From a6d39ee9dba0ec547062b00d7ff5ea7fc569b17e Mon Sep 17 00:00:00 2001
From: Evan Hanson <evhan@foldling.org>
Date: Sat, 12 Jan 2019 10:33:56 +1300
Subject: [PATCH 0001/4636] ugarit: fix build by using CHICKEN 4.x

Ugarit only works with CHICKEN 4, not CHICKEN 5 (which is the default
version in nixpkgs since 69ef0702), so use the compiler and egg tools
from `chickenPackages_4` for ugarit and ugarit-manifest-maker.
---
 pkgs/top-level/all-packages.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb1fa5e5ebc3..0e63eb9b6963 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6502,9 +6502,13 @@ in
 
   xxkb = callPackage ../applications/misc/xxkb { };
 
-  ugarit = callPackage ../tools/backup/ugarit { };
+  ugarit = callPackage ../tools/backup/ugarit {
+    inherit (chickenPackages_4) eggDerivation fetchegg;
+  };
 
-  ugarit-manifest-maker = callPackage ../tools/backup/ugarit-manifest-maker { };
+  ugarit-manifest-maker = callPackage ../tools/backup/ugarit-manifest-maker {
+    inherit (chickenPackages_4) eggDerivation fetchegg;
+  };
 
   unar = callPackage ../tools/archivers/unar { stdenv = clangStdenv; };
 

From ff2883dceab64c1a80b06172f017ae9ad4e3e7b3 Mon Sep 17 00:00:00 2001
From: Daniel Vianna <dmlvianna@gmail.com>
Date: Thu, 13 Jun 2019 22:23:23 +1000
Subject: [PATCH 0002/4636] add inconsolata and terminus nerdfonts in single
 packages

---
 .../fonts/inconsolata-nerdfont/default.nix    | 28 +++++++++++++++++++
 pkgs/data/fonts/terminus-nerdfont/default.nix | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 ++++
 3 files changed, 61 insertions(+)
 create mode 100644 pkgs/data/fonts/inconsolata-nerdfont/default.nix
 create mode 100644 pkgs/data/fonts/terminus-nerdfont/default.nix

diff --git a/pkgs/data/fonts/inconsolata-nerdfont/default.nix b/pkgs/data/fonts/inconsolata-nerdfont/default.nix
new file mode 100644
index 000000000000..b4356e73d5c7
--- /dev/null
+++ b/pkgs/data/fonts/inconsolata-nerdfont/default.nix
@@ -0,0 +1,28 @@
+{ lib, fetchzip }:
+
+let
+  version = "2.0.0";
+in fetchzip {
+  name = "inconsolata-nerdfont-${version}";
+
+  url = "https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/Inconsolata.zip";
+
+  postFetch = ''
+    mkdir -p $out/share/fonts/inconsolata-nerdfont
+    unzip -j $downloadedFile -d $out/share/fonts/inconsolata-nerdfont
+  '';
+
+  sha256 = "06i1akjblqd038cn5lvz67lwp6afpv31vqcfdihp66qisgbgm4w9";
+
+  meta = with lib; {
+    description = ''
+      Nerd Fonts is a project that attempts to patch as many developer targeted
+      and/or used fonts as possible. The patch is to specifically add a high
+      number of additional glyphs from popular 'iconic fonts' such as Font
+      Awesome, Devicons, Octicons, and others.
+    '';
+    homepage = https://github.com/ryanoasis/nerd-fonts;
+    license = licenses.mit;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/data/fonts/terminus-nerdfont/default.nix b/pkgs/data/fonts/terminus-nerdfont/default.nix
new file mode 100644
index 000000000000..3c1730146b3d
--- /dev/null
+++ b/pkgs/data/fonts/terminus-nerdfont/default.nix
@@ -0,0 +1,28 @@
+{ lib, fetchzip }:
+
+let
+  version = "2.0.0";
+in fetchzip {
+  name = "terminus-nerdfont-${version}";
+
+  url = "https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/Terminus.zip";
+
+  postFetch = ''
+    mkdir -p $out/share/fonts/terminus-nerdfont
+    unzip -j $downloadedFile -d $out/share/fonts/terminus-nerdfont
+  '';
+
+  sha256 = "036i1qwwrb0r8hvcjf3h34w0g7mbsmngvrjic98jgikbz3i2f46c";
+
+  meta = with lib; {
+    description = ''
+      Nerd Fonts is a project that attempts to patch as many developer targeted
+      and/or used fonts as possible. The patch is to specifically add a high
+      number of additional glyphs from popular 'iconic fonts' such as Font
+      Awesome, Devicons, Octicons, and others.
+    '';
+    homepage = https://github.com/ryanoasis/nerd-fonts;
+    license = licenses.mit;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 783d4f1ba3db..1b5166be06d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16314,8 +16314,11 @@ in
   iconpack-obsidian = callPackage ../data/icons/iconpack-obsidian { };
 
   inconsolata = callPackage ../data/fonts/inconsolata {};
+
   inconsolata-lgc = callPackage ../data/fonts/inconsolata/lgc.nix {};
 
+  inconsolata-nerdfont = callPackage ../data/fonts/inconsolata-nerdfont {};
+
   input-fonts = callPackage ../data/fonts/input-fonts { };
 
   inriafonts = callPackage ../data/fonts/inriafonts { };
@@ -16666,6 +16669,8 @@ in
 
   terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { };
 
+  terminus-nerdfont = callPackage ../data/fonts/terminus-nerdfont { };
+
   termtekst = callPackage ../misc/emulators/termtekst { };
 
   tex-gyre = callPackages ../data/fonts/tex-gyre { };

From 86e3208ca31bc3dcddc412c59eae2e42107abcec Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Tue, 2 Jul 2019 16:16:04 +0900
Subject: [PATCH 0003/4636] yubico-piv-tool: support Apple PCSC, enable by
 default

---
 pkgs/tools/misc/yubico-piv-tool/default.nix | 9 ++++++---
 pkgs/top-level/all-packages.nix             | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix
index b5c5aca0883b..eb978de06e65 100644
--- a/pkgs/tools/misc/yubico-piv-tool/default.nix
+++ b/pkgs/tools/misc/yubico-piv-tool/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, openssl, pcsclite, check }:
+{ stdenv, fetchurl, pkgconfig, openssl, check, pcsclite, PCSC
+, withApplePCSC ? stdenv.isDarwin
+}:
 
 stdenv.mkDerivation rec {
   name = "yubico-piv-tool-1.7.0";
@@ -9,9 +11,10 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ openssl pcsclite check ];
+  buildInputs = [ openssl check ]
+    ++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]);
 
-  configureFlags = [ "--with-backend=pcsc" ];
+  configureFlags = [ "--with-backend=${if withApplePCSC then "macscard" else "pcsc"}" ];
 
   meta = with stdenv.lib; {
     homepage = https://developers.yubico.com/yubico-piv-tool/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e3e4654c12fd..433646d5c3bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13825,7 +13825,9 @@ in
 
   yubico-pam = callPackage ../development/libraries/yubico-pam { };
 
-  yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool { };
+  yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool {
+    inherit (darwin.apple_sdk.frameworks) PCSC;
+  };
 
   yubikey-manager = callPackage ../tools/misc/yubikey-manager { };
 

From 92a015d35d0450708438f68466027707b18188bd Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Mon, 22 Jul 2019 02:57:16 +0300
Subject: [PATCH 0004/4636] nixos/postgresql: support 0750 for data directory

This is rework of part of https://github.com/NixOS/nixpkgs/pull/46670.
My usecase was to be able to inspect PG datadir as wheel user.

PG11 now allows starting server with 0750 mask for data dir.
`groupAccess = true` now does this automatically. The only thing you have to do
is to set group ownership.

For PG10 and below, I've described a hack how this can be done. Before this PR
hack was impossible. The hack isn't ideal, because there is short
period of time when dir mode is 0700, so I didn't want to make it official.

Test/example is present too.
---
 .../modules/services/databases/postgresql.nix | 40 +++++++++--
 nixos/tests/postgresql.nix                    | 66 +++++++++++++++++++
 pkgs/servers/sql/postgresql/default.nix       |  3 +
 3 files changed, 104 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index bc47e7e1e0dc..7dddebfc28dd 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -38,6 +38,8 @@ let
       ${cfg.extraConfig}
     '';
 
+    dirMode = if cfg.groupAccess then "0750" else "0700";
+
 in
 
 {
@@ -80,6 +82,23 @@ in
         '';
       };
 
+      groupAccess = mkOption {
+        type = types.bool;
+        default = false;
+        example = true;
+        description = ''
+          Allow read access for group (0750 mask for data directory).
+          Supported only for PostgreSQL 11+. PostgreSQL 10 and lower doesn't
+          support starting server with 0750 mask, but a workaround like
+          <programlisting>
+          systemd.services.postgresql.postStart = lib.mkAfter '''
+            chmod 750 ''${config.services.postgresql.dataDir}
+          ''';
+          </programlisting>
+          may be used instead.
+        '';
+      };
+
       authentication = mkOption {
         type = types.lines;
         default = "";
@@ -240,6 +259,14 @@ in
 
   config = mkIf config.services.postgresql.enable {
 
+    assertions = [
+      { assertion = cfg.groupAccess -> builtins.compareVersions cfg.package.version "11.0" >= 0;
+        message = ''
+          'groupAccess' is not available for PostgreSQL < 11.
+        '';
+      }
+    ];
+
     services.postgresql.package =
       # Note: when changing the default, make it conditional on
       # ‘system.stateVersion’ to maintain compatibility with existing
@@ -287,9 +314,9 @@ in
           ''
             # Create data directory.
             if ! test -e ${cfg.dataDir}/PG_VERSION; then
-              mkdir -m 0700 -p ${cfg.dataDir}
+              mkdir -m ${dirMode} -p ${cfg.dataDir}
               rm -f ${cfg.dataDir}/*.conf
-              chown -R postgres:postgres ${cfg.dataDir}
+              chown -R postgres ${cfg.dataDir}
             fi
           ''; # */
 
@@ -297,7 +324,9 @@ in
           ''
             # Initialise the database.
             if ! test -e ${cfg.dataDir}/PG_VERSION; then
-              initdb -U ${cfg.superUser}
+              initdb -U ${cfg.superUser} ${
+                lib.optionalString cfg.groupAccess "--allow-group-access"
+              }
               # See postStart!
               touch "${cfg.dataDir}/.first_startup"
             fi
@@ -306,8 +335,9 @@ in
               ln -sfn "${pkgs.writeText "recovery.conf" cfg.recoveryConfig}" \
                 "${cfg.dataDir}/recovery.conf"
             ''}
+            chmod ${dirMode} "${cfg.dataDir}"
 
-             exec postgres
+            exec postgres
           '';
 
         serviceConfig =
@@ -365,5 +395,5 @@ in
   };
 
   meta.doc = ./postgresql.xml;
-  meta.maintainers = with lib.maintainers; [ thoughtpolice ];
+  meta.maintainers = with lib.maintainers; [ thoughtpolice danbst ];
 }
diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix
index ae5d6d095ea2..81ec4d698b66 100644
--- a/nixos/tests/postgresql.nix
+++ b/nixos/tests/postgresql.nix
@@ -69,5 +69,71 @@ let
 in
   (mapAttrs' (name: package: { inherit name; value=make-postgresql-test name package false;}) postgresql-versions) // {
     postgresql_11-backup-all = make-postgresql-test "postgresql_11-backup-all" postgresql-versions.postgresql_11 true;
+
+    postgresql_dirmode_change =
+      let dataDir = "/db";
+    in makeTest {
+      name = "postgresql_dirmode_change";
+      meta = with pkgs.stdenv.lib.maintainers; {
+        maintainers = [ danbst ];
+      };
+
+      machine = { config, ...}:
+        {
+          services.postgresql.enable = true;
+          services.postgresql.package = pkgs.postgresql_11;
+          services.postgresql.dataDir = dataDir;
+
+          # users.groups.backup = {};
+          users.users.backup.isNormalUser = true;
+          users.users.backup.group = "wheel";
+
+          systemd.tmpfiles.rules = [
+            "d ${dataDir} 0750 postgres wheel -"
+          ];
+
+          nesting.clone = [
+            {
+              services.postgresql.groupAccess = true;
+            }
+
+            ({ config, lib, ... }: {
+              services.postgresql.package = lib.mkForce pkgs.postgresql_10;
+              services.postgresql.dataDir = lib.mkForce (dataDir + "_10");
+              systemd.tmpfiles.rules = [
+                "d ${dataDir}_10 0750 postgres wheel -"
+              ];
+              systemd.services.postgresql.postStart = lib.mkAfter ''
+                chmod 750 ${config.services.postgresql.dataDir}
+              '';
+            })
+          ];
+        };
+    testScript = { nodes, ... }: let
+      c1 = "${nodes.machine.config.system.build.toplevel}/fine-tune/child-1";
+      c2 = "${nodes.machine.config.system.build.toplevel}/fine-tune/child-2";
+    in ''
+      $machine->start;
+      $machine->waitForUnit("postgresql");
+      $machine->succeed("echo select 1 | sudo -u postgres psql");
+
+      # by default, mode is 0700
+      $machine->fail("sudo -u backup ls ${dataDir}");
+
+      $machine->succeed("${c1}/bin/switch-to-configuration test >&2");
+      $machine->succeed("journalctl -u postgresql | grep -q -i stopped"); # was restarted
+      $machine->succeed("echo select 1 | sudo -u postgres psql"); # works after restart
+      $machine->succeed("sudo -u backup ls ${dataDir}");
+
+      # This tests a hack for PG <11: restore permissions to 0700 just before PG starts
+      # and put it back to 0750 after PG had started
+      $machine->succeed("${c2}/bin/switch-to-configuration test >&2");
+      $machine->succeed("systemctl restart postgresql");
+      $machine->waitForUnit("postgresql");   # works after restart
+      $machine->succeed("sudo -u backup ls ${dataDir}_10");
+
+      $machine->shutdown;
+    '';
+    };
   }
 
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 440ee15a5180..e2703a549d3b 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -157,6 +157,9 @@ let
       cp --target-directory=$out/bin ${postgresql}/bin/{postgres,pg_config,pg_ctl}
       wrapProgram $out/bin/postgres --set NIX_PGLIBDIR $out/lib
     '';
+
+    passthru.version = postgresql.version;
+    passthru.psqlSchema = postgresql.psqlSchema;
   };
 
 in self: {

From 7e4e37fff4cd97cc7fed26c9e1060761ed1379a7 Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Tue, 23 Jul 2019 21:53:59 +0300
Subject: [PATCH 0005/4636] postgresql: allow changing initidb arguments via
 module system

Closes https://github.com/NixOS/nixpkgs/issues/18829

+ some cleanups
---
 .../modules/services/databases/postgresql.nix | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 7dddebfc28dd..b89f4a57253a 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -119,6 +119,15 @@ in
         '';
       };
 
+      initdbFlags = mkOption {
+        type = with types; listOf str;
+        default = [];
+        description = ''
+          Additional flags passed to <literal>initdb<literal> during data dir
+          initialisation.
+        '';
+      };
+
       initialScript = mkOption {
         type = types.nullOr types.path;
         default = null;
@@ -257,10 +266,10 @@ in
 
   ###### implementation
 
-  config = mkIf config.services.postgresql.enable {
+  config = mkIf cfg.enable {
 
     assertions = [
-      { assertion = cfg.groupAccess -> builtins.compareVersions cfg.package.version "11.0" >= 0;
+      { assertion = cfg.groupAccess -> versionAtLeast cfg.package.version "11.0";
         message = ''
           'groupAccess' is not available for PostgreSQL < 11.
         '';
@@ -276,8 +285,12 @@ in
             else pkgs.postgresql_9_4);
 
     services.postgresql.dataDir =
-      mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}"
-                 else "/var/db/postgresql");
+      mkDefault (if versionAtLeast config.system.stateVersion "17.09"
+                  then "/var/lib/postgresql/${cfg.package.psqlSchema}"
+                  else "/var/db/postgresql");
+
+    services.postgresql.initdbFlags =
+      mkDefault (lib.optional cfg.groupAccess "--allow-group-access");
 
     services.postgresql.authentication = mkAfter
       ''
@@ -324,9 +337,7 @@ in
           ''
             # Initialise the database.
             if ! test -e ${cfg.dataDir}/PG_VERSION; then
-              initdb -U ${cfg.superUser} ${
-                lib.optionalString cfg.groupAccess "--allow-group-access"
-              }
+              initdb -U ${cfg.superUser} ${lib.concatStringsSep " " cfg.initdbFlags}
               # See postStart!
               touch "${cfg.dataDir}/.first_startup"
             fi

From b643e0aee32a1c12ee48da3d62895e4f8f77af79 Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Wed, 24 Jul 2019 23:34:21 +0300
Subject: [PATCH 0006/4636] addressed review comments and some fixes

---
 .../modules/services/databases/postgresql.nix | 26 ++++++---------
 nixos/tests/postgresql.nix                    | 33 +++----------------
 2 files changed, 15 insertions(+), 44 deletions(-)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index b89f4a57253a..eb1ac6bcb307 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -85,17 +85,9 @@ in
       groupAccess = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = ''
           Allow read access for group (0750 mask for data directory).
-          Supported only for PostgreSQL 11+. PostgreSQL 10 and lower doesn't
-          support starting server with 0750 mask, but a workaround like
-          <programlisting>
-          systemd.services.postgresql.postStart = lib.mkAfter '''
-            chmod 750 ''${config.services.postgresql.dataDir}
-          ''';
-          </programlisting>
-          may be used instead.
+          Supported only for PostgreSQL 11+.
         '';
       };
 
@@ -119,11 +111,12 @@ in
         '';
       };
 
-      initdbFlags = mkOption {
+      initdbArgs = mkOption {
         type = with types; listOf str;
         default = [];
+        example = [ "--data-checksums" ];
         description = ''
-          Additional flags passed to <literal>initdb<literal> during data dir
+          Additional arguments passed to <literal>initdb<literal> during data dir
           initialisation.
         '';
       };
@@ -289,8 +282,8 @@ in
                   then "/var/lib/postgresql/${cfg.package.psqlSchema}"
                   else "/var/db/postgresql");
 
-    services.postgresql.initdbFlags =
-      mkDefault (lib.optional cfg.groupAccess "--allow-group-access");
+    services.postgresql.initdbArgs =
+      mkBefore (optional cfg.groupAccess "--allow-group-access");
 
     services.postgresql.authentication = mkAfter
       ''
@@ -329,7 +322,7 @@ in
             if ! test -e ${cfg.dataDir}/PG_VERSION; then
               mkdir -m ${dirMode} -p ${cfg.dataDir}
               rm -f ${cfg.dataDir}/*.conf
-              chown -R postgres ${cfg.dataDir}
+              chown -R postgres:postgres ${cfg.dataDir}
             fi
           ''; # */
 
@@ -337,7 +330,7 @@ in
           ''
             # Initialise the database.
             if ! test -e ${cfg.dataDir}/PG_VERSION; then
-              initdb -U ${cfg.superUser} ${lib.concatStringsSep " " cfg.initdbFlags}
+              initdb -U ${cfg.superUser} ${concatStringsSep " " cfg.initdbArgs}
               # See postStart!
               touch "${cfg.dataDir}/.first_startup"
             fi
@@ -346,6 +339,7 @@ in
               ln -sfn "${pkgs.writeText "recovery.conf" cfg.recoveryConfig}" \
                 "${cfg.dataDir}/recovery.conf"
             ''}
+            echo chmod ${dirMode} "${cfg.dataDir}"
             chmod ${dirMode} "${cfg.dataDir}"
 
             exec postgres
@@ -357,7 +351,7 @@ in
             Group = "postgres";
             PermissionsStartOnly = true;
             RuntimeDirectory = "postgresql";
-            Type = if lib.versionAtLeast cfg.package.version "9.6"
+            Type = if versionAtLeast cfg.package.version "9.6"
                    then "notify"
                    else "simple";
 
diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix
index 81ec4d698b66..433a64e9fab8 100644
--- a/nixos/tests/postgresql.nix
+++ b/nixos/tests/postgresql.nix
@@ -84,53 +84,30 @@ in
           services.postgresql.package = pkgs.postgresql_11;
           services.postgresql.dataDir = dataDir;
 
-          # users.groups.backup = {};
-          users.users.backup.isNormalUser = true;
-          users.users.backup.group = "wheel";
-
-          systemd.tmpfiles.rules = [
-            "d ${dataDir} 0750 postgres wheel -"
-          ];
+          users.users.admin.isNormalUser = true;
+          users.users.admin.extraGroups = [ "postgres" ];
 
           nesting.clone = [
             {
               services.postgresql.groupAccess = true;
             }
-
-            ({ config, lib, ... }: {
-              services.postgresql.package = lib.mkForce pkgs.postgresql_10;
-              services.postgresql.dataDir = lib.mkForce (dataDir + "_10");
-              systemd.tmpfiles.rules = [
-                "d ${dataDir}_10 0750 postgres wheel -"
-              ];
-              systemd.services.postgresql.postStart = lib.mkAfter ''
-                chmod 750 ${config.services.postgresql.dataDir}
-              '';
-            })
           ];
         };
     testScript = { nodes, ... }: let
       c1 = "${nodes.machine.config.system.build.toplevel}/fine-tune/child-1";
-      c2 = "${nodes.machine.config.system.build.toplevel}/fine-tune/child-2";
     in ''
       $machine->start;
       $machine->waitForUnit("postgresql");
       $machine->succeed("echo select 1 | sudo -u postgres psql");
 
       # by default, mode is 0700
-      $machine->fail("sudo -u backup ls ${dataDir}");
+      $machine->fail("sudo -u admin ls ${dataDir}");
 
       $machine->succeed("${c1}/bin/switch-to-configuration test >&2");
       $machine->succeed("journalctl -u postgresql | grep -q -i stopped"); # was restarted
       $machine->succeed("echo select 1 | sudo -u postgres psql"); # works after restart
-      $machine->succeed("sudo -u backup ls ${dataDir}");
-
-      # This tests a hack for PG <11: restore permissions to 0700 just before PG starts
-      # and put it back to 0750 after PG had started
-      $machine->succeed("${c2}/bin/switch-to-configuration test >&2");
-      $machine->succeed("systemctl restart postgresql");
-      $machine->waitForUnit("postgresql");   # works after restart
-      $machine->succeed("sudo -u backup ls ${dataDir}_10");
+      $machine->succeed("sudo -u admin ls -la / >&2");
+      $machine->succeed("sudo -u admin ls ${dataDir}");
 
       $machine->shutdown;
     '';

From e54ad9812bf4f91782cde477f405e015ee5cbdbc Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Thu, 25 Jul 2019 00:17:01 +0300
Subject: [PATCH 0007/4636] whoops

---
 nixos/modules/services/databases/postgresql.nix | 1 -
 nixos/tests/postgresql.nix                      | 1 -
 2 files changed, 2 deletions(-)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index eb1ac6bcb307..510e8f17133b 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -339,7 +339,6 @@ in
               ln -sfn "${pkgs.writeText "recovery.conf" cfg.recoveryConfig}" \
                 "${cfg.dataDir}/recovery.conf"
             ''}
-            echo chmod ${dirMode} "${cfg.dataDir}"
             chmod ${dirMode} "${cfg.dataDir}"
 
             exec postgres
diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix
index 433a64e9fab8..a787d0f5976a 100644
--- a/nixos/tests/postgresql.nix
+++ b/nixos/tests/postgresql.nix
@@ -106,7 +106,6 @@ in
       $machine->succeed("${c1}/bin/switch-to-configuration test >&2");
       $machine->succeed("journalctl -u postgresql | grep -q -i stopped"); # was restarted
       $machine->succeed("echo select 1 | sudo -u postgres psql"); # works after restart
-      $machine->succeed("sudo -u admin ls -la / >&2");
       $machine->succeed("sudo -u admin ls ${dataDir}");
 
       $machine->shutdown;

From 363ba3f40371f5c016aecf07bf62f3a33f755f29 Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Thu, 25 Jul 2019 01:00:26 +0300
Subject: [PATCH 0008/4636] change groupAccess to tristate, to not force
 `chmod` on dataDir.

Making mask either 0700 or 0750 is too restrictive..
---
 .../modules/services/databases/postgresql.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 510e8f17133b..4b3693d689c9 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -38,7 +38,7 @@ let
       ${cfg.extraConfig}
     '';
 
-    dirMode = if cfg.groupAccess then "0750" else "0700";
+    dirMode = if cfg.groupAccess == true then "0750" else "0700";
 
 in
 
@@ -83,11 +83,14 @@ in
       };
 
       groupAccess = mkOption {
-        type = types.bool;
-        default = false;
+        type = with types; nullOr bool;
+        default = null;
         description = ''
-          Allow read access for group (0750 mask for data directory).
+          When true, allow read access for group (<literal>0750</literal> mask for data directory).
           Supported only for PostgreSQL 11+.
+          </para><para>
+          When false, force a restrictive <literal>0700</literal> mask on data directory, so
+          PostgreSQL won't fail due to too permissive mask.
         '';
       };
 
@@ -262,7 +265,7 @@ in
   config = mkIf cfg.enable {
 
     assertions = [
-      { assertion = cfg.groupAccess -> versionAtLeast cfg.package.version "11.0";
+      { assertion = cfg.groupAccess == true -> versionAtLeast cfg.package.version "11.0";
         message = ''
           'groupAccess' is not available for PostgreSQL < 11.
         '';
@@ -283,7 +286,7 @@ in
                   else "/var/db/postgresql");
 
     services.postgresql.initdbArgs =
-      mkBefore (optional cfg.groupAccess "--allow-group-access");
+      mkBefore (optional (cfg.groupAccess == true) "--allow-group-access");
 
     services.postgresql.authentication = mkAfter
       ''
@@ -339,7 +342,9 @@ in
               ln -sfn "${pkgs.writeText "recovery.conf" cfg.recoveryConfig}" \
                 "${cfg.dataDir}/recovery.conf"
             ''}
-            chmod ${dirMode} "${cfg.dataDir}"
+            ${optionalString (cfg.groupAccess != null) ''
+              chmod ${dirMode} "${cfg.dataDir}"
+            ''}
 
             exec postgres
           '';

From d9ff157ee44d978aebed6f6a9c7d4de05d5576ad Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Tue, 13 Aug 2019 09:17:50 +0300
Subject: [PATCH 0009/4636] WIP

---
 nixos/tests/postgresql.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix
index a787d0f5976a..a6120c9c5d34 100644
--- a/nixos/tests/postgresql.nix
+++ b/nixos/tests/postgresql.nix
@@ -78,10 +78,10 @@ in
         maintainers = [ danbst ];
       };
 
-      machine = { config, ...}:
+      machine = { config, lib, ...}:
         {
           services.postgresql.enable = true;
-          services.postgresql.package = pkgs.postgresql_11;
+          services.postgresql.package = pkgs.postgresql_10;
           services.postgresql.dataDir = dataDir;
 
           users.users.admin.isNormalUser = true;
@@ -89,7 +89,13 @@ in
 
           nesting.clone = [
             {
-              services.postgresql.groupAccess = true;
+              systemd.services.postgresql.preStart = lib.mkAfter ''
+                chmod 0700 ${dataDir}
+              '';
+              systemd.services.postgresql.postStart = lib.mkAfter ''
+                chmod -R 750 ${dataDir}
+                ${pkgs.acl}/bin/setfacl -d -m g::r-x ${dataDir}
+              '';
             }
           ];
         };
@@ -105,6 +111,9 @@ in
 
       $machine->succeed("${c1}/bin/switch-to-configuration test >&2");
       $machine->succeed("journalctl -u postgresql | grep -q -i stopped"); # was restarted
+      $machine->succeed("systemctl restart postgresql"); # but we have to be sure
+                                                         # manual restart works too
+      $machine->waitForUnit("postgresql");
       $machine->succeed("echo select 1 | sudo -u postgres psql"); # works after restart
       $machine->succeed("sudo -u admin ls ${dataDir}");
 

From 8935bfb4ac3680e38a8811c12282e2026f7e82ae Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 11 Sep 2019 12:57:38 +0200
Subject: [PATCH 0010/4636] lib: Add recurseIntoAttrs

This makes the function available without having to evaluate the
Nixpkgs fix-point, making it available in a more natural way for
code that deals with multiple Nixpkgs invocations.

Its definition is coupled to Nix rather than Nixpkgs, so it will
feel right at home in lib.
---
 lib/attrsets.nix                | 6 ++++++
 lib/default.nix                 | 3 ++-
 pkgs/top-level/all-packages.nix | 6 +++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index d374d229f597..4b73735fd850 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -473,6 +473,12 @@ rec {
   /* Pick the outputs of packages to place in buildInputs */
   chooseDevOutputs = drvs: builtins.map getDev drvs;
 
+  /* Make various Nix tools consider the contents of the resulting
+     attribute set when looking for what to build, find, etc.
+   */
+  recurseIntoAttrs =
+    attrs: attrs // { recurseForDerivations = true; };
+
   /*** deprecated stuff ***/
 
   zipWithNames = zipAttrsWithNames;
diff --git a/lib/default.nix b/lib/default.nix
index 18d2dfae1e18..34c72a3512ee 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -70,7 +70,8 @@ let
       genAttrs isDerivation toDerivation optionalAttrs
       zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil
       recursiveUpdate matchAttrs overrideExisting getOutput getBin
-      getLib getDev chooseDevOutputs zipWithNames zip;
+      getLib getDev chooseDevOutputs zipWithNames zip
+      recurseIntoAttrs;
     inherit (lists) singleton forEach foldr fold foldl foldl' imap0 imap1
       concatMap flatten remove findSingle findFirst any all count
       optional optionals toList range partition zipListsWith zipLists
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd36574e1240..c50e8eaca23b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -62,9 +62,9 @@ in
 
   inherit (lib) lowPrio hiPrio appendToName makeOverridable;
 
-  # Applying this to an attribute set will cause nix-env to look
-  # inside the set for derivations.
-  recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; };
+  # Make various Nix tools consider the contents of the resulting
+  # attribute set when looking for what to build, find, etc.
+  inherit (lib) recurseIntoAttrs;
 
   # This is intended to be the reverse of recurseIntoAttrs, as it is
   # defined now it exists mainly for documentation purposes, but you

From fc64cf65abfd6f42910a639f7ffb996788a95797 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 11 Sep 2019 13:03:48 +0200
Subject: [PATCH 0011/4636] top-level: Fix dontRecurseIntoAttrs and include in
 lib

dontRecurseIntoAttrs was a noop (x: x), causing the expression
dontRecurseIntoAttrs (recurseIntoAttrs a) to have the wrong effect.
---
 lib/attrsets.nix                | 5 +++++
 lib/default.nix                 | 2 +-
 pkgs/top-level/all-packages.nix | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index 4b73735fd850..607a22393f8a 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -479,6 +479,11 @@ rec {
   recurseIntoAttrs =
     attrs: attrs // { recurseForDerivations = true; };
 
+  /* Undo the effect of recurseIntoAttrs.
+   */
+  dontRecurseIntoAttrs =
+    attrs: attrs // { recurseForDerivations = false; };
+
   /*** deprecated stuff ***/
 
   zipWithNames = zipAttrsWithNames;
diff --git a/lib/default.nix b/lib/default.nix
index 34c72a3512ee..88083214a31a 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -71,7 +71,7 @@ let
       zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil
       recursiveUpdate matchAttrs overrideExisting getOutput getBin
       getLib getDev chooseDevOutputs zipWithNames zip
-      recurseIntoAttrs;
+      recurseIntoAttrs dontRecurseIntoAttrs;
     inherit (lists) singleton forEach foldr fold foldl foldl' imap0 imap1
       concatMap flatten remove findSingle findFirst any all count
       optional optionals toList range partition zipListsWith zipLists
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c50e8eaca23b..5fa010558ca5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -72,7 +72,7 @@ in
   # the Attrs which is useful for testing massive changes. Ideally,
   # every package subset not marked with recurseIntoAttrs should be
   # marked with this.
-  dontRecurseIntoAttrs = x: x;
+  inherit (lib) dontRecurseIntoAttrs;
 
   stringsWithDeps = lib.stringsWithDeps;
 

From a96f37db10fb2892d0420a7ef51c5b157d9e58dd Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 11 Sep 2019 14:51:28 +0200
Subject: [PATCH 0012/4636] Document attrsets.recurseIntoAttrs

---
 doc/functions/library/attrsets.xml | 44 ++++++++++++++++++++++++++++++
 lib/attrsets.nix                   |  3 ++
 pkgs/top-level/all-packages.nix    |  2 --
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml
index 65d0b40e2e82..8fe2e324b3b2 100644
--- a/doc/functions/library/attrsets.xml
+++ b/doc/functions/library/attrsets.xml
@@ -1728,4 +1728,48 @@ recursiveUpdate
 ]]></programlisting>
   </example>
  </section>
+
+ <section xml:id="function-library-lib.attrsets.recurseIntoAttrs">
+  <title><function>lib.attrsets.recurseIntoAttrs</function></title>
+
+  <subtitle><literal>recurseIntoAttrs :: AttrSet -> AttrSet</literal>
+  </subtitle>
+
+  <xi:include href="./locations.xml" xpointer="lib.attrsets.recurseIntoAttrs" />
+
+  <para>
+   Make various Nix tools consider the contents of the resulting
+   attribute set when looking for what to build, find, etc.
+  </para>
+
+  <para>
+   This function only affects a single attribute set; it does not apply itself recursively for nested attribute sets.
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term>
+     <varname>attrs</varname>
+    </term>
+    <listitem>
+     <para>
+      An attribute set to scan for derivations.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <example xml:id="function-library-lib.attrsets.recurseIntoAttrs-example">
+   <title>Making Nix look inside an attribute set</title>
+<programlisting><![CDATA[
+{ pkgs ? import <nixpkgs> {} }:
+{
+  myTools = pkgs.lib.recurseIntoAttrs {
+    inherit (pkgs) hello figlet;
+  };
+}
+]]></programlisting>
+  </example>
+ </section>
+
 </section>
diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index 607a22393f8a..ae6e4e7c8518 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -475,6 +475,9 @@ rec {
 
   /* Make various Nix tools consider the contents of the resulting
      attribute set when looking for what to build, find, etc.
+
+     This function only affects a single attribute set; it does not
+     apply itself recursively for nested attribute sets.
    */
   recurseIntoAttrs =
     attrs: attrs // { recurseForDerivations = true; };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5fa010558ca5..5a1b52938d1c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -62,8 +62,6 @@ in
 
   inherit (lib) lowPrio hiPrio appendToName makeOverridable;
 
-  # Make various Nix tools consider the contents of the resulting
-  # attribute set when looking for what to build, find, etc.
   inherit (lib) recurseIntoAttrs;
 
   # This is intended to be the reverse of recurseIntoAttrs, as it is

From 5616f9937a954091f0ffd6d7473061aef9daa18c Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Sat, 14 Sep 2019 16:13:41 +0200
Subject: [PATCH 0013/4636] carla: enable parallel building

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

diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix
index 98a4ddd29d6e..4218a1ee06b8 100644
--- a/pkgs/applications/audio/carla/default.nix
+++ b/pkgs/applications/audio/carla/default.nix
@@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
     ++ optional withGtk2 gtk2
     ++ optional withGtk3 gtk3;
 
+  enableParallelBuilding = true;
+
   installFlags = [ "PREFIX=$(out)" ];
 
   dontWrapQtApps = true;

From 8f32a1615262555e14257e4f9919848dec1540b8 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Sat, 14 Sep 2019 16:14:02 +0200
Subject: [PATCH 0014/4636] carla: properly wrap plugin programs. fixes #67923

---
 pkgs/applications/audio/carla/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix
index 4218a1ee06b8..6641e99e4917 100644
--- a/pkgs/applications/audio/carla/default.nix
+++ b/pkgs/applications/audio/carla/default.nix
@@ -47,6 +47,7 @@ stdenv.mkDerivation rec {
   postFixup = ''
     # Also sets program_PYTHONPATH and program_PATH variables
     wrapPythonPrograms
+    wrapPythonProgramsIn "$out/share/carla/resources" "$out $pythonPath"
 
     find "$out/share/carla" -maxdepth 1 -type f -not -name "*.py" -print0 | while read -d "" f; do
       patchPythonScript "$f"
@@ -58,6 +59,12 @@ stdenv.mkDerivation rec {
         --prefix PATH : "$program_PATH:${which}/bin" \
         --set PYTHONNOUSERSITE true
     done
+
+    find "$out/share/carla/resources" -maxdepth 1 -type f -not -name "*.py" -print0 | while read -d "" f; do
+      wrapQtApp "$f" \
+        --prefix PATH : "$program_PATH:${which}/bin" \
+        --set PYTHONNOUSERSITE true
+    done
   '';
 
   meta = with stdenv.lib; {

From 036bf4982a6cc2fc9deb17bfe938193bc4d16cce Mon Sep 17 00:00:00 2001
From: Jeff Slight <jslight90@gmail.com>
Date: Thu, 19 Sep 2019 12:58:13 -0700
Subject: [PATCH 0015/4636] mattermost: 5.9.0 -> 5.15.0

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

diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix
index 2919647e5734..00f74e7a01ec 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }:
 
 let
-  version = "5.9.0";
+  version = "5.15.0";
 
   mattermost-server = buildGoPackage rec {
     pname = "mattermost-server";
@@ -11,7 +11,7 @@ let
       owner = "mattermost";
       repo = "mattermost-server";
       rev = "v${version}";
-      sha256 = "08h7n9smv6f1njazn4pl6pwkfmqxn93rzg69h6asicp9c4vad3m2";
+      sha256 = "1bh53h0bmpc1qmnbpsmwkfrvj66z18m7b1xg7pqikid57ssqxjx9";
     };
 
     goPackagePath = "github.com/mattermost/mattermost-server";
@@ -29,7 +29,7 @@ let
 
     src = fetchurl {
       url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
-      sha256 = "19ys5mwmw99fbj44gd00vrl2qj09lrwvj1ihic0fsn6nd3hnx3mw";
+      sha256 = "13xmc2y4pp0b0svzaf4v7ynx6rxcvznx3vqmlrpiil414s69xv45";
     };
 
     installPhase = ''

From 366be2ea324571a7b40410e79d45e900ff6b0ae2 Mon Sep 17 00:00:00 2001
From: Jeff Slight <jslight90@gmail.com>
Date: Thu, 19 Sep 2019 16:00:27 -0700
Subject: [PATCH 0016/4636] nixos/mattermost: unescape unicode characters in
 config.json

---
 nixos/modules/services/web-apps/mattermost.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix
index 8c7fc4056adc..97dc0dd3c66b 100644
--- a/nixos/modules/services/web-apps/mattermost.nix
+++ b/nixos/modules/services/web-apps/mattermost.nix
@@ -6,7 +6,9 @@ let
 
   cfg = config.services.mattermost;
 
-  defaultConfig = builtins.fromJSON (readFile "${pkgs.mattermost}/config/config.json");
+  defaultConfig = builtins.fromJSON (builtins.replaceStrings [ "\\u0026" ] [ "&" ]
+    (readFile "${pkgs.mattermost}/config/config.json")
+  );
 
   mattermostConf = foldl recursiveUpdate defaultConfig
     [ { ServiceSettings.SiteURL = cfg.siteUrl;

From 346a6ce2653324a61a2855fffa30a8fba00fbdbb Mon Sep 17 00:00:00 2001
From: Jeff Slight <jslight90@gmail.com>
Date: Fri, 20 Sep 2019 10:39:57 -0700
Subject: [PATCH 0017/4636] nixos/mattermost: use database config if set to
 immutable

---
 nixos/modules/services/web-apps/mattermost.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix
index 97dc0dd3c66b..e402f5ff843f 100644
--- a/nixos/modules/services/web-apps/mattermost.nix
+++ b/nixos/modules/services/web-apps/mattermost.nix
@@ -10,12 +10,14 @@ let
     (readFile "${pkgs.mattermost}/config/config.json")
   );
 
+  database = "postgres://${cfg.localDatabaseUser}:${cfg.localDatabasePassword}@localhost:5432/${cfg.localDatabaseName}?sslmode=disable&connect_timeout=10";
+
   mattermostConf = foldl recursiveUpdate defaultConfig
     [ { ServiceSettings.SiteURL = cfg.siteUrl;
         ServiceSettings.ListenAddress = cfg.listenAddress;
         TeamSettings.SiteName = cfg.siteName;
         SqlSettings.DriverName = "postgres";
-        SqlSettings.DataSource = "postgres://${cfg.localDatabaseUser}:${cfg.localDatabasePassword}@localhost:5432/${cfg.localDatabaseName}?sslmode=disable&connect_timeout=10";
+        SqlSettings.DataSource = database;
       }
       cfg.extraConfig
     ];
@@ -177,7 +179,9 @@ in
           mkdir -p ${cfg.statePath}/{data,config,logs}
           ln -sf ${pkgs.mattermost}/{bin,fonts,i18n,templates,client} ${cfg.statePath}
         '' + lib.optionalString (!cfg.mutableConfig) ''
-          ln -sf ${mattermostConfJSON} ${cfg.statePath}/config/config.json
+          rm -f ${cfg.statePath}/config/config.json
+          cp ${mattermostConfJSON} ${cfg.statePath}/config/config.json
+          ${pkgs.mattermost}/bin/mattermost config migrate ${cfg.statePath}/config/config.json ${database}
         '' + lib.optionalString cfg.mutableConfig ''
           if ! test -e "${cfg.statePath}/config/.initial-created"; then
             rm -f ${cfg.statePath}/config/config.json
@@ -203,7 +207,8 @@ in
           PermissionsStartOnly = true;
           User = cfg.user;
           Group = cfg.group;
-          ExecStart = "${pkgs.mattermost}/bin/mattermost";
+          ExecStart = "${pkgs.mattermost}/bin/mattermost" +
+            (lib.optionalString (!cfg.mutableConfig) " -c ${database}");
           WorkingDirectory = "${cfg.statePath}";
           Restart = "always";
           RestartSec = "10";
@@ -229,4 +234,3 @@ in
     })
   ];
 }
-

From afa0e02d64b15707262f13a348b33dad735bd80f Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Wed, 18 Sep 2019 17:34:02 +0900
Subject: [PATCH 0018/4636] lib.kernel: make public

Remove the "version" parameter in order to make it more widely
available.
Starts making some kernel configuration helpers available.
The intent is to be able to better build and check the linux kernel
configuration.
---
 lib/default.nix                                   | 3 +++
 lib/kernel.nix                                    | 7 +------
 pkgs/os-specific/linux/kernel/common-config.nix   | 9 +++++++--
 pkgs/os-specific/linux/kernel/hardened-config.nix | 3 +--
 pkgs/os-specific/linux/kernel/mptcp-config.nix    | 2 +-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/default.nix b/lib/default.nix
index 18d2dfae1e18..efa47a67f966 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -52,6 +52,9 @@ let
     # back-compat aliases
     platforms = systems.doubles;
 
+    # linux kernel configuration
+    kernel = callLibs ./kernel.nix;
+
     inherit (builtins) add addErrorContext attrNames concatLists
       deepSeq elem elemAt filter genericClosure genList getAttr
       hasAttr head isAttrs isBool isInt isList isString length
diff --git a/lib/kernel.nix b/lib/kernel.nix
index 36ea30838289..bfadf148be25 100644
--- a/lib/kernel.nix
+++ b/lib/kernel.nix
@@ -1,12 +1,7 @@
-{ lib, version }:
+{ lib }:
 
 with lib;
 {
-  # Common patterns/legacy
-  whenAtLeast = ver: mkIf (versionAtLeast version ver);
-  whenOlder   = ver: mkIf (versionOlder version ver);
-  # range is (inclusive, exclusive)
-  whenBetween = verLow: verHigh: mkIf (versionAtLeast version verLow && versionOlder version verHigh);
 
 
   # Keeping these around in case we decide to change this horrible implementation :)
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 3b409f15abaa..d414a0842624 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -16,10 +16,15 @@
 }:
 
 with stdenv.lib;
-
-  with import ../../../../lib/kernel.nix { inherit (stdenv) lib; inherit version; };
+with stdenv.lib.kernel;
 
 let
+  # Common patterns/legacy
+  whenAtLeast = ver: mkIf (versionAtLeast version ver);
+  whenOlder   = ver: mkIf (versionOlder version ver);
+  # range is (inclusive, exclusive)
+  whenBetween = verLow: verHigh: mkIf (versionAtLeast version verLow && versionOlder version verHigh);
+
 
   # configuration items have to be part of a subattrs
   flattenKConf =  nested: mapAttrs (_: head) (zipAttrs (attrValues nested));
diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix
index 156a4cf44234..b72994d6dd6e 100644
--- a/pkgs/os-specific/linux/kernel/hardened-config.nix
+++ b/pkgs/os-specific/linux/kernel/hardened-config.nix
@@ -11,8 +11,7 @@
 { stdenv, version }:
 
 with stdenv.lib;
-with import ../../../../lib/kernel.nix { inherit (stdenv) lib; inherit version; };
-
+with stdenv.lib.kernel;
 assert (versionAtLeast version "4.9");
 
 optionalAttrs (stdenv.hostPlatform.platform.kernelArch == "x86_64") {
diff --git a/pkgs/os-specific/linux/kernel/mptcp-config.nix b/pkgs/os-specific/linux/kernel/mptcp-config.nix
index e5e3ee283fff..9752e63d9f94 100644
--- a/pkgs/os-specific/linux/kernel/mptcp-config.nix
+++ b/pkgs/os-specific/linux/kernel/mptcp-config.nix
@@ -1,5 +1,5 @@
 { stdenv }:
-with import ../../../../lib/kernel.nix { inherit (stdenv) lib; version = null; };
+with stdenv.lib.kernel;
 {
     # DRM_AMDGPU = yes;
 

From a4fe469d39bdb9a91f9f6c8bbbac15fd836b66ce Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Thu, 19 Sep 2019 20:12:35 +0900
Subject: [PATCH 0019/4636] lib.kernel: scoped whenXXX helpers

whenAtLeast/whenBetween are made available in lib/kernel.nix but are now
scoped under whenXXX.
---
 lib/kernel.nix                                    | 10 ++++++++++
 pkgs/os-specific/linux/kernel/common-config.nix   |  6 +-----
 pkgs/os-specific/linux/kernel/hardened-config.nix |  2 ++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/kernel.nix b/lib/kernel.nix
index bfadf148be25..2ce19f8cb68c 100644
--- a/lib/kernel.nix
+++ b/lib/kernel.nix
@@ -13,4 +13,14 @@ with lib;
   module   = { tristate    = "m"; };
   freeform = x: { freeform = x; };
 
+  /*
+    Common patterns/legacy used in common-config/hardened-config.nix
+   */
+  whenHelpers = version: {
+    whenAtLeast = ver: mkIf (versionAtLeast version ver);
+    whenOlder   = ver: mkIf (versionOlder version ver);
+    # range is (inclusive, exclusive)
+    whenBetween = verLow: verHigh: mkIf (versionAtLeast version verLow && versionOlder version verHigh);
+  };
+
 }
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index d414a0842624..126e534520ce 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -17,13 +17,9 @@
 
 with stdenv.lib;
 with stdenv.lib.kernel;
+with (stdenv.lib.kernel.whenHelpers version);
 
 let
-  # Common patterns/legacy
-  whenAtLeast = ver: mkIf (versionAtLeast version ver);
-  whenOlder   = ver: mkIf (versionOlder version ver);
-  # range is (inclusive, exclusive)
-  whenBetween = verLow: verHigh: mkIf (versionAtLeast version verLow && versionOlder version verHigh);
 
 
   # configuration items have to be part of a subattrs
diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix
index b72994d6dd6e..b28ce770f7a9 100644
--- a/pkgs/os-specific/linux/kernel/hardened-config.nix
+++ b/pkgs/os-specific/linux/kernel/hardened-config.nix
@@ -12,6 +12,8 @@
 
 with stdenv.lib;
 with stdenv.lib.kernel;
+with (stdenv.lib.kernel.whenHelpers version);
+
 assert (versionAtLeast version "4.9");
 
 optionalAttrs (stdenv.hostPlatform.platform.kernelArch == "x86_64") {

From 89f5dc24ed9b6aa15d8314b592184399081844ba Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Tue, 8 Oct 2019 19:01:14 +0200
Subject: [PATCH 0020/4636] nixos/mullvad-vpn: add service

mullvad-vpn package is mostly useless without it.
---
 nixos/modules/module-list.nix                 |  1 +
 .../services/networking/mullvad-vpn.nix       | 43 +++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 nixos/modules/services/networking/mullvad-vpn.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6829a4e25788..378095f5b762 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -636,6 +636,7 @@
   ./services/networking/miredo.nix
   ./services/networking/mstpd.nix
   ./services/networking/mtprotoproxy.nix
+  ./services/networking/mullvad-vpn.nix
   ./services/networking/murmur.nix
   ./services/networking/mxisd.nix
   ./services/networking/namecoind.nix
diff --git a/nixos/modules/services/networking/mullvad-vpn.nix b/nixos/modules/services/networking/mullvad-vpn.nix
new file mode 100644
index 000000000000..cc98414257ca
--- /dev/null
+++ b/nixos/modules/services/networking/mullvad-vpn.nix
@@ -0,0 +1,43 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.services.mullvad-vpn;
+in
+with lib;
+{
+  options.services.mullvad-vpn.enable = mkOption {
+    type = types.bool;
+    default = false;
+    description = ''
+      This option enables Mullvad VPN daemon.
+    '';
+  };
+
+  config = mkIf cfg.enable {
+    boot.kernelModules = [ "tun" ];
+
+    systemd.services.mullvad-daemon = {
+      description = "Mullvad VPN daemon";
+      wantedBy = [ "multi-user.target" ];
+      wants = [ "network.target" ];
+      after = [
+        "network-online.target"
+        "NetworkManager.service"
+        "systemd-resolved.service"
+      ];
+      path = [
+        pkgs.iproute
+        # Needed for ping
+        "/run/wrappers"
+      ];
+      serviceConfig = {
+        StartLimitBurst = 5;
+        StartLimitIntervalSec = 20;
+        ExecStart = "${pkgs.mullvad-vpn}/bin/mullvad-daemon -v --disable-stdout-timestamps";
+        Restart = "always";
+        RestartSec = 1;
+      };
+    };
+  };
+
+  meta.maintainers = [ maintainers.xfix ];
+}

From 34b4babed2898068e0bc173d27931d5e20358a61 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 11 Oct 2019 23:00:01 -0400
Subject: [PATCH 0021/4636] adoptopenjdk-bin: add OpenJDK 13

---
 .../adoptopenjdk-bin/generate-sources.py      |   2 +-
 .../adoptopenjdk-bin/jdk13-darwin.nix         |   9 +
 .../adoptopenjdk-bin/jdk13-linux.nix          |   9 +
 .../compilers/adoptopenjdk-bin/sources.json   | 174 ++++++++++++++++--
 pkgs/top-level/all-packages.nix               |  18 ++
 5 files changed, 195 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix
 create mode 100644 pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix

diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
index 22a3c9cf4686..a7782610afb3 100755
--- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
+++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
@@ -6,7 +6,7 @@ import re
 import requests
 import sys
 
-releases = ("openjdk8", "openjdk11")
+releases = ("openjdk8", "openjdk11", "openjdk13")
 oses = ("mac", "linux")
 types = ("jre", "jdk")
 impls = ("hotspot", "openj9")
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix
new file mode 100644
index 000000000000..48806143c87c
--- /dev/null
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix
@@ -0,0 +1,9 @@
+let
+  sources = builtins.fromJSON (builtins.readFile ./sources.json);
+in
+{
+  jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk13.mac.jdk.hotspot;
+  jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk13.mac.jre.hotspot;
+  jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk13.mac.jdk.openj9;
+  jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk13.mac.jre.openj9;
+}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix
new file mode 100644
index 000000000000..1bd7bb884481
--- /dev/null
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix
@@ -0,0 +1,9 @@
+let
+  sources = builtins.fromJSON (builtins.readFile ./sources.json);
+in
+{
+  jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk13.linux.jdk.hotspot;
+  jre-hotspot = import ./jdk-linux-base.nix sources.openjdk13.linux.jre.hotspot;
+  jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk13.linux.jdk.openj9;
+  jre-openj9 = import ./jdk-linux-base.nix sources.openjdk13.linux.jre.openj9;
+}
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json
index 403bd96efb0e..218ed5bad46a 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json
+++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json
@@ -10,16 +10,16 @@
             "version": "11.0.4"
           },
           "armv6l": {
-            "build": "7",
-            "sha256": "3fbe418368e6d5888d0f15c4751139eb60d9785b864158a001386537fa46f67e",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.3_7.tar.gz",
-            "version": "11.0.3"
+            "build": "11",
+            "sha256": "19f16c4b905055a13457d06ce9a107a54289d3828bf3ae378efc6deb908a5572",
+            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_arm_linux_hotspot_11.0.4_11.tar.gz",
+            "version": "11.0.4"
           },
           "armv7l": {
-            "build": "7",
-            "sha256": "3fbe418368e6d5888d0f15c4751139eb60d9785b864158a001386537fa46f67e",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.3%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.3_7.tar.gz",
-            "version": "11.0.3"
+            "build": "11",
+            "sha256": "19f16c4b905055a13457d06ce9a107a54289d3828bf3ae378efc6deb908a5572",
+            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_arm_linux_hotspot_11.0.4_11.tar.gz",
+            "version": "11.0.4"
           },
           "packageType": "jdk",
           "vmType": "hotspot",
@@ -77,8 +77,8 @@
           "vmType": "hotspot",
           "x86_64": {
             "build": "11",
-            "sha256": "a50b211f475b9497311c9b65594764d7b852b1653f249582bb20fc3c302846a5",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_x64_mac_hotspot_11.0.4_11.tar.gz",
+            "sha256": "0bf5a0572877ca628fb37c54c17ce5f3aad18d64bb999eff93e11875a603b1e3",
+            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11.4/OpenJDK11U-jdk_x64_mac_hotspot_11.0.4_11.tar.gz",
             "version": "11.0.4"
           }
         },
@@ -87,8 +87,8 @@
           "vmType": "openj9",
           "x86_64": {
             "build": "11",
-            "sha256": "7c09678d9c2d9dd0366693c6ab27bed39c76a23e7ac69b8a25c794e99dcf3ba7",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11_openj9-0.15.1/OpenJDK11U-jdk_x64_mac_openj9_11.0.4_11_openj9-0.15.1.tar.gz",
+            "sha256": "6c0c0f364b9eaf285d7ee9236135648ca9fc6889cb0486ce99f827bcdc21f941",
+            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11.4_openj9-0.15.1/OpenJDK11U-jdk_x64_mac_openj9_11.0.4_11_openj9-0.15.1.tar.gz",
             "version": "11.0.4"
           }
         }
@@ -99,8 +99,8 @@
           "vmType": "hotspot",
           "x86_64": {
             "build": "11",
-            "sha256": "1647fded28d25e562811f7bce2092eb9c21d30608843b04250c023b40604ff26",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jre_x64_mac_hotspot_11.0.4_11.tar.gz",
+            "sha256": "800c421391e399518f6787a0b7a407c3b8efdfb73238dbd31c87bca5d899efec",
+            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11.4/OpenJDK11U-jre_x64_mac_hotspot_11.0.4_11.tar.gz",
             "version": "11.0.4"
           }
         },
@@ -109,14 +109,132 @@
           "vmType": "openj9",
           "x86_64": {
             "build": "11",
-            "sha256": "1a8e84bae517a848aa5f25c7b04f26ab3a3bfffaa7fdf9be24e1f83325e46766",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11_openj9-0.15.1/OpenJDK11U-jre_x64_mac_openj9_11.0.4_11_openj9-0.15.1.tar.gz",
+            "sha256": "d554d407f14d40056caf6474901eebfbe940296dd943afd05e6719b1bd15624f",
+            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11.4_openj9-0.15.1/OpenJDK11U-jre_x64_mac_openj9_11.0.4_11_openj9-0.15.1.tar.gz",
             "version": "11.0.4"
           }
         }
       }
     }
   },
+  "openjdk13": {
+    "linux": {
+      "jdk": {
+        "hotspot": {
+          "aarch64": {
+            "build": "33",
+            "sha256": "74f4110333ac4239564ed864b1d7d69b7af32af39efcfbde9816e1486cb5ae07",
+            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_aarch64_linux_hotspot_13_33.tar.gz",
+            "version": "13.0.0"
+          },
+          "armv6l": {
+            "build": "33",
+            "sha256": "477e1b8d26a220d6d570765e9e0a4a34dbb489fab63a420d0859d173efc59adb",
+            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_arm_linux_hotspot_13_33.tar.gz",
+            "version": "13.0.0"
+          },
+          "armv7l": {
+            "build": "33",
+            "sha256": "477e1b8d26a220d6d570765e9e0a4a34dbb489fab63a420d0859d173efc59adb",
+            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_arm_linux_hotspot_13_33.tar.gz",
+            "version": "13.0.0"
+          },
+          "packageType": "jdk",
+          "vmType": "hotspot",
+          "x86_64": {
+            "build": "33",
+            "sha256": "e562caeffa89c834a69a44242d802eae3523875e427f07c05b1902c152638368",
+            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_x64_linux_hotspot_13_33.tar.gz",
+            "version": "13.0.0"
+          }
+        },
+        "openj9": {
+          "packageType": "jdk",
+          "vmType": "openj9",
+          "x86_64": {
+            "build": "33",
+            "sha256": "68ebab0021c719694be8fc868478725a69c5c515cdb62e2933eefe87ba6437df",
+            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33_openj9-0.16.0/OpenJDK13U-jdk_x64_linux_openj9_13_33_openj9-0.16.0.tar.gz",
+            "version": "13.0.0"
+          }
+        }
+      },
+      "jre": {
+        "hotspot": {
+          "aarch64": {
+            "build": "33",
+            "sha256": "2365b7fbba8d9125fb091933aad9f38f8cc1fbb0217cdec9ec75d2000f6d451a",
+            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jre_aarch64_linux_hotspot_13_33.tar.gz",
+            "version": "13.0.0"
+          },
+          "packageType": "jre",
+          "vmType": "hotspot",
+          "x86_64": {
+            "build": "33",
+            "sha256": "73800a0d7c4e81df408a8518d282aa2c001ce4ee15541574c639dfc3564f708f",
+            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jre_x64_linux_hotspot_13_33.tar.gz",
+            "version": "13.0.0"
+          }
+        },
+        "openj9": {
+          "packageType": "jre",
+          "vmType": "openj9",
+          "x86_64": {
+            "build": "33",
+            "sha256": "2ee59be5062a81daa7be85be161cab6b245f9a2e2cbd4769ae9edefaac41e31d",
+            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33_openj9-0.16.0/OpenJDK13U-jre_x64_linux_openj9_13_33_openj9-0.16.0.tar.gz",
+            "version": "13.0.0"
+          }
+        }
+      }
+    },
+    "mac": {
+      "jdk": {
+        "hotspot": {
+          "packageType": "jdk",
+          "vmType": "hotspot",
+          "x86_64": {
+            "build": "33",
+            "sha256": "f948be96daba250b6695e22cb51372d2ba3060e4d778dd09c89548889783099f",
+            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_x64_mac_hotspot_13_33.tar.gz",
+            "version": "13.0.0"
+          }
+        },
+        "openj9": {
+          "packageType": "jdk",
+          "vmType": "openj9",
+          "x86_64": {
+            "build": "33",
+            "sha256": "583e0defd5c062550896ead7cac383be16f1a81d9b6492dfec26da9af5dcc1c0",
+            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33_openj9-0.16.0/OpenJDK13U-jdk_x64_mac_openj9_13_33_openj9-0.16.0.tar.gz",
+            "version": "13.0.0"
+          }
+        }
+      },
+      "jre": {
+        "hotspot": {
+          "packageType": "jre",
+          "vmType": "hotspot",
+          "x86_64": {
+            "build": "33",
+            "sha256": "1c23efba7908de9a611a98e755602f45381a8f7c957adb3fc4012ab1369a352c",
+            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jre_x64_mac_hotspot_13_33.tar.gz",
+            "version": "13.0.0"
+          }
+        },
+        "openj9": {
+          "packageType": "jre",
+          "vmType": "openj9",
+          "x86_64": {
+            "build": "33",
+            "sha256": "33a60b78138d50cb02325156c7d1fcf588697749a4401f6c11a3cbefa3033127",
+            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33_openj9-0.16.0/OpenJDK13U-jre_x64_mac_openj9_13_33_openj9-0.16.0.tar.gz",
+            "version": "13.0.0"
+          }
+        }
+      }
+    }
+  },
   "openjdk8": {
     "linux": {
       "jdk": {
@@ -127,6 +245,18 @@
             "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u222b10.tar.gz",
             "version": "8.0.222"
           },
+          "armv6l": {
+            "build": "10",
+            "sha256": "7b3d6ade8c25adca01095ba66642132d8c87a1a8caf3883850e34778453afcec",
+            "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u222b10.tar.gz",
+            "version": "8.0.222"
+          },
+          "armv7l": {
+            "build": "10",
+            "sha256": "7b3d6ade8c25adca01095ba66642132d8c87a1a8caf3883850e34778453afcec",
+            "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u222b10.tar.gz",
+            "version": "8.0.222"
+          },
           "packageType": "jdk",
           "vmType": "hotspot",
           "x86_64": {
@@ -155,6 +285,18 @@
             "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_aarch64_linux_hotspot_8u222b10.tar.gz",
             "version": "8.0.222"
           },
+          "armv6l": {
+            "build": "10",
+            "sha256": "19de77b74812b90851816bdb991d6473488a10d3ac293c6accf46ae9b1f714a0",
+            "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_arm_linux_hotspot_8u222b10.tar.gz",
+            "version": "8.0.222"
+          },
+          "armv7l": {
+            "build": "10",
+            "sha256": "19de77b74812b90851816bdb991d6473488a10d3ac293c6accf46ae9b1f714a0",
+            "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10/OpenJDK8U-jre_arm_linux_hotspot_8u222b10.tar.gz",
+            "version": "8.0.222"
+          },
           "packageType": "jre",
           "vmType": "hotspot",
           "x86_64": {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f805f58c6dce..f6e3f63a4512 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7391,6 +7391,24 @@ in
 
   abcl = callPackage ../development/compilers/abcl {};
 
+  adoptopenjdk-bin-13-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk13-linux.nix;
+  adoptopenjdk-bin-13-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk13-darwin.nix;
+
+  adoptopenjdk-hotspot-bin-13 = if stdenv.isLinux
+    then callPackage adoptopenjdk-bin-13-packages-linux.jdk-hotspot {}
+    else callPackage adoptopenjdk-bin-13-packages-darwin.jdk-hotspot {};
+  adoptopenjdk-jre-hotspot-bin-13 = if stdenv.isLinux
+    then callPackage adoptopenjdk-bin-13-packages-linux.jre-hotspot {}
+    else callPackage adoptopenjdk-bin-13-packages-darwin.jre-hotspot {};
+
+  adoptopenjdk-openj9-bin-13 = if stdenv.isLinux
+    then callPackage adoptopenjdk-bin-13-packages-linux.jdk-openj9 {}
+    else callPackage adoptopenjdk-bin-13-packages-darwin.jdk-openj9 {};
+
+  adoptopenjdk-jre-openj9-bin-13 = if stdenv.isLinux
+    then callPackage adoptopenjdk-bin-13-packages-linux.jre-openj9 {}
+    else callPackage adoptopenjdk-bin-13-packages-darwin.jre-openj9 {};
+
   adoptopenjdk-bin-11-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk11-linux.nix;
   adoptopenjdk-bin-11-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk11-darwin.nix;
 

From d9d5b737ee41832a859014a74f632dd430a6f5b6 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 11 Oct 2019 23:22:18 -0400
Subject: [PATCH 0022/4636] adoptopenjdk-bin: fix JDK 8 build on ARM

---
 pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
index 509050209fb2..8e133347dabc 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
@@ -9,6 +9,7 @@ sourcePerArch:
 , fontconfig
 , zlib
 , xorg
+, libffi
 }:
 
 let
@@ -29,7 +30,7 @@ let result = stdenv.mkDerivation rec {
   buildInputs = [
     alsaLib freetype fontconfig zlib xorg.libX11 xorg.libXext xorg.libXtst
     xorg.libXi xorg.libXrender
-  ];
+  ] ++ lib.optional stdenv.isAarch32 libffi;
 
   nativeBuildInputs = [ autoPatchelfHook ];
 

From a0b154765dbb9aa8a7cb91e78ee7f1ecd6d37134 Mon Sep 17 00:00:00 2001
From: Troels Henriksen <athas@sigkill.dk>
Date: Sun, 9 Jun 2019 13:51:48 +0200
Subject: [PATCH 0023/4636] libclc: 2017-11-29 -> 2019-06-09

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

diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix
index 119adcb4ef2b..4cea2df7816b 100644
--- a/pkgs/development/libraries/libclc/default.nix
+++ b/pkgs/development/libraries/libclc/default.nix
@@ -3,23 +3,24 @@
 let
   llvm = llvmPackages.llvm;
   clang = llvmPackages.clang;
+  clang-unwrapped = llvmPackages.clang-unwrapped;
 in
 
 stdenv.mkDerivation {
-  name = "libclc-2017-11-29";
+  name = "libclc-2019-06-09";
 
   src = fetchFromGitHub {
     owner = "llvm-mirror";
     repo = "libclc";
-    rev = "d6384415ab854c68777dd77451aa2bc0d959da99";
-    sha256 = "10fqrlnqlknh58x7pfsbg9r07fblfg2mgq2m4fr1jbb836ncn3wh";
+    rev = "9f6204ec04a8cadb6bef57caa71e3161c4f398f2";
+    sha256 = "03l9frx3iw3qdsb9rrscgzdwm6872gv6mkssvn027ndf9y321xk7";
   };
 
   nativeBuildInputs = [ python ];
-  buildInputs = [ llvm clang ];
+  buildInputs = [ llvm clang clang-unwrapped ];
 
   postPatch = ''
-    sed -i 's,llvm_clang =.*,llvm_clang = "${clang}/bin/clang",' configure.py
+    sed -i 's,llvm_clang =.*,llvm_clang = "${clang-unwrapped}/bin/clang",' configure.py
     sed -i 's,cxx_compiler =.*,cxx_compiler = "${clang}/bin/clang++",' configure.py
   '';
 
@@ -32,6 +33,5 @@ stdenv.mkDerivation {
     description = "Implementation of the library requirements of the OpenCL C programming language";
     license = licenses.mit;
     platforms = platforms.all;
-    broken = true;
   };
 }

From bb24fafbfad04cd23431de14176cdc581a906f66 Mon Sep 17 00:00:00 2001
From: hyperfekt <git@hyperfekt.net>
Date: Wed, 16 Oct 2019 21:52:31 +0200
Subject: [PATCH 0024/4636] vscode-with-extensions: fix insiders build

Extensions are no longer unwrapped to the /share directory so the
extensions' derivations do not have to know about VSCode's package name.
---
 pkgs/applications/editors/vscode/with-extensions.nix |  4 ++--
 pkgs/misc/vscode-extensions/vscode-utils.nix         | 10 +++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/applications/editors/vscode/with-extensions.nix
index 074e6b8b12d5..5dcd1f6fb783 100644
--- a/pkgs/applications/editors/vscode/with-extensions.nix
+++ b/pkgs/applications/editors/vscode/with-extensions.nix
@@ -48,7 +48,7 @@ let
   wrappedPkgName = lib.removeSuffix "-${wrappedPkgVersion}" vscode.name;
 
   combinedExtensionsDrv = buildEnv {
-    name = "${wrappedPkgName}-extensions-${wrappedPkgVersion}";
+    name = "vscode-extensions";
     paths = vscodeExtensions;
   };
 
@@ -70,6 +70,6 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" {
   ln -sT "${vscode}/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop"
   ln -sT "${vscode}/share/applications/${executableName}-url-handler.desktop" "$out/share/applications/${executableName}-url-handler.desktop"
   makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" ${lib.optionalString (vscodeExtensions != []) ''
-    --add-flags "--extensions-dir ${combinedExtensionsDrv}/share/${wrappedPkgName}/extensions"
+    --add-flags "--extensions-dir ${combinedExtensionsDrv}"
   ''}
 ''
diff --git a/pkgs/misc/vscode-extensions/vscode-utils.nix b/pkgs/misc/vscode-extensions/vscode-utils.nix
index 2216e4258973..df8f24fcce73 100644
--- a/pkgs/misc/vscode-extensions/vscode-utils.nix
+++ b/pkgs/misc/vscode-extensions/vscode-utils.nix
@@ -1,9 +1,6 @@
-{ stdenv, lib, fetchurl, vscode, unzip }:
+{ stdenv, lib, fetchurl, unzip }:
 
 let
-  extendedPkgVersion = lib.getVersion vscode;
-  extendedPkgName = lib.removeSuffix "-${extendedPkgVersion}" vscode.name;
-
   mktplcExtRefToFetchArgs = ext: {
     url = "https://${ext.publisher}.gallery.vsassets.io/_apis/public/gallery/publisher/${ext.publisher}/extension/${ext.name}/${ext.version}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage";
     sha256 = ext.sha256;
@@ -14,7 +11,6 @@ let
 
   buildVscodeExtension = a@{
     name,
-    namePrefix ? "${extendedPkgName}-extension-",
     src,
     # Same as "Unique Identifier" on the extension's web page.
     # For the moment, only serve as unique extension dir.
@@ -28,12 +24,12 @@ let
   }:
   stdenv.mkDerivation ((removeAttrs a [ "vscodeExtUniqueId" ]) //  {
 
-    name = namePrefix + name;
+    name = "vscode-extension-${name}";
 
     inherit vscodeExtUniqueId;
     inherit configurePhase buildPhase dontPatchELF dontStrip;
 
-    installPrefix = "share/${extendedPkgName}/extensions/${vscodeExtUniqueId}";
+    installPrefix = "${vscodeExtUniqueId}";
 
     buildInputs = [ unzip ] ++ buildInputs;
 

From d00559ebb84af84b48a207a5a0a0762ce9d577eb Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Wed, 9 Oct 2019 08:02:18 -0400
Subject: [PATCH 0025/4636] openjdk: 12.0.2 -> 13.0.1

---
 pkgs/development/compilers/openjdk/12.nix     | 155 ++++++++++++++++++
 .../compilers/openjdk/darwin/default.nix      |   4 +-
 .../development/compilers/openjdk/default.nix |  22 +--
 .../openjdk/increase-javadoc-heap-jdk13.patch |  12 ++
 .../compilers/openjdk/openjfx/11.nix          |   3 +
 .../openjdk/openjfx/{12.nix => 13.nix}        |  16 +-
 .../openjfx/openjfx-mesa-license.patch        |  17 ++
 .../openjdk/swing-use-gtk-jdk13.patch         |  22 +++
 pkgs/top-level/all-packages.nix               |  28 +++-
 9 files changed, 253 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/development/compilers/openjdk/12.nix
 create mode 100644 pkgs/development/compilers/openjdk/increase-javadoc-heap-jdk13.patch
 rename pkgs/development/compilers/openjdk/openjfx/{12.nix => 13.nix} (83%)
 create mode 100644 pkgs/development/compilers/openjdk/openjfx/openjfx-mesa-license.patch
 create mode 100644 pkgs/development/compilers/openjdk/swing-use-gtk-jdk13.patch

diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix
new file mode 100644
index 000000000000..094bd57e6e98
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/12.nix
@@ -0,0 +1,155 @@
+{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip
+, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
+, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
+, libXcursor, libXrandr, fontconfig, openjdk11
+, setJavaClassPath
+, headless ? false
+, enableJavaFX ? openjfx.meta.available, openjfx
+, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
+}:
+
+let
+  major = "12";
+  update = ".0.2";
+  build = "ga";
+
+  openjdk = stdenv.mkDerivation rec {
+    pname = "openjdk" + lib.optionalString headless "-headless";
+    version = "${major}${update}-${build}";
+
+    src = fetchurl {
+      url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
+      sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7";
+    };
+
+    nativeBuildInputs = [ pkgconfig autoconf ];
+    buildInputs = [
+      cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
+      libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
+      libXi libXinerama libXcursor libXrandr fontconfig openjdk11
+    ] ++ lib.optionals (!headless && enableGnome2) [
+      gtk3 gnome_vfs GConf glib
+    ];
+
+    patches = [
+      ./fix-java-home-jdk10.patch
+      ./read-truststore-from-env-jdk10.patch
+      ./currency-date-range-jdk10.patch
+      ./increase-javadoc-heap.patch
+      # -Wformat etc. are stricter in newer gccs, per
+      # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677
+      # so grab the work-around from
+      # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24
+      (fetchurl {
+        url = https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch;
+        sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
+      })
+    ] ++ lib.optionals (!headless && enableGnome2) [
+      ./swing-use-gtk-jdk10.patch
+    ];
+
+    prePatch = ''
+      chmod +x configure
+      patchShebangs --build configure
+    '';
+
+    configureFlags = [
+      "--with-boot-jdk=${openjdk11.home}"
+      "--enable-unlimited-crypto"
+      "--with-native-debug-symbols=internal"
+      "--with-libjpeg=system"
+      "--with-giflib=system"
+      "--with-libpng=system"
+      "--with-zlib=system"
+      "--with-lcms=system"
+      "--with-stdc++lib=dynamic"
+    ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc"
+      ++ lib.optional headless "--enable-headless-only"
+      ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
+
+    separateDebugInfo = true;
+
+    NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
+
+    NIX_LDFLAGS = lib.optionals (!headless) [
+      "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
+    ] ++ lib.optionals (!headless && enableGnome2) [
+      "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
+    ];
+
+    buildFlags = [ "all" ];
+
+    installPhase = ''
+      mkdir -p $out/lib
+
+      mv build/*/images/jdk $out/lib/openjdk
+
+      # Remove some broken manpages.
+      rm -rf $out/lib/openjdk/man/ja*
+
+      # Mirror some stuff in top-level.
+      mkdir -p $out/share
+      ln -s $out/lib/openjdk/include $out/include
+      ln -s $out/lib/openjdk/man $out/share/man
+
+      # jni.h expects jni_md.h to be in the header search path.
+      ln -s $out/include/linux/*_md.h $out/include/
+
+      # Remove crap from the installation.
+      rm -rf $out/lib/openjdk/demo
+      ${lib.optionalString headless ''
+        rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
+      ''}
+
+      ln -s $out/lib/openjdk/bin $out/bin
+    '';
+
+    preFixup = ''
+      # Propagate the setJavaClassPath setup hook so that any package
+      # that depends on the JDK has $CLASSPATH set up properly.
+      mkdir -p $out/nix-support
+      #TODO or printWords?  cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
+      echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
+
+      # Set JAVA_HOME automatically.
+      mkdir -p $out/nix-support
+      cat <<EOF > $out/nix-support/setup-hook
+      if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/openjdk; fi
+      EOF
+    '';
+
+    postFixup = ''
+      # Build the set of output library directories to rpath against
+      LIBDIRS=""
+      for output in $outputs; do
+        if [ "$output" = debug ]; then continue; fi
+        LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
+      done
+      # Add the local library paths to remove dependencies on the bootstrap
+      for output in $outputs; do
+        if [ "$output" = debug ]; then continue; fi
+        OUTPUTDIR=$(eval echo \$$output)
+        BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
+        echo "$BINLIBS" | while read i; do
+          patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
+          patchelf --shrink-rpath "$i" || true
+        done
+      done
+    '';
+
+    disallowedReferences = [ openjdk11 ];
+
+    meta = with stdenv.lib; {
+      homepage = http://openjdk.java.net/;
+      license = licenses.gpl2;
+      description = "The open-source Java Development Kit";
+      maintainers = with maintainers; [ edwtjo ];
+      platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
+    };
+
+    passthru = {
+      architecture = "";
+      home = "${openjdk}/lib/openjdk";
+    };
+  };
+in openjdk
diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix
index 58e4ba990149..d080bcf38297 100644
--- a/pkgs/development/compilers/openjdk/darwin/default.nix
+++ b/pkgs/development/compilers/openjdk/darwin/default.nix
@@ -7,11 +7,11 @@ let
   };
 
   jdk = stdenv.mkDerivation rec {
-    name = "zulu12.1.3-ca-jdk12";
+    name = "zulu13.28.11-ca-jdk13.0.1";
 
     src = fetchurl {
       url = "https://cdn.azul.com/zulu/bin/${name}-macosx_x64.tar.gz";
-      sha256 = "05q3v4vwjd7xhqr21bzlip5x4xhq5rpdshfpb8i86n4zvn7l0mxy";
+      sha256 = "0j148gq7vwhda6y9sazy0qg6ka7milywrdhbvmd31a1xp303r37b";
       curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";
     };
 
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 094bd57e6e98..616d946ef663 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip
 , zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
 , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
-, libXcursor, libXrandr, fontconfig, openjdk11
+, libXcursor, libXrandr, fontconfig, openjdk13-bootstrap
 , setJavaClassPath
 , headless ? false
 , enableJavaFX ? openjfx.meta.available, openjfx
@@ -9,24 +9,24 @@
 }:
 
 let
-  major = "12";
-  update = ".0.2";
-  build = "ga";
+  major = "13";
+  update = ".0.1";
+  build = "-ga";
 
   openjdk = stdenv.mkDerivation rec {
     pname = "openjdk" + lib.optionalString headless "-headless";
-    version = "${major}${update}-${build}";
+    version = "${major}${update}${build}";
 
     src = fetchurl {
       url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
-      sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7";
+      sha256 = "1pmgbzlr97ns9fvi3a193miziv5v8fvk9jgymspllsvmb6x9lppk";
     };
 
     nativeBuildInputs = [ pkgconfig autoconf ];
     buildInputs = [
       cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
-      libXi libXinerama libXcursor libXrandr fontconfig openjdk11
+      libXi libXinerama libXcursor libXrandr fontconfig openjdk13-bootstrap
     ] ++ lib.optionals (!headless && enableGnome2) [
       gtk3 gnome_vfs GConf glib
     ];
@@ -35,7 +35,7 @@ let
       ./fix-java-home-jdk10.patch
       ./read-truststore-from-env-jdk10.patch
       ./currency-date-range-jdk10.patch
-      ./increase-javadoc-heap.patch
+      ./increase-javadoc-heap-jdk13.patch
       # -Wformat etc. are stricter in newer gccs, per
       # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677
       # so grab the work-around from
@@ -45,7 +45,7 @@ let
         sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
       })
     ] ++ lib.optionals (!headless && enableGnome2) [
-      ./swing-use-gtk-jdk10.patch
+      ./swing-use-gtk-jdk13.patch
     ];
 
     prePatch = ''
@@ -54,7 +54,7 @@ let
     '';
 
     configureFlags = [
-      "--with-boot-jdk=${openjdk11.home}"
+      "--with-boot-jdk=${openjdk13-bootstrap.home}"
       "--enable-unlimited-crypto"
       "--with-native-debug-symbols=internal"
       "--with-libjpeg=system"
@@ -137,7 +137,7 @@ let
       done
     '';
 
-    disallowedReferences = [ openjdk11 ];
+    disallowedReferences = [ openjdk13-bootstrap ];
 
     meta = with stdenv.lib; {
       homepage = http://openjdk.java.net/;
diff --git a/pkgs/development/compilers/openjdk/increase-javadoc-heap-jdk13.patch b/pkgs/development/compilers/openjdk/increase-javadoc-heap-jdk13.patch
new file mode 100644
index 000000000000..6e48db6ac3b9
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/increase-javadoc-heap-jdk13.patch
@@ -0,0 +1,12 @@
+diff -uw -r a/make/Docs.gmk b/make/Docs.gmk
+--- a/make/Docs.gmk	2019-10-09 08:05:43.107349180 -0400
++++ b/make/Docs.gmk	2019-10-09 08:09:29.330118790 -0400
+@@ -277,7 +277,7 @@
+   $1_ALL_MODULES := $$(sort $$($1_MODULES) $$($1_INDIRECT_EXPORTS))
+ 
+   $1_JAVA_ARGS := -Dextlink.spec.version=$$(VERSION_SPECIFICATION) \
+-	-Djspec.version=$$(VERSION_SPECIFICATION)
++	-Djspec.version=$$(VERSION_SPECIFICATION) -Xmx1G
+ 
+   ifeq ($$(ENABLE_FULL_DOCS), true)
+     # Tell the ModuleGraph taglet to generate html links to soon-to-be-created
diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix
index 43fe8ed83876..a65aea642a4a 100644
--- a/pkgs/development/compilers/openjdk/openjfx/11.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/11.nix
@@ -29,6 +29,9 @@ let
       JDK_HOME = ${openjdk11-bootstrap.home}
     '' + args.gradleProperties or "");
 
+    #avoids errors about deprecation of GTypeDebugFlags, GTimeVal, etc.
+    NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
+
     buildPhase = ''
       runHook preBuild
 
diff --git a/pkgs/development/compilers/openjdk/openjfx/12.nix b/pkgs/development/compilers/openjdk/openjfx/13.nix
similarity index 83%
rename from pkgs/development/compilers/openjdk/openjfx/12.nix
rename to pkgs/development/compilers/openjdk/openjfx/13.nix
index 356ac4800d9f..4def48ac6473 100644
--- a/pkgs/development/compilers/openjdk/openjfx/12.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/13.nix
@@ -3,7 +3,7 @@
 , ffmpeg, python, ruby }:
 
 let
-  major = "12";
+  major = "13";
   update = "";
   build = "14";
   repover = "${major}${update}+${build}";
@@ -15,8 +15,8 @@ let
     version = "${major}${update}-${build}";
 
     src = fetchurl {
-      url = "https://hg.openjdk.java.net/openjfx/${major}/rt/archive/${repover}.tar.gz";
-      sha256 = "16jjfjkrg57wsj9mmm52i2kl3byz3ba1f9f8wwc8zwqm4cpjzliz";
+      url = "https://hg.openjdk.java.net/openjfx/${major}-dev/rt/archive/${repover}.tar.gz";
+      sha256 = "0nviv9fiwzp1z4gjbp8iz9mf601nadzcy0sx74f5y3v41a3l59qb";
     };
 
     buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ];
@@ -29,6 +29,9 @@ let
       JDK_HOME = ${openjdk11_headless.home}
     '' + args.gradleProperties or "");
 
+    #avoids errors about deprecation of GTypeDebugFlags, GTimeVal, etc.
+    NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ];
+
     buildPhase = ''
       runHook preBuild
 
@@ -59,8 +62,8 @@ let
     outputHashMode = "recursive";
     # Downloaded AWT jars differ by platform.
     outputHash = {
-      x86_64-linux = "1z5qar5l28ja4pkf5l5m48xbv3x1yrnilsv9lpf2j3vkdk9h1nci";
-      i686-linux = "0rbygvjc7w197fi5nxldqdrm6mpiyd3n45042g3gd4s5qk08spjd";
+      x86_64-linux = "077zss95iq6iskx7ghz1c57ymydpzj0wm7r1pkznw99l9xwvdmqi";
+      i686-linux = "03gglr2sh77cyg16qw9g45ji33dg7i93s5s30hz3mh420g112qa0";
     }.${stdenv.system} or (throw "Unsupported platform");
   };
 
@@ -72,6 +75,9 @@ in makePackage {
     COMPILE_WEBKIT = true
   '';
 
+  #openjdk build fails if licenses are identical, so we must patch this trivial difference
+  patches = [ ./openjfx-mesa-license.patch ];
+
   preBuild = ''
     swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)"
     substituteInPlace build.gradle \
diff --git a/pkgs/development/compilers/openjdk/openjfx/openjfx-mesa-license.patch b/pkgs/development/compilers/openjdk/openjfx/openjfx-mesa-license.patch
new file mode 100644
index 000000000000..d3bf9e17c22b
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/openjfx/openjfx-mesa-license.patch
@@ -0,0 +1,17 @@
+--- a/modules/javafx.graphics/src/main/legal/mesa3d.md	1969-12-31 19:00:01.000000000 -0500
++++ b/modules/javafx.graphics/src/main/legal/mesa3d.md	2019-08-08 01:05:04.000000000 -0400
+@@ -1,7 +1,7 @@
+ ## Mesa 3-D Graphics Library v5.0
+ 
+ ### Mesa License
+-```
++<pre>
+ 
+ Mesa 3-D graphics library
+ Version:  5.0
+@@ -25,4 +25,4 @@
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+-```
++</pre>
diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk-jdk13.patch b/pkgs/development/compilers/openjdk/swing-use-gtk-jdk13.patch
new file mode 100644
index 000000000000..8a1b9b6149bb
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/swing-use-gtk-jdk13.patch
@@ -0,0 +1,22 @@
+--- a/src/java.desktop/share/classes/javax/swing/UIManager.java	2019-08-08 01:05:04.000000000 -0400
++++ b/src/java.desktop/share/classes/javax/swing/UIManager.java	2019-10-09 08:20:31.791606748 -0400
+@@ -660,9 +660,8 @@
+             Toolkit toolkit = Toolkit.getDefaultToolkit();
+             if (toolkit instanceof SunToolkit) {
+                 SunToolkit suntk = (SunToolkit)toolkit;
+-                String desktop = suntk.getDesktop();
+                 boolean gtkAvailable = suntk.isNativeGTKAvailable();
+-                if ("gnome".equals(desktop) && gtkAvailable) {
++                if (gtkAvailable) {
+                     return "com.sun.java.swing.plaf.gtk.GTKLookAndFeel";
+                 }
+             }
+@@ -1397,7 +1396,7 @@
+             lafName = lafData.remove("defaultlaf");
+         }
+         if (lafName == null) {
+-            lafName = getCrossPlatformLookAndFeelClassName();
++            lafName = getSystemLookAndFeelClassName();
+         }
+         lafName = swingProps.getProperty(defaultLAFKey, lafName);
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f6e3f63a4512..ba71a1cee9ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8039,7 +8039,7 @@ in
 
   openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { };
 
-  openjfx12 = callPackage ../development/compilers/openjdk/openjfx/12.nix { };
+  openjfx13 = callPackage ../development/compilers/openjdk/openjfx/13.nix { };
 
   openjdk8-bootstrap =
     if adoptopenjdk-hotspot-bin-8.meta.available then
@@ -8084,21 +8084,33 @@ in
     else
       openjdk11.override { headless = true; };
 
+  openjdk13-bootstrap =
+    if adoptopenjdk-hotspot-bin-13.meta.available then
+      adoptopenjdk-hotspot-bin-13
+    else
+      /* adoptopenjdk not available for i686, so fall back to our old build of 12 for bootstrapping */
+      callPackage ../development/compilers/openjdk/12.nix {
+        openjfx = openjfx11; /* need this despite next line :-( */
+        enableJavaFX = false;
+        headless = true;
+        inherit (gnome2) GConf gnome_vfs;
+      };
+
   /* current JDK */
-  openjdk12 =
+  openjdk13 =
     if stdenv.isDarwin then
       callPackage ../development/compilers/openjdk/darwin { }
     else
       callPackage ../development/compilers/openjdk {
-        openjfx = openjfx12;
+        openjfx = openjfx13;
         inherit (gnome2) GConf gnome_vfs;
       };
 
-  openjdk12_headless =
+  openjdk13_headless =
     if stdenv.isDarwin then
-      openjdk12
+      openjdk13
     else
-      openjdk12.override { headless = true; };
+      openjdk13.override { headless = true; };
 
   openjdk = openjdk8;
   openjdk_headless = openjdk8_headless;
@@ -8110,8 +8122,8 @@ in
   jdk11 = openjdk11;
   jdk11_headless = openjdk11_headless;
 
-  jdk12 = openjdk12;
-  jdk12_headless = openjdk12_headless;
+  jdk13 = openjdk13;
+  jdk13_headless = openjdk13_headless;
 
   jdk = jdk8;
   jre = jre8;

From 1ae39fff83097252580272dd614963a63d534e0a Mon Sep 17 00:00:00 2001
From: tilpner <till@hoeppner.ws>
Date: Fri, 18 Oct 2019 12:46:29 +0200
Subject: [PATCH 0026/4636] nixos/cadvisor: don't enable docker

cadvisor has usecases that don't involve docker, and it's entirely
unexpected for a monitoring service to enable docker.
---
 nixos/modules/services/monitoring/cadvisor.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix
index 695a8c42e85e..655a6934a266 100644
--- a/nixos/modules/services/monitoring/cadvisor.nix
+++ b/nixos/modules/services/monitoring/cadvisor.nix
@@ -135,7 +135,6 @@ in {
 
         serviceConfig.TimeoutStartSec=300;
       };
-      virtualisation.docker.enable = mkDefault true;
     })
   ];
 }

From 5760002d95289474892a2fc015e7665648760284 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 21 Oct 2019 16:25:43 -0700
Subject: [PATCH 0027/4636] geos: 3.7.3 -> 3.8.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/geos/versions
---
 pkgs/development/libraries/geos/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix
index e7fce696894f..7135d6b3586a 100644
--- a/pkgs/development/libraries/geos/default.nix
+++ b/pkgs/development/libraries/geos/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
-  name = "geos-3.7.3";
+  name = "geos-3.8.0";
 
   src = fetchurl {
     url = "https://download.osgeo.org/geos/${name}.tar.bz2";
-    sha256 = "0znaby3fs3fy7af5njrnmjnfsa80ac97fvamlnjiywddw3j5l0q2";
+    sha256 = "1mb2v9fy1gnbjhcgv0xny11ggfb17vkzsajdyibigwsxr4ylq4cr";
   };
 
   enableParallelBuilding = true;

From fd38a119dfa0015b6f3a4522c280d5066268d542 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 6 Mar 2019 17:50:43 -0600
Subject: [PATCH 0028/4636] fx_cast_bridge: init at 0.0.3!

---
 pkgs/tools/misc/fx_cast/default.nix | 85 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 +
 2 files changed, 87 insertions(+)
 create mode 100644 pkgs/tools/misc/fx_cast/default.nix

diff --git a/pkgs/tools/misc/fx_cast/default.nix b/pkgs/tools/misc/fx_cast/default.nix
new file mode 100644
index 000000000000..78567da5b9bb
--- /dev/null
+++ b/pkgs/tools/misc/fx_cast/default.nix
@@ -0,0 +1,85 @@
+{ stdenv, fetchurl, dpkg }:
+
+stdenv.mkDerivation rec {
+  pname = "fx_cast_bridge";
+  version = "0.0.3";
+
+  src = fetchurl {
+     url = "https://github.com/hensm/fx_cast/releases/download/v${version}/fx_cast_bridge-${version}-x64.deb";
+     sha256 = "0wqm0spmffn31yd23ych6fjxhzfxhj92379h0qdjh2xr3as4yh4n";
+  };
+
+  nativeBuildInputs = [ dpkg ];
+
+  unpackPhase = ''
+    runHook preUnpack
+    dpkg-deb -x $src ./
+    runHook postUnpack
+  '';
+
+  dontBuild = true;
+  dontPatchELF = true;
+
+  installPhase = ''
+    install -DT {opt/fx_cast,$out/bin}/bridge
+    install -DT {usr,$out}/lib/mozilla/native-messaging-hosts/fx_cast_bridge.json
+
+    substituteInPlace $out/lib/mozilla/native-messaging-hosts/fx_cast_bridge.json \
+      --replace /opt/fx_cast/bridge $out/bin/bridge
+  '';
+
+  # See now-cli/default.nix
+  dontStrip = true;
+  preFixup = let
+    libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc];
+    bin = "$out/bin/bridge";
+  in ''
+
+    orig_size=$(stat --printf=%s ${bin})
+
+    patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" ${bin}
+    patchelf --set-rpath ${libPath} ${bin}
+    chmod +x ${bin}
+
+    new_size=$(stat --printf=%s ${bin})
+
+    ###### zeit-pkg fixing starts here.
+    # we're replacing plaintext js code that looks like
+    # PAYLOAD_POSITION = '1234                  ' | 0
+    # [...]
+    # PRELUDE_POSITION = '1234                  ' | 0
+    # ^-----20-chars-----^^------22-chars------^
+    # ^-- grep points here
+    #
+    # var_* are as described above
+    # shift_by seems to be safe so long as all patchelf adjustments occur
+    # before any locations pointed to by hardcoded offsets
+
+    var_skip=20
+    var_select=22
+    shift_by=$(expr $new_size - $orig_size)
+
+    function fix_offset {
+      # $1 = name of variable to adjust
+      location=$(grep -obUam1 "$1" ${bin} | cut -d: -f1)
+      location=$(expr $location + $var_skip)
+
+      value=$(dd if=${bin} iflag=count_bytes,skip_bytes skip=$location \
+                 bs=1 count=$var_select status=none)
+      value=$(expr $shift_by + $value)
+
+      echo -n $value | dd of=${bin} bs=1 seek=$location conv=notrunc
+    }
+
+    fix_offset PAYLOAD_POSITION
+    fix_offset PRELUDE_POSITION
+
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Implementation of the Chrome Sender API (Chromecast) within Firefox";
+    homepage = https://hensm.github.io/fx_cast/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 879daf19b718..a597ddb75473 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1708,6 +1708,8 @@ in
 
   fwup = callPackage ../tools/misc/fwup { };
 
+  fx_cast_bridge = callPackage ../tools/misc/fx_cast { };
+
   fzf = callPackage ../tools/misc/fzf { };
 
   fzf-zsh = callPackage ../shells/zsh/fzf-zsh { };

From c4e9dd4e57935c00c88450e10857c060bf2c45fe Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 6 Mar 2019 18:27:52 -0600
Subject: [PATCH 0029/4636] firefox: add option to use fx_cast_bridge

---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 3ed06717f6a2..f360500ca3d7 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -8,6 +8,7 @@
 , google_talk_plugin, fribid, gnome3/*.gnome-shell*/
 , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow
 , tridactyl-native
+, fx_cast_bridge
 , udev
 , kerberos
 }:
@@ -70,6 +71,7 @@ let
           ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell
           ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator
           ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration
+          ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge
           ++ extraNativeMessagingHosts
         );
       libs =   lib.optional stdenv.isLinux udev

From 2488f6a4a5e23db1a59d90b275f30717878eaafd Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 20 Aug 2019 07:02:46 -0500
Subject: [PATCH 0030/4636] fx_cast_bridge: 0.0.3 -> 0.0.4

https://github.com/hensm/fx_cast/releases/tag/v0.0.4
(cherry picked from commit c8e255962e89795f50268e1e370fdba31f759994)
---
 pkgs/tools/misc/fx_cast/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/fx_cast/default.nix b/pkgs/tools/misc/fx_cast/default.nix
index 78567da5b9bb..ff533e7f7237 100644
--- a/pkgs/tools/misc/fx_cast/default.nix
+++ b/pkgs/tools/misc/fx_cast/default.nix
@@ -2,18 +2,18 @@
 
 stdenv.mkDerivation rec {
   pname = "fx_cast_bridge";
-  version = "0.0.3";
+  version = "0.0.4";
 
   src = fetchurl {
      url = "https://github.com/hensm/fx_cast/releases/download/v${version}/fx_cast_bridge-${version}-x64.deb";
-     sha256 = "0wqm0spmffn31yd23ych6fjxhzfxhj92379h0qdjh2xr3as4yh4n";
+     sha256 = "1p6d8idbaaqr80vxrmmyfcr5nwb0sk5vwrmizflg39p5zasmmhy2";
   };
 
   nativeBuildInputs = [ dpkg ];
 
   unpackPhase = ''
     runHook preUnpack
-    dpkg-deb -x $src ./
+    dpkg-deb -xv $src ./
     runHook postUnpack
   '';
 
@@ -21,18 +21,18 @@ stdenv.mkDerivation rec {
   dontPatchELF = true;
 
   installPhase = ''
-    install -DT {opt/fx_cast,$out/bin}/bridge
+    install -DT {opt/fx_cast,$out/bin}/fx_cast_bridge
     install -DT {usr,$out}/lib/mozilla/native-messaging-hosts/fx_cast_bridge.json
 
     substituteInPlace $out/lib/mozilla/native-messaging-hosts/fx_cast_bridge.json \
-      --replace /opt/fx_cast/bridge $out/bin/bridge
+      --replace {opt/fx_cast,$out/bin}/fx_cast_bridge
   '';
 
   # See now-cli/default.nix
   dontStrip = true;
   preFixup = let
     libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc];
-    bin = "$out/bin/bridge";
+    bin = "$out/bin/fx_cast_bridge";
   in ''
 
     orig_size=$(stat --printf=%s ${bin})

From b7c783cfc9576899be4fabecb2d2be1ac4358a05 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 20 Aug 2019 08:26:16 -0500
Subject: [PATCH 0031/4636] fx_cast_bridge: fix double-slash

(cherry picked from commit 61576be9df9f3120dd69f3f5862242212ecc536a)
---
 pkgs/tools/misc/fx_cast/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/fx_cast/default.nix b/pkgs/tools/misc/fx_cast/default.nix
index ff533e7f7237..65f57d96a11b 100644
--- a/pkgs/tools/misc/fx_cast/default.nix
+++ b/pkgs/tools/misc/fx_cast/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     install -DT {usr,$out}/lib/mozilla/native-messaging-hosts/fx_cast_bridge.json
 
     substituteInPlace $out/lib/mozilla/native-messaging-hosts/fx_cast_bridge.json \
-      --replace {opt/fx_cast,$out/bin}/fx_cast_bridge
+      --replace {/opt/fx_cast,$out/bin}/fx_cast_bridge
   '';
 
   # See now-cli/default.nix

From a21665252d588aa142497a33acb506fa341268e5 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 20 Aug 2019 08:54:26 -0500
Subject: [PATCH 0032/4636] fx_cast: libc

(cherry picked from commit c6d6f636e186b68ae7626dcf611d10a3a50c30a3)
---
 pkgs/tools/misc/fx_cast/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/fx_cast/default.nix b/pkgs/tools/misc/fx_cast/default.nix
index 65f57d96a11b..bb723800f0c5 100644
--- a/pkgs/tools/misc/fx_cast/default.nix
+++ b/pkgs/tools/misc/fx_cast/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   # See now-cli/default.nix
   dontStrip = true;
   preFixup = let
-    libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc];
+    libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc stdenv.cc.libc];
     bin = "$out/bin/fx_cast_bridge";
   in ''
 

From b232587833cdf2e1c6a1a13fceebfd62728d06bd Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 7 Sep 2019 13:12:20 -0500
Subject: [PATCH 0033/4636] fx_cast: use pname a bit more

(cherry picked from commit a01a80a52c952bfa70a474cb062e508d3947ca6b)
---
 pkgs/tools/misc/fx_cast/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/fx_cast/default.nix b/pkgs/tools/misc/fx_cast/default.nix
index bb723800f0c5..e271960d73ef 100644
--- a/pkgs/tools/misc/fx_cast/default.nix
+++ b/pkgs/tools/misc/fx_cast/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.0.4";
 
   src = fetchurl {
-     url = "https://github.com/hensm/fx_cast/releases/download/v${version}/fx_cast_bridge-${version}-x64.deb";
+     url = "https://github.com/hensm/fx_cast/releases/download/v${version}/${pname}-${version}-x64.deb";
      sha256 = "1p6d8idbaaqr80vxrmmyfcr5nwb0sk5vwrmizflg39p5zasmmhy2";
   };
 
@@ -21,18 +21,18 @@ stdenv.mkDerivation rec {
   dontPatchELF = true;
 
   installPhase = ''
-    install -DT {opt/fx_cast,$out/bin}/fx_cast_bridge
-    install -DT {usr,$out}/lib/mozilla/native-messaging-hosts/fx_cast_bridge.json
+    install -DT {opt/fx_cast,$out/bin}/${pname}
+    install -DT {usr,$out}/lib/mozilla/native-messaging-hosts/${pname}.json
 
-    substituteInPlace $out/lib/mozilla/native-messaging-hosts/fx_cast_bridge.json \
-      --replace {/opt/fx_cast,$out/bin}/fx_cast_bridge
+    substituteInPlace $out/lib/mozilla/native-messaging-hosts/${pname}.json \
+      --replace {/opt/fx_cast,$out/bin}/${pname}
   '';
 
   # See now-cli/default.nix
   dontStrip = true;
   preFixup = let
     libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc stdenv.cc.libc];
-    bin = "$out/bin/fx_cast_bridge";
+    bin = "$out/bin/${pname}";
   in ''
 
     orig_size=$(stat --printf=%s ${bin})

From 10ac558ca10c11019d07f1fda8f9406a0642e81d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 27 Oct 2019 22:44:24 +0100
Subject: [PATCH 0034/4636] lib: Add lib.teams

Also add a freedesktop maintainer group as an example.
---
 lib/default.nix           |  1 +
 maintainers/team-list.nix | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 maintainers/team-list.nix

diff --git a/lib/default.nix b/lib/default.nix
index 74d508ec1d6e..716bd772c7f0 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -24,6 +24,7 @@ let
     # packaging
     customisation = callLibs ./customisation.nix;
     maintainers = import ../maintainers/maintainer-list.nix;
+    teams = callLibs ../maintainers/team-list.nix;
     meta = callLibs ./meta.nix;
     sources = callLibs ./sources.nix;
     versions = callLibs ./versions.nix;
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
new file mode 100644
index 000000000000..f98bbeee912e
--- /dev/null
+++ b/maintainers/team-list.nix
@@ -0,0 +1,24 @@
+/* List of maintainer teams.
+    name = {
+      # Required
+      members = [ maintainer1 maintainer2 ];
+      scope = "Maintain foo packages.";
+    };
+
+  where
+
+  - `members` is the list of maintainers belonging to the group,
+  - `scope` describes the scope of the group.
+
+  More fields may be added in the future.
+
+  Please keep the list alphabetically sorted.
+  */
+
+{ lib }:
+with lib.maintainers; {
+  freedesktop = {
+    members = [ jtojnar worldofpeace ];
+    scope = "Maintain Freedesktop.org packages for graphical desktop.";
+  };
+}

From 03941c1e673289dbc732da059d6edd7b61b8fde0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 27 Oct 2019 22:49:09 +0100
Subject: [PATCH 0035/4636] colord: add freedesktop team to maintainers

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

diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix
index 54379ec08f07..c6dbcfdda02f 100644
--- a/pkgs/tools/misc/colord/default.nix
+++ b/pkgs/tools/misc/colord/default.nix
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
     description = "System service to manage, install and generate color profiles to accurately color manage input and output devices";
     homepage = https://www.freedesktop.org/software/colord/;
     license = licenses.lgpl2Plus;
-    maintainers = [ maintainers.marcweber ];
+    maintainers = [ maintainers.marcweber ] ++ teams.freedesktop.members;
     platforms = platforms.linux;
   };
 }

From 34733fed5156a1f02efbe6d0f6d11871a26766b6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 25 Nov 2019 16:56:19 -0800
Subject: [PATCH 0036/4636] fwts: 19.09.00 -> 19.11.00

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

diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix
index 2f725952f0a3..435086512f69 100644
--- a/pkgs/os-specific/linux/fwts/default.nix
+++ b/pkgs/os-specific/linux/fwts/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "fwts";
-  version = "19.09.00";
+  version = "19.11.00";
 
   src = fetchzip {
     url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz";
-    sha256 = "039dc1sy2pfj3b7kqcww3qaabrhzks1xfkynzwbjwdk04fjiwxfw";
+    sha256 = "07adim2pxh1d0395632ds78hcy7xs3jqgdijksq10ridivhqxcli";
     stripRoot = false;
   };
 

From 848af2c6fc214b12a34442574755826678251181 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Sun, 23 Dec 2018 15:50:23 -0500
Subject: [PATCH 0037/4636] nixos/gitlab-runner: reload on config change

With this change it is no longer required to restart the runner on every
change. Instead it can just reload it's config while running.
---
 .../services/continuous-integration/gitlab-runner.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index 3d307b1abcf8..bd4cf6a37bad 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -120,10 +120,16 @@ in
         ++ optional hasDocker "docker.service";
       requires = optional hasDocker "docker.service";
       wantedBy = [ "multi-user.target" ];
+      reloadIfChanged = true;
+      restartTriggers = [
+         config.environment.etc."gitlab-runner/config.toml".source
+      ];
       serviceConfig = {
+        StateDirectory = "gitlab-runner";
+        ExecReload= "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         ExecStart = ''${cfg.package.bin}/bin/gitlab-runner run \
           --working-directory ${cfg.workDir} \
-          --config ${configFile} \
+          --config /etc/gitlab-runner/config.toml \
           --service gitlab-runner \
           --user gitlab-runner \
         '';
@@ -138,6 +144,9 @@ in
     # Make the gitlab-runner command availabe so users can query the runner
     environment.systemPackages = [ cfg.package ];
 
+    # Make sure the config can be reloaded on change
+    environment.etc."gitlab-runner/config.toml".source = configFile;
+
     users.users.gitlab-runner = {
       group = "gitlab-runner";
       extraGroups = optional hasDocker "docker";

From 36b1b61ed12c9c1fb85b3617e27d80473ba429ee Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 28 Nov 2019 02:26:14 -0800
Subject: [PATCH 0038/4636] mkp224o: 1.3.0 -> 1.4.0

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

diff --git a/pkgs/tools/security/mkp224o/default.nix b/pkgs/tools/security/mkp224o/default.nix
index a4aae480ae16..7585fdf22e1a 100644
--- a/pkgs/tools/security/mkp224o/default.nix
+++ b/pkgs/tools/security/mkp224o/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mkp224o";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "cathugger";
     repo = "mkp224o";
     rev = "v${version}";
-    sha256 = "1il12ahcs5pj52hxn4xvpjfz801xcg31zk2jnkl80frzlwq040qi";
+    sha256 = "0b7xs4gnyfhdkwl8wkb6mazas88ybnlbxck59p4n2mnlndvd8kb7";
   };
 
   buildCommand =

From 6937213e4a6fb52bfb791b3a63ebbc27a9ff967b Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 7 Dec 2019 13:47:07 +0100
Subject: [PATCH 0039/4636] geos: fix homepage

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

diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix
index 7135d6b3586a..b8e056edb416 100644
--- a/pkgs/development/libraries/geos/default.nix
+++ b/pkgs/development/libraries/geos/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "C++ port of the Java Topology Suite (JTS)";
-    homepage = http://geos.refractions.net/;
+    homepage = https://trac.osgeo.org/geos;
     license = licenses.lgpl21;
   };
 }

From 70628823abb3f7b801f836b203aa71998ba16e03 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sat, 7 Dec 2019 18:58:55 +0100
Subject: [PATCH 0040/4636] radarr: 0.2.0.1358 -> 0.2.0.1450

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

diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix
index 854f73be1871..61fee03a7a18 100644
--- a/pkgs/servers/radarr/default.nix
+++ b/pkgs/servers/radarr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "radarr";
-  version = "0.2.0.1358";
+  version = "0.2.0.1450";
 
   src = fetchurl {
     url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz";
-    sha256 = "0lyd9gcrfdp7nc4myg22ardsig30lgkvma03zzdjrwvsngqclmv7";
+    sha256 = "1sknq6fifpmgzryr07dnriaw2x425v2zxdcqzm65viw5p5j9xh00";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From ef4ce9ec9a5e38753076ad8009a090c80bfb4509 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Wed, 27 Nov 2019 17:52:25 +0200
Subject: [PATCH 0041/4636] nano-wallet: 19.0 -> 20.0

---
 pkgs/applications/blockchains/nano-wallet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix
index 2b7ae5d9c6e6..7d9fdb06d184 100644
--- a/pkgs/applications/blockchains/nano-wallet/default.nix
+++ b/pkgs/applications/blockchains/nano-wallet/default.nix
@@ -4,13 +4,13 @@
 stdenv.mkDerivation rec {
 
   pname = "nano-wallet";
-  version = "19.0";
+  version = "20.0";
 
   src = fetchFromGitHub {
     owner = "nanocurrency";
     repo = "raiblocks";
     rev = "V${version}";
-    sha256 = "1y5fc4cvfqh33imjkh91sqhy5bb9kh0icwyvdgm1cl564vnjax80";
+    sha256 = "12nrjjd89yjzx20d85ccmp395pl0djpx0x0qb8dgka8xfy11k7xn";
     fetchSubmodules = true;
   };
 

From 5d21e8c92b1afc3f6521d5190ea7b8ed748f805a Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Tue, 13 Aug 2019 22:39:26 -0400
Subject: [PATCH 0042/4636] nixos/nvidia: remove lib references

---
 nixos/modules/hardware/video/nvidia.nix | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index fcb30187fa2f..b365ff62d509 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -39,8 +39,8 @@ in
 
 {
   options = {
-    hardware.nvidia.modesetting.enable = lib.mkOption {
-      type = lib.types.bool;
+    hardware.nvidia.modesetting.enable = mkOption {
+      type = types.bool;
       default = false;
       description = ''
         Enable kernel modesetting when using the NVIDIA proprietary driver.
@@ -52,8 +52,8 @@ in
       '';
     };
 
-    hardware.nvidia.optimus_prime.enable = lib.mkOption {
-      type = lib.types.bool;
+    hardware.nvidia.optimus_prime.enable = mkOption {
+      type = types.bool;
       default = false;
       description = ''
         Enable NVIDIA Optimus support using the NVIDIA proprietary driver via PRIME.
@@ -79,16 +79,16 @@ in
       '';
     };
 
-    hardware.nvidia.optimus_prime.allowExternalGpu = lib.mkOption {
-      type = lib.types.bool;
+    hardware.nvidia.optimus_prime.allowExternalGpu = mkOption {
+      type = types.bool;
       default = false;
       description = ''
         Configure X to allow external NVIDIA GPUs when using optimus.
       '';
     };
 
-    hardware.nvidia.optimus_prime.nvidiaBusId = lib.mkOption {
-      type = lib.types.str;
+    hardware.nvidia.optimus_prime.nvidiaBusId = mkOption {
+      type = types.str;
       default = "";
       example = "PCI:1:0:0";
       description = ''
@@ -97,8 +97,8 @@ in
       '';
     };
 
-    hardware.nvidia.optimus_prime.intelBusId = lib.mkOption {
-      type = lib.types.str;
+    hardware.nvidia.optimus_prime.intelBusId = mkOption {
+      type = types.str;
       default = "";
       example = "PCI:0:2:0";
       description = ''
@@ -179,7 +179,7 @@ in
     hardware.opengl.package32 = nvidia_libs32;
 
     environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ]
-      ++ lib.filter (p: p != null) [ nvidia_x11.persistenced ];
+      ++ filter (p: p != null) [ nvidia_x11.persistenced ];
 
     systemd.tmpfiles.rules = optional config.virtualisation.docker.enableNvidia
         "L+ /run/nvidia-docker/bin - - - - ${nvidia_x11.bin}/origBin"
@@ -190,7 +190,7 @@ in
 
     # nvidia-uvm is required by CUDA applications.
     boot.kernelModules = [ "nvidia-uvm" ] ++
-      lib.optionals config.services.xserver.enable [ "nvidia" "nvidia_modeset" "nvidia_drm" ];
+      optionals config.services.xserver.enable [ "nvidia" "nvidia_modeset" "nvidia_drm" ];
 
     # If requested enable modesetting via kernel parameter.
     boot.kernelParams = optional cfg.modesetting.enable "nvidia-drm.modeset=1";

From aca9ffe893bd7346c32b38c50eaee3022668c998 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Wed, 14 Aug 2019 08:15:43 -0400
Subject: [PATCH 0043/4636] nixos/nvidia: optimus_prime -> prime.sync

---
 nixos/modules/hardware/video/nvidia.nix | 44 +++++++++++++++----------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index b365ff62d509..88ae088bb28a 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -34,10 +34,18 @@ let
   enabled = nvidia_x11 != null;
 
   cfg = config.hardware.nvidia;
-  optimusCfg = cfg.optimus_prime;
+  syncCfg = cfg.prime.sync;
 in
 
 {
+  imports =
+    [
+      (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "enable" ] [ "hardware" "nvidia" "prime" "sync" "enable" ])
+      (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "allowExternalGpu" ] [ "hardware" "nvidia" "prime" "sync" "allowExternalGpu" ])
+      (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "nvidiaBusId" ] [ "hardware" "nvidia" "prime" "sync" "nvidiaBusId" ])
+      (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "intelBusId" ] [ "hardware" "nvidia" "prime" "sync" "intelBusId" ])
+    ];
+
   options = {
     hardware.nvidia.modesetting.enable = mkOption {
       type = types.bool;
@@ -46,13 +54,13 @@ in
         Enable kernel modesetting when using the NVIDIA proprietary driver.
 
         Enabling this fixes screen tearing when using Optimus via PRIME (see
-        <option>hardware.nvidia.optimus_prime.enable</option>. This is not enabled
+        <option>hardware.nvidia.prime.sync.enable</option>. This is not enabled
         by default because it is not officially supported by NVIDIA and would not
         work with SLI.
       '';
     };
 
-    hardware.nvidia.optimus_prime.enable = mkOption {
+    hardware.nvidia.prime.sync.enable = mkOption {
       type = types.bool;
       default = false;
       description = ''
@@ -66,8 +74,8 @@ in
         be the only driver there.
 
         If this is enabled, then the bus IDs of the NVIDIA and Intel GPUs have to be
-        specified (<option>hardware.nvidia.optimus_prime.nvidiaBusId</option> and
-        <option>hardware.nvidia.optimus_prime.intelBusId</option>).
+        specified (<option>hardware.nvidia.prime.sync.nvidiaBusId</option> and
+        <option>hardware.nvidia.prime.sync.intelBusId</option>).
 
         If you enable this, you may want to also enable kernel modesetting for the
         NVIDIA driver (<option>hardware.nvidia.modesetting.enable</option>) in order
@@ -79,7 +87,7 @@ in
       '';
     };
 
-    hardware.nvidia.optimus_prime.allowExternalGpu = mkOption {
+    hardware.nvidia.prime.sync.allowExternalGpu = mkOption {
       type = types.bool;
       default = false;
       description = ''
@@ -87,7 +95,7 @@ in
       '';
     };
 
-    hardware.nvidia.optimus_prime.nvidiaBusId = mkOption {
+    hardware.nvidia.prime.sync.nvidiaBusId = mkOption {
       type = types.str;
       default = "";
       example = "PCI:1:0:0";
@@ -97,7 +105,7 @@ in
       '';
     };
 
-    hardware.nvidia.optimus_prime.intelBusId = mkOption {
+    hardware.nvidia.prime.sync.intelBusId = mkOption {
       type = types.str;
       default = "";
       example = "PCI:0:2:0";
@@ -116,8 +124,8 @@ in
       }
 
       {
-        assertion = !optimusCfg.enable ||
-          (optimusCfg.nvidiaBusId != "" && optimusCfg.intelBusId != "");
+        assertion = !syncCfg.enable ||
+          (syncCfg.nvidiaBusId != "" && syncCfg.intelBusId != "");
         message = ''
           When NVIDIA Optimus via PRIME is enabled, the GPU bus IDs must configured.
         '';
@@ -139,33 +147,33 @@ in
     services.xserver.drivers = singleton {
       name = "nvidia";
       modules = [ nvidia_x11.bin ];
-      deviceSection = optionalString optimusCfg.enable
+      deviceSection = optionalString syncCfg.enable
         ''
-          BusID "${optimusCfg.nvidiaBusId}"
-          ${optionalString optimusCfg.allowExternalGpu "Option \"AllowExternalGpus\""}
+          BusID "${syncCfg.nvidiaBusId}"
+          ${optionalString syncCfg.allowExternalGpu "Option \"AllowExternalGpus\""}
         '';
       screenSection =
         ''
           Option "RandRRotation" "on"
-          ${optionalString optimusCfg.enable "Option \"AllowEmptyInitialConfiguration\""}
+          ${optionalString syncCfg.enable "Option \"AllowEmptyInitialConfiguration\""}
         '';
     };
 
-    services.xserver.extraConfig = optionalString optimusCfg.enable
+    services.xserver.extraConfig = optionalString syncCfg.enable
       ''
         Section "Device"
           Identifier "nvidia-optimus-intel"
           Driver "modesetting"
-          BusID  "${optimusCfg.intelBusId}"
+          BusID  "${syncCfg.intelBusId}"
           Option "AccelMethod" "none"
         EndSection
       '';
-    services.xserver.serverLayoutSection = optionalString optimusCfg.enable
+    services.xserver.serverLayoutSection = optionalString syncCfg.enable
       ''
         Inactive "nvidia-optimus-intel"
       '';
 
-    services.xserver.displayManager.setupCommands = optionalString optimusCfg.enable ''
+    services.xserver.displayManager.setupCommands = optionalString syncCfg.enable ''
       # Added by nvidia configuration module for Optimus/PRIME.
       ${pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource modesetting NVIDIA-0
       ${pkgs.xorg.xrandr}/bin/xrandr --auto

From e8daa1e35ca120c52f38fb08505f7f716073ead7 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Wed, 14 Aug 2019 08:18:28 -0400
Subject: [PATCH 0044/4636] nixos/nvidia: prime.sync.{intel,nvidia}BusId ->
 prime.{intel,nvidia}BusId

---
 nixos/modules/hardware/video/nvidia.nix | 57 +++++++++++++------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 88ae088bb28a..295180d2b64e 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -34,7 +34,8 @@ let
   enabled = nvidia_x11 != null;
 
   cfg = config.hardware.nvidia;
-  syncCfg = cfg.prime.sync;
+  pCfg = cfg.prime;
+  syncCfg = pCfg.sync;
 in
 
 {
@@ -42,8 +43,8 @@ in
     [
       (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "enable" ] [ "hardware" "nvidia" "prime" "sync" "enable" ])
       (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "allowExternalGpu" ] [ "hardware" "nvidia" "prime" "sync" "allowExternalGpu" ])
-      (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "nvidiaBusId" ] [ "hardware" "nvidia" "prime" "sync" "nvidiaBusId" ])
-      (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "intelBusId" ] [ "hardware" "nvidia" "prime" "sync" "intelBusId" ])
+      (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "nvidiaBusId" ] [ "hardware" "nvidia" "prime" "nvidiaBusId" ])
+      (mkRenamedOptionModule [ "hardware" "nvidia" "optimus_prime" "intelBusId" ] [ "hardware" "nvidia" "prime" "intelBusId" ])
     ];
 
   options = {
@@ -60,6 +61,26 @@ in
       '';
     };
 
+    hardware.nvidia.prime.nvidiaBusId = mkOption {
+      type = types.str;
+      default = "";
+      example = "PCI:1:0:0";
+      description = ''
+        Bus ID of the NVIDIA GPU. You can find it using lspci; for example if lspci
+        shows the NVIDIA GPU at "01:00.0", set this option to "PCI:1:0:0".
+      '';
+    };
+
+    hardware.nvidia.prime.intelBusId = mkOption {
+      type = types.str;
+      default = "";
+      example = "PCI:0:2:0";
+      description = ''
+        Bus ID of the Intel GPU. You can find it using lspci; for example if lspci
+        shows the Intel GPU at "00:02.0", set this option to "PCI:0:2:0".
+      '';
+    };
+
     hardware.nvidia.prime.sync.enable = mkOption {
       type = types.bool;
       default = false;
@@ -74,8 +95,8 @@ in
         be the only driver there.
 
         If this is enabled, then the bus IDs of the NVIDIA and Intel GPUs have to be
-        specified (<option>hardware.nvidia.prime.sync.nvidiaBusId</option> and
-        <option>hardware.nvidia.prime.sync.intelBusId</option>).
+        specified (<option>hardware.nvidia.prime.nvidiaBusId</option> and
+        <option>hardware.nvidia.prime.intelBusId</option>).
 
         If you enable this, you may want to also enable kernel modesetting for the
         NVIDIA driver (<option>hardware.nvidia.modesetting.enable</option>) in order
@@ -94,26 +115,6 @@ in
         Configure X to allow external NVIDIA GPUs when using optimus.
       '';
     };
-
-    hardware.nvidia.prime.sync.nvidiaBusId = mkOption {
-      type = types.str;
-      default = "";
-      example = "PCI:1:0:0";
-      description = ''
-        Bus ID of the NVIDIA GPU. You can find it using lspci; for example if lspci
-        shows the NVIDIA GPU at "01:00.0", set this option to "PCI:1:0:0".
-      '';
-    };
-
-    hardware.nvidia.prime.sync.intelBusId = mkOption {
-      type = types.str;
-      default = "";
-      example = "PCI:0:2:0";
-      description = ''
-        Bus ID of the Intel GPU. You can find it using lspci; for example if lspci
-        shows the Intel GPU at "00:02.0", set this option to "PCI:0:2:0".
-      '';
-    };
   };
 
   config = mkIf enabled {
@@ -125,7 +126,7 @@ in
 
       {
         assertion = !syncCfg.enable ||
-          (syncCfg.nvidiaBusId != "" && syncCfg.intelBusId != "");
+          (pCfg.nvidiaBusId != "" && pCfg.intelBusId != "");
         message = ''
           When NVIDIA Optimus via PRIME is enabled, the GPU bus IDs must configured.
         '';
@@ -149,7 +150,7 @@ in
       modules = [ nvidia_x11.bin ];
       deviceSection = optionalString syncCfg.enable
         ''
-          BusID "${syncCfg.nvidiaBusId}"
+          BusID "${pCfg.nvidiaBusId}"
           ${optionalString syncCfg.allowExternalGpu "Option \"AllowExternalGpus\""}
         '';
       screenSection =
@@ -164,7 +165,7 @@ in
         Section "Device"
           Identifier "nvidia-optimus-intel"
           Driver "modesetting"
-          BusID  "${syncCfg.intelBusId}"
+          BusID  "${pCfg.intelBusId}"
           Option "AccelMethod" "none"
         EndSection
       '';

From 632a8a7bb27b5e852becf0c4cd451cde18237f1b Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Wed, 14 Aug 2019 12:37:03 -0400
Subject: [PATCH 0045/4636] nixos/xserver: introduce attr display to
 xserver.drivers

Specifically for NVIDIA so that only the device section would be created
---
 nixos/modules/hardware/video/amdgpu-pro.nix |  2 +-
 nixos/modules/hardware/video/ati.nix        |  2 +-
 nixos/modules/hardware/video/nvidia.nix     | 29 ++++-----
 nixos/modules/services/x11/xserver.nix      | 68 +++++++++++----------
 4 files changed, 50 insertions(+), 51 deletions(-)

diff --git a/nixos/modules/hardware/video/amdgpu-pro.nix b/nixos/modules/hardware/video/amdgpu-pro.nix
index 8e91e9d2baa9..ec1c8c2d57a1 100644
--- a/nixos/modules/hardware/video/amdgpu-pro.nix
+++ b/nixos/modules/hardware/video/amdgpu-pro.nix
@@ -30,7 +30,7 @@ in
     nixpkgs.config.xorg.abiCompat = "1.19";
 
     services.xserver.drivers = singleton
-      { name = "amdgpu"; modules = [ package ]; };
+      { name = "amdgpu"; modules = [ package ]; display = true; };
 
     hardware.opengl.package = package;
     hardware.opengl.package32 = package32;
diff --git a/nixos/modules/hardware/video/ati.nix b/nixos/modules/hardware/video/ati.nix
index 0aab7bd6b92c..06d3ea324d8d 100644
--- a/nixos/modules/hardware/video/ati.nix
+++ b/nixos/modules/hardware/video/ati.nix
@@ -21,7 +21,7 @@ in
     nixpkgs.config.xorg.abiCompat = "1.17";
 
     services.xserver.drivers = singleton
-      { name = "fglrx"; modules = [ ati_x11 ]; };
+      { name = "fglrx"; modules = [ ati_x11 ]; display = true; };
 
     hardware.opengl.package = ati_x11;
     hardware.opengl.package32 = pkgs.pkgsi686Linux.linuxPackages.ati_drivers_x11.override { libsOnly = true; kernel = null; };
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 295180d2b64e..e3ef0e7a846b 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -125,8 +125,7 @@ in
       }
 
       {
-        assertion = !syncCfg.enable ||
-          (pCfg.nvidiaBusId != "" && pCfg.intelBusId != "");
+        assertion = syncCfg.enable -> pCfg.nvidiaBusId != "" && pCfg.intelBusId != "";
         message = ''
           When NVIDIA Optimus via PRIME is enabled, the GPU bus IDs must configured.
         '';
@@ -145,9 +144,17 @@ in
     # - Configure the display manager to run specific `xrandr` commands which will
     #   configure/enable displays connected to the Intel GPU.
 
-    services.xserver.drivers = singleton {
+    services.xserver.drivers = optional syncCfg.enable {
+      name = "modesetting";
+      display = false;
+      deviceSection = ''
+        BusID "${pCfg.intelBusId}"
+        Option "AccelMethod" "none"
+      '';
+    } ++ singleton {
       name = "nvidia";
       modules = [ nvidia_x11.bin ];
+      display = true;
       deviceSection = optionalString syncCfg.enable
         ''
           BusID "${pCfg.nvidiaBusId}"
@@ -160,19 +167,9 @@ in
         '';
     };
 
-    services.xserver.extraConfig = optionalString syncCfg.enable
-      ''
-        Section "Device"
-          Identifier "nvidia-optimus-intel"
-          Driver "modesetting"
-          BusID  "${pCfg.intelBusId}"
-          Option "AccelMethod" "none"
-        EndSection
-      '';
-    services.xserver.serverLayoutSection = optionalString syncCfg.enable
-      ''
-        Inactive "nvidia-optimus-intel"
-      '';
+    services.xserver.serverLayoutSection = optionalString syncCfg.enable ''
+      Inactive "Device-modesetting[0]"
+    '';
 
     services.xserver.displayManager.setupCommands = optionalString syncCfg.enable ''
       # Added by nvidia configuration module for Optimus/PRIME.
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 1f6ee7cfffda..acf240ca5ade 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -574,7 +574,7 @@ in
            then { modules = [xorg.${"xf86video" + name}]; }
            else null)
           knownVideoDrivers;
-      in optional (driver != null) ({ inherit name; modules = []; driverName = name; } // driver));
+      in optional (driver != null) ({ inherit name; modules = []; driverName = name; display = true; } // driver));
 
     assertions = [
       { assertion = config.security.polkit.enable;
@@ -749,7 +749,7 @@ in
           ${cfg.serverLayoutSection}
           # Reference the Screen sections for each driver.  This will
           # cause the X server to try each in turn.
-          ${flip concatMapStrings cfg.drivers (d: ''
+          ${flip concatMapStrings (filter (d: d.display) cfg.drivers) (d: ''
             Screen "Screen-${d.name}[0]"
           '')}
         EndSection
@@ -773,42 +773,44 @@ in
             ${driver.deviceSection or ""}
             ${xrandrDeviceSection}
           EndSection
+          ${optionalString driver.display ''
 
-          Section "Screen"
-            Identifier "Screen-${driver.name}[0]"
-            Device "Device-${driver.name}[0]"
-            ${optionalString (cfg.monitorSection != "") ''
-              Monitor "Monitor[0]"
-            ''}
+            Section "Screen"
+              Identifier "Screen-${driver.name}[0]"
+              Device "Device-${driver.name}[0]"
+              ${optionalString (cfg.monitorSection != "") ''
+                Monitor "Monitor[0]"
+              ''}
 
-            ${cfg.screenSection}
-            ${driver.screenSection or ""}
+              ${cfg.screenSection}
+              ${driver.screenSection or ""}
 
-            ${optionalString (cfg.defaultDepth != 0) ''
-              DefaultDepth ${toString cfg.defaultDepth}
-            ''}
+              ${optionalString (cfg.defaultDepth != 0) ''
+                DefaultDepth ${toString cfg.defaultDepth}
+              ''}
 
-            ${optionalString
-                (driver.name != "virtualbox" &&
-                 (cfg.resolutions != [] ||
-                  cfg.extraDisplaySettings != "" ||
-                  cfg.virtualScreen != null))
-              (let
-                f = depth:
-                  ''
-                    SubSection "Display"
-                      Depth ${toString depth}
-                      ${optionalString (cfg.resolutions != [])
-                        "Modes ${concatMapStrings (res: ''"${toString res.x}x${toString res.y}"'') cfg.resolutions}"}
-                      ${cfg.extraDisplaySettings}
-                      ${optionalString (cfg.virtualScreen != null)
-                        "Virtual ${toString cfg.virtualScreen.x} ${toString cfg.virtualScreen.y}"}
-                    EndSubSection
-                  '';
-              in concatMapStrings f [8 16 24]
-            )}
+              ${optionalString
+                  (driver.name != "virtualbox" &&
+                  (cfg.resolutions != [] ||
+                    cfg.extraDisplaySettings != "" ||
+                    cfg.virtualScreen != null))
+                (let
+                  f = depth:
+                    ''
+                      SubSection "Display"
+                        Depth ${toString depth}
+                        ${optionalString (cfg.resolutions != [])
+                          "Modes ${concatMapStrings (res: ''"${toString res.x}x${toString res.y}"'') cfg.resolutions}"}
+                        ${cfg.extraDisplaySettings}
+                        ${optionalString (cfg.virtualScreen != null)
+                          "Virtual ${toString cfg.virtualScreen.x} ${toString cfg.virtualScreen.y}"}
+                      EndSubSection
+                    '';
+                in concatMapStrings f [8 16 24]
+              )}
 
-          EndSection
+            EndSection
+          ''}
         '')}
 
         ${xrandrMonitorSections}

From 026b6010efb33462865bc4ab3004d82bcd0b49ac Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Wed, 14 Aug 2019 12:41:15 -0400
Subject: [PATCH 0046/4636] nixos/nvidia: implement prime render offload

---
 nixos/modules/hardware/video/nvidia.nix | 48 +++++++++++++++++++------
 1 file changed, 38 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index e3ef0e7a846b..a75e6961b64c 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -36,6 +36,8 @@ let
   cfg = config.hardware.nvidia;
   pCfg = cfg.prime;
   syncCfg = pCfg.sync;
+  offloadCfg = pCfg.offload;
+  primeEnabled = syncCfg.enable || offloadCfg.enable;
 in
 
 {
@@ -115,6 +117,18 @@ in
         Configure X to allow external NVIDIA GPUs when using optimus.
       '';
     };
+
+    hardware.nvidia.prime.offload.enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Enable render offload support using the NVIDIA proprietary driver via PRIME.
+
+        If this is enabled, then the bus IDs of the NVIDIA and Intel GPUs have to be
+        specified (<option>hardware.nvidia.prime.nvidiaBusId</option> and
+        <option>hardware.nvidia.prime.intelBusId</option>).
+      '';
+    };
   };
 
   config = mkIf enabled {
@@ -125,11 +139,19 @@ in
       }
 
       {
-        assertion = syncCfg.enable -> pCfg.nvidiaBusId != "" && pCfg.intelBusId != "";
+        assertion = primeEnabled -> pCfg.nvidiaBusId != "" && pCfg.intelBusId != "";
         message = ''
-          When NVIDIA Optimus via PRIME is enabled, the GPU bus IDs must configured.
+          When NVIDIA PRIME is enabled, the GPU bus IDs must configured.
         '';
       }
+      {
+        assertion = offloadCfg.enable -> versionAtLeast nvidia_x11.version "435.21";
+        message = "NVIDIA PRIME render offload is currently only supported on versions >= 435.21.";
+      }
+      {
+        assertion = !(syncCfg.enable && offloadCfg.enable);
+        message = "Only one NVIDIA PRIME solution may be used at a time.";
+      }
     ];
 
     # If Optimus/PRIME is enabled, we:
@@ -144,18 +166,20 @@ in
     # - Configure the display manager to run specific `xrandr` commands which will
     #   configure/enable displays connected to the Intel GPU.
 
-    services.xserver.drivers = optional syncCfg.enable {
+    services.xserver.useGlamor = mkDefault offloadCfg.enable;
+
+    services.xserver.drivers = optional primeEnabled {
       name = "modesetting";
-      display = false;
+      display = offloadCfg.enable;
       deviceSection = ''
         BusID "${pCfg.intelBusId}"
-        Option "AccelMethod" "none"
+        ${optionalString syncCfg.enable ''Option "AccelMethod" "none"''}
       '';
     } ++ singleton {
       name = "nvidia";
       modules = [ nvidia_x11.bin ];
-      display = true;
-      deviceSection = optionalString syncCfg.enable
+      display = !offloadCfg.enable;
+      deviceSection = optionalString primeEnabled
         ''
           BusID "${pCfg.nvidiaBusId}"
           ${optionalString syncCfg.allowExternalGpu "Option \"AllowExternalGpus\""}
@@ -169,6 +193,8 @@ in
 
     services.xserver.serverLayoutSection = optionalString syncCfg.enable ''
       Inactive "Device-modesetting[0]"
+    '' + optionalString offloadCfg.enable ''
+      Option "AllowNVIDIAGPUScreens"
     '';
 
     services.xserver.displayManager.setupCommands = optionalString syncCfg.enable ''
@@ -181,8 +207,10 @@ in
       source = "${nvidia_x11.bin}/share/nvidia/nvidia-application-profiles-rc";
     };
 
-    hardware.opengl.package = nvidia_x11.out;
-    hardware.opengl.package32 = nvidia_libs32;
+    hardware.opengl.package = mkIf (!offloadCfg.enable) nvidia_x11.out;
+    hardware.opengl.package32 = mkIf (!offloadCfg.enable) nvidia_libs32;
+    hardware.opengl.extraPackages = optional offloadCfg.enable nvidia_x11.out;
+    hardware.opengl.extraPackages32 = optional offloadCfg.enable nvidia_libs32;
 
     environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ]
       ++ filter (p: p != null) [ nvidia_x11.persistenced ];
@@ -199,7 +227,7 @@ in
       optionals config.services.xserver.enable [ "nvidia" "nvidia_modeset" "nvidia_drm" ];
 
     # If requested enable modesetting via kernel parameter.
-    boot.kernelParams = optional cfg.modesetting.enable "nvidia-drm.modeset=1";
+    boot.kernelParams = optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1";
 
     # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded.
     services.udev.extraRules =

From d48ed3b9e55b1ffa9cbdf343d01a6fabfee87263 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Fri, 6 Sep 2019 22:00:18 +0300
Subject: [PATCH 0047/4636] nvidia_x11: fix *nvidia*.so* references

---
 pkgs/os-specific/linux/nvidia-x11/builder.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index b4c6952d44d3..30e5d16b60f3 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -75,11 +75,18 @@ installPhase() {
             fi
             install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia.json
         fi
+        if [ -e nvidia_layers.json ]; then
+            sed -E "s#(libGLX_nvidia)#$i/lib/\\1#" nvidia_layers.json > nvidia_layers.json.fixed
+            install -Dm644 nvidia_layers.json.fixed $i/share/vulkan/implicit_layer.d/nvidia_layers.json
+        fi
 
         # EGL
         if [ "$useGLVND" = "1" ]; then
             sed -E "s#(libEGL_nvidia)#$i/lib/\\1#" 10_nvidia.json > 10_nvidia.json.fixed
+            sed -E "s#(libnvidia-egl-wayland)#$i/lib/\\1#" 10_nvidia_wayland.json > 10_nvidia_wayland.json.fixed
+
             install -Dm644 10_nvidia.json.fixed $i/share/glvnd/egl_vendor.d/nvidia.json
+            install -Dm644 10_nvidia_wayland.json.fixed $i/share/glvnd/egl_vendor.d/nvidia_wayland.json
         fi
 
     done

From 3b3876649d963fcc473bae2a04da22a3296ba99a Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Mon, 23 Sep 2019 17:52:47 -0400
Subject: [PATCH 0048/4636] nvidia_x11: include libdrm in rpath

Needed for PRIME render offload specifically
---
 pkgs/os-specific/linux/nvidia-x11/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index eeb7b99bbaae..9e2ee6e834c2 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -32,7 +32,7 @@ let
   pkgSuffix = optionalString (versionOlder version "304") "-pkg0";
   i686bundled = versionAtLeast version "391";
 
-  libPathFor = pkgs: pkgs.lib.makeLibraryPath [ pkgs.xorg.libXext pkgs.xorg.libX11
+  libPathFor = pkgs: pkgs.lib.makeLibraryPath [ pkgs.libdrm pkgs.xorg.libXext pkgs.xorg.libX11
     pkgs.xorg.libXv pkgs.xorg.libXrandr pkgs.xorg.libxcb pkgs.zlib pkgs.stdenv.cc.cc ];
 
   self = stdenv.mkDerivation {

From 7b1b72c853215b37ba32507d86b798c9c9cb72ec Mon Sep 17 00:00:00 2001
From: Ente <ducksource@duckpond.ch>
Date: Wed, 11 Dec 2019 18:34:41 +0100
Subject: [PATCH 0049/4636] hopper: fix libxml2 dynamic linking issue

* port to qt5.callPackage / mkDerivation
* format derivation
---
 .../tools/analysis/hopper/default.nix         | 29 ++++++++++++++-----
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix
index c9214ae7e35d..3df60c0b99c8 100644
--- a/pkgs/development/tools/analysis/hopper/default.nix
+++ b/pkgs/development/tools/analysis/hopper/default.nix
@@ -1,6 +1,21 @@
-{ stdenv, fetchurl, pkgs, lib }:
+{ mkDerivation, stdenv, fetchurl, pkgs, lib, qtbase }:
+let
 
-stdenv.mkDerivation rec {
+  ldLibraryPath = with pkgs; stdenv.lib.makeLibraryPath  [
+    libbsd.out
+    libffi.out
+    gmpxx.out
+    python27Full.out
+    python27Packages.libxml2.out
+    qt5.qtbase
+    zlib
+    xlibs.libX11.out
+    xorg_sys_opengl.out
+    xlibs.libXrender.out
+    gcc-unwrapped.lib
+  ];
+
+in mkDerivation rec {
   pname    = "hopper";
   version = "4.5.7";
   rev = "v${lib.versions.major version}";
@@ -12,13 +27,13 @@ stdenv.mkDerivation rec {
 
   sourceRoot = ".";
 
-  ldLibraryPath = with pkgs; stdenv.lib.makeLibraryPath  [
-libbsd.out libffi.out gmpxx.out python27Full.out python27Packages.libxml2 qt5.qtbase zlib  xlibs.libX11.out xorg_sys_opengl.out xlibs.libXrender.out gcc-unwrapped.lib
+  buildInputs = [
+    qtbase
   ];
 
-  nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ];
-
-  qtWrapperArgs = [ ''--suffix LD_LIBRARY_PATH : ${ldLibraryPath}'' ];
+  qtWrapperArgs = [
+    ''--suffix LD_LIBRARY_PATH : ${ldLibraryPath}''
+  ];
 
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2b0483568cbf..9e97b8b8124c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1831,7 +1831,7 @@ in
 
   hostsblock = callPackage ../tools/misc/hostsblock { };
 
-  hopper = callPackage ../development/tools/analysis/hopper {};
+  hopper = qt5.callPackage ../development/tools/analysis/hopper {};
 
   hr = callPackage ../applications/misc/hr { };
 

From 2f7f00bb84c2a69269aeda5eb6054b50da4e3255 Mon Sep 17 00:00:00 2001
From: Ente <ducksource@duckpond.ch>
Date: Wed, 11 Dec 2019 21:13:30 +0100
Subject: [PATCH 0050/4636] hopper: refactor derivation

* use wrapQtAppsHook in favour for the custom qt builder
* use autoPatchelfHook
* cleanup build dependencies
* add maintainer Enteee
---
 .../tools/analysis/hopper/default.nix         | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix
index 3df60c0b99c8..8f0b6c5b2df2 100644
--- a/pkgs/development/tools/analysis/hopper/default.nix
+++ b/pkgs/development/tools/analysis/hopper/default.nix
@@ -1,21 +1,17 @@
-{ mkDerivation, stdenv, fetchurl, pkgs, lib, qtbase }:
+{
+  stdenv, fetchurl, lib,
+
+  autoPatchelfHook,
+
+  wrapQtAppsHook,
+
+  libbsd,
+  python27,
+  gmpxx,
+}:
 let
 
-  ldLibraryPath = with pkgs; stdenv.lib.makeLibraryPath  [
-    libbsd.out
-    libffi.out
-    gmpxx.out
-    python27Full.out
-    python27Packages.libxml2.out
-    qt5.qtbase
-    zlib
-    xlibs.libX11.out
-    xorg_sys_opengl.out
-    xlibs.libXrender.out
-    gcc-unwrapped.lib
-  ];
-
-in mkDerivation rec {
+in stdenv.mkDerivation rec {
   pname    = "hopper";
   version = "4.5.7";
   rev = "v${lib.versions.major version}";
@@ -27,31 +23,35 @@ in mkDerivation rec {
 
   sourceRoot = ".";
 
-  buildInputs = [
-    qtbase
+  nativeBuildInputs = [
+    wrapQtAppsHook
+    autoPatchelfHook
   ];
 
-  qtWrapperArgs = [
-    ''--suffix LD_LIBRARY_PATH : ${ldLibraryPath}''
+  buildInputs = [
+    libbsd
+    python27
+    gmpxx
   ];
 
   installPhase = ''
     mkdir -p $out/bin
     mkdir -p $out/lib
     mkdir -p $out/share
+
     cp $sourceRoot/opt/hopper-${rev}/bin/Hopper $out/bin/hopper
     cp -r $sourceRoot/opt/hopper-${rev}/lib $out
     cp -r $sourceRoot/usr/share $out/share
-    patchelf \
-      --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \
-      $out/bin/hopper
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://www.hopperapp.com/index.html";
     description = "A macOS and Linux Disassembler";
-    license = stdenv.lib.licenses.unfree;
-    maintainers = [ stdenv.lib.maintainers.luis ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.unfree;
+    maintainers = [
+      maintainers.luis
+      maintainers.Enteee
+    ];
+    platforms = platforms.linux;
   };
 }

From b301e82cfe825bd3db4fbcc39820724a6c6f213a Mon Sep 17 00:00:00 2001
From: Ente <ducksource@duckpond.ch>
Date: Wed, 11 Dec 2019 21:19:21 +0100
Subject: [PATCH 0051/4636] hopper: 4.5.7 -> 4.5.19

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

diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix
index 8f0b6c5b2df2..d58fad474301 100644
--- a/pkgs/development/tools/analysis/hopper/default.nix
+++ b/pkgs/development/tools/analysis/hopper/default.nix
@@ -13,12 +13,12 @@ let
 
 in stdenv.mkDerivation rec {
   pname    = "hopper";
-  version = "4.5.7";
+  version = "4.5.19";
   rev = "v${lib.versions.major version}";
 
   src = fetchurl {
     url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz";
-    sha256 = "1ce7a0f13126a940398aa8da4a74e250dff0401074f30446a8840ac3dbb902c0";
+    sha256 = "1c9wbjwz5xn0skz2a1wpxyx78hhrm8vcbpzagsg4wwnyblap59db";
   };
 
   sourceRoot = ".";

From a8cfe8867e5ca1829c00920d6c0c16508d37c08a Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Thu, 12 Dec 2019 19:31:34 +0100
Subject: [PATCH 0052/4636] pdftk: keep old version as insurance

---
 pkgs/tools/typesetting/pdftk/legacy.nix | 42 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  1 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/tools/typesetting/pdftk/legacy.nix

diff --git a/pkgs/tools/typesetting/pdftk/legacy.nix b/pkgs/tools/typesetting/pdftk/legacy.nix
new file mode 100644
index 000000000000..72f25ef099bc
--- /dev/null
+++ b/pkgs/tools/typesetting/pdftk/legacy.nix
@@ -0,0 +1,42 @@
+{ fetchurl, stdenv, gcj, unzip }:
+
+stdenv.mkDerivation {
+  name = "pdftk-2.02";
+
+  src = fetchurl {
+    url = "https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-2.02-src.zip";
+    sha256 = "1hdq6zm2dx2f9h7bjrp6a1hfa1ywgkwydp14i2sszjiszljnm3qi";
+  };
+
+  nativeBuildInputs = [ gcj unzip ];
+
+  hardeningDisable = [ "fortify" "format" ];
+
+  preBuild = ''
+    cd pdftk
+    sed -e 's@/usr/bin/@@g' -i Makefile.*
+    NIX_ENFORCE_PURITY= \
+      make \
+      LIBGCJ="${gcj.cc}/share/java/libgcj-${gcj.cc.version}.jar" \
+      GCJ=gcj GCJH=gcjh GJAR=gjar \
+      -iC ../java all
+  '';
+
+  # Makefile.Debian has almost fitting defaults
+  makeFlags = [ "-f" "Makefile.Debian" "VERSUFF=" ];
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/man/man1
+    cp pdftk $out/bin
+    cp ../pdftk.1 $out/share/man/man1
+  '';
+
+
+  meta = {
+    description = "Simple tool for doing everyday things with PDF documents";
+    homepage = https://www.pdflabs.com/tools/pdftk-server/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [raskin];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d4baf7fcdd9d..1de2dc748422 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20554,6 +20554,7 @@ in
 
   pdfcpu = callPackage ../applications/graphics/pdfcpu { };
   pdftk = callPackage ../tools/typesetting/pdftk { };
+  pdftk-legacy = lowPrio (callPackage ../tools/typesetting/pdftk/legacy.nix { });
   pdfgrep  = callPackage ../tools/typesetting/pdfgrep { };
 
   pdfpc = callPackage ../applications/misc/pdfpc {

From 9fdff1c5e0cc183cdb745d789546dde57f467182 Mon Sep 17 00:00:00 2001
From: Averell Dalton <averell+nixpkgs@rxd4.com>
Date: Wed, 11 Dec 2019 23:17:39 +0100
Subject: [PATCH 0053/4636] pdftk: reinit at 3.0.8

---
 pkgs/tools/typesetting/pdftk/default.nix | 105 +++++++++++++++++------
 1 file changed, 79 insertions(+), 26 deletions(-)

diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/tools/typesetting/pdftk/default.nix
index 72f25ef099bc..b30d6269c347 100644
--- a/pkgs/tools/typesetting/pdftk/default.nix
+++ b/pkgs/tools/typesetting/pdftk/default.nix
@@ -1,42 +1,95 @@
-{ fetchurl, stdenv, gcj, unzip }:
+{ stdenv, fetchFromGitLab, gradle_5, jre, perl, writeText, runtimeShell }:
 
-stdenv.mkDerivation {
-  name = "pdftk-2.02";
+let
+  pname = "pdftk";
+  version = "3.0.8";
 
-  src = fetchurl {
-    url = "https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-2.02-src.zip";
-    sha256 = "1hdq6zm2dx2f9h7bjrp6a1hfa1ywgkwydp14i2sszjiszljnm3qi";
+  src = fetchFromGitLab {
+    owner = "pdftk-java";
+    repo = "pdftk";
+    rev = "v${version}";
+    sha256 = "1bj4a9g5mbxd859mmawzs0mpm0jw7ap4n1imcwkwz142r9x1g6rk";
   };
 
-  nativeBuildInputs = [ gcj unzip ];
+  deps = stdenv.mkDerivation {
+    pname = "${pname}-deps";
+    inherit src version;
 
-  hardeningDisable = [ "fortify" "format" ];
+    nativeBuildInputs = [ gradle_5 perl ];
 
-  preBuild = ''
-    cd pdftk
-    sed -e 's@/usr/bin/@@g' -i Makefile.*
-    NIX_ENFORCE_PURITY= \
-      make \
-      LIBGCJ="${gcj.cc}/share/java/libgcj-${gcj.cc.version}.jar" \
-      GCJ=gcj GCJH=gcjh GJAR=gjar \
-      -iC ../java all
+    buildPhase = ''
+      export GRADLE_USER_HOME=$(mktemp -d)
+      gradle -Dfile.encoding=utf-8 shadowJar;
+    '';
+
+    # Mavenize dependency paths
+    # e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar
+    installPhase = ''
+      find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
+        | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
+        | sh
+    '';
+
+    outputHashAlgo = "sha256";
+    outputHashMode = "recursive";
+    outputHash = "12b7lw1zpj69pv4bpbrm6pi0ip02ay3dfj3vcy2jyikfbwdb3qcz";
+  };
+
+  # Point to our local deps repo
+  gradleInit = writeText "init.gradle" ''
+    logger.lifecycle 'Replacing Maven repositories with ${deps}...'
+    gradle.projectsLoaded {
+      rootProject.allprojects {
+        buildscript {
+          repositories {
+            clear()
+            maven { url '${deps}' }
+          }
+        }
+        repositories {
+          clear()
+          maven { url '${deps}' }
+        }
+      }
+    }
+
+    settingsEvaluated { settings ->
+      settings.pluginManagement {
+        repositories {
+          maven { url '${deps}' }
+        }
+      }
+  }
   '';
 
-  # Makefile.Debian has almost fitting defaults
-  makeFlags = [ "-f" "Makefile.Debian" "VERSUFF=" ];
+in stdenv.mkDerivation rec {
+  inherit pname version src;
+
+  nativeBuildInputs = [ gradle_5 ];
+
+  buildPhase = ''
+    export GRADLE_USER_HOME=$(mktemp -d)
+    gradle --offline --no-daemon --info --init-script ${gradleInit} shadowJar
+  '';
 
   installPhase = ''
-    mkdir -p $out/bin $out/share/man/man1
-    cp pdftk $out/bin
-    cp ../pdftk.1 $out/share/man/man1
+    mkdir -p $out/{bin,share/pdftk,share/man/man1}
+    cp build/libs/pdftk.jar $out/share/pdftk
+
+    cat  << EOF > $out/bin/pdftk
+    #!${runtimeShell}
+    exec ${jre}/bin/java -jar "$out/share/pdftk/pdftk.jar" "\$@"
+    EOF
+    chmod a+x "$out/bin/pdftk"
+
+    cp ${src}/pdftk.1 $out/share/man/man1
   '';
 
-
   meta = {
-    description = "Simple tool for doing everyday things with PDF documents";
-    homepage = https://www.pdflabs.com/tools/pdftk-server/;
+    description = "Command-line tool for working with PDFs";
+    homepage = "https://gitlab.com/pdftk-java/pdftk";
     license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [raskin];
-    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with stdenv.lib.maintainers; [ raskin averelld ];
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 7da91c565c55d02accb297e1180ce720336782c4 Mon Sep 17 00:00:00 2001
From: Ente <ducksource@duckpond.ch>
Date: Sun, 15 Dec 2019 14:54:28 +0100
Subject: [PATCH 0054/4636] hopper: apply changes from code review

* add dependency to ncurses, gnustep
* don't copy to share/share
* run pre/post Install hooks
* fix desktop icon
* with maintainers
---
 .../tools/analysis/hopper/default.nix         | 39 +++++++++++++++----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix
index d58fad474301..5786bacd7a9d 100644
--- a/pkgs/development/tools/analysis/hopper/default.nix
+++ b/pkgs/development/tools/analysis/hopper/default.nix
@@ -8,10 +8,11 @@
   libbsd,
   python27,
   gmpxx,
-}:
-let
 
-in stdenv.mkDerivation rec {
+  ncurses5,
+  gnustep,
+}:
+stdenv.mkDerivation rec {
   pname    = "hopper";
   version = "4.5.19";
   rev = "v${lib.versions.major version}";
@@ -32,25 +33,47 @@ in stdenv.mkDerivation rec {
     libbsd
     python27
     gmpxx
+
+    ncurses5
+    gnustep.libobjc
   ];
 
   installPhase = ''
+    runHook preInstall
+
     mkdir -p $out/bin
     mkdir -p $out/lib
     mkdir -p $out/share
 
     cp $sourceRoot/opt/hopper-${rev}/bin/Hopper $out/bin/hopper
-    cp -r $sourceRoot/opt/hopper-${rev}/lib $out
-    cp -r $sourceRoot/usr/share $out/share
+    cp \
+      --archive \
+      $sourceRoot/opt/hopper-${rev}/lib/libBlocksRuntime.so* \
+      $sourceRoot/opt/hopper-${rev}/lib/libdispatch.so* \
+      $sourceRoot/opt/hopper-${rev}/lib/libgnustep-base.so* \
+      $sourceRoot/opt/hopper-${rev}/lib/libHopperCore.so* \
+      $sourceRoot/opt/hopper-${rev}/lib/libkqueue.so* \
+      $sourceRoot/opt/hopper-${rev}/lib/libobjcxx.so* \
+      $sourceRoot/opt/hopper-${rev}/lib/libpthread_workqueue.so* \
+      $out/lib
+
+    cp -r $sourceRoot/usr/share $out
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    substituteInPlace "$out/share/applications/hopper-${rev}.desktop" \
+      --replace "Exec=/opt/hopper-${rev}/bin/Hopper" "Exec=$out/bin/hopper"
   '';
 
   meta = with stdenv.lib; {
     homepage = "https://www.hopperapp.com/index.html";
     description = "A macOS and Linux Disassembler";
     license = licenses.unfree;
-    maintainers = [
-      maintainers.luis
-      maintainers.Enteee
+    maintainers = with maintainers; [
+      luis
+      Enteee
     ];
     platforms = platforms.linux;
   };

From bb517428021ab1670f8532ad3d417436b3652ff4 Mon Sep 17 00:00:00 2001
From: Ente <ducksource@duckpond.ch>
Date: Sun, 15 Dec 2019 15:01:21 +0100
Subject: [PATCH 0055/4636] hopper: nixpkgs-fmt

---
 .../tools/analysis/hopper/default.nix         | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix
index 5786bacd7a9d..78be246eb878 100644
--- a/pkgs/development/tools/analysis/hopper/default.nix
+++ b/pkgs/development/tools/analysis/hopper/default.nix
@@ -1,19 +1,17 @@
-{
-  stdenv, fetchurl, lib,
-
-  autoPatchelfHook,
-
-  wrapQtAppsHook,
-
-  libbsd,
-  python27,
-  gmpxx,
-
-  ncurses5,
-  gnustep,
+{ stdenv
+, fetchurl
+, lib
+, autoPatchelfHook
+, wrapQtAppsHook
+, libbsd
+, python27
+, gmpxx
+, ncurses5
+, gnustep
+,
 }:
 stdenv.mkDerivation rec {
-  pname    = "hopper";
+  pname = "hopper";
   version = "4.5.19";
   rev = "v${lib.versions.major version}";
 

From 55fb0c955b4e2e89012dbb7c1665f536426f4826 Mon Sep 17 00:00:00 2001
From: georgewhewell <georgerw@gmail.com>
Date: Sun, 15 Dec 2019 15:05:57 +0000
Subject: [PATCH 0056/4636] kodi: add option for GBM backend

---
 pkgs/applications/video/kodi/default.nix | 9 +++++++++
 pkgs/top-level/all-packages.nix          | 6 ++++++
 2 files changed, 15 insertions(+)

diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 8edc99c5f028..8246212280a2 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -30,6 +30,7 @@
 , vdpauSupport ? true, libvdpau ? null
 , useWayland ? false, wayland ? null, wayland-protocols ? null
 , waylandpp ?  null, libxkbcommon ? null
+, useGbm ? false, mesa ? null, libinput ? null
 }:
 
 assert dbusSupport  -> dbus != null;
@@ -183,6 +184,11 @@ in stdenv.mkDerivation {
       wayland waylandpp
       # Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise
       libxkbcommon.dev
+    ]
+    ++ lib.optional useGbm [
+      libxkbcommon.dev
+      mesa.dev
+      libinput.dev
     ];
 
     nativeBuildInputs = [
@@ -206,6 +212,9 @@ in stdenv.mkDerivation {
     ] ++ lib.optional useWayland [
       "-DCORE_PLATFORM_NAME=wayland"
       "-DWAYLAND_RENDER_SYSTEM=gl"
+    ] ++ lib.optional useGbm [
+      "-DCORE_PLATFORM_NAME=gbm"
+      "-DGBM_RENDER_SYSTEM=gles"
     ];
 
     enableParallelBuilding = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae495eb019ba..594c26d16552 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22074,6 +22074,8 @@ in
 
   kodiPlainWayland = callPackage ../applications/video/kodi { useWayland = true; };
 
+  kodiGBM = callPackage ../applications/video/kodi { useGbm = true; };
+
   kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {});
 
   kodi = wrapKodi {
@@ -22084,6 +22086,10 @@ in
     kodi = kodiPlainWayland;
   };
 
+  kodi-gbm = wrapKodi {
+    kodi = kodiGBM;
+  };
+
   kodi-cli = callPackage ../tools/misc/kodi-cli { };
 
   kodi-retroarch-advanced-launchers =

From cd3597b4864935a8dc978b711a4847a6132b8a2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Netix=20=28Espinet=20Franc=CC=A7ois=29?=
 <dev.espinetfrancois@gmail.com>
Date: Sat, 29 Dec 2018 11:16:51 +0100
Subject: [PATCH 0057/4636] openvswitch: better integration with systemd

Systemd dependencies for scripted mode
were refactored according to analysis in #34586.

networking.vswitches can now be used with systemd-networkd,
although they are not supported by the daemon, a nixos receipe
creates the switch and attached required interfaces (just like
the scripted version).

Vlans and internal interfaces are implemented following the
  template format i.e. each interface is
described using an attributeSet (vlan and type at the moment).
If vlan is present, then interface is added to the vswitch with
given tag (access mode). Type internal enabled vswitch to create
interfaces (see openvswitch docs).

Added configuration for configuring supported openFlow version on
the vswitch

This commit is a split from the original PR #35127.
---
 nixos/modules/services/networking/dhcpcd.nix  |  2 +-
 .../tasks/network-interfaces-scripted.nix     | 49 ++++++++-----
 .../tasks/network-interfaces-systemd.nix      | 69 +++++++++++++++++--
 nixos/modules/tasks/network-interfaces.nix    | 56 +++++++++++++--
 nixos/modules/virtualisation/libvirtd.nix     |  2 +-
 nixos/modules/virtualisation/openvswitch.nix  |  7 +-
 6 files changed, 151 insertions(+), 34 deletions(-)

diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 7b2786034552..4b572df10b43 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -19,7 +19,7 @@ let
     map (i: i.name) (filter (i: if i.useDHCP != null then !i.useDHCP else i.ipv4.addresses != [ ]) interfaces)
     ++ mapAttrsToList (i: _: i) config.networking.sits
     ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges))
-    ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.vswitches))
+    ++ flatten (concatMap (i: attrNames (filterAttrs (_: config: config.type != "internal") i.interfaces)) (attrValues config.networking.vswitches))
     ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bonds))
     ++ config.networking.dhcpcd.denyInterfaces;
 
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index 1726d05115ea..4d25137c5dfc 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -10,7 +10,7 @@ let
 
   slaves = concatMap (i: i.interfaces) (attrValues cfg.bonds)
     ++ concatMap (i: i.interfaces) (attrValues cfg.bridges)
-    ++ concatMap (i: i.interfaces) (attrValues cfg.vswitches)
+    ++ concatMap (i: attrNames (filterAttrs (_: config: config.type != "internal") i.interfaces)) (attrValues cfg.vswitches)
     ++ concatMap (i: [i.interface]) (attrValues cfg.macvlans)
     ++ concatMap (i: [i.interface]) (attrValues cfg.vlans);
 
@@ -336,34 +336,47 @@ let
 
         createVswitchDevice = n: v: nameValuePair "${n}-netdev"
           (let
-            deps = concatLists (map deviceDependency v.interfaces);
+            deps = concatLists (map deviceDependency (attrNames (filterAttrs (_: config: config.type != "internal") v.interfaces)));
+            internalConfigs = concatMap (i: ["network-link-${i}.service" "network-addresses-${i}.service"]) (attrNames (filterAttrs (_: config: config.type == "internal") v.interfaces));
             ofRules = pkgs.writeText "vswitch-${n}-openFlowRules" v.openFlowRules;
           in
           { description = "Open vSwitch Interface ${n}";
-            wantedBy = [ "network-setup.service" "vswitchd.service" ] ++ deps;
-            bindsTo =  [ "vswitchd.service" (subsystemDevice n) ] ++ deps;
-            partOf = [ "network-setup.service" "vswitchd.service" ];
-            after = [ "network-pre.target" "vswitchd.service" ] ++ deps;
-            before = [ "network-setup.service" ];
+            wantedBy = [ "network-setup.service" (subsystemDevice n) ] ++ internalConfigs;
+            # before = [ "network-setup.service" ];
+            # should work without internalConfigs dependencies because address/link configuration depends
+            # on the device, which is created by ovs-vswitchd with type=internal, but it does not...
+            before = [ "network-setup.service" ] ++ internalConfigs;
+            partOf = [ "network-setup.service" ]; # shutdown the bridge when network is shutdown
+            bindsTo = [ "ovs-vswitchd.service" ]; # requires ovs-vswitchd to be alive at all times
+            after = [ "network-pre.target" "ovs-vswitchd.service" ] ++ deps; # start switch after physical interfaces and vswitch daemon
+            wants = deps; # if one or more interface fails, the switch should continue to run
             serviceConfig.Type = "oneshot";
             serviceConfig.RemainAfterExit = true;
             path = [ pkgs.iproute config.virtualisation.vswitch.package ];
+            preStart = ''
+              echo "Resetting Open vSwitch ${n}..."
+              ovs-vsctl --if-exists del-br ${n} -- add-br ${n} \
+                        -- set bridge ${n} protocols=${concatStringsSep "," v.supportedOpenFlowVersions}
+            '';
             script = ''
-              echo "Removing old Open vSwitch ${n}..."
-              ovs-vsctl --if-exists del-br ${n}
-
-              echo "Adding Open vSwitch ${n}..."
-              ovs-vsctl -- add-br ${n} ${concatMapStrings (i: " -- add-port ${n} ${i}") v.interfaces} \
+              echo "Configuring Open vSwitch ${n}..."
+              ovs-vsctl ${concatStrings (mapAttrsToList (name: config: " -- add-port ${n} ${name}" + optionalString (config.vlan != null) " tag=${toString config.vlan}") v.interfaces)} \
+                ${concatStrings (mapAttrsToList (name: config: optionalString (config.type != null) " -- set interface ${name} type=${config.type}") v.interfaces)} \
                 ${concatMapStrings (x: " -- set-controller ${n} " + x)  v.controllers} \
                 ${concatMapStrings (x: " -- " + x) (splitString "\n" v.extraOvsctlCmds)}
 
+
               echo "Adding OpenFlow rules for Open vSwitch ${n}..."
-              ovs-ofctl add-flows ${n} ${ofRules}
+              ovs-ofctl --protocols=${v.openFlowVersion} add-flows ${n} ${ofRules}
             '';
             postStop = ''
+              echo "Cleaning Open vSwitch ${n}"
+              echo "Shuting down internal ${n} interface"
               ip link set ${n} down || true
-              ovs-ofctl del-flows ${n} || true
-              ovs-vsctl --if-exists del-br ${n}
+              echo "Deleting flows for ${n}"
+              ovs-ofctl --protocols=${v.openFlowVersion} del-flows ${n} || true
+              echo "Deleting Open vSwitch ${n}"
+              ovs-vsctl --if-exists del-br ${n} || true
             '';
           });
 
@@ -476,9 +489,9 @@ let
               # Remove Dead Interfaces
               ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}"
               ip link add link "${v.interface}" name "${n}" type vlan id "${toString v.id}"
-              
-              # We try to bring up the logical VLAN interface. If the master 
-              # interface the logical interface is dependent upon is not up yet we will 
+
+              # We try to bring up the logical VLAN interface. If the master
+              # interface the logical interface is dependent upon is not up yet we will
               # fail to immediately bring up the logical interface. The resulting logical
               # interface will brought up later when the master interface is up.
               ip link set "${n}" up || true
diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix
index 9ffa1089ee69..37b42c010a60 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -1,4 +1,4 @@
-{ config, lib, utils, ... }:
+{ config, lib, utils, pkgs, ... }:
 
 with utils;
 with lib;
@@ -18,7 +18,10 @@ let
     concatLists (map (bond: bond.interfaces) (attrValues cfg.bonds))
     ++ concatLists (map (bridge: bridge.interfaces) (attrValues cfg.bridges))
     ++ map (sit: sit.dev) (attrValues cfg.sits)
-    ++ map (vlan: vlan.interface) (attrValues cfg.vlans);
+    ++ map (vlan: vlan.interface) (attrValues cfg.vlans)
+    # add dependency to physical or independently created vswitch member interface
+    # TODO: warn the user that any address configured on those interfaces will be useless
+    ++ concatMap (i: attrNames (filterAttrs (_: config: config.type != "internal") i.interfaces)) (attrValues cfg.vswitches);
 
 in
 
@@ -51,11 +54,6 @@ in
 
     networking.dhcpcd.enable = mkDefault false;
 
-    systemd.services.network-local-commands = {
-      after = [ "systemd-networkd.service" ];
-      bindsTo = [ "systemd-networkd.service" ];
-    };
-
     systemd.network =
       let
         domains = cfg.search ++ (optional (cfg.domain != null) cfg.domain);
@@ -233,6 +231,63 @@ in
     # This forces the network interface creator to initialize slaves.
     networking.interfaces = listToAttrs (map (i: nameValuePair i { }) slaves);
 
+    systemd.services = let
+      # We must escape interfaces due to the systemd interpretation
+      subsystemDevice = interface:
+        "sys-subsystem-net-devices-${escapeSystemdPath interface}.device";
+      # support for creating openvswitch switches
+      createVswitchDevice = n: v: nameValuePair "${n}-netdev"
+          (let
+            deps = map subsystemDevice (attrNames (filterAttrs (_: config: config.type != "internal") v.interfaces));
+            ofRules = pkgs.writeText "vswitch-${n}-openFlowRules" v.openFlowRules;
+          in
+          { description = "Open vSwitch Interface ${n}";
+            wantedBy = [ "network.target" (subsystemDevice n) ];
+            # and create bridge before systemd-networkd starts because it might create internal interfaces
+            before = [ "systemd-networkd.service" ];
+            # shutdown the bridge when network is shutdown
+            partOf = [ "network.target" ];
+            # requires ovs-vswitchd to be alive at all times
+            bindsTo = [ "ovs-vswitchd.service" ];
+            # start switch after physical interfaces and vswitch daemon
+            after = [ "network-pre.target" "ovs-vswitchd.service" ] ++ deps;
+            wants = deps; # if one or more interface fails, the switch should continue to run
+            serviceConfig.Type = "oneshot";
+            serviceConfig.RemainAfterExit = true;
+            path = [ pkgs.iproute config.virtualisation.vswitch.package ];
+            preStart = ''
+              echo "Resetting Open vSwitch ${n}..."
+              ovs-vsctl --if-exists del-br ${n} -- add-br ${n} \
+                        -- set bridge ${n} protocols=${concatStringsSep "," v.supportedOpenFlowVersions}
+            '';
+            script = ''
+              echo "Configuring Open vSwitch ${n}..."
+              ovs-vsctl ${concatStrings (mapAttrsToList (name: config: " -- add-port ${n} ${name}" + optionalString (config.vlan != null) " tag=${toString config.vlan}") v.interfaces)} \
+                ${concatStrings (mapAttrsToList (name: config: optionalString (config.type != null) " -- set interface ${name} type=${config.type}") v.interfaces)} \
+                ${concatMapStrings (x: " -- set-controller ${n} " + x)  v.controllers} \
+                ${concatMapStrings (x: " -- " + x) (splitString "\n" v.extraOvsctlCmds)}
+
+
+              echo "Adding OpenFlow rules for Open vSwitch ${n}..."
+              ovs-ofctl --protocols=${v.openFlowVersion} add-flows ${n} ${ofRules}
+            '';
+            postStop = ''
+              echo "Cleaning Open vSwitch ${n}"
+              echo "Shuting down internal ${n} interface"
+              ip link set ${n} down || true
+              echo "Deleting flows for ${n}"
+              ovs-ofctl --protocols=${v.openFlowVersion} del-flows ${n} || true
+              echo "Deleting Open vSwitch ${n}"
+              ovs-vsctl --if-exists del-br ${n} || true
+            '';
+          });
+    in mapAttrs' createVswitchDevice cfg.vswitches
+      // {
+            "network-local-commands" = {
+              after = [ "systemd-networkd.service" ];
+              bindsTo = [ "systemd-networkd.service" ];
+          };
+      };
   };
 
 }
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 31e2ed1cd1ea..fc80e6fcc3ef 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -13,7 +13,7 @@ let
 
   slaves = concatMap (i: i.interfaces) (attrValues cfg.bonds)
     ++ concatMap (i: i.interfaces) (attrValues cfg.bridges)
-    ++ concatMap (i: i.interfaces) (attrValues cfg.vswitches);
+    ++ concatMap (i: attrNames (filterAttrs (name: config: ! (config.type == "internal" || hasAttr name cfg.interfaces)) i.interfaces)) (attrValues cfg.vswitches);
 
   slaveIfs = map (i: cfg.interfaces.${i}) (filter (i: cfg.interfaces ? ${i}) slaves);
 
@@ -310,6 +310,32 @@ let
 
   };
 
+  vswitchInterfaceOpts = {name, ...}: {
+
+    options = {
+
+      name = mkOption {
+        description = "Name of the interface";
+        example = "eth0";
+        type = types.str;
+      };
+
+      vlan = mkOption {
+        description = "Vlan tag to apply to interface";
+        example = 10;
+        type = types.nullOr types.int;
+        default = null;
+      };
+
+      type = mkOption {
+        description = "Openvswitch type to assign to interface";
+        example = "internal";
+        type = types.nullOr types.str;
+        default = null;
+      };
+    };
+  };
+
   hexChars = stringToCharacters "0123456789abcdef";
 
   isHexString = s: all (c: elem c hexChars) (stringToCharacters (toLower s));
@@ -460,8 +486,8 @@ in
     networking.vswitches = mkOption {
       default = { };
       example =
-        { vs0.interfaces = [ "eth0" "eth1" ];
-          vs1.interfaces = [ "eth2" "wlan0" ];
+        { vs0.interfaces = { eth0 = { }; lo1 = { type="internal"; }; };
+          vs1.interfaces = [ { name = "eth2"; } { name = "lo2"; type="internal"; } ];
         };
       description =
         ''
@@ -478,9 +504,8 @@ in
 
           interfaces = mkOption {
             example = [ "eth0" "eth1" ];
-            type = types.listOf types.str;
-            description =
-              "The physical network interfaces connected by the vSwitch.";
+            description = "The physical network interfaces connected by the vSwitch.";
+            type = with types; loaOf (submodule vswitchInterfaceOpts);
           };
 
           controllers = mkOption {
@@ -504,6 +529,25 @@ in
             '';
           };
 
+          # TODO: custom "openflow version" type, with list from existing openflow protocols
+          supportedOpenFlowVersions = mkOption {
+            type = types.listOf types.str;
+            example = [ "OpenFlow10" "OpenFlow13" "OpenFlow14" ];
+            default = [ "OpenFlow13" ];
+            description = ''
+              Supported versions to enable on this switch.
+            '';
+          };
+
+          # TODO: use same type as elements from supportedOpenFlowVersions
+          openFlowVersion = mkOption {
+            type = types.str;
+            default = "OpenFlow13";
+            description = ''
+              Version of OpenFlow protocol to use when communicating with the switch internally (e.g. with <literal>openFlowRules</literal>).
+            '';
+          };
+
           extraOvsctlCmds = mkOption {
             type = types.lines;
             default = "";
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 52d852894ce5..9f7bac480e38 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -219,7 +219,7 @@ in {
       wantedBy = [ "multi-user.target" ];
       requires = [ "libvirtd-config.service" ];
       after = [ "systemd-udev-settle.service" "libvirtd-config.service" ]
-              ++ optional vswitch.enable "vswitchd.service";
+              ++ optional vswitch.enable "ovs-vswitchd.service";
 
       environment.LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}'';
 
diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix
index 6b8ad83661fe..c6a3ceddc3e0 100644
--- a/nixos/modules/virtualisation/openvswitch.nix
+++ b/nixos/modules/virtualisation/openvswitch.nix
@@ -124,7 +124,7 @@ in {
       '';
     };
 
-    systemd.services.vswitchd = {
+    systemd.services.ovs-vswitchd = {
       description = "Open_vSwitch Daemon";
       wantedBy = [ "multi-user.target" ];
       bindsTo = [ "ovsdb.service" ];
@@ -139,6 +139,8 @@ in {
         PIDFile = "/run/openvswitch/ovs-vswitchd.pid";
         # Use service type 'forking' to correctly determine when vswitchd is ready.
         Type = "forking";
+        Restart = "always";
+        RestartSec = 3;
       };
     };
 
@@ -182,4 +184,7 @@ in {
       '';
     };
   })]));
+
+  meta.maintainers = with maintainers; [ netixx ];
+
 }

From 9665977f4cca4333add0a061db78daa2b650f0b0 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 15 Dec 2019 19:04:10 -0500
Subject: [PATCH 0058/4636] makeDesktopItem: add desktop file validation

This uses desktop-file-validate in desktop-file-utils.
It can be turned off if wanted.
---
 pkgs/build-support/make-desktopitem/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix
index 67b82fd66db1..127243c6f2f8 100644
--- a/pkgs/build-support/make-desktopitem/default.nix
+++ b/pkgs/build-support/make-desktopitem/default.nix
@@ -1,4 +1,5 @@
-{ lib, runCommandLocal }:
+{ lib, runCommandLocal, desktop-file-utils }:
+
 { name
 , type ? "Application"
 , exec
@@ -11,6 +12,7 @@
 , categories ? "Application;Other;"
 , startupNotify ? null
 , extraEntries ? null
+, fileValidation ? true # whether to validate resulting desktop file.
 }:
 
 let
@@ -28,8 +30,8 @@ let
 in
 runCommandLocal "${name}.desktop" {}
   ''
-    mkdir -p $out/share/applications
-    cat > $out/share/applications/${name}.desktop <<EOF
+    mkdir -p "$out/share/applications"
+    cat > "$out/share/applications/${name}.desktop" <<EOF
     [Desktop Entry]
     Type=${type}
     Exec=${exec}
@@ -40,4 +42,9 @@ runCommandLocal "${name}.desktop" {}
     ${if extraEntries == null then ''EOF'' else ''
     ${extraEntries}
     EOF''}
+
+    ${lib.optionalString fileValidation ''
+      echo "Running desktop-file validation"
+      ${desktop-file-utils}/bin/desktop-file-validate "$out/share/applications/${name}.desktop"
+    ''}
   ''

From 970e6452ed5f94f55487502dbdf0703e8c628adb Mon Sep 17 00:00:00 2001
From: Ente <ducksource@duckpond.ch>
Date: Wed, 18 Dec 2019 12:42:27 +0100
Subject: [PATCH 0059/4636] hopper: remove unneeded ,

---
 pkgs/development/tools/analysis/hopper/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix
index 78be246eb878..8bb1c5d04f87 100644
--- a/pkgs/development/tools/analysis/hopper/default.nix
+++ b/pkgs/development/tools/analysis/hopper/default.nix
@@ -8,7 +8,6 @@
 , gmpxx
 , ncurses5
 , gnustep
-,
 }:
 stdenv.mkDerivation rec {
   pname = "hopper";

From 4a0819805a6e389bb5e37a72d8d41345b1ad4a1a Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Thu, 19 Dec 2019 12:26:45 +0000
Subject: [PATCH 0060/4636] wooting-udev-rules: init at 20190601

Signed-off-by: David Wood <david.wood@codeplay.com>
---
 .../linux/wooting-udev-rules/default.nix      | 23 +++++++++++++++++++
 .../linux/wooting-udev-rules/wooting.rules    |  9 ++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 34 insertions(+)
 create mode 100644 pkgs/os-specific/linux/wooting-udev-rules/default.nix
 create mode 100644 pkgs/os-specific/linux/wooting-udev-rules/wooting.rules

diff --git a/pkgs/os-specific/linux/wooting-udev-rules/default.nix b/pkgs/os-specific/linux/wooting-udev-rules/default.nix
new file mode 100644
index 000000000000..49da843e3ad9
--- /dev/null
+++ b/pkgs/os-specific/linux/wooting-udev-rules/default.nix
@@ -0,0 +1,23 @@
+{ stdenv }:
+
+stdenv.mkDerivation rec {
+  pname = "wooting-udev-rules";
+  version = "20190601";
+
+  # Source: https://wooting.helpscoutdocs.com/article/68-wootility-configuring-device-access-for-wootility-under-linux-udev-rules
+  src = [ ./wooting.rules ];
+
+  unpackPhase = ":";
+
+  installPhase = ''
+    install -Dpm644 $src $out/lib/udev/rules.d/70-wooting.rules
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wooting.helpscoutdocs.com/article/34-linux-udev-rules;
+    description = "udev rules that give NixOS permission to communicate with Wooting keyboards";
+    platforms = platforms.linux;
+    license = "unknown";
+    maintainers = with maintainers; [ davidtwco ];
+  };
+}
diff --git a/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules b/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules
new file mode 100644
index 000000000000..d906df3d4c6a
--- /dev/null
+++ b/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules
@@ -0,0 +1,9 @@
+# Wooting One
+SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff01", MODE:="0660", GROUP="input"
+# Wooting One update mode
+SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", MODE:="0660", GROUP="input"
+
+# Wooting Two
+SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", MODE:="0660", GROUP="input"
+# Wooting Two update mode
+SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", MODE:="0660", GROUP="input"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39b764537f7e..ab90b14e41f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17052,6 +17052,8 @@ in
 
   wirelesstools = callPackage ../os-specific/linux/wireless-tools { };
 
+  wooting-udev-rules = callPackage ../os-specific/linux/wooting-udev-rules { };
+
   wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { };
 
   wpa_supplicant_gui = libsForQt5.callPackage ../os-specific/linux/wpa_supplicant/gui.nix { };

From 47d402e4f70bc96daed0f8cc4bd9d94bea4cedce Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Thu, 19 Dec 2019 12:28:30 +0000
Subject: [PATCH 0061/4636] wootility: init at 3.3.3

Signed-off-by: David Wood <david.wood@codeplay.com>
---
 pkgs/tools/misc/wootility/default.nix | 32 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/misc/wootility/default.nix

diff --git a/pkgs/tools/misc/wootility/default.nix b/pkgs/tools/misc/wootility/default.nix
new file mode 100644
index 000000000000..e88322f7f756
--- /dev/null
+++ b/pkgs/tools/misc/wootility/default.nix
@@ -0,0 +1,32 @@
+{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3, udev, wooting-udev-rules }:
+
+let
+  pname = "wootility";
+  version = "3.3.3";
+in
+appimageTools.wrapType2 rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-linux-latest/wootility-${version}.AppImage";
+    sha256 = "1qdiacwnvqahqkrhwnblz0jjywn63c6ndl3z450myhx5x55fdcja";
+  };
+
+  profile = ''
+    export LC_ALL=C.UTF-8
+    export XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS"
+  '';
+
+  multiPkgs = extraPkgs;
+  extraPkgs =
+    pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ ([ udev wooting-udev-rules ]);
+  extraInstallCommands = "mv $out/bin/{${name},${pname}}";
+
+  meta = with lib; {
+    homepage = https://wooting.io/wootility;
+    description = "Wootility is customization and management software for Wooting keyboards.";
+    platforms = [ "x86_64-linux" ];
+    license = "unknown";
+    maintainers = with maintainers; [ davidtwco ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab90b14e41f8..de240791c11a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7078,6 +7078,8 @@ in
 
   woof = callPackage ../tools/misc/woof { };
 
+  wootility = callPackage ../tools/misc/wootility { };
+
   wpscan = callPackage ../tools/security/wpscan { };
 
   wsmancli = callPackage ../tools/system/wsmancli {};

From 33f4d93e0308631255eb04629c28dab0acda50d3 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Thu, 19 Dec 2019 12:29:20 +0000
Subject: [PATCH 0062/4636] nixos/wooting: add `hardware.wooting` module

Signed-off-by: David Wood <david.wood@codeplay.com>
---
 nixos/modules/hardware/wooting.nix | 12 ++++++++++++
 nixos/modules/module-list.nix      |  1 +
 2 files changed, 13 insertions(+)
 create mode 100644 nixos/modules/hardware/wooting.nix

diff --git a/nixos/modules/hardware/wooting.nix b/nixos/modules/hardware/wooting.nix
new file mode 100644
index 000000000000..ee550cbbf6b8
--- /dev/null
+++ b/nixos/modules/hardware/wooting.nix
@@ -0,0 +1,12 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+{
+  options.hardware.wooting.enable =
+    mkEnableOption "Enable support for Wooting keyboards";
+
+  config = mkIf config.hardware.wooting.enable {
+    environment.systemPackages = [ pkgs.wootility ];
+    services.udev.packages = [ pkgs.wooting-udev-rules ];
+  };
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 3300848220a0..886156a3e494 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -63,6 +63,7 @@
   ./hardware/steam-hardware.nix
   ./hardware/usb-wwan.nix
   ./hardware/onlykey.nix
+  ./hardware/wooting.nix
   ./hardware/video/amdgpu.nix
   ./hardware/video/amdgpu-pro.nix
   ./hardware/video/ati.nix

From c82658ac4a8929f050960a6e59939b5d529adcd6 Mon Sep 17 00:00:00 2001
From: PsyanticY <iuns@outlook.fr>
Date: Mon, 23 Dec 2019 17:18:23 +0100
Subject: [PATCH 0063/4636] s3bro: init at 2.8

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

diff --git a/pkgs/tools/admin/s3bro/default.nix b/pkgs/tools/admin/s3bro/default.nix
new file mode 100644
index 000000000000..9f383a8638d3
--- /dev/null
+++ b/pkgs/tools/admin/s3bro/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, python3Packages }:
+
+python3Packages.buildPythonPackage rec {
+  pname = "s3bro";
+  version = "2.8";
+
+  src = python3Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "0k25g3vch0q772f29jlghda5mjvps55h5lgwhwwbd5g2nlnrrspq";
+  };
+
+  propagatedBuildInputs = with python3Packages; [ boto3 botocore click termcolor ];
+
+  # No tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A handy s3 cli tool";
+    homepage = https://github.com/rsavordelli/s3bro;
+    license = licenses.mit;
+    maintainers = with maintainers; [ psyanticy ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f6b16b1ef32f..6be1eebd1290 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6122,6 +6122,8 @@ in
 
   s3backer = callPackage ../tools/filesystems/s3backer { };
 
+  s3bro = callPackage ../tools/admin/s3bro { };
+
   s3fs = callPackage ../tools/filesystems/s3fs { };
 
   s3cmd = callPackage ../tools/networking/s3cmd { };

From eaffc7d0a5f85d3c0ff0b6405de712eebc4b337d Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Tue, 24 Dec 2019 16:05:16 -0500
Subject: [PATCH 0064/4636] Deprecate the boot.vesa option

---
 nixos/modules/system/boot/kernel.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index ee43fe100238..da6c322ae1d5 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -100,7 +100,12 @@ in
       type = types.bool;
       default = false;
       description = ''
-        Whether to activate VESA video mode on boot.
+        (Deprecated) This option, if set, activates the VESA 800x600 video
+        mode on boot and disables kernel modesetting. It is equivalent to
+        specifying <literal>[ "vga=0x317" "nomodeset" ]</literal> in the
+        <option>boot.kernelParams</option> option. This option is
+        deprecated as of 2020: Xorg now works better with modesetting, and
+        you might want a different VESA vga setting, anyway.
       '';
     };
 

From 0ba8b3b67bb516b5d7cc65e22c9e305b5cc58e54 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 29 Dec 2019 19:40:34 -0500
Subject: [PATCH 0065/4636] buildsrht: 0.48.0 -> 0.52.5

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

diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix
index 76edc1b3e646..0711dda52d26 100644
--- a/pkgs/applications/version-management/sourcehut/builds.nix
+++ b/pkgs/applications/version-management/sourcehut/builds.nix
@@ -4,7 +4,7 @@
 , srht, redis, celery, pyyaml, markdown }:
 
 let
-  version = "0.48.0";
+  version = "0.52.5";
 
   buildWorker = src: buildGoModule {
     inherit src version;
@@ -20,7 +20,7 @@ in buildPythonPackage rec {
   src = fetchgit {
     url = "https://git.sr.ht/~sircmpwn/builds.sr.ht";
     rev = version;
-    sha256 = "1z5bxsn67cqffixqsrnska86mw0a6494650wbi6dbp10z03870bs";
+    sha256 = "142aycnary6yfi0y1i3zgpyndi0756fingavcz2dnqi36pkajaaj";
   };
 
   patches = [

From 72fb1992ef308c163bca2ae954ef34b721cb4618 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 29 Dec 2019 19:40:39 -0500
Subject: [PATCH 0066/4636] dispatchsrht: 0.12.3 -> 0.13.3

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

diff --git a/pkgs/applications/version-management/sourcehut/dispatch.nix b/pkgs/applications/version-management/sourcehut/dispatch.nix
index a61f35b9ee1c..ca9c2ac0074d 100644
--- a/pkgs/applications/version-management/sourcehut/dispatch.nix
+++ b/pkgs/applications/version-management/sourcehut/dispatch.nix
@@ -4,12 +4,12 @@
 
 buildPythonPackage rec {
   pname = "dispatchsrht";
-  version = "0.12.3";
+  version = "0.13.3";
 
   src = fetchgit {
     url = "https://git.sr.ht/~sircmpwn/dispatch.sr.ht";
     rev = version;
-    sha256 = "0lpc8jpyz1rg3g98546wlhr27b15g32lds77hl42aixv5f5b8lc9";
+    sha256 = "08asayfwpzafscpli5grx1p0y1ryz7pqkznf5bd9j8ir2iyhbc10";
   };
 
   patches = [

From 0b6cb53f5f8db6310adfb4231c5510fd075ecf25 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 29 Dec 2019 19:40:45 -0500
Subject: [PATCH 0067/4636] gitsrht: 0.35.6 -> 0.43.3

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

diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix
index b580e89c747e..e993098d0b96 100644
--- a/pkgs/applications/version-management/sourcehut/git.nix
+++ b/pkgs/applications/version-management/sourcehut/git.nix
@@ -4,7 +4,7 @@
 , srht, pygit2, scmsrht }:
 
 let
-  version = "0.35.6";
+  version = "0.43.3";
 
   buildShell = src: buildGoModule {
     inherit src version;
@@ -28,7 +28,7 @@ in buildPythonPackage rec {
   src = fetchgit {
     url = "https://git.sr.ht/~sircmpwn/git.sr.ht";
     rev = version;
-    sha256 = "0j8caqbzdqkgc1bdhzz4k5hgh8lhsghfgwf46d19ryf83d8ggxqc";
+    sha256 = "1f9wfyri85bq4zi9xkbfcfb69q4abh0hz7p3lghj460hh9zxc57w";
   };
 
   patches = [

From 85ff8f9f94f504082d8eb796331c6b1a40a76e2e Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 29 Dec 2019 19:40:50 -0500
Subject: [PATCH 0068/4636] hgsrht: 0.16.2 -> 0.21.1

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

diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix
index fd5c3145db0a..2d57012d071d 100644
--- a/pkgs/applications/version-management/sourcehut/hg.nix
+++ b/pkgs/applications/version-management/sourcehut/hg.nix
@@ -4,12 +4,12 @@
 
 buildPythonPackage rec {
   pname = "hgsrht";
-  version = "0.16.2";
+  version = "0.21.1";
 
   src = fetchhg {
     url = "https://hg.sr.ht/~sircmpwn/hg.sr.ht";
     rev = version;
-    sha256 = "02bzy31zplnlqg8rcls5n65q1h920lhy6f51w89w1kskdw7r2mhy";
+    sha256 = "19r8zcy4xf9imqifqw3b7ylxd46i025ncns69kn5xp11damilz66";
   };
 
   patches = [

From ef17a5092cf2021b30f998bf0210398b0972e97a Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 29 Dec 2019 19:40:55 -0500
Subject: [PATCH 0069/4636] listssrht: 0.38.3 -> 0.40.3

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

diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix
index d050895ca237..8cac8230f3e8 100644
--- a/pkgs/applications/version-management/sourcehut/lists.nix
+++ b/pkgs/applications/version-management/sourcehut/lists.nix
@@ -4,12 +4,12 @@
 
 buildPythonPackage rec {
   pname = "listssrht";
-  version = "0.38.3";
+  version = "0.40.3";
 
   src = fetchgit {
     url = "https://git.sr.ht/~sircmpwn/lists.sr.ht";
     rev = version;
-    sha256 = "020s6kglm7620pjn2j7fxvaqd5lpz7y7x0wf014jsrm71l6w0rla";
+    sha256 = "1s736i5wm04pqa5k7455bdjdi7vjgvq32q1v6mdsp1w7jhgy1ags";
   };
 
   patches = [

From cce0d7ee57d758171b03d67e24ac3e6e7d1ca7b0 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 29 Dec 2019 19:40:59 -0500
Subject: [PATCH 0070/4636] mansrht: 0.13.5 -> 0.14.1

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

diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix
index df4e62a7ac26..7ed4c6a5a248 100644
--- a/pkgs/applications/version-management/sourcehut/man.nix
+++ b/pkgs/applications/version-management/sourcehut/man.nix
@@ -4,12 +4,12 @@
 
 buildPythonPackage rec {
   pname = "mansrht";
-  version = "0.13.5";
+  version = "0.14.1";
 
   src = fetchgit {
     url = "https://git.sr.ht/~sircmpwn/man.sr.ht";
     rev = version;
-    sha256 = "1hfxhczppn8yng6m3kdzj9rn6zjhwpm6dq3pzaiaii92b3d4cyh3";
+    sha256 = "13yar0sa24jyiq0l4p4bgq6p5crj148f26sxwyi37g76jqba4rfi";
   };
 
   patches = [

From 8ded6650a715f3c503ff04a9897aa5d8457f16f2 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 29 Dec 2019 19:41:04 -0500
Subject: [PATCH 0071/4636] metasrht: 0.37.0 -> 0.41.10

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

diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix
index a5458b0b8641..17b4c91446f6 100644
--- a/pkgs/applications/version-management/sourcehut/meta.nix
+++ b/pkgs/applications/version-management/sourcehut/meta.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "metasrht";
-  version = "0.37.0";
+  version = "0.41.10";
 
   src = fetchgit {
     url = "https://git.sr.ht/~sircmpwn/meta.sr.ht";
     rev = version;
-    sha256 = "1jf3h2v27cbam8bwiw3x35319pzp0r651p8mfhw150jvskyvmkmr";
+    sha256 = "1srzrajgwq85kjryxykj708m2c98r6a84x4k4a5grwznqw3mwm6p";
   };
 
   nativeBuildInputs = srht.nativeBuildInputs;

From 9ec305a493725bf54d0ba8b0c05ca02583301359 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 29 Dec 2019 19:41:10 -0500
Subject: [PATCH 0072/4636] pastesrht: 0.7.3 -> 0.9.2

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

diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix
index 4e397c649f90..b629ca9bca30 100644
--- a/pkgs/applications/version-management/sourcehut/paste.nix
+++ b/pkgs/applications/version-management/sourcehut/paste.nix
@@ -4,12 +4,12 @@
 
 buildPythonPackage rec {
   pname = "pastesrht";
-  version = "0.7.3";
+  version = "0.9.2";
 
   src = fetchgit {
     url = "https://git.sr.ht/~sircmpwn/paste.sr.ht";
     rev = version;
-    sha256 = "15689gk37djcwdjb636d97k0il2zpdpksb95l9l4d43wipd7x5qi";
+    sha256 = "0hiv607a7446dba524kblmpswlcz0z4i1jr49ng7g90nhpsk8dy4";
   };
 
   patches = [

From 0282a909f74ccc7abb9ff7c07a8836d6ab47b8bb Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 29 Dec 2019 19:41:15 -0500
Subject: [PATCH 0073/4636] todosrht: 0.51.13 -> 0.55.3

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

diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix
index a7703bd07292..4955879eeb08 100644
--- a/pkgs/applications/version-management/sourcehut/todo.nix
+++ b/pkgs/applications/version-management/sourcehut/todo.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "todosrht";
-  version = "0.51.13";
+  version = "0.55.3";
 
   src = fetchgit {
     url = "https://git.sr.ht/~sircmpwn/todo.sr.ht";
     rev = version;
-    sha256 = "19gywq5j7wlpk7j2whm2ivz0z0i3j50n7k7bx29pghndl7l43c18";
+    sha256 = "1j82yxdnag0q6rp0rpiq3ccn5maa1k58j2f1ilcsxf1gr13pycf5";
   };
 
   patches = [

From 7845e281258d7978cc5b81c08807cb8bcc9cf29f Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 29 Dec 2019 19:41:20 -0500
Subject: [PATCH 0074/4636] scmsrht: 0.16.0 -> 0.18.1

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

diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix
index c5209cee46bc..2c48a1bf011c 100644
--- a/pkgs/applications/version-management/sourcehut/scm.nix
+++ b/pkgs/applications/version-management/sourcehut/scm.nix
@@ -4,12 +4,12 @@
 
 buildPythonPackage rec {
   pname = "scmsrht";
-  version = "0.16.0";
+  version = "0.18.1";
 
   src = fetchgit {
     url = "https://git.sr.ht/~sircmpwn/scm.sr.ht";
     rev = version;
-    sha256 = "0jny8ihn49n7bpw5nhdrfha78yzpxp277l50y1lj142r59kwmh22";
+    sha256 = "1f0h8vbbqx34v1rgzqjkgbf0z7jhnp8hdlzmrxwhs74kj6zjb134";
   };
 
   nativeBuildInputs = srht.nativeBuildInputs;

From 9401dcc3607b0368553dee39921f2bee279d141c Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 29 Dec 2019 20:03:05 -0500
Subject: [PATCH 0075/4636] buildsrht: fix build

---
 pkgs/applications/version-management/sourcehut/builds.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix
index 0711dda52d26..07935336c1e2 100644
--- a/pkgs/applications/version-management/sourcehut/builds.nix
+++ b/pkgs/applications/version-management/sourcehut/builds.nix
@@ -11,7 +11,7 @@ let
     pname = "builds-sr-ht-worker";
     goPackagePath = "git.sr.ht/~sircmpwn/builds.sr.ht/worker";
 
-    modSha256 = "1jm259ncw8dgqp0fqbjn30c4y3v3vwqj41gfh99jx30bwlmpgfax";
+    modSha256 = "1dwp87zsbh4a48q0pacssy329kchrd4sa47c5a1k8smbqn078424";
   };
 in buildPythonPackage rec {
   inherit version;

From 1360a0303d28ba5f5531f83f2ebafdbfb5429e1e Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 29 Dec 2019 20:03:28 -0500
Subject: [PATCH 0076/4636] srht: drop flask_login

---
 .../version-management/sourcehut/core.nix        | 16 +++-------------
 .../version-management/sourcehut/dispatch.nix    |  3 +--
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix
index 67486bd28f3a..9c1a04c1a961 100644
--- a/pkgs/applications/version-management/sourcehut/core.nix
+++ b/pkgs/applications/version-management/sourcehut/core.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, fetchNodeModules, buildPythonPackage
 , pgpy, flask, bleach, misaka, humanize, markdown, psycopg2, pygments, requests
-, sqlalchemy, flask_login, beautifulsoup4, sqlalchemy-utils, celery, alembic
+, sqlalchemy, cryptography, beautifulsoup4, sqlalchemy-utils, celery, alembic
 , importlib-metadata
 , sassc, nodejs
 , writeText }:
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     pygments
     requests
     sqlalchemy
-    flask_login
+    cryptography
     beautifulsoup4
     sqlalchemy-utils
 
@@ -57,17 +57,7 @@ buildPythonPackage rec {
     cp -r ${node_modules} srht/node_modules
   '';
 
-  preCheck = let
-    config = writeText "config.ini" ''
-      [webhooks]
-      private-key=K6JupPpnr0HnBjelKTQUSm3Ro9SgzEA2T2Zv472OvzI=
-
-      [meta.sr.ht]
-      origin=http://meta.sr.ht.local
-    '';
-  in ''
-    cp -f ${config} config.ini
-  '';
+  dontUseSetuptoolsCheck = true;
 
   meta = with stdenv.lib; {
     homepage = https://git.sr.ht/~sircmpwn/srht;
diff --git a/pkgs/applications/version-management/sourcehut/dispatch.nix b/pkgs/applications/version-management/sourcehut/dispatch.nix
index ca9c2ac0074d..a078c5acb4f3 100644
--- a/pkgs/applications/version-management/sourcehut/dispatch.nix
+++ b/pkgs/applications/version-management/sourcehut/dispatch.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, buildPythonPackage
 , python
-, srht, pyyaml, PyGithub, cryptography }:
+, srht, pyyaml, PyGithub }:
 
 buildPythonPackage rec {
   pname = "dispatchsrht";
@@ -22,7 +22,6 @@ buildPythonPackage rec {
     srht
     pyyaml
     PyGithub
-    cryptography
   ];
 
   preBuild = ''

From 889e5ca6546ed13bd2acb0cbb2a48c24ac0a4619 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 29 Dec 2019 20:03:37 -0500
Subject: [PATCH 0077/4636] gitsrht: fix build

---
 .../version-management/sourcehut/git.nix      | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix
index e993098d0b96..93ab499e14e3 100644
--- a/pkgs/applications/version-management/sourcehut/git.nix
+++ b/pkgs/applications/version-management/sourcehut/git.nix
@@ -8,19 +8,35 @@ let
 
   buildShell = src: buildGoModule {
     inherit src version;
-    pname = "git-srht-shell";
+    pname = "gitsrht-shell";
     goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-shell";
 
-    modSha256 = "1v4npijqgv09ssrxf1y1b3syb2fs7smy7k9rcj3ynsfrn9xgfd9y";
+    modSha256 = "0lxxxzh39bviab71kfsqqr217338yxn5l2zkak55r6qqs6iz4ccv";
   };
 
   buildDispatcher = src: buildGoModule {
     inherit src version;
-    pname = "git-srht-dispatcher";
+    pname = "gitsrht-dispatcher";
     goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-dispatch";
 
     modSha256 = "1lmgmlin460g09dph2hw6yz25d4agqwjhrjv0qqsis7df9qpf3i1";
   };
+
+  buildKeys = src: buildGoModule {
+    inherit src version;
+    pname = "gitsrht-keys";
+    goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-keys";
+
+    modSha256 = "1pfcw9n63zhlxm9kd3bxa2zqmzd8mgl7yl2ck055j56v3k929w3f";
+  };
+
+  buildUpdateHook = src: buildGoModule {
+    inherit src version;
+    pname = "gitsrht-update-hook";
+    goPackagePath = "git.sr.ht/~sircmpwn/git.sr.ht/gitsrht-update-hook";
+
+    modSha256 = "0p8qd6hpgmnlfqk5vw6l41dqs7qjhf6xijzj5iv6wv1cf362b4wp";
+  };
 in buildPythonPackage rec {
   inherit version;
   pname = "gitsrht";
@@ -52,6 +68,8 @@ in buildPythonPackage rec {
     mkdir -p $out/bin
     cp ${buildShell "${src}/gitsrht-shell"}/bin/gitsrht-shell $out/bin/gitsrht-shell
     cp ${buildDispatcher "${src}/gitsrht-dispatch"}/bin/gitsrht-dispatch $out/bin/gitsrht-dispatch
+    cp ${buildKeys "${src}/gitsrht-keys"}/bin/gitsrht-keys $out/bin/gitsrht-keys
+    cp ${buildUpdateHook "${src}/gitsrht-update-hook"}/bin/gitsrht-update-hook $out/bin/gitsrht-update-hook
   '';
 
   meta = with stdenv.lib; {

From e313963c0543ff273e60e98e1223b6180b564250 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 29 Dec 2019 20:03:54 -0500
Subject: [PATCH 0078/4636] listssrht: drop unidiff

---
 pkgs/applications/version-management/sourcehut/lists.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix
index 8cac8230f3e8..a7915a917baf 100644
--- a/pkgs/applications/version-management/sourcehut/lists.nix
+++ b/pkgs/applications/version-management/sourcehut/lists.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, buildPythonPackage
 , python
-, srht, asyncpg, unidiff, aiosmtpd, pygit2, emailthreads }:
+, srht, asyncpg, aiosmtpd, pygit2, emailthreads }:
 
 buildPythonPackage rec {
   pname = "listssrht";
@@ -22,7 +22,6 @@ buildPythonPackage rec {
     srht
     pygit2
     asyncpg
-    unidiff
     aiosmtpd
     emailthreads
   ];

From d0c08d8d9b54492f6fc151769c206578b1b6e70f Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 29 Dec 2019 20:04:02 -0500
Subject: [PATCH 0079/4636] scmsrht: fix build

---
 .../version-management/sourcehut/scm.nix        | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix
index 2c48a1bf011c..add791da2840 100644
--- a/pkgs/applications/version-management/sourcehut/scm.nix
+++ b/pkgs/applications/version-management/sourcehut/scm.nix
@@ -25,22 +25,7 @@ buildPythonPackage rec {
     export PKGVER=${version}
   '';
 
-  # No actual? tests but seems like it needs this anyway
-  preCheck = let
-    config = writeText "config.ini" ''
-      [webhooks]
-      private-key=K6JupPpnr0HnBjelKTQUSm3Ro9SgzEA2T2Zv472OvzI=
-
-      [builds.sr.ht]
-      origin=http://builds.sr.ht.local
-      oauth-client-id=
-
-      [meta.sr.ht]
-      origin=http://meta.sr.ht.local
-    '';
-  in ''
-    cp -f ${config} config.ini
-  '';
+  dontUseSetuptoolsCheck = true;
 
   meta = with stdenv.lib; {
     homepage = https://git.sr.ht/~sircmpwn/git.sr.ht;

From 5ff450e83f68f2c8cfb9ea72c8cb8de3e7ded797 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 29 Dec 2019 20:04:16 -0500
Subject: [PATCH 0080/4636] todosrht: fix build

---
 .../version-management/sourcehut/todo.nix     | 24 ++-----------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix
index 4955879eeb08..572c2919b16d 100644
--- a/pkgs/applications/version-management/sourcehut/todo.nix
+++ b/pkgs/applications/version-management/sourcehut/todo.nix
@@ -31,33 +31,13 @@ buildPythonPackage rec {
     export SRHT_PATH=${srht}/${python.sitePackages}/srht
   '';
 
+  # pytest tests fail
   checkInputs = [
     pytest
     factory_boy
   ];
 
-  installCheckPhase = let
-    config = writeText "config.ini" ''
-      [webhooks]
-      private-key=K6JupPpnr0HnBjelKTQUSm3Ro9SgzEA2T2Zv472OvzI=
-
-      [todo.sr.ht]
-      origin=http://todo.sr.ht.local
-      oauth-client-id=
-      oauth-client-secret=
-
-      [todo.sr.ht::mail]
-      posting-domain=
-
-      [meta.sr.ht]
-      origin=http://meta.sr.ht.local
-    '';
-  in ''
-    cp -f ${config} config.ini
-
-    # pytest tests fail
-    # pytest tests/
-  '';
+  dontUseSetuptoolsCheck = true;
 
   meta = with stdenv.lib; {
     homepage = https://todo.sr.ht/~sircmpwn/todo.sr.ht;

From 90cc8993aaf7aa1d79a674dbac6924ccc631ff24 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Mon, 30 Dec 2019 10:19:56 -0500
Subject: [PATCH 0081/4636] srht: 0.54.4 -> 0.57.2

---
 pkgs/applications/version-management/sourcehut/core.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix
index 9c1a04c1a961..8a6c3e6feb4e 100644
--- a/pkgs/applications/version-management/sourcehut/core.nix
+++ b/pkgs/applications/version-management/sourcehut/core.nix
@@ -7,18 +7,18 @@
 
 buildPythonPackage rec {
   pname = "srht";
-  version = "0.54.4";
+  version = "0.57.2";
 
   src = fetchgit {
     url = "https://git.sr.ht/~sircmpwn/core.sr.ht";
     rev = version;
-    sha256 = "0flxvn178hqd8ljz89ddis80zfnmzgimv4506w4dg2flbwzywy7z";
+    sha256 = "11rfpb0wf1xzrhcnpahaghmi5626snzph0vsbxlmmqx75wf0p6mf";
   };
 
   node_modules = fetchNodeModules {
     src = "${src}/srht";
     nodejs = nodejs;
-    sha256 = "0axl50swhcw8llq8z2icwr4nkr5qsw2riih0a040f9wx4xiw4p6p";
+    sha256 = "0gwa2xb75g7fclrsr7r131kj8ri5gmhd96yw1iws5pmgsn2rlqi1";
   };
 
   patches = [

From c9a3e1f99c0de9acf30ad01eefba4eea559c7434 Mon Sep 17 00:00:00 2001
From: David Terry <me@xwvvvvwx.com>
Date: Thu, 28 Nov 2019 09:32:13 +0100
Subject: [PATCH 0082/4636] tests/wireguard: init wg-quick

- Duplicate and adapt the existing default wireguard test for wg-quick
- Pull common setup code out into a seperate file
---
 nixos/tests/all-tests.nix           |   1 +
 nixos/tests/wireguard/default.nix   | 138 +++++++++++-----------------
 nixos/tests/wireguard/make-peer.nix |  23 +++++
 nixos/tests/wireguard/wg-quick.nix  |  63 +++++++++++++
 4 files changed, 143 insertions(+), 82 deletions(-)
 create mode 100644 nixos/tests/wireguard/make-peer.nix
 create mode 100644 nixos/tests/wireguard/wg-quick.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 111643ad69c3..9c22ad5ba612 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -288,6 +288,7 @@ in
   uwsgi = handleTest ./uwsgi.nix {};
   vault = handleTest ./vault.nix {};
   virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {};
+  wg-quick = handleTest ./wireguard/wg-quick.nix {};
   wireguard = handleTest ./wireguard {};
   wireguard-generated = handleTest ./wireguard/generated.nix {};
   wireguard-namespaces = handleTest ./wireguard/namespaces.nix {};
diff --git a/nixos/tests/wireguard/default.nix b/nixos/tests/wireguard/default.nix
index 8206823a9181..e3bc31c600f9 100644
--- a/nixos/tests/wireguard/default.nix
+++ b/nixos/tests/wireguard/default.nix
@@ -1,97 +1,71 @@
-let
-  wg-snakeoil-keys = import ./snakeoil-keys.nix;
-in
+import ../make-test-python.nix ({ pkgs, lib, ...} :
+  let
+    wg-snakeoil-keys = import ./snakeoil-keys.nix;
+    peer = (import ./make-peer.nix) { inherit lib; };
+  in
+  {
+    name = "wireguard";
+    meta = with pkgs.stdenv.lib.maintainers; {
+      maintainers = [ ma27 ];
+    };
 
-import ../make-test-python.nix ({ pkgs, ...} : {
-  name = "wireguard";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ ma27 ];
-  };
+    nodes = {
+      peer0 = peer {
+        ip4 = "192.168.0.1";
+        ip6 = "fd00::1";
+        extraConfig = {
+          networking.firewall.allowedUDPPorts = [ 23542 ];
+          networking.wireguard.interfaces.wg0 = {
+            ips = [ "10.23.42.1/32" "fc00::1/128" ];
+            listenPort = 23542;
 
-  nodes = {
-    peer0 = { lib, ... }: {
-      boot.kernel.sysctl = {
-        "net.ipv6.conf.all.forwarding" = "1";
-        "net.ipv6.conf.default.forwarding" = "1";
-        "net.ipv4.ip_forward" = "1";
-      };
+            inherit (wg-snakeoil-keys.peer0) privateKey;
 
-      networking.useDHCP = false;
-      networking.interfaces.eth1 = {
-        ipv4.addresses = lib.singleton {
-          address = "192.168.0.1";
-          prefixLength = 24;
-        };
-        ipv6.addresses = lib.singleton {
-          address = "fd00::1";
-          prefixLength = 64;
+            peers = lib.singleton {
+              allowedIPs = [ "10.23.42.2/32" "fc00::2/128" ];
+
+              inherit (wg-snakeoil-keys.peer1) publicKey;
+            };
+          };
         };
       };
 
-      networking.firewall.allowedUDPPorts = [ 23542 ];
-      networking.wireguard.interfaces.wg0 = {
-        ips = [ "10.23.42.1/32" "fc00::1/128" ];
-        listenPort = 23542;
+      peer1 = peer {
+        ip4 = "192.168.0.2";
+        ip6 = "fd00::2";
+        extraConfig = {
+          networking.wireguard.interfaces.wg0 = {
+            ips = [ "10.23.42.2/32" "fc00::2/128" ];
+            listenPort = 23542;
+            allowedIPsAsRoutes = false;
 
-        inherit (wg-snakeoil-keys.peer0) privateKey;
+            inherit (wg-snakeoil-keys.peer1) privateKey;
 
-        peers = lib.singleton {
-          allowedIPs = [ "10.23.42.2/32" "fc00::2/128" ];
+            peers = lib.singleton {
+              allowedIPs = [ "0.0.0.0/0" "::/0" ];
+              endpoint = "192.168.0.1:23542";
+              persistentKeepalive = 25;
 
-          inherit (wg-snakeoil-keys.peer1) publicKey;
+              inherit (wg-snakeoil-keys.peer0) publicKey;
+            };
+
+            postSetup = let inherit (pkgs) iproute; in ''
+              ${iproute}/bin/ip route replace 10.23.42.1/32 dev wg0
+              ${iproute}/bin/ip route replace fc00::1/128 dev wg0
+            '';
+          };
         };
       };
     };
 
-    peer1 = { pkgs, lib, ... }: {
-      boot.kernel.sysctl = {
-        "net.ipv6.conf.all.forwarding" = "1";
-        "net.ipv6.conf.default.forwarding" = "1";
-        "net.ipv4.ip_forward" = "1";
-      };
+    testScript = ''
+      start_all()
 
-      networking.useDHCP = false;
-      networking.interfaces.eth1 = {
-        ipv4.addresses = lib.singleton {
-          address = "192.168.0.2";
-          prefixLength = 24;
-        };
-        ipv6.addresses = lib.singleton {
-          address = "fd00::2";
-          prefixLength = 64;
-        };
-      };
+      peer0.wait_for_unit("wireguard-wg0.service")
+      peer1.wait_for_unit("wireguard-wg0.service")
 
-      networking.wireguard.interfaces.wg0 = {
-        ips = [ "10.23.42.2/32" "fc00::2/128" ];
-        listenPort = 23542;
-        allowedIPsAsRoutes = false;
-
-        inherit (wg-snakeoil-keys.peer1) privateKey;
-
-        peers = lib.singleton {
-          allowedIPs = [ "0.0.0.0/0" "::/0" ];
-          endpoint = "192.168.0.1:23542";
-          persistentKeepalive = 25;
-
-          inherit (wg-snakeoil-keys.peer0) publicKey;
-        };
-
-        postSetup = let inherit (pkgs) iproute; in ''
-          ${iproute}/bin/ip route replace 10.23.42.1/32 dev wg0
-          ${iproute}/bin/ip route replace fc00::1/128 dev wg0
-        '';
-      };
-    };
-  };
-
-  testScript = ''
-    start_all()
-
-    peer0.wait_for_unit("wireguard-wg0.service")
-    peer1.wait_for_unit("wireguard-wg0.service")
-
-    peer1.succeed("ping -c5 fc00::1")
-    peer1.succeed("ping -c5 10.23.42.1")
-  '';
-})
+      peer1.succeed("ping -c5 fc00::1")
+      peer1.succeed("ping -c5 10.23.42.1")
+    '';
+  }
+)
diff --git a/nixos/tests/wireguard/make-peer.nix b/nixos/tests/wireguard/make-peer.nix
new file mode 100644
index 000000000000..d2740549738b
--- /dev/null
+++ b/nixos/tests/wireguard/make-peer.nix
@@ -0,0 +1,23 @@
+{ lib, ... }: { ip4, ip6, extraConfig }:
+lib.mkMerge [
+  {
+    boot.kernel.sysctl = {
+      "net.ipv6.conf.all.forwarding" = "1";
+      "net.ipv6.conf.default.forwarding" = "1";
+      "net.ipv4.ip_forward" = "1";
+    };
+
+    networking.useDHCP = false;
+    networking.interfaces.eth1 = {
+      ipv4.addresses = [{
+        address = ip4;
+        prefixLength = 24;
+      }];
+      ipv6.addresses = [{
+        address = ip6;
+        prefixLength = 64;
+      }];
+    };
+  }
+  extraConfig
+]
diff --git a/nixos/tests/wireguard/wg-quick.nix b/nixos/tests/wireguard/wg-quick.nix
new file mode 100644
index 000000000000..7354dd01a34a
--- /dev/null
+++ b/nixos/tests/wireguard/wg-quick.nix
@@ -0,0 +1,63 @@
+import ../make-test-python.nix ({ pkgs, lib, ... }:
+  let
+    wg-snakeoil-keys = import ./snakeoil-keys.nix;
+    peer = (import ./make-peer.nix) { inherit lib; };
+  in
+  {
+    name = "wg-quick";
+    meta = with pkgs.stdenv.lib.maintainers; {
+      maintainers = [ xwvvvvwx ];
+    };
+
+    nodes = {
+      peer0 = peer {
+        ip4 = "192.168.0.1";
+        ip6 = "fd00::1";
+        extraConfig = {
+          networking.firewall.allowedUDPPorts = [ 23542 ];
+          networking.wg-quick.interfaces.wg0 = {
+            address = [ "10.23.42.1/32" "fc00::1/128" ];
+            listenPort = 23542;
+
+            inherit (wg-snakeoil-keys.peer0) privateKey;
+
+            peers = lib.singleton {
+              allowedIPs = [ "10.23.42.2/32" "fc00::2/128" ];
+
+              inherit (wg-snakeoil-keys.peer1) publicKey;
+            };
+          };
+        };
+      };
+
+      peer1 = peer {
+        ip4 = "192.168.0.2";
+        ip6 = "fd00::2";
+        extraConfig = {
+          networking.wg-quick.interfaces.wg0 = {
+            address = [ "10.23.42.2/32" "fc00::2/128" ];
+            inherit (wg-snakeoil-keys.peer1) privateKey;
+
+            peers = lib.singleton {
+              allowedIPs = [ "0.0.0.0/0" "::/0" ];
+              endpoint = "192.168.0.1:23542";
+              persistentKeepalive = 25;
+
+              inherit (wg-snakeoil-keys.peer0) publicKey;
+            };
+          };
+        };
+      };
+    };
+
+    testScript = ''
+      start_all()
+
+      peer0.wait_for_unit("wg-quick-wg0.service")
+      peer1.wait_for_unit("wg-quick-wg0.service")
+
+      peer1.succeed("ping -c5 fc00::1")
+      peer1.succeed("ping -c5 10.23.42.1")
+    '';
+  }
+)

From a15efd8f73a77dc006aa3ed5582de859a85525ce Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 31 Dec 2019 12:54:25 +0800
Subject: [PATCH 0083/4636] git: upstream no longer ships .el files for emacs

---
 .../version-management/git-and-tools/git/default.nix            | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 312879a49e86..18b59e84e08f 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -139,8 +139,6 @@ stdenv.mkDerivation {
       # Install contrib stuff.
       mkdir -p $out/share/git
       cp -a contrib $out/share/git/
-      mkdir -p $out/share/emacs/site-lisp
-      ln -s "$out/share/git/contrib/emacs/"*.el $out/share/emacs/site-lisp/
       mkdir -p $out/share/bash-completion/completions
       ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/git
       mkdir -p $out/etc/bash_completion.d

From 46736ce973cd1f6bca183d8dac4e1f78b8b27762 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jan 2020 06:04:09 -0800
Subject: [PATCH 0084/4636] gerrit: 3.0.2 -> 3.1.2

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

diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix
index fe0c1a508d0a..be84b7abc820 100644
--- a/pkgs/applications/version-management/gerrit/default.nix
+++ b/pkgs/applications/version-management/gerrit/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gerrit";
-  version = "3.0.2";
+  version = "3.1.2";
 
   src = fetchurl {
     url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";
-    sha256 = "16zh2dczjnzwzrzg0xkqs7bfd6bzk7s42gyb59z3206zpvh5kq9k";
+    sha256 = "01hak4gqaqn40a0qvmg8a89ai3ndnjls5v64m8awig8j1yysz5vl";
   };
 
   buildCommand = ''

From 80f043b738f20e30d87ac7438a9e2d6c5e734d04 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 6 Jan 2020 15:37:40 -0600
Subject: [PATCH 0085/4636] samurai: init at 1.0

---
 .../tools/build-managers/samurai/default.nix  | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/samurai/default.nix

diff --git a/pkgs/development/tools/build-managers/samurai/default.nix b/pkgs/development/tools/build-managers/samurai/default.nix
new file mode 100644
index 000000000000..063a2c198dab
--- /dev/null
+++ b/pkgs/development/tools/build-managers/samurai/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "samurai";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "michaelforney";
+    repo = pname;
+    rev = version;
+    sha256 = "1jsxfpwa6q893x18qlvpsiym29rrw5cj0k805wgmk2n57j9rw4f2";
+  };
+
+  makeFlags = [ "DESTDIR=" "PREFIX=${placeholder "out"}" ];
+
+  meta = with stdenv.lib; {
+    description = "ninja-compatible build tool written in C";
+    homepage = "https://github.com/michaelforney/samurai";
+    license = with licenses; [ mit asl20 ]; # see LICENSE
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f54db64d9134..a30c9753fdae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10476,6 +10476,8 @@ in
 
   rr = callPackage ../development/tools/analysis/rr { };
 
+  samurai = callPackage ../development/tools/build-managers/samurai { };
+
   saleae-logic = callPackage ../development/tools/misc/saleae-logic { };
 
   sauce-connect = callPackage ../development/tools/sauce-connect { };

From 052c103725383309b0199b4fcc01a60f27837119 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 8 Jan 2020 14:11:26 +0200
Subject: [PATCH 0086/4636] brotab: init at 1.1.0

---
 pkgs/tools/misc/brotab/default.nix | 29 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  4 ++++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/misc/brotab/default.nix

diff --git a/pkgs/tools/misc/brotab/default.nix b/pkgs/tools/misc/brotab/default.nix
new file mode 100644
index 000000000000..b109c0ad50cb
--- /dev/null
+++ b/pkgs/tools/misc/brotab/default.nix
@@ -0,0 +1,29 @@
+{ lib, fetchFromGitHub, glibcLocales, python }:
+
+python.pkgs.buildPythonApplication rec {
+  version = "1.1.0";
+  pname = "brotab";
+
+  src = fetchFromGitHub {
+    owner = "balta2ar";
+    repo = pname;
+    rev = version;
+    sha256 = "17yj5i8p28a7zmixdfa1i4gfc7c2fmdkxlymazasar58dz8m68mw";
+  };
+
+  propagatedBuildInputs = with python.pkgs; [
+    requests
+    flask
+    requests
+    pytest
+    psutil
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/balta2ar/brotab";
+    description = "Control your browser's tabs from the command line";
+    license = licenses.mit;
+    maintainers = with maintainers; [ doronbehar ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18132524fba5..e720883a236d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18324,6 +18324,10 @@ in
 
   browsh = callPackage ../applications/networking/browsers/browsh { };
 
+  brotab = callPackage ../tools/misc/brotab {
+    python = python3;
+  };
+
   bookworm = callPackage ../applications/office/bookworm { };
 
   chromium = callPackage ../applications/networking/browsers/chromium (config.chromium or {});

From bc6c029e129abc1a7fb37a1b0a7b694f1cb60042 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 9 Jan 2020 04:20:00 -0500
Subject: [PATCH 0087/4636] gitAndTools.git-filter-repo: init at 2.25.0

---
 .../git-and-tools/default.nix                 |  4 +++
 .../git-and-tools/git-filter-repo/default.nix | 27 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 2e99ca666dcd..501313456185 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -40,6 +40,10 @@ let
 
   git-fame = callPackage ./git-fame {};
 
+  git-filter-repo = callPackage ./git-filter-repo {
+    pythonPackages = python3Packages;
+  };
+
   gita = python3Packages.callPackage ./gita {};
 
   # The full-featured Git.
diff --git a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix
new file mode 100644
index 000000000000..af21296cffa4
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+stdenv.mkDerivation rec {
+  pname = "git-filter-repo";
+  version = "2.25.0";
+
+  src = fetchurl {
+    url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz";
+    sha256 = "1772if8ajaw80dsdw4ic6vjw24dq0b9w87qlkn0iw4b8r9yxp37a";
+  };
+
+  buildInputs = [ pythonPackages.python ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    install -Dm755 -t $out/bin git-filter-repo
+    install -Dm644 -t $out/share/man/man1 Documentation/man1/git-filter-repo.1
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/newren/git-filter-repo";
+    description = "Quickly rewrite git repository history (filter-branch replacement)";
+    license = licenses.mit;
+    maintainers = [ maintainers.marsam ];
+  };
+}

From 204b722bed338449d436e7a1945311ae10db1da7 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <brightone@protonmail.com>
Date: Thu, 9 Jan 2020 16:24:56 +0200
Subject: [PATCH 0088/4636] cargo-update: 1.5.2 -> 2.5.0

---
 .../cargo-update/cargo-lock.patch             |  739 +++++++++
 .../cargo-update/cargo-update.nix             | 1334 -----------------
 .../cargo-update/default.nix                  |   54 +-
 3 files changed, 770 insertions(+), 1357 deletions(-)
 create mode 100644 pkgs/tools/package-management/cargo-update/cargo-lock.patch
 delete mode 100644 pkgs/tools/package-management/cargo-update/cargo-update.nix

diff --git a/pkgs/tools/package-management/cargo-update/cargo-lock.patch b/pkgs/tools/package-management/cargo-update/cargo-lock.patch
new file mode 100644
index 000000000000..7872a4bf18b8
--- /dev/null
+++ b/pkgs/tools/package-management/cargo-update/cargo-lock.patch
@@ -0,0 +1,739 @@
+diff --git a/Cargo.lock b/Cargo.lock
+new file mode 100644
+index 000000000..76f256f46
+--- /dev/null
++++ b/Cargo.lock
+@@ -0,0 +1,733 @@
++# This file is automatically @generated by Cargo.
++# It is not intended for manual editing.
++[[package]]
++name = "aho-corasick"
++version = "0.7.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "ansi_term"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "array_tool"
++version = "1.0.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "arrayref"
++version = "0.3.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "arrayvec"
++version = "0.5.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "atty"
++version = "0.2.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "autocfg"
++version = "0.1.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "backtrace"
++version = "0.3.40"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "backtrace-sys"
++version = "0.1.32"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "base64"
++version = "0.10.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "bitflags"
++version = "1.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "blake2b_simd"
++version = "0.5.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "byteorder"
++version = "1.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "cargo-update"
++version = "2.5.0"
++dependencies = [
++ "array_tool 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "embed-resource 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "git2 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "json 0.11.15 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tabwriter 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-normalization 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "cc"
++version = "1.0.50"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "jobserver 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "cfg-if"
++version = "0.1.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "clap"
++version = "2.33.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "cloudabi"
++version = "0.0.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "constant_time_eq"
++version = "0.1.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "crossbeam-utils"
++version = "0.6.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "dirs"
++version = "2.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "dirs-sys"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "embed-resource"
++version = "1.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "failure"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
++ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "failure_derive"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "fuchsia-cprng"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "git2"
++version = "0.10.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libgit2-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
++ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "hermit-abi"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "idna"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-normalization 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "jobserver"
++version = "0.1.18"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "json"
++version = "0.11.15"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "lazy_static"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "lazysort"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "libc"
++version = "0.2.66"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "libgit2-sys"
++version = "0.9.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libssh2-sys 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "libssh2-sys"
++version = "0.2.13"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
++ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "libz-sys"
++version = "1.0.25"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
++ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "log"
++version = "0.4.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "matches"
++version = "0.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "maybe-uninit"
++version = "2.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "memchr"
++version = "2.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "openssl-probe"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "openssl-sys"
++version = "0.9.53"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
++ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "percent-encoding"
++version = "2.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "pkg-config"
++version = "0.3.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "proc-macro2"
++version = "1.0.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "quote"
++version = "1.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "rand_os"
++version = "0.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rdrand"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "redox_syscall"
++version = "0.1.56"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "redox_users"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "regex"
++version = "1.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
++ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "regex-syntax"
++version = "0.6.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "rust-argon2"
++version = "0.5.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rustc-demangle"
++version = "0.1.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "semver"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "semver-parser"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "serde"
++version = "1.0.104"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "serde_derive"
++version = "1.0.104"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "smallvec"
++version = "0.6.13"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "strsim"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "syn"
++version = "1.0.13"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "synstructure"
++version = "0.12.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tabwriter"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "textwrap"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "thread_local"
++version = "0.3.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "toml"
++version = "0.5.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "unicode-bidi"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "unicode-normalization"
++version = "0.1.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "unicode-width"
++version = "0.1.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "unicode-xid"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "url"
++version = "2.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "vcpkg"
++version = "0.2.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "vec_map"
++version = "0.8.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "vswhom"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "vswhom-sys"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "winapi"
++version = "0.3.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "winapi-i686-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi-x86_64-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winreg"
++version = "0.6.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[metadata]
++"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
++"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
++"checksum array_tool 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8f8cb5d814eb646a863c4f24978cff2880c4be96ad8cde2c0f0678732902e271"
++"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee"
++"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
++"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
++"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
++"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
++"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
++"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
++"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
++"checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
++"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
++"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
++"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
++"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
++"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
++"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120"
++"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
++"checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
++"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
++"checksum embed-resource 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bbaba4684ab0af1cbb3ef0b1f540ddc4b57b31940c920ea594efe09ab86e2a6c"
++"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9"
++"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08"
++"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
++"checksum git2 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c1af51ea8a906616af45a4ce78eacf25860f7a13ae7bf8a814693f0f4037a26"
++"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772"
++"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
++"checksum jobserver 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "230ae9adf468173aecd4176c7233bddc84a15871a586c5971ace9a55f881c075"
++"checksum json 0.11.15 (registry+https://github.com/rust-lang/crates.io-index)" = "92c245af8786f6ac35f95ca14feca9119e71339aaab41e878e7cdd655c97e9e5"
++"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
++"checksum lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e22ff43b231e0e2f87d74984e53ebc73b90ae13397e041214fb07efc64168f"
++"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
++"checksum libgit2-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4870c781f6063efb83150cd22c1ddf6ecf58531419e7570cdcced46970f64a16"
++"checksum libssh2-sys 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "5fcd5a428a31cbbfe059812d74f4b6cd3b9b7426c2bdaec56993c5365da1c328"
++"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
++"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
++"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
++"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
++"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
++"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
++"checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f"
++"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
++"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
++"checksum proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0319972dcae462681daf4da1adeeaa066e3ebd29c69be96c6abb1259d2ee2bcc"
++"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
++"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
++"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
++"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
++"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
++"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
++"checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d"
++"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd"
++"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
++"checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf"
++"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
++"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
++"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
++"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
++"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
++"checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
++"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
++"checksum syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4ff033220a41d1a57d8125eab57bf5263783dfdcc18688b1dacc6ce9651ef8"
++"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
++"checksum tabwriter 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9128e3a9149e51494cad59712a286e149fcb74e443d2298d69bd6eaa42cc4ebb"
++"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
++"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
++"checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf"
++"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
++"checksum unicode-normalization 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "09c8070a9942f5e7cfccd93f490fdebd230ee3c3c9f107cb25bad5351ef671cf"
++"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
++"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
++"checksum url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
++"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
++"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
++"checksum vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b"
++"checksum vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc2f5402d3d0e79a069714f7b48e3ecc60be7775a2c049cb839457457a239532"
++"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
++"checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9"
diff --git a/pkgs/tools/package-management/cargo-update/cargo-update.nix b/pkgs/tools/package-management/cargo-update/cargo-update.nix
deleted file mode 100644
index 9b8cf24605a5..000000000000
--- a/pkgs/tools/package-management/cargo-update/cargo-update.nix
+++ /dev/null
@@ -1,1334 +0,0 @@
-# Generated by carnix 0.6.6: carnix -o cargo-update.nix --src ./. Cargo.lock --standalone
-{ lib, stdenv, buildRustCrate, fetchgit }:
-let kernel = stdenv.hostPlatform.parsed.kernel.name;
-    abi = stdenv.hostPlatform.parsed.abi.name;
-    include = includedFiles: src: builtins.filterSource (path: type:
-      lib.lists.any (f:
-        let p = toString (src + ("/" + f)); in
-        (path == p) || (type == "directory" && lib.strings.hasPrefix path p)
-      ) includedFiles
-    ) src;
-    updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
-    mapFeatures = features: map (fun: fun { features = features; });
-    mkFeatures = feat: lib.lists.foldl (features: featureName:
-      if feat.${featureName} or false then
-        [ featureName ] ++ features
-      else
-        features
-    ) [] (builtins.attrNames feat);
-in
-rec {
-  cargo_update = f: cargo_update_1_5_2 { features = cargo_update_1_5_2_features { cargo_update_1_5_2 = f; }; };
-  advapi32_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "advapi32-sys";
-    version = "0.2.0";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "1l6789hkz2whd9gklwz1m379kcvyizaj8nnzj3rn4a5h79yg59v7";
-    libName = "advapi32";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  aho_corasick_0_6_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "aho-corasick";
-    version = "0.6.4";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "189v919mp6rzzgjp1khpn4zlq8ls81gh43x1lmc8kbkagdlpq888";
-    libName = "aho_corasick";
-    crateBin = [ {  name = "aho-corasick-dot"; } ];
-    inherit dependencies buildDependencies features;
-  };
-  ansi_term_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "ansi_term";
-    version = "0.11.0";
-    authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) <ryan.havvy@gmail.com>" "Josh Triplett <josh@joshtriplett.org>" ];
-    sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v";
-    inherit dependencies buildDependencies features;
-  };
-  array_tool_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "array_tool";
-    version = "1.0.3";
-    authors = [ "Daniel P. Clark <6ftdan@gmail.com>" ];
-    sha256 = "0igg0zvhcvjc15vgg6vjxjfifn2w4scjq9c8i1b2abv1sy2cgc86";
-    inherit dependencies buildDependencies features;
-  };
-  atty_0_2_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "atty";
-    version = "0.2.10";
-    authors = [ "softprops <d.tangren@gmail.com>" ];
-    sha256 = "1h26lssj8rwaz0xhwwm5a645r49yly211amfmd243m3m0jl49i2c";
-    inherit dependencies buildDependencies features;
-  };
-  bitflags_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "bitflags";
-    version = "0.9.1";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws";
-    inherit dependencies buildDependencies features;
-  };
-  bitflags_1_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "bitflags";
-    version = "1.0.3";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "162p4w4h1ad76awq6b5yivmls3d50m9cl27d8g588lsps6g8s5rw";
-    inherit dependencies buildDependencies features;
-  };
-  cargo_update_1_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "cargo-update";
-    version = "1.5.2";
-    authors = [ "nabijaczleweli <nabijaczleweli@gmail.com>" "Yann Simon <yann.simon.fr@gmail.com>" "ven <vendethiel@hotmail.fr>" "Cat Plus Plus <piotrlegnica@piotrl.pl>" "Liigo <liigo@qq.com>" "azyobuzin <azyobuzin@users.sourceforge.jp>" "Tatsuyuki Ishi <ishitatsuyuki@gmail.com>" "Tom Prince <tom.prince@twistedmatrix.com>" "Mateusz Mikuła <mati865@gmail.com>" "sinkuu <sinkuupump@gmail.com>" "Alex Burka <aburka@seas.upenn.edu>" "Matthias Krüger <matthias.krueger@famsik.de>" "Daniel Holbert <dholbert@cs.stanford.edu>" ];
-    src = ./.;
-    crateBin = [ {  name = "cargo-install-update";  path = "src/main.rs"; } {  name = "cargo-install-update-config";  path = "src/main-config.rs"; } ];
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  cc_1_0_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "cc";
-    version = "1.0.15";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "1zmcv4zf888byhay2qakqlc9b8snhy5ccfs35zb6flywmlj8f2c0";
-    inherit dependencies buildDependencies features;
-  };
-  clap_2_31_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "clap";
-    version = "2.31.2";
-    authors = [ "Kevin K. <kbknapp@gmail.com>" ];
-    sha256 = "0r24ziw85a8y1sf2l21y4mvv5qan3rjafcshpyfsjfadqfxsij72";
-    inherit dependencies buildDependencies features;
-  };
-  cmake_0_1_31_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "cmake";
-    version = "0.1.31";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "18j5fci486s7v5yjvv2ik3nsp4lk0fn0b8js5k6c4dviml476vz2";
-    inherit dependencies buildDependencies features;
-  };
-  curl_sys_0_4_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "curl-sys";
-    version = "0.4.5";
-    authors = [ "Carl Lerche <me@carllerche.com>" "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "149nswzwzr1lx0ki8awbppm7kf8nb268pc3zhzmvbs5fliq075qw";
-    libPath = "lib.rs";
-    libName = "curl_sys";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  embed_resource_1_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "embed-resource";
-    version = "1.1.4";
-    authors = [ "nabijaczleweli <nabijaczleweli@gmail.com>" "Cat Plus Plus <piotrlegnica@piotrl.pl>" "Liigo <liigo@qq.com>" "azyobuzin <azyobuzin@users.sourceforge.jp>" "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "1n07qys5904mkcididfgh1m6g8nfgl93pdpygaqn4dkhm5cxssfd";
-    inherit dependencies buildDependencies features;
-  };
-  fuchsia_zircon_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "fuchsia-zircon";
-    version = "0.3.3";
-    authors = [ "Raph Levien <raph@google.com>" ];
-    sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk";
-    inherit dependencies buildDependencies features;
-  };
-  fuchsia_zircon_sys_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "fuchsia-zircon-sys";
-    version = "0.3.3";
-    authors = [ "Raph Levien <raph@google.com>" ];
-    sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5";
-    inherit dependencies buildDependencies features;
-  };
-  git2_0_6_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "git2";
-    version = "0.6.11";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "0jznfnk2n7nk250cj52k3mxjqgan7gwyrh3h7dkhqqs2zfx4ylvd";
-    inherit dependencies buildDependencies features;
-  };
-  idna_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "idna";
-    version = "0.1.4";
-    authors = [ "The rust-url developers" ];
-    sha256 = "15j44qgjx1skwg9i7f4cm36ni4n99b1ayx23yxx7axxcw8vjf336";
-    inherit dependencies buildDependencies features;
-  };
-  json_0_11_13_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "json";
-    version = "0.11.13";
-    authors = [ "Maciej Hirsz <maciej.hirsz@gmail.com>" ];
-    sha256 = "03227jaj6rjlfigsk4rmc0b83b1djlh42grfjaxk0d2xvgdb893i";
-    inherit dependencies buildDependencies features;
-  };
-  kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "kernel32-sys";
-    version = "0.2.2";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj";
-    libName = "kernel32";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  lazy_static_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "lazy_static";
-    version = "1.0.0";
-    authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
-    sha256 = "0wfvqyr2nvx2mbsrscg5y7gfa9skhb8p72ayanl8vl49pw24v4fh";
-    inherit dependencies buildDependencies features;
-  };
-  lazysort_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "lazysort";
-    version = "0.2.0";
-    authors = [ "Ben Ashford" ];
-    sha256 = "0dv9bryg10hj8cycmdxpcc9y14i958yjr2hm4c3i9168q0y7njdz";
-    inherit dependencies buildDependencies features;
-  };
-  libc_0_2_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "libc";
-    version = "0.2.40";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "1xfc39237ldzgr8x8wcflgdr8zssi3wif7g2zxc02d94gzkjsw83";
-    inherit dependencies buildDependencies features;
-  };
-  libgit2_sys_0_6_19_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "libgit2-sys";
-    version = "0.6.19";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "13044s468adsx3sq4qvr4vnbr6nr5hq23lls8wn0a415jdl3qbcg";
-    libPath = "lib.rs";
-    libName = "libgit2_sys";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  libssh2_sys_0_2_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "libssh2-sys";
-    version = "0.2.7";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "1mr683x23l7f0mmc10vd5fnarfqpd7wqxs3rxyhq2igrh3fn0m2v";
-    libPath = "lib.rs";
-    libName = "libssh2_sys";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  libz_sys_1_0_18_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "libz-sys";
-    version = "1.0.18";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "0lr0rvmmfbfa4g7mhi0l93i8jq86pfcssdv4d40kzfy45ajdcgim";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  matches_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "matches";
-    version = "0.1.6";
-    authors = [ "Simon Sapin <simon.sapin@exyr.org>" ];
-    sha256 = "1zlrqlbvzxdil8z8ial2ihvxjwvlvg3g8dr0lcdpsjclkclasjan";
-    libPath = "lib.rs";
-    inherit dependencies buildDependencies features;
-  };
-  memchr_2_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "memchr";
-    version = "2.0.1";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ];
-    sha256 = "0ls2y47rjwapjdax6bp974gdp06ggm1v8d1h69wyydmh1nhgm5gr";
-    inherit dependencies buildDependencies features;
-  };
-  openssl_probe_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "openssl-probe";
-    version = "0.1.2";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "1a89fznx26vvaxyrxdvgf6iwai5xvs6xjvpjin68fgvrslv6n15a";
-    inherit dependencies buildDependencies features;
-  };
-  openssl_sys_0_9_30_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "openssl-sys";
-    version = "0.9.30";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" "Steven Fackler <sfackler@gmail.com>" ];
-    sha256 = "1p5y3md4crbmg0lcfkdl8pp3kf9k82vghjy28x7ix5mji3j2p87a";
-    inherit dependencies buildDependencies features;
-  };
-  percent_encoding_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "percent-encoding";
-    version = "1.0.1";
-    authors = [ "The rust-url developers" ];
-    sha256 = "04ahrp7aw4ip7fmadb0bknybmkfav0kk0gw4ps3ydq5w6hr0ib5i";
-    libPath = "lib.rs";
-    inherit dependencies buildDependencies features;
-  };
-  pkg_config_0_3_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "pkg-config";
-    version = "0.3.11";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "177kbs465skvzmb2d9bh7aa5lqm0npfig12awcbd34c6k6nlyr5h";
-    inherit dependencies buildDependencies features;
-  };
-  proc_macro2_0_3_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "proc-macro2";
-    version = "0.3.8";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "0ixnavxcd6sk1861hjgnfxly7qgq4ch1iplsx0nclvjjkwg39qdc";
-    inherit dependencies buildDependencies features;
-  };
-  quote_0_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "quote";
-    version = "0.5.2";
-    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "062cnp12j09x0z0nj4j5pfh26h35zlrks07asxgqhfhcym1ba595";
-    inherit dependencies buildDependencies features;
-  };
-  rand_0_3_22_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "rand";
-    version = "0.3.22";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0wrj12acx7l4hr7ag3nz8b50yhp8ancyq988bzmnnsxln67rsys0";
-    inherit dependencies buildDependencies features;
-  };
-  rand_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "rand";
-    version = "0.4.2";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0h8pkg23wb67i8904sm76iyr1jlmhklb85vbpz9c9191a24xzkfm";
-    inherit dependencies buildDependencies features;
-  };
-  redox_syscall_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "redox_syscall";
-    version = "0.1.37";
-    authors = [ "Jeremy Soller <jackpot51@gmail.com>" ];
-    sha256 = "0qa0jl9cr3qp80an8vshp2mcn8rzvwiavs1398hq1vsjw7pc3h2v";
-    libName = "syscall";
-    inherit dependencies buildDependencies features;
-  };
-  redox_termios_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "redox_termios";
-    version = "0.1.1";
-    authors = [ "Jeremy Soller <jackpot51@gmail.com>" ];
-    sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh";
-    libPath = "src/lib.rs";
-    inherit dependencies buildDependencies features;
-  };
-  regex_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "regex";
-    version = "0.2.11";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "0r50cymxdqp0fv1dxd22mjr6y32q450nwacd279p9s7lh0cafijj";
-    inherit dependencies buildDependencies features;
-  };
-  regex_syntax_0_5_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "regex-syntax";
-    version = "0.5.6";
-    authors = [ "The Rust Project Developers" ];
-    sha256 = "10vf3r34bgjnbrnqd5aszn35bjvm8insw498l1vjy8zx5yms3427";
-    inherit dependencies buildDependencies features;
-  };
-  semver_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "semver";
-    version = "0.9.0";
-    authors = [ "Steve Klabnik <steve@steveklabnik.com>" "The Rust Project Developers" ];
-    sha256 = "0azak2lb2wc36s3x15az886kck7rpnksrw14lalm157rg9sc9z63";
-    inherit dependencies buildDependencies features;
-  };
-  semver_parser_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "semver-parser";
-    version = "0.7.0";
-    authors = [ "Steve Klabnik <steve@steveklabnik.com>" ];
-    sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h";
-    inherit dependencies buildDependencies features;
-  };
-  serde_1_0_55_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "serde";
-    version = "1.0.55";
-    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "1vpslfs3j8xbl3srmzppa34h0908q0sj4hyrmlrpklhldii5vbqh";
-    inherit dependencies buildDependencies features;
-  };
-  serde_derive_1_0_55_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "serde_derive";
-    version = "1.0.55";
-    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "1ggcidzgi51l3lsdf8gg46ivn61py8rnrf6garpcxwmdbfcc8lgk";
-    procMacro = true;
-    inherit dependencies buildDependencies features;
-  };
-  strsim_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "strsim";
-    version = "0.7.0";
-    authors = [ "Danny Guo <dannyguo91@gmail.com>" ];
-    sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv";
-    inherit dependencies buildDependencies features;
-  };
-  syn_0_13_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "syn";
-    version = "0.13.10";
-    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
-    sha256 = "0dbvdxlpvx7f8iw5cbv88vbyszp72df8y8zhl36gj73g1xwdqfhx";
-    inherit dependencies buildDependencies features;
-  };
-  tabwriter_1_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "tabwriter";
-    version = "1.0.4";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "02yk7db101lqn24wnm15yy8xb095kv9bnkdvyj7vqhx40vixyibd";
-    inherit dependencies buildDependencies features;
-  };
-  termion_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "termion";
-    version = "1.5.1";
-    authors = [ "ticki <Ticki@users.noreply.github.com>" "gycos <alexandre.bury@gmail.com>" "IGI-111 <igi-111@protonmail.com>" ];
-    sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1";
-    inherit dependencies buildDependencies features;
-  };
-  textwrap_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "textwrap";
-    version = "0.9.0";
-    authors = [ "Martin Geisler <martin@geisler.net>" ];
-    sha256 = "18jg79ndjlwndz01mlbh82kkr2arqm658yn5kwp65l5n1hz8w4yb";
-    inherit dependencies buildDependencies features;
-  };
-  thread_local_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "thread_local";
-    version = "0.3.5";
-    authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ];
-    sha256 = "0mkp0sp91aqsk7brgygai4igv751r1754rsxn37mig3ag5rx8np6";
-    inherit dependencies buildDependencies features;
-  };
-  toml_0_4_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "toml";
-    version = "0.4.6";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
-    sha256 = "0rfl7lyb5f67spk69s604nw87f97g7fvv36hj9v88qlr2bwyrn8v";
-    inherit dependencies buildDependencies features;
-  };
-  ucd_util_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "ucd-util";
-    version = "0.1.1";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0";
-    inherit dependencies buildDependencies features;
-  };
-  unicode_bidi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "unicode-bidi";
-    version = "0.3.4";
-    authors = [ "The Servo Project Developers" ];
-    sha256 = "0lcd6jasrf8p9p0q20qyf10c6xhvw40m2c4rr105hbk6zy26nj1q";
-    libName = "unicode_bidi";
-    inherit dependencies buildDependencies features;
-  };
-  unicode_normalization_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "unicode-normalization";
-    version = "0.1.7";
-    authors = [ "kwantam <kwantam@gmail.com>" ];
-    sha256 = "1da2hv800pd0wilmn4idwpgv5p510hjxizjcfv6xzb40xcsjd8gs";
-    inherit dependencies buildDependencies features;
-  };
-  unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "unicode-width";
-    version = "0.1.4";
-    authors = [ "kwantam <kwantam@gmail.com>" ];
-    sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl";
-    inherit dependencies buildDependencies features;
-  };
-  unicode_xid_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "unicode-xid";
-    version = "0.1.0";
-    authors = [ "erick.tryzelaar <erick.tryzelaar@gmail.com>" "kwantam <kwantam@gmail.com>" ];
-    sha256 = "05wdmwlfzxhq3nhsxn6wx4q8dhxzzfb9szsz6wiw092m1rjj01zj";
-    inherit dependencies buildDependencies features;
-  };
-  unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "unreachable";
-    version = "1.0.0";
-    authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ];
-    sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf";
-    inherit dependencies buildDependencies features;
-  };
-  url_1_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "url";
-    version = "1.7.0";
-    authors = [ "The rust-url developers" ];
-    sha256 = "0333ynhkp47hna88aamz1zpk4lxyzx4ab9n7yhc75g14w27cv8jj";
-    inherit dependencies buildDependencies features;
-  };
-  utf8_ranges_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "utf8-ranges";
-    version = "1.0.0";
-    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
-    sha256 = "0rzmqprwjv9yp1n0qqgahgm24872x6c0xddfym5pfndy7a36vkn0";
-    inherit dependencies buildDependencies features;
-  };
-  vcpkg_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "vcpkg";
-    version = "0.2.3";
-    authors = [ "Jim McGrath <jimmc2@gmail.com>" ];
-    sha256 = "0achi8sfy0wm4q04gj7nwpq9xfx8ynk6vv4r12a3ijg26hispq0c";
-    inherit dependencies buildDependencies features;
-  };
-  vec_map_0_8_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "vec_map";
-    version = "0.8.1";
-    authors = [ "Alex Crichton <alex@alexcrichton.com>" "Jorge Aparicio <japaricious@gmail.com>" "Alexis Beingessner <a.beingessner@gmail.com>" "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon <aturon@mozilla.com>" "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood <csouth3@illinois.edu>" "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens <markus@m-siemens.de>" "Josh Branchaud <jbranchaud@gmail.com>" "Huon Wilson <dbau.pp@gmail.com>" "Corey Farwell <coref@rwell.org>" "Aaron Liblong <>" "Nick Cameron <nrc@ncameron.org>" "Patrick Walton <pcwalton@mimiga.net>" "Felix S Klock II <>" "Andrew Paseltiner <apaseltiner@gmail.com>" "Sean McArthur <sean.monstar@gmail.com>" "Vadim Petrochenkov <>" ];
-    sha256 = "1jj2nrg8h3l53d43rwkpkikq5a5x15ms4rf1rw92hp5lrqhi8mpi";
-    inherit dependencies buildDependencies features;
-  };
-  void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "void";
-    version = "1.0.2";
-    authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ];
-    sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3";
-    inherit dependencies buildDependencies features;
-  };
-  winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "winapi";
-    version = "0.2.8";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as";
-    inherit dependencies buildDependencies features;
-  };
-  winapi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "winapi";
-    version = "0.3.4";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "1qbrf5dcnd8j36cawby5d9r5vx07r0l4ryf672pfncnp8895k9lx";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "winapi-build";
-    version = "0.1.1";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga";
-    libName = "build";
-    inherit dependencies buildDependencies features;
-  };
-  winapi_i686_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "winapi-i686-pc-windows-gnu";
-    version = "0.4.0";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  winapi_x86_64_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "winapi-x86_64-pc-windows-gnu";
-    version = "0.4.0";
-    authors = [ "Peter Atashian <retep998@gmail.com>" ];
-    sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj";
-    build = "build.rs";
-    inherit dependencies buildDependencies features;
-  };
-  winreg_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
-    crateName = "winreg";
-    version = "0.4.0";
-    authors = [ "Igor Shaula <gentoo90@gmail.com>" ];
-    sha256 = "1zhk2a6qwyfpvwjd929qs0y6zzxl7g90pnz59qhazfg72m36iwda";
-    inherit dependencies buildDependencies features;
-  };
-  advapi32_sys_0_2_0 = { features?(advapi32_sys_0_2_0_features {}) }: advapi32_sys_0_2_0_ {
-    dependencies = mapFeatures features ([ winapi_0_2_8 ]);
-    buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
-  };
-  advapi32_sys_0_2_0_features = f: updateFeatures f ({
-    advapi32_sys_0_2_0.default = (f.advapi32_sys_0_2_0.default or true);
-    winapi_0_2_8.default = true;
-    winapi_build_0_1_1.default = true;
-  }) [ winapi_0_2_8_features winapi_build_0_1_1_features ];
-  aho_corasick_0_6_4 = { features?(aho_corasick_0_6_4_features {}) }: aho_corasick_0_6_4_ {
-    dependencies = mapFeatures features ([ memchr_2_0_1 ]);
-  };
-  aho_corasick_0_6_4_features = f: updateFeatures f ({
-    aho_corasick_0_6_4.default = (f.aho_corasick_0_6_4.default or true);
-    memchr_2_0_1.default = true;
-  }) [ memchr_2_0_1_features ];
-  ansi_term_0_11_0 = { features?(ansi_term_0_11_0_features {}) }: ansi_term_0_11_0_ {
-    dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
-  };
-  ansi_term_0_11_0_features = f: updateFeatures f ({
-    ansi_term_0_11_0.default = (f.ansi_term_0_11_0.default or true);
-    winapi_0_3_4.consoleapi = true;
-    winapi_0_3_4.default = true;
-    winapi_0_3_4.errhandlingapi = true;
-    winapi_0_3_4.processenv = true;
-  }) [ winapi_0_3_4_features ];
-  array_tool_1_0_3 = { features?(array_tool_1_0_3_features {}) }: array_tool_1_0_3_ {};
-  array_tool_1_0_3_features = f: updateFeatures f ({
-    array_tool_1_0_3.default = (f.array_tool_1_0_3.default or true);
-  }) [];
-  atty_0_2_10 = { features?(atty_0_2_10_features {}) }: atty_0_2_10_ {
-    dependencies = (if kernel == "redox" then mapFeatures features ([ termion_1_5_1 ]) else [])
-      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_40 ]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
-  };
-  atty_0_2_10_features = f: updateFeatures f ({
-    atty_0_2_10.default = (f.atty_0_2_10.default or true);
-    libc_0_2_40.default = (f.libc_0_2_40.default or false);
-    termion_1_5_1.default = true;
-    winapi_0_3_4.consoleapi = true;
-    winapi_0_3_4.default = true;
-    winapi_0_3_4.minwinbase = true;
-    winapi_0_3_4.minwindef = true;
-    winapi_0_3_4.processenv = true;
-    winapi_0_3_4.winbase = true;
-  }) [ termion_1_5_1_features libc_0_2_40_features winapi_0_3_4_features ];
-  bitflags_0_9_1 = { features?(bitflags_0_9_1_features {}) }: bitflags_0_9_1_ {
-    features = mkFeatures (features.bitflags_0_9_1 or {});
-  };
-  bitflags_0_9_1_features = f: updateFeatures f (rec {
-    bitflags_0_9_1.default = (f.bitflags_0_9_1.default or true);
-    bitflags_0_9_1.example_generated =
-      (f.bitflags_0_9_1.example_generated or false) ||
-      (f.bitflags_0_9_1.default or false) ||
-      (bitflags_0_9_1.default or false);
-  }) [];
-  bitflags_1_0_3 = { features?(bitflags_1_0_3_features {}) }: bitflags_1_0_3_ {
-    features = mkFeatures (features.bitflags_1_0_3 or {});
-  };
-  bitflags_1_0_3_features = f: updateFeatures f ({
-    bitflags_1_0_3.default = (f.bitflags_1_0_3.default or true);
-  }) [];
-  cargo_update_1_5_2 = { features?(cargo_update_1_5_2_features {}) }: cargo_update_1_5_2_ {
-    dependencies = mapFeatures features ([ array_tool_1_0_3 clap_2_31_2 git2_0_6_11 json_0_11_13 lazy_static_1_0_0 lazysort_0_2_0 regex_0_2_11 semver_0_9_0 serde_1_0_55 serde_derive_1_0_55 tabwriter_1_0_4 toml_0_4_6 url_1_7_0 ]);
-    buildDependencies = mapFeatures features ([ embed_resource_1_1_4 ]);
-  };
-  cargo_update_1_5_2_features = f: updateFeatures f ({
-    array_tool_1_0_3.default = true;
-    cargo_update_1_5_2.default = (f.cargo_update_1_5_2.default or true);
-    clap_2_31_2.default = true;
-    embed_resource_1_1_4.default = true;
-    git2_0_6_11.default = true;
-    json_0_11_13.default = true;
-    lazy_static_1_0_0.default = true;
-    lazysort_0_2_0.default = true;
-    regex_0_2_11.default = true;
-    semver_0_9_0.default = true;
-    semver_0_9_0.serde = true;
-    serde_1_0_55.default = true;
-    serde_derive_1_0_55.default = true;
-    tabwriter_1_0_4.default = true;
-    toml_0_4_6.default = true;
-    url_1_7_0.default = true;
-  }) [ array_tool_1_0_3_features clap_2_31_2_features git2_0_6_11_features json_0_11_13_features lazy_static_1_0_0_features lazysort_0_2_0_features regex_0_2_11_features semver_0_9_0_features serde_1_0_55_features serde_derive_1_0_55_features tabwriter_1_0_4_features toml_0_4_6_features url_1_7_0_features embed_resource_1_1_4_features ];
-  cc_1_0_15 = { features?(cc_1_0_15_features {}) }: cc_1_0_15_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.cc_1_0_15 or {});
-  };
-  cc_1_0_15_features = f: updateFeatures f (rec {
-    cc_1_0_15.default = (f.cc_1_0_15.default or true);
-    cc_1_0_15.rayon =
-      (f.cc_1_0_15.rayon or false) ||
-      (f.cc_1_0_15.parallel or false) ||
-      (cc_1_0_15.parallel or false);
-  }) [];
-  clap_2_31_2 = { features?(clap_2_31_2_features {}) }: clap_2_31_2_ {
-    dependencies = mapFeatures features ([ bitflags_1_0_3 textwrap_0_9_0 unicode_width_0_1_4 ]
-      ++ (if features.clap_2_31_2.atty or false then [ atty_0_2_10 ] else [])
-      ++ (if features.clap_2_31_2.strsim or false then [ strsim_0_7_0 ] else [])
-      ++ (if features.clap_2_31_2.vec_map or false then [ vec_map_0_8_1 ] else []))
-      ++ (if !(kernel == "windows") then mapFeatures features ([ ]
-      ++ (if features.clap_2_31_2.ansi_term or false then [ ansi_term_0_11_0 ] else [])) else []);
-    features = mkFeatures (features.clap_2_31_2 or {});
-  };
-  clap_2_31_2_features = f: updateFeatures f (rec {
-    ansi_term_0_11_0.default = true;
-    atty_0_2_10.default = true;
-    bitflags_1_0_3.default = true;
-    clap_2_31_2.ansi_term =
-      (f.clap_2_31_2.ansi_term or false) ||
-      (f.clap_2_31_2.color or false) ||
-      (clap_2_31_2.color or false);
-    clap_2_31_2.atty =
-      (f.clap_2_31_2.atty or false) ||
-      (f.clap_2_31_2.color or false) ||
-      (clap_2_31_2.color or false);
-    clap_2_31_2.clippy =
-      (f.clap_2_31_2.clippy or false) ||
-      (f.clap_2_31_2.lints or false) ||
-      (clap_2_31_2.lints or false);
-    clap_2_31_2.color =
-      (f.clap_2_31_2.color or false) ||
-      (f.clap_2_31_2.default or false) ||
-      (clap_2_31_2.default or false);
-    clap_2_31_2.default = (f.clap_2_31_2.default or true);
-    clap_2_31_2.strsim =
-      (f.clap_2_31_2.strsim or false) ||
-      (f.clap_2_31_2.suggestions or false) ||
-      (clap_2_31_2.suggestions or false);
-    clap_2_31_2.suggestions =
-      (f.clap_2_31_2.suggestions or false) ||
-      (f.clap_2_31_2.default or false) ||
-      (clap_2_31_2.default or false);
-    clap_2_31_2.term_size =
-      (f.clap_2_31_2.term_size or false) ||
-      (f.clap_2_31_2.wrap_help or false) ||
-      (clap_2_31_2.wrap_help or false);
-    clap_2_31_2.vec_map =
-      (f.clap_2_31_2.vec_map or false) ||
-      (f.clap_2_31_2.default or false) ||
-      (clap_2_31_2.default or false);
-    clap_2_31_2.yaml =
-      (f.clap_2_31_2.yaml or false) ||
-      (f.clap_2_31_2.doc or false) ||
-      (clap_2_31_2.doc or false);
-    clap_2_31_2.yaml-rust =
-      (f.clap_2_31_2.yaml-rust or false) ||
-      (f.clap_2_31_2.yaml or false) ||
-      (clap_2_31_2.yaml or false);
-    strsim_0_7_0.default = true;
-    textwrap_0_9_0.default = true;
-    textwrap_0_9_0.term_size =
-      (f.textwrap_0_9_0.term_size or false) ||
-      (clap_2_31_2.wrap_help or false) ||
-      (f.clap_2_31_2.wrap_help or false);
-    unicode_width_0_1_4.default = true;
-    vec_map_0_8_1.default = true;
-  }) [ atty_0_2_10_features bitflags_1_0_3_features strsim_0_7_0_features textwrap_0_9_0_features unicode_width_0_1_4_features vec_map_0_8_1_features ansi_term_0_11_0_features ];
-  cmake_0_1_31 = { features?(cmake_0_1_31_features {}) }: cmake_0_1_31_ {
-    dependencies = mapFeatures features ([ cc_1_0_15 ]);
-  };
-  cmake_0_1_31_features = f: updateFeatures f ({
-    cc_1_0_15.default = true;
-    cmake_0_1_31.default = (f.cmake_0_1_31.default or true);
-  }) [ cc_1_0_15_features ];
-  curl_sys_0_4_5 = { features?(curl_sys_0_4_5_features {}) }: curl_sys_0_4_5_ {
-    dependencies = mapFeatures features ([ libc_0_2_40 libz_sys_1_0_18 ])
-      ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "darwin") then mapFeatures features ([ openssl_sys_0_9_30 ]) else [])
-      ++ (if abi == "msvc" then mapFeatures features ([]) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
-    buildDependencies = mapFeatures features ([ cc_1_0_15 pkg_config_0_3_11 ]);
-  };
-  curl_sys_0_4_5_features = f: updateFeatures f ({
-    cc_1_0_15.default = true;
-    curl_sys_0_4_5.default = (f.curl_sys_0_4_5.default or true);
-    libc_0_2_40.default = true;
-    libz_sys_1_0_18.default = true;
-    openssl_sys_0_9_30.default = true;
-    pkg_config_0_3_11.default = true;
-    winapi_0_3_4.default = true;
-    winapi_0_3_4.winsock2 = true;
-    winapi_0_3_4.ws2def = true;
-  }) [ libc_0_2_40_features libz_sys_1_0_18_features cc_1_0_15_features pkg_config_0_3_11_features openssl_sys_0_9_30_features winapi_0_3_4_features ];
-  embed_resource_1_1_4 = { features?(embed_resource_1_1_4_features {}) }: embed_resource_1_1_4_ {
-    dependencies = (if kernel == "windows" && abi == "msvc" then mapFeatures features ([ winreg_0_4_0 ]) else []);
-  };
-  embed_resource_1_1_4_features = f: updateFeatures f ({
-    embed_resource_1_1_4.default = (f.embed_resource_1_1_4.default or true);
-    winreg_0_4_0.default = (f.winreg_0_4_0.default or false);
-  }) [ winreg_0_4_0_features ];
-  fuchsia_zircon_0_3_3 = { features?(fuchsia_zircon_0_3_3_features {}) }: fuchsia_zircon_0_3_3_ {
-    dependencies = mapFeatures features ([ bitflags_1_0_3 fuchsia_zircon_sys_0_3_3 ]);
-  };
-  fuchsia_zircon_0_3_3_features = f: updateFeatures f ({
-    bitflags_1_0_3.default = true;
-    fuchsia_zircon_0_3_3.default = (f.fuchsia_zircon_0_3_3.default or true);
-    fuchsia_zircon_sys_0_3_3.default = true;
-  }) [ bitflags_1_0_3_features fuchsia_zircon_sys_0_3_3_features ];
-  fuchsia_zircon_sys_0_3_3 = { features?(fuchsia_zircon_sys_0_3_3_features {}) }: fuchsia_zircon_sys_0_3_3_ {};
-  fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f ({
-    fuchsia_zircon_sys_0_3_3.default = (f.fuchsia_zircon_sys_0_3_3.default or true);
-  }) [];
-  git2_0_6_11 = { features?(git2_0_6_11_features {}) }: git2_0_6_11_ {
-    dependencies = mapFeatures features ([ bitflags_0_9_1 libc_0_2_40 libgit2_sys_0_6_19 url_1_7_0 ])
-      ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "darwin") then mapFeatures features ([ ]
-      ++ (if features.git2_0_6_11.openssl-probe or false then [ openssl_probe_0_1_2 ] else [])
-      ++ (if features.git2_0_6_11.openssl-sys or false then [ openssl_sys_0_9_30 ] else [])) else []);
-    features = mkFeatures (features.git2_0_6_11 or {});
-  };
-  git2_0_6_11_features = f: updateFeatures f (rec {
-    bitflags_0_9_1.default = true;
-    git2_0_6_11.curl =
-      (f.git2_0_6_11.curl or false) ||
-      (f.git2_0_6_11.default or false) ||
-      (git2_0_6_11.default or false);
-    git2_0_6_11.default = (f.git2_0_6_11.default or true);
-    git2_0_6_11.https =
-      (f.git2_0_6_11.https or false) ||
-      (f.git2_0_6_11.default or false) ||
-      (git2_0_6_11.default or false);
-    git2_0_6_11.openssl-probe =
-      (f.git2_0_6_11.openssl-probe or false) ||
-      (f.git2_0_6_11.https or false) ||
-      (git2_0_6_11.https or false);
-    git2_0_6_11.openssl-sys =
-      (f.git2_0_6_11.openssl-sys or false) ||
-      (f.git2_0_6_11.https or false) ||
-      (git2_0_6_11.https or false);
-    git2_0_6_11.ssh =
-      (f.git2_0_6_11.ssh or false) ||
-      (f.git2_0_6_11.default or false) ||
-      (git2_0_6_11.default or false);
-    libc_0_2_40.default = true;
-    libgit2_sys_0_6_19.curl =
-      (f.libgit2_sys_0_6_19.curl or false) ||
-      (git2_0_6_11.curl or false) ||
-      (f.git2_0_6_11.curl or false);
-    libgit2_sys_0_6_19.default = true;
-    libgit2_sys_0_6_19.https =
-      (f.libgit2_sys_0_6_19.https or false) ||
-      (git2_0_6_11.https or false) ||
-      (f.git2_0_6_11.https or false);
-    libgit2_sys_0_6_19.ssh =
-      (f.libgit2_sys_0_6_19.ssh or false) ||
-      (git2_0_6_11.ssh or false) ||
-      (f.git2_0_6_11.ssh or false);
-    openssl_probe_0_1_2.default = true;
-    openssl_sys_0_9_30.default = true;
-    url_1_7_0.default = true;
-  }) [ bitflags_0_9_1_features libc_0_2_40_features libgit2_sys_0_6_19_features url_1_7_0_features openssl_probe_0_1_2_features openssl_sys_0_9_30_features ];
-  idna_0_1_4 = { features?(idna_0_1_4_features {}) }: idna_0_1_4_ {
-    dependencies = mapFeatures features ([ matches_0_1_6 unicode_bidi_0_3_4 unicode_normalization_0_1_7 ]);
-  };
-  idna_0_1_4_features = f: updateFeatures f ({
-    idna_0_1_4.default = (f.idna_0_1_4.default or true);
-    matches_0_1_6.default = true;
-    unicode_bidi_0_3_4.default = true;
-    unicode_normalization_0_1_7.default = true;
-  }) [ matches_0_1_6_features unicode_bidi_0_3_4_features unicode_normalization_0_1_7_features ];
-  json_0_11_13 = { features?(json_0_11_13_features {}) }: json_0_11_13_ {};
-  json_0_11_13_features = f: updateFeatures f ({
-    json_0_11_13.default = (f.json_0_11_13.default or true);
-  }) [];
-  kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ {
-    dependencies = mapFeatures features ([ winapi_0_2_8 ]);
-    buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
-  };
-  kernel32_sys_0_2_2_features = f: updateFeatures f ({
-    kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true);
-    winapi_0_2_8.default = true;
-    winapi_build_0_1_1.default = true;
-  }) [ winapi_0_2_8_features winapi_build_0_1_1_features ];
-  lazy_static_1_0_0 = { features?(lazy_static_1_0_0_features {}) }: lazy_static_1_0_0_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.lazy_static_1_0_0 or {});
-  };
-  lazy_static_1_0_0_features = f: updateFeatures f (rec {
-    lazy_static_1_0_0.compiletest_rs =
-      (f.lazy_static_1_0_0.compiletest_rs or false) ||
-      (f.lazy_static_1_0_0.compiletest or false) ||
-      (lazy_static_1_0_0.compiletest or false);
-    lazy_static_1_0_0.default = (f.lazy_static_1_0_0.default or true);
-    lazy_static_1_0_0.nightly =
-      (f.lazy_static_1_0_0.nightly or false) ||
-      (f.lazy_static_1_0_0.spin_no_std or false) ||
-      (lazy_static_1_0_0.spin_no_std or false);
-    lazy_static_1_0_0.spin =
-      (f.lazy_static_1_0_0.spin or false) ||
-      (f.lazy_static_1_0_0.spin_no_std or false) ||
-      (lazy_static_1_0_0.spin_no_std or false);
-  }) [];
-  lazysort_0_2_0 = { features?(lazysort_0_2_0_features {}) }: lazysort_0_2_0_ {
-    dependencies = mapFeatures features ([ rand_0_3_22 ]);
-    features = mkFeatures (features.lazysort_0_2_0 or {});
-  };
-  lazysort_0_2_0_features = f: updateFeatures f ({
-    lazysort_0_2_0.default = (f.lazysort_0_2_0.default or true);
-    rand_0_3_22.default = true;
-  }) [ rand_0_3_22_features ];
-  libc_0_2_40 = { features?(libc_0_2_40_features {}) }: libc_0_2_40_ {
-    features = mkFeatures (features.libc_0_2_40 or {});
-  };
-  libc_0_2_40_features = f: updateFeatures f (rec {
-    libc_0_2_40.default = (f.libc_0_2_40.default or true);
-    libc_0_2_40.use_std =
-      (f.libc_0_2_40.use_std or false) ||
-      (f.libc_0_2_40.default or false) ||
-      (libc_0_2_40.default or false);
-  }) [];
-  libgit2_sys_0_6_19 = { features?(libgit2_sys_0_6_19_features {}) }: libgit2_sys_0_6_19_ {
-    dependencies = mapFeatures features ([ libc_0_2_40 libz_sys_1_0_18 ]
-      ++ (if features.libgit2_sys_0_6_19.curl-sys or false then [ curl_sys_0_4_5 ] else [])
-      ++ (if features.libgit2_sys_0_6_19.libssh2-sys or false then [ libssh2_sys_0_2_7 ] else []))
-      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ ]
-      ++ (if features.libgit2_sys_0_6_19.openssl-sys or false then [ openssl_sys_0_9_30 ] else [])) else []);
-    buildDependencies = mapFeatures features ([ cc_1_0_15 cmake_0_1_31 pkg_config_0_3_11 ]);
-    features = mkFeatures (features.libgit2_sys_0_6_19 or {});
-  };
-  libgit2_sys_0_6_19_features = f: updateFeatures f (rec {
-    cc_1_0_15.default = true;
-    cmake_0_1_31.default = true;
-    curl_sys_0_4_5.default = true;
-    libc_0_2_40.default = true;
-    libgit2_sys_0_6_19.curl-sys =
-      (f.libgit2_sys_0_6_19.curl-sys or false) ||
-      (f.libgit2_sys_0_6_19.curl or false) ||
-      (libgit2_sys_0_6_19.curl or false);
-    libgit2_sys_0_6_19.default = (f.libgit2_sys_0_6_19.default or true);
-    libgit2_sys_0_6_19.libssh2-sys =
-      (f.libgit2_sys_0_6_19.libssh2-sys or false) ||
-      (f.libgit2_sys_0_6_19.ssh or false) ||
-      (libgit2_sys_0_6_19.ssh or false);
-    libgit2_sys_0_6_19.openssl-sys =
-      (f.libgit2_sys_0_6_19.openssl-sys or false) ||
-      (f.libgit2_sys_0_6_19.https or false) ||
-      (libgit2_sys_0_6_19.https or false);
-    libssh2_sys_0_2_7.default = true;
-    libz_sys_1_0_18.default = true;
-    openssl_sys_0_9_30.default = true;
-    pkg_config_0_3_11.default = true;
-  }) [ curl_sys_0_4_5_features libc_0_2_40_features libssh2_sys_0_2_7_features libz_sys_1_0_18_features cc_1_0_15_features cmake_0_1_31_features pkg_config_0_3_11_features openssl_sys_0_9_30_features ];
-  libssh2_sys_0_2_7 = { features?(libssh2_sys_0_2_7_features {}) }: libssh2_sys_0_2_7_ {
-    dependencies = mapFeatures features ([ libc_0_2_40 libz_sys_1_0_18 ])
-      ++ (if abi == "msvc" then mapFeatures features ([]) else [])
-      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ openssl_sys_0_9_30 ]) else []);
-    buildDependencies = mapFeatures features ([ cmake_0_1_31 pkg_config_0_3_11 ]);
-  };
-  libssh2_sys_0_2_7_features = f: updateFeatures f ({
-    cmake_0_1_31.default = true;
-    libc_0_2_40.default = true;
-    libssh2_sys_0_2_7.default = (f.libssh2_sys_0_2_7.default or true);
-    libz_sys_1_0_18.default = true;
-    openssl_sys_0_9_30.default = true;
-    pkg_config_0_3_11.default = true;
-  }) [ libc_0_2_40_features libz_sys_1_0_18_features cmake_0_1_31_features pkg_config_0_3_11_features openssl_sys_0_9_30_features ];
-  libz_sys_1_0_18 = { features?(libz_sys_1_0_18_features {}) }: libz_sys_1_0_18_ {
-    dependencies = mapFeatures features ([ libc_0_2_40 ])
-      ++ (if abi == "msvc" then mapFeatures features ([]) else []);
-    buildDependencies = mapFeatures features ([ cc_1_0_15 pkg_config_0_3_11 ]);
-  };
-  libz_sys_1_0_18_features = f: updateFeatures f ({
-    cc_1_0_15.default = true;
-    libc_0_2_40.default = true;
-    libz_sys_1_0_18.default = (f.libz_sys_1_0_18.default or true);
-    pkg_config_0_3_11.default = true;
-  }) [ libc_0_2_40_features cc_1_0_15_features pkg_config_0_3_11_features ];
-  matches_0_1_6 = { features?(matches_0_1_6_features {}) }: matches_0_1_6_ {};
-  matches_0_1_6_features = f: updateFeatures f ({
-    matches_0_1_6.default = (f.matches_0_1_6.default or true);
-  }) [];
-  memchr_2_0_1 = { features?(memchr_2_0_1_features {}) }: memchr_2_0_1_ {
-    dependencies = mapFeatures features ([ ]
-      ++ (if features.memchr_2_0_1.libc or false then [ libc_0_2_40 ] else []));
-    features = mkFeatures (features.memchr_2_0_1 or {});
-  };
-  memchr_2_0_1_features = f: updateFeatures f (rec {
-    libc_0_2_40.default = (f.libc_0_2_40.default or false);
-    libc_0_2_40.use_std =
-      (f.libc_0_2_40.use_std or false) ||
-      (memchr_2_0_1.use_std or false) ||
-      (f.memchr_2_0_1.use_std or false);
-    memchr_2_0_1.default = (f.memchr_2_0_1.default or true);
-    memchr_2_0_1.libc =
-      (f.memchr_2_0_1.libc or false) ||
-      (f.memchr_2_0_1.default or false) ||
-      (memchr_2_0_1.default or false) ||
-      (f.memchr_2_0_1.use_std or false) ||
-      (memchr_2_0_1.use_std or false);
-    memchr_2_0_1.use_std =
-      (f.memchr_2_0_1.use_std or false) ||
-      (f.memchr_2_0_1.default or false) ||
-      (memchr_2_0_1.default or false);
-  }) [ libc_0_2_40_features ];
-  openssl_probe_0_1_2 = { features?(openssl_probe_0_1_2_features {}) }: openssl_probe_0_1_2_ {};
-  openssl_probe_0_1_2_features = f: updateFeatures f ({
-    openssl_probe_0_1_2.default = (f.openssl_probe_0_1_2.default or true);
-  }) [];
-  openssl_sys_0_9_30 = { features?(openssl_sys_0_9_30_features {}) }: openssl_sys_0_9_30_ {
-    dependencies = mapFeatures features ([ libc_0_2_40 ])
-      ++ (if abi == "msvc" then mapFeatures features ([]) else []);
-    buildDependencies = mapFeatures features ([ cc_1_0_15 pkg_config_0_3_11 ]);
-  };
-  openssl_sys_0_9_30_features = f: updateFeatures f ({
-    cc_1_0_15.default = true;
-    libc_0_2_40.default = true;
-    openssl_sys_0_9_30.default = (f.openssl_sys_0_9_30.default or true);
-    pkg_config_0_3_11.default = true;
-  }) [ libc_0_2_40_features cc_1_0_15_features pkg_config_0_3_11_features ];
-  percent_encoding_1_0_1 = { features?(percent_encoding_1_0_1_features {}) }: percent_encoding_1_0_1_ {};
-  percent_encoding_1_0_1_features = f: updateFeatures f ({
-    percent_encoding_1_0_1.default = (f.percent_encoding_1_0_1.default or true);
-  }) [];
-  pkg_config_0_3_11 = { features?(pkg_config_0_3_11_features {}) }: pkg_config_0_3_11_ {};
-  pkg_config_0_3_11_features = f: updateFeatures f ({
-    pkg_config_0_3_11.default = (f.pkg_config_0_3_11.default or true);
-  }) [];
-  proc_macro2_0_3_8 = { features?(proc_macro2_0_3_8_features {}) }: proc_macro2_0_3_8_ {
-    dependencies = mapFeatures features ([ unicode_xid_0_1_0 ]);
-    features = mkFeatures (features.proc_macro2_0_3_8 or {});
-  };
-  proc_macro2_0_3_8_features = f: updateFeatures f (rec {
-    proc_macro2_0_3_8.default = (f.proc_macro2_0_3_8.default or true);
-    proc_macro2_0_3_8.proc-macro =
-      (f.proc_macro2_0_3_8.proc-macro or false) ||
-      (f.proc_macro2_0_3_8.default or false) ||
-      (proc_macro2_0_3_8.default or false) ||
-      (f.proc_macro2_0_3_8.nightly or false) ||
-      (proc_macro2_0_3_8.nightly or false);
-    unicode_xid_0_1_0.default = true;
-  }) [ unicode_xid_0_1_0_features ];
-  quote_0_5_2 = { features?(quote_0_5_2_features {}) }: quote_0_5_2_ {
-    dependencies = mapFeatures features ([ proc_macro2_0_3_8 ]);
-    features = mkFeatures (features.quote_0_5_2 or {});
-  };
-  quote_0_5_2_features = f: updateFeatures f (rec {
-    proc_macro2_0_3_8.default = (f.proc_macro2_0_3_8.default or false);
-    proc_macro2_0_3_8.proc-macro =
-      (f.proc_macro2_0_3_8.proc-macro or false) ||
-      (quote_0_5_2.proc-macro or false) ||
-      (f.quote_0_5_2.proc-macro or false);
-    quote_0_5_2.default = (f.quote_0_5_2.default or true);
-    quote_0_5_2.proc-macro =
-      (f.quote_0_5_2.proc-macro or false) ||
-      (f.quote_0_5_2.default or false) ||
-      (quote_0_5_2.default or false);
-  }) [ proc_macro2_0_3_8_features ];
-  rand_0_3_22 = { features?(rand_0_3_22_features {}) }: rand_0_3_22_ {
-    dependencies = mapFeatures features ([ libc_0_2_40 rand_0_4_2 ])
-      ++ (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 ]) else []);
-    features = mkFeatures (features.rand_0_3_22 or {});
-  };
-  rand_0_3_22_features = f: updateFeatures f (rec {
-    fuchsia_zircon_0_3_3.default = true;
-    libc_0_2_40.default = true;
-    rand_0_3_22.default = (f.rand_0_3_22.default or true);
-    rand_0_3_22.i128_support =
-      (f.rand_0_3_22.i128_support or false) ||
-      (f.rand_0_3_22.nightly or false) ||
-      (rand_0_3_22.nightly or false);
-    rand_0_4_2.default = true;
-  }) [ libc_0_2_40_features rand_0_4_2_features fuchsia_zircon_0_3_3_features ];
-  rand_0_4_2 = { features?(rand_0_4_2_features {}) }: rand_0_4_2_ {
-    dependencies = (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 ]) else [])
-      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ ]
-      ++ (if features.rand_0_4_2.libc or false then [ libc_0_2_40 ] else [])) else [])
-      ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []);
-    features = mkFeatures (features.rand_0_4_2 or {});
-  };
-  rand_0_4_2_features = f: updateFeatures f (rec {
-    fuchsia_zircon_0_3_3.default = true;
-    libc_0_2_40.default = true;
-    rand_0_4_2.default = (f.rand_0_4_2.default or true);
-    rand_0_4_2.i128_support =
-      (f.rand_0_4_2.i128_support or false) ||
-      (f.rand_0_4_2.nightly or false) ||
-      (rand_0_4_2.nightly or false);
-    rand_0_4_2.libc =
-      (f.rand_0_4_2.libc or false) ||
-      (f.rand_0_4_2.std or false) ||
-      (rand_0_4_2.std or false);
-    rand_0_4_2.std =
-      (f.rand_0_4_2.std or false) ||
-      (f.rand_0_4_2.default or false) ||
-      (rand_0_4_2.default or false);
-    winapi_0_3_4.default = true;
-    winapi_0_3_4.minwindef = true;
-    winapi_0_3_4.ntsecapi = true;
-    winapi_0_3_4.profileapi = true;
-    winapi_0_3_4.winnt = true;
-  }) [ fuchsia_zircon_0_3_3_features libc_0_2_40_features winapi_0_3_4_features ];
-  redox_syscall_0_1_37 = { features?(redox_syscall_0_1_37_features {}) }: redox_syscall_0_1_37_ {};
-  redox_syscall_0_1_37_features = f: updateFeatures f ({
-    redox_syscall_0_1_37.default = (f.redox_syscall_0_1_37.default or true);
-  }) [];
-  redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ {
-    dependencies = mapFeatures features ([ redox_syscall_0_1_37 ]);
-  };
-  redox_termios_0_1_1_features = f: updateFeatures f ({
-    redox_syscall_0_1_37.default = true;
-    redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true);
-  }) [ redox_syscall_0_1_37_features ];
-  regex_0_2_11 = { features?(regex_0_2_11_features {}) }: regex_0_2_11_ {
-    dependencies = mapFeatures features ([ aho_corasick_0_6_4 memchr_2_0_1 regex_syntax_0_5_6 thread_local_0_3_5 utf8_ranges_1_0_0 ]);
-    features = mkFeatures (features.regex_0_2_11 or {});
-  };
-  regex_0_2_11_features = f: updateFeatures f (rec {
-    aho_corasick_0_6_4.default = true;
-    memchr_2_0_1.default = true;
-    regex_0_2_11.default = (f.regex_0_2_11.default or true);
-    regex_0_2_11.pattern =
-      (f.regex_0_2_11.pattern or false) ||
-      (f.regex_0_2_11.unstable or false) ||
-      (regex_0_2_11.unstable or false);
-    regex_syntax_0_5_6.default = true;
-    thread_local_0_3_5.default = true;
-    utf8_ranges_1_0_0.default = true;
-  }) [ aho_corasick_0_6_4_features memchr_2_0_1_features regex_syntax_0_5_6_features thread_local_0_3_5_features utf8_ranges_1_0_0_features ];
-  regex_syntax_0_5_6 = { features?(regex_syntax_0_5_6_features {}) }: regex_syntax_0_5_6_ {
-    dependencies = mapFeatures features ([ ucd_util_0_1_1 ]);
-  };
-  regex_syntax_0_5_6_features = f: updateFeatures f ({
-    regex_syntax_0_5_6.default = (f.regex_syntax_0_5_6.default or true);
-    ucd_util_0_1_1.default = true;
-  }) [ ucd_util_0_1_1_features ];
-  semver_0_9_0 = { features?(semver_0_9_0_features {}) }: semver_0_9_0_ {
-    dependencies = mapFeatures features ([ semver_parser_0_7_0 ]
-      ++ (if features.semver_0_9_0.serde or false then [ serde_1_0_55 ] else []));
-    features = mkFeatures (features.semver_0_9_0 or {});
-  };
-  semver_0_9_0_features = f: updateFeatures f (rec {
-    semver_0_9_0.default = (f.semver_0_9_0.default or true);
-    semver_0_9_0.serde =
-      (f.semver_0_9_0.serde or false) ||
-      (f.semver_0_9_0.ci or false) ||
-      (semver_0_9_0.ci or false);
-    semver_parser_0_7_0.default = true;
-    serde_1_0_55.default = true;
-  }) [ semver_parser_0_7_0_features serde_1_0_55_features ];
-  semver_parser_0_7_0 = { features?(semver_parser_0_7_0_features {}) }: semver_parser_0_7_0_ {};
-  semver_parser_0_7_0_features = f: updateFeatures f ({
-    semver_parser_0_7_0.default = (f.semver_parser_0_7_0.default or true);
-  }) [];
-  serde_1_0_55 = { features?(serde_1_0_55_features {}) }: serde_1_0_55_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.serde_1_0_55 or {});
-  };
-  serde_1_0_55_features = f: updateFeatures f (rec {
-    serde_1_0_55.default = (f.serde_1_0_55.default or true);
-    serde_1_0_55.serde_derive =
-      (f.serde_1_0_55.serde_derive or false) ||
-      (f.serde_1_0_55.derive or false) ||
-      (serde_1_0_55.derive or false);
-    serde_1_0_55.std =
-      (f.serde_1_0_55.std or false) ||
-      (f.serde_1_0_55.default or false) ||
-      (serde_1_0_55.default or false);
-    serde_1_0_55.unstable =
-      (f.serde_1_0_55.unstable or false) ||
-      (f.serde_1_0_55.alloc or false) ||
-      (serde_1_0_55.alloc or false);
-  }) [];
-  serde_derive_1_0_55 = { features?(serde_derive_1_0_55_features {}) }: serde_derive_1_0_55_ {
-    dependencies = mapFeatures features ([ proc_macro2_0_3_8 quote_0_5_2 syn_0_13_10 ]);
-    features = mkFeatures (features.serde_derive_1_0_55 or {});
-  };
-  serde_derive_1_0_55_features = f: updateFeatures f ({
-    proc_macro2_0_3_8.default = true;
-    quote_0_5_2.default = true;
-    serde_derive_1_0_55.default = (f.serde_derive_1_0_55.default or true);
-    syn_0_13_10.default = true;
-    syn_0_13_10.visit = true;
-  }) [ proc_macro2_0_3_8_features quote_0_5_2_features syn_0_13_10_features ];
-  strsim_0_7_0 = { features?(strsim_0_7_0_features {}) }: strsim_0_7_0_ {};
-  strsim_0_7_0_features = f: updateFeatures f ({
-    strsim_0_7_0.default = (f.strsim_0_7_0.default or true);
-  }) [];
-  syn_0_13_10 = { features?(syn_0_13_10_features {}) }: syn_0_13_10_ {
-    dependencies = mapFeatures features ([ proc_macro2_0_3_8 unicode_xid_0_1_0 ]
-      ++ (if features.syn_0_13_10.quote or false then [ quote_0_5_2 ] else []));
-    features = mkFeatures (features.syn_0_13_10 or {});
-  };
-  syn_0_13_10_features = f: updateFeatures f (rec {
-    proc_macro2_0_3_8.default = (f.proc_macro2_0_3_8.default or false);
-    proc_macro2_0_3_8.proc-macro =
-      (f.proc_macro2_0_3_8.proc-macro or false) ||
-      (syn_0_13_10.proc-macro or false) ||
-      (f.syn_0_13_10.proc-macro or false);
-    quote_0_5_2.default = (f.quote_0_5_2.default or false);
-    quote_0_5_2.proc-macro =
-      (f.quote_0_5_2.proc-macro or false) ||
-      (syn_0_13_10.proc-macro or false) ||
-      (f.syn_0_13_10.proc-macro or false);
-    syn_0_13_10.clone-impls =
-      (f.syn_0_13_10.clone-impls or false) ||
-      (f.syn_0_13_10.default or false) ||
-      (syn_0_13_10.default or false);
-    syn_0_13_10.default = (f.syn_0_13_10.default or true);
-    syn_0_13_10.derive =
-      (f.syn_0_13_10.derive or false) ||
-      (f.syn_0_13_10.default or false) ||
-      (syn_0_13_10.default or false);
-    syn_0_13_10.parsing =
-      (f.syn_0_13_10.parsing or false) ||
-      (f.syn_0_13_10.default or false) ||
-      (syn_0_13_10.default or false);
-    syn_0_13_10.printing =
-      (f.syn_0_13_10.printing or false) ||
-      (f.syn_0_13_10.default or false) ||
-      (syn_0_13_10.default or false);
-    syn_0_13_10.proc-macro =
-      (f.syn_0_13_10.proc-macro or false) ||
-      (f.syn_0_13_10.default or false) ||
-      (syn_0_13_10.default or false);
-    syn_0_13_10.quote =
-      (f.syn_0_13_10.quote or false) ||
-      (f.syn_0_13_10.printing or false) ||
-      (syn_0_13_10.printing or false);
-    unicode_xid_0_1_0.default = true;
-  }) [ proc_macro2_0_3_8_features quote_0_5_2_features unicode_xid_0_1_0_features ];
-  tabwriter_1_0_4 = { features?(tabwriter_1_0_4_features {}) }: tabwriter_1_0_4_ {
-    dependencies = mapFeatures features ([ unicode_width_0_1_4 ]);
-    features = mkFeatures (features.tabwriter_1_0_4 or {});
-  };
-  tabwriter_1_0_4_features = f: updateFeatures f (rec {
-    tabwriter_1_0_4.default = (f.tabwriter_1_0_4.default or true);
-    tabwriter_1_0_4.lazy_static =
-      (f.tabwriter_1_0_4.lazy_static or false) ||
-      (f.tabwriter_1_0_4.ansi_formatting or false) ||
-      (tabwriter_1_0_4.ansi_formatting or false);
-    tabwriter_1_0_4.regex =
-      (f.tabwriter_1_0_4.regex or false) ||
-      (f.tabwriter_1_0_4.ansi_formatting or false) ||
-      (tabwriter_1_0_4.ansi_formatting or false);
-    unicode_width_0_1_4.default = true;
-  }) [ unicode_width_0_1_4_features ];
-  termion_1_5_1 = { features?(termion_1_5_1_features {}) }: termion_1_5_1_ {
-    dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_40 ]) else [])
-      ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_37 redox_termios_0_1_1 ]) else []);
-  };
-  termion_1_5_1_features = f: updateFeatures f ({
-    libc_0_2_40.default = true;
-    redox_syscall_0_1_37.default = true;
-    redox_termios_0_1_1.default = true;
-    termion_1_5_1.default = (f.termion_1_5_1.default or true);
-  }) [ libc_0_2_40_features redox_syscall_0_1_37_features redox_termios_0_1_1_features ];
-  textwrap_0_9_0 = { features?(textwrap_0_9_0_features {}) }: textwrap_0_9_0_ {
-    dependencies = mapFeatures features ([ unicode_width_0_1_4 ]);
-  };
-  textwrap_0_9_0_features = f: updateFeatures f ({
-    textwrap_0_9_0.default = (f.textwrap_0_9_0.default or true);
-    unicode_width_0_1_4.default = true;
-  }) [ unicode_width_0_1_4_features ];
-  thread_local_0_3_5 = { features?(thread_local_0_3_5_features {}) }: thread_local_0_3_5_ {
-    dependencies = mapFeatures features ([ lazy_static_1_0_0 unreachable_1_0_0 ]);
-  };
-  thread_local_0_3_5_features = f: updateFeatures f ({
-    lazy_static_1_0_0.default = true;
-    thread_local_0_3_5.default = (f.thread_local_0_3_5.default or true);
-    unreachable_1_0_0.default = true;
-  }) [ lazy_static_1_0_0_features unreachable_1_0_0_features ];
-  toml_0_4_6 = { features?(toml_0_4_6_features {}) }: toml_0_4_6_ {
-    dependencies = mapFeatures features ([ serde_1_0_55 ]);
-  };
-  toml_0_4_6_features = f: updateFeatures f ({
-    serde_1_0_55.default = true;
-    toml_0_4_6.default = (f.toml_0_4_6.default or true);
-  }) [ serde_1_0_55_features ];
-  ucd_util_0_1_1 = { features?(ucd_util_0_1_1_features {}) }: ucd_util_0_1_1_ {};
-  ucd_util_0_1_1_features = f: updateFeatures f ({
-    ucd_util_0_1_1.default = (f.ucd_util_0_1_1.default or true);
-  }) [];
-  unicode_bidi_0_3_4 = { features?(unicode_bidi_0_3_4_features {}) }: unicode_bidi_0_3_4_ {
-    dependencies = mapFeatures features ([ matches_0_1_6 ]);
-    features = mkFeatures (features.unicode_bidi_0_3_4 or {});
-  };
-  unicode_bidi_0_3_4_features = f: updateFeatures f (rec {
-    matches_0_1_6.default = true;
-    unicode_bidi_0_3_4.default = (f.unicode_bidi_0_3_4.default or true);
-    unicode_bidi_0_3_4.flame =
-      (f.unicode_bidi_0_3_4.flame or false) ||
-      (f.unicode_bidi_0_3_4.flame_it or false) ||
-      (unicode_bidi_0_3_4.flame_it or false);
-    unicode_bidi_0_3_4.flamer =
-      (f.unicode_bidi_0_3_4.flamer or false) ||
-      (f.unicode_bidi_0_3_4.flame_it or false) ||
-      (unicode_bidi_0_3_4.flame_it or false);
-    unicode_bidi_0_3_4.serde =
-      (f.unicode_bidi_0_3_4.serde or false) ||
-      (f.unicode_bidi_0_3_4.with_serde or false) ||
-      (unicode_bidi_0_3_4.with_serde or false);
-  }) [ matches_0_1_6_features ];
-  unicode_normalization_0_1_7 = { features?(unicode_normalization_0_1_7_features {}) }: unicode_normalization_0_1_7_ {};
-  unicode_normalization_0_1_7_features = f: updateFeatures f ({
-    unicode_normalization_0_1_7.default = (f.unicode_normalization_0_1_7.default or true);
-  }) [];
-  unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ {
-    features = mkFeatures (features.unicode_width_0_1_4 or {});
-  };
-  unicode_width_0_1_4_features = f: updateFeatures f ({
-    unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true);
-  }) [];
-  unicode_xid_0_1_0 = { features?(unicode_xid_0_1_0_features {}) }: unicode_xid_0_1_0_ {
-    features = mkFeatures (features.unicode_xid_0_1_0 or {});
-  };
-  unicode_xid_0_1_0_features = f: updateFeatures f ({
-    unicode_xid_0_1_0.default = (f.unicode_xid_0_1_0.default or true);
-  }) [];
-  unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ {
-    dependencies = mapFeatures features ([ void_1_0_2 ]);
-  };
-  unreachable_1_0_0_features = f: updateFeatures f ({
-    unreachable_1_0_0.default = (f.unreachable_1_0_0.default or true);
-    void_1_0_2.default = (f.void_1_0_2.default or false);
-  }) [ void_1_0_2_features ];
-  url_1_7_0 = { features?(url_1_7_0_features {}) }: url_1_7_0_ {
-    dependencies = mapFeatures features ([ idna_0_1_4 matches_0_1_6 percent_encoding_1_0_1 ]);
-    features = mkFeatures (features.url_1_7_0 or {});
-  };
-  url_1_7_0_features = f: updateFeatures f (rec {
-    idna_0_1_4.default = true;
-    matches_0_1_6.default = true;
-    percent_encoding_1_0_1.default = true;
-    url_1_7_0.default = (f.url_1_7_0.default or true);
-    url_1_7_0.encoding =
-      (f.url_1_7_0.encoding or false) ||
-      (f.url_1_7_0.query_encoding or false) ||
-      (url_1_7_0.query_encoding or false);
-    url_1_7_0.heapsize =
-      (f.url_1_7_0.heapsize or false) ||
-      (f.url_1_7_0.heap_size or false) ||
-      (url_1_7_0.heap_size or false);
-  }) [ idna_0_1_4_features matches_0_1_6_features percent_encoding_1_0_1_features ];
-  utf8_ranges_1_0_0 = { features?(utf8_ranges_1_0_0_features {}) }: utf8_ranges_1_0_0_ {};
-  utf8_ranges_1_0_0_features = f: updateFeatures f ({
-    utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true);
-  }) [];
-  vcpkg_0_2_3 = { features?(vcpkg_0_2_3_features {}) }: vcpkg_0_2_3_ {};
-  vcpkg_0_2_3_features = f: updateFeatures f ({
-    vcpkg_0_2_3.default = (f.vcpkg_0_2_3.default or true);
-  }) [];
-  vec_map_0_8_1 = { features?(vec_map_0_8_1_features {}) }: vec_map_0_8_1_ {
-    dependencies = mapFeatures features ([]);
-    features = mkFeatures (features.vec_map_0_8_1 or {});
-  };
-  vec_map_0_8_1_features = f: updateFeatures f (rec {
-    vec_map_0_8_1.default = (f.vec_map_0_8_1.default or true);
-    vec_map_0_8_1.serde =
-      (f.vec_map_0_8_1.serde or false) ||
-      (f.vec_map_0_8_1.eders or false) ||
-      (vec_map_0_8_1.eders or false);
-  }) [];
-  void_1_0_2 = { features?(void_1_0_2_features {}) }: void_1_0_2_ {
-    features = mkFeatures (features.void_1_0_2 or {});
-  };
-  void_1_0_2_features = f: updateFeatures f (rec {
-    void_1_0_2.default = (f.void_1_0_2.default or true);
-    void_1_0_2.std =
-      (f.void_1_0_2.std or false) ||
-      (f.void_1_0_2.default or false) ||
-      (void_1_0_2.default or false);
-  }) [];
-  winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {};
-  winapi_0_2_8_features = f: updateFeatures f ({
-    winapi_0_2_8.default = (f.winapi_0_2_8.default or true);
-  }) [];
-  winapi_0_3_4 = { features?(winapi_0_3_4_features {}) }: winapi_0_3_4_ {
-    dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ winapi_i686_pc_windows_gnu_0_4_0 ]) else [])
-      ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ winapi_x86_64_pc_windows_gnu_0_4_0 ]) else []);
-    features = mkFeatures (features.winapi_0_3_4 or {});
-  };
-  winapi_0_3_4_features = f: updateFeatures f ({
-    winapi_0_3_4.default = (f.winapi_0_3_4.default or true);
-    winapi_i686_pc_windows_gnu_0_4_0.default = true;
-    winapi_x86_64_pc_windows_gnu_0_4_0.default = true;
-  }) [ winapi_i686_pc_windows_gnu_0_4_0_features winapi_x86_64_pc_windows_gnu_0_4_0_features ];
-  winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {};
-  winapi_build_0_1_1_features = f: updateFeatures f ({
-    winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true);
-  }) [];
-  winapi_i686_pc_windows_gnu_0_4_0 = { features?(winapi_i686_pc_windows_gnu_0_4_0_features {}) }: winapi_i686_pc_windows_gnu_0_4_0_ {};
-  winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f ({
-    winapi_i686_pc_windows_gnu_0_4_0.default = (f.winapi_i686_pc_windows_gnu_0_4_0.default or true);
-  }) [];
-  winapi_x86_64_pc_windows_gnu_0_4_0 = { features?(winapi_x86_64_pc_windows_gnu_0_4_0_features {}) }: winapi_x86_64_pc_windows_gnu_0_4_0_ {};
-  winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f ({
-    winapi_x86_64_pc_windows_gnu_0_4_0.default = (f.winapi_x86_64_pc_windows_gnu_0_4_0.default or true);
-  }) [];
-  winreg_0_4_0 = { features?(winreg_0_4_0_features {}) }: winreg_0_4_0_ {
-    dependencies = mapFeatures features ([ advapi32_sys_0_2_0 kernel32_sys_0_2_2 winapi_0_2_8 ]);
-    features = mkFeatures (features.winreg_0_4_0 or {});
-  };
-  winreg_0_4_0_features = f: updateFeatures f (rec {
-    advapi32_sys_0_2_0.default = true;
-    kernel32_sys_0_2_2.default = true;
-    winapi_0_2_8.default = true;
-    winreg_0_4_0.default = (f.winreg_0_4_0.default or true);
-    winreg_0_4_0.ktmw32-sys =
-      (f.winreg_0_4_0.ktmw32-sys or false) ||
-      (f.winreg_0_4_0.transactions or false) ||
-      (winreg_0_4_0.transactions or false);
-    winreg_0_4_0.rustc-serialize =
-      (f.winreg_0_4_0.rustc-serialize or false) ||
-      (f.winreg_0_4_0.serialization-rustc or false) ||
-      (winreg_0_4_0.serialization-rustc or false);
-    winreg_0_4_0.serialization-rustc =
-      (f.winreg_0_4_0.serialization-rustc or false) ||
-      (f.winreg_0_4_0.default or false) ||
-      (winreg_0_4_0.default or false);
-    winreg_0_4_0.transactions =
-      (f.winreg_0_4_0.transactions or false) ||
-      (f.winreg_0_4_0.default or false) ||
-      (winreg_0_4_0.default or false) ||
-      (f.winreg_0_4_0.serialization-rustc or false) ||
-      (winreg_0_4_0.serialization-rustc or false);
-  }) [ advapi32_sys_0_2_0_features kernel32_sys_0_2_2_features winapi_0_2_8_features ];
-}
diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/tools/package-management/cargo-update/default.nix
index 50dc748e07ef..07651665645c 100644
--- a/pkgs/tools/package-management/cargo-update/default.nix
+++ b/pkgs/tools/package-management/cargo-update/default.nix
@@ -1,29 +1,37 @@
-{ stdenv, callPackage, defaultCrateOverrides, fetchFromGitHub, cmake, curl, libssh2, libgit2, openssl, zlib }:
+{ stdenv
+, rustPlatform
+, fetchFromGitHub
+, cmake
+, curl
+, libgit2
+, libssh2
+, openssl
+, pkg-config
+, zlib }:
 
-((callPackage ./cargo-update.nix {}).cargo_update {}).override {
-  crateOverrides = defaultCrateOverrides // {
-    cargo-update = attrs: rec {
-      name = "cargo-update-${version}";
-      version = "1.5.2";
+rustPlatform.buildRustPackage rec {
+  pname = "cargo-update";
+  version = "2.5.0";
 
-      src = fetchFromGitHub {
-        owner = "nabijaczleweli";
-        repo = "cargo-update";
-        rev = "v${version}";
-        sha256 = "1bvrdgcw2akzd78wgvsisvghi8pvdk3szyg9s46qxv4km9sf88s7";
-      };
+  src = fetchFromGitHub {
+    owner = "nabijaczleweli";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "143aczay7i3zbhbvv4cjf6hns5w8j52rfdaq8ff0r8v3qghd2972";
+  };
 
-      nativeBuildInputs = [ cmake ];
-      buildInputs = [ libssh2 libgit2 openssl zlib ]
-        ++ stdenv.lib.optional stdenv.isDarwin curl;
+  cargoPatches = [ ./cargo-lock.patch ];
+  cargoSha256 = "0mxc752hmd7r29camq4f4qzwx0w008rqlq07j2r26z4ygvlrkc3a";
 
-      meta = with stdenv.lib; {
-        description = "A cargo subcommand for checking and applying updates to installed executables";
-        homepage = https://github.com/nabijaczleweli/cargo-update;
-        license = with licenses; [ mit ];
-        maintainers = with maintainers; [ gerschtli ];
-        platforms = platforms.all;
-      };
-    };
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libgit2 libssh2 openssl pkg-config zlib ]
+    ++ stdenv.lib.optional stdenv.isDarwin curl;
+
+  meta = with stdenv.lib; {
+    description = "A cargo subcommand for checking and applying updates to installed executables";
+    homepage = "https://github.com/nabijaczleweli/cargo-update";
+    license = licenses.mit;
+    maintainers = with maintainers; [ gerschtli ];
+    platforms = platforms.all;
   };
 }

From 1bd8b17959aea449c38a0bf15585b13b2eeb9965 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <brightone@protonmail.com>
Date: Thu, 9 Jan 2020 16:25:20 +0200
Subject: [PATCH 0089/4636] cargo-update: add filalex77 to maintainers

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

diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/tools/package-management/cargo-update/default.nix
index 07651665645c..241213b94096 100644
--- a/pkgs/tools/package-management/cargo-update/default.nix
+++ b/pkgs/tools/package-management/cargo-update/default.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
     description = "A cargo subcommand for checking and applying updates to installed executables";
     homepage = "https://github.com/nabijaczleweli/cargo-update";
     license = licenses.mit;
-    maintainers = with maintainers; [ gerschtli ];
+    maintainers = with maintainers; [ gerschtli filalex77 ];
     platforms = platforms.all;
   };
 }

From d9935b1f717a440d810265396675c0474153d062 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 9 Jan 2020 17:29:59 +0200
Subject: [PATCH 0090/4636] Add checkPhase

Co-Authored-By: Jon <jonringer@users.noreply.github.com>
---
 pkgs/tools/misc/brotab/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/brotab/default.nix b/pkgs/tools/misc/brotab/default.nix
index b109c0ad50cb..2b6274c631da 100644
--- a/pkgs/tools/misc/brotab/default.nix
+++ b/pkgs/tools/misc/brotab/default.nix
@@ -19,6 +19,11 @@ python.pkgs.buildPythonApplication rec {
     psutil
   ];
 
+  # test_integration.py requires Chrome browser session
+  checkPhase = ''
+    ${python.interpreter} -m unittest brotab/tests/test_{brotab,utils}.py
+  '';
+  
   meta = with lib; {
     homepage = "https://github.com/balta2ar/brotab";
     description = "Control your browser's tabs from the command line";
@@ -26,4 +31,3 @@ python.pkgs.buildPythonApplication rec {
     maintainers = with maintainers; [ doronbehar ];
   };
 }
-

From 27b8253655217f46532625d07fb8d4cdbd649489 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Thu, 9 Jan 2020 17:34:54 -0500
Subject: [PATCH 0091/4636] nixos/zerotierone: prevent systemd from changing
 MAC address

---
 nixos/modules/services/networking/zerotierone.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix
index 764af3846fe5..190ffdf4cad3 100644
--- a/nixos/modules/services/networking/zerotierone.nix
+++ b/nixos/modules/services/networking/zerotierone.nix
@@ -63,5 +63,15 @@ in
     networking.firewall.allowedUDPPorts = [ cfg.port ];
 
     environment.systemPackages = [ cfg.package ];
+
+    # Prevent systemd from potentially changing the MAC address
+    environment.etc."systemd/network/50-zerotier.link".text = ''
+      [Match]
+      OriginalName=zt*
+
+      [Link]
+      AutoNegotiation=false
+      MACAddressPolicy=none
+    '';
   };
 }

From 637d7a5db9927a78c3b9e57ea3b2b22b27d8caa9 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Thu, 9 Jan 2020 15:07:50 +0000
Subject: [PATCH 0092/4636] nixos/factorio: add extraSettings and package
 options

Currently there is no way to set game settings, such as administrators.
extraSettings allows users to override default game settings without
adding many more settings.

The package option allows users to use the experimental version, or
override to a specific version with their own modified package.
---
 nixos/modules/services/games/factorio.nix | 26 ++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix
index f3831156f453..4b2e1a3c07f0 100644
--- a/nixos/modules/services/games/factorio.nix
+++ b/nixos/modules/services/games/factorio.nix
@@ -4,14 +4,13 @@ with lib;
 
 let
   cfg = config.services.factorio;
-  factorio = pkgs.factorio-headless;
   name = "Factorio";
   stateDir = "/var/lib/${cfg.stateDirName}";
   mkSavePath = name: "${stateDir}/saves/${name}.zip";
   configFile = pkgs.writeText "factorio.conf" ''
     use-system-read-write-data-directories=true
     [path]
-    read-data=${factorio}/share/factorio/data
+    read-data=${cfg.package}/share/factorio/data
     write-data=${stateDir}
   '';
   serverSettings = {
@@ -37,7 +36,7 @@ let
     only_admins_can_pause_the_game = true;
     autosave_only_on_server = true;
     admins = [];
-  };
+  } // cfg.extraSettings;
   serverSettingsFile = pkgs.writeText "server-settings.json" (builtins.toJSON (filterAttrsRecursive (n: v: v != null) serverSettings));
   modDir = pkgs.factorio-utils.mkModDirDrv cfg.mods;
 in
@@ -115,6 +114,14 @@ in
           Description of the game that will appear in the listing.
         '';
       };
+      extraSettings = mkOption {
+        type = types.attrs;
+        default = {};
+        example = { admins = [ "username" ];};
+        description = ''
+          Extra game configuration that will go into server-settings.json
+        '';
+      };
       public = mkOption {
         type = types.bool;
         default = false;
@@ -136,6 +143,15 @@ in
           Your factorio.com login credentials. Required for games with visibility public.
         '';
       };
+      package = mkOption {
+        type = types.package;
+        default = pkgs.factorio-headless;
+        defaultText = "pkgs.factorio-headless";
+        example = "pkgs.factorio-headless-experimental";
+        description = ''
+          Factorio version to use. This defaults to the stable channel.
+        '';
+      };
       password = mkOption {
         type = types.nullOr types.str;
         default = null;
@@ -184,7 +200,7 @@ in
       preStart = toString [
         "test -e ${stateDir}/saves/${cfg.saveName}.zip"
         "||"
-        "${factorio}/bin/factorio"
+        "${cfg.package}/bin/factorio"
           "--config=${cfg.configFile}"
           "--create=${mkSavePath cfg.saveName}"
           (optionalString (cfg.mods != []) "--mod-directory=${modDir}")
@@ -197,7 +213,7 @@ in
         StateDirectory = cfg.stateDirName;
         UMask = "0007";
         ExecStart = toString [
-          "${factorio}/bin/factorio"
+          "${cfg.package}/bin/factorio"
           "--config=${cfg.configFile}"
           "--port=${toString cfg.port}"
           "--start-server=${mkSavePath cfg.saveName}"

From 2a38b364e6e06ba423403334e638e69992531ab5 Mon Sep 17 00:00:00 2001
From: Tomasz Rybarczyk <paluho@gmail.com>
Date: Sun, 12 Jan 2020 19:20:12 +0100
Subject: [PATCH 0093/4636] Add paluh to the list of maintainers

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index de4c95f7f2c6..4d2a745a83b0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5308,6 +5308,12 @@
     githubId = 11016164;
     name = "Fedor Pakhomov";
   };
+  paluh = {
+    email = "paluho@gmail.com";
+    github = "paluh";
+    githubId = 190249;
+    name = "Tomasz Rybarczyk";
+  };
   pamplemousse = {
     email = "xav.maso@gmail.com";
     github = "Pamplemousse";

From d13bf9a14fba5f4921458a8fdd36d5365cc9b54f Mon Sep 17 00:00:00 2001
From: Tomasz Rybarczyk <paluho@gmail.com>
Date: Fri, 10 Jan 2020 20:56:16 +0100
Subject: [PATCH 0094/4636] imgproxy: init at 2.8.1

---
 pkgs/servers/imgproxy/default.nix | 32 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/servers/imgproxy/default.nix

diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix
new file mode 100644
index 000000000000..be78e1aa8316
--- /dev/null
+++ b/pkgs/servers/imgproxy/default.nix
@@ -0,0 +1,32 @@
+{ lib, buildGoModule, fetchFromGitHub, pkg-config, vips, gobject-introspection }:
+
+buildGoModule rec {
+  pname = "imgproxy";
+  version = "2.8.1";
+
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    sha256 = "00hhgh6nrzg2blc6yl8rph5h5w7swlkbh0zgsj7xr0lkm10879pc";
+    rev = "v${version}";
+  };
+
+  modSha256 = "0kgd8lwcdns3skvd4bj4z85mq6hkk79mb0zzwky0wqxni8f73s6w";
+
+  buildInputs = [
+    gobject-introspection
+    pkg-config
+    vips
+  ];
+
+  preBuild = ''
+    export CGO_LDFLAGS_ALLOW='-(s|w)'
+  '';
+
+  meta = with lib; {
+    description = "Fast and secure on-the-fly image processing server written in Go";
+    homepage = "https://imgproxy.net";
+    license = licenses.mit;
+    maintainers = with maintainers; [ paluh ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 982721ae44d9..3e5049343a5b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15231,6 +15231,8 @@ in
     theme-spring = callPackage ../servers/icingaweb2/theme-spring { };
   };
 
+  imgproxy = callPackage ../servers/imgproxy { };
+
   ircdHybrid = callPackage ../servers/irc/ircd-hybrid { };
 
   jboss = callPackage ../servers/http/jboss { };

From cd5222a8b573f6b2d90d56bcda1ef8411c0374f9 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 13 Nov 2019 12:01:46 +0800
Subject: [PATCH 0095/4636] netalyzr: service no longer exists as of 2019-03

---
 pkgs/tools/networking/netalyzr/default.nix | 30 ----------------------
 pkgs/top-level/all-packages.nix            |  2 --
 2 files changed, 32 deletions(-)
 delete mode 100644 pkgs/tools/networking/netalyzr/default.nix

diff --git a/pkgs/tools/networking/netalyzr/default.nix b/pkgs/tools/networking/netalyzr/default.nix
deleted file mode 100644
index 969084582aee..000000000000
--- a/pkgs/tools/networking/netalyzr/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, jre, makeWrapper }:
-
-stdenv.mkDerivation {
-  pname = "netalyzr";
-  version = "57861";
-
-  # unfortunately there is not a version specific download URL
-  src = fetchurl {
-    url    = "http://netalyzr.icsi.berkeley.edu/NetalyzrCLI.jar";
-    sha256 = "0fa3gvgp05p1nf1d711052wgvnp0xnvhj2h2bwk1mh1ih8qn50xb";
-  };
-
-  phases = [ "installPhase" ];
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  installPhase = ''
-    mkdir -p $out/{bin,share/netalyzr}
-    install -m644 $src $out/share/netalyzr/NetalyzrCLI.jar
-    makeWrapper ${stdenv.lib.getBin jre}/bin/java $out/bin/netalyzr \
-      --add-flags "-jar $out/share/netalyzr/NetalyzrCLI.jar"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Network debugging and analysis tool";
-    homepage    = http://netalyzr.icsi.berkeley.edu;
-    maintainers = with maintainers; [ peterhoeg ];
-    platforms   = platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef9ebc140504..9cbe198901a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6634,8 +6634,6 @@ in
     w3m = w3m-batch;
   };
 
-  netalyzr = callPackage ../tools/networking/netalyzr { };
-
   swaks = callPackage ../tools/networking/swaks { };
 
   swiften = callPackage ../development/libraries/swiften { };

From 1c613434c5c026130d338967b953a5ae4bad85d6 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Tue, 14 Jan 2020 10:18:06 -0500
Subject: [PATCH 0096/4636] python3Packages.pynvml: init at 8.0.4

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

diff --git a/pkgs/development/python-modules/pynvml/default.nix b/pkgs/development/python-modules/pynvml/default.nix
new file mode 100644
index 000000000000..c64d723ec32f
--- /dev/null
+++ b/pkgs/development/python-modules/pynvml/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, cudatoolkit
+}:
+
+buildPythonPackage rec {
+  pname = "pynvml";
+  version = "8.0.4";
+  disabled = pythonOlder "3.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0pfykj1amqh1rixp90rg85v1nj6qmx89fahqr6ii4zlcckffmm68";
+  };
+
+  propagatedBuildInputs = [ cudatoolkit ];
+
+  doCheck = false;  # no tests in PyPi dist
+  pythonImportsCheck = [ "pynvml" "pynvml.smi" ];
+
+  meta = with lib; {
+    description = "Python bindings for the NVIDIA Management Library";
+    homepage = https://www.nvidia.com;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.bcdarwin ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5b148263388b..438eb0e43ad3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4943,6 +4943,8 @@ in {
 
   pynrrd = callPackage ../development/python-modules/pynrrd { };
 
+  pynvml = callPackage ../development/python-modules/pynvml { };
+
   pynzb = callPackage ../development/python-modules/pynzb { };
 
   process-tests = callPackage ../development/python-modules/process-tests { };

From 1dc14208f58ce3e09ce2a687f0476d53cf85dadc Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Mon, 13 Jan 2020 16:55:46 -0500
Subject: [PATCH 0097/4636] python3Packages.ignite: init at 0.2.1

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

diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix
new file mode 100644
index 000000000000..1ded86af3fb2
--- /dev/null
+++ b/pkgs/development/python-modules/ignite/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytest
+, mock
+, pytorch
+, pynvml
+, scikitlearn
+, tqdm
+}:
+
+buildPythonPackage rec {
+  pname = "ignite";
+  version = "0.2.1";
+
+  src = fetchFromGitHub {
+    owner = "pytorch";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "15k6dd11yxn4923llcpmw4srl1by5ljhh7aw5pnkn4n4qpywh6cm";
+  };
+
+  checkInputs = [ pytest mock ];
+
+  checkPhase = ''
+    pytest -k 'not visdom and not tensorboard and not mlflow and not polyaxon' tests/
+  '';
+  # these packages are not currently in nixpkgs
+
+  propagatedBuildInputs = [ pytorch scikitlearn tqdm pynvml ];
+
+  meta = with lib; {
+    description = "High-level training library for PyTorch";
+    homepage = https://pytorch.org/ignite;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.bcdarwin ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 438eb0e43ad3..9658528b3b3d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -761,6 +761,8 @@ in {
 
   i3ipc = callPackage ../development/python-modules/i3ipc { };
 
+  ignite = callPackage ../development/python-modules/ignite { };
+
   ihatemoney = callPackage ../development/python-modules/ihatemoney { };
 
   imutils = callPackage ../development/python-modules/imutils { };

From 9fb77128ee724c7a7d2797f2d3ad15c2bba5fb1c Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 15 Jan 2020 00:05:30 +0000
Subject: [PATCH 0098/4636] imageworsener: init at 1.3.3

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

diff --git a/pkgs/tools/graphics/imageworsener/default.nix b/pkgs/tools/graphics/imageworsener/default.nix
new file mode 100644
index 000000000000..7c3d89317001
--- /dev/null
+++ b/pkgs/tools/graphics/imageworsener/default.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, fetchurl
+, zlib
+, libpng
+, libjpeg
+, libwebp
+}:
+
+stdenv.mkDerivation rec {
+  pname = "imageworsener";
+  version = "1.3.3";
+
+  src = fetchurl {
+    url = "https://entropymine.com/${pname}/${pname}-${version}.tar.gz";
+    sha256 = "099ymaqk7gj0plmdx7fxabbdx2n03d25r00ly0vf6cx37mgnwjvw";
+  };
+
+  postPatch = ''
+    patchShebangs tests/runtest
+  '';
+
+  postInstall = ''
+    mkdir -p $out/share/doc/imageworsener
+    cp readme.txt technical.txt $out/share/doc/imageworsener
+  '';
+
+  buildInputs = [ zlib libpng libjpeg libwebp ];
+
+  doCheck = true;
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "A raster image scaling and processing utility";
+    homepage = https://entropymine.com/imageworsener/;
+    changelog = "https://github.com/jsummers/${pname}/blob/${version}/changelog.txt";
+    license = licenses.mit;
+    maintainers = with maintainers; [ emily ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef9ebc140504..432ca4019d42 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -930,6 +930,8 @@ in
 
   ili2c = callPackage ../tools/misc/ili2c { };
 
+  imageworsener = callPackage ../tools/graphics/imageworsener { };
+
   imgpatchtools = callPackage ../development/mobile/imgpatchtools { };
 
   ipgrep = callPackage ../tools/networking/ipgrep { };

From 51e137bbdc3821852201adbfa49dea728f8f5cfc Mon Sep 17 00:00:00 2001
From: Kovacsics Robert <rmk35@cam.ac.uk>
Date: Thu, 19 Dec 2019 16:26:54 +0000
Subject: [PATCH 0099/4636] rosie: init at unstable-2020-01-11

It uses its own Lua (making it use a generic Lua is work-in-progress).
---
 pkgs/tools/text/rosie/default.nix | 47 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/tools/text/rosie/default.nix

diff --git a/pkgs/tools/text/rosie/default.nix b/pkgs/tools/text/rosie/default.nix
new file mode 100644
index 000000000000..37f523c03475
--- /dev/null
+++ b/pkgs/tools/text/rosie/default.nix
@@ -0,0 +1,47 @@
+{ stdenv
+, lib
+, fetchgit
+, libbsd
+, readline
+}:
+
+stdenv.mkDerivation rec {
+  pname = "rosie";
+  version = "unstable-2020-01-11";
+  src = fetchgit {
+    url = https://gitlab.com/rosie-pattern-language/rosie;
+    rev = "670e9027563609ba2ea31e14e2621a1302742795";
+    sha256 = "0jc512dbn62a1fniknhbp6q0xa1p7xi3hn5v60is8sy9jgi3afxv";
+    fetchSubmodules = true;
+  };
+
+  postUnpack = ''
+    # The Makefile calls git to update submodules, unless this file exists
+    touch ${src.name}/submodules/~~present~~
+  '';
+
+  preConfigure = ''
+    patchShebangs src/build_info.sh
+    # Part of the same Makefile target which calls git to update submodules
+    ln -s src submodules/lua/include
+  '';
+
+  postInstall = ''
+    mkdir -p $out/share/emacs/site-lisp $out/share/vim-plugins $out/share/nvim
+    mv $out/lib/rosie/extra/extra/emacs/* $out/share/emacs/site-lisp/
+    mv $out/lib/rosie/extra/extra/vim $out/share/vim-plugins/rosie
+    ln -s $out/share/vim-plugins/rosie $out/share/nvim/site
+  '';
+
+  makeFlags = [ "DESTDIR=${placeholder "out"}" ];
+
+  buildInputs = [ libbsd readline ];
+
+  meta = with lib; {
+    homepage = https://rosie-lang.org;
+    description = "Tools for searching using parsing expression grammars";
+    license = licenses.mit;
+    maintainers = with maintainers; [ kovirobi ];
+    platforms = with platforms; linux ++ darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 245abf731dda..06f487aa0afb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6116,6 +6116,8 @@ in
 
   rnv = callPackage ../tools/text/xml/rnv { };
 
+  rosie = callPackage ../tools/text/rosie { };
+
   rounded-mgenplus = callPackage ../data/fonts/rounded-mgenplus { };
 
   roundup = callPackage ../tools/misc/roundup { };

From 521ac53e8826af5d54b6bbda332ba3d2322b0735 Mon Sep 17 00:00:00 2001
From: Stewart Mackenzie <sjm@fractalide.com>
Date: Sat, 18 Jan 2020 19:39:17 +0800
Subject: [PATCH 0100/4636] amp: git rev 2c88e8 (2019-06-09) -> v0.6.1

---
 pkgs/applications/editors/amp/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/amp/default.nix b/pkgs/applications/editors/amp/default.nix
index 31d0806df8a5..6db7cbed25bd 100644
--- a/pkgs/applications/editors/amp/default.nix
+++ b/pkgs/applications/editors/amp/default.nix
@@ -3,17 +3,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "amp";
-  # The latest release (0.5.2) does not compile, so we use a git snapshot instead.
-  version = "unstable-2019-06-09";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "jmacdonald";
     repo = pname;
-    rev = "2c88e82a88ada8a5fd2620ef225192395a4533a2";
-    sha256 = "0ha1xiabq31s687gkrnszf3zc7b3sfdl79iyg5ygbc49mzvarp8c";
+    rev = version;
+    sha256 = "0jhxyl27nwp7rp0lc3kic69g8x55d0azrwlwwhz3z74icqa8f03j";
   };
 
-  cargoSha256 = "1bvj2zg19ak4vi47vjkqlybz011kn5zq1j7zznr76zrryacw4lz1";
+  cargoSha256 = "0rk5c8knx8swqzmj7wd18hq2h5ndkzvcbq4lzggpavkk01a8hlb1";
 
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [ openssl python3 xorg.libxcb libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin

From cb8ba82f15e5747adf5eb098460ff3d4c37985c8 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Mon, 20 Jan 2020 23:59:40 +0100
Subject: [PATCH 0101/4636] sta: init at 2016-01-25

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

diff --git a/pkgs/tools/misc/sta/default.nix b/pkgs/tools/misc/sta/default.nix
new file mode 100644
index 000000000000..aa27ddf08384
--- /dev/null
+++ b/pkgs/tools/misc/sta/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, lib, fetchFromGitHub, autoreconfHook }:
+stdenv.mkDerivation {
+  pname = "sta";
+  version = "unstable-2016-01-25";
+
+  src = fetchFromGitHub {
+    owner = "simonccarter";
+    repo = "sta";
+    rev = "2aa2a6035dde88b24978b875e4c45e0e296f77ed";
+    sha256 = "05804f106nb89yvdd0csvpd5skwvnr9x4qr3maqzaw0qr055mrsk";
+  };
+
+  buildInputs = [ autoreconfHook ];
+
+  meta = with lib; {
+    description = "Simple statistics from the command line interface (CLI), fast";
+    longDescription = ''
+      This is a lightweight, fast tool for calculating basic descriptive
+      statistics from the command line. Inspired by
+      https://github.com/nferraz/st, this project differs in that it is written
+      in C++, allowing for faster computation of statistics given larger
+      non-trivial data sets.
+    '';
+    license = licenses.mit;
+    homepage = "https://github.com/simonccarter/sta";
+    maintainers = with maintainers; [ infinisil ];
+    platforms = platforms.all;
+    badPlatforms = platforms.darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec21cb75b45d..8cd61d18657e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5103,6 +5103,8 @@ in
 
   multitime = callPackage ../tools/misc/multitime { };
 
+  sta = callPackage ../tools/misc/sta {};
+
   multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in {
     multitrandata = callPackage ../tools/text/multitran/data { };
 

From 34b0167c56b3262f39a250fada3608dcf5150649 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Thu, 23 Jan 2020 14:07:05 +0100
Subject: [PATCH 0102/4636] nixos/caddy: resync with upstream unit file

---
 nixos/modules/services/web-servers/caddy.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix
index 132c50735d96..0e6e10a5f47d 100644
--- a/nixos/modules/services/web-servers/caddy.nix
+++ b/nixos/modules/services/web-servers/caddy.nix
@@ -64,32 +64,38 @@ in {
   config = mkIf cfg.enable {
     systemd.services.caddy = {
       description = "Caddy web server";
+      # upstream unit: https://github.com/caddyserver/caddy/blob/master/dist/init/linux-systemd/caddy.service
       after = [ "network-online.target" ];
+      wants = [ "network-online.target" ]; # systemd-networkd-wait-online.service
       wantedBy = [ "multi-user.target" ];
       environment = mkIf (versionAtLeast config.system.stateVersion "17.09")
         { CADDYPATH = cfg.dataDir; };
       serviceConfig = {
         ExecStart = ''
-          ${cfg.package}/bin/caddy -root=/var/tmp -conf=${configFile} \
+          ${cfg.package}/bin/caddy -log stdout -log-timestamps=false \
+            -root=/var/tmp -conf=${configFile} \
             -ca=${cfg.ca} -email=${cfg.email} ${optionalString cfg.agree "-agree"}
         '';
-        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID";
         Type = "simple";
         User = "caddy";
         Group = "caddy";
-        Restart = "on-failure";
-        StartLimitInterval = 86400;
-        StartLimitBurst = 5;
+        Restart = "on-abnormal";
+        StartLimitIntervalSec = 14400;
+        StartLimitBurst = 10;
         AmbientCapabilities = "cap_net_bind_service";
         CapabilityBoundingSet = "cap_net_bind_service";
         NoNewPrivileges = true;
-        LimitNPROC = 64;
+        LimitNPROC = 512;
         LimitNOFILE = 1048576;
         PrivateTmp = true;
         PrivateDevices = true;
         ProtectHome = true;
         ProtectSystem = "full";
         ReadWriteDirectories = cfg.dataDir;
+        KillMode = "mixed";
+        KillSignal = "SIGQUIT";
+        TimeoutStopSec = "5s";
       };
     };
 

From 5d2ea07f02ba60aa7af2388381f14dd62a0978dc Mon Sep 17 00:00:00 2001
From: vasile luta <elsile69@yahoo.com>
Date: Thu, 23 Jan 2020 12:24:40 +0200
Subject: [PATCH 0103/4636] vimUtils.vimrcFile: fixes packpath order

---
 pkgs/misc/vim-plugins/vim-utils.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 16c14b322189..81cd77f3edb5 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -330,9 +330,8 @@ let
         );
       in
       ''
-        set packpath-=~/.vim/after
-        set packpath+=${packDir packages}
-        set packpath+=~/.vim/after
+        set packpath^=${packDir packages}
+        set runtimepath^=${packDir packages}
 
         filetype indent plugin on | syn on
       '');

From 3b606fefb50dd43b8ac7c7dabe9f6e4294d27120 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Thu, 23 Jan 2020 18:52:10 +0000
Subject: [PATCH 0104/4636] kramdown-asciidoc: init at 1.0.1

---
 .../typesetting/kramdown-asciidoc/Gemfile     |  2 +
 .../kramdown-asciidoc/Gemfile.lock            | 15 ++++++++
 .../typesetting/kramdown-asciidoc/default.nix | 37 +++++++++++++++++++
 .../typesetting/kramdown-asciidoc/gemset.nix  | 23 ++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +-
 5 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/typesetting/kramdown-asciidoc/Gemfile
 create mode 100644 pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock
 create mode 100644 pkgs/tools/typesetting/kramdown-asciidoc/default.nix
 create mode 100644 pkgs/tools/typesetting/kramdown-asciidoc/gemset.nix

diff --git a/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile b/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile
new file mode 100644
index 000000000000..33585ea850ef
--- /dev/null
+++ b/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'kramdown-asciidoc'
diff --git a/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock b/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock
new file mode 100644
index 000000000000..f47f401367c8
--- /dev/null
+++ b/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock
@@ -0,0 +1,15 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    kramdown (1.17.0)
+    kramdown-asciidoc (1.0.1)
+      kramdown (~> 1.17.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  kramdown-asciidoc
+
+BUNDLED WITH
+   1.17.3
diff --git a/pkgs/tools/typesetting/kramdown-asciidoc/default.nix b/pkgs/tools/typesetting/kramdown-asciidoc/default.nix
new file mode 100644
index 000000000000..f37be270ddbe
--- /dev/null
+++ b/pkgs/tools/typesetting/kramdown-asciidoc/default.nix
@@ -0,0 +1,37 @@
+{ lib, bundlerApp, makeWrapper,
+  # Optional dependencies, can be null
+  epubcheck, kindlegen,
+  bundlerUpdateScript
+}:
+
+let
+  app = bundlerApp {
+    pname = "kramdown-asciidoc";
+    gemdir = ./.;
+
+    exes = [
+      "kramdoc"
+    ];
+
+    # buildInputs = [ makeWrapper ];
+
+    # postBuild = ''
+    #     wrapProgram "$out/bin/asciidoctor-epub3" \
+    #       ${lib.optionalString (epubcheck != null) "--set EPUBCHECK ${epubcheck}/bin/epubcheck"} \
+    #       ${lib.optionalString (kindlegen != null) "--set KINDLEGEN ${kindlegen}/bin/kindlegen"}
+    #   '';
+
+    # passthru = {
+    #   updateScript = bundlerUpdateScript "kramdown-asciidoc";
+    # };
+
+    meta = with lib; {
+      description = "A kramdown extension for converting Markdown documents to AsciiDoc.";
+      homepage = https://asciidoctor.org/;
+      license = licenses.mit;
+      maintainers = with maintainers; [ ];
+      platforms = platforms.unix;
+    };
+  };
+in
+  app
diff --git a/pkgs/tools/typesetting/kramdown-asciidoc/gemset.nix b/pkgs/tools/typesetting/kramdown-asciidoc/gemset.nix
new file mode 100644
index 000000000000..8a0ffda9e782
--- /dev/null
+++ b/pkgs/tools/typesetting/kramdown-asciidoc/gemset.nix
@@ -0,0 +1,23 @@
+{
+  kramdown = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq";
+      type = "gem";
+    };
+    version = "1.17.0";
+  };
+  kramdown-asciidoc = {
+    dependencies = ["kramdown"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nr4hss1byhchwkqy2w0dgc7s83n0s5xm0pjms2cmckc4sbrryxi";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1268532fae2..683cd1c08919 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2964,6 +2964,8 @@ in
     ssh = openssh;
   };
 
+  kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { };
+
   mcrcon = callPackage ../tools/networking/mcrcon {};
 
   rage = callPackage ../tools/security/rage {
@@ -7591,7 +7593,7 @@ in
   zpaqd = callPackage ../tools/archivers/zpaq/zpaqd.nix { };
 
   zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { };
-  
+
   zsh-bd = callPackage ../shells/zsh/zsh-bd { };
 
   zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { };

From 95917c20ab946ee544666fe86fbce46f38630b85 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Thu, 23 Jan 2020 18:52:54 +0000
Subject: [PATCH 0105/4636] docbookrx: init at unstable-2018-05-02

---
 pkgs/tools/typesetting/docbookrx/Gemfile      |  2 +
 pkgs/tools/typesetting/docbookrx/Gemfile.lock | 15 +++++
 pkgs/tools/typesetting/docbookrx/default.nix  | 58 +++++++++++++++++++
 pkgs/tools/typesetting/docbookrx/gemset.nix   | 23 ++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 5 files changed, 100 insertions(+)
 create mode 100644 pkgs/tools/typesetting/docbookrx/Gemfile
 create mode 100644 pkgs/tools/typesetting/docbookrx/Gemfile.lock
 create mode 100644 pkgs/tools/typesetting/docbookrx/default.nix
 create mode 100644 pkgs/tools/typesetting/docbookrx/gemset.nix

diff --git a/pkgs/tools/typesetting/docbookrx/Gemfile b/pkgs/tools/typesetting/docbookrx/Gemfile
new file mode 100644
index 000000000000..73fee2920d5e
--- /dev/null
+++ b/pkgs/tools/typesetting/docbookrx/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'nokogiri', '~> 1.8.0'
diff --git a/pkgs/tools/typesetting/docbookrx/Gemfile.lock b/pkgs/tools/typesetting/docbookrx/Gemfile.lock
new file mode 100644
index 000000000000..e1fbc2c94464
--- /dev/null
+++ b/pkgs/tools/typesetting/docbookrx/Gemfile.lock
@@ -0,0 +1,15 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    mini_portile2 (2.3.0)
+    nokogiri (1.8.5)
+      mini_portile2 (~> 2.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  nokogiri (~> 1.8.0)
+
+BUNDLED WITH
+   1.17.3
diff --git a/pkgs/tools/typesetting/docbookrx/default.nix b/pkgs/tools/typesetting/docbookrx/default.nix
new file mode 100644
index 000000000000..484e98fc88cb
--- /dev/null
+++ b/pkgs/tools/typesetting/docbookrx/default.nix
@@ -0,0 +1,58 @@
+{ lib
+, fetchFromGitHub
+, stdenv
+, ruby
+, bundlerEnv
+# , libxml2
+}:
+
+let
+  env = bundlerEnv {
+    name = "docbookrx-env";
+    gemdir = ./.;
+
+    inherit ruby;
+
+    # buildInputs = [
+    #   libxml2
+    # ];
+
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset = ./gemset.nix;
+  };
+
+in stdenv.mkDerivation {
+
+  pname = "docbookrx";
+  version = "unstable-2018-05-02";
+
+  buildInputs = [ env.wrappedRuby ];
+
+  src = fetchFromGitHub {
+    owner = "asciidoctor";
+    repo = "docbookrx";
+    rev = "682d8c2f7a9e1e6f546c5f7d0067353621c68a7a";
+    sha256 = "07jilh17gj8xx4ps4ln787izmhv8xwwwv6fkqqg3pwjni5qikx7w";
+  };
+
+  # TODO: I don't know ruby packaging but this does the trick for now
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    cp -a bin/docbookrx $out/bin
+    cp -a lib $out
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "(An early version of) a DocBook to AsciiDoc converter written in Ruby.";
+    homepage = https://asciidoctor.org/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ ];
+    platforms = platforms.unix;
+  };
+
+}
diff --git a/pkgs/tools/typesetting/docbookrx/gemset.nix b/pkgs/tools/typesetting/docbookrx/gemset.nix
new file mode 100644
index 000000000000..33a58845b221
--- /dev/null
+++ b/pkgs/tools/typesetting/docbookrx/gemset.nix
@@ -0,0 +1,23 @@
+{
+  mini_portile2 = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
+      type = "gem";
+    };
+    version = "2.3.0";
+  };
+  nokogiri = {
+    dependencies = ["mini_portile2"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz";
+      type = "gem";
+    };
+    version = "1.8.5";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 683cd1c08919..d43121553e80 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2845,6 +2845,8 @@ in
 
   docbook2mdoc = callPackage ../tools/misc/docbook2mdoc { };
 
+  docbookrx = callPackage ../tools/typesetting/docbookrx { };
+
   docear = callPackage ../applications/office/docear { };
 
   dockbarx = callPackage ../applications/misc/dockbarx { };

From de1411f0d421036f2beeff294fa40f57f8b71e32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= <code@andre-bubel.de>
Date: Mon, 27 Jan 2020 02:49:23 +0100
Subject: [PATCH 0106/4636] lzbench: 20170208 -> 1.8

---
 pkgs/tools/compression/lzbench/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/compression/lzbench/default.nix b/pkgs/tools/compression/lzbench/default.nix
index df7700d41cb8..be0491007e24 100644
--- a/pkgs/tools/compression/lzbench/default.nix
+++ b/pkgs/tools/compression/lzbench/default.nix
@@ -1,19 +1,18 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "lzbench-20170208";
+  pname = "lzbench";
+  version = "1.8";
 
   src = fetchFromGitHub {
     owner = "inikep";
-    repo = "lzbench";
-    rev = "d5e9b58";
-    sha256 = "16xj5fldwl639f0ys5rx54csbfvf35ja34bdl5m068hdn6dr47r5";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0gxw9b3yjj3z2b1y9mx3yfhklyxpfmb8fjf9mfpg9hlbr9mcpff3";
   };
 
   enableParallelBuilding = true;
 
-  buildInputs = stdenv.lib.optionals stdenv.isLinux [ stdenv.glibc.static ];
-
   installPhase = ''
     mkdir -p $out/bin
     cp lzbench $out/bin

From 674cfeb30f990ea7902ad7adf47e6c19ee99979f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 27 Jan 2020 09:26:47 +0000
Subject: [PATCH 0107/4636] libx86emu: 2.4 -> 2.6

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

diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix
index cef2c6aeb1bb..35d45845ce62 100644
--- a/pkgs/development/libraries/libx86emu/default.nix
+++ b/pkgs/development/libraries/libx86emu/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libx86emu";
-  version = "2.4";
+  version = "2.6";
 
   src = fetchFromGitHub {
     owner = "wfeldt";
     repo = "libx86emu";
     rev = version;
-    sha256 = "0r55ij8f5mab2kg6kvy5n2bw6avzp75nsxigbzy7dgik9zwsxvr4";
+    sha256 = "1a43xrgxyl1bawcyf4qnvasgjrmnl1npzlz07yz90vyg56x5c102";
   };
 
   nativeBuildInputs = [ perl ];

From 0da7a14f16ad150a28bf50fb2f11797f9c5c4456 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Tue, 31 Dec 2019 12:00:00 +0000
Subject: [PATCH 0108/4636] nixos/dovecot: add an option to enable mail_plugins

Motivation:
if enableQuota is true, mail plugins cannot be enabled in extraConfig
because of the problem described here:

https://doc.dovecot.org/configuration_manual/config_file/config_file_syntax/#variable-expansion

doveconf: Warning: /etc/dovecot/dovecot.conf line 8: Global setting
mail_plugins won't change the setting inside an earlier filter at
/etc/dovecot/dovecot.conf line 5 (if this is intentional, avoid this
warning by moving the global setting before /etc/dovecot/dovecot.conf
line 5)
---
 nixos/modules/services/mail/dovecot.nix | 52 ++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index b5ed2c594f77..37ee3c8494e8 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -14,8 +14,16 @@ let
       base_dir = ${baseDir}
       protocols = ${concatStringsSep " " cfg.protocols}
       sendmail_path = /run/wrappers/bin/sendmail
+      # defining mail_plugins must be done before the first protocol {} filter because of https://doc.dovecot.org/configuration_manual/config_file/config_file_syntax/#variable-expansion
+      mail_plugins = $mail_plugins ${concatStringsSep " " cfg.mailPlugins.globally.enable}
     ''
 
+    (concatStringsSep "\n" (mapAttrsToList (protocol: plugins: ''
+      protocol ${protocol} {
+        mail_plugins = $mail_plugins ${concatStringsSep " " plugins.enable}
+      }
+    '') cfg.mailPlugins.perProtocol))
+
     (if cfg.sslServerCert == null then ''
       ssl = no
       disable_plaintext_auth = no
@@ -72,7 +80,6 @@ let
     '')
 
     (optionalString cfg.enableQuota ''
-      mail_plugins = $mail_plugins quota
       service quota-status {
         executable = ${dovecotPkg}/libexec/dovecot/quota-status -p postfix
         inet_listener {
@@ -81,10 +88,6 @@ let
         client_limit = 1
       }
 
-      protocol imap {
-        mail_plugins = $mail_plugins imap_quota
-      }
-
       plugin {
         quota_rule = *:storage=${cfg.quotaGlobalPerUser}
         quota = maildir:User quota # per virtual mail user quota # BUG/FIXME broken, we couldn't get this working
@@ -183,6 +186,40 @@ in
       description = "Additional entries to put verbatim into Dovecot's config file.";
     };
 
+    mailPlugins =
+    let plugins = hint: types.submodule {
+        options = {
+          enable = mkOption {
+            type = types.listOf types.str;
+            default = [];
+            description = "mail plugins to enable as a list of strings to append to the ${hint} <literal>$mail_plugins</literal> configuration variable";
+          };
+        };
+      };
+    in
+    mkOption {
+      type = with types; submodule {
+        options = {
+          globally = mkOption {
+            type = plugins "top-level";
+            example = { enable =[ "virtual" ]; };
+            default = { enable = []; };
+          };
+          perProtocol = mkOption {
+            type = attrsOf (plugins "corresponding per-protocol");
+            default = {};
+            example = { imap = [ "imap_acl" ]; };
+          };
+        };
+      };
+      description = "Additional entries to add to the mail_plugins variable, globally and per protocol";
+      example = {
+        globally.enable = [ "acl" ];
+        perProtocol.imap.enable = [ "imap_acl" ];
+      };
+      default = { globally.enable = []; perProtocol = {};};
+    };
+
     configFile = mkOption {
       type = types.nullOr types.path;
       default = null;
@@ -310,6 +347,11 @@ in
      ++ optional cfg.enablePop3 "pop3"
      ++ optional cfg.enableLmtp "lmtp";
 
+    services.dovecot2.mailPlugins = mkIf cfg.enableQuota {
+      globally.enable = [ "quota" ];
+      perProtocol.imap.enable = [ "imap_quota" ];
+    };
+
     users.users = {
       dovenull =
         { uid = config.ids.uids.dovenull2;

From 56f9c51b05669c60489bdff2ba8a31f07aadc479 Mon Sep 17 00:00:00 2001
From: symphorien <symphorien@users.noreply.github.com>
Date: Tue, 28 Jan 2020 19:21:38 +0000
Subject: [PATCH 0109/4636] Update nixos/modules/services/mail/dovecot.nix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Léo Gaspard <github@leo.gaspard.ninja>
---
 nixos/modules/services/mail/dovecot.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 37ee3c8494e8..4dda69ae33c5 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -202,7 +202,7 @@ in
         options = {
           globally = mkOption {
             type = plugins "top-level";
-            example = { enable =[ "virtual" ]; };
+            example = { enable = [ "virtual" ]; };
             default = { enable = []; };
           };
           perProtocol = mkOption {

From 7a40ced06b02cfca5086209326180175953bef6a Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Tue, 28 Jan 2020 12:00:00 +0000
Subject: [PATCH 0110/4636] nixos/modules/services/mail/dovecot.nix:
 nixpkgs-fmt

---
 nixos/modules/services/mail/dovecot.nix | 246 +++++++++++++-----------
 1 file changed, 136 insertions(+), 110 deletions(-)

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 4dda69ae33c5..11d4e4ae5f8a 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -18,22 +18,30 @@ let
       mail_plugins = $mail_plugins ${concatStringsSep " " cfg.mailPlugins.globally.enable}
     ''
 
-    (concatStringsSep "\n" (mapAttrsToList (protocol: plugins: ''
-      protocol ${protocol} {
-        mail_plugins = $mail_plugins ${concatStringsSep " " plugins.enable}
-      }
-    '') cfg.mailPlugins.perProtocol))
+    (
+      concatStringsSep "\n" (
+        mapAttrsToList (
+          protocol: plugins: ''
+            protocol ${protocol} {
+              mail_plugins = $mail_plugins ${concatStringsSep " " plugins.enable}
+            }
+          ''
+        ) cfg.mailPlugins.perProtocol
+      )
+    )
 
-    (if cfg.sslServerCert == null then ''
-      ssl = no
-      disable_plaintext_auth = no
-    '' else ''
-      ssl_cert = <${cfg.sslServerCert}
-      ssl_key = <${cfg.sslServerKey}
-      ${optionalString (cfg.sslCACert != null) ("ssl_ca = <" + cfg.sslCACert)}
-      ssl_dh = <${config.security.dhparams.params.dovecot2.path}
-      disable_plaintext_auth = yes
-    '')
+    (
+      if cfg.sslServerCert == null then ''
+        ssl = no
+        disable_plaintext_auth = no
+      '' else ''
+        ssl_cert = <${cfg.sslServerCert}
+        ssl_key = <${cfg.sslServerKey}
+        ${optionalString (cfg.sslCACert != null) ("ssl_ca = <" + cfg.sslCACert)}
+        ssl_dh = <${config.security.dhparams.params.dovecot2.path}
+        disable_plaintext_auth = yes
+      ''
+    )
 
     ''
       default_internal_user = ${cfg.user}
@@ -53,50 +61,58 @@ let
       }
     ''
 
-    (optionalString cfg.enablePAM ''
-      userdb {
-        driver = passwd
-      }
-
-      passdb {
-        driver = pam
-        args = ${optionalString cfg.showPAMFailure "failure_show_msg=yes"} dovecot2
-      }
-    '')
-
-    (optionalString (cfg.sieveScripts != {}) ''
-      plugin {
-        ${concatStringsSep "\n" (mapAttrsToList (to: from: "sieve_${to} = ${stateDir}/sieve/${to}") cfg.sieveScripts)}
-      }
-    '')
-
-    (optionalString (cfg.mailboxes != []) ''
-      protocol imap {
-        namespace inbox {
-          inbox=yes
-          ${concatStringsSep "\n" (map mailboxConfig cfg.mailboxes)}
+    (
+      optionalString cfg.enablePAM ''
+        userdb {
+          driver = passwd
         }
-      }
-    '')
 
-    (optionalString cfg.enableQuota ''
-      service quota-status {
-        executable = ${dovecotPkg}/libexec/dovecot/quota-status -p postfix
-        inet_listener {
-          port = ${cfg.quotaPort}
+        passdb {
+          driver = pam
+          args = ${optionalString cfg.showPAMFailure "failure_show_msg=yes"} dovecot2
         }
-        client_limit = 1
-      }
+      ''
+    )
 
-      plugin {
-        quota_rule = *:storage=${cfg.quotaGlobalPerUser}
-        quota = maildir:User quota # per virtual mail user quota # BUG/FIXME broken, we couldn't get this working
-        quota_status_success = DUNNO
-        quota_status_nouser = DUNNO
-        quota_status_overquota = "552 5.2.2 Mailbox is full"
-        quota_grace = 10%%
-      }
-    '')
+    (
+      optionalString (cfg.sieveScripts != {}) ''
+        plugin {
+          ${concatStringsSep "\n" (mapAttrsToList (to: from: "sieve_${to} = ${stateDir}/sieve/${to}") cfg.sieveScripts)}
+        }
+      ''
+    )
+
+    (
+      optionalString (cfg.mailboxes != []) ''
+        protocol imap {
+          namespace inbox {
+            inbox=yes
+            ${concatStringsSep "\n" (map mailboxConfig cfg.mailboxes)}
+          }
+        }
+      ''
+    )
+
+    (
+      optionalString cfg.enableQuota ''
+        service quota-status {
+          executable = ${dovecotPkg}/libexec/dovecot/quota-status -p postfix
+          inet_listener {
+            port = ${cfg.quotaPort}
+          }
+          client_limit = 1
+        }
+
+        plugin {
+          quota_rule = *:storage=${cfg.quotaGlobalPerUser}
+          quota = maildir:User quota # per virtual mail user quota # BUG/FIXME broken, we couldn't get this working
+          quota_status_success = DUNNO
+          quota_status_nouser = DUNNO
+          quota_status_overquota = "552 5.2.2 Mailbox is full"
+          quota_grace = 10%%
+        }
+      ''
+    )
 
     cfg.extraConfig
   ];
@@ -110,7 +126,7 @@ let
     mailbox "${mailbox.name}" {
       auto = ${toString mailbox.auto}
   '' + optionalString (mailbox.specialUse != null) ''
-      special_use = \${toString mailbox.specialUse}
+    special_use = \${toString mailbox.specialUse}
   '' + "}";
 
   mailboxes = { ... }: {
@@ -163,7 +179,7 @@ in
 
     protocols = mkOption {
       type = types.listOf types.str;
-      default = [ ];
+      default = [];
       description = "Additional listeners to start when Dovecot is enabled.";
     };
 
@@ -187,38 +203,39 @@ in
     };
 
     mailPlugins =
-    let plugins = hint: types.submodule {
-        options = {
-          enable = mkOption {
-            type = types.listOf types.str;
-            default = [];
-            description = "mail plugins to enable as a list of strings to append to the ${hint} <literal>$mail_plugins</literal> configuration variable";
+      let
+        plugins = hint: types.submodule {
+          options = {
+            enable = mkOption {
+              type = types.listOf types.str;
+              default = [];
+              description = "mail plugins to enable as a list of strings to append to the ${hint} <literal>$mail_plugins</literal> configuration variable";
+            };
           };
         };
-      };
-    in
-    mkOption {
-      type = with types; submodule {
-        options = {
-          globally = mkOption {
-            type = plugins "top-level";
-            example = { enable = [ "virtual" ]; };
-            default = { enable = []; };
+      in
+        mkOption {
+          type = with types; submodule {
+            options = {
+              globally = mkOption {
+                type = plugins "top-level";
+                example = { enable = [ "virtual" ]; };
+                default = { enable = []; };
+              };
+              perProtocol = mkOption {
+                type = attrsOf (plugins "corresponding per-protocol");
+                default = {};
+                example = { imap = [ "imap_acl" ]; };
+              };
+            };
           };
-          perProtocol = mkOption {
-            type = attrsOf (plugins "corresponding per-protocol");
-            default = {};
-            example = { imap = [ "imap_acl" ]; };
+          description = "Additional entries to add to the mail_plugins variable, globally and per protocol";
+          example = {
+            globally.enable = [ "acl" ];
+            perProtocol.imap.enable = [ "imap_acl" ];
           };
+          default = { globally.enable = []; perProtocol = {}; };
         };
-      };
-      description = "Additional entries to add to the mail_plugins variable, globally and per protocol";
-      example = {
-        globally.enable = [ "acl" ];
-        perProtocol.imap.enable = [ "imap_acl" ];
-      };
-      default = { globally.enable = []; perProtocol = {};};
-    };
 
     configFile = mkOption {
       type = types.nullOr types.path;
@@ -342,10 +359,10 @@ in
       enable = true;
       params.dovecot2 = {};
     };
-   services.dovecot2.protocols =
-     optional cfg.enableImap "imap"
-     ++ optional cfg.enablePop3 "pop3"
-     ++ optional cfg.enableLmtp "lmtp";
+    services.dovecot2.protocols =
+      optional cfg.enableImap "imap"
+      ++ optional cfg.enablePop3 "pop3"
+      ++ optional cfg.enableLmtp "lmtp";
 
     services.dovecot2.mailPlugins = mkIf cfg.enableQuota {
       globally.enable = [ "quota" ];
@@ -354,20 +371,21 @@ in
 
     users.users = {
       dovenull =
-        { uid = config.ids.uids.dovenull2;
+        {
+          uid = config.ids.uids.dovenull2;
           description = "Dovecot user for untrusted logins";
           group = "dovenull";
         };
     } // optionalAttrs (cfg.user == "dovecot2") {
       dovecot2 =
-         { uid = config.ids.uids.dovecot2;
-           description = "Dovecot user";
-           group = cfg.group;
-         };
+        {
+          uid = config.ids.uids.dovecot2;
+          description = "Dovecot user";
+          group = cfg.group;
+        };
     } // optionalAttrs (cfg.createMailUser && cfg.mailUser != null) {
       ${cfg.mailUser} =
-        { description = "Virtual Mail User"; } //
-        optionalAttrs (cfg.mailGroup != null)
+        { description = "Virtual Mail User"; } // optionalAttrs (cfg.mailGroup != null)
           { group = cfg.mailGroup; };
     };
 
@@ -376,7 +394,7 @@ in
     } // optionalAttrs (cfg.group == "dovecot2") {
       dovecot2.gid = config.ids.gids.dovecot2;
     } // optionalAttrs (cfg.createMailUser && cfg.mailGroup != null) {
-      ${cfg.mailGroup} = { };
+      ${cfg.mailGroup} = {};
     };
 
     environment.etc."dovecot/modules".source = modulesDir;
@@ -405,15 +423,19 @@ in
         rm -rf ${stateDir}/sieve
       '' + optionalString (cfg.sieveScripts != {}) ''
         mkdir -p ${stateDir}/sieve
-        ${concatStringsSep "\n" (mapAttrsToList (to: from: ''
-          if [ -d '${from}' ]; then
-            mkdir '${stateDir}/sieve/${to}'
-            cp -p "${from}/"*.sieve '${stateDir}/sieve/${to}'
-          else
-            cp -p '${from}' '${stateDir}/sieve/${to}'
-          fi
-          ${pkgs.dovecot_pigeonhole}/bin/sievec '${stateDir}/sieve/${to}'
-        '') cfg.sieveScripts)}
+        ${concatStringsSep "\n" (
+        mapAttrsToList (
+          to: from: ''
+            if [ -d '${from}' ]; then
+              mkdir '${stateDir}/sieve/${to}'
+              cp -p "${from}/"*.sieve '${stateDir}/sieve/${to}'
+            else
+              cp -p '${from}' '${stateDir}/sieve/${to}'
+            fi
+            ${pkgs.dovecot_pigeonhole}/bin/sievec '${stateDir}/sieve/${to}'
+          ''
+        ) cfg.sieveScripts
+      )}
         chown -R '${cfg.mailUser}:${cfg.mailGroup}' '${stateDir}/sieve'
       '';
     };
@@ -421,17 +443,21 @@ in
     environment.systemPackages = [ dovecotPkg ];
 
     assertions = [
-      { assertion = intersectLists cfg.protocols [ "pop3" "imap" ] != [];
+      {
+        assertion = intersectLists cfg.protocols [ "pop3" "imap" ] != [];
         message = "dovecot needs at least one of the IMAP or POP3 listeners enabled";
       }
-      { assertion = (cfg.sslServerCert == null) == (cfg.sslServerKey == null)
-          && (cfg.sslCACert != null -> !(cfg.sslServerCert == null || cfg.sslServerKey == null));
+      {
+        assertion = (cfg.sslServerCert == null) == (cfg.sslServerKey == null)
+        && (cfg.sslCACert != null -> !(cfg.sslServerCert == null || cfg.sslServerKey == null));
         message = "dovecot needs both sslServerCert and sslServerKey defined for working crypto";
       }
-      { assertion = cfg.showPAMFailure -> cfg.enablePAM;
+      {
+        assertion = cfg.showPAMFailure -> cfg.enablePAM;
         message = "dovecot is configured with showPAMFailure while enablePAM is disabled";
       }
-      { assertion = cfg.sieveScripts != {} -> (cfg.mailUser != null && cfg.mailGroup != null);
+      {
+        assertion = cfg.sieveScripts != {} -> (cfg.mailUser != null && cfg.mailGroup != null);
         message = "dovecot requires mailUser and mailGroup to be set when sieveScripts is set";
       }
     ];

From 28321223d8cc44bd67371c2f5543fe748582edce Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Tue, 28 Jan 2020 12:00:00 +0000
Subject: [PATCH 0111/4636] dovecot: add missing descriptions

---
 nixos/modules/services/mail/dovecot.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 11d4e4ae5f8a..230a2ae3f825 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -218,11 +218,13 @@ in
           type = with types; submodule {
             options = {
               globally = mkOption {
+                description = "Additional entries to add to the mail_plugins variable for all protocols";
                 type = plugins "top-level";
                 example = { enable = [ "virtual" ]; };
                 default = { enable = []; };
               };
               perProtocol = mkOption {
+                description = "Additional entries to add to the mail_plugins variable, per protocol";
                 type = attrsOf (plugins "corresponding per-protocol");
                 default = {};
                 example = { imap = [ "imap_acl" ]; };

From 2646554b2547335e38a534b69829be38906a4610 Mon Sep 17 00:00:00 2001
From: arcnmx <arcnmx@users.noreply.github.com>
Date: Wed, 29 Jan 2020 08:32:01 -0800
Subject: [PATCH 0112/4636] edk2: 201905 -> 201911

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

diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix
index 97af433d6067..47aa8e249f8e 100644
--- a/pkgs/development/compilers/edk2/default.nix
+++ b/pkgs/development/compilers/edk2/default.nix
@@ -14,13 +14,13 @@ else
 
 edk2 = stdenv.mkDerivation {
   pname = "edk2";
-  version = "201905";
+  version = "201911";
 
   # submodules
   src = fetchgit {
     url = "https://github.com/tianocore/edk2";
     rev = "edk2-stable${edk2.version}";
-    sha256 = "0fk40h4nj4qg8shg0yd1zj4iyspslms5fx95ysi04akv90k5sqkn";
+    sha256 = "1rmvb4w043v25cppsqxqrpzqqcay3yrzsrhhzm2q9bncrj56vm8q";
   };
 
   buildInputs = [ libuuid pythonEnv ];

From 8f5af404d26c54c238d32e12a007a622c931496e Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Thu, 30 Jan 2020 10:40:40 +0300
Subject: [PATCH 0113/4636] zsh: fix bracketed-paste-magic

---
 pkgs/shells/zsh/bracketed-paste-magic.patch | 22 +++++++++++++++++++++
 pkgs/shells/zsh/default.nix                 |  7 +++++++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/shells/zsh/bracketed-paste-magic.patch

diff --git a/pkgs/shells/zsh/bracketed-paste-magic.patch b/pkgs/shells/zsh/bracketed-paste-magic.patch
new file mode 100644
index 000000000000..f22f6489ce7a
--- /dev/null
+++ b/pkgs/shells/zsh/bracketed-paste-magic.patch
@@ -0,0 +1,22 @@
+diff --git a/Functions/Zle/bracketed-paste-magic b/Functions/Zle/bracketed-paste-magic
+index 4baae82..840091b 100644
+--- a/Functions/Zle/bracketed-paste-magic
++++ b/Functions/Zle/bracketed-paste-magic
+@@ -162,7 +162,7 @@ bracketed-paste-magic() {
+ 
+ 	# There are active widgets.  Reprocess $PASTED as keystrokes.
+ 	NUMERIC=1
+-	zle -U - $PASTED
++	zle -U - "$PASTED"
+ 
+ 	# Just in case there are active undo widgets
+ 
+@@ -212,7 +212,7 @@ bracketed-paste-magic() {
+     # Arrange to display highlighting if necessary
+     if [[ -z $zle_highlight || -n ${(M)zle_highlight:#paste:*} ]]; then
+ 	zle -R
+-	zle .read-command && zle -U - $KEYS
++	zle .read-command && zle -U - "$KEYS"
+     fi
+ }
+ 
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index 0a26b8a78210..52bd3c71858e 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -18,6 +18,13 @@ stdenv.mkDerivation {
     sha256 = "1s3yww0mzgvpc48kp0x868mm3gbna42sbgzya0nknj0x5hn2jq3j";
   };
 
+  patches = [
+    # Bracketed-paste-magic error in Putty due to empty $PASTED variable
+    # http://www.zsh.org/mla/workers/2019/msg00808.html
+    # This patch included in the next version
+    ./bracketed-paste-magic.patch
+  ];
+
   buildInputs = [ ncurses pcre ];
 
   configureFlags = [

From 29bc26113c5b546074d83b3338f008a0c352efa0 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Thu, 30 Jan 2020 17:04:54 -0500
Subject: [PATCH 0114/4636] ocamlPackages.cfstream: 1.3.0 -> 1.3.1

---
 .../ocaml-modules/cfstream/default.nix        |  4 ++--
 .../ocaml-modules/cfstream/git_commit.patch   | 24 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/ocaml-modules/cfstream/default.nix b/pkgs/development/ocaml-modules/cfstream/default.nix
index db6d2b1d4401..0ec1949f5627 100644
--- a/pkgs/development/ocaml-modules/cfstream/default.nix
+++ b/pkgs/development/ocaml-modules/cfstream/default.nix
@@ -2,7 +2,7 @@
 
 buildDunePackage rec {
   pname = "cfstream";
-  version = "1.3.0";
+  version = "1.3.1";
 
   minimumOCamlVersion = "4.04.1";
 
@@ -10,7 +10,7 @@ buildDunePackage rec {
     owner = "biocaml";
     repo   = pname;
     rev    = version;
-    sha256 = "1bpzpci0cx6r3sdk183mm603wgzvvj46nlx0lpx44108anxcxbak";
+    sha256 = "0qnxfp6y294gjsccx7ksvwn9x5q20hi8sg24rjypzsdkmlphgdnd";
   };
 
   patches = [ ./git_commit.patch ];
diff --git a/pkgs/development/ocaml-modules/cfstream/git_commit.patch b/pkgs/development/ocaml-modules/cfstream/git_commit.patch
index 5f8d8f5ce31d..596cfdc70927 100644
--- a/pkgs/development/ocaml-modules/cfstream/git_commit.patch
+++ b/pkgs/development/ocaml-modules/cfstream/git_commit.patch
@@ -1,13 +1,13 @@
-diff --git a/lib/jbuild b/lib/jbuild
-index fcc5a39..d72d50c 100644
---- a/lib/jbuild
-+++ b/lib/jbuild
-@@ -10,7 +10,7 @@
- (rule (
-   (targets (GIT_COMMIT))
-   (deps (../bin/git_commit.sh))
--  (action (with-stdout-to ${@} (run ${<})))
-+  (action (with-stdout-to ${@} (run echo "None")))
- ))
+diff --git a/lib/dune b/lib/dune
+index 2266b87..344c704 100644
+--- a/lib/dune
++++ b/lib/dune
+@@ -8,7 +8,7 @@
+ (rule
+  (targets GIT_COMMIT)
+  (deps (:x ../bin/git_commit.sh))
+- (action (with-stdout-to %{targets} (run %{x})))
++ (action (with-stdout-to %{targets} (run echo None)))
+ )
  
- (rule (
+ (rule

From 24bd88ce5a1828c85221dc2eb84187dd4d31260b Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Thu, 30 Jan 2020 17:05:33 -0500
Subject: [PATCH 0115/4636] ocamlPackages.biocaml: 0.10.0 -> 0.10.1

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

diff --git a/pkgs/development/ocaml-modules/biocaml/default.nix b/pkgs/development/ocaml-modules/biocaml/default.nix
index 4f97594fb7c0..de54c24b7742 100644
--- a/pkgs/development/ocaml-modules/biocaml/default.nix
+++ b/pkgs/development/ocaml-modules/biocaml/default.nix
@@ -4,7 +4,7 @@
 
 buildDunePackage rec {
   pname = "biocaml";
-  version = "0.10.0";
+  version = "0.10.1";
 
   owner = "biocaml";
 
@@ -14,7 +14,7 @@ buildDunePackage rec {
     inherit owner;
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "0dghqx6jbzihmga8jjwwavs0wqksgcns4z1nmwj0ds9ik3mcra30";
+    sha256 = "1f19nc8ld0iv45jjnsvaah3ddj88s2n9wj8mrz726kzg85cfr8xj";
   };
 
   buildInputs = [ ppx_jane ppx_sexp_conv ];
@@ -23,7 +23,7 @@ buildDunePackage rec {
 
   meta = with stdenv.lib; {
     description = "Bioinformatics library for Ocaml";
-    homepage = "http://${owner}.github.io/${pname}";
+    homepage = "http://${pname}.org";
     maintainers = [ maintainers.bcdarwin ];
     license = licenses.gpl2;
   };

From acab138354973469d8c92c9b245a41bfabf1f42c Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 31 Jan 2020 17:08:29 +0100
Subject: [PATCH 0116/4636] phpPackages.maxminddb: 1.5.0 -> 1.6.0

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 8a610392110d..4963b18cc4de 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -201,13 +201,13 @@ let
 
   maxminddb = buildPecl rec {
     pname = "maxminddb";
-    version = "1.5.0";
+    version = "1.6.0";
 
     src = pkgs.fetchFromGitHub {
       owner = "maxmind";
       repo = "MaxMind-DB-Reader-php";
       rev = "v${version}";
-      sha256 = "1ilgpx36rgihjr8s4bvkbms5hl6xy7mymna3ym2bl4lb15vkr0sm";
+      sha256 = "0sa943ij9pgz55aik93lllb8lh063bvr66ibn77p3y3p41vdiabz";
     };
 
     buildInputs = [ pkgs.libmaxminddb ];

From d48e99d9122119ce1741867b5a7ea682d134f713 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 1 Feb 2020 04:35:14 +0000
Subject: [PATCH 0117/4636] linuxHeaders: 4.19.16 -> 5.5

Linux has reworked its header install process in
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=59b2bd05f5f4dc62979c2e82ddd384f07e8f10bc
It has introduced `make headers` that prepares the headers in ./usr/include, and
made `make headers_install` copy the headers from there using rsync.
---
 .../linux/kernel-headers/default.nix          | 27 ++++++----------
 .../no-dynamic-cc-version-check.patch         | 32 -------------------
 .../linux/kernel-headers/no-relocs.patch      |  8 +----
 3 files changed, 10 insertions(+), 57 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch

diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index fb2b90689214..99595c28eec1 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -1,5 +1,5 @@
 { stdenvNoCC, lib, buildPackages
-, fetchurl, perl
+, fetchurl, perl, rsync
 , elf-header
 }:
 
@@ -16,7 +16,7 @@ let
     # We do this so we have a build->build, not build->host, C compiler.
     depsBuildBuild = [ buildPackages.stdenv.cc ];
     # `elf-header` is null when libc provides `elf.h`.
-    nativeBuildInputs = [ perl elf-header ];
+    nativeBuildInputs = [ perl rsync elf-header ];
 
     extraIncludeDirs = lib.optional stdenvNoCC.hostPlatform.isPowerPC ["ppc"];
 
@@ -39,12 +39,8 @@ let
     # Skip clean on darwin, case-sensitivity issues.
     buildPhase = lib.optionalString (!stdenvNoCC.buildPlatform.isDarwin) ''
       make mrproper $makeFlags
-    ''
-    # For some reason, doing `make install_headers` twice, first without
-    # INSTALL_HDR_PATH=$out then with, is neccessary to get this to work
-    # for darwin cross. @Ericson2314 has no idea why.
-    + ''
-      make headers_install $makeFlags
+    '' + ''
+      make headers $makeFlags
     '';
 
     checkPhase = ''
@@ -55,13 +51,9 @@ let
       make headers_install INSTALL_HDR_PATH=$out $makeFlags
     ''
     # Some builds (e.g. KVM) want a kernel.release.
-    + '' mkdir -p $out/include/config
-      echo "${version}-default" > $out/include/config/kernel.release
-    ''
-    # These oddly named file records the `SHELL` passed, which causes bootstrap
-    # tools run-time dependency.
     + ''
-      find "$out" -name '..install.cmd' -print0 | xargs -0 rm
+      mkdir -p $out/include/config
+      echo "${version}-default" > $out/include/config/kernel.release
     '';
 
     meta = with lib; {
@@ -73,16 +65,15 @@ let
 in {
   inherit makeLinuxHeaders;
 
-  linuxHeaders = let version = "4.19.16"; in
+  linuxHeaders = let version = "5.5"; in
     makeLinuxHeaders {
       inherit version;
       src = fetchurl {
-        url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-        sha256 = "1pqvn6dsh0xhdpawz4ag27vkw1abvb6sn3869i4fbrz33ww8i86q";
+        url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
+        sha256 = "0c131fi6s7vgvka1c0597vnvcmwn1pp968rci5kq64iwj3pd9yx6";
       };
       patches = [
          ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms
-         ./no-dynamic-cc-version-check.patch # so we can use `stdenvNoCC`, see `makeFlags` above
       ];
     };
 }
diff --git a/pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch b/pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch
deleted file mode 100644
index 9b582cac7153..000000000000
--- a/pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 863f58503bee..b778d5023208 100644
---- a/Makefile
-+++ b/Makefile
-@@ -501,11 +501,9 @@ KBUILD_CFLAGS      += $(call cc-option,-fno-PIE)
- KBUILD_AFLAGS  += $(call cc-option,-fno-PIE)
- 
- # check for 'asm goto'
--ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)
-   CC_HAVE_ASM_GOTO := 1
-   KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO
-   KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO
--endif
- 
- # The expansion should be delayed until arch/$(SRCARCH)/Makefile is included.
- # Some architectures define CROSS_COMPILE in arch/$(SRCARCH)/Makefile.
-diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
-index 065324a8046f..d09c67194549 100644
---- a/scripts/Kbuild.include
-+++ b/scripts/Kbuild.include
-@@ -216,11 +216,8 @@ cc-disable-warning = $(call try-run-cached,\
- cc-name = $(call shell-cached,$(CC) -v 2>&1 | grep -q "clang version" && echo clang || echo gcc)
- 
- # cc-version
--cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC))
- 
- # cc-fullversion
--cc-fullversion = $(shell $(CONFIG_SHELL) \
--	$(srctree)/scripts/gcc-version.sh -p $(CC))
- 
- # cc-ifversion
- # Usage:  EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
diff --git a/pkgs/os-specific/linux/kernel-headers/no-relocs.patch b/pkgs/os-specific/linux/kernel-headers/no-relocs.patch
index 67e8b19e23bd..32c88224b867 100644
--- a/pkgs/os-specific/linux/kernel-headers/no-relocs.patch
+++ b/pkgs/os-specific/linux/kernel-headers/no-relocs.patch
@@ -1,13 +1,7 @@
-diff --git a/arch/x86/Makefile b/arch/x86/Makefile
-index fad55160dcb9..a48c8331cbb2 100644
 --- a/arch/x86/Makefile
 +++ b/arch/x86/Makefile
-@@ -239,7 +239,7 @@ ifdef CONFIG_RETPOLINE
- endif
- 
+@@ -231,3 +231,3 @@ endif
  archscripts: scripts_basic
 -	$(Q)$(MAKE) $(build)=arch/x86/tools relocs
 +	$(Q)$(MAKE) $(build)=arch/x86/tools
  
- ###
- # Syscall table generation

From 18e56a8190ea82b62ffc6fea41b1c9a59bcc1d87 Mon Sep 17 00:00:00 2001
From: Sergey Makarov <setser200018@gmail.com>
Date: Sat, 1 Feb 2020 14:15:11 +0300
Subject: [PATCH 0118/4636] tdlib: 1.5.0 -> 1.6.0

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

diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix
index 96ae5c1ec9ad..5224744c6a2c 100644
--- a/pkgs/development/libraries/tdlib/default.nix
+++ b/pkgs/development/libraries/tdlib/default.nix
@@ -1,14 +1,14 @@
 { fetchFromGitHub, gperf, openssl, readline, zlib, cmake, stdenv }:
 
 stdenv.mkDerivation rec {
-  version = "1.5.0";
+  version = "1.6.0";
   pname = "tdlib";
 
   src = fetchFromGitHub {
     owner = "tdlib";
     repo = "td";
     rev = "v${version}";
-    sha256 = "1rqxdvzlryqln5jzj35cwz1fjwy4s8xq97p0wdnpzbfjpcalvrm5";
+    sha256 = "0zlzpl6fgszg18kwycyyyrnkm255dvc6fkq0b0y32m5wvwwl36cv";
   };
 
   buildInputs = [ gperf openssl readline zlib ];

From 08dc02a07b52380008b33256ca6ef1a87df6bc08 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 1 Feb 2020 06:27:00 -0500
Subject: [PATCH 0119/4636] rclone: install completions

---
 .../networking/sync/rclone/default.nix         | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index c40b1573e566..d6f37583abe5 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub, buildPackages }:
 
 buildGoPackage rec {
   pname = "rclone";
@@ -17,9 +17,19 @@ buildGoPackage rec {
 
   outputs = [ "bin" "out" "man" ];
 
-  postInstall = ''
-    install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1
-  '';
+  postInstall =
+    let
+      rcloneBin =
+        if stdenv.buildPlatform == stdenv.hostPlatform
+        then "$bin"
+        else stdenv.lib.getBin buildPackages.rclone;
+    in
+      ''
+        install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1
+        mkdir -p $bin/share/zsh/site-functions $bin/share/bash-completion/completions/
+        ${rcloneBin}/bin/rclone genautocomplete zsh $bin/share/zsh/site-functions/_rclone
+        ${rcloneBin}/bin/rclone genautocomplete bash $bin/share/bash-completion/completions/rclone.bash
+      '';
 
   meta = with stdenv.lib; {
     description = "Command line program to sync files and directories to and from major cloud storage";

From 9f1c76f514a644d00e7bb5ae711949b23ee9b222 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 1 Feb 2020 15:23:55 +0100
Subject: [PATCH 0120/4636] nixos/tests/openarena: run real openarena clients

The old Quake3 NixOS test was removed in
50ea99cbc18d3f480a773de5250b4ef9c7f6d514 which served as a nice demo to
showcase what NixOS tests are capable of. This commit adds the same
functionality to run real openarena clients.
---
 nixos/tests/openarena.nix | 88 ++++++++++++++++++++++++++-------------
 1 file changed, 59 insertions(+), 29 deletions(-)

diff --git a/nixos/tests/openarena.nix b/nixos/tests/openarena.nix
index b315426532ba..395ed9153ea1 100644
--- a/nixos/tests/openarena.nix
+++ b/nixos/tests/openarena.nix
@@ -1,41 +1,71 @@
-import ./make-test-python.nix ({ pkgs, ...} : {
-  name = "openarena";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ tomfitzhenry ];
-  };
+import ./make-test-python.nix ({ pkgs, ...} :
 
-  machine =
+let
+  client =
     { pkgs, ... }:
 
-    { imports = [];
-      environment.systemPackages = with pkgs; [
-        socat
-      ];
-      services.openarena = {
-        enable = true;
-        extraFlags = [
-          "+set dedicated 2"
-          "+set sv_hostname 'My NixOS server'"
-          "+map oa_dm1"
-        ];
-      };
+    { imports = [ ./common/x11.nix ];
+      hardware.opengl.driSupport = true;
+      environment.systemPackages = [ pkgs.openarena ];
+    };
+
+in {
+  name = "openarena";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ fpletz ];
+  };
+
+  nodes =
+    { server =
+        { services.openarena = {
+            enable = true;
+            extraFlags = [ "+set g_gametype 0" "+map oa_dm7" "+addbot Angelyss" "+addbot Arachna" ];
+            openPorts = true;
+          };
+        };
+
+      client1 = client;
+      client2 = client;
     };
 
   testScript =
     ''
-      machine.wait_for_unit("openarena.service")
-      machine.wait_until_succeeds("ss --numeric --udp --listening | grep -q 27960")
+      start_all()
 
-      # The log line containing 'resolve address' is last and only message that occurs after
-      # the server starts accepting clients.
-      machine.wait_until_succeeds(
-          "journalctl -u openarena.service | grep 'resolve address: dpmaster.deathmask.net'"
+      server.wait_for_unit("openarena")
+      server.wait_until_succeeds("ss --numeric --udp --listening | grep -q 27960")
+
+      client1.wait_for_x()
+      client2.wait_for_x()
+
+      client1.execute("openarena +set r_fullscreen 0 +set name Foo +connect server &")
+      client2.execute("openarena +set r_fullscreen 0 +set name Bar +connect server &")
+
+      server.wait_until_succeeds(
+          "journalctl -u openarena -e | grep -q 'Foo.*entered the game'"
+      )
+      server.wait_until_succeeds(
+          "journalctl -u openarena -e | grep -q 'Bar.*entered the game'"
       )
 
-      # Check it's possible to join the server.
-      # Can't use substring match instead of grep because the output is not utf-8
-      machine.succeed(
-          "echo -n -e '\\xff\\xff\\xff\\xffgetchallenge' | socat - UDP4-DATAGRAM:127.0.0.1:27960 | grep -q challengeResponse"
-      )
+      server.sleep(10)  # wait for a while to get a nice screenshot
+
+      client1.screenshot("screen_client1_1")
+      client2.screenshot("screen_client2_1")
+
+      client1.block()
+
+      server.sleep(10)
+
+      client1.screenshot("screen_client1_2")
+      client2.screenshot("screen_client2_2")
+
+      client1.unblock()
+
+      server.sleep(10)
+
+      client1.screenshot("screen_client1_3")
+      client2.screenshot("screen_client2_3")
     '';
+
 })

From cdd1c216ff377e724d390aaed73cc7b5fc2273bb Mon Sep 17 00:00:00 2001
From: Matthew Glazar <strager.nds@gmail.com>
Date: Sat, 1 Feb 2020 17:53:55 -0800
Subject: [PATCH 0121/4636] chatterino2: fix install on macOS

On Darwin/macOS, chatterino2's install phase copies no files into the
output. `make install` does not copy chatterino2.app. Copy the .app
manually, fixing the installation.

With this patch, chatterino2 almost works on macOS. Issue #42893
applies, so to make chatterino2 work, you must install qtbase in your
environment. For example:

    $ nix-env -iA nixpkgs.qt5.qtbase
    $ open ~/.nix-profile/Applications/chatterino.app
---
 .../networking/instant-messengers/chatterino2/default.nix   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
index 787d66826ef1..f3051eabe2bc 100644
--- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
+++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, pkgconfig, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl }:
+{ mkDerivation, stdenv, lib, pkgconfig, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl }:
 
 mkDerivation rec {
   pname = "chatterino2";
@@ -12,6 +12,10 @@ mkDerivation rec {
   };
   nativeBuildInputs = [ qmake pkgconfig ];
   buildInputs = [ qtbase qtsvg qtmultimedia boost openssl ];
+  postInstall = lib.optionalString stdenv.isDarwin ''
+    mkdir -p "$out/Applications"
+    mv bin/chatterino.app "$out/Applications/"
+  '';
   meta = with lib; {
     description = "A chat client for Twitch chat";
     longDescription = ''

From 1221a6b096aed2276d25963434cacb805f133cca Mon Sep 17 00:00:00 2001
From: Matthew Glazar <strager.nds@gmail.com>
Date: Sat, 1 Feb 2020 19:55:55 -0800
Subject: [PATCH 0122/4636] chatterino2: fix: Could not find the Qt platform
 plugin "cocoa" in ""

wrapQtAppsHook ignores Mach-O binaries [1]. Additionally, wrapQtAppsHook
doesn't look inside $out/Applications [2], which is where chatterino2 is
installed. This means chatterino2 for Darwin/macOS is not wrapped
properly, causing the following error when launched:

> qt.qpa.plugin: Could not find the Qt platform plugin "cocoa" in ""
>
> This application failed to start because no Qt platform plugin could
> be initialized. Reinstalling the application may fix this problem.

On macOS, explicitly wrap chatterino2's executable.

[1] pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh line 85
[2] pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh line 76
---
 .../networking/instant-messengers/chatterino2/default.nix  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
index f3051eabe2bc..553b466b12f9 100644
--- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
+++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, stdenv, lib, pkgconfig, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl }:
+{ mkDerivation, stdenv, lib, pkgconfig, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl, wrapQtAppsHook }:
 
 mkDerivation rec {
   pname = "chatterino2";
@@ -10,12 +10,15 @@ mkDerivation rec {
     sha256 = "0i2385hamhd9i7jdy906cfrd81cybw524j92l87c8pzrkxphignk";
     fetchSubmodules = true;
   };
-  nativeBuildInputs = [ qmake pkgconfig ];
+  nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ];
   buildInputs = [ qtbase qtsvg qtmultimedia boost openssl ];
   postInstall = lib.optionalString stdenv.isDarwin ''
     mkdir -p "$out/Applications"
     mv bin/chatterino.app "$out/Applications/"
   '';
+  postFixup = lib.optionalString stdenv.isDarwin ''
+    wrapQtApp "$out/Applications/chatterino.app/Contents/MacOS/chatterino"
+  '';
   meta = with lib; {
     description = "A chat client for Twitch chat";
     longDescription = ''

From 5ece342d0f95c4158a1db4122259ac5233556021 Mon Sep 17 00:00:00 2001
From: Kristian Brucaj <kbrucaj@gmail.com>
Date: Sun, 2 Feb 2020 19:43:52 -0500
Subject: [PATCH 0123/4636] fusee-interfacee-tk: init at V1.0.0 all-packages:
 Add fusee-interfacee-tk

---
 .../misc/fusee-interfacee-tk/default.nix      | 40 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/applications/misc/fusee-interfacee-tk/default.nix

diff --git a/pkgs/applications/misc/fusee-interfacee-tk/default.nix b/pkgs/applications/misc/fusee-interfacee-tk/default.nix
new file mode 100644
index 000000000000..d74b6565ba34
--- /dev/null
+++ b/pkgs/applications/misc/fusee-interfacee-tk/default.nix
@@ -0,0 +1,40 @@
+{ stdenv , fetchFromGitHub , python3 , makeWrapper }: 
+
+let pythonEnv = python3.withPackages(ps: [ ps.tkinter ps.pyusb ]); 
+in stdenv.mkDerivation rec { 
+  pname = "fusee-interfacee-tk";
+  version = "1.0.0";
+
+  src = fetchFromGitHub { 
+    owner = "nh-server";
+    repo = pname;
+    rev = "V${version}"; 
+    sha256 = "0ycsxv71b5yvkcawxmcnmywxfvn8fdg1lyq71xdw7qrskxv5fgq7";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ pythonEnv ];
+
+  installPhase = '' 
+    mkdir -p $out/bin
+			      
+    # The program isn't just called app, so I'm renaming it based on the repo name 
+    # It also isn't a standard program, so we need to append the shebang to the top
+    echo "#!${pythonEnv.interpreter}" > $out/bin/fusee-interfacee-tk 
+    cat app.py >> $out/bin/fusee-interfacee-tk
+    chmod +x $out/bin/fusee-interfacee-tk 
+							      
+    # app.py depends on these to run 
+    cp *.py $out/bin/ 
+    cp intermezzo.bin $out/bin/intermezzo.bin
+  '';
+
+  meta = with stdenv.lib; { 
+    homepage = "https://github.com/nh-server/fusee-interfacee-tk";
+    description = "A tool to send .bin files to a Nintendo Switch in RCM mode";
+    longDescription = "A mod of falquinhos Fusée Launcher for use with Nintendo Homebrew Switch Guide. It also adds the ability to mount SD while in RCM. 
+    Must be run as sudo.";
+    maintainers = with maintainers; [ kristian-brucaj ];
+    license = licenses.gpl2;
+  };
+} 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98e878a8d79e..be3f4d677710 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3453,6 +3453,8 @@ in
   fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { };
 
   fuse-overlayfs = callPackage ../tools/filesystems/fuse-overlayfs {};
+  
+  fusee-interfacee-tk = callPackage ../applications/misc/fusee-interfacee-tk { };
 
   fusee-launcher = callPackage ../development/tools/fusee-launcher { };
 
@@ -6680,6 +6682,8 @@ in
 
   Sylk = callPackage ../applications/networking/Sylk {};
 
+  otter-browser = qt5.callPackage ../applications/networking/browsers/otter {};
+
   privoxy = callPackage ../tools/networking/privoxy {
     w3m = w3m-batch;
   };

From 87adf9a702262b2ebd1cb96f806e97ae90fd7dfc Mon Sep 17 00:00:00 2001
From: Kristian Brucaj <kbrucaj@gmail.com>
Date: Mon, 3 Feb 2020 23:13:50 -0500
Subject: [PATCH 0124/4636] Removed unexpected package from all-packages.nix

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be3f4d677710..b4be33ed6b59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6682,8 +6682,6 @@ in
 
   Sylk = callPackage ../applications/networking/Sylk {};
 
-  otter-browser = qt5.callPackage ../applications/networking/browsers/otter {};
-
   privoxy = callPackage ../tools/networking/privoxy {
     w3m = w3m-batch;
   };

From 194f9ce7196670992a19ad0db8765d489aae5532 Mon Sep 17 00:00:00 2001
From: Christoph Stich <christoph.n.stich@gmail.com>
Date: Mon, 3 Feb 2020 18:17:22 +0000
Subject: [PATCH 0125/4636] julia-1.3.1 version bump

Added all-packages.nix
---
 pkgs/development/compilers/julia/1.3.nix      | 168 ++++++++++++++++++
 .../julia/use-system-utf8proc-julia-1.3.patch |  24 +++
 pkgs/top-level/all-packages.nix               |   6 +
 3 files changed, 198 insertions(+)
 create mode 100644 pkgs/development/compilers/julia/1.3.nix
 create mode 100644 pkgs/development/compilers/julia/use-system-utf8proc-julia-1.3.patch

diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix
new file mode 100644
index 000000000000..efb9ce391987
--- /dev/null
+++ b/pkgs/development/compilers/julia/1.3.nix
@@ -0,0 +1,168 @@
+{ stdenv, fetchurl, fetchzip, fetchFromGitHub
+# build tools
+, gfortran, m4, makeWrapper, patchelf, perl, which, python2
+, cmake
+# libjulia dependencies
+, libunwind, readline, utf8proc, zlib
+# standard library dependencies
+, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2
+# linear algebra
+, openblas, arpack
+# llvm
+, llvm
+}:
+
+with stdenv.lib;
+
+# All dependencies must use the same OpenBLAS.
+let
+  arpack_ = arpack;
+in
+let
+  arpack = arpack_.override { inherit openblas; };
+in
+
+let 
+  majorVersion = "1";
+  minorVersion = "3";
+  maintenanceVersion = "1";
+  src_sha256 = "0q9a7yc3b235psrwl5ghyxgwly25lf8n818l8h6bkf2ymdbsv5p6";
+  version = "${majorVersion}.${minorVersion}.${maintenanceVersion}";
+in 
+
+stdenv.mkDerivation rec {
+  pname = "julia";
+  inherit version;
+
+   src = fetchzip {
+     url = "https://github.com/JuliaLang/julia/releases/download/v${majorVersion}.${minorVersion}.${maintenanceVersion}/julia-${majorVersion}.${minorVersion}.${maintenanceVersion}-full.tar.gz";
+     sha256 = src_sha256;
+   };
+
+  prePatch = ''
+    export PATH=$PATH:${cmake}/bin
+    '';
+
+  patches = [
+    ./use-system-utf8proc-julia-1.3.patch
+
+    # Julia recompiles a precompiled file if the mtime stored *in* the
+    # .ji file differs from the mtime of the .ji file.  This
+    # doesn't work in Nix because Nix changes the mtime of files in
+    # the Nix store to 1. So patch Julia to accept mtimes of 1.
+    ./allow_nix_mtime.patch
+  ];
+
+  postPatch = ''
+    patchShebangs . contrib
+    for i in backtrace cmdlineargs; do
+      mv test/$i.jl{,.off}
+      touch test/$i.jl
+    done
+    rm stdlib/Sockets/test/runtests.jl && touch stdlib/Sockets/test/runtests.jl
+    rm stdlib/Distributed/test/runtests.jl && touch stdlib/Distributed/test/runtests.jl
+    sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i ./stdlib/LibGit2/test/libgit2.jl
+    sed -e 's/Failed to resolve /failed to resolve /g' -i ./stdlib/LibGit2/test/libgit2.jl
+  '';
+
+  buildInputs = [
+    arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr
+    pcre2.dev openblas openlibm openspecfun readline utf8proc
+    zlib
+  ]
+  ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
+  ;
+
+  nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ];
+
+  makeFlags =
+    let
+      arch = head (splitString "-" stdenv.system);
+      march = { x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; i686 = "pentium4"; }.${arch}
+              or (throw "unsupported architecture: ${arch}");
+      # Julia requires Pentium 4 (SSE2) or better
+      cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; }.${arch}
+                  or (throw "unsupported architecture: ${arch}");
+    in [
+      "ARCH=${arch}"
+      "MARCH=${march}"
+      "JULIA_CPU_TARGET=${cpuTarget}"
+      "PREFIX=$(out)"
+      "prefix=$(out)"
+      "SHELL=${stdenv.shell}"
+
+      "USE_SYSTEM_BLAS=1"
+      "USE_BLAS64=${if openblas.blas64 then "1" else "0"}"
+      "LIBBLAS=-lopenblas"
+      "LIBBLASNAME=libopenblas"
+
+      "USE_SYSTEM_LAPACK=1"
+      "LIBLAPACK=-lopenblas"
+      "LIBLAPACKNAME=libopenblas"
+
+      "USE_SYSTEM_ARPACK=1"
+      "USE_SYSTEM_FFTW=1"
+      "USE_SYSTEM_GMP=1"
+      "USE_SYSTEM_LIBGIT2=1"
+      "USE_SYSTEM_LIBUNWIND=1"
+
+      "USE_SYSTEM_MPFR=1"
+      "USE_SYSTEM_OPENLIBM=1"
+      "USE_SYSTEM_OPENSPECFUN=1"
+      "USE_SYSTEM_PATCHELF=1"
+      "USE_SYSTEM_PCRE=1"
+      "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config"
+      "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h"
+      "USE_SYSTEM_READLINE=1"
+      "USE_SYSTEM_UTF8PROC=1"
+      "USE_SYSTEM_ZLIB=1"
+
+      "USE_BINARYBUILDER=0"
+    ];
+
+  LD_LIBRARY_PATH = makeLibraryPath [
+    arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm
+    openspecfun pcre2
+  ];
+
+  enableParallelBuilding = true;
+
+  doCheck = !stdenv.isDarwin;
+  checkTarget = "testall";
+  # Julia's tests require read/write access to $HOME
+  preCheck = ''
+    export HOME="$NIX_BUILD_TOP"
+  '';
+
+  preBuild = ''
+    sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile
+    sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
+  '';
+
+  postInstall = ''
+    # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia,
+    # as using a wrapper with LD_LIBRARY_PATH causes segmentation
+    # faults when program returns an error:
+    #   $ julia -e 'throw(Error())'
+    find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do
+      if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then
+        ln -sv $lib $out/lib/julia/$(basename $lib)
+      fi
+    done
+  '';
+
+  passthru = {
+    inherit majorVersion minorVersion maintenanceVersion;
+    site = "share/julia/site/v${majorVersion}.${minorVersion}";
+  };
+
+  meta = {
+    description = "High-level performance-oriented dynamical language for technical computing";
+    homepage = https://julialang.org/;
+    license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ];
+    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
+    broken = stdenv.isi686;
+  };
+}
diff --git a/pkgs/development/compilers/julia/use-system-utf8proc-julia-1.3.patch b/pkgs/development/compilers/julia/use-system-utf8proc-julia-1.3.patch
new file mode 100644
index 000000000000..63e0ba9ab057
--- /dev/null
+++ b/pkgs/development/compilers/julia/use-system-utf8proc-julia-1.3.patch
@@ -0,0 +1,24 @@
+---
+ src/flisp/Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+
+diff --git a/src/flisp/Makefile b/src/flisp/Makefile
+index d97075e..6bebca7 100644
+--- a/src/flisp/Makefile
++++ b/src/flisp/Makefile
+@@ -32,9 +32,9 @@ OBJS := $(SRCS:%.c=$(BUILDDIR)/%.o)
+ DOBJS := $(SRCS:%.c=$(BUILDDIR)/%.dbg.obj)
+ LLT_release := $(LLT_BUILDDIR)/libsupport.a
+ LLT_debug := $(LLT_BUILDDIR)/libsupport-debug.a
+-LIBFILES_release := $(LLT_release) $(LIBUV) $(LIBUTF8PROC)
+-LIBFILES_debug := $(LLT_debug) $(LIBUV) $(LIBUTF8PROC)
+-LIBS :=
++LIBFILES_release := $(LLT_release) $(LIBUV)
++LIBFILES_debug := $(LLT_debug) $(LIBUV)
++LIBS := $(LIBUTF8PROC)
+ ifneq ($(OS),WINNT)
+ LIBS += -lpthread
+ endif
+
+-- 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c8fe84c0b60..761c456e1018 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8502,6 +8502,12 @@ in
     inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
   };
 
+  julia_13 = callPackage ../development/compilers/julia/1.3.nix {
+    gmp = gmp6;
+    openblas = openblasCompat;
+    inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
+  };
+
   julia_1 = julia_10;
   julia = julia_1;
 

From 2a04e690bc3acb4061fe4285171e3647e4306048 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Tue, 28 Jan 2020 12:00:00 +0000
Subject: [PATCH 0126/4636] iodine: 1.2.0 -> 2019-09-27

Adds ipv6 support
---
 pkgs/tools/networking/iodine/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix
index 44bf52c9933f..feaeace3afd9 100644
--- a/pkgs/tools/networking/iodine/default.nix
+++ b/pkgs/tools/networking/iodine/default.nix
@@ -1,11 +1,14 @@
-{ stdenv, fetchurl, zlib, nettools }:
+{ stdenv, fetchFromGitHub, zlib, nettools }:
 
 stdenv.mkDerivation rec {
-  name = "iodine-0.7.0";
+  pname = "iodine";
+  version = "unstable-2019-09-27";
 
-  src = fetchurl {
-    url = "https://code.kryo.se/iodine/${name}.tar.gz";
-    sha256 = "0gh17kcxxi37k65zm4gqsvbk3aw7yphcs3c02pn1c4s2y6n40axd";
+  src = fetchFromGitHub {
+    owner = "yarrick";
+    repo = "iodine";
+    rev = "8e14f18";
+    sha256 = "0k8m99qfjd5n6n56jnq85y7q8h2i2b8yw6ba0kxsz4jyx97lavg3";
   };
 
   buildInputs = [ zlib ];

From 683fa30931130857e83406060ab55ea33b81f13a Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Tue, 28 Jan 2020 12:00:00 +0000
Subject: [PATCH 0127/4636] network-manager-iodine: 1.2.0 -> 2019-11-05

the released version is old and cannot reconnect after the first
connection is closed. This is fixed in master.
---
 .../network-manager/iodine/default.nix           | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix
index 29c0d550fe2f..9042605caf17 100644
--- a/pkgs/tools/networking/network-manager/iodine/default.nix
+++ b/pkgs/tools/networking/network-manager/iodine/default.nix
@@ -1,15 +1,18 @@
-{ stdenv, fetchurl, substituteAll, iodine, intltool, pkgconfig, networkmanager, libsecret, gtk3
+{ stdenv, fetchFromGitLab, substituteAll, autoreconfHook, iodine, intltool, pkgconfig, networkmanager, libsecret, gtk3
 , withGnome ? true, gnome3, fetchpatch, networkmanagerapplet }:
 
 let
   pname = "NetworkManager-iodine";
-  version = "1.2.0";
+  version = "unstable-2019-11-05";
 in stdenv.mkDerivation {
   name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
 
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0njdigakidji6mfmbsp8lfi8wl88z1dk8cljbva2w0xazyddbwyh";
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "GNOME";
+    repo = "network-manager-iodine";
+    rev = "2ef0abf089b00a0546f214dde0d45e63f2990b79";
+    sha256 = "1ps26fr9b1yyafj7lrzf2kmaxb0ipl0mhagch5kzrjdsc5xkajz7";
   };
 
   patches = [
@@ -27,11 +30,12 @@ in stdenv.mkDerivation {
   buildInputs = [ iodine networkmanager ]
     ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ];
 
-  nativeBuildInputs = [ intltool pkgconfig ];
+  nativeBuildInputs = [ intltool autoreconfHook pkgconfig ];
 
   # glib-2.62 deprecations
   NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
 
+  preConfigure = "intltoolize";
   configureFlags = [
     "--without-libnm-glib"
     "--with-gnome=${if withGnome then "yes" else "no"}"

From 7437bff7d1db7f1d62a53350a73632d18926d67a Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 2 Feb 2020 12:00:00 +0000
Subject: [PATCH 0128/4636] nixos/iodine: nixpkgs-fmt

---
 nixos/modules/services/networking/iodine.nix | 119 ++++++++++---------
 1 file changed, 61 insertions(+), 58 deletions(-)

diff --git a/nixos/modules/services/networking/iodine.nix b/nixos/modules/services/networking/iodine.nix
index f9ca26c27960..58067edf9026 100644
--- a/nixos/modules/services/networking/iodine.nix
+++ b/nixos/modules/services/networking/iodine.nix
@@ -35,45 +35,48 @@ in
           corresponding attribute name.
         '';
         example = literalExample ''
-        {
-          foo = {
-            server = "tunnel.mdomain.com";
-            relay = "8.8.8.8";
-            extraConfig = "-v";
+          {
+            foo = {
+              server = "tunnel.mdomain.com";
+              relay = "8.8.8.8";
+              extraConfig = "-v";
+            }
           }
-        }
         '';
-        type = types.attrsOf (types.submodule (
-        {
-          options = {
-            server = mkOption {
-              type = types.str;
-              default = "";
-              description = "Domain or Subdomain of server running iodined";
-              example = "tunnel.mydomain.com";
-            };
+        type = types.attrsOf (
+          types.submodule (
+            {
+              options = {
+                server = mkOption {
+                  type = types.str;
+                  default = "";
+                  description = "Domain or Subdomain of server running iodined";
+                  example = "tunnel.mydomain.com";
+                };
 
-            relay = mkOption {
-              type = types.str;
-              default = "";
-              description = "DNS server to use as a intermediate relay to the iodined server";
-              example = "8.8.8.8";
-            };
+                relay = mkOption {
+                  type = types.str;
+                  default = "";
+                  description = "DNS server to use as a intermediate relay to the iodined server";
+                  example = "8.8.8.8";
+                };
 
-            extraConfig = mkOption {
-              type = types.str;
-              default = "";
-              description = "Additional command line parameters";
-              example = "-l 192.168.1.10 -p 23";
-            };
+                extraConfig = mkOption {
+                  type = types.str;
+                  default = "";
+                  description = "Additional command line parameters";
+                  example = "-l 192.168.1.10 -p 23";
+                };
 
-            passwordFile = mkOption {
-              type = types.str;
-              default = "";
-              description = "File that contains password";
-            };
-          };
-        }));
+                passwordFile = mkOption {
+                  type = types.str;
+                  default = "";
+                  description = "File that contains password";
+                };
+              };
+            }
+          )
+        );
       };
 
       server = {
@@ -121,31 +124,31 @@ in
     boot.kernelModules = [ "tun" ];
 
     systemd.services =
-    let
-      createIodineClientService = name: cfg:
-      {
-        description = "iodine client - ${name}";
-        after = [ "network.target" ];
-        wantedBy = [ "multi-user.target" ];
-        script = "exec ${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${optionalString (cfg.passwordFile != "") "< \"${cfg.passwordFile}\""} ${cfg.relay} ${cfg.server}";
-        serviceConfig = {
-          RestartSec = "30s";
-          Restart = "always";
+      let
+        createIodineClientService = name: cfg:
+          {
+            description = "iodine client - ${name}";
+            after = [ "network.target" ];
+            wantedBy = [ "multi-user.target" ];
+            script = "exec ${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${optionalString (cfg.passwordFile != "") "< \"${cfg.passwordFile}\""} ${cfg.relay} ${cfg.server}";
+            serviceConfig = {
+              RestartSec = "30s";
+              Restart = "always";
+            };
+          };
+      in
+        listToAttrs (
+          mapAttrsToList
+            (name: value: nameValuePair "iodine-${name}" (createIodineClientService name value))
+            cfg.clients
+        ) // {
+          iodined = mkIf (cfg.server.enable) {
+            description = "iodine, ip over dns server daemon";
+            after = [ "network.target" ];
+            wantedBy = [ "multi-user.target" ];
+            script = "exec ${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${optionalString (cfg.server.passwordFile != "") "< \"${cfg.server.passwordFile}\""} ${cfg.server.ip} ${cfg.server.domain}";
+          };
         };
-      };
-    in
-    listToAttrs (
-      mapAttrsToList
-        (name: value: nameValuePair "iodine-${name}" (createIodineClientService name value))
-        cfg.clients
-    ) // {
-      iodined = mkIf (cfg.server.enable) {
-        description = "iodine, ip over dns server daemon";
-        after = [ "network.target" ];
-        wantedBy = [ "multi-user.target" ];
-        script = "exec ${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${optionalString (cfg.server.passwordFile != "") "< \"${cfg.server.passwordFile}\""} ${cfg.server.ip} ${cfg.server.domain}";
-      };
-    };
 
     users.users.${iodinedUser} = {
       uid = config.ids.uids.iodined;

From 00a91d919d6f6cdaecc67a894f372a4195fea9da Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 2 Feb 2020 12:00:00 +0000
Subject: [PATCH 0129/4636] nixos/iodine: hardening

---
 nixos/modules/services/networking/iodine.nix | 38 ++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/nixos/modules/services/networking/iodine.nix b/nixos/modules/services/networking/iodine.nix
index 58067edf9026..8aa911708511 100644
--- a/nixos/modules/services/networking/iodine.nix
+++ b/nixos/modules/services/networking/iodine.nix
@@ -9,6 +9,8 @@ let
 
   iodinedUser = "iodined";
 
+  /* is this path made unreadable by ProtectHome = true ? */
+  isProtected = x: hasPrefix "/root" x || hasPrefix "/home" x;
 in
 {
   imports = [
@@ -134,6 +136,24 @@ in
             serviceConfig = {
               RestartSec = "30s";
               Restart = "always";
+
+              # hardening :
+              # Filesystem access
+              ProtectSystem = "strict";
+              ProtectHome = if isProtected cfg.passwordFile then "read-only" else "true" ;
+              PrivateTmp = true;
+              ReadWritePaths = "/dev/net/tun";
+              PrivateDevices = false;
+              ProtectKernelTunables = true;
+              ProtectKernelModules = true;
+              ProtectControlGroups = true;
+              # Caps
+              NoNewPrivileges = true;
+              # Misc.
+              LockPersonality = true;
+              RestrictRealtime = true;
+              PrivateMounts = true;
+              MemoryDenyWriteExecute = true;
             };
           };
       in
@@ -147,6 +167,24 @@ in
             after = [ "network.target" ];
             wantedBy = [ "multi-user.target" ];
             script = "exec ${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${optionalString (cfg.server.passwordFile != "") "< \"${cfg.server.passwordFile}\""} ${cfg.server.ip} ${cfg.server.domain}";
+            serviceConfig = {
+              # Filesystem access
+              ProtectSystem = "strict";
+              ProtectHome = if isProtected cfg.server.passwordFile then "read-only" else "true" ;
+              PrivateTmp = true;
+              ReadWritePaths = "/dev/net/tun";
+              PrivateDevices = false;
+              ProtectKernelTunables = true;
+              ProtectKernelModules = true;
+              ProtectControlGroups = true;
+              # Caps
+              NoNewPrivileges = true;
+              # Misc.
+              LockPersonality = true;
+              RestrictRealtime = true;
+              PrivateMounts = true;
+              MemoryDenyWriteExecute = true;
+            };
           };
         };
 

From b7f27cb61a09c76973cdeb4ed4207b7f2e6f4c65 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 2 Feb 2020 12:00:00 +0000
Subject: [PATCH 0130/4636] nixos/iodine: add test

---
 nixos/tests/all-tests.nix                |  1 +
 nixos/tests/iodine.nix                   | 63 ++++++++++++++++++++++++
 pkgs/tools/networking/iodine/default.nix |  6 ++-
 3 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/iodine.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index eb69457fb7e9..ab8dd8972055 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -130,6 +130,7 @@ in
   initrd-network-ssh = handleTest ./initrd-network-ssh {};
   initrdNetwork = handleTest ./initrd-network.nix {};
   installer = handleTest ./installer.nix {};
+  iodine = handleTest ./iodine.nix {};
   ipv6 = handleTest ./ipv6.nix {};
   jackett = handleTest ./jackett.nix {};
   jellyfin = handleTest ./jellyfin.nix {};
diff --git a/nixos/tests/iodine.nix b/nixos/tests/iodine.nix
new file mode 100644
index 000000000000..8bd9603a6d6c
--- /dev/null
+++ b/nixos/tests/iodine.nix
@@ -0,0 +1,63 @@
+import ./make-test-python.nix (
+  { pkgs, ... }: let
+    domain = "whatever.example.com";
+  in
+    {
+      name = "iodine";
+      nodes = {
+        server =
+          { ... }:
+
+            {
+              networking.firewall = {
+                allowedUDPPorts = [ 53 ];
+                trustedInterfaces = [ "dns0" ];
+              };
+              boot.kernel.sysctl = {
+                "net.ipv4.ip_forward" = 1;
+                "net.ipv6.ip_forward" = 1;
+              };
+
+              services.iodine.server = {
+                enable = true;
+                ip = "10.53.53.1/24";
+                passwordFile = "${builtins.toFile "password" "foo"}";
+                inherit domain;
+              };
+
+              # test resource: accessible only via tunnel
+              services.openssh = {
+                enable = true;
+                openFirewall = false;
+              };
+            };
+
+        client =
+          { ... }: {
+            services.iodine.clients.testClient = {
+              # test that ProtectHome is "read-only"
+              passwordFile = "/root/pw";
+              relay = "server";
+              server = domain;
+            };
+            systemd.tmpfiles.rules = [
+              "f /root/pw 0666 root root - foo"
+            ];
+            environment.systemPackages = [
+              pkgs.nagiosPluginsOfficial
+            ];
+          };
+
+      };
+
+      testScript = ''
+        start_all()
+
+        server.wait_for_unit("sshd")
+        server.wait_for_unit("iodined")
+        client.wait_for_unit("iodine-testClient")
+
+        client.succeed("check_ssh -H 10.53.53.1")
+      '';
+    }
+)
diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix
index feaeace3afd9..c978a330ceeb 100644
--- a/pkgs/tools/networking/iodine/default.nix
+++ b/pkgs/tools/networking/iodine/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, zlib, nettools }:
+{ stdenv, fetchFromGitHub, zlib, nettools, nixosTests }:
 
 stdenv.mkDerivation rec {
   pname = "iodine";
@@ -19,6 +19,10 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "prefix=\${out}" ];
 
+  passthru.tests = {
+    inherit (nixosTests) iodine;
+  };
+
   meta = {
     homepage = http://code.kryo.se/iodine/;
     description = "Tool to tunnel IPv4 data through a DNS server";

From 1addf1fd9404d89adbbb26f6460d9c46f24ffe1c Mon Sep 17 00:00:00 2001
From: symphorien <symphorien@users.noreply.github.com>
Date: Wed, 5 Feb 2020 19:42:07 +0000
Subject: [PATCH 0131/4636] nixos/iodine: improve description of some options

Co-Authored-By: Martin Weinelt <mweinelt@users.noreply.github.com>
---
 nixos/modules/services/networking/iodine.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/iodine.nix b/nixos/modules/services/networking/iodine.nix
index 8aa911708511..1a18976372d0 100644
--- a/nixos/modules/services/networking/iodine.nix
+++ b/nixos/modules/services/networking/iodine.nix
@@ -52,7 +52,7 @@ in
                 server = mkOption {
                   type = types.str;
                   default = "";
-                  description = "Domain or Subdomain of server running iodined";
+                  description = "Hostname of server running iodined";
                   example = "tunnel.mydomain.com";
                 };
 

From dfa67635d62973c9b8c0dc1ef3e55cd7eadd35c8 Mon Sep 17 00:00:00 2001
From: symphorien <symphorien@users.noreply.github.com>
Date: Wed, 5 Feb 2020 19:42:27 +0000
Subject: [PATCH 0132/4636] nixos/iodine: fix typo in description

Co-Authored-By: Martin Weinelt <mweinelt@users.noreply.github.com>
---
 nixos/modules/services/networking/iodine.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/iodine.nix b/nixos/modules/services/networking/iodine.nix
index 1a18976372d0..07b325d5b346 100644
--- a/nixos/modules/services/networking/iodine.nix
+++ b/nixos/modules/services/networking/iodine.nix
@@ -59,7 +59,7 @@ in
                 relay = mkOption {
                   type = types.str;
                   default = "";
-                  description = "DNS server to use as a intermediate relay to the iodined server";
+                  description = "DNS server to use as an intermediate relay to the iodined server";
                   example = "8.8.8.8";
                 };
 

From d2d5d89c2c30779ef6299d68fa8ef3f7d4fc1086 Mon Sep 17 00:00:00 2001
From: symphorien <symphorien@users.noreply.github.com>
Date: Wed, 5 Feb 2020 19:47:43 +0000
Subject: [PATCH 0133/4636] nixos/iodine: improve wording of some descriptions

Co-Authored-By: Martin Weinelt <mweinelt@users.noreply.github.com>
---
 nixos/modules/services/networking/iodine.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/iodine.nix b/nixos/modules/services/networking/iodine.nix
index 07b325d5b346..63a6a4c0fb9f 100644
--- a/nixos/modules/services/networking/iodine.nix
+++ b/nixos/modules/services/networking/iodine.nix
@@ -73,7 +73,7 @@ in
                 passwordFile = mkOption {
                   type = types.str;
                   default = "";
-                  description = "File that contains password";
+                  description = "Path to a file containing the password.";
                 };
               };
             }

From e8a766883fe0061ef60e5f0b70a95844957ec777 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 5 Feb 2020 23:50:47 +0100
Subject: [PATCH 0134/4636] libgit2: 0.27.8 -> 0.28.4

* https://github.com/libgit2/libgit2/releases/tag/v0.28.0
* https://github.com/libgit2/libgit2/releases/tag/v0.28.1
* https://github.com/libgit2/libgit2/releases/tag/v0.28.2
* https://github.com/libgit2/libgit2/releases/tag/v0.28.3
* https://github.com/libgit2/libgit2/releases/tag/v0.28.4
---
 pkgs/development/libraries/git2/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix
index 2d89355cffe0..ed32f68635b0 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/pkgs/development/libraries/git2/default.nix
@@ -1,25 +1,25 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, python3
-, zlib, libssh2, openssl, http-parser, curl
+, zlib, libssh2, openssl, http-parser
 , libiconv, Security
 }:
 
 stdenv.mkDerivation rec {
   pname = "libgit2";
-  version = "0.27.8";
-  # keep the version in sync with pythonPackages.pygit2 and libgit2-glib
+  version = "0.28.4";
+  # keep the version in sync with python3.pkgs.pygit2 and libgit2-glib
 
   src = fetchFromGitHub {
     owner = "libgit2";
     repo = "libgit2";
     rev = "v${version}";
-    sha256 = "0wzx8nkyy9m7mx6cks58chjd4289vjsw97mxm9w6f1ggqsfnmbr9";
+    sha256 = "171b25aym4q88bidc4c76y4l6jmdwifm3q9zjqsll0wjhlkycfy1";
   };
 
   cmakeFlags = [ "-DTHREADSAFE=ON" ];
 
   nativeBuildInputs = [ cmake python3 pkgconfig ];
 
-  buildInputs = [ zlib libssh2 openssl http-parser curl ]
+  buildInputs = [ zlib libssh2 openssl http-parser ]
     ++ stdenv.lib.optional stdenv.isDarwin Security;
 
   propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;

From 56e11bc8dff88c59e9137badd1ede2f7b66ec6ca Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Thu, 6 Feb 2020 00:59:40 +0100
Subject: [PATCH 0135/4636] buildRustCrate: remap the current build dir to /
 for (more) reproducible builds

---
 pkgs/build-support/rust/build-rust-crate/build-crate.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
index dec49d24f524..2dcca75e299b 100644
--- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
@@ -11,6 +11,7 @@
     baseRustcOpts =
       [(if release then "-C opt-level=3" else "-C debuginfo=2")]
       ++ ["-C codegen-units=$NIX_BUILD_CORES"]
+      ++ ["--remap-path-prefix=$NIX_BUILD_TOP=/" ]
       ++ [(mkRustcDepArgs dependencies crateRenames)]
       ++ [crateFeatures]
       ++ extraRustcOpts

From 02f17407449598e36b95dd3add77307fffa294d9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 6 Feb 2020 00:20:47 +0100
Subject: [PATCH 0136/4636] gitfs: Switch to Python 3

Supported since 0.5 at least
---
 pkgs/tools/filesystems/gitfs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix
index 5b3794146665..7c36e37b33fd 100644
--- a/pkgs/tools/filesystems/gitfs/default.nix
+++ b/pkgs/tools/filesystems/gitfs/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, python2Packages }:
+{ stdenv, fetchFromGitHub, python3Packages }:
 
-python2Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "gitfs";
   version = "0.5.2";
 
@@ -16,8 +16,8 @@ python2Packages.buildPythonApplication rec {
     echo > requirements.txt
   '';
 
-  buildInputs = with python2Packages; [ pytest pytestcov mock ];
-  propagatedBuildInputs = with python2Packages; [ atomiclong fusepy pygit2 ];
+  checkInputs = with python3Packages; [ pytest pytestcov mock ];
+  propagatedBuildInputs = with python3Packages; [ atomiclong fusepy pygit2 six ];
 
   checkPhase = "py.test";
   doCheck = false;

From 5308a8694e838539b52f7c1e9a36d999f1839c55 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 6 Feb 2020 00:11:28 +0100
Subject: [PATCH 0137/4636] =?UTF-8?q?python3.pkgs.pygit2:=200.27.2=20?=
 =?UTF-8?q?=E2=86=92=201.0.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Removes Python 2 support.

https://github.com/libgit2/pygit2/blob/v1.0.3/CHANGELOG.rst
---
 .../python-modules/pygit2/default.nix         | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix
index 313a3e5ab189..cd2994a4dc0f 100644
--- a/pkgs/development/python-modules/pygit2/default.nix
+++ b/pkgs/development/python-modules/pygit2/default.nix
@@ -1,25 +1,21 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, isPyPy, libgit2, six, cffi }:
+{ stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, isPy3k, libgit2, pytestCheckHook, cffi, cacert }:
 
 buildPythonPackage rec {
   pname = "pygit2";
-  version = "0.27.2";
+  version = "1.0.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0d9bgxd6ch5jxz0j5cmx7c4kw933g8pgm2zxf3id1a6w9g2r7hpw";
+    sha256 = "1ql7hkcxrh8yszglrg7d3y0ivh1l56xdc3j34j2fjy4qq06ifv6y";
   };
 
   preConfigure = lib.optionalString stdenv.isDarwin ''
     export DYLD_LIBRARY_PATH="${libgit2}/lib"
   '';
 
-  patches = [ (fetchpatch {
-    name = "dont-require-old-pycparser"; # https://github.com/libgit2/pygit2/issues/819
-    url = https://github.com/libgit2/pygit2/commit/1eaba181577de206d3d43ec7886d0353fc0c9f2a.patch;
-    sha256 = "18x1fpmywhjjr4lvakwmy34zpxfqi8pqqj48g1wcib39lh3s7l4f";
-  }) ];
+  propagatedBuildInputs = [ libgit2 ] ++ lib.optional (!isPyPy) cffi;
 
-  propagatedBuildInputs = [ libgit2 six ] ++ lib.optional (!isPyPy) cffi;
+  checkInputs = [ pytestCheckHook ];
 
   preCheck = ''
     # disable tests that require networking
@@ -28,6 +24,20 @@ buildPythonPackage rec {
     rm test/test_submodule.py
   '';
 
+  # Tests require certificates
+  # https://github.com/NixOS/nixpkgs/pull/72544#issuecomment-582674047
+  SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+
+  # setup.py check is broken
+  # https://github.com/libgit2/pygit2/issues/868
+  dontUseSetuptoolsCheck = true;
+
+  # TODO: Test collection is failing
+  # https://github.com/NixOS/nixpkgs/pull/72544#issuecomment-582681068
+  doCheck = false;
+
+  disabled = !isPy3k;
+
   meta = with lib; {
     description = "A set of Python bindings to the libgit2 shared library";
     homepage = https://pypi.python.org/pypi/pygit2;

From 6f51e7a13dd890dc1b05023e11aaa82f545b6e80 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 6 Feb 2020 07:33:54 +0000
Subject: [PATCH 0138/4636] git-ftp: 1.5.2 -> 1.6.0

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

diff --git a/pkgs/development/tools/git-ftp/default.nix b/pkgs/development/tools/git-ftp/default.nix
index b0a59e632f16..c0001774252b 100644
--- a/pkgs/development/tools/git-ftp/default.nix
+++ b/pkgs/development/tools/git-ftp/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, pandoc, man }:
 stdenv.mkDerivation rec {
   pname = "git-ftp";
-  version = "1.5.2";
+  version = "1.6.0";
   src = fetchFromGitHub {
     owner = "git-ftp";
     repo = "git-ftp";
     rev = version;
-    sha256 = "09qr8ciyfipcq32kl78ksvcra22aq7r4my685aajlbvkxgs0a867";
+    sha256 = "1hxkqf7jbrx24q18yxpnd3dxzh4xk6asymwkylp1x7zg6mcci87d";
   };
 
   dontBuild = true;

From aeb0b7ef5f4e14129fd41c5630b4318f5dfb39b7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 6 Feb 2020 12:47:38 +0000
Subject: [PATCH 0139/4636] pioneer: 20191117 -> 20200203

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

diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix
index cb9fe730f195..46190daa3d3b 100644
--- a/pkgs/games/pioneer/default.nix
+++ b/pkgs/games/pioneer/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pioneer";
-  version = "20191117";
+  version = "20200203";
 
   src = fetchFromGitHub{
     owner = "pioneerspacesim";
     repo = "pioneer";
     rev = version;
-    sha256 = "0ka5w1sfp56bs3njiwyr6ffy34qvqbzcvmra9cqwyvi7famn8b49";
+    sha256 = "1011xsi94jhw98mhm8kryq8ajig0qfbrdx5xdasi92bd4nk7lcp8";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 3987ea9a9d4464869ac6b8e8519a386190b6b68d Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 6 Feb 2020 14:15:35 +0100
Subject: [PATCH 0140/4636] mpv: add flag for swift on darwin

While we currently don't have a pure swift build on macOS it's possible
to build mpv using the swift compiler from CLT. eg.

    self: super:
    let
      CommandLineTools = "/Library/Developer/CommandLineTools";
    in
    {
      swift = super.stdenv.mkDerivation {
        name = "swift-CommandLineTools-0.0.0";
        phases = [ "installPhase" "fixupPhase" ];

        propagatedBuildInputs = [ self.darwin.DarwinTools ];

        installPhase = ''
            mkdir -p $out/bin $out/lib
            ln -s ${CommandLineTools}/usr/bin/swift $out/bin
            ln -s ${CommandLineTools}/usr/lib/swift $out/lib
            ln -s ${CommandLineTools}/SDKs $out
        '';

        setupHook = builtins.toFile "hook" ''
            addCommandLineTools() {
                echo >&2
                echo "WARNING: this is impure and unreliable, make sure the CommandLineTools are installed!" >&2
                echo "  $ xcode-select --install" >&2
                echo >&2
                [ -d ${CommandLineTools} ]
                export NIX_LDFLAGS+=" -L@out@/lib/swift/macosx"
                export SWIFT=swift
                export SWIFT_LIB_DYNAMIC=@out@/lib/swift/macosx
                export MACOS_SDK_VERSION=$(sw_vers -productVersion | awk -F. '{print $1 "." $2}')
                export MACOS_SDK=@out@/SDKs/MacOSX$MACOS_SDK_VERSION.sdk
            }

            prePhases+=" addCommandLineTools"
        '';

        __impureHostDeps = [ CommandLineTools ];
      };

      mpv = super.mpv.override { swiftSupport = true; };
    }
---
 pkgs/applications/video/mpv/default.nix          | 12 +++++++-----
 pkgs/os-specific/darwin/apple-sdk/frameworks.nix |  1 +
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index f7ac5ef58cdf..052e190a3e16 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -38,11 +38,12 @@
 , libpngSupport      ? true,           libpng        ? null
 , pulseSupport       ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
 , rubberbandSupport  ? stdenv.isLinux, rubberband    ? null
-, screenSaverSupport ? true,           libXScrnSaver ? null
 , sambaSupport       ? stdenv.isLinux, samba         ? null
+, screenSaverSupport ? true,           libXScrnSaver ? null
 , sdl2Support        ? true,           SDL2          ? null
 , sndioSupport       ? true,           sndio         ? null
 , speexSupport       ? true,           speex         ? null
+, swiftSupport       ? false,          swift         ? null
 , theoraSupport      ? true,           libtheora     ? null
 , vaapiSupport       ? stdenv.isLinux, libva         ? null
 , vdpauSupport       ? true,           libvdpau      ? null
@@ -119,7 +120,6 @@ in stdenv.mkDerivation rec {
     "--disable-libmpv-static"
     "--disable-static-build"
     "--disable-build-date" # Purity
-    "--disable-macos-cocoa-cb" # Disable whilst Swift isn't supported
     (enableFeature archiveSupport  "libarchive")
     (enableFeature cddaSupport     "cdda")
     (enableFeature dvdnavSupport   "dvdnav")
@@ -130,11 +130,13 @@ in stdenv.mkDerivation rec {
     (enableFeature vaapiSupport    "vaapi")
     (enableFeature waylandSupport  "wayland")
     (enableFeature stdenv.isLinux  "dvbin")
-  ];
+  ] # Disable whilst Swift isn't supported
+    ++ stdenv.lib.optional (!swiftSupport) "--disable-macos-cocoa-cb";
 
   nativeBuildInputs = [
     addOpenGLRunpath docutils makeWrapper perl pkgconfig python3 wafHook which
-  ];
+  ]
+    ++ optional swiftSupport swift;
 
   buildInputs = [
     ffmpeg_4 freetype libass libpthreadstubs
@@ -172,7 +174,7 @@ in stdenv.mkDerivation rec {
     ++ optionals x11Support        [ libX11 libXext libGLU libGL libXxf86vm libXrandr ]
     ++ optionals vulkanSupport     [ libplacebo shaderc vulkan-headers vulkan-loader ]
     ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
-      CoreFoundation Cocoa CoreAudio
+      CoreFoundation Cocoa CoreAudio MediaPlayer
     ]);
 
   enableParallelBuilding = true;
diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
index 09e0e4e48ecd..02e2421f3472 100644
--- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
@@ -75,6 +75,7 @@ with frameworks; with libs; {
   LocalAuthentication     = [];
   MapKit                  = [];
   MediaAccessibility      = [ CoreGraphics CoreText QuartzCore ];
+  MediaPlayer             = [];
   MediaToolbox            = [ AudioToolbox AudioUnit CoreMedia ];
   Metal                   = [];
   MetalKit                = [ ModelIO Metal ];

From 68464b6440ed0e2d2b16872b88160082919dfa4c Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 7 Dec 2019 17:22:14 +0100
Subject: [PATCH 0141/4636] gohufont: generate opentype files

---
 pkgs/data/fonts/gohufont/default.nix | 33 ++++++++++++++--------------
 pkgs/top-level/all-packages.nix      |  2 +-
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix
index e4e9954d1187..9715e42abfe7 100644
--- a/pkgs/data/fonts/gohufont/default.nix
+++ b/pkgs/data/fonts/gohufont/default.nix
@@ -1,42 +1,41 @@
 { stdenv, fetchurl, fetchFromGitHub
 , mkfontdir, mkfontscale, bdf2psf, bdftopcf
+, fonttosfnt
 }:
 
 stdenv.mkDerivation rec {
   pname = "gohufont";
   version = "2.1";
 
-  src = fetchurl {
-    url = "https://font.gohu.org/${pname}-${version}.tar.gz";
-    sha256 = "10dsl7insnw95hinkcgmp9rx39lyzb7bpx5g70vswl8d6p4n53bm";
-  };
-
-  bdf = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner  = "hchargois";
     repo   = "gohufont";
     rev    = "cc36b8c9fed7141763e55dcee0a97abffcf08224";
     sha256 = "1hmp11mrr01b29phw0xyj4h9b92qz19cf56ssf6c47c5j2c4xmbv";
   };
 
-  nativeBuildInputs = [ mkfontdir mkfontscale bdf2psf bdftopcf ];
+  nativeBuildInputs =
+    [ mkfontdir mkfontscale bdf2psf bdftopcf fonttosfnt ];
 
   buildPhase = ''
-    # convert bdf to psf fonts
+    # convert bdf fonts to psf
     build=$(pwd)
     mkdir psf
     cd ${bdf2psf}/share/bdf2psf
-    for i in $bdf/*.bdf; do
+    for i in $src/*.bdf; do
+      name=$(basename $i .bdf)
       bdf2psf \
         --fb "$i" standard.equivalents \
         ascii.set+useful.set+linux.set 512 \
-        "$build/psf/$(basename $i .bdf).psf"
+        "$build/psf/$name.psf"
     done
     cd $build
 
-    # convert hidpi variant to pcf
-    for i in $bdf/hidpi/*.bdf; do
-        name=$(basename $i .bdf).pcf
-        bdftopcf -o "$name" "$i"
+    # convert bdf fonts to pcf and otb
+    for i in *.bdf $src/hidpi/*.bdf; do
+        name=$(basename $i .bdf)
+        bdftopcf -o "$name.pcf" "$i"
+        fonttosfnt -v -o "$name.otb" "$i" || true
     done
   '';
 
@@ -46,10 +45,10 @@ stdenv.mkDerivation rec {
     mkdir -p "$fontDir"
     mv -t "$fontDir" psf/*.psf
 
-    # install the pcf fonts (for xorg applications)
+    # install the pcf and otb fonts (for xorg applications)
     fontDir="$out/share/fonts/misc"
     mkdir -p "$fontDir"
-    mv -t "$fontDir" *.pcf.gz *.pcf
+    mv -t "$fontDir" *.pcf *.otb
 
     cd "$fontDir"
     mkfontdir
@@ -58,7 +57,7 @@ stdenv.mkDerivation rec {
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash     = "0kl7k8idl0fnsap2c4j02i33z017p2s4gi2cgspy6ica46fczcc1";
+  outputHash     = "0j9fhvzkascpb5y8lc1pmmmgd74apgw9mimbj0bk2chcbfsi852p";
 
   meta = with stdenv.lib; {
     description = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0c475483078..44b17172e8ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17493,7 +17493,7 @@ in
 
   geolite-legacy = callPackage ../data/misc/geolite-legacy { };
 
-  gohufont = callPackage ../data/fonts/gohufont { };
+  gohufont = callPackage ../data/fonts/gohufont { inherit (xorg) fonttosfnt mkfontdir; };
 
   gnome-user-docs = callPackage ../data/documentation/gnome-user-docs { };
 

From 8784637f12d1cd4678d44373da93841e260c1e8c Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Fri, 7 Feb 2020 10:02:17 +0100
Subject: [PATCH 0142/4636] bdf2psf: fix for cross compilation

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

diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix
index defdd9494e51..07bc5de371f3 100644
--- a/pkgs/tools/misc/bdf2psf/default.nix
+++ b/pkgs/tools/misc/bdf2psf/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "10c0rbhqscizfa063m6mms31i0knh25bxr35s008b6mp5pxr33mc";
   };
 
-  buildInputs = [ dpkg ];
+  nativeBuildInputs = [ dpkg ];
 
   dontConfigure = true;
   dontBuild = true;

From 3f29e19a48ba5ae78359650c04854fd75884eaef Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Fri, 7 Feb 2020 10:53:23 +0100
Subject: [PATCH 0143/4636] gohufont: fix for cross compilation

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 44b17172e8ef..90c390ba4156 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17493,7 +17493,8 @@ in
 
   geolite-legacy = callPackage ../data/misc/geolite-legacy { };
 
-  gohufont = callPackage ../data/fonts/gohufont { inherit (xorg) fonttosfnt mkfontdir; };
+  gohufont = callPackage ../data/fonts/gohufont
+    { inherit (buildPackages.xorg) fonttosfnt mkfontdir; };
 
   gnome-user-docs = callPackage ../data/documentation/gnome-user-docs { };
 

From 1cc11b98f15c6cf6e4012c21cbdfcc1b4279796c Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Fri, 7 Feb 2020 18:20:47 +0100
Subject: [PATCH 0144/4636] xorg.fonttosfnt: add patch to fix uninitialized
 memory bug

---
 .../x11/xorg/fix-uninitialised-memory.patch   | 61 +++++++++++++++++++
 pkgs/servers/x11/xorg/overrides.nix           |  5 ++
 2 files changed, 66 insertions(+)
 create mode 100644 pkgs/servers/x11/xorg/fix-uninitialised-memory.patch

diff --git a/pkgs/servers/x11/xorg/fix-uninitialised-memory.patch b/pkgs/servers/x11/xorg/fix-uninitialised-memory.patch
new file mode 100644
index 000000000000..53f22d7f39cf
--- /dev/null
+++ b/pkgs/servers/x11/xorg/fix-uninitialised-memory.patch
@@ -0,0 +1,61 @@
+From 51e8117654fb092ae5412d7aa184bfc6b498c954 Mon Sep 17 00:00:00 2001
+From: rnhmjoj <rnhmjoj@inventati.org>
+Date: Fri, 7 Feb 2020 17:46:54 +0100
+Subject: [PATCH 1/2] Fix incorrect error handling in macTime()
+
+mktime() and time() return (time_t -1) to signal an error.
+Checking for negative values will incorrectly assume an error
+happened for any calendar date before the unix epoch.
+---
+ util.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/util.c b/util.c
+index bcbfa2f..4482c9a 100644
+--- a/util.c
++++ b/util.c
+@@ -213,10 +213,10 @@ macTime(int *hi, unsigned *lo)
+     tm.tm_isdst = -1;
+ 
+     macEpoch = mktime_gmt(&tm);
+-    if(macEpoch < 0) return -1;
++    if(macEpoch == -1) return -1;
+ 
+     current = time(NULL);
+-    if(current < 0)
++    if(current == -1)
+         return -1;
+ 
+     if(current < macEpoch) {
+-- 
+2.23.0
+
+From 81a61c049e6de80120531f0770b22e7637c9acb9 Mon Sep 17 00:00:00 2001
+From: rnhmjoj <rnhmjoj@inventati.org>
+Date: Fri, 7 Feb 2020 17:47:52 +0100
+Subject: [PATCH 2/2] Fix uninitialised memory write
+
+If macTime() fails write zeros instead of unitialized memory to
+the date fields.
+---
+ write.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/write.c b/write.c
+index 318adef..c8a86e4 100644
+--- a/write.c
++++ b/write.c
+@@ -434,8 +434,8 @@ fixupChecksum(FILE *out, int full_length, int head_position)
+ static int 
+ writehead(FILE* out, FontPtr font)
+ {
+-    int time_hi;
+-    unsigned time_lo;
++    int time_hi = 0;
++    unsigned time_lo = 0;
+ 
+     macTime(&time_hi, &time_lo);
+ 
+-- 
+2.23.0
+
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 7a9ffcfc6469..2261831586a5 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -22,6 +22,11 @@ self: super:
     buildInputs = attrs.buildInputs ++ [ self.xorgproto ];
   });
 
+  fonttosfnt = super.fonttosfnt.overrideAttrs (attrs: {
+    # https://gitlab.freedesktop.org/xorg/app/fonttosfnt/merge_requests/6
+    patches = [ ./fix-uninitialised-memory.patch ];
+  });
+
   bitmap = super.bitmap.overrideAttrs (attrs: {
     nativeBuildInputs = attrs.nativeBuildInputs ++ [ makeWrapper ];
     postInstall = ''

From 96606b67faea751ac20c49043e247ed5822ab991 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Fri, 7 Feb 2020 18:21:29 +0100
Subject: [PATCH 0145/4636] gohufont: make fonttosfnt deterministic

---
 pkgs/data/fonts/gohufont/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix
index 9715e42abfe7..ec36d9230f5b 100644
--- a/pkgs/data/fonts/gohufont/default.nix
+++ b/pkgs/data/fonts/gohufont/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchFromGitHub
 , mkfontdir, mkfontscale, bdf2psf, bdftopcf
-, fonttosfnt
+, fonttosfnt, libfaketime
 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,9 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs =
-    [ mkfontdir mkfontscale bdf2psf bdftopcf fonttosfnt ];
+    [ mkfontdir mkfontscale bdf2psf bdftopcf
+      fonttosfnt libfaketime
+    ];
 
   buildPhase = ''
     # convert bdf fonts to psf
@@ -35,7 +37,7 @@ stdenv.mkDerivation rec {
     for i in *.bdf $src/hidpi/*.bdf; do
         name=$(basename $i .bdf)
         bdftopcf -o "$name.pcf" "$i"
-        fonttosfnt -v -o "$name.otb" "$i" || true
+        faketime -f "1970-01-01 00:00:01" fonttosfnt -v -o "$name.otb" "$i" || true
     done
   '';
 
@@ -57,7 +59,7 @@ stdenv.mkDerivation rec {
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash     = "0j9fhvzkascpb5y8lc1pmmmgd74apgw9mimbj0bk2chcbfsi852p";
+  outputHash     = "028mq0j6w76isv4ycj1jzx7ih9d9cz5012np7f1pf3bvnvw3ajw2";
 
   meta = with stdenv.lib; {
     description = ''

From c6b1ce47b673a35c140e7eec8b7409c645443a6f Mon Sep 17 00:00:00 2001
From: Stefano Mazzucco <stefano@curso.re>
Date: Fri, 7 Feb 2020 20:52:05 +0000
Subject: [PATCH 0146/4636] aws-sam-cli: disable telemetry

Since v0.19.0 aws-sam-cli sends telemetry data to AWS[1]. To protect the users'
privacy, we opt-out by default.

[1] https://github.com/awslabs/aws-sam-cli/issues/1272
---
 pkgs/development/tools/aws-sam-cli/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix
index 39a68622056a..916ff325b43b 100644
--- a/pkgs/development/tools/aws-sam-cli/default.nix
+++ b/pkgs/development/tools/aws-sam-cli/default.nix
@@ -83,6 +83,11 @@ buildPythonApplication rec {
     tomlkit
   ];
 
+  postFixup = ''
+    # Disable telemetry: https://github.com/awslabs/aws-sam-cli/issues/1272
+    wrapProgram $out/bin/sam --set  SAM_CLI_TELEMETRY 0
+  '';
+
   # fix over-restrictive version bounds
   postPatch = ''
     substituteInPlace requirements/base.txt \

From 408f36923dd1efdc00dde6ed917945df6b625cbb Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 7 Feb 2020 22:09:23 +0100
Subject: [PATCH 0147/4636] mpv: call with frameworks

Referencing darwin.* directly makes overriding dependencies very
awkward.
---
 pkgs/applications/video/mpv/default.nix | 7 +++----
 pkgs/top-level/all-packages.nix         | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 052e190a3e16..f1713fe29d4b 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -1,7 +1,8 @@
 { config, stdenv, fetchurl, fetchFromGitHub, makeWrapper
 , addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which
 , ffmpeg_4, freefont_ttf, freetype, libass, libpthreadstubs, mujs
-, nv-codec-headers, lua, libuchardet, libiconv ? null, darwin
+, nv-codec-headers, lua, libuchardet, libiconv ? null
+, CoreFoundation, Cocoa, CoreAudio, MediaPlayer
 
 , waylandSupport ? stdenv.isLinux
   , wayland           ? null
@@ -173,9 +174,7 @@ in stdenv.mkDerivation rec {
     ++ optionals waylandSupport    [ wayland wayland-protocols libxkbcommon ]
     ++ optionals x11Support        [ libX11 libXext libGLU libGL libXxf86vm libXrandr ]
     ++ optionals vulkanSupport     [ libplacebo shaderc vulkan-headers vulkan-loader ]
-    ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
-      CoreFoundation Cocoa CoreAudio MediaPlayer
-    ]);
+    ++ optionals stdenv.isDarwin   [ CoreFoundation Cocoa CoreAudio MediaPlayer ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e351a5f90642..3916e71751c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20379,6 +20379,7 @@ in
 
   mpv = callPackage ../applications/video/mpv {
     inherit lua;
+    inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer;
   };
 
   mpv-with-scripts = callPackage ../applications/video/mpv/wrapper.nix { };

From 825f7cda3f331c138b6de10bbb3e7dd7876d3626 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 8 Feb 2020 02:03:06 +0000
Subject: [PATCH 0148/4636] copyq: 3.9.3 -> 3.10.0

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

diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
index 58a85f8f6e97..16be8e06b686 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -5,13 +5,13 @@
 
 mkDerivation rec {
   pname = "CopyQ";
-  version = "3.9.3";
+  version = "3.10.0";
 
   src  = fetchFromGitHub {
     owner = "hluk";
     repo = "CopyQ";
     rev = "v${version}";
-    sha256 = "0wlwq9xg8rzsbj0b29z358k4mbrqy04iraa8x0p26pa95yskgcma";
+    sha256 = "05nhgndiq0sm1bvb80sf5fgnm38249dclwzmfm7hzrablmkwgv3c";
   };
 
   nativeBuildInputs = [ cmake ];

From e978d20fd2ccbc98d1df46016eac1b2803ae21a6 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Sat, 8 Feb 2020 11:57:19 +0800
Subject: [PATCH 0149/4636] opencorsairlink: init at 2019-12-23

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

diff --git a/pkgs/tools/misc/opencorsairlink/default.nix b/pkgs/tools/misc/opencorsairlink/default.nix
new file mode 100644
index 000000000000..11df20b3b827
--- /dev/null
+++ b/pkgs/tools/misc/opencorsairlink/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, libusb1, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "OpenCorsairLink-${version}";
+  version = "2019-12-23";
+
+  buildInputs = [ libusb1 ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
+
+  src = fetchFromGitHub {
+    owner = "audiohacked";
+    repo = "OpenCorsairLink";
+    rev = "46dbf206e19a40d6de6bd73142ed93bdb26c5c1a";
+    sha256 = "1nizicl0mc9pslc6065mnrs0fnn8sh7ca8iiw7w9ix57zrhabpld";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Linux and Mac OS support for the CorsairLink Devices ";
+    homepage = "https://github.com/audiohacked/OpenCorsairLink";
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    maintainers = [ stdenv.lib.maintainers.expipiplus1 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c9b909a9d06..9e5a10d7e55c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5418,6 +5418,8 @@ in
 
   ocserv = callPackage ../tools/networking/ocserv { };
 
+  opencorsairlink = callPackage ../tools/misc/opencorsairlink { };
+
   openfortivpn = callPackage ../tools/networking/openfortivpn { };
 
   obexfs = callPackage ../tools/bluetooth/obexfs { };

From 200b0caa9beb590e1df0209e2d42364686ef1324 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 8 Feb 2020 04:52:30 +0000
Subject: [PATCH 0150/4636] fldigi: 4.1.08.51 -> 4.1.09

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

diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix
index 48c53ccc59f6..b7705cff026f 100644
--- a/pkgs/applications/radio/fldigi/default.nix
+++ b/pkgs/applications/radio/fldigi/default.nix
@@ -2,12 +2,12 @@
   libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:
 
 stdenv.mkDerivation rec {
-  version = "4.1.08.51";
+  version = "4.1.09";
   pname = "fldigi";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "0wki9d19q8rkjxcd3dz3k0a395gmbnji4fxlhw6dpcyqpfw88fcs";
+    sha256 = "1pdwm8na2yq6wj76057sbfxr5cb5avnm26if8spsp5fkfw9yylwp";
   };
 
   buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio

From 1ac86e14c746140a7fa9a6e81a3471739655366b Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 18 Oct 2019 00:53:48 +0200
Subject: [PATCH 0151/4636] swap: depend on rngd if enabled and
 randomEncryption is configured to avoid entropy starvation during boot

---
 nixos/modules/config/swap.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix
index d0fc0d4a3ea4..adb4e2294213 100644
--- a/nixos/modules/config/swap.nix
+++ b/nixos/modules/config/swap.nix
@@ -185,6 +185,8 @@ in
           { description = "Initialisation of swap device ${sw.device}";
             wantedBy = [ "${realDevice'}.swap" ];
             before = [ "${realDevice'}.swap" ];
+            # If swap is encrypted, depending on rngd resolves a possible entropy starvation during boot
+            after = mkIf (config.security.rngd.enable && sw.randomEncryption.enable) [ "rngd.service" ];
             path = [ pkgs.utillinux ] ++ optional sw.randomEncryption.enable pkgs.cryptsetup;
 
             script =

From d14ba1e1add6cca568515f87508ad5d00180bf16 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 18 Oct 2019 00:30:11 +0200
Subject: [PATCH 0152/4636] security.rngd: start rngd during early boot to
 reduce entropy starvation due to encrypted swap and remove PrivateTmp to
 avoid a circular dependency

---
 nixos/modules/security/rngd.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/security/rngd.nix b/nixos/modules/security/rngd.nix
index d9d6d9c9f253..5566c53897dc 100644
--- a/nixos/modules/security/rngd.nix
+++ b/nixos/modules/security/rngd.nix
@@ -39,12 +39,15 @@ in
 
       description = "Hardware RNG Entropy Gatherer Daemon";
 
+      # rngd may have to start early to avoid entropy starvation during boot with encrypted swap
+      unitConfig.DefaultDependencies = false;
       serviceConfig = {
         ExecStart = "${pkgs.rng-tools}/sbin/rngd -f"
           + optionalString cfg.debug " -d";
+        # PrivateTmp would introduce a circular dependency if /tmp is on tmpfs and swap is encrypted,
+        # thus depending on rngd before swap, while swap depends on rngd to avoid entropy starvation.
         NoNewPrivileges = true;
         PrivateNetwork = true;
-        PrivateTmp = true;
         ProtectSystem = "full";
         ProtectHome = true;
       };

From 44e289f93bcf6d04c3eab231bac57dade06fc0c6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 22 Sep 2019 17:14:47 +0200
Subject: [PATCH 0153/4636] nixos/stage-1: fix predictable interfaces names

This makes predictable interfaces names available as soon as possible
with udev by adding the default network link units to initrd which are read
by udev. Also adds some udev rules that are needed but which would normally
loaded from the udev store path which is not included in the initrd.
---
 nixos/modules/system/boot/stage-1-init.sh   |  6 ++++--
 nixos/modules/system/boot/stage-1.nix       | 15 +++++++++++++--
 nixos/tests/predictable-interface-names.nix |  6 ++++++
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 8736613c3d25..607aec87f01e 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -210,6 +210,8 @@ done
 # Create device nodes in /dev.
 @preDeviceCommands@
 echo "running udev..."
+mkdir -p /etc/systemd
+ln -sfn @linkUnits@ /etc/systemd/network
 mkdir -p /etc/udev
 ln -sfn @udevRules@ /etc/udev/rules.d
 mkdir -p /dev/.mdadm
@@ -266,7 +268,7 @@ checkFS() {
         return 0
     fi
 
-    # Device might be already mounted manually 
+    # Device might be already mounted manually
     # e.g. NBD-device or the host filesystem of the file which contains encrypted root fs
     if mount | grep -q "^$device on "; then
         echo "skip checking already mounted $device"
@@ -351,7 +353,7 @@ mountFS() {
             elif [ "$fsType" = f2fs ]; then
                 echo "resizing $device..."
                 fsck.f2fs -fp "$device"
-                resize.f2fs "$device" 
+                resize.f2fs "$device"
             fi
             ;;
     esac
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 4c2d130d5a5d..26117cffeda2 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -120,6 +120,7 @@ let
 
       # Copy udev.
       copy_bin_and_libs ${udev}/lib/systemd/systemd-udevd
+      copy_bin_and_libs ${udev}/lib/systemd/systemd-sysctl
       copy_bin_and_libs ${udev}/bin/udevadm
       for BIN in ${udev}/lib/udev/*_id; do
         copy_bin_and_libs $BIN
@@ -198,6 +199,14 @@ let
     ''; # */
 
 
+  linkUnits = pkgs.runCommand "link-units" {
+      allowedReferences = [ extraUtils ];
+      preferLocalBuild = true;
+    } ''
+      mkdir -p $out
+      cp -v ${udev}/lib/systemd/network/*.link $out/
+    '';
+
   udevRules = pkgs.runCommand "udev-rules" {
       allowedReferences = [ extraUtils ];
       preferLocalBuild = true;
@@ -208,7 +217,9 @@ let
 
       cp -v ${udev}/lib/udev/rules.d/60-cdrom_id.rules $out/
       cp -v ${udev}/lib/udev/rules.d/60-persistent-storage.rules $out/
+      cp -v ${udev}/lib/udev/rules.d/75-net-description.rules $out/
       cp -v ${udev}/lib/udev/rules.d/80-drivers.rules $out/
+      cp -v ${udev}/lib/udev/rules.d/80-net-setup-link.rules $out/
       cp -v ${pkgs.lvm2}/lib/udev/rules.d/*.rules $out/
       ${config.boot.initrd.extraUdevRulesCommands}
 
@@ -222,7 +233,7 @@ let
             --replace ${pkgs.lvm2}/sbin ${extraUtils}/bin \
             --replace ${pkgs.mdadm}/sbin ${extraUtils}/sbin \
             --replace ${pkgs.bash}/bin/sh ${extraUtils}/bin/sh \
-            --replace ${udev}/bin/udevadm ${extraUtils}/bin/udevadm
+            --replace ${udev} ${extraUtils}
       done
 
       # Work around a bug in QEMU, which doesn't implement the "READ
@@ -257,7 +268,7 @@ let
       ${pkgs.buildPackages.busybox}/bin/ash -n $target
     '';
 
-    inherit udevRules extraUtils modulesClosure;
+    inherit linkUnits udevRules extraUtils modulesClosure;
 
     inherit (config.boot) resumeDevice;
 
diff --git a/nixos/tests/predictable-interface-names.nix b/nixos/tests/predictable-interface-names.nix
index 83883477a5cc..bab091d57acf 100644
--- a/nixos/tests/predictable-interface-names.nix
+++ b/nixos/tests/predictable-interface-names.nix
@@ -17,6 +17,12 @@ in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: {
       networking.useNetworkd = withNetworkd;
       networking.dhcpcd.enable = !withNetworkd;
       networking.useDHCP = !withNetworkd;
+
+      # Check if predictable interface names are working in stage-1
+      boot.initrd.postDeviceCommands = ''
+        ip link
+        ip link show eth0 ${if predictable then "&&" else "||"} exit 1
+      '';
     };
 
     testScript = ''

From ea7d02406b000b8b9a951fba262174492ff4572f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 8 Feb 2020 12:11:13 +0100
Subject: [PATCH 0154/4636] nixos/initrd-network: flush interfaces before stage
 2

Depending on the network management backend being used, if the interface
configuration in stage 1 is not cleared, there might still be some old
addresses or routes from stage 1 present in stage 2 after network
configuration has finished.
---
 nixos/modules/system/boot/initrd-network.nix | 39 +++++++++++++++-----
 nixos/tests/initrd-network.nix               | 15 +++++++-
 2 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/system/boot/initrd-network.nix b/nixos/modules/system/boot/initrd-network.nix
index cb8fc957a990..cdffdf29f2d9 100644
--- a/nixos/modules/system/boot/initrd-network.nix
+++ b/nixos/modules/system/boot/initrd-network.nix
@@ -6,7 +6,11 @@ let
 
   cfg = config.boot.initrd.network;
 
-  dhcpinterfaces = lib.attrNames (lib.filterAttrs (iface: v: v.useDHCP == true) (config.networking.interfaces or {}));
+  dhcpInterfaces = lib.attrNames (lib.filterAttrs (iface: v: v.useDHCP == true) (config.networking.interfaces or {}));
+  doDhcp = config.networking.useDHCP || dhcpInterfaces != [];
+  dhcpIfShellExpr = if config.networking.useDHCP
+                      then "$(ls /sys/class/net/ | grep -v ^lo$)"
+                      else lib.concatMapStringsSep " " lib.escapeShellArg dhcpInterfaces;
 
   udhcpcScript = pkgs.writeScript "udhcp-script"
     ''
@@ -62,6 +66,16 @@ in
       '';
     };
 
+    boot.initrd.network.flushBeforeStage2 = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Whether to clear the configuration of the interfaces that were set up in
+        the initrd right before stage 2 takes over. Stage 2 will do the regular network
+        configuration based on the NixOS networking options.
+      '';
+    };
+
     boot.initrd.network.udhcpc.extraArgs = mkOption {
       default = [];
       type = types.listOf types.str;
@@ -95,31 +109,29 @@ in
     boot.initrd.preLVMCommands = mkBefore (
       # Search for interface definitions in command line.
       ''
+        ifaces=""
         for o in $(cat /proc/cmdline); do
           case $o in
             ip=*)
-              ipconfig $o && hasNetwork=1
+              ipconfig $o && hasNetwork=1 \
+                && ifaces="$ifaces $(echo $o | cut -d: -f6)"
               ;;
           esac
         done
       ''
 
       # Otherwise, use DHCP.
-      + optionalString (config.networking.useDHCP || dhcpinterfaces != []) ''
+      + optionalString doDhcp ''
         if [ -z "$hasNetwork" ]; then
 
           # Bring up all interfaces.
-          for iface in $(ls /sys/class/net/); do
+          for iface in ${dhcpIfShellExpr}; do
             echo "bringing up network interface $iface..."
-            ip link set "$iface" up
+            ip link set "$iface" up && ifaces="$ifaces $iface"
           done
 
           # Acquire DHCP leases.
-          for iface in ${ if config.networking.useDHCP then
-                            "$(ls /sys/class/net/ | grep -v ^lo$)"
-                          else
-                            lib.concatMapStringsSep " " lib.escapeShellArg dhcpinterfaces
-                        }; do
+          for iface in ${dhcpIfShellExpr}; do
             echo "acquiring IP address via DHCP on $iface..."
             udhcpc --quit --now -i $iface -O staticroutes --script ${udhcpcScript} ${udhcpcArgs} && hasNetwork=1
           done
@@ -133,6 +145,13 @@ in
         fi
       '');
 
+    boot.initrd.postMountCommands = mkIf cfg.flushBeforeStage2 ''
+      for iface in $ifaces; do
+        ip address flush "$iface"
+        ip link down "$iface"
+      done
+    '';
+
   };
 
 }
diff --git a/nixos/tests/initrd-network.nix b/nixos/tests/initrd-network.nix
index 4796ff9b7c8d..9c35b7305768 100644
--- a/nixos/tests/initrd-network.nix
+++ b/nixos/tests/initrd-network.nix
@@ -1,4 +1,4 @@
-import ./make-test-python.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, lib, ...} : {
   name = "initrd-network";
 
   meta.maintainers = [ pkgs.stdenv.lib.maintainers.eelco ];
@@ -8,15 +8,26 @@ import ./make-test-python.nix ({ pkgs, ...} : {
     boot.initrd.network.enable = true;
     boot.initrd.network.postCommands =
       ''
+        ip addr show
+        ip route show
         ip addr | grep 10.0.2.15 || exit 1
         ping -c1 10.0.2.2 || exit 1
       '';
+    # Check if cleanup was done correctly
+    boot.initrd.postMountCommands = lib.mkAfter
+      ''
+        ip addr show
+        ip route show
+        ip addr | grep 10.0.2.15 && exit 1
+        ping -c1 10.0.2.2 && exit 1
+      '';
   };
 
   testScript =
     ''
       start_all()
       machine.wait_for_unit("multi-user.target")
-      machine.succeed("ip link >&2")
+      machine.succeed("ip addr show >&2")
+      machine.succeed("ip route show >&2")
     '';
 })

From dae266aa6627151e51a4f7e2cfca4d6ace7a3030 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 8 Feb 2020 13:04:53 +0000
Subject: [PATCH 0155/4636] last: 1045 -> 1047

---
 pkgs/applications/science/biology/last/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix
index c9e546dc2ce7..b47ce6ac3a94 100644
--- a/pkgs/applications/science/biology/last/default.nix
+++ b/pkgs/applications/science/biology/last/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "last";
-  version = "1045";
+  version = "1047";
 
   src = fetchurl {
     url = "http://last.cbrc.jp/last-${version}.zip";
-    sha256 = "0x2wrm52ca935n3yc486m8yy59ap34w1x9h3csjca3jab5agnjkc";
+    sha256 = "06fj4qfw3dd35y3pky3dnr40v1alf43wjx373rbx1vr3hbgzvgf8";
   };
 
   nativeBuildInputs = [ unzip ];

From 4ba8086aa17e014bec3843e16c0c7eddee9bdf40 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 8 Feb 2020 14:30:51 +0100
Subject: [PATCH 0156/4636] klibc: 2.0.4 -> 2.0.7

---
 pkgs/os-specific/linux/klibc/default.nix            | 13 ++++++++-----
 .../linux/klibc/no-reinstall-kernel-headers.patch   |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix
index 8e224c8f33b8..a92970726dca 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, linuxHeaders, perl }:
+{ lib, stdenv, fetchurl, linuxHeaders, perl }:
 
 let
   commonMakeFlags = [
@@ -9,11 +9,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "klibc";
-  version = "2.0.4";
+  version = "2.0.7";
 
   src = fetchurl {
     url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz";
-    sha256 = "7f9a0850586def7cf4faeeb75e5d0f66e613674c524f6e77b0f4d93a26c801cb";
+    sha256 = "08li3aj9bvzabrih98jdxi3m19h85cp53s8cr7cqad42r8vjdvxb";
   };
 
   patches = [ ./no-reinstall-kernel-headers.patch ];
@@ -35,7 +35,6 @@ stdenv.mkDerivation rec {
     dir=$out/lib/klibc/bin.static
     mkdir $dir
     cp $(find $(find . -name static) -type f ! -name "*.g" -a ! -name ".*") $dir/
-    cp usr/dash/sh $dir/
 
     for file in ${linuxHeaders}/include/*; do
       ln -sv $file $out/lib/klibc/include
@@ -43,6 +42,10 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    platforms = [ "x86_64-linux" ];
+    description = "Minimalistic libc subset for initramfs usage";
+    homepage = "https://kernel.org/pub/linux/libs/klibc/";
+    maintainers = with lib.maintainers; [ fpletz ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch b/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch
index d3e55fc8731d..709dd30f8c7e 100644
--- a/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch
+++ b/pkgs/os-specific/linux/klibc/no-reinstall-kernel-headers.patch
@@ -5,7 +5,7 @@ diff -Naur klibc-2.0.3-orig/scripts/Kbuild.install klibc-2.0.3/scripts/Kbuild.in
  	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
  	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
  	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
--	$(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install
+-	$(Q)cp -rfL $(KLIBCKERNELSRC)/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
  	$(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
  	$(Q)chmod -R a+rX $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
  	$(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1

From d25c1a8fdc383b8997f6e7b4e1479875df1f06b2 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 8 Feb 2020 14:29:04 +0100
Subject: [PATCH 0157/4636] nixos/initrd-network: use ipconfig from klibc

This apparently has features that the version from Arch's
mkinitcpio-nfs-utils does not have. Fixes #75314.
---
 nixos/modules/system/boot/initrd-network.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/initrd-network.nix b/nixos/modules/system/boot/initrd-network.nix
index cdffdf29f2d9..d36850c2a16f 100644
--- a/nixos/modules/system/boot/initrd-network.nix
+++ b/nixos/modules/system/boot/initrd-network.nix
@@ -103,7 +103,7 @@ in
     boot.initrd.kernelModules = [ "af_packet" ];
 
     boot.initrd.extraUtilsCommands = ''
-      copy_bin_and_libs ${pkgs.mkinitcpio-nfs-utils}/bin/ipconfig
+      copy_bin_and_libs ${pkgs.klibc}/lib/klibc/bin.static/ipconfig
     '';
 
     boot.initrd.preLVMCommands = mkBefore (

From 589789997fe882668eae25f1f0578230d8576506 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 8 Feb 2020 14:55:29 +0100
Subject: [PATCH 0158/4636] nixos/initrd-network: always run postCommands

As outlined in #71447, postCommands should always be run if networking
in initrd is enabled. regardless if the configuration actually
succeeded.
---
 nixos/modules/system/boot/initrd-network.nix | 33 +++++++-------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/system/boot/initrd-network.nix b/nixos/modules/system/boot/initrd-network.nix
index d36850c2a16f..0ab6e626b340 100644
--- a/nixos/modules/system/boot/initrd-network.nix
+++ b/nixos/modules/system/boot/initrd-network.nix
@@ -113,8 +113,7 @@ in
         for o in $(cat /proc/cmdline); do
           case $o in
             ip=*)
-              ipconfig $o && hasNetwork=1 \
-                && ifaces="$ifaces $(echo $o | cut -d: -f6)"
+              ipconfig $o && ifaces="$ifaces $(echo $o | cut -d: -f6)"
               ;;
           esac
         done
@@ -122,28 +121,20 @@ in
 
       # Otherwise, use DHCP.
       + optionalString doDhcp ''
-        if [ -z "$hasNetwork" ]; then
+        # Bring up all interfaces.
+        for iface in ${dhcpIfShellExpr}; do
+          echo "bringing up network interface $iface..."
+          ip link set "$iface" up && ifaces="$ifaces $iface"
+        done
 
-          # Bring up all interfaces.
-          for iface in ${dhcpIfShellExpr}; do
-            echo "bringing up network interface $iface..."
-            ip link set "$iface" up && ifaces="$ifaces $iface"
-          done
-
-          # Acquire DHCP leases.
-          for iface in ${dhcpIfShellExpr}; do
-            echo "acquiring IP address via DHCP on $iface..."
-            udhcpc --quit --now -i $iface -O staticroutes --script ${udhcpcScript} ${udhcpcArgs} && hasNetwork=1
-          done
-        fi
+        # Acquire DHCP leases.
+        for iface in ${dhcpIfShellExpr}; do
+          echo "acquiring IP address via DHCP on $iface..."
+          udhcpc --quit --now -i $iface -O staticroutes --script ${udhcpcScript} ${udhcpcArgs}
+        done
       ''
 
-      + ''
-        if [ -n "$hasNetwork" ]; then
-          echo "networking is up!"
-          ${cfg.postCommands}
-        fi
-      '');
+      + cfg.postCommands);
 
     boot.initrd.postMountCommands = mkIf cfg.flushBeforeStage2 ''
       for iface in $ifaces; do

From 76e748889ca744237e9d68ad5e3963926be2f211 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 8 Feb 2020 14:58:18 +0000
Subject: [PATCH 0159/4636] kdevelop-pg-qt: 2.2.0 -> 2.2.1

---
 pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix
index 0ed4fe0aaad7..b33153138130 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "kdevelop-pg-qt";
-  version = "2.2.0";
+  version = "2.2.1";
 
 in
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
-    sha256 = "01a4y98hf8zlrdf5l8f4izqh4n3j3xs93j8ny5a3f4z50nb6hxq7";
+    sha256 = "0ay6m6j6zgrbcm48f14bass83bk4w5qnx76xihc05p69i9w32ff1";
   };
 
   nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ];

From 5c8356105c6bea5869bb3cd989843281f318d27e Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Sun, 9 Feb 2020 01:12:17 +0300
Subject: [PATCH 0160/4636] opencc: enable on darwin

---
 pkgs/tools/text/opencc/default.nix | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix
index 8b6ada09ebe7..07990aca92ad 100644
--- a/pkgs/tools/text/opencc/default.nix
+++ b/pkgs/tools/text/opencc/default.nix
@@ -1,24 +1,30 @@
-{ stdenv, fetchurl, cmake, python }:
+{ stdenv, fetchFromGitHub, cmake, python }:
 
-stdenv.mkDerivation {
-  name = "opencc-1.0.5";
-  src = fetchurl {
-    url = "https://github.com/BYVoid/OpenCC/archive/ver.1.0.5.tar.gz";
-    sha256 = "1ce1649ba280cfc88bb76e740be5f54b29a9c034400c97a3ae211c37d7030705";
+stdenv.mkDerivation rec {
+  pname = "opencc";
+  version = "1.0.5";
+
+  src = fetchFromGitHub {
+    owner = "BYVoid";
+    repo = "OpenCC";
+    rev = "ver.${version}";
+    sha256 = "1pv5md225qwhbn8ql932zdg6gh1qlx3paiajaks8gfsa07yzvhr4";
   };
 
-  buildInputs = [ cmake python ];
+  nativeBuildInputs = [ cmake python ];
 
-  preBuild = ''
-    # let intermediate tools find intermediate library
+  # let intermediate tools find intermediate library
+  preBuild = stdenv.lib.optionalString stdenv.isLinux ''
     export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$(pwd)/src
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$(pwd)/src
   '';
 
   # Parallel building occasionaly fails with: Error copying file "/tmp/nix-build-opencc-1.0.5.drv-0/OpenCC-ver.1.0.5/build/src/libopencc.so.1.0.0" to "/tmp/nix-build-opencc-1.0.5.drv-0/OpenCC-ver.1.0.5/build/src/tools".
   enableParallelBuilding = false;
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/BYVoid/OpenCC;
+    homepage = "https://github.com/BYVoid/OpenCC";
     license = licenses.asl20;
     description = "A project for conversion between Traditional and Simplified Chinese";
     longDescription = ''
@@ -27,7 +33,7 @@ stdenv.mkDerivation {
       phrase-level conversion, variant conversion and regional idioms among Mainland China,
       Taiwan and Hong kong.
     '';
-    maintainers = [ maintainers.sifmelcara ];
-    platforms = platforms.linux;
+    maintainers = with maintainers; [ sifmelcara ];
+    platforms = with platforms; linux ++ darwin;
   };
 }

From caff18340206c4e5c466c16a534f13505d1098ee Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 2 Feb 2020 16:56:11 -0500
Subject: [PATCH 0161/4636] fetchzip, fetchgit: cleanup handling of optional
 features and whitespace

No intended functional difference, just trying to polish to make this easier to
extend and more aligned with other nix conventions.
---
 pkgs/build-support/fetchgit/default.nix      |  2 +-
 pkgs/build-support/fetchgit/nix-prefetch-git | 25 +++++----
 pkgs/build-support/fetchzip/default.nix      | 57 ++++++++++----------
 3 files changed, 41 insertions(+), 43 deletions(-)

diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 0405951a9e40..ee662154cc7b 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -1,4 +1,4 @@
-{stdenvNoCC, git, cacert}: let
+{ stdenvNoCC, git, cacert }: let
   urlToName = url: rev: let
     inherit (stdenvNoCC.lib) removeSuffix splitString last;
     base = last (splitString ":" (baseNameOf (removeSuffix "/" url)));
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 8020ba46f3f1..a211b6a31e6f 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -1,6 +1,5 @@
-#! /usr/bin/env bash
-
-set -e -o pipefail
+#!/usr/bin/env bash
+set -eo pipefail
 
 url=
 rev=
@@ -38,17 +37,17 @@ usage(){
     echo  >&2 "syntax: nix-prefetch-git [options] [URL [REVISION [EXPECTED-HASH]]]
 
 Options:
-      --out path      Path where the output would be stored.
-      --url url       Any url understood by 'git clone'.
-      --rev ref       Any sha1 or references (such as refs/heads/master)
-      --hash h        Expected hash.
-      --branch-name   Branch name to check out into
-      --deepClone     Clone the entire repository.
-      --no-deepClone  Make a shallow clone of just the required ref.
-      --leave-dotGit  Keep the .git directories.
+      --out path         Path where the output would be stored.
+      --url url          Any url understood by 'git clone'.
+      --rev ref          Any sha1 or references (such as refs/heads/master).
+      --hash h           Expected hash.
+      --branch-name      Branch name to check out into.
+      --deepClone        Clone the entire repository.
+      --no-deepClone     Make a shallow clone of just the required ref.
+      --leave-dotGit     Keep the .git directories.
       --fetch-submodules Fetch submodules.
-      --builder       Clone as fetchgit does, but url, rev, and out option are mandatory.
-      --quiet         Only print the final json summary.
+      --builder          Clone as fetchgit does, but url, rev, and out option are mandatory.
+      --quiet            Only print the final json summary.
 "
     exit 1
 }
diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix
index c61df8ceb001..9d829e43ccbc 100644
--- a/pkgs/build-support/fetchzip/default.nix
+++ b/pkgs/build-support/fetchzip/default.nix
@@ -5,47 +5,46 @@
 # (e.g. due to minor changes in the compression algorithm, or changes
 # in timestamps).
 
-{ fetchurl, unzip }:
+{ lib, fetchurl, unzip }:
 
-{ # Optionally move the contents of the unpacked tree up one level.
-  stripRoot ? true
+{ name ? "source"
 , url
+  # Optionally move the contents of the unpacked tree up one level.
+, stripRoot ? true
 , extraPostFetch ? ""
-, name ? "source"
 , ... } @ args:
 
 (fetchurl ({
   inherit name;
 
   recursiveHash = true;
-
   downloadToTemp = true;
 
-  postFetch =
-    ''
-      unpackDir="$TMPDIR/unpack"
-      mkdir "$unpackDir"
-      cd "$unpackDir"
+  postFetch = ''
+    unpackDir="$TMPDIR/unpack"
+    mkdir "$unpackDir"
+    cd "$unpackDir"
+
+    renamed="$TMPDIR/${baseNameOf url}"
+    mv "$downloadedFile" "$renamed"
+    unpackFile "$renamed"
+    result=$unpackDir
+  ''
+  # Most src disted tarballs have a parent directory like foo-1.2.3/ to strip
+  + lib.optionalString stripRoot ''
+    if [ $(ls "$unpackDir" | wc -l) != 1 ]; then
+      echo "error: zip file must contain a single file or directory."
+      echo "hint: Pass stripRoot=false; to fetchzip to assume flat list of files."
+      exit 1
+    fi
+    fn=$(cd "$unpackDir" && echo *)
+    result="$unpackDir/$fn"
+  '' + ''
+    mkdir $out
+    mv "$result" "$out"
+  ''
+  + extraPostFetch;
 
-      renamed="$TMPDIR/${baseNameOf url}"
-      mv "$downloadedFile" "$renamed"
-      unpackFile "$renamed"
-    ''
-    + (if stripRoot then ''
-      if [ $(ls "$unpackDir" | wc -l) != 1 ]; then
-        echo "error: zip file must contain a single file or directory."
-        echo "hint: Pass stripRoot=false; to fetchzip to assume flat list of files."
-        exit 1
-      fi
-      fn=$(cd "$unpackDir" && echo *)
-      if [ -f "$unpackDir/$fn" ]; then
-        mkdir $out
-      fi
-      mv "$unpackDir/$fn" "$out"
-    '' else ''
-      mv "$unpackDir" "$out"
-    '') #*/
-    + extraPostFetch;
 } // removeAttrs args [ "stripRoot" "extraPostFetch" ])).overrideAttrs (x: {
   # Hackety-hack: we actually need unzip hooks, too
   nativeBuildInputs = x.nativeBuildInputs ++ [ unzip ];

From b6cd45699a5258eb38d9ac40f3477e112ff22288 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 9 Feb 2020 05:14:01 +0000
Subject: [PATCH 0162/4636] poedit: 2.2.4 -> 2.3

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

diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix
index 4d29c380483d..e0e7f5d957da 100644
--- a/pkgs/tools/text/poedit/default.nix
+++ b/pkgs/tools/text/poedit/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "poedit";
-  version = "2.2.4";
+  version = "2.3";
 
   src = fetchurl {
     url = "https://github.com/vslavik/poedit/archive/v${version}-oss.tar.gz";
-    sha256 = "1k5ql41g635z01s1i9bchvf72ynwsvg54gs3s40f07f9dihb23gd";
+    sha256 = "0smvdpvb4hdhqc327pcj29bzjqbzgad6mr7r5pg81461fi2r2myw";
   };
 
   nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook 

From 393ad5c32227bc6ee67c5f643d5aa9411230454a Mon Sep 17 00:00:00 2001
From: koral <chahine.moreau@gmail.com>
Date: Sun, 9 Feb 2020 08:58:06 +0100
Subject: [PATCH 0163/4636] clipman: 1.2.0 -> unstable-2019-12-10

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

diff --git a/pkgs/tools/misc/clipman/default.nix b/pkgs/tools/misc/clipman/default.nix
index 861d384f1f82..b8873e2bcac2 100644
--- a/pkgs/tools/misc/clipman/default.nix
+++ b/pkgs/tools/misc/clipman/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "clipman";
-  version = "1.2.0";
+  version = "unstable-2019-12-10";
 
   src = fetchFromGitHub {
     owner = "yory8";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "0266qb8p5l8j25nn51ajsbiij8bh5r7ywphf2x1l7wfhbzgxz12d";
+    rev = "c57453be90bb4496f67275db8c0beb2116a6ce14";
+    sha256 = "0zvqk3gcpx67dsn7qr0p9bgjp0sljl3yrlsfbqzrbrmj2lwr98ys";
   };
 
   modSha256 = "0aw0ng8pk8qzn1iv79iw0v9zr8xdc8p9xnigr3ij86038f7aqdhv";

From 4988805287a8fb0ea74860309f5fb4a4bbb059b9 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 9 Feb 2020 11:23:11 -0500
Subject: [PATCH 0164/4636] doc: consistent formatting on python manual section

No material changes to docs, but trying to sanitize them for consistent
readability prior to looking at #75837.

- Use `*` for lists instead of `-`. I have no opinion one way or the other, but
  the latter was only used in 1-2 places.
- Pad the code blocks with whitespace.
- Wrap to 80 characters, except for a few 1-liners that were only slightly over.
---
 doc/languages-frameworks/python.section.md | 360 ++++++++++++++-------
 1 file changed, 237 insertions(+), 123 deletions(-)

diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index e183bd8160da..2f66bf6d6105 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -72,8 +72,9 @@ Now you can use the Python interpreter, as well as the extra packages (`numpy`,
 
 ##### Environment defined in `~/.config/nixpkgs/config.nix`
 
-If you prefer to, you could also add the environment as a package override to the Nixpkgs set, e.g.
-using `config.nix`,
+If you prefer you could also add the environment as a package override to the
+Nixpkgs set, e.g. using `config.nix`,
+
 ```nix
 { # ...
 
@@ -83,15 +84,18 @@ using `config.nix`,
 }
 ```
 and install it in your profile with
+
 ```shell
 nix-env -iA nixpkgs.myEnv
 ```
+
 The environment is is installed by referring to the attribute, and considering
 the `nixpkgs` channel was used.
 
 ##### Environment defined in `/etc/nixos/configuration.nix`
 
-For the sake of completeness, here's another example how to install the environment system-wide.
+For the sake of completeness, here's another example how to install the
+environment system-wide.
 
 ```nix
 { # ...
@@ -109,40 +113,56 @@ into a profile. For development you may need to use multiple environments.
 `nix-shell` gives the possibility to temporarily load another environment, akin
 to `virtualenv`.
 
-There are two methods for loading a shell with Python packages. The first and recommended method
-is to create an environment with `python.buildEnv` or `python.withPackages` and load that. E.g.
+There are two methods for loading a shell with Python packages. The first and
+recommended method is to create an environment with `python.buildEnv` or
+`python.withPackages` and load that. E.g.
+
 ```sh
 $ nix-shell -p 'python35.withPackages(ps: with ps; [ numpy toolz ])'
 ```
+
 opens a shell from which you can launch the interpreter
+
 ```sh
 [nix-shell:~] python3
 ```
-The other method, which is not recommended, does not create an environment and requires you to list the packages directly,
+
+The other method, which is not recommended, does not create an environment and
+requires you to list the packages directly,
 
 ```sh
 $ nix-shell -p python35.pkgs.numpy python35.pkgs.toolz
 ```
-Again, it is possible to launch the interpreter from the shell.
-The Python interpreter has the attribute `pkgs` which contains all Python libraries for that specific interpreter.
+
+Again, it is possible to launch the interpreter from the shell. The Python
+interpreter has the attribute `pkgs` which contains all Python libraries for
+that specific interpreter.
 
 ##### Load environment from `.nix` expression
 As explained in the Nix manual, `nix-shell` can also load an
 expression from a `.nix` file. Say we want to have Python 3.5, `numpy`
 and `toolz`, like before, in an environment. Consider a `shell.nix` file
 with
+
 ```nix
 with import <nixpkgs> {};
 
 (python35.withPackages (ps: [ps.numpy ps.toolz])).env
 ```
+
 Executing `nix-shell` gives you again a Nix shell from which you can run Python.
 
 What's happening here?
 
-1. We begin with importing the Nix Packages collections. `import <nixpkgs>` imports the `<nixpkgs>` function, `{}` calls it and the `with` statement brings all attributes of `nixpkgs` in the local scope. These attributes form the main package set.
+1. We begin with importing the Nix Packages collections. `import <nixpkgs>`
+   imports the `<nixpkgs>` function, `{}` calls it and the `with` statement
+   brings all attributes of `nixpkgs` in the local scope. These attributes form
+   the main package set.
 2. Then we create a Python 3.5 environment with the `withPackages` function.
-3. The `withPackages` function expects us to provide a function as an argument that takes the set of all python packages and returns a list of packages to include in the environment. Here, we select the packages `numpy` and `toolz` from the package set.
+3. The `withPackages` function expects us to provide a function as an argument
+   that takes the set of all python packages and returns a list of packages to
+   include in the environment. Here, we select the packages `numpy` and `toolz`
+   from the package set.
 
 To combine this with `mkShell` you can:
 
@@ -166,20 +186,23 @@ in mkShell {
 A convenient option with `nix-shell` is the `--run`
 option, with which you can execute a command in the `nix-shell`. We can
 e.g. directly open a Python shell
+
 ```sh
 $ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3"
 ```
+
 or run a script
+
 ```sh
 $ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3 myscript.py"
 ```
 
 ##### `nix-shell` as shebang
-In fact, for the second use case, there is a more convenient method. You can
-add a [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) to your script
+In fact, for the second use case, there is a more convenient method. You can add
+a [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) to your script
 specifying which dependencies `nix-shell` needs. With the following shebang, you
-can just execute `./myscript.py`, and it will make available all dependencies and
-run the script in the `python3` shell.
+can just execute `./myscript.py`, and it will make available all dependencies
+and run the script in the `python3` shell.
 
 ```py
 #! /usr/bin/env nix-shell
@@ -270,6 +293,7 @@ with import <nixpkgs> {};
   in python35.withPackages (ps: [ps.numpy my_toolz])
 ).env
 ```
+
 Executing `nix-shell` will result in an environment in which you can use
 Python 3.5 and the `toolz` package. As you can see we had to explicitly mention
 for which Python version we want to build a package.
@@ -355,12 +379,12 @@ buildPythonPackage rec {
 In this example `lxml` and Nix are able to work out exactly where the relevant
 files of the dependencies are. This is not always the case.
 
-The example below shows bindings to The Fastest Fourier Transform in the West, commonly known as
-FFTW. On Nix we have separate packages of FFTW for the different types of floats
-(`"single"`, `"double"`, `"long-double"`). The bindings need all three types,
-and therefore we add all three as `buildInputs`. The bindings don't expect to
-find each of them in a different folder, and therefore we have to set `LDFLAGS`
-and `CFLAGS`.
+The example below shows bindings to The Fastest Fourier Transform in the West,
+commonly known as FFTW. On Nix we have separate packages of FFTW for the
+different types of floats (`"single"`, `"double"`, `"long-double"`). The
+bindings need all three types, and therefore we add all three as `buildInputs`.
+The bindings don't expect to find each of them in a different folder, and
+therefore we have to set `LDFLAGS` and `CFLAGS`.
 
 ```nix
 { lib, pkgs, buildPythonPackage, fetchPypi, numpy, scipy }:
@@ -404,17 +428,18 @@ instead of installing the package this command creates a special link to the pro
 That way, you can run updated code without having to reinstall after each and every change you make.
 Development mode is also available. Let's see how you can use it.
 
-In the previous Nix expression the source was fetched from an url. We can also refer to a local source instead using
-`src = ./path/to/source/tree;`
+In the previous Nix expression the source was fetched from an url. We can also
+refer to a local source instead using `src = ./path/to/source/tree;`
 
 If we create a `shell.nix` file which calls `buildPythonPackage`, and if `src`
 is a local source, and if the local source has a `setup.py`, then development
 mode is activated.
 
-In the following example we create a simple environment that
-has a Python 3.5 version of our package in it, as well as its dependencies and
-other packages we like to have in the environment, all specified with `propagatedBuildInputs`.
-Indeed, we can just add any package we like to have in our environment to `propagatedBuildInputs`.
+In the following example we create a simple environment that has a Python 3.5
+version of our package in it, as well as its dependencies and other packages we
+like to have in the environment, all specified with `propagatedBuildInputs`.
+Indeed, we can just add any package we like to have in our environment to
+`propagatedBuildInputs`.
 
 ```nix
 with import <nixpkgs> {};
@@ -427,7 +452,8 @@ buildPythonPackage rec {
 }
 ```
 
-It is important to note that due to how development mode is implemented on Nix it is not possible to have multiple packages simultaneously in development mode.
+It is important to note that due to how development mode is implemented on Nix
+it is not possible to have multiple packages simultaneously in development mode.
 
 
 ### Organising your packages
@@ -497,13 +523,13 @@ and in this case the `python35` interpreter is automatically used.
 ### Interpreters
 
 Versions 2.7, 3.5, 3.6, 3.7 and 3.8 of the CPython interpreter are available as
-respectively `python27`, `python35`, `python36`, `python37` and `python38`. The aliases
-`python2` and `python3` correspond to respectively `python27` and
+respectively `python27`, `python35`, `python36`, `python37` and `python38`. The
+aliases `python2` and `python3` correspond to respectively `python27` and
 `python37`. The default interpreter, `python`, maps to `python2`. The PyPy
 interpreters compatible with Python 2.7 and 3 are available as `pypy27` and
-`pypy3`, with aliases `pypy2` mapping to `pypy27` and `pypy` mapping to
-`pypy2`. The Nix expressions for the interpreters can be
-found in `pkgs/development/interpreters/python`.
+`pypy3`, with aliases `pypy2` mapping to `pypy27` and `pypy` mapping to `pypy2`.
+The Nix expressions for the interpreters can be found in
+`pkgs/development/interpreters/python`.
 
 All packages depending on any Python interpreter get appended
 `out/{python.sitePackages}` to `$PYTHONPATH` if such directory
@@ -532,9 +558,10 @@ Python libraries and applications that use `setuptools` or
 `buildPythonApplication` functions. These two functions also support installing a `wheel`.
 
 All Python packages reside in `pkgs/top-level/python-packages.nix` and all
-applications elsewhere. In case a package is used as both a library and an application,
-then the package should be in `pkgs/top-level/python-packages.nix` since only those packages are made
-available for all interpreter versions. The preferred location for library expressions is in
+applications elsewhere. In case a package is used as both a library and an
+application, then the package should be in `pkgs/top-level/python-packages.nix`
+since only those packages are made available for all interpreter versions. The
+preferred location for library expressions is in
 `pkgs/development/python-modules`. It is important that these packages are
 called from `pkgs/top-level/python-packages.nix` and not elsewhere, to guarantee
 the right version of the package is built.
@@ -562,6 +589,7 @@ The `buildPythonPackage` function is implemented in
 using setup hooks.
 
 The following is an example:
+
 ```nix
 { lib, buildPythonPackage, fetchPypi, hypothesis, setuptools_scm, attrs, py, setuptools, six, pluggy }:
 
@@ -608,38 +636,67 @@ as the interpreter unless overridden otherwise.
 
 ##### `buildPythonPackage` parameters
 
-All parameters from `stdenv.mkDerivation` function are still supported. The following are specific to `buildPythonPackage`:
+All parameters from `stdenv.mkDerivation` function are still supported. The
+following are specific to `buildPythonPackage`:
 
-* `catchConflicts ? true`: If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`.
-* `disabled` ? false: If `true`, package is not built for the particular Python interpreter version.
+* `catchConflicts ? true`: If `true`, abort package build if a package name
+  appears more than once in dependency tree. Default is `true`.
+* `disabled` ? false: If `true`, package is not built for the particular Python
+  interpreter version.
 * `dontWrapPythonPrograms ? false`: Skip wrapping of python programs.
-* `permitUserSite ? false`: Skip setting the `PYTHONNOUSERSITE` environment variable in wrapped programs.
-* `installFlags ? []`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]`.
-* `format ? "setuptools"`: Format of the source. Valid options are `"setuptools"`, `"pyproject"`, `"flit"`, `"wheel"`, and `"other"`. `"setuptools"` is for when the source has a `setup.py` and `setuptools` is used to build a wheel, `flit`, in case `flit` should be used to build a wheel, and `wheel` in case a wheel is provided. Use `other` when a custom `buildPhase` and/or `installPhase` is needed.
-* `makeWrapperArgs ? []`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`.
-* `namePrefix`: Prepends text to `${name}` parameter. In case of libraries, this defaults to `"python3.5-"` for Python 3.5, etc., and in case of applications to `""`.
-* `pythonPath ? []`: List of packages to be added into `$PYTHONPATH`. Packages in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`).
+* `permitUserSite ? false`: Skip setting the `PYTHONNOUSERSITE` environment
+  variable in wrapped programs.
+* `installFlags ? []`: A list of strings. Arguments to be passed to `pip
+  install`. To pass options to `python setup.py install`, use
+  `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]`.
+* `format ? "setuptools"`: Format of the source. Valid options are
+  `"setuptools"`, `"pyproject"`, `"flit"`, `"wheel"`, and `"other"`.
+  `"setuptools"` is for when the source has a `setup.py` and `setuptools` is
+  used to build a wheel, `flit`, in case `flit` should be used to build a wheel,
+  and `wheel` in case a wheel is provided. Use `other` when a custom
+  `buildPhase` and/or `installPhase` is needed.
+* `makeWrapperArgs ? []`: A list of strings. Arguments to be passed to
+  `makeWrapper`, which wraps generated binaries. By default, the arguments to
+  `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling
+  the binary. Additional arguments here can allow a developer to set environment
+  variables which will be available when the binary is run. For example,
+  `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`.
+* `namePrefix`: Prepends text to `${name}` parameter. In case of libraries, this
+  defaults to `"python3.5-"` for Python 3.5, etc., and in case of applications
+  to `""`.
+* `pythonPath ? []`: List of packages to be added into `$PYTHONPATH`. Packages
+  in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`).
 * `preShellHook`: Hook to execute commands before `shellHook`.
 * `postShellHook`: Hook to execute commands after `shellHook`.
-* `removeBinByteCode ? true`: Remove bytecode from `/bin`. Bytecode is only created when the filenames end with `.py`.
+* `removeBinByteCode ? true`: Remove bytecode from `/bin`. Bytecode is only
+  created when the filenames end with `.py`.
 * `setupPyGlobalFlags ? []`: List of flags passed to `setup.py` command.
 * `setupPyBuildFlags ? []`: List of flags passed to `setup.py build_ext` command.
 
-The `stdenv.mkDerivation` function accepts various parameters for describing build inputs (see "Specifying dependencies"). The following are of special
-interest for Python packages, either because these are primarily used, or because their behaviour is different:
+The `stdenv.mkDerivation` function accepts various parameters for describing
+build inputs (see "Specifying dependencies"). The following are of special
+interest for Python packages, either because these are primarily used, or
+because their behaviour is different:
 
-* `nativeBuildInputs ? []`: Build-time only dependencies. Typically executables as well as the items listed in `setup_requires`.
-* `buildInputs ? []`: Build and/or run-time dependencies that need to be be compiled for the host machine. Typically non-Python libraries which are being linked.
-* `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These are added to `nativeBuildInputs` when `doCheck = true`. Items listed in `tests_require` go here.
-* `propagatedBuildInputs ? []`: Aside from propagating dependencies, `buildPythonPackage` also injects code into and wraps executables with the paths included in this list. Items listed in `install_requires` go here.
+* `nativeBuildInputs ? []`: Build-time only dependencies. Typically executables
+  as well as the items listed in `setup_requires`.
+* `buildInputs ? []`: Build and/or run-time dependencies that need to be be
+  compiled for the host machine. Typically non-Python libraries which are being
+  linked.
+* `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These
+  are added to `nativeBuildInputs` when `doCheck = true`. Items listed in
+  `tests_require` go here.
+* `propagatedBuildInputs ? []`: Aside from propagating dependencies,
+  `buildPythonPackage` also injects code into and wraps executables with the
+  paths included in this list. Items listed in `install_requires` go here.
 
 ##### Overriding Python packages
 
-The `buildPythonPackage` function has a `overridePythonAttrs` method that
-can be used to override the package. In the following example we create an
-environment where we have the `blaze` package using an older version of `pandas`.
-We override first the Python interpreter and pass
-`packageOverrides` which contains the overrides for packages in the package set.
+The `buildPythonPackage` function has a `overridePythonAttrs` method that can be
+used to override the package. In the following example we create an environment
+where we have the `blaze` package using an older version of `pandas`. We
+override first the Python interpreter and pass `packageOverrides` which contains
+the overrides for packages in the package set.
 
 ```nix
 with import <nixpkgs> {};
@@ -725,15 +782,18 @@ youtube-dl = with pythonPackages; toPythonApplication youtube-dl;
 #### `toPythonModule` function
 
 In some cases, such as bindings, a package is created using
-`stdenv.mkDerivation` and added as attribute in `all-packages.nix`.
-The Python bindings should be made available from `python-packages.nix`.
-The `toPythonModule` function takes a derivation and makes certain Python-specific modifications.
+`stdenv.mkDerivation` and added as attribute in `all-packages.nix`. The Python
+bindings should be made available from `python-packages.nix`. The
+`toPythonModule` function takes a derivation and makes certain Python-specific
+modifications.
+
 ```nix
 opencv = toPythonModule (pkgs.opencv.override {
   enablePython = true;
   pythonPackages = self;
 });
 ```
+
 Do pay attention to passing in the right Python version!
 
 #### `python.buildEnv` function
@@ -741,6 +801,7 @@ Do pay attention to passing in the right Python version!
 Python environments can be created using the low-level `pkgs.buildEnv` function.
 This example shows how to create an environment that has the Pyramid Web Framework.
 Saving the following as `default.nix`
+
 ```nix
 with import <nixpkgs> {};
 
@@ -751,6 +812,7 @@ python.buildEnv.override {
 ```
 
 and running `nix-build` will create
+
 ```
 /nix/store/cf1xhjwzmdki7fasgr4kz6di72ykicl5-python-2.7.8-env
 ```
@@ -760,6 +822,7 @@ with wrapped binaries in `bin/`.
 You can also use the `env` attribute to create local environments with needed
 packages installed. This is somewhat comparable to `virtualenv`. For example,
 running `nix-shell` with the following `shell.nix`
+
 ```nix
 with import <nixpkgs> {};
 
@@ -777,7 +840,8 @@ specified packages in its path.
 * `extraLibs`: List of packages installed inside the environment.
 * `postBuild`: Shell command executed after the build of environment.
 * `ignoreCollisions`: Ignore file collisions inside the environment (default is `false`).
-* `permitUserSite`: Skip setting the `PYTHONNOUSERSITE` environment variable in wrapped binaries in the environment.
+* `permitUserSite`: Skip setting the `PYTHONNOUSERSITE` environment variable in
+  wrapped binaries in the environment.
 
 #### `python.withPackages` function
 
@@ -785,15 +849,17 @@ The `python.withPackages` function provides a simpler interface to the `python.b
 It takes a function as an argument that is passed the set of python packages and returns the list
 of the packages to be included in the environment. Using the `withPackages` function, the previous
 example for the Pyramid Web Framework environment can be written like this:
+
 ```nix
 with import <nixpkgs> {};
 
 python.withPackages (ps: [ps.pyramid])
 ```
 
-`withPackages` passes the correct package set for the specific interpreter version as an
-argument to the function. In the above example, `ps` equals `pythonPackages`.
-But you can also easily switch to using python3:
+`withPackages` passes the correct package set for the specific interpreter
+version as an argument to the function. In the above example, `ps` equals
+`pythonPackages`. But you can also easily switch to using python3:
+
 ```nix
 with import <nixpkgs> {};
 
@@ -802,30 +868,35 @@ python3.withPackages (ps: [ps.pyramid])
 
 Now, `ps` is set to `python3Packages`, matching the version of the interpreter.
 
-As `python.withPackages` simply uses `python.buildEnv` under the hood, it also supports the `env`
-attribute. The `shell.nix` file from the previous section can thus be also written like this:
+As `python.withPackages` simply uses `python.buildEnv` under the hood, it also
+supports the `env` attribute. The `shell.nix` file from the previous section can
+thus be also written like this:
+
 ```nix
 with import <nixpkgs> {};
 
 (python36.withPackages (ps: [ps.numpy ps.requests])).env
 ```
 
-In contrast to `python.buildEnv`, `python.withPackages` does not support the more advanced options
-such as `ignoreCollisions = true` or `postBuild`. If you need them, you have to use `python.buildEnv`.
+In contrast to `python.buildEnv`, `python.withPackages` does not support the
+more advanced options such as `ignoreCollisions = true` or `postBuild`. If you
+need them, you have to use `python.buildEnv`.
 
-Python 2 namespace packages may provide `__init__.py` that collide. In that case `python.buildEnv`
-should be used with `ignoreCollisions = true`.
+Python 2 namespace packages may provide `__init__.py` that collide. In that case
+`python.buildEnv` should be used with `ignoreCollisions = true`.
 
 #### Setup hooks
 
-The following are setup hooks specifically for Python packages. Most of these are
-used in `buildPythonPackage`.
+The following are setup hooks specifically for Python packages. Most of these
+are used in `buildPythonPackage`.
 
-- `eggUnpackhook` to move an egg to the correct folder so it can be installed with the `eggInstallHook`
+- `eggUnpackhook` to move an egg to the correct folder so it can be installed
+  with the `eggInstallHook`
 - `eggBuildHook` to skip building for eggs.
 - `eggInstallHook` to install eggs.
 - `flitBuildHook` to build a wheel using `flit`.
-- `pipBuildHook` to build a wheel using `pip` and PEP 517. Note a build system (e.g. `setuptools` or `flit`) should still be added as `nativeBuildInput`.
+- `pipBuildHook` to build a wheel using `pip` and PEP 517. Note a build system
+  (e.g. `setuptools` or `flit`) should still be added as `nativeBuildInput`.
 - `pipInstallHook` to install wheels.
 - `pytestCheckHook` to run tests with `pytest`.
 - `pythonCatchConflictsHook` to check whether a Python package is not already existing.
@@ -833,8 +904,10 @@ used in `buildPythonPackage`.
 - `pythonRemoveBinBytecode` to remove bytecode from the `/bin` folder.
 - `setuptoolsBuildHook` to build a wheel using `setuptools`.
 - `setuptoolsCheckHook` to run tests with `python setup.py test`.
-- `venvShellHook` to source a Python 3 `venv` at the `venvDir` location. A `venv` is created if it does not yet exist.
-- `wheelUnpackHook` to move a wheel to the correct folder so it can be installed with the `pipInstallHook`.
+- `venvShellHook` to source a Python 3 `venv` at the `venvDir` location. A
+  `venv` is created if it does not yet exist.
+- `wheelUnpackHook` to move a wheel to the correct folder so it can be installed
+  with the `pipInstallHook`.
 
 ### Development mode
 
@@ -856,11 +929,11 @@ pythonPackages.buildPythonPackage {
 }
 ```
 
-Running `nix-shell` with no arguments should give you
-the environment in which the package would be built with
-`nix-build`.
+Running `nix-shell` with no arguments should give you the environment in which
+the package would be built with `nix-build`.
 
 Shortcut to setup environments with C headers/libraries and python packages:
+
 ```shell
 nix-shell -p pythonPackages.pyramid zlib libjpeg git
 ```
@@ -872,19 +945,22 @@ Note: There is a boolean value `lib.inNixShell` set to `true` if nix-shell is in
 Packages inside nixpkgs are written by hand. However many tools exist in
 community to help save time. No tool is preferred at the moment.
 
-- [pypi2nix](https://github.com/nix-community/pypi2nix): Generate Nix expressions for your Python project. Note that [sharing derivations from pypi2nix with nixpkgs is possible but not encouraged](https://github.com/nix-community/pypi2nix/issues/222#issuecomment-443497376).
+- [pypi2nix](https://github.com/nix-community/pypi2nix): Generate Nix
+  expressions for your Python project. Note that [sharing derivations from
+  pypi2nix with nixpkgs is possible but not
+  encouraged](https://github.com/nix-community/pypi2nix/issues/222#issuecomment-443497376).
 - [python2nix](https://github.com/proger/python2nix) by Vladimir Kirillov.
 
 ### Deterministic builds
 
-The Python interpreters are now built deterministically.
-Minor modifications had to be made to the interpreters in order to generate
-deterministic bytecode. This has security implications and is relevant for
-those using Python in a `nix-shell`.
+The Python interpreters are now built deterministically. Minor modifications had
+to be made to the interpreters in order to generate deterministic bytecode. This
+has security implications and is relevant for those using Python in a
+`nix-shell`.
 
-When the environment variable `DETERMINISTIC_BUILD` is set, all bytecode will have timestamp 1.
-The `buildPythonPackage` function sets `DETERMINISTIC_BUILD=1` and
-[PYTHONHASHSEED=0](https://docs.python.org/3.5/using/cmdline.html#envvar-PYTHONHASHSEED).
+When the environment variable `DETERMINISTIC_BUILD` is set, all bytecode will
+have timestamp 1. The `buildPythonPackage` function sets `DETERMINISTIC_BUILD=1`
+and [PYTHONHASHSEED=0](https://docs.python.org/3.5/using/cmdline.html#envvar-PYTHONHASHSEED).
 Both are also exported in `nix-shell`.
 
 
@@ -899,9 +975,10 @@ example of such a situation is when `py.test` is used.
 
 #### Common issues
 
-- Non-working tests can often be deselected. By default `buildPythonPackage` runs `python setup.py test`.
-  Most python modules follows the standard test protocol where the pytest runner can be used instead.
-  `py.test` supports a `-k` parameter to ignore test methods or classes:
+* Non-working tests can often be deselected. By default `buildPythonPackage`
+  runs `python setup.py test`. Most python modules follows the standard test
+  protocol where the pytest runner can be used instead. `py.test` supports a
+  `-k` parameter to ignore test methods or classes:
 
   ```nix
   buildPythonPackage {
@@ -913,7 +990,8 @@ example of such a situation is when `py.test` is used.
     '';
   }
   ```
-- Tests that attempt to access `$HOME` can be fixed by using the following work-around before running tests (e.g. `preCheck`): `export HOME=$(mktemp -d)`
+* Tests that attempt to access `$HOME` can be fixed by using the following
+  work-around before running tests (e.g. `preCheck`): `export HOME=$(mktemp -d)`
 
 ## FAQ
 
@@ -925,8 +1003,9 @@ should also be done when packaging `A`.
 
 ### How to override a Python package?
 
-We can override the interpreter and pass `packageOverrides`.
-In the following example we rename the `pandas` package and build it.
+We can override the interpreter and pass `packageOverrides`. In the following
+example we rename the `pandas` package and build it.
+
 ```nix
 with import <nixpkgs> {};
 
@@ -939,14 +1018,16 @@ with import <nixpkgs> {};
 
 in python.withPackages(ps: [ps.pandas])).env
 ```
+
 Using `nix-build` on this expression will build an environment that contains the
 package `pandas` but with the new name `foo`.
 
-All packages in the package set will use the renamed package.
-A typical use case is to switch to another version of a certain package.
-For example, in the Nixpkgs repository we have multiple versions of `django` and `scipy`.
-In the following example we use a different version of `scipy` and create an environment that uses it.
-All packages in the Python package set will now use the updated `scipy` version.
+All packages in the package set will use the renamed package. A typical use case
+is to switch to another version of a certain package. For example, in the
+Nixpkgs repository we have multiple versions of `django` and `scipy`. In the
+following example we use a different version of `scipy` and create an
+environment that uses it. All packages in the Python package set will now use
+the updated `scipy` version.
 
 ```nix
 with import <nixpkgs> {};
@@ -958,10 +1039,13 @@ with import <nixpkgs> {};
   in (pkgs.python35.override {inherit packageOverrides;}).withPackages (ps: [ps.blaze])
 ).env
 ```
+
 The requested package `blaze` depends on `pandas` which itself depends on `scipy`.
 
-If you want the whole of Nixpkgs to use your modifications, then you can use `overlays`
-as explained in this manual. In the following example we build a `inkscape` using a different version of `numpy`.
+If you want the whole of Nixpkgs to use your modifications, then you can use
+`overlays` as explained in this manual. In the following example we build a
+`inkscape` using a different version of `numpy`.
+
 ```nix
 let
   pkgs = import <nixpkgs> {};
@@ -982,19 +1066,28 @@ Executing `python setup.py bdist_wheel` in a `nix-shell `fails with
 ValueError: ZIP does not support timestamps before 1980
 ```
 
-This is because files from the Nix store (which have a timestamp of the UNIX epoch of January 1, 1970) are included in the .ZIP, but .ZIP archives follow the DOS convention of counting timestamps from 1980.
+This is because files from the Nix store (which have a timestamp of the UNIX
+epoch of January 1, 1970) are included in the .ZIP, but .ZIP archives follow the
+DOS convention of counting timestamps from 1980.
 
-The command `bdist_wheel` reads the `SOURCE_DATE_EPOCH` environment variable, which `nix-shell` sets to 1. Unsetting this variable or giving it a value corresponding to 1980 or later enables building wheels.
+The command `bdist_wheel` reads the `SOURCE_DATE_EPOCH` environment variable,
+which `nix-shell` sets to 1. Unsetting this variable or giving it a value
+corresponding to 1980 or later enables building wheels.
 
 Use 1980 as timestamp:
+
 ```shell
 nix-shell --run "SOURCE_DATE_EPOCH=315532800 python3 setup.py bdist_wheel"
 ```
+
 or the current time:
+
 ```shell
 nix-shell --run "SOURCE_DATE_EPOCH=$(date +%s) python3 setup.py bdist_wheel"
 ```
+
 or unset `SOURCE_DATE_EPOCH`:
+
 ```shell
 nix-shell --run "unset SOURCE_DATE_EPOCH; python3 setup.py bdist_wheel"
 ```
@@ -1002,13 +1095,18 @@ nix-shell --run "unset SOURCE_DATE_EPOCH; python3 setup.py bdist_wheel"
 ### `install_data` / `data_files` problems
 
 If you get the following error:
+
 ```
 could not create '/nix/store/6l1bvljpy8gazlsw2aw9skwwp4pmvyxw-python-2.7.8/etc':
 Permission denied
 ```
-This is a [known bug](https://github.com/pypa/setuptools/issues/130) in `setuptools`.
-Setuptools `install_data` does not respect `--prefix`. An example of such package using the feature is `pkgs/tools/X11/xpra/default.nix`.
+
+This is a [known bug](https://github.com/pypa/setuptools/issues/130) in
+`setuptools`. Setuptools `install_data` does not respect `--prefix`. An example
+of such package using the feature is `pkgs/tools/X11/xpra/default.nix`.
+
 As workaround install it as an extra `preInstall` step:
+
 ```shell
 ${python.interpreter} setup.py install_data --install-dir=$out --root=$out
 sed -i '/ = data\_files/d' setup.py
@@ -1031,13 +1129,16 @@ function.
 
 ### How to consume python modules using pip in a virtual environment like I am used to on other Operating Systems?
 
-While this approach is not very idiomatic from Nix perspective, it can still be useful when dealing with pre-existing
-projects or in situations where it's not feasible or desired to write derivations for all required dependencies.
+While this approach is not very idiomatic from Nix perspective, it can still be
+useful when dealing with pre-existing projects or in situations where it's not
+feasible or desired to write derivations for all required dependencies.
 
-This is an example of a `default.nix` for a `nix-shell`, which allows to consume a virtual environment created by `venv`,
-and install python modules through `pip` the traditional way.
+This is an example of a `default.nix` for a `nix-shell`, which allows to consume
+a virtual environment created by `venv`, and install python modules through
+`pip` the traditional way.
 
-Create this `default.nix` file, together with a `requirements.txt` and simply execute `nix-shell`.
+Create this `default.nix` file, together with a `requirements.txt` and simply
+execute `nix-shell`.
 
 ```nix
 with import <nixpkgs> { };
@@ -1082,8 +1183,9 @@ in pkgs.mkShell rec {
 }
 ```
 
-In case the supplied venvShellHook is insufficient, or when python 2 support is needed,
-you can define your own shell hook and adapt to your needs like in the following example:
+In case the supplied venvShellHook is insufficient, or when python 2 support is
+needed, you can define your own shell hook and adapt to your needs like in the
+following example:
 
 ```nix
 with import <nixpkgs> { };
@@ -1152,11 +1254,11 @@ If you need to change a package's attribute(s) from `configuration.nix` you coul
 ```
 
 `pythonPackages.zerobin` is now globally overridden. All packages and also the
-`zerobin` NixOS service use the new definition.
-Note that `python-super` refers to the old package set and `python-self`
-to the new, overridden version.
+`zerobin` NixOS service use the new definition. Note that `python-super` refers
+to the old package set and `python-self` to the new, overridden version.
 
-To modify only a Python package set instead of a whole Python derivation, use this snippet:
+To modify only a Python package set instead of a whole Python derivation, use
+this snippet:
 
 ```nix
   myPythonPackages = pythonPackages.override {
@@ -1188,11 +1290,12 @@ self: super: {
 
 ### How to use Intel's MKL with numpy and scipy?
 
-A `site.cfg` is created that configures BLAS based on the `blas` parameter
-of the `numpy` derivation. By passing in `mkl`, `numpy` and packages depending
-on `numpy` will be built with `mkl`.
+A `site.cfg` is created that configures BLAS based on the `blas` parameter of
+the `numpy` derivation. By passing in `mkl`, `numpy` and packages depending on
+`numpy` will be built with `mkl`.
 
 The following is an overlay that configures `numpy` to use `mkl`:
+
 ```nix
 self: super: {
   python37 = super.python37.override {
@@ -1228,10 +1331,21 @@ In a `setup.py` or `setup.cfg` it is common to declare dependencies:
 
 Following rules are desired to be respected:
 
-* Python libraries are called from `python-packages.nix` and packaged with `buildPythonPackage`. The expression of a library should be in `pkgs/development/python-modules/<name>/default.nix`. Libraries in `pkgs/top-level/python-packages.nix` are sorted quasi-alphabetically to avoid merge conflicts.
-* Python applications live outside of `python-packages.nix` and are packaged with `buildPythonApplication`.
+* Python libraries are called from `python-packages.nix` and packaged with
+  `buildPythonPackage`. The expression of a library should be in
+  `pkgs/development/python-modules/<name>/default.nix`. Libraries in
+  `pkgs/top-level/python-packages.nix` are sorted quasi-alphabetically to avoid
+  merge conflicts.
+* Python applications live outside of `python-packages.nix` and are packaged
+  with `buildPythonApplication`.
 * Make sure libraries build for all Python interpreters.
-* By default we enable tests. Make sure the tests are found and, in the case of libraries, are passing for all interpreters. If certain tests fail they can be disabled individually. Try to avoid disabling the tests altogether. In any case, when you disable tests, leave a comment explaining why.
-* Commit names of Python libraries should reflect that they are Python libraries, so write for example `pythonPackages.numpy: 1.11 -> 1.12`.
-* Attribute names in `python-packages.nix` should be normalized according to [PEP 0503](https://www.python.org/dev/peps/pep-0503/#normalized-names).
-  This means that characters should be converted to lowercase and `.` and `_` should be replaced by a single `-` (foo-bar-baz instead of Foo__Bar.baz )
+* By default we enable tests. Make sure the tests are found and, in the case of
+  libraries, are passing for all interpreters. If certain tests fail they can be
+  disabled individually. Try to avoid disabling the tests altogether. In any
+  case, when you disable tests, leave a comment explaining why.
+* Commit names of Python libraries should reflect that they are Python
+  libraries, so write for example `pythonPackages.numpy: 1.11 -> 1.12`.
+* Attribute names in `python-packages.nix` should be normalized according to
+  [PEP 0503](https://www.python.org/dev/peps/pep-0503/#normalized-names). This
+  means that characters should be converted to lowercase and `.` and `_` should
+  be replaced by a single `-` (foo-bar-baz instead of Foo__Bar.baz )

From dcc8e45dab2f77103166226711c221d851acc049 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 9 Feb 2020 19:05:06 +0100
Subject: [PATCH 0165/4636] creep: split outputs in out and otb

---
 pkgs/data/fonts/creep/default.nix | 17 +++++++++++++----
 pkgs/top-level/all-packages.nix   |  3 ++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/data/fonts/creep/default.nix b/pkgs/data/fonts/creep/default.nix
index bad78e3433e1..90b0d19ae99b 100644
--- a/pkgs/data/fonts/creep/default.nix
+++ b/pkgs/data/fonts/creep/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchFromGitHub, fontforge }:
+{ stdenv, fetchFromGitHub, libfaketime
+, fonttosfnt, mkfontscale
+}:
 
 stdenv.mkDerivation rec {
   pname = "creep";
@@ -11,14 +13,21 @@ stdenv.mkDerivation rec {
     sha256 = "0zs21kznh1q883jfdgz74bb63i4lxlv98hj3ipp0wvsi6zw0vs8n";
   };
 
-  nativeBuildInputs = [ fontforge ];
+  nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
 
-  dontBuild = true;
+  buildPhase = ''
+    faketime -f "1970-01-01 00:00:01" fonttosfnt -g 2 -m 2 -o creep.otb creep.bdf
+  '';
 
   installPhase = ''
-    install -D -m644 creep.bdf "$out/usr/share/fonts/misc/creep.bdf"
+    install -D -m644 creep.bdf "$out/share/fonts/misc/creep.bdf"
+    mkfontdir "$out/share/fonts/misc"
+    install -D -m644 creep.otb "$otb/share/fonts/misc/creep.otb"
+    mkfontdir "$otb/share/fonts/misc"
   '';
 
+  outputs = [ "out" "otb" ];
+
   meta = with stdenv.lib; {
     description = "A pretty sweet 4px wide pixel font";
     homepage = https://github.com/romeovs/creep;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0c475483078..ad6111341bfc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17366,7 +17366,8 @@ in
 
   cm_unicode = callPackage ../data/fonts/cm-unicode {};
 
-  creep = callPackage ../data/fonts/creep { };
+  creep = callPackage ../data/fonts/creep
+    { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
 
   crimson = callPackage ../data/fonts/crimson {};
 

From fa9af83e960aa982302bd367d8159f365eaa7471 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 9 Feb 2020 16:21:52 -0500
Subject: [PATCH 0166/4636] testing-python: fix runInMachine

The test script's were unported.
It's unclear whether the preBuild or
postBuild will work as expect, due to
the linting of the test scripts.
---
 nixos/lib/testing-python.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix
index a7f6d7926514..36394c594b2b 100644
--- a/nixos/lib/testing-python.nix
+++ b/nixos/lib/testing-python.nix
@@ -218,12 +218,12 @@ in rec {
       '';
 
       testScript = ''
-        startAll;
-        $client->waitForUnit("multi-user.target");
+        start_all()
+        client.wait_for_unit("multi-user.target")
         ${preBuild}
-        $client->succeed("env -i ${bash}/bin/bash ${buildrunner} /tmp/xchg/saved-env >&2");
+        client.succeed("env -i ${bash}/bin/bash ${buildrunner} /tmp/xchg/saved-env >&2")
         ${postBuild}
-        $client->succeed("sync"); # flush all data before pulling the plug
+        client.succeed("sync") # flush all data before pulling the plug
       '';
 
       vmRunCommand = writeText "vm-run" ''
@@ -274,7 +274,7 @@ in rec {
         machine = client;
         preBuild =
           ''
-            $client->waitForX;
+            client.wait_for_x()
           '';
       } // args);
 

From 88f76812f23a15546ec4455a0ecb9ca735150b18 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 9 Feb 2020 16:23:35 -0500
Subject: [PATCH 0167/4636] testing-python: readd auto displayManager

we import it for the runInMachineWithX
---
 nixos/lib/testing-python.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix
index 36394c594b2b..6663864f1e56 100644
--- a/nixos/lib/testing-python.nix
+++ b/nixos/lib/testing-python.nix
@@ -263,9 +263,12 @@ in rec {
         { ... }:
         {
           inherit require;
+          imports = [
+            ../tests/common/auto.nix
+          ];
           virtualisation.memorySize = 1024;
           services.xserver.enable = true;
-          services.xserver.displayManager.auto.enable = true;
+          test-support.displayManager.auto.enable = true;
           services.xserver.displayManager.defaultSession = "none+icewm";
           services.xserver.windowManager.icewm.enable = true;
         };

From 5507e09618c2e2d4a51377d73eb77b3cb9eef01c Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 9 Feb 2020 16:27:01 -0500
Subject: [PATCH 0168/4636] testing: fix runInMachineWithX

---
 nixos/lib/testing.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index ae8ecd6270ce..68c18eff1d06 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -246,9 +246,12 @@ in rec {
         { ... }:
         {
           inherit require;
+          imports = [
+            ../tests/common/auto.nix
+          ];
           virtualisation.memorySize = 1024;
           services.xserver.enable = true;
-          services.xserver.displayManager.auto.enable = true;
+          test-support.displayManager.auto.enable = true;
           services.xserver.displayManager.defaultSession = "none+icewm";
           services.xserver.windowManager.icewm.enable = true;
         };

From cf5dd2623bb5518257d0edbb50a84093f08086bb Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 24 Oct 2019 14:54:40 +0200
Subject: [PATCH 0169/4636] brightnessctl: Add systemd support

This makes it possible to use brightnessctl without udev rules / suid.
---
 pkgs/misc/brightnessctl/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/brightnessctl/default.nix b/pkgs/misc/brightnessctl/default.nix
index fc4468921290..387216e052f9 100644
--- a/pkgs/misc/brightnessctl/default.nix
+++ b/pkgs/misc/brightnessctl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, coreutils }:
+{ stdenv, fetchFromGitHub, coreutils, pkg-config, systemd }:
 
 stdenv.mkDerivation rec {
   pname = "brightnessctl";
@@ -11,12 +11,17 @@ stdenv.mkDerivation rec {
     sha256 = "0immxc7almmpg80n3bdn834p3nrrz7bspl2syhb04s3lawa5y2lq";
   };
 
-  makeFlags = [ "PREFIX=" "DESTDIR=$(out)" ];
+  makeFlags = [ "PREFIX=" "DESTDIR=$(out)" "ENABLE_SYSTEMD=1" ];
 
   postPatch = ''
     substituteInPlace 90-brightnessctl.rules --replace /bin/ ${coreutils}/bin/
+    # For backward compatibility with the NixOS module / udev approach:
+    substituteInPlace Makefile --replace "INSTALL_UDEV_RULES=0" "INSTALL_UDEV_RULES=1"
   '';
 
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ systemd ];
+
   meta = with stdenv.lib; {
     homepage = "https://github.com/Hummer12007/brightnessctl";
     description = "This program allows you read and control device brightness";

From 3a39ea06d20fb062658c36afa70eba700dfb4b36 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Tue, 28 Jan 2020 15:30:23 +0100
Subject: [PATCH 0170/4636] ninja: 1.9.0 -> 1.10.0

---
 .../tools/build-managers/ninja/default.nix    | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix
index 7001510d52d6..9702a1979030 100644
--- a/pkgs/development/tools/build-managers/ninja/default.nix
+++ b/pkgs/development/tools/build-managers/ninja/default.nix
@@ -4,31 +4,15 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "ninja";
-  version = "1.9.0";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "ninja-build";
     repo = "ninja";
     rev = "v${version}";
-    sha256 = "1q0nld3g0d210zmdjyjzjz2xb2bw1s58gj6zsx7p8q30yh0wg610";
+    sha256 = "1fbzl7mrcrwp527sgkc1npfl3k6bbpydpiq98xcf1a1hkrx0z5x4";
   };
 
-  patches = [
-    # Make builds reproducible by generating the same IDs from the same inputs.
-    (fetchpatch {
-      name = "consistent-doc-ids";
-      url = "https://github.com/ninja-build/ninja/commit/9aa947471fcfc607bec6d92a1a6eed5c692edbaf.patch";
-      sha256 = "0zsg46jflsh644jccrcgyfalr7fkzrv041kyi8644nyk923gcrl9";
-    })
-    # https://github.com/ninja-build/ninja/issues/1510 - fix w/musl, possibly BSDs?
-    #
-    (fetchpatch {
-      name = "fix-issue-1510.patch";
-      url = https://github.com/makepost/ninja/commit/567815df38a2ff54ad7478a90bd75c91e434236a.patch;
-      sha256 = "0zd0xyi7h2066nw1dsk76c7yf71b0f7v4p5nljda7jxi01vpdh69";
-    })
-  ];
-
   nativeBuildInputs = [ python3 re2c ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin ];
 
   buildPhase = ''

From 7f7c94497a34756f39af889e74282ad3fcee0c7b Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 9 Feb 2020 23:55:05 +0100
Subject: [PATCH 0171/4636] dina,dina-pcf: unify packages

---
 pkgs/data/fonts/dina-pcf/default.nix | 64 ----------------------------
 pkgs/data/fonts/dina/default.nix     | 49 ++++++++++++++++-----
 pkgs/top-level/aliases.nix           |  3 ++
 pkgs/top-level/all-packages.nix      |  5 +--
 4 files changed, 43 insertions(+), 78 deletions(-)
 delete mode 100644 pkgs/data/fonts/dina-pcf/default.nix

diff --git a/pkgs/data/fonts/dina-pcf/default.nix b/pkgs/data/fonts/dina-pcf/default.nix
deleted file mode 100644
index eff0c579a707..000000000000
--- a/pkgs/data/fonts/dina-pcf/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{stdenv, fetchurl, unzip, bdftopcf, mkfontdir, mkfontscale}:
-
-stdenv.mkDerivation {
-  version = "2.92";
-  pname = "dina-font-pcf";
-
-  src = fetchurl {
-    url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip";
-    sha256 = "1kq86lbxxgik82aywwhawmj80vsbz3hfhdyhicnlv9km7yjvnl8z";
-  };
-
-  nativeBuildInputs = [ unzip bdftopcf mkfontdir mkfontscale ];
-
-  dontBuild = true;
-  patchPhase = "sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf";
-  installPhase = ''
-    _get_font_size() {
-      _pt=$\{1%.bdf}
-      _pt=$\{_pt#*-}
-      echo $_pt
-    }
-
-    for i in Dina_i400-*.bdf; do
-        bdftopcf -t -o DinaItalic$(_get_font_size $i).pcf $i
-    done
-    for i in Dina_i700-*.bdf; do
-        bdftopcf -t -o DinaBoldItalic$(_get_font_size $i).pcf $i
-    done
-    for i in Dina_r400-*.bdf; do
-        bdftopcf -t -o DinaMedium$(_get_font_size $i).pcf $i
-    done
-    for i in Dina_r700-*.bdf; do
-        bdftopcf -t -o DinaBold$(_get_font_size $i).pcf $i
-    done
-    gzip -n *.pcf
-
-    fontDir="$out/share/fonts/misc"
-    mkdir -p "$fontDir"
-    mv *.pcf.gz "$fontDir"
-
-    cd "$fontDir"
-    mkfontdir
-    mkfontscale
-  '';
-
-  preferLocalBuild = true;
-
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "0v0qn5zwq4j1yx53ypg6w6mqx6dk8l1xix0188b0k4z3ivgnflyb";
-
-  meta = with stdenv.lib; {
-    description = "A monospace bitmap font aimed at programmers";
-    longDescription = ''
-      Dina is a monospace bitmap font, primarily aimed at programmers. It is
-      relatively compact to allow a lot of code on screen, while (hopefully)
-      clear enough to remain readable even at high resolutions.
-    '';
-    homepage = https://www.donationcoder.com/Software/Jibz/Dina/;
-    downloadPage = https://www.donationcoder.com/Software/Jibz/Dina/;
-    license = licenses.free;
-    maintainers = [ maintainers.prikhi ];
-  };
-}
diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix
index 0d4cd286219e..d5b709007035 100644
--- a/pkgs/data/fonts/dina/default.nix
+++ b/pkgs/data/fonts/dina/default.nix
@@ -1,20 +1,47 @@
-{ stdenv, fetchzip }:
+{ stdenv, fetchurl, unzip
+, bdftopcf, mkfontscale
+}:
 
-let
+stdenv.mkDerivation {
+  pname = "dina-font";
   version = "2.92";
-in fetchzip {
-  name = "dina-font-${version}";
 
-  # `meta.homepage` has no direct download link
-  url = "https://github.com/ProgrammingFonts/ProgrammingFonts/archive/b15ef365146be7eef4a46979cfe157c5aeefb7c0.zip";
+  src = fetchurl {
+    url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip";
+    sha256 = "1kq86lbxxgik82aywwhawmj80vsbz3hfhdyhicnlv9km7yjvnl8z";
+  };
 
-  postFetch = ''
-    mkdir -p $out/share/fonts
-    unzip -j $downloadedFile '*/Dina/*.bdf' -d $out/share/fonts
-    chmod u-x $out/share/fonts/*
+  nativeBuildInputs =
+    [ unzip bdftopcf mkfontscale ];
+
+  patchPhase = "sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf";
+
+  buildPhase = ''
+    newName() {
+      test "''${1:5:1}" = i && _it=Italic || _it=
+      case ''${1:6:3} in
+        400) test -z $it && _weight=Medium ;;
+        700) _weight=Bold ;;
+      esac
+      _pt=''${1%.bdf}
+      _pt=''${_pt#*-}
+      echo "Dina$_weight$_it$_pt"
+    }
+
+    # convert bdf fonts to pcf
+    for i in *.bdf; do
+      bdftopcf -t -o $(newName "$i").pcf "$i"
+    done
+    gzip -n -9 *.pcf
   '';
 
-  sha256 = "02a6hqbq18sw69npylfskriqhvj1nsk65hjjyd05nl913ycc6jl7";
+  installPhase = ''
+    install -D -m 644 -t "$out/share/fonts/misc" *.pcf.gz
+    install -D -m 644 -t "$bdf/share/fonts/misc" *.bdf
+    mkfontdir "$out/share/fonts/misc"
+  '';
+
+  outputs = [ "out" "bdf" ];
 
   meta = with stdenv.lib; {
     description = "A monospace bitmap font aimed at programmers";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6b4fb1f9f746..f27391ff9049 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -542,6 +542,9 @@ mapAliases ({
   # added 2020-01-10
   tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead. See #77452.";
 
+  # added 2020-02-09
+  dina-font-pcf = dina-font;
+
     /* Cleanup before 20.09 */
   llvm_4 = throw ''
     The LLVM versions 3.5, 3.9 and 4.0 have been removed in NixOS 20.03
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0c475483078..60094116a049 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17378,9 +17378,8 @@ in
     paths = [ dejavu_fonts.out ];
   };
 
-  dina-font = callPackage ../data/fonts/dina { };
-
-  dina-font-pcf = callPackage ../data/fonts/dina-pcf { };
+  dina-font = callPackage ../data/fonts/dina
+    { inherit (buildPackages.xorg) mkfontscale; };
 
   dns-root-data = callPackage ../data/misc/dns-root-data { };
 

From 406b96fa7d02dff6abacb8c23b6c96fc1d33671f Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 10 Feb 2020 00:57:53 +0100
Subject: [PATCH 0172/4636] envypn-font: split outputs in out and otb

---
 pkgs/data/fonts/envypn-font/default.nix | 32 ++++++++++++++-----------
 pkgs/top-level/all-packages.nix         |  3 ++-
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix
index 351a0617ddc8..bb5488481e58 100644
--- a/pkgs/data/fonts/envypn-font/default.nix
+++ b/pkgs/data/fonts/envypn-font/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, mkfontdir, mkfontscale }:
+{ stdenv, fetchurl, libfaketime
+, fonttosfnt, mkfontscale
+}:
 
 stdenv.mkDerivation {
   name = "envypn-font-1.7.1";
@@ -8,26 +10,28 @@ stdenv.mkDerivation {
     sha256 = "bda67b6bc6d5d871a4d46565d4126729dfb8a0de9611dae6c68132a7b7db1270";
   };
 
-  nativeBuildInputs = [ mkfontdir mkfontscale ];
+  nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
 
   unpackPhase = ''
     tar -xzf $src --strip-components=1
   '';
 
-  installPhase = ''
-    # install the pcf fonts (for xorg applications)
-    fontDir="$out/share/fonts/envypn"
-    mkdir -p "$fontDir"
-    mv *.pcf.gz "$fontDir"
-
-    cd "$fontDir"
-    mkfontdir
-    mkfontscale
+  buildPhase = ''
+    # convert pcf fonts to otb
+    for i in *e.pcf.gz; do
+      faketime -f "1970-01-01 00:00:01" \
+      fonttosfnt -v -o "$(basename "$i" .pcf.gz)".otb "$i"
+    done
   '';
 
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "04sjxfrlvjc2f0679cy4w366mpzbn3fp6gnrjb8vy12vjd1ffnc1";
+  installPhase = ''
+    install -D -m 644 -t "$out/share/fonts/misc" *.pcf.gz
+    install -D -m 644 -t "$otb/share/fonts/misc" *.otb
+    mkfontdir "$out/share/fonts/misc"
+    mkfontdir "$otb/share/fonts/misc"
+  '';
+
+  outputs = [ "out" "otb" ];
 
   meta = with stdenv.lib; {
     description = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0c475483078..6add16ac09b3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17464,7 +17464,8 @@ in
 
   encode-sans = callPackage ../data/fonts/encode-sans { };
 
-  envypn-font = callPackage ../data/fonts/envypn-font { };
+  envypn-font = callPackage ../data/fonts/envypn-font
+    { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
 
   envdir = callPackage ../tools/misc/envdir-go { };
 

From 8ada47545000adcc97d56f19dd9ea61a894d8e7a Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 10 Feb 2020 01:27:20 +0100
Subject: [PATCH 0173/4636] spleen: install otf font

---
 pkgs/data/fonts/spleen/default.nix | 11 ++++++-----
 pkgs/top-level/all-packages.nix    |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix
index 3e843e30f5ee..42645fda664d 100644
--- a/pkgs/data/fonts/spleen/default.nix
+++ b/pkgs/data/fonts/spleen/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, mkfontdir }:
+{ lib, fetchurl, mkfontscale }:
 
 let
   pname = "spleen";
@@ -11,14 +11,15 @@ in fetchurl {
   recursiveHash = true;
   postFetch = ''
     tar xvf $downloadedFile --strip=1
-    d="$out/share/fonts/X11/misc/spleen"
-    install -Dm644 *.{pcf.gz,psfu,bdf} -t $d
+    d="$out/share/fonts/misc"
+    install -D -m 644 *.{pcf,bdf,otf} -t "$d"
+    install -D -m 644 *.psfu -t "$out/share/consolefonts"
     install -m644 fonts.alias-spleen $d/fonts.alias
 
     # create fonts.dir so NixOS xorg module adds to fp
-    ${mkfontdir}/bin/mkfontdir $d
+    ${mkfontscale}/bin/mkfontdir "$d"
   '';
-  sha256 = "0h9gj7syn87hl5rhwckih92r228zac6b1dvh3034caml8ad3fyla";
+  sha256 = "0x1xiw4gyfkyvwqg0f47rl92zq76d0c6jfncdnq8m2wwpxz9697b";
 
   meta = with lib; {
     description = "Monospaced bitmap fonts";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c0238735d7b..f515f8dacf11 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17897,7 +17897,7 @@ in
   source-han-serif-simplified-chinese = sourceHanSerifPackages.simplified-chinese;
   source-han-serif-traditional-chinese = sourceHanSerifPackages.traditional-chinese;
 
-  spleen = callPackage ../data/fonts/spleen { inherit (xorg) mkfontdir; };
+  spleen = callPackage ../data/fonts/spleen { inherit (buildPackages.xorg) mkfontscale; };
 
   stilo-themes = callPackage ../data/themes/stilo { };
 

From 98a22766372c5921a59a057c9fb91eaee8871138 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Sun, 9 Feb 2020 18:37:29 -0800
Subject: [PATCH 0174/4636] fish-foreign-env: git-20170324 -> git-20200209

"`^` as a redirection deprecated and will be removed in the future."
(see the changelog, under the 3.0b1 release)

The latest fish beta release (3.1b1 as of time of writing) errors when
encountering `^&1` (though the fact it is now an error has yet to be
documented by them). The plugin was updated last year to account for
this change, and with the "imminent" release of fish-shell v3.1, this
should be fixed.
---
 pkgs/shells/fish/fish-foreign-env/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/fish/fish-foreign-env/default.nix b/pkgs/shells/fish/fish-foreign-env/default.nix
index a5f429ed3732..ef157f323923 100644
--- a/pkgs/shells/fish/fish-foreign-env/default.nix
+++ b/pkgs/shells/fish/fish-foreign-env/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation {
   pname = "fish-foreign-env";
-  version = "git-20170324";
+  version = "git-20200209";
 
   src = fetchFromGitHub {
     owner = "oh-my-fish";
     repo = "plugin-foreign-env";
-    rev = "baefbd690f0b52cb8746f3e64b326d82834d07c5";
-    sha256 = "0lwp6hy3kfk7xfx4xvbk1ir8zkzm7gfjbm4bf6xg1y6iw9jq9dnl";
+    rev = "dddd9213272a0ab848d474d0cbde12ad034e65bc";
+    sha256 = "00xqlyl3lffc5l0viin1nyp819wf81fncqyz87jx8ljjdhilmgbs";
   };
 
   installPhase = ''

From 5ca385e1e9f2db0caa93721d147f89c0d9ea0f0d Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 22 Jan 2020 18:02:39 -0800
Subject: [PATCH 0175/4636] python3Packages.pip: 19.3.1 -> 20.0.2

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

diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix
index e1af281b9e91..d1ffd0931b8b 100644
--- a/pkgs/development/python-modules/pip/default.nix
+++ b/pkgs/development/python-modules/pip/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "pip";
-  version = "19.3.1";
+  version = "20.0.2";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "pypa";
     repo = pname;
     rev = version;
-    sha256 = "079gz0v37ah1l4i5iwyfb0d3mni422yv5ynnxa0wcqpnvkc7sfnw";
+    sha256 = "1jj0qa47d7pqn2r379p434hxk14ij2qgmr83x65w9ib9l8092fhg";
     name = "${pname}-${version}-source";
   };
 

From ee027c128beaa78c3e143f1422bb3b1d2ba758e8 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 10 Feb 2020 12:01:48 +0800
Subject: [PATCH 0176/4636] crun: run tests and show the proper version number

---
 .../virtualization/crun/default.nix           | 52 +++++++++++++++----
 1 file changed, 42 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix
index f976ede79c46..224bee784cfa 100644
--- a/pkgs/applications/virtualization/crun/default.nix
+++ b/pkgs/applications/virtualization/crun/default.nix
@@ -1,6 +1,36 @@
-{ stdenv, lib, fetchFromGitHub, autoreconfHook, go-md2man, pkgconfig
-, libcap, libseccomp, python3, systemd, yajl }:
+{ stdenv
+, lib
+, fetchFromGitHub
+, autoreconfHook
+, go-md2man
+, pkgconfig
+, libcap
+, libseccomp
+, python3
+, systemd
+, yajl
+}:
 
+let
+  # these tests require additional permissions
+  disabledTests = [
+    "test_capabilities.py"
+    "test_cwd.py"
+    "test_detach.py"
+    "test_exec.py"
+    "test_hooks.py"
+    "test_hostname.py"
+    "test_paths.py"
+    "test_pid.py"
+    "test_pid_file.py"
+    "test_preserve_fds.py"
+    "test_start.py"
+    "test_uid_gid.py"
+    "test_update.py"
+    "tests_libcrun_utils"
+  ];
+
+in
 stdenv.mkDerivation rec {
   pname = "crun";
   version = "0.12.1";
@@ -19,16 +49,18 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  preBuild = ''
-    cat > git-version.h <<EOF
-    #ifndef GIT_VERSION
-    # define GIT_VERSION "nixpkgs-${version}"
-    #endif
-    EOF
+  # we need this before autoreconfHook does its thing in order to initialize
+  # config.h with the correct values
+  postPatch = ''
+    echo ${version} > .tarball-version
+    echo '#define GIT_VERSION "${src.rev}"' > git-version.h
+
+    ${lib.concatMapStringsSep "\n" (e:
+      "substituteInPlace Makefile.am --replace 'tests/${e}' ''"
+    ) disabledTests}
   '';
 
-  # the tests require additional permissions
-  doCheck = false;
+  doCheck = true;
 
   meta = with lib; {
     description = "A fast and lightweight fully featured OCI runtime and C library for running containers";

From 9e0175e3a424c42e50962b7b8e20686ac12bdbf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Hafl=C3=ADnud=C3=B3ttir?= <ftrvxmtrx@gmail.com>
Date: Mon, 10 Feb 2020 10:07:06 +0000
Subject: [PATCH 0177/4636] maintainers: update my name

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8d5447654eef..e638886975f9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2578,7 +2578,7 @@
     email = "ftrvxmtrx@gmail.com";
     github = "ftrvxmtrx";
     githubId = 248148;
-    name = "Siarhei Zirukin";
+    name = "Sigrid Solveig Haflínudóttir";
   };
   fuerbringer = {
     email = "severin@fuerbringer.info";

From 6808f48dfd348934405bb97a64e8b8d95801f21b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Hafl=C3=ADnud=C3=B3ttir?= <ftrvxmtrx@gmail.com>
Date: Mon, 10 Feb 2020 10:07:18 +0000
Subject: [PATCH 0178/4636] yoshimi: 1.6.1 -> 1.7.0.1

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

diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index 0cd512e5093c..40691be1a0c9 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -6,11 +6,11 @@ assert stdenv ? glibc;
 
 stdenv.mkDerivation  rec {
   pname = "yoshimi";
-  version = "1.6.1";
+  version = "1.7.0.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/yoshimi/${pname}-${version}.tar.bz2";
-    sha256 = "044k2pcdsb43znc8q63mc4niggpain7wl9s5c4sgsfmrjh0bjapj";
+    sha256 = "1pkqrrr51vlxh96vy0c0rf5ijjvymys4brsw9rv1bdp1bb8izw6c";
   };
 
   buildInputs = [

From c5a0d66eb7cd17880b6238541d4189da6987e711 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Fri, 7 Feb 2020 22:49:24 +0100
Subject: [PATCH 0179/4636] gohufont: split outputs into out and otb

---
 pkgs/data/fonts/gohufont/default.nix | 34 ++++++++++++++++------------
 pkgs/top-level/all-packages.nix      |  2 +-
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix
index ec36d9230f5b..b331edf7aa1e 100644
--- a/pkgs/data/fonts/gohufont/default.nix
+++ b/pkgs/data/fonts/gohufont/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchFromGitHub
-, mkfontdir, mkfontscale, bdf2psf, bdftopcf
+, mkfontscale, bdf2psf, bdftopcf
 , fonttosfnt, libfaketime
 }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs =
-    [ mkfontdir mkfontscale bdf2psf bdftopcf
+    [ mkfontscale bdf2psf bdftopcf
       fonttosfnt libfaketime
     ];
 
@@ -33,33 +33,37 @@ stdenv.mkDerivation rec {
     done
     cd $build
 
-    # convert bdf fonts to pcf and otb
+    # convert bdf fonts to pcf
     for i in *.bdf $src/hidpi/*.bdf; do
         name=$(basename $i .bdf)
         bdftopcf -o "$name.pcf" "$i"
-        faketime -f "1970-01-01 00:00:01" fonttosfnt -v -o "$name.otb" "$i" || true
+    done
+
+    # convert unicode bdf fonts to otb
+    for i in *-uni*.bdf $src/hidpi/*-uni*.bdf; do
+        name=$(basename $i .bdf)
+        faketime -f "1970-01-01 00:00:01" \
+        fonttosfnt -v -o "$name.otb" "$i"
     done
   '';
 
   installPhase = ''
     # install the psf fonts (for the virtual console)
     fontDir="$out/share/consolefonts"
-    mkdir -p "$fontDir"
-    mv -t "$fontDir" psf/*.psf
+    install -D -m 644 -t "$fontDir" psf/*.psf
 
-    # install the pcf and otb fonts (for xorg applications)
+    # install the pcf fonts (for xorg applications)
     fontDir="$out/share/fonts/misc"
-    mkdir -p "$fontDir"
-    mv -t "$fontDir" *.pcf *.otb
+    install -D -m 644 -t "$fontDir" *.pcf
+    mkfontdir "$fontDir"
 
-    cd "$fontDir"
-    mkfontdir
-    mkfontscale
+    # install the otb fonts (for gtk applications)
+    fontDir="$otb/share/fonts/misc"
+    install -D -m 644 -t "$fontDir" *.otb
+    mkfontdir "$fontDir"
   '';
 
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash     = "028mq0j6w76isv4ycj1jzx7ih9d9cz5012np7f1pf3bvnvw3ajw2";
+  outputs = [ "out" "otb" ];
 
   meta = with stdenv.lib; {
     description = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90c390ba4156..c292398c9c62 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17494,7 +17494,7 @@ in
   geolite-legacy = callPackage ../data/misc/geolite-legacy { };
 
   gohufont = callPackage ../data/fonts/gohufont
-    { inherit (buildPackages.xorg) fonttosfnt mkfontdir; };
+    { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
 
   gnome-user-docs = callPackage ../data/documentation/gnome-user-docs { };
 

From 3b1608a94bf9a4e3c419e5bbe1fd3ce10889950b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 10 Feb 2020 11:14:48 +0000
Subject: [PATCH 0180/4636] rust-bindgen: 0.52.0 -> 0.53.1

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

diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index a87ef4d2228a..29f6fe5bd42d 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -3,7 +3,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rust-bindgen";
-  version = "0.52.0";
+  version = "0.53.1";
 
   RUSTFLAGS = "--cap-lints warn"; # probably OK to remove after update
 
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     owner = "rust-lang";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0rf5sg9136f4j7s07iz2gd481h8gzdd106jc1jw1p5pw4zaiz5l0";
+    sha256 = "0zxqryqks9in9q7az0lrw8fq9wnc5p4yf6b1fxnzy2j6qhlw2c5c";
   };
 
   cargoSha256 = "1wy5xdkf9ql2l9qavi0fh7hwjvly108f4l2m1k947412fyjwr7x7";

From 05d52e28c64063d230a00409cd8fc13a194b3d25 Mon Sep 17 00:00:00 2001
From: Tamer Abdulradi <tamer@abdulradi.com>
Date: Mon, 10 Feb 2020 12:41:54 +0100
Subject: [PATCH 0181/4636] Upgrades coursier to 2.0.0-RC6-4

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

diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix
index 09e6513d2b16..41303439d76b 100644
--- a/pkgs/development/tools/coursier/default.nix
+++ b/pkgs/development/tools/coursier/default.nix
@@ -3,16 +3,16 @@
 let
   zshCompletion = version: fetchurl {
     url = "https://raw.githubusercontent.com/coursier/coursier/v${version}/modules/cli/src/main/resources/completions/zsh";
-    sha256 = "0gfr1q66crh6si4682xbxnj41igws83qj710npgm2bvq90xa8m49";
+    sha256 = "1mn6cdmf59nkz5012wgd3gd6hpk2w4629sk8z95230ky8487dac3";
   };
 in
 stdenv.mkDerivation rec {
   pname = "coursier";
-  version = "2.0.0-RC3-3";
+  version = "2.0.0-RC6-4";
 
   src = fetchurl {
     url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier";
-    sha256 = "1qrybajwk46h6d1yp6n4zxdvrfl19lqhjsqxbm48vk3wbvj31vyl";
+    sha256 = "0i8jvs5l7f2xzkdlxk784mx5h86hq7xh5ffzb4zalczw9bzmmds1";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 03f246620d2e6cf5fa47b44b43c35bcc7aaaebde Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 10 Feb 2020 13:28:04 +0100
Subject: [PATCH 0182/4636] powerline-fonts: install psf to share/consolefonts

This will make easier to set the font of the virtual console
in NixOS. Instead of specifing the full filepath of the psf
on can simply do:

    console.font = "ter-powerline-v20b";
    console.packages = [ pkgs.powerline-fonts ];
---
 pkgs/data/fonts/powerline-fonts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix
index c8044905a088..f051ef76c9c1 100644
--- a/pkgs/data/fonts/powerline-fonts/default.nix
+++ b/pkgs/data/fonts/powerline-fonts/default.nix
@@ -13,10 +13,10 @@ fetchFromGitHub {
     find . -name '*.ttf'    -exec install -Dt $out/share/fonts/truetype {} \;
     find . -name '*.bdf'    -exec install -Dt $out/share/fonts/bdf      {} \;
     find . -name '*.pcf.gz' -exec install -Dt $out/share/fonts/pcf      {} \;
-    find . -name '*.psf.gz' -exec install -Dt $out/share/fonts/psf      {} \;
+    find . -name '*.psf.gz' -exec install -Dt $out/share/consolefonts   {} \;
   '';
 
-  sha256 = "0irifak86gn7hawzgxcy53s22y215mxc2kjncv37h7q44jsqdqww";
+  sha256 = "0r8p4z3db17f5p8jr7sv80nglmjxhg83ncfvwg1dszldswr0dhvr";
 
   meta = with lib; {
     homepage = https://github.com/powerline/fonts;

From 9d452922085509e8b1b6a6b78e35fd586417ba52 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 10 Feb 2020 12:55:39 +0000
Subject: [PATCH 0183/4636] babelstone-han: 12.1.7 -> 13.0.3

---
 pkgs/data/fonts/babelstone-han/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix
index 0d46fc92d5f2..da2d67c084ff 100644
--- a/pkgs/data/fonts/babelstone-han/default.nix
+++ b/pkgs/data/fonts/babelstone-han/default.nix
@@ -1,16 +1,17 @@
 { lib, fetchzip }:
 
 let
-  version = "12.1.7";
+  version = "13.0.3";
 in fetchzip {
   name = "babelstone-han-${version}";
 
-  url = https://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip;
+  # upstream download links are unversioned, so hash changes
+  url = https://web.archive.org/web/20200210125314/https://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip;
   postFetch = ''
     mkdir -p $out/share/fonts/truetype
     unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype
   '';
-  sha256 = "07liv0lmk28ybxccf91gp2wmc17pk3fcshixpj0jx069b64zwf1v";
+  sha256 = "018isk3hbzsihzrxavgjbn485ngzvlm96npqx9y7zpkxsssslc4w";
 
   meta = with lib; {
     description = "Unicode CJK font with over 36000 Han characters";
@@ -18,7 +19,6 @@ in fetchzip {
 
     license = licenses.free;
     platforms = platforms.all;
-    hydraPlatforms = [];
-    maintainers = [ maintainers.volth ];
+    maintainers = with maintainers; [ volth emily ];
   };
 }

From c36fca9701f697c6c6ada46c847686804ff59084 Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@suse.com>
Date: Mon, 10 Feb 2020 14:42:40 +0100
Subject: [PATCH 0184/4636] cri-o: remove unused ldflags variable

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
---
 pkgs/applications/virtualization/cri-o/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
index f39e22cc64ab..274468334ee4 100644
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@@ -1,5 +1,4 @@
 { flavor ? ""
-, ldflags ? ""
 , stdenv
 , btrfs-progs
 , buildGoPackage

From 3815de80c0e1b4d97d46bf181ffdd02aa68f1843 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 10 Feb 2020 14:47:35 +0000
Subject: [PATCH 0185/4636] unit: 1.14.0 -> 1.15.0

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

diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix
index c3af0d555438..9077bc21654a 100644
--- a/pkgs/servers/http/unit/default.nix
+++ b/pkgs/servers/http/unit/default.nix
@@ -18,14 +18,14 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "1.14.0";
+  version = "1.15.0";
   pname = "unit";
 
   src = fetchFromGitHub {
     owner = "nginx";
     repo = "unit";
     rev = version;
-    sha256 = "01anczfcdwd22hb0y4zw647f86ivk5zq8lcd13xfxjvkmnsnbj9w";
+    sha256 = "1dj21fcssrvbspppbhg8684vfcbn0m1abiy1r60h5fzb470k21jb";
   };
 
   patches = [

From 2115a2037cb8337ccb09798c175733f1fc747ee3 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 12 Jan 2020 11:21:23 -0500
Subject: [PATCH 0186/4636] fetchcargo: use flat tar.gz file for vendored src
 instead of recursive hash dir

This has several advantages:

1. It takes up less space on disk in-between builds in the nix store.
2. It uses less space in the binary cache for vendor derivation packages.
3. It uses less network traffic downloading from the binary cache.
4. It plays nicely with hashed mirrors like tarballs.nixos.org, which only
   substitute --flat hashes on single files (not recursive directory hashes).
5. It's consistent with how simple `fetchurl` src derivations work.
6. It provides a stronger abstraction between input src-package and output
   package, e.g., it's harder to accidentally depend on the src derivation at
   runtime by referencing something like `${src}/etc/index.html`. Likewise, in
   the store it's harder to get confused with something that is just there as a
   build-time dependency vs. a runtime dependency, since the build-time
   src dependencies are tarred up.

Disadvantages are:
1. It takes slightly longer to untar at the start of a build.

As currently implemented, this attaches the compacted vendor.tar.gz feature as a
rider on `verifyCargoDeps`, since both of them are relatively newly implemented
behavior that change the `cargoSha256`.

If this PR is accepted, I will push forward the remaining rust packages with a
series of treewide PRs to update the `cargoSha256`s.
---
 doc/languages-frameworks/rust.section.md      | 21 +++--
 pkgs/applications/editors/hexdino/default.nix |  4 +-
 .../git-and-tools/git-workspace/default.nix   |  4 +-
 pkgs/build-support/rust/README.md             | 45 +++++++++++
 pkgs/build-support/rust/default.nix           | 41 ++++++----
 pkgs/build-support/rust/fetchCargoTarball.nix | 81 +++++++++++++++++++
 pkgs/development/compilers/rust/default.nix   |  8 +-
 .../tools/documentation/mdsh/default.nix      |  4 +-
 pkgs/tools/misc/broot/default.nix             |  4 +-
 pkgs/tools/misc/wagyu/default.nix             |  4 +-
 .../package-management/nix-du/default.nix     |  4 +-
 pkgs/tools/security/fido2luks/default.nix     |  4 +-
 pkgs/tools/system/tre-command/default.nix     |  4 +-
 13 files changed, 190 insertions(+), 38 deletions(-)
 create mode 100644 pkgs/build-support/rust/README.md
 create mode 100644 pkgs/build-support/rust/fetchCargoTarball.nix

diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 3332dff1eb07..6f0ec7c05144 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   cargoSha256 = "17ldqr3asrdcsh4l29m3b5r37r5d0b3npq1lrgjmxb6vlx6a36qh";
-  verifyCargoDeps = true;
+  legacyCargoFetcher = false;
 
   meta = with stdenv.lib; {
     description = "A fast line-oriented regex search tool, similar to ag and ack";
@@ -59,12 +59,19 @@ When the `Cargo.lock`, provided by upstream, is not in sync with the
 added in `cargoPatches` will also be prepended to the patches in `patches` at
 build-time.
 
-When `verifyCargoDeps` is set to `true`, the build will also verify that the
-`cargoSha256` is not out of date by comparing the `Cargo.lock` file in both the
-`cargoDeps` and `src`. Note that this option changes the value of `cargoSha256`
-since it also copies the `Cargo.lock` in it. To avoid breaking
-backward-compatibility this option is not enabled by default but hopefully will
-be in the future.
+Setting `legacyCargoFetcher` to `false` enables the following behavior:
+
+1. The `Cargo.lock` file is copied into the cargo vendor directory.
+2. At buildtime, `buildRustPackage` will ensure that the `src` and `cargoSha256`
+   are consistent. This avoids errors where one but not the other is updated.
+3. The builder will compress the vendored cargo src directory into a tar.gz file
+   for storage after vendoring, and decompress it before the build. This saves
+   disk space and enables hashed mirrors for Rust dependencies.
+
+Note that this option changes the value of `cargoSha256`, so it is currently
+defaulted to `false`. When updating a Rust package, please set it to `true`;
+eventually we will default this to true and update the remaining Rust packages,
+then delete the option from all individual Rust package expressions.
 
 ### Building a crate for a different target
 
diff --git a/pkgs/applications/editors/hexdino/default.nix b/pkgs/applications/editors/hexdino/default.nix
index eee5a6965558..91f048320a72 100644
--- a/pkgs/applications/editors/hexdino/default.nix
+++ b/pkgs/applications/editors/hexdino/default.nix
@@ -11,8 +11,8 @@ rustPlatform.buildRustPackage {
     sha256 = "11mz07735gxqfamjcjjmxya6swlvr1p77sgd377zjcmd6z54gwyf";
   };
 
-  cargoSha256 = "0qa8ypp5a7sf1gic482zh3i6s94w6k6bgmk5ynfvwi7g49ql7c4z";
-  verifyCargoDeps = true;
+  cargoSha256 = "06ghcd4j751mdkzwb88nqwk8la4zdb137y0iqrkpykkfx0as43x3";
+  legacyCargoFetcher = false;
 
   buildInputs = [ ncurses ];
 
diff --git a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix
index 2ceac55bf5ca..61e3e1e3eef0 100644
--- a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix
@@ -15,9 +15,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0pl5z0gx2ypkrgq7vj1cxj5iwj06vcd06x3b3nh0g7w7q7nl8pr4";
   };
 
-  cargoSha256 = "0jbsz7r9n3jcgb9sd6pdjwzjf1b35qpfqw8ba8fjjmzfvs9qn6ld";
+  cargoSha256 = "1z4cb7rcb7ldj16xxynrjh4hg872rj39rbbp0vy15kdp3ifyi466";
 
-  verifyCargoDeps = true;
+  legacyCargoFetcher = false;
 
   buildInputs = with stdenv; lib.optional isDarwin Security;
 
diff --git a/pkgs/build-support/rust/README.md b/pkgs/build-support/rust/README.md
new file mode 100644
index 000000000000..0e0ddb9648de
--- /dev/null
+++ b/pkgs/build-support/rust/README.md
@@ -0,0 +1,45 @@
+# Updated fetchCargo behavior
+
+Changes to the `fetchcargo.nix` behavior that cause changes to the `cargoSha256`
+are somewhat disruptive, so historically we've added conditionals to provide
+backwards compatibility. We've now accumulated enough of these that it makes
+sense to do a clean sweep updating hashes, and delete the conditionals in the
+fetcher to simplify maintenance and implementation complexity. These
+conditionals are:
+
+1. When cargo vendors dependencies, it generates a config. Previously, we were
+   hard-coding our own config, but this fails if there are git dependencies. We
+   have conditional logic to sometimes copy the vendored cargo config in, and
+   sometimes not.
+
+2. When a user updates the src package, they may forget to update the
+   `cargoSha256`. We have an opt-in conditional flag to add the `Cargo.lock`
+   into the vendor dir for inspection and compare at build-time, but it defaults
+   to false.
+
+3. We were previously vendoring into a directory with a recursive hash, but
+   would like to vendor into a compressed tar.gz file instead, for the reasons
+   specified in the git commit message adding this feature.
+
+
+## Migration plan
+
+1. (DONE in this PR) Implement `fetchCargoTarball` as a separate, clean fetcher
+   implementation along-side `fetchcargo`. Rename `verifyCargoDeps` (default
+   false) to `legacyCargoFetcher` (default true), which switches the fetcher
+   implementation used. Replace `verifyCargoDeps = true;` with
+   `legacyCargoFetcher = false;` in Rust applications.
+
+2. Send a treewide Rust PR that sets `legacyCargoFetcher = true;` in all Rust
+   applications not using this (which is ~200 of them), with a note to
+   maintainers to delete if updating the package. Change the default in
+   `buildRustPackage` to false.
+
+3. Go through all Rust src packages deleting the `legacyCargoFetcher = false;`
+   line and re-computing the `cargoSha256`, merging as we go.
+
+4. Delete the `fetchcargo.nix` implementation entirely and also remove:
+  - All overrides in application-level packages
+  - The `fetchcargo-default-config.toml` and conditionals around using it when
+    no `$CARGO_CONFIG` exists
+  - This README.md file
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 4089436c0e0b..ac0a8d3ae464 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cacert, git, rust, cargo, rustc, fetchcargo, buildPackages, windows }:
+{ stdenv, cacert, git, rust, cargo, rustc, fetchcargo, fetchCargoTarball, buildPackages, windows }:
 
 { name ? "${args.pname}-${args.version}"
 , cargoSha256 ? "unset"
@@ -14,13 +14,13 @@
 , cargoUpdateHook ? ""
 , cargoDepsHook ? ""
 , cargoBuildFlags ? []
-, # Set to true to verify if the cargo dependencies are up to date.
-  # This will change the value of cargoSha256.
-  verifyCargoDeps ? false
+  # Please set to true on any Rust package updates. Once all packages set this
+  # to true, we will delete and make it the default. For details, see the Rust
+  # section on the manual and ./README.md.
+, legacyCargoFetcher ? true
 , buildType ? "release"
 , meta ? {}
 , target ? null
-
 , cargoVendorDir ? null
 , ... } @ args:
 
@@ -28,20 +28,27 @@ assert cargoVendorDir == null -> cargoSha256 != "unset";
 assert buildType == "release" || buildType == "debug";
 
 let
+
+  cargoFetcher = if legacyCargoFetcher
+                 then fetchcargo
+                 else fetchCargoTarball;
+
   cargoDeps = if cargoVendorDir == null
-    then fetchcargo {
+    then cargoFetcher {
         inherit name src srcs sourceRoot unpackPhase cargoUpdateHook;
-        copyLockfile = verifyCargoDeps;
         patches = cargoPatches;
         sha256 = cargoSha256;
       }
     else null;
 
+  # If we're using the modern fetcher that always preserves the original Cargo.lock
+  # and have vendored deps, check them against the src attr for consistency.
+  validateCargoDeps = cargoSha256 != "unset" && !legacyCargoFetcher;
+
   setupVendorDir = if cargoVendorDir == null
     then ''
       unpackFile "$cargoDeps"
-      cargoDepsCopy=$(stripHash $(basename $cargoDeps))
-      chmod -R +w "$cargoDepsCopy"
+      cargoDepsCopy=$(stripHash $cargoDeps)
     ''
     else ''
       cargoDepsCopy="$sourceRoot/${cargoVendorDir}"
@@ -54,9 +61,14 @@ let
   ccForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc";
   cxxForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++";
   releaseDir = "target/${rustTarget}/${buildType}";
+
+  # Fetcher implementation choice should not be part of the hash in final
+  # derivation; only the cargoSha256 input matters.
+  filteredArgs = builtins.removeAttrs args [ "legacyCargoFetcher" ];
+
 in
 
-stdenv.mkDerivation (args // {
+stdenv.mkDerivation (filteredArgs // {
   inherit cargoDeps;
 
   patchRegistryDeps = ./patch-registry-deps;
@@ -95,14 +107,13 @@ stdenv.mkDerivation (args // {
     ''}
     EOF
 
-    unset cargoDepsCopy
     export RUST_LOG=${logLevel}
-  '' + stdenv.lib.optionalString verifyCargoDeps ''
-    if ! diff source/Cargo.lock $cargoDeps/Cargo.lock ; then
+  '' + stdenv.lib.optionalString validateCargoDeps ''
+    if ! diff source/Cargo.lock $cargoDepsCopy/Cargo.lock ; then
       echo
       echo "ERROR: cargoSha256 is out of date"
       echo
-      echo "Cargo.lock is not the same in $cargoDeps"
+      echo "Cargo.lock is not the same in $cargoDepsCopy"
       echo
       echo "To fix the issue:"
       echo '1. Use "1111111111111111111111111111111111111111111111111111" as the cargoSha256 value'
@@ -112,6 +123,8 @@ stdenv.mkDerivation (args // {
 
       exit 1
     fi
+  '' + ''
+    unset cargoDepsCopy
   '' + (args.postUnpack or "");
 
   configurePhase = args.configurePhase or ''
diff --git a/pkgs/build-support/rust/fetchCargoTarball.nix b/pkgs/build-support/rust/fetchCargoTarball.nix
new file mode 100644
index 000000000000..dff5d99da9eb
--- /dev/null
+++ b/pkgs/build-support/rust/fetchCargoTarball.nix
@@ -0,0 +1,81 @@
+{ stdenv, cacert, git, cargo, python3 }:
+let cargo-vendor-normalise = stdenv.mkDerivation {
+  name = "cargo-vendor-normalise";
+  src = ./cargo-vendor-normalise.py;
+  nativeBuildInputs = [ python3.pkgs.wrapPython ];
+  dontUnpack = true;
+  installPhase = "install -D $src $out/bin/cargo-vendor-normalise";
+  pythonPath = [ python3.pkgs.toml ];
+  postFixup = "wrapPythonPrograms";
+  doInstallCheck = true;
+  installCheckPhase = ''
+    # check that ./fetchcargo-default-config.toml is a fix point
+    reference=${./fetchcargo-default-config.toml}
+    < $reference $out/bin/cargo-vendor-normalise > test;
+    cmp test $reference
+  '';
+  preferLocalBuild = true;
+};
+in
+{ name ? "cargo-deps"
+, src ? null
+, srcs ? []
+, patches ? []
+, sourceRoot
+, sha256
+, cargoUpdateHook ? ""
+, ...
+} @ args:
+stdenv.mkDerivation ({
+  name = "${name}-vendor.tar.gz";
+  nativeBuildInputs = [ cacert git cargo-vendor-normalise cargo ];
+
+  phases = "unpackPhase patchPhase buildPhase installPhase";
+
+  buildPhase = ''
+    # Ensure deterministic Cargo vendor builds
+    export SOURCE_DATE_EPOCH=1
+
+    if [[ ! -f Cargo.lock ]]; then
+        echo
+        echo "ERROR: The Cargo.lock file doesn't exist"
+        echo
+        echo "Cargo.lock is needed to make sure that cargoSha256 doesn't change"
+        echo "when the registry is updated."
+        echo
+
+        exit 1
+    fi
+
+    # Keep the original around for copyLockfile
+    cp Cargo.lock Cargo.lock.orig
+
+    export CARGO_HOME=$(mktemp -d cargo-home.XXX)
+    CARGO_CONFIG=$(mktemp cargo-config.XXXX)
+
+    ${cargoUpdateHook}
+
+    cargo vendor $name | cargo-vendor-normalise > $CARGO_CONFIG
+
+    # Add the Cargo.lock to allow hash invalidation
+    cp Cargo.lock.orig $name/Cargo.lock
+
+    # Packages with git dependencies generate non-default cargo configs, so
+    # always install it rather than trying to write a standard default template.
+    install -D $CARGO_CONFIG $name/.cargo/config;
+  '';
+
+  # Build a reproducible tar, per instructions at https://reproducible-builds.org/docs/archives/
+  installPhase = ''
+    tar --owner=0 --group=0 --numeric-owner --format=gnu \
+        --sort=name --mtime="@$SOURCE_DATE_EPOCH" \
+        -czf $out $name
+  '';
+
+  outputHashAlgo = "sha256";
+  outputHash = sha256;
+
+  impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
+} // (builtins.removeAttrs args [
+  "name" "sha256" "cargoUpdateHook"
+]))
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index da3421a987da..af7f63b6f8a0 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -25,12 +25,18 @@
       inherit rustc cargo;
     };
 
+    fetchCargoTarball = buildPackages.callPackage ../../../build-support/rust/fetchCargoTarball.nix {
+      inherit cargo;
+    };
+
+    # N.B. This is a legacy fetcher implementation that is being phased out and deleted.
+    # See ../../../build-support/rust/README.md for details.
     fetchcargo = buildPackages.callPackage ../../../build-support/rust/fetchcargo.nix {
       inherit cargo;
     };
 
     buildRustPackage = callPackage ../../../build-support/rust {
-      inherit rustc cargo fetchcargo;
+      inherit rustc cargo fetchcargo fetchCargoTarball;
     };
 
     rustcSrc = callPackage ./rust-src.nix {
diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix
index 2ca2ef29dd26..ddce5bc29a43 100644
--- a/pkgs/development/tools/documentation/mdsh/default.nix
+++ b/pkgs/development/tools/documentation/mdsh/default.nix
@@ -11,8 +11,8 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1a9i6h8fzrrfzjyfxaps73lxgkz92k0bnmwbjbwdmiwci4qgi9ms";
   };
 
-  cargoSha256 = "0rarpzfigyxr6s0ba13z00kvnms29qkjfbfjkay72mb6xn7f1059";
-  verifyCargoDeps = true;
+  cargoSha256 = "1fxajh1n0qvcdas6w7dy3g92wilhfldy90pyk3779mrnh57fa6n5";
+  legacyCargoFetcher = false;
 
   meta = with stdenv.lib; {
     description = "Markdown shell pre-processor";
diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix
index 45b26b250558..df26423c6331 100644
--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@@ -11,8 +11,8 @@ rustPlatform.buildRustPackage rec {
     sha256 = "13b1w9g68aj3r70w9bmrmdc772y959n77ajbdm2cpjs5f4kgfpak";
   };
 
-  cargoSha256 = "0vzpyymylzxjm613lf5xr6hd21ijkl3vwq4y6h1q3as41phw2sqb";
-  verifyCargoDeps = true;
+  cargoSha256 = "0zrwpmsrzwnjml0964zky8w222zmlargha3z0n6hf8cfshx23s4k";
+  legacyCargoFetcher = false;
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/tools/misc/wagyu/default.nix b/pkgs/tools/misc/wagyu/default.nix
index d56d21b15166..53e098495226 100644
--- a/pkgs/tools/misc/wagyu/default.nix
+++ b/pkgs/tools/misc/wagyu/default.nix
@@ -11,8 +11,8 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1646j0lgg3hhznifvbkvr672p3yqlcavswijawaxq7n33ll8vmcn";
   };
 
-  cargoSha256 = "10b96l0b32zxq0xrnhivv3gihmi5y31rllbizv67hrg1axz095vn";
-  verifyCargoDeps = true;
+  cargoSha256 = "16d1b3pamkg29nq80n6cbzc4zl9z3cgfvdxjkr2z4xrnzmkn1ysi";
+  legacyCargoFetcher = false;
 
   meta = with lib; {
     description = "Rust library for generating cryptocurrency wallets";
diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix
index 74543cef83b1..908f31b93abe 100644
--- a/pkgs/tools/package-management/nix-du/default.nix
+++ b/pkgs/tools/package-management/nix-du/default.nix
@@ -9,8 +9,8 @@ rustPlatform.buildRustPackage rec {
     rev = "v${version}";
     sha256 = "149d60mid29s5alv5m3d7jrhyzc6cj7b6hpiq399gsdwzgxr00wq";
   };
-  cargoSha256 = "18kb4car5nzch3vpl6z1499silhs3fyn8c6xj3rzk94mm2m9srg4";
-  verifyCargoDeps = true;
+  cargoSha256 = "1a6svl89dcdb5fpvs2i32i6agyhl0sx7kkkw70rqr17fyzl5psai";
+  legacyCargoFetcher = false;
 
   doCheck = true;
   checkInputs = [ graphviz ];
diff --git a/pkgs/tools/security/fido2luks/default.nix b/pkgs/tools/security/fido2luks/default.nix
index 4682a09acf5c..ea911e467340 100644
--- a/pkgs/tools/security/fido2luks/default.nix
+++ b/pkgs/tools/security/fido2luks/default.nix
@@ -19,8 +19,8 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ cryptsetup ];
   nativeBuildInputs = [ pkg-config ];
 
-  cargoSha256 = "1i37k4ih6118z3wip2qh4jqk7ja2z0v1w8dri1lwqwlciqw17zi9";
-  verifyCargoDeps = true;
+  cargoSha256 = "0rp4f6xnwmvf3pv6h0qwsg01jrndf77yn67675ac39kxzmrzfy2f";
+  legacyCargoFetcher = false;
 
   meta = with stdenv.lib; {
     description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator";
diff --git a/pkgs/tools/system/tre-command/default.nix b/pkgs/tools/system/tre-command/default.nix
index 6050b2a709eb..b8925dcfa42e 100644
--- a/pkgs/tools/system/tre-command/default.nix
+++ b/pkgs/tools/system/tre-command/default.nix
@@ -11,8 +11,8 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1fazw2wn738iknbv54gv7qll7d4q2gy9bq1s3f3cv21cdv6bqral";
   };
 
-  cargoSha256 = "0m82zbi610zgvcza6n03xl80g31x6bfkjyrfxcxa6fyf2l5cj9pv";
-  verifyCargoDeps = true;
+  cargoSha256 = "1m3ccp5ncafkifg8sxyxczsg3ja1gvq8wmgni68bgzm2lwxh2qgw";
+  legacyCargoFetcher = false;
 
   meta = with stdenv.lib; {
     description = "Tree command, improved";

From 4682b29aad054b4ead15135c1d59db063497eafb Mon Sep 17 00:00:00 2001
From: Christian Kauhaus <kc@flyingcircus.io>
Date: Mon, 10 Feb 2020 16:39:24 +0100
Subject: [PATCH 0187/4636] libssh2-1.9.0: apply patch for CVE-2019-17498

No upstream release yet, but https://github.com/libssh2/libssh2/pull/402
has been accepted by upstream devs.

Original advisory:
https://blog.semmle.com/libssh2-integer-overflow-CVE-2019-17498/

Re #73662
---
 pkgs/development/libraries/libssh2/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index d4205981499c..365c836c9fdb 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -14,6 +14,15 @@ stdenv.mkDerivation rec {
   buildInputs = [ openssl zlib ]
     ++ stdenv.lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64;
 
+  patches = [
+    # not able to use fetchpatch here: infinite recursion
+    (fetchurl {
+      name = "CVE-2019-17498.patch";
+      url = "https://github.com/libssh2/libssh2/pull/402.patch";
+      sha256 = "1n9s2mcz5dkw0xpm3c5x4hzj8bar4i6z0pr1rmqjplhfg888vdvc";
+    })
+  ];
+
   meta = with stdenv.lib; {
     description = "A client-side C library implementing the SSH2 protocol";
     homepage = https://www.libssh2.org;

From 4fce9a6ca291c513278245fd0b34eebdac88d6a6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 8 Feb 2020 17:12:02 +0000
Subject: [PATCH 0188/4636] libmtp: 1.1.16 -> 1.1.17

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

diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix
index e750c2c6c70e..c8c34eb1c9c5 100644
--- a/pkgs/development/libraries/libmtp/default.nix
+++ b/pkgs/development/libraries/libmtp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libusb1, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "libmtp-1.1.16";
+  name = "libmtp-1.1.17";
 
   src = fetchurl {
     url = "mirror://sourceforge/libmtp/${name}.tar.gz";
-    sha256 = "185vh9bds6dcy00ycggg69g4v7m3api40zv8vrcfb3fk3vfzjs2v";
+    sha256 = "1p3r38nvdip40ab1h4scj3mzfjkx6kd14szjqyw9r6wz5pslr8zq";
   };
 
   outputs = [ "bin" "dev" "out" ];

From ccc54f0fc3ef6defa99de5035e06bd3871bca5ac Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jan 2020 03:35:43 -0800
Subject: [PATCH 0189/4636] drumkv1: 0.9.11 -> 0.9.12

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

diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index b926ff09d22b..d3399315376f 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -2,11 +2,11 @@
 
 mkDerivation rec {
   pname = "drumkv1";
-  version = "0.9.11";
+  version = "0.9.12";
 
   src = fetchurl {
     url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz";
-    sha256 = "1wnjn175l0mz51k9pjf3pdzv54c4jlh63saavld9lm6zfgfs13d7";
+    sha256 = "0hmnmk9vvi43wl6say0dg7j088h7mmwmfdwjhsq89c7i7cpg78da";
   };
 
   buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];

From d4f09b65906c1077397da825671f8b35e0175fdd Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 10 Feb 2020 19:45:36 +0200
Subject: [PATCH 0190/4636] luarocks: 3.2.1 -> 3.3.1

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

diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix
index fa19b2494076..565b6a5ca041 100644
--- a/pkgs/development/tools/misc/luarocks/default.nix
+++ b/pkgs/development/tools/misc/luarocks/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "luarocks";
-  version = "3.2.1";
+  version = "3.3.1";
 
   src = fetchFromGitHub {
     owner = "luarocks";
     repo = "luarocks";
     rev = "v${version}";
-    sha256 = "0viiafmb8binksda79ah828q1dfnb6jsqlk7vyndl2xvx9yfn4y2";
+    sha256 = "0859k2b9pihmcw45fdsbwx936npcj3vbp3hxi1v3j7n61dkw7r0s";
   };
 
   patches = [ ./darwin-3.1.3.patch ];

From 4f6d905d1ce2a4996bf41675493f09d65f42ed65 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 10 Feb 2020 19:54:04 +0200
Subject: [PATCH 0191/4636] sequoia: 0.13.0 -> 0.14.0

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

diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix
index 75fc66647e8e..355cc77ec34b 100644
--- a/pkgs/tools/security/sequoia/default.nix
+++ b/pkgs/tools/security/sequoia/default.nix
@@ -9,16 +9,16 @@ assert pythonSupport -> pythonPackages != null;
 
 rustPlatform.buildRustPackage rec {
   pname = "sequoia";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchFromGitLab {
     owner = "sequoia-pgp";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0hxdjzd2qjwf9pbnkzrnzlg0xa8vf1f65aryq7pd9895bpnk7740";
+    sha256 = "1p17y6vsya8daglvl6yal3759x44dc062ah5vyra0k7dk82cc4pq";
   };
 
-  cargoSha256 = "0w968ynxqkznp9g1ah040iv6ghwqwqjk1cjlr2f0j5fs57rspzf2";
+  cargoSha256 = "1hbwx2d9j5ddqlvskqxk951g59nsyk5y5l7f9yg2cyqhkzfil7nr";
 
   nativeBuildInputs = [
     pkgconfig

From fe560588a5df26bb0f76a0547164afd9ca7de5c4 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 10 Feb 2020 19:55:23 +0200
Subject: [PATCH 0192/4636] mpvScripts.mpris: 0.3 -> 0.4

Quote URL as well.
---
 pkgs/applications/video/mpv/scripts/mpris.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix
index e383823f2ccd..e318c7afa676 100644
--- a/pkgs/applications/video/mpv/scripts/mpris.nix
+++ b/pkgs/applications/video/mpv/scripts/mpris.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "mpv-mpris-${version}.so";
-  version = "0.3";
+  version = "0.4";
 
   src = fetchFromGitHub {
     owner = "hoyon";
     repo = "mpv-mpris";
     rev = version;
-    sha256 = "02lqsgp296s8wr0yh6wm8h7nhn53rj254zahpzbwdv15apgy0z17";
+    sha256 = "1fr3jvja8s2gdpx8qyk9r17977flms3qpm8zci62nd9r5wjdvr5i";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "MPRIS plugin for mpv";
-    homepage = https://github.com/hoyon/mpv-mpris;
+    homepage = "https://github.com/hoyon/mpv-mpris";
     license = licenses.mit;
     maintainers = with maintainers; [ jfrankenau ];
   };

From b5126937b4031cfb30733559935c3e2f4afcb5e5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 5 Jan 2020 17:01:50 +0100
Subject: [PATCH 0193/4636] duplicity: 0.7.19 -> 0.8.10

Update, port to Python 3 and clean up.

Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>
Co-Authored-By: Frederik Rietdijk <fridh@fridh.nl>
---
 pkgs/tools/backup/duplicity/default.nix       | 106 +++++++++++-------
 .../backup/duplicity/gnutar-in-test.patch     |  16 +--
 .../use-installed-scripts-in-test.patch       |  40 ++++++-
 pkgs/top-level/all-packages.nix               |   2 +-
 4 files changed, 113 insertions(+), 51 deletions(-)

diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index a33067e88979..0d4e098129a6 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -1,64 +1,90 @@
-{ stdenv, fetchpatch, fetchurl, python2Packages, librsync, ncftp, gnupg
+{ stdenv
+, fetchpatch
+, fetchurl
+, pythonPackages
+, librsync
+, ncftp
+, gnupg
 , gnutar
 , par2cmdline
 , utillinux
 , rsync
-, backblaze-b2, makeWrapper }:
+, backblaze-b2
+, makeWrapper
+}:
 
-python2Packages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   pname = "duplicity";
-  version = "0.7.19";
+  version = "0.8.10";
 
   src = fetchurl {
-    url = "https://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${pname}-${version}.tar.gz";
-    sha256 = "0ag9dknslxlasslwfjhqgcqbkb1mvzzx93ry7lch2lfzcdd91am6";
+    url = "https://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${pname}-${version}fin1558.tar.gz";
+    sha256 = "13apmavdc2cx3wxv2ymy97c575hc37xjhpa6b4sds8fkx2vrb0mh";
   };
-  patches = [
-    ./gnutar-in-test.patch
-    ./use-installed-scripts-in-test.patch
 
-    # The following patches improve the performance of installCheckPhase:
-    # Ensure all duplicity output is captured in tests
-    (fetchpatch {
-      extraPrefix = "";
-      sha256 = "07ay3mmnw8p2j3v8yvcpjsx0rf2jqly9ablwjpmry23dz9f0mxsd";
-      url = "https://bazaar.launchpad.net/~duplicity-team/duplicity/0.8-series/diff/1359.2.1";
-    })
-    # Minimize time spent sleeping between backups
-    (fetchpatch {
-      extraPrefix = "";
-      sha256 = "0v99q6mvikb8sf68gh3s0zg12pq8fijs87fv1qrvdnc8zvs4pmfs";
-      url = "https://bazaar.launchpad.net/~duplicity-team/duplicity/0.8-series/diff/1359.2.2";
-    })
-    # Remove unnecessary sleeping after running backups in tests
-    (fetchpatch {
-      extraPrefix = "";
-      sha256 = "1bmgp4ilq2gwz2k73fxrqplf866hj57lbyabaqpkvwxhr0ch1jiq";
-      url = "https://bazaar.launchpad.net/~duplicity-team/duplicity/0.8-series/diff/1359.2.3";
+  patches = [
+    # We use the tar binary on all platforms.
+    ./gnutar-in-test.patch
+
+    # Make test respect TMPDIR env var.
+    # https://bugs.launchpad.net/duplicity/+bug/1862672
+    (fetchurl {
+      url = "https://launchpadlibrarian.net/464404371/0001-Make-LogTest-respect-TMPDIR-env-variable.patch";
+      hash = "sha256-wdy8mMurLhBS0ZTXmlIGGrIkS2gGBDwTp7TRxTSXBGo=";
     })
+
+    # Our Python infrastructure runs test in installCheckPhase so we need
+    # to make the testing code stop assuming it is run from the source directory.
+    ./use-installed-scripts-in-test.patch
   ] ++ stdenv.lib.optionals stdenv.isLinux [
     ./linux-disable-timezone-test.patch
   ];
 
-  buildInputs = [ librsync makeWrapper python2Packages.wrapPython ];
-  propagatedBuildInputs = [ backblaze-b2 ] ++ (with python2Packages; [
-    boto cffi cryptography ecdsa enum idna pygobject3 fasteners
-    ipaddress lockfile paramiko pyasn1 pycrypto six pydrive
+  buildInputs = [
+    librsync
+    makeWrapper
+    pythonPackages.wrapPython
+  ];
+
+  propagatedBuildInputs = [
+    backblaze-b2
+  ] ++ (with pythonPackages; [
+    boto
+    cffi
+    cryptography
+    ecdsa
+    idna
+    pygobject3
+    fasteners
+    ipaddress
+    lockfile
+    paramiko
+    pyasn1
+    pycrypto
+    pydrive
+    future
+  ] ++ stdenv.lib.optionals (!isPy3k) [
+    enum
   ]);
+
   checkInputs = [
-    gnupg  # Add 'gpg' to PATH.
-    gnutar  # Add 'tar' to PATH.
-    librsync  # Add 'rdiff' to PATH.
-    par2cmdline  # Add 'par2' to PATH.
+    gnupg # Add 'gpg' to PATH.
+    gnutar # Add 'tar' to PATH.
+    librsync # Add 'rdiff' to PATH.
+    par2cmdline # Add 'par2' to PATH.
   ] ++ stdenv.lib.optionals stdenv.isLinux [
-    utillinux  # Add 'setsid' to PATH.
-  ] ++ (with python2Packages; [ lockfile mock pexpect ]);
+    utillinux # Add 'setsid' to PATH.
+  ] ++ (with pythonPackages; [
+    lockfile
+    mock
+    pexpect
+    pytest
+    pytestrunner
+  ]);
 
   postInstall = ''
     wrapProgram $out/bin/duplicity \
       --prefix PATH : "${stdenv.lib.makeBinPath [ gnupg ncftp rsync ]}"
-
-    wrapPythonPrograms
   '';
 
   preCheck = ''
@@ -88,7 +114,7 @@ python2Packages.buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     description = "Encrypted bandwidth-efficient backup using the rsync algorithm";
-    homepage = https://www.nongnu.org/duplicity;
+    homepage = "https://www.nongnu.org/duplicity";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ peti ];
     platforms = platforms.unix;
diff --git a/pkgs/tools/backup/duplicity/gnutar-in-test.patch b/pkgs/tools/backup/duplicity/gnutar-in-test.patch
index b2820feb0190..694fc8819509 100644
--- a/pkgs/tools/backup/duplicity/gnutar-in-test.patch
+++ b/pkgs/tools/backup/duplicity/gnutar-in-test.patch
@@ -4,15 +4,15 @@
          https://launchpad.net/bugs/929067
          """
 
--        if platform.system().startswith('Linux'):
--            tarcmd = "tar"
--        elif platform.system().startswith('Darwin'):
--            tarcmd = "gtar"
--        elif platform.system().endswith('BSD'):
--            tarcmd = "gtar"
+-        if platform.system().startswith(u'Linux'):
+-            tarcmd = u"tar"
+-        elif platform.system().startswith(u'Darwin'):
+-            tarcmd = u"gtar"
+-        elif platform.system().endswith(u'BSD'):
+-            tarcmd = u"gtar"
 -        else:
--            raise Exception("Platform %s not supported by tar/gtar." % platform.platform())
-+        tarcmd = "tar"
+-            raise Exception(u"Platform %s not supported by tar/gtar." % platform.platform())
++        tarcmd = u"tar"
 
          # Intial normal backup
          self.backup("full", "testfiles/blocktartest")
diff --git a/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch b/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch
index 191808abc637..a3ba14229159 100644
--- a/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch
+++ b/pkgs/tools/backup/duplicity/use-installed-scripts-in-test.patch
@@ -4,10 +4,46 @@
                  except Exception:
                      pass
 
--        os.environ['PATH'] = "%s:%s" % (
+-        os.environ[u'PATH'] = u"%s:%s" % (
 -            os.path.abspath(build_scripts_cmd.build_dir),
--            os.environ.get('PATH'))
+-            os.environ.get(u'PATH'))
 -
          test.run(self)
 
      def run_tests(self):
+--- a/testing/functional/__init__.py
++++ b/testing/functional/__init__.py
+@@ -107,7 +107,7 @@ class FunctionalTestCase(DuplicityTestCase):
+         if basepython is not None:
+             cmd_list.extend([basepython])
+             cmd_list.extend([u"-m", u"coverage", u"run", u"--source=duplicity", u"-p"])
+-        cmd_list.extend([u"../bin/duplicity"])
++        cmd_list.extend([u"duplicity"])
+         cmd_list.extend(options)
+         cmd_list.extend([u"-v0"])
+         cmd_list.extend([u"--no-print-statistics"])
+--- a/testing/functional/test_log.py
++++ b/testing/functional/test_log.py
+@@ -47,9 +47,9 @@ class LogTest(FunctionalTestCase):
+         # Run actual duplicity command (will fail, because no arguments passed)
+         basepython = os.environ.get(u'TOXPYTHON', None)
+         if basepython is not None:
+-            os.system(u"{} ../bin/duplicity --log-file={} >/dev/null 2>&1".format(basepython, self.logfile))
++            os.system(u"{} duplicity --log-file={} >/dev/null 2>&1".format(basepython, self.logfile))
+         else:
+-            os.system(u"../bin/duplicity --log-file={} >/dev/null 2>&1".format(self.logfile))
++            os.system(u"duplicity --log-file={} >/dev/null 2>&1".format(self.logfile))
+ 
+         # The format of the file should be:
+         # """ERROR 2
+--- a/testing/functional/test_rdiffdir.py
++++ b/testing/functional/test_rdiffdir.py
+@@ -38,7 +38,7 @@ class RdiffdirTest(FunctionalTestCase):
+ 
+     def run_rdiffdir(self, argstring):
+         u"""Run rdiffdir with given arguments"""
+-        self.run_cmd(u"../bin/rdiffdir " + argstring)
++        self.run_cmd(u"rdiffdir " + argstring)
+ 
+     def run_cycle(self, dirname_list):
+         u"""Run diff/patch cycle on directories in dirname_list"""
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6bfeaf0acf20..da80856205d1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2906,7 +2906,7 @@ in
   duplicati = callPackage ../tools/backup/duplicati { };
 
   duplicity = callPackage ../tools/backup/duplicity {
-    gnupg = gnupg1;
+    pythonPackages = python3Packages;
   };
 
   duply = callPackage ../tools/backup/duply { };

From bcdc90a3a7dba95a56db91dcd53b4b9f0e6d35aa Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 28 Dec 2019 12:29:24 +0100
Subject: [PATCH 0194/4636] ruby_2_4: remove

According to https://endoflife.software/programming-languages/server-side-scripting/ruby
ruby 2.4 will go end-of-life in march, where the new release of nixpkgs
will be cut. We won't be able to support it for security updates.

Remove all references to ruby_2_4 and add ruby_2_7 instead where
missing.

Mark packages that depend on ruby 2.4 as broken:
* chefdk
* sonic-pi
---
 pkgs/applications/audio/sonic-pi/default.nix  |  2 ++
 .../development/interpreters/ruby/default.nix | 21 +++----------------
 .../ruby-modules/with-packages/test.nix       |  1 -
 pkgs/development/tools/chefdk/default.nix     |  6 ++++--
 pkgs/servers/http/unit/default.nix            |  3 ---
 pkgs/top-level/aliases.nix                    |  6 ++++--
 pkgs/top-level/all-packages.nix               |  6 +-----
 7 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix
index ac72a26b0eec..534ea1358803 100644
--- a/pkgs/applications/audio/sonic-pi/default.nix
+++ b/pkgs/applications/audio/sonic-pi/default.nix
@@ -105,5 +105,7 @@ mkDerivation rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ Phlogistique kamilchm ];
     platforms = lib.platforms.linux;
+    # sonic-pi depends on ruby 2.4 which we don't support anymore
+    broken = true;
   };
 }
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 8b8e7ccc8bb0..8ddd19bb40cc 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -26,7 +26,6 @@ let
   generic = { version, sha256 }: let
     ver = version;
     tag = ver.gitTag;
-    atLeast25 = lib.versionAtLeast ver.majMin "2.5";
     atLeast27 = lib.versionAtLeast ver.majMin "2.7";
     baseruby = self.override {
       useRailsExpress = false;
@@ -77,14 +76,13 @@ let
         nativeBuildInputs = [ autoreconfHook bison ]
           ++ (op docSupport groff)
           ++ op (stdenv.buildPlatform != stdenv.hostPlatform) buildPackages.ruby;
-        buildInputs =
-             (op fiddleSupport libffi)
+        buildInputs = [ autoconf ]
+          ++ (op fiddleSupport libffi)
           ++ (ops cursesSupport [ ncurses readline ])
           ++ (op zlibSupport zlib)
           ++ (op opensslSupport openssl)
           ++ (op gdbmSupport gdbm)
           ++ (op yamlSupport libyaml)
-          ++ (op atLeast25 autoconf)
           # Looks like ruby fails to build on darwin without readline even if curses
           # support is not enabled, so add readline to the build inputs if curses
           # support is disabled (if it's enabled, we already have it) and we're
@@ -106,15 +104,10 @@ let
           cp -r ${rubygems}/test/rubygems $sourceRoot/test
         '';
 
-        postPatch = if atLeast25 then ''
+        postPatch = ''
           sed -i configure.ac -e '/config.guess/d'
           cp --remove-destination ${config}/config.guess tool/
           cp --remove-destination ${config}/config.sub tool/
-        ''
-        else opString useRailsExpress ''
-          sed -i configure.in -e '/config.guess/d'
-          cp ${config}/config.guess tool/
-          cp ${config}/config.sub tool/
         '';
 
         # Force the revision.h generation. Somehow `revision.tmp` is an empty
@@ -230,14 +223,6 @@ let
     ) args; in self;
 
 in {
-  ruby_2_4 = generic {
-    version = rubyVersion "2" "4" "9" "";
-    sha256 = {
-      src = "1bn6n5b920qy3lsx99jr8495jkc3sg89swgb96d5fgd579g6p6zr";
-      git = "066kb1iki7mx7qkm10xhj5b6v8s47wg68v43l3nc36y2hyim1w2c";
-    };
-  };
-
   ruby_2_5 = generic {
     version = rubyVersion "2" "5" "7" "";
     sha256 = {
diff --git a/pkgs/development/ruby-modules/with-packages/test.nix b/pkgs/development/ruby-modules/with-packages/test.nix
index dc1da3de4924..946854e4545f 100644
--- a/pkgs/development/ruby-modules/with-packages/test.nix
+++ b/pkgs/development/ruby-modules/with-packages/test.nix
@@ -6,7 +6,6 @@ let
   stdenv = pkgs.stdenv;
 
   rubyVersions = with pkgs; [
-    ruby_2_4
     ruby_2_5
     ruby_2_6
     ruby_2_7
diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix
index d30c0aaeb496..5f6c2b156f36 100644
--- a/pkgs/development/tools/chefdk/default.nix
+++ b/pkgs/development/tools/chefdk/default.nix
@@ -1,9 +1,9 @@
-{ lib, bundlerEnv, bundlerUpdateScript, ruby_2_4, perl, autoconf }:
+{ lib, bundlerEnv, bundlerUpdateScript, ruby, perl, autoconf }:
 
 bundlerEnv {
   name = "chef-dk-2.4.17";
 
-  ruby = ruby_2_4;
+  inherit ruby;
   gemdir = ./.;
 
   buildInputs = [ perl autoconf ];
@@ -16,5 +16,7 @@ bundlerEnv {
     license     = licenses.asl20;
     maintainers = with maintainers; [ offline nicknovitski ];
     platforms   = platforms.unix;
+    # chefdk depends on ruby 2.4 which we don't support anymore
+    broken      = true;
   };
 }
diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix
index c3af0d555438..ab11481ccf32 100644
--- a/pkgs/servers/http/unit/default.nix
+++ b/pkgs/servers/http/unit/default.nix
@@ -6,7 +6,6 @@
 , withPerl528 ? false, perl528
 , withPerl530 ? true, perl530
 , withPerldevel ? false, perldevel
-, withRuby_2_4 ? false, ruby_2_4
 , withRuby_2_5 ? false, ruby_2_5
 , withRuby_2_6 ? true, ruby_2_6
 , withRuby_2_7 ? true, ruby_2_7
@@ -43,7 +42,6 @@ stdenv.mkDerivation rec {
     ++ optional withPerl528 perl528
     ++ optional withPerl530 perl530
     ++ optional withPerldevel perldevel
-    ++ optional withRuby_2_4 ruby_2_4
     ++ optional withRuby_2_5 ruby_2_5
     ++ optional withRuby_2_6 ruby_2_6
     ++ optional withRuby_2_7 ruby_2_7
@@ -66,7 +64,6 @@ stdenv.mkDerivation rec {
     ${optionalString withPerl528    "./configure perl   --module=perl528  --perl=${perl528}/bin/perl"}
     ${optionalString withPerl530    "./configure perl   --module=perl530  --perl=${perl530}/bin/perl"}
     ${optionalString withPerldevel  "./configure perl   --module=perldev  --perl=${perldevel}/bin/perl"}
-    ${optionalString withRuby_2_4   "./configure ruby   --module=ruby24   --ruby=${ruby_2_4}/bin/ruby"}
     ${optionalString withRuby_2_5   "./configure ruby   --module=ruby25   --ruby=${ruby_2_5}/bin/ruby"}
     ${optionalString withRuby_2_6   "./configure ruby   --module=ruby26   --ruby=${ruby_2_6}/bin/ruby"}
     ${optionalString withRuby_2_7   "./configure ruby   --module=ruby27   --ruby=${ruby_2_7}/bin/ruby"}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2d5bee58b7ff..f8748b2df9b1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -378,8 +378,10 @@ mapAliases ({
   ruby_2_2_9 = throw "deprecated 2018-0213: use a newer version of ruby";
   ruby_2_3_6 = throw "deprecated 2018-0213: use a newer version of ruby";
   ruby_2_3 = throw "deprecated 2019-09-06: use a newer version of ruby";
-  ruby_2_4_3 = throw "deprecated 2018-0213: use ruby_2_4 instead";
-  ruby_2_5_0 = throw "deprecated 2018-0213: use ruby_2_5 instead";
+  ruby_2_4_3 = throw "deprecated 2018-0213: use a newer version of ruby";
+  ruby_2_4 = throw "deprecated 2019-12: use a newer version of ruby";
+  ruby_2_5_0 = throw "deprecated 2018-0213: use a newer version of ruby";
+  rubyPackages_2_4 = throw "deprecated 2019-12: use a newer version of rubyPackages instead";
   rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby";
   rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02
   s6Dns = s6-dns; # added 2018-07-23
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf601b9a6079..e42e53235391 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9424,7 +9424,6 @@ in
     inherit (darwin) libiconv libobjc libunwind;
     inherit (darwin.apple_sdk.frameworks) Foundation;
   })
-    ruby_2_4
     ruby_2_5
     ruby_2_6
     ruby_2_7;
@@ -9445,7 +9444,6 @@ in
   ruby = ruby_2_6;
   rubyPackages = rubyPackages_2_6;
 
-  rubyPackages_2_4 = recurseIntoAttrs ruby_2_4.gems;
   rubyPackages_2_5 = recurseIntoAttrs ruby_2_5.gems;
   rubyPackages_2_6 = recurseIntoAttrs ruby_2_6.gems;
   rubyPackages_2_7 = recurseIntoAttrs ruby_2_7.gems;
@@ -21363,9 +21361,7 @@ in
 
   wavebox = callPackage ../applications/networking/instant-messengers/wavebox { };
 
-  sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi {
-    ruby = ruby_2_4;  # sonic-pi build breaks with ruby 2.5 and 2.6
-  };
+  sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { };
 
   st = callPackage ../applications/misc/st {
     conf = config.st.conf or null;

From e1efcdfd694afce1be996c6c4066d5a2564bdfbc Mon Sep 17 00:00:00 2001
From: luc65r <lucas.r065@yahoo.fr>
Date: Sun, 9 Feb 2020 23:16:29 +0100
Subject: [PATCH 0195/4636] maintainers: add luc65r

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8d5447654eef..bf81339607be 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4241,6 +4241,12 @@
     github = "ltavard";
     name = "Laure Tavard";
   };
+  luc65r = {
+    email = "lucas@ransan.tk";
+    github = "luc65r";
+    githubId = 59375051;
+    name = "Lucas Ransan";
+  };
   lucus16 = {
     email = "lars.jellema@gmail.com";
     github = "Lucus16";

From 94c60990fc2ac185b070af63bb4ec2bb8db48f10 Mon Sep 17 00:00:00 2001
From: luc65r <lucas.r065@yahoo.fr>
Date: Sun, 9 Feb 2020 23:17:07 +0100
Subject: [PATCH 0196/4636] cemu: init at 1.3

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

diff --git a/pkgs/applications/science/math/cemu/default.nix b/pkgs/applications/science/math/cemu/default.nix
new file mode 100644
index 000000000000..f91e5be51700
--- /dev/null
+++ b/pkgs/applications/science/math/cemu/default.nix
@@ -0,0 +1,53 @@
+{ fetchFromGitHub
+, stdenv
+, mkDerivation
+, SDL2
+, libGL
+, libarchive
+, libusb
+, qtbase
+, qmake
+, git
+, libpng_apng
+, pkgconfig
+}:
+
+mkDerivation rec {
+  pname = "CEmu";
+  version = "1.3";
+  src = fetchFromGitHub {
+    owner = "CE-Programming";
+    repo = "CEmu";
+    rev = "v${version}";
+    sha256 = "1wcdnzcqscawj6jfdj5wwmw9g9vsd6a1rx0rrramakxzf8b7g47r";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    qmake
+    git
+    pkgconfig
+  ];
+
+  buildInputs = [
+    SDL2
+    libGL
+    libarchive
+    libusb
+    qtbase
+    libpng_apng
+  ];
+
+  qmakeFlags = [
+    "gui/qt"
+  ];
+
+  meta = with stdenv.lib; {
+    changelog = "https://github.com/CE-Programming/CEmu/releases/tag/v${version}";
+    description = "Third-party TI-84 Plus CE / TI-83 Premium CE emulator, focused on developer features";
+    homepage = "https://ce-programming.github.io/CEmu";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ luc65r ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 361b30a187f7..4600ca8b1ee4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2348,6 +2348,8 @@ in
     inherit (darwin.apple_sdk.frameworks) Carbon IOKit;
   };
 
+  cemu = qt5.callPackage ../applications/science/math/cemu { };
+
   isomd5sum = callPackage ../tools/cd-dvd/isomd5sum { };
 
   mdf2iso = callPackage ../tools/cd-dvd/mdf2iso { };

From d6f5459da9c7fc941cf97eb1eccf0458872def18 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Mon, 10 Feb 2020 21:28:33 +0300
Subject: [PATCH 0197/4636] osm2pgsql: enable on darwin

---
 pkgs/tools/misc/osm2pgsql/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/tools/misc/osm2pgsql/default.nix
index 8905f9eb36ad..6137abd92939 100644
--- a/pkgs/tools/misc/osm2pgsql/default.nix
+++ b/pkgs/tools/misc/osm2pgsql/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, cmake, expat, proj, bzip2, zlib, boost, postgresql, lua}:
+{ stdenv, fetchFromGitHub, cmake, expat, proj, bzip2, zlib, boost, postgresql
+, withLuaJIT ? false, lua, luajit }:
 
 stdenv.mkDerivation rec {
   pname = "osm2pgsql";
@@ -13,7 +14,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = [ expat proj bzip2 zlib boost postgresql lua ];
+  buildInputs = [ expat proj bzip2 zlib boost postgresql ]
+    ++ stdenv.lib.optional withLuaJIT luajit
+    ++ stdenv.lib.optional (!withLuaJIT) lua;
+
+  cmakeFlags = stdenv.lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON";
 
   NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H";
 
@@ -21,7 +26,7 @@ stdenv.mkDerivation rec {
     description = "OpenStreetMap data to PostgreSQL converter";
     homepage = "https://github.com/openstreetmap/osm2pgsql";
     license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = with platforms; linux ++ darwin;
     maintainers = with maintainers; [ jglukasik ];
   };
 }

From 79d0c76b75b88a1a31ca397d17d91265850033ea Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 8 Feb 2020 02:56:00 +0000
Subject: [PATCH 0198/4636] cinnamon.cinnamon-desktop: 4.4.0 -> 4.4.1

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

diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
index a622e6abfd12..c5beff134b3f 100644
--- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-desktop";
-  version = "4.4.0";
+  version = "4.4.1";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    sha256 = "17hb8gkb9pfj56ckva5g4x83yvmdv7hvpidxjsdf79dw6pabr5rg";
+    sha256 = "10db5rai8cbbzphvcwarr3hm1bd9rxchlc0hcghg7qnmvv52fq03";
   };
 
   outputs = [ "out" "dev" ];

From ebb3d1a9a49b1b5b3eac8911b7eb3bd48870098a Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Thu, 6 Feb 2020 13:02:09 +0100
Subject: [PATCH 0199/4636] glfw: 3.3.1 -> 3.3.2

---
 pkgs/development/libraries/glfw/3.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix
index 16368ae21276..0dfe3cbea2e4 100644
--- a/pkgs/development/libraries/glfw/3.x.nix
+++ b/pkgs/development/libraries/glfw/3.x.nix
@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.3.1";
+  version = "3.3.2";
   pname = "glfw";
 
   src = fetchFromGitHub {
     owner = "glfw";
     repo = "GLFW";
     rev = version;
-    sha256 = "0c7nlrhq84gdq10diyv6nshjbv8410bmn0vging815pfvis208xc";
+    sha256 = "0b5lsxz1xkzip7fvbicjkxvg5ig8gbhx1zrlhandqc0rpk56bvyw";
   };
 
   enableParallelBuilding = true;

From 8a24d3f89214d1f9d1f85de834b887fd2afec572 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Sun, 9 Feb 2020 13:48:38 +0100
Subject: [PATCH 0200/4636] chipsec: 1.4.1 -> 1.4.7

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

diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix
index 7b4c8cf68eb8..7d7456309899 100644
--- a/pkgs/tools/security/chipsec/default.nix
+++ b/pkgs/tools/security/chipsec/default.nix
@@ -2,13 +2,13 @@
 , kernel ? null, withDriver ? false }:
 pythonPackages.buildPythonApplication rec {
   name = "chipsec-${version}";
-  version = "1.4.1";
+  version = "1.4.7";
 
   src = fetchFromGitHub {
     owner = "chipsec";
     repo = "chipsec";
     rev = version;
-    sha256 = "043gf21zygvrzvvkwv5xxpcv3ryj5m8klkgyhq0lnh6k594qrg77";
+    sha256 = "11qi4m4hqkylf1wd7f921r0p7xg5prpmfkmb7l9nn7sb95zz0sjr";
   };
 
   nativeBuildInputs = [

From 70e3b2b4429e0ab39fb64701be2c9ec790fed22c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Sun, 9 Feb 2020 02:22:47 +0100
Subject: [PATCH 0201/4636] twinkle: patch manual link since old domain got
 re-used

---
 .../networking/instant-messengers/twinkle/default.nix     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix
index 0378f50a9c00..b6f0b87dc848 100644
--- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix
+++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix
@@ -47,10 +47,16 @@ mkDerivation rec {
   ];
 
   patches = [
-    (fetchurl { # https://github.com/LubosD/twinkle/pull/152 patch for bcg729 1.0.2+
+    # patch for bcg729 1.0.2+
+    (fetchurl { # https://github.com/LubosD/twinkle/pull/152
       url = "https://github.com/LubosD/twinkle/compare/05082ae12051821b1d969e6672d9e4e5afe1bc07...7a6c533cda387652b5b4cb2a867be1a18585890c.patch";
       sha256 = "39fc6cef3e88cfca8db44612b2d082fb618027b0f99509138d3c0d2777a494c2";
     })
+    # patch manual link to not link to old url, which now points to NSFW page
+    (fetchurl { # https://github.com/LubosD/twinkle/commit/05082ae12051821b1d969e6672d9e4e5afe1bc07
+      url = "https://github.com/LubosD/twinkle/commit/05082ae12051821b1d969e6672d9e4e5afe1bc07.diff";
+      sha256 = "1iamragr9wp2vczsnp6n261fpr1ai2nc2abp0228jlar9zafksw0";
+    })
   ];
 
   nativeBuildInputs = [

From e77291b64e0bfb00efce0e66fe1295637e186386 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Sun, 9 Feb 2020 13:05:40 +0100
Subject: [PATCH 0202/4636] hpmyroom: 11.1.0.0508 -> 12.0.0.0220

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

diff --git a/pkgs/applications/networking/hpmyroom/default.nix b/pkgs/applications/networking/hpmyroom/default.nix
index b0f21f6f7e0b..59274f4105b2 100644
--- a/pkgs/applications/networking/hpmyroom/default.nix
+++ b/pkgs/applications/networking/hpmyroom/default.nix
@@ -4,11 +4,11 @@
 }:
 mkDerivation rec {
   pname = "hpmyroom";
-  version = "11.1.0.0508";
+  version = "12.0.0.0220";
 
   src = fetchurl {
     url = "https://www.myroom.hpe.com/downloadfiles/${pname}-${version}.x86_64.rpm";
-    sha256 = "1j7mzvf349yxb42m8syh73gpvil01hy1a2wrr0rdzb2ijfnkxyaa";
+    sha256 = "0gajj2s6l7jj8520agrv2dyisg7hhacbwzqlsp9a0xdxr0v71jhr";
   };
 
   nativeBuildInputs = [

From 6ca7b62a3670d6ebdd6e8ac7f3d531471f1263f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= <vn.mcsinyx@gmail.com>
Date: Sat, 8 Feb 2020 15:55:30 +0700
Subject: [PATCH 0203/4636] alure2: unstable-2020-01-09 -> unstable-2020-02-06

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

diff --git a/pkgs/development/libraries/alure2/default.nix b/pkgs/development/libraries/alure2/default.nix
index 91919873fa63..6da95a772648 100644
--- a/pkgs/development/libraries/alure2/default.nix
+++ b/pkgs/development/libraries/alure2/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "alure2";
-  version = "unstable-2020-01-09";
+  version = "unstable-2020-02-06";
 
   src = fetchFromGitHub {
     owner = "kcat";
     repo = "alure";
-    rev = "4b7b58d3f0de444d6f26aa705704deb59145f586";
-    sha256 = "0ds18hhy2wpvx498z5hcpzfqz9i60ixsi0cjihyvk20rf4qy12vg";
+    rev = "50f92fe528e77da82197fd947d1cf9b0a82a0c7d";
+    sha256 = "1gmc1yfhwaj6lik0vn7zv8y23i05f4rw25v2jg34n856jcs02svx";
   };
 
   nativeBuildInputs = [ cmake ];

From bcad453bcfdc85048632054b2b1dfa3077b1953f Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Fri, 20 Dec 2019 12:11:24 -0500
Subject: [PATCH 0204/4636] minc_tools: 2017-09-11 -> unstable-2019-12-04

---
 .../science/biology/minc-tools/default.nix           | 10 ++++++----
 .../biology/minc-tools/fix-netcdf-header.patch       | 12 ++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/science/biology/minc-tools/fix-netcdf-header.patch

diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix
index 033f78609e9a..87d5ceaa125e 100644
--- a/pkgs/applications/science/biology/minc-tools/default.nix
+++ b/pkgs/applications/science/biology/minc-tools/default.nix
@@ -1,16 +1,18 @@
 { stdenv, fetchFromGitHub, cmake, makeWrapper, flex, bison, perlPackages, libminc, libjpeg, zlib }:
 
 stdenv.mkDerivation rec {
-  pname = "minc-tools";
-  name  = "${pname}-2017-09-11";
+  pname   = "minc-tools";
+  version = "unstable-2019-12-04";
 
   src = fetchFromGitHub {
     owner  = "BIC-MNI";
     repo   = pname;
-    rev    = "5b7c40425cd4f67a018055cb85c0157ee50a3056";
-    sha256 = "0zkcs05svp1gj5h0cdgc0k20c7lrk8m7wg3ks3xc5mkaiannj8g7";
+    rev    = "d4dddfdb4e4fa0cea389b8fdce51cfc076565d94";
+    sha256 = "1wwdss59qq4hz1jp35qylfswzzv0d37if23al0srnxkkgc5f8zng";
   };
 
+  patches = [ ./fix-netcdf-header.patch ];
+
   nativeBuildInputs = [ cmake flex bison makeWrapper ];
   buildInputs = [ libminc libjpeg zlib ];
   propagatedBuildInputs = with perlPackages; [ perl TextFormat ];
diff --git a/pkgs/applications/science/biology/minc-tools/fix-netcdf-header.patch b/pkgs/applications/science/biology/minc-tools/fix-netcdf-header.patch
new file mode 100644
index 000000000000..89c7564f8b62
--- /dev/null
+++ b/pkgs/applications/science/biology/minc-tools/fix-netcdf-header.patch
@@ -0,0 +1,12 @@
+diff --git a/progs/mincdump/mincdump.h b/progs/mincdump/mincdump.h
+index 14c95cd..117ab26 100644
+--- a/progs/mincdump/mincdump.h
++++ b/progs/mincdump/mincdump.h
+@@ -3,6 +3,7 @@
+  *   See netcdf/COPYRIGHT file for copying and redistribution conditions.
+  *   $Header: /private-cvsroot/minc/progs/mincdump/mincdump.h,v 1.1 2004-04-27 15:35:15 bert Exp $
+  *********************************************************************/
++#include <netcdf_meta.h>
+ 
+ 
+ /* error checking macro */

From 39f0e3b32b5b4aa5ec463c21fa3488f677fac18e Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Fri, 7 Feb 2020 11:57:12 -0500
Subject: [PATCH 0205/4636] minc_tools: enable building conversion tools

---
 .../science/biology/minc-tools/default.nix            | 11 ++++++++---
 pkgs/top-level/all-packages.nix                       |  4 +++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix
index 87d5ceaa125e..4c8b768a56a9 100644
--- a/pkgs/applications/science/biology/minc-tools/default.nix
+++ b/pkgs/applications/science/biology/minc-tools/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, cmake, makeWrapper, flex, bison, perlPackages, libminc, libjpeg, zlib }:
+{ stdenv, fetchFromGitHub, cmake, makeWrapper, flex, bison, perl, TextFormat,
+  libminc, libjpeg, nifticlib, zlib }:
 
 stdenv.mkDerivation rec {
   pname   = "minc-tools";
@@ -15,9 +16,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake flex bison makeWrapper ];
   buildInputs = [ libminc libjpeg zlib ];
-  propagatedBuildInputs = with perlPackages; [ perl TextFormat ];
+  propagatedBuildInputs = [ perl TextFormat ];
 
-  cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ];
+  cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/"
+                 "-DZNZ_INCLUDE_DIR=${nifticlib}/include/"
+                 "-DZNZ_LIBRARY=${nifticlib}/lib/libznz.a"
+                 "-DNIFTI_INCLUDE_DIR=${nifticlib}/include/nifti/"
+                 "-DNIFTI_LIBRARY=${nifticlib}/lib/libniftiio.a" ];
 
   postFixup = ''
     for prog in minccomplete minchistory mincpik; do
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b325f77a87af..85891e27c516 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23884,7 +23884,9 @@ in
 
   messer-slim = callPackage ../applications/science/biology/messer-slim { };
 
-  minc_tools = callPackage ../applications/science/biology/minc-tools { };
+  minc_tools = callPackage ../applications/science/biology/minc-tools {
+    inherit (perlPackages) perl TextFormat;
+  };
 
   minc_widgets = callPackage ../applications/science/biology/minc-widgets { };
 

From ec85f51603073e9912aedf1f74e75c76cd592305 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Fri, 7 Feb 2020 10:44:52 +0300
Subject: [PATCH 0206/4636] tippecanoe: 1.34.3 -> 1.35.0

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

diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/pkgs/applications/misc/tippecanoe/default.nix
index 8d84ab59d479..c85192603cbc 100644
--- a/pkgs/applications/misc/tippecanoe/default.nix
+++ b/pkgs/applications/misc/tippecanoe/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tippecanoe";
-  version = "1.34.3";
+  version = "1.35.0";
 
   src = fetchFromGitHub {
     owner = "mapbox";
     repo = pname;
     rev = version;
-    sha256 = "08pkxzwp4w5phrk9b0vszxnx8yymp50v0bcw96pz8qwk48z4xm0i";
+    sha256 = "0v5ycc3gsqnl9pps3m45yrnb1gvw5pk6jdyr0q6516b4ac6x67m5";
   };
 
   buildInputs = [ sqlite zlib ];
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Build vector tilesets from large collections of GeoJSON features";
-    homepage = https://github.com/mapbox/tippecanoe;
+    homepage = "https://github.com/mapbox/tippecanoe";
     license = licenses.bsd2;
     maintainers = with maintainers; [ sikmir ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = with platforms; linux ++ darwin;
   };
 }

From a9942b0226f8bd08a007001f6f2daf90ae73c2f4 Mon Sep 17 00:00:00 2001
From: Evils <evils.devils@protonmail.com>
Date: Sun, 12 Jan 2020 16:45:35 +0100
Subject: [PATCH 0207/4636] kicad: simplify component names

---
 .../science/electronics/kicad/default.nix     | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index 0b627dbb23ae..a60f8db388a5 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -35,8 +35,8 @@ let
   python = python3;
   wxPython = python3Packages.wxPython_4_0;
 
-  kicad-libraries = callPackages ./libraries.nix versionConfig.libVersion;
-  kicad-base = callPackage ./base.nix {
+  libraries = callPackages ./libraries.nix versionConfig.libVersion;
+  base = callPackage ./base.nix {
     pname = baseName;
     inherit versions stable baseName;
     inherit wxGTK python wxPython;
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
   inherit pname;
   version = versions.${baseName}.kicadVersion.version;
 
-  src = kicad-base;
+  src = base;
   dontUnpack = true;
   dontConfigure = true;
   dontBuild = true;
@@ -61,10 +61,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = optionals (scriptingSupport)
     [ pythonPackages.wrapPython ];
 
-  # wrapGAppsHook added the equivalent to ${kicad-base}/share
+  # wrapGAppsHook added the equivalent to ${base}/share
   # though i noticed no difference without it
   makeWrapperArgs = [
-    "--prefix XDG_DATA_DIRS : ${kicad-base}/share"
+    "--prefix XDG_DATA_DIRS : ${base}/share"
     "--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share"
     "--prefix XDG_DATA_DIRS : ${gnome3.defaultIconTheme}/share"
     "--prefix XDG_DATA_DIRS : ${wxGTK.gtk}/share/gsettings-schemas/${wxGTK.gtk.name}"
@@ -73,13 +73,13 @@ stdenv.mkDerivation rec {
     "--prefix XDG_DATA_DIRS : ${cups}/share"
     "--prefix GIO_EXTRA_MODULES : ${gnome3.dconf}/lib/gio/modules"
 
-    "--set KISYSMOD ${kicad-libraries.footprints}/share/kicad/modules"
-    "--set KICAD_SYMBOL_DIR ${kicad-libraries.symbols}/share/kicad/library"
-    "--set KICAD_TEMPLATE_DIR ${kicad-libraries.templates}/share/kicad/template"
-    "--prefix KICAD_TEMPLATE_DIR : ${kicad-libraries.symbols}/share/kicad/template"
-    "--prefix KICAD_TEMPLATE_DIR : ${kicad-libraries.footprints}/share/kicad/template"
+    "--set KISYSMOD ${libraries.footprints}/share/kicad/modules"
+    "--set KICAD_SYMBOL_DIR ${libraries.symbols}/share/kicad/library"
+    "--set KICAD_TEMPLATE_DIR ${libraries.templates}/share/kicad/template"
+    "--prefix KICAD_TEMPLATE_DIR : ${libraries.symbols}/share/kicad/template"
+    "--prefix KICAD_TEMPLATE_DIR : ${libraries.footprints}/share/kicad/template"
   ]
-  ++ optionals (with3d) [ "--set KISYS3DMOD ${kicad-libraries.packages3d}/share/kicad/modules/packages3d" ]
+  ++ optionals (with3d) [ "--set KISYS3DMOD ${libraries.packages3d}/share/kicad/modules/packages3d" ]
   ++ optionals (ngspiceSupport) [ "--prefix LD_LIBRARY_PATH : ${libngspice}/lib" ]
 
   # infinisil's workaround for #39493
@@ -88,30 +88,30 @@ stdenv.mkDerivation rec {
 
   # dunno why i have to add $makeWrapperArgs manually...
   # $out and $program_PYTHONPATH don't exist when makeWrapperArgs gets set?
-  # not sure if anything has to be done with the other stuff in kicad-base/bin
+  # not sure if anything has to be done with the other stuff in base/bin
   # dxf2idf, idf2vrml, idfcyl, idfrect, kicad2step, kicad-ogltest
   installPhase =
-    optionalString (scriptingSupport) '' buildPythonPath "${kicad-base} $pythonPath"
+    optionalString (scriptingSupport) '' buildPythonPath "${base} $pythonPath"
     '' +
-    '' makeWrapper ${kicad-base}/bin/kicad $out/bin/kicad $makeWrapperArgs ''
+    '' makeWrapper ${base}/bin/kicad $out/bin/kicad $makeWrapperArgs ''
     + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH"
     '' +
-    '' makeWrapper ${kicad-base}/bin/pcbnew $out/bin/pcbnew $makeWrapperArgs ''
+    '' makeWrapper ${base}/bin/pcbnew $out/bin/pcbnew $makeWrapperArgs ''
     + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH"
     '' +
-    '' makeWrapper ${kicad-base}/bin/eeschema $out/bin/eeschema $makeWrapperArgs ''
+    '' makeWrapper ${base}/bin/eeschema $out/bin/eeschema $makeWrapperArgs ''
     + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH"
     '' +
-    '' makeWrapper ${kicad-base}/bin/gerbview $out/bin/gerbview $makeWrapperArgs ''
+    '' makeWrapper ${base}/bin/gerbview $out/bin/gerbview $makeWrapperArgs ''
     + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH"
     '' +
-    '' makeWrapper ${kicad-base}/bin/pcb_calculator $out/bin/pcb_calculator $makeWrapperArgs ''
+    '' makeWrapper ${base}/bin/pcb_calculator $out/bin/pcb_calculator $makeWrapperArgs ''
     + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH"
     '' +
-    '' makeWrapper ${kicad-base}/bin/pl_editor $out/bin/pl_editor $makeWrapperArgs ''
+    '' makeWrapper ${base}/bin/pl_editor $out/bin/pl_editor $makeWrapperArgs ''
     + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH"
     '' +
-    '' makeWrapper ${kicad-base}/bin/bitmap2component $out/bin/bitmap2component $makeWrapperArgs ''
+    '' makeWrapper ${base}/bin/bitmap2component $out/bin/bitmap2component $makeWrapperArgs ''
     + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH"
     ''
   ;

From d3a9e634bf463b0cfbad2dc02cad58e7f3b102e3 Mon Sep 17 00:00:00 2001
From: Evils <evils.devils@protonmail.com>
Date: Sat, 11 Jan 2020 11:29:55 +0100
Subject: [PATCH 0208/4636] kicad-unstable: update update.sh && update

use /tmp instead of XDG_RUNTIME_DIR
  which is /run/user/1000, which defaults to 10% of RAM
  and kicad-packages3d needs ~6gb
---
 .../science/electronics/kicad/update.sh       | 16 ++++++-------
 .../science/electronics/kicad/versions.nix    | 24 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/science/electronics/kicad/update.sh b/pkgs/applications/science/electronics/kicad/update.sh
index b4f744c47ef3..7dc0b008b6c2 100755
--- a/pkgs/applications/science/electronics/kicad/update.sh
+++ b/pkgs/applications/science/electronics/kicad/update.sh
@@ -5,13 +5,12 @@
 # this should contain the versions' revs and hashes
 # the stable revs are stored only for ease of skipping
 
-# if you get something like "tar: no space left on device"
-# you may need a bigger tmpfs, this can be set as such
-# services.logind.extraConfig = "RuntimeDirectorySize=8G";
-# this is most likely only needed for the packages3d
-# this can be checked without that config by manual TOFU
-# copy the generated items from ,versions.nix to versions.nix
-# then nix-build and see what it actually gets
+# by default nix-prefetch-url uses XDG_RUNTIME_DIR as tmp
+# which is /run/user/1000, which defaults to 10% of your RAM
+# unless you have over 64GB of ram that'll be insufficient
+# resulting in "tar: no space left on device" for packages3d
+# hence:
+export TMPDIR=/tmp
 
 # if something goes unrepairably wrong, run 'update.sh all clean'
 
@@ -19,7 +18,8 @@
 # support parallel instances for each pname
 #   currently risks reusing old data
 # no getting around manually checking if the build product works...
-# if there is, default to commiting
+# if there is, default to commiting?
+#   won't work when running in parallel?
 # remove items left in /nix/store?
 
 # get the latest tag that isn't an RC or *.99
diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix
index ac273a1265cd..6b9a981a87c4 100644
--- a/pkgs/applications/science/electronics/kicad/versions.nix
+++ b/pkgs/applications/science/electronics/kicad/versions.nix
@@ -27,25 +27,25 @@
   };
   "kicad-unstable" = {
     kicadVersion = {
-      version =			"2020-01-08";
+      version =			"2020-02-10";
       src = {
-        rev =			"ca34ade00c554157f106fde97af5f08a202808ef";
-        sha256 =		"0xx5qkc5pi3qdrdikgq3902ws8zilv2476fb4bbgh95d9wpgr35v";
+        rev =			"1190e60dd426d246661e478db3287f266ec6cda2";
+        sha256 =		"0cgfad07j69cks97llj4hf3kga0d5qf728s89xwxrzcwm06k62bi";
       };
     };
     libVersion = {
-      version =			"2020-01-08";
+      version =			"2020-02-10";
       libSources = {
-        i18n.rev =		"e7439fd76f27cfc26e269c4e6c4d56245345c28b";
-        i18n.sha256 =		"1nqm1kx5b4f7s0f9q8bg4rdhqnp0128yp6bgnrkia1kwmfnf5gmy";
-        symbols.rev =		"ad58768b88d564fd188c6667841adec436da53f2";
-        symbols.sha256 =	"1rdplf04bff0hmgjwr81fbcr9nkqi21n0n88nzs5fdp73mqiywcy";
+        i18n.rev =		"26786c4ca804bad7eb072f1ef381f00b5a2ff3ee";
+        i18n.sha256 =		"0iqr1xfw4s677afjy9bn5y41z4isp327f9y90wypkxiwwq3dfkfl";
+        symbols.rev =		"35b7da2d211d7cc036b37ad7f5e40ef03faa1bc7";
+        symbols.sha256 =	"0wbfw1swbfvfp47cn48pxpqlygjs3xh568ydrrs51v3w102x8y64";
         templates.rev =		"0c0490897f803ab8b7c3dad438b7eb1f80e0417c";
         templates.sha256 =	"0cs3bm3zb5ngw5ldn0lzw5bvqm4kvcidyrn76438alffwiz2b15g";
-        footprints.rev =	"973867de7f33f202e9fd1b3455bd1f7e7fe4a074";
-        footprints.sha256 =	"0yvidpnqbfxjdwaiscl5bdchsg0l4d769vp456dc8h0f3802mibi";
-        packages3d.rev =	"c2b92a411adc93ddeeed74b36b542e1057f81a2a";
-        packages3d.sha256 =	"05znc6y2lc31iafspg308cxdda94zg6c7mwslmys76npih1pb8qc";
+        footprints.rev =	"9357b6f09312966c57fec9f66a516941d79c3038";
+        footprints.sha256 =	"0cgah1q0h012ffwfl220k7qb6hgbs0i91spq2j4v3lgpfr4g638d";
+        packages3d.rev =	"de368eb739abe41dfc3163e0e370477e857f9cc1";
+        packages3d.sha256 =	"0b3p5v8g24h6l7q3sbqz7ns0gnrf9l89glj86m5ybhizvls9vrrs";
       };
     };
   };

From 567be487077dc56508c7d3a290b56959e74d691f Mon Sep 17 00:00:00 2001
From: Brenton Horne <brentonhorne77@gmail.com>
Date: Mon, 10 Feb 2020 19:26:58 +1000
Subject: [PATCH 0209/4636] marvin: 20.3.0 -> 20.4.0

---
 pkgs/applications/science/chemistry/marvin/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix
index ba20695ec44e..b27af67c974f 100644
--- a/pkgs/applications/science/chemistry/marvin/default.nix
+++ b/pkgs/applications/science/chemistry/marvin/default.nix
@@ -4,12 +4,12 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "marvin";
-  version = "20.3.0";
+  version = "20.4.0";
 
   src = fetchurl {
     name = "marvin-${version}.deb";
     url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
-    sha256 = "1y2vh1n80mrrbxqbhxfag8h4lisarbw8h3labmh3ajrfan7bmhql";
+    sha256 = "12kygxq24in7hbp7shkx1baqig8rwmzvv0d3kc3ld9sj9hb0a2n1";
   };
 
   nativeBuildInputs = [ dpkg makeWrapper ];
@@ -45,4 +45,4 @@ stdenv.mkDerivation rec {
     license = licenses.unfree;
     platforms = platforms.linux;
   };
-}
\ No newline at end of file
+}

From 63abe0af44f02a46a1e1a4602a95c7b1a7418cad Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <brightone@protonmail.com>
Date: Mon, 10 Feb 2020 15:59:50 +0200
Subject: [PATCH 0210/4636] lazydocker: 0.7.6 -> 0.8

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

diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix
index 96c13010fac2..b63892178d91 100644
--- a/pkgs/tools/misc/lazydocker/default.nix
+++ b/pkgs/tools/misc/lazydocker/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "lazydocker";
-  version = "0.7.6";
+  version = "0.8";
 
   src = fetchFromGitHub {
     owner = "jesseduffield";
     repo = "lazydocker";
     rev = "v${version}";
-    sha256 = "1sp5f9lkysqkyhd6gvrlpszrih78bj67yidkkd6azv9ianrndx0b";
+    sha256 = "02x03nmkbj0133bziaqmqlh3x515w3n01iqvg7q6b55r7nan7hv7";
   };
 
   goPackagePath = "github.com/jesseduffield/lazydocker";

From 46db47e5f76a8045e4bdbce22b97e7c83a579712 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <brightone@protonmail.com>
Date: Mon, 10 Feb 2020 15:53:45 +0200
Subject: [PATCH 0211/4636] findomain: 0.9.3 -> 1.4.0

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

diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix
index abc34abd77f7..3eb037d50a11 100644
--- a/pkgs/tools/networking/findomain/default.nix
+++ b/pkgs/tools/networking/findomain/default.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "findomain";
-  version = "0.9.3";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "Edu4rdSHL";
     repo = pname;
     rev = version;
-    sha256 = "1p7bj8q3zwn92nn6d71bk7cczclcsjvan6m8znlzr4lrwircp1y1";
+    sha256 = "1hqvs6h6cfimg0y6hggnmc0mlddajwmh3h36n160n6imq0lfixka";
   };
 
-  cargoSha256 = "1grb0frc1kp3z6vs2906h9v1yx9qxn6x0gf9jy1msqgnqjw0bgn9";
+  cargoSha256 = "0brkza04b38hcjjmqz4bkd8gj0n0mrh0p7427007f5xlnhj7hrn4";
 
   nativeBuildInputs = [ installShellFiles perl ];
   buildInputs = lib.optional stdenv.isDarwin Security;

From ab0b90ec5036c2bcb0133d69d2f8c5c9e9c30541 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 10 Feb 2020 00:26:32 +0000
Subject: [PATCH 0212/4636] python3Packages.matrix-nio: 0.6 -> 0.7.1

---
 .../python-modules/matrix-nio/default.nix     | 45 ++++++++++++-------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix
index 9f5a086f2ee5..c7631f0c5b25 100644
--- a/pkgs/development/python-modules/matrix-nio/default.nix
+++ b/pkgs/development/python-modules/matrix-nio/default.nix
@@ -1,23 +1,34 @@
-{ lib, buildPythonPackage, fetchFromGitHub, git,
-  attrs, future, peewee, h11, h2, atomicwrites, pycryptodome, sphinx, Logbook, jsonschema,
-  python-olm, unpaddedbase64, aiohttp, cachetools }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, git
+, attrs
+, future
+, aiohttp
+, aiofiles
+, h11
+, h2
+, Logbook
+, jsonschema
+, unpaddedbase64
+, pycryptodome
+, python-olm
+, peewee
+, cachetools
+, atomicwrites
+}:
 
 buildPythonPackage rec {
   pname = "nio";
-  version = "0.6";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "poljar";
     repo = "matrix-nio";
     rev = version;
-    sha256 = "0pq5i6ks3pck2kq9m4p3pw9hbvkzs27xkyv68mjnfc6chp2g2mg9";
+    sha256 = "05cggfhsfa0irvzc7x3fndv6n0zszxxhmlv89r5rkrl5wvrhbb2h";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace 'python-olm>=3.1.0' ""
-  '';
-
   nativeBuildInputs = [
     git
   ];
@@ -25,18 +36,18 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     attrs
     future
-    peewee
+    aiohttp
+    aiofiles
     h11
     h2
-    atomicwrites
-    pycryptodome
-    sphinx
     Logbook
     jsonschema
-    python-olm
     unpaddedbase64
-    aiohttp
+    pycryptodome
+    python-olm
+    peewee
     cachetools
+    atomicwrites
   ];
 
   doCheck = false;
@@ -45,6 +56,6 @@ buildPythonPackage rec {
     description = "A Python Matrix client library, designed according to sans I/O principles";
     homepage = "https://github.com/poljar/matrix-nio";
     license = licenses.isc;
-    maintainers = [ maintainers.tilpner ];
+    maintainers = with maintainers; [ tilpner emily ];
   };
 }

From 6957e476f422a58951a5869e4b5a34367ceb6d8c Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 10 Feb 2020 00:26:59 +0000
Subject: [PATCH 0213/4636] weechatScripts.weechat-matrix: unstable-2019-11-10
 -> unstable-2020-01-21

---
 .../scripts/weechat-matrix/default.nix        | 49 ++++++++++++++-----
 1 file changed, 36 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
index ff6a7d947411..845dd9287663 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
@@ -1,20 +1,34 @@
-{ buildPythonPackage, stdenv, python, fetchFromGitHub,
-  pyopenssl, webcolors, future, atomicwrites,
-  attrs, Logbook, pygments, cachetools, matrix-nio }:
+{ buildPythonPackage
+, stdenv
+, python
+, fetchFromGitHub
+, pyopenssl
+, webcolors
+, future
+, atomicwrites
+, attrs
+, Logbook
+, pygments
+, matrix-nio
+, aiohttp
+, requests
+}:
 
 let
-  matrixUploadPython = python.withPackages (ps: with ps; [
-    magic
+  scriptPython = python.withPackages (ps: with ps; [
+    aiohttp
+    requests
+    python_magic
   ]);
 in buildPythonPackage {
   pname = "weechat-matrix";
-  version = "unstable-2019-11-10";
+  version = "unstable-2020-01-21";
 
   src = fetchFromGitHub {
     owner = "poljar";
     repo = "weechat-matrix";
-    rev = "69ad2a9c03d516c212d3d0700dbb2bfe654f6365";
-    sha256 = "1mfbkag5np2lgv6f31nyfnvavyh67jrrx6gxhzb8m99dd43lgs8c";
+    rev = "46640df3e0bfb058e97d8abe723bb88fdf4e5177";
+    sha256 = "1j3l43j741csfxsp1nsc74y6wj2wm86c45iraf167g6p0sdzcq8z";
   };
 
   propagatedBuildInputs = [
@@ -25,8 +39,9 @@ in buildPythonPackage {
     attrs
     Logbook
     pygments
-    cachetools
     matrix-nio
+    aiohttp
+    requests
   ];
 
   passthru.scripts = [ "matrix.py" ];
@@ -38,10 +53,18 @@ in buildPythonPackage {
     mkdir -p $out/share $out/bin
     cp $src/main.py $out/share/matrix.py
 
-    cp $src/contrib/matrix_upload $out/bin/
+    cp \
+      $src/contrib/matrix_upload \
+      $src/contrib/matrix_decrypt \
+      $src/contrib/matrix_sso_helper \
+      $out/bin/
     substituteInPlace $out/bin/matrix_upload \
-      --replace '/usr/bin/env -S python3 -u' '${matrixUploadPython}/bin/python -u' 
-  
+      --replace '/usr/bin/env -S python3' '${scriptPython}/bin/python'
+    substituteInPlace $out/bin/matrix_sso_helper \
+      --replace '/usr/bin/env -S python3' '${scriptPython}/bin/python'
+    substituteInPlace $out/bin/matrix_decrypt \
+      --replace '/usr/bin/env python3' '${scriptPython}/bin/python'
+   
     mkdir -p $out/${python.sitePackages}
     cp -r $src/matrix $out/${python.sitePackages}/matrix
   '';
@@ -53,6 +76,6 @@ in buildPythonPackage {
     homepage = "https://github.com/poljar/weechat-matrix";
     license = licenses.isc;
     platforms = platforms.linux;
-    maintainers = [ maintainers.tilpner ];
+    maintainers = with maintainers; [ tilpner emily ];
   };
 }

From 603109c1718d0c0d6fbf3855a2a050fbf829560f Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Fri, 7 Feb 2020 12:40:18 +0100
Subject: [PATCH 0214/4636] vscodium: 1.41.1 -> 1.42.0

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

diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index e7bdacc13905..d4676d421d0e 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -11,8 +11,8 @@ let
   archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "0n4wcg072a0b76jjv08cig2kygkmakvwav5vvl0h6ww9sbdcwl1x";
-    x86_64-darwin = "0xvyh9qypsyzw02vpmnfa0hdszj8ylvf78yjbmg86m4xml0sbj9r";
+    x86_64-linux = "0f6ic24w6s9wfirzk5rvysn96gj1naj6b81al9743mllaf32ad5q";
+    x86_64-darwin = "0fgyhb2wxkvrc90zzw5w2k3ggwbinmax286gbff3sjlrzbs5sj64";
   }.${system};
 
   sourceRoot = {
@@ -25,7 +25,7 @@ in
     # The update script doesn't correctly change the hash for darwin, so please:
     # nixpkgs-update: no auto update
 
-    version = "1.41.1";
+    version = "1.42.0";
     pname = "vscodium";
 
     executableName = "codium";

From b19c857985dbfd034f4535a805560880a8ea0459 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 5 Feb 2020 21:23:44 +0800
Subject: [PATCH 0215/4636] redoflacs: 0.30.20150202 -> 0.30.20190903

---
 pkgs/applications/audio/redoflacs/default.nix | 36 ++++++++++++-------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/audio/redoflacs/default.nix b/pkgs/applications/audio/redoflacs/default.nix
index e32fd42af323..140b163e25cd 100644
--- a/pkgs/applications/audio/redoflacs/default.nix
+++ b/pkgs/applications/audio/redoflacs/default.nix
@@ -1,39 +1,49 @@
-{ stdenv, fetchFromGitHub, makeWrapper
-, flac, sox }:
+{ stdenv
+, lib
+, fetchFromGitHub
+, makeWrapper
+, installShellFiles
+, flac
+, sox
+, withAucdtect ? false
+, aucdtect ? null
+}:
 
 stdenv.mkDerivation rec {
   pname = "redoflacs";
-  version = "0.30.20150202";
+  version = "0.30.20190903";
 
   src = fetchFromGitHub {
-    owner  = "sirjaren";
-    repo   = "redoflacs";
-    rev    = "86c6f5becca0909dcb2a0cb9ed747a575d7a4735";
-    sha256 = "1gzlmh4vnf2fl0x8ig2n1f76082ngldsv85i27dv15y2m1kffw2j";
+    owner = "sirjaren";
+    repo = "redoflacs";
+    rev = "4ca544cbc075d0865884906208cb2b8bc318cf9e";
+    sha256 = "19lcl09d4ngz2zzwd8dnnxx41ddvznhar6ggrlf1xvkr5gd7lafp";
   };
 
   dontBuild = true;
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ installShellFiles makeWrapper ];
 
   installPhase = ''
     runHook preInstall
 
     install -Dm755 -t $out/bin redoflacs
     install -Dm644 -t $out/share/doc/redoflacs LICENSE *.md
+    installManPage redoflacs.1
 
     runHook postInstall
   '';
 
   postFixup = ''
     wrapProgram $out/bin/redoflacs \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ flac sox ]}
+      --prefix PATH : ${stdenv.lib.makeBinPath ([ flac sox ] ++ lib.optional withAucdtect aucdtect)}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Parallel BASH commandline FLAC compressor, verifier, organizer, analyzer, and retagger";
-    homepage    = src.meta.homepage;
-    license     = licenses.gpl2;
-    platforms   = platforms.all;
+    homepage = src.meta.homepage;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms = platforms.all;
   };
 }

From fd162292cfe5d50dc1e49d2cf021877164b91056 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 3 Feb 2020 22:23:53 +0800
Subject: [PATCH 0216/4636] dxx-rebirth: 0.59.100 -> 0.59.20200202

---
 pkgs/games/dxx-rebirth/default.nix | 54 ++++++++++++++++--------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix
index b7eb2f02568d..aa2563d4e4b9 100644
--- a/pkgs/games/dxx-rebirth/default.nix
+++ b/pkgs/games/dxx-rebirth/default.nix
@@ -1,5 +1,15 @@
-{ gcc6Stdenv, fetchurl, fetchpatch, scons, pkgconfig
-, SDL, SDL_mixer, libGLU, libGL, physfs
+{ stdenv
+, fetchFromGitHub
+, fetchurl
+, fetchpatch
+, scons
+, pkgconfig
+, SDL
+, SDL_mixer
+, libGLU
+, libGL
+, libpng
+, physfs
 }:
 
 let
@@ -8,46 +18,38 @@ let
     sha256 = "05mz77vml396mff43dbs50524rlm4fyds6widypagfbh5hc55qdc";
   };
 
-in gcc6Stdenv.mkDerivation rec {
+in
+stdenv.mkDerivation rec {
   pname = "dxx-rebirth";
-  version = "0.59.100";
+  version = "0.59.20200202";
 
-  src = fetchurl {
-    url = "https://www.dxx-rebirth.com/download/dxx/dxx-rebirth_v${version}-src.tar.gz";
-    sha256 = "0m9k34zyr8bbni9szip407mffdpwbqszgfggavgqjwq0k9c1w7ka";
+  src = fetchFromGitHub {
+    owner = "dxx-rebirth";
+    repo = "dxx-rebirth";
+    rev = "8ebb66c5c9c74ebb93d49741cc9545f2bb7fa05d";
+    sha256 = "1lsrlp47aby2m9hh7i3nv5rb0srlkmnq1w2ca6vyvlga9m9h7jrk";
   };
 
-  # TODO: drop these when upgrading to version > 0.59.100
-  patches = [
-    (fetchpatch {
-      name   = "dxx-gcc7-fix1.patch";
-      url    = "https://github.com/dxx-rebirth/dxx-rebirth/commit/1ed7cec714c623758e3418ec69eaf3b3ff03e9f6.patch";
-      sha256 = "026pn8xglmxryaj8555h5rhzkx30lxmksja1fzdlfyb1vll75gq0";
-    })
-    (fetchpatch {
-      name   = "dxx-gcc7-fix2.patch";
-      url    = "https://github.com/dxx-rebirth/dxx-rebirth/commit/73057ad8ec6977ac747637db1080686f11b4c3cc.patch";
-      sha256 = "0s506vdd2djrrm3xl0ygn9ylpg6y8qxii2nnzk3sf9133glp3swy";
-    })
-  ];
-
   nativeBuildInputs = [ pkgconfig scons ];
 
-  buildInputs = [ libGLU libGL physfs SDL SDL_mixer ];
+  buildInputs = [ libGLU libGL libpng physfs SDL SDL_mixer ];
 
   enableParallelBuilding = true;
 
-  NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral";
+  NIX_CFLAGS_COMPILE = [
+    "-Wno-format-nonliteral"
+    "-Wno-format-truncation"
+  ];
 
   postInstall = ''
-    install -Dm644 ${music} $out/share/games/dxx-rebirth/d2xr-sc55-music.dxa
+    install -Dm644 ${music} $out/share/games/dxx-rebirth/${music.name}
     install -Dm644 -t $out/share/doc/dxx-rebirth *.txt
   '';
 
-  meta = with gcc6Stdenv.lib; {
+  meta = with stdenv.lib; {
     description = "Source Port of the Descent 1 and 2 engines";
     homepage = "https://www.dxx-rebirth.com/";
-    license = licenses.free;
+    license = licenses.gpl3;
     maintainers = with maintainers; [ peterhoeg ];
     platforms = with platforms; linux;
   };

From 07655cd7244cb1219a626b43eda18e8562ae38ba Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Sun, 2 Feb 2020 22:34:36 +0300
Subject: [PATCH 0217/4636] lsd2dsl: 0.4.1 -> 0.5.1

---
 pkgs/applications/misc/lsd2dsl/default.nix | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/lsd2dsl/default.nix b/pkgs/applications/misc/lsd2dsl/default.nix
index 5dd5fa0f5122..335279c7084a 100644
--- a/pkgs/applications/misc/lsd2dsl/default.nix
+++ b/pkgs/applications/misc/lsd2dsl/default.nix
@@ -1,26 +1,29 @@
-{ mkDerivation, lib, fetchFromGitHub, cmake
-, boost, libvorbis, libsndfile, minizip, gtest }:
+{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake
+, boost, libvorbis, libsndfile, minizip, gtest, qtwebkit }:
 
 mkDerivation rec {
   pname = "lsd2dsl";
-  version = "0.4.1";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "nongeneric";
     repo = pname;
     rev = "v${version}";
-    sha256 = "15xjp5xxvl0qc4zp553n7djrbvdp63sfjw406idgxqinfmkqkqdr";
+    sha256 = "100qd9i0x6r0nkw1ic2p0xjr16jlhinxkn1x7i98s4xmw4wyb8n8";
   };
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = [ boost libvorbis libsndfile minizip gtest ];
+  buildInputs = [ boost libvorbis libsndfile minizip gtest qtwebkit ];
 
-  NIX_CFLAGS_COMPILE = "-Wno-error=unused-result";
+  NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=missing-braces";
 
   installPhase = ''
-    install -Dm755 lsd2dsl $out/bin/lsd2dsl
-    install -m755 qtgui/lsd2dsl-qtgui $out/bin/lsd2dsl-qtgui
+    install -Dm755 console/lsd2dsl $out/bin/lsd2dsl
+    install -m755 gui/lsd2dsl-qtgui $out/bin/lsd2dsl-qtgui
+  '' + lib.optionalString stdenv.isDarwin ''
+    wrapQtApp $out/bin/lsd2dsl
+    wrapQtApp $out/bin/lsd2dsl-qtgui
   '';
 
   meta = with lib; {
@@ -31,6 +34,6 @@ mkDerivation rec {
     '';
     license = licenses.mit;
     maintainers = with maintainers; [ sikmir ];
-    platforms = with platforms; linux;
+    platforms = with platforms; linux ++ darwin;
   };
 }

From c856d7ff128b4d6ed87bae0a5b10692763a0e63b Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 30 Jan 2020 19:37:29 +0000
Subject: [PATCH 0218/4636] dino: remove unnecessary private transitive deps

As explained by Orivej (reformatted from Markdown):

> These (except libsignal-protocol-c) are private dependencies of the
> actual dependencies that should neither be propagated nor added
> manually to dino. For example, libpsl and brotli come from
> libsoup-2.4.pc:
>
>     Requires: glib-2.0 >=  2.38, gobject-2.0 >=  2.38, gio-2.0 >=  2.38
>     Requires.private: libxml-2.0, sqlite3, libpsl >=  0.20, libbrotlidec, zlib
>
> (To be precise, glib uses utillinuxMinimal rather than utillinux.)
>
> The warnings we see, such as Package 'mount', required by 'gio-2.0',
> not found, come from CMake running both pkg-config --libs and
> pkg-config --static --libs to populate both <XXX>_LIBRARIES and
> <XXX>_STATIC_LIBRARIES[1], but dino has no use for the latter.
> Currently these warnings can not be disabled:
> https://gitlab.kitware.com/cmake/cmake/issues/18158
>
> (They could be prevented by pruning Requires.private from shared-only
> libraries akin to <https://github.com/NixOS/nixpkgs/pull/51767>,
> although it can not be detected if a library is shared-only from the
> .pc file alone, and this is just a warning.)
>
> [1]: docs: https://cmake.org/cmake/help/v3.16/module/FindPkgConfig.html
---
 .../networking/instant-messengers/dino/default.nix        | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 8928814e9670..9cf0032cf49f 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -2,7 +2,7 @@
 , vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext
 , gobject-introspection, gnome3, glib, gdk-pixbuf, gtk3, glib-networking
 , xorg, libXdmcp, libxkbcommon
-, libnotify, libsoup, libgee, utillinux, libselinux, libsepol, libpsl, brotli
+, libnotify, libsoup, libgee
 , librsvg, libsignal-protocol-c
 , libgcrypt
 , epoxy
@@ -52,18 +52,12 @@ stdenv.mkDerivation rec {
     pcre
     xorg.libxcb
     xorg.libpthreadstubs
-    xorg.libXtst
     libXdmcp
     libxkbcommon
     epoxy
     at-spi2-core
     dbus
     icu
-    utillinux
-    libselinux
-    libsepol
-    libpsl
-    brotli
     libsignal-protocol-c
     librsvg
   ];

From 49fe4299905e5066bf76bc1b53f3f7c153689334 Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Thu, 30 Jan 2020 11:58:17 -0600
Subject: [PATCH 0219/4636] lfe: add message to OTP version assertion

---
 pkgs/development/interpreters/lfe/generic-builder.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/lfe/generic-builder.nix b/pkgs/development/interpreters/lfe/generic-builder.nix
index 6e74229e1e88..5df491e72d3a 100644
--- a/pkgs/development/interpreters/lfe/generic-builder.nix
+++ b/pkgs/development/interpreters/lfe/generic-builder.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  inherit (stdenv.lib) getVersion versionAtLeast versions;
+  inherit (stdenv.lib) assertMsg getVersion versionAtLeast versions;
 
   mainVersion = versions.major (getVersion erlang);
 
@@ -25,7 +25,9 @@ let
   };
 
 in
-assert versionAtLeast maximumOTPVersion mainVersion;
+assert (assertMsg (versionAtLeast maximumOTPVersion mainVersion)) ''
+  LFE ${version} is supported on OTP <=${maximumOTPVersion}, not ${mainVersion}.
+'';
 
 buildRebar3 {
   name = baseName;

From 82e007f80fd14216f2104798acf3d53645383da2 Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Thu, 30 Jan 2020 12:00:24 -0600
Subject: [PATCH 0220/4636] lfe: pin 1.2.1 to R19

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index badee379ad31..6da96b967b5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9050,15 +9050,14 @@ in
   inherit (beam.interpreters)
     erlang erlangR18 erlangR19 erlangR20 erlangR21 erlangR22
     erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02
-    elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6
-    lfe lfe_1_2;
+    elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6;
 
   inherit (beam.packages.erlang)
     rebar rebar3
     fetchHex beamPackages
     relxExe;
 
-  inherit (beam.packages.erlangR19) cuter;
+  inherit (beam.packages.erlangR19) cuter lfe lfe_1_2;
 
   groovy = callPackage ../development/interpreters/groovy { };
 

From d723b9122345b0198ad5349ebdd21651561a6e64 Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Thu, 30 Jan 2020 12:00:09 -0600
Subject: [PATCH 0221/4636] lfe: 1.2.1 -> 1.3

Add patches to the builder expression, and add those necessary for 1.3.
---
 pkgs/development/beam-modules/default.nix     |  3 +-
 pkgs/development/interpreters/lfe/1.3.nix     | 43 +++++++++++++++++++
 .../interpreters/lfe/dedup-ebins.patch        | 13 ++++++
 .../interpreters/lfe/generic-builder.nix      | 13 ++++--
 pkgs/top-level/all-packages.nix               |  4 +-
 pkgs/top-level/beam-packages.nix              |  2 +-
 6 files changed, 71 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/development/interpreters/lfe/1.3.nix
 create mode 100644 pkgs/development/interpreters/lfe/dedup-ebins.patch

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 96062a573004..efd68988c9b2 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -66,8 +66,9 @@ let
         # Remove old versions of elixir, when the supports fades out:
         # https://hexdocs.pm/elixir/compatibility-and-deprecations.html
 
-        lfe = lfe_1_2;
+        lfe = lfe_1_3;
         lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; };
+        lfe_1_3 = lib.callLFE ../interpreters/lfe/1.3.nix { inherit erlang buildRebar3 buildHex; };
 
         # Non hex packages. Examples how to build Rebar/Mix packages with and
         # without helper functions buildRebar3 and buildMix.
diff --git a/pkgs/development/interpreters/lfe/1.3.nix b/pkgs/development/interpreters/lfe/1.3.nix
new file mode 100644
index 000000000000..52df5c025447
--- /dev/null
+++ b/pkgs/development/interpreters/lfe/1.3.nix
@@ -0,0 +1,43 @@
+{ fetchpatch, mkDerivation }:
+
+let
+  _fetchpatch =
+    { rev, sha256 }:
+    fetchpatch {
+      url = "https://github.com/rvirding/lfe/commit/${rev}.patch";
+      inherit sha256;
+    };
+  fetchPatches = map _fetchpatch;
+in
+
+mkDerivation {
+  version = "1.3";
+  sha256 = "0pgwi0h0d34353m39jin8dxw4yykgfcg90k6pc4qkjyrg40hh4l6";
+  maximumOTPVersion = "21";
+  patches = fetchPatches [
+    {
+      rev = "b457e5d521bb35008e6049fab31b4073cc10d583";
+      sha256 = "1zrq1b3291xhb0jsirgb5s8hacq5xvz7xidsp29aqcnpazdvivdc";
+    }
+    {
+      rev = "5fe9f37741b7d53bd43109fd3435e1437f124a0d";
+      sha256 = "1anqlcbih52lc0wynf58r67w1jhn264lz49rczwgh19pqg92dvqf";
+    }
+    {
+      rev = "b8f3e06511cb6805cf3a904c1589b27f33f3958d";
+      sha256 = "1zqafc0asm9m6cq7r0brvfawv69fqggy1phif3zknjmpicf25pqf";
+    }
+    {
+      rev = "40c239a608460e55563edb68c1b6faca57518b54";
+      sha256 = "03av5115jwyammw337xzy50l6api5h0wbwwda5vzw0w10zwb2z8y";
+    }
+    {
+      rev = "5faa7106419263689bfc0bc08a7451ccb1fba718";
+      sha256 = "0ml5yh5b3rn4ympks4bpx409hkra0i79zvq80azk0kmbjd869fxp";
+    }
+    {
+      rev = "9ff978693babcfd043d741b5c6940920b8315892";
+      sha256 = "04968dmp527wbkdv7dqpaj3nsyjls93whc1b5hx73b39dvl3n3y1";
+    }
+  ];
+}
diff --git a/pkgs/development/interpreters/lfe/dedup-ebins.patch b/pkgs/development/interpreters/lfe/dedup-ebins.patch
new file mode 100644
index 000000000000..44e3733c4165
--- /dev/null
+++ b/pkgs/development/interpreters/lfe/dedup-ebins.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 59f2c06..5ee8f6e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -60,7 +60,7 @@ ESRCS = $(notdir $(wildcard $(SRCDIR)/*.erl))
+ XSRCS = $(notdir $(wildcard $(SRCDIR)/*.xrl))
+ YSRCS = $(notdir $(wildcard $(SRCDIR)/*.yrl))
+ LSRCS = $(notdir $(wildcard $(LSRCDIR)/*.lfe))
+-EBINS = $(ESRCS:.erl=.beam) $(XSRCS:.xrl=.beam) $(YSRCS:.yrl=.beam)
++EBINS = $(sort $(ESRCS:.erl=.beam) $(XSRCS:.xrl=.beam) $(YSRCS:.yrl=.beam))
+ LBINS = $(LSRCS:.lfe=.beam)
+ 
+ CSRCS = $(notdir $(wildcard $(CSRCDIR)/*.c))
diff --git a/pkgs/development/interpreters/lfe/generic-builder.nix b/pkgs/development/interpreters/lfe/generic-builder.nix
index 5df491e72d3a..ba42c2d59d56 100644
--- a/pkgs/development/interpreters/lfe/generic-builder.nix
+++ b/pkgs/development/interpreters/lfe/generic-builder.nix
@@ -6,10 +6,13 @@
 , sha256 ? null
 , rev ? version
 , src ? fetchFromGitHub { inherit rev sha256; owner = "rvirding"; repo = "lfe"; }
+, patches ? []
 }:
 
 let
-  inherit (stdenv.lib) assertMsg getVersion versionAtLeast versions;
+  inherit (stdenv.lib)
+    assertMsg makeBinPath optionalString
+    getVersion versionAtLeast versionOlder versions;
 
   mainVersion = versions.major (getVersion erlang);
 
@@ -36,13 +39,15 @@ buildRebar3 {
 
   buildInputs = [ erlang makeWrapper ];
   beamDeps    = [ proper ];
-  patches     = [ ./no-test-deps.patch ];
+  patches     = [ ./no-test-deps.patch ./dedup-ebins.patch ] ++ patches;
   doCheck     = true;
   checkTarget = "travis";
 
+  makeFlags = [ "-e" "MANDB=''" "PREFIX=$$out"];
+
   # These installPhase tricks are based on Elixir's Makefile.
   # TODO: Make, upload, and apply a patch.
-  installPhase = ''
+  installPhase = optionalString (versionOlder version "1.3") ''
     local libdir=$out/lib/lfe
     local ebindir=$libdir/ebin
     local bindir=$libdir/bin
@@ -65,7 +70,7 @@ buildRebar3 {
     # Add some stuff to PATH so the scripts can run without problems.
     for f in $out/bin/*; do
       wrapProgram $f \
-        --prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils bash ]}:$out/bin"
+        --prefix PATH ":" "${makeBinPath [ erlang coreutils bash ]}:$out/bin"
       substituteInPlace $f --replace "/usr/bin/env" "${coreutils}/bin/env"
     done
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6da96b967b5d..0090a06e3df4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9057,7 +9057,9 @@ in
     fetchHex beamPackages
     relxExe;
 
-  inherit (beam.packages.erlangR19) cuter lfe lfe_1_2;
+  inherit (beam.packages.erlangR19) cuter lfe_1_2;
+
+  inherit (beam.packages.erlangR21) lfe lfe_1_3;
 
   groovy = callPackage ../development/interpreters/groovy { };
 
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index a24051075636..f6fe58a83d03 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -74,7 +74,7 @@ rec {
     # `beam.packages.erlangR22.elixir`.
     inherit (packages.erlang) elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6;
 
-    inherit (packages.erlang) lfe lfe_1_2;
+    inherit (packages.erlang) lfe lfe_1_2 lfe_1_3;
   };
 
   # Helper function to generate package set with a specific Erlang version.

From 60446543dc31a152e0128e907643d21f654b7b3c Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Sat, 18 Jan 2020 13:48:40 +0000
Subject: [PATCH 0222/4636] zopfli: split outputs

---
 pkgs/tools/compression/zopfli/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix
index 586c47de582c..f3f82a4067a6 100644
--- a/pkgs/tools/compression/zopfli/default.nix
+++ b/pkgs/tools/compression/zopfli/default.nix
@@ -3,6 +3,7 @@
 stdenv.mkDerivation rec {
   pname = "zopfli";
   version = "1.0.3";
+  outputs = [ "out" "lib" "dev" ];
 
   src = fetchFromGitHub {
     owner = "google";

From 08e96d2fb99af8dbe0d80e4c52634c8feec01488 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Sat, 18 Jan 2020 14:10:11 +0000
Subject: [PATCH 0223/4636] zopfli: add edef as maintainer

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

diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix
index f3f82a4067a6..81fdc95d88d4 100644
--- a/pkgs/tools/compression/zopfli/default.nix
+++ b/pkgs/tools/compression/zopfli/default.nix
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
     '';
     platforms = platforms.unix;
     license = licenses.asl20;
-    maintainers = with maintainers; [ bobvanderlinden ];
+    maintainers = with maintainers; [ bobvanderlinden edef ];
   };
 }

From 434c507864cf6ae7e4940ea275735f4d2a115680 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20Rivi=C3=A8re?= <babathriviere@gmail.com>
Date: Tue, 4 Feb 2020 11:20:40 +0100
Subject: [PATCH 0224/4636] insomnia: 7.0.5 -> 7.0.6

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

diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix
index 00ffa9d1d62b..ae4302b74291 100644
--- a/pkgs/development/web/insomnia/default.nix
+++ b/pkgs/development/web/insomnia/default.nix
@@ -16,12 +16,12 @@ let
   ];
 in stdenv.mkDerivation rec {
   pname = "insomnia";
-  version = "7.0.5";
+  version = "7.0.6";
 
   src = fetchurl {
     url =
       "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb";
-    sha256 = "1zcxldfi4rxg7rr6r588blhihyh7ggcdy32vwzjklgq7ihsvx5bs";
+    sha256 = "125g40micavq5js5l7lpv01yl8635dwg240vldz8i2riqj65inq8";
   };
 
   nativeBuildInputs =

From 4562d76dde955b74b8ffe3524cf434bcc06500ce Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Tue, 28 Jan 2020 23:58:37 +0300
Subject: [PATCH 0225/4636] qtpbfimageplugin: 2.0 -> 2.1

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

diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix
index 5f3f8c4a66af..cc4a3ae84d90 100644
--- a/pkgs/development/libraries/qtpbfimageplugin/default.nix
+++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qtpbfimageplugin";
-  version = "2.0";
+  version = "2.1";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "QtPBFImagePlugin";
     rev = version;
-    sha256 = "16qsax1p09gldbg83df77ixaz7bkxl8wm806lc55y19pwnid9m7p";
+    sha256 = "05l28xf7pf9mxm6crrdx5i7d2ri3hlg5iva0fqc8wxnj8pf2m38r";
   };
 
   nativeBuildInputs = [ qmake ];

From bd90b5a5cff0158925ed26d78bb65734acee33d1 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 27 Jan 2020 12:48:57 +0100
Subject: [PATCH 0226/4636] faust: 2.5.23 -> 2.20.2

---
 pkgs/applications/audio/faust/faust2.nix      | 58 ++++++-------------
 pkgs/applications/audio/faust/faust2jack.nix  |  2 +
 .../audio/faust/faust2jackrust.nix            | 18 ++++++
 pkgs/top-level/all-packages.nix               |  4 +-
 4 files changed, 40 insertions(+), 42 deletions(-)
 create mode 100644 pkgs/applications/audio/faust/faust2jackrust.nix

diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index 21cd3fbdb25a..74a5f4d383d9 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -3,25 +3,30 @@
 , fetchFromGitHub
 , makeWrapper
 , pkgconfig
+, cmake
 , llvm
 , emscripten
 , openssl
 , libsndfile
 , libmicrohttpd
+, gnutls
+, libtasn1
+, p11-kit
 , vim
+, which
 }:
 
 with stdenv.lib.strings;
 
 let
 
-  version = "2.5.23";
+  version = "2.20.2";
 
   src = fetchFromGitHub {
     owner = "grame-cncm";
     repo = "faust";
     rev = version;
-    sha256 = "1pci8ac6sqrm3mb3yikmmr3iy35g3nj4iihazif1amqkbdz719rc";
+    sha256 = "08hv8gyj6c83128z3si92r1ka5ckf9sdpn5jdnlhrqyzja4mrxsy";
     fetchSubmodules = true;
   };
 
@@ -40,8 +45,8 @@ let
 
     inherit src;
 
-    nativeBuildInputs = [ makeWrapper pkgconfig vim ];
-    buildInputs = [ llvm emscripten openssl libsndfile libmicrohttpd ];
+    nativeBuildInputs = [ makeWrapper pkgconfig cmake vim which ];
+    buildInputs = [ llvm emscripten openssl libsndfile libmicrohttpd gnutls libtasn1 p11-kit ];
 
 
     passthru = {
@@ -50,39 +55,13 @@ let
 
 
     preConfigure = ''
-      makeFlags="$makeFlags prefix=$out LLVM_CONFIG='${llvm}/bin/llvm-config' world"
-
-      # The faust makefiles use 'system ?= $(shell uname -s)' but nix
-      # defines 'system' env var, so undefine that so faust detects the
-      # correct system.
-      unset system
-      # sed -e "232s/LLVM_STATIC_LIBS/LLVMLIBS/" -i compiler/Makefile.unix
-
-      # The makefile sets LLVM_<version> depending on the current llvm
-      # version, but the detection code is quite brittle.
-      #
-      # Failing to properly detect the llvm version means that the macro
-      # LLVM_VERSION ends up being the raw output of `llvm-config --version`, while
-      # the code assumes that it's set to a symbol like `LLVM_35`.  Two problems result:
-      # * <command-line>:0:1: error: macro names must be identifiers.; and
-      # * a bunch of undefined reference errors due to conditional definitions relying on
-      #   LLVM_XY being defined.
-      #
-      # For now, fix this by 1) pinning the llvm version; 2) manually setting LLVM_VERSION
-      # to something the makefile will recognize.
-      sed '52iLLVM_VERSION=${stdenv.lib.getVersion llvm}' -i compiler/Makefile.unix
+      cd build
     '';
 
-    postPatch = ''
-      # fix build with llvm 5.0.2 by adding it to the list of known versions
-      # TODO: check if still needed on next update
-      substituteInPlace compiler/Makefile.unix \
-        --replace "5.0.0 5.0.1" "5.0.0 5.0.1 5.0.2"
+    cmakeFlags = ''
+      -C ../backends/all.cmake -C  ../targets/all.cmake ..
     '';
 
-    # Remove most faust2appl scripts since they won't run properly
-    # without additional paths setup. See faust.wrap,
-    # faust.wrapWithBuildEnv.
     postInstall = ''
       # syntax error when eval'd directly
       pattern="faust2!(*@(atomsnippets|graph|graphviewer|md|plot|sig|sigviewer|svg))"
@@ -90,10 +69,6 @@ let
     '';
 
     postFixup = ''
-      # Set faustpath explicitly.
-      substituteInPlace "$out"/bin/faustpath \
-        --replace "/usr/local /usr /opt /opt/local" "$out"
-
       # The 'faustoptflags' is 'source'd into other faust scripts and
       # not used as an executable, so patch 'uname' usage directly
       # rather than use makeWrapper.
@@ -160,8 +135,6 @@ let
         # 'faustoptflags' to absolute paths.
         for script in "$out"/bin/*; do
           substituteInPlace "$script" \
-            --replace ". faustpath" ". '${faust}/bin/faustpath'" \
-            --replace ". faustoptflags" ". '${faust}/bin/faustoptflags'" \
             --replace " error " "echo"
         done
       '';
@@ -200,19 +173,22 @@ let
 
       propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs;
 
+      libPath = stdenv.lib.makeLibraryPath propagatedBuildInputs;
 
       postFixup = ''
 
         # export parts of the build environment
         for script in "$out"/bin/*; do
           wrapProgram "$script" \
+            --set FAUSTLDDIR "${faust}/lib" \
             --set FAUSTLIB "${faust}/share/faust" \
-            --set FAUST_LIB_PATH "${faust}/share/faust" \
             --set FAUSTINC "${faust}/include/faust" \
+            --set FAUSTARCH "${faust}/share/faust" \
             --prefix PATH : "$PATH" \
             --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \
             --set NIX_CFLAGS_COMPILE "$NIX_CFLAGS_COMPILE" \
-            --set NIX_LDFLAGS "$NIX_LDFLAGS"
+            --set NIX_LDFLAGS "$NIX_LDFLAGS -lpthread" \
+            --prefix LIBRARY_PATH $libPath
         done
       '';
     });
diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix
index 7762ca393690..f032f435a35e 100644
--- a/pkgs/applications/audio/faust/faust2jack.nix
+++ b/pkgs/applications/audio/faust/faust2jack.nix
@@ -1,6 +1,7 @@
 { faust
 , gtk2
 , jack2Full
+, alsaLib
 , opencv
 , libsndfile
 }:
@@ -18,6 +19,7 @@ faust.wrapWithBuildEnv {
   propagatedBuildInputs = [
     gtk2
     jack2Full
+    alsaLib
     opencv
     libsndfile
   ];
diff --git a/pkgs/applications/audio/faust/faust2jackrust.nix b/pkgs/applications/audio/faust/faust2jackrust.nix
new file mode 100644
index 000000000000..2562237424e5
--- /dev/null
+++ b/pkgs/applications/audio/faust/faust2jackrust.nix
@@ -0,0 +1,18 @@
+{ stdenv
+, faust
+, libjack2
+, cargo
+, binutils
+, gcc
+, gnumake
+, openssl
+, pkgconfig
+
+}:
+
+faust.wrapWithBuildEnv {
+
+  baseName = "faust2jackrust";
+
+  propagatedBuildInputs = [ libjack2 cargo binutils gcc gnumake openssl pkgconfig ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0090a06e3df4..4494a96ab94c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24759,7 +24759,7 @@ in
   faust1 = callPackage ../applications/audio/faust/faust1.nix { };
 
   faust2 = callPackage ../applications/audio/faust/faust2.nix {
-    llvm = llvm_5;
+    llvm = llvm_9;
   };
 
   faust2alqt = callPackage ../applications/audio/faust/faust2alqt.nix { };
@@ -24772,6 +24772,8 @@ in
 
   faust2jack = callPackage ../applications/audio/faust/faust2jack.nix { };
 
+  faust2jackrust = callPackage ../applications/audio/faust/faust2jackrust.nix { };
+
   faust2jaqt = callPackage ../applications/audio/faust/faust2jaqt.nix { };
 
   faust2ladspa = callPackage ../applications/audio/faust/faust2ladspa.nix { };

From 2ba2b0cf23e4d0f7fdcf97ac7900c349da0d3fbc Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 10 Feb 2020 14:14:05 -0500
Subject: [PATCH 0227/4636] 20.09 is Nightingale

---
 .version                                      |  2 +-
 lib/trivial.nix                               |  2 +-
 .../manual/release-notes/release-notes.xml    |  1 +
 nixos/doc/manual/release-notes/rl-2009.xml    | 80 +++++++++++++++++++
 4 files changed, 83 insertions(+), 2 deletions(-)
 create mode 100644 nixos/doc/manual/release-notes/rl-2009.xml

diff --git a/.version b/.version
index 88b8320330da..3eea3c4c0e93 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-20.03
\ No newline at end of file
+20.09
diff --git a/lib/trivial.nix b/lib/trivial.nix
index a281cd70fb0e..5788dd435e59 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -171,7 +171,7 @@ rec {
      On each release the first letter is bumped and a new animal is chosen
      starting with that new letter.
   */
-  codeName = "Markhor";
+  codeName = "Nightingale";
 
   /* Returns the current nixpkgs version suffix as string. */
   versionSuffix =
diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml
index 444862c5739b..e2913b8a5353 100644
--- a/nixos/doc/manual/release-notes/release-notes.xml
+++ b/nixos/doc/manual/release-notes/release-notes.xml
@@ -8,6 +8,7 @@
   This section lists the release notes for each stable version of NixOS and
   current unstable revision.
  </para>
+ <xi:include href="rl-2009.xml" />
  <xi:include href="rl-2003.xml" />
  <xi:include href="rl-1909.xml" />
  <xi:include href="rl-1903.xml" />
diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
new file mode 100644
index 000000000000..240fa281d790
--- /dev/null
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -0,0 +1,80 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-release-20.09">
+ <title>Release 20.09 (“Markhor”, 2020.09/??)</title>
+
+ <section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-release-20.09-highlights">
+  <title>Highlights</title>
+
+  <para>
+   In addition to numerous new and upgraded packages, this release has the
+   following highlights:
+  </para>
+
+  <itemizedlist>
+   <listitem>
+    <para>
+     Support is planned until the end of October 2020, handing over to 20.09.
+    </para>
+   </listitem>
+  </itemizedlist>
+ </section>
+
+ <section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-release-20.09-new-services">
+  <title>New Services</title>
+
+  <para>
+   The following new services were added since the last release:
+  </para>
+
+  <itemizedlist>
+   <listitem>
+    <para />
+   </listitem>
+  </itemizedlist>
+
+ </section>
+
+ <section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-release-20.09-incompatibilities">
+  <title>Backward Incompatibilities</title>
+
+  <para>
+   When upgrading from a previous release, please be aware of the following
+   incompatible changes:
+  </para>
+
+  <itemizedlist>
+   <listitem>
+    <para />
+   </listitem>
+  </itemizedlist>
+ </section>
+
+ <section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-release-20.09-notable-changes">
+  <title>Other Notable Changes</title>
+
+  <itemizedlist>
+   <listitem>
+    <para />
+   </listitem>
+  </itemizedlist>
+ </section>
+</section>

From 1f54afb299f693fe2c9a42b97890e65e8cb89d8a Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Mon, 20 Jan 2020 21:09:11 -0800
Subject: [PATCH 0228/4636] gotools: fix the path in the setup-hook

---
 pkgs/development/tools/gotools/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix
index 59416f031346..430f17bfb5b0 100644
--- a/pkgs/development/tools/gotools/default.nix
+++ b/pkgs/development/tools/gotools/default.nix
@@ -40,9 +40,8 @@ buildGoModule rec {
   # Set GOTOOLDIR for derivations adding this to buildInputs
   postInstall = ''
     mkdir -p $out/nix-support
-    substituteAll ${../../go-modules/tools/setup-hook.sh} $out/nix-support/setup-hook.tmp
-    cat $out/nix-support/setup-hook.tmp >> $out/nix-support/setup-hook
-    rm $out/nix-support/setup-hook.tmp
+    substitute ${../../go-modules/tools/setup-hook.sh} $out/nix-support/setup-hook \
+      --subst-var-by bin $out
   '';
 
   # Do not copy this without a good reason for enabling

From 3b4c71721a95222f3634eb3064e0401fb0b190ab Mon Sep 17 00:00:00 2001
From: Kyle Sferrazza <kyle.sferrazza@gmail.com>
Date: Tue, 21 Jan 2020 13:15:28 -0500
Subject: [PATCH 0229/4636] jdiskreport: cleanup and add desktop item

---
 pkgs/tools/misc/jdiskreport/builder.sh  | 15 ---------
 pkgs/tools/misc/jdiskreport/default.nix | 41 +++++++++++++++++++++----
 2 files changed, 35 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/tools/misc/jdiskreport/builder.sh

diff --git a/pkgs/tools/misc/jdiskreport/builder.sh b/pkgs/tools/misc/jdiskreport/builder.sh
deleted file mode 100644
index f95dafedd32a..000000000000
--- a/pkgs/tools/misc/jdiskreport/builder.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-source $stdenv/setup
-
-unzip $src
-
-jar=$(ls */*.jar)
-
-mkdir -p $out/share/java
-mv $jar $out/share/java
-
-mkdir -p $out/bin
-cat > $out/bin/jdiskreport <<EOF
-#! $SHELL -e
-exec $jre/bin/java -jar $out/share/java/$(basename $jar)
-EOF
-chmod +x $out/bin/jdiskreport
diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix
index b1d71a892d6f..6b1c0d735eed 100644
--- a/pkgs/tools/misc/jdiskreport/default.nix
+++ b/pkgs/tools/misc/jdiskreport/default.nix
@@ -1,22 +1,51 @@
-{ stdenv, fetchurl, unzip, jre }:
+{ stdenv, fetchurl, unzip, jre, makeDesktopItem }:
 
+let
+  desktopItem = makeDesktopItem {
+    desktopName = "JDiskReport";
+    genericName = "A graphical utility to visualize disk usage";
+    categories = "Utility;";
+    exec = "jdiskreport";
+    name = "jdiskreport";
+    type = "Application";
+  };
+in
 stdenv.mkDerivation {
   name = "jdiskreport-1.4.1";
 
-  builder = ./builder.sh;
-
   src = fetchurl {
     url = http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_1.zip;
     sha256 = "0d5mzkwsbh9s9b1vyvpaawqc09b0q41l2a7pmwf7386b1fsx6d58";
   };
 
   buildInputs = [ unzip ];
-
   inherit jre;
 
-  meta = {
+  installPhase = ''
+    source $stdenv/setup
+
+    unzip $src
+
+    jar=$(ls */*.jar)
+
+    mkdir -p $out/share/java
+    mv $jar $out/share/java
+
+    mkdir -p $out/bin
+    cat > $out/bin/jdiskreport <<EOF
+    #! $SHELL -e
+    exec $jre/bin/java -jar $out/share/java/$(basename $jar)
+    EOF
+    chmod +x $out/bin/jdiskreport
+
+    ${desktopItem.buildCommand}
+  '';
+
+  meta = with stdenv.lib; {
     homepage = http://www.jgoodies.com/freeware/jdiskreport/;
     description = "A graphical utility to visualize disk usage";
-    license = stdenv.lib.licenses.unfreeRedistributable; #TODO freedist, libs under BSD-3
+    license = licenses.unfreeRedistributable; #TODO freedist, libs under BSD-3
+    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ kylesferrazza ];
   };
 }

From 2843a7d1228c70025af67d3aa406e9303e9fdb85 Mon Sep 17 00:00:00 2001
From: Kyle Sferrazza <kyle.sferrazza@gmail.com>
Date: Fri, 31 Jan 2020 11:39:26 -0500
Subject: [PATCH 0230/4636] jdiskreport: remove builder.sh link from docs

---
 doc/contributing/quick-start.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/contributing/quick-start.xml b/doc/contributing/quick-start.xml
index 80514cba4904..8e4e914d4511 100644
--- a/doc/contributing/quick-start.xml
+++ b/doc/contributing/quick-start.xml
@@ -69,8 +69,7 @@
       <listitem>
        <para>
         JDiskReport, a Java utility: <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/default.nix"><filename>pkgs/tools/misc/jdiskreport/default.nix</filename></link> (and the <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/builder.sh">builder</link>). Nixpkgs doesn’t have a decent <varname>stdenv</varname> for Java yet so this is pretty ad-hoc.
+          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/default.nix"><filename>pkgs/tools/misc/jdiskreport/default.nix</filename></link>. Nixpkgs doesn’t have a decent <varname>stdenv</varname> for Java yet so this is pretty ad-hoc.
        </para>
       </listitem>
       <listitem>

From 168b3076a73ac5f3949c57b182c454aeb7b922ed Mon Sep 17 00:00:00 2001
From: Kevin Amado <kamadorueda@gmail.com>
Date: Wed, 15 Jan 2020 15:49:32 -0500
Subject: [PATCH 0231/4636] pythonPackages.cfn-flip: 1.1.0.post1 -> 1.2.2

---
 .../python-modules/cfn-flip/default.nix       | 54 ++++++++++++++-----
 .../python-modules/fluidasserts/default.nix   |  1 -
 2 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/cfn-flip/default.nix b/pkgs/development/python-modules/cfn-flip/default.nix
index ab6abc4cd6f6..da04ecf68897 100644
--- a/pkgs/development/python-modules/cfn-flip/default.nix
+++ b/pkgs/development/python-modules/cfn-flip/default.nix
@@ -1,25 +1,55 @@
-{ lib, buildPythonPackage, fetchPypi, six, pyyaml, click, pytestrunner }:
+{ buildPythonPackage
+, fetchFromGitHub
+, lib
+
+# pythonPackages
+, click
+, pytest
+, pytestcov
+, pytestrunner
+, pyyaml
+, six
+}:
 
 buildPythonPackage rec {
   pname = "cfn-flip";
-  version = "1.1.0.post1";
+  version = "1.2.2";
 
-  src = fetchPypi {
-    pname = "cfn_flip";
-    inherit version;
-    sha256 = "16r01ijjwnq06ax5xrv6mq9l00f6sgzw776kr43zjai09xsbwwck";
+  src = fetchFromGitHub {
+    owner = "awslabs";
+    repo = "aws-cfn-template-flip";
+    rev = version;
+    sha256 = "05fk725a1i3zl3idik2hxl3w6k1ln0j33j3jdq1gvy1sfyc79ifm";
   };
 
-  propagatedBuildInputs = [ six pyyaml click ];
-  nativeBuildInputs = [ pytestrunner ];
+  propagatedBuildInputs = [
+    click
+    pyyaml
+    six
+  ];
 
-  # No tests in Pypi
-  doCheck = false;
+  checkInputs = [
+    pytest
+    pytestcov
+    pytestrunner
+  ];
+
+  checkPhase = ''
+    py.test \
+      --cov=cfn_clean \
+      --cov=cfn_flip \
+      --cov=cfn_tools \
+      --cov-report term-missing \
+      --cov-report html
+  '';
 
   meta = with lib; {
     description = "Tool for converting AWS CloudFormation templates between JSON and YAML formats";
-    homepage = https://github.com/awslabs/aws-cfn-template-flip;
+    homepage = "https://github.com/awslabs/aws-cfn-template-flip";
     license = licenses.asl20;
-    maintainers = with maintainers; [ psyanticy ];
+    maintainers = with maintainers; [
+      kamadorueda
+      psyanticy
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/fluidasserts/default.nix b/pkgs/development/python-modules/fluidasserts/default.nix
index 78405ed8a660..f1f5397c0a82 100644
--- a/pkgs/development/python-modules/fluidasserts/default.nix
+++ b/pkgs/development/python-modules/fluidasserts/default.nix
@@ -75,7 +75,6 @@ buildPythonPackage rec {
     substituteInPlace ./setup.py \
       --replace 'tlslite-ng==0.8.0-alpha36' 'tlslite-ng==0.7.5' \
       --replace 'boto3==1.11.7' 'boto3==1.10.1' \
-      --replace 'cfn-flip==1.2.2' 'cfn-flip==1.1.0.post1' \
       --replace 'typed-ast==1.4.1' 'typed-ast==1.4.0' \
       --replace 'pillow==7.0.0' 'pillow==6.2.1' \
 

From 48d502cd66ea604d5f9baf68e423aa7a1df54004 Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Tue, 14 Jan 2020 16:06:54 +0100
Subject: [PATCH 0232/4636] libspiro: 0.5.20150702 -> 20190731

also build from Git
---
 pkgs/development/libraries/libspiro/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix
index 5f547a973707..67251f9430a8 100644
--- a/pkgs/development/libraries/libspiro/default.nix
+++ b/pkgs/development/libraries/libspiro/default.nix
@@ -1,18 +1,22 @@
-{stdenv, pkgconfig, fetchurl}:
+{stdenv, pkgconfig, autoreconfHook, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "libspiro";
-  version = "0.5.20150702";
-  src = fetchurl {
-    url = "https://github.com/fontforge/libspiro/releases/download/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0z4zpxd3nwwchqdsbmmjbp13aw5jg8v5p1993190bpykkrjlh6nv";
+  version = "20190731";
+
+  src = fetchFromGitHub {
+    owner = "fontforge";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256:1wc6ikjrvcq05jki0ligmxyplgb4nzx6qb5va277qiin8vad9b1v";
   };
 
-  nativeBuildInputs = [pkgconfig];
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
 
   meta = with stdenv.lib; {
     description = "A library that simplifies the drawing of beautiful curves";
     homepage = https://github.com/fontforge/libspiro;
     license = licenses.gpl3Plus;
+    maintainers = [ maintainers.erictapen ];
   };
 }

From 35bfcc98c93ce66f386731a3e8156a5b6cd79b2d Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Mon, 13 Jan 2020 17:17:24 -0500
Subject: [PATCH 0233/4636] python3Packages.sparse: mark unbroken (package has
 been previously updated)

---
 pkgs/development/python-modules/sparse/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix
index ec126e963b01..a1b9eae398df 100644
--- a/pkgs/development/python-modules/sparse/default.nix
+++ b/pkgs/development/python-modules/sparse/default.nix
@@ -35,6 +35,5 @@ buildPythonPackage rec {
     homepage = https://github.com/pydata/sparse/;
     license = licenses.bsd3;
     maintainers = [ maintainers.costrouc ];
-    broken = true;
   };
 }

From 7059f44440c264cb534336dcd4c84dc5687c7b44 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Mon, 13 Jan 2020 17:18:02 -0500
Subject: [PATCH 0234/4636] python3Packages.tensorly: init at 0.4.5

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

diff --git a/pkgs/development/python-modules/tensorly/default.nix b/pkgs/development/python-modules/tensorly/default.nix
new file mode 100644
index 000000000000..33aca636f45f
--- /dev/null
+++ b/pkgs/development/python-modules/tensorly/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytest
+, nose
+, isPy27
+, numpy
+, scipy
+, sparse
+, pytorch
+}:
+
+buildPythonPackage rec {
+  pname = "tensorly";
+  version = "0.4.5";
+  disabled = isPy27;
+
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = version;
+    sha256 = "1ml91yaxwx4msisxbm92yf22qfrscvk58f3z2r1jhi96pw2k4i7x";
+  };
+
+  propagatedBuildInputs = [ numpy scipy sparse ];
+  checkInputs = [ pytest nose pytorch ];
+  # also has a cupy backend, but the tests are currently broken
+  # (e.g. attempts to access cupy.qr instead of cupy.linalg.qr)
+  # and this backend also adds a non-optional CUDA dependence,
+  # as well as tensorflow and mxnet backends, but the tests don't
+  # seem to exercise these backend by default
+
+  checkPhase = ''
+    runHook preCheck
+    nosetests -e "test_cupy"
+    runHook postCheck
+  '';
+
+  meta = with lib; {
+    description = "Tensor learning in Python";
+    homepage = https://tensorly.org/;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.bcdarwin ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 610a8d0852f9..f510f29facc7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6581,6 +6581,8 @@ in {
     cudaSupport = true;
   };
 
+  tensorly = callPackage ../development/python-modules/tensorly { };
+
   tflearn = callPackage ../development/python-modules/tflearn { };
 
   simpleai = callPackage ../development/python-modules/simpleai { };

From 8f30b3e83e561dee8f18d3be618a07a8c2eba644 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Mon, 13 Jan 2020 19:25:47 +0100
Subject: [PATCH 0235/4636] kanboard: 1.2.12 -> 1.2.13

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

diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix
index d3cef00bbe8a..b790fb9e6c45 100644
--- a/pkgs/applications/misc/kanboard/default.nix
+++ b/pkgs/applications/misc/kanboard/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "kanboard";
-  version = "1.2.12";
+  version = "1.2.13";
 
   src = fetchFromGitHub {
     owner = "kanboard";
     repo = "kanboard";
     rev = "v${version}";
-    sha256 = "1m1drgbyk1m6mf69xqlz9gqcj650n9m4y2fdj7d2yv20q8r31489";
+    sha256 = "0mm5sx323v1rwykd1dhvk4d3ipgvgvi3wvhrlavbja3lgay3mdwk";
   };
 
   dontBuild = true;
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     description = "Kanban project management software";
     homepage = https://kanboard.net;
     license = licenses.mit;
-    maintainers = with maintainers; [ fpletz ];
+    maintainers = with maintainers; [ fpletz lheckemann ];
   };
 }

From be01f27adcaf56c56357cfce60acdae5fd4d22e3 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 10 Feb 2020 14:21:59 -0500
Subject: [PATCH 0236/4636] rl-2009: typo

---
 nixos/doc/manual/release-notes/rl-2009.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 240fa281d790..d07b7cf49c39 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -3,7 +3,7 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-20.09">
- <title>Release 20.09 (“Markhor”, 2020.09/??)</title>
+ <title>Release 20.09 (“Nightingale”, 2020.09/??)</title>
 
  <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"

From c1b3b6f8b22fe11b894c236bcfe6522c6a46dc5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjarki=20=C3=81g=C3=BAst=20Gu=C3=B0mundsson?=
 <bjarki.agust@gmail.com>
Date: Tue, 7 Jan 2020 21:13:49 +0000
Subject: [PATCH 0237/4636] google-play-music-desktop-player: 4.6.1 -> 4.7.1

---
 .../audio/google-play-music-desktop-player/default.nix     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
index b51b72f1c8a4..332f2ca2342e 100644
--- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix
+++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, alsaLib, atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype
+{ stdenv, alsaLib, atk, at-spi2-atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype
 , fetchurl, GConf, gdk-pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr
 , nss, pango, udev, xorg
 }:
 
 let
-  version = "4.6.1";
+  version = "4.7.1";
 
   deps = [
     alsaLib
     atk
+    at-spi2-atk
     cairo
     cups
     dbus
@@ -48,7 +49,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb";
-    sha256 = "0dyn2fxhcri9d9nmcprszs6yg79gsr09bjfzzb1p10yjmi77cj2g";
+    sha256 = "1ljm9c5sv6wa7pa483yq03wq9j1h1jdh8363z5m2imz407yzgm5r";
   };
 
   dontBuild = true;

From 9205b2d6334289b8acb340c4d1b84252247464a6 Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Sun, 5 Jan 2020 13:18:12 +0100
Subject: [PATCH 0238/4636] trilium: 0.38.2 -> 0.39.4

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

diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix
index 28548091f6ea..ee4940928841 100644
--- a/pkgs/applications/office/trilium/default.nix
+++ b/pkgs/applications/office/trilium/default.nix
@@ -19,7 +19,7 @@ let
     maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ];
   };
 
-  version = "0.38.2";
+  version = "0.39.4";
 
 in {
   
@@ -30,7 +30,7 @@ in {
 
     src = fetchurl {
       url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
-      sha256 = "10f5zfqcfcjynw04d5xzrfmkbqpk85i4mq7njhkibx2f1m0br2qa";
+      sha256 = "18wrnm13k0gg6aljpf6k7c5zia81zzkqc0sa1pgz0yzczydsfaa9";
     };
   
     # Fetch from source repo, no longer included in release.
@@ -78,7 +78,7 @@ in {
 
     src = fetchurl {
       url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
-      sha256 = "1df0cx9gpzk0086lgha0qm1g03l8f4rz7y2xzgpzng5rrxjkgz61";
+      sha256 = "06svdp25031p665pvlxdz10malvhxpczzrg90hpr1zymm6v8van3";
     };
 
     nativeBuildInputs = [

From 51950d7a29a42d0d4e0e3b2953401bc17480b0c3 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Sat, 4 Jan 2020 22:48:37 -0500
Subject: [PATCH 0239/4636] rtl8812au: fix cross compiling

Built and tested on:
Raspberry Pi 3, natively compiled on aarch64
Raspberry Pi 1, cross compiled from x86_64 to armv6l
---
 pkgs/os-specific/linux/rtl8812au/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix
index 683645803464..edec5932e7f9 100644
--- a/pkgs/os-specific/linux/rtl8812au/default.nix
+++ b/pkgs/os-specific/linux/rtl8812au/default.nix
@@ -23,6 +23,15 @@ stdenv.mkDerivation rec {
     substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
   '';
 
+  makeFlags = [
+    "ARCH=${stdenv.hostPlatform.platform.kernelArch}"
+    "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+    ("CONFIG_PLATFORM_I386_PC=" + (if (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) then "y" else "n"))
+    ("CONFIG_PLATFORM_ARM_RPI=" + (if (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) then "y" else "n"))
+  ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+  ];
+
   preInstall = ''
     mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
   '';
@@ -35,7 +44,7 @@ stdenv.mkDerivation rec {
     description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod";
     homepage = https://github.com/zebulon2/rtl8812au-driver-5.2.20;
     license = licenses.gpl2;
-    platforms = [ "x86_64-linux" "i686-linux" ];
+    platforms = platforms.linux;
     maintainers = with maintainers; [ danielfullmer ];
   };
 }

From a8c0c21f7851e201bf113854f0f80519afa551fe Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Fri, 3 Jan 2020 23:31:31 +0000
Subject: [PATCH 0240/4636] capstone: enable for darwin, enable tests & fix
 pkg-config output

turns out capstone.pc is generated during the buildPhase, so needs
PREFIX set here too for it to be correct
---
 .../libraries/capstone/default.nix            | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
index 956fd74da585..b8d00984cd64 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -9,9 +9,23 @@ stdenv.mkDerivation rec {
     sha256 = "1isxw2qwy1fi3m3w7igsr5klzczxc5cxndz0a78dfss6ps6ymfvr";
   };
 
+  # replace faulty macos detection
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i 's/^IS_APPLE := .*$/IS_APPLE := 1/' Makefile
+  '';
+
   configurePhase = '' patchShebangs make.sh '';
-  buildPhase = '' ./make.sh '';
-  installPhase = '' env PREFIX=$out ./make.sh install '';
+  buildPhase = "PREFIX=$out ./make.sh";
+
+  doCheck = true;
+  checkPhase = ''
+    # first remove fuzzing steps from check target
+    substituteInPlace Makefile --replace "fuzztest fuzzallcorp" ""
+    make check
+  '';
+
+  installPhase = (stdenv.lib.optionalString stdenv.isDarwin "HOMEBREW_CAPSTONE=1 ")
+    + "PREFIX=$out ./make.sh install";
   
   nativeBuildInputs = [
     pkgconfig
@@ -23,7 +37,7 @@ stdenv.mkDerivation rec {
     description = "Advanced disassembly library";
     homepage    = "http://www.capstone-engine.org";
     license     = stdenv.lib.licenses.bsd3;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ thoughtpolice ris ];
   };
 }

From 8817036a3140dc8496dd627ed6c7e8994b086b9a Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Thu, 2 Jan 2020 20:06:50 +0000
Subject: [PATCH 0241/4636] pythonPackages.capstone: 3.0.5.post1 -> 4.0.1,
 redesign as wrapper package around main capstone package

this allows us to keep the two packages in sync and handle overrides more
flexibly
---
 .../python-modules/capstone/default.nix       | 38 +++++++------------
 pkgs/top-level/python-packages.nix            |  2 +-
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/python-modules/capstone/default.nix b/pkgs/development/python-modules/capstone/default.nix
index 035632f9cf25..7fc0b16522ed 100644
--- a/pkgs/development/python-modules/capstone/default.nix
+++ b/pkgs/development/python-modules/capstone/default.nix
@@ -3,43 +3,33 @@
 , fetchPypi
 , fetchpatch
 , setuptools
+, capstone
 }:
 
 buildPythonPackage rec {
   pname = "capstone";
-  version = "3.0.5.post1";
+  version = stdenv.lib.getVersion capstone;
 
-  setupPyBuildFlags = [
-    "--plat-name x86_64-linux"
-  ];
+  src = capstone.src;
+  sourceRoot = "${capstone.name}/bindings/python";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "3c0f73db9f8392f7048c8a244809f154d7c39f354e2167f6c477630aa517ed04";
-  };
+  postPatch = ''
+    ln -s ${capstone}/lib/libcapstone${stdenv.targetPlatform.extensions.sharedLibrary} prebuilt/
+    ln -s ${capstone}/lib/libcapstone.a prebuilt/
+  '';
 
   propagatedBuildInputs = [ setuptools ];
 
-  patches = [
-    (fetchpatch {
-      stripLen = 2;
-      url = "https://patch-diff.githubusercontent.com/raw/aquynh/capstone/pull/783/commits/23fe9f36622573c747e2bab6119ff245437bf276.patch";
-      sha256 = "0yizqrdlxqxn16873593kdx2vrr7gvvilhgcf9xy6hr0603d3m5r";
-    })
-  ];
-
-  postPatch = ''
-    patchShebangs src/make.sh
-  '';
-
-  preCheck = ''
-    mv src/libcapstone.so capstone
+  checkPhase = ''
+    mv capstone capstone.hidden
+    patchShebangs test_*
+    make check
   '';
 
   meta = with stdenv.lib; {
     homepage = "http://www.capstone-engine.org/";
     license = licenses.bsdOriginal;
-    description = "Capstone disassembly engine";
-    maintainers = with maintainers; [ bennofs ];
+    description = "Python bindings for Capstone disassembly engine";
+    maintainers = with maintainers; [ bennofs ris ];
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f510f29facc7..603b2cf5dfee 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1816,7 +1816,7 @@ in {
     inherit (self) python numpy boost;
   });
 
-  capstone = callPackage ../development/python-modules/capstone { };
+  capstone = callPackage ../development/python-modules/capstone { inherit (pkgs) capstone; };
 
   capturer = callPackage ../development/python-modules/capturer { };
 

From 8d6d53b173692ab2160383d78ab5f8f8fb333496 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 3 Jan 2020 10:54:00 -0800
Subject: [PATCH 0242/4636] pythonPackages.elementpath: 1.3.3 -> 1.4.0

---
 .../python-modules/elementpath/default.nix        | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix
index 093a30d29dab..7d293edba35a 100644
--- a/pkgs/development/python-modules/elementpath/default.nix
+++ b/pkgs/development/python-modules/elementpath/default.nix
@@ -1,19 +1,28 @@
-{ lib, buildPythonPackage, fetchFromGitHub }:
+{ lib, buildPythonPackage, fetchFromGitHub, isPy27 }:
 
 buildPythonPackage rec {
-  version = "1.3.3";
+  version = "1.4.0";
   pname = "elementpath";
+  disabled = isPy27; # uses incompatible class syntax
 
   src = fetchFromGitHub {
     owner = "sissaschool";
     repo = "elementpath";
     rev = "v${version}";
-    sha256 = "05wplh836ffwhncf5rpdnz4g1b3mqw7jiy83352nw4x3aak4ifbr";
+    sha256 = "1fmwy7plcgxam09cx3z11068k0c98wcsgclmxdq8chsd6id3632y";
   };
 
   # avoid circular dependency with xmlschema which directly depends on this
   doCheck = false;
 
+  pythonImportsCheck = [
+    "elementpath.xpath1_parser"
+    "elementpath.xpath2_parser"
+    "elementpath.xpath2_functions"
+    "elementpath.xpath_context"
+    "elementpath.xpath_selectors"
+  ];
+
   meta = with lib; {
     description = "XPath 1.0/2.0 parsers and selectors for ElementTree and lxml";
     homepage = "https://github.com/sissaschool/elementpath";

From 2214be1fe1b6da7860d2e7c7d6f2f90b0697e7b9 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 3 Jan 2020 15:17:33 -0800
Subject: [PATCH 0243/4636] pythonPackages.xmlschema: 1.0.17 -> 1.0.18

---
 pkgs/development/python-modules/xmlschema/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix
index 788ccc0ed81b..ade478bf82c5 100644
--- a/pkgs/development/python-modules/xmlschema/default.nix
+++ b/pkgs/development/python-modules/xmlschema/default.nix
@@ -18,6 +18,11 @@ buildPythonPackage rec {
 
   checkInputs = [ pytest ];
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "elementpath~=1.3.0" "elementpath~=1.3"
+  '';
+
   # Ignore broken fixtures, and tests for files which don't exist.
   # For darwin, we need to explicity say we can't reach network
   checkPhase = ''

From d108ba9ded169e857a2807df4a97ceb611da085f Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 29 Dec 2019 20:04:35 -0500
Subject: [PATCH 0244/4636] recursive: 1.022 -> 1.030

---
 pkgs/data/fonts/recursive/default.nix | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix
index d3d65f8e515c..3b1e8931b897 100644
--- a/pkgs/data/fonts/recursive/default.nix
+++ b/pkgs/data/fonts/recursive/default.nix
@@ -2,25 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "recursive";
-  version = "1.022";
+  version = "1.030";
 
-  srcs = [
-    (fetchzip {
-      name = "${pname}";
-      url = "https://github.com/arrowtype/recursive/releases/download/v${version}/recursive-beta_1_022.zip";
-      sha256 = "09nr1fli7ksv8z4yb25c4xidwsqq50av18qrybsy4kqy5c22957v";
-      stripRoot = false;
-    })
-
-    (fetchzip {
-      name = "${pname}-static";
-      url = "https://github.com/arrowtype/recursive/releases/download/v${version}/recursive-static_fonts-b020.zip";
-      sha256 = "1wlj113gjm26ra9y2r2b3syis2wx0mjq2m8i8xpwscp1kflma1r6";
-      stripRoot = false;
-    })
-  ];
-
-  sourceRoot = ".";
+  src = fetchzip {
+    url = "https://github.com/arrowtype/recursive/releases/download/${version}/recursive-beta_1_030--statics.zip";
+    sha256 = "1clds4ljiqdf0zc3b7nlna1w7kc23pc9gxdd5vwbgmz9xfvkam0f";
+    stripRoot = false;
+  };
 
   installPhase = ''
     mkdir -p $out/share/fonts/{opentype,truetype,woff2}

From e66cbc5f6544c8475626b27a74a859e39790d1c2 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Sun, 29 Dec 2019 04:10:33 +0100
Subject: [PATCH 0245/4636] rakudo: 2017.01 -> 2020.01

dependencies:
- moarvm: init at 2020.01.1
- nqp: init at 2020.01
- zef: init 0.8.2

Replaced the rakudo-star distribution with packages for raku, moarvm, nqp and
zef.
---
 .../interpreters/rakudo/default.nix           | 30 ++++++++--------
 .../interpreters/rakudo/moarvm.nix            | 25 ++++++++++++++
 pkgs/development/interpreters/rakudo/nqp.nix  | 29 ++++++++++++++++
 pkgs/development/interpreters/rakudo/zef.nix  | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 ++-
 5 files changed, 107 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/interpreters/rakudo/moarvm.nix
 create mode 100644 pkgs/development/interpreters/rakudo/nqp.nix
 create mode 100644 pkgs/development/interpreters/rakudo/zef.nix

diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index ab5493e8a9d0..1f832efee89a 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -1,29 +1,29 @@
-{ stdenv, fetchurl, perl, icu, zlib, gmp, readline
-, CoreServices, ApplicationServices }:
+{ stdenv, fetchurl, perl, icu, zlib, gmp, lib, nqp }:
 
 stdenv.mkDerivation rec {
-  pname = "rakudo-star";
-  version = "2017.01";
+  pname = "rakudo";
+  version = "2020.01";
 
   src = fetchurl {
-    url    = "http://rakudo.org/downloads/star/${pname}-${version}.tar.gz";
-    sha256 = "07zjqdzxm30pmjqwlnr669d75bsbimy09sk0dvgm0pnn3zr92fjq";
+    url    = "https://github.com/rakudo/rakudo/releases/download/${version}/rakudo-${version}.tar.gz";
+    sha256 = "1c63ns90zy13gyj0l27k63q7dv08w4589w605nywd7pplbygq0if";
   };
 
-  buildInputs = [ icu zlib gmp readline perl ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
+  buildInputs = [ icu zlib gmp perl ];
   configureScript = "perl ./Configure.pl";
-  configureFlags =
-    [ "--backends=moar"
-      "--gen-moar"
-      "--gen-nqp"
-    ];
+  configureFlags = [
+    "--backends=moar"
+    "--with-nqp=${nqp}/bin/nqp"
+  ];
+
+  # Some tests fail on Darwin
+  doCheck = !stdenv.isDarwin;
 
   meta = with stdenv.lib; {
-    description = "A Perl 6 implementation";
+    description = "Raku implementation on top of Moar virtual machine";
     homepage    = https://www.rakudo.org;
     license     = licenses.artistic2;
     platforms   = platforms.unix;
-    maintainers = with maintainers; [ thoughtpolice vrthra ];
+    maintainers = with maintainers; [ thoughtpolice vrthra sgo ];
   };
 }
diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix
new file mode 100644
index 000000000000..48430ef548be
--- /dev/null
+++ b/pkgs/development/interpreters/rakudo/moarvm.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, perl
+, CoreServices, ApplicationServices }:
+
+stdenv.mkDerivation rec {
+  pname = "moarvm";
+  version = "2020.01.1";
+
+  src = fetchurl {
+    url    = "https://github.com/MoarVM/MoarVM/releases/download/${version}/MoarVM-${version}.tar.gz";
+    sha256 = "11rmlps6r3nqa9m2yyv9i2imahirsqmxbfay71f3gs4ql121xdnw";
+  };
+
+  buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
+  doCheck = false; # MoarVM does not come with its own test suite
+
+  configureScript = "${perl}/bin/perl ./Configure.pl";
+
+  meta = with stdenv.lib; {
+    description = "VM with adaptive optimization and JIT compilation, built for Rakudo";
+    homepage    = "https://github.com/MoarVM/MoarVM";
+    license     = licenses.artistic2;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ thoughtpolice vrthra sgo ];
+  };
+}
diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix
new file mode 100644
index 000000000000..5a93a7f9dad9
--- /dev/null
+++ b/pkgs/development/interpreters/rakudo/nqp.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, perl, lib, moarvm }:
+
+stdenv.mkDerivation rec {
+  pname = "nqp";
+  version = "2020.01";
+
+  src = fetchurl {
+    url    = "https://github.com/perl6/nqp/releases/download/${version}/nqp-${version}.tar.gz";
+    sha256 = "0nwn6a9i9akw1zmywhkn631gqy8l4dvy50d6id63zir28ccrrk2c";
+  };
+
+  buildInputs = [ perl ];
+
+  configureScript = "${perl}/bin/perl ./Configure.pl";
+  configureFlags = [
+    "--backends=moar"
+    "--with-moar=${moarvm}/bin/moar"
+  ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "Not Quite Perl -- a lightweight Raku-like environment for virtual machines";
+    homepage    = "https://github.com/perl6/nqp";
+    license     = licenses.artistic2;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ thoughtpolice vrthra sgo ];
+  };
+}
diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix
new file mode 100644
index 000000000000..5c3597cf289c
--- /dev/null
+++ b/pkgs/development/interpreters/rakudo/zef.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, rakudo, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  pname = "zef";
+  version = "0.8.2";
+
+  src = fetchFromGitHub {
+    owner = "ugexe";
+    repo = "zef";
+    rev = "v${version}";
+    sha256 = "064nbl2hz55mpxdcy9zi39s2z6bad3bj73xsna966a7hzkls0a70";
+  };
+
+  buildInputs = [ rakudo makeWrapper ];
+
+  installPhase = ''
+    mkdir -p "$out"
+    # TODO: Find better solution. zef stores cache stuff in $HOME with the
+    # default config.
+    env HOME=$TMPDIR ${rakudo}/bin/raku -I. ./bin/zef --/depends --/test-depends --/build-depends --install-to=$out install .
+  '';
+
+  postFixup =''
+    wrapProgram $out/bin/zef --prefix RAKUDOLIB , "inst#$out"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Raku / Perl6 Module Management";
+    homepage    = "https://github.com/ugexe/zef";
+    license     = licenses.artistic2;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ sgo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4494a96ab94c..073f5f42f607 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9394,9 +9394,12 @@ in
   };
   racket-minimal = callPackage ../development/interpreters/racket/minimal.nix { };
 
-  rakudo = callPackage ../development/interpreters/rakudo {
+  rakudo = callPackage ../development/interpreters/rakudo {};
+  moarvm = callPackage ../development/interpreters/rakudo/moarvm.nix {
     inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
   };
+  nqp = callPackage  ../development/interpreters/rakudo/nqp.nix { };
+  zef = callPackage ../development/interpreters/rakudo/zef.nix { };
 
   rascal = callPackage ../development/interpreters/rascal { };
 

From 8d0f535606ffba2c270997097d1de8b5f82e0c46 Mon Sep 17 00:00:00 2001
From: Pedro Pombeiro <noreply@pedro.pombei.ro>
Date: Sun, 2 Feb 2020 10:19:25 +0100
Subject: [PATCH 0246/4636] nsis: 3.04 -> 3.05

---
 pkgs/development/tools/nsis/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/development/tools/nsis/default.nix
index f8beae4d527a..683d07ed4964 100644
--- a/pkgs/development/tools/nsis/default.nix
+++ b/pkgs/development/tools/nsis/default.nix
@@ -2,23 +2,24 @@
 
 stdenv.mkDerivation rec {
   pname = "nsis";
-  version = "3.04";
+  version = "3.05";
 
   src =
     fetchurl {
       url = "mirror://sourceforge/project/nsis/NSIS%203/${version}/nsis-${version}-src.tar.bz2";
-      sha256 = "1xgllk2mk36ll2509hd31mfq6blgncmdzmwxj3ymrwshdh23d5b0";
+      sha256 = "1sbwx5vzpddharkb7nj4q5z3i5fbg4lan63ng738cw4hmc4v7qdn";
     };
   srcWinDistributable =
     fetchzip {
       url = "mirror://sourceforge/project/nsis/NSIS%203/${version}/nsis-${version}.zip";
-      sha256 = "1g31vz73x4d3cmsw2wfk43qa06bpqp5815fb5qq9vmwms6hym6y2";
+      sha256 = "0i3pzdilyy5g0r2c92pd2jl92ji9f75vv98mndzq8vw03a34yh3q";
     };
 
   postUnpack = ''
     mkdir -p $out/share/nsis
     cp -avr ${srcWinDistributable}/{Contrib,Include,Plugins,Stubs} \
       $out/share/nsis
+    chmod -R u+w $out/share/nsis
   '';
 
   nativeBuildInputs = [ scons ];

From 4e0f25d443c85f6cac415ba1602d53ca4593252a Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Sun, 9 Feb 2020 19:07:55 -0800
Subject: [PATCH 0247/4636] abseil-cpp: 20190322 -> 20191119

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 pkgs/development/libraries/abseil-cpp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/abseil-cpp/default.nix b/pkgs/development/libraries/abseil-cpp/default.nix
index b46963f4673e..bd896fb9c65d 100644
--- a/pkgs/development/libraries/abseil-cpp/default.nix
+++ b/pkgs/development/libraries/abseil-cpp/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation rec {
   pname = "abseil-cpp";
-  date = "20190322";
-  rev = "eab2078b53c9e3d9d240135c09d27e3393acb50a";
+  date = "20191119";
+  rev = "8ba96a8244bbe334d09542e92d566673a65c1f78";
   version = "${date}-${rev}";
 
   src = fetchFromGitHub {
     owner = "abseil";
     repo = "abseil-cpp";
     rev = rev;
-    sha256 = "1bpz44hxq5fpkv6jlgphzk7mxjiiah526jgb63ih5pd1hd2cfw1r";
+    sha256 = "089bvlspgdgi40fham20qy1m97gr1jh5k5czz49dincpd18j6inb";
   };
 
   nativeBuildInputs = [ cmake ];

From 1a32e383e6139834f1b86c1edc877fcd28f24dea Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Sun, 9 Feb 2020 19:08:45 -0800
Subject: [PATCH 0248/4636] or-tools: 7.3 -> 7.5

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 .../science/math/or-tools/build.patch         |  5 -----
 .../science/math/or-tools/default.nix         | 22 +++++++++----------
 .../science/math/or-tools/protobuf.patch      | 10 ---------
 pkgs/top-level/all-packages.nix               |  4 +---
 pkgs/top-level/python-packages.nix            |  1 -
 5 files changed, 11 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/development/libraries/science/math/or-tools/build.patch
 delete mode 100644 pkgs/development/libraries/science/math/or-tools/protobuf.patch

diff --git a/pkgs/development/libraries/science/math/or-tools/build.patch b/pkgs/development/libraries/science/math/or-tools/build.patch
deleted file mode 100644
index a67e137ff4af..000000000000
--- a/pkgs/development/libraries/science/math/or-tools/build.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- a/makefiles/Makefile.python.mk
-+++ b/makefiles/Makefile.python.mk
-@@ -1070 +1070 @@ $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools/data: $(PYDATA_LIBS) | $(PYPI_ARCHIVE_T
--$(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools/util: $(PYUTIL_LIBS) | $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools
-+$(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools/util: $(PYSORTED_INTERVAL_LIST_LIBS) | $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools
diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix
index 15aea5803bf1..688d14256819 100644
--- a/pkgs/development/libraries/science/math/or-tools/default.nix
+++ b/pkgs/development/libraries/science/math/or-tools/default.nix
@@ -1,24 +1,22 @@
 { stdenv, fetchFromGitHub, cmake, abseil-cpp, gflags, which
-, lsb-release, glog, protobuf, cbc, zlib
-, ensureNewerSourcesForZipFilesHook, python, swig
-, pythonProtobuf }:
+, lsb-release, glog, protobuf3_11, cbc, zlib
+, ensureNewerSourcesForZipFilesHook, python, swig }:
 
-stdenv.mkDerivation rec {
+let
+  protobuf = protobuf3_11;
+  pythonProtobuf = python.pkgs.protobuf.override { inherit protobuf; };
+
+in stdenv.mkDerivation rec {
   pname = "or-tools";
-  version = "7.3";
+  version = "7.5";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "or-tools";
     rev = "v${version}";
-    sha256 = "0q06vxmds6nm3dpjw4y5jzr8j98qgfb9i8pbm9pfhmqigv791hwc";
+    sha256 = "1p9jwdwzcsaa58ap912hdf2w27vna3xl9g4lh6kjskddwi8l3wac";
   };
 
-  patches = [
-    ./build.patch # https://github.com/google/or-tools/pull/1619
-    ./protobuf.patch # Otherwise it tries to install protobuf from pypi.
-  ];
-
   # The original build system uses cmake which does things like pull
   # in dependencies through git and Makefile creation time. We
   # obviously don't want to do this so instead we provide the
@@ -69,7 +67,7 @@ stdenv.mkDerivation rec {
     description = ''
       Google's software suite for combinatorial optimization.
     '';
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ andersk ];
     platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/development/libraries/science/math/or-tools/protobuf.patch b/pkgs/development/libraries/science/math/or-tools/protobuf.patch
deleted file mode 100644
index b0cce40434c6..000000000000
--- a/pkgs/development/libraries/science/math/or-tools/protobuf.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/makefiles/Makefile.third_party.unix.mk
-+++ b/makefiles/Makefile.third_party.unix.mk
-@@ -24,1 +24,1 @@ GLOG_TAG = 0.4.0
--PROTOBUF_TAG = 3.9.0
-+PROTOBUF_TAG = 3.7.0
---- a/makefiles/Makefile.third_party.win.mk
-+++ b/makefiles/Makefile.third_party.win.mk
-@@ -40 +40 @@ GLOG_TAG = 0.4.0
--PROTOBUF_TAG = 3.9.0
-+PROTOBUF_TAG = 3.7.0
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 073f5f42f607..e12acb123272 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24065,9 +24065,7 @@ in
 
   osi = callPackage ../development/libraries/science/math/osi { };
 
-  or-tools = callPackage ../development/libraries/science/math/or-tools {
-    pythonProtobuf = pythonPackages.protobuf;
-  };
+  or-tools = callPackage ../development/libraries/science/math/or-tools { };
 
   rubiks = callPackage ../development/libraries/science/math/rubiks { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 603b2cf5dfee..2f307c0da05e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -929,7 +929,6 @@ in {
 
   ortools = (toPythonModule (pkgs.or-tools.override {
     inherit (self) python;
-    pythonProtobuf = self.protobuf;
   })).python;
 
   osmnx = callPackage ../development/python-modules/osmnx { };

From 047095f89f741dd934ebfd64e816672279ba51d6 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Mon, 16 Dec 2019 16:53:46 +0000
Subject: [PATCH 0249/4636] far2l: 2018-07-19 -> 2019-12-14

---
 pkgs/applications/misc/far2l/default.nix | 34 +++++++++++++-----------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix
index 51e9c4371b5b..3823c70cf111 100644
--- a/pkgs/applications/misc/far2l/default.nix
+++ b/pkgs/applications/misc/far2l/default.nix
@@ -1,10 +1,17 @@
 { stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash,
   xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }:
 
-with stdenv.lib;
+let
+  newer-colorer-schemes = fetchFromGitHub {
+    owner = "colorer";
+    repo = "Colorer-schemes";
+    rev = "7c831f5e94a90530ace8b2bb9916210e3a2fcda6"; # 2019-11-28 (far2l has older Colorer-schemes)
+    sha256 = "18vaahdz5i7xdf00c9h9kjjswm4jszywm8zkhva4c4ivr4qqnv2c";
+  };
+in
 stdenv.mkDerivation rec {
-  build = "unstable-2018-07-19.git${builtins.substring 0 7 src.rev}";
-  name = "far2l-2.1.${build}";
+  pname = "far2l";
+  version = "2019-12-14.git${builtins.substring 0 7 src.rev}";
 
   src = fetchFromGitHub {
     owner = "elfmz";
@@ -16,16 +23,16 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ];
 
   buildInputs = [ wxGTK30 glib pcre ]
-    ++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa;
+    ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa;
 
-  postPatch = optionalString stdenv.isLinux ''
+  postPatch = stdenv.lib.optionalString stdenv.isLinux ''
     substituteInPlace far2l/bootstrap/trash.sh \
       --replace 'gvfs-trash'  '${gvfs}/bin/gvfs-trash'
-  '' + optionalString stdenv.isDarwin ''
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace far2l/CMakeLists.txt \
       --replace "-framework System" -lSystem
   '' + ''
-    echo 'echo ${build}' > far2l/bootstrap/scripts/vbuild.sh
+    echo 'echo ${version}' > far2l/bootstrap/scripts/vbuild.sh
     substituteInPlace far2l/bootstrap/open.sh              \
       --replace 'xdg-open'    '${xdg_utils}/bin/xdg-open'
     substituteInPlace far2l/vtcompletor.cpp                \
@@ -42,14 +49,9 @@ stdenv.mkDerivation rec {
       --replace '"bzip2 '     '"${bzip2}/bin/bzip2 '       \
       --replace '"tar '       '"${gnutar}/bin/tar '
 
-    ( cd colorer/configs/base
-      patch -p2 <  ${ fetchpatch {
-                        name   = "nix-language-highlighting.patch";
-                        url    = https://github.com/colorer/Colorer-schemes/commit/64bd06de0a63224b431cd8fc42cd9fa84b8ba7c0.patch;
-                        sha256 = "1mrj1wyxmk7sll9j1jzw6miwi0sfavf654klms24wngnh6hadsch";
-                      }
-                    }
-    )
+    cp ${newer-colorer-schemes}/hrc/hrc/base/nix.hrc     colorer/configs/base/hrc/base/
+    cp ${newer-colorer-schemes}/hrc/hrc/base/cpp.hrc     colorer/configs/base/hrc/base/
+    cp ${newer-colorer-schemes}/hrc/hrc/inet/jscript.hrc colorer/configs/base/hrc/base/
   '';
 
   installPhase = ''
@@ -75,7 +77,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "An orthodox file manager";
     homepage = https://github.com/elfmz/far2l;
     license = licenses.gpl2;

From f1541d185d02a0584b31f944ac2d0f5bb9bc1074 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 18 Jan 2020 17:50:37 +0000
Subject: [PATCH 0250/4636] far2l: fix .desktop file

---
 pkgs/applications/misc/far2l/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix
index 3823c70cf111..7c6573630a15 100644
--- a/pkgs/applications/misc/far2l/default.nix
+++ b/pkgs/applications/misc/far2l/default.nix
@@ -61,7 +61,8 @@ stdenv.mkDerivation rec {
     ln -s -r --force $out/bin/far2l $out/share/far2l/far2l_askpass
     ln -s -r --force $out/bin/far2l $out/share/far2l/far2l_sudoapp
 
-    sed "s,/usr/bin/,$out/bin/," ../far2l/DE/far2l.desktop > $out/share/applications/far2l.desktop
+    cp ../far2l/DE/far2l.desktop $out/share/applications/far2l.desktop
+    substituteInPlace $out/share/applications/far2l.desktop --replace \''${CMAKE_INSTALL_PREFIX} "$out"
 
     cp ../far2l/DE/icons/hicolor/1024x1024/apps/far2l.svg $out/share/icons/hicolor/scalable/apps/
     convert -size 128x128 ../far2l/DE/icons/far2l.svg $out/share/icons/far2l.png

From 0aa6230b58253a0f02a763e394f2c522e26ead1f Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <brightone@protonmail.com>
Date: Wed, 11 Dec 2019 23:52:21 +0200
Subject: [PATCH 0251/4636] keybase,keybase-gui: 5.0.0 -> 5.1.0

---
 pkgs/tools/security/keybase/default.nix | 4 ++--
 pkgs/tools/security/keybase/gui.nix     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index 1edf86675c31..fe9d702cbaff 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -6,7 +6,7 @@
 
 buildGoPackage rec {
   pname = "keybase";
-  version = "5.0.0";
+  version = "5.1.0";
 
   goPackagePath = "github.com/keybase/client";
   subPackages = [ "go/kbnm" "go/keybase" ];
@@ -17,7 +17,7 @@ buildGoPackage rec {
     owner = "keybase";
     repo = "client";
     rev = "v${version}";
-    sha256 = "0cxxqmgp82qi2b1fljyfa38is94y8ghb2pd31nbyh8y4wnmi0x1s";
+    sha256 = "1phf90q30la50bdqhm9cqcw039wh4dwrxwa5l3zvsr5j72aak5ij";
   };
 
   patches = [
diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix
index 2ec97f882367..4a50a7493229 100644
--- a/pkgs/tools/security/keybase/gui.nix
+++ b/pkgs/tools/security/keybase/gui.nix
@@ -4,16 +4,16 @@
 , runtimeShell, gsettings-desktop-schemas }:
 
 let
-  versionSuffix = "20191114203213.f73f97dac6";
+  versionSuffix = "20191211211104.cd9333f9fc";
 in
 
 stdenv.mkDerivation rec {
   pname = "keybase-gui";
-  version = "5.0.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
+  version = "5.1.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
 
   src = fetchurl {
     url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb";
-    sha256 = "e175e52a6355d8359d66ef4b445981b572c513754329d5c7f75ad7bb14ec348f";
+    sha256 = "0wqcb56wg6f4d49ln88krj7fhgy3zyb3f62yd5c17nym05anchwy";
   };
 
   nativeBuildInputs = [

From 85b93ef20e7530c4cd4815d815e862486cad99ec Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <brightone@protonmail.com>
Date: Wed, 11 Dec 2019 23:54:17 +0200
Subject: [PATCH 0252/4636] keybase,keybase-gui: add filalex77 to maintainers

---
 pkgs/tools/security/keybase/default.nix | 2 +-
 pkgs/tools/security/keybase/gui.nix     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index fe9d702cbaff..f3ee5a0e7ed0 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -35,7 +35,7 @@ buildGoPackage rec {
     homepage = https://www.keybase.io/;
     description = "The Keybase official command-line utility and service.";
     platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ carlsverre np rvolosatovs ];
+    maintainers = with maintainers; [ carlsverre np rvolosatovs filalex77 ];
     license = licenses.bsd3;
   };
 }
diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix
index 4a50a7493229..973d6ee2f410 100644
--- a/pkgs/tools/security/keybase/gui.nix
+++ b/pkgs/tools/security/keybase/gui.nix
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
     homepage = https://www.keybase.io/;
     description = "The Keybase official GUI";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ rvolosatovs puffnfresh np ];
+    maintainers = with maintainers; [ rvolosatovs puffnfresh np filalex77 ];
     license = licenses.bsd3;
   };
 }

From 0ea4e9940bfd6f8169c50aa8379a79bf802ec12e Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <brightone@protonmail.com>
Date: Thu, 12 Dec 2019 13:46:47 +0200
Subject: [PATCH 0253/4636] keybase,keybase-gui: 5.1.0 -> 5.1.1

---
 pkgs/tools/security/keybase/default.nix | 4 ++--
 pkgs/tools/security/keybase/gui.nix     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index f3ee5a0e7ed0..284ee2cab21b 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -6,7 +6,7 @@
 
 buildGoPackage rec {
   pname = "keybase";
-  version = "5.1.0";
+  version = "5.1.1";
 
   goPackagePath = "github.com/keybase/client";
   subPackages = [ "go/kbnm" "go/keybase" ];
@@ -17,7 +17,7 @@ buildGoPackage rec {
     owner = "keybase";
     repo = "client";
     rev = "v${version}";
-    sha256 = "1phf90q30la50bdqhm9cqcw039wh4dwrxwa5l3zvsr5j72aak5ij";
+    sha256 = "06rhnmk59was7dd5pd4czlrwqvmh02l9gka9561dkpl6w3j6814a";
   };
 
   patches = [
diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix
index 973d6ee2f410..3095142d3629 100644
--- a/pkgs/tools/security/keybase/gui.nix
+++ b/pkgs/tools/security/keybase/gui.nix
@@ -4,16 +4,16 @@
 , runtimeShell, gsettings-desktop-schemas }:
 
 let
-  versionSuffix = "20191211211104.cd9333f9fc";
+  versionSuffix = "20191211223501.15bbb94c23";
 in
 
 stdenv.mkDerivation rec {
   pname = "keybase-gui";
-  version = "5.1.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
+  version = "5.1.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
 
   src = fetchurl {
     url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb";
-    sha256 = "0wqcb56wg6f4d49ln88krj7fhgy3zyb3f62yd5c17nym05anchwy";
+    sha256 = "1frmk4ldmcz9rkl5bpsinzzwh39vavww67lsklln76xmkm3nacvq";
   };
 
   nativeBuildInputs = [

From 2835f1b8eb2ff65dc54939c252d63c07cf456e09 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Thu, 5 Dec 2019 13:12:59 +0100
Subject: [PATCH 0254/4636] pandoc-imagine: unstable-2018-11-19 -> 0.1.6

---
 pkgs/tools/misc/pandoc-imagine/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/pandoc-imagine/default.nix b/pkgs/tools/misc/pandoc-imagine/default.nix
index 811e44a6ce8e..67e27da960fc 100644
--- a/pkgs/tools/misc/pandoc-imagine/default.nix
+++ b/pkgs/tools/misc/pandoc-imagine/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonApplication rec {
   pname = "pandoc-imagine";
-  version = "unstable-2018-11-19";
+  version = "0.1.6";
 
   src = fetchFromGitHub {
     repo = "imagine";
     owner = "hertogp";
-    rev = "cc9be85155666c2d12d47a71690ba618cea1fac2";
-    sha256 = "0iksh9081g488yfjzd24bz4lm1nrrjamph1vynx3imrcfgyq7nsb";
+    rev = version;
+    sha256 = "1wpnckc7qyrf6ga5xhr6gv38k1anpy9nx888n7n3rh6nixzcz2dw";
   };
 
   propagatedBuildInputs = [ pandocfilters six ];

From a80f4726c4321582af96618c7da2665f58da5c67 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Fri, 15 Nov 2019 00:38:40 +0100
Subject: [PATCH 0255/4636] gofumpt: 2019-07-29 -> 2019-11-11

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

diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix
index 221058a461ef..5ca0d6cb1e03 100644
--- a/pkgs/development/tools/gofumpt/default.nix
+++ b/pkgs/development/tools/gofumpt/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "gofumpt";
-  version = "2019-07-29";
+  version = "2019-11-11";
 
   src = fetchFromGitHub {
     owner = "mvdan";
     repo = pname;
-    rev = "96300e3d49fbb3b7bc9c6dc74f8a5cc0ef46f84b";
-    sha256 = "169hwggbhlr6ga045d6sa7xsan3mnj19qbh63i3h4rynqlppzvpf";
+    rev = "eb442649d62000da5d11671f3beb1afa1b746fd7";
+    sha256 = "1cw9mmavxz8gxzzwsllvf5lwb2wwi19jbc7hcwxsi4ywp7a84gh0";
   };
 
-  modSha256 = "1g7dkl60zwlk4q2gwx2780xys8rf2c4kqyy8gr99s5y342wsbx2g";
+  modSha256 = "1ladpxhr90awnms2qmlm2lz91wyh92fl3rqbfr54qngrkpkpbhr2";
 
   meta = with lib; {
     description = "A stricter gofmt";

From df7ee19182c560db257e7d436d744ba073d88e36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCtke-Stetzkamp?= <christian@lkamp.de>
Date: Mon, 10 Feb 2020 11:12:22 +0100
Subject: [PATCH 0256/4636] cvsq: init at 1.10

---
 maintainers/maintainer-list.nix               |  6 ++
 .../version-management/cvsq/default.nix       | 67 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 75 insertions(+)
 create mode 100644 pkgs/applications/version-management/cvsq/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index de6adbf69d51..347bece0bd4a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1340,6 +1340,12 @@
     githubId = 25088352;
     name = "Christian Kögler";
   };
+  clkamp = {
+    email = "c@lkamp.de";
+    github = "clkamp";
+    githubId = 46303707;
+    name = "Christian Lütke-Stetzkamp";
+  };
   kampka = {
     email = "christian@kampka.net";
     github = "kampka";
diff --git a/pkgs/applications/version-management/cvsq/default.nix b/pkgs/applications/version-management/cvsq/default.nix
new file mode 100644
index 000000000000..f9cabb94b978
--- /dev/null
+++ b/pkgs/applications/version-management/cvsq/default.nix
@@ -0,0 +1,67 @@
+{ stdenv
+, fetchurl
+, makeWrapper
+, cvs
+, perl
+, nettools
+, findutils
+, rsync
+, coreutils
+, diffutils
+} :
+
+stdenv.mkDerivation rec {
+  pname = "cvsq";
+  version = "1.10";
+
+  src = fetchurl {
+    url = "http://www.linta.de/~aehlig/cvsq/cvsq-${version}.tgz";
+    sha256 = "1a2e5666d4d23f1eb673a505caeb771ac62a86ed69c9ab89c4e2696c2ccd0621";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ cvs perl nettools findutils rsync coreutils diffutils ];
+
+
+  makeFlags = [ "prefix=$(out)" ];
+
+  postInstall = ''
+    substituteInPlace $out/bin/cvsq --replace "/bin/sh" "${stdenv.shell}"
+    substituteInPlace $out/bin/lcvs --replace "/bin/sh" "${stdenv.shell}"
+    wrapProgram $out/bin/cvsq --prefix PATH : ${stdenv.lib.makeBinPath
+      [ cvs nettools findutils rsync coreutils diffutils ]}
+    wrapProgram $out/bin/cvsq-branch --prefix PATH : ${stdenv.lib.makeBinPath
+      [ cvs nettools findutils rsync coreutils diffutils ]}
+    wrapProgram $out/bin/cvsq-merge --prefix PATH : ${stdenv.lib.makeBinPath
+      [ cvs nettools findutils rsync coreutils diffutils ]}
+    wrapProgram $out/bin/cvsq-switch --prefix PATH : ${stdenv.lib.makeBinPath
+      [ cvs nettools findutils rsync coreutils diffutils ]}
+    wrapProgram $out/bin/lcvs --prefix PATH : ${stdenv.lib.makeBinPath
+      [ cvs nettools findutils rsync coreutils diffutils ]}
+  '';
+
+  meta = {
+    description = ''A collection of tools to work locally with CVS'';
+    longDescription = ''
+      cvsq is a collection of tools to work locally with CVS.
+
+      cvsq queues commits and other cvs commands in a queue to be executed later,
+      when the machine is online again. In case of a commit (the default action)
+      an actual copy of the working directory is made, so that you can continue
+      editing without affecting the scheduled commit. You can even schedule
+      several successive commits to the same file and they will be correctly
+      committed as successive commits at the time of upload. This is different
+      from an earlier script also named cvsq that you might have seen elsewhere.
+
+      lcvs uses rsync to maintain a local copy of a cvs repository. It also
+      gives a convenient interface to call cvs in such a way that it believes the
+      current working directory refers to the local copy rather than to the actual
+      repository. This is useful for commands like log, diff, etc; however it cannot
+      be used for commits (that's what cvsq is for).
+    '';
+    homepage = https://www.linta.de/~aehlig/cvsq/;
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = with stdenv.lib.maintainers; [ clkamp ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94be4b1745de..6145b37a6213 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18531,6 +18531,8 @@ in
 
   cvsps = callPackage ../applications/version-management/cvsps { };
 
+  cvsq = callPackage ../applications/version-management/cvsq { };
+
   cvs2svn = callPackage ../applications/version-management/cvs2svn { };
 
   cwm = callPackage ../applications/window-managers/cwm { };

From c79d6d0430777e97e34aab1777ff74998f7e870e Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Sat, 26 Oct 2019 16:08:37 -0400
Subject: [PATCH 0257/4636] c3d: 2018-10-04 -> unstable-2019-10-22; mark
 unbroken

---
 pkgs/applications/graphics/c3d/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix
index ad86e66204b2..4997bb03d6ac 100644
--- a/pkgs/applications/graphics/c3d/default.nix
+++ b/pkgs/applications/graphics/c3d/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchgit, cmake, itk, Cocoa }:
+{ stdenv, fetchgit, cmake, itk4, Cocoa }:
 
 stdenv.mkDerivation {
   pname   = "c3d";
-  version = "2018-10-04";
+  version = "unstable-2019-10-22";
 
   src = fetchgit {
-    url = "https://git.code.sf.net/p/c3d/git";
-    rev = "351929a582b2ef68fb9902df0b11d38f44a0ccd0";
-    sha256 = "0mpv4yl6hdnxgvnwrmd182h64n3ppp30ldzm0jz6jglk0nvpzq9w";
+    url    = "https://github.com/pyushkevich/c3d";
+    rev    = "c04e2b84568654665c64d8843378c8bbd58ba9b0";
+    sha256 = "0lzldxvshl9q362mg76byc7s5zc9qx7mxf2wgyij5vysx8mihx3q";
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ itk ]
+  buildInputs = [ itk4 ]
     ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
 
   meta = with stdenv.lib; {
@@ -20,6 +20,5 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ bcdarwin ];
     platforms = platforms.unix;
     license = licenses.gpl2;
-    broken = true;
   };
 }

From 3a6751d22d927ea41169360b65aa444a3fee1c9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?=
 <aluisio@aasg.name>
Date: Sun, 18 Aug 2019 11:34:07 -0300
Subject: [PATCH 0258/4636] maintainers: add AluisioASG

---
 maintainers/maintainer-list.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index de6adbf69d51..c4634caa7e42 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -357,6 +357,16 @@
     githubId = 5892756;
     name = "Alec Snyder";
   };
+  AluisioASG = {
+    name = "Aluísio Augusto Silva Gonçalves";
+    email = "aluisio@aasg.name";
+    github = "AluisioASG";
+    githubId = 1904165;
+    keys = [{
+      longkeyid = "rsa4096/0x9FAA63E097506D9D";
+      fingerprint = "7FDB 17B3 C29B 5BA6 E5A9  8BB2 9FAA 63E0 9750 6D9D";
+    }];
+  };
   alunduil = {
     email = "alunduil@gmail.com";
     github = "alunduil";

From 9a0e92512c8aa27828447bad1d8c13f4979dff0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?=
 <aluisio@aasg.name>
Date: Sun, 18 Aug 2019 16:31:15 -0300
Subject: [PATCH 0259/4636] r128gain: init at 0.9.3

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

diff --git a/pkgs/applications/audio/r128gain/default.nix b/pkgs/applications/audio/r128gain/default.nix
new file mode 100644
index 000000000000..c4d8a1c20167
--- /dev/null
+++ b/pkgs/applications/audio/r128gain/default.nix
@@ -0,0 +1,25 @@
+{ lib, python3Packages, ffmpeg }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "r128gain";
+  version = "0.9.3";
+
+  src = python3Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "0dx2grryp0lj58bawx1zcq9a6b4ijz9r5qrg8h6nvm92kqlya26i";
+  };
+
+  propagatedBuildInputs = [ ffmpeg ]
+    ++ (with python3Packages; [ crcmod mutagen tqdm ])
+    ;
+
+  doCheck = false; # downloads media files for testing
+
+  meta = with lib; {
+    description = "Fast audio loudness scanner & tagger (ReplayGain v2 / R128)";
+    homepage = "https://github.com/desbma/r128gain";
+    license = licenses.lgpl2Plus;
+    maintainers = [ maintainers.AluisioASG ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e12acb123272..dbacd6bab9b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25186,6 +25186,8 @@ in
     pcre = pcre-cpp;
   });
 
+  r128gain = callPackage ../applications/audio/r128gain { };
+
   redis-desktop-manager = libsForQt5.callPackage ../applications/misc/redis-desktop-manager { };
 
   robin-map = callPackage ../development/libraries/robin-map { };

From 42f1cab9c8f87eef50ca2c4e111dfdf765842d99 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 10 Feb 2020 20:15:56 +0000
Subject: [PATCH 0260/4636] udiskie: 1.7.7 -> 2.1.0

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

diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix
index 63892439fa03..7b2c49974973 100644
--- a/pkgs/applications/misc/udiskie/default.nix
+++ b/pkgs/applications/misc/udiskie/default.nix
@@ -6,13 +6,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "udiskie";
-  version = "1.7.7";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "coldfix";
     repo = "udiskie";
     rev = version;
-    sha256 = "1j17z26vy44il2s9zgchvhq280vq8ag64ddi35f35b444wz2azlb";
+    sha256 = "1d8fz0jrnpgldvdwpl27az2kjhpbcjd8nqn3qc2v6682q12p3jqb";
   };
 
   nativeBuildInputs = [

From 35b13b52cd701e613ffb341977e3aa9efed1b9fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 10 Feb 2020 21:30:50 +0100
Subject: [PATCH 0261/4636] lz4: do the refactoring forgotten after PR #51965

---
 pkgs/tools/compression/lz4/default.nix | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index 3ce0eac3fc5c..81cb1ad9811a 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -31,15 +31,10 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "PREFIX=$(out)"
     "INCLUDEDIR=$(dev)/include"
-    # TODO do this instead
-    #"BUILD_STATIC=${if enableStatic then "yes" else "no"}"
-    #"BUILD_SHARED=${if enableShared then "yes" else "no"}"
-    #"WINDRES:=${stdenv.cc.bintools.targetPrefix}windres"
+    "BUILD_STATIC=${if enableStatic then "yes" else "no"}"
+    "BUILD_SHARED=${if enableShared then "yes" else "no"}"
+    "WINDRES:=${stdenv.cc.bintools.targetPrefix}windres"
   ]
-    # TODO delete and do above
-    ++ stdenv.lib.optional (enableStatic) "BUILD_STATIC=yes"
-    ++ stdenv.lib.optional (!enableShared) "BUILD_SHARED=no"
-    ++ stdenv.lib.optional stdenv.hostPlatform.isMinGW "WINDRES:=${stdenv.cc.bintools.targetPrefix}windres"
     # TODO make full dictionary
     ++ stdenv.lib.optional stdenv.hostPlatform.isMinGW "TARGET_OS=MINGW"
     ;
@@ -52,9 +47,7 @@ stdenv.mkDerivation rec {
     stdenv.lib.optionalString stdenv.hostPlatform.isWindows ''
       mv $out/bin/*.dll $out/lib
       ln -s $out/lib/*.dll
-    ''
-    # TODO remove
-    + stdenv.lib.optionalString (!enableStatic) "rm $out/lib/*.a";
+    '';
 
   meta = with stdenv.lib; {
     description = "Extremely fast compression algorithm";

From cfa1f136dbf470baa95743acbe5ee2f9296b1fb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 10 Feb 2020 21:31:48 +0100
Subject: [PATCH 0262/4636] lz4: split binaries into a separate output

It's a little suspicious that the binaries are (apparently)
linked statically, but I assume upstream has some reasons (e.g. speed).
---
 pkgs/tools/compression/lz4/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index 81cb1ad9811a..fd967fce9c6c 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   ];
 
   # TODO(@Ericson2314): Separate binaries and libraries
-  outputs = [ "out" "dev" ];
+  outputs = [ "bin" "out" "dev" ];
 
   buildInputs = stdenv.lib.optional doCheck valgrind;
 
@@ -47,6 +47,9 @@ stdenv.mkDerivation rec {
     stdenv.lib.optionalString stdenv.hostPlatform.isWindows ''
       mv $out/bin/*.dll $out/lib
       ln -s $out/lib/*.dll
+    ''
+    + ''
+      moveToOutput bin "$bin"
     '';
 
   meta = with stdenv.lib; {

From 3668d993a32d69b40e3784c60d27b68e74a25ba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 10 Feb 2020 21:34:46 +0100
Subject: [PATCH 0263/4636] gnutls: move some docs that don't seem useful
 normally

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

diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix
index 869db46ede0c..cde8587acc37 100644
--- a/pkgs/development/libraries/gnutls/default.nix
+++ b/pkgs/development/libraries/gnutls/default.nix
@@ -28,7 +28,9 @@ stdenv.mkDerivation {
   };
 
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];
+  # Not normally useful docs.
   outputInfo = "devdoc";
+  outputDoc  = "devdoc";
 
   patches = [ ./nix-ssl-cert-file.patch ]
     # Disable native add_system_trust.

From 704b49db972b7d862712575c2399e02d887ce39e Mon Sep 17 00:00:00 2001
From: Tom Hall <tahall256@protonmail.ch>
Date: Sat, 8 Feb 2020 19:23:33 +0000
Subject: [PATCH 0264/4636] qttools: Add qtdeclarative to buildInputs

qtdeclarative is an optional dependency for some parts of qttools:
without it, the lupdate binary is not able to process qml files for
translatable strings.
---
 pkgs/development/libraries/qt-5/modules/qttools.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/modules/qttools.nix b/pkgs/development/libraries/qt-5/modules/qttools.nix
index 573472a8b5ab..c38eb0105e12 100644
--- a/pkgs/development/libraries/qt-5/modules/qttools.nix
+++ b/pkgs/development/libraries/qt-5/modules/qttools.nix
@@ -4,7 +4,7 @@ with lib;
 
 qtModule {
   name = "qttools";
-  qtInputs = [ qtbase ];
+  qtInputs = [ qtbase qtdeclarative ];
   outputs = [ "out" "dev" "bin" ];
 
   # fixQtBuiltinPaths overwrites a builtin path we should keep

From 9a4eb10862e0dbed3cd5caea585d00f74c1dc32c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 10 Feb 2020 21:57:25 +0000
Subject: [PATCH 0265/4636] yadm: 2.3.0 -> 2.4.0

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

diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix
index f3ddf8059b29..aab47ed1327b 100644
--- a/pkgs/applications/version-management/yadm/default.nix
+++ b/pkgs/applications/version-management/yadm/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, git, gnupg }:
 
-let version = "2.3.0"; in
+let version = "2.4.0"; in
 stdenv.mkDerivation {
   pname = "yadm";
   inherit version;
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     owner  = "TheLocehiliosan";
     repo   = "yadm";
     rev    = version;
-    sha256 = "1by21dh48qbi33wlyyvdwz7ac1lxrblzcr5v7hlnc4cbcgvgs1a0";
+    sha256 = "0kpahznrkxkyj92vrhwjvldg2affi1askgwvpgbs4mg40f92szlp";
   };
 
   dontConfigure = true;

From 84506b6c18bb8db47de21577c5a6299f0a1c3ba4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 10 Feb 2020 16:40:19 +0000
Subject: [PATCH 0266/4636] unoconv: 0.8.2 -> 0.9.0

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

diff --git a/pkgs/tools/text/unoconv/default.nix b/pkgs/tools/text/unoconv/default.nix
index aed7554e1704..2eaabc4f53d5 100644
--- a/pkgs/tools/text/unoconv/default.nix
+++ b/pkgs/tools/text/unoconv/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "unoconv";
-  version = "0.8.2";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "unoconv";
     repo = "unoconv";
     rev = version;
-    sha256 = "0mxrzzg9bl42lsiw8hcq624qbq8jrhcgmnal7ys68dj0l901snk3";
+    sha256 = "1akx64686in8j8arl6vsgp2n3bv770q48pfv283c6fz6wf9p8fvr";
   };
 
   buildInputs = [ asciidoc makeWrapper ];

From 5282bc9a748b1dbf2da2a450f522fdbbff192780 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 10 Feb 2020 23:10:53 +0100
Subject: [PATCH 0267/4636] nixos/brightnessctl: Remove the module

Due to the support of the systemd-logind API the udev rules aren't
required anymore which renders this module useless [0].
Note: brightnessctl should now require a working D-Bus setup and a valid
local logind session for this to work.

[0]: https://github.com/NixOS/nixpkgs/pull/79663
---
 nixos/modules/hardware/brightnessctl.nix | 31 ------------------------
 nixos/modules/module-list.nix            |  1 -
 nixos/modules/rename.nix                 |  6 +++++
 pkgs/misc/brightnessctl/default.nix      |  8 +-----
 4 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100644 nixos/modules/hardware/brightnessctl.nix

diff --git a/nixos/modules/hardware/brightnessctl.nix b/nixos/modules/hardware/brightnessctl.nix
deleted file mode 100644
index 2d54398d10df..000000000000
--- a/nixos/modules/hardware/brightnessctl.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-let
-  cfg = config.hardware.brightnessctl;
-in
-{
-
-  options = {
-
-    hardware.brightnessctl = {
-
-      enable = mkOption {
-        default = false;
-        type = types.bool;
-        description = ''
-          Enable brightnessctl in userspace.
-          This will allow brightness control from users in the video group.
-        '';
-
-      };
-    };
-  };
-
-
-  config = mkIf cfg.enable {
-    services.udev.packages = with pkgs; [ brightnessctl ];
-    environment.systemPackages = with pkgs; [ brightnessctl ];
-  };
-
-}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 402f222f4e92..9bad1554adc9 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -41,7 +41,6 @@
   ./hardware/acpilight.nix
   ./hardware/all-firmware.nix
   ./hardware/bladeRF.nix
-  ./hardware/brightnessctl.nix
   ./hardware/brillo.nix
   ./hardware/ckb-next.nix
   ./hardware/cpu/amd-microcode.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 3b1b1b8bb55c..2cc6c46e3581 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -42,6 +42,12 @@ with lib;
       instead, or any other display manager in NixOS as they all support auto-login.
     '')
     (mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead")
+    (mkRemovedOptionModule ["hardware" "brightnessctl" ] ''
+      The brightnessctl module was removed because newer versions of
+      brightnessctl don't require the udev rules anymore (they can use the
+      systemd-logind API). Instead of using the module you can now
+      simply add the brightnessctl package to environment.systemPackages.
+    '')
 
     # Do NOT add any option renames here, see top of the file
   ];
diff --git a/pkgs/misc/brightnessctl/default.nix b/pkgs/misc/brightnessctl/default.nix
index 387216e052f9..37956785a5bb 100644
--- a/pkgs/misc/brightnessctl/default.nix
+++ b/pkgs/misc/brightnessctl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, coreutils, pkg-config, systemd }:
+{ stdenv, fetchFromGitHub, pkg-config, systemd }:
 
 stdenv.mkDerivation rec {
   pname = "brightnessctl";
@@ -13,12 +13,6 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=" "DESTDIR=$(out)" "ENABLE_SYSTEMD=1" ];
 
-  postPatch = ''
-    substituteInPlace 90-brightnessctl.rules --replace /bin/ ${coreutils}/bin/
-    # For backward compatibility with the NixOS module / udev approach:
-    substituteInPlace Makefile --replace "INSTALL_UDEV_RULES=0" "INSTALL_UDEV_RULES=1"
-  '';
-
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ systemd ];
 

From 1b6ef1268fa87d66125938399a42f2b4d416cd8f Mon Sep 17 00:00:00 2001
From: Dave Nicponski <dev.Nicponski.Dave@dev.bwater.com>
Date: Mon, 10 Feb 2020 17:19:26 -0500
Subject: [PATCH 0268/4636] git: Fix git-gui to work on Catalina

The existing post-install was not successfully patching the git-gui script,
and thus was invoking the packaged osx app which uses the system tk,
which is too old to work (and is no longer supported by Apple anyway).
---
 .../version-management/git-and-tools/git/default.nix             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index d448f7b9c16a..a7f13905e7cd 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -234,6 +234,7 @@ stdenv.mkDerivation {
        for prog in bin/gitk libexec/git-core/{git-gui,git-citool,git-gui--askpass}; do
          sed -i -e "s|exec 'wish'|exec '${tk}/bin/wish'|g" \
                 -e "s|exec wish|exec '${tk}/bin/wish'|g" \
+                -e "s|exec \"[^\"]*/MacOS/Wish\"|exec '${tk}/bin/wish'|g" \
                 "$out/$prog"
        done
        ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/gitk

From e49df10da448ba85fcd9ee99c2b2eff8f3ccefe5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 10 Feb 2020 22:21:55 +0000
Subject: [PATCH 0269/4636] xlockmore: 5.61 -> 5.62

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

diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix
index c43a8acf8850..f18099d3840e 100644
--- a/pkgs/misc/screensavers/xlockmore/default.nix
+++ b/pkgs/misc/screensavers/xlockmore/default.nix
@@ -2,11 +2,11 @@
 , libXdmcp, libXt }:
 
 stdenv.mkDerivation rec {
-  name = "xlockmore-5.61";
+  name = "xlockmore-5.62";
 
   src = fetchurl {
     url = "http://sillycycle.com/xlock/${name}.tar.xz";
-    sha256 = "012wsfcphahwwylyfk9c848nwj1v08hpnja2yfs0j8pnq7milnva";
+    sha256 = "0b05wgj4mpssy4hd7km5c48i454dfg45p11mfmsr7xjd2gnz5gqi";
     curlOpts = "--user-agent 'Mozilla/5.0'";
   };
 

From 7d927677f494c07a81613547105b95b534840513 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 10 Feb 2020 23:28:06 +0100
Subject: [PATCH 0270/4636] signal-desktop: 1.30.1 -> 1.31.0

Changelog: https://github.com/signalapp/Signal-Desktop/releases/tag/v1.31.0
---
 .../networking/instant-messengers/signal-desktop/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index be1fe96526c3..d7e70b584c21 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -23,7 +23,7 @@ let
       else "");
 in stdenv.mkDerivation rec {
   pname = "signal-desktop";
-  version = "1.30.1"; # Please backport all updates to the stable channel.
+  version = "1.31.0"; # Please backport all updates to the stable channel.
   # All releases have a limited lifetime and "expire" 90 days after the release.
   # When releases "expire" the application becomes unusable until an update is
   # applied. The expiration date for the current release can be extracted with:
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "08l51f1fq9jlnqb4j38lxdfwfbqfzb85zrim57wlgcj8azp2ash6";
+    sha256 = "19vsv7jv30xvfgq1nr3091b6x4agymy9afpy9r9mxzgn0xfb0ap9";
   };
 
   nativeBuildInputs = [

From 4dfac925a66fd6695331192235627bf9901c6afe Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 11 Feb 2020 08:36:31 +1000
Subject: [PATCH 0271/4636] ncdu: 1.14.1 -> 1.14.2

https://dev.yorhel.nl/ncdu/changes
---
 pkgs/tools/misc/ncdu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix
index d29626c99d18..f47a43ab5d24 100644
--- a/pkgs/tools/misc/ncdu/default.nix
+++ b/pkgs/tools/misc/ncdu/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ncdu";
-  version = "1.14.1";
+  version = "1.14.2";
 
   src = fetchurl {
     url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz";
-    sha256 = "0gp1aszzrh8b6fhv8fspvkmr0qwc55z6z4w6l7r8j09sq7lf0cdy";
+    sha256 = "1cf6a9qw7ljaw09b0g7c5i252dl7wb2mnkrbwwwf7m0c3mf7yyll";
   };
 
   buildInputs = [ ncurses ];

From 6932a75d9c48c4587a340ceb384d83e87709d189 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Mon, 10 Feb 2020 23:16:23 +0000
Subject: [PATCH 0272/4636] drawpile,drawpile-server-headless: 2.1.15 -> 2.1.16
 (#79760)

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

diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix
index e64e384a9a7e..abe3bd19f744 100644
--- a/pkgs/applications/graphics/drawpile/default.nix
+++ b/pkgs/applications/graphics/drawpile/default.nix
@@ -60,11 +60,11 @@ let
 
 in mkDerivation rec {
   pname = "drawpile";
-  version = "2.1.15";
+  version = "2.1.16";
 
   src = fetchurl {
     url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz";
-    sha256 = "0w6bdg1rnnjzjg8xzqv3a9qhw41q41sjvp6f8m0sqxjfax05lqin";
+    sha256 = "1mz64c1a5x906j2jqq7i16l1q1d97wgm2y0ybmmcyqzg09x9wyaw";
   };
 
   nativeBuildInputs = [

From 157f392f57ddcb3a0c8b7062dc01469c6b43fdce Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 10 Feb 2020 19:00:03 -0500
Subject: [PATCH 0273/4636] mesos: switch to https for maven

Fixes: #78702
Closes: #79260
---
 pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh b/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh
index cf7318ecb273..1e2840017b34 100644
--- a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh
+++ b/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh
@@ -4,7 +4,7 @@ header "fetching Apache Mesos maven repo"
 function fetchArtifact {
   repoPath="$1"
   echo "Fetching $repoPath"
-  url="http://repo.maven.apache.org/maven2/$repoPath"
+  url="https://repo.maven.apache.org/maven2/$repoPath"
   mkdir -p $(dirname $out/$repoPath)
   curl --fail --location --insecure --retry 3 --max-redirs 20 "$url" --output "$out/$repoPath"
 }

From 720181abab01cfe0871dc667141651132227e228 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <meurerbernardo@gmail.com>
Date: Mon, 10 Feb 2020 16:18:16 -0800
Subject: [PATCH 0274/4636] cargo-udeps: 0.1.5 -> 0.1.7

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

diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix
index 829f9aa3740d..d05b7dd92218 100644
--- a/pkgs/development/tools/rust/cargo-udeps/default.nix
+++ b/pkgs/development/tools/rust/cargo-udeps/default.nix
@@ -2,22 +2,25 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-udeps";
-  version = "0.1.5";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
     owner = "est31";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0lrfnrxqmpp06fargb5s5fc9y4w4h0ahbd7rgibqqx1la23l9r5q";
+    sha256 = "1wh8w5p9rb9cqgpmclaywfsz3ckfi9mw38hhg31w7hkgjmqalyj9";
   };
 
-  cargoSha256 = "18rwzcsrlwds3nx90y03dkqm1hl4dpvclm32i9zy9bhpm9hkypwr";
+  cargoSha256 = "0vb2qr03qv66mmxgs1d5fvs63cdfxaldlg7pilhmdzha1kgy7ib0";
 
   nativeBuildInputs = [ pkgconfig ];
 
   buildInputs = [ openssl ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security libiconv ];
 
+  # Requires network access
+  doCheck = false;
+
   meta = with stdenv.lib; {
     description = "Find unused dependencies in Cargo.toml";
     homepage = "https://github.com/est31/cargo-udeps";

From 48603cd9d7ec51d5d5f4d46916ede48d1f19bac5 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 10 Feb 2020 16:29:02 +0100
Subject: [PATCH 0275/4636] nss: 3.48 -> 3.49.2

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

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 2e611c8975d7..fc2763486d1e 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -5,7 +5,7 @@ let
     url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz;
     sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
   };
-  version = "3.48";
+  version = "3.49.2";
   underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
 
 in stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
-    sha256 = "1b7qs1q7jqhw9dvkdznanzhc5dyq4bwx0biywszy3qx4hqm8571z";
+    sha256 = "1ck0c4ikr0d747pn63h62b2iqzfgi0yzd25aw95hs9797hn519zs";
   };
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];

From 82d9ce45fe0b67e3708ab6ba47ffcb4bba09945d Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 10 Feb 2020 16:20:57 +0100
Subject: [PATCH 0276/4636] rust-cbindgen: 0.10.0 -> 0.13.1

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

diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix
index fb71c2fbdff4..0cb2eb602069 100644
--- a/pkgs/development/tools/rust/cbindgen/default.nix
+++ b/pkgs/development/tools/rust/cbindgen/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rust-cbindgen";
-  version = "0.10.0";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "eqrion";
     repo = "cbindgen";
     rev = "v${version}";
-    sha256 = "0g82ikn5yricihl064q57dhrd4m475aykclrjf145hgl4qy2bjly";
+    sha256 = "1x21g66gri6z9bnnfn7zmnf2lwdf5ing76pcmw0ilx4nzpvfhkg0";
   };
 
-  cargoSha256 = "1y96m2my0h8fxglxz20y68fr8mnw031pxvzjsq801gwz2p858d75";
+  cargoSha256 = "13fb8cdg6r0g5jb3vaznvv5aaywrnsl2yp00h4k8028vl8jwwr79";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 

From 187d6912a8363daaed052387a062637368305901 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 10 Feb 2020 16:29:20 +0100
Subject: [PATCH 0277/4636] firefox: prepare for 73.0

---
 pkgs/applications/networking/browsers/firefox/common.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 8ba899457b3d..4aa8105559b0 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -103,10 +103,6 @@ stdenv.mkDerivation ({
       sha256 = "1zg56v3lc346fkzcjjx21vjip2s9hb2xw4pvza1dsfdnhsnzppfp";
     })
   ]
-  ++ lib.optional (lib.versionAtLeast ffversion "71") (fetchpatch {
-    url = "https://phabricator.services.mozilla.com/D56873?download=true";
-    sha256 = "183949phd2n27nhiq85a04j4fjn0jxmldic6wcjrczsd8g2rrr5k";
-  })
   ++ patches;
 
 

From 8019df98f8a88761e6462df19bdd5b494e555f3d Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 10 Feb 2020 16:29:30 +0100
Subject: [PATCH 0278/4636] firefox: 72.0.2 -> 73.0

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

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index c61483c67721..4f611f296b13 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -16,10 +16,10 @@ in
 rec {
   firefox = common rec {
     pname = "firefox";
-    ffversion = "72.0.2";
+    ffversion = "73.0";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
-      sha512 = "13l23p2dqsf2cpdzaydqqq4kbxlc5jxggz9r2i49avn4q9bqx036zvsq512q1hk37bz2bwq8zdr0530s44zickinls150xq14kq732d";
+      sha512 = "2da2jn3gwck6qys3ys146jsjl9fgq10s3ii62y4ssnhl76ryir8f1mv9i1d6hyv8381hplasnxb553d5bgwnq87ymgqabakmr48n2p1";
     };
 
     patches = [

From 11920736e8c703a0143652e6976dd9e4f0f8e668 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 10 Feb 2020 16:34:34 +0100
Subject: [PATCH 0279/4636] firefox-bin: 72.0.3 -> 73.0

---
 .../browsers/firefox-bin/release_sources.nix  | 770 +++++++++---------
 1 file changed, 385 insertions(+), 385 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 0e339253ade9..9228dfebbdc7 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,965 +1,965 @@
 {
-  version = "72.0.2";
+  version = "73.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ach/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ach/firefox-73.0.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "0d7e31be07e67a439754848dd7b2ae0dca7fdb172cc7900db84a90ce15a40bd2c2e80127700195f4b54e3c3008d4541785c58c0fd0bbce060eae6ece77d38b8f";
+      sha512 = "9b93c28d9236318f779df24675207e14976a3a303852f111e3e54f81fe24019f48d16c13c92dcf8301d2f7a40f127c75ca940adda251437d45edd1c11d961395";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/af/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/af/firefox-73.0.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "1ee09340d97967d956d484bb217c5fd7ac3c26ad28714889c18b860f1d03baabc93ea00567743bb0c1650cc7c6934ba56e184e734e89fc0c602cfdbf6366ace8";
+      sha512 = "b6828a008030b775176d165082cfa9c6eecfe5857ab0702702c7298b4d946f0aced8338182c5dc84437b7b02e42a33c6df6c1d38b0b4da6cf0bebc3f364d7f96";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/an/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/an/firefox-73.0.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "0a50c181a81823b80c67619d97bb1d371544a7b2109fbe02822a44070088247fc11fffe920e0f7290186f85719567114797720fae780f2c6eaf3d1c2462c87fd";
+      sha512 = "b1676964b0b9a935b4be440d82dca37c75362a4d47b227435d04d84ebde94eec469faf9fceff32235112bd816ae85f5290e776b9e983c9a3566b89205800ca06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ar/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ar/firefox-73.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "ca36d482348ffb63af556076e2c3ee159e084837c3e3186f4162856ba573dc0fa8849bdef581440bdfe2e12fbec05b0dca4ba294d9483d99020e26b40be4a5d9";
+      sha512 = "058be707b6348036150124d85010f9d8475efd2a6d910a3f4ed114d2b51cb63775b35e83e0799635755c5c016b21595efb20ec5c53a362280dfb424efffe0d54";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ast/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ast/firefox-73.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "9f9e3a9fe29a83a37f09e4b25cb65ad76f30d7312a79d27455d1e9fd51bfcba6db7b25e15a0d8442e1ca26c6f5aa1614c6e1815a0aef56547e81ea8458b89c94";
+      sha512 = "6e36766b939f42f6f8cf551e5ebafbf57a857ab584579797c84eccaf1a669e2f9daeb13b1a897b90153eb502c97f63a55ed7a2bab2de4feb92719e2aaf42ba52";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/az/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/az/firefox-73.0.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "95ee55c2802c4ea246ef3da4121f382d05c60354fae641485c92d7ca05c4c08e1d41b9fe6e5e5109d8e16a14ceed9692ff96d32a81a29770d937c65b5378128e";
+      sha512 = "f6c065ac0af3cb2ef1dca288810192b8ee5906f7fa03bab713a8abea4b811c78b4278340bc5226ddd4113851f9b753268965905e020f74875d2ef3d2c2ecafbd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/be/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/be/firefox-73.0.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "fcc595ddec94a0f5eb4106b1b462a8aad2d8d030bf5288ca08a3b56ee8138ad019457eaecc891175229a00b94d786633f5e1dd501470e94ed6a5e4b9b8d332f3";
+      sha512 = "710c468adc051a5895ef429585f9d94f4f6ac533703f2674c9433c04011e411bde0827739c28d300a2e90cea13db0dac4bca1f37a711ff0bdf19d5c4853b7570";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/bg/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/bg/firefox-73.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "ce4ab1fd20bf0aa69a7cae0af232c9d6c7496b1e63469709f0b8914a2ca7a5dc295ca22f59e368b92b6938b22e582d308ed4c5d7b234350b25a4cb8e9e010cdd";
+      sha512 = "328586ac2b3182c455f3abab8b6177e97d7389c4150f8708807b52f632d84e88cf342358818514b93b5d8428c6c870b21f1138803e8a7256c95487f5dff5e9db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/bn/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/bn/firefox-73.0.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha512 = "62db7f66b5ebb802243b429a90a368e6d0c1cc27e0382273b627bde7a9db48e32b3e3d7359cbeccc2bf70447534b3ec6a1cb4abcc66d715d971cc8cf1e8cc659";
+      sha512 = "c7730bc40976685b40161a6238d0982775ec02429923443265d5165d12adb8b863190c4e57c082c09c4c6ab3348be035e338f3c34d78503b521928f3722139eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/br/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/br/firefox-73.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "b7836b77b8311989167dc1bbe1b90994c27c03c555134be9df45b160d785b506ed8f7ed0d851f7e2a26ae14e8f8651ea87c077e012836bbeb5e06596dd7498db";
+      sha512 = "2083a6598a60dfae7093828fa8c47a149b2af18180b360817333de126077a067a81a1b7aa98aadbbba51cab5a8e66811a8a3513e68f5fb6e0320807cce782502";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/bs/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/bs/firefox-73.0.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "2a7dfc194c72143401fdefa4f4df4a414bed4d1fb370b82d0d7bf144c77707211b431314cbf409f07d43ba1cb28e43b78e5278b9cd7548191c09c71240c634d0";
+      sha512 = "4e5f04c7ecd8b4707c5107bc0e862a9ea0f099ce070c6d271c4d5b034330a0595a07c3de2117b1199dd475492edda863e02d541eb2f7e507710e06665741d5c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ca-valencia/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ca-valencia/firefox-73.0.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha512 = "db3dfc0414f66330d9a60bb545c92bb01c20dd4872436b30b4a27da3706870a9f40377ad40987850c556e2e14c13081a73fc8382b0bf45c356818f1c30e325ec";
+      sha512 = "103ba1a390de36018e8ab834d7ae144dd8187e8211d94c18fe2d84935efdeec64093531f2e3dade16fbc123930549ac2282d1c5c915ecef38428726420915925";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ca/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ca/firefox-73.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "d741e0fe55cb9d261832c8cfd5a51e5e88753c2c9483eb5744d80e0885d129a464530771fd5eb1ffba040ac46823fefd74efbadb63935e6d2773a398da160925";
+      sha512 = "90f2e9b575e390d57c6ac91f784e20cc740049096747bedeba1fe467e77a2b7b88e119f66e7be46d8f3261ec66aefa73a7ce11e3ea5b4520dcd1fc2467a7d169";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/cak/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/cak/firefox-73.0.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "98ac16f8771357d9999789bf2df39f0b4e4d28a32be13c07574fba303ede71b6267f991a1112d83cc95de295383d92a865e3ea5173102466b3d1ed0b2d082faf";
+      sha512 = "fffd827c9b8b5d5e83eab130ac7c34cae00c166314757576f3fae5f978d090bb9bc6e793eb1265d91c34ee95f4321f1e02d579680990d383e385a346c16ac61c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/cs/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/cs/firefox-73.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "c959a5b4008c95923ab0cc6ab669811d700c1b4f5dd0de47ce2d519d7acc1ffc98595a1e8948f6ee7563b2b025307b702595d01365daa57c3552a0e61c85a5da";
+      sha512 = "f544d707deced655448ce595ff700671d796180d3df9e5e651176a72daed9e203bf8d8bfe6fbd6c57907cefca7bab5e9beda2b785c7306a87e426df88335982d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/cy/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/cy/firefox-73.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "82b1620bebfac41d498c4ba6bd9d89754dba3c7b48f5073bd41558e735e49a7b95b662efdb247f0eefef8055e07bdea31efbdf579dd17ae7738711fb9679d85d";
+      sha512 = "a039a02f17483c4d9b7a5563af4fcc72a73c35ebe9d9d383b3e1ae8013e0dd5b9660ec650a6f11a21d4359605f6252faf1dd99fa8b9525edda5336a3f28138b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/da/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/da/firefox-73.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "71d5d3192f115df501dd889234e33ebe7b9f101bda2f4b604932fb66d172ea2adb475da408e9774466b1d9c379991895787b441c8af11ac36504d96e63eba402";
+      sha512 = "f8829df5163a12e806ed29a640159cc220dd8a39eba48b51e03c5524f5976ff4452eb19064441b4e81fd0e30a8c3058117f5a022e2b7a8e76e5e8898eb4ab54a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/de/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/de/firefox-73.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "013bac3db996fb3e4bab75c072b02ab0bd04cf6731cc95757b51df9b28c3ac46fdbdc3a17b61388aea842eb0d00dbefe2e9f32d5d758e207995c39338c82c7d3";
+      sha512 = "45c2ec4167c4f6cec18c306fb04c1eb0a430809220157c5757ca7565da3150ab82490c946afd7b255ebc75118fe2a2ee8228a31149545e5901b15b5c9fd113ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/dsb/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/dsb/firefox-73.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "49ff30d580b38749d8f46b9db90037f844305a3fd716d7f276910475f416d2fc9bc1f0e8fd82544572b4c7840437076f5b194cb37bf0cd39fe7b3b3d355fee05";
+      sha512 = "f67dc560d458660eb16eed78edce3157c31e195721cd350722c189fbd3936b13e9d230f00e5079a52fcf229bac352f7e6f88c5972c26b3797c470278b352d2e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/el/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/el/firefox-73.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "7c5e3c97fed944852c3888ccdcdefa9c156712f3aa70c8ca6c3744e7ae32c7fe85e2fcb57c7707e7e4456d7e0cf2d131818552bcc507f082aa9da2ad89267180";
+      sha512 = "247eaa4b6bbbb34e809232f5f907d67e01e95c77397734a5fee7483a6215ab8492e138e1b593a9b1a4b647c7aadf662e14a51e6dfc2b4acb4151be61767393ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/en-CA/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/en-CA/firefox-73.0.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "5dceff7aefa5eb668a38487e44fcfdf2d72e4717cd9f6a0beb58bb25c8826086a960a67a70a5d563af0db2865c001ed23eaf7414000d1cf184d10a9267473740";
+      sha512 = "d4705fcbccb47d765ed3a56ae7895b285d57486c2c95ac9e12e13b1b403e6cf713291960315808350d452c05ce7441ef3da4042e29d1e2e59ff50bfb3bf567f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/en-GB/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/en-GB/firefox-73.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "1f47f38344683e1e0afb5f5aeb46f3a7cb1aa80b38730a88cdc9904e66f35c14cbd9b3002deeee2f7387aec9f30ffbc306a3a655296f15650272b7185e6fb0fc";
+      sha512 = "3a27d69fdc1c1d4aa47a3181bf7d9842c0833da8ce1c132da7b289f6d49054e6b666184d1866506bc05f802c9e817e0ca659ac3ea228c91866b64df66ef7dc8b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/en-US/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/en-US/firefox-73.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "009e4569271e6ffff2325a04ee6b337804c69bf96d3d74682da0a8abc5adf42959658237a01feff736b8336df0c69445fac2d9a8292680173d5f82ecbc262043";
+      sha512 = "1acb3149e99d0e38eb624c98a6471b4d8e3fa6eedb13cc516f581aaa561f1de9d3238e6ec9364e937532d2beacd9aba2ccad72872f114013e7490412c56195c5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/eo/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/eo/firefox-73.0.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "a61206783846e1fbe55b065c02c8217905222fa92de0290bf42ba2b06745d6903aea5bd575a318b83c2fc1f1aea149040b6b68d9ff98ad3c0d537081951ffcea";
+      sha512 = "d8a598569daeda5e5fdc5c5fd2580e85f5933bb1ebec806373755442d3c660c5b0ad38b24bc41e0b05c734489fe27836f5d22718709d1447bd36b1480b2f02f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/es-AR/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/es-AR/firefox-73.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "14d6c0cd17e6560e2f4193e8cd182b8dba0b94edc3fc9e407ba3b9423e153f8d74fa0c797a431ef03586a0c8ed8193f3a8b26bc2683c1cb45a27d9c21401ec41";
+      sha512 = "531eea7a2cb3d98b2a61226f72ac1cc33ac94844787f5db0db84a81655f1909a1f9633353b5b0aaa25aa892d15a1789ada008274b955ada991e5eea1c71ab168";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/es-CL/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/es-CL/firefox-73.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "cef6af646f98a5ba5b5e01dc49317dd54efe392b88d3ce93ee220fe880c0b1dd7855c5a004f1b93ae27583df1fae030f4b90031312bd92443cf77e08e746c844";
+      sha512 = "9901d90be922471ab32b5780ece1ea3f5756250229a8d30a336890823dc8dfadc96992f582c3671afef94802b2003d64a7f77ff469ba5a7ce104b34852f123ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/es-ES/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/es-ES/firefox-73.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "ff17aa9c3c804539d6bcce2e760da2603d914e9d345c7d6e3465d7856a1ee9f581147505779fa81e4d512252fd72334abccd9f2fb1fbbf4ae6ddb47e02561483";
+      sha512 = "5615f29da4d69a93b1b07f90f248aada987d56626fd61684ae2d0c4c2d7d2398d30e0de41ce9eb2a7e066b1f34ea07d06f50ccc91dee41dfa2427ed8f2ee8166";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/es-MX/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/es-MX/firefox-73.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "b587ab2e8daa659011f8001b2b5ee544462e789f1bb46d9f32073f5a3a3cc34e34708035e1dbef6d6385673afecae66c4db18d86056f2fe81d0ddd06314b8164";
+      sha512 = "49453184964bb88329f6385afa382f440e2400333cf53e737491f248e43c5522e171bc85da86e3c2e5b6e2aca6c1136c529d91dec58cfade30ff67fc552d09c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/et/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/et/firefox-73.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "b92b11d2ac93c67b858536533794e8da01846485b9dc300b74fc8da3f6856c9278f2cee1599da354bb374a22bd3adfe24924c0c33d080fa9c05c70006a9fe347";
+      sha512 = "1e5e2f0bbed1e9dff29f646b8038fb27c46ef8cbf6a978e324efe9522c78983133ea3a675f077f837ffc53816c6120b7ff680fd1ba5a761de74162764aedbcfe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/eu/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/eu/firefox-73.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "30b34427404fdc43c09b5ff6cbc1ef27caec99f8b258ae0d227b0f38383d9b3dc95d7454ce344584706c0340a3859e6fedf125bb87e4f9f11fd1005647b42f8f";
+      sha512 = "c99b22564d7d3d16aff4ec9749ce1699b61ddf271ebcd9b24934271b31bacc68936d11f166730f93b5346acbef3116ee67b336364c33bbe3fca1fa18d41c6c9c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/fa/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/fa/firefox-73.0.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "f04b9d5205fb63f8a6d8cf83d5845bdcd7d9b9b1b01f59cff61b3a1042f9cd23b077ed1fc10b6484b87bf019e72fdba313568306bf9e19f7e98ea54cf58b5b9b";
+      sha512 = "91ca6ec0f36895609184a1be784848ca208534dffa9c554f7d271d16585e9d220cfef7da176ae23e4836f7e8d26493088f863f59dc9f6af5b58e7006d7e4a37c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ff/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ff/firefox-73.0.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "789a7dc7ce2d13edce2ad38a64507af6e840426665dd98b072271d4da49d9fae34786c7e64f8f0baba0ed70efa784b40d45537ef1f17a019043dbb65fffc7df0";
+      sha512 = "07e0096e432fc7e95d26ae4af3cda0238f28272bda6239f54e891df28a50d414301da8218813ed36b959a2db004c55dfc6f1d3a5b1a31a321fed72d6cdc47f11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/fi/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/fi/firefox-73.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "b4562cfd54bbfac093e872798fc503fc8f05952248f448a86a8a30a31998d4cab531b42ad8b894da41b8cc1b88d6c1e0b39b8e92cfb999e2c99057abfdce6479";
+      sha512 = "1199ed222e7092a852d3911e576057d52add578acd68a28ec334e377644aed48cf8ea0ca145f6996181bb006a067b3560112599d4bf9dd07528f31a0036d7fd0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/fr/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/fr/firefox-73.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "da6c9cec5089be3acba9d0ee4ec5456aa3027f8193478e122c71453c109a4356b8cbd9118a170f037a29cbedeeab99b1bfc213e57cc3aebaed907fde31fa5e2b";
+      sha512 = "9d287d14eedf1f32c6b5b8b0556191892541db4ef23e7a7a4aeec956ea26e0a5361f15560aac45970cd702909f654058549114cba98f7204adbc1decfe66c074";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/fy-NL/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/fy-NL/firefox-73.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "29b83043e60ef499e75becf12f8b60b855304db7de724120dbcbcb440b0379cabb766bb492c1d5f9eafa2f397cdbc79bc7806793dcba28666597746d743810ba";
+      sha512 = "db42296b84eb0a383728e79b024aff82fc3f5da1f35292b5b9a78ec65b8c7955dc502b2a2107ecb845b0816343cf05abeca075a4291bcee78ce8be8d4337b696";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ga-IE/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ga-IE/firefox-73.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "22597f1feb06e89286fca9692c4730ae570ec71f2558ab32d4eb0276d970944afe75cf427abc95d1192c37eca29a27fd7cc6c917eb70c983b436daf79432643c";
+      sha512 = "789b435790aaade6a52b9ce4aca30bfaf9d9e2899d2cc640b095227712ff06b503b36d64c3330a8c4ca7b867cbb4ee324e66a5f338ac3e01c85773955ff3c70f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/gd/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/gd/firefox-73.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "96273c0ab26d305dbeabce65e0b7650113edde2882297079527a9802fa5868ded25b5f21af07fce19992b3b3821014f5f611ce2b264c952080e0b8e7867db389";
+      sha512 = "bb6aa1596ecc3b71562d4e83a0ab1e49d28a2c4de75b4f5056f8d38b83e65b79231e06ffdabc61ddccf358a79583be568db3374d748686379da2163ceb8494f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/gl/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/gl/firefox-73.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "0167a4bb9874e1b0016c464202f14a9c1057a691b6786fd15e8ad44816a2e047728edb987f2fa68bd993583e9d390cf9e1553a8df7d19af0b2a303c10182ed27";
+      sha512 = "1315eaedb0bb6336377fd61a3b02cb0391cb81441f1c6c4dc3935bb9bf707fb0d5b8b32ca6c9c6bbef77a5d5c0d4cd476234348f398acdaa24280437b0e0eac2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/gn/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/gn/firefox-73.0.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "e58fe8062a18a08d57c20d81ceb2c8c76c210d0fa4e00b10a2aae3bf3e6fd548350cb42e9f4f27aa06a21608976520c2c00533f060a30310e8cf78d218bf08b9";
+      sha512 = "6d810e69ad78fe5fc07c2f04c2b2ace6550183fcd9e1e9e3af863c219948999bd0c2c095a8f85806d6b8b6da0d6e88e59789aa55b3eedd821c0dc59e37114005";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/gu-IN/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/gu-IN/firefox-73.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "13cd81296562b497b69df87961fc7a16b701d14fd35e8742f3bf15ccfa144745929323e07c2d4d121940aee589a281e0e90d8007faa638b34193a401892b67fc";
+      sha512 = "ed0574ba20986bae45a9ffde86d4b4568de296d4c8809f102c25c85f155ab0bed03f20ac7cfe3eef7225c77193343950ed7bc3714f5e56e709c47aaa02a823ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/he/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/he/firefox-73.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "6ecc9a96ee3157bc183bf3e6cc252f87e84906efd7072a413c392df27869514e41d37bb1a384b3b1e107281830a0ed9d74339cb4acb5001e98c56271a3b57fd0";
+      sha512 = "d4c1f23b270bfd827c4babdb24a7a7e97aad1620f886c27430ee4136ded392a4921395fc87fc031608e6e056ebafcc74766b028aebca787bc51025f38d2b0173";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/hi-IN/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/hi-IN/firefox-73.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "23dc8a041f08424c6895c151584c7db9d4dacc76f9fedb2adf91d0fbdff7ef43bdffefdbc06a11d565d15629f3794e40b07d39797289d51394c47113d8054d6c";
+      sha512 = "485ec6ddeeb2e6fe9f0a141a33f55491eedd3dfae5793802118ba8bac53322b1f2abc3f14e3eed3c8c9bf5b8beb9e53e3d80d0c2a05fbba850697aa262151298";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/hr/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/hr/firefox-73.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "e9cd1ae6a782965a4e79b7fb3ee17b2f0d09d2faa659cad1d34add2ecd2645e88006980a8c2a628ecd7622515b1c50c23203c3bbe41801493f767e2c5885932e";
+      sha512 = "1d1ccb53fafdef570efe7991902413a6cdc005f5fafd3a395c0ea9d7d764357525429c5f34825a0437242b2e816c86d207c91c92c557bb0b0eafa9bbe86debb5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/hsb/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/hsb/firefox-73.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "24fff6f98710a3729cb4a82a765a3bb4672c4cf5f067845732b6656d2d5c5f08b7035b6cbb341f00385bb0119d7d81cb5ab275f42f4a92533b4fabda161d2967";
+      sha512 = "79a71e0255cbaaf49afd0077f0a73a2d8f21037055b6f43a8a16ce6f512712b536fefcc911cbbd6c5ba4db493b1c9d0ecb23e99bfeeccf92a9159dec57328da0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/hu/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/hu/firefox-73.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "0b02c3e55ed81c1a07faf11e159b00987c46cb2225f3c414b824df4fd89bee8d199aafe7f2b9ab78fa8683364a8c30ef9a4b33103310bae32d3fb4fd0b2708de";
+      sha512 = "0d5ef5c1589e184fa78ba6cb8bd86530f30dd94ce1e9f2e3a4116539d1f676d60672cb5fc20db3a9e513ec6e7e6fe4b98e340c457ecce583f73bbebf47913eb6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/hy-AM/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/hy-AM/firefox-73.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "48d3b6e4f06067e76e7c33daff9dd04b1b1e4745b4c6814880dfdcfac64ec71e378271e963b05cb48a89d3e546fc8bfd607506c783b5bc1624908beac89c2588";
+      sha512 = "4198b61f6708feb15d6d20e0a447d8d9f9ae353c77565fbd5c185e74043d7c896ad8a0c5744e4ed4eee813761df9053b0ad578b8a34ce89ff475d477245e23b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ia/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ia/firefox-73.0.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "1f99776f7c6f5b3786d3806c838a6790e944ed83c42411f79629ddd54b0906fefce18c355b6c04b7799911fef1f90cb9296a0bf1d17ab489370a1e274be6eb9f";
+      sha512 = "79f01a78363ce26e31d32c21aa8191db748be7f831aa5143bccdaa35912c23bd5ca3586796b931cb84f92cf28c495fe239b1bf7b6feeca9581bb0c8a94a9c1a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/id/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/id/firefox-73.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "90cfcfa0a6b4d791dee1016fd64af7b195a078c57c4ddb0e2b0e81372d71d0266f592b49cf6509a02aed6e044e0f50f898f09be18c4b5d1d1611789ddcb3b6da";
+      sha512 = "afd876da8a8914f88c043f7ffaf8296e14278503e7ff1b94f8563cfc13c2ecf1e0ecf52c18b5c2c16799878de836056f403c67ffd9333a77d3ad3142f9236769";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/is/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/is/firefox-73.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "fb9b33dd73e81c80f035f7a47f49a45c7aafcca93dff1f451107a86e9dc566159d2a15fa3a4045ef6a095e2d329956d02e9fe1ceeb29f6ce0d6527d6a383af3a";
+      sha512 = "3d98244f97a7c0169f272de877ef3193d4c09392a92ec2ee931d95df610617e00529c1e2c86d31115b4df88dd1a15fee6b6d166a55535396e6203b9b104e0d14";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/it/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/it/firefox-73.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "cd73f16f1f01f4eb3e1f121a054958c32147baf7f3f7f856e4f5d80515efdb38bb901814734e5825e63c19dec7dc27ba25b4a682430aa8de64d1a72bb24e4533";
+      sha512 = "22c2dad95a21743ff3350ac8765340fd96c006dcfcadc68c3fca1814d0b6669066d8f76136cc7c4fc6717929d41df0b0b5a01d40de36b9d1c4eeb8529ed1850d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ja/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ja/firefox-73.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "0deea9508673300957dbb33b644f4dabef47a4f502431ee51ca7e4844c7fc5504f59bea5416c70eaa713685091c9af9bb336f0416d3cb78d251f87a3b1d6d194";
+      sha512 = "6297f970de4b35aa7e3ad43fc5112ac0a36bedc5b2431f143e65344cebae74ca36da7af3fa23e1c522e62ae13d2069ff2f1114867e0b0960f9f740904f18ae82";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ka/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ka/firefox-73.0.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "00106e34b8353c4e19570e284364d27765f2afda9de181518f33eb5a83b703073c3bbc8a3ecc59f5828a91ae78867db0cfdc1fdae6b3393a3c1d63668d70732a";
+      sha512 = "2e4ef3085f01d66e7d2b85b058f7be2a7122f1cfd53757494bc6e66a2fb9840013c2f3f68ef7bcd363f6d3f84926449650e8ff2e1f6641dae70893ff1dc00ff5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/kab/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/kab/firefox-73.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "e993314ae7d3e23662b8dd52fc33922bc25c29d732217e7c3bce051faf0aff43cc7ede1b91f8995e51e6d20eab8c1cdde980f35d40b0105312e215d2509f7504";
+      sha512 = "eda0492c8528bb4eb9ddda9f2d585aa63794ba34231b58b5ccf66dd9bc49feca36a837a786c1f0d182398fe5cf5cdc735c45bb56d1aa743554697b6c6a9d1b8f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/kk/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/kk/firefox-73.0.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "ac0f49449f4b296ca3de4a905c667c0eedb7557b54c3b1c27d6494cbd952ce0d1aa61d73271d88ac0a8520ebe4c2d4454ae9742bfa2b5c7e32443a6920850d6a";
+      sha512 = "6d8b29ae3a21f952e7e0633bdee2f82d53d015e134812a24c2bec73e21b923add3fb7470097bd96a6ad41d7cb1488574475c51140db7616d66024178774282c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/km/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/km/firefox-73.0.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "e5709bcbd40481c3198758813ef5e5a9cdad6e256396174cbb006eafcaa6165efbcd920fb91dab5ab415d19e85b5f7a3cb649f4f3ad9035ad773ab51a5a41009";
+      sha512 = "95773f7848250ad0c7f4e4a76ccd956e94dbe9994e451b349f862b3854cf2daa021de7b47c014b14e588189413bbabfb84bf3c2245550a4f824c56ab3964645a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/kn/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/kn/firefox-73.0.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "6dc7045adb63e54374dbb6f288bafd710f54f1a637a3849f0c2dd243043e6373ddae941d88a8ec25cde643d0ac856dcc57b75d97356eab29ca01831d0e042724";
+      sha512 = "f1c66d17d7c8957ff804b77ef49e5389703506019bb3fe24e44f31f6958e65a83f90082f399a351e8bb3c869f2663c1737ee618cc6ee8732a753bcb50893140d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ko/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ko/firefox-73.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "f3246f4a1da0d019c0456b03d8837244c59cd7931f3766c3f513c9ff9d55d390869ae508c0713bd8236fff562b9becba4bb4046a50e6c2f23549b6b06c800688";
+      sha512 = "2661bfba5959c05752c818119ff29e22bdea6ffcd52eccf1f3dcb2f68c9c0f83ed900a9bf77e99de9e2fd1b4bd153339e5a212e5b7b4c365ea12b02f6fd75637";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/lij/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/lij/firefox-73.0.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "7a7aa021c32790fe844f258a55edb51ea4b13ef26d1d7cb2fba609cbd1f09a4b02c227eba639971bf4663d1fc8b943403eeb95839d9ec53d15fd6316c84aec20";
+      sha512 = "e1c6d44e2301ec9223798dfef54aa2bd1cf0553ea0691089f5c345ef7cf276727dd420261ae3a4b40855d58e241ea41af2e7856fecf334f534b6ff4459bc0155";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/lt/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/lt/firefox-73.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "d3c8d20b7311586dc0693d169b6d47612136d8ca40b31a35641e61f7965778d52bcfe68abcced8356e31d66c2fa208560e8f37f1d7e3621f511721fd7162ce58";
+      sha512 = "42316a0775d8cfb8a12545485762268feb74052c6d022b092644dec77048cc4e5f6a2e00288739f0a0b39b5530bc43f2946eaaa16711140bbf2ead3d1c28993b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/lv/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/lv/firefox-73.0.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "3e770d4f829abd903dae078526918dcd29fbb0b214b1e44017b32cc273cfc9a6cf626f61d6a805e508d37eedf2ab7eb51fc185d0c34be57fefd842b5f3a083b9";
+      sha512 = "51118140b18c9f911e1ce9932d08cd5dc9e0a9f6cc31160e51c3e06f640322b3ffd28f74eae5fc7b5bc2a9423e820fbab8392b96f55770e8e4503dfd86cd6111";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/mk/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/mk/firefox-73.0.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "d6b5deb5cef689500f2ded676145a6efb55e301b6718596e127f45b1e3743a0b7606006994f62a978f0d94789f45d60006f0b45e6f4e5444948388a37a1db19c";
+      sha512 = "96b5fefd5f1c7f37db059db505864210a872597e8d3f11247c6e68f30122eae15784d5eff7d94a48a38679ca6ea7338a82dc8b0cc65061d03be0c12aa570eefe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/mr/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/mr/firefox-73.0.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "4def7628770de7a67cce3c5aea45c718ea3f723ae7574d97bc87a4ef41350034abb0081887c3f335699c45a381e0634b1d4b41984a479dc0f0d5ced667e876ab";
+      sha512 = "fc5a084fc9d71eaa4a31b4445390ebeea93f828ce0f492802dd38da3a2d5a71f865c5884efb9883545fdb3f2aeb374f93eea133de6c0809b75a924d14ae973a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ms/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ms/firefox-73.0.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "9713ba2651191cac976aefc43afb3cb640092dd738d9ee9e7518839170281e5f769d0f11b643f70d98b5cb74eac211e78c086787f63ec583636b0b02058461e5";
+      sha512 = "c084b4c6e2e9ed3f646b18d14cd7d8f76e46ccd0152a74ee101b0fd532dc91acfef8f26d827e759c2bfd8828ff762a430cec3fc9d0b9e7423166951aaceb8b72";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/my/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/my/firefox-73.0.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "79ed96b7225facd3c759ca36874c42bebc8ed21856a8d46b7170efece2eb48e860065f21295a12561e8e20c2f56734189862420b1278fbf722b36e21d0e2100b";
+      sha512 = "8fed2a79499f57b0401da536a557809b152d65fccc91c76fcd2deacbab35b370dcc1c812c8e8217aa4b61e9a02fd41359b84080313fc572fec936ec3ab15935d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/nb-NO/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/nb-NO/firefox-73.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "12d0b02ae7953997514629a739d7df4c0e5d0b4006dd4b09447ac0710ca5d043605a5f060499f2b5f51689f101f580e7565810a4c1d0782ee408fbfe6925aa2a";
+      sha512 = "d316c653e922c6f71d14bd9b6baae661a1d2d93a9ef2ec2c1ac368cdd5797df5896f927c909feef7ccd5323bc4290585ecf119f0bbc6eabe4c69c67127b82c98";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ne-NP/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ne-NP/firefox-73.0.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "7d3512fc9cb2f6af9c47c27f54595c957515dea077a5624685f95060783fce7a23bd11ad0f4f74da52345de6704582c5bcb9a162aa29d700adf3feb90b0547b5";
+      sha512 = "1ecd87e201addeabc43050279bb175511bedbc5e2e1a541641e5bf6eeadd1edeabaae9e6d7a7cc53d6a4a46d84f256f0abf8bbe9d211dd6b7d8b3bb91b341443";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/nl/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/nl/firefox-73.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "5a74e2ab73546a3754933adfc5846ce7cb81fbf0f955ef10189f5da86e36cd4a919cfcbf5b34f0e49dd9a0736b402c005591d9f3270ffd5dadec887df63c272c";
+      sha512 = "77d9e23944e5fdc8e08394b46811146d95560663e91a534c115986772b5c0b5c9c2e20dabde58ddbc643b3bf0f600c3b0b2f8f31045cf92ea8353610e0c78c67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/nn-NO/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/nn-NO/firefox-73.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "59684dbc041f9cb97cf1dc6b62cf075c9e09c27a213d79faa2da7e3c76120249f9dd668036926cace1bac2e386ed2e5f2477dfd29a16d4628cd3492df3dc1e69";
+      sha512 = "6923adac5fc7c616ad94ff4f45db0c5ba20c5c77cc23661196212b419437db8d1d8b9feab9f68556545b3553b6e22858c2f0c7a2afa81f7b4e914446e92fe418";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/oc/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/oc/firefox-73.0.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "13aec175cfb0e99ebc64a3fa00d96373f578c0b40e9fb748cee39a6e0e38b884c99010426a47835b04ca76f7e14ae690425226eeba0cca828c4e03f9ea9478a3";
+      sha512 = "eddd11c121dc1933272d1557d220a5590e5fe695cedb261e382d2a0e560646f1f4706dcc46f4bbf1b6c10df2f0b59e15d43398a32975c9505317aaf86bfc8a49";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/pa-IN/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/pa-IN/firefox-73.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "5350381fd1490a9d77bce592b5fe5bb16ea806a19a11b90a6d4458dd5804e291be61981ca6358db4f1c61e7b221bf6032ebd74328080b72c7ce7c69b5dc8c6f2";
+      sha512 = "cd2eb4dd3b29299786d094699dbc162be2c073f25b6feda13e9f631f36530dc9abfde5f473c0276fa8b099010c66938f4e8bd9346a2d1761c59f63190944b553";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/pl/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/pl/firefox-73.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "73ff9ebe12ceca06c338c75d01f187b3c680d33b7a1ccb9ee9206b97f6249d95eba3047d7e87f01651e4c5e112c5c59be7c50ef5451b6f9e6c384d94d3ec23b1";
+      sha512 = "e039394e335b13bd55a214a8345645e1d5640d2dbcf76234cdb5710c2ae0b81e568b8ff8456780edbb74fa2ab186eed004c1d54a04560406909702555a318db2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/pt-BR/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/pt-BR/firefox-73.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "3660b8376970fb9b70a6d99f68225420b681900e3c3184a503f577cde29e05c94dca80ed3bdfd991497875006769ce8a1e973276dc302e6bc0a8b68472c223c3";
+      sha512 = "4649c45fdf1b8b3a93e8a5f88b88c47104b6d1781c89fba4cb9630a8998f3e4e28ad3aafa0265d04a3c10323916fce73d834cc95e5968a10b4a28a9ccf70aee1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/pt-PT/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/pt-PT/firefox-73.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "fdcf089be16988c3b31b9628a08a7c60e87913b0bb44a21abd9267358b881c5963694bb956c0f7c075ece3e6f1ee89f814d427d0965537fb75981475806ab6fc";
+      sha512 = "44d65ac6e2df986638de77b01c7c544a846f92444de25208247c93ef2701d0398f77de10e9035c8fd383cc998adccbfe2dd76edebb646ba1f29a639786b61259";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/rm/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/rm/firefox-73.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "b38abcbd3da1b481bbcec3caf1dd948e7f696099740e2386fcadd13f628cdc45177176915a8bee6d5024b19e08a43de99fec7f8296839a3af14f4e80c2c69406";
+      sha512 = "6c9694d25cbe53e129148080e365b4964f5e683ede81d7a17fdc94045359480cf57cb8e4004b36645c6cc9c987845ac723e11407302eeca1e2e1fca9924eff2f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ro/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ro/firefox-73.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "e0b4a164c9a8199309890c541a72377b852638ba1f2bf134b367b5b82945008e72b9d12db49fce800ca0a5bac3d10207b75059a9463b9f19d9570299f66a8c5f";
+      sha512 = "b1e98c052f5b51047ebb5c28f83e7c36a74b85d0aab3226438bdbc502619a2f9767cfee6f9a2f72653ab8102f058cdfe40dd7f6cf11f88652ea8f00a0985d9cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ru/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ru/firefox-73.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "ce71732d95d5dda49e80d69b1e363e6e623a81917d0babc01e24fb5e81aff3453e368ec901898c22805587958d833fa9a2dd2e96f73fcb37741ea518685f5df5";
+      sha512 = "681214c7286392c8267cf73bfd4a57fe3cc9710992019aa645e052a8839234f4f65ccef2e98e6f4e8b4d099a0d2932c8d909291ad46cb581036930715a916565";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/si/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/si/firefox-73.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "aaaedbf3901a8047cce09f27f05a7e50b395dae2cf31a155d7b3e027e8edc35ffb5d580c03f8c6a56ddad829da2b52ec1b42f146be183eed022a0768c818cd45";
+      sha512 = "daf1cbb9ae4e3892b138fe0f3aaab8aa11fe175c1bed70d374e5da7baf0c77a3d1e836647a8a0e36b1b2791c3fa638c63ca960a361751b7dbaac5d87a1e73e56";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/sk/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/sk/firefox-73.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "a5a1296e053524ff1aa3779b123406e179a0eae38d7a5b34fed1acc6f70df176cdac22050afee59a7e80c79cedb7b86ec0549726dec9044c7e3bd0a087587b89";
+      sha512 = "4d34b4c6eda6297461191388266d5d281be23b4e4390db9999832f384431bd5f5f323be80fa1cbc645b7d1bcb8bd6e80077ae2f0ba66239308eb3b72c062bb37";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/sl/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/sl/firefox-73.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "b360d85da7d2d8236dd4c731f43417364393b3c379f0b4b88b7521598a7cdc5ea73ecc4c58ed71245e53fa8b2d9b0345f054c27d55d7d1979ed3d97681578314";
+      sha512 = "7ab8ea5037264ef3853376c000582b7a423ebf366d84e50fbb642f8510609cbfc7d8cff6b48eea499cf7dd14da3dfbda635871fa7b2990beb386b5e6b1db35f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/son/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/son/firefox-73.0.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "b92eaba0eb03801064258eb5528ffe46115ebd6b6c7efa6d174b48984da527bd542804c7a5edbf565d724dc1c66b464acb0b83160b4a01e1f845b37a82eb5624";
+      sha512 = "afda3965d5934b4cbc3ce0c9df16d286cb3f2054c5bf5a174349691d12abed45d47e0c79a5b4e730cf6791a118daab6cc4e7438ee2e50529002fb9a99db4eb88";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/sq/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/sq/firefox-73.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "5620a2d17500a7a6385d93dfe8496dfad466ac415ddd871f82baceec799c02b6dc9291aab8799d1938462c83507d54ce3807de42a5a1e2fc41ac780079a27160";
+      sha512 = "6a1535b6440a805f60b5085f4e34e54453e36f01cd10536b169cfcd8cb67d61bf325469d33981e261855deb0ea158a68710b4606a912c1a2d8769f0c83ec33d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/sr/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/sr/firefox-73.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "79a01eec8ab15e0f3b7cbffa408245abce4e48f91ad1f81520fda0c9f66f2a5ff483864bb1118365d0a24818cd477d6bb992563e01ef704122387e1356b00c20";
+      sha512 = "a5cf593a21ed3c2a825cfb4a7280b1b4a8d4905cf85cd69edcb36f733189ced40a9a5c6e86cbc9870cd9bc1442f4c7ef19621e43181335d0b9d7090a3d4b102e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/sv-SE/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/sv-SE/firefox-73.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "31351684d7819ce10dfbce8198ae5fb58790f79ee94e277b684eb914b59a686a1eab7e8e8cc3346cbc1a0f630bd181194d34d7e4610351e9d783fa56909d73eb";
+      sha512 = "bdf87d4f3a960ac38dfc39183d7a7a7ae68d45e52d4f356a47a122a1a93fcb6d49cac463c6173c87495c39f717c68533e0234f828c45071a9ab59b3b0dbb87af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ta/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ta/firefox-73.0.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "d3204472eff80b522bcb0e8abad52fe1cc49c778f5cf0766ab45b5ca8e5bf2d60e561b1f72745b7accf209fcab9e23d90477a8388044bd2919c617fe96de3174";
+      sha512 = "808628662c860b996124c367ff3d9ae89fd622648b46a985da4c3be50baeecf5b5d4de7de0488b2f46810dd7e8d91dd6923397830c58d27fbbf847772ba42c74";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/te/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/te/firefox-73.0.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "a4127d25376e59b67c15e4dcb660262a5fd651b32989e8439de8661b026fc1a96590cfe4bbea9183cfd7568f37623face2e69489f398fc5f4601f8ccb17c39bf";
+      sha512 = "22190521d45ad61965b5e863d877bf92da4633bfc7638f2f83825f478dda5ca5ad333707a874c0b992b2b9e8613c96f6e5f7144a9e51e696edce88cc36bd8c1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/th/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/th/firefox-73.0.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "4b13582eb740408fe252328f00bd3217456f406cddb131912074112d59aa2b1b97a056c71e2c1f7030a29ea82c0f4c3240ecc4ffbebd104e8544fd4eef51133d";
+      sha512 = "0131790f8fc79abff771b28e4b3f4f894c680f790e9999be22ebb968a869b17dc18c4fb15f992bcc025863eaed5887662a3ccb98c4d3e85f385ec00c37f1b891";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/tl/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/tl/firefox-73.0.tar.bz2";
       locale = "tl";
       arch = "linux-x86_64";
-      sha512 = "48312b1d86756044a19c47d30ef662f4fded179cde72d9f82f47fe4fcf38df29f5f020dce26c8faa37bf5eb3cb5f389547a0fca3e504edd934ad7a414a1e70cc";
+      sha512 = "5c20780883b844c5f3206c4c2d7fb0d341afdfa5b30f87d0356445cf279b0be7396433e1f6ef7aa20c88016f540eb773a66aee172c678a172f378b7ffa28c2d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/tr/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/tr/firefox-73.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "5ebd816cace4f8b10a8bb3891e4dc3fde9a60c24945a3cb54a05a5683c15f9c1710c427f31dbfd7ba3ff035d6dcce3719c08180e4fee8e4022b3c91c297c35d0";
+      sha512 = "211842a6177af5397be00b18d42e038c2a82a185305dc2bc36803713d16461321ec96838c21873a23816198bcd2d9e1b5298b2885afa60506702e8f07b803b7b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/trs/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/trs/firefox-73.0.tar.bz2";
       locale = "trs";
       arch = "linux-x86_64";
-      sha512 = "993bc4ccb6d60e93663e13df7176df38682d5980c2b73ac2b7b43b05792a5dae88d4f959940405fecfa2e4cf8d11ac07838f44cd03db395361ee67af4fe27a1c";
+      sha512 = "3d1292229c645bbd3529763c4729be8ed044bb8081f0127b39f62a3b21c670889c915fd982866451ce494299438caf7380e4b72b971c4163a2e9e96575550439";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/uk/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/uk/firefox-73.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "8c61661884089446bbf0359a89550b41f09d3aa6ce9d1f95e7fc0d2d0d3fb6a232f3c3fe26f9124a88af981eec9bc6646030f97f0d412298358272fa440930eb";
+      sha512 = "58da46b39c491278be85ff9a37eabe993166b9f950aabf6b5776634779d2427bd8c044e7b851462d59584051299c954fd5e35491a32a2c893678ca0fce0b4a8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/ur/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ur/firefox-73.0.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "64b83bd3057e1d7edd804e948626a1d6c6801ff0c91717140d75da5778c4ff9afb52eb08d982d3e9474f9dc1daf8de5887b2ccbba41e490b567c380980635564";
+      sha512 = "c0f35fb5e3967fcefb7bd708e621abb138a3972b52d871ffd5f9e636c9d27e040e5f99313c72ae31cfa2313c9edc2ac9b64e9ec1710a5b1288bf7d1a7be80136";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/uz/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/uz/firefox-73.0.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "ffe82703e4d66ccf612ac616fd94befd35fd41d26f2dba2d1cd269dc95500dc762c85c3fe2e881fcd8bae04c75486edee55d90a43c0b6c379eacf1f2270b76f1";
+      sha512 = "68d335c31ac07a2790c4fc142b3f17c527bcb289e0f6e19a228dce248062c89df18874fe22a73623f6d94309fe4089a072dcaab533bdcdc1855c539395222b45";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/vi/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/vi/firefox-73.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "c4bea8bb131ea97dd52b3849d1edfc36f88afe5550c3a7ad67b2b0f860ded462834b62804a92823149c5bb4d38a76e1e239b626d15c48dd388e9eaf232d03bc0";
+      sha512 = "e7c846995285b3194a12b14a844c4cb01871012d1f7df241c3b9ad73191c567c04127a4d7a7aa2ed33ecf6deff8d483a92b2b3511ffe180e4f61cdb114a3285d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/xh/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/xh/firefox-73.0.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "74e09c80cd60f97712e4b5a374b9a32a1bc99c160e34a324b360afc3396d057456a988e8706139ac62525ee8002755e8a1ca52587de83028340fb6c767f1f432";
+      sha512 = "cc9b6e46fbfe9fae1be6e501069932e35b8e53a91bee226ed8b7179cff98e3092e984dfb194fdc0e4554b983bdf203b28e271ff40565bb30a140aff24bf88e02";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/zh-CN/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/zh-CN/firefox-73.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "d922dfa80f19904e8905a30074ad57f124c4cf81fcfbbf157f6b9a775f12943909584e21b1ef247540f26e1f5392e1e13852e0bee46bc082b0038cee15cecd3b";
+      sha512 = "d967c3de22a110ed948a055d3d1e5f29ff473a8eebf1cc08d960135dac0bdb3a812c240cf46f789be8de5a5769bec2518d60dff5b31c8149275c0650b387053d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-x86_64/zh-TW/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/zh-TW/firefox-73.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "4e5fb29e77467554b767f4f59de3a0d4844de91955782d9a859b6b7a7d379c673325e1c6f090d6af477a67d8b91dbc57e5c3169f77e14dd43fccf2aba508db6a";
+      sha512 = "3e9838ef076f360f09c30deb25298d23c7c067ee4956061b5d19c51eba91e28bacb9e22cf6fc6f7df929d1fd541f5aae383137aefeb3c0f2f0d41625875578e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ach/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ach/firefox-73.0.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "84669f751e3871de2ce92959b944eab1f4f6e808ab275c20389eb253c11815548d4c5ff766ac331562d13165d7bdc7498a1ff376777e98b428d68f83d09f789c";
+      sha512 = "62f98561f7dc2b856474d5915ab1ce9f9939cfc4102d33532c2f933fc1887be5995abe4b16fa715647ee1b7b5a68e5fd9f263e928d05b6f6ae35ce924aaaea2b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/af/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/af/firefox-73.0.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "230e212b172566edc7e3e30e7c4d76b94abf55d2c6bfe1d64e75a5769b1d758770b123b77edd2315c4a12641b1edb12be2a7f080dd44a59fe1a3f05f53fd86a6";
+      sha512 = "cb203a3cddc9fd71178c1d158f31ca55b15f3388761c4347a3b2fdbde921effc335ea6f2b49b4fbda624b79621df9196b2e08bc42caeeab9feedac05a25aa04c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/an/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/an/firefox-73.0.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "af8a603d252961198255cda016b018d443226cf7143dbb7859494b871999ed1548efe6a8c7aba6bbdec0f8e0bcb7657e84ce3f12b45e23ab5df7067d462b1014";
+      sha512 = "77bec37a0584e2cb00dbbe6278f21f3814a73ffcd026b33c2c4ccf13e13561263e314aee2c39595d037a9a49e54510844db44d521d3c550a19f1c2bddb66be00";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ar/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ar/firefox-73.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "70c4214324eceec873654620e5a6b9a1f304c392ca83e989030cb43541092d3a1ab9562d58bc0178ce2862392793f65c5adeaff323006cb24cb0e7c660a4d0b8";
+      sha512 = "c84047c4267fd8f872876a87a809604a1d65245804b5cdf45ccbca764d9ec9b39cd6edb13e282a7ab0278bcd17111487d5a22a36d9cfb7c1544353111395216a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ast/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ast/firefox-73.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "af157cacc34a9f31f04b6fc46cacd7dbc9b3894dee6209e52341f4ad72499e296bbde0b2a6e1b6ce9400559260f9aad5e3ffa3273e56e046528fad7926ba9fd2";
+      sha512 = "8d87ec12eefa47af400d0c3da5c103587019d3f4584ccb5ff7fc02017451be0417673a3b539ce3191339f9afd8bf9e562aa962883bbabe3355cbfba2c7748cbe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/az/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/az/firefox-73.0.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "863399e7ee8b05c1ad5a35aec88bc0fa9137fe2f1677329cf3ac1ec43db2d20edf28cf6fa07efde7ebac800790c2971dfdaa4f52fdccfe1ff77195f3b1c0a1aa";
+      sha512 = "0801cdd56ed2217f52bdde2f541112540853f79385d3488a2d01e9e95e5d8e8cd4f3d2433f9c272dc7309445f11ae36ab4edd0bc24ad343cce46ef3d74826261";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/be/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/be/firefox-73.0.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "0aa85d3e64ce5a27710fd2cf49abac8d63bca791f480d28480f4c0cb725d44a36f723f711392eccc5d1ab90cb150027a17b37cac5ed7cd099c80d8d7c1f1bf57";
+      sha512 = "34a7d7abb122fa4fe4d38cda591fc88a5b5e38bf0415a89a87cc04fe14216408c56b3c7a67a29eff8409cea95bb82df4ed885110e0b39a5606e8278ef30085d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/bg/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/bg/firefox-73.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "b20d322b2955591dc56fd01a0f321cfdc3595533881e27c23ea63ecf6878dadc24f8e357e882d554b58c340a598825ce2325bf08fd65d174a648686992ffae17";
+      sha512 = "a1deaa04a797865ab9d62d1c820ed837c723bb66723397218d9afc114c4d1146c64f3c49ac558c69476938ef5c4f815b300bc25e53cedeef41c9022a6173e24f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/bn/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/bn/firefox-73.0.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha512 = "3ca4fa19d0fdcf2110af4ff36be438e84e23f534f854ae2a24f56d5e3befc57700951c948f45f730e7439109dedeaf0f7ebf27c8fcfe1d9a14f886f5724d009e";
+      sha512 = "8fa4631d3a5c4aabb0ddd587f66a8802530864dbf99e1035d3a13efda65cba93a7824e72abfb6388ebdad045d981ac818368406ac345fa4bfb65b8560a9e1943";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/br/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/br/firefox-73.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "2d89f28124cb2650a78728e3860d206f627d54886817727884f60157c561a00773fc8688fff3418c76a6c2e4286b9d1277b249c6e5a7c9de03d9d1a62c78494e";
+      sha512 = "c9de94ec51f4cb7bc77c5db2b5d359cfe24d60c76fd6c368907f6dfae8c2166b6b0a4954d791e808a52b145cc5acba1e2bf82237d63b357fb2920b1e4a057bcd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/bs/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/bs/firefox-73.0.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "e047abeba9c53a321484bce65617c3ce5def9ae06153f0317739e716d1617fed2e95fd4fb1959e36e24784b036d273f872250ce865975a977a25c0f98f054bbb";
+      sha512 = "08bd5b8a337e0968c618903ba137d9340f83282bae27f286d4fd65f89c7ecdd36d771cf7a63767102e1885c7588d29645feab07e1c7c970c0ba9e5b8c38db7be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ca-valencia/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ca-valencia/firefox-73.0.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha512 = "91de80a3eb281ad887f5c053803d1869aa41e43f2fc7438edecbc5a8ede86e9e401e27db8e66494a84d4c1681f3e8a43dcabb3fdfad5bb763f50bff11c7151ca";
+      sha512 = "5036cfd9bda8de708d90a3ba216bb74526a2a4b00bf16a435b8e346deeb713080049a3f39b2e9f5bc73799203c91eddce07df3bd0affa49135b3cea2d2c4081f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ca/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ca/firefox-73.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "4b94b5f074848fa6164f2eb6df555ac190846380ca719d09225b63d4e0438a96035f0b3cdf5ce23c6c39fce055909bb4d6ca6f056fb223b652193539b3566bc3";
+      sha512 = "1576e57936866754bcce40c8daa9fcbb7b8c4b86c44c66dd0288764a12cfb7b03c9274327d06e3d1e98808a720acb5c01fb1cbd83b1cc580208e29754cfb8864";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/cak/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/cak/firefox-73.0.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "4a60942861ff2a1a3992c664a425c1f957b5f6f3ce9877ace5cdb13ec38a04d843a822c3b07180d4907b91774d9f7194d7e2b8f4b5f807556c3c5735c1a20cc9";
+      sha512 = "715ff756b1781ee74a12025163443ae22fa54891f8978356acb816db254f0e9ab999b8855e6b542329a42fae6a3f3bd319295b9b17953234c1107668f3414009";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/cs/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/cs/firefox-73.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "0a1e8b063d06d92c5a0eddb2aec88ca41029a686d4914fda9d4e7addae9b6acd03c0667eed020faad6a0e82c234fa97529a94fb0771042bdf363c887a9aec2f3";
+      sha512 = "835be53ef8be7772decc01e0ddc9115075c26f15bef7b4cc659022e2c7c6997bcdebd8ab4efa431e61af92c13b59734e4e9a433efd068ac2bc93fd79aa706f44";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/cy/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/cy/firefox-73.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "688a86f70b5d1901e6531414587453341fb647ec3a4560103e52c70fcd8c91dd499dbe716572ec8585c3aacfe378d64b82c63790b2f190e286ad1e0bf7b99477";
+      sha512 = "be5702229cad8438312ee14e24b3267bea91e131736bc8dd4796798285dacec2863843f844bcac47eb64dd9a2ebb6966f161a3530db7743dfb8ccb3b5cab9fe0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/da/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/da/firefox-73.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "84adac21cb7800d3f8afe3fe0d17492cd6a1d2e2cac60969b4403191ff0b1a8cf04fbe772c5a02fcc24ef93372c76b95fbe92f2f4c4b595a929397cb3fce2ccf";
+      sha512 = "bda6c747c1eb8de22850aa418fcdf57f5a39d96546cccff3d82ffd1be93bd1be499abcce60f5e1b76595eddb1fdd4e3dee3855fb25fdb8c1f2ad82ba97a9d854";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/de/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/de/firefox-73.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "a7cbb78ce08d5783997529c61f51ddae197b9d7fa683847444d74978c191a2053b5845dc4d93898e0453ca59894cab4dc28cf9f79baa22b7a4304eea59e3f0f8";
+      sha512 = "aa7510f2dc6846ace6a9754a4105197b238a22bcb034ea22453b7550aa00b3ad87d6aa9a7e909366daccf21427659802e7bc3eb285ceb4e38bb1c906cc782399";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/dsb/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/dsb/firefox-73.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "9d2821f99755cf024f4c7215274c6f3b6cff8c00ceb9c1d82f77becf3251f5c81776834a034fedd22ba15ea21aa606955ed743563a176632d592dbe4e55b7c0b";
+      sha512 = "9a97a6b634685f02e3af6492378a3db600ccc80678ec9d9fb75e08ea123ae6d3016254a2fea5b4736530480671e7095fc21840e6c3db50bcc8343a800897b704";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/el/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/el/firefox-73.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "69023e2ef7c3c5d3716421b603cbd85d7b812c201c1d1e2efb69a47d43de500306a0d493f9a8380bbd1490fdd85c564c0b2a9ed54d792ffc93cf67b399887fb4";
+      sha512 = "7b15f63414a9b08fe54ca249b99e80a9a2a62a0a9462911b31c4220c7941eea7e1f4d170d969770fa1a0bf76b25cf539ee0eb5c41106fab3200ed32ea580fe94";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/en-CA/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/en-CA/firefox-73.0.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "2309e3a8e2973871911757392806fb74086c010c374334c8169fd91f8e45664746d693f63a0376a07f529ee4160f4f75ed22f4aefce5deba39d43df30d683943";
+      sha512 = "92c8f0132880dd0d3af36e1ee489ec87a7169ce76afda68367f977a3dba346aed727d04a9ada0aa96c1c26e6b029e27b2edaa266074f49399ba10f7cedc12bbe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/en-GB/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/en-GB/firefox-73.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "8db7fb10afa8deb76352ff324ef44becf01db57acb01caa2bd7e69714ddf327912f4795e874a2056acae4f7d970b688ec4b08a4912774e88f6d67d11a208a977";
+      sha512 = "b4cc2106924be7ed68a96a97fe3410ddf6a0dd57861a6e93185f396ec92ad40dcf901de8785e9814a9e9499b5828c34c61910c88a257e1f45103f737030d7376";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/en-US/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/en-US/firefox-73.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "6665f3683537437a3487cded3219a8228bf58b9294acc205ae18197ffdf240a67f623d827795672217194f327c0747708cc4997d25a1da90e8131e8a32667c94";
+      sha512 = "5b8bd3558e30d65d9368e86c79695c7cd5d5fca159a678394285bd5a72f74cd70775dadf176d22ee99dfc939333bb3c64225385e2e9330e04298a62718821cd0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/eo/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/eo/firefox-73.0.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "65e52bd65313c31e9d354bf35896d410123b139aa27fbead0e41bba2cd8bc4737fb4e12fd741429c209cdb31661eafb1c49509359fe333c6082d9c3346e686a5";
+      sha512 = "e80c74cef34d4be438792e7436fa14e3008029c7ddba9884f3a5bd6f1a20ca51612e5f3a1e6c5939d69740921b0717b2ce5bf20c1a740ec6d167cd28809492c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/es-AR/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/es-AR/firefox-73.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "5d680d2135e4ba5e7c6ce7771e8b3fc34d753329fb8034e8018af302d451868730cd5175aca40b95a47319c5299b8f34d9bcf180270dd9d2cd4ca9413d0606f6";
+      sha512 = "2dfd113477eac29985af07c05a3d2c0574104f91e44e8625fe5ec51bc5debc262d2f812761edff5a63ebff408f2e560eaced510ce34256f497317e0af5066b49";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/es-CL/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/es-CL/firefox-73.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "a1e81b2a68ce3808630efceb578d6d786ec0a4ad11de5985febd811ab49e60a5c91f60d4682a4b980a658ee03683e53f55d338851d3a475507411b7092090762";
+      sha512 = "7cd5fe37c8eefe0ef5488feb3a4c9640f8cc25e5c01c31d84e755a84d7c42e2b1ee89fcd78cd797b3bb34c465d06966ff5f994b7b6412008628646a987abac52";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/es-ES/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/es-ES/firefox-73.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "d7807a206fa3c169a3d36a9b41f8649b83db1a43b2f54de7d238fde37728d59e27c0f8654223f02c7f9970d358830a29776a4bba1ff2e25629ef289ab0612b4a";
+      sha512 = "7d2a3fec526f8e812597c1184a3a811c0a1f7d1545aea8f826ac934e1b694d35692aa8f47bb2a42f7a5c183075e620e29a77a927d99dea54326bc690110c575e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/es-MX/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/es-MX/firefox-73.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "bf0ac4aeb7d527969da7633a6142238c9b9e2c57612cf32582f1316fda1cad020a5c53de18d009db9489dbd781af5de1d1da72a6956b1a08bff3a149372b6982";
+      sha512 = "03df019ca336e8b6ae455b91058c5ffbdeeed6bec6f039962c00d8b8d83668783e072f91a82439092bcc4794c1be0e52dc6f88303147f97fd67d81feb14d58a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/et/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/et/firefox-73.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "3213ae4c41a450ff0e487f661df8716a6e6ba24fc29d41dc7acc8807f1d0af8e065d65b441f6eb47c3a2c2554e3848ccf83f786b69e536e44f6dac994d76478b";
+      sha512 = "85d6ef77f080e8617cf490d945d45f453d04a635e1b410fa1ad78c86afd5d43a9a39c8ef7be0b4676b057d7131168a1d8ad0dab5a4fbe230266f96d25baa8fee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/eu/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/eu/firefox-73.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "90f4364bc45540c8543c38291de35013e6198918cc2e32016b707c6dfe96ab5177501fd165204c6386cc3efc7204b86bfaf131af9ab164c0662124a5149d4cad";
+      sha512 = "e20b16ff5539c00627bb44efc87fcbbc4017006d6a74e0a6e9421b91c297327b42405fd6b65e8b98d71028a8ca35323b7c55da9c4ab77fe7a511c2a75aec6f03";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/fa/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/fa/firefox-73.0.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "be2e0aeba63a36348956862f636e6afd6c7dca6e76fbb103c91456737eb487dcac4073bbb57f45987f8308b395fb5ae0424b36b982e0ecb8d3ef90d259660818";
+      sha512 = "ecb9935bd89a41128955005ce003700e15efb007a98f0653f88145cc21af2ed719a0edc342b4343712814a9bd16011322cb454f36e4236d0c73a5b5306d45035";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ff/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ff/firefox-73.0.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "5881048229f3f17a2c766c12ec4e734311f3841a3737fae4ad459c50eba5c889e98c4666f8a87074fe87f59c33603ad056cea8bda23ab449babc3eb230d442b4";
+      sha512 = "6bd4c591f7e6a7c0d08ccc64d7086f1863e1a2d8760c63b02a250a8b47e9c50a0f36191d7ef18d85ead4046678095cc101670511d9790962312ae1d6032ad9f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/fi/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/fi/firefox-73.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "1bc13da6298705ad2bcd40ca0994b1b6288416defed2a8bafedcf5d7a3e0239a550540eae7e2ec6556c4ab5ede77a6b451b906ce61f753fea2b9c1cea5205e99";
+      sha512 = "60237eaa42baefa008a1fe6fcfe30694c63e832df64a12175b34967a2358ad2bc0b08854a45ce698fdf9d4b2ef21dcf63e87cabd624254fc71dea5b9e1610b17";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/fr/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/fr/firefox-73.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "c5bb1bf92b1f24a3bcd493a183ac70683b01fe7bdc337e96c41582c043adfd0f429f3eb90f543a9af98dbbef915e6a5e2aa3f90f96414828c9cfa30e58187aa8";
+      sha512 = "6f7b38cea8b38d746623ed37fe2be83d5a3ab3c9ed2b6be88e78c0c28ccafea70ce0a11088e35a45427d3c5e3a84939c3c6c2be16b15e7270d4296088ba8c3fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/fy-NL/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/fy-NL/firefox-73.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "fbd38bc075181e87abbd457e5c763146e4ddb590004d7e76fdc29ddba8c3d66ae718705339bdb224bb782eb8633771f8c287ab0d585f27a37614f3a7a284d97a";
+      sha512 = "dc0eedb90ccbeb5a0de494c3a60c94704582d1b681e3281c3ab3b60fe3d1140bb5463d66e2ed36c8549a581a8e28d1b0a09ee1fef903baa6680a7c43c3d6b8fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ga-IE/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ga-IE/firefox-73.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "c2276b743f3c5efecfd58bc397a202eb4efa02eaf30d5b18221c8de365e4ab625617e1430a056304b2c4a30ed901376e8ac14bf28b806d2c0b284bd732f546d1";
+      sha512 = "9c64b6586f102dfe190c8a600474bcf4a32c7b268a7ba3cb60d673636aa340407d492a7fb377308d6f0b6759b76069f4e5f573499f36ad570905060d00d85d21";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/gd/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/gd/firefox-73.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "327f677c3d4f71c3802f515ebe36decf236725e1fc318f55afc0985aa800b206a5f7fa215a219e1c2c54ffd24f2f95baa6194822325aa6144b0ae1f8fdd22d2a";
+      sha512 = "5f3e92b500a371e5228a2bd7c176e116e8eee7210f14dbe130ecb2a1f5f337e2a413702aec2685fec27245c281c97931bcc08c0fc7ca0cc4954c3e507e42fd16";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/gl/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/gl/firefox-73.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "d8aef85685637cc5186c5b0b6f9458f29955ffea90725973efaaca806cb48cf817095e08ee1d2ec533ccebc6199e671e04acf460d1b8a88c795b9842b1a55be1";
+      sha512 = "8fcb6890fc7664f11a833585e14e0d70f6d4f4d52b9a8cf4917a86b452d96f9b1ce76502a15bba116dec18b31b61976ccf8680949c67e53c93cec786373f2654";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/gn/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/gn/firefox-73.0.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "95585c2c547ec4224841178f6cd8697139fd6166aaceb749abc444425e100961f230cf1b98b76b8774b849e6a10a37f1be3047d97e48130407cd5c27f9031f71";
+      sha512 = "6729111f3c0e4511ae70afd2db2c9dbf9640d01c16b711cbbd1ce7c4ee689cdb844a03b2aaf93215aa85b91d3a519f135ee5fe895cb2f96c77e296ed8528b942";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/gu-IN/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/gu-IN/firefox-73.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "396b68a041957adb0a15390261cc152f41cd339511a94933ace779e5494a595ab36243ce533ed158f57c4bd2418e7b66764ce9c2cb4e93f7708fb29aa6a12b0c";
+      sha512 = "9152dd76206762dfe6fbb4ede85d2aa606c1c5455945fd6cdb31aa65267042a292f99378a7ba51c793cf50753d51ec21e896938b58d6092eef032d5c2ca89d43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/he/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/he/firefox-73.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "884ef44f1b5f017d46abcd268b87c6c433ffd8c30f5afb66cf66441558e819bda15d9843b7fba3413c8f148f6d8c583506b6a754d91e2baea70c5cad321909a9";
+      sha512 = "bdbf71a917eeb72a47fdca61253b5f7861ab8b20d05b61833e5d6359f808fd34c518f192c8eb55883530f0b82c56f0d289c78dc369badbb59050ab092f2d2794";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/hi-IN/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/hi-IN/firefox-73.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "ca548c8b992d9c11a76f17b0790ca024a8c40893da10d50cd96f133f99459c981a2f2f37ad08f570bae809b6b08684d051651786840db33be4990f502fc5ba5d";
+      sha512 = "1cd239f79716e277518ad870bad8d01be7f558e60f1ef69d632a87e4fea570dae219fbf63d57ede37e2128888860f1899e2d702e24117071885d71e5a95061fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/hr/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/hr/firefox-73.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "d51a5454a6908d349b1b7239176f57fbd118d41d6bfe578c64bb9fe074628afc25acd1731221e6531a85a84d8193765d46e49843e7743f32be96b26180e9b593";
+      sha512 = "47e3c93ea8a5c7094d02840a0c4dfcd74d91cb81a718a42505284f29d7dc7ae779c21ce04413eb4889369a22867f4562afb132769430ebeefe2095c23352edc6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/hsb/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/hsb/firefox-73.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "19bcad2ccfc2c00d1a735a006c126f7e9610c979310fd1af30ae1d9bbe2e1b6a35ccad8441ff1a2c5d1bf7f4b006751da6f848415ea28cbe2c47b2ebe1b97bd6";
+      sha512 = "dbf79eab22d233809bcaa8bf9464abc143bd120f6c9258b95d61538104cb18584208a9f55206f27be5a8b7f9b2ad7ed42f58562d37b14f86a61dca0b18fa4401";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/hu/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/hu/firefox-73.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "2b598a6adb47878224759492c1834b317ba6fd68839de83ddad835c09f5bdf92c5b89a71351b64aa9f8332f61d685ecf56ca2423128142e03a6904708cd693d1";
+      sha512 = "d8878f168fd05f6334477078ef647f70ab1e89e144756238b12dc8da7b7b703fd56958cdb4119c66e66cf3f8c0260d2fe9ce65d9d9e094c52c775b1234e2a8d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/hy-AM/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/hy-AM/firefox-73.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "76e940fd65f81be02750c299a2375e2252b1e2595193aa52ae6238a4931b08d461ffb2806a6c6ea7ac24a343d183bfacb1a57d349d4c57ae6e3f68ee09833322";
+      sha512 = "9348b29a96e8cacc331b544ef219049e1228ecfb4c282ea1e9a859eeb5f16d261d6ba48d6d6bf1d2cb9be6d7ca2f3f6ecfb5f58e42a54fe9eaa04742b3a42532";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ia/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ia/firefox-73.0.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "6554fa82b4e6e7dc20a5dc83148752661ba12aeb4ed19500a21f9d3e46b7cc37881b53ff0100c9f382b2e24e16dc99ce1fc338677e40ae4eeb3d4d1a9bc8ca80";
+      sha512 = "b8abbd7321a68fb1eb3418a8b8b871e4f27fcce07a26bed73d91482bc22030217599b515bdca16c4f409581ea3f73afca7dc506c85e4b19e0f4d9c27abd0a602";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/id/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/id/firefox-73.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "dd12e9a4cc83e13c6a7f49d7a52de3f46b4439405a28bdb855406394483cd90120a4b5ce9bd5df912a70128bbd532d158c1b3eddeaa1b7c95ca4b8334429d599";
+      sha512 = "b70c61f469f18b06baf12efecf1b4f9d617bb47721810d6069c7d3e1491cdc5701a4bce4f3c26a54825ea4ed48706a69aae731aa3514488fd90533bd128625eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/is/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/is/firefox-73.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "01e7e45c6e45d7a20dfeeef16558684a6f38b6d97e84bd084246c17d891a19432f9fb77b7c2b0daedb12755853e53efbb0fa567f2f306c385d9c6e7e2fe1d661";
+      sha512 = "2fd9b1e7cd86c28dd43d6e0b39fb4bfafa82c05dfdeace15c792d5f2c21b80b67a664f2abe0c9f9d4dc3a1e4fc214e38428124d740aa7f63ebc4c82210e7d646";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/it/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/it/firefox-73.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "e000567bccea7588af26e9e51883bcea340ee237d2626dc9e63eb241efc49962d60712bcbd4527caaade8eae7a64ead080e7df0150436f37aedcfd5cc212146c";
+      sha512 = "44f2b7ca7f2e5f14107a243b1d711b487e8c71e73808f849756e65f3e61040917104836e912ba8c356754ee1b04986eabe85f4cfab10e1b49a5867dd33242648";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ja/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ja/firefox-73.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "5bc1f2078288499005e189adcf2c6fe3fcaf3f642d624c2451da2611b804072771161c59ffb58021cedeabfb91415644a201db519e5d6211e78ee52f32e97979";
+      sha512 = "86d5e55c23ec5077f32c290a4200d2b53e28184d2e01ead019a8d8d810724e692b9364cf28d7088c881bbd32cba55a6c649cae448fb92b7b1c9f309134b9ad1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ka/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ka/firefox-73.0.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "ffa42e8f3c098b199d68321c1354cbd6e21ba7f36add6e9000c8a2ea524f3ffd70ad13128b4c67ba5f376158dd87f7565a8bf876bb385481f823b5fdbf74d8d3";
+      sha512 = "11b4a38f291728dfa67ce79c050cac6197e73f1de746991cb85906f648df14b72bc1d94c4e287e89575cef201a98cc91774df3872d974dfc1c3d644b596e7bbd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/kab/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/kab/firefox-73.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "0315ea8f56f8525f9758e919c97437b8ea8781e04a98c2a34502b98196c6b27030759e26098051cd4f27c96c7de4bee3f28ff8cf9ebc87b12aac7e7924a79275";
+      sha512 = "7d817167020b89bc460e3b5ac6bad95c32c62b2e7ac816d69a4e943fad80ee06dece53762cdc6b8dbac27958cc4b851e12d777eb08c84638f0c0234a9681053e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/kk/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/kk/firefox-73.0.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "4c0e327fdafe298dcf897e68fbd1557bab24ddb91bcfbe3bf92a19662f6fc6c4c8862585d909639fc7a4c6bd4b875d52d8a6d0867049ca1b1ffbb00d8e8d9195";
+      sha512 = "998241399f8019c1385b2e005bf55f715ef734e0720ac3482726ac9bac82c0d656eb38511793ae96fadd810949c8ca084e4cd0810a7a0a1d0a07c9c88b69ffa8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/km/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/km/firefox-73.0.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "34a45eda40d599116be8f320ad99e25dd2d9607d91c99aa8b1eb5b05eae32dbb526391a4a08ce5b8d411a6d6fff23dd9d01e276f75653d9c2adc5a4177511df2";
+      sha512 = "530210e9760266ae5680333cf94d8cdce20fcb2e8762503413b42e7bd593a163d0c9c37392aac6b89526a2109f6edfe3f6baa0ee1e0c8e85fb7938badfbd8d66";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/kn/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/kn/firefox-73.0.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "6bce122a0a2a88ee17b29ad2e98e99293c077fb70ac63604b407f4426bf39c9ee3d91057b9e60df6604a71183a266fa7f27bda01c0fa60bde898872d5325e9ca";
+      sha512 = "43bc6d75ae2efdd31c9bc02e1808da3999ab5d1fe64df2194343bcbc9436adab4e530b67ff088727bd379c099911afd8733d6b3bd73872a6e9e5ceb14c2c7346";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ko/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ko/firefox-73.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "3b746676d728ebdf3dfd646bf25b007c61c7ce960f7cf77f80601cb38e6fb56cdb6d6d7ba36e84f55b7969f2f8f882def133126e0598b43ac569380cd897f2f5";
+      sha512 = "08ac6c0704f13ac266adcdd8ba8eeb62e18ddf4c3e4633acef3df31f07b6a5d4608a15d4c3bfc25b3c16556ada6296843f1ef7115bd37515cd1d5110dbf85064";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/lij/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/lij/firefox-73.0.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "453ae335ec815eea785d822ceb8224d590b8615b21f316ee7f6c06e9a0e02c341d26b9e938fd5eed60727df719c8d8394df312bb28868cd21ccaff60d3212d9d";
+      sha512 = "7ed520a475ab533d33e392e7fb24f2444caf9fe5cb06aa5499740d36b8fbfc899af7c8f6495c46f9e363606d33fe067da9fa72a2d41a820731d764d698eeb075";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/lt/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/lt/firefox-73.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "e6da72f2ff519a0e348ff8c9cfe7a29a3253eaa16e8ef58fac79868b9e4e4ff9fb453e763397209e0490658005ecd2d4bd339b366afd7f8936d51186e55c94ae";
+      sha512 = "6e49543423ec6c0e968b85702fec46587c01fb5a35c28e1617f3e206512c5b072856a7bd455549ad31c2828d1f6baac40f5916b8e38c622c84b7a54a6468ce3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/lv/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/lv/firefox-73.0.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "c9f958bf85e43fbebad9b9dee033cbaaeeac010065a7b79c6b4e90967f16ab747f4fd0d01af4316094876eaa80b35ad67b6b485ab4b02a3765ce3583cbe7eae2";
+      sha512 = "c8c7e30bde45f99026b3874ee70d4b9ac44d1a4921b448883faf54c9e1323066464d4eed3671b372a8e342e9bae9226ac64525a1ca285d7015f1854e5d4eda3a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/mk/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/mk/firefox-73.0.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "3c936346e9f915f24b806d299bdb2ab665d03f3d2c12a7b52506109ed1aca4f87fd3a099f6fca6fba1bce46784bc3a93d54ed2d9e8b704990bbc757bf4e1b798";
+      sha512 = "e22388afa540e7abe6575525663ac7365555d7d515ad49233bfb3de16db778a634dc166b8e9680f837978cf6662bf1f460f95ae40520116988822050de731a65";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/mr/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/mr/firefox-73.0.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "92622561297d3e8dcbbe56d2333f3b46ea66cbd72efc64c20c339d33046244e68f98687a9c5b5c5e6738eb6e88d392781cb1c56d96647e454a7e1bd111761ff9";
+      sha512 = "ad71b75a9b309c9166b72416ec06edc90a6621ff27fcaed07c16a42147664e3b116db8e3ffc9bdba8ddda862dbd29074b62feb9ffbebab6d36437bd5a50318d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ms/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ms/firefox-73.0.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "9ba4f473ca8e56576d4c13e467b49f7cbb2f4af43e78406361d4222a74412f7b336419da504168754828796eb2f5211fdbd0afd8f6bf4030aff7a9855919b119";
+      sha512 = "f4c3f8d93cfbf89b862929d74eacd3398531f43617288aefcdf7b0f4b5857e9a790802755791a202aab465349bd4f979d257d5925b45a8a28b4245ba10d5d0e3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/my/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/my/firefox-73.0.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "8abe55c550aa5f185fa0919641749de22d807625d1ad84b561265653b17e04a267311b6d5be5d3e327af04f2ad5bc17352a2d48df7927c7183cf5578c9ebcdc6";
+      sha512 = "4ca9a42291faa8bb4c39a9efc0f8067407ee486e37a0b32576d2519a0189efd2c86ea45ea6c19f44d321d485ccf7479a58d9fc84bc3022fa211046adcd1cac8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/nb-NO/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/nb-NO/firefox-73.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "c15e35640a4b6672fce9263a15dfbb519474652ce2024d6627d3a853ae8017071ea62eea0cc3524ea5c099aa3eb0de34e51d6765e0dd507a58311db6b810de44";
+      sha512 = "fd54231a3888ae659df17b64d1f8150d112bc9191387f3621b0edf8a97571b90613d387c8fcd1944a263bc20c4c2f701bc4eac3765e6d2c4529c93c70cd07780";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ne-NP/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ne-NP/firefox-73.0.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "d5b54a65c3b12d7090061e23ab3e0428c6e870b1dd7c6293d13011921b868db6dfd8ed9f4e0ffa33d2af7c5f53ae2ad50eaeea0a87b0a9af676d32f6563d1e5b";
+      sha512 = "1530837c31b3f062ef0d13063d7ac071e0434a3bc9d44f53d17675cee3f6cec4f19305ce01a5ffba0c9be9d2661a6f563790d54449408eb95449c62a378e0217";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/nl/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/nl/firefox-73.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "3c7c0e1b45948125a01b3447e6bb4d1bf48e79c16477bdaef5145e67d154f101b299ec696d22588052a5d7e3e87b226418795c3aeef9991d226bbd344d7e8c7d";
+      sha512 = "914ac5e5a1495d753ca9bbefc8fc57375252bcbdb35c6b92a37ac12bb3218edbfd7caf641a52bf1448950c3ba84bbc13b7396199ef0c6b1678090fa40d3ea26c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/nn-NO/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/nn-NO/firefox-73.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "f4391136225aa0e477c748d541e94be9b75b955ef8a756d12ac3213a7a83f0b273d320b512bd3cd82393f6fd1b1470f02206cb37562554179d0c23b3b6ab83cd";
+      sha512 = "3218d09d98d61d7c804d6ecd8be2ed48dee8f0fd9c2cea42e44a1c38485e3cb466955eb84e23ca308f1d724afdd33931d780d9f76b5d54ce942d00f0d31463b7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/oc/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/oc/firefox-73.0.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "af5c368c519a95d575ca0cd3b719406ece8823350c828fb4984b58584c1abe8b743ee99bbbd29f98a543510c91358a80817d707070c2b2e341529e33ea955e64";
+      sha512 = "a7bf0def44278d66532b7e4edbc0deaafaa3a0be1a3ac41ba22848893c4ad8e651114e0d39e49eb49458dfb257280c32cf8bd6bb503c8f3198db1872324a7345";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/pa-IN/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/pa-IN/firefox-73.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "9e1f51321f34b9d4ae207b2630c7be558f16b0d1e3a0b7fcde82c908dc435b044388a3a23da99e28c7be3889275d67041cd53276b8a4af04f7b01e00f06ae3b8";
+      sha512 = "d052c6d72e88a31492567d03097c3efba10ab0dc4d8fd0cd489ebbe45949896effb514a7af1fa30356f3cb97a0b08caa47472d0032558197e608b1ec130bd7bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/pl/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/pl/firefox-73.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "3b5ec2695ceb35dd2b0d70b3f47cad9b692eb11447ed9bbf4b3fa8e049a35911802ee455a132fa812eaded78ef18df31ef3a8a11c8c95b260bc89350a7355181";
+      sha512 = "a4dc584b9222558203be7dab78c58f5e7fb86dcba9ee565d2978ed7d8da1cdc2cc3c9bb8f93ccba8f1c5ccd9074bb642ee99d0225056a54522cb499575ce1e11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/pt-BR/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/pt-BR/firefox-73.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "df5fbe1a058233864e7ffae44538b14540ed4846ca5bdbfbf07eb627a8753c3bdaf68b337eb6e69900df8cf3930a9468e7c626583af60761854a282fd5d52b95";
+      sha512 = "5ecc7aa9752a373c511a208dad606774f589e36b5daa1434c8e7d76bbd835c8f2b9c6b20c176bee0ab6fc7b4355af1f25243563eb4d97d988059bf3d08e7d279";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/pt-PT/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/pt-PT/firefox-73.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "0145016eb55586388a49fe052daf5d7cadadda15ae88ccbf1410f35de0d0e4fbcf7afa5ab5889c9c88a0937691617a51ac53dc8db070aa199b17840275d03ec8";
+      sha512 = "31c3585e7612f71b2d7369d477930aebafcc54ca8d21ed6f84ef0073144ca5fdfd1bc45e6f19b702c26ab5c6797c52420d8fa5451b889c7706f509b6c4dd5ad1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/rm/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/rm/firefox-73.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "9890545266e1f31a27c50a4782acb6d3af0825699e6ec78151d872d7a181c6258a08764cbf046d483593bfd8467c4c78b9bc316fef20bf444afa73b7bcc14795";
+      sha512 = "eb82d612861e1a0434edc04dd79ce33e42d116e27b001139371b7fa2802b94a46c7035152be2248941cb7ae576484da743175491c63121be8651dfe9b74a0d82";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ro/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ro/firefox-73.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "e13b760d6d61079136b4449ee14a8d2cbaf72512071f4475d8fdb95337ef86970ee3eb72f987c1e07290650898108f0e90948ecb2ae027ba40b5fdd53ff7303e";
+      sha512 = "c5229abd0b1fce59debd4d72af3d7bcf8a3f37c5abdf9f1a6b4851c19b7191492da42901683e57c9233efff16cd99bc1499d8e16ddf7a405807c7d00a41c205e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ru/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ru/firefox-73.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "3c51eb7be0e7a23b2f3ee8b8ec5cd420ceda5bcc3aad6b76ff4406ea0b59fd77327b295d78df6990556cc9c6f8d221978d6af58890d4122cfb604891fe6d574d";
+      sha512 = "3b965b0cba404679e6c9756367dfa3dd8ecb028b440cc7bb949df353f5a27efdece0878eb44f950b3bfa7e8842483b929ff70ba1fd25bce5ed0a23d7b505c0cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/si/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/si/firefox-73.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "1a4bb6b01a0d9bc89b270844d4c1e235354abc447068b45b3630733d1735b66e65c808f70c532474c31298b7962b463c7b71bda89ae2f302fcb847101e0734b4";
+      sha512 = "569f2910116f51cb3be82cc2d07f76d4f8b61cdb6ca96024290cd5e523c6711009106658a09305ebf2c596928de35eca1bdc578541a9eb14fe853fead902c7c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/sk/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/sk/firefox-73.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "c46e2914e4afdd9b3e6a0eec1f2e5ff9082944221a35d9a4de8439f5c31ee705b37575eebad365e19ad2a447eea065a712cb02150757cf053be83986e69700c4";
+      sha512 = "109afe184afc873727c4c880280ce38f6577f0688c42c7a18b692d54a4eeb3f24dd8c5ca1a062df886bb171c50d30d6707125005baa29a1db9ec5091746164e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/sl/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/sl/firefox-73.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "335256ef9a8c9008119fc7de2f14c4c51e288f65cfeac0ce8dea737cab04772739f99401ef7b8873e95e0290239502a227d3a6772d7fab96ae7e78437b6854a7";
+      sha512 = "63af29eadaa34738b715aa23609a20decd0a805a252a80051ed54fb8a332f6ae7eb17f73159469a755eb736a1523b0552ac3dc01de5fe2a5903e21e0286c833c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/son/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/son/firefox-73.0.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "1de8c05e776163d5015487ee1c48b63f8c2beb6699c3502e9bd08058529a59324df59f26426852558e30018657978ea613b97e2e651a6dc500379d4a61651947";
+      sha512 = "348898f1a01cbe5191c31c8a806547b74890762163a8aeee07b61aebc969a36567255f00bf8bda7f0dfb29b81396ab71ff39054dc1910c7b7a2ec225aaeb7ff9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/sq/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/sq/firefox-73.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "02794e37e26dbc6b8df8a62d9a29a5e47cf0a45a1929265c1177c97181592a5ecaa99b5549bb95da00a0559d1488723a4454866d2e5edb08413b984165150140";
+      sha512 = "278e02254b09df8469c3ca0fd56e72b9b663be621e930a1f261276e58242c84ec9ce717a0924bfec01953e15a0a36c746a17ff43a30e98c6862697995e7f7fac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/sr/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/sr/firefox-73.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "dbe5862115a4f55f2c78de57b03198e08dce35d491b60238955d406b0696600bec8f116615a41bac3d80d5e77e1faccdc33663056b4b15aad952d0b096d73260";
+      sha512 = "1d7f2d1f341d2621500bc4eb0885c6e2709c4621d34fcf8c1f35d3054af17b0c0490acb92867841ab605b8a6b764d9689ccf7eb6325a136f00531068c2a83d29";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/sv-SE/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/sv-SE/firefox-73.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "4c0d9dea8339def7a3dc300da9f8cfa1ba6d6eb5a5899918bf0ab8211b4b5aab4367ca91a7a290aa5faa3424588d29bc34e89ab645bca155d8ce6150e225b946";
+      sha512 = "38772f54d574a7b0dda06a535adf934e60e06d1753c4df4a9dd52dfe1cc08dc1fcdb1e0350e889facdfbdde95707cd70d705b9f7fc6f2d030ea92bf59de820ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ta/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ta/firefox-73.0.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "d70089c118868484a556e747a72cab6242ca7a5aedd7425c59f273170ec559afd9b057d7106226a9948540641d25829b21b4bb9b4bf15b02f3ec2702badac873";
+      sha512 = "c75d17e579c45961c92d9a0c238276a9371f27d438182b366c8804d7d4899e9d4cb689455b5d1dfb6100165bd1b4fef1215059779eec7fd215e485fd26f4db33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/te/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/te/firefox-73.0.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "bb65f50f55d11b79c1943df102b6f3479127c89c74bf4cc7aeb5fa8dea61116f23caef84a770016567285cbd7788c923f3c87af5598d7ffb805c541e0c69a0fc";
+      sha512 = "5d791b6bb7ad154970646e83e77513e92e284d32169d9ec6f8ae66e252be3ab6618e927cf73693d81986a2bc10ed27dc2f46ef8b39065eae028828282153803b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/th/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/th/firefox-73.0.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "5dc7eb602e0ab548d5f337bd79630c516968544bcf6f801093676f784f54e20b5218d2fd0b323cff31292aca15616e2485e75c3475f71c2681222bc10a74e367";
+      sha512 = "6015ae88939f2bcaeb2f354ae0003695fb111e60ac0c137cd4d6cdfbb1ef27699b76bd1d02587af1996002a39955e7c1ed537f906328695b820b024c8b91ddd9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/tl/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/tl/firefox-73.0.tar.bz2";
       locale = "tl";
       arch = "linux-i686";
-      sha512 = "3318940aafc8af7421a2e1973a1bdfabb6670dda5a104de41f4ed1abbb3c904e6319ceb6f94fddcf11e4d18e5f72d439f5e4506f6b42f9b5adddbf291e9e2532";
+      sha512 = "471e73795238f2f65550ffc73b604f1ef41b92470b811c440fee5d2cfe41b77c3fcc38be0d2ed85f7f86c005407095780a12e8ffad02fd5f435c6492feefb8bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/tr/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/tr/firefox-73.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "fedcec77a95458fd334be9c8af587923d6281a50ed9c146a32f289f51138ab27d0cf551ccaae77fec2f5e4aa2565c12af7267d5476e777d95761ac2f6904cdcb";
+      sha512 = "464f2df89fd62ee8649786516df21a10ad9bc0faf90f6970144dd2b3397c58643c1f7d1ada6f9f7d7710777b903de89e2bc04c7ab7b057e8fa07ec667bf62f9a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/trs/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/trs/firefox-73.0.tar.bz2";
       locale = "trs";
       arch = "linux-i686";
-      sha512 = "1f4293cf978b92114b25aecf7f633608eb0ec52274147b939bda57463bfa170467484d3eac34183588b58ebcab6c68b20d59561961489069b7fdb120474806ba";
+      sha512 = "d9462735ef137af2defa7d580567479e97d5527b8941880a27979f496a0d74da39cce10eb3503dda54b4a732433182d3725123ecf0b49ebb503bfd56fdf5a286";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/uk/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/uk/firefox-73.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "7e7b442ed847d07ee42c9665835a6fbb06f1b8e61e04dccbe623624facc0fb4ed3832b91192819190be785decaf07a61575f198f089f852b814328a168e2af5e";
+      sha512 = "966b2fd86876b694c66e68f7e8c33e380e021be7e24196816f741ec491eddbbee33318f922b03eb8c66c5302e0d5eb582aaa1d341860b82d7c7a4a7949254bf3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/ur/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ur/firefox-73.0.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "4519a75106a92aa6b6c172fe565818f554aa9da3a6cad86fa6fc4ead9f3fec24bf5065f69e12d985b7798b7d0b019033b88b81605d9599746bbd58786d2d2025";
+      sha512 = "03fa60920c5cbb89035fbd665135b2911bdeaa3d4387c38184aa6f7589369390ae8bfcc0ebca83749f5c2e811a8a74d0ad5dbb62a1befd009f674c7a21449fbe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/uz/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/uz/firefox-73.0.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "41f4eb9cb1f002373ab5d1587c92f6b3fc5b0729117dfe4d74e399d1c8b08c595fdf8d22a253296f4f838dae1f8c4eb15fb634a77a2d60f8d4d61fb402b2a1cc";
+      sha512 = "e66657c54a7edaaa80d932f8447d9edffc2e7625c6241de6ad47272c77586b5eeacb299f3cb9f75a43791d145762883632ec409c1c2b5d32d8d81d42e54cf62b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/vi/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/vi/firefox-73.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "02a6856c5a9a13820cd26333d6968159743907304e58fa1973592f694968d3b9ab229811f239a0f5c37974ef16c504c71d2312127293b8276c7077b03dcbe0b8";
+      sha512 = "2fc3f94a80262819d72525e5ddce77344d482d22ac33992931c79d15d4476d4c564be306a35468358b7b02c167d294510c197496894fb8107062fe897bcb049f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xh/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xh/firefox-73.0.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "d0076f85cd30481b7d174fe89b245c13063b6bf64465c0a6cd288ece96c662d77e25ff2412afe334310375dc3ea39bdfa31c81b1b67ca5d54f09d2e871e7d23b";
+      sha512 = "806db4368b5c5f248f3992140a23734451f9b8122caf249466c63cea69e063a1274b620009d7e6e8ea45bd43f29997995ff0d23580a8bd2376e950926e9807f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/zh-CN/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/zh-CN/firefox-73.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "d560bab6c8deef31fe2f582faa1cf827eac11e60b2ce8695be5c8682972247bd9b6abc3b7c0e2ec174e3dec09374c3a909554660b449abeea821c9b69fdc3550";
+      sha512 = "b4ea2b4c2f54a7c3dc2f16754aa38555e81221062827c3339fac543528cc52062b9e9c910dc597b21f2ad1a267ca2cf1faa8362f3c9c78b52480169251b073da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/zh-TW/firefox-72.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/zh-TW/firefox-73.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "06c70f2d07a84f98c5fc2407e29a53fdf08174c661908f788ef7b4b652a0c589c192c0eb6d5eb51e2b4fd6d529d491899c93e153cfd1e58169f3eb037d112dfc";
+      sha512 = "ed2e55f3279472c9e3b2bc0b51762b797f61c4fdb3fe95c652e5d2243516ea17f2dadc1711bd19154389215ede42a97bac9a607aabc14ac24d5e43a2913420cb";
     }
     ];
 }

From f43fdd115103e4fbe846fa8ff9bcb40c3997c86c Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 10 Feb 2020 16:37:29 +0100
Subject: [PATCH 0280/4636] firefox-esr: 68.4.2esr -> 68.5.0esr

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

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 4f611f296b13..dd9222fef034 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -42,10 +42,10 @@ rec {
 
   firefox-esr-68 = common rec {
     pname = "firefox-esr";
-    ffversion = "68.4.2esr";
+    ffversion = "68.5.0esr";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
-      sha512 = "1n7ssx4w5b822bq8zcv6vsy5ph1xjyj9qh6zbnknym5bc0spzk19nrkrpl8a2m26z6xj2lgw1n19gjf4ab6jpfxv3cqq4qwmm0v2fz1";
+      sha512 = "39i05r7r4rh2jvc8v4m2s2i6d33qaa075a1lc8m9gx7s3rw8yxja2c42cv5hq1imr9zc4dldbk88paz6lv1w8rhncm0dkxw8z6lxkqa";
     };
 
     patches = [

From 6c3c1f0c0a9bbb219c81ef8c016562df1b22412b Mon Sep 17 00:00:00 2001
From: Thomas Bereknyei <tomberek@gmail.com>
Date: Mon, 10 Feb 2020 19:32:42 -0500
Subject: [PATCH 0281/4636] ngt: init at 1.8.4

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

diff --git a/pkgs/development/libraries/ngt/default.nix b/pkgs/development/libraries/ngt/default.nix
new file mode 100644
index 000000000000..c66eceb5e7f0
--- /dev/null
+++ b/pkgs/development/libraries/ngt/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub, cmake }:
+stdenv.mkDerivation rec {
+  pname = "NGT";
+  version = "v1.8.4";
+  nativeBuildInputs = [ cmake ];
+  src = fetchFromGitHub {
+    owner = "yahoojapan";
+    repo = "NGT";
+    rev = version;
+    sha256 = "f2019e7916b81f8aeabc57d682904c8447776bf9ba94525d20265b329aa43eb5";
+  };
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/yahoojapan/NGT;
+    description = "Nearest Neighbor Search with Neighborhood Graph and Tree for High-dimensional Data";
+    platforms = platforms.linux ++ platforms.darwin;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ tomberek ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e75a8407718..f2c745db4b04 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20641,6 +20641,8 @@ in
 
   nedit = callPackage ../applications/editors/nedit { };
 
+  ngt = callPackage ../development/libraries/ngt { };
+
   nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { };
 
   nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { };

From 1a297c817fd5b9869a05cdaf1568455030c46db0 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 10 Feb 2020 14:23:27 -0800
Subject: [PATCH 0282/4636] python3Packages.xmlschema: 1.0.18 -> 1.1.0

---
 .../python-modules/xmlschema/default.nix       | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix
index ade478bf82c5..d3db09bc022e 100644
--- a/pkgs/development/python-modules/xmlschema/default.nix
+++ b/pkgs/development/python-modules/xmlschema/default.nix
@@ -4,14 +4,14 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.0.18";
+  version = "1.1.0";
   pname = "xmlschema";
 
   src = fetchFromGitHub {
     owner = "sissaschool";
     repo = "xmlschema";
     rev = "v${version}";
-    sha256 = "1pwq2sfh7klcxismsqzgw80cp3cdkq9wv8x9g3h1zx1p66xpas9p";
+    sha256 = "1h8321jb6q3dhlh3608y3f3sbbzfd3jg1psyirxkrm4w5xs3lbvy";
   };
 
   propagatedBuildInputs = [ elementpath ];
@@ -20,19 +20,17 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "elementpath~=1.3.0" "elementpath~=1.3"
+      --replace "elementpath~=1.4.0" "elementpath~=1.4"
   '';
 
   # Ignore broken fixtures, and tests for files which don't exist.
   # For darwin, we need to explicity say we can't reach network
   checkPhase = ''
-    substituteInPlace xmlschema/tests/__init__.py \
-      --replace "SKIP_REMOTE_TESTS = " "SKIP_REMOTE_TESTS = True #"
-    pytest . \
-      --ignore=xmlschema/tests/test_factory.py \
-      --ignore=xmlschema/tests/test_memory.py \
-      --ignore=xmlschema/tests/test_validators.py \
-      --ignore=xmlschema/tests/test_schemas.py \
+    pytest tests \
+      --ignore=tests/test_factory.py \
+      --ignore=tests/test_schemas.py \
+      --ignore=tests/test_memory.py \
+      --ignore=tests/test_validation.py \
       -k 'not element_tree_import_script'
   '';
 

From facdac01c7f1911e22eb583e4feaf1a807247511 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 10 Feb 2020 14:00:04 -0800
Subject: [PATCH 0283/4636] python3Packages.pytest-black: 0.3.7 -> 0.3.8

---
 .../python-modules/pytest-black/black-version.patch | 13 -------------
 .../python-modules/pytest-black/default.nix         |  5 ++---
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pytest-black/black-version.patch

diff --git a/pkgs/development/python-modules/pytest-black/black-version.patch b/pkgs/development/python-modules/pytest-black/black-version.patch
deleted file mode 100644
index 93bb4180930c..000000000000
--- a/pkgs/development/python-modules/pytest-black/black-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 5c9ce5f..84b148a 100644
---- a/setup.py
-+++ b/setup.py
-@@ -26,6 +26,6 @@ setup(
-     python_requires=">=2.7",
-     install_requires=[
-         "pytest>=3.5.0",
--        'black==19.3b0; python_version >= "3.6"',
-+        'black; python_version >= "3.6"',
-         "toml",
-     ],
-     use_scm_version=True,
\ No newline at end of file
diff --git a/pkgs/development/python-modules/pytest-black/default.nix b/pkgs/development/python-modules/pytest-black/default.nix
index b129f9eec4b3..1f01e7fb65fd 100644
--- a/pkgs/development/python-modules/pytest-black/default.nix
+++ b/pkgs/development/python-modules/pytest-black/default.nix
@@ -7,14 +7,13 @@
 
 buildPythonPackage rec {
   pname = "pytest-black";
-  version = "0.3.7";
+  version = "0.3.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "03gwwy1h3qnfh6vpfhgsa5ag53a9sw1g42sc2s8a2hilwb7yrfvm";
+    sha256 = "04lppqydxm0f3f3x0l8hj7v0j6d8syj34jc37yzqwqcyqsnaga81";
   };
 
-  patches = [ ./black-version.patch ];
   nativeBuildInputs = [ setuptools_scm ];
 
   propagatedBuildInputs = [ black pytest toml ];

From 70580587de5abd5d4b4461da565f68f9ba8ce6d8 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 10 Feb 2020 13:51:23 -0800
Subject: [PATCH 0284/4636] python3Packages.msrest: 0.6.10 -> 0.6.11

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

diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix
index 70fa6f361ca6..6f53314bd287 100644
--- a/pkgs/development/python-modules/msrest/default.nix
+++ b/pkgs/development/python-modules/msrest/default.nix
@@ -18,7 +18,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.6.10";
+  version = "0.6.11";
   pname = "msrest";
 
   # no tests in PyPI tarball
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "Azure";
     repo = "msrest-for-python";
     rev = "v${version}";
-    sha256 = "1l08daq748lk8rwiv4jdlnmfl9mi7g1ln46gibhnd9xvrrjp0sdx";
+    sha256 = "1lq3bf7kzs9h9sk6ahpf0vidklv0ahx3bm4wpv3qka3jb64yqdmi";
   };
 
   propagatedBuildInputs = [
@@ -46,7 +46,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "The runtime library 'msrest' for AutoRest generated Python clients.";
-    homepage = https://github.com/Azure/msrest-for-python;
+    homepage = "https://github.com/Azure/msrest-for-python";
     license = licenses.mit;
     maintainers = with maintainers; [ bendlas jonringer mwilsoninsight ];
   };

From 17377f441ce80970b4a0afc7726ed5c6c251c6f6 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 10 Feb 2020 14:31:10 -0800
Subject: [PATCH 0285/4636] python3Packages.azure-mgmt-applicationinsights: fix
 build

---
 .../azure-mgmt-applicationinsights/default.nix               | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
index 0a485f05f910..274cb181d2d2 100644
--- a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix
@@ -28,8 +28,7 @@ buildPythonPackage rec {
   ];
 
   postInstall = lib.optionalString isPy3k ''
-    rm $out/${python.sitePackages}/azure/__init__.py
-    rm $out/${python.sitePackages}/azure/mgmt/__init__.py
+    rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py
   '';
 
   # has no tests
@@ -39,6 +38,6 @@ buildPythonPackage rec {
     description = "This is the Microsoft Azure Application Insights Management Client Library";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
     license = licenses.mit;
-    maintainers = with maintainers; [ mwilsoninsight ];
+    maintainers = with maintainers; [ jonringer mwilsoninsight ];
   };
 }

From 3f7f043deaa7c06e42af045b93eac53db4efaa53 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 10 Feb 2020 14:48:59 -0800
Subject: [PATCH 0286/4636] azure-cli: force PEP420 for azure-mgmt packages

---
 pkgs/tools/admin/azure-cli/python-packages.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix
index f0bebeed679d..4cf0a5d35545 100644
--- a/pkgs/tools/admin/azure-cli/python-packages.nix
+++ b/pkgs/tools/admin/azure-cli/python-packages.nix
@@ -37,6 +37,11 @@ let
         substituteInPlace setup.cfg \
           --replace "azure-namespace-package = azure-mgmt-nspkg" ""
       '';
+
+      # force PEP420
+      postInstall = ''
+        rm -f $out/${py.sitePackages}/azure/{,mgmt/}__init__.py
+      '';
     });
 
   py = python.override {

From 330707e54dbc900ea697992cbc776fc0260ed2ec Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 11 Feb 2020 01:41:58 +0000
Subject: [PATCH 0287/4636] linuxHeaders: replace rsync by cp and find

See https://github.com/NixOS/nixpkgs/pull/78994#issuecomment-584437442
---
 .../os-specific/linux/kernel-headers/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index 99595c28eec1..52b280c30261 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -1,7 +1,4 @@
-{ stdenvNoCC, lib, buildPackages
-, fetchurl, perl, rsync
-, elf-header
-}:
+{ stdenvNoCC, lib, buildPackages, fetchurl, perl, elf-header }:
 
 let
   makeLinuxHeaders = { src, version, patches ? [] }: stdenvNoCC.mkDerivation {
@@ -16,7 +13,7 @@ let
     # We do this so we have a build->build, not build->host, C compiler.
     depsBuildBuild = [ buildPackages.stdenv.cc ];
     # `elf-header` is null when libc provides `elf.h`.
-    nativeBuildInputs = [ perl rsync elf-header ];
+    nativeBuildInputs = [ perl elf-header ];
 
     extraIncludeDirs = lib.optional stdenvNoCC.hostPlatform.isPowerPC ["ppc"];
 
@@ -47,8 +44,15 @@ let
       make headers_check $makeFlags
     '';
 
+    # The following command requires rsync:
+    #   make headers_install INSTALL_HDR_PATH=$out $makeFlags
+    # but rsync depends on popt which does not compile on aarch64 without
+    # updateAutotoolsGnuConfigScriptsHook which is not enabled in stage2,
+    # so we replicate it with cp. This also reduces bootstrap closure size.
     installPhase = ''
-      make headers_install INSTALL_HDR_PATH=$out $makeFlags
+      mkdir -p $out
+      cp -r usr/include $out
+      find $out -type f ! -name '*.h' -delete
     ''
     # Some builds (e.g. KVM) want a kernel.release.
     + ''

From c7eee5ddac2b351d20418e69e3738e6829e893d7 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 10 Feb 2020 13:53:19 -0800
Subject: [PATCH 0288/4636] python3Packages.lxml: 4.4.2 -> 4.5.0

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

diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix
index db3bf6925561..67c338b58c72 100644
--- a/pkgs/development/python-modules/lxml/default.nix
+++ b/pkgs/development/python-modules/lxml/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "lxml";
-  version = "4.4.2";
+  version = "4.5.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "${pname}-${version}";
-    sha256 = "0h4axgcghshcvh1nn39l64xxhylglm3b00hh2rbi1ifvly5mx24f";
+    sha256 = "1i3bhg8xb502afq4ar3kgvvi1hy83l4af2gznfwqvb5b221fr7ak";
   };
 
   # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs

From 524af32c15e5b389f630782b35085892ecb8c440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Miguel?= <jm@0pt1mates.com>
Date: Thu, 6 Feb 2020 20:38:41 +0000
Subject: [PATCH 0289/4636] pythonPackages.wordcloud: init at 1.6.0

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

diff --git a/pkgs/development/python-modules/wordcloud/default.nix b/pkgs/development/python-modules/wordcloud/default.nix
new file mode 100644
index 000000000000..759e48eb997e
--- /dev/null
+++ b/pkgs/development/python-modules/wordcloud/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, codecov, coverage
+, flake8
+, matplotlib
+, mock
+, numpy
+, pillow
+, pytest
+, pytestcov
+, pytest-sugar
+, setuptools
+, twine
+, wheel
+}:
+  
+buildPythonPackage rec {
+  pname = "word_cloud";
+  version = "1.6.0";
+
+  # tests are not included in pypi tarball
+  src = fetchFromGitHub {
+    owner = "amueller";
+    repo = pname;
+    rev = version;
+    sha256 = "1ncjr90m3w3b4zi23kw6ai11gxahdyah96x8jb2yn2x4573022x2";
+  };
+
+  propagatedBuildInputs = [ matplotlib numpy pillow ];
+
+  # Tests require extra dependencies
+  checkInputs = [ codecov coverage flake8 mock pytest pytestcov pytest-sugar setuptools twine wheel ];
+  # skip tests which make assumptions about installation
+  checkPhase = ''
+    pytest -k 'not cli_as_executable'
+  '';
+  
+  meta = with stdenv.lib; {
+    description = "A little word cloud generator in Python";
+    homepage = "https://github.com/amueller/word_cloud";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jm2dev ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2f307c0da05e..de926517fbce 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1484,6 +1484,8 @@ in {
 
   webapp2 = callPackage ../development/python-modules/webapp2 { };
 
+  wordcloud = callPackage ../development/python-modules/wordcloud { };
+  
   wrf-python = callPackage ../development/python-modules/wrf-python { };
 
   pyunbound = callPackage ../tools/networking/unbound/python.nix { };

From b86f4d52cf83890cb8d2558cf7010efe90ef8323 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Tue, 11 Feb 2020 00:09:53 +0100
Subject: [PATCH 0290/4636] gunicorn: add 19.x branch for python2.7 support

The nixos/moinmoin module uses gunicorn, however the 20.0 version
dropped python2 support which broke the module as there's no python3
port planned for moinmoin: http://moinmo.in/Python3
---
 .../python-modules/gunicorn/19.nix            | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  5 ++-
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/gunicorn/19.nix

diff --git a/pkgs/development/python-modules/gunicorn/19.nix b/pkgs/development/python-modules/gunicorn/19.nix
new file mode 100644
index 000000000000..f9681eef97e3
--- /dev/null
+++ b/pkgs/development/python-modules/gunicorn/19.nix
@@ -0,0 +1,39 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, coverage
+, mock
+, pytest
+, pytestcov
+, setuptools
+}:
+
+buildPythonPackage rec {
+  pname = "gunicorn";
+  version = "19.10.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1080jk1ly8j0rc6lv8i33sj94rxjaskd1732cdq5chdqb3ij9ppr";
+  };
+
+  propagatedBuildInputs = [ setuptools ];
+
+  checkInputs = [ pytest mock pytestcov coverage ];
+
+  prePatch = ''
+    substituteInPlace requirements_test.txt --replace "==" ">=" \
+      --replace "coverage>=4.0,<4.4" "coverage"
+  '';
+
+  # better than no tests
+  checkPhase = ''
+    $out/bin/gunicorn --help > /dev/null
+  '';
+
+  pythonImportsCheck = [ "gunicorn" ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/benoitc/gunicorn";
+    description = "WSGI HTTP Server for UNIX";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index de926517fbce..04fd9e76192d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3802,7 +3802,10 @@ in {
 
   rebulk = callPackage ../development/python-modules/rebulk { };
 
-  gunicorn = callPackage ../development/python-modules/gunicorn { };
+  gunicorn = if isPy27 then
+          callPackage ../development/python-modules/gunicorn/19.nix { }
+        else
+          callPackage ../development/python-modules/gunicorn { };
 
   hawkauthlib = callPackage ../development/python-modules/hawkauthlib { };
 

From 212b24a566ffd1e30fdecf179a8777355dacab18 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 10 Feb 2020 19:27:45 -0800
Subject: [PATCH 0291/4636] python3Packages.gunicorn: fix homepage

---
 pkgs/development/python-modules/gunicorn/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix
index 75a3d745a3f5..8bdc42969032 100644
--- a/pkgs/development/python-modules/gunicorn/default.nix
+++ b/pkgs/development/python-modules/gunicorn/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "gunicorn" ];
 
   meta = with stdenv.lib; {
-    homepage = https://pypi.python.org/pypi/gunicorn;
+    homepage = "https://github.com/benoitc/gunicorn";
     description = "WSGI HTTP Server for UNIX";
     license = licenses.mit;
   };

From 6cb26aecd009480e46cf268875972e06a9a73a11 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 11 Feb 2020 04:38:10 +0000
Subject: [PATCH 0292/4636] you-get: 0.4.1388 -> 0.4.1403

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

diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix
index 223fb4883aee..466813ee75f7 100644
--- a/pkgs/tools/misc/you-get/default.nix
+++ b/pkgs/tools/misc/you-get/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonApplication rec {
   pname = "you-get";
-  version = "0.4.1388";
+  version = "0.4.1403";
 
   # Tests aren't packaged, but they all hit the real network so
   # probably aren't suitable for a build environment anyway.
@@ -10,7 +10,7 @@ buildPythonApplication rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1afnyb5srs0prqm73pz5qbfk5j4lb5g70nqg41r4igh753p2yi13";
+    sha256 = "195c91xxcv3l3rd0v8ls5ghncf92ndfx0lpcbjr5zb41bl8alkcl";
   };
 
   meta = with stdenv.lib; {

From 6c52b3ade9cc43bbb15f88297493b8505968887b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 4 Feb 2020 09:49:23 +0100
Subject: [PATCH 0293/4636] =?UTF-8?q?ocamlPackages.reason:=203.5.1=20?=
 =?UTF-8?q?=E2=86=92=203.5.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/compilers/reason/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix
index 20286dcc43c9..ef27fc41b077 100644
--- a/pkgs/development/compilers/reason/default.nix
+++ b/pkgs/development/compilers/reason/default.nix
@@ -1,24 +1,23 @@
 { stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune
-, menhir, merlin-extend, ppx_tools_versioned, utop, cppo
-, ocaml_lwt
+, fix, menhir, merlin-extend, ppx_tools_versioned, utop, cppo
 }:
 
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-reason-${version}";
-  version = "3.5.1";
+  version = "3.5.4";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "reason";
-    rev = "aea245a43eb44034d2fccac7028b640a437af239";
-    sha256 = "0ff7rjxbsg9zkq6sxlm9bkx7yk8x2cvras7z8436msczgd1wmmyf";
+    rev = "e3287476e5c3f0cbcd9dc7ab18d290f81f4afa0c";
+    sha256 = "02p5d1x6lr7jp9mvgvsas3nnq3a97chxp5q6rl07n5qm61d5b4dl";
   };
 
   nativeBuildInputs = [ makeWrapper ];
 
   propagatedBuildInputs = [ menhir merlin-extend ppx_tools_versioned ];
 
-  buildInputs = [ ocaml findlib dune cppo utop menhir ];
+  buildInputs = [ ocaml findlib dune cppo fix utop menhir ];
 
   buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed
 
@@ -27,8 +26,8 @@ stdenv.mkDerivation rec {
   postInstall = ''
     wrapProgram $out/bin/rtop \
       --prefix PATH : "${utop}/bin" \
-      --prefix CAML_LD_LIBRARY_PATH : "${ocaml_lwt}/lib/ocaml/${ocaml.version}/site-lib" \
-      --prefix OCAMLPATH : "$out/lib/ocaml/${ocaml.version}/site-lib"
+      --prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH" \
+      --prefix OCAMLPATH : "$OCAMLPATH:$OCAMLFIND_DESTDIR"
   '';
 
   meta = with stdenv.lib; {

From c81a2e6a1ee5cc4f4571b480599af9e33da70353 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Sun, 5 Jan 2020 14:10:50 -0500
Subject: [PATCH 0294/4636] ocamlPackages.npy: init at unstable-2019-04-02

---
 .../development/ocaml-modules/npy/default.nix | 27 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  4 +++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/npy/default.nix

diff --git a/pkgs/development/ocaml-modules/npy/default.nix b/pkgs/development/ocaml-modules/npy/default.nix
new file mode 100644
index 000000000000..87fd72b7567a
--- /dev/null
+++ b/pkgs/development/ocaml-modules/npy/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildDunePackage, fetchFromGitHub, numpy, camlzip }:
+
+buildDunePackage rec {
+  pname = "npy";
+  version = "unstable-2019-04-02";
+
+  minimumOCamlVersion = "4.06";
+
+  src = fetchFromGitHub {
+    owner = "LaurentMazare";
+    repo   = "${pname}-ocaml";
+    rev    = "c051086bfea6bee58208098bcf1c2f725a80a1fb";
+    sha256 = "06mgrnm7xiw2lhqvbdv2zmd65sqfdnjd7j4qmcswanmplm17yhvb";
+  };
+
+  propagatedBuildInputs = [ camlzip ];
+  checkInputs = [ numpy ];
+
+  doCheck = true;
+
+  meta = with lib; {
+    inherit (src.meta) homepage;
+    description = "OCaml implementation of the Npy format spec";
+    maintainers = [ maintainers.bcdarwin ];
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 56ae90ae3920..baa1d862e53e 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -558,6 +558,10 @@ let
       lwt = ocaml_lwt;
     };
 
+    npy = callPackage ../development/ocaml-modules/npy {
+      inherit (pkgs.python3Packages) numpy;
+    };
+
     num = if lib.versionOlder "4.06" ocaml.version
       then callPackage ../development/ocaml-modules/num {}
       else null;

From 7cc5d84cd79c31db524acd31556cf97675e7596d Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 10 Feb 2020 18:06:54 -0500
Subject: [PATCH 0295/4636] libtasn1: fix on darwin

Test binaries are linked to the libraries at their install path, but
those are not installed when checkPhase executes.
---
 pkgs/development/libraries/libtasn1/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index 215d67dc0b10..d266817c5d77 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ texinfo perl ];
 
   doCheck = true;
+  preCheck = if stdenv.isDarwin then
+    "export DYLD_LIBRARY_PATH=`pwd`/lib/.libs"
+  else
+    null;
 
   meta = with stdenv.lib; {
     homepage = https://www.gnu.org/software/libtasn1/;

From 92f660e2542fe9b3b4babe8c80e1d282a31aa779 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 10 Feb 2020 16:29:02 +0100
Subject: [PATCH 0296/4636] nss: 3.48 -> 3.49.2

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

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 2e611c8975d7..fc2763486d1e 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -5,7 +5,7 @@ let
     url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz;
     sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
   };
-  version = "3.48";
+  version = "3.49.2";
   underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
 
 in stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
-    sha256 = "1b7qs1q7jqhw9dvkdznanzhc5dyq4bwx0biywszy3qx4hqm8571z";
+    sha256 = "1ck0c4ikr0d747pn63h62b2iqzfgi0yzd25aw95hs9797hn519zs";
   };
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];

From 4959c970ee991a5c1b049649ccd392a9c2a2ca79 Mon Sep 17 00:00:00 2001
From: "Markus S. Wamser" <github-dev@mail2013.wamser.eu>
Date: Wed, 22 Jan 2020 21:22:12 +0100
Subject: [PATCH 0297/4636] sqlite: 3.30.1 -> 3.31.0 (security)

---
 pkgs/development/libraries/sqlite/analyzer.nix | 6 +++---
 pkgs/development/libraries/sqlite/default.nix  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix
index 6de71d066ade..2b287c7cc617 100644
--- a/pkgs/development/libraries/sqlite/analyzer.nix
+++ b/pkgs/development/libraries/sqlite/analyzer.nix
@@ -6,11 +6,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "sqlite-analyzer";
-  version = "3.30.0";
+  version = "3.31.0";
 
   src = assert version == sqlite.version; fetchurl {
-    url = "https://sqlite.org/2019/sqlite-src-${archiveVersion version}.zip";
-    sha256 = "0d4i87q0f618pmrgax0mr5x7m8bywikrwjvixag3biyhgl5rx7fd";
+    url = "https://sqlite.org/2020/sqlite-src-${archiveVersion version}.zip";
+    sha256 = "1dz3s3q9gsxxfj9wp4lqndzpwd1hcvm42yqn02p0l0bs6bw0mp5l";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index d904637fcd38..fe0eb54cf114 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -10,12 +10,12 @@ in
 
 stdenv.mkDerivation rec {
   pname = "sqlite";
-  version = "3.30.1";
+  version = "3.31.0";
 
   # NB! Make sure to update analyzer.nix src (in the same directory).
   src = fetchurl {
-    url = "https://sqlite.org/2019/sqlite-autoconf-${archiveVersion version}.tar.gz";
-    sha256 = "0q4f57a5995wz9c7dfiqy9zwl0kn0b900nxwinqa3llv13dm0nlc";
+    url = "https://sqlite.org/2020/sqlite-autoconf-${archiveVersion version}.tar.gz";
+    sha256 = "1w7i954349sjd5a6rvy118prra43k07y9hy8rpajs6vmjmnnx7bw";
   };
 
   outputs = [ "bin" "dev" "out" ];

From 8b260ebe688f002853a643f0c0a58d765550f69b Mon Sep 17 00:00:00 2001
From: Elyhaka <57923898+Elyhaka@users.noreply.github.com>
Date: Tue, 11 Feb 2020 08:08:36 +0100
Subject: [PATCH 0298/4636] pop-gtk-theme: 2019-12-17 -> 2020-02-10

---
 pkgs/data/themes/pop-gtk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/themes/pop-gtk/default.nix b/pkgs/data/themes/pop-gtk/default.nix
index 151fadddc16c..9bb2beae4d31 100644
--- a/pkgs/data/themes/pop-gtk/default.nix
+++ b/pkgs/data/themes/pop-gtk/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pop-gtk-theme";
-  version = "2019-12-17";
+  version = "2020-02-10";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "gtk-theme";
-    rev = "77601545f049251bce9c63a07f0d9819aa27cb60";
-    sha256 = "0bmkcdr1z9m3inrw33zprq2a4jawql4724a84nr89r19xllj2z1s";
+    rev = "ed888e9dd5de142cb899e362beedaf694594cc7e";
+    sha256 = "0ryr1jx9pzij6pkv7sam07f90w5lbrzx0fj5vdxl94612mh76aad";
   };
 
   nativeBuildInputs = [

From 065175540bd82747a822467c05971e519ade46ce Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 11 Feb 2020 07:37:57 +0000
Subject: [PATCH 0299/4636] fluent-bit: 1.3.6 -> 1.3.7

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

diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix
index 4e1a18efde4d..042ed2b03341 100644
--- a/pkgs/tools/misc/fluent-bit/default.nix
+++ b/pkgs/tools/misc/fluent-bit/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fluent-bit";
-  version = "1.3.6";
+  version = "1.3.7";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     rev = "v${version}";
-    sha256 = "0gkn5axjxaa52f3w2qxwwab4m46xrxymbkcpw1v1jihil34pxw7a";
+    sha256 = "1j0fzhakk4kpfpq4p4c0byw99adxd9w7irfn83rlvw8bw32j2lrj";
   };
 
   nativeBuildInputs = [ cmake flex bison ];

From 7a625e745346fbc87952a7af23ae6c88ade80ede Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 10 Feb 2020 18:01:47 +0100
Subject: [PATCH 0300/4636] nixos/tests/firefox: support running the test with
 the firefox ESR version

Also adds this to the release jobset.
---
 nixos/release-combined.nix | 1 +
 nixos/tests/all-tests.nix  | 1 +
 nixos/tests/firefox.nix    | 6 ++++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 641699818769..41f8c3d9d52f 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -66,6 +66,7 @@ in rec {
         (all nixos.tests.containers-ip)
         nixos.tests.chromium.x86_64-linux or []
         (all nixos.tests.firefox)
+        (all nixos.tests.firefox-esr)
         (all nixos.tests.firewall)
         (all nixos.tests.fontconfig-default-fonts)
         (all nixos.tests.gnome3-xorg)
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 33c6441dbc80..671f87a43944 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -88,6 +88,7 @@ in
   fancontrol = handleTest ./fancontrol.nix {};
   ferm = handleTest ./ferm.nix {};
   firefox = handleTest ./firefox.nix {};
+  firefox-esr = handleTest ./firefox.nix { esr = true; };
   firewall = handleTest ./firewall.nix {};
   fish = handleTest ./fish.nix {};
   flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {};
diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix
index 56ddabbae771..7071baceba73 100644
--- a/nixos/tests/firefox.nix
+++ b/nixos/tests/firefox.nix
@@ -1,4 +1,4 @@
-import ./make-test-python.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ pkgs, esr ? false, ... }: {
   name = "firefox";
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ eelco shlevy ];
@@ -8,7 +8,9 @@ import ./make-test-python.nix ({ pkgs, ... }: {
     { pkgs, ... }:
 
     { imports = [ ./common/x11.nix ];
-      environment.systemPackages = [ pkgs.firefox pkgs.xdotool ];
+      environment.systemPackages =
+        (if esr then [ pkgs.firefox-esr ] else [ pkgs.firefox ])
+        ++ [ pkgs.xdotool ];
     };
 
   testScript = ''

From 717d1e85a57b186836ade3c980feb0b0b6bef6c2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 11 Feb 2020 08:12:43 +0000
Subject: [PATCH 0301/4636] go-jsonnet: 0.14.0 -> 0.15.0

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

diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix
index 949190903673..a39ee351f21e 100644
--- a/pkgs/development/compilers/go-jsonnet/default.nix
+++ b/pkgs/development/compilers/go-jsonnet/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "go-jsonnet";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "go-jsonnet";
     rev = "v${version}";
-    sha256 = "1q0mpydh8h0zrml605q9r259y8584kbwcr9g4sqcb1n13b4d1sgp";
+    sha256 = "0l6cwky2xl7m8nnc9abp76bhkdcf2ldbbv3r8p30xv2yr5wd1j8i";
   };
 
   modSha256 = "1b6hz5a66hhlzpcv1badxr1b4nmk4lw0507d5jks7lqzvvwd0sxq";

From a8fe9e7affb27e803b5cfaa134019b028b25b8f0 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Tue, 11 Feb 2020 10:10:19 +1100
Subject: [PATCH 0302/4636] delly: 0.8.1 -> 0.8.2

Backported patch required for htslib 1.10.2
---
 .../science/biology/delly/default.nix           | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/biology/delly/default.nix b/pkgs/applications/science/biology/delly/default.nix
index bfdf5a1bb17e..a6c45f8aa44e 100644
--- a/pkgs/applications/science/biology/delly/default.nix
+++ b/pkgs/applications/science/biology/delly/default.nix
@@ -1,16 +1,25 @@
-{ stdenv, fetchFromGitHub, htslib, zlib, bzip2, lzma, ncurses, boost }:
+{ stdenv, fetchpatch, fetchFromGitHub, htslib, zlib, bzip2, lzma, ncurses, boost }:
 
-stdenv.mkDerivation rec {
+let
+  htslibPatch = fetchpatch {
+    url = "https://github.com/dellytools/delly/commit/0e5c710b0c5ea790bb39699d4cbd49cf4fb86f14.diff";
+    sha256 = "09bz1qqvzhdzm99hf9zgrv80kq9jlr1m2mdvx96p2hk5lpnbdl7y";
+    excludes = [ "src/htslib" ];
+  };
+
+in stdenv.mkDerivation rec {
   pname = "delly";
-  version = "0.8.1";
+  version = "0.8.2";
 
   src = fetchFromGitHub {
       owner = "dellytools";
       repo = pname;
       rev = "v${version}";
-      sha256 = "18gm86j1g1k4z1cjv2m5v9rsl1xqs2w3dhwcsnzx2mhkrvmlc4i1";
+      sha256 = "14bkmixz7737xj192ww96s3a20zc7xs7r04db8avw3ggi3i1s1cs";
   };
 
+  patches = [ htslibPatch ];
+
   buildInputs = [ zlib htslib bzip2 lzma ncurses boost ];
 
   EBROOTHTSLIB = htslib;

From 7e8a31126d4ab5e03ec4b9f018cdbbf074602fb0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 11 Feb 2020 08:38:05 +0000
Subject: [PATCH 0303/4636] grabserial: 1.9.9 -> 2.0.2

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

diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/development/tools/grabserial/default.nix
index 5e06e9f771d9..ce336241b65d 100644
--- a/pkgs/development/tools/grabserial/default.nix
+++ b/pkgs/development/tools/grabserial/default.nix
@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "grabserial";
-  version = "1.9.9";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "tbird20d";
     repo = "grabserial";
     rev = "v${version}";
-    sha256 = "0cwrajkh605gfhshrlpbc32gmx86a8kv3pq7cv713k60sgqrgpqx";
+    sha256 = "0ryk4w8q6zfmia71nwnk5b7xaxw0sf45dw9q50xp7k76i3k5f9f3";
   };
 
   propagatedBuildInputs = [ pythonPackages.pyserial ];

From f216b03d5b01490aadc54e5e9d5e3cb607816262 Mon Sep 17 00:00:00 2001
From: ahiaao <ahiaao@waifu.club>
Date: Fri, 31 Jan 2020 22:34:41 -0800
Subject: [PATCH 0304/4636] tigervnc: fix compatibility with xorgserver 1.20.7

---
 pkgs/tools/admin/tigervnc/default.nix         |  2 ++
 ...org-server-1.20.7-ddxInputThreadInit.patch | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/tools/admin/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patch

diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index 1c2243d04f11..9f105a7d5d55 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
 
   inherit fontDirectories;
 
+  patches = [ ./u_xorg-server-1.20.7-ddxInputThreadInit.patch ];
+
   postPatch = ''
     sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver
     fontPath=
diff --git a/pkgs/tools/admin/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patch b/pkgs/tools/admin/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patch
new file mode 100644
index 000000000000..c18f4bf213f2
--- /dev/null
+++ b/pkgs/tools/admin/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patch
@@ -0,0 +1,21 @@
+Origin: https://build.opensuse.org/package/view_file/X11:XOrg/tigervnc/u_xorg-server-1.20.7-ddxInputThreadInit.patch
+diff -u -p -r tigervnc-1.10.0.old/unix/xserver/hw/vnc/xvnc.c tigervnc-1.10.0/unix/xserver/hw/vnc/xvnc.c
+--- tigervnc-1.10.0.old/unix/xserver/hw/vnc/xvnc.c	2020-01-15 11:19:19.486731848 +0000
++++ tigervnc-1.10.0/unix/xserver/hw/vnc/xvnc.c	2020-01-15 11:37:33.275445409 +0000
+@@ -295,6 +295,15 @@ void ddxBeforeReset(void)
+ }
+ #endif
+ 
++#if INPUTTHREAD
++/** This function is called in Xserver/os/inputthread.c when starting
++    the input thread. */
++void
++ddxInputThreadInit(void)
++{
++}
++#endif
++
+ void ddxUseMsg(void)
+ {
+     vncPrintBanner();
+

From 5dc70e89c48edf4be3a2e6cccce576572536487c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 11 Feb 2020 09:10:51 +0000
Subject: [PATCH 0305/4636] hugo: 0.64.0 -> 0.64.1

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

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 6ab297c69700..18f7153b1eb9 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "hugo";
-  version = "0.64.0";
+  version = "0.64.1";
 
   goPackagePath = "github.com/gohugoio/hugo";
 
@@ -10,7 +10,7 @@ buildGoModule rec {
     owner = "gohugoio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "10zbi2414c9grqhi9vcj3sczjh7hf20dihvcsirj551fmiqxrvpy";
+    sha256 = "1h5n5d7g3l2lp25sjrcmavbkqqm1csgv2q5z7afwbb57j0m1nkn8";
   };
 
   modSha256 = "18wfsp3ypfxj5qljmb19kzyc5byf413nkabz5mfvq8srjhcq1ifl";

From c2b9f7aae2c1f991c767ca6fac46024be1ad6539 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 11 Feb 2020 04:20:00 -0500
Subject: [PATCH 0306/4636] ncspot: 0.1.1 -> 0.1.2

Changelog: https://github.com/hrkfdn/ncspot/releases/tag/v0.1.2
---
 pkgs/applications/audio/ncspot/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix
index 136f6fc1427d..5bf091adbdf9 100644
--- a/pkgs/applications/audio/ncspot/default.nix
+++ b/pkgs/applications/audio/ncspot/default.nix
@@ -12,16 +12,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "ncspot";
-  version = "0.1.1";
+  version = "0.1.2";
 
   src = fetchFromGitHub {
     owner = "hrkfdn";
     repo = "ncspot";
     rev = "v${version}";
-    sha256 = "0ldisr45w6ys1j62qv99ssqfg5q9dwrrzxh2maggyrx1zqdlsk6m";
+    sha256 = "10jp2yh8jlvdwh297658q9fi3i62vwsbd9fbwjsir7s1c9bgdy8k";
   };
 
-  cargoSha256 = "0k765hinqxfm30li1z66m1chsv69v6hiz109q2zlkxzg937qbnjh";
+  cargoSha256 = "1gw8wvms1ry2shvm3c79wp5nkpc39409af4qfm5hd4wgz2grh8d2";
 
   cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
 

From a27ceaa56596af9402837bbc1e948f50fbefbea5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 11 Feb 2020 10:04:03 +0000
Subject: [PATCH 0307/4636] krohnkite: 0.6 -> 0.6.1

---
 pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix b/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix
index c568aa8b8705..569ba1571f80 100644
--- a/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix
+++ b/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix
@@ -3,13 +3,13 @@
 
 mkDerivation rec {
   pname = "krohnkite";
-  version = "0.6";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "esjeon";
     repo = "krohnkite";
     rev = "v${version}";
-    sha256 = "0gib39vvnpdynyfqfrkzri67dhr4lf3zpk3njw4zzkz97c8k6psq";
+    sha256 = "1rjmpnd5fc5dmxwq9pr0l858185h4580fhicgaywx9l3nppam72a";
   };
 
   buildInputs = [

From be5597fc9d2f4fefac097d3c6e9364bedf548078 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 11 Feb 2020 11:48:45 +0100
Subject: [PATCH 0308/4636] buildRustCrate: remove superfluous dependency
 overrides
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

By overriding each dependency on every level of the dependency tree we
are creating a lot of unnecessary instances of the same derivation

Looking at the output size of `nix-instantiate --trace-function-calls
-vvvv …` and the execution time I got about a 10x improvement after
applying this change.

It was probably good intentions that lead to these overrides but in
practice no tooling (that I know of) really needs this. `carnix` and
`crate2nix` are fine without those overrides. Furthermore I believe that
it is the job of the tooling around `buildRustCrate` to provide a
coherent set of overrides. By not enforcing all of the overrides, debug
flags, verbosity, … to be the same throughout the closure we also allow
consumers to override specific aspects of the crates. Some (older?)
crates might need different `crateOverrides` then newer crates with the
same name. Currently such situations can not (easily) be implemented
with the override in-place.
---
 pkgs/build-support/rust/build-rust-crate/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix
index 569b48d25aea..94b64a1225cb 100644
--- a/pkgs/build-support/rust/build-rust-crate/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/default.nix
@@ -62,9 +62,6 @@ let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverr
     extraRustcOpts_ = extraRustcOpts;
     buildTests_ = buildTests;
 
-    # take a list of crates that we depend on and override them to fit our overrides, rustc, release, …
-    makeDependencies = map (dep: lib.getLib (dep.override { inherit release verbose crateOverrides; }));
-
     # crate2nix has a hack for the old bash based build script that did split
     # entries at `,`. No we have to work around that hack.
     # https://github.com/kolloch/crate2nix/blame/5b19c1b14e1b0e5522c3e44e300d0b332dc939e7/crate2nix/templates/build.nix.tera#L89
@@ -93,8 +90,8 @@ stdenv.mkDerivation (rec {
     name = "rust_${crate.crateName}-${crate.version}${lib.optionalString buildTests_ "-test"}";
     depsBuildBuild = [ rust stdenv.cc ];
     buildInputs = (crate.buildInputs or []) ++ buildInputs_;
-    dependencies = makeDependencies dependencies_;
-    buildDependencies = makeDependencies buildDependencies_;
+    dependencies = map lib.getLib dependencies_;
+    buildDependencies = map lib.getLib buildDependencies_;
 
     completeDeps = lib.unique (dependencies ++ lib.concatMap (dep: dep.completeDeps) dependencies);
     completeBuildDeps = lib.unique (

From 6222192872b758f06488afc78affe04c35f09204 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 11 Feb 2020 12:01:57 +0000
Subject: [PATCH 0309/4636] openblas: 0.3.7 -> 0.3.8

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

diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index a26cf38a9d09..9c411234357a 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -88,12 +88,12 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "openblas";
-  version = "0.3.7";
+  version = "0.3.8";
   src = fetchFromGitHub {
     owner = "xianyi";
     repo = "OpenBLAS";
     rev = "v${version}";
-    sha256 = "0vs1dlzyla02wajpkfzz8x3lfpgmwiaaizq2nmdjbkzkb7jnxhhz";
+    sha256 = "0s017qqi4n6jzrxl9cyx625wj26smnyn5g8s699s7h8v1srlrw6p";
   };
 
   inherit blas64;

From 87d9d9a374b2bd18a87bd953caf043f457304c47 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 11 Feb 2020 21:15:08 +0900
Subject: [PATCH 0310/4636] flashplayer: 32.0.0.314 -> 32.0.0.330

---
 .../networking/browsers/chromium/plugins.nix           |  4 ++--
 .../browsers/mozilla-plugins/flashplayer/default.nix   | 10 +++++-----
 .../mozilla-plugins/flashplayer/standalone.nix         |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index c4a09c8063db..e600d134e9c0 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -45,11 +45,11 @@ let
 
   flash = stdenv.mkDerivation rec {
     pname = "flashplayer-ppapi";
-    version = "32.0.0.314";
+    version = "32.0.0.330";
 
     src = fetchzip {
       url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 = "05xcscpzglpfpiiqc3ngs5snxli99irjk18g5vdhw91jk9808gnl";
+      sha256 = "08gpx0fq0r1sz5smfdgv4fkfwq1hdijv4dw432d6jdz8lq09y1nk";
       stripRoot = false;
     };
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 5ecb6bfb0766..3d711f92d1c9 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -74,7 +74,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "flashplayer";
-  version = "32.0.0.314";
+  version = "32.0.0.330";
 
   src = fetchurl {
     url =
@@ -85,14 +85,14 @@ stdenv.mkDerivation rec {
     sha256 =
       if debug then
         if arch == "x86_64" then
-          "076l93wjcy15sic88cyq6msp87gdhcvbk4ym2vbvvjz2bav2z456"
+          "1k7h1p6g1vf96v31j1n8638jdxacap0729n0dnmh6l0h5q518k1b"
         else
-          "0kxr8d6fh00akqgk3lwv0z6rk7xswislicsbh9b9p33f19mj7c8a"
+          "0gabgllx79s6rhv0zivfj6z79rcsdrzrdm94xdr19c11dsbqxd6b"
       else
         if arch == "x86_64" then
-          "0a3hvp0qmqlann8k875ajf0i70cv0an1a3mr8kbgji46dxqvwjxz"
+          "1pf3k1x8c2kbkc9pf9y5n4jilp3g41v8v0q5ng77sbnl92s35zsj"
         else
-          "0jyywas2z7ssgzng82qgnp01gy6nccqavkbx9529m07xrclvqbxn";
+          "1xibm6ffm09c553g100cgb6grnk21dfq8m81yy0jskph157vg962";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index 353aff7e707e..b003a1b3f5c0 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -50,7 +50,7 @@
 
 stdenv.mkDerivation {
   pname = "flashplayer-standalone";
-  version = "32.0.0.314";
+  version = "32.0.0.330";
 
   src = fetchurl {
     url =
@@ -60,9 +60,9 @@ stdenv.mkDerivation {
         "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
     sha256 =
       if debug then
-        "0zlin94rip13rn58m7v5l6m20ylnw59l77rbg5j5qyxkr53zawdz"
+        "0wrkg2in4c0bnbifm06m4rdggzs8zbaxwrh6z3mpbf4p3bl6xg84"
       else
-        "0pfrm02iwa01pqx3adqj0sw27p1ddlz9knjky6x248ak8zywsqr2";
+        "08qxa3zanlgmn8sn7crz242adx10jqymd4gzf1m0zlczw20ar09c";
   };
 
   nativeBuildInputs = [ unzip ];

From a72367ae315765a89c9667948b6961e0d80dfd31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Tue, 11 Feb 2020 11:53:54 +0100
Subject: [PATCH 0311/4636] fftw: Re-enable OpenMP with non-GCC and musl.

Clang now supports OpenMP, and musl has no problem with it either.

Related to #7023 and #34645.

See also #79818.
---
 pkgs/development/libraries/fftw/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix
index c9577436c300..fcbcde745380 100644
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/pkgs/development/libraries/fftw/default.nix
@@ -1,7 +1,8 @@
-{ fetchurl, stdenv, lib, precision ? "double", perl }:
+{ fetchurl, stdenv, lib, llvmPackages ? null, precision ? "double", perl }:
 
 with lib;
 
+assert stdenv.cc.isClang -> llvmPackages != null;
 assert elem precision [ "single" "double" "long-double" "quad-precision" ];
 
 let
@@ -24,6 +25,11 @@ stdenv.mkDerivation {
     ++ optional withDoc "info"; # it's dev-doc only
   outputBin = "dev"; # fftw-wisdom
 
+  buildInputs = lib.optionals stdenv.cc.isClang [
+    # TODO: This may mismatch the LLVM version sin the stdenv, see #79818.
+    llvmPackages.openmp
+  ];
+
   configureFlags =
     [ "--enable-shared"
       "--enable-threads"
@@ -32,7 +38,7 @@ stdenv.mkDerivation {
     # all x86_64 have sse2
     # however, not all float sizes fit
     ++ optional (stdenv.isx86_64 && (precision == "single" || precision == "double") )  "--enable-sse2"
-    ++ optional (stdenv.cc.isGNU && !stdenv.hostPlatform.isMusl) "--enable-openmp"
+    ++ [ "--enable-openmp" ]
     # doc generation causes Fortran wrapper generation which hard-codes gcc
     ++ optional (!withDoc) "--disable-doc";
 

From 0b2a15fdddd0494b2bfebef80d975bdd6eeb351f Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 11 Feb 2020 00:00:00 -0500
Subject: [PATCH 0312/4636] luaPackages.cassowary: init at 2.2-1

---
 maintainers/scripts/luarocks-packages.csv       |  1 +
 .../lua-modules/generated-packages.nix          | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 01e3150ede13..62f9fa722d96 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -6,6 +6,7 @@ basexx,,,,,
 binaryheap,,,,,vcunat
 bit32,,,,lua5_1,lblasc
 busted,,,,,
+cassowary,,,,,marsam
 cjson,lua-cjson,,,,
 compat53,,,,,vcunat
 coxpcall,,,1.17.0-1,,
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index d95ce128b737..1090123416ef 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -158,6 +158,23 @@ busted = buildLuarocksPackage {
     };
   };
 };
+cassowary = buildLuarocksPackage {
+  pname = "cassowary";
+  version = "2.2-1";
+
+  src = fetchurl {
+    url    = mirror://luarocks/cassowary-2.2-1.src.rock;
+    sha256 = "0laghzk5jbap5rfd8sasnrdrbda649sfciarba8rhygm0qni1azy";
+  };
+  propagatedBuildInputs = [ lua penlight ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/simoncozens/cassowary.lua";
+    description = "The cassowary constraint solver.";
+    maintainers = with maintainers; [ marsam ];
+    license.fullName = "Apache 2";
+  };
+};
 cjson = buildLuarocksPackage {
   pname = "lua-cjson";
   version = "2.1.0.6-1";

From 7d64380b6b032323e6bd1378d599410f73f1c409 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 11 Feb 2020 00:01:00 -0500
Subject: [PATCH 0313/4636] luaPackages.cosmo: init at 16.06.04-1

---
 maintainers/scripts/luarocks-packages.csv       |  1 +
 .../lua-modules/generated-packages.nix          | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 62f9fa722d96..cb934ae37525 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -9,6 +9,7 @@ busted,,,,,
 cassowary,,,,,marsam
 cjson,lua-cjson,,,,
 compat53,,,,,vcunat
+cosmo,,,,,marsam
 coxpcall,,,1.17.0-1,,
 cqueues,,,,,vcunat
 cyrussasl,,,,,vcunat
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 1090123416ef..58af59c1971e 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -214,6 +214,23 @@ compat53 = buildLuarocksPackage {
     };
   };
 };
+cosmo = buildLuarocksPackage {
+  pname = "cosmo";
+  version = "16.06.04-1";
+
+  src = fetchurl {
+    url    = mirror://luarocks/cosmo-16.06.04-1.src.rock;
+    sha256 = "1adrk74j0x1yzhy0xz9k80hphxdjvm09kpwpbx00sk3kic6db0ww";
+  };
+  propagatedBuildInputs = [ lpeg ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://cosmo.luaforge.net";
+    description = "Safe templates for Lua";
+    maintainers = with maintainers; [ marsam ];
+    license.fullName = "MIT/X11";
+  };
+};
 coxpcall = buildLuarocksPackage {
   pname = "coxpcall";
   version = "1.17.0-1";

From cceb24e5a178bdf29c43ea50c961201d02e71ce4 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan <caleb@alerque.com>
Date: Wed, 15 Jan 2020 11:33:31 +0300
Subject: [PATCH 0314/4636] sile: v0.9.5.1 -> v0.10.0, adjust build process

---
 pkgs/tools/typesetting/sile/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix
index 3b6ec809869d..6fbebcefae97 100644
--- a/pkgs/tools/typesetting/sile/default.nix
+++ b/pkgs/tools/typesetting/sile/default.nix
@@ -1,23 +1,23 @@
 { stdenv, darwin, fetchurl, makeWrapper, pkgconfig
 , harfbuzz, icu
 , fontconfig, lua, libiconv
-, makeFontsConf, gentium, gentium-book-basic, dejavu_fonts
+, makeFontsConf, gentium
 }:
 
 with stdenv.lib;
 
 let
-  luaEnv = lua.withPackages(ps: with ps;[ lpeg luaexpat lua-zlib luafilesystem luasocket luasec]);
+  luaEnv = lua.withPackages(ps: with ps;[cassowary linenoise lpeg lua-zlib lua_cliargs luaepnf luaexpat luafilesystem luarepl luasec luasocket stdlib vstruct]);
 
 in
 
 stdenv.mkDerivation rec {
   pname = "sile";
-  version = "0.9.5.1";
+  version = "0.10.0";
 
   src = fetchurl {
-    url = "https://github.com/simoncozens/sile/releases/download/v${version}/${pname}-${version}.tar.bz2";
-    sha256 = "0fh0jbpsyqyq0hzq4midn7yw2z11hqdgqb9mmgz766cp152wrkb0";
+    url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.bz2";
+    sha256 = "b0353b88793d68bf3e800f87bff51e8161ce39d250e22dff11385712caf332b6";
   };
 
   nativeBuildInputs = [pkgconfig makeWrapper];
@@ -34,8 +34,6 @@ stdenv.mkDerivation rec {
   FONTCONFIG_FILE = makeFontsConf {
     fontDirectories = [
       gentium
-      gentium-book-basic
-      dejavu_fonts
     ];
   };
 
@@ -46,11 +44,12 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   checkPhase = ''
-    make documentation/developers.pdf documentation/sile.pdf
+    make documentation examples
   '';
 
   postInstall = ''
-    install -D -t $out/share/doc/sile documentation/*.pdf
+    install -D -t $out/share/doc/sile documentation/sile.pdf
+    install -D -t $out/share/doc/sile examples
   '';
 
   # Hack to avoid TMPDIR in RPATHs.

From df44e2e2b3a0d2884dbf981b4c11eef75b8689ec Mon Sep 17 00:00:00 2001
From: Caleb Maclennan <caleb@alerque.com>
Date: Fri, 24 Jan 2020 23:57:43 +0300
Subject: [PATCH 0315/4636] =?UTF-8?q?sile:=20v0.10.0=20=E2=86=92=20v0.10.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix
index 6fbebcefae97..354f3c482444 100644
--- a/pkgs/tools/typesetting/sile/default.nix
+++ b/pkgs/tools/typesetting/sile/default.nix
@@ -13,11 +13,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "sile";
-  version = "0.10.0";
+  version = "0.10.1";
 
   src = fetchurl {
     url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.bz2";
-    sha256 = "b0353b88793d68bf3e800f87bff51e8161ce39d250e22dff11385712caf332b6";
+    sha256 = "a5ec924bfe8a629ec4b4d09754d822cab1cf48d28bc6ce649faa5c597a108666";
   };
 
   nativeBuildInputs = [pkgconfig makeWrapper];

From 870e509ef7ca897884cde0c705f73da68bc1f260 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan <caleb@alerque.com>
Date: Fri, 24 Jan 2020 23:57:43 +0300
Subject: [PATCH 0316/4636] sile: note manual comes precompiled in tarball

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

diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix
index 354f3c482444..fddf8020d3b9 100644
--- a/pkgs/tools/typesetting/sile/default.nix
+++ b/pkgs/tools/typesetting/sile/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   checkPhase = ''
-    make documentation examples
+    make examples
   '';
 
   postInstall = ''

From 928e6486aab41815aa03cf78574beea383ceb951 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan <caleb@alerque.com>
Date: Wed, 5 Feb 2020 11:57:54 +0300
Subject: [PATCH 0317/4636] sile: Bump to 0.10.3 and add missing lua dependency

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

diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix
index fddf8020d3b9..de82656dc303 100644
--- a/pkgs/tools/typesetting/sile/default.nix
+++ b/pkgs/tools/typesetting/sile/default.nix
@@ -7,17 +7,17 @@
 with stdenv.lib;
 
 let
-  luaEnv = lua.withPackages(ps: with ps;[cassowary linenoise lpeg lua-zlib lua_cliargs luaepnf luaexpat luafilesystem luarepl luasec luasocket stdlib vstruct]);
+  luaEnv = lua.withPackages(ps: with ps;[cassowary cosmo linenoise lpeg lua-zlib lua_cliargs luaepnf luaexpat luafilesystem luarepl luasec luasocket stdlib vstruct]);
 
 in
 
 stdenv.mkDerivation rec {
   pname = "sile";
-  version = "0.10.1";
+  version = "0.10.3";
 
   src = fetchurl {
     url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.bz2";
-    sha256 = "a5ec924bfe8a629ec4b4d09754d822cab1cf48d28bc6ce649faa5c597a108666";
+    sha256 = "d89d5ce7d2bf46fb062e5299ffd8b5d821dc3cb3462a0e7c1109edeee111d856";
   };
 
   nativeBuildInputs = [pkgconfig makeWrapper];

From 984256e05c9c1ede509f85753e1397aaa58fd8c7 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 11 Feb 2020 00:02:00 -0500
Subject: [PATCH 0318/4636] sile: fix build

---
 pkgs/tools/typesetting/sile/default.nix | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix
index de82656dc303..5bb4c5b7fb2f 100644
--- a/pkgs/tools/typesetting/sile/default.nix
+++ b/pkgs/tools/typesetting/sile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, darwin, fetchurl, makeWrapper, pkgconfig
+{ stdenv, darwin, fetchurl, makeWrapper, pkgconfig, autoconf, automake
 , harfbuzz, icu
 , fontconfig, lua, libiconv
 , makeFontsConf, gentium
@@ -7,7 +7,7 @@
 with stdenv.lib;
 
 let
-  luaEnv = lua.withPackages(ps: with ps;[cassowary cosmo linenoise lpeg lua-zlib lua_cliargs luaepnf luaexpat luafilesystem luarepl luasec luasocket stdlib vstruct]);
+  luaEnv = lua.withPackages(ps: with ps;[cassowary cosmo compat53 linenoise lpeg lua-zlib lua_cliargs luaepnf luaexpat luafilesystem luarepl luasec luasocket stdlib vstruct]);
 
 in
 
@@ -20,7 +20,9 @@ stdenv.mkDerivation rec {
     sha256 = "d89d5ce7d2bf46fb062e5299ffd8b5d821dc3cb3462a0e7c1109edeee111d856";
   };
 
-  nativeBuildInputs = [pkgconfig makeWrapper];
+  configureFlags = [ "--with-system-luarocks" ];
+
+  nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ];
   buildInputs = [ harfbuzz icu fontconfig libiconv luaEnv ]
   ++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit
   ;
@@ -37,19 +39,23 @@ stdenv.mkDerivation rec {
     ];
   };
 
-  doCheck = stdenv.targetPlatform == stdenv.hostPlatform
+  # TODO: needs to tweak Makefile-fonts to avoid download fonts
+  doCheck = false; /*stdenv.targetPlatform == stdenv.hostPlatform
   && ! stdenv.isAarch64 # random seg. faults
   && ! stdenv.isDarwin; # dy lib not found
+ */
 
   enableParallelBuilding = true;
 
-  checkPhase = ''
-    make examples
+  preBuild = stdenv.lib.optionalString stdenv.cc.isClang ''
+    substituteInPlace libtexpdf/dpxutil.c \
+      --replace "ASSERT(ht && ht->table && iter);" "ASSERT(ht && iter);"
   '';
 
+  checkTarget = "examples";
+
   postInstall = ''
     install -D -t $out/share/doc/sile documentation/sile.pdf
-    install -D -t $out/share/doc/sile examples
   '';
 
   # Hack to avoid TMPDIR in RPATHs.
@@ -69,7 +75,7 @@ stdenv.mkDerivation rec {
       technologies and borrowing some ideas from graphical systems
       such as InDesign.
     '';
-    homepage = http://www.sile-typesetter.org;
+    homepage = "https://sile-typesetter.org/";
     platforms = platforms.unix;
     license = licenses.mit;
   };

From 93943acbc5d795a34a0f933d3b31094fc2c7b78f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 10 Feb 2020 02:21:24 +0100
Subject: [PATCH 0319/4636] nixos/nixos-container: ensure that the state-dir is
 cleaned up if a build fails

---
 nixos/tests/containers-imperative.nix         | 15 +++++++++++
 .../nixos-container/nixos-container.pl        | 26 ++++++++++++++-----
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix
index 61df74042cb3..c4f2002918fc 100644
--- a/nixos/tests/containers-imperative.nix
+++ b/nixos/tests/containers-imperative.nix
@@ -46,6 +46,15 @@ import ./make-test-python.nix ({ pkgs, ...} : {
           };
         }
       '';
+      brokenCfg = pkgs.writeText "broken.nix" ''
+        {
+          assertions = [
+            { assertion = false;
+              message = "I never evaluate";
+            }
+          ];
+        }
+      '';
     in ''
       with subtest("Make sure we have a NixOS tree (required by ‘nixos-container create’)"):
           machine.succeed("PAGER=cat nix-env -qa -A nixos.hello >&2")
@@ -130,5 +139,11 @@ import ./make-test-python.nix ({ pkgs, ...} : {
       with subtest("Ensure that the container path is gone"):
           print(machine.succeed("ls -lsa /var/lib/containers"))
           machine.succeed(f"test ! -e /var/lib/containers/{id1}")
+
+      with subtest("Ensure that a failed container creation doesn'leave any state"):
+          machine.fail(
+              "nixos-container create b0rk --config-file ${brokenCfg}"
+          )
+          machine.succeed(f"test ! -e /var/lib/containers/b0rk")
     '';
 })
diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
index 727c0333b275..a14926a9767b 100755
--- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl
+++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
@@ -149,6 +149,16 @@ sub buildFlake {
     unlink("$systemPath.tmp");
 }
 
+sub clearContainerState {
+    my ($profileDir, $gcRootsDir, $root, $configFile) = @_;
+
+    safeRemoveTree($profileDir) if -e $profileDir;
+    safeRemoveTree($gcRootsDir) if -e $gcRootsDir;
+    system("chattr", "-i", "$root/var/empty") if -e "$root/var/empty";
+    safeRemoveTree($root) if -e $root;
+    unlink($configFile) or die;
+}
+
 if ($action eq "create") {
     # Acquire an exclusive lock to prevent races with other
     # invocations of ‘nixos-container create’.
@@ -226,7 +236,10 @@ if ($action eq "create") {
 
     if (defined $systemPath) {
         system("nix-env", "-p", "$profileDir/system", "--set", $systemPath) == 0
-            or die "$0: failed to set initial container configuration\n";
+            or do {
+                clearContainerState($profileDir, "$profileDir/$containerName", $root, $confFile);
+                die "$0: failed to set initial container configuration\n";
+            };
     } else {
         mkpath("$root/etc/nixos", 0, 0755);
 
@@ -237,7 +250,10 @@ if ($action eq "create") {
         system("nix-env", "-p", "$profileDir/system",
                "-I", "nixos-config=$nixosConfigFile", "-f", "$nixenvF",
                "--set", "-A", "system") == 0
-            or die "$0: failed to build initial container configuration\n";
+            or do {
+                clearContainerState($profileDir, "$profileDir/$containerName", $root, $confFile);
+                die "$0: failed to build initial container configuration\n"
+            };
     }
 
     print "$containerName\n" if $ensureUniqueName;
@@ -331,11 +347,7 @@ if ($action eq "destroy") {
 
     terminateContainer if (isContainerRunning);
 
-    safeRemoveTree($profileDir) if -e $profileDir;
-    safeRemoveTree($gcRootsDir) if -e $gcRootsDir;
-    system("chattr", "-i", "$root/var/empty") if -e "$root/var/empty";
-    safeRemoveTree($root) if -e $root;
-    unlink($confFile) or die;
+    clearContainerState($profileDir, $gcRootsDir, $root, $confFile);
 }
 
 elsif ($action eq "restart") {

From 31bbcc21d38366489120341bb74438cd38f4bf40 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 10 Feb 2020 15:12:00 +0100
Subject: [PATCH 0320/4636] nixos/nixos-container: use custom path if specified
 by `--nixos-path`

---
 pkgs/tools/virtualization/nixos-container/nixos-container.pl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
index a14926a9767b..df4c8fee21b4 100755
--- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl
+++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
@@ -43,6 +43,7 @@ Usage: nixos-container list
          [--config <string>]
          [--config-file <path>]
          [--flake <flakeref>]
+         [--nixos-path <path>]
        nixos-container login <container-name>
        nixos-container root-login <container-name>
        nixos-container run <container-name> -- args...
@@ -386,6 +387,7 @@ elsif ($action eq "update") {
         system("nix-env", "-p", "$profileDir/system", "--set", $systemPath) == 0
             or die "$0: failed to set container configuration\n";
     } else {
+
         my $nixosConfigFile = "$root/etc/nixos/configuration.nix";
 
         # FIXME: may want to be more careful about clobbering the existing
@@ -395,8 +397,9 @@ elsif ($action eq "update") {
             writeNixOSConfig $nixosConfigFile;
         }
 
+        my $nixenvF = $nixosPath // "<nixpkgs/nixos>";
         system("nix-env", "-p", "$profileDir/system",
-               "-I", "nixos-config=$nixosConfigFile", "-f", "<nixpkgs/nixos>",
+               "-I", "nixos-config=$nixosConfigFile", "-f", $nixenvF,
                "--set", "-A", "system") == 0
             or die "$0: failed to build container configuration\n";
     }

From 3a9a0f299a6a1714ab7d6d9188fdf85a519e07ee Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 11 Feb 2020 14:04:22 +0000
Subject: [PATCH 0321/4636] quilter: 2.1.0 -> 2.1.1

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

diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix
index 87dc1a6cfe79..2b4abb1f1625 100644
--- a/pkgs/applications/editors/quilter/default.nix
+++ b/pkgs/applications/editors/quilter/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "quilter";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "lainsce";
     repo = pname;
     rev = version;
-    sha256 = "1756gp3f2pmxz2k4xg4cfdbdav848qb0vjglyiy1n2k9xc79dyxz";
+    sha256 = "1raba835kvqq4lfpk141vg81ll7sg3jyhwyr6758pdjmncncg0wr";
   };
 
   nativeBuildInputs = [

From 9729f2be9514c6f08785767285764939fceb4186 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Tue, 11 Feb 2020 15:08:18 +0100
Subject: [PATCH 0322/4636] perlPackages.OpenAPIClient: init at 0.24

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7a34d1f8ee6a..6ea1b2e88ce8 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14023,6 +14023,22 @@ let
     };
   };
 
+  OpenAPIClient = buildPerlPackage rec {
+    pname = "OpenAPI-Client";
+    version = "0.24";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/OpenAPI-Client-0.24.tar.gz";
+      sha256 = "2420a2d1a9bc24a644c9ba12d77f1252ac2209ef0ac5a432153fe49c840faf28";
+    };
+    propagatedBuildInputs = [ JSONValidator MojoliciousPluginOpenAPI ];
+    meta = {
+      homepage = "https://github.com/jhthorsen/openapi-client";
+      description = "A client for talking to an Open API powered server";
+      license = stdenv.lib.licenses.artistic2;
+      maintainers = [ maintainers.sgo ];
+    };
+  };
+
   OpenGL = buildPerlPackage rec {
     pname = "OpenGL";
     version = "0.70";

From 7f311beb43156a9f6e121a2d519591cd5d3144a7 Mon Sep 17 00:00:00 2001
From: Victor multun Collod <victor.collod@epita.fr>
Date: Tue, 11 Feb 2020 15:58:33 +0100
Subject: [PATCH 0323/4636] gegl: enable umfpack support

Fixes #79836
---
 pkgs/development/libraries/gegl/4.0.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix
index 45f2c96dffe5..639ad8d0e51a 100644
--- a/pkgs/development/libraries/gegl/4.0.nix
+++ b/pkgs/development/libraries/gegl/4.0.nix
@@ -29,6 +29,7 @@
 , luajit
 , openexr
 , OpenCL
+, suitesparse
 }:
 
 stdenv.mkDerivation rec {
@@ -76,6 +77,7 @@ stdenv.mkDerivation rec {
     gexiv2
     luajit
     openexr
+    suitesparse
   ] ++ stdenv.lib.optional stdenv.isDarwin OpenCL;
 
   # for gegl-4.0.pc
@@ -93,7 +95,6 @@ stdenv.mkDerivation rec {
     "-Dlibav=disabled"
     "-Dlibv4l=disabled"
     "-Dlibv4l2=disabled"
-    "-Dumfpack=disabled"
     # Disabled due to multiple vulnerabilities, see
     # https://github.com/NixOS/nixpkgs/pull/73586
     "-Djasper=disabled"

From dd759b3b67a4d46f944c72e48cf32f375ab184b5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Braun <eon@patapon.info>
Date: Thu, 6 Feb 2020 11:03:20 +0100
Subject: [PATCH 0324/4636] safe: init at 1.5.1

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

diff --git a/pkgs/tools/security/safe/default.nix b/pkgs/tools/security/safe/default.nix
new file mode 100644
index 000000000000..43d791e19dbe
--- /dev/null
+++ b/pkgs/tools/security/safe/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, buildGoPackage
+, fetchFromGitHub
+}:
+
+with builtins;
+
+buildGoPackage rec {
+  pname = "safe";
+  version = "1.5.1";
+
+  src = fetchFromGitHub {
+    owner = "starkandwayne";
+    repo = "safe";
+    rev = "v${version}";
+    sha256 = "12gzxrnyl890h79z9yx23m1wwgy8ahm74q4qwi8n2nh7ydq6mn2d";
+  };
+
+  goPackagePath = "github.com/starkandwayne/safe";
+
+  preBuild = ''
+    buildFlagsArray+=("-ldflags" "-X main.Version=${version}")
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Vault CLI";
+    homepage = "https://github.com/starkandwayne/safe";
+    license = licenses.mit;
+    maintainers = with maintainers; [ eonpatapon ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f90ba38fa892..de9336126315 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6251,6 +6251,8 @@ in
 
   safecopy = callPackage ../tools/system/safecopy { };
 
+  safe = callPackage ../tools/security/safe { };
+
   safe-rm = callPackage ../tools/system/safe-rm { };
 
   safeeyes = callPackage ../applications/misc/safeeyes { };

From 3d1007716c2295162274cb9faceca494e29aa104 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 11 Feb 2020 15:52:15 +0100
Subject: [PATCH 0325/4636] pinentry_qt5: alias to pinentry-qt

Attribute was removed in a4916fdea5680452cb9fc5aac5ec350b52b3797c which
will land in 20.03, but breaks evaluation for everyone using
pinentry_qt5 on NixOS 19.09 when updating.
---
 pkgs/top-level/aliases.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 43a0f8294160..372c17a2272d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -347,6 +347,7 @@ mapAliases ({
   pinentry_gtk2 = pinentry-gtk2; # added 2019-10-14
   pinentry_qt = pinentry-qt; # added 2019-10-14
   pinentry_gnome = pinentry-gnome; # added 2019-10-14
+  pinentry_qt5 = pinentry-qt; # added 2020-02-11
   postgis = postgresqlPackages.postgis;
   # end
   ppl-address-book = throw "deprecated in 2019-05-02: abandoned by upstream.";

From dd7f6b0c6b461dbc69c1b11ebcf1c8ea5b6160ec Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 11 Feb 2020 16:33:18 +0100
Subject: [PATCH 0326/4636] nixUnstable, nixFlakes: Update to latest

Note that we need to build from a tarball now to get the vendored
crates. A bit ugly to fetch tarballs from Hydra...
---
 pkgs/tools/package-management/nix/default.nix | 39 ++++++++-----------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 28413971c004..a51a4cab4f08 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, fetchFromGitHub, callPackage
+{ lib, fetchurl, callPackage
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
 , confDir ? "/etc"
@@ -11,7 +11,7 @@ let
 common =
   { lib, stdenv, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz
   , pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json
-  , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns, jq
+  , jq, libarchive, rustc, cargo
   , busybox-sandbox-shell
   , storeDir
   , stateDir
@@ -19,7 +19,7 @@ common =
   , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp
   , withAWS ? stdenv.isLinux || stdenv.isDarwin, aws-sdk-cpp
 
-  , name, suffix ? "", src, includesPerl ? false, fromGit ? false
+  , name, suffix ? "", src, includesPerl ? false
 
   }:
   let
@@ -29,19 +29,21 @@ common =
       version = lib.getVersion name;
 
       is20 = lib.versionAtLeast version "2.0pre";
+      is24 = lib.versionAtLeast version "2.4pre";
 
-      VERSION_SUFFIX = lib.optionalString fromGit suffix;
+      VERSION_SUFFIX = suffix;
 
       outputs = [ "out" "dev" "man" "doc" ];
 
       nativeBuildInputs =
         [ pkgconfig ]
         ++ lib.optionals (!is20) [ curl perl ]
-        ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns jq ];
+        ++ lib.optionals is24 [ jq ];
 
       buildInputs = [ curl openssl sqlite xz bzip2 nlohmann_json ]
         ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
         ++ lib.optionals is20 [ brotli boost editline ]
+        ++ lib.optionals is24 [ libarchive rustc cargo ]
         ++ lib.optional withLibseccomp libseccomp
         ++ lib.optional (withAWS && is20)
             ((aws-sdk-cpp.override {
@@ -126,8 +128,6 @@ common =
       };
 
       passthru = {
-        inherit fromGit;
-
         perl-bindings = if includesPerl then nix else stdenv.mkDerivation {
           pname = "nix-perl";
           inherit version;
@@ -140,7 +140,6 @@ common =
           # but noting for future travellers.
           nativeBuildInputs =
             [ perl pkgconfig curl nix libsodium ]
-            ++ lib.optionals fromGit [ autoreconfHook autoconf-archive ]
             ++ lib.optional is20 boost;
 
           configureFlags =
@@ -186,29 +185,23 @@ in rec {
   });
 
   nixUnstable = lib.lowPrio (callPackage common rec {
-    name = "nix-2.3${suffix}";
-    suffix = "pre6895_84de821";
-    src = fetchFromGitHub {
-      owner = "NixOS";
-      repo = "nix";
-      rev = "84de8210040580ce7189332b43038d52c56a9689";
-      sha256 = "062pdly0m2hk8ly8li5psvpbj1mi7m1a15k8wyzf79q7294l5li3";
+    name = "nix-2.4${suffix}";
+    suffix = "pre7250_94c93437";
+    src = fetchurl {
+      url = "https://hydra.nixos.org/build/112193977/download/3/nix-2.4${suffix}.tar.xz";
+      sha256 = "f9baf241c9449c1e3e5c9610adbcd2ce9e5fbcab16aff3ba3030d2fad7b34d7b";
     };
-    fromGit = true;
 
     inherit storeDir stateDir confDir boehmgc;
   });
 
   nixFlakes = lib.lowPrio (callPackage common rec {
     name = "nix-2.4${suffix}";
-    suffix = "pre20191022_9cac895";
-    src = fetchFromGitHub {
-      owner = "NixOS";
-      repo = "nix";
-      rev = "9cac895406724e0304dff140379783c4d786e855";
-      hash = "sha256-Y1cdnCNoJmjqyC/a+Nt2N+5L3Ttg7K7zOD7gmtg1QzA=";
+    suffix = "pre20200207_d2032ed";
+    src = fetchurl {
+      url = "https://hydra.nixos.org/build/111815420/download/3/nix-2.4${suffix}.tar.xz";
+      sha256 = "e72a20efeee4ccc704cca3a06de9185fb8742bc7ef1a62af5896ec0f379b9ceb";
     };
-    fromGit = true;
 
     inherit storeDir stateDir confDir boehmgc;
   });

From 8e5ed7cfbbb1dcd9a1bb0a9fa54d57cef95287e5 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 11 Feb 2020 10:59:24 -0500
Subject: [PATCH 0327/4636] xfce.xfce4-pulseaudio-plugin: 0.4.1 -> 0.4.2, fix
 volume

We needed to add keybinder3.
---
 .../xfce4-pulseaudio-plugin/default.nix       | 36 +++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix
index 83778aa8fffd..64916f92a6ff 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix
@@ -1,13 +1,27 @@
-{ mkXfceDerivation, automakeAddFlags, dbus-glib, dbus, gtk3, libpulseaudio
-, libnotify, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
+{ mkXfceDerivation
+, automakeAddFlags
+, dbus-glib
+, dbus
+, gtk3
+, libpulseaudio
+, libnotify
+, libxfce4ui
+, libxfce4util
+, xfce4-panel
+, xfconf
+, keybinder3
+, glib
+}:
 
 mkXfceDerivation {
   category = "panel-plugins";
   pname = "xfce4-pulseaudio-plugin";
-  version = "0.4.1";
-  sha256 = "1c8krpg3l6ki00ldd9hifc4bddysdm0w3x5w43fkr31j0zrscvfp";
+  version = "0.4.2";
+  sha256 = "1s996mcniskq42vv7cb9i165pmrfp9c95p5f9rx14hqq8in9mvc5";
 
-  nativeBuildInputs = [ automakeAddFlags ];
+  nativeBuildInputs = [
+    automakeAddFlags
+  ];
 
   NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus.dev}/include/dbus-1.0";
 
@@ -15,7 +29,17 @@ mkXfceDerivation {
     substituteInPlace configure.ac.in --replace gio-2.0 gio-unix-2.0
   '';
 
-  buildInputs = [ gtk3 libnotify libpulseaudio libxfce4ui libxfce4util xfce4-panel xfconf ];
+  buildInputs = [
+    glib
+    gtk3
+    keybinder3
+    libnotify
+    libpulseaudio
+    libxfce4ui
+    libxfce4util
+    xfce4-panel
+    xfconf
+  ];
 
   meta = {
     description = "Adjust the audio volume of the PulseAudio sound system";

From 71a54f1130fe6043e7aaf4f557cc06c6c9f0e306 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Tue, 11 Feb 2020 17:01:25 +0100
Subject: [PATCH 0328/4636] gnomeExtensions.gsconnect: fix build

dbus is now propagated from at-spi2-core, which made gsconnect try to
install dbus service files in the wrong location.

closes https://github.com/NixOS/nixpkgs/issues/79806
---
 pkgs/desktops/gnome-3/extensions/gsconnect/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
index 08011ab5c722..26d7f157240e 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
@@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
     "-Dopenssl_path=${openssl}/bin/openssl"
     "-Dsshadd_path=${openssh}/bin/ssh-add"
     "-Dsshkeygen_path=${openssh}/bin/ssh-keygen"
+    "-Dsession_bus_services_dir=${placeholder "out"}/share/dbus-1/services"
     "-Dpost_install=true"
   ];
 

From 7fbc860d723dc46ba639f51e8b3ac67c0e5d016e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <mil@nyantec.com>
Date: Sat, 14 Dec 2019 20:41:37 +0100
Subject: [PATCH 0329/4636] tipp10: init at 3.1.0

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

diff --git a/pkgs/applications/misc/tipp10/default.nix b/pkgs/applications/misc/tipp10/default.nix
new file mode 100644
index 000000000000..8316fd918ab1
--- /dev/null
+++ b/pkgs/applications/misc/tipp10/default.nix
@@ -0,0 +1,25 @@
+{ cmake, stdenv, mkDerivation, fetchFromGitLab,
+  qtmultimedia, qttools, ... }:
+
+mkDerivation rec {
+  pname = "tipp10";
+  version = "3.1.0";
+
+  src = fetchFromGitLab {
+    owner = "a_a";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1mksga1zyqz1y2s524nkw86irg36zpjwz7ff87n2ygrlysczvnx1";
+  };
+
+  nativeBuildInputs = [ cmake qttools ];
+  buildInputs = [ qtmultimedia ];
+
+  meta = with stdenv.lib; {
+    description = "Learn and train typing with the ten-finger system";
+    homepage = "https://gitlab.com/a_a/tipp10";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ petabyteboy ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b18b36b4633..b309035f344d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21727,6 +21727,8 @@ in
 
   tiny = callPackage ../applications/networking/irc/tiny { };
 
+  tipp10 = qt5.callPackage ../applications/misc/tipp10 { };
+
   tixati = callPackage ../applications/networking/p2p/tixati { };
 
   tkcvs = callPackage ../applications/version-management/tkcvs { };

From d217d4c63c4acecceb12153c285014e65bd8409d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 11 Feb 2020 13:50:03 +0000
Subject: [PATCH 0330/4636] psc-package: 0.6.0 -> 0.6.2

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

diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix
index c2f8765a131c..908a8e943e78 100644
--- a/pkgs/development/compilers/purescript/psc-package/default.nix
+++ b/pkgs/development/compilers/purescript/psc-package/default.nix
@@ -4,13 +4,13 @@ with lib;
 
 mkDerivation rec {
   pname = "psc-package";
-  version = "0.6.0";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "purescript";
     repo = pname;
     rev = "v${version}";
-    sha256 = "165yax131rj1mdlqd28g6wcy1ps3k4w50z8gj9yc3nfs09dy0lab";
+    sha256 = "0536mijma61khldnpbdviq2vvpfzzz7w8bxr59mvr19i10njdq0y";
   };
 
   isLibrary = false;

From 8ffa642baa4ed87c0b8d6bda8d848668cd8d9f2d Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 11 Feb 2020 14:25:03 +0100
Subject: [PATCH 0331/4636] gitRepo: 2.0 -> 2.1.1

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

diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index dc4ee00b0033..6db612f46a2a 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "git-repo";
-  version = "2.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "android";
     repo = "tools_repo";
     rev = "v${version}";
-    sha256 = "077fsg2mh47c7qvqwpivkw474rpnw5xs36j23rxj2k5m700bz3hq";
+    sha256 = "0p09yak0vrdg8apk76kbx5gy7z57mzis9702rbw8mfx9p0ag6fy7";
   };
 
   patches = [ ./import-ssl-module.patch ];

From 8985abb3c6656b0bff1ec168b72fe8170b1aa87d Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Tue, 28 Jan 2020 22:25:05 -0800
Subject: [PATCH 0332/4636] vulkan-headers: 1.1.144.0 -> 1.2.131.1

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

diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix
index 4ea8d69a498b..ee6e58fab287 100644
--- a/pkgs/development/libraries/vulkan-headers/default.nix
+++ b/pkgs/development/libraries/vulkan-headers/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
   pname = "vulkan-headers";
-  version = "1.1.114.0";
+  version = "1.2.131.1";
 
   nativeBuildInputs = [ cmake ];
 
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     owner = "KhronosGroup";
     repo = "Vulkan-Headers";
     rev = "sdk-${version}";
-    sha256 = "0fdvh26nxibylh32lj8b62d9nf9j25xa0il9zg362wmr2zgm8gka";
+    sha256 = "1yf42c2cnhx1y4wkxsdl6g653xl2vvamhpkldz6jb4ca5wk03gxf";
   };
 
   meta = with stdenv.lib; {

From eb250b9a00179df46fcc8a6bde602bf4a79fc928 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Tue, 28 Jan 2020 22:27:09 -0800
Subject: [PATCH 0333/4636] vulkan-loader: 1.1.144.0 -> 1.2.131.2

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

diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index 3cdf8f08651f..c12c3ca640ba 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -1,20 +1,15 @@
 { stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig
 , xlibsWrapper, libxcb, libXrandr, libXext, wayland, addOpenGLRunpath }:
 
-let
-  version = "1.1.114.0";
-in
-
-assert version == vulkan-headers.version;
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "vulkan-loader";
-  inherit version;
+  version = "1.2.131.2";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-Loader";
     rev = "sdk-${version}";
-    sha256 = "08nibkbjf3g32qyp5bpdvj7i0zdv5ds1n5y52z8pvyzkpiz7s6ww";
+    sha256 = "12n4mxc6db89258k8i47ql1zna7k94lkwv7lpxg39nm8ypa1ywrv";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 533e7c229688001b2c9f59929758dc331615ba25 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Tue, 28 Jan 2020 22:32:22 -0800
Subject: [PATCH 0334/4636] glslang: 7.11.3214 -> 8.13.3559

---
 pkgs/development/compilers/glslang/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix
index 161e57b54792..b9d6866cc432 100644
--- a/pkgs/development/compilers/glslang/default.nix
+++ b/pkgs/development/compilers/glslang/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "glslang";
-  version = "7.11.3214";
+  version = "8.13.3559";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "glslang";
     rev = version;
-    sha256 = "0dqjga0lcza006fhac26zp2plbq4gx8a6nsmrwkqlzji6lw1jins";
+    sha256 = "0waamlh2vqh1k40m169294xdlm0iqjkx2vis4qyxfki0r0cnsmnk";
   };
 
   # These get set at all-packages, keep onto them for child drvs
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b309035f344d..599424839f36 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8302,16 +8302,16 @@ in
       src = fetchFromGitHub {
         owner = "KhronosGroup";
         repo = "SPIRV-Tools";
-        rev = "26c1b8878315a7a5c188df45e0bc236bb222b698";
-        sha256 = "1q76vaqwxf4q2l4rd7j2p2jqgcqpys0m235drzx0drkn2qd50n1b";
+        rev = "5c019b5923c1f6bf00a3ac28114ec4a7b1faa0e2";
+        sha256 = "17a0kiyb7zjsg7ws12diip84vds1ajl98ni9c2wria6ymcvbvsvz";
       };
     });
     spirv-headers = spirv-headers.overrideAttrs (_: {
       src = fetchFromGitHub {
         owner = "KhronosGroup";
         repo = "SPIRV-Headers";
-        rev = "2434b89345a50c018c84f42a310b0fad4f3fd94f";
-        sha256 = "1m902q1alm0rbh69zlskkx4n453xijijp9mf3wzwphi2j36gygwm";
+        rev = "204cd131c42b90d129073719f2766293ce35c081";
+        sha256 = "1gp0mlbfccqnalaix97jxsa5i337xyzyr55wgssapy56p0q04wv2";
       };
     });
   };

From d73c83fca540f82d2d862d3102e3f1f3b2343ea8 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Tue, 28 Jan 2020 23:06:27 -0800
Subject: [PATCH 0335/4636] vulkan-validation-layers: 1.1.114.0 -> 1.2.131.2

---
 .../tools/vulkan-validation-layers/default.nix       |  6 +++---
 pkgs/top-level/all-packages.nix                      | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix
index 36d018682df9..5d807d13a9ea 100644
--- a/pkgs/development/tools/vulkan-validation-layers/default.nix
+++ b/pkgs/development/tools/vulkan-validation-layers/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchFromGitHub, cmake, writeText, python3
 , vulkan-headers, vulkan-loader, glslang
-, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland, spirv-headers }:
+, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }:
 
 stdenv.mkDerivation rec {
   pname = "vulkan-validation-layers";
-  version = "1.1.114.0";
+  version = "1.2.131.2";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-ValidationLayers";
     rev = "sdk-${version}";
-    sha256 = "0f8dlrjw1nz2adhzi4sbvljys4h0dyiwafdihsdyrg3xncgffks4";
+    sha256 = "1sz0388cr018ldx6ziplvk4v3zbg44pww77kv6kv5wxl69plwfcn";
   };
 
   nativeBuildInputs = [ pkgconfig cmake python3  ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 599424839f36..351314ec274a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14597,24 +14597,24 @@ in
         src = fetchFromGitHub {
           owner = "KhronosGroup";
           repo = "SPIRV-Tools";
-          rev = "aa9e8f538041db3055ea443080e0ccc315fa114f";
-          sha256 = "1nbii0xa5zgs36dmpvzpli1jbzb9ijr7bkgvzmlpcjrjsl02cnbk";
+          rev = "323a81fc5e30e43a04e5e22af4cba98ca2a161e6";
+          sha256 = "1kwyh95l02w3v1ra55c836wayzw8d0m14ab7wf0ynhhyp3k2p9hv";
         };
       });
       spirv-headers = spirv-tools.overrideAttrs (_: {
         src = fetchFromGitHub {
           owner = "KhronosGroup";
           repo = "SPIRV-Headers";
-          rev = "45c2cc37276d69e5b257507d97fd90d2a5684ccc";
-          sha256 = "1jrzazv5j8nsn8hz5vc43vz4msps05d65wdy9spfg2hg36r1s2pm";
+          rev = "204cd131c42b90d129073719f2766293ce35c081";
+          sha256 = "1gp0mlbfccqnalaix97jxsa5i337xyzyr55wgssapy56p0q04wv2";
         };
       });
     }).overrideAttrs (_: {
       src = fetchFromGitHub {
         owner = "KhronosGroup";
         repo = "glslang";
-        rev = "333d1c95792692205472c457d7bec915a94c8000";
-        sha256 = "04srq1zcilhs7p1xz7wcnrncjxqskhfnqggisvxw5f774gk01ks6";
+        rev = "4fc7a33910fb8e40b970d160e1b38ab3f67fe0f3";
+        sha256 = "1dghz8zl774dx2xpa4dv8xhxirbylgyn6kx18ib4qirna1njp0zg";
       };
     });
   };

From 3b9d71af2c7dd24e8ef1adf61f86d1b5df55c0b9 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Tue, 28 Jan 2020 23:06:46 -0800
Subject: [PATCH 0336/4636] shaderc: 2019.0 -> 2019.1

---
 pkgs/development/compilers/shaderc/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix
index 82cccc3befc3..e7308973d5c6 100644
--- a/pkgs/development/compilers/shaderc/default.nix
+++ b/pkgs/development/compilers/shaderc/default.nix
@@ -8,24 +8,24 @@ let
   glslang = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "glslang";
-    rev = "d3692c701b1265955221aa0d6ebc656bc4442b2a";
-    sha256 = "11cvwbzlpr4zrcmmyd9h0kbfhmhr6r696ydmn0yp1jrixby4bmji";
+    rev = "3ed344dd784ecbbc5855e613786f3a1238823e56";
+    sha256 = "00s2arfvw78d9k9fmangqlkvkmkpqzrin3g91vfab4wr8srb09dx";
   };
   spirv-tools = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Tools";
-    rev = "08cc49ec59c3ff4d6bd4bb4f2097ede35e802158";
-    sha256 = "1xhgcppx02fp3nr7654mr3qrgy1fxlxdyl87jhmn3k9jf24gmmmz";
+    rev = "323a81fc5e30e43a04e5e22af4cba98ca2a161e6";
+    sha256 = "1kwyh95l02w3v1ra55c836wayzw8d0m14ab7wf0ynhhyp3k2p9hv";
   };
   spirv-headers = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Headers";
-    rev = "8b911bd2ba37677037b38c9bd286c7c05701bcda";
-    sha256 = "0qdnj34bkagszyvci6ifpqd7iqvybhmqzvc9lvqnls44qg90aqh2";
+    rev = "204cd131c42b90d129073719f2766293ce35c081";
+    sha256 = "1gp0mlbfccqnalaix97jxsa5i337xyzyr55wgssapy56p0q04wv2";
   };
 in stdenv.mkDerivation rec {
   pname = "shaderc";
-  version = "2019.0";
+  version = "2019.1";
 
   outputs = [ "out" "lib" "bin" "dev" "static" ];
 
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
     owner = "google";
     repo = "shaderc";
     rev = "v${version}";
-    sha256 = "1l5mmyxhzsbp0a6y2d86i8jmf46c6bjgjkdgkr5l8hmhflmm7gi2";
+    sha256 = "0x514rpignnb4vvl7wmijfakqc59986knjw3dh1zx0ah42xa7x37";
   };
 
   patchPhase = ''

From ad1934b4653ff761e4f2ffd0ba89484f3db6989f Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Tue, 28 Jan 2020 23:11:09 -0800
Subject: [PATCH 0337/4636] vulkan-tools: 1.1.114.0 -> 1.2.131.1

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

diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix
index 5851e4a2d46a..f61835ac81f8 100644
--- a/pkgs/tools/graphics/vulkan-tools/default.nix
+++ b/pkgs/tools/graphics/vulkan-tools/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vulkan-tools";
-  version = "1.1.114.0";
+  version = "1.2.131.1";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-Tools";
     rev = "sdk-${version}";
-    sha256 = "1d4fcy11gk21x7r7vywdcc1dy9j1d2j78hvd5vfh3vy9fnahx107";
+    sha256 = "0ws47ansrr8cq4qjf6k4q0ygm9wwd3w7mhwqcl1qxms8lh5vmhfq";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From eaf12cc4d1777506dc02377d61734413f3722043 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 12 Feb 2020 03:12:21 +0900
Subject: [PATCH 0338/4636] thunderbird-bin: 68.4.2 -> 68.5.0

---
 .../thunderbird-bin/release_sources.nix       | 490 +++++++++---------
 1 file changed, 245 insertions(+), 245 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 13f201eaea11..f8d8c2627fec 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,615 +1,615 @@
 {
-  version = "68.4.2";
+  version = "68.5.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ar/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ar/thunderbird-68.5.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "6dcb7cf023c6b6e1d663eb99280aa8245c658a6faed7933be8d8340b33e47f2082d548e6d9fc4394a74ddf8b05c9a7b3a57f691504cb4095d41787ebb564b86b";
+      sha512 = "dc71109c963e9b8e162437e33feec002268b392cba9ebbfb37714aa79e834143641b92488c3c923256b1d0058c92e6502caf4f022b17145d8e0f67fa7d77b7c1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ast/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ast/thunderbird-68.5.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "89592d5c44742b75d8125e4f360f6ef1a719f6a573c72ca3b88fe971be699d74d4326af7385f36e67c0d4ab09a23d7d8f62c8cfac27c9249f84f520b8ff46ab8";
+      sha512 = "2768582e13905d162eacb051209a3ff5c7f704ff95efa3339cf8ecdfce3f892e76e79e65d11c4638a8f4529177a7b2efb12d7c6ac308c1d02b93da361bb9cd23";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/be/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/be/thunderbird-68.5.0.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "5cd617c16a448f79335a1df7e7028eadbcf35b6221678da4c31e5cb5a014ccb9ff6020fa271488312853a5b08ae1e29102f470e9bed193f2de2e0b70cbee4752";
+      sha512 = "dfb0806383acb8bbe817be30c4ad1ed34f21e68dea71e249226b07fdf4d1226c88690962f228b6d3f5d0205501be2dddf985b9f99b8eae37400362f1a0be1979";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/bg/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/bg/thunderbird-68.5.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "85221ff6c56119b603b291febacab6c92cad2d4e2f56415a778f9f06495dbc0c52380fba7dc2153853a689e804c7ef731ae762b0cee9a9ec92ead2184a7ce987";
+      sha512 = "194b1f645ca3b1607283d176e28e07e204abec90a96a85e9f2aeef0c1af8011c7dea3f0dfdc37402719380b26899c83800ecb79da194730e9c3fcfce1685778b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/br/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/br/thunderbird-68.5.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "e42c6569be589c543b1b3d23062733e61317ce2efb83b224f94571564c881c329b96d49a7c4be9a553d1eb656595212f839f8b4119b382782be6f1e55048cde0";
+      sha512 = "1b5513ea62c766d8dc7839fb9708dc63ab01e297a146a351d670aff3d6e7d6a842289da5da753fe649ff08a751b0fd0abee7a1fc71f7d0eebef375b72e929973";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ca/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ca/thunderbird-68.5.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "31f8a8bddbf1f3be169c15cdd94d11cea472ff10abafee33619d0d53d51fbc862d8cf143d2924733cb8ee39751f1145ec7cad299b0d634d2269901d9a6a5f7f8";
+      sha512 = "460c3b39881ab764fd7bedb10c27a2df5da6a907058010204d8849b87da42ce48f0038b05d0910b2c7df8339952dd781ea167687706494b92de2d0deebba8b81";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/cak/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/cak/thunderbird-68.5.0.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "b8ad08b7abe314a4d1ba6a92bd5a3e1d43310738493ed130eb11549d0179f38ea435d0b246513ecd10a701c0fe65578fbf21ce3c47d9ad067a3a25a82ae590ec";
+      sha512 = "f35ea0852f598285d86445d80839db0dac799760607bd83db528196ebaf3a77abf9f185a2b2f1044a7d5c0fd07383e8c0e020dcc7251817d6d3299d6cae63137";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/cs/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/cs/thunderbird-68.5.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "5228af6fd773622fbd846993f1b48f480a2f0da4fde2a49c9b1663c9f72c8821d51093a121175bf57130670ba96aabc44d92fbdc895d1f5508e6301d148ae137";
+      sha512 = "baac0a55a175fa4e9512c7ff2a82d986af049eadbde9e1136216ce1d5b384c4db3891ab8b5af420dc4a0635ba50a9d4908baed0f3a9f1ca0076596d20d5e15a0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/cy/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/cy/thunderbird-68.5.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "6559e40814619edd5c943e0dea738c8237adce53483640d7b9a946ffb0c5050c9e0909009c83af5ca0c3163e15c876cfe1b28b2dcbe5409061bd4644ee31495d";
+      sha512 = "ef0b065b9d322772ec002d994140b2c9510f80d993c9c00aaa65d3314b9b4b7352ffdda6b84a916326deebfc8a12696d60a62d69f5aa13bbbacfbf9a5ccbe443";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/da/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/da/thunderbird-68.5.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "570aeb036129543af13be385d3be6efd30b22fa34af650b8fb0770d48c6537cb44613c33535e2efafad89a0c632e7acbeb569658f515f4910daecbf2212c960a";
+      sha512 = "1a9e3396d278cf9a02bb0bdc226036fd3cd6c86f47a4d9d00f4ca1031491a068b56c0b501799f75e385295ee50b013753376183b2bba73f0e95ae801507e0232";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/de/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/de/thunderbird-68.5.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "e48e9b6652016693338555104866b9c155ad8919f1d48ed7dac3ee6fa1ca4e484403a3d77f17b7b2a862e2590e41a043de94a097ef9e4faade63b063291f344d";
+      sha512 = "7b292fe10c09831c1b21141168aa136da9a2d78750bb5094633d2f58f85f3b4df69b6b638e00f097a1490050cf92f4bcc53cd4bef9a5539bb96cd2812971318d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/dsb/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/dsb/thunderbird-68.5.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "135c321f899b2a8fd75fbe15f589ec618911252cf66a004c3c3aeb5d98fcc65754e38a9dbdbaa914418e2bc3175603d04713269c0b22a54e5b70ad6402253cee";
+      sha512 = "3f26f768e5f400dc19d4069cb034878a3e0df059a5ec90cb70b06f138585ed976f58efb14ec54a3c0aac1e2fb8561c8e198f7a5822a40b37eff93a8e1c9ef3f2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/el/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/el/thunderbird-68.5.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "896251287bb17eea6681313c5f15b2babb108d760b2a09b09ce3d3507177054e9e2479bbcfe5afc4016de36018f8c7d25e5147a4a214f855c16e602fc386c664";
+      sha512 = "c6847200d45a169ef8a3bae3e2b7d45592d31429a205222e03f9d5365104e92be54dc4b07227b23c07abd425ee5383b5917d34362d4f37667b6f5addc9197514";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/en-GB/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/en-GB/thunderbird-68.5.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "b4fec6505a563c8730f113a29b4893890c798d2427672f8d10d588c9bd4ec5a97e7438ce27d53d93f7b043f90485055b04f4b1be792db552561864cf1600ec56";
+      sha512 = "bcc10a9daed5c4e68eb4a582cbfc8aa1c30b0d4cb92a714adbc695bba410e23d2f65e1194c0ed580976cda51d61fb95784b6296be95952aec1a2b51e711434d4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/en-US/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/en-US/thunderbird-68.5.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "e5643659593e404d2317f3620d2c2b48bc45ffc4d707b02243e342f28ce1b81260ab7b05541ecea47e03583d8b6968c964c16dbf36fc1fb10a4e00b235c55318";
+      sha512 = "9500d9a22bb42a04fd2d7d24ff8fb7a69b205d6f889ab3b301405a22a51da731452fd18ce33c492f0733d72bddf6aa37b4d8899db4418e8e0155f2bb93af6b06";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/es-AR/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/es-AR/thunderbird-68.5.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "102acc6c5d5178f3f8e2f39cff5e5f9e1ecbaa4c62d4311277fe06b123c2d9b8270d423bfd68d6e9d86e666f219ef1ddfebd439e85ae53340589fe6e41439bdf";
+      sha512 = "b193048a9c1a0d4c08c08cd12ae41c7a9cdfc8dba47c645d593675e08ac68f8158a578e645c8db32b862b0bb7174627534340a62aefa8ab9e38489b8b7687234";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/es-ES/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/es-ES/thunderbird-68.5.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "302c83a0726cb3893a8eab156c1613bb9722c340633e3201e259c619c53066318cb57b751be9dcbe9788b52d901b0c605584211e183d9fcb62edd340d87a23f9";
+      sha512 = "c1c5cd0b49e388260cc781e4bc7bc46530791467d4241defc31dae35c0ced85d8cc9e63734b0b8898eb23216065f388930d36227bd1484279ce135b20a70f041";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/et/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/et/thunderbird-68.5.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "d8d2b1bd1214b2ff4641e53edd3d6ef662cd9e7bf116cb8c8ff468a9ec179f7a83a7489cb756271c82e36201e082bd2da5d804ebb26fd1019a299f3afcad3d60";
+      sha512 = "9cb03aa0214d8e8a0c0786b95d5716a761bb9b2f1fb430b552f09ad3942a277e0117d7b2d95cabc01fb63dfc7956aeabbc522d38515371af7e3a52b8514a32d8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/eu/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/eu/thunderbird-68.5.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "94bdea45e3693d404cf97e93bdfe46a4593efd6fe0a5fc0bac78ea047cd58f7998140350730706ccc05db2a105414e44e473a472ff9f57a170895dab81a62e90";
+      sha512 = "3c1da2c13f0b5ed58a1b11fcac24bb3ded8f1fd5dbb23fb8eaac529e5595bcca6adcfee0effa4c4e8a78e85d53b062113022e8e34ca936dc99cda5720a859b39";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/fi/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/fi/thunderbird-68.5.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "f1071ca2ae7e6d03880a96dd968ee993b99e2c34c904392d5a0757b53deefd7c15c4cd643679a232de2e404999d1e5c990b052ef0f598c57d8f099cb1b1c9cbe";
+      sha512 = "1d04c56fd080a52dc2c399339369ab54a7650ddd9d4f473b6ae40445c2889e05eb25c635d7add28e779df3c851fc9826c416419be22691c3424bd8ad01ab23d1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/fr/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/fr/thunderbird-68.5.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "b7b051a5b4cb139de840b33240f1f8ddb25703d8dbfc66f0a028a2b26f0f6eea5d594e740018aaa093d68ac7bc648ce983a996ad4feee398854aeb160f9fc316";
+      sha512 = "a64c2a4c2f7da481995be93d03b6442a79c6a8ebeae3c2e1bd0efd8256f400bec3a416348ebee1753edd8a5911a80aa81843651e39a718607b3085494589210e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/fy-NL/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/fy-NL/thunderbird-68.5.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "a967b9ecdf596e603fb56dd50b20853bfdebc57aec69a0b6abebc0bcb2c9ab62e1890517bf70205749980a37835bc711fcda9ccb6d60f6e6d467fc28c7ef1475";
+      sha512 = "4e51df5766540356dc86414063c98f47aaca94a57d2449c05c677513ce4477533638eb34b234696431b8beb4d241b0eb97db08cf9e27da891e95965c16ef21a3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ga-IE/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ga-IE/thunderbird-68.5.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "7c09306024ea7147c68a9279fc391ce7cdcfe49d4fe60650bdce3fa2a5233623934f7c1f8877feda8388f24b1b1eebeeb2c006265d973cc83339b1220f61e8a1";
+      sha512 = "ec4f2667daeff8305feb8ac64304f42fbcda6b4c93a8bdfb1f4b45f1fc40163049f6a887f7208b41c49a21a5d94f06adf2f4446e784b8e2822c9f997d783eff2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/gd/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/gd/thunderbird-68.5.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "d820ff2c6bf09aa3dc19c8c679197f207cac505c5e2e5cacfcd5873d4607593d2efe15cf2483f62eda18bc8f7150c4f0f039a80ead07548aa69e5458b6c487df";
+      sha512 = "09076ac19ec28a790b84c584856ffb60cbcb0db11fe52f1bd307515762fccf79e158a8805c6743eff287a4b25978f94c8ffcaf655b414fd267cd9db321ccbc41";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/gl/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/gl/thunderbird-68.5.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "e193400689f5d3ecf4a72ee138355dad2c719120e9780be7406dca617faffc750107c8642e35719565f124fdba7a39fac9aed79fbd8923389f14dec54e128d11";
+      sha512 = "ad697320ba8f4e5a04a4e201e04490398cc09152b1cb1a31e325c06a30d8ca6f7209c35c9d9263e6087db41b4502e69c9ad6c35183872312dcde215ab1ba3e90";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/he/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/he/thunderbird-68.5.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "20098de7a90c1d783466a56a7ea6946153729274c4b8d8663b42f957c7c6da4e2d3465293fe1f33ee884de41bb4e2d0ae83d67b4dd06d5afd09d09c732805c3c";
+      sha512 = "7b367bd45c876e20a22e71b276d9ae9b7aec5fc58574647a5b8f99bdb52602eb41541f3397eea54a7395c5374a26277f1a312edb49c95eedfdc9ae06a6f5b9d3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/hr/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/hr/thunderbird-68.5.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "df359b429f9a9e7954391e3f64b056d0f6c0fbeb8ba7b024d71f7d211594496fe5aa2f3d3ef56bb1e048ce928dc6da77b1ded84cce0904f5fafc6d3d22bfeff1";
+      sha512 = "8f8fc6fab45e45ee426426a28fd00deb52110f68f2aa29037db120fa81afd802681aabb1f390ab62e2f067ac178eaf7f2b1d4f0c4ac70492ce45ef1cd2545a92";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/hsb/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/hsb/thunderbird-68.5.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "a0bdff2fc50ef13742098eb43e4c627cadbf363026ae9c6d49b3e3c4a48bc747739344fa90030a4fddb5843a4e6fc5f39b6c862e745dab31d41ab4b22e4d35fb";
+      sha512 = "870c925b327ff575b1cb6819864c5bb70b5531871e04a69ec3a456f83cd207bb2cd45defb4722f03586bb5e6569fe3d7e2c6e7937127269e9018a41039b6d83a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/hu/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/hu/thunderbird-68.5.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "a4d0106ecf554b8b18cab2e417e5ca5d4a3384c6f1f87b8f8cefba3c3addb60dedbbd3bdc5268c6d20fdf4e6bc2c06f17a6baf266cc3b7356e885339cf7ee711";
+      sha512 = "3bacd70e1bf4c07d1c625e835296d52d353546950178a92ad4ff1d29168b78928f985b3db99c7b5587aeb5a51e54c9f4cb5f0cf354df3ea853e8147ff969c288";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/hy-AM/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/hy-AM/thunderbird-68.5.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "9038e461596d473905a8390aa9967ef8e6bb013e85258294374bbf910f31d1a1e7fe582886c280add6071d856c484599bc8571bd21f02a63cd313605b1c35325";
+      sha512 = "46b9728709dd7866d6233e20c949dacccde3f62fce1558d2baadb87b94438833faf4d93e9449b0a5cddfbef8c3c9967258c606445c1fbf13aa74d776f61d844f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/id/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/id/thunderbird-68.5.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "9507df025dc4bcfe5ef11c929b9ce7d3b5e4b8459f7aeb1a2c30bb50b8e987bb016b8750bf8399720b1cf3bad54eb330c88e990438494f0557ee63a9e4077742";
+      sha512 = "11889847cd84dec9132eaa768251fe41dfcb7cb4682cb5c34160142791f75512b74b79d1caa2ce8cf205e521a244b168f89760782dcf1b453793122414903428";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/is/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/is/thunderbird-68.5.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "448696428b3c5f39c845ac82c0c4ff2079dca1ce19639e4403571bf9723074f3f9fdac533f36ff3fbb852931a49a2def2bd727c93dfcf70809c1d8caa1ab46b9";
+      sha512 = "e68fa0a96283013df42afa1fc7889d9dbfc906e508399d7dab6131b885ac73e5558c7acab1a5e8c13c6252e1612d43a1bc503b570c6f978c0460b121f2f37112";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/it/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/it/thunderbird-68.5.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "3948b06ffb8749ebcb444de60fff6f713ab72a859d0804a56310ec4ec3951ef6ae6309403e454051147404015fd22deb3fa7d5f6e82ae69018fca55562a583e4";
+      sha512 = "a55f5664274caabc43d64ac1abaf04f159c2b76c8389ecc00dcd213430d8c80836fe149bf4449cccc53184f2ded1ebcb85f8347de099aee47c32c899c5184a6c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ja/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ja/thunderbird-68.5.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "fba5fdf22fb3154cfd052e7a7883fc4fe593c49a166e6b088fb1d15acf07edbdff0fc8b8622018c05036cade7048a2cc8ba438c4cf44fd308e62d3634a144618";
+      sha512 = "b3fb1bfaeb1509ee3392b11e18a2f80b6a84165e6f01c6caeb47f4b1e9dd8733d88ef724497f603352119412d9b5f88d7d37b21ccb1802e4f3930c6f499363e2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ka/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ka/thunderbird-68.5.0.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "8da3bed471a03eb8634d804d06cb6ed631212e168ecbce76c4147b40d082434d658a48a2df5dd2b84fc1361ca83a58ecbd8edc913e63a12828a90d87142965d0";
+      sha512 = "1cf0b21bd0c1742a018675b8af830be7de163e567a2691b5c95cf91af9753b23d431ad5b67738d690220d1d8a57da7990cb01f89917f7c8ddad80b4ab056a83a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/kab/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/kab/thunderbird-68.5.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "cc190d979f8a01f95f02b9fbb8dd0433b14427c724f0ccd95b213a18fc5c46edd91363971b4cf5919f965fa012316667fba24e821929741c9a4fcc82fe62f8fa";
+      sha512 = "8decdb91a1241f4d9495202965986d78598f5e8be603ed9c28bbd2a8cb405ce96a1206f1ade35a11e2f161bffbd8a034fd13b15abd16f4ec5a05442a6194fd1e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/kk/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/kk/thunderbird-68.5.0.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "426f0b90e951b8377088e83b6c32b0c500134b2bae56938fd2f1c44ee652ddb1d6356cea48e52e7c9f88ad0184aa8deaa0141f21ae227ae876bddf1eb1814aac";
+      sha512 = "7a7e4d2c6dca6455c81456bb5a8eb3c8a085458ed9253c4a91b22a8cde9892fbba624be89c7ab1fea5875d902fa1198cf796bb309c3b6bd597bc05013d3f4687";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ko/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ko/thunderbird-68.5.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "6dfc70115784b79adb6ea4fa1f1854fae15b961fd310c55efc67eba03b65057776a163fdf45043c142126ba67fd1212f5ed46a0acaca061fee74ad7e5b905b85";
+      sha512 = "cb037d1ab8dde1fcd61dfd446aa7587c7dcb24d239485e3b3c63db49097eb91bdc59fa9048b8871ce17da6b33bb0490e9f7a8f29f5f59a623f4eca522a04c287";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/lt/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/lt/thunderbird-68.5.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "a2bcac9f00ac050b3526d59a75f5943b5874929df195ad2fbae984b38c637c2b186528e2926b66fe13fead86ff19efd508a969b18fbe5898bf6a95005ffe782d";
+      sha512 = "898ad8b33435bafc361861a19887fa423eb2000acff87862543e4051722e1e1b4d6606eae057647bf7bee366296bfe5567ac1e7002fd62d28515a4d57c2466ad";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ms/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ms/thunderbird-68.5.0.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "8692a23434d0b0f833346b23bcda716be2c14800fe26892ae6ad8c01a01b4574174ad11a61940b3b8f13c88b4fc890d7992c32e0081d7afb0a290babe32fdf85";
+      sha512 = "c08d8ec6ff837eb03dc41fa5e8d9e7d8a142df489f47698f372808c0ddea88d1313abef999c00a0d4aaa6e0d5d4564845b001454d85ea8990cec072fea689e28";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/nb-NO/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/nb-NO/thunderbird-68.5.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "b415dbd4ec148544d800c86c39cc8006591770aa34bc9dd341bada216abbec2118dc672ad78aa0f9e628937ae996bd79a2ec1c8d7e11cb43182bd0d98b2ec8d2";
+      sha512 = "9e34bea73e2514f2c76a08a79752977d12c42726408be0d5d39405c2edd56f826ad453fdb1e20c4f8840070715fc0eb1211135e8c9b1f3ecac6c0e99ec0be029";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/nl/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/nl/thunderbird-68.5.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "c51b1665262313140898ad3e46adb56a566a454b5f39e6afd56c5681bf55cfbc8838d6c16fe1a04f555ddfe0f166f275f2bfafb7e2f9452ef082f1e0238d431b";
+      sha512 = "3bd89bc0528d49a79ca93dcc6842f06102fd0799164d717ef7aeb15f283b44a7236148bd7a746ea7d713cf41b2bed7a5b7e66017b46b3398e4b6f035c7933a14";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/nn-NO/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/nn-NO/thunderbird-68.5.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "6c4a13b6f2f8540c0411db998fce53e346e28b89ffdda42d9f1b0cf214cacca7ee93de8a9c5eac056a609ecb108e3cd46260821597d4b89e5bc76c5f961ce982";
+      sha512 = "0cc4b9ac7dab3e879f6a691546fb414c4b43de166c5deb018634fe8d6583bff378d60937be4c8c30a1ffe68f5d715bb67414fa7359e061c766426666bdbbabc9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/pl/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/pl/thunderbird-68.5.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "b44c28d828171c6cb8c783606d8aa311c4234f623533fc2072b78a7435b261ae444297e8d01abca28a5a952a5f7dff380f250a11ce4a357bf3e0cc294d2c47db";
+      sha512 = "48ceb0fe27e9dff3c09aaf05276aaa7c9c0d2d643236bf69af03974cd514bdd0d3bc816151887d3247907bb67853ed840e486e6f1bc721ac7283ea193152b723";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/pt-BR/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/pt-BR/thunderbird-68.5.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "77e8efb89679f744891c419bdc6ee649d379c023ce181448b84da88c8fb9ae780eb762a01f547d6b662a59c8d5fb172d4b5582e6eba45d8e3c2927667e3c2141";
+      sha512 = "77a272f0553e2981d156b5c928a159ef754ca2220e8e48a06a6bd53bc67b6965a202e06ee98d15bd8d2f5fabc9768ea744eed8d88009f194b8a3f0097eb2b194";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/pt-PT/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/pt-PT/thunderbird-68.5.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "5e2ba598257d9c7efc793c2126e6564d8e2b92ff03a3df64d5147fbea199912bec44ae54cb3a878f9ff84921fb403dcdb58d05fbd55730e7c4c9d988ece21250";
+      sha512 = "bdbc148ab52ea519e2e5dc07655ffb687154a93420ac3d9b320349102436214ee26e558d94f4c8bcad1a94d611e7222f28c660e425385f3598c369332710066d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/rm/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/rm/thunderbird-68.5.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "e00c35d5f354f48491420e75191ca5776e365a46d37c68ff69618d2620be6e203ad2b81a7fc2483e4251a5a9815d5eccb1d12bb60e73d039160e156bab627d70";
+      sha512 = "de01b86deacf5af7b44112147cbb13057137a70c77e4f3f0fd7b6f2286da3cfff14d11bed3d2e2501db51dae336e3fdeea0fca60b5af92b13de78d9dee98d46e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ro/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ro/thunderbird-68.5.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "2cdf5dd8acc3a8834bb4f48fc58c6a5ebdddcfd94810d32848b98712b63d11a5e41afffa7555871343c90f817fd75f8bab090db0a0417a4b32e736fb67f0471f";
+      sha512 = "03a9eae26c2b1d989d8f74b8bbe5237265f89c6632568be7282e1e9253fad3062502e1d64402f3fb57b1755a2b52be0fad65c0a099aa55affd623b594083f303";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/ru/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ru/thunderbird-68.5.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "6bb10e60e32dea4f809e358ae7be703e368674e74ffcfa27cde2fbb344bc938b8d3a1c4b5a2a966857058cfff4865e0cdb11ed1829c5b53ac97fb79bb60c65e7";
+      sha512 = "a80a5cf3d34eb4e231c67182a17401783c75c5ccb0911fcc61a1cac8e007fca4e67004de02d9d10c5442dc2ad90837b6da562f37468dfbb84eef45981a6520aa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/si/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/si/thunderbird-68.5.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "c6989e4b4ee2f23c7d8a577305c9239c20de8754b46222ff86e0debc31fac8372f9a7b6c49a04742456c5bdd2326024180901070bc1015798f6ac28c17ab06dc";
+      sha512 = "8cfaa054258a2b83fd140702bc59c3723495ff090f2dda06830d70548c425d47522cf574bbc9328887ba7621e3bb55e17bedcd314e54d5787d6ab9d00fd836ef";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/sk/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/sk/thunderbird-68.5.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "1001fce0276a38faf011ca3136961fda7f58a7f1b21401c0769443d9b3726ee67e6809732a1f3015b65d9bf2e54edc5a9ced5a65d5fa3dc556972d05340162af";
+      sha512 = "c625263588f5b83e844c549aa182b996e7f99f3a2838c558d5a88ebfcb1cca966233c6f8f843c44651c001236d147d16b6ed3e26470c4d5c1b0b24c89472a46d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/sl/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/sl/thunderbird-68.5.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "3179e9cb041080a0be5248c7454fbf5f26f939aed8ba79ea4552f2873731b7c8f371c066c34564b614b86be77918d234c4386de7a6fb7ad4960f416788d5d10e";
+      sha512 = "9654edc706571afe5e1ccc54b1ca0a0b7d9dd800278d0ddeaebfd483334353d87e1b2ee99da0e6242fa81e4778d3d10573db48462d8f681dc9ae68814c4e7be8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/sq/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/sq/thunderbird-68.5.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "07fb5ba6aced0ce735144c6bcdf81a154ffdf1f56ca8ac6299a64d170c6a4c1308b92e7829fa402586ea8232ebdaa078d2438136aeebe585f374f43560e51553";
+      sha512 = "d994da857c1e7c40c9df313f8135583885e728e93b80e0cdb0090bec49ddcf681b318a69dd553404f36c6ada6ecd4c70f4b7325ba092d700b60697941e855535";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/sr/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/sr/thunderbird-68.5.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "5c77c8a00dcff96f4c59be212a118bbe427bb8a418d904d6e24f81f30add2f1cf6987f4b7b78660c9eaf636101518646c78d0addc93f9b8409b58a3d5fc8ca1c";
+      sha512 = "d45178698af58c9496340739b658c3974c4f8ff1386c862bc5032598f7079193321a0752d01e8da74890069ed549285925529fbf84f10738c870ba6d0d1c6f19";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/sv-SE/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/sv-SE/thunderbird-68.5.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "32c0be98bdd1392fdf42eb7d84ee5927b57ab0a1af8600349b2e51627e0b4fa4cf1f9782e4d16041d7c465a3126a18a11fc60dc15b214ee8c11babe9b3ab9c33";
+      sha512 = "c79f1beb35445674b5c73914aa6379e415af42f90ae15afed18a748f5d7867be2ff6ade3e7ebee639954e65e5cc3d0abce158cf5cc0bf8740367f84067890751";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/tr/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/tr/thunderbird-68.5.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "7c143cc6e9cfdfa0d2db25ae37dc7878f97f193f3b611d07d343738c3dc61af1e09a4718391173c85df08365f9733666ca7b3711df2e8155aab8f960e1642bc5";
+      sha512 = "a8d294506c9b255a6af29aa6df09bc87242db91b7d9e415a4f173564dc65f22cb3cc093a2e5b7c9b519aaacfdff99d855c00963bf3370cc8c4c8f0f8bc6b0328";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/uk/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/uk/thunderbird-68.5.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "db7b6115a26c6488f0019da6d7b8b944d415accbccc96b6ae475a06a35b610e4bea0474c89b6b618b2257b224beb0442fc96d40a2650da05970af94c2ac32d78";
+      sha512 = "4c889e12d7855c5e57c01d894708577485d2ec0a50634160a682e517823780efe45968e1f2bfbc72f60fa5c690aad9d9bf9ff14686cff7f4696ca5704565f20d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/uz/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/uz/thunderbird-68.5.0.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "bbbeb6f795439c0dcbc518c682bd22e76579313b6616edbd245d41459f6130a36d562d159fbaada3091cd4a0617efd2a787da147d79b8ee65dc4f14cdb9a3632";
+      sha512 = "6a8253b9c1d9f07d932bf097c12d106c8b5993eacc4560ea3e7c55d58b754cc7ea09c0e86ce8937d14b400d6a095cd26c6794633243c4b53d7ece8bf9c1118f3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/vi/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/vi/thunderbird-68.5.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "fc171feca694a222b8c18cbc56279a467e006e12a2bae9d342543ea110a4f3d6942ebe826aedcc1ee1b0820572b938cf56a7248c946b55376955bdab76d5f0e7";
+      sha512 = "ae4e2c35bc0a31422b5a2befa3b8bcd4835c535f6690a4ea11b21f0b3c33e38c2ff707ab70ac5aaec5153c4b38d44e67375aaf66b27af3b0316af35b9b5fa22b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/zh-CN/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/zh-CN/thunderbird-68.5.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "ffe6cedf7ab39695473274eb0a56bdb4264f3236b82377de57de9d17536353fbd9d311492aa5c3f91fecc007cc7f70a37611e52e44aa29b324af265a4f42b0e4";
+      sha512 = "da4aa6e899ac51ffb94674248d11d7ce072c27b9bd1aa4a5bf79c48e16d5b437b838f2b7f709e56fceba338ad9172252ae82c283bb88bb41a73fec1f876fc24a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-x86_64/zh-TW/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/zh-TW/thunderbird-68.5.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "2c463698c7c540a6c0b87feaf12afea2a053157268a9e9a50b8cf222fb7b60ed4b2b8338da9d5ff6504d78b13e644020f82f9e45cdbe60f2d022bd8301ebbb31";
+      sha512 = "47244d490e02d5d784e81b3641126b38307128d4d95096fce05717c8535318a0cd1567f20bd19b13922cf6c89ba3042350a8870360a25003a87d6ba6e3e0bccc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ar/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ar/thunderbird-68.5.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "40e5955aa4cf8816f9b1f6b0b35b2a2a315c64165dbecff1a5467c59b1eba773becaa6e36369b984e133b3f24b26b95ff30b586172a187ceb63341bb1b88310c";
+      sha512 = "6c9adce3d5e14ba5748dd8f60bafd72c5d910926de91810da7fbddb7054da822b79a79679b72125c483889383f19aa8a928d949de8785972a7067b0d23921072";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ast/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ast/thunderbird-68.5.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "c9fa685b0545b4344867590504765e5bab29efcb1f4535b5955955a0454e67d48b8cec3f806b016389640e49849e6e45f49605680d80ae68d5a49da25aa6eb17";
+      sha512 = "ff0090a6370069ff7668d650d16f3d9d24fa2325c46aecf9a3b8fc536e1138793e751fc524b63a5dec3e07c10aa77dcf09d066d9137aed1f35dcce1eb9c368e3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/be/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/be/thunderbird-68.5.0.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "582cb49b43c878bff242e46efe8bcee8798c19ddf69021c5e27b7ff874a64004643c01be06083426968d3e0a690c095ef902fa8f89959bcddd88e76a11e1a00e";
+      sha512 = "751527c55d73080fec112af6cd3f6161d848979b9b9f12f8cae4f4e28c2906f7aba5f6f2b02ad192f67f7b3b8713fbcaeba8960c53bc5bf1a9259e33f555fb94";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/bg/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/bg/thunderbird-68.5.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "6cd97d683813e413fc57bcfd0edeb36fc6679474f7459b9a83156d546c2841d9947d9ea2304a1f02bc97a7dd030657a706756ab0e07f0ef0545a0d63c671b080";
+      sha512 = "8b10b496a27a6bbe22e443213f69b0e3fdcb9bfd7fecbd509fc771ef1a22a66586febca2b303cb1a526b739ab303283086f14b314cd545fdd5f13bedb6d23fcb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/br/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/br/thunderbird-68.5.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "d1c604a702bfe245de5b8b577081677a643828eeee377da3c630e886ba7e71d513e012064ba426104d73943596ff7a551af982c0513d44b2e80f5b3ec7ae1b67";
+      sha512 = "46ffb59df042c028366ae64c58c41a65c92d7aa4e50c24ebabe8141b2e78fdc6dbb5634574c7759ff0fd067cfe0ac7c9570bcd006d4c828a7dbdd00555178647";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ca/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ca/thunderbird-68.5.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "900608dc77fd43f7a4a8a08e7bedfdd0ad9fea6df3cc2a23697141a0240c3a186103c9f91dc730e8d79462413d3449cee14f64f73b54b563ef20daca99f4aec1";
+      sha512 = "98bcdfdec73eba43ac67c571ecdda4622040b300b560f227ced55a197384d3462b89e844dca1fd310da7c326099fc072eb42adcc14d9519b8bb6b44647abd70c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/cak/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/cak/thunderbird-68.5.0.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "fc58f312b7da60f8234bd7c53b22ba3835664fb187c66d556c32dbeabf30550ab612c89c36b86ea7eee6b4bbc03b6750b5fd35173115a85f90af417c09b1e54b";
+      sha512 = "ca042a34871f95c82011e36ee700ebc60a3594229093ea2a38b28e6eeb6751c143227b9fc2dedac62608f42ffafe96aba4c600cd1e599794f2215adfa07e0270";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/cs/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/cs/thunderbird-68.5.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "5262f6f39b7001eb921f405fc665bf13507b9dac57d3dc30fcfa2379442937bcdb0a693821d09a36585047b394e719217f4eb923ff386782276bf0786d35d078";
+      sha512 = "ab121a73e77c9976e1cc4373340fce96abd419d387775e31da07bb9b4293e70fb6b753cf9904f3ab44f330b911664327e0d5d187dad8e2b46f702b112737bc79";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/cy/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/cy/thunderbird-68.5.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "ab29ef67b069b97c53dffe8b444fa2ae0b49aa894ef072a5bc95f43e2cbb1fa2bf2c84d0a734445d9af27fafcc50efc7a96c95d43cd01cc1c23433a748d48a16";
+      sha512 = "8c82689dfd9602a05b3daed5c778a29b755ac09d191765961c1e113f65dc398400bea7e32b8cdbf83b4ec02f13f473dcca759591a508d7f8d5c642db334cce33";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/da/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/da/thunderbird-68.5.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "d4b0e640bc98ef085d79244a9a3120d55b39c621aadb0aed3973fa97baec0db11f906b2a08b88b98b114bb28831c77fea9e20a93ed9a3ae66f910a3425c553ef";
+      sha512 = "9d23be92c0574ae9dbbf27058fac97a92657bebff46ed9889c7987469e9a376c4800027aa371a039e294ad5be29d650b4d11e64c0130476638d87638e4db57ed";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/de/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/de/thunderbird-68.5.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "bc82a9c40bb551852db0829dea239a133d78287e47edbd31df6053c36336f0a483f608deb5e095654e37cd9ecc234f9007ccb46cf08ba45f5e53335c040f4bda";
+      sha512 = "1f7d247455dd540e81fa15d201491415e691ea6b66df9cf36716316625decb541d2046ac8aef5efd5435d5be4e1c44bc3dc8db9eb2023b5cff1446d678a764fe";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/dsb/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/dsb/thunderbird-68.5.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "63bc8569d8c4c7c77933838b53d58b23da35692d6e64229742abe78593e8bc26d21d81d275f2c2ac4531c498143c756768a1d2e830ed3ceb0586739fa1aabdc0";
+      sha512 = "350b7378ba5b732e52af1234ce005c0ca0a5ffb286d4599c0f931dcf2c912740ea81bf6aa20c14960485be1360d1b9825ccb63c261836b389ac96088f3f77344";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/el/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/el/thunderbird-68.5.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "f41852a1ebf44ee534c43ceb054613775d33391563460fbf97f8fcd01a530d8738d5199690ff8aee48840b2ac5d2b79335ea4262c575441aacffb8ae54034c8d";
+      sha512 = "510ff7b9d4549b9daefd69f25ad92d97ae516f5f2d0bddf459d11c260ba11d6c4cb2574bf81c08cb4d8c720c7c8164355fc1c3bf5055e99ec31ea85cfb677f0b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/en-GB/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/en-GB/thunderbird-68.5.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "9324413cfbaf370b69d1addbdce63f8fac8668fb0354533b48993b78116c4b531f8bc73291b8764440d47808a582f8bdce64b3147660b8130392b14010895323";
+      sha512 = "71cd61ffb1546dd8085c976d77c51d6231ad39afe9844d69ed697aa76e4c515780c264fdf2cc3644c9a22156054cbfad355b936f891465723ced665b14460604";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/en-US/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/en-US/thunderbird-68.5.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "163b78b9333435abf8bd0efc60451076b304269e13d95cc5ca3566d2fbde178317d6c66619353ab3576e8411e0752d1157400e3f0857d7dee8279877585ba5f9";
+      sha512 = "dd2dbad0087646a87faac120d616d4b7a07f30fbbd95f657cf5ce4c08714c013522a1e05a55fb0a4f23302b02b63935b06e15e4c05f83fee18a0f482bccfaf79";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/es-AR/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/es-AR/thunderbird-68.5.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "4a96f59e3d9d3ee8675a4346a0997ff0170cb8202bbefcf60d1bf57f491eafbea5e56510310560f5e94688bede7e1767d9423b95f10724e42c3ef5cd49d54c7a";
+      sha512 = "dff461bfcf287a7fa38826a2b8f629913b1816d631b122042673677eed1636370ff50112ba0316047af0be4ffa869924c842ec17155ee422d52d40d2f7769184";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/es-ES/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/es-ES/thunderbird-68.5.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "f7eaae51d0b8f0573e73eb434ebd1ac8f1b65421ad0b50a9f59fc4f329efec11aef40e8914ed4b97bdd9189bcc14777cdf6718b2c677515e4463804166460670";
+      sha512 = "381f9d0aa2695a0acca17bfde5e3845a59ce233736ea49d24e7cdeecd557b6d7ca4544b709f80f6454bd518132f9d7bd0b85cd76d053107f6dd4eeb4fa30b4c5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/et/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/et/thunderbird-68.5.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "e0489ddc529f1d898c373667e8abfa1e1443d2816e7981660310538b6433ac8ce108eb154541d390db59810b3cdfa43ab599f2aecdd7723c15c9410751542a48";
+      sha512 = "976f673e2ca991204df9134c8b3b1bbac00470b6bb5c20bb6ae5f886d611d250a509162f332e33523ef0cb103b70461dde8137449cf565d1be0f2ff0c08075a8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/eu/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/eu/thunderbird-68.5.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "c36cf8f192319c7bce325d7c2f382e291863d9c4380afe776adb914e85fcbf74f09469f8a0e7880f2b7bc75897870245c0617fb92c811325b115a1269bf2ac5e";
+      sha512 = "8ecc9b36630e67dd2a7505103c2f2574fa1e27f6e7719d4b47e06359b8a41f2b7d97c88adc47acb6ce67205d15ec292570fb580166d963b1dd4a5bb0934c18eb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/fi/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/fi/thunderbird-68.5.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "acc72ed030d25404508d1f1cc1adaca4f5e202144effa5f8fa3d45aff72c534ab001d6f973dd9f8ff87b03ade9cbfe862d9b611dae6797ac1a0ee3c765ce86c6";
+      sha512 = "54ef27d97d3712dab4616fa8a5d14392f39962bcf5113718d6de2f0fb8c6f801100c4e9d48f3129675ebbe7dc213486181ba28b96db56d4a23cc4e56ae68e276";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/fr/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/fr/thunderbird-68.5.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "b953148ef8402effc648843b6496986889e35595c5def7aa7c6e563a73f79bed65bad28569aaa2ea73afbe0ce3476d8a7f7fea7f547c13ef39bdb8e75c37ca87";
+      sha512 = "becdddb3c175a2930bafb48a47227d8046c330ac22540662cc310bd734f89d09a693e1f355d49d00837ec9af43755c1eb7ea206e87cf550c25786086d1af5b1d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/fy-NL/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/fy-NL/thunderbird-68.5.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "d361f67487163acb0e6be8729777e7c37678287e5edd5303ee300f36bfcb62b2bb709c5a4677135ef347f6864985a9d4f9a7b986a7e0ce2987d2f650748b13e2";
+      sha512 = "dc6d3c3ce455b315fdfc1dda46b79f9ae506af0c17d46b2d2d54a7e0f1f5281619acc861b73bd6caa23e2eedef88f0e7e9c279931584e3f4a1ddb1ba87c9d3d2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ga-IE/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ga-IE/thunderbird-68.5.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "5c2e87a6770cd71002e4d7518e23bbc6a2c498ea53487088a0015f8382b3348d170e44731fc3a6c05de585531f05db971c70a7fdb4dae64e8a7cc37da8487353";
+      sha512 = "875529e87597870478e2552f06677cbff98226efdac4fc3de007662e7c0b1d575888f2bb3f23d5f5b14191793f54361d8950c041b2b82ddea5a0283b7c98b26e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/gd/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/gd/thunderbird-68.5.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "adf0cb3660d024853a683b2ba76a40db53e9ddefa0c8faaa250c30bf0ba4235981bf33a34e538b0a68a466645280824f51904ff2365994c8bb81493f42d5199f";
+      sha512 = "47b7f5aea26aedaa3ba0ca52f53f86a339b51520d4f9150711cb37c72e6dbd2f1e0872d3eae8a9ddf821d3102025f82bdea7da5a9b077e817a80b31d345ed8b8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/gl/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/gl/thunderbird-68.5.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "0f34e45513ee591a303fcb3478518b66a58782e93dcf7ae717a24947cb7280e29631050aaaaaa388c9908fef9abf51f50c2d5f624375c762dd5eb76b5cabe45f";
+      sha512 = "22e9ab419e7a80e498c459a89ac3cf39451dc95fda545ec9a0c74067d971b9f66457a6948918fb2cfd3e43a471b0f23e54bc880298813111f4cc77c5a99708fc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/he/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/he/thunderbird-68.5.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "1cf9cecce376aa8b1858546ff41418c26c126b00ce8d78eed82ce1504119173e8b2205fd27df7753b41d2fcffa9137bf8d89d79d74c106119be1ec7758aca115";
+      sha512 = "7494ec5b2315748379a4b476add35cd6ce7f4afdd90a8503efd41188af189aa06b01345f21e5808720e2aeadc6729f7e65d4c5e16b5f301f04cf2646373a4712";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/hr/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/hr/thunderbird-68.5.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "3840bf39881b0ca61c37ff81cd5bd3e26ee9e033979e6ae3293c56bf08e328bae598de56abd54a75ca5f2f9af577b766066177108fb654b99410a4850dac8c84";
+      sha512 = "e586ff015da79b357f5b3218a65ad13e861d5e73c32f6cf990aa100ca76c2f3519feb6592826271a9ffed3f3d51f40db373c2931c2dae169454710c7b5e36c07";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/hsb/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/hsb/thunderbird-68.5.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "4c6fe533a358f1a49754dee7a7d0185f4c8595f92b3458db52511d29f0c24f5af4c4e9578394d337852c82f1d2c7be27240ef7b630462fd111c1e81fc52b5cc0";
+      sha512 = "261970ba0021e09d4356284e52a8336db7448269a76714448ab5dc4f77dc91be8f2f8185915f4e1392912ca0464f4f699c754fdc2fe8080b1f68a3d210d085d6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/hu/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/hu/thunderbird-68.5.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "2077728c1d4978424cc8350fabfea488966c3ecae734ac2a1ec3a328ca05ed6e229f01d07b8c37123edb2b005a4f0ea57be8ce4d8e79269a8f94975d08583fd1";
+      sha512 = "ce329a1900b7ce6093e06d522e141b228090f20f3917e9c154a4ee95611316bc1117224f2bfe5fd0add40a5b31ba39fc87fccba4d28edea83d0be05df7b87e70";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/hy-AM/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/hy-AM/thunderbird-68.5.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "893d6c30af0873df0002efb3821bc515de446d785e0bbd03890b1e04033f09845961365666344f1c5a85a8698ee464c454e848296d50b82da5092821e8836751";
+      sha512 = "756d4675e03753d1b3398b665247301997200e5f53215f9eabd17acb7502f282a1a5be3ea098ef8db4941ce7fd1a57165344c3036b786d3857b08b6613ba4088";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/id/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/id/thunderbird-68.5.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "32709627f0f046ae00a1adbbb99b6bf10f1d2358a8c8fd5a07646a7aa05cd9a89fd20a20b0fb286f28fb65fe87ff7f1ecce7a25fbc93f54ab3ac0712cd99a6e7";
+      sha512 = "61538042a75ab0d987fc9289fa1f6e7bc74ab67cda7c78ab34ed72894f6bf3cb3cd05e0a5519b44348d050319c137113508d6f8b4845d0fcc668560acea74eb9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/is/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/is/thunderbird-68.5.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "cb6b69787a6258d18733413a91e74071f003e7c920463535f22862d2a381bdfbaee658c19eb5ee6affeabec80bf9c8756d83bce8e3d59528ced62687b61febc6";
+      sha512 = "c292cf7d04f84f6819950115f4d821f0212d87b6a8587468bb4c3c8978a98decf7dcf6e00d8db6bc557cd5e3e0621814caad65d5b86c645d82e670929d2da525";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/it/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/it/thunderbird-68.5.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "b4cb0e7fc8cc0f462183ace8b0924e545baa233f97192f62083e323fb50f9156bcafe2a9822371b6b13ff3cdebce78e134cb855524b4b0e7979d6edcd0cac7d4";
+      sha512 = "950f886bd49b8b90e8c26dd52352e13020ae752c0581d15666a512265270c39a406b2421832e3eb25eede3ff5a6129287f9c7f6849a99ba907190f257615a79c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ja/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ja/thunderbird-68.5.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "60eda8ddff44d4bad3bdfaf3e8a06b0f77b0a8de151eb76f47e376317b36ad9d240fe04a267fa8a202e56e82a1fb456a9f7954235de3ff8f6a2eb2f4f51f9730";
+      sha512 = "9902c298bf470ef71d1d00372caf3d99a16ca61ca4ae448c838c936e6ddee674a2ca6359989c852d6de41ab550a7fdca9db829951740324eeda8dbb84fb51705";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ka/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ka/thunderbird-68.5.0.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "686318185f32947f60d451d01ccfddb8203997d077080da2bcb79a44eacdc59d688e8cc5c80fd46aab4b31bee7e13d0122fef169874403111186befddd0bdfe3";
+      sha512 = "123cead4f30751e8422821690a436796d1b915e38c1b03aac8c2bb339df7f2d69d6794f4261971f73595add6db6a9887d0e5d4f0699459baeeec46cc687f1efa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/kab/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/kab/thunderbird-68.5.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "9c278760cf0707045f02525c9320946d3c844b868550bc434f1bdda27eb52b6cc1d1c719aded4d741eb2a413899cd2c0627194febae09b39fa30a1f8fe56c880";
+      sha512 = "c9d3a9d368b8db85f7c6c83ff64bb5b3ab37faab2b2cdf29d23b444dc42ef394a951d3dc4c164eed3c5c278f12c9d42ef8a5f7abcc320ed6b6e181ec540873d9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/kk/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/kk/thunderbird-68.5.0.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "e0ef017074e515d04bddda0d9720723d903f2ebe50c51b14c220adb06e4346fb49e2dab14d91e33099965bd6fd93547fbe591c34539cbb061f74f98a11d85421";
+      sha512 = "2f3ba44e31fcacadf517de3d7e3c108335a75de4d54023de296d9329bba8cbb90d5989093e2d6afdfc8c7d2ce71db9e4bdfd72ff57d13bae281406cdb31a5670";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ko/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ko/thunderbird-68.5.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "0aa2dcfb8f76250642a2c50dde421e99f881561c05028f7b167eb79226843b51a33cef56ee64b18cc5c4c1231a28b6747adc5aaaad46b228705f8459e5ae9ec5";
+      sha512 = "8a8bf9ad7f9f2d7132d8f8635ef9e924c1f488ca9963157ab2b40230a63c48de9223cd3076489a7249894c2bb9a369dc7b80a09c05387fbb93906a562868a96e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/lt/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/lt/thunderbird-68.5.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "ef95d5727f64da1013a0de99fae05d49b04cb8a78e9059231e609544106e9c1df45c34188cf879849028de40a35b488d6d00df4c11b81452de0353e5c224e724";
+      sha512 = "79967b8b49ba9cc63fe379fa16395962e9fee3704c9513222934ff7bc6f89e3ea2dcae37f1f74c30bef962ddda450cac5fb9f9d0d6fdf65492aa8246f0334a02";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ms/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ms/thunderbird-68.5.0.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "f3176d9cb1c2c3689fd70b9beb62c54ef8ff794724b57b074fbeac72ba575aa49675cca53960f588da01fddf9921be0b606baab6234ccdd930a9916805b08135";
+      sha512 = "5f4c7d1a015aee2ab55a7387a621a793bd8c006740e2e97b2a0237c6947841cfe5cdc13a184614df58a082b0ab90fc581d84a31f98f0ef8c782a61326f027b1d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/nb-NO/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/nb-NO/thunderbird-68.5.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "ae78f3dba2009e70c9f9aa2449555ae4d854ffd22d83b9a41df41f62ebc090a255cd3ad60cf47938137625c7c726fd8dcb26f4136dc1732b22d2e3823967ab8f";
+      sha512 = "60679df9cc0898513b343955d8e99362ea106599f98ddf238c694c7b35e4a260b3fa3b8a80a438d3a9891bfe4f1fee504d868e293f9c9eadf8d9042c280d7f08";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/nl/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/nl/thunderbird-68.5.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "8e52c3bedf7715a063e0f94ca9b1b927eeac872917f5b5fbbec90cb4a87b0aa73b28a809fc30f3a99169b2bff4ffb3b85234f5fbf5e97230eb2a099cee775715";
+      sha512 = "ddc26e850a055a532107f7f6d329fc4385b0fbd68eea382574b8a3f2510d0b4c75587696b1994adc710ce286ddf41bc44f80cb42c8011171dcf813a4e3a992f1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/nn-NO/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/nn-NO/thunderbird-68.5.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "3c51c7436e4b37d9b8df40543db1506aea856b99e10cb06805da4c3e45fcb67350222c90e5b6ebdeaa0318ac57357872e7d7932f910462466abd70f364bd8b72";
+      sha512 = "0ebef3051ad541cb042ca3512c145bf46b5807990b3643d42d3d21f4c9c01fdb69872967381ce9790c70e59948dd991d83286bf41404312e62074d814d70a1fa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/pl/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/pl/thunderbird-68.5.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "4996a28f8e7a6dbf351f93339abf3b30a85ee2311db7234c516c8994a90059169538b5c49d789195818ba7449ed308f7c4c7f8d54ce910aa10f0c5103fcbd992";
+      sha512 = "3fab9ea4cf7c2e9ae5bb30059a2cd96c9cab281c87600927dba3b7a932e434f56c7359cc05e8f5c568232d53ba68fcf7d0164b59021a9ac2e502415129abc38e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/pt-BR/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/pt-BR/thunderbird-68.5.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "03f16be0561a16d943dcbd2fe898839060683a3dc16773647169b8da71d0c2ce235aeeb3021b474b4beb00b41bb56d486bccb870321adfafffe4aa2522d8cf39";
+      sha512 = "7e5c5e2a1d5e8c940cdbb43fc394c75b97b5c1a3898e93647473b2dc751ac020225ba14ae812ddc1b0585fd4f6df747053d443d6538b21f96c7f8aab38521f37";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/pt-PT/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/pt-PT/thunderbird-68.5.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "03225c1bc7352c79c457f6be6149bba18b7682bc1e66fd6745613b80701b9138ba3fa4d1016b7cd2a0cb4fb804a9a5329a3768f9c9e53529e9279f64ddb4765c";
+      sha512 = "a02fe6bad1dc6479df27ebe62a13ef2dc0a8f52bead42e65bee89e76bfa117c975fe1db612d0a577f7d8de84bb3ee82f27a3af247675721e4cb2e54467ff300a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/rm/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/rm/thunderbird-68.5.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "f0d42c9add6b6ca9e3bd768ef56f320f57a8e62eaf0eec8f8d6d544bcf95c3549990940ce5b8b04e91998a012bae20d92f186c1f42273e5f7d1fed8e504ab082";
+      sha512 = "56967ecc02e1cfa91d9c942d31e5ce1c3f16319732344aee385acd0f0f40882e65f02e2134bd53483c5459039982eb261b8d0b97aed5388fdb2754f58d2eb80f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ro/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ro/thunderbird-68.5.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "63bed7e8e38dc7dbc468fd668d8fac6ac8ee4502a035c881fc09176f2868c184712282bb9c3787da07fef0a27af3ec1f01e70f39711f90b4694ecd31be5173dc";
+      sha512 = "20b6bc1e4fd8a595e42e468d94216aa0502aadb7de9cecd1a6da1fb14fc6008976551467ceb1e258fc87f98f4cfc485d91697817525a9a4ddb65626ccf6d989c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/ru/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ru/thunderbird-68.5.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "0f694746bdfc5e69fb82c57f401bca6b33661205c3cd0d94857d80432711d8396fbee8dfcd91c86022fdb693bbb1d096e5802077b49b98de008cea0c6fadc9cb";
+      sha512 = "325649a3cb72ac2c3d8ef01caaf00123a2ffd5772ced16271cef8c08408e8828c9d96ca8ea81ca594f669b936b68f941d35adc1f00268447c782efca186a4a36";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/si/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/si/thunderbird-68.5.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "ec2f4ca4a03ade9225307d3a7272cf8ccc6616612c3ac5ccdfa13219d33bb3e7d86dbe724d500b907a450d4a7cc1066cfc13a64e679486f8557016ed17d3f73d";
+      sha512 = "164e0588d563b49a5652a97f21eaf513cbbf9af7ff97f93446f7ab99800d0cbcb61714e72e53feccb407992386a02715413c26c70ca46c45dd15ca7357e185a2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/sk/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/sk/thunderbird-68.5.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "95e700d67d831f7ebc505ffd699a58641bd5ffd5d0f92ac09472d1fa7f24310c90551821149fde4782357c551487cc8dc999f5e94c8c55e8fbd24508e9c9edaa";
+      sha512 = "fc2e7881caed0943f773a687653e2fc301ace20f59e7afb1074350cda33a1f18998789410c10d1f0aa9cb4ceae7268ab251efd7b5ca02a6949da6b613cd88780";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/sl/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/sl/thunderbird-68.5.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "9be4327cf8696a8324c37ae80f0537322c1a2601db32e1a601155a25207b41db8d2b028d8da7b43b97986465b425689474fbb660eda97abf450216d50ae059c6";
+      sha512 = "4dd57628b1d8c4518b889424f457c8f3b83bfbf6aca2cb9be403fe97020c25d4ef95e5d473c5d2be67a9caf184aa657c6c13a549cc3b7a2e5e29199c990cda8d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/sq/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/sq/thunderbird-68.5.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "bdc02096793ea114f6e44532d6e998fc36ec4ff7df2dc21df1225241cdd24ddf6f4b4d005563f698b53c743b0abf0a6cdc276efac6cff6d4803df2a84f5c61f7";
+      sha512 = "3cda84132453a2802738145fe38c9a36db162842bda1a1c2a125a1f8c4cfc6af2bbd4c629804e539f260af8964c34f5af77965d755ea0f327f7765cb43c525d2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/sr/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/sr/thunderbird-68.5.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "a9ffbe1c59b0171fc8ed611f61e923c6f3d260ecac226c122f7d10bd858607b963fd1d89a896db0eb1754c3f75b18cbbe66c579c8da994490e04380c907c8fee";
+      sha512 = "6d1a2da487b616716c680619528f9b70fc5ca9c4c34e3e66841ace9254cddae6fa63396bcb8dec6d961a29f0dc14aefc660e96f90a82c7801a1acb7b21275fe1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/sv-SE/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/sv-SE/thunderbird-68.5.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "86f3c1330fd0a7a920d9cb93f6387cdde69873c2b60bb9c71ff8fe3c3c6cb0cede8cb399d16a7d876708c3bf4142ae0188a1a7b0cd2dfa7a271fdee363a4ce4e";
+      sha512 = "c2b3901a02f01123460816c566f62374ee954e18c411868059211d97d88b8d59c2452eb0fe1ecc940473b68f983dfb64f276a1f167178fba0d79a03235ac2758";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/tr/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/tr/thunderbird-68.5.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "4b6086ee5bc0925d790b552d9c812d8bc02e5cb2579cca9cdd94475c4dc3ed390c989b0f9f7b22d119caa64f76f45f8aee06c100a131874d86c03692e6979750";
+      sha512 = "bdcfc20888bd896abdb2dd52ae5d4497a5a9706c01ae0193548707d326b74eb5af448db5d0e9e647c976024560e091305bc6d074ca8181886e27a2e201446204";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/uk/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/uk/thunderbird-68.5.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "27dccd517995446bff809c74b79900488694d2a999fdba38b39225bc38d212c2c394c0256c6146b9485af67da27c8dfe3a31e7e380e2e07d19abd1a8a086e44d";
+      sha512 = "e71a965b6d3c7f90b97361435027af0b0fe194233500f127b2b9c75fbc2cd2c4ecf4228b537081a8ef61131e97e09b348198d3f59db7587a2e40a75b0e90686e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/uz/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/uz/thunderbird-68.5.0.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "344e0311945f8139be8be3413bbd0106ae4197f78d809ce729634ec888e50ea2153b13ddf14f5680224a5be049080d540a9db93f22c3ef141932ed0b4d769dd0";
+      sha512 = "305c74f94e10565923073d157dbc6c62d03e6c1f5291cad5a0fcddf5cd158e99f8fd88b84c4c0e4a352139339398c80f84abebf486503030fa5a0dd4ac1d02ea";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/vi/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/vi/thunderbird-68.5.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "b023e8afab96756e67b589d912d27de880fad51b9160645a3320ebd8d1af9a13c036d09fed7dd60bcf57876a93056cfa5f780c505b03bbd2825158e7c65aeb93";
+      sha512 = "5578e325a16c94acae412ba403abbd7920b2b78e8e469c16175d27e44bebcd257dcf9c5e4454276422ebbc7797049f927e0a131be54aa11ceac1878fa1ac6c13";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/zh-CN/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/zh-CN/thunderbird-68.5.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "52553bee4e8954ec54b3bc79f02149359d4a96b07a94a7f175abeba1795fc0c92e734631870b141fe4c9d094425d9e555b473bdbc1088a9845bbd49aaaebc181";
+      sha512 = "a8f2a25bac4b312d2c61bf3e6a7fae6a98fb6ed43682005881157809083dbb1939afd6200b67236b3087148622978f5616d554202f586ffd60b5dadb65dad433";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.4.2/linux-i686/zh-TW/thunderbird-68.4.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/zh-TW/thunderbird-68.5.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "3f792f3529d85eba88a76b7bb87f207ba3fefc91c7a6447554572c7e2666d19d41a5f65f811a60173a584ecfc192f9a38580a8861bd87cd5bb71adc582c4d825";
+      sha512 = "9b463179ef67102ba10d440071b10a7e075c586c72cc352b2af05db9b048b46819a913547f5d0e0ca3a5c2e26110515d4a87db36f9765b59f64fd58f76662785";
     }
     ];
 }

From 64fe2b7260acc39dbf592246f10f3544a0398874 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 12 Feb 2020 03:16:07 +0900
Subject: [PATCH 0339/4636] thunderbird: 68.4.2 -> 68.5.0

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

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 2011c35f1a7f..8d4fa98ef729 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -72,13 +72,13 @@ assert waylandSupport -> gtk3Support == true;
 
 stdenv.mkDerivation rec {
   pname = "thunderbird";
-  version = "68.4.2";
+  version = "68.5.0";
 
   src = fetchurl {
     url =
       "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
     sha512 =
-      "30k0qwg8vb6gj8j8kc198n3v0lzd6bj5khdcdhyw7wrsz0802k2lnai836p9ji5kybf9v8vs5n8g4ml1yl88sxvbg0692ijz8xmkbix";
+      "15hi1193z6gp05dx6pqakxydyrxzls4xhfpvrk5qg458gxhdfj4qbgb33mcf944g7vf2hk5mk6nbgmdxlb9svw1n72ym2adyaca6n5v";
   };
 
   nativeBuildInputs = [

From 68cff3a69c0b1e52123875ea8183970136bb0941 Mon Sep 17 00:00:00 2001
From: Robert Djubek <envy1988@gmail.com>
Date: Tue, 11 Feb 2020 14:32:29 +0000
Subject: [PATCH 0340/4636] matomo: 3.13.1 -> 3.13.2

Updated both matomo and matomo-beta to the latest version
---
 pkgs/servers/web-apps/matomo/default.nix | 192 ++++++++++++-----------
 1 file changed, 98 insertions(+), 94 deletions(-)

diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix
index d5f0b7057f07..09a8d21c4ce9 100644
--- a/pkgs/servers/web-apps/matomo/default.nix
+++ b/pkgs/servers/web-apps/matomo/default.nix
@@ -3,103 +3,107 @@
 let
   versions = {
     matomo = {
-      version = "3.13.1";
-      sha256 = "071m3sw3rrhlccbwdyklcn8rwp4mcnii5m2a7zmgx3rv87i9n2ni";
+      version = "3.13.2";
+      sha256 = "1psysdz60h5rvgbsflkfprygxnh3kq60snqamyss07rk0ahbcb16";
     };
 
     matomo-beta = {
-      version = "3.12.0";
-      beta = 3;
-      sha256 = "1n7b8cag7rpi6y4145cll2irz3in4668jkiicy06wm5nq6lb4bdf";
+      version = "3.13.2";
+      # `beta` examples: "b1", "rc1", null
+      # TOOD when updating: use null if stable version is >= latest beta or release candidate
+      beta = null;
+      sha256 = "1psysdz60h5rvgbsflkfprygxnh3kq60snqamyss07rk0ahbcb16";
     };
   };
-  common = pname: {version, sha256, beta ? null}:
-    let fullVersion = version + stdenv.lib.optionalString (beta != null) "-b${toString beta}";
-  name = "${pname}-${fullVersion}";
+  common = pname: { version, sha256, beta ? null }:
+    let
+      fullVersion = version + stdenv.lib.optionalString (beta != null) "-${toString beta}";
+      name = "${pname}-${fullVersion}";
+    in
+
+      stdenv.mkDerivation rec {
+        inherit name;
+        version = fullVersion;
+
+        src = fetchurl {
+          url = "https://builds.matomo.org/matomo-${version}.tar.gz";
+          inherit sha256;
+        };
+
+        nativeBuildInputs = [ makeWrapper ];
+
+        # make-localhost-default-database-server.patch:
+        #   This changes the default value of the database server field
+        #   from 127.0.0.1 to localhost.
+        #   unix socket authentication only works with localhost,
+        #   but password-based SQL authentication works with both.
+        # TODO: is upstream interested in this?
+        # -> discussion at https://github.com/matomo-org/matomo/issues/12646
+        patches = [ ./make-localhost-default-database-host.patch ];
+
+        # this bootstrap.php adds support for getting PIWIK_USER_PATH
+        # from an environment variable. Point it to a mutable location
+        # to be able to use matomo read-only from the nix store
+        postPatch = ''
+          cp ${./bootstrap.php} bootstrap.php
+        '';
+
+        # TODO: future versions might rename the PIWIK_… variables to MATOMO_…
+        # TODO: Move more unnecessary files from share/, especially using PIWIK_INCLUDE_PATH.
+        #       See https://forum.matomo.org/t/bootstrap-php/5926/10 and
+        #       https://github.com/matomo-org/matomo/issues/11654#issuecomment-297730843
+        installPhase = ''
+          runHook preInstall
+
+          # copy everything to share/, used as webroot folder, and then remove what's known to be not needed
+          mkdir -p $out/share
+          cp -ra * $out/share/
+          # tmp/ is created by matomo in PIWIK_USER_PATH
+          rmdir $out/share/tmp
+          # config/ needs to be accessed by PIWIK_USER_PATH anyway
+          ln -s $out/share/config $out/
+
+          makeWrapper ${php}/bin/php $out/bin/matomo-console \
+            --add-flags "$out/share/console"
+
+          runHook postInstall
+        '';
+
+        filesToFix = [
+          "misc/composer/build-xhprof.sh"
+          "misc/composer/clean-xhprof.sh"
+          "misc/cron/archive.sh"
+          "plugins/Installation/FormDatabaseSetup.php"
+          "vendor/leafo/lessphp/package.sh"
+          "vendor/pear/archive_tar/sync-php4"
+          "vendor/szymach/c-pchart/coverage.sh"
+          # drupal_test.sh does not exist in 3.12.0-b3; added for 3.13.0
+          "vendor/twig/twig/drupal_test.sh"
+        ];
+
+        # This fixes the consistency check in the admin interface
+        #
+        # The filesToFix list may contain files that are exclusive to only one of the versions we build
+        # make sure to test for existence to avoid erroring on an incompatible version and failing
+        postFixup = ''
+          pushd $out/share > /dev/null
+          for f in $filesToFix; do
+            if [ -f "$f" ]; then
+              length="$(wc -c "$f" | cut -d' ' -f1)"
+              hash="$(md5sum "$f" | cut -d' ' -f1)"
+              sed -i "s:\\(\"$f\"[^(]*(\\).*:\\1\"$length\", \"$hash\"),:g" config/manifest.inc.php
+            fi
+          done
+          popd > /dev/null
+        '';
+
+        meta = with stdenv.lib; {
+          description = "A real-time web analytics application";
+          license = licenses.gpl3Plus;
+          homepage = https://matomo.org/;
+          platforms = platforms.all;
+          maintainers = with maintainers; [ florianjacob kiwi ];
+        };
+      };
 in
-
-stdenv.mkDerivation rec {
-  inherit name;
-  version = fullVersion;
-
-  src = fetchurl {
-    url = "https://builds.matomo.org/matomo-${version}.tar.gz";
-    inherit sha256;
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  # make-localhost-default-database-server.patch:
-  #   This changes the default value of the database server field
-  #   from 127.0.0.1 to localhost.
-  #   unix socket authentication only works with localhost,
-  #   but password-based SQL authentication works with both.
-  # TODO: is upstream interested in this?
-  # -> discussion at https://github.com/matomo-org/matomo/issues/12646
-  patches = [ ./make-localhost-default-database-host.patch ];
-
-  # this bootstrap.php adds support for getting PIWIK_USER_PATH
-  # from an environment variable. Point it to a mutable location
-  # to be able to use matomo read-only from the nix store
-  postPatch = ''
-    cp ${./bootstrap.php} bootstrap.php
-  '';
-
-  # TODO: future versions might rename the PIWIK_… variables to MATOMO_…
-  # TODO: Move more unnecessary files from share/, especially using PIWIK_INCLUDE_PATH.
-  #       See https://forum.matomo.org/t/bootstrap-php/5926/10 and
-  #       https://github.com/matomo-org/matomo/issues/11654#issuecomment-297730843
-  installPhase = ''
-    runHook preInstall
-
-    # copy everything to share/, used as webroot folder, and then remove what's known to be not needed
-    mkdir -p $out/share
-    cp -ra * $out/share/
-    # tmp/ is created by matomo in PIWIK_USER_PATH
-    rmdir $out/share/tmp
-    # config/ needs to be accessed by PIWIK_USER_PATH anyway
-    ln -s $out/share/config $out/
-
-    makeWrapper ${php}/bin/php $out/bin/matomo-console \
-      --add-flags "$out/share/console"
-
-    runHook postInstall
-  '';
-
-  filesToFix = [
-    "misc/composer/build-xhprof.sh"
-    "misc/composer/clean-xhprof.sh"
-    "misc/cron/archive.sh"
-    "plugins/Installation/FormDatabaseSetup.php"
-    "vendor/leafo/lessphp/package.sh"
-    "vendor/pear/archive_tar/sync-php4"
-    "vendor/szymach/c-pchart/coverage.sh"
-    # drupal_test.sh does not exist in 3.12.0-b3; added for 3.13.0
-    "vendor/twig/twig/drupal_test.sh"
-  ];
-
-  # This fixes the consistency check in the admin interface
-  #
-  # The filesToFix list may contain files that are exclusive to only one of the versions we build
-  # make sure to test for existence to avoid erroring on an incompatible version and failing
-  postFixup = ''
-    pushd $out/share > /dev/null
-    for f in $filesToFix; do
-      if [ -f "$f" ]; then
-        length="$(wc -c "$f" | cut -d' ' -f1)"
-        hash="$(md5sum "$f" | cut -d' ' -f1)"
-        sed -i "s:\\(\"$f\"[^(]*(\\).*:\\1\"$length\", \"$hash\"),:g" config/manifest.inc.php
-      fi
-    done
-    popd > /dev/null
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A real-time web analytics application";
-    license = licenses.gpl3Plus;
-    homepage = https://matomo.org/;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ florianjacob kiwi ];
-  };
-};
-in stdenv.lib.mapAttrs common versions
+stdenv.lib.mapAttrs common versions

From 4b33402d30128fd9b81075c8cf67cb3fd1ea2a87 Mon Sep 17 00:00:00 2001
From: 0x4A6F <0x4A6F@users.noreply.github.com>
Date: Tue, 11 Feb 2020 19:29:51 +0100
Subject: [PATCH 0341/4636] maintainers: fix 0x4A6F

---
 pkgs/applications/qubes/qubes-core-vchan-xen/default.nix | 2 +-
 pkgs/applications/window-managers/cwm/default.nix        | 2 +-
 pkgs/tools/networking/pmacct/default.nix                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix b/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix
index e8241ede96cd..ecb9403be36e 100644
--- a/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix
+++ b/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     description = "Libraries required for the higher-level Qubes daemons and tools";
     homepage = "https://qubes-os.org";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ "0x4A6F" ];
+    maintainers = [ maintainers."0x4A6F" ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix
index 53489eca3a06..0e57643c64d3 100644
--- a/pkgs/applications/window-managers/cwm/default.nix
+++ b/pkgs/applications/window-managers/cwm/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A lightweight and efficient window manager for X11";
     homepage    = "https://github.com/leahneukirchen/cwm";
-    maintainers = with maintainers; [ "0x4A6F" mkf ];
+    maintainers = with maintainers; [ maintainers."0x4A6F" mkf ];
     license     = licenses.isc;
     platforms   = platforms.linux;
   };
diff --git a/pkgs/tools/networking/pmacct/default.nix b/pkgs/tools/networking/pmacct/default.nix
index 5d0c5cccdedb..861c44ef70fe 100644
--- a/pkgs/tools/networking/pmacct/default.nix
+++ b/pkgs/tools/networking/pmacct/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://www.pmacct.net/";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ "0x4A6F" ];
+    maintainers = [ maintainers."0x4A6F" ];
     platforms = platforms.unix;
   };
 }

From b70a3234c541ec0f678d279e8cfaac3a5a6beaab Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 11 Feb 2020 13:40:00 -0500
Subject: [PATCH 0342/4636] nodejs-12_x: 12.15.0 -> 12.16.0

Changelog: https://github.com/nodejs/node/releases/tag/v12.16.0
---
 .../web/nodejs/disable-libatomic-darwin.patch         | 11 -----------
 pkgs/development/web/nodejs/v12.nix                   |  8 +++-----
 2 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/development/web/nodejs/disable-libatomic-darwin.patch

diff --git a/pkgs/development/web/nodejs/disable-libatomic-darwin.patch b/pkgs/development/web/nodejs/disable-libatomic-darwin.patch
deleted file mode 100644
index 7ac6c2ef8953..000000000000
--- a/pkgs/development/web/nodejs/disable-libatomic-darwin.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/node.gyp
-+++ b/node.gyp
-@@ -289,7 +289,7 @@
-           '-Wl,-bnoerrmsg',
-         ],
-       }],
--      ['OS in ("linux", "mac") and llvm_version != "0.0"', {
-+      ['OS == "linux" and llvm_version != "0.0"', {
-         'libraries': ['-latomic'],
-       }],
-     ],
diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix
index 1cb11037e560..e8a4634773d6 100644
--- a/pkgs/development/web/nodejs/v12.nix
+++ b/pkgs/development/web/nodejs/v12.nix
@@ -1,12 +1,10 @@
-{ stdenv, callPackage, openssl, icu, enableNpm ? true }:
+{ callPackage, openssl, icu, enableNpm ? true }:
 
 let
   buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; };
 in
   buildNodejs {
     inherit enableNpm;
-    version = "12.15.0";
-    sha256 = "06x8sma4rxbw0mxj0l4438lfpv9abxmnw2ibamq1acng1jl4zyyj";
-
-    patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin.patch ];
+    version = "12.16.0";
+    sha256 = "09grij355z210mkzkzarb6gwz8b02lnaxzdll1249kiz8wvhdjdq";
   }

From 7926ad01f97fd9afab1792dc0546919f4fe1ead4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 11 Feb 2020 15:56:28 -0300
Subject: [PATCH 0343/4636] mate: update the version in the update script

---
 pkgs/desktops/mate/update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/mate/update.sh b/pkgs/desktops/mate/update.sh
index fe294ae4985a..d214e07f8cdd 100755
--- a/pkgs/desktops/mate/update.sh
+++ b/pkgs/desktops/mate/update.sh
@@ -7,7 +7,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
 root=../../..
 export NIXPKGS_ALLOW_UNFREE=1
 
-mate_version=1.22
+mate_version=1.24
 theme_version=3.22
 materepo=https://pub.mate-desktop.org/releases/${mate_version}
 themerepo=https://pub.mate-desktop.org/releases/themes/${theme_version}

From a0ef7ad1d60ee28dced446b5c6dfa1895036468f Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 11 Feb 2020 19:54:17 +0100
Subject: [PATCH 0344/4636] androidStudioPackages.beta: 3.6.0.19 -> 3.6.0.20

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

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 60d00b7fbc7a..414e205b9a95 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,9 +13,9 @@ let
     sha256Hash = "1nsm4d3vdx90szqd78a8mjq65xc9m5ipd35cqrlx3c3ny900sqxg";
   };
   betaVersion = {
-    version = "3.6.0.19"; # "Android Studio 3.6 RC 2"
-    build = "192.6165589";
-    sha256Hash = "1d47nfhzb0apfzin4bg5bck4jjid3jipm5s4n36r7fh20lpx93z5";
+    version = "3.6.0.20"; # "Android Studio 3.6 RC 3"
+    build = "192.6186006";
+    sha256Hash = "153piq67yps5jwqrbciam4kpxziavml29d8ya5bi2rvfhipdd7da";
   };
   latestVersion = { # canary & dev
     version = "4.0.0.9"; # "Android Studio 4.0 Canary 9"

From b4c324c719beed529dce2c55b67afac3504ec834 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Tue, 11 Feb 2020 20:04:40 +0100
Subject: [PATCH 0345/4636] proggyfonts: cleanup

- mkfontdir and mkfontscale have been merged
- use install insead of cp
- make gzip deterministic with -n
---
 pkgs/data/fonts/proggyfonts/default.nix | 29 ++++++++++---------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/pkgs/data/fonts/proggyfonts/default.nix
index 580ea61a2df5..51165ceac13e 100644
--- a/pkgs/data/fonts/proggyfonts/default.nix
+++ b/pkgs/data/fonts/proggyfonts/default.nix
@@ -1,6 +1,4 @@
-{ stdenv, fetchurl, mkfontdir, mkfontscale }:
-
-# adapted from https://aur.archlinux.org/packages/proggyfonts/
+{ stdenv, fetchurl, mkfontscale }:
 
 stdenv.mkDerivation {
   name = "proggyfonts-0.1";
@@ -10,31 +8,28 @@ stdenv.mkDerivation {
     sha256 = "1plcm1sjpa3hdqhhin48fq6zmz3ndm4md72916hd8ff0w6596q0n";
   };
 
-  nativeBuildInputs = [ mkfontdir mkfontscale ];
+  nativeBuildInputs = [ mkfontscale ];
 
   installPhase =
     ''
-      mkdir -p $out/share/doc/$name $out/share/fonts/misc $out/share/fonts/truetype
-
-      cp Licence.txt $out/share/doc/$name/LICENSE
-
+      # compress pcf fonts
+      mkdir -p $out/share/fonts/misc
       rm Speedy.pcf # duplicated as Speedy11.pcf
       for f in *.pcf; do
-        gzip -c "$f" > $out/share/fonts/misc/"$f".gz
+        gzip -n -9 -c "$f" > $out/share/fonts/misc/"$f".gz
       done
-      cp *.bdf $out/share/fonts/misc
-      cp *.ttf $out/share/fonts/truetype
 
-      for f in misc truetype; do
-        cd $out/share/fonts/$f
-        mkfontscale
-        mkfontdir
-      done
+      install -D -m 644 *.bdf -t "$out/share/fonts/misc"
+      install -D -m 644 *.ttf -t "$out/share/fonts/truetype"
+      install -D -m 644 Licence.txt -t "$out/share/doc/$name"
+
+      mkfontscale "$out/share/fonts/truetype"
+      mkfontdir   "$out/share/fonts/misc"
     '';
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "1l1sxmzp3gcd2d32nxar6xwd1v1w18a9gfh57zmsrfpspnfbz7y1";
+  outputHash = "1x196rp3wqjd7m57bgp5kfy5jmj97qncxi1vwibs925ji7dqzfgf";
 
   meta = with stdenv.lib; {
     homepage = http://upperbounds.net;

From ab1a14d581b5afd6126c6e474dedb94308ab382c Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Tue, 11 Feb 2020 20:34:46 +0100
Subject: [PATCH 0346/4636] trezord-go: 2.0.27 -> 2.0.28

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

diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix
index 134d36258a56..e6427e5970fa 100644
--- a/pkgs/servers/trezord/default.nix
+++ b/pkgs/servers/trezord/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "trezord-go";
-  version = "2.0.27";
+  version = "2.0.28";
 
   goPackagePath = "github.com/trezor/trezord-go";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner  = "trezor";
     repo   = "trezord-go";
     rev    = "v${version}";
-    sha256 = "00d90qmmk1pays78a2jm8gb7dncvlsjjn4033q1yd1ii3fxc6nh8";
+    sha256 = "02c1mvn01gcfls37sa0c7v2lwffg14x54np8z7d4hjzxxzwg4gpw";
   };
 
   propagatedBuildInputs = [ trezor-udev-rules ];

From ae4b390551ea728a1d2229426db89505928a9020 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 11 Feb 2020 14:42:18 -0500
Subject: [PATCH 0347/4636] linux: 4.19.102 -> 4.19.103

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index f4c3ac52c9c7..a5ca2e24ac44 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.102";
+  version = "4.19.103";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "05g0gkwvlwfx1wlinnwm3ryq7fblmxjzhp12g6vx2jbvvn486bih";
+    sha256 = "0hxvqkjy63370sr9j4j0a1kzqwxxdn3i8i6wwc5c2gbzpmqlay5l";
   };
 } // (args.argsOverride or {}))

From 05b407ac81bae73c6c070218f3a053e6723f3fd0 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 11 Feb 2020 14:42:30 -0500
Subject: [PATCH 0348/4636] linux: 5.4.18 -> 5.4.19

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 883def31b7fb..69996e6c1efb 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.4.18";
+  version = "5.4.19";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "12ad4fnxag16ar2afiljv4nnv15i4f493sz6m7i9qgjld7yz3scj";
+    sha256 = "1f3pzg8vai5qz19gy9gf3rxs2z4dsw78zjkkfnha8iiy2mqvk14m";
   };
 } // (args.argsOverride or {}))

From da8c2896e8554cefc332e4975787e6b4e04831df Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 11 Feb 2020 14:42:38 -0500
Subject: [PATCH 0349/4636] linux: 5.5.2 -> 5.5.3

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.5.nix b/pkgs/os-specific/linux/kernel/linux-5.5.nix
index 52d1f6abca56..87192ba3b92f 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.5.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.5.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.5.2";
+  version = "5.5.3";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "17pr9v04g3lrar585l1zpnsmrivryqxwyfvjc3qp8wrkn21z7x94";
+    sha256 = "1cnaa64i72cfxmspi0lw6598rq8k42dq0jjz0j1n6x2cykf3xvrb";
   };
 } // (args.argsOverride or {}))

From b6d2d4216513a876e2be8b1b7140b0eb7f06b543 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 11 Feb 2020 14:48:14 -0500
Subject: [PATCH 0350/4636] oh-my-zsh: 2020-02-07 -> 2020-02-11

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

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 23df4fc8a81f..3b67d2a2280d 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2020-02-07";
+  version = "2020-02-11";
   pname = "oh-my-zsh";
-  rev = "e81782ac3faf24cac2384a99366f748040b3f20a";
+  rev = "17428f3c9a99c8d81e57bcf565d39011669e65ed";
 
   src = fetchgit { inherit rev;
     url = "https://github.com/ohmyzsh/ohmyzsh";
-    sha256 = "0mry8a43kfmb1wap85ss4dvmy5x3sil14z98fd15l9cgkqxpjnlb";
+    sha256 = "1i2f5gvr8gdvwx4x135j949x4q1q721jq2936p33c1zk9wq4kzwc";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];

From 88e4258df4056a962e26ddaf6093962e30337533 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 11 Feb 2020 20:04:58 +0000
Subject: [PATCH 0351/4636] pounce: 1.0p1 -> 1.1

---
 pkgs/servers/pounce/default.nix | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/pkgs/servers/pounce/default.nix b/pkgs/servers/pounce/default.nix
index c581027530ea..8fb71f72721d 100644
--- a/pkgs/servers/pounce/default.nix
+++ b/pkgs/servers/pounce/default.nix
@@ -2,31 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pounce";
-  version = "1.0p1";
+  version = "1.1";
 
   src = fetchzip {
-    url = "https://code.causal.agency/june/pounce/archive/${version}.zip";
-    sha256 = "1fh1cf15ybl962n7x70hlg7zfcmpwgq6q90s74d3jhawmjj01syw";
+    url = "https://git.causal.agency/pounce/snapshot/pounce-${version}.tar.gz";
+    sha256 = "07iyh6ikrlf7y57k462jcr00db6aijk9b2s7n7l7i49hk7kmm6wq";
   };
 
-  patches = [
-    # Don't always create ${ETCDIR}/rc.d
-    (fetchpatch {
-      url = https://code.causal.agency/june/pounce/commit/db65889605a2fa5352e90a573b7584a6b7a59dd5.patch;
-      sha256 = "0bxhig72g4q0hs8lb7g8lb7kf0w9jdy22qwm9yndlwrdw3vi36zq";
-    })
-    # Simplify Linux.mk
-    (fetchpatch {
-      url = https://code.causal.agency/june/pounce/commit/b7dc2e3439a37d23d4847e130b37ece39b8efdd7.patch;
-      sha256 = "0c2pa6w9abkmaaq4957arfmpsrn933vcrs4a2da785v57pgkj4lq";
-    })
-    # Reference openssl(1) by absolute path
-    (fetchpatch {
-      url = https://code.causal.agency/june/pounce/commit/973f19b4fe73ef956fbb4eeaf963bbb83c926203.patch;
-      sha256 = "1w4rhwqfcakzb9a6afq788rrsypay0rw75bjk2f3l66spjb7v3ps";
-    })
-  ];
-
   buildInputs = [ libressl ];
 
   configurePhase = "ln -s Linux.mk config.mk";

From 8f69b1dcd26e9673fb41122db5b7d1e3589623ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Tue, 11 Feb 2020 00:20:58 +0100
Subject: [PATCH 0352/4636] cinnamon.xapps: move gobject-introspection to
 buildInputs

---
 pkgs/desktops/cinnamon/xapps/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/cinnamon/xapps/default.nix b/pkgs/desktops/cinnamon/xapps/default.nix
index dce9d6f666a4..ff02720e8021 100644
--- a/pkgs/desktops/cinnamon/xapps/default.nix
+++ b/pkgs/desktops/cinnamon/xapps/default.nix
@@ -44,7 +44,6 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    gobject-introspection
     meson
     ninja
     pkgconfig
@@ -54,6 +53,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    gobject-introspection
     (python3.withPackages(ps: with ps; [
       pygobject3
       setproctitle # mate applet

From e61b8d99c2c5083f7032a1cf6c2e0538bc4b94ee Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 11 Feb 2020 20:11:32 +0100
Subject: [PATCH 0353/4636] chromium: 80.0.3987.87 -> 80.0.3987.100

https://chromereleases.googleblog.com/2020/02/stable-channel-update-for-desktop_11.html
---
 .../browsers/chromium/upstream-info.nix        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 1baa1d6fcc1a..c03685deb911 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "13mcn37nhf44bzaafr4bwmmfkihhfi1bzdd6ba2yzfwsbp56y7zm";
-    sha256bin64 = "08nvmrrglssrxhp9s8bcj479dfhi83nmnjim6cignfhbzqmwpgdl";
-    version = "80.0.3987.87";
+    sha256 = "02r0lw14j96py5d3c87r7q3l8a9h5g1qb85rvn8cmbx98m04qip9";
+    sha256bin64 = "0adfxgvhcqvlyv4g9ix2a26vgh8f2nxdqbg415x7xijfspbc0apa";
+    version = "80.0.3987.100";
   };
   dev = {
-    sha256 = "173saw11pvz1fgw60hrfm1hnfjq3hk4zri7jpphk0ws7930zkhf4";
-    sha256bin64 = "1g718g0a0m87qkvy0mf1kbhv398iyqks7d9g40cqp5rf1b7yjkw2";
-    version = "81.0.4040.5";
+    sha256 = "1mfhv2nix1ddqkp4kk5kpn74rv31sk9zma6icajk5cm21m6cqlbb";
+    sha256bin64 = "1jschlsy3vsxs471n3p6y84bnqd8yxx3ax38ylvjzg7f9mvy13m1";
+    version = "81.0.4044.9";
   };
   stable = {
-    sha256 = "13mcn37nhf44bzaafr4bwmmfkihhfi1bzdd6ba2yzfwsbp56y7zm";
-    sha256bin64 = "0qdslcl028v0fx8q0n8f5kjkwd8b0z5yz531dbn7wg2dcbp7vq45";
-    version = "80.0.3987.87";
+    sha256 = "02r0lw14j96py5d3c87r7q3l8a9h5g1qb85rvn8cmbx98m04qip9";
+    sha256bin64 = "0l7a8nkhq7qy8lrl20icr169fni1nvkvvxibqipzjzmj7hxdxbpr";
+    version = "80.0.3987.100";
   };
 }

From 529948c302010add0a946b9ea8ac5c5b127239bd Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Tue, 11 Feb 2020 21:35:01 +0100
Subject: [PATCH 0354/4636] gist: 5.0.0 -> 5.1.0 (#79838)

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

diff --git a/pkgs/tools/text/gist/default.nix b/pkgs/tools/text/gist/default.nix
index 7091031d28f0..ebefae06c8ca 100644
--- a/pkgs/tools/text/gist/default.nix
+++ b/pkgs/tools/text/gist/default.nix
@@ -4,8 +4,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "gist";
-  version = "5.0.0";
-  source.sha256 = "1i0a73mzcjv4mj5vjqwkrx815ydsppx3v812lxxd9mk2s7cj1vyd";
+  version = "5.1.0";
+  source.sha256 = "0s69y6hi5iq5k6317j1kjmhi3mk586j1543q8wa608grwcmbq3fw";
 
   meta = with lib; {
     description = "Upload code to https://gist.github.com (or github enterprise)";

From 9eaf6f5f5c0de5fe4e8fcae74699629d3ae6a80a Mon Sep 17 00:00:00 2001
From: Christian Kampka <kampka@users.noreply.github.com>
Date: Tue, 11 Feb 2020 21:35:35 +0100
Subject: [PATCH 0355/4636] kops_1_15: 1.15.1 -> 1.15.2 (#79809)

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

diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index e3b82152e6fa..595cfae2e697 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -67,7 +67,7 @@ in rec {
   };
 
   kops_1_15 = mkKops {
-    version = "1.15.1";
-    sha256 = "0iq2bqq6zv6sk2psar33c3smnz79rk5v623qx4kr5h47wnqvrfvj";
+    version = "1.15.2";
+    sha256 = "1sjfd7pfi81ccq1dkgkh9xx6y94bqzlp727pvyf7l01x3d14z2b3";
   };
 }

From 21ea3ddf601363b2b74e5d811370342990cc6b3f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 10 Feb 2020 03:57:14 +0000
Subject: [PATCH 0356/4636] merriweather: init at 2.005

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

diff --git a/pkgs/data/fonts/merriweather/default.nix b/pkgs/data/fonts/merriweather/default.nix
new file mode 100644
index 000000000000..1768c44bc03c
--- /dev/null
+++ b/pkgs/data/fonts/merriweather/default.nix
@@ -0,0 +1,35 @@
+{ stdenvNoCC
+, lib
+, fetchFromGitHub
+}:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "merriweather";
+  version = "2.005";
+
+  src = fetchFromGitHub {
+    owner = "SorkinType";
+    repo = "Merriweather";
+    rev = "4fd88c9299009d1c1d201e7da3ff75cf1de5153a";
+    sha256 = "1ndycja2jzhcfbqbm0p6ka2zl1i1pdbkf0crw2lp3pi4k89wlm29";
+  };
+
+  # TODO: it would be nice to build this from scratch, but lots of
+  # Python dependencies to package (fontmake, gftools)
+
+  installPhase = ''
+    install -m444 -Dt $out/share/fonts/opentype/${pname} fonts/otf/*.otf
+    install -m444 -Dt $out/share/fonts/truetype/${pname} fonts/ttfs/*.ttf
+    install -m444 -Dt $out/share/fonts/woff/${pname} fonts/woff/*.woff
+    install -m444 -Dt $out/share/fonts/woff2/${pname} fonts/woff2/*.woff2
+    # TODO: install variable version?
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/SorkinType/Merriweather";
+    description = "Merriweather was designed to be a text face that is pleasant to read on screens";
+    license = licenses.ofl;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ emily ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index feaba9296a18..f07d66007ab9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1951,6 +1951,8 @@ in
 
   opendune = callPackage ../games/opendune { };
 
+  merriweather = callPackage ../data/fonts/merriweather { };
+
   meson = callPackage ../development/tools/build-managers/meson { };
 
   meson-tools = callPackage ../misc/meson-tools { };

From 7f1ab0505ca3e3b0a7458affa31f0f544ba80d86 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 10 Feb 2020 03:58:08 +0000
Subject: [PATCH 0357/4636] merriweather-sans: init at 1.008

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

diff --git a/pkgs/data/fonts/merriweather-sans/default.nix b/pkgs/data/fonts/merriweather-sans/default.nix
new file mode 100644
index 000000000000..397f42236b52
--- /dev/null
+++ b/pkgs/data/fonts/merriweather-sans/default.nix
@@ -0,0 +1,34 @@
+{ stdenvNoCC
+, lib
+, fetchFromGitHub
+}:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "merriweather-sans";
+  version = "1.008";
+
+  src = fetchFromGitHub {
+    owner = "SorkinType";
+    repo = "Merriweather-Sans";
+    rev = "8a1b078e3aeec6aecc856c3422898816af9b9dc7";
+    sha256 = "1f6a64bv4b4b1v3g2pgrzxcys8rk12wq6wfxamgzligcq5fxaffd";
+  };
+
+  # TODO: it would be nice to build this from scratch, but lots of
+  # Python dependencies to package (fontmake, gftools)
+
+  installPhase = ''
+    install -m444 -Dt $out/share/fonts/truetype/${pname} fonts/ttfs/*.ttf
+    install -m444 -Dt $out/share/fonts/woff/${pname} fonts/woff/*.woff
+    install -m444 -Dt $out/share/fonts/woff2/${pname} fonts/woff2/*.woff2
+    # TODO: install variable version?
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/SorkinType/Merriweather-Sans";
+    description = "Merriweather Sans is a low-contrast semi-condensed sans-serif text typeface family designed to be pleasant to read at very small sizes";
+    license = licenses.ofl;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ emily ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f07d66007ab9..33724732691a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1953,6 +1953,8 @@ in
 
   merriweather = callPackage ../data/fonts/merriweather { };
 
+  merriweather-sans = callPackage ../data/fonts/merriweather-sans { };
+
   meson = callPackage ../development/tools/build-managers/meson { };
 
   meson-tools = callPackage ../misc/meson-tools { };

From 2b4794f941ceb73cad80758fc8f34fa8281aa511 Mon Sep 17 00:00:00 2001
From: Stefano Mazzucco <stefano@curso.re>
Date: Tue, 11 Feb 2020 20:38:15 +0000
Subject: [PATCH 0358/4636] aws-sam-cli: add argument to conditionally enable
 telemetry

If someone really wants to opt into telemetry, they can do so by setting
`enableTelemetry` to `true` (the default is `false`), in which case the wrapper
that sets `SAM_CLI_TELEMETRY` to `0` will not be created.

Note that this actually allows a user to optionally disable telemetry from the
command line or the (poorly documented) configuration in
`~/.aws-sam/metadata.json`. The downside is telemetry will be enabled at least
on the first run, causing a unique installation ID to be saved in the
configuration file.
---
 pkgs/development/tools/aws-sam-cli/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix
index 916ff325b43b..09a61ef564f6 100644
--- a/pkgs/development/tools/aws-sam-cli/default.nix
+++ b/pkgs/development/tools/aws-sam-cli/default.nix
@@ -1,5 +1,6 @@
 { lib
 , python
+, enableTelemetry ? false
 }:
 
 let
@@ -83,7 +84,7 @@ buildPythonApplication rec {
     tomlkit
   ];
 
-  postFixup = ''
+  postFixup = if enableTelemetry then "echo aws-sam-cli TELEMETRY IS ENABLED" else ''
     # Disable telemetry: https://github.com/awslabs/aws-sam-cli/issues/1272
     wrapProgram $out/bin/sam --set  SAM_CLI_TELEMETRY 0
   '';

From 4c8bdd1c4f6aafd96e002e4cae14c0c5798ddfd7 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 11 Feb 2020 21:41:04 +0100
Subject: [PATCH 0359/4636] nixos/filesystems: don't chown /run/keys
 recursively

3c74e48d9c8dbcede89a72ea18cd27def4b498a9 was a bit too much, it updated
permissions of all files recursively, causing files to be readable by
the group.

This isn't a problem immediately after bootup, but on a new activation,
as tmpfiles.d get restarted then, updating the permission bits of
now-existing files.

This updates the `Z` to be a `z` (the non-recursive variant), and adds a
`d` to ensure a directory is created (which should be covered by the
initrd shell script anyway)
---
 nixos/modules/tasks/filesystems.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index 965a1c9eb1a6..0ade74b957a0 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -305,7 +305,8 @@ in
       in listToAttrs (map formatDevice (filter (fs: fs.autoFormat) fileSystems));
 
     systemd.tmpfiles.rules = [
-      "Z /run/keys 0750 root ${toString config.ids.gids.keys}"
+      "d /run/keys 0750 root ${toString config.ids.gids.keys}"
+      "z /run/keys 0750 root ${toString config.ids.gids.keys}"
     ];
 
     # Sync mount options with systemd's src/core/mount-setup.c: mount_table.

From 44fb48ecd57fdc312a651977fd3f9657cefe9367 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 11 Feb 2020 21:12:47 +0000
Subject: [PATCH 0360/4636] spdx-license-list-data: 3.7 -> 3.8

---
 pkgs/data/misc/spdx-license-list-data/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/spdx-license-list-data/default.nix b/pkgs/data/misc/spdx-license-list-data/default.nix
index 6be0ab73641e..3e33e373a53e 100644
--- a/pkgs/data/misc/spdx-license-list-data/default.nix
+++ b/pkgs/data/misc/spdx-license-list-data/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "spdx-license-list-data";
-  version = "3.7";
+  version = "3.8";
 
   src = fetchFromGitHub {
     owner = "spdx";
     repo = "license-list-data";
     rev = "v${version}";
-    sha256 = "1zll1d4apqh762iplzcm90v3yp3b36whc3vqx1vlmjgdrfss9jhn";
+    sha256 = "1pfy0vbs7sk7m670mclmlkpcanizdmgsm1qgwzrw28w3hxfq7gdb";
   };
 
   phases = [ "unpackPhase" "installPhase" ];

From f77e057cda60a3f96a4010a698ff3be311bf18c6 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Mon, 10 Feb 2020 22:45:12 +0000
Subject: [PATCH 0361/4636] pythonPackages.pysaml2: fix tests with fixed &
 now-expired timestamps

these only expired (and upstream only seem to have noticed) today
---
 pkgs/development/python-modules/pysaml2/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix
index 81324920c431..b4552b264d5a 100644
--- a/pkgs/development/python-modules/pysaml2/default.nix
+++ b/pkgs/development/python-modules/pysaml2/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , isPy3k
 , fetchFromGitHub
+, fetchpatch
 , substituteAll
 , xmlsec
 , cryptography, defusedxml, future, pyopenssl, dateutil, pytz, requests, six
@@ -27,6 +28,12 @@ buildPythonPackage rec {
       src = ./hardcode-xmlsec1-path.patch;
       inherit xmlsec;
     })
+    # remove on next release
+    (fetchpatch {
+      name = "fix-test-dates.patch";
+      url = "https://github.com/IdentityPython/pysaml2/commit/1d97d2d26f63e42611558fdd0e439bb8a7496a27.patch";
+      sha256 = "0r6d6hkk6z9yw7aqnsnylii516ysmdsc8dghwmgnwvw6cm7l388p";
+    })
   ];
 
   propagatedBuildInputs = [ cryptography defusedxml future pyopenssl dateutil pytz requests six ];

From 818628c53a85680cd0e5ea8be3da5ddd34da0a54 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 11 Feb 2020 22:18:23 +0100
Subject: [PATCH 0362/4636] tl-expected: init at 2019-11-11

This version is 5 commits ahead of version 1.0.0 because we need at
least one patch [0] that prevents CMake from trying to use Git to fetch
the already fetched submodule...
Also some files have the wrong formatting (CRLF line endings) which
makes the patching really messy. At this point is seems therefore better
to use the master version instead (1.0.0 is pretty broken regarding
CMake).

[0]: https://github.com/TartanLlama/expected/commit/0ca73ee30e72a54b285ef1e26fd9ecc83c81e5ea
---
 .../libraries/tl-expected/default.nix         | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/tl-expected/default.nix

diff --git a/pkgs/development/libraries/tl-expected/default.nix b/pkgs/development/libraries/tl-expected/default.nix
new file mode 100644
index 000000000000..9de97229e0b6
--- /dev/null
+++ b/pkgs/development/libraries/tl-expected/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  pname = "tl-expected-unstable";
+  version = "2019-11-11"; # 5 commits ahead of version 1.0.0
+
+  src = fetchFromGitHub {
+    owner = "TartanLlama";
+    repo = "expected";
+    rev = "1d9c5d8c0da84b8ddc54bd3d90d632eec95c1f13";
+    fetchSubmodules = true;
+    sha256 = "0rzfn9yyg70zwpxbmv22qy0015baymi2rdd65ixmcb31fgnap68i";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    description = "C++11/14/17 std::expected with functional-style extensions";
+    homepage = https://tl.tartanllama.xyz/en/latest/api/expected.html;
+    license = licenses.cc0;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ primeos ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cb4016b49716..e645277627c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14458,6 +14458,8 @@ in
   tk-8_6 = callPackage ../development/libraries/tk/8.6.nix { };
   tk-8_5 = callPackage ../development/libraries/tk/8.5.nix { tcl = tcl-8_5; };
 
+  tl-expected = callPackage ../development/libraries/tl-expected { };
+
   tnt = callPackage ../development/libraries/tnt { };
 
   tntnet = callPackage ../development/libraries/tntnet { };

From e8fe8182e9447993711173d8c5299e3f4fc41cba Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 11 Feb 2020 06:47:48 +0000
Subject: [PATCH 0363/4636] credstash: 1.16.1 -> 1.16.2

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

diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix
index 495311c09724..585bc0106067 100644
--- a/pkgs/development/python-modules/credstash/default.nix
+++ b/pkgs/development/python-modules/credstash/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "credstash";
-  version = "1.16.1";
+  version = "1.16.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "019wviz3hx0pkh3mgqr3prg55njyhzvhjqcpndgrfmkykjkcj435";
+    sha256 = "1l3g76dm9csmx0z8s7zd75wfzw9dcyvrq0a81gfzwxk0c0w8c79r";
   };
 
   # The install phase puts an executable and a copy of the library it imports in

From 59e0025ec8eed97a94164a6fa7cdae9bbeeb8976 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 11 Feb 2020 18:18:18 -0500
Subject: [PATCH 0364/4636] spdx-license-list-data: add platforms

---
 pkgs/data/misc/spdx-license-list-data/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/data/misc/spdx-license-list-data/default.nix b/pkgs/data/misc/spdx-license-list-data/default.nix
index 3e33e373a53e..1c68569a29aa 100644
--- a/pkgs/data/misc/spdx-license-list-data/default.nix
+++ b/pkgs/data/misc/spdx-license-list-data/default.nix
@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
     description = "Various data formats for the SPDX License List";
     homepage = "https://github.com/spdx/license-list-data";
     license = lib.licenses.cc0;
+    platforms = lib.platforms.all;
   };
 }

From 2f618146653ed55632fc2f0c720aec16246cf1a3 Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Tue, 11 Feb 2020 15:32:43 -0800
Subject: [PATCH 0365/4636] cypress: 3.6.1 -> 3.8.3 (#79871)

* cypress: 3.6.1 -> 3.8.3

* cypress: binary_state.json is now expected at the root of $out
---
 pkgs/development/web/cypress/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix
index 796060de0b0a..86f6b129accd 100644
--- a/pkgs/development/web/cypress/default.nix
+++ b/pkgs/development/web/cypress/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec{
   pname = "cypress";
-  version = "3.6.1";
+  version = "3.8.3";
 
   src = fetchzip {
     url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
-    sha256 = "0vlfmhsz7zkp3bjsgqmp9n716d5znicl42hm0m9hl7ndvgm9z9z0";
+    sha256 = "1ncq64s5y5dsx0lrz950vab2yzwihl2wd7yapp12305bjjsihj3z";
   };
 
   # don't remove runtime deps
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec{
     mkdir -p $out/bin/resources/app
     printf '{"version":"%b"}' $version > $out/bin/resources/app/package.json
     # Cypress now looks for binary_state.json in bin
-    echo '{"verified": true}' > $out/bin/binary_state.json
+    echo '{"verified": true}' > $out/binary_state.json
     ln -s $out/opt/cypress/Cypress $out/bin/Cypress
   '';
 

From d0729f83230e551e2c094d98bcc3919a2d331c0a Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 11 Feb 2020 21:41:25 +0100
Subject: [PATCH 0366/4636] tdesktop: 1.9.9 -> 1.9.12

Note: I skipped the packaging of mapbox-variant for now.
---
 .../telegram/tdesktop/default.nix                  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index f4ade0767261..05dbfbdaf968 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -1,7 +1,8 @@
 { mkDerivation, lib, fetchurl, fetchsvn
 , pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook
-, qtbase, qtimageformats, gtk3, libappindicator-gtk3, enchant2, lz4, xxHash
+, qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash
 , dee, ffmpeg_4, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
+, tl-expected, microsoft_gsl
 # TODO: Shouldn't be required:
 , pcre, xorg, utillinux, libselinux, libsepol, epoxy, at-spi2-core, libXtst
 , xdg_utils
@@ -18,17 +19,15 @@ with lib;
 
 mkDerivation rec {
   pname = "telegram-desktop";
-  version = "1.9.9";
+  version = "1.9.12";
 
   # Telegram-Desktop with submodules
   src = fetchurl {
     url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
-    sha256 = "08bxlqiapj9yqj9ywni33n5k7n3ckgfhv200snjqyqy9waqph1i6";
+    sha256 = "1xjf2fh6qry4q6frq2ixmn1k0rsc72h4j0zmahfsggyl3j5mgkx1";
   };
 
   postPatch = ''
-    substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \
-      --replace '"appindicator3"' '"${libappindicator-gtk3}/lib/libappindicator3.so"'
     substituteInPlace Telegram/lib_spellcheck/spellcheck/platform/linux/linux_enchant.cpp \
       --replace '"libenchant-2.so.2"' '"${enchant2}/lib/libenchant-2.so.2"'
     substituteInPlace Telegram/CMakeLists.txt \
@@ -42,8 +41,9 @@ mkDerivation rec {
   nativeBuildInputs = [ pkgconfig cmake ninja python3 wrapGAppsHook wrapQtAppsHook ];
 
   buildInputs = [
-    qtbase qtimageformats gtk3 libappindicator-gtk3 enchant2 lz4 xxHash
+    qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash
     dee ffmpeg_4 openalSoft minizip libopus alsaLib libpulseaudio range-v3
+    tl-expected microsoft_gsl
     # TODO: Shouldn't be required:
     pcre xorg.libpthreadstubs xorg.libXdmcp utillinux libselinux libsepol epoxy at-spi2-core libXtst
   ];
@@ -58,6 +58,7 @@ mkDerivation rec {
     "-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF"
     "-DDESKTOP_APP_USE_PACKAGED=ON"
     "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF"
+    "-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF"
     "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON"
     "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON"
     "-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON"
@@ -80,6 +81,7 @@ mkDerivation rec {
   #   - upstream: https://github.com/grishka/libtgvoip
   # Both of these packages are included in this PR (kotatogram-desktop):
   # https://github.com/NixOS/nixpkgs/pull/75210
+  # TODO: Package mapbox-variant
 
   postFixup = ''
     # This is necessary to run Telegram in a pure environment.

From 1905a3719359d237d5e36257bef9b2d892d40d3a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 00:39:35 +0000
Subject: [PATCH 0367/4636] allegro5: 5.2.5.0 -> 5.2.6.0

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

diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index 5f5368f2866d..d2021e23b533 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "allegro";
-  version = "5.2.5.0";
+  version = "5.2.6.0";
 
   src = fetchFromGitHub {
     owner = "liballeg";
     repo = "allegro5";
     rev = version;
-    sha256 = "1jrnizpwznyxz2c7zb75lfy7l51ww5jlqfaahcrycfj1xay9mpqp";
+    sha256 = "1xbhvriyh10ka2j7jgjkpa6mlzp6av909hhr9sk317vjvf0z0mqz";
   };
 
   buildInputs = [

From 8f583860c8ecb111752256284894f2a2113b9eb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <mil@nyantec.com>
Date: Wed, 12 Feb 2020 01:57:19 +0100
Subject: [PATCH 0368/4636] libubox: 2017-09-29 -> unstable-2020-01-20

---
 pkgs/development/libraries/libubox/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix
index 71ac22e85a8f..2cd5bd8a3412 100644
--- a/pkgs/development/libraries/libubox/default.nix
+++ b/pkgs/development/libraries/libubox/default.nix
@@ -1,12 +1,13 @@
 { stdenv, lib, fetchgit, cmake, pkgconfig, json_c }:
 
 stdenv.mkDerivation {
-  name = "libubox-2017-09-29";
+  pname = "libubox";
+  version = "unstable-2020-01-20";
 
   src = fetchgit {
     url = "https://git.openwrt.org/project/libubox.git";
-    rev = "632688e8d6cde32781e4ec685d59afb0938300ad";
-    sha256 = "1rkwn287k7p802hbd9ap13xxrxsghq6827r86ymqbbcmbcrna13c";
+    rev = "43a103ff17ee5872669f8712606578c90c14591d";
+    sha256 = "0cihgckghamcfxrvqjjn69giib80xhsqaj98ldn0gd96zqh96sd4";
   };
 
   cmakeFlags = [ "-DBUILD_LUA=OFF" "-DBUILD_EXAMPLES=OFF" ];

From e9cb7037f961bf367cb7da7cc758abc1a4d8dcef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <mil@nyantec.com>
Date: Wed, 12 Feb 2020 01:58:00 +0100
Subject: [PATCH 0369/4636] uqmi: 2016-12-19 -> unstable-2019-06-27

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

diff --git a/pkgs/tools/networking/uqmi/default.nix b/pkgs/tools/networking/uqmi/default.nix
index 010d6a7f8e85..17a55d86b9a3 100644
--- a/pkgs/tools/networking/uqmi/default.nix
+++ b/pkgs/tools/networking/uqmi/default.nix
@@ -1,12 +1,13 @@
 { stdenv, lib, fetchgit, cmake, perl, libubox, json_c }:
 
 stdenv.mkDerivation {
-  name = "uqmi-2016-12-19";
+  pname = "uqmi";
+  version = "unstable-2019-06-27";
 
   src = fetchgit {
     url = "https://git.openwrt.org/project/uqmi.git";
-    rev = "8ceeab690d8c6f1e3afbd4bcaee7bc2ba3fbe165";
-    sha256 = "1fw9r36d024iiq6bq2cikaq5pams5pnbc4z6pcmcny2k4l5cdb6m";
+    rev = "1965c713937495a5cb029165c16acdb6572c3f87";
+    sha256 = "1gn8sdcl4lwfs3lwabmnjbvdhhk1l42bwbajwds7j4936fpbklx0";
   };
 
   postPatch = ''

From 020e93b394c18f0ca902947eb8d4fd870f53a133 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <mil@nyantec.com>
Date: Wed, 12 Feb 2020 02:01:17 +0100
Subject: [PATCH 0370/4636] ubus: init at unstable-2020-01-05

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

diff --git a/pkgs/development/libraries/ubus/default.nix b/pkgs/development/libraries/ubus/default.nix
new file mode 100644
index 000000000000..1f7124411ac3
--- /dev/null
+++ b/pkgs/development/libraries/ubus/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, cmake, fetchgit, libubox, libjson }:
+
+stdenv.mkDerivation {
+  pname = "ubus";
+  version = "unstable-2020-01-05";
+
+  src = fetchgit {
+    url = "https://git.openwrt.org/project/ubus.git";
+    rev = "d35df8adda873dc75d876f72b78e84db8cfa72ee";
+    sha256 = "1ksrih5vfyixaafzsrs6ab88qw34d0197wvw201jl5p1fc7drgn4";
+  };
+
+  cmakeFlags = [ "-D BUILD_LUA:BOOL=OFF" ];
+  buildInputs = [ libubox libjson ];
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    description = "OpenWrt system message/RPC bus";
+    homepage = "https://git.openwrt.org/?p=project/ubus.git;a=summary";
+    license = licenses.lgpl21;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ petabyteboy ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cb4016b49716..e9cc7bc43767 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11104,6 +11104,8 @@ in
 
   cpp-netlib = callPackage ../development/libraries/cpp-netlib {};
 
+  ubus = callPackage ../development/libraries/ubus { };
+
   uri = callPackage ../development/libraries/uri { };
 
   cppcms = callPackage ../development/libraries/cppcms { };

From 6ad91bb5ca13ff97f0c20dc0e8c46a3283b3a093 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <mil@nyantec.com>
Date: Wed, 12 Feb 2020 02:02:19 +0100
Subject: [PATCH 0371/4636] uci: init at unstable-2020-01-27

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

diff --git a/pkgs/development/libraries/uci/default.nix b/pkgs/development/libraries/uci/default.nix
new file mode 100644
index 000000000000..e3bdea8c8890
--- /dev/null
+++ b/pkgs/development/libraries/uci/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, cmake, fetchgit, pkgconfig, libubox }:
+
+stdenv.mkDerivation {
+  pname = "uci";
+  version = "unstable-2020-01-27";
+
+  src = fetchgit {
+    url = "https://git.openwrt.org/project/uci.git";
+    rev = "e8d83732f9eb571dce71aa915ff38a072579610b";
+    sha256 = "1si8dh8zzw4j6m7387qciw2akfvl7c4779s8q5ns2ys6dn4sz6by";
+  };
+
+  hardeningDisable = [ "all" ];
+  cmakeFlags = [ "-D BUILD_LUA:BOOL=OFF" ];
+  buildInputs = [ libubox ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "OpenWrt Unified Configuration Interface";
+    homepage = "https://git.openwrt.org/?p=project/uci.git;a=summary";
+    license = licenses.lgpl21;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ petabyteboy ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9cc7bc43767..7bd293399af0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11106,6 +11106,8 @@ in
 
   ubus = callPackage ../development/libraries/ubus { };
 
+  uci = callPackage ../development/libraries/uci { };
+
   uri = callPackage ../development/libraries/uri { };
 
   cppcms = callPackage ../development/libraries/cppcms { };

From d24c4038da7fe62f18fa41e17e1eea07591f251b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <mil@nyantec.com>
Date: Wed, 12 Feb 2020 02:02:34 +0100
Subject: [PATCH 0372/4636] netifd: init at unstable-2020-01-18

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

diff --git a/pkgs/tools/networking/netifd/default.nix b/pkgs/tools/networking/netifd/default.nix
new file mode 100644
index 000000000000..38591f38fcf8
--- /dev/null
+++ b/pkgs/tools/networking/netifd/default.nix
@@ -0,0 +1,28 @@
+{ runCommand, stdenv, cmake, fetchgit, libnl, libubox, uci, ubus, json_c }:
+
+stdenv.mkDerivation {
+  pname = "netifd";
+  version = "unstable-2020-01-18";
+
+  src = fetchgit {
+    url = "https://git.openwrt.org/project/netifd.git";
+    rev = "1321c1bd8fe921986c4eb39c3783ddd827b79543";
+    sha256 = "178pckyf1cydi6zzr4bmhksv8vyaks91zv9lqqd2z5nkmccl6vf3";
+  };
+
+  buildInputs = [ libnl libubox uci ubus json_c ];
+  nativeBuildInputs = [ cmake ];
+
+  preBuild = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE \
+      -I$(echo "${stdenv.lib.getDev libnl}"/include/libnl*/)"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "OpenWrt Network interface configuration daemon";
+    homepage = "https://git.openwrt.org/?p=project/netifd.git;a=summary";
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ petabyteboy ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7bd293399af0..c3bad082994a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4252,6 +4252,8 @@ in
 
   netmask = callPackage ../tools/networking/netmask {};
 
+  netifd = callPackage ../tools/networking/netifd {};
+
   ipscan = callPackage ../tools/security/ipscan { };
 
   ipv6calc = callPackage ../tools/networking/ipv6calc {};

From 5b174837fa46d0caa3bb4a47e59fbc10b6565816 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 01:28:09 +0000
Subject: [PATCH 0373/4636] caf: 0.17.3 -> 0.17.4

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

diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix
index e32ec1695792..c1415a2837c4 100644
--- a/pkgs/development/libraries/caf/default.nix
+++ b/pkgs/development/libraries/caf/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "actor-framework";
-  version = "0.17.3";
+  version = "0.17.4";
 
   src = fetchFromGitHub {
     owner = "actor-framework";
     repo = "actor-framework";
     rev = version;
-    sha256 = "187r7vc4kpd0v6bb1y51zwqm9y1lh0m84vkwmrxn8rrp4bwdxlpj";
+    sha256 = "04p3kgk1zadadl6n0prwc77nfxrbdasbwbqpws1y9y6f77lrcxdn";
   };
 
   nativeBuildInputs = [ cmake ];

From f7768c939aa67494da93c732d031d380828f4896 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 11 Feb 2020 18:08:17 +0400
Subject: [PATCH 0374/4636] nixos/display-managers: Add DesktopNames parameter
 to generated desktop session files

Some display managers (e.g. SDDM) set the XDG_CURRENT_DESKTOP variable accroding to this parameter.
If this variable is not defined, there will be some problems (e.g. MATE doesn't have icons on the desktop).

Fixes https://github.com/NixOS/nixpkgs/issues/71427
---
 nixos/modules/services/x11/display-managers/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 821886e5fdab..5d49ca943872 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -427,6 +427,7 @@ in
                     TryExec=${script}
                     Exec=${script}
                     Name=${sessionName}
+                    DesktopNames=${sessionName}
                   '';
                 } // {
                   providedSessions = [ sessionName ];

From 6b11b2fd39f258eb4750fedd646231a6eee3ed31 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 03:15:36 +0000
Subject: [PATCH 0375/4636] armadillo: 9.800.4 -> 9.850.1

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

diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index 9f0f16d5cee2..6c0b3c867a48 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "armadillo";
-  version = "9.800.4";
+  version = "9.850.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    sha256 = "1vcgqshlah5cv1954r1jv02y2iyr0gi5jqc8zz8wmvgm56vm83mw";
+    sha256 = "07y0s87srj2wxbywmnxam9bif0x625n6b8np19832mvsb6wqkhyl";
   };
 
   nativeBuildInputs = [ cmake ];

From 16dba2c7f69fe38e52e7edc889b96997b7615006 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 05:13:18 +0000
Subject: [PATCH 0376/4636] closurecompiler: 20190909 -> 20200204

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

diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index 682a8aa4eed9..f90e6b4bcfe0 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "closure-compiler";
-  version = "20190909";
+  version = "20200204";
 
   src = fetchurl {
     url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
-    sha256 = "0km45pz19dz1hi8vjj290hyxdhr379iixmml0rs8crr4gvs3685w";
+    sha256 = "0diqnvyfh8w7yf7l5zqvb4msw07n50k9grz0k2znykaqwmjsidx9";
   };
 
   sourceRoot = ".";

From a2589275f2110b83ea7091288e55d7c9d8c3f00b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 05:19:46 +0000
Subject: [PATCH 0377/4636] dar: 2.6.7 -> 2.6.8

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

diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix
index 5d5bff7bfa1e..c105c8086c49 100644
--- a/pkgs/tools/backup/dar/default.nix
+++ b/pkgs/tools/backup/dar/default.nix
@@ -3,12 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "2.6.7";
+  version = "2.6.8";
   pname = "dar";
 
   src = fetchurl {
     url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz";
-    sha256 = "055kkxhg7sz3fbndsr4p2wp7aa2phq3pr0a9y7b1fkg52x7fbhr2";
+    sha256 = "05mw6m054jklnxkxgf9fh4hx8ik1d8c18rfg3i55bnddk0vr8ra3";
   };
 
   buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ]

From 567a5904f90bb3733fbb5e18c7a6ea0caeb8db1e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 05:54:21 +0000
Subject: [PATCH 0378/4636] byobu: 5.130 -> 5.131

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

diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix
index 94db365f6d6d..89a5154adda2 100644
--- a/pkgs/tools/misc/byobu/default.nix
+++ b/pkgs/tools/misc/byobu/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, python3, perl, textual-window-manager }:
 
 stdenv.mkDerivation rec {
-  version = "5.130";
+  version = "5.131";
   name = "byobu-" + version;
 
   src = fetchurl {
     url = "https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz";
-    sha256 = "0qblw5vz90fixvpwfvlc8bkljsviri5gj77cp63l44ns3lb19r27";
+    sha256 = "0ljyk0fkpdjjyqpqsss6d26sd3vkr55vcr5cfw1kz3lxwwd7bb3p";
   };
 
   doCheck = true;

From 9d1c581a390556169be127ab26eb653c90240a98 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 06:00:43 +0000
Subject: [PATCH 0379/4636] debootstrap: 1.0.116 -> 1.0.117

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

diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index da810b3c9d87..c016b857de3b 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -15,13 +15,13 @@ let binPath = stdenv.lib.makeBinPath [
   ];
 in stdenv.mkDerivation rec {
   pname = "debootstrap";
-  version = "1.0.116";
+  version = "1.0.117";
 
   src = fetchurl {
     # git clone git://git.debian.org/d-i/debootstrap.git
     # I'd like to use the source. However it's lacking the lanny script ? (still true?)
     url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.gz";
-    sha256 = "06gh7hks8flpg327wnrwwmp7h9s6knz2kk794s5wpd91iwnjfcyb";
+    sha256 = "0rsdw1yjkx35jd1i45646l07glnwsn9gzd6k8sjccv2xvhcljq77";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 38f1d70c01a2421e7a838306f63d6dd9d603eb3f Mon Sep 17 00:00:00 2001
From: Gabriel Gonzalez <Gabriel439@gmail.com>
Date: Tue, 11 Feb 2020 22:02:53 -0800
Subject: [PATCH 0380/4636] Add Nixpkgs support for Dhall

One of the motivations for this change is the following Discourse
discussion:

https://discourse.dhall-lang.org/t/offline-use-of-prelude/137

Many users have requested Dhall support for "offline" packages
that can be fetched/built/installed using ordinary package
management tools (like Nix) instead of using Dhall's HTTP import system.
I will continue to use the term "offline" to mean Dhall package
builds that do not use Dhall's language support for HTTP imports (and
instead use the package manager's support for HTTP requests, such
as `pkgs.fetchFromGitHub`)

The goal of this change is to document what is the idiomatic way to
implement "offline" Dhall builds by implementing Nixpkgs support
for such builds.  That way when other package management tools ask
me how to package Dhall with their tools I can refer them to how it
is done in Nixpkgs.

This change contains a fully "offline" build for the largest Dhall
package in existence, known as "dhall-packages" (not to be confused
with `dhallPackages`, which is our Nix attribute set containing
Dhall packages).

The trick to implementing offline builds in Dhall is to take
advantage of Dhall's support for semantic integrity checks.  If an
HTTP import is protected by an integrity check and a cached build
product matches the integrity check then the HTTP import is never
resolved and the expression is instead fetched from cache.

By "installing" dependencies in a pre-seeded and isolated cache
we can replace remote HTTP imports with dependencies that have
been built and supplied by Nix instead.

The offline nature of the builds are enforced by compiling the
Haskell interpreter with the `-f-with-http` flag, which disables
the interpreter's support for HTTP imports.  If a user forgets
to supply a necessary dependency as a Nix build product then the
build fails informing them that HTTP imports are disabled.

By default, built packages are "binary distributions", containing
just a cache product and a Dhall expression which can be used to
resolve the corresponding cache product.

Users can also optionally enable a "source distribution" of a package
which already includes the equivalent fully-evaluated Dhall code (for
convenience), but this is disabled by default to keep `/nix/store`
utilization as compact as possible.
---
 pkgs/development/dhall-modules/Prelude.nix    | 77 +++++++++++++++++
 pkgs/development/dhall-modules/default.nix    |  9 --
 .../dhall-modules/dhall-kubernetes.nix        | 54 ++++++++++++
 .../dhall-modules/dhall-packages.nix          | 71 ++++++++++++++++
 pkgs/development/dhall-modules/prelude/v3.nix | 25 ------
 .../dhall/build-dhall-package.nix             | 83 +++++++++++++++++++
 .../interpreters/dhall/default.nix            | 18 ----
 pkgs/top-level/all-packages.nix               |  4 +-
 pkgs/top-level/dhall-packages.nix             | 28 +++++++
 9 files changed, 315 insertions(+), 54 deletions(-)
 create mode 100644 pkgs/development/dhall-modules/Prelude.nix
 delete mode 100644 pkgs/development/dhall-modules/default.nix
 create mode 100644 pkgs/development/dhall-modules/dhall-kubernetes.nix
 create mode 100644 pkgs/development/dhall-modules/dhall-packages.nix
 delete mode 100644 pkgs/development/dhall-modules/prelude/v3.nix
 create mode 100644 pkgs/development/interpreters/dhall/build-dhall-package.nix
 delete mode 100644 pkgs/development/interpreters/dhall/default.nix
 create mode 100644 pkgs/top-level/dhall-packages.nix

diff --git a/pkgs/development/dhall-modules/Prelude.nix b/pkgs/development/dhall-modules/Prelude.nix
new file mode 100644
index 000000000000..53f6bace41cd
--- /dev/null
+++ b/pkgs/development/dhall-modules/Prelude.nix
@@ -0,0 +1,77 @@
+{ buildDhallPackage, fetchFromGitHub, lib }:
+
+let
+  makePrelude =
+    version:
+    lib.makeOverridable
+      ( { rev, sha256, file ? "package.dhall" }:
+          buildDhallPackage {
+            name = "Prelude-${version}";
+
+            code =
+              let
+                src = fetchFromGitHub {
+                  owner = "dhall-lang";
+
+                  repo = "dhall-lang";
+
+                  inherit rev sha256;
+                };
+
+              in
+                "${src}/Prelude/${file}";
+          }
+      );
+
+in
+  lib.mapAttrs makePrelude {
+    # Prelude versions older than 7.0.0 use old-style union literals, which are
+    # no longer supported by the latest version of the standard
+    "7.0.0" = {
+      rev = "f0509b403ace4b8a72ebb5fa9c473b9aeabeaf33";
+
+      sha256 = "00ldlvqfh411vnrnc41zfnlvgfanwfd3l8hdia8kni3r8q9qmd71";
+    };
+
+    "8.0.0" = {
+      rev = "136a3491753fef251b2087031617d1ee1053f285";
+
+      sha256 = "0haxd5dhi5bmg06a0hx1blpivmwrcnndydwagibj3zvch4knyi2q";
+    };
+
+    "9.0.0" = {
+      rev = "6cbf57c946e7e6576babc23a38320e53ecfa6bee";
+
+      sha256 = "1r06fijszyifq5b4j6libwkm06g8693m9n5c4kq61dvzrjfd2gim";
+    };
+
+    "10.0.0" = {
+      rev = "ecbf82785cff406bbd162bbabf3df6f817c805e0";
+
+      sha256 = "0gxkr9649jqpykdzqjc98gkwnjry8wp469037brfghyidwsm021m";
+    };
+
+    "11.0.0" = {
+      rev = "8098184d17c3aecc82674a7b874077a7641be05a";
+
+      sha256 = "0rdvyxq7mvas82wsfzzpk6imzm8ax4q58l522mx0ks69pacpr3yi";
+    };
+
+    "11.1.0" = {
+      rev = "31e90e1996f6c4cb50e03ccb1f3c45beb4bd278c";
+
+      sha256 = "0rdvyxq7mvas82wsfzzpk6imzm8ax4q58l522mx0ks69pacpr3yi";
+    };
+
+    "12.0.0" = {
+      rev = "9f248138f69ee5e22192dc3d0417d5c77b189e04";
+
+      sha256 = "1gbr0376sfamp0ibhcbxz4vaxr6ipv42y42p5wyksfhz3ls9x5ph";
+    };
+
+    "13.0.0" = {
+      rev = "48db9e1ff1f8881fa4310085834fbc19e313ebf0";
+
+      sha256 = "0kg3rzag3irlcldck63rjspls614bc2sbs3zq44h0pzcz9v7z5h9";
+    };
+  }
diff --git a/pkgs/development/dhall-modules/default.nix b/pkgs/development/dhall-modules/default.nix
deleted file mode 100644
index b6632a86f31f..000000000000
--- a/pkgs/development/dhall-modules/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs }:
-
-# TODO: add into the toplevel fixpoint instead of using rec
-rec {
-
-  prelude = prelude_3_0_0;
-  prelude_3_0_0 = pkgs.callPackage ./prelude/v3.nix {};
-
-}
diff --git a/pkgs/development/dhall-modules/dhall-kubernetes.nix b/pkgs/development/dhall-modules/dhall-kubernetes.nix
new file mode 100644
index 000000000000..5bc0e08c69b7
--- /dev/null
+++ b/pkgs/development/dhall-modules/dhall-kubernetes.nix
@@ -0,0 +1,54 @@
+{ buildDhallPackage, fetchFromGitHub, lib }:
+
+let
+  makeDhallKubernetes =
+    version:
+    lib.makeOverridable
+      ( { rev
+        , sha256
+
+          # The version of the Kubernetes OpenAPI spec to use.
+          #
+          # This defaults to the latest supported Kubernetes if left unspecified.
+          #
+          # This is only supported by dhall-kubernetes version 3.0.0 or newer.
+        , kubernetesVersion ? null
+
+        , file ? "package.dhall"
+        }:
+          buildDhallPackage {
+            name = "dhall-kubernetes-${version}";
+
+            code =
+              let
+                src = fetchFromGitHub {
+                  owner = "dhall-lang";
+
+                  repo = "dhall-kubernetes";
+
+                  inherit rev sha256;
+                };
+
+                prefix =
+                  if kubernetesVersion == null then "" else "${kubernetesVersion}/";
+
+              in
+                "${src}/${prefix}${file}";
+          }
+      );
+
+in
+  lib.mapAttrs makeDhallKubernetes {
+    # 2.1.0 was the first version to introduce a top-level `package.dhall` file
+    "2.1.0" = {
+      rev = "bbfec3d8548b605f1c9628f34029ab4a7d928839";
+
+      sha256 = "10zkigj05khiy6w2sqcm5nw7d47r5k52xq8np8q86h0phy798g96";
+    };
+
+    "3.0.0" = {
+      rev = "3c6d09a9409977cdde58a091d76a6d20509ca4b0";
+
+      sha256 = "1r4awh770ghsrwabh5ddy3jpmrbigakk0h32542n1kh71w3cdq1h";
+    };
+  }
diff --git a/pkgs/development/dhall-modules/dhall-packages.nix b/pkgs/development/dhall-modules/dhall-packages.nix
new file mode 100644
index 000000000000..659c582f3c12
--- /dev/null
+++ b/pkgs/development/dhall-modules/dhall-packages.nix
@@ -0,0 +1,71 @@
+{ buildDhallPackage, dhall-kubernetes, fetchFromGitHub, lib, Prelude }:
+
+let
+  makeDhallPackages =
+    version:
+    lib.makeOverridable
+      ( { rev
+        , sha256
+        , dependencies
+        }:
+          buildDhallPackage {
+            name = "dhall-packages-${version}";
+
+            inherit dependencies;
+
+            code =
+              let
+                src = fetchFromGitHub {
+                  owner = "EarnestResearch";
+
+                  repo = "dhall-packages";
+
+                  inherit rev sha256;
+                };
+
+              in
+                "${src}/package.dhall";
+          }
+      );
+
+in
+  lib.mapAttrs makeDhallPackages {
+    "0.11.1" =
+      let
+        k8s_6a47bd = dhall-kubernetes."3.0.0".override {
+          rev = "6a47bd50c4d3984a13570ea62382a3ad4a9919a4";
+
+          sha256 = "1azqs0x2kia3xw93rfk2mdi8izd7gy9aq6qzbip32gin7dncmfhh";
+        };
+
+        k8s_4ad581 = dhall-kubernetes."3.0.0".override {
+          rev = "4ad58156b7fdbbb6da0543d8b314df899feca077";
+
+          sha256 = "12fm70qbhcainxia388svsay2cfg9iksc6mss0nvhgxhpypgp8r0";
+        };
+
+        k8s_fee24c = dhall-kubernetes."3.0.0".override {
+          rev = "fee24c0993ba0b20190e2fdb94e386b7fb67252d";
+
+          sha256 = "11d93z8y0jzrb8dl43gqha9z96nxxqkl7cbxpz8hw8ky9x6ggayk";
+        };
+
+      in
+        { rev = "8d228f578fbc7bb16c04a7c9ac8c6c7d2e13d1f7";
+
+          sha256 = "1v4y1x13lxy6cxf8xqc6sb0mc4mrd4frkxih95v9q2wxw4vkw2h7";
+
+          dependencies = [
+            (k8s_6a47bd.override { kubernetesVersion = "1.14"; })
+            (k8s_6a47bd.override { kubernetesVersion = "1.15"; })
+            (k8s_6a47bd.override { kubernetesVersion = "1.16"; })
+            (k8s_4ad581.override { file = "types.dhall"; })
+            (k8s_fee24c.override { file = "types/io.k8s.api.core.v1.ServiceSpec.dhall"; })
+            (k8s_fee24c.override { file = "types/io.k8s.api.core.v1.PodTemplateSpec.dhall"; })
+            Prelude."12.0.0"
+            (Prelude."12.0.0".override { file = "JSON/package.dhall"; })
+            (Prelude."12.0.0".override { file = "JSON/Type"; })
+            (Prelude."12.0.0".override { file = "Map/Type"; })
+          ];
+        };
+  }
diff --git a/pkgs/development/dhall-modules/prelude/v3.nix b/pkgs/development/dhall-modules/prelude/v3.nix
deleted file mode 100644
index ef673310ceb0..000000000000
--- a/pkgs/development/dhall-modules/prelude/v3.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, lib, fetchFromGitHub }:
-
-stdenv.mkDerivation {
-  name = "dhall-prelude";
-
-  src = fetchFromGitHub {
-    owner = "dhall-lang";
-    repo = "dhall-lang";
-    # Commit where the v3.0.0 prelude folder was merged into dhall-lang
-    # and a LICENSE file has been added.
-    rev = "f6aa9399f1ac831d66c34104abe6856023c5b2df";
-    sha256 = "0kqjgh3y1l3cb3rj381j7c09547g1vh2dsfzpm08y1qajhhf9vgf";
-  };
-
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
-    cp -r Prelude $out
-  '';
-
-  meta = {
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ Profpatsch ];
-  };
-}
diff --git a/pkgs/development/interpreters/dhall/build-dhall-package.nix b/pkgs/development/interpreters/dhall/build-dhall-package.nix
new file mode 100644
index 000000000000..739dc9b3d52e
--- /dev/null
+++ b/pkgs/development/interpreters/dhall/build-dhall-package.nix
@@ -0,0 +1,83 @@
+{ haskell, haskellPackages, lib, lndir, runCommand, writeText }:
+
+{ name
+
+  # Expressions to add to the cache before interpreting the code
+, dependencies ? []
+
+  # A Dhall expression
+  #
+  # Carefully note that the following expression must be devoid of uncached HTTP
+  # imports.  This is because the expression will be evaluated using an
+  # interpreter with HTTP support disabled, so all HTTP imports have to be
+  # protected by an integrity check that can be satisfied via cached
+  # dependencies.
+  #
+  # You can add a dependency to the cache using the preceding `dependencies`
+  # option
+, code
+
+  # `buildDhallPackage` can include both a "source distribution" in
+  # `source.dhall` and a "binary distribution" in `binary.dhall`:
+  #
+  # * `source.dhall` is a dependency-free αβ-normalized Dhall expression
+  #
+  # * `binary.dhall` is an expression of the form: `missing sha256:${HASH}`
+  #
+  #   This expression requires you to install the cache product located at
+  #   `.cache/dhall/1220${HASH}` to successfully resolve
+  #
+  # By default, `buildDhallPackage` only includes "binary.dhall" to conserve
+  # space within the Nix store, but if you set the following `source` option to
+  # `true` then the package will also include `source.dhall`.
+, source ? false
+}:
+
+let
+  # `buildDhallPackage` requires version 1.25.0 or newer of the Haskell
+  # interpreter for Dhall.  Given that the default version is 1.24.0 we choose
+  # the latest available version instead until the default is upgraded.
+  #
+  # HTTP support is disabled in order to force that HTTP dependencies are built
+  # using Nix instead of using Dhall's support for HTTP imports.
+  dhall =
+    haskell.lib.justStaticExecutables
+      (haskell.lib.appendConfigureFlag
+        haskellPackages.dhall_1_29_0
+        "-f-with-http"
+      );
+
+  file = writeText "${name}.dhall" code;
+
+  cache = ".cache";
+
+  cacheDhall = "${cache}/dhall";
+
+  sourceFile = "source.dhall";
+
+in
+  runCommand name { inherit dependencies; } ''
+    set -eu
+
+    mkdir -p ${cacheDhall}
+
+    for dependency in $dependencies; do
+      ${lndir}/bin/lndir -silent $dependency/${cacheDhall} ${cacheDhall}
+    done
+
+    export XDG_CACHE_HOME=$PWD/${cache}
+
+    mkdir -p $out/${cacheDhall}
+
+    ${dhall}/bin/dhall --alpha --file '${file}' > $out/${sourceFile}
+
+    SHA_HASH=$(${dhall}/bin/dhall hash <<< $out/${sourceFile})
+
+    HASH_FILE="''${SHA_HASH/sha256:/1220}"
+
+    ${dhall}/bin/dhall encode --file $out/${sourceFile} > $out/${cacheDhall}/$HASH_FILE
+
+    echo "missing $SHA_HASH" > $out/binary.dhall
+
+    ${lib.optionalString (!source) "rm $out/${sourceFile}"}
+  ''
diff --git a/pkgs/development/interpreters/dhall/default.nix b/pkgs/development/interpreters/dhall/default.nix
deleted file mode 100644
index 8e1df36e4127..000000000000
--- a/pkgs/development/interpreters/dhall/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ haskell, haskellPackages, stdenvNoCC }:
-
-let
-  static = haskell.lib.justStaticExecutables haskellPackages.dhall;
-
-in static.overrideAttrs (old: {
-  passthru = old.passthru or {} // {
-    prelude = stdenvNoCC.mkDerivation {
-      name = "dhall-prelude";
-      inherit (old) src;
-      phases = [ "unpackPhase" "installPhase" ];
-      installPhase = ''
-        mkdir $out
-        cp -r Prelude/* $out/
-      '';
-    };
-  };
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cb4016b49716..197639a4cbf4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9029,7 +9029,7 @@ in
 
   clooj = callPackage ../development/interpreters/clojure/clooj.nix { };
 
-  dhall = callPackage ../development/interpreters/dhall { };
+  dhall = haskell.lib.justStaticExecutables haskellPackages.dhall;
 
   dhall-nix = haskell.lib.justStaticExecutables haskellPackages.dhall-nix;
 
@@ -9039,7 +9039,7 @@ in
 
   dhall-text = haskell.lib.justStaticExecutables haskellPackages.dhall-text;
 
-  dhallPackages = import ../development/dhall-modules { inherit pkgs; };
+  dhallPackages = callPackages ./dhall-packages.nix { };
 
   duktape = callPackage ../development/interpreters/duktape { };
 
diff --git a/pkgs/top-level/dhall-packages.nix b/pkgs/top-level/dhall-packages.nix
new file mode 100644
index 000000000000..6cdd84c22799
--- /dev/null
+++ b/pkgs/top-level/dhall-packages.nix
@@ -0,0 +1,28 @@
+{ lib
+, newScope
+, overrides ? (self: super: {})
+}:
+
+let
+  packages = self:
+    let
+      callPackage = newScope self;
+
+      buildDhallPackage =
+        callPackage ../development/interpreters/dhall/build-dhall-package.nix { };
+
+    in
+      { inherit buildDhallPackage;
+
+        dhall-kubernetes =
+          callPackage ../development/dhall-modules/dhall-kubernetes.nix { };
+
+        dhall-packages =
+          callPackage ../development/dhall-modules/dhall-packages.nix { };
+
+        Prelude =
+          callPackage ../development/dhall-modules/Prelude.nix { };
+      };
+
+in
+  lib.fix' (lib.extends overrides packages)

From b2d4c9d216fde6e912497248a6f067f47cd65c3d Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Wed, 12 Feb 2020 09:28:47 +0300
Subject: [PATCH 0381/4636] nnn: 2.9 -> 3.0

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

diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix
index f2df8a09ff2a..67f0b4b39260 100644
--- a/pkgs/applications/misc/nnn/default.nix
+++ b/pkgs/applications/misc/nnn/default.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "nnn";
-  version = "2.9";
+  version = "3.0";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1pifrcrc8fh85b8h8x01hih9wfclb95sf38s443bs3gip1zdrlk3";
+    sha256 = "0kmfg61v3xnf8m4m9nna28sr7hdwqbxwivc7j91zhfj2wpdswywp";
   };
 
   configFile = optionalString (conf != null) (builtins.toFile "nnn.h" conf);

From 5b5e206412b8d9b8c06c249df40f6688f555a21d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 06:35:37 +0000
Subject: [PATCH 0382/4636] btrbk: 0.29.0 -> 0.29.1

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

diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix
index cd45edfa2d5f..ce43ebb5720b 100644
--- a/pkgs/tools/backup/btrbk/default.nix
+++ b/pkgs/tools/backup/btrbk/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "btrbk";
-  version = "0.29.0";
+  version = "0.29.1";
 
   src = fetchurl {
     url = "https://digint.ch/download/btrbk/releases/${pname}-${version}.tar.xz";
-    sha256 = "1ki40jga09x361lj36hgzw3ahs0cg2w0s3rjwp209255fzyl89il";
+    sha256 = "153inyvvnl17hq1w3nsa783havznaykdam2yrj775bmi2wg6fvwn";
   };
 
   nativeBuildInputs = [ asciidoc asciidoctor makeWrapper ];

From 06bb5ccb8ace8e584ccbdc2ba34d0a6ed8b6ddc3 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 11 Feb 2020 19:38:48 -0800
Subject: [PATCH 0383/4636] readme: add link to community chat options

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index f5090e023289..edcd8dc0a00c 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,7 @@
 * [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos)
 * [NixOS Weekly](https://weekly.nixos.org/)
 * [Community-maintained wiki](https://nixos.wiki/)
+* [Community-maintained list of ways to get in touch](https://nixos.wiki/wiki/Get_In_Touch#Chat) (Discord, Matrix, Telegram, other IRC channels, etc.)
 
 # Other Project Repositories
 

From e8818f266ce6a7f7cac286a87fbfd39091b97124 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 07:54:19 +0000
Subject: [PATCH 0384/4636] fasm: 1.73.21 -> 1.73.22

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

diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix
index 135bae2daf4b..fd3bb8d4c429 100644
--- a/pkgs/development/compilers/fasm/bin.nix
+++ b/pkgs/development/compilers/fasm/bin.nix
@@ -3,11 +3,11 @@
 stdenvNoCC.mkDerivation rec {
   pname = "fasm-bin";
 
-  version = "1.73.21";
+  version = "1.73.22";
 
   src = fetchurl {
     url = "https://flatassembler.net/fasm-${version}.tgz";
-    sha256 = "143zh7x3q0r2kclshh8n5w4i5pw4lh60si7rspvc725xxjpjkvcv";
+    sha256 = "1pb0rcfdsb0h89khjjrbikz5wjdllavj3ajim0rcyh7x12xr1hw5";
   };
 
   installPhase = ''

From f00bda0148b7ec338ecd5021b3f91321ca4d255e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 05:35:04 +0000
Subject: [PATCH 0385/4636] cmake: 3.16.3 -> 3.16.4

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

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 33d762dbe92c..4eb531f59a8d 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
           + lib.optionalString useNcurses "-cursesUI"
           + lib.optionalString withQt5 "-qt5UI"
           + lib.optionalString useQt4 "-qt4UI";
-  version = "3.16.3";
+  version = "3.16.4";
 
   src = fetchurl {
     url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
     # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
-    sha256 = "0s06wrp0jnw2l4yq94skj53hwnz7lqrmhh96sq7w7njkkggickz5";
+    sha256 = "0b5c77lqzfk5l7mnnih5c78i36d3skbkw20jjnph79lx9l8qrk4v";
   };
 
   patches = [

From 1aa0a799a451e05002ff771d7f9d5ad04f3cc978 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 08:37:44 +0000
Subject: [PATCH 0386/4636] flashrom: 1.1 -> 1.2

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

diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix
index 18914a304f34..10da5338b24a 100644
--- a/pkgs/tools/misc/flashrom/default.nix
+++ b/pkgs/tools/misc/flashrom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "flashrom";
-  version = "1.1";
+  version = "1.2";
 
   src = fetchurl {
     url = "https://download.flashrom.org/releases/flashrom-v${version}.tar.bz2";
-    sha256 = "06afq680n9p34hi3vrkn12vd1pfyq2062db9qqbi4hi21k3skbdf";
+    sha256 = "0ax4kqnh7kd3z120ypgp73qy1knz47l6qxsqzrfkd97mh5cdky71";
   };
 
   # Newer versions of libusb deprecate some API flashrom uses.

From f2c564b1242a6ba7c4d0c2f37b03de5b4d63c853 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Wed, 12 Feb 2020 09:46:37 +0100
Subject: [PATCH 0387/4636] kdepim-runtime: Remove obsolete patch to fix
 compilation

The facebook plugin is currently disabled by upstream.
---
 .../kde/kdepim-runtime/00-no-facebook.patch          | 12 ------------
 pkgs/applications/kde/kdepim-runtime/default.nix     |  3 ---
 pkgs/applications/kde/kdepim-runtime/series          |  1 -
 3 files changed, 16 deletions(-)
 delete mode 100644 pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch
 delete mode 100644 pkgs/applications/kde/kdepim-runtime/series

diff --git a/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch b/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch
deleted file mode 100644
index 46722ff5fba0..000000000000
--- a/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
-index 99f7dbf..03e953b 100644
---- a/resources/CMakeLists.txt
-+++ b/resources/CMakeLists.txt
-@@ -45,7 +45,6 @@ add_subdirectory( imap )
- if (Libkolabxml_FOUND)
-     add_subdirectory( kolab )
- endif()
--add_subdirectory( facebook )
- add_subdirectory( maildir )
- 
- add_subdirectory( openxchange )
diff --git a/pkgs/applications/kde/kdepim-runtime/default.nix b/pkgs/applications/kde/kdepim-runtime/default.nix
index 6d7bd0daa96b..65719514f96b 100644
--- a/pkgs/applications/kde/kdepim-runtime/default.nix
+++ b/pkgs/applications/kde/kdepim-runtime/default.nix
@@ -14,7 +14,6 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
     maintainers = kdepimTeam;
   };
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ];
   buildInputs = [
     akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
@@ -22,6 +21,4 @@ mkDerivation {
     kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
     pimcommon libkgapi qtnetworkauth qtspeech qtxmlpatterns
   ];
-  # Attempts to build some files before dependencies have been generated
-  enableParallelBuilding = false;
 }
diff --git a/pkgs/applications/kde/kdepim-runtime/series b/pkgs/applications/kde/kdepim-runtime/series
deleted file mode 100644
index cc3e104775ff..000000000000
--- a/pkgs/applications/kde/kdepim-runtime/series
+++ /dev/null
@@ -1 +0,0 @@
-00-no-facebook.patch

From de6b81a89b666095a1ddea3a2f343c332da5d60f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 09:45:36 +0000
Subject: [PATCH 0388/4636] gitAndTools.gitRemoteGcrypt: 1.2 -> 1.3

---
 .../git-and-tools/git-remote-gcrypt/default.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
index ff0f702269c2..4e6e450657d2 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
@@ -5,14 +5,14 @@
 
 stdenv.mkDerivation rec {
   pname = "git-remote-gcrypt";
-  version = "1.2";
+  version = "1.3";
   rev = version;
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "spwhitton";
     repo = "git-remote-gcrypt";
-    sha256 = "0isfg0vlmcphxzj4jm32dycprhym26ina1b28jgc4j57kiqqrdcy";
+    sha256 = "0n8fzvr6y0pxrbvkywlky2bd8jvi0ayp4n9hwi84l1ldmv4a40dh";
   };
 
   outputs = [ "out" "man" ];

From eef4b5175fcd1da4667e88eac27ad96890c1e45a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 7 Feb 2020 10:40:04 +0100
Subject: [PATCH 0389/4636] =?UTF-8?q?ocaml-ng.ocamlPackages=5F4=5F10.ocaml?=
 =?UTF-8?q?:=204.10.0+=CE=B22=20=E2=86=92=204.10.0+rc1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/compilers/ocaml/4.10.nix b/pkgs/development/compilers/ocaml/4.10.nix
index 9c8a84f21125..046ea84a0d8a 100644
--- a/pkgs/development/compilers/ocaml/4.10.nix
+++ b/pkgs/development/compilers/ocaml/4.10.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
   major_version = "4";
   minor_version = "10";
-  patch_version = "0+beta2";
-  sha256 = "106y4jarwib6xxy0vhd7766mxhnlr1zq05jchisklyrgjly0g3ry";
+  patch_version = "0+rc1";
+  sha256 = "1nzmn9wszixsyzz4bhpwqw8dx0m1iy83xmanp4g9f5dfywgcss2c";
 }

From 65fc119474bbe76492c9dd4ee3e217720ec7b4ea Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Wed, 12 Feb 2020 11:14:15 +0100
Subject: [PATCH 0390/4636] flashrom: disable on aarch64

Reference: https://github.com/flashrom/flashrom/issues/125
---
 pkgs/tools/misc/flashrom/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix
index 10da5338b24a..143bc805decd 100644
--- a/pkgs/tools/misc/flashrom/default.nix
+++ b/pkgs/tools/misc/flashrom/default.nix
@@ -26,5 +26,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     maintainers = with maintainers; [ funfunctor fpletz ];
     platforms = with platforms; linux;
+    badPlatforms = [ "aarch64-linux" ];
   };
 }

From e6b2d88b2a76c52922160ac134fce59a13d55341 Mon Sep 17 00:00:00 2001
From: David Leung <david@davidslab.com>
Date: Tue, 11 Feb 2020 18:34:23 +0800
Subject: [PATCH 0391/4636] wasm-pack: 0.8.1 -> 0.9.1

---
 pkgs/development/tools/wasm-pack/default.nix | 21 +++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix
index 3f721eaee2a9..d8bdd3a4f72c 100644
--- a/pkgs/development/tools/wasm-pack/default.nix
+++ b/pkgs/development/tools/wasm-pack/default.nix
@@ -2,32 +2,35 @@
 , fetchFromGitHub
 , rustPlatform
 , pkgconfig
-, openssl
+, libressl
 , curl
 , Security
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "wasm-pack";
-  version = "0.8.1";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "rustwasm";
     repo = "wasm-pack";
     rev = "v${version}";
-    sha256 = "1z66m16n4r16zqmnv84a5jndr5x6mdqdq4b1wq929sablwqd2rl4";
+    sha256 = "1rqyfg6ajxxyfx87ar25nf5ck9hd0p12qgv98dicniqag8l4rvsr";
   };
 
-  cargoSha256 = "0hp68w5mvk725gzbmlgl8j6wa1dv2fydil7jvq0f09mzxxaqrwcs";
+  cargoSha256 = "095gk6lcck5864wjhrkhgnkxn9pzcg82xk5p94br7lmf15y9gc7j";
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ openssl ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ curl Security ];
+  buildInputs = [
+    # LibreSSL works around segfault issues caused by OpenSSL being unable to
+    # gracefully exit while doing work.
+    # See: https://github.com/rustwasm/wasm-pack/issues/650
+    libressl
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [ curl Security ];
 
-
-  # Tests fetch external resources and build artifacts.
-  # Disabled to work with sandboxing
+  # Most tests rely on external resources and build artifacts.
+  # Disabling check here to work with build sandboxing.
   doCheck = false;
 
   meta = with stdenv.lib; {

From 1c82542488641d363613afa9e3f1f5a2427f3488 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 31 Jan 2020 01:29:21 +0100
Subject: [PATCH 0392/4636] wayland: 1.17.0 -> 1.18.0

This also switches the build from Autotools to Meson. The only
difference should be that the libtool archives (.la files) aren't
generated anymore.
Additionally I've updated the meta attributes and added myself as
maintainer.

The changelog is in the final release announcement [0] and an overview
of most commits is in the alpha release announcement [1].

[0]: https://lists.freedesktop.org/archives/wayland-devel/2020-February/041207.html
[1]: https://lists.freedesktop.org/archives/wayland-devel/2020-January/041140.html
---
 .../development/libraries/wayland/default.nix | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index 60d240552d4f..08ab4c6748e3 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig
+{ lib, stdenv, fetchurl, meson, pkgconfig, ninja
 , libffi, libxml2, wayland
 , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0)
 }:
@@ -8,23 +8,19 @@ assert expat != null;
 
 stdenv.mkDerivation rec {
   pname = "wayland";
-  version = "1.17.0";
+  version = "1.18.0";
 
   src = fetchurl {
     url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
-    sha256 = "194ibzwpdcn6fvk4xngr4bf5axpciwg2bj82fdvz88kfmjw13akj";
+    sha256 = "0k995rn96xkplrapz5k648j651wc43kq817xk1x8280h16gsfxa6";
   };
 
   separateDebugInfo = true;
 
-  configureFlags = [
-    "--disable-documentation"
-  ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-    "--with-host-scanner"
-  ];
+  mesonFlags = [ "-Ddocumentation=false" ];
 
   nativeBuildInputs = [
-    pkgconfig
+    meson pkgconfig ninja
   ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
     # for wayland-scanner during build
     wayland
@@ -33,11 +29,19 @@ stdenv.mkDerivation rec {
   buildInputs = [ libffi /* docbook_xsl doxygen graphviz libxslt xmlto */ expat libxml2 ];
 
   meta = {
-    description = "Reference implementation of the wayland protocol";
+    description = "Core Wayland window system code and protocol";
+    longDescription = ''
+      Wayland is a project to define a protocol for a compositor to talk to its
+      clients as well as a library implementation of the protocol.
+      The wayland protocol is essentially only about input handling and buffer
+      management, but also handles drag and drop, selections, window management
+      and other interactions that must go through the compositor (but not
+      rendering).
+    '';
     homepage    = https://wayland.freedesktop.org/;
-    license     = lib.licenses.mit;
+    license     = lib.licenses.mit; # Expat version
     platforms   = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ codyopel ];
+    maintainers = with lib.maintainers; [ primeos codyopel ];
   };
 
   passthru.version = version;

From c16b065cc959158717b1ccc6098881eec7ff926f Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 31 Jan 2020 15:36:41 +0100
Subject: [PATCH 0393/4636] wayland: Add a flag to build the documentation

But don't build the documentation by default.
---
 pkgs/development/libraries/wayland/default.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index 08ab4c6748e3..db476da55a1d 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -1,6 +1,8 @@
 { lib, stdenv, fetchurl, meson, pkgconfig, ninja
 , libffi, libxml2, wayland
 , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0)
+, withDocumentation ? false, graphviz-nox, doxygen, libxslt, xmlto, python3
+, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42
 }:
 
 # Require the optional to be enabled until upstream fixes or removes the configure flag
@@ -17,16 +19,26 @@ stdenv.mkDerivation rec {
 
   separateDebugInfo = true;
 
-  mesonFlags = [ "-Ddocumentation=false" ];
+  mesonFlags = [ "-Ddocumentation=${lib.boolToString withDocumentation}" ];
+
+  postPatch = lib.optionalString withDocumentation ''
+    patchShebangs doc/doxygen/gen-doxygen.py
+  '';
 
   nativeBuildInputs = [
     meson pkgconfig ninja
   ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
     # for wayland-scanner during build
     wayland
+  ] ++ lib.optionals withDocumentation [
+    (graphviz-nox.override { pango = null; }) # To avoid an infinite recursion
+    doxygen libxslt xmlto python3 docbook_xml_dtd_45
   ];
 
-  buildInputs = [ libffi /* docbook_xsl doxygen graphviz libxslt xmlto */ expat libxml2 ];
+  buildInputs = [ libffi expat libxml2
+  ] ++ lib.optionals withDocumentation [
+    docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42
+  ];
 
   meta = {
     description = "Core Wayland window system code and protocol";

From de3f4fe9005f7814ef61bc75b25c0f69a0ba1e53 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 4 Feb 2020 22:16:04 +0100
Subject: [PATCH 0394/4636] wayland: Fix the cross-compilation with Meson

The build sandbox provides only wayland-scanner and not the library and
the wayland-egl symbols check test must use nm prefixed with the target
triplet.
---
 pkgs/development/libraries/wayland/default.nix    | 15 +++++++++++----
 .../wayland/fix-wayland-cross-compilation.patch   | 14 ++++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/wayland/fix-wayland-cross-compilation.patch

diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index db476da55a1d..ef88e690067b 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -8,7 +8,9 @@
 # Require the optional to be enabled until upstream fixes or removes the configure flag
 assert expat != null;
 
-stdenv.mkDerivation rec {
+let
+  isCross = stdenv.buildPlatform != stdenv.hostPlatform;
+in stdenv.mkDerivation rec {
   pname = "wayland";
   version = "1.18.0";
 
@@ -21,15 +23,20 @@ stdenv.mkDerivation rec {
 
   mesonFlags = [ "-Ddocumentation=${lib.boolToString withDocumentation}" ];
 
+  patches = lib.optional isCross ./fix-wayland-cross-compilation.patch;
+
   postPatch = lib.optionalString withDocumentation ''
     patchShebangs doc/doxygen/gen-doxygen.py
+  '' + lib.optionalString isCross ''
+    substituteInPlace egl/meson.build --replace \
+      "find_program('nm').path()" \
+      "find_program('${stdenv.cc.targetPrefix}nm').path()"
   '';
 
   nativeBuildInputs = [
     meson pkgconfig ninja
-  ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-    # for wayland-scanner during build
-    wayland
+  ] ++ lib.optionals isCross [
+    wayland # For wayland-scanner during the build
   ] ++ lib.optionals withDocumentation [
     (graphviz-nox.override { pango = null; }) # To avoid an infinite recursion
     doxygen libxslt xmlto python3 docbook_xml_dtd_45
diff --git a/pkgs/development/libraries/wayland/fix-wayland-cross-compilation.patch b/pkgs/development/libraries/wayland/fix-wayland-cross-compilation.patch
new file mode 100644
index 000000000000..77639acb6530
--- /dev/null
+++ b/pkgs/development/libraries/wayland/fix-wayland-cross-compilation.patch
@@ -0,0 +1,14 @@
+diff --git a/src/meson.build b/src/meson.build
+index 3e8c9bf..75241cb 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -55,8 +55,7 @@ pkgconfig.generate(
+ )
+ 
+ if meson.is_cross_build()
+-	scanner_dep = dependency('wayland-scanner', native: true, version: '>=1.14.0')
+-	wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner'))
++	wayland_scanner_for_build = find_program('wayland-scanner', native: true, version: '>=1.14.0')
+ else
+ 	wayland_scanner_for_build = wayland_scanner
+ endif

From ded18bd210172ae03660852d6741427b89f3a2d5 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 5 Feb 2020 00:52:48 +0100
Subject: [PATCH 0395/4636] wayland-protocols: Update meta and add myself as
 maintainer

---
 pkgs/development/libraries/wayland/protocols.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix
index 0b367f4a930f..8c2823d74b0a 100644
--- a/pkgs/development/libraries/wayland/protocols.nix
+++ b/pkgs/development/libraries/wayland/protocols.nix
@@ -17,10 +17,17 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Wayland protocol extensions";
-    homepage    = https://wayland.freedesktop.org/;
-    license     = lib.licenses.mit;
+    longDescription = ''
+      wayland-protocols contains Wayland protocols that add functionality not
+      available in the Wayland core protocol. Such protocols either add
+      completely new functionality, or extend the functionality of some other
+      protocol either in Wayland core, or some other protocol in
+      wayland-protocols.
+    '';
+    homepage    = https://gitlab.freedesktop.org/wayland/wayland-protocols;
+    license     = lib.licenses.mit; # Expat version
     platforms   = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ primeos ];
   };
 
   passthru.version = version;

From 91801c0b45e2d667a77c7ce4332ec30a0715d036 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hl=C3=B6=C3=B0ver=20Sigur=C3=B0sson?= <hlolli@gmail.com>
Date: Wed, 12 Feb 2020 12:50:50 +0100
Subject: [PATCH 0396/4636] clojure 1.10.1.492 -> 1.10.1.507 plus bugfix
 (#79868)

---
 .../interpreters/clojure/TDEPS-150.patch      | 23 +++++++++++
 .../interpreters/clojure/default.nix          | 40 ++++++++++++-------
 2 files changed, 48 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/interpreters/clojure/TDEPS-150.patch

diff --git a/pkgs/development/interpreters/clojure/TDEPS-150.patch b/pkgs/development/interpreters/clojure/TDEPS-150.patch
new file mode 100644
index 000000000000..611134e8e3fa
--- /dev/null
+++ b/pkgs/development/interpreters/clojure/TDEPS-150.patch
@@ -0,0 +1,23 @@
+--- a/clojure
++++ b/clojure
+@@ -317,17 +317,17 @@ if "$stale" || "$pom"; then
+     tools_args+=("--threads" "$threads")
+   fi
+   if "$trace"; then
+     tools_args+=("--trace")
+   fi
+ fi
+
+ # If stale, run make-classpath to refresh cached classpath
+-if [[ "$stale" = true && "$describe" = false ]]; then
++if [[ "$stale" = true && "$describe" = false && -z "$force_cp" ]]; then
+   if "$verbose"; then
+     echo "Refreshing classpath"
+   fi
+
+   "$JAVA_CMD" -classpath "$tools_cp" clojure.main -m clojure.tools.deps.alpha.script.make-classpath2 --config-user "$config_user" --config-project "$config_project" --libs-file "$libs_file" --cp-file "$cp_file" --jvm-file "$jvm_file" --main-file "$main_file" "${tools_args[@]}"
+ fi
+
+ if "$describe"; then
+--
+2.25.0
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index 8187bf4af8e1..01fba17f104f 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -2,31 +2,41 @@
 
 stdenv.mkDerivation rec {
   pname = "clojure";
-  version = "1.10.1.492";
+  version = "1.10.1.507";
 
   src = fetchurl {
     url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
-    sha256 = "09mhy5xw9kdr10a1xpbn5v97qyyhngw5s1n1alrs45a4m3l11iky";
+    sha256 = "1k0jwa3481g3mkalwlb9gkcz9aq9zjpwmzckv823fr2d8djp41cc";
   };
 
+  patches = [ ./TDEPS-150.patch ];
+
   buildInputs = [ makeWrapper ];
 
-  installPhase = let
-    binPath = stdenv.lib.makeBinPath [ rlwrap jdk11 ];
-  in
-    ''
-      mkdir -p $out/libexec
-      cp clojure-tools-${version}.jar $out/libexec
-      cp example-deps.edn $out
-      cp deps.edn $out
+  installPhase =
+    let
+      binPath = stdenv.lib.makeBinPath [ rlwrap jdk11 ];
+    in
+      ''
+        mkdir -p $out/libexec
+        cp clojure-tools-${version}.jar $out/libexec
+        cp example-deps.edn $out
+        cp deps.edn $out
 
-      substituteInPlace clojure --replace PREFIX $out
+        substituteInPlace clojure --replace PREFIX $out
 
-      install -Dt $out/bin clj clojure
-      wrapProgram $out/bin/clj --prefix PATH : $out/bin:${binPath}
-      wrapProgram $out/bin/clojure --prefix PATH : $out/bin:${binPath}
-    '';
+        install -Dt $out/bin clj clojure
+        wrapProgram $out/bin/clj --prefix PATH : $out/bin:${binPath}
+        wrapProgram $out/bin/clojure --prefix PATH : $out/bin:${binPath}
+      '';
 
+  doInstallCheck = true;
+  installCheckPhase = ''
+    CLJ_CONFIG=$out CLJ_CACHE=$out/libexec $out/bin/clojure \
+      -Spath \
+      -Sverbose \
+      -Scp $out/libexec/clojure-tools-${version}.jar
+  '';
   meta = with stdenv.lib; {
     description = "A Lisp dialect for the JVM";
     homepage = https://clojure.org/;

From 146e91470bb453e0776b5b7c1c296c5706383f88 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 12:34:24 +0000
Subject: [PATCH 0397/4636] groovy: 2.5.9 -> 3.0.0

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

diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index 67d9ecf9c61f..e1d404a6b15d 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "groovy";
-  version = "2.5.9";
+  version = "3.0.0";
 
   src = fetchurl {
     url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
-    sha256 = "16xq8mz7270kmiq4xb0g52y7ik1bbl2nb8aaz9zw8a9h38rdr9zy";
+    sha256 = "10nn04hfky4x75nss33vvslw958pjvhw35lcfb3lxvaifqg23cpl";
   };
 
   buildInputs = [ unzip makeWrapper ];

From ab34d0d15bb64a18fbbc30349da97cf929d469c2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 12:36:58 +0000
Subject: [PATCH 0398/4636] gti: 1.6.1 -> 1.7.0

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

diff --git a/pkgs/tools/misc/gti/default.nix b/pkgs/tools/misc/gti/default.nix
index bca481cade45..cdb6be992539 100644
--- a/pkgs/tools/misc/gti/default.nix
+++ b/pkgs/tools/misc/gti/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gti";
-  version = "1.6.1";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "rwos";
     repo = "gti";
     rev = "v${version}";
-    sha256 = "19q3r4v22z2q1j4njap356f3mcq6kwh6v8nbbq2rw4x3cdxwdv51";
+    sha256 = "1jivnjswlhwjfg5v9nwfg3vfssvqbdxxf9znwmfb5dgfblg9wxw9";
   };
 
   installPhase = ''

From 07ba5ae8f7268d002bf1552f499c689f3ca4e7c3 Mon Sep 17 00:00:00 2001
From: TANIGUCHI Kohei <a.d.xvii.kal.mai@gmail.com>
Date: Wed, 12 Feb 2020 22:22:50 +0900
Subject: [PATCH 0399/4636] chromedriver: 78.0.3904.70 -> 80.0.3987.16

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

diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index aed384ba61f9..435588953db2 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -6,12 +6,12 @@ let
   allSpecs = {
     x86_64-linux = {
       system = "linux64";
-      sha256 = "155yilj9w8a6jbkx1axhhkizwdc12krl4xixn10j7n94bvny4w2y";
+      sha256 = "0cx6x5akmawyzm5dmd3xvj9a2vg4dnai1qs1v9p4acw9hai559c8";
     };
 
     x86_64-darwin = {
       system = "mac64";
-      sha256 = "0dzy9ihhbhx4byr2kalwfbn6jbk1hinacdqi25lvhaprdbrh2igh";
+      sha256 = "1nh7h2wpljpblwqr0km7nzg3ky5xw6cxqmgdmgvw6qia8bryw1lj";
     };
   };
 
@@ -28,7 +28,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "chromedriver";
-  version = "78.0.3904.70";
+  version = "80.0.3987.16";
 
   src = fetchurl {
     url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip";

From 0b3dd6026e5a3a22a7a0b611f8f5fcd824115c8d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 12 Feb 2020 08:26:52 -0500
Subject: [PATCH 0400/4636] linux_latest-libre: 17318 -> 17322

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

diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index 19e226cc3441..e9872cf0761f 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -1,8 +1,8 @@
 { stdenv, lib, fetchsvn, linux
 , scripts ? fetchsvn {
     url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
-    rev = "17318";
-    sha256 = "1advlajxkcwjp6ffhg31wpxmp9xqj04mg0g4rbmff4vkrz68kraf";
+    rev = "17322";
+    sha256 = "1hhi1gsfr08zj9d8mglbfk5wicfy1gqrh68vg90hxglp61dsx97x";
   }
 , ...
 }:

From c3b1bb31cb7ad3aeaf5928237e35dafe53aaa932 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 12 Feb 2020 08:27:30 -0500
Subject: [PATCH 0401/4636] vivaldi: 2.10.1745.27-1 -> 2.11.1811.33-1

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

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 6825d2af64f9..73a0bfdbb7e3 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -17,11 +17,11 @@ let
   vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
 in stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "2.10.1745.27-1";
+  version = "2.11.1811.33-1";
 
   src = fetchurl {
     url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
-    sha256 = "1z9biiycxcxyw7i1lqhvk8092hqvidaipkfdvkz632vxcg33jz4q";
+    sha256 = "1z0cscvmhxh1wjs7r0sjdr3f3mcg8i6avpal6spp0ymkxp2rn0h3";
   };
 
   unpackPhase = ''

From c384edd32e0a85be29cd24b1b6b7506250d80eb2 Mon Sep 17 00:00:00 2001
From: ffinkdevs <fink@h0st.space>
Date: Fri, 1 Nov 2019 16:04:24 +0100
Subject: [PATCH 0402/4636] duplicacy: 2.1.2 -> 2.3.0

---
 pkgs/tools/backup/duplicacy/default.nix | 8 ++++----
 pkgs/tools/backup/duplicacy/deps.nix    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/backup/duplicacy/default.nix b/pkgs/tools/backup/duplicacy/default.nix
index d217864e93e6..d7a248b7a49c 100644
--- a/pkgs/tools/backup/duplicacy/default.nix
+++ b/pkgs/tools/backup/duplicacy/default.nix
@@ -2,15 +2,15 @@
 
 buildGoPackage rec {
   pname = "duplicacy";
-  version = "2.1.2";
+  version = "2.3.0";
 
-  goPackagePath = "github.com/gilbertchen/duplicacy/";
+  goPackagePath = "github.com/gilbertchen/duplicacy";
 
   src = fetchFromGitHub {
     owner = "gilbertchen";
     repo = "duplicacy";
     rev = "v${version}";
-    sha256 = "0v3rk4da4b6dhqq8zsr4z27wd8p7crxapkn265kwpsaa99xszzbv";
+    sha256 = "12swp3kbwkmwn3g2mp964m60kabmz0ip7kkhvhiqq7k74nxzj312";
   };
   goDeps = ./deps.nix;
   buildPhase = ''
@@ -24,7 +24,7 @@ buildGoPackage rec {
 
   meta = with lib; {
     homepage = https://duplicacy.com;
-    description = "A new generation cloud backup tool ";
+    description = "A new generation cloud backup tool";
     platforms = platforms.linux ++ platforms.darwin;
     license = lib.licenses.unfree;
     maintainers = with maintainers; [ ffinkdevs ];
diff --git a/pkgs/tools/backup/duplicacy/deps.nix b/pkgs/tools/backup/duplicacy/deps.nix
index 5511b2e67163..12d30b53b6c5 100644
--- a/pkgs/tools/backup/duplicacy/deps.nix
+++ b/pkgs/tools/backup/duplicacy/deps.nix
@@ -104,8 +104,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gilbertchen/go.dbus";
-      rev =  "9e442e6378618c083fd3b85b703ffd202721fb17";
-      sha256 = "0q8ld38gnr4adzw5287lw5f5l14yp8slxsz1za5ryrkprh04bhkv";
+      rev =  "8591994fa32f1dbe3fa9486bc6f4d4361ac16649";
+      sha256 = "0wg82hwgk4s65ns76x7cby6dfdxsdkc4jyqn9zd7g037fhzh8rk5";
     };
   }
   {
@@ -230,8 +230,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/pkg/sftp";
-      rev =  "98203f5a8333288eb3163b7c667d4260fe1333e9";
-      sha256 = "09wxyrhwwh20rzpzb06vsj8k2bmw52cjlx7j4115zhky27528sx9";
+      rev =  "3edd153f213d8d4191a0ee4577c61cca19436632";
+      sha256 = "0iw6lijdljwh5xw5hsy0b578cr52h6vvm7hbnzlrvciwhh4sfhhp";
     };
   }
   {

From ef38093b13e0eb522e59a03a51af6154621b1c90 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 8 Feb 2020 20:04:46 +0000
Subject: [PATCH 0403/4636] mawk: 1.3.4-20200106 -> 1.3.4-20200120

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

diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix
index 81d11e2aae7e..8ad5cd16aafa 100644
--- a/pkgs/tools/text/mawk/default.nix
+++ b/pkgs/tools/text/mawk/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mawk-1.3.4-20200106";
+  name = "mawk-1.3.4-20200120";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.invisible-island.net/mawk/${name}.tgz"
       "https://invisible-mirror.net/archives/mawk/${name}.tgz"
     ];
-    sha256 = "1dhmn0l1c122a4bb07a1lwzrzpjdhsbdbllb1a9gwvv2lw5j9qgi";
+    sha256 = "0dw2icf8bnqd9y0clfd9pkcxz4b2phdihwci13z914mf3wgcvm3z";
   };
 
   meta = with stdenv.lib; {

From 822ad560b46ab70684d81f985807929688fa5708 Mon Sep 17 00:00:00 2001
From: Gabriel Gonzalez <Gabriel439@gmail.com>
Date: Wed, 12 Feb 2020 06:44:55 -0800
Subject: [PATCH 0404/4636] Simplify `dhall-kubernetes` packages

There is no need to provide a separate `kubernetesVersion` argument
since the `file` argument works just fine
---
 pkgs/development/dhall-modules/dhall-kubernetes.nix | 13 +------------
 pkgs/development/dhall-modules/dhall-packages.nix   |  6 +++---
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/dhall-modules/dhall-kubernetes.nix b/pkgs/development/dhall-modules/dhall-kubernetes.nix
index 5bc0e08c69b7..8ae1d2ae9fbc 100644
--- a/pkgs/development/dhall-modules/dhall-kubernetes.nix
+++ b/pkgs/development/dhall-modules/dhall-kubernetes.nix
@@ -6,14 +6,6 @@ let
     lib.makeOverridable
       ( { rev
         , sha256
-
-          # The version of the Kubernetes OpenAPI spec to use.
-          #
-          # This defaults to the latest supported Kubernetes if left unspecified.
-          #
-          # This is only supported by dhall-kubernetes version 3.0.0 or newer.
-        , kubernetesVersion ? null
-
         , file ? "package.dhall"
         }:
           buildDhallPackage {
@@ -29,11 +21,8 @@ let
                   inherit rev sha256;
                 };
 
-                prefix =
-                  if kubernetesVersion == null then "" else "${kubernetesVersion}/";
-
               in
-                "${src}/${prefix}${file}";
+                "${src}/${file}";
           }
       );
 
diff --git a/pkgs/development/dhall-modules/dhall-packages.nix b/pkgs/development/dhall-modules/dhall-packages.nix
index 659c582f3c12..b83eb688a60f 100644
--- a/pkgs/development/dhall-modules/dhall-packages.nix
+++ b/pkgs/development/dhall-modules/dhall-packages.nix
@@ -56,9 +56,9 @@ in
           sha256 = "1v4y1x13lxy6cxf8xqc6sb0mc4mrd4frkxih95v9q2wxw4vkw2h7";
 
           dependencies = [
-            (k8s_6a47bd.override { kubernetesVersion = "1.14"; })
-            (k8s_6a47bd.override { kubernetesVersion = "1.15"; })
-            (k8s_6a47bd.override { kubernetesVersion = "1.16"; })
+            (k8s_6a47bd.override { file = "1.14/package.dhall"; })
+            (k8s_6a47bd.override { file = "1.15/package.dhall"; })
+            (k8s_6a47bd.override { file = "1.16/package.dhall"; })
             (k8s_4ad581.override { file = "types.dhall"; })
             (k8s_fee24c.override { file = "types/io.k8s.api.core.v1.ServiceSpec.dhall"; })
             (k8s_fee24c.override { file = "types/io.k8s.api.core.v1.PodTemplateSpec.dhall"; })

From 0795e60e2318bc05f27fff4016b11f9800363674 Mon Sep 17 00:00:00 2001
From: Alma Cemerlic <Alma.Cemerlic@worldquant.com>
Date: Mon, 10 Feb 2020 17:05:09 -0500
Subject: [PATCH 0405/4636] maintainers: add almac

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c4634caa7e42..f6035a7ba835 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -367,6 +367,12 @@
       fingerprint = "7FDB 17B3 C29B 5BA6 E5A9  8BB2 9FAA 63E0 9750 6D9D";
     }];
   };
+  almac = {
+    email = "alma.cemerlic@gmail.com";
+    github = "a1mac";
+    githubId = 60479013;
+    name = "Alma Cemerlic";
+  };
   alunduil = {
     email = "alunduil@gmail.com";
     github = "alunduil";

From efc75b3eb3044cefa2fcf596f6e1684e226ccd4d Mon Sep 17 00:00:00 2001
From: Alma Cemerlic <Alma.Cemerlic@worldquant.com>
Date: Mon, 10 Feb 2020 17:10:01 -0500
Subject: [PATCH 0406/4636] pythonPackages.pysnow: init at 0.7.14

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

diff --git a/pkgs/development/python-modules/pysnow/default.nix b/pkgs/development/python-modules/pysnow/default.nix
new file mode 100644
index 000000000000..db02f0f390e3
--- /dev/null
+++ b/pkgs/development/python-modules/pysnow/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy27
+, pythonAtLeast
+, brotli
+, ijson
+, nose
+, requests_oauthlib 
+, python_magic
+, pytz
+}:
+
+buildPythonPackage rec {
+  pname = "pysnow";
+  version = "0.7.14";
+  
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0a6ce8b5f247fbfe5a53829c2f22391161e88646742283f861bce32bfe1626f1";
+  };
+
+  propagatedBuildInputs = [
+    brotli
+    ijson 
+    python_magic 
+    pytz 
+    requests_oauthlib
+  ];
+
+  checkInputs = [ nose ];
+
+  checkPhase = ''
+    nosetests --cover-package=pysnow --with-coverage --cover-erase
+  '';
+
+  meta = with lib; {
+    description = "ServiceNow HTTP client library written in Python";
+    homepage = "https://github.com/rbw/pysnow";
+    license = licenses.mit;
+    maintainers = [ maintainers.almac ];  
+  };
+
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 04fd9e76192d..07d88e411d39 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4969,6 +4969,8 @@ in {
 
   pyshp = callPackage ../development/python-modules/pyshp { };
 
+  pysnow = callPackage ../development/python-modules/pysnow { };
+
   pysmbc = callPackage ../development/python-modules/pysmbc {
     inherit (pkgs) pkgconfig;
   };

From ef086b6c175b8e14abf1715750db21ff351bb953 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Mon, 28 Oct 2019 21:01:31 -0400
Subject: [PATCH 0407/4636] vivaldi: fix patched paths

---
 .../networking/browsers/vivaldi/default.nix           |  5 ++---
 .../networking/browsers/vivaldi/widevine.nix          | 11 +++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 73a0bfdbb7e3..ce3530728aa2 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -51,8 +51,7 @@ in stdenv.mkDerivation rec {
       --set-rpath "${libPath}" \
       opt/${vivaldiName}/vivaldi-bin
   '' + stdenv.lib.optionalString proprietaryCodecs ''
-    sed -i '/^if \[ "$VIVALDI_FFMPEG_FOUND/i \
-      VIVALDI_FFMPEG_FOUND=YES\nCACHED_FFMPEG=${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so' opt/${vivaldiName}/${vivaldiName}
+    ln -s ${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so opt/${vivaldiName}/libffmpeg.so.''${version%\.*\.*}
   '' + ''
     echo "Finished patching Vivaldi binaries"
   '';
@@ -82,7 +81,7 @@ in stdenv.mkDerivation rec {
       --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ \
       ${stdenv.lib.optionalString enableWidevine "--suffix LD_LIBRARY_PATH : ${libPath}"}
   '' + stdenv.lib.optionalString enableWidevine ''
-    ln -sf ${vivaldi-widevine}/lib/libwidevinecdm.so $out/opt/${vivaldiName}/libwidevinecdm.so
+    ln -sf ${vivaldi-widevine}/share/google/chrome/WidevineCdm $out/opt/${vivaldiName}/WidevineCdm
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/browsers/vivaldi/widevine.nix b/pkgs/applications/networking/browsers/vivaldi/widevine.nix
index a21de1acad28..756a655eddf7 100644
--- a/pkgs/applications/networking/browsers/vivaldi/widevine.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/widevine.nix
@@ -14,12 +14,15 @@ stdenv.mkDerivation rec {
   buildInputs = [ unzip ];
 
   unpackPhase = ''
-    unzip $src libwidevinecdm.so
-    find .
+    unzip $src
   '';
 
-  installPhase = ''
-    install -vD libwidevinecdm.so $out/lib/libwidevinecdm.so
+  installPhase = let
+    installDir = "$out/share/google/chrome/WidevineCdm/_platform_specific/linux_x64";
+  in ''
+    install -vD libwidevinecdm.so ${installDir}/libwidevinecdm.so
+    install -vD manifest.json ${installDir}/manifest.json
+    install -vD LICENSE.txt ${installDir}/LICENSE.txt
   '';
 
   meta = with stdenv.lib; {

From c8311920a0dbd4e732b141ddaaeadea2695425af Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Mon, 28 Oct 2019 21:02:01 -0400
Subject: [PATCH 0408/4636] vivaldi-codecs-ffmpeg: 74.0.3729.169 ->
 78.0.3904.70

---
 .../networking/browsers/vivaldi/ffmpeg-codecs.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
index 3207409a6ba5..2643bd3e58d9 100644
--- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "chromium-codecs-ffmpeg";
-  version = "74.0.3729.169";
+  version = "78.0.3904.70";
 
   src = fetchurl {
-    url = "https://launchpadlibrarian.net/424938057/${name}-extra_${version}-0ubuntu0.16.04.1_amd64.deb";
-    sha256 = "1ls2fshfk08hqsfvbd7p6rp2gv3n0xdy86rdh00wiz5qgl3skfzc";
+    url = "https://launchpadlibrarian.net/449403909/${name}-extra_${version}-0ubuntu0.16.04.2_amd64.deb";
+    sha256 = "00j604nm49z6hbyw7xsxcvmdjf7117kb478plkpizzvmm3w72b9v";
   };
 
   buildInputs = [ dpkg ];

From 3480dd63d6c827a9ffe3b50c3c5854fc396e1304 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Mon, 28 Oct 2019 21:02:21 -0400
Subject: [PATCH 0409/4636] widevine: 4.10.1196.0 -> 4.10.1582.1

---
 .../networking/browsers/vivaldi/widevine.nix       | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vivaldi/widevine.nix b/pkgs/applications/networking/browsers/vivaldi/widevine.nix
index 756a655eddf7..6e807aac5df6 100644
--- a/pkgs/applications/networking/browsers/vivaldi/widevine.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/widevine.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "widevine";
-  version = "4.10.1196.0";
+  version = "4.10.1582.1";
 
   src = fetchurl {
     url = "https://dl.google.com/widevine-cdm/${version}-linux-x64.zip";
-    sha256 = "01c7nr7d2xs718jymicbk4ipzfx6q253109qv3lk4lryrrhvw14y";
+    sha256 = "0l743f2yyaq1vvc3iicajgnfpjxjsfvjcqvanndbxs23skgjcv6r";
   };
 
   buildInputs = [ unzip ];
@@ -17,12 +17,10 @@ stdenv.mkDerivation rec {
     unzip $src
   '';
 
-  installPhase = let
-    installDir = "$out/share/google/chrome/WidevineCdm/_platform_specific/linux_x64";
-  in ''
-    install -vD libwidevinecdm.so ${installDir}/libwidevinecdm.so
-    install -vD manifest.json ${installDir}/manifest.json
-    install -vD LICENSE.txt ${installDir}/LICENSE.txt
+  installPhase = ''
+    install -vD manifest.json $out/share/google/chrome/WidevineCdm/manifest.json
+    install -vD LICENSE.txt $out/share/google/chrome/WidevineCdm/LICENSE.txt
+    install -vD libwidevinecdm.so $out/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
   '';
 
   meta = with stdenv.lib; {

From a279b685718bb31af9e61697a1f4ff70aacdff14 Mon Sep 17 00:00:00 2001
From: Sarah Zhang <sarah.s.zhang@vanderbilt.edu>
Date: Mon, 10 Feb 2020 17:40:57 -0600
Subject: [PATCH 0410/4636] Fixed typo

---
 pkgs/tools/virtualization/nixos-container/nixos-container.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
index 727c0333b275..0ba0d5546a09 100755
--- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl
+++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
@@ -90,7 +90,7 @@ my $action = $ARGV[0] or die "$0: no action specified\n";
 
 if (defined $configFile and defined $extraConfig) {
     die "--config and --config-file are mutually incompatible. " .
-        "Please define on or the other, but not both";
+        "Please define one or the other, but not both";
 }
 
 if (defined $flake && $flake =~ /^(.*)#([^#"]+)$/) {

From 0a5108d00221a98a61a84dbf2c6f2aa86a1c9733 Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Tue, 21 Jan 2020 13:19:01 -0500
Subject: [PATCH 0411/4636] pythonPackages.dlx: init at 1.0.4

Python implementation of Donald Knuth's Dancing Links (exact cover)
algorithm.

Requirement of qiskit-aqua.
---
 .../python-modules/dlx/default.nix            | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/python-modules/dlx/default.nix

diff --git a/pkgs/development/python-modules/dlx/default.nix b/pkgs/development/python-modules/dlx/default.nix
new file mode 100644
index 000000000000..81ae3deda624
--- /dev/null
+++ b/pkgs/development/python-modules/dlx/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "dlx";
+  version = "1.0.4";
+
+  # untagged releases
+  src = fetchFromGitHub {
+    owner = "sraaphorst";
+    repo = "dlx_python";
+    rev = "02d1ed534df60513095633da07e67a6593b9e9b4";
+    sha256 = "0c6dblbypwmx6yrk9qxp157m3cd7lq3j411ifr3shscv1igxv5hk";
+  };
+
+  # No test suite, so just run an example
+  pythonImportsCheck = [ "dlx" ];
+  # ./examples/design.py requires pyncomb, not in tree
+  checkPhase = ''
+    # example sudoku board from ./examples/sudoku.py
+    ${python.interpreter} ./examples/sudoku.py 3 "070285010008903500000000000500010008010000090900040003000000000002408600090632080"
+  '';
+
+  meta = with lib; {
+    description = "Implementation of Donald Knuth's Dancing Links algorithm";
+    homepage = "https://github.com/sraaphorst/dlx_python";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ drewrisinger ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 07d88e411d39..9a8136a7032e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2514,6 +2514,8 @@ in {
 
   discogs_client = callPackage ../development/python-modules/discogs_client { };
 
+  dlx = callPackage ../development/python-modules/dlx { };
+
   dmenu-python = callPackage ../development/python-modules/dmenu { };
 
   dnslib = callPackage ../development/python-modules/dnslib { };

From ca80fbd08aa84c76a981d9dbd853e91a15b06373 Mon Sep 17 00:00:00 2001
From: David Terry <me@xwvvvvwx.com>
Date: Wed, 12 Feb 2020 16:21:58 +0100
Subject: [PATCH 0412/4636] vimPlugins: update

---
 pkgs/misc/vim-plugins/generated.nix    | 426 ++++++++++++-------------
 pkgs/misc/vim-plugins/vim-plugin-names |   4 +-
 2 files changed, 215 insertions(+), 215 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 5ae96e963b31..d25a768d39ef 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -61,12 +61,12 @@ let
 
   ale = buildVimPluginFrom2Nix {
     pname = "ale";
-    version = "2020-01-02";
+    version = "2020-02-08";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "4afbf2f25dc0ce86b118261b0cfb904c80ae6ba0";
-      sha256 = "1p2g745gyhzs6qql6gnwsn2yxvzf2409andbd8xgrc9bi9cn25pj";
+      rev = "d6d2a0c77010db6a75a8942e2af9606971738c23";
+      sha256 = "1g3zws7zi18plvwd6m7wrvj83siczsnwx0yr892v1m0gh7x2452y";
     };
   };
 
@@ -83,12 +83,12 @@ let
 
   ansible-vim = buildVimPluginFrom2Nix {
     pname = "ansible-vim";
-    version = "2019-12-07";
+    version = "2020-02-09";
     src = fetchFromGitHub {
       owner = "pearofducks";
       repo = "ansible-vim";
-      rev = "19e6ae0f2258953591d7c674abd7aca3ceb51374";
-      sha256 = "0283nm92666idvwp0pzy6yzcfvrqy12nwn9zys1jbs34kk6srwa8";
+      rev = "8da127b946b519a271a73dc6f337e97190a958c9";
+      sha256 = "0df6nhc39xnxll2smxyj6fxqvkq7v2s44cs2n4zzdg80w1wswkgd";
     };
   };
 
@@ -215,12 +215,12 @@ let
 
   calendar-vim = buildVimPluginFrom2Nix {
     pname = "calendar-vim";
-    version = "2020-01-31";
+    version = "2020-02-08";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "calendar.vim";
-      rev = "84e87ab52e18fb1b06c71ca0a03dfe949b12ff22";
-      sha256 = "0nffpmkraxfdh9fv1j7k413kw1vn3s4vdr26r5srfr21ck835l2c";
+      rev = "dff8667463062d03bae86152a71afd6534a3fabc";
+      sha256 = "0a5p61ijhvkshxk2744bgmikk6s5f0dvyh5rj65ax202qw62blid";
     };
   };
 
@@ -325,34 +325,34 @@ let
 
   coc-eslint = buildVimPluginFrom2Nix {
     pname = "coc-eslint";
-    version = "2020-01-31";
+    version = "2020-02-10";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-eslint";
-      rev = "e1059e0481f71507daafffbd88cb053edec6d66f";
-      sha256 = "1zb9637bsw0y73cwy7g5bhs3abi2hha8rvwji83jy3c31xals3y1";
+      rev = "2f9de5cf232223f886b5e9711b0e9a5260f65db9";
+      sha256 = "0q1sizzj6ac6gzfp4s7ka600pa9f2dhr17v14j98cdlmyp6pyfhz";
     };
   };
 
   coc-git = buildVimPluginFrom2Nix {
     pname = "coc-git";
-    version = "2020-01-22";
+    version = "2020-02-04";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-git";
-      rev = "99a156b0af36365707aa97afa6544020eb2f4fe2";
-      sha256 = "1lq0gjwxh0qhx6vp85bld8sng47yf6pb28n3wkfi6m6718wz8dq3";
+      rev = "e75395a9064dd88b2434c8824e6de1f173944595";
+      sha256 = "1ga01205rdq1zgdpbn3xk4rnd0p4bbfn7wn4jn04wxfyb5rkdnkq";
     };
   };
 
   coc-go = buildVimPluginFrom2Nix {
     pname = "coc-go";
-    version = "2020-01-04";
+    version = "2020-02-03";
     src = fetchFromGitHub {
       owner = "josa42";
       repo = "coc-go";
-      rev = "f2a24f2e35350811845c6a14438a94341217992b";
-      sha256 = "1ramsl7dpgh9l801jq9g8jpg2n757c7r6w8jgfx6gpqmm47iqgrs";
+      rev = "9547750cb317361ee5471f2fa3183b2bf509eca6";
+      sha256 = "158c3jc297pkdsw5mnayp18k3f34k9f1sy7y4zfknq0qsv5skfhy";
     };
   };
 
@@ -369,12 +369,12 @@ let
 
   coc-html = buildVimPluginFrom2Nix {
     pname = "coc-html";
-    version = "2019-06-17";
+    version = "2020-02-10";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-html";
-      rev = "f88704f9f252ebf5c6bfbc65c0747a3fd668ca3e";
-      sha256 = "010p0dmd7x3sxmhjdrcawrrcgzz56dmgf0rxmi8vy3jk6x2ydnai";
+      rev = "2221768187a1bb87af44715bce563bc7fc6917ab";
+      sha256 = "04rial5fvyq68qj66ys33sgw7020r81jjsxsycm6y0shn8pjd33y";
     };
   };
 
@@ -424,23 +424,23 @@ let
 
   coc-lists = buildVimPluginFrom2Nix {
     pname = "coc-lists";
-    version = "2019-12-10";
+    version = "2020-02-10";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-lists";
-      rev = "6dde4a564e33251d6745631fcf3168663cad7551";
-      sha256 = "1w6cln4ac6df4ka7q4wkv303sh5bmgfzl7gck2v2n5fff7yhrqxq";
+      rev = "25c1f7661a9ce6898924228115b671469c958a1a";
+      sha256 = "1cqy6a9cs0ns5ifglxhrmd6lvfnlfx6ni44xq3gayh4lnyxdlc8p";
     };
   };
 
   coc-metals = buildVimPluginFrom2Nix {
     pname = "coc-metals";
-    version = "2020-01-26";
+    version = "2020-02-11";
     src = fetchFromGitHub {
       owner = "ckipp01";
       repo = "coc-metals";
-      rev = "a360f269ded6b6bd9303f563d68fa05587e59f88";
-      sha256 = "1v55ld7jdrgq44cz8z8nncl4lfnwi48nnvhk9iy8zgqhrd1al8ji";
+      rev = "0c1803bf771e3fd73c3d12fb7e848a90960f372b";
+      sha256 = "1nbhaa5gbjl115ixxjgnfss7b8hpgdz9aq239l1l7w2cbgb1132c";
     };
   };
 
@@ -523,12 +523,12 @@ let
 
   coc-snippets = buildVimPluginFrom2Nix {
     pname = "coc-snippets";
-    version = "2020-01-28";
+    version = "2020-02-10";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-snippets";
-      rev = "66b684a530358355d85dd792b21f3e49b4fba24b";
-      sha256 = "1f14lj6fr11w2vgklym36s0awlwgp50d2kahmj380igqv8dipf3j";
+      rev = "e5ebdaae28474a9e7a21bddc5fcdd3d1c9729437";
+      sha256 = "0j5wcjbmip14zx7aizb8ma2vmr03w6nzym9kpc98x4v8vwswqjhg";
     };
   };
 
@@ -589,12 +589,12 @@ let
 
   coc-tsserver = buildVimPluginFrom2Nix {
     pname = "coc-tsserver";
-    version = "2019-12-11";
+    version = "2020-02-07";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-tsserver";
-      rev = "1f76767ffb0c79a8917b122c8091dbcdf71aa824";
-      sha256 = "0p6pkhq4y69ib408g2r3a20ycfh8yyr8a5jld9snc1jpb8vi0m1l";
+      rev = "89998609d4b117083738aa06cb138765810ac0e7";
+      sha256 = "118acn2vzb51mqxnx50lhibfqivzzfqsbyd5hy5qfl2p8gd67c0k";
     };
   };
 
@@ -633,12 +633,12 @@ let
 
   coc-yaml = buildVimPluginFrom2Nix {
     pname = "coc-yaml";
-    version = "2019-11-08";
+    version = "2020-02-09";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-yaml";
-      rev = "916db4bca79c85c68e175534f733b41a79fb06bd";
-      sha256 = "016ix4jwq5c7zdvk9h2z64rwyzv39wxjr2675xrdv240f5zw0fmw";
+      rev = "d9b2a7ec6275e25bb89e875f73d99ff8a3e58877";
+      sha256 = "05xgz3lhfzd93ldac0jw7i68f1s3p3ikg22gvl3v2va8r1rf01hh";
     };
   };
 
@@ -755,12 +755,12 @@ let
 
   csv-vim = buildVimPluginFrom2Nix {
     pname = "csv-vim";
-    version = "2019-12-27";
+    version = "2020-02-05";
     src = fetchFromGitHub {
       owner = "chrisbra";
       repo = "csv.vim";
-      rev = "ece4fde5a377d52ba737b991b8a320ada5d1ac95";
-      sha256 = "0aqxvhv70mbsr1gsybs8np82nhvixydivnbj2jp8cy43c1hvyxlh";
+      rev = "0663b09f9203cb38ef113254b461047c7e3c43e7";
+      sha256 = "14icc2a5hylknz8sigmbxwamf9ck4lsjjykyxjycrnwjrpasl8sv";
     };
   };
 
@@ -799,12 +799,12 @@ let
 
   ctrlp-vim = buildVimPluginFrom2Nix {
     pname = "ctrlp-vim";
-    version = "2019-11-07";
+    version = "2020-02-08";
     src = fetchFromGitHub {
       owner = "ctrlpvim";
       repo = "ctrlp.vim";
-      rev = "44c8e24956d7dcfee3ee6083a0573fed31d136ed";
-      sha256 = "0g1j4g2p48pwcvbj2p36122q71x1xybq5aqqyz40n16sjjrvcz02";
+      rev = "585143acbe15f362852d78bd050baff3c12902d7";
+      sha256 = "0ijkzlb08sc47cax4f328hlk68nscx5wdzhihpj106vrnfyrpyx3";
     };
   };
 
@@ -832,23 +832,23 @@ let
 
   defx-icons = buildVimPluginFrom2Nix {
     pname = "defx-icons";
-    version = "2020-01-19";
+    version = "2020-02-10";
     src = fetchFromGitHub {
       owner = "kristijanhusak";
       repo = "defx-icons";
-      rev = "15e783260e9d021dfbd94fbd18bf2fc6ba263daa";
-      sha256 = "0fw4lj2xk7bzyfyb91lhm3zm5gb8drkzwr7aj5viidaajd157ray";
+      rev = "2e4df3b6302da537ac7df28fbc0e0991c6c1aa0e";
+      sha256 = "0wkn02z75pvfl0xrhgq80sw0qfidjg5s0zm5mij632pq3dm7axiq";
     };
   };
 
   defx-nvim = buildVimPluginFrom2Nix {
     pname = "defx-nvim";
-    version = "2020-01-29";
+    version = "2020-02-09";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "defx.nvim";
-      rev = "0b5e1225c515f47ff0ffb12bf9f1141b53c52cc5";
-      sha256 = "1y382rlmn9ns9rckp0m37kyaxzyjz27g8lph9n0sj1lw4rjzblql";
+      rev = "17c86251515e18a2791552d88d6142495fa78a69";
+      sha256 = "184mwc8iapjzdysc5fsabdm77kyvr2p2a1azsryji7b65h1pzdal";
     };
   };
 
@@ -887,12 +887,12 @@ let
 
   denite-nvim = buildVimPluginFrom2Nix {
     pname = "denite-nvim";
-    version = "2020-02-02";
+    version = "2020-02-05";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "54e15f738b41990b140866e72d4b6457e36cfdf3";
-      sha256 = "1rh6d6bl67r41k8x3v8s52ish27cw3qgd01i80lgwjskq29qy808";
+      rev = "21645215f941034f0bfaa081f9146914afd5d563";
+      sha256 = "01ywp49ambc3nk0cyv9f7m6gfnf5hkp1dxfiihjxf96whg8p3kwj";
     };
   };
 
@@ -966,12 +966,12 @@ let
 
   deoplete-jedi = buildVimPluginFrom2Nix {
     pname = "deoplete-jedi";
-    version = "2020-01-26";
+    version = "2020-02-03";
     src = fetchFromGitHub {
       owner = "deoplete-plugins";
       repo = "deoplete-jedi";
-      rev = "395f1a91be8b748f6b92f069a60c69ca8e2c96f1";
-      sha256 = "0iwcybwadp2198sxiwbbcirmjgvfw89v40qa51akj5vvalr6r5bg";
+      rev = "2d2ff2382fd67574c233d0ce48150b26eb7f6809";
+      sha256 = "1hwmf0hnyvznciysj3k0gcycmvl2mvv8krmc26bi430q89gxgq56";
       fetchSubmodules = true;
     };
   };
@@ -1178,45 +1178,45 @@ let
 
   falcon = buildVimPluginFrom2Nix {
     pname = "falcon";
-    version = "2020-02-02";
+    version = "2020-02-07";
     src = fetchFromGitHub {
       owner = "fenetikm";
       repo = "falcon";
-      rev = "4355adcfe26e34744f95a467a07642094ac75884";
-      sha256 = "0acya14rrmryfv6lmihx5mrjaa6aqqp1mfmyn3jawsynrgrfalc4";
+      rev = "b37f45f0a25dbbebe86470e72d735e110e193b4e";
+      sha256 = "148s39lm13m825ax48p0lrj2bg0i80lli8x18f3xnaqjad0lb1fk";
     };
   };
 
   far-vim = buildVimPluginFrom2Nix {
     pname = "far-vim";
-    version = "2020-01-28";
+    version = "2020-02-10";
     src = fetchFromGitHub {
       owner = "brooth";
       repo = "far.vim";
-      rev = "451e76934599893685f5283bfd2b53d5526239d4";
-      sha256 = "1g0vmfi15yn5llzrqddzxvz8ypzz6z9ksxij6nr33w6qdzvid27s";
+      rev = "4d1e65c41fbe2b78827dd943f93930f601661bc3";
+      sha256 = "1686vv570w1pljbzcc8yd9shzbbhxny9za80sq41xpd2wvyn1iw1";
     };
   };
 
   fastfold = buildVimPluginFrom2Nix {
     pname = "fastfold";
-    version = "2019-10-02";
+    version = "2020-02-02";
     src = fetchFromGitHub {
       owner = "konfekt";
       repo = "fastfold";
-      rev = "bd88eed0c22a298a49f52a14a673bc1aad8c0a1b";
-      sha256 = "1xvf32g5kzx7g1si84m0sih02b0dd888bdwa2ym533qxiriqgxpg";
+      rev = "4bc15cb4db274ed2b10bbdde414d2b2ab1f7cb00";
+      sha256 = "1y4yfw15g1l7f1v3kynr7ynga8g30rvwmy80dnfpg7v4a5jaf4f1";
     };
   };
 
   ferret = buildVimPluginFrom2Nix {
     pname = "ferret";
-    version = "2019-09-27";
+    version = "2020-02-09";
     src = fetchFromGitHub {
       owner = "wincent";
       repo = "ferret";
-      rev = "d03f7ebeb0cea0311d23888adb1d62efcf04021a";
-      sha256 = "1xh6jp1gzmn211bfv7v1r88sh49x1zly16qs3k70qgj9w57zgwwy";
+      rev = "24633d3047eb93013743b28b0ea735783c7850d9";
+      sha256 = "06c3x3fqks30rzkj7z28qsgx9fcghz86ajc0cx3aai69xhgdipb5";
     };
   };
 
@@ -1289,12 +1289,12 @@ let
 
   fzf-vim = buildVimPluginFrom2Nix {
     pname = "fzf-vim";
-    version = "2020-01-14";
+    version = "2020-02-05";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
-      rev = "dc4c4c22715c060a2babd5a5187004bdecbcdea7";
-      sha256 = "0vd5jj0b0sdgawmadxkfl3s2d6m7nwgprhwnah4k7in8lcgq0jz1";
+      rev = "467c3277884240f7b5430f8f4d600e3415c38f3b";
+      sha256 = "1bnml1gfrzbbp6j1lwcip4k9ncf4br604z4h1snw29qsf0wgcyv3";
     };
   };
 
@@ -1575,12 +1575,12 @@ let
 
   jedi-vim = buildVimPluginFrom2Nix {
     pname = "jedi-vim";
-    version = "2020-02-02";
+    version = "2020-02-03";
     src = fetchFromGitHub {
       owner = "davidhalter";
       repo = "jedi-vim";
-      rev = "ea4de13344084623d243bed3ebfccde9f9076585";
-      sha256 = "0hw3564qqmjdykk1bpb5hgi2ysv0lfpw7z8kbs9mv6sxhln1p7js";
+      rev = "8d24b837547688f19f3184d99e96a430b3c3722e";
+      sha256 = "1xbk0d4r02hmxj7y33jjazr0ri5a4bw7v29fl5qll3dgqjbijmjm";
       fetchSubmodules = true;
     };
   };
@@ -1609,12 +1609,12 @@ let
 
   julia-vim = buildVimPluginFrom2Nix {
     pname = "julia-vim";
-    version = "2019-09-03";
+    version = "2020-02-12";
     src = fetchFromGitHub {
       owner = "JuliaEditorSupport";
       repo = "julia-vim";
-      rev = "995eae2c333ac9a2ca1d31c8d7845680f4ac28b0";
-      sha256 = "14d3r06nffxpbvffnh2b4i0q187cv5wsvq62mh2h1ifq95bj07s5";
+      rev = "eaa8da63551a1805051d75ba3a827dd4b292d30e";
+      sha256 = "1qalg8mqajs7z2prsvq7400pv9qzv6za9yiim259gy08qr2425nd";
     };
   };
 
@@ -1719,12 +1719,12 @@ let
 
   lh-brackets = buildVimPluginFrom2Nix {
     pname = "lh-brackets";
-    version = "2019-11-26";
+    version = "2020-02-02";
     src = fetchFromGitHub {
       owner = "LucHermitte";
       repo = "lh-brackets";
-      rev = "441b2d3827158c1c1781e797dd5953fa2b7ba63f";
-      sha256 = "134lb5nnbkwlcgryd39n9dbqyqzadnfibk76m67pjk60sy4s64wk";
+      rev = "05aaec7d82f15c135f97063d534332b3fd388474";
+      sha256 = "11vp244x912fipfp8h61v7m361kjs6jq6g843avwskpjb2b4b40f";
     };
   };
 
@@ -1752,12 +1752,12 @@ let
 
   lightline-vim = buildVimPluginFrom2Nix {
     pname = "lightline-vim";
-    version = "2020-02-01";
+    version = "2020-02-03";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "lightline.vim";
-      rev = "f7dd47eb55aed259cbc3e913f78c4ab21b3504bf";
-      sha256 = "0hg9dcp2bwkj4ly06g60sw4akd5ziah325jdmwwj09xq8q4vsvll";
+      rev = "377e62d8010ae3a65ee19b88328e4f3a5e54eca5";
+      sha256 = "1a63wjr8myj54ikdi3xs854dmm653m2mk7brzz40m1ajlmw9qsyv";
     };
   };
 
@@ -1829,12 +1829,12 @@ let
 
   ncm2 = buildVimPluginFrom2Nix {
     pname = "ncm2";
-    version = "2019-12-03";
+    version = "2020-02-10";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2";
-      rev = "a6ab1a4d17a295dae5446382a45c9ea3b2936f1e";
-      sha256 = "1abxy7p0b6y2zvi7lmdhgkyl1ws281n3dsfk15lkg9j0sk51j06l";
+      rev = "605ea0ddcec45b33ec7db69119822a9a5d538823";
+      sha256 = "1pjmxx3wxss25vdb5dqppr7ngkd9w52gzf6ani99flw3rzkmg9c5";
     };
   };
 
@@ -1983,23 +1983,23 @@ let
 
   neomake = buildVimPluginFrom2Nix {
     pname = "neomake";
-    version = "2020-01-27";
+    version = "2020-02-11";
     src = fetchFromGitHub {
       owner = "neomake";
       repo = "neomake";
-      rev = "dd76544b09a01c81157f1e6d440fda760ed14125";
-      sha256 = "12ywqpy8dbjxn384c0basbns4y8j3znwi3rrvvqqra4vxay8cpgn";
+      rev = "52ea895e70726cb45c6734e1eff52fb3e808c292";
+      sha256 = "130ldqadzp4grf4kdj7z0x8lhl8pvjawrb6vn1vr0s8as6zin5dm";
     };
   };
 
   neomru-vim = buildVimPluginFrom2Nix {
     pname = "neomru-vim";
-    version = "2019-07-06";
+    version = "2020-02-05";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neomru.vim";
-      rev = "79e6c9d04b75d67a1494435a4fb25573373cb1dc";
-      sha256 = "194cr8nkkqrz3f9l9ymxdbnwgbrafn1i6lhrqalskawq6kn7kb21";
+      rev = "d9b92f73f7d9158e803d72f2baeb7da9ea30040e";
+      sha256 = "04fic8s4g19kgml1pb5fd6yzhsscq8yrpwbmg8sb0lqjas2qpakv";
     };
   };
 
@@ -2016,12 +2016,12 @@ let
 
   neosnippet-vim = buildVimPluginFrom2Nix {
     pname = "neosnippet-vim";
-    version = "2020-01-29";
+    version = "2020-02-06";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neosnippet.vim";
-      rev = "3581e4c3f4c3c37fd614ad67bb54e6959326508b";
-      sha256 = "05mwn8yxk27gym42j5jra6fm199ah17ack65jqvhvslycgk28khc";
+      rev = "caa9b82220237865a2fbb846b0fa63f4a6a9eb7a";
+      sha256 = "1rvc4za0vb5if144v07vj0aw7axq3mh1idhismyc4y31pfz59nap";
     };
   };
 
@@ -2093,12 +2093,12 @@ let
 
   nerdtree = buildVimPluginFrom2Nix {
     pname = "nerdtree";
-    version = "2020-01-28";
+    version = "2020-02-07";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdtree";
-      rev = "8c48845d11adc4c9b07fc727725ed68be5d3177f";
-      sha256 = "0d8rlmj65lq50iznangcrpdyd1233qwbv8yn86pzd3n7s3r18l3g";
+      rev = "07612557ebb4118ef4a337faa7033d0270773c71";
+      sha256 = "17l4nd62riyfnzn5i1g5blmrivlx9m3gf5qf7x0rw31y3d8k64g3";
     };
   };
 
@@ -2159,12 +2159,12 @@ let
 
   nvim-gdb = buildVimPluginFrom2Nix {
     pname = "nvim-gdb";
-    version = "2020-01-21";
+    version = "2020-02-11";
     src = fetchFromGitHub {
       owner = "sakhnik";
       repo = "nvim-gdb";
-      rev = "eed0efd34297966533b6e7155dedfcc59a84baae";
-      sha256 = "1sa60pw609v2a0dacaddx3d861xidc72id4dipa55k5ck3ma4vns";
+      rev = "d94d49c0602f3ee6f66f5d33201d8698db76e2b3";
+      sha256 = "0lsyggs6wagrjh73wqi0f1jivqgx39f2pi0qgq98i4lpjc829i53";
     };
   };
 
@@ -2181,12 +2181,12 @@ let
 
   nvim-lsp = buildVimPluginFrom2Nix {
     pname = "nvim-lsp";
-    version = "2020-01-31";
+    version = "2020-02-10";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lsp";
-      rev = "9c9687f1339809a9ebfb3994c967abb473517684";
-      sha256 = "17ggvs6w2qb4lyph9fn8y2q2ihay47672h7wr62525l7sgldjih4";
+      rev = "42385dbf6a5eac40da213322fdd3037588eede56";
+      sha256 = "094dgh3m69n1bnxjjaz2r8pv419ism9awhn4zgbhw8kffrf29z7h";
     };
   };
 
@@ -2236,23 +2236,23 @@ let
 
   open-browser-github-vim = buildVimPluginFrom2Nix {
     pname = "open-browser-github-vim";
-    version = "2019-10-17";
+    version = "2020-02-08";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "open-browser-github.vim";
-      rev = "b252c5cf717865b61945f5c7fad0fb950a947db8";
-      sha256 = "1n562h3g7ri4ifcbfzjiz2yq0a5v9aad3di24xc3kriz4pwlkgbr";
+      rev = "cb1b3b957d391e15eac41a2c9695086472d6638f";
+      sha256 = "0sd72arqqk6kpr3mxdvdcqsb0lcf80gbswxzd5piafwidkmk7m5n";
     };
   };
 
   open-browser-vim = buildVimPluginFrom2Nix {
     pname = "open-browser-vim";
-    version = "2020-01-27";
+    version = "2020-02-07";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "open-browser.vim";
-      rev = "88168d9c4cc41000b8020c852b6a75cb99bc7e1b";
-      sha256 = "0f14ij1c0mqjxbwjgp5nsss3ja21w7lkfkh08x1fvcf88h4y91j6";
+      rev = "a78ae55a6f5d76347d36515e930cad711b8d324b";
+      sha256 = "1gzbabm81q16n6i40rk3r63xpf5rkfgwi4akhdvhxhdavk7z5dzs";
     };
   };
 
@@ -2544,12 +2544,12 @@ let
 
   rust-vim = buildVimPluginFrom2Nix {
     pname = "rust-vim";
-    version = "2020-01-26";
+    version = "2020-02-03";
     src = fetchFromGitHub {
       owner = "rust-lang";
       repo = "rust.vim";
-      rev = "a1dfe1d47301cd02a2eb2ab56a0ff17e29d53bd2";
-      sha256 = "08pmrrn5v1b69g51gs5dv5ri7fwwjfnp0wdnjiigkzkff069001r";
+      rev = "db0137dfad4690621e01dbae780fb4a2dd7dbf27";
+      sha256 = "1c5yynl6clq6rvr17ma49npfiw5ssarrn8hdz9vgqwkvf879icmd";
     };
   };
 
@@ -2852,12 +2852,12 @@ let
 
   tender-vim = buildVimPluginFrom2Nix {
     pname = "tender-vim";
-    version = "2019-06-15";
+    version = "2020-02-12";
     src = fetchFromGitHub {
       owner = "jacoborus";
       repo = "tender.vim";
-      rev = "19b5067d623ab5d74fa0b42a6ce9aa345e708b27";
-      sha256 = "0hdc3qfibc41jcijjdj95j5vpz5ifhkn0rhgfmph33yn1cn154gx";
+      rev = "0c3c715d27ba8fcc13ad1343bda069710b49b259";
+      sha256 = "1rpwl3xd46nb4ghklbffpacg4f8plmjxgbnckd5jc7wwjfs1sl7q";
     };
   };
 
@@ -2996,12 +2996,12 @@ let
 
   unicode-vim = buildVimPluginFrom2Nix {
     pname = "unicode-vim";
-    version = "2020-01-30";
+    version = "2020-02-07";
     src = fetchFromGitHub {
       owner = "chrisbra";
       repo = "unicode.vim";
-      rev = "7314b0051e8155b1b70bbc3811d1e740423dedbf";
-      sha256 = "1w2dhl25g8cy980bsj1w4xp76r5rsgym3l2d1acxabixi8bgbzjr";
+      rev = "749a38330c5cfb2557636137a3ab8183004173e6";
+      sha256 = "1lzp691a7q9hvc6vg0gl2v871sgryki3yifza7rdfwaxiam4yy0k";
     };
   };
 
@@ -3150,12 +3150,12 @@ let
 
   vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix {
     pname = "vim-addon-goto-thing-at-cursor";
-    version = "2018-12-28";
+    version = "2020-02-07";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-goto-thing-at-cursor";
-      rev = "53cab03c46649d123bb481cd6793179ef255fc55";
-      sha256 = "069j1m75fnkhqyyww2z21dnkg613k97145vgga4dkh2a0fakrs4q";
+      rev = "44f0cba27013cfc1f4e46697ba6de30b2a128cf7";
+      sha256 = "1s9021qnn95bzl8r7nx818j1kmjfjzg8xg07s071ic96lv40bcqp";
     };
   };
 
@@ -3194,12 +3194,12 @@ let
 
   vim-addon-mw-utils = buildVimPluginFrom2Nix {
     pname = "vim-addon-mw-utils";
-    version = "2018-03-09";
+    version = "2020-02-07";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-mw-utils";
-      rev = "295862ba6be47ec3b11b6c85c10d982ffd9bc0b2";
-      sha256 = "0ylvhmx0cnj2x38plwqlq4pqyqyxxhf4s08hknnl7qhrr5kd533f";
+      rev = "6aaf4fee472db7cbec6d2c8eea69fdf3a8f8a75d";
+      sha256 = "1w99r6ck6gqg6b0fk9qj07q0b7p2qxav0ar6x294g34wsqij6xj5";
     };
   };
 
@@ -3216,12 +3216,12 @@ let
 
   vim-addon-other = buildVimPluginFrom2Nix {
     pname = "vim-addon-other";
-    version = "2014-07-15";
+    version = "2020-02-07";
     src = fetchFromGitHub {
       owner = "MarcWeber";
       repo = "vim-addon-other";
-      rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b";
-      sha256 = "0cjz7mlyfkkncas4ss7rwxb0q38ls1qw1p15hac1imscscsvyjc6";
+      rev = "7a395970b8817296c11e1de8310194c4ae6e1f89";
+      sha256 = "0sding7rc11imf5k9ki4h426wjiz8ywxa81v74xj3m23zm6l77sa";
     };
   };
 
@@ -3293,23 +3293,23 @@ let
 
   vim-airline = buildVimPluginFrom2Nix {
     pname = "vim-airline";
-    version = "2020-01-30";
+    version = "2020-02-07";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "f659a98d501a1eea9f0229aba85499ab2f8308e6";
-      sha256 = "0k0mpgy1kz6lvr55i9i6py0mbig4w323xzcq0wjk7gjlllh2xilz";
+      rev = "099dd92eebe09ab27a483e381f2a708945e34330";
+      sha256 = "04rmghvl29hlmlhh4j90m466m0a4sfflk0qrvx87q8ab1salq6iz";
     };
   };
 
   vim-airline-themes = buildVimPluginFrom2Nix {
     pname = "vim-airline-themes";
-    version = "2020-01-30";
+    version = "2020-02-07";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline-themes";
-      rev = "9d6b2fdf66c178dfb0ffb4879b22845f980289c5";
-      sha256 = "1lfxn6f9688irzw6dkj0dmfchmf8xzmky56kmfy83prnc1jql8yj";
+      rev = "6270e7d58828999da7239785ad4269899fab99b5";
+      sha256 = "1pjgsp4ki1ii5rw75wvzcj3ssz51w5369j8kqaf6awqimyl1ygsd";
     };
   };
 
@@ -3337,12 +3337,12 @@ let
 
   vim-asterisk = buildVimPluginFrom2Nix {
     pname = "vim-asterisk";
-    version = "2020-01-07";
+    version = "2020-02-03";
     src = fetchFromGitHub {
       owner = "haya14busa";
       repo = "vim-asterisk";
-      rev = "66a64172d21fab44312d0d49b22f63eeeaf89b23";
-      sha256 = "1lksnr4mix9y2al2yfysrxqcska3cd82ck89fkjg5zqzb5wz20vs";
+      rev = "77e97061d6691637a034258cc415d98670698459";
+      sha256 = "1bm99j4vskbgzfn09567qi0462dvjrpdkifc4hg24bi02bx9hjrj";
     };
   };
 
@@ -3359,12 +3359,12 @@ let
 
   vim-autoformat = buildVimPluginFrom2Nix {
     pname = "vim-autoformat";
-    version = "2020-01-23";
+    version = "2020-02-05";
     src = fetchFromGitHub {
       owner = "Chiel92";
       repo = "vim-autoformat";
-      rev = "9a0a3184348c513e0ad67d44ad65f57405b2db2a";
-      sha256 = "0i38d39myhn0mabwz24g7d6bnnbs94nhxppig868kq6qfjqb9ydy";
+      rev = "f5d5d07731005adbd2dc76cf8f47ae9a68db9783";
+      sha256 = "15szhh1i52wv5p6l1a9755fk8yndpipvhxjbc2y9dgbx35zyvpm2";
     };
   };
 
@@ -3392,12 +3392,12 @@ let
 
   vim-better-whitespace = buildVimPluginFrom2Nix {
     pname = "vim-better-whitespace";
-    version = "2019-10-23";
+    version = "2020-02-09";
     src = fetchFromGitHub {
       owner = "ntpeters";
       repo = "vim-better-whitespace";
-      rev = "166a409f1ddade37d1cfd25ba7c6b60270831a95";
-      sha256 = "0c63sv7vy7yzh8hvy5a5i3amnpk4kklkkm4kimgw2dzm1pqfz5y4";
+      rev = "4afbd45238da56898013546c609d72818fc97a1b";
+      sha256 = "0gfqd927pxqszafbycns9f08sw6kl3z6xijvw2l0hgb5zrvfc5lg";
     };
   };
 
@@ -3634,12 +3634,12 @@ let
 
   vim-devicons = buildVimPluginFrom2Nix {
     pname = "vim-devicons";
-    version = "2019-11-10";
+    version = "2020-02-08";
     src = fetchFromGitHub {
       owner = "ryanoasis";
       repo = "vim-devicons";
-      rev = "e3e6aa16bfce255e9bca3d117c11f18f36f5c1b3";
-      sha256 = "1p7k20nfxm6jrrlx6dp9cm9bq8jkssh7fyr2y49wnwp652s191gm";
+      rev = "b06f5418a434644f64ba9f218472b5aa86eb03a6";
+      sha256 = "0prfygwiwv6i59p45rrvk0d5s68fc25hw5r44z9a90n6f8xsn740";
     };
   };
 
@@ -3678,12 +3678,12 @@ let
 
   vim-dispatch = buildVimPluginFrom2Nix {
     pname = "vim-dispatch";
-    version = "2019-11-13";
+    version = "2020-02-10";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-dispatch";
-      rev = "1206e1474fc613caeb1ba56d36b71d7f9f7760ac";
-      sha256 = "15mdn8s9isnscsaggkz552f8hi2yqq9wksymrxkihihv0nwwdgi6";
+      rev = "3757ddad87073a6ded8c34dfabb28c325acf6c02";
+      sha256 = "0vnkwn896v9dsqf329nvdik60bm6f0m0n32x3fqmzazqgqlx055j";
     };
   };
 
@@ -3733,12 +3733,12 @@ let
 
   vim-easymotion = buildVimPluginFrom2Nix {
     pname = "vim-easymotion";
-    version = "2020-01-19";
+    version = "2020-02-08";
     src = fetchFromGitHub {
       owner = "easymotion";
       repo = "vim-easymotion";
-      rev = "9194ce922d7edda10d9e1e4f053fd9abab0370c7";
-      sha256 = "0is9y46l90n0jklsrs8hkwq5a4vr36gvb6pybfc8yxyiph9pdyki";
+      rev = "dd7b4b526775bc8553e16bc402020573b04a948c";
+      sha256 = "1dhhq1y6xa3q26irclad6254q89xpnxglfd92v3bq01l4p41zcqf";
     };
   };
 
@@ -3766,12 +3766,12 @@ let
 
   vim-elixir = buildVimPluginFrom2Nix {
     pname = "vim-elixir";
-    version = "2019-11-03";
+    version = "2020-02-11";
     src = fetchFromGitHub {
       owner = "elixir-lang";
       repo = "vim-elixir";
-      rev = "057ac39b5982a2decf52d48cffc405ff6a666ca5";
-      sha256 = "1mzdjqh99cyixngy9y38fdgs2bzni4pgrk14y8f72vlc0di0fg5d";
+      rev = "95a0e08e9bc3ebb3d2606c83b06cef3db4092337";
+      sha256 = "00l3qi8dg5qvq67d1wqijf00ahvp7bhcp6l0z87szdr8fs5r2ak1";
     };
   };
 
@@ -3942,12 +3942,12 @@ let
 
   vim-fugitive = buildVimPluginFrom2Nix {
     pname = "vim-fugitive";
-    version = "2020-01-30";
+    version = "2020-02-06";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "1c1014a0464cfb4985b6f913381a2a7a2f7b87bd";
-      sha256 = "006mn3dpxx0yf4da4gy7lw43lp78w4sp9isv4rq5pjc9q02hs0hy";
+      rev = "460664018a8eaecd89fb2b095fad59c0e16f5f06";
+      sha256 = "1xznsxk63gjzhxldzngc0kx10ygkl8ank0xm75qqs92zciwg1xqx";
     };
   };
 
@@ -4019,12 +4019,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2020-01-31";
+    version = "2020-02-12";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "311ea9dbbe91186afc8262cb2a2e52b406a32dbd";
-      sha256 = "1ri7hbm3g4bx56cqpic109dvggpj9nxifdwgk35ka08yc7v9vcl4";
+      rev = "b3c3b6585388565c1de7a9e0a14f8aedb07b7839";
+      sha256 = "1cc20kcl348j7gnyrj4wjmk47l3bx3mwkvxjlplwir6p8dxl14vg";
     };
   };
 
@@ -4063,12 +4063,12 @@ let
 
   vim-gutentags = buildVimPluginFrom2Nix {
     pname = "vim-gutentags";
-    version = "2019-10-26";
+    version = "2020-02-06";
     src = fetchFromGitHub {
       owner = "ludovicchabant";
       repo = "vim-gutentags";
-      rev = "eb9e57f579d2ef747be25a7a4ec5add6fe5ca3d9";
-      sha256 = "0v46yxv6rv6x9zqsvahkjjwp8khzsz4il1rk34r6zlsy3w8d988d";
+      rev = "31c0ead56428529c8991e45c0ac0fa7dd99e3bd0";
+      sha256 = "1x1f52awqnbpnd4y2zsv140rwjml6b5r5laim49n1i1z9vnwknjk";
     };
   };
 
@@ -4162,12 +4162,12 @@ let
 
   vim-html-template-literals = buildVimPluginFrom2Nix {
     pname = "vim-html-template-literals";
-    version = "2019-06-16";
+    version = "2020-02-07";
     src = fetchFromGitHub {
       owner = "jonsmithers";
       repo = "vim-html-template-literals";
-      rev = "9ac412554a818dc151b51507a13c73fa3de7d51e";
-      sha256 = "0ii12kk4j7jpnv5gb4kkcmb5gca0lrv0n4mw4968jh6rxxh1xwyy";
+      rev = "3b370b69bce94bdeb0ca7137f548356f775cadcc";
+      sha256 = "1wmyxscyqs6344jsn839dyrx7k3iiwv07ic9gxh5d93g5s3c3pml";
     };
   };
 
@@ -4515,12 +4515,12 @@ let
 
   vim-lsc = buildVimPluginFrom2Nix {
     pname = "vim-lsc";
-    version = "2020-01-07";
+    version = "2020-02-11";
     src = fetchFromGitHub {
       owner = "natebosch";
       repo = "vim-lsc";
-      rev = "2384903e1dd6314934f58e3c88b10924dd1bf4f7";
-      sha256 = "0xs64i4g27w8bdmznjilqg5rlrpaw12qiclg1p4l3ryyid27wki7";
+      rev = "62c6f6aa227b1b3ef5e7cf7df9f0a9c1d855d7fe";
+      sha256 = "1qimz08rqm4ch6dr0znwxl328593kmz0yxdqq15g1yrw4ig0fi22";
     };
   };
 
@@ -4625,12 +4625,12 @@ let
 
   vim-multiple-cursors = buildVimPluginFrom2Nix {
     pname = "vim-multiple-cursors";
-    version = "2019-11-09";
+    version = "2020-02-06";
     src = fetchFromGitHub {
       owner = "terryma";
       repo = "vim-multiple-cursors";
-      rev = "6ab4dc7dd012e23adee74ef4596ad3e9659a20c7";
-      sha256 = "149cg1fwsrd1swvd0ivn1p8j8gpj3gk08mx6dim4fkshknwxs5l0";
+      rev = "701e92dd4cfd1b0f511e83a96d52bc590c0218dd";
+      sha256 = "0a7fghk025f8gj5rsixi1hn8vkg2982fja7maf427v3wq74s6j1c";
     };
   };
 
@@ -4801,12 +4801,12 @@ let
 
   vim-parinfer = buildVimPluginFrom2Nix {
     pname = "vim-parinfer";
-    version = "2019-10-29";
+    version = "2020-02-04";
     src = fetchFromGitHub {
       owner = "bhurlow";
       repo = "vim-parinfer";
-      rev = "fbe48d65ba98f062312b4af08d4d623725f36def";
-      sha256 = "0zzgrx2kc4j3nn81l07my9v4izy9hks96483qyxr4vhsznz1a1wn";
+      rev = "a8c075ce5256bffbf1f62e08aba37dca88d0cf1a";
+      sha256 = "1v2pyjyxvqw2kl9j4pdpdlbl2q3jnndcb8iqgyygs7jn91c4s073";
     };
   };
 
@@ -4966,23 +4966,23 @@ let
 
   vim-quickrun = buildVimPluginFrom2Nix {
     pname = "vim-quickrun";
-    version = "2019-10-29";
+    version = "2020-02-03";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-quickrun";
-      rev = "4967eafcaf5bd09e4e008d4ce46f75d38fdfb8e4";
-      sha256 = "1il851k3j6cggh73mb3lbfnl1097q2laxywi7ym279axpp0ds7qi";
+      rev = "f637c35b16d6e83cc71dababbda2a64eb29b3f5e";
+      sha256 = "0yf9acqcj3x62qchz0z9mwgf1af5vz39kyzhv5jh1mc0vwksrdwl";
     };
   };
 
   vim-racer = buildVimPluginFrom2Nix {
     pname = "vim-racer";
-    version = "2019-12-18";
+    version = "2020-02-06";
     src = fetchFromGitHub {
       owner = "racer-rust";
       repo = "vim-racer";
-      rev = "4ed62b09b84b8212382d5c3b03278b6eb9ddc08b";
-      sha256 = "06kii2p5czan1m92s5p992c137n9ijvgbjj1miqy86am2p48a40k";
+      rev = "bbfc89cef6ceda1a1bad2ece124be323134b74a8";
+      sha256 = "1x6y95zps8bxdbcj5939yvw2nz65w1038rs60cjz0xjk0h6360zz";
     };
   };
 
@@ -5054,12 +5054,12 @@ let
 
   vim-sandwich = buildVimPluginFrom2Nix {
     pname = "vim-sandwich";
-    version = "2019-12-06";
+    version = "2020-02-01";
     src = fetchFromGitHub {
       owner = "machakann";
       repo = "vim-sandwich";
-      rev = "a0cde9cfb20d9aff10a09b7fc776231f7856abef";
-      sha256 = "0dzrzz9ngprh2zd3wnnbr9qcs7ilgchadw4l39ncny6x43fk2ckd";
+      rev = "d19545c6feb45966ed3aefac82a46c9447520875";
+      sha256 = "07ib0hjlwwzcyz074ibrshcpkmlwj7195l2jwkncksf29qafzyw4";
     };
   };
 
@@ -5241,12 +5241,12 @@ let
 
   vim-snippets = buildVimPluginFrom2Nix {
     pname = "vim-snippets";
-    version = "2020-01-31";
+    version = "2020-02-05";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "71b30be0012448178b3371ea50909e097fdf9b55";
-      sha256 = "16bcjhr236swc0wm50lvgl8nr4vr8xd69mgadi5r5lkqn1nflw4l";
+      rev = "cca8bdc4df751c1f262030b8409845aa657f5043";
+      sha256 = "18iyl4axash340lqq3j5b3jisk2zpz5gsaz307sjclsf1s6860xr";
     };
   };
 
@@ -5406,12 +5406,12 @@ let
 
   vim-terraform = buildVimPluginFrom2Nix {
     pname = "vim-terraform";
-    version = "2020-01-30";
+    version = "2020-02-07";
     src = fetchFromGitHub {
       owner = "hashivim";
       repo = "vim-terraform";
-      rev = "c779b9e8458b5129b55e45e943ea5fe025af066c";
-      sha256 = "152k628lbnhckrcr3rfm0nr6magmvwrvmvjdj19sw9g3r2lyqp8j";
+      rev = "c8c9bbd70da65e2c0bcba2947c4061a7c3e24e69";
+      sha256 = "0mpzy2y8k5kyz7pvg41pqy88g15mqay8lxhribi288smmbyswsyl";
     };
   };
 
@@ -5494,12 +5494,12 @@ let
 
   vim-themis = buildVimPluginFrom2Nix {
     pname = "vim-themis";
-    version = "2019-08-18";
+    version = "2020-02-09";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-themis";
-      rev = "85ca1f5f197a30ce52d382bcdcaedeed4e132848";
-      sha256 = "17lnvcw7vnwnl54yhw0jpsqnk0pni1wqg4kbm53bv4pvk8ivr95d";
+      rev = "d0e8474c22c65ce050f4e7c1a56a02826d04e6e5";
+      sha256 = "1lxp62gnp5wwmia481491vgnnh3392nlr7nakwig495ikk3ff1sz";
     };
   };
 
@@ -5626,12 +5626,12 @@ let
 
   vim-visual-multi = buildVimPluginFrom2Nix {
     pname = "vim-visual-multi";
-    version = "2020-01-31";
+    version = "2020-02-10";
     src = fetchFromGitHub {
       owner = "mg979";
       repo = "vim-visual-multi";
-      rev = "e9dac3d1091397df6245ec6fc75fb67501e85bc3";
-      sha256 = "0kss80xh0j0hvv4mz472cxwwx7pgipjrxg5kj67bllxkrixv8i29";
+      rev = "9d03a5d366b4198b7b505dfda538e87f76c9ce60";
+      sha256 = "0yqqd25l7zzfn31216qpnccb3a3lvv75j6020q02s0wgapiw15y9";
     };
   };
 
@@ -5659,12 +5659,12 @@ let
 
   vim-wakatime = buildVimPluginFrom2Nix {
     pname = "vim-wakatime";
-    version = "2019-12-05";
+    version = "2020-02-12";
     src = fetchFromGitHub {
       owner = "wakatime";
       repo = "vim-wakatime";
-      rev = "dfc57db34d641315ddf1880b27573dfa07a41872";
-      sha256 = "05fhnw4jdi6wbf14zrmq6gvb7pqxhvmy65kij2zzf0nwyb8l1c09";
+      rev = "dd74c71cd2ea23b4a6cba4b05c873983c16e297c";
+      sha256 = "1dc04vmpv62x2rfnfad2y60l5xzpw0167pbii9kss6n6ra81gayr";
     };
   };
 
@@ -5835,12 +5835,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2020-02-01";
+    version = "2020-02-11";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "2f407de42781648809628b566d4b7cd7d7ea0722";
-      sha256 = "1m4nmh9zdnxz1cd4nwixp6gjgxl4lqjrpfijg2f9mypc2n3j1zhc";
+      rev = "1f5cef6b03814274381e7ece0e23773fa9bda4df";
+      sha256 = "0na59kxiyaxvizr942vrmhkf5pcmn1wmvvwc92a4mlsm6xjj0zpd";
     };
   };
 
@@ -5879,12 +5879,12 @@ let
 
   vista-vim = buildVimPluginFrom2Nix {
     pname = "vista-vim";
-    version = "2020-01-30";
+    version = "2020-02-07";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "vista.vim";
-      rev = "dd5769ec7a1e4c2c8927a6af4d26f88524faa60c";
-      sha256 = "0jad10lx3lvfy56gnk50lpcbwyxk16yxm5i1p3r3zwsqra03kw5h";
+      rev = "029adbe4e78c75be4a9a064f049df21806edc7c5";
+      sha256 = "181x7wzqmz68n4nczl31s32wds8kbd3lbdlvjfmzzvfl9zpyxva6";
     };
   };
 
@@ -5956,12 +5956,12 @@ let
 
   xptemplate = buildVimPluginFrom2Nix {
     pname = "xptemplate";
-    version = "2020-01-07";
+    version = "2020-02-08";
     src = fetchFromGitHub {
       owner = "drmingdrmer";
       repo = "xptemplate";
-      rev = "9cd1c622a5a7cc383ae3df2cec2bac5cb102fa7f";
-      sha256 = "01szas3gv4zw1v6c8yp5p2hygf3fqmpx0y2h6sn8696pfph7vjk3";
+      rev = "79d650bad58b9c896ec47785f8a0c7b603105c2d";
+      sha256 = "1myxp0ldk0s46aipx1iswa9zx2fkc4gwqpmhbswqgg7sxl1bz30g";
     };
   };
 
@@ -6001,12 +6001,12 @@ let
 
   youcompleteme = buildVimPluginFrom2Nix {
     pname = "youcompleteme";
-    version = "2020-01-26";
+    version = "2020-02-10";
     src = fetchFromGitHub {
       owner = "valloric";
       repo = "youcompleteme";
-      rev = "124661f218e80b96c1f9f3d124e99f9a2fd2d83b";
-      sha256 = "09v1wdx4xydz6f72wwm30p2h12zn3dfpywjw69z8zw6bbb4h8ksn";
+      rev = "52632f13ea134a000cbc6a2d1928a37c197ddeee";
+      sha256 = "1rlxd9r1f2m7qfyy551kk5mvbzhmckp0qy0c2mbmfcgrsn627lnb";
       fetchSubmodules = true;
     };
   };
@@ -6046,12 +6046,12 @@ let
 
   zig-vim = buildVimPluginFrom2Nix {
     pname = "zig-vim";
-    version = "2020-01-21";
+    version = "2020-02-10";
     src = fetchFromGitHub {
       owner = "zig-lang";
       repo = "zig.vim";
-      rev = "669d4562d3ce0dba704374f1ccca66e4106b5234";
-      sha256 = "0i3rg58wwq3h4lhqgpbdparrbshjif8z7aw0ivc1gx67zyyvlsip";
+      rev = "55b690029791022fd7818ebd0ee395e8976899fe";
+      sha256 = "10xkrn4yhjda187mpw1y3qw0s6bp7aklk87pansaa3fvysdf3b6c";
     };
   };
 
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index c444868a183b..8584ab759598 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -225,8 +225,8 @@ lumiliet/vim-twig
 luochen1990/rainbow
 lyokha/vim-xkbswitch
 machakann/vim-highlightedyank
-machakann/vim-swap
 machakann/vim-sandwich
+machakann/vim-swap
 majutsushi/tagbar
 maksimr/vim-jsbeautify
 MarcWeber/vim-addon-actions
@@ -491,8 +491,8 @@ uarun/vim-protobuf
 udalov/kotlin-vim
 ujihisa/neco-look
 unblevable/quick-scope
-Valodim/deoplete-notmuch
 valloric/youcompleteme
+Valodim/deoplete-notmuch
 vhda/verilog_systemverilog.vim
 vim-airline/vim-airline
 vim-airline/vim-airline-themes

From 3e7ce1e07d7cd50b2cc1ceb1a71ec4fbc5628d3b Mon Sep 17 00:00:00 2001
From: David Terry <me@xwvvvvwx.com>
Date: Wed, 12 Feb 2020 16:22:12 +0100
Subject: [PATCH 0413/4636] vimPlugins.jellybeans-vim: init at 2019-06-22

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index d25a768d39ef..796029e26067 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -1585,6 +1585,17 @@ let
     };
   };
 
+  jellybeans-vim = buildVimPluginFrom2Nix {
+    pname = "jellybeans-vim";
+    version = "2019-06-22";
+    src = fetchFromGitHub {
+      owner = "nanotech";
+      repo = "jellybeans.vim";
+      rev = "ef83bf4dc8b3eacffc97bf5c96ab2581b415c9fa";
+      sha256 = "1zy3gjz5bna3l5a7k2ddqa0w7x8wbndy2vc9gmqfdsxdbhrgpvaz";
+    };
+  };
+
   Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix {
     pname = "Jenkinsfile-vim-syntax";
     version = "2019-12-31";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 8584ab759598..0d93fbbb6a7b 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -277,6 +277,7 @@ mopp/sky-color-clock.vim
 morhetz/gruvbox
 motus/pig.vim
 mpickering/hlint-refactor-vim
+nanotech/jellybeans.vim
 natebosch/vim-lsc
 nathanaelkane/vim-indent-guides
 nathangrigg/vim-beancount

From 5c8612d90cc9028d6b99804ea08c266a1db7f236 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 12 Feb 2020 17:00:19 +0100
Subject: [PATCH 0414/4636] cargo: use bundled libgit2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Cargo uses git-rs which is made to be built against the bundled libgit2
version that hasn't been part of a stable release yet. Using our libgit2
instead of the master version fails during runtime as they are not
compatible anymore.

After the next libgit2 update we can try again but it is likely that
there will also be yet another cargo release at that point in time…
---
 pkgs/development/compilers/rust/cargo.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index f639d330566d..6259101f6b64 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -1,5 +1,5 @@
 { stdenv, file, curl, pkgconfig, python3, openssl, cmake, zlib
-, makeWrapper, libiconv, cacert, rustPlatform, rustc, libgit2
+, makeWrapper, libiconv, cacert, rustPlatform, rustc
 , CoreFoundation, Security
 }:
 
@@ -18,10 +18,12 @@ rustPlatform.buildRustPackage {
   dontUpdateAutotoolsGnuConfigScripts = true;
 
   nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
-  buildInputs = [ cacert file curl python3 openssl zlib libgit2 ]
+  buildInputs = [ cacert file curl python3 openssl zlib ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];
 
-  LIBGIT2_SYS_USE_PKG_CONFIG = 1;
+  # cargo uses git-rs which is made for a version of libgit2 from recent master that
+  # is not compatible with the current version in nixpkgs.
+  #LIBGIT2_SYS_USE_PKG_CONFIG = 1;
 
   # fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel
   RUSTC_BOOTSTRAP = 1;

From ebf837e07ff709f91dc2cb15690e6b3698b4950f Mon Sep 17 00:00:00 2001
From: "Farkas, Arnold" <arnold.farkas@worldquant.com>
Date: Mon, 27 Jan 2020 02:46:04 -0500
Subject: [PATCH 0415/4636] pythonPackages.sanic-auth: init at 0.2.0

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

diff --git a/pkgs/development/python-modules/sanic-auth/default.nix b/pkgs/development/python-modules/sanic-auth/default.nix
new file mode 100644
index 000000000000..498e9cb34b11
--- /dev/null
+++ b/pkgs/development/python-modules/sanic-auth/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchPypi, pytest, sanic }:
+
+buildPythonPackage rec {
+  pname = "Sanic-Auth";
+  version = "0.2.0";
+  
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "b7cb9e93296c035ada0aa1ebfb33f9f7b62f7774c519e374b7fe703ff73589cb";
+  };
+  
+  propagatedBuildInputs = [ sanic ];
+  
+  checkInputs = [ pytest ];
+  
+  checkPhase = ''
+    pytest tests
+  '';
+  
+  meta = with lib; {
+    description = "Simple Authentication for Sanic";
+    homepage = "https://github.com/pyx/sanic-auth/";
+    license = licenses.bsdOriginal;
+    maintainers = [ maintainers.arnoldfarkas ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9a8136a7032e..716166e4ba61 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1347,6 +1347,8 @@ in {
 
   salmon-mail = callPackage ../development/python-modules/salmon-mail { };
 
+  sanic-auth = callPackage ../development/python-modules/sanic-auth { };
+
   seekpath = callPackage ../development/python-modules/seekpath { };
 
   selectors2 = callPackage ../development/python-modules/selectors2 { };

From 6adc09ed308e088481728c7f25ecabf609764254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 7 Feb 2020 15:21:12 +0000
Subject: [PATCH 0416/4636] knot: put runtime paths outside the nix store

Otherwise knot tries to write to non-writable directories.
This for example breaks dnssec signing.
While it's possible to overwrite these path in the configuration,
having a sane defaults is nicer.
---
 pkgs/servers/dns/knot-dns/default.nix         | 19 +++++++++--
 .../knot-dns/dont-create-run-time-dirs.patch  | 32 +++++++++++++++++++
 2 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/servers/dns/knot-dns/dont-create-run-time-dirs.patch

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index c3d63a54ac0d..234a39574506 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, pkgconfig, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring
 , systemd, nettle, libedit, zlib, libiconv, libintl
+, autoreconfHook
 }:
 
 let inherit (stdenv.lib) optional optionals; in
@@ -16,7 +17,19 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  configureFlags = [
+    "--with-configdir=/etc/knot"
+    "--with-rundir=/run/knot"
+    "--with-storage=/var/lib/knot"
+  ];
+
+  patches = [
+    # Don't try to create directories like /var/lib/knot at build time.
+    # They are later created from NixOS itself.
+    ./dont-create-run-time-dirs.patch
+  ];
+
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [
     gnutls liburcu libidn2 libunistring
     nettle libedit
@@ -33,7 +46,9 @@ stdenv.mkDerivation rec {
   doCheck = true;
   doInstallCheck = false; # needs pykeymgr?
 
-  postInstall = ''rm -r "$out"/var "$out"/lib/*.la'';
+  postInstall = ''
+    rm -r "$out"/lib/*.la
+  '';
 
   meta = with stdenv.lib; {
     description = "Authoritative-only DNS server from .cz domain registry";
diff --git a/pkgs/servers/dns/knot-dns/dont-create-run-time-dirs.patch b/pkgs/servers/dns/knot-dns/dont-create-run-time-dirs.patch
new file mode 100644
index 000000000000..9fe165e7681d
--- /dev/null
+++ b/pkgs/servers/dns/knot-dns/dont-create-run-time-dirs.patch
@@ -0,0 +1,32 @@
+diff --git a/samples/Makefile.am b/samples/Makefile.am
+index c253c91..107401d 100644
+--- a/samples/Makefile.am
++++ b/samples/Makefile.am
+@@ -19,11 +19,6 @@ EXTRA_DIST = knot.sample.conf.in example.com.zone
+ 
+ if HAVE_DAEMON
+ 
+-install-data-local: knot.sample.conf
+-	if [ \! -f $(DESTDIR)/$(config_dir)/knot.sample.conf ]; then \
+-	  $(INSTALL) -d $(DESTDIR)/$(config_dir); \
+-	  $(INSTALL_DATA) knot.sample.conf $(srcdir)/example.com.zone $(DESTDIR)/$(config_dir); \
+-	fi
+ uninstall-local:
+ 	-rm -rf $(DESTDIR)/$(config_dir)/knot.sample.conf \
+ 	        $(DESTDIR)/$(config_dir)/example.com.zone
+diff --git a/src/utils/Makefile.inc b/src/utils/Makefile.inc
+index e6765d9..d859d23 100644
+--- a/src/utils/Makefile.inc
++++ b/src/utils/Makefile.inc
+@@ -79,11 +79,6 @@ endif HAVE_DNSTAP
+ endif HAVE_UTILS
+ 
+ if HAVE_DAEMON
+-# Create storage and run-time directories
+-install-data-hook:
+-	$(INSTALL) -d $(DESTDIR)/@config_dir@
+-	$(INSTALL) -d $(DESTDIR)/@run_dir@
+-	$(INSTALL) -d $(DESTDIR)/@storage_dir@
+ 
+ sbin_PROGRAMS = knotc knotd
+ 

From 2f0614bdcb4c962440b9107f9e4c6d2f396b768f Mon Sep 17 00:00:00 2001
From: Jeff Labonte <grimsleepless@protonmail.com>
Date: Sun, 9 Feb 2020 23:59:27 -0500
Subject: [PATCH 0417/4636] maintainers: add jefflabonte

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f6035a7ba835..b1c6c11e5c6c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3291,6 +3291,12 @@
     githubId = 1198065;
     name = "Jeffrey David Johnson";
   };
+  jefflabonte = {
+    email = "grimsleepless@protonmail.com";
+    github = "jefflabonte";
+    githubId = 9425955;
+    name = "Jean-François Labonté";
+  };
   jensbin = {
     email = "jensbin+git@pm.me";
     github = "jensbin";

From 843a8481cdaecad266072567c5faa51757eb51c1 Mon Sep 17 00:00:00 2001
From: Jeff Labonte <grimsleepless@protonmail.com>
Date: Mon, 10 Feb 2020 22:50:24 -0500
Subject: [PATCH 0418/4636] pythonPackages.srp: init at 1.0.15

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

diff --git a/pkgs/development/python-modules/srp/default.nix b/pkgs/development/python-modules/srp/default.nix
new file mode 100644
index 000000000000..77644f6aa698
--- /dev/null
+++ b/pkgs/development/python-modules/srp/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildPythonPackage, fetchPypi, six, lib }:
+
+buildPythonPackage rec {
+  pname = "srp";
+  version = "1.0.15";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "d5b8ed6dc7d3ae2845a16590ef37763bbf15d6049848b85a8c96dfb8a83c984a";
+  };
+
+  propagatedBuildInputs = [ six ];
+
+  # Tests ends up with libssl.so cannot load shared
+  doCheck = false;
+
+  meta = with lib; {
+    longDescription = ''
+     This package provides an implementation of the Secure Remote Password protocol (SRP).
+     SRP is a cryptographically strong authentication protocol for password-based, mutual authentication over an insecure network connection.
+    '';
+    homepage = "https://github.com/cocagne/pysrp";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jefflabonte ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 716166e4ba61..e8e89da75cb9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2441,6 +2441,8 @@ in {
 
   digital-ocean = callPackage ../development/python-modules/digitalocean { };
 
+  digi-xbee = callPackage ../development/python-modules/digi-xbee { };
+
   leather = callPackage ../development/python-modules/leather { };
 
   libais = callPackage ../development/python-modules/libais { };
@@ -6948,8 +6950,12 @@ in {
 
   importlib-resources = callPackage ../development/python-modules/importlib-resources {};
 
+  srp = callPackage ../development/python-modules/srp { };
+
   srptools = callPackage ../development/python-modules/srptools { };
 
+  srp = callPackage ../development/python-modules/srp { };
+
   curve25519-donna = callPackage ../development/python-modules/curve25519-donna { };
 
   pyatv = callPackage ../development/python-modules/pyatv { };

From b67006fae1e12e9bd3ae43259ef575a434ff8fd9 Mon Sep 17 00:00:00 2001
From: Jeff Labonte <grimsleepless@protonmail.com>
Date: Mon, 10 Feb 2020 21:53:02 -0500
Subject: [PATCH 0419/4636] pythonPackages.digi-xbee: init at 1.3.0

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

diff --git a/pkgs/development/python-modules/digi-xbee/default.nix b/pkgs/development/python-modules/digi-xbee/default.nix
new file mode 100644
index 000000000000..32d8c47a9801
--- /dev/null
+++ b/pkgs/development/python-modules/digi-xbee/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy27, pyserial, srp, lib }:
+
+buildPythonPackage rec {
+  pname = "digi-xbee";
+  version = "1.3.0";
+  disabled = isPy27;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2ed798faee0853bf7ae9ca5aa4bdcbab496e3c2d56c9f0719a8e3e0d13270891";
+  };
+
+  propagatedBuildInputs = [ pyserial srp ];
+
+  # Upstream doesn't contain unit tests, only functional tests which require specific hardware
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Python library to interact with Digi International's XBee radio frequency modules";
+    homepage = "https://github.com/digidotcom/xbee-python";
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ jefflabonte ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e8e89da75cb9..27fb41d2c4bf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6950,8 +6950,6 @@ in {
 
   importlib-resources = callPackage ../development/python-modules/importlib-resources {};
 
-  srp = callPackage ../development/python-modules/srp { };
-
   srptools = callPackage ../development/python-modules/srptools { };
 
   srp = callPackage ../development/python-modules/srp { };

From 88029bce39bd485fc07f1b2aa111c3ee9d12e684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 12 Feb 2020 16:34:10 +0000
Subject: [PATCH 0420/4636] knot: drop dynamic user

This makes it hard to include secret files.
Also using tools like keymgr becomes harder.
---
 nixos/modules/services/networking/knot.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/knot.nix b/nixos/modules/services/networking/knot.nix
index 47364ecb8464..6d0bb23846fb 100644
--- a/nixos/modules/services/networking/knot.nix
+++ b/nixos/modules/services/networking/knot.nix
@@ -65,6 +65,13 @@ in {
   };
 
   config = mkIf config.services.knot.enable {
+    users.users.knot = {
+      isSystemUser = true;
+      group = "knot";
+      description = "Knot daemon user";
+    };
+
+    users.groups.knot.gid = null;
     systemd.services.knot = {
       unitConfig.Documentation = "man:knotd(8) man:knot.conf(5) man:knotc(8) https://www.knot-dns.cz/docs/${cfg.package.version}/html/";
       description = cfg.package.meta.description;
@@ -79,7 +86,7 @@ in {
         CapabilityBoundingSet = "CAP_NET_BIND_SERVICE CAP_SETPCAP";
         AmbientCapabilities = "CAP_NET_BIND_SERVICE CAP_SETPCAP";
         NoNewPrivileges = true;
-        DynamicUser = "yes";
+        User = "knot";
         RuntimeDirectory = "knot";
         StateDirectory = "knot";
         StateDirectoryMode = "0700";

From e0050dcd9a4aa6752670fb9ccce6976be55d5d5e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 16:34:11 +0000
Subject: [PATCH 0421/4636] libgee: 0.20.2 -> 0.20.3

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

diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix
index b9e1d668cd3e..92c9f214ab46 100644
--- a/pkgs/development/libraries/libgee/default.nix
+++ b/pkgs/development/libraries/libgee/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libgee";
-  version = "0.20.2";
+  version = "0.20.3";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0g1mhl7nidg82v4cikkk8dakzc18hg7wv0dsf2pbyijzfm5mq0wy";
+    sha256 = "1pm525wm11dhwz24m8bpcln9547lmrigl6cxf3qsbg4cr3pyvdfh";
   };
 
   doCheck = true;

From e2ef8b439fbb48308f7387396fa84946259b2bb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 12 Feb 2020 16:35:33 +0000
Subject: [PATCH 0422/4636] knot: add keyFiles option

This useful to include tsig keys using nixops without adding those
world-readable to the nix store.
---
 nixos/modules/services/networking/knot.nix | 31 ++++++++++++++++------
 nixos/tests/knot.nix                       | 15 +++++++++--
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/networking/knot.nix b/nixos/modules/services/networking/knot.nix
index 6d0bb23846fb..12ff89fe8492 100644
--- a/nixos/modules/services/networking/knot.nix
+++ b/nixos/modules/services/networking/knot.nix
@@ -5,14 +5,16 @@ with lib;
 let
   cfg = config.services.knot;
 
-  configFile = pkgs.writeText "knot.conf" cfg.extraConfig;
-  socketFile = "/run/knot/knot.sock";
+  configFile = pkgs.writeTextFile {
+    name = "knot.conf";
+    text = (concatMapStringsSep "\n" (file: "include: ${file}") cfg.keyFiles) + "\n" +
+           cfg.extraConfig;
+    checkPhase = lib.optionalString (cfg.keyFiles == []) ''
+      ${cfg.package}/bin/knotc --config=$out conf-check
+    '';
+  };
 
-  knotConfCheck = file: pkgs.runCommand "knot-config-checked"
-    { buildInputs = [ cfg.package ]; } ''
-    ln -s ${configFile} $out
-    knotc --config=${configFile} conf-check
-  '';
+  socketFile = "/run/knot/knot.sock";
 
   knot-cli-wrappers = pkgs.stdenv.mkDerivation {
     name = "knot-cli-wrappers";
@@ -45,6 +47,19 @@ in {
         '';
       };
 
+      keyFiles = mkOption {
+        type = types.listOf types.path;
+        default = [];
+        description = ''
+          A list of files containing additional configuration
+          to be included using the include directive. This option
+          allows to include configuration like TSIG keys without
+          exposing them to the nix store readable to any process.
+          Note that using this option will also disable configuration
+          checks at build time.
+        '';
+      };
+
       extraConfig = mkOption {
         type = types.lines;
         default = "";
@@ -81,7 +96,7 @@ in {
 
       serviceConfig = {
         Type = "notify";
-        ExecStart = "${cfg.package}/bin/knotd --config=${knotConfCheck configFile} --socket=${socketFile} ${concatStringsSep " " cfg.extraArgs}";
+        ExecStart = "${cfg.package}/bin/knotd --config=${configFile} --socket=${socketFile} ${concatStringsSep " " cfg.extraArgs}";
         ExecReload = "${knot-cli-wrappers}/bin/knotc reload";
         CapabilityBoundingSet = "CAP_NET_BIND_SERVICE CAP_SETPCAP";
         AmbientCapabilities = "CAP_NET_BIND_SERVICE CAP_SETPCAP";
diff --git a/nixos/tests/knot.nix b/nixos/tests/knot.nix
index 0588cf86ac09..8bab917a351e 100644
--- a/nixos/tests/knot.nix
+++ b/nixos/tests/knot.nix
@@ -28,6 +28,13 @@ let
     name = "knot-zones";
     paths = [ exampleZone delegatedZone ];
   };
+  # DO NOT USE pkgs.writeText IN PRODUCTION. This put secrets in the nix store!
+  tsigFile = pkgs.writeText "tsig.conf" ''
+    key:
+      - id: slave_key
+        algorithm: hmac-sha256
+        secret: zOYgOgnzx3TGe5J5I/0kxd7gTcxXhLYMEq3Ek3fY37s=
+  '';
 in {
   name = "knot";
   meta = with pkgs.stdenv.lib.maintainers; {
@@ -48,6 +55,7 @@ in {
       };
       services.knot.enable = true;
       services.knot.extraArgs = [ "-v" ];
+      services.knot.keyFiles = [ tsigFile ];
       services.knot.extraConfig = ''
         server:
             listen: 0.0.0.0@53
@@ -56,6 +64,7 @@ in {
         acl:
           - id: slave_acl
             address: 192.168.0.2
+            key: slave_key
             action: transfer
 
         remote:
@@ -103,6 +112,7 @@ in {
         ];
       };
       services.knot.enable = true;
+      services.knot.keyFiles = [ tsigFile ];
       services.knot.extraArgs = [ "-v" ];
       services.knot.extraConfig = ''
         server:
@@ -117,6 +127,7 @@ in {
         remote:
           - id: master
             address: 192.168.0.1@53
+            key: slave_key
 
         template:
           - id: default
@@ -155,10 +166,10 @@ in {
         ];
       };
       environment.systemPackages = [ pkgs.knot-dns ];
-    };    
+    };
   };
 
-  testScript = { nodes, ... }: let 
+  testScript = { nodes, ... }: let
     master4 = (lib.head nodes.master.config.networking.interfaces.eth1.ipv4.addresses).address;
     master6 = (lib.head nodes.master.config.networking.interfaces.eth1.ipv6.addresses).address;
 

From f87157e0d3804b781bfc17042d71406f4ba33e5c Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Mon, 20 Jan 2020 18:55:16 -0500
Subject: [PATCH 0423/4636] pythonPackages.marshmallow-polyfield: init at 5.7

This python package allows polymorphic data fields in marshmallow
serialization/deserialization schema.

This is a requirement for qiskit.
---
 .../marshmallow-polyfield/default.nix         | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/marshmallow-polyfield/default.nix

diff --git a/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/pkgs/development/python-modules/marshmallow-polyfield/default.nix
new file mode 100644
index 000000000000..cb0b9e9e60d2
--- /dev/null
+++ b/pkgs/development/python-modules/marshmallow-polyfield/default.nix
@@ -0,0 +1,34 @@
+{ buildPythonPackage
+, fetchFromGitHub
+, lib
+, marshmallow
+  # Check Inputs
+, pytestCheckHook
+, pytestcov
+}:
+
+buildPythonPackage rec {
+  pname = "marshmallow-polyfield";
+  version = "5.7";
+
+  src = fetchFromGitHub {
+    owner = "Bachmann1234";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "15yx8ib5yx1xx6kq8wnfdmv9zm43k7y33c6zpq5rba6a30v4lcnd";
+  };
+
+  propagatedBuildInputs = [
+    marshmallow
+  ];
+  
+  # setuptools check can run, but won't find tests
+  checkInputs = [ pytestCheckHook pytestcov ];
+
+  meta = with lib; {
+    description = "An unofficial extension to Marshmallow to allow for polymorphic fields";
+    homepage = "https://github.com/Bachmann1234/marshmallow-polyfield";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ drewrisinger ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 27fb41d2c4bf..02c6ef3cd265 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4158,6 +4158,8 @@ in {
 
   marshmallow-enum = callPackage ../development/python-modules/marshmallow-enum { };
 
+  marshmallow-polyfield = callPackage ../development/python-modules/marshmallow-polyfield { };
+
   marshmallow-sqlalchemy = callPackage ../development/python-modules/marshmallow-sqlalchemy { };
 
   manuel = callPackage ../development/python-modules/manuel { };

From 3be3ba4519cb7a61070b3f0ae418c21f4cb3e3d3 Mon Sep 17 00:00:00 2001
From: Sam Doshi <sam@metal-fish.co.uk>
Date: Mon, 7 Oct 2019 11:47:49 +0100
Subject: [PATCH 0424/4636] maintainers: add samdoshi

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b1c6c11e5c6c..34d1bc876c85 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6263,6 +6263,12 @@
     githubId = 766350;
     name = "Richard Zetterberg";
   };
+  samdoshi = {
+    email = "sam@metal-fish.co.uk";
+    github = "samdoshi";
+    githubId = 112490;
+    name = "Sam Doshi";
+  };
   samdroid-apps = {
     email = "sam@sam.today";
     github = "samdroid-apps";

From 8bccdc4b81183b65cf6117cb3ce32b7910a71a7f Mon Sep 17 00:00:00 2001
From: Sam Doshi <sam@metal-fish.co.uk>
Date: Mon, 7 Oct 2019 15:33:09 +0100
Subject: [PATCH 0425/4636] squeezelite: git -> 1.9.1196

Fix mp3, aac and ogg support, add extra codecs.
---
 .../audio/squeezelite/default.nix             | 54 +++++++++++++++----
 1 file changed, 43 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix
index 4648c9b5ab32..ce0153e9f26e 100644
--- a/pkgs/applications/audio/squeezelite/default.nix
+++ b/pkgs/applications/audio/squeezelite/default.nix
@@ -1,38 +1,70 @@
-{ stdenv, fetchFromGitHub, alsaLib, faad2, flac, libmad, libvorbis, makeWrapper, mpg123 }:
+{ stdenv, fetchFromGitHub
+, alsaLib, flac, libmad, libvorbis, mpg123
+, dsdSupport ? true
+, faad2Support ? true, faad2
+, ffmpegSupport ? true, ffmpeg
+, opusSupport ? true, opusfile
+, resampleSupport ? true, soxr
+, sslSupport ? true, openssl
+}:
 
 let
-  runtimeDeps  = [ faad2 flac libmad libvorbis mpg123 ];
-  rpath = stdenv.lib.makeLibraryPath runtimeDeps;
+  concatStringsSep = stdenv.lib.concatStringsSep;
+  optional = stdenv.lib.optional;
+  opts = [ "-DLINKALL" ]
+    ++ optional dsdSupport "-DDSD"
+    ++ optional (!faad2Support) "-DNO_FAAD"
+    ++ optional ffmpegSupport "-DFFMPEG"
+    ++ optional opusSupport "-DOPUS"
+    ++ optional resampleSupport "-DRESAMPLE"
+    ++ optional sslSupport "-DUSE_SSL";
+
 in stdenv.mkDerivation {
-  name = "squeezelite-git-2018-08-14";
+  pname = "squeezelite";
+
+  # versions are specified in `squeezelite.h`
+  # see https://github.com/ralph-irving/squeezelite/issues/29
+  version = "1.9.6.1196";
 
   src = fetchFromGitHub {
     owner  = "ralph-irving";
     repo   = "squeezelite";
-    rev    = "ecb6e3696a42113994640e5345d0b5ca2e77d28b";
-    sha256 = "0di3d5qy8fhawijq6bxy524fgffvzl08dprrws0fs2j1a70fs0fh";
+    rev    = "2b508464dce2cbdb2a3089c58df2a6fbc36328c0";
+    sha256 = "024ypr1da2r079k3hgiifzd3d3wcfprhbl5zdm40zm0c7frzmr8i";
   };
 
-  buildInputs = [ alsaLib ] ++ runtimeDeps;
-  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ alsaLib flac libmad libvorbis mpg123 ]
+    ++ optional faad2Support faad2
+    ++ optional ffmpegSupport ffmpeg
+    ++ optional opusSupport opusfile
+    ++ optional resampleSupport soxr
+    ++ optional sslSupport openssl;
 
   enableParallelBuilding = true;
 
+  postPatch = ''
+    substituteInPlace opus.c \
+      --replace "<opusfile.h>" "<opus/opusfile.h>"
+  '';
+
+  preBuild = ''
+    export OPTS="${concatStringsSep " " opts}"
+  '';
+
   installPhase = ''
     runHook preInstall
 
     install -Dm755 -t $out/bin                   squeezelite
     install -Dm644 -t $out/share/doc/squeezelite *.txt *.md
 
-    wrapProgram $out/bin/squeezelite --set LD_LIBRARY_PATH $RPATH
     runHook postInstall
   '';
 
   meta = with stdenv.lib; {
     description = "Lightweight headless squeezebox client emulator";
     homepage = https://github.com/ralph-irving/squeezelite;
-    license = licenses.gpl3;
+    license = with licenses; [ gpl3 ] ++ optional dsdSupport bsd2;
+    maintainers = with maintainers; [ samdoshi ];
     platforms = platforms.linux;
   };
-  RPATH = rpath;
 }

From e1ed62abc2b5f628a3e1184a757d0be4f0d1228e Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 11 Feb 2020 17:52:11 +0000
Subject: [PATCH 0426/4636] cargo: install man pages

I thought about doing a seperate output for these, but they're tiny
compared to the size of the binary, so there's no point.

(cherry picked from commit 0489c1b4b20d13fa04e6460ead73893889ff2529)
---
 pkgs/development/compilers/rust/cargo.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index 6259101f6b64..6625367262a0 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -1,5 +1,5 @@
 { stdenv, file, curl, pkgconfig, python3, openssl, cmake, zlib
-, makeWrapper, libiconv, cacert, rustPlatform, rustc
+, installShellFiles, makeWrapper, libiconv, cacert, rustPlatform, rustc
 , CoreFoundation, Security
 }:
 
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage {
   # changes hash of vendor directory otherwise
   dontUpdateAutotoolsGnuConfigScripts = true;
 
-  nativeBuildInputs = [ pkgconfig cmake makeWrapper ];
+  nativeBuildInputs = [ pkgconfig cmake installShellFiles makeWrapper ];
   buildInputs = [ cacert file curl python3 openssl zlib ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];
 
@@ -37,6 +37,8 @@ rustPlatform.buildRustPackage {
       --suffix PATH : "${rustc}/bin" \
       --set CARGO_HTTP_CAINFO "${cacert}/etc/ssl/certs/ca-bundle.crt" \
       --set SSL_CERT_FILE "${cacert}/etc/ssl/certs/ca-bundle.crt"
+
+    installManPage src/tools/cargo/src/etc/man/*
   '';
 
   checkPhase = ''

From e0efe0d77f6c6816a2ddf91ca56b9cca0316154d Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Wed, 12 Feb 2020 18:36:31 +0100
Subject: [PATCH 0427/4636] ezquake: 3.0.1 -> 3.1

---
 pkgs/games/ezquake/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix
index 1c007cc6bb54..86db4a3209e8 100644
--- a/pkgs/games/ezquake/default.nix
+++ b/pkgs/games/ezquake/default.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchFromGitHub, curl, expat
 , jansson, libpng, libjpeg, libGLU, libGL, libXxf86vm, pcre
-, pkgconfig, SDL2, vim }:
+, pkgconfig, SDL2, vim, speex }:
 
 stdenv.mkDerivation rec {
   pname = "ezquake";
-  version = "3.0.1";
+  version = "3.1";
 
   src = fetchFromGitHub {
     owner = "ezQuake";
     repo = pname + "-source";
-    rev = "v" + version;
-    sha256 = "14wck0r64z5haacp7g7qb2qrbhff3x6jfjmn4268dyb9dl5663f2";
+    rev = version;
+    sha256 = "0375jndynhkl59m80fhmq12v5g24zy16c7ly08h004cmjzqsikn4";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    expat curl jansson libpng libjpeg libGLU libGL libXxf86vm pcre SDL2 vim
+    expat curl jansson libpng libjpeg libGLU libGL libXxf86vm pcre SDL2 vim speex
   ];
 
   installPhase = with stdenv.lib; let
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://ezquake.github.io/;
-    description = "A modern QuakeWorld client focused on competitive online play.";
+    homepage = "http://ezquake.github.io/";
+    description = "A modern QuakeWorld client focused on competitive online play";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ edwtjo ];

From 7b61246b95bd8a6e22a568f8070671713419b85e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 12:52:48 +0000
Subject: [PATCH 0428/4636] gitAndTools.gh: 0.5.3 -> 0.5.4

---
 .../version-management/git-and-tools/gh/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix
index 02f830a3f07e..4e461c490984 100644
--- a/pkgs/applications/version-management/git-and-tools/gh/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "gh";
-  version = "0.5.3";
+  version = "0.5.4";
 
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "033y9bwdaj8735nmj22k8lrgkgimji7hyly9i4jyp11iaa7cgd7a";
+    sha256 = "1i8zxz1vwr86654bxrb8ryh9mk3hsgyrkaxx17dnvasdvym49vrs";
   };
 
   modSha256 = "0ina3m2ixkkz2fws6ifwy34pmp6kn5s3j7w40alz6vmybn2smy1h";

From 21fceb367f2237a0498c485ff6cd1e8fed815ec7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:18 -0300
Subject: [PATCH 0429/4636] mate.atril: 1.22.3 -> 1.24.0

---
 pkgs/desktops/mate/atril/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix
index ecb9ea2e377e..b12a543d11c2 100644
--- a/pkgs/desktops/mate/atril/default.nix
+++ b/pkgs/desktops/mate/atril/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, mate, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, texlive, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "atril";
-  version = "1.22.3";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "06hmyw7fwdrdyl3n79b8qxlrwbzf240n82arzmlg62q9zxzdc0is";
+    sha256 = "0967gxw7h2qh2kpwl0jgv58hicz6aa92kr12mnykbpikad25s95y";
   };
 
   nativeBuildInputs = [
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
     mate.caja
     mate.mate-desktop
     hicolor-icon-theme
+    texlive.bin.core  # for synctex, used by the pdf back-end
   ];
 
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
@@ -33,7 +34,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A simple multi-page document viewer for the MATE desktop";
-    homepage = https://mate-desktop.org;
+    homepage = "https://mate-desktop.org";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
   };

From c17f188de0de013827e453d4f6748b901b386731 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:18 -0300
Subject: [PATCH 0430/4636] mate.caja: 1.22.3 -> 1.24.0

---
 .../mate/caja/caja-extension-dirs.patch       | 22 ++++++++++++++++---
 pkgs/desktops/mate/caja/default.nix           |  6 ++---
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/mate/caja/caja-extension-dirs.patch b/pkgs/desktops/mate/caja/caja-extension-dirs.patch
index 7490a368efd9..0b1453bd4689 100644
--- a/pkgs/desktops/mate/caja/caja-extension-dirs.patch
+++ b/pkgs/desktops/mate/caja/caja-extension-dirs.patch
@@ -1,11 +1,24 @@
+From 35e9e6a6f3ba6cbe62a3957044eb67864f5d8e66 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
+Date: Tue, 11 Feb 2020 17:49:13 -0300
+Subject: [PATCH] Look for caja extentions at $CAJA_EXTENTSION_DIRS
+
+CAJA_EXTENSION_DIRS is a list of paths where caja extensions are
+looked for. It is needed for distributions like NixOS that do not
+install all extensions in the same directory. In NixOS each package is
+installed in a self contained directory.
+---
+ libcaja-private/caja-module.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
 diff --git a/libcaja-private/caja-module.c b/libcaja-private/caja-module.c
-index 023c22e..414913b 100644
+index d54d7cf..9794e56 100644
 --- a/libcaja-private/caja-module.c
 +++ b/libcaja-private/caja-module.c
-@@ -258,11 +258,25 @@ caja_module_setup (void)
+@@ -258,11 +258,25 @@ void
+ caja_module_setup (void)
  {
      static gboolean initialized = FALSE;
-     GList *res;
 +    gchar *caja_extension_dirs;
 +    gchar **dir_vector;
  
@@ -28,3 +41,6 @@ index 023c22e..414913b 100644
          load_module_dir (CAJA_EXTENSIONDIR);
  
          eel_debug_call_at_shutdown (free_module_objects);
+-- 
+2.25.0
+
diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix
index c460a2cf2dc0..6508dfa3b8de 100644
--- a/pkgs/desktops/mate/caja/default.nix
+++ b/pkgs/desktops/mate/caja/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "caja";
-  version = "1.22.3";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1w2liq9h1kr5zyaaq82xz8pic04qi5sra8kaycfg1iddmknkfqn7";
+    sha256 = "1cnfy481hcwjv3ia3kw0d4h7ga8cng0pqm3z349v4qcmfdapmqc0";
   };
 
   nativeBuildInputs = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "File manager for the MATE desktop";
-    homepage = https://mate-desktop.org;
+    homepage = "https://mate-desktop.org";
     license = with stdenv.lib.licenses; [ gpl2 lgpl2 ];
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.romildo ];

From d5f9737d1a676968cc264939a6a7c6d8d2893a89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:18 -0300
Subject: [PATCH 0431/4636] mate.caja-dropbox: 1.22.1 -> 1.24.0

---
 pkgs/desktops/mate/caja-dropbox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix
index 820b1e905ecd..2ced1ddf62b3 100644
--- a/pkgs/desktops/mate/caja-dropbox/default.nix
+++ b/pkgs/desktops/mate/caja-dropbox/default.nix
@@ -7,11 +7,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "caja-dropbox";
-  version = "1.22.1";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "18cnd3yw2ingvl38mhmfbl5k0kfg8pzcf2649j00i6v90cwiril5";
+    sha256 = "1rcn82q58mv9hn5xamvzay2pw1szfk6zns94362476fcp786lji2";
   };
 
   patches = [

From 97631fe8b3a973c1e0cde3a326498db718cddb06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:18 -0300
Subject: [PATCH 0432/4636] mate.caja-extensions: 1.22.1 -> 1.24.0

---
 pkgs/desktops/mate/caja-extensions/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix
index 10595bbbaecc..1704b5051b2e 100644
--- a/pkgs/desktops/mate/caja-extensions/default.nix
+++ b/pkgs/desktops/mate/caja-extensions/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "caja-extensions";
-  version = "1.22.1";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0xzhphzvaxbwyyp242pnhl5zjrkiznj90i0xjmy7pvi155pmp16h";
+    sha256 = "175v5c05nrdliya23rbqma49alldq67dklmvpq18nq71sfry4pp6";
   };
 
   nativeBuildInputs = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Set of extensions for Caja file manager";
-    homepage = https://mate-desktop.org;
+    homepage = "https://mate-desktop.org";
     license = licenses.gpl2;
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];

From c8d4d775d021defb8696a2f9485b14752d593960 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:19 -0300
Subject: [PATCH 0433/4636] mate.engrampa: 1.22.3 -> 1.24.0

---
 pkgs/desktops/mate/engrampa/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix
index 9569b1919e4a..de685badafc2 100644
--- a/pkgs/desktops/mate/engrampa/default.nix
+++ b/pkgs/desktops/mate/engrampa/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "engrampa";
-  version = "1.22.3";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "17pn1qgr1a13jxv50qcnzqcw8gr96g7jz2z2y1wbwy7i44bknv6n";
+    sha256 = "13cak3qgrzqj74x9jq1sf155793v2bqqz4mk4i04g9f9xn3g85fl";
   };
 
   nativeBuildInputs = [
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Archive Manager for MATE";
-    homepage = https://mate-desktop.org;
+    homepage = "https://mate-desktop.org";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.romildo ];

From 0841600674b0d2d59ea793e76a104ccdee0514d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:19 -0300
Subject: [PATCH 0434/4636] mate.eom: 1.22.2 -> 1.24.0

---
 pkgs/desktops/mate/eom/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix
index 457a9e56c5d4..2a535e321b56 100644
--- a/pkgs/desktops/mate/eom/default.nix
+++ b/pkgs/desktops/mate/eom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "eom";
-  version = "1.22.2";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0za1lw4awg1i0ls0r9iw0ail2hqa34y1dx65b50bw9kx9kbfyl9l";
+    sha256 = "0zzximp2534bky0vac219alafblw6m0lis0gncq92017s6c1mb77";
   };
 
   nativeBuildInputs = [
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "An image viewing and cataloging program for the MATE desktop";
-    homepage = https://mate-desktop.org;
+    homepage = "https://mate-desktop.org";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.romildo ];

From fc1a17d0f114e2f5aeef1098d45de0a28d0bb135 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:19 -0300
Subject: [PATCH 0435/4636] mate.libmatekbd: 1.22.0 -> 1.24.0

---
 pkgs/desktops/mate/libmatekbd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix
index 6364b89204af..f4c2241aebb5 100644
--- a/pkgs/desktops/mate/libmatekbd/default.nix
+++ b/pkgs/desktops/mate/libmatekbd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libmatekbd";
-  version = "1.22.0";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1dsr7618c92mhwabwhgxqsfp7gnf9zrz2z790jc5g085dxhg13y8";
+    sha256 = "1sq7gwr9q3hq4q0vx32qqa68qcqf5by9mqyxnq6lwgaq8ydq16ab";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Keyboard management library for MATE";
-    homepage = https://github.com/mate-desktop/libmatekbd;
+    homepage = "https://github.com/mate-desktop/libmatekbd";
     license = licenses.gpl2;
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];

From b143f1867d8138aceba02a0f83b7978a23673bb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:19 -0300
Subject: [PATCH 0436/4636] mate.libmatemixer: 1.22.0 -> 1.24.0

---
 pkgs/desktops/mate/libmatemixer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix
index 9c2dc412d4d4..ca73c550cb17 100644
--- a/pkgs/desktops/mate/libmatemixer/default.nix
+++ b/pkgs/desktops/mate/libmatemixer/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libmatemixer";
-  version = "1.22.0";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1v0gpr55gj4mj8hzxbhgzrmhaxvs2inxhsmirvjw39sc7iplvrh9";
+    sha256 = "08vkdp2kzy27xwscwp2jj5nz0yblrka2482l6cx3wl4dnk0rpznm";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Mixer library for MATE";
-    homepage = https://github.com/mate-desktop/libmatemixer;
+    homepage = "https://github.com/mate-desktop/libmatemixer";
     license = with licenses; [ gpl2 lgpl2 ];
     platforms = platforms.linux;
     maintainers = [ maintainers.romildo ];

From e1cc75eaa3490e7ffa8f0cd51db392729ac38e90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:19 -0300
Subject: [PATCH 0437/4636] mate.libmateweather: 1.22.1 -> 1.24.0

---
 pkgs/desktops/mate/libmateweather/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix
index 0c14cdb96b5d..f6c3c9b4e8af 100644
--- a/pkgs/desktops/mate/libmateweather/default.nix
+++ b/pkgs/desktops/mate/libmateweather/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libmateweather";
-  version = "1.22.1";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1y3z82ymc7q6z8ly9f6nys0hbs373fjnvr6j7zwlgf6zc88f71h3";
+    sha256 = "094mnlczxq9crjj8z7dzs1zmwscdkbp54l3qjaf4a4bhd8lihv8d";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Library to access weather information from online services for MATE";
-    homepage = https://github.com/mate-desktop/libmateweather;
+    homepage = "https://github.com/mate-desktop/libmateweather";
     license = licenses.gpl2;
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];

From bd9bee5fd456ca8e7c83b11ac9b3c9f5f979bc2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:19 -0300
Subject: [PATCH 0438/4636] mate.marco: 1.22.4 -> 1.24.0

---
 pkgs/desktops/mate/marco/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix
index fd551c0cc78a..2a2bd9a46641 100644
--- a/pkgs/desktops/mate/marco/default.nix
+++ b/pkgs/desktops/mate/marco/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "marco";
-  version = "1.22.4";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0z8q4nwm43imbnbxz348ylgzfl25sknb19kml57d6z6flxws19k3";
+    sha256 = "0hcbyv8czymhwz5q9rwig7kkhlhik6y080bls736f3wsbqnnirc2";
   };
 
   nativeBuildInputs = [
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "MATE default window manager";
-    homepage = https://github.com/mate-desktop/marco;
+    homepage = "https://github.com/mate-desktop/marco";
     license = [ licenses.gpl2 ];
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];

From 10e1405b16e9ed753bded0c1825a0ff83c2392cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:19 -0300
Subject: [PATCH 0439/4636] mate.mate-applets: 1.22.2 -> 1.24.0

---
 pkgs/desktops/mate/mate-applets/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix
index 3b5a4ccf2a2b..2af9c6940d43 100644
--- a/pkgs/desktops/mate/mate-applets/default.nix
+++ b/pkgs/desktops/mate/mate-applets/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-applets";
-  version = "1.22.2";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1c32rkkry6kka2arrx5psjj037j79icp5jr1s0qh596dvsgxciqc";
+    sha256 = "0nm3amb3v458mxv1mbz9y8f4230gldmydmkkm7vqxsrxbccynkxq";
   };
 
   nativeBuildInputs = [
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Applets for use with the MATE panel";
-    homepage = https://mate-desktop.org;
+    homepage = "https://mate-desktop.org";
     license = with licenses; [ gpl2Plus lgpl2Plus ];
     platforms = platforms.linux;
     maintainers = [ maintainers.romildo ];

From e812e5053b7c1a42728fae94ccc97710e2a70ec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:20 -0300
Subject: [PATCH 0440/4636] mate.mate-backgrounds: 1.22.0 -> 1.24.0

---
 pkgs/desktops/mate/mate-backgrounds/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix
index 4b41caba710b..6cb7d365ff68 100644
--- a/pkgs/desktops/mate/mate-backgrounds/default.nix
+++ b/pkgs/desktops/mate/mate-backgrounds/default.nix
@@ -2,18 +2,18 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-backgrounds";
-  version = "1.22.0";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1j9ch04qi2q4mdcvb92w667ra9hpfdf2bfpi1dpw0nbph7r6qvj9";
+    sha256 = "16rmsy02fyq6mj6xgc5mdyh146z3zmkn7iwsi44s962aqwbpn4i8";
   };
 
   nativeBuildInputs = [ intltool ];
 
   meta = with stdenv.lib; {
     description = "Background images and data for MATE";
-    homepage = https://mate-desktop.org;
+    homepage = "https://mate-desktop.org";
     license = licenses.gpl2;
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];

From 9b60f99c1f4912890690c4aec3534d6f9afc8d79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:20 -0300
Subject: [PATCH 0441/4636] mate.mate-calc: 1.22.2 -> 1.24.0

---
 pkgs/desktops/mate/mate-calc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix
index d89e1e35d924..7a1d97a1968f 100644
--- a/pkgs/desktops/mate/mate-calc/default.nix
+++ b/pkgs/desktops/mate/mate-calc/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-calc";
-  version = "1.22.2";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1as4gshydcf84vynq8ijd9n8pslz5jpw6aj18ri4bdc91a6q3rpg";
+    sha256 = "0f7hc1gg41kcwcyvsqqg79qylrp0qqymris8qizk2x3cfvvg7261";
   };
 
   nativeBuildInputs = [
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Calculator for the MATE desktop";
-    homepage = https://mate-desktop.org;
+    homepage = "https://mate-desktop.org";
     license = [ licenses.gpl2Plus ];
     platforms = platforms.linux;
     maintainers = [ maintainers.romildo ];

From 6ba2a2c04f9bd4f768bc353569ed8b5ca68435d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:20 -0300
Subject: [PATCH 0442/4636] mate.mate-common: 1.22.2 -> 1.24.0

---
 pkgs/desktops/mate/mate-common/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix
index b0a7096c5e78..c9ed7cd51f61 100644
--- a/pkgs/desktops/mate/mate-common/default.nix
+++ b/pkgs/desktops/mate/mate-common/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-common";
-  version = "1.22.2";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1xx7qrw8kc6355r1a1nybncf8s2rxjb2nqzw0gv2r5j5sqx8fzgf";
+    sha256 = "06w25mk2w7rfnkwpnav8pcrvip1zdd0zd1qc6d975ksmg66r1vz7";
   };
 
   meta = {
     description = "Common files for development of MATE packages";
-    homepage = https://mate-desktop.org;
+    homepage = "https://mate-desktop.org";
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.romildo ];

From b4749d221af1ccf317942160b0de7f67e9a53eec Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Wed, 12 Feb 2020 18:52:32 +0100
Subject: [PATCH 0443/4636] eggdrop: 1.6.21-nix1 -> 1.8.4

---
 pkgs/tools/networking/eggdrop/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/tools/networking/eggdrop/default.nix
index 5b85a680efdf..dc5bf1ef9760 100644
--- a/pkgs/tools/networking/eggdrop/default.nix
+++ b/pkgs/tools/networking/eggdrop/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, tcl }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "eggdrop";
-  version = "1.6.21-nix1";
+  version = "1.8.4";
 
   src = fetchFromGitHub {
     owner = "eggheads";
     repo = "eggdrop";
-    rev = "9ec109a13c016c4cdc7d52b7e16e4b9b6fbb9331";
-    sha256 = "0mf1vcbmpnvmf5mxk7gi3z32fxpcbynsh9jni8z8frrscrdf5lp5";
+    rev = "v${version}";
+    sha256 = "0xqdrv4ydxw72a740lkmpg3fs7ldicaf08b0sfqdyaj7cq8l5x5l";
   };
 
   buildInputs = [ tcl ];
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     license = licenses.gpl2;
     platforms = platforms.unix;
-    homepage = http://www.eggheads.org;
+    homepage = "http://www.eggheads.org";
     description = "An Internet Relay Chat (IRC) bot";
   };
 }

From 97fec8cfbb8ffe4adde39087165e8ca5e4b8af06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:20 -0300
Subject: [PATCH 0444/4636] mate.mate-control-center: 1.22.2 -> 1.24.0

Also the patches have been integrated upstream.
---
 ...ch-system-themes-in-system-data-dirs.patch |  81 -------------
 .../mate/mate-control-center/default.nix      |  16 +--
 .../mate-control-center.keybindings-dir.patch | 106 ------------------
 3 files changed, 5 insertions(+), 198 deletions(-)
 delete mode 100644 pkgs/desktops/mate/mate-control-center/0001-Search-system-themes-in-system-data-dirs.patch
 delete mode 100644 pkgs/desktops/mate/mate-control-center/mate-control-center.keybindings-dir.patch

diff --git a/pkgs/desktops/mate/mate-control-center/0001-Search-system-themes-in-system-data-dirs.patch b/pkgs/desktops/mate/mate-control-center/0001-Search-system-themes-in-system-data-dirs.patch
deleted file mode 100644
index fb2917b36bb5..000000000000
--- a/pkgs/desktops/mate/mate-control-center/0001-Search-system-themes-in-system-data-dirs.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 74fb65a2574c93a2b20a51875a5e336f727ff4bc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
-Date: Wed, 25 Dec 2019 18:48:38 -0300
-Subject: [PATCH] Search system themes in system data dirs
-
----
- capplets/common/gtkrc-utils.c     | 20 ++++++++++++--------
- capplets/common/mate-theme-info.c | 18 +++++++++++-------
- 2 files changed, 23 insertions(+), 15 deletions(-)
-
-diff --git a/capplets/common/gtkrc-utils.c b/capplets/common/gtkrc-utils.c
-index 011c8a1..27e01da 100644
---- a/capplets/common/gtkrc-utils.c
-+++ b/capplets/common/gtkrc-utils.c
-@@ -60,15 +60,19 @@ gchar* gtkrc_find_named(const gchar* name)
- 
- 	if (!path)
- 	{
--		gchar* theme_dir = gtk_rc_get_theme_dir();
--		path = g_build_filename(theme_dir, name, subpath, NULL);
--		g_free(theme_dir);
-+		const gchar * const * dirs = g_get_system_data_dirs();
- 
--		if (!g_file_test(path, G_FILE_TEST_EXISTS))
--		{
--			g_free (path);
--			path = NULL;
--		}
-+		if (dirs != NULL)
-+			for (; !path && *dirs != NULL; ++dirs)
-+			{
-+				path = g_build_filename(*dirs, "themes", name, subpath, NULL);
-+
-+				if (!g_file_test(path, G_FILE_TEST_EXISTS))
-+				{
-+					g_free (path);
-+					path = NULL;
-+				}
-+			}
- 	}
- 
- 	return path;
-diff --git a/capplets/common/mate-theme-info.c b/capplets/common/mate-theme-info.c
-index 54ae3ae..a738f0b 100644
---- a/capplets/common/mate-theme-info.c
-+++ b/capplets/common/mate-theme-info.c
-@@ -1763,6 +1763,7 @@ mate_theme_color_scheme_equal (const gchar *s1, const gchar *s2)
- void
- mate_theme_init ()
- {
-+  const gchar * const * dirs;
-   GFile *top_theme_dir;
-   gchar *top_theme_dir_string;
-   static gboolean initted = FALSE;
-@@ -1783,13 +1784,16 @@ mate_theme_init ()
-   theme_hash_by_uri = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-   theme_hash_by_name = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
- 
--  /* Add all the toplevel theme dirs. */
--  /* $datadir/themes */
--  top_theme_dir_string = gtk_rc_get_theme_dir ();
--  top_theme_dir = g_file_new_for_path (top_theme_dir_string);
--  g_free (top_theme_dir_string);
--  add_top_theme_dir_monitor (top_theme_dir, 1, NULL);
--  g_object_unref (top_theme_dir);
-+  /* Add all the toplevel theme dirs following the XDG Base Directory Specification */
-+  dirs = g_get_system_data_dirs ();
-+  if (dirs != NULL)
-+    for (; *dirs != NULL; ++dirs) {
-+      top_theme_dir_string = g_build_filename (*dirs, "themes", NULL);
-+      top_theme_dir = g_file_new_for_path (top_theme_dir_string);
-+      g_free (top_theme_dir_string);
-+      add_top_theme_dir_monitor (top_theme_dir, 1, NULL);
-+      g_object_unref (top_theme_dir);
-+    }
- 
-   /* ~/.themes */
-   top_theme_dir_string  = g_build_filename (g_get_home_dir (), ".themes", NULL);
--- 
-2.24.1
-
diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix
index 2451c403c82d..beae8dc63ecb 100644
--- a/pkgs/desktops/mate/mate-control-center/default.nix
+++ b/pkgs/desktops/mate/mate-control-center/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus-glib,
   libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3,
-  desktop-file-utils, dconf, gtk3, mate, hicolor-icon-theme, wrapGAppsHook
+  desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
   pname = "mate-control-center";
-  version = "1.22.2";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1ybdjibi6wgqn3587a66ckxp2qkvl4mcvv2smhflyxksl5djrjgh";
+    sha256 = "192plsh83m2qz7jgakns2yvhqbj53v7i54iwb0z26i2awy0j9rcd";
   };
 
   nativeBuildInputs = [
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
     libappindicator-gtk3
     gtk3
     dconf
+    polkit
     hicolor-icon-theme
     mate.mate-desktop
     mate.libmatekbd
@@ -37,13 +38,6 @@ stdenv.mkDerivation rec {
     mate.mate-settings-daemon
   ];
 
-  patches = [
-    # see https://github.com/mate-desktop/mate-control-center/pull/528
-    ./0001-Search-system-themes-in-system-data-dirs.patch
-    # look up keyboard shortcuts in system data dirs
-    ./mate-control-center.keybindings-dir.patch
-  ];
-
   configureFlags = [ "--disable-update-mimedb" ];
 
   preFixup = ''
@@ -57,7 +51,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Utilities to configure the MATE desktop";
-    homepage = https://github.com/mate-desktop/mate-control-center;
+    homepage = "https://github.com/mate-desktop/mate-control-center";
     license = licenses.gpl2;
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];
diff --git a/pkgs/desktops/mate/mate-control-center/mate-control-center.keybindings-dir.patch b/pkgs/desktops/mate/mate-control-center/mate-control-center.keybindings-dir.patch
deleted file mode 100644
index 4a3036ae16e2..000000000000
--- a/pkgs/desktops/mate/mate-control-center/mate-control-center.keybindings-dir.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From faeb322b01d3856f3cf163470cc38f4e88a8527c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
-Date: Sun, 28 Apr 2019 21:45:39 -0300
-Subject: [PATCH] Use system data dirs to locate key bindings
-
----
- capplets/keybindings/Makefile.am              |  3 +-
- .../keybindings/mate-keybinding-properties.c  | 58 ++++++++++++-------
- 2 files changed, 39 insertions(+), 22 deletions(-)
-
-diff --git a/capplets/keybindings/Makefile.am b/capplets/keybindings/Makefile.am
-index e5efb109..9501dd8f 100644
---- a/capplets/keybindings/Makefile.am
-+++ b/capplets/keybindings/Makefile.am
-@@ -33,8 +33,7 @@ AM_CPPFLAGS = \
- 	$(MATECC_CAPPLETS_CFLAGS) \
- 	-DMATELOCALEDIR="\"$(datadir)/locale\"" \
- 	-DMATECC_DATA_DIR="\"$(pkgdatadir)\"" \
--	-DMATECC_UI_DIR="\"$(uidir)\"" \
--	-DMATECC_KEYBINDINGS_DIR="\"$(pkgdatadir)/keybindings\""
-+	-DMATECC_UI_DIR="\"$(uidir)\""
- CLEANFILES = \
- 	$(MATECC_CAPPLETS_CLEANFILES) \
- 	$(desktop_DATA) \
-diff --git a/capplets/keybindings/mate-keybinding-properties.c b/capplets/keybindings/mate-keybinding-properties.c
-index 4f257333..cf1891d2 100644
---- a/capplets/keybindings/mate-keybinding-properties.c
-+++ b/capplets/keybindings/mate-keybinding-properties.c
-@@ -1033,39 +1033,57 @@ static void
- reload_key_entries (GtkBuilder *builder)
- {
-   gchar **wm_keybindings;
--  GDir *dir;
--  const char *name;
-   GList *list, *l;
-+  const gchar * const * data_dirs;
-+  GHashTable *loaded_files;
-+  guint i;
- 
-   wm_keybindings = wm_common_get_current_keybindings();
- 
-   clear_old_model (builder);
- 
--  dir = g_dir_open (MATECC_KEYBINDINGS_DIR, 0, NULL);
--  if (!dir)
--      return;
--
--  list = NULL;
--  for (name = g_dir_read_name (dir) ; name ; name = g_dir_read_name (dir))
-+  loaded_files = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
-+  data_dirs = g_get_system_data_dirs ();
-+  for (i = 0; data_dirs[i] != NULL; i++)
-     {
--      if (g_str_has_suffix (name, ".xml"))
-+      g_autofree gchar *dir_path = NULL;
-+      GDir *dir;
-+      const gchar *name;
-+
-+      dir_path = g_build_filename (data_dirs[i], "mate-control-center", "keybindings", NULL);
-+      g_debug ("Keybinding dir: %s", dir_path);
-+
-+      dir = g_dir_open (dir_path, 0, NULL);
-+      if (!dir)
-+        continue;
-+
-+      for (name = g_dir_read_name (dir) ; name ; name = g_dir_read_name (dir))
-         {
--      list = g_list_insert_sorted (list, g_strdup (name),
--                       (GCompareFunc) g_ascii_strcasecmp);
--    }
--    }
--  g_dir_close (dir);
-+          if (g_str_has_suffix (name, ".xml") == FALSE)
-+            continue;
-+
-+          if (g_hash_table_lookup (loaded_files, name) != NULL)
-+            {
-+              g_debug ("Not loading %s, it was already loaded from another directory", name);
-+              continue;
-+            }
- 
-+          g_hash_table_insert (loaded_files, g_strdup (name), g_strdup (dir_path));
-+        }
-+
-+      g_dir_close (dir);
-+    }
-+  list = g_hash_table_get_keys (loaded_files);
-+  list = g_list_sort(list, (GCompareFunc) g_str_equal);
-   for (l = list; l != NULL; l = l->next)
-     {
--        gchar *path;
--
--    path = g_build_filename (MATECC_KEYBINDINGS_DIR, l->data, NULL);
--        append_keys_to_tree_from_file (builder, path, wm_keybindings);
--    g_free (l->data);
--    g_free (path);
-+      g_autofree gchar *path = NULL;
-+      path = g_build_filename (g_hash_table_lookup (loaded_files, l->data), l->data, NULL);
-+      g_debug ("Keybinding file: %s", path);
-+      append_keys_to_tree_from_file (builder, path, wm_keybindings);
-     }
-   g_list_free (list);
-+  g_hash_table_destroy (loaded_files);
- 
-   /* Load custom shortcuts _after_ system-provided ones,
-    * since some of the custom shortcuts may also be listed

From 2edf5522dd82a645d401bd588ecfad8015ec2fd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:20 -0300
Subject: [PATCH 0445/4636] mate.mate-desktop: 1.22.2 -> 1.24.0

---
 pkgs/desktops/mate/mate-desktop/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix
index 2dca83bcd46e..48d672a64782 100644
--- a/pkgs/desktops/mate/mate-desktop/default.nix
+++ b/pkgs/desktops/mate/mate-desktop/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-desktop";
-  version = "1.22.2";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "18w5r9p3bqpvxqqy2am7z686xf65cz5vhj247kki8s2yvvap6rlh";
+    sha256 = "0l4bbj6nz315s5ndq5sw1jcgi3s1whk59bj12c4mbpsvmlb33adg";
   };
 
   nativeBuildInputs = [
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Library with common API for various MATE modules";
-    homepage = https://mate-desktop.org;
+    homepage = "https://mate-desktop.org";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = [ maintainers.romildo ];

From 873fb6fe492cbf14e4b7663da814c437c0aa3fd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:20 -0300
Subject: [PATCH 0446/4636] mate.mate-icon-theme: 1.22.2 -> 1.24.0

---
 pkgs/desktops/mate/mate-icon-theme/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix
index d374092c48ac..b639bcf282da 100644
--- a/pkgs/desktops/mate/mate-icon-theme/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-icon-theme";
-  version = "1.22.2";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0r2bk4flb6kjj97badj2lnml4lfwpl2ym5hkf7r6f7cj8g6pzc4r";
+    sha256 = "0a2lz61ivwwcdznmwlmgjr6ipr9sdl5g2czbagnpxkwz8f3m77na";
   };
 
   nativeBuildInputs = [ pkgconfig intltool iconnamingutils ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Icon themes from MATE";
-    homepage = https://mate-desktop.org;
+    homepage = "https://mate-desktop.org";
     license = stdenv.lib.licenses.lgpl3;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.romildo ];

From 3e8fdffd12909e4ed75beb061604ded68bf2b139 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:20 -0300
Subject: [PATCH 0447/4636] mate.mate-indicator-applet: 1.22.1 -> 1.24.0

---
 pkgs/desktops/mate/mate-indicator-applet/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix
index b2e07d0a3e7c..731c1c835729 100644
--- a/pkgs/desktops/mate/mate-indicator-applet/default.nix
+++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-indicator-applet";
-  version = "1.22.1";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "05j5s6r4kx1rbz0j7a7xv38d0kbdi1r8iv8b6nx3lkbkdzq1x0w2";
+    sha256 = "0m7pvbs5hhy5f400wqb8wp0dw3pyjpjnjax9qzc73j97l1k3zawf";
   };
 
   nativeBuildInputs = [
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/mate-desktop/mate-indicator-applet;
+    homepage = "https://github.com/mate-desktop/mate-indicator-applet";
     description = "MATE panel indicator applet";
     longDescription = ''
       A small applet to display information from various applications

From b8facf93add0e0a1c3e003d7b940c9dd3809370a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:20 -0300
Subject: [PATCH 0448/4636] mate.mate-media: 1.22.2 -> 1.24.0

---
 pkgs/desktops/mate/mate-media/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix
index 156a305a63f3..1f1f77ae5189 100644
--- a/pkgs/desktops/mate/mate-media/default.nix
+++ b/pkgs/desktops/mate/mate-media/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-media";
-  version = "1.22.2";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0m8q2rqbxzvh82yj63syd8sbfjrc8y4a8caa42zs66j9x60d1agw";
+    sha256 = "1d5dx79yfqghjaxrdrdh053nfnvkbx8p3ma7j87s7rsvy5irs963";
   };
 
   buildInputs = [
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Media tools for MATE";
-    homepage = https://mate-desktop.org;
+    homepage = "https://mate-desktop.org";
     license = licenses.gpl3;
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo maintainers.chpatrick ];

From 8e031050e04e581a67e435b55a5a5d30f0998e3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:21 -0300
Subject: [PATCH 0449/4636] mate.mate-menus: 1.22.1 -> 1.24.0

---
 pkgs/desktops/mate/mate-menus/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix
index 299c9b0e60f0..93ba4f59efc7 100644
--- a/pkgs/desktops/mate/mate-menus/default.nix
+++ b/pkgs/desktops/mate/mate-menus/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-menus";
-  version = "1.22.1";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0kh6y76f1rhp3nr22rp93bx77wcgqnygag2ir076cqkppayjc3c0";
+    sha256 = "1vv4j38h7mrbfrsj99k25z6y7b5dg30fzd2qnhk7pl8ca8s1jhrd";
   };
 
   nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Menu system for MATE";
-    homepage = https://github.com/mate-desktop/mate-menus;
+    homepage = "https://github.com/mate-desktop/mate-menus";
     license = with licenses; [ gpl2 lgpl2 ];
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];

From 6c63b7a1dc59ff38296b8ab1a242f8b3d08a0ca1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:21 -0300
Subject: [PATCH 0450/4636] mate.mate-netbook: 1.22.2 -> 1.24.0

---
 pkgs/desktops/mate/mate-netbook/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix
index 337e2bfdb3b8..63284bb51884 100644
--- a/pkgs/desktops/mate/mate-netbook/default.nix
+++ b/pkgs/desktops/mate/mate-netbook/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-netbook";
-  version = "1.22.2";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0m38v2276s2d3zs7smxyf70nyl7bcwp5665zgva28lvs8ip3gijx";
+    sha256 = "1bmk9gq5gcqkvfppa7i1hqfph8sajc3xs189s4ha97g0ifwd98a8";
   };
 
   nativeBuildInputs = [
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       Installing these utilities is recommended for netbooks and similar
       devices with low resolution displays.
     '';
-    homepage = https://mate-desktop.org;
+    homepage = "https://mate-desktop.org";
     license = with licenses; [ gpl3 lgpl2Plus ];
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];

From 8fdadaed8d9bbbc8cd80b04d155ddad057f37bde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:21 -0300
Subject: [PATCH 0451/4636] mate.mate-notification-daemon: 1.22.1 -> 1.24.0

---
 .../mate/mate-notification-daemon/default.nix         | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix
index a83bbcb3ffbf..e1e276d1b190 100644
--- a/pkgs/desktops/mate/mate-notification-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix
@@ -1,18 +1,19 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, libcanberra-gtk3,
-  libnotify, libwnck3, gtk3, wrapGAppsHook }:
+  libnotify, libwnck3, gtk3, libxml2, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "mate-notification-daemon";
-  version = "1.22.1";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0f8m3m94iqj2x61dzwwvwq2qlsl2ma8pqr6rfns5pzd0nj0waz0m";
+    sha256 = "0y362b51lb8nq2cw254qc39x8hpficn5rxddzp0fxqxakrh7vcif";
   };
 
   nativeBuildInputs = [
     pkgconfig
     intltool
+    libxml2 # for xmllint
     wrapGAppsHook
   ];
 
@@ -26,8 +27,8 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
 
   meta = with stdenv.lib; {
-    description = "Notification daemon for MATE";
-    homepage = https://github.com/mate-desktop/mate-notification-daemon;
+    description = "Notification daemon for MATE Desktop";
+    homepage = "https://github.com/mate-desktop/mate-notification-daemon";
     license = licenses.gpl2;
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];

From 5440c15b3c1ebf95190a0f3a90fd7b5ff7261cc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:21 -0300
Subject: [PATCH 0452/4636] mate.mate-panel: 1.22.2 -> 1.24.0

---
 pkgs/desktops/mate/mate-panel/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix
index 06e9b386adb4..7436415ff6d4 100644
--- a/pkgs/desktops/mate/mate-panel/default.nix
+++ b/pkgs/desktops/mate/mate-panel/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-panel";
-  version = "1.22.2";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1sm0fniywcxg8rbakhhc37bamwq1x3jqqyaqcvqwxvm6jg1hc97y";
+    sha256 = "1hrh10pqk8mva1ix2nmsp3cbbn81cgqy0b9lqhsl0b5p0s40i7in";
   };
 
   nativeBuildInputs = [
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "The MATE panel";
-    homepage = https://github.com/mate-desktop/mate-panel;
+    homepage = "https://github.com/mate-desktop/mate-panel";
     license = with licenses; [ gpl2 lgpl2 ];
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];

From cad58c2d8c1fc65c40348ac806451dd6a76e3c8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:22 -0300
Subject: [PATCH 0453/4636] mate.mate-polkit: 1.22.0 -> 1.24.0

---
 pkgs/desktops/mate/mate-polkit/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix
index e11bcb102573..8847046dd956 100644
--- a/pkgs/desktops/mate/mate-polkit/default.nix
+++ b/pkgs/desktops/mate/mate-polkit/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-polkit";
-  version = "1.22.0";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "02r8n71xflhvw2hsf6g4svdahzyg3r4n6xamasyzqfhyn0mqmjy0";
+    sha256 = "1450bqzlnvwy3xa98lj102j2cf7piqbxcd1cy2zp41rdl8ri3gvn";
   };
 
   nativeBuildInputs = [
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Integrates polkit authentication for MATE desktop";
-    homepage = https://mate-desktop.org;
+    homepage = "https://mate-desktop.org";
     license = [ licenses.gpl2Plus ];
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];

From 107711cf81b4e6660b81ba713e4c4e2c2e90adfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:22 -0300
Subject: [PATCH 0454/4636] mate.mate-power-manager: 1.22.2 -> 1.24.0

---
 .../mate/mate-power-manager/default.nix       | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix
index 3f84e60f9b65..2e9a04ff8553 100644
--- a/pkgs/desktops/mate/mate-power-manager/default.nix
+++ b/pkgs/desktops/mate/mate-power-manager/default.nix
@@ -1,14 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "mate-power-manager";
-  version = "1.22.2";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "12pnj7y01k1fhfhswxmf6q9yyb0772am5anm338hzfhjp0lcxlbn";
+    sha256 = "1h6wm8vna97iayhwqh7rfsc87715np12nxa72w27p4zl54bdkdlg";
   };
 
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    libtool
+    wrapGAppsHook
+  ];
+
   buildInputs = [
      glib
      itstool
@@ -19,23 +26,17 @@ stdenv.mkDerivation rec {
      libnotify
      dbus-glib
      upower
+     polkit
      mate.mate-panel
   ];
 
-  nativeBuildInputs = [
-    pkgconfig
-    intltool
-    libtool
-    wrapGAppsHook
-  ];
-
   configureFlags = [ "--enable-applets" ];
 
   meta = with stdenv.lib; {
     description = "The MATE Power Manager";
-    homepage = https://mate-desktop.org;
+    homepage = "https://mate-desktop.org";
     license = licenses.gpl3;
     platforms = platforms.unix;
-    maintainers = [ maintainers.romildo maintainers.chpatrick ];
+    maintainers = with maintainers; [ romildo chpatrick ];
   };
 }

From b1b0a4ce98ca0da93d023724cb5fd2acfda0b7db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:22 -0300
Subject: [PATCH 0455/4636] mate.mate-screensaver: 1.22.2 -> 1.24.0

---
 pkgs/desktops/mate/mate-screensaver/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix
index 23e8080f01f0..3c5216ec8f39 100644
--- a/pkgs/desktops/mate/mate-screensaver/default.nix
+++ b/pkgs/desktops/mate/mate-screensaver/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus-glib, libXScrnSaver, libnotify, pam, systemd, mate, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "mate-screensaver";
-  version = "1.22.2";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1y8828g4bys8y4r5y478z6i7dgdqm2wkymi5fq75vxx4lzq919cb";
+    sha256 = "0gpw6x9d0b77f14vjl7ghq5dya1mwcnvmgigg00manfwlksr5zby";
   };
 
   nativeBuildInputs = [
     pkgconfig
     intltool
+    libxml2 # provides xmllint
     wrapGAppsHook
   ];
 
@@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Screen saver and locker for the MATE desktop";
-    homepage = https://mate-desktop.org;
+    homepage = "https://mate-desktop.org";
     license = with licenses; [ gpl2Plus lgpl2Plus ];
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];

From a9abcf28a9785d87f7e75b6c5caba8c2714fc123 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:22 -0300
Subject: [PATCH 0456/4636] mate.mate-sensors-applet: 1.22.1 -> 1.24.0

---
 pkgs/desktops/mate/mate-sensors-applet/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix
index 0c20880d7ecc..1f401c8e5614 100644
--- a/pkgs/desktops/mate/mate-sensors-applet/default.nix
+++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-sensors-applet";
-  version = "1.22.1";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0rv19jxxviqqwk2wlhxlm98jsxa26scvs7ilp2i6plhn3ap2alq3";
+    sha256 = "1izjgzj3xb93arim8w891x8as85phdmlhdnr2yc8ixg7xpblsq2s";
   };
 
   nativeBuildInputs = [
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/mate-desktop/mate-sensors-applet;
+    homepage = "https://github.com/mate-desktop/mate-sensors-applet";
     description = "MATE panel applet for hardware sensors";
     license = with licenses; [ gpl2Plus ];
     platforms = platforms.linux;

From d1353577654ddd165d35d640ecc23557475c8824 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:22 -0300
Subject: [PATCH 0457/4636] mate.mate-session-manager: 1.22.3 -> 1.24.0

---
 pkgs/desktops/mate/mate-session-manager/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix
index 61dec6b34845..6fe1996c6b56 100644
--- a/pkgs/desktops/mate/mate-session-manager/default.nix
+++ b/pkgs/desktops/mate/mate-session-manager/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, pkgconfig, intltool, xtrans, dbus-glib, systemd,
-  libSM, libXtst, gtk3, hicolor-icon-theme, mate,
+  libSM, libXtst, gtk3, epoxy, polkit, hicolor-icon-theme, mate,
   wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
   pname = "mate-session-manager";
-  version = "1.22.3";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1ys26af75xl1psck8v32gygxipd8ms1xgpvdhwmnj7bqhabhh249";
+    sha256 = "01scj5d1xlri9b2id8gm9kfni9nzhdjdf7rag7fvcxwqp7baz3h3";
   };
 
   nativeBuildInputs = [
@@ -27,11 +27,13 @@ stdenv.mkDerivation rec {
     gtk3
     mate.mate-desktop
     hicolor-icon-theme
+    epoxy
+    polkit
   ];
 
   meta = with stdenv.lib; {
     description = "MATE Desktop session manager";
-    homepage = https://github.com/mate-desktop/mate-session-manager;
+    homepage = "https://github.com/mate-desktop/mate-session-manager";
     license = with licenses; [ gpl2 lgpl2 ];
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];

From 4f501cdebca3ad7ceef14f9795551b1e60e6ff53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:23 -0300
Subject: [PATCH 0458/4636] mate.mate-settings-daemon: 1.22.1 -> 1.24.0

---
 .../mate/mate-settings-daemon/default.nix       | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix
index f126918afca8..2eff667511d7 100644
--- a/pkgs/desktops/mate/mate-settings-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix
@@ -1,27 +1,18 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, dbus-glib, libxklavier,
   libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate,
   pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio,
-  wrapGAppsHook, fetchpatch, autoreconfHook }:
+  wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "mate-settings-daemon";
-  version = "1.22.1";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0idw02z0iig0pfxvlhc4dq4sr7kl1w50xscvg0jzzswnxid2l4ip";
+    sha256 = "1hc5a36wqpjv9i2lgrn1h12s8y910xab3phx5vzbzq47kj6m3gw9";
   };
 
-  patches = [
-    # Don't use etc/dbus-1/system.d
-    (fetchpatch {
-      url = "https://patch-diff.githubusercontent.com/raw/mate-desktop/mate-settings-daemon/pull/296.patch";
-      sha256 = "00dfn8h47zw3wr7yya82vvp19wsw51whn8jwgayn4hkjd161s9nm";
-    })
-  ];
-
   nativeBuildInputs = [
-    autoreconfHook # drop with the above patch
     intltool
     pkgconfig
     wrapGAppsHook
@@ -47,7 +38,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "MATE settings daemon";
-    homepage = https://github.com/mate-desktop/mate-settings-daemon;
+    homepage = "https://github.com/mate-desktop/mate-settings-daemon";
     license = with licenses; [ gpl2 lgpl21 ];
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];

From 7a390eae5799cbd43e6d6d5b62fbca1918796d46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:23 -0300
Subject: [PATCH 0459/4636] mate.mate-system-monitor: 1.22.2 -> 1.24.0

---
 pkgs/desktops/mate/mate-system-monitor/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix
index 982d2d77b3ee..ce281ebdda1b 100644
--- a/pkgs/desktops/mate/mate-system-monitor/default.nix
+++ b/pkgs/desktops/mate/mate-system-monitor/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, systemd, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "mate-system-monitor";
-  version = "1.22.2";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1d4l5rv01343jf8bk2j5hxvrbp3d705nd4v2pdrjn4h5dw8nxsl1";
+    sha256 = "1cb36lrsn4fhsryl2kl4yq0qhp1p4r7k21w3fc2ywjga8fdxx6y5";
   };
 
   nativeBuildInputs = [
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
     libgtop
     libwnck3
     librsvg
+    polkit
     systemd
   ];
 
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "System monitor for the MATE desktop";
-    homepage = https://mate-desktop.org;
+    homepage = "https://mate-desktop.org";
     license = [ licenses.gpl2Plus ];
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];

From fd6551f156df4c307c729d71d55753722761cbb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:23 -0300
Subject: [PATCH 0460/4636] mate.mate-terminal: 1.22.1 -> 1.24.0

---
 pkgs/desktops/mate/mate-terminal/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix
index 905e56438988..1100bd4d241e 100644
--- a/pkgs/desktops/mate/mate-terminal/default.nix
+++ b/pkgs/desktops/mate/mate-terminal/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-terminal";
-  version = "1.22.1";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "08210ry5lrivsgzqpdaxrchhpj0n5s1q0x4pxmwdpnksjpcj11mn";
+    sha256 = "0nc23nmbkya2fgf7j65z85dcibwi5akkr8nscqrvk039ckirhk97";
   };
 
   buildInputs = [
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "The MATE Terminal Emulator";
-    homepage = https://mate-desktop.org;
+    homepage = "https://mate-desktop.org";
     license = licenses.gpl3;
     platforms = platforms.unix;
   };

From c80bec5de7b9202ada2febffc3bd88ceea07f445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:23 -0300
Subject: [PATCH 0461/4636] mate.mate-user-guide: 1.22.3 -> 1.24.0

---
 pkgs/desktops/mate/mate-user-guide/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix
index 386b53837b16..d635fa8da6db 100644
--- a/pkgs/desktops/mate/mate-user-guide/default.nix
+++ b/pkgs/desktops/mate/mate-user-guide/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-user-guide";
-  version = "1.22.3";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0zv8arsxnbab0qk3ck9i1wp3d4gfclcv6vq6nh5i8zjz6rpp9cjs";
+    sha256 = "0ddxya84iydvy85dbqls0wmz2rph87wri3rsdhv4rkbhh5g4sd7f";
   };
 
   nativeBuildInputs = [ itstool intltool libxml2 ];
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "MATE User Guide";
-    homepage = https://mate-desktop.org;
+    homepage = "https://mate-desktop.org";
     license = with licenses; [ gpl2Plus fdl12 ];
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];

From 5306b93657a72ab29f11e702f86d3b7ddf154aa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:23 -0300
Subject: [PATCH 0462/4636] mate.mate-user-share: 1.22.1 -> 1.24.0

---
 pkgs/desktops/mate/mate-user-share/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix
index 7f5e4e10f147..a8777fa4dd72 100644
--- a/pkgs/desktops/mate/mate-user-share/default.nix
+++ b/pkgs/desktops/mate/mate-user-share/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-user-share";
-  version = "1.22.1";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1krsar1pwa8720qz2dckcg0f6z9mvfk49djdxaz1afvi7blmqd6k";
+    sha256 = "1h4aabcby96nsg557brzzb0an1qvnawhim2rinzlzg4fhkvdfnr5";
   };
 
   nativeBuildInputs = [
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "User level public file sharing for the MATE desktop";
-    homepage = https://github.com/mate-desktop/mate-user-share;
+    homepage = "https://github.com/mate-desktop/mate-user-share";
     license = with licenses; [ gpl2Plus ];
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];

From 97ed661278a31811cba21d14f8d5e5f30cc52f38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:23 -0300
Subject: [PATCH 0463/4636] mate.mate-utils: 1.22.2 -> 1.24.0

---
 pkgs/desktops/mate/mate-utils/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix
index 0afeb00610bf..0d4ab907ef2b 100644
--- a/pkgs/desktops/mate/mate-utils/default.nix
+++ b/pkgs/desktops/mate/mate-utils/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, mate, hicolor-icon-theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "mate-utils";
-  version = "1.22.2";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1i6fnm3y1hj8r57x4jpc4ixqs77zln8f7477d0haypflxm3s4kjr";
+    sha256 = "1b16n1628gcsym5mph6lr9x5xm4rgkxsa8xwr2wlx8g2gw2775i1";
   };
 
   nativeBuildInputs = [
@@ -22,13 +22,18 @@ stdenv.mkDerivation rec {
     libgtop
     libcanberra-gtk3
     libxml2
+    udisks2
     mate.mate-panel
     hicolor-icon-theme
   ];
 
+  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Utilities for the MATE desktop";
-    homepage = https://mate-desktop.org;
+    homepage = "https://mate-desktop.org";
     license = with licenses; [ gpl2Plus lgpl2Plus ];
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];

From 096bb530c079bf7697418dc99536f0df359462b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:23 -0300
Subject: [PATCH 0464/4636] mate.mozo: 1.22.2 -> 1.24.0

---
 pkgs/desktops/mate/mozo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix
index 365a471dd7ae..eb5361787a84 100644
--- a/pkgs/desktops/mate/mozo/default.nix
+++ b/pkgs/desktops/mate/mozo/default.nix
@@ -2,14 +2,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "mozo";
-  version = "1.22.2";
+  version = "1.24.0";
 
   format = "other";
   doCheck = false;
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1lzcwsz940v218frwzhpywp1an9x3cgfvqr7r8dplpdapvd0khrs";
+    sha256 = "01lyi47a04xk0by5bvnfmqgv5sysk2wdlri6a4ssmy1qhgwh9zr3";
   };
 
   nativeBuildInputs = [ pkgconfig intltool gobject-introspection wrapGAppsHook ];
@@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     description = "MATE Desktop menu editor";
-    homepage = https://github.com/mate-desktop/mozo;
+    homepage = "https://github.com/mate-desktop/mozo";
     license = with licenses; [ lgpl2Plus ];
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];

From 31c6e56635f2c358b0b1143d7d130308fc7e289e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:24 -0300
Subject: [PATCH 0465/4636] mate.pluma: 1.22.2 -> 1.24.0

---
 pkgs/desktops/mate/pluma/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix
index cb1e3de376ee..f617799bedaf 100644
--- a/pkgs/desktops/mate/pluma/default.nix
+++ b/pkgs/desktops/mate/pluma/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pluma";
-  version = "1.22.2";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1gsj8grdhzb1jvl5zwd8zjc9cj9ys2ndny04gy4bbh80sjaj6xva";
+    sha256 = "1vmndhlhy3qkf3xs5kkv0xhbv5ar25pqz0kp17hc4qhgjzycfr0r";
   };
 
   nativeBuildInputs = [
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Powerful text editor for the MATE desktop";
-    homepage = https://mate-desktop.org;
+    homepage = "https://mate-desktop.org";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.romildo ];

From d0533644fa4deba40d010ef43e8f95c1e152914a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:51:24 -0300
Subject: [PATCH 0466/4636] mate.python-caja: 1.22.1 -> 1.24.0

---
 pkgs/desktops/mate/python-caja/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix
index c566c8a6953a..041bd3e121c1 100644
--- a/pkgs/desktops/mate/python-caja/default.nix
+++ b/pkgs/desktops/mate/python-caja/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "python-caja";
-  version = "1.22.1";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "07hkvs4a6anrvh28zjsrj8anbcz32p19hslhq66yhcvh0hh4kvqk";
+    sha256 = "1wp61q64cgzr3syd3niclj6rjk87wlib5m86i0myf5ph704r3qgg";
   };
 
   nativeBuildInputs = [
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Python binding for Caja components";
-    homepage = https://github.com/mate-desktop/python-caja;
+    homepage = "https://github.com/mate-desktop/python-caja";
     license = [ licenses.gpl2Plus ];
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];

From d5a1f3616660a86f503cf882f9fde5d8fdcf10d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:52:08 -0300
Subject: [PATCH 0467/4636] mate.mate-icon-theme-faenza: quote homepage

---
 pkgs/desktops/mate/mate-icon-theme-faenza/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
index a4fa6fedae32..dd8b5662119c 100644
--- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Faenza icon theme from MATE";
-    homepage = https://mate-desktop.org;
+    homepage = "https://mate-desktop.org";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.romildo ];

From badd457e8cbe078cb53d2048d342ad5921802e3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 14:53:06 -0300
Subject: [PATCH 0468/4636] mate.mate-themes: quote homepage

---
 pkgs/desktops/mate/mate-themes/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index c994513273b7..8a444702f638 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A set of themes from MATE";
-    homepage = https://mate-desktop.org;
+    homepage = "https://mate-desktop.org";
     license = stdenv.lib.licenses.lgpl21;
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.romildo ];

From 95ae0156149fc9475340c45c722c5110b204123b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 15:01:21 -0300
Subject: [PATCH 0469/4636] mate.atril: add maintainer

---
 pkgs/desktops/mate/atril/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix
index b12a543d11c2..4d402ffd9f5a 100644
--- a/pkgs/desktops/mate/atril/default.nix
+++ b/pkgs/desktops/mate/atril/default.nix
@@ -32,10 +32,11 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "cajaextensiondir=$$out/lib/caja/extensions-2.0" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A simple multi-page document viewer for the MATE desktop";
     homepage = "https://mate-desktop.org";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
   };
 }

From 8aa38e74d07a1b5657de3fe8cc9017ff1474143c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 12 Feb 2020 15:02:59 -0300
Subject: [PATCH 0470/4636] mate.mate-terminal: add maintainer

---
 pkgs/desktops/mate/mate-terminal/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix
index 1100bd4d241e..f09c119fc817 100644
--- a/pkgs/desktops/mate/mate-terminal/default.nix
+++ b/pkgs/desktops/mate/mate-terminal/default.nix
@@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
     homepage = "https://mate-desktop.org";
     license = licenses.gpl3;
     platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
   };
 }

From c5b84649258e65f0ed5d0339adff770097b72cc1 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Wed, 12 Feb 2020 19:14:10 +0100
Subject: [PATCH 0471/4636] glide: 0.12.3 -> 0.13.3

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

diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix
index 930043489813..913c02125599 100644
--- a/pkgs/development/tools/glide/default.nix
+++ b/pkgs/development/tools/glide/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "glide";
-  version = "0.12.3";
+  version = "0.13.3";
 
   goPackagePath = "github.com/Masterminds/glide";
 
@@ -15,7 +15,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "Masterminds";
     repo = "glide";
-    sha256 = "0hvfikvxfk94aqms1bdxqxqpamzy0v8binv5jwglzw2sf2437ww0";
+    sha256 = "1wskg1cxqy9sp0738qiiagdw09dbs3swxsk4z6w5hsfiq2h44a54";
   };
 
   meta = with stdenv.lib; {

From ed5f25f6a19d0ac280c6894704612d859577700c Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 2 Feb 2020 20:24:23 -0500
Subject: [PATCH 0472/4636] dnnl: run tests, fix install tree

With the new update to 1.2 in https://github.com/NixOS/nixpkgs/pull/79426, some
the install tree coming out of cmake seems to have produced a duplicate copy of
the nix tree.
---
 pkgs/development/libraries/dnnl/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/dnnl/default.nix b/pkgs/development/libraries/dnnl/default.nix
index 4f5e4148baaf..73a6ff77522f 100644
--- a/pkgs/development/libraries/dnnl/default.nix
+++ b/pkgs/development/libraries/dnnl/default.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "17xpdwqjfb2bq586gnk3hq94r06jd8pk6qfs703qqd7155fkbil9";
   };
 
-  # Generic fix upstreamed in https://github.com/intel/mkl-dnn/pull/631
-  # Delete patch when 1.2.0 is released
+  # Generic fix merged upstream in https://github.com/intel/mkl-dnn/pull/631
+  # Delete after next release
   patches = [ (substituteAll {
     src = ./bash-to-sh.patch;
     inherit bash;
@@ -22,12 +22,18 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
+  doCheck = true;
+
   # The test driver doesn't add an RPath to the build libdir
   preCheck = ''
     export LD_LIBRARY_PATH=$PWD/src
   '';
 
-  doCheck = true;
+  # The cmake install gets tripped up and installs a nix tree into $out, in
+  # addition to the correct install; clean it up.
+  postInstall = ''
+    rm -r $out/nix
+  '';
 
   meta = with lib; {
     description = "Deep Neural Network Library (DNNL)";

From 35853d8a1e61ce34721a5f469263cb6b2852c2ff Mon Sep 17 00:00:00 2001
From: Nathan van Doorn <nathan@myrtlesoftware.com>
Date: Wed, 12 Feb 2020 11:50:41 +0000
Subject: [PATCH 0473/4636] metamath: 0.178 -> 0.180

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

diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix
index 2213ace8f572..423352955853 100644
--- a/pkgs/development/interpreters/metamath/default.nix
+++ b/pkgs/development/interpreters/metamath/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation {
   pname = "metamath";
-  version = "0.178";
+  version = "0.180";
 
   buildInputs = [ autoreconfHook ];
 
   src = fetchFromGitHub {
     owner = "metamath";
     repo = "metamath-exe";
-    rev = "4f59d60aeb03f92aea3cc7ecf5a2c0fcf08900a5";
-    sha256 = "0nrl4nzp6rm2sn365xyjf3g5l5fl58kca7rq08lqyz5gla0wgfcf";
+    rev = "469e1b253f29be838411e2cc9c93d7704297059c";
+    sha256 = "0nazi7z8qrpn7nnmxk99ilwf8smkzh26jcvn17wyfnywxpdsb7wa";
   };
 
   # the files necessary to build the DATA target are not in this distribution

From 6a0be96db1684a141aaf4cac33e781598d415ea1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 15:55:37 +0000
Subject: [PATCH 0474/4636] jsonnet: 0.14.0 -> 0.15.0

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

diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix
index d7c05331991d..bc850a53c51e 100644
--- a/pkgs/development/compilers/jsonnet/default.nix
+++ b/pkgs/development/compilers/jsonnet/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "jsonnet";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "google";
     repo = "jsonnet";
-    sha256 = "012zapx0xvlkl2y7dljpdn18gymnmzc4mma2yagf9pxnr286lwrf";
+    sha256 = "06imnpbc5mn1dis051f54q6nq80dbm51nhxmba61rdyhf1131ml8";
   };
 
   enableParallelBuilding = true;

From ac758caff10e98790d5f9df298d0172099268077 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 12 Feb 2020 19:49:26 +0100
Subject: [PATCH 0475/4636] fscrypt-experimental: 0.2.5 -> 0.2.6 (#79853)

Changelog: https://github.com/google/fscrypt/releases/tag/v0.2.6
---
 pkgs/os-specific/linux/fscrypt/default.nix | 32 ++++++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix
index 92594ea99de4..bb04efaf1ca2 100644
--- a/pkgs/os-specific/linux/fscrypt/default.nix
+++ b/pkgs/os-specific/linux/fscrypt/default.nix
@@ -1,22 +1,42 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, pam }:
+{ stdenv, buildGoModule, fetchFromGitHub, gnum4, pam, fscrypt-experimental }:
 
 # Don't use this for anything important yet!
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "fscrypt";
-  version = "0.2.5";
-
-  goPackagePath = "github.com/google/fscrypt";
+  version = "0.2.6";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "fscrypt";
     rev = "v${version}";
-    sha256 = "1jf6363kc9id3ar93znlcglx3llgv01ccp3nlbamm98rm9dps4qk";
+    sha256 = "15pwhz4267kwhkv532k6wgjqfzawawdrrk6vnl017ys5s9ln51a8";
   };
 
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace 'TAG_VERSION := $(shell git describe --tags)' "" \
+      --replace '$(shell date)' '$(shell date --date="@0")' \
+      --replace "/usr/local" "$out"
+  '';
+
+  modSha256 = "110b647q6ljsg5gwlciqv4cddxmk332nahcrpidrpsiqs2yjv1md";
+
+  nativeBuildInputs = [ gnum4 ];
   buildInputs = [ pam ];
 
+  buildPhase = ''
+    make
+  '';
+
+  installPhase = ''
+    make install
+  '';
+
+  preFixup = ''
+    remove-references-to -t ${fscrypt-experimental.go} $out/lib/security/pam_fscrypt.so
+  '';
+
   meta = with stdenv.lib; {
     description =
       "A high-level tool for the management of Linux filesystem encryption";

From 2a975873d86db919edfb975a0ff8d50f495d80d7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 11 Feb 2020 23:12:27 +0000
Subject: [PATCH 0476/4636] urweb: 20190217 -> 20200209

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

diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index 3bdf91449be7..ac324167f97b 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "urweb";
-  version = "20190217";
+  version = "20200209";
 
   src = fetchurl {
     url = "https://github.com/urweb/urweb/releases/download/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1cl0x0sy7w1lazszc8q06q3wx0x0rczxh27vimrsw54s6s9y096s";
+    sha256 = "0qh6wcxfk5kf735i5gqwnkdirnnmqhnnpkfz96gz144dgz2i0c5c";
   };
 
   buildInputs = [ openssl mlton libmysqlclient postgresql sqlite icu ];

From fc9be021c61673ee48a66431eb5063469ef6dfce Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <meurerbernardo@gmail.com>
Date: Wed, 5 Feb 2020 21:42:32 -0800
Subject: [PATCH 0477/4636] vimPlugins: sort

---
 pkgs/misc/vim-plugins/vim-plugin-names | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 0d93fbbb6a7b..ec9d767915c1 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -55,8 +55,8 @@ cocopon/iceberg.vim
 cohama/lexima.vim
 ctjhoa/spacevim
 ctrlpvim/ctrlp.vim
-dag/vim2hs
 dag/vim-fish
+dag/vim2hs
 dannyob/quickfixstatus
 darfink/starsearch.vim
 dart-lang/dart-vim-plugin
@@ -307,8 +307,8 @@ neoclide/coc-neco
 neoclide/coc-pairs
 neoclide/coc-prettier
 neoclide/coc-python
-neoclide/coc-rls
 neoclide/coc-r-lsp
+neoclide/coc-rls
 neoclide/coc-smartf
 neoclide/coc-snippets
 neoclide/coc-solargraph
@@ -324,10 +324,10 @@ neoclide/coc-yaml
 neoclide/coc-yank
 neoclide/vim-easygit
 neomake/neomake
+neovim/nvim-lsp
+neovim/nvimdev.nvim
 neovimhaskell/haskell-vim
 neovimhaskell/nvim-hs.vim
-neovim/nvimdev.nvim
-neovim/nvim-lsp
 neutaaaaan/iosvkem
 nfnty/vim-nftables
 nicoe/deoplete-khard
@@ -497,16 +497,14 @@ Valodim/deoplete-notmuch
 vhda/verilog_systemverilog.vim
 vim-airline/vim-airline
 vim-airline/vim-airline-themes
-vimlab/split-term.vim
-vimoutliner/vimoutliner
 vim-pandoc/vim-pandoc
 vim-pandoc/vim-pandoc-after
 vim-pandoc/vim-pandoc-syntax
 vim-ruby/vim-ruby
+vim-scripts/a.vim
 vim-scripts/align
 vim-scripts/argtextobj.vim
 vim-scripts/autoload_cscope.vim
-vim-scripts/a.vim
 vim-scripts/bats.vim
 vim-scripts/changeColorScheme.vim
 vim-scripts/Colour-Sampler-Pack
@@ -529,6 +527,8 @@ vim-scripts/utl.vim
 vim-scripts/wombat256.vim
 vim-scripts/YankRing.vim
 vim-utils/vim-husk
+vimlab/split-term.vim
+vimoutliner/vimoutliner
 vimwiki/vimwiki
 vito-c/jq.vim
 vmchale/dhall-vim

From b84b386a215b845f1b71db4a564de96b2082aeb2 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <meurerbernardo@gmail.com>
Date: Wed, 5 Feb 2020 21:40:00 -0800
Subject: [PATCH 0478/4636] vimPlugins: update

---
 pkgs/misc/vim-plugins/generated.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 796029e26067..fc027268d1bb 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -1189,12 +1189,12 @@ let
 
   far-vim = buildVimPluginFrom2Nix {
     pname = "far-vim";
-    version = "2020-02-10";
+    version = "2020-02-12";
     src = fetchFromGitHub {
       owner = "brooth";
       repo = "far.vim";
-      rev = "4d1e65c41fbe2b78827dd943f93930f601661bc3";
-      sha256 = "1686vv570w1pljbzcc8yd9shzbbhxny9za80sq41xpd2wvyn1iw1";
+      rev = "e4068a68f740a328c40ed4c7a59a88bfe8033dd8";
+      sha256 = "1h1sr9kkdj712ra777bff8msc42v9k3xwmwjc7favwk71jbx0n5l";
     };
   };
 

From 9af1597d01e6c56e4fd76cb4d41689d436db0642 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <meurerbernardo@gmail.com>
Date: Wed, 5 Feb 2020 21:41:23 -0800
Subject: [PATCH 0479/4636] vimPlugins.arcanist-vim: init at 2016-05-27

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index fc027268d1bb..04df1e48436f 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -103,6 +103,17 @@ let
     };
   };
 
+  arcanist-vim = buildVimPluginFrom2Nix {
+    pname = "arcanist-vim";
+    version = "2016-05-27";
+    src = fetchFromGitHub {
+      owner = "solarnz";
+      repo = "arcanist.vim";
+      rev = "bd59e799e838c8d946d33142104b2db625dc15d6";
+      sha256 = "11v7gqa5rnv28q0i3d02g9sw22gkjn10afvjx7bg352d91knxn9m";
+    };
+  };
+
   argtextobj-vim = buildVimPluginFrom2Nix {
     pname = "argtextobj-vim";
     version = "2010-10-18";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index ec9d767915c1..7df33ee2f5c4 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -422,6 +422,7 @@ sjl/gundo.vim
 sjl/splice.vim
 sk1418/last256
 slashmili/alchemist.vim
+solarnz/arcanist.vim
 sonph/onehalf
 stefandtw/quickfix-reflector.vim
 stephpy/vim-yaml

From fc7f856287e2985e1646b79e2b594402658a4448 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <meurerbernardo@gmail.com>
Date: Sat, 8 Feb 2020 14:20:52 -0800
Subject: [PATCH 0480/4636] vimPlugins.vim-phabricator: init at 2020-01-23

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 04df1e48436f..e4c077483568 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -4876,6 +4876,17 @@ let
     };
   };
 
+  vim-phabricator = buildVimPluginFrom2Nix {
+    pname = "vim-phabricator";
+    version = "2020-01-23";
+    src = fetchFromGitHub {
+      owner = "jparise";
+      repo = "vim-phabricator";
+      rev = "065c7e3f2d92a6792b50f087393b2c9a10a1e825";
+      sha256 = "0yhf347fhrs0aqsq1swqihyav32442lv2chzjr3mzqcym8zbzsh6";
+    };
+  };
+
   vim-plug = buildVimPluginFrom2Nix {
     pname = "vim-plug";
     version = "2020-01-27";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 7df33ee2f5c4..0fc5edffe486 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -164,6 +164,7 @@ jonsmithers/vim-html-template-literals
 joonty/vim-xdebug
 josa42/coc-go
 jpalardy/vim-slime
+jparise/vim-phabricator
 jreybert/vimagit
 jsfaint/gen_tags.vim
 JuliaEditorSupport/deoplete-julia

From 1c6b1d160ecc2952b3d0d13a184c72366907599a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 21:15:22 +0000
Subject: [PATCH 0481/4636] libratbag: 0.12 -> 0.13

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

diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix
index 9c926800c303..63220846f0ce 100644
--- a/pkgs/os-specific/linux/libratbag/default.nix
+++ b/pkgs/os-specific/linux/libratbag/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libratbag";
-  version = "0.12";
+  version = "0.13";
 
   src = fetchFromGitHub {
     owner  = "libratbag";
     repo   = "libratbag";
     rev    = "v${version}";
-    sha256 = "00m0f87fqf5i2yvlz5r02f55fbcb13kwlkqx8m69zwya8jhv0j7d";
+    sha256 = "18y8mfr63d91278m1kcid0wvrxa1sgjs8na9af1ks2n28ssvciwq";
   };
 
   nativeBuildInputs = [

From a98456b7b6818b149c561a9b2cc98169a6ea5eb1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 21:27:47 +0000
Subject: [PATCH 0482/4636] libmypaint: 1.4.0 -> 1.5.0

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

diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix
index c36633edfff3..32251afffde5 100644
--- a/pkgs/development/libraries/libmypaint/default.nix
+++ b/pkgs/development/libraries/libmypaint/default.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libmypaint";
-  version = "1.4.0";
+  version = "1.5.0";
 
   outputs = [ "out" "dev" ];
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     owner = "mypaint";
     repo = "libmypaint";
     rev = "v${version}";
-    sha256 = "1ynm2g2wdb9zsymncndlgs6gpcbsa122n52d11161jrj5nrdliaq";
+    sha256 = "06szsadj589vlvn33gzybygdknsaahr4cpigh2xyg8mr3h9ngqrl";
   };
 
   nativeBuildInputs = [

From 3182fbdeaae38dd20c1420a23a2c5f99566f280f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 12 Feb 2020 22:43:35 +0100
Subject: [PATCH 0483/4636] nixos/release.nix: Import './..' instead of nixpkgs

'nixpkgs' is a result of a call to cleanSource, which is very
expensive and fails in --dry-run mode.
---
 nixos/release.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index 512ba7143977..6107f3529715 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -20,7 +20,7 @@ let
   allTestsForSystem = system:
     import ./tests/all-tests.nix {
       inherit system;
-      pkgs = import nixpkgs { inherit system; };
+      pkgs = import ./.. { inherit system; };
       callTest = t: {
         ${system} = hydraJob t.test;
       };
@@ -28,7 +28,7 @@ let
   allTests =
     foldAttrs recursiveUpdate {} (map allTestsForSystem supportedSystems);
 
-  pkgs = import nixpkgs { system = "x86_64-linux"; };
+  pkgs = import ./.. { system = "x86_64-linux"; };
 
 
   versionModule =
@@ -41,7 +41,7 @@ let
   makeIso =
     { module, type, system, ... }:
 
-    with import nixpkgs { inherit system; };
+    with import ./.. { inherit system; };
 
     hydraJob ((import lib/eval-config.nix {
       inherit system;
@@ -54,7 +54,7 @@ let
   makeSdImage =
     { module, system, ... }:
 
-    with import nixpkgs { inherit system; };
+    with import ./.. { inherit system; };
 
     hydraJob ((import lib/eval-config.nix {
       inherit system;
@@ -65,7 +65,7 @@ let
   makeSystemTarball =
     { module, maintainers ? ["viric"], system }:
 
-    with import nixpkgs { inherit system; };
+    with import ./.. { inherit system; };
 
     let
 
@@ -188,7 +188,7 @@ in rec {
   # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF).
   ova = forMatchingSystems [ "x86_64-linux" ] (system:
 
-    with import nixpkgs { inherit system; };
+    with import ./.. { inherit system; };
 
     hydraJob ((import lib/eval-config.nix {
       inherit system;
@@ -204,7 +204,7 @@ in rec {
   # A disk image that can be imported to Amazon EC2 and registered as an AMI
   amazonImage = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system:
 
-    with import nixpkgs { inherit system; };
+    with import ./.. { inherit system; };
 
     hydraJob ((import lib/eval-config.nix {
       inherit system;

From ddf22e78846a34f865ba02036ec40012efec1af4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 22:07:28 +0000
Subject: [PATCH 0484/4636] man-pages: 5.04 -> 5.05

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

diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index b4435fb911fa..c57526d307a7 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "man-pages";
-  version = "5.04";
+  version = "5.05";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz";
-    sha256 = "1bx4ws24bjq6iyfyilg7aih5f0qrhy9l97ksrwcd4yxvjh8gn13x";
+    sha256 = "0izb6shcczvg37cyd3kzxsfsrffqj1qw9nqhhq9mi4kd36qkbcfm";
   };
 
   makeFlags = [ "MANDIR=$(out)/share/man" ];

From 036a1b2755369fd4b1931c49a73958a69cc8f58f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 14:16:37 -0800
Subject: [PATCH 0485/4636] latte-dock: 0.9.7 -> 0.9.8.1 (#79533)

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

diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix
index d7d23853e115..45b788a9489a 100644
--- a/pkgs/applications/misc/latte-dock/default.nix
+++ b/pkgs/applications/misc/latte-dock/default.nix
@@ -3,11 +3,11 @@
 
 mkDerivation rec {
   pname = "latte-dock";
-  version = "0.9.7";
+  version = "0.9.8.1";
 
   src = fetchurl {
     url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "1b8yz6r6x46xajx900m8s0sjfwiwbpp6nfb780ygfcz6inb1234q";
+    sha256 = "10x5aplkjyi2w0793whjjzi777ffh3m4d0sp06qzkpx8jqd46him";
     name = "${pname}-${version}.tar.xz";
   };
 

From 0b3e5db5d364d278791f84979ea084e74a76debe Mon Sep 17 00:00:00 2001
From: Puck Meerburg <puck@puckipedia.com>
Date: Wed, 12 Feb 2020 22:31:31 +0000
Subject: [PATCH 0486/4636] signal-desktop: fix notifications

---
 .../networking/instant-messengers/signal-desktop/default.nix     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index d7e70b584c21..c5921e645f03 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -80,6 +80,7 @@ in stdenv.mkDerivation rec {
 
   runtimeDependencies = [
     systemd.lib
+    libnotify
   ];
 
   unpackPhase = "dpkg-deb -x $src .";

From b35ae1f9fa014c111d4184e5ce6d68abf857f496 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 12 Feb 2020 18:00:00 -0500
Subject: [PATCH 0487/4636] mutagen: 0.10.3 -> 0.11.0

Changelog: https://github.com/mutagen-io/mutagen/releases/tag/v0.11.0
---
 pkgs/tools/misc/mutagen/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix
index 3c355dbddf31..9514ca18b9d9 100644
--- a/pkgs/tools/misc/mutagen/default.nix
+++ b/pkgs/tools/misc/mutagen/default.nix
@@ -2,22 +2,23 @@
 
 buildGoModule rec {
   pname = "mutagen";
-  version = "0.10.3";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "mutagen-io";
     repo = pname;
     rev = "v${version}";
-    sha256 = "18wjzylxypvisfdmmwqc8g9vd9w7iyhs8irad1ksf7fhwz9w188m";
+    sha256 = "19rr2q7kfkivjj23vv3s249jifx9hipi3zwzr2550v9jb4372x1r";
   };
 
-  modSha256 = "0zb6wqfgp5v0hpm8ad6s9lc1n3wayyqindv4vfkmp3980ikb8qwx";
+  modSha256 = "1r6b4y6civk75if6nljl66pgv5qm7x05qqby1anf7s7cz7d1rc3g";
 
   subPackages = [ "cmd/mutagen" "cmd/mutagen-agent" ];
 
   meta = with lib; {
     description = "Make remote development work with your local tools";
     homepage = "https://mutagen.io/";
+    changelog = "https://github.com/mutagen-io/mutagen/releases/tag/v${version}";
     maintainers = [ maintainers.marsam ];
     license = licenses.mit;
   };

From cf8bb29287789bac582bffa3ddfda422eed2dac6 Mon Sep 17 00:00:00 2001
From: Andrew Abbott <mirrexagon@mirrexagon.com>
Date: Thu, 13 Feb 2020 10:27:23 +1100
Subject: [PATCH 0488/4636] godot: 3.1.2 -> 3.2

---
 pkgs/development/tools/godot/default.nix                   | 4 ++--
 .../development/tools/godot/dont_clobber_environment.patch | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index e31d27f710bc..56b81f494e15 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -10,13 +10,13 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "godot";
-  version = "3.1.2";
+  version = "3.2";
 
   src = fetchFromGitHub {
     owner  = "godotengine";
     repo   = "godot";
     rev    = "${version}-stable";
-    sha256 = "12305wj2i4067jc50l8r0wmb7zjcna24fli8vb8kiaild0jrlip6";
+    sha256 = "0f15izjl4i2xlz1xj5pcslzl9gm3rmr3c21gh256ynpi2zhhkcdd";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/tools/godot/dont_clobber_environment.patch b/pkgs/development/tools/godot/dont_clobber_environment.patch
index 96a8464b5668..3782aced1a4f 100644
--- a/pkgs/development/tools/godot/dont_clobber_environment.patch
+++ b/pkgs/development/tools/godot/dont_clobber_environment.patch
@@ -11,7 +11,6 @@
 +    if (k in os.environ):
 +        env_base["ENV"][k] = os.environ[k]
 +
- env_base.android_maven_repos = []
- env_base.android_flat_dirs = []
- env_base.android_dependencies = []
-
+ env_base.disabled_modules = []
+ env_base.use_ptrcall = False
+ env_base.module_version_string = ""

From 523ea83cec773ba5c1816e19334972c59dfd8060 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Feb 2020 00:01:08 +0000
Subject: [PATCH 0489/4636] mercurial: 5.2.2 -> 5.3

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

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 6b9ada0ebb08..3edfe3994347 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -8,11 +8,11 @@ let
 
 in python3Packages.buildPythonApplication rec {
   pname = "mercurial";
-  version = "5.2.2";
+  version = "5.3";
 
   src = fetchurl {
     url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
-    sha256 = "0fy00q0k4f0q64jjlnb7cl6m0sglivq9jgdddsp5sywc913zzigz";
+    sha256 = "1fgr8k2ra7hs2dm8048pw01anmd41as246a5vm4m2sb7dcfzczz5";
   };
 
   format = "other";

From b5f1046892ba766eb265e414092ca9f89c1cd414 Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Thu, 13 Feb 2020 08:06:30 +0800
Subject: [PATCH 0490/4636] cargo-xbuild: 0.5.21 -> 0.5.24

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

diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/development/tools/rust/cargo-xbuild/default.nix
index 56cb5560f946..11ee7b584df4 100644
--- a/pkgs/development/tools/rust/cargo-xbuild/default.nix
+++ b/pkgs/development/tools/rust/cargo-xbuild/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-xbuild";
-  version = "0.5.21";
+  version = "0.5.24";
 
   src = fetchFromGitHub {
     owner = "rust-osdev";
     repo = pname;
     rev = "v${version}";
-    sha256 = "08mpnj3l6bcm1jg22lw1gcs0lkm4320fwl4p5y1s44w64963kzf7";
+    sha256 = "1haq8gv4k6qgihyjplf76589d2hbb1720g6yvwk88aksjxmqj4jm";
   };
 
-  cargoSha256 = "1pj4x8y5vfpnn8vhxqqm3vicn29870r3jh0b17q3riq4vz1a2afp";
+  cargoSha256 = "011r5n68ay94dvfm37xpd9s8x086l6qsll74iw98hcvw3inxp1ws";
 
   meta = with stdenv.lib; {
     description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc";

From f2f9f509eaf7010198dc43bae37ac636a079558c Mon Sep 17 00:00:00 2001
From: xrelkd <46590321+xrelkd@users.noreply.github.com>
Date: Thu, 13 Feb 2020 08:14:36 +0800
Subject: [PATCH 0491/4636] cargo-sweep: 0.4.1 -> 0.5.0

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

diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/pkgs/development/tools/rust/cargo-sweep/default.nix
index a6068a96dc7e..8707cd593fda 100644
--- a/pkgs/development/tools/rust/cargo-sweep/default.nix
+++ b/pkgs/development/tools/rust/cargo-sweep/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-sweep";
-  version = "0.4.1";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "holmgr";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1zp0x0jy5bjqbxawlwvpj6vb3y602mnh19p48rw70kdx6vripbvj";
+    sha256 = "0zwdrh4z5x79qs8cwmwh3phzy4brw0ggv2qyf6pylv99vha5acyf";
   };
 
-  cargoSha256 = "1j5i4gp5mspgb8l6a25lqlyr5c16pchbh3g3yn8h1qlxj8g2vgnh";
+  cargoSha256 = "09n0s275iskvg0n3gxbl47qfw00wfpvxyrf2iakkznyxjgbaxh4l";
 
   meta = with stdenv.lib; {
     description = "A Cargo subcommand for cleaning up unused build files generated by Cargo";

From 3b99307f9b56da3b76a7bab3bfb6f79c4a5b0535 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 12 Feb 2020 18:45:52 -0600
Subject: [PATCH 0492/4636] ell: 0.27 -> 0.28

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

diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix
index 5cbddac82f01..e811dc1bc386 100644
--- a/pkgs/os-specific/linux/ell/default.nix
+++ b/pkgs/os-specific/linux/ell/default.nix
@@ -7,14 +7,14 @@
 
 stdenv.mkDerivation rec {
   pname = "ell";
-  version = "0.27";
+  version = "0.28";
 
   outputs = [ "out" "dev" ];
 
   src = fetchgit {
      url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git";
      rev = version;
-     sha256 = "0pr9c4h535ggj54zfah9m3wziiwlig7r1hxpfx16s2s11ylrl9gd";
+     sha256 = "1am3ghji271364vmf2w5sxskvlhh4r2mwakza7vjjph16cvsv6a7";
   };
 
   patches = [

From 5f51a18863e76f53924c1246eda31e0cac7bfe52 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 12 Feb 2020 18:45:59 -0600
Subject: [PATCH 0493/4636] iwd: 1.4 -> 1.5

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

diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index 8e1bbd374cfb..85dc6a1ba0c4 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -13,12 +13,12 @@
 
 stdenv.mkDerivation rec {
   pname = "iwd";
-  version = "1.4";
+  version = "1.5";
 
   src = fetchgit {
     url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
     rev = version;
-    sha256 = "13sig2lbiyi4x74ag37gvdqx5w18w6hmq9hc1ir4a1cqqf50v61v";
+    sha256 = "09viyfv5j2rl6ly52b2xlc2zbmb6i22dv89jc6823bzdjjimkrg6";
   };
 
   nativeBuildInputs = [

From 54f35e4e40c4a42982f20309d70f8279893ea73a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 12 Feb 2020 18:54:45 -0600
Subject: [PATCH 0494/4636] iwd: drop systemd dep, not needed when specifying
 config flags too

Only used to guess if systemd-y bits should be installed,
which we manually specify already.  So drop unneeded dep.
---
 pkgs/os-specific/linux/iwd/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index 85dc6a1ba0c4..5c7645921bc2 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -8,7 +8,6 @@
 , docutils
 , readline
 , python3Packages
-, systemd
 }:
 
 stdenv.mkDerivation rec {
@@ -32,7 +31,6 @@ stdenv.mkDerivation rec {
     ell
     python3Packages.python
     readline
-    systemd
   ];
 
   pythonPath = [

From f9b5108d916d7e47872b8001f137afa2b099309d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 12 Feb 2020 19:08:21 -0600
Subject: [PATCH 0495/4636] iwd: tests, openssl check dep

---
 pkgs/os-specific/linux/iwd/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index 5c7645921bc2..f6e98b047df6 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -7,6 +7,7 @@
 , coreutils
 , docutils
 , readline
+, openssl
 , python3Packages
 }:
 
@@ -33,6 +34,8 @@ stdenv.mkDerivation rec {
     readline
   ];
 
+  checkInputs = [ openssl ];
+
   pythonPath = [
     python3Packages.dbus-python
     python3Packages.pygobject3
@@ -53,6 +56,8 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
+  doCheck = true;
+
   postInstall = ''
     cp -a test/* $out/bin/
     mkdir -p $out/share

From ac8a92543babf3cc9c500a69d37905d286be261f Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 12 Feb 2020 19:28:34 -0600
Subject: [PATCH 0496/4636] iwd: drop tmpfiles snippet, services use
 StateDirectory already

Originally added in [1], and iwd added StateDirectory to its services
in [2] -- 4 days later.

("StateDirectory wasn't used when tmpfile snippet was added to NixOS")
(nevermind git -> release delay)

[1] 6e54e9253a28d1fe5c507b76ce45965c31ecab70
[2] upstream iwd git rev: 71ae0bee9c6320dae0083ed8c1700bc8fff1defb
---
 nixos/modules/services/networking/iwd.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/nixos/modules/services/networking/iwd.nix b/nixos/modules/services/networking/iwd.nix
index 839fa48d9a42..6be67a8b96f4 100644
--- a/nixos/modules/services/networking/iwd.nix
+++ b/nixos/modules/services/networking/iwd.nix
@@ -23,12 +23,7 @@ in {
     systemd.packages = [ pkgs.iwd ];
 
     systemd.services.iwd.wantedBy = [ "multi-user.target" ];
-
-    systemd.tmpfiles.rules = [
-      "d /var/lib/iwd 0700 root root -"
-      "d /var/lib/ead 0700 root root -"
-    ];
   };
 
-  meta.maintainers = with lib.maintainers; [ mic92 ];
+  meta.maintainers = with lib.maintainers; [ mic92 dtzWill ];
 }

From 93656d56d3fd9937155afc56474a60c875db5c79 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 25 Jan 2020 22:42:29 -0600
Subject: [PATCH 0497/4636] biblatex-check: init at 2019-11-09

---
 .../typesetting/biblatex-check/default.nix    | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/tools/typesetting/biblatex-check/default.nix

diff --git a/pkgs/tools/typesetting/biblatex-check/default.nix b/pkgs/tools/typesetting/biblatex-check/default.nix
new file mode 100644
index 000000000000..bad560660023
--- /dev/null
+++ b/pkgs/tools/typesetting/biblatex-check/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, python }:
+
+stdenv.mkDerivation {
+  pname = "biblatex-check";
+  version = "2019-11-09";
+
+  src = fetchFromGitHub {
+    owner = "Pezmc";
+    repo = "BibLatex-Check";
+    rev = "2db50bf94d1480f37edf1b3619e73baf4ef85938";
+    sha256 = "1bq0yqckhssazwkivipdjmn1jpsf301i4ppyl88qhc5igx39wg25";
+  };
+
+  buildInputs = [ python ];
+
+  installPhase = ''
+    install -Dm755 biblatex_check.py $out/bin/biblatex-check
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Python2/3 script for checking BibLatex .bib files";
+    homepage = "https://github.com/Pezmc/BibLatex-Check";
+    license = licenses.mit;
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7feffda07ccb..8299aaaa7ff9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2263,6 +2263,8 @@ in
 
   biber = callPackage ../tools/typesetting/biber { };
 
+  biblatex-check = callPackage ../tools/typesetting/biblatex-check { };
+
   birdfont = callPackage ../tools/misc/birdfont { };
   xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { };
 

From 21e5e8026516c0293aeccb5297ca40dfc979cfe4 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 12 Feb 2020 16:17:47 -0800
Subject: [PATCH 0498/4636] python3Packages.elementpath: 1.4.0 -> 1.4.1

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

diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix
index 7d293edba35a..22b1c31ece95 100644
--- a/pkgs/development/python-modules/elementpath/default.nix
+++ b/pkgs/development/python-modules/elementpath/default.nix
@@ -1,7 +1,7 @@
 { lib, buildPythonPackage, fetchFromGitHub, isPy27 }:
 
 buildPythonPackage rec {
-  version = "1.4.0";
+  version = "1.4.1";
   pname = "elementpath";
   disabled = isPy27; # uses incompatible class syntax
 
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     owner = "sissaschool";
     repo = "elementpath";
     rev = "v${version}";
-    sha256 = "1fmwy7plcgxam09cx3z11068k0c98wcsgclmxdq8chsd6id3632y";
+    sha256 = "1xgz4aml3g3q2011wxarg25xl3g9zny313p52w9abyy16f40vjy0";
   };
 
   # avoid circular dependency with xmlschema which directly depends on this

From 4aa1259e2902299242390ace8307c9c5934edeb8 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 25 Jan 2020 22:37:30 -0600
Subject: [PATCH 0499/4636] bibclean: init at 3.03

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

diff --git a/pkgs/tools/typesetting/bibclean/default.nix b/pkgs/tools/typesetting/bibclean/default.nix
new file mode 100644
index 000000000000..5763a059d4b7
--- /dev/null
+++ b/pkgs/tools/typesetting/bibclean/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  pname = "bibclean";
+  version = "3.03";
+
+  src = fetchurl {
+    url = "http://ftp.math.utah.edu/pub/bibclean/bibclean-${version}.tar.xz";
+    sha256 = "06ic9zix8gh1wz7hd1cnlxxyrp7sqs67a7xnv08r71b5ikri35a3";
+  };
+
+  postPatch = ''
+    substituteInPlace Makefile.in --replace man/man1 share/man/man1
+  '';
+
+  preInstall = ''
+    mkdir -p $out/bin $out/share/man/man1
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Prettyprint and syntax check BibTeX and Scribe bibliography data base files";
+    homepage = "http://ftp.math.utah.edu/pub/bibclean";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8299aaaa7ff9..a4c307f26277 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2261,6 +2261,8 @@ in
 
   bgs = callPackage ../tools/X11/bgs { };
 
+  bibclean = callPackage ../tools/typesetting/bibclean { };
+
   biber = callPackage ../tools/typesetting/biber { };
 
   biblatex-check = callPackage ../tools/typesetting/biblatex-check { };

From 2d42fc240c4035e6df5dbbef42a0e3693ede931d Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 12 Feb 2020 20:50:05 -0500
Subject: [PATCH 0500/4636] nixos-enter: redirect to fd2 instead of a file
 named /dev/stderr

In some cases, /dev/stderr may not point to a sensible location. For
example, running nixos-enter inside a systemd unit where the unit's
StandardOutput and StandardError are set to be sockets. In these
cases, this line would fail.

Piping to fd2 directly works just as well, even under strange and
twisted executions.

Co-authored-by: Michael Bishop <michael.bishop@iohk.io>
---
 nixos/modules/installer/tools/nixos-enter.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/nixos/modules/installer/tools/nixos-enter.sh
index 4680cd8ae95a..1fdd4627a902 100644
--- a/nixos/modules/installer/tools/nixos-enter.sh
+++ b/nixos/modules/installer/tools/nixos-enter.sh
@@ -60,15 +60,15 @@ chmod 0755 "$mountPoint/dev" "$mountPoint/sys"
 mount --rbind /dev "$mountPoint/dev"
 mount --rbind /sys "$mountPoint/sys"
 
-# If silent, write both stdout and stderr of activation script to /dev/null
-# otherwise, write both streams to stderr of this process
-if [ "$silent" -eq 0 ]; then
-    PIPE_TARGET="/dev/stderr"
-else
-    PIPE_TARGET="/dev/null"
-fi
+(
+    # If silent, write both stdout and stderr of activation script to /dev/null
+    # otherwise, write both streams to stderr of this process
+    if [ "$silent" -eq 1 ]; then
+        exec 2>/dev/null
+    fi
 
-# Run the activation script. Set $LOCALE_ARCHIVE to supress some Perl locale warnings.
-LOCALE_ARCHIVE="$system/sw/lib/locale/locale-archive" chroot "$mountPoint" "$system/activate" >>$PIPE_TARGET 2>&1 || true
+    # Run the activation script. Set $LOCALE_ARCHIVE to supress some Perl locale warnings.
+    LOCALE_ARCHIVE="$system/sw/lib/locale/locale-archive" chroot "$mountPoint" "$system/activate" 1>&2 || true
+)
 
 exec chroot "$mountPoint" "${command[@]}"

From 3991c60b3754d4e218cf8caa58a0ca1f05524c8d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 12 Feb 2020 20:35:11 -0600
Subject: [PATCH 0501/4636] go-license-detector: init at 3.0.2

---
 .../misc/go-license-detector/default.nix      | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/tools/misc/go-license-detector/default.nix

diff --git a/pkgs/development/tools/misc/go-license-detector/default.nix b/pkgs/development/tools/misc/go-license-detector/default.nix
new file mode 100644
index 000000000000..31e0158eb6b3
--- /dev/null
+++ b/pkgs/development/tools/misc/go-license-detector/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "go-license-detector";
+  version = "3.0.2";
+
+  src = fetchFromGitHub {
+    owner = "src-d";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0gp7na2hqn5crr5x4khllsq7ka9h7rx8b4y10yzxmi0wpmxr53sw";
+  };
+
+  modSha256 = "163f1kiy7kqrnaazb8ydaaiz57lv30jyjkvv6i7pczvcg9yfhmdb";
+
+  meta = with lib; {
+    description = "Reliable project licenses detector";
+    homepage = "https://github.com/src-d/go-license-detector";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4c307f26277..041f97aefa80 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25947,4 +25947,5 @@ in
 
   quartus-prime-lite = callPackage ../applications/editors/quartus-prime {};
 
+  go-license-detector = callPackage ../development/tools/misc/go-license-detector { };
 }

From 77da4954da4c412145a5996517d045ef292615a0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Feb 2020 02:50:37 +0000
Subject: [PATCH 0502/4636] opensmtpd: 6.6.2p1 -> 6.6.3p1

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

diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index 48e2666c580a..7174b45a6f77 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   pname = "opensmtpd";
-  version = "6.6.2p1";
+  version = "6.6.3p1";
 
   nativeBuildInputs = [ autoconf automake libtool bison ];
   buildInputs = [ libasr libevent zlib libressl db pam ];
 
   src = fetchurl {
     url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz";
-    sha256 = "16nz2n4s3djlasd6m6dqfwggf6igyfxzq5igny5i0qb8lnn13f33";
+    sha256 = "1dqysjlyl0x3qzdzc9sjrla0063vpmlyq735lzf88p7wgzmw1xwy";
   };
 
   patches = [

From 36c53f703b69b37e5de1ad6637af5418fc53f029 Mon Sep 17 00:00:00 2001
From: Benjamin Asbach <asbachb@users.noreply.github.com>
Date: Wed, 12 Feb 2020 23:50:05 +0100
Subject: [PATCH 0503/4636] openjdk8: 8u222 -> 8u242

---
 .../openjdk/004_add-fontconfig.patch          |  14 -
 .../openjdk/005_enable-infinality.patch       | 260 ------------------
 pkgs/development/compilers/openjdk/8.nix      |  41 ++-
 3 files changed, 18 insertions(+), 297 deletions(-)
 delete mode 100644 pkgs/development/compilers/openjdk/004_add-fontconfig.patch
 delete mode 100644 pkgs/development/compilers/openjdk/005_enable-infinality.patch

diff --git a/pkgs/development/compilers/openjdk/004_add-fontconfig.patch b/pkgs/development/compilers/openjdk/004_add-fontconfig.patch
deleted file mode 100644
index 8172bc821905..000000000000
--- a/pkgs/development/compilers/openjdk/004_add-fontconfig.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This patch was downloaded from https://aur.archlinux.org/cgit/aur.git/tree/?h=java8-openjdk
-More info can be found at http://www.infinality.net/forum/viewtopic.php?f=2&t=275
-diff -ur a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk
---- a/jdk/make/lib/Awt2dLibraries.gmk	2015-07-13 20:50:59.000000000 +0300
-+++ b/jdk/make/lib/Awt2dLibraries.gmk	2015-08-24 12:12:22.930330643 +0300
-@@ -824,7 +824,7 @@
-     LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
-         $(call SET_SHARED_LIBRARY_ORIGIN), \
-     LDFLAGS_SUFFIX := $(BUILD_LIBFONTMANAGER_FONTLIB), \
--    LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
-+    LDFLAGS_SUFFIX_linux := -lfontconfig -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
-     LDFLAGS_SUFFIX_solaris := -lawt -lawt_headless -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \
-     LDFLAGS_SUFFIX_aix := -lawt -lawt_headless $(LIBM) $(LIBCXX) -ljava -ljvm,\
-     LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \
diff --git a/pkgs/development/compilers/openjdk/005_enable-infinality.patch b/pkgs/development/compilers/openjdk/005_enable-infinality.patch
deleted file mode 100644
index cc34e548758e..000000000000
--- a/pkgs/development/compilers/openjdk/005_enable-infinality.patch
+++ /dev/null
@@ -1,260 +0,0 @@
-This patch was downloaded from https://aur.archlinux.org/cgit/aur.git/tree/?h=java8-openjdk
-More info can be found at http://www.infinality.net/forum/viewtopic.php?f=2&t=275
-diff -ur a/jdk/src/share/native/sun/font/freetypeScaler.c b/jdk/src/share/native/sun/font/freetypeScaler.c
---- a/jdk/src/share/native/sun/font/freetypeScaler.c	2014-09-14 16:28:06.108295959 +0200
-+++ b/jdk/src/share/native/sun/font/freetypeScaler.c	2014-09-14 16:28:45.569693174 +0200
-@@ -23,6 +23,9 @@
-  * questions.
-  */
-
-+/* Use Infinality patches as default */
-+#define INFINALITY
-+
- #include "jni.h"
- #include "jni_util.h"
- #include "jlong.h"
-@@ -38,6 +41,10 @@
- #include FT_SIZES_H
- #include FT_OUTLINE_H
- #include FT_SYNTHESIS_H
-+#ifdef INFINALITY
-+#include FT_LCD_FILTER_H
-+#include <fontconfig/fontconfig.h>
-+#endif
-
- #include "fontscaler.h"
-
-@@ -676,6 +683,147 @@ static void CopyFTSubpixelVToSubpixel(co
-     }
- }
-
-+#ifdef INFINALITY
-+typedef struct {
-+    FT_Render_Mode ftRenderMode;
-+    int ftLoadFlags;
-+    FT_LcdFilter ftLcdFilter;
-+} RenderingProperties;
-+
-+static FcPattern* matchedPattern(const FcChar8* family, double ptSize) {
-+    /*
-+      we will create pattern to find our family and size in
-+      fontconfig configuration, and then will return it's
-+      properties:
-+    */
-+    FcPattern* fcPattern = 0;
-+    fcPattern = FcPatternCreate();
-+    FcValue fcValue;
-+    fcValue.type = FcTypeString;
-+    fcValue.u.s = family;
-+    FcPatternAdd(fcPattern, FC_FAMILY, fcValue, FcTrue);
-+    FcPatternAddBool(fcPattern, FC_SCALABLE, FcTrue);
-+    FcPatternAddDouble(fcPattern, FC_SIZE, ptSize);
-+    // TODO FcPatternAddInteger(pattern, FC_WEIGHT, weight_value);
-+    // TODO FcPatternAddInteger(pattern, FC_SLANT, slant_value);
-+    // TODO FcPatternAddDouble(pattern, FC_PIXEL_SIZE, size_value);
-+    // TODO FcPatternAddInteger(pattern, FC_WIDTH, stretch); 100 in most cases
-+    FcConfigSubstitute(0, fcPattern, FcMatchPattern);
-+    FcConfigSubstitute(0, fcPattern, FcMatchFont);
-+    FcDefaultSubstitute(fcPattern);
-+    FcResult res;
-+
-+    FcPattern *pattern = 0;
-+    pattern = FcFontMatch(0, fcPattern, &res);
-+    FcPatternDestroy(fcPattern);
-+    return pattern;
-+}
-+
-+static void readFontconfig(const FcChar8* family, double ptSize, jint aaType, RenderingProperties* rp) {
-+
-+    FcPattern *pattern = matchedPattern(family, ptSize);
-+
-+    int ftLoadFalgs = FT_LOAD_DEFAULT;
-+    FT_Render_Mode ftRenderMode;
-+    FT_LcdFilter ftLcdFilter;
-+    char horizontal = 1;
-+    FcBool b;
-+
-+    // subpixel order:
-+    if (aaType == TEXT_AA_ON)
-+        ftRenderMode = FT_RENDER_MODE_NORMAL;
-+    else if (aaType == TEXT_AA_OFF)
-+        ftRenderMode = FT_RENDER_MODE_MONO;
-+    else if (FcPatternGetBool(pattern, FC_ANTIALIAS, 0, &b) == FcResultMatch)
-+        if (b) {
-+            int subpixel = FC_RGBA_UNKNOWN;
-+            FcPatternGetInteger(pattern, FC_RGBA, 0, &subpixel);
-+            if (subpixel == FC_RGBA_UNKNOWN)
-+                subpixel = FC_RGBA_NONE;
-+                switch (subpixel) {
-+                case FC_RGBA_NONE:
-+                    ftRenderMode = FT_RENDER_MODE_NORMAL;
-+                    break;
-+                case FC_RGBA_RGB:
-+                case FC_RGBA_BGR:
-+                    ftRenderMode = FT_RENDER_MODE_LCD;
-+                    horizontal = 1;
-+                    break;
-+                case FC_RGBA_VRGB:
-+                case FC_RGBA_VBGR:
-+                    ftRenderMode = FT_RENDER_MODE_LCD_V;
-+                    horizontal = 0;
-+                    break;
-+                default:
-+                    break;
-+                }
-+            } else {
-+                ftRenderMode = FT_RENDER_MODE_NORMAL;
-+            }
-+
-+    // loading mode:
-+    if (aaType == TEXT_AA_OFF)
-+        ftLoadFalgs |= FT_LOAD_TARGET_MONO;
-+    else {
-+        int hint_style = FC_HINT_NONE;
-+        FcPatternGetInteger(pattern, FC_HINT_STYLE, 0, &hint_style);
-+        switch (hint_style) {
-+        case FC_HINT_NONE:
-+            ftLoadFalgs |= FT_LOAD_NO_HINTING;
-+            break;
-+        case FC_HINT_SLIGHT:
-+            ftLoadFalgs |= FT_LOAD_TARGET_LIGHT;
-+            break;
-+        case FC_HINT_MEDIUM:
-+            ftLoadFalgs |= FT_LOAD_TARGET_NORMAL;
-+            break;
-+        case FC_HINT_FULL:
-+            if (aaType == TEXT_AA_ON)
-+                ftLoadFalgs |= FT_LOAD_TARGET_NORMAL;
-+            else
-+                ftLoadFalgs |= horizontal ? FT_LOAD_TARGET_LCD : FT_LOAD_TARGET_LCD_V;
-+            break;
-+        default:
-+            // what else to use as default?
-+            ftLoadFalgs |= FT_LOAD_TARGET_NORMAL;
-+            break;
-+        }
-+    }
-+
-+    // autohinting:
-+    if (FcPatternGetBool(pattern, FC_AUTOHINT, 0, &b) == FcResultMatch)
-+        if (b)
-+            ftLoadFalgs |= FT_LOAD_FORCE_AUTOHINT;
-+
-+    // LCD filter:
-+    int filter = FC_LCD_DEFAULT;
-+    FcPatternGetInteger(pattern, FC_LCD_FILTER, 0, &filter);
-+    switch (filter) {
-+    case FC_LCD_NONE:
-+        ftLcdFilter = FT_LCD_FILTER_NONE;
-+        break;
-+    case FC_LCD_DEFAULT:
-+        ftLcdFilter = FT_LCD_FILTER_DEFAULT;
-+        break;
-+    case FC_LCD_LIGHT:
-+        ftLcdFilter = FT_LCD_FILTER_LIGHT;
-+        break;
-+    case FC_LCD_LEGACY:
-+        ftLcdFilter = FT_LCD_FILTER_LEGACY;
-+        break;
-+    default:
-+        // new unknown lcd filter type?! will use default one:
-+        ftLcdFilter = FT_LCD_FILTER_DEFAULT;
-+        break;
-+    }
-+
-+    FcPatternDestroy(pattern);
-+
-+    rp->ftRenderMode = ftRenderMode;
-+    rp->ftLoadFlags = ftLoadFalgs;
-+    rp->ftLcdFilter = ftLcdFilter;
-+}
-+#endif
-
- /*
-  * Class:     sun_font_FreetypeFontScaler
-@@ -691,7 +839,9 @@ Java_sun_font_FreetypeFontScaler_getGlyp
-     UInt16 width, height;
-     GlyphInfo *glyphInfo;
-     int glyph_index;
-+#ifndef INFINALITY
-     int renderFlags = FT_LOAD_RENDER, target;
-+#endif
-     FT_GlyphSlot ftglyph;
-
-     FTScalerContext* context =
-@@ -709,5 +859,10 @@ Java_sun_font_FreetypeFontScaler_getGlyp
-         return ptr_to_jlong(getNullGlyphImage());
-     }
-
-+#ifdef INFINALITY
-+    RenderingProperties renderingProperties;
-+    readFontconfig((const FcChar8 *) scalerInfo->face->family_name,
-+                   context->ptsz, context->aaType, &renderingProperties);
-+#else
-     if (!context->useSbits) {
-          renderFlags |= FT_LOAD_NO_BITMAP;
-@@ -731,10 +886,17 @@ Java_sun_font_FreetypeFontScaler_getGlyp
-         target = FT_LOAD_TARGET_LCD_V;
-     }
-     renderFlags |= target;
-+#endif
-
-     glyph_index = FT_Get_Char_Index(scalerInfo->face, glyphCode);
-
-+#ifdef INFINALITY
-+    FT_Library_SetLcdFilter(scalerInfo->library, renderingProperties.ftLcdFilter);
-+    error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags);
-+#else
-     error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags);
-+#endif
-+
-     if (error) {
-         //do not destroy scaler yet.
-         //this can be problem of particular context (e.g. with bad transform)
-@@ -753,9 +915,13 @@ Java_sun_font_FreetypeFontScaler_getGlyp
-
-     /* generate bitmap if it is not done yet
-      e.g. if algorithmic styling is performed and style was added to outline */
-+#ifdef INFINALITY
-+    FT_Render_Glyph(ftglyph, renderingProperties.ftRenderMode);
-+#else
-     if (ftglyph->format == FT_GLYPH_FORMAT_OUTLINE) {
-         FT_Render_Glyph(ftglyph, FT_LOAD_TARGET_MODE(target));
-     }
-+#endif
-
-     width  = (UInt16) ftglyph->bitmap.width;
-     height = (UInt16) ftglyph->bitmap.rows;
-@@ -969,7 +1135,9 @@ Java_sun_font_FreetypeFontScaler_getGlyp
- static FT_Outline* getFTOutline(JNIEnv* env, jobject font2D,
-         FTScalerContext *context, FTScalerInfo* scalerInfo,
-         jint glyphCode, jfloat xpos, jfloat ypos) {
-+#ifndef INFINALITY
-     int renderFlags;
-+#endif
-     int glyph_index;
-     FT_Error error;
-     FT_GlyphSlot ftglyph;
-@@ -984,11 +1152,22 @@ static FT_Outline* getFTOutline(JNIEnv*
-         return NULL;
-     }
-
-+#ifdef INFINALITY
-+    RenderingProperties renderingProperties;
-+    readFontconfig((const FcChar8 *) scalerInfo->face->family_name,
-+                   context->ptsz, context->aaType, &renderingProperties);
-+#else
-     renderFlags = FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP;
-+#endif
-
-     glyph_index = FT_Get_Char_Index(scalerInfo->face, glyphCode);
-
-+#ifdef INFINALITY
-+    error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags);
-+#else
-     error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags);
-+#endif
-+
-     if (error) {
-         return NULL;
-     }
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index c6b3644fecca..4231845792a9 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -5,7 +5,6 @@
 , openjdk8-bootstrap
 , setJavaClassPath
 , headless ? false
-, enableInfinality ? true # font rendering patch
 , enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf
 }:
 
@@ -20,9 +19,8 @@ let
     aarch64-linux = "aarch64";
   }.${stdenv.system} or (throw "Unsupported platform");
 
-  update = "222";
-  build = if stdenv.isAarch64 then "b10"
-          else "ga";
+  update = "242";
+  build = "b08";
   baseurl = if stdenv.isAarch64 then "https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah"
             else "https://hg.openjdk.java.net/jdk8u/jdk8u";
   repover = lib.optionalString stdenv.isAarch64 "aarch64-shenandoah-"
@@ -31,50 +29,50 @@ let
   jdk8 = fetchurl {
              name = "jdk8-${repover}.tar.gz";
              url = "${baseurl}/archive/${repover}.tar.gz";
-             sha256 = if stdenv.isAarch64 then "1h19zpmc76f8v4s0mfvqxmxvv8imdwq92z5dmgi19y4xnl978qq8"
-                      else "19dyqayn8n2y08p08g34xxnf0dkm6bfjxkp7633m7dx50mjcpxnj";
+             sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb"
+                      else "1crs4hmzmgm6fkwfq0d3xz9lph0nd33fngrqv2rz1mkkqcrjx18z";
           };
   langtools = fetchurl {
              name = "langtools-${repover}.tar.gz";
              url = "${baseurl}/langtools/archive/${repover}.tar.gz";
-             sha256 = if stdenv.isAarch64 then "09phy2izw2yyp3hnw7jmb7lp559dgnp2a0rymx1k3q97anfz3bzj"
-                      else "11nibmqnf7nap10sydk57gimgwpxqk5mn12dyg6fzg4s2fxf0y1q";
+             sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb"
+                      else "1aaxd1rl7dlk4kxdivvqvripsbn0d5vny0jvjksycsm97vrfiry4";
           };
   hotspot = fetchurl {
              name = "hotspot-${repover}.tar.gz";
              url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
-             sha256 = if stdenv.isAarch64 then "1dqrzg2af94pjam6jg9nq8ydaibn4bsjv7ai6m7m3r2ph2fml80s"
-                      else "1g512xrrxvnrk5szg7wqqz00x4gv53dx3yffk5im2zfcalyka2q7";
+             sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb"
+                      else "18i4if16zikgda9k5bgqyx0p2104db23zlnclq512178z0p9yycb";
           };
   corba = fetchurl {
              name = "corba-${repover}.tar.gz";
              url = "${baseurl}/corba/archive/${repover}.tar.gz";
-             sha256 = if stdenv.isAarch64 then "15l1ccvk2slx8wf5gilzjvhc428hl57gg1knbma1jqgs3ymnqwpr"
-                      else "0h8nprfzpy21mfl39fxxzfa420skwmaaji4r31j7lj3g8c1wp62r";
+             sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb"
+                      else "1298k8p2dsj7xc4h2ayk5nl4ssrcgncn06ysyqrmnwrb8gj8s1w4";
           };
   jdk = fetchurl {
              name = "jdk-${repover}.tar.gz";
              url = "${baseurl}/jdk/archive/${repover}.tar.gz";
-             sha256 = if stdenv.isAarch64 then "179ij3rs1ahl6dh3n64k4xp2prv413ckqk7sj1g5lw48rj7bjh83"
-                      else "1sb38h0rckgkr2y0kfzav6mb74nv5whb9l8m842mv1jpavxrdv6k";
+             sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb"
+                      else "0vqlbks3cy3cnmnrnhbjkqinvp8bcy2h96xvx81cvlza4s2hszvz";
           };
   jaxws = fetchurl {
              name = "jaxws-${repover}.tar.gz";
              url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
-             sha256 = if stdenv.isAarch64 then "16bayw7c4vzm9s0ixhw2dv6pan6wywyiddh9a8dss35660dnhrm0"
-                      else "0akn5zapff5m32ibgm3f4lhgq96bsqx74g4xl38xmivvxddsd6kz";
+             sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb"
+                      else "1wg9fbiz09arj0llavnzrmbhw8nx0dw8dcjkrzxw78rj1cadflzc";
           };
   jaxp = fetchurl {
              name = "jaxp-${repover}.tar.gz";
              url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
-             sha256 = if stdenv.isAarch64 then "176db7pi2irc7q87c273cjm5nrlj5g973fjmh24m6a1jxanrrm9x"
-                      else "0bw4q8yhmrl8hqlimy1ijnarav4r91dj73lpr7axba77rqlr41c8";
+             sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb"
+                      else "1i5xrk8r8pcgnc68zrgp3hd1a1nzcm99swpmdnlb424qlg5nnrcf";
           };
   nashorn = fetchurl {
              name = "nashorn-${repover}.tar.gz";
              url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
-             sha256 = if stdenv.isAarch64 then "0vi3kbsqfpdjxc08ayxk2c87zycd7z0qbqw9xka1vc59iyv97n62"
-                      else "0bfcf3iv2lr0xlp6sclxq7zz7b9ahajl008hz5rasjnrnr993qja";
+             sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb"
+                      else "0qlxaz7sriy709vcyzz48s2v4p5h4d31my33whip018c4j5gkfqq";
           };
   openjdk8 = stdenv.mkDerivation {
     pname = "openjdk" + lib.optionalString headless "-headless";
@@ -108,9 +106,6 @@ let
       ./fix-java-home-jdk8.patch
       ./read-truststore-from-env-jdk8.patch
       ./currency-date-range-jdk8.patch
-    ] ++ lib.optionals (!headless && enableInfinality) [
-      ./004_add-fontconfig.patch
-      ./005_enable-infinality.patch
     ] ++ lib.optionals (!headless && enableGnome2) [
       ./swing-use-gtk-jdk8.patch
     ];

From 5583685749a38a4f60d5c5f364fcca795a348981 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Feb 2020 03:06:12 +0000
Subject: [PATCH 0504/4636] ocamlPackages.odoc: 1.4.2 -> 1.5.0

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

diff --git a/pkgs/development/ocaml-modules/odoc/default.nix b/pkgs/development/ocaml-modules/odoc/default.nix
index 75a2dab970ee..3e8ac82add4c 100644
--- a/pkgs/development/ocaml-modules/odoc/default.nix
+++ b/pkgs/development/ocaml-modules/odoc/default.nix
@@ -4,13 +4,13 @@
 
 buildDunePackage rec {
   pname = "odoc";
-  version = "1.4.2";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "ocaml";
     repo = pname;
     rev = version;
-    sha256 = "0rvhx139jx6wmlfz355mja6mk03x4swq1xxvk5ky6jzhalq3cf5i";
+    sha256 = "14ilq2glcvda8mfhj27jqqwx3392q8ssp9bq9agz7k1k6ilp9dai";
   };
 
   buildInputs = [ astring cmdliner cppo fpath result tyxml ];

From c1542fc4cd3608c4188e61627c6908e4bc3e4018 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Wed, 12 Feb 2020 22:28:53 -0500
Subject: [PATCH 0505/4636] rust: Replace migration README with GitHub issue

The readme was nice to discuss in the implementation PR, but now that this is
merged it's better to have an issue that can be linked against in PRs and
doesn't require further merges to update status.

Ported with a status update in #79975
---
 pkgs/build-support/rust/README.md | 45 -------------------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 pkgs/build-support/rust/README.md

diff --git a/pkgs/build-support/rust/README.md b/pkgs/build-support/rust/README.md
deleted file mode 100644
index 0e0ddb9648de..000000000000
--- a/pkgs/build-support/rust/README.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# Updated fetchCargo behavior
-
-Changes to the `fetchcargo.nix` behavior that cause changes to the `cargoSha256`
-are somewhat disruptive, so historically we've added conditionals to provide
-backwards compatibility. We've now accumulated enough of these that it makes
-sense to do a clean sweep updating hashes, and delete the conditionals in the
-fetcher to simplify maintenance and implementation complexity. These
-conditionals are:
-
-1. When cargo vendors dependencies, it generates a config. Previously, we were
-   hard-coding our own config, but this fails if there are git dependencies. We
-   have conditional logic to sometimes copy the vendored cargo config in, and
-   sometimes not.
-
-2. When a user updates the src package, they may forget to update the
-   `cargoSha256`. We have an opt-in conditional flag to add the `Cargo.lock`
-   into the vendor dir for inspection and compare at build-time, but it defaults
-   to false.
-
-3. We were previously vendoring into a directory with a recursive hash, but
-   would like to vendor into a compressed tar.gz file instead, for the reasons
-   specified in the git commit message adding this feature.
-
-
-## Migration plan
-
-1. (DONE in this PR) Implement `fetchCargoTarball` as a separate, clean fetcher
-   implementation along-side `fetchcargo`. Rename `verifyCargoDeps` (default
-   false) to `legacyCargoFetcher` (default true), which switches the fetcher
-   implementation used. Replace `verifyCargoDeps = true;` with
-   `legacyCargoFetcher = false;` in Rust applications.
-
-2. Send a treewide Rust PR that sets `legacyCargoFetcher = true;` in all Rust
-   applications not using this (which is ~200 of them), with a note to
-   maintainers to delete if updating the package. Change the default in
-   `buildRustPackage` to false.
-
-3. Go through all Rust src packages deleting the `legacyCargoFetcher = false;`
-   line and re-computing the `cargoSha256`, merging as we go.
-
-4. Delete the `fetchcargo.nix` implementation entirely and also remove:
-  - All overrides in application-level packages
-  - The `fetchcargo-default-config.toml` and conditionals around using it when
-    no `$CARGO_CONFIG` exists
-  - This README.md file

From 22b87c6a7fa1bde1a3db603eac1b3853faaca85a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Feb 2020 04:11:43 +0000
Subject: [PATCH 0506/4636] numix-icon-theme-circle: 19.09.20 -> 19.12.27

---
 pkgs/data/icons/numix-icon-theme-circle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index ed4b2581e850..c85f01d2718a 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "numix-icon-theme-circle";
-  version = "19.09.20";
+  version = "19.12.27";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = pname;
     rev = version;
-    sha256 = "1pmz2dy1580ln5m57xw3vhqrjhviayisgbs2km3i77hyx66hiivi";
+    sha256 = "0za44h7f4vk37yl30xlaa6w76maiipb6p63gl9hl1rshdn9nxq0y";
   };
 
   nativeBuildInputs = [ gtk3 numix-icon-theme ];

From 1979e038a31c90a50f1e53378056a15ad8fcd113 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 13 Feb 2020 14:17:47 +1000
Subject: [PATCH 0507/4636] docker: 19.03.5 -> 19.03.6

https://github.com/docker/docker-ce/releases/tag/v19.03.6
---
 .../applications/virtualization/docker/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index f6fc999269e3..2154daa2a2c9 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -206,13 +206,13 @@ rec {
   };
 
   docker_19_03 = makeOverridable dockerGen {
-    version = "19.03.5";
-    rev = "633a0ea838f10e000b7c6d6eed1623e6e988b5bc";
-    sha256 = "1cs38ffh5xn8c40rln4pvd53iahvi4kys9an6kpclvvciqfc2cxs";
-    runcRev = "3e425f80a8c931f88e6d94a8c831b9d5aa481657";
-    runcSha256 = "18psc830b2rkwml1x6vxngam5b5wi3pj14mw817rshpzy87prspj";
-    containerdRev = "b34a5c8af56e510852c35414db4c1f4fa6172339";
-    containerdSha256 = "1kddhkd93wkrimk0yjcqiavdrqc818nd39rf3wrgxyilx1mfnrwb";
+    version = "19.03.6";
+    rev = "369ce74a3ce86a392e39e45d3960ce970fdfac97";
+    sha256 = "0myvh7p9h0j4xc35zhcvp8cqxd3r6p6jx5zxl5rzh14m6lgzmkh0";
+    runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd";
+    runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk";
+    containerdRev = "35bd7a5f69c13e1563af8a93431411cd9ecf5021";
+    containerdSha256 = "076355bkbdsgsxryhhr9gbpyypdx8gg149lylyd6q5ig98p179ap";
     tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662";
     tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn";
   };

From a01d0bc1a9d6415d932baad48a296befb9c44c62 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 12 Feb 2020 17:59:06 -0800
Subject: [PATCH 0508/4636] onnxruntime: 1.1.0 -> 1.1.1

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

diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix
index 90da6c192120..8fb586bcd732 100644
--- a/pkgs/development/libraries/onnxruntime/default.nix
+++ b/pkgs/development/libraries/onnxruntime/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "onnxruntime";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "onnxruntime";
     rev = "v${version}";
-    sha256 = "1ryf5v2h07c7b42q2p9id88i270ajyz5rlsradp00dy8in6dn2yr";
+    sha256 = "0d79adxw09cd6xfyb2sxp38j03h3g7gn4ki85zhp9nicrrm179qz";
     # TODO: use nix-versions of grpc, onnx, eigen, googletest, etc.
     # submodules increase src size and compile times significantly
     # not currently feasible due to how integrated cmake build is with git

From 57bacf67e92451be4c0c1cdf905269b8b0cffc1e Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Thu, 13 Feb 2020 00:49:09 -0500
Subject: [PATCH 0509/4636] starship: 0.35.1 -> 0.36.0

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

diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index 65b34f1b720d..1009b101d997 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -3,13 +3,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "starship";
-  version = "0.35.1";
+  version = "0.36.0";
 
   src = fetchFromGitHub {
     owner = "starship";
     repo = pname;
     rev = "v${version}";
-    sha256 = "17338l3nj6rysl9qvlbi1amqk6n5p15x8fvd11md7hwiavy4c63c";
+    sha256 = "0vkp6yfafzyhilkk5rfvgka91gmhm9nrrvy3m6gdza4ayslmcpam";
   };
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
       --replace "/bin/echo" "echo"
   '';
 
-  cargoSha256 = "0q6g7i930n23aabkwfn30lpbm5brjls552ql5khc6w02sirshsng";
+  cargoSha256 = "05q527bd5q6a7kd03hwic4bynyc4sipyvi0bf2g2jqxzcsmswyyk";
   checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root";
 
   meta = with stdenv.lib; {

From ff638c0afc278655ce15a6041041448e783bb7d2 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 13 Feb 2020 00:04:26 -0600
Subject: [PATCH 0510/4636] bdf2sfd: init at 1.1.0

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

diff --git a/pkgs/tools/misc/bdf2sfd/default.nix b/pkgs/tools/misc/bdf2sfd/default.nix
new file mode 100644
index 000000000000..deb88f70eb50
--- /dev/null
+++ b/pkgs/tools/misc/bdf2sfd/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  pname = "bdf2sfd";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "fcambus";
+    repo = pname;
+    rev = version;
+    sha256 = "130kaw2485qhb2171w2i9kpl1lhbkfwdz3j19cy63xk63fhyd8kb";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    description = "BDF to SFD converter";
+    homepage = "https://github.com/fcambus/bdf2sfd";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4c307f26277..a5e0ad038aae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1139,6 +1139,8 @@ in
 
   bdf2psf = callPackage ../tools/misc/bdf2psf { };
 
+  bdf2sfd = callPackage ../tools/misc/bdf2sfd { };
+
   bcat = callPackage ../tools/text/bcat {};
 
   bcache-tools = callPackage ../tools/filesystems/bcache-tools { };

From 9ad3ee23c0857e1dbbdf09fae5ffe673e312dc05 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 12 Feb 2020 21:39:40 -0800
Subject: [PATCH 0511/4636] python3Packages.imgaug: 0.3.0 -> 0.4.0

---
 .../python-modules/imgaug/default.nix           | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix
index 48ea6004426c..fc43af9294f1 100644
--- a/pkgs/development/python-modules/imgaug/default.nix
+++ b/pkgs/development/python-modules/imgaug/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage
-, fetchurl
+, fetchFromGitHub
 , imageio
 , numpy
 , opencv3
@@ -13,18 +13,20 @@
 
 buildPythonPackage rec {
   pname = "imgaug";
-  version = "0.3.0";
+  version = "0.4.0";
 
-  src = fetchurl {
-    url = "https://github.com/aleju/imgaug/archive/c3d99a420efc45652a1264920dc20378a54b1325.zip";
-    sha256 = "sha256:174nvhyhdn3vz0i34rqmkn26840j3mnfr55cvv5bdf9l4y9bbjq2";
+  src = fetchFromGitHub {
+    owner = "aleju";
+    repo = "imgaug";
+    rev = version;
+    sha256 = "17hbxndxphk3bfnq35y805adrfa6gnm5x7grjxbwdw4kqmbbqzah";
   };
 
   postPatch = ''
     substituteInPlace requirements.txt \
       --replace "opencv-python-headless" ""
     substituteInPlace setup.py \
-      --replace "opencv-python-headless" "" 
+      --replace "opencv-python-headless" ""
     substituteInPlace pytest.ini \
       --replace "--xdoctest --xdoctest-global-exec=\"import imgaug as ia\nfrom imgaug import augmenters as iaa\"" ""
   '';
@@ -39,8 +41,9 @@ buildPythonPackage rec {
     six
   ];
 
+  # augmenters requires a significant increase in packages requires
   checkPhase = ''
-     pytest ./test
+     pytest ./test --ignore=test/augmenters
   '';
 
   checkInputs = [ opencv3 pytest ];

From 6730bc5144953d8426201ad1ad75aa716ea2ec5d Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 11 Feb 2020 14:33:14 -0800
Subject: [PATCH 0512/4636] python3Packages.mailman-web: prevent error from
 crashing eval

---
 pkgs/servers/mail/mailman/web.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix
index b73120c646d2..f770f2e4489d 100644
--- a/pkgs/servers/mail/mailman/web.nix
+++ b/pkgs/servers/mail/mailman/web.nix
@@ -3,9 +3,6 @@
 , django
 }:
 
-if lib.versionOlder "2.2" django.version
-then throw "mailman-web requires django < 2.2"
-else
 buildPythonPackage rec {
   pname = "mailman-web-unstable";
   version = "2019-09-29";
@@ -39,5 +36,7 @@ buildPythonPackage rec {
     description = "Django project for Mailman 3 web interface";
     license = licenses.gpl3;
     maintainers = with maintainers; [ peti qyliss ];
+    # mailman-web requires django < 2.2
+    broken = versionOlder "2.2" django.version;
   };
 }

From 6c353471442c22394137de59f86cb76fa7867224 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 12 Feb 2020 21:15:31 -0800
Subject: [PATCH 0513/4636] python3Packages.mezzaine: prevent throw from
 breaking nix eval

---
 .../python-modules/mezzanine/default.nix        | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix
index 567a1c66e029..d27fd8620459 100644
--- a/pkgs/development/python-modules/mezzanine/default.nix
+++ b/pkgs/development/python-modules/mezzanine/default.nix
@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , buildPythonPackage
 , fetchPypi
 , isPyPy
@@ -18,9 +19,6 @@
 , chardet
 }:
 
-if stdenv.lib.versionOlder django.version "1.11" || stdenv.lib.versionAtLeast django.version "2.0"
-then throw "mezzanine requires django-1.11. Consider overriding python package set to use django_1_11"
-else
 buildPythonPackage rec {
   version = "4.3.1";
   pname = "Mezzanine";
@@ -30,7 +28,8 @@ buildPythonPackage rec {
     sha256 = "42c7909953cc5aea91921b47d804b61e14893bf48a2a476ce49a96559a0fa1d3";
   };
 
-  disabled = isPyPy;
+  disabled = isPyPy || stdenv.lib.versionOlder django.version "1.11"
+    || stdenv.lib.versionAtLeast django.version "2.0";
 
   buildInputs = [ pyflakes pep8 ];
   propagatedBuildInputs = [ django django_contrib_comments filebrowser_safe grappelli_safe bleach tzlocal beautifulsoup4 requests requests_oauthlib future pillow chardet ];
@@ -44,7 +43,7 @@ buildPythonPackage rec {
 
   LC_ALL="en_US.UTF-8";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = ''
       A content management platform built using the Django framework
     '';
@@ -63,11 +62,13 @@ buildPythonPackage rec {
       Mezzanine provides most of its functionality by default. This
       approach yields a more integrated and efficient platform.
     '';
-    homepage = http://mezzanine.jupo.org/;
-    downloadPage = https://github.com/stephenmcd/mezzanine/releases;
+    homepage = "http://mezzanine.jupo.org/";
+    downloadPage = "https://github.com/stephenmcd/mezzanine/releases";
     license = licenses.free;
     maintainers = with maintainers; [ prikhi ];
     platforms = platforms.unix;
+    # mezzanine requires django-1.11. Consider overriding python package set to use django_1_11"
+    broken = versionOlder django.version "1.11" || versionAtLeast django.version "2.0";
   };
 
 }

From 5f67b6ad187c3740d7d782d066f65659959f42f5 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 12 Feb 2020 21:15:56 -0800
Subject: [PATCH 0514/4636] python3Packages.django-compat: prevent throw from
 breaking nix eval

---
 pkgs/development/python-modules/django-compat/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/django-compat/default.nix b/pkgs/development/python-modules/django-compat/default.nix
index de180ca03e55..c492e65854a7 100644
--- a/pkgs/development/python-modules/django-compat/default.nix
+++ b/pkgs/development/python-modules/django-compat/default.nix
@@ -1,12 +1,12 @@
 { stdenv, buildPythonPackage, fetchFromGitHub, python,
   django, six
 }:
-if stdenv.lib.versionAtLeast django.version "2.0"
-then throw "django-compat requires django < 2.0"
-else
+
 buildPythonPackage rec {
   pname = "django-compat";
   version = "1.0.15";
+  # django-compat requires django < 2.0
+  disabled = stdenv.lib.versionAtLeast django.version "2.0";
 
   # the pypi packages don't include everything required for the tests
   src = fetchFromGitHub {

From 217b221eab2db87e0f5a6433d4703f6ca1a4482c Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Sat, 8 Feb 2020 14:36:28 +0300
Subject: [PATCH 0515/4636] goldendict: enable on darwin

---
 .../0001-dont-check-for-updates.patch         | 49 +++++++++++++
 .../goldendict/0001-dont-use-maclibs.patch    | 62 ++++++++++++++++
 pkgs/applications/misc/goldendict/default.nix | 71 ++++++++++++++-----
 pkgs/top-level/all-packages.nix               |  4 +-
 4 files changed, 167 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/applications/misc/goldendict/0001-dont-check-for-updates.patch
 create mode 100644 pkgs/applications/misc/goldendict/0001-dont-use-maclibs.patch

diff --git a/pkgs/applications/misc/goldendict/0001-dont-check-for-updates.patch b/pkgs/applications/misc/goldendict/0001-dont-check-for-updates.patch
new file mode 100644
index 000000000000..31c7a6382292
--- /dev/null
+++ b/pkgs/applications/misc/goldendict/0001-dont-check-for-updates.patch
@@ -0,0 +1,49 @@
+diff --git i/config.cc w/config.cc
+index 04b63f5..7a453d9 100644
+--- i/config.cc
++++ w/config.cc
+@@ -182,7 +182,7 @@ Preferences::Preferences():
+   pronounceOnLoadPopup( false ),
+   useInternalPlayer( InternalPlayerBackend::anyAvailable() ),
+   internalPlayerBackend( InternalPlayerBackend::defaultBackend() ),
+-  checkForNewReleases( true ),
++  checkForNewReleases( false ),
+   disallowContentFromOtherSites( false ),
+   enableWebPlugins( false ),
+   hideGoldenDictHeader( false ),
+@@ -867,8 +867,8 @@ Class load() THROW_SPEC( exError )
+       c.preferences.proxyServer.systemProxyPassword = proxy.namedItem( "systemProxyPassword" ).toElement().text();
+     }
+ 
+-    if ( !preferences.namedItem( "checkForNewReleases" ).isNull() )
+-      c.preferences.checkForNewReleases = ( preferences.namedItem( "checkForNewReleases" ).toElement().text() == "1" );
++    //if ( !preferences.namedItem( "checkForNewReleases" ).isNull() )
++    //  c.preferences.checkForNewReleases = ( preferences.namedItem( "checkForNewReleases" ).toElement().text() == "1" );
+ 
+     if ( !preferences.namedItem( "disallowContentFromOtherSites" ).isNull() )
+       c.preferences.disallowContentFromOtherSites = ( preferences.namedItem( "disallowContentFromOtherSites" ).toElement().text() == "1" );
+@@ -1819,9 +1819,9 @@ void save( Class const & c ) THROW_SPEC( exError )
+       proxy.appendChild( opt );
+     }
+ 
+-    opt = dd.createElement( "checkForNewReleases" );
+-    opt.appendChild( dd.createTextNode( c.preferences.checkForNewReleases ? "1" : "0" ) );
+-    preferences.appendChild( opt );
++    //opt = dd.createElement( "checkForNewReleases" );
++    //opt.appendChild( dd.createTextNode( c.preferences.checkForNewReleases ? "1" : "0" ) );
++    //preferences.appendChild( opt );
+ 
+     opt = dd.createElement( "disallowContentFromOtherSites" );
+     opt.appendChild( dd.createTextNode( c.preferences.disallowContentFromOtherSites ? "1" : "0" ) );
+diff --git i/preferences.cc w/preferences.cc
+index 72c3147..7e48f00 100644
+--- i/preferences.cc
++++ w/preferences.cc
+@@ -314,6 +314,7 @@ Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ):
+            this, SLOT( customProxyToggled( bool ) ) );
+ 
+   ui.checkForNewReleases->setChecked( p.checkForNewReleases );
++  ui.checkForNewReleases->setEnabled( false );
+   ui.disallowContentFromOtherSites->setChecked( p.disallowContentFromOtherSites );
+   ui.enableWebPlugins->setChecked( p.enableWebPlugins );
+   ui.hideGoldenDictHeader->setChecked( p.hideGoldenDictHeader );
diff --git a/pkgs/applications/misc/goldendict/0001-dont-use-maclibs.patch b/pkgs/applications/misc/goldendict/0001-dont-use-maclibs.patch
new file mode 100644
index 000000000000..fc1fcbb0db07
--- /dev/null
+++ b/pkgs/applications/misc/goldendict/0001-dont-use-maclibs.patch
@@ -0,0 +1,62 @@
+diff --git i/goldendict.pro w/goldendict.pro
+index 328dc20..5202a07 100644
+--- i/goldendict.pro
++++ w/goldendict.pro
+@@ -210,21 +210,18 @@ mac {
+         -llzo2
+     !CONFIG( no_ffmpeg_player ) {
+         LIBS += -lao \
+-            -lavutil-gd \
+-            -lavformat-gd \
+-            -lavcodec-gd
++            -lavutil \
++            -lavformat \
++            -lavcodec
+     }
+-    INCLUDEPATH = $${PWD}/maclibs/include
+-    LIBS += -L$${PWD}/maclibs/lib -framework AppKit -framework Carbon
++    LIBS += -framework AppKit -framework Carbon
+     OBJECTIVE_SOURCES += lionsupport.mm \
+                          machotkeywrapper.mm \
+                          macmouseover.mm \
+                          speechclient_mac.mm
+     ICON = icons/macicon.icns
+     QMAKE_INFO_PLIST = myInfo.plist
+-    QMAKE_POST_LINK = mkdir -p GoldenDict.app/Contents/Frameworks & \
+-                      cp -nR $${PWD}/maclibs/lib/ GoldenDict.app/Contents/Frameworks/ & \
+-                      mkdir -p GoldenDict.app/Contents/MacOS/locale & \
++    QMAKE_POST_LINK = mkdir -p GoldenDict.app/Contents/MacOS/locale & \
+                       cp -R locale/*.qm GoldenDict.app/Contents/MacOS/locale/ & \
+                       mkdir -p GoldenDict.app/Contents/MacOS/help & \
+                       cp -R $${PWD}/help/*.qch GoldenDict.app/Contents/MacOS/help/
+@@ -232,15 +229,6 @@ mac {
+     CONFIG += zim_support
+     !CONFIG( no_chinese_conversion_support ) {
+         CONFIG += chinese_conversion_support
+-        CONFIG( x86 ) {
+-            QMAKE_POST_LINK += & mkdir -p GoldenDict.app/Contents/MacOS/opencc & \
+-                                 cp -R $${PWD}/opencc/*.json GoldenDict.app/Contents/MacOS/opencc/ & \
+-                                 cp -R $${PWD}/opencc/*.ocd GoldenDict.app/Contents/MacOS/opencc/
+-        } else {
+-            QMAKE_POST_LINK += & mkdir -p GoldenDict.app/Contents/MacOS/opencc & \
+-                                 cp -R $${PWD}/opencc/x64/*.json GoldenDict.app/Contents/MacOS/opencc/ & \
+-                                 cp -R $${PWD}/opencc/x64/*.ocd GoldenDict.app/Contents/MacOS/opencc/
+-        }
+     }
+ }
+ DEFINES += PROGRAM_VERSION=\\\"$$VERSION\\\"
+diff --git i/tiff.cc w/tiff.cc
+index e3cb8bf..9ff880f 100644
+--- i/tiff.cc
++++ w/tiff.cc
+@@ -6,8 +6,8 @@
+ #include "tiff.hh"
+ 
+ #if defined (Q_OS_MAC) || defined (Q_OS_WIN)
+-#include "tiff/tiff.h"
+-#include "tiff/tiffio.h"
++#include "tiff.h"
++#include "tiffio.h"
+ #else
+ #include "tiff.h"
+ #include "tiffio.h"
diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix
index e917cc024d5b..cd8ecc18223b 100644
--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/pkgs/applications/misc/goldendict/default.nix
@@ -1,33 +1,68 @@
-{ mkDerivation, lib, fetchFromGitHub, pkgconfig, libXtst, libvorbis, hunspell
-, libao, ffmpeg, libeb, lzo, xz, libtiff, opencc
-, qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake }:
-mkDerivation {
+{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig
+, libXtst, libvorbis, hunspell, lzo, xz, bzip2, libiconv
+, qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake
+, withCC ? true, opencc
+, withEpwing ? true, libeb
+, withExtraTiff ? true, libtiff
+, withFFmpeg ? true, libao, ffmpeg
+, withMultimedia ? true
+, withZim ? true }:
+
+mkDerivation rec {
+  pname = "goldendict";
+  version = "2020-01-09";
 
-  name = "goldendict-2019-08-01";
   src = fetchFromGitHub {
     owner = "goldendict";
-    repo = "goldendict";
-    rev = "0f951b06a55f3a201891cf645a556e773bda5f52";
-    sha256 = "1d1hn95vhvsmbq9q96l5adn90g0hg25dl01knb4y4v6v9x4yrl2x";
+    repo = pname;
+    rev = "da197ff5cd0e7326124c9240a1853a0e8b1de439";
+    sha256 = "0dlzwjh9wg4bzhhib71jycpp21qw762ww63a37dd50z1ymi61lxc";
   };
 
+  patches = [
+    ./0001-dont-check-for-updates.patch
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    ./0001-dont-use-maclibs.patch
+  ];
+
+  postPatch = ''
+    substituteInPlace goldendict.pro \
+      --replace "hunspell-1.6.1" "hunspell-${stdenv.lib.versions.majorMinor hunspell.version}"
+  '';
+
   nativeBuildInputs = [ pkgconfig qmake ];
   buildInputs = [
-    qtbase qtsvg qtwebkit qtx11extras qttools
-    libXtst libvorbis hunspell libao ffmpeg libeb lzo xz libtiff opencc
-  ];
+    qtbase qtsvg qtwebkit qttools
+    libvorbis hunspell xz lzo
+  ] ++ stdenv.lib.optionals stdenv.isLinux [ qtx11extras libXtst ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ bzip2 libiconv ]
+    ++ stdenv.lib.optional withCC opencc
+    ++ stdenv.lib.optional withEpwing libeb
+    ++ stdenv.lib.optional withExtraTiff libtiff
+    ++ stdenv.lib.optionals withFFmpeg [ libao ffmpeg ];
 
-  qmakeFlags = [
+  qmakeFlags = with stdenv.lib; [
     "goldendict.pro"
-    "CONFIG+=zim_support"
-    "CONFIG+=chinese_conversion_support"
+    (optional withCC "CONFIG+=chinese_conversion_support")
+    (optional (!withCC) "CONFIG+=no_chinese_conversion_support")
+    (optional (!withEpwing) "CONFIG+=no_epwing_support")
+    (optional (!withExtraTiff) "CONFIG+=no_extra_tiff_handler")
+    (optional (!withFFmpeg) "CONFIG+=no_ffmpeg_player")
+    (optional (!withMultimedia)"CONFIG+=no_qtmultimedia_player")
+    (optional withZim "CONFIG+=zim_support")
   ];
 
-  meta = with lib; {
-    homepage = http://goldendict.org/;
+  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+    mkdir -p $out/Applications
+    mv GoldenDict.app $out/Applications
+    wrapQtApp $out/Applications/GoldenDict.app/Contents/MacOS/GoldenDict
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://goldendict.org/";
     description = "A feature-rich dictionary lookup program";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ gebner astsmtl ];
+    platforms = with platforms; linux ++ darwin;
+    maintainers = with maintainers; [ gebner astsmtl sikmir ];
     license = licenses.gpl3Plus;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa7eba6a652e..7244da0a1151 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19033,7 +19033,9 @@ in
 
   gr-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix { };
 
-  goldendict = libsForQt5.callPackage ../applications/misc/goldendict { };
+  goldendict = libsForQt5.callPackage ../applications/misc/goldendict {
+    inherit (darwin) libiconv;
+  };
 
   gomuks = callPackage ../applications/networking/instant-messengers/gomuks { };
 

From a43ec0716524f73e6407c5a9b0ff87c06d837692 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 12 Feb 2020 22:36:24 -0800
Subject: [PATCH 0516/4636] pythonPackages.seaborn: disable <py3.6, abandoned
 upstream

---
 pkgs/development/python-modules/seaborn/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix
index 10c42fea033e..5532a8afa9b1 100644
--- a/pkgs/development/python-modules/seaborn/default.nix
+++ b/pkgs/development/python-modules/seaborn/default.nix
@@ -1,5 +1,6 @@
 { lib
 , buildPythonPackage
+, pythonOlder
 , fetchPypi
 , nose
 , pandas
@@ -9,6 +10,8 @@
 buildPythonPackage rec {
   pname = "seaborn";
   version = "0.10.0";
+  disabled = pythonOlder "3.6";
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "59fe414e138d7d5ea08b0feb01b86caf4682e36fa748e3987730523a89aecbb9";
@@ -30,4 +33,4 @@ buildPythonPackage rec {
     license = with lib.licenses; [ bsd3 ];
     maintainers = with lib.maintainers; [ fridh ];
   };
-}
\ No newline at end of file
+}

From 984eb944960fcf1060a732e23e739fee47b2ca97 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 12 Feb 2020 23:13:50 -0800
Subject: [PATCH 0517/4636] python3Packages.numba: disable for python < 3.6

---
 pkgs/development/python-modules/numba/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index 4529b80556ba..829a983e3801 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, pythonOlder
 , fetchPypi
 , python
 , buildPythonPackage
@@ -15,6 +16,8 @@
 buildPythonPackage rec {
   version = "0.48.0";
   pname = "numba";
+  # uses f-strings
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;

From b4b0bc9d38b91c6dd0a4fb04d6ccf976b071c268 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 12 Feb 2020 23:09:20 -0800
Subject: [PATCH 0518/4636] python3Packages.fix-airflow: fix dependencies

---
 pkgs/development/python-modules/apache-airflow/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix
index 7bb805e4f35d..049db8a648fb 100644
--- a/pkgs/development/python-modules/apache-airflow/default.nix
+++ b/pkgs/development/python-modules/apache-airflow/default.nix
@@ -137,6 +137,8 @@ buildPythonPackage rec {
 
    substituteInPlace setup.py \
      --replace "flask>=1.1.0, <2.0" "flask" \
+     --replace "jinja2>=2.10.1, <2.11.0" "jinja2" \
+     --replace "pandas>=0.17.1, <1.0.0" "pandas" \
      --replace "flask-caching>=1.3.3, <1.4.0" "flask-caching" \
      --replace "flask-appbuilder>=1.12.5, <2.0.0" "flask-appbuilder" \
      --replace "pendulum==1.4.4" "pendulum" \
@@ -156,7 +158,7 @@ buildPythonPackage rec {
      --replace "sqlalchemy~=1.3" "sqlalchemy" \
      --replace "gunicorn>=19.5.0, <20.0" "gunicorn" \
      --replace "werkzeug>=0.14.1, <0.15.0" "werkzeug"
- 
+
   # dumb-init is only needed for CI and Docker, not relevant for NixOS.
   substituteInPlace setup.py \
      --replace "'dumb-init>=1.2.2'," ""

From 3b7f5c6762bb174bd9951a697b636e1db531e98a Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 12 Feb 2020 22:42:15 -0800
Subject: [PATCH 0519/4636] python3Packages.snowflake-connector-python: 2.1.2
 -> 2.2.0

---
 .../python-modules/snowflake-connector-python/default.nix   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix
index eb8be17797f3..84e92fa9f7c7 100644
--- a/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix
@@ -1,4 +1,5 @@
 { buildPythonPackage
+, isPy27
 , asn1crypto
 , azure-storage-blob
 , boto3
@@ -24,11 +25,12 @@
 
 buildPythonPackage rec {
   pname = "snowflake-connector-python";
-  version = "2.1.2";
+  version = "2.2.0";
+  disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "06061d59lapqrlg3gzdk4bi3v9c3q5zxfs0if5v2chg1f2l80ncr";
+    sha256 = "1d3qxjqc79fi2l4sns5svbc6kfaihivsrpycflmh50h7x0k9sv7f";
   };
 
   propagatedBuildInputs = [

From e34a0fa6681571237338e2a91d9532a76e7609e2 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Thu, 13 Feb 2020 10:23:37 +0300
Subject: [PATCH 0520/4636] gpxsee: 7.20 -> 7.22

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

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index d3d732f410fe..2f314508b749 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "gpxsee";
-  version = "7.20";
+  version = "7.22";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     rev = version;
-    sha256 = "08scvhhdadzz9iydhpkn2k618bgw26z09y6nydi3hi8fc3xfnb8d";
+    sha256 = "0gxkx255d8cn5076ync731cdygwvi95rxv463pd4rdw5srbr0gm5";
   };
 
   nativeBuildInputs = [ qmake ];

From 18859c884169595af7c03c355b1f7fc27fd945f8 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Thu, 13 Feb 2020 09:02:23 +0100
Subject: [PATCH 0521/4636] grisbi: 1.2.1 -> 1.2.2

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

diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix
index cb8cf76b9988..85b688b0c4d3 100644
--- a/pkgs/applications/office/grisbi/default.nix
+++ b/pkgs/applications/office/grisbi/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "grisbi";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/grisbi/${pname}-${version}.tar.bz2";
-    sha1 = "1159c5491967fa7afd251783013579ffb45b891b";
+    sha1 = "crv3bga72v6fw07wad0nkrgdg4war66j";
   };
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

From 72bdf27771cde873090af3f303f5c1d7a485b0db Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Thu, 13 Feb 2020 09:30:22 +0100
Subject: [PATCH 0522/4636] rxvt-unicode: fix typo in aliases.nix

---
 pkgs/top-level/aliases.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4b4991cf9791..5baec5689f1a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -384,7 +384,7 @@ mapAliases ({
   ruby_2_5_0 = throw "deprecated 2018-0213: use a newer version of ruby";
   rubyPackages_2_4 = throw "deprecated 2019-12: use a newer version of rubyPackages instead";
   rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby";
-  rxvt_unicode_with-plugins = rxvt-unicode; # added 2020-02-02
+  rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02
   rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02
   urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # added 2020-02-02
   urxvt_perl = rxvt-unicode-plugins.perl; # added 2020-02-02

From 9290e6e7bab4fe27e0f2e9979565ce5f991bcc89 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Thu, 13 Feb 2020 09:33:58 +0100
Subject: [PATCH 0523/4636] nixos/urxvtd: use new package name for rxvt-unicode

---
 nixos/modules/services/x11/urxvtd.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/x11/urxvtd.nix b/nixos/modules/services/x11/urxvtd.nix
index 9bfcfa9b065d..867ac38a944f 100644
--- a/nixos/modules/services/x11/urxvtd.nix
+++ b/nixos/modules/services/x11/urxvtd.nix
@@ -18,10 +18,10 @@ in {
     };
 
     package = mkOption {
-      default = pkgs.rxvt_unicode-with-plugins;
-      defaultText = "pkgs.rxvt_unicode-with-plugins";
+      default = pkgs.rxvt-unicode;
+      defaultText = "pkgs.rxvt-unicode";
       description = ''
-        Package to install. Usually pkgs.rxvt_unicode-with-plugins or pkgs.rxvt_unicode
+        Package to install. Usually pkgs.rxvt-unicode.
       '';
       type = types.package;
     };

From ceb35dac589503aa6b9660bde427e52a00de4f9a Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Thu, 13 Feb 2020 09:36:35 +0100
Subject: [PATCH 0524/4636] nixos/sway: use new package name for rxvt-unicode

---
 nixos/modules/programs/sway.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix
index 7e646f8737d6..364debddb0f1 100644
--- a/nixos/modules/programs/sway.nix
+++ b/nixos/modules/programs/sway.nix
@@ -88,10 +88,10 @@ in {
       default = with pkgs; [
         swaylock swayidle
         xwayland alacritty dmenu
-        rxvt_unicode # For backward compatibility (old default terminal)
+        rxvt-unicode # For backward compatibility (old default terminal)
       ];
       defaultText = literalExample ''
-        with pkgs; [ swaylock swayidle xwayland rxvt_unicode dmenu ];
+        with pkgs; [ swaylock swayidle xwayland rxvt-unicode dmenu ];
       '';
       example = literalExample ''
         with pkgs; [

From 91f81e84de0d2e6923246e9a6873520c18860bb3 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Thu, 13 Feb 2020 09:38:16 +0100
Subject: [PATCH 0525/4636] rxvt-unicode/vtwheel: use new package name for
 rxvt-unicode

---
 .../misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix
index 2f2c20558031..3d0dec20c9a4 100644
--- a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix
+++ b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
 
-  name = "rxvt_unicode-vtwheel-0.3.2";
+  name = "rxvt-unicode-vtwheel-0.3.2";
 
   src = fetchgit {
    url = "https://aur.archlinux.org/urxvt-vtwheel.git";
@@ -24,4 +24,4 @@ stdenv.mkDerivation {
     platforms = with platforms; unix;
   };
   
-}
\ No newline at end of file
+}

From d4a31f97e05ec2837823f9c30160c42ecdcec4b3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Feb 2020 08:40:30 +0000
Subject: [PATCH 0526/4636] poppler: 0.84.0 -> 0.85.0

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

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index d21b4705b978..bddb9a32e310 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -12,11 +12,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "poppler-${suffix}-${version}";
-  version = "0.84.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
+  version = "0.85.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
 
   src = fetchurl {
     url = "${meta.homepage}/poppler-${version}.tar.xz";
-    sha256 = "0ccp2gx05cz5y04k5pgbyi4ikyq60nafa7x2yx4aaf1vfkd318f7";
+    sha256 = "0jyr036scdly13hx5dxmsqp2p3jifc29h2by51msw0ih6bmpbj1b";
   };
 
   outputs = [ "out" "dev" ];

From 7ea0c42a83b2c6bfebdebea0649a35aebdb5d474 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 13 Feb 2020 04:20:00 -0500
Subject: [PATCH 0527/4636] satysfi: 0.0.3 -> 0.0.4

---
 pkgs/tools/typesetting/satysfi/default.nix | 24 +++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix
index 6a2ebb089d21..13196556cd5a 100644
--- a/pkgs/tools/typesetting/satysfi/default.nix
+++ b/pkgs/tools/typesetting/satysfi/default.nix
@@ -15,27 +15,35 @@ let
     src = fetchFromGitHub {
       owner = "gfngfn";
       repo = "camlpdf";
-      rev = "v2.2.1+satysfi";
-      sha256 = "1s8v2i8nq52kz038bvc2n0spz68fpdq6kgxrabcs6zvml6n1frzy";
+      rev = "v2.2.2+satysfi";
+      sha256 = "1dkyibjd8qb9fzljlzdsfdhb798vc9m8xqkd7295fm6bcfpr5r5k";
     };
   });
   otfm = ocamlPackages.otfm.overrideAttrs (o: {
     src = fetchFromGitHub {
       owner = "gfngfn";
       repo = "otfm";
-      rev = "v0.3.2+satysfi";
-      sha256 = "1h795pdi5qi2nwymsfvb53x56h9pqi9iiqbzw10mi6fazgd2dzhd";
+      rev = "v0.3.7+satysfi";
+      sha256 = "0y8s0ij1vp1s4h5y1hn3ns76fzki2ba5ysqdib33akdav9krbj8p";
+    };
+  });
+  yojson = ocamlPackages.yojson.overrideAttrs (o: {
+    src = fetchFromGitHub {
+      owner = "gfngfn";
+      repo = "yojson";
+      rev = "v1.4.1+satysfi";
+      sha256 = "06lajzycwmvc6s26cf40s9xn001cjxrpxijgfha3s4f4rpybb1mp";
     };
   });
 in
   stdenv.mkDerivation rec {
     pname = "satysfi";
-    version = "0.0.3";
+    version = "0.0.4";
     src = fetchFromGitHub {
       owner = "gfngfn";
       repo = "SATySFi";
       rev = "v${version}";
-      sha256 = "0qk284jhxnfb69s24j397a6155dhl4dcgamicin7sq04d0wj6c7f";
+      sha256 = "0ilvgixglklqwavf8p9mcbrjq6cjfm9pk4kqx163c0irh0lh0adv";
       fetchSubmodules = true;
     };
 
@@ -49,7 +57,7 @@ in
 
     buildInputs = [ camlpdf otfm ] ++ (with ocamlPackages; [
       ocaml findlib menhir
-      batteries camlimages core_kernel ppx_deriving uutf yojson
+      batteries camlimages core_kernel ppx_deriving uutf yojson omd cppo re
     ]);
 
     installPhase = ''
@@ -58,6 +66,8 @@ in
       cp -r ${lm}/* lib-satysfi/dist/fonts/
       cp -r ${lm-math}/otf/latinmodern-math.otf lib-satysfi/dist/fonts/
       make install PREFIX=$out LIBDIR=$out/share/satysfi
+      mkdir -p $out/share/satysfi/
+      cp -r lib-satysfi/dist/ $out/share/satysfi/
     '';
 
     meta = with stdenv.lib; {

From d799e3507940d044b0d348bac8dc70fb909778a2 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 13 Feb 2020 04:20:00 -0500
Subject: [PATCH 0528/4636] procs: 0.9.6 -> 0.9.9

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

diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix
index 280949cfdcec..3b1e471a61ab 100644
--- a/pkgs/tools/admin/procs/default.nix
+++ b/pkgs/tools/admin/procs/default.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "procs";
-  version = "0.9.6";
+  version = "0.9.9";
 
   src = fetchFromGitHub {
     owner = "dalance";
     repo = pname;
     rev = "v${version}";
-    sha256 = "06q18ynb4r9dcxc690291z9vvll9rfpc8j1gkkgfav2f1xdndzq3";
+    sha256 = "1dvwn991widribk563jn3461f1913bpga0yyfr5mnf4p4p8s59j6";
   };
 
   cargoSha256 = "11wv02nn6gp32zzcd6kmsh6ky0dzyk1qqhb5vxvmq2nxhxjlddwv";

From ef44aa017e5fd68c9516d6080fc0f2597ba0fb6c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 13 Feb 2020 04:21:00 -0500
Subject: [PATCH 0529/4636] satysfi: add marsam to maintainers

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

diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix
index 13196556cd5a..f2d447f66f6e 100644
--- a/pkgs/tools/typesetting/satysfi/default.nix
+++ b/pkgs/tools/typesetting/satysfi/default.nix
@@ -74,7 +74,7 @@ in
       homepage = https://github.com/gfngfn/SATySFi;
       description = "A statically-typed, functional typesetting system";
       license = licenses.lgpl3;
-      maintainers = [ maintainers.mt-caret ];
+      maintainers = [ maintainers.mt-caret maintainers.marsam ];
       platforms = platforms.all;
     };
   }

From 0d8210e0ed9d5833a76871f1f909afcaf69f1a00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Thu, 13 Feb 2020 10:33:26 +0100
Subject: [PATCH 0530/4636] burpsuite: 3.1.07 -> 2020.1

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

diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix
index cc7fa9ddfb0d..ebb46dfed7e1 100644
--- a/pkgs/tools/networking/burpsuite/default.nix
+++ b/pkgs/tools/networking/burpsuite/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, jre, runtimeShell }:
 
 let
-  version = "2.1.07";
+  version = "2020.1";
   jar = fetchurl {
     name = "burpsuite.jar";
     url = "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar";
-    sha256 = "0811pkxmwl9d58lgqbvyfi2q79ni5w8hs61jycxkvkqxrinpgki3";
+    sha256 = "12awfy0f8fyqjc0kza1gkmdx1g8bniw1xqaps2dhjimi6s0lq5jx";
   };
   launcher = ''
     #!${runtimeShell}

From 8b4999e8cbb57e4e9bf71b1fb4c4b6adf7016825 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Thu, 13 Feb 2020 11:18:18 +0100
Subject: [PATCH 0531/4636] lazygit: 0.14.2 -> 0.14.3

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

diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix
index 7a4276b4c9a7..aaccfe8ee762 100644
--- a/pkgs/development/tools/lazygit/default.nix
+++ b/pkgs/development/tools/lazygit/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "lazygit";
-  version = "0.14.2";
+  version = "0.14.3";
 
   goPackagePath = "github.com/jesseduffield/lazygit";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "jesseduffield";
     repo = pname;
     rev = "v${version}";
-    sha256 = "001j663l851lg59rjjkpf915rsr9c9lm1vynzw05rfwszicgkdaa";
+    sha256 = "163d05081yrbnzvpkjd7knsl50pkqg9g22ncc2hi54i1i0h5pp80";
   };
 
   meta = with stdenv.lib; {

From 967daec1eee3d1dc44e1b004657cc37de0944b9a Mon Sep 17 00:00:00 2001
From: Jacek Galowicz <jacek@galowicz.de>
Date: Thu, 13 Feb 2020 12:01:38 +0100
Subject: [PATCH 0532/4636] nixosTests.docker-containers: Port to python

---
 nixos/tests/docker-containers.nix | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/nixos/tests/docker-containers.nix b/nixos/tests/docker-containers.nix
index 9be9bfa80ce0..0e318a52d9f1 100644
--- a/nixos/tests/docker-containers.nix
+++ b/nixos/tests/docker-containers.nix
@@ -1,30 +1,27 @@
 # Test Docker containers as systemd units
 
-import ./make-test.nix ({ pkgs, lib, ... }:
-
-{
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
   name = "docker-containers";
   meta = {
     maintainers = with lib.maintainers; [ benley mkaito ];
   };
 
   nodes = {
-    docker = { pkgs, ... }:
-      {
-        virtualisation.docker.enable = true;
+    docker = { pkgs, ... }: {
+      virtualisation.docker.enable = true;
 
-        docker-containers.nginx = {
-          image = "nginx-container";
-          imageFile = pkgs.dockerTools.examples.nginx;
-          ports = ["8181:80"];
-        };
+      docker-containers.nginx = {
+        image = "nginx-container";
+        imageFile = pkgs.dockerTools.examples.nginx;
+        ports = ["8181:80"];
       };
+    };
   };
 
   testScript = ''
-    startAll;
-    $docker->waitForUnit("docker-nginx.service");
-    $docker->waitForOpenPort(8181);
-    $docker->waitUntilSucceeds("curl http://localhost:8181|grep Hello");
+    start_all()
+    docker.wait_for_unit("docker-nginx.service")
+    docker.wait_for_open_port(8181)
+    docker.wait_until_succeeds("curl http://localhost:8181 | grep Hello")
   '';
 })

From 8417e9c15fa290da49e77e398600109f0623948f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Feb 2020 11:21:10 +0000
Subject: [PATCH 0533/4636] python27Packages.nameparser: 1.0.5 -> 1.0.6

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

diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix
index 984304e9ccbf..de4803c60e49 100644
--- a/pkgs/development/python-modules/nameparser/default.nix
+++ b/pkgs/development/python-modules/nameparser/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "nameparser";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "79b5f81b9315b03ac3744d12448032490f5028b5117b721775ba97118ecd5e45";
+    sha256 = "0av5kraczczp0hvwpkdaw7kl2hk9k4dyll08rg180n52a2dm0pra";
   };
 
   LC_ALL="en_US.UTF-8";

From e4f65629dbab46933f8d872b32ddfa41df366bc6 Mon Sep 17 00:00:00 2001
From: Christoph Stich <christoph.n.stich@gmail.com>
Date: Mon, 3 Feb 2020 18:17:22 +0000
Subject: [PATCH 0534/4636] julia_13: julia-1.3.1 version bump

Added all-packages.nix
---
 pkgs/development/compilers/julia/1.3.nix      | 168 ++++++++++++++++++
 .../julia/use-system-utf8proc-julia-1.3.patch |  24 +++
 pkgs/top-level/all-packages.nix               |   6 +
 3 files changed, 198 insertions(+)
 create mode 100644 pkgs/development/compilers/julia/1.3.nix
 create mode 100644 pkgs/development/compilers/julia/use-system-utf8proc-julia-1.3.patch

diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix
new file mode 100644
index 000000000000..efb9ce391987
--- /dev/null
+++ b/pkgs/development/compilers/julia/1.3.nix
@@ -0,0 +1,168 @@
+{ stdenv, fetchurl, fetchzip, fetchFromGitHub
+# build tools
+, gfortran, m4, makeWrapper, patchelf, perl, which, python2
+, cmake
+# libjulia dependencies
+, libunwind, readline, utf8proc, zlib
+# standard library dependencies
+, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2
+# linear algebra
+, openblas, arpack
+# llvm
+, llvm
+}:
+
+with stdenv.lib;
+
+# All dependencies must use the same OpenBLAS.
+let
+  arpack_ = arpack;
+in
+let
+  arpack = arpack_.override { inherit openblas; };
+in
+
+let 
+  majorVersion = "1";
+  minorVersion = "3";
+  maintenanceVersion = "1";
+  src_sha256 = "0q9a7yc3b235psrwl5ghyxgwly25lf8n818l8h6bkf2ymdbsv5p6";
+  version = "${majorVersion}.${minorVersion}.${maintenanceVersion}";
+in 
+
+stdenv.mkDerivation rec {
+  pname = "julia";
+  inherit version;
+
+   src = fetchzip {
+     url = "https://github.com/JuliaLang/julia/releases/download/v${majorVersion}.${minorVersion}.${maintenanceVersion}/julia-${majorVersion}.${minorVersion}.${maintenanceVersion}-full.tar.gz";
+     sha256 = src_sha256;
+   };
+
+  prePatch = ''
+    export PATH=$PATH:${cmake}/bin
+    '';
+
+  patches = [
+    ./use-system-utf8proc-julia-1.3.patch
+
+    # Julia recompiles a precompiled file if the mtime stored *in* the
+    # .ji file differs from the mtime of the .ji file.  This
+    # doesn't work in Nix because Nix changes the mtime of files in
+    # the Nix store to 1. So patch Julia to accept mtimes of 1.
+    ./allow_nix_mtime.patch
+  ];
+
+  postPatch = ''
+    patchShebangs . contrib
+    for i in backtrace cmdlineargs; do
+      mv test/$i.jl{,.off}
+      touch test/$i.jl
+    done
+    rm stdlib/Sockets/test/runtests.jl && touch stdlib/Sockets/test/runtests.jl
+    rm stdlib/Distributed/test/runtests.jl && touch stdlib/Distributed/test/runtests.jl
+    sed -e 's/Invalid Content-Type:/invalid Content-Type:/g' -i ./stdlib/LibGit2/test/libgit2.jl
+    sed -e 's/Failed to resolve /failed to resolve /g' -i ./stdlib/LibGit2/test/libgit2.jl
+  '';
+
+  buildInputs = [
+    arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr
+    pcre2.dev openblas openlibm openspecfun readline utf8proc
+    zlib
+  ]
+  ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices]
+  ;
+
+  nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ];
+
+  makeFlags =
+    let
+      arch = head (splitString "-" stdenv.system);
+      march = { x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; i686 = "pentium4"; }.${arch}
+              or (throw "unsupported architecture: ${arch}");
+      # Julia requires Pentium 4 (SSE2) or better
+      cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; }.${arch}
+                  or (throw "unsupported architecture: ${arch}");
+    in [
+      "ARCH=${arch}"
+      "MARCH=${march}"
+      "JULIA_CPU_TARGET=${cpuTarget}"
+      "PREFIX=$(out)"
+      "prefix=$(out)"
+      "SHELL=${stdenv.shell}"
+
+      "USE_SYSTEM_BLAS=1"
+      "USE_BLAS64=${if openblas.blas64 then "1" else "0"}"
+      "LIBBLAS=-lopenblas"
+      "LIBBLASNAME=libopenblas"
+
+      "USE_SYSTEM_LAPACK=1"
+      "LIBLAPACK=-lopenblas"
+      "LIBLAPACKNAME=libopenblas"
+
+      "USE_SYSTEM_ARPACK=1"
+      "USE_SYSTEM_FFTW=1"
+      "USE_SYSTEM_GMP=1"
+      "USE_SYSTEM_LIBGIT2=1"
+      "USE_SYSTEM_LIBUNWIND=1"
+
+      "USE_SYSTEM_MPFR=1"
+      "USE_SYSTEM_OPENLIBM=1"
+      "USE_SYSTEM_OPENSPECFUN=1"
+      "USE_SYSTEM_PATCHELF=1"
+      "USE_SYSTEM_PCRE=1"
+      "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config"
+      "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h"
+      "USE_SYSTEM_READLINE=1"
+      "USE_SYSTEM_UTF8PROC=1"
+      "USE_SYSTEM_ZLIB=1"
+
+      "USE_BINARYBUILDER=0"
+    ];
+
+  LD_LIBRARY_PATH = makeLibraryPath [
+    arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm
+    openspecfun pcre2
+  ];
+
+  enableParallelBuilding = true;
+
+  doCheck = !stdenv.isDarwin;
+  checkTarget = "testall";
+  # Julia's tests require read/write access to $HOME
+  preCheck = ''
+    export HOME="$NIX_BUILD_TOP"
+  '';
+
+  preBuild = ''
+    sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile
+    sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
+  '';
+
+  postInstall = ''
+    # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia,
+    # as using a wrapper with LD_LIBRARY_PATH causes segmentation
+    # faults when program returns an error:
+    #   $ julia -e 'throw(Error())'
+    find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do
+      if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then
+        ln -sv $lib $out/lib/julia/$(basename $lib)
+      fi
+    done
+  '';
+
+  passthru = {
+    inherit majorVersion minorVersion maintenanceVersion;
+    site = "share/julia/site/v${majorVersion}.${minorVersion}";
+  };
+
+  meta = {
+    description = "High-level performance-oriented dynamical language for technical computing";
+    homepage = https://julialang.org/;
+    license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ];
+    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
+    broken = stdenv.isi686;
+  };
+}
diff --git a/pkgs/development/compilers/julia/use-system-utf8proc-julia-1.3.patch b/pkgs/development/compilers/julia/use-system-utf8proc-julia-1.3.patch
new file mode 100644
index 000000000000..63e0ba9ab057
--- /dev/null
+++ b/pkgs/development/compilers/julia/use-system-utf8proc-julia-1.3.patch
@@ -0,0 +1,24 @@
+---
+ src/flisp/Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+
+diff --git a/src/flisp/Makefile b/src/flisp/Makefile
+index d97075e..6bebca7 100644
+--- a/src/flisp/Makefile
++++ b/src/flisp/Makefile
+@@ -32,9 +32,9 @@ OBJS := $(SRCS:%.c=$(BUILDDIR)/%.o)
+ DOBJS := $(SRCS:%.c=$(BUILDDIR)/%.dbg.obj)
+ LLT_release := $(LLT_BUILDDIR)/libsupport.a
+ LLT_debug := $(LLT_BUILDDIR)/libsupport-debug.a
+-LIBFILES_release := $(LLT_release) $(LIBUV) $(LIBUTF8PROC)
+-LIBFILES_debug := $(LLT_debug) $(LIBUV) $(LIBUTF8PROC)
+-LIBS :=
++LIBFILES_release := $(LLT_release) $(LIBUV)
++LIBFILES_debug := $(LLT_debug) $(LIBUV)
++LIBS := $(LIBUTF8PROC)
+ ifneq ($(OS),WINNT)
+ LIBS += -lpthread
+ endif
+
+-- 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c8fe84c0b60..761c456e1018 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8502,6 +8502,12 @@ in
     inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
   };
 
+  julia_13 = callPackage ../development/compilers/julia/1.3.nix {
+    gmp = gmp6;
+    openblas = openblasCompat;
+    inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
+  };
+
   julia_1 = julia_10;
   julia = julia_1;
 

From c4fe8c0f69f9701fa5c7ae819285de8c8c9bdbf6 Mon Sep 17 00:00:00 2001
From: Christoph Stich <christoph.n.stich@gmail.com>
Date: Thu, 13 Feb 2020 11:57:14 +0000
Subject: [PATCH 0535/4636] julia_13: Fixed darwin dependencies

---
 pkgs/development/compilers/julia/1.3.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix
index efb9ce391987..5b1300ba240b 100644
--- a/pkgs/development/compilers/julia/1.3.nix
+++ b/pkgs/development/compilers/julia/1.3.nix
@@ -8,8 +8,8 @@
 , curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2
 # linear algebra
 , openblas, arpack
-# llvm
-, llvm
+# Darwin frameworks
+, CoreServices, ApplicationServices
 }:
 
 with stdenv.lib;
@@ -83,6 +83,8 @@ stdenv.mkDerivation rec {
       # Julia requires Pentium 4 (SSE2) or better
       cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; }.${arch}
                   or (throw "unsupported architecture: ${arch}");
+      # Julia applies a lot of patches to its dependencies, so for now do not use the system LLVM
+      # https://github.com/JuliaLang/julia/tree/master/deps/patches
     in [
       "ARCH=${arch}"
       "MARCH=${march}"

From 39ab83dc8d1e09da2fcc695707409ac49c93a43c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Feb 2020 12:02:42 +0000
Subject: [PATCH 0536/4636] python27Packages.diff_cover: 2.5.2 -> 2.6.0

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

diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix
index 7066a188c773..585f96341eef 100644
--- a/pkgs/development/python-modules/diff_cover/default.nix
+++ b/pkgs/development/python-modules/diff_cover/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "diff_cover";
-  version = "2.5.2";
+  version = "2.6.0";
 
   preCheck = ''
     export LC_ALL=en_US.UTF-8;
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "09pgzx2m04hzpckwgz4iz9590ll5fk1mirlra89qps8ig1xmz5m5";
+    sha256 = "1bsxc9x3yx5dy2r3b3lzi97wz0ma3ncd14jr27n6lbqvl20w92mm";
   };
 
   propagatedBuildInputs = [ jinja2 jinja2_pluralize pygments six inflect ];

From 25f706b26ca0d7932cb9fb66260f2ff9ae72b5f9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 13 Feb 2020 07:41:14 -0500
Subject: [PATCH 0537/4636] linux: 5.5-rc7 -> 5.6-rc1

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 00dcb6f0f488..6e3abb792bd9 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -3,15 +3,15 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.5-rc7";
-  extraMeta.branch = "5.5";
+  version = "5.6-rc1";
+  extraMeta.branch = "5.6";
 
   # modDirVersion needs to be x.y.z, will always add .0
   modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg;
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "10fjk4bw73x5xpb4q83ngni7slw489wdxhdwmyrkfqqy5chgm290";
+    sha256 = "1ir7mdzxrin7k6a7ldfmpl9bbapkr99l3pd07dv8589vcrd43zlh";
   };
 
   # Should the testing kernels ever be built on Hydra?

From f57ef4e32ab6b2b09cc5677e7f4a779e4c882477 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Thu, 13 Feb 2020 14:30:29 +0100
Subject: [PATCH 0538/4636] heroku: 7.35.1 -> 7.38.1

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

diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix
index 58e9c67dd449..1e2359f10033 100644
--- a/pkgs/development/tools/heroku/default.nix
+++ b/pkgs/development/tools/heroku/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "heroku";
-  version = "7.35.1";
+  version = "7.38.1";
 
   src = fetchurl {
     url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz";
-    sha256 = "1b48jhl7a9nzvgankys32mfnv6i2kx11z874k7fz9px3kx8s7pbb";
+    sha256 = "1sa4ph4d5y48yz2n06aivqgl07ljlgwgf5ik431vnrz5smxl6ngr";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = https://cli.heroku.com;
+    homepage = "https://cli.heroku.com";
     description = "Everything you need to get started using Heroku";
     maintainers = with lib.maintainers; [ aflatter mirdhyn peterhoeg ];
     license = lib.licenses.mit;

From b9f176a719b083efa2fae4990ebfc78fd8467dec Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Thu, 13 Feb 2020 12:16:38 +0100
Subject: [PATCH 0539/4636] nix-prefetch-git: add gawk to PATH

The prefetch script requires awk to be in PATH and fails otherwise.

Fixes #79968
---
 .../tools/package-management/nix-prefetch-scripts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
index c23db106ea1f..2c5781a95b8c 100644
--- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
+++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
@@ -1,5 +1,5 @@
 { stdenv, makeWrapper, buildEnv,
-  git, subversion, mercurial, bazaar, cvs, gnused, coreutils, nix, findutils
+  bazaar, coreutils, cvs, findutils, gawk, git, gnused, mercurial, nix, subversion
 }:
 
 let mkPrefetchScript = tool: src: deps:
@@ -28,7 +28,7 @@ let mkPrefetchScript = tool: src: deps:
 in rec {
   nix-prefetch-bzr = mkPrefetchScript "bzr" ../../../build-support/fetchbzr/nix-prefetch-bzr [ bazaar ];
   nix-prefetch-cvs = mkPrefetchScript "cvs" ../../../build-support/fetchcvs/nix-prefetch-cvs [ cvs ];
-  nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [ git coreutils findutils ];
+  nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [ coreutils findutils gawk git ];
   nix-prefetch-hg  = mkPrefetchScript "hg"  ../../../build-support/fetchhg/nix-prefetch-hg   [ mercurial ];
   nix-prefetch-svn = mkPrefetchScript "svn" ../../../build-support/fetchsvn/nix-prefetch-svn [ subversion ];
 

From de9bac3b86f69500e9a5293e235f0ec17bc2625d Mon Sep 17 00:00:00 2001
From: Jacek Galowicz <jacek@galowicz.de>
Date: Thu, 13 Feb 2020 16:34:02 +0100
Subject: [PATCH 0540/4636] nixosTests.nsd: Port to python

---
 nixos/tests/nsd.nix | 52 ++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/nixos/tests/nsd.nix b/nixos/tests/nsd.nix
index c3c91e71b5ca..bcc14e817a87 100644
--- a/nixos/tests/nsd.nix
+++ b/nixos/tests/nsd.nix
@@ -5,7 +5,7 @@ let
     # for a host utility with IPv6 support
     environment.systemPackages = [ pkgs.bind ];
   };
-in import ./make-test.nix ({ pkgs, ...} : {
+in import ./make-test-python.nix ({ pkgs, ...} : {
   name = "nsd";
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ aszlig ];
@@ -65,37 +65,35 @@ in import ./make-test.nix ({ pkgs, ...} : {
   };
 
   testScript = ''
-    startAll;
+    start_all()
 
-    $clientv4->waitForUnit("network.target");
-    $clientv6->waitForUnit("network.target");
-    $server->waitForUnit("nsd.service");
+    clientv4.wait_for_unit("network.target")
+    clientv6.wait_for_unit("network.target")
+    server.wait_for_unit("nsd.service")
 
-    sub assertHost {
-      my ($type, $rr, $query, $expected) = @_;
-      my $self = $type eq 4 ? $clientv4 : $clientv6;
-      my $out = $self->succeed("host -$type -t $rr $query");
-      $self->log("output: $out");
-      chomp $out;
-      die "DNS IPv$type query on $query gave '$out' instead of '$expected'"
-        if ($out !~ $expected);
-    }
 
-    foreach (4, 6) {
-      subtest "ipv$_", sub {
-        assertHost($_, "a", "example.com", qr/has no [^ ]+ record/);
-        assertHost($_, "aaaa", "example.com", qr/has no [^ ]+ record/);
+    def assert_host(type, rr, query, expected):
+        self = clientv4 if type == 4 else clientv6
+        out = self.succeed(f"host -{type} -t {rr} {query}").rstrip()
+        self.log(f"output: {out}")
+        assert re.search(
+            expected, out
+        ), f"DNS IPv{type} query on {query} gave '{out}' instead of '{expected}'"
 
-        assertHost($_, "soa", "example.com", qr/SOA.*?noc\.example\.com/);
-        assertHost($_, "a", "ipv4.example.com", qr/address 1.2.3.4$/);
-        assertHost($_, "aaaa", "ipv6.example.com", qr/address abcd::eeff$/);
 
-        assertHost($_, "a", "deleg.example.com", qr/address 9.8.7.6$/);
-        assertHost($_, "aaaa", "deleg.example.com", qr/address fedc::bbaa$/);
+    for ipv in 4, 6:
+        with subtest(f"IPv{ipv}"):
+            assert_host(ipv, "a", "example.com", "has no [^ ]+ record")
+            assert_host(ipv, "aaaa", "example.com", "has no [^ ]+ record")
 
-        assertHost($_, "a", "root", qr/address 1.8.7.4$/);
-        assertHost($_, "aaaa", "root", qr/address acbd::4$/);
-      };
-    }
+            assert_host(ipv, "soa", "example.com", "SOA.*?noc\.example\.com")
+            assert_host(ipv, "a", "ipv4.example.com", "address 1.2.3.4$")
+            assert_host(ipv, "aaaa", "ipv6.example.com", "address abcd::eeff$")
+
+            assert_host(ipv, "a", "deleg.example.com", "address 9.8.7.6$")
+            assert_host(ipv, "aaaa", "deleg.example.com", "address fedc::bbaa$")
+
+            assert_host(ipv, "a", "root", "address 1.8.7.4$")
+            assert_host(ipv, "aaaa", "root", "address acbd::4$")
   '';
 })

From 08a304f6b5e7b4baed0d672e5b9f239b20a46332 Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Thu, 6 Feb 2020 11:54:16 +0100
Subject: [PATCH 0541/4636] rbtools: 0.7.2 -> 1.0.2

---
 .../python-modules/rbtools/default.nix        | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix
index 99f1df09bbf4..71b40318a514 100644
--- a/pkgs/development/python-modules/rbtools/default.nix
+++ b/pkgs/development/python-modules/rbtools/default.nix
@@ -1,26 +1,29 @@
 { stdenv
 , buildPythonPackage
 , fetchurl
-, nose
-, six
-, setuptools
 , isPy3k
+, setuptools
+, colorama
+, six
+, texttable
+, tqdm
 }:
 
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "rbtools";
-  version = "0.7.2";
-  disabled = isPy3k;
+  version = "1.0.2";
+
+  disabled = !isPy3k;
 
   src = fetchurl {
-    url = "http://downloads.reviewboard.org/releases/RBTools/0.7/RBTools-0.7.2.tar.gz";
-    sha256 = "1ng8l8cx81cz23ls7fq9wz4ijs0zbbaqh4kj0mj6plzcqcf8na4i";
+    url = "https://downloads.reviewboard.org/releases/RBTools/${stdenv.lib.versions.majorMinor version}/RBTools-${version}.tar.gz";
+    sha256 = "577c2f8bbf88f77bda84ee95af0310b59111c156f48a5aab56ca481e2f77eaf4";
   };
 
-  checkInputs = [ nose ];
-  propagatedBuildInputs = [ six setuptools ];
+  propagatedBuildInputs = [ six texttable tqdm colorama setuptools ];
 
-  checkPhase = "LC_ALL=C nosetests";
+  # The kgb test dependency is not in nixpkgs
+  doCheck = false;
 
   meta = with stdenv.lib; {
     homepage = https://www.reviewboard.org/docs/rbtools/dev/;

From c7dab2af253bfabd311dae0719ab30e27158ff3f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Feb 2020 15:34:40 +0000
Subject: [PATCH 0542/4636] python37Packages.nest-asyncio: 1.2.2 -> 1.2.3

---
 pkgs/development/python-modules/nest-asyncio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix
index 102c41d0117e..12412860f880 100644
--- a/pkgs/development/python-modules/nest-asyncio/default.nix
+++ b/pkgs/development/python-modules/nest-asyncio/default.nix
@@ -5,16 +5,16 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.2.2";
+  version = "1.2.3";
   pname = "nest_asyncio";
   disabled = !(pythonAtLeast "3.5");
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "06hw495yqg60j738jp3qaxryhyrs36lpgmblf1sm2m2c3mgm92p5";
+    sha256 = "0fznrg32rk6fmvpfdxwwhadh526gdjivmdifg2hiciil2gr8n1s3";
   };
 
-  # tests not packaged with source dist as of 1.2.2/1.2.2, and
+  # tests not packaged with source dist as of 1.2.3/1.2.3, and
   # can't check tests out of GitHub easily without specific commit IDs (no tagged releases)
   doCheck = false;
   pythonImportsCheck = [ "nest_asyncio" ];

From 17c2ae932cfa2206d5f0b301946f6f508112dbcc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Feb 2020 07:33:42 +0000
Subject: [PATCH 0543/4636] python27Packages.av: 6.2.0 -> 7.0.1

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

diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix
index 8998abd6986a..38f658cf9826 100644
--- a/pkgs/development/python-modules/av/default.nix
+++ b/pkgs/development/python-modules/av/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "av";
-  version = "6.2.0";
+  version = "7.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1wm33qajxcpl9rn7zfb2pwwqn87idb7ic7h5zwy2hgbpjnh3vc2g";
+    sha256 = "10qav9dryly9h6n8vypx5m334v2lh88fsvgfg0zjy4bxjslay4zv";
   };
 
   checkInputs = [ numpy ];

From ef7ba860c42680e2e7263da3595ee2a3ab015f77 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Feb 2020 15:03:32 +0000
Subject: [PATCH 0544/4636] python27Packages.gym: 0.15.4 -> 0.15.6

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

diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix
index d90ded1fb5fa..d9d66e7a204d 100644
--- a/pkgs/development/python-modules/gym/default.nix
+++ b/pkgs/development/python-modules/gym/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "gym";
-  version = "0.15.4";
+  version = "0.15.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3b930cbe1c76bbd30455b5e82ba723dea94159a5f988e927f443324bf7cc7ddd";
+    sha256 = "0qpx4w6k42sb9ncjk4r6i22qjbcxcnha43svhvvq1nh7796xqzgd";
   };
 
   postPatch = ''

From 05928690e18573e91f9c1845a87e82ba2a4aee48 Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Thu, 13 Feb 2020 18:31:58 +0200
Subject: [PATCH 0545/4636] nethack: 3.6.2 -> 3.6.5

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

diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix
index 07f84e498db7..9a60abdc1500 100644
--- a/pkgs/games/nethack/default.nix
+++ b/pkgs/games/nethack/default.nix
@@ -19,14 +19,14 @@ let
   binPath = lib.makeBinPath [ coreutils less ];
 
 in stdenv.mkDerivation rec {
-  version = "3.6.2";
+  version = "3.6.5";
   name = if x11Mode then "nethack-x11-${version}"
          else if qtMode then "nethack-qt-${version}"
          else "nethack-${version}";
 
   src = fetchurl {
-    url = "https://nethack.org/download/3.6.2/nethack-362-src.tgz";
-    sha256 = "07fvkm3v11a4pjrq2f66vjslljsvk6raal53skn4gqsfdbd0ml7v";
+    url = "https://nethack.org/download/3.6.5/nethack-365-src.tgz";
+    sha256 = "0xifs8pqfffnmkbpmrcd1xf14yakcj06nl2bbhy4dyacg8myysmv";
   };
 
   buildInputs = [ ncurses ]

From 1ac4319bcc06cb4d20f996c96655ebdc18ea9ec1 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Thu, 13 Feb 2020 18:49:57 +0300
Subject: [PATCH 0546/4636] qlandkartegt: fix broken download links

---
 pkgs/applications/misc/qlandkartegt/default.nix   | 2 +-
 pkgs/applications/misc/qlandkartegt/garmindev.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/qlandkartegt/default.nix b/pkgs/applications/misc/qlandkartegt/default.nix
index aae38f7d0f17..b9645980c64a 100644
--- a/pkgs/applications/misc/qlandkartegt/default.nix
+++ b/pkgs/applications/misc/qlandkartegt/default.nix
@@ -7,7 +7,7 @@ mkDerivation rec {
   version = "1.8.1";
 
   src = fetchurl {
-    url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
     sha256 = "1rwv5ar5jv15g1cc6pp0lk69q3ip10pjazsh3ds2ggaciymha1ly";
   };
 
diff --git a/pkgs/applications/misc/qlandkartegt/garmindev.nix b/pkgs/applications/misc/qlandkartegt/garmindev.nix
index a679a4f1112f..382e7dbe1218 100644
--- a/pkgs/applications/misc/qlandkartegt/garmindev.nix
+++ b/pkgs/applications/misc/qlandkartegt/garmindev.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.3.4";
 
   src = fetchurl {
-    url = "https://bitbucket.org/maproom/qlandkarte-gt/downloads/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/qlandkartegt/${pname}-${version}.tar.gz";
     sha256 = "1mc7rxdn9790pgbvz02xzipxp2dp9h4hfq87xgawa18sp9jqzhw6";
   };
 

From c87ec93392e5bc178c384e98bf6fde3336ece60a Mon Sep 17 00:00:00 2001
From: devhell <devhell@mailfresser.de>
Date: Thu, 13 Feb 2020 14:54:32 +0000
Subject: [PATCH 0547/4636] profanity: 0.7.1 -> 0.8.1

Changelog available at:
https://github.com/profanity-im/profanity/releases/tag/0.8.1
---
 .../networking/instant-messengers/profanity/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index 8281e3b606a7..f6c1aa14e0ff 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -22,13 +22,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "profanity";
-  version = "0.7.1";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "profanity-im";
     repo = "profanity";
     rev = version;
-    sha256 = "1mcgr86wqyzqx7mqxfkk2jwx6cgnvrky3zi4v1ww0lh6j05wj9gf";
+    sha256 = "0fg5xcdlvhsi7a40w4jcxyj7m7wl42jy1cvsa8fi2gb6g9y568k8";
   };
 
   patches = [ ./patches/packages-osx.patch ./patches/undefined-macros.patch ];

From 5c403726bc0b81a09491b1ef1b23785dbdfa62bb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Feb 2020 09:59:30 +0000
Subject: [PATCH 0548/4636] postman: 7.16.1 -> 7.18.0

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

diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix
index 7c91eaafcaed..142ce8cd5e8c 100644
--- a/pkgs/development/web/postman/default.nix
+++ b/pkgs/development/web/postman/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "postman";
-  version = "7.16.1";
+  version = "7.18.0";
 
   src = fetchurl {
     url = "https://dl.pstmn.io/download/version/${version}/linux64";
-    sha256 = "10x1f09zgd5mlhlqjfjl6pmkypyp8dbnvlhrc8rd4y19yjp930jx";
+    sha256 = "144yd4w1hqjmcp5v24ghkxh78fxc5ylzbgv7szp7y3vhwdanaiy7";
     name = "${pname}.tar.gz";
   };
 

From 9cfe5a7a541052cffa78c94af5f04883125424c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 13 Feb 2020 15:56:29 +0000
Subject: [PATCH 0549/4636] nixos/redis: add requirePassFile option

Avoids having the password in the nix store.
---
 nixos/modules/services/databases/redis.nix | 47 +++++++++++++++-------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix
index 70895fa53e45..5c817422aae5 100644
--- a/nixos/modules/services/databases/redis.nix
+++ b/nixos/modules/services/databases/redis.nix
@@ -150,10 +150,20 @@ in
       requirePass = mkOption {
         type = with types; nullOr str;
         default = null;
-        description = "Password for database (STORED PLAIN TEXT, WORLD-READABLE IN NIX STORE)";
+        description = ''
+          Password for database (STORED PLAIN TEXT, WORLD-READABLE IN NIX STORE).
+          Use requirePassFile to store it outside of the nix store in a dedicated file.
+        '';
         example = "letmein!";
       };
 
+      requirePassFile = mkOption {
+        type = with types; nullOr path;
+        default = null;
+        description = "File with password for the database.";
+        example = "/run/keys/redis-password";
+      };
+
       appendOnly = mkOption {
         type = types.bool;
         default = false;
@@ -192,6 +202,10 @@ in
   ###### implementation
 
   config = mkIf config.services.redis.enable {
+    assertions = [{
+      assertion = cfg.requirePass != null -> cfg.requirePassFile == null;
+      message = "You can only set one services.redis.requirePass or services.redis.requirePassFile";
+    }];
     boot.kernel.sysctl = (mkMerge [
       { "vm.nr_hugepages" = "0"; }
       ( mkIf cfg.vmOverCommit { "vm.overcommit_memory" = "1"; } )
@@ -208,21 +222,26 @@ in
 
     environment.systemPackages = [ cfg.package ];
 
-    systemd.services.redis =
-      { description = "Redis Server";
+    systemd.services.redis = {
+      description = "Redis Server";
 
-        wantedBy = [ "multi-user.target" ];
-        after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
 
-        serviceConfig = {
-          ExecStart = "${cfg.package}/bin/redis-server ${redisConfig}";
-          RuntimeDirectory = "redis";
-          StateDirectory = "redis";
-          Type = "notify";
-          User = "redis";
-        };
+      preStart = ''
+        install -m 600 ${redisConfig} /run/redis/redis.conf
+      '' + optionalString (cfg.requirePassFile != null) ''
+        password=$(cat ${escapeShellArg cfg.requirePassFile})
+        echo "requirePass $password" >> /run/redis/redis.conf
+      '';
+
+      serviceConfig = {
+        ExecStart = "${cfg.package}/bin/redis-server /run/redis/redis.conf";
+        RuntimeDirectory = "redis";
+        StateDirectory = "redis";
+        Type = "notify";
+        User = "redis";
       };
-
+    };
   };
-
 }

From a5c2fc61c31a731293682cbbc4732dde72a98ecf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Feb 2020 07:42:52 +0000
Subject: [PATCH 0550/4636] piper: 0.3 -> 0.4

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

diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix
index 1229c442fa22..4eb1b2c8c14a 100644
--- a/pkgs/os-specific/linux/piper/default.nix
+++ b/pkgs/os-specific/linux/piper/default.nix
@@ -4,7 +4,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "piper";
-  version = "0.3";
+  version = "0.4";
 
   format = "other";
 
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
     owner  = "libratbag";
     repo   = "piper";
     rev    =  version;
-    sha256 = "1vz7blhx6qsfrk5znwr0fj1k8vahnlaz6rn7ifcgxmq398mmz8z7";
+    sha256 = "17h06j8lxpbfygq8fzycl7lml4vv7r05bsyhh3gga2hp0zms4mvg";
   };
 
   nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];

From 04fb02a944ea7289663d0c596d2d1b0cc113fb45 Mon Sep 17 00:00:00 2001
From: Melissa Goad <mszoopers@protonmail.com>
Date: Thu, 13 Feb 2020 08:11:50 -0600
Subject: [PATCH 0551/4636] mame: 0.217 -> 0.218

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

diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix
index 3c205a703759..a0455b88bec2 100644
--- a/pkgs/misc/emulators/mame/default.nix
+++ b/pkgs/misc/emulators/mame/default.nix
@@ -4,7 +4,7 @@
 
 let
   majorVersion = "0";
-  minorVersion = "217";
+  minorVersion = "218";
 
   desktopItem = makeDesktopItem {
     name = "MAME";
@@ -23,7 +23,7 @@ in mkDerivation {
     owner = "mamedev";
     repo = "mame";
     rev = "mame${majorVersion}${minorVersion}";
-    sha256 = "0yzn29fp72k2g5xgv47ss6fr3sk9wdxw9f52nwld1baxr2adc0qx";
+    sha256 = "11qschyxhi45pbpf9q3k71kybqxmcfhjml8axqpi43sv4q2ack6q";
   };
 
   hardeningDisable = [ "fortify" ];

From d7131ce4ad5eed30f72df34b84a6f4e3a1c8944b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 13 Feb 2020 11:37:38 -0600
Subject: [PATCH 0552/4636] stretchly: 0.21.0 -> 0.21.1, use system electron,
 simplify

---
 pkgs/applications/misc/stretchly/default.nix | 205 ++++---------------
 pkgs/top-level/all-packages.nix              |   3 +-
 2 files changed, 42 insertions(+), 166 deletions(-)

diff --git a/pkgs/applications/misc/stretchly/default.nix b/pkgs/applications/misc/stretchly/default.nix
index 75f3be85dadf..9769045b9ce5 100644
--- a/pkgs/applications/misc/stretchly/default.nix
+++ b/pkgs/applications/misc/stretchly/default.nix
@@ -1,177 +1,38 @@
-{ GConf
-, alsaLib
-, at-spi2-atk
-, at-spi2-core
-, atk
-, buildFHSUserEnv
-, cairo
+{ stdenv, lib, fetchurl, makeWrapper, wrapGAppsHook, electron
 , common-updater-scripts
-, coreutils
-, cups
-, dbus
-, expat
-, fetchurl
-, fontconfig
-, gdk-pixbuf
-, glib
-, gtk2
-, gtk3
-, lib
-, libX11
-, libXScrnSaver
-, libXcomposite
-, libXcursor
-, libXdamage
-, libXext
-, libXfixes
-, libXi
-, libXrandr
-, libXrender
-, libXtst
-, libappindicator
-, libdrm
-, libnotify
-, libpciaccess
-, libpng12
-, libuuid
-, libxcb
-, nspr
-, nss
-, pango
-, pciutils
-, pulseaudio
-, runtimeShell
-, stdenv
-, udev
-, wrapGAppsHook
-, writeScript
-, file
+, writeShellScript
 }:
 
-let
-  libs = [
-    GConf
-    alsaLib
-    at-spi2-atk
-    at-spi2-core
-    atk
-    cairo
-    cups
-    dbus
-    expat
-    fontconfig
-    gdk-pixbuf
-    glib
-    gtk2
-    gtk3
-    libX11
-    libXScrnSaver
-    libXcomposite
-    libXcursor
-    libXdamage
-    libXext
-    libXfixes
-    libXi
-    libXrandr
-    libXrender
-    libXtst
-    libappindicator
-    libdrm
-    libnotify
-    libpciaccess
-    libpng12
-    libuuid
-    libxcb
-    nspr
-    nss
-    pango
-    pciutils
-    pulseaudio
-    stdenv.cc.cc.lib
-    udev
+stdenv.mkDerivation rec {
+  pname = "stretchly";
+  version = "0.21.1";
+
+  src = fetchurl {
+    url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz";
+    sha256 = "0776pywyqylwd33m85l4wdr89x0q9xkrjgliag10fp1bswz844lf";
+  };
+
+  nativeBuildInputs = [
+    wrapGAppsHook
   ];
 
-  libPath = lib.makeLibraryPath libs;
+  installPhase = ''
+    runHook preInstall
 
-  stretchly =
-    stdenv.mkDerivation rec {
-      pname = "stretchly";
-      version = "0.21.0";
+    mkdir -p $out/bin $out/share/${pname}/
+    mv resources/app.asar $out/share/${pname}/
 
-      src = fetchurl {
-        url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz";
-        sha256 = "1gyyr22xq8s4miiacs8wqhp7lxnwvkvlwhngnq8671l62s6iyjzl";
-      };
+    makeWrapper ${electron}/bin/electron $out/bin/${pname} \
+      --add-flags $out/share/${pname}/app.asar \
+      "''${gappsWrapperArgs[@]}" \
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}"
 
-      nativeBuildInputs = [
-        wrapGAppsHook
-        coreutils
-      ];
+    runHook postInstall
+  '';
 
-      buildInputs = libs;
-
-      dontPatchELF = true;
-      dontBuild = true;
-      dontConfigure = true;
-
-      installPhase = ''
-        mkdir -p $out/bin $out/lib/stretchly
-        cp -r ./* $out/lib/stretchly/
-        ln -s $out/lib/stretchly/stretchly $out/bin/
-      '';
-
-      preFixup = ''
-        patchelf --set-rpath "${libPath}" $out/lib/stretchly/libffmpeg.so
-        patchelf --set-rpath "${libPath}" $out/lib/stretchly/libEGL.so
-        patchelf --set-rpath "${libPath}" $out/lib/stretchly/libGLESv2.so
-        patchelf --set-rpath "${libPath}" $out/lib/stretchly/swiftshader/libEGL.so
-        patchelf --set-rpath "${libPath}" $out/lib/stretchly/swiftshader/libGLESv2.so
-
-        patchelf \
-          --set-rpath "$out/lib/stretchly:${libPath}" \
-          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          $out/lib/stretchly/stretchly
-
-        patchelf \
-          --set-rpath "$out/lib/stretchly:${libPath}" \
-          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          $out/lib/stretchly/chrome-sandbox
-      '';
-
-      meta = with stdenv.lib; {
-        description = "A break time reminder app";
-        longDescription = ''
-          stretchly is a cross-platform electron app that reminds you to take
-          breaks when working on your computer. By default, it runs in your tray
-          and displays a reminder window containing an idea for a microbreak for 20
-          seconds every 10 minutes. Every 30 minutes, it displays a window
-          containing an idea for a longer 5 minute break.
-        '';
-        homepage = https://hovancik.net/stretchly;
-        downloadPage = https://hovancik.net/stretchly/downloads/;
-        license = licenses.bsd2;
-        maintainers = with maintainers; [ cdepillabout ];
-        platforms = platforms.linux;
-      };
-    };
-
-in
-
-buildFHSUserEnv {
-  inherit (stretchly) meta;
-
-  name = "stretchly";
-
-  targetPkgs = pkgs: [
-     stretchly
-  ];
-
-  runScript = "stretchly";
 
   passthru = {
-    updateScript = writeScript "update-stretchly" ''
-      #!${runtimeShell}
-
+    updateScript = writeShellScript "update-stretchly" ''
       set -eu -o pipefail
 
       # get the latest release version
@@ -179,9 +40,23 @@ buildFHSUserEnv {
 
       echo "updating to $latest_version..."
 
-      ${common-updater-scripts}/bin/update-source-version stretchly.passthru.stretchlyWrapped "$latest_version"
+      ${common-updater-scripts}/bin/update-source-version stretchly "$latest_version"
     '';
+  };
 
-    stretchlyWrapped = stretchly;
+  meta = with stdenv.lib; {
+    description = "A break time reminder app";
+    longDescription = ''
+      stretchly is a cross-platform electron app that reminds you to take
+      breaks when working on your computer. By default, it runs in your tray
+      and displays a reminder window containing an idea for a microbreak for 20
+      seconds every 10 minutes. Every 30 minutes, it displays a window
+      containing an idea for a longer 5 minute break.
+    '';
+    homepage = https://hovancik.net/stretchly;
+    downloadPage = https://hovancik.net/stretchly/downloads/;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ cdepillabout ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 048fcae738db..52c7b57a557a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21529,7 +21529,8 @@ in
   stp = callPackage ../applications/science/logic/stp { };
 
   stretchly = callPackage ../applications/misc/stretchly {
-    inherit (gnome2) GConf;
+    # Error on launch w/electron_8
+    electron = electron_7;
   };
 
   stumpish = callPackage ../applications/window-managers/stumpish {};

From 873a6650bbe68cf5f781fb32c1e77ca7fc9868e9 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Thu, 13 Feb 2020 21:02:24 +0100
Subject: [PATCH 0553/4636] hunspellDicts: libreoffice: 6.2.0.3 -> 6.3.0.4

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

diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix
index fb64aa81d1a0..386a18f641fe 100644
--- a/pkgs/development/libraries/hunspell/dictionaries.nix
+++ b/pkgs/development/libraries/hunspell/dictionaries.nix
@@ -272,13 +272,13 @@ let
     , sourceRoot ? dictFileName }:
     mkDict rec {
       name = "hunspell-dict-${shortName}-libreoffice-${version}";
-      version = "6.2.0.3";
+      version = "6.3.0.4";
       inherit dictFileName readmeFile;
       src = fetchFromGitHub {
         owner = "LibreOffice";
         repo = "dictionaries";
         rev = "libreoffice-${version}";
-        sha256 = "0rw9ahhynia5wsgyd67lrhinqqn1s1rizgiykb3palbyk0lv72xj";
+        sha256 = "14z4b0grn7cw8l9s7sl6cgapbpwhn1b3gwc3kn6b0k4zl3dq7y63";
       };
       buildPhase = ''
         cp -a ${sourceRoot}/* .

From be1635933fe5fbf963972acc8877f6a640e6b4a9 Mon Sep 17 00:00:00 2001
From: Shahrukh Khan <Shahrukh.khan@keeptruckin.com>
Date: Fri, 14 Feb 2020 01:12:29 +0500
Subject: [PATCH 0554/4636] argocd: init at 1.4.2 (#79846)

---
 .../networking/cluster/argocd/default.nix     |   31 +
 .../cluster/argocd/use-go-module.patch        | 3058 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |    2 +
 3 files changed, 3091 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/argocd/default.nix
 create mode 100644 pkgs/applications/networking/cluster/argocd/use-go-module.patch

diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix
new file mode 100644
index 000000000000..4842f31c40d6
--- /dev/null
+++ b/pkgs/applications/networking/cluster/argocd/default.nix
@@ -0,0 +1,31 @@
+{ lib, buildGoModule, fetchFromGitHub, packr }:
+
+buildGoModule rec {
+  pname = "argocd";
+  version = "1.4.2";
+
+  src = fetchFromGitHub {
+    owner = "argoproj";
+    repo = "argo-cd";
+    rev = "v${version}";
+    sha256 = "01vsyrks1k5yfvrarv8ia0isr7snilr21b7lfiy860si82r2r8hj";
+  };
+
+  modSha256 = "1qivg7yy7ymmgkrvl365x29d8jnsphbz18j1ykgwwysyw3n4jkdg";
+
+  nativeBuildInputs = [ packr ];
+
+  patches = [ ./use-go-module.patch ];
+ 
+  # run packr to embed assets
+  preBuild = ''
+    packr
+  '';
+  
+  meta = with lib; {
+    description = "Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes";
+    homepage = "https://github.com/argoproj/argo";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ shahrukh330 ];
+  };
+}
diff --git a/pkgs/applications/networking/cluster/argocd/use-go-module.patch b/pkgs/applications/networking/cluster/argocd/use-go-module.patch
new file mode 100644
index 000000000000..ac597f4187e9
--- /dev/null
+++ b/pkgs/applications/networking/cluster/argocd/use-go-module.patch
@@ -0,0 +1,3058 @@
+diff --git a/Gopkg.lock b/Gopkg.lock
+deleted file mode 100644
+index 03737a95..00000000
+--- a/Gopkg.lock
++++ /dev/null
+@@ -1,2103 +0,0 @@
+-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+-
+-
+-[[projects]]
+-  digest = "1:6d5a057da97a9dbdb10e7beedd2f43452b6bf7691001c0c8886e8dacf5610349"
+-  name = "bou.ke/monkey"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "bdf6dea004c6fd1cdf4b25da8ad45a606c09409a"
+-  version = "v1.0.1"
+-
+-[[projects]]
+-  digest = "1:9702dc153c9bb6ee7ee0587c248b7024700e89e4a7be284faaeeab9da32e1c6b"
+-  name = "cloud.google.com/go"
+-  packages = ["compute/metadata"]
+-  pruneopts = ""
+-  revision = "767c40d6a2e058483c25fa193e963a22da17236d"
+-  version = "v0.18.0"
+-
+-[[projects]]
+-  digest = "1:8ec1618fc3ee146af104d6c13be250f25e5976e34557d4afbfe4b28035ce6c05"
+-  name = "github.com/Knetic/govaluate"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "d216395917cc49052c7c7094cf57f09657ca08a8"
+-  version = "v3.0.0"
+-
+-[[projects]]
+-  digest = "1:63e57618d792cccb87ad7cb8a0602e6205732beb3b01b0ea858fc4a5fd3ce8f1"
+-  name = "github.com/MakeNowJust/heredoc"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "efb6ca8de9d5385c3963279701760e37637cf238"
+-  version = "v2.0.1"
+-
+-[[projects]]
+-  digest = "1:b856d8248663c39265a764561c1a1a149783f6cc815feb54a1f3a591b91f6eca"
+-  name = "github.com/Masterminds/semver"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "c7af12943936e8c39859482e61f0574c2fd7fc75"
+-  version = "v1.4.2"
+-
+-[[projects]]
+-  digest = "1:71c0dfb843260bfb9b03357cae8eac261b8d82e149ad8f76938b87a23aa47c43"
+-  name = "github.com/PuerkitoBio/purell"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "b938d81255b5473c57635324295cb0fe398c7a58"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:331a419049c2be691e5ba1d24342fc77c7e767a80c666a18fd8a9f7b82419c1c"
+-  name = "github.com/PuerkitoBio/urlesc"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "de5bf2ad457846296e2031421a34e2568e304e35"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:a1b56af5e69569454f55ef4842485a0da5616e240a610d77c987e17a73b0e265"
+-  name = "github.com/TomOnTime/utfutil"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "09c41003ee1d5015b75f331e52215512e7145b8d"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:52905b00a73cda93a2ce8c5fa35185daed673d59e39576e81ad6ab6fb7076b3c"
+-  name = "github.com/argoproj/pkg"
+-  packages = [
+-    "errors",
+-    "exec",
+-    "rand",
+-    "time",
+-  ]
+-  pruneopts = ""
+-  revision = "02a6aac40ac4cd23de448afe7a1ec0ba4b6d2b96"
+-
+-[[projects]]
+-  digest = "1:d8a2bb36a048d1571bcc1aee208b61f39dc16c6c53823feffd37449dde162507"
+-  name = "github.com/asaskevich/govalidator"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "ccb8e960c48f04d6935e72476ae4a51028f9e22f"
+-  version = "v9"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:c0bec5f9b98d0bc872ff5e834fac186b807b656683bd29cb82fb207a1513fabb"
+-  name = "github.com/beorn7/perks"
+-  packages = ["quantile"]
+-  pruneopts = ""
+-  revision = "3a771d992973f24aa725d07868b467d1ddfceafb"
+-
+-[[projects]]
+-  digest = "1:6e2b0748ea11cffebe87b4a671a44ecfb243141cdd5df54cb44b7e8e93cb7ea3"
+-  name = "github.com/casbin/casbin"
+-  packages = [
+-    ".",
+-    "config",
+-    "effect",
+-    "errors",
+-    "log",
+-    "model",
+-    "persist",
+-    "persist/file-adapter",
+-    "rbac",
+-    "rbac/default-role-manager",
+-    "util",
+-  ]
+-  pruneopts = ""
+-  revision = "aaed1b7a7eac65d37ec4e15e308429fdf0bd6a9e"
+-  version = "v1.9.1"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:9c19f8c33e635e0439c8afc167d6d02e3aa6eea5b69d64880244fd354a99edc4"
+-  name = "github.com/chai2010/gettext-go"
+-  packages = [
+-    "gettext",
+-    "gettext/mo",
+-    "gettext/plural",
+-    "gettext/po",
+-  ]
+-  pruneopts = ""
+-  revision = "bf70f2a70fb1b1f36d90d671a72795984eab0fcb"
+-
+-[[projects]]
+-  branch = "v2"
+-  digest = "1:d8ee1b165eb7f4fd9ada718e1e7eeb0bc1fd462592d0bd823df694443f448681"
+-  name = "github.com/coreos/go-oidc"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "1180514eaf4d9f38d0d19eef639a1d695e066e72"
+-
+-[[projects]]
+-  digest = "1:56c130d885a4aacae1dd9c7b71cfe39912c7ebc1ff7d2b46083c8812996dc43b"
+-  name = "github.com/davecgh/go-spew"
+-  packages = ["spew"]
+-  pruneopts = ""
+-  revision = "346938d642f2ec3594ed81d874461961cd0faa76"
+-  version = "v1.1.0"
+-
+-[[projects]]
+-  digest = "1:6098222470fe0172157ce9bbef5d2200df4edde17ee649c5d6e48330e4afa4c6"
+-  name = "github.com/dgrijalva/jwt-go"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"
+-  version = "v3.2.0"
+-
+-[[projects]]
+-  digest = "1:c05f1899f086e3b4613d94d9e6f7ba6f4b6587498a1aa6037c5c294b22f5a743"
+-  name = "github.com/docker/distribution"
+-  packages = [
+-    "digestset",
+-    "reference",
+-  ]
+-  pruneopts = ""
+-  revision = "2461543d988979529609e8cb6fca9ca190dc48da"
+-  version = "v2.7.1"
+-
+-[[projects]]
+-  digest = "1:b021ef379356343bdc13ec101e546b756fcef4b1186d08163bef7d3bc8c1e07f"
+-  name = "github.com/docker/docker"
+-  packages = [
+-    "pkg/term",
+-    "pkg/term/winconsole",
+-  ]
+-  pruneopts = ""
+-  revision = "fc4825d5ef5e0e1af74904208f9b925c22f0b6f8"
+-  version = "v1.6.0-rc5"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:d6c13a378213e3de60445e49084b8a0a9ce582776dfc77927775dbeb3ff72a35"
+-  name = "github.com/docker/spdystream"
+-  packages = [
+-    ".",
+-    "spdy",
+-  ]
+-  pruneopts = ""
+-  revision = "6480d4af844c189cf5dd913db24ddd339d3a4f85"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:f1a75a8e00244e5ea77ff274baa9559eb877437b240ee7b278f3fc560d9f08bf"
+-  name = "github.com/dustin/go-humanize"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "9f541cc9db5d55bce703bd99987c9d5cb8eea45e"
+-
+-[[projects]]
+-  digest = "1:971e9ba63a417c5f1f83ab358677bc59e96ff04285f26c6646ff089fb60b15e8"
+-  name = "github.com/emicklei/go-restful"
+-  packages = [
+-    ".",
+-    "log",
+-  ]
+-  pruneopts = ""
+-  revision = "3658237ded108b4134956c1b3050349d93e7b895"
+-  version = "v2.7.1"
+-
+-[[projects]]
+-  digest = "1:ba7c75e38d81b9cf3e8601c081567be3b71bccca8c11aee5de98871360aa4d7b"
+-  name = "github.com/emirpasic/gods"
+-  packages = [
+-    "containers",
+-    "lists",
+-    "lists/arraylist",
+-    "trees",
+-    "trees/binaryheap",
+-    "utils",
+-  ]
+-  pruneopts = ""
+-  revision = "f6c17b524822278a87e3b3bd809fec33b51f5b46"
+-  version = "v1.9.0"
+-
+-[[projects]]
+-  digest = "1:46ddeb9dd35d875ac7568c4dc1fc96ce424e034bdbb984239d8ffc151398ec01"
+-  name = "github.com/evanphx/json-patch"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "026c730a0dcc5d11f93f1cf1cc65b01247ea7b6f"
+-  version = "v4.5.0"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:549f95037fea25e00a5341ac6a169a5b3e5306be107f45260440107b779b74f9"
+-  name = "github.com/exponent-io/jsonpath"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
+-
+-[[projects]]
+-  digest = "1:23a5efa4b272df86a8ebffc942f5e0c1aac4b750836037394cc450b6d91e241a"
+-  name = "github.com/fatih/camelcase"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "44e46d280b43ec1531bb25252440e34f1b800b65"
+-  version = "v1.0.0"
+-
+-[[projects]]
+-  digest = "1:b13707423743d41665fd23f0c36b2f37bb49c30e94adb813319c44188a51ba22"
+-  name = "github.com/ghodss/yaml"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"
+-  version = "v1.0.0"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:eb77b66abaf9649747230eb973350bd1c311a0d0362213192efbdd222082b072"
+-  name = "github.com/go-openapi/analysis"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "5957818e100395077187fb7ef3b8a28227af06c6"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:ee273c95c1414ef11bd4da259b40e83f41c1d5a6bee7d1b54a05ef5f3565fd92"
+-  name = "github.com/go-openapi/errors"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "b2b2befaf267d082d779bcef52d682a47c779517"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:1287439f7765209116509fffff2b8f853845e4b35572b41a1aadda42cbcffcc2"
+-  name = "github.com/go-openapi/jsonpointer"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "779f45308c19820f1a69e9a4cd965f496e0da10f"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:07ac8ac445f68b0bc063d11845d479fb7e09c906ead7a8c4165b59777df09d74"
+-  name = "github.com/go-openapi/jsonreference"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "36d33bfe519efae5632669801b180bf1a245da3b"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:c4a8c916364abeda1c5cf36684320298bbf4d87718b0b2bd9c4ca663157fdc75"
+-  name = "github.com/go-openapi/loads"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "2a2b323bab96e6b1fdee110e57d959322446e9c9"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:1d9c762f6695e6e7ed0b4c055fa0eab7d20c2b36c935943282273d37f114e302"
+-  name = "github.com/go-openapi/runtime"
+-  packages = [
+-    ".",
+-    "logger",
+-    "middleware",
+-    "middleware/denco",
+-    "middleware/header",
+-    "middleware/untyped",
+-    "security",
+-  ]
+-  pruneopts = ""
+-  revision = "cd9d8ed52e4b4665463cbc655500e4faa09c3c16"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:fd4008f8283b993180f0626d0c7b2f48880e9dbb6bd92a91cac7ded30dc66777"
+-  name = "github.com/go-openapi/spec"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "1de3e0542de65ad8d75452a595886fdd0befb363"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:4ddc424130bcfbf6f782f433192ca2502a02a09e4ac55dcbecf91f22ed4e3138"
+-  name = "github.com/go-openapi/strfmt"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "481808443b00a14745fada967cb5eeff0f9b1df2"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:366052ef634d344217d6720719c9f8e95de13a94d211f09785b0ba3c4c181b06"
+-  name = "github.com/go-openapi/swag"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "84f4bee7c0a6db40e3166044c7983c1c32125429"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:671e25496d550c80a9d6e7e588d32b380c6b4877f113750724f69acc6ce6790f"
+-  name = "github.com/go-openapi/validate"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "b0a3ed684d0fdd3e1eda00433382188ce8aa7169"
+-
+-[[projects]]
+-  digest = "1:024c9473f363a12918e87e7efc778091839beab514b01309a6ecd8aa336c8065"
+-  name = "github.com/go-redis/cache"
+-  packages = [
+-    ".",
+-    "internal/lrucache",
+-    "internal/singleflight",
+-  ]
+-  pruneopts = ""
+-  revision = "c58ada1e23a3b66593f81c70572c20a0bb805a90"
+-  version = "v6.3.5"
+-
+-[[projects]]
+-  digest = "1:b73fabc1ff8f2417bc5cc51d3f7274d6af5300b5ad9b8606967213134c1700dc"
+-  name = "github.com/go-redis/redis"
+-  packages = [
+-    ".",
+-    "internal",
+-    "internal/consistenthash",
+-    "internal/hashtag",
+-    "internal/pool",
+-    "internal/proto",
+-    "internal/util",
+-  ]
+-  pruneopts = ""
+-  revision = "22be8a3eaf992c828cecb69dc07348313bf08d2e"
+-  version = "v6.15.1"
+-
+-[[projects]]
+-  digest = "1:842c1acbacc80da775cfc0c412c4fe322c2d1b86c260db632987730d0d67a6bd"
+-  name = "github.com/gobuffalo/packr"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "7f4074995d431987caaa35088199f13c44b24440"
+-  version = "v1.11.0"
+-
+-[[projects]]
+-  digest = "1:9ab1b1c637d7c8f49e39d8538a650d7eb2137b076790cff69d160823b505964c"
+-  name = "github.com/gobwas/glob"
+-  packages = [
+-    ".",
+-    "compiler",
+-    "match",
+-    "syntax",
+-    "syntax/ast",
+-    "syntax/lexer",
+-    "util/runes",
+-    "util/strings",
+-  ]
+-  pruneopts = ""
+-  revision = "5ccd90ef52e1e632236f7326478d4faa74f99438"
+-  version = "v0.2.3"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:9a06e7365c6039daf4db9bbf79650e2933a2880982cbab8106cb74a36617f40d"
+-  name = "github.com/gogits/go-gogs-client"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "5a05380e4bc2440e0ec12f54f6f45648dbdd5e55"
+-
+-[[projects]]
+-  digest = "1:d69d2ba23955582a64e367ff2b0808cdbd048458c178cea48f11ab8c40bd7aea"
+-  name = "github.com/gogo/protobuf"
+-  packages = [
+-    "gogoproto",
+-    "plugin/compare",
+-    "plugin/defaultcheck",
+-    "plugin/description",
+-    "plugin/embedcheck",
+-    "plugin/enumstringer",
+-    "plugin/equal",
+-    "plugin/face",
+-    "plugin/gostring",
+-    "plugin/marshalto",
+-    "plugin/oneofcheck",
+-    "plugin/populate",
+-    "plugin/size",
+-    "plugin/stringer",
+-    "plugin/testgen",
+-    "plugin/union",
+-    "plugin/unmarshal",
+-    "proto",
+-    "protoc-gen-gofast",
+-    "protoc-gen-gogo/descriptor",
+-    "protoc-gen-gogo/generator",
+-    "protoc-gen-gogo/generator/internal/remap",
+-    "protoc-gen-gogo/grpc",
+-    "protoc-gen-gogo/plugin",
+-    "protoc-gen-gogofast",
+-    "sortkeys",
+-    "vanity",
+-    "vanity/command",
+-  ]
+-  pruneopts = ""
+-  revision = "5628607bb4c51c3157aacc3a50f0ab707582b805"
+-  version = "v1.3.1"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:107b233e45174dbab5b1324201d092ea9448e58243ab9f039e4c0f332e121e3a"
+-  name = "github.com/golang/glog"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"
+-
+-[[projects]]
+-  digest = "1:3dd078fda7500c341bc26cfbc6c6a34614f295a2457149fc1045cab767cbcf18"
+-  name = "github.com/golang/protobuf"
+-  packages = [
+-    "jsonpb",
+-    "proto",
+-    "protoc-gen-go",
+-    "protoc-gen-go/descriptor",
+-    "protoc-gen-go/generator",
+-    "protoc-gen-go/generator/internal/remap",
+-    "protoc-gen-go/grpc",
+-    "protoc-gen-go/plugin",
+-    "ptypes",
+-    "ptypes/any",
+-    "ptypes/duration",
+-    "ptypes/empty",
+-    "ptypes/struct",
+-    "ptypes/timestamp",
+-  ]
+-  pruneopts = ""
+-  revision = "aa810b61a9c79d51363740d207bb46cf8e620ed5"
+-  version = "v1.2.0"
+-
+-[[projects]]
+-  digest = "1:1e5b1e14524ed08301977b7b8e10c719ed853cbf3f24ecb66fae783a46f207a6"
+-  name = "github.com/google/btree"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "4030bb1f1f0c35b30ca7009e9ebd06849dd45306"
+-  version = "v1.0.0"
+-
+-[[projects]]
+-  digest = "1:9fcb267c272bc5054564b392e3ff7e65e35400fd9914afb1d169f92b95e7dbc9"
+-  name = "github.com/google/go-cmp"
+-  packages = [
+-    "cmp",
+-    "cmp/internal/diff",
+-    "cmp/internal/flags",
+-    "cmp/internal/function",
+-    "cmp/internal/value",
+-  ]
+-  pruneopts = ""
+-  revision = "2d0692c2e9617365a95b295612ac0d4415ba4627"
+-  version = "v0.3.1"
+-
+-[[projects]]
+-  digest = "1:14d826ee25139b4674e9768ac287a135f4e7c14e1134a5b15e4e152edfd49f41"
+-  name = "github.com/google/go-jsonnet"
+-  packages = [
+-    ".",
+-    "ast",
+-    "parser",
+-  ]
+-  pruneopts = ""
+-  revision = "dfddf2b4e3aec377b0dcdf247ff92e7d078b8179"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:754f77e9c839b24778a4b64422236d38515301d2baeb63113aa3edc42e6af692"
+-  name = "github.com/google/gofuzz"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "24818f796faf91cd76ec7bddd72458fbced7a6c1"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:d0899ec7c2f61fd5e4ccba7dbefe72e366a3ecce23ecdb982c768fa1d38812fb"
+-  name = "github.com/google/shlex"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "c34317bd91bf98fab745d77b03933cf8769299fe"
+-
+-[[projects]]
+-  digest = "1:2a131706ff80636629ab6373f2944569b8252ecc018cda8040931b05d32e3c16"
+-  name = "github.com/googleapis/gnostic"
+-  packages = [
+-    "OpenAPIv2",
+-    "compiler",
+-    "extensions",
+-  ]
+-  pruneopts = ""
+-  revision = "ee43cbb60db7bd22502942cccbc39059117352ab"
+-  version = "v0.1.0"
+-
+-[[projects]]
+-  digest = "1:09aa5dd1332b93c96bde671bafb053249dc813febf7d5ca84e8f382ba255d67d"
+-  name = "github.com/gorilla/websocket"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "66b9c49e59c6c48f0ffce28c2d8b8a5678502c6d"
+-  version = "v1.4.0"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:e1fd67b5695fb12f54f979606c5d650a5aa72ef242f8e71072bfd4f7b5a141a0"
+-  name = "github.com/gregjones/httpcache"
+-  packages = [
+-    ".",
+-    "diskcache",
+-  ]
+-  pruneopts = ""
+-  revision = "901d90724c7919163f472a9812253fb26761123d"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:9dca8c981b8aed7448d94e78bc68a76784867a38b3036d5aabc0b32d92ffd1f4"
+-  name = "github.com/grpc-ecosystem/go-grpc-middleware"
+-  packages = [
+-    ".",
+-    "auth",
+-    "logging",
+-    "logging/logrus",
+-    "logging/logrus/ctxlogrus",
+-    "retry",
+-    "tags",
+-    "tags/logrus",
+-    "util/backoffutils",
+-    "util/metautils",
+-  ]
+-  pruneopts = ""
+-  revision = "bc372cc64f55abd91995ba3f219b380ffbc59e9d"
+-
+-[[projects]]
+-  digest = "1:e24dc5ef44694848785de507f439a24e9e6d96d7b43b8cf3d6cfa857aa1e2186"
+-  name = "github.com/grpc-ecosystem/go-grpc-prometheus"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "c225b8c3b01faf2899099b768856a9e916e5087b"
+-  version = "v1.2.0"
+-
+-[[projects]]
+-  digest = "1:9feb7485bc57adbcbc1e1037ca05588e9d8b0a3a1875fbf730021fc118859b75"
+-  name = "github.com/grpc-ecosystem/grpc-gateway"
+-  packages = [
+-    "protoc-gen-grpc-gateway",
+-    "protoc-gen-grpc-gateway/descriptor",
+-    "protoc-gen-grpc-gateway/generator",
+-    "protoc-gen-grpc-gateway/gengateway",
+-    "protoc-gen-grpc-gateway/httprule",
+-    "protoc-gen-swagger",
+-    "protoc-gen-swagger/genswagger",
+-    "protoc-gen-swagger/options",
+-    "runtime",
+-    "runtime/internal",
+-    "utilities",
+-  ]
+-  pruneopts = ""
+-  revision = "07f5e79768022f9a3265235f0db4ac8c3f675fec"
+-  version = "v1.3.1"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:9c776d7d9c54b7ed89f119e449983c3f24c0023e75001d6092442412ebca6b94"
+-  name = "github.com/hashicorp/golang-lru"
+-  packages = [
+-    ".",
+-    "simplelru",
+-  ]
+-  pruneopts = ""
+-  revision = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3"
+-
+-[[projects]]
+-  digest = "1:23bc0b496ba341c6e3ba24d6358ff4a40a704d9eb5f9a3bd8e8fbd57ad869013"
+-  name = "github.com/imdario/mergo"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "163f41321a19dd09362d4c63cc2489db2015f1f4"
+-  version = "0.3.2"
+-
+-[[projects]]
+-  digest = "1:6f7a8f1f3e04174c426eea1c8661ef49a6b4c63bd2e40c0ad74b5ba9051f4812"
+-  name = "github.com/improbable-eng/grpc-web"
+-  packages = ["go/grpcweb"]
+-  pruneopts = ""
+-  revision = "16092bd1d58ae1b3c2d8be1cb67e65956f945dea"
+-  version = "0.7.0"
+-
+-[[projects]]
+-  digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be"
+-  name = "github.com/inconshreveable/mousetrap"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+-  version = "v1.0"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:95abc4eba158a39873bd4fabdee576d0ae13826b550f8b710881d80ae4093a0f"
+-  name = "github.com/jbenet/go-context"
+-  packages = ["io"]
+-  pruneopts = ""
+-  revision = "d14ea06fba99483203c19d92cfcd13ebe73135f4"
+-
+-[[projects]]
+-  digest = "1:302ad9379eb146668760df4d779a95379acab43ce5f9a28f27f3273f98232020"
+-  name = "github.com/jonboulle/clockwork"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "2eee05ed794112d45db504eb05aa693efd2b8b09"
+-  version = "v0.1.0"
+-
+-[[projects]]
+-  digest = "1:31c6f3c4f1e15fcc24fcfc9f5f24603ff3963c56d6fa162116493b4025fb6acc"
+-  name = "github.com/json-iterator/go"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "f2b4162afba35581b6d4a50d3b8f34e33c144682"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:63e7368fcf6b54804076eaec26fd9cf0c4466166b272393db4b93102e1e962df"
+-  name = "github.com/kballard/go-shellquote"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "95032a82bc518f77982ea72343cc1ade730072f0"
+-
+-[[projects]]
+-  digest = "1:41e0bed5df4f9fd04c418bf9b6b7179b3671e416ad6175332601ca1c8dc74606"
+-  name = "github.com/kevinburke/ssh_config"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "81db2a75821ed34e682567d48be488a1c3121088"
+-  version = "0.5"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:448b4a6e39e46d8740b00dc871f26d58dc39341b160e01267b7917132831a136"
+-  name = "github.com/konsorten/go-windows-terminal-sequences"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "b729f2633dfe35f4d1d8a32385f6685610ce1cb5"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:93018a4331df9925058905133cb997aec8f54d5303f4536a23e49b5648632d06"
+-  name = "github.com/liggitt/tabwriter"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "89fcab3d43de07060e4fd4c1547430ed57e87f24"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:ccc20cacf54eb16464dad02efa1c14fa7c0b9e124639b0d2a51dcc87b0154e4c"
+-  name = "github.com/mailru/easyjson"
+-  packages = [
+-    "buffer",
+-    "jlexer",
+-    "jwriter",
+-  ]
+-  pruneopts = ""
+-  revision = "32fa128f234d041f196a9f3e0fea5ac9772c08e1"
+-
+-[[projects]]
+-  digest = "1:63722a4b1e1717be7b98fc686e0b30d5e7f734b9e93d7dee86293b6deab7ea28"
+-  name = "github.com/matttproud/golang_protobuf_extensions"
+-  packages = ["pbutil"]
+-  pruneopts = ""
+-  revision = "c12348ce28de40eed0136aa2b644d0ee0650e56c"
+-  version = "v1.0.1"
+-
+-[[projects]]
+-  digest = "1:096a8a9182648da3d00ff243b88407838902b6703fc12657f76890e08d1899bf"
+-  name = "github.com/mitchellh/go-homedir"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "ae18d6b8b3205b561c79e8e5f69bff09736185f4"
+-  version = "v1.0.0"
+-
+-[[projects]]
+-  digest = "1:713b341855f1480e4baca1e7c5434e1d266441340685ecbde32d59bdc065fb3f"
+-  name = "github.com/mitchellh/go-wordwrap"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c"
+-  version = "v1.0.0"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:eb9117392ee8e7aa44f78e0db603f70b1050ee0ebda4bd40040befb5b218c546"
+-  name = "github.com/mitchellh/mapstructure"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b"
+-
+-[[projects]]
+-  digest = "1:0c0ff2a89c1bb0d01887e1dac043ad7efbf3ec77482ef058ac423d13497e16fd"
+-  name = "github.com/modern-go/concurrent"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
+-  version = "1.0.3"
+-
+-[[projects]]
+-  digest = "1:e32bdbdb7c377a07a9a46378290059822efdce5c8d96fe71940d87cb4f918855"
+-  name = "github.com/modern-go/reflect2"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd"
+-  version = "1.0.1"
+-
+-[[projects]]
+-  digest = "1:5d9b668b0b4581a978f07e7d2e3314af18eb27b3fb5d19b70185b7c575723d11"
+-  name = "github.com/opencontainers/go-digest"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "279bed98673dd5bef374d3b6e4b09e2af76183bf"
+-  version = "v1.0.0-rc1"
+-
+-[[projects]]
+-  digest = "1:4c0404dc03d974acd5fcd8b8d3ce687b13bd169db032b89275e8b9d77b98ce8c"
+-  name = "github.com/patrickmn/go-cache"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0"
+-  version = "v2.1.0"
+-
+-[[projects]]
+-  digest = "1:049b5bee78dfdc9628ee0e557219c41f683e5b06c5a5f20eaba0105ccc586689"
+-  name = "github.com/pelletier/go-buffruneio"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "c37440a7cf42ac63b919c752ca73a85067e05992"
+-  version = "v0.2.0"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:5f0faa008e8ff4221b55a1a5057c8b02cb2fd68da6a65c9e31c82b72cbc836d0"
+-  name = "github.com/petar/GoLLRB"
+-  packages = ["llrb"]
+-  pruneopts = ""
+-  revision = "33fb24c13b99c46c93183c291836c573ac382536"
+-
+-[[projects]]
+-  digest = "1:4709c61d984ef9ba99b037b047546d8a576ae984fb49486e48d99658aa750cd5"
+-  name = "github.com/peterbourgon/diskv"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "0be1b92a6df0e4f5cb0a5d15fb7f643d0ad93ce6"
+-  version = "v3.0.0"
+-
+-[[projects]]
+-  digest = "1:7365acd48986e205ccb8652cc746f09c8b7876030d53710ea6ef7d0bd0dcd7ca"
+-  name = "github.com/pkg/errors"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
+-  version = "v0.8.0"
+-
+-[[projects]]
+-  digest = "1:256484dbbcd271f9ecebc6795b2df8cad4c458dd0f5fd82a8c2fa0c29f233411"
+-  name = "github.com/pmezard/go-difflib"
+-  packages = ["difflib"]
+-  pruneopts = ""
+-  revision = "792786c7400a136282c1664665ae0a8db921c6c2"
+-  version = "v1.0.0"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:90daff4630a8cf2fa207dbd3ccaed0e860936ead1851a473019674e6b5993a13"
+-  name = "github.com/pquerna/cachecontrol"
+-  packages = [
+-    ".",
+-    "cacheobject",
+-  ]
+-  pruneopts = ""
+-  revision = "525d0eb5f91d30e3b1548de401b7ef9ea6898520"
+-
+-[[projects]]
+-  digest = "1:9d34d575593e3dd27bbd119138ba009ef1535a0df2aad7259e1dd5aed7405eea"
+-  name = "github.com/prometheus/client_golang"
+-  packages = [
+-    "prometheus",
+-    "prometheus/internal",
+-    "prometheus/promhttp",
+-  ]
+-  pruneopts = ""
+-  revision = "7858729281ec582767b20e0d696b6041d995d5e0"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:185cf55b1f44a1bf243558901c3f06efa5c64ba62cfdcbb1bf7bbe8c3fb68561"
+-  name = "github.com/prometheus/client_model"
+-  packages = ["go"]
+-  pruneopts = ""
+-  revision = "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:f477ef7b65d94fb17574fc6548cef0c99a69c1634ea3b6da248b63a61ebe0498"
+-  name = "github.com/prometheus/common"
+-  packages = [
+-    "expfmt",
+-    "internal/bitbucket.org/ww/goautoneg",
+-    "model",
+-  ]
+-  pruneopts = ""
+-  revision = "c7de2306084e37d54b8be01f3541a8464345e9a5"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:e04aaa0e8f8da0ed3d6c0700bd77eda52a47f38510063209d72d62f0ef807d5e"
+-  name = "github.com/prometheus/procfs"
+-  packages = [
+-    ".",
+-    "internal/util",
+-    "nfs",
+-    "xfs",
+-  ]
+-  pruneopts = ""
+-  revision = "05ee40e3a273f7245e8777337fc7b46e533a9a92"
+-
+-[[projects]]
+-  digest = "1:6bb048133650d1fb7fbff9fb3c35bd5c7e8653fc95c3bae6df94cd17d1580278"
+-  name = "github.com/robfig/cron"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "45fbe1491cdd47d74d1bf1396286d67faee8b8b5"
+-  version = "v3.0.0"
+-
+-[[projects]]
+-  digest = "1:5f47c69f85311c4dc292be6cc995a0a3fe8337a6ce38ef4f71e5b7efd5ad42e0"
+-  name = "github.com/rs/cors"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "9a47f48565a795472d43519dd49aac781f3034fb"
+-  version = "v1.6.0"
+-
+-[[projects]]
+-  digest = "1:2761e287c811d0948d47d0252b82281eca3801eb3c9d5f9530956643d5b9f430"
+-  name = "github.com/russross/blackfriday"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "05f3235734ad95d0016f6a23902f06461fcf567a"
+-  version = "v1.5.2"
+-
+-[[projects]]
+-  digest = "1:3962f553b77bf6c03fc07cd687a22dd3b00fe11aa14d31194f5505f5bb65cdc8"
+-  name = "github.com/sergi/go-diff"
+-  packages = ["diffmatchpatch"]
+-  pruneopts = ""
+-  revision = "1744e2970ca51c86172c8190fadad617561ed6e7"
+-  version = "v1.0.0"
+-
+-[[projects]]
+-  digest = "1:01d968ff6535945510c944983eee024e81f1c949043e9bbfe5ab206ebc3588a4"
+-  name = "github.com/sirupsen/logrus"
+-  packages = [
+-    ".",
+-    "hooks/test",
+-  ]
+-  pruneopts = ""
+-  revision = "a67f783a3814b8729bd2dac5780b5f78f8dbd64d"
+-  version = "v1.1.0"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:50b5be512f924d289f20e8b2aef8951d98b9bd8c44666cf169514906df597a4c"
+-  name = "github.com/skratchdot/open-golang"
+-  packages = ["open"]
+-  pruneopts = ""
+-  revision = "75fb7ed4208cf72d323d7d02fd1a5964a7a9073c"
+-
+-[[projects]]
+-  digest = "1:022a4e2a8c327eb46a99088a51c0dda5d5be86928ace2afd72145dc1d746a323"
+-  name = "github.com/soheilhy/cmux"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "e09e9389d85d8492d313d73d1469c029e710623f"
+-  version = "v0.1.4"
+-
+-[[projects]]
+-  digest = "1:0c63b3c7ad6d825a898f28cb854252a3b29d37700c68a117a977263f5ec94efe"
+-  name = "github.com/spf13/cobra"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "0.0.5"
+-
+-[[projects]]
+-  digest = "1:8e243c568f36b09031ec18dff5f7d2769dcf5ca4d624ea511c8e3197dc3d352d"
+-  name = "github.com/spf13/pflag"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "583c0c0531f06d5278b7d917446061adc344b5cd"
+-  version = "v1.0.1"
+-
+-[[projects]]
+-  digest = "1:b1861b9a1aa0801b0b62945ed7477c1ab61a4bd03b55dfbc27f6d4f378110c8c"
+-  name = "github.com/src-d/gcfg"
+-  packages = [
+-    ".",
+-    "scanner",
+-    "token",
+-    "types",
+-  ]
+-  pruneopts = ""
+-  revision = "f187355171c936ac84a82793659ebb4936bc1c23"
+-  version = "v1.3.0"
+-
+-[[projects]]
+-  digest = "1:306417ea2f31ea733df356a2b895de63776b6a5107085b33458e5cd6eb1d584d"
+-  name = "github.com/stretchr/objx"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "facf9a85c22f48d2f52f2380e4efce1768749a89"
+-  version = "v0.1"
+-
+-[[projects]]
+-  digest = "1:c587772fb8ad29ad4db67575dad25ba17a51f072ff18a22b4f0257a4d9c24f75"
+-  name = "github.com/stretchr/testify"
+-  packages = [
+-    "assert",
+-    "mock",
+-  ]
+-  pruneopts = ""
+-  revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686"
+-  version = "v1.2.2"
+-
+-[[projects]]
+-  digest = "1:51cf0fca93f4866709ceaf01b750e51d997c299a7bd2edf7ccd79e3b428754ae"
+-  name = "github.com/vmihailenco/msgpack"
+-  packages = [
+-    ".",
+-    "codes",
+-  ]
+-  pruneopts = ""
+-  revision = "a053f3dac71df214bfe8b367f34220f0029c9c02"
+-  version = "v3.3.1"
+-
+-[[projects]]
+-  digest = "1:afc0b8068986a01e2d8f449917829753a54f6bd4d1265c2b4ad9cba75560020f"
+-  name = "github.com/xanzy/ssh-agent"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "640f0ab560aeb89d523bb6ac322b1244d5c3796c"
+-  version = "v0.2.0"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:3cf699a0df65293cc8fd2339606950d3e2f6d02a435703951d1da411a23f7cef"
+-  name = "github.com/yudai/gojsondiff"
+-  packages = [
+-    ".",
+-    "formatter",
+-  ]
+-  pruneopts = ""
+-  revision = "0525c875b75ca60b9e67ddc44496aa16f21066b0"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:9857bb2293f372b2181004d8b62179bbdb4ab0982ec6f762abe6cf2bfedaff85"
+-  name = "github.com/yudai/golcs"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "ecda9a501e8220fae3b4b600c3db4b0ba22cfc68"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:525776d99293affd2c61dfb573007ff9f22863068c20c220ef3f58620758c341"
+-  name = "github.com/yuin/gopher-lua"
+-  packages = [
+-    ".",
+-    "ast",
+-    "parse",
+-    "pm",
+-  ]
+-  pruneopts = ""
+-  revision = "732aa6820ec4fb93d60c4057dd574c33db8ad4e7"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:2ea6df0f542cc95a5e374e9cdd81eaa599ed0d55366eef92d2f6b9efa2795c07"
+-  name = "golang.org/x/crypto"
+-  packages = [
+-    "bcrypt",
+-    "blowfish",
+-    "cast5",
+-    "curve25519",
+-    "ed25519",
+-    "ed25519/internal/edwards25519",
+-    "internal/chacha20",
+-    "openpgp",
+-    "openpgp/armor",
+-    "openpgp/elgamal",
+-    "openpgp/errors",
+-    "openpgp/packet",
+-    "openpgp/s2k",
+-    "poly1305",
+-    "ssh",
+-    "ssh/agent",
+-    "ssh/knownhosts",
+-    "ssh/terminal",
+-  ]
+-  pruneopts = ""
+-  revision = "432090b8f568c018896cd8a0fb0345872bbac6ce"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:b4ba046df563f56fe42b6270b20039107a37e1ab47c97aa47a16f848aa5b6d9a"
+-  name = "golang.org/x/net"
+-  packages = [
+-    "context",
+-    "context/ctxhttp",
+-    "http2",
+-    "http2/hpack",
+-    "idna",
+-    "internal/timeseries",
+-    "lex/httplex",
+-    "trace",
+-  ]
+-  pruneopts = ""
+-  revision = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb"
+-
+-[[projects]]
+-  digest = "1:8a58c605e58272e3d280181a24749b07499cf98968da6f7c1d19c8d5649c6b1b"
+-  name = "golang.org/x/oauth2"
+-  packages = [
+-    ".",
+-    "google",
+-    "internal",
+-    "jws",
+-    "jwt",
+-  ]
+-  pruneopts = ""
+-  revision = "cce311a261e6fcf29de72ca96827bdb0b7d9c9e6"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:b2ea75de0ccb2db2ac79356407f8a4cd8f798fe15d41b381c00abf3ae8e55ed1"
+-  name = "golang.org/x/sync"
+-  packages = [
+-    "errgroup",
+-    "semaphore",
+-  ]
+-  pruneopts = ""
+-  revision = "1d60e4601c6fd243af51cc01ddf169918a5407ca"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:ed900376500543ca05f2a2383e1f541b4606f19cd22f34acb81b17a0b90c7f3e"
+-  name = "golang.org/x/sys"
+-  packages = [
+-    "unix",
+-    "windows",
+-  ]
+-  pruneopts = ""
+-  revision = "d0be0721c37eeb5299f245a996a483160fc36940"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:31985a0ed491dba5ba7fe92e18be008acd92ca9435ed9b35b06f3e6c00fd82cb"
+-  name = "golang.org/x/text"
+-  packages = [
+-    "collate",
+-    "collate/build",
+-    "encoding",
+-    "encoding/internal",
+-    "encoding/internal/identifier",
+-    "encoding/unicode",
+-    "internal/colltab",
+-    "internal/gen",
+-    "internal/tag",
+-    "internal/triegen",
+-    "internal/ucd",
+-    "internal/utf8internal",
+-    "language",
+-    "runes",
+-    "secure/bidirule",
+-    "transform",
+-    "unicode/bidi",
+-    "unicode/cldr",
+-    "unicode/norm",
+-    "unicode/rangetable",
+-    "width",
+-  ]
+-  pruneopts = ""
+-  revision = "4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:55a681cb66f28755765fa5fa5104cbd8dc85c55c02d206f9f89566451e3fe1aa"
+-  name = "golang.org/x/time"
+-  packages = ["rate"]
+-  pruneopts = ""
+-  revision = "fbb02b2291d28baffd63558aa44b4b56f178d650"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:77e1d6ed91936b206979806b0aacbf817ec54b840803d8f8cd7a1de5bfbf92a4"
+-  name = "golang.org/x/tools"
+-  packages = [
+-    "go/ast/astutil",
+-    "imports",
+-  ]
+-  pruneopts = ""
+-  revision = "5e776fee60db37e560cee3fb46db699d2f095386"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:e9e4b928898842a138bc345d42aae33741baa6d64f3ca69b0931f9c7a4fd0437"
+-  name = "gonum.org/v1/gonum"
+-  packages = [
+-    "blas",
+-    "blas/blas64",
+-    "blas/cblas128",
+-    "blas/gonum",
+-    "floats",
+-    "graph",
+-    "graph/internal/linear",
+-    "graph/internal/ordered",
+-    "graph/internal/set",
+-    "graph/internal/uid",
+-    "graph/iterator",
+-    "graph/simple",
+-    "graph/topo",
+-    "graph/traverse",
+-    "internal/asm/c128",
+-    "internal/asm/c64",
+-    "internal/asm/f32",
+-    "internal/asm/f64",
+-    "internal/cmplx64",
+-    "internal/math32",
+-    "lapack",
+-    "lapack/gonum",
+-    "lapack/lapack64",
+-    "mat",
+-  ]
+-  pruneopts = ""
+-  revision = "90b7154515874cee6c33cf56b29e257403a09a69"
+-
+-[[projects]]
+-  digest = "1:934fb8966f303ede63aa405e2c8d7f0a427a05ea8df335dfdc1833dd4d40756f"
+-  name = "google.golang.org/appengine"
+-  packages = [
+-    ".",
+-    "datastore",
+-    "internal",
+-    "internal/app_identity",
+-    "internal/base",
+-    "internal/datastore",
+-    "internal/log",
+-    "internal/modules",
+-    "internal/remote_api",
+-    "internal/urlfetch",
+-    "urlfetch",
+-  ]
+-  pruneopts = ""
+-  revision = "150dc57a1b433e64154302bdc40b6bb8aefa313a"
+-  version = "v1.0.0"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:2d833b53e432cd69645da559b822661ebc5c0a13c571dee1c1f80fb1a0241330"
+-  name = "google.golang.org/genproto"
+-  packages = [
+-    "googleapis/api/annotations",
+-    "googleapis/rpc/status",
+-  ]
+-  pruneopts = ""
+-  revision = "2b5a72b8730b0b16380010cfe5286c42108d88e7"
+-
+-[[projects]]
+-  digest = "1:15656947b87a6a240e61dcfae9e71a55a8d5677f240d12ab48f02cdbabf1e309"
+-  name = "google.golang.org/grpc"
+-  packages = [
+-    ".",
+-    "balancer",
+-    "balancer/base",
+-    "balancer/roundrobin",
+-    "codes",
+-    "connectivity",
+-    "credentials",
+-    "encoding",
+-    "encoding/proto",
+-    "grpclog",
+-    "internal",
+-    "internal/backoff",
+-    "internal/channelz",
+-    "internal/envconfig",
+-    "internal/grpcrand",
+-    "internal/transport",
+-    "keepalive",
+-    "metadata",
+-    "naming",
+-    "peer",
+-    "reflection",
+-    "reflection/grpc_reflection_v1alpha",
+-    "resolver",
+-    "resolver/dns",
+-    "resolver/passthrough",
+-    "stats",
+-    "status",
+-    "tap",
+-  ]
+-  pruneopts = ""
+-  revision = "8dea3dc473e90c8179e519d91302d0597c0ca1d1"
+-  version = "v1.15.0"
+-
+-[[projects]]
+-  digest = "1:adf5b0ae3467c3182757ecb86fbfe819939473bb870a42789dc1a3e7729397cd"
+-  name = "gopkg.in/go-playground/webhooks.v5"
+-  packages = [
+-    "bitbucket",
+-    "bitbucket-server",
+-    "github",
+-    "gitlab",
+-    "gogs",
+-  ]
+-  pruneopts = ""
+-  revision = "175186584584a83966dc9a7b8ec6c3d3a4ce6110"
+-  version = "v5.11.0"
+-
+-[[projects]]
+-  digest = "1:e5d1fb981765b6f7513f793a3fcaac7158408cca77f75f7311ac82cc88e9c445"
+-  name = "gopkg.in/inf.v0"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"
+-  version = "v0.9.0"
+-
+-[[projects]]
+-  branch = "v2"
+-  digest = "1:c80894778314c7fb90d94a5ab925214900e1341afeddc953cda7398b8cdcd006"
+-  name = "gopkg.in/mgo.v2"
+-  packages = [
+-    "bson",
+-    "internal/json",
+-  ]
+-  pruneopts = ""
+-  revision = "3f83fa5005286a7fe593b055f0d7771a7dce4655"
+-
+-[[projects]]
+-  digest = "1:de0ec5755ee1a5e61f079c8855cf2073b5a5f614ae3b51db65f2c4e1044455fd"
+-  name = "gopkg.in/square/go-jose.v2"
+-  packages = [
+-    ".",
+-    "cipher",
+-    "json",
+-  ]
+-  pruneopts = ""
+-  revision = "76dd09796242edb5b897103a75df2645c028c960"
+-  version = "v2.1.6"
+-
+-[[projects]]
+-  digest = "1:c8f3ff1edaf7208bf7633e5952ffb8d697552343f8010aee12427400b434ae63"
+-  name = "gopkg.in/src-d/go-billy.v4"
+-  packages = [
+-    ".",
+-    "helper/chroot",
+-    "helper/polyfill",
+-    "osfs",
+-    "util",
+-  ]
+-  pruneopts = ""
+-  revision = "59952543636f55de3f860b477b615093d5c2c3e4"
+-  version = "v4.2.1"
+-
+-[[projects]]
+-  digest = "1:a72d911e18578e34367f4b849340501c7e6a2787a3a05651b3d53c6cb96990f4"
+-  name = "gopkg.in/src-d/go-git.v4"
+-  packages = [
+-    ".",
+-    "config",
+-    "internal/revision",
+-    "plumbing",
+-    "plumbing/cache",
+-    "plumbing/filemode",
+-    "plumbing/format/config",
+-    "plumbing/format/diff",
+-    "plumbing/format/gitignore",
+-    "plumbing/format/idxfile",
+-    "plumbing/format/index",
+-    "plumbing/format/objfile",
+-    "plumbing/format/packfile",
+-    "plumbing/format/pktline",
+-    "plumbing/object",
+-    "plumbing/protocol/packp",
+-    "plumbing/protocol/packp/capability",
+-    "plumbing/protocol/packp/sideband",
+-    "plumbing/revlist",
+-    "plumbing/storer",
+-    "plumbing/transport",
+-    "plumbing/transport/client",
+-    "plumbing/transport/file",
+-    "plumbing/transport/git",
+-    "plumbing/transport/http",
+-    "plumbing/transport/internal/common",
+-    "plumbing/transport/server",
+-    "plumbing/transport/ssh",
+-    "storage",
+-    "storage/filesystem",
+-    "storage/filesystem/dotgit",
+-    "storage/memory",
+-    "utils/binary",
+-    "utils/diff",
+-    "utils/ioutil",
+-    "utils/merkletrie",
+-    "utils/merkletrie/filesystem",
+-    "utils/merkletrie/index",
+-    "utils/merkletrie/internal/frame",
+-    "utils/merkletrie/noder",
+-  ]
+-  pruneopts = ""
+-  revision = "a1f6ef44dfed1253ef7f3bc049f66b15f8fc2ab2"
+-  version = "v4.9.1"
+-
+-[[projects]]
+-  digest = "1:ceec7e96590fb8168f36df4795fefe17051d4b0c2acc7ec4e260d8138c4dafac"
+-  name = "gopkg.in/warnings.v0"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "ec4a0fea49c7b46c2aeb0b51aac55779c607e52b"
+-  version = "v0.1.2"
+-
+-[[projects]]
+-  digest = "1:cedccf16b71e86db87a24f8d4c70b0a855872eb967cb906a66b95de56aefbd0d"
+-  name = "gopkg.in/yaml.v2"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "51d6538a90f86fe93ac480b35f37b2be17fef232"
+-  version = "v2.2.2"
+-
+-[[projects]]
+-  branch = "release-1.16"
+-  digest = "1:5e5cfbab57ea5444c1eb295a39fdc403f097f5ace592c829db7b3e0e3ea66903"
+-  name = "k8s.io/api"
+-  packages = [
+-    "admission/v1",
+-    "admission/v1beta1",
+-    "admissionregistration/v1",
+-    "admissionregistration/v1beta1",
+-    "apps/v1",
+-    "apps/v1beta1",
+-    "apps/v1beta2",
+-    "auditregistration/v1alpha1",
+-    "authentication/v1",
+-    "authentication/v1beta1",
+-    "authorization/v1",
+-    "authorization/v1beta1",
+-    "autoscaling/v1",
+-    "autoscaling/v2beta1",
+-    "autoscaling/v2beta2",
+-    "batch/v1",
+-    "batch/v1beta1",
+-    "batch/v2alpha1",
+-    "certificates/v1beta1",
+-    "coordination/v1",
+-    "coordination/v1beta1",
+-    "core/v1",
+-    "discovery/v1alpha1",
+-    "events/v1beta1",
+-    "extensions/v1beta1",
+-    "imagepolicy/v1alpha1",
+-    "networking/v1",
+-    "networking/v1beta1",
+-    "node/v1alpha1",
+-    "node/v1beta1",
+-    "policy/v1beta1",
+-    "rbac/v1",
+-    "rbac/v1alpha1",
+-    "rbac/v1beta1",
+-    "scheduling/v1",
+-    "scheduling/v1alpha1",
+-    "scheduling/v1beta1",
+-    "settings/v1alpha1",
+-    "storage/v1",
+-    "storage/v1alpha1",
+-    "storage/v1beta1",
+-  ]
+-  pruneopts = ""
+-  revision = "195af9ec35214c6d98662c5791364285bf2e2cf2"
+-
+-[[projects]]
+-  branch = "release-1.16"
+-  digest = "1:7f29d62c07c68767171cf2ed8598e0cb862b99584bb8beb93189e2ed00ac520e"
+-  name = "k8s.io/apiextensions-apiserver"
+-  packages = [
+-    "pkg/apis/apiextensions",
+-    "pkg/apis/apiextensions/v1",
+-    "pkg/apis/apiextensions/v1beta1",
+-    "pkg/client/clientset/clientset",
+-    "pkg/client/clientset/clientset/scheme",
+-    "pkg/client/clientset/clientset/typed/apiextensions/v1",
+-    "pkg/client/clientset/clientset/typed/apiextensions/v1beta1",
+-    "pkg/features",
+-  ]
+-  pruneopts = ""
+-  revision = "07afe84a85e43cf2503133660c424a0b594b21db"
+-
+-[[projects]]
+-  branch = "release-1.16"
+-  digest = "1:36db89a45a8cb3d565f7ebfd67dafd42c9c0bbb80d6bbd4991629b39b02a4c64"
+-  name = "k8s.io/apimachinery"
+-  packages = [
+-    "pkg/api/equality",
+-    "pkg/api/errors",
+-    "pkg/api/meta",
+-    "pkg/api/resource",
+-    "pkg/api/validation",
+-    "pkg/api/validation/path",
+-    "pkg/apis/meta/internalversion",
+-    "pkg/apis/meta/v1",
+-    "pkg/apis/meta/v1/unstructured",
+-    "pkg/apis/meta/v1/unstructured/unstructuredscheme",
+-    "pkg/apis/meta/v1/validation",
+-    "pkg/apis/meta/v1beta1",
+-    "pkg/conversion",
+-    "pkg/conversion/queryparams",
+-    "pkg/fields",
+-    "pkg/labels",
+-    "pkg/runtime",
+-    "pkg/runtime/schema",
+-    "pkg/runtime/serializer",
+-    "pkg/runtime/serializer/json",
+-    "pkg/runtime/serializer/protobuf",
+-    "pkg/runtime/serializer/recognizer",
+-    "pkg/runtime/serializer/streaming",
+-    "pkg/runtime/serializer/versioning",
+-    "pkg/selection",
+-    "pkg/types",
+-    "pkg/util/cache",
+-    "pkg/util/clock",
+-    "pkg/util/diff",
+-    "pkg/util/duration",
+-    "pkg/util/errors",
+-    "pkg/util/framer",
+-    "pkg/util/httpstream",
+-    "pkg/util/httpstream/spdy",
+-    "pkg/util/intstr",
+-    "pkg/util/json",
+-    "pkg/util/jsonmergepatch",
+-    "pkg/util/mergepatch",
+-    "pkg/util/naming",
+-    "pkg/util/net",
+-    "pkg/util/remotecommand",
+-    "pkg/util/runtime",
+-    "pkg/util/sets",
+-    "pkg/util/strategicpatch",
+-    "pkg/util/validation",
+-    "pkg/util/validation/field",
+-    "pkg/util/wait",
+-    "pkg/util/yaml",
+-    "pkg/version",
+-    "pkg/watch",
+-    "third_party/forked/golang/json",
+-    "third_party/forked/golang/netutil",
+-    "third_party/forked/golang/reflect",
+-  ]
+-  pruneopts = ""
+-  revision = "72ed19daf4bb788ae595ae4103c404cb0fa09c84"
+-
+-[[projects]]
+-  branch = "release-1.16"
+-  digest = "1:4e236f3f94cfc5f005ceb143948ad39a4b2ad10373f394b232838f797bddd6ef"
+-  name = "k8s.io/apiserver"
+-  packages = [
+-    "pkg/apis/audit",
+-    "pkg/authentication/serviceaccount",
+-    "pkg/authentication/user",
+-    "pkg/endpoints/request",
+-    "pkg/features",
+-    "pkg/util/feature",
+-  ]
+-  pruneopts = ""
+-  revision = "ebfe712c1fff40c4800d779470515e6025eda218"
+-
+-[[projects]]
+-  branch = "release-1.16"
+-  digest = "1:b46a88b317c3187b6fa7c5351eca48b35aad182eee371168677747430ff955bb"
+-  name = "k8s.io/cli-runtime"
+-  packages = [
+-    "pkg/genericclioptions",
+-    "pkg/kustomize",
+-    "pkg/kustomize/k8sdeps",
+-    "pkg/kustomize/k8sdeps/configmapandsecret",
+-    "pkg/kustomize/k8sdeps/kunstruct",
+-    "pkg/kustomize/k8sdeps/kv",
+-    "pkg/kustomize/k8sdeps/transformer",
+-    "pkg/kustomize/k8sdeps/transformer/hash",
+-    "pkg/kustomize/k8sdeps/transformer/patch",
+-    "pkg/kustomize/k8sdeps/validator",
+-    "pkg/printers",
+-    "pkg/resource",
+-  ]
+-  pruneopts = ""
+-  revision = "6bff60de437070d7e8644b7a930837d5de512240"
+-
+-[[projects]]
+-  branch = "release-13.0"
+-  digest = "1:84f90f6a3b5b16f2c57164c5281d302b2647da8f77aa9cb14d5ebeb17fccc25e"
+-  name = "k8s.io/client-go"
+-  packages = [
+-    "discovery",
+-    "discovery/cached/disk",
+-    "discovery/fake",
+-    "dynamic",
+-    "dynamic/fake",
+-    "informers/core/v1",
+-    "informers/internalinterfaces",
+-    "kubernetes",
+-    "kubernetes/fake",
+-    "kubernetes/scheme",
+-    "kubernetes/typed/admissionregistration/v1",
+-    "kubernetes/typed/admissionregistration/v1/fake",
+-    "kubernetes/typed/admissionregistration/v1beta1",
+-    "kubernetes/typed/admissionregistration/v1beta1/fake",
+-    "kubernetes/typed/apps/v1",
+-    "kubernetes/typed/apps/v1/fake",
+-    "kubernetes/typed/apps/v1beta1",
+-    "kubernetes/typed/apps/v1beta1/fake",
+-    "kubernetes/typed/apps/v1beta2",
+-    "kubernetes/typed/apps/v1beta2/fake",
+-    "kubernetes/typed/auditregistration/v1alpha1",
+-    "kubernetes/typed/auditregistration/v1alpha1/fake",
+-    "kubernetes/typed/authentication/v1",
+-    "kubernetes/typed/authentication/v1/fake",
+-    "kubernetes/typed/authentication/v1beta1",
+-    "kubernetes/typed/authentication/v1beta1/fake",
+-    "kubernetes/typed/authorization/v1",
+-    "kubernetes/typed/authorization/v1/fake",
+-    "kubernetes/typed/authorization/v1beta1",
+-    "kubernetes/typed/authorization/v1beta1/fake",
+-    "kubernetes/typed/autoscaling/v1",
+-    "kubernetes/typed/autoscaling/v1/fake",
+-    "kubernetes/typed/autoscaling/v2beta1",
+-    "kubernetes/typed/autoscaling/v2beta1/fake",
+-    "kubernetes/typed/autoscaling/v2beta2",
+-    "kubernetes/typed/autoscaling/v2beta2/fake",
+-    "kubernetes/typed/batch/v1",
+-    "kubernetes/typed/batch/v1/fake",
+-    "kubernetes/typed/batch/v1beta1",
+-    "kubernetes/typed/batch/v1beta1/fake",
+-    "kubernetes/typed/batch/v2alpha1",
+-    "kubernetes/typed/batch/v2alpha1/fake",
+-    "kubernetes/typed/certificates/v1beta1",
+-    "kubernetes/typed/certificates/v1beta1/fake",
+-    "kubernetes/typed/coordination/v1",
+-    "kubernetes/typed/coordination/v1/fake",
+-    "kubernetes/typed/coordination/v1beta1",
+-    "kubernetes/typed/coordination/v1beta1/fake",
+-    "kubernetes/typed/core/v1",
+-    "kubernetes/typed/core/v1/fake",
+-    "kubernetes/typed/discovery/v1alpha1",
+-    "kubernetes/typed/discovery/v1alpha1/fake",
+-    "kubernetes/typed/events/v1beta1",
+-    "kubernetes/typed/events/v1beta1/fake",
+-    "kubernetes/typed/extensions/v1beta1",
+-    "kubernetes/typed/extensions/v1beta1/fake",
+-    "kubernetes/typed/networking/v1",
+-    "kubernetes/typed/networking/v1/fake",
+-    "kubernetes/typed/networking/v1beta1",
+-    "kubernetes/typed/networking/v1beta1/fake",
+-    "kubernetes/typed/node/v1alpha1",
+-    "kubernetes/typed/node/v1alpha1/fake",
+-    "kubernetes/typed/node/v1beta1",
+-    "kubernetes/typed/node/v1beta1/fake",
+-    "kubernetes/typed/policy/v1beta1",
+-    "kubernetes/typed/policy/v1beta1/fake",
+-    "kubernetes/typed/rbac/v1",
+-    "kubernetes/typed/rbac/v1/fake",
+-    "kubernetes/typed/rbac/v1alpha1",
+-    "kubernetes/typed/rbac/v1alpha1/fake",
+-    "kubernetes/typed/rbac/v1beta1",
+-    "kubernetes/typed/rbac/v1beta1/fake",
+-    "kubernetes/typed/scheduling/v1",
+-    "kubernetes/typed/scheduling/v1/fake",
+-    "kubernetes/typed/scheduling/v1alpha1",
+-    "kubernetes/typed/scheduling/v1alpha1/fake",
+-    "kubernetes/typed/scheduling/v1beta1",
+-    "kubernetes/typed/scheduling/v1beta1/fake",
+-    "kubernetes/typed/settings/v1alpha1",
+-    "kubernetes/typed/settings/v1alpha1/fake",
+-    "kubernetes/typed/storage/v1",
+-    "kubernetes/typed/storage/v1/fake",
+-    "kubernetes/typed/storage/v1alpha1",
+-    "kubernetes/typed/storage/v1alpha1/fake",
+-    "kubernetes/typed/storage/v1beta1",
+-    "kubernetes/typed/storage/v1beta1/fake",
+-    "listers/core/v1",
+-    "pkg/apis/clientauthentication",
+-    "pkg/apis/clientauthentication/v1alpha1",
+-    "pkg/apis/clientauthentication/v1beta1",
+-    "pkg/version",
+-    "plugin/pkg/client/auth/exec",
+-    "plugin/pkg/client/auth/gcp",
+-    "plugin/pkg/client/auth/oidc",
+-    "rest",
+-    "rest/watch",
+-    "restmapper",
+-    "scale",
+-    "scale/scheme",
+-    "scale/scheme/appsint",
+-    "scale/scheme/appsv1beta1",
+-    "scale/scheme/appsv1beta2",
+-    "scale/scheme/autoscalingv1",
+-    "scale/scheme/extensionsint",
+-    "scale/scheme/extensionsv1beta1",
+-    "testing",
+-    "third_party/forked/golang/template",
+-    "tools/auth",
+-    "tools/cache",
+-    "tools/clientcmd",
+-    "tools/clientcmd/api",
+-    "tools/clientcmd/api/latest",
+-    "tools/clientcmd/api/v1",
+-    "tools/metrics",
+-    "tools/pager",
+-    "tools/portforward",
+-    "tools/reference",
+-    "tools/remotecommand",
+-    "tools/watch",
+-    "transport",
+-    "transport/spdy",
+-    "util/cert",
+-    "util/connrotation",
+-    "util/exec",
+-    "util/flowcontrol",
+-    "util/homedir",
+-    "util/jsonpath",
+-    "util/keyutil",
+-    "util/retry",
+-    "util/workqueue",
+-  ]
+-  pruneopts = ""
+-  revision = "85029d69edeae82e97dd1a0de3b24668cee9a15d"
+-
+-[[projects]]
+-  branch = "release-1.16"
+-  digest = "1:254da4cb69b3776686b730a206e081e6f8898bb64760619d1895c25c407e718f"
+-  name = "k8s.io/code-generator"
+-  packages = [
+-    "cmd/go-to-protobuf",
+-    "cmd/go-to-protobuf/protobuf",
+-    "pkg/util",
+-    "third_party/forked/golang/reflect",
+-  ]
+-  pruneopts = ""
+-  revision = "8e001e5d18949be7e823ccb9cfe9b60026e7bda0"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:06c18e328063f3612dfda3c4c5e5b8becda1eabceca689335c8d98704dffe70a"
+-  name = "k8s.io/component-base"
+-  packages = ["featuregate"]
+-  pruneopts = ""
+-  revision = "435ce712a6949916fa293dc4d3d49429962043d8"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:6a2a63e09a59caff3fd2d36d69b7b92c2fe7cf783390f0b7349fb330820f9a8e"
+-  name = "k8s.io/gengo"
+-  packages = [
+-    "args",
+-    "examples/set-gen/sets",
+-    "generator",
+-    "namer",
+-    "parser",
+-    "types",
+-  ]
+-  pruneopts = ""
+-  revision = "e17681d19d3ac4837a019ece36c2a0ec31ffe985"
+-
+-[[projects]]
+-  digest = "1:9eaf86f4f6fb4a8f177220d488ef1e3255d06a691cca95f14ef085d4cd1cef3c"
+-  name = "k8s.io/klog"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "d98d8acdac006fb39831f1b25640813fef9c314f"
+-  version = "v0.3.3"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:0d737d598e9db0a38d6ef6cba514c358b9fe7e1bc6b1128d02b2622700c75f2a"
+-  name = "k8s.io/kube-aggregator"
+-  packages = [
+-    "pkg/apis/apiregistration",
+-    "pkg/apis/apiregistration/v1",
+-    "pkg/apis/apiregistration/v1beta1",
+-  ]
+-  pruneopts = ""
+-  revision = "e80910364765199a4baebd4dec54c885fe52b680"
+-
+-[[projects]]
+-  digest = "1:16a343bd9d820ae320de4d1eaa8acc7a214aac4b38fb21d03255d3a457d861df"
+-  name = "k8s.io/kube-openapi"
+-  packages = [
+-    "cmd/openapi-gen",
+-    "cmd/openapi-gen/args",
+-    "pkg/common",
+-    "pkg/generators",
+-    "pkg/generators/rules",
+-    "pkg/util/proto",
+-    "pkg/util/proto/validation",
+-    "pkg/util/sets",
+-  ]
+-  pruneopts = ""
+-  revision = "30be4d16710ac61bce31eb28a01054596fe6a9f1"
+-
+-[[projects]]
+-  branch = "release-1.16"
+-  digest = "1:687af22932f9b53ff2e6755b2eefe160f076d522794abb980f0ddb187bcefacd"
+-  name = "k8s.io/kubectl"
+-  packages = [
+-    "pkg/cmd/apply",
+-    "pkg/cmd/delete",
+-    "pkg/cmd/util",
+-    "pkg/cmd/util/editor",
+-    "pkg/cmd/util/editor/crlf",
+-    "pkg/cmd/wait",
+-    "pkg/describe",
+-    "pkg/describe/versioned",
+-    "pkg/generated",
+-    "pkg/rawhttp",
+-    "pkg/scheme",
+-    "pkg/util",
+-    "pkg/util/certificate",
+-    "pkg/util/deployment",
+-    "pkg/util/event",
+-    "pkg/util/fieldpath",
+-    "pkg/util/i18n",
+-    "pkg/util/interrupt",
+-    "pkg/util/openapi",
+-    "pkg/util/openapi/validation",
+-    "pkg/util/printers",
+-    "pkg/util/qos",
+-    "pkg/util/rbac",
+-    "pkg/util/resource",
+-    "pkg/util/slice",
+-    "pkg/util/storage",
+-    "pkg/util/templates",
+-    "pkg/util/term",
+-    "pkg/validation",
+-    "pkg/version",
+-  ]
+-  pruneopts = ""
+-  revision = "14647fd13a8b4cffc5a8f327b0018e037f72e4e8"
+-
+-[[projects]]
+-  branch = "release-1.16"
+-  digest = "1:02241e5570c239d31e52955b1a8e6d603a35fd6542d14e98882fb6c3c4ef3d56"
+-  name = "k8s.io/kubernetes"
+-  packages = [
+-    "pkg/api/legacyscheme",
+-    "pkg/api/v1/pod",
+-    "pkg/apis/apps",
+-    "pkg/apis/apps/install",
+-    "pkg/apis/apps/v1",
+-    "pkg/apis/apps/v1beta1",
+-    "pkg/apis/apps/v1beta2",
+-    "pkg/apis/authentication",
+-    "pkg/apis/authentication/install",
+-    "pkg/apis/authentication/v1",
+-    "pkg/apis/authentication/v1beta1",
+-    "pkg/apis/authorization",
+-    "pkg/apis/authorization/install",
+-    "pkg/apis/authorization/v1",
+-    "pkg/apis/authorization/v1beta1",
+-    "pkg/apis/autoscaling",
+-    "pkg/apis/autoscaling/install",
+-    "pkg/apis/autoscaling/v1",
+-    "pkg/apis/autoscaling/v2beta1",
+-    "pkg/apis/autoscaling/v2beta2",
+-    "pkg/apis/batch",
+-    "pkg/apis/batch/install",
+-    "pkg/apis/batch/v1",
+-    "pkg/apis/batch/v1beta1",
+-    "pkg/apis/batch/v2alpha1",
+-    "pkg/apis/certificates",
+-    "pkg/apis/certificates/install",
+-    "pkg/apis/certificates/v1beta1",
+-    "pkg/apis/coordination",
+-    "pkg/apis/coordination/install",
+-    "pkg/apis/coordination/v1",
+-    "pkg/apis/coordination/v1beta1",
+-    "pkg/apis/core",
+-    "pkg/apis/core/install",
+-    "pkg/apis/core/v1",
+-    "pkg/apis/events",
+-    "pkg/apis/events/install",
+-    "pkg/apis/events/v1beta1",
+-    "pkg/apis/extensions",
+-    "pkg/apis/extensions/install",
+-    "pkg/apis/extensions/v1beta1",
+-    "pkg/apis/networking",
+-    "pkg/apis/policy",
+-    "pkg/apis/policy/install",
+-    "pkg/apis/policy/v1beta1",
+-    "pkg/apis/rbac",
+-    "pkg/apis/rbac/install",
+-    "pkg/apis/rbac/v1",
+-    "pkg/apis/rbac/v1alpha1",
+-    "pkg/apis/rbac/v1beta1",
+-    "pkg/apis/scheduling",
+-    "pkg/apis/scheduling/install",
+-    "pkg/apis/scheduling/v1",
+-    "pkg/apis/scheduling/v1alpha1",
+-    "pkg/apis/scheduling/v1beta1",
+-    "pkg/apis/settings",
+-    "pkg/apis/settings/install",
+-    "pkg/apis/settings/v1alpha1",
+-    "pkg/apis/storage",
+-    "pkg/apis/storage/install",
+-    "pkg/apis/storage/v1",
+-    "pkg/apis/storage/v1alpha1",
+-    "pkg/apis/storage/v1beta1",
+-    "pkg/features",
+-    "pkg/kubectl/cmd/auth",
+-    "pkg/registry/rbac/reconciliation",
+-    "pkg/registry/rbac/validation",
+-    "pkg/util/node",
+-    "pkg/util/parsers",
+-    "pkg/util/slice",
+-    "pkg/util/workqueue/prometheus",
+-  ]
+-  pruneopts = ""
+-  revision = "bfafae8f1c2fdf3c3cfef04674db028531a7c098"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:a8a2e6bbef691323b833d0eb11bb0e570e7eb9619ac76f7b11265530e1cac922"
+-  name = "k8s.io/utils"
+-  packages = [
+-    "buffer",
+-    "exec",
+-    "integer",
+-    "net",
+-    "pointer",
+-    "trace",
+-  ]
+-  pruneopts = ""
+-  revision = "6ca3b61696b65b0e81f1a39b4937fc2d2994ed6a"
+-
+-[[projects]]
+-  branch = "master"
+-  digest = "1:9b9f12f4c13ca4a4f4b4554c00ba46cb2910ff4079825d96d520b03c447e6da5"
+-  name = "layeh.com/gopher-json"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "97fed8db84274c421dbfffbb28ec859901556b97"
+-
+-[[projects]]
+-  digest = "1:0b2daace3dcced8712072529b621360cf520f3c2ead92d755f35a0ec8dca2714"
+-  name = "sigs.k8s.io/kustomize"
+-  packages = [
+-    "pkg/commands/build",
+-    "pkg/constants",
+-    "pkg/expansion",
+-    "pkg/factory",
+-    "pkg/fs",
+-    "pkg/git",
+-    "pkg/gvk",
+-    "pkg/ifc",
+-    "pkg/ifc/transformer",
+-    "pkg/image",
+-    "pkg/internal/error",
+-    "pkg/loader",
+-    "pkg/patch",
+-    "pkg/patch/transformer",
+-    "pkg/resid",
+-    "pkg/resmap",
+-    "pkg/resource",
+-    "pkg/target",
+-    "pkg/transformers",
+-    "pkg/transformers/config",
+-    "pkg/transformers/config/defaultconfig",
+-    "pkg/types",
+-  ]
+-  pruneopts = ""
+-  revision = "a6f65144121d1955266b0cd836ce954c04122dc8"
+-  version = "v2.0.3"
+-
+-[[projects]]
+-  digest = "1:321081b4a44256715f2b68411d8eda9a17f17ebfe6f0cc61d2cc52d11c08acfa"
+-  name = "sigs.k8s.io/yaml"
+-  packages = ["."]
+-  pruneopts = ""
+-  revision = "fd68e9863619f6ec2fdd8625fe1f02e7c877e480"
+-  version = "v1.1.0"
+-
+-[solve-meta]
+-  analyzer-name = "dep"
+-  analyzer-version = 1
+-  input-imports = [
+-    "bou.ke/monkey",
+-    "github.com/Masterminds/semver",
+-    "github.com/TomOnTime/utfutil",
+-    "github.com/argoproj/pkg/errors",
+-    "github.com/argoproj/pkg/exec",
+-    "github.com/argoproj/pkg/time",
+-    "github.com/casbin/casbin",
+-    "github.com/casbin/casbin/model",
+-    "github.com/coreos/go-oidc",
+-    "github.com/dgrijalva/jwt-go",
+-    "github.com/dustin/go-humanize",
+-    "github.com/evanphx/json-patch",
+-    "github.com/ghodss/yaml",
+-    "github.com/go-openapi/loads",
+-    "github.com/go-openapi/runtime/middleware",
+-    "github.com/go-openapi/spec",
+-    "github.com/go-redis/cache",
+-    "github.com/go-redis/redis",
+-    "github.com/gobuffalo/packr",
+-    "github.com/gobwas/glob",
+-    "github.com/gogits/go-gogs-client",
+-    "github.com/gogo/protobuf/gogoproto",
+-    "github.com/gogo/protobuf/proto",
+-    "github.com/gogo/protobuf/protoc-gen-gofast",
+-    "github.com/gogo/protobuf/protoc-gen-gogofast",
+-    "github.com/gogo/protobuf/sortkeys",
+-    "github.com/golang/protobuf/proto",
+-    "github.com/golang/protobuf/protoc-gen-go",
+-    "github.com/golang/protobuf/ptypes/empty",
+-    "github.com/google/go-jsonnet",
+-    "github.com/google/shlex",
+-    "github.com/grpc-ecosystem/go-grpc-middleware",
+-    "github.com/grpc-ecosystem/go-grpc-middleware/auth",
+-    "github.com/grpc-ecosystem/go-grpc-middleware/logging",
+-    "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus",
+-    "github.com/grpc-ecosystem/go-grpc-middleware/retry",
+-    "github.com/grpc-ecosystem/go-grpc-middleware/tags/logrus",
+-    "github.com/grpc-ecosystem/go-grpc-prometheus",
+-    "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway",
+-    "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger",
+-    "github.com/grpc-ecosystem/grpc-gateway/runtime",
+-    "github.com/grpc-ecosystem/grpc-gateway/utilities",
+-    "github.com/improbable-eng/grpc-web/go/grpcweb",
+-    "github.com/kballard/go-shellquote",
+-    "github.com/patrickmn/go-cache",
+-    "github.com/pkg/errors",
+-    "github.com/prometheus/client_golang/prometheus",
+-    "github.com/prometheus/client_golang/prometheus/promhttp",
+-    "github.com/robfig/cron",
+-    "github.com/sirupsen/logrus",
+-    "github.com/sirupsen/logrus/hooks/test",
+-    "github.com/skratchdot/open-golang/open",
+-    "github.com/soheilhy/cmux",
+-    "github.com/spf13/cobra",
+-    "github.com/spf13/pflag",
+-    "github.com/stretchr/testify/assert",
+-    "github.com/stretchr/testify/mock",
+-    "github.com/vmihailenco/msgpack",
+-    "github.com/yudai/gojsondiff",
+-    "github.com/yudai/gojsondiff/formatter",
+-    "github.com/yuin/gopher-lua",
+-    "golang.org/x/crypto/bcrypt",
+-    "golang.org/x/crypto/ssh",
+-    "golang.org/x/crypto/ssh/knownhosts",
+-    "golang.org/x/crypto/ssh/terminal",
+-    "golang.org/x/net/context",
+-    "golang.org/x/oauth2",
+-    "golang.org/x/sync/errgroup",
+-    "golang.org/x/sync/semaphore",
+-    "google.golang.org/genproto/googleapis/api/annotations",
+-    "google.golang.org/grpc",
+-    "google.golang.org/grpc/codes",
+-    "google.golang.org/grpc/credentials",
+-    "google.golang.org/grpc/grpclog",
+-    "google.golang.org/grpc/metadata",
+-    "google.golang.org/grpc/reflection",
+-    "google.golang.org/grpc/status",
+-    "gopkg.in/go-playground/webhooks.v5/bitbucket",
+-    "gopkg.in/go-playground/webhooks.v5/bitbucket-server",
+-    "gopkg.in/go-playground/webhooks.v5/github",
+-    "gopkg.in/go-playground/webhooks.v5/gitlab",
+-    "gopkg.in/go-playground/webhooks.v5/gogs",
+-    "gopkg.in/src-d/go-git.v4",
+-    "gopkg.in/src-d/go-git.v4/config",
+-    "gopkg.in/src-d/go-git.v4/plumbing",
+-    "gopkg.in/src-d/go-git.v4/plumbing/transport",
+-    "gopkg.in/src-d/go-git.v4/plumbing/transport/client",
+-    "gopkg.in/src-d/go-git.v4/plumbing/transport/http",
+-    "gopkg.in/src-d/go-git.v4/plumbing/transport/ssh",
+-    "gopkg.in/src-d/go-git.v4/storage/memory",
+-    "gopkg.in/src-d/go-git.v4/utils/ioutil",
+-    "gopkg.in/yaml.v2",
+-    "k8s.io/api/apps/v1",
+-    "k8s.io/api/batch/v1",
+-    "k8s.io/api/core/v1",
+-    "k8s.io/api/extensions/v1beta1",
+-    "k8s.io/api/networking/v1beta1",
+-    "k8s.io/api/rbac/v1",
+-    "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1",
+-    "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset",
+-    "k8s.io/apimachinery/pkg/api/equality",
+-    "k8s.io/apimachinery/pkg/api/errors",
+-    "k8s.io/apimachinery/pkg/apis/meta/v1",
+-    "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
+-    "k8s.io/apimachinery/pkg/fields",
+-    "k8s.io/apimachinery/pkg/labels",
+-    "k8s.io/apimachinery/pkg/runtime",
+-    "k8s.io/apimachinery/pkg/runtime/schema",
+-    "k8s.io/apimachinery/pkg/runtime/serializer",
+-    "k8s.io/apimachinery/pkg/selection",
+-    "k8s.io/apimachinery/pkg/types",
+-    "k8s.io/apimachinery/pkg/util/intstr",
+-    "k8s.io/apimachinery/pkg/util/jsonmergepatch",
+-    "k8s.io/apimachinery/pkg/util/runtime",
+-    "k8s.io/apimachinery/pkg/util/strategicpatch",
+-    "k8s.io/apimachinery/pkg/util/wait",
+-    "k8s.io/apimachinery/pkg/watch",
+-    "k8s.io/cli-runtime/pkg/genericclioptions",
+-    "k8s.io/cli-runtime/pkg/printers",
+-    "k8s.io/client-go/discovery",
+-    "k8s.io/client-go/discovery/fake",
+-    "k8s.io/client-go/dynamic",
+-    "k8s.io/client-go/dynamic/fake",
+-    "k8s.io/client-go/informers/core/v1",
+-    "k8s.io/client-go/kubernetes",
+-    "k8s.io/client-go/kubernetes/fake",
+-    "k8s.io/client-go/kubernetes/scheme",
+-    "k8s.io/client-go/listers/core/v1",
+-    "k8s.io/client-go/plugin/pkg/client/auth/gcp",
+-    "k8s.io/client-go/plugin/pkg/client/auth/oidc",
+-    "k8s.io/client-go/rest",
+-    "k8s.io/client-go/testing",
+-    "k8s.io/client-go/tools/cache",
+-    "k8s.io/client-go/tools/clientcmd",
+-    "k8s.io/client-go/tools/clientcmd/api",
+-    "k8s.io/client-go/tools/portforward",
+-    "k8s.io/client-go/transport/spdy",
+-    "k8s.io/client-go/util/flowcontrol",
+-    "k8s.io/client-go/util/workqueue",
+-    "k8s.io/code-generator/cmd/go-to-protobuf",
+-    "k8s.io/klog",
+-    "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1",
+-    "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1",
+-    "k8s.io/kube-openapi/cmd/openapi-gen",
+-    "k8s.io/kube-openapi/pkg/common",
+-    "k8s.io/kubectl/pkg/cmd/apply",
+-    "k8s.io/kubectl/pkg/cmd/util",
+-    "k8s.io/kubectl/pkg/scheme",
+-    "k8s.io/kubectl/pkg/util/term",
+-    "k8s.io/kubernetes/pkg/api/legacyscheme",
+-    "k8s.io/kubernetes/pkg/api/v1/pod",
+-    "k8s.io/kubernetes/pkg/apis/apps/install",
+-    "k8s.io/kubernetes/pkg/apis/authentication/install",
+-    "k8s.io/kubernetes/pkg/apis/authorization/install",
+-    "k8s.io/kubernetes/pkg/apis/autoscaling/install",
+-    "k8s.io/kubernetes/pkg/apis/batch/install",
+-    "k8s.io/kubernetes/pkg/apis/certificates/install",
+-    "k8s.io/kubernetes/pkg/apis/coordination/install",
+-    "k8s.io/kubernetes/pkg/apis/core",
+-    "k8s.io/kubernetes/pkg/apis/core/install",
+-    "k8s.io/kubernetes/pkg/apis/events/install",
+-    "k8s.io/kubernetes/pkg/apis/extensions/install",
+-    "k8s.io/kubernetes/pkg/apis/policy/install",
+-    "k8s.io/kubernetes/pkg/apis/rbac/install",
+-    "k8s.io/kubernetes/pkg/apis/scheduling/install",
+-    "k8s.io/kubernetes/pkg/apis/settings/install",
+-    "k8s.io/kubernetes/pkg/apis/storage/install",
+-    "k8s.io/kubernetes/pkg/kubectl/cmd/auth",
+-    "k8s.io/kubernetes/pkg/util/node",
+-    "k8s.io/kubernetes/pkg/util/slice",
+-    "k8s.io/kubernetes/pkg/util/workqueue/prometheus",
+-    "k8s.io/utils/pointer",
+-    "layeh.com/gopher-json",
+-  ]
+-  solver-name = "gps-cdcl"
+-  solver-version = 1
+diff --git a/Gopkg.toml b/Gopkg.toml
+deleted file mode 100644
+index 2fa04ee4..00000000
+--- a/Gopkg.toml
++++ /dev/null
+@@ -1,117 +0,0 @@
+-# Packages should only be added to the following list when we use them *outside* of our go code.
+-# (e.g. we want to build the binary to invoke as part of the build process, such as in
+-# generate-proto.sh). Normal use of golang packages should be added via `dep ensure`, and pinned
+-# with a [[constraint]] or [[override]] when version is important.
+-required = [
+-  "github.com/golang/protobuf/protoc-gen-go",
+-  "github.com/gogo/protobuf/protoc-gen-gofast",
+-  "github.com/gogo/protobuf/protoc-gen-gogofast",
+-  "k8s.io/code-generator/cmd/go-to-protobuf",
+-  "k8s.io/kube-openapi/cmd/openapi-gen",
+-  "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway",
+-  "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger",
+-  "golang.org/x/sync/errgroup",
+-]
+-
+-[[constraint]]
+-  name = "google.golang.org/grpc"
+-  version = "1.15.0"
+-
+-[[constraint]]
+-  name = "github.com/gogo/protobuf"
+-  version = "1.3.1"
+-
+-# override github.com/grpc-ecosystem/go-grpc-middleware's constraint on master
+-[[override]]
+-  name = "github.com/golang/protobuf"
+-  version = "1.2.0"
+-
+-[[constraint]]
+-  name = "github.com/grpc-ecosystem/grpc-gateway"
+-  version = "v1.3.1"
+-
+-# prometheus does not believe in semversioning yet
+-[[constraint]]
+-  name = "github.com/prometheus/client_golang"
+-  revision = "7858729281ec582767b20e0d696b6041d995d5e0"
+-
+-[[override]]
+-  branch = "release-1.16"
+-  name = "k8s.io/api"
+-
+-[[override]]
+-  branch = "release-1.16"
+-  name = "k8s.io/kubernetes"
+-
+-[[override]]
+-  branch = "release-1.16"
+-  name = "k8s.io/code-generator"
+-
+-[[override]]
+-  branch = "release-1.16"
+-  name = "k8s.io/apimachinery"
+-
+-[[override]]
+-  branch = "release-1.16"
+-  name = "k8s.io/apiextensions-apiserver"
+-
+-[[override]]
+-  branch = "release-1.16"
+-  name = "k8s.io/apiserver"
+-
+-[[override]]
+-  branch = "release-1.16"
+-  name = "k8s.io/kubectl"
+-
+-[[override]]
+-  branch = "release-1.16"
+-  name = "k8s.io/cli-runtime"
+-
+-[[override]]
+-  version = "2.0.3"
+-  name = "sigs.k8s.io/kustomize"
+-
+-# ASCIIRenderer does not implement blackfriday.Renderer
+-[[override]]
+-  name = "github.com/russross/blackfriday"
+-  version = "1.5.2"
+- 
+-[[override]]
+-  branch = "release-13.0"
+-  name = "k8s.io/client-go"
+-
+-[[override]]
+-  name = "github.com/casbin/casbin"
+-  version = "1.9.1"
+-
+-[[constraint]]
+-  name = "github.com/stretchr/testify"
+-  version = "1.2.2"
+-
+-[[constraint]]
+-  name = "github.com/gobuffalo/packr"
+-  version = "v1.11.0"
+-
+-[[constraint]]
+-  branch = "master"
+-  name = "github.com/argoproj/pkg"
+-
+-[[constraint]]
+-  branch = "master"
+-  name = "github.com/yudai/gojsondiff"
+-
+-# Fixes: Could not introduce sigs.k8s.io/kustomize@v2.0.3, as it has a dependency on github.com/spf13/cobra with constraint ^0.0.2, which has no overlap with existing constraint 0.0.5 from (root)
+-[[override]]
+-  name = "github.com/spf13/cobra"
+-  revision = "0.0.5"
+-
+-# TODO: move off of k8s.io/kube-openapi and use controller-tools for CRD spec generation
+-# (override argoproj/argo contraint on master)
+-[[override]]
+-  revision = "30be4d16710ac61bce31eb28a01054596fe6a9f1"
+-  name = "k8s.io/kube-openapi"
+-
+-# jsonpatch replace operation does not apply: doc is missing key: /metadata/annotations
+-[[override]]
+-  name = "github.com/evanphx/json-patch"
+-  version = "v4.1.0"
+diff --git a/go.mod b/go.mod
+new file mode 100644
+index 00000000..2e741ab3
+--- /dev/null
++++ b/go.mod
+@@ -0,0 +1,114 @@
++module github.com/argoproj/argo-cd
++
++go 1.12
++
++require (
++	bou.ke/monkey v1.0.1
++	github.com/Masterminds/semver v1.4.2
++	github.com/TomOnTime/utfutil v0.0.0-20180511104225-09c41003ee1d
++	github.com/argoproj/pkg v0.0.0-20191031223000-02a6aac40ac4
++	github.com/casbin/casbin v1.9.1
++	github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 // indirect
++	github.com/coreos/go-oidc v2.1.0+incompatible
++	github.com/dgrijalva/jwt-go v3.2.0+incompatible
++	github.com/docker/docker v1.6.0-rc5 // indirect
++	github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
++	github.com/dustin/go-humanize v1.0.0
++	github.com/evanphx/json-patch v4.5.0+incompatible
++	github.com/ghodss/yaml v1.0.0
++	github.com/go-openapi/loads v0.19.2
++	github.com/go-openapi/runtime v0.19.0
++	github.com/go-openapi/spec v0.19.2
++	github.com/go-redis/cache v6.3.5+incompatible
++	github.com/go-redis/redis v6.15.1+incompatible
++	github.com/gobuffalo/packr v1.11.0
++	github.com/gobwas/glob v0.2.3
++	github.com/gogits/go-gogs-client v0.0.0-20190616193657-5a05380e4bc2
++	github.com/gogo/protobuf v1.3.1
++	github.com/golang/protobuf v1.3.1
++	github.com/google/btree v1.0.0 // indirect
++	github.com/google/go-cmp v0.3.1 // indirect
++	github.com/google/go-jsonnet v0.10.0
++	github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf
++	github.com/googleapis/gnostic v0.1.0 // indirect
++	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
++	github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79
++	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
++	github.com/grpc-ecosystem/grpc-gateway v1.3.1
++	github.com/improbable-eng/grpc-web v0.0.0-20181111100011-16092bd1d58a
++	github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect
++	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
++	github.com/malexdev/utfutil v0.0.0-20180510171754-00c8d4a8e7a8 // indirect
++	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
++	github.com/patrickmn/go-cache v2.1.0+incompatible
++	github.com/pkg/errors v0.8.1
++	github.com/pquerna/cachecontrol v0.0.0-20180306154005-525d0eb5f91d // indirect
++	github.com/prometheus/client_golang v0.9.2
++	github.com/robfig/cron v1.1.0
++	github.com/rs/cors v1.6.0 // indirect
++	github.com/sirupsen/logrus v1.4.2
++	github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c
++	github.com/soheilhy/cmux v0.1.4
++	github.com/spf13/cobra v0.0.5
++	github.com/spf13/pflag v1.0.5
++	github.com/stretchr/testify v1.3.0
++	github.com/vmihailenco/msgpack v3.3.1+incompatible
++	github.com/yudai/gojsondiff v0.0.0-20180504020246-0525c875b75c
++	github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
++	github.com/yudai/pp v2.0.1+incompatible // indirect
++	github.com/yuin/gopher-lua v0.0.0-20190115140932-732aa6820ec4
++	golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586
++	golang.org/x/net v0.0.0-20191004110552-13f9640d40b9
++	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
++	golang.org/x/sync v0.0.0-20190423024810-112230192c58
++	google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873
++	google.golang.org/grpc v1.23.0
++	gopkg.in/go-playground/webhooks.v5 v5.11.0
++	gopkg.in/src-d/go-git.v4 v4.9.1
++	gopkg.in/yaml.v2 v2.2.8
++	k8s.io/api v0.0.0
++	k8s.io/apiextensions-apiserver v0.0.0
++	k8s.io/apimachinery v0.16.5-beta.1
++	k8s.io/cli-runtime v0.0.0
++	k8s.io/client-go v0.0.0
++	k8s.io/klog v1.0.0
++	k8s.io/kube-aggregator v0.0.0
++	k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
++	k8s.io/kubectl v0.0.0
++	k8s.io/kubernetes v0.0.0-20191207011953-bfafae8f1c2f
++	k8s.io/utils v0.0.0-20191114200735-6ca3b61696b6
++	layeh.com/gopher-json v0.0.0-20190114024228-97fed8db8427
++)
++
++replace (
++	k8s.io/api => k8s.io/api v0.0.0-20200131112707-d64dbec685a4
++	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20200208193839-84fe3c0be50e
++	k8s.io/apimachinery => k8s.io/apimachinery v0.16.7-beta.0.0.20200131112342-0c9ec93240c9
++	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20200208192130-2d005a048922
++	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200131120220-9674fbb91442
++	k8s.io/client-go => k8s.io/client-go v0.0.0-20191016111102-bec269661e48
++	k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20200131203752-f498d522efeb
++	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20200131121422-fc6110069b18
++	k8s.io/code-generator => k8s.io/code-generator v0.16.7-beta.0.0.20200131112027-a3045e5e55c0
++	k8s.io/component-base => k8s.io/component-base v0.0.0-20200131113804-409d4deb41dd
++	k8s.io/cri-api => k8s.io/cri-api v0.16.8-beta.0
++	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20200131121824-f033562d74c3
++	k8s.io/gengo => k8s.io/gengo v0.0.0-20190822140433-26a664648505
++	k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
++	k8s.io/klog => k8s.io/klog v0.4.0
++	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20200208192621-0eeb50407007
++	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20200131121224-13b3f231e47d
++	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf
++	k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20200131120626-5b8ba5e54e1f
++	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20200131121024-5f0ba0866863
++	k8s.io/kubectl => k8s.io/kubectl v0.0.0-20200131122652-b28c9fbca10f
++	k8s.io/kubelet => k8s.io/kubelet v0.0.0-20200131120825-905bd8eea4c4
++	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20200208200602-3a1c7effd2b3
++	k8s.io/metrics => k8s.io/metrics v0.0.0-20200131120008-5c623d74062d
++	k8s.io/node-api => k8s.io/node-api v0.0.0-20200131122255-04077c800298
++	k8s.io/repo-infra => k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3
++	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20200208192953-f8dc80bbc173
++	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.0.0-20200131120425-dca0863cb511
++	k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-20200131115407-2b45fb79af22
++	k8s.io/utils => k8s.io/utils v0.0.0-20190801114015-581e00157fb1
++)
+diff --git a/go.sum b/go.sum
+new file mode 100644
+index 00000000..3d39244f
+--- /dev/null
++++ b/go.sum
+@@ -0,0 +1,700 @@
++bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690/go.mod h1:Ulb78X89vxKYgdL24HMTiXYHlyHEvruOj1ZPlqeNEZM=
++bou.ke/monkey v1.0.1 h1:zEMLInw9xvNakzUUPjfS4Ds6jYPqCFx3m7bRmG5NH2U=
++bou.ke/monkey v1.0.1/go.mod h1:FgHuK96Rv2Nlf+0u1OOVDpCMdsWyOFmeeketDHE7LIg=
++cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
++cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
++cloud.google.com/go v0.38.0 h1:ROfEUZz+Gh5pa62DJWXSaonyu3StP6EA6lPEXPI6mCo=
++cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
++github.com/Azure/azure-sdk-for-go v32.5.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
++github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
++github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
++github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
++github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
++github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
++github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
++github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocmRAJWqST1wQYhyyjXJ3SJc=
++github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8=
++github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
++github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
++github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
++github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
++github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
++github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190822182118-27a4ced34534/go.mod h1:iroGtC8B3tQiqtds1l+mgk/BBOrxbqjH+eUfFQYRc14=
++github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod h1:3VYc5hodBMJ5+l/7J4xAyMeuM2PNuepvHlGs8yilUCA=
++github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw=
++github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
++github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd h1:sjQovDkwrZp8u+gxLtPgKGjk5hCxuy2hrRejBTA9xFU=
++github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
++github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc=
++github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
++github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
++github.com/Microsoft/hcsshim v0.0.0-20190417211021-672e52e9209d/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
++github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
++github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
++github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
++github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
++github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
++github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
++github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
++github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
++github.com/Rican7/retry v0.1.0/go.mod h1:FgOROf8P5bebcC1DS0PdOQiqGUridaZvikzUmkFW6gg=
++github.com/TomOnTime/utfutil v0.0.0-20180511104225-09c41003ee1d h1:WtAMR0fPCOfK7TPGZ8ZpLLY18HRvL7XJ3xcs0wnREgo=
++github.com/TomOnTime/utfutil v0.0.0-20180511104225-09c41003ee1d/go.mod h1:WML6KOYjeU8N6YyusMjj2qRvaPNUEvrQvaxuFcMRFJY=
++github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
++github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
++github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
++github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
++github.com/argoproj/pkg v0.0.0-20191031223000-02a6aac40ac4 h1:ykGEoo3WuCNoqO+rnaa0j/RdYfXZFp5Aqim+CjzdBaQ=
++github.com/argoproj/pkg v0.0.0-20191031223000-02a6aac40ac4/go.mod h1:2EZ44RG/CcgtPTwrRR0apOc7oU6UIw8GjCUJWZ8X3bM=
++github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
++github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
++github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
++github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=
++github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
++github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7/go.mod h1:LWMyo4iOLWXHGdBki7NIht1kHru/0wM179h+d3g8ATM=
++github.com/aws/aws-sdk-go v1.16.26/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
++github.com/bazelbuild/bazel-gazelle v0.0.0-20181012220611-c728ce9f663e/go.mod h1:uHBSeeATKpVazAACZBDPL/Nk/UhQDDsJWDlqYJo8/Us=
++github.com/bazelbuild/buildtools v0.0.0-20180226164855-80c7f0d45d7e/go.mod h1:5JP0TXzWDHXv8qvxRC4InIazwdyDseBDbzESUMKk1yU=
++github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
++github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
++github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115/go.mod h1:zVt7zX3K/aDCk9Tj+VM7YymsX66ERvzCJzw8rFCX2JU=
++github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
++github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
++github.com/caddyserver/caddy v1.0.3/go.mod h1:G+ouvOY32gENkJC+jhgl62TyhvqEsFaDiZ4uw0RzP1E=
++github.com/casbin/casbin v1.9.1 h1:ucjbS5zTrmSLtH4XogqOG920Poe6QatdXtz1FEbApeM=
++github.com/casbin/casbin v1.9.1/go.mod h1:z8uPsfBJGUsnkagrt3G8QvjgTKFMBJ32UP8HpZllfog=
++github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
++github.com/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c/go.mod h1:Xe6ZsFhtM8HrDku0pxJ3/Lr51rwykrzgFwpmTzleatY=
++github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
++github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 h1:HD4PLRzjuCVW79mQ0/pdsalOLHJ+FaEoqJLxfltpb2U=
++github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
++github.com/checkpoint-restore/go-criu v0.0.0-20190109184317-bdb7599cd87b/go.mod h1:TrMrLQfeENAPYPRsJuq3jsqdlRh3lvi6trTZJG8+tho=
++github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
++github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
++github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
++github.com/cloudflare/cfssl v0.0.0-20180726162950-56268a613adf/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA=
++github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313/go.mod h1:P1wt9Z3DP8O6W3rvwCt0REIlshg1InHImaLW0t3ObY0=
++github.com/codegangsta/negroni v1.0.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2iZY63YTKWo0=
++github.com/container-storage-interface/spec v1.1.0/go.mod h1:6URME8mwIBbpVyZV93Ce5St17xBiQJQY67NDsuohiy4=
++github.com/containerd/console v0.0.0-20170925154832-84eeaae905fa/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
++github.com/containerd/containerd v1.0.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
++github.com/containerd/typeurl v0.0.0-20190228175220-2a93cfde8c20/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc=
++github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
++github.com/coredns/corefile-migration v1.0.2/go.mod h1:OFwBp/Wc9dJt5cAZzHWMNhK1r5L0p0jDwIBc6j8NC8E=
++github.com/coreos/bbolt v1.3.3/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
++github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
++github.com/coreos/etcd v3.3.17+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
++github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
++github.com/coreos/go-oidc v2.1.0+incompatible h1:sdJrfw8akMnCuUlaZU3tE/uYXFgfqom8DBE9so9EBsM=
++github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
++github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
++github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
++github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
++github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
++github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
++github.com/coreos/rkt v1.30.0/go.mod h1:O634mlH6U7qk87poQifK6M2rsFNt+FyUTWNMnP1hF1U=
++github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
++github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4=
++github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
++github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
++github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
++github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
++github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE=
++github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
++github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
++github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
++github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
++github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
++github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
++github.com/docker/docker v1.6.0-rc5 h1:8dnqiCOcZf2QXwR4LNnG7AK9hXeeT6adGmtjicsVswc=
++github.com/docker/docker v1.6.0-rc5/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
++github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
++github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
++github.com/docker/libnetwork v0.0.0-20180830151422-a9cd636e3789/go.mod h1:93m0aTqz6z+g32wla4l4WxTrdtvBRmVzYRkYvasA5Z8=
++github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
++github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c h1:ZfSZ3P3BedhKGUhzj7BQlPSU4OvT6tfOKe3DVHzOA7s=
++github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
++github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
++github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
++github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e h1:p1yVGRW3nmb85p1Sh1ZJSDm4A4iKLS5QNbvUHMgGu/M=
++github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
++github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
++github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk=
++github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
++github.com/emirpasic/gods v1.9.0 h1:rUF4PuzEjMChMiNsVjdI+SyLu7rEqpQ5reNFnhC7oFo=
++github.com/emirpasic/gods v1.9.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
++github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod h1:MhmAMZ8V4CYH4ybgdRwPr2TU5ThnS43puaKEMpja1uw=
++github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
++github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M=
++github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
++github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM=
++github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
++github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8=
++github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
++github.com/fatih/color v1.6.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
++github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
++github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
++github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
++github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
++github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
++github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
++github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
++github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
++github.com/gliderlabs/ssh v0.1.1 h1:j3L6gSLQalDETeEg/Jg0mGY0/y/N6zI2xX1978P0Uqw=
++github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
++github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
++github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8 h1:DujepqpGd1hyOd7aW59XpK7Qymp8iy83xq74fLr21is=
++github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
++github.com/go-acme/lego v2.5.0+incompatible/go.mod h1:yzMNe9CasVUhkquNvti5nAtPmG94USbYxYrZfTkIn0M=
++github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo=
++github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
++github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI=
++github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
++github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
++github.com/go-openapi/analysis v0.19.2 h1:ophLETFestFZHk3ji7niPEL4d466QjW+0Tdg5VyDq7E=
++github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk=
++github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
++github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
++github.com/go-openapi/errors v0.19.2 h1:a2kIyV3w+OS3S97zxUndRVD46+FhGOUBDFY7nmu4CsY=
++github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94=
++github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
++github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
++github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
++github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
++github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=
++github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
++github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
++github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
++github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
++github.com/go-openapi/jsonreference v0.19.2 h1:o20suLFB4Ri0tuzpWtyHlh7E7HnkqTNLq6aR6WVNS1w=
++github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
++github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
++github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
++github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
++github.com/go-openapi/loads v0.19.2 h1:rf5ArTHmIJxyV5Oiks+Su0mUens1+AjpkPoWr5xFRcI=
++github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs=
++github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA=
++github.com/go-openapi/runtime v0.19.0 h1:sU6pp4dSV2sGlNKKyHxZzi1m1kG4WnYtWcJ+HYbygjE=
++github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64=
++github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
++github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
++github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
++github.com/go-openapi/spec v0.19.2 h1:SStNd1jRcYtfKCN7R0laGNs80WYYvn5CbBjM2sOmCrE=
++github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY=
++github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
++github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
++github.com/go-openapi/strfmt v0.19.0 h1:0Dn9qy1G9+UJfRU7TR8bmdGxb4uifB7HNrJjOnV0yPk=
++github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY=
++github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
++github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
++github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
++github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
++github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY=
++github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
++github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
++github.com/go-openapi/validate v0.19.2 h1:ky5l57HjyVRrsJfd2+Ro5Z9PjGuKbsmftwyMtk8H7js=
++github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
++github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU=
++github.com/go-redis/cache v6.3.5+incompatible h1:4OUyoXXYRRQ6tKA4ue3TlPUkBzk3occzjtXBZBxCzgs=
++github.com/go-redis/cache v6.3.5+incompatible/go.mod h1:XNnMdvlNjcZvHjsscEozHAeOeSE5riG9Fj54meG4WT4=
++github.com/go-redis/redis v6.15.1+incompatible h1:BZ9s4/vHrIqwOb0OPtTQ5uABxETJ3NRuUNoSUurnkew=
++github.com/go-redis/redis v6.15.1+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
++github.com/gobuffalo/packr v1.11.0 h1:lxysfHcxVCWGNMHzKABP7ZEL3A7iIVYfkev/D7AR0aM=
++github.com/gobuffalo/packr v1.11.0/go.mod h1:rYwMLC6NXbAbkKb+9j3NTKbxSswkKLlelZYccr4HYVw=
++github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
++github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
++github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
++github.com/gogits/go-gogs-client v0.0.0-20190616193657-5a05380e4bc2 h1:BbwX8wsMRDZRdNYxAna+4ls3wvMKJyn4PT6Zk1CPxP4=
++github.com/gogits/go-gogs-client v0.0.0-20190616193657-5a05380e4bc2/go.mod h1:cY2AIrMgHm6oOHmR7jY+9TtjzSjQ3iG7tURJG3Y6XH0=
++github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
++github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
++github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
++github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
++github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
++github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 h1:LbsanbbD6LieFkXbj9YNNBupiGHJgFeLpO0j0Fza1h8=
++github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
++github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
++github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
++github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
++github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
++github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
++github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
++github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho=
++github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8=
++github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk=
++github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
++github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
++github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
++github.com/google/cadvisor v0.34.0/go.mod h1:1nql6U13uTHaLYB8rLS5x9IJc2qT6Xd/Tr1sTX6NE48=
++github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg=
++github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
++github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
++github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
++github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
++github.com/google/go-jsonnet v0.10.0 h1:NzmG/5DRTYDjNnsL/OmX6wT+ByeKbSoRoV6VxOy+QdM=
++github.com/google/go-jsonnet v0.10.0/go.mod h1:gVu3UVSfOt5fRFq+dh9duBqXa5905QY8S1QvMNcEIVs=
++github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
++github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
++github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
++github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
++github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
++github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
++github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf h1:7+FW5aGwISbqUtkfmIpZJGRgNFg2ioYPvFaUxdqpDsg=
++github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf/go.mod h1:RpwtwJQFrIEPstU94h88MWPXP2ektJZ8cZ0YntAmXiE=
++github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
++github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
++github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
++github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
++github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
++github.com/googleapis/gnostic v0.1.0 h1:rVsPeBmXbYv4If/cumu1AzZPwV58q433hvONV1UEZoI=
++github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
++github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
++github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
++github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
++github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
++github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
++github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
++github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
++github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA=
++github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
++github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79 h1:lR9ssWAqp9qL0bALxqEEkuudiP1eweOdv9jsRK3e7lE=
++github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
++github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
++github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
++github.com/grpc-ecosystem/grpc-gateway v1.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
++github.com/grpc-ecosystem/grpc-gateway v1.3.1 h1:k2neygAEBYavP90THffKBVlkASdxu4XiI8cAWuL3MG0=
++github.com/grpc-ecosystem/grpc-gateway v1.3.1/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
++github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
++github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
++github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
++github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
++github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
++github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
++github.com/heketi/heketi v9.0.0+incompatible/go.mod h1:bB9ly3RchcQqsQ9CpyaQwvva7RS5ytVoSoholZQON6o=
++github.com/heketi/rest v0.0.0-20180404230133-aa6a65207413/go.mod h1:BeS3M108VzVlmAue3lv2WcGuPAX94/KN63MUURzbYSI=
++github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6/go.mod h1:xGMAM8JLi7UkZt1i4FQeQy0R2T8GLUwQhOP5M1gBhy4=
++github.com/heketi/utils v0.0.0-20170317161834-435bc5bdfa64/go.mod h1:RYlF4ghFZPPmk2TC5REt5OFwvfb6lzxFWrTWB+qs28s=
++github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
++github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
++github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q=
++github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
++github.com/improbable-eng/grpc-web v0.0.0-20181111100011-16092bd1d58a h1:RweVA0vnEyStwtAelyGmnU8ENDnwd1Q7pQr7U3J/rXo=
++github.com/improbable-eng/grpc-web v0.0.0-20181111100011-16092bd1d58a/go.mod h1:6hRR09jOEG81ADP5wCQju1z71g6OL4eEvELdran/3cs=
++github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
++github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
++github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
++github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
++github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
++github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod h1:wK6yTYYcgjHE1Z1QtXACPDjcFJyBskHEdagmnq3vsP8=
++github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
++github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=
++github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
++github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
++github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
++github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo=
++github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
++github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
++github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
++github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 h1:uC1QfSlInpQF+M0ao65imhwqKnz3Q2z/d8PWZRMQvDM=
++github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
++github.com/karrick/godirwalk v1.7.5/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34=
++github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
++github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
++github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e h1:RgQk53JHp/Cjunrr1WlsXSZpqXn+uREuHvUVcK82CV8=
++github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
++github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
++github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
++github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
++github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
++github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
++github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
++github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
++github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
++github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
++github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
++github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
++github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
++github.com/libopenstorage/openstorage v1.0.0/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc=
++github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
++github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
++github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=
++github.com/lpabon/godbc v0.1.1/go.mod h1:Jo9QV0cf3U6jZABgiJ2skINAXb9j8m51r07g4KI92ZA=
++github.com/lucas-clemente/aes12 v0.0.0-20171027163421-cd47fb39b79f/go.mod h1:JpH9J1c9oX6otFSgdUHwUBUizmKlrMjxWnIAjff4m04=
++github.com/lucas-clemente/quic-clients v0.1.0/go.mod h1:y5xVIEoObKqULIKivu+gD/LU90pL73bTdtQjPBvtCBk=
++github.com/lucas-clemente/quic-go v0.10.2/go.mod h1:hvaRS9IHjFLMq76puFJeWNfmn+H70QZ/CXoxqw9bzao=
++github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced/go.mod h1:NCcRLrOTZbzhZvixZLlERbJtDtYsmMw8Jc4vS8Z0g58=
++github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
++github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
++github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
++github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
++github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
++github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
++github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e h1:hB2xlXdHp/pmPZq0y3QnmWAArdw9PqbmotexnWx/FU8=
++github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
++github.com/malexdev/utfutil v0.0.0-20180510171754-00c8d4a8e7a8 h1:A6SLdFpRzUUF5v9F/7T1fu3DERmOCgTwwP6x54eyFfU=
++github.com/malexdev/utfutil v0.0.0-20180510171754-00c8d4a8e7a8/go.mod h1:UtpLyb/EupVKXF/N0b4NRe1DNg+QYJsnsHQ038romhM=
++github.com/marten-seemann/qtls v0.2.3/go.mod h1:xzjG7avBwGGbdZ8dTGxlBnLArsVKLvwmjgmPuiQEcYk=
++github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
++github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
++github.com/mattn/go-isatty v0.0.3 h1:ns/ykhmWi7G9O+8a448SecJU3nSMBXJfqQkl0upE1jI=
++github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
++github.com/mattn/go-shellwords v1.0.5/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
++github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
++github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
++github.com/mesos/mesos-go v0.0.9/go.mod h1:kPYCMQ9gsOXVAle1OsoY4I1+9kPu8GHkf88aV59fDr4=
++github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2/go.mod h1:g4cOPxcjV0oFq3qwpjSA30LReKD8AoIfwAY9VvG35NY=
++github.com/miekg/dns v1.1.3/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
++github.com/miekg/dns v1.1.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
++github.com/mindprince/gonvml v0.0.0-20171110221305-fee913ce8fb2/go.mod h1:2eu9pRWp8mo84xCg6KswZ+USQHjwgRhNp06sozOdsTY=
++github.com/mistifyio/go-zfs v2.1.1+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
++github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
++github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
++github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
++github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4=
++github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
++github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
++github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
++github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
++github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
++github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
++github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
++github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
++github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
++github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
++github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
++github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
++github.com/mrunalp/fileutils v0.0.0-20160930181131-4ee1cc9a8058/go.mod h1:x8F1gnqOkIEiO4rqoeEEEqQbo7HjGMTvyoq3gej4iT0=
++github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
++github.com/mvdan/xurls v1.1.0/go.mod h1:tQlNn3BED8bE/15hnSL2HLkDeLWpNPAwtw7wkEq44oU=
++github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
++github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
++github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
++github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0=
++github.com/naoina/toml v0.1.1/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E=
++github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
++github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
++github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w=
++github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
++github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
++github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
++github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
++github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
++github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
++github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
++github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
++github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
++github.com/opencontainers/runtime-spec v1.0.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
++github.com/opencontainers/selinux v1.2.2/go.mod h1:+BLncwf63G4dgOzykXAxcmnFlUaOlkDdmw/CqsW6pjs=
++github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
++github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
++github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
++github.com/pelletier/go-buffruneio v0.2.0 h1:U4t4R6YkofJ5xHm3dJzuRpPZ0mr5MMCoAWooScCR7aA=
++github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo=
++github.com/pelletier/go-toml v1.0.1/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
++github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
++github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
++github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
++github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
++github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
++github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
++github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
++github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
++github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
++github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
++github.com/pquerna/cachecontrol v0.0.0-20180306154005-525d0eb5f91d h1:7gXyC293Lsm2YWgQ+0uaAFFFDO82ruiQSwc3ua+Vtlc=
++github.com/pquerna/cachecontrol v0.0.0-20180306154005-525d0eb5f91d/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
++github.com/pquerna/ffjson v0.0.0-20180717144149-af8b230fcd20/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M=
++github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740=
++github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
++github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
++github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
++github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8=
++github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
++github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE=
++github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
++github.com/quobyte/api v0.1.2/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI=
++github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
++github.com/robfig/cron v1.1.0 h1:jk4/Hud3TTdcrJgUOBgsqrZBarcxl6ADIjSC2iniwLY=
++github.com/robfig/cron v1.1.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
++github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
++github.com/rs/cors v1.6.0 h1:G9tHG9lebljV9mfp9SNPDL36nCDxmo3zTlAf1YgvzmI=
++github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
++github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto=
++github.com/russross/blackfriday v0.0.0-20170610170232-067529f716f4/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
++github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
++github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
++github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
++github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
++github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
++github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
++github.com/sirupsen/logrus v1.0.5/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
++github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
++github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
++github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c h1:fyKiXKO1/I/B6Y2U8T7WdQGWzwehOuGIrljPtt7YTTI=
++github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
++github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
++github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
++github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
++github.com/soheilhy/cmux v0.1.4 h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E=
++github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
++github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
++github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
++github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
++github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
++github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
++github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
++github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
++github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
++github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
++github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
++github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
++github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
++github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
++github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4=
++github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI=
++github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc/go.mod h1:ZrLn+e0ZuF3Y65PNF6dIwbJPZqfmtCXxFm9ckv0agOY=
++github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
++github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
++github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
++github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
++github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
++github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
++github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
++github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
++github.com/syndtr/gocapability v0.0.0-20160928074757-e7cb7fa329f4/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
++github.com/thecodeteam/goscaleio v0.1.0/go.mod h1:68sdkZAsK8bvEwBlbQnlLS+xU+hvLYM/iQ8KXej1AwM=
++github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
++github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
++github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
++github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk=
++github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI=
++github.com/vmihailenco/msgpack v3.3.1+incompatible h1:ibe+d1lqocBmxbJ+gwcDO8LpAHFr3PGDYovoURuTVGk=
++github.com/vmihailenco/msgpack v3.3.1+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
++github.com/vmware/govmomi v0.20.1/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU=
++github.com/xanzy/ssh-agent v0.2.0 h1:Adglfbi5p9Z0BmK2oKU9nTG+zKfniSfnaMYB+ULd+Ro=
++github.com/xanzy/ssh-agent v0.2.0/go.mod h1:0NyE30eGUDliuLEHJgYte/zncp2zdTStcOnWhgSqHD8=
++github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
++github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8=
++github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
++github.com/yudai/gojsondiff v0.0.0-20180504020246-0525c875b75c h1:/8Xb/f8s2/ZZpzMzBkFwW2Jvj7Pglk+AW8m8FFqOoIQ=
++github.com/yudai/gojsondiff v0.0.0-20180504020246-0525c875b75c/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
++github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3IfnEUduWvb9is428/nNb5L3U01M=
++github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=
++github.com/yudai/pp v2.0.1+incompatible h1:Q4//iY4pNF6yPLZIigmvcl7k/bPgrcTPIFIcmawg5bI=
++github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc=
++github.com/yuin/gopher-lua v0.0.0-20190115140932-732aa6820ec4 h1:1yOVVSFiradDwXpgdkDjlGOcGJqcohH/W49Zn8Ywgco=
++github.com/yuin/gopher-lua v0.0.0-20190115140932-732aa6820ec4/go.mod h1:fFiAh+CowNFr0NK5VASokuwKwkbacRmHsVA7Yb1Tqac=
++go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
++go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
++go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
++go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
++go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
++golang.org/x/crypto v0.0.0-20180426230345-b49d69b5da94/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
++golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
++golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
++golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
++golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
++golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
++golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
++golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
++golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
++golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
++golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 h1:7KByu05hhLed2MO29w7p1XfZvZ13m8mub3shuVftRs0=
++golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
++golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
++golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
++golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
++golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
++golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
++golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
++golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
++golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
++golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
++golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
++golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
++golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
++golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
++golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
++golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
++golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
++golang.org/x/net v0.0.0-20181102091132-c10e9556a7bc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
++golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
++golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
++golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
++golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
++golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
++golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
++golang.org/x/net v0.0.0-20190328230028-74de082e2cca/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
++golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
++golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
++golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
++golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
++golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
++golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 h1:rjwSpXsdiK0dV8/Naq3kAw9ymfAeJIyd0upUIElB+lI=
++golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
++golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
++golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
++golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
++golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
++golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
++golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
++golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
++golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
++golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
++golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
++golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
++golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
++golang.org/x/sys v0.0.0-20180903190138-2b024373dcd9/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
++golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
++golang.org/x/sys v0.0.0-20181004145325-8469e314837c/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
++golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
++golang.org/x/sys v0.0.0-20190124100055-b90733256f2e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
++golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
++golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
++golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
++golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
++golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
++golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
++golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
++golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
++golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
++golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg=
++golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
++golang.org/x/tools v0.0.0-20170824195420-5d2fd3ccab98/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
++golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
++golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
++golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
++golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
++golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
++golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
++golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
++golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
++golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
++golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
++golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
++golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
++golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
++golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
++golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
++golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
++gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
++gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
++gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ=
++google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
++google.golang.org/api v0.6.1-0.20190607001116-5213b8090861/go.mod h1:btoxGiFvQNVUZQ8W08zLtrVS08CNpINPEfxXxgJL1Q4=
++google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
++google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
++google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c=
++google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
++google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
++google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
++google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
++google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 h1:nfPFGzJkUDX6uBmpN/pSw7MbOAWegH5QDQuoXFHedLg=
++google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
++google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
++google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
++google.golang.org/grpc v1.23.0 h1:AzbTB6ux+okLTzP8Ru1Xs41C303zdcfEht7MQnYJt5A=
++google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
++gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
++gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
++gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
++gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
++gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
++gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
++gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
++gopkg.in/gcfg.v1 v1.2.0/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
++gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
++gopkg.in/go-playground/webhooks.v5 v5.11.0 h1:V3vej+ZXrVvO2EmBTKlhClEbpTqXH44K5OyLUMOkHMg=
++gopkg.in/go-playground/webhooks.v5 v5.11.0/go.mod h1:LZbya/qLVdbqDR1aKrGuWV6qbia2zCYSR5dpom2SInQ=
++gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
++gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
++gopkg.in/mcuadros/go-syslog.v2 v2.2.1/go.mod h1:l5LPIyOOyIdQquNg+oU6Z3524YwrcqEm0aKH+5zpt2U=
++gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
++gopkg.in/square/go-jose.v2 v2.2.2 h1:orlkJ3myw8CN1nVQHBFfloD+L3egixIa4FvUP6RosSA=
++gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
++gopkg.in/src-d/go-billy.v4 v4.2.1 h1:omN5CrMrMcQ+4I8bJ0wEhOBPanIRWzFC953IiXKdYzo=
++gopkg.in/src-d/go-billy.v4 v4.2.1/go.mod h1:tm33zBoOwxjYHZIE+OV8bxTWFMJLrconzFMd38aARFk=
++gopkg.in/src-d/go-git-fixtures.v3 v3.1.1 h1:XWW/s5W18RaJpmo1l0IYGqXKuJITWRFuA45iOf1dKJs=
++gopkg.in/src-d/go-git-fixtures.v3 v3.1.1/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g=
++gopkg.in/src-d/go-git.v4 v4.9.1 h1:0oKHJZY8tM7B71378cfTg2c5jmWyNlXvestTT6WfY+4=
++gopkg.in/src-d/go-git.v4 v4.9.1/go.mod h1:Vtut8izDyrM8BUVQnzJ+YvmNcem2J89EmfZYCkLokZk=
++gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
++gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
++gopkg.in/warnings.v0 v0.1.1/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
++gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
++gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
++gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
++gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gotest.tools v2.1.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
++gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
++gotest.tools/gotestsum v0.3.5/go.mod h1:Mnf3e5FUzXbkCfynWBGOwLssY7gTQgCHObK9tMpAriY=
++honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
++honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
++honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
++honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
++honnef.co/go/tools v0.0.1-2019.2.2/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
++k8s.io/api v0.0.0-20200131112707-d64dbec685a4 h1:7kA/ATNKWB1TVM0pwxzl/JONybbBVROCxqndoCd57fU=
++k8s.io/api v0.0.0-20200131112707-d64dbec685a4/go.mod h1:SGkmWEIoDg63In+t6yMJLEXQSkK5XxTNDcVydoy58dc=
++k8s.io/apiextensions-apiserver v0.0.0-20200208193839-84fe3c0be50e h1:L/XqOouONrybm+3jyUJZPo5JIMARb5qFNfmmUqy81Eg=
++k8s.io/apiextensions-apiserver v0.0.0-20200208193839-84fe3c0be50e/go.mod h1:YzEcimsSKeVDDQnLTI9Qf8uws94WpMl4qut8Rbx4dVk=
++k8s.io/apimachinery v0.16.7-beta.0.0.20200131112342-0c9ec93240c9 h1:pusQlPC9d40F13jjdYyJDFDwnUjCTDN5P/y5WteLVkA=
++k8s.io/apimachinery v0.16.7-beta.0.0.20200131112342-0c9ec93240c9/go.mod h1:Xk2vD2TRRpuWYLQNM6lT9R7DSFZUYG03SarNkbGrnKE=
++k8s.io/apiserver v0.0.0-20200208192130-2d005a048922 h1:kgU/Yr5/GsGK3GAaFgmSp+y0IMLu+FoZK+wnKlgzIrQ=
++k8s.io/apiserver v0.0.0-20200208192130-2d005a048922/go.mod h1:kcWyL8/bV2c1b/FeWrxbO08zraTaYuhR7leZ4l9iOmo=
++k8s.io/cli-runtime v0.0.0-20200131120220-9674fbb91442 h1:gHF/ZIm6hTWAuN/rKdH1IO/iJfKPjn0d1kdeIMbPiDg=
++k8s.io/cli-runtime v0.0.0-20200131120220-9674fbb91442/go.mod h1:sL3otDuOz8AlMrzsrBeB/ektmi6qYAE4a9Gid/pxtSo=
++k8s.io/client-go v0.0.0-20191016111102-bec269661e48 h1:C2XVy2z0dV94q9hSSoCuTPp1KOG7IegvbdXuz9VGxoU=
++k8s.io/client-go v0.0.0-20191016111102-bec269661e48/go.mod h1:hrwktSwYGI4JK+TJA3dMaFyyvHVi/aLarVHpbs8bgCU=
++k8s.io/cloud-provider v0.0.0-20200131203752-f498d522efeb/go.mod h1:hb9XI7OCOFjqueeUaUYHbEuGG/nSq0UZtydmOu83p6M=
++k8s.io/cluster-bootstrap v0.0.0-20200131121422-fc6110069b18/go.mod h1:2U3dLDmef+EIuACENgQ1f8jQV//Z+aX/bp9DsglDXK0=
++k8s.io/code-generator v0.16.7-beta.0.0.20200131112027-a3045e5e55c0/go.mod h1:wFdrXdVi/UC+xIfLi+4l9elsTT/uEF61IfcN2wOLULQ=
++k8s.io/component-base v0.0.0-20200131113804-409d4deb41dd h1:W0AuOSSgValfdhcR68oayHewqFJh/nMA+JDPQbXGrkg=
++k8s.io/component-base v0.0.0-20200131113804-409d4deb41dd/go.mod h1:55xG5ozAlA2bbjfmFYC2LPf4cQqp4nOJT5e4+cXUDnY=
++k8s.io/cri-api v0.16.8-beta.0/go.mod h1:W6aMMPN5fmxcRGaHnb6BEfoTeS82OsJcsUJyKf+EWYc=
++k8s.io/csi-translation-lib v0.0.0-20200131121824-f033562d74c3/go.mod h1:2NVc4Xw5CEBgQj3/GtHOKPs5M68nhbszaFFuoB+xGUE=
++k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
++k8s.io/heapster v1.2.0-beta.1/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM=
++k8s.io/klog v0.4.0 h1:lCJCxf/LIowc2IGS9TPjWDyXY4nOmdGdfcwwDQCOURQ=
++k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
++k8s.io/kube-aggregator v0.0.0-20200208192621-0eeb50407007 h1:PqWgdqcu7/ZAno0sqGoqo3eC/qhwnz+XTotZfG+84ic=
++k8s.io/kube-aggregator v0.0.0-20200208192621-0eeb50407007/go.mod h1:u6psj4FzpmwlJuQKReXypLOIhIF2UxzZRBThWtnjIDU=
++k8s.io/kube-controller-manager v0.0.0-20200131121224-13b3f231e47d/go.mod h1:rlvqwtZiupLrqd54U19Th2a0sMf0PNbGA1J3zPTwFAc=
++k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf h1:EYm5AW/UUDbnmnI+gK0TJDVK9qPLhM+sRHYanNKw0EQ=
++k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
++k8s.io/kube-proxy v0.0.0-20200131120626-5b8ba5e54e1f/go.mod h1:3/a8cJm4V50vBnkRwRhpgdIdsTH+4cj/kV66oxybGxc=
++k8s.io/kube-scheduler v0.0.0-20200131121024-5f0ba0866863/go.mod h1:1xme9q7fNwDPtgIELmyOFGQErlOzFlQ1XHjTPUz1GYc=
++k8s.io/kubectl v0.0.0-20200131122652-b28c9fbca10f h1:7764TWFJ+UYY6TX1Vq3jCo/3BkORLtywarY8SEdQh18=
++k8s.io/kubectl v0.0.0-20200131122652-b28c9fbca10f/go.mod h1:d78MZ7MR2Q5xMwSrGvbJARH13CsOo5mSoDZWfjIe1TQ=
++k8s.io/kubelet v0.0.0-20200131120825-905bd8eea4c4/go.mod h1:VkwV80jJy9GciSRBPFduby5qJxI5v5lV3D6WMMCveek=
++k8s.io/kubernetes v0.0.0-20191207011953-bfafae8f1c2f h1:bGmDtZ96ysKXeBFw0+9cw9twoCQjrPRkkpSQqhxEXVs=
++k8s.io/kubernetes v0.0.0-20191207011953-bfafae8f1c2f/go.mod h1:OdJXH1Q9L+NDVj158Zo8f6R3NSaOx1ewLUcaJv8hSRE=
++k8s.io/legacy-cloud-providers v0.0.0-20200208200602-3a1c7effd2b3/go.mod h1:Egd+aHCesdnzDDtUaaWnAhnyt5/dgQIfM4UL5z2WJxg=
++k8s.io/metrics v0.0.0-20200131120008-5c623d74062d/go.mod h1:18pR44uxuhPU05LZpHhJiPPzQvGoFmCf2UlTp2EhSM8=
++k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3/go.mod h1:+G1xBfZDfVFsm1Tj/HNCvg4QqWx8rJ2Fxpqr1rqp/gQ=
++k8s.io/sample-apiserver v0.0.0-20200208192953-f8dc80bbc173/go.mod h1:Bnw1dM0HuYH49aVse0I8cV6KeyOFPBaWxnhsU7uR2UA=
++k8s.io/utils v0.0.0-20190801114015-581e00157fb1 h1:+ySTxfHnfzZb9ys375PXNlLhkJPLKgHajBU0N62BDvE=
++k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
++layeh.com/gopher-json v0.0.0-20190114024228-97fed8db8427 h1:RZkKxMR3jbQxdCEcglq3j7wY3PRJIopAwBlx1RE71X0=
++layeh.com/gopher-json v0.0.0-20190114024228-97fed8db8427/go.mod h1:ivKkcY8Zxw5ba0jldhZCYYQfGdb2K6u9tbYK1AwMIBc=
++modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
++modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
++modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
++modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
++modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
++sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
++sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
++sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
++sigs.k8s.io/structured-merge-diff v1.0.2/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA=
++sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
++sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
++vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI=
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 048fcae738db..87f37d33d86c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18163,6 +18163,8 @@ in
 
   argo = callPackage ../applications/networking/cluster/argo { };
 
+  argocd = callPackage ../applications/networking/cluster/argocd { };
+
   ario = callPackage ../applications/audio/ario { };
 
   arion = callPackage ../applications/virtualization/arion { };

From af5c8e7a2aad2ef9f940270d25141ddd498ce516 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Thu, 13 Feb 2020 21:03:35 +0100
Subject: [PATCH 0555/4636] hunspellDicts: add Czech and Slovak dictionary

---
 .../libraries/hunspell/dictionaries.nix       | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix
index 386a18f641fe..9ec79f514437 100644
--- a/pkgs/development/libraries/hunspell/dictionaries.nix
+++ b/pkgs/development/libraries/hunspell/dictionaries.nix
@@ -732,4 +732,26 @@ in rec {
     shortDescription = "Russian (Russian)";
     license = with stdenv.lib.licenses; [ mpl20 lgpl3 ];
   };
+
+  /* CZECH */
+
+  cs_CZ = cs-cz;
+  cs-cz = mkDictFromLibreOffice {
+    shortName = "cs-cz";
+    dictFileName = "cs_CZ";
+    shortDescription = "Czech (Czechia)";
+    readmeFile = "README_cs.txt";
+    license = with stdenv.lib.licenses; [ gpl2 ];
+  };
+
+  /* SLOVAK */
+
+  sk_SK = sk-sk;
+  sk-sk = mkDictFromLibreOffice {
+    shortName = "sk-sk";
+    dictFileName = "sk_SK";
+    shortDescription = "Slovak (Slovakia)";
+    readmeFile = "README_sk.txt";
+    license = with stdenv.lib.licenses; [ gpl2 lgpl21 mpl11 ];
+  };
 }

From 44fd320c0f083ea267ab3e69156f2e82c3912e60 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Thu, 13 Feb 2020 12:00:00 +0000
Subject: [PATCH 0556/4636] nixos/iodine: protect passwordFiles with toString

It should prevent copying the files to a store path
---
 nixos/modules/services/networking/iodine.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/iodine.nix b/nixos/modules/services/networking/iodine.nix
index 63a6a4c0fb9f..46051d7044b5 100644
--- a/nixos/modules/services/networking/iodine.nix
+++ b/nixos/modules/services/networking/iodine.nix
@@ -132,7 +132,7 @@ in
             description = "iodine client - ${name}";
             after = [ "network.target" ];
             wantedBy = [ "multi-user.target" ];
-            script = "exec ${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${optionalString (cfg.passwordFile != "") "< \"${cfg.passwordFile}\""} ${cfg.relay} ${cfg.server}";
+            script = "exec ${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${optionalString (cfg.passwordFile != "") "< \"${builtins.toString cfg.passwordFile}\""} ${cfg.relay} ${cfg.server}";
             serviceConfig = {
               RestartSec = "30s";
               Restart = "always";
@@ -166,7 +166,7 @@ in
             description = "iodine, ip over dns server daemon";
             after = [ "network.target" ];
             wantedBy = [ "multi-user.target" ];
-            script = "exec ${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${optionalString (cfg.server.passwordFile != "") "< \"${cfg.server.passwordFile}\""} ${cfg.server.ip} ${cfg.server.domain}";
+            script = "exec ${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${optionalString (cfg.server.passwordFile != "") "< \"${builtins.toString cfg.server.passwordFile}\""} ${cfg.server.ip} ${cfg.server.domain}";
             serviceConfig = {
               # Filesystem access
               ProtectSystem = "strict";

From c9ca90af519b06161e89974ed4024714b7b776cd Mon Sep 17 00:00:00 2001
From: Georg Haas <hax404foogit@hax404.de>
Date: Thu, 13 Feb 2020 21:47:08 +0100
Subject: [PATCH 0557/4636] bino3d: use mkDerivation from qt

adopted solution from commit 7e0dd3833d51294224ac5f5d8fd375e7935f2d0e
---
 pkgs/applications/video/bino3d/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/bino3d/default.nix b/pkgs/applications/video/bino3d/default.nix
index 64b9613363c3..c3f5d7d796d4 100644
--- a/pkgs/applications/video/bino3d/default.nix
+++ b/pkgs/applications/video/bino3d/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, fetchurl, pkgconfig, ffmpeg, glew, libass, openal, qtbase }:
+{ mkDerivation, lib, fetchurl, pkgconfig, ffmpeg, glew, libass, openal, qtbase }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "bino";
   version = "1.6.7";
 

From 48254f391cb4be3b2d836feee581dc40898bb92a Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Thu, 13 Feb 2020 12:48:19 -0800
Subject: [PATCH 0558/4636] helm: 3.0.3 -> 3.1.0

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

diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 6ceee567592e..92ce038afa16 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "helm";
-  version = "3.0.3";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "helm";
     repo = "helm";
     rev = "v${version}";
-    sha256 = "1gdrm3zz7524c8v3g128drfzdyalxlipbzxmwhalm7px4p5z4n0j";
+    sha256 = "0byc3si0ysjzbgb91vlbvbmawy8wprs1ajk5xzsb66c5hlhq1il9";
   };
-  modSha256 = "1kmm6yb03g9lsz380rvf32j4icp3rcq7ixxcgsxfgpwqvq08zkn6";
+  modSha256 = "0618zzi4x37ahsrazsr82anghhfva8yaryzb3p5d737p3ixbiyv8";
 
   subPackages = [ "cmd/helm" ];
   buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ];

From dba13a032ceb3b9f2c95775784ff001f578054b1 Mon Sep 17 00:00:00 2001
From: Alex Whitt <alex.joseph.whitt@gmail.com>
Date: Thu, 13 Feb 2020 15:57:50 -0500
Subject: [PATCH 0559/4636] Octoprint-PrintTimeGenius: 2.0.2 -> 2.2.1

---
 pkgs/applications/misc/octoprint/plugins.nix    |  8 ++++++--
 .../octoprint/printtimegenius-logging.patch     | 17 +++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/misc/octoprint/printtimegenius-logging.patch

diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index ce800e8f18be..cd1dfbe1396a 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -168,13 +168,13 @@ let
 
     printtimegenius = buildPlugin rec {
       pname = "PrintTimeGenius";
-      version = "2.0.2";
+      version = "2.2.1";
 
       src = fetchFromGitHub {
         owner = "eyal0";
         repo = "OctoPrint-${pname}";
         rev = version;
-        sha256 = "1w4jm42434x87sbih45brkb9krik851vxkz153w3w5c8p74kgg6f";
+        sha256 = "1dr93vbpxgxw3b1q4rwam8f4dmiwr5vnfr9796g6jx8xkpfzzy1h";
       };
 
       preConfigure = ''
@@ -183,6 +183,10 @@ let
         sed 's@"{}.{}".format(binary_base_name, machine)@"${marlin-calc}/bin/marlin-calc"@' -i */analyzers/analyze_progress.py
       '';
 
+      patches = [
+        ./printtimegenius-logging.patch
+      ];
+
       meta = with stdenv.lib; {
         description = "Better print time estimation for OctoPrint";
         homepage = "https://github.com/eyal0/OctoPrint-PrintTimeGenius";
diff --git a/pkgs/applications/misc/octoprint/printtimegenius-logging.patch b/pkgs/applications/misc/octoprint/printtimegenius-logging.patch
new file mode 100644
index 000000000000..66c2e83d62ca
--- /dev/null
+++ b/pkgs/applications/misc/octoprint/printtimegenius-logging.patch
@@ -0,0 +1,17 @@
+diff --git a/setup.py b/setup.py
+index 6a6610e..cc45902 100644
+--- a/setup.py
++++ b/setup.py
+@@ -35,9 +35,9 @@ plugin_license = "AGPLv3"
+ # Any additional requirements besides OctoPrint should be listed here
+ # For now, require the working release, which is only 1.3.9rc1.
+ plugin_requires = ["OctoPrint>=1.3.9rc1", "psutil", "sarge"]
+-from sys import version_info
+-if version_info[0] < 3:
+-    plugin_requires.append("logging")
++#from sys import version_info
++#if version_info[0] < 3:
++#    plugin_requires.append("logging")
+ 
+ ### --------------------------------------------------------------------------------------------------------------------
+ ### More advanced options that you usually shouldn't have to touch follow after this point

From 5e0ae51052a80d7a0112308e9f1ed35cba76fe27 Mon Sep 17 00:00:00 2001
From: Alex Whitt <alex.joseph.whitt@gmail.com>
Date: Thu, 13 Feb 2020 15:58:17 -0500
Subject: [PATCH 0560/4636] Octoprint-ABL_Expert: init at 2019-12-21

---
 pkgs/applications/misc/octoprint/plugins.nix | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index cd1dfbe1396a..41cf6c00fdd9 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, octoprint, python2Packages, marlin-calc }:
+{ stdenv, fetchgit, fetchFromGitHub, octoprint, python2Packages, marlin-calc }:
 
 let
   buildPlugin = args: python2Packages.buildPythonPackage (args // {
@@ -195,6 +195,24 @@ let
       };
     };
 
+    abl-expert = buildPlugin rec {
+      pname = "ABL_Expert";
+      version = "2019-12-21";
+
+      src = fetchgit {
+        url = "https://framagit.org/razer/Octoprint_ABL_Expert/";
+        rev = "f11fbe05088ad618bfd9d064ac3881faec223f33";
+        sha256 = "026r4prkyvwzxag5pv36455q7s3gaig37nmr2nbvhwq3d2lbi5s4";
+      };
+
+      meta = with stdenv.lib; {
+        description = "Marlin auto bed leveling control, mesh correction, and z probe handling";
+        homepage = "https://framagit.org/razer/Octoprint_ABL_Expert/";
+        license = licenses.agpl3;
+        maintainers = with maintainers; [ WhittlesJr ];
+      };
+    };
+
   };
 
 in self

From 37e6afd799e406f263653946ec21cb8462007271 Mon Sep 17 00:00:00 2001
From: Alex Whitt <alex.joseph.whitt@gmail.com>
Date: Thu, 13 Feb 2020 15:58:33 -0500
Subject: [PATCH 0561/4636] Octoprint-GcodeEditor: init at 0.2.6

---
 pkgs/applications/misc/octoprint/plugins.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index 41cf6c00fdd9..2d70fe39026e 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -213,6 +213,24 @@ let
       };
     };
 
+    gcodeeditor = buildPlugin rec {
+      pname = "GcodeEditor";
+      version = "0.2.6";
+
+      src = fetchFromGitHub {
+        owner = "ieatacid";
+        repo = "OctoPrint-${pname}";
+        rev = version;
+        sha256 = "0c6p78r3vd6ys3kld308pyln09zjbr9yif1ljvcx6wlml2i5l1vh";
+      };
+
+      meta = with stdenv.lib; {
+        description = "Edit gcode on OctoPrint";
+        homepage = "https://github.com/Sebclem/OctoPrint-SimpleEmergencyStop";
+        license = licenses.agpl3;
+        maintainers = with maintainers; [ WhittlesJr ];
+      };
+    };
   };
 
 in self

From 61a637aa6467ae7e128b76de13c247b6eb806c19 Mon Sep 17 00:00:00 2001
From: Alex Whitt <alex.joseph.whitt@gmail.com>
Date: Thu, 13 Feb 2020 15:58:50 -0500
Subject: [PATCH 0562/4636] Octoprint-SimpleEmergencyStop: init at 0.2.5

---
 pkgs/applications/misc/octoprint/plugins.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index 2d70fe39026e..10c4f2f84480 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -231,6 +231,25 @@ let
         maintainers = with maintainers; [ WhittlesJr ];
       };
     };
+
+    simpleemergencystop = buildPlugin rec {
+      pname = "SimpleEmergencyStop";
+      version = "0.2.5";
+
+      src = fetchFromGitHub {
+        owner = "Sebclem";
+        repo = "OctoPrint-${pname}";
+        rev = version;
+        sha256 = "10wadv09wv2h96igvq3byw9hz1si82n3c7v5y0ii3j7hm2d06y8p";
+      };
+
+      meta = with stdenv.lib; {
+        description = "A simple plugin that add an emergency stop buton on NavBar of OctoPrint";
+        homepage = "https://github.com/ieatacid/OctoPrint-GcodeEditor";
+        license = licenses.agpl3;
+        maintainers = with maintainers; [ WhittlesJr ];
+      };
+    };
   };
 
 in self

From 90ca2a49a0f1b8f32c4cc551a013ded95b057995 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Feb 2020 19:28:25 +0000
Subject: [PATCH 0563/4636] python27Packages.shodan: 1.21.2 -> 1.21.3

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

diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix
index 909c54788b2c..0c88dcd0fe20 100644
--- a/pkgs/development/python-modules/shodan/default.nix
+++ b/pkgs/development/python-modules/shodan/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "shodan";
-  version = "1.21.2";
+  version = "1.21.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1pbfmab3ixvaa845qp6ms2djcwp9c5vnlsr2bf9prmx5973khg7d";
+    sha256 = "1mbqdk3jdga4r08dg66j7kawmb40rs0y3nnwb9vh3c1safgqjmiz";
   };
 
   propagatedBuildInputs = [

From f96163891a4d09827ec5e7c31226a533c79a7e00 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 13 Feb 2020 16:04:39 -0500
Subject: [PATCH 0564/4636] refind: 0.11.4 -> 0.11.5

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

diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix
index cf0ad78d1d7e..bebbb4d978ce 100644
--- a/pkgs/tools/bootloaders/refind/default.nix
+++ b/pkgs/tools/bootloaders/refind/default.nix
@@ -14,12 +14,12 @@ in
 
 stdenv.mkDerivation rec {
   pname = "refind";
-  version = "0.11.4";
+  version = "0.11.5";
   srcName = "refind-src-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/refind/${version}/${srcName}.tar.gz";
-    sha256 = "1bjd0dl77bc5k6g3kc7s8m57vpbg2zscph9qh84xll9rc10g3fir";
+    sha256 = "0pphl37y1zfrcai821aab9k097yp669hn1j07cas1nppinafg78v";
   };
 
   patches = [

From 9648094ec736b8b116ca818567b33b40ca3c2abf Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 13 Feb 2020 16:04:48 -0500
Subject: [PATCH 0565/4636] refind: Add samueldr to maintainers

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

diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix
index bebbb4d978ce..81686a456d07 100644
--- a/pkgs/tools/bootloaders/refind/default.nix
+++ b/pkgs/tools/bootloaders/refind/default.nix
@@ -121,7 +121,7 @@ stdenv.mkDerivation rec {
       Linux kernels that provide EFI stub support.
     '';
     homepage = http://refind.sourceforge.net/;
-    maintainers = [ maintainers.AndersonTorres ];
+    maintainers = with maintainers; [ AndersonTorres samueldr ];
     platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
     license = licenses.gpl3Plus;
   };

From c30b4a746f9cbe7b48c65deb0b205ef86c937ab8 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 23 Jan 2020 01:46:29 +0100
Subject: [PATCH 0566/4636] mono: fix build w/glibc-2.30

---
 pkgs/development/compilers/mono/generic.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix
index 25956bc06e1e..85d64de6c233 100644
--- a/pkgs/development/compilers/mono/generic.nix
+++ b/pkgs/development/compilers/mono/generic.nix
@@ -23,8 +23,6 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [glib];
 
-  NIX_LDFLAGS = if stdenv.isDarwin then "" else "-lgcc_s" ;
-
   configureFlags = [
     "--x-includes=${libX11.dev}/include"
     "--x-libraries=${libX11.out}/lib"

From 088f8ee7fc21a99c58874bb87764c2dcf4983695 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Feb 2020 20:32:02 +0000
Subject: [PATCH 0567/4636] python27Packages.webassets: 0.12.1 -> 2.0

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

diff --git a/pkgs/development/python-modules/webassets/default.nix b/pkgs/development/python-modules/webassets/default.nix
index a8a4e474f538..4556eefed2dd 100644
--- a/pkgs/development/python-modules/webassets/default.nix
+++ b/pkgs/development/python-modules/webassets/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "webassets";
-  version = "0.12.1";
+  version = "2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1nrqkpb7z46h2b77xafxihqv3322cwqv6293ngaky4j3ff4cing7";
+    sha256 = "1kc1042jydgk54xpgcp0r1ib4gys91nhy285jzfcxj3pfqrk4w8n";
   };
 
   propagatedBuildInputs = [ pyyaml ];

From 0a87568b0380ba508babcf91c980179af433903a Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 13 Feb 2020 22:18:27 +0100
Subject: [PATCH 0568/4636] gitlab: 12.7.5 -> 12.7.6

---
 pkgs/applications/version-management/gitlab/data.json       | 6 +++---
 pkgs/applications/version-management/gitlab/gitaly/deps.nix | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 6e83e5d2566d..e7e73d4c48a0 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,9 +1,9 @@
 {
-  "version": "12.7.5",
-  "repo_hash": "0jlhaakpg6bycajbhm3100gs2ka9f6iv529dvj3y1k6gysd2dpvs",
+  "version": "12.7.6",
+  "repo_hash": "092c6n2jg8himmcc23gh3gvmx0y272kwk00cj1s2k4b92dlzvm18",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v12.7.5-ee",
+  "rev": "v12.7.6-ee",
   "passthru": {
     "GITALY_SERVER_VERSION": "1.83.0",
     "GITLAB_PAGES_VERSION": "1.12.0",
diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix
index 8853dded8f22..f710523103f6 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix
@@ -1319,8 +1319,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/ugorji/go";
-      rev = "v1.1.4";
-      sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w";
+      rev = "d75b2dcb6bc8";
+      sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps";
     };
   }
   {

From d4169851a53c230d88392f3fdc15eefd3612b074 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 13 Feb 2020 21:24:22 +0200
Subject: [PATCH 0569/4636] neovim-remote: add now needed setuptools as input

---
 pkgs/applications/editors/neovim/neovim-remote.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix
index aae37b5a2621..c77cfd9c2b6e 100644
--- a/pkgs/applications/editors/neovim/neovim-remote.nix
+++ b/pkgs/applications/editors/neovim/neovim-remote.nix
@@ -14,7 +14,11 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "0jlw0qksak4bdzddpsj74pm2f2bgpj3cwrlspdjjy0j9qzg0mpl9";
   };
 
-  propagatedBuildInputs = with pythonPackages; [ pynvim psutil ];
+  propagatedBuildInputs = with pythonPackages; [
+    pynvim
+    psutil
+    setuptools
+  ];
 
   meta = {
     description = "A tool that helps controlling nvim processes from a terminal";

From 36b808de5fb0fe43d2906e89b3b0d605cba547c0 Mon Sep 17 00:00:00 2001
From: Jacek Galowicz <jacek.galowicz@cyberus-technology.de>
Date: Thu, 13 Feb 2020 22:40:47 +0100
Subject: [PATCH 0570/4636] nixosTests.solr: Port to python

---
 nixos/tests/solr.nix | 50 +++++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/nixos/tests/solr.nix b/nixos/tests/solr.nix
index 23e1a960fb37..dc5770e16bc7 100644
--- a/nixos/tests/solr.nix
+++ b/nixos/tests/solr.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }:
+import ./make-test-python.nix ({ pkgs, ... }:
 
 {
   name = "solr";
@@ -21,28 +21,36 @@ import ./make-test.nix ({ pkgs, ... }:
     };
 
   testScript = ''
-    startAll;
+    start_all()
 
-    $machine->waitForUnit('solr.service');
-    $machine->waitForOpenPort('8983');
-    $machine->succeed('curl --fail http://localhost:8983/solr/');
+    machine.wait_for_unit("solr.service")
+    machine.wait_for_open_port(8983)
+    machine.succeed("curl --fail http://localhost:8983/solr/")
 
     # adapted from pkgs.solr/examples/films/README.txt
-    $machine->succeed('sudo -u solr solr create -c films');
-    $machine->succeed(q(curl http://localhost:8983/solr/films/schema -X POST -H 'Content-type:application/json' --data-binary '{
-      "add-field" : {
-        "name":"name",
-        "type":"text_general",
-        "multiValued":false,
-        "stored":true
-      },
-      "add-field" : {
-        "name":"initial_release_date",
-        "type":"pdate",
-        "stored":true
-      }
-    }')) =~ /"status":0/ or die;
-    $machine->succeed('sudo -u solr post -c films ${pkgs.solr}/example/films/films.json');
-    $machine->succeed('curl http://localhost:8983/solr/films/query?q=name:batman') =~ /"name":"Batman Begins"/ or die;
+    machine.succeed("sudo -u solr solr create -c films")
+    assert '"status":0' in machine.succeed(
+        """
+      curl http://localhost:8983/solr/films/schema -X POST -H 'Content-type:application/json' --data-binary '{
+        "add-field" : {
+          "name":"name",
+          "type":"text_general",
+          "multiValued":false,
+          "stored":true
+        },
+        "add-field" : {
+          "name":"initial_release_date",
+          "type":"pdate",
+          "stored":true
+        }
+      }'
+    """
+    )
+    machine.succeed(
+        "sudo -u solr post -c films ${pkgs.solr}/example/films/films.json"
+    )
+    assert '"name":"Batman Begins"' in machine.succeed(
+        "curl http://localhost:8983/solr/films/query?q=name:batman"
+    )
   '';
 })

From acef369bc3a2851c7fca184d0bb67c554227eb22 Mon Sep 17 00:00:00 2001
From: Jacek Galowicz <jacek.galowicz@cyberus-technology.de>
Date: Thu, 13 Feb 2020 23:01:45 +0100
Subject: [PATCH 0571/4636] nixosTests.plotinus: Port to Python

---
 nixos/tests/plotinus.nix | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/nixos/tests/plotinus.nix b/nixos/tests/plotinus.nix
index 609afe7b2145..39a4234dbf73 100644
--- a/nixos/tests/plotinus.nix
+++ b/nixos/tests/plotinus.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ pkgs, ... }: {
   name = "plotinus";
   meta = {
     maintainers = pkgs.plotinus.meta.maintainers;
@@ -12,16 +12,17 @@ import ./make-test.nix ({ pkgs, ... }: {
       environment.systemPackages = [ pkgs.gnome3.gnome-calculator pkgs.xdotool ];
     };
 
-  testScript =
-    ''
-      $machine->waitForX;
-      $machine->succeed("gnome-calculator &");
-      $machine->waitForWindow(qr/gnome-calculator/);
-      $machine->succeed("xdotool search --sync --onlyvisible --class gnome-calculator windowfocus --sync key ctrl+shift+p");
-      $machine->sleep(5); # wait for the popup
-      $machine->succeed("xdotool key --delay 100 p r e f e r e n c e s Return");
-      $machine->waitForWindow(qr/Preferences/);
-      $machine->screenshot("screen");
-    '';
-
+  testScript = ''
+    machine.wait_for_x()
+    machine.succeed("gnome-calculator &")
+    machine.wait_for_window("gnome-calculator")
+    machine.succeed(
+        "xdotool search --sync --onlyvisible --class gnome-calculator "
+        + "windowfocus --sync key --clearmodifiers --delay 1 'ctrl+shift+p'"
+    )
+    machine.sleep(5)  # wait for the popup
+    machine.succeed("xdotool key --delay 100 p r e f e r e n c e s Return")
+    machine.wait_for_window("Preferences")
+    machine.screenshot("screen")
+  '';
 })

From 1112bcc75ec37dbc247ac1ea3143d1612c696141 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Thu, 13 Feb 2020 14:23:23 -0500
Subject: [PATCH 0572/4636] c3d: unbreak via stdenv -> gcc8Stdenv

---
 pkgs/applications/graphics/c3d/default.nix | 2 ++
 pkgs/top-level/all-packages.nix            | 1 +
 2 files changed, 3 insertions(+)

diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix
index 4997bb03d6ac..55a5d49f7524 100644
--- a/pkgs/applications/graphics/c3d/default.nix
+++ b/pkgs/applications/graphics/c3d/default.nix
@@ -20,5 +20,7 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ bcdarwin ];
     platforms = platforms.unix;
     license = licenses.gpl2;
+    broken = stdenv.isAarch64;
+    # /build/git-3453f61/itkextras/OneDimensionalInPlaceAccumulateFilter.txx:311:10: fatal error: xmmintrin.h: No such file or directory
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b18b36b4633..b00468fbdfc1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1322,6 +1322,7 @@ in
   bs-platform = callPackage ../development/compilers/bs-platform {};
 
   c3d = callPackage ../applications/graphics/c3d {
+    stdenv = gcc8Stdenv;
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 

From f1d1cae1a1634eeec7e5f6708741e604fe923655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ferry=20J=C3=A9r=C3=A9mie?= <ferryjeremie@free.fr>
Date: Thu, 13 Feb 2020 23:38:05 +0100
Subject: [PATCH 0573/4636] maintainers: add mothsart

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 34d1bc876c85..537e0ed11c21 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4899,6 +4899,12 @@
     githubId = 118035;
     name = "Corbin Simpson";
   };
+  mothsart = {
+    email = "jerem.ferry@gmail.com";
+    github = "mothsart";
+    githubId = 10601196;
+    name = "Jérémie Ferry";
+  };
   mounium = {
     email = "muoniurn@gmail.com";
     github = "mounium";

From 3fadc45499fc4cbf91349b0173061d04691b01bf Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 14 Feb 2020 00:30:21 +0100
Subject: [PATCH 0574/4636] google-chrome-dev: Add the newly required
 dependencies

google-chrome-unstable won't launch without the following shared object
files: libdrm.so.2 and libgbm.so.1.
---
 .../applications/networking/browsers/google-chrome/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index 9f49925b2672..89599158ea03 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -5,7 +5,7 @@
 , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
 , alsaLib, libXdamage, libXtst, libXrandr, expat, cups
 , dbus, gtk2, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
-, kerberos
+, kerberos, libdrm, mesa
 
 # command line arguments which are always set e.g "--disable-gpu"
 , commandLineArgs ? ""
@@ -60,6 +60,7 @@ let
     bzip2 libcap at-spi2-atk at-spi2-core
     kerberos
   ] ++ optional pulseSupport libpulseaudio
+    ++ optionals (channel == "dev") [ libdrm mesa ]
     ++ [ gtk ];
 
   suffix = if channel != "stable" then "-" + channel else "";

From a59a557cf69c582036c585a5eaa0d4ac0ef07ed6 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 13 Feb 2020 23:55:37 +0100
Subject: [PATCH 0575/4636] tdesktop: 1.9.12 -> 1.9.13

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

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 05dbfbdaf968..ec7e4e68312d 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -19,12 +19,12 @@ with lib;
 
 mkDerivation rec {
   pname = "telegram-desktop";
-  version = "1.9.12";
+  version = "1.9.13";
 
   # Telegram-Desktop with submodules
   src = fetchurl {
     url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
-    sha256 = "1xjf2fh6qry4q6frq2ixmn1k0rsc72h4j0zmahfsggyl3j5mgkx1";
+    sha256 = "1cd1vy5f0hin01jp7agdr56axwd8539rkngb7c16x17bhj5r7rm7";
   };
 
   postPatch = ''

From 66f50128dc065713ee6896dca3ea8ccdfbae7bb5 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 14 Feb 2020 09:46:21 +1000
Subject: [PATCH 0576/4636] gitAndTools.gh: 0.5.4 -> 0.5.5

https://github.com/cli/cli/releases/tag/v0.5.5
---
 .../version-management/git-and-tools/gh/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix
index 4e461c490984..19f97e8994cf 100644
--- a/pkgs/applications/version-management/git-and-tools/gh/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "gh";
-  version = "0.5.4";
+  version = "0.5.5";
 
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "1i8zxz1vwr86654bxrb8ryh9mk3hsgyrkaxx17dnvasdvym49vrs";
+    sha256 = "0jmkcx95kngzylqhllg33s094rggpsrgky704z8v6j4969xgrfnc";
   };
 
   modSha256 = "0ina3m2ixkkz2fws6ifwy34pmp6kn5s3j7w40alz6vmybn2smy1h";
@@ -29,7 +29,7 @@ buildGoModule rec {
 
   meta = with lib; {
     description = "GitHub CLI tool";
-    homepage = "https://github.com/cli/cli";
+    homepage = "https://cli.github.com/";
     license = licenses.mit;
     maintainers = with maintainers; [ zowoq ];
   };

From c7c57b9f84bdb943a642f47c9ea6de956208a4e6 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 13 Feb 2020 17:51:39 -0600
Subject: [PATCH 0577/4636] liburing: 0.2 -> 0.4pre514_2454d630

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/libraries/liburing/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix
index 386354b48e4d..de7d092373b3 100644
--- a/pkgs/development/libraries/liburing/default.nix
+++ b/pkgs/development/libraries/liburing/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   pname = "liburing";
-  version = "0.2";
+  version = "0.4pre514_${builtins.substring 0 8 src.rev}";
 
   src = fetchgit {
     url    = "http://git.kernel.dk/${pname}";
-    rev    = "refs/tags/${pname}-${version}";
-    sha256 = "0dxq7qjrwndgavrrc6y2wg54ia3y5wkmcyhpdk4l5pvh7hw6kpdz";
+    rev    = "2454d6301d83a714d0775662b512fd46dbf82a0d";
+    sha256 = "0qdycr0w0rymnizc4p5rh2qcnzr05afris4ggaawdg4zr07jms7k";
   };
 
   separateDebugInfo = true;

From 5a40f6c32923288b3c2f5e5995c8b111d6678b98 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Feb 2020 19:18:47 +0000
Subject: [PATCH 0578/4636] python27Packages.sphinx-jinja: 1.1.0 -> 1.1.1

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

diff --git a/pkgs/development/python-modules/sphinx-jinja/default.nix b/pkgs/development/python-modules/sphinx-jinja/default.nix
index 375f59ec3f91..d8f52e33a588 100644
--- a/pkgs/development/python-modules/sphinx-jinja/default.nix
+++ b/pkgs/development/python-modules/sphinx-jinja/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "sphinx-jinja";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "02pgp9pbn0zrs0lggrc74mv6cvlnlq8wib84ga6yjvq30gda9v8q";
+    sha256 = "0hz13vc65zi4zmay40nz8wzxickv1q9zzl6x03qc7rvvapz0c91p";
   };
 
   buildInputs = [ pbr ];

From 4580ffa701139d36d26a9f9acb912fea7dc8e6c4 Mon Sep 17 00:00:00 2001
From: Jon <jonringer@users.noreply.github.com>
Date: Thu, 13 Feb 2020 12:53:41 -0800
Subject: [PATCH 0579/4636] python3Packages.sphinx-jinja: fix python3 namespace
 during tests

---
 pkgs/development/python-modules/sphinx-jinja/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sphinx-jinja/default.nix b/pkgs/development/python-modules/sphinx-jinja/default.nix
index d8f52e33a588..060d7f14a336 100644
--- a/pkgs/development/python-modules/sphinx-jinja/default.nix
+++ b/pkgs/development/python-modules/sphinx-jinja/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, pbr, sphinx, sphinx-testing, nose, glibcLocales }:
+{ lib, buildPythonPackage, fetchPypi, isPy27, pbr, sphinx, sphinx-testing, nose, glibcLocales }:
 
 buildPythonPackage rec {
   pname = "sphinx-jinja";
@@ -14,7 +14,10 @@ buildPythonPackage rec {
 
   checkInputs = [ sphinx-testing nose glibcLocales ];
 
-  checkPhase = ''
+  checkPhase = lib.optionalString (!isPy27) ''
+    # prevent python from loading locally and breaking namespace
+    mv sphinxcontrib .sphinxcontrib
+  '' + ''
     # Zip (epub) does not support files with epoch timestamp
     LC_ALL="en_US.UTF-8" nosetests -e test_build_epub
   '';

From 574a57a67fe8432e8032bdcfa30a95983dddd550 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 14 Feb 2020 00:55:32 +0100
Subject: [PATCH 0580/4636] chromium: 80.0.3987.100 -> 80.0.3987.106

https://chromereleases.googleblog.com/2020/02/stable-channel-update-for-desktop_13.html
---
 .../browsers/chromium/upstream-info.nix        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index c03685deb911..bfc4fd028404 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "02r0lw14j96py5d3c87r7q3l8a9h5g1qb85rvn8cmbx98m04qip9";
-    sha256bin64 = "0adfxgvhcqvlyv4g9ix2a26vgh8f2nxdqbg415x7xijfspbc0apa";
-    version = "80.0.3987.100";
+    sha256 = "0vsykl3gaql8fp1h5007ljds8m8q2n6n34dsbcqqav2008zlks61";
+    sha256bin64 = "1bmszzgmzv7hkczs6kcsa2r8vv6nhg39q1sv74695mr3j3j4bdp8";
+    version = "81.0.4044.17";
   };
   dev = {
-    sha256 = "1mfhv2nix1ddqkp4kk5kpn74rv31sk9zma6icajk5cm21m6cqlbb";
-    sha256bin64 = "1jschlsy3vsxs471n3p6y84bnqd8yxx3ax38ylvjzg7f9mvy13m1";
-    version = "81.0.4044.9";
+    sha256 = "0vsykl3gaql8fp1h5007ljds8m8q2n6n34dsbcqqav2008zlks61";
+    sha256bin64 = "0xx4h82w6jklwlk8p2a2qqk2a9vnf004hmgw69i8iwk6l1d9hxfb";
+    version = "81.0.4044.17";
   };
   stable = {
-    sha256 = "02r0lw14j96py5d3c87r7q3l8a9h5g1qb85rvn8cmbx98m04qip9";
-    sha256bin64 = "0l7a8nkhq7qy8lrl20icr169fni1nvkvvxibqipzjzmj7hxdxbpr";
-    version = "80.0.3987.100";
+    sha256 = "10myihiyrgnm0ly41k4h8ayl3vv3cpshs3pshpqaba0l8i5r5b9f";
+    sha256bin64 = "0pd4ygmyinaq22lmaqjqi1gs3svnb863mkhcf85dzm1354iz1g9k";
+    version = "80.0.3987.106";
   };
 }

From c1741fc12a3329cf4c4509f22c60dfd4d54a192f Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 14 Feb 2020 01:05:01 +0100
Subject: [PATCH 0581/4636] gitRepo: 2.1.1 -> 2.3

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

diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index 6db612f46a2a..7af3e70f211d 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "git-repo";
-  version = "2.1.1";
+  version = "2.3";
 
   src = fetchFromGitHub {
     owner = "android";
     repo = "tools_repo";
     rev = "v${version}";
-    sha256 = "0p09yak0vrdg8apk76kbx5gy7z57mzis9702rbw8mfx9p0ag6fy7";
+    sha256 = "0jrll0mjfwakyjvlhbxwsdi32jhgss9mwz8c8h24n1qbqqxysrk4";
   };
 
   patches = [ ./import-ssl-module.patch ];

From 2ad680ac731ab58d09c628efd12fb307597e6e83 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Fri, 14 Feb 2020 01:17:18 +0100
Subject: [PATCH 0582/4636] nixos/alsa: replace list by attrset in
 environment.etc

---
 nixos/modules/services/audio/alsa.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix
index 990398e65463..3fe76a165401 100644
--- a/nixos/modules/services/audio/alsa.nix
+++ b/nixos/modules/services/audio/alsa.nix
@@ -91,11 +91,7 @@ in
     environment.systemPackages = [ alsaUtils ];
 
     environment.etc = mkIf (!pulseaudioEnabled && config.sound.extraConfig != "")
-      [
-        { source = pkgs.writeText "asound.conf" config.sound.extraConfig;
-          target = "asound.conf";
-        }
-      ];
+      { "asound.conf".text = config.sound.extraConfig; };
 
     # ALSA provides a udev rule for restoring volume settings.
     services.udev.packages = [ alsaUtils ];

From f01bcccd25adf7d151979036b238d3c409374c5d Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Fri, 14 Feb 2020 01:28:03 +0100
Subject: [PATCH 0583/4636] nixos/unclutter: fix remaining typo

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

diff --git a/nixos/modules/services/x11/unclutter.nix b/nixos/modules/services/x11/unclutter.nix
index c0868604a688..56e30c79d1f1 100644
--- a/nixos/modules/services/x11/unclutter.nix
+++ b/nixos/modules/services/x11/unclutter.nix
@@ -61,7 +61,7 @@ in {
       serviceConfig.ExecStart = ''
         ${cfg.package}/bin/unclutter \
           -idle ${toString cfg.timeout} \
-          -jitter ${toString (cfg.threeshold - 1)} \
+          -jitter ${toString (cfg.threshold - 1)} \
           ${optionalString cfg.keystroke "-keystroke"} \
           ${concatMapStrings (x: " -"+x) cfg.extraOptions} \
           -not ${concatStringsSep " " cfg.excluded} \

From ed123808279497f302ad71ec9077e583f779e7de Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 14 Feb 2020 01:59:38 +0000
Subject: [PATCH 0584/4636] alsaPluginWrapper: fix shebang

The bang was missing!  But there's a neater way to do this anyway.
What was there before would still have worked, but I think it would
end up being executed by /bin/sh since it had no shebang line.
---
 pkgs/os-specific/linux/alsa-plugins/wrapper.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/alsa-plugins/wrapper.nix b/pkgs/os-specific/linux/alsa-plugins/wrapper.nix
index 769b6ecd9bf2..8271088a5016 100644
--- a/pkgs/os-specific/linux/alsa-plugins/wrapper.nix
+++ b/pkgs/os-specific/linux/alsa-plugins/wrapper.nix
@@ -1,5 +1,4 @@
-{ writeScriptBin, stdenv, alsaPlugins }:
-writeScriptBin "ap${if stdenv.hostPlatform.system == "i686-linux" then "32" else "64"}" ''
-  #${stdenv.shell}
+{ writeShellScriptBin, stdenv, alsaPlugins }:
+writeShellScriptBin "ap${if stdenv.hostPlatform.system == "i686-linux" then "32" else "64"}" ''
   ALSA_PLUGIN_DIRS=${alsaPlugins}/lib/alsa-lib "$@"
 ''

From 95ee2c8e266aa96b8119bded18255ed550960b03 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 14 Feb 2020 02:00:44 +0000
Subject: [PATCH 0585/4636] python3.pkgs.cmd2: fix shebang

The bang was missing!  What was there before would still have worked,
but I think it would end up being executed by /bin/sh since it had no
shebang line.
---
 pkgs/development/python-modules/cmd2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix
index ca1056928574..ac5ef42bdbed 100644
--- a/pkgs/development/python-modules/cmd2/default.nix
+++ b/pkgs/development/python-modules/cmd2/default.nix
@@ -18,8 +18,8 @@ buildPythonPackage rec {
   postPatch = stdenv.lib.optional stdenv.isDarwin ''
     # Fake the impure dependencies pbpaste and pbcopy
     mkdir bin
-    echo '#${stdenv.shell}' > bin/pbpaste
-    echo '#${stdenv.shell}' > bin/pbcopy
+    echo '#!${stdenv.shell}' > bin/pbpaste
+    echo '#!${stdenv.shell}' > bin/pbcopy
     chmod +x bin/{pbcopy,pbpaste}
     export PATH=$(realpath bin):$PATH
   '';

From 0509ce6408889048f8f4000eb54a7698c7ae8f01 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@gmail.com>
Date: Thu, 13 Feb 2020 22:35:02 -0500
Subject: [PATCH 0586/4636] texlab: 1.9.0 -> 1.10.0 (#79885)

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

diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix
index 1e8b3b2cbab2..748ec8e2b68b 100644
--- a/pkgs/development/tools/misc/texlab/default.nix
+++ b/pkgs/development/tools/misc/texlab/default.nix
@@ -1,23 +1,21 @@
 { stdenv
 , rustPlatform
 , fetchFromGitHub
-, nodejs
 , Security
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "texlab";
-  version = "1.9.0";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "latex-lsp";
     repo = pname;
-    # 1.9.0 + patches for building citeproc-db, see https://github.com/latex-lsp/texlab/pull/137
-    rev = "e38fe4bedc9d8094649a9d2753ca9855e0c18882";
-    sha256 = "0j87gmzyqrpgxrgalvlfqj5cj8j0h23hbbv8vdz2dhc847xhhfq1";
+    rev = "v${version}";
+    sha256 = "12zfcvbihirh38xxzc8fbx293m4vsrhq6kh0qnhnhlrx75m09l9i";
   };
 
-  cargoSha256 = "09d9r7aal1q00idv08zdw7dygyasyp5l6jrh96cdclf63h1p4fk9";
+  cargoSha256 = "11labj3zf7ahbly1ylwliqhxzydbxz9w8z991575daj7a2nbw1q0";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
 

From 6ef1edbeaa02f4e6adcaadcab009fe765e2b7032 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Feb 2020 03:38:53 +0000
Subject: [PATCH 0587/4636] rspamd: 2.2 -> 2.3

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

diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index 3d04d35a3c51..15a651d8a321 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -10,13 +10,13 @@ assert withHyperscan -> stdenv.isx86_64;
 
 stdenv.mkDerivation rec {
   pname = "rspamd";
-  version = "2.2";
+  version = "2.3";
 
   src = fetchFromGitHub {
     owner = "rspamd";
     repo = "rspamd";
     rev = version;
-    sha256 = "0rqiz4xm20w80q8p4grcgqcrg14yiddsay0aw00f0v82h4apw7k8";
+    sha256 = "1v4kbvj9r0hs8jaisq3fr0rg0qndpbhc5h8cbpfpprmkbw4nj6pf";
   };
 
   nativeBuildInputs = [ cmake pkgconfig perl ];

From 0e69b50b60147d4a5c867c16772e814e44838643 Mon Sep 17 00:00:00 2001
From: ivanbrennan <ivan.brennan@gmail.com>
Date: Thu, 13 Feb 2020 23:34:45 -0500
Subject: [PATCH 0588/4636] rxvt-unicode-plugins.perls: 2.2 -> 2.3

This upgrade brings a new option to the keyboard-select plugin:

  URxvt.keyboard-select.clipboard: If true, copy to clipboard too

and removes the now deprecated clipboard and url-select plugins. The
reasons for deprecating these two plugins are described at:
https://github.com/muennich/urxvt-perls/blob/master/deprecated/README.md
---
 .../misc/rxvt-unicode-plugins/urxvt-perls/default.nix    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix
index b976388ae2c4..4081fea76c96 100644
--- a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix
+++ b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix
@@ -2,21 +2,18 @@
 
 stdenv.mkDerivation rec {
   pname = "urxvt-perls";
-  version = "2.2";
+  version = "2.3";
 
   src = fetchFromGitHub {
     owner = "muennich";
     repo = "urxvt-perls";
     rev = version;
-    sha256 = "1cb0jbjmwfy2dlq2ny8wpc04k79jp3pz9qhbmgagsxs3sp1jg2hz";
+    sha256 = "0xvwfw7965ghhd9g6rl6y6fgpd444l46rjqmlgg0rfjypbh6c0p1";
   };
 
   installPhase = ''
     mkdir -p $out/lib/urxvt/perl
-    cp clipboard \
-       keyboard-select \
-       url-select \
-    $out/lib/urxvt/perl
+    cp keyboard-select $out/lib/urxvt/perl
   '';
 
   meta = with stdenv.lib; {

From 73b22c40967b78d01bc55f820bf78506a00d8372 Mon Sep 17 00:00:00 2001
From: ivanbrennan <ivan.brennan@gmail.com>
Date: Thu, 13 Feb 2020 23:44:30 -0500
Subject: [PATCH 0589/4636] rxvt-unicode-plugins.perls: deprecated plugins

While the clipboard and url-select plugins have been deprecated, it's
likely there are still many users expecting them to exist, so continue
to provide them.

https://github.com/muennich/urxvt-perls/blob/master/deprecated/README.md
---
 .../misc/rxvt-unicode-plugins/urxvt-perls/default.nix          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix
index 4081fea76c96..dac041410707 100644
--- a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix
+++ b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix
@@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/lib/urxvt/perl
     cp keyboard-select $out/lib/urxvt/perl
+    cp deprecated/clipboard \
+       deprecated/url-select \
+    $out/lib/urxvt/perl
   '';
 
   meta = with stdenv.lib; {

From 0f8d1ac47d9e64d4536c13fb9940d44a89fdb2ec Mon Sep 17 00:00:00 2001
From: Jyun-Yan You <jyyou.tw@gmail.com>
Date: Fri, 14 Feb 2020 10:42:49 +0800
Subject: [PATCH 0590/4636] nixos/pppd: fix build error

---
 nixos/modules/services/networking/pppd.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/pppd.nix b/nixos/modules/services/networking/pppd.nix
index b31bfa642358..c1cbdb461765 100644
--- a/nixos/modules/services/networking/pppd.nix
+++ b/nixos/modules/services/networking/pppd.nix
@@ -130,7 +130,7 @@ in
     systemdConfigs = listToAttrs (map mkSystemd enabledConfigs);
 
   in mkIf cfg.enable {
-    environment.etc = mkMerge etcFiles;
-    systemd.services = mkMerge systemdConfigs;
+    environment.etc = etcFiles;
+    systemd.services = systemdConfigs;
   };
 }

From 4e7ea9b49a9ede2af7749312ddc466272c4e853f Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 14 Feb 2020 00:00:00 -0500
Subject: [PATCH 0591/4636] postgresql_9_5: 9.5.20 -> 9.5.21

Release notes: https://www.postgresql.org/docs/9.5/release-9-5-21.html
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 890ac2d37779..af5b9e1d36d3 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -183,9 +183,9 @@ let
 in self: {
 
   postgresql_9_5 = self.callPackage generic {
-    version = "9.5.20";
+    version = "9.5.21";
     psqlSchema = "9.5";
-    sha256 = "03fygn3nn6l6ar66sldy5akdg1gynny3yxbrpvmmp5ygfnrm2mwj";
+    sha256 = "0b3kzc0431bvp55jns42q9h1119gy075mp4aywnkq93pm17nxdby";
     this = self.postgresql_9_5;
     inherit self;
   };

From d067b4ac812aca80eb6316c546efe255aacfa767 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 14 Feb 2020 00:01:00 -0500
Subject: [PATCH 0592/4636] postgresql_9_6: 9.6.16 -> 9.6.17

Release notes: https://www.postgresql.org/docs/9.6/release-9-6-17.html
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index af5b9e1d36d3..1a43aaedb183 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -191,9 +191,9 @@ in self: {
   };
 
   postgresql_9_6 = self.callPackage generic {
-    version = "9.6.16";
+    version = "9.6.17";
     psqlSchema = "9.6";
-    sha256 = "1rr2dgv4ams8r2lp13w85c77rkmzpb88fjlc28mvlw6zq2fblv2w";
+    sha256 = "1hm0w6n988n9qn2wylhjq02i5ayzb16rzhgkcv09fpsl68ny7qgn";
     this = self.postgresql_9_6;
     inherit self;
   };

From 08d614c72f48c9960423dd15d7c7ce7e6716c158 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 14 Feb 2020 00:02:00 -0500
Subject: [PATCH 0593/4636] postgresql_10: 10.11 -> 10.12

Release notes: https://www.postgresql.org/docs/10/release-10-12.html
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 1a43aaedb183..a71542d42ce9 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -199,9 +199,9 @@ in self: {
   };
 
   postgresql_10 = self.callPackage generic {
-    version = "10.11";
+    version = "10.12";
     psqlSchema = "10.0"; # should be 10, but changing it is invasive
-    sha256 = "02fcmvbh0mhplj3s2jd24s642ysx7bggnf0h8bs5amh7dgzi8p8d";
+    sha256 = "1rsab4zf4rx7pvvhlwhb04kb95aiad9cwazc4ksbvg2gij47z3rq";
     this = self.postgresql_10;
     inherit self;
   };

From 36681748369c5ac9c2c9926464e889c44eca42e3 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 14 Feb 2020 00:03:00 -0500
Subject: [PATCH 0594/4636] postgresql_11: 11.6 -> 11.7

Release notes: https://www.postgresql.org/docs/11/release-11-7.html
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index a71542d42ce9..50e4d3e5c9a1 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -207,9 +207,9 @@ in self: {
   };
 
   postgresql_11 = self.callPackage generic {
-    version = "11.6";
+    version = "11.7";
     psqlSchema = "11.1"; # should be 11, but changing it is invasive
-    sha256 = "0w1iq488kpzfgfnlw4k32lz5by695mpnkq461jrgsr99z5zlz4j9";
+    sha256 = "04x343i4v0w4jf1v5ial8rwsizs1qhdjfbanbnibdys6i0xfjjij";
     this = self.postgresql_11;
     inherit self;
   };

From bfdb8f99ce848b331cb3297a149630c2b9c3f68b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 14 Feb 2020 00:04:00 -0500
Subject: [PATCH 0595/4636] postgresql_12: 12.1 -> 12.2

Release notes: https://www.postgresql.org/docs/current/release-12-2.html
---
 pkgs/servers/sql/postgresql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 50e4d3e5c9a1..b9cd50aa5fe0 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -215,9 +215,9 @@ in self: {
   };
 
   postgresql_12 = self.callPackage generic {
-    version = "12.1";
+    version = "12.2";
     psqlSchema = "12";
-    sha256 = "1vc3hjcbgkdfczc1ipkk02rahabn7fabpb7qs203jxpnpamz76x0";
+    sha256 = "1pmmd59pvfs50gsi728bw9f1jl59xghsjdanfimph0659x6cq7dd";
     this = self.postgresql_12;
     inherit self;
   };

From f19a101a73fcd447f6cfbaf7a8b01583ae6caf12 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 14 Feb 2020 06:05:43 +0100
Subject: [PATCH 0596/4636] nix-prefetch-git: report deepClone & leaveDotGit

Just like in https://github.com/NixOS/nixpkgs/commit/be30ba8e0eabbc2483122ddf9d5911484df3a578
we want `fetchgit (builtins.fromJSON (builtins.readFile ./src.json))` to work.
---
 pkgs/build-support/fetchgit/nix-prefetch-git | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 8020ba46f3f1..38c00d9fd9cc 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -25,7 +25,7 @@ commitDateStrict8601=
 if test -n "$deepClone"; then
     deepClone=true
 else
-    deepClone=false
+    deepClone=
 fi
 
 if test "$leaveDotGit" != 1; then
@@ -65,7 +65,7 @@ for arg; do
             --branch-name) argfun=set_branchName;;
             --deepClone) deepClone=true;;
             --quiet) QUIET=true;;
-            --no-deepClone) deepClone=false;;
+            --no-deepClone) deepClone=;;
             --leave-dotGit) leaveDotGit=true;;
             --fetch-submodules) fetchSubmodules=true;;
             --builder) builder=true;;
@@ -150,7 +150,7 @@ checkout_ref(){
     local hash="$1"
     local ref="$2"
 
-    if "$deepClone"; then
+    if [[ -n "$deepClone" ]]; then
         # The caller explicitly asked for a deep clone.  Deep clones
         # allow "git describe" and similar tools to work.  See
         # https://marc.info/?l=nix-dev&m=139641582514772
@@ -369,7 +369,9 @@ print_results() {
   "rev": "$(json_escape "$fullRev")",
   "date": "$(json_escape "$commitDateStrict8601")",
   "$(json_escape "$hashType")": "$(json_escape "$hash")",
-  "fetchSubmodules": $([[ -n "$fetchSubmodules" ]] && echo true || echo false)
+  "fetchSubmodules": $([[ -n "$fetchSubmodules" ]] && echo true || echo false),
+  "deepClone": $([[ -n "$deepClone" ]] && echo true || echo false),
+  "leaveDotGit": $([[ -n "$leaveDotGit" ]] && echo true || echo false)
 }
 EOF
     fi

From f422253fddca708ed819e6be8f5c5fdc0c007e07 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Feb 2020 05:30:51 +0000
Subject: [PATCH 0597/4636] stress-ng: 0.10.16 -> 0.10.19

---
 pkgs/tools/system/stress-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index 911b1ef662c9..29a838e49143 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "stress-ng";
-  version = "0.10.16";
+  version = "0.10.19";
 
   src = fetchurl {
     url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "0173lys5i7bnw8zdpkrr8chh1b84q9b08a41a5v6fgpmzk7zzgza";
+    sha256 = "0v85q5sch1rx68cr69s1wrr79ny9gv99awgqkailk76z2cjva38g";
   };
 
   postPatch = ''

From e57fdf508a3b3c5492c266c5fff1b93ac2ea8557 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 6 Feb 2020 09:40:12 +0100
Subject: [PATCH 0598/4636] =?UTF-8?q?ocamlPackages.uunf:=2011.0.0=20?=
 =?UTF-8?q?=E2=86=92=2012.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix
index c8eb8ea532c4..f9569f860869 100644
--- a/pkgs/development/ocaml-modules/uunf/default.nix
+++ b/pkgs/development/ocaml-modules/uunf/default.nix
@@ -8,11 +8,11 @@ assert stdenv.lib.versionAtLeast ocaml.version "4.01";
 
 stdenv.mkDerivation rec {
   name = "ocaml-${pname}-${version}";
-  version = "11.0.0";
+  version = "12.0.0";
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
-    sha256 = "1j0v3dg19sq13fmbx4kzy3n1hjiv7hkm1ysxyrdva430jvqw23df";
+    sha256 = "031fxixp37hjv45mib87wxm865k82903w72x60hp6v36k7jn34a4";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild topkg uutf cmdliner ];

From eb11feaa0b7971687d8004896df4f9618cf1dafe Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 13 Feb 2020 21:00:26 -0500
Subject: [PATCH 0599/4636] treewide: change fetchCargoTarball default to
 opt-out

Changes the default fetcher in the Rust Platform to be the newer
`fetchCargoTarball`, and changes every application using the current default to
instead opt out.

This commit does not change any hashes or cause any rebuilds. Once integrated,
we will start deleting the opt-outs and recomputing hashes.

See #79975 for details.
---
 pkgs/applications/accessibility/contrast/default.nix           | 3 +++
 pkgs/applications/audio/gnome-podcasts/default.nix             | 3 +++
 pkgs/applications/audio/ncspot/default.nix                     | 3 +++
 pkgs/applications/audio/spotify-tui/default.nix                | 3 +++
 pkgs/applications/audio/spotifyd/default.nix                   | 3 +++
 pkgs/applications/blockchains/ethabi.nix                       | 3 +++
 pkgs/applications/blockchains/parity/parity.nix                | 3 +++
 pkgs/applications/blockchains/polkadot/default.nix             | 3 +++
 pkgs/applications/blockchains/zcash/librustzcash/default.nix   | 3 +++
 pkgs/applications/editors/amp/default.nix                      | 3 +++
 pkgs/applications/editors/neovim/gnvim/default.nix             | 3 +++
 pkgs/applications/gis/whitebox-tools/default.nix               | 3 +++
 pkgs/applications/graphics/rx/default.nix                      | 3 +++
 pkgs/applications/misc/alacritty/default.nix                   | 3 +++
 pkgs/applications/misc/pastel/default.nix                      | 3 +++
 pkgs/applications/misc/pueue/default.nix                       | 3 +++
 pkgs/applications/misc/rsclock/default.nix                     | 3 +++
 pkgs/applications/misc/taizen/default.nix                      | 3 +++
 pkgs/applications/misc/todiff/default.nix                      | 3 +++
 pkgs/applications/misc/zola/default.nix                        | 3 +++
 pkgs/applications/networking/cluster/click/default.nix         | 3 +++
 pkgs/applications/networking/cluster/habitat/default.nix       | 3 +++
 pkgs/applications/networking/dyndns/cfdyndns/default.nix       | 3 +++
 pkgs/applications/networking/feedreaders/newsboat/default.nix  | 3 +++
 .../networking/instant-messengers/fractal/default.nix          | 3 +++
 pkgs/applications/networking/irc/tiny/default.nix              | 3 +++
 pkgs/applications/networking/p2p/synapse-bt/default.nix        | 3 +++
 pkgs/applications/science/logic/elan/default.nix               | 3 +++
 pkgs/applications/science/misc/rink/default.nix                | 3 +++
 .../version-management/git-and-tools/delta/default.nix         | 3 +++
 .../version-management/git-and-tools/git-absorb/default.nix    | 3 +++
 .../git-and-tools/git-codeowners/default.nix                   | 3 +++
 .../version-management/git-and-tools/git-dit/default.nix       | 3 +++
 .../version-management/git-and-tools/git-gone/default.nix      | 3 +++
 .../version-management/git-and-tools/git-ignore/default.nix    | 3 +++
 .../git-and-tools/git-interactive-rebase-tool/default.nix      | 3 +++
 pkgs/applications/version-management/git-backup/default.nix    | 3 +++
 pkgs/applications/version-management/pijul/default.nix         | 3 +++
 pkgs/applications/version-management/sit/default.nix           | 3 +++
 pkgs/applications/virtualization/cntr/default.nix              | 3 +++
 pkgs/applications/virtualization/crosvm/default.nix            | 3 +++
 pkgs/applications/virtualization/railcar/default.nix           | 3 +++
 pkgs/applications/window-managers/dwm/dwm-status.nix           | 3 +++
 pkgs/applications/window-managers/i3/status-rust.nix           | 3 +++
 pkgs/applications/window-managers/i3/wmfocus.nix               | 3 +++
 pkgs/applications/window-managers/leftwm/default.nix           | 3 +++
 pkgs/applications/window-managers/wtftw/default.nix            | 3 +++
 pkgs/build-support/rust/default.nix                            | 2 +-
 pkgs/development/compilers/gleam/default.nix                   | 3 +++
 pkgs/development/interpreters/evcxr/default.nix                | 3 +++
 pkgs/development/interpreters/wasm-gc/default.nix              | 3 +++
 pkgs/development/interpreters/wasmer/default.nix               | 3 +++
 pkgs/development/interpreters/wasmtime/default.nix             | 3 +++
 pkgs/development/misc/loc/default.nix                          | 3 +++
 pkgs/development/tools/analysis/bingrep/default.nix            | 3 +++
 pkgs/development/tools/analysis/panopticon/default.nix         | 3 +++
 pkgs/development/tools/async/default.nix                       | 3 +++
 pkgs/development/tools/cargo-flamegraph/default.nix            | 3 +++
 pkgs/development/tools/cargo-web/default.nix                   | 3 +++
 pkgs/development/tools/chit/default.nix                        | 3 +++
 pkgs/development/tools/clog-cli/default.nix                    | 3 +++
 pkgs/development/tools/cloudflare-wrangler/default.nix         | 3 +++
 pkgs/development/tools/diesel-cli/default.nix                  | 3 +++
 pkgs/development/tools/geckodriver/default.nix                 | 3 +++
 pkgs/development/tools/gir/default.nix                         | 3 +++
 pkgs/development/tools/git-series/default.nix                  | 3 +++
 pkgs/development/tools/just/default.nix                        | 3 +++
 pkgs/development/tools/misc/hydra-cli/default.nix              | 3 +++
 pkgs/development/tools/misc/sccache/default.nix                | 3 +++
 pkgs/development/tools/misc/texlab/default.nix                 | 3 +++
 pkgs/development/tools/misc/tokei/default.nix                  | 3 +++
 pkgs/development/tools/misc/wishbone-tool/default.nix          | 3 +++
 pkgs/development/tools/parinfer-rust/default.nix               | 3 +++
 pkgs/development/tools/parsing/tree-sitter/default.nix         | 3 +++
 pkgs/development/tools/pax-rs/default.nix                      | 3 +++
 pkgs/development/tools/rnix-lsp/default.nix                    | 3 +++
 pkgs/development/tools/rq/default.nix                          | 3 +++
 pkgs/development/tools/rust/bindgen/default.nix                | 3 +++
 pkgs/development/tools/rust/cargo-asm/default.nix              | 3 +++
 pkgs/development/tools/rust/cargo-bloat/default.nix            | 3 +++
 pkgs/development/tools/rust/cargo-crev/default.nix             | 3 +++
 pkgs/development/tools/rust/cargo-expand/default.nix           | 3 +++
 pkgs/development/tools/rust/cargo-fuzz/default.nix             | 3 +++
 pkgs/development/tools/rust/cargo-geiger/default.nix           | 3 +++
 pkgs/development/tools/rust/cargo-generate/default.nix         | 3 +++
 pkgs/development/tools/rust/cargo-inspect/default.nix          | 3 +++
 pkgs/development/tools/rust/cargo-make/default.nix             | 3 +++
 pkgs/development/tools/rust/cargo-raze/default.nix             | 3 +++
 pkgs/development/tools/rust/cargo-sweep/default.nix            | 3 +++
 pkgs/development/tools/rust/cargo-udeps/default.nix            | 3 +++
 pkgs/development/tools/rust/cargo-watch/default.nix            | 3 +++
 pkgs/development/tools/rust/cargo-xbuild/default.nix           | 3 +++
 pkgs/development/tools/rust/cbindgen/default.nix               | 3 +++
 pkgs/development/tools/rust/maturin/default.nix                | 3 +++
 pkgs/development/tools/rust/racer/default.nix                  | 3 +++
 pkgs/development/tools/rust/racerd/default.nix                 | 3 +++
 pkgs/development/tools/rust/rainicorn/default.nix              | 3 +++
 pkgs/development/tools/rust/rustup/default.nix                 | 3 +++
 pkgs/development/tools/rust/svd2rust/default.nix               | 3 +++
 pkgs/development/tools/scaff/default.nix                       | 3 +++
 pkgs/development/tools/wasm-bindgen-cli/default.nix            | 3 +++
 pkgs/development/tools/wasm-pack/default.nix                   | 3 +++
 pkgs/games/eidolon/default.nix                                 | 3 +++
 pkgs/games/ja2-stracciatella/default.nix                       | 1 +
 pkgs/games/system-syzygy/default.nix                           | 3 +++
 pkgs/misc/uq/default.nix                                       | 3 +++
 pkgs/misc/vim-plugins/overrides.nix                            | 3 +++
 pkgs/servers/monitoring/prometheus/wireguard-exporter.nix      | 3 +++
 pkgs/servers/routinator/default.nix                            | 3 +++
 pkgs/servers/unpfs/default.nix                                 | 3 +++
 pkgs/servers/webmetro/default.nix                              | 3 +++
 pkgs/shells/ion/default.nix                                    | 3 +++
 pkgs/shells/nushell/default.nix                                | 3 +++
 pkgs/tools/X11/xidlehook/default.nix                           | 3 +++
 pkgs/tools/admin/intecture/agent.nix                           | 3 +++
 pkgs/tools/admin/intecture/auth.nix                            | 3 +++
 pkgs/tools/admin/intecture/cli.nix                             | 3 +++
 pkgs/tools/admin/procs/default.nix                             | 3 +++
 pkgs/tools/backup/rdedup/default.nix                           | 3 +++
 pkgs/tools/filesystems/btrfs-dedupe/default.nix                | 3 +++
 pkgs/tools/graphics/gifski/default.nix                         | 3 +++
 pkgs/tools/graphics/oxipng/default.nix                         | 3 +++
 pkgs/tools/graphics/shotgun/default.nix                        | 3 +++
 pkgs/tools/graphics/svgbob/default.nix                         | 3 +++
 pkgs/tools/graphics/svgcleaner/default.nix                     | 3 +++
 pkgs/tools/graphics/viu/default.nix                            | 3 +++
 pkgs/tools/misc/bat/default.nix                                | 3 +++
 pkgs/tools/misc/diskus/default.nix                             | 3 +++
 pkgs/tools/misc/dua/default.nix                                | 3 +++
 pkgs/tools/misc/dust/default.nix                               | 3 +++
 pkgs/tools/misc/eva/default.nix                                | 3 +++
 pkgs/tools/misc/exa/default.nix                                | 3 +++
 pkgs/tools/misc/fd/default.nix                                 | 3 +++
 pkgs/tools/misc/ffsend/default.nix                             | 3 +++
 pkgs/tools/misc/fselect/default.nix                            | 3 +++
 pkgs/tools/misc/heatseeker/default.nix                         | 3 +++
 pkgs/tools/misc/hexyl/default.nix                              | 3 +++
 pkgs/tools/misc/hyperfine/default.nix                          | 3 +++
 pkgs/tools/misc/journaldriver/default.nix                      | 3 +++
 pkgs/tools/misc/kak-lsp/default.nix                            | 3 +++
 pkgs/tools/misc/licensor/default.nix                           | 3 +++
 pkgs/tools/misc/loop/default.nix                               | 3 +++
 pkgs/tools/misc/lorri/default.nix                              | 3 +++
 pkgs/tools/misc/lsd/default.nix                                | 3 +++
 pkgs/tools/misc/mcfly/default.nix                              | 3 +++
 pkgs/tools/misc/miniserve/default.nix                          | 3 +++
 pkgs/tools/misc/onefetch/default.nix                           | 3 +++
 pkgs/tools/misc/parallel-rust/default.nix                      | 3 +++
 pkgs/tools/misc/pazi/default.nix                               | 3 +++
 pkgs/tools/misc/powerline-rs/default.nix                       | 3 +++
 pkgs/tools/misc/shadowenv/default.nix                          | 3 +++
 pkgs/tools/misc/shell-hist/default.nix                         | 3 +++
 pkgs/tools/misc/silicon/default.nix                            | 3 +++
 pkgs/tools/misc/skim/default.nix                               | 3 +++
 pkgs/tools/misc/starship/default.nix                           | 3 +++
 pkgs/tools/misc/tealdeer/default.nix                           | 3 +++
 pkgs/tools/misc/tensorman/default.nix                          | 3 +++
 pkgs/tools/misc/termplay/default.nix                           | 3 +++
 pkgs/tools/misc/topgrade/default.nix                           | 3 +++
 pkgs/tools/misc/uutils-coreutils/default.nix                   | 3 +++
 pkgs/tools/misc/vdirsyncer/default.nix                         | 3 +++
 pkgs/tools/misc/vector/default.nix                             | 3 +++
 pkgs/tools/misc/vivid/default.nix                              | 3 +++
 pkgs/tools/misc/void/default.nix                               | 3 +++
 pkgs/tools/misc/watchexec/default.nix                          | 3 +++
 pkgs/tools/misc/websocat/default.nix                           | 3 +++
 pkgs/tools/misc/xprite-editor/default.nix                      | 3 +++
 pkgs/tools/misc/xv/default.nix                                 | 3 +++
 pkgs/tools/networking/bandwhich/default.nix                    | 3 +++
 pkgs/tools/networking/boringtun/default.nix                    | 3 +++
 pkgs/tools/networking/bukubrow/default.nix                     | 3 +++
 pkgs/tools/networking/findomain/default.nix                    | 3 +++
 pkgs/tools/networking/gnirehtet/default.nix                    | 3 +++
 pkgs/tools/networking/httplz/default.nix                       | 3 +++
 pkgs/tools/networking/shadowsocks-rust/default.nix             | 3 +++
 pkgs/tools/networking/tdns-cli/default.nix                     | 3 +++
 pkgs/tools/networking/tox-node/default.nix                     | 3 +++
 pkgs/tools/nix/nixdoc/default.nix                              | 3 +++
 pkgs/tools/nix/nixpkgs-fmt/default.nix                         | 3 +++
 pkgs/tools/package-management/cargo-about/default.nix          | 3 +++
 pkgs/tools/package-management/cargo-audit/default.nix          | 3 +++
 pkgs/tools/package-management/cargo-deb/default.nix            | 3 +++
 pkgs/tools/package-management/cargo-deps/default.nix           | 3 +++
 pkgs/tools/package-management/cargo-edit/default.nix           | 3 +++
 pkgs/tools/package-management/cargo-graph/default.nix          | 3 +++
 pkgs/tools/package-management/cargo-license/default.nix        | 3 +++
 pkgs/tools/package-management/cargo-outdated/default.nix       | 3 +++
 pkgs/tools/package-management/cargo-release/default.nix        | 3 +++
 pkgs/tools/package-management/cargo-tree/default.nix           | 3 +++
 pkgs/tools/package-management/emplace/default.nix              | 3 +++
 pkgs/tools/package-management/nix-index/default.nix            | 3 +++
 pkgs/tools/security/b3sum/default.nix                          | 3 +++
 pkgs/tools/security/bitwarden_rs/default.nix                   | 3 +++
 pkgs/tools/security/jwt-cli/default.nix                        | 3 +++
 pkgs/tools/security/rage/default.nix                           | 3 +++
 pkgs/tools/security/ripasso/cursive.nix                        | 3 +++
 pkgs/tools/security/sequoia/default.nix                        | 3 +++
 pkgs/tools/system/mq-cli/default.nix                           | 3 +++
 pkgs/tools/system/ytop/default.nix                             | 3 +++
 pkgs/tools/text/amber/default.nix                              | 3 +++
 pkgs/tools/text/coloursum/default.nix                          | 3 +++
 pkgs/tools/text/diffr/default.nix                              | 3 +++
 pkgs/tools/text/mdbook/default.nix                             | 3 +++
 pkgs/tools/text/mdcat/default.nix                              | 3 +++
 pkgs/tools/text/ripgrep-all/default.nix                        | 3 +++
 pkgs/tools/text/ripgrep/default.nix                            | 3 +++
 pkgs/tools/text/ruplacer/default.nix                           | 3 +++
 pkgs/tools/text/sd/default.nix                                 | 3 +++
 pkgs/tools/text/staccato/default.nix                           | 3 +++
 pkgs/tools/text/xsv/default.nix                                | 3 +++
 pkgs/tools/typesetting/tectonic/default.nix                    | 3 +++
 pkgs/tools/video/rav1e/default.nix                             | 3 +++
 212 files changed, 632 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix
index 3e03cf2da730..ebd0a7a44a6c 100644
--- a/pkgs/applications/accessibility/contrast/default.nix
+++ b/pkgs/applications/accessibility/contrast/default.nix
@@ -30,6 +30,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0rm705zrk9rfv31pwbqxrswi5v6vhnghxa8dgxjmcrh00l8dm6j9";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "06vgc89d93fhjcyy9d1v6lf8kr34pl5bbpwbv2jpfahpj9y84bgj";
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix
index 7a44ebe67694..c28754e471a9 100644
--- a/pkgs/applications/audio/gnome-podcasts/default.nix
+++ b/pkgs/applications/audio/gnome-podcasts/default.nix
@@ -32,6 +32,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0vy5i77bv8c22ldhrnr4z6kx22zqnb1lg3s7y8673bqjgd7dppi0";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1h0n8zclb8a1b1ri83viiwwzlj3anm38m4cp38aqyf6q40qga35q";
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix
index 5bf091adbdf9..1f9ee8ae334f 100644
--- a/pkgs/applications/audio/ncspot/default.nix
+++ b/pkgs/applications/audio/ncspot/default.nix
@@ -21,6 +21,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "10jp2yh8jlvdwh297658q9fi3i62vwsbd9fbwjsir7s1c9bgdy8k";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1gw8wvms1ry2shvm3c79wp5nkpc39409af4qfm5hd4wgz2grh8d2";
 
   cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix
index fc630e78078f..e4d6c6c42ffe 100644
--- a/pkgs/applications/audio/spotify-tui/default.nix
+++ b/pkgs/applications/audio/spotify-tui/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0gp7xb63icraqg7f0j91q474acph3ligzak2k8qqr9cqbgg509f4";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1364z9jz3mnba3pii5h7imqlwlvbp146pcd5q8w61lsmdr2iyha2";
 
   nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ];
diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix
index 30cedfa8bb8f..bc410a39319b 100644
--- a/pkgs/applications/audio/spotifyd/default.nix
+++ b/pkgs/applications/audio/spotifyd/default.nix
@@ -15,6 +15,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "08i0zm7kgprixqjpgaxk7xid1njgj6lmi896jf9fsjqzdzlblqk8";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0kl8xl2qhzf8wb25ajw59frgym62lkg7p72d8z0xmkqjjcg2nyib";
 
   cargoBuildFlags = [
diff --git a/pkgs/applications/blockchains/ethabi.nix b/pkgs/applications/blockchains/ethabi.nix
index 5bc81a6daf66..9949b5414bae 100644
--- a/pkgs/applications/blockchains/ethabi.nix
+++ b/pkgs/applications/blockchains/ethabi.nix
@@ -13,6 +13,9 @@ buildRustPackage rec {
     sha256 = "1gqd3vwsvv1wvi659qcdywgmh41swblpwmmxb033k8irw581dwq4";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0zkdai31jf8f5syklaxq43ydjvp5xclr8pd6y1q6vkwjz6z49hzm";
 
   cargoBuildFlags = ["--features cli"];
diff --git a/pkgs/applications/blockchains/parity/parity.nix b/pkgs/applications/blockchains/parity/parity.nix
index 7f28d97bf81a..6937d6efb099 100644
--- a/pkgs/applications/blockchains/parity/parity.nix
+++ b/pkgs/applications/blockchains/parity/parity.nix
@@ -17,6 +17,9 @@ rustPlatform.buildRustPackage {
   pname = "parity";
   inherit version;
   inherit cargoSha256;
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
 
   src = fetchFromGitHub {
     owner = "paritytech";
diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix
index b50b14258ccc..cf83be9b50dc 100644
--- a/pkgs/applications/blockchains/polkadot/default.nix
+++ b/pkgs/applications/blockchains/polkadot/default.nix
@@ -16,6 +16,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0v7g03rbml2afw0splmyjh9nqpjg0ldjw09hyc0jqd3qlhgxiiyj";
   }; 
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0gc3w0cwdyk8f7cgpp9sfawczk3n6wd7q0nhfvk87sry71b8vvwq";
 
   buildInputs = [ pkgconfig openssl openssl.dev ];
diff --git a/pkgs/applications/blockchains/zcash/librustzcash/default.nix b/pkgs/applications/blockchains/zcash/librustzcash/default.nix
index 31703f8fb2a5..5032594468e7 100644
--- a/pkgs/applications/blockchains/zcash/librustzcash/default.nix
+++ b/pkgs/applications/blockchains/zcash/librustzcash/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0md0pp3k97iv7kfjpfkg14pjanhrql4vafa8ggbxpkajv1j4xldv";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "166v8cxlpfslbs5gljbh7wp0lxqakayw47ikxm9r9a39n7j36mq1";
 
   installPhase = ''
diff --git a/pkgs/applications/editors/amp/default.nix b/pkgs/applications/editors/amp/default.nix
index 6db7cbed25bd..e4248e32447c 100644
--- a/pkgs/applications/editors/amp/default.nix
+++ b/pkgs/applications/editors/amp/default.nix
@@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0jhxyl27nwp7rp0lc3kic69g8x55d0azrwlwwhz3z74icqa8f03j";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0rk5c8knx8swqzmj7wd18hq2h5ndkzvcbq4lzggpavkk01a8hlb1";
 
   nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/applications/editors/neovim/gnvim/default.nix b/pkgs/applications/editors/neovim/gnvim/default.nix
index 764d7004940d..a9b2abd0cb3b 100644
--- a/pkgs/applications/editors/neovim/gnvim/default.nix
+++ b/pkgs/applications/editors/neovim/gnvim/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "11gb59lhc1sp5dxj2fdm6072f4nxxay0war3kmchdwsk41nvxlrh";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "00r5jf5qdw02vcv3522qqrnwj14mip0l58prcncbvyg4pxlm2rb2";
 
   buildInputs = [ gtk webkitgtk ];
diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix
index 84d7f3ddb499..1ee1d3376db3 100644
--- a/pkgs/applications/gis/whitebox-tools/default.nix
+++ b/pkgs/applications/gis/whitebox-tools/default.nix
@@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1y3vk8bzsaisx7wrncjxcqdh355f2wk4n59vq5qgj37fph2zpy7f";
 
   # failures: structures::polyline::test::test_polyline_split
diff --git a/pkgs/applications/graphics/rx/default.nix b/pkgs/applications/graphics/rx/default.nix
index 3093fa107d6b..51d03831e32b 100644
--- a/pkgs/applications/graphics/rx/default.nix
+++ b/pkgs/applications/graphics/rx/default.nix
@@ -16,6 +16,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1n5s7v2z13550gkqz7w6dw62jdy60wdi8w1lfa23609b4yhg4w94";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "173jfjvdag97f6jvfg366hjk9v3cz301cbzpcahy51rbf1cip1w1";
 
   nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 7d4f0614d8bc..34d2b510a03a 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -62,6 +62,9 @@ in buildRustPackage rec {
     sha256 = "05jcg33ifngpzw2hdhgb614j87ihhhlqgar0kky183rywg0dxikg";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1kc9n10kb4j87x337pzl6wpi0qj5ib2mqmrjag2yld3138dag71n";
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix
index 8499ad0880c0..426c5162500d 100644
--- a/pkgs/applications/misc/pastel/default.nix
+++ b/pkgs/applications/misc/pastel/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1c47bph1qraq3g0g5bp23jqlz7qdn4f8vh264y937jz17avvacx5";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1pfhwqj9kxm9p0mpdw7qyvivgby2bmah05kavf0a5zhzvq4v4sg0";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix
index 762d1d6d15cb..e283a5381e76 100644
--- a/pkgs/applications/misc/pueue/default.nix
+++ b/pkgs/applications/misc/pueue/default.nix
@@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1y33n0dmrssv35l0apfq1mchyh92cfbzjarh0m8zb2nxwhvk7paw";
 
   postInstall = ''
diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix
index 137ec920f750..a66f4c9a2cf0 100644
--- a/pkgs/applications/misc/rsclock/default.nix
+++ b/pkgs/applications/misc/rsclock/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1i93qkz6d8sbk78i4rvx099hnn4lklp4cjvanpm9ssv8na4rqvh2";
   };
    
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "03mhlp5hi3nlybb9dkwf1gxgsg056mjq2zsxnb5qh8pdxw7fmdxk";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/taizen/default.nix b/pkgs/applications/misc/taizen/default.nix
index 8d58c8887481..1eb4123a4cc0 100644
--- a/pkgs/applications/misc/taizen/default.nix
+++ b/pkgs/applications/misc/taizen/default.nix
@@ -14,6 +14,9 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security;
   nativeBuildInputs = [ pkgconfig ];
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0h8ybhb17pqhhfjcmq1l70kp8g1yyq38228lcf86byk3r2ar2rkg";
 
   meta = with lib; {
diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix
index 93f233a4f925..d4321e3b88e3 100644
--- a/pkgs/applications/misc/todiff/default.nix
+++ b/pkgs/applications/misc/todiff/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1y0v8nkaqb8kn61xwarpbyrq019gxx1f5f5p1hzw73nqxadc1rcm";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0xn5p71qk0ahd2drklja16xwv7zw0797kkzpiv563kffzvd1p8id";
 
   checkPhase = "cargo test --features=integration_tests";
diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix
index 178be4911693..be00070d2a50 100644
--- a/pkgs/applications/misc/zola/default.nix
+++ b/pkgs/applications/misc/zola/default.nix
@@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec {
   };
   cargoPatches = [ ./cargo-lock.patch ];
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "03rwf5l1l3ap03qi0xqcxsbyvpg3cqmr50j8ql6c5v55xl0ki9w8";
 
   nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix
index f4d6fce3545e..dd5deff294a0 100644
--- a/pkgs/applications/networking/cluster/click/default.nix
+++ b/pkgs/applications/networking/cluster/click/default.nix
@@ -13,6 +13,9 @@ buildRustPackage rec {
     sha256 = "18mpzvvww2g6y2d3m8wcfajzdshagihn59k03xvcknd5d8zxagl3";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0298x7wkr4j1l5flmv5vhl1ay8icvh4dlhsh4xi8fd3p8jl9jpqv";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix
index 9bf801ee93d7..31184bd68ff5 100644
--- a/pkgs/applications/networking/cluster/habitat/default.nix
+++ b/pkgs/applications/networking/cluster/habitat/default.nix
@@ -14,6 +14,9 @@ buildRustPackage rec {
     sha256 = "0pqrm85pd9hqn5fwqjbyyrrfh4k7q9mi9qy9hm8yigk5l8mw44y1";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1ahfm5agvabqqqgjsyjb95xxbc7mng1mdyclcakwp1m1qdkxx9p0";
 
   buildInputs = [ libsodium libarchive openssl ];
diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix
index 640421bef8f5..e5b3e1d52f43 100644
--- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix
+++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix
@@ -12,6 +12,9 @@ buildRustPackage rec {
     sha256 = "1mcdjykrgh0jq6k6y664lai8sbgzk6j7k0r944f43vg63d1jql5b";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1d7jpffkw2m2v37bfdqsl9sqwsl19cgglpa00lwy4ih09kzbc2n9";
 
   buildInputs = [ makeWrapper openssl ];
diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix
index e01e4c4fc44f..f567dabf5a66 100644
--- a/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix
@@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1bg2qjkzdawn4fnn0w7jhw1dk6191w8axnqra43z21pinfyim6da";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0q0iqd8y9rph8pwild5i2kv00h217a166c88hxpmbrigq9w960lp";
 
   postPatch = ''
diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix
index 052a626531b4..9e052c101ad3 100644
--- a/pkgs/applications/networking/instant-messengers/fractal/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix
@@ -35,6 +35,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0r98km3c8naj3mdr1wppzj823ir7jnsia7r3cbg3vsq8q52i480r";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1n9n4d057cz44sh1iy2hb2adplhnrhvr8drnp0v2h8yw73a5shvv";
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix
index 7967bdcc9c4e..4fbbbfd140fb 100644
--- a/pkgs/applications/networking/irc/tiny/default.nix
+++ b/pkgs/applications/networking/irc/tiny/default.nix
@@ -19,6 +19,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1m57xsrc7lzkrm8k1wh3yx3in5bhd0qjzygxdwr8lvigpsiy5caa";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1vj6whnx8gd5r66zric9163ddlqc4al4azj0dvhv5sq0r33871kv";
 
   RUSTC_BOOTSTRAP = 1;
diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix
index f3c7f8ccf18a..51ab54b10f92 100644
--- a/pkgs/applications/networking/p2p/synapse-bt/default.nix
+++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "01npv3zwia5d534zdwisd9xfng507adv4qkljf8z0zm0khqqn71a";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0m4jigz6la3mf4yq217849ilcncb7d97mqyw2qicff4rbscdgf6h";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix
index e9ef16b2392b..2ac7c208a5f1 100644
--- a/pkgs/applications/science/logic/elan/default.nix
+++ b/pkgs/applications/science/logic/elan/default.nix
@@ -4,6 +4,9 @@ rustPlatform.buildRustPackage rec {
   pname = "elan";
   version = "0.7.5";
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0q0xlvyyf88dbz43r7kk9v8rrp6hj0nl5i2i9mg6ibk2gphgdv6v";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix
index dad1d245b10a..4c759308a5c6 100644
--- a/pkgs/applications/science/misc/rink/default.nix
+++ b/pkgs/applications/science/misc/rink/default.nix
@@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec {
   };
   cargoPatches = [ ./cargo-lock.patch ];
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0q2g1hkqyzq9lsas4fhsbpk3jn5hikchh6i1jf9c08ca2xm136c2";
 
   buildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix
index df2ca22132e4..36ce0a484b3e 100644
--- a/pkgs/applications/version-management/git-and-tools/delta/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "01jiqizg1ywvrrwhqzfqzbaqrzyfaqm66sixas0mpyzmd6cdwmh6";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1zmk70hccrxn1gdr1bksnvh6sa2h4518s0ni8k2ihxi4ld1ch5p2";
 
   meta = with lib; {
diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix
index 169315d1e2ef..f07e05e23e2e 100644
--- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix
@@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1khplyglavsidh13nnq9y5rxd5w89ail08wgzn29a5m03zir1yfd";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
index 418cf2e5866f..635393b1deb0 100644
--- a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
@@ -10,6 +10,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0bzq4ridzb4l1zqrj1r0vlzkjpgfaqwky5jf49cwjhz4ybwrfpkq";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1k5gxbjv4a8l5y9rm0n4vwzlwp4hk1rb59v0wvcirmj0p7hpw9x9";
 
   meta = with lib; {
diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
index 77fc04281153..571125ee1134 100644
--- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
@@ -26,6 +26,9 @@ buildRustPackage rec {
     sha256 = "1sx6sc2dj3l61gbiqz8vfyhw5w4xjdyfzn1ixz0y8ipm579yc7a2";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "10852131aizfw9j1yl4gz180h4gd8y5ymx3wmf5v9cmqiqxy8bgy";
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix
index 618526843870..54f7e935ea33 100644
--- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "05wlng563p9iy0ky3z23a4jakcix887fb45r7j2mk0fp5ykdjmzh";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1s3v5p6qgz74sh34gvajf453fsgl13sds4v8hz8c6ivipz4hpby2";
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
index 99be85e09b1e..e50efb5c6b7d 100644
--- a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
@@ -13,6 +13,9 @@ buildRustPackage rec {
     sha256 = "0krz50pw9bkyzl78bvppk6skbpjp8ga7bd34jya4ha1xfmd8p89c";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1ccipxifnm38315qigaq28hlzam2wr8q2p2dbcq96kar6pq377vf";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix
index 7635a96eca5e..1e343cdb1800 100644
--- a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "10z3di2qypgsmg2z7xfs9nlrf9vng5i7l8dvqadv1l4lb9zz7i8q";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "002kr52vlpv1rhnxki29xflpmgk6bszrw0dsxcc34kyal0593ajk";
 
   buildInputs = [ ncurses5 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
diff --git a/pkgs/applications/version-management/git-backup/default.nix b/pkgs/applications/version-management/git-backup/default.nix
index 9d05fb830313..51ae994b43bb 100644
--- a/pkgs/applications/version-management/git-backup/default.nix
+++ b/pkgs/applications/version-management/git-backup/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0h31j8clvk4gkw4mgva9p0ypf26zhf7f0y564fdmzyw6rsz9wzcj";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1vfyhfdy5ks9zs9sy61ck9459w86hn9v6jqcar7rib82bclzr1mx";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index 32222c12c7cc..c2df8c971b0e 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -45,6 +45,9 @@ in rustPlatform.buildRustPackage rec {
 
   doCheck = false;
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1w77s5q18yr1gqqif15wmrfdvv2chq8rq3w4dnmxg2gn0r7bmz2k";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix
index a225c23ceebc..0a1f4c72da6f 100644
--- a/pkgs/applications/version-management/sit/default.nix
+++ b/pkgs/applications/version-management/sit/default.nix
@@ -20,6 +20,9 @@ rustPlatform.buildRustPackage rec {
     export HOME=$(mktemp -d)
   '';
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0kijx7s7zh6yisrsjz213h9x5jx43ixr44vy5rb3wwbn9dgsr528";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix
index 698f6df0673a..c5bbab39643f 100644
--- a/pkgs/applications/virtualization/cntr/default.nix
+++ b/pkgs/applications/virtualization/cntr/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0dhfz7aj3cqi974ybf0axchih40rzrs9m8bxhwz1hgig57aisfc0";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0xkwza9fx61pvlsm0s3dxc9i09mqp6c9df8w63fyiq7174vjxryx";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix
index 5035b65f9818..091ea0fa1c54 100644
--- a/pkgs/applications/virtualization/crosvm/default.nix
+++ b/pkgs/applications/virtualization/crosvm/default.nix
@@ -53,6 +53,9 @@ in
       ./default-seccomp-policy-dir.diff
     ];
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
     cargoSha256 = "1d7y07wkliy5qnlyx5zj6ni39avhs3s48sqgvwxm5g5zrahg2a85";
 
     nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/virtualization/railcar/default.nix b/pkgs/applications/virtualization/railcar/default.nix
index bce254061421..8dd3c270b23d 100644
--- a/pkgs/applications/virtualization/railcar/default.nix
+++ b/pkgs/applications/virtualization/railcar/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "09zn160qxd7760ii6rs5nhr00qmaz49x1plclscznxh9hinyjyh9";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1k4y37x783fsd8li17k56vlx5ziwmrz167a0w5mcb9sgyd2kc19a";
 
   buildInputs = [ libseccomp ];
diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix
index ecd792f74e78..9507ada40114 100644
--- a/pkgs/applications/window-managers/dwm/dwm-status.nix
+++ b/pkgs/applications/window-managers/dwm/dwm-status.nix
@@ -21,6 +21,9 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ makeWrapper pkgconfig ];
   buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ];
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0l6x59bzzilc78gsi5rlgq9zjvp8qjphfsds776ljzmkbdq8q4iz";
 
   postInstall = lib.optionalString (bins != [])  ''
diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix
index 208764c0adcb..1899be9a038a 100644
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0va6ny1v7lk30hhx4i5qyk9fwg3apy2nmh6kbmxhcf0rs5449ikg";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "099hn0pm9ppply3m3dwns3f5p43rdag2d3niaj8jyc1mnavviwjv";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix
index b0012c587f6a..677108e2163c 100644
--- a/pkgs/applications/window-managers/i3/wmfocus.nix
+++ b/pkgs/applications/window-managers/i3/wmfocus.nix
@@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0jx0h2zyghs3bp4sg8f3vk5rkyprz2dqfqs0v72vmkp3cvgzxbvs";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1xmc28ns59jcmnv17102s2084baxqdvi0ibbyqwb108385qnixzf";
 
   nativeBuildInputs = [ python3 pkgconfig ];
diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix
index 29e33bca9143..25a219c2be42 100644
--- a/pkgs/applications/window-managers/leftwm/default.nix
+++ b/pkgs/applications/window-managers/leftwm/default.nix
@@ -23,6 +23,9 @@ rustPlatform.buildRustPackage rec {
         wrapProgram $out/bin/leftwm-worker --prefix LD_LIBRARY_PATH : "${rpath}"
     '';
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
     cargoSha256 = "0mpvfix7bvc84vanha474l4gaq97ac1zy5l77z83m9jg0246yxd6";
 
     # patch wrong version in Cargo.lock
diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix
index 36ca00b776bb..febe16dd349f 100644
--- a/pkgs/applications/window-managers/wtftw/default.nix
+++ b/pkgs/applications/window-managers/wtftw/default.nix
@@ -9,6 +9,9 @@ rustPlatform.buildRustPackage {
     sha256 = "1r74nhcwiy2rmifzjhdal3jcqz4jz48nfvhdyw4gasa6nxp3msdl";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "18lb24k71sndklbwwhbv8jglj2d4y9mdk07l60wsvn5m2jbnpckk";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index ac0a8d3ae464..da4d69e1c9ed 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -17,7 +17,7 @@
   # Please set to true on any Rust package updates. Once all packages set this
   # to true, we will delete and make it the default. For details, see the Rust
   # section on the manual and ./README.md.
-, legacyCargoFetcher ? true
+, legacyCargoFetcher ? false
 , buildType ? "release"
 , meta ? {}
 , target ? null
diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix
index beef0ce03d91..0af8a6cd42dd 100644
--- a/pkgs/development/compilers/gleam/default.nix
+++ b/pkgs/development/compilers/gleam/default.nix
@@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0zfdsnrnxplvi4f92l7sqdp5yk5p738ra64m41izlcilkwj1j3vp";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix
index 168b012efcc1..6aa7897c95b8 100644
--- a/pkgs/development/interpreters/evcxr/default.nix
+++ b/pkgs/development/interpreters/evcxr/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0vkcis06gwsqfwvrl8xcf74mfcs6j77b9fhcz5rrh77mwl7ixsdc";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "04wffj2y9pqyk0x3y6ghp06pggmxnk2h245iabqq0mpwx36fd8b6";
 
   nativeBuildInputs = [ pkgconfig makeWrapper cmake ];
diff --git a/pkgs/development/interpreters/wasm-gc/default.nix b/pkgs/development/interpreters/wasm-gc/default.nix
index 44ac11be5400..585a90c505bb 100644
--- a/pkgs/development/interpreters/wasm-gc/default.nix
+++ b/pkgs/development/interpreters/wasm-gc/default.nix
@@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {
 
   cargoPatches = [ ./fix-build.patch ]; # Cargo.lock is not up-to-date
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "073dnn80sl4adh7vi6q9sx2vkmy27gxy7ysxz17iz12p7pfcagm2";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix
index 7c270e5fb447..5fb60fd9bdb6 100644
--- a/pkgs/development/interpreters/wasmer/default.nix
+++ b/pkgs/development/interpreters/wasmer/default.nix
@@ -18,6 +18,9 @@ rustPlatform.buildRustPackage rec {
     fetchSubmodules = true;
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1yp7kandh5hh8hkzlmqpj05vwgr5v4nil8blf3scbppg865qk3rq";
 
   nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix
index c978f023936b..08d583c54b43 100644
--- a/pkgs/development/interpreters/wasmtime/default.nix
+++ b/pkgs/development/interpreters/wasmtime/default.nix
@@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec {
     fetchSubmodules = true;
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "08b3rbnl7qwyfbwaqcb7z84sh0h94v18v6557hrf0dlil414v54i";
 
   cargoPatches = [ ./cargo-lock.patch ];
diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix
index 557d6f176097..78a89baeafbb 100644
--- a/pkgs/development/misc/loc/default.nix
+++ b/pkgs/development/misc/loc/default.nix
@@ -13,6 +13,9 @@ buildRustPackage rec {
     sha256 = "0086asrx48qlmc484pjz5r5znli85q6qgpfbd81gjlzylj7f57gg";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "06iqzpg5jz1xd2amajvlf7yaz9kr3q2ipbhx71whvv9mwplmxmbi";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/analysis/bingrep/default.nix b/pkgs/development/tools/analysis/bingrep/default.nix
index 2367e197f849..b2d3a46e621a 100644
--- a/pkgs/development/tools/analysis/bingrep/default.nix
+++ b/pkgs/development/tools/analysis/bingrep/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1xig3lrw0jdaxibzirqnm50l8nj4si9pa9w0jypmyhf1lr6yzd0g";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1fsp1ycfswrzldwnjw5cdwi809fd37pwshvrpf7sp0wmzx2bqhgm";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix
index 250002a16b76..87512355b851 100644
--- a/pkgs/development/tools/analysis/panopticon/default.nix
+++ b/pkgs/development/tools/analysis/panopticon/default.nix
@@ -24,6 +24,9 @@ rustPlatform.buildRustPackage rec {
      git
   ];
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1fsxd7yzb38h1d52yyz7kj1v0riycjydb1b1bn1zkhgwm5sm2kbs";
   doCheck = false;
 
diff --git a/pkgs/development/tools/async/default.nix b/pkgs/development/tools/async/default.nix
index 1b06d8e1adcc..65c1a0fa78d0 100644
--- a/pkgs/development/tools/async/default.nix
+++ b/pkgs/development/tools/async/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "19ypflbayi5l0mb8yw7w0a4bq9a3w8nl9jsxapp9m3xggzmsvrxx";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1qf52xsd15rj8y9w65zyab7akvzry76k1d4gxvxlz7ph3sl7jl3y";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/cargo-flamegraph/default.nix b/pkgs/development/tools/cargo-flamegraph/default.nix
index 9d25d7cf3542..836e3adebe30 100644
--- a/pkgs/development/tools/cargo-flamegraph/default.nix
+++ b/pkgs/development/tools/cargo-flamegraph/default.nix
@@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1avjq36wnm0gd5zkkv1c8hj8j51ah1prlifadjhpaf788rsng9w1";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1kmxpzgv24hf66gzyapxy48gzwqi0p0jvzv829sfdlp00qgj1kp4";
 
   nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/cargo-web/default.nix
index 7ed75d3f6e69..7e84baba0dda 100644
--- a/pkgs/development/tools/cargo-web/default.nix
+++ b/pkgs/development/tools/cargo-web/default.nix
@@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1dl5brj5fnmxmwl130v36lvy4j64igdpdvjwmxw3jgg2c6r6b7cd";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1cbyy9rc33f69hbs0ff00v0v3p92f3lqq8ma5aqid5dm6d8l2dx5";
 
   nativeBuildInputs = [ openssl perl pkgconfig ];
diff --git a/pkgs/development/tools/chit/default.nix b/pkgs/development/tools/chit/default.nix
index e939ddb1334e..965f12002354 100644
--- a/pkgs/development/tools/chit/default.nix
+++ b/pkgs/development/tools/chit/default.nix
@@ -15,6 +15,9 @@ buildRustPackage rec {
     sha256 = "0iixczy3cad44j2d7zzj8f3lnmp4jwnb0snmwfgiq3vj9wrn28pz";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0k6z69a09ps55w2rdgnf92yscw6rlbcpb4q9yf3rsav15pgpqvw8";
 
   nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkgconfig ];
diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix
index 12289cbb68aa..696a0264767c 100644
--- a/pkgs/development/tools/clog-cli/default.nix
+++ b/pkgs/development/tools/clog-cli/default.nix
@@ -13,6 +13,9 @@ buildRustPackage rec {
     sha256 = "1wxglc4n1dar5qphhj5pab7ps34cjr7jy611fwn72lz0f6c7jp3z";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1i1aq7bwkx8sqrlpxq24ldh908j72lwi2r3sg9zaz5p8xq1xgq6p";
 
   meta = {
diff --git a/pkgs/development/tools/cloudflare-wrangler/default.nix b/pkgs/development/tools/cloudflare-wrangler/default.nix
index efca438ada36..372de27ec59a 100644
--- a/pkgs/development/tools/cloudflare-wrangler/default.nix
+++ b/pkgs/development/tools/cloudflare-wrangler/default.nix
@@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1agl1cg34iklvniygrkq8dqsampvg17d3nsm0dcr6c3n5rj09gbi";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0c2g6yghwqjy21yfdcri4v9aqizd06ww3zx2snns51gnqqk8r57k";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix
index 0fdd026d875f..d2888dc616a6 100644
--- a/pkgs/development/tools/diesel-cli/default.nix
+++ b/pkgs/development/tools/diesel-cli/default.nix
@@ -37,6 +37,9 @@ rustPlatform.buildRustPackage rec {
 
   cargoBuildFlags = [ "--no-default-features --features \"${features}\"" ];
   cargoPatches = [ ./cargo-lock.patch ];
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0xlcskddhy7xsiwj54gmn1xlgkfxb4dwrys7rbamfz1h8aa6ixjx";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix
index 9f0de971d1bd..1120d5dc68da 100644
--- a/pkgs/development/tools/geckodriver/default.nix
+++ b/pkgs/development/tools/geckodriver/default.nix
@@ -21,6 +21,9 @@ rustPlatform.buildRustPackage {
   });
 
   cargoPatches = [ ./cargo-lock.patch ];
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "07w5lmvm5w6id0qikcs968n0c69bb6fav63l66bskxcjva67d6dy";
 
   buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
diff --git a/pkgs/development/tools/gir/default.nix b/pkgs/development/tools/gir/default.nix
index b8dbda2a1f82..90acfce1ecb1 100644
--- a/pkgs/development/tools/gir/default.nix
+++ b/pkgs/development/tools/gir/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1kn5kgdma9j6dwpmv6jmydak7ajlgdkw9sfkh3q7h8c2a8yikvxr";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1ybd9h2f13fxmnkzbacd39rcyzjcjd2ra52y8kncg1s0dc0m8rjb";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix
index 0a7c9e7ebe13..e94f1f1e14ac 100644
--- a/pkgs/development/tools/git-series/default.nix
+++ b/pkgs/development/tools/git-series/default.nix
@@ -15,6 +15,9 @@ buildRustPackage rec {
     sha256 = "07mgq5h6r1gf3jflbv2khcz32bdazw7z1s8xcsafdarnm13ps014";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "16qjbvppc01yxk8x9jk7gs8jaag5nkfl30j3lyv3dc27vv9mckjv";
 
   cargoPatches = [
diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix
index 7628bd9558ac..20f854619467 100644
--- a/pkgs/development/tools/just/default.nix
+++ b/pkgs/development/tools/just/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0a4bml9nxvyh110a60l4lc11yr2ds5r8d3iplslccrkq1ka96av9";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0dbgjc21q0zaadsjvq3s6y6f4dmsybxb6g2sg8w2d3phkm9j921z";
 
   checkInputs = [ coreutils bash dash ];
diff --git a/pkgs/development/tools/misc/hydra-cli/default.nix b/pkgs/development/tools/misc/hydra-cli/default.nix
index 79ef81d09e1c..796fcbafd69b 100644
--- a/pkgs/development/tools/misc/hydra-cli/default.nix
+++ b/pkgs/development/tools/misc/hydra-cli/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1jdlmc45hwblcxs6hvy3gi2dr7qyzs1sg5zr26jrpxrbvqqzrdhc";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "11y82np52f7lgfzhzs24kkawcfzzc6070x4rj5d6iv5csf6c03ny";
 
   buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix
index 16a3f9557d28..fd3c8ec1ec8f 100644
--- a/pkgs/development/tools/misc/sccache/default.nix
+++ b/pkgs/development/tools/misc/sccache/default.nix
@@ -10,6 +10,9 @@ rustPlatform.buildRustPackage rec {
     rev = version;
     sha256 = "1yd3rfp032crwlmfn2p3z12f67q7bxm78fhvdlc7azm2a4hkif4k";
   };
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1bkglgrasyjyzjj9mwm32d3g3mg5yv74jj3zl7jf20dlq3rg3fh6";
 
   cargoBuildFlags = [ "--features=all" ];
diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix
index 748ec8e2b68b..d98a4018867f 100644
--- a/pkgs/development/tools/misc/texlab/default.nix
+++ b/pkgs/development/tools/misc/texlab/default.nix
@@ -15,6 +15,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "12zfcvbihirh38xxzc8fbx293m4vsrhq6kh0qnhnhlrx75m09l9i";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "11labj3zf7ahbly1ylwliqhxzydbxz9w8z991575daj7a2nbw1q0";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix
index 96eb98bbbeff..5db4ec125c09 100644
--- a/pkgs/development/tools/misc/tokei/default.nix
+++ b/pkgs/development/tools/misc/tokei/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0wndjb4rvj8548wz0svwgnk94qlg5w2fv75fn2jgriq6fh6v43yg";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1lpa4xfh3bcm51amwxvkzpvmi4b2c4q5qwxxigcbzw76l7rqp2w9";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [
diff --git a/pkgs/development/tools/misc/wishbone-tool/default.nix b/pkgs/development/tools/misc/wishbone-tool/default.nix
index 6b2c944f7016..10de4a8157a6 100644
--- a/pkgs/development/tools/misc/wishbone-tool/default.nix
+++ b/pkgs/development/tools/misc/wishbone-tool/default.nix
@@ -12,6 +12,9 @@ rustPlatform.buildRustPackage {
   pname = "wishbone-tool";
   inherit version;
   src = "${src}/wishbone-tool";
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0pj8kf6s1c666p4kc6q1hlvaqm0lm9aqnsx5r034g1y8sxnnyri2";
   buildInputs = [ libusb ];
 
diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/development/tools/parinfer-rust/default.nix
index 0d7c806d2f46..47e7ab254817 100644
--- a/pkgs/development/tools/parinfer-rust/default.nix
+++ b/pkgs/development/tools/parinfer-rust/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1k2kr1zlxx3w3kwb634kngzx8vl5iif1yr6zk2xh46gjwqb3223l";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0i5wy15w985nxwl4b6rzb06hchzjwph6ygzjkkmigm9diw9jcycn";
 
   buildInputs = [ llvmPackages.libclang llvmPackages.clang ];
diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index 989107a2fbef..2ef86070fccd 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -80,6 +80,9 @@ in rustPlatform.buildRustPackage {
   };
 
   inherit cargoSha256;
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
 
   meta = {
     homepage = "https://github.com/tree-sitter/tree-sitter";
diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix
index f1bda9997ac6..f2fff99d1532 100644
--- a/pkgs/development/tools/pax-rs/default.nix
+++ b/pkgs/development/tools/pax-rs/default.nix
@@ -36,5 +36,8 @@ buildRustPackage rec {
       cp ${cargo-lock} $out/Cargo.lock
     '';
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "132a9vnlyp78zxiw5xrazadvx0scs7h2vbm5wz612dmh436mwnxg";
 }
diff --git a/pkgs/development/tools/rnix-lsp/default.nix b/pkgs/development/tools/rnix-lsp/default.nix
index 37a1955ce8b2..0cb402425046 100644
--- a/pkgs/development/tools/rnix-lsp/default.nix
+++ b/pkgs/development/tools/rnix-lsp/default.nix
@@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0fy620c34kxl27sd62x9mj0555bcdmnmbsxavmyiwb497z1m9wnn";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1wm5m7b6zr6wg1k59rmqis1zp9i2990p7y0ml852hxv34an7pp5d";
 
   meta = with lib; {
diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix
index 78a8c7470df2..7394d7a645a6 100644
--- a/pkgs/development/tools/rq/default.nix
+++ b/pkgs/development/tools/rq/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0km9d751jr6c5qy4af6ks7nv3xfn13iqi03wq59a1c73rnf0zinp";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0z971fpyj4v5hjp6q4yxgxv069h9idkpkcixb14gxi7kpiswprvz";
 
   buildInputs = [ llvmPackages.clang-unwrapped v8 ];
diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index 29f6fe5bd42d..db1ad9f0ea9d 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -14,6 +14,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0zxqryqks9in9q7az0lrw8fq9wnc5p4yf6b1fxnzy2j6qhlw2c5c";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1wy5xdkf9ql2l9qavi0fh7hwjvly108f4l2m1k947412fyjwr7x7";
 
   libclang = llvmPackages.libclang.lib; #for substituteAll
diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix
index 17103bae50a6..af9f2fa82ffc 100644
--- a/pkgs/development/tools/rust/cargo-asm/default.nix
+++ b/pkgs/development/tools/rust/cargo-asm/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0zn5p95hsmhvk2slc9hakrpvim6l4zbpgkks2x64ndwyfmzyykws";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1k9mc29y4487ssf5whvr8xig7j4jh0rpcrhclp6siw8xamygijdm";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/development/tools/rust/cargo-bloat/default.nix
index 61d2c327d9bb..7e1dffc59760 100644
--- a/pkgs/development/tools/rust/cargo-bloat/default.nix
+++ b/pkgs/development/tools/rust/cargo-bloat/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0h535fnmwm1ix08a3ifasppqcm7z4fiwf6kn32vhqqpn7x9vvl53";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1jc1lx0yk8galkyc4a67d39ywsfrgc2sjjsz08p47gpz7228d64w";
 
   meta = with lib; {
diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix
index 60d0c3504c87..03e052043314 100644
--- a/pkgs/development/tools/rust/cargo-crev/default.nix
+++ b/pkgs/development/tools/rust/cargo-crev/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1v7m2yy54jm5mkg9n3wnba1j5ldw6mvk2sgbngx1q240wnc9vbnk";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "09kcvrhklbzjjyqikj9c53w24qy3f6v5hb16ib4fq1s2ia77rgl2";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix
index cec7a509dc12..5a4e6bb60521 100644
--- a/pkgs/development/tools/rust/cargo-expand/default.nix
+++ b/pkgs/development/tools/rust/cargo-expand/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "043adbvc1slswwygibgghfl2ryry3ja1x3zjz39qqv63f81pd5id";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1dasyyy2nkr4i5nhlzlwij3b972h2a43j94kvlbc9kvnnb44aymn";
 
   buildInputs = [ llvmPackages.libclang ]
diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix
index c5b45b92c812..c61c7306b8c3 100644
--- a/pkgs/development/tools/rust/cargo-fuzz/default.nix
+++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0qy4xb7bxyw2x2ya7zmbkz48wxb69jcnvvj7021f1kyc6wdwcxs7";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1d42cmpg1yn1ql9isx26kxsxzf5rg6qw6j948skc5p054r0c9n3f";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix
index 4437f6fb5a08..59e4402627cf 100644
--- a/pkgs/development/tools/rust/cargo-geiger/default.nix
+++ b/pkgs/development/tools/rust/cargo-geiger/default.nix
@@ -15,6 +15,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0kvmjahyx5dcjhry2hkvcshi0lbgipfj0as74a3h3bllfvdfkkg0";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0aykhhxk416p237safmqh5dhwjgrhvgc6zikkmxi9rq567ypp914";
   cargoPatches = [ ./cargo-lock.patch ];
 
diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix
index c49739165aa1..3fed52a2fafe 100644
--- a/pkgs/development/tools/rust/cargo-generate/default.nix
+++ b/pkgs/development/tools/rust/cargo-generate/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "07hklya22ixklb44f3qp6yyh5d03a7rjcn0g76icqr36hvcjyjjh";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1rsk9j1ij53dz4gakxwdppgmv12lmyj0ihh9qypdbgskvyq3a2j9";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/tools/rust/cargo-inspect/default.nix b/pkgs/development/tools/rust/cargo-inspect/default.nix
index 79b1214de659..ccd9fd3e4879 100644
--- a/pkgs/development/tools/rust/cargo-inspect/default.nix
+++ b/pkgs/development/tools/rust/cargo-inspect/default.nix
@@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1pxvcf991w0jfxdissvwal5slrx7vpk3rqkzwk4hxfv0mjiqxsg5";
 
   meta = with lib; {
diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix
index 34bcb42a4790..a622a822cfa1 100644
--- a/pkgs/development/tools/rust/cargo-make/default.nix
+++ b/pkgs/development/tools/rust/cargo-make/default.nix
@@ -24,6 +24,9 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "02bx8nz8kkr0l8m1b8nfc9576qx9is6s72x4ji3bzwimy76jvx3j";
 
   # Some tests fail because they need network access.
diff --git a/pkgs/development/tools/rust/cargo-raze/default.nix b/pkgs/development/tools/rust/cargo-raze/default.nix
index 142edbdaf113..48579e431064 100644
--- a/pkgs/development/tools/rust/cargo-raze/default.nix
+++ b/pkgs/development/tools/rust/cargo-raze/default.nix
@@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {
   };
   sourceRoot = "source/impl";
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "06rl7v0f1lgj9ii07fcnaxmhn28ckr03cpf5b93q8ripm5qh7my9";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/pkgs/development/tools/rust/cargo-sweep/default.nix
index 8707cd593fda..0b51b5b4f508 100644
--- a/pkgs/development/tools/rust/cargo-sweep/default.nix
+++ b/pkgs/development/tools/rust/cargo-sweep/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0zwdrh4z5x79qs8cwmwh3phzy4brw0ggv2qyf6pylv99vha5acyf";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "09n0s275iskvg0n3gxbl47qfw00wfpvxyrf2iakkznyxjgbaxh4l";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix
index d05b7dd92218..54008300c512 100644
--- a/pkgs/development/tools/rust/cargo-udeps/default.nix
+++ b/pkgs/development/tools/rust/cargo-udeps/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1wh8w5p9rb9cqgpmclaywfsz3ckfi9mw38hhg31w7hkgjmqalyj9";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0vb2qr03qv66mmxgs1d5fvs63cdfxaldlg7pilhmdzha1kgy7ib0";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix
index 55721df22d7f..d0b20ffe3b25 100644
--- a/pkgs/development/tools/rust/cargo-watch/default.nix
+++ b/pkgs/development/tools/rust/cargo-watch/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0l1aalb8ans7scljrza7akhi821jbpqgn6sa8kgd8sys83r93fkj";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0dlbln8nsvmrc9p99bl6yni57fravicias9gbv88fg7az904ilzz";
 
   buildInputs = lib.optional stdenv.isDarwin CoreServices;
diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/development/tools/rust/cargo-xbuild/default.nix
index 11ee7b584df4..1877ac6e1223 100644
--- a/pkgs/development/tools/rust/cargo-xbuild/default.nix
+++ b/pkgs/development/tools/rust/cargo-xbuild/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1haq8gv4k6qgihyjplf76589d2hbb1720g6yvwk88aksjxmqj4jm";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "011r5n68ay94dvfm37xpd9s8x086l6qsll74iw98hcvw3inxp1ws";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix
index 0cb2eb602069..b97c9af088fd 100644
--- a/pkgs/development/tools/rust/cbindgen/default.nix
+++ b/pkgs/development/tools/rust/cbindgen/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1x21g66gri6z9bnnfn7zmnf2lwdf5ing76pcmw0ilx4nzpvfhkg0";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "13fb8cdg6r0g5jb3vaznvv5aaywrnsl2yp00h4k8028vl8jwwr79";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix
index 98a2b0b7e0bd..cb8d13b47d91 100644
--- a/pkgs/development/tools/rust/maturin/default.nix
+++ b/pkgs/development/tools/rust/maturin/default.nix
@@ -14,6 +14,9 @@ in rustPlatform.buildRustPackage rec {
     sha256 = "1siqd8k6grlbj9n1a75jq8px1pzvzpr2ph689g53rjngf1k44zqk";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "18678qzrzj044aj5nvyjn5hvby0i0x23gx26nhcf1nqcjn3fr32l";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index 6dcaba237ae9..8839464e9f66 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0svvdkfqpk2rw0wxyrhkxy553k55lg7jxc0ly4w1195iwv14ad3y";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1qxg9r6wpv811fh2l889jm0ya96gsra00kqpyxh41fb7myvl2a4i";
 
   buildInputs = [ makeWrapper ]
diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix
index 9457a08556af..c9b89abb0b07 100644
--- a/pkgs/development/tools/rust/racerd/default.nix
+++ b/pkgs/development/tools/rust/racerd/default.nix
@@ -17,6 +17,9 @@ buildRustPackage rec {
 
   doCheck = false;
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "07130587drrdkrk7aqb8pl8i3p485qr6xh1m86630ydlnb9z6s6i";
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/development/tools/rust/rainicorn/default.nix b/pkgs/development/tools/rust/rainicorn/default.nix
index 8a87bf5cf4df..94ee2a773f26 100644
--- a/pkgs/development/tools/rust/rainicorn/default.nix
+++ b/pkgs/development/tools/rust/rainicorn/default.nix
@@ -13,6 +13,9 @@ buildRustPackage rec {
     sha256 = "07vh4g120sx569wkzclq91blkkd7q7z582pl8vz0li1l9ij8md01";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "07zsj12g4ff0cdb9pwz302vxvajr8g6nl3bpz4vdyi84csfvmahz";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix
index ffae05f1c744..b9a417e3b665 100644
--- a/pkgs/development/tools/rust/rustup/default.nix
+++ b/pkgs/development/tools/rust/rustup/default.nix
@@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0d7l3j8js16zgdx37kykavr343v65vchldz88j38jjyc43pcm2pg";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0kn3sq99sgsh8msignyb4vjllv0wf1crqaw7sqp3ggmlkrdq35sd";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix
index 32cc66f76e92..fa457477b581 100644
--- a/pkgs/development/tools/rust/svd2rust/default.nix
+++ b/pkgs/development/tools/rust/svd2rust/default.nix
@@ -14,6 +14,9 @@ buildRustPackage rec {
   };
   cargoPatches = [ ./cargo-lock.patch ];
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "03rfb8swxbcc9qm4mhxz5nm4b1gw7g7389wrdc91abxl4mw733ac";
 
   # doc tests fail due to missing dependency
diff --git a/pkgs/development/tools/scaff/default.nix b/pkgs/development/tools/scaff/default.nix
index d2f3733fbc5c..034376d337ce 100644
--- a/pkgs/development/tools/scaff/default.nix
+++ b/pkgs/development/tools/scaff/default.nix
@@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1s5v50205l2h33pccyafrjv3a6lpb62inhm8z81hkvx53bqifvd7";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "17rnzwlgrpr6isbajaccxa83msvvskxyqrc4cirgjmc7aqa0ilbh";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix
index e949da2cf7e8..9e83aae8a05c 100644
--- a/pkgs/development/tools/wasm-bindgen-cli/default.nix
+++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix
@@ -14,6 +14,9 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ];
   nativeBuildInputs = [ pkgconfig ];
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1kkvgqvn08pv0654b7s40vs92myzfiv965561mwfzhj8fx8f1y18";
   cargoPatches = [ ./0001-Add-cargo.lock.patch ];
   cargoBuildFlags = [ "-p" pname ];
diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix
index d8bdd3a4f72c..e91a08303947 100644
--- a/pkgs/development/tools/wasm-pack/default.nix
+++ b/pkgs/development/tools/wasm-pack/default.nix
@@ -18,6 +18,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1rqyfg6ajxxyfx87ar25nf5ck9hd0p12qgv98dicniqag8l4rvsr";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "095gk6lcck5864wjhrkhgnkxn9pzcg82xk5p94br7lmf15y9gc7j";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/games/eidolon/default.nix b/pkgs/games/eidolon/default.nix
index ab3d9647dc85..f6bc271ec02b 100644
--- a/pkgs/games/eidolon/default.nix
+++ b/pkgs/games/eidolon/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
   };
   cargoPatches = [ ./cargo-lock.patch ];
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1887fjkk641cn6dpmyc5r3r2li61yw1nvfb0f2dp3169gycka15h";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix
index fa0720e51fd9..a08ce593012c 100644
--- a/pkgs/games/ja2-stracciatella/default.nix
+++ b/pkgs/games/ja2-stracciatella/default.nix
@@ -22,6 +22,7 @@ let
     name = "libstracciatella-${version}";
     inherit version;
     src = libstracciatellaSrc;
+    legacyCargoFetcher = true;
     cargoSha256 = "0a1pc8wyvgmna0a5cbpv3mh0h4nzjxlm887ymcq00cy1ciq5nmj4";
     doCheck = false;
   };
diff --git a/pkgs/games/system-syzygy/default.nix b/pkgs/games/system-syzygy/default.nix
index ee47bd545066..34eb5315e749 100644
--- a/pkgs/games/system-syzygy/default.nix
+++ b/pkgs/games/system-syzygy/default.nix
@@ -23,6 +23,9 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ SDL2 ];
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "03724z33dqxbbrzpvz172qh45qrgnyb801algjdcm32v8xsx81qg";
 
   postInstall = ''
diff --git a/pkgs/misc/uq/default.nix b/pkgs/misc/uq/default.nix
index 9dcfae41ea82..3f3ba291dd74 100755
--- a/pkgs/misc/uq/default.nix
+++ b/pkgs/misc/uq/default.nix
@@ -14,6 +14,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1qqqmdk0v1d3ckasmmw5lbrkvhkv0nws4bzi9cfi1ndhrbvbkbxb";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1s22v2wz5h3l5l447zl54bhdk6avkk2ycrbbpxcx1442lllbss4w";
 
   meta = with lib; {
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 334df8e405ec..c115f9b1cd62 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -64,6 +64,9 @@ self: super: {
       name = "LanguageClient-neovim-bin";
       src = LanguageClient-neovim-src;
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
       cargoSha256 = "1w8g7pxwnjqp9zi47h4lz2mcg5daldsk5z72h8cjj750wng8a82c";
       buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
 
diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
index 7b92fc98e287..15802510da3c 100644
--- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "18khym7ygj29w98zf6i1l5c2pz84zla2z34l5jnh595xvwfl94pc";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1bi9nr1dhyv322pq6fjrhs12h3wdak53mvwkbyim1hmrp62vky4m";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix
index 7d91dc91a93e..906ee07f3556 100644
--- a/pkgs/servers/routinator/default.nix
+++ b/pkgs/servers/routinator/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1hbqvjv9h1aghpyrl03w5f4j8gjy6n9lx83rmpsh5p7yd9ahwmf9";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "08lizhag7aqz3a59gaapsymn7sf9c6im1aw64n0r9a5advhwdh18";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/unpfs/default.nix b/pkgs/servers/unpfs/default.nix
index df6cfb70438f..dc228c25915d 100644
--- a/pkgs/servers/unpfs/default.nix
+++ b/pkgs/servers/unpfs/default.nix
@@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "source/example/unpfs";
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1d33nwj3i333a6ji3r3037mgg553lc3wsawm0pz13kbvhjf336i8";
 
   RUSTC_BOOTSTRAP = 1;
diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/servers/webmetro/default.nix
index fc9876e10c25..4bf329fa5db1 100644
--- a/pkgs/servers/webmetro/default.nix
+++ b/pkgs/servers/webmetro/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1n2c7ygs8qsd5zgii6fqqcwg427bsij082bg4ijnzkq5630dx651";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "03ncwj9bn21590phcnqyclclcird7rikbhxbwhg8i9i0nad81aaa";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix
index 2010f34ef7e6..5886fdb5574d 100644
--- a/pkgs/shells/ion/default.nix
+++ b/pkgs/shells/ion/default.nix
@@ -13,6 +13,9 @@ buildRustPackage rec {
     sha256 = "0i0acl5nw254mw8dbfmb4792rr71is98a5wg32yylfnlrk7zlf8z";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1hs01b1rhbpafxlhw661k907rznqhcgyng85njkb99bg4lxwxaap";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index 00a27d1d7e37..6ed0857ec64d 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -24,6 +24,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0p1aykhkz5rixj6x0rskg77q31xw11mirvjhzp7n4nmbx3rfkagc";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0143mm9cdswd1azpzzpbfc5x7dy3ryywvq44mwkd6h1027n5idap";
 
   nativeBuildInputs = [ pkg-config ]
diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix
index 67c6a594db75..49ebe825053c 100644
--- a/pkgs/tools/X11/xidlehook/default.nix
+++ b/pkgs/tools/X11/xidlehook/default.nix
@@ -16,6 +16,9 @@ rustPlatform.buildRustPackage rec {
   };
 
   cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"];
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0jdkcxvlw7s8pz1ka3d2w97356a2axvlwfgyh2dz7nmfzpjx64x0";
 
   buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix
index f0945d7d778b..5f0e63341154 100644
--- a/pkgs/tools/admin/intecture/agent.nix
+++ b/pkgs/tools/admin/intecture/agent.nix
@@ -14,6 +14,9 @@ buildRustPackage rec {
     sha256 = "0j27qdgyxybaixggh7k57mpm6rifimn4z2vydk463msc8b3kgywj";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "093ipd8lg2ngnln55x5j40g2n8f3y8aysgz9rjn95a4npxrg4yxw";
 
   buildInputs = [ openssl zeromq czmq zlib ];
diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix
index a3208bddabe9..4807cd89aac3 100644
--- a/pkgs/tools/admin/intecture/auth.nix
+++ b/pkgs/tools/admin/intecture/auth.nix
@@ -14,6 +14,9 @@ buildRustPackage rec {
     sha256 = "0c7ar3pc7n59lzfy74lwz51p09s2bglc870rfr4c0vmc91jl0pj2";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1rnhhb4mpf1j7c7a2pz4741hzbf2s2wb0bm25j049n64j49j3jq8";
 
   buildInputs = [ openssl zeromq czmq zlib ];
diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix
index 90d65a3f2951..e5aa379e9c32 100644
--- a/pkgs/tools/admin/intecture/cli.nix
+++ b/pkgs/tools/admin/intecture/cli.nix
@@ -14,6 +14,9 @@ buildRustPackage rec {
     sha256 = "16a5fkpyqkf8w20k3ircc1d0qmif7nygkzxj6mzk9609dlb0dmxq";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0dhrx6njfbd8w27ifk13g6s3ick579bhc4ijf54rfb9g6n8abafx";
 
   buildInputs = [ openssl zeromq czmq zlib ];
diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix
index 3b1e471a61ab..51ff06817cb8 100644
--- a/pkgs/tools/admin/procs/default.nix
+++ b/pkgs/tools/admin/procs/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1dvwn991widribk563jn3461f1913bpga0yyfr5mnf4p4p8s59j6";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "11wv02nn6gp32zzcd6kmsh6ky0dzyk1qqhb5vxvmq2nxhxjlddwv";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix
index 29204417b224..bf4b2eb5351d 100644
--- a/pkgs/tools/backup/rdedup/default.nix
+++ b/pkgs/tools/backup/rdedup/default.nix
@@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0y34a3mpghdmcb2rx4z62q0s351bfmy1287d75mm07ryfgglgsd7";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "19j1xscchnckqq1nddx9nr9wxxv124ab40l4mdalqbkli4zd748j";
 
   patches = [
diff --git a/pkgs/tools/filesystems/btrfs-dedupe/default.nix b/pkgs/tools/filesystems/btrfs-dedupe/default.nix
index e2538387d450..40a58e4227f3 100644
--- a/pkgs/tools/filesystems/btrfs-dedupe/default.nix
+++ b/pkgs/tools/filesystems/btrfs-dedupe/default.nix
@@ -12,6 +12,9 @@ buildRustPackage rec {
     sha256 = "0qy1g4crhfgs2f5cmrsjv6qscg3r66gb8n6sxhimm9ksivhjyyjp";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1sz3fswb76rnk7x4kpl1rnj2yxbhpx6q8kv8xxiqdr7qyphpi98r";
 
   buildInputs = [ lzo zlib ];
diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix
index f5076801326c..d5656db29a7e 100644
--- a/pkgs/tools/graphics/gifski/default.nix
+++ b/pkgs/tools/graphics/gifski/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0dl5725imb2a2s0fskdqlnh2207ryyi2v5gz37cr5mf6khz898p2";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0wngsd0pmmxlwzxmyp8pvphh1ijs5s9k1mkkv688xpc4b8w0z10j";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix
index 0bbd7c21aa6e..1998ac67713c 100644
--- a/pkgs/tools/graphics/oxipng/default.nix
+++ b/pkgs/tools/graphics/oxipng/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1cx026g1gdvk4qmnrbsmg46y2lizx0wqny25hhdjnh9pwzjc77mh";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1213mg7xhv9ymgm0xqdai5wgammz9n07whw2d42m83208k94zss3";
 
   # https://crates.io/crates/cloudflare-zlib#arm-vs-nightly-rust
diff --git a/pkgs/tools/graphics/shotgun/default.nix b/pkgs/tools/graphics/shotgun/default.nix
index 1ab47dfce2de..f5dba34202e4 100644
--- a/pkgs/tools/graphics/shotgun/default.nix
+++ b/pkgs/tools/graphics/shotgun/default.nix
@@ -15,6 +15,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "tJnF1X+NI1hP0J/n3rGy8TD/yIveqRPVlJvJvn0C7Do=";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "TL2WehcCwygLMVVrBHOX1HgVtDhgVsIgUeiadEjCj1o=";
 
   meta = with lib; {
diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/tools/graphics/svgbob/default.nix
index 24736b8f0fff..68640d45bb21 100644
--- a/pkgs/tools/graphics/svgbob/default.nix
+++ b/pkgs/tools/graphics/svgbob/default.nix
@@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "source/svgbob_cli";
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0mnq1s809f394x83gjv9zljr07c94k48zkrwxs6ibi19shgmrnnd";
 
   # Test tries to build outdated examples
diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix
index 50aeae78fce8..e3cb3334b583 100644
--- a/pkgs/tools/graphics/svgcleaner/default.nix
+++ b/pkgs/tools/graphics/svgcleaner/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1jpnqsln37kkxz98vj7gly3c2170v6zamd876nc9nfl9vns41s0f";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0kzrklw5nrzgvrfzq1mlnri06s19p4f3w38v39247baz2xd6j1n2";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/graphics/viu/default.nix b/pkgs/tools/graphics/viu/default.nix
index 5de5b7e5be57..2ad33b8eef92 100644
--- a/pkgs/tools/graphics/viu/default.nix
+++ b/pkgs/tools/graphics/viu/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0p4ibvv0qrflqdc2bi9rjn7yhn01ncxrpqpxmh8cbq67rbvm7jnx";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1h9dm2hhld2079dnx4x5nzkn3ivk6g5ijhv49jxnc200mx4mr1s5";
 
   meta = with lib; {
diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix
index 6f5dc209b964..666fbd16a883 100644
--- a/pkgs/tools/misc/bat/default.nix
+++ b/pkgs/tools/misc/bat/default.nix
@@ -14,6 +14,9 @@ rustPlatform.buildRustPackage rec {
     fetchSubmodules = true;
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0d7h0kn41w6wm4w63vjy2i7r19jkansfvfjn7vgh2gqh5m60kal2";
 
   nativeBuildInputs = [ pkgconfig llvmPackages.libclang installShellFiles makeWrapper ];
diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix
index 7b1e5ed6c0af..e83d13249d2f 100644
--- a/pkgs/tools/misc/diskus/default.nix
+++ b/pkgs/tools/misc/diskus/default.nix
@@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "07wsl1vw2aimgmrlri03pfcxv13klqxyvmmsbzgnq9sc9qzzy8gp";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix
index 5ac8a661c9ac..3e5f12da0c39 100644
--- a/pkgs/tools/misc/dua/default.nix
+++ b/pkgs/tools/misc/dua/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "08zgi2yiynb20l1f9rhly4a7zgqnr7lq3cr5vkmh1jnfs6z27dv6";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0hd46h4wwh81hnida0in3142884y8n6ygk7qm09i5wj52g73bivv";
 
   meta = with lib; {
diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix
index caa8451585e7..c0aa9180aedb 100644
--- a/pkgs/tools/misc/dust/default.nix
+++ b/pkgs/tools/misc/dust/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1qbh9vgdh0xmh4c78fm0rd1sgb01n656p3cr4my7ymsy81ypx9y7";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "07ynz6y1z3rz84662d4rfl2sw1sx46a3k48z8dckr0b3fqs2zj6a";
 
   doCheck = false;
diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/tools/misc/eva/default.nix
index bf43d11e5666..c720361b9cd1 100644
--- a/pkgs/tools/misc/eva/default.nix
+++ b/pkgs/tools/misc/eva/default.nix
@@ -4,6 +4,9 @@ rustPlatform.buildRustPackage rec {
   pname = "eva";
   version = "0.2.7";
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0n3xvlmp4l925nbz8lx6dr9yrrfh6z7b9z8wd6sli3a1dq26d6bg";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix
index 0edd8a1b318f..cfb2c57f7c93 100644
--- a/pkgs/tools/misc/exa/default.nix
+++ b/pkgs/tools/misc/exa/default.nix
@@ -8,6 +8,9 @@ buildRustPackage rec {
   pname = "exa";
   version = "0.9.0";
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1hgjp23rjd90wyf0nq6d5akjxdfjlaps54dv23zgwjvkhw24fidf";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix
index 76661c77f7be..f012aa120eb8 100644
--- a/pkgs/tools/misc/fd/default.nix
+++ b/pkgs/tools/misc/fd/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "108p1p9bxhg4qzwfs6wqcakcvlpqw3w498jkz1vhmg6jp1mbmgdr";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0ylanxcb1vrhvm9h3lvq8nh28362wi5hjy0pqdv5lh40pphcknnz";
 
   preFixup = ''
diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix
index bb10bfe2ec76..6637f2d2a4ae 100644
--- a/pkgs/tools/misc/ffsend/default.nix
+++ b/pkgs/tools/misc/ffsend/default.nix
@@ -25,6 +25,9 @@ buildRustPackage rec {
     sha256 = "0yqigqh5vldzmp7wc1mxi5a4bxzm81xycx5h0ghak74vbjibps49";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1wwdnm6a5g4gpd1f89qii8v4f6mcfc1bif1v6mdlcbrpwax5skh4";
 
   nativeBuildInputs = [ cmake pkgconfig installShellFiles ];
diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix
index 0685ecf2440a..5c2e5e3da2d4 100644
--- a/pkgs/tools/misc/fselect/default.nix
+++ b/pkgs/tools/misc/fselect/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1zccl60l557lhaaqb33myys4vp3jsnjqh3dxb22i46bff28s1w6c";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1496zjrkwj5bv08k575m064x0hfk0gpci0dmxvvspj6jf8f8bfm6";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix
index bf6740d7ee4a..d7944e55d325 100644
--- a/pkgs/tools/misc/heatseeker/default.nix
+++ b/pkgs/tools/misc/heatseeker/default.nix
@@ -13,6 +13,9 @@ buildRustPackage rec {
     sha256 = "1fcrbjwnhcz71i70ppy0rcgk5crwwmbkm9nrk1kapvks33pv0az7";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0m3sxbz1iii31s30cnv1970i1mwfhl6gm19k8wv0n7zji30ayx07";
 
   # some tests require a tty, this variable turns them off for Travis CI,
diff --git a/pkgs/tools/misc/hexyl/default.nix b/pkgs/tools/misc/hexyl/default.nix
index c00e47433c1a..b3cc549e018b 100644
--- a/pkgs/tools/misc/hexyl/default.nix
+++ b/pkgs/tools/misc/hexyl/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1n2q5a6697bxvl0askywhad2x560cajv456gxihdqqmmyq2vf63h";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1wcpbqlglf9r0xhfjmyym8bnd4pgrsf9lrmb14hn1ml5zlshpd7p";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix
index 9a27c4df7721..1dab11ec27e0 100644
--- a/pkgs/tools/misc/hyperfine/default.nix
+++ b/pkgs/tools/misc/hyperfine/default.nix
@@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0jx2lqhayp14c51dfvgmqrmmadyvxf0p4dsn770ndqpzv66rh6zb";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0sqmqfig40ragjx3jvwrng6hqz8l1zbmxzq470lk66x0gy4gziag";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/tools/misc/journaldriver/default.nix
index 56a1dc75a455..be199f7eb0af 100644
--- a/pkgs/tools/misc/journaldriver/default.nix
+++ b/pkgs/tools/misc/journaldriver/default.nix
@@ -3,6 +3,9 @@
 rustPlatform.buildRustPackage rec {
   pname = "journaldriver";
   version     = "1.1.0";
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0wmr0r54ar7gvhvhv76a49ap74lx8hl79bf73vc4f4xlj7hj303g";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/misc/kak-lsp/default.nix b/pkgs/tools/misc/kak-lsp/default.nix
index e3551b8f404f..55a3cf409eb1 100644
--- a/pkgs/tools/misc/kak-lsp/default.nix
+++ b/pkgs/tools/misc/kak-lsp/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1b9v417g0z9q1sqgnms5vy740xggg4fcz0fdwbc4hfvfj6jkyaad";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0kzrrphlilnyl79yfmlvd6an8iyi8zcs0inwiq74z383lnbdpk7q";
 
   buildInputs = lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
diff --git a/pkgs/tools/misc/licensor/default.nix b/pkgs/tools/misc/licensor/default.nix
index 0913b9afbf5e..246684c6638b 100644
--- a/pkgs/tools/misc/licensor/default.nix
+++ b/pkgs/tools/misc/licensor/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0zr8hcq7crmhrdhwcclc0nap68wvg5kqn5l93ha0vn9xgjy8z11p";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "042dplm0cdxkv73m5qlkc61h0x9fpzxn2b0c8gjx2hwvigcia139";
 
   meta = with lib; {
diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix
index ef7a3e3ada40..e3d8d15922d6 100644
--- a/pkgs/tools/misc/loop/default.nix
+++ b/pkgs/tools/misc/loop/default.nix
@@ -10,6 +10,9 @@ rustPlatform.buildRustPackage {
     sha256 = "0f33sc1slg97q1aisdrb465c3p7fgdh2swv8k3yphpnja37f5nl4";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "19x8n39yaa924naldw6fv7mq9qb500arkhwj9jz2fsbhz5nz607r";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix
index bbf71dec4d39..c4175f77d055 100644
--- a/pkgs/tools/misc/lorri/default.nix
+++ b/pkgs/tools/misc/lorri/default.nix
@@ -31,6 +31,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1415mhdr0pwvshs04clfz1ys76r5qf9jz8jchm63l6llaj6m7mrv";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1kdpzbn3353yk7i65hll480fcy16wdvppdr6xgfh06x88xhim4mp";
   doCheck = false;
 
diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix
index 9b7ff7fd600a..ae3b57238506 100644
--- a/pkgs/tools/misc/lsd/default.nix
+++ b/pkgs/tools/misc/lsd/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0fh5rz6slyjzz03bpjcl9gplk36vm7qcc0i0gvhsikwvw0cf3hym";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0377jbjkrrjss3w8xmjsjjynycpdk19grp20hffxschg4ryvniin";
 
   preFixup = ''
diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix
index 7d85e709f73a..ee3d622a47a7 100644
--- a/pkgs/tools/misc/mcfly/default.nix
+++ b/pkgs/tools/misc/mcfly/default.nix
@@ -17,6 +17,9 @@ rustPlatform.buildRustPackage rec {
     install -Dm644 -t $out/share/mcfly mcfly.bash
   '';
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1bf65kagvhsi6lg8187ihi5j45hkq9d8v6j7rzmmfhngdzvcfr69";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix
index 09640b30be90..0231d4df9239 100644
--- a/pkgs/tools/misc/miniserve/default.nix
+++ b/pkgs/tools/misc/miniserve/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "06cxkkf3sf84prba65dymr1hg7mwizmsax0dlljh0lcmvlcpzi08";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "046xxxqcf1sdsi9dlilsn0nk36gyca20ck1a70ihj1k9kl7yj8sn";
 
   RUSTC_BOOTSTRAP = 1;
diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix
index e51a00dc7bd0..9c5ffc260ffb 100644
--- a/pkgs/tools/misc/onefetch/default.nix
+++ b/pkgs/tools/misc/onefetch/default.nix
@@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1sgpai3gx3w7w3ilmbnmzgdxdim6klkfiqaqxmffpyap6qgksfqs";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1phv06zf47bv5cmhypivljfiynrblha0kj13c5al9l0hd1xx749h";
 
   buildInputs = with stdenv;
diff --git a/pkgs/tools/misc/parallel-rust/default.nix b/pkgs/tools/misc/parallel-rust/default.nix
index c77ca56655ab..b4f939da3c96 100644
--- a/pkgs/tools/misc/parallel-rust/default.nix
+++ b/pkgs/tools/misc/parallel-rust/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1bb1m3ckkrxlnw9w24ig70bd1zwyrbaw914q3xz5yv43c0l6pn9c";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0ssawp06fidsppvfzk0balf4fink2vym9688r7k7x7pb2z7cvyqc";
 
   patches = [ ./fix_cargo_lock_version.patch ];
diff --git a/pkgs/tools/misc/pazi/default.nix b/pkgs/tools/misc/pazi/default.nix
index d3df890385f8..89ffdde2974e 100644
--- a/pkgs/tools/misc/pazi/default.nix
+++ b/pkgs/tools/misc/pazi/default.nix
@@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0nqcp54nwv4ic5jc3cgg15rh8dgkixfgkwb5q47rv8ding4cd0j5";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix
index 309ccf8070b6..10844fc30c25 100644
--- a/pkgs/tools/misc/powerline-rs/default.nix
+++ b/pkgs/tools/misc/powerline-rs/default.nix
@@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0rqlxxl58dpfvm2idhi0vzinraf4bgiapmawiih9wxs599fnhm3y";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1vdx5nwj4qmkb3rdgnchd9xixc5pmhvskvn6dmqgm91s41p2al1p";
 
   nativeBuildInputs = [ pkgconfig file perl cmake curl ];
diff --git a/pkgs/tools/misc/shadowenv/default.nix b/pkgs/tools/misc/shadowenv/default.nix
index faa4220200cc..670d8c193825 100644
--- a/pkgs/tools/misc/shadowenv/default.nix
+++ b/pkgs/tools/misc/shadowenv/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1s59ra99wcyyqz8gzly4qmcq5rh22c50c75cdi2kyajm7ghgryy9";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0s4p4mpz1p5v9hr4flxlzqvc1b3zbqr3nxp1nxjw39ng9g3hplpg";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
diff --git a/pkgs/tools/misc/shell-hist/default.nix b/pkgs/tools/misc/shell-hist/default.nix
index b44cbf100e8a..19f69655bbf9 100644
--- a/pkgs/tools/misc/shell-hist/default.nix
+++ b/pkgs/tools/misc/shell-hist/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage {
     sha256 = "0kc128xnnp1d56if70vfv0w3qnwhljhbnvzwwb7hfm3x2m0vqrqf";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1nqnkzwqk879qy1261g1gds668xz6islhzq7chzhilaqpmvf6039";
 
   meta = with lib; {
diff --git a/pkgs/tools/misc/silicon/default.nix b/pkgs/tools/misc/silicon/default.nix
index e25b6cfa2dfa..3bf8916f47c2 100644
--- a/pkgs/tools/misc/silicon/default.nix
+++ b/pkgs/tools/misc/silicon/default.nix
@@ -25,6 +25,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0j211qrkwgll7rm15dk4fcazmxkcqk2zah0qg2s3y0k7cx65bcxy";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "11b9i1aa36wc7mg2lsvmkiisl23mjkg02xcvlb7zdangwzbv13sq";
 
   buildInputs = [ llvmPackages.libclang expat freetype ]
diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix
index 0c8e2da36df1..550db58895d0 100644
--- a/pkgs/tools/misc/skim/default.nix
+++ b/pkgs/tools/misc/skim/default.nix
@@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {
 
   outputs = [ "out" "vim" ];
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1dl530ac8i4wdw7lziskl7rhh3ak9ykcws3kpy64808kxg3b1jnz";
 
   patchPhase = ''
diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index 1009b101d997..0c0820837f50 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -19,6 +19,9 @@ rustPlatform.buildRustPackage rec {
       --replace "/bin/echo" "echo"
   '';
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "05q527bd5q6a7kd03hwic4bynyc4sipyvi0bf2g2jqxzcsmswyyk";
   checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root";
 
diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix
index 547cb2d10759..1666d22626b0 100644
--- a/pkgs/tools/misc/tealdeer/default.nix
+++ b/pkgs/tools/misc/tealdeer/default.nix
@@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1v9wq4k7k4lmdz6xy6kabchjpbx9lds20yh6va87shypdh9iva29";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0y1y74fgxcv8a3cmyf30p6gg12r79ln7inir8scj88wbmwgkbxsp";
 
   buildInputs = [ openssl cacert curl ]
diff --git a/pkgs/tools/misc/tensorman/default.nix b/pkgs/tools/misc/tensorman/default.nix
index 97912b3c5fa1..88d437e56af6 100644
--- a/pkgs/tools/misc/tensorman/default.nix
+++ b/pkgs/tools/misc/tensorman/default.nix
@@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec {
   };
 
   buildInputs = [ pkgconfig openssl ];
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1gh5w6zzrvjk60bqaf355fagijy723rvmqjh4laksd96pmzdfwn9";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/termplay/default.nix b/pkgs/tools/misc/termplay/default.nix
index dd045f1cfac4..7e5b0e7d7361 100644
--- a/pkgs/tools/misc/termplay/default.nix
+++ b/pkgs/tools/misc/termplay/default.nix
@@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {
   };
 
   cargoBuildFlags = ["--features" "bin"];
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "15i7qid91awlk74n823im1n6isqanf4vlcal90n1w9izyddzs9j0";
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix
index 5f992e017a9f..191d66a6de80 100644
--- a/pkgs/tools/misc/topgrade/default.nix
+++ b/pkgs/tools/misc/topgrade/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0g9pb4f5skigyahv8kpx7wkvv625lvgnbqz6iq7j7wgixxf4nl1i";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1y85hl7xl60vsj3ivm6pyd6bvk39wqg25bqxfx00r9myha94iqmd";
 
   buildInputs = lib.optional stdenv.isDarwin Foundation;
diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix
index 5aa9f8c34a47..6309cbc19612 100644
--- a/pkgs/tools/misc/uutils-coreutils/default.nix
+++ b/pkgs/tools/misc/uutils-coreutils/default.nix
@@ -14,6 +14,9 @@ rustPlatform.buildRustPackage {
   # too many impure/platform-dependent tests
   doCheck = false;
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0qnpx2xhckb45q8cgn0xh31dg5k73hqp5mz5zg3micmg7as4b621";
 
   makeFlags =
diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index 328c343ba702..2f8bb36990b7 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -19,6 +19,9 @@ python3Packages.buildPythonApplication rec {
     name = "${name}-native";
     inherit src;
     sourceRoot = "source/rust";
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
     cargoSha256 = "1n1dxq3klsry5mmbfff2jv7ih8mr5zvpncrdgba6qs93wi77qi0y";
     buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
   };
diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix
index f2fef36f8422..cdc3a90f3726 100644
--- a/pkgs/tools/misc/vector/default.nix
+++ b/pkgs/tools/misc/vector/default.nix
@@ -19,6 +19,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1bqp1ms8y91mpcmxlc8kyncigxq7spxq1ygy6gviz35zq1cqkwnr";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "01hynn8ccpwqrirr1bczqc7q7pqkzfjks2v6q4f32xbm50b31fky";
   buildInputs = [ openssl pkgconfig protobuf rdkafka ]
                 ++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv ];
diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/tools/misc/vivid/default.nix
index a3df78abd25a..2f665f199587 100644
--- a/pkgs/tools/misc/vivid/default.nix
+++ b/pkgs/tools/misc/vivid/default.nix
@@ -15,6 +15,9 @@ rustPlatform.buildRustPackage rec {
     substituteInPlace src/main.rs --replace /usr/share $out/share
   '';
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "04xx26ngz7hx7bv5g01q9h6dqa96xkx0xm3jb0qk6c3hp6500zpn";
 
   postInstall = ''
diff --git a/pkgs/tools/misc/void/default.nix b/pkgs/tools/misc/void/default.nix
index ec19ae5bd18e..7e570d21f7ae 100644
--- a/pkgs/tools/misc/void/default.nix
+++ b/pkgs/tools/misc/void/default.nix
@@ -14,6 +14,9 @@ rustPlatform.buildRustPackage rec {
   # The tests are long-running and not that useful
   doCheck = false;
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "03g7155jpg8k1ymk95m8rlhlszkxyq0rv32966n4gk5yziijvk4k";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix
index 9729f110bb74..26fc7107d41e 100644
--- a/pkgs/tools/misc/watchexec/default.nix
+++ b/pkgs/tools/misc/watchexec/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "03s9nsss4895x4lp90y65jajavk8c2nj1jjnmx0vbbwl210ghlv1";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "07whi9w51ddh8s7v06c3k6n5q9gfx74rdkhgfysi180y2rgnbanj";
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix
index f682bb3d2eba..003932551efd 100644
--- a/pkgs/tools/misc/websocat/default.nix
+++ b/pkgs/tools/misc/websocat/default.nix
@@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec {
   };
 
   cargoBuildFlags = [ "--features=ssl" ];
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "163kwpahrbb9v88kjkrc0jx2np3c068pspr8rqrm9cb8jyl2njrr";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/misc/xprite-editor/default.nix b/pkgs/tools/misc/xprite-editor/default.nix
index e2615bef6ce1..af2fdc5e1995 100644
--- a/pkgs/tools/misc/xprite-editor/default.nix
+++ b/pkgs/tools/misc/xprite-editor/default.nix
@@ -29,6 +29,9 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config python3 ];
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0cd58888l7pjmghin31ha780yhs2pz67b10jysyasdw0a88m0dwy";
 
   cargoBuildFlags = [ "--bin" "xprite-native" ];
diff --git a/pkgs/tools/misc/xv/default.nix b/pkgs/tools/misc/xv/default.nix
index 8d8c2fa55b28..bbf966d1c1f3 100644
--- a/pkgs/tools/misc/xv/default.nix
+++ b/pkgs/tools/misc/xv/default.nix
@@ -17,6 +17,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0x2yd21sr4wik3z22rknkx1fgb64j119ynjls919za8gd83zk81g";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0m69pcmnx3c3q7lgvbhxc8dl6lavv5ch4r6wg2bhdmapcmb4p7jq";
 
   buildInputs = lib.optionals useNcurses [ ncurses ]
diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix
index 4203e0c5c823..39024ff462f9 100644
--- a/pkgs/tools/networking/bandwhich/default.nix
+++ b/pkgs/tools/networking/bandwhich/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1c4lndrr7xndgp60zcdjqpciwibm9sjwwrd3921fyz4jg44g76zy";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1sa81570cvvpqgdcpnb08b0q4c6ap8a2wxfp2z336jzbv0zgv8a6";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/tools/networking/boringtun/default.nix
index dfb13f2168b4..60a9469bced4 100644
--- a/pkgs/tools/networking/boringtun/default.nix
+++ b/pkgs/tools/networking/boringtun/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1mijy51hd8c4as9g4ivpfxismc9m5m3nhibfvclh3wrlcmp1ha9c";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1gvmshwg9b486933vfgkg2r8nn6w6dyz42hqjy74p785fcg0v5hs";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
diff --git a/pkgs/tools/networking/bukubrow/default.nix b/pkgs/tools/networking/bukubrow/default.nix
index e83e72cbfb44..eeb69417dc7f 100644
--- a/pkgs/tools/networking/bukubrow/default.nix
+++ b/pkgs/tools/networking/bukubrow/default.nix
@@ -18,6 +18,9 @@ in rustPlatform.buildRustPackage rec {
     sha256 = "1a3gqxj6d1shv3w0v9m8x2xr0bvcynchy778yqalxkc3x4vr0nbn";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "06nh99cvg3y4f98fs0j5bkidzq6fg46wk47z5jfzz5lf72ha54lk";
 
   buildInputs = [ sqlite ];
diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix
index 3eb037d50a11..b7dd84fd43c0 100644
--- a/pkgs/tools/networking/findomain/default.nix
+++ b/pkgs/tools/networking/findomain/default.nix
@@ -18,6 +18,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1hqvs6h6cfimg0y6hggnmc0mlddajwmh3h36n160n6imq0lfixka";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0brkza04b38hcjjmqz4bkd8gj0n0mrh0p7427007f5xlnhj7hrn4";
 
   nativeBuildInputs = [ installShellFiles perl ];
diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix
index 06faa0640257..913d1c1a52b4 100644
--- a/pkgs/tools/networking/gnirehtet/default.nix
+++ b/pkgs/tools/networking/gnirehtet/default.nix
@@ -25,6 +25,9 @@ rustPlatform.buildRustPackage {
       sha256 = "1c99d6zpjxa8xlrg0n1825am20d2pjiicfcjwv8iay9ylfdnvygl";
   };
   sourceRoot = "source/relay-rust";
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1l1cirhmfkpa466vksynlhwggsfiahws7cpsxydrc414l415l283";
 
   patchFlags = [ "-p2" ];
diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix
index 55630d7814c2..c394f216e0f7 100644
--- a/pkgs/tools/networking/httplz/default.nix
+++ b/pkgs/tools/networking/httplz/default.nix
@@ -21,6 +21,9 @@ rustPlatform.buildRustPackage rec {
 
   cargoBuildFlags = [ "--bin httplz" ];
   cargoPatches = [ ./cargo-lock.patch ];
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1ajxfvj1pv6yq84zgrh7vjzghpb2y8qd5r09gzwdvww5rbj920fq";
 
   postInstall = ''
diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix
index 2416ef23c8a3..d746d1f42b53 100644
--- a/pkgs/tools/networking/shadowsocks-rust/default.nix
+++ b/pkgs/tools/networking/shadowsocks-rust/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0w7ysha46ml3j1i1knvll4pmqg291z8a2ypcy650m61dhrvkh2ng";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "18nlvqa9ha4vs9xb60hivhgcsqr69zsigfmqyig48slvwgqkbwda";
 
   buildInputs = [ openssl libsodium ]
diff --git a/pkgs/tools/networking/tdns-cli/default.nix b/pkgs/tools/networking/tdns-cli/default.nix
index 473ee8ace345..4ad924ee5b55 100644
--- a/pkgs/tools/networking/tdns-cli/default.nix
+++ b/pkgs/tools/networking/tdns-cli/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0nn036in5j1h0vxkwif0lf7fn900zy4f4kxlzy6qdx3jakgmxvwh";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0h41ws3jcxb90mhnznckfkfv0mpx6ykga7087bipbaw2fqhr7izd";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix
index f47ccab45ea4..3b94c61a7131 100644
--- a/pkgs/tools/networking/tox-node/default.nix
+++ b/pkgs/tools/networking/tox-node/default.nix
@@ -31,6 +31,9 @@ buildRustPackage rec {
 
   doCheck = false;
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1nv0630yb8k857n7km4bbgf41j747xdxv7xnc6a9746qpggmdbkh";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix
index 13b7ffd2af71..4f64750892a0 100644
--- a/pkgs/tools/nix/nixdoc/default.nix
+++ b/pkgs/tools/nix/nixdoc/default.nix
@@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs =  stdenv.lib.optional stdenv.isDarwin [ darwin.Security ];
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1hy8w73fir4wnqx7zfvfqh7s24w95x9nkw55kmizvrwf0glw9m4n";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix
index 946710b1fdde..eac8d1293d2a 100644
--- a/pkgs/tools/nix/nixpkgs-fmt/default.nix
+++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix
@@ -10,6 +10,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1iylldgyvrcarfigpbhicg6j6qyipfiqn7gybza7qajfzyprjqfa";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "04my7dlp76dxs1ydy2sbbca8sp3n62wzdxyc4afcmrg8anb0ghaf";
 
   meta = with lib; {
diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/tools/package-management/cargo-about/default.nix
index 5d741e25fb9d..bee0ee7d3d88 100644
--- a/pkgs/tools/package-management/cargo-about/default.nix
+++ b/pkgs/tools/package-management/cargo-about/default.nix
@@ -10,6 +10,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0bsay1vqi5b3z7qjwbkwx3ikmpjzc0kswbajm50xmcwlg8jrn420";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1mqicibpa9sxac8v2kk8vfvxcis2wkdkklia2pbspc0pz3h0c8if";
 
   meta = with lib; {
diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix
index 1a60675080d8..2d9bb71c5694 100644
--- a/pkgs/tools/package-management/cargo-audit/default.nix
+++ b/pkgs/tools/package-management/cargo-audit/default.nix
@@ -10,6 +10,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1977ykablfi4mc6j2iil0bxc6diy07vi5hm56xmqj3n37ziavf1m";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0zbnsq0cif0yppn8ygxhcsrshkbf1c801f8waqqb2d1rjsrhb93y";
 
   buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ];
diff --git a/pkgs/tools/package-management/cargo-deb/default.nix b/pkgs/tools/package-management/cargo-deb/default.nix
index 1af8be3da44c..6672e31e3020 100644
--- a/pkgs/tools/package-management/cargo-deb/default.nix
+++ b/pkgs/tools/package-management/cargo-deb/default.nix
@@ -17,6 +17,9 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0j64dcczxdr9zdch4a241d5adgipzz8sgbw00min9k3p8hbljd9n";
 
   meta = with lib; {
diff --git a/pkgs/tools/package-management/cargo-deps/default.nix b/pkgs/tools/package-management/cargo-deps/default.nix
index 8a43fb3cf11b..b5dafc544fbb 100644
--- a/pkgs/tools/package-management/cargo-deps/default.nix
+++ b/pkgs/tools/package-management/cargo-deps/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "16181p7ghvy9mqippg1xi2cw7yxvicis8v6n39wly5qw05i57aw2";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1a9svdw1cgk6s7gqpsq3r25wxa2gr2xddqkc1cjk7hf6sk327cpv";
 
   meta = with lib; {
diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix
index 25c9711c1a59..77753dc33492 100644
--- a/pkgs/tools/package-management/cargo-edit/default.nix
+++ b/pkgs/tools/package-management/cargo-edit/default.nix
@@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "16gpljbzk6cibry9ssnl22xbcsx2cr57mrs3x3n6cfmldbp6bhbr";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1cjpbfgbqzlfs5hck2j3d2v719fwandpnc7bdk4243j7j0k1ng9q";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/tools/package-management/cargo-graph/default.nix b/pkgs/tools/package-management/cargo-graph/default.nix
index 2fe89ccfa986..1f0b11ad9786 100644
--- a/pkgs/tools/package-management/cargo-graph/default.nix
+++ b/pkgs/tools/package-management/cargo-graph/default.nix
@@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0myg26cssmbakz53dl61lswsbaqnjqlbc30c2571pq8f7gvz2qv5";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1k4byg77s1iqhry96pl57mbsvd32sbnvf60dlbd62pvan39rispg";
 
   meta = with lib; {
diff --git a/pkgs/tools/package-management/cargo-license/default.nix b/pkgs/tools/package-management/cargo-license/default.nix
index f697c57d3e8c..e91f099da851 100644
--- a/pkgs/tools/package-management/cargo-license/default.nix
+++ b/pkgs/tools/package-management/cargo-license/default.nix
@@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec {
 
   cargoPatches = [ ./add-Cargo.lock.patch ];
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0ksxvbrx8d8d09i167mdrhz5m46nbr6l0vyn7xpdanmha31xiaz9";
 
   meta = with lib; {
diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix
index 7d684d943b90..667a1a21a2d4 100644
--- a/pkgs/tools/package-management/cargo-outdated/default.nix
+++ b/pkgs/tools/package-management/cargo-outdated/default.nix
@@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec {
   };
 
   cargoPatches = [ ./cargo-lock.patch ];
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1ywmrvkwwwwh99l4j8vc4cyk8qjd0jx8hn68yr2h31ya1bzcqbd1";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix
index 3e3ba47be056..1e5d1fe3512a 100644
--- a/pkgs/tools/package-management/cargo-release/default.nix
+++ b/pkgs/tools/package-management/cargo-release/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1w9w43i5br94vg5m4idabh67p4ffsx2lmc2g0ak2k961vl46wr0q";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "075fvvd4c8f3kz6i6ny835h6jpa3c1v3miwfwwrdyy49a85lzjyj";
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/tools/package-management/cargo-tree/default.nix b/pkgs/tools/package-management/cargo-tree/default.nix
index 37d546adb9df..141ec8fd48a4 100644
--- a/pkgs/tools/package-management/cargo-tree/default.nix
+++ b/pkgs/tools/package-management/cargo-tree/default.nix
@@ -10,6 +10,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0wv5zgyx18fypdb4pmgzxvr2gb9w8vgv6aqir3dxhcvcgf2j5c3n";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "16r7zzkf87v67spahaprc25agwh6d3i0kg73vx8a6w7hgqlk0zwa";
 
   nativeBuildInputs = [ pkgconfig cmake ];
diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix
index bb361fd97c3a..6b39ed9d1c4e 100644
--- a/pkgs/tools/package-management/emplace/default.nix
+++ b/pkgs/tools/package-management/emplace/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1y77cla6bgy8pjb21cawx7cb69hhri4r7gyjkhnjyiixkh945mwj";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "119llsc8m7qda2cjnd45ndml148z8074f76xygkz6fp3m1c2z3pw";
 
   meta = with lib; {
diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix
index b3a16633c1d9..f41dd715fcf4 100644
--- a/pkgs/tools/package-management/nix-index/default.nix
+++ b/pkgs/tools/package-management/nix-index/default.nix
@@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec {
     rev = "v${version}";
     sha256 = "05fqfwz34n4ijw7ydw2n6bh4bv64rhks85cn720sy5r7bmhfmfa8";
   };
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "06idjb5h5fahqklyxnss2zffrvvfbcw0hjh1mcrf1872s4x78ags";
   nativeBuildInputs = [ pkgconfig makeWrapper ];
   buildInputs = [ openssl curl ]
diff --git a/pkgs/tools/security/b3sum/default.nix b/pkgs/tools/security/b3sum/default.nix
index 4056c3b5b1b5..db5524ce365b 100644
--- a/pkgs/tools/security/b3sum/default.nix
+++ b/pkgs/tools/security/b3sum/default.nix
@@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "source/b3sum";
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0qw7sr817lmj9xicc03cj1k49lwjwc1whllc7sj2g4c0nl2vndir";
   verifyCargoDeps = false;
 
diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix
index 1b262581eb23..517de33fa88e 100644
--- a/pkgs/tools/security/bitwarden_rs/default.nix
+++ b/pkgs/tools/security/bitwarden_rs/default.nix
@@ -25,6 +25,9 @@ in rustPlatform.buildRustPackage rec {
 
   RUSTC_BOOTSTRAP = 1;
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1v6n4aqhd5pyvvhlzhpmq7ykclfxw82wn2bg7n49b53d9p72jwq6";
   cargoBuildFlags = [ featuresFlag ];
 
diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix
index 4b9fefd18c36..06284c52f988 100644
--- a/pkgs/tools/security/jwt-cli/default.nix
+++ b/pkgs/tools/security/jwt-cli/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1q6dqh8z6mhiksjrhi602cvq31jgc18pfbwf6mlm9gi1grpgm5dl";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0k3fla0zz2r66y5fvmbcdhjd2jq8md2sxgcjb3x8sipzqfv8bwi2";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix
index f9d648f04b10..088dfc6c5a1a 100644
--- a/pkgs/tools/security/rage/default.nix
+++ b/pkgs/tools/security/rage/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1lfp9vyrk8880j7p5i73zja9dglvl1lvvh7286rwd1a9gbcj6grb";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "09dg43vba8hwivng2h70qmpxnijad171mf02vwjw0gqxk83ql28v";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix
index da850c6d9daa..f0e9cb8959dc 100644
--- a/pkgs/tools/security/ripasso/cursive.nix
+++ b/pkgs/tools/security/ripasso/cursive.nix
@@ -12,6 +12,9 @@ buildRustPackage rec {
     sha256 = "164da20j727p8l7hh37j2r8pai9sj402nhswvg0nrlgj53nr6083";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1vyhdbia7khh0ixim00knai5d270jl5a5crqik1qaz7bkwc02bsp";
 
   cargoBuildFlags = [ "-p ripasso-cursive -p ripasso-man" ];
diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix
index 355cc77ec34b..1301a01e8c6d 100644
--- a/pkgs/tools/security/sequoia/default.nix
+++ b/pkgs/tools/security/sequoia/default.nix
@@ -18,6 +18,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1p17y6vsya8daglvl6yal3759x44dc062ah5vyra0k7dk82cc4pq";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1hbwx2d9j5ddqlvskqxk951g59nsyk5y5l7f9yg2cyqhkzfil7nr";
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/system/mq-cli/default.nix b/pkgs/tools/system/mq-cli/default.nix
index 930bf8382c64..f685259429d2 100644
--- a/pkgs/tools/system/mq-cli/default.nix
+++ b/pkgs/tools/system/mq-cli/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "02z85waj5jc312biv2qhbgplsggxgjmfmyv9v8b1ky0iq1mpxjw7";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "03ab6jbcgmbgg9hn7ihk8814sjwdmrr9p4xlll6nfdad4a7gq3yn";
 
   meta = with lib; {
diff --git a/pkgs/tools/system/ytop/default.nix b/pkgs/tools/system/ytop/default.nix
index b1677dadf9d3..8732bf88ad7a 100644
--- a/pkgs/tools/system/ytop/default.nix
+++ b/pkgs/tools/system/ytop/default.nix
@@ -15,6 +15,9 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "11pcchwahcwdvmfwfs6j2zg23grlw538wfs90mvqy2mpccj7d3ys";
   verifyCargoDeps = true;
 
diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/tools/text/amber/default.nix
index 935b6a607298..95ffc592bfe1 100644
--- a/pkgs/tools/text/amber/default.nix
+++ b/pkgs/tools/text/amber/default.nix
@@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0k70rk19hwdlhhqm91x12xcb8r09kzpijs0xwhplrwdh86qfxymx";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0hh3sgcdcp0llgf3i3dysrr3vry3fv3fzzf44ad1953d5mnyhvap";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/tools/text/coloursum/default.nix b/pkgs/tools/text/coloursum/default.nix
index 5cac5a9f90e5..27e349c9d934 100644
--- a/pkgs/tools/text/coloursum/default.nix
+++ b/pkgs/tools/text/coloursum/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1piz0l7qdcvjzfykm6rzqc8s1daxp3cj3923v9cmm41bc2v0p5q0";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "091flc5ymx0y43ld6bdmig5cy479b90bkmwv3yaysi5kpr28skvh";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/tools/text/diffr/default.nix b/pkgs/tools/text/diffr/default.nix
index c032d2e8b361..d93ffa9d090e 100644
--- a/pkgs/tools/text/diffr/default.nix
+++ b/pkgs/tools/text/diffr/default.nix
@@ -14,6 +14,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1fpcyl4kc4djfl6a2jlj56xqra42334vygz8n7614zgjpyxz3zx2";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1dddb3a547qnpm1vvrgffb3v9m8sh19hmhy0fg6xjqpm032lqx3v";
 
   nativeBuildInputs = [];
diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix
index b21523ce863a..6f9f8577501e 100644
--- a/pkgs/tools/text/mdbook/default.nix
+++ b/pkgs/tools/text/mdbook/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0gcrv54iswphzxxkmak1c7pmmpakiri6jk50j4bxrsplwjr76f7n";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "00grlxjz61vxinr18f28ga6610yjxcq48lr75wmyc5wq317j12fn";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix
index 6b19251acf8e..7a97a110381b 100644
--- a/pkgs/tools/text/mdcat/default.nix
+++ b/pkgs/tools/text/mdcat/default.nix
@@ -14,6 +14,9 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1kc434pa72n9xll2r4ddmd9xdwv3ls36cwsmdry392j41zmics51";
 
   checkInputs = [ ansi2html ];
diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix
index df54724d3847..62549ba9577c 100644
--- a/pkgs/tools/text/ripgrep-all/default.nix
+++ b/pkgs/tools/text/ripgrep-all/default.nix
@@ -13,6 +13,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0fxvnd8qflzvqz2181njdhpbr4wdvd1jc6lcw38c3pknk9h3ymq9";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1jcwipsb7sl65ky78cypl4qvjvxvv4sjlwcg1pirgmqikcyiiy2l";
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index 963ef99c68a1..0c72467c00b2 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -14,6 +14,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1iga3320mgi7m853la55xip514a3chqsdi1a1rwv25lr9b1p7vd3";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "17ldqr3asrdcsh4l29m3b5r37r5d0b3npq1lrgjmxb6vlx6a36qh";
 
   cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2";
diff --git a/pkgs/tools/text/ruplacer/default.nix b/pkgs/tools/text/ruplacer/default.nix
index 7fdde0b3a694..d868f9e2529d 100644
--- a/pkgs/tools/text/ruplacer/default.nix
+++ b/pkgs/tools/text/ruplacer/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0yj753d9wsnp4s5a71ph241jym5rfz3161a1v3qxfc4w23v86j1q";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1lzw4x40j25khf68x5srj8i05c11ls5y7km206vxn19vsy9ah4k9";
 
   buildInputs = (stdenv.lib.optional stdenv.isDarwin Security);
diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix
index 3b4a6edba0ff..889dde46dead 100644
--- a/pkgs/tools/text/sd/default.nix
+++ b/pkgs/tools/text/sd/default.nix
@@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1vxljmd1vh245yhv095i3l44pk915zr2pix4v9r8pz2fynp2nnmj";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1shqphbpn3ib28hnyib7mh1i5q56nshj864jm209s8qggbp96wp1";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
diff --git a/pkgs/tools/text/staccato/default.nix b/pkgs/tools/text/staccato/default.nix
index a68d2266b431..cbd53c898233 100644
--- a/pkgs/tools/text/staccato/default.nix
+++ b/pkgs/tools/text/staccato/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1zbd1gx0ik2r7bavcid776j37g6rzd3f6cs94kq1qar4gyf1gqjm";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0h1822hba6lpv14y6hgn8qgh7p812b3kkf592ggr6yjlhqfh37n7";
 
   meta = {
diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix
index cf44782432c4..b81b7b109821 100644
--- a/pkgs/tools/text/xsv/default.nix
+++ b/pkgs/tools/text/xsv/default.nix
@@ -11,6 +11,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "17v1nw36mrarrd5yv4xd3mpc1d7lvhd5786mqkzyyraf78pjg045";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "1xlbszr9ccv924ww45lnc0qqb7nxj2cnc41480xbpvsdqsdrgbhs";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix
index c78e60996bb2..b6d8cb67c110 100644
--- a/pkgs/tools/typesetting/tectonic/default.nix
+++ b/pkgs/tools/typesetting/tectonic/default.nix
@@ -12,6 +12,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0dycv135bkpf71iwlwh8rwwvn287d605nl7v8mjxlrsayiivdmn9";
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "0bkgh73kqcdv3j9hr3m13wrdhls3zrk7aii9shzbzl6rnp2ry1az";
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix
index 99a3e5ee6188..9d4f7b514a35 100644
--- a/pkgs/tools/video/rav1e/default.nix
+++ b/pkgs/tools/video/rav1e/default.nix
@@ -25,6 +25,9 @@ rustPlatform.buildRustPackage rec {
     '';
   };
 
+  # Delete this on next update; see #79975 for details
+  legacyCargoFetcher = true;
+
   cargoSha256 = "185jnmyirfhrv8bxvmwizf3lvq49sjj1696g3gflph31d8bfpb0c";
 
   nativeBuildInputs = [ nasm ];

From 49bba752d5a4405beb92921f657d41171f9c0f53 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 14 Feb 2020 07:28:05 +0100
Subject: [PATCH 0600/4636] =?UTF-8?q?python3.pkgs.babelgladeextractor:=200?=
 =?UTF-8?q?.6.3=20=E2=86=92=200.7.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/gnome-keysign/babel-glade/compare/0.6.3...0.7.0
---
 .../python-modules/babelgladeextractor/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/babelgladeextractor/default.nix b/pkgs/development/python-modules/babelgladeextractor/default.nix
index 4ed52d333d63..7b73396155c7 100644
--- a/pkgs/development/python-modules/babelgladeextractor/default.nix
+++ b/pkgs/development/python-modules/babelgladeextractor/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "babelgladeextractor";
-  version = "0.6.3";
+  version = "0.7.0";
 
   src = fetchPypi {
     pname = "BabelGladeExtractor";
     inherit version;
     extension = "tar.bz2";
-    sha256 = "12i2i97wai5vv5h522rj6pfcdsfyrkgmjqc699m5v4af0yy3rqsq";
+    sha256 = "160p4wi2ss69g141c2z59azvrhn7ymy5m9h9d65qrcabigi0by5w";
   };
 
   propagatedBuildInputs = [

From 893f7e8f43a7893113b1b6500e6e394f2040053b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Feb 2020 21:16:26 +0000
Subject: [PATCH 0601/4636] python27Packages.Rtree: 0.9.3 -> 0.9.4

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

diff --git a/pkgs/development/python-modules/Rtree/default.nix b/pkgs/development/python-modules/Rtree/default.nix
index 867c771350c1..22f54d08e5c5 100644
--- a/pkgs/development/python-modules/Rtree/default.nix
+++ b/pkgs/development/python-modules/Rtree/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "Rtree";
-  version = "0.9.3";
+  version = "0.9.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "55c046a98e8d84235792de1f18635f680d7b4085264fbced6b073f28fcbe353a";
+    sha256 = "0i1zlyz6vczy3cgg7fan5hq9zzjm7s7zdzfh83ma8g9vq3i2gqya";
   };
 
   propagatedBuildInputs = [ libspatialindex ];

From c5b6c6958fa2cdabe9dad3f33f51a02b6496645c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Feb 2020 18:12:00 +0000
Subject: [PATCH 0602/4636] python27Packages.Wand: 0.5.8 -> 0.5.9

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

diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix
index a7fe193c62f5..7c8387e48fcd 100644
--- a/pkgs/development/python-modules/Wand/default.nix
+++ b/pkgs/development/python-modules/Wand/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "Wand";
-  version = "0.5.8";
+  version = "0.5.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0sjdlfhw1wdjqpmr72mckf2njy9xigx51shl510jhvl418cja2bd";
+    sha256 = "0a4v5cwnwsjxril7514ssvdqxsad227v5w7hcfqjkqzvaf7agb3f";
   };
 
   postPatch = ''

From 334e013a0a54abe30e2f15192ca0e8220cb33303 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Feb 2020 07:09:30 +0000
Subject: [PATCH 0603/4636] gitAndTools.svn-all-fast-export: 1.0.16 -> 1.0.17

---
 .../git-and-tools/svn-all-fast-export/default.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
index 45b427341a21..92d7fd4e3dab 100644
--- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, qmake, qtbase, qttools, subversion, apr }:
 
 let
-  version = "1.0.16";
+  version = "1.0.17";
 in
 stdenv.mkDerivation {
   pname = "svn-all-fast-export";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     owner = "svn-all-fast-export";
     repo = "svn2git";
     rev = version;
-    sha256 = "1xs3gngjkna458liaqjsc8ryld03mdmvycnkzwsgyzfxsgjx1i3l";
+    sha256 = "13gmrxh4i34scv51h9x38v8jqfjykbbd9w7zzqjnxzvzpzsczg9a";
   };
 
   nativeBuildInputs = [ qmake qttools ];

From f0a6a458e6e5509f622bf04a6c4b9adfd67dab2a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Feb 2020 07:39:05 +0000
Subject: [PATCH 0604/4636] teamviewer: 15.1.3937 -> 15.2.2756

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

diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index 077e4157ef54..6fe77790b74a 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -6,11 +6,11 @@
 
 mkDerivation rec {
   pname = "teamviewer";
-  version = "15.1.3937";
+  version = "15.2.2756";
 
   src = fetchurl {
     url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb";
-    sha256 = "0v7733g795b15l2fya26sq710p0mg3wqhkahrg4w84y69p9zz2pf";
+    sha256 = "1g6a7yadvc6gc660m62yibj2hrj7bwy26z5ww0gk6rwqlz048i97";
   };
 
   unpackPhase = ''

From 9a80ee245ceeaf7a0c25e8811a09a0b2bd39bd7d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 27 Jan 2020 12:09:37 -0600
Subject: [PATCH 0605/4636] fx_cast_bridge: 0.0.4 -> 0.0.5

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

diff --git a/pkgs/tools/misc/fx_cast/default.nix b/pkgs/tools/misc/fx_cast/default.nix
index e271960d73ef..5fa57e830d22 100644
--- a/pkgs/tools/misc/fx_cast/default.nix
+++ b/pkgs/tools/misc/fx_cast/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "fx_cast_bridge";
-  version = "0.0.4";
+  version = "0.0.5";
 
   src = fetchurl {
      url = "https://github.com/hensm/fx_cast/releases/download/v${version}/${pname}-${version}-x64.deb";
-     sha256 = "1p6d8idbaaqr80vxrmmyfcr5nwb0sk5vwrmizflg39p5zasmmhy2";
+     sha256 = "1qmp1d7miq7c2q8i4bhfp5ywxdngvyi7rjl6i82is2g5nhr7gbvv";
   };
 
   nativeBuildInputs = [ dpkg ];

From 3b65b3f6d637c6576cd9a0fe954aced5aa70de12 Mon Sep 17 00:00:00 2001
From: Richard Wallace <richard.wallace@simspace.com>
Date: Wed, 29 Jan 2020 14:56:05 -0700
Subject: [PATCH 0606/4636] dockerTools.buildLayeredImage: store all paths
 passed in final layer

Fixes #78744

My previous change broke when there are more packages than the maximum
number of layers. I had assumed that the `store-path-to-layer.sh` was
only ever passed a single store path, but that is not the case if
there are multiple packages going into the final layer. To fix this, we
loop through the paths going into the final layer, appending them to the
tar file and making sure they end up at the right path.
---
 pkgs/build-support/docker/examples.nix        |  1 +
 .../docker/store-path-to-layer.sh             | 21 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index a1f71d35793c..f6520201a64a 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -246,4 +246,5 @@ rec {
     contents = [ pkgs.bash pkgs.hello ];
     maxLayers = 2;
   };
+
 }
diff --git a/pkgs/build-support/docker/store-path-to-layer.sh b/pkgs/build-support/docker/store-path-to-layer.sh
index c808abab7a8a..7e8efeea1c10 100755
--- a/pkgs/build-support/docker/store-path-to-layer.sh
+++ b/pkgs/build-support/docker/store-path-to-layer.sh
@@ -5,11 +5,8 @@ set -eu
 layerNumber=$1
 shift
 
-storePath="$1"
-shift
-
 layerPath="./layers/$layerNumber"
-echo "Creating layer #$layerNumber for $storePath"
+echo "Creating layer #$layerNumber for $@"
 
 mkdir -p "$layerPath"
 
@@ -35,13 +32,15 @@ tar -cf "$layerPath/layer.tar"  \
 # to /nix/store. In order to create the correct structure
 # in the tar file, we transform the relative nix store
 # path to the absolute store path.
-n=$(basename "$storePath")
-tar -C /nix/store -rpf "$layerPath/layer.tar" \
-    --hard-dereference --sort=name \
-    --mtime="@$SOURCE_DATE_EPOCH" \
-    --owner=0 --group=0 \
-    --transform="s,$n,/nix/store/$n," \
-    $n
+for storePath in "$@"; do
+  n=$(basename "$storePath")
+  tar -C /nix/store -rpf "$layerPath/layer.tar" \
+      --hard-dereference --sort=name \
+      --mtime="@$SOURCE_DATE_EPOCH" \
+      --owner=0 --group=0 \
+      --transform="s,$n,/nix/store/$n," \
+      $n
+done
 
 # Compute a checksum of the tarball.
 tarhash=$(tarsum < $layerPath/layer.tar)

From baa78de59403a69936bd9fc4709707d600926308 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Thu, 30 Jan 2020 22:35:16 +0100
Subject: [PATCH 0607/4636] nixosTests.docker-tools: add bulk-layer test

A regression test for https://github.com/NixOS/nixpkgs/issues/78744.
---
 nixos/tests/docker-tools.nix           |  6 ++++++
 pkgs/build-support/docker/examples.nix | 11 +++++++++++
 2 files changed, 17 insertions(+)

diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index 07fac5336803..ca750e8ba3cd 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -83,5 +83,11 @@ import ./make-test.nix ({ pkgs, ... }: {
 
       # Ensure image with only 2 layers can be loaded
       $docker->succeed("docker load --input='${pkgs.dockerTools.examples.two-layered-image}'");
+
+      # Ensure the bulk layer didn't miss store paths
+      # Regression test for https://github.com/NixOS/nixpkgs/issues/78744
+      $docker->succeed("docker load --input='${pkgs.dockerTools.examples.bulk-layer}'");
+      # This ensure the two output paths (ls and hello) are in the layer
+      $docker->succeed("docker run bulk-layer ls /bin/hello");
     '';
 })
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index f6520201a64a..f0dcf236c0e4 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -247,4 +247,15 @@ rec {
     maxLayers = 2;
   };
 
+  # 16. Create a layered image with more packages than max layers.
+  # coreutils and hello are part of the same layer
+  bulk-layer = pkgs.dockerTools.buildLayeredImage {
+    name = "bulk-layer";
+    tag = "latest";
+    contents = with pkgs; [
+      coreutils hello
+    ];
+    maxLayers = 2;
+  };
+
 }

From 6c4228f7d14e37e461993a76bbad35d1a1b4dd4b Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Fri, 14 Feb 2020 00:11:08 -0800
Subject: [PATCH 0608/4636] tokei: 10.1.1 -> 10.1.2

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

diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix
index 5db4ec125c09..aaf6efc03aee 100644
--- a/pkgs/development/tools/misc/tokei/default.nix
+++ b/pkgs/development/tools/misc/tokei/default.nix
@@ -2,19 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tokei";
-  version = "10.1.1";
+  version = "10.1.2";
 
   src = fetchFromGitHub {
     owner = "XAMPPRocky";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0wndjb4rvj8548wz0svwgnk94qlg5w2fv75fn2jgriq6fh6v43yg";
+    sha256 = "1h9vk30wdcjkf6wdv1xdiv94ln5ivwhmfhx5kwdvrxx8cci2m3yx";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1lpa4xfh3bcm51amwxvkzpvmi4b2c4q5qwxxigcbzw76l7rqp2w9";
+  cargoSha256 = "11xf2vkhar4y0rb4blq3hk9xlw0ixnig88zzc72hcnkv2yamgkhi";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [
     libiconv darwin.apple_sdk.frameworks.Security

From 7696369bec565e6c850a606a3fffce65a7dbee70 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 14 Feb 2020 03:42:18 -0500
Subject: [PATCH 0609/4636] docker-slim: move expression to outside of
 build-support (#80078)

---
 .../virtualization}/docker-slim/default.nix                     | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{build-support => applications/virtualization}/docker-slim/default.nix (100%)

diff --git a/pkgs/build-support/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix
similarity index 100%
rename from pkgs/build-support/docker-slim/default.nix
rename to pkgs/applications/virtualization/docker-slim/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index efd7e0da75eb..617f602a3ac7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -203,7 +203,7 @@ in
 
   docker-ls = callPackage ../tools/misc/docker-ls { };
 
-  docker-slim = callPackage ../build-support/docker-slim { };
+  docker-slim = callPackage ../applications/virtualization/docker-slim { };
 
   docker-sync = callPackage ../tools/misc/docker-sync { };
 

From 809bc8cafb9fac07f3ab53859c2f4727674d4428 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Tue, 11 Feb 2020 13:17:33 +0100
Subject: [PATCH 0610/4636] cloudflare-wrangler: 1.4.0 -> 1.7.0

---
 pkgs/development/tools/cloudflare-wrangler/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/cloudflare-wrangler/default.nix b/pkgs/development/tools/cloudflare-wrangler/default.nix
index 372de27ec59a..76e227aace08 100644
--- a/pkgs/development/tools/cloudflare-wrangler/default.nix
+++ b/pkgs/development/tools/cloudflare-wrangler/default.nix
@@ -3,19 +3,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cloudflare-wrangler";
-  version = "1.4.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "wrangler";
     rev = "v" + version;
-    sha256 = "1agl1cg34iklvniygrkq8dqsampvg17d3nsm0dcr6c3n5rj09gbi";
+    sha256 = "0vc7f3jki2fdwlgpwhaxzm58g2898wpwbib7dmibb9kxv4jna8gj";
   };
 
   # Delete this on next update; see #79975 for details
   legacyCargoFetcher = true;
-
-  cargoSha256 = "0c2g6yghwqjy21yfdcri4v9aqizd06ww3zx2snns51gnqqk8r57k";
+  cargoSha256 = "1f3gy3agpdg6pck5acxjfrd89hyp9x1byqhfizlizbfmwrqs4il8";
 
   nativeBuildInputs = [ pkg-config ];
 

From 6274ce11a1301a12f024f0ae592d7cdec1df399e Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Wed, 12 Feb 2020 09:17:15 +0100
Subject: [PATCH 0611/4636] cloudflare-wrangler: adding dependencies for darwin

---
 pkgs/development/tools/cloudflare-wrangler/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/cloudflare-wrangler/default.nix b/pkgs/development/tools/cloudflare-wrangler/default.nix
index 76e227aace08..88c52318da46 100644
--- a/pkgs/development/tools/cloudflare-wrangler/default.nix
+++ b/pkgs/development/tools/cloudflare-wrangler/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl
+{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -18,7 +18,12 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ openssl ];
+  buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [
+                  curl
+                  darwin.apple_sdk.frameworks.Security
+                  darwin.apple_sdk.frameworks.CoreServices
+                  darwin.apple_sdk.frameworks.CoreFoundation
+                ];
 
   # tries to use "/homeless-shelter" and fails
   doCheck = false;

From 0c0a338d20ab628706fd645caa0257161e239c4e Mon Sep 17 00:00:00 2001
From: Jacek Galowicz <jacek.galowicz@cyberus-technology.de>
Date: Fri, 14 Feb 2020 09:56:32 +0100
Subject: [PATCH 0612/4636] nixosTests.krb5: Port to python

---
 nixos/tests/krb5/deprecated-config.nix | 6 ++++--
 nixos/tests/krb5/example-config.nix    | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/krb5/deprecated-config.nix b/nixos/tests/krb5/deprecated-config.nix
index 7d7926309c95..be6ebce9e051 100644
--- a/nixos/tests/krb5/deprecated-config.nix
+++ b/nixos/tests/krb5/deprecated-config.nix
@@ -1,7 +1,7 @@
 # Verifies that the configuration suggested in deprecated example values
 # will result in the expected output.
 
-import ../make-test.nix ({ pkgs, ...} : {
+import ../make-test-python.nix ({ pkgs, ...} : {
   name = "krb5-with-deprecated-config";
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ eqyiel ];
@@ -43,6 +43,8 @@ import ../make-test.nix ({ pkgs, ...} : {
 
     '';
   in ''
-    $machine->succeed("diff /etc/krb5.conf ${snapshot}");
+    machine.succeed(
+        "diff /etc/krb5.conf ${snapshot}"
+    )
   '';
 })
diff --git a/nixos/tests/krb5/example-config.nix b/nixos/tests/krb5/example-config.nix
index f01cf6988eef..be195b513935 100644
--- a/nixos/tests/krb5/example-config.nix
+++ b/nixos/tests/krb5/example-config.nix
@@ -1,7 +1,7 @@
 # Verifies that the configuration suggested in (non-deprecated) example values
 # will result in the expected output.
 
-import ../make-test.nix ({ pkgs, ...} : {
+import ../make-test-python.nix ({ pkgs, ...} : {
   name = "krb5-with-example-config";
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ eqyiel ];
@@ -101,6 +101,8 @@ import ../make-test.nix ({ pkgs, ...} : {
         default      = SYSLOG:NOTICE
     '';
   in ''
-    $machine->succeed("diff /etc/krb5.conf ${snapshot}");
+    machine.succeed(
+        "diff /etc/krb5.conf ${snapshot}"
+    )
   '';
 })

From 32e3d156386895bbe96dfcf33bcfc59fe3dca78b Mon Sep 17 00:00:00 2001
From: Jacek Galowicz <jacek.galowicz@cyberus-technology.de>
Date: Fri, 14 Feb 2020 09:56:43 +0100
Subject: [PATCH 0613/4636] nixosTests.krb5: Add to all-tests.nix

---
 nixos/tests/all-tests.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 671f87a43944..a854365f752e 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -145,6 +145,7 @@ in
   kernel-testing = handleTest ./kernel-testing.nix {};
   keymap = handleTest ./keymap.nix {};
   knot = handleTest ./knot.nix {};
+  krb5 = discoverTests (import ./krb5 {});
   kubernetes.dns = handleTestOn ["x86_64-linux"] ./kubernetes/dns.nix {};
   # kubernetes.e2e should eventually replace kubernetes.rbac when it works
   #kubernetes.e2e = handleTestOn ["x86_64-linux"] ./kubernetes/e2e.nix {};

From c589de98e247e87b7e6e5274c1226d888c3f207b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 11 Feb 2020 17:45:17 +0100
Subject: [PATCH 0614/4636] =?UTF-8?q?ocamlPackages.resource-pooling:=200.6?=
 =?UTF-8?q?=20=E2=86=92=201.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ocamlPackages.ocsigen-start: 1.8.0 → 2.7.0
---
 .../ocaml-modules/ocsigen-start/default.nix   | 11 ++++----
 .../resource-pooling/default.nix              | 27 +++++++------------
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix
index a8eea5b0c072..bbdf3d56a474 100644
--- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server
+{ stdenv, fetchFromGitHub, ocaml, findlib, camlp4, ocsigen-toolkit, pgocaml, macaque, safepass, yojson
 , js_of_ocaml-camlp4, lwt_camlp4
+, cohttp-lwt-unix
 , resource-pooling
 }:
 
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-ocsigen-start-${version}";
-  version = "1.8.0";
+  version = "2.7.0";
 
-  buildInputs = [ ocaml findlib eliom js_of_ocaml-camlp4 lwt_camlp4 ];
-  propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server resource-pooling ];
+  buildInputs = [ ocaml findlib js_of_ocaml-camlp4 lwt_camlp4 ];
+  propagatedBuildInputs = [ pgocaml macaque safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix camlp4 ];
 
   patches = [ ./templates-dir.patch ];
 
@@ -22,7 +23,7 @@ stdenv.mkDerivation rec {
     owner = "ocsigen";
     repo = "ocsigen-start";
     rev = version;
-    sha256 = "0h5gp06vxy6jpppz1x840gyf9viiy7lic7spx7fxldpy2jpv058s";
+    sha256 = "1kp9g679xnff2ybwsicnc9c203hi9ri1ijbpp6221b2sj6zxf2wc";
   };
 
   meta = {
diff --git a/pkgs/development/ocaml-modules/resource-pooling/default.nix b/pkgs/development/ocaml-modules/resource-pooling/default.nix
index 9a053d4e9a2e..773fb76bcc75 100644
--- a/pkgs/development/ocaml-modules/resource-pooling/default.nix
+++ b/pkgs/development/ocaml-modules/resource-pooling/default.nix
@@ -1,35 +1,26 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, lwt_log }:
+{ lib, fetchFromGitHub, buildDunePackage, lwt_log }:
 
-let pname = "resource-pooling"; in
+buildDunePackage rec {
+  version = "1.1";
+  pname = "resource-pooling";
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.06"
-then throw "${pname} is not available for OCaml ${ocaml.version}"
-else
-
-stdenv.mkDerivation rec {
-  version = "0.6";
-  name = "ocaml${ocaml.version}-${pname}-${version}";
+  minimumOCamlVersion = "4.06";
 
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = pname;
     rev = version;
-    sha256 = "1hw98a4pndq6ms4vfsyz0ynfz8g21fm73fc7s1gx824fhdx4ywgd";
+    sha256 = "0wsbnwszafdv3gsiiaslgf6m6pfx74h7h19i0gp2c4ivdiv3wck9";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild ];
   propagatedBuildInputs = [ lwt_log ];
 
-  configurePhase = "ocaml setup.ml -configure --prefix $out";
-  buildPhase = "ocaml setup.ml -build";
-  createFindlibDestdir = true;
-  installPhase = "ocaml setup.ml -install";
+  doCheck = true;
 
   meta = {
     inherit (src.meta) homepage;
-    inherit (ocaml.meta) platforms;
     description = "A library for pooling resources like connections, threads, or similar";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vbgl ];
   };
 }

From dd95c8149aadff4bc8b0c8a8f7ace18e5facd53a Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 14 Feb 2020 04:20:00 -0500
Subject: [PATCH 0615/4636] racket: 7.5 -> 7.6

Changelog: https://download.racket-lang.org/v7.6.html
---
 pkgs/development/interpreters/racket/default.nix | 4 ++--
 pkgs/development/interpreters/racket/minimal.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index f12d1f1090fb..3e9716af5508 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -46,7 +46,7 @@ in
 
 stdenv.mkDerivation rec {
   pname = "racket";
-  version = "7.5"; # always change at once with ./minimal.nix
+  version = "7.6"; # always change at once with ./minimal.nix
 
   src = (stdenv.lib.makeOverridable ({ name, sha256 }:
     fetchurl {
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     }
   )) {
     name = "${pname}-${version}";
-    sha256 = "0b74v0pqkx57x2gk0m4sp94jaf6bi1mci4ix9vx4sh2442sbds1j";
+    sha256 = "0yagy7qrnz96gwafnj3whh2vs54788k1ci3vkm100h68gsw638b8";
   };
 
   FONTCONFIG_FILE = fontsConf;
diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix
index df7c72c4a681..9e817b760003 100644
--- a/pkgs/development/interpreters/racket/minimal.nix
+++ b/pkgs/development/interpreters/racket/minimal.nix
@@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec {
   name = "racket-minimal-${oldAttrs.version}";
   src = oldAttrs.src.override {
     inherit name;
-    sha256 = "0478f0phkjch10ncsl8lm8a1m8qvgchrkgzpcaxyhmg2clyjgn8r";
+    sha256 = "0id094q9024hj2n3907l7dblp3iix1v5289xzskmh5c26xfygp9y";
   };
 
   meta = oldAttrs.meta // {

From 310b108efa5f7192bee0571c5641c5d1a46c7523 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 14 Feb 2020 04:20:00 -0500
Subject: [PATCH 0616/4636] lepton: enable on darwin

---
 pkgs/tools/graphics/lepton/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/graphics/lepton/default.nix b/pkgs/tools/graphics/lepton/default.nix
index 0b6c12639423..2a4f8a310ada 100644
--- a/pkgs/tools/graphics/lepton/default.nix
+++ b/pkgs/tools/graphics/lepton/default.nix
@@ -1,24 +1,24 @@
 { stdenv, fetchFromGitHub, cmake, git, glibc }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   version = "1.2.1";
   pname = "lepton";
 
   src = fetchFromGitHub {
     repo = "lepton";
     owner = "dropbox";
-    rev = "c378cbfa2daaa99e8828be7395013f94cedb1bcc";
+    rev = version;
     sha256 = "1f2vyp0crj4yw27bs53vykf2fqk4w57gv3lh9dp89dh3y7wwh1ba";
   };
 
   nativeBuildInputs = [ cmake git ];
-  buildInputs = [ glibc.static ];
+  buildInputs = stdenv.lib.optionals stdenv.isLinux [ glibc.static ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/dropbox/lepton;
     description = "A tool to losslessly compress JPEGs";
     license = licenses.asl20;
-    platforms = [ "x86_64-linux" ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
     maintainers = with maintainers; [ artemist ];
   };
 }

From 2e651faa3c59769ab8a71c9674c675247ea45735 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 14 Feb 2020 04:20:00 -0500
Subject: [PATCH 0617/4636] bazel-remote: 2020-01-29 -> 1.0.0

---
 .../tools/build-managers/bazel/bazel-remote/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
index f2f3588ba29c..ffdeb01c2bb1 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
@@ -8,13 +8,13 @@
 
 buildBazelPackage rec {
   name = "bazel-remote-${version}";
-  version = "2020-01-29";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "buchgr";
     repo = "bazel-remote";
-    rev = "ae9378321552dd14066332f8fa55076040228cb7";
-    sha256 = "1jbd319n255cmmncnjfdkdcpx0x62asp3dqwgl6vimx4dqqj8v1p";
+    rev = "v${version}";
+    sha256 = "1fpdw139d5q1377qnqbgkahmdr4mdaa17d2m10wkyvyvijwm4r2m";
   };
 
   nativeBuildInputs = [ go git ];

From 40556c961757f09f5a70c12245e6ec7693126558 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Feb 2020 09:45:51 +0000
Subject: [PATCH 0618/4636] worker: 4.2.0 -> 4.3.0

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

diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix
index 6bc118897b0f..d8d9598e54a2 100644
--- a/pkgs/applications/misc/worker/default.nix
+++ b/pkgs/applications/misc/worker/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "worker";
-  version = "4.2.0";
+  version = "4.3.0";
 
   src = fetchurl {
     url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz";
-    sha256 = "17b845x09q0cfk12hd3f7y08diqrflrr2aj2nwf4szy4f52jk5gz";
+    sha256 = "0s7i1qjnh4mfjyrfvbbr1dklqi0n2nwksls21106q633wk9qdlqx";
   };
 
   buildInputs = [ libX11 ];

From 5ef31532b14ebf9eca3e156839c54345b69b8a11 Mon Sep 17 00:00:00 2001
From: Lenz Weber <lenz.weber@mayflower.de>
Date: Fri, 14 Feb 2020 11:36:11 +0100
Subject: [PATCH 0619/4636] androidenv build-tools: fix old versions under
 linux

---
 pkgs/development/mobile/androidenv/build-tools.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix
index 9e273468cd3f..e648c83fa17d 100644
--- a/pkgs/development/mobile/androidenv/build-tools.nix
+++ b/pkgs/development/mobile/androidenv/build-tools.nix
@@ -7,8 +7,10 @@ deployAndroidPackage {
   patchInstructions = ''
     ${lib.optionalString (os == "linux") ''
       addAutoPatchelfSearchPath $packageBaseDir/lib
-      addAutoPatchelfSearchPath $packageBaseDir/lib64
-      autoPatchelf --no-recurse $packageBaseDir/lib64
+      if [[ -d $packageBaseDir/lib64 ]]; then
+        addAutoPatchelfSearchPath $packageBaseDir/lib64
+        autoPatchelf --no-recurse $packageBaseDir/lib64
+      fi
       autoPatchelf --no-recurse $packageBaseDir
     ''}
 

From c17c99800008c5f530fa49a0eebac7bd6c087853 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Feb 2020 11:06:33 +0000
Subject: [PATCH 0620/4636] xpra: 3.0.5 -> 3.0.6

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

diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index e6d1d7c64245..ea4e84889f9f 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -14,11 +14,11 @@ let
   xf86videodummy = callPackage ./xf86videodummy { };
 in buildPythonApplication rec {
   pname = "xpra";
-  version = "3.0.5";
+  version = "3.0.6";
 
   src = fetchurl {
     url = "https://xpra.org/src/${pname}-${version}.tar.xz";
-    sha256 = "1zy4q8sq0j00ybxw3v8ylaj2aj10x2gb0a05aqbcnrwp3hf983vz";
+    sha256 = "0msm53iphb6zr1phb2knkrn94hjcg3a9n1vvbis5sipdvlx50m08";
   };
 
   patches = [

From 8dca34015ad0a02bbb403ff68b18b78349ee5662 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Feb 2020 11:58:06 +0000
Subject: [PATCH 0621/4636] yaru-theme: 19.10.5 -> 20.04.1

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

diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix
index 2c3686f63d04..27a879af1842 100644
--- a/pkgs/data/themes/yaru/default.nix
+++ b/pkgs/data/themes/yaru/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "yaru";
-  version = "19.10.5";
+  version = "20.04.1";
 
   src = fetchFromGitHub {
     owner = "ubuntu";
     repo = "yaru";
     rev = version;
-    sha256 = "0d53flfkb01kycchdhv72ga0qh8947bxvm5njfrrbk6rqfg0zc1v";
+    sha256 = "0c9az0bmnrnkgxfifp6nkan5bvjrkqrpg38zsp2vg493bm3bpbg1";
   };
 
   nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ];

From 5359d90b151f2a427becd25887512c4e4a8e6a0b Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Fri, 14 Feb 2020 12:00:00 +0000
Subject: [PATCH 0622/4636] nixos/btrfs: make autoScrub not prevent shutdown or
 suspend

Fixes: #79086 #79017
---
 nixos/modules/tasks/filesystems/btrfs.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/filesystems/btrfs.nix b/nixos/modules/tasks/filesystems/btrfs.nix
index 48be18c71021..f64493e1a3c7 100644
--- a/nixos/modules/tasks/filesystems/btrfs.nix
+++ b/nixos/modules/tasks/filesystems/btrfs.nix
@@ -118,12 +118,17 @@ in
           fs' = utils.escapeSystemdPath fs;
         in nameValuePair "btrfs-scrub-${fs'}" {
           description = "btrfs scrub on ${fs}";
+          # scrub prevents suspend2ram or proper shutdown
+          conflicts = [ "shutdown.target" "sleep.target" ];
+          before = [ "shutdown.target" "sleep.target" ];
 
           serviceConfig = {
-            Type = "oneshot";
+            # simple and not oneshot, otherwise ExecStop is not used
+            Type = "simple";
             Nice = 19;
             IOSchedulingClass = "idle";
             ExecStart = "${pkgs.btrfs-progs}/bin/btrfs scrub start -B ${fs}";
+            ExecStop  = "${pkgs.btrfs-progs}/bin/btrfs scrub cancel ${fs}";
           };
         };
       in listToAttrs (map scrubService cfgScrub.fileSystems);

From f6519103bf8c8217c4007baaeb8bcaa1fcf95f1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 14 Feb 2020 13:18:37 +0100
Subject: [PATCH 0623/4636] glibc: use python3Minimal instead of python3

This should improve the speed of bootstrapping process.
Cost of evaluation also decreases a bit,
but I don't expect that will be significant.
---
 pkgs/development/libraries/glibc/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 7ccba0072e28..d1ff681097dd 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -24,7 +24,7 @@
 , gd ? null, libpng ? null
 , libidn2
 , bison
-, python3
+, python3Minimal
 }:
 
 { name
@@ -155,7 +155,7 @@ stdenv.mkDerivation ({
   outputs = [ "out" "bin" "dev" "static" ];
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs = [ bison python3 ];
+  nativeBuildInputs = [ bison python3Minimal ];
   buildInputs = [ linuxHeaders ] ++ lib.optionals withGd [ gd libpng ];
 
   # Needed to install share/zoneinfo/zone.tab.  Set to impure /bin/sh to

From 5a8000dc0517f10bafe386a534d0583b9e514889 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 14 Feb 2020 13:22:44 +0100
Subject: [PATCH 0624/4636] openssl: revert a workaround that's no longer
 needed

Thanks to python3Minimal.  This reverts part of c2038483f #79738.
---
 pkgs/development/libraries/openssl/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 9986c2217f7c..63657cfc5e6e 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -36,9 +36,7 @@ let
 
     outputs = [ "bin" "dev" "out" "man" ] ++ optional withDocs "doc";
     setOutputFlags = false;
-    separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false)
-      && stdenv.hostPlatform == stdenv.buildPlatform # unable to fix infinite recursion on stdenv.cc
-      && stdenv.cc.isGNU;
+    separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU;
 
     nativeBuildInputs = [ perl ];
     buildInputs = stdenv.lib.optional withCryptodev cryptodev;

From f74988f8a593798437df52f3298e8250eb5c1771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 14 Feb 2020 09:27:50 -0300
Subject: [PATCH 0625/4636] mate.marco: add dependence on mate-settings-daemon

Settings schema 'org.mate.peripherals-mouse' is needed by marco-1.24.x
and is provided by mate-settings-daemon.
---
 pkgs/desktops/mate/marco/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix
index 2a2bd9a46641..5d6f13a17793 100644
--- a/pkgs/desktops/mate/marco/default.nix
+++ b/pkgs/desktops/mate/marco/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "marco";
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
     libstartup_notification
     gtk3
     gnome3.zenity
+    mate-settings-daemon
   ];
 
   meta = with stdenv.lib; {

From 193eeab4bcf7ae8c75627a70c6f9e6daf6320ad1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Feb 2020 13:30:57 +0000
Subject: [PATCH 0626/4636] chezmoi: 1.7.12 -> 1.7.13

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

diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix
index c0d915d1f82b..da8f8c789181 100644
--- a/pkgs/tools/misc/chezmoi/default.nix
+++ b/pkgs/tools/misc/chezmoi/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "chezmoi";
-  version = "1.7.12";
+  version = "1.7.13";
 
   src = fetchFromGitHub {
     owner = "twpayne";
     repo = "chezmoi";
     rev = "v${version}";
-    sha256 = "0ab35dfapm38g92lagsv3nsp8aamrvrpxglhcxrnnajs7h8w3kjh";
+    sha256 = "1xqmr7sps5s3ib4q91z7drwlglp1av37gb2jm0zw7y3ijyp2c749";
   };
 
   modSha256 = "07fglc3k3a5y70slly4ri3izwnyk4nwghmvkjwgc8lbw8m1zx0r8";

From 698a3c65d5fc033a1e43713a4153a514291fa8d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 14 Feb 2020 11:09:49 -0300
Subject: [PATCH 0627/4636] mate: all applications have been migrated from
 intltools to gettext

---
 pkgs/desktops/mate/atril/default.nix                    | 4 ++--
 pkgs/desktops/mate/caja-extensions/default.nix          | 4 ++--
 pkgs/desktops/mate/caja/default.nix                     | 4 ++--
 pkgs/desktops/mate/engrampa/default.nix                 | 4 ++--
 pkgs/desktops/mate/eom/default.nix                      | 4 ++--
 pkgs/desktops/mate/libmatekbd/default.nix               | 4 ++--
 pkgs/desktops/mate/libmatemixer/default.nix             | 4 ++--
 pkgs/desktops/mate/libmateweather/default.nix           | 4 ++--
 pkgs/desktops/mate/marco/default.nix                    | 4 ++--
 pkgs/desktops/mate/mate-applets/default.nix             | 4 ++--
 pkgs/desktops/mate/mate-backgrounds/default.nix         | 4 ++--
 pkgs/desktops/mate/mate-calc/default.nix                | 4 ++--
 pkgs/desktops/mate/mate-control-center/default.nix      | 4 ++--
 pkgs/desktops/mate/mate-desktop/default.nix             | 4 ++--
 pkgs/desktops/mate/mate-icon-theme/default.nix          | 4 ++--
 pkgs/desktops/mate/mate-indicator-applet/default.nix    | 4 ++--
 pkgs/desktops/mate/mate-media/default.nix               | 4 ++--
 pkgs/desktops/mate/mate-menus/default.nix               | 4 ++--
 pkgs/desktops/mate/mate-netbook/default.nix             | 4 ++--
 pkgs/desktops/mate/mate-notification-daemon/default.nix | 4 ++--
 pkgs/desktops/mate/mate-panel/default.nix               | 4 ++--
 pkgs/desktops/mate/mate-polkit/default.nix              | 4 ++--
 pkgs/desktops/mate/mate-power-manager/default.nix       | 4 ++--
 pkgs/desktops/mate/mate-screensaver/default.nix         | 4 ++--
 pkgs/desktops/mate/mate-sensors-applet/default.nix      | 4 ++--
 pkgs/desktops/mate/mate-session-manager/default.nix     | 4 ++--
 pkgs/desktops/mate/mate-settings-daemon/default.nix     | 4 ++--
 pkgs/desktops/mate/mate-system-monitor/default.nix      | 4 ++--
 pkgs/desktops/mate/mate-terminal/default.nix            | 4 ++--
 pkgs/desktops/mate/mate-user-guide/default.nix          | 4 ++--
 pkgs/desktops/mate/mate-user-share/default.nix          | 4 ++--
 pkgs/desktops/mate/mate-utils/default.nix               | 4 ++--
 pkgs/desktops/mate/mozo/default.nix                     | 4 ++--
 pkgs/desktops/mate/pluma/default.nix                    | 5 +++--
 pkgs/desktops/mate/python-caja/default.nix              | 4 ++--
 35 files changed, 71 insertions(+), 70 deletions(-)

diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix
index 4d402ffd9f5a..b7a7e16d462d 100644
--- a/pkgs/desktops/mate/atril/default.nix
+++ b/pkgs/desktops/mate/atril/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, texlive, mate, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, gettext, gtk3, glib, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, texlive, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "atril";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    intltool
+    gettext
     wrapGAppsHook
   ];
 
diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix
index 1704b5051b2e..cb1a82c7e0e0 100644
--- a/pkgs/desktops/mate/caja-extensions/default.nix
+++ b/pkgs/desktops/mate/caja-extensions/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "caja-extensions";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    intltool
+    gettext
     wrapGAppsHook
   ];
 
diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix
index 6508dfa3b8de..c1cc371d4633 100644
--- a/pkgs/desktops/mate/caja/default.nix
+++ b/pkgs/desktops/mate/caja/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, gettext, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "caja";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    intltool
+    gettext
     wrapGAppsHook
   ];
 
diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix
index de685badafc2..06f7f8de6df2 100644
--- a/pkgs/desktops/mate/engrampa/default.nix
+++ b/pkgs/desktops/mate/engrampa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "engrampa";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    intltool
+    gettext
     itstool
     wrapGAppsHook
   ];
diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix
index 2a535e321b56..a5cfd8be88e5 100644
--- a/pkgs/desktops/mate/eom/default.nix
+++ b/pkgs/desktops/mate/eom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, gettext, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "eom";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    intltool
+    gettext
     itstool
     wrapGAppsHook
   ];
diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix
index f4c2241aebb5..6c1bd31d62bf 100644
--- a/pkgs/desktops/mate/libmatekbd/default.nix
+++ b/pkgs/desktops/mate/libmatekbd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxklavier }:
+{ stdenv, fetchurl, pkgconfig, gettext, gtk3, libxklavier }:
 
 stdenv.mkDerivation rec {
   pname = "libmatekbd";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1sq7gwr9q3hq4q0vx32qqa68qcqf5by9mqyxnq6lwgaq8ydq16ab";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool ];
+  nativeBuildInputs = [ pkgconfig gettext ];
 
   buildInputs = [ gtk3 libxklavier ];
 
diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix
index ca73c550cb17..ee2cd6284539 100644
--- a/pkgs/desktops/mate/libmatemixer/default.nix
+++ b/pkgs/desktops/mate/libmatemixer/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, fetchurl, pkgconfig, intltool, glib
+{ config, stdenv, fetchurl, pkgconfig, gettext, glib
 , alsaSupport ? stdenv.isLinux, alsaLib
 , pulseaudioSupport ? config.pulseaudio or true, libpulseaudio
 , ossSupport ? false
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "08vkdp2kzy27xwscwp2jj5nz0yblrka2482l6cx3wl4dnk0rpznm";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool ];
+  nativeBuildInputs = [ pkgconfig gettext ];
 
   buildInputs = [ glib ]
     ++ stdenv.lib.optional alsaSupport alsaLib
diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix
index f6c3c9b4e8af..cf9daf8b34ce 100644
--- a/pkgs/desktops/mate/libmateweather/default.nix
+++ b/pkgs/desktops/mate/libmateweather/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libsoup, tzdata }:
+{ stdenv, fetchurl, pkgconfig, gettext, gtk3, libsoup, tzdata }:
 
 stdenv.mkDerivation rec {
   pname = "libmateweather";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "094mnlczxq9crjj8z7dzs1zmwscdkbp54l3qjaf4a4bhd8lihv8d";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool ];
+  nativeBuildInputs = [ pkgconfig gettext ];
 
   buildInputs = [ gtk3 libsoup tzdata ];
 
diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix
index 5d6f13a17793..a1d8eed8d283 100644
--- a/pkgs/desktops/mate/marco/default.nix
+++ b/pkgs/desktops/mate/marco/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "marco";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    intltool
+    gettext
     itstool
     wrapGAppsHook
   ];
diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix
index 2af9c6940d43..e7d4eda2f341 100644
--- a/pkgs/desktops/mate/mate-applets/default.nix
+++ b/pkgs/desktops/mate/mate-applets/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "mate-applets";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    intltool
+    gettext
     itstool
     wrapGAppsHook
   ];
diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix
index 6cb7d365ff68..4b649c6b2933 100644
--- a/pkgs/desktops/mate/mate-backgrounds/default.nix
+++ b/pkgs/desktops/mate/mate-backgrounds/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool }:
+{ stdenv, fetchurl, gettext }:
 
 stdenv.mkDerivation rec {
   pname = "mate-backgrounds";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "16rmsy02fyq6mj6xgc5mdyh146z3zmkn7iwsi44s962aqwbpn4i8";
   };
 
-  nativeBuildInputs = [ intltool ];
+  nativeBuildInputs = [ gettext ];
 
   meta = with stdenv.lib; {
     description = "Background images and data for MATE";
diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix
index 7a1d97a1968f..c0e82c391e8f 100644
--- a/pkgs/desktops/mate/mate-calc/default.nix
+++ b/pkgs/desktops/mate/mate-calc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, libxml2, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "mate-calc";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    intltool
+    gettext
     itstool
     wrapGAppsHook
   ];
diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix
index beae8dc63ecb..c8119a923d15 100644
--- a/pkgs/desktops/mate/mate-control-center/default.nix
+++ b/pkgs/desktops/mate/mate-control-center/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus-glib,
+{ stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, dbus-glib,
   libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3,
   desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook
 }:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    intltool
+    gettext
     itstool
     desktop-file-utils
     wrapGAppsHook
diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix
index 48d672a64782..96f035e7115f 100644
--- a/pkgs/desktops/mate/mate-desktop/default.nix
+++ b/pkgs/desktops/mate/mate-desktop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "mate-desktop";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    intltool
+    gettext
     wrapGAppsHook
   ];
 
diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix
index b639bcf282da..59a19af54801 100644
--- a/pkgs/desktops/mate/mate-icon-theme/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, gtk3, hicolor-icon-theme }:
+{ stdenv, fetchurl, pkgconfig, gettext, iconnamingutils, librsvg, gtk3, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
   pname = "mate-icon-theme";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0a2lz61ivwwcdznmwlmgjr6ipr9sdl5g2czbagnpxkwz8f3m77na";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool iconnamingutils ];
+  nativeBuildInputs = [ pkgconfig gettext iconnamingutils ];
 
   buildInputs = [ librsvg ];
 
diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix
index 731c1c835729..b9cb58ffe768 100644
--- a/pkgs/desktops/mate/mate-indicator-applet/default.nix
+++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "mate-indicator-applet";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    intltool
+    gettext
     wrapGAppsHook
   ];
 
diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix
index 1f1f77ae5189..3ff6fe163adc 100644
--- a/pkgs/desktops/mate/mate-media/default.nix
+++ b/pkgs/desktops/mate/mate-media/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "mate-media";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    intltool
+    gettext
     libtool
     wrapGAppsHook
   ];
diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix
index 93ba4f59efc7..2ad108ba7507 100644
--- a/pkgs/desktops/mate/mate-menus/default.nix
+++ b/pkgs/desktops/mate/mate-menus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, gobject-introspection, python3 }:
+{ stdenv, fetchurl, pkgconfig, gettext, glib, gobject-introspection, python3 }:
 
 stdenv.mkDerivation rec {
   pname = "mate-menus";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1vv4j38h7mrbfrsj99k25z6y7b5dg30fzd2qnhk7pl8ca8s1jhrd";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];
+  nativeBuildInputs = [ pkgconfig gettext gobject-introspection ];
 
   buildInputs = [ glib python3 ];
 
diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix
index 63284bb51884..8669205168c4 100644
--- a/pkgs/desktops/mate/mate-netbook/default.nix
+++ b/pkgs/desktops/mate/mate-netbook/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, gettext, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "mate-netbook";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    intltool
+    gettext
     wrapGAppsHook
   ];
 
diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix
index e1e276d1b190..172dd1a61087 100644
--- a/pkgs/desktops/mate/mate-notification-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, libcanberra-gtk3,
+{ stdenv, fetchurl, pkgconfig, gettext, glib, libcanberra-gtk3,
   libnotify, libwnck3, gtk3, libxml2, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    intltool
+    gettext
     libxml2 # for xmllint
     wrapGAppsHook
   ];
diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix
index 7436415ff6d4..d98d90c16061 100644
--- a/pkgs/desktops/mate/mate-panel/default.nix
+++ b/pkgs/desktops/mate/mate-panel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, gettext, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "mate-panel";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     gobject-introspection
-    intltool
+    gettext
     itstool
     pkgconfig
     wrapGAppsHook
diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix
index 8847046dd956..e65e37d92810 100644
--- a/pkgs/desktops/mate/mate-polkit/default.nix
+++ b/pkgs/desktops/mate/mate-polkit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }:
+{ stdenv, fetchurl, pkgconfig, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }:
 
 stdenv.mkDerivation rec {
   pname = "mate-polkit";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     gobject-introspection
-    intltool
+    gettext
     pkgconfig
   ];
 
diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix
index 2e9a04ff8553..71dfb9c1a200 100644
--- a/pkgs/desktops/mate/mate-power-manager/default.nix
+++ b/pkgs/desktops/mate/mate-power-manager/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "mate-power-manager";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    intltool
+    gettext
     libtool
     wrapGAppsHook
   ];
diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix
index 3c5216ec8f39..8acde9fb3965 100644
--- a/pkgs/desktops/mate/mate-screensaver/default.nix
+++ b/pkgs/desktops/mate/mate-screensaver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "mate-screensaver";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    intltool
+    gettext
     libxml2 # provides xmllint
     wrapGAppsHook
   ];
diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix
index 1f401c8e5614..92cc283ab336 100644
--- a/pkgs/desktops/mate/mate-sensors-applet/default.nix
+++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "mate-sensors-applet";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    intltool
+    gettext
     itstool
     wrapGAppsHook
   ];
diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix
index 6fe1996c6b56..0aedcd3cc342 100644
--- a/pkgs/desktops/mate/mate-session-manager/default.nix
+++ b/pkgs/desktops/mate/mate-session-manager/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, xtrans, dbus-glib, systemd,
+{ stdenv, fetchurl, pkgconfig, gettext, xtrans, dbus-glib, systemd,
   libSM, libXtst, gtk3, epoxy, polkit, hicolor-icon-theme, mate,
   wrapGAppsHook
 }:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    intltool
+    gettext
     xtrans
     wrapGAppsHook
   ];
diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix
index 2eff667511d7..af50ba8d8e43 100644
--- a/pkgs/desktops/mate/mate-settings-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, dbus-glib, libxklavier,
+{ stdenv, fetchurl, pkgconfig, gettext, glib, dbus-glib, libxklavier,
   libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate,
   pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio,
   wrapGAppsHook }:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    intltool
+    gettext
     pkgconfig
     wrapGAppsHook
   ];
diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix
index ce281ebdda1b..84e5ae5d5d9a 100644
--- a/pkgs/desktops/mate/mate-system-monitor/default.nix
+++ b/pkgs/desktops/mate/mate-system-monitor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "mate-system-monitor";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    intltool
+    gettext
     itstool
     wrapGAppsHook
   ];
diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix
index f09c119fc817..a0f98a864c1f 100644
--- a/pkgs/desktops/mate/mate-terminal/default.nix
+++ b/pkgs/desktops/mate/mate-terminal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, dconf, gtk3, vte, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "mate-terminal";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    intltool
+    gettext
     wrapGAppsHook
   ];
 
diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix
index d635fa8da6db..89a5e9720e65 100644
--- a/pkgs/desktops/mate/mate-user-guide/default.nix
+++ b/pkgs/desktops/mate/mate-user-guide/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, itstool, libxml2, yelp }:
+{ stdenv, fetchurl, gettext, itstool, libxml2, yelp }:
 
 stdenv.mkDerivation rec {
   pname = "mate-user-guide";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ddxya84iydvy85dbqls0wmz2rph87wri3rsdhv4rkbhh5g4sd7f";
   };
 
-  nativeBuildInputs = [ itstool intltool libxml2 ];
+  nativeBuildInputs = [ itstool gettext libxml2 ];
 
   buildInputs = [ yelp ];
 
diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix
index a8777fa4dd72..eddf5ea4b29b 100644
--- a/pkgs/desktops/mate/mate-user-share/default.nix
+++ b/pkgs/desktops/mate/mate-user-share/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "mate-user-share";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    intltool
+    gettext
     itstool
     libxml2
     wrapGAppsHook
diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix
index 0d4ab907ef2b..e36ff69a6fa7 100644
--- a/pkgs/desktops/mate/mate-utils/default.nix
+++ b/pkgs/desktops/mate/mate-utils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "mate-utils";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    intltool
+    gettext
     itstool
     inkscape
     wrapGAppsHook
diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix
index eb5361787a84..3abadc00fe4b 100644
--- a/pkgs/desktops/mate/mozo/default.nix
+++ b/pkgs/desktops/mate/mozo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3, fetchurl, pkgconfig, intltool, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }:
+{ stdenv, python3, fetchurl, pkgconfig, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "mozo";
@@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "01lyi47a04xk0by5bvnfmqgv5sysk2wdlri6a4ssmy1qhgwh9zr3";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool gobject-introspection wrapGAppsHook ];
+  nativeBuildInputs = [ pkgconfig gettext gobject-introspection wrapGAppsHook ];
 
   propagatedBuildInputs =  [ mate.mate-menus python3.pkgs.pygobject3 ];
 
diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix
index f617799bedaf..fe4a8e488211 100644
--- a/pkgs/desktops/mate/pluma/default.nix
+++ b/pkgs/desktops/mate/pluma/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, gettext, perl, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "pluma";
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    intltool
+    gettext
+    perl
     itstool
     isocodes
     wrapGAppsHook
diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix
index 041bd3e121c1..ad4e46555aa6 100644
--- a/pkgs/desktops/mate/python-caja/default.nix
+++ b/pkgs/desktops/mate/python-caja/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, mate, python3Packages }:
+{ stdenv, fetchurl, pkgconfig, gettext, gtk3, mate, python3Packages }:
 
 stdenv.mkDerivation rec {
   pname = "python-caja";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    intltool
+    gettext
     python3Packages.wrapPython
   ];
 

From 854638ea2953b9285379840abba539fd559d5712 Mon Sep 17 00:00:00 2001
From: Danylo Hlynskyi <abcz2.uprola@gmail.com>
Date: Fri, 14 Feb 2020 16:16:02 +0200
Subject: [PATCH 0628/4636] zoom-us: fix launch (#80005)

zoom-us: fix launch

Probably due to glibc update, ZoomLauncher became broken when v4l is present in
LD_PRELOAD path. It can be fixed by a) removing ZoomLauncher from startup chain,
so `zoom` is started directly or b) removing v4l from LD_PRELOAD.

The reason v4l was added before was because my video was rotated upside down without it.
Seem like nowadays this is fixed by Zoom itself, so I'm removing it.

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

Co-authored-by: @mmlb
---
 .../networking/instant-messengers/zoom-us/default.nix          | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index cc19bbd7156f..d22c1cefc2f4 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -5,7 +5,7 @@
 , qtimageformats, qtlocation, qtquickcontrols, qtquickcontrols2, qtscript, qtsvg
 , qttools, qtwayland, qtwebchannel, qtwebengine
 # Runtime
-, coreutils, libjpeg_turbo, pciutils, procps, utillinux, libv4l
+, coreutils, libjpeg_turbo, pciutils, procps, utillinux
 , pulseaudioSupport ? true, libpulseaudio ? null
 }:
 
@@ -101,7 +101,6 @@ in mkDerivation {
 
   qtWrapperArgs = [
     ''--prefix PATH : ${makeBinPath [ coreutils glib.dev pciutils procps qttools.dev utillinux ]}''
-    ''--prefix LD_PRELOAD : ${libv4l}/lib/libv4l/v4l2convert.so''
     # --run "cd ${placeholder "out"}/share/zoom-us"
     # ^^ unfortunately, breaks run arg into multiple array elements, due to
     # some bad array propagation. We'll do that in bash below

From 70e22cb61e68d1ebe9656f81ee77594691d57de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Fri, 14 Feb 2020 15:24:40 +0100
Subject: [PATCH 0629/4636] cargo-crev: 0.15.0 -> 0.16.0

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

diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix
index 03e052043314..b1d326ebdb76 100644
--- a/pkgs/development/tools/rust/cargo-crev/default.nix
+++ b/pkgs/development/tools/rust/cargo-crev/default.nix
@@ -2,19 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-crev";
-  version = "0.15.0";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "crev-dev";
     repo = "cargo-crev";
     rev = "v${version}";
-    sha256 = "1v7m2yy54jm5mkg9n3wnba1j5ldw6mvk2sgbngx1q240wnc9vbnk";
+    sha256 = "1vf78hrc84xgr73r72vmilh24s4qy80a1z6gyk97nd8ipn93m2k5";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "09kcvrhklbzjjyqikj9c53w24qy3f6v5hb16ib4fq1s2ia77rgl2";
+  cargoSha256 = "0h7izq4sq6nf0gip7ylyglq1mvpfipm4qmjsifb3x559lqwfbxli";
 
   nativeBuildInputs = [ pkgconfig ];
 

From 7666bf47c79c3af0bf61ec86f248d125eee7bec1 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 14 Feb 2020 17:16:10 +0100
Subject: [PATCH 0630/4636] linuxPackages.wireguard: 0.0.20200205 ->
 0.0.20200214

https://lists.zx2c4.com/pipermail/wireguard/2020-February/005013.html
---
 pkgs/os-specific/linux/wireguard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index f0c3de0229a7..3a6dca0e8b17 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6";
 
 stdenv.mkDerivation rec {
   pname = "wireguard";
-  version = "0.0.20200205";
+  version = "0.0.20200214";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz";
-    sha256 = "084bvjhfqxvbh5wv7a2cj8k1i1lfix2l9972xwr36hw9kvqpynnm";
+    sha256 = "1nc2w429r0vvfxhlca6va01164mgs2pqf2s5vjf32yy9irs553aa";
   };
 
   preConfigure = ''

From 72b3595b941a4f8f7effdb561b13d85a32197754 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 14 Feb 2020 05:06:04 -0600
Subject: [PATCH 0631/4636] webkitgtk: 2.26.3 -> 2.26.4

(cherry picked from commit 6b155e2269e2372b23ca84c502fddd6205d50eb1)
---
 pkgs/development/libraries/webkitgtk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 8d1129c11685..aa3d874979f2 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -61,13 +61,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "webkitgtk";
-  version = "2.26.3";
+  version = "2.26.4";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
-    sha256 = "04g6y0sv04d20bw401myq3k828ikysjhx383ly81vh9wji9i3mdd";
+    sha256 = "0gqi9f9njrdn8vad1zvr59b25arwc8r0n8bp25sgkbfz2c3r11j3";
   };
 
   patches = optionals stdenv.isLinux [

From 7c92d539c1cbaa372d47eef139193b25f535187f Mon Sep 17 00:00:00 2001
From: Arnold Farkas <59696216+arnoldfarkas@users.noreply.github.com>
Date: Fri, 14 Feb 2020 17:35:36 +0100
Subject: [PATCH 0632/4636] pythonPackages.zstandard: init at 0.13.0 (#79215)

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

diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix
new file mode 100755
index 000000000000..bcac246e8f62
--- /dev/null
+++ b/pkgs/development/python-modules/zstandard/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, cffi
+, hypothesis
+, zstd
+}:
+
+buildPythonPackage rec {
+  pname = "zstandard";
+  version = "0.13.0";
+  
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "e5cbd8b751bd498f275b0582f449f92f14e64f4e03b5bf51c571240d40d43561";
+  };
+  
+  propagatedBuildInputs = [ cffi zstd ];
+  
+  checkInputs = [ hypothesis ];
+    
+  meta = with lib; {
+    description = "zstandard bindings for Python";
+    homepage = "https://github.com/indygreg/python-zstandard";
+    license = licenses.bsdOriginal;
+    maintainers = [ maintainers.arnoldfarkas ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 02c6ef3cd265..ed8f513db86a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6764,6 +6764,8 @@ in {
     inherit (pkgs) zstd pkgconfig;
   };
 
+  zstandard = callPackage ../development/python-modules/zstandard { };
+
   zxcvbn = callPackage ../development/python-modules/zxcvbn { };
 
   incremental = callPackage ../development/python-modules/incremental { };

From 0be376a8e296c86290b28945bc409c5ffbf9546b Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Fri, 14 Feb 2020 16:43:31 +0000
Subject: [PATCH 0633/4636] postgresqlPackages.periods: init at 1.1 (#79255)

---
 pkgs/servers/sql/postgresql/ext/periods.nix | 30 +++++++++++++++++++++
 pkgs/servers/sql/postgresql/packages.nix    |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/servers/sql/postgresql/ext/periods.nix

diff --git a/pkgs/servers/sql/postgresql/ext/periods.nix b/pkgs/servers/sql/postgresql/ext/periods.nix
new file mode 100644
index 000000000000..cf859a4bde05
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/ext/periods.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, postgresql }:
+
+stdenv.mkDerivation rec {
+  pname = "periods";
+  version = "1.1";
+
+  src = fetchFromGitHub {
+    owner = "xocolatl";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0gdnlbh7kp7c0kvsrri2kxdbmm2qgib1qqpl37203z6c3fk45kfh";
+  };
+
+  buildInputs = [ postgresql ];
+
+  installPhase = ''
+    install -D -t $out/lib *.so
+    install -D -t $out/share/postgresql/extension *.sql
+    install -D -t $out/share/postgresql/extension *.control
+  '';
+
+  meta = with stdenv.lib; {
+    description = "PostgreSQL extension implementing SQL standard functionality for PERIODs and SYSTEM VERSIONING";
+    homepage = "https://github.com/xocolatl/periods";
+    maintainers = with maintainers; [ ivan ];
+    platforms = postgresql.meta.platforms;
+    license = licenses.postgresql;
+    broken = versionOlder postgresql.version "9.5";
+  };
+}
diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix
index a6821373389f..15735a82c52e 100644
--- a/pkgs/servers/sql/postgresql/packages.nix
+++ b/pkgs/servers/sql/postgresql/packages.nix
@@ -1,5 +1,7 @@
 self: super: {
 
+    periods = super.callPackage ./ext/periods.nix { };
+
     postgis = super.callPackage ./ext/postgis.nix {
         gdal = self.gdal.override {
             postgresql = self.postgresql;

From 50a597cd7a89d3683c0d209980c307b93745ef32 Mon Sep 17 00:00:00 2001
From: snicket2100 <57048005+snicket2100@users.noreply.github.com>
Date: Fri, 14 Feb 2020 16:52:18 +0000
Subject: [PATCH 0634/4636] installation-cd-graphical-base.nix: adding git
 (#79098)

---
 .../installer/cd-dvd/installation-cd-graphical-base.nix        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
index e0b558dcb0d8..fa19daf13280 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
@@ -44,6 +44,9 @@ with lib;
     pkgs.bvi # binary editor
     pkgs.joe
 
+    # Include some version control tools.
+    pkgs.git
+
     # Firefox for reading the manual.
     pkgs.firefox
 

From c25e18089a27b1193e66f27ad6706c9c4c6eb5c0 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 14 Feb 2020 10:44:30 -0600
Subject: [PATCH 0635/4636] llvmPackages_5.compiler-rt: fix for glibc bump
 using upstream fix

---
 .../llvm/5/compiler-rt-sys-ustat.patch        | 58 +++++++++++++++++++
 .../compilers/llvm/5/compiler-rt.nix          |  3 +-
 2 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/llvm/5/compiler-rt-sys-ustat.patch

diff --git a/pkgs/development/compilers/llvm/5/compiler-rt-sys-ustat.patch b/pkgs/development/compilers/llvm/5/compiler-rt-sys-ustat.patch
new file mode 100644
index 000000000000..d9e9a10d8600
--- /dev/null
+++ b/pkgs/development/compilers/llvm/5/compiler-rt-sys-ustat.patch
@@ -0,0 +1,58 @@
+From 521935db9de17ad08748fd050137ac83b7734835 Mon Sep 17 00:00:00 2001
+From: Craig Topper <craig.topper@intel.com>
+Date: Thu, 24 May 2018 17:59:47 +0000
+Subject: [PATCH] sanitizer: Use pre-computed size of struct ustat for Linux
+
+<sys/ustat.h> has been removed from glibc 2.28 by:
+
+commit cf2478d53ad7071e84c724a986b56fe17f4f4ca7
+Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+Date: Sun Mar 18 11:28:59 2018 +0800
+
+Deprecate ustat syscall interface
+This patch uses pre-computed size of struct ustat for Linux to fix
+
+https://bugs.llvm.org/show_bug.cgi?id=37418
+
+Patch by H.J. Lu.
+
+Differential Revision: https://reviews.llvm.org/D47281
+
+git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@333213 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ .../sanitizer_platform_limits_posix.cc            | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+index 94b8f3f627..936d818673 100644
+--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -159,7 +159,6 @@ typedef struct user_fpregs elf_fpregset_t;
+ # include <sys/procfs.h>
+ #endif
+ #include <sys/user.h>
+-#include <sys/ustat.h>
+ #include <linux/cyclades.h>
+ #include <linux/if_eql.h>
+ #include <linux/if_plip.h>
+@@ -253,7 +252,19 @@ namespace __sanitizer {
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+-  unsigned struct_ustat_sz = sizeof(struct ustat);
++  // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which
++  // has been removed from glibc 2.28.
++#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
++  || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \
++  || defined(__x86_64__)
++#define SIZEOF_STRUCT_USTAT 32
++#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \
++  || defined(__powerpc__) || defined(__s390__)
++#define SIZEOF_STRUCT_USTAT 20
++#else
++#error Unknown size of struct ustat
++#endif
++  unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT;
+   unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
+   unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
+ #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
diff --git a/pkgs/development/compilers/llvm/5/compiler-rt.nix b/pkgs/development/compilers/llvm/5/compiler-rt.nix
index 0282591b6e20..4740180eb294 100644
--- a/pkgs/development/compilers/llvm/5/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/5/compiler-rt.nix
@@ -16,7 +16,8 @@ stdenv.mkDerivation {
 
   patches = [
     ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
-  ] ++ optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch;
+  ] ++ optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
+    ++ optional (stdenv.hostPlatform.libc == "glibc") ./compiler-rt-sys-ustat.patch;
 
   # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
   # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra

From af1eb21dbf91e165a51b3618910d9e4a3d0de5dd Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 14 Feb 2020 08:38:11 -0800
Subject: [PATCH 0636/4636] python3Packages.csvs-to-sqlite: remove pandas
 version constraint

---
 pkgs/development/python-modules/csvs-to-sqlite/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/csvs-to-sqlite/default.nix b/pkgs/development/python-modules/csvs-to-sqlite/default.nix
index 0e5e902be2e3..15f43eb994e6 100644
--- a/pkgs/development/python-modules/csvs-to-sqlite/default.nix
+++ b/pkgs/development/python-modules/csvs-to-sqlite/default.nix
@@ -23,6 +23,11 @@ buildPythonPackage rec {
     sha256 = "0n80y9a6qhbhhbz64jdpscx0nha9jn9nygp9nkgszmw04ri5j5hm";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace pandas~=0.25.0 pandas
+  '';
+
   propagatedBuildInputs = [
     click
     dateparser

From e24c04f278e7b13ec4edbcfcadec55e33b42c1de Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 14 Feb 2020 09:00:59 -0800
Subject: [PATCH 0637/4636] python3Packages.fastparquet: 0.3.2 -> 0.3.3

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

diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix
index 046fc530969f..1cf62428a0ff 100644
--- a/pkgs/development/python-modules/fastparquet/default.nix
+++ b/pkgs/development/python-modules/fastparquet/default.nix
@@ -3,13 +3,13 @@ thrift, pytest, python-snappy, lz4 }:
 
 buildPythonPackage rec {
   pname = "fastparquet";
-  version = "0.3.2";
+  version = "0.3.3";
 
   src = fetchFromGitHub {
     owner = "dask";
     repo = pname;
     rev = version;
-    sha256 = "142kmyddaq6mvmca23abwns1csn8f3lk9c8mbxwxrg4wa1dh0lb4";
+    sha256 = "1vnxr4r0bia2zi9csjw342l507nic6an4hr5xb3a36ggqlbaa0g5";
   };
 
   postPatch = ''

From 84535e0a47bf97d6d7ea6ea3764d45baab93fde9 Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Fri, 14 Feb 2020 19:16:34 +0200
Subject: [PATCH 0638/4636] let's not support group mode for versions pre-11.

The only fix is to change mode to 0700 before start, because otherwise postgresql
doesn't start, and error is non-obvious.
---
 .../modules/services/databases/postgresql.nix | 36 +++----------
 nixos/tests/postgresql.nix                    | 51 -------------------
 2 files changed, 7 insertions(+), 80 deletions(-)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 8bbbf2d31fc7..f656e236b369 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -20,9 +20,9 @@ let
       listen_addresses = '${if cfg.enableTCPIP then "*" else "localhost"}'
       port = ${toString cfg.port}
       ${cfg.extraConfig}
-    '';
+    ''; 
 
-    dirMode = if cfg.groupAccess == true then "0750" else "0700";
+  groupAccessAvailable = versionAtLeast postgresql.version "11.0";
 
 in
 
@@ -66,18 +66,6 @@ in
         '';
       };
 
-      groupAccess = mkOption {
-        type = with types; nullOr bool;
-        default = null;
-        description = ''
-          When true, allow read access for group (<literal>0750</literal> mask for data directory).
-          Supported only for PostgreSQL 11+.
-          </para><para>
-          When false, force a restrictive <literal>0700</literal> mask on data directory, so
-          PostgreSQL won't fail due to too permissive mask.
-        '';
-      };
-
       authentication = mkOption {
         type = types.lines;
         default = "";
@@ -105,7 +93,7 @@ in
       initdbArgs = mkOption {
         type = with types; listOf str;
         default = [];
-        example = [ "--data-checksums" ];
+        example = [ "--data-checksums" "--allow-group-access" ];
         description = ''
           Additional arguments passed to <literal>initdb<literal> during data dir
           initialisation.
@@ -246,14 +234,6 @@ in
 
   config = mkIf cfg.enable {
 
-    assertions = [
-      { assertion = cfg.groupAccess == true -> versionAtLeast cfg.package.version "11.0";
-        message = ''
-          'groupAccess' is not available for PostgreSQL < 11.
-        '';
-      }
-    ];
-
     services.postgresql.package =
       # Note: when changing the default, make it conditional on
       # ‘system.stateVersion’ to maintain compatibility with existing
@@ -268,9 +248,6 @@ in
                   then "/var/lib/postgresql/${cfg.package.psqlSchema}"
                   else "/var/db/postgresql");
 
-    services.postgresql.initdbArgs =
-      mkBefore (optional (cfg.groupAccess == true) "--allow-group-access");
-
     services.postgresql.authentication = mkAfter
       ''
         # Generated file; do not edit!
@@ -310,7 +287,7 @@ in
           ''
             # Create data directory.
             if ! test -e ${cfg.dataDir}/PG_VERSION; then
-              mkdir -m ${dirMode} -p ${cfg.dataDir}
+              mkdir -m 0700 -p ${cfg.dataDir}
               rm -f ${cfg.dataDir}/*.conf
               chown -R postgres:postgres ${cfg.dataDir}
             fi
@@ -329,8 +306,9 @@ in
               ln -sfn "${pkgs.writeText "recovery.conf" cfg.recoveryConfig}" \
                 "${cfg.dataDir}/recovery.conf"
             ''}
-            ${optionalString (cfg.groupAccess != null) ''
-              chmod ${dirMode} "${cfg.dataDir}"
+            ${optionalString (!groupAccessAvailable) ''
+              # postgresql pre 11.0 doesn't start if state directory mode is group accessible
+              chmod 0700 "${cfg.dataDir}"
             ''}
 
             exec postgres
diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix
index c36ce046efcd..3201e22555ea 100644
--- a/nixos/tests/postgresql.nix
+++ b/nixos/tests/postgresql.nix
@@ -86,56 +86,5 @@ let
 in
   (mapAttrs' (name: package: { inherit name; value=make-postgresql-test name package false;}) postgresql-versions) // {
     postgresql_11-backup-all = make-postgresql-test "postgresql_11-backup-all" postgresql-versions.postgresql_11 true;
-
-    postgresql_dirmode_change =
-      let dataDir = "/db";
-    in makeTest {
-      name = "postgresql_dirmode_change";
-      meta = with pkgs.stdenv.lib.maintainers; {
-        maintainers = [ danbst ];
-      };
-
-      machine = { config, lib, ...}:
-        {
-          services.postgresql.enable = true;
-          services.postgresql.package = pkgs.postgresql_10;
-          services.postgresql.dataDir = dataDir;
-
-          users.users.admin.isNormalUser = true;
-          users.users.admin.extraGroups = [ "postgres" ];
-
-          nesting.clone = [
-            {
-              systemd.services.postgresql.preStart = lib.mkAfter ''
-                chmod 0700 ${dataDir}
-              '';
-              systemd.services.postgresql.postStart = lib.mkAfter ''
-                chmod -R 750 ${dataDir}
-                ${pkgs.acl}/bin/setfacl -d -m g::r-x ${dataDir}
-              '';
-            }
-          ];
-        };
-    testScript = { nodes, ... }: let
-      c1 = "${nodes.machine.config.system.build.toplevel}/fine-tune/child-1";
-    in ''
-      $machine->start;
-      $machine->waitForUnit("postgresql");
-      $machine->succeed("echo select 1 | sudo -u postgres psql");
-
-      # by default, mode is 0700
-      $machine->fail("sudo -u admin ls ${dataDir}");
-
-      $machine->succeed("${c1}/bin/switch-to-configuration test >&2");
-      $machine->succeed("journalctl -u postgresql | grep -q -i stopped"); # was restarted
-      $machine->succeed("systemctl restart postgresql"); # but we have to be sure
-                                                         # manual restart works too
-      $machine->waitForUnit("postgresql");
-      $machine->succeed("echo select 1 | sudo -u postgres psql"); # works after restart
-      $machine->succeed("sudo -u admin ls ${dataDir}");
-
-      $machine->shutdown;
-    '';
-    };
   }
 

From b229e9fdfdb7925b808b498bd6ff6cc9b0d55a60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 14 Feb 2020 18:31:53 +0100
Subject: [PATCH 0639/4636] libclc: enableParallelBuilding = true

Otherwise it takes quite some time.  Tested on a 32-threaded machine,
so there probably aren't common high-parallelism bugs.
---
 pkgs/development/libraries/libclc/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix
index 4cea2df7816b..9ddf1d4f1576 100644
--- a/pkgs/development/libraries/libclc/default.nix
+++ b/pkgs/development/libraries/libclc/default.nix
@@ -28,6 +28,8 @@ stdenv.mkDerivation {
     ${python.interpreter} ./configure.py --prefix=$out
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = http://libclc.llvm.org/;
     description = "Implementation of the library requirements of the OpenCL C programming language";

From a721edfabbff95c1d08c7789cfbbab8876b1a994 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <samuel.leathers@iohk.io>
Date: Fri, 14 Feb 2020 12:48:20 -0500
Subject: [PATCH 0640/4636] python3Packages.openapi-spec-validator: add
 setuptools

---
 .../python-modules/openapi-spec-validator/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix
index 026643266852..160427db7f19 100644
--- a/pkgs/development/python-modules/openapi-spec-validator/default.nix
+++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix
@@ -1,6 +1,6 @@
 { lib, buildPythonPackage, isPy27, fetchPypi
 , jsonschema, pyyaml, six, pathlib
-, mock, pytest, pytestcov, pytest-flake8, tox }:
+, mock, pytest, pytestcov, pytest-flake8, tox, setuptools }:
 
 buildPythonPackage rec {
   pname = "openapi-spec-validator";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "1kav0jlgdpgwx4am09ja7cr8s1g8h8a7j8mcfy1cfjr8fficg2g4";
   };
 
-  propagatedBuildInputs = [ jsonschema pyyaml six ]
+  propagatedBuildInputs = [ jsonschema pyyaml six setuptools ]
     ++ (lib.optionals (isPy27) [ pathlib ]);
 
   checkInputs = [ mock pytest pytestcov pytest-flake8 tox ];

From d772206c49f094a11eba39e892539ffab861d8d1 Mon Sep 17 00:00:00 2001
From: Jacek Galowicz <jacek.galowicz@cyberus-technology.de>
Date: Fri, 14 Feb 2020 08:50:07 +0100
Subject: [PATCH 0641/4636] nixosTests: Make VLAN argument optional in python
 test driver

---
 nixos/lib/test-driver/test-driver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py
index 2b8dffec7d59..c27947bc610d 100644
--- a/nixos/lib/test-driver/test-driver.py
+++ b/nixos/lib/test-driver/test-driver.py
@@ -911,7 +911,7 @@ def subtest(name: str) -> Iterator[None]:
 if __name__ == "__main__":
     log = Logger()
 
-    vlan_nrs = list(dict.fromkeys(os.environ["VLANS"].split()))
+    vlan_nrs = list(dict.fromkeys(os.environ.get("VLANS", "").split()))
     vde_sockets = [create_vlan(v) for v in vlan_nrs]
     for nr, vde_socket, _, _ in vde_sockets:
         os.environ["QEMU_VDE_SOCKET_{}".format(nr)] = vde_socket

From 965c1785d08a718f524e940d6ddf5593a644636a Mon Sep 17 00:00:00 2001
From: Jacek Galowicz <jacek.galowicz@cyberus-technology.de>
Date: Fri, 14 Feb 2020 08:50:55 +0100
Subject: [PATCH 0642/4636] nixosTests.run-in-machine: Port to python

---
 nixos/tests/run-in-machine.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/run-in-machine.nix b/nixos/tests/run-in-machine.nix
index 339a4b9a7404..67840f3e9fe7 100644
--- a/nixos/tests/run-in-machine.nix
+++ b/nixos/tests/run-in-machine.nix
@@ -3,7 +3,7 @@
   pkgs ? import ../.. { inherit system config; }
 }:
 
-with import ../lib/testing.nix { inherit system pkgs; };
+with import ../lib/testing-python.nix { inherit system pkgs; };
 
 let
   output = runInMachine {

From 6979f761a5c86cccbcc8bf13670e402ee485e523 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 10 Feb 2020 19:27:31 +0100
Subject: [PATCH 0643/4636] profont: install otb variant

---
 pkgs/data/fonts/profont/default.nix | 45 ++++++++++++++++++++---------
 pkgs/top-level/all-packages.nix     |  3 +-
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/pkgs/data/fonts/profont/default.nix b/pkgs/data/fonts/profont/default.nix
index 89565910f7a5..d1f2cd9c5af1 100644
--- a/pkgs/data/fonts/profont/default.nix
+++ b/pkgs/data/fonts/profont/default.nix
@@ -1,29 +1,48 @@
-{ lib, fetchzip }:
+{ stdenv, fetchzip, mkfontscale }:
 
-fetchzip {
-  name = "profont";
+stdenv.mkDerivation {
+  pname = "profont";
+  version = "2019-11";
 
-  url = "http://web.archive.org/web/20160707013914/http://tobiasjung.name/downloadfile.php?file=profont-x11.zip";
+  # Note: stripRoot doesn't work because the archive
+  # constains the metadata directory `__MACOSX`.
+  src = fetchzip {
+    url = "https://tobiasjung.name/downloadfile.php?file=profont-x11.zip";
+    sha256 = "12dbm87wvcpmn7nzgzwlk45cybp091diara8blqm6129ps27z6kb";
+    stripRoot = false;
+  } + /profont-x11;
 
-  postFetch = ''
-    unzip -j $downloadedFile
+  srcOtb = fetchzip {
+    url = "https://tobiasjung.name/downloadfile.php?file=profont-otb.zip";
+    sha256 = "18rfhfqrsj3510by0w1a7ak5as6r2cxh8xv02xc1y30mfa6g24x6";
+    stripRoot = false;
+  } + /profont-otb;
 
-    mkdir -p $out/share/doc/$name $out/share/fonts/misc
+  dontBuild = true;
 
-    cp LICENSE $out/share/doc/$name/LICENSE
+  nativeBuildInputs = [ mkfontscale ];
 
+  installPhase = ''
+    mkdir -p "$out/share/fonts/misc"
     for f in *.pcf; do
-      gzip -c "$f" > $out/share/fonts/misc/"$f".gz
+      gzip -n -9 -c "$f" > "$out/share/fonts/misc/$f.gz"
     done
+    install -D -m 644 LICENSE -t "$out/share/doc/$pname"
+    mkfontdir "$out/share/fonts/misc"
+
+    cd $srcOtb
+    install -D -m 644 profontn.otb -t $otb/share/fonts/misc
+    mkfontdir "$otb/share/fonts/misc"
   '';
 
-  sha256 = "1calqmvrfv068w61f614la8mg8szas6m5i9s0lsmwjhb4qwjyxbw";
+  outputs = [ "out" "otb" ];
 
-  meta = with lib; {
-    homepage = http://tobiasjung.name;
+  meta = with stdenv.lib; {
+    homepage = https://tobiasjung.name/profont/;
     description = "A monospaced font created to be a most readable font for programming";
-    maintainers = with lib.maintainers; [ myrl ];
+    maintainers = with maintainers; [ myrl ];
     license = licenses.mit;
     platforms = platforms.all;
   };
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 125f9e698e4a..8bf1148557ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17777,7 +17777,8 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  profont = callPackage ../data/fonts/profont { };
+  profont = callPackage ../data/fonts/profont
+    { inherit (buildPackages.xorg) mkfontscale; };
 
   proggyfonts = callPackage ../data/fonts/proggyfonts { };
 

From 4ad03d1c8c9252503dc55a7aa205ab219a675e7c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Feb 2020 18:10:39 +0000
Subject: [PATCH 0644/4636] mle: 1.4.2 -> 1.4.3

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

diff --git a/pkgs/applications/editors/mle/default.nix b/pkgs/applications/editors/mle/default.nix
index 2c36be1c21bc..692b82dc6887 100644
--- a/pkgs/applications/editors/mle/default.nix
+++ b/pkgs/applications/editors/mle/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mle";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "adsr";
     repo = "mle";
     rev = "v${version}";
-    sha256 = "053zvxkjx2zwq6lwkycirxz1m9sjc3zi9ic8fvp3mjvbqfri1y3x";
+    sha256 = "16dbwfdd6sqqn7jfaxd5wdy8y9ghbihnz6bgn3xhqcww8rj1sia1";
   };
 
   # Fix location of Lua 5.3 header and library

From d54a58a2cdc9828a4dc646fb830fbddad2e6bb6f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Feb 2020 09:18:00 +0000
Subject: [PATCH 0645/4636] verilator: 4.026 -> 4.028

---
 pkgs/applications/science/electronics/verilator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
index c47d055a32ba..7163c201dbfc 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "verilator";
-  version = "4.026";
+  version = "4.028";
 
   src = fetchurl {
     url    = "https://www.veripool.org/ftp/${pname}-${version}.tgz";
-    sha256 = "1b4zxwgd780yxql11r2333qhl7ki5jxh9jxlyhv9xqml9aq8myva";
+    sha256 = "1rl92jnayhc1j47gjxdz2zf1by9vzlawbyw9mf1d7d2y22dqak1l";
   };
 
   enableParallelBuilding = true;

From d394c82cde39f3acd4be0a0d22fe379e6c656e85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 14 Feb 2020 19:16:49 +0100
Subject: [PATCH 0646/4636] build-fhs-userenv: runCommand -> runCommandLocal
 (#77253)

It's a trivial derivation, no need to build remotely (it's slower that
way).
---
 pkgs/build-support/build-fhs-userenv/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix
index 707b256cd4b4..e7db6a75297d 100644
--- a/pkgs/build-support/build-fhs-userenv/default.nix
+++ b/pkgs/build-support/build-fhs-userenv/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, runCommand, writeScript, stdenv, coreutils }:
+{ callPackage, runCommandLocal, writeScript, stdenv, coreutils }:
 
 let buildFHSEnv = callPackage ./env.nix { }; in
 
@@ -23,10 +23,11 @@ let
     exec ${run} "$@"
   '';
 
-in runCommand name {
+in runCommandLocal name {
   inherit meta;
+
   passthru = passthru // {
-    env = runCommand "${name}-shell-env" {
+    env = runCommandLocal "${name}-shell-env" {
       shellHook = ''
         exec ${chrootenv}/bin/chrootenv ${init runScript} "$(pwd)"
       '';

From c412f11cc8253fde661d450ed3c3e47ee4f90567 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 9 Feb 2020 17:18:14 +0100
Subject: [PATCH 0647/4636] uw-ttyp0: split outputs in out and otb

---
 pkgs/data/fonts/uw-ttyp0/default.nix | 32 ++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/pkgs/data/fonts/uw-ttyp0/default.nix b/pkgs/data/fonts/uw-ttyp0/default.nix
index eae820fb0d11..1d63b3fa54c8 100644
--- a/pkgs/data/fonts/uw-ttyp0/default.nix
+++ b/pkgs/data/fonts/uw-ttyp0/default.nix
@@ -19,10 +19,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ perl bdftopcf bdf2psf fonttosfnt mkfontdir ];
 
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash     = "0hzhaakbbcnz5ksi5p8mavw9578rsqlqadkrirrkhfnyqqlrii4j";
-
   # configure sizes, encodings and variants
   preConfigure =
     (if targetsDat == null
@@ -45,7 +41,7 @@ stdenv.mkDerivation rec {
       else ''cp "${variantsDat}" VARIANTS.dat'');
 
   postBuild = ''
-    # convert bdf to psf and otb fonts
+    # convert bdf fonts to psf
     build=$(pwd)
     mkdir {psf,otb}
     cd ${bdf2psf}/share/bdf2psf
@@ -55,19 +51,37 @@ stdenv.mkDerivation rec {
         --fb "$i" standard.equivalents \
         ascii.set+useful.set+linux.set 512 \
         "$build/psf/$name.psf"
+    done
+    cd -
+
+    # convert unicode bdf fonts to otb
+    for i in $build/genbdf/*-uni.bdf; do
+      name="$(basename $i .bdf)"
       fonttosfnt -v -o "$build/otb/$name.otb" "$i"
     done
-    cd $build
   '';
 
   postInstall = ''
     # install psf fonts
     fontDir="$out/share/consolefonts"
-    mkdir -p "$fontDir"
-    mv -t "$fontDir" psf/*.psf
-    mv -t "$out/share/fonts/X11/misc" otb/*.otb
+    install -m 644 -D psf/*.psf -t "$fontDir"
+
+    # install otb fonts
+    fontDir="$otb/share/fonts/X11/misc"
+    install -m 644 -D otb/*.otb -t "$fontDir"
+    mkfontdir "$fontDir"
   '';
 
+  # Nix with multiple outputs adds several flags
+  # that the ./configure script doesn't understand.
+  configurePhase = ''
+    runHook preConfigure
+    ./configure --prefix="$out"
+    runHook postConfigure
+  '';
+
+  outputs = [ "out" "otb" ];
+
   meta = with stdenv.lib; {
     description = "Monospace bitmap screen fonts for X11";
     homepage = https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/;

From 55875fe19ed1f9e449d5933357b80d8627dd358d Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 11 Feb 2020 14:56:03 -0800
Subject: [PATCH 0648/4636] jetbrains: update

---
 .../editors/jetbrains/default.nix             | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 83dff4a4f29e..1db952cf1a5a 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -276,12 +276,12 @@ in
 
   goland = buildGoland rec {
     name = "goland-${version}";
-    version = "2019.3.1"; /* updated by script */
+    version = "2019.3.2"; /* updated by script */
     description = "Up and Coming Go IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/go/${name}.tar.gz";
-      sha256 = "1lj5i71nw2m9xwv6q48b86kipiwj927bxiwxppb4isqax2w6250d"; /* updated by script */
+      sha256 = "0namvc8dfm562dgvs4mrv1c6lyi4j8yxw402fkw55l0xqv3ff0a9"; /* updated by script */
     };
     wmClass = "jetbrains-goland";
     update-channel = "GoLand RELEASE";
@@ -289,12 +289,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2019.3.2"; /* updated by script */
+    version = "2019.3.3"; /* updated by script */
     description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
-      sha256 = "09vicd2czag07f2f7dy0mmcvz5kryv659m32zm9rlsr4nai1i3y3"; /* updated by script */
+      sha256 = "15rs866fp4lrsqdk13fnbg7ncdfrhky1m5sl90p32v45j90hagrg"; /* updated by script */
     };
     wmClass = "jetbrains-idea-ce";
     update-channel = "IntelliJ IDEA RELEASE";
@@ -302,12 +302,12 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2019.3.2"; /* updated by script */
+    version = "2019.3.3"; /* updated by script */
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz";
-      sha256 = "09lgdd7gkx94warjc7wah9w7s9lj81law8clavjjyjas8bhhf1hz"; /* updated by script */
+      sha256 = "034aq5lf64apc152xr0889hg2xak2if9n5xl6zvd3f9q9srhivxn"; /* updated by script */
     };
     wmClass = "jetbrains-idea";
     update-channel = "IntelliJ IDEA RELEASE";
@@ -328,12 +328,12 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "2019.3.2"; /* updated by script */
+    version = "2019.3.3"; /* updated by script */
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "06dzqjsq6jqgv8askzskm0bllzm9i8rzmhkjsv4na2phvdxf6qi2"; /* updated by script */
+      sha256 = "0ly3cdzm4hp4qchdadjmbd39jnqpmpnlk6vgp8s4amsv35b6hydd"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm-ce";
     update-channel = "PyCharm RELEASE";
@@ -341,12 +341,12 @@ in
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "2019.3.2"; /* updated by script */
+    version = "2019.3.3"; /* updated by script */
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1zp64pnzz2jy232g8fgkqmn34afbhbkkhgyb9z1v1qfb533p39ig"; /* updated by script */
+      sha256 = "1305zvb5n2zqnny4l50qfv7jd1sj4ffhrig4rpfiqg65ncfpypwb"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm";
     update-channel = "PyCharm RELEASE";
@@ -367,12 +367,12 @@ in
 
   ruby-mine = buildRubyMine rec {
     name = "ruby-mine-${version}";
-    version = "2019.3.1"; /* updated by script */
+    version = "2019.3.2"; /* updated by script */
     description = "The Most Intelligent Ruby and Rails IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
-      sha256 = "0xadjx4szd9rk3bl3fqzhnfq744gmkbz9li80j5rqm27qhf4axfx"; /* updated by script */
+      sha256 = "0mwzhvrhvsyb8r7sjcigv9jazim1zyipb3ym4xsd2gyl3ans2vm9"; /* updated by script */
     };
     wmClass = "jetbrains-rubymine";
     update-channel = "RubyMine RELEASE";

From 25f6f66f256e2a9768798a19ac1a0510cc6917c8 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 14 Feb 2020 08:54:40 -0800
Subject: [PATCH 0649/4636] jetbrains.jdk: 520.30 -> 520.38

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

diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index 54d95fbd8a88..e9b3ad151ca8 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -7,17 +7,17 @@
 
 let drv = stdenv.mkDerivation rec {
   pname = "jetbrainsjdk";
-  version = "520.30";
+  version = "520.38";
 
   src = if stdenv.hostPlatform.system == "x86_64-linux" then
     fetchurl {
       url = "https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbrsdk-11_0_5-linux-x64-b${version}.tar.gz";
-      sha256 = "0xmr5jjnr4af7byz5w01phyrrdyizfhqmwhs4k8ih566fkhyzj02";
+      sha256 = "13hqp9ww9afkl70yrslyyx0z7fqcc8nrcqax69d6jaj587qfjqvz";
     }
   else if stdenv.hostPlatform.system == "x86_64-darwin" then
     fetchurl {
       url = "https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbrsdk-11_0_5-osx-x64-b${version}.tar.gz";
-      sha256 = "0wfcw66wv5rkkjzyzi9j7zk7c2fgi33ny09drgihxi2kdzyfrpcb";
+      sha256 = "1qrw4rpyznx7pkcjlfhi889l3a7gydz9yrqp6phz1rszmklpyk07";
     }
   else
     throw "unsupported system: ${stdenv.hostPlatform.system}";

From 1abea42347f1c586791338060b37cd7ca3d08c7f Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 14 Feb 2020 09:24:28 -0800
Subject: [PATCH 0650/4636] python38Packages.nipype: mark broken

Tests on python3.8 hang for several hours, blocking reviews
of other packages.
---
 pkgs/development/python-modules/nipype/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
index ab81b2b190b5..5944e4d863f6 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , isPy3k
+, isPy38
 # python dependencies
 , click
 , configparser ? null
@@ -109,5 +110,7 @@ buildPythonPackage rec {
     description = "Neuroimaging in Python: Pipelines and Interfaces";
     license = licenses.bsd3;
     maintainers = with maintainers; [ ashgillman ];
+    # tests hang, blocking reviews of other packages
+    broken = isPy38;
   };
 }

From ce84052ef78c2e6b94f76e974d294109bab78948 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 14 Feb 2020 19:57:39 +0100
Subject: [PATCH 0651/4636] spotifyd: use new cargo fetcher, fix build

https://hydra.nixos.org/build/112753750
---
 pkgs/applications/audio/spotifyd/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix
index bc410a39319b..e61a2879d474 100644
--- a/pkgs/applications/audio/spotifyd/default.nix
+++ b/pkgs/applications/audio/spotifyd/default.nix
@@ -15,10 +15,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "08i0zm7kgprixqjpgaxk7xid1njgj6lmi896jf9fsjqzdzlblqk8";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
+  legacyCargoFetcher = false;
 
-  cargoSha256 = "0kl8xl2qhzf8wb25ajw59frgym62lkg7p72d8z0xmkqjjcg2nyib";
+  cargoSha256 = "0200apqbx769ggjnjr0m72g61ikhml2xak5n1il2pvfx1yf5nw0n";
 
   cargoBuildFlags = [
     "--no-default-features"

From 7f50a5c0de729eb950be6f102628794735a519d7 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 14 Feb 2020 20:03:19 +0100
Subject: [PATCH 0652/4636] spotify-tui: 0.13.0 -> 0.14.0, fix build

https://github.com/Rigellute/spotify-tui/releases/tag/v0.14.0
https://hydra.nixos.org/build/112751711
---
 pkgs/applications/audio/spotify-tui/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix
index e4d6c6c42ffe..a6af8c5208e5 100644
--- a/pkgs/applications/audio/spotify-tui/default.nix
+++ b/pkgs/applications/audio/spotify-tui/default.nix
@@ -2,19 +2,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "spotify-tui";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "Rigellute";
     repo = "spotify-tui";
     rev = "v${version}";
-    sha256 = "0gp7xb63icraqg7f0j91q474acph3ligzak2k8qqr9cqbgg509f4";
+    sha256 = "06xqj83m4hz00p8796m0df7lv9875p8zc1v6l9yqbiak1h95lq7h";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
+  legacyCargoFetcher = false;
 
-  cargoSha256 = "1364z9jz3mnba3pii5h7imqlwlvbp146pcd5q8w61lsmdr2iyha2";
+  cargoSha256 = "1pc4n6lm1w0660ivm0kxzicpckvb351y62dpv0cxa7ckd3raa5pr";
 
   nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ];
   buildInputs = [ openssl ]

From c4767b86a3424ed1658a0c4fb28f3bcba827c1b0 Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <ruud@channable.com>
Date: Tue, 14 Jan 2020 17:37:50 +0100
Subject: [PATCH 0653/4636] python3Packages.google_api_core: 0.15.0 -> 1.16.0

Also drop 3.2 compatibility; google-api-core version 1.16.0 requires at
least Python 3.5, there is no point in keeping a Python 3.2 check around
here.
---
 .../python-modules/google_api_core/default.nix            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix
index 6bfc10f0a093..0f30be449c09 100644
--- a/pkgs/development/python-modules/google_api_core/default.nix
+++ b/pkgs/development/python-modules/google_api_core/default.nix
@@ -1,20 +1,20 @@
 { lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27
-, google_auth, protobuf, googleapis_common_protos, requests, setuptools, grpcio, futures, mock }:
+, google_auth, protobuf, googleapis_common_protos, requests, setuptools, grpcio, mock }:
 
 buildPythonPackage rec {
   pname = "google-api-core";
-  version = "1.15.0";
+  version = "1.16.0";
   disabled = isPy27; # google namespace no longer works on python2
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2d661c8d650a1df5805d0e360121cb55c55d8bd29f858fa62cbe943e59ce89f7";
+    sha256 = "1qh30ji399gngv2j1czzvi3h0mgx3lfdx2n8qp8vii7ihyh65scj";
   };
 
   propagatedBuildInputs = [
     googleapis_common_protos protobuf
     google_auth requests setuptools grpcio
-  ] ++ lib.optional (pythonOlder "3.2") futures;
+  ];
 
   # requires nox
   doCheck = false;

From 6283d62c97527f96385cb34deac0191b0c4bb62c Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <ruud@channable.com>
Date: Wed, 15 Jan 2020 10:16:39 +0100
Subject: [PATCH 0654/4636] python3Packages.google_cloud_core: 1.1.0 -> 1.2.0

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

diff --git a/pkgs/development/python-modules/google_cloud_core/default.nix b/pkgs/development/python-modules/google_cloud_core/default.nix
index 139ce85a3191..c74ad1d2e3ce 100644
--- a/pkgs/development/python-modules/google_cloud_core/default.nix
+++ b/pkgs/development/python-modules/google_cloud_core/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-core";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "49036087c1170c3fad026e45189f17092b8c584a9accb2d73d1854f494e223ae";
+    sha256 = "0vfhvpiiigfldi3vb0730w13md1c90irpdx5kypmnfszrrzg7q2a";
   };
 
   propagatedBuildInputs = [ google_api_core grpcio setuptools ];

From 5fa0590cc7e81108eea95741cadc385914acc4bf Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <ruud@channable.com>
Date: Tue, 14 Jan 2020 17:31:54 +0100
Subject: [PATCH 0655/4636] python3Packages.google_auth: 1.6.3 -> 1.10.0

It builds fine without the test-related patches now, so let's remove
those patches. Also, a new dependency is required to run the tests.
---
 .../python-modules/google_auth/default.nix    | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix
index 01797673fbaa..56ca3358e890 100644
--- a/pkgs/development/python-modules/google_auth/default.nix
+++ b/pkgs/development/python-modules/google_auth/default.nix
@@ -1,30 +1,18 @@
 { stdenv, buildPythonPackage, fetchpatch, fetchPypi
-, pytest, mock, oauth2client, flask, requests, setuptools, urllib3, pytest-localserver, six, pyasn1-modules, cachetools, rsa }:
+, pytest, mock, oauth2client, flask, requests, setuptools, urllib3, pytest-localserver, six, pyasn1-modules, cachetools, rsa, freezegun }:
 
 buildPythonPackage rec {
   pname = "google-auth";
-  version = "1.6.3";
+  version = "1.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0f7c6a64927d34c1a474da92cfc59e552a5d3b940d3266606c6a28b72888b9e4";
+    sha256 = "1xs8ch6bz57vs6j0p8061c7wj9ahkvrfpf1y9v7r009979507ckv";
   };
-  patches = [
-    (fetchpatch {
-      name = "use-new-pytest-api-to-keep-building-with-pytest5.patch";
-      url = "https://github.com/googleapis/google-auth-library-python/commit/b482417a04dbbc207fcd6baa7a67e16b1a9ffc77.patch";
-      sha256 = "07jpa7pa6sffbcwlsg5fgcv2vvngil5qpmv6fhjqp7fnvx0674s0";
-    })
-  ];
 
-  checkInputs = [ pytest mock oauth2client flask requests urllib3 pytest-localserver ];
+  checkInputs = [ pytest mock oauth2client flask requests urllib3 pytest-localserver freezegun ];
   propagatedBuildInputs = [ six pyasn1-modules cachetools rsa setuptools ];
 
-  # The removed test tests the working together of google_auth and google's https://pypi.python.org/pypi/oauth2client
-  # but the latter is deprecated. Since it is not currently part of the nixpkgs collection and deprecated it will
-  # probably never be. We just remove the test to make the tests work again.
-  postPatch = ''rm tests/test__oauth2client.py'';
-
   checkPhase = ''
     py.test
   '';

From 4cc354fe086a6961542349988649ffa966e32577 Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <ruud@channable.com>
Date: Wed, 15 Jan 2020 10:24:51 +0100
Subject: [PATCH 0656/4636] python3Packages.googleapis_common_protos: 1.6.0 ->
 1.51.0

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

diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis_common_protos/default.nix
index 5c8f1767dca7..7a10ce12c38f 100644
--- a/pkgs/development/python-modules/googleapis_common_protos/default.nix
+++ b/pkgs/development/python-modules/googleapis_common_protos/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "googleapis-common-protos";
-  version = "1.6.0";
+  version = "1.51.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e61b8ed5e36b976b487c6e7b15f31bb10c7a0ca7bd5c0e837f4afab64b53a0c6";
+    sha256 = "0vi2kr0daivx2q1692lp3y61bfnvdw471xsfwi8924br89q92g01";
   };
 
   propagatedBuildInputs = [ protobuf setuptools ];

From c2dc35e6feea0ce7fcf09d10482566c9849ceb9d Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Fri, 14 Feb 2020 11:45:21 -0800
Subject: [PATCH 0657/4636] prometheus: 2.15.2 -> 2.16.0 (#80105)

---
 pkgs/servers/monitoring/prometheus/default.nix        | 6 +++---
 pkgs/servers/monitoring/prometheus/webui-package.json | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index 4a27b7ac049e..a01f4559a118 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -1,13 +1,13 @@
 { lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage }:
 
 let
-  version = "2.15.2";
+  version = "2.16.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "prometheus";
     repo = "prometheus";
-    sha256 = "0gl11qqbq57vkx226n8z4x07fwvly5f21y6dn20kjh2fxigmrb2n";
+    sha256 = "1bfcl3bvjb991ic8jw6y6i9pn7y03v8gwzzc78j1k5lhpqzbxkzd";
   };
 
   webui = mkYarnPackage {
@@ -65,7 +65,7 @@ in buildGoPackage rec {
     description = "Service monitoring system and time series database";
     homepage = "https://prometheus.io";
     license = licenses.asl20;
-    maintainers = with maintainers; [ benley fpletz globin willibutz ];
+    maintainers = with maintainers; [ benley fpletz globin willibutz Frostman ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/servers/monitoring/prometheus/webui-package.json b/pkgs/servers/monitoring/prometheus/webui-package.json
index 1a96845d15e0..71b9a45f9067 100644
--- a/pkgs/servers/monitoring/prometheus/webui-package.json
+++ b/pkgs/servers/monitoring/prometheus/webui-package.json
@@ -20,7 +20,6 @@
     "bootstrap": "^4.2.1",
     "downshift": "^3.2.2",
     "enzyme-to-json": "^3.4.3",
-    "flot": "^3.2.13",
     "fuzzy": "^0.1.3",
     "i": "^0.3.6",
     "jest-fetch-mock": "^2.1.2",
@@ -45,7 +44,7 @@
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",
-    "test": "react-scripts test",
+    "test": "react-scripts test --runInBand",
     "test:debug": "react-scripts --inspect-brk test --runInBand --no-cache",
     "eject": "react-scripts eject",
     "lint:ci": "eslint --quiet \"src/**/*.{ts,tsx}\"",

From 76dd1143760492b5f9dc6baf0c1b510133c406ba Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 9 Feb 2020 18:21:26 +0100
Subject: [PATCH 0658/4636] clearlyU: split outputs in out and otb

---
 pkgs/data/fonts/clearlyU/default.nix | 44 ++++++++++++++++++----------
 pkgs/top-level/all-packages.nix      |  3 +-
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/data/fonts/clearlyU/default.nix
index 0df3ba4f659c..62002b14dd58 100644
--- a/pkgs/data/fonts/clearlyU/default.nix
+++ b/pkgs/data/fonts/clearlyU/default.nix
@@ -1,29 +1,41 @@
-{ stdenv, fetchurl, mkfontdir, mkfontscale }:
+{ stdenv, fetchurl, fonttosfnt, mkfontscale, libfaketime }:
 
-stdenv.mkDerivation {
-  name = "clearlyU-12-1.9";
+stdenv.mkDerivation rec {
+  pname = "clearlyU";
+  version = "12-1.9";
 
   src = fetchurl {
-    url = https://www.math.nmsu.edu/~mleisher/Software/cu/cu12-1.9.tgz;
+    url = "https://www.math.nmsu.edu/~mleisher/Software/cu/cu${version}.tgz";
     sha256 = "1xn14jbv3m1khy7ydvad9ydkn7yygdbhjy9wm1v000jzjwr3lv21";
   };
 
-  nativeBuildInputs = [ mkfontdir mkfontscale ];
+  nativeBuildInputs = [ fonttosfnt mkfontscale libfaketime ];
 
-  installPhase = ''
-    mkdir -p $out/share/fonts
-    cp *.bdf $out/share/fonts
-    cd $out/share/fonts
-    mkfontdir
-    mkfontscale
+  buildPhase = ''
+    # convert bdf fonts to otb
+    for i in *.bdf; do
+      name=$(basename "$i" .bdf)
+      faketime -f "1970-01-01 00:00:01" fonttosfnt -g 2 -m 2 -v -o "$name.otb" "$i"
+    done
   '';
 
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "127zrg65s90ksj99kr9hxny40rbxvpai62mf5nqk853hcd1bzpr6";
+  installPhase = ''
+    # install bdf fonts
+    fontDir="$out/share/fonts"
+    install -m 644 -D *.bdf -t "$fontDir"
+    mkfontdir "$fontDir"
 
-  meta = {
+    # install otb fonts
+    fontDir="$otb/share/fonts"
+    install -m 644 -D *.otb -t "$fontDir"
+    mkfontdir "$fontDir"
+  '';
+
+  outputs = [ "out"  "otb" ];
+
+  meta = with stdenv.lib; {
     description = "A Unicode font";
-    maintainers = [stdenv.lib.maintainers.raskin];
+    license = licenses.mit;
+    maintainers = [ maintainers.raskin ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0c475483078..ebde670d8974 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17362,7 +17362,8 @@ in
 
   culmus = callPackage ../data/fonts/culmus { };
 
-  clearlyU = callPackage ../data/fonts/clearlyU { };
+  clearlyU = callPackage ../data/fonts/clearlyU
+    { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
 
   cm_unicode = callPackage ../data/fonts/cm-unicode {};
 

From 213e4ca488a02becddf19aa0ca1b6805a2813684 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Feb 2020 20:49:04 +0000
Subject: [PATCH 0659/4636] prometheus-cpp: 0.8.0 -> 0.9.0

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

diff --git a/pkgs/development/libraries/prometheus-cpp/default.nix b/pkgs/development/libraries/prometheus-cpp/default.nix
index 624b23f4d600..2ec2426af4a1 100644
--- a/pkgs/development/libraries/prometheus-cpp/default.nix
+++ b/pkgs/development/libraries/prometheus-cpp/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "prometheus-cpp";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "jupp0r";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0j12ir8skw3y2q8n743zql4ddp7v1j4h030pjcsqn0xqrqw7m5hg";
+    sha256 = "1pjz29ywzfg3blhg2v8fn7gjvq46k3bqn7y0xvmn468ixxhv21fi";
   };
 
   nativeBuildInputs = [ cmake ];

From 016dcfe5146e4f86a853530eda2ff03fc25639f2 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 13 Feb 2020 15:27:26 -0800
Subject: [PATCH 0660/4636] dwarf-therapist: 41.1.2 -> 41.1.3

---
 pkgs/games/dwarf-fortress/dwarf-therapist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index 388aaefc9606..be0d57f45d9c 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dwarf-therapist";
-  version = "41.1.2";
+  version = "41.1.3";
 
   src = fetchFromGitHub {
     owner = "Dwarf-Therapist";
     repo = "Dwarf-Therapist";
     rev = "v${version}";
-    sha256 = "1qyyny2v4wxqs4ar02s8aawaxnkibz5aa5xgjm421k6v04iqxgcl";
+    sha256 = "15f6npbfgsxsr6pm2vxpali8f6nyyk80bcyhy9s77n064q0qg2nj";
   };
 
   nativeBuildInputs = [ texlive cmake ninja ];

From 71af0ea361530295b1972bbd983cd83216dd2934 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 13 Feb 2020 15:28:49 -0800
Subject: [PATCH 0661/4636] dwarf-fortress.twbt: add 6.61 release

This is just the latest release, there hasn't been
a release for a few months.
---
 pkgs/games/dwarf-fortress/twbt/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix
index e191d372704b..86ff8a6bc446 100644
--- a/pkgs/games/dwarf-fortress/twbt/default.nix
+++ b/pkgs/games/dwarf-fortress/twbt/default.nix
@@ -36,6 +36,11 @@ let
       sha256 = "10gfd6vv0vk4v1r5hjbz7vf1zqys06dsad695gysc7fbcik2dakh";
       prerelease = false;
     };
+    "0.47.02" = {
+      twbtRelease = "6.61";
+      sha256 = "07bqy9rkd64h033sxdpigp5zq4xrr0xd36wdr1b21g649mv8j6yw";
+      prerelease = false;
+    };
   };
 
   release = if hasAttr dfVersion twbt-releases

From 381e86a7827a4f1c631e76ee5b37d1d4bfd9e480 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 13 Feb 2020 15:33:27 -0800
Subject: [PATCH 0662/4636] dwarf-fortress.dfhack: add 0.47.02-alpha0 release

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

diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index 5706337dffd7..b27dc9c058c7 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -46,6 +46,12 @@ let
       xmlRev = "23500e4e9bd1885365d0a2ef1746c321c1dd5094";
       prerelease = false;
     };
+    "0.47.02" = {
+      dfHackRelease = "0.47.02-alpha0";
+      sha256 = "19lgykgqm0si9vd9hx4zw8b5m9188gg8r1a6h25np2m2ziqwbjj9";
+      xmlRev = "23500e4e9bd1885365d0a2ef1746c321c1dd509a";
+      prerelease = true;
+    };
   };
 
   release = if hasAttr dfVersion dfhack-releases

From d2b745d617a549ae5d68e0fc4154171ce77030c4 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 13 Feb 2020 15:35:23 -0800
Subject: [PATCH 0663/4636] dwarf-fortress: 0.44.12 -> 0.47.02

---
 pkgs/games/dwarf-fortress/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index 650d5da53313..4f88e36a2f6c 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -40,7 +40,7 @@ let
   # The latest Dwarf Fortress version. Maintainers: when a new version comes
   # out, ensure that (unfuck|dfhack|twbt) are all up to date before changing
   # this.
-  latestVersion = "0.44.12";
+  latestVersion = "0.47.02";
 
   # Converts a version to a package name.
   versionToName = version: "dwarf-fortress_${lib.replaceStrings ["."] ["_"] version}";
@@ -101,7 +101,7 @@ let
     dwarf-fortress-full = callPackage ./lazy-pack.nix {
       inherit df-games versionToName latestVersion;
     };
-    
+
     soundSense = callPackage ./soundsense.nix { };
 
     legends-browser = callPackage ./legends-browser {};

From 52ac65c0274016ddddc69dc21e67bbff206db199 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Sat, 4 Jan 2020 01:22:19 +0100
Subject: [PATCH 0664/4636] maintainers: add valodim

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 34d1bc876c85..d1f6ee211dc4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7456,6 +7456,12 @@
     github = "valeriangalliat";
     name = "Valérian Galliat";
   };
+  valodim = {
+    email = "look@my.amazin.horse";
+    github = "valodim";
+    githubId = 27813;
+    name = "Vincent Breitmoser";
+  };
   vandenoever = {
     email = "jos@vandenoever.info";
     github = "vandenoever";

From a49b311815c59300632c02dc368c8f259c105a73 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Wed, 22 Jan 2020 01:52:18 +0100
Subject: [PATCH 0665/4636] pantalaimon: init at 0.4

---
 .../pantalaimon/default.nix                   | 59 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 61 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/pantalaimon/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
new file mode 100644
index 000000000000..2fcf65dfc1c2
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
@@ -0,0 +1,59 @@
+{ lib, stdenv, buildPythonApplication, fetchPypi, pythonOlder,
+  attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus,
+  prompt_toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3,
+
+  pytest, faker, pytest-aiohttp, aioresponses,
+
+  enableDbusUi ? true
+}:
+
+buildPythonApplication rec {
+  pname = "pantalaimon";
+  version = "0.4";
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1canj9w72wh1rcw6fivrvaahpxy13gb6gh1k8nss6bgixalvnq9m";
+  };
+
+  propagatedBuildInputs = [
+    aiohttp
+    appdirs
+    attrs
+    click
+    janus
+    keyring
+    Logbook
+    matrix-nio
+    peewee
+    prompt_toolkit
+  ] ++ lib.optional enableDbusUi [
+      dbus-python
+      notify2
+      pygobject3
+      pydbus
+  ];
+
+  checkInputs = [
+    pytest
+    faker
+    pytest-aiohttp
+    aioresponses
+  ];
+
+  # darwin has difficulty communicating with server, fails some integration tests
+  doCheck = !stdenv.isDarwin;
+
+  checkPhase = ''
+    pytest
+  '';
+
+  meta = with lib; {
+    description = "An end-to-end encryption aware Matrix reverse proxy daemon.";
+    homepage = "https://github.com/matrix-org/pantalaimon";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ valodim ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 868071d4a50a..94ec79a5708b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20817,6 +20817,8 @@ in
 
   paprefs = callPackage ../applications/audio/paprefs { };
 
+  pantalaimon = python3Packages.callPackage ../applications/networking/instant-messengers/pantalaimon { };
+
   pavucontrol = callPackage ../applications/audio/pavucontrol { };
 
   paraview = libsForQt5.callPackage ../applications/graphics/paraview { };

From 12ea3571ea4e697818ecf2122fef9998d6f76274 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Feb 2020 21:01:24 +0000
Subject: [PATCH 0666/4636] qdirstat: 1.6 -> 1.6.1

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

diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix
index 21d4b0031792..c57153fe0e0d 100644
--- a/pkgs/applications/misc/qdirstat/default.nix
+++ b/pkgs/applications/misc/qdirstat/default.nix
@@ -3,7 +3,7 @@
 , makeWrapper, perlPackages, mkDerivation }:
 
 let
-  version = "1.6";
+  version = "1.6.1";
 in mkDerivation rec {
   pname = "qdirstat";
   inherit version;
@@ -12,7 +12,7 @@ in mkDerivation rec {
     owner = "shundhammer";
     repo = "qdirstat";
     rev = version;
-    sha256 = "0q4ccjmlbqifg251kyxwys8wspdskr8scqhacyfrs9cmnjxcjqan";
+    sha256 = "0q77a347qv1aka6sni6l03zh5jzyy9s74aygg554r73g01kxczpb";
   };
 
   nativeBuildInputs = [ qmake makeWrapper ];

From b13ccf503b1240a3c043e60532a33cf3a4fe1448 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 14 Feb 2020 18:03:20 -0300
Subject: [PATCH 0667/4636] mate.mate-user-guide: use absolute path of yelp

---
 pkgs/desktops/mate/mate-user-guide/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix
index 89a5e9720e65..c092bb569618 100644
--- a/pkgs/desktops/mate/mate-user-guide/default.nix
+++ b/pkgs/desktops/mate/mate-user-guide/default.nix
@@ -13,6 +13,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ yelp ];
 
+  postPatch = ''
+    substituteInPlace mate-user-guide.desktop.in.in \
+      --replace "Exec=yelp" "Exec=${yelp}/bin/yelp"
+  '';
+
   meta = with stdenv.lib; {
     description = "MATE User Guide";
     homepage = "https://mate-desktop.org";

From 28faf5bc8622f4fec12321cac9bd7950856f1d91 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 14 Feb 2020 21:27:47 +0100
Subject: [PATCH 0668/4636] nix-prefetch-git: Fix output mangling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`git repack` and `git gc` sometimes print “Nothing new to pack.”
to stdout, which breaks redirecting output to JSON file.

Let’s move the stdout of all git calls where it is not used to stderr
so that we still receive the info but it does not pollute our output.
---
 pkgs/build-support/fetchgit/nix-prefetch-git | 31 ++++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 38c00d9fd9cc..abba76bd1ac9 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -53,6 +53,11 @@ Options:
     exit 1
 }
 
+# some git commands print to stdout, which would contaminate our JSON output
+clean_git(){
+    git "$@" >&2
+}
+
 argi=0
 argfun=""
 for arg; do
@@ -98,9 +103,9 @@ fi
 
 init_remote(){
     local url=$1
-    git init
-    git remote add origin "$url"
-    ( [ -n "$http_proxy" ] && git config http.proxy "$http_proxy" ) || true
+    clean_git init
+    clean_git remote add origin "$url"
+    ( [ -n "$http_proxy" ] && clean_git config http.proxy "$http_proxy" ) || true
 }
 
 # Return the reference of an hash if it exists on the remote repository.
@@ -141,8 +146,8 @@ checkout_hash(){
         hash=$(hash_from_ref "$ref")
     fi
 
-    git fetch -t ${builder:+--progress} origin || return 1
-    git checkout -b "$branchName" "$hash" || return 1
+    clean_git fetch -t ${builder:+--progress} origin || return 1
+    clean_git checkout -b "$branchName" "$hash" || return 1
 }
 
 # Fetch only a branch/tag and checkout it.
@@ -164,8 +169,8 @@ checkout_ref(){
 
     if test -n "$ref"; then
         # --depth option is ignored on http repository.
-        git fetch ${builder:+--progress} --depth 1 origin +"$ref" || return 1
-        git checkout -b "$branchName" FETCH_HEAD || return 1
+        clean_git fetch ${builder:+--progress} --depth 1 origin +"$ref" || return 1
+        clean_git checkout -b "$branchName" FETCH_HEAD || return 1
     else
         return 1
     fi
@@ -174,7 +179,7 @@ checkout_ref(){
 # Update submodules
 init_submodules(){
     # Add urls into .git/config file
-    git submodule init
+    clean_git submodule init
 
     # list submodule directories and their hashes
     git submodule status |
@@ -248,7 +253,7 @@ make_deterministic_repo(){
 
     # Remove all remote branches.
     git branch -r | while read -r branch; do
-        git branch -rD "$branch" >&2
+        clean_git branch -rD "$branch"
     done
 
     # Remove tags not reachable from HEAD. If we're exactly on a tag, don't
@@ -256,19 +261,19 @@ make_deterministic_repo(){
     maybe_tag=$(git tag --points-at HEAD)
     git tag --contains HEAD | while read -r tag; do
         if [ "$tag" != "$maybe_tag" ]; then
-            git tag -d "$tag" >&2
+            clean_git tag -d "$tag"
         fi
     done
 
     # Do a full repack. Must run single-threaded, or else we lose determinism.
-    git config pack.threads 1
-    git repack -A -d -f
+    clean_git config pack.threads 1
+    clean_git repack -A -d -f
     rm -f .git/config
 
     # Garbage collect unreferenced objects.
     # Note: --keep-largest-pack prevents non-deterministic ordering of packs
     #   listed in .git/objects/info/packs by only using a single pack
-    git gc --prune=all --keep-largest-pack
+    clean_git gc --prune=all --keep-largest-pack
     )
 }
 

From ba42fef9a76dd9b7b0d3e4f56d445f1506f52002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 14 Feb 2020 18:31:52 -0300
Subject: [PATCH 0669/4636] nixos/mate: add yelp to systemPackages

Without this the Contents item in the Help menu of applications fails
to launch.
---
 nixos/modules/services/x11/desktop-managers/mate.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
index 4a6f2ca727d9..910a246d776c 100644
--- a/nixos/modules/services/x11/desktop-managers/mate.nix
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -86,6 +86,7 @@ in
         pkgs.shared-mime-info
         pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
         pkgs.mate.mate-settings-daemon
+        pkgs.yelp # for 'Contents' in 'Help' menus
       ];
 
     programs.dconf.enable = true;

From ceb87a4c269e92d671bf208b6951808a1dfdb921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 14 Feb 2020 18:52:51 -0300
Subject: [PATCH 0670/4636] mate: enable parallel building

---
 pkgs/desktops/mate/atril/default.nix                    | 2 ++
 pkgs/desktops/mate/caja-dropbox/default.nix             | 2 ++
 pkgs/desktops/mate/caja-extensions/default.nix          | 2 ++
 pkgs/desktops/mate/caja/default.nix                     | 2 ++
 pkgs/desktops/mate/engrampa/default.nix                 | 2 ++
 pkgs/desktops/mate/eom/default.nix                      | 2 ++
 pkgs/desktops/mate/libmatekbd/default.nix               | 2 ++
 pkgs/desktops/mate/libmatemixer/default.nix             | 2 ++
 pkgs/desktops/mate/libmateweather/default.nix           | 2 ++
 pkgs/desktops/mate/marco/default.nix                    | 2 ++
 pkgs/desktops/mate/mate-applets/default.nix             | 2 ++
 pkgs/desktops/mate/mate-backgrounds/default.nix         | 2 ++
 pkgs/desktops/mate/mate-calc/default.nix                | 2 ++
 pkgs/desktops/mate/mate-common/default.nix              | 2 ++
 pkgs/desktops/mate/mate-desktop/default.nix             | 2 ++
 pkgs/desktops/mate/mate-icon-theme-faenza/default.nix   | 2 ++
 pkgs/desktops/mate/mate-icon-theme/default.nix          | 2 ++
 pkgs/desktops/mate/mate-indicator-applet/default.nix    | 2 ++
 pkgs/desktops/mate/mate-media/default.nix               | 2 ++
 pkgs/desktops/mate/mate-menus/default.nix               | 2 ++
 pkgs/desktops/mate/mate-netbook/default.nix             | 2 ++
 pkgs/desktops/mate/mate-notification-daemon/default.nix | 2 ++
 pkgs/desktops/mate/mate-panel/default.nix               | 2 ++
 pkgs/desktops/mate/mate-polkit/default.nix              | 2 ++
 pkgs/desktops/mate/mate-power-manager/default.nix       | 2 ++
 pkgs/desktops/mate/mate-screensaver/default.nix         | 2 ++
 pkgs/desktops/mate/mate-sensors-applet/default.nix      | 2 ++
 pkgs/desktops/mate/mate-session-manager/default.nix     | 2 ++
 pkgs/desktops/mate/mate-settings-daemon/default.nix     | 2 ++
 pkgs/desktops/mate/mate-system-monitor/default.nix      | 2 ++
 pkgs/desktops/mate/mate-terminal/default.nix            | 2 ++
 pkgs/desktops/mate/mate-themes/default.nix              | 2 ++
 pkgs/desktops/mate/mate-user-guide/default.nix          | 2 ++
 pkgs/desktops/mate/mate-user-share/default.nix          | 2 ++
 pkgs/desktops/mate/mozo/default.nix                     | 2 ++
 pkgs/desktops/mate/pluma/default.nix                    | 2 ++
 pkgs/desktops/mate/python-caja/default.nix              | 2 ++
 37 files changed, 74 insertions(+)

diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix
index b7a7e16d462d..e71ca81142a7 100644
--- a/pkgs/desktops/mate/atril/default.nix
+++ b/pkgs/desktops/mate/atril/default.nix
@@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "cajaextensiondir=$$out/lib/caja/extensions-2.0" ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "A simple multi-page document viewer for the MATE desktop";
     homepage = "https://mate-desktop.org";
diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix
index 2ced1ddf62b3..7b2387721dca 100644
--- a/pkgs/desktops/mate/caja-dropbox/default.nix
+++ b/pkgs/desktops/mate/caja-dropbox/default.nix
@@ -41,6 +41,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-caja-extension-dir=$$out/lib/caja/extensions-2.0" ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Dropbox extension for Caja file manager";
     homepage = "https://github.com/mate-desktop/caja-dropbox";
diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix
index cb1a82c7e0e0..89191dc302b1 100644
--- a/pkgs/desktops/mate/caja-extensions/default.nix
+++ b/pkgs/desktops/mate/caja-extensions/default.nix
@@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Set of extensions for Caja file manager";
     homepage = "https://mate-desktop.org";
diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix
index c1cc371d4633..9f1ec9f587bc 100644
--- a/pkgs/desktops/mate/caja/default.nix
+++ b/pkgs/desktops/mate/caja/default.nix
@@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--disable-update-mimedb" ];
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "File manager for the MATE desktop";
     homepage = "https://mate-desktop.org";
diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix
index 06f7f8de6df2..1f1be3e28577 100644
--- a/pkgs/desktops/mate/engrampa/default.nix
+++ b/pkgs/desktops/mate/engrampa/default.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ];
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "Archive Manager for MATE";
     homepage = "https://mate-desktop.org";
diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix
index a5cfd8be88e5..d7c546040895 100644
--- a/pkgs/desktops/mate/eom/default.nix
+++ b/pkgs/desktops/mate/eom/default.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
     hicolor-icon-theme
   ];
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "An image viewing and cataloging program for the MATE desktop";
     homepage = "https://mate-desktop.org";
diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix
index 6c1bd31d62bf..4c70c2528066 100644
--- a/pkgs/desktops/mate/libmatekbd/default.nix
+++ b/pkgs/desktops/mate/libmatekbd/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gtk3 libxklavier ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Keyboard management library for MATE";
     homepage = "https://github.com/mate-desktop/libmatekbd";
diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix
index ee2cd6284539..6bc9fe54ec3a 100644
--- a/pkgs/desktops/mate/libmatemixer/default.nix
+++ b/pkgs/desktops/mate/libmatemixer/default.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = stdenv.lib.optional ossSupport "--enable-oss";
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Mixer library for MATE";
     homepage = "https://github.com/mate-desktop/libmatemixer";
diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix
index cf9daf8b34ce..4774339db8b0 100644
--- a/pkgs/desktops/mate/libmateweather/default.nix
+++ b/pkgs/desktops/mate/libmateweather/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
 
   preFixup = "rm -f $out/share/icons/mate/icon-theme.cache";
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Library to access weather information from online services for MATE";
     homepage = "https://github.com/mate-desktop/libmateweather";
diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix
index a1d8eed8d283..3d36f51ab145 100644
--- a/pkgs/desktops/mate/marco/default.nix
+++ b/pkgs/desktops/mate/marco/default.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
     mate-settings-daemon
   ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "MATE default window manager";
     homepage = "https://github.com/mate-desktop/marco";
diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix
index e7d4eda2f341..7f77a5668070 100644
--- a/pkgs/desktops/mate/mate-applets/default.nix
+++ b/pkgs/desktops/mate/mate-applets/default.nix
@@ -36,6 +36,8 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Applets for use with the MATE panel";
     homepage = "https://mate-desktop.org";
diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix
index 4b649c6b2933..85bf57ff1c04 100644
--- a/pkgs/desktops/mate/mate-backgrounds/default.nix
+++ b/pkgs/desktops/mate/mate-backgrounds/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ gettext ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Background images and data for MATE";
     homepage = "https://mate-desktop.org";
diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix
index c0e82c391e8f..2de156d02de8 100644
--- a/pkgs/desktops/mate/mate-calc/default.nix
+++ b/pkgs/desktops/mate/mate-calc/default.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
     libxml2
   ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Calculator for the MATE desktop";
     homepage = "https://mate-desktop.org";
diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix
index c9ed7cd51f61..d2bd073e4a29 100644
--- a/pkgs/desktops/mate/mate-common/default.nix
+++ b/pkgs/desktops/mate/mate-common/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "06w25mk2w7rfnkwpnav8pcrvip1zdd0zd1qc6d975ksmg66r1vz7";
   };
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "Common files for development of MATE packages";
     homepage = "https://mate-desktop.org";
diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix
index 96f035e7115f..6a5f8b13bf1f 100644
--- a/pkgs/desktops/mate/mate-desktop/default.nix
+++ b/pkgs/desktops/mate/mate-desktop/default.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
     isocodes
   ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Library with common API for various MATE modules";
     homepage = "https://mate-desktop.org";
diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
index dd8b5662119c..26d8f86985b9 100644
--- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "Faenza icon theme from MATE";
     homepage = "https://mate-desktop.org";
diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix
index 59a19af54801..4a1ea4c41fcb 100644
--- a/pkgs/desktops/mate/mate-icon-theme/default.nix
+++ b/pkgs/desktops/mate/mate-icon-theme/default.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "Icon themes from MATE";
     homepage = "https://mate-desktop.org";
diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix
index b9cb58ffe768..235929dce0c7 100644
--- a/pkgs/desktops/mate/mate-indicator-applet/default.nix
+++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
     hicolor-icon-theme
   ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = "https://github.com/mate-desktop/mate-indicator-applet";
     description = "MATE panel indicator applet";
diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix
index 3ff6fe163adc..c02201c855f9 100644
--- a/pkgs/desktops/mate/mate-media/default.nix
+++ b/pkgs/desktops/mate/mate-media/default.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
     wrapGAppsHook
   ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Media tools for MATE";
     homepage = "https://mate-desktop.org";
diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix
index 2ad108ba7507..7d418c90b4ae 100644
--- a/pkgs/desktops/mate/mate-menus/default.nix
+++ b/pkgs/desktops/mate/mate-menus/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
     "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
   ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Menu system for MATE";
     homepage = "https://github.com/mate-desktop/mate-menus";
diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix
index 8669205168c4..4c3338ef907d 100644
--- a/pkgs/desktops/mate/mate-netbook/default.nix
+++ b/pkgs/desktops/mate/mate-netbook/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
     mate.mate-panel
   ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "MATE utilities for netbooks";
     longDescription = ''
diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix
index 172dd1a61087..32d0cc9ed8e4 100644
--- a/pkgs/desktops/mate/mate-notification-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Notification daemon for MATE Desktop";
     homepage = "https://github.com/mate-desktop/mate-notification-daemon";
diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix
index d98d90c16061..dce656751898 100644
--- a/pkgs/desktops/mate/mate-panel/default.nix
+++ b/pkgs/desktops/mate/mate-panel/default.nix
@@ -37,6 +37,8 @@ stdenv.mkDerivation rec {
     "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
   ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "The MATE panel";
     homepage = "https://github.com/mate-desktop/mate-panel";
diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix
index e65e37d92810..2ab526240418 100644
--- a/pkgs/desktops/mate/mate-polkit/default.nix
+++ b/pkgs/desktops/mate/mate-polkit/default.nix
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
     polkit
   ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Integrates polkit authentication for MATE desktop";
     homepage = "https://mate-desktop.org";
diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix
index 71dfb9c1a200..37ff34e081ab 100644
--- a/pkgs/desktops/mate/mate-power-manager/default.nix
+++ b/pkgs/desktops/mate/mate-power-manager/default.nix
@@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--enable-applets" ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "The MATE Power Manager";
     homepage = "https://mate-desktop.org";
diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix
index 8acde9fb3965..1c80b19aa5bb 100644
--- a/pkgs/desktops/mate/mate-screensaver/default.nix
+++ b/pkgs/desktops/mate/mate-screensaver/default.nix
@@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "DBUS_SESSION_SERVICE_DIR=$(out)/etc" ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Screen saver and locker for the MATE desktop";
     homepage = "https://mate-desktop.org";
diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix
index 92cc283ab336..c7b7d5ba1919 100644
--- a/pkgs/desktops/mate/mate-sensors-applet/default.nix
+++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
     hicolor-icon-theme
   ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = "https://github.com/mate-desktop/mate-sensors-applet";
     description = "MATE panel applet for hardware sensors";
diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix
index 0aedcd3cc342..1db0947bf2a4 100644
--- a/pkgs/desktops/mate/mate-session-manager/default.nix
+++ b/pkgs/desktops/mate/mate-session-manager/default.nix
@@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
     polkit
   ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "MATE Desktop session manager";
     homepage = "https://github.com/mate-desktop/mate-session-manager";
diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix
index af50ba8d8e43..30db743c2763 100644
--- a/pkgs/desktops/mate/mate-settings-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix
@@ -36,6 +36,8 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "MATE settings daemon";
     homepage = "https://github.com/mate-desktop/mate-settings-daemon";
diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix
index 84e5ae5d5d9a..480cf8de1de0 100644
--- a/pkgs/desktops/mate/mate-system-monitor/default.nix
+++ b/pkgs/desktops/mate/mate-system-monitor/default.nix
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--enable-systemd" ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "System monitor for the MATE desktop";
     homepage = "https://mate-desktop.org";
diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix
index a0f98a864c1f..fc030152bcd9 100644
--- a/pkgs/desktops/mate/mate-terminal/default.nix
+++ b/pkgs/desktops/mate/mate-terminal/default.nix
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
     wrapGAppsHook
   ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "The MATE Terminal Emulator";
     homepage = "https://mate-desktop.org";
diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index 8a444702f638..b2a0eea6d5e0 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
     gtk-update-icon-cache "$out"/share/icons/ContrastHigh
   '';
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "A set of themes from MATE";
     homepage = "https://mate-desktop.org";
diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix
index c092bb569618..20ab8a9a361f 100644
--- a/pkgs/desktops/mate/mate-user-guide/default.nix
+++ b/pkgs/desktops/mate/mate-user-guide/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
       --replace "Exec=yelp" "Exec=${yelp}/bin/yelp"
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "MATE User Guide";
     homepage = "https://mate-desktop.org";
diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix
index eddf5ea4b29b..ba27ae6ce102 100644
--- a/pkgs/desktops/mate/mate-user-share/default.nix
+++ b/pkgs/desktops/mate/mate-user-share/default.nix
@@ -42,6 +42,8 @@ stdenv.mkDerivation rec {
     "--with-cajadir=$(out)/lib/caja/extensions-2.0"
   ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "User level public file sharing for the MATE desktop";
     homepage = "https://github.com/mate-desktop/mate-user-share";
diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix
index 3abadc00fe4b..7bad399623a7 100644
--- a/pkgs/desktops/mate/mozo/default.nix
+++ b/pkgs/desktops/mate/mozo/default.nix
@@ -18,6 +18,8 @@ python3.pkgs.buildPythonApplication rec {
 
   buildInputs = [ gtk3 glib ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "MATE Desktop menu editor";
     homepage = "https://github.com/mate-desktop/mozo";
diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix
index fe4a8e488211..5a12ffc37820 100644
--- a/pkgs/desktops/mate/pluma/default.nix
+++ b/pkgs/desktops/mate/pluma/default.nix
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
     mate.mate-desktop
   ];
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "Powerful text editor for the MATE desktop";
     homepage = "https://mate-desktop.org";
diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix
index ad4e46555aa6..570eaefb5990 100644
--- a/pkgs/desktops/mate/python-caja/default.nix
+++ b/pkgs/desktops/mate/python-caja/default.nix
@@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Python binding for Caja components";
     homepage = "https://github.com/mate-desktop/python-caja";

From ee936405b73f9047f8acb68013486f2086a422d8 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 14 Feb 2020 23:34:27 +0100
Subject: [PATCH 0671/4636] cargo-tree: 0.28.0 -> 0.29.0

https://crates.io/crates/cargo-tree/0.29.0
---
 pkgs/tools/package-management/cargo-tree/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-tree/default.nix b/pkgs/tools/package-management/cargo-tree/default.nix
index 141ec8fd48a4..4e5fa69aec90 100644
--- a/pkgs/tools/package-management/cargo-tree/default.nix
+++ b/pkgs/tools/package-management/cargo-tree/default.nix
@@ -1,19 +1,18 @@
 { stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, cmake, curl, libiconv, darwin }:
 rustPlatform.buildRustPackage rec {
   pname = "cargo-tree";
-  version = "0.28.0";
+  version = "0.29.0";
 
   src = fetchFromGitHub {
     owner = "sfackler";
     repo = "cargo-tree";
     rev = "v${version}";
-    sha256 = "0wv5zgyx18fypdb4pmgzxvr2gb9w8vgv6aqir3dxhcvcgf2j5c3n";
+    sha256 = "16k41pj66m2221n1v2szir7x7qwx4i0g3svck2c8cj76h0bqyy15";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
+  legacyCargoFetcher = false;
 
-  cargoSha256 = "16r7zzkf87v67spahaprc25agwh6d3i0kg73vx8a6w7hgqlk0zwa";
+  cargoSha256 = "0762gdj4n5mlflhzynnny1h8z792zyxmb4kcn54jj7qzdask4qdy";
 
   nativeBuildInputs = [ pkgconfig cmake ];
   buildInputs = [ curl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
@@ -21,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "A cargo subcommand that visualizes a crate's dependency graph in a tree-like format";
     license = with licenses; [ asl20 mit ];
-    maintainers = with maintainers; [ jD91mZM2 ];
+    maintainers = with maintainers; [ jD91mZM2 ma27 ];
     homepage = "https://crates.io/crates/cargo-tree";
   };
 }

From ce8d1c2adfcbc9dd2dd7ad5aa801b6d0886408e4 Mon Sep 17 00:00:00 2001
From: Michael Brantley <nixpkgs-commits@deshaw.com>
Date: Mon, 10 Feb 2020 08:11:56 -0500
Subject: [PATCH 0672/4636] pythonPackages.ydiff: init at 1.1

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

diff --git a/pkgs/development/python-modules/ydiff/default.nix b/pkgs/development/python-modules/ydiff/default.nix
new file mode 100644
index 000000000000..ea30e62546fe
--- /dev/null
+++ b/pkgs/development/python-modules/ydiff/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "ydiff";
+  version = "1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0mxcl17sx1d4vaw22ammnnn3y19mm7r6ljbarcjzi519klz26bnf";
+  };
+
+  # test suite requires a multitude of other version control tooling
+  # currently only a single file, an import/usage should suffice
+  checkPhase = ''
+    $out/bin/ydiff --help
+  '';
+
+  meta = with stdenv.lib; {
+    description = "View colored, incremental diff in workspace or from stdin with side by side and auto pager support (Was \"cdiff\")";
+    longDescription = ''
+      Term based tool to view colored, incremental diff in a Git/Mercurial/Svn
+      workspace or from stdin, with side by side (similar to diff -y) and auto
+      pager support
+    '';
+    homepage = "https://github.com/ymattw/ydiff";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.limeytexan ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ed8f513db86a..3adaab1c33f8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5770,6 +5770,8 @@ in {
 
   xxhash = callPackage ../development/python-modules/xxhash { };
 
+  ydiff = callPackage ../development/python-modules/ydiff { };
+
   yoda = toPythonModule (pkgs.yoda.override {
     inherit python;
   });

From 08ac06edbaaeccb4677adca396c30a8f88cb9c92 Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Fri, 14 Feb 2020 23:57:31 +0100
Subject: [PATCH 0673/4636] docker-containers: Add autoStart option (#76480)

This option allows the user to control whether or not the docker container is
automatically started on boot. The previous default behavior (true) is preserved
---
 nixos/modules/virtualisation/docker-containers.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/docker-containers.nix b/nixos/modules/virtualisation/docker-containers.nix
index 216ba2c733fc..cae39a56f52f 100644
--- a/nixos/modules/virtualisation/docker-containers.nix
+++ b/nixos/modules/virtualisation/docker-containers.nix
@@ -192,13 +192,22 @@ let
             ["--network=host"]
           '';
         };
+
+        autoStart = mkOption {
+          type = types.bool;
+          default = true;
+          description = ''
+            When enabled, the container is automatically started on boot.
+            If this option is set to false, the container has to be started on-demand via its service.
+          '';
+        };
       };
     };
 
   mkService = name: container: let
     mkAfter = map (x: "docker-${x}.service") container.dependsOn;
   in rec {
-    wantedBy = [ "multi-user.target" ];
+    wantedBy = [] ++ optional (container.autoStart) "multi-user.target";
     after = [ "docker.service" "docker.socket" ] ++ mkAfter;
     requires = after;
 

From be2ceb2efc0a150d68755189bc47c6240270bcdf Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Thu, 13 Feb 2020 21:41:35 -0800
Subject: [PATCH 0674/4636] fish: 3.0.2 -> 3.1.0

fish-shell 3.1.0 was just released today with many niceties (including
the ability to have bash-like temporary env vars e.g. `VAR="var1"
command` instead of needing to use `env VAR="var1" command`). To see the
full list of changes, please visit
https://github.com/fish-shell/fish-shell/releases/tag/3.1.0.
---
 pkgs/shells/fish/default.nix | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 5f59c33af0d1..013cebfd7ec5 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -90,7 +90,7 @@ let
 
   fish = stdenv.mkDerivation rec {
     pname = "fish";
-    version = "3.0.2";
+    version = "3.1.0";
 
     etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText;
 
@@ -98,7 +98,7 @@ let
       # There are differences between the release tarball and the tarball github packages from the tag
       # Hence we cannot use fetchFromGithub
       url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.gz";
-      sha256 = "03j3jl9jzlnhq4p86zj8wqsh5sx45j1d1fvfa80ks1cfdg68qwhl";
+      sha256 = "0s2356mlx7fp9kgqgw91lm5ds2i9iq9hq071fbqmcp3875l1xnz5";
     };
 
     nativeBuildInputs = [ cmake ];
@@ -109,11 +109,10 @@ let
     '';
 
     patches = [
-      # Fixes "Integer 243 in '243 (243)' followed by non-digit" error with systemctl completion.
-      # https://github.com/fish-shell/fish-shell/issues/5689 (will be included in fish 3.1.0)
+      # Fixes compilation on old Apple SDKs
       (fetchpatch {
-        url = "https://github.com/fish-shell/fish-shell/commit/c6ec4235136e82c709e8d7b455f7c463f9714b48.patch";
-        sha256 = "02m6pkhhx6y21csydznsxkbpnwhcpzyz99xgd9ryh7s03v7wbigw";
+        url = "https://github.com/fish-shell/fish-shell/commit/10385d422b3e2a823faebfdaf13edd0e7f48a27f.patch";
+        sha256 = "0hj13kyjf5wr9j5afd4mfylcr7mz68ilbncbcf307drk1lv1lvrn";
       })
     ];
 
@@ -128,7 +127,7 @@ let
       sed -r "s|command grep|command ${gnugrep}/bin/grep|" \
           -i "$out/share/fish/functions/grep.fish"
       sed -i "s|which |${which}/bin/which |"               \
-              "$out/share/fish/functions/type.fish"
+             "$out/share/fish/functions/type.fish"
       sed -e "s|\|cut|\|${coreutils}/bin/cut|"             \
           -i "$out/share/fish/functions/fish_prompt.fish"
       sed -e "s|gettext |${gettext}/bin/gettext |"         \
@@ -136,18 +135,18 @@ let
           -i "$out/share/fish/functions/_.fish"
       sed -e "s|uname|${coreutils}/bin/uname|"             \
           -i "$out/share/fish/functions/__fish_pwd.fish"   \
-            "$out/share/fish/functions/prompt_pwd.fish"
+             "$out/share/fish/functions/prompt_pwd.fish"
       sed -e "s|sed |${gnused}/bin/sed |"                  \
           -i "$out/share/fish/functions/alias.fish"        \
-            "$out/share/fish/functions/prompt_pwd.fish"
+             "$out/share/fish/functions/prompt_pwd.fish"
       sed -i "s|nroff |${groff}/bin/nroff |"               \
-            "$out/share/fish/functions/__fish_print_help.fish"
-      sed -i "s|/sbin /usr/sbin||" \
-            "$out/share/fish/functions/__fish_complete_subcommand_root.fish"
-      sed -e "s|clear;|${getBin ncurses}/bin/clear;|" \
+             "$out/share/fish/functions/__fish_print_help.fish"
+      sed -e "s|clear;|${getBin ncurses}/bin/clear;|"      \
           -i "$out/share/fish/functions/fish_default_key_bindings.fish"
-      sed -e "s|python3|${getBin python3}/bin/python3|" \
+      sed -e "s|python3|${getBin python3}/bin/python3|"    \
           -i $out/share/fish/functions/{__fish_config_interactive.fish,fish_config.fish,fish_update_completions.fish}
+      sed -i "s|/usr/local/sbin /sbin /usr/sbin||"         \
+             $out/share/fish/completions/{sudo.fish,doas.fish}
 
     '' + optionalString stdenv.isLinux ''
       sed -e "s| ul| ${utillinux}/bin/ul|" \

From 36ca91e25306df0f72332a24c8dd67f7a59552bd Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 10 Feb 2020 00:25:07 +0100
Subject: [PATCH 0675/4636] dina: generate otb files with fontforge

Note: the encoding of the Dina BDF fonts is not unicode and
apparently fonttosfnt can't handle them.
---
 pkgs/data/fonts/dina/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix
index d5b709007035..8bc1af60ab4d 100644
--- a/pkgs/data/fonts/dina/default.nix
+++ b/pkgs/data/fonts/dina/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, unzip
-, bdftopcf, mkfontscale
+, bdftopcf, mkfontscale, fontforge
 }:
 
 stdenv.mkDerivation {
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs =
-    [ unzip bdftopcf mkfontscale ];
+    [ unzip bdftopcf mkfontscale fontforge ];
 
   patchPhase = "sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf";
 
@@ -33,15 +33,23 @@ stdenv.mkDerivation {
       bdftopcf -t -o $(newName "$i").pcf "$i"
     done
     gzip -n -9 *.pcf
+
+    # convert bdf fonts to otb
+    for i in *.bdf; do
+      fontforge -lang=ff -c "Open(\"$i\"); Generate(\"$(newName $i).otb\")"
+    done
   '';
 
   installPhase = ''
     install -D -m 644 -t "$out/share/fonts/misc" *.pcf.gz
     install -D -m 644 -t "$bdf/share/fonts/misc" *.bdf
+    install -D -m 644 -t "$otb/share/fonts/misc" *.otb
     mkfontdir "$out/share/fonts/misc"
+    mkfontdir "$bdf/share/fonts/misc"
+    mkfontdir "$otb/share/fonts/misc"
   '';
 
-  outputs = [ "out" "bdf" ];
+  outputs = [ "out" "bdf" "otb" ];
 
   meta = with stdenv.lib; {
     description = "A monospace bitmap font aimed at programmers";

From 7fe574dff3788310156d0d4e5f972ce533c0e6c3 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 15 Feb 2020 01:32:36 +0100
Subject: [PATCH 0676/4636] envupn-font: unrestrict platforms

---
 pkgs/data/fonts/envypn-font/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix
index bb5488481e58..c26569166a30 100644
--- a/pkgs/data/fonts/envypn-font/default.nix
+++ b/pkgs/data/fonts/envypn-font/default.nix
@@ -39,6 +39,6 @@ stdenv.mkDerivation {
     '';
     homepage = "http://ywstd.fr/p/pj/#envypn";
     license = licenses.miros;
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 }

From 124ff1a3fadd488e72e2f04a1f1db6284a0638af Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Feb 2020 00:38:26 +0000
Subject: [PATCH 0677/4636] gnome3.accerciser: 3.34.3 -> 3.34.4

---
 pkgs/desktops/gnome-3/apps/accerciser/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
index 8fd4a0923767..41b40244f57d 100644
--- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix
@@ -17,13 +17,13 @@
 
  python3.pkgs.buildPythonApplication rec {
   name = "accerciser-${version}";
-  version = "3.34.3";
+  version = "3.34.4";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1ixyxfv2h5921x82d0r39v952ggclnf2xba5li01qmshl6b21kcc";
+    sha256 = "0f1dixq5hc55dl3y0fr85bkrc2zk08n4dacqcjifij1dys4ks3z1";
   };
 
   nativeBuildInputs = [

From 29c5035e0f510bea02657b9777cb39be95960ec3 Mon Sep 17 00:00:00 2001
From: Kim Lindberger <kim.lindberger@gmail.com>
Date: Sat, 15 Feb 2020 01:39:47 +0100
Subject: [PATCH 0678/4636] synergy: 1.8.8 -> 1.11.0 (#80138)

This gets rid of a few patches that aren't needed any more, adds one
to make the tests work again and updates the MacOS patch. It also
introduces two builds - one with the Qt application and one without.

The patch to get the tests working will be submitted upstream and
hopefully not be needed for future releases.
---
 .../misc/synergy/build-tests.patch            |  97 +++++++++++
 pkgs/applications/misc/synergy/default.nix    |  90 +++++-----
 .../misc/synergy/macos_build_fix.patch        |  29 ++++
 .../misc/synergy/openssl-1.1.patch            |  18 --
 .../misc/synergy/respect_macos_arch.patch     |  61 -------
 .../misc/synergy/update_gtest_gmock.patch     | 158 ------------------
 pkgs/top-level/all-packages.nix               |   4 +-
 7 files changed, 168 insertions(+), 289 deletions(-)
 create mode 100644 pkgs/applications/misc/synergy/build-tests.patch
 create mode 100644 pkgs/applications/misc/synergy/macos_build_fix.patch
 delete mode 100644 pkgs/applications/misc/synergy/openssl-1.1.patch
 delete mode 100644 pkgs/applications/misc/synergy/respect_macos_arch.patch
 delete mode 100644 pkgs/applications/misc/synergy/update_gtest_gmock.patch

diff --git a/pkgs/applications/misc/synergy/build-tests.patch b/pkgs/applications/misc/synergy/build-tests.patch
new file mode 100644
index 000000000000..ab08195e794d
--- /dev/null
+++ b/pkgs/applications/misc/synergy/build-tests.patch
@@ -0,0 +1,97 @@
+From 9c2278dad498b8e4040f30c80cf65b3a089ba218 Mon Sep 17 00:00:00 2001
+From: talyz <kim.lindberger@gmail.com>
+Date: Fri, 14 Feb 2020 16:26:36 +0100
+Subject: [PATCH] Build tests again
+
+The tests were accidentally disabled in
+688095d0a7d22704b5c3282bc68b41ceca42ab7e. Since then, the code has
+drifted slightly: the synergy lib has been renamed from synergy to
+synlib in 4263fd17177d7717b04ac6d6ec62efa2f657ed74 and the curl
+dependency was dropped in 491bb2de000245a943b8298462c4a9d8f34c9a44.
+
+This reenables the tests, targets the right lib and removes the
+obsolete test.
+---
+ src/CMakeLists.txt                            |  2 +
+ src/test/integtests/CMakeLists.txt            |  2 +-
+ .../integtests/arch/ArchInternetTests.cpp     | 37 -------------------
+ src/test/unittests/CMakeLists.txt             |  2 +-
+ 4 files changed, 4 insertions(+), 39 deletions(-)
+ delete mode 100644 src/test/integtests/arch/ArchInternetTests.cpp
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index ab63a066..fee080ab 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -22,3 +22,5 @@ add_subdirectory(cmd)
+ if (SYNERGY_BUILD_LEGACY_GUI)
+ add_subdirectory(gui)
+ endif (SYNERGY_BUILD_LEGACY_GUI)
++
++add_subdirectory(test)
+diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt
+index f39968a3..096ba3d5 100644
+--- a/src/test/integtests/CMakeLists.txt
++++ b/src/test/integtests/CMakeLists.txt
+@@ -68,4 +68,4 @@ endif()
+ 
+ add_executable(integtests ${sources})
+ target_link_libraries(integtests
+-    arch base client common io ipc mt net platform server synergy gtest gmock ${libs} ${OPENSSL_LIBS})
++    arch base client common io ipc mt net platform server synlib gtest gmock ${libs} ${OPENSSL_LIBS})
+diff --git a/src/test/integtests/arch/ArchInternetTests.cpp b/src/test/integtests/arch/ArchInternetTests.cpp
+deleted file mode 100644
+index 95823e9f..00000000
+--- a/src/test/integtests/arch/ArchInternetTests.cpp
++++ /dev/null
+@@ -1,37 +0,0 @@
+-/*
+- * synergy -- mouse and keyboard sharing utility
+- * Copyright (C) 2014-2016 Symless Ltd.
+- *
+- * This package is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public License
+- * found in the file LICENSE that should have accompanied this file.
+- *
+- * This package is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+- */
+-
+-#include "arch/Arch.h"
+-
+-#include "test/global/gtest.h"
+-
+-#define TEST_URL "https://symless.com/tests/?testString"
+-//#define TEST_URL "http://localhost/synergy/tests/?testString"
+-
+-TEST(ArchInternetTests, get)
+-{
+-    ARCH_INTERNET internet;
+-    String result = internet.get(TEST_URL);
+-    ASSERT_EQ("Hello world!", result);
+-}
+-
+-TEST(ArchInternetTests, urlEncode)
+-{
+-    ARCH_INTERNET internet;
+-    String result = internet.urlEncode("hello=+&world");
+-    ASSERT_EQ("hello%3D%2B%26world", result);
+-}
+diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt
+index 54131eb2..46307e90 100644
+--- a/src/test/unittests/CMakeLists.txt
++++ b/src/test/unittests/CMakeLists.txt
+@@ -68,4 +68,4 @@ endif()
+ 
+ add_executable(unittests ${sources})
+ target_link_libraries(unittests
+-    arch base client server common io net platform server synergy mt ipc gtest gmock shared ${libs} ${OPENSSL_LIBS})
++    arch base client server common io net platform server synlib mt ipc gtest gmock shared ${libs} ${OPENSSL_LIBS})
+-- 
+2.25.0
+
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 377d83e59627..69c2e37e3520 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -1,81 +1,69 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, xlibsWrapper
+{ stdenv, lib, fetchFromGitHub, cmake, avahi-compat
 , ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver
-, libX11, libXi, libXtst, libXrandr, xinput, curl, openssl, unzip }:
+, xlibsWrapper, libX11, libXi, libXtst, libXrandr, xinput, openssl
+, withGUI ? true, wrapQtAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "synergy";
-  version = "1.8.8";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "symless";
     repo = "synergy-core";
-    rev = "v${version}-stable";
-    sha256 = "0ksgr9hkf09h54572p7k7b9zkfhcdb2g2d5x7ixxn028y8i3jyp3";
+    rev = "${version}-stable";
+    sha256 = "1jk60xw4h6s5crha89wk4y8rrf1f3bixgh5mzh3cq3xyrkba41gh";
   };
 
-  patches = [./openssl-1.1.patch ./update_gtest_gmock.patch
-  ] ++ lib.optional stdenv.isDarwin ./respect_macos_arch.patch;
+  patches = [ ./build-tests.patch
+  ] ++ lib.optional stdenv.isDarwin ./macos_build_fix.patch;
 
-  patch_gcc6 = fetchpatch {
-    url = https://raw.githubusercontent.com/gentoo/gentoo/20e2bff3697ebf5f291e9907b34aae3074a36b53/dev-cpp/gmock/files/gmock-1.7.0-gcc6.patch;
-    sha256 = "0j3f381x1lf8qci9pfv6mliggl8qs2w05v5lw3rs3gn7aibg174d";
-  };
-
-  # Due to the included gtest and gmock not supporting clang
-  # we replace it with 1.7.0 for synergy-1.8.8. This should
-  # become unnecessary when we update to a newer version of Synergy.
-  gmock_zip = fetchurl {
-    url = https://github.com/google/googlemock/archive/release-1.7.0.zip;
-    sha256 = "11bd04098rzamv7f9y01zaf9c8zrmzdk6g1qrlwq780pxzlr4ya0";
-  };
-
-  gtest_zip = fetchurl {
-    url = https://github.com/google/googletest/archive/release-1.7.0.zip;
-    sha256 = "1l5n6kzdypjzjrz2jh14ylzrx735lccfx2p3s4ccgci8g9abg35m";
+  # Since the included gtest and gmock don't support clang and the
+  # segfault when built with gcc9, we replace it with 1.10.0 for
+  # synergy-1.11.0. This should become unnecessary when upstream
+  # updates these dependencies.
+  googletest = fetchFromGitHub {
+    owner = "google";
+    repo = "googletest";
+    rev = "release-1.10.0";
+    sha256 = "1zbmab9295scgg4z2vclgfgjchfjailjnvzc6f5x9jvlsdi3dpwz";
   };
 
   postPatch = ''
-    ${unzip}/bin/unzip -d ext/ ${gmock_zip}
-    ${unzip}/bin/unzip -d ext/ ${gtest_zip}
-    mv ext/googlemock-release-1.7.0 ext/gmock-1.7.0
-    mv ext/googletest-release-1.7.0 ext/gtest-1.7.0
-    patch -d ext/gmock-1.7.0 -p1 -i ${patch_gcc6}
-  ''
-    # We have XRRNotifyEvent (libXrandr), but with the upstream CMakeLists.txt
-    # it's not able to find it (it's trying to search the store path of libX11
-    # instead) and we don't get XRandR support, even though the CMake output
-    # _seems_ to say so:
-    #
-    #   Looking for XRRQueryExtension in Xrandr - found
-    #
-    # The relevant part however is:
-    #
-    #   Looking for XRRNotifyEvent - not found
-    #
-    # So let's force it:
-  + lib.optionalString stdenv.isLinux ''
-    sed -i -e '/HAVE_X11_EXTENSIONS_XRANDR_H/c \
-      set(HAVE_X11_EXTENSIONS_XRANDR_H true)
-    ' CMakeLists.txt
+    rm -r ext/*
+    cp -r ${googletest}/googlemock ext/gmock/
+    cp -r ${googletest}/googletest ext/gtest/
+    chmod -R +w ext/
   '';
 
-  cmakeFlags = lib.optionals stdenv.isDarwin [ "-DOSX_TARGET_MAJOR=10" "-DOSX_TARGET_MINOR=7" ];
+  cmakeFlags = lib.optionals stdenv.isDarwin [
+    "-DOSX_TARGET_MAJOR=10"
+    "-DOSX_TARGET_MINOR=7"
+  ] ++ lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF";
+
+  nativeBuildInputs = [ cmake ] ++ lib.optional withGUI wrapQtAppsHook;
+
+  dontWrapQtApps = true;
 
   buildInputs = [
-    cmake curl openssl
+    openssl avahi-compat
   ] ++ lib.optionals stdenv.isDarwin [
     ApplicationServices Carbon Cocoa CoreServices ScreenSaver
   ] ++ lib.optionals stdenv.isLinux [ xlibsWrapper libX11 libXi libXtst libXrandr xinput ];
 
   installPhase = ''
     mkdir -p $out/bin
-    cp ../bin/synergyc $out/bin
-    cp ../bin/synergys $out/bin
-    cp ../bin/synergyd $out/bin
+    cp bin/{synergyc,synergys,synergyd,syntool} $out/bin/
+  '' + lib.optionalString withGUI ''
+    cp bin/synergy $out/bin/
+    wrapQtApp $out/bin/synergy --prefix PATH : ${lib.makeBinPath [ openssl ]}
+    mkdir -p $out/share/icons/hicolor/scalable/apps
+    cp ../res/synergy.svg $out/share/icons/hicolor/scalable/apps/
+    mkdir -p $out/share/applications
+    substitute ../res/synergy.desktop $out/share/applications/synergy.desktop --replace /usr/bin $out/bin
   '';
 
   doCheck = true;
-  checkPhase = "../bin/unittests";
+  checkPhase = "bin/unittests";
 
   meta = with lib; {
     description = "Share one mouse and keyboard between multiple computers";
diff --git a/pkgs/applications/misc/synergy/macos_build_fix.patch b/pkgs/applications/misc/synergy/macos_build_fix.patch
new file mode 100644
index 000000000000..2ce277d261b1
--- /dev/null
+++ b/pkgs/applications/misc/synergy/macos_build_fix.patch
@@ -0,0 +1,29 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a2297311..25a51f56 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -138,7 +138,7 @@ if (UNIX)
+ 
+ 
+     if (APPLE)
+-        set (CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1")
++        set (CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS}")
+ 
+         find_library (lib_ScreenSaver ScreenSaver)
+         find_library (lib_IOKit IOKit)
+@@ -292,14 +292,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+         ${OPENSSL_ROOT}/lib/libssl.lib
+         ${OPENSSL_ROOT}/lib/libcrypto.lib
+     )
+-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+-    set (OPENSSL_ROOT /usr/local/opt/openssl)
+-    include_directories (BEFORE SYSTEM ${OPENSSL_ROOT}/include)
+-    set (OPENSSL_LIBS
+-        ${OPENSSL_ROOT}/lib/libssl.a
+-        ${OPENSSL_ROOT}/lib/libcrypto.a
+-    )
+-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
++elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+     set (OPENSSL_LIBS ssl crypto)
+ else()
+     message (FATAL_ERROR "Couldn't find OpenSSL")
diff --git a/pkgs/applications/misc/synergy/openssl-1.1.patch b/pkgs/applications/misc/synergy/openssl-1.1.patch
deleted file mode 100644
index 56dc6112844e..000000000000
--- a/pkgs/applications/misc/synergy/openssl-1.1.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/lib/net/SecureSocket.cpp	2017-07-22 19:33:22.442645291 +0200
-+++ b/src/lib/net/SecureSocket.cpp	2017-07-22 19:36:25.632595581 +0200
-@@ -805,9 +805,14 @@
- 		showCipherStackDesc(sStack);
- 	}
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	// m_ssl->m_ssl->session->ciphers is not forward compatable, In future release
--	// of OpenSSL, it's not visible, need to use SSL_get_client_ciphers() instead
-+	// of OpenSSL, it's not visible
- 	STACK_OF(SSL_CIPHER) * cStack = m_ssl->m_ssl->session->ciphers;
-+#else
-+	// Use SSL_get_client_ciphers() for newer versions
-+	STACK_OF(SSL_CIPHER) * cStack = SSL_get_client_ciphers(m_ssl->m_ssl);
-+#endif
- 		if (cStack == NULL) {
- 		LOG((CLOG_DEBUG1 "remote cipher list not available"));
- 	}
diff --git a/pkgs/applications/misc/synergy/respect_macos_arch.patch b/pkgs/applications/misc/synergy/respect_macos_arch.patch
deleted file mode 100644
index 003d7d22421a..000000000000
--- a/pkgs/applications/misc/synergy/respect_macos_arch.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 944177c76d4c7ff5ef3460eab28286a45344a0e7 Mon Sep 17 00:00:00 2001
-From: Michael Hoang <enzime@users.noreply.github.com>
-Date: Sat, 14 Jul 2018 21:56:59 +1000
-Subject: [PATCH 2/2] Make sure CMake respects the current arch on macOS
-
-Only set the macOS architecture if not defined by the user. Use the
-OpenSSL libraries and headers from Nix on macOS to prevent architecture
-mismatches.
----
- CMakeLists.txt     |  2 +-
- src/CMakeLists.txt | 14 +-------------
- 2 files changed, 2 insertions(+), 14 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2f37424d..c7217e28 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -172,7 +172,7 @@ if (UNIX)
- 			# <= 10.5: 32-bit Intel and PowerPC
- 			set(CMAKE_OSX_ARCHITECTURES "ppc;i386"
- 				CACHE STRING "" FORCE)
--		else()
-+		elseif (NOT CMAKE_OSX_ARCHITECTURES)
- 			# >= 10.6: Intel only
- 			set(CMAKE_OSX_ARCHITECTURES "i386"
- 				CACHE STRING "" FORCE)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 237ba484..04428636 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -23,11 +23,6 @@ if (WIN32)
- 	set(OPENSSL_INCLUDE ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/inc32)
- endif()
- 
--if (APPLE)
--	set(OPENSSL_PLAT_DIR openssl-osx)
--	set(OPENSSL_INCLUDE ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/include)
--endif()
--
- if (WIN32)
- 	set(OPENSSL_LIBS
- 		${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/out32dll/libeay32.lib
-@@ -36,14 +31,7 @@ if (WIN32)
- endif()
- 
- if (UNIX)
--	if (APPLE)
--		set(OPENSSL_LIBS
--		${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/libssl.a
--		${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/libcrypto.a
--		)
--	else()
--		set(OPENSSL_LIBS ssl crypto)
--	endif()
-+	set(OPENSSL_LIBS ssl crypto)
- endif()
- 
- add_subdirectory(lib)
--- 
-2.17.1
-
diff --git a/pkgs/applications/misc/synergy/update_gtest_gmock.patch b/pkgs/applications/misc/synergy/update_gtest_gmock.patch
deleted file mode 100644
index 87b53e78585b..000000000000
--- a/pkgs/applications/misc/synergy/update_gtest_gmock.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From eea85dbf4bbde545d8cb07d7ee9fbdca3dcf48fd Mon Sep 17 00:00:00 2001
-From: Michael Hoang <enzime@users.noreply.github.com>
-Date: Sat, 14 Jul 2018 22:07:39 +1000
-Subject: [PATCH 1/2] Update gtest and gmock to version 1.7.0
-
-Fixes compilation under clang on macOS as <tr1/tuple> is now found under
-<tuple>.
----
- CMakeLists.txt                     |  2 +-
- ext/toolchain/commands1.py         |  4 ++--
- src/lib/platform/CMakeLists.txt    |  2 +-
- src/lib/server/CMakeLists.txt      |  2 +-
- src/lib/shared/CMakeLists.txt      |  2 +-
- src/lib/synergy/CMakeLists.txt     |  2 +-
- src/test/CMakeLists.txt            | 12 ++++++------
- src/test/integtests/CMakeLists.txt |  4 ++--
- src/test/unittests/CMakeLists.txt  |  4 ++--
- 9 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 94c474e8..2f37424d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -178,7 +178,7 @@ if (UNIX)
- 				CACHE STRING "" FORCE)
- 		endif()
- 		
--		set(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1")
-+		set(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS}")
- 
- 		find_library(lib_ScreenSaver ScreenSaver)
- 		find_library(lib_IOKit IOKit)
-diff --git a/ext/toolchain/commands1.py b/ext/toolchain/commands1.py
-index f32ec483..bf997cf6 100644
---- a/ext/toolchain/commands1.py
-+++ b/ext/toolchain/commands1.py
-@@ -251,10 +251,10 @@ class InternalCommands:
- 	macIdentity = None
- 	
- 	# gtest dir with version number
--	gtestDir = 'gtest-1.6.0'
-+	gtestDir = 'gtest-1.7.0'
- 	
- 	# gmock dir with version number
--	gmockDir = 'gmock-1.6.0'
-+	gmockDir = 'gmock-1.7.0'
- 
- 	win32_generators = {
- 		1 : VisualStudioGenerator('10'),
-diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt
-index 481d8ef9..1ce67eca 100644
---- a/src/lib/platform/CMakeLists.txt
-+++ b/src/lib/platform/CMakeLists.txt
-@@ -31,7 +31,7 @@ endif()
- 
- include_directories(
- 	../
--	../../../ext/gtest-1.6.0/include
-+	../../../ext/gtest-1.7.0/include
- )
- 
- if (UNIX)
-diff --git a/src/lib/server/CMakeLists.txt b/src/lib/server/CMakeLists.txt
-index 3cb582ec..0525d627 100644
---- a/src/lib/server/CMakeLists.txt
-+++ b/src/lib/server/CMakeLists.txt
-@@ -24,7 +24,7 @@ endif()
- include_directories(
- 	../
- 	../../../ext
--	../../../ext/gtest-1.6.0/include
-+	../../../ext/gtest-1.7.0/include
- )
- 
- if (UNIX)
-diff --git a/src/lib/shared/CMakeLists.txt b/src/lib/shared/CMakeLists.txt
-index 891f4aa7..16c8b04a 100644
---- a/src/lib/shared/CMakeLists.txt
-+++ b/src/lib/shared/CMakeLists.txt
-@@ -25,7 +25,7 @@ add_library(shared STATIC ${sources})
- include_directories(
- 	../
- 	../../../ext
--	../../../ext/gtest-1.6.0/include
-+	../../../ext/gtest-1.7.0/include
- )
- 
- target_link_libraries(shared arch base)
-diff --git a/src/lib/synergy/CMakeLists.txt b/src/lib/synergy/CMakeLists.txt
-index 0972be8c..e19fcce5 100644
---- a/src/lib/synergy/CMakeLists.txt
-+++ b/src/lib/synergy/CMakeLists.txt
-@@ -36,7 +36,7 @@ endif()
- include_directories(
- 	../
- 	../../../ext
--	../../../ext/gtest-1.6.0/include
-+	../../../ext/gtest-1.7.0/include
- )
- 
- if (UNIX)
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
-index 8812150a..04cdfc50 100644
---- a/src/test/CMakeLists.txt
-+++ b/src/test/CMakeLists.txt
-@@ -15,13 +15,13 @@
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
- include_directories(
--	../../ext/gtest-1.6.0
--	../../ext/gtest-1.6.0/include
--	../../ext/gmock-1.6.0
--	../../ext/gmock-1.6.0/include)
-+	../../ext/gtest-1.7.0
-+	../../ext/gtest-1.7.0/include
-+	../../ext/gmock-1.7.0
-+	../../ext/gmock-1.7.0/include)
- 	
--add_library(gtest STATIC ../../ext/gtest-1.6.0/src/gtest-all.cc)
--add_library(gmock STATIC ../../ext/gmock-1.6.0/src/gmock-all.cc)
-+add_library(gtest STATIC ../../ext/gtest-1.7.0/src/gtest-all.cc)
-+add_library(gmock STATIC ../../ext/gmock-1.7.0/src/gmock-all.cc)
- 
- if (UNIX)
- 	# ignore warnings in gtest and gmock
-diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt
-index 2f1ca7f3..6ddbd29a 100644
---- a/src/test/integtests/CMakeLists.txt
-+++ b/src/test/integtests/CMakeLists.txt
-@@ -56,8 +56,8 @@ endif()
- include_directories(
- 	../../
- 	../../lib/
--	../../../ext/gtest-1.6.0/include
--	../../../ext/gmock-1.6.0/include
-+	../../../ext/gtest-1.7.0/include
-+	../../../ext/gmock-1.7.0/include
- )
- 
- if (UNIX)
-diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt
-index 3e49dc3c..5f6c4fac 100644
---- a/src/test/unittests/CMakeLists.txt
-+++ b/src/test/unittests/CMakeLists.txt
-@@ -51,8 +51,8 @@ list(APPEND headers ${platform_sources})
- include_directories(
- 	../../
- 	../../lib/
--	../../../ext/gtest-1.6.0/include
--	../../../ext/gmock-1.6.0/include
-+	../../../ext/gtest-1.7.0/include
-+	../../../ext/gmock-1.7.0/include
- 	../../../ext
- )
- 
--- 
-2.17.1
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ca3ce8928406..f768541ad806 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21614,11 +21614,13 @@ in
     systemdSupport = true;
   };
 
-  synergy = callPackage ../applications/misc/synergy {
+  synergy = libsForQt5.callPackage ../applications/misc/synergy {
     stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
     inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa CoreServices ScreenSaver;
   };
 
+  synergyWithoutGUI = synergy.override { withGUI = false; };
+
   tabbed = callPackage ../applications/window-managers/tabbed {
     # if you prefer a custom config, write the config.h in tabbed.config.h
     # and enable

From 931f47304f65e6be1c2b9ad140eb97ae7fb541b5 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Tue, 28 Jan 2020 16:48:15 -0500
Subject: [PATCH 0679/4636] python3Packages.hickle: init at 3.4.5

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

diff --git a/pkgs/development/python-modules/hickle/default.nix b/pkgs/development/python-modules/hickle/default.nix
new file mode 100644
index 000000000000..8d45970294c7
--- /dev/null
+++ b/pkgs/development/python-modules/hickle/default.nix
@@ -0,0 +1,39 @@
+{ buildPythonPackage
+, fetchPypi
+, h5py
+, numpy
+, dill
+, astropy
+, scipy
+, pandas
+, pytest
+, pytestcov
+, pytestrunner
+, coveralls
+, lib
+}:
+
+buildPythonPackage rec {
+  pname   = "hickle";
+  version = "3.4.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1d1qj3yl7635lgkqacz9r8fyhv71396l748ww4wy05ibpignjm2x";
+  };
+
+  postPatch = ''
+    substituteInPlace requirements_test.txt \
+      --replace 'astropy<3.1;' 'astropy;' --replace 'astropy<3.0;' 'astropy;'
+  '';
+
+  propagatedBuildInputs = [ h5py numpy dill ];
+  checkInputs = [ pytest pytestcov pytestrunner coveralls scipy pandas astropy ];
+
+  meta = {
+    description = "Serialize Python data to HDF5";
+    homepage = "https://github.com/telegraphic/hickle";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ bcdarwin ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3adaab1c33f8..46e5fc00b445 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2750,6 +2750,8 @@ in {
 
   hbmqtt = callPackage ../development/python-modules/hbmqtt { };
 
+  hickle = callPackage ../development/python-modules/hickle { };
+
   hiro = callPackage ../development/python-modules/hiro {};
 
   hglib = callPackage ../development/python-modules/hglib {};

From 6dca90784ae865d815cb1a91d9a34661e638576b Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Tue, 28 Jan 2020 16:50:39 -0500
Subject: [PATCH 0680/4636] python3Packages.pywick: init at 0.5.6

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

diff --git a/pkgs/development/python-modules/pywick/default.nix b/pkgs/development/python-modules/pywick/default.nix
new file mode 100644
index 000000000000..c675686ef833
--- /dev/null
+++ b/pkgs/development/python-modules/pywick/default.nix
@@ -0,0 +1,48 @@
+{ buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, pytest
+, h5py
+, hickle
+, numpy
+, pandas
+, pillow
+, six
+, pytorch
+, torchvision
+, tqdm
+, lib
+}:
+
+buildPythonPackage rec {
+  pname   = "pywick";
+  version = "0.5.6";
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "achaiah";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1gmlifnv9kji0d1jwg1pa8d96zg48w17qg0sgxwy1y1jf3hn37bm";
+  };
+
+  propagatedBuildInputs = [
+    h5py hickle numpy pandas pillow six pytorch torchvision tqdm
+  ];
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    runHook preCheck
+    pytest tests/
+    runHook postCheck
+  '';
+
+  meta = {
+    description = "High-level training framework for Pytorch";
+    homepage = "https://github.com/achaiah/pywick";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ bcdarwin ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 46e5fc00b445..f13129b74d52 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1317,6 +1317,8 @@ in {
 
   pywebpush = callPackage ../development/python-modules/pywebpush { };
 
+  pywick = callPackage ../development/python-modules/pywick { };
+
   pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml{ });
 
   pyvcd = callPackage ../development/python-modules/pyvcd { };

From ebf01d561401494f4539306e8a7d5c3f21e9b4ba Mon Sep 17 00:00:00 2001
From: Jeff Labonte <jeff.labonte12@gmail.com>
Date: Thu, 13 Feb 2020 15:24:17 -0500
Subject: [PATCH 0681/4636] gitAndTools.bump2version: init at 1.0.0

---
 .../git-and-tools/bump2version/default.nix    | 31 +++++++++++++++++++
 .../git-and-tools/default.nix                 |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/bump2version/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/bump2version/default.nix b/pkgs/applications/version-management/git-and-tools/bump2version/default.nix
new file mode 100644
index 000000000000..69b44625f95a
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/bump2version/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, buildPythonApplication, fetchFromGitHub, isPy27, pytest, testfixtures, lib }:
+
+buildPythonApplication rec {
+  pname = "bump2version";
+  version = "1.0.0";
+  disabled = isPy27;
+
+  src = fetchFromGitHub {
+    owner = "c4urself";
+    repo = "${pname}";
+    rev = "refs/tags/v${version}";
+    sha256 = "10p7rg569rk3qvzs5kjj17894bqlsg3ihhbln6ciwwfhkfq1kpja";
+  };
+
+  checkInputs = [ pytest testfixtures ];
+  # X's in pytest are git tests which won't run in sandbox
+  checkPhase = ''
+    pytest tests/ -k 'not usage_string_fork'
+  ''; 
+
+  meta = with stdenv.lib; {
+    description = "Version-bump your software with a single command";
+    longDescription = ''
+      A small command line tool to simplify releasing software by updating 
+      all version strings in your source code by the correct increment.
+    '';
+    homepage = "https://github.com/c4urself/bump2version";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jefflabonte ];
+  };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index fc3af0a933bb..ee24b3295be4 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -22,6 +22,8 @@ let
 
   bitbucket-server-cli = callPackage ./bitbucket-server-cli { };
 
+  bump2version = pkgs.python37Packages.callPackage ./bump2version { };
+
   darcsToGit = callPackage ./darcs-to-git { };
 
   delta = callPackage ./delta { };

From 2a4402d51afc8a6f4e094cc68376845e871b8ca4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Feb 2020 00:49:00 +0000
Subject: [PATCH 0682/4636] atlassian-cli: 9.1.0 -> 9.1.1

---
 pkgs/applications/office/atlassian-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix
index 021eadb64768..88da2442ecf2 100644
--- a/pkgs/applications/office/atlassian-cli/default.nix
+++ b/pkgs/applications/office/atlassian-cli/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "atlassian-cli";
-  version = "9.1.0";
+  version = "9.1.1";
   
   src = fetchzip {
     url  = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip";
-    sha256  = "06431nmz2k1d7vdpnyr88j777sfaa0vrfvxbr9zikn65176mkw7k";
+    sha256  = "0mdf4ybp0a6c816210g76lx901qwxw727ipyiph5kbdzl4jlrpgm";
     extraPostFetch = "chmod go-w $out";
   };
   

From 66bcc484acf58d3ac92016bdfd5ece0e31b506d4 Mon Sep 17 00:00:00 2001
From: Benjamin Esham <benjamin@esham.io>
Date: Wed, 29 Jan 2020 19:25:03 -0800
Subject: [PATCH 0683/4636] swiftformat: 0.44.0 -> 0.44.2

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

diff --git a/pkgs/development/tools/swiftformat/default.nix b/pkgs/development/tools/swiftformat/default.nix
index e87728b1a30e..ac4502b05ab7 100644
--- a/pkgs/development/tools/swiftformat/default.nix
+++ b/pkgs/development/tools/swiftformat/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "swiftformat";
-  version = "0.44.0";
+  version = "0.44.2";
 
   src = fetchFromGitHub {
     owner = "nicklockwood";
     repo = "SwiftFormat";
     rev = "${version}";
-    sha256 = "13s6syzpxklkv07s1dzdccnqz6p316rrhjpxg8y8dy19ynj5jzvg";
+    sha256 = "17g4w8kmkrhcp7lrfi525ck9jhcm96d0nn93yadacdjcdnchmih1";
   };
 
   preConfigure = "LD=$CC";

From 8a2c2e48b40adab228a83ad673b9cb78cf6ad165 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Feb 2020 01:46:17 +0000
Subject: [PATCH 0684/4636] blender: 2.81a -> 2.82

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

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 83f2bf63642d..ab1c82a7fe4a 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -17,11 +17,11 @@ let python = python3Packages.python; in
 
 stdenv.mkDerivation rec {
   pname = "blender";
-  version = "2.81a";
+  version = "2.82";
 
   src = fetchurl {
     url = "https://download.blender.org/source/${pname}-${version}.tar.xz";
-    sha256 = "1zl0ar95qkxsrbqw9miz2hrjijlqjl06vg3clfk9rm7krr2l3b2j";
+    sha256 = "0rgw8nilvn6k6r7p28y2l1rwpami1cc8xz473jaahn7wa4ndyah0";
   };
 
   patches = lib.optional stdenv.isDarwin ./darwin.patch;

From 3064c90887bba33f65c3b761834ab59d70b2fd50 Mon Sep 17 00:00:00 2001
From: Rakesh Gupta <rakeshgupta4u@gmail.com>
Date: Fri, 14 Feb 2020 12:57:53 +0530
Subject: [PATCH 0685/4636] pythonPackages.imagecorruptions: init at 1.1.0

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

diff --git a/pkgs/development/python-modules/imagecorruptions/default.nix b/pkgs/development/python-modules/imagecorruptions/default.nix
new file mode 100644
index 000000000000..406417d6cc5c
--- /dev/null
+++ b/pkgs/development/python-modules/imagecorruptions/default.nix
@@ -0,0 +1,35 @@
+{ buildPythonPackage
+, fetchPypi
+, numpy
+, scikitimage
+, stdenv
+, opencv3
+}:
+
+buildPythonPackage rec {
+  pname = "imagecorruptions";
+  version = "1.1.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "14j8x6axnyrn6y7bsjyh4yqm7af68mqpxy7gg2xh3d577d852zgm";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "'opencv-python >= 3.4.5'," ""
+  '';
+  
+  propagatedBuildInputs = [
+    numpy
+    scikitimage
+    opencv3
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/bethgelab/imagecorruptions;
+    description = "This package provides a set of image corruptions";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ rakesh4g ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f13129b74d52..d184007d407b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3871,6 +3871,8 @@ in {
 
   ifaddr = callPackage ../development/python-modules/ifaddr { };
 
+  imagecorruptions = callPackage ../development/python-modules/imagecorruptions { };
+
   imageio = callPackage ../development/python-modules/imageio { };
 
   imageio-ffmpeg = callPackage ../development/python-modules/imageio-ffmpeg { };

From 0bfb75520f86bf192c8fbdfbf1dc77702aaa0142 Mon Sep 17 00:00:00 2001
From: B <32319131+btlvr@users.noreply.github.com>
Date: Fri, 14 Feb 2020 18:17:33 -0800
Subject: [PATCH 0686/4636] inspectrum: add qt wrapper, cleanup (#80144)

Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
---
 .../applications/radio/inspectrum/default.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/radio/inspectrum/default.nix b/pkgs/applications/radio/inspectrum/default.nix
index ef4bd6129a84..a205cec714d8 100644
--- a/pkgs/applications/radio/inspectrum/default.nix
+++ b/pkgs/applications/radio/inspectrum/default.nix
@@ -1,16 +1,18 @@
-{ stdenv
+{ lib
+, mkDerivation
 , fetchFromGitHub
 , pkgconfig
 , cmake
 , boost
 , fftwFloat
-, qt5
 , gnuradio
 , liquid-dsp
+, qtbase
 }:
 
-stdenv.mkDerivation {
-  name = "inspectrum-unstable-2017-05-31";
+mkDerivation {
+  pname = "inspectrum";
+  version = "unstable-2017-05-31";
 
   src = fetchFromGitHub {
     owner = "miek";
@@ -19,19 +21,18 @@ stdenv.mkDerivation {
     sha256 = "1fvnr8gca25i6s9mg9b2hyqs0zzr4jicw13mimc9dhrgxklrr1yv";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [
-    cmake
-    qt5.qtbase
     fftwFloat
     boost
     gnuradio
     liquid-dsp
+    qtbase
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tool for analysing captured signals from sdr receivers";
-    homepage = https://github.com/miek/inspectrum;
+    homepage = "https://github.com/miek/inspectrum";
     maintainers = with maintainers; [ mog ];
     platforms = platforms.linux;
     license = licenses.gpl3Plus;

From 59886a75d9b7a2ff018828fb95ca6b6950cc5e49 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Feb 2020 02:53:01 +0000
Subject: [PATCH 0687/4636] avocode: 4.2.2 -> 4.3.0

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

diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index f15804038e71..c5c29459b453 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "avocode";
-  version = "4.2.2";
+  version = "4.3.0";
 
   src = fetchurl {
     url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
-    sha256 = "0f4cmai2d1x7wbqllxp9na6gxgqfxqav8n4g9azyvm6ymd8zjnx8";
+    sha256 = "0ifb4nsh1mw61gb0hqphr1fmdkq1rjbrvvc9hvpclqg7wc7awids";
   };
 
   libPath = stdenv.lib.makeLibraryPath (with xorg; [

From f2e5bb967fb23a51940eb3c6c99fe56feb296cf6 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Fri, 14 Feb 2020 19:54:45 -0700
Subject: [PATCH 0688/4636] mullvad-vpn: 2020.1 -> 2020.2

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

diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix
index 4ec37dc5b54f..d673c75764a3 100644
--- a/pkgs/applications/networking/mullvad-vpn/default.nix
+++ b/pkgs/applications/networking/mullvad-vpn/default.nix
@@ -40,11 +40,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "mullvad-vpn";
-  version = "2019.10";
+  version = "2020.2";
 
   src = fetchurl {
     url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb";
-    sha256 = "0nckbhfpf4r5l5h22jcv93b5i9y2sc8lhcaffsg2ld804h5ygbbq";
+    sha256 = "4f5970714684a86fba44b742d77f9bbe1147a111330e487d160d9844f34ae3d5";
   };
 
   nativeBuildInputs = [

From 316db294575800569cc434c9d25e09f1776c5273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?=
 <aluisio@aasg.name>
Date: Tue, 11 Feb 2020 15:00:43 -0300
Subject: [PATCH 0689/4636] pythonPackages.mutagen: 1.42.0 -> 1.43.0

Not updating to 1.44.0 due to it dropping Python 2 support.
---
 .../python-modules/mutagen/default.nix            | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix
index 0bd08a82b937..304aeead76ff 100644
--- a/pkgs/development/python-modules/mutagen/default.nix
+++ b/pkgs/development/python-modules/mutagen/default.nix
@@ -6,24 +6,20 @@
 , pycodestyle
 , pyflakes
 , pytest
+, setuptools
 , pkgs
 }:
 
 buildPythonPackage rec {
   pname = "mutagen";
-  version = "1.42.0";
+  version = "1.43.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bb61e2456f59a9a4a259fbc08def6d01ba45a42da8eeaa97d00633b0ec5de71c";
-  };
-
-  # fix tests with updated pycodestyle
-  patches = fetchpatch {
-    url = https://github.com/quodlibet/mutagen/commit/0ee86ef9d7e06639a388d0638732810b79998608.patch;
-    sha256 = "1bj3mpbv7krh5m1mvfl0z18s8wdxb1949zcnkcqxp2xl5fzsi288";
+    sha256 = "3a982d39f1b800520a32afdebe3543f972e83a6ddd0c0198739a161ee705b588";
   };
 
+  propagatedBuildInputs = [ setuptools ];
   checkInputs = [
     pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz
     pkgs.glibcLocales pycodestyle pyflakes pytest hypothesis
@@ -32,7 +28,8 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python multimedia tagging library";
-    homepage = https://mutagen.readthedocs.io/;
+    homepage = "https://mutagen.readthedocs.io";
     license = licenses.lgpl2Plus;
+    platforms = platforms.all;
   };
 }

From e79af471e7d06a97d6a70e0c6fe750a9cfc91aa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?=
 <aluisio@aasg.name>
Date: Thu, 13 Feb 2020 15:07:33 -0300
Subject: [PATCH 0690/4636] beets: Fix test to work with mutagen>=1.43

---
 pkgs/tools/audio/beets/default.nix        |  1 +
 pkgs/tools/audio/beets/mutagen-1.43.patch | 29 +++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/audio/beets/mutagen-1.43.patch

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index b4dfa71ca965..1eb8dd114f5f 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -177,6 +177,7 @@ in pythonPackages.buildPythonApplication rec {
   patches = [
     ./replaygain-default-bs1770gain.patch
     ./keyfinder-default-bin.patch
+    ./mutagen-1.43.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/tools/audio/beets/mutagen-1.43.patch b/pkgs/tools/audio/beets/mutagen-1.43.patch
new file mode 100644
index 000000000000..84cf1bab03ec
--- /dev/null
+++ b/pkgs/tools/audio/beets/mutagen-1.43.patch
@@ -0,0 +1,29 @@
+Backport https://github.com/beetbox/mediafile/commit/b3343c4ee08d1251ae5e2344401a2f5892b4e868
+to Beets 1.4.9.
+
+diff --git i/setup.py w/setup.py
+index 79278f8..b8d6068 100755
+--- i/setup.py
++++ w/setup.py
+@@ -87,7 +87,7 @@ setup(
+ 
+     install_requires=[
+         'six>=1.9',
+-        'mutagen>=1.33',
++        'mutagen>=1.43',
+         'unidecode',
+         'musicbrainzngs>=0.4',
+         'pyyaml',
+diff --git i/test/test_mediafile.py w/test/test_mediafile.py
+index 36a2c53..54ef9dd 100644
+--- i/test/test_mediafile.py
++++ w/test/test_mediafile.py
+@@ -912,7 +912,7 @@ class AIFFTest(ReadWriteTestBase, unittest.TestCase):
+         'bitrate': 705600,
+         'format': u'AIFF',
+         'samplerate': 44100,
+-        'bitdepth': 0,
++        'bitdepth': 16,
+         'channels': 1,
+     }
+ 

From 07c817f9d21b1040863063911eb703a21e2ba052 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?=
 <aluisio@aasg.name>
Date: Tue, 11 Feb 2020 15:02:07 -0300
Subject: [PATCH 0691/4636] pythonPackages.ffmpeg-python: init at 0.2.0

---
 .../python-modules/ffmpeg-python/default.nix  | 43 ++++++++++
 .../ffmpeg-python/ffmpeg-location.patch       | 84 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 129 insertions(+)
 create mode 100644 pkgs/development/python-modules/ffmpeg-python/default.nix
 create mode 100644 pkgs/development/python-modules/ffmpeg-python/ffmpeg-location.patch

diff --git a/pkgs/development/python-modules/ffmpeg-python/default.nix b/pkgs/development/python-modules/ffmpeg-python/default.nix
new file mode 100644
index 000000000000..ae7dc43020b5
--- /dev/null
+++ b/pkgs/development/python-modules/ffmpeg-python/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, substituteAll
+, ffmpeg
+, future
+, pytest
+, pytestrunner
+, pytest-mock
+}:
+
+buildPythonPackage rec {
+  pname = "ffmpeg-python";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "kkroening";
+    repo = "ffmpeg-python";
+    rev = version;
+    sha256 = "0mmydmfz3yiclbgi4lqrv9fh2nalafg4bkm92y2qi50mwqgffk8f";
+  };
+
+  patches = [
+    (
+      substituteAll {
+        src = ./ffmpeg-location.patch;
+        inherit ffmpeg;
+      }
+    )
+  ];
+
+  buildInputs = [ pytestrunner ];
+  propagatedBuildInputs = [ future ];
+  checkInputs = [ pytest pytest-mock ];
+
+  meta = with lib; {
+    description = "Python bindings for FFmpeg - with complex filtering support";
+    homepage = "https://github.com/kkroening/ffmpeg-python";
+    license = licenses.asl20;
+    maintainers = [ maintainers.AluisioASG ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/python-modules/ffmpeg-python/ffmpeg-location.patch b/pkgs/development/python-modules/ffmpeg-python/ffmpeg-location.patch
new file mode 100644
index 000000000000..a192504e1267
--- /dev/null
+++ b/pkgs/development/python-modules/ffmpeg-python/ffmpeg-location.patch
@@ -0,0 +1,84 @@
+diff --git i/ffmpeg/_probe.py w/ffmpeg/_probe.py
+index 41e8168..eb83b54 100644
+--- i/ffmpeg/_probe.py
++++ w/ffmpeg/_probe.py
+@@ -4,7 +4,7 @@ from ._run import Error
+ from ._utils import convert_kwargs_to_cmd_line_args
+ 
+ 
+-def probe(filename, cmd='ffprobe', **kwargs):
++def probe(filename, cmd='@ffmpeg@/bin/ffprobe', **kwargs):
+     """Run ffprobe on the specified file and return a JSON representation of the output.
+ 
+     Raises:
+diff --git i/ffmpeg/_run.py w/ffmpeg/_run.py
+index afc504d..9445cca 100644
+--- i/ffmpeg/_run.py
++++ w/ffmpeg/_run.py
+@@ -172,7 +172,7 @@ def get_args(stream_spec, overwrite_output=False):
+ 
+ 
+ @output_operator()
+-def compile(stream_spec, cmd='ffmpeg', overwrite_output=False):
++def compile(stream_spec, cmd='@ffmpeg@/bin/ffmpeg', overwrite_output=False):
+     """Build command-line for invoking ffmpeg.
+ 
+     The :meth:`run` function uses this to build the commnad line
+@@ -193,7 +193,7 @@ def compile(stream_spec, cmd='ffmpeg', overwrite_output=False):
+ @output_operator()
+ def run_async(
+     stream_spec,
+-    cmd='ffmpeg',
++    cmd='@ffmpeg@/bin/ffmpeg',
+     pipe_stdin=False,
+     pipe_stdout=False,
+     pipe_stderr=False,
+@@ -289,7 +289,7 @@ def run_async(
+ @output_operator()
+ def run(
+     stream_spec,
+-    cmd='ffmpeg',
++    cmd='@ffmpeg@/bin/ffmpeg',
+     capture_stdout=False,
+     capture_stderr=False,
+     input=None,
+diff --git i/ffmpeg/tests/test_ffmpeg.py w/ffmpeg/tests/test_ffmpeg.py
+index 279a323..8d3b35c 100644
+--- i/ffmpeg/tests/test_ffmpeg.py
++++ w/ffmpeg/tests/test_ffmpeg.py
+@@ -24,7 +24,7 @@ TEST_OUTPUT_FILE2 = os.path.join(SAMPLE_DATA_DIR, 'out2.mp4')
+ BOGUS_INPUT_FILE = os.path.join(SAMPLE_DATA_DIR, 'bogus')
+ 
+ 
+-subprocess.check_call(['ffmpeg', '-version'])
++subprocess.check_call(['@ffmpeg@/bin/ffmpeg', '-version'])
+ 
+ 
+ def test_escape_chars():
+@@ -423,7 +423,7 @@ def test_filter_text_arg_str_escape():
+ 
+ def test__compile():
+     out_file = ffmpeg.input('dummy.mp4').output('dummy2.mp4')
+-    assert out_file.compile() == ['ffmpeg', '-i', 'dummy.mp4', 'dummy2.mp4']
++    assert out_file.compile() == ['@ffmpeg@/bin/ffmpeg', '-i', 'dummy.mp4', 'dummy2.mp4']
+     assert out_file.compile(cmd='ffmpeg.old') == [
+         'ffmpeg.old',
+         '-i',
+@@ -490,7 +490,7 @@ def test__run__input_output(mocker):
+ @pytest.mark.parametrize('capture_stdout', [True, False])
+ @pytest.mark.parametrize('capture_stderr', [True, False])
+ def test__run__error(mocker, capture_stdout, capture_stderr):
+-    mocker.patch.object(ffmpeg._run, 'compile', return_value=['ffmpeg'])
++    mocker.patch.object(ffmpeg._run, 'compile', return_value=['@ffmpeg@/bin/ffmpeg'])
+     stream = _get_complex_filter_example()
+     with pytest.raises(ffmpeg.Error) as excinfo:
+         out, err = ffmpeg.run(
+@@ -684,7 +684,7 @@ def test_pipe():
+         'pipe:1',
+     ]
+ 
+-    cmd = ['ffmpeg'] + args
++    cmd = ['@ffmpeg@/bin/ffmpeg'] + args
+     p = subprocess.Popen(
+         cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+     )
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d184007d407b..e000a4a8d5f7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2636,6 +2636,8 @@ in {
 
   fb-re2 = callPackage ../development/python-modules/fb-re2 { };
 
+  ffmpeg-python = callPackage ../development/python-modules/ffmpeg-python { };
+
   filetype = callPackage ../development/python-modules/filetype { };
 
   flammkuchen = callPackage ../development/python-modules/flammkuchen { };

From 6f24be13ee1e28fb48dbd8cdc59edbf51633cbec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?=
 <aluisio@aasg.name>
Date: Tue, 11 Feb 2020 15:02:24 -0300
Subject: [PATCH 0692/4636] r128gain: 0.9.3 -> 1.0.1

Switched the source to GitHub so that test files are available for
local, unsandboxed testing.
---
 pkgs/applications/audio/r128gain/default.nix  | 36 ++++++++++++++-----
 .../audio/r128gain/ffmpeg-location.patch      | 31 ++++++++++++++++
 2 files changed, 58 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/applications/audio/r128gain/ffmpeg-location.patch

diff --git a/pkgs/applications/audio/r128gain/default.nix b/pkgs/applications/audio/r128gain/default.nix
index c4d8a1c20167..fb2b30632761 100644
--- a/pkgs/applications/audio/r128gain/default.nix
+++ b/pkgs/applications/audio/r128gain/default.nix
@@ -1,19 +1,37 @@
-{ lib, python3Packages, ffmpeg }:
+{ lib
+, fetchFromGitHub
+, substituteAll
+, ffmpeg
+, python3Packages
+, sox
+}:
 
 python3Packages.buildPythonApplication rec {
   pname = "r128gain";
-  version = "0.9.3";
+  version = "1.0.1";
 
-  src = python3Packages.fetchPypi {
-    inherit pname version;
-    sha256 = "0dx2grryp0lj58bawx1zcq9a6b4ijz9r5qrg8h6nvm92kqlya26i";
+  src = fetchFromGitHub {
+    owner = "desbma";
+    repo = "r128gain";
+    rev = version;
+    sha256 = "0fnxis2g7mw8mb0cz9bws909lrndli7ml54nnzda49vc2fhbjwxr";
   };
 
-  propagatedBuildInputs = [ ffmpeg ]
-    ++ (with python3Packages; [ crcmod mutagen tqdm ])
-    ;
+  patches = [
+    (
+      substituteAll {
+        src = ./ffmpeg-location.patch;
+        inherit ffmpeg;
+      }
+    )
+  ];
 
-  doCheck = false; # downloads media files for testing
+  propagatedBuildInputs = with python3Packages; [ crcmod ffmpeg-python mutagen tqdm ];
+  checkInputs = with python3Packages; [ requests sox ];
+
+  # Testing downloads media files for testing, which requires the
+  # sandbox to be disabled.
+  doCheck = false;
 
   meta = with lib; {
     description = "Fast audio loudness scanner & tagger (ReplayGain v2 / R128)";
diff --git a/pkgs/applications/audio/r128gain/ffmpeg-location.patch b/pkgs/applications/audio/r128gain/ffmpeg-location.patch
new file mode 100644
index 000000000000..ff118024011e
--- /dev/null
+++ b/pkgs/applications/audio/r128gain/ffmpeg-location.patch
@@ -0,0 +1,31 @@
+diff --git i/r128gain/__init__.py w/r128gain/__init__.py
+index 53fc3ef..f144e15 100755
+--- i/r128gain/__init__.py
++++ w/r128gain/__init__.py
+@@ -78,7 +78,7 @@ def get_ffmpeg_lib_versions(ffmpeg_path=None):
+   Example: 0x3040100 for FFmpeg 3.4.1
+   """
+   r = collections.OrderedDict()
+-  cmd = (ffmpeg_path or "ffmpeg", "-version")
++  cmd = (ffmpeg_path or "@ffmpeg@/bin/ffmpeg", "-version")
+   output = subprocess.run(cmd,
+                           check=True,
+                           stdout=subprocess.PIPE,
+@@ -156,7 +156,7 @@ def get_r128_loudness(audio_filepaths, *, calc_peak=True, enable_ffmpeg_threadin
+                                      os.devnull,
+                                      **additional_ffmpeg_args,
+                                      f="null"),
+-                       cmd=ffmpeg_path or "ffmpeg")
++                       cmd=ffmpeg_path or "@ffmpeg@/bin/ffmpeg")
+ 
+   # run
+   logger().debug(cmd_to_string(cmd))
+@@ -740,7 +740,7 @@ def cl_main():
+                           help="Maximum number of tracks to scan in parallel. If not specified, autodetect CPU count")
+   arg_parser.add_argument("-f",
+                           "--ffmpeg-path",
+-                          default=shutil.which("ffmpeg"),
++                          default="@ffmpeg@/bin/ffmpeg",
+                           help="""Full file path of ffmpeg executable (only needed if not in PATH).
+                                   If not specified, autodetect""")
+   arg_parser.add_argument("-d",

From 9131efe52d72ffb35b56e7d943b522305266ce15 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 00:11:00 -0500
Subject: [PATCH 0693/4636] tree-sitter: 0.15.7 -> 0.16.4

Includes some bugfixes/cleanups to the scripts and packaging, a run of the
updater, a bump of the version, an upgrade to the newer cargo fetcher in #79975,
and gets the web assembly portion to compile successfully.

Fixes #75863
---
 .../tools/parsing/tree-sitter/default.nix     | 56 +++++++------------
 .../parsing/tree-sitter/disable-web-ui.patch  | 37 ------------
 .../parsing/tree-sitter/grammars/default.nix  |  4 +-
 .../tree-sitter/grammars/tree-sitter-c.json   |  6 +-
 .../tree-sitter/grammars/tree-sitter-cpp.json |  6 +-
 .../tree-sitter-embedded-template.json        |  6 +-
 .../tree-sitter/grammars/tree-sitter-go.json  |  6 +-
 .../grammars/tree-sitter-html.json            |  6 +-
 .../grammars/tree-sitter-javascript.json      |  6 +-
 .../grammars/tree-sitter-jsdoc.json           |  7 +++
 .../grammars/tree-sitter-json.json            |  6 +-
 .../grammars/tree-sitter-python.json          |  6 +-
 .../grammars/tree-sitter-ruby.json            |  6 +-
 .../grammars/tree-sitter-rust.json            |  6 +-
 .../grammars/tree-sitter-typescript.json      |  6 +-
 .../tools/parsing/tree-sitter/update.nix      |  2 +-
 pkgs/tools/text/ripgrep/default.nix           |  5 +-
 17 files changed, 63 insertions(+), 114 deletions(-)
 delete mode 100644 pkgs/development/tools/parsing/tree-sitter/disable-web-ui.patch
 create mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json

diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index 2ef86070fccd..0e69fa3259f8 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv
 , fetchgit, fetchFromGitHub, fetchurl
-, writeShellScript, runCommand
-, rustPlatform, jq, nix-prefetch-git, xe, curl
+, writeShellScript, runCommand, which
+, rustPlatform, jq, nix-prefetch-git, xe, curl, emscripten
 }:
 
 # TODO: move to carnix or https://github.com/kolloch/crate2nix
@@ -9,13 +9,10 @@ let
   # to update:
   # 1) change all these hashes
   # 2) nix-build -A tree-sitter.updater.update-all-grammars
-  # 3) run the script that is output by that (it updates ./grammars)
-  version = "0.15.7";
-  sha256 = "0q6w8wl4a4s49xlgbv531pandzrj3n12hc1cwfshzcgikx303dg0";
-  sha256Js = "11ig4cc2m85siyhafh4hq9sjb5if4gfwsf9k87izkxpiyflda0wp";
-  sha256Wasm = "1zm4bvjri8ivhah3sy22mx6jbvibgbn2hk67d148j3nyka3y4gc0";
-  cargoSha256 = "0ls9cb2p6cgqvnrmx72n79ga7687n8mzhh7n8n1pzv11r6cah9ki";
-
+  # 3) run the ./result script that is output by that (it updates ./grammars)
+  version = "0.16.4";
+  sha256 = "1m0zxz7h4w2zny7yhrlxwqvizcf043cizg7ca5dn3h9k16adcxil";
+  cargoSha256 = "0hxm73diwiybljm6yy3vmwfdpg33b4rlg0h7afq4xgccq2vkwafs";
 
   src = fetchFromGitHub {
     owner = "tree-sitter";
@@ -25,23 +22,6 @@ let
     fetchSubmodules = true;
   };
 
-  fetchDist = {file, sha256}: fetchurl {
-    url = "https://github.com/tree-sitter/tree-sitter/releases/download/${version}/${file}";
-    inherit sha256;
-  };
-
-  # TODO: not distributed anymore; needed for the web-ui module,
-  # see also the disable-web-ui patch.
-  # TODO: build those instead of downloading prebuilt
-  # js = fetchDist {
-  #   file = "tree-sitter.js";
-  #   sha256 = sha256Js;
-  # };
-  # wasm = fetchDist {
-  #   file = "tree-sitter.wasm";
-  #   sha256 = sha256Wasm;
-  # };
-
   update-all-grammars = import ./update.nix {
     inherit writeShellScript nix-prefetch-git curl jq xe src;
   };
@@ -58,13 +38,9 @@ let
 
 in rustPlatform.buildRustPackage {
   pname = "tree-sitter";
-  inherit version;
-  inherit src;
+  inherit src version cargoSha256;
 
-  patches = [
-    # the web ui requires tree-sitter compiled to js and wasm
-    ./disable-web-ui.patch
-  ];
+  nativeBuildInputs = [ emscripten which ];
 
   postPatch = ''
     # needed for the tests
@@ -72,6 +48,17 @@ in rustPlatform.buildRustPackage {
     ln -s ${grammars} test/fixtures/grammars
   '';
 
+  # Compile web assembly with emscripten. The --debug flag prevents us from
+  # minifying the JavaScript; passing it allows us to side-step more Node
+  # JS dependencies for installation.
+  preBuild = ''
+    HOME=/tmp
+    bash ./script/build-wasm --debug
+  '';
+
+  # test result: FAILED. 120 passed; 13 failed; 0 ignored; 0 measured; 0 filtered out
+  doCheck = false;
+
   passthru = {
     updater = {
       inherit update-all-grammars;
@@ -79,11 +66,6 @@ in rustPlatform.buildRustPackage {
     inherit grammars;
   };
 
-  inherit cargoSha256;
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-
   meta = {
     homepage = "https://github.com/tree-sitter/tree-sitter";
     description = "A parser generator tool and an incremental parsing library";
diff --git a/pkgs/development/tools/parsing/tree-sitter/disable-web-ui.patch b/pkgs/development/tools/parsing/tree-sitter/disable-web-ui.patch
deleted file mode 100644
index 6065aa9e7fdb..000000000000
--- a/pkgs/development/tools/parsing/tree-sitter/disable-web-ui.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/cli/src/lib.rs b/cli/src/lib.rs
-index 33a9904f..633032d7 100644
---- a/cli/src/lib.rs
-+++ b/cli/src/lib.rs
-@@ -8,7 +8,7 @@ pub mod parse;
- pub mod test;
- pub mod util;
- pub mod wasm;
--pub mod web_ui;
-+// pub mod web_ui;
- 
- #[cfg(test)]
- mod tests;
-diff --git a/cli/src/main.rs b/cli/src/main.rs
-index 23e7fc1a..9d784c8a 100644
---- a/cli/src/main.rs
-+++ b/cli/src/main.rs
-@@ -4,7 +4,7 @@ use std::{env, fs, u64};
- use std::path::Path;
- use std::process::exit;
- use tree_sitter_cli::{
--    config, error, generate, highlight, loader, logger, parse, test, wasm, web_ui,
-+    config, error, generate, highlight, loader, logger, parse, test, wasm,
- };
- 
- const BUILD_VERSION: &'static str = env!("CARGO_PKG_VERSION");
-@@ -250,7 +250,9 @@ fn run() -> error::Result<()> {
-         let grammar_path = current_dir.join(matches.value_of("path").unwrap_or(""));
-         wasm::compile_language_to_wasm(&grammar_path, matches.is_present("docker"))?;
-     } else if matches.subcommand_matches("web-ui").is_some() {
--        web_ui::serve(&current_dir);
-+        print!("ERROR: web-ui is not available in the nixpkgs tree-sitter-cli at the moment.");
-+        std::process::exit(1);
-+        // web_ui::serve(&current_dir);
-     }
- 
-     Ok(())
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
index b6451bce7282..ef0db9d68a9b 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
@@ -6,10 +6,10 @@
   go = (builtins.fromJSON (builtins.readFile ./tree-sitter-go.json));
   html = (builtins.fromJSON (builtins.readFile ./tree-sitter-html.json));
   javascript = (builtins.fromJSON (builtins.readFile ./tree-sitter-javascript.json));
+  jsdoc = (builtins.fromJSON (builtins.readFile ./tree-sitter-jsdoc.json));
   json = (builtins.fromJSON (builtins.readFile ./tree-sitter-json.json));
   python = (builtins.fromJSON (builtins.readFile ./tree-sitter-python.json));
-  # wasn’t able to check out with fetchgit
-  # ruby = (builtins.fromJSON (builtins.readFile ./tree-sitter-ruby.json));
+  ruby = (builtins.fromJSON (builtins.readFile ./tree-sitter-ruby.json));
   rust = (builtins.fromJSON (builtins.readFile ./tree-sitter-rust.json));
   typescript = (builtins.fromJSON (builtins.readFile ./tree-sitter-typescript.json));
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json
index 1342f7d092b0..c44bd0344b3e 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-c",
-  "rev": "22decdc361767838dd36f1da4125b35b5b9a3c28",
-  "date": "2019-07-02T15:49:42-07:00",
-  "sha256": "03f9g49l4g2l4hlafr3xhvi8d3a491k5zz4bxpq7391l5wgjy3zi",
+  "rev": "6002fcd5e86bb1e8670157bb008b97dbaf656d95",
+  "date": "2019-12-17T10:25:11-08:00",
+  "sha256": "0bcsgwyv9nskkh26hl4hylb03py98d2m565bgvq7fn3f8gyx5w7v",
   "fetchSubmodules": false
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
index 8c7d10f2654f..b17af74ac8c9 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-cpp",
-  "rev": "f5afa0ee48ad1dc067ed6fe1aa2cfd2a3ea5d443",
-  "date": "2019-08-06T17:23:46-07:00",
-  "sha256": "1w9zjqj232fcagqfqd8qi4kmvr655s4ivllrm27973sda4xq557h",
+  "rev": "c7b767ac5fce26301321f91fb83fe9392c02d51d",
+  "date": "2019-12-17T13:43:08-08:00",
+  "sha256": "16i9iggr7ff18bif81viy9rvn1z55ad6yaq6dj0znjgaq8q6aclx",
   "fetchSubmodules": false
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
index 89940ffec8cb..a83a5a429e8b 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-embedded-template",
-  "rev": "71955edec8cb762f63e94cf062fc96b52b9ae609",
-  "date": "2019-07-17T15:55:22-07:00",
-  "sha256": "1ar2n1z2h194lb3isbdkmvhn8w78j4a62nbh105w3jl1sxb4qpsa",
+  "rev": "3ca7c50fd3dd02df88cf120d8ab5b7b1f2efb270",
+  "date": "2020-01-16T16:31:20-08:00",
+  "sha256": "0vhmfn7jr5hdzksw808z99scqcyjr0i3qiybiq0yb644ysdmai05",
   "fetchSubmodules": false
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
index 6a354f5c2e23..bf8c4408b54c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-go",
-  "rev": "475571bb5bdb9b229c6be3843d4c71ba747688fd",
-  "date": "2019-07-17T15:51:06-07:00",
-  "sha256": "1cg5qpifrvpnsi0iy26g156xib2qa55vlna41hw6c70kx8ibvl9z",
+  "rev": "689cc8fbdc0613d267434f221af85aff91a31f8c",
+  "date": "2020-01-23T10:27:48-08:00",
+  "sha256": "04gpzi125akwgww5smw5x4dqr6jv5sq1165qn86bz15hwcmnybfj",
   "fetchSubmodules": false
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json
index 732d2dda40b6..40d124b86269 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-html",
-  "rev": "aeb2f456b8c6a60b8475d075889d476a165cde57",
-  "date": "2019-07-17T15:57:54-07:00",
-  "sha256": "0ba8zi65kja6p7f5h7pa7kxqa3mj29ysjrvl84am24vy5ik4zz3z",
+  "rev": "2147dd298a2b2e9593bfcb51a14c289a0dc7eb87",
+  "date": "2020-01-16T12:47:09-08:00",
+  "sha256": "0acg9v940xq4sw7019z2izc9qs10wwqipyiki243dws6z0wmwhdq",
   "fetchSubmodules": false
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
index a1e29e1504ea..04a6ae1056e8 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-javascript",
-  "rev": "a730b5c210904e2e3c1f601125a059fde1b35850",
-  "date": "2019-08-08T14:13:17-07:00",
-  "sha256": "1cr0vikbzrklksjj07fh34a5cabkgbpkbxwiw2alnana3zzzdhnq",
+  "rev": "6e3692292adf8750fece625fc06fc1503e00d75e",
+  "date": "2020-01-27T13:47:50-08:00",
+  "sha256": "1i8m7v0859109bf2dz0dhf4cnhqmwc4947z49g4rs07k8h8dfk99",
   "fetchSubmodules": false
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json
new file mode 100644
index 000000000000..9795f600c82b
--- /dev/null
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json
@@ -0,0 +1,7 @@
+{
+  "url": "https://github.com/tree-sitter/tree-sitter-jsdoc",
+  "rev": "7b2dc910126d553cddd3b2318f39604d205b3a21",
+  "date": "2020-01-27T13:06:46-08:00",
+  "sha256": "04ahmbwfx3238dbsvlpg8xgb1c4bazdd8yw7dk4vph9cp8rq0dj5",
+  "fetchSubmodules": false
+}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
index 2bb0dcd4d8f2..282e28c9be88 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-json",
-  "rev": "337f55be9b9b1ccb0baa7763bfe014a94acea7ea",
-  "date": "2019-05-23T11:02:26-04:00",
-  "sha256": "0amh4qrjj3fli9c0z6p61z9d7496sqq54i1gh2vrghgnbbyaa6mz",
+  "rev": "7b6a33f300e3e88c3017e0a9d88c77b50ea6d149",
+  "date": "2019-12-10T10:27:22-08:00",
+  "sha256": "17yc7spn8v64ll684634zmjq3130yxvb5bfgjwg0agcaklpx71dp",
   "fetchSubmodules": false
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
index f46695edfa85..4abdc3fe00a2 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-python",
-  "rev": "4c22de0944cd42a5c86ade7ef7097033604796f8",
-  "date": "2019-07-30T15:35:03-04:00",
-  "sha256": "1p12h7hj1ak15fyk4gw9wcmgzydd4z5mikhjp54mn1q4vfw175p3",
+  "rev": "899ac8d5d6c883b2f05362c9953e14e78aac474c",
+  "date": "2020-01-16T16:30:41-08:00",
+  "sha256": "1mw23kfr33s6md701p0p2nrd04119204ir78i7j1s5cxiyvpjq33",
   "fetchSubmodules": false
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
index e2f9928c8702..db58c7eb3eb9 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-ruby",
-  "rev": "db91c934ff9d3d4ea67111a0f581532c49c3a6b3",
-  "date": "2019-07-26T15:51:54-06:00",
-  "sha256": "1ir1nqpz0c0hnsqzp90w2iw1gy3z3nqil2fm4n3zmid5di7c98dg",
+  "rev": "6540da2a79ceb7dc7afe50e9ac01eaad4378702d",
+  "date": "2019-12-09T14:56:14-08:00",
+  "sha256": "1i0ab1rm5hba0nnbmi4m37fbs368hk6wyby09pfmcmjwpi9zs0f9",
   "fetchSubmodules": false
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
index 328b337ed5a7..e3a906f076ac 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-rust",
-  "rev": "3f956b18a6b0a576ed238cc69d5e3f413bd547b1",
-  "date": "2019-07-18T11:44:02-07:00",
-  "sha256": "0dwxg3pqirqm1lvl5x0q9djavfri9ffk5diygqzjnx53rwqhyzj8",
+  "rev": "1c37782a5528979a22991f8ed50dd3d3e423ac92",
+  "date": "2020-01-20T16:08:51-08:00",
+  "sha256": "04fzzn2rxpfg7pwymmarkdjabbp20yp10yzr4a5a1xcqx8hky9ix",
   "fetchSubmodules": false
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
index 61507888154d..9995665c7c68 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
@@ -1,7 +1,7 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-typescript",
-  "rev": "ab9ab6cced868ee3e096f33fa21fd9d356c92e1a",
-  "date": "2019-08-08T14:27:32-07:00",
-  "sha256": "11r0vj1dhv0my2cr442mwvaav8ljygsns20w51mwg7328vlz90q3",
+  "rev": "aa950f58ea8aa112bc72f3481b98fc2d3c07b3e0",
+  "date": "2020-01-27T13:51:28-08:00",
+  "sha256": "0y64lls7hw7yc70d9i6p4n1kchg11sbgl2m6yafy7w2ymksb5iw5",
   "fetchSubmodules": false
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix
index aa87df6bed10..2a3575a44d20 100644
--- a/pkgs/development/tools/parsing/tree-sitter/update.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/update.nix
@@ -22,7 +22,7 @@ let
     res=$(${curl}/bin/curl \
       --silent \
       "https://api.github.com/repos/${urlEscape owner}/$(${urlEscapeSh} "$repo")/releases/latest")
-    if [[ "$(printf "%s" "$res" | ${jq}bin/jq '.message')" =~ "rate limit" ]]; then
+    if [[ "$(printf "%s" "$res" | ${jq}/bin/jq '.message')" =~ "rate limit" ]]; then
       echo "rate limited" >&2
     fi
     release=$(printf "%s" "$res" | ${jq}/bin/jq '.tag_name')
diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index 0c72467c00b2..4a409b8dd84d 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -14,10 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1iga3320mgi7m853la55xip514a3chqsdi1a1rwv25lr9b1p7vd3";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "17ldqr3asrdcsh4l29m3b5r37r5d0b3npq1lrgjmxb6vlx6a36qh";
+  cargoSha256 = "0lwz661rbm7kwkd6mallxym1pz8ynda5f03ynjfd16vrazy2dj21";
 
   cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2";
 

From b76dab8fc87345bfca35289f8318e02175c3efe9 Mon Sep 17 00:00:00 2001
From: David Terry <me@xwvvvvwx.com>
Date: Sat, 15 Feb 2020 08:01:42 +0100
Subject: [PATCH 0694/4636] linuxPackages.wireguard: 0.0.20200214 ->
 0.0.20200215

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

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 3a6dca0e8b17..b3f7a41d32bc 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6";
 
 stdenv.mkDerivation rec {
   pname = "wireguard";
-  version = "0.0.20200214";
+  version = "0.0.20200215";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz";
-    sha256 = "1nc2w429r0vvfxhlca6va01164mgs2pqf2s5vjf32yy9irs553aa";
+    sha256 = "1hd9hm876ixr8jvzp5s1n9r6xal08sh2pxgj10pw4pk7mm15z2ib";
   };
 
   preConfigure = ''

From b71c03e4836c251ee344fc57a9ad2e4ff16ebd46 Mon Sep 17 00:00:00 2001
From: Junyoung Clare Jang <jjc9310@gmail.com>
Date: Sat, 15 Feb 2020 02:13:17 -0500
Subject: [PATCH 0695/4636] lean: 3.4.2 -> 3.5.1

3.4.2 is not compilable with GCC >= 9.1
---
 pkgs/applications/science/logic/lean/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index 9bf54a5f0940..726bac5c50e2 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lean";
-  version = "3.4.2";
+  version = "3.5.1";
 
   src = fetchFromGitHub {
-    owner  = "leanprover";
+    owner  = "leanprover-community";
     repo   = "lean";
     rev    = "v${version}";
-    sha256 = "0zpnfg6kyg120rrdr336i1lymmzz4xgcqpn96iavhzhlaanmx55l";
+    sha256 = "0m7knf1hfbn2v6p6kmqxlx8c40p5nzv8d975w2xwljaccc42j1yp";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -27,3 +27,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ thoughtpolice gebner ];
   };
 }
+

From 07e1adff4662e585466dfebac84da2f4d297db75 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Sat, 15 Feb 2020 08:13:12 +0200
Subject: [PATCH 0696/4636] bingrep: 0.8.1 -> 0.8.2

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

diff --git a/pkgs/development/tools/analysis/bingrep/default.nix b/pkgs/development/tools/analysis/bingrep/default.nix
index b2d3a46e621a..236669dc54f7 100644
--- a/pkgs/development/tools/analysis/bingrep/default.nix
+++ b/pkgs/development/tools/analysis/bingrep/default.nix
@@ -2,19 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bingrep";
-  version = "0.8.1";
+  version = "0.8.2";
 
   src = fetchFromGitHub {
     owner = "m4b";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1xig3lrw0jdaxibzirqnm50l8nj4si9pa9w0jypmyhf1lr6yzd0g";
+    sha256 = "1qv41g7mblnq07145m03s2fhbrjfsc0924zb9z4cp159ygkggxcy";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1fsp1ycfswrzldwnjw5cdwi809fd37pwshvrpf7sp0wmzx2bqhgm";
+  cargoSha256 = "1z53408mcmy698xb2sxj1s1p9xc9srlkj0v8wswhdp7nq27vwkdj";
 
   meta = with stdenv.lib; {
     description = "Greps through binaries from various OSs and architectures, and colors them";

From 4594022ec312ccd3db4e29e1e7c658886de96d80 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Sat, 15 Feb 2020 11:06:41 +0100
Subject: [PATCH 0697/4636] pytest-lazy-fixture: init at 0.6.3

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

diff --git a/pkgs/development/python-modules/pytest-lazy-fixture/default.nix b/pkgs/development/python-modules/pytest-lazy-fixture/default.nix
new file mode 100644
index 000000000000..779b710f92ba
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-lazy-fixture/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-lazy-fixture";
+  version = "0.6.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1b0hmnsxw4s2wf9pks8dg6dfy5cx3zcbzs8517lfccxsfizhqz8f";
+  };
+
+  checkInputs = [
+    pytest
+  ];
+
+  checkPhase = ''
+    pytest
+  '';
+
+  meta = with lib; {
+    description = "Helps to use fixtures in pytest.mark.parametrize";
+    homepage = "https://github.com/pytest-dev/pytest-repeat";
+    license = licenses.mit;
+    maintainers = with maintainers; [ tobim ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 148990650dd2..3283197c2d24 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2332,6 +2332,8 @@ in {
 
   pytest-isort = callPackage ../development/python-modules/pytest-isort { };
 
+  pytest-lazy-fixture = callPackage ../development/python-modules/pytest-lazy-fixture { };
+
   pytest-mpl = callPackage ../development/python-modules/pytest-mpl { };
 
   pytest-mock = callPackage ../development/python-modules/pytest-mock { };

From 2fe5239056fd26ac411a50c16b21245e3a5faca0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Feb 2020 23:02:23 +0000
Subject: [PATCH 0698/4636] trompeloeil: 36 -> 37

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

diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/pkgs/development/libraries/trompeloeil/default.nix
index 6984a2694d61..782af4ab0331 100644
--- a/pkgs/development/libraries/trompeloeil/default.nix
+++ b/pkgs/development/libraries/trompeloeil/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "trompeloeil";
-  version = "36";
+  version = "37";
 
   src = fetchFromGitHub {
     owner = "rollbear";
     repo = "trompeloeil";
     rev = "v${version}";
-    sha256 = "1ik4cxh2srcdjrj9409lvxgklnadmjd3f5lvjqb5z3jgv51w38nh";
+    sha256 = "04f9vpzh4fc15w4ynirzs9ipm9r31dbggb2zilmk0fj4qr79am42";
   };
 
   nativeBuildInputs = [ cmake ];

From dea79b56f7218ba75653260232c07d2f5ad2f109 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Fri, 14 Feb 2020 14:11:33 +0100
Subject: [PATCH 0699/4636] nixos/boot: add option to disable initrd

---
 nixos/modules/system/boot/kernel.nix  | 227 +++++++++++++-------------
 nixos/modules/system/boot/stage-1.nix |  13 +-
 2 files changed, 128 insertions(+), 112 deletions(-)

diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 6edb9082e75a..7ca63a88b3db 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -187,139 +187,144 @@ in
 
   ###### implementation
 
-  config = mkIf (!config.boot.isContainer) {
+  config = mkMerge
+    [ (mkIf config.boot.initrd.enable {
+        boot.initrd.availableKernelModules =
+          [ # Note: most of these (especially the SATA/PATA modules)
+            # shouldn't be included by default since nixos-generate-config
+            # detects them, but I'm keeping them for now for backwards
+            # compatibility.
 
-    system.build = { inherit kernel; };
+            # Some SATA/PATA stuff.
+            "ahci"
+            "sata_nv"
+            "sata_via"
+            "sata_sis"
+            "sata_uli"
+            "ata_piix"
+            "pata_marvell"
 
-    system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
+            # Standard SCSI stuff.
+            "sd_mod"
+            "sr_mod"
 
-    # Implement consoleLogLevel both in early boot and using sysctl
-    # (so you don't need to reboot to have changes take effect).
-    boot.kernelParams =
-      [ "loglevel=${toString config.boot.consoleLogLevel}" ] ++
-      optionals config.boot.vesa [ "vga=0x317" "nomodeset" ];
+            # SD cards and internal eMMC drives.
+            "mmc_block"
 
-    boot.kernel.sysctl."kernel.printk" = mkDefault config.boot.consoleLogLevel;
+            # Support USB keyboards, in case the boot fails and we only have
+            # a USB keyboard, or for LUKS passphrase prompt.
+            "uhci_hcd"
+            "ehci_hcd"
+            "ehci_pci"
+            "ohci_hcd"
+            "ohci_pci"
+            "xhci_hcd"
+            "xhci_pci"
+            "usbhid"
+            "hid_generic" "hid_lenovo" "hid_apple" "hid_roccat"
+            "hid_logitech_hidpp" "hid_logitech_dj"
 
-    boot.kernelModules = [ "loop" "atkbd" ];
+          ] ++ optionals (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [
+            # Misc. x86 keyboard stuff.
+            "pcips2" "atkbd" "i8042"
 
-    boot.initrd.availableKernelModules =
-      [ # Note: most of these (especially the SATA/PATA modules)
-        # shouldn't be included by default since nixos-generate-config
-        # detects them, but I'm keeping them for now for backwards
-        # compatibility.
+            # x86 RTC needed by the stage 2 init script.
+            "rtc_cmos"
+          ];
 
-        # Some SATA/PATA stuff.
-        "ahci"
-        "sata_nv"
-        "sata_via"
-        "sata_sis"
-        "sata_uli"
-        "ata_piix"
-        "pata_marvell"
+        boot.initrd.kernelModules =
+          [ # For LVM.
+            "dm_mod"
+          ];
+      })
 
-        # Standard SCSI stuff.
-        "sd_mod"
-        "sr_mod"
+      (mkIf (!config.boot.isContainer) {
+        system.build = { inherit kernel; };
 
-        # SD cards and internal eMMC drives.
-        "mmc_block"
+        system.modulesTree = [ kernel ] ++ config.boot.extraModulePackages;
 
-        # Support USB keyboards, in case the boot fails and we only have
-        # a USB keyboard, or for LUKS passphrase prompt.
-        "uhci_hcd"
-        "ehci_hcd"
-        "ehci_pci"
-        "ohci_hcd"
-        "ohci_pci"
-        "xhci_hcd"
-        "xhci_pci"
-        "usbhid"
-        "hid_generic" "hid_lenovo" "hid_apple" "hid_roccat"
-        "hid_logitech_hidpp" "hid_logitech_dj"
+        # Implement consoleLogLevel both in early boot and using sysctl
+        # (so you don't need to reboot to have changes take effect).
+        boot.kernelParams =
+          [ "loglevel=${toString config.boot.consoleLogLevel}" ] ++
+          optionals config.boot.vesa [ "vga=0x317" "nomodeset" ];
 
-      ] ++ optionals (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [
-        # Misc. x86 keyboard stuff.
-        "pcips2" "atkbd" "i8042"
+        boot.kernel.sysctl."kernel.printk" = mkDefault config.boot.consoleLogLevel;
 
-        # x86 RTC needed by the stage 2 init script.
-        "rtc_cmos"
-      ];
+        boot.kernelModules = [ "loop" "atkbd" ];
 
-    boot.initrd.kernelModules =
-      [ # For LVM.
-        "dm_mod"
-      ];
+        # The Linux kernel >= 2.6.27 provides firmware.
+        hardware.firmware = [ kernel ];
 
-    # The Linux kernel >= 2.6.27 provides firmware.
-    hardware.firmware = [ kernel ];
-
-    # Create /etc/modules-load.d/nixos.conf, which is read by
-    # systemd-modules-load.service to load required kernel modules.
-    environment.etc =
-      { "modules-load.d/nixos.conf".source = kernelModulesConf;
-      };
-
-    systemd.services.systemd-modules-load =
-      { wantedBy = [ "multi-user.target" ];
-        restartTriggers = [ kernelModulesConf ];
-        serviceConfig =
-          { # Ignore failed module loads.  Typically some of the
-            # modules in ‘boot.kernelModules’ are "nice to have but
-            # not required" (e.g. acpi-cpufreq), so we don't want to
-            # barf on those.
-            SuccessExitStatus = "0 1";
+        # Create /etc/modules-load.d/nixos.conf, which is read by
+        # systemd-modules-load.service to load required kernel modules.
+        environment.etc =
+          { "modules-load.d/nixos.conf".source = kernelModulesConf;
           };
-      };
 
-    lib.kernelConfig = {
-      isYes = option: {
-        assertion = config: config.isYes option;
-        message = "CONFIG_${option} is not yes!";
-        configLine = "CONFIG_${option}=y";
-      };
+        systemd.services.systemd-modules-load =
+          { wantedBy = [ "multi-user.target" ];
+            restartTriggers = [ kernelModulesConf ];
+            serviceConfig =
+              { # Ignore failed module loads.  Typically some of the
+                # modules in ‘boot.kernelModules’ are "nice to have but
+                # not required" (e.g. acpi-cpufreq), so we don't want to
+                # barf on those.
+                SuccessExitStatus = "0 1";
+              };
+          };
 
-      isNo = option: {
-        assertion = config: config.isNo option;
-        message = "CONFIG_${option} is not no!";
-        configLine = "CONFIG_${option}=n";
-      };
+        lib.kernelConfig = {
+          isYes = option: {
+            assertion = config: config.isYes option;
+            message = "CONFIG_${option} is not yes!";
+            configLine = "CONFIG_${option}=y";
+          };
 
-      isModule = option: {
-        assertion = config: config.isModule option;
-        message = "CONFIG_${option} is not built as a module!";
-        configLine = "CONFIG_${option}=m";
-      };
+          isNo = option: {
+            assertion = config: config.isNo option;
+            message = "CONFIG_${option} is not no!";
+            configLine = "CONFIG_${option}=n";
+          };
 
-      ### Usually you will just want to use these two
-      # True if yes or module
-      isEnabled = option: {
-        assertion = config: config.isEnabled option;
-        message = "CONFIG_${option} is not enabled!";
-        configLine = "CONFIG_${option}=y";
-      };
+          isModule = option: {
+            assertion = config: config.isModule option;
+            message = "CONFIG_${option} is not built as a module!";
+            configLine = "CONFIG_${option}=m";
+          };
 
-      # True if no or omitted
-      isDisabled = option: {
-        assertion = config: config.isDisabled option;
-        message = "CONFIG_${option} is not disabled!";
-        configLine = "CONFIG_${option}=n";
-      };
-    };
+          ### Usually you will just want to use these two
+          # True if yes or module
+          isEnabled = option: {
+            assertion = config: config.isEnabled option;
+            message = "CONFIG_${option} is not enabled!";
+            configLine = "CONFIG_${option}=y";
+          };
 
-    # The config options that all modules can depend upon
-    system.requiredKernelConfig = with config.lib.kernelConfig; [
-      # !!! Should this really be needed?
-      (isYes "MODULES")
-      (isYes "BINFMT_ELF")
-    ] ++ (optional (randstructSeed != "") (isYes "GCC_PLUGIN_RANDSTRUCT"));
+          # True if no or omitted
+          isDisabled = option: {
+            assertion = config: config.isDisabled option;
+            message = "CONFIG_${option} is not disabled!";
+            configLine = "CONFIG_${option}=n";
+          };
+        };
 
-    # nixpkgs kernels are assumed to have all required features
-    assertions = if config.boot.kernelPackages.kernel ? features then [] else
-      let cfg = config.boot.kernelPackages.kernel.config; in map (attrs:
-        { assertion = attrs.assertion cfg; inherit (attrs) message; }
-      ) config.system.requiredKernelConfig;
+        # The config options that all modules can depend upon
+        system.requiredKernelConfig = with config.lib.kernelConfig;
+          [
+            # !!! Should this really be needed?
+            (isYes "MODULES")
+            (isYes "BINFMT_ELF")
+          ] ++ (optional (randstructSeed != "") (isYes "GCC_PLUGIN_RANDSTRUCT"));
 
-  };
+        # nixpkgs kernels are assumed to have all required features
+        assertions = if config.boot.kernelPackages.kernel ? features then [] else
+          let cfg = config.boot.kernelPackages.kernel.config; in map (attrs:
+            { assertion = attrs.assertion cfg; inherit (attrs) message; }
+          ) config.system.requiredKernelConfig;
+
+      })
+
+    ];
 
 }
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 4c2d130d5a5d..524553bfdaff 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -379,6 +379,17 @@ in
       '';
     };
 
+    boot.initrd.enable = mkOption {
+      type = types.bool;
+      default = !config.boot.isContainer;
+      defaultText = "!config.boot.isContainer";
+      description = ''
+        Whether to enable the NixOS initial RAM disk (initrd). This may be
+        needed to perform some initialisation tasks (like mounting
+        network/encrypted file systems) before continuing the boot process.
+      '';
+    };
+
     boot.initrd.prepend = mkOption {
       default = [ ];
       type = types.listOf types.str;
@@ -544,7 +555,7 @@ in
 
   };
 
-  config = mkIf (!config.boot.isContainer) {
+  config = mkIf config.boot.initrd.enable {
     assertions = [
       { assertion = any (fs: fs.mountPoint == "/") fileSystems;
         message = "The ‘fileSystems’ option does not specify your root file system.";

From ac560382c5fe69b8b5375a44117da99a35cbf8a6 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sat, 15 Feb 2020 06:39:27 -0500
Subject: [PATCH 0700/4636] blender: fix build on darwin

We don't compile blender with alembic. The linux build is able to detect
that, but this is not done for darwin. This explicitly disables alembic
to fix blender build on darwin.
---
 pkgs/applications/misc/blender/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index ab1c82a7fe4a..c14d0cda1df5 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -75,7 +75,9 @@ stdenv.mkDerivation rec {
     '';
 
   cmakeFlags =
-    [ "-DWITH_MOD_OCEANSIM=ON"
+    [
+      "-DWITH_ALEMBIC=OFF"
+      "-DWITH_MOD_OCEANSIM=ON"
       "-DWITH_CODEC_FFMPEG=ON"
       "-DWITH_CODEC_SNDFILE=ON"
       "-DWITH_INSTALL_PORTABLE=OFF"

From e019371ab4f7016f4f740f6379a78a5e2e3533dc Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sat, 15 Feb 2020 07:00:05 -0500
Subject: [PATCH 0701/4636] soundfont-fluid: fix src url

---
 pkgs/data/soundfonts/fluid/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/soundfonts/fluid/default.nix b/pkgs/data/soundfonts/fluid/default.nix
index 7debe119aa1c..18c4160014f6 100644
--- a/pkgs/data/soundfonts/fluid/default.nix
+++ b/pkgs/data/soundfonts/fluid/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "Fluid-3";
 
   src = fetchurl {
-    url = "http://www.musescore.org/download/fluid-soundfont.tar.gz";
+    url = "https://ftp.osuosl.org/pub/musescore/soundfont/fluid-soundfont.tar.gz";
     sha256 = "1f96bi0y6rms255yr8dfk436azvwk66c99j6p43iavyq8jg7c5f8";
   };
 

From 175d83634b7684a63a00e83e4d482a60b833365b Mon Sep 17 00:00:00 2001
From: brano543 <brano.masar@gmail.com>
Date: Sat, 15 Feb 2020 13:05:56 +0100
Subject: [PATCH 0702/4636] gdal: Clean up formatting

---
 pkgs/development/libraries/gdal/default.nix | 50 +++++++++++++--------
 1 file changed, 31 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 7a00a5aa94e6..ed31d34f65e4 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -1,9 +1,7 @@
-{ stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib
-, postgresql, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl
-, libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
-, libiconv, libxml2, autoreconfHook
-, netcdfSupport ? true, netcdf, hdf5, curl
-}:
+{ stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib, postgresql
+, libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl, libpng
+, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat, libiconv, libxml2
+, autoreconfHook, netcdfSupport ? true, netcdf, hdf5, curl }:
 
 with stdenv.lib;
 
@@ -22,27 +20,41 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite
-    libspatialite libgeotiff poppler hdf4 qhull giflib expat libxml2 ]
-  ++ (with pythonPackages; [ python numpy wrapPython ])
-  ++ stdenv.lib.optional stdenv.isDarwin libiconv
-  ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ];
+  buildInputs = [
+    unzip
+    libjpeg
+    libtiff
+    libpng
+    proj
+    openssl
+    sqlite
+    libspatialite
+    libgeotiff
+    poppler
+    hdf4
+    qhull
+    giflib
+    expat
+    libxml2
+  ] ++ (with pythonPackages; [ python numpy wrapPython ])
+    ++ stdenv.lib.optional stdenv.isDarwin libiconv
+    ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ];
 
   configureFlags = [
     "--with-expat=${expat.dev}"
     "--with-jpeg=${libjpeg.dev}"
     "--with-libtiff=${libtiff.dev}" # optional (without largetiff support)
-    "--with-png=${libpng.dev}"      # optional
+    "--with-png=${libpng.dev}" # optional
     "--with-poppler=${poppler.dev}" # optional
-    "--with-libz=${zlib.dev}"       # optional
+    "--with-libz=${zlib.dev}" # optional
     "--with-pg=${postgresql}/bin/pg_config"
     "--with-mysql=${libmysqlclient}/bin/mysql_config"
     "--with-geotiff=${libgeotiff}"
     "--with-sqlite3=${sqlite.dev}"
     "--with-spatialite=${libspatialite}"
-    "--with-python"               # optional
+    "--with-python" # optional
     "--with-proj=${proj.dev}" # optional
-    "--with-geos=${geos}/bin/geos-config"# optional
+    "--with-geos=${geos}/bin/geos-config" # optional
     "--with-hdf4=${hdf4.dev}" # optional
     "--with-xml2=${libxml2.dev}/bin/xml2-config" # optional
     (if netcdfSupport then "--with-netcdf=${netcdf}" else "")
@@ -55,9 +67,9 @@ stdenv.mkDerivation rec {
   # - Unset CC and CXX as they confuse libtool.
   # - teach gdal that libdf is the legacy name for libhdf
   preConfigure = ''
-      substituteInPlace configure \
-      --replace "-lmfhdf -ldf" "-lmfhdf -lhdf"
-    '';
+    substituteInPlace configure \
+    --replace "-lmfhdf -ldf" "-lmfhdf -lhdf"
+  '';
 
   preBuild = ''
     substituteInPlace swig/python/GNUmakefile \
@@ -72,7 +84,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Translator library for raster geospatial data formats";
-    homepage = https://www.gdal.org/;
+    homepage = "https://www.gdal.org/";
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = with stdenv.lib.platforms; linux ++ darwin;

From b57af2d024b13784dad35aac282533fc09797b58 Mon Sep 17 00:00:00 2001
From: brano543 <brano.masar@gmail.com>
Date: Sat, 15 Feb 2020 13:09:14 +0100
Subject: [PATCH 0703/4636] gdal: Fix finding postgresql after 3.0 update

---
 pkgs/development/libraries/gdal/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index ed31d34f65e4..085c23c49cf4 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, unzip, libjpeg, libtiff, zlib, postgresql
 , libmysqlclient, libgeotiff, pythonPackages, proj, geos, openssl, libpng
 , sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat, libiconv, libxml2
-, autoreconfHook, netcdfSupport ? true, netcdf, hdf5, curl }:
+, autoreconfHook, netcdfSupport ? true, netcdf, hdf5, curl, pkg-config }:
 
 with stdenv.lib;
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   sourceRoot = "source/gdal";
 
-  nativeBuildInputs = [ autoreconfHook ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   buildInputs = [
     unzip
@@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
     giflib
     expat
     libxml2
+    postgresql
   ] ++ (with pythonPackages; [ python numpy wrapPython ])
     ++ stdenv.lib.optional stdenv.isDarwin libiconv
     ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ];
@@ -47,7 +48,7 @@ stdenv.mkDerivation rec {
     "--with-png=${libpng.dev}" # optional
     "--with-poppler=${poppler.dev}" # optional
     "--with-libz=${zlib.dev}" # optional
-    "--with-pg=${postgresql}/bin/pg_config"
+    "--with-pg=yes" # since gdal 3.0 doesn't use ${postgresql}/bin/pg_config
     "--with-mysql=${libmysqlclient}/bin/mysql_config"
     "--with-geotiff=${libgeotiff}"
     "--with-sqlite3=${sqlite.dev}"

From 1e263a638ff900d544b3960fb4dd54a9a9944174 Mon Sep 17 00:00:00 2001
From: brano543 <brano.masar@gmail.com>
Date: Sat, 15 Feb 2020 13:20:36 +0100
Subject: [PATCH 0704/4636] gdal: Port to Python 3

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f768541ad806..8577a4deec0c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11487,7 +11487,9 @@ in
     libXpm = null;
   };
 
-  gdal = callPackage ../development/libraries/gdal { };
+  gdal = callPackage ../development/libraries/gdal {
+    pythonPackages = python3Packages; 
+  };
 
   gdal_1_11 = callPackage ../development/libraries/gdal/gdal-1_11.nix { };
 

From 78b6642e5d5c1ebd5d07b3a5905828ac80f7f9e0 Mon Sep 17 00:00:00 2001
From: brano543 <brano.masar@gmail.com>
Date: Sat, 15 Feb 2020 13:29:00 +0100
Subject: [PATCH 0705/4636] gdal: correct indentation in preConfigure

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

diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 085c23c49cf4..1734ee9ce589 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
   # - teach gdal that libdf is the legacy name for libhdf
   preConfigure = ''
     substituteInPlace configure \
-    --replace "-lmfhdf -ldf" "-lmfhdf -lhdf"
+      --replace "-lmfhdf -ldf" "-lmfhdf -lhdf"
   '';
 
   preBuild = ''

From 76dde9d65f8fae37ae5d0c01b54b86a6d525dcdb Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sat, 15 Feb 2020 07:56:48 +0300
Subject: [PATCH 0706/4636] cdesktopenv: 2019-11-30 -> 2.3.2

---
 pkgs/desktops/cdesktopenv/2.3.2.patch | 106 ++++++++++++++++++++++++++
 pkgs/desktops/cdesktopenv/default.nix |  17 +++--
 2 files changed, 116 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/desktops/cdesktopenv/2.3.2.patch

diff --git a/pkgs/desktops/cdesktopenv/2.3.2.patch b/pkgs/desktops/cdesktopenv/2.3.2.patch
new file mode 100644
index 000000000000..cfd027694d79
--- /dev/null
+++ b/pkgs/desktops/cdesktopenv/2.3.2.patch
@@ -0,0 +1,106 @@
+From 8db8a2290683acf94f02e855af668a864d6001c2 Mon Sep 17 00:00:00 2001
+Subject: [PATCH 1/2] installCDE: don't hardcode path to whoami
+---
+ cde/admin/IntegTools/dbTools/installCDE.src | 11 ++---------
+ cde/admin/IntegTools/dbTools/mkProd         |  9 +--------
+ 2 files changed, 3 insertions(+), 17 deletions(-)
+
+diff --git a/cde/admin/IntegTools/dbTools/installCDE.src b/cde/admin/IntegTools/dbTools/installCDE.src
+index a00fefd1..233b4a96 100755
+--- a/cde/admin/IntegTools/dbTools/installCDE.src
++++ b/admin/IntegTools/dbTools/installCDE.src
+@@ -52,7 +52,7 @@ LOGFILE="installCDE.$$.log"
+ 
+ Log()
+ {
+-  /bin/echo "$1" | tee -a $LOGFILE
++  echo "$1" | tee -a $LOGFILE
+ }
+ 
+ MakeTarball()
+@@ -537,14 +537,7 @@ XCOMM
+     PLATFORM_SCRIPT_DIR=hp
+   fi
+ 
+-  if [ "$PLATFORM" = "aix" ];
+-  then
+-    USER=$(/bin/whoami)
+-  else
+-    USER=$(/usr/bin/whoami)
+-  fi
+-
+-  if [ "$USER" != "root" ];
++  if [ $(whoami) != "root" ];
+   then
+     echo ""
+     echo "You should be root to run this script.  Continuing anyway."
+diff --git a/cde/admin/IntegTools/dbTools/mkProd b/cde/admin/IntegTools/dbTools/mkProd
+index 44591fab..413a77e8 100755
+--- a/cde/admin/IntegTools/dbTools/mkProd
++++ b/admin/IntegTools/dbTools/mkProd
+@@ -96,13 +96,6 @@ else                                                # Build system = HP
+         PLATFORM=hp-ux
+ fi
+ 
+-if [ $PLATFORM = "aix" ];
+-then
+-        USER=`/bin/whoami`
+-else
+-        USER=`/usr/bin/whoami`
+-fi
+-
+ awkit() {
+ 	awk  '
+ 	BEGIN {
+@@ -504,7 +497,7 @@ doit()
+ 		}
+ 		# set permissions for non-links
+ 		if [ "${TYPE%link}" = "$TYPE" ]; then
+-			if [ "$USER" = "root" ]; then
++			if [ $(whoami) = "root" ]; then
+ 				chgrp $GROUP $DEST || 
+ 					echo "ERROR: \"chgrp $GROUP $DEST\" failed" >&2
+ 				chown $OWNER $DEST || 
+-- 
+2.25.0
+
+
+From 9221c55a5f811986eaf0e01301827c294ac2e29b Mon Sep 17 00:00:00 2001
+Subject: [PATCH 2/2] tt_type_comp: use CppCmd definition
+---
+ cde/lib/tt/bin/tt_type_comp/Imakefile | 4 +++-
+ cde/lib/tt/lib/tt_options.h           | 5 +++++
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/cde/lib/tt/bin/tt_type_comp/Imakefile b/cde/lib/tt/bin/tt_type_comp/Imakefile
+index 92179208..62434929 100644
+--- a/cde/lib/tt/bin/tt_type_comp/Imakefile
++++ b/lib/tt/bin/tt_type_comp/Imakefile
+@@ -8,7 +8,9 @@ EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
+ 
+ #include "../../tooltalk.tmpl"
+ 
+-DEFINES = 
++CPP_PROGRAM = CppCmd
++CPP_DEFINES = -DCPP_PROGRAM="\"$(CPP_PROGRAM)\""
++DEFINES = $(CPP_DEFINES)
+ INCLUDES = $(TIRPCINC) -I../../lib -I../../slib
+ 
+ DEPLIBS         = ../../slib/libstt.a TtClientDepLibs
+diff --git a/cde/lib/tt/lib/tt_options.h b/cde/lib/tt/lib/tt_options.h
+index 4315daa8..e23bb9e5 100644
+--- a/cde/lib/tt/lib/tt_options.h
++++ b/lib/tt/lib/tt_options.h
+@@ -529,4 +529,9 @@
+ 
+ #endif
+ 
++#ifdef CPP_PROGRAM
++# undef OPT_CPP_PATH
++# define OPT_CPP_PATH CPP_PROGRAM
++#endif
++
+ #endif				/* _TT_OPTIONS_H */
+-- 
+2.25.0
+
diff --git a/pkgs/desktops/cdesktopenv/default.nix b/pkgs/desktops/cdesktopenv/default.nix
index 09d53cdd1c56..aa3e3f78b913 100644
--- a/pkgs/desktops/cdesktopenv/default.nix
+++ b/pkgs/desktops/cdesktopenv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, xorgproto, libX11, bison, ksh, perl, gnum4
+{ stdenv, fetchurl, xorgproto, libX11, bison, ksh, perl, gnum4
 , libXinerama, libXt, libXext, libtirpc, motif, libXft, xbitmaps
 , libjpeg, libXmu, libXdmcp, libXScrnSaver, symlinkJoin, bdftopcf
 , ncompress, mkfontdir, tcl, libXaw, gcc, glibcLocales, gawk
@@ -14,15 +14,18 @@ let
     ];
   };
 in stdenv.mkDerivation rec {
-  version = "2019-11-30";
+  version = "2.3.2";
   name = "cde-${version}";
 
-  src = fetchgit {
-    url = "https://git.code.sf.net/p/cdesktopenv/code";
-    rev = "5cebd7c4da1afea353a3baef250e31a4cf867bc5";
-    sha256 = "06wvnb3n8hn98kxvmrf6v3lyqp8bxpzl8wrixlw9jinmsivfs4b9";
+  src = fetchurl {
+    url = "mirror://sourceforge/cdesktopenv/${name}.tar.gz";
+    sha256 = "029rljhi5r483x8rzdpl8625z0wx8r7k2m0364nbw66h5pig9lbx";
   };
-  setSourceRoot = ''export sourceRoot="$(echo */cde)"'';
+
+  # remove with next release
+  patches = [
+    ./2.3.2.patch
+  ];
 
   buildInputs = [
     libX11 libXinerama libXt libXext libtirpc motif libXft xbitmaps

From cebf96a257a8f4d0ec566f728a3ec3358e9b389e Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sat, 15 Feb 2020 08:08:58 +0300
Subject: [PATCH 0707/4636] kmsxx: 2019-10-28 -> 2020-02-14

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

diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix
index 70058db4c0a2..ac998f305175 100644
--- a/pkgs/development/libraries/kmsxx/default.nix
+++ b/pkgs/development/libraries/kmsxx/default.nix
@@ -3,14 +3,14 @@
 
 stdenv.mkDerivation {
   pname = "kmsxx";
-  version = "2019-10-28";
+  version = "2020-02-14";
 
   src = fetchFromGitHub {
     owner = "tomba";
     repo = "kmsxx";
     fetchSubmodules = true;
-    rev = "d29da28c7f2a0212d834136fe64fb8ca96a0a235";
-    sha256 = "0r94qjyy3s36s32s1xkzij0g2pfwigmyrshw8ni2xli7mg87g1zm";
+    rev = "7c5e645112a899ad018219365c3898b0e896353f";
+    sha256 = "1hj4gk4gwlvpjprjbrmrbrzqjhdgszsndrb1i4f9z7mjvdv8gij2";
   };
 
   enableParallelBuilding = true;

From 4f1d75fd899f1281be728b41351f73722187e056 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sat, 15 Feb 2020 08:22:40 +0300
Subject: [PATCH 0708/4636] mididings: correct version naming

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

diff --git a/pkgs/tools/audio/mididings/default.nix b/pkgs/tools/audio/mididings/default.nix
index 35d1af1e7676..addb95b9f1bd 100644
--- a/pkgs/tools/audio/mididings/default.nix
+++ b/pkgs/tools/audio/mididings/default.nix
@@ -1,7 +1,7 @@
 { stdenv, pythonPackages, fetchFromGitHub, pkg-config, glib, alsaLib, libjack2  }:
 
 pythonPackages.buildPythonApplication {
-  version = "20151117";
+  version = "2015-11-17";
   pname = "mididings";
 
   src = fetchFromGitHub {

From 6e6fa2b6852ac7399efa3a0b763ee6cfe71f532f Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sat, 15 Feb 2020 09:06:43 +0300
Subject: [PATCH 0709/4636] openjk: 2019-10-25 -> 2019-11-29

---
 pkgs/games/openjk/default.nix   | 6 +++---
 pkgs/top-level/all-packages.nix | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix
index fd12c9015833..07dd2a00c230 100644
--- a/pkgs/games/openjk/default.nix
+++ b/pkgs/games/openjk/default.nix
@@ -21,13 +21,13 @@ let
   };
 in stdenv.mkDerivation {
   pname = "OpenJK";
-  version = "2019-10-25";
+  version = "2019-11-29";
 
   src = fetchFromGitHub {
     owner = "JACoders";
     repo = "OpenJK";
-    rev = "e9116155052ef6a22135a1806a10e959aa9a1e00";
-    sha256 = "1f1bz1g2ksw4m3rnbh6fdsawcrpbfjdmq1gs2xj0q450yb840l3z";
+    rev = "eed60925ad1b0d513d3747264f3bf98615fa4b2a";
+    sha256 = "0b33cr540vz7w7dlagqf3yldmyx9y2pri20j44pd8fxapq4krrmb";
   };
 
   dontAddPrefix = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 228f248a61db..69712eea2adf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23211,7 +23211,10 @@ in
 
   openclonk = callPackage ../games/openclonk { };
 
-  openjk = callPackage ../games/openjk { };
+  openjk = callPackage ../games/openjk {
+    # segfaults when built with gcc9
+    stdenv = gcc8Stdenv;
+  };
 
   openmw = libsForQt5.callPackage ../games/openmw { };
 

From 2083c1d8b442c9f74305646a4762dadc299055ea Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sat, 15 Feb 2020 09:58:58 +0300
Subject: [PATCH 0710/4636] openmw-tes3mp: 2019-07-01 -> 2019-11-19

---
 pkgs/games/openmw/tes3mp.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix
index 9570acfdbaaf..3d14fb0487c7 100644
--- a/pkgs/games/openmw/tes3mp.nix
+++ b/pkgs/games/openmw/tes3mp.nix
@@ -25,19 +25,19 @@ let
     owner = "TES3MP";
     repo = "CoreScripts";
     # usually latest in stable branch (e.g. 0.7.0)
-    rev = "506146f5b2297242b713a030a589966156df1e8e";
-    sha256 = "0p4a4bgigyxfmaczf3jnz6ik4hgvdaafzc4614hbmbm1qbn8wpf9";
+    rev = "24aae91d9ddad38cdb3b0e0a13af59f142803e94";
+    sha256 = "1rfmxxr9ircfagdpbdrzl26msdhx1i3g974cblbv69078cradfh3";
   };
 in openmw.overrideAttrs (oldAttrs: rec {
-  version = "2019-07-01";
+  version = "2019-11-19";
   name = "openmw-tes3mp-${version}";
 
   src = fetchFromGitHub {
     owner = "TES3MP";
     repo = "openmw-tes3mp";
     # usually latest in stable branch (e.g. 0.7.0)
-    rev = "94a9292cc676a037496f98877b62da80cde2ac47";
-    sha256 = "0kc45xs33rsxac1aba248slzvljx90ybdk4ag9jwjjmsjmy7w2w5";
+    rev = "ad9ee80641a3e22d0780daca051df7f4e90f3615";
+    sha256 = "03a1vldiv5lk7yq6lhicx3qz8hjfxhind2dj0w9lg5839ljyk6jv";
   };
 
   nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ makeWrapper ];

From 5ddfac70f1160163ccff223a4b0b1963993da1ad Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sat, 15 Feb 2020 13:49:17 +0300
Subject: [PATCH 0711/4636] qtcurve: 1.9 -> 1.9.1

---
 pkgs/data/themes/qtcurve/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix
index df8e86bf4c15..c949965cb879 100644
--- a/pkgs/data/themes/qtcurve/default.nix
+++ b/pkgs/data/themes/qtcurve/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig, mkDerivation
+{ stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, mkDerivation
 , gtk2, qtbase, qtsvg, qtx11extras # Toolkit dependencies
 , karchive, kconfig, kconfigwidgets, kio, frameworkintegration
 , kguiaddons, ki18n, kwindowsystem, kdelibs4support, kiconthemes
@@ -7,13 +7,15 @@
 }:
 
 let
-  version = "1.9";
+  version = "1.9.1";
 in mkDerivation {
   pname = "qtcurve";
   inherit version;
-  src = fetchurl {
-    url = "https://download.kde.org/stable/qtcurve/qtcurve-${version}.tar.xz";
-    sha256 = "169gdny1cdld0qnx3nqvx568zjzdba4pwp3gxapc1hdh2cymw7r8";
+  src = fetchFromGitHub {
+    owner = "KDE";
+    repo = "qtcurve";
+    rev = version;
+    sha256 = "0sm1fza68mwl9cvid4h2lsyxq5svia86l5v9wqk268lmx16mbzsw";
   };
 
   patches = [

From c0609be0a24a6b648e0f544b86985d5d21580462 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sat, 15 Feb 2020 15:39:59 +0300
Subject: [PATCH 0712/4636] woeusb: 3.3.0 -> 3.3.1

---
 pkgs/tools/misc/woeusb/default.nix            |  4 +-
 .../tools/misc/woeusb/remove-workaround.patch | 87 +++----------------
 2 files changed, 12 insertions(+), 79 deletions(-)

diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix
index cc53b26e2388..a61434d21020 100644
--- a/pkgs/tools/misc/woeusb/default.nix
+++ b/pkgs/tools/misc/woeusb/default.nix
@@ -3,14 +3,14 @@
 , wxGTK30 }:
 
 stdenv.mkDerivation rec {
-  version = "3.3.0";
+  version = "3.3.1";
   pname = "woeusb";
 
   src = fetchFromGitHub {
     owner = "slacka";
     repo = "WoeUSB";
     rev = "v${version}";
-    sha256 = "1w3m3qbjn0igydsbpf22w29lzf1pkxv7dlny5mbyrb6j0q6wlx0b";
+    sha256 = "1hbr88sr943s4yqdvbny543jvgvnsa622wq4cmwd23hjsfcrvyiv";
   };
 
   patches = [ ./remove-workaround.patch ];
diff --git a/pkgs/tools/misc/woeusb/remove-workaround.patch b/pkgs/tools/misc/woeusb/remove-workaround.patch
index 094da2cb2bc1..3550002dfedd 100644
--- a/pkgs/tools/misc/woeusb/remove-workaround.patch
+++ b/pkgs/tools/misc/woeusb/remove-workaround.patch
@@ -1,82 +1,15 @@
-From 3cf93fd595bd3fca98c98a0bdc8fc86b36ee1403 Mon Sep 17 00:00:00 2001
-From: Michael Hoang <enzime@users.noreply.github.com>
-Date: Wed, 9 Oct 2019 12:42:53 +1100
-Subject: [PATCH] Remove writeback buffering workaround
-
----
- src/woeusb | 45 ---------------------------------------------
- 1 file changed, 45 deletions(-)
+https://github.com/slacka/WoeUSB/issues/267
 
 diff --git a/src/woeusb b/src/woeusb
-index 3284259..0d3ea20 100755
+index 8cb292c..c017dbf 100755
 --- a/src/woeusb
 +++ b/src/woeusb
-@@ -308,9 +308,6 @@ init(){
+@@ -1661,6 +1661,8 @@ workaround_support_windows_7_uefi_boot(){
+ ## - System lagging while copying data · Issue #113 · slacka/WoeUSB <https://github.com/slacka/WoeUSB/issues/113>
+ ## - The pernicious USB-stick stall problem [LWN.net] <https://lwn.net/Articles/572911/>
+ workaround_linux_make_writeback_buffering_not_suck(){
++	return 0
++
+ 	util_check_function_parameters_quantity 1 "${#}"
+ 	local -r mode="${1}"
  
- 	current_state=copying-filesystem
- 
--	workaround_linux_make_writeback_buffering_not_suck \
--		apply
--
- 	copy_filesystem_files \
- 		"${source_fs_mountpoint}" \
- 		"${target_fs_mountpoint}" \
-@@ -1650,41 +1647,6 @@ workaround_support_windows_7_uefi_boot(){
- 		> "${efi_boot_directory}/bootx64.efi"
- }; declare -fr workaround_support_windows_7_uefi_boot
- 
--## Currently WoeUSB indirectly causes severely unresponsive system on 64-bit architecture with large primary memory during file copy process due to a flaw of the writeback buffer size handling in Linux kernel, workaround it before it is fixed
--## Refer: 
--## - System lagging while copying data · Issue #113 · slacka/WoeUSB <https://github.com/slacka/WoeUSB/issues/113>
--## - The pernicious USB-stick stall problem [LWN.net] <https://lwn.net/Articles/572911/>
--workaround_linux_make_writeback_buffering_not_suck(){
--	util_check_function_parameters_quantity 1 "${#}"
--	local -r mode="${1}"
--
--	local -ir VM_DIRTY_BACKGROUND_BYTES=$((16*1024*1024)) # 16MiB
--	local -ir VM_DIRTY_BYTES=$((48*1024*1024)) # 48MiB
--
--	case "${mode}" in
--		apply)
--			echo_with_color \
--				yellow \
--				'Applying workaround to prevent 64-bit systems with big primary memory from being unresponsive during copying files.'
--			echo "${VM_DIRTY_BACKGROUND_BYTES}" > /proc/sys/vm/dirty_background_bytes
--			echo "${VM_DIRTY_BYTES}" > /proc/sys/vm/dirty_bytes
--		;;
--		reset)
--			echo_with_color \
--				yellow \
--				'Resetting workaround to prevent 64-bit systems with big primary memory from being unresponsive during copying files.'
--			echo 0 > /proc/sys/vm/dirty_background_bytes
--			echo 0 > /proc/sys/vm/dirty_bytes
--		;;
--		*)
--			printf_with_color \
--				red \
--				'Fatal: %s: Unexpected *mode* encountered, please report bug.\n' \
--				"${FUNCNAME[0]}"
--		;;
--	esac
--}; declare -fr workaround_linux_make_writeback_buffering_not_suck
--
- install_legacy_pc_bootloader_grub(){
- 	util_check_function_parameters_quantity 3 "${#}"
- 	local -r target_fs_mountpoint="${1}"; shift 1
-@@ -1836,13 +1798,6 @@ trap_exit(){
- 		off \
- 		"${global_only_for_gui}"
- 
--	case "${current_state}" in
--		copying-filesystem|finished)
--			workaround_linux_make_writeback_buffering_not_suck \
--				reset
--		;;
--	esac
--
- 	if util_is_parameter_set_and_not_empty \
- 		source_fs_mountpoint; then
- 		if ! cleanup_mountpoint  \
--- 
-2.23.0
-

From ade5a50b0f8479c33b3c23f96cc4715f7cfa76ba Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 15 Feb 2020 17:02:06 +0100
Subject: [PATCH 0713/4636] python3Packages.mautrix: 0.4.1 -> 0.4.2

https://pypi.org/project/mautrix/0.4.2/
---
 pkgs/development/python-modules/mautrix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix
index 7f908aad6e60..ea5f5ee4851b 100644
--- a/pkgs/development/python-modules/mautrix/default.nix
+++ b/pkgs/development/python-modules/mautrix/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "mautrix";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0mfxfc1y317h90h1jx7amsk09jwzxbvfc75qxzl9nf8ah432yfpr";
+    sha256 = "0f8pzi7ip82p7hn6d9xrgp5wsl4s3w6gmjsgb8gjy2606f7czqyg";
   };
 
   propagatedBuildInputs = [

From 97303641caa66b3b7bc0a4b70057505d6c2f4a60 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 8 Feb 2020 03:32:48 +0000
Subject: [PATCH 0714/4636] clamav: 0.102.1 -> 0.102.2

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

diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 43f56352ceb3..6cb2eaa7d33e 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "clamav";
-  version = "0.102.1";
+  version = "0.102.2";
 
   src = fetchurl {
     url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz";
-    sha256 = "1mpdgn3isz26hd1j6p8lcb76v8hjs54k1wb655rnil4hv78aig8d";
+    sha256 = "1lq7r6r2yl8pp3fkn32b0bsmbbl9pg90kpvhsa2clad3xg0drz49";
   };
 
   # don't install sample config files into the absolute sysconfdir folder

From e5c8ead7d145c89ce24587d4667c7ee5796e13bb Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 13 Feb 2020 13:03:39 -0800
Subject: [PATCH 0715/4636] python3Packages.docker: 4.1.0 -> 4.2.0

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

diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix
index 3d4a73bc969e..701a211a6bb4 100644
--- a/pkgs/development/python-modules/docker/default.nix
+++ b/pkgs/development/python-modules/docker/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "docker";
-  version = "4.1.0";
+  version = "4.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1hdgics03fz2fbhalzys7a7kjj54jnl5a37h6lzdgym41gkwa1kf";
+    sha256 = "0bkj1xfp6mnvk1i9hl5awsmwi07q6iwwsjznd7kvrx5m19i6dbnx";
   };
 
   nativeBuildInputs = [

From bbb4a1be3d968e37bffc2aa218946d7d92e0b0a5 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 14 Feb 2020 14:57:29 -0800
Subject: [PATCH 0716/4636] gitAndTools.ydiff: add python3.pkgs.ydiff tool

---
 pkgs/applications/version-management/git-and-tools/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index ee24b3295be4..0ea406aca817 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -194,6 +194,8 @@ let
 
   transcrypt = callPackage ./transcrypt { };
 
+  ydiff = pkgs.python3.pkgs.toPythonApplication pkgs.python3.pkgs.ydiff;
+
 } // lib.optionalAttrs (config.allowAliases or true) (with self; {
   # aliases
   gitAnnex = git-annex;

From e34db5a5680d96ea2effeea29114b390af74ce46 Mon Sep 17 00:00:00 2001
From: Alexei Robyn <shados@shados.net>
Date: Sat, 23 Mar 2019 16:21:37 +1100
Subject: [PATCH 0717/4636] luajit: Expose build options, enable JIT debug
 module

---
 .../interpreters/luajit/default.nix           | 50 +++++++++++++++----
 1 file changed, 41 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index 5b7761164472..08c0564847c5 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -7,9 +7,33 @@
 , callPackage
 , self
 , packageOverrides ? (self: super: {})
+, enableFFI ? true
+, enableJIT ? true
+, enableJITDebugModule ? enableJIT
+, enable52Compat ? false
+, enableValgrindSupport ? false
+, valgrind ? null
+, enableGDBJITSupport ? false
+, enableAPICheck ? false
+, enableVMAssertions ? false
+, useSystemMalloc ? false
 }:
+assert enableJITDebugModule -> enableJIT;
+assert enableGDBJITSupport -> enableJIT;
+assert enableValgrindSupport -> valgrind != null;
 let
   luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;};
+
+  XCFLAGS = with stdenv.lib;
+     optional (!enableFFI) "-DLUAJIT_DISABLE_FFI"
+  ++ optional (!enableJIT) "-DLUAJIT_DISABLE_JIT"
+  ++ optional enable52Compat "-DLUAJIT_ENABLE_LUA52COMPAT"
+  ++ optional useSystemMalloc "-DLUAJIT_USE_SYSMALLOC"
+  ++ optional enableValgrindSupport "-DLUAJIT_USE_VALGRIND"
+  ++ optional enableGDBJITSupport "-DLUAJIT_USE_GDBJIT"
+  ++ optional enableAPICheck "-DLUAJIT_USE_APICHECK"
+  ++ optional enableVMAssertions "-DLUAJIT_USE_ASSERT"
+  ;
 in
 stdenv.mkDerivation rec {
   inherit name version;
@@ -22,27 +46,36 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace Makefile --replace ldconfig :
+    if test -n "''${dontStrip-}"; then
+      # CCDEBUG must be non-empty or everything will be stripped, -g being
+      # passed by nixpkgs CC wrapper is insufficient on its own
+      substituteInPlace src/Makefile --replace "#CCDEBUG= -g" "CCDEBUG= -g"
+    fi
   '';
 
   configurePhase = false;
 
+  buildInputs = stdenv.lib.optional enableValgrindSupport valgrind;
+
+  buildFlags = [
+    "amalg" # Build highly optimized version
+  ];
   makeFlags = [
     "PREFIX=$(out)"
     "DEFAULT_CC=cc"
     "CROSS=${stdenv.cc.targetPrefix}"
     # TODO: when pointer size differs, we would need e.g. -m32
     "HOST_CC=${buildPackages.stdenv.cc}/bin/cc"
-  ];
-  buildFlags = [ "amalg" ]; # Build highly optimized version
+  ] ++ stdenv.lib.optional enableJITDebugModule "INSTALL_LJLIBD=$(INSTALL_LMOD)";
   enableParallelBuilding = true;
+  NIX_CFLAGS_COMPILE = XCFLAGS;
 
   postInstall = ''
-      ( cd "$out/include"; ln -s luajit-*/* . )
-      ln -s "$out"/bin/luajit-* "$out"/bin/lua
-    ''
-    + stdenv.lib.optionalString (!isStable) ''
-      ln -s "$out"/bin/luajit-* "$out"/bin/luajit
-    '';
+    ( cd "$out/include"; ln -s luajit-*/* . )
+    ln -s "$out"/bin/luajit-* "$out"/bin/lua
+  '' + stdenv.lib.optionalString (!isStable) ''
+    ln -s "$out"/bin/luajit-* "$out"/bin/luajit
+  '';
 
   LuaPathSearchPaths = [
     "lib/lua/${luaversion}/?.lua" "share/lua/${luaversion}/?.lua"
@@ -70,4 +103,3 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ thoughtpolice smironov vcunat andir ];
   } // extraMeta;
 }
-

From 8c58c44aaed3c05f817de9f0bf151bd927cb1abd Mon Sep 17 00:00:00 2001
From: Simon Chatterjee <code@chatts.net>
Date: Sat, 15 Feb 2020 16:37:24 +0000
Subject: [PATCH 0718/4636] haskell generic-builder: fix Darwin regression for
 lmdb

Recent updates to the generic builder have caused haskellPackages.lmdb-simple to
fail to build on Darwin, since it cannot see the lmdb C dynamic library included
by its dependent haskellPackages.lmdb.

The C dynamic library has suffix `.so` not `.dylib`, so this fix allows for
that.

Closes #80190, but that issue may identify a preferable solution.
---
 pkgs/development/haskell-modules/generic-builder.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 513987dae7b3..ac22f903c9b5 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -384,7 +384,7 @@ stdenv.mkDerivation ({
     done
 
     for d in $(grep '^dynamic-library-dirs:' "$packageConfDir"/* | cut -d' ' -f2- | tr ' ' '\n' | sort -u); do
-      for lib in "$d/"*.dylib; do
+      for lib in "$d/"*.{dylib,so}; do
         ln -s "$lib" "$dynamicLinksDir"
       done
     done

From 103720697112b6c36be8eb1a5d6cabb6aa0720f4 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 15 Feb 2020 08:51:41 -0800
Subject: [PATCH 0719/4636] pythonPackages.babelgladeextractor: disable for
 python2

Uses python3 specific calls in setup.py:
```
  File "setup.py", line 23, in _slurp
    with open(path, encoding="utf-8") as fp:
TypeError: 'encoding' is an invalid keyword argument for this function
```
---
 pkgs/development/python-modules/babelgladeextractor/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/babelgladeextractor/default.nix b/pkgs/development/python-modules/babelgladeextractor/default.nix
index 7b73396155c7..0df03754127b 100644
--- a/pkgs/development/python-modules/babelgladeextractor/default.nix
+++ b/pkgs/development/python-modules/babelgladeextractor/default.nix
@@ -9,6 +9,7 @@
 buildPythonPackage rec {
   pname = "babelgladeextractor";
   version = "0.7.0";
+  disabled = (!isPy3k); # uses python3 specific file io in setup.py
 
   src = fetchPypi {
     pname = "BabelGladeExtractor";

From 6c6310787212acaba1b8f3a9b3bfd319015f00e2 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 15 Feb 2020 19:16:41 +0100
Subject: [PATCH 0720/4636] nixos/manual: fix build

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

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index f656e236b369..284e2878d64e 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -95,7 +95,7 @@ in
         default = [];
         example = [ "--data-checksums" "--allow-group-access" ];
         description = ''
-          Additional arguments passed to <literal>initdb<literal> during data dir
+          Additional arguments passed to <literal>initdb</literal> during data dir
           initialisation.
         '';
       };

From 4ca08a2a73e22de710c8b8959a66932ca2299c8f Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 15 Feb 2020 10:00:33 -0800
Subject: [PATCH 0721/4636] steam-chrootenv: add lsof

This adds support for "Launch Game" through the friends menu
---
 pkgs/games/steam/chrootenv.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 1a930b287af1..8832f3bbc184 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -97,6 +97,9 @@ in buildFHSUserEnv rec {
     gdk-pixbuf
     pango
     fontconfig
+
+    # friends options won't display "Launch Game" without it
+    lsof
   ] ++ (if (!nativeOnly) then [
     (steamPackages.steam-runtime-wrapped.override {
       inherit runtimeOnly;

From c391343fcd1515fd2d9b86a3267f7896522eb6a7 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 15 Feb 2020 18:49:18 +0100
Subject: [PATCH 0722/4636] nixos/nixos-build-vms: switch to python test-driver

In 0945178b3c6fd9e33002dd6e3c6f77dfca49565a we decided that Perl-based
VM tests should be deprecated and will be removed between 20.03 and
20.09. So let's switch `nixos-build-vms(8)` to python as well (which is
entirely interactive, so other scripts won't break).

In my experience, the test-driver isn't used most of the time, so this
patch is mainly supposed to get rid of the (probably misleading)
deprecation warning when running `nixos-build-vms`. Apart from that, the
interface for python's test-driver is way nicer.
---
 nixos/doc/manual/release-notes/rl-2003.xml                  | 6 ++++++
 nixos/modules/installer/tools/nixos-build-vms/build-vms.nix | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index caa0de3f05f9..31f08d9da341 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -625,6 +625,12 @@ auth required pam_succeed_if.so uid >= 1000 quiet
      to a fairly old snapshot  from the <package>gcc7</package>-branch.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     The <citerefentry><refentrytitle>nixos-build-vms</refentrytitle><manvolnum>8</manvolnum>
+     </citerefentry>-script now uses the python test-driver.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix b/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
index c1028a0ad7e9..90f0702f7173 100644
--- a/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
+++ b/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
@@ -5,7 +5,7 @@
 
 let nodes = import networkExpr; in
 
-with import ../../../../lib/testing.nix {
+with import ../../../../lib/testing-python.nix {
   inherit system;
   pkgs = import ../../../../.. { inherit system config; };
 };

From 67f349d224dd504a6ff8756952ed0388acae18ca Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 15 Feb 2020 19:51:35 +0100
Subject: [PATCH 0723/4636] google-chrome*: Add the newly required dependencies

See 3fadc45499f. Since the beta channel is now also on 81 and the stable
channel will be on 81 soon, it makes sense to already add this
unconditionally for all channels.
---
 .../applications/networking/browsers/google-chrome/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index 89599158ea03..53255ec51835 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -58,9 +58,8 @@ let
     liberation_ttf curl utillinux xdg_utils wget
     flac harfbuzz icu libpng opusWithCustomModes snappy speechd
     bzip2 libcap at-spi2-atk at-spi2-core
-    kerberos
+    kerberos libdrm mesa
   ] ++ optional pulseSupport libpulseaudio
-    ++ optionals (channel == "dev") [ libdrm mesa ]
     ++ [ gtk ];
 
   suffix = if channel != "stable" then "-" + channel else "";

From bfb7ebf5dfded338aef31fa9640c5ebc1050932e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 15 Feb 2020 08:56:00 -0500
Subject: [PATCH 0724/4636] dune_2: 2.2.0 -> 2.3.0

Changelog: https://github.com/ocaml/dune/releases/tag/2.3.0
---
 pkgs/development/tools/ocaml/dune/2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix
index dc6c27318b18..860602cb684c 100644
--- a/pkgs/development/tools/ocaml/dune/2.nix
+++ b/pkgs/development/tools/ocaml/dune/2.nix
@@ -6,11 +6,11 @@ else
 
 stdenv.mkDerivation rec {
   pname = "dune";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchurl {
     url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
-    sha256 = "1x4bipcyqhgagzvd5iq6p498a4qwvj622j240grsch8nq9qbjpmb";
+    sha256 = "1zswdp2gran8djk718q5g3ldbvw0qp34j9jj1n7m1xp870g3590l";
   };
 
   buildInputs = [ ocaml findlib ];

From a5f883e5359ca97fb946dade25418d5732e3cdf7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Sat, 15 Feb 2020 20:14:46 +0100
Subject: [PATCH 0725/4636] nixos/modules/installer/cd-dvd/channel.nix: Handle
 null config.system.nixos.revision

---
 nixos/modules/installer/cd-dvd/channel.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix
index ab5e7c0645f3..92164d65e533 100644
--- a/nixos/modules/installer/cd-dvd/channel.nix
+++ b/nixos/modules/installer/cd-dvd/channel.nix
@@ -21,7 +21,9 @@ let
       if [ ! -e $out/nixos/nixpkgs ]; then
         ln -s . $out/nixos/nixpkgs
       fi
-      echo -n ${config.system.nixos.revision} > $out/nixos/.git-revision
+      ${optionalString (config.system.nixos.revision != null) ''
+        echo -n ${config.system.nixos.revision} > $out/nixos/.git-revision
+      ''}
       echo -n ${config.system.nixos.versionSuffix} > $out/nixos/.version-suffix
       echo ${config.system.nixos.versionSuffix} | sed -e s/pre// > $out/nixos/svn-revision
     '';

From f0f040c3f7f07fa4dc28b32d44e1db78fa3a0cc1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Sat, 15 Feb 2020 20:15:05 +0100
Subject: [PATCH 0726/4636] nixos/modules/misc/version.nix: Don't parse .git

This leads to inconsistent results between local builds and
Hydra. Also Nix is not a general purpose language, we shouldn't be
parsing .git from inside Nix code.
---
 nixos/modules/misc/version.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index c394ff592f49..9557def622d8 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -4,10 +4,6 @@ with lib;
 
 let
   cfg = config.system.nixos;
-
-  gitRepo      = "${toString pkgs.path}/.git";
-  gitRepoValid = lib.pathIsGitRepo gitRepo;
-  gitCommitId  = lib.substring 0 7 (commitIdFromGitRepo gitRepo);
 in
 
 {
@@ -98,8 +94,6 @@ in
       # These defaults are set here rather than up there so that
       # changing them would not rebuild the manual
       version = mkDefault (cfg.release + cfg.versionSuffix);
-      revision      = mkIf gitRepoValid (mkDefault            gitCommitId);
-      versionSuffix = mkIf gitRepoValid (mkDefault (".git." + gitCommitId));
     };
 
     # Generate /etc/os-release.  See

From ee809ac83b092700a073c8a7f6cd107eb26f6264 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 15 Feb 2020 19:17:34 +0100
Subject: [PATCH 0727/4636] scdoc: 1.10.0 -> 1.10.1

Changelog: https://git.sr.ht/~sircmpwn/scdoc/refs/1.10.1
---
 pkgs/tools/typesetting/scdoc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix
index 011a8f24ece9..6bddf1073289 100644
--- a/pkgs/tools/typesetting/scdoc/default.nix
+++ b/pkgs/tools/typesetting/scdoc/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "scdoc";
-  version = "1.10.0";
+  version = "1.10.1";
 
   src = fetchurl {
     url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz";
-    sha256 = "0lk8wpz95ld1fnpnc3xkhvnd58px1vbhvlpkr8labi2ck65y10il";
+    sha256 = "13x7g1r56bshvfmlvapvz35ywnbgsh337kywb5kcv8nc6b3j3q40";
   };
 
   postPatch = ''

From 99ae76856cfbdede5fb549056fa9332df88572b1 Mon Sep 17 00:00:00 2001
From: Brett L <btlvr@protonmail.com>
Date: Sat, 15 Feb 2020 11:29:43 -0800
Subject: [PATCH 0728/4636] mainainers: add btlvr

add btlvr maintainer
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d1f6ee211dc4..6cd21475d5a9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1085,6 +1085,12 @@
     githubId = 7716744;
     name = "Berno Strik";
   };
+  btlvr = {
+    email = "btlvr@protonmail.com";
+    github = "btlvr";
+    githubId = 32319131;
+    name = "Brett L";
+  };
   buffet = {
     email = "niclas@countingsort.com";
     github = "buffet";

From daee1daf5d1d71be332942532a0aa5eb1fdef6e8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 15 Feb 2020 15:09:11 -0500
Subject: [PATCH 0729/4636] linux: 4.14.170 -> 4.14.171

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 99a74f14d7ab..472f02574dd0 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.170";
+  version = "4.14.171";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1hqp3spi4cqgkqkzx5g2nbp6isz0kdcsj56ilsp6siqiglj662ll";
+    sha256 = "181jadiwfix23xmqfvg7hpacjd0523v7vy0frzn8g8dlwj4j9q2g";
   };
 } // (args.argsOverride or {}))

From f350e377739f5c5cb276b90c493f8033a40dd17d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 15 Feb 2020 15:09:54 -0500
Subject: [PATCH 0730/4636] linux: 4.19.103 -> 4.19.104

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index a5ca2e24ac44..248e5334d507 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.103";
+  version = "4.19.104";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0hxvqkjy63370sr9j4j0a1kzqwxxdn3i8i6wwc5c2gbzpmqlay5l";
+    sha256 = "1s3bsqcsjrpjiqlxwq89llb5pb37fkbr1pwircpnh1r6ijrgzsr3";
   };
 } // (args.argsOverride or {}))

From e2315d6a7efd4ee757771df8edb5e7302484536d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 15 Feb 2020 15:11:00 -0500
Subject: [PATCH 0731/4636] linux: 4.4.213 -> 4.4.214

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 4ec9cdb55473..fbd9fad0d40b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.213";
+  version = "4.4.214";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1cmwn9zvz14jqjy6qkszglhs2p5h6yh82b2269cbzvibg8y3rxq0";
+    sha256 = "0v575wl85fg9c3ksdj570hxjcl9p1dxwzag3fm0qcrq75kp6bamn";
   };
 } // (args.argsOverride or {}))

From 4c407a299f93de5921b323c438e72352dc1eabe4 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 15 Feb 2020 15:12:14 -0500
Subject: [PATCH 0732/4636] linux: 4.9.213 -> 4.9.214

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 304f1464282c..6f0c75a5c9af 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.213";
+  version = "4.9.214";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0r7bqpvbpiiniwsm338b38mv6flfgm1r09avxqsakhkh8rvgz1dg";
+    sha256 = "10z4n792g88p46csla2g9b0m7vz40ln0901ffb2cfd3hmhyhjzxl";
   };
 } // (args.argsOverride or {}))

From f5357bbe1fd95b1ee127f17090925f9e930ef8a4 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 15 Feb 2020 15:13:14 -0500
Subject: [PATCH 0733/4636] linux: 5.4.19 -> 5.4.20

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 69996e6c1efb..4692ef7dc56f 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.4.19";
+  version = "5.4.20";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1f3pzg8vai5qz19gy9gf3rxs2z4dsw78zjkkfnha8iiy2mqvk14m";
+    sha256 = "1fv7bknwjyzh176rwn11dxvpymp97h5v94mhpdhxqx3hkb6nsgvr";
   };
 } // (args.argsOverride or {}))

From fe613230502cecc0a3af12e64c1e77ea5e4f55eb Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 15 Feb 2020 15:13:45 -0500
Subject: [PATCH 0734/4636] linux: 5.5.3 -> 5.5.4

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.5.nix b/pkgs/os-specific/linux/kernel/linux-5.5.nix
index 87192ba3b92f..375743dda150 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.5.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.5.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.5.3";
+  version = "5.5.4";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1cnaa64i72cfxmspi0lw6598rq8k42dq0jjz0j1n6x2cykf3xvrb";
+    sha256 = "1yx60d22c3x2qnwdhrwdr2nxir59gk33jh5d5334780bxc6zsh7a";
   };
 } // (args.argsOverride or {}))

From edee7deaf4cb05a08b49bb4cce80e8b6b0f0248c Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 15:46:56 -0500
Subject: [PATCH 0735/4636] ripgrep-all: upgrade cargo fetcher implementation
 and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/text/ripgrep-all/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix
index 62549ba9577c..5d02e6225be7 100644
--- a/pkgs/tools/text/ripgrep-all/default.nix
+++ b/pkgs/tools/text/ripgrep-all/default.nix
@@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0fxvnd8qflzvqz2181njdhpbr4wdvd1jc6lcw38c3pknk9h3ymq9";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1jcwipsb7sl65ky78cypl4qvjvxvv4sjlwcg1pirgmqikcyiiy2l";
+  cargoSha256 = "1ajj1glc9c1scnryyil7qg05gvyn1pk8dl2ivmv5h74vx0x8n0rv";
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = lib.optional stdenv.isDarwin Security;
 

From bc8cd1899646f040d10bf933b32c51020d188772 Mon Sep 17 00:00:00 2001
From: Mathias Schreck <mathias.schreck@joyn.de>
Date: Thu, 6 Feb 2020 15:24:16 +0100
Subject: [PATCH 0736/4636] aws-lambda-builders: 0.6.0 -> 0.7.0

---
 .../python-modules/aws-lambda-builders/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix
index d9c90cfa0499..c15beffca80d 100644
--- a/pkgs/development/python-modules/aws-lambda-builders/default.nix
+++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "aws-lambda-builders";
-  version = "0.6.0";
+  version = "0.7.0";
 
   # No tests available in PyPI tarball
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-lambda-builders";
     rev = "v${version}";
-    sha256 = "0bvph58wrw9in5irdbv103knvw2dhqs3kapqv5lpaac9dn7lsk6q";
+    sha256 = "0g133yxh3bgvdjcpar65x5pyx2bcx0kg173rbq5iwmmpw388f47a";
   };
 
   # Package is not compatible with Python 3.5

From 70670e8da26c9dd526fa4603822cd0e9b9068138 Mon Sep 17 00:00:00 2001
From: Mathias Schreck <mathias.schreck@joyn.de>
Date: Thu, 6 Feb 2020 15:24:42 +0100
Subject: [PATCH 0737/4636] aws-sam-translator: 1.19.1 -> 1.20.1

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

diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix
index 732d5fba528e..846c7d9954f7 100644
--- a/pkgs/development/python-modules/aws-sam-translator/default.nix
+++ b/pkgs/development/python-modules/aws-sam-translator/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "aws-sam-translator";
-  version = "1.19.1";
+  version = "1.20.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a62f31ac81a9f36a89ba61b147c5df5819e73af3562859711191354d86836326";
+    sha256 = "17n7kajqf35g0bxqd30jpm2vq275l3b45l77lfh6r9llpkd1zxnx";
   };
 
   # Tests are not included in the PyPI package

From cae8cec57d25a4a08d3f6b9ffa5e88713388020e Mon Sep 17 00:00:00 2001
From: Mathias Schreck <mathias.schreck@joyn.de>
Date: Thu, 6 Feb 2020 15:25:00 +0100
Subject: [PATCH 0738/4636] aws-sam-cli: 0.40.0 -> 0.41.0

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

diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix
index 936aebf22e5d..fcf4c606c1f4 100644
--- a/pkgs/development/tools/aws-sam-cli/default.nix
+++ b/pkgs/development/tools/aws-sam-cli/default.nix
@@ -30,11 +30,11 @@ with py.pkgs;
 
 buildPythonApplication rec {
   pname = "aws-sam-cli";
-  version = "0.40.0";
+  version = "0.41.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1vlg5fdkq5xr4v3a86gyxbbrx4rzdspbv62ki7q8yq8xdja1qz05";
+    sha256 = "1v21bhylys1mvrsvxqw88cvghl6s46hdni52xn661bbn4byrrv3b";
   };
 
   # Tests are not included in the PyPI package

From 8b6e471ce895b070566ca50e22de0c11e30cb4b8 Mon Sep 17 00:00:00 2001
From: Mathias Schreck <mathias.schreck@joyn.de>
Date: Tue, 11 Feb 2020 18:16:06 +0100
Subject: [PATCH 0739/4636] aws-sam-cli: change maintainers dhkl -> lo1tuma

---
 pkgs/development/tools/aws-sam-cli/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix
index fcf4c606c1f4..f5a5d0e65d65 100644
--- a/pkgs/development/tools/aws-sam-cli/default.nix
+++ b/pkgs/development/tools/aws-sam-cli/default.nix
@@ -76,6 +76,6 @@ buildPythonApplication rec {
     homepage = https://github.com/awslabs/aws-sam-cli;
     description = "CLI tool for local development and testing of Serverless applications";
     license = licenses.asl20;
-    maintainers = with maintainers; [ andreabedini dhkl ];
+    maintainers = with maintainers; [ andreabedini lo1tuma ];
   };
 }

From a5df5df2eac837e5879b2386e39da3681d837243 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 14:53:55 -0500
Subject: [PATCH 0740/4636] nushell: fix build by using newer cargo fetcher

Resolves #80117 by using the newer fetcher; see #79975 for details.

Would also be fixed by #80153 eventually, but we want to upgrade Rust packages
either way, so might as well start with the broken ones!
---
 pkgs/shells/nushell/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index 6ed0857ec64d..e08b23afcdd0 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -24,10 +24,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0p1aykhkz5rixj6x0rskg77q31xw11mirvjhzp7n4nmbx3rfkagc";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0143mm9cdswd1azpzzpbfc5x7dy3ryywvq44mwkd6h1027n5idap";
+  cargoSha256 = "14v25smx23d5d386dyw0gspddj6g9am1qpg4ykc1a8lmr0h4ccrk";
 
   nativeBuildInputs = [ pkg-config ]
     ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ];

From 7f774d458d0b222337cd21f7c8f6d095f8d44b01 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 05:26:14 +0000
Subject: [PATCH 0741/4636] chirp: 20191221 -> 20200213

Co-authored-by: Daniel Schaefer <git@danielschaefer.me>
---
 pkgs/applications/radio/chirp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix
index dcbf3522e392..f88687b076e0 100644
--- a/pkgs/applications/radio/chirp/default.nix
+++ b/pkgs/applications/radio/chirp/default.nix
@@ -4,11 +4,11 @@
 }:
 python2.pkgs.buildPythonApplication rec {
   pname = "chirp-daily";
-  version = "20191221";
+  version = "20200213";
 
   src = fetchurl {
     url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz";
-    sha256 = "1f4h45cbaq3rssl95xax8gn2bm1slnsbgds479db46czgq6y1qhy";
+    sha256 = "189kg3425wggib1cggcj49bk01pq3j4b8mks7najpp1rjsl5f2i1";
   };
 
   propagatedBuildInputs = with python2.pkgs; [

From 0fb2de1a8fa2a31064e12c34b9efa670ab65bb9c Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 15 Feb 2020 13:12:41 -0800
Subject: [PATCH 0742/4636] ethabi: 7.0.0 -> 11.0.0

---
 pkgs/applications/blockchains/ethabi.nix | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/blockchains/ethabi.nix b/pkgs/applications/blockchains/ethabi.nix
index 9949b5414bae..ad574c82b464 100644
--- a/pkgs/applications/blockchains/ethabi.nix
+++ b/pkgs/applications/blockchains/ethabi.nix
@@ -1,10 +1,8 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
-with rustPlatform;
-
-buildRustPackage rec {
+rustPlatform.buildRustPackage rec {
   pname = "ethabi";
-  version = "7.0.0";
+  version = "11.0.0";
 
   src = fetchFromGitHub {
     owner = "paritytech";
@@ -13,16 +11,11 @@ buildRustPackage rec {
     sha256 = "1gqd3vwsvv1wvi659qcdywgmh41swblpwmmxb033k8irw581dwq4";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0zkdai31jf8f5syklaxq43ydjvp5xclr8pd6y1q6vkwjz6z49hzm";
-
-  cargoBuildFlags = ["--features cli"];
+  cargoSha256 = "1hx8qw51rl7sn9jmnclw0hc4rx619hf78hpaih5mvny3k0zgiwpm";
 
   meta = with stdenv.lib; {
     description = "Ethereum function call encoding (ABI) utility";
-    homepage = https://github.com/ethcore/ethabi/;
+    homepage = "https://github.com/ethcore/ethabi/";
     maintainers = [ maintainers.dbrock ];
     license = licenses.gpl3;
     inherit version;

From e94a84a144b83eebfcfb33ac3315c01d0d4b3a0a Mon Sep 17 00:00:00 2001
From: rakesh Gupta <rakeshgupta4u@gmail.com>
Date: Sat, 15 Feb 2020 11:22:22 +0530
Subject: [PATCH 0743/4636] Fixed disabled/broken augmenters tests

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

diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix
index fc43af9294f1..603e25fce721 100644
--- a/pkgs/development/python-modules/imgaug/default.nix
+++ b/pkgs/development/python-modules/imgaug/default.nix
@@ -1,6 +1,7 @@
 { buildPythonPackage
 , fetchFromGitHub
 , imageio
+, imagecorruptions
 , numpy
 , opencv3
 , pytest
@@ -33,6 +34,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     imageio
+    imagecorruptions
     numpy
     opencv3
     scikitimage
@@ -41,9 +43,8 @@ buildPythonPackage rec {
     six
   ];
 
-  # augmenters requires a significant increase in packages requires
   checkPhase = ''
-     pytest ./test --ignore=test/augmenters
+     pytest ./test
   '';
 
   checkInputs = [ opencv3 pytest ];

From 36ab5e27e7e2f6292085bf4df549ad44e400a21b Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sat, 15 Feb 2020 22:29:35 +0100
Subject: [PATCH 0744/4636] mutt: 1.13.3 -> 1.13.4

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index b7bf5eb329ca..143153d4d9ff 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -27,11 +27,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "mutt";
-  version = "1.13.3";
+  version = "1.13.4";
 
   src = fetchurl {
     url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
-    sha256 = "0y3ks10mc7m8c7pd4c4j8pj7n5rqcvzrjs8mzldv7z7jnlb30hkq";
+    sha256 = "016dzx2c0kr9xgnw4nfzpkn4nvpk56rdlcqhrwa820fq8083yzdm";
   };
 
   patches = optional smimeSupport (fetchpatch {

From 993719b88af72d27c5ba4414e202eadca11978fd Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 16:33:10 -0500
Subject: [PATCH 0745/4636] sequoia: fix build by migrating off legacy
 fetchCargo implementation

Currently broken; see #79975 for details. Would also be fixed by #80153
eventually, but since we want to upgrade either way we might as well do so now.
---
 pkgs/tools/security/sequoia/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix
index 1301a01e8c6d..45dfddf7c145 100644
--- a/pkgs/tools/security/sequoia/default.nix
+++ b/pkgs/tools/security/sequoia/default.nix
@@ -18,10 +18,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1p17y6vsya8daglvl6yal3759x44dc062ah5vyra0k7dk82cc4pq";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1hbwx2d9j5ddqlvskqxk951g59nsyk5y5l7f9yg2cyqhkzfil7nr";
+  cargoSha256 = "1x0iwcp7dppxyrggmszd62s52j54szw69n3qnlyl7cdpdr64ckqc";
 
   nativeBuildInputs = [
     pkgconfig

From 4c6c40d96a27994ce15a2eeda9d93fa37590df0f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Feb 2020 16:42:21 +0000
Subject: [PATCH 0746/4636] kallisto: 0.46.1 -> 0.46.2

Co-authored-by: Daniel Schaefer <git@danielschaefer.me>
---
 pkgs/applications/science/biology/kallisto/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/kallisto/default.nix b/pkgs/applications/science/biology/kallisto/default.nix
index 1a6555e0d634..5a1bb187886b 100644
--- a/pkgs/applications/science/biology/kallisto/default.nix
+++ b/pkgs/applications/science/biology/kallisto/default.nix
@@ -2,19 +2,21 @@
 
 stdenv.mkDerivation rec {
   pname = "kallisto";
-  version = "0.46.1";
+  version = "0.46.2";
 
   src = fetchFromGitHub {
     repo = "kallisto";
     owner = "pachterlab";
     rev = "v${version}";
-    sha256 = "09ldgy70wziw51ma4a3b7vyrphzf2v1cnq1j5r1wwgfmx8fgbh2z";
+    sha256 = "0m0r2820ca3rch99md1zzbgkilmlfkhdkpys2lfnb87qxmf1jnmb";
   };
 
   nativeBuildInputs = [ autoconf cmake ];
 
   buildInputs = [ hdf5 zlib ];
 
+  cmakeFlags = [ "-DUSE_HDF5=ON" ];
+
   # Parallel build fails in some cases: https://github.com/pachterlab/kallisto/issues/160
   enableParallelBuilding = false;
 

From 4c5ea02dc5b85398f674e1459e27ece5cbd7f66f Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 15 Feb 2020 16:45:47 -0500
Subject: [PATCH 0747/4636] grub: Update extraConfig example text (#79406)

This expands the example to something one might actually want to use
to set up a serial console.
---
 nixos/modules/system/boot/loader/grub/grub.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 26c1197bf975..b97ef88a7ca0 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -224,7 +224,11 @@ in
 
       extraConfig = mkOption {
         default = "";
-        example = "serial; terminal_output.serial";
+        example = ''
+          serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1
+          terminal_input --append serial
+          terminal_output --append serial
+        '';
         type = types.lines;
         description = ''
           Additional GRUB commands inserted in the configuration file

From c359c6959a114500fedc0749d280f7f971954fe6 Mon Sep 17 00:00:00 2001
From: gtgteq <59947264+gtgteq@users.noreply.github.com>
Date: Sun, 16 Feb 2020 06:55:35 +0900
Subject: [PATCH 0748/4636] nixos/postgresql: Change local auth method from
 ident to peer (#80179)

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

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 284e2878d64e..0b79a996dc78 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -251,7 +251,7 @@ in
     services.postgresql.authentication = mkAfter
       ''
         # Generated file; do not edit!
-        local all all              ident
+        local all all              peer
         host  all all 127.0.0.1/32 md5
         host  all all ::1/128      md5
       '';

From c83cc9c364649560a7a0dafc610c09cf24e39408 Mon Sep 17 00:00:00 2001
From: CRTified <carl.schneider+github@ruhr-uni-bochum.de>
Date: Sat, 15 Feb 2020 20:44:36 +0100
Subject: [PATCH 0749/4636] nixos/docker-containers: Move
 ExecStartPre/ExecStopPost to preStart/postStop

This commit fixes #76620. It moves ExecStartPre and ExecStopPost to
preStart and postStop, as these options are composable. It thus allows
adding additional initialisation scripts or cleanup scripts to the systemd
unit of the docker container.
---
 .../modules/virtualisation/docker-containers.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/virtualisation/docker-containers.nix b/nixos/modules/virtualisation/docker-containers.nix
index cae39a56f52f..5ab990a3d7cc 100644
--- a/nixos/modules/virtualisation/docker-containers.nix
+++ b/nixos/modules/virtualisation/docker-containers.nix
@@ -210,7 +210,16 @@ let
     wantedBy = [] ++ optional (container.autoStart) "multi-user.target";
     after = [ "docker.service" "docker.socket" ] ++ mkAfter;
     requires = after;
+    path = [ pkgs.docker ];
 
+    preStart = ''
+      docker rm -f ${name} || true
+      ${optionalString (container.imageFile != null) ''
+        docker load -i ${container.imageFile}
+        ''}
+      '';
+    postStop = "docker rm -f ${name} || true";
+        
     serviceConfig = {
       ExecStart = concatStringsSep " \\\n  " ([
         "${pkgs.docker}/bin/docker run"
@@ -229,12 +238,7 @@ let
         ++ map escapeShellArg container.cmd
       );
 
-      ExecStartPre =
-        ["-${pkgs.docker}/bin/docker rm -f ${name}"] ++
-        (optional (container.imageFile != null) "${pkgs.docker}/bin/docker load -i ${container.imageFile}");
-
-      ExecStop = ''${pkgs.bash}/bin/sh -c "[ $SERVICE_RESULT = success ] || ${pkgs.docker}/bin/docker stop ${name}"'';
-      ExecStopPost = "-${pkgs.docker}/bin/docker rm -f ${name}";
+      ExecStop = ''${pkgs.bash}/bin/sh -c "[ $SERVICE_RESULT = success ] || docker stop ${name}"'';
 
       ### There is no generalized way of supporting `reload` for docker
       ### containers. Some containers may respond well to SIGHUP sent to their

From ec3daae1fc259ad2f7530327815453d4b3a93090 Mon Sep 17 00:00:00 2001
From: Georg Haas <hax404foogit@hax404.de>
Date: Sat, 15 Feb 2020 23:21:12 +0100
Subject: [PATCH 0750/4636] tor-browser-bundle-bin: 9.0.4 -> 9.0.5

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

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index c925483147ba..4fafe19b3792 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -90,19 +90,19 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "9.0.4";
+  version = "9.0.5";
 
   lang = "en-US";
 
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
-      sha256 = "14zlf02i447hcdr4qap8af1k4aziznfp9m2ygqz05zsy8icm1j2k";
+      sha256 = "1d4c3mrvqd6v086mwn3rnv776y2j3y45agnd0k5njqnmr53ybn2s";
     };
 
     i686-linux = fetchurl {
       url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
-      sha256 = "1bmih91gsh698fp2mbnjcq8vmwhg822wanmn99r0xhkmgpi4zw2s";
+      sha256 = "040nh79hjkg5afvzshzhp7588dbi1pcpjsyk8phfqaapds74ma8y";
     };
   };
 in

From 27006fcb4d09808c1a5fe5e1b67c8c5f31f311ca Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 15 Feb 2020 15:57:08 -0800
Subject: [PATCH 0751/4636] vimPlugins: update

---
 pkgs/misc/vim-plugins/generated.nix | 150 ++++++++++++++--------------
 1 file changed, 75 insertions(+), 75 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index e4c077483568..b4464eed825c 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -226,12 +226,12 @@ let
 
   calendar-vim = buildVimPluginFrom2Nix {
     pname = "calendar-vim";
-    version = "2020-02-08";
+    version = "2020-02-14";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "calendar.vim";
-      rev = "dff8667463062d03bae86152a71afd6534a3fabc";
-      sha256 = "0a5p61ijhvkshxk2744bgmikk6s5f0dvyh5rj65ax202qw62blid";
+      rev = "55d0495ff03260d82a5c80365cb754871ce35460";
+      sha256 = "0xi2g6x5lf8r36c5ld8pvz5c7n7jx3d6whwbk4gibmz6hlfrslwr";
     };
   };
 
@@ -358,12 +358,12 @@ let
 
   coc-go = buildVimPluginFrom2Nix {
     pname = "coc-go";
-    version = "2020-02-03";
+    version = "2020-02-13";
     src = fetchFromGitHub {
       owner = "josa42";
       repo = "coc-go";
-      rev = "9547750cb317361ee5471f2fa3183b2bf509eca6";
-      sha256 = "158c3jc297pkdsw5mnayp18k3f34k9f1sy7y4zfknq0qsv5skfhy";
+      rev = "fa76d5c34d048b97eb53cf5e13f6d9acf975c92e";
+      sha256 = "0wizc10g7jxrf2da15hdnjn471w0fgyaw13j9qf7gyhcsmdx1x5w";
     };
   };
 
@@ -446,12 +446,12 @@ let
 
   coc-metals = buildVimPluginFrom2Nix {
     pname = "coc-metals";
-    version = "2020-02-11";
+    version = "2020-02-13";
     src = fetchFromGitHub {
       owner = "ckipp01";
       repo = "coc-metals";
-      rev = "0c1803bf771e3fd73c3d12fb7e848a90960f372b";
-      sha256 = "1nbhaa5gbjl115ixxjgnfss7b8hpgdz9aq239l1l7w2cbgb1132c";
+      rev = "23ec84c855cb791f3d3030fff83aa343e15607b9";
+      sha256 = "1x6ain64aip83h0fhqx7xqnc7jqamgf72q77fddp42id6cws0v61";
     };
   };
 
@@ -545,12 +545,12 @@ let
 
   coc-solargraph = buildVimPluginFrom2Nix {
     pname = "coc-solargraph";
-    version = "2020-01-16";
+    version = "2020-02-14";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-solargraph";
-      rev = "da48852eb9127091f993568dab10982eb201d764";
-      sha256 = "1mw5qfpslzvp9h1yz4zfjf75xixgjfq82c8m7zlfq743sd2gni44";
+      rev = "231447aae26a0e88aa6d9e207a7354c4ca37d564";
+      sha256 = "0amcx519r9j8jr6ckglywsjlyph3m5jq4qvbfwyir8ihxhxa4b0d";
     };
   };
 
@@ -1121,12 +1121,12 @@ let
 
   echodoc-vim = buildVimPluginFrom2Nix {
     pname = "echodoc-vim";
-    version = "2020-01-18";
+    version = "2020-02-12";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "echodoc.vim";
-      rev = "0711b8686c1d25b21337d935ee34f339df671cc1";
-      sha256 = "1l8l0v4818all14rilbjkl0iazgxqdwsffr9a91gxgxzr81zxvdh";
+      rev = "42d0ac0f41601f5e09bd9d62d6c14a5de99f0964";
+      sha256 = "19mydl8r6cqmv2z93p7rww0bxvr7b1y1ag8qml5ajfcsfaz9r1i2";
     };
   };
 
@@ -1200,12 +1200,12 @@ let
 
   far-vim = buildVimPluginFrom2Nix {
     pname = "far-vim";
-    version = "2020-02-12";
+    version = "2020-02-15";
     src = fetchFromGitHub {
       owner = "brooth";
       repo = "far.vim";
-      rev = "e4068a68f740a328c40ed4c7a59a88bfe8033dd8";
-      sha256 = "1h1sr9kkdj712ra777bff8msc42v9k3xwmwjc7favwk71jbx0n5l";
+      rev = "f9d916497e2bf26e6e7072b0375f6c484170311a";
+      sha256 = "02ych1rrj8n6caczphnmvmir8x661p94kc0kh9bffmz7hjk6586q";
     };
   };
 
@@ -1631,12 +1631,12 @@ let
 
   julia-vim = buildVimPluginFrom2Nix {
     pname = "julia-vim";
-    version = "2020-02-12";
+    version = "2020-02-13";
     src = fetchFromGitHub {
       owner = "JuliaEditorSupport";
       repo = "julia-vim";
-      rev = "eaa8da63551a1805051d75ba3a827dd4b292d30e";
-      sha256 = "1qalg8mqajs7z2prsvq7400pv9qzv6za9yiim259gy08qr2425nd";
+      rev = "8c0b9e8f87091ff17abbca752fa30e3a34ebb5a1";
+      sha256 = "013c0zgh0d0zanys38k3q0bxp9xd5xjz92kjsr3b0in371yc7wv1";
     };
   };
 
@@ -1774,12 +1774,12 @@ let
 
   lightline-vim = buildVimPluginFrom2Nix {
     pname = "lightline-vim";
-    version = "2020-02-03";
+    version = "2020-02-15";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "lightline.vim";
-      rev = "377e62d8010ae3a65ee19b88328e4f3a5e54eca5";
-      sha256 = "1a63wjr8myj54ikdi3xs854dmm653m2mk7brzz40m1ajlmw9qsyv";
+      rev = "e8577f3654cac97ee18faae28c80a2200aaaad5a";
+      sha256 = "15jw9qvj1dqqfnf52yqvs11r9hzw42aviz89q1gx6yqmvjd5py4v";
     };
   };
 
@@ -2005,12 +2005,12 @@ let
 
   neomake = buildVimPluginFrom2Nix {
     pname = "neomake";
-    version = "2020-02-11";
+    version = "2020-02-13";
     src = fetchFromGitHub {
       owner = "neomake";
       repo = "neomake";
-      rev = "52ea895e70726cb45c6734e1eff52fb3e808c292";
-      sha256 = "130ldqadzp4grf4kdj7z0x8lhl8pvjawrb6vn1vr0s8as6zin5dm";
+      rev = "acbbd0e0ce2277c33926c189d0f54825e2ed59d3";
+      sha256 = "1s9pg7pz39z4xz80v5i2vh3hd664zfxg2769mfj2nqz38f0qnk97";
     };
   };
 
@@ -2060,12 +2060,12 @@ let
 
   neoterm = buildVimPluginFrom2Nix {
     pname = "neoterm";
-    version = "2019-12-10";
+    version = "2020-02-14";
     src = fetchFromGitHub {
       owner = "kassio";
       repo = "neoterm";
-      rev = "9f0e71200274fc7906df1284d18d43c127214c2c";
-      sha256 = "0shg7a66w8l6g872fgpf59sialc8gs3nx9h1awgngy0kk0m17ilq";
+      rev = "41b309e5528ce07c9471ea4f2fae41e2a539ae49";
+      sha256 = "1knqa3gd9jbj865p8zhy2yks8wfszp7fdnnd29088i82d0sl8g10";
     };
   };
 
@@ -2181,12 +2181,12 @@ let
 
   nvim-gdb = buildVimPluginFrom2Nix {
     pname = "nvim-gdb";
-    version = "2020-02-11";
+    version = "2020-02-13";
     src = fetchFromGitHub {
       owner = "sakhnik";
       repo = "nvim-gdb";
-      rev = "d94d49c0602f3ee6f66f5d33201d8698db76e2b3";
-      sha256 = "0lsyggs6wagrjh73wqi0f1jivqgx39f2pi0qgq98i4lpjc829i53";
+      rev = "64c471aa17ec1980a8f3304c11f00fa4174234bf";
+      sha256 = "0nc6rn1wvdhka23jc52r7kccq81qda1ilal5c1qp0x0hr9ada58l";
     };
   };
 
@@ -2203,12 +2203,12 @@ let
 
   nvim-lsp = buildVimPluginFrom2Nix {
     pname = "nvim-lsp";
-    version = "2020-02-10";
+    version = "2020-02-13";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lsp";
-      rev = "42385dbf6a5eac40da213322fdd3037588eede56";
-      sha256 = "094dgh3m69n1bnxjjaz2r8pv419ism9awhn4zgbhw8kffrf29z7h";
+      rev = "63d8e18a1003ad986ce0c95199839adb10283dbd";
+      sha256 = "1q1myv0hqlscsnmmxqbl5bxvqkgl896p1b1l93826wbfsnpr6wn6";
     };
   };
 
@@ -2676,12 +2676,12 @@ let
 
   SpaceCamp = buildVimPluginFrom2Nix {
     pname = "SpaceCamp";
-    version = "2020-01-24";
+    version = "2020-02-15";
     src = fetchFromGitHub {
       owner = "jaredgorski";
       repo = "SpaceCamp";
-      rev = "7024da097c1530c25cb1f8b63f07c00c04ca2c6f";
-      sha256 = "1kghrk6xmx48prv54qmv4j515bbvivc7gbpkaci7a088k9cdvgk8";
+      rev = "68e8d592237a61fd322c0305d0e7415d64153ec9";
+      sha256 = "1njg0hqcbcqiyyjq5vldbwhndz9d7x9gxksdyr5yygc58463zk2l";
     };
   };
 
@@ -2985,23 +2985,23 @@ let
 
   typescript-vim = buildVimPluginFrom2Nix {
     pname = "typescript-vim";
-    version = "2019-12-19";
+    version = "2020-02-13";
     src = fetchFromGitHub {
       owner = "leafgarland";
       repo = "typescript-vim";
-      rev = "616186fd8a04afa32bae8dc0b70ab7f9cdb427fd";
-      sha256 = "0mq6yxq5ais47ib0ifvdl3qi4c4wz0jwzqsz5djb616xfnmp8ysx";
+      rev = "17d85d8051ba21283e62a9101734981e10b732fd";
+      sha256 = "17z8ygns97wlnm4vq7kgkx3ymnbb2f6imxn02fc0iywkrhdqv7mj";
     };
   };
 
   ultisnips = buildVimPluginFrom2Nix {
     pname = "ultisnips";
-    version = "2020-01-01";
+    version = "2020-02-12";
     src = fetchFromGitHub {
       owner = "SirVer";
       repo = "ultisnips";
-      rev = "96026a4df27899b9e4029dd3b2977ad2ed819caf";
-      sha256 = "1lp6rggsdq7hhis02yyzb79y30g3f7zcydwsi0hjpnnrwvani6s3";
+      rev = "a6c9d4fd1b23e1480b973e7cee1fe20c79248b75";
+      sha256 = "1imqxb04gmqf5v4rd3pb26g5px3sd2pgvb6s0l0bg0qxhg8ksq0p";
     };
   };
 
@@ -3051,12 +3051,12 @@ let
 
   vader-vim = buildVimPluginFrom2Nix {
     pname = "vader-vim";
-    version = "2020-01-26";
+    version = "2020-02-13";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vader.vim";
-      rev = "44b74b4155ec1c28fd8c6dccd90b8736dcd87aa3";
-      sha256 = "00shc6v2jh0jcksfk1ba5slw5m4amxk140j524xyva3kpvdfm814";
+      rev = "6fff477431ac3191c69a3a5e5f187925466e275a";
+      sha256 = "153cr1mrf5w5lyr8374brwx1z5yl9h0cnijxnd3xikh3yi3pbmwk";
     };
   };
 
@@ -4008,12 +4008,12 @@ let
 
   vim-gitgutter = buildVimPluginFrom2Nix {
     pname = "vim-gitgutter";
-    version = "2020-01-22";
+    version = "2020-02-13";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
-      rev = "2ef4f7e7b20dce7fd89adbeb6a943240b77a7a8e";
-      sha256 = "01gqp1rg1pwnb0nz8b15ii704p5b36wsax4yglkjbxa216f3snj9";
+      rev = "da2c785221810b3d57479bb4b3678aabf32f3b88";
+      sha256 = "1kgyzraz48c4zlpkz4qxlvzqzmh6dy7qwlq7gz8n8pbpr7kahmhb";
     };
   };
 
@@ -4041,12 +4041,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2020-02-12";
+    version = "2020-02-14";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "b3c3b6585388565c1de7a9e0a14f8aedb07b7839";
-      sha256 = "1cc20kcl348j7gnyrj4wjmk47l3bx3mwkvxjlplwir6p8dxl14vg";
+      rev = "13c943aaad7ad98ddf0c35f6b758318f53e144fb";
+      sha256 = "1qik4knd96py6f5y4xylshdxbf5fvf0960aadwvk1ninvsazxqic";
     };
   };
 
@@ -4085,12 +4085,12 @@ let
 
   vim-gutentags = buildVimPluginFrom2Nix {
     pname = "vim-gutentags";
-    version = "2020-02-06";
+    version = "2020-02-15";
     src = fetchFromGitHub {
       owner = "ludovicchabant";
       repo = "vim-gutentags";
-      rev = "31c0ead56428529c8991e45c0ac0fa7dd99e3bd0";
-      sha256 = "1x1f52awqnbpnd4y2zsv140rwjml6b5r5laim49n1i1z9vnwknjk";
+      rev = "96cd7dbfe324e8983da68468085967e0b85dc898";
+      sha256 = "15xvknzy2r178jh0w76cagmxprxsznzk0zgv41h33rns4hy5q1vf";
     };
   };
 
@@ -5065,12 +5065,12 @@ let
 
   vim-ruby = buildVimPluginFrom2Nix {
     pname = "vim-ruby";
-    version = "2020-01-26";
+    version = "2020-02-13";
     src = fetchFromGitHub {
       owner = "vim-ruby";
       repo = "vim-ruby";
-      rev = "871e7a16dcb5a9c1ce8ae34978d6922e804e3472";
-      sha256 = "1gacbgw1d273adp46mbasjrkrpk8ajmv8qi43pl4bjsqzdcigbg7";
+      rev = "fbf85d106a2c3979ed43d6332b8c26a72542754d";
+      sha256 = "02k6l6wykw7i26fz2avjrpgml79hy4rrr2x9106g84nc5vimswn0";
     };
   };
 
@@ -5087,12 +5087,12 @@ let
 
   vim-sandwich = buildVimPluginFrom2Nix {
     pname = "vim-sandwich";
-    version = "2020-02-01";
+    version = "2020-02-13";
     src = fetchFromGitHub {
       owner = "machakann";
       repo = "vim-sandwich";
-      rev = "d19545c6feb45966ed3aefac82a46c9447520875";
-      sha256 = "07ib0hjlwwzcyz074ibrshcpkmlwj7195l2jwkncksf29qafzyw4";
+      rev = "02e3b6d1ff9ce346c115166855137b318b63c536";
+      sha256 = "1jd5i0ykvwf5jnm3g3rm2r0zn64xqk38p2xl55la9a1a99j9mfxh";
     };
   };
 
@@ -5527,12 +5527,12 @@ let
 
   vim-themis = buildVimPluginFrom2Nix {
     pname = "vim-themis";
-    version = "2020-02-09";
+    version = "2020-02-13";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-themis";
-      rev = "d0e8474c22c65ce050f4e7c1a56a02826d04e6e5";
-      sha256 = "1lxp62gnp5wwmia481491vgnnh3392nlr7nakwig495ikk3ff1sz";
+      rev = "002eb3566e2cd6426e1d32713d585389da40abeb";
+      sha256 = "066r6132dr37xgl3gz661iyhcx4qb8k548b88smrpar8k8vsgj9n";
     };
   };
 
@@ -5868,12 +5868,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2020-02-11";
+    version = "2020-02-15";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "1f5cef6b03814274381e7ece0e23773fa9bda4df";
-      sha256 = "0na59kxiyaxvizr942vrmhkf5pcmn1wmvvwc92a4mlsm6xjj0zpd";
+      rev = "aa4d8f9d39a112f09f30872962a0c79cd121bedf";
+      sha256 = "1rlhb8srp9dgmspp92qvp79sjw17m04ps90m2zlslh07xm5v2aag";
     };
   };
 
@@ -5912,12 +5912,12 @@ let
 
   vista-vim = buildVimPluginFrom2Nix {
     pname = "vista-vim";
-    version = "2020-02-07";
+    version = "2020-02-15";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "vista.vim";
-      rev = "029adbe4e78c75be4a9a064f049df21806edc7c5";
-      sha256 = "181x7wzqmz68n4nczl31s32wds8kbd3lbdlvjfmzzvfl9zpyxva6";
+      rev = "ae2c79d97547d3e048e7138ac8721825b5a47a09";
+      sha256 = "0j5ya2rwl11daqgdfsqpr8svmhp9hs5zzhabq5xf3d3hlb7nvcpq";
     };
   };
 
@@ -6034,12 +6034,12 @@ let
 
   youcompleteme = buildVimPluginFrom2Nix {
     pname = "youcompleteme";
-    version = "2020-02-10";
+    version = "2020-02-14";
     src = fetchFromGitHub {
       owner = "valloric";
       repo = "youcompleteme";
-      rev = "52632f13ea134a000cbc6a2d1928a37c197ddeee";
-      sha256 = "1rlxd9r1f2m7qfyy551kk5mvbzhmckp0qy0c2mbmfcgrsn627lnb";
+      rev = "de8bad012d66e652a2b5ecc77c2a23c8f97489b3";
+      sha256 = "1my5j2fk6c80sqmj353909dky78jr92g8bxhp02ky2mcwxlg6qrm";
       fetchSubmodules = true;
     };
   };

From 9917c35480929e3965a1ca75c81a60394c8c66c1 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 19:06:53 -0500
Subject: [PATCH 0752/4636] xidlehook: fix build by migrating off legacy
 fetchCargo

Currently broken; see #79975 for details. Would also be fixed by #80153
eventually, but since we want to upgrade either way we might as well do so now.

https://hydra.nixos.org/job/nixpkgs/trunk/xidlehook.x86_64-linux
---
 pkgs/tools/X11/xidlehook/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix
index 49ebe825053c..a4bc2295f1b9 100644
--- a/pkgs/tools/X11/xidlehook/default.nix
+++ b/pkgs/tools/X11/xidlehook/default.nix
@@ -16,10 +16,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"];
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0jdkcxvlw7s8pz1ka3d2w97356a2axvlwfgyh2dz7nmfzpjx64x0";
+  cargoSha256 = "0wakw3pqgwfwarjfb3h0a2javrhnf509v3j547a7p9k5kbjb5np0";
 
   buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security;
   nativeBuildInputs = [ pkgconfig patchelf python3 ];

From dd65399e04c439ce9635565f6b087547e56339eb Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 16 Feb 2020 01:08:46 +0100
Subject: [PATCH 0753/4636] siji: split output into out, bdf, otb

---
 pkgs/data/fonts/siji/default.nix | 48 ++++++++++++++++++++++----------
 pkgs/top-level/all-packages.nix  |  3 +-
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/pkgs/data/fonts/siji/default.nix b/pkgs/data/fonts/siji/default.nix
index a0acf78d855d..336fe48f54da 100644
--- a/pkgs/data/fonts/siji/default.nix
+++ b/pkgs/data/fonts/siji/default.nix
@@ -1,26 +1,44 @@
-{ lib, fetchzip }:
+{ stdenv, fetchzip, libfaketime, fonttosfnt, mkfontscale }:
 
-let
-  date = "2016-05-13";
-in fetchzip {
-  name = "siji-${date}";
+stdenv.mkDerivation rec {
+  name = "siji-${version}";
+  version = "2016-05-13";
 
-  url = https://github.com/stark/siji/archive/95369afac3e661cb6d3329ade5219992c88688c1.zip;
+  src = fetchzip {
+    url = https://github.com/stark/siji/archive/95369afac3e661cb6d3329ade5219992c88688c1.zip;
+    sha256 = "1408g4nxwdd682vjqpmgv0cp0bfnzzzwls62cjs9zrds16xa9dpf";
+  };
 
-  postFetch = ''
-    unzip -j $downloadedFile
+  nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
 
-    install -D *.pcf -t $out/share/fonts/pcf
-    install -D *.bdf -t $out/share/fonts/bdf
+  buildPhase = ''
+    # compress pcf fonts
+    gzip -n -9 pcf/*
+
+    # convert bdf fonts to otb
+    for i in bdf/*; do
+        name=$(basename $i .bdf)
+        faketime -f "1970-01-01 00:00:01" \
+        fonttosfnt -v -o "$name.otb" "$i"
+    done
   '';
 
-  sha256 = "1ymcbirdbkqaf0xs2y00l0wachb4yxh1fgqm5avqwvccs0lsfj1d";
+  postInstall = ''
+    install -m 644 -D pcf/* -t "$out/share/fonts/misc"
+    install -m 644 -D bdf/* -t "$bdf/share/fonts/misc"
+    install -m 644 -D *.otb -t "$otb/share/fonts/misc"
+    mkfontdir "$out/share/fonts/misc"
+    mkfontdir "$bdf/share/fonts/misc"
+    mkfontdir "$otb/share/fonts/misc"
+  '';
 
-  meta = {
+  outputs = [ "out" "bdf" "otb" ];
+
+  meta = with stdenv.lib; {
     homepage = https://github.com/stark/siji;
     description = "An iconic bitmap font based on Stlarch with additional glyphs";
-    license = lib.licenses.gpl2;
-    platforms = lib.platforms.all;
-    maintainers = [ lib.maintainers.asymmetric ];
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    maintainers = [ maintainers.asymmetric ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8192f56c1be..2a20b46d7e84 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17920,7 +17920,8 @@ in
   inter-ui = callPackage ../data/fonts/inter-ui { };
   inter = callPackage ../data/fonts/inter { };
 
-  siji = callPackage ../data/fonts/siji { };
+  siji = callPackage ../data/fonts/siji
+    { inherit (buildPackages.xorg) mkfontscale fonttosfnt; };
 
   sound-theme-freedesktop = callPackage ../data/misc/sound-theme-freedesktop { };
 

From fa560fb30c30109d35b1d3027e9c2478209e3624 Mon Sep 17 00:00:00 2001
From: Jeff Labonte <grimsleepless@protonmail.com>
Date: Wed, 12 Feb 2020 22:20:28 -0500
Subject: [PATCH 0754/4636] brave: 1.1.23 -> 1.3.115

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

diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index ef0b8ec76190..0a4f3960c185 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -82,11 +82,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "brave";
-  version = "1.1.23";
+  version = "1.3.115";
 
   src = fetchurl {
     url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-    sha256 = "1kb40h5d76k6p338h75p8lxs0cb88jaasss0cmb7bfc7zykfqmd3";
+    sha256 = "1k9g1zjnn0bhyw133padpyym73x8v1i3nm65a040bgkwh6a5jaj8";
   };
 
   dontConfigure = true;

From 9a4a2eb1d21a19330143944fb76b8387f5e6ca41 Mon Sep 17 00:00:00 2001
From: Jeff Labonte <grimsleepless@protonmail.com>
Date: Wed, 12 Feb 2020 22:20:40 -0500
Subject: [PATCH 0755/4636] brave: add jefflabonte to maintainer list

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

diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index 0a4f3960c185..caaecd0ab9f6 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -151,7 +151,7 @@ stdenv.mkDerivation rec {
       contribute to your favorite creators automatically.
     '';
     license = licenses.mpl20;
-    maintainers = with maintainers; [ uskudnik rht ];
+    maintainers = with maintainers; [ uskudnik rht jefflabonte ];
     platforms = [ "x86_64-linux" ];
   };
 }

From 83f3aa011370ceada4856b89c30f5d19c64273d3 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 16 Feb 2020 10:45:52 +1000
Subject: [PATCH 0756/4636] zsh: 5.7.1 -> 5.8

https://www.zsh.org/mla/zsh-announce/141
---
 pkgs/shells/zsh/bracketed-paste-magic.patch | 22 ---------------------
 pkgs/shells/zsh/default.nix                 | 13 +++---------
 2 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/shells/zsh/bracketed-paste-magic.patch

diff --git a/pkgs/shells/zsh/bracketed-paste-magic.patch b/pkgs/shells/zsh/bracketed-paste-magic.patch
deleted file mode 100644
index f22f6489ce7a..000000000000
--- a/pkgs/shells/zsh/bracketed-paste-magic.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/Functions/Zle/bracketed-paste-magic b/Functions/Zle/bracketed-paste-magic
-index 4baae82..840091b 100644
---- a/Functions/Zle/bracketed-paste-magic
-+++ b/Functions/Zle/bracketed-paste-magic
-@@ -162,7 +162,7 @@ bracketed-paste-magic() {
- 
- 	# There are active widgets.  Reprocess $PASTED as keystrokes.
- 	NUMERIC=1
--	zle -U - $PASTED
-+	zle -U - "$PASTED"
- 
- 	# Just in case there are active undo widgets
- 
-@@ -212,7 +212,7 @@ bracketed-paste-magic() {
-     # Arrange to display highlighting if necessary
-     if [[ -z $zle_highlight || -n ${(M)zle_highlight:#paste:*} ]]; then
- 	zle -R
--	zle .read-command && zle -U - $KEYS
-+	zle .read-command && zle -U - "$KEYS"
-     fi
- }
- 
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index 52bd3c71858e..8e050acef1fd 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, pcre, buildPackages }:
 
 let
-  version = "5.7.1";
+  version = "5.8";
 
   documentation = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz";
-    sha256 = "1d1r88n1gfdavx4zy3svl1gljrvzim17jb2r834hafg2a016flrh";
+    sha256 = "1i6wdzq6rfjx5yjrpzan1jf50hk2pfzy5qib9mb7cnnbjfar6klv";
   };
 in
 
@@ -15,16 +15,9 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${version}.tar.xz";
-    sha256 = "1s3yww0mzgvpc48kp0x868mm3gbna42sbgzya0nknj0x5hn2jq3j";
+    sha256 = "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w";
   };
 
-  patches = [
-    # Bracketed-paste-magic error in Putty due to empty $PASTED variable
-    # http://www.zsh.org/mla/workers/2019/msg00808.html
-    # This patch included in the next version
-    ./bracketed-paste-magic.patch
-  ];
-
   buildInputs = [ ncurses pcre ];
 
   configureFlags = [

From b5a6818a7f58e4930e25cfc22e9d06167dc66b62 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 16 Feb 2020 01:50:14 +0100
Subject: [PATCH 0757/4636] tamsyn: generate otb and split output

---
 pkgs/data/fonts/tamsyn/default.nix | 33 +++++++++++++++++-------------
 pkgs/top-level/all-packages.nix    |  2 +-
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/pkgs/data/fonts/tamsyn/default.nix b/pkgs/data/fonts/tamsyn/default.nix
index 380024e7e1a3..10f96b2b17a8 100644
--- a/pkgs/data/fonts/tamsyn/default.nix
+++ b/pkgs/data/fonts/tamsyn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, mkfontdir, mkfontscale }:
+{ stdenv, fetchurl, fontforge, mkfontscale }:
 
 let
   version = "1.11";
@@ -11,27 +11,32 @@ in stdenv.mkDerivation {
     sha256 = "0kpjzdj8sv5871b8827mjgj9dswk75h94jj5iia2bds18ih1pglp";
    };
 
-  nativeBuildInputs = [ mkfontdir mkfontscale ];
+  nativeBuildInputs = [ fontforge mkfontscale ];
 
   unpackPhase = ''
     tar -xzf $src --strip-components=1
   '';
 
-  installPhase = ''
-    # install the pcf fonts (for xorg applications)
-    fontDir="$out/share/fonts/tamsyn"
-    mkdir -p "$fontDir"
-    mv *.pcf "$fontDir"
-    mv *.psf.gz "$fontDir"
+  postBuild = ''
+    # convert pcf fonts to otb
+    for i in *.pcf; do
+      name=$(basename "$i" .pcf)
+      fontforge -lang=ff -c "Open(\"$i\"); Generate(\"$name.otb\")"
+    done
 
-    cd "$fontDir"
-    mkfontdir
-    mkfontscale
+    # compress pcf fonts
+    gzip -n -9 *.pcf
   '';
 
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "13l7ighfmn3kmqmchlksfg8ss22ndjk71rs0f9fn5p5zk7s4dn5x";
+  installPhase = ''
+    install -m 644 -D *.pcf.gz -t "$out/share/fonts/misc"
+    install -m 644 -D *.psf.gz -t "$out/share/consolefonts"
+    install -m 644 -D *.otb    -t "$otb/share/fonts/misc"
+    mkfontdir "$out/share/fonts/misc"
+    mkfontdir "$otb/share/fonts/misc"
+  '';
+
+  outputs = [ "out" "otb" ];
 
   meta = with stdenv.lib; {
     description = "A monospace bitmap font aimed at programmers";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8192f56c1be..1652c0011be5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17951,7 +17951,7 @@ in
 
   inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom;
 
-  tamsyn = callPackage ../data/fonts/tamsyn { };
+  tamsyn = callPackage ../data/fonts/tamsyn { inherit (buildPackages.xorg) mkfontscale; };
 
   tango-icon-theme = callPackage ../data/icons/tango-icon-theme {
     gtk = res.gtk2;

From c05d5fc478ada7a6a5f51beca64e2ab6d514862c Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 17:51:28 -0500
Subject: [PATCH 0758/4636] hyperfine: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/hyperfine/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix
index 1dab11ec27e0..a5b7b81d77c2 100644
--- a/pkgs/tools/misc/hyperfine/default.nix
+++ b/pkgs/tools/misc/hyperfine/default.nix
@@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0jx2lqhayp14c51dfvgmqrmmadyvxf0p4dsn770ndqpzv66rh6zb";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0sqmqfig40ragjx3jvwrng6hqz8l1zbmxzq470lk66x0gy4gziag";
+  cargoSha256 = "0n0hizldhr026mrzzz1wlw4g0b1z6ybxarybq3fzchs722iqpsis";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 

From e66fb0f5a4f5d97494dfd175e78ed54dc757761f Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 19:36:19 -0500
Subject: [PATCH 0759/4636] ncspot: fix build by migrating off legacy
 fetchCargo

Currently broken; see #79975 for details. Would also be fixed by #80153
eventually, but since we want to upgrade either way we might as well do so now.

https://hydra.nixos.org/job/nixpkgs/trunk/ncspot.x86_64-linux
---
 pkgs/applications/audio/ncspot/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix
index 1f9ee8ae334f..0d8fd8e26378 100644
--- a/pkgs/applications/audio/ncspot/default.nix
+++ b/pkgs/applications/audio/ncspot/default.nix
@@ -21,10 +21,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "10jp2yh8jlvdwh297658q9fi3i62vwsbd9fbwjsir7s1c9bgdy8k";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1gw8wvms1ry2shvm3c79wp5nkpc39409af4qfm5hd4wgz2grh8d2";
+  cargoSha256 = "0081wc3xw11hivz0nwy4my3y4a53ch857bq989dr0pm9p2pirvj1";
 
   cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
 

From c292376438a36a5355e3608c4e5a687e46c62789 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 19:14:07 -0500
Subject: [PATCH 0760/4636] silicon: fix build by migrating off legacy
 fetchCargo

Currently broken; see #79975 for details. Would also be fixed by #80153
eventually, but since we want to upgrade either way we might as well do so now.

https://hydra.nixos.org/job/nixpkgs/trunk/silicon.x86_64-linux
---
 pkgs/tools/misc/silicon/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/silicon/default.nix b/pkgs/tools/misc/silicon/default.nix
index 3bf8916f47c2..7fc1a63c5abc 100644
--- a/pkgs/tools/misc/silicon/default.nix
+++ b/pkgs/tools/misc/silicon/default.nix
@@ -25,10 +25,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0j211qrkwgll7rm15dk4fcazmxkcqk2zah0qg2s3y0k7cx65bcxy";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "11b9i1aa36wc7mg2lsvmkiisl23mjkg02xcvlb7zdangwzbv13sq";
+  cargoSha256 = "1i0y3x5rmg27gxrr2lv04sqq7qyiv1bnazfy24l5zgb4akvdg3r5";
 
   buildInputs = [ llvmPackages.libclang expat freetype ]
     ++ lib.optionals stdenv.isLinux [ libxcb ]

From 2227115e788e4420b481a7f909d5caa444ca0e7a Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 19:22:09 -0500
Subject: [PATCH 0761/4636] xprite-editor: fix build by migrating off legacy
 fetchCargo

Currently broken; see #79975 for details. Would also be fixed by #80153
eventually, but since we want to upgrade either way we might as well do so now.

https://hydra.nixos.org/job/nixpkgs/trunk/xprite-editor.x86_64-linux
---
 pkgs/tools/misc/xprite-editor/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/xprite-editor/default.nix b/pkgs/tools/misc/xprite-editor/default.nix
index af2fdc5e1995..3f7e2e32294c 100644
--- a/pkgs/tools/misc/xprite-editor/default.nix
+++ b/pkgs/tools/misc/xprite-editor/default.nix
@@ -29,10 +29,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config python3 ];
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0cd58888l7pjmghin31ha780yhs2pz67b10jysyasdw0a88m0dwy";
+  cargoSha256 = "1a0zy8gfc1gdk8nnv5qr4yspqy1jsip5nql3w74rl6h46cplpf5y";
 
   cargoBuildFlags = [ "--bin" "xprite-native" ];
 

From 855dd87bf3f372de98c392e69f4750b1556e082d Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 18:02:03 -0500
Subject: [PATCH 0762/4636] exa: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/exa/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix
index cfb2c57f7c93..acfbe6bb63c5 100644
--- a/pkgs/tools/misc/exa/default.nix
+++ b/pkgs/tools/misc/exa/default.nix
@@ -8,10 +8,7 @@ buildRustPackage rec {
   pname = "exa";
   version = "0.9.0";
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1hgjp23rjd90wyf0nq6d5akjxdfjlaps54dv23zgwjvkhw24fidf";
+  cargoSha256 = "0nl106jlbr8gnnlbi20mrc6zyww7vxgmw6w34ibndxqh9ggxwfvr";
 
   src = fetchFromGitHub {
     owner = "ogham";

From 4c900027b135786fa021513af3bd2485d6420114 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 17:59:07 -0500
Subject: [PATCH 0763/4636] bat: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/bat/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix
index 666fbd16a883..d8ac90abf87c 100644
--- a/pkgs/tools/misc/bat/default.nix
+++ b/pkgs/tools/misc/bat/default.nix
@@ -14,10 +14,7 @@ rustPlatform.buildRustPackage rec {
     fetchSubmodules = true;
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0d7h0kn41w6wm4w63vjy2i7r19jkansfvfjn7vgh2gqh5m60kal2";
+  cargoSha256 = "17xyb84axkn341nd5rm7jza1lrn8wcnl6jirhyv63r5k6mswy39i";
 
   nativeBuildInputs = [ pkgconfig llvmPackages.libclang installShellFiles makeWrapper ];
 

From 6d881472ef7c6a592eda36c2783130dc03c678b9 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 14 Feb 2020 19:51:05 -0500
Subject: [PATCH 0764/4636] rust: Fix for legacy fetch cargo

See inline comment and #79975 for details.
---
 pkgs/build-support/rust/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index da4d69e1c9ed..3fdfc0636f94 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -45,11 +45,17 @@ let
   # and have vendored deps, check them against the src attr for consistency.
   validateCargoDeps = cargoSha256 != "unset" && !legacyCargoFetcher;
 
+  # Some cargo builds include build hooks that modify their own vendor
+  # dependencies. This copies the vendor directory into the build tree and makes
+  # it writable. If we're using a tarball, the unpackFile hook already handles
+  # this for us automatically.
   setupVendorDir = if cargoVendorDir == null
-    then ''
+    then (''
       unpackFile "$cargoDeps"
       cargoDepsCopy=$(stripHash $cargoDeps)
-    ''
+    '' + stdenv.lib.optionalString legacyCargoFetcher ''
+      chmod -R +w "$cargoDepsCopy"
+    '')
     else ''
       cargoDepsCopy="$sourceRoot/${cargoVendorDir}"
     '';

From 31971254d70802d8c248dedc50882247824c3bb1 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 23:09:32 -0500
Subject: [PATCH 0765/4636] wasm-gc: remove package

The upstream repository has been archived, with a note that this should never be needed:
https://github.com/alexcrichton/wasm-gc

It also happens to have custom patch logic that will fail the newer cargo
verification in #79975
---
 .../interpreters/wasm-gc/default.nix          | 28 ---------------
 .../interpreters/wasm-gc/fix-build.patch      | 34 -------------------
 pkgs/top-level/all-packages.nix               |  4 +--
 3 files changed, 1 insertion(+), 65 deletions(-)
 delete mode 100644 pkgs/development/interpreters/wasm-gc/default.nix
 delete mode 100644 pkgs/development/interpreters/wasm-gc/fix-build.patch

diff --git a/pkgs/development/interpreters/wasm-gc/default.nix b/pkgs/development/interpreters/wasm-gc/default.nix
deleted file mode 100644
index 585a90c505bb..000000000000
--- a/pkgs/development/interpreters/wasm-gc/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
-
-rustPlatform.buildRustPackage rec {
-  pname = "wasm-gc";
-  version = "0.1.6";
-
-  src = fetchFromGitHub {
-    owner = "alexcrichton";
-    repo = "wasm-gc";
-    rev = version;
-    sha256 = "1lc30xxqp3vv1r269xzznh2lf2dzdq89bi5f1vmqjw4yc3xmawm7";
-  };
-
-  cargoPatches = [ ./fix-build.patch ]; # Cargo.lock is not up-to-date
-
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "073dnn80sl4adh7vi6q9sx2vkmy27gxy7ysxz17iz12p7pfcagm2";
-
-  meta = with stdenv.lib; {
-    description = "gc-sections for wasm";
-    homepage = "https://github.com/alexcrichton/wasm-gc";
-    maintainers = with maintainers; [ ekleog ];
-    platforms = platforms.all;
-    license = with licenses; [ mit asl20 ];
-  };
-}
diff --git a/pkgs/development/interpreters/wasm-gc/fix-build.patch b/pkgs/development/interpreters/wasm-gc/fix-build.patch
deleted file mode 100644
index 3144dd898374..000000000000
--- a/pkgs/development/interpreters/wasm-gc/fix-build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 923ed91..71f17c8 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -212,16 +212,16 @@ dependencies = [
- 
- [[package]]
- name = "wasm-gc"
--version = "0.1.1"
-+version = "0.1.6"
- dependencies = [
-  "env_logger 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
-  "getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
-- "wasm-gc-api 0.1.5",
-+ "wasm-gc-api 0.1.6",
- ]
- 
- [[package]]
- name = "wasm-gc-api"
--version = "0.1.5"
-+version = "0.1.6"
- dependencies = [
-  "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "parity-wasm 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -234,7 +234,7 @@ version = "0.1.0"
- dependencies = [
-  "cfg-if 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-  "wasm-bindgen 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
-- "wasm-gc-api 0.1.5",
-+ "wasm-gc-api 0.1.6",
- ]
- 
- [[package]]
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8192f56c1be..9d202271a238 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9506,8 +9506,6 @@ in
 
   proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { };
 
-  wasm-gc = callPackage ../development/interpreters/wasm-gc { };
-
 
   ### DEVELOPMENT / MISC
 
@@ -11488,7 +11486,7 @@ in
   };
 
   gdal = callPackage ../development/libraries/gdal {
-    pythonPackages = python3Packages; 
+    pythonPackages = python3Packages;
   };
 
   gdal_1_11 = callPackage ../development/libraries/gdal/gdal-1_11.nix { };

From 02b760b2a825c95d899bb704b618bfb5fc478efc Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 13 Feb 2020 08:11:59 -0600
Subject: [PATCH 0766/4636] spleen: 1.6.0 -> 1.7.0

---
 pkgs/data/fonts/spleen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix
index 42645fda664d..c3cfec244e3a 100644
--- a/pkgs/data/fonts/spleen/default.nix
+++ b/pkgs/data/fonts/spleen/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "spleen";
-  version = "1.6.0";
+  version = "1.7.0";
 in fetchurl {
   name = "${pname}-${version}";
   url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
@@ -19,7 +19,7 @@ in fetchurl {
     # create fonts.dir so NixOS xorg module adds to fp
     ${mkfontscale}/bin/mkfontdir "$d"
   '';
-  sha256 = "0x1xiw4gyfkyvwqg0f47rl92zq76d0c6jfncdnq8m2wwpxz9697b";
+  sha256 = "17dn6spfr8wv63sy009djb4q12q635m13wsyirzn074qabhr9ggg";
 
   meta = with lib; {
     description = "Monospaced bitmap fonts";

From 71a97479b5dd7e927ac409890eb8d28fc032845c Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 23:33:58 -0500
Subject: [PATCH 0767/4636] cargo-asm: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/development/tools/rust/cargo-asm/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix
index af9f2fa82ffc..9d2279fe5982 100644
--- a/pkgs/development/tools/rust/cargo-asm/default.nix
+++ b/pkgs/development/tools/rust/cargo-asm/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0zn5p95hsmhvk2slc9hakrpvim6l4zbpgkks2x64ndwyfmzyykws";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1k9mc29y4487ssf5whvr8xig7j4jh0rpcrhclp6siw8xamygijdm";
+  cargoSha256 = "1xsfwzn2b7hmb7hwgfa4ss7qfas8957gkw7zys0an9hdj5qr3ywb";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 

From 05764cf5bf033ee6959503ebdf6b116291bacd3b Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 23:54:54 -0500
Subject: [PATCH 0768/4636] cargo-deb: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/package-management/cargo-deb/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-deb/default.nix b/pkgs/tools/package-management/cargo-deb/default.nix
index 6672e31e3020..493633d99f06 100644
--- a/pkgs/tools/package-management/cargo-deb/default.nix
+++ b/pkgs/tools/package-management/cargo-deb/default.nix
@@ -17,10 +17,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0j64dcczxdr9zdch4a241d5adgipzz8sgbw00min9k3p8hbljd9n";
+  cargoSha256 = "0ji6d5a23rzhkkk27iigqcf2zw3mx1p1ap0cryqcj43z5ixdygiw";
 
   meta = with lib; {
     description = "Generate Debian packages from information in Cargo.toml";

From 1ed1ac520174f2628b10ab3d8db1a3a53cc38cfd Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 23:58:50 -0500
Subject: [PATCH 0769/4636] synapse-bt: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/applications/networking/p2p/synapse-bt/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix
index 51ab54b10f92..65cf21c1611c 100644
--- a/pkgs/applications/networking/p2p/synapse-bt/default.nix
+++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "01npv3zwia5d534zdwisd9xfng507adv4qkljf8z0zm0khqqn71a";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0m4jigz6la3mf4yq217849ilcncb7d97mqyw2qicff4rbscdgf6h";
+  cargoSha256 = "0lhhdzq4sadnp2pnbq309d1mb7ggbf24k5ivlchrjhllbim1wmdz";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ openssl ]

From d47970b2f8398e8f24bde8f4427ce338321dfd87 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 22:42:55 -0500
Subject: [PATCH 0770/4636] cargo-bloat: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/development/tools/rust/cargo-bloat/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/development/tools/rust/cargo-bloat/default.nix
index 7e1dffc59760..d9980df02a04 100644
--- a/pkgs/development/tools/rust/cargo-bloat/default.nix
+++ b/pkgs/development/tools/rust/cargo-bloat/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0h535fnmwm1ix08a3ifasppqcm7z4fiwf6kn32vhqqpn7x9vvl53";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1jc1lx0yk8galkyc4a67d39ywsfrgc2sjjsz08p47gpz7228d64w";
+  cargoSha256 = "00j2czhb0ag10hwq7ycdwr2ndb6gz99kg12hlmaq4mkaf8h254nn";
 
   meta = with lib; {
     description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable";

From 2c24c39f272909b9e7263ab6a16fba607050cb76 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 22:39:44 -0500
Subject: [PATCH 0771/4636] cargo-flamegraph: upgrade cargo fetcher and
 cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/development/tools/cargo-flamegraph/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/cargo-flamegraph/default.nix b/pkgs/development/tools/cargo-flamegraph/default.nix
index 836e3adebe30..51cdbcef324b 100644
--- a/pkgs/development/tools/cargo-flamegraph/default.nix
+++ b/pkgs/development/tools/cargo-flamegraph/default.nix
@@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1avjq36wnm0gd5zkkv1c8hj8j51ah1prlifadjhpaf788rsng9w1";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1kmxpzgv24hf66gzyapxy48gzwqi0p0jvzv829sfdlp00qgj1kp4";
+  cargoSha256 = "10cw3qgc39id8rzziamvgm5s3yf8vgqrnx9v15dw9miapz88amcy";
 
   nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
   buildInputs = lib.optionals stdenv.isDarwin [

From c0aca67f7420c682ac6be213b94f15b6728a9a2d Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 22:36:33 -0500
Subject: [PATCH 0772/4636] hydra-cli: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/development/tools/misc/hydra-cli/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/hydra-cli/default.nix b/pkgs/development/tools/misc/hydra-cli/default.nix
index 796fcbafd69b..5cdd9b0ce1d6 100644
--- a/pkgs/development/tools/misc/hydra-cli/default.nix
+++ b/pkgs/development/tools/misc/hydra-cli/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1jdlmc45hwblcxs6hvy3gi2dr7qyzs1sg5zr26jrpxrbvqqzrdhc";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "11y82np52f7lgfzhzs24kkawcfzzc6070x4rj5d6iv5csf6c03ny";
+  cargoSha256 = "1sj80a99iakxxa698gggiszsrxwlwhr2sx4wmsni0cshx6z2x6za";
 
   buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 

From ceb30c490ccb6c7a019b79d856baf4c493fa8af4 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 15 Feb 2020 16:47:46 -0800
Subject: [PATCH 0773/4636] vector: 0.7.1 -> 0.7.2

---
 pkgs/tools/misc/vector/default.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix
index cdc3a90f3726..2e01059b7366 100644
--- a/pkgs/tools/misc/vector/default.nix
+++ b/pkgs/tools/misc/vector/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, rustPlatform
-, openssl, pkgconfig, protobuf
+, openssl, pkg-config, protobuf
 , Security, libiconv, rdkafka
 
 , features ?
@@ -10,20 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "vector";
-  version = "0.7.1";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
     owner  = "timberio";
     repo   = pname;
-    rev    = "refs/tags/v${version}";
-    sha256 = "1bqp1ms8y91mpcmxlc8kyncigxq7spxq1ygy6gviz35zq1cqkwnr";
+    rev    = "v${version}";
+    sha256 = "1r6pqljrl0cqz5x09p6bmf4h52h8m02pg05a09idj86v0c0q6bw3";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "01hynn8ccpwqrirr1bczqc7q7pqkzfjks2v6q4f32xbm50b31fky";
-  buildInputs = [ openssl pkgconfig protobuf rdkafka ]
+  cargoSha256 = "1c742g7a4z5lhr991hxdhwk8h0d43r4vv5bxj80sf3lynyx60yzf";
+  buildInputs = [ openssl pkg-config protobuf rdkafka ]
                 ++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv ];
 
   # needed for internal protobuf c wrapper library
@@ -31,7 +28,8 @@ rustPlatform.buildRustPackage rec {
   PROTOC_INCLUDE="${protobuf}/include";
 
   cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
-  checkPhase = ":"; # skip tests, too -- they don't respect the rdkafka flag...
+  # skip tests, too -- they don't respect the rdkafka flag...
+  doCheck = false;
 
   meta = with stdenv.lib; {
     description = "A high-performance logs, metrics, and events router";

From 131a32a5afdb72063704a8407332f747af619319 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 01:06:59 -0500
Subject: [PATCH 0774/4636] rust: update docs on legacyCargoFetcher; remove
 unnecessary defaults

As mentioned in #79975, the default on `legacyCargoFetcher` if left unspecified
is now `false`.
---
 doc/languages-frameworks/rust.section.md        | 17 +++--------------
 pkgs/applications/audio/spotify-tui/default.nix |  4 +---
 pkgs/applications/audio/spotifyd/default.nix    |  2 --
 pkgs/applications/editors/hexdino/default.nix   |  1 -
 .../git-and-tools/git-workspace/default.nix     |  2 --
 .../tools/documentation/mdsh/default.nix        |  1 -
 pkgs/tools/misc/broot/default.nix               |  1 -
 pkgs/tools/misc/wagyu/default.nix               |  1 -
 .../package-management/cargo-tree/default.nix   |  3 +--
 .../tools/package-management/nix-du/default.nix |  3 ++-
 pkgs/tools/security/fido2luks/default.nix       |  1 -
 pkgs/tools/system/tre-command/default.nix       |  1 -
 12 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 6f0ec7c05144..099872fba13d 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -37,7 +37,6 @@ rustPlatform.buildRustPackage rec {
   };
 
   cargoSha256 = "17ldqr3asrdcsh4l29m3b5r37r5d0b3npq1lrgjmxb6vlx6a36qh";
-  legacyCargoFetcher = false;
 
   meta = with stdenv.lib; {
     description = "A fast line-oriented regex search tool, similar to ag and ack";
@@ -59,19 +58,9 @@ When the `Cargo.lock`, provided by upstream, is not in sync with the
 added in `cargoPatches` will also be prepended to the patches in `patches` at
 build-time.
 
-Setting `legacyCargoFetcher` to `false` enables the following behavior:
-
-1. The `Cargo.lock` file is copied into the cargo vendor directory.
-2. At buildtime, `buildRustPackage` will ensure that the `src` and `cargoSha256`
-   are consistent. This avoids errors where one but not the other is updated.
-3. The builder will compress the vendored cargo src directory into a tar.gz file
-   for storage after vendoring, and decompress it before the build. This saves
-   disk space and enables hashed mirrors for Rust dependencies.
-
-Note that this option changes the value of `cargoSha256`, so it is currently
-defaulted to `false`. When updating a Rust package, please set it to `true`;
-eventually we will default this to true and update the remaining Rust packages,
-then delete the option from all individual Rust package expressions.
+Unless `legacyCargoFetcher` is set to `true`, the fetcher will also verify that
+the `Cargo.lock` file is in sync with the `src` attribute, and will compress the
+vendor directory into a tar.gz archive.
 
 ### Building a crate for a different target
 
diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix
index a6af8c5208e5..db54055def40 100644
--- a/pkgs/applications/audio/spotify-tui/default.nix
+++ b/pkgs/applications/audio/spotify-tui/default.nix
@@ -11,13 +11,11 @@ rustPlatform.buildRustPackage rec {
     sha256 = "06xqj83m4hz00p8796m0df7lv9875p8zc1v6l9yqbiak1h95lq7h";
   };
 
-  legacyCargoFetcher = false;
-
   cargoSha256 = "1pc4n6lm1w0660ivm0kxzicpckvb351y62dpv0cxa7ckd3raa5pr";
 
   nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ];
   buildInputs = [ openssl ]
-  	++ stdenv.lib.optional stdenv.isLinux libxcb
+    ++ stdenv.lib.optional stdenv.isLinux libxcb
     ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix
index e61a2879d474..263fe986df31 100644
--- a/pkgs/applications/audio/spotifyd/default.nix
+++ b/pkgs/applications/audio/spotifyd/default.nix
@@ -15,8 +15,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "08i0zm7kgprixqjpgaxk7xid1njgj6lmi896jf9fsjqzdzlblqk8";
   };
 
-  legacyCargoFetcher = false;
-
   cargoSha256 = "0200apqbx769ggjnjr0m72g61ikhml2xak5n1il2pvfx1yf5nw0n";
 
   cargoBuildFlags = [
diff --git a/pkgs/applications/editors/hexdino/default.nix b/pkgs/applications/editors/hexdino/default.nix
index 91f048320a72..48cd58570f8a 100644
--- a/pkgs/applications/editors/hexdino/default.nix
+++ b/pkgs/applications/editors/hexdino/default.nix
@@ -12,7 +12,6 @@ rustPlatform.buildRustPackage {
   };
 
   cargoSha256 = "06ghcd4j751mdkzwb88nqwk8la4zdb137y0iqrkpykkfx0as43x3";
-  legacyCargoFetcher = false;
 
   buildInputs = [ ncurses ];
 
diff --git a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix
index 61e3e1e3eef0..b93163e239ad 100644
--- a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix
@@ -17,8 +17,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1z4cb7rcb7ldj16xxynrjh4hg872rj39rbbp0vy15kdp3ifyi466";
 
-  legacyCargoFetcher = false;
-
   buildInputs = with stdenv; lib.optional isDarwin Security;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix
index ddce5bc29a43..714ea15cd61e 100644
--- a/pkgs/development/tools/documentation/mdsh/default.nix
+++ b/pkgs/development/tools/documentation/mdsh/default.nix
@@ -12,7 +12,6 @@ rustPlatform.buildRustPackage rec {
   };
 
   cargoSha256 = "1fxajh1n0qvcdas6w7dy3g92wilhfldy90pyk3779mrnh57fa6n5";
-  legacyCargoFetcher = false;
 
   meta = with stdenv.lib; {
     description = "Markdown shell pre-processor";
diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix
index df26423c6331..572bee3d2621 100644
--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@@ -12,7 +12,6 @@ rustPlatform.buildRustPackage rec {
   };
 
   cargoSha256 = "0zrwpmsrzwnjml0964zky8w222zmlargha3z0n6hf8cfshx23s4k";
-  legacyCargoFetcher = false;
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/tools/misc/wagyu/default.nix b/pkgs/tools/misc/wagyu/default.nix
index 53e098495226..f21db2c4b4fc 100644
--- a/pkgs/tools/misc/wagyu/default.nix
+++ b/pkgs/tools/misc/wagyu/default.nix
@@ -12,7 +12,6 @@ rustPlatform.buildRustPackage rec {
   };
 
   cargoSha256 = "16d1b3pamkg29nq80n6cbzc4zl9z3cgfvdxjkr2z4xrnzmkn1ysi";
-  legacyCargoFetcher = false;
 
   meta = with lib; {
     description = "Rust library for generating cryptocurrency wallets";
diff --git a/pkgs/tools/package-management/cargo-tree/default.nix b/pkgs/tools/package-management/cargo-tree/default.nix
index 4e5fa69aec90..2e0207e01ed3 100644
--- a/pkgs/tools/package-management/cargo-tree/default.nix
+++ b/pkgs/tools/package-management/cargo-tree/default.nix
@@ -1,4 +1,5 @@
 { stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, cmake, curl, libiconv, darwin }:
+
 rustPlatform.buildRustPackage rec {
   pname = "cargo-tree";
   version = "0.29.0";
@@ -10,8 +11,6 @@ rustPlatform.buildRustPackage rec {
     sha256 = "16k41pj66m2221n1v2szir7x7qwx4i0g3svck2c8cj76h0bqyy15";
   };
 
-  legacyCargoFetcher = false;
-
   cargoSha256 = "0762gdj4n5mlflhzynnny1h8z792zyxmb4kcn54jj7qzdask4qdy";
 
   nativeBuildInputs = [ pkgconfig cmake ];
diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix
index 908f31b93abe..6ee7dee33f67 100644
--- a/pkgs/tools/package-management/nix-du/default.nix
+++ b/pkgs/tools/package-management/nix-du/default.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz, darwin }:
+
 rustPlatform.buildRustPackage rec {
   pname = "nix-du";
   version = "0.3.1";
@@ -9,8 +10,8 @@ rustPlatform.buildRustPackage rec {
     rev = "v${version}";
     sha256 = "149d60mid29s5alv5m3d7jrhyzc6cj7b6hpiq399gsdwzgxr00wq";
   };
+
   cargoSha256 = "1a6svl89dcdb5fpvs2i32i6agyhl0sx7kkkw70rqr17fyzl5psai";
-  legacyCargoFetcher = false;
 
   doCheck = true;
   checkInputs = [ graphviz ];
diff --git a/pkgs/tools/security/fido2luks/default.nix b/pkgs/tools/security/fido2luks/default.nix
index ea911e467340..729a3f7297cb 100644
--- a/pkgs/tools/security/fido2luks/default.nix
+++ b/pkgs/tools/security/fido2luks/default.nix
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ pkg-config ];
 
   cargoSha256 = "0rp4f6xnwmvf3pv6h0qwsg01jrndf77yn67675ac39kxzmrzfy2f";
-  legacyCargoFetcher = false;
 
   meta = with stdenv.lib; {
     description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator";
diff --git a/pkgs/tools/system/tre-command/default.nix b/pkgs/tools/system/tre-command/default.nix
index b8925dcfa42e..0cbe87ccd377 100644
--- a/pkgs/tools/system/tre-command/default.nix
+++ b/pkgs/tools/system/tre-command/default.nix
@@ -12,7 +12,6 @@ rustPlatform.buildRustPackage rec {
   };
 
   cargoSha256 = "1m3ccp5ncafkifg8sxyxczsg3ja1gvq8wmgni68bgzm2lwxh2qgw";
-  legacyCargoFetcher = false;
 
   meta = with stdenv.lib; {
     description = "Tree command, improved";

From ecdff9225be5f36dd1a14aa82aea423a2f4a840a Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 22:49:00 -0500
Subject: [PATCH 0775/4636] evcxr: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/development/interpreters/evcxr/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix
index 6aa7897c95b8..fa8050a21ff0 100644
--- a/pkgs/development/interpreters/evcxr/default.nix
+++ b/pkgs/development/interpreters/evcxr/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0vkcis06gwsqfwvrl8xcf74mfcs6j77b9fhcz5rrh77mwl7ixsdc";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "04wffj2y9pqyk0x3y6ghp06pggmxnk2h245iabqq0mpwx36fd8b6";
+  cargoSha256 = "0pamwqhw3sj4anqc1112l5cayhqzibdhqjc28apfrkf2m63cclzi";
 
   nativeBuildInputs = [ pkgconfig makeWrapper cmake ];
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;

From 94f62695d1911ee87843651a403039ea747763f3 Mon Sep 17 00:00:00 2001
From: tbenst <lensman@tylerbenster.com>
Date: Sun, 24 Nov 2019 16:14:12 -0800
Subject: [PATCH 0776/4636] pythonPackages.mlflow: init at 1.4.0

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

diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix
new file mode 100644
index 000000000000..8eb0ca7c6b8e
--- /dev/null
+++ b/pkgs/development/python-modules/mlflow/default.nix
@@ -0,0 +1,69 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, alembic
+, click
+, cloudpickle
+, requests
+, six
+, flask
+, numpy
+, pandas
+, python-dateutil
+, protobuf
+, GitPython
+, pyyaml
+, querystring_parser
+, simplejson
+, docker
+, databricks-cli
+, entrypoints
+, sqlparse
+, sqlalchemy
+, gorilla
+, gunicorn
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "mlflow";
+  version = "1.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "9116d82be380c32fa465049d14b217c4c200ad11614f4c6674e6b524b2935206";
+  };
+
+  # run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config
+  # also, tests use conda so can't run on NixOS without buildFHSUserEnv
+  doCheck = false;
+
+  propagatedBuildInputs = [
+    alembic
+    click
+    cloudpickle
+    requests
+    six
+    flask
+    numpy
+    pandas
+    python-dateutil
+    protobuf
+    GitPython
+    pyyaml
+    querystring_parser
+    simplejson
+    docker
+    databricks-cli
+    entrypoints
+    sqlparse
+    sqlalchemy
+    gorilla
+    gunicorn
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/mlflow/mlflow";
+    description = "Open source platform for the machine learning lifecycle";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ tbenst ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e000a4a8d5f7..c27b05d8a1ab 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2929,6 +2929,8 @@ in {
 
   mlrose = callPackage ../development/python-modules/mlrose { };
 
+  mlflow = callPackage ../development/python-modules/mlflow { };
+
   mt-940 = callPackage ../development/python-modules/mt-940 { };
 
   mwlib = callPackage ../development/python-modules/mwlib { };

From 07bb282c842bbbb683406be896f4732ea56aee8e Mon Sep 17 00:00:00 2001
From: Tyler Benster <tbenst@gmail.com>
Date: Sun, 24 Nov 2019 17:04:13 -0800
Subject: [PATCH 0777/4636] pythonPackages.querystring_parser: init at 1.2.4

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

diff --git a/pkgs/development/python-modules/querystring-parser/default.nix b/pkgs/development/python-modules/querystring-parser/default.nix
new file mode 100644
index 000000000000..f9d04a8f797c
--- /dev/null
+++ b/pkgs/development/python-modules/querystring-parser/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, fetchPypi, python, isPy27
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "querystring_parser";
+  version = "1.2.4";
+  disabled = isPy27;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "644fce1cffe0530453b43a83a38094dbe422ccba8c9b2f2a1c00280e14ca8a62";
+  };
+
+  propagatedBuildInputs = [
+    six
+  ];
+
+  checkPhase = "${python.interpreter} querystring_parser/tests.py -k 'not test_parse_normalized'";
+  # one test fails due to https://github.com/bernii/querystring-parser/issues/35
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/bernii/querystring-parser";
+    description = "QueryString parser for Python/Django that correctly handles nested dictionaries";
+    license = licenses.mit;
+    maintainers = with maintainers; [ tbenst ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c27b05d8a1ab..9399fdd0cbd6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5264,6 +5264,8 @@ in {
   # alias for an older package which did not support Python 3
   Quandl = callPackage ../development/python-modules/quandl { };
 
+  querystring_parser = callPackage ../development/python-modules/querystring-parser { };
+
   qscintilla-qt4 = callPackage ../development/python-modules/qscintilla { };
 
   qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 {

From 7a49699a30d3e35b84f8f356d12194748fd868ce Mon Sep 17 00:00:00 2001
From: Tyler Benster <tbenst@gmail.com>
Date: Sun, 24 Nov 2019 18:43:23 -0800
Subject: [PATCH 0778/4636] pythonPackages.gorilla: init at 0.3.0

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

diff --git a/pkgs/development/python-modules/gorilla/default.nix b/pkgs/development/python-modules/gorilla/default.nix
new file mode 100644
index 000000000000..d93cddee765e
--- /dev/null
+++ b/pkgs/development/python-modules/gorilla/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, buildPythonPackage, fetchPypi}:
+
+buildPythonPackage rec {
+  pname = "gorilla";
+  version = "0.3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "feb2899b923935c25420b94aa8c266ccb5c0315199c685b725303a73195d802c";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/christophercrouzet/gorilla";
+    description = "Convenient approach to monkey patching";
+    license = licenses.mit;
+    maintainers = with maintainers; [ tbenst ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9399fdd0cbd6..c86d1afdc1e3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3777,6 +3777,8 @@ in {
 
   google_resumable_media = callPackage ../development/python-modules/google_resumable_media { };
 
+  gorilla = callPackage ../development/python-modules/gorilla { };
+
   gpgme = toPythonModule (pkgs.gpgme.override {
     pythonSupport = true;
     inherit python;

From 5c20a955d7d84674da291a117052aaf456f24798 Mon Sep 17 00:00:00 2001
From: Tyler Benster <tbenst@gmail.com>
Date: Sun, 24 Nov 2019 19:11:12 -0800
Subject: [PATCH 0779/4636] pythonPackages.databricks-cli: init at 0.9.1

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

diff --git a/pkgs/development/python-modules/databricks-cli/default.nix b/pkgs/development/python-modules/databricks-cli/default.nix
new file mode 100644
index 000000000000..9dd061065437
--- /dev/null
+++ b/pkgs/development/python-modules/databricks-cli/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, click
+, requests
+, tabulate
+, six
+, configparser
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "databricks-cli";
+  version = "0.9.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1ebf123b5567c06b7583688077120ead075ca06938b9995d4acafa97863ed8ff";
+  };
+
+  checkInputs = [
+    pytest
+  ];
+
+  checkPhase = "pytest tests";
+  # tests folder is missing in PyPI
+  doCheck = false;
+
+  propagatedBuildInputs = [
+    click
+    requests
+    tabulate
+    six
+    configparser
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/databricks/databricks-cli";
+    description = "A command line interface for Databricks";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ tbenst ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c86d1afdc1e3..9dfa595f231b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -574,6 +574,8 @@ in {
 
   btchip = callPackage ../development/python-modules/btchip { };
 
+  databricks-cli = callPackage ../development/python-modules/databricks-cli { };
+
   datatable = callPackage ../development/python-modules/datatable {
     inherit (pkgs.llvmPackages) openmp libcxx libcxxabi;
   };

From a35a2806db517f2a8db0a6ca0e9729690ba92cf1 Mon Sep 17 00:00:00 2001
From: tbenst <lensman@tylerbenster.com>
Date: Mon, 6 Jan 2020 15:59:25 -0800
Subject: [PATCH 0780/4636] mlflow-server: init at 1.4.0

---
 .../python-modules/mlflow/default.nix         |  3 +-
 pkgs/servers/mlflow-server/default.nix        | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/servers/mlflow-server/default.nix

diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix
index 8eb0ca7c6b8e..5aaeb09b894d 100644
--- a/pkgs/development/python-modules/mlflow/default.nix
+++ b/pkgs/development/python-modules/mlflow/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ stdenv, buildPythonPackage, fetchPypi, isPy27
 , alembic
 , click
 , cloudpickle
@@ -26,6 +26,7 @@
 buildPythonPackage rec {
   pname = "mlflow";
   version = "1.4.0";
+  disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
diff --git a/pkgs/servers/mlflow-server/default.nix b/pkgs/servers/mlflow-server/default.nix
new file mode 100644
index 000000000000..eb99fffeb169
--- /dev/null
+++ b/pkgs/servers/mlflow-server/default.nix
@@ -0,0 +1,37 @@
+{lib, python3, writeText}:
+
+let
+  py = python3.pkgs;
+in
+py.toPythonApplication 
+  (py.mlflow.overridePythonAttrs(old: rec {
+    pname = "mlflow-server";
+
+    propagatedBuildInputs = old.propagatedBuildInputs ++ [
+      py.boto3
+      py.mysqlclient
+    ];
+
+    postPatch = ''
+      substituteInPlace mlflow/utils/process.py --replace \
+        "child = subprocess.Popen(cmd, env=cmd_env, cwd=cwd, universal_newlines=True," \
+        "cmd[0]='$out/bin/gunicornMlflow'; child = subprocess.Popen(cmd, env=cmd_env, cwd=cwd, universal_newlines=True,"
+    '';
+
+    gunicornScript = writeText "gunicornMlflow"
+    ''
+        #!/usr/bin/env python
+        import re
+        import sys
+        from gunicorn.app.wsgiapp import run
+        if __name__ == '__main__':
+          sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', ''', sys.argv[0])
+          sys.exit(run())
+      '';
+
+    postInstall = ''
+      gpath=$out/bin/gunicornMlflow
+      cp ${gunicornScript} $gpath
+      chmod 555 $gpath
+    '';
+}))
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8192f56c1be..fda84f4ac4fd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15385,6 +15385,8 @@ in
 
   miniHttpd = callPackage ../servers/http/mini-httpd {};
 
+  mlflow-server = callPackage ../servers/mlflow-server { };
+  
   mlmmj = callPackage ../servers/mail/mlmmj { };
 
   moodle = callPackage ../servers/web-apps/moodle { };

From 777c1dda593dd4e2fe5356984ef0b0384ac70633 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 23:00:39 -0500
Subject: [PATCH 0781/4636] cargo-sweep: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/development/tools/rust/cargo-sweep/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/pkgs/development/tools/rust/cargo-sweep/default.nix
index 0b51b5b4f508..8bebaf24d478 100644
--- a/pkgs/development/tools/rust/cargo-sweep/default.nix
+++ b/pkgs/development/tools/rust/cargo-sweep/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0zwdrh4z5x79qs8cwmwh3phzy4brw0ggv2qyf6pylv99vha5acyf";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "09n0s275iskvg0n3gxbl47qfw00wfpvxyrf2iakkznyxjgbaxh4l";
+  cargoSha256 = "1sxjc64g8h77a3dvzb99f1f72zrak1nh4jgfjfkw4yc4dhkpyrmz";
 
   meta = with stdenv.lib; {
     description = "A Cargo subcommand for cleaning up unused build files generated by Cargo";

From e90602b8f2f4c1a8a5064daac0f16b00bf9958e0 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 23:02:14 -0500
Subject: [PATCH 0782/4636] wasmer: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/development/interpreters/wasmer/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix
index 5fb60fd9bdb6..37baf241db65 100644
--- a/pkgs/development/interpreters/wasmer/default.nix
+++ b/pkgs/development/interpreters/wasmer/default.nix
@@ -18,10 +18,7 @@ rustPlatform.buildRustPackage rec {
     fetchSubmodules = true;
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1yp7kandh5hh8hkzlmqpj05vwgr5v4nil8blf3scbppg865qk3rq";
+  cargoSha256 = "101y3zcnbl0w0zv2k0bhqk5d0xj8m2h6ww9r366j9b1y54cqj4b7";
 
   nativeBuildInputs = [ cmake pkg-config ];
 

From 07de65920753d472d74cbc728e82cf4ece64d9fe Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 23:04:11 -0500
Subject: [PATCH 0783/4636] sccache: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/development/tools/misc/sccache/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix
index fd3c8ec1ec8f..140b7679ab2c 100644
--- a/pkgs/development/tools/misc/sccache/default.nix
+++ b/pkgs/development/tools/misc/sccache/default.nix
@@ -10,10 +10,7 @@ rustPlatform.buildRustPackage rec {
     rev = version;
     sha256 = "1yd3rfp032crwlmfn2p3z12f67q7bxm78fhvdlc7azm2a4hkif4k";
   };
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1bkglgrasyjyzjj9mwm32d3g3mg5yv74jj3zl7jf20dlq3rg3fh6";
+  cargoSha256 = "17i3m7hj7kvdbicabmz2wl3g6s6c8lcyi3pririkq77jxm87shfh";
 
   cargoBuildFlags = [ "--features=all" ];
   nativeBuildInputs = [

From f5578dc61d0361332e19ab95bbfb0ce9b6aa5271 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 23:02:52 -0500
Subject: [PATCH 0784/4636] cargo-expand: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/development/tools/rust/cargo-expand/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix
index 5a4e6bb60521..a799fc0bec27 100644
--- a/pkgs/development/tools/rust/cargo-expand/default.nix
+++ b/pkgs/development/tools/rust/cargo-expand/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "043adbvc1slswwygibgghfl2ryry3ja1x3zjz39qqv63f81pd5id";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1dasyyy2nkr4i5nhlzlwij3b972h2a43j94kvlbc9kvnnb44aymn";
+  cargoSha256 = "0kwpc62nwjjhlh3rd5d27sjv0p53q5gj0gky9xx9khxy8xazbh91";
 
   buildInputs = [ llvmPackages.libclang ]
     ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;

From 1c36f69b08b9cef2cb1e87eab02b53a7783fc0f9 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 23:11:43 -0500
Subject: [PATCH 0785/4636] texlab: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/development/tools/misc/texlab/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix
index d98a4018867f..be3a6d47a159 100644
--- a/pkgs/development/tools/misc/texlab/default.nix
+++ b/pkgs/development/tools/misc/texlab/default.nix
@@ -15,10 +15,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "12zfcvbihirh38xxzc8fbx293m4vsrhq6kh0qnhnhlrx75m09l9i";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "11labj3zf7ahbly1ylwliqhxzydbxz9w8z991575daj7a2nbw1q0";
+  cargoSha256 = "08fi0c4s0d1p2rqxvj1y82zg6xl3n0ikgyhgrjwh6xay8f0121f0";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
 

From d4212f7036fa8016ba1451246e7a9c1b7ca4e453 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sun, 16 Feb 2020 08:19:23 +0100
Subject: [PATCH 0786/4636] softmaker-office: 972 -> 974

Changelog:
https://www.softmaker.com/en/servicepacks-office-changelog
---
 pkgs/applications/office/softmaker/softmaker_office.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/softmaker/softmaker_office.nix b/pkgs/applications/office/softmaker/softmaker_office.nix
index 73a7d9bd35bc..ed4903d64743 100644
--- a/pkgs/applications/office/softmaker/softmaker_office.nix
+++ b/pkgs/applications/office/softmaker/softmaker_office.nix
@@ -2,13 +2,13 @@
 
 callPackage ./generic.nix (args // rec {
   pname = "softmaker-office";
-  version = "972";
+  version = "974";
   edition = "2018";
   suiteName = "SoftMaker Office";
 
   src = fetchurl {
     url = "https://www.softmaker.net/down/softmaker-office-${edition}-${version}-amd64.tgz";
-    sha256 = "06kgkmqg5269a4vm14i89mw8m1x9yy9ajw0dhfcvjizadyzmlqn1";
+    sha256 = "0z1g76lhja92s25x6y0h55wmqza2d3pjbshn5b9rn2784gjgj7hn";
   };
 
   archive = "office${edition}.tar.lzma";

From 555df1fddcff7792dbb601d9916946cb97287ccd Mon Sep 17 00:00:00 2001
From: matthuszagh <huszaghmatt@gmail.com>
Date: Sat, 15 Feb 2020 23:30:13 -0800
Subject: [PATCH 0787/4636] perlPackages.LaTeXML: init at 0.8.4 (#80193)

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7a34d1f8ee6a..562e96246bf0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9759,6 +9759,28 @@ let
     };
   };
 
+  LaTeXML = buildPerlPackage {
+    pname = "LaTeXML";
+    version = "0.8.4";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/B/BR/BRMILLER/LaTeXML-0.8.4.tar.gz";
+      sha256 = "92599b45fb587ac14b2ba9cc84b85d9ddc2deaf1cbdc2e89e7a6559e1fbb34cc";
+    };
+    propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent TextUnidecode URI XMLLibXML XMLLibXSLT shortenPerlShebang ];
+    doCheck = false;  # epub test fails
+    postInstall = ''
+      shortenPerlShebang $out/bin/latexml
+      shortenPerlShebang $out/bin/latexmlc
+      shortenPerlShebang $out/bin/latexmlfind
+      shortenPerlShebang $out/bin/latexmlmath
+      shortenPerlShebang $out/bin/latexmlpost
+    '';
+    meta = {
+      description = "Transforms TeX and LaTeX into XML/HTML/MathML";
+      license = stdenv.lib.licenses.free;
+    };
+  };
+
   libapreq2 = buildPerlPackage {
     pname = "libapreq2";
     version = "2.13";

From 452f481853f3cbec428f125d5292a6b785a447ec Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 10 Feb 2020 18:41:20 +0000
Subject: [PATCH 0788/4636] vim: 8.2.0013 -> 8.2.0227

---
 pkgs/applications/editors/vim/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 485f1d0dca3d..e5ee1da75801 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "8.2.0013";
+  version = "8.2.0227";
 
   src = fetchFromGitHub {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    sha256 = "00sc9zdjdww6f3svwf0nxpx8q2zp1n1r978h7ijapgvn2ysx2z1f";
+    sha256 = "1yi7l2yd214iv6i8pr52m272mlzps5v3h6xdgr1770xfz4y1yc0h";
   };
 
   enableParallelBuilding = true;

From 4496f8f4b82d51fd3157836d64fa5266ea767e85 Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Mon, 13 Jan 2020 15:59:01 +0100
Subject: [PATCH 0789/4636] fontforge: 20190413 -> 20190801

- Init libuninameslist at 20190701 as it is a new dependency to fontforge
- Remove gnulib, as it is not used anymore
- Remove a non-applying patch
- Add myself as maintainer
---
 .../libraries/libuninameslist/default.nix     | 28 +++++++++++++++++
 pkgs/tools/misc/fontforge/default.nix         | 17 +++++-----
 ...fontforge-20140813-use-system-uthash.patch | 31 -------------------
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 37 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/development/libraries/libuninameslist/default.nix
 delete mode 100644 pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch

diff --git a/pkgs/development/libraries/libuninameslist/default.nix b/pkgs/development/libraries/libuninameslist/default.nix
new file mode 100644
index 000000000000..5d4cc61fe7ac
--- /dev/null
+++ b/pkgs/development/libraries/libuninameslist/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, fetchFromGitHub
+, autoreconfHook
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libuninameslist";
+  version = "20190701";
+
+  src = fetchFromGitHub {
+    owner = "fontforge";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256:034c8clnskvqbwyiq7si4dad1kbngi3jmnrj064i39msqixmpdzb";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/fontforge/libuninameslist/;
+    description = "A Library of Unicode names and annotation data";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ erictapen ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix
index 6239e8395981..635d786da53a 100644
--- a/pkgs/tools/misc/fontforge/default.nix
+++ b/pkgs/tools/misc/fontforge/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, lib
-, autoconf, automake, gnum4, libtool, perl, gnulib, uthash, pkgconfig, gettext
+, autoconf, automake, gnum4, libtool, perl, uthash, pkgconfig, gettext
 , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, cairo, pango
-, readline, woff2, zeromq
+, readline, woff2, zeromq, libuninameslist
 , withSpiro ? false, libspiro
 , withGTK ? false, gtk2
 , withPython ? true
@@ -11,15 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fontforge";
-  version = "20190413";
+  version = "20190801";
 
   src = fetchurl {
     url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}.tar.gz";
-    sha256 = "05v640mnk4fy4jzmxb6c4n4qm800x7hy4sl5gcdgzmm3md2s0qk7";
+    sha256 = "0lh8yx01asbzxm6car5cfi64njh5p4lxc7iv8dldr5rwg357a86r";
   };
 
-  patches = [ ./fontforge-20140813-use-system-uthash.patch ];
-
   # use $SOURCE_DATE_EPOCH instead of non-deterministic timestamps
   postPatch = ''
     find . -type f -name '*.c' -exec sed -r -i 's#\btime\(&(.+)\)#if (getenv("SOURCE_DATE_EPOCH")) \1=atol(getenv("SOURCE_DATE_EPOCH")); else &#g' {} \;
@@ -34,7 +32,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig autoconf automake gnum4 libtool perl gettext ];
   buildInputs = [
-    readline uthash woff2 zeromq
+    readline uthash woff2 zeromq libuninameslist
     python freetype zlib glib libungif libpng libjpeg libtiff libxml2
   ]
     ++ lib.optionals withSpiro [libspiro]
@@ -53,9 +51,7 @@ stdenv.mkDerivation rec {
     export SOURCE_DATE_EPOCH=$(date -d ${version} +%s)
 
     export GIT="$(type -P true)"
-    cp -r "${gnulib}" ./gnulib
-    chmod +w -R ./gnulib
-    ./bootstrap --skip-git --gnulib-srcdir=./gnulib --force
+    ./bootstrap --skip-git --force
   '';
 
   doCheck = false; # tries to wget some fonts
@@ -74,5 +70,6 @@ stdenv.mkDerivation rec {
     homepage = http://fontforge.github.io;
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.erictapen ];
   };
 }
diff --git a/pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch b/pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch
deleted file mode 100644
index fb53c619b2bc..000000000000
--- a/pkgs/tools/misc/fontforge/fontforge-20140813-use-system-uthash.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/Makefile.am.old	2014-08-12 10:07:32.000000000 +0530
-+++ b/Makefile.am	2014-09-08 16:23:56.046996941 +0530
-@@ -43,7 +43,6 @@
- AM_CPPFLAGS =
- AM_LDFLAGS =
- 
--BUILT_SOURCES = uthash/src
- EXTRA_DIST =
- CLEANFILES =
- MOSTLYCLEANFILES =
-@@ -113,8 +112,7 @@
- 	Packaging/FontForge-doc.spec \
- 	Packaging/FontForge.spec \
- 	Packaging/FontForge.static.spec \
- 	README \
--	uthash/src \
- 	$(NULL)
- 
- #--------------------------------------------------------------------------
-@@ -129,11 +127,6 @@
- 
- 
- #--------------------------------------------------------------------------
--uthash/src:
--	if [ ! -e uthash/src ]; then \
--	if [ -e uthash ] ; then rm -r uthash ; fi ; \
--	git clone https://github.com/troydhanson/uthash ; \
--	fi ;
- 
- # We import a selection of targets from Frank's standard packaging Makefile.
- 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 88ce26c91e85..731c6009b547 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13072,6 +13072,8 @@ in
 
   libunibreak = callPackage ../development/libraries/libunibreak { };
 
+  libuninameslist = callPackage ../development/libraries/libuninameslist { };
+
   libunique = callPackage ../development/libraries/libunique { };
   libunique3 = callPackage ../development/libraries/libunique/3.x.nix { };
 

From 40971eca7b98779b5471afcef0de139bf1822171 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 8 Feb 2020 12:17:29 +0000
Subject: [PATCH 0790/4636] http-parser: 2.9.2 -> 2.9.3

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

diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix
index 4b1a695ca551..7c3b313dd60b 100644
--- a/pkgs/development/libraries/http-parser/default.nix
+++ b/pkgs/development/libraries/http-parser/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 let
-  version = "2.9.2";
+  version = "2.9.3";
 in stdenv.mkDerivation {
   pname = "http-parser";
   inherit version;
@@ -10,7 +10,7 @@ in stdenv.mkDerivation {
     owner = "nodejs";
     repo = "http-parser";
     rev = "v${version}";
-    sha256 = "1qs6x3n2nrcj1wiik5pg5i16inykf7rcfdfdy7rwyzf40pvdl3c2";
+    sha256 = "189zi61vczqgmqjd2myjcjbbi5icrk7ccs0kn6nj8hxqiv5j3811";
   };
 
   NIX_CFLAGS_COMPILE = "-Wno-error";

From 9f406d3b104d0743aefcb5e1a1f6e18bac1f3327 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Fri, 14 Feb 2020 22:11:37 -0800
Subject: [PATCH 0791/4636] go_1_12: 1.12.16 -> 1.12.17

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

diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix
index 8f02de2cddbb..a48c73363109 100644
--- a/pkgs/development/compilers/go/1.12.nix
+++ b/pkgs/development/compilers/go/1.12.nix
@@ -30,11 +30,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "go";
-  version = "1.12.16";
+  version = "1.12.17";
 
   src = fetchurl {
     url = "https://dl.google.com/go/go${version}.src.tar.gz";
-    sha256 = "1y0x10fsvgpc1x24b9q9y6kv9b0kwf7879am3p0gym2abgc5wvnf";
+    sha256 = "09cbl90maxry713wd18jdqrms3ivbvcm472csnxc78rsqhc851yy";
   };
 
   # perl is used for testing go vet

From 634cb1cadcfeb340911eb1332f2bccaa84983b6d Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Fri, 14 Feb 2020 22:12:03 -0800
Subject: [PATCH 0792/4636] go_1_13: 1.13.7 -> 1.13.8

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

diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix
index 9006725f639b..58786a94efe5 100644
--- a/pkgs/development/compilers/go/1.13.nix
+++ b/pkgs/development/compilers/go/1.13.nix
@@ -30,11 +30,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "go";
-  version = "1.13.7";
+  version = "1.13.8";
 
   src = fetchurl {
     url = "https://dl.google.com/go/go${version}.src.tar.gz";
-    sha256 = "1x21kfpzfkvmqd42pan6nl862m7jjl4niqxxpcgm46awbz645bg4";
+    sha256 = "0d7cxffk72568h46srzswrxd0bsdip7amgkf499wzn6l6d3g0fxi";
   };
 
   # perl is used for testing go vet

From 02b033417b73385381b65bc7f84272b22f8f65c9 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Fri, 14 Feb 2020 22:20:14 -0800
Subject: [PATCH 0793/4636] go_1_12, go_1_13: add Frostman to maintainers

---
 pkgs/development/compilers/go/1.12.nix | 2 +-
 pkgs/development/compilers/go/1.13.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix
index a48c73363109..78ffa9658752 100644
--- a/pkgs/development/compilers/go/1.12.nix
+++ b/pkgs/development/compilers/go/1.12.nix
@@ -242,7 +242,7 @@ stdenv.mkDerivation rec {
     homepage = http://golang.org/;
     description = "The Go Programming language";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs ];
+    maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs Frostman ];
     platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix
index 58786a94efe5..71a056109224 100644
--- a/pkgs/development/compilers/go/1.13.nix
+++ b/pkgs/development/compilers/go/1.13.nix
@@ -239,7 +239,7 @@ stdenv.mkDerivation rec {
     homepage = http://golang.org/;
     description = "The Go Programming language";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs kalbasit ];
+    maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs kalbasit Frostman ];
     platforms = platforms.linux ++ platforms.darwin;
   };
 }

From 13a03f402cc75f5db52ebaaac3af2f7d99cb9c27 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Feb 2020 17:01:59 +0000
Subject: [PATCH 0794/4636] libarchive: 3.4.1 -> 3.4.2

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

diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 04b4e409b9bd..779ddfeb589a 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -10,13 +10,13 @@ assert xarSupport -> libxml2 != null;
 
 stdenv.mkDerivation rec {
   pname = "libarchive";
-  version = "3.4.1";
+  version = "3.4.2";
 
   src = fetchFromGitHub {
     owner = "libarchive";
     repo = "libarchive";
     rev = "v${version}";
-    sha256 = "0g0kzfl01zy1aabr5jcrh8480mb16vh3pacdhg6mm2bdv2f5w8z1";
+    sha256 = "0mjm77wbqs8sbn9j44lj39nwbg6anmgz6pkyfxsww54a4rs0p3iz";
   };
 
   outputs = [ "out" "lib" "dev" ];

From 8e5d6824a9ce18401b4f91e7ae2e8b7d32cf7c75 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 21:30:44 +0000
Subject: [PATCH 0795/4636] libmicrohttpd: 0.9.69 -> 0.9.70

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

diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index ba4d74e4d484..e3bce805d291 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libmicrohttpd";
-  version = "0.9.69";
+  version = "0.9.70";
 
   src = fetchurl {
     url = "mirror://gnu/libmicrohttpd/${pname}-${version}.tar.gz";
-    sha256 = "0zp34zgcahym5kp2r83gfb5wnr8yf643a26k6zk96x3qica6p6zv";
+    sha256 = "01vkjy89b1ylmh22dy5yza2r414nfwcfixxh3v29nvzrjv9s7l4h";
   };
 
   outputs = [ "out" "dev" "devdoc" "info" ];

From 2277a41b55dc167fe2fbda267f964a74d2ab2bd1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 16:09:36 +0000
Subject: [PATCH 0796/4636] libinput: 1.15.0 -> 1.15.1

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

diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 5cbf7c9145db..4c3fb6704843 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -27,11 +27,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "libinput";
-  version = "1.15.0";
+  version = "1.15.1";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz";
-    sha256 = "1qa3b2fd4pv8ysf0mgwnyhqv9v48zgy3sy0q3a3vxcmwcvpizgxz";
+    sha256 = "05hcjlsrc38yn1g1n7kia9m93nc703hx66gf977kw5vgbi4mfbvb";
   };
 
   outputs = [ "bin" "out" "dev" ];

From e533111c110e1033a3db7881a3c8ff456f5896ad Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 04:35:03 +0000
Subject: [PATCH 0797/4636] cppunit: 1.15.0 -> 1.15.1

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

diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix
index b006b0911f14..beaa5721a4d8 100644
--- a/pkgs/development/libraries/cppunit/default.nix
+++ b/pkgs/development/libraries/cppunit/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cppunit";
-  version = "1.15.0";
+  version = "1.15.1";
 
   src = fetchurl {
     url = "https://dev-www.libreoffice.org/src/${pname}-${version}.tar.gz";
-    sha256 = "08j9hc11yl07ginsf282pshn6zpy96yhzf7426sfn10f8gdxyq8w";
+    sha256 = "19qpqzy66bq76wcyadmi3zahk5v1ll2kig1nvg96zx9padkcdic9";
   };
 
   meta = with stdenv.lib; {

From c46b840adc1fc984898f7ee1510224823048c1e7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 8 Feb 2020 16:23:03 +0000
Subject: [PATCH 0798/4636] libcdr: 0.1.5 -> 0.1.6

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

diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix
index f7276d39b14a..cfd768b5272d 100644
--- a/pkgs/development/libraries/libcdr/default.nix
+++ b/pkgs/development/libraries/libcdr/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig, librevenge, icu, boost, cppunit }:
 
 stdenv.mkDerivation rec {
-  name = "libcdr-0.1.5";
+  name = "libcdr-0.1.6";
 
   src = fetchurl {
     url = "https://dev-www.libreoffice.org/src/${name}.tar.xz";
-    sha256 = "0j1skr11jwvafn0l6p37v3i4lqc8wcn489g8f7c4mqwbk94mrkka";
+    sha256 = "0qgqlw6i25zfq1gf7f6r5hrhawlrgh92sg238kjpf2839aq01k81";
   };
 
   buildInputs = [ libwpg libwpd lcms librevenge icu boost cppunit ];

From 17b46e81da2159f7d7f8c6861eb8476bc85bf4b4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 6 Feb 2020 09:31:46 +0000
Subject: [PATCH 0799/4636] libbytesize: 2.1 -> 2.2

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

diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/development/libraries/libbytesize/default.nix
index 4fea84723f99..5e293c163a9b 100644
--- a/pkgs/development/libraries/libbytesize/default.nix
+++ b/pkgs/development/libraries/libbytesize/default.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "2.1";
+  version = "2.2";
 in stdenv.mkDerivation rec {
   pname = "libbytesize";
   inherit version;
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
     owner = "storaged-project";
     repo = "libbytesize";
     rev = version;
-    sha256 = "0qb6zx2fdghm21lishlcrhnwf4wwy5p69dsgp0504kn93ii7mw3m";
+    sha256 = "0n4gmn68ypsk3gcw6akcghlgk3aj3wskwg3mlg93cw5y3a33nbhm";
   };
 
   outputs = [ "out" "dev" "devdoc" ];

From a4014a71ed437a41bcea3157a231f5f5d4753f4d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 15:14:36 +0000
Subject: [PATCH 0800/4636] homebank: 5.3.1 -> 5.3.2

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

diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index 683cddde5ec8..3cda543eda12 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -2,10 +2,10 @@
 , libsoup, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "homebank-5.3.1";
+  name = "homebank-5.3.2";
   src = fetchurl {
     url = "http://homebank.free.fr/public/${name}.tar.gz";
-    sha256 = "119lyr8c33n8sa3s4l8s33ajwhyv0qgpmaigkyaqnccbkw1qdhhv";
+    sha256 = "1fr4060yqlciay98dypvifmfvr8y2kbpj89d86mcvq9gb00vij2b";
   };
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

From e7f3e3e2d8723880d1c841cbc6f631528794b0ed Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 05:06:04 +0000
Subject: [PATCH 0801/4636] clickhouse: 19.13.6.51 -> 19.17.8.54

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

diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index 4c586efe1778..90cdfc3e7051 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "clickhouse";
-  version = "19.13.6.51";
+  version = "19.17.8.54";
 
   src = fetchFromGitHub {
     owner  = "yandex";
     repo   = "ClickHouse";
     rev    = "v${version}-stable";
-    sha256 = "0mcwfam1nrs2g54syw7vvpfkjn3l4gfzvla7xbg92lr03fn6kbn2";
+    sha256 = "0ck6kcifj7y4i2j1jj1a9vf5nfpp9mxk5x8y8557zp9yayjm9qyr";
   };
 
   nativeBuildInputs = [ cmake libtool ninja ];

From 4f0f4ae25c24a652702427cb3590a2eaab896b5e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 11 Feb 2020 10:43:24 +0000
Subject: [PATCH 0802/4636] liquibase: 3.8.5 -> 3.8.6

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

diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix
index e3ad2a5bcbc9..990fbba7226c 100644
--- a/pkgs/development/tools/database/liquibase/default.nix
+++ b/pkgs/development/tools/database/liquibase/default.nix
@@ -10,11 +10,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "liquibase";
-  version = "3.8.5";
+  version = "3.8.6";
 
   src = fetchurl {
     url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "0wvz188i1214b904xrhvba90hyfrlc4za3aibbdqfm86wm3qzh6s";
+    sha256 = "19x6v8kji3mjpf3r0khmlvgkljm269r16w8p4yvknsw4rf0rl9x4";
   };
 
   buildInputs = [ jre makeWrapper ];

From 0a625e2d3454c2fb5a502b3da9c1e890122bbab1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 11 Feb 2020 07:56:42 +0000
Subject: [PATCH 0803/4636] freeorion: 0.4.8 -> 0.4.9

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

diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix
index dfad954f0f0c..527e41680831 100644
--- a/pkgs/games/freeorion/default.nix
+++ b/pkgs/games/freeorion/default.nix
@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.8";
+  version = "0.4.9";
   pname = "freeorion";
 
   src = fetchFromGitHub {
     owner  = "freeorion";
     repo   = "freeorion";
     rev = "v${version}";
-    sha256 = "1lj1q2ljjgbbiqxb53wdrrcz0zxxr3vv9jqrhbzvfsss7q808jfw";
+    sha256 = "18xigx4qla225ybf7mc1w8zfm81nhcm1i5181n5l2fbndvslb1wf";
   };
 
   buildInputs = [

From 9d304bd60ba44bfdc8623857b3a4ec9bee023fb8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 16 Feb 2020 09:26:58 +0100
Subject: [PATCH 0804/4636] python2Packages.spyder-kernels: fix build

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

diff --git a/pkgs/development/python-modules/spyder-kernels/2.nix b/pkgs/development/python-modules/spyder-kernels/2.nix
new file mode 100644
index 000000000000..86daec23d954
--- /dev/null
+++ b/pkgs/development/python-modules/spyder-kernels/2.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer,
+  jupyter_client, pyzmq }:
+
+buildPythonPackage rec {
+  pname = "spyder-kernels";
+  version = "0.5.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "01354b7fa180a87212cc005553b31a7300159b108d36828e301d3782291323f7";
+  };
+
+  propagatedBuildInputs = [
+    cloudpickle
+    ipykernel
+    wurlitzer
+    jupyter_client
+    pyzmq
+  ];
+
+  # No tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Jupyter kernels for Spyder's console";
+    homepage = "https://github.com/spyder-ide/spyder-kernels";
+    license = licenses.mit;
+    maintainers = with maintainers; [ gebner ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9dfa595f231b..bed57a8ed620 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1459,8 +1459,8 @@ in {
 
   sniffio = callPackage ../development/python-modules/sniffio { };
 
-  spyder-kernels = callPackage ../development/python-modules/spyder-kernels {};
-  spyder = callPackage ../development/python-modules/spyder {};
+  spyder-kernels = if isPy3k then callPackage ../development/python-modules/spyder-kernels {}
+    else callPackage ../development/python-modules/spyder-kernels/2.nix {};
 
   tenacity = callPackage ../development/python-modules/tenacity { };
 

From 3ff3e2ce1f4bce7882c02cd1a0ba8a561d9c3716 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 16 Feb 2020 09:27:14 +0100
Subject: [PATCH 0805/4636] python2Packages.spyder: fix build

---
 pkgs/development/python-modules/spyder/2.nix | 70 ++++++++++++++++++++
 pkgs/top-level/python-packages.nix           |  3 +
 2 files changed, 73 insertions(+)
 create mode 100644 pkgs/development/python-modules/spyder/2.nix

diff --git a/pkgs/development/python-modules/spyder/2.nix b/pkgs/development/python-modules/spyder/2.nix
new file mode 100644
index 000000000000..b707d4a0abc1
--- /dev/null
+++ b/pkgs/development/python-modules/spyder/2.nix
@@ -0,0 +1,70 @@
+{ stdenv, buildPythonPackage, fetchPypi, makeDesktopItem, jedi, pycodestyle,
+  psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc,
+  qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments,
+  spyder-kernels, qtpy, pyzmq, chardet
+, pyqtwebengine
+}:
+
+buildPythonPackage rec {
+  pname = "spyder";
+  version = "3.3.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1z7qw1h3rhca12ycv8xrzw6z2gf81v0j6lfq9kpwh472w4vk75v1";
+  };
+
+  nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
+
+  propagatedBuildInputs = [
+    jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring
+    numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels
+    pygments qtpy pyzmq chardet pyqtwebengine
+  ];
+
+  # There is no test for spyder
+  doCheck = false;
+
+  desktopItem = makeDesktopItem {
+    name = "Spyder";
+    exec = "spyder";
+    icon = "spyder";
+    comment = "Scientific Python Development Environment";
+    desktopName = "Spyder";
+    genericName = "Python IDE";
+    categories = "Application;Development;Editor;IDE;";
+  };
+
+  postPatch = ''
+    # remove dependency on pyqtwebengine
+    # this is still part of the pyqt 5.11 version we have in nixpkgs
+    sed -i /pyqtwebengine/d setup.py
+    substituteInPlace setup.py --replace "pyqt5<5.13" "pyqt5"
+  '';
+
+  # Create desktop item
+  postInstall = ''
+    mkdir -p $out/share/icons
+    cp spyder/images/spyder.svg $out/share/icons
+    cp -r $desktopItem/share/applications/ $out/share
+  '';
+
+  dontWrapQtApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Scientific python development environment";
+    longDescription = ''
+      Spyder (previously known as Pydee) is a powerful interactive development
+      environment for the Python language with advanced editing, interactive
+      testing, debugging and introspection features.
+    '';
+    homepage = "https://github.com/spyder-ide/spyder/";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ gebner ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bed57a8ed620..bab1135c2a07 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1462,6 +1462,9 @@ in {
   spyder-kernels = if isPy3k then callPackage ../development/python-modules/spyder-kernels {}
     else callPackage ../development/python-modules/spyder-kernels/2.nix {};
 
+  spyder = if isPy3k then callPackage ../development/python-modules/spyder {}
+    else callPackage ../development/python-modules/spyder/2.nix {};
+
   tenacity = callPackage ../development/python-modules/tenacity { };
 
   tokenserver = callPackage ../development/python-modules/tokenserver {};

From d70bdb7047fe40c811f8d5cedf654bfc81826ec7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 16 Feb 2020 09:47:12 +0100
Subject: [PATCH 0806/4636] pythonPackages.helpdev: init at 0.6.10

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

diff --git a/pkgs/development/python-modules/helpdev/default.nix b/pkgs/development/python-modules/helpdev/default.nix
new file mode 100644
index 000000000000..5977ec3aee23
--- /dev/null
+++ b/pkgs/development/python-modules/helpdev/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, importlib-metadata
+, psutil
+}:
+
+buildPythonPackage rec {
+  pname = "helpdev";
+  version = "0.6.10";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "9e61d24458b7506809670222ca656b139e67d46c530cd227a899780152d7b44e";
+  };
+
+  propagatedBuildInputs = [
+    importlib-metadata
+    psutil
+  ];
+
+  # No tests included in archive
+  doCheck = false;
+
+  meta = {
+    description = "Extracts information about the Python environment easily";
+    license = lib.licenses.mit;
+  };
+
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bab1135c2a07..927bfa285ba3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2759,6 +2759,8 @@ in {
 
   hbmqtt = callPackage ../development/python-modules/hbmqtt { };
 
+  helpdev = callPackage ../development/python-modules/helpdev { };
+
   hickle = callPackage ../development/python-modules/hickle { };
 
   hiro = callPackage ../development/python-modules/hiro {};

From 11641a16fab102deec2853ba42b36d4b527838f4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 16 Feb 2020 09:47:28 +0100
Subject: [PATCH 0807/4636] pythonPackages.qdarkstyle: 2.6.8 -> 2.8

---
 .../python-modules/qdarkstyle/default.nix           | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/qdarkstyle/default.nix b/pkgs/development/python-modules/qdarkstyle/default.nix
index 425bb21a687b..a1893c88e0e0 100644
--- a/pkgs/development/python-modules/qdarkstyle/default.nix
+++ b/pkgs/development/python-modules/qdarkstyle/default.nix
@@ -1,18 +1,25 @@
-{ lib, fetchPypi, buildPythonPackage }:
+{ lib
+, fetchPypi
+, buildPythonPackage
+, helpdev
+, qtpy
+}:
 
 buildPythonPackage rec {
   pname = "qdarkstyle";
-  version = "2.6.8";
+  version = "2.8";
 
   src = fetchPypi {
     inherit version;
     pname = "QDarkStyle";
-    sha256 = "18l2ynq2x8jd380nr47xy947c3qdmhv8nnxnan03y5d51azm8yh3";
+    sha256 = "6a967c4b664446f8bed9df12d1032cf68cb54f186bfc9cbfdbbc756bf9a5d475";
   };
 
   # No tests available
   doCheck = false;
 
+  propagatedBuildInputs = [ helpdev qtpy ];
+
   meta = with lib; {
     description = "A dark stylesheet for Python and Qt applications";
     homepage = https://github.com/ColinDuquesnoy/QDarkStyleSheet;

From a4645dfa33799683caca77296cf185cb9179eec9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 16 Feb 2020 09:47:45 +0100
Subject: [PATCH 0808/4636] pythonPackages.python-jsonrpc-server: 0.2.0 ->
 0.3.4

---
 .../python-modules/python-jsonrpc-server/default.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix
index 29c6950070a5..f972187d6fc7 100644
--- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix
+++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix
@@ -1,17 +1,17 @@
 { stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
 , pytest, mock, pytestcov, coverage
-, future, futures
+, future, futures, ujson
 }:
 
 buildPythonPackage rec {
   pname = "python-jsonrpc-server";
-  version = "0.2.0";
+  version = "0.3.4";
 
   src = fetchFromGitHub {
     owner = "palantir";
     repo = "python-jsonrpc-server";
     rev = version;
-    sha256 = "054b0xm5z3f82jwp7zj21pkh7gwj9jd933jhymdx49n1n1iynfn0";
+    sha256 = "sha256:027sx5pv4i9a192kr00bjjcxxprh2xyr8q5372q8ghff3xryk9dd";
   };
 
   postPatch = ''
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     pytest
   '';
 
-  propagatedBuildInputs = [ future ]
+  propagatedBuildInputs = [ future ujson ]
     ++ stdenv.lib.optional (pythonOlder "3.2") futures;
 
   meta = with stdenv.lib; {

From ebc94344f7780209df4e402105390e72253ff5c3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 16 Feb 2020 09:47:58 +0100
Subject: [PATCH 0809/4636] pythonPackages.python-language-server: 0.29.1 ->
 0.31.8

---
 .../python-language-server/default.nix        | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix
index b029373bdca7..74eadd9b2de3 100644
--- a/pkgs/development/python-modules/python-language-server/default.nix
+++ b/pkgs/development/python-modules/python-language-server/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27
 , backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server, flake8
-, pytest, mock, pytestcov, coverage, setuptools
+, pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson
 , # Allow building a limited set of providers, e.g. ["pycodestyle"].
   providers ? ["*"]
   # The following packages are optional and
@@ -21,30 +21,45 @@ in
 
 buildPythonPackage rec {
   pname = "python-language-server";
-  version = "0.29.1";
+  version = "0.31.8";
 
   src = fetchFromGitHub {
     owner = "palantir";
     repo = "python-language-server";
     rev = version;
-    sha256 = "0hsp0h8vma8z6f0mg311hp59h6hayl7zzxmy295x5fl2l9iiakfv";
+    sha256 = "sha256:1h0w7x7d9g3z7vmxn5w7qxdkjya3sl0xfnklfaaaj8dkb5mjldpi";
   };
 
   # The tests require all the providers, disable otherwise.
   doCheck = providers == ["*"];
 
   checkInputs = [
-    pytest mock pytestcov coverage
+    pytestCheckHook mock pytestcov coverage
     # rope is technically a dependency, but we don't add it by default since we
     # already have jedi, which is the preferred option
     rope
   ];
 
-  checkPhase = ''
-    HOME=$TEMPDIR pytest
+  dontUseSetuptoolsCheck = true;
+
+  preCheck = ''
+    export HOME=$TEMPDIR
   '';
 
-  propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server flake8 ]
+  # Tests failed since update to 0.31.8
+  disabledTests = [
+    "test_pyqt_completion"
+    "test_numpy_completions"
+    "test_pandas_completions"
+    "test_matplotlib_completions"
+    "test_snippet_parsing"
+
+  ];
+  # checkPhase = ''
+  #   HOME=$TEMPDIR pytest -k "not test_pyqt_completion and not 
+  # '';
+
+  propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server flake8 ujson ]
     ++ stdenv.lib.optional (withProvider "autopep8") autopep8
     ++ stdenv.lib.optional (withProvider "mccabe") mccabe
     ++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle

From 68a8115e10674435dec121a47df013c1283c8d01 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 03:49:11 -0500
Subject: [PATCH 0810/4636] gnome-podcasts: upgrade cargo fetcher and
 cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/applications/audio/gnome-podcasts/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix
index c28754e471a9..47945de78330 100644
--- a/pkgs/applications/audio/gnome-podcasts/default.nix
+++ b/pkgs/applications/audio/gnome-podcasts/default.nix
@@ -32,10 +32,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0vy5i77bv8c22ldhrnr4z6kx22zqnb1lg3s7y8673bqjgd7dppi0";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1h0n8zclb8a1b1ri83viiwwzlj3anm38m4cp38aqyf6q40qga35q";
+  cargoSha256 = "1dlbdxsf9p2jzrsclm43k95y8m3zcd41qd9ajg1ii3fpnahi58kd";
 
   nativeBuildInputs = [
     meson

From 1f03a3434f5781ea198b9e8852edbb784be76ca0 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 03:53:12 -0500
Subject: [PATCH 0811/4636] alacritty: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/applications/misc/alacritty/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 34d2b510a03a..a4d777151992 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -62,10 +62,7 @@ in buildRustPackage rec {
     sha256 = "05jcg33ifngpzw2hdhgb614j87ihhhlqgar0kky183rywg0dxikg";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1kc9n10kb4j87x337pzl6wpi0qj5ib2mqmrjag2yld3138dag71n";
+  cargoSha256 = "182j8ah67b2gw409vjfml3p41i00zh0klx9m8bwfkm64y2ki2bip";
 
   nativeBuildInputs = [
     cmake

From 4ba018085e4e7599bfbc2c53949b17406f94a64d Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 03:54:36 -0500
Subject: [PATCH 0812/4636] loc: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/development/misc/loc/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix
index 78a89baeafbb..ba4ab6bf6150 100644
--- a/pkgs/development/misc/loc/default.nix
+++ b/pkgs/development/misc/loc/default.nix
@@ -13,10 +13,7 @@ buildRustPackage rec {
     sha256 = "0086asrx48qlmc484pjz5r5znli85q6qgpfbd81gjlzylj7f57gg";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "06iqzpg5jz1xd2amajvlf7yaz9kr3q2ipbhx71whvv9mwplmxmbi";
+  cargoSha256 = "1fgv1kxiif48q9mm60ygn88r5nkxfyiacmvbgwp0jxiacv8r7779";
 
   meta = with stdenv.lib; {
     homepage = https://github.com/cgag/loc;

From 3a773045e662b7ba14cbddb9e6c94f54e86a86aa Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 16 Feb 2020 09:52:25 +0100
Subject: [PATCH 0813/4636] python3Packages: attempt to fix build, mark as
 broken

Earlier spyder was updated to 4.0.0. This build fails. Adding new
dependencies, it still fails, because it needs a very specific version
of jedi. This is problematic, we cannot have these tight constraints in
the Python packages set.

We could revert to 3.x. It builds, however, I expect it to have runtime
issues due to jedi as well.

https://github.com/spyder-ide/spyder/issues/11047
---
 pkgs/development/python-modules/spyder/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix
index 47094fcb9933..65fabc6c7bc4 100644
--- a/pkgs/development/python-modules/spyder/default.nix
+++ b/pkgs/development/python-modules/spyder/default.nix
@@ -1,25 +1,25 @@
-{ stdenv, buildPythonPackage, fetchPypi, makeDesktopItem, jedi, pycodestyle,
+{ stdenv, buildPythonPackage, fetchPypi, makeDesktopItem, intervaltree, jedi, pycodestyle,
   psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc,
   qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments,
-  spyder-kernels, qtpy, pyzmq, chardet
+  spyder-kernels, qtpy, pyzmq, chardet, qdarkstyle, watchdog, python-language-server
 , pyqtwebengine
 }:
 
 buildPythonPackage rec {
   pname = "spyder";
-  version = "4.0.0";
+  version = "4.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f2bfece9743188e3d1da68f02271a7c6eb7f0a3b692c3df4952458ab96b037a8";
+    sha256 = "4b279c16487d224368dd2213e1517185fa59fc528f539601fffb34ea97accb7b";
   };
 
   nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
 
   propagatedBuildInputs = [
-    jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring
+    intervaltree jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring
     numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels
-    pygments qtpy pyzmq chardet pyqtwebengine
+    pygments qtpy pyzmq chardet pyqtwebengine qdarkstyle watchdog python-language-server
   ];
 
   # There is no test for spyder
@@ -66,5 +66,6 @@ buildPythonPackage rec {
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = with maintainers; [ gebner ];
+    broken = true;
   };
 }

From 7605f60665e35a8039818fbe7a7e4064fbf5578f Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 03:57:15 -0500
Subject: [PATCH 0814/4636] async: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/development/tools/async/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/async/default.nix b/pkgs/development/tools/async/default.nix
index 65c1a0fa78d0..dad1e2f65741 100644
--- a/pkgs/development/tools/async/default.nix
+++ b/pkgs/development/tools/async/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "19ypflbayi5l0mb8yw7w0a4bq9a3w8nl9jsxapp9m3xggzmsvrxx";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1qf52xsd15rj8y9w65zyab7akvzry76k1d4gxvxlz7ph3sl7jl3y";
+  cargoSha256 = "1zgds5rjjikvaj0rxc7slyvkjn067s0v8vdnxn3vsv819q5yd707";
 
   meta = with stdenv.lib; {
     description = "A tool to parallelize shell commands";

From 16eb59cecb6b6f9e72e4f484ff94ad6ed0c73b4e Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 23:45:47 -0500
Subject: [PATCH 0815/4636] rust-bindgen: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/development/tools/rust/bindgen/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index db1ad9f0ea9d..c064ebc4e7e1 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -14,10 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0zxqryqks9in9q7az0lrw8fq9wnc5p4yf6b1fxnzy2j6qhlw2c5c";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1wy5xdkf9ql2l9qavi0fh7hwjvly108f4l2m1k947412fyjwr7x7";
+  cargoSha256 = "1fdgm83l9d469garfbgny6jk1fvwnwh32sybz9g7s2qzrvzzrx1d";
 
   libclang = llvmPackages.libclang.lib; #for substituteAll
 

From 53a967f138d0187311b3e90f0ab0a502890edc7a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 13 Feb 2020 21:13:41 -0600
Subject: [PATCH 0816/4636] readline80: p1 -> p4

https://ftp.gnu.org/gnu/readline/readline-8.0-patches/readline80-002
https://ftp.gnu.org/gnu/readline/readline-8.0-patches/readline80-003
https://ftp.gnu.org/gnu/readline/readline-8.0-patches/readline80-004
---
 pkgs/development/libraries/readline/readline-8.0-patches.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/readline/readline-8.0-patches.nix b/pkgs/development/libraries/readline/readline-8.0-patches.nix
index 433da83dab95..2fac6a413c71 100644
--- a/pkgs/development/libraries/readline/readline-8.0-patches.nix
+++ b/pkgs/development/libraries/readline/readline-8.0-patches.nix
@@ -2,4 +2,7 @@
 
 patch: [
 (patch "001" "0sfh7wn0pr743xspnb1zndxndlv9rc0hcg14cbw5cmyg6f4ykrfq")
+(patch "002" "1xy8mv8xm8hsfixwp3ci9kfx3dii3y92cq27wwd0jq75y6zzxc1n")
+(patch "003" "1vza7sxjcsr2z295ij12nzgncdil1vb6as3mqy4m7svi1chv5pcl")
+(patch "004" "0k1rfx9w32lglxg564yvp0mw6jg6883p8ac2f2lxxqpf80m3vami")
 ]

From afc321fa914323ab611885946a9442477dabb05b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 13 Feb 2020 21:18:24 -0600
Subject: [PATCH 0817/4636] bash_5: 5p11 -> 5p16

https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-012
https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-013
https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-014
https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-015
https://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-016
---
 pkgs/shells/bash/bash-5.0-patches.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/shells/bash/bash-5.0-patches.nix b/pkgs/shells/bash/bash-5.0-patches.nix
index 1f24a6dec12f..e6481aa4da10 100644
--- a/pkgs/shells/bash/bash-5.0-patches.nix
+++ b/pkgs/shells/bash/bash-5.0-patches.nix
@@ -12,4 +12,9 @@ patch: [
 (patch "009" "00yrjjqd95s81b21qq3ba1y7h879q8jaajlkjggc6grhcwbs4g7d")
 (patch "010" "04ca5bjv456v538mkspzvn4xb2zdphh31r4fpvfm9p5my0jw7yyn")
 (patch "011" "1sklyixvsv8993kxzs0jigacpdchjrq7jv5xpdx7kbqyp4rf6k9c")
+(patch "012" "0cz21qg2gbr40lfgza7g02bqi2qknwqgxnq459pjj640d0cywhr9")
+(patch "013" "16h9nwz3yzwj7fnxvlidjymdc4yr30h818433gh9j1x3in6igmzm")
+(patch "014" "12gm5bvv2pd3m72z2ilj26pa08c61az253dsgfl24vpf2ijywvjx")
+(patch "015" "0pm0px758w4i23s55wajcv6lqfiym7zgxvq0pxf6vclkv8nxy5x5")
+(patch "016" "0vdha332km2iwx8g2ld15jy7d24cbplzgr1531dpzylr9ajxglgz")
 ]

From 4eb84c9ed4e07b115f0e84ad9bf8466cd63284d9 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 16 Feb 2020 10:46:35 +0100
Subject: [PATCH 0818/4636] terminus_font: generate otb and split output

---
 pkgs/data/fonts/terminus-font/default.nix | 35 +++++++++++++++++++----
 pkgs/top-level/all-packages.nix           |  3 +-
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix
index 358ab959cd0e..88ae9ac72c2e 100644
--- a/pkgs/data/fonts/terminus-font/default.nix
+++ b/pkgs/data/fonts/terminus-font/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchurl, python3, bdftopcf, mkfontdir, mkfontscale }:
+{ stdenv, fetchurl, python3
+, libfaketime, fonttosfnt
+, bdftopcf, mkfontscale
+}:
 
 stdenv.mkDerivation rec {
   pname = "terminus-font";
@@ -9,16 +12,36 @@ stdenv.mkDerivation rec {
     sha256 = "1bwlkj39rqbyq57v5yssayav6hzv1n11b9ml2s0dpiyfsn6rqy9l";
   };
 
-  nativeBuildInputs = [ python3 bdftopcf mkfontdir mkfontscale ];
-
-  patchPhase = ''
-    substituteInPlace Makefile --replace 'fc-cache' '#fc-cache'
-  '';
+  nativeBuildInputs =
+    [ python3 bdftopcf libfaketime
+      fonttosfnt mkfontscale
+    ];
 
   enableParallelBuilding = true;
 
+  postPatch = ''
+    substituteInPlace Makefile --replace 'fc-cache' '#fc-cache'
+  '';
+
+  postBuild = ''
+    # convert unicode bdf fonts to otb
+    for i in *.bdf; do
+      name=$(basename $i .bdf)
+      faketime -f "1970-01-01 00:00:01" \
+      fonttosfnt -v -o "$name.otb" "$i"
+    done
+  '';
+
+  postInstall = ''
+    # install otb fonts (for GTK applications)
+    install -m 644 -D *.otb -t "$otb/share/fonts/misc";
+    mkfontdir "$otb/share/fonts/misc"
+  '';
+
   installTargets = [ "install" "fontdir" ];
 
+  outputs = [ "out" "otb" ];
+
   meta = with stdenv.lib; {
     description = "A clean fixed width font";
     longDescription = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8192f56c1be..aadb74aa4dae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17971,7 +17971,8 @@ in
 
   tenderness = callPackage ../data/fonts/tenderness { };
 
-  terminus_font = callPackage ../data/fonts/terminus-font { };
+  terminus_font = callPackage ../data/fonts/terminus-font
+    { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
 
   terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { };
 

From 1df3c86f2e0b58ae53d6d074ec484d547ff9dacb Mon Sep 17 00:00:00 2001
From: Jon <jonringer@users.noreply.github.com>
Date: Sun, 16 Feb 2020 02:23:57 -0800
Subject: [PATCH 0819/4636] moolticute: 0.30.8 -> 0.42.32-testing (#80222)

---
 pkgs/applications/misc/moolticute/default.nix | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix
index e734e44a2e04..e3154b7cd1cd 100644
--- a/pkgs/applications/misc/moolticute/default.nix
+++ b/pkgs/applications/misc/moolticute/default.nix
@@ -1,36 +1,44 @@
-{ stdenv, fetchurl
-, libusb1, pkgconfig, qmake, qtbase, qttools, qtwebsockets
+{ lib, mkDerivation, fetchFromGitHub
+, libusb1
+, pkg-config
+, qmake
+, qtbase
+, qttools
+, qtwebsockets
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "moolticute";
-  version = "0.30.8";
+  version = "0.42.32-testing";
 
-  src = fetchurl {
-    url = "https://github.com/mooltipass/moolticute/archive/v${version}.tar.gz";
-    sha256 = "1qi18r2v0mpw1y007vjgzhiia89fpgsbg2wirxgngl21yxdns1pf";
+  src = fetchFromGitHub {
+    owner = "mooltipass";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1kx1p2h65dilj1pbzf36d1mxwym19kvln1sqg8fb7na8q7lk4b05";
   };
 
+  outputs = [ "out" "udev" ];
+
+  nativeBuildInputs = [ pkg-config qmake qttools ];
+  buildInputs = [ libusb1 qtbase qtwebsockets ];
+
   preConfigure = "mkdir -p build && cd build";
-  nativeBuildInputs = [ pkgconfig qmake qttools ];
   qmakeFlags = [ "../Moolticute.pro" ];
 
-  outputs = [ "out" "udev" ];
   preInstall = ''
     mkdir -p $udev/lib/udev/rules.d
     sed -n '/^ \+cat > "$tmpfile" <<- EOF$/,/^EOF$/p' ../data/moolticute.sh |
         sed '1d;$d' > $udev/lib/udev/rules.d/50-mooltipass.rules
  '';
-  
-  buildInputs = [ libusb1 qtbase qtwebsockets ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GUI app and daemon to work with Mooltipass device via USB";
     longDescription = ''
       To install udev rules, add `services.udev.packages == [ moolticute.udev ]`
       into `nixos/configuration.nix`.
     '';
-    homepage = https://github.com/mooltipass/moolticute;
+    homepage = "https://github.com/mooltipass/moolticute";
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.kirikaza ];
     platforms = platforms.linux;

From f9be656873dacbc5f51f0cea41e5c4ea0f358b2b Mon Sep 17 00:00:00 2001
From: Julien Moutinho <ju1m@users.noreply.github.com>
Date: Sun, 16 Feb 2020 11:53:49 +0100
Subject: [PATCH 0820/4636] shorewall: fix warnings due to types.loaOf being
 deprecated (#80154)

---
 nixos/modules/services/networking/shorewall.nix  | 8 +-------
 nixos/modules/services/networking/shorewall6.nix | 8 +-------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/networking/shorewall.nix b/nixos/modules/services/networking/shorewall.nix
index 0f94d414fcf7..c59a53669158 100644
--- a/nixos/modules/services/networking/shorewall.nix
+++ b/nixos/modules/services/networking/shorewall.nix
@@ -33,7 +33,6 @@ in {
           The attribute name defines the name of the config,
           and the attribute value defines the content of the config.
         '';
-        apply = lib.mapAttrs (name: text: pkgs.writeText "${name}" text);
       };
     };
   };
@@ -63,12 +62,7 @@ in {
       '';
     };
     environment = {
-      etc = lib.mapAttrsToList
-              (name: file:
-                { source = file;
-                  target = "shorewall/${name}";
-                })
-              cfg.configs;
+      etc = lib.mapAttrs' (name: conf: lib.nameValuePair "shorewall/${name}" {text=conf;}) cfg.configs;
       systemPackages = [ cfg.package ];
     };
   };
diff --git a/nixos/modules/services/networking/shorewall6.nix b/nixos/modules/services/networking/shorewall6.nix
index 9c22a037c0b4..374e407cc7a1 100644
--- a/nixos/modules/services/networking/shorewall6.nix
+++ b/nixos/modules/services/networking/shorewall6.nix
@@ -33,7 +33,6 @@ in {
           The attribute name defines the name of the config,
           and the attribute value defines the content of the config.
         '';
-        apply = lib.mapAttrs (name: text: pkgs.writeText "${name}" text);
       };
     };
   };
@@ -63,12 +62,7 @@ in {
       '';
     };
     environment = {
-      etc = lib.mapAttrsToList
-              (name: file:
-                { source = file;
-                  target = "shorewall6/${name}";
-                })
-              cfg.configs;
+      etc = lib.mapAttrs' (name: conf: lib.nameValuePair "shorewall6/${name}" {text=conf;}) cfg.configs;
       systemPackages = [ cfg.package ];
     };
   };

From 37d9b45b04033a5458c151430717f10f77a4f292 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 16 Feb 2020 13:44:16 +0100
Subject: [PATCH 0821/4636] tewi-font: 2015-06-07 -> 2.0.2

---
 pkgs/data/fonts/tewi/default.nix | 43 +++++++++++++++-----------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/pkgs/data/fonts/tewi/default.nix b/pkgs/data/fonts/tewi/default.nix
index fbc29cdf5fb1..c3c88dd08c4b 100644
--- a/pkgs/data/fonts/tewi/default.nix
+++ b/pkgs/data/fonts/tewi/default.nix
@@ -1,38 +1,35 @@
-{stdenv, fetchgit, bdftopcf, mkfontdir, mkfontscale}:
+{ stdenv, fetchFromGitHub, python3, bdftopcf, mkfontscale }:
 
 stdenv.mkDerivation rec {
-  date = "2015-06-07";
-  name = "tewi-font-${date}";
+  pname = "tewi-font";
+  version = "2.0.2";
 
-  src = fetchgit {
-    url = "https://github.com/lucy/tewi-font";
-    rev = "ff930e66ae471da4fdc226ffe65fd1ccd13d4a69";
-    sha256 = "0c7k847cp68w20frzsdknpss2cwv3lp970asyybv65jxyl2jz3iq";
+  src = fetchFromGitHub {
+    owner  = "lucy";
+    repo   = pname;
+    rev    = version;
+    sha256 = "1axv9bv10xlcmgfyjh3z5kn5fkg3m6n1kskcs5hvlmyb6m1zk91j";
   };
 
-  nativeBuildInputs = [ bdftopcf mkfontdir mkfontscale ];
-  buildPhase = ''
-    for i in *.bdf; do
-        bdftopcf -o ''${i/bdf/pcf} $i
-    done
+  nativeBuildInputs = [ python3 bdftopcf mkfontscale ];
 
-    gzip -n *.pcf
+  postPatch = ''
+    # do not update fontconfig cache
+    sed '32,33d' -i Makefile
+
+    # make gzip deterministic
+    sed 's/gzip -9/gzip -9 -n/g' -i Makefile
+
+    # fix python not found
+    patchShebangs scripts/merge
   '';
 
   installPhase = ''
     fontDir="$out/share/fonts/misc"
-    mkdir -p "$fontDir"
-    mv *.pcf.gz "$fontDir"
-
-    cd "$fontDir"
-    mkfontdir
-    mkfontscale
+    install -m 644 -D out/* -t "$fontDir"
+    mkfontdir "$fontDir"
   '';
 
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "14dv3m1svahjyb9c1x1570qrmlnynzg0g36b10bqqs8xvhix34yq";
-
   meta = with stdenv.lib; {
     description = "A nice bitmap font, readable even at small sizes";
     longDescription = ''

From 128030139e5aea981d308708005cfb81ebb8676a Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 16 Feb 2020 14:01:52 +0100
Subject: [PATCH 0822/4636] tewi-font: generate otb and split output

---
 pkgs/data/fonts/tewi/default.nix | 28 +++++++++++++++++++++++-----
 pkgs/top-level/all-packages.nix  |  3 ++-
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/pkgs/data/fonts/tewi/default.nix b/pkgs/data/fonts/tewi/default.nix
index c3c88dd08c4b..6245032246c9 100644
--- a/pkgs/data/fonts/tewi/default.nix
+++ b/pkgs/data/fonts/tewi/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchFromGitHub, python3, bdftopcf, mkfontscale }:
+{ stdenv, fetchFromGitHub, python3
+, bdftopcf, mkfontscale
+, libfaketime, fonttosfnt
+}:
 
 stdenv.mkDerivation rec {
   pname = "tewi-font";
@@ -11,12 +14,12 @@ stdenv.mkDerivation rec {
     sha256 = "1axv9bv10xlcmgfyjh3z5kn5fkg3m6n1kskcs5hvlmyb6m1zk91j";
   };
 
-  nativeBuildInputs = [ python3 bdftopcf mkfontscale ];
+  nativeBuildInputs =
+    [ python3 bdftopcf mkfontscale
+      libfaketime fonttosfnt
+    ];
 
   postPatch = ''
-    # do not update fontconfig cache
-    sed '32,33d' -i Makefile
-
     # make gzip deterministic
     sed 's/gzip -9/gzip -9 -n/g' -i Makefile
 
@@ -24,12 +27,27 @@ stdenv.mkDerivation rec {
     patchShebangs scripts/merge
   '';
 
+  postBuild = ''
+    # convert bdf fonts to otb
+    for i in *.bdf; do
+      name=$(basename "$i" .bdf)
+      faketime -f "1970-01-01 00:00:01" \
+      fonttosfnt -v -o "$name.otb" "$i"
+    done
+  '';
+
   installPhase = ''
     fontDir="$out/share/fonts/misc"
     install -m 644 -D out/* -t "$fontDir"
     mkfontdir "$fontDir"
+
+    fontDir="$otb/share/fonts/misc"
+    install -m 644 -D *.otb -t "$fontDir"
+    mkfontdir "$fontDir"
   '';
 
+  outputs = [ "out" "otb" ];
+
   meta = with stdenv.lib; {
     description = "A nice bitmap font, readable even at small sizes";
     longDescription = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8192f56c1be..135e059186de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25475,7 +25475,8 @@ in
 
   tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
 
-  tewi-font = callPackage ../data/fonts/tewi  {};
+  tewi-font = callPackage ../data/fonts/tewi
+    { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
 
   texFunctions = callPackage ../tools/typesetting/tex/nix pkgs;
 

From 74aae635e5ac043cba49d321150a802d17553cbc Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 17:34:00 -0500
Subject: [PATCH 0823/4636] nix-index: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/package-management/nix-index/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix
index f41dd715fcf4..da7469ea6465 100644
--- a/pkgs/tools/package-management/nix-index/default.nix
+++ b/pkgs/tools/package-management/nix-index/default.nix
@@ -12,10 +12,9 @@ rustPlatform.buildRustPackage rec {
     rev = "v${version}";
     sha256 = "05fqfwz34n4ijw7ydw2n6bh4bv64rhks85cn720sy5r7bmhfmfa8";
   };
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
 
-  cargoSha256 = "06idjb5h5fahqklyxnss2zffrvvfbcw0hjh1mcrf1872s4x78ags";
+  cargoSha256 = "0apdr9z18p6m4lfjv8k9zv2mqc7vssd2d536zfv1pns0pdqsfw50";
+
   nativeBuildInputs = [ pkgconfig makeWrapper ];
   buildInputs = [ openssl curl ]
     ++ stdenv.lib.optional stdenv.isDarwin Security;

From 4ebe020cc7d07b13a2f4bee29249c51acfa9db6b Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <middendorf@plapadoo.de>
Date: Thu, 13 Feb 2020 09:51:27 +0100
Subject: [PATCH 0824/4636] quake3e: 2019-11-29 -> 2020-01-23

---
 pkgs/games/quake3/quake3e/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/quake3/quake3e/default.nix b/pkgs/games/quake3/quake3e/default.nix
index 1e179f2f9564..7d6ac0afe45d 100644
--- a/pkgs/games/quake3/quake3e/default.nix
+++ b/pkgs/games/quake3/quake3e/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "Quake3e";
-  version = "2019-11-29";
+  version = "2020-01-23";
 
   src = fetchFromGitHub {
     owner = "ec-";
     repo = pname;
     rev = version;
-    sha256 = "1gpfl72rzwiawhcj3ir38sqdb95y7w7lm7wgj44lbn99z7bvkcn3";
+    sha256 = "0crqn32nkqhlagamkp5nr0vl474ad4wx5ms7yr85s6zybpsk5jnz";
   };
 
   buildInputs = [ curl libGL libX11 libXxf86dga alsaLib libXrandr libXxf86vm libXext ];
@@ -33,5 +33,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ pmiddend ];
+    badPlatforms = [ platforms.aarch64 ];
   };  
 }

From 91a106d4b429296980e4a48d1432e8283a58d72b Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Sun, 16 Feb 2020 16:04:44 +0100
Subject: [PATCH 0825/4636] vscode, vscodium: 1.42.0 -> 1.42.1

---
 pkgs/applications/editors/vscode/vscode.nix   | 6 +++---
 pkgs/applications/editors/vscode/vscodium.nix | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index b6861a9023f8..cd3e5676e8c7 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -11,15 +11,15 @@ let
   archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "1bb7icdjzprrsxllx2q478m1p3qf5sbs3rs3bavvb3hzyyf4bifn";
-    x86_64-darwin = "1hqpfmp5s135kb9777s96sr0zbls002h1980qbgf7r2hmc0mpnx0";
+    x86_64-linux = "0c067qp3aa5kqya3y8pzc9cvyzsafizhgjp9dsibnfl08lvz9hbs";
+    x86_64-darwin = "0vi94nk8p3vp30nx60mwqcmfqbrmrqwvfdjbah0zm480dcjzz7dv";
   }.${system};
 in
   callPackage ./generic.nix rec {
     # The update script doesn't correctly change the hash for darwin, so please:
     # nixpkgs-update: no auto update
 
-    version = "1.42.0";
+    version = "1.42.1";
     pname = "vscode";
 
     executableName = "code" + lib.optionalString isInsiders "-insiders";
diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index d4676d421d0e..eafe1718c2fe 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -11,8 +11,8 @@ let
   archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "0f6ic24w6s9wfirzk5rvysn96gj1naj6b81al9743mllaf32ad5q";
-    x86_64-darwin = "0fgyhb2wxkvrc90zzw5w2k3ggwbinmax286gbff3sjlrzbs5sj64";
+    x86_64-linux = "1pac3rv7ps23ymynvy8dwd5k2154aln33ksr75z1d8w859x3f1dy";
+    x86_64-darwin = "1imzgqynbd65c7gbfp2gb1cxjbazx7afvbdvbqnm5qg7pvq22rni";
   }.${system};
 
   sourceRoot = {
@@ -25,7 +25,7 @@ in
     # The update script doesn't correctly change the hash for darwin, so please:
     # nixpkgs-update: no auto update
 
-    version = "1.42.0";
+    version = "1.42.1";
     pname = "vscodium";
 
     executableName = "codium";

From 29d2b6385f00634e9d2b537427c3474ea8b417c1 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Sun, 16 Feb 2020 14:19:01 +0000
Subject: [PATCH 0826/4636] mdcat: 0.15.0 -> 0.15.1

---
 pkgs/tools/text/mdcat/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix
index 7a97a110381b..9bb3d7469ef7 100644
--- a/pkgs/tools/text/mdcat/default.nix
+++ b/pkgs/tools/text/mdcat/default.nix
@@ -2,22 +2,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mdcat";
-  version = "0.15.0";
+  version = "0.15.1";
 
   src = fetchFromGitHub {
     owner = "lunaryorn";
     repo = pname;
     rev = "mdcat-${version}";
-    sha256 = "1x9c3cj3y8wvwr74kbz6nrdh61rinr98gcp3hnjpi6c3vg3xx4wh";
+    sha256 = "0qvlnjw0h2hnap1crnprdrynqvg7pywq32qin5fdkk4fv496wjhs";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1kc434pa72n9xll2r4ddmd9xdwv3ls36cwsmdry392j41zmics51";
+  cargoSha256 = "12s0dakv37vvvd43xzkydr7w3cpp7sizk8s1kalg4b0xz6ydghcp";
 
   checkInputs = [ ansi2html ];
   checkPhase = ''

From 731c793fed56573368d872c0b362f608d9ef788e Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 03:45:41 -0500
Subject: [PATCH 0827/4636] rsclock: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/applications/misc/rsclock/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix
index a66f4c9a2cf0..4f63ed057b78 100644
--- a/pkgs/applications/misc/rsclock/default.nix
+++ b/pkgs/applications/misc/rsclock/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1i93qkz6d8sbk78i4rvx099hnn4lklp4cjvanpm9ssv8na4rqvh2";
   };
    
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "03mhlp5hi3nlybb9dkwf1gxgsg056mjq2zsxnb5qh8pdxw7fmdxk";
+  cargoSha256 = "01dhkis6zswq1y40n7sdq9xv1sp61f2v7nfqbkicyjngmdrmcgrl";
 
   meta = with stdenv.lib; {
     description = "A simple terminal clock written in Rust";

From 5434a66f914b696997102789a1d42eaf9e62d116 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 03:58:11 -0500
Subject: [PATCH 0828/4636] taizen: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/applications/misc/taizen/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/taizen/default.nix b/pkgs/applications/misc/taizen/default.nix
index 1eb4123a4cc0..bf9770acacd8 100644
--- a/pkgs/applications/misc/taizen/default.nix
+++ b/pkgs/applications/misc/taizen/default.nix
@@ -14,10 +14,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security;
   nativeBuildInputs = [ pkgconfig ];
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0h8ybhb17pqhhfjcmq1l70kp8g1yyq38228lcf86byk3r2ar2rkg";
+  cargoSha256 = "0chrgwm97y1a3gj218x25yqk1y1h74a6gzyxjdm023msvs58nkni";
 
   meta = with lib; {
     homepage = https://crates.io/crates/taizen;

From bb2cb2d5e246f12be34cb83ad6923ee88a16a9d2 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 03:45:06 -0500
Subject: [PATCH 0829/4636] pastel: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/applications/misc/pastel/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix
index 426c5162500d..7b070e32ca56 100644
--- a/pkgs/applications/misc/pastel/default.nix
+++ b/pkgs/applications/misc/pastel/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1c47bph1qraq3g0g5bp23jqlz7qdn4f8vh264y937jz17avvacx5";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1pfhwqj9kxm9p0mpdw7qyvivgby2bmah05kavf0a5zhzvq4v4sg0";
+  cargoSha256 = "1hkqahsrhmgcpgp0pvfpc0wmwqivnqylsxzjrz63k1s9ssdv9syy";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 

From 5375b833bc478f4320d991604428ae029a057ef5 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 03:56:06 -0500
Subject: [PATCH 0830/4636] chit: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/development/tools/chit/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/chit/default.nix b/pkgs/development/tools/chit/default.nix
index 965f12002354..9859739a1dfd 100644
--- a/pkgs/development/tools/chit/default.nix
+++ b/pkgs/development/tools/chit/default.nix
@@ -15,10 +15,7 @@ buildRustPackage rec {
     sha256 = "0iixczy3cad44j2d7zzj8f3lnmp4jwnb0snmwfgiq3vj9wrn28pz";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0k6z69a09ps55w2rdgnf92yscw6rlbcpb4q9yf3rsav15pgpqvw8";
+  cargoSha256 = "1w25k3bqmmcrhpkw510vbwph0rfmrzi2wby0z2rz1q4k1f9k486m";
 
   nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkgconfig ];
   buildInputs = []

From e73928ba4d47f41bf40e4c58589c5a7bdff890fc Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 00:00:59 -0500
Subject: [PATCH 0831/4636] panopticon: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/development/tools/analysis/panopticon/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix
index 87512355b851..85fd8c93529e 100644
--- a/pkgs/development/tools/analysis/panopticon/default.nix
+++ b/pkgs/development/tools/analysis/panopticon/default.nix
@@ -24,10 +24,7 @@ rustPlatform.buildRustPackage rec {
      git
   ];
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1fsxd7yzb38h1d52yyz7kj1v0riycjydb1b1bn1zkhgwm5sm2kbs";
+  cargoSha256 = "1hdsn011y9invfy7can8c02zwa7birj9y1rxhrj7wyv4gh3659i0";
   doCheck = false;
 
   postInstall = ''

From f85a6d959c606d7d1e8e5812215d99d170987290 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 23:56:47 -0500
Subject: [PATCH 0832/4636] fractal: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 .../networking/instant-messengers/fractal/default.nix        | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix
index 9e052c101ad3..896ca4f38a61 100644
--- a/pkgs/applications/networking/instant-messengers/fractal/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix
@@ -35,10 +35,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0r98km3c8naj3mdr1wppzj823ir7jnsia7r3cbg3vsq8q52i480r";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1n9n4d057cz44sh1iy2hb2adplhnrhvr8drnp0v2h8yw73a5shvv";
+  cargoSha256 = "10fgw9m6gdazrca73g43sgvsghhac7xc3bg7hr0vpynzqyfigwa9";
 
   nativeBuildInputs = [
     cargo

From dc851d40519724cdd3252fc6d5c8a87b03302f96 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 23:24:46 -0500
Subject: [PATCH 0833/4636] wishbone-utils: 0.2.8 -> 0.6.9

The upstreeam repository has moved its URL here:
https://github.com/xobs/wishbone-utils

This also contains some cleanup to make the cargo tarball checker find the cargo
lockfile in the source directory; see #79975 for details.
---
 .../tools/misc/wishbone-tool/default.nix      | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/misc/wishbone-tool/default.nix b/pkgs/development/tools/misc/wishbone-tool/default.nix
index 10de4a8157a6..8c2e27d64507 100644
--- a/pkgs/development/tools/misc/wishbone-tool/default.nix
+++ b/pkgs/development/tools/misc/wishbone-tool/default.nix
@@ -1,26 +1,31 @@
 { lib, fetchFromGitHub, rustPlatform, libusb }:
+
 let
-  version = "0.2.8";
+  version = "0.6.9";
   src = fetchFromGitHub {
-    owner = "xobs";
+    owner = "litex-hub";
     repo = "wishbone-utils";
     rev = "v${version}";
-    sha256 = "0v6s5yl0y6bd2snf12x6c77rwvqkg6ybi1sm4wr7qdgbwq563nxp";
+    sha256 = "0gq359ybxnqvcp93cn154bs9kwlai62gnm71yvl2nhzjdlcr3fhp";
   };
 in
 rustPlatform.buildRustPackage {
   pname = "wishbone-tool";
   inherit version;
-  src = "${src}/wishbone-tool";
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
 
-  cargoSha256 = "0pj8kf6s1c666p4kc6q1hlvaqm0lm9aqnsx5r034g1y8sxnnyri2";
+  src = "${src}/wishbone-tool";
+
+  # N.B. The cargo vendor consistency checker searches in "source" for lockfile
+  cargoDepsHook = ''
+    ln -s wishbone-tool source
+  '';
+  cargoSha256 = "0d5kcwy0cgxqfxf2xysw65ng84q4knhp4fgvh6dwqhf0nsca9gvs";
+
   buildInputs = [ libusb ];
 
   meta = with lib; {
     description = "Manipulate a Wishbone device over some sort of bridge";
-    homepage = "https://github.com/xobs/wishbone-utils#wishbone-tool";
+    homepage = "https://github.com/litex-hub/wishbone-utils";
     license = licenses.bsd2;
     maintainers = with maintainers; [ edef ];
     platforms = platforms.linux;

From 2494471a140ff025359272cac4bc4105ed0a8071 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 02:46:36 -0500
Subject: [PATCH 0834/4636] cntr: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/applications/virtualization/cntr/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix
index c5bbab39643f..f046e0e44b2c 100644
--- a/pkgs/applications/virtualization/cntr/default.nix
+++ b/pkgs/applications/virtualization/cntr/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0dhfz7aj3cqi974ybf0axchih40rzrs9m8bxhwz1hgig57aisfc0";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0xkwza9fx61pvlsm0s3dxc9i09mqp6c9df8w63fyiq7174vjxryx";
+  cargoSha256 = "088drkpkgq8psv5j6igxyhfvvbalzg6nd98r9z0nxkawck5i2clz";
 
   meta = with stdenv.lib; {
     description = "A container debugging tool based on FUSE";

From 201d464f1207961f535f3b70fb305dd016dcd882 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 18:41:54 -0500
Subject: [PATCH 0835/4636] pijul: fix build by migrating off legacy fetchCargo

Currently broken; see #79975 for details. Would also be fixed by #80153
eventually, but since we want to upgrade either way we might as well do so now.

https://hydra.nixos.org/job/nixpkgs/trunk/pijul.x86_64-linux
---
 .../version-management/pijul/default.nix        | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index c2df8c971b0e..c6c0f0a52f4b 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -20,8 +20,18 @@ in rustPlatform.buildRustPackage rec {
     sha256 = "1rm787kkh3ya8ix0rjvj7sbrg9armm0rnpkga6gjmsbg5bx20y4q";
   };
 
+  cargoSha256 = "0rf8qmgzgyl718yznbskzafyg963ygibjmqncd93zdandgl9nj5v";
+
+  # N.B. The cargo depfile checker expects us to have unpacked the src tarball
+  # into the standard dirname "source".
+  cargoDepsHook = ''
+    ln -s ${pname}-${version} source
+  '';
+
+  # TODO: Delete once pijul fixes upstream:
+  # https://nest.pijul.com/pijul_org/pijul/discussions/447
   postPatch = ''
-    pushd ../${pname}-${version}-vendor/thrussh/
+    pushd ../${pname}-${version}-vendor.tar.gz/thrussh/
     patch -p1 < ${./thrussh-build-fix.patch}
     substituteInPlace .cargo-checksum.json --replace \
       9696ed2422a483cd8de48ac241178a0441be6636909c76174c536b8b1cba9d45 \
@@ -45,11 +55,6 @@ in rustPlatform.buildRustPackage rec {
 
   doCheck = false;
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1w77s5q18yr1gqqif15wmrfdvv2chq8rq3w4dnmxg2gn0r7bmz2k";
-
   meta = with stdenv.lib; {
     description = "A distributed version control system";
     homepage = https://pijul.org;

From 2aa4fba8d13532c249a2e814017633e2737ded0a Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Wed, 25 Dec 2019 17:46:06 +0000
Subject: [PATCH 0836/4636] doc/ociTools: exec is a shell builtin, not an
 external command

---
 doc/builders/images/ocitools.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/builders/images/ocitools.xml b/doc/builders/images/ocitools.xml
index f61075b242f8..e8cd3472f54d 100644
--- a/doc/builders/images/ocitools.xml
+++ b/doc/builders/images/ocitools.xml
@@ -25,7 +25,7 @@
 buildContainer {
   args = [ (with pkgs; writeScript "run.sh" ''
     #!${bash}/bin/bash
-    ${coreutils}/bin/exec ${bash}/bin/bash
+    exec ${bash}/bin/bash
   '').outPath ]; <co xml:id='ex-ociTools-buildContainer-1' />
 
   mounts = {

From 3990b914c34e9e4503ebdea71e241f91e3bc788c Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 16 Feb 2020 08:31:03 -0800
Subject: [PATCH 0837/4636] manual: use quoted homepage urls

---
 doc/languages-frameworks/go.xml            | 2 +-
 doc/languages-frameworks/idris.section.md  | 2 +-
 doc/languages-frameworks/ocaml.xml         | 4 ++--
 doc/languages-frameworks/python.section.md | 6 +++---
 doc/languages-frameworks/rust.section.md   | 2 +-
 doc/stdenv/meta.xml                        | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml
index e8cf27d05652..84b146532b14 100644
--- a/doc/languages-frameworks/go.xml
+++ b/doc/languages-frameworks/go.xml
@@ -42,7 +42,7 @@ pet = buildGoModule rec {
 
   meta = with lib; {
     description = "Simple command-line snippet manager, written in Go";
-    homepage = https://github.com/knqyf263/pet;
+    homepage = "https://github.com/knqyf263/pet";
     license = licenses.mit;
     maintainers = with maintainers; [ kalbasit ];
     platforms = platforms.linux ++ platforms.darwin;
diff --git a/doc/languages-frameworks/idris.section.md b/doc/languages-frameworks/idris.section.md
index 8d7962d7fb9b..f071b9ce1785 100644
--- a/doc/languages-frameworks/idris.section.md
+++ b/doc/languages-frameworks/idris.section.md
@@ -96,7 +96,7 @@ build-idris-package  {
 
   meta = {
     description = "Idris YAML lib";
-    homepage = https://github.com/Heather/Idris.Yaml;
+    homepage = "https://github.com/Heather/Idris.Yaml";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.brainrape ];
   };
diff --git a/doc/languages-frameworks/ocaml.xml b/doc/languages-frameworks/ocaml.xml
index a0ea209b493c..3f72092ec150 100644
--- a/doc/languages-frameworks/ocaml.xml
+++ b/doc/languages-frameworks/ocaml.xml
@@ -36,7 +36,7 @@ buildDunePackage rec {
   doCheck = true;
 
   meta = {
-    homepage = https://github.com/inhabitedtype/angstrom;
+    homepage = "https://github.com/inhabitedtype/angstrom";
     description = "OCaml parser combinators built for speed and memory efficiency";
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ sternenseemann ];
@@ -63,7 +63,7 @@ buildDunePackage rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/flowtype/ocaml-wtf8;
+    homepage = "https://github.com/flowtype/ocaml-wtf8";
     description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates.";
     license = licenses.mit;
     maintainers = [ maintainers.eqyiel ];
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 2f66bf6d6105..650ed3428584 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -241,7 +241,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with lib; {
-    homepage = https://github.com/pytoolz/toolz;
+    homepage = "https://github.com/pytoolz/toolz";
     description = "List processing tools and functional utilities";
     license = licenses.bsd3;
     maintainers = with maintainers; [ fridh ];
@@ -335,7 +335,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ numpy multipledispatch dateutil ];
 
   meta = with lib; {
-    homepage = https://github.com/ContinuumIO/datashape;
+    homepage = "https://github.com/ContinuumIO/datashape";
     description = "A data description language";
     license = licenses.bsd2;
     maintainers = with maintainers; [ fridh ];
@@ -369,7 +369,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Pythonic binding for the libxml2 and libxslt libraries";
-    homepage = https://lxml.de;
+    homepage = "https://lxml.de";
     license = licenses.bsd3;
     maintainers = with maintainers; [ sjourdois ];
   };
diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 099872fba13d..f23926eee3b6 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with stdenv.lib; {
     description = "A fast line-oriented regex search tool, similar to ag and ack";
-    homepage = https://github.com/BurntSushi/ripgrep;
+    homepage = "https://github.com/BurntSushi/ripgrep";
     license = licenses.unlicense;
     maintainers = [ maintainers.tailhook ];
     platforms = platforms.all;
diff --git a/doc/stdenv/meta.xml b/doc/stdenv/meta.xml
index 9371196818ad..45f7834eb2cc 100644
--- a/doc/stdenv/meta.xml
+++ b/doc/stdenv/meta.xml
@@ -11,7 +11,7 @@ meta = with stdenv.lib; {
     GNU Hello is a program that prints "Hello, world!" when you run it.
     It is fully customizable.
   '';
-  homepage = https://www.gnu.org/software/hello/manual/;
+  homepage = "https://www.gnu.org/software/hello/manual/";
   license = licenses.gpl3Plus;
   maintainers = [ maintainers.eelco ];
   platforms = platforms.all;

From 1a492b64cfcaa8ca71be3e630c682a4628fe0f47 Mon Sep 17 00:00:00 2001
From: Jonas Nick <jonasd.nick@gmail.com>
Date: Sun, 16 Feb 2020 18:09:33 +0000
Subject: [PATCH 0838/4636] lnd 0.8.1 -> lnd 0.9.0

---
 pkgs/applications/blockchains/lnd.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd.nix
index fd18b3fa3997..dd45746c8df5 100644
--- a/pkgs/applications/blockchains/lnd.nix
+++ b/pkgs/applications/blockchains/lnd.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "lnd";
-  version = "0.8.1-beta";
+  version = "0.9.0-beta";
 
   src = fetchFromGitHub {
     owner = "lightningnetwork";
     repo = "lnd";
     rev = "v${version}";
-    sha256 = "0f9fx2y66l3wxiax2vl2966avamjarkv3vbn9dy0wbxkwg4pfayb";
+    sha256 = "1hq105s9ykp6nsn4iicjnl3mwspqkbfsswkx7sgzv3jggg08fkq9";
   };
 
-  modSha256 = "1i6xw2amkg4azvzybcl4pqxif9c0mv8ayrhz9hm8x85bz7i6a787";
+  modSha256 = "1pvcvpiz6ck8xkgpypchrq9kgkik0jxd7f3jhihbgldsh4zaqiaq";
 
   meta = with lib; {
     description = "Lightning Network Daemon";

From 39fd6223c866e4d57e12bfc70b2a45ab459f945c Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Sun, 16 Feb 2020 10:24:58 -0800
Subject: [PATCH 0839/4636] restic: switch to default go compiler

---
 pkgs/top-level/all-packages.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9eaa8525fc6b..ac069a1e2597 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15755,11 +15755,7 @@ in
 
   redstore = callPackage ../servers/http/redstore { };
 
-  restic = callPackage ../tools/backup/restic {
-    # Version 0.9.5 fails to build with go 1.13 due to dependency:
-    #    go: bazil.org/fuse@v0.0.0-20180421153158-65cc252bf669: Get https://proxy.golang.org/bazil.org/fuse/@v/v0.0.0-20180421153158-65cc252bf669.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:56450->[::1]:53: read: connection refused
-    buildGoPackage = buildGo112Package;
-  };
+  restic = callPackage ../tools/backup/restic { };
 
   restic-rest-server = callPackage ../tools/backup/restic/rest-server.nix { };
 

From 3e8e6bacd5aa81a7870b24a5a4fafaa510cca3c9 Mon Sep 17 00:00:00 2001
From: elseym <elseym@me.com>
Date: Sun, 16 Feb 2020 19:44:25 +0100
Subject: [PATCH 0840/4636] plex: 1.18.4.2171 -> 1.18.6.2368

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

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index 380e5bb4be51..2586171a7cf0 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -8,13 +8,13 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.18.4.2171-ac2afe5f8";
+  version = "1.18.6.2368-97add474d";
   pname = "plexmediaserver";
 
   # Fetch the source
   src = fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm";
-    sha256 = "10x4cf1c826vj9gqr7r6k70rrjifmi36sd7imfi7pdw5swizjzqv";
+    sha256 = "0d2nnvw9qpmsra6g044bz192v67igcp1mfayy4sk0j2yqgiqvcgl";
   };
 
   outputs = [ "out" "basedb" ];

From a5dc839bcc5cda8c384faea045021b91e853b4f8 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 13:46:58 -0500
Subject: [PATCH 0841/4636] uq: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/misc/uq/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/misc/uq/default.nix b/pkgs/misc/uq/default.nix
index 3f3ba291dd74..fe3a1e2a5d15 100755
--- a/pkgs/misc/uq/default.nix
+++ b/pkgs/misc/uq/default.nix
@@ -14,10 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1qqqmdk0v1d3ckasmmw5lbrkvhkv0nws4bzi9cfi1ndhrbvbkbxb";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1s22v2wz5h3l5l447zl54bhdk6avkk2ycrbbpxcx1442lllbss4w";
+  cargoSha256 = "1fv13rbghfw7114h7sda04gpqrjrsgnnki0p9kdd6r6sk5cbhn9x";
 
   meta = with lib; {
     description = "A simple, user-friendly alternative to sort | uniq";

From 36279a03ed7b1c2c3f83aa1852f8c047ec982838 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 13:51:41 -0500
Subject: [PATCH 0842/4636] cargo-about: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/package-management/cargo-about/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/tools/package-management/cargo-about/default.nix
index bee0ee7d3d88..82da6b7b93c7 100644
--- a/pkgs/tools/package-management/cargo-about/default.nix
+++ b/pkgs/tools/package-management/cargo-about/default.nix
@@ -10,10 +10,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0bsay1vqi5b3z7qjwbkwx3ikmpjzc0kswbajm50xmcwlg8jrn420";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1mqicibpa9sxac8v2kk8vfvxcis2wkdkklia2pbspc0pz3h0c8if";
+  cargoSha256 = "1ynalwaqa70ihgras3frp5l3xniz58hwp108wkxn6zj8lwxbxfgx";
 
   meta = with lib; {
     description = "Cargo plugin to generate list of all licenses for a crate";

From 98d2f4e96b9af1664e9d1ac3885b6f6457f20978 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 13:53:35 -0500
Subject: [PATCH 0843/4636] cargo-deps: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/package-management/cargo-deps/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-deps/default.nix b/pkgs/tools/package-management/cargo-deps/default.nix
index b5dafc544fbb..d0768300d82e 100644
--- a/pkgs/tools/package-management/cargo-deps/default.nix
+++ b/pkgs/tools/package-management/cargo-deps/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "16181p7ghvy9mqippg1xi2cw7yxvicis8v6n39wly5qw05i57aw2";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1a9svdw1cgk6s7gqpsq3r25wxa2gr2xddqkc1cjk7hf6sk327cpv";
+  cargoSha256 = "1zk6pf7agqs1mpld40rn05cwp4wy0vpjnn5ip6m83bxm8b3i87wk";
 
   meta = with lib; {
     description = "Cargo subcommand for building dependency graphs of Rust projects";

From 8625e276b216b0613c519369861527530b8028f5 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 13:55:19 -0500
Subject: [PATCH 0844/4636] emplace: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/package-management/emplace/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix
index 6b39ed9d1c4e..321897369dbf 100644
--- a/pkgs/tools/package-management/emplace/default.nix
+++ b/pkgs/tools/package-management/emplace/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1y77cla6bgy8pjb21cawx7cb69hhri4r7gyjkhnjyiixkh945mwj";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "119llsc8m7qda2cjnd45ndml148z8074f76xygkz6fp3m1c2z3pw";
+  cargoSha256 = "1vkcr239axxqya0iin74jxkmx6z9nwb67pjjdh89v4qwjvwhiqg3";
 
   meta = with lib; {
     description = "Mirror installed software on multiple machines";

From 46d46b7a6968ece9000b2a0af3a322df0c7447dc Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 13:56:02 -0500
Subject: [PATCH 0845/4636] cargo-graph: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/package-management/cargo-graph/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-graph/default.nix b/pkgs/tools/package-management/cargo-graph/default.nix
index 1f0b11ad9786..4d35e284040b 100644
--- a/pkgs/tools/package-management/cargo-graph/default.nix
+++ b/pkgs/tools/package-management/cargo-graph/default.nix
@@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0myg26cssmbakz53dl61lswsbaqnjqlbc30c2571pq8f7gvz2qv5";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1k4byg77s1iqhry96pl57mbsvd32sbnvf60dlbd62pvan39rispg";
+  cargoSha256 = "0fzj88iy57c39yi8pf3agfmsf2dck06f0yqmlnsaxvvp4cknkw1n";
 
   meta = with lib; {
     description = "A cargo subcommand for creating GraphViz DOT files and dependency graphs";

From 2926041c6ab010516418dcea988edaa6974e02d4 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 13:57:12 -0500
Subject: [PATCH 0846/4636] cargo-edit: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/package-management/cargo-edit/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix
index 77753dc33492..b15400e576ef 100644
--- a/pkgs/tools/package-management/cargo-edit/default.nix
+++ b/pkgs/tools/package-management/cargo-edit/default.nix
@@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "16gpljbzk6cibry9ssnl22xbcsx2cr57mrs3x3n6cfmldbp6bhbr";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1cjpbfgbqzlfs5hck2j3d2v719fwandpnc7bdk4243j7j0k1ng9q";
+  cargoSha256 = "1zwkar914zyghky09lgk0s374m5d6yccn0m15bqlgxxyymg4b59y";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];

From 66e5cc0bd2d712998ca4f2eb4f797f592fc86e94 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 15:10:10 -0500
Subject: [PATCH 0847/4636] cargo-outdated: 0.9.1 -> 0.9.5

Upstream is now vendoring the Cargo.lock file for reproducible app builds, so we
can now remove the patching workaround. However, they're missing a git tag, so
we have to do some work to find the right git commit.
---
 .../cargo-outdated/cargo-lock.patch           | 1283 -----------------
 .../cargo-outdated/default.nix                |   15 +-
 .../cargo-outdated/update-cargo-lock.sh       |   18 -
 3 files changed, 7 insertions(+), 1309 deletions(-)
 delete mode 100644 pkgs/tools/package-management/cargo-outdated/cargo-lock.patch
 delete mode 100755 pkgs/tools/package-management/cargo-outdated/update-cargo-lock.sh

diff --git a/pkgs/tools/package-management/cargo-outdated/cargo-lock.patch b/pkgs/tools/package-management/cargo-outdated/cargo-lock.patch
deleted file mode 100644
index 7e0528eda2ac..000000000000
--- a/pkgs/tools/package-management/cargo-outdated/cargo-lock.patch
+++ /dev/null
@@ -1,1283 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-new file mode 100644
-index 0000000..0f18cc6
---- /dev/null
-+++ b/Cargo.lock
-@@ -0,0 +1,1277 @@
-+# This file is automatically @generated by Cargo.
-+# It is not intended for manual editing.
-+[[package]]
-+name = "adler32"
-+version = "1.0.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
-+
-+[[package]]
-+name = "aho-corasick"
-+version = "0.7.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
-+dependencies = [
-+ "memchr",
-+]
-+
-+[[package]]
-+name = "ansi_term"
-+version = "0.11.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-+dependencies = [
-+ "winapi",
-+]
-+
-+[[package]]
-+name = "atty"
-+version = "0.2.13"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
-+dependencies = [
-+ "libc",
-+ "winapi",
-+]
-+
-+[[package]]
-+name = "autocfg"
-+version = "0.1.7"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
-+
-+[[package]]
-+name = "backtrace"
-+version = "0.3.40"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
-+dependencies = [
-+ "backtrace-sys",
-+ "cfg-if",
-+ "libc",
-+ "rustc-demangle",
-+]
-+
-+[[package]]
-+name = "backtrace-sys"
-+version = "0.1.32"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
-+dependencies = [
-+ "cc",
-+ "libc",
-+]
-+
-+[[package]]
-+name = "bitflags"
-+version = "1.2.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-+
-+[[package]]
-+name = "bstr"
-+version = "0.2.8"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245"
-+dependencies = [
-+ "memchr",
-+]
-+
-+[[package]]
-+name = "bytesize"
-+version = "1.0.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "716960a18f978640f25101b5cbf1c6f6b0d3192fab36a2d98ca96f0ecbe41010"
-+
-+[[package]]
-+name = "c2-chacha"
-+version = "0.2.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
-+dependencies = [
-+ "ppv-lite86",
-+]
-+
-+[[package]]
-+name = "cargo"
-+version = "0.40.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "03504435a39de1303decb9c9a7416e875f16d4b94769d4d0dd5e1bfb21229640"
-+dependencies = [
-+ "atty",
-+ "bytesize",
-+ "clap",
-+ "core-foundation",
-+ "crates-io",
-+ "crossbeam-utils",
-+ "crypto-hash",
-+ "curl",
-+ "curl-sys",
-+ "env_logger 0.6.2",
-+ "failure",
-+ "filetime",
-+ "flate2",
-+ "fs2",
-+ "fwdansi",
-+ "git2",
-+ "git2-curl",
-+ "glob",
-+ "hex 0.4.0",
-+ "home",
-+ "humantime",
-+ "ignore",
-+ "im-rc",
-+ "jobserver",
-+ "lazy_static",
-+ "lazycell",
-+ "libc",
-+ "libgit2-sys",
-+ "log",
-+ "memchr",
-+ "miow",
-+ "num_cpus",
-+ "opener",
-+ "percent-encoding",
-+ "remove_dir_all",
-+ "rustc-workspace-hack",
-+ "rustfix",
-+ "same-file",
-+ "semver",
-+ "serde",
-+ "serde_ignored",
-+ "serde_json",
-+ "shell-escape",
-+ "strip-ansi-escapes",
-+ "tar",
-+ "tempfile",
-+ "termcolor",
-+ "toml",
-+ "unicode-width",
-+ "url",
-+ "walkdir",
-+ "winapi",
-+]
-+
-+[[package]]
-+name = "cargo-outdated"
-+version = "0.9.1"
-+dependencies = [
-+ "cargo",
-+ "docopt",
-+ "env_logger 0.7.1",
-+ "failure",
-+ "semver",
-+ "serde",
-+ "serde_derive",
-+ "serde_json",
-+ "tabwriter",
-+ "tempfile",
-+ "termcolor",
-+ "toml",
-+]
-+
-+[[package]]
-+name = "cc"
-+version = "1.0.48"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f52a465a666ca3d838ebbf08b241383421412fe7ebb463527bba275526d89f76"
-+dependencies = [
-+ "jobserver",
-+ "num_cpus",
-+]
-+
-+[[package]]
-+name = "cfg-if"
-+version = "0.1.10"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-+
-+[[package]]
-+name = "clap"
-+version = "2.33.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
-+dependencies = [
-+ "ansi_term",
-+ "atty",
-+ "bitflags",
-+ "strsim 0.8.0",
-+ "textwrap",
-+ "unicode-width",
-+ "vec_map",
-+]
-+
-+[[package]]
-+name = "commoncrypto"
-+version = "0.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007"
-+dependencies = [
-+ "commoncrypto-sys",
-+]
-+
-+[[package]]
-+name = "commoncrypto-sys"
-+version = "0.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2"
-+dependencies = [
-+ "libc",
-+]
-+
-+[[package]]
-+name = "core-foundation"
-+version = "0.6.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
-+dependencies = [
-+ "core-foundation-sys",
-+ "libc",
-+]
-+
-+[[package]]
-+name = "core-foundation-sys"
-+version = "0.6.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
-+
-+[[package]]
-+name = "crates-io"
-+version = "0.28.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9dc57b7035c84bcaaa14d89221491b624a32977c230ce6bb77ae191e880c48e1"
-+dependencies = [
-+ "curl",
-+ "failure",
-+ "percent-encoding",
-+ "serde",
-+ "serde_derive",
-+ "serde_json",
-+ "url",
-+]
-+
-+[[package]]
-+name = "crc32fast"
-+version = "1.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
-+dependencies = [
-+ "cfg-if",
-+]
-+
-+[[package]]
-+name = "crossbeam-channel"
-+version = "0.3.9"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa"
-+dependencies = [
-+ "crossbeam-utils",
-+]
-+
-+[[package]]
-+name = "crossbeam-utils"
-+version = "0.6.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
-+dependencies = [
-+ "cfg-if",
-+ "lazy_static",
-+]
-+
-+[[package]]
-+name = "crypto-hash"
-+version = "0.3.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8a77162240fd97248d19a564a565eb563a3f592b386e4136fb300909e67dddca"
-+dependencies = [
-+ "commoncrypto",
-+ "hex 0.3.2",
-+ "openssl",
-+ "winapi",
-+]
-+
-+[[package]]
-+name = "curl"
-+version = "0.4.25"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "06aa71e9208a54def20792d877bc663d6aae0732b9852e612c4a933177c31283"
-+dependencies = [
-+ "curl-sys",
-+ "libc",
-+ "openssl-probe",
-+ "openssl-sys",
-+ "schannel",
-+ "socket2",
-+ "winapi",
-+]
-+
-+[[package]]
-+name = "curl-sys"
-+version = "0.4.24"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f659f3ffac9582d6177bb86d1d2aa649f4eb9d0d4de9d03ccc08b402832ea340"
-+dependencies = [
-+ "cc",
-+ "libc",
-+ "libnghttp2-sys",
-+ "libz-sys",
-+ "openssl-sys",
-+ "pkg-config",
-+ "vcpkg",
-+ "winapi",
-+]
-+
-+[[package]]
-+name = "docopt"
-+version = "1.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969"
-+dependencies = [
-+ "lazy_static",
-+ "regex",
-+ "serde",
-+ "strsim 0.9.3",
-+]
-+
-+[[package]]
-+name = "env_logger"
-+version = "0.6.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
-+dependencies = [
-+ "atty",
-+ "humantime",
-+ "log",
-+ "regex",
-+ "termcolor",
-+]
-+
-+[[package]]
-+name = "env_logger"
-+version = "0.7.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
-+dependencies = [
-+ "atty",
-+ "humantime",
-+ "log",
-+ "regex",
-+ "termcolor",
-+]
-+
-+[[package]]
-+name = "failure"
-+version = "0.1.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9"
-+dependencies = [
-+ "backtrace",
-+ "failure_derive",
-+]
-+
-+[[package]]
-+name = "failure_derive"
-+version = "0.1.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08"
-+dependencies = [
-+ "proc-macro2",
-+ "quote",
-+ "syn",
-+ "synstructure",
-+]
-+
-+[[package]]
-+name = "filetime"
-+version = "0.2.8"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d"
-+dependencies = [
-+ "cfg-if",
-+ "libc",
-+ "redox_syscall",
-+ "winapi",
-+]
-+
-+[[package]]
-+name = "flate2"
-+version = "1.0.13"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f"
-+dependencies = [
-+ "cfg-if",
-+ "crc32fast",
-+ "libc",
-+ "libz-sys",
-+ "miniz_oxide",
-+]
-+
-+[[package]]
-+name = "fnv"
-+version = "1.0.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
-+
-+[[package]]
-+name = "foreign-types"
-+version = "0.3.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-+dependencies = [
-+ "foreign-types-shared",
-+]
-+
-+[[package]]
-+name = "foreign-types-shared"
-+version = "0.1.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-+
-+[[package]]
-+name = "fs2"
-+version = "0.4.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
-+dependencies = [
-+ "libc",
-+ "winapi",
-+]
-+
-+[[package]]
-+name = "fwdansi"
-+version = "1.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "08c1f5787fe85505d1f7777268db5103d80a7a374d2316a7ce262e57baf8f208"
-+dependencies = [
-+ "memchr",
-+ "termcolor",
-+]
-+
-+[[package]]
-+name = "getrandom"
-+version = "0.1.13"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407"
-+dependencies = [
-+ "cfg-if",
-+ "libc",
-+ "wasi",
-+]
-+
-+[[package]]
-+name = "git2"
-+version = "0.10.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7c1af51ea8a906616af45a4ce78eacf25860f7a13ae7bf8a814693f0f4037a26"
-+dependencies = [
-+ "bitflags",
-+ "libc",
-+ "libgit2-sys",
-+ "log",
-+ "openssl-probe",
-+ "openssl-sys",
-+ "url",
-+]
-+
-+[[package]]
-+name = "git2-curl"
-+version = "0.11.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "cd6527e480187ce19aaf4fa6acfb7657b25628ce31cb8ffabdfca3bf731524c5"
-+dependencies = [
-+ "curl",
-+ "git2",
-+ "log",
-+ "url",
-+]
-+
-+[[package]]
-+name = "glob"
-+version = "0.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
-+
-+[[package]]
-+name = "globset"
-+version = "0.4.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "925aa2cac82d8834e2b2a4415b6f6879757fb5c0928fc445ae76461a12eed8f2"
-+dependencies = [
-+ "aho-corasick",
-+ "bstr",
-+ "fnv",
-+ "log",
-+ "regex",
-+]
-+
-+[[package]]
-+name = "hermit-abi"
-+version = "0.1.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120"
-+dependencies = [
-+ "libc",
-+]
-+
-+[[package]]
-+name = "hex"
-+version = "0.3.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
-+
-+[[package]]
-+name = "hex"
-+version = "0.4.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "023b39be39e3a2da62a94feb433e91e8bcd37676fbc8bea371daf52b7a769a3e"
-+
-+[[package]]
-+name = "home"
-+version = "0.5.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a3753954f7bd71f0e671afb8b5a992d1724cf43b7f95a563cd4a0bde94659ca8"
-+dependencies = [
-+ "scopeguard",
-+ "winapi",
-+]
-+
-+[[package]]
-+name = "humantime"
-+version = "1.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-+dependencies = [
-+ "quick-error",
-+]
-+
-+[[package]]
-+name = "idna"
-+version = "0.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
-+dependencies = [
-+ "matches",
-+ "unicode-bidi",
-+ "unicode-normalization",
-+]
-+
-+[[package]]
-+name = "ignore"
-+version = "0.4.10"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0ec16832258409d571aaef8273f3c3cc5b060d784e159d1a0f3b0017308f84a7"
-+dependencies = [
-+ "crossbeam-channel",
-+ "globset",
-+ "lazy_static",
-+ "log",
-+ "memchr",
-+ "regex",
-+ "same-file",
-+ "thread_local",
-+ "walkdir",
-+ "winapi-util",
-+]
-+
-+[[package]]
-+name = "im-rc"
-+version = "13.0.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0a0197597d095c0d11107975d3175173f810ee572c2501ff4de64f4f3f119806"
-+dependencies = [
-+ "rustc_version",
-+ "sized-chunks",
-+ "typenum",
-+]
-+
-+[[package]]
-+name = "itoa"
-+version = "0.4.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
-+
-+[[package]]
-+name = "jobserver"
-+version = "0.1.17"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f2b1d42ef453b30b7387e113da1c83ab1605d90c5b4e0eb8e96d016ed3b8c160"
-+dependencies = [
-+ "getrandom",
-+ "libc",
-+ "log",
-+]
-+
-+[[package]]
-+name = "lazy_static"
-+version = "1.4.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-+
-+[[package]]
-+name = "lazycell"
-+version = "1.2.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
-+
-+[[package]]
-+name = "libc"
-+version = "0.2.66"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
-+
-+[[package]]
-+name = "libgit2-sys"
-+version = "0.9.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4870c781f6063efb83150cd22c1ddf6ecf58531419e7570cdcced46970f64a16"
-+dependencies = [
-+ "cc",
-+ "libc",
-+ "libssh2-sys",
-+ "libz-sys",
-+ "openssl-sys",
-+ "pkg-config",
-+]
-+
-+[[package]]
-+name = "libnghttp2-sys"
-+version = "0.1.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "02254d44f4435dd79e695f2c2b83cd06a47919adea30216ceaf0c57ca0a72463"
-+dependencies = [
-+ "cc",
-+ "libc",
-+]
-+
-+[[package]]
-+name = "libssh2-sys"
-+version = "0.2.13"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5fcd5a428a31cbbfe059812d74f4b6cd3b9b7426c2bdaec56993c5365da1c328"
-+dependencies = [
-+ "cc",
-+ "libc",
-+ "libz-sys",
-+ "openssl-sys",
-+ "pkg-config",
-+ "vcpkg",
-+]
-+
-+[[package]]
-+name = "libz-sys"
-+version = "1.0.25"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
-+dependencies = [
-+ "cc",
-+ "libc",
-+ "pkg-config",
-+ "vcpkg",
-+]
-+
-+[[package]]
-+name = "log"
-+version = "0.4.8"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
-+dependencies = [
-+ "cfg-if",
-+]
-+
-+[[package]]
-+name = "matches"
-+version = "0.1.8"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
-+
-+[[package]]
-+name = "memchr"
-+version = "2.2.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
-+
-+[[package]]
-+name = "miniz_oxide"
-+version = "0.3.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625"
-+dependencies = [
-+ "adler32",
-+]
-+
-+[[package]]
-+name = "miow"
-+version = "0.3.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "396aa0f2003d7df8395cb93e09871561ccc3e785f0acb369170e8cc74ddf9226"
-+dependencies = [
-+ "socket2",
-+ "winapi",
-+]
-+
-+[[package]]
-+name = "num_cpus"
-+version = "1.11.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72"
-+dependencies = [
-+ "hermit-abi",
-+ "libc",
-+]
-+
-+[[package]]
-+name = "opener"
-+version = "0.4.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "13117407ca9d0caf3a0e74f97b490a7e64c0ae3aa90a8b7085544d0c37b6f3ae"
-+dependencies = [
-+ "winapi",
-+]
-+
-+[[package]]
-+name = "openssl"
-+version = "0.10.26"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585"
-+dependencies = [
-+ "bitflags",
-+ "cfg-if",
-+ "foreign-types",
-+ "lazy_static",
-+ "libc",
-+ "openssl-sys",
-+]
-+
-+[[package]]
-+name = "openssl-probe"
-+version = "0.1.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
-+
-+[[package]]
-+name = "openssl-sys"
-+version = "0.9.53"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f"
-+dependencies = [
-+ "autocfg",
-+ "cc",
-+ "libc",
-+ "pkg-config",
-+ "vcpkg",
-+]
-+
-+[[package]]
-+name = "percent-encoding"
-+version = "2.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
-+
-+[[package]]
-+name = "pkg-config"
-+version = "0.3.17"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
-+
-+[[package]]
-+name = "ppv-lite86"
-+version = "0.2.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
-+
-+[[package]]
-+name = "proc-macro2"
-+version = "1.0.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27"
-+dependencies = [
-+ "unicode-xid",
-+]
-+
-+[[package]]
-+name = "quick-error"
-+version = "1.2.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
-+
-+[[package]]
-+name = "quote"
-+version = "1.0.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
-+dependencies = [
-+ "proc-macro2",
-+]
-+
-+[[package]]
-+name = "rand"
-+version = "0.7.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412"
-+dependencies = [
-+ "getrandom",
-+ "libc",
-+ "rand_chacha",
-+ "rand_core",
-+ "rand_hc",
-+]
-+
-+[[package]]
-+name = "rand_chacha"
-+version = "0.2.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
-+dependencies = [
-+ "c2-chacha",
-+ "rand_core",
-+]
-+
-+[[package]]
-+name = "rand_core"
-+version = "0.5.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-+dependencies = [
-+ "getrandom",
-+]
-+
-+[[package]]
-+name = "rand_hc"
-+version = "0.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-+dependencies = [
-+ "rand_core",
-+]
-+
-+[[package]]
-+name = "redox_syscall"
-+version = "0.1.56"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
-+
-+[[package]]
-+name = "regex"
-+version = "1.3.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd"
-+dependencies = [
-+ "aho-corasick",
-+ "memchr",
-+ "regex-syntax",
-+ "thread_local",
-+]
-+
-+[[package]]
-+name = "regex-syntax"
-+version = "0.6.12"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
-+
-+[[package]]
-+name = "remove_dir_all"
-+version = "0.5.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
-+dependencies = [
-+ "winapi",
-+]
-+
-+[[package]]
-+name = "rustc-demangle"
-+version = "0.1.16"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
-+
-+[[package]]
-+name = "rustc-workspace-hack"
-+version = "1.0.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fc71d2faa173b74b232dedc235e3ee1696581bb132fc116fa3626d6151a1a8fb"
-+
-+[[package]]
-+name = "rustc_version"
-+version = "0.2.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-+dependencies = [
-+ "semver",
-+]
-+
-+[[package]]
-+name = "rustfix"
-+version = "0.4.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7150ac777a2931a53489f5a41eb0937b84e3092a20cd0e73ad436b65b507f607"
-+dependencies = [
-+ "failure",
-+ "log",
-+ "serde",
-+ "serde_json",
-+]
-+
-+[[package]]
-+name = "ryu"
-+version = "1.0.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
-+
-+[[package]]
-+name = "same-file"
-+version = "1.0.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"
-+dependencies = [
-+ "winapi-util",
-+]
-+
-+[[package]]
-+name = "schannel"
-+version = "0.1.16"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021"
-+dependencies = [
-+ "lazy_static",
-+ "winapi",
-+]
-+
-+[[package]]
-+name = "scopeguard"
-+version = "1.0.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
-+
-+[[package]]
-+name = "semver"
-+version = "0.9.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-+dependencies = [
-+ "semver-parser",
-+ "serde",
-+]
-+
-+[[package]]
-+name = "semver-parser"
-+version = "0.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-+
-+[[package]]
-+name = "serde"
-+version = "1.0.103"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1217f97ab8e8904b57dd22eb61cde455fa7446a9c1cf43966066da047c1f3702"
-+dependencies = [
-+ "serde_derive",
-+]
-+
-+[[package]]
-+name = "serde_derive"
-+version = "1.0.103"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a8c6faef9a2e64b0064f48570289b4bf8823b7581f1d6157c1b52152306651d0"
-+dependencies = [
-+ "proc-macro2",
-+ "quote",
-+ "syn",
-+]
-+
-+[[package]]
-+name = "serde_ignored"
-+version = "0.1.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7248fdcbd17d3f2604fc2a02d0ecc844d9a7bf52bf95fc196d9f0a38f6da6a0e"
-+dependencies = [
-+ "serde",
-+]
-+
-+[[package]]
-+name = "serde_json"
-+version = "1.0.44"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7"
-+dependencies = [
-+ "itoa",
-+ "ryu",
-+ "serde",
-+]
-+
-+[[package]]
-+name = "shell-escape"
-+version = "0.1.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "170a13e64f2a51b77a45702ba77287f5c6829375b04a69cf2222acd17d0cfab9"
-+
-+[[package]]
-+name = "sized-chunks"
-+version = "0.3.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f01db57d7ee89c8e053245deb77040a6cc8508311f381c88749c33d4b9b78785"
-+dependencies = [
-+ "typenum",
-+]
-+
-+[[package]]
-+name = "smallvec"
-+version = "1.0.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86"
-+
-+[[package]]
-+name = "socket2"
-+version = "0.3.11"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85"
-+dependencies = [
-+ "cfg-if",
-+ "libc",
-+ "redox_syscall",
-+ "winapi",
-+]
-+
-+[[package]]
-+name = "strip-ansi-escapes"
-+version = "0.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9d63676e2abafa709460982ddc02a3bb586b6d15a49b75c212e06edd3933acee"
-+dependencies = [
-+ "vte",
-+]
-+
-+[[package]]
-+name = "strsim"
-+version = "0.8.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-+
-+[[package]]
-+name = "strsim"
-+version = "0.9.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
-+
-+[[package]]
-+name = "syn"
-+version = "1.0.11"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "dff0acdb207ae2fe6d5976617f887eb1e35a2ba52c13c7234c790960cdad9238"
-+dependencies = [
-+ "proc-macro2",
-+ "quote",
-+ "unicode-xid",
-+]
-+
-+[[package]]
-+name = "synstructure"
-+version = "0.12.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
-+dependencies = [
-+ "proc-macro2",
-+ "quote",
-+ "syn",
-+ "unicode-xid",
-+]
-+
-+[[package]]
-+name = "tabwriter"
-+version = "1.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9128e3a9149e51494cad59712a286e149fcb74e443d2298d69bd6eaa42cc4ebb"
-+dependencies = [
-+ "unicode-width",
-+]
-+
-+[[package]]
-+name = "tar"
-+version = "0.4.26"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b3196bfbffbba3e57481b6ea32249fbaf590396a52505a2615adbb79d9d826d3"
-+dependencies = [
-+ "filetime",
-+ "libc",
-+ "redox_syscall",
-+]
-+
-+[[package]]
-+name = "tempfile"
-+version = "3.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
-+dependencies = [
-+ "cfg-if",
-+ "libc",
-+ "rand",
-+ "redox_syscall",
-+ "remove_dir_all",
-+ "winapi",
-+]
-+
-+[[package]]
-+name = "termcolor"
-+version = "1.0.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e"
-+dependencies = [
-+ "wincolor",
-+]
-+
-+[[package]]
-+name = "textwrap"
-+version = "0.11.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-+dependencies = [
-+ "unicode-width",
-+]
-+
-+[[package]]
-+name = "thread_local"
-+version = "0.3.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
-+dependencies = [
-+ "lazy_static",
-+]
-+
-+[[package]]
-+name = "toml"
-+version = "0.5.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf"
-+dependencies = [
-+ "serde",
-+]
-+
-+[[package]]
-+name = "typenum"
-+version = "1.11.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9"
-+
-+[[package]]
-+name = "unicode-bidi"
-+version = "0.3.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-+dependencies = [
-+ "matches",
-+]
-+
-+[[package]]
-+name = "unicode-normalization"
-+version = "0.1.11"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b561e267b2326bb4cebfc0ef9e68355c7abe6c6f522aeac2f5bf95d56c59bdcf"
-+dependencies = [
-+ "smallvec",
-+]
-+
-+[[package]]
-+name = "unicode-width"
-+version = "0.1.7"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
-+
-+[[package]]
-+name = "unicode-xid"
-+version = "0.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
-+
-+[[package]]
-+name = "url"
-+version = "2.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61"
-+dependencies = [
-+ "idna",
-+ "matches",
-+ "percent-encoding",
-+]
-+
-+[[package]]
-+name = "utf8parse"
-+version = "0.1.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8772a4ccbb4e89959023bc5b7cb8623a795caa7092d99f3aa9501b9484d4557d"
-+
-+[[package]]
-+name = "vcpkg"
-+version = "0.2.8"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
-+
-+[[package]]
-+name = "vec_map"
-+version = "0.8.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
-+
-+[[package]]
-+name = "vte"
-+version = "0.3.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4f42f536e22f7fcbb407639765c8fd78707a33109301f834a594758bedd6e8cf"
-+dependencies = [
-+ "utf8parse",
-+]
-+
-+[[package]]
-+name = "walkdir"
-+version = "2.2.9"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e"
-+dependencies = [
-+ "same-file",
-+ "winapi",
-+ "winapi-util",
-+]
-+
-+[[package]]
-+name = "wasi"
-+version = "0.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
-+
-+[[package]]
-+name = "winapi"
-+version = "0.3.8"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
-+dependencies = [
-+ "winapi-i686-pc-windows-gnu",
-+ "winapi-x86_64-pc-windows-gnu",
-+]
-+
-+[[package]]
-+name = "winapi-i686-pc-windows-gnu"
-+version = "0.4.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-+
-+[[package]]
-+name = "winapi-util"
-+version = "0.1.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
-+dependencies = [
-+ "winapi",
-+]
-+
-+[[package]]
-+name = "winapi-x86_64-pc-windows-gnu"
-+version = "0.4.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-+
-+[[package]]
-+name = "wincolor"
-+version = "1.0.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9"
-+dependencies = [
-+ "winapi",
-+ "winapi-util",
-+]
diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix
index 667a1a21a2d4..7fc7d93f927b 100644
--- a/pkgs/tools/package-management/cargo-outdated/default.nix
+++ b/pkgs/tools/package-management/cargo-outdated/default.nix
@@ -2,20 +2,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-outdated";
-  version = "0.9.1";
+  version = "0.9.5";
 
   src = fetchFromGitHub {
     owner = "kbknapp";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "02gsarwm4gjkr9m4sfbjwp37xmqhch8qpyy027bxqkg8iyipxm69";
+    # This is the git commit that produced 0.9.5, according to crates.io, but
+    # the tag is missing in git. See here for details:
+    # https://github.com/kbknapp/cargo-outdated/issues/206
+    rev = "7685da3265749bb7ae2b436a132f51d19b409bff";
+    sha256 = "08prksns7d3g7ha601z8p28p36rg44rjl5ph76vg6nriww96zzca";
   };
 
-  cargoPatches = [ ./cargo-lock.patch ];
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1ywmrvkwwwwh99l4j8vc4cyk8qjd0jx8hn68yr2h31ya1bzcqbd1";
+  cargoSha256 = "0kxfavyd9slpp2kzxhjp47q1pzw9rlmn7yhxnjsg88sxbjxfzv95";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ openssl ]
diff --git a/pkgs/tools/package-management/cargo-outdated/update-cargo-lock.sh b/pkgs/tools/package-management/cargo-outdated/update-cargo-lock.sh
deleted file mode 100755
index 21ee27c59b74..000000000000
--- a/pkgs/tools/package-management/cargo-outdated/update-cargo-lock.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# This updates cargo-lock.patch for the cargo-outdated version listed in default.nix.
-
-set -eu -o verbose
-
-here=$PWD
-version=$(cat default.nix | grep '^  version = "' | cut -d '"' -f 2)
-checkout=$(mktemp -d)
-git clone -b "v$version" --depth=1 https://github.com/kbknapp/cargo-outdated "$checkout"
-cd "$checkout"
-
-cargo generate-lockfile
-git add -f Cargo.lock
-git diff HEAD -- Cargo.lock > "$here"/cargo-lock.patch
-
-cd "$here"
-rm -rf "$checkout"

From 3388643b8e72254a679e1382af60c1e63f62bfa2 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 16 Feb 2020 20:14:13 +0000
Subject: [PATCH 0848/4636] flashrom: switch to Meson build and update deps

---
 pkgs/tools/misc/flashrom/default.nix | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix
index 143bc805decd..3b9e600dcdbe 100644
--- a/pkgs/tools/misc/flashrom/default.nix
+++ b/pkgs/tools/misc/flashrom/default.nix
@@ -1,4 +1,13 @@
-{ lib, stdenv, fetchurl, pkgconfig, libftdi, pciutils }:
+{ lib
+, stdenv
+, fetchurl
+, meson
+, ninja
+, pkgconfig
+, libftdi1
+, libusb1
+, pciutils
+}:
 
 stdenv.mkDerivation rec {
   pname = "flashrom";
@@ -9,23 +18,16 @@ stdenv.mkDerivation rec {
     sha256 = "0ax4kqnh7kd3z120ypgp73qy1knz47l6qxsqzrfkd97mh5cdky71";
   };
 
-  # Newer versions of libusb deprecate some API flashrom uses.
-  #postPatch = ''
-  #  substituteInPlace Makefile \
-  #    --replace "-Werror" "-Werror -Wno-error=deprecated-declarations -Wno-error=unused-const-variable="
-  #'';
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libftdi pciutils ];
-
-  preConfigure = "export PREFIX=$out";
+  nativeBuildInputs = [ meson pkgconfig ninja ];
+  buildInputs = [ libftdi1 libusb1 pciutils ];
 
   meta = with lib; {
     homepage = http://www.flashrom.org;
     description = "Utility for reading, writing, erasing and verifying flash ROM chips";
     license = licenses.gpl2;
     maintainers = with maintainers; [ funfunctor fpletz ];
-    platforms = with platforms; linux;
+    platforms = platforms.all;
+    # https://github.com/flashrom/flashrom/issues/125
     badPlatforms = [ "aarch64-linux" ];
   };
 }

From 6888cae7d672465f9eab60ff53df22622ed8c571 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=BChrk?= <andy@hammerhartes.de>
Date: Sun, 16 Feb 2020 21:29:14 +0100
Subject: [PATCH 0849/4636] skaffold: 1.2.0 -> 1.3.1

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

diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix
index d485ac199969..325338c376a2 100644
--- a/pkgs/development/tools/skaffold/default.nix
+++ b/pkgs/development/tools/skaffold/default.nix
@@ -2,9 +2,9 @@
 
 buildGoPackage rec {
   pname = "skaffold";
-  version = "1.2.0";
-  # rev is the 1.2.0 commit, mainly for skaffold version command output
-  rev = "80f82f42fe271aea1058f4a37776d52ab5a7c441";
+  version = "1.3.1";
+  # rev is the 1.3.1 commit, mainly for skaffold version command output
+  rev = "6ba887a42438d1da578a005cf550e618fee6dfb8";
 
   goPackagePath = "github.com/GoogleContainerTools/skaffold";
   subPackages = ["cmd/skaffold"];
@@ -20,7 +20,7 @@ buildGoPackage rec {
     owner = "GoogleContainerTools";
     repo = "skaffold";
     rev = "v${version}";
-    sha256 = "17gdxifv3n2kcmz1pvs2ni2llq30zw6dwxgy5crs97h7hjdk29fw";
+    sha256 = "1ph7qyk5khdinxbhgqhhja8fz8b6q8yz5rj5xh0nwaff4bmlfd99";
   };
 
   meta = {

From 56c4800e7f9d57b102bb53326f24c10847cec8a1 Mon Sep 17 00:00:00 2001
From: Danylo Hlynskyi <abcz2.uprola@gmail.com>
Date: Sun, 16 Feb 2020 22:58:34 +0200
Subject: [PATCH 0850/4636] postgresql-wal-receiver: fix test for Pg12 (#80268)

Fixes https://github.com/NixOS/nixpkgs/issues/80060
---
 nixos/tests/postgresql-wal-receiver.nix | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/postgresql-wal-receiver.nix b/nixos/tests/postgresql-wal-receiver.nix
index 791b041ba95b..372dd9d8c1c1 100644
--- a/nixos/tests/postgresql-wal-receiver.nix
+++ b/nixos/tests/postgresql-wal-receiver.nix
@@ -6,17 +6,24 @@ with import ../lib/testing.nix { inherit system pkgs; };
 with pkgs.lib;
 
 let
+  makePostgresqlWalReceiverTest = subTestName: postgresqlPackage: let
+
   postgresqlDataDir = "/var/db/postgresql/test";
   replicationUser = "wal_receiver_user";
   replicationSlot = "wal_receiver_slot";
   replicationConn = "postgresql://${replicationUser}@localhost";
   baseBackupDir = "/tmp/pg_basebackup";
   walBackupDir = "/tmp/pg_wal";
-  recoveryConf = pkgs.writeText "recovery.conf" ''
+  atLeast12 = versionAtLeast postgresqlPackage.version "12.0";
+  restoreCommand = ''
     restore_command = 'cp ${walBackupDir}/%f %p'
   '';
 
-  makePostgresqlWalReceiverTest = subTestName: postgresqlPackage: makeTest {
+  recoveryFile = if atLeast12
+      then pkgs.writeTextDir "recovery.signal" ""
+      else pkgs.writeTextDir "recovery.conf" "${restoreCommand}";
+
+  in makeTest {
     name = "postgresql-wal-receiver-${subTestName}";
     meta.maintainers = with maintainers; [ pacien ];
 
@@ -29,6 +36,9 @@ let
           wal_level = archive # alias for replica on pg >= 9.6
           max_wal_senders = 10
           max_replication_slots = 10
+        '' + optionalString atLeast12 ''
+          ${restoreCommand}
+          recovery_end_command = 'touch recovery.done'
         '';
         authentication = ''
           host replication ${replicationUser} all trust
@@ -45,6 +55,9 @@ let
         slot = replicationSlot;
         directory = walBackupDir;
       };
+      # This is only to speedup test, it isn't time racing. Service is set to autorestart always,
+      # default 60sec is fine for real system, but is too much for a test
+      systemd.services.postgresql-wal-receiver-main.serviceConfig.RestartSec = mkForce 5;
     };
 
     testScript = ''
@@ -70,7 +83,7 @@ let
       # prepare WAL and recovery
       $machine->succeed('chmod a+rX -R ${walBackupDir}');
       $machine->execute('for part in ${walBackupDir}/*.partial; do mv $part ''${part%%.*}; done'); # make use of partial segments too
-      $machine->succeed('cp ${recoveryConf} ${postgresqlDataDir}/recovery.conf && chmod 666 ${postgresqlDataDir}/recovery.conf');
+      $machine->succeed('cp ${recoveryFile}/* ${postgresqlDataDir}/ && chmod 666 ${postgresqlDataDir}/recovery*');
 
       # replay WAL
       $machine->systemctl('start postgresql');

From 940e6968f1ec155e242b27bcfd0618a5ab9a9ee0 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 16:05:21 -0500
Subject: [PATCH 0851/4636] nixdoc: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/nix/nixdoc/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix
index 4f64750892a0..6ea28dbea2b4 100644
--- a/pkgs/tools/nix/nixdoc/default.nix
+++ b/pkgs/tools/nix/nixdoc/default.nix
@@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs =  stdenv.lib.optional stdenv.isDarwin [ darwin.Security ];
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1hy8w73fir4wnqx7zfvfqh7s24w95x9nkw55kmizvrwf0glw9m4n";
+  cargoSha256 = "1vamwynkbnffs8ryr2zb1a41cymjvr8zzh1bifyh9hpkx2k11rs3";
 
   meta = with stdenv.lib; {
     description = "Generate documentation for Nix functions";

From 8541c35fab9a185eb164317a8ce6c2fa3fb0ee18 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 16:05:50 -0500
Subject: [PATCH 0852/4636] cargo-release: upgrade cargo fetcher and
 cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/package-management/cargo-release/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix
index 1e5d1fe3512a..9b7d915a3490 100644
--- a/pkgs/tools/package-management/cargo-release/default.nix
+++ b/pkgs/tools/package-management/cargo-release/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1w9w43i5br94vg5m4idabh67p4ffsx2lmc2g0ak2k961vl46wr0q";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "075fvvd4c8f3kz6i6ny835h6jpa3c1v3miwfwwrdyy49a85lzjyj";
+  cargoSha256 = "1x54c6wk5cbnqcy1qpsff8lwqxs0d4qf0v71r7wl0kjp8mrmmhl4";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;

From 36cf8ad6856f2ae524b299e40c9b3cfc10b7b4e1 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 16:06:47 -0500
Subject: [PATCH 0853/4636] nixpkgs-fmt: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/nix/nixpkgs-fmt/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix
index eac8d1293d2a..1088884dca65 100644
--- a/pkgs/tools/nix/nixpkgs-fmt/default.nix
+++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix
@@ -10,10 +10,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1iylldgyvrcarfigpbhicg6j6qyipfiqn7gybza7qajfzyprjqfa";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "04my7dlp76dxs1ydy2sbbca8sp3n62wzdxyc4afcmrg8anb0ghaf";
+  cargoSha256 = "1jxvy4w9jxv898wgqyj9bpkhnc7pkj9dxg5x0b39xsnkzl2lr239";
 
   meta = with lib; {
     description = "Nix code formatter for nixpkgs";

From bc8753b9a51d72e5ccd68eef6ec9bc28b9ed1ffd Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 16:07:16 -0500
Subject: [PATCH 0854/4636] cargo-audit: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/package-management/cargo-audit/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix
index 2d9bb71c5694..6c56fbe476d7 100644
--- a/pkgs/tools/package-management/cargo-audit/default.nix
+++ b/pkgs/tools/package-management/cargo-audit/default.nix
@@ -10,10 +10,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1977ykablfi4mc6j2iil0bxc6diy07vi5hm56xmqj3n37ziavf1m";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0zbnsq0cif0yppn8ygxhcsrshkbf1c801f8waqqb2d1rjsrhb93y";
+  cargoSha256 = "0bpqsg8mv94ivwmbfxfcnd89yx5vry33395ynqrzhqq9s1jwq0dq";
 
   buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ];
   nativeBuildInputs = [ pkg-config ];

From 91aafa8476c56e0ab7b97786405e1d109fa338b4 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 16:09:16 -0500
Subject: [PATCH 0855/4636] tectonic: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/typesetting/tectonic/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix
index b6d8cb67c110..7e4c7dafefe3 100644
--- a/pkgs/tools/typesetting/tectonic/default.nix
+++ b/pkgs/tools/typesetting/tectonic/default.nix
@@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0dycv135bkpf71iwlwh8rwwvn287d605nl7v8mjxlrsayiivdmn9";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0bkgh73kqcdv3j9hr3m13wrdhls3zrk7aii9shzbzl6rnp2ry1az";
+  cargoSha256 = "1axrf7d01gmhvrap13rydfvwcsg0lk1zw7z1i7zzm898bc7c02qn";
 
   nativeBuildInputs = [ pkgconfig ];
 

From 805db0db45d3df38e45d4cdc101717d778e630de Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 16:23:11 -0500
Subject: [PATCH 0856/4636] maturin: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully.
---
 pkgs/development/tools/rust/maturin/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix
index cb8d13b47d91..8edd69c28be9 100644
--- a/pkgs/development/tools/rust/maturin/default.nix
+++ b/pkgs/development/tools/rust/maturin/default.nix
@@ -14,10 +14,7 @@ in rustPlatform.buildRustPackage rec {
     sha256 = "1siqd8k6grlbj9n1a75jq8px1pzvzpr2ph689g53rjngf1k44zqk";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "18678qzrzj044aj5nvyjn5hvby0i0x23gx26nhcf1nqcjn3fr32l";
+  cargoSha256 = "10x8kr4qxvvmzpr1n41ybsb6rnii2qz5bdhnk0zpfnr2n9215p8s";
 
   nativeBuildInputs = [ pkgconfig ];
 

From 5eeaac4433a26e83791cde27a60c6c62f423422c Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 16:40:31 -0500
Subject: [PATCH 0857/4636] coloursum: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully.
---
 pkgs/tools/text/coloursum/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/text/coloursum/default.nix b/pkgs/tools/text/coloursum/default.nix
index 27e349c9d934..f38ada46c119 100644
--- a/pkgs/tools/text/coloursum/default.nix
+++ b/pkgs/tools/text/coloursum/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1piz0l7qdcvjzfykm6rzqc8s1daxp3cj3923v9cmm41bc2v0p5q0";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "091flc5ymx0y43ld6bdmig5cy479b90bkmwv3yaysi5kpr28skvh";
+  cargoSha256 = "1w0q5w0bf1682jvzcml8cgmr9mrgi4if0p63wzchyjav330dp6pk";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 

From 93aadd5f4ae95758cb44db0a5892a4f98e8581d9 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 16:40:35 -0500
Subject: [PATCH 0858/4636] todiff: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully.
---
 pkgs/applications/misc/todiff/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix
index d4321e3b88e3..f55b3852e5bf 100644
--- a/pkgs/applications/misc/todiff/default.nix
+++ b/pkgs/applications/misc/todiff/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1y0v8nkaqb8kn61xwarpbyrq019gxx1f5f5p1hzw73nqxadc1rcm";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0xn5p71qk0ahd2drklja16xwv7zw0797kkzpiv563kffzvd1p8id";
+  cargoSha256 = "1vyc230a2b0dry2057mkdkrjb7s9d0p43fnz4q67aqrpyr4jxwx2";
 
   checkPhase = "cargo test --features=integration_tests";
 

From f31c9a0414151dcf8757adf4c1767a7833f19f80 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 16:42:57 -0500
Subject: [PATCH 0859/4636] mq-cli: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully.
---
 pkgs/tools/system/mq-cli/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/system/mq-cli/default.nix b/pkgs/tools/system/mq-cli/default.nix
index f685259429d2..afde8b8f9d27 100644
--- a/pkgs/tools/system/mq-cli/default.nix
+++ b/pkgs/tools/system/mq-cli/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "02z85waj5jc312biv2qhbgplsggxgjmfmyv9v8b1ky0iq1mpxjw7";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "03ab6jbcgmbgg9hn7ihk8814sjwdmrr9p4xlll6nfdad4a7gq3yn";
+  cargoSha256 = "19ccylnmmlm2d8kc178cffpjwrjlia6b4v3nzvxcs81a396ymr7b";
 
   meta = with lib; {
     description      = "CLI tool to manage POSIX message queues";

From c87fa84f3dd0e1b6696bccc101e2c83fbccdb8cd Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 16:43:44 -0500
Subject: [PATCH 0860/4636] just: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully.
---
 pkgs/development/tools/just/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix
index 20f854619467..5641a14e1ab3 100644
--- a/pkgs/development/tools/just/default.nix
+++ b/pkgs/development/tools/just/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0a4bml9nxvyh110a60l4lc11yr2ds5r8d3iplslccrkq1ka96av9";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0dbgjc21q0zaadsjvq3s6y6f4dmsybxb6g2sg8w2d3phkm9j921z";
+  cargoSha256 = "0wp61zjws9r1aapkapvq2vmad5kylkpw03wa82qhhq30knkpvr7b";
 
   checkInputs = [ coreutils bash dash ];
 

From f4195e6a6b548bcce9f2e5275455c837b9e06a8c Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 16:45:14 -0500
Subject: [PATCH 0861/4636] ruplacer: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully.
---
 pkgs/tools/text/ruplacer/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/text/ruplacer/default.nix b/pkgs/tools/text/ruplacer/default.nix
index d868f9e2529d..535a00b7b4d0 100644
--- a/pkgs/tools/text/ruplacer/default.nix
+++ b/pkgs/tools/text/ruplacer/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0yj753d9wsnp4s5a71ph241jym5rfz3161a1v3qxfc4w23v86j1q";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1lzw4x40j25khf68x5srj8i05c11ls5y7km206vxn19vsy9ah4k9";
+  cargoSha256 = "0wrv4k63pc1v0apmxmmci9qaykcv9ig3nfxy6id5caqrckp73cr4";
 
   buildInputs = (stdenv.lib.optional stdenv.isDarwin Security);
 

From c917e7cbc63568fc14c8794c6daad7bbf80ed874 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 16:48:38 -0500
Subject: [PATCH 0862/4636] amber: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully.
---
 pkgs/tools/text/amber/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/tools/text/amber/default.nix
index 95ffc592bfe1..70bfaafbcec9 100644
--- a/pkgs/tools/text/amber/default.nix
+++ b/pkgs/tools/text/amber/default.nix
@@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0k70rk19hwdlhhqm91x12xcb8r09kzpijs0xwhplrwdh86qfxymx";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0hh3sgcdcp0llgf3i3dysrr3vry3fv3fzzf44ad1953d5mnyhvap";
+  cargoSha256 = "0g8n3r6bdsfl1417wnss3ggnv5ywz8mx53hjglshmln40552znh3";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 

From a1927899f7589483e4441e8ef14429060ffff6a3 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 16:49:11 -0500
Subject: [PATCH 0863/4636] rq: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully.
---
 pkgs/development/tools/rq/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix
index 7394d7a645a6..5fe73ed33f0a 100644
--- a/pkgs/development/tools/rq/default.nix
+++ b/pkgs/development/tools/rq/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0km9d751jr6c5qy4af6ks7nv3xfn13iqi03wq59a1c73rnf0zinp";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0z971fpyj4v5hjp6q4yxgxv069h9idkpkcixb14gxi7kpiswprvz";
+  cargoSha256 = "0c5vwy3c5ji602dj64z6jqvcpi2xff03zvjbnwihb3ydqwnb3v67";
 
   buildInputs = [ llvmPackages.clang-unwrapped v8 ];
 

From 9f8b5e80eeff9aa06d1cdc5635a75090c2962ef0 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 16:51:53 -0500
Subject: [PATCH 0864/4636] ytop: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully.
---
 pkgs/tools/system/ytop/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/system/ytop/default.nix b/pkgs/tools/system/ytop/default.nix
index 8732bf88ad7a..79dcf41b7220 100644
--- a/pkgs/tools/system/ytop/default.nix
+++ b/pkgs/tools/system/ytop/default.nix
@@ -15,10 +15,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "11pcchwahcwdvmfwfs6j2zg23grlw538wfs90mvqy2mpccj7d3ys";
+  cargoSha256 = "0c4xp63fm1n7x8brmx7avqjvcbqi32k6x5ps7h0fh0ign452y7fz";
   verifyCargoDeps = true;
 
   meta = with stdenv.lib; {

From 93da4c8485818d738f6aafd5fc5f1e752c920eb4 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 16:54:18 -0500
Subject: [PATCH 0865/4636] scaff: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully.
---
 pkgs/development/tools/scaff/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/scaff/default.nix b/pkgs/development/tools/scaff/default.nix
index 034376d337ce..f81ca70c6a9a 100644
--- a/pkgs/development/tools/scaff/default.nix
+++ b/pkgs/development/tools/scaff/default.nix
@@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1s5v50205l2h33pccyafrjv3a6lpb62inhm8z81hkvx53bqifvd7";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "17rnzwlgrpr6isbajaccxa83msvvskxyqrc4cirgjmc7aqa0ilbh";
+  cargoSha256 = "0k6msvly3yhzl1hhs4zv31qzbllwmw16i55dbznlgp1c8icy2pwr";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ openssl ];

From 8f818022a6f1a37ed03f576f6c9768dad5e0e3d4 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 16:54:39 -0500
Subject: [PATCH 0866/4636] sd: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully.
---
 pkgs/tools/text/sd/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix
index 889dde46dead..1b6e4d945d42 100644
--- a/pkgs/tools/text/sd/default.nix
+++ b/pkgs/tools/text/sd/default.nix
@@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1vxljmd1vh245yhv095i3l44pk915zr2pix4v9r8pz2fynp2nnmj";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1shqphbpn3ib28hnyib7mh1i5q56nshj864jm209s8qggbp96wp1";
+  cargoSha256 = "0n4c0snmjfyk3z2mbzpqgb6ggyv4nqszdda035g3rzpbavzx9xb5";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
 

From ac277262780527296eea600c79e26240ed743c84 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 16:57:41 -0500
Subject: [PATCH 0867/4636] rnix-lsp: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully.
---
 pkgs/development/tools/rnix-lsp/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rnix-lsp/default.nix b/pkgs/development/tools/rnix-lsp/default.nix
index 0cb402425046..e938526ecbfb 100644
--- a/pkgs/development/tools/rnix-lsp/default.nix
+++ b/pkgs/development/tools/rnix-lsp/default.nix
@@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0fy620c34kxl27sd62x9mj0555bcdmnmbsxavmyiwb497z1m9wnn";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1wm5m7b6zr6wg1k59rmqis1zp9i2990p7y0ml852hxv34an7pp5d";
+  cargoSha256 = "0xmaa7rds7hlagfxj65pv9vgflcv4nwbwbw4g7cyj88cbb1kbxxj";
 
   meta = with lib; {
     description = "A work-in-progress language server for Nix, with syntax checking and basic completion";

From 05045718748917a7c1f96f79b331e5892224a924 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 16:57:54 -0500
Subject: [PATCH 0868/4636] xsv: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully.
---
 pkgs/tools/text/xsv/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix
index b81b7b109821..72a586d2b22d 100644
--- a/pkgs/tools/text/xsv/default.nix
+++ b/pkgs/tools/text/xsv/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "17v1nw36mrarrd5yv4xd3mpc1d7lvhd5786mqkzyyraf78pjg045";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1xlbszr9ccv924ww45lnc0qqb7nxj2cnc41480xbpvsdqsdrgbhs";
+  cargoSha256 = "1q59nvklh5r2mrsz656z6js3j2l6rqyhfz6l0yq28df5kyahk91b";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 

From b0a26b3b525d30a9c80a0ce68b2fadc3edde474f Mon Sep 17 00:00:00 2001
From: James Cook <jcook@cs.berkeley.edu>
Date: Sun, 16 Feb 2020 22:12:44 +0000
Subject: [PATCH 0869/4636] Remove myself as maintainer.

I'm not really that familiar with these two packages.
---
 pkgs/development/libraries/libgnurl/default.nix | 2 +-
 pkgs/tools/misc/apt-offline/default.nix         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix
index a1e8ef76394a..339146da2b9b 100644
--- a/pkgs/development/libraries/libgnurl/default.nix
+++ b/pkgs/development/libraries/libgnurl/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A fork of libcurl used by GNUnet";
     homepage    = "https://gnunet.org/en/gnurl.html";
-    maintainers = with maintainers; [ falsifian vrthra ];
+    maintainers = with maintainers; [ vrthra ];
     platforms = platforms.linux;
     license = licenses.curl;
   };
diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix
index 921c1af4ad6a..7e29c63347dd 100644
--- a/pkgs/tools/misc/apt-offline/default.nix
+++ b/pkgs/tools/misc/apt-offline/default.nix
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
   meta = with stdenv.lib; {
     description = "Offline APT package manager";
     license = licenses.gpl3;
-    maintainers = [ maintainers.falsifian ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }

From 21bfc57dd9eb5c7c58b6ab0bfa707cbc7cf04e98 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Sun, 16 Feb 2020 17:39:12 +0000
Subject: [PATCH 0870/4636] tinyprog: fix pkg_resources crash

---
 pkgs/development/tools/misc/tinyprog/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/misc/tinyprog/default.nix b/pkgs/development/tools/misc/tinyprog/default.nix
index 580414f4d9d9..65d2ce37814c 100644
--- a/pkgs/development/tools/misc/tinyprog/default.nix
+++ b/pkgs/development/tools/misc/tinyprog/default.nix
@@ -24,6 +24,7 @@ with python3Packages; buildPythonApplication rec {
     tqdm
     six
     packaging
+    setuptools
     pyusb
   ];
 

From eb1ffda13c1ddd6a3766461a95eda1c6949aa57b Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Sun, 16 Feb 2020 23:47:44 +0100
Subject: [PATCH 0871/4636] libfishsound at 1.0.0

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

diff --git a/pkgs/development/libraries/libfishsound/default.nix b/pkgs/development/libraries/libfishsound/default.nix
new file mode 100644
index 000000000000..fae96c8d3f7b
--- /dev/null
+++ b/pkgs/development/libraries/libfishsound/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, libvorbis, speex, flac, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "libfishsound-1.0.0";
+
+  src = fetchurl {
+    url = "http://downloads.xiph.org/releases/libfishsound/${name}.tar.gz";
+    sha256 = "1iz7mn6hw2wg8ljaw74f4g2zdj68ib88x4vjxxg3gjgc5z75f2rf";
+  };
+
+  propagatedBuildInputs = [ libvorbis speex flac ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = with stdenv.lib; {
+    homepage = https://xiph.org/fishsound/;
+    description = ''libfishsound by itself is designed to handle raw codec streams from a lower level layer such as UDP datagrams. When these codecs are used in files, they are commonly encapsulated in Ogg to produce Ogg FLAC, Speex and Ogg Vorbis files.
+
+libfishsound is a wrapper around the existing codec libraries and provides a consistent, higher-level programming interface. It has been designed for use in a wide variety of applications; it has no direct dependencies on Ogg encapsulation, though it is most commonly used in conjunction with liboggz to decode or encode FLAC, Speex or Vorbis audio tracks in Ogg files, including Ogg Theora and Annodex.
+
+FishSound has been developed and tested on GNU/Linux, Darwin/MacOSX and Win32. It probably also works on other Unix-like systems via GNU autoconf. For Win32: nmake Makefiles, Visual Studio .NET 2003 solution files and Visual C++ 6.0 workspace files are all provided in the source distribution.'';
+    platforms = platforms.unix;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9eaa8525fc6b..b81306abc5a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12438,6 +12438,8 @@ in
 
   libfilezilla = callPackage ../development/libraries/libfilezilla { };
 
+  libfishsound = callPackage ../development/libraries/libfishsound { };
+
   libfm = callPackage ../development/libraries/libfm { };
   libfm-extra = libfm.override {
     extraOnly = true;

From 528e27b33cdbb79253c031b4578aed344e8620bc Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Sun, 16 Feb 2020 23:52:24 +0100
Subject: [PATCH 0872/4636] sonic-visualiser: 2.4.1 -> 4.0.1

The program is no longer broken.
---
 .../audio/sonic-visualiser/default.nix        | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix
index 6164c1cfe933..d1c981de2d5d 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -2,21 +2,23 @@
 
 { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo
 , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
-, libsndfile, pkgconfig, libpulseaudio, qtbase, redland
-, qmake, rubberband, serd, sord, vampSDK, fftwFloat
+, libsndfile, pkgconfig, libpulseaudio, qtbase, qtsvg, redland
+, rubberband, serd, sord, vampSDK, fftwFloat
+, capnproto, liboggz, libfishsound, libid3tag, opusfile
+, wrapQtAppsHook
 }:
 
 stdenv.mkDerivation rec {
   pname = "sonic-visualiser";
-  version = "2.4.1";
+  version = "4.0.1";
 
   src = fetchurl {
-    url = "https://code.soundsoftware.ac.uk/attachments/download/1185/${pname}-${version}.tar.gz";
-    sha256 = "06nlha70kgrby16nyhngrv5q846xagnxdinv608v7ga7vpywwmyb";
+    url = "https://code.soundsoftware.ac.uk/attachments/download/2607/${pname}-${version}.tar.gz";
+    sha256 = "14674adzp3chilymna236qyvci3b1zmi3wyz696wk7bcd3ndpsg6";
   };
 
   buildInputs =
-    [ libsndfile qtbase fftw fftwFloat bzip2 librdf rubberband
+    [ libsndfile qtbase qtsvg fftw fftwFloat bzip2 librdf rubberband
       libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland
       serd
       sord
@@ -26,23 +28,22 @@ stdenv.mkDerivation rec {
       libpulseaudio
       libmad
       libogg # ?
-      # fishsound
+      libfishsound
       liblo
       libX11
+      capnproto
+      liboggz
+      libid3tag
+      opusfile
     ];
 
-  nativeBuildInputs = [ pkgconfig qmake ];
+  nativeBuildInputs = [ pkgconfig wrapQtAppsHook ];
 
-  configurePhase = ''
-    for i in sonic-visualiser svapp svcore svgui;
-      do cd $i && qmake PREFIX=$out && cd ..;
-    done
-  '';
+  enableParallelBuilding = true;
 
-  installPhase = ''
-    mkdir -p $out/{bin,share/sonic-visualiser}
-    cp sonic-visualiser $out/bin/
-    cp -r samples $out/share/sonic-visualiser/
+  # comment out the tests
+  preConfigure = ''
+    sed -i 's/sub_test_svcore_/#sub_test_svcore_/' sonic-visualiser.pro
   '';
 
   meta = with stdenv.lib; {
@@ -51,6 +52,5 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.goibhniu maintainers.marcweber ];
     platforms = platforms.linux;
-    broken = true;
   };
 }

From 7957f43b6a2249487685dacc9f40e7d84f04d1df Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 17 Feb 2020 00:13:05 +0100
Subject: [PATCH 0873/4636] youtube-dl: 2020.01.24 -> 2020.02.16

https://github.com/ytdl-org/youtube-dl/releases/tag/2020.02.16
---
 pkgs/tools/misc/youtube-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 59fd4fa70c9f..1fc8acdda2cd 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
   # The websites youtube-dl deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2020.01.24";
+  version = "2020.02.16";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1zrnbjnwv315f9a83lk5c0gl4ianvp6q2kinxvqlv604sabcq78b";
+    sha256 = "1ip0p7gifwmkls8ppfvz89j1lh82dg60zmvabj8njnhj170ikkdb";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 10af1a139b97bafe9765925d2003b5c4a2584a7a Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 16 Feb 2020 23:08:52 +0000
Subject: [PATCH 0874/4636] qtads: 2.1.99.2019-04-12 -> 3.0.0

---
 pkgs/games/qtads/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/qtads/default.nix b/pkgs/games/qtads/default.nix
index dda7799aacba..f36581776cb2 100644
--- a/pkgs/games/qtads/default.nix
+++ b/pkgs/games/qtads/default.nix
@@ -1,16 +1,16 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, qmake
+{ lib, mkDerivation, fetchFromGitHub, fetchpatch, pkgconfig, qmake
 , SDL2, fluidsynth, libsndfile, libvorbis, mpg123, qtbase
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "qtads";
-  version = "2.1.99.2019-04-12";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "realnc";
     repo = pname;
-    rev = "43289a830a18c66a293c2b1ee75a08e92e8dd5dc";
-    sha256 = "0zscf6nmjjc4i7c38iy8znv2s453xc49gn7knyi3g1l6iinjwbx7";
+    rev = "v${version}";
+    sha256 = "02kk2hs20h9ffhylwms9f8zikmmlrz1nvbrm97gis9iljkyx035c";
   };
 
   nativeBuildInputs = [ pkgconfig qmake ];

From b30dc0ff8934e8add2978737d252c49fadf62b0b Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 13 Feb 2020 17:06:43 +0100
Subject: [PATCH 0875/4636] expect: patch configure after the autoreconf phase,
 not before it

Fixes: #79863
---
 pkgs/tools/misc/expect/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix
index 4a6f62f995ba..6c9f348b8a19 100644
--- a/pkgs/tools/misc/expect/default.nix
+++ b/pkgs/tools/misc/expect/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  postPatch = ''
+  preConfigure = ''
     sed -i "s,/bin/stty,$(type -p stty),g" configure
   '';
 

From 32ed1c59b3bbf4c5eec59acb7a4a22c15d0fa83a Mon Sep 17 00:00:00 2001
From: Gabriel Gonzalez <Gabriel439@gmail.com>
Date: Sun, 16 Feb 2020 16:02:24 -0800
Subject: [PATCH 0876/4636] Change formatting of record fields

... as requested by @Profpatsch
---
 pkgs/development/dhall-modules/Prelude.nix    | 27 +++++++------------
 .../dhall-modules/dhall-kubernetes.nix        |  9 +++----
 .../dhall-modules/dhall-packages.nix          | 15 ++++-------
 3 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/pkgs/development/dhall-modules/Prelude.nix b/pkgs/development/dhall-modules/Prelude.nix
index 53f6bace41cd..c689f7156fb4 100644
--- a/pkgs/development/dhall-modules/Prelude.nix
+++ b/pkgs/development/dhall-modules/Prelude.nix
@@ -12,8 +12,7 @@ let
               let
                 src = fetchFromGitHub {
                   owner = "dhall-lang";
-
-                  repo = "dhall-lang";
+                  repo  = "dhall-lang";
 
                   inherit rev sha256;
                 };
@@ -28,50 +27,42 @@ in
     # Prelude versions older than 7.0.0 use old-style union literals, which are
     # no longer supported by the latest version of the standard
     "7.0.0" = {
-      rev = "f0509b403ace4b8a72ebb5fa9c473b9aeabeaf33";
-
+      rev    = "f0509b403ace4b8a72ebb5fa9c473b9aeabeaf33";
       sha256 = "00ldlvqfh411vnrnc41zfnlvgfanwfd3l8hdia8kni3r8q9qmd71";
     };
 
     "8.0.0" = {
-      rev = "136a3491753fef251b2087031617d1ee1053f285";
-
+      rev    = "136a3491753fef251b2087031617d1ee1053f285";
       sha256 = "0haxd5dhi5bmg06a0hx1blpivmwrcnndydwagibj3zvch4knyi2q";
     };
 
     "9.0.0" = {
-      rev = "6cbf57c946e7e6576babc23a38320e53ecfa6bee";
-
+      rev    = "6cbf57c946e7e6576babc23a38320e53ecfa6bee";
       sha256 = "1r06fijszyifq5b4j6libwkm06g8693m9n5c4kq61dvzrjfd2gim";
     };
 
     "10.0.0" = {
-      rev = "ecbf82785cff406bbd162bbabf3df6f817c805e0";
-
+      rev    = "ecbf82785cff406bbd162bbabf3df6f817c805e0";
       sha256 = "0gxkr9649jqpykdzqjc98gkwnjry8wp469037brfghyidwsm021m";
     };
 
     "11.0.0" = {
-      rev = "8098184d17c3aecc82674a7b874077a7641be05a";
-
+      rev    = "8098184d17c3aecc82674a7b874077a7641be05a";
       sha256 = "0rdvyxq7mvas82wsfzzpk6imzm8ax4q58l522mx0ks69pacpr3yi";
     };
 
     "11.1.0" = {
-      rev = "31e90e1996f6c4cb50e03ccb1f3c45beb4bd278c";
-
+      rev    = "31e90e1996f6c4cb50e03ccb1f3c45beb4bd278c";
       sha256 = "0rdvyxq7mvas82wsfzzpk6imzm8ax4q58l522mx0ks69pacpr3yi";
     };
 
     "12.0.0" = {
-      rev = "9f248138f69ee5e22192dc3d0417d5c77b189e04";
-
+      rev    = "9f248138f69ee5e22192dc3d0417d5c77b189e04";
       sha256 = "1gbr0376sfamp0ibhcbxz4vaxr6ipv42y42p5wyksfhz3ls9x5ph";
     };
 
     "13.0.0" = {
-      rev = "48db9e1ff1f8881fa4310085834fbc19e313ebf0";
-
+      rev    = "48db9e1ff1f8881fa4310085834fbc19e313ebf0";
       sha256 = "0kg3rzag3irlcldck63rjspls614bc2sbs3zq44h0pzcz9v7z5h9";
     };
   }
diff --git a/pkgs/development/dhall-modules/dhall-kubernetes.nix b/pkgs/development/dhall-modules/dhall-kubernetes.nix
index 8ae1d2ae9fbc..23a1123eacb3 100644
--- a/pkgs/development/dhall-modules/dhall-kubernetes.nix
+++ b/pkgs/development/dhall-modules/dhall-kubernetes.nix
@@ -15,8 +15,7 @@ let
               let
                 src = fetchFromGitHub {
                   owner = "dhall-lang";
-
-                  repo = "dhall-kubernetes";
+                  repo  = "dhall-kubernetes";
 
                   inherit rev sha256;
                 };
@@ -30,14 +29,12 @@ in
   lib.mapAttrs makeDhallKubernetes {
     # 2.1.0 was the first version to introduce a top-level `package.dhall` file
     "2.1.0" = {
-      rev = "bbfec3d8548b605f1c9628f34029ab4a7d928839";
-
+      rev    = "bbfec3d8548b605f1c9628f34029ab4a7d928839";
       sha256 = "10zkigj05khiy6w2sqcm5nw7d47r5k52xq8np8q86h0phy798g96";
     };
 
     "3.0.0" = {
-      rev = "3c6d09a9409977cdde58a091d76a6d20509ca4b0";
-
+      rev    = "3c6d09a9409977cdde58a091d76a6d20509ca4b0";
       sha256 = "1r4awh770ghsrwabh5ddy3jpmrbigakk0h32542n1kh71w3cdq1h";
     };
   }
diff --git a/pkgs/development/dhall-modules/dhall-packages.nix b/pkgs/development/dhall-modules/dhall-packages.nix
index b83eb688a60f..34ebbed68699 100644
--- a/pkgs/development/dhall-modules/dhall-packages.nix
+++ b/pkgs/development/dhall-modules/dhall-packages.nix
@@ -17,8 +17,7 @@ let
               let
                 src = fetchFromGitHub {
                   owner = "EarnestResearch";
-
-                  repo = "dhall-packages";
+                  repo  = "dhall-packages";
 
                   inherit rev sha256;
                 };
@@ -33,26 +32,22 @@ in
     "0.11.1" =
       let
         k8s_6a47bd = dhall-kubernetes."3.0.0".override {
-          rev = "6a47bd50c4d3984a13570ea62382a3ad4a9919a4";
-
+          rev    = "6a47bd50c4d3984a13570ea62382a3ad4a9919a4";
           sha256 = "1azqs0x2kia3xw93rfk2mdi8izd7gy9aq6qzbip32gin7dncmfhh";
         };
 
         k8s_4ad581 = dhall-kubernetes."3.0.0".override {
-          rev = "4ad58156b7fdbbb6da0543d8b314df899feca077";
-
+          rev    = "4ad58156b7fdbbb6da0543d8b314df899feca077";
           sha256 = "12fm70qbhcainxia388svsay2cfg9iksc6mss0nvhgxhpypgp8r0";
         };
 
         k8s_fee24c = dhall-kubernetes."3.0.0".override {
-          rev = "fee24c0993ba0b20190e2fdb94e386b7fb67252d";
-
+          rev    = "fee24c0993ba0b20190e2fdb94e386b7fb67252d";
           sha256 = "11d93z8y0jzrb8dl43gqha9z96nxxqkl7cbxpz8hw8ky9x6ggayk";
         };
 
       in
-        { rev = "8d228f578fbc7bb16c04a7c9ac8c6c7d2e13d1f7";
-
+        { rev    = "8d228f578fbc7bb16c04a7c9ac8c6c7d2e13d1f7";
           sha256 = "1v4y1x13lxy6cxf8xqc6sb0mc4mrd4frkxih95v9q2wxw4vkw2h7";
 
           dependencies = [

From b87e7d00f3f2ede7b982c1fad3dc0805b586e13f Mon Sep 17 00:00:00 2001
From: Benjamin Asbach <asbachb@users.noreply.github.com>
Date: Mon, 17 Feb 2020 00:59:48 +0100
Subject: [PATCH 0877/4636] openjdk8: 8u222b10 -> 8u242b08

---
 pkgs/development/compilers/openjdk/8.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 4231845792a9..f47d7939e48c 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -29,49 +29,49 @@ let
   jdk8 = fetchurl {
              name = "jdk8-${repover}.tar.gz";
              url = "${baseurl}/archive/${repover}.tar.gz";
-             sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb"
+             sha256 = if stdenv.isAarch64 then "0qpmr267qcxhmw398zbl1axd161yxn4k4hfz1jlxlmdvg70p7h90"
                       else "1crs4hmzmgm6fkwfq0d3xz9lph0nd33fngrqv2rz1mkkqcrjx18z";
           };
   langtools = fetchurl {
              name = "langtools-${repover}.tar.gz";
              url = "${baseurl}/langtools/archive/${repover}.tar.gz";
-             sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb"
+             sha256 = if stdenv.isAarch64 then "1rhhi4kgmxvnyl3ic5p008p1n7zyji5nw99blm1lr5fw7ry7df24"
                       else "1aaxd1rl7dlk4kxdivvqvripsbn0d5vny0jvjksycsm97vrfiry4";
           };
   hotspot = fetchurl {
              name = "hotspot-${repover}.tar.gz";
              url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
-             sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb"
+             sha256 = if stdenv.isAarch64 then "0lphrhjqlavd6qlkh7h4sd2bqf5gd0cchkcnvy87703fbd7gy5ii"
                       else "18i4if16zikgda9k5bgqyx0p2104db23zlnclq512178z0p9yycb";
           };
   corba = fetchurl {
              name = "corba-${repover}.tar.gz";
              url = "${baseurl}/corba/archive/${repover}.tar.gz";
-             sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb"
+             sha256 = if stdenv.isAarch64 then "18h0v566v420d00na6x4jrs41v4aa39byk15fi8k6dcn0dmirhvg"
                       else "1298k8p2dsj7xc4h2ayk5nl4ssrcgncn06ysyqrmnwrb8gj8s1w4";
           };
   jdk = fetchurl {
              name = "jdk-${repover}.tar.gz";
              url = "${baseurl}/jdk/archive/${repover}.tar.gz";
-             sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb"
+             sha256 = if stdenv.isAarch64 then "0xxy7rkj8ah263nnzkd4mg9dai5qix3l9cyilm47dig5hv7g8aq0"
                       else "0vqlbks3cy3cnmnrnhbjkqinvp8bcy2h96xvx81cvlza4s2hszvz";
           };
   jaxws = fetchurl {
              name = "jaxws-${repover}.tar.gz";
              url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
-             sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb"
+             sha256 = if stdenv.isAarch64 then "0ajqm2l9g5w5ag5s4vl4ldpbm99pqa6d342hrzvv7psqn3zf6ar5"
                       else "1wg9fbiz09arj0llavnzrmbhw8nx0dw8dcjkrzxw78rj1cadflzc";
           };
   jaxp = fetchurl {
              name = "jaxp-${repover}.tar.gz";
              url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
-             sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb"
+             sha256 = if stdenv.isAarch64 then "03zjh6xvza05abxz9d9j2w9xndw9n07f8lrn6dymj7f4imals831"
                       else "1i5xrk8r8pcgnc68zrgp3hd1a1nzcm99swpmdnlb424qlg5nnrcf";
           };
   nashorn = fetchurl {
              name = "nashorn-${repover}.tar.gz";
              url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
-             sha256 = if stdenv.isAarch64 then "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb"
+             sha256 = if stdenv.isAarch64 then "0n809w264ndxksva9c81x0m1fsyg8c627w571f72xxxl9c1bnrmp"
                       else "0qlxaz7sriy709vcyzz48s2v4p5h4d31my33whip018c4j5gkfqq";
           };
   openjdk8 = stdenv.mkDerivation {

From c23db52a657c0be17fd53a3c0386c10e3c253336 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 17 Feb 2020 01:07:00 +0100
Subject: [PATCH 0878/4636] unifont: generate otb and split output

---
 pkgs/data/fonts/unifont/default.nix | 31 +++++++++++++++++++----------
 pkgs/top-level/all-packages.nix     |  3 ++-
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix
index a80beee342b3..fc41263fee7e 100644
--- a/pkgs/data/fonts/unifont/default.nix
+++ b/pkgs/data/fonts/unifont/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, mkfontscale, mkfontdir }:
+{ stdenv, fetchurl, mkfontscale
+, libfaketime, fonttosfnt
+}:
 
 stdenv.mkDerivation rec {
   pname = "unifont";
@@ -14,23 +16,32 @@ stdenv.mkDerivation rec {
     sha256 = "1cd1fnk3m7giqp099kynnjj4m7q00lqm4ybqb1vzd2wi3j4a1awf";
   };
 
-  nativeBuildInputs = [ mkfontscale mkfontdir ];
+  nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
 
-  phases = "installPhase";
+  phases = [ "buildPhase" "installPhase" ];
+
+  buildPhase =
+    ''
+      # convert pcf font to otb
+      faketime -f "1970-01-01 00:00:01" \
+      fonttosfnt -g 2 -m 2 -v -o "unifont.otb" "${pcf}"
+    '';
 
   installPhase =
     ''
-      mkdir -p $out/share/fonts $out/share/fonts/truetype
-      cp -v ${pcf} $out/share/fonts/unifont.pcf.gz
-      cp -v ${ttf} $out/share/fonts/truetype/unifont.ttf
-      cd $out/share/fonts
+      # install otb fonts
+      install -m 644 -D unifont.otb "$otb/share/fonts/unifont.otb"
+      mkfontdir "$otb/share/fonts"
+
+      # install pcf and ttf fonts
+      install -m 644 -D ${pcf} $out/share/fonts/unifont.pcf.gz
+      install -m 644 -D ${ttf} $out/share/fonts/truetype/unifont.ttf
+      cd "$out/share/fonts"
       mkfontdir
       mkfontscale
     '';
 
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "0n3ms2k2mk7j6144l05c45smggwf3j5cwkaxhw93wf9hd1lhpwq1";
+  outputs = [ "out" "otb" ];
 
   meta = with stdenv.lib; {
     description = "Unicode font for Base Multilingual Plane";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8192f56c1be..b05e565b981c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18013,7 +18013,8 @@ in
 
   unihan-database = callPackage ../data/misc/unihan-database { };
 
-  unifont = callPackage ../data/fonts/unifont { };
+  unifont = callPackage ../data/fonts/unifont
+     { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
 
   unifont_upper = callPackage ../data/fonts/unifont_upper { };
 

From a0cd12263eed1e6545f6d7ced20b964c3be1fdc8 Mon Sep 17 00:00:00 2001
From: Eric Dallo <ericdallo06@hotmail.com>
Date: Sun, 16 Feb 2020 21:50:30 -0300
Subject: [PATCH 0879/4636] Add my githubId

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6cd21475d5a9..92a7fec22e45 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2257,6 +2257,7 @@
   ericdallo = {
     email = "ercdll1337@gmail.com";
     github = "ericdallo";
+    githubId = 7820865;
     name = "Eric Dallo";
   };
   ericsagnes = {

From a3b97a4061f8c59922b49aa3237d8876ab36aaa8 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 17 Feb 2020 02:11:34 +0100
Subject: [PATCH 0880/4636] uni-vga: generate otb, psf and split output

---
 pkgs/data/fonts/uni-vga/default.nix | 48 ++++++++++++++++++++++-------
 pkgs/top-level/all-packages.nix     |  3 +-
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/data/fonts/uni-vga/default.nix
index cd719a62d99f..44619bf3424c 100644
--- a/pkgs/data/fonts/uni-vga/default.nix
+++ b/pkgs/data/fonts/uni-vga/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, mkfontdir, mkfontscale }:
+{ stdenv, fetchurl, perl, kbd, bdftopcf
+, libfaketime, fonttosfnt, mkfontscale
+}:
 
 stdenv.mkDerivation {
   name = "uni-vga";
@@ -8,19 +10,43 @@ stdenv.mkDerivation {
     sha256 = "05sns8h5yspa7xkl81ri7y1yxf5icgsnl497f3xnaryhx11s2rv6";
   };
 
-  nativeBuildInputs = [ mkfontdir mkfontscale ];
+  nativeBuildInputs =
+    [ perl kbd bdftopcf libfaketime
+      fonttosfnt mkfontscale
+    ];
 
-  installPhase = ''
-    mkdir -p $out/share/fonts
-    cp *.bdf $out/share/fonts
-    cd $out/share/fonts
-    mkfontdir
-    mkfontscale
+  postPatch = "patchShebangs .";
+
+  buildPhase = ''
+    # convert font to compressed pcf
+    bdftopcf u_vga16.bdf | gzip -c -9 -n  > u_vga16.pcf.gz
+
+    # convert font to compressed psf
+    ./bdf2psf.pl -s UniCyrX.sfm u_vga16.bdf \
+      | psfaddtable - UniCyrX.sfm - \
+      | gzip -c -9 -n > u_vga16.psf.gz
+
+    # convert bdf font to otb
+    faketime -f "1970-01-01 00:00:01" \
+    fonttosfnt -v -o u_vga16.otb u_vga16.bdf
   '';
 
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "0rfly7r6blr2ykxlv0f6my2w41vvxcw85chspljd2p1fxlr28jd7";
+  installPhase = ''
+    # install pcf (for X11 applications) and psf (virtual terminal)
+    install -m 644 -D *.pcf.gz -t "$out/share/fonts"
+    install -m 644 -D *.psf.gz -t "$out/share/consolefonts"
+    mkfontdir "$out/share/fonts"
+
+    # install bdf font
+    install -m 644 -D *.bdf -t "$bdf/share/fonts"
+    mkfontdir "$bdf/share/fonts"
+
+    # install otb font (for GTK applications)
+    install -m 644 -D *.otb -t "$otb/share/fonts"
+    mkfontdir "$otb/share/fonts"
+  '';
+
+  outputs = [ "out" "bdf" "otb" ];
 
   meta = {
     description = "Unicode VGA font";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8192f56c1be..b16cb6da5bc8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18005,7 +18005,8 @@ in
 
   undefined-medium = callPackage ../data/fonts/undefined-medium { };
 
-  uni-vga = callPackage ../data/fonts/uni-vga { };
+  uni-vga = callPackage ../data/fonts/uni-vga
+     { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
 
   unicode-character-database = callPackage ../data/misc/unicode-character-database { };
 

From d85c885dc4780b6622bd229ebd8579b91393861c Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Mon, 17 Feb 2020 03:11:12 +0100
Subject: [PATCH 0881/4636] nixos: add /share/hunspell to
 environment.pathsToLink

So that applications can find hunspell dictionaries installed through
environment.systemPackages.
---
 nixos/modules/config/system-path.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index aba9bc0945b1..4100ec897016 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -116,6 +116,7 @@ in
         "/lib" # FIXME: remove and update debug-info.nix
         "/sbin"
         "/share/emacs"
+        "/share/hunspell"
         "/share/nano"
         "/share/org"
         "/share/themes"

From 419d0ad370b8bbe3fa5d54dd261c9e997cd60e42 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sun, 16 Feb 2020 16:52:24 +0100
Subject: [PATCH 0882/4636] jftui: init at 0.2.2

---
 pkgs/applications/video/jftui/default.nix | 46 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/applications/video/jftui/default.nix

diff --git a/pkgs/applications/video/jftui/default.nix b/pkgs/applications/video/jftui/default.nix
new file mode 100644
index 000000000000..82774ada09eb
--- /dev/null
+++ b/pkgs/applications/video/jftui/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchFromGitHub, fetchpatch, clang,
+  pkg-config, curl, mpv, yajl }:
+
+stdenv.mkDerivation rec {
+  pname = "jftui";
+  version = "0.2.2";
+
+  src = fetchFromGitHub {
+    owner = "Aanok";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0g93w8ahyh2v0cv2fyj5a7v6qyznavwk0dcxx1qw4kczdgmlxnkx";
+  };
+
+  patches = [
+    # Remove this patch with next version
+    (fetchpatch {
+      name = "curl-capability-check-fix";
+      url = "https://github.com/Aanok/jftui/commit/d63996b8bc0d2ac4b04c5de4169bc7f8ec9b2a30.patch";
+      sha256 = "1d595mkzgx3carq2cykxpvmf5klgdlyaq94fk9wj8812yswqlsr7";
+    })
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    clang
+    curl
+    mpv
+    yajl
+  ];
+
+  installPhase = ''
+    install -Dm555 build/jftui $out/bin/jftui
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Jellyfin Terminal User Interface ";
+    homepage = "https://github.com/Aanok/jftui";
+    license = licenses.unlicense;
+    maintainers = [ maintainers.nyanloutre ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac069a1e2597..f280b6423084 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20117,6 +20117,8 @@ in
     inherit (darwin) libobjc;
   };
 
+  jftui = callPackage ../applications/video/jftui { };
+
   lilyterm = callPackage ../applications/misc/lilyterm {
     inherit (gnome2) vte;
     gtk = gtk2;

From 46a93a7fdb2bccf0feaa6b3945251b4b1b1378d4 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 16 Feb 2020 15:54:41 -0800
Subject: [PATCH 0883/4636] expect: use postPatch for stty patch

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

diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix
index 6c9f348b8a19..9fcff332de6d 100644
--- a/pkgs/tools/misc/expect/default.nix
+++ b/pkgs/tools/misc/expect/default.nix
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  preConfigure = ''
-    sed -i "s,/bin/stty,$(type -p stty),g" configure
+  postPatch = ''
+    sed -i "s,/bin/stty,$(type -p stty),g" configure.in
   '';
 
   configureFlags = [

From d186c7f1c71ff0fd4747599c847aa48b5125a594 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 4 Feb 2020 18:43:32 +0000
Subject: [PATCH 0884/4636] seqdiag: 0.9.6 -> 2.0.0

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

diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix
index 1f6307f2cbbf..052c2fc3d0fc 100644
--- a/pkgs/development/python-modules/seqdiag/default.nix
+++ b/pkgs/development/python-modules/seqdiag/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "seqdiag";
-  version = "0.9.6";
+  version = "2.0.0";
 
   src = fetchurl {
     url = "mirror://pypi/s/seqdiag/${pname}-${version}.tar.gz";
-    sha256 = "78104e7644c1a4d3a5cacb68de6a7f720793f08dd78561ef0e9e80bed63702bf";
+    sha256 = "0k7j4f9j3d0325piwvbv90nfh0wzfk2n6s73s6h6nsxmqshcgswk";
   };
 
   buildInputs = [ pep8 nose unittest2 docutils ];

From d6e1193d39208ce7c83078ead244694165bbb8bd Mon Sep 17 00:00:00 2001
From: Jon <jonringer@users.noreply.github.com>
Date: Sun, 16 Feb 2020 19:09:03 -0800
Subject: [PATCH 0885/4636] pythonPackages.seqdiag: disable python2

No longer supported upstream
```
  ERROR: Package 'seqdiag' requires a different Python: 2.7.17 not in '>=3.5'
```
---
 pkgs/development/python-modules/seqdiag/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix
index 052c2fc3d0fc..feddc24985ab 100644
--- a/pkgs/development/python-modules/seqdiag/default.nix
+++ b/pkgs/development/python-modules/seqdiag/default.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils
+{ stdenv, fetchurl, buildPythonPackage, isPy27, pep8, nose, unittest2, docutils
 , blockdiag
 }:
 
 buildPythonPackage rec {
   pname = "seqdiag";
   version = "2.0.0";
+  disabled = isPy27;
 
   src = fetchurl {
     url = "mirror://pypi/s/seqdiag/${pname}-${version}.tar.gz";

From f0d53bd6f9f0cbd806d0f486e4bf7d4d69062f1b Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Tue, 21 Jan 2020 13:20:26 -0500
Subject: [PATCH 0886/4636] pythonPackages.docloud: init at 1.0.375

The IBM Decision Optimization on Cloud Python client.

Requirement of docplex, which is a dependency of qiskit-aqua.
---
 .../python-modules/docloud/default.nix        | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/python-modules/docloud/default.nix

diff --git a/pkgs/development/python-modules/docloud/default.nix b/pkgs/development/python-modules/docloud/default.nix
new file mode 100644
index 000000000000..f1ec269f7cbb
--- /dev/null
+++ b/pkgs/development/python-modules/docloud/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "docloud";
+  version = "1.0.375";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "996d55407498fd01e6c6c480f367048f92255e9ca9db0e9ea19aaef91328a441";
+  };
+
+  propagatedBuildInputs = [
+    requests
+  ];
+
+  # Pypi's tarball doesn't contain tests. Source not available.
+  doCheck = false;
+  pythonImportsCheck = [ "docloud" ];
+
+  meta = with lib; {
+    description = "The IBM Decision Optimization on Cloud Python client";
+    homepage = "https://onboarding-oaas.docloud.ibmcloud.com/software/analytics/docloud/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ drewrisinger ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 927bfa285ba3..ca130a8df05e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2544,6 +2544,8 @@ in {
 
   docker_pycreds = callPackage ../development/python-modules/docker-pycreds {};
 
+  docloud = callPackage ../development/python-modules/docloud { };
+
   docopt = callPackage ../development/python-modules/docopt { };
 
   doctest-ignore-unicode = callPackage ../development/python-modules/doctest-ignore-unicode { };

From c71f63a3378d60c3fe73d7a0f0f1acd4970ec8e6 Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Mon, 3 Feb 2020 17:24:54 -0500
Subject: [PATCH 0887/4636] ecos: 2.0.6 -> 2.0.7

Bump ecos module.
---
 .../libraries/science/math/ecos/default.nix           | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/science/math/ecos/default.nix b/pkgs/development/libraries/science/math/ecos/default.nix
index 77973a954494..2ba69a34a4a7 100644
--- a/pkgs/development/libraries/science/math/ecos/default.nix
+++ b/pkgs/development/libraries/science/math/ecos/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ecos";
-  version = "2.0.6";
+  version = "2.0.7";
 
   src = fetchFromGitHub {
     owner = "embotech";
     repo = "ecos";
-    rev = "v${version}";
-    sha256 = "11v958j66wq30gxpjpkgl7n3rvla845lygz8fl39pgf1vk9sdyc7";
+    rev = version;
+    sha256 = "1hsndim5kjvcwk5svqa4igawzahj982180xj1d7yd0dbjlgxc7w7";
   };
 
   buildPhase = ''
@@ -29,9 +29,10 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A lightweight conic solver for second-order cone programming";
-    homepage = https://www.embotech.com/ECOS;
+    homepage = "https://www.embotech.com/ECOS";
+    downloadPage = "https://github.com/embotech/ecos/releases";
     license = licenses.gpl3;
     platforms = platforms.all;
-    maintainers = [ maintainers.bhipple ];
+    maintainers = with maintainers; [ bhipple ];
   };
 }

From 78c147c164fed876b84c6744586b0ceb52c4f6c3 Mon Sep 17 00:00:00 2001
From: "Farkas, Arnold" <arnold.farkas@worldquant.com>
Date: Mon, 27 Jan 2020 03:47:40 -0500
Subject: [PATCH 0888/4636] pythonPackages.vertica-python: init at 0.10.2

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

diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix
new file mode 100644
index 000000000000..24af3599869b
--- /dev/null
+++ b/pkgs/development/python-modules/vertica-python/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, fetchPypi, future, dateutil, six, pytest, mock, parameterized }:
+
+buildPythonPackage rec {
+  pname = "vertica-python";
+  version = "0.10.2";
+  
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "c35d0e7ac8da2af47a65efc72d5d8351caa93e4829e549f229aa7e375593f896";
+  };
+  
+  propagatedBuildInputs = [ future dateutil six ];
+  
+  checkInputs = [ pytest mock parameterized ];
+  
+  # Integration tests require an accessible Vertica db
+  checkPhase = ''
+    pytest --ignore vertica_python/tests/integration_tests
+  '';
+  
+  meta = with lib; {
+    description = "Native Python client for Vertica database";
+    homepage = "https://github.com/vertica/vertica-python";
+    license = licenses.asl20;
+    maintainers = [ maintainers.arnoldfarkas ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ca130a8df05e..ed7a00d5e816 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5720,6 +5720,8 @@ in {
 
   vega_datasets = callPackage ../development/python-modules/vega_datasets { };
 
+  vertica-python = callPackage ../development/python-modules/vertica-python { };
+
   virtkey = callPackage ../development/python-modules/virtkey {
     inherit (pkgs) pkgconfig;
   };

From 9a2cd20478850a577d0b85166e7c071a250ed193 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Sun, 16 Feb 2020 14:45:22 -0500
Subject: [PATCH 0889/4636] mrtrix: init at 3.0_RC3_latest

This package consists mostly of command-line tools, but there are also two qt5-based image viewers (`mrview` and `shview`). I have provided an option `withGui = true` to allow users to disable these viewers. They work on NixOS but unlikely to work out-of-the box on non-NixOS Linux (see #62169), but I've refrained from asserting that they shouldn't be built since a user might want to fiddle with runtime GL stuff.

Some programs rely on FSL and/or ANTs backends; I have somewhat heavy-handedly wrapped all binaries to point to ANTs, while FSL is not available in Nix at the moment and has a non-commercial license so would be convenient to disable by default for Hydra builds.
---
 .../science/biology/mrtrix/default.nix        | 77 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 79 insertions(+)
 create mode 100644 pkgs/applications/science/biology/mrtrix/default.nix

diff --git a/pkgs/applications/science/biology/mrtrix/default.nix b/pkgs/applications/science/biology/mrtrix/default.nix
new file mode 100644
index 000000000000..6959b2caab8a
--- /dev/null
+++ b/pkgs/applications/science/biology/mrtrix/default.nix
@@ -0,0 +1,77 @@
+{ stdenv, lib, fetchFromGitHub, python, makeWrapper
+, eigen, fftw, libtiff, zlib, ants, bc
+, qt5, libGL, libGLU, libX11, libXext
+, withGui ? true }:
+
+stdenv.mkDerivation rec {
+  pname = "mrtrix";
+  version = "3.0_RC3_latest";
+
+  src = fetchFromGitHub {
+    owner  = "MRtrix3";
+    repo   = "mrtrix3";
+    rev    = version;
+    sha256 = "184nv524p8j94qicjy9l288bqcgl2yxqqs55a7042i0gfsnwp51c";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [ eigen makeWrapper ] ++ lib.optional withGui qt5.wrapQtAppsHook;
+
+  buildInputs = [
+    ants
+    python
+    fftw
+    libtiff
+    zlib ] ++ lib.optionals withGui [
+    libGL
+    libGLU
+    libX11
+    libXext
+    qt5.qtbase
+    qt5.qtsvg
+  ];
+
+  installCheckInputs = [ bc ];
+
+  postPatch = ''
+    patchShebangs ./build ./configure ./run_tests ./bin/population_template
+    substituteInPlace ./run_tests  \
+      --replace 'git submodule update --init >> $LOGFILE 2>&1' ""
+  '';
+
+  configurePhase = ''
+    export EIGEN_CFLAGS="-isystem ${eigen}/include/eigen3"
+    unset LD  # similar to https://github.com/MRtrix3/mrtrix3/issues/1519
+    ./configure ${lib.optionalString (!withGui) "-nogui"};
+  '';
+
+  buildPhase = ''
+    ./build
+    (cd testing && ../build)
+  '';
+
+  installCheckPhase = "./run_tests";
+  doInstallCheck = true;
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out
+    cp -ar lib $out/lib
+    cp -ar bin $out/bin
+    runHook postInstall
+  '';
+
+  postInstall = ''
+    for prog in $out/bin/*; do
+      wrapProgram $prog --prefix PATH : ${lib.makeBinPath [ ants ]}
+    done
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/MRtrix3/mrtrix3";
+    description = "Suite of tools for diffusion imaging";
+    maintainers = with maintainers; [ bcdarwin ];
+    platforms = platforms.linux;
+    license   = licenses.mpl20;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d3691ce2293..52b77558b459 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23907,6 +23907,8 @@ in
 
   mrbayes = callPackage ../applications/science/biology/mrbayes { };
 
+  mrtrix = callPackage ../applications/science/biology/mrtrix { python = python3; };
+
   megahit = callPackage ../applications/science/biology/megahit { };
 
   messer-slim = callPackage ../applications/science/biology/messer-slim { };

From 7855afeef7eda3b4d63815b5e927038dc1676e50 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Wed, 11 Sep 2019 23:20:31 +0300
Subject: [PATCH 0890/4636] mbutil: init at 0.3.0

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

diff --git a/pkgs/applications/misc/mbutil/default.nix b/pkgs/applications/misc/mbutil/default.nix
new file mode 100644
index 000000000000..b108d1a5647e
--- /dev/null
+++ b/pkgs/applications/misc/mbutil/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonApplication, fetchFromGitHub, nose }:
+
+buildPythonApplication rec {
+  pname = "mbutil";
+  version = "0.3.0";
+
+  src = fetchFromGitHub {
+    owner = "mapbox";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "06d62r89h026asaa4ryzb23m86j0cmbvy54kf4zl5f35sgiha45z";
+  };
+
+  checkInputs = [ nose ];
+  checkPhase = "nosetests";
+
+  meta = with lib; {
+    description = "An importer and exporter for MBTiles";
+    homepage = "https://github.com/mapbox/mbutil";
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ sikmir ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f280b6423084..19de9f2d10f2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5005,6 +5005,8 @@ in
     boost = boost155;
   };
 
+  mbutil = python3Packages.callPackage ../applications/misc/mbutil { };
+
   mc = callPackage ../tools/misc/mc { };
 
   mcabber = callPackage ../applications/networking/instant-messengers/mcabber { };

From 79969356682e7ea642a0ee934080cc769a689790 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 7 Feb 2020 14:23:52 +0000
Subject: [PATCH 0891/4636] libsixel: 1.8.4 -> 1.8.6

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

diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix
index 9973f3373982..3c3beb5f1a78 100644
--- a/pkgs/development/libraries/libsixel/default.nix
+++ b/pkgs/development/libraries/libsixel/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchFromGitHub}:
 stdenv.mkDerivation rec {
-  version = "1.8.4";
+  version = "1.8.6";
   pname = "libsixel";
 
   src = fetchFromGitHub {
     repo = "libsixel";
     rev = "v${version}";
     owner = "saitoha";
-    sha256 = "1zckahfl0j7k68jf87iwdc4yx7fkfhxwa7lrf22dnz36d2iq785v";
+    sha256 = "1saxdj6sldv01g6w6yk8vr7px4bl31xca3a82j6v1j3fw5rbfphy";
   };
 
   configureFlags = [

From 52981cedfd9f194d9c16903527d16f122efbb072 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 17 Feb 2020 00:42:54 +0100
Subject: [PATCH 0892/4636] mautrix-whatsapp: 2020-01-12 -> 2020-02-09

---
 pkgs/servers/mautrix-whatsapp/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
index bb72ce1b45fd..578f125ee2b5 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule {
   pname = "mautrix-whatsapp-unstable";
-  version = "2020-01-12";
+  version = "2020-02-09";
 
   src = fetchFromGitHub {
     owner = "tulir";
     repo = "mautrix-whatsapp";
-    rev = "39e46833b471b0cf262d4ff57fcd61530b5d2b9e";
-    sha256 = "1r1f52advibb97vrhi2gw0d0scnsvfbmfqizsbpjmgm7ci9jjhcl";
+    rev = "260555b69ccd20f247405e4d8cab3d49fabda070";
+    sha256 = "1ykhwrp8bvhzzw4lg4m1w430ybgzd0zqgrs4jrvfd1m0als2iff7";
   };
 
-  modSha256 = "18bcv7x49bqnzwhafh8fvyv9z2d4j6w0iyqql0alq57hy7h7lxik";
+  modSha256 = "0ypj79rjwj5bls6aq2cz0d034dnv1sddl43iz51b4fl2bfv0drm9";
 
   meta = with stdenv.lib; {
     homepage = https://github.com/tulir/mautrix-whatsapp;

From ed944d4ceeb60a09f607da983e1cd9df73e1c2c6 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 17 Feb 2020 07:45:51 +0100
Subject: [PATCH 0893/4636] nextcloud-client: 2.6.2 -> 2.6.3

https://github.com/nextcloud/desktop/releases/tag/v2.6.3
---
 pkgs/applications/networking/nextcloud-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix
index c362de2daa35..53d073caee47 100644
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/applications/networking/nextcloud-client/default.nix
@@ -17,13 +17,13 @@
 
 mkDerivation rec {
   pname = "nextcloud-client";
-  version = "2.6.2";
+  version = "2.6.3";
 
   src = fetchFromGitHub {
     owner = "nextcloud";
     repo = "desktop";
     rev = "v${version}";
-    sha256 = "1adicl0msjwbvvi0nxqb1zmka51nn2b88plsynrap5fm0xp40j39";
+    sha256 = "17w1bx305w656jkiv55lwncxwdly8rf2dsisqw3c9bc7vz19l6p8";
   };
 
   patches = [

From 2721f9d549d1f18973ab23eb1ccaa1369d398bc2 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Sun, 16 Feb 2020 23:26:28 -0800
Subject: [PATCH 0894/4636] fish-foreign-env: update stderr redirection in
 patch

Caret stderr redirection has been deprecated and will be removed in a
future version.
---
 .../fish/fish-foreign-env/suppress-harmless-warnings.patch      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch b/pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch
index 5e4569f0a15c..6eed35152120 100644
--- a/pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch
+++ b/pkgs/shells/fish/fish-foreign-env/suppress-harmless-warnings.patch
@@ -14,7 +14,7 @@ index 34a25e3..3d94135 100644
  
 -        set -g -x $key $value
 +        if contains $key $ignore
-+          set -g -x $key $value ^/dev/null
++          set -g -x $key $value 2>/dev/null
 +        else
 +          set -g -x $key $value
 +        end

From 7d717675bf179514a87f50c79be82539899e1080 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 17 Feb 2020 08:35:03 +0100
Subject: [PATCH 0895/4636] gnome3.gnome-shell: 3.34.3 -> 3.34.4

---
 pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index c4fec93079a0..71d47a338a78 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -15,11 +15,11 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "gnome-shell";
-  version = "3.34.3";
+  version = "3.34.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "12mxavjf83d96qd5m8k0z2jnpi1587i25al5w9xpv965hvrvwx14";
+    sha256 = "0rm32h7lv4vyadi9x32sb6fwxslarwk70yzmvzjxbq872cazp779";
   };
 
   LANG = "en_US.UTF-8";

From 25f5825b0aa5fd59f54d7ee7e80831a2eb815e99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 17 Feb 2020 08:35:39 +0100
Subject: [PATCH 0896/4636] gnome3.mutter: 3.34.3 -> 3.34.4

---
 pkgs/desktops/gnome-3/core/mutter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 642a825d5396..8ed00edf6c54 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -42,13 +42,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mutter";
-  version = "3.34.3";
+  version = "3.34.4";
 
   outputs = [ "out" "dev" "man" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "12aaxmclg3aw7qkk3pzpw8f5vrk0cxwprdrjnx9bjpf31gfpvxfd";
+    sha256 = "18hbw98p4h3d4qz57415smwmfg72s9a0nk8mb04ds1gn2lsm2d01";
   };
 
   mesonFlags = [

From 86cd4d110f9f92cc5bc906116e04ef26082aff7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 17 Feb 2020 08:36:28 +0100
Subject: [PATCH 0897/4636] epiphany: 3.34.3.1 -> 3.34.4

---
 pkgs/desktops/gnome-3/core/epiphany/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index 46f0f4191dff..be917b64452c 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -34,11 +34,11 @@
 
 stdenv.mkDerivation rec {
   pname = "epiphany";
-  version = "3.34.3.1";
+  version = "3.34.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0vga9bqcv792ivnlw6pbfz17zn0nh6wq01rp60c4px08l7xpkr00";
+    sha256 = "13ar3s40cds1rplwbzx0fzigf120w0rydiv05r3k6zpc0zy91qb0";
   };
 
   # Tests need an X display

From e718c3a68558ff3b209df41fc5c3c79ef4788ad4 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Sun, 16 Feb 2020 23:34:35 -0800
Subject: [PATCH 0898/4636] iosevka: don't show build progress

The node progress "bar" looks like crap when using `nix-build`. Redirect
the infinite scrolling screen to `/dev/null` to calm the output down.
Errors will still print because stderr isn't redirected.
---
 pkgs/data/fonts/iosevka/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index e21110658261..e6e3aeba9dea 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''
     runHook preBuild
-    npm run build -- ttf::$pname
+    npm run build -- ttf::$pname >/dev/null
     runHook postBuild
   '';
 

From cfc21ad059c2bd850deee0d75350144c2cd4d4b8 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Mon, 17 Feb 2020 09:36:53 +0100
Subject: [PATCH 0899/4636] Revert "haskell generic-builder: fix Darwin
 regression for lmdb"

This reverts commit 8c58c44aaed3c05f817de9f0bf151bd927cb1abd.

This causes a mass rebuild and should go to staging instead before
master
---
 pkgs/development/haskell-modules/generic-builder.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index ac22f903c9b5..513987dae7b3 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -384,7 +384,7 @@ stdenv.mkDerivation ({
     done
 
     for d in $(grep '^dynamic-library-dirs:' "$packageConfDir"/* | cut -d' ' -f2- | tr ' ' '\n' | sort -u); do
-      for lib in "$d/"*.{dylib,so}; do
+      for lib in "$d/"*.dylib; do
         ln -s "$lib" "$dynamicLinksDir"
       done
     done

From 019e86fde9c0a6db999bb15bf2f2ea703fce58fd Mon Sep 17 00:00:00 2001
From: Simon Chatterjee <code@chatts.net>
Date: Sat, 15 Feb 2020 16:37:24 +0000
Subject: [PATCH 0900/4636] haskell generic-builder: fix Darwin regression for
 lmdb

Recent updates to the generic builder have caused haskellPackages.lmdb-simple to
fail to build on Darwin, since it cannot see the lmdb C dynamic library included
by its dependent haskellPackages.lmdb.

The C dynamic library has suffix `.so` not `.dylib`, so this fix allows for
that.

Closes #80190, but that issue may identify a preferable solution.
---
 pkgs/development/haskell-modules/generic-builder.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 513987dae7b3..ac22f903c9b5 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -384,7 +384,7 @@ stdenv.mkDerivation ({
     done
 
     for d in $(grep '^dynamic-library-dirs:' "$packageConfDir"/* | cut -d' ' -f2- | tr ' ' '\n' | sort -u); do
-      for lib in "$d/"*.dylib; do
+      for lib in "$d/"*.{dylib,so}; do
         ln -s "$lib" "$dynamicLinksDir"
       done
     done

From d7bc3a753452faed3dac6ad9914dcdd0e4bee2f0 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 17 Feb 2020 09:57:35 +0100
Subject: [PATCH 0901/4636] tests: fix more loaOf deprecation warnings

---
 nixos/tests/glusterfs.nix  | 19 ++++++++++---------
 nixos/tests/nfs/simple.nix | 14 +++++++-------
 nixos/tests/orangefs.nix   | 10 +++++-----
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/nixos/tests/glusterfs.nix b/nixos/tests/glusterfs.nix
index 8f9cb8973d51..cb07bc09511d 100644
--- a/nixos/tests/glusterfs.nix
+++ b/nixos/tests/glusterfs.nix
@@ -4,10 +4,11 @@ let
   client = { pkgs, ... } : {
     environment.systemPackages = [ pkgs.glusterfs ];
     fileSystems = pkgs.lib.mkVMOverride
-    [ { mountPoint = "/gluster";
-        fsType = "glusterfs";
-        device = "server1:/gv0";
-    } ];
+      { "/gluster" =
+          { device = "server1:/gv0";
+            fsType = "glusterfs";
+          };
+      };
   };
 
   server = { pkgs, ... } : {
@@ -22,11 +23,11 @@ let
     virtualisation.emptyDiskImages = [ 1024 ];
 
     fileSystems = pkgs.lib.mkVMOverride
-      [ { mountPoint = "/data";
-          device = "/dev/disk/by-label/data";
-          fsType = "ext4";
-        }
-      ];
+      { "/data" =
+          { device = "/dev/disk/by-label/data";
+            fsType = "ext4";
+          };
+      };
   };
 in {
   name = "glusterfs";
diff --git a/nixos/tests/nfs/simple.nix b/nixos/tests/nfs/simple.nix
index a1a09ee0f45c..c49ebddc2fdd 100644
--- a/nixos/tests/nfs/simple.nix
+++ b/nixos/tests/nfs/simple.nix
@@ -5,13 +5,13 @@ let
   client =
     { pkgs, ... }:
     { fileSystems = pkgs.lib.mkVMOverride
-        [ { mountPoint = "/data";
-            # nfs4 exports the export with fsid=0 as a virtual root directory
-            device = if (version == 4) then "server:/" else "server:/data";
-            fsType = "nfs";
-            options = [ "vers=${toString version}" ];
-          }
-        ];
+        { "/data" =
+           { # nfs4 exports the export with fsid=0 as a virtual root directory
+             device = if (version == 4) then "server:/" else "server:/data";
+             fsType = "nfs";
+             options = [ "vers=${toString version}" ];
+           };
+        };
       networking.firewall.enable = false; # FIXME: only open statd
     };
 
diff --git a/nixos/tests/orangefs.nix b/nixos/tests/orangefs.nix
index 46d7a6a72f89..24b7737058c8 100644
--- a/nixos/tests/orangefs.nix
+++ b/nixos/tests/orangefs.nix
@@ -10,11 +10,11 @@ let
     virtualisation.emptyDiskImages = [ 4096 ];
 
     fileSystems = pkgs.lib.mkVMOverride
-      [ { mountPoint = "/data";
-          device = "/dev/disk/by-label/data";
-          fsType = "ext4";
-        }
-      ];
+      { "/data" =
+          { device = "/dev/disk/by-label/data";
+            fsType = "ext4";
+          };
+      };
 
     services.orangefs.server = {
       enable = true;

From f8e031b2988c6ae907270ccea9207ec390ff7f5e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 17 Feb 2020 04:20:00 -0500
Subject: [PATCH 0902/4636] circleci-cli: 0.1.5879 -> 0.1.6072

---
 pkgs/development/tools/misc/circleci-cli/default.nix | 8 +++++---
 pkgs/top-level/all-packages.nix                      | 6 +-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix
index a590d4a61067..f4bdd0c09af3 100644
--- a/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/pkgs/development/tools/misc/circleci-cli/default.nix
@@ -2,16 +2,18 @@
 
 buildGoModule rec {
   pname = "circleci-cli";
-  version = "0.1.5879";
+  version = "0.1.6072";
 
   src = fetchFromGitHub {
     owner = "CircleCI-Public";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1471g56apaw0c5dpa0jrr7hvzh3kbwfr3yr0m4mz2dlf27d481ac";
+    sha256 = "1sbzl6y7974sib14qr2qa6d20cs54h6a3mc1whbxifg87cw02qjn";
   };
 
-  modSha256 = "0cvmcsl00jfikpkw3f7k5zw65156z5g5l2b6s5803a2i9d613268";
+  modSha256 = "1pxqc2a1hb6bk67sd2c37zwg6n7h0jay3yqsjcs4jc0bqv48gzip";
+
+  buildFlagsArray = [ "-ldflags=-s -w -X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" ];
 
   preBuild = ''
     substituteInPlace data/data.go \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4728ae975e7d..da0a9e76c7c3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2409,11 +2409,7 @@ in
 
   ciopfs = callPackage ../tools/filesystems/ciopfs { };
 
-  circleci-cli = callPackage ../development/tools/misc/circleci-cli {
-    # Version 0.1.5879 fails to build with go 1.13 due to:
-    #   build github.com/CircleCI-Public/circleci-cli: cannot load github.com/gobuffalo/packr/v2: github.com/gobuffalo/packr@v1.21.0: reading file:///nix/store/hh9hrfdg3gbqz37sa3hx44mkzkxpkkyw-circleci-cli-0.1.5879-go-modules/github.com/gobuffalo/packr/@v/v1.21.0.zip: Not Found
-    buildGoModule = buildGo112Module;
-  };
+  circleci-cli = callPackage ../development/tools/misc/circleci-cli { };
 
   circus = callPackage ../tools/networking/circus { };
 

From d9a19e97cb4ca95af0255cc2abbed14cf1b4e6e1 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 17 Feb 2020 04:20:00 -0500
Subject: [PATCH 0903/4636] ytop: 0.4.0 -> 0.5.1

---
 pkgs/tools/system/ytop/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/system/ytop/default.nix b/pkgs/tools/system/ytop/default.nix
index 79dcf41b7220..7bd97507beaf 100644
--- a/pkgs/tools/system/ytop/default.nix
+++ b/pkgs/tools/system/ytop/default.nix
@@ -4,19 +4,18 @@ assert stdenv.isDarwin -> IOKit != null;
 
 rustPlatform.buildRustPackage rec {
   pname = "ytop";
-  version = "0.4.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "cjbassi";
     repo = pname;
     rev = version;
-    sha256 = "1158nlg5b93jyljwvf9f2m8m3ph8sksk5dh9sfnvbiifbk4gizv7";
+    sha256 = "1wpxn8i5112pzs8b03shl627r2yz70lvzjhd6f5crwhsnir06h5x";
   };
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
 
-  cargoSha256 = "0c4xp63fm1n7x8brmx7avqjvcbqi32k6x5ps7h0fh0ign452y7fz";
-  verifyCargoDeps = true;
+  cargoSha256 = "0wmlmkq4y2923i5kjhprw2hd2v5qls49ncs6h8g9rdlmwd7qdl86";
 
   meta = with stdenv.lib; {
     description = "A TUI system monitor written in Rust";

From 5ef4af7afcaa3b85cf936efabe46b481b9dea3b7 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Mon, 17 Feb 2020 04:50:44 -0500
Subject: [PATCH 0904/4636] doomseeker: add qt wrapper, cleanup (#79794)

This avoids using NIX_CFLAGS_COMPILE by switching to hardeningDisable.
The hack is also only needed for darwin sources and is not specific to
clang.

Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
---
 pkgs/applications/misc/doomseeker/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix
index fbe21dd9a5b2..da36e89db1fa 100644
--- a/pkgs/applications/misc/doomseeker/default.nix
+++ b/pkgs/applications/misc/doomseeker/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }:
+{ stdenv, mkDerivation, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }:
 
-stdenv.mkDerivation {
+mkDerivation {
   pname = "doomseeker";
   version = "2018-03-05";
 
@@ -13,13 +13,10 @@ stdenv.mkDerivation {
 
   patches = [ ./fix_paths.patch ./qt_build_fix.patch ];
 
+  nativeBuildInputs = [ cmake qttools pkgconfig xxd ];
   buildInputs = [ qtbase qtmultimedia zlib bzip2 ];
 
-  nativeBuildInputs = [ cmake qttools pkgconfig xxd ];
-
-  enableParallelBuilding = true;
-
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=format-security";
+  hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format";
 
   meta = with stdenv.lib; {
     homepage = http://doomseeker.drdteam.org/;

From b224c0df88b5e2e36c05bc623ee402c2b5b42f07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20Rivi=C3=A8re?= <babathriviere@gmail.com>
Date: Mon, 17 Feb 2020 11:24:12 +0100
Subject: [PATCH 0905/4636] insomnia: 7.0.6 -> 7.1.0

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

diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix
index ae4302b74291..d05fbff5e0c1 100644
--- a/pkgs/development/web/insomnia/default.nix
+++ b/pkgs/development/web/insomnia/default.nix
@@ -16,12 +16,12 @@ let
   ];
 in stdenv.mkDerivation rec {
   pname = "insomnia";
-  version = "7.0.6";
+  version = "7.1.0";
 
   src = fetchurl {
     url =
       "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb";
-    sha256 = "125g40micavq5js5l7lpv01yl8635dwg240vldz8i2riqj65inq8";
+    sha256 = "1aqzg01dwgm1jidavwxichydxsz1c4ck8xhgvlgw24qddx5gwq1y";
   };
 
   nativeBuildInputs =

From 4e0a6bc4be0e5fb516e92f932b52572244e95f4b Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Mon, 17 Feb 2020 11:45:44 +0100
Subject: [PATCH 0906/4636] symlinkJoin: fix "bash: Argument list too long"
 error

When the `paths` argument is too big `symlinkJoin` will fail with:

```
while setting up the build environment: executing '/nix/store/rm1hz1lybxangc8sdl7xvzs5dcvigvf7-bash-4.4-p23/bin/bash': Argument list too long
```

This is fixed by passing `paths` as a file instead of as an
environment variable.
---
 pkgs/build-support/trivial-builders.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 5210b7d7ba20..e107db2db5c9 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -255,11 +255,14 @@ rec {
          }:
     let
       args = removeAttrs args_ [ "name" "postBuild" ]
-        // { inherit preferLocalBuild allowSubstitutes; }; # pass the defaults
+        // {
+          inherit preferLocalBuild allowSubstitutes;
+          passAsFile = [ "paths" ];
+        }; # pass the defaults
     in runCommand name args
       ''
         mkdir -p $out
-        for i in $paths; do
+        for i in $(cat $pathsPath); do
           ${lndir}/bin/lndir -silent $i $out
         done
         ${postBuild}

From 270a1e4f8a45fdff2dc5f32d30882f6dab87ca9f Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 17 Feb 2020 11:57:28 +0100
Subject: [PATCH 0907/4636] unscii: cleanup and split outputs

The font is very large and duplicated across many formats, some of
which cannot be compressed, like `.hex` or `.svg`.
For normal use (eg. X11, GTK applications) these formats are not
necessary, so they are moved to another output reducing the default
closure size.
---
 pkgs/data/fonts/unscii/default.nix | 45 ++++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix
index cd4d0dc42cdd..93fe8cdfb74b 100644
--- a/pkgs/data/fonts/unscii/default.nix
+++ b/pkgs/data/fonts/unscii/default.nix
@@ -1,32 +1,55 @@
-{stdenv, fetchurl, perl, bdftopcf, perlPackages, fontforge, SDL, SDL_image}:
+{ stdenv, fetchurl, perl, bdftopcf
+, fontforge, SDL, SDL_image, mkfontscale
+}:
+
 stdenv.mkDerivation rec {
   pname = "unscii";
   version = "1.1";
-  # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
+
   src = fetchurl {
     url = "http://pelulamu.net/${pname}/${pname}-${version}-src.tar.gz";
     sha256 = "0qcxcnqz2nlwfzlrn115kkp3n8dd7593h762vxs6vfqm13i39lq1";
   };
-  nativeBuildInputs = [perl bdftopcf perlPackages.TextCharWidth fontforge
-    SDL SDL_image];
+
+  nativeBuildInputs =
+    [ (perl.withPackages (p: [ p.TextCharWidth ]))
+      bdftopcf fontforge SDL SDL_image
+      mkfontscale
+    ];
+
   preConfigure = ''
     patchShebangs .
   '';
-  installPhase = ''
-    install -m444 -Dt $out/share/fonts          *.hex *.pcf
-    install -m444 -Dt $out/share/fonts/truetype *.ttf
-    install -m444 -Dt $out/share/fonts/opentype *.otf
-    install -m444 -Dt $out/share/fonts/svg      *.svg
-    install -m444 -Dt $out/share/fonts/web      *.woff
+
+  postBuild = ''
+    # compress pcf fonts
+    gzip -9 -n *.pcf
   '';
 
+  installPhase = ''
+    # install fonts for use in X11 and GTK applications
+    install -m444 -Dt "$out/share/fonts/misc"     *.pcf.gz
+    install -m444 -Dt "$out/share/fonts/opentype" *.otf
+    mkfontdir   "$out/share/fonts/misc"
+    mkfontscale "$out/share/fonts/opentype"
+
+    # install other formats in $extra
+    install -m444 -Dt "$extra/share/fonts/truetype" *.ttf
+    install -m444 -Dt "$extra/share/fonts/svg"      *.svg
+    install -m444 -Dt "$extra/share/fonts/web"      *.woff
+    install -m444 -Dt "$extra/share/fonts/misc"     *.hex
+    mkfontscale "$extra"/share/fonts/*
+  '';
+
+  outputs = [ "out" "extra" ];
+
   meta = {
     inherit version;
     description = ''Bitmapped character-art-friendly Unicode fonts'';
     # Basically GPL2+ with font exception — because of the Unifont-augmented
     # version. The reduced version is public domain.
     license = http://unifoundry.com/LICENSE.txt;
-    maintainers = [stdenv.lib.maintainers.raskin];
+    maintainers = [ stdenv.lib.maintainers.raskin ];
     homepage = http://pelulamu.net/unscii/;
   };
 }

From dfd86fc8821915e75d9c3e15bded4203df1e7fe5 Mon Sep 17 00:00:00 2001
From: Johannes Schleifenbaum <johannes@js-webcoding.de>
Date: Mon, 17 Feb 2020 12:56:16 +0100
Subject: [PATCH 0908/4636] dbeaver: 6.3.4 -> 6.3.5

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

diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index 98aebc32dba1..e5590bfe8556 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   pname = "dbeaver-ce";
-  version = "6.3.4";
+  version = "6.3.5";
 
   desktopItem = makeDesktopItem {
     name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
-    sha256 = "1b4ac7vsfz3c9vk7yv33pcfflcxl5fcnbzfdva1yfq63v28g38gk";
+    sha256 = "1ssxgnd23cy6br7sbfszvx283c5vz9hgfhx0vqyvm13wyr67hk45";
   };
 
   installPhase = ''

From 92c97a3915be841ea8b5440a2f5eb3f299f21058 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Braun <eon@patapon.info>
Date: Wed, 5 Feb 2020 19:29:09 +0100
Subject: [PATCH 0909/4636] terragrunt: 0.17.4 -> 0.21.11

---
 .../networking/cluster/terragrunt/default.nix |   5 +-
 .../networking/cluster/terragrunt/deps.nix    | 412 ++++++++++++++++--
 2 files changed, 371 insertions(+), 46 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index ddeb5851037b..49f55370bc42 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "terragrunt";
-  version = "0.17.4";
+  version = "0.21.11";
 
   goPackagePath = "github.com/gruntwork-io/terragrunt";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner  = "gruntwork-io";
     repo   = "terragrunt";
     rev    = "v${version}";
-    sha256 = "13hlv0ydmv8gpzgg6bfr7rp89xfw1bkgd0j684armw8zq29cmv3a";
+    sha256 = "1w64skk67i0sxjd2mkyqh3nglc32wc7schk7h8fwszpa1rw4dfcn";
   };
 
   goDeps = ./deps.nix;
@@ -18,6 +18,7 @@ buildGoPackage rec {
   buildInputs = [ makeWrapper ];
 
   preBuild = ''
+    find go/src -name vendor | xargs -I % sh -c 'echo Removing %; rm -rf %'
     buildFlagsArray+=("-ldflags" "-X main.VERSION=v${version}")
   '';
 
diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix
index 8432a8366b7a..51cb455ce7c9 100644
--- a/pkgs/applications/networking/cluster/terragrunt/deps.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix
@@ -1,129 +1,453 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
 [
   {
-    goPackagePath = "github.com/aws/aws-sdk-go";
+    goPackagePath  = "cloud.google.com/go";
     fetch = {
       type = "git";
-      url = "https://github.com/aws/aws-sdk-go";
-      rev = "25253087ea42da08900c4c1fc34c04bdb4a97d5a";
-      sha256 = "0p6mf53f4l9b26yc4qlm1s7yls73hsw8klyfhmnxhk2mq8k6ix4m";
+      url = "https://code.googlesource.com/gocloud";
+      rev =  "28a4bc8c44b3acbcc482cff0cdf7de29a4688b61";
+      sha256 = "0j40msxm72m8gs87rpwkk19iagjj387r42xwxszmrna7il8g0sbl";
     };
   }
   {
-    goPackagePath = "github.com/bgentry/go-netrc";
+    goPackagePath  = "github.com/agext/levenshtein";
+    fetch = {
+      type = "git";
+      url = "https://github.com/agext/levenshtein";
+      rev =  "0ded9c86537917af2ff89bc9c78de6bd58477894";
+      sha256 = "19d7q69yhcg7gl81j038rkbjz8yjb4qwnsqrmxa4zvhgzlc7d130";
+    };
+  }
+  {
+    goPackagePath  = "github.com/apparentlymart/go-cidr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/apparentlymart/go-cidr";
+      rev =  "b1115bf8e14a60131a196f908223e4506b0ddc35";
+      sha256 = "0r938rb18c9cr2k417cwwd4pfq74aabpjp9pzvk4qkxc5279igl3";
+    };
+  }
+  {
+    goPackagePath  = "github.com/apparentlymart/go-textseg";
+    fetch = {
+      type = "git";
+      url = "https://github.com/apparentlymart/go-textseg";
+      rev =  "fb01f485ebef760e5ee06d55e1b07534dda2d295";
+      sha256 = "0n9xcyj7p5y8mbqilk9zprfyqvgm2y9f1g440wqw9dnn3s4fi1k4";
+    };
+  }
+  {
+    goPackagePath  = "github.com/aws/aws-sdk-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/aws/aws-sdk-go";
+      rev =  "572908275ed4e38fef7ccb7d507f2faacaa7ab36";
+      sha256 = "07bn3v0c4pd38qdp0a0kgmsvh7q30f14qp7pbbls3jzmvpxh49zs";
+    };
+  }
+  {
+    goPackagePath  = "github.com/bgentry/go-netrc";
     fetch = {
       type = "git";
       url = "https://github.com/bgentry/go-netrc";
-      rev = "9fd32a8b3d3d3f9d43c341bfe098430e07609480";
+      rev =  "9fd32a8b3d3d3f9d43c341bfe098430e07609480";
       sha256 = "0dn2h8avgavqdzdqnph8bkhj35bx0wssczry1zdczr22xv650g1l";
     };
   }
   {
-    goPackagePath = "github.com/go-errors/errors";
+    goPackagePath  = "github.com/bmatcuk/doublestar";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bmatcuk/doublestar";
+      rev =  "2437321e1473408f122a95f65df3d8841fec4fba";
+      sha256 = "0z1jg4l746825qs95sffbc69av1yj0l37n8rjmmnwf7hxh5glxzp";
+    };
+  }
+  {
+    goPackagePath  = "github.com/creack/pty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/creack/pty";
+      rev =  "3a6a957789163cacdfe0e291617a1c8e80612c11";
+      sha256 = "1v52599qq76dwq742mffakzj6mxqqccv2szn3hjicjld56nmd2d3";
+    };
+  }
+  {
+    goPackagePath  = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev =  "8991bc29aa16c548c550c7ff78260e27b9ab7c73";
+      sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+    };
+  }
+  {
+    goPackagePath  = "github.com/fatih/color";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fatih/color";
+      rev =  "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4";
+      sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-errors/errors";
     fetch = {
       type = "git";
       url = "https://github.com/go-errors/errors";
-      rev = "a6af135bd4e28680facf08a3d206b454abc877a4";
+      rev =  "a6af135bd4e28680facf08a3d206b454abc877a4";
       sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp";
     };
   }
   {
-    goPackagePath = "github.com/hashicorp/go-cleanhttp";
+    goPackagePath  = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev =  "b5d812f8a3706043e23a9cd5babf2e5423744d30";
+      sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl";
+    };
+  }
+  {
+    goPackagePath  = "github.com/google/go-cmp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-cmp";
+      rev =  "6f77996f0c42f7b84e5a2b252227263f93432e9b";
+      sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj";
+    };
+  }
+  {
+    goPackagePath  = "github.com/google/uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/uuid";
+      rev =  "0cd6bf5da1e1c83f8b45653022c74f71af0538a4";
+      sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb";
+    };
+  }
+  {
+    goPackagePath  = "github.com/googleapis/gax-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/googleapis/gax-go";
+      rev =  "beaecbbdd8af86aa3acf14180d53828ce69400b2";
+      sha256 = "1iwnm6ky1x53lgs44mw3hpdkjzrm5qd0kfs50m0qcq2ml5m1cwdm";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gruntwork-io/terratest";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gruntwork-io/terratest";
+      rev =  "a02960d4ef0711ae95ae2651271b4e073f88da4e";
+      sha256 = "0mywsimj8if8j2jbp8sf4igl5lcdlj81hd3lif86fsmyrma090vw";
+    };
+  }
+  {
+    goPackagePath  = "github.com/hashicorp/errwrap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/errwrap";
+      rev =  "8a6fb523712970c966eefc6b39ed2c5e74880354";
+      sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c";
+    };
+  }
+  {
+    goPackagePath  = "github.com/hashicorp/go-cleanhttp";
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/go-cleanhttp";
-      rev = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d";
-      sha256 = "1m20y90syky4xr81sm3980jpil81nnpzmi6kv0vjr6p584gl1hn8";
+      rev =  "eda1e5db218aad1db63ca4642c8906b26bcf2744";
+      sha256 = "07kx3fhryqmaw3czacmm11qwx63js2q8cfq967vphk7xg9q377kk";
     };
   }
   {
-    goPackagePath = "github.com/hashicorp/go-getter";
+    goPackagePath  = "github.com/hashicorp/go-getter";
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/go-getter";
-      rev = "64040d90d4ab861e7e833d689dc76a0f176d8dec";
-      sha256 = "0g25nx42z6ykd7jqzlrxf161h8lqrpxpddmbspl4w3a84wphhgms";
+      rev =  "f9ec369200fd2163b8f452e5e45696d83ae3f4b6";
+      sha256 = "1h69946nsmpp06iqg85whwvjrfqlk1gf9q7y01f0r3sf0cb28f30";
     };
   }
   {
-    goPackagePath = "github.com/hashicorp/go-version";
+    goPackagePath  = "github.com/hashicorp/go-multierror";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-multierror";
+      rev =  "886a7fbe3eb1c874d46f623bfa70af45f425b3d1";
+      sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49";
+    };
+  }
+  {
+    goPackagePath  = "github.com/hashicorp/go-safetemp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-safetemp";
+      rev =  "c9a55de4fe06c920a71964b53cfe3dd293a3c743";
+      sha256 = "0gydks8bkq88adlzmv8qj3rvljx15j94c8lyrp88ji2jn6dvv643";
+    };
+  }
+  {
+    goPackagePath  = "github.com/hashicorp/go-uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-uuid";
+      rev =  "4f571afc59f3043a65f8fe6bf46d887b10a01d43";
+      sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k";
+    };
+  }
+  {
+    goPackagePath  = "github.com/hashicorp/go-version";
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/go-version";
-      rev = "23480c0665776210b5fbbac6eaaee40e3e6a96b7";
-      sha256 = "056zs67diq3m7skmmq3pnz6wymfcg55dfs5zf86xkfqqpj10kyf7";
+      rev =  "ac23dc3fea5d1a983c43f6a0f6e2c13f0195d8bd";
+      sha256 = "1bwi6y6111xq8ww8kjq0w1cmz15l1h9hb2id6596l8l0ag1vjj1z";
     };
   }
   {
-    goPackagePath = "github.com/hashicorp/hcl";
+    goPackagePath  = "github.com/hashicorp/golang-lru";
     fetch = {
       type = "git";
-      url = "https://github.com/hashicorp/hcl";
-      rev = "f40e974e75af4e271d97ce0fc917af5898ae7bda";
-      sha256 = "1w5w3m40xv85gngw8g1kjbcgah1vl4ardbpg2cxgj1svf80zazxx";
+      url = "https://github.com/hashicorp/golang-lru";
+      rev =  "7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c";
+      sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy";
     };
   }
   {
-    goPackagePath = "github.com/mattn/go-zglob";
+    goPackagePath  = "github.com/hashicorp/hcl2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/hcl2";
+      rev =  "318e80eefe28c3aa01b434c61bcf4c83a0cc6b25";
+      sha256 = "1wlm47qk84ggn6lanafirc49kaq998r1nw2xdcv4ghdxy2ijc0rj";
+    };
+  }
+  {
+    goPackagePath  = "github.com/hashicorp/terraform";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/terraform";
+      rev =  "abec0acf40d8e31ac612a244cf3886fb3bcce0bb";
+      sha256 = "14js4n08rg30y0jrm0na79syglpb64cb7cxys0x3w47pcbgymrka";
+    };
+  }
+  {
+    goPackagePath  = "github.com/jmespath/go-jmespath";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jmespath/go-jmespath";
+      rev =  "c2b33e84";
+      sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-colorable";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-colorable";
+      rev =  "167de6bfdfba052fa6b2d3664c8f5272e23c9072";
+      sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-isatty";
+      rev =  "e1f7b56ace729e4a73a29a6b4fac6cd5fcda7ab3";
+      sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-zglob";
     fetch = {
       type = "git";
       url = "https://github.com/mattn/go-zglob";
-      rev = "4959821b481786922ac53e7ef25c61ae19fb7c36";
-      sha256 = "0rwkdw143kphpmingsrw1zp030zf3p08f64h347jpdm4lz8z5449";
+      rev =  "2ea3427bfa539cca900ca2768d8663ecc8a708c1";
+      sha256 = "1sncdyq5fbd42al4amyy91h7vlzm3wm6c9vl8za2pjgfgsd581fz";
     };
   }
   {
-    goPackagePath = "github.com/mitchellh/go-homedir";
+    goPackagePath  = "github.com/mitchellh/go-homedir";
     fetch = {
       type = "git";
       url = "https://github.com/mitchellh/go-homedir";
-      rev = "b8bc1bf767474819792c23f32d8286a45736f1c6";
-      sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
+      rev =  "af06845cf3004701891bf4fdb884bfe4920b3727";
+      sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
     };
   }
   {
-    goPackagePath = "github.com/mitchellh/go-testing-interface";
+    goPackagePath  = "github.com/mitchellh/go-testing-interface";
     fetch = {
       type = "git";
       url = "https://github.com/mitchellh/go-testing-interface";
-      rev = "a61a99592b77c9ba629d254a693acffaeb4b7e28";
-      sha256 = "139hq835jpgk9pjg94br9d08nka8bfm7zyw92zxlwrkska4pgigx";
+      rev =  "6d0b8010fcc857872e42fc6c931227569016843c";
+      sha256 = "1dl2js8di858bawg7dadlf1qjpkl2g3apziihjyf5imri3znyfpw";
     };
   }
   {
-    goPackagePath = "github.com/mitchellh/mapstructure";
+    goPackagePath  = "github.com/mitchellh/go-wordwrap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-wordwrap";
+      rev =  "9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c";
+      sha256 = "1jffbwcr3nnq6c12c5856bwzv2nxjzqk3jwgvxkwi1xhpd2by0bf";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mitchellh/mapstructure";
     fetch = {
       type = "git";
       url = "https://github.com/mitchellh/mapstructure";
-      rev = "00c29f56e2386353d58c599509e8dc3801b0d716";
-      sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb";
+      rev =  "3536a929edddb9a5b34bd6861dc4a9647cb459fe";
+      sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr";
     };
   }
   {
-    goPackagePath = "github.com/stretchr/testify";
+    goPackagePath  = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev =  "792786c7400a136282c1664665ae0a8db921c6c2";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+  {
+    goPackagePath  = "github.com/stretchr/testify";
     fetch = {
       type = "git";
       url = "https://github.com/stretchr/testify";
-      rev = "c679ae2cc0cb27ec3293fea7e254e47386f05d69";
-      sha256 = "1rrdn7k83j492rzhqwkh6956sj8m2nbk44d7r1xa9nsn3hfwj691";
+      rev =  "ffdc059bfe9ce6a4e144ba849dbedead332c6053";
+      sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy";
     };
   }
   {
-    goPackagePath = "github.com/ulikunitz/xz";
+    goPackagePath  = "github.com/ulikunitz/xz";
     fetch = {
       type = "git";
       url = "https://github.com/ulikunitz/xz";
-      rev = "0c6b41e72360850ca4f98dc341fd999726ea007f";
-      sha256 = "0a6l7sp67ipxim093qh6fvw8knbxj24l7bj5lykcddi5gwfi78n3";
+      rev =  "6f934d456d51e742b4eeab20d925a827ef22320a";
+      sha256 = "1qpk02c0nfgfyg110nmbaiy5x12fpn0pm8gy7h1s8pwns133n831";
     };
   }
   {
-    goPackagePath = "github.com/urfave/cli";
+    goPackagePath  = "github.com/urfave/cli";
     fetch = {
       type = "git";
       url = "https://github.com/urfave/cli";
-      rev = "8e01ec4cd3e2d84ab2fe90d8210528ffbb06d8ff";
-      sha256 = "0cpr10n4ps3gcdbcink71ry9hzhdb5rrcysmylybs8h2lzxqgc1i";
+      rev =  "cfb38830724cc34fedffe9a2a29fb54fa9169cd1";
+      sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
     };
   }
-]
+  {
+    goPackagePath  = "github.com/zclconf/go-cty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/zclconf/go-cty";
+      rev =  "6fd39ad70c3a6bbdb1b4e47444e4cce72f901200";
+      sha256 = "0mb0ws70jg93vlamzhdvyvyfq6x0s0ll5gf44yanb1dhlz6i1f90";
+    };
+  }
+  {
+    goPackagePath  = "github.com/zclconf/go-cty-yaml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/zclconf/go-cty-yaml";
+      rev =  "bc34c981dadb5ed30af852693e3aba8fb6546f42";
+      sha256 = "0dams5g61n88rk7zq7sy0yap873ksjafhf81hn2fg2dpfjhcd3y2";
+    };
+  }
+  {
+    goPackagePath  = "go.opencensus.io";
+    fetch = {
+      type = "git";
+      url = "https://github.com/census-instrumentation/opencensus-go";
+      rev =  "9c377598961b706d1542bd2d84d538b5094d596e";
+      sha256 = "05jr8gkr2w34i5wwki4zhl5ch0qrgi7cdgag5iy5gpxplhbrvbg9";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev =  "5c40567a22f818bd14a1ea7245dad9f8ef0691aa";
+      sha256 = "17g8fb9vy2sqq8vgz8jdvf6c6d2290gm2qs0i4yzsd86mgn4dlrg";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev =  "461777fb6f67e8cb9d70cda16573678d085a74cf";
+      sha256 = "0sc0llch05q6h7nqgayi3sgismsznpnlsz4gh89y4klpymdcpbh2";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/oauth2";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/oauth2";
+      rev =  "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33";
+      sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev =  "93c9922d18aeb82498a065f07aec7ad7fa60dfb7";
+      sha256 = "0hv96nwbv0li3nrv43ldfzmf12yrrbji2cf8n44iibv8ps5kfssx";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev =  "342b2e1fbaa52c93f31447ad2c6abc048c63e475";
+      sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
+    };
+  }
+  {
+    goPackagePath  = "google.golang.org/api";
+    fetch = {
+      type = "git";
+      url = "https://code.googlesource.com/google-api-go-client";
+      rev =  "890e5eb51fe205e56dc55eb68d63e82039730816";
+      sha256 = "05r2wsjnmszsz4y59w8q6qknc7zq1mc56kya61i2133dqxyc55ai";
+    };
+  }
+  {
+    goPackagePath  = "google.golang.org/appengine";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/appengine";
+      rev =  "b2f4a3cf3c67576a2ee09e1fe62656a5086ce880";
+      sha256 = "0zxlvwzxwkwz4bs4h9zc9979dx76y4xf9ks4d22bclg47dv59yry";
+    };
+  }
+  {
+    goPackagePath  = "google.golang.org/genproto";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-genproto";
+      rev =  "eb0b1bdb6ae60fcfc41b8d907b50dfb346112301";
+      sha256 = "0g00wfxd4z886bglyszcvfpgzak0476axqyfaqv3va62ndbqpk90";
+    };
+  }
+  {
+    goPackagePath  = "google.golang.org/grpc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/grpc/grpc-go";
+      rev =  "501c41df7f472c740d0674ff27122f3f48c80ce7";
+      sha256 = "0hla9rjvyi6wjak4cw39ic8jkdcd0lsymhrz9sa52bfybxsczf38";
+    };
+  }
+]
\ No newline at end of file

From 66dc93c716a98b9748fad64ff0360107f32500e0 Mon Sep 17 00:00:00 2001
From: Patrizio Bekerle <patrizio@bekerle.com>
Date: Mon, 17 Feb 2020 06:23:54 +0100
Subject: [PATCH 0910/4636] Update QOwnNotes to 20.2.5

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

diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix
index 30569512129b..fa2c67709fb9 100644
--- a/pkgs/applications/office/qownnotes/default.nix
+++ b/pkgs/applications/office/qownnotes/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "qownnotes";
-  version = "19.12.15";
+  version = "20.2.5";
 
   src = fetchurl {
     url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
     # Can grab official version like so:
-    # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256
-    sha256 = "11i3cn1j365nwinaksfpi1hn7j6bqgjzhawkl6c294lzahngba9w";
+    # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-20.2.5.tar.xz.sha256
+    sha256 = "c26d2a86a521cd243ec0a4788e7627e91cb5877dace73d93dd7d35dd02e9e4c5";
   };
 
   nativeBuildInputs = [ qmake qttools ];

From f5a5695edd3e8a2d86d1759790017264efd314e9 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Mon, 17 Feb 2020 14:47:54 +0100
Subject: [PATCH 0911/4636] libreoffice-fresh: 6.3.0.4 -> 6.3.5.2

---
 .../office/libreoffice/default.nix            | 13 ---
 .../office/libreoffice/src-fresh/download.nix | 80 +++++++++----------
 .../office/libreoffice/src-fresh/primary.nix  | 10 +--
 .../office/libreoffice/src-still/override.nix | 14 ++++
 4 files changed, 59 insertions(+), 58 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index c8bb58d29213..12ffb9ce0485 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -61,19 +61,6 @@ in (stdenv.mkDerivation rec {
 
   patches = [
     ./xdg-open-brief.patch
-
-    # Poppler-0.82 compatibility
-    # https://gerrit.libreoffice.org/81545
-    (fetchpatch {
-      url = "https://github.com/LibreOffice/core/commit/2eadd46ab81058087af95bdfc1fea28fcdb65998.patch";
-      sha256 = "1mpipdfxvixjziizbhfbpybpzlg1ijw7s0yqjpmq5d7pf3pvkm4n";
-    })
-    # Poppler-0.83 compatibility
-    # https://gerrit.libreoffice.org/84384
-    (fetchpatch {
-      url = "https://github.com/LibreOffice/core/commit/9065cd8d9a19864f6b618f2dc10daf577badd9ee.patch";
-      sha256 = "0nd0gck8ra3ffw936a7ri0s6a0ii5cyglnhip2prcjh5yf7vw2i2";
-    })
   ];
 
   tarballPath = "external/tarballs";
diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix
index 4df8ce1059b4..78482326be23 100644
--- a/pkgs/applications/office/libreoffice/src-fresh/download.nix
+++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix
@@ -1,10 +1,10 @@
 [
   {
-    name = "libabw-0.1.2.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz";
-    sha256 = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485";
+    name = "libabw-0.1.3.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz";
+    sha256 = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed";
     md5 = "";
-    md5name = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485-libabw-0.1.2.tar.xz";
+    md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz";
   }
   {
     name = "commons-logging-1.2-src.tar.gz";
@@ -147,11 +147,11 @@
     md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz";
   }
   {
-    name = "expat-2.2.5.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/expat-2.2.5.tar.bz2";
-    sha256 = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6";
+    name = "expat-2.2.8.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2";
+    sha256 = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102";
     md5 = "";
-    md5name = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6-expat-2.2.5.tar.bz2";
+    md5name = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102-expat-2.2.8.tar.bz2";
   }
   {
     name = "Firebird-3.0.0.32483-0.tar.bz2";
@@ -462,11 +462,11 @@
     md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz";
   }
   {
-    name = "language-subtag-registry-2019-04-03.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-04-03.tar.bz2";
-    sha256 = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d";
+    name = "language-subtag-registry-2019-09-16.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-09-16.tar.bz2";
+    sha256 = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a";
     md5 = "";
-    md5name = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d-language-subtag-registry-2019-04-03.tar.bz2";
+    md5name = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a-language-subtag-registry-2019-09-16.tar.bz2";
   }
   {
     name = "JLanguageTool-1.7.0.tar.bz2";
@@ -546,18 +546,18 @@
     md5name = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4-xmlsec1-1.2.28.tar.gz";
   }
   {
-    name = "libxml2-2.9.9.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/libxml2-2.9.9.tar.gz";
-    sha256 = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871";
+    name = "libxml2-2.9.10.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz";
+    sha256 = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f";
     md5 = "";
-    md5name = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871-libxml2-2.9.9.tar.gz";
+    md5name = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f-libxml2-2.9.10.tar.gz";
   }
   {
-    name = "libxslt-1.1.33.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/libxslt-1.1.33.tar.gz";
-    sha256 = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8";
+    name = "libxslt-1.1.34.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz";
+    sha256 = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f";
     md5 = "";
-    md5name = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8-libxslt-1.1.33.tar.gz";
+    md5name = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f-libxslt-1.1.34.tar.gz";
   }
   {
     name = "lp_solve_5.5.tar.gz";
@@ -623,11 +623,11 @@
     md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz";
   }
   {
-    name = "nss-3.45-with-nspr-4.21.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/nss-3.45-with-nspr-4.21.tar.gz";
-    sha256 = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1";
+    name = "nss-3.47.1-with-nspr-4.23.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/nss-3.47.1-with-nspr-4.23.tar.gz";
+    sha256 = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64";
     md5 = "";
-    md5name = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1-nss-3.45-with-nspr-4.21.tar.gz";
+    md5name = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64-nss-3.47.1-with-nspr-4.23.tar.gz";
   }
   {
     name = "libodfgen-0.1.6.tar.bz2";
@@ -658,11 +658,11 @@
     md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz";
   }
   {
-    name = "openssl-1.0.2r.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/openssl-1.0.2r.tar.gz";
-    sha256 = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6";
+    name = "openssl-1.0.2t.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz";
+    sha256 = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc";
     md5 = "";
-    md5name = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6-openssl-1.0.2r.tar.gz";
+    md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz";
   }
   {
     name = "liborcus-0.14.1.tar.gz";
@@ -707,11 +707,11 @@
     md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz";
   }
   {
-    name = "poppler-0.74.0.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/poppler-0.74.0.tar.xz";
-    sha256 = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f";
+    name = "poppler-0.82.0.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz";
+    sha256 = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df";
     md5 = "";
-    md5name = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f-poppler-0.74.0.tar.xz";
+    md5name = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df-poppler-0.82.0.tar.xz";
   }
   {
     name = "postgresql-9.2.24.tar.bz2";
@@ -721,11 +721,11 @@
     md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2";
   }
   {
-    name = "Python-3.5.7.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/Python-3.5.7.tar.xz";
-    sha256 = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc";
+    name = "Python-3.5.9.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/Python-3.5.9.tar.xz";
+    sha256 = "c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049";
     md5 = "";
-    md5name = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc-Python-3.5.7.tar.xz";
+    md5name = "c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049-Python-3.5.9.tar.xz";
   }
   {
     name = "libqxp-0.0.2.tar.xz";
@@ -805,11 +805,11 @@
     md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz";
   }
   {
-    name = "libvisio-0.1.6.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libvisio-0.1.6.tar.xz";
-    sha256 = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9";
+    name = "libvisio-0.1.7.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz";
+    sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c";
     md5 = "";
-    md5name = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9-libvisio-0.1.6.tar.xz";
+    md5name = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c-libvisio-0.1.7.tar.xz";
   }
   {
     name = "libwpd-0.10.3.tar.xz";
diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix
index 28bf127c3988..d3da7d09b704 100644
--- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix
+++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix
@@ -8,8 +8,8 @@ rec {
 
   major = "6";
   minor = "3";
-  patch = "0";
-  tweak = "4";
+  patch = "5";
+  tweak = "2";
 
   subdir = "${major}.${minor}.${patch}";
 
@@ -17,19 +17,19 @@ rec {
 
   src = fetchurl {
     url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "1mxflzrcm04djkj8ifyy4rwgl8bxirrvzrn864w6rgvzn43h30w7";
+    sha256 = "0jnayv1i0iq1gpf3q3z9nfq6jid77d0c76675lkqb3gi07f63nzz";
   };
 
   # FIXME rename
   translations = fetchSrc {
     name = "translations";
-    sha256 = "0730fw2kr00b2d56jkdzjdz49c4k4mxiz879c7ikw59c5zvrh009";
+    sha256 = "01g09bbn1ixrsfj4l0x6x8p06dz9hnlrhnr3f3xb42drmi9ipvjv";
   };
 
   # TODO: dictionaries
 
   help = fetchSrc {
     name = "help";
-    sha256 = "1w9bqwzz75vvxxy9dgln0v6p6isf8mkqnkg1nzlaykvdgsn5sp4z";
+    sha256 = "1p38wlclv6cbjpkkq7n2mjpxy84pxi4vxc9s5kjp4dm63zzxafd6";
   };
 }
diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/pkgs/applications/office/libreoffice/src-still/override.nix
index 7192af019496..a089dd1e2c7f 100644
--- a/pkgs/applications/office/libreoffice/src-still/override.nix
+++ b/pkgs/applications/office/libreoffice/src-still/override.nix
@@ -3,4 +3,18 @@ attrs:
 {
   configureFlags = stdenv.lib.lists.remove "--without-export-validation" attrs.configureFlags;
   meta = attrs.meta // { description = "Comprehensive, professional-quality productivity suite (Still/Stable release)"; };
+  patches = = attrs.patches ++ [
+    # Poppler-0.82 compatibility
+    # https://gerrit.libreoffice.org/81545
+    (fetchpatch {
+      url = "https://github.com/LibreOffice/core/commit/2eadd46ab81058087af95bdfc1fea28fcdb65998.patch";
+      sha256 = "1mpipdfxvixjziizbhfbpybpzlg1ijw7s0yqjpmq5d7pf3pvkm4n";
+    })
+    # Poppler-0.83 compatibility
+    # https://gerrit.libreoffice.org/84384
+    (fetchpatch {
+      url = "https://github.com/LibreOffice/core/commit/9065cd8d9a19864f6b618f2dc10daf577badd9ee.patch";
+      sha256 = "0nd0gck8ra3ffw936a7ri0s6a0ii5cyglnhip2prcjh5yf7vw2i2";
+    })
+  ];
 }

From a508b6e606ee4c165a90a10881c0df8308ab4ce8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 9 Feb 2020 18:26:40 +0100
Subject: [PATCH 0912/4636] jose: init at 10

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

diff --git a/pkgs/development/libraries/jose/default.nix b/pkgs/development/libraries/jose/default.nix
new file mode 100644
index 000000000000..4c3095681ed0
--- /dev/null
+++ b/pkgs/development/libraries/jose/default.nix
@@ -0,0 +1,28 @@
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+, zlib, jansson, openssl
+}:
+
+stdenv.mkDerivation rec {
+  pname = "jose";
+  version = "10";
+
+  src = fetchFromGitHub {
+    owner = "latchset";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "15ac8a656m66rd9qg4dj53smykwaagqv606h18w7fiqn0ykxl4vi";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ zlib jansson openssl ];
+
+  outputs = [ "out" "dev" "man" ];
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "C-language implementation of Javascript Object Signing and Encryption";
+    homepage = "https://github.com/latchset/jose";
+    maintainers = with lib.maintainers; [ fpletz ];
+    license = lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1994c2eafec..7ec52b06a0e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12060,6 +12060,8 @@ in
 
   jemalloc450 = callPackage ../development/libraries/jemalloc/jemalloc450.nix { };
 
+  jose = callPackage ../development/libraries/jose { };
+
   jshon = callPackage ../development/tools/parsing/jshon { };
 
   json2hcl = callPackage ../development/tools/json2hcl { };

From 38ae7d1c6ff342bcfb76f2640592b3619e29a185 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 9 Feb 2020 18:31:38 +0100
Subject: [PATCH 0913/4636] luksmeta: init at 9

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

diff --git a/pkgs/development/libraries/luksmeta/default.nix b/pkgs/development/libraries/luksmeta/default.nix
new file mode 100644
index 000000000000..9e01605d2df1
--- /dev/null
+++ b/pkgs/development/libraries/luksmeta/default.nix
@@ -0,0 +1,25 @@
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, asciidoc
+, cryptsetup
+}:
+
+stdenv.mkDerivation rec {
+  pname = "luksmeta";
+  version = "9";
+
+  src = fetchFromGitHub {
+    owner = "latchset";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "10nslwk7m1qwskd12c204ipa3cbad0q6fn0v084z2f7q6xxbkd2d";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig asciidoc ];
+  buildInputs = [ cryptsetup ];
+
+  meta = {
+    description = "Simple library for storing metadata in the LUKSv1 header";
+    homepage = "https://github.com/latchset/luksmeta/";
+    maintainers = with lib.maintainers; [ fpletz ];
+    license = lib.licenses.lgpl21Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7ec52b06a0e3..6c06c4901f30 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13283,6 +13283,10 @@ in
 
   luabind_luajit = luabind.override { lua = luajit; };
 
+  luksmeta = callPackage ../development/libraries/luksmeta {
+    asciidoc = asciidoc-full;
+  };
+
   lzo = callPackage ../development/libraries/lzo { };
 
   opencl-clang = callPackage ../development/libraries/opencl-clang { };

From 37f35dc7790e7ffada83e91e98cbf8c4bdd9ed73 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 9 Feb 2020 18:35:52 +0100
Subject: [PATCH 0914/4636] clevis: init at 12

---
 pkgs/tools/security/clevis/default.nix | 27 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  4 ++++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/security/clevis/default.nix

diff --git a/pkgs/tools/security/clevis/default.nix b/pkgs/tools/security/clevis/default.nix
new file mode 100644
index 000000000000..4acec7c8a5ba
--- /dev/null
+++ b/pkgs/tools/security/clevis/default.nix
@@ -0,0 +1,27 @@
+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, asciidoc
+, jansson, jose, cryptsetup, curl, libpwquality, luksmeta
+}:
+
+stdenv.mkDerivation rec {
+  pname = "clevis";
+  version = "12";
+
+  src = fetchFromGitHub {
+    owner = "latchset";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1dbyl3c21h841w9lrrq6gd5y6dhamr0z5ixd87jz86cn02lznp5m";
+  };
+
+  nativeBuildInputs = [ meson ninja pkgconfig asciidoc ];
+  buildInputs = [ jansson jose cryptsetup curl libpwquality luksmeta ];
+
+  outputs = [ "out" "man" ];
+
+  meta = {
+    description = "Automated Encryption Framework";
+    homepage = "https://github.com/latchset/clevis";
+    maintainers = with lib.maintainers; [ fpletz ];
+    license = lib.licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c06c4901f30..4ecd71dde87b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1431,6 +1431,10 @@ in
 
   clasp = callPackage ../tools/misc/clasp { };
 
+  clevis = callPackage ../tools/security/clevis {
+    asciidoc = asciidoc-full;
+  };
+
   cli53 = callPackage ../tools/admin/cli53 { };
 
   cli-visualizer = callPackage ../applications/misc/cli-visualizer { };

From 71cc7796e1d52a53a6cbd73bbdb32f6319dbf50c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 9 Feb 2020 18:40:03 +0100
Subject: [PATCH 0915/4636] tang: init at 7

---
 pkgs/servers/tang/default.nix   | 32 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  4 ++++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/servers/tang/default.nix

diff --git a/pkgs/servers/tang/default.nix b/pkgs/servers/tang/default.nix
new file mode 100644
index 000000000000..5aa261bd8a4c
--- /dev/null
+++ b/pkgs/servers/tang/default.nix
@@ -0,0 +1,32 @@
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, asciidoc
+, jansson, jose, http-parser, systemd
+}:
+
+stdenv.mkDerivation rec {
+  pname = "tang";
+  version = "7";
+
+  src = fetchFromGitHub {
+    owner = "latchset";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0y5w1jrq5djh9gpy2r98ja7676nfxss17s1dk7jvgblsijx9qsd7";
+  };
+
+  configureFlags = [
+    "--localstatedir=/var"
+    "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
+  ];
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig asciidoc ];
+  buildInputs = [ jansson jose http-parser systemd ];
+
+  outputs = [ "out" "man" ];
+
+  meta = {
+    description = "Server for binding data to network presence.";
+    homepage = "https://github.com/latchset/tang";
+    maintainers = with lib.maintainers; [ fpletz ];
+    license = lib.licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ecd71dde87b..e0827c15d33c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15664,6 +15664,10 @@ in
     libmemcached = null; # Detection is broken upstream
   };
 
+  tang = callPackage ../servers/tang {
+    asciidoc = asciidoc-full;
+  };
+
   timescaledb-parallel-copy = callPackage ../development/tools/database/timescaledb-parallel-copy { };
 
   timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { };

From f9a34082e64594b6ad62a77b08be0eef8d034813 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 17 Feb 2020 15:11:53 +0100
Subject: [PATCH 0916/4636] dovecot: 2.3.9.2 -> 2.3.9.3

Fixes CVE-2020-7046 & CVE-2020-7957:

  https://dovecot.org/pipermail/dovecot-news/2020-February/000429.html
---
 pkgs/servers/mail/dovecot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index 3aff9f53ce74..12da51f9f239 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -9,7 +9,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "dovecot-2.3.9.2";
+  name = "dovecot-2.3.9.3";
 
   nativeBuildInputs = [ perl pkgconfig ];
   buildInputs =
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dovecot.org/releases/2.3/${name}.tar.gz";
-    sha256 = "1yc6hi4hqg4hcc4495sf4m5f1lnargphi6dawj43if21vncgp127";
+    sha256 = "0lcnqib63nv32xr3nr4s3x8k77mbgrhc13swjl2xqnzw4fabd7zq";
   };
 
   enableParallelBuilding = true;

From c75860918f0e470bcc881414bd039d7c6c541a21 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 17 Feb 2020 08:12:48 -0600
Subject: [PATCH 0917/4636] kinit: Increase environment size limit

start_kdeinit reads its environment over a pipe from start_kdeinit_wrapper. For
security, each environment entry must be smaller than 4kb by default. Qt-based
applications in Nixpkgs may have larger environments, and the recent upgrade to
Plasma 5.17 pushed start_kdeinit_wrapper over the limit. The limit is now
extended to 16kb.

This problem was not detected during testing because the failure is silent:
start_kdeinit will continue with an empty environment. In other circumstances,
this strategy might work, but it does not work on NixOS. This failure is now
treated as a fatal error.

Fixes: #79707
---
 ...libpath.patch => 0001-kinit-libpath.patch} | 22 ++++++++++----
 .../kinit/0002-start_kdeinit-path.patch       | 25 ++++++++++++++++
 ...bs.patch => 0003-kdeinit-extra-libs.patch} | 25 ++++++++++++----
 ...004-start_kdeinit-environ-hard-limit.patch | 29 +++++++++++++++++++
 .../kde-frameworks/kinit/default.nix          |  7 ++++-
 .../kinit/start_kdeinit-path.patch            | 13 ---------
 6 files changed, 96 insertions(+), 25 deletions(-)
 rename pkgs/development/libraries/kde-frameworks/kinit/{kinit-libpath.patch => 0001-kinit-libpath.patch} (72%)
 create mode 100644 pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch
 rename pkgs/development/libraries/kde-frameworks/kinit/{kdeinit-extra_libs.patch => 0003-kdeinit-extra-libs.patch} (67%)
 create mode 100644 pkgs/development/libraries/kde-frameworks/kinit/0004-start_kdeinit-environ-hard-limit.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch

diff --git a/pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch
similarity index 72%
rename from pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch
rename to pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch
index b949723fb543..21477394c915 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch
+++ b/pkgs/development/libraries/kde-frameworks/kinit/0001-kinit-libpath.patch
@@ -1,8 +1,17 @@
-Index: kinit-5.32.0/src/kdeinit/kinit.cpp
-===================================================================
---- kinit-5.32.0.orig/src/kdeinit/kinit.cpp
-+++ kinit-5.32.0/src/kdeinit/kinit.cpp
-@@ -623,19 +623,15 @@ static pid_t launch(int argc, const char
+From 715c5f461b4992dac066601202a673bc551a5e33 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@mailbox.org>
+Date: Sun, 16 Feb 2020 14:23:31 -0600
+Subject: [PATCH 1/4] kinit-libpath
+
+---
+ src/kdeinit/kinit.cpp | 22 +++++++++-------------
+ 1 file changed, 9 insertions(+), 13 deletions(-)
+
+diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
+index 8fff17a..0801b75 100644
+--- a/src/kdeinit/kinit.cpp
++++ b/src/kdeinit/kinit.cpp
+@@ -622,19 +622,15 @@ static pid_t launch(int argc, const char *_name, const char *args,
  
          if (!libpath.isEmpty()) {
              if (libpath_relative) {
@@ -31,3 +40,6 @@ Index: kinit-5.32.0/src/kdeinit/kinit.cpp
                  }
              } else {
                  l.load();
+-- 
+2.23.1
+
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch b/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch
new file mode 100644
index 000000000000..bf25b98d6c56
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/kinit/0002-start_kdeinit-path.patch
@@ -0,0 +1,25 @@
+From 129cd0ae1e983adc10dbe84e87bcc6f31cb13db8 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@mailbox.org>
+Date: Sun, 16 Feb 2020 14:23:44 -0600
+Subject: [PATCH 2/4] start_kdeinit-path
+
+---
+ src/start_kdeinit/start_kdeinit_wrapper.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/start_kdeinit/start_kdeinit_wrapper.c b/src/start_kdeinit/start_kdeinit_wrapper.c
+index 891f50c..ef664ad 100644
+--- a/src/start_kdeinit/start_kdeinit_wrapper.c
++++ b/src/start_kdeinit/start_kdeinit_wrapper.c
+@@ -23,7 +23,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ 
+-#define EXECUTE CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit"
++#define EXECUTE "/run/wrappers/bin/start_kdeinit"
+ 
+ #if KDEINIT_OOM_PROTECT
+ 
+-- 
+2.23.1
+
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch b/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch
similarity index 67%
rename from pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch
rename to pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch
index d5b1a4accaa7..9df8505b2929 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch
+++ b/pkgs/development/libraries/kde-frameworks/kinit/0003-kdeinit-extra-libs.patch
@@ -1,7 +1,16 @@
-Index: kinit-5.32.0/src/kdeinit/kinit.cpp
-===================================================================
---- kinit-5.32.0.orig/src/kdeinit/kinit.cpp
-+++ kinit-5.32.0/src/kdeinit/kinit.cpp
+From 4f5d0de7e35744cdbfa9e280ee7e15a54cf21abb Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@mailbox.org>
+Date: Sun, 16 Feb 2020 14:24:07 -0600
+Subject: [PATCH 3/4] kdeinit-extra-libs
+
+---
+ src/kdeinit/kinit.cpp | 22 ++++------------------
+ 1 file changed, 4 insertions(+), 18 deletions(-)
+
+diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
+index 0801b75..622dd5f 100644
+--- a/src/kdeinit/kinit.cpp
++++ b/src/kdeinit/kinit.cpp
 @@ -96,9 +96,9 @@ static const char *extra_libs[] = {
      "libKF5Parts.5.dylib",
      "libKF5Plasma.5.dylib"
@@ -15,7 +24,7 @@ Index: kinit-5.32.0/src/kdeinit/kinit.cpp
  #endif
  };
  #endif
-@@ -1533,20 +1531,6 @@ static int initXconnection()
+@@ -1524,20 +1524,6 @@ static int initXconnection()
  }
  #endif
  
@@ -36,7 +45,8 @@ Index: kinit-5.32.0/src/kdeinit/kinit.cpp
  extern "C" {
  
      static void secondary_child_handler(int)
-@@ -1692,7 +1676,7 @@ int main(int argc, char **argv)
+@@ -1679,7 +1665,7 @@ int main(int argc, char **argv)
+ #if defined(Q_OS_UNIX) && !defined(Q_OS_OSX)
      if (!d.suicide && qEnvironmentVariableIsEmpty("KDE_IS_PRELINKED")) {
          for (const char *extra_lib : extra_libs) {
 -            const QString extra = findSharedLib(QString::fromLatin1(extra_lib));
@@ -44,3 +54,6 @@ Index: kinit-5.32.0/src/kdeinit/kinit.cpp
              if (!extra.isEmpty()) {
                  QLibrary l(extra);
                  l.setLoadHints(QLibrary::ExportExternalSymbolsHint);
+-- 
+2.23.1
+
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/0004-start_kdeinit-environ-hard-limit.patch b/pkgs/development/libraries/kde-frameworks/kinit/0004-start_kdeinit-environ-hard-limit.patch
new file mode 100644
index 000000000000..34d4726150c0
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/kinit/0004-start_kdeinit-environ-hard-limit.patch
@@ -0,0 +1,29 @@
+From 41e94983dcfbc1667f1b18c5b566aa5c5975edcb Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@mailbox.org>
+Date: Mon, 17 Feb 2020 04:45:03 -0600
+Subject: [PATCH 4/4] start_kdeinit-environ-hard-limit
+
+---
+ src/start_kdeinit/start_kdeinit.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/start_kdeinit/start_kdeinit.c b/src/start_kdeinit/start_kdeinit.c
+index f2db3e9..4ff2602 100644
+--- a/src/start_kdeinit/start_kdeinit.c
++++ b/src/start_kdeinit/start_kdeinit.c
+@@ -148,7 +148,11 @@ int main(int argc, char **argv)
+                         ++i) {
+                     unsigned len;
+                     if (read(0, &len, sizeof(unsigned)) == sizeof(unsigned)
+-                            && len && len < (1 << 12)) {
++                            && len) {
++                        if (len >= (1 << 14)) {
++                            fprintf(stderr, "%s: exceeded environment length limit", argv[0]);
++                            return 1;
++                        }
+                         env[ i ] = malloc(len + 1);
+                         if ((unsigned) read(0, env[ i ], len) == len) {
+                             env[ i ][ len ] = '\0';
+-- 
+2.23.1
+
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix
index 42a1e157a917..116f475e2f8c 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kinit/default.nix
@@ -14,7 +14,12 @@ mkDerivation {
   buildInputs = [
     kconfig kcrash ki18n kio kservice kwindowsystem
   ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  patches = [
+    ./0001-kinit-libpath.patch
+    ./0002-start_kdeinit-path.patch
+    ./0003-kdeinit-extra-libs.patch
+    ./0004-start_kdeinit-environ-hard-limit.patch
+  ];
   CXXFLAGS = [
     ''-DNIXPKGS_KF5_KIOCORE=\"${getLib kio}/lib/libKF5KIOCore.so.5\"''
     ''-DNIXPKGS_KF5_PARTS=\"${getLib kparts}/lib/libKF5Parts.so.5\"''
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch b/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch
deleted file mode 100644
index e3bfc2ebe6b4..000000000000
--- a/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kinit-5.24.0/src/start_kdeinit/start_kdeinit_wrapper.c
-===================================================================
---- kinit-5.24.0.orig/src/start_kdeinit/start_kdeinit_wrapper.c
-+++ kinit-5.24.0/src/start_kdeinit/start_kdeinit_wrapper.c
-@@ -23,7 +23,7 @@
- #include <string.h>
- #include <unistd.h>
- 
--#define EXECUTE CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit"
-+#define EXECUTE "/run/wrappers/bin/start_kdeinit"
- 
- #if KDEINIT_OOM_PROTECT
- 

From 85e09daf435677c3d5fe96f36223bb3549cd20d9 Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Mon, 17 Feb 2020 15:26:19 +0100
Subject: [PATCH 0918/4636] riot-web: 1.5.8 -> 1.5.9

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

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index 2156214db6b0..48e1beed2e7e 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "riot-web";
-  version = "1.5.8";
+  version = "1.5.9";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "112zjlmxy2s8qcd227laf1lfvbbwwcipn51xb779hy2dci48kpkx";
+    sha256 = "1qibbgjzhiwn1lnfm3pbfn6jahphgyf6625mp4v0ah2is75x16ys";
   };
 
   installPhase = let

From 5bd923057c59221c2f3dd02864f9aebcd91b137f Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Mon, 17 Feb 2020 15:26:31 +0100
Subject: [PATCH 0919/4636] riot-desktop: 1.5.6 -> 1.5.9

---
 .../instant-messengers/riot/riot-desktop-package.json        | 2 +-
 .../networking/instant-messengers/riot/riot-desktop.nix      | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
index c49934b96f77..11e2cf5c7e45 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "1.5.6",
+  "version": "1.5.9",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "dependencies": {
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
index 9b6f591bd42d..bf0feda42780 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
@@ -6,12 +6,12 @@
 
 let
   executableName = "riot-desktop";
-  version = "1.5.6";
+  version = "1.5.9";
   riot-web-src = fetchFromGitHub {
     owner = "vector-im";
     repo = "riot-web";
     rev = "v${version}";
-    sha256 = "148rg6wc84xy53bj16v5riw78s999ridid59x6v9jas827l0bdpk";
+    sha256 = "13bskp8nj1h44y7x4dibnfa8sdnzl744x4xckcw5lxnlkccfr69m";
   };
 
 in mkYarnPackage rec {
@@ -29,7 +29,6 @@ in mkYarnPackage rec {
     # resources
     mkdir -p "$out/share/riot"
     ln -s '${riot-web}' "$out/share/riot/webapp"
-    cp -r '${riot-web-src}/origin_migrator' "$out/share/riot/origin_migrator"
     cp -r './deps/riot-web' "$out/share/riot/electron"
     cp -r './deps/riot-web/img' "$out/share/riot"
     rm "$out/share/riot/electron/node_modules"

From 789182cb8f2024c83a2ea8fb0bc309be51dc7d0b Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 17 Feb 2020 16:02:25 +0100
Subject: [PATCH 0920/4636] ucs-fonts: add license and homepage

---
 pkgs/data/fonts/ucs-fonts/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix
index 0ea0363763dc..7f808af18f24 100644
--- a/pkgs/data/fonts/ucs-fonts/default.nix
+++ b/pkgs/data/fonts/ucs-fonts/default.nix
@@ -38,6 +38,7 @@ stdenv.mkDerivation {
   outputHash = "12fh3kbsib0baqwk6148fnzqrj9gs4vnl7yd5n9km72sic1z1xwk";
 
   meta = with stdenv.lib; {
+    homepage = https://www.cl.cam.ac.uk/~mgk25/ucs-fonts.html;
     description = "Unicode bitmap fonts";
     maintainers = [ maintainers.raskin ];
     platforms = platforms.all;

From 895042956f279ae8ebc9fd026664cea8198f71ec Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 17 Feb 2020 16:35:53 +0100
Subject: [PATCH 0921/4636] nixos/release-small.nix: List constituents of the
 'tested' job by name

https://github.com/NixOS/hydra/issues/715
---
 nixos/release-small.nix | 38 +++++++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/nixos/release-small.nix b/nixos/release-small.nix
index 74c16e990f35..7b86a91357ec 100644
--- a/nixos/release-small.nix
+++ b/nixos/release-small.nix
@@ -82,18 +82,42 @@ in rec {
       vim;
   };
 
-  tested = lib.hydraJob (pkgs.releaseTools.aggregate {
+  tested = pkgs.releaseTools.aggregate {
     name = "nixos-${nixos.channel.version}";
     meta = {
       description = "Release-critical builds for the NixOS channel";
       maintainers = [ lib.maintainers.eelco ];
     };
     constituents =
-      let all = x: map (system: x.${system}) supportedSystems; in
-      [ nixpkgs.tarball
-        (all nixpkgs.jdk)
-      ]
-      ++ lib.collect lib.isDerivation nixos;
-  });
+      [ "nixos.channel"
+        "nixos.dummy.x86_64-linux"
+        "nixos.iso_minimal.x86_64-linux"
+        "nixos.manual.x86_64-linux"
+        "nixos.tests.boot.biosCdrom.x86_64-linux"
+        "nixos.tests.containers-imperative.x86_64-linux"
+        "nixos.tests.containers-ip.x86_64-linux"
+        "nixos.tests.firewall.x86_64-linux"
+        "nixos.tests.installer.lvm.x86_64-linux"
+        "nixos.tests.installer.separateBoot.x86_64-linux"
+        "nixos.tests.installer.simple.x86_64-linux"
+        "nixos.tests.ipv6.x86_64-linux"
+        "nixos.tests.login.x86_64-linux"
+        "nixos.tests.misc.x86_64-linux"
+        "nixos.tests.nat.firewall-conntrack.x86_64-linux"
+        "nixos.tests.nat.firewall.x86_64-linux"
+        "nixos.tests.nat.standalone.x86_64-linux"
+        "nixos.tests.nfs3.simple.x86_64-linux"
+        "nixos.tests.openssh.x86_64-linux"
+        "nixos.tests.php-pcre.x86_64-linux"
+        "nixos.tests.predictable-interface-names.predictable.x86_64-linux"
+        "nixos.tests.predictable-interface-names.predictableNetworkd.x86_64-linux"
+        "nixos.tests.predictable-interface-names.unpredictable.x86_64-linux"
+        "nixos.tests.predictable-interface-names.unpredictableNetworkd.x86_64-linux"
+        "nixos.tests.proxy.x86_64-linux"
+        "nixos.tests.simple.x86_64-linux"
+        "nixpkgs.jdk.x86_64-linux"
+        "nixpkgs.tarball"
+      ];
+  };
 
 }

From c91aade77fd5b98e2bf0d7c920c07b1a8abb4b2d Mon Sep 17 00:00:00 2001
From: Sirio Balmelli <sirio.bm@gmail.com>
Date: Mon, 17 Feb 2020 16:48:11 +0100
Subject: [PATCH 0922/4636] mscgen: enable on darwin (#79996)

Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
---
 pkgs/tools/graphics/mscgen/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix
index 832a48baab72..613a906a7b4e 100644
--- a/pkgs/tools/graphics/mscgen/default.nix
+++ b/pkgs/tools/graphics/mscgen/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
       printing.
     '';
 
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

From 35bae4f749eb45dd0dcbc7994af15da76bec752d Mon Sep 17 00:00:00 2001
From: jakobrs <jakobrs100@gmail.com>
Date: Mon, 17 Feb 2020 16:50:21 +0100
Subject: [PATCH 0923/4636] electron: correct casing of MacOS (#80362)

---
 pkgs/development/tools/electron/3.x.nix     | 2 +-
 pkgs/development/tools/electron/generic.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/electron/3.x.nix b/pkgs/development/tools/electron/3.x.nix
index a902f279a49c..f66d1a57a047 100644
--- a/pkgs/development/tools/electron/3.x.nix
+++ b/pkgs/development/tools/electron/3.x.nix
@@ -69,7 +69,7 @@ let
       unzip $src
       mv Electron.app $out/Applications
       mkdir -p $out/bin
-      ln -s $out/Applications/Electron.app/Contents/MacOs/Electron $out/bin/electron
+      ln -s $out/Applications/Electron.app/Contents/MacOS/Electron $out/bin/electron
     '';
   };
 in
diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix
index b2ce076933dd..a06989ad2545 100644
--- a/pkgs/development/tools/electron/generic.nix
+++ b/pkgs/development/tools/electron/generic.nix
@@ -70,7 +70,7 @@ let
       unzip $src
       mv Electron.app $out/Applications
       mkdir -p $out/bin
-      ln -s $out/Applications/Electron.app/Contents/MacOs/Electron $out/bin/electron
+      ln -s $out/Applications/Electron.app/Contents/MacOS/Electron $out/bin/electron
     '';
   };
 in

From c9e5cca071223b8869ac12111131e27eb17ff95d Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Mon, 17 Feb 2020 16:54:13 +0100
Subject: [PATCH 0924/4636] riot-web: add config overrides for privacy

Preventing the app from phoning home by default.

GitHub: closes https://github.com/NixOS/nixpkgs/issues/80358
---
 .../instant-messengers/riot/riot-web.nix      | 19 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index 2156214db6b0..c31f0cc06cb9 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -1,9 +1,16 @@
-{ lib, stdenv, fetchurl, writeText, conf ? null }:
+{ lib, stdenv, fetchurl, writeText, jq, conf ? {} }:
 
 # Note for maintainers:
 # Versions of `riot-web` and `riot-desktop` should be kept in sync.
 
-stdenv.mkDerivation rec {
+let
+  noPhoningHome = {
+    disable_guests = true; # disable automatic guest account registration at matrix.org
+    piwik = false; # disable analytics
+  };
+  configOverrides = writeText "riot-config-overrides.json" (builtins.toJSON (noPhoningHome // conf));
+
+in stdenv.mkDerivation rec {
   pname = "riot-web";
   version = "1.5.8";
 
@@ -12,16 +19,12 @@ stdenv.mkDerivation rec {
     sha256 = "112zjlmxy2s8qcd227laf1lfvbbwwcipn51xb779hy2dci48kpkx";
   };
 
-  installPhase = let
-    configFile = if (conf != null)
-      then writeText "riot-config.json" conf
-      else "$out/config.sample.json";
-  in ''
+  installPhase = ''
     runHook preInstall
 
     mkdir -p $out/
     cp -R . $out/
-    ln -s ${configFile} $out/config.json
+    ${jq}/bin/jq -s '.[0] * .[1]' "config.sample.json" "${configOverrides}" > "$out/config.json"
 
     runHook postInstall
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1994c2eafec..2e5f1c38845f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2115,7 +2115,7 @@ in
   riot-desktop = callPackage ../applications/networking/instant-messengers/riot/riot-desktop.nix { };
 
   riot-web = callPackage ../applications/networking/instant-messengers/riot/riot-web.nix {
-    conf = config.riot-web.conf or null;
+    conf = config.riot-web.conf or {};
   };
 
   ripasso-cursive = callPackage ../tools/security/ripasso/cursive.nix {

From b2492bc444dfab0bf809018a7af3fb6d277f6c98 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 17 Feb 2020 16:00:58 +0000
Subject: [PATCH 0925/4636] rnnoise: 0.0.1 (2017-10-10) -> 2019-04-24

---
 pkgs/development/libraries/rnnoise/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/rnnoise/default.nix b/pkgs/development/libraries/rnnoise/default.nix
index fe6b75446b21..7a1f69e86c7d 100644
--- a/pkgs/development/libraries/rnnoise/default.nix
+++ b/pkgs/development/libraries/rnnoise/default.nix
@@ -1,21 +1,25 @@
 { stdenv, lib, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation (rec {
-  name = "rnnoise-${version}";
-  version = "0.0.1";
+  pname = "rnnoise";
+  version = "2019-04-24";
 
   src = fetchFromGitHub {
     owner = "xiph";
     repo = "rnnoise";
-    rev = "91ef401f4c3536c6de999ac609262691ec888c4c";
-    sha256 = "1h2ibg67gfcwnpvkq1rx0sngf9lk9j8pqsmsmmk5hclvrr2lp3yb";
+    rev = "9acc1e5a633e0961a5895a73204df24744f199b6";
+    sha256 = "17xip4z0skpzas7wrdyi87j46mbz9jncpj554m8654bqpkxis0pr";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
 
+  postInstall = ''
+    install -Dt $out/bin examples/.libs/rnnoise_demo
+  '';
+
   meta = with lib; {
     homepage = https://people.xiph.org/~jm/demo/rnnoise/;
-    description = "Recurrent neural network for audio noise reduction.";
+    description = "Recurrent neural network for audio noise reduction";
     license = licenses.bsd3;
     maintainers = [ maintainers.nh2 ];
     platforms = platforms.all;

From 06e7100bf9a818f3c184328728354c310abc346e Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 17 Feb 2020 17:06:23 +0100
Subject: [PATCH 0926/4636] ucs-fonts: generate pcf, otb and split output

---
 pkgs/data/fonts/ucs-fonts/default.nix | 43 +++++++++++++++++++--------
 pkgs/top-level/all-packages.nix       |  4 ++-
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix
index 7f808af18f24..d363f01309be 100644
--- a/pkgs/data/fonts/ucs-fonts/default.nix
+++ b/pkgs/data/fonts/ucs-fonts/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, mkfontdir, mkfontscale }:
+{ stdenv, fetchurl, bdftopcf
+, libfaketime, fonttosfnt, mkfontscale
+}:
 
 stdenv.mkDerivation {
   pname = "ucs-fonts";
@@ -21,25 +23,40 @@ stdenv.mkDerivation {
 
   sourceRoot = ".";
 
-  nativeBuildInputs = [ mkfontdir mkfontscale ];
+  nativeBuildInputs =
+    [ bdftopcf libfaketime fonttosfnt
+      mkfontscale
+    ];
 
-  phases = [ "unpackPhase" "installPhase" ];
+  buildPhase = ''
+    for i in *.bdf; do
+      name=$(basename "$i" .bdf)
 
-  installPhase = ''
-    mkdir -p $out/share/fonts
-    cp *.bdf $out/share/fonts
-    cd $out/share/fonts
-    mkfontdir
-    mkfontscale
+      # generate pcf fonts (for X11 applications)
+      bdftopcf -t "$i" | gzip -n -9 -c > "$name.pcf.gz"
+
+      # generate otb fonts (for GTK applications)
+      faketime -f "1970-01-01 00:00:01" \
+      fonttosfnt -v -o "$name.otb" "$i"
+    done
   '';
 
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "12fh3kbsib0baqwk6148fnzqrj9gs4vnl7yd5n9km72sic1z1xwk";
+  installPhase = ''
+    install -m 644 -D *.pcf.gz -t "$out/share/fonts/misc"
+    install -m 644 -D *.bdf    -t "$bdf/share/fonts/misc"
+    install -m 644 -D *.otb    -t "$otb/share/fonts/misc"
+
+    mkfontdir "$out/share/fonts/misc"
+    mkfontdir "$bdf/share/fonts/misc"
+    mkfontdir "$otb/share/fonts/misc"
+  '';
+
+  outputs = [ "out" "bdf" "otb" ];
 
   meta = with stdenv.lib; {
-    homepage = https://www.cl.cam.ac.uk/~mgk25/ucs-fonts.html;
+    homepage = "https://www.cl.cam.ac.uk/~mgk25/ucs-fonts.html";
     description = "Unicode bitmap fonts";
+    license = licenses.publicDomain;
     maintainers = [ maintainers.raskin ];
     platforms = platforms.all;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa7eba6a652e..75f20daefef5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17986,7 +17986,9 @@ in
 
   ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { };
 
-  ucs-fonts = callPackage ../data/fonts/ucs-fonts { };
+  ucs-fonts = callPackage ../data/fonts/ucs-fonts
+    { inherit (buildPackages.xorg) fonttosfnt mkfontscale; };
+
 
   ultimate-oldschool-pc-font-pack = callPackage ../data/fonts/ultimate-oldschool-pc-font-pack { };
 

From 2de3caf01109891cfc2645b0ad07ac36aedadd1e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 17 Feb 2020 17:14:30 +0100
Subject: [PATCH 0927/4636] nixos/release-combined.nix: List constituents of
 the 'tested' job by name

https://github.com/NixOS/hydra/issues/715
---
 nixos/release-combined.nix | 178 +++++++++++++++++--------------------
 1 file changed, 80 insertions(+), 98 deletions(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 41f8c3d9d52f..e47e64edb297 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -38,108 +38,90 @@ in rec {
     nixpkgs = nixpkgsSrc;
   })) [ "unstable" ];
 
-  tested = pkgs.lib.hydraJob (pkgs.releaseTools.aggregate {
+  tested = pkgs.releaseTools.aggregate {
     name = "nixos-${nixos.channel.version}";
     meta = {
       description = "Release-critical builds for the NixOS channel";
       maintainers = with pkgs.lib.maintainers; [ eelco fpletz ];
     };
-    constituents =
-      let
-        # Except for the given systems, return the system-specific constituent
-        except = systems: x: map (system: x.${system}) (pkgs.lib.subtractLists systems supportedSystems);
-        all = x: except [] x;
-      in [
-        nixos.channel
-        (all nixos.dummy)
-        (all nixos.manual)
-
-        nixos.iso_plasma5.x86_64-linux or []
-        nixos.iso_minimal.aarch64-linux or []
-        nixos.iso_minimal.i686-linux or []
-        nixos.iso_minimal.x86_64-linux or []
-        nixos.ova.x86_64-linux or []
-        nixos.sd_image.aarch64-linux or []
-
-        #(all nixos.tests.containers)
-        (all nixos.tests.containers-imperative)
-        (all nixos.tests.containers-ip)
-        nixos.tests.chromium.x86_64-linux or []
-        (all nixos.tests.firefox)
-        (all nixos.tests.firefox-esr)
-        (all nixos.tests.firewall)
-        (all nixos.tests.fontconfig-default-fonts)
-        (all nixos.tests.gnome3-xorg)
-        (all nixos.tests.gnome3)
-        (all nixos.tests.pantheon)
-        nixos.tests.installer.zfsroot.x86_64-linux or [] # ZFS is 64bit only
-        (except ["aarch64-linux"] nixos.tests.installer.lvm)
-        (except ["aarch64-linux"] nixos.tests.installer.luksroot)
-        (except ["aarch64-linux"] nixos.tests.installer.separateBoot)
-        (except ["aarch64-linux"] nixos.tests.installer.separateBootFat)
-        (except ["aarch64-linux"] nixos.tests.installer.simple)
-        (except ["aarch64-linux"] nixos.tests.installer.simpleLabels)
-        (except ["aarch64-linux"] nixos.tests.installer.simpleProvided)
-        (except ["aarch64-linux"] nixos.tests.installer.simpleUefiSystemdBoot)
-        (except ["aarch64-linux"] nixos.tests.installer.swraid)
-        (except ["aarch64-linux"] nixos.tests.installer.btrfsSimple)
-        (except ["aarch64-linux"] nixos.tests.installer.btrfsSubvols)
-        (except ["aarch64-linux"] nixos.tests.installer.btrfsSubvolDefault)
-        (except ["aarch64-linux"] nixos.tests.boot.biosCdrom)
-        #(except ["aarch64-linux"] nixos.tests.boot.biosUsb) # disabled due to issue #15690
-        (except ["aarch64-linux"] nixos.tests.boot.uefiCdrom)
-        (except ["aarch64-linux"] nixos.tests.boot.uefiUsb)
-        (all nixos.tests.boot-stage1)
-        (all nixos.tests.hibernate)
-        nixos.tests.docker.x86_64-linux or []
-        (all nixos.tests.ecryptfs)
-        (all nixos.tests.env)
-        (all nixos.tests.ipv6)
-        (all nixos.tests.i3wm)
-        (except ["aarch64-linux"] nixos.tests.keymap.azerty)
-        (except ["aarch64-linux"] nixos.tests.keymap.colemak)
-        (except ["aarch64-linux"] nixos.tests.keymap.dvorak)
-        (except ["aarch64-linux"] nixos.tests.keymap.dvp)
-        (except ["aarch64-linux"] nixos.tests.keymap.neo)
-        (except ["aarch64-linux"] nixos.tests.keymap.qwertz)
-        (all nixos.tests.plasma5)
-        (all nixos.tests.lightdm)
-        (all nixos.tests.login)
-        (all nixos.tests.misc)
-        (all nixos.tests.mutableUsers)
-        (all nixos.tests.nat.firewall)
-        (all nixos.tests.nat.firewall-conntrack)
-        (all nixos.tests.nat.standalone)
-        (all nixos.tests.networking.scripted.loopback)
-        (all nixos.tests.networking.scripted.static)
-        (all nixos.tests.networking.scripted.dhcpSimple)
-        (all nixos.tests.networking.scripted.dhcpOneIf)
-        (all nixos.tests.networking.scripted.bond)
-        (all nixos.tests.networking.scripted.bridge)
-        (all nixos.tests.networking.scripted.macvlan)
-        (all nixos.tests.networking.scripted.sit)
-        (all nixos.tests.networking.scripted.vlan)
-        (all nixos.tests.nfs3.simple)
-        (all nixos.tests.nfs4.simple)
-        (all nixos.tests.openssh)
-        (all nixos.tests.php-pcre)
-        (all nixos.tests.predictable-interface-names.predictable)
-        (all nixos.tests.predictable-interface-names.unpredictable)
-        (all nixos.tests.predictable-interface-names.predictableNetworkd)
-        (all nixos.tests.predictable-interface-names.unpredictableNetworkd)
-        (all nixos.tests.printing)
-        (all nixos.tests.proxy)
-        (all nixos.tests.sddm.default)
-        (all nixos.tests.simple)
-        (all nixos.tests.switchTest)
-        (all nixos.tests.udisks2)
-        (all nixos.tests.xfce)
-
-        nixpkgs.tarball
-        (all allSupportedNixpkgs.emacs)
-        # The currently available aarch64 JDK is unfree
-        (except ["aarch64-linux"] allSupportedNixpkgs.jdk)
-      ];
-  });
+    constituents = [
+      "nixos.channel"
+      "nixos.dummy.x86_64-linux"
+      "nixos.iso_minimal.aarch64-linux"
+      "nixos.iso_minimal.i686-linux"
+      "nixos.iso_minimal.x86_64-linux"
+      "nixos.iso_plasma5.x86_64-linux"
+      "nixos.manual.x86_64-linux"
+      "nixos.ova.x86_64-linux"
+      "nixos.sd_image.aarch64-linux"
+      "nixos.tests.boot.biosCdrom.x86_64-linux"
+      "nixos.tests.boot-stage1.x86_64-linux"
+      "nixos.tests.boot.uefiCdrom.x86_64-linux"
+      "nixos.tests.boot.uefiUsb.x86_64-linux"
+      "nixos.tests.chromium.x86_64-linux"
+      "nixos.tests.containers-imperative.x86_64-linux"
+      "nixos.tests.containers-ip.x86_64-linux"
+      "nixos.tests.docker.x86_64-linux"
+      "nixos.tests.ecryptfs.x86_64-linux"
+      "nixos.tests.env.x86_64-linux"
+      "nixos.tests.firefox.x86_64-linux"
+      "nixos.tests.firewall.x86_64-linux"
+      "nixos.tests.fontconfig-default-fonts.x86_64-linux"
+      "nixos.tests.gnome3.x86_64-linux"
+      "nixos.tests.gnome3-xorg.x86_64-linux"
+      "nixos.tests.hibernate.x86_64-linux"
+      "nixos.tests.i3wm.x86_64-linux"
+      "nixos.tests.installer.btrfsSimple.x86_64-linux"
+      "nixos.tests.installer.btrfsSubvolDefault.x86_64-linux"
+      "nixos.tests.installer.btrfsSubvols.x86_64-linux"
+      "nixos.tests.installer.luksroot.x86_64-linux"
+      "nixos.tests.installer.lvm.x86_64-linux"
+      "nixos.tests.installer.separateBootFat.x86_64-linux"
+      "nixos.tests.installer.separateBoot.x86_64-linux"
+      "nixos.tests.installer.simpleLabels.x86_64-linux"
+      "nixos.tests.installer.simpleProvided.x86_64-linux"
+      "nixos.tests.installer.simpleUefiSystemdBoot.x86_64-linux"
+      "nixos.tests.installer.simple.x86_64-linux"
+      "nixos.tests.installer.swraid.x86_64-linux"
+      "nixos.tests.ipv6.x86_64-linux"
+      "nixos.tests.lightdm.x86_64-linux"
+      "nixos.tests.login.x86_64-linux"
+      "nixos.tests.misc.x86_64-linux"
+      "nixos.tests.mutableUsers.x86_64-linux"
+      "nixos.tests.nat.firewall-conntrack.x86_64-linux"
+      "nixos.tests.nat.firewall.x86_64-linux"
+      "nixos.tests.nat.standalone.x86_64-linux"
+      "nixos.tests.networking.scripted.bond.x86_64-linux"
+      "nixos.tests.networking.scripted.bridge.x86_64-linux"
+      "nixos.tests.networking.scripted.dhcpOneIf.x86_64-linux"
+      "nixos.tests.networking.scripted.dhcpSimple.x86_64-linux"
+      "nixos.tests.networking.scripted.loopback.x86_64-linux"
+      "nixos.tests.networking.scripted.macvlan.x86_64-linux"
+      "nixos.tests.networking.scripted.sit.x86_64-linux"
+      "nixos.tests.networking.scripted.static.x86_64-linux"
+      "nixos.tests.networking.scripted.vlan.x86_64-linux"
+      "nixos.tests.nfs3.simple.x86_64-linux"
+      "nixos.tests.nfs4.simple.x86_64-linux"
+      "nixos.tests.openssh.x86_64-linux"
+      "nixos.tests.pantheon.x86_64-linux"
+      "nixos.tests.php-pcre.x86_64-linux"
+      "nixos.tests.plasma5.x86_64-linux"
+      "nixos.tests.predictable-interface-names.predictableNetworkd.x86_64-linux"
+      "nixos.tests.predictable-interface-names.predictable.x86_64-linux"
+      "nixos.tests.predictable-interface-names.unpredictableNetworkd.x86_64-linux"
+      "nixos.tests.predictable-interface-names.unpredictable.x86_64-linux"
+      "nixos.tests.printing.x86_64-linux"
+      "nixos.tests.proxy.x86_64-linux"
+      "nixos.tests.sddm.default.x86_64-linux"
+      "nixos.tests.simple.x86_64-linux"
+      "nixos.tests.switchTest.x86_64-linux"
+      "nixos.tests.udisks2.x86_64-linux"
+      "nixos.tests.xfce.x86_64-linux"
+      "nixos.tests.zfs.installer.i686-linux"
+      "nixpkgs.emacs.x86_64-linux"
+      "nixpkgs.jdk.x86_64-linux"
+      "nixpkgs.tarball"
+    ];
+  };
 
 }

From eb401313106aec6bb29eff5e80e919fb3486e133 Mon Sep 17 00:00:00 2001
From: OmnipotentEntity <OmnipotentEntity@gmail.com>
Date: Mon, 17 Feb 2020 11:31:21 -0500
Subject: [PATCH 0928/4636] geant4: 10.6.0 -> 10.6.1 (#80365)

---
 .../libraries/physics/geant4/datasets.nix         |  4 ++--
 .../libraries/physics/geant4/default.nix          | 15 +++------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/physics/geant4/datasets.nix b/pkgs/development/libraries/physics/geant4/datasets.nix
index 5e783b0e9501..df44fa275f5d 100644
--- a/pkgs/development/libraries/physics/geant4/datasets.nix
+++ b/pkgs/development/libraries/physics/geant4/datasets.nix
@@ -42,8 +42,8 @@ in
 
     {
       name = "G4EMLOW";
-      version = "7.9";
-      sha256 = "1zrsvk2ahlwss6mgjrma6d2ii49vlzcd5r3ccw94c7m9rnk9mgsa";
+      version = "7.9.1";
+      sha256 = "1jrw0izw732bywq1k1srs3x2z0m3y2h377kcvwbwcr0wa1p10342";
       envvar = "LE";
     }
 
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 97e8cf9c7c43..1897071b1259 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -36,23 +36,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "10.6.0";
+  version = "10.6.1";
   pname = "geant4";
 
   src = fetchurl{
-    url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.06.tar.gz";
-    sha256 = "169ikv2sssfbqml7bs146dj035xifxm9b12r4rzmgpvswfhca90l";
+    url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.06.p01.tar.gz";
+    sha256 = "0ssxg7dd7vxljb3fdyb0llg7gsxack21qjfsb3n23k107a19yibk";
   };
 
-  # This patch fixes crash when set -u is enabled
-  patches = [
-    (fetchpatch {
-      name = "bash-variable-fix.patch";
-      url = "https://bugzilla-geant4.kek.jp/attachment.cgi?id=606&action=diff&collapsed=&headers=1&format=raw";
-      sha256 = "1bg9wg174fbqbjsjm1gz9584a7rq9p1szxr2fq9yfvqaf78289k6";
-    })
-  ];
-
   cmakeFlags = [
     "-DGEANT4_INSTALL_DATA=OFF"
     "-DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}"

From eaa47284113cda19a037b7fcbaa892ddb596b813 Mon Sep 17 00:00:00 2001
From: Michael Lingelbach <m.j.lbach@gmail.com>
Date: Mon, 17 Feb 2020 09:34:07 -0800
Subject: [PATCH 0929/4636] luaPackages.luv: 1.30.0-0 -> 1.34.1-1

---
 pkgs/development/lua-modules/generated-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 58af59c1971e..2a4146577ff0 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -1326,11 +1326,11 @@ luuid = buildLuarocksPackage {
 };
 luv = buildLuarocksPackage {
   pname = "luv";
-  version = "1.30.0-0";
+  version = "1.34.1-1";
 
   src = fetchurl {
-    url    = https://luarocks.org/luv-1.30.0-0.src.rock;
-    sha256 = "1z5sdq9ld4sm5pws9qxpk9cadv9i7ycwad1zwsa57pj67gly11vi";
+    url    = https://luarocks.org/luv-1.34.1-1.src.rock;
+    sha256 = "044cyp25xn35nj5qp1hx04lfkzrpa6adhqjshq2g7wvbga77p1q0";
   };
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];

From 1462612de1b9e102b8ce60eb3c99df693171c18e Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Mon, 17 Feb 2020 20:36:48 +0300
Subject: [PATCH 0930/4636] sourcehut: don't refer to rambox

---
 .../version-management/sourcehut/default.nix  |  2 +-
 .../sourcehut/fetchNodeModules.nix            | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/version-management/sourcehut/fetchNodeModules.nix

diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix
index 3fa5399c2b56..f6de0036afe0 100644
--- a/pkgs/applications/version-management/sourcehut/default.nix
+++ b/pkgs/applications/version-management/sourcehut/default.nix
@@ -6,7 +6,7 @@
 # https://github.com/NixOS/nixpkgs/pull/54425#discussion_r250688781
 
 let
-  fetchNodeModules = callPackage ../../networking/instant-messengers/rambox/fetchNodeModules.nix { };
+  fetchNodeModules = callPackage ./fetchNodeModules.nix { };
 
   python = python37.override {
     packageOverrides = self: super: {
diff --git a/pkgs/applications/version-management/sourcehut/fetchNodeModules.nix b/pkgs/applications/version-management/sourcehut/fetchNodeModules.nix
new file mode 100644
index 000000000000..047890a932ca
--- /dev/null
+++ b/pkgs/applications/version-management/sourcehut/fetchNodeModules.nix
@@ -0,0 +1,26 @@
+{ stdenv, jq }: { src, nodejs, sha256 }:
+
+# Only npm >= 5.4.2 is deterministic, see:
+# https://github.com/npm/npm/issues/17979#issuecomment-332701215
+assert stdenv.lib.versionAtLeast nodejs.version "8.9.0";
+
+stdenv.mkDerivation {
+  name = "node_modules";
+
+  outputHashAlgo = "sha256";
+  outputHash = sha256;
+  outputHashMode = "recursive";
+
+  nativeBuildInputs = [ jq nodejs ];
+
+  buildCommand = ''
+    cp -r ${src}/* .
+    HOME=. npm install --force --ignore-scripts --only=production
+    for f in $(find node_modules -name package.json); do
+      # https://github.com/npm/npm/issues/10393
+      jq -S 'delpaths(keys | map(select(startswith("_")) | [.]))' $f > $f.tmp
+      mv $f.tmp $f
+    done
+    mv node_modules $out
+  '';
+}

From 11a9dfeb96dd84a7fbd44498b1950890d51faa5b Mon Sep 17 00:00:00 2001
From: Alex Gryzlov <skyrodent@gmail.com>
Date: Mon, 17 Feb 2020 20:08:27 +0100
Subject: [PATCH 0931/4636] idrisPackages.tparsec: 2019-09-19 -> 2020-02-11

---
 pkgs/development/idris-modules/tparsec.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix
index 599ca72c615e..67020898ff3f 100644
--- a/pkgs/development/idris-modules/tparsec.nix
+++ b/pkgs/development/idris-modules/tparsec.nix
@@ -5,7 +5,7 @@
 }:
 build-idris-package  {
   name = "tparsec";
-  version = "2019-09-19";
+  version = "2020-02-11";
 
   ipkgName = "TParsec";
   
@@ -14,8 +14,8 @@ build-idris-package  {
   src = fetchFromGitHub {
     owner = "gallais";
     repo = "idris-tparsec";
-    rev = "cbaea6ec7e5b62536666329940f3ffb5b8b59036";
-    sha256 = "0bzdv90a83irn7ca268acl19mjg9vxjmc4saa4naj4hdmg7srb2v";
+    rev = "943c64dfcb4e1582696f68312fad88145dc3a8e4";
+    sha256 = "0pyhkafhx2pwim91ada6qrgacvahl9bpv5m486y8fph4qzf4z6mx";
   };
 
   meta = {

From a2f3ec7a60dfa8cd7e34c78617ac11cabb3c0b22 Mon Sep 17 00:00:00 2001
From: Kim Lindberger <kim.lindberger@gmail.com>
Date: Mon, 17 Feb 2020 20:41:43 +0100
Subject: [PATCH 0932/4636] synergy: Build application bundle on Darwin + other
 fixes (#80354)

Includes the following fixes for Darwin:
- Build an application bundle
- Don't install the .desktop file and icons
- Get rid of unused cmake variables
- Don't list avahi as a dependency, since it's not used
---
 pkgs/applications/misc/synergy/default.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 69c2e37e3520..645ed7433b32 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, fetchFromGitHub, cmake, avahi-compat
+{ stdenv, lib, fetchFromGitHub, cmake, openssl
 , ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver
-, xlibsWrapper, libX11, libXi, libXtst, libXrandr, xinput, openssl
+, xlibsWrapper, libX11, libXi, libXtst, libXrandr, xinput, avahi-compat
 , withGUI ? true, wrapQtAppsHook }:
 
 stdenv.mkDerivation rec {
@@ -35,20 +35,19 @@ stdenv.mkDerivation rec {
     chmod -R +w ext/
   '';
 
-  cmakeFlags = lib.optionals stdenv.isDarwin [
-    "-DOSX_TARGET_MAJOR=10"
-    "-DOSX_TARGET_MINOR=7"
-  ] ++ lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF";
+  cmakeFlags = lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF";
 
   nativeBuildInputs = [ cmake ] ++ lib.optional withGUI wrapQtAppsHook;
 
   dontWrapQtApps = true;
 
   buildInputs = [
-    openssl avahi-compat
+    openssl
   ] ++ lib.optionals stdenv.isDarwin [
     ApplicationServices Carbon Cocoa CoreServices ScreenSaver
-  ] ++ lib.optionals stdenv.isLinux [ xlibsWrapper libX11 libXi libXtst libXrandr xinput ];
+  ] ++ lib.optionals stdenv.isLinux [
+    xlibsWrapper libX11 libXi libXtst libXrandr xinput avahi-compat
+  ];
 
   installPhase = ''
     mkdir -p $out/bin
@@ -56,10 +55,15 @@ stdenv.mkDerivation rec {
   '' + lib.optionalString withGUI ''
     cp bin/synergy $out/bin/
     wrapQtApp $out/bin/synergy --prefix PATH : ${lib.makeBinPath [ openssl ]}
+  '' + lib.optionalString stdenv.isLinux ''
     mkdir -p $out/share/icons/hicolor/scalable/apps
     cp ../res/synergy.svg $out/share/icons/hicolor/scalable/apps/
     mkdir -p $out/share/applications
     substitute ../res/synergy.desktop $out/share/applications/synergy.desktop --replace /usr/bin $out/bin
+  '' + lib.optionalString stdenv.isDarwin ''
+    mkdir -p $out/Applications/
+    mv bundle/Synergy.app $out/Applications/
+    ln -s $out/bin $out/Applications/Synergy.app/Contents/MacOS
   '';
 
   doCheck = true;

From 9b4424cbb74a42dd3ff879302f6f8a4489b6fcf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 17 Feb 2020 21:04:32 +0100
Subject: [PATCH 0933/4636] efivar: fixup build on i686

I don't think it really needs LTO.
---
 pkgs/tools/system/efivar/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix
index f02923de349f..71389af7423e 100644
--- a/pkgs/tools/system/efivar/default.nix
+++ b/pkgs/tools/system/efivar/default.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
       sha256 = "0lc38npydp069nlcga25wzzm204ww9l6mpjfn6wmhdfhn0pgjwky";
     })
   ];
+  # We have no LTO here since commit 22284b07.
+  postPatch = if stdenv.isi686 then "sed '/^OPTIMIZE /s/-flto//' -i Make.defaults" else null;
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ popt ];

From 9425bab10a809d5f412ff68242958b687301a84a Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Mon, 17 Feb 2020 22:08:35 +0100
Subject: [PATCH 0934/4636] libreoffice-still: 6.2.6.2 -> 6.3.5.2,
 libreoffice-fresh: 6.3.5.2 -> 6.4.1.1

---
 .../office/libreoffice/default.nix            |  10 +-
 .../office/libreoffice/src-fresh/download.nix |  70 +++++----
 .../office/libreoffice/src-fresh/override.nix |  12 +-
 .../office/libreoffice/src-fresh/primary.nix  |  12 +-
 .../office/libreoffice/src-still/download.nix | 144 +++++++++---------
 .../office/libreoffice/src-still/override.nix |  24 +--
 .../office/libreoffice/src-still/primary.nix  |  11 +-
 7 files changed, 147 insertions(+), 136 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 12ffb9ce0485..a7d8f4c7d40f 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -57,7 +57,8 @@ in (stdenv.mkDerivation rec {
 
   # For some reason librdf_redland sometimes refers to rasqal.h instead
   # of rasqal/rasqal.h
-  NIX_CFLAGS_COMPILE = "-I${librdf_rasqal}/include/rasqal";
+  NIX_CFLAGS_COMPILE = "-I${librdf_rasqal}/include/rasqal"
+    + stdenv.lib.optionalString stdenv.isx86_64 " -mno-fma";
 
   patches = [
     ./xdg-open-brief.patch
@@ -222,7 +223,6 @@ in (stdenv.mkDerivation rec {
       sed -e '/CPPUNIT_TEST(testEmbeddedDataSource);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx'
       sed -e '/CPPUNIT_TEST(testTdf96479);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx'
       sed -e '/CPPUNIT_TEST(testInconsistentBookmark);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx'
-      sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/extras/inc/swmodeltestbase.hxx'
       sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlexport9.cxx"
       sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlencryption.cxx"
       sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/odfexport/odfexport.cxx"
@@ -283,7 +283,6 @@ in (stdenv.mkDerivation rec {
     "--enable-python=system"
     "--enable-dbus"
     "--enable-release-build"
-    (lib.enableFeature kdeIntegration "kde4")
     "--enable-epm"
     "--with-jdk-home=${jdk.home}"
     "--with-ant-home=${ant}/lib/ant"
@@ -297,8 +296,6 @@ in (stdenv.mkDerivation rec {
     "--with-system-openldap"
     "--with-system-coinmp"
 
-    "--with-alloc=system"
-
     # Without these, configure does not finish
     "--without-junit"
 
@@ -336,6 +333,7 @@ in (stdenv.mkDerivation rec {
     "--without-system-mdds"
     # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f
     "--without-system-orcus"
+    "--without-system-qrcodegen"
     "--without-system-xmlsec"
   ];
 
@@ -377,4 +375,4 @@ in (stdenv.mkDerivation rec {
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
   };
-}).overrideAttrs ((importVariant "override.nix") args)
+}).overrideAttrs ((importVariant "override.nix") (args // { inherit kdeIntegration; }))
diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix
index 78482326be23..bc329e5a8f89 100644
--- a/pkgs/applications/office/libreoffice/src-fresh/download.nix
+++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix
@@ -336,11 +336,11 @@
     md5name = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36-graphite2-minimal-1.3.13.tgz";
   }
   {
-    name = "harfbuzz-2.3.1.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/harfbuzz-2.3.1.tar.bz2";
-    sha256 = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468";
+    name = "harfbuzz-2.6.0.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/harfbuzz-2.6.0.tar.xz";
+    sha256 = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966";
     md5 = "";
-    md5name = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468-harfbuzz-2.3.1.tar.bz2";
+    md5name = "9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966-harfbuzz-2.6.0.tar.xz";
   }
   {
     name = "hsqldb_1_8_0.zip";
@@ -364,18 +364,18 @@
     md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz";
   }
   {
-    name = "icu4c-63_1-src.tgz";
-    url = "http://dev-www.libreoffice.org/src/icu4c-63_1-src.tgz";
-    sha256 = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d";
+    name = "icu4c-65_1-src.tgz";
+    url = "http://dev-www.libreoffice.org/src/icu4c-65_1-src.tgz";
+    sha256 = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948";
     md5 = "";
-    md5name = "05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d-icu4c-63_1-src.tgz";
+    md5name = "53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948-icu4c-65_1-src.tgz";
   }
   {
-    name = "icu4c-63_1-data.zip";
-    url = "http://dev-www.libreoffice.org/src/icu4c-63_1-data.zip";
-    sha256 = "9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c";
+    name = "icu4c-65_1-data.zip";
+    url = "http://dev-www.libreoffice.org/src/icu4c-65_1-data.zip";
+    sha256 = "06359a7c4ad125ba11d3ac30617cd4b932f1214f611db96573032726574896b6";
     md5 = "";
-    md5name = "9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c-icu4c-63_1-data.zip";
+    md5name = "06359a7c4ad125ba11d3ac30617cd4b932f1214f611db96573032726574896b6-icu4c-65_1-data.zip";
   }
   {
     name = "flow-engine-0.9.4.zip";
@@ -510,6 +510,13 @@
     md5 = "";
     md5name = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8-libexttextcat-3.4.5.tar.xz";
   }
+  {
+    name = "libffi-3.3.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/libffi-3.3.tar.gz";
+    sha256 = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056";
+    md5 = "";
+    md5name = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056-libffi-3.3.tar.gz";
+  }
   {
     name = "libgpg-error-1.27.tar.bz2";
     url = "http://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2";
@@ -581,11 +588,11 @@
     md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz";
   }
   {
-    name = "mdds-1.4.3.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/mdds-1.4.3.tar.bz2";
-    sha256 = "25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81";
+    name = "mdds-1.5.0.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/mdds-1.5.0.tar.bz2";
+    sha256 = "144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d";
     md5 = "";
-    md5name = "25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81-mdds-1.4.3.tar.bz2";
+    md5name = "144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d-mdds-1.5.0.tar.bz2";
   }
   {
     name = "mDNSResponder-878.200.35.tar.gz";
@@ -665,11 +672,11 @@
     md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz";
   }
   {
-    name = "liborcus-0.14.1.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/liborcus-0.14.1.tar.gz";
-    sha256 = "3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f";
+    name = "liborcus-0.15.3.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/liborcus-0.15.3.tar.gz";
+    sha256 = "0dd26f3f2e611c51df9ee02d6dbf08887989eaa417b73f6877cd0d94df795fc2";
     md5 = "";
-    md5name = "3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f-liborcus-0.14.1.tar.gz";
+    md5name = "0dd26f3f2e611c51df9ee02d6dbf08887989eaa417b73f6877cd0d94df795fc2-liborcus-0.15.3.tar.gz";
   }
   {
     name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
@@ -686,11 +693,11 @@
     md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz";
   }
   {
-    name = "pdfium-3794.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/pdfium-3794.tar.bz2";
-    sha256 = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4";
+    name = "pdfium-3963.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/pdfium-3963.tar.bz2";
+    sha256 = "80d4d6bd8faec226936fcde5521c6e92c0c645126ac3ae72dd2c160ca1749895";
     md5 = "";
-    md5name = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4-pdfium-3794.tar.bz2";
+    md5name = "80d4d6bd8faec226936fcde5521c6e92c0c645126ac3ae72dd2c160ca1749895-pdfium-3963.tar.bz2";
   }
   {
     name = "pixman-0.34.0.tar.gz";
@@ -721,11 +728,18 @@
     md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2";
   }
   {
-    name = "Python-3.5.9.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/Python-3.5.9.tar.xz";
-    sha256 = "c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049";
+    name = "Python-3.7.6.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/Python-3.7.6.tar.xz";
+    sha256 = "55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f";
     md5 = "";
-    md5name = "c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049-Python-3.5.9.tar.xz";
+    md5name = "55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f-Python-3.7.6.tar.xz";
+  }
+  {
+    name = "QR-Code-generator-1.4.0.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz";
+    sha256 = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a";
+    md5 = "";
+    md5name = "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a-QR-Code-generator-1.4.0.tar.gz";
   }
   {
     name = "libqxp-0.0.2.tar.xz";
diff --git a/pkgs/applications/office/libreoffice/src-fresh/override.nix b/pkgs/applications/office/libreoffice/src-fresh/override.nix
index 464965121d97..60e08735d2e6 100644
--- a/pkgs/applications/office/libreoffice/src-fresh/override.nix
+++ b/pkgs/applications/office/libreoffice/src-fresh/override.nix
@@ -1,4 +1,10 @@
-{ stdenv, ... }:
-attrs: {
-  NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE + stdenv.lib.optionalString stdenv.isx86_64 " -mno-fma";
+{ stdenv, kdeIntegration, ... }:
+attrs:
+{
+  postConfigure = attrs.postConfigure + ''
+    sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx'
+  '';
+  configureFlags = attrs.configureFlags ++ [
+    (stdenv.lib.enableFeature kdeIntegration "kf5")
+  ];
 }
diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix
index d3da7d09b704..ec7f9e52bbba 100644
--- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix
+++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix
@@ -7,9 +7,9 @@ rec {
   };
 
   major = "6";
-  minor = "3";
-  patch = "5";
-  tweak = "2";
+  minor = "4";
+  patch = "1";
+  tweak = "1";
 
   subdir = "${major}.${minor}.${patch}";
 
@@ -17,19 +17,19 @@ rec {
 
   src = fetchurl {
     url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "0jnayv1i0iq1gpf3q3z9nfq6jid77d0c76675lkqb3gi07f63nzz";
+    sha256 = "03fqpkilz4yi35l447hb9r8gjwj23l61bpdkwg21jm8blm8kkvyj";
   };
 
   # FIXME rename
   translations = fetchSrc {
     name = "translations";
-    sha256 = "01g09bbn1ixrsfj4l0x6x8p06dz9hnlrhnr3f3xb42drmi9ipvjv";
+    sha256 = "0a7arjlxxy7hjm1brxwd124bf1gkbl92bgygi3sbbhbsv07pjdcr";
   };
 
   # TODO: dictionaries
 
   help = fetchSrc {
     name = "help";
-    sha256 = "1p38wlclv6cbjpkkq7n2mjpxy84pxi4vxc9s5kjp4dm63zzxafd6";
+    sha256 = "1hfllrdyxrg5mgqry3dcrhjbdrd0d27k5mvv4sfj7nwjlmjh8rqq";
   };
 }
diff --git a/pkgs/applications/office/libreoffice/src-still/download.nix b/pkgs/applications/office/libreoffice/src-still/download.nix
index b5a721b5679b..78482326be23 100644
--- a/pkgs/applications/office/libreoffice/src-still/download.nix
+++ b/pkgs/applications/office/libreoffice/src-still/download.nix
@@ -1,10 +1,10 @@
 [
   {
-    name = "libabw-0.1.2.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz";
-    sha256 = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485";
+    name = "libabw-0.1.3.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz";
+    sha256 = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed";
     md5 = "";
-    md5name = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485-libabw-0.1.2.tar.xz";
+    md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz";
   }
   {
     name = "commons-logging-1.2-src.tar.gz";
@@ -28,11 +28,11 @@
     md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz";
   }
   {
-    name = "boost_1_66_0.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/boost_1_66_0.tar.bz2";
-    sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9";
+    name = "boost_1_69_0.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/boost_1_69_0.tar.bz2";
+    sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406";
     md5 = "";
-    md5name = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9-boost_1_66_0.tar.bz2";
+    md5name = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406-boost_1_69_0.tar.bz2";
   }
   {
     name = "breakpad.zip";
@@ -147,11 +147,11 @@
     md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz";
   }
   {
-    name = "expat-2.2.5.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/expat-2.2.5.tar.bz2";
-    sha256 = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6";
+    name = "expat-2.2.8.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2";
+    sha256 = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102";
     md5 = "";
-    md5name = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6-expat-2.2.5.tar.bz2";
+    md5name = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102-expat-2.2.8.tar.bz2";
   }
   {
     name = "Firebird-3.0.0.32483-0.tar.bz2";
@@ -231,11 +231,11 @@
     md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz";
   }
   {
-    name = "source-serif-font-2.007R.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/source-serif-font-2.007R.tar.gz";
-    sha256 = "10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb";
+    name = "source-serif-pro-3.000R.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz";
+    sha256 = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3";
     md5 = "";
-    md5name = "10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb-source-serif-font-2.007R.tar.gz";
+    md5name = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3-source-serif-pro-3.000R.tar.gz";
   }
   {
     name = "EmojiOneColor-SVGinOT-1.3.tar.gz";
@@ -308,11 +308,11 @@
     md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz";
   }
   {
-    name = "freetype-2.8.1.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/freetype-2.8.1.tar.bz2";
-    sha256 = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78";
+    name = "freetype-2.9.1.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2";
+    sha256 = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d";
     md5 = "";
-    md5name = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78-freetype-2.8.1.tar.bz2";
+    md5name = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d-freetype-2.9.1.tar.bz2";
   }
   {
     name = "glm-0.9.4.6-libreoffice.zip";
@@ -329,18 +329,18 @@
     md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2";
   }
   {
-    name = "graphite2-minimal-1.3.10.tgz";
-    url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.10.tgz";
-    sha256 = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9";
+    name = "graphite2-minimal-1.3.13.tgz";
+    url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.13.tgz";
+    sha256 = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36";
     md5 = "";
-    md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz";
+    md5name = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36-graphite2-minimal-1.3.13.tgz";
   }
   {
-    name = "harfbuzz-1.8.4.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/harfbuzz-1.8.4.tar.bz2";
-    sha256 = "3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd";
+    name = "harfbuzz-2.3.1.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/harfbuzz-2.3.1.tar.bz2";
+    sha256 = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468";
     md5 = "";
-    md5name = "3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd-harfbuzz-1.8.4.tar.bz2";
+    md5name = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468-harfbuzz-2.3.1.tar.bz2";
   }
   {
     name = "hsqldb_1_8_0.zip";
@@ -462,11 +462,11 @@
     md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz";
   }
   {
-    name = "language-subtag-registry-2019-04-03.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-04-03.tar.bz2";
-    sha256 = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d";
+    name = "language-subtag-registry-2019-09-16.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2019-09-16.tar.bz2";
+    sha256 = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a";
     md5 = "";
-    md5name = "a1d7fb901764bb8f251d4f686cdf565764f9987d0fb5d9315d54a7366a84822d-language-subtag-registry-2019-04-03.tar.bz2";
+    md5name = "07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a-language-subtag-registry-2019-09-16.tar.bz2";
   }
   {
     name = "JLanguageTool-1.7.0.tar.bz2";
@@ -539,25 +539,25 @@
     md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip";
   }
   {
-    name = "xmlsec1-1.2.27.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.27.tar.gz";
-    sha256 = "97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6";
+    name = "xmlsec1-1.2.28.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.28.tar.gz";
+    sha256 = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4";
     md5 = "";
-    md5name = "97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6-xmlsec1-1.2.27.tar.gz";
+    md5name = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4-xmlsec1-1.2.28.tar.gz";
   }
   {
-    name = "libxml2-2.9.9.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/libxml2-2.9.9.tar.gz";
-    sha256 = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871";
+    name = "libxml2-2.9.10.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz";
+    sha256 = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f";
     md5 = "";
-    md5name = "94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871-libxml2-2.9.9.tar.gz";
+    md5name = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f-libxml2-2.9.10.tar.gz";
   }
   {
-    name = "libxslt-1.1.33.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/libxslt-1.1.33.tar.gz";
-    sha256 = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8";
+    name = "libxslt-1.1.34.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz";
+    sha256 = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f";
     md5 = "";
-    md5name = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8-libxslt-1.1.33.tar.gz";
+    md5name = "98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f-libxslt-1.1.34.tar.gz";
   }
   {
     name = "lp_solve_5.5.tar.gz";
@@ -602,11 +602,11 @@
     md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz";
   }
   {
-    name = "libmwaw-0.3.14.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.14.tar.xz";
-    sha256 = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9";
+    name = "libmwaw-0.3.15.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.15.tar.xz";
+    sha256 = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1";
     md5 = "";
-    md5name = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9-libmwaw-0.3.14.tar.xz";
+    md5name = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1-libmwaw-0.3.15.tar.xz";
   }
   {
     name = "mythes-1.2.4.tar.gz";
@@ -623,11 +623,11 @@
     md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz";
   }
   {
-    name = "nss-3.45-with-nspr-4.21.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/nss-3.45-with-nspr-4.21.tar.gz";
-    sha256 = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1";
+    name = "nss-3.47.1-with-nspr-4.23.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/nss-3.47.1-with-nspr-4.23.tar.gz";
+    sha256 = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64";
     md5 = "";
-    md5name = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1-nss-3.45-with-nspr-4.21.tar.gz";
+    md5name = "07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64-nss-3.47.1-with-nspr-4.23.tar.gz";
   }
   {
     name = "libodfgen-0.1.6.tar.bz2";
@@ -658,11 +658,11 @@
     md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz";
   }
   {
-    name = "openssl-1.0.2r.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/openssl-1.0.2r.tar.gz";
-    sha256 = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6";
+    name = "openssl-1.0.2t.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz";
+    sha256 = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc";
     md5 = "";
-    md5name = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6-openssl-1.0.2r.tar.gz";
+    md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz";
   }
   {
     name = "liborcus-0.14.1.tar.gz";
@@ -686,11 +686,11 @@
     md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz";
   }
   {
-    name = "pdfium-3550.tar.bz2";
-    url = "http://dev-www.libreoffice.org/src/pdfium-3550.tar.bz2";
-    sha256 = "572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679";
+    name = "pdfium-3794.tar.bz2";
+    url = "http://dev-www.libreoffice.org/src/pdfium-3794.tar.bz2";
+    sha256 = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4";
     md5 = "";
-    md5name = "572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679-pdfium-3550.tar.bz2";
+    md5name = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4-pdfium-3794.tar.bz2";
   }
   {
     name = "pixman-0.34.0.tar.gz";
@@ -707,11 +707,11 @@
     md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz";
   }
   {
-    name = "poppler-0.74.0.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/poppler-0.74.0.tar.xz";
-    sha256 = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f";
+    name = "poppler-0.82.0.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz";
+    sha256 = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df";
     md5 = "";
-    md5name = "92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f-poppler-0.74.0.tar.xz";
+    md5name = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df-poppler-0.82.0.tar.xz";
   }
   {
     name = "postgresql-9.2.24.tar.bz2";
@@ -721,11 +721,11 @@
     md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2";
   }
   {
-    name = "Python-3.5.7.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/Python-3.5.7.tar.xz";
-    sha256 = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc";
+    name = "Python-3.5.9.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/Python-3.5.9.tar.xz";
+    sha256 = "c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049";
     md5 = "";
-    md5name = "285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc-Python-3.5.7.tar.xz";
+    md5name = "c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049-Python-3.5.9.tar.xz";
   }
   {
     name = "libqxp-0.0.2.tar.xz";
@@ -805,11 +805,11 @@
     md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz";
   }
   {
-    name = "libvisio-0.1.6.tar.xz";
-    url = "http://dev-www.libreoffice.org/src/libvisio-0.1.6.tar.xz";
-    sha256 = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9";
+    name = "libvisio-0.1.7.tar.xz";
+    url = "http://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz";
+    sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c";
     md5 = "";
-    md5name = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9-libvisio-0.1.6.tar.xz";
+    md5name = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c-libvisio-0.1.7.tar.xz";
   }
   {
     name = "libwpd-0.10.3.tar.xz";
diff --git a/pkgs/applications/office/libreoffice/src-still/override.nix b/pkgs/applications/office/libreoffice/src-still/override.nix
index a089dd1e2c7f..c0880aa3ecb1 100644
--- a/pkgs/applications/office/libreoffice/src-still/override.nix
+++ b/pkgs/applications/office/libreoffice/src-still/override.nix
@@ -1,20 +1,12 @@
-{ stdenv, ... }:
+{ stdenv, kdeIntegration, ... }:
 attrs:
 {
-  configureFlags = stdenv.lib.lists.remove "--without-export-validation" attrs.configureFlags;
+  postConfigure = attrs.postConfigure + ''
+    sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/extras/inc/swmodeltestbase.hxx'
+  '';
+  configureFlags = stdenv.lib.remove "--without-system-qrcodegen"
+  (attrs.configureFlags ++ [
+    (stdenv.lib.enableFeature kdeIntegration "kde5")
+  ]);
   meta = attrs.meta // { description = "Comprehensive, professional-quality productivity suite (Still/Stable release)"; };
-  patches = = attrs.patches ++ [
-    # Poppler-0.82 compatibility
-    # https://gerrit.libreoffice.org/81545
-    (fetchpatch {
-      url = "https://github.com/LibreOffice/core/commit/2eadd46ab81058087af95bdfc1fea28fcdb65998.patch";
-      sha256 = "1mpipdfxvixjziizbhfbpybpzlg1ijw7s0yqjpmq5d7pf3pvkm4n";
-    })
-    # Poppler-0.83 compatibility
-    # https://gerrit.libreoffice.org/84384
-    (fetchpatch {
-      url = "https://github.com/LibreOffice/core/commit/9065cd8d9a19864f6b618f2dc10daf577badd9ee.patch";
-      sha256 = "0nd0gck8ra3ffw936a7ri0s6a0ii5cyglnhip2prcjh5yf7vw2i2";
-    })
-  ];
 }
diff --git a/pkgs/applications/office/libreoffice/src-still/primary.nix b/pkgs/applications/office/libreoffice/src-still/primary.nix
index a27087a1b051..d3da7d09b704 100644
--- a/pkgs/applications/office/libreoffice/src-still/primary.nix
+++ b/pkgs/applications/office/libreoffice/src-still/primary.nix
@@ -7,8 +7,8 @@ rec {
   };
 
   major = "6";
-  minor = "2";
-  patch = "6";
+  minor = "3";
+  patch = "5";
   tweak = "2";
 
   subdir = "${major}.${minor}.${patch}";
@@ -17,18 +17,19 @@ rec {
 
   src = fetchurl {
     url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "1nzvdb6yq8bpybz7lrppr237cws6dajk3r9hc9qd0zi55kcddjpq";
+    sha256 = "0jnayv1i0iq1gpf3q3z9nfq6jid77d0c76675lkqb3gi07f63nzz";
   };
 
+  # FIXME rename
   translations = fetchSrc {
     name = "translations";
-    sha256 = "1l5v9bb7n9s6i24q4mdyqyp5v4f8iy0a9dmpgw649vngj1zxdxfh";
+    sha256 = "01g09bbn1ixrsfj4l0x6x8p06dz9hnlrhnr3f3xb42drmi9ipvjv";
   };
 
   # TODO: dictionaries
 
   help = fetchSrc {
     name = "help";
-    sha256 = "0h4jvdbvxvgy7w2bzf4k4knqbshlr4v2ic2jsaygy52530z9xifz";
+    sha256 = "1p38wlclv6cbjpkkq7n2mjpxy84pxi4vxc9s5kjp4dm63zzxafd6";
   };
 }

From d9bedd0e3ee0537701c5727e2dbf32469779fc24 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 18 Feb 2020 07:30:55 +1000
Subject: [PATCH 0935/4636] crun: 0.12.1 -> 0.12.2.1

https://github.com/containers/crun/blob/0.12.2.1/NEWS
---
 pkgs/applications/virtualization/crun/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix
index f976ede79c46..9eaf2d6c5c24 100644
--- a/pkgs/applications/virtualization/crun/default.nix
+++ b/pkgs/applications/virtualization/crun/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "crun";
-  version = "0.12.1";
+  version = "0.12.2.1";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = version;
-    sha256 = "0dj6lf5yflbsybv7qkx19xvcfy5pv46k9mys7imr7akr9r1bcl5s";
+    sha256 = "16hjkkr1fp542ycyp87pj626mzfrza5mcb82hhkp4a8m8bqmpzp4";
     fetchSubmodules = true;
   };
 

From e25f0b3e3d62126c419e4c7e00a20ad8da5957cc Mon Sep 17 00:00:00 2001
From: Dylan Simon <dylan@dylex.net>
Date: Mon, 17 Feb 2020 18:29:02 -0500
Subject: [PATCH 0936/4636] scalapack: 2.1 -> 2.1.0

2.1 seems to have disappeared
---
 pkgs/development/libraries/science/math/scalapack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix
index fda902f320c9..a226dd2fc63d 100644
--- a/pkgs/development/libraries/science/math/scalapack/default.nix
+++ b/pkgs/development/libraries/science/math/scalapack/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "scalapack";
-  version = "2.1";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "Reference-ScaLAPACK";
     repo = pname;
     rev = "v${version}";
-    sha256 = "042q9kc383h7y0had9a37702z4s0szavss063ljvfdsbjy07gzb1";
+    sha256 = "1c10d18gj3kvpmyv5q246x35hjxaqn4ygy1cygaydhyxnm4klzdj";
   };
 
   nativeBuildInputs = [ cmake openssh ];

From 461ea02544e523d5c2afa29d6566daa08912af44 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 17 Feb 2020 18:32:35 -0500
Subject: [PATCH 0937/4636] flatpak: propagate glib and ostree

Pantheon's sideload broke:
```
meson.build:17:0: ERROR: Could not generate cargs for flatpak:
Package ostree-1 was not found in the pkg-config search path.
Perhaps you should add the directory containing `ostree-1.pc'
to the PKG_CONFIG_PATH environment variable
Package 'ostree-1', required by 'flatpak', not found
```

https://hydra.nixos.org/build/113077888

ZHF: #80379
---
 pkgs/development/libraries/flatpak/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index 2c44b045a2f7..54afc53ac986 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -128,7 +128,6 @@ stdenv.mkDerivation rec {
     bzip2
     dbus
     dconf
-    glib
     gpgme
     json-glib
     libarchive
@@ -136,7 +135,6 @@ stdenv.mkDerivation rec {
     libseccomp
     libsoup
     lzma
-    ostree
     polkit
     python3
     systemd
@@ -148,6 +146,12 @@ stdenv.mkDerivation rec {
     librsvg # for flatpak-validate-icon
   ];
 
+  # Required by flatpak.pc
+  propagatedBuildInputs = [
+    glib
+    ostree
+  ];
+
   checkInputs = [
     valgrind
   ];

From d744b4f9281d2d954ee06025e76e65da513f4cae Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 18 Feb 2020 09:41:31 +1000
Subject: [PATCH 0938/4636] flatpak: 1.6.1 -> 1.6.2

https://github.com/flatpak/flatpak/releases/tag/1.6.2
---
 pkgs/development/libraries/flatpak/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index 2c44b045a2f7..a73efffc7ed0 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -55,14 +55,14 @@
 
 stdenv.mkDerivation rec {
   pname = "flatpak";
-  version = "1.6.1";
+  version = "1.6.2";
 
   # TODO: split out lib once we figure out what to do with triggerdir
   outputs = [ "out" "man" "doc" "installedTests" ];
 
   src = fetchurl {
     url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz";
-    sha256 = "1x3zh2xashsq1nh4s85qq45hcnwfbnwzln2wlk10g7149nia6f7w";
+    sha256 = "02k9p5n60gz2k85n805n9niic4miw0mfh0i7yk1vrc8vaa5h69wd";
   };
 
   patches = [

From d7c7b4890e83198a3741d9038d450d6bbdaaca3c Mon Sep 17 00:00:00 2001
From: Imran Hossain <contact@imranhossa.in>
Date: Mon, 3 Feb 2020 19:08:37 -0500
Subject: [PATCH 0939/4636] maintainers: add i077

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 92a7fec22e45..a8762be1143e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3003,6 +3003,12 @@
     githubId = 12491746;
     name = "Masato Yonekawa";
   };
+  i077 = {
+    email = "nixpkgs@imranhossa.in";
+    github = "i077";
+    githubId = 2789926;
+    name = "Imran Hossain";
+  };
   iand675 = {
     email = "ian@iankduncan.com";
     github = "iand675";

From 2599fd06a2b4fc370baab140776c9d39896560a9 Mon Sep 17 00:00:00 2001
From: Imran Hossain <contact@imranhossa.in>
Date: Mon, 3 Feb 2020 19:08:59 -0500
Subject: [PATCH 0940/4636] todoist-electron: init at 1.19

---
 .../misc/todoist-electron/default.nix         | 61 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 63 insertions(+)
 create mode 100644 pkgs/applications/misc/todoist-electron/default.nix

diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix
new file mode 100644
index 000000000000..cb0ee20f555f
--- /dev/null
+++ b/pkgs/applications/misc/todoist-electron/default.nix
@@ -0,0 +1,61 @@
+{ stdenv, lib, fetchurl, makeDesktopItem, dpkg, atk, at-spi2-atk, glib, pango, gdk-pixbuf
+, gtk3, cairo, freetype, fontconfig, dbus, xorg, nss, nspr, alsaLib, cups, expat
+, udev, libpulseaudio, utillinux, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  pname = "todoist-electron";
+  version = "1.19";
+
+  src = fetchurl {
+    url = "https://github.com/KryDos/todoist-linux/releases/download/${version}/Todoist_${version}.0_amd64.deb";
+    sha256 = "1w0l7k7wmbhwzv71cffsir0q7zg9m0617fmyvd4a01b6flpxrpfx";
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "Todoist";
+    exec = "todoist";
+    desktopName = "Todoist";
+    categories = "Utility;Productivity";
+  };
+
+  nativeBuildInputs = [ makeWrapper dpkg ];
+  unpackPhase = ''
+    mkdir pkg
+    dpkg-deb -x $src pkg
+    sourceRoot=pkg
+  '';
+  installPhase = let
+    libPath = lib.makeLibraryPath ([
+      stdenv.cc.cc gtk3 atk at-spi2-atk glib pango gdk-pixbuf cairo freetype fontconfig dbus
+      nss nspr alsaLib libpulseaudio cups expat udev utillinux
+    ] ++ (with xorg; [
+      libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
+      libXrender libX11 libXtst libXScrnSaver
+    ]));
+  in ''
+    mkdir -p "$out/bin"
+    mv opt "$out/"
+
+    # Patch binary
+    patchelf \
+      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${libPath}:\$ORIGIN" \
+      $out/opt/Todoist/todoist
+
+    # Hacky workaround for RPATH problems
+    makeWrapper $out/opt/Todoist/todoist $out/bin/todoist \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio udev ]}
+
+    # Desktop item
+    mkdir -p "$out/share"
+    ln -s "${desktopItem}/share/applications" "$out/share/applications"
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/KryDos/todoist-linux";
+    description = "The Linux wrapper for Todoist web version";
+    platforms = [ "x86_64-linux" ];
+    license = licenses.isc;
+    maintainers = with maintainers; [ i077 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2785da848b80..8c2010f426e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10699,6 +10699,8 @@ in
 
   todoist = callPackage ../applications/misc/todoist { };
 
+  todoist-electron = callPackage ../applications/misc/todoist-electron { };
+
   todolist = callPackage ../applications/misc/todolist { };
 
   travis = callPackage ../development/tools/misc/travis { };

From a539bbf1eebe460f57c700c2240c9da70aabf101 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 17 Feb 2020 18:52:46 -0500
Subject: [PATCH 0941/4636] release-combined: readd keymap tests (again)

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

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index e47e64edb297..a2c78752581c 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -84,6 +84,12 @@ in rec {
       "nixos.tests.installer.simple.x86_64-linux"
       "nixos.tests.installer.swraid.x86_64-linux"
       "nixos.tests.ipv6.x86_64-linux"
+      "nixos.tests.keymap.azerty.x86_64-linux"
+      "nixos.tests.keymap.colemak.x86_64-linux"
+      "nixos.tests.keymap.dvorak.x86_64-linux"
+      "nixos.tests.keymap.dvp.x86_64-linux"
+      "nixos.tests.keymap.neo.x86_64-linux"
+      "nixos.tests.keymap.qwertz.x86_64-linux"
       "nixos.tests.lightdm.x86_64-linux"
       "nixos.tests.login.x86_64-linux"
       "nixos.tests.misc.x86_64-linux"

From 6be8389b04913a034143474d7b93bdc79dee6b34 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Tue, 18 Feb 2020 00:52:55 +0100
Subject: [PATCH 0942/4636] python/aiohttp: disable test on 32bit platforms

The test `test_cookiejar` is failing because a time_t
constant can't be represented on 32bit platforms.
---
 pkgs/development/python-modules/aiohttp/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 0cecdb0291e9..737d1eec3c21 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -1,4 +1,5 @@
 { lib
+, stdenv
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
@@ -54,6 +55,7 @@ buildPythonPackage rec {
                and not handle_keepalive_on_closed_connection \
                and not proxy_https_bad_response \
                and not partially_applied_handler \
+               ${lib.optionalString stdenv.is32bit "and not test_cookiejar"} \
                and not middleware" \
       --ignore=test_connector.py
   '';

From af19743739fe25c259a91ccd694e08dc7743bc99 Mon Sep 17 00:00:00 2001
From: "Farkas, Arnold" <arnold.farkas@worldquant.com>
Date: Mon, 27 Jan 2020 04:19:42 -0500
Subject: [PATCH 0943/4636] pythonPackages.sqlitedict: init at 1.6.0

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

diff --git a/pkgs/development/python-modules/sqlitedict/default.nix b/pkgs/development/python-modules/sqlitedict/default.nix
new file mode 100644
index 000000000000..5037aa2c3681
--- /dev/null
+++ b/pkgs/development/python-modules/sqlitedict/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchFromGitHub, pytest }:
+
+buildPythonPackage rec {
+  pname = "sqlitedict";
+  version = "1.6.0";
+  
+  src = fetchFromGitHub {
+    owner = "RaRe-Technologies";
+    repo = "sqlitedict";
+    rev = version;
+    sha256 = "1yq94lgpny9qcfbsl39npjvrsjfggi3lj2kpzcsxcfdfgxag6m2m";
+  };
+  
+  checkInputs = [ pytest ];
+  
+  checkPhase = ''
+    pytest tests
+  '';
+  
+  meta = with lib; {
+    description = "Persistent, thread-safe dict";
+    homepage = "https://github.com/RaRe-Technologies/sqlitedict";
+    license = licenses.asl20;
+    maintainers = [ maintainers.arnoldfarkas ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ed7a00d5e816..9731cab24b26 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5878,6 +5878,8 @@ in {
 
   sqlite3dbm = callPackage ../development/python-modules/sqlite3dbm { };
 
+  sqlitedict = callPackage ../development/python-modules/sqlitedict { };
+
   sqlobject = callPackage ../development/python-modules/sqlobject { };
 
   sqlmap = callPackage ../development/python-modules/sqlmap { };

From 26f1d1e81b22803a54377f9ac9ceb767f02e2770 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 17 Feb 2020 19:14:10 -0500
Subject: [PATCH 0944/4636] flatpak: add dev output

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

diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index 54afc53ac986..42733922687d 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
   version = "1.6.1";
 
   # TODO: split out lib once we figure out what to do with triggerdir
-  outputs = [ "out" "man" "doc" "installedTests" ];
+  outputs = [ "out" "dev" "man" "doc" "installedTests" ];
 
   src = fetchurl {
     url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz";

From 27d44b5156c8d64c0e762cd40dfbc79424ea4d54 Mon Sep 17 00:00:00 2001
From: Ersin Akinci <me@ersinakinci.com>
Date: Mon, 17 Feb 2020 21:35:43 +0000
Subject: [PATCH 0945/4636] slack: add MacOS target

---
 .../instant-messengers/slack/default.nix      | 236 ++++++++++--------
 1 file changed, 131 insertions(+), 105 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index e501d3bcdbfc..32f50b6fd638 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -8,120 +8,146 @@ let
 
   version = "4.2.0";
 
-  rpath = stdenv.lib.makeLibraryPath [
-    alsaLib
-    at-spi2-atk
-    at-spi2-core
-    atk
-    cairo
-    cups
-    curl
-    dbus
-    expat
-    fontconfig
-    freetype
-    glib
-    gnome2.GConf
-    gdk-pixbuf
-    gtk3
-    pango
-    libnotify
-    libxcb
-    libappindicator-gtk3
-    nspr
-    nss
-    stdenv.cc.cc
-    systemd
-    libuuid
-    libpulseaudio
+  inherit (stdenv.hostPlatform) system;
 
-    xorg.libxkbfile
-    xorg.libX11
-    xorg.libXcomposite
-    xorg.libXcursor
-    xorg.libXdamage
-    xorg.libXext
-    xorg.libXfixes
-    xorg.libXi
-    xorg.libXrandr
-    xorg.libXrender
-    xorg.libXtst
-    xorg.libXScrnSaver
-  ] + ":${stdenv.cc.cc.lib}/lib64";
+  throwSystem = throw "Unsupported system: ${system}";
 
-  src =
-    if stdenv.hostPlatform.system == "x86_64-linux" then
-      fetchurl {
-        url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
-        sha256 = "01b2klhky04fijdqcpfafgdqx2c5nh2fpnzvzgvz10hv7h16cinv";
-      }
-    else
-      throw "Slack is not supported on ${stdenv.hostPlatform.system}";
-
-in stdenv.mkDerivation {
   pname = "slack";
-  inherit version;
 
-  inherit src;
+  sha256 = {
+    x86_64-darwin = "0947a98m7yz4hldjvcqnv9s17dpvlsk9sflc1zc99hf500zck0w1";
+    x86_64-linux = "01b2klhky04fijdqcpfafgdqx2c5nh2fpnzvzgvz10hv7h16cinv";
+  }.${system} or throwSystem;
 
-  buildInputs = [
-    gtk3  # needed for GSETTINGS_SCHEMAS_PATH
-  ];
-
-  nativeBuildInputs = [ dpkg makeWrapper nodePackages.asar ];
-
-  dontUnpack = true;
-  dontBuild = true;
-  dontPatchELF = true;
-
-  installPhase = ''
-    # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here
-    dpkg --fsys-tarfile $src | tar --extract
-    rm -rf usr/share/lintian
-
-    mkdir -p $out
-    mv usr/* $out
-
-    # Otherwise it looks "suspicious"
-    chmod -R g-w $out
-
-    for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
-      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
-      patchelf --set-rpath ${rpath}:$out/lib/slack $file || true
-    done
-
-    # Replace the broken bin/slack symlink with a startup wrapper
-    rm $out/bin/slack
-    makeWrapper $out/lib/slack/slack $out/bin/slack \
-      --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
-      --prefix PATH : ${xdg_utils}/bin
-
-    # Fix the desktop link
-    substituteInPlace $out/share/applications/slack.desktop \
-      --replace /usr/bin/ $out/bin/ \
-      --replace /usr/share/ $out/share/
-  '' + stdenv.lib.optionalString (theme != null) ''
-    asar extract $out/lib/slack/resources/app.asar $out/lib/slack/resources/app.asar.unpacked
-    cat <<EOF >> $out/lib/slack/resources/app.asar.unpacked/dist/ssb-interop.bundle.js
-
-    var fs = require('fs');
-    document.addEventListener('DOMContentLoaded', function() {
-      fs.readFile('${theme}/theme.css', 'utf8', function(err, css) {
-        let s = document.createElement('style');
-        s.type = 'text/css';
-        s.innerHTML = css;
-        document.head.appendChild(s);
-      });
-    });
-    EOF
-    asar pack $out/lib/slack/resources/app.asar.unpacked $out/lib/slack/resources/app.asar
-  '';
 
   meta = with stdenv.lib; {
     description = "Desktop client for Slack";
     homepage = https://slack.com;
     license = licenses.unfree;
     maintainers = [ maintainers.mmahut ];
-    platforms = [ "x86_64-linux" ];
+    platforms = [ "x86_64-darwin" "x86_64-linux" ];
   };
-}
+
+  linux = stdenv.mkDerivation rec {
+    inherit pname version meta;
+    src = fetchurl {
+      url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
+      inherit sha256;
+    };
+
+    rpath = stdenv.lib.makeLibraryPath [
+      alsaLib
+      at-spi2-atk
+      at-spi2-core
+      atk
+      cairo
+      cups
+      curl
+      dbus
+      expat
+      fontconfig
+      freetype
+      glib
+      gnome2.GConf
+      gdk-pixbuf
+      gtk3
+      pango
+      libnotify
+      libxcb
+      libappindicator-gtk3
+      nspr
+      nss
+      stdenv.cc.cc
+      systemd
+      libuuid
+      libpulseaudio
+  
+      xorg.libxkbfile
+      xorg.libX11
+      xorg.libXcomposite
+      xorg.libXcursor
+      xorg.libXdamage
+      xorg.libXext
+      xorg.libXfixes
+      xorg.libXi
+      xorg.libXrandr
+      xorg.libXrender
+      xorg.libXtst
+      xorg.libXScrnSaver
+    ] + ":${stdenv.cc.cc.lib}/lib64";
+
+    buildInputs = [
+      gtk3  # needed for GSETTINGS_SCHEMAS_PATH
+    ];
+  
+    nativeBuildInputs = [ dpkg makeWrapper nodePackages.asar ];
+  
+    dontUnpack = true;
+    dontBuild = true;
+    dontPatchELF = true;
+  
+    installPhase = ''
+      # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here
+      dpkg --fsys-tarfile $src | tar --extract
+      rm -rf usr/share/lintian
+  
+      mkdir -p $out
+      mv usr/* $out
+  
+      # Otherwise it looks "suspicious"
+      chmod -R g-w $out
+  
+      for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
+        patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
+        patchelf --set-rpath ${rpath}:$out/lib/slack $file || true
+      done
+  
+      # Replace the broken bin/slack symlink with a startup wrapper
+      rm $out/bin/slack
+      makeWrapper $out/lib/slack/slack $out/bin/slack \
+        --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
+        --prefix PATH : ${xdg_utils}/bin
+  
+      # Fix the desktop link
+      substituteInPlace $out/share/applications/slack.desktop \
+        --replace /usr/bin/ $out/bin/ \
+        --replace /usr/share/ $out/share/
+    '' + stdenv.lib.optionalString (theme != null) ''
+      asar extract $out/lib/slack/resources/app.asar $out/lib/slack/resources/app.asar.unpacked
+      cat <<EOF >> $out/lib/slack/resources/app.asar.unpacked/dist/ssb-interop.bundle.js
+  
+      var fs = require('fs');
+      document.addEventListener('DOMContentLoaded', function() {
+        fs.readFile('${theme}/theme.css', 'utf8', function(err, css) {
+          let s = document.createElement('style');
+          s.type = 'text/css';
+          s.innerHTML = css;
+          document.head.appendChild(s);
+        });
+      });
+      EOF
+      asar pack $out/lib/slack/resources/app.asar.unpacked $out/lib/slack/resources/app.asar
+    '';
+  };
+
+  darwin = stdenv.mkDerivation {
+    inherit pname version meta;
+
+    phases = [ "installPhase" ];
+
+    src = fetchurl {
+      url = "https://downloads.slack-edge.com/mac_releases/Slack-${version}-macOS.dmg";
+      inherit sha256;
+    };
+
+    installPhase = ''
+      /usr/bin/hdiutil mount -nobrowse -mountpoint slack-mnt $src
+      mkdir -p $out/Applications
+      cp -r ./slack-mnt/Slack.app $out/Applications
+      /usr/bin/hdiutil unmount slack-mnt
+      defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -bool YES
+    '';
+  };
+in if stdenv.isDarwin
+  then darwin
+  else linux

From 1170594e99350f9750ba36e986344ab6ded7f1e3 Mon Sep 17 00:00:00 2001
From: Ersin Akinci <me@ersinakinci.com>
Date: Mon, 17 Feb 2020 21:37:50 +0000
Subject: [PATCH 0946/4636] slack: 4.2.0 -> 4.3.3

---
 .../networking/instant-messengers/slack/default.nix             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 32f50b6fd638..8037f68c8d11 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -6,7 +6,7 @@ at-spi2-atk, at-spi2-core, libuuid, nodePackages, libpulseaudio, xdg_utils
 
 let
 
-  version = "4.2.0";
+  version = "4.3.3";
 
   inherit (stdenv.hostPlatform) system;
 

From 1e1ad96cf6cfeabd7eee2dafba56aeff8e3e4848 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <brightone@protonmail.com>
Date: Tue, 18 Feb 2020 03:23:19 +0200
Subject: [PATCH 0947/4636] procs: 0.9.9 -> 0.9.11

---
 pkgs/tools/admin/procs/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix
index 51ff06817cb8..9fdb8ac21979 100644
--- a/pkgs/tools/admin/procs/default.nix
+++ b/pkgs/tools/admin/procs/default.nix
@@ -2,26 +2,23 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "procs";
-  version = "0.9.9";
+  version = "0.9.11";
 
   src = fetchFromGitHub {
     owner = "dalance";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1dvwn991widribk563jn3461f1913bpga0yyfr5mnf4p4p8s59j6";
+    sha256 = "0nz06q1rdrqgprclgr30la2vp4bx0qgibh22vdlqpd4rzi3x0h2r";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "11wv02nn6gp32zzcd6kmsh6ky0dzyk1qqhb5vxvmq2nxhxjlddwv";
+  cargoSha256 = "0hmz19ndfcg7bsrjk89ck9x99ibsvghqwmvgcd89vxmjr5h13rsg";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 
   meta = with stdenv.lib; {
     description = "A modern replacement for ps written in Rust";
     homepage = "https://github.com/dalance/procs";
-    license = with licenses; [ mit ];
+    license = licenses.mit;
     maintainers = [ maintainers.dalance ];
     platforms = with platforms; linux ++ darwin;
   };

From f00f60ffbb05bc71c0e00b94464846c996ba5e33 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <brightone@protonmail.com>
Date: Tue, 18 Feb 2020 03:25:35 +0200
Subject: [PATCH 0948/4636] procs: add filalex77 as a maintainer

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

diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix
index 9fdb8ac21979..453bbfb426aa 100644
--- a/pkgs/tools/admin/procs/default.nix
+++ b/pkgs/tools/admin/procs/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     description = "A modern replacement for ps written in Rust";
     homepage = "https://github.com/dalance/procs";
     license = licenses.mit;
-    maintainers = [ maintainers.dalance ];
+    maintainers = with maintainers;  [ dalance filalex77 ];
     platforms = with platforms; linux ++ darwin;
   };
 }

From 59bf79ec4b30b8f747e7f8fa9de7fd0c33a36074 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 17 Feb 2020 21:05:17 -0500
Subject: [PATCH 0949/4636] pantheon.elementary-files: 4.3.0 -> 4.4.0

https://github.com/elementary/files/releases/tag/4.4.0
---
 pkgs/desktops/pantheon/apps/elementary-files/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index ae43a372acc3..858e49900c5a 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -30,7 +30,7 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-files";
-  version = "4.3.0";
+  version = "4.4.0";
 
   repoName = "files";
 
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = repoName;
     rev = version;
-    sha256 = "0brckm0vi9lh8l4g3cy37pbyrdh6g0mdsv3cpii069y2drrh8mz5";
+    sha256 = "1l5ki203agy3wkhnxf89ziy4xfmn7m3q0qz1hyrzy7a7qaslq3bg";
   };
 
   passthru = {

From fdcb86de65f502c73e9edcbe3c14b9a7804949ee Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 17 Feb 2020 17:16:08 -0800
Subject: [PATCH 0950/4636] python3Packages.django_extensions: 2.2.5 -> 2.2.8

---
 .../django-extensions/default.nix             | 74 ++++++++++---------
 1 file changed, 41 insertions(+), 33 deletions(-)

diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix
index d62542536768..08b2460b1bbc 100644
--- a/pkgs/development/python-modules/django-extensions/default.nix
+++ b/pkgs/development/python-modules/django-extensions/default.nix
@@ -1,55 +1,63 @@
-{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder
-, six, typing, pygments
-, django, shortuuid, python-dateutil, pytest
-, pytest-django, pytestcov, mock, vobject
-, werkzeug, glibcLocales, factory_boy
+{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, python
+, django
+, factory_boy
+, glibcLocales
+, mock
+, pygments
+, pytest
+, pytestcov
+, pytest-django
+, python-dateutil
+, shortuuid
+, six
+, tox
+, typing
+, vobject
+, werkzeug
 }:
 
 buildPythonPackage rec {
   pname = "django-extensions";
-  version = "2.2.5";
+  version = "2.2.8";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "0053yqq4vq3mwy7zkfs5vfm3g8j9sfy3vrc6xby83qlj9wz43ipi";
+    sha256 = "1gd3nykwzh3azq1p9cvgkc3l5dwrv7y86sfjxd9llbyj8ky71iaj";
   };
 
-  # This patch fixes a single failing test and can be removed when updating this pkg
-  # to the next version
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/django-extensions/django-extensions/commit/1d21786da2e6868d98ae34c82079e1e03ad1aa97.patch";
-      sha256 = "0d81zpj0f8a7ijrfb12j0b67fgj89k3axaskz1nwqsr4wc6n4bw2";
-    })
-  ];
+  LC_ALL = "en_US.UTF-8";
+  __darwinAllowLocalNetworking = true;
 
-  postPatch = ''
-    substituteInPlace setup.py --replace "'tox'," ""
-
-    # not yet pytest 5 compatible?
-    rm tests/management/commands/test_set_fake_emails.py
-    rm tests/management/commands/test_set_fake_passwords.py
-    rm tests/management/commands/test_validate_templates.py
-
-    # pip should not be used during tests...
-    rm tests/management/commands/test_pipchecker.py
-  '';
-
-  propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") typing;
+  propagatedBuildInputs = [ six ]
+    ++ lib.optional (pythonOlder "3.5") typing;
 
   checkInputs = [
-    django shortuuid python-dateutil pytest
-    pytest-django pytestcov mock vobject
-    werkzeug glibcLocales factory_boy pygments
+    django
+    factory_boy
+    glibcLocales
+    mock
+    pygments # not explicitly declared in setup.py, but some tests require it
+    pytest
+    pytestcov
+    pytest-django
+    python-dateutil
+    shortuuid
+    tox
+    vobject
+    werkzeug
   ];
 
-  LC_ALL = "en_US.UTF-8";
+  # tests not compatible with pip>=20
+  checkPhase = ''
+    rm tests/management/commands/test_pipchecker.py
+    ${python.interpreter} setup.py test
+  '';
 
   meta = with lib; {
     description = "A collection of custom extensions for the Django Framework";
-    homepage = https://github.com/django-extensions/django-extensions;
+    homepage = "https://github.com/django-extensions/django-extensions";
     license = licenses.mit;
   };
 }

From 60c4596dcbc2be668274f15f45a856f5e721fa14 Mon Sep 17 00:00:00 2001
From: Julien Dehos <dehos@univ-littoral.fr>
Date: Thu, 13 Feb 2020 13:31:08 +0100
Subject: [PATCH 0951/4636] pythonPackages.bayesian-optimization: init at 1.0.1

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

diff --git a/pkgs/development/python-modules/bayesian-optimization/default.nix b/pkgs/development/python-modules/bayesian-optimization/default.nix
new file mode 100644
index 000000000000..1f1d33fe329e
--- /dev/null
+++ b/pkgs/development/python-modules/bayesian-optimization/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, python
+, scikitlearn
+, scipy
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "bayesian-optimization";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "fmfn";
+    repo = "BayesianOptimization";
+    rev = "v${version}";
+    sha256 = "07sqymg6k5512k7wq4kbp7rsrkb4g90n0ck1f0b9s6glyfpcy4pq";
+  };
+
+  propagatedBuildInputs = [
+    scikitlearn
+    scipy
+  ];
+  
+  checkInputs = [ pytest ];
+  checkPhase = ''
+    pytest tests
+  '';
+
+  meta = with lib; {
+    description = "A Python implementation of global optimization with gaussian processes";
+    homepage = "https://github.com/fmfn/BayesianOptimization";
+    license = licenses.mit;
+    maintainers = [ maintainers.juliendehos ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9731cab24b26..9037b9e39986 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -484,6 +484,8 @@ in {
 
   bashlex = callPackage ../development/python-modules/bashlex { };
 
+  bayesian-optimization = callPackage ../development/python-modules/bayesian-optimization { };
+
   bayespy = callPackage ../development/python-modules/bayespy { };
 
   beanstalkc = callPackage ../development/python-modules/beanstalkc { };

From c416e032d5dbe9a86b751bb0de0a24e12e4d3151 Mon Sep 17 00:00:00 2001
From: "Farkas, Arnold" <arnold.farkas@worldquant.com>
Date: Mon, 27 Jan 2020 04:39:40 -0500
Subject: [PATCH 0952/4636] pythonPackages.untangle: init at 1.1.1

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

diff --git a/pkgs/development/python-modules/untangle/default.nix b/pkgs/development/python-modules/untangle/default.nix
new file mode 100644
index 000000000000..f8f172e78b13
--- /dev/null
+++ b/pkgs/development/python-modules/untangle/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchFromGitHub, python }:
+
+buildPythonPackage rec {
+  pname = "untangle";
+  version = "1.1.1";
+  
+  src = fetchFromGitHub {
+    owner = "stchris";
+    repo = "untangle";
+    # 1.1.1 is not tagged on GitHub
+    rev = "61b57cd771a40df7d1621e9ec3c68d9acd733d31";
+    sha256 = "0ffvlfyyl82xi4akz1lls32lrnlrn44ik41v8x8xh9ghy0n0ick7";
+  };
+  
+  checkPhase = ''
+    ${python.interpreter} -m unittest discover -s tests
+  '';
+  
+  meta = with lib; {
+    description = "Convert XML documents into Python objects";
+    homepage = "http://github.com/stchris/untangle";
+    license = licenses.mit;
+    maintainers = [ maintainers.arnoldfarkas ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9037b9e39986..63cde6669fe8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6115,6 +6115,8 @@ in {
 
   unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { };
 
+  untangle = callPackage ../development/python-modules/untangle { };
+
   traceback2 = callPackage ../development/python-modules/traceback2 { };
 
   trackpy = callPackage ../development/python-modules/trackpy { };

From bd4ffbcd261f6f41dfdeea3fa463d63524dcecf2 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 18 Feb 2020 15:00:37 +1000
Subject: [PATCH 0953/4636] amass: 3.4.2 -> 3.4.4

https://github.com/OWASP/Amass/releases/tag/v3.4.3
https://github.com/OWASP/Amass/releases/tag/v3.4.4
---
 pkgs/tools/networking/amass/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix
index 06eabec06183..a79540eaeca9 100644
--- a/pkgs/tools/networking/amass/default.nix
+++ b/pkgs/tools/networking/amass/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "amass";
-  version = "3.4.2";
+  version = "3.4.4";
 
   src = fetchFromGitHub {
     owner = "OWASP";
     repo = "Amass";
     rev = "v${version}";
-    sha256 = "0mia01cqmaa17696m73qazpbyrcng7wldca79g46xgc4z96q1i7i";
+    sha256 = "1qr9cd22m6w5r32bsvg08bmvyvzz7agaklrghf8n1d23ijj1563p";
   };
 
-  modSha256 = "1zwm7skdhql6isffyhixqsgvcgxw2436iv8bj92cxs70ipk537v9";
+  modSha256 = "00pd0xi0m3w4xqdqq7ldqcpirq9plln45nhpjrsp5r9bz7yc5wn9";
 
   outputs = [ "out" "wordlists" ];
 

From c3b5bdaba015f9fd1b8afff4ccee41ba29b6c655 Mon Sep 17 00:00:00 2001
From: Dylan Simon <dylan@dylex.net>
Date: Mon, 17 Feb 2020 20:27:01 -0500
Subject: [PATCH 0954/4636] ruamel: moved from bitbucket to sourceforge

---
 pkgs/development/python-modules/ruamel_base/default.nix  | 2 +-
 pkgs/development/python-modules/ruamel_yaml/default.nix  | 2 +-
 .../python-modules/ruamel_yaml_clib/default.nix          | 9 ++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/ruamel_base/default.nix b/pkgs/development/python-modules/ruamel_base/default.nix
index ba6a79fdd634..0395c6246e11 100644
--- a/pkgs/development/python-modules/ruamel_base/default.nix
+++ b/pkgs/development/python-modules/ruamel_base/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Common routines for ruamel packages";
-    homepage = https://bitbucket.org/ruamel/base;
+    homepage = https://sourceforge.net/projects/ruamel-base/;
     license = licenses.mit;
   };
 
diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix
index 88b2de830b7e..cba566e1d661 100644
--- a/pkgs/development/python-modules/ruamel_yaml/default.nix
+++ b/pkgs/development/python-modules/ruamel_yaml/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";
-    homepage = https://bitbucket.org/ruamel/yaml;
+    homepage = https://sourceforge.net/projects/ruamel-yaml/;
     license = licenses.mit;
   };
 
diff --git a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix
index 19c208f27169..f86f5102b195 100644
--- a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix
+++ b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix
@@ -1,6 +1,6 @@
 { stdenv
 , buildPythonPackage
-, fetchFromBitbucket
+, fetchhg
 , ruamel_base
 , ruamel_ordereddict
 , isPy3k
@@ -10,9 +10,8 @@ buildPythonPackage rec {
   pname = "ruamel.yaml.clib";
   version = "0.2.0";
 
-  src = fetchFromBitbucket {
-    owner = "ruamel";
-    repo = "yaml.clib";
+  src = fetchhg {
+    url = "http://hg.code.sf.net/p/ruamel-yaml-clib/code";
     rev = version;
     sha256 = "0kq6zi96qlm72lzj90fc2rfk6nm5kqhk6qxdl8wl9s3a42b0v6wl";
   };
@@ -22,7 +21,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";
-    homepage = https://bitbucket.org/ruamel/yaml;
+    homepage = https://sourceforge.net/projects/ruamel-yaml-clib/;
     license = licenses.mit;
   };
 

From 15a97f8d03db670ed53e84464e225311a60ea172 Mon Sep 17 00:00:00 2001
From: Dylan Simon <dylan@dylex.net>
Date: Mon, 17 Feb 2020 23:05:21 -0500
Subject: [PATCH 0955/4636] ruamel: quote urls, update ordereddict url

---
 pkgs/development/python-modules/ruamel_base/default.nix        | 2 +-
 pkgs/development/python-modules/ruamel_ordereddict/default.nix | 2 +-
 pkgs/development/python-modules/ruamel_yaml/default.nix        | 2 +-
 pkgs/development/python-modules/ruamel_yaml_clib/default.nix   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/ruamel_base/default.nix b/pkgs/development/python-modules/ruamel_base/default.nix
index 0395c6246e11..f7e473f9f561 100644
--- a/pkgs/development/python-modules/ruamel_base/default.nix
+++ b/pkgs/development/python-modules/ruamel_base/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Common routines for ruamel packages";
-    homepage = https://sourceforge.net/projects/ruamel-base/;
+    homepage = "https://sourceforge.net/projects/ruamel-base/";
     license = licenses.mit;
   };
 
diff --git a/pkgs/development/python-modules/ruamel_ordereddict/default.nix b/pkgs/development/python-modules/ruamel_ordereddict/default.nix
index ee329a651661..da4e891b2b38 100644
--- a/pkgs/development/python-modules/ruamel_ordereddict/default.nix
+++ b/pkgs/development/python-modules/ruamel_ordereddict/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "A version of dict that keeps keys in insertion resp. sorted order";
-    homepage = https://bitbucket.org/ruamel/ordereddict;
+    homepage = "https://sourceforge.net/projects/ruamel-ordereddict/";
     license = licenses.mit;
   };
 
diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix
index cba566e1d661..bdfde326d76f 100644
--- a/pkgs/development/python-modules/ruamel_yaml/default.nix
+++ b/pkgs/development/python-modules/ruamel_yaml/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";
-    homepage = https://sourceforge.net/projects/ruamel-yaml/;
+    homepage = "https://sourceforge.net/projects/ruamel-yaml/";
     license = licenses.mit;
   };
 
diff --git a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix
index f86f5102b195..46b55c04d30e 100644
--- a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix
+++ b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";
-    homepage = https://sourceforge.net/projects/ruamel-yaml-clib/;
+    homepage = "https://sourceforge.net/projects/ruamel-yaml-clib/";
     license = licenses.mit;
   };
 

From 0b91dad9ee106d565f8c32816a339743234b775e Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Mon, 17 Feb 2020 20:19:20 -0500
Subject: [PATCH 0956/4636] tealdeer: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully.
---
 pkgs/tools/misc/tealdeer/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix
index 1666d22626b0..5e4b1bec1e6e 100644
--- a/pkgs/tools/misc/tealdeer/default.nix
+++ b/pkgs/tools/misc/tealdeer/default.nix
@@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1v9wq4k7k4lmdz6xy6kabchjpbx9lds20yh6va87shypdh9iva29";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0y1y74fgxcv8a3cmyf30p6gg12r79ln7inir8scj88wbmwgkbxsp";
+  cargoSha256 = "0rr9mqylcs3nb7wgilp810qia0rv2pnalyhh28q0wnqyz0kqfrzr";
 
   buildInputs = [ openssl cacert curl ]
     ++ (stdenv.lib.optional stdenv.isDarwin Security);

From 0ded378b10a17d2e7525bcd2002e89e10ecd7967 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 18 Feb 2020 06:05:09 +0000
Subject: [PATCH 0957/4636] aseprite: fix build with glibc 2.30

Otherwise it fails with:

In file included from /build/source/src/allegro/include/allegro/base.h:41,
                 from /build/source/src/allegro/include/allegro.h:25,
                 from /build/source/src/./she/alleg4/alleg_surface.h:11,
                 from /build/source/src/she/alleg4/alleg_surface.cpp:11:
/build/source/src/allegro/include/allegro/alcompat.h:44:22: error: conflicting declaration of C function 'fixed fadd(fixed, fixed)'
   44 |       AL_ALIAS(fixed fadd(fixed x, fixed y), fixadd(x, y))
      |                      ^~~~
/build/source/src/allegro/include/allegro/internal/alconfig.h:164:49: note: in definition of macro 'AL_ALIAS'
  164 |       static __attribute__((unused)) __inline__ DECL    \
      |                                                 ^~~~
In file included from /nix/store/y57skwl8a5vbkrjrc30ygdw9vr1p6n19-gcc-9.2.0/include/c++/9.2.0/cmath:45,
                 from /nix/store/y57skwl8a5vbkrjrc30ygdw9vr1p6n19-gcc-9.2.0/include/c++/9.2.0/math.h:36,
                 from /build/source/src/./base/base.h:13,
                 from /build/source/src/./config.h:40,
                 from /build/source/src/she/alleg4/alleg_surface.cpp:8:
/nix/store/2v6pi2wj3lcsc3j48n7flx9mgqyii1lv-glibc-2.30-dev/include/bits/mathcalls-narrow.h:24:20: note: previous declaration 'float fadd(double, double)'
   24 | __MATHCALL_NARROW (__MATHCALL_NAME (add), __MATHCALL_REDIR_NAME (add), 2);
      |                    ^~~~~~~~~~~~~~~
---
 .../editors/aseprite/allegro-glibc-2.30.patch             | 8 ++++++++
 pkgs/applications/editors/aseprite/default.nix            | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch

diff --git a/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch b/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch
new file mode 100644
index 000000000000..94c70da276c9
--- /dev/null
+++ b/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch
@@ -0,0 +1,8 @@
+diff --git a/src/she/CMakeLists.txt b/src/she/CMakeLists.txt
+index 4909ff1..02fa145 100644
+--- a/src/she/CMakeLists.txt
++++ b/src/she/CMakeLists.txt
+@@ -23,2 +23,3 @@ if(USE_ALLEG4_BACKEND)
+     add_definitions(-DUSE_MOUSE_POLLER)
++    add_definitions(-DALLEGRO_NO_FIX_ALIASES)
+   endif()
diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix
index 170fde7b9caf..fb744ef59550 100644
--- a/pkgs/applications/editors/aseprite/default.nix
+++ b/pkgs/applications/editors/aseprite/default.nix
@@ -36,7 +36,9 @@ stdenv.mkDerivation rec {
     skia libGL
   ];
 
-  patches = lib.optionals unfree [
+  patches = if !unfree then [
+    ./allegro-glibc-2.30.patch
+  ] else [
     (fetchpatch {
       url = "https://github.com/lfont/aseprite/commit/f1ebc47012d3fed52306ed5922787b4b98cc0a7b.patch";
       sha256 = "03xg7x6b9iv7z18vzlqxhcfphmx4v3qhs9f5rgf38ppyklca5jyw";

From 472b657221071bdf7048ec5c3eca7ca458b0a5f5 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 18 Feb 2020 16:32:51 +1000
Subject: [PATCH 0958/4636] kepubify: init at 3.0.0

Co-authored-by: Jacob Dillon <jacob.dillon@uconn.edu>
---
 pkgs/tools/misc/kepubify/default.nix | 26 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/tools/misc/kepubify/default.nix

diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix
new file mode 100644
index 000000000000..faa5e9d85e81
--- /dev/null
+++ b/pkgs/tools/misc/kepubify/default.nix
@@ -0,0 +1,26 @@
+{ lib, fetchFromGitHub, buildGoModule }:
+
+buildGoModule rec {
+  pname = "kepubify";
+  version = "3.0.0";
+
+  src = fetchFromGitHub {
+    owner = "geek1011";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "168n4xbhjrzwzlhvakmsd0nwqjwgibphkwzq5hcxrk9ywpqpxjad";
+  };
+
+  modSha256 = "18q9ywsjc2v1bsmw7307dpd4v5m7v80hbhijkfrkcyqzj34jrq43";
+
+  buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
+
+  subPackages = [ "." "covergen" "seriesmeta" ];
+
+  meta = with lib; {
+    description = "EPUB to KEPUB converter";
+    homepage = "https://pgaskin.net/kepubify";
+    license = licenses.mit;
+    maintainers = with maintainers; [ zowoq ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4728ae975e7d..abd310f729d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19920,6 +19920,8 @@ in
 
   kega-fusion = pkgsi686Linux.callPackage ../misc/emulators/kega-fusion { };
 
+  kepubify = callPackage ../tools/misc/kepubify { };
+
   kermit = callPackage ../tools/misc/kermit { };
 
   kexi = libsForQt5.callPackage ../applications/office/kexi { };

From 4b212b91afca7ba6354a499be765bee339d3a171 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Mon, 17 Feb 2020 20:13:10 -0500
Subject: [PATCH 0959/4636] mdbook: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully.
---
 pkgs/tools/text/mdbook/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix
index 6f9f8577501e..2aad1755cff0 100644
--- a/pkgs/tools/text/mdbook/default.nix
+++ b/pkgs/tools/text/mdbook/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0gcrv54iswphzxxkmak1c7pmmpakiri6jk50j4bxrsplwjr76f7n";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "00grlxjz61vxinr18f28ga6610yjxcq48lr75wmyc5wq317j12fn";
+  cargoSha256 = "12i9w9dgji36yvvdks0vkjjkh32nbnhz76sgrl2827pj49h9vnn0";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
 

From 3ad2c20fe69048e68b49b61717cf911380262320 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 18 Feb 2020 06:57:40 +0000
Subject: [PATCH 0960/4636] aseprite-unfree: fix build

It fails with:

src/gpu/gl/glx/GrGLMakeNativeInterface_glx.cpp:15:10: fatal error: GL/glx.h: No such file or directory
   15 | #include <GL/glx.h>
---
 pkgs/applications/editors/aseprite/skia.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/aseprite/skia.nix b/pkgs/applications/editors/aseprite/skia.nix
index 8bf2adf484e2..c89ebd4ad0c1 100644
--- a/pkgs/applications/editors/aseprite/skia.nix
+++ b/pkgs/applications/editors/aseprite/skia.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, fetchgit, python2, gn, ninja
-, fontconfig, expat, icu58, libjpeg, libpng, libwebp, zlib
+, fontconfig, expat, icu58, libglvnd, libjpeg, libpng, libwebp, zlib
 , mesa, libX11
 }:
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ python2 gn ninja ];
 
   buildInputs = [
-    fontconfig expat icu58 libjpeg libpng libwebp zlib
+    fontconfig expat icu58 libglvnd libjpeg libpng libwebp zlib
     mesa libX11
   ];
 

From 43ee8097d927cc72bc01a9001547d517975177c9 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 18 Feb 2020 07:49:03 +0000
Subject: [PATCH 0961/4636] aseprite-unfree: 1.2.11 -> 1.2.16.3

Restore the comment explaining the split between free and unfree versions
deleted in caa4e6dcb24fe5f0d9bc334049f90bbece8fa461.
---
 pkgs/applications/editors/aseprite/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix
index fb744ef59550..6e6d7db81770 100644
--- a/pkgs/applications/editors/aseprite/default.nix
+++ b/pkgs/applications/editors/aseprite/default.nix
@@ -6,12 +6,16 @@
 , cmark
 }:
 
+# Unfree version is not redistributable:
+# https://dev.aseprite.org/2016/09/01/new-source-code-license/
+# Consider supporting the developer: https://aseprite.org/#buy
+
 let
   skia = callPackage ./skia.nix {};
 in
 stdenv.mkDerivation rec {
   pname = "aseprite";
-  version = if unfree then "1.2.11" else "1.1.7";
+  version = if unfree then "1.2.16.3" else "1.1.7";
 
   src = fetchFromGitHub {
     owner = "aseprite";
@@ -19,7 +23,7 @@ stdenv.mkDerivation rec {
     rev = "v${version}";
     fetchSubmodules = true;
     sha256 = if unfree
-      then "1illr51jpg5g6nx29rav9dllyy5lzyyn7lj2fhrnpz1ysqgaq5p8"
+      then "16yn7y9xdc5jd50cq7bmsm320gv23pp71lr8hg2nmynzc8ibyda8"
       else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di";
   };
 

From 9408c29404ee55afe4773f2af19a337b22c6121c Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Tue, 18 Feb 2020 01:35:49 +0100
Subject: [PATCH 0962/4636] mint: 0.5.0 -> 0.7.1

This also fixes the build with the latest crystal version
---
 pkgs/development/compilers/mint/default.nix |  8 ++++----
 pkgs/development/compilers/mint/shards.nix  | 14 ++++++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix
index 5f72bd3649b1..78cce113e9b4 100644
--- a/pkgs/development/compilers/mint/default.nix
+++ b/pkgs/development/compilers/mint/default.nix
@@ -1,15 +1,15 @@
-{ lib, fetchFromGitHub, crystal, zlib, openssl_1_0_2, duktape, which, libyaml }:
+{ lib, fetchFromGitHub, crystal, zlib, openssl, duktape, which, libyaml }:
 crystal.buildCrystalPackage rec {
-  version = "0.5.0";
+  version = "0.7.1";
   pname = "mint";
   src = fetchFromGitHub {
     owner = "mint-lang";
     repo = "mint";
     rev = version;
-    sha256 = "0vxbx38c390rd2ysvbwgh89v2232sh5rbsp3nk9wzb70jybpslvl";
+    sha256 = "18cg96kl4dn89bj6fm3080zzyd1r7rsfi17agdjjayd2v9fgs95l";
   };
 
-  buildInputs = [ openssl_1_0_2 ];
+  buildInputs = [ openssl ];
 
   # Update with
   #   nix-shell -p crystal2nix --run crystal2nix
diff --git a/pkgs/development/compilers/mint/shards.nix b/pkgs/development/compilers/mint/shards.nix
index dc6866e3af3d..b3583ac2cbaa 100644
--- a/pkgs/development/compilers/mint/shards.nix
+++ b/pkgs/development/compilers/mint/shards.nix
@@ -8,8 +8,8 @@
   ameba = {
     owner = "veelenga";
     repo = "ameba";
-    rev = "v0.9.1";
-    sha256 = "05q2ki9dpg23pllalv5p27f1m287kiicp97ziz0z7vv0vg1r8smj";
+    rev = "v0.10.1";
+    sha256 = "0dcw7px7g0c5pxpdlirhirqzhcc7gdwdfiwb9kgm4x1k74ghjgxq";
   };
   baked_file_system = {
     owner = "schovi";
@@ -26,8 +26,8 @@
   dotenv = {
     owner = "gdotdesign";
     repo = "cr-dotenv";
-    rev = "v0.2.0";
-    sha256 = "0zi2y1j2546xjhdzn7icmry0cjv82cx2cqmpgx5ml37c2pnb7kp7";
+    rev = "v0.3.1";
+    sha256 = "1xp7c3g8dj1hqk2b885qr4y0s8661gpp9q28lv6rhr0ckllc6zgz";
   };
   exception_page = {
     owner = "crystal-loot";
@@ -47,6 +47,12 @@
     rev = "v0.4.0";
     sha256 = "1w9ib6j4xhwxdxx58nzc06gw7ci7vga03vgj1z1bnklamb0b0l0k";
   };
+  markd = {
+    owner = "icyleaf";
+    repo = "markd";
+    rev = "v0.2.0";
+    sha256 = "0n27fndd77mlkgw1r4pf0sa8fz4gwsh7dpnjck95c0ml91cr8j1a";
+  };
   radix = {
     owner = "luislavena";
     repo = "radix";

From 50593c6f1eb93c0404fae1bd4d0a740c92bc2da1 Mon Sep 17 00:00:00 2001
From: Rakesh Gupta <rakeshgupta4u@gmail.com>
Date: Tue, 18 Feb 2020 12:55:03 +0530
Subject: [PATCH 0963/4636] Added additional dependency boto3, needed for s3
 cache support

---
 pkgs/applications/misc/mapproxy/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/mapproxy/default.nix b/pkgs/applications/misc/mapproxy/default.nix
index efdfbaadd3da..e5826c09d77d 100644
--- a/pkgs/applications/misc/mapproxy/default.nix
+++ b/pkgs/applications/misc/mapproxy/default.nix
@@ -38,6 +38,7 @@ buildPythonApplication rec {
     substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv"
   '';
   propagatedBuildInputs = [
+    boto3 # needed for caches service
     pillow
     pyyaml
     pyproj

From 327c4b7ea60975af35c31dd0dcb428dfe62a00d8 Mon Sep 17 00:00:00 2001
From: MetaDark <kira.bruneau@gmail.com>
Date: Mon, 17 Feb 2020 14:02:43 -0500
Subject: [PATCH 0964/4636] protontricks: 1.4 -> 1.4.1

---
 pkgs/tools/package-management/protontricks/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix
index 2b7fbd28c7ef..c2bdf327124d 100644
--- a/pkgs/tools/package-management/protontricks/default.nix
+++ b/pkgs/tools/package-management/protontricks/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonApplication rec {
   pname = "protontricks";
-  version = "1.4";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "Matoking";
     repo = pname;
     rev = version;
-    sha256 = "1aarx6g8ykw1jvygfngmz8apdvfj26rcq10bwl228612kwigh7s2";
+    sha256 = "083ncg6yjd7s3dx91zd52w166x709mnxknwwr78ggka8d8vlyi0b";
   };
 
   # Fix interpreter in mock run.sh for tests

From eb2ab1861494302e749ddd31f4622e2f0517c921 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Tue, 18 Feb 2020 08:53:48 +0100
Subject: [PATCH 0965/4636] milkytracker: set cmake sdl variable to fix build

ZHF: #80379
---
 pkgs/applications/audio/milkytracker/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix
index 7f86e2c20716..bc508f92e3b5 100644
--- a/pkgs/applications/audio/milkytracker/default.nix
+++ b/pkgs/applications/audio/milkytracker/default.nix
@@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ SDL2 alsaLib libjack2 lhasa perl rtmidi zlib zziplib ];
 
+  # Somehow this does not get set automatically
+  cmakeFlags = [ "-DSDL2MAIN_LIBRARY=${SDL2}/lib/libSDL2.so" ];
+
   meta = with stdenv.lib; {
     description = "Music tracker application, similar to Fasttracker II";
     homepage = http://milkytracker.org;

From 53e2a85f85e58a9285a916f8cb91d0eab5203e92 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 18 Feb 2020 04:20:00 -0500
Subject: [PATCH 0966/4636] flexget: 3.1.21 -> 3.1.26

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

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index a509d9be3294..4361679fc884 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "FlexGet";
-  version = "3.1.21";
+  version = "3.1.26";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "ea2c9225bbf565215fc97eed97e718f426b4b7b3c8628bbd8edcc96e7bfe7e4e";
+    sha256 = "0bd8ccc9ae8e9fd9d5aa4f61a1a5d8b62ff30257fc0f5b2ec61b2f4b26275eee";
   };
 
   postPatch = ''

From 2bbe49f4c28f80510aad92097ad415904c5db659 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 18 Feb 2020 04:20:00 -0500
Subject: [PATCH 0967/4636] postgresqlPackages.cstore_fdw: 1.6.2 -> 1.7.0

---
 pkgs/servers/sql/postgresql/ext/cstore_fdw.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
index 8e30683737db..8bd50c3974c8 100644
--- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
+++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "cstore_fdw";
-  version = "1.6.2";
+  version = "1.7.0";
 
   nativeBuildInputs = [ protobufc ];
   buildInputs = [ postgresql ];
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     owner  = "citusdata";
     repo   = "cstore_fdw";
     rev    = "refs/tags/v${version}";
-    sha256 = "0kdmzpbhhjdg4p6i5963h7qbs88jzgpqc52gz450h7hwb9ckpv74";
+    sha256 = "129mpq8rq16jg7idh6c1j6nij64iywrs7wl3cn02bdb3h8f19z1b";
   };
 
   installPhase = ''

From e86619f273d5f3363ae59f6b5beb728da4d1db80 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 18 Feb 2020 04:20:00 -0500
Subject: [PATCH 0968/4636] postgresqlPackages.pg_auto_failover: 1.0.5 -> 1.0.6

---
 pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
index 5946b8f5ec32..c872e8bf95d2 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pg_auto_failover";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchFromGitHub {
     owner = "citusdata";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1idlgqazr2qra5x702f2yjcl99zwm1i5fi84paplfy98i5jjmxm1";
+    sha256 = "0fli8wxi5f3vyn9cjjqi0a2z4i9npx4nqndx2lqzzx95khqqknp1";
   };
 
   buildInputs = [ postgresql openssl zlib readline ];

From 5bd7c81ae7064a79aa734c6640d070420da46a75 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 18 Feb 2020 04:20:00 -0500
Subject: [PATCH 0969/4636] wal-g: 0.2.0 -> 0.2.14

---
 pkgs/tools/backup/wal-g/default.nix |  20 +-
 pkgs/tools/backup/wal-g/deps.nix    | 588 ++++++++++++++++++++++++++++
 2 files changed, 603 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/tools/backup/wal-g/deps.nix

diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix
index c6c47ce4f16c..90ce2d188d6e 100644
--- a/pkgs/tools/backup/wal-g/default.nix
+++ b/pkgs/tools/backup/wal-g/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "wal-g";
-  version = "0.2.0";
+  version = "0.2.14";
 
   src = fetchFromGitHub {
     owner  = "wal-g";
     repo   = "wal-g";
     rev    = "v${version}";
-    sha256 = "08lk7by1anxpd9v97xbf9443kk4n1w63zaar2nz86w8i3k3b4id9";
+    sha256 = "0rrn9kzcg3nw9qvzy58m4qacghv0pj7iyjh4yspc71n5nkamkfgm";
   };
 
   buildInputs = [ brotli ];
@@ -16,11 +16,21 @@ buildGoPackage rec {
   doCheck = true;
 
   goPackagePath = "github.com/wal-g/wal-g";
+
+  goDeps = ./deps.nix;
+
+  subPackages = [ "main/pg" ];
+
+  buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/cmd/pg.WalgVersion=${version} -X ${goPackagePath}/cmd/pg.GitRevision=${src.rev}" ];
+
+  postInstall = ''
+    mv $bin/bin/pg $bin/bin/wal-g
+  '';
+
   meta = {
-    inherit (src.meta) homepage;
+    homepage = "https://github.com/wal-g/wal-g";
     license = stdenv.lib.licenses.asl20;
-    description = "An archival restoration tool for Postgres";
+    description = "An archival restoration tool for PostgreSQL";
     maintainers = [ stdenv.lib.maintainers.ocharles ];
-    broken = true;
   };
 }
diff --git a/pkgs/tools/backup/wal-g/deps.nix b/pkgs/tools/backup/wal-g/deps.nix
new file mode 100644
index 000000000000..13daf375c31a
--- /dev/null
+++ b/pkgs/tools/backup/wal-g/deps.nix
@@ -0,0 +1,588 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+  {
+    goPackagePath  = "cloud.google.com/go";
+    fetch = {
+      type = "git";
+      url = "https://code.googlesource.com/gocloud";
+      rev =  "0ebda48a7f143b1cce9eb37a8c1106ac762a3430";
+      sha256 = "1kclgclwar3r37zbvb9gg3qxbgzkb50zk3s9778zlh2773qikmai";
+    };
+  }
+  {
+    goPackagePath  = "github.com/Azure/azure-pipeline-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Azure/azure-pipeline-go";
+      rev =  "232aee85e8e3a6223a11c0943f7df2ae0fac00e4";
+      sha256 = "1agn2nzmm1dkwggm4w7h4bnrav4n5jrl0vqbqy2s49vqlr8zirn6";
+    };
+  }
+  {
+    goPackagePath  = "github.com/Azure/azure-storage-blob-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Azure/azure-storage-blob-go";
+      rev =  "fc700035fe4a7020f50d49f420b3c088aed57e03";
+      sha256 = "00gsnk9s1rlrakqvcm917hn4r47jannxwp7rkhrb71pamzm46752";
+    };
+  }
+  {
+    goPackagePath  = "github.com/BurntSushi/toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/BurntSushi/toml";
+      rev =  "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005";
+      sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
+    };
+  }
+  {
+    goPackagePath  = "github.com/DataDog/zstd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/DataDog/zstd";
+      rev =  "aebefd9fcb99f22cd691ef778a12ed68f0e6a1ab";
+      sha256 = "06wphl43ji23c0cmmm6fd3wszbwq36mdp1jarak2a6hmxl6yf0b8";
+    };
+  }
+  {
+    goPackagePath  = "github.com/RoaringBitmap/roaring";
+    fetch = {
+      type = "git";
+      url = "https://github.com/RoaringBitmap/roaring";
+      rev =  "3d677d3262197ee558b85029301eb69b8239f91a";
+      sha256 = "0v5jbqr7m4x7n8rxcyizhs21ndyinn8kil9hd6y2bifx9b9g6gv9";
+    };
+  }
+  {
+    goPackagePath  = "github.com/aws/aws-sdk-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/aws/aws-sdk-go";
+      rev =  "02973e4916ed10f78aff1257f45f01d23907a05d";
+      sha256 = "0w5c06l0f8h77p74gmsp2wzl21pcn92yzsycd36746qqav83yyld";
+    };
+  }
+  {
+    goPackagePath  = "github.com/cyberdelia/lzo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cyberdelia/lzo";
+      rev =  "feb520148d8940294afb1e242dc1d2a7c9c34432";
+      sha256 = "0mk93b7vr9hp1xcvzaw5r01zs2blhk24m22pacf6sx5zwx8fd2ld";
+    };
+  }
+  {
+    goPackagePath  = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev =  "8991bc29aa16c548c550c7ff78260e27b9ab7c73";
+      sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+    };
+  }
+  {
+    goPackagePath  = "github.com/fsnotify/fsnotify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fsnotify/fsnotify";
+      rev =  "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
+      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+    };
+  }
+  {
+    goPackagePath  = "github.com/glycerine/go-unsnap-stream";
+    fetch = {
+      type = "git";
+      url = "https://github.com/glycerine/go-unsnap-stream";
+      rev =  "9f0cb55181dd3a0a4c168d3dbc72d4aca4853126";
+      sha256 = "1v10z30y9qc8dl34x0s8lr773g6raxilfdxbmzd1176pspzcmm9n";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-redis/redis";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-redis/redis";
+      rev =  "75795aa4236dc7341eefac3bbe945e68c99ef9df";
+      sha256 = "1qf7zl5slnc4bcz0z0vn4fq1pwkphdrmqmjg3wv5q6pv2x29drli";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-sql-driver/mysql";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-sql-driver/mysql";
+      rev =  "72cd26f257d44c1114970e19afddcd812016007e";
+      sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang/mock";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/mock";
+      rev =  "51421b967af1f557f93a59e0057aaf15ca02e29c";
+      sha256 = "12ddj2g8ab87id6n2n67vnbhq6p8dvgsq1pzpqfriym4dk8w54fg";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev =  "6c65a5562fc06764971b7c5d05c76c75e84bdbf7";
+      sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
+    };
+  }
+  {
+    goPackagePath  = "github.com/golang/snappy";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/snappy";
+      rev =  "2e65f85255dbc3072edf28d6b5b8efc472979f5a";
+      sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf";
+    };
+  }
+  {
+    goPackagePath  = "github.com/google/brotli";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/brotli";
+      rev =  "d6d98957ca8ccb1ef45922e978bb10efca0ea541";
+      sha256 = "0n0ia2sxsj3fnnzhjbigbadpsqxivjs3v78b1xzqvgd1nwalglaj";
+    };
+  }
+  {
+    goPackagePath  = "github.com/googleapis/gax-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/googleapis/gax-go";
+      rev =  "bd5b16380fd03dc758d11cef74ba2e3bc8b0e8c2";
+      sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx";
+    };
+  }
+  {
+    goPackagePath  = "github.com/hashicorp/golang-lru";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/golang-lru";
+      rev =  "7f827b33c0f158ec5dfbba01bb0b14a4541fd81d";
+      sha256 = "1p2igd58xkm8yaj2c2wxiplkf2hj6kxwrg6ss7mx61s5rd71v5xb";
+    };
+  }
+  {
+    goPackagePath  = "github.com/hashicorp/hcl";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/hcl";
+      rev =  "8cb6e5b959231cc1119e43259c4a608f9c51a241";
+      sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66";
+    };
+  }
+  {
+    goPackagePath  = "github.com/inconshreveable/mousetrap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/inconshreveable/mousetrap";
+      rev =  "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
+      sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+    };
+  }
+  {
+    goPackagePath  = "github.com/jackc/pgx";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jackc/pgx";
+      rev =  "c73e7d75061bb42b0282945710f344cfe1113d10";
+      sha256 = "1am1iggch89mn4a99bxnawjhc5yrgd8fjlmzq0b9l9qy5w1gzr1f";
+    };
+  }
+  {
+    goPackagePath  = "github.com/jedib0t/go-pretty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jedib0t/go-pretty";
+      rev =  "a37e1e030434d93557ca8a6a77b4cf9d31cc21ff";
+      sha256 = "057xwrrqq0cvyq9f0wnfzjpx10807520vl92qq7l7a7s0r56jyrx";
+    };
+  }
+  {
+    goPackagePath  = "github.com/jmespath/go-jmespath";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jmespath/go-jmespath";
+      rev =  "c2b33e84";
+      sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz";
+    };
+  }
+  {
+    goPackagePath  = "github.com/magiconair/properties";
+    fetch = {
+      type = "git";
+      url = "https://github.com/magiconair/properties";
+      rev =  "c2353362d570a7bfa228149c62842019201cfb71";
+      sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-ieproxy";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-ieproxy";
+      rev =  "f9202b1cfdeb0c82ddd3dc1e8e9cd94b3c0c1b13";
+      sha256 = "0r8c17znlv32750qy3p96fbyp8ys8xfdccpzv0z9lr2y88jnzhpz";
+    };
+  }
+  {
+    goPackagePath  = "github.com/minio/sio";
+    fetch = {
+      type = "git";
+      url = "https://github.com/minio/sio";
+      rev =  "035b4ef8c449ba2ba21ec143c91964e76a1fb68c";
+      sha256 = "007mh7a61qzgf8ga4pix6qhm6jbph3h71a8iif7l45mvqphabh0z";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mitchellh/mapstructure";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/mapstructure";
+      rev =  "3536a929edddb9a5b34bd6861dc4a9647cb459fe";
+      sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mschoch/smat";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mschoch/smat";
+      rev =  "90eadee771aeab36e8bf796039b8c261bebebe4f";
+      sha256 = "141saq6d4z3c7v3jw45zy4gn6wwjlyralqygjff1fzvz1gkvimk3";
+    };
+  }
+  {
+    goPackagePath  = "github.com/ncw/swift";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ncw/swift";
+      rev =  "f737f4e00462f79ff2e0ddbcfb09331ce7ec4fa9";
+      sha256 = "0c6vcn3dmhh339wilh71fmjb535kgfkf9dh2dh8ln43whq6mbjbs";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pelletier/go-toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pelletier/go-toml";
+      rev =  "c01d1270ff3e442a8a57cddc1c92dc1138598194";
+      sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
+    };
+  }
+  {
+    goPackagePath  = "github.com/philhofer/fwd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/philhofer/fwd";
+      rev =  "bb6d471dc95d4fe11e432687f8b70ff496cf3136";
+      sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pierrec/lz4";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pierrec/lz4";
+      rev =  "5a3d2245f97fc249850e7802e3c01fad02a1c316";
+      sha256 = "1my03x0m72vc2xyy9h0naa1qrzcf0g531gh4cakcwpxrq0z39vmr";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pierrec/xxHash";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pierrec/xxHash";
+      rev =  "d17cb990ad2d219d5901415ceaeb50d17df59527";
+      sha256 = "07rbr0apyq9m8m2knf1j7g9299r2v2ihvig1b7bq2srszcd9r221";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev =  "ba968bfe8b2f7e042a574c888954fccecfa385b4";
+      sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev =  "792786c7400a136282c1664665ae0a8db921c6c2";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/afero";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/afero";
+      rev =  "f4711e4db9e9a1d3887343acb72b2bbfc2f686f5";
+      sha256 = "14qqj0cz6a595vn4dp747vddx05fd77jdsyl85qjmf9baymaxlam";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/cast";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cast";
+      rev =  "8c9545af88b134710ab1cd196795e7f2388358d7";
+      sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/cobra";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cobra";
+      rev =  "ef82de70bb3f60c65fb8eebacbb2d122ef517385";
+      sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/jwalterweatherman";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/jwalterweatherman";
+      rev =  "94f6ae3ed3bceceafa716478c5fbf8d29ca601a1";
+      sha256 = "1ywmkwci5zyd88ijym6f30fj5c0k2yayxarkmnazf5ybljv50q7b";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag";
+      rev =  "298182f68c66c05229eb03ac171abe6e309ee79a";
+      sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd";
+    };
+  }
+  {
+    goPackagePath  = "github.com/spf13/viper";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/viper";
+      rev =  "6d33b5a963d922d182c91e8a1c88d81fd150cfd4";
+      sha256 = "1190mg04718r03qriav99sf4kx2n7wdgr8vdni15f74bpbzrdjrl";
+    };
+  }
+  {
+    goPackagePath  = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev =  "221dbe5ed46703ee255b1da0dec05086f5035f62";
+      sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb";
+    };
+  }
+  {
+    goPackagePath  = "github.com/tinsane/tracelog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tinsane/tracelog";
+      rev =  "05cb843fbac1d7693bbbbed8aa8f7b401438ee7f";
+      sha256 = "1fry633qi4iih9za91m90c26p3qpd79d716dggk10cbc0bpvql51";
+    };
+  }
+  {
+    goPackagePath  = "github.com/tinylib/msgp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tinylib/msgp";
+      rev =  "b2b6a672cf1e5b90748f79b8b81fc8c5cf0571a1";
+      sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc";
+    };
+  }
+  {
+    goPackagePath  = "github.com/ulikunitz/xz";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ulikunitz/xz";
+      rev =  "590df8077fbcb06ad62d7714da06c00e5dd2316d";
+      sha256 = "07mivr4aiw3b8qzwajsxyjlpbkf3my4xx23lv0yryc4pciam5lhy";
+    };
+  }
+  {
+    goPackagePath  = "github.com/wal-g/storages";
+    fetch = {
+      type = "git";
+      url = "https://github.com/wal-g/storages";
+      rev =  "ecd376af8972cd9c3e355831c126a7862de6b2b9";
+      sha256 = "1jmvin93811xxh9sqf6xrrys55dm12zszqf2l3arf92h0bysvniy";
+    };
+  }
+  {
+    goPackagePath  = "github.com/willf/bitset";
+    fetch = {
+      type = "git";
+      url = "https://github.com/willf/bitset";
+      rev =  "e553b05586428962bf7058d1044519d87ca72d74";
+      sha256 = "0davmxzv79qqg7lkj89diqinqx3xkr94d67yfnazqn3h1f7sjkd1";
+    };
+  }
+  {
+    goPackagePath  = "go.opencensus.io";
+    fetch = {
+      type = "git";
+      url = "https://github.com/census-instrumentation/opencensus-go";
+      rev =  "9c377598961b706d1542bd2d84d538b5094d596e";
+      sha256 = "05jr8gkr2w34i5wwki4zhl5ch0qrgi7cdgag5iy5gpxplhbrvbg9";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev =  "e657309f52e71501f9934566ac06dc5c2f7f11a1";
+      sha256 = "17jwkjrfj7kz25z8z492xlz88nmb42kpjcxl9dsv5jl28zvzq1bj";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/exp";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/exp";
+      rev =  "ec7cb31e5a562f5e9e31b300128d2f530f55d127";
+      sha256 = "19b4kdwfahq9f809v4lmn9h47sq1y67nkl7csnracn5qd334hp06";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/lint";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/lint";
+      rev =  "959b441ac422379a43da2230f62be024250818b0";
+      sha256 = "1mgcv5f00pkzsbwnq2y7vqvd1b4lr5a3s47cphh2qv4indfk7pck";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev =  "74dc4d7220e7acc4e100824340f3e66577424772";
+      sha256 = "0563yswwqknxx2gsvl0qikn0lmwalilbng8i12iw4d3v40n23s0l";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/oauth2";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/oauth2";
+      rev =  "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33";
+      sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/sync";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sync";
+      rev =  "42b317875d0fa942474b76e1b46a6060d720ae6e";
+      sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev =  "4d1cda033e0619309c606fc686de3adcf599539e";
+      sha256 = "1wgaldbnkmh568v8kkgvnmkskaj96fqrbzhx23yji2kh1432q6gh";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev =  "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
+      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/time";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/time";
+      rev =  "85acf8d2951cb2a3bde7632f9ff273ef0379bcbd";
+      sha256 = "0yqnxsrarjk4qkda8kcxzmk7y90kkkxzx9iwryzrk7bzs87ky3xc";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev =  "fc82fb2afd64396b05ea9aa0bccd6e8f2257b154";
+      sha256 = "1rnpbhhcnv28k63m7biv2rxrmdxhz9q3p35qi0phcq2qhcf78032";
+    };
+  }
+  {
+    goPackagePath  = "google.golang.org/api";
+    fetch = {
+      type = "git";
+      url = "https://code.googlesource.com/google-api-go-client";
+      rev =  "feb0267beb8644f5088a03be4d5ec3f8c7020152";
+      sha256 = "1lzdzkd2i41v6amxs9jah1q44qbvf1yvm8906jpfjiq6c3ffhqss";
+    };
+  }
+  {
+    goPackagePath  = "google.golang.org/appengine";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/appengine";
+      rev =  "4a4468ece617fc8205e99368fa2200e9d1fad421";
+      sha256 = "13cyhqwmvc2nia4ssdwwdzscq52aj3z9zjikx17wk4kb0j8vr370";
+    };
+  }
+  {
+    goPackagePath  = "google.golang.org/genproto";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-genproto";
+      rev =  "24fa4b261c55da65468f2abfdae2b024eef27dfb";
+      sha256 = "109zhaqlfd8zkbr1hk6zqbs6vcxfrk64scjwh2nswph05gr0m84d";
+    };
+  }
+  {
+    goPackagePath  = "google.golang.org/grpc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/grpc/grpc-go";
+      rev =  "6eaf6f47437a6b4e2153a190160ef39a92c7eceb";
+      sha256 = "1cn33r2gclmq2v1ndpf1n5bmhf2qs8mms7ii5cnl6f9ch4r2c4k3";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-yaml/yaml";
+      rev =  "51d6538a90f86fe93ac480b35f37b2be17fef232";
+      sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
+    };
+  }
+  {
+    goPackagePath  = "honnef.co/go/tools";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dominikh/go-tools";
+      rev =  "72554cb117ad340748b3093e7108983fd984c9f2";
+      sha256 = "1vndpwg797z2gw9h9378iq99aqy7nalqx82lgvcsaqnkypdmppnd";
+    };
+  }
+]
\ No newline at end of file

From f5956774188194c8f5b5acbfe4392f91ece6a593 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 18 Feb 2020 10:19:44 +0100
Subject: [PATCH 0970/4636] efibootmgr: fixup build on i686

Same as efivar; I believe it doesn't really needs LTO.  I checked:
nix build -f nixos/release-combined.nix nixos.iso_minimal.i686-linux
---
 pkgs/tools/system/efibootmgr/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix
index 272809e486c1..a24873248497 100644
--- a/pkgs/tools/system/efibootmgr/default.nix
+++ b/pkgs/tools/system/efibootmgr/default.nix
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
       sha256 = "1sbijvlpv4khkix3vix9mbhzffj8lp8zpnbxm9gnzjz8yssz9p5h";
     })
   ];
+  # We have no LTO here since commit 22284b07.
+  postPatch = if stdenv.isi686 then "sed '/^CFLAGS/s/-flto//' -i Make.defaults" else null;
 
   makeFlags = [ "EFIDIR=nixos" ];
 

From 329102c47bd1c68f0acdf4feec64232202948c7a Mon Sep 17 00:00:00 2001
From: Danylo Hlynskyi <abcz2.uprola@gmail.com>
Date: Tue, 18 Feb 2020 09:06:56 +0200
Subject: [PATCH 0971/4636] Merge #80328: postgresql: minor updates (security)

Forward-picked from merge 036c524a2e in staging to master,
as upstream claims it fixes CVE-2020-1720.
https://www.postgresql.org/about/news/2011/
---
 pkgs/servers/sql/postgresql/default.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 890ac2d37779..b9cd50aa5fe0 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -183,41 +183,41 @@ let
 in self: {
 
   postgresql_9_5 = self.callPackage generic {
-    version = "9.5.20";
+    version = "9.5.21";
     psqlSchema = "9.5";
-    sha256 = "03fygn3nn6l6ar66sldy5akdg1gynny3yxbrpvmmp5ygfnrm2mwj";
+    sha256 = "0b3kzc0431bvp55jns42q9h1119gy075mp4aywnkq93pm17nxdby";
     this = self.postgresql_9_5;
     inherit self;
   };
 
   postgresql_9_6 = self.callPackage generic {
-    version = "9.6.16";
+    version = "9.6.17";
     psqlSchema = "9.6";
-    sha256 = "1rr2dgv4ams8r2lp13w85c77rkmzpb88fjlc28mvlw6zq2fblv2w";
+    sha256 = "1hm0w6n988n9qn2wylhjq02i5ayzb16rzhgkcv09fpsl68ny7qgn";
     this = self.postgresql_9_6;
     inherit self;
   };
 
   postgresql_10 = self.callPackage generic {
-    version = "10.11";
+    version = "10.12";
     psqlSchema = "10.0"; # should be 10, but changing it is invasive
-    sha256 = "02fcmvbh0mhplj3s2jd24s642ysx7bggnf0h8bs5amh7dgzi8p8d";
+    sha256 = "1rsab4zf4rx7pvvhlwhb04kb95aiad9cwazc4ksbvg2gij47z3rq";
     this = self.postgresql_10;
     inherit self;
   };
 
   postgresql_11 = self.callPackage generic {
-    version = "11.6";
+    version = "11.7";
     psqlSchema = "11.1"; # should be 11, but changing it is invasive
-    sha256 = "0w1iq488kpzfgfnlw4k32lz5by695mpnkq461jrgsr99z5zlz4j9";
+    sha256 = "04x343i4v0w4jf1v5ial8rwsizs1qhdjfbanbnibdys6i0xfjjij";
     this = self.postgresql_11;
     inherit self;
   };
 
   postgresql_12 = self.callPackage generic {
-    version = "12.1";
+    version = "12.2";
     psqlSchema = "12";
-    sha256 = "1vc3hjcbgkdfczc1ipkk02rahabn7fabpb7qs203jxpnpamz76x0";
+    sha256 = "1pmmd59pvfs50gsi728bw9f1jl59xghsjdanfimph0659x6cq7dd";
     this = self.postgresql_12;
     inherit self;
   };

From db688a8a42ceb7ca8dd89584126b3382eeb1a0a3 Mon Sep 17 00:00:00 2001
From: GRBurst <GRBurst@protonmail.com>
Date: Tue, 18 Feb 2020 11:13:08 +0100
Subject: [PATCH 0972/4636] update maintainer infos for myself

---
 maintainers/maintainer-list.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a8762be1143e..a9573c0a8a9a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2796,9 +2796,14 @@
     name = "Graham Christensen";
   };
   grburst = {
-    email = "grburst@openmailbox.org";
-    github = "grburst";
-    name = "Julius Elias";
+    email = "GRBurst@protonmail.com";
+    github = "GRBurst";
+    githubId = 4647221;
+    name = "GRBurst";
+    keys = [{
+      longkeyid = "rsa4096/0x797F623868CD00C2";
+      fingerprint = "7FC7 98AB 390E 1646 ED4D  8F1F 797F 6238 68CD 00C2";
+    }];
   };
   greydot = {
     email = "lanablack@amok.cc";

From 6637f1cac641bb21076afeb511172c9597c4d9f5 Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Tue, 18 Feb 2020 11:46:50 +0100
Subject: [PATCH 0973/4636] cargo-geiger: fix build with rust 1.41

---
 pkgs/development/tools/rust/cargo-geiger/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix
index 59e4402627cf..b6f3bb7af000 100644
--- a/pkgs/development/tools/rust/cargo-geiger/default.nix
+++ b/pkgs/development/tools/rust/cargo-geiger/default.nix
@@ -26,6 +26,12 @@ rustPlatform.buildRustPackage rec {
   # we might be able to run these with something like
   # `cargo insta review` in the `preCheck` phase.
   checkPhase = ''
+    cd cargo-geiger/tests/snapshots
+    for file in *
+    do
+      mv $file r#$file
+    done
+    cd -
     cargo test -- \
     --skip test_package::case_2 \
     --skip test_package::case_3 \

From 1f439a882661b0c47b305340db7471d72a9276fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= <hoe.dom@gmx.de>
Date: Tue, 18 Feb 2020 12:12:48 +0100
Subject: [PATCH 0974/4636] dbus-broker: 21 -> 22

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

diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix
index 5f5005d8b97d..b61d99cead10 100644
--- a/pkgs/os-specific/linux/dbus-broker/default.nix
+++ b/pkgs/os-specific/linux/dbus-broker/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dbus-broker";
-  version = "21";
+  version = "22";
 
   src = fetchFromGitHub {
     owner  = "bus1";
     repo   = "dbus-broker";
     rev    = "v${version}";
-    sha256 = "14lgjv0gxvfa1h5hsarh9nwpxns6jb2861nd7mcanpkm2jlxh5vm";
+    sha256 = "0vxr73afix5wjxy8g4cckwhl242rrlazm52673iwmdyfz5nskj2x";
     fetchSubmodules = true;
   };
 

From 03d69128b233c4bab40cc85daa326ad1657d18e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 18 Feb 2020 12:17:45 +0100
Subject: [PATCH 0975/4636] nettle: runtime selection of HW-accelerated code

> Include multiple versions of certain functions in the library,
> and select the ones to use at run-time, depending on available
> processor features. Supported for ARM and x86_64.

The current version seems to accelerate AES and SHA families.

Size increase on x86_64 is <10k in our case.

It can make quite some performance difference; I tried
$ time ./result-dev/bin/nettle-hash -a sha256 /some/file/around/2G
And the total CPU time went down from 8.5s to 2s (single thread).
Now it matches the time of openssl
$ time openssl sha256 /some/file/around/2G
Of course, in real life it will be much harder to notice a difference...

Platforms without support for this (e.g. i686) seem to still build fine,
and ARMv7 cross-build also succeeds for me, so hopefully all is OK.
---
 pkgs/development/libraries/nettle/generic.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix
index 064ef3443980..9939cbf60679 100644
--- a/pkgs/development/libraries/nettle/generic.nix
+++ b/pkgs/development/libraries/nettle/generic.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation ({
   nativeBuildInputs = [ gnum4 ];
   propagatedBuildInputs = [ gmp ];
 
+  configureFlags = [ "--enable-fat" ]; # runtime selection of HW-accelerated code
+
   doCheck = (stdenv.hostPlatform.system != "i686-cygwin" && !stdenv.isDarwin);
 
   enableParallelBuilding = true;

From c058060402b50028c25767385d2804808e6e03e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-=C3=89tienne=20Meunier?= <pe@pijul.org>
Date: Tue, 18 Feb 2020 11:54:23 +0000
Subject: [PATCH 0976/4636] nodePackages.webpack-dev-server: init at 3.10.3

---
 .../node-packages/node-packages-v10.json      |    2 +
 .../node-packages/node-packages-v10.nix       | 3164 +++++++++++------
 .../node-packages/node-packages-v12.nix       |   55 +-
 .../node-packages/node-packages-v13.nix       |   43 +-
 4 files changed, 2118 insertions(+), 1146 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json
index d5f7b95ab978..cbae97149d36 100644
--- a/pkgs/development/node-packages/node-packages-v10.json
+++ b/pkgs/development/node-packages/node-packages-v10.json
@@ -158,6 +158,8 @@
 , "web-ext"
 , "webpack"
 , "webpack-cli"
+, "webpack-dev-server"
+, "copy-webpack-plugin"
 , "webtorrent-cli"
 , "wring"
 , "write-good"
diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
index c97f9d7ab49b..5497679f4f67 100644
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -22,31 +22,31 @@ let
         sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ==";
       };
     };
-    "@angular-devkit/architect-0.900.1" = {
+    "@angular-devkit/architect-0.900.2" = {
       name = "_at_angular-devkit_slash_architect";
       packageName = "@angular-devkit/architect";
-      version = "0.900.1";
+      version = "0.900.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.900.1.tgz";
-        sha512 = "zzB3J0fXFoYeJpgF5tsmZ7byygzjJn1IPiXBdnbNqcMbil1OPOhq+KdD4ZFPyXNwBQ3w02kOwPdNqB++jbPmlQ==";
+        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.900.2.tgz";
+        sha512 = "uClqp4QEY/m6CB7SsNZGdVNTEgMzkI1Fkt0TOdE9huN1iCi/0+h3nQb+NZ1vBqD2afg9EqDwIPu2KCU0p1BR2A==";
       };
     };
-    "@angular-devkit/core-9.0.1" = {
+    "@angular-devkit/core-9.0.2" = {
       name = "_at_angular-devkit_slash_core";
       packageName = "@angular-devkit/core";
-      version = "9.0.1";
+      version = "9.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.0.1.tgz";
-        sha512 = "HboJI/x+SJD9clSOAMjHRv0eXAGRAdEaqJGmjDfdFMP2wznfsBiC6cgcHC17oM4jRWFhmWMR8Omc7CjLZJawJg==";
+        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.0.2.tgz";
+        sha512 = "lEmfYs7+oHmXEQ3y97QGm73zs7i6chpx+ZSaBUvMM9oCKj/lytcn+diVG+t4hMavH6TK0lai7DO1rAbYkbmdrA==";
       };
     };
-    "@angular-devkit/schematics-9.0.1" = {
+    "@angular-devkit/schematics-9.0.2" = {
       name = "_at_angular-devkit_slash_schematics";
       packageName = "@angular-devkit/schematics";
-      version = "9.0.1";
+      version = "9.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.0.1.tgz";
-        sha512 = "Cuub9eJm1TWygKTOowRbxMASA8QWeHWzNEU2V3TqUF1Tqy/iPf4cpuMijkFysXjTn2bi2HA9t26AwQkwymbliA==";
+        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.0.2.tgz";
+        sha512 = "+MiSBWErz8hxcbyHioCQtTnFpbqaoCEQEknK0vCb15fFEY2Hi3u2TXK59QNKsqn8w+Mye5dHYhwmpsAC8Wcgtw==";
       };
     };
     "@antora/asciidoc-loader-2.2.0" = {
@@ -157,13 +157,13 @@ let
         sha512 = "3d6SqtknM3PiLRw2wLtcMVVfmyHtfNuWo8+ZBRmUrZs8HfhGteV8/s4vpiOJZmLYhW4KLFgIgG09lFdD5t78Ow==";
       };
     };
-    "@apollo/federation-0.11.3" = {
+    "@apollo/federation-0.12.0" = {
       name = "_at_apollo_slash_federation";
       packageName = "@apollo/federation";
-      version = "0.11.3";
+      version = "0.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.11.3.tgz";
-        sha512 = "6KK9noDoWXujIgmp7RHcA9quQTByM8b4saxmujeO4RnZmMQq4bcpN8AJAykulE1x3DuHqeUbLNl3s7gGlEhOWw==";
+        url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.12.0.tgz";
+        sha512 = "jJb4CzJDLWghkVkhQE5go9XvekQZgL8MsHAGWHzrgHXfUNHZhAjkxODH0duPEq2WunGSp6rSu4rerW1cC89JvA==";
       };
     };
     "@apollo/protobufjs-1.0.3" = {
@@ -1111,13 +1111,13 @@ let
         sha512 = "neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==";
       };
     };
-    "@babel/runtime-corejs2-7.8.4" = {
-      name = "_at_babel_slash_runtime-corejs2";
-      packageName = "@babel/runtime-corejs2";
+    "@babel/runtime-corejs3-7.8.4" = {
+      name = "_at_babel_slash_runtime-corejs3";
+      packageName = "@babel/runtime-corejs3";
       version = "7.8.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.8.4.tgz";
-        sha512 = "7jU2FgNqNHX6yTuU/Dr/vH5/O8eVL9U85MG5aDw1LzGfCvvhXC1shdXfVzCQDsoY967yrAKeLujRv7l8BU+dZA==";
+        url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.8.4.tgz";
+        sha512 = "+wpLqy5+fbQhvbllvlJEVRIpYj+COUWnnsm+I4jZlA8Lo7/MJmBhGTCHyk1/RWfOqBRJ2MbadddG6QltTKTlrg==";
       };
     };
     "@babel/template-7.8.3" = {
@@ -2137,13 +2137,13 @@ let
         sha512 = "6+iaCMh/JXJaB2QWikqvGE9//wLEVYYwZd5sud8aLoLKog1Q75naZh2vlGVtg5Mq/NqpqGQvdIjJb3Bm+64AUQ==";
       };
     };
-    "@oclif/config-1.13.3" = {
+    "@oclif/config-1.14.0" = {
       name = "_at_oclif_slash_config";
       packageName = "@oclif/config";
-      version = "1.13.3";
+      version = "1.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@oclif/config/-/config-1.13.3.tgz";
-        sha512 = "qs5XvGRw+1M41abOKCjd0uoeHCgsMxa2MurD2g2K8CtQlzlMXl0rW5idVeimIg5208LLuxkfzQo8TKAhhRCWLg==";
+        url = "https://registry.npmjs.org/@oclif/config/-/config-1.14.0.tgz";
+        sha512 = "KsOP/mx9lzTah+EtGqLUXN3PDL0J3zb9/dTneFyiUK2K6T7vFEGhV6OasmqTh4uMZHGYTGrNPV8x/Yw6qZNL6A==";
       };
     };
     "@oclif/errors-1.2.2" = {
@@ -2479,22 +2479,22 @@ let
         sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==";
       };
     };
-    "@schematics/angular-9.0.1" = {
+    "@schematics/angular-9.0.2" = {
       name = "_at_schematics_slash_angular";
       packageName = "@schematics/angular";
-      version = "9.0.1";
+      version = "9.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.0.1.tgz";
-        sha512 = "lQ8Qc697ef2jvEf1+tElAUsbOnbUAMo3dnOUVw9RlYO90pHeG3/OdWBMH1kjn3jbjuKuvCVZH3voJUUcLDx6eg==";
+        url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.0.2.tgz";
+        sha512 = "H6ZyxLYoIN68bbNKnUjBCPtB0fcwnpIyTkqXQHa3B4HITcU3uee4PLAl3xCkTS2NGv8m/0eWND9zt5wryGf8PQ==";
       };
     };
-    "@schematics/update-0.900.1" = {
+    "@schematics/update-0.900.2" = {
       name = "_at_schematics_slash_update";
       packageName = "@schematics/update";
-      version = "0.900.1";
+      version = "0.900.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/update/-/update-0.900.1.tgz";
-        sha512 = "p2xfctTtT5kMAaCTBENxi69m5IhsvdTwwwokb9zVHJYAC6D1K//q1bl30mTe6U2YE3hSPWND2S14ahXw8PyN8g==";
+        url = "https://registry.npmjs.org/@schematics/update/-/update-0.900.2.tgz";
+        sha512 = "CRDb2pax8DtSyO32b2D5uKlQZ+s5h9feD4oEMvm2zU7z/4wcoTNC0T9ols20aHYeNhKYD9FuMI3KQWlgMTPgbw==";
       };
     };
     "@serverless/cli-1.4.0" = {
@@ -2524,13 +2524,13 @@ let
         sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ==";
       };
     };
-    "@serverless/enterprise-plugin-3.3.0" = {
+    "@serverless/enterprise-plugin-3.4.0" = {
       name = "_at_serverless_slash_enterprise-plugin";
       packageName = "@serverless/enterprise-plugin";
-      version = "3.3.0";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.3.0.tgz";
-        sha512 = "hj0lkoi3uJsxVu8V2dkfVZL2HS7GNGW1N5Sa3SRKxnHrGKpErTZGEnIHzPp5dw7H2Q4lE8LD191O4JdTk7GE9A==";
+        url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.4.0.tgz";
+        sha512 = "QaJUQwtej6LsBlmPldPYNHOApjrHrpGvreVcXy2GBqr0hpPFy+o2xmSKek+NDjmpyzHraeHKb5DoKemTWUxsTg==";
       };
     };
     "@serverless/event-mocks-1.1.1" = {
@@ -3163,13 +3163,13 @@ let
         sha512 = "MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw==";
       };
     };
-    "@types/koa-2.11.0" = {
+    "@types/koa-2.11.1" = {
       name = "_at_types_slash_koa";
       packageName = "@types/koa";
-      version = "2.11.0";
+      version = "2.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.0.tgz";
-        sha512 = "Hgx/1/rVlJvqYBrdeCsS7PDiR2qbxlMt1RnmNWD4Uxi5FF9nwkYqIldo7urjc+dfNpk+2NRGcnAYd4L5xEhCcQ==";
+        url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.1.tgz";
+        sha512 = "/kqQs+8Qd9GL0cdl39HEhK91k7xq6+Zci76RUdqtTLj1Mg1aVG7zwJm3snkeyFUeAvY8noY27eMXgqg1wHZgwA==";
       };
     };
     "@types/koa-compose-3.2.5" = {
@@ -3226,22 +3226,22 @@ let
         sha1 = "69a23a3ad29caf0097f06eda59b361ee2f0639f6";
       };
     };
-    "@types/node-10.17.14" = {
+    "@types/node-10.17.15" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "10.17.14";
+      version = "10.17.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-10.17.14.tgz";
-        sha512 = "G0UmX5uKEmW+ZAhmZ6PLTQ5eu/VPaT+d/tdLd5IFsKRPcbe6lPxocBtcYBFSaLaCW8O60AX90e91Nsp8lVHCNw==";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.17.15.tgz";
+        sha512 = "daFGV9GSs6USfPgxceDA8nlSe48XrVCJfDeYm7eokxq/ye7iuOH87hKXgMtEAVLFapkczbZsx868PMDT1Y0a6A==";
       };
     };
-    "@types/node-13.7.0" = {
+    "@types/node-13.7.1" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "13.7.0";
+      version = "13.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-13.7.0.tgz";
-        sha512 = "GnZbirvmqZUzMgkFn70c74OQpTTUcCzlhQliTzYjQMqg+hVKcDnxdL19Ne3UdYzdMA/+W3eb646FWn/ZaT1NfQ==";
+        url = "https://registry.npmjs.org/@types/node/-/node-13.7.1.tgz";
+        sha512 = "Zq8gcQGmn4txQEJeiXo/KiLpon8TzAl0kmKH4zdWctPj05nWwp1ClMdAVEloqrQKfaC48PNLdgN/aVaLqUrluA==";
       };
     };
     "@types/node-6.14.9" = {
@@ -4252,13 +4252,13 @@ let
         sha512 = "7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==";
       };
     };
-    "acorn-walk-7.0.0" = {
+    "acorn-walk-7.1.1" = {
       name = "acorn-walk";
       packageName = "acorn-walk";
-      version = "7.0.0";
+      version = "7.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.0.0.tgz";
-        sha512 = "7Bv1We7ZGuU79zZbb6rRqcpxo3OY+zrdtloZWoyD8fmGX+FeXRjE+iuGkZjSXLVovLzrsvMGMy0EkwA0E0umxg==";
+        url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz";
+        sha512 = "wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==";
       };
     };
     "adbkit-2.11.1" = {
@@ -4297,13 +4297,13 @@ let
         sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1";
       };
     };
-    "addons-linter-1.19.0" = {
+    "addons-linter-1.20.0" = {
       name = "addons-linter";
       packageName = "addons-linter";
-      version = "1.19.0";
+      version = "1.20.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.19.0.tgz";
-        sha512 = "pnfrdQqatZeEnBcRcMq9KWZJRmS9YiPyWu3gZbJl12Ee3dUlvke+2C0DcYhNfm4hciRB4wrr4OiQTYAXh1CyzA==";
+        url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.20.0.tgz";
+        sha512 = "EIyJnIkvXhBKgOzVFR873uGa4ny07odIl8i8qWxHAuVJWM/ZQtLouAbndA+cVRDbD66sK6HsO1oWN6WkdCr/uA==";
       };
     };
     "addr-to-ip-port-1.5.1" = {
@@ -4423,15 +4423,6 @@ let
         sha512 = "CW/n1wxF8RpEuuiq6Vbn9S8m0VSYDMnZESqaJ6F2cWN9fY8rei2qaxweIaRgq+ek8TqfoFIsUjaGNKGGEHElSg==";
       };
     };
-    "aggregate-error-1.0.0" = {
-      name = "aggregate-error";
-      packageName = "aggregate-error";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-1.0.0.tgz";
-        sha1 = "888344dad0220a72e3af50906117f48771925fac";
-      };
-    };
     "aggregate-error-3.0.1" = {
       name = "aggregate-error";
       packageName = "aggregate-error";
@@ -4675,6 +4666,15 @@ let
         sha512 = "LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==";
       };
     };
+    "ansi-colors-3.2.4" = {
+      name = "ansi-colors";
+      packageName = "ansi-colors";
+      version = "3.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz";
+        sha512 = "hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==";
+      };
+    };
     "ansi-colors-4.1.1" = {
       name = "ansi-colors";
       packageName = "ansi-colors";
@@ -4747,6 +4747,15 @@ let
         sha1 = "2962cf54ec9792c48510a3deb524436861ef7251";
       };
     };
+    "ansi-html-0.0.7" = {
+      name = "ansi-html";
+      packageName = "ansi-html";
+      version = "0.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz";
+        sha1 = "813584021962a9e9e6fd039f940d12f56ca7859e";
+      };
+    };
     "ansi-red-0.1.1" = {
       name = "ansi-red";
       packageName = "ansi-red";
@@ -4981,13 +4990,13 @@ let
         sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw==";
       };
     };
-    "apollo-2.22.0" = {
+    "apollo-2.22.1" = {
       name = "apollo";
       packageName = "apollo";
-      version = "2.22.0";
+      version = "2.22.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo/-/apollo-2.22.0.tgz";
-        sha512 = "9Xmfdx/q0YU1LkcZIV1chAy1iY+bNTsgzamhw71gMg6qto94qnEYBX531Cv+80V+Bx6/f0ZGgofmgPPJx4KCTA==";
+        url = "https://registry.npmjs.org/apollo/-/apollo-2.22.1.tgz";
+        sha512 = "FONVPKvK0gg+loWCh7KOAAa/HlvbKcR7pdiC3Mtpohe3RWKqKb/QLsBPHjCgz1mjVyVL+05Cv/SjnQ9WHUO6/g==";
       };
     };
     "apollo-cache-1.3.4" = {
@@ -5044,13 +5053,13 @@ let
         sha512 = "sanUIqXWyyDpxY3fYOVU+Hsxwxdj5fmn3Zcy6CcMGnWmh9o7tautQAuod2a63wrDs1jcNQcFq3EKIpeB+2xECw==";
       };
     };
-    "apollo-codegen-core-0.36.0" = {
+    "apollo-codegen-core-0.36.1" = {
       name = "apollo-codegen-core";
       packageName = "apollo-codegen-core";
-      version = "0.36.0";
+      version = "0.36.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.36.0.tgz";
-        sha512 = "RorGvym1AFZzrPwLCWznMcyHCfzCWZb7IktC1TyvvgSuKA9whAGLbkLB9tXk7gE3bcmkRmNaWJUWfb+8iZ+rRg==";
+        url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.36.1.tgz";
+        sha512 = "PSucYRG29+BAnQE8A4KhGqUK0LdFfAiep8az1qNDq6RDfqVhdqzMF32ZpQWuEx7cz4YTRcBs9cg2/ZjXxAgJwA==";
       };
     };
     "apollo-codegen-flow-0.20.0" = {
@@ -5062,13 +5071,13 @@ let
         sha512 = "XgKE19B0Q74PBLVqHP/77NcCFrcvrN9wi3CcotH+FV8BeHTjvpHlilTsQMmd2STPt19cCvY2Qtz0EOeLXTUQ2Q==";
       };
     };
-    "apollo-codegen-flow-0.34.0" = {
+    "apollo-codegen-flow-0.34.1" = {
       name = "apollo-codegen-flow";
       packageName = "apollo-codegen-flow";
-      version = "0.34.0";
+      version = "0.34.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.34.0.tgz";
-        sha512 = "Vc4i0lV9O0D3vrwWvKkiFWqeUxgl81jAGNGSy2pOhfDut84kS85GbR0fO4eQ8JTLYqh/PquT3Oq6Q5UfSQQE9w==";
+        url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.34.1.tgz";
+        sha512 = "q28f5rY+KwVWNoPyTJHSSJfA+y9JdXFxvzDZNQ7odUKuLZRDJSswYZkBYk/Nq/rkl7RwOJ7qgwEG6AxhPMvH1g==";
       };
     };
     "apollo-codegen-flow-legacy-0.20.0" = {
@@ -5089,13 +5098,13 @@ let
         sha512 = "NbnMOfUXXovlTGRj4mIZGXB9HvidQhwKfAmdYHox5peHPkjjsqEzxGCIuWCSnubWiCF2uHZnQoIkg4sXWf0KLw==";
       };
     };
-    "apollo-codegen-scala-0.35.0" = {
+    "apollo-codegen-scala-0.35.1" = {
       name = "apollo-codegen-scala";
       packageName = "apollo-codegen-scala";
-      version = "0.35.0";
+      version = "0.35.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.35.0.tgz";
-        sha512 = "QBhaYX+F4B0nESLP+n1GvDZ03EWRo31dfEA2eu+DUx+Nez1kMzbohFOFDaN7h1DADIarPyELQ3CQb5yDrzFMMw==";
+        url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.35.1.tgz";
+        sha512 = "9yywcpwZiclKRXXSFGYuJcQIOTlPyPKSYH/+Rls1Vu5CafPGgkhIJQLtvtc80PJMaK1vmYVvsrDsAO91Tu/frw==";
       };
     };
     "apollo-codegen-swift-0.20.0" = {
@@ -5107,13 +5116,13 @@ let
         sha512 = "L9Y4StbXw0t/nuF+miz0ybSt/io6tsLc063Yeh1A8GCvhFFQyXE/yK0Rf3nO1Bl5Z9UZ5o8Aae9kK4GSWYIGNQ==";
       };
     };
-    "apollo-codegen-swift-0.36.0" = {
+    "apollo-codegen-swift-0.36.1" = {
       name = "apollo-codegen-swift";
       packageName = "apollo-codegen-swift";
-      version = "0.36.0";
+      version = "0.36.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.36.0.tgz";
-        sha512 = "i6AoxYunQhUeXauZdsY9DunvdGMAd83DwRHxH/XCbwOcjSWTflnSxd8JJzNA6uMOI7lN276k8XpYQMB+xaNKig==";
+        url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.36.1.tgz";
+        sha512 = "no5bq4xiTqeT591bpGTdy3ATfflmmQXc9h6q935lVrak5uqGigd72RPWHNeN/BbnGg6khaL9jBbSs2+VqrOGug==";
       };
     };
     "apollo-codegen-typescript-0.20.0" = {
@@ -5125,13 +5134,13 @@ let
         sha512 = "mzlIJXz+5WPwzeALqRHHR9aPPEf6IlhSrjCawpUHmFU1NK9hgwbguYCEYZv9mKkYBUUgDY+9cGFK1cafJX70AQ==";
       };
     };
-    "apollo-codegen-typescript-0.36.0" = {
+    "apollo-codegen-typescript-0.36.1" = {
       name = "apollo-codegen-typescript";
       packageName = "apollo-codegen-typescript";
-      version = "0.36.0";
+      version = "0.36.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.36.0.tgz";
-        sha512 = "mnhUXrZ1Ynqvav7mWxQHNWg+ShtgRsub7z4NwlURQjI1UfQRtrQKRQzY8Q/3ihTUSTYoD0tHeBv8ZJcVXq0dWw==";
+        url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.36.1.tgz";
+        sha512 = "iQ2FGxA9Neb5728eqtvC9J4Ig6heOEMdgVcfsIrUQRTRKiPp7iIKc2DS8ReMX6LMdRhm000ldcquJFQJldFjLg==";
       };
     };
     "apollo-codegen-typescript-legacy-0.20.0" = {
@@ -5143,15 +5152,6 @@ let
         sha512 = "0/h5hce2FIGn6Y4+EHMeMINQxFwcgjw1vU+xV3KGaaEgyEAEQ3/n9pyz43M8mOm/JVgg8Eb4CtM1AtCkRQuFGw==";
       };
     };
-    "apollo-datasource-0.6.4" = {
-      name = "apollo-datasource";
-      packageName = "apollo-datasource";
-      version = "0.6.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.6.4.tgz";
-        sha512 = "u4eu6Q94q6KuZacZfdo4vCevA81F4QWeTYEXUvoksQMJpiacPHHe0DJrofKVKvxngUp5kCi1RnPXSc6kBY+/oA==";
-      };
-    };
     "apollo-datasource-0.7.0" = {
       name = "apollo-datasource";
       packageName = "apollo-datasource";
@@ -5161,13 +5161,13 @@ let
         sha512 = "Yja12BgNQhzuFGG/5Nw2MQe0hkuQy2+9er09HxeEyAf2rUDIPnhPrn1MDoZTB8MU7UGfjwITC+1ofzKkkrZobA==";
       };
     };
-    "apollo-engine-reporting-1.5.0" = {
+    "apollo-engine-reporting-1.6.0" = {
       name = "apollo-engine-reporting";
       packageName = "apollo-engine-reporting";
-      version = "1.5.0";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.5.0.tgz";
-        sha512 = "Pe2DelijZ2QHqkqv8E97iOb32l+FIMT2nxpQsuH+nWi+96cCFJJJHjm3RLAPEUuvGOgW9dFYQP3J91EyC5O0tQ==";
+        url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.6.0.tgz";
+        sha512 = "prA17Tp/WYBJdCd4ey1CnGX8d4Xis1n9PsFmT7x8PV/oNpxG21/x3yNw5kPBZuKAoKz8yEggYtHhkYie1ZBjPQ==";
       };
     };
     "apollo-engine-reporting-protobuf-0.4.4" = {
@@ -5188,15 +5188,6 @@ let
         sha512 = "B9BgpQGR1ndeDtb4Gtor0J4CITQ+OPACZrVW6lgStnljKEe9ZB76DZ1dAd3OCeizAswW6Lo9uvfK8jhVS5nBhQ==";
       };
     };
-    "apollo-graphql-0.3.7" = {
-      name = "apollo-graphql";
-      packageName = "apollo-graphql";
-      version = "0.3.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.3.7.tgz";
-        sha512 = "ghW16xx9tRcyL38Pw6G5OidMnYn+CNUGZWmvqQgEO2nRy4T0ONPZZBOvGrIMtJQ70oEykNMKGm0zm6PdHdxd8Q==";
-      };
-    };
     "apollo-graphql-0.4.0" = {
       name = "apollo-graphql";
       packageName = "apollo-graphql";
@@ -5206,13 +5197,13 @@ let
         sha512 = "abCHcKln1EGbzSItW087EjBI5wnluikyUqEn4VsdeWHCtdENWpHCn/MnM0+jJa1prNasxN7tCukp4nMpJYYVqg==";
       };
     };
-    "apollo-language-server-1.19.0" = {
+    "apollo-language-server-1.19.1" = {
       name = "apollo-language-server";
       packageName = "apollo-language-server";
-      version = "1.19.0";
+      version = "1.19.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.19.0.tgz";
-        sha512 = "BkrfKs0k+Pr3GXnnS1pbuX9qKhFLBRbImFwO1fka2fmeQ8J2uZc8oSHR3TZ7jWEYA7DQsTPNu1SD4GFfE750UA==";
+        url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.19.1.tgz";
+        sha512 = "Xq9DL+7rl1I78hU5TTJG1zxfPWbz08l/XOthI+rCEhzhIFafzOlUjrtJziuYr1AmAAjA9CJLzaaUDC9ixm+Sfw==";
       };
     };
     "apollo-link-1.2.13" = {
@@ -5296,13 +5287,13 @@ let
         sha512 = "L7LHZ3k9Ao5OSf2WStvQhxdsNVplRQi7kCAPfqf9Z3GBEnQ2uaL0EgO0hSmtVHfXTbk5CTRziMT1Pe87bXrFIw==";
       };
     };
-    "apollo-server-core-2.10.0" = {
+    "apollo-server-core-2.10.1" = {
       name = "apollo-server-core";
       packageName = "apollo-server-core";
-      version = "2.10.0";
+      version = "2.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.10.0.tgz";
-        sha512 = "x/UK6XvU307W8D/pzTclU04JIjRarcbg5mFPe0nVmO4OTc26uQgKi1WlZkcewXsAUnn+nDwKVn2c2G3dHEgXzQ==";
+        url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.10.1.tgz";
+        sha512 = "BVITSJRMnj+CWFkjt7FMcaoqg/Ni9gfyVE9iu8bUc1IebBfFDcQj652Iolr7dTqyUziN2jbf0wfcybKYJLQHQQ==";
       };
     };
     "apollo-server-env-2.4.3" = {
@@ -5323,13 +5314,13 @@ let
         sha512 = "Y0PKQvkrb2Kd18d1NPlHdSqmlr8TgqJ7JQcNIfhNDgdb45CnqZlxL1abuIRhr8tiw8OhVOcFxz2KyglBi8TKdA==";
       };
     };
-    "apollo-server-express-2.10.0" = {
+    "apollo-server-express-2.10.1" = {
       name = "apollo-server-express";
       packageName = "apollo-server-express";
-      version = "2.10.0";
+      version = "2.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.10.0.tgz";
-        sha512 = "adDQts4QmkX2ENU7JibV1EwRl3ESnpnpImXIMvg8Cm7kX2wSbzwm8LecQNujwWJtkAPTCEAcnPBDyKwWjTQ6/g==";
+        url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.10.1.tgz";
+        sha512 = "NkuWGBOCTiju/aDjfvDImm+4yzfrM0dwiRxu9fKwwh2h1oYBUKJNqjQ1mzJRi0ks6Sn1egwl/fQkTBTkWwGx7Q==";
       };
     };
     "apollo-server-plugin-base-0.6.10" = {
@@ -6466,13 +6457,13 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.614.0" = {
+    "aws-sdk-2.620.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.614.0";
+      version = "2.620.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.614.0.tgz";
-        sha512 = "o7utaxDMo9ri1VyPKw8Kcmpy5uZOqMeok2cgur70iZ94zsLIRnHKrBv1wMBbyRGuUbfJRq76HGAS9QxdiSqQHw==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.620.0.tgz";
+        sha512 = "j+PGKbYwk5OjzbCFbxzRkcJVEvfdn9YFkrU8dJdjleYf9AzUSUpTjMyZsyUPOKxJxdNdA9FYTs43WdtSKHZa0A==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -7870,13 +7861,13 @@ let
         sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e";
       };
     };
-    "boolean-3.0.0" = {
+    "boolean-3.0.1" = {
       name = "boolean";
       packageName = "boolean";
-      version = "3.0.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/boolean/-/boolean-3.0.0.tgz";
-        sha512 = "OElxJ1lUSinuoUnkpOgLmxp0DC4ytEhODEL6QJU0NpxE/mI4rUSh8h1P1Wkvfi3xQEBcxXR2gBIPNYNuaFcAbQ==";
+        url = "https://registry.npmjs.org/boolean/-/boolean-3.0.1.tgz";
+        sha512 = "HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA==";
       };
     };
     "boom-2.10.1" = {
@@ -8221,13 +8212,13 @@ let
         sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==";
       };
     };
-    "browserslist-4.8.6" = {
+    "browserslist-4.8.7" = {
       name = "browserslist";
       packageName = "browserslist";
-      version = "4.8.6";
+      version = "4.8.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.8.6.tgz";
-        sha512 = "ZHao85gf0eZ0ESxLfCp73GG9O/VTytYDIkIiZDlURppLTI9wErSM/5yAKEq6rcUdxBLjMELmrYUJGg5sxGKMHg==";
+        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.8.7.tgz";
+        sha512 = "gFOnZNYBHrEyUML0xr5NJ6edFaaKbTFX9S9kQHlYfCP0Rit/boRIz4G+Avq6/4haEKJXdGGUnoolx+5MWW2BoA==";
       };
     };
     "btoa-lite-1.0.0" = {
@@ -8941,13 +8932,13 @@ let
         sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
       };
     };
-    "caniuse-lite-1.0.30001025" = {
+    "caniuse-lite-1.0.30001027" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001025";
+      version = "1.0.30001027";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001025.tgz";
-        sha512 = "SKyFdHYfXUZf5V85+PJgLYyit27q4wgvZuf8QTOk1osbypcROihMBlx9GRar2/pIcKH2r4OehdlBr9x6PXetAQ==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001027.tgz";
+        sha512 = "7xvKeErvXZFtUItTHgNtLgS9RJpVnwBlWX8jSo/BO8VsF6deszemZSkJJJA1KOKrXuzZH4WALpAJdq5EyfgMLg==";
       };
     };
     "capture-stack-trace-1.0.1" = {
@@ -9427,13 +9418,13 @@ let
         sha1 = "2f9aebf746f90808ce00607b72ba73b41604c485";
       };
     };
-    "chownr-1.1.3" = {
+    "chownr-1.1.4" = {
       name = "chownr";
       packageName = "chownr";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz";
-        sha512 = "i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==";
+        url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz";
+        sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==";
       };
     };
     "chroma-js-2.1.0" = {
@@ -9823,6 +9814,15 @@ let
         sha512 = "bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA==";
       };
     };
+    "cli-truncate-2.1.0" = {
+      name = "cli-truncate";
+      packageName = "cli-truncate";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz";
+        sha512 = "n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==";
+      };
+    };
     "cli-ux-4.9.3" = {
       name = "cli-ux";
       packageName = "cli-ux";
@@ -10903,13 +10903,13 @@ let
         sha512 = "CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ==";
       };
     };
-    "configstore-5.0.0" = {
+    "configstore-5.0.1" = {
       name = "configstore";
       packageName = "configstore";
-      version = "5.0.0";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/configstore/-/configstore-5.0.0.tgz";
-        sha512 = "eE/hvMs7qw7DlcB5JPRnthmrITuHMmACUJAp89v6PT6iOqzoLS7HRWhBtuHMlhNHo2AhUSA/3Dh1bKNJHcublQ==";
+        url = "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz";
+        sha512 = "aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==";
       };
     };
     "connect-1.9.2" = {
@@ -10948,6 +10948,15 @@ let
         sha512 = "ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==";
       };
     };
+    "connect-history-api-fallback-1.6.0" = {
+      name = "connect-history-api-fallback";
+      packageName = "connect-history-api-fallback";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz";
+        sha512 = "e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==";
+      };
+    };
     "connect-multiparty-2.2.0" = {
       name = "connect-multiparty";
       packageName = "connect-multiparty";
@@ -11479,15 +11488,6 @@ let
         sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==";
       };
     };
-    "core-js-3.6.0" = {
-      name = "core-js";
-      packageName = "core-js";
-      version = "3.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-3.6.0.tgz";
-        sha512 = "AHPTNKzyB+YwgDWoSOCaid9PUSEF6781vsfiK8qUz62zRR448/XgK2NtCbpiUGizbep8Lrpt0Du19PpGGZvw3Q==";
-      };
-    };
     "core-js-3.6.4" = {
       name = "core-js";
       packageName = "core-js";
@@ -11506,6 +11506,15 @@ let
         sha512 = "zAa3IZPvsJ0slViBQ2z+vgyyTuhd3MFn1rBQjZSKVEgB0UMYhUkCj9jJUVPgGTGqWvsBVmfnruXgTcNyTlEiSA==";
       };
     };
+    "core-js-pure-3.6.4" = {
+      name = "core-js-pure";
+      packageName = "core-js-pure";
+      version = "3.6.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.4.tgz";
+        sha512 = "epIhRLkXdgv32xIUFaaAry2wdxZYBi6bgM7cB136dzzXXa+dFyRLTZeLUJxnd8ShrmyVXBub63n2NHo2JAt8Cw==";
+      };
+    };
     "core-util-is-1.0.2" = {
       name = "core-util-is";
       packageName = "core-util-is";
@@ -12982,6 +12991,15 @@ let
         sha512 = "QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==";
       };
     };
+    "default-gateway-4.2.0" = {
+      name = "default-gateway";
+      packageName = "default-gateway";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz";
+        sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==";
+      };
+    };
     "default-resolution-2.0.0" = {
       name = "default-resolution";
       packageName = "default-resolution";
@@ -13108,6 +13126,15 @@ let
         sha1 = "fcf490a37ece266464d9cc431ab98c5819ced095";
       };
     };
+    "del-4.1.1" = {
+      name = "del";
+      packageName = "del";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/del/-/del-4.1.1.tgz";
+        sha512 = "QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==";
+      };
+    };
     "delay-4.3.0" = {
       name = "delay";
       packageName = "delay";
@@ -13594,13 +13621,13 @@ let
         sha1 = "57ddacb47324ae5f58d2cc0da886db4ce9eeb718";
       };
     };
-    "dispensary-0.48.1" = {
+    "dispensary-0.49.0" = {
       name = "dispensary";
       packageName = "dispensary";
-      version = "0.48.1";
+      version = "0.49.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dispensary/-/dispensary-0.48.1.tgz";
-        sha512 = "oC9ItJ7YtO/DKsp24T90k7z0NxfkZQkvJ3USTxUoVjBKrfMRz1/kMd+NcFgDG+KrJg14GChiv1sbdFdxeKRUUw==";
+        url = "https://registry.npmjs.org/dispensary/-/dispensary-0.49.0.tgz";
+        sha512 = "szH0vDORmGWEfwQgIqrhmrMpSGU2yXL3z7oe0NGx4sCbmnJdXXr5SQvRccPNCPrRuRPn2zPIITvwD9Lf+pcOew==";
       };
     };
     "diveSync-0.3.0" = {
@@ -13711,15 +13738,6 @@ let
         sha512 = "cIV8oXkAxpIuN5XgG0TGg07nLDgrj4olkfrdT77OTA3VypscsYHBUg/FjHxW9K3oA+CyH4Th/qtoMgTVpzSobw==";
       };
     };
-    "dockerfile-ast-0.0.16" = {
-      name = "dockerfile-ast";
-      packageName = "dockerfile-ast";
-      version = "0.0.16";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.16.tgz";
-        sha512 = "+HZToHjjiLPl46TqBrok5dMrg5oCkZFPSROMQjRmvin0zG4FxK0DJXTpV/CUPYY2zpmEvVza55XLwSHFx/xZMw==";
-      };
-    };
     "dockerfile-ast-0.0.18" = {
       name = "dockerfile-ast";
       packageName = "dockerfile-ast";
@@ -13729,13 +13747,22 @@ let
         sha512 = "SEp95qCox1KAzf8BBtjHoBDD0a7/eNlZJ6fgDf9RxqeSEDwLuEN9YjdZ/tRlkrYLxXR4i+kqZzS4eDRSqs8VKQ==";
       };
     };
-    "dockerfile-language-service-0.0.8" = {
+    "dockerfile-ast-0.0.20" = {
+      name = "dockerfile-ast";
+      packageName = "dockerfile-ast";
+      version = "0.0.20";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.20.tgz";
+        sha512 = "VGFMBT0Av1Sk4SCjafsv2S/MCVy6+AuhLW+958wS2df86wb90JPl+WJXhTTGHk5DQVwQX0NoQQBzQQP1U7GaWg==";
+      };
+    };
+    "dockerfile-language-service-0.0.9" = {
       name = "dockerfile-language-service";
       packageName = "dockerfile-language-service";
-      version = "0.0.8";
+      version = "0.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.0.8.tgz";
-        sha512 = "peko1rQtZ81e3QK3VLZgkCKkCMnuoSqZxCQuudyEbtYqqAe6jJ4r0bwOnWD9hyH/FMg7jMvI5uLsoo7/dHLNYw==";
+        url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.0.9.tgz";
+        sha512 = "g+TFMRG/Vv+yKqYJ2EE5KZlmwbPShWhlGhyG6tFEhUlHUt2Cd3wMr35popmc5Y9ra3OPwR3nY9cQFWIt8OP1Kw==";
       };
     };
     "dockerfile-utils-0.0.11" = {
@@ -13747,13 +13774,13 @@ let
         sha512 = "LNdPIgcl58343dF4KNCHvFzUScUhgLI9BRAR+Vln6D1tVBGvv1k5/qHuxWRCAM2uyFbj73QVkKMScXPhY7TqfQ==";
       };
     };
-    "dockerfile-utils-0.0.13" = {
+    "dockerfile-utils-0.0.14" = {
       name = "dockerfile-utils";
       packageName = "dockerfile-utils";
-      version = "0.0.13";
+      version = "0.0.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.0.13.tgz";
-        sha512 = "+MAmhEnQ16B7+3C2UDWpmIS1D8EiKvpl4LDRjrMv94bOusaeRcLagRR0AvgV6NWT+oiRxDMLDyay6yjm6LESsw==";
+        url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.0.14.tgz";
+        sha512 = "9S77f18SmnI4hJ1Ndv1h1/gPxm74uV/n9E/2JMp6I9D3cSLrNdBZwq3FpNiXX1TRJQAn+Ufl/5b7YzH63NZ6jA==";
       };
     };
     "doctrine-2.1.0" = {
@@ -14341,13 +14368,13 @@ let
         sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==";
       };
     };
-    "electron-to-chromium-1.3.346" = {
+    "electron-to-chromium-1.3.353" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.346";
+      version = "1.3.353";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.346.tgz";
-        sha512 = "Yy4jF5hJd57BWmGPt0KjaXc25AmWZeQK75kdr4zIzksWVtiT6DwaNtvTb9dt+LkQKwUpvBfCyyPsXXtbY/5GYw==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.353.tgz";
+        sha512 = "CkG24biyy9qQTQs8U2vGQaiyWSFDxAXP/UGHBveXZ1TGoWOAw+eYZXryrX0UeIMKnQjcaHx33hzYuydv98kqGQ==";
       };
     };
     "elegant-spinner-1.0.1" = {
@@ -15044,6 +15071,15 @@ let
         sha512 = "VHDcDg9AwFoeQU9ULPCJCw6P95gr9Er65M+bccefEVD/OOb+WMyQIYw58rpm0F+zcfRJNf394I+BMH8JeU97Hw==";
       };
     };
+    "escape-goat-2.1.1" = {
+      name = "escape-goat";
+      packageName = "escape-goat";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz";
+        sha512 = "8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==";
+      };
+    };
     "escape-html-1.0.1" = {
       name = "escape-html";
       packageName = "escape-html";
@@ -15197,13 +15233,13 @@ let
         sha1 = "7d02878c8e9bf7916b88836d5ac122b42f151932";
       };
     };
-    "eslint-plugin-vue-6.1.2" = {
+    "eslint-plugin-vue-6.2.1" = {
       name = "eslint-plugin-vue";
       packageName = "eslint-plugin-vue";
-      version = "6.1.2";
+      version = "6.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-6.1.2.tgz";
-        sha512 = "M75oAB+2a/LNkLKRbeEaS07EjzjIUaV7/hYoHAfRFeeF8ZMmCbahUn8nQLsLP85mkar24+zDU3QW2iT1JRsACw==";
+        url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-6.2.1.tgz";
+        sha512 = "MiIDOotoWseIfLIfGeDzF6sDvHkVvGd2JgkvjyHtN3q4RoxdAXrAMuI3SXTOKatljgacKwpNAYShmcKZa4yZzw==";
       };
     };
     "eslint-scope-3.7.1" = {
@@ -15368,13 +15404,13 @@ let
         sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0";
       };
     };
-    "esquery-1.0.1" = {
+    "esquery-1.1.0" = {
       name = "esquery";
       packageName = "esquery";
-      version = "1.0.1";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz";
-        sha512 = "SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==";
+        url = "https://registry.npmjs.org/esquery/-/esquery-1.1.0.tgz";
+        sha512 = "MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q==";
       };
     };
     "esrecurse-4.2.1" = {
@@ -15683,6 +15719,15 @@ let
         sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4";
       };
     };
+    "eventsource-1.0.7" = {
+      name = "eventsource";
+      packageName = "eventsource";
+      version = "1.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz";
+        sha512 = "4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==";
+      };
+    };
     "everyauth-0.4.5" = {
       name = "everyauth";
       packageName = "everyauth";
@@ -15719,15 +15764,6 @@ let
         sha1 = "b09c2a9309bc0ef0501479472db3180f8d4c3edd";
       };
     };
-    "execa-0.10.0" = {
-      name = "execa";
-      packageName = "execa";
-      version = "0.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz";
-        sha512 = "7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==";
-      };
-    };
     "execa-0.7.0" = {
       name = "execa";
       packageName = "execa";
@@ -16412,6 +16448,15 @@ let
         sha512 = "CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==";
       };
     };
+    "faye-websocket-0.10.0" = {
+      name = "faye-websocket";
+      packageName = "faye-websocket";
+      version = "0.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz";
+        sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4";
+      };
+    };
     "faye-websocket-0.11.3" = {
       name = "faye-websocket";
       packageName = "faye-websocket";
@@ -16511,13 +16556,13 @@ let
         sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962";
       };
     };
-    "figures-3.1.0" = {
+    "figures-3.2.0" = {
       name = "figures";
       packageName = "figures";
-      version = "3.1.0";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/figures/-/figures-3.1.0.tgz";
-        sha512 = "ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==";
+        url = "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz";
+        sha512 = "yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==";
       };
     };
     "file-entry-cache-2.0.0" = {
@@ -16898,15 +16943,6 @@ let
         sha512 = "LNRvR4hr/S8cXXkIY5pTgVP7L3tq6LlYWcg9nWBuW7o1NMxKZo6oOVa/6GIekMGI0Iw7uC+HWimMe9u/VAeKqw==";
       };
     };
-    "fkill-5.3.0" = {
-      name = "fkill";
-      packageName = "fkill";
-      version = "5.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fkill/-/fkill-5.3.0.tgz";
-        sha512 = "AHe4x/k9xHlSNPRya0FOCd42qa6ggmW4gtdy6mR0R1vdWtNq9zMd8nmMR5LB7fTNOA1f1nOU+uqaQHP7NMWmVA==";
-      };
-    };
     "fkill-6.2.0" = {
       name = "fkill";
       packageName = "fkill";
@@ -16916,6 +16952,15 @@ let
         sha512 = "VoPpKScAzvZ07jtciOY0bJieJwyd/VVCuo4fn3nBLh4iBagzYED7GLQeFBpMpy7HP5edEKTDo8yxaIrYrwb7hg==";
       };
     };
+    "fkill-7.0.0" = {
+      name = "fkill";
+      packageName = "fkill";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fkill/-/fkill-7.0.0.tgz";
+        sha512 = "i61SqvPdfCxl1/VQulh9SXrC+4dudCtINzTHbKaEx3Jr0kD9SvxKDeXzej7Saurnj3al/jMJwQnsUc62VrBMHQ==";
+      };
+    };
     "flagged-respawn-1.0.1" = {
       name = "flagged-respawn";
       packageName = "flagged-respawn";
@@ -18618,6 +18663,15 @@ let
         sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c";
       };
     };
+    "globby-7.1.1" = {
+      name = "globby";
+      packageName = "globby";
+      version = "7.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz";
+        sha1 = "fb2ccff9401f8600945dfada97440cca972b8680";
+      };
+    };
     "globby-8.0.2" = {
       name = "globby";
       packageName = "globby";
@@ -18654,13 +18708,13 @@ let
         sha1 = "d9c8edde1da79d125a151b79533b978676346ae5";
       };
     };
-    "globule-1.3.0" = {
+    "globule-1.3.1" = {
       name = "globule";
       packageName = "globule";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/globule/-/globule-1.3.0.tgz";
-        sha512 = "YlD4kdMqRCQHrhVdonet4TdRtv1/sZKepvoxNT4Nrhrp5HI8XFfc8kFlGlBn2myBo80aGp8Eft259mbcUJhgSg==";
+        url = "https://registry.npmjs.org/globule/-/globule-1.3.1.tgz";
+        sha512 = "OVyWOHgw29yosRHCHo7NncwR1hW5ew0W/UrvtwvjefVJeQ26q4/8r8FmPsSF1hJ93IgWkyv16pCTz6WblMzm/g==";
       };
     };
     "glogg-1.0.2" = {
@@ -19077,13 +19131,13 @@ let
         sha512 = "CgXlq3PGpBRj8RMnLSYs46Hvl5q9Up9kwuMAcYlvS4sNgH5j4Ao7hbY+HI62PaYTeIdffiJidLEIeZVCmZCrFA==";
       };
     };
-    "grouped-queue-0.3.3" = {
+    "grouped-queue-1.0.0" = {
       name = "grouped-queue";
       packageName = "grouped-queue";
-      version = "0.3.3";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/grouped-queue/-/grouped-queue-0.3.3.tgz";
-        sha1 = "c167d2a5319c5a0e0964ef6a25b7c2df8996c85c";
+        url = "https://registry.npmjs.org/grouped-queue/-/grouped-queue-1.0.0.tgz";
+        sha512 = "XslfWrAGCYovQjveHODR0hllUrsn3UtvPFTkamHbgVHmkUA6eCIDmw3JDWVLJvuntTvYjwaPGamlyzK4/HAEOA==";
       };
     };
     "growl-1.10.5" = {
@@ -19212,6 +19266,15 @@ let
         sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5";
       };
     };
+    "handle-thing-2.0.0" = {
+      name = "handle-thing";
+      packageName = "handle-thing";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz";
+        sha512 = "d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==";
+      };
+    };
     "handlebars-4.5.3" = {
       name = "handlebars";
       packageName = "handlebars";
@@ -19851,6 +19914,15 @@ let
         sha512 = "ezZMWtHXm7Eb7Rq4Mwnx2vs79WUx2QmRg3+ZqeGroKzfDO+EprOcgRPYghsOP9JuYBfK18VojmRTGCg8Ma+ktw==";
       };
     };
+    "hpack.js-2.1.6" = {
+      name = "hpack.js";
+      packageName = "hpack.js";
+      version = "2.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz";
+        sha1 = "87774c0949e513f42e84575b3c45681fade2a0b2";
+      };
+    };
     "hsl-regex-1.0.0" = {
       name = "hsl-regex";
       packageName = "hsl-regex";
@@ -20004,13 +20076,13 @@ let
         sha512 = "5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==";
       };
     };
-    "http-cache-semantics-4.0.3" = {
+    "http-cache-semantics-4.0.4" = {
       name = "http-cache-semantics";
       packageName = "http-cache-semantics";
-      version = "4.0.3";
+      version = "4.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz";
-        sha512 = "TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew==";
+        url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz";
+        sha512 = "Z2EICWNJou7Tr9Bd2M2UqDJq3A9F2ePG9w3lIpjoyuSyXFP9QbniJVu3XQYytuw5ebmG7dXSXO9PgAjJG8DDKA==";
       };
     };
     "http-call-5.3.0" = {
@@ -20022,6 +20094,15 @@ let
         sha512 = "ahwimsC23ICE4kPl9xTBjKB4inbRaeLyZeRunC/1Jy/Z6X8tv22MEAjK+KBOMSVLaqXPTTmd8638waVIKLGx2w==";
       };
     };
+    "http-deceiver-1.2.7" = {
+      name = "http-deceiver";
+      packageName = "http-deceiver";
+      version = "1.2.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz";
+        sha1 = "fa7168944ab9a519d337cb0bec7284dc3e723d87";
+      };
+    };
     "http-errors-1.6.3" = {
       name = "http-errors";
       packageName = "http-errors";
@@ -20122,6 +20203,15 @@ let
         sha512 = "uGuJaBWQWDQCJI5ip0d/VTYZW0nRrlLWXA4A7P1jrsa+f77rW2yXz315oBt6zGCF6l8C2tlMxY7ffULCj+5FhA==";
       };
     };
+    "http-proxy-middleware-0.19.1" = {
+      name = "http-proxy-middleware";
+      packageName = "http-proxy-middleware";
+      version = "0.19.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz";
+        sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==";
+      };
+    };
     "http-signature-0.11.0" = {
       name = "http-signature";
       packageName = "http-signature";
@@ -21013,6 +21103,15 @@ let
         sha1 = "ae9fbf93b984878785d50a8de1b356956058cf5c";
       };
     };
+    "internal-ip-4.3.0" = {
+      name = "internal-ip";
+      packageName = "internal-ip";
+      version = "4.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz";
+        sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==";
+      };
+    };
     "interpret-1.1.0" = {
       name = "interpret";
       packageName = "interpret";
@@ -21958,6 +22057,24 @@ let
         sha512 = "2Xj8sA0zDrAcaoWfBiNmc6VPWAgKDpim0T3J9Djq7vbm1UjwbUWzeuLu/FwC46g3cBbAn0E5R0xwVtOobM6Xxg==";
       };
     };
+    "is-path-cwd-2.2.0" = {
+      name = "is-path-cwd";
+      packageName = "is-path-cwd";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz";
+        sha512 = "w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==";
+      };
+    };
+    "is-path-in-cwd-2.1.0" = {
+      name = "is-path-in-cwd";
+      packageName = "is-path-in-cwd";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz";
+        sha512 = "rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==";
+      };
+    };
     "is-path-inside-1.0.1" = {
       name = "is-path-inside";
       packageName = "is-path-inside";
@@ -21967,6 +22084,15 @@ let
         sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036";
       };
     };
+    "is-path-inside-2.1.0" = {
+      name = "is-path-inside";
+      packageName = "is-path-inside";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz";
+        sha512 = "wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==";
+      };
+    };
     "is-path-inside-3.0.2" = {
       name = "is-path-inside";
       packageName = "is-path-inside";
@@ -22759,13 +22885,13 @@ let
         sha1 = "d6be2e4c377494e2378b1cae2920a91d1182d8c4";
       };
     };
-    "js-base64-2.5.1" = {
+    "js-base64-2.5.2" = {
       name = "js-base64";
       packageName = "js-base64";
-      version = "2.5.1";
+      version = "2.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz";
-        sha512 = "M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==";
+        url = "https://registry.npmjs.org/js-base64/-/js-base64-2.5.2.tgz";
+        sha512 = "Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ==";
       };
     };
     "js-beautify-1.10.3" = {
@@ -23182,6 +23308,15 @@ let
         sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b";
       };
     };
+    "json3-3.3.3" = {
+      name = "json3";
+      packageName = "json3";
+      version = "3.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz";
+        sha512 = "c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==";
+      };
+    };
     "json5-0.5.1" = {
       name = "json5";
       packageName = "json5";
@@ -23651,6 +23786,15 @@ let
         sha512 = "U7ioE8AimvRVLfw4LffyOIRhL2xVgmE8T22L6i0BucSnBUyv4w+I7VN/zVZwRKHOI6ZRUcdMdWHQ8KSUvGpEog==";
       };
     };
+    "killable-1.0.1" = {
+      name = "killable";
+      packageName = "killable";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz";
+        sha512 = "LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==";
+      };
+    };
     "kind-of-1.1.0" = {
       name = "kind-of";
       packageName = "kind-of";
@@ -25586,13 +25730,13 @@ let
         sha512 = "+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ==";
       };
     };
-    "loglevel-1.6.6" = {
+    "loglevel-1.6.7" = {
       name = "loglevel";
       packageName = "loglevel";
-      version = "1.6.6";
+      version = "1.6.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.6.tgz";
-        sha512 = "Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ==";
+        url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz";
+        sha512 = "cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A==";
       };
     };
     "loglevel-colored-level-prefix-1.0.0" = {
@@ -26054,13 +26198,13 @@ let
         sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==";
       };
     };
-    "make-dir-3.0.0" = {
+    "make-dir-3.0.2" = {
       name = "make-dir";
       packageName = "make-dir";
-      version = "3.0.0";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/make-dir/-/make-dir-3.0.0.tgz";
-        sha512 = "grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw==";
+        url = "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz";
+        sha512 = "rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==";
       };
     };
     "make-error-1.3.5" = {
@@ -26576,13 +26720,13 @@ let
         sha1 = "c04891883c28c83602e1d06b05a11037e359b4c8";
       };
     };
-    "mdn-browser-compat-data-1.0.1" = {
+    "mdn-browser-compat-data-1.0.3" = {
       name = "mdn-browser-compat-data";
       packageName = "mdn-browser-compat-data";
-      version = "1.0.1";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.1.tgz";
-        sha512 = "FxRIu4UYu4rRdFs5JFf6del6J+OpbOq2tYfIEK7N/PtEtz6yGVcWcytmh5L5hZxe58kuxUzjgR8+/0TRyRzRqA==";
+        url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.3.tgz";
+        sha512 = "5n7c20IVrUiuOPSuhbkd5xoJPSzEEGsoMrmrdEtPHIw6gRPzonydcsguAmqGfSBd4d2DRoDQg533sijLUpeJLg==";
       };
     };
     "mdn-data-2.0.4" = {
@@ -26792,6 +26936,15 @@ let
         sha512 = "rYRjVukgBR9sptGI3IfpAjZc4SkupddhAenUhPTGprnqM8Qh863PxfXxXWlfvHpMIAkJCok28Bm7ZlOKB4U+MA==";
       };
     };
+    "memorystore-1.6.2" = {
+      name = "memorystore";
+      packageName = "memorystore";
+      version = "1.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/memorystore/-/memorystore-1.6.2.tgz";
+        sha512 = "HQM+cZB/kY1+jj57It22FsptJ3nuZRYxnwh3rWZEvDZO1zuzhIrX9uyFcjP9AhFQvM5WS6vZKtn3veohDH4S7w==";
+      };
+    };
     "memorystream-0.3.1" = {
       name = "memorystream";
       packageName = "memorystream";
@@ -26837,13 +26990,13 @@ let
         sha512 = "CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig==";
       };
     };
-    "meow-6.0.0" = {
+    "meow-6.0.1" = {
       name = "meow";
       packageName = "meow";
-      version = "6.0.0";
+      version = "6.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/meow/-/meow-6.0.0.tgz";
-        sha512 = "x4rYsjigPBDAxY+BGuK83YLhUIqui5wYyZoqb6QJCUOs+0fiYq+i/NV4Jt8OgIfObZFxG9iTyvLDu4UTohGTFw==";
+        url = "https://registry.npmjs.org/meow/-/meow-6.0.1.tgz";
+        sha512 = "kxGTFgT/b7/oSRSQsJ0qsT5IMU+bgZ1eAdSA3kIV7onkW0QWo/hL5RbGlMfvBjHJKPE1LaPX0kdecYFiqYWjUw==";
       };
     };
     "merge-1.2.1" = {
@@ -27188,13 +27341,13 @@ let
         sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==";
       };
     };
-    "mimic-response-2.0.0" = {
+    "mimic-response-2.1.0" = {
       name = "mimic-response";
       packageName = "mimic-response";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mimic-response/-/mimic-response-2.0.0.tgz";
-        sha512 = "8ilDoEapqA4uQ3TwS0jakGONKXVJqpy+RpM+3b7pLdOjghCrEiGp9SRkFbUHAmZW9vdnrENWHjaweIoTIJExSQ==";
+        url = "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz";
+        sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==";
       };
     };
     "min-document-2.19.0" = {
@@ -27836,13 +27989,13 @@ let
         sha512 = "ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==";
       };
     };
-    "multicast-dns-7.2.0" = {
+    "multicast-dns-7.2.1" = {
       name = "multicast-dns";
       packageName = "multicast-dns";
-      version = "7.2.0";
+      version = "7.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.0.tgz";
-        sha512 = "Tu2QORGOFANB124NWQ/JTRhMf/ODouVLEuvu5Dz8YWEU55zQgRgFGnBHfIh5PbfNDAuaRl7yLB+pgWhSqVxi2Q==";
+        url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.1.tgz";
+        sha512 = "qJaNecNV4wV5FqZ+aBHOgUcHaJXpEMZhiERmuu7CM0YrCyIsgevVLZJGXeyxMAiofN+jby8oAGr8BpQk6xmptw==";
       };
     };
     "multicast-dns-service-types-1.1.0" = {
@@ -28178,13 +28331,13 @@ let
         sha512 = "Hv9USGyH8EsPy0o8pPWE7x3YRIfuZDgMBirzjU6XLebhiSK2g53JlfqgolD0c39ne6wXAfaBNcIAvYe22Bav+Q==";
       };
     };
-    "nanoguard-1.2.2" = {
+    "nanoguard-1.3.0" = {
       name = "nanoguard";
       packageName = "nanoguard";
-      version = "1.2.2";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nanoguard/-/nanoguard-1.2.2.tgz";
-        sha512 = "IMVIZkHP7Ep01foXurcJR59Hj/0yyApNK3JWpVHq2QVdLgo8wGU/ZsodlpL7jJ/m24+lxT0eyavrLCEuYQK2fg==";
+        url = "https://registry.npmjs.org/nanoguard/-/nanoguard-1.3.0.tgz";
+        sha512 = "K/ON5wyflyPyZskdeT3m7Y2gJVkm3QLdKykMCquAbK8A2erstyMpZUc3NG8Nz5jKdfatiYndONrlmLF8+pGl+A==";
       };
     };
     "nanoid-2.1.11" = {
@@ -28650,6 +28803,15 @@ let
         sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c";
       };
     };
+    "next-tick-1.1.0" = {
+      name = "next-tick";
+      packageName = "next-tick";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz";
+        sha512 = "CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==";
+      };
+    };
     "nextgen-events-1.3.0" = {
       name = "nextgen-events";
       packageName = "nextgen-events";
@@ -28740,13 +28902,13 @@ let
         sha512 = "iEOqDAOFl6uN5jZGRj39Jdo8qALzf2HPXtpFso8+BMaDylDrUMYMwhFbfYGgxdnMlsRnxYTwv68kaXEpsHIapg==";
       };
     };
-    "node-abi-2.14.0" = {
+    "node-abi-2.15.0" = {
       name = "node-abi";
       packageName = "node-abi";
-      version = "2.14.0";
+      version = "2.15.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-abi/-/node-abi-2.14.0.tgz";
-        sha512 = "y54KGgEOHnRHlGQi7E5UiryRkH8bmksmQLj/9iLAjoje743YS+KaKB/sDYXgqtT0J16JT3c3AYJZNI98aU/kYg==";
+        url = "https://registry.npmjs.org/node-abi/-/node-abi-2.15.0.tgz";
+        sha512 = "FeLpTS0F39U7hHZU1srAK4Vx+5AHNVOTP+hxBNQknR/54laTHSFIJkDWDqiquY1LeLUgTfPN7sLPhMubx0PLAg==";
       };
     };
     "node-addon-api-1.7.1" = {
@@ -28903,6 +29065,15 @@ let
         sha512 = "sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw==";
       };
     };
+    "node-forge-0.9.0" = {
+      name = "node-forge";
+      packageName = "node-forge";
+      version = "0.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz";
+        sha512 = "7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==";
+      };
+    };
     "node-gyp-3.8.0" = {
       name = "node-gyp";
       packageName = "node-gyp";
@@ -29074,13 +29245,13 @@ let
         sha512 = "wEiT7bSeU9oVHPK7S+mHb3cR6cIf9l205wTiHzhnUAuoDJS+IdwQkkpFgKTYmkL4Py2LvqCU90h85YpQul7QFQ==";
       };
     };
-    "node-releases-1.1.48" = {
+    "node-releases-1.1.49" = {
       name = "node-releases";
       packageName = "node-releases";
-      version = "1.1.48";
+      version = "1.1.49";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.48.tgz";
-        sha512 = "Hr8BbmUl1ujAST0K0snItzEA5zkJTQup8VNTKNfT6Zw8vTJkIiagUPNfxHmgDOyfFYNfKAul40sD0UEYTvwebw==";
+        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.49.tgz";
+        sha512 = "xH8t0LS0disN0mtRCh+eByxFPie+msJUBL/lJDBuap53QGiYPa9joh83K4pCZgWJ+2L4b9h88vCVdXQ60NO2bg==";
       };
     };
     "node-request-by-swagger-1.1.4" = {
@@ -29452,13 +29623,13 @@ let
         sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==";
       };
     };
-    "npm-packlist-2.0.3" = {
+    "npm-packlist-2.1.0" = {
       name = "npm-packlist";
       packageName = "npm-packlist";
-      version = "2.0.3";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.0.3.tgz";
-        sha512 = "geT5P1y+58INE/jlxBHNsucRX7jpZAgW+XkxAe1NWN7N9SNwpueWTUPRoVdJH+hFpqcdAChRUE/HWsXQI+8JaQ==";
+        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.1.0.tgz";
+        sha512 = "XXqrT4WXVc8M1cdL7LCOUflEdyvCu9lKmM5j5mFwXAK8hUMRxzClNml8ox2d8YIDhS7p51AP6zYWNsgNiWuSLQ==";
       };
     };
     "npm-path-2.0.4" = {
@@ -29524,22 +29695,22 @@ let
         sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg==";
       };
     };
-    "npm-registry-fetch-4.0.2" = {
+    "npm-registry-fetch-4.0.3" = {
       name = "npm-registry-fetch";
       packageName = "npm-registry-fetch";
-      version = "4.0.2";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.2.tgz";
-        sha512 = "Z0IFtPEozNdeZRPh3aHHxdG+ZRpzcbQaJLthsm3VhNf6DScicTFRHZzK82u8RsJUsUHkX+QH/zcB/5pmd20H4A==";
+        url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.3.tgz";
+        sha512 = "WGvUx0lkKFhu9MbiGFuT9nG2NpfQ+4dCJwRwwtK2HK5izJEvwDxMeUyqbuMS7N/OkpVCqDorV6rO5E4V9F8lJw==";
       };
     };
-    "npm-registry-fetch-6.0.0" = {
+    "npm-registry-fetch-6.0.2" = {
       name = "npm-registry-fetch";
       packageName = "npm-registry-fetch";
-      version = "6.0.0";
+      version = "6.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-6.0.0.tgz";
-        sha512 = "TSzEzudrky0ArPskchM/7F5SrawBY5acMNtRqFuacEI2lCKEyfBjaENuuIU5Uq2CyHfJ+gWp5QlCprolKa5wKg==";
+        url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-6.0.2.tgz";
+        sha512 = "fffWUYR6J5u11URMuCSOsrr35YO3lNa41ckzIj1XPaznsRTFemIcLCU59A347xQcliUFSB2CJJeQVy5OiIVBcg==";
       };
     };
     "npm-run-4.1.2" = {
@@ -29650,13 +29821,13 @@ let
         sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==";
       };
     };
-    "num-sort-1.0.0" = {
+    "num-sort-2.0.0" = {
       name = "num-sort";
       packageName = "num-sort";
-      version = "1.0.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/num-sort/-/num-sort-1.0.0.tgz";
-        sha1 = "cabec1fd5f4da4aca995af90b7a0f379944e1dbd";
+        url = "https://registry.npmjs.org/num-sort/-/num-sort-2.0.0.tgz";
+        sha512 = "tqzBd1/b4CPp94zlhOmWDEZ9kUue6Kmg6CpRp7RKJPZQKjNve8Ui3DkqOeZCIlmGrAzJDpdZP9ZEANC4EqYPsw==";
       };
     };
     "number-is-nan-1.0.1" = {
@@ -29993,6 +30164,15 @@ let
         sha1 = "304e97c85adda70ecd7f08da450678ef90f0b707";
       };
     };
+    "obuf-1.1.2" = {
+      name = "obuf";
+      packageName = "obuf";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz";
+        sha512 = "PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==";
+      };
+    };
     "obv-0.0.1" = {
       name = "obv";
       packageName = "obv";
@@ -30461,6 +30641,15 @@ let
         sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e";
       };
     };
+    "original-1.0.2" = {
+      name = "original";
+      packageName = "original";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/original/-/original-1.0.2.tgz";
+        sha512 = "hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==";
+      };
+    };
     "os-browserify-0.3.0" = {
       name = "os-browserify";
       packageName = "os-browserify";
@@ -30785,13 +30974,13 @@ let
         sha512 = "3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg==";
       };
     };
-    "p-queue-6.2.1" = {
+    "p-queue-6.3.0" = {
       name = "p-queue";
       packageName = "p-queue";
-      version = "6.2.1";
+      version = "6.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-queue/-/p-queue-6.2.1.tgz";
-        sha512 = "wV8yC/rkuWpgu9LGKJIb48OynYSrE6lVl2Bx6r8WjbyVKrFAzzQ/QevAvwnDjlD+mLt8xy0LTDOU1freOvMTCg==";
+        url = "https://registry.npmjs.org/p-queue/-/p-queue-6.3.0.tgz";
+        sha512 = "fg5dJlFpd5+3CgG3/0ogpVZUeJbjiyXFg0nu53hrOYsybqSiDyxyOpad0Rm6tAiGjgztAwkyvhlYHC53OiAJOA==";
       };
     };
     "p-reduce-1.0.0" = {
@@ -30803,6 +30992,15 @@ let
         sha1 = "18c2b0dd936a4690a529f8231f58a0fdb6a47dfa";
       };
     };
+    "p-retry-3.0.1" = {
+      name = "p-retry";
+      packageName = "p-retry";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz";
+        sha512 = "XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==";
+      };
+    };
     "p-some-4.1.0" = {
       name = "p-some";
       packageName = "p-some";
@@ -31955,13 +32153,13 @@ let
         sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa";
       };
     };
-    "pino-5.14.0" = {
+    "pino-5.15.0" = {
       name = "pino";
       packageName = "pino";
-      version = "5.14.0";
+      version = "5.15.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pino/-/pino-5.14.0.tgz";
-        sha512 = "Vj1f2wAojTGesogT0hsA/ua8ALltCOBCcA1nkEoDfnTsVWpgBu5UVSY7OdjiGmrMOKHBm24nd3nKXzyPUYJ3ig==";
+        url = "https://registry.npmjs.org/pino/-/pino-5.15.0.tgz";
+        sha512 = "7+FXMTA3H3sNP5+2miY2K9JKnAAW5GKuhHfNWsukFCsPprGQY3ctqpwbV74wAHW3Nl93cEEQ1G82MgOLM8P7TQ==";
       };
     };
     "pino-std-serializers-2.4.2" = {
@@ -32253,15 +32451,6 @@ let
         sha512 = "soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==";
       };
     };
-    "postcss-7.0.24" = {
-      name = "postcss";
-      packageName = "postcss";
-      version = "7.0.24";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss/-/postcss-7.0.24.tgz";
-        sha512 = "Xl0XvdNWg+CblAXzNvbSOUvgJXwSjmbAKORqyw9V2AlHrm1js2gFw9y3jibBAhpKZi8b5JzJCVh/FyzPsTtgTA==";
-      };
-    };
     "postcss-7.0.26" = {
       name = "postcss";
       packageName = "postcss";
@@ -32532,13 +32721,13 @@ let
         sha512 = "EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==";
       };
     };
-    "postcss-selector-parser-3.1.1" = {
+    "postcss-selector-parser-3.1.2" = {
       name = "postcss-selector-parser";
       packageName = "postcss-selector-parser";
-      version = "3.1.1";
+      version = "3.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz";
-        sha1 = "4f875f4afb0c96573d5cf4d74011aee250a7e865";
+        url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz";
+        sha512 = "h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==";
       };
     };
     "postcss-selector-parser-5.0.0" = {
@@ -32892,6 +33081,15 @@ let
         sha512 = "X11vso1oNLtyDa2j8fsMol2fph1+5PoQ4vpEc1it/rM8eLuRTmrmTg4jfn82WhNur241AYitgjKCgmlgMRZesw==";
       };
     };
+    "process-exists-4.0.0" = {
+      name = "process-exists";
+      packageName = "process-exists";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/process-exists/-/process-exists-4.0.0.tgz";
+        sha512 = "BnlcYPiZjSW+fye12g9B7UeCzMAOdMkxuTz3zcytJ2BHwYZf2RoKvuuwUcJLeXlGj58x9YQrvhT21PmKhUc4UQ==";
+      };
+    };
     "process-nextick-args-1.0.7" = {
       name = "process-nextick-args";
       packageName = "process-nextick-args";
@@ -33036,13 +33234,13 @@ let
         sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe";
       };
     };
-    "prompts-2.3.0" = {
+    "prompts-2.3.1" = {
       name = "prompts";
       packageName = "prompts";
-      version = "2.3.0";
+      version = "2.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prompts/-/prompts-2.3.0.tgz";
-        sha512 = "NfbbPPg/74fT7wk2XYQ7hAIp9zJyZp5Fu19iRbORqqy1BhtrkZ0fPafBU+7bmn8ie69DpT0R6QpJIN2oisYjJg==";
+        url = "https://registry.npmjs.org/prompts/-/prompts-2.3.1.tgz";
+        sha512 = "qIP2lQyCwYbdzcqHIUi2HAxiWixhoM9OdLCWf8txXsapC/X9YdsCoeyRIXE/GP+Q0J37Q7+XN/MFqbUa7IzXNA==";
       };
     };
     "promzard-0.3.0" = {
@@ -33243,13 +33441,22 @@ let
         sha512 = "DSpMj8PI5W7v2G4+rE+BymTKZPjlu6t/M1N6rPAa6Hwn+/e8jDmFJaq8/kpoGCvwd75g2h5DbjF2MduOMNyrsQ==";
       };
     };
-    "ps-list-5.0.1" = {
+    "ps-list-6.3.0" = {
       name = "ps-list";
       packageName = "ps-list";
-      version = "5.0.1";
+      version = "6.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ps-list/-/ps-list-5.0.1.tgz";
-        sha512 = "HfafYofNB+Ud+/xdptoYPCkDQ6u1jo9bpgbcyiPtBQ2z+mr1Bb3zGeeXQ30ymBUq3aEJrKLnnvpSZU7WKEiihA==";
+        url = "https://registry.npmjs.org/ps-list/-/ps-list-6.3.0.tgz";
+        sha512 = "qau0czUSB0fzSlBOQt0bo+I2v6R+xiQdj78e1BR/Qjfl5OHWJ/urXi8+ilw1eHe+5hSeDI1wrwVTgDp2wst4oA==";
+      };
+    };
+    "ps-list-7.0.0" = {
+      name = "ps-list";
+      packageName = "ps-list";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ps-list/-/ps-list-7.0.0.tgz";
+        sha512 = "ZDhdxqb+kE895BAvqIdGnWwfvB43h7KHMIcJC0hw7xLbbiJoprS+bqZxuGZ0jWdDxZEvB3jpnfgJyOn3lmsH+Q==";
       };
     };
     "ps-tree-0.0.3" = {
@@ -33981,6 +34188,15 @@ let
         sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
       };
     };
+    "pupa-2.0.1" = {
+      name = "pupa";
+      packageName = "pupa";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pupa/-/pupa-2.0.1.tgz";
+        sha512 = "hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA==";
+      };
+    };
     "purgecss-1.4.2" = {
       name = "purgecss";
       packageName = "purgecss";
@@ -34791,13 +35007,13 @@ let
         sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==";
       };
     };
-    "readable-stream-3.5.0" = {
+    "readable-stream-3.6.0" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "3.5.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.5.0.tgz";
-        sha512 = "gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA==";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz";
+        sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==";
       };
     };
     "readdir-scoped-modules-1.1.0" = {
@@ -35178,13 +35394,13 @@ let
         sha1 = "7ee8f84dc6fa792d3fd0ae228d24bd949ead205c";
       };
     };
-    "regjsparser-0.6.2" = {
+    "regjsparser-0.6.3" = {
       name = "regjsparser";
       packageName = "regjsparser";
-      version = "0.6.2";
+      version = "0.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.2.tgz";
-        sha512 = "E9ghzUtoLwDekPT0DYCp+c4h+bvuUpe6rRHCTYn6eGoqj1LgKXxT6I0Il4WbjhQkOghzi/V+y03bPKvbllL93Q==";
+        url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.3.tgz";
+        sha512 = "8uZvYbnfAtEm9Ab8NTb3hdLwL4g/LQzEYP7Xs27T96abJCCE2d6r3cPZPQEsLKy0vRSGVNG+/zVGtLr86HQduA==";
       };
     };
     "rehype-sort-attribute-values-2.0.1" = {
@@ -35466,6 +35682,15 @@ let
         sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==";
       };
     };
+    "request-2.88.2" = {
+      name = "request";
+      packageName = "request";
+      version = "2.88.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz";
+        sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==";
+      };
+    };
     "request-2.9.203" = {
       name = "request";
       packageName = "request";
@@ -36636,6 +36861,24 @@ let
         sha1 = "0e7350acdec80b1108528786ec1d4418d11b396d";
       };
     };
+    "select-hose-2.0.0" = {
+      name = "select-hose";
+      packageName = "select-hose";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz";
+        sha1 = "625d8658f865af43ec962bfc376a37359a4994ca";
+      };
+    };
+    "selfsigned-1.10.7" = {
+      name = "selfsigned";
+      packageName = "selfsigned";
+      version = "1.10.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz";
+        sha512 = "8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==";
+      };
+    };
     "semaphore-async-await-1.5.1" = {
       name = "semaphore-async-await";
       packageName = "semaphore-async-await";
@@ -36789,13 +37032,13 @@ let
         sha512 = "WfuG+fl6eh3eZ2qAf6goB7nhiCd7NPXhmyFxigB/TOkQyeLP8w8GsVehvtGNtnNmyboz4TgeK40B1Kbql/8c5A==";
       };
     };
-    "semver-7.1.2" = {
+    "semver-7.1.3" = {
       name = "semver";
       packageName = "semver";
-      version = "7.1.2";
+      version = "7.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-7.1.2.tgz";
-        sha512 = "BJs9T/H8sEVHbeigqzIEo57Iu/3DG6c4QoqTfbQB3BPA4zgzAomh/Fk9E7QtjWQ8mx2dgA9YCfSF4y9k9bHNpQ==";
+        url = "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz";
+        sha512 = "ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==";
       };
     };
     "semver-compare-1.0.0" = {
@@ -37122,13 +37365,13 @@ let
         sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==";
       };
     };
-    "seventh-0.7.30" = {
+    "seventh-0.7.34" = {
       name = "seventh";
       packageName = "seventh";
-      version = "0.7.30";
+      version = "0.7.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/seventh/-/seventh-0.7.30.tgz";
-        sha512 = "GDX4eZEZXQFqURkUA802R3GkawzGA8zm2QS9AfFqPcJKakoytxhI0soTRfhEqNhqh0RrRFO/EraffrAULaxiQQ==";
+        url = "https://registry.npmjs.org/seventh/-/seventh-0.7.34.tgz";
+        sha512 = "9YR6YjZIckltwsfomtsUuyHEGSx7gNHdXDX+hPmvVeHJLiGpFnLRm3izKWCVjb70cYZYUfdlA9osUEqtH/J6uQ==";
       };
     };
     "sha.js-2.4.11" = {
@@ -37329,13 +37572,13 @@ let
         sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590";
       };
     };
-    "sign-addon-2.0.4" = {
+    "sign-addon-2.0.5" = {
       name = "sign-addon";
       packageName = "sign-addon";
-      version = "2.0.4";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sign-addon/-/sign-addon-2.0.4.tgz";
-        sha512 = "QKfE558nIQ2o9VACAIMQBI4I+IhlL+k9bxhVsQUb4B6Bu+tC8IDSlnHrydcYPf3AB6K+g+BVzbDD1JlSw4bRDg==";
+        url = "https://registry.npmjs.org/sign-addon/-/sign-addon-2.0.5.tgz";
+        sha512 = "dVjIWe1VJ2VQCdScREWXWECmJhgjpJMqwPKkW+L78PPx2Jyr/t+//kNHqG1hYrmIsvQN7vGjAjv9s7ix0vw0zA==";
       };
     };
     "signal-exit-3.0.2" = {
@@ -37797,13 +38040,13 @@ let
         sha512 = "A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA==";
       };
     };
-    "snyk-mvn-plugin-2.8.0" = {
+    "snyk-mvn-plugin-2.9.0" = {
       name = "snyk-mvn-plugin";
       packageName = "snyk-mvn-plugin";
-      version = "2.8.0";
+      version = "2.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.8.0.tgz";
-        sha512 = "Jt6lsVOFOYj7rp0H2IWz/BZS9xxaO0jEFTAoafLCocJIWWuGhPpVocCqmh/hrYAdKY9gS4gVOViMJ3EvcC1r1Q==";
+        url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.9.0.tgz";
+        sha512 = "FBl78wCHNm0P/QOlipvOxzN2LrXlS6NBN0zXWYZ09P0hG65rmA3gKTg0QsHUjIBh1Pg9bw5aG4r/AHle6a6g6w==";
       };
     };
     "snyk-nodejs-lockfile-parser-1.17.0" = {
@@ -38040,6 +38283,24 @@ let
         sha512 = "/G/VOI+3DBp0+DJKW4KesGnQkQPFmUCbA/oO2QGT6CWxU7hLGWqU3tyuzeSK/dqcyeHsQg1vTe9jiZI8GU9SCQ==";
       };
     };
+    "sockjs-0.3.19" = {
+      name = "sockjs";
+      packageName = "sockjs";
+      version = "0.3.19";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz";
+        sha512 = "V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==";
+      };
+    };
+    "sockjs-client-1.4.0" = {
+      name = "sockjs-client";
+      packageName = "sockjs-client";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz";
+        sha512 = "5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==";
+      };
+    };
     "socks-2.3.3" = {
       name = "socks";
       packageName = "socks";
@@ -38463,6 +38724,24 @@ let
         sha1 = "70eff23cde4e97d52a445f65afddcc5695eb5edb";
       };
     };
+    "spdy-4.0.1" = {
+      name = "spdy";
+      packageName = "spdy";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz";
+        sha512 = "HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==";
+      };
+    };
+    "spdy-transport-3.0.0" = {
+      name = "spdy-transport";
+      packageName = "spdy-transport";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz";
+        sha512 = "hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==";
+      };
+    };
     "speedometer-0.1.4" = {
       name = "speedometer";
       packageName = "speedometer";
@@ -38670,13 +38949,13 @@ let
         sha512 = "qe3qpvchJ+gnH8M/ge4rpL+7eRbSmsEAzNwHkDdrW06OBcziQ6/KuAdmcR6joxCbNeoAXAZF+inkefgE16okXA==";
       };
     };
-    "ssb-client-4.8.0" = {
+    "ssb-client-4.9.0" = {
       name = "ssb-client";
       packageName = "ssb-client";
-      version = "4.8.0";
+      version = "4.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssb-client/-/ssb-client-4.8.0.tgz";
-        sha512 = "5nfx08Cgl176IyK1uQrHO3SBord1rUDKUJvrz9ddgYWIL78+/puk3zs26rt3BqDTPWBtd/Txdy9OLHBYNDhK8A==";
+        url = "https://registry.npmjs.org/ssb-client/-/ssb-client-4.9.0.tgz";
+        sha512 = "5wPrVA82Uk3deV2oiCZEbm1kMp9r/5xTT2VvwwMLZS3fDD9FnLOi0kjUUh3OTP+jGBK7bVHRmnvXIVy6ETnSpA==";
       };
     };
     "ssb-config-2.3.9" = {
@@ -40407,13 +40686,13 @@ let
         sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==";
       };
     };
-    "systeminformation-4.21.1" = {
+    "systeminformation-4.22.0" = {
       name = "systeminformation";
       packageName = "systeminformation";
-      version = "4.21.1";
+      version = "4.22.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.21.1.tgz";
-        sha512 = "IQMy+ieSThY+MfLZaCdQsGCteMah4nhsDQcnT9DhocoJnhMKVUqDY025j1i+MSm7qdUCMXS5oV7dvttr+pSodw==";
+        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.22.0.tgz";
+        sha512 = "Sq6H99xxvBeN54kUdM9DCdbesSLb+S5MZnUD2qy7gutyfS0REYZ4QN6tfsWbYhcsaocrvcpCwoOHblbO+caN4A==";
       };
     };
     "syswide-cas-5.3.0" = {
@@ -40642,15 +40921,6 @@ let
         sha512 = "+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw==";
       };
     };
-    "taskkill-2.0.0" = {
-      name = "taskkill";
-      packageName = "taskkill";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/taskkill/-/taskkill-2.0.0.tgz";
-        sha1 = "a354305702a964357033027aa949eaed5331b784";
-      };
-    };
     "taskkill-3.1.0" = {
       name = "taskkill";
       packageName = "taskkill";
@@ -40804,13 +41074,13 @@ let
         sha512 = "a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==";
       };
     };
-    "terminal-kit-1.32.3" = {
+    "terminal-kit-1.33.10" = {
       name = "terminal-kit";
       packageName = "terminal-kit";
-      version = "1.32.3";
+      version = "1.33.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.32.3.tgz";
-        sha512 = "9iRH+8HbY6KSjOUVF7Ja9s8SyYEJ2eMNI9vfsNvMnDOG9iXly2bLyK1WIwZF7mSZZCZshUiNkuM25BDN3Nj81Q==";
+        url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.33.10.tgz";
+        sha512 = "xKJAeyfm9EIkHWWz0C/GXbYW5LytAMzuVT9xZdI9kgLnm9Z7lNkly0WdBCH8WOPD4inZpKjNzBKr0StEOJXBNA==";
       };
     };
     "terser-3.17.0" = {
@@ -41704,6 +41974,15 @@ let
         sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09";
       };
     };
+    "tr46-2.0.0" = {
+      name = "tr46";
+      packageName = "tr46";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tr46/-/tr46-2.0.0.tgz";
+        sha512 = "LrErSqfhdUw73AC/eXV2fEmNkvgSYxfm5lvxnLvuVgoVDknvD28Pa5FeDGc8RuVouDxUD3GnHHFv7xnBp7As5w==";
+      };
+    };
     "transliteration-1.6.6" = {
       name = "transliteration";
       packageName = "transliteration";
@@ -42073,13 +42352,13 @@ let
         sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
       };
     };
-    "tweetnacl-1.0.2" = {
+    "tweetnacl-1.0.3" = {
       name = "tweetnacl";
       packageName = "tweetnacl";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.2.tgz";
-        sha512 = "+8aPRjmXgf1VqvyxSlBUzKzeYqVS9Ai8vZ28g+mL7dNQl1jlUTCMDZnvNQdAS1xTywMkIXwJsfipsR/6s2+syw==";
+        url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz";
+        sha512 = "6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==";
       };
     };
     "tweetnacl-auth-0.3.1" = {
@@ -42487,13 +42766,13 @@ let
         sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa";
       };
     };
-    "uncss-0.17.2" = {
+    "uncss-0.17.3" = {
       name = "uncss";
       packageName = "uncss";
-      version = "0.17.2";
+      version = "0.17.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uncss/-/uncss-0.17.2.tgz";
-        sha512 = "hu2HquwDItuGDem4YsJROdAD8SknmWtM24zwhQax6J1se8tPjV1cnwPKhtjodzBaUhaL8Zb3hlGdZ2WAUpbAOg==";
+        url = "https://registry.npmjs.org/uncss/-/uncss-0.17.3.tgz";
+        sha512 = "ksdDWl81YWvF/X14fOSw4iu8tESDHFIeyKIeDrK6GEVTQvqJc1WlOEXqostNwOCi3qAj++4EaLsdAgPmUbEyog==";
       };
     };
     "undeclared-identifiers-1.1.3" = {
@@ -42505,13 +42784,13 @@ let
         sha512 = "pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw==";
       };
     };
-    "undefsafe-2.0.2" = {
+    "undefsafe-2.0.3" = {
       name = "undefsafe";
       packageName = "undefsafe";
-      version = "2.0.2";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.2.tgz";
-        sha1 = "225f6b9e0337663e0d8e7cfd686fc2836ccace76";
+        url = "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.3.tgz";
+        sha512 = "nrXZwwXrD/T/JXeygJqdCO6NZZ1L66HrxM/Z7mIq2oPanoN0F1nLx3lwJMu6AwJY69hdixaFQOuoYsMjE5/C2A==";
       };
     };
     "underscore-1.2.1" = {
@@ -42883,22 +43162,22 @@ let
         sha512 = "dFil/AN6vqhnQWNCZk0GF/G3+Q5YwsB+PqjnzvpO2wzdRtUJ1E8PN+XRE/PRr/G3FzKjRTJU0haqE0Ekl+O3Ag==";
       };
     };
-    "unist-util-modify-children-1.1.5" = {
+    "unist-util-modify-children-1.1.6" = {
       name = "unist-util-modify-children";
       packageName = "unist-util-modify-children";
-      version = "1.1.5";
+      version = "1.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-1.1.5.tgz";
-        sha512 = "XeL5qqyoS3TEueCKEzHusWXE9JBDJPE4rl6LmcLOwlzv0RIZrcMNqKx02GSK3Ms4v45ldu+ltPxG42FBMVdPZw==";
+        url = "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-1.1.6.tgz";
+        sha512 = "TOA6W9QLil+BrHqIZNR4o6IA5QwGOveMbnQxnWYq+7EFORx9vz/CHrtzF36zWrW61E2UKw7sM1KPtIgeceVwXw==";
       };
     };
-    "unist-util-position-3.0.4" = {
+    "unist-util-position-3.1.0" = {
       name = "unist-util-position";
       packageName = "unist-util-position";
-      version = "3.0.4";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.0.4.tgz";
-        sha512 = "tWvIbV8goayTjobxDIr4zVTyG+Q7ragMSMeKC3xnPl9xzIc0+she8mxXLM3JVNDDsfARPbCd3XdzkyLdo7fF3g==";
+        url = "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.1.0.tgz";
+        sha512 = "w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==";
       };
     };
     "unist-util-remove-position-1.1.4" = {
@@ -42937,13 +43216,13 @@ let
         sha512 = "AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==";
       };
     };
-    "unist-util-visit-children-1.1.3" = {
+    "unist-util-visit-children-1.1.4" = {
       name = "unist-util-visit-children";
       packageName = "unist-util-visit-children";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unist-util-visit-children/-/unist-util-visit-children-1.1.3.tgz";
-        sha512 = "/GQ8KNRrG+qD30H76FZNc6Ok+8XTu8lxJByN5LnQ4eQfqxda2gP0CPsCX63BRB26ZRMNf6i1c+jlvNlqysEoFg==";
+        url = "https://registry.npmjs.org/unist-util-visit-children/-/unist-util-visit-children-1.1.4.tgz";
+        sha512 = "sA/nXwYRCQVRwZU2/tQWUqJ9JSFM1X3x7JIOsIgSzrFHcfVt6NkzDtKzyxg2cZWkCwGF9CO8x4QNZRJRMK8FeQ==";
       };
     };
     "unist-util-visit-parents-2.1.2" = {
@@ -43162,6 +43441,15 @@ let
         sha512 = "p9zf71hWt5GVXM4iEBujpUgx8mK9AWiCCapEJm/O1z5ntCim83Z1ATqzZFBHFYqx03laMqv8LiDgs/7ikXjf/g==";
       };
     };
+    "update-notifier-4.1.0" = {
+      name = "update-notifier";
+      packageName = "update-notifier";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.0.tgz";
+        sha512 = "w3doE1qtI0/ZmgeoDoARmI5fjDoT93IfKgEGqm26dGUOh8oNpaSTsGNdYRN/SjOuo10jcJGwkEL3mroKzktkew==";
+      };
+    };
     "upnp-device-client-1.0.2" = {
       name = "upnp-device-client";
       packageName = "upnp-device-client";
@@ -44359,6 +44647,15 @@ let
         sha512 = "QL7Fe1FT6PdLtVzwJeZ78pTic4eZbzLRy7yAQgPb9xalqqgZESR0+yDZPwJrM3E7PzOmwHBceYcJR54eQZ7Kng==";
       };
     };
+    "vscode-languageserver-6.1.1" = {
+      name = "vscode-languageserver";
+      packageName = "vscode-languageserver";
+      version = "6.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.1.1.tgz";
+        sha512 = "DueEpkUAkD5XTR4MLYNr6bQIp/UFR0/IPApgXU3YfCBCB08u2sm9hRCs6DxYZELkk++STPjpcjksR2H8qI3cDQ==";
+      };
+    };
     "vscode-languageserver-protocol-3.14.1" = {
       name = "vscode-languageserver-protocol";
       packageName = "vscode-languageserver-protocol";
@@ -44368,13 +44665,13 @@ let
         sha512 = "IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==";
       };
     };
-    "vscode-languageserver-protocol-3.15.2" = {
+    "vscode-languageserver-protocol-3.15.3" = {
       name = "vscode-languageserver-protocol";
       packageName = "vscode-languageserver-protocol";
-      version = "3.15.2";
+      version = "3.15.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.2.tgz";
-        sha512 = "GdL05JKOgZ76RDg3suiGCl9enESM7iQgGw4x93ibTh4sldvZmakHmTeZ4iUApPPGKf6O3OVBtrsksBXnHYaxNg==";
+        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz";
+        sha512 = "zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==";
       };
     };
     "vscode-languageserver-protocol-3.6.0" = {
@@ -44629,6 +44926,15 @@ let
         sha512 = "i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==";
       };
     };
+    "wbuf-1.7.3" = {
+      name = "wbuf";
+      packageName = "wbuf";
+      version = "1.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz";
+        sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==";
+      };
+    };
     "wcwidth-1.0.1" = {
       name = "wcwidth";
       packageName = "wcwidth";
@@ -44692,22 +44998,31 @@ let
         sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==";
       };
     };
-    "webpack-4.41.5" = {
-      name = "webpack";
-      packageName = "webpack";
-      version = "4.41.5";
+    "webidl-conversions-5.0.0" = {
+      name = "webidl-conversions";
+      packageName = "webidl-conversions";
+      version = "5.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack/-/webpack-4.41.5.tgz";
-        sha512 = "wp0Co4vpyumnp3KlkmpM5LWuzvZYayDwM2n17EHFr4qxBBbRokC7DJawPJC7TfSFZ9HZ6GsdH40EBj4UV0nmpw==";
+        url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz";
+        sha512 = "VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==";
       };
     };
-    "webpack-cli-3.3.10" = {
+    "webpack-4.41.6" = {
+      name = "webpack";
+      packageName = "webpack";
+      version = "4.41.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/webpack/-/webpack-4.41.6.tgz";
+        sha512 = "yxXfV0Zv9WMGRD+QexkZzmGIh54bsvEs+9aRWxnN8erLWEOehAKUTeNBoUbA6HPEZPlRo7KDi2ZcNveoZgK9MA==";
+      };
+    };
+    "webpack-cli-3.3.11" = {
       name = "webpack-cli";
       packageName = "webpack-cli";
-      version = "3.3.10";
+      version = "3.3.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.10.tgz";
-        sha512 = "u1dgND9+MXaEt74sJR4PR7qkPxXUSQ0RXYq8x1L6Jg1MYVEmGPrH6Ah6C4arD4r0J1P5HKjRqpab36k0eIzPqg==";
+        url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.11.tgz";
+        sha512 = "dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g==";
       };
     };
     "webpack-core-0.6.9" = {
@@ -44719,6 +45034,24 @@ let
         sha1 = "fc571588c8558da77be9efb6debdc5a3b172bdc2";
       };
     };
+    "webpack-dev-middleware-3.7.2" = {
+      name = "webpack-dev-middleware";
+      packageName = "webpack-dev-middleware";
+      version = "3.7.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz";
+        sha512 = "1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==";
+      };
+    };
+    "webpack-log-2.0.0" = {
+      name = "webpack-log";
+      packageName = "webpack-log";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz";
+        sha512 = "cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==";
+      };
+    };
     "webpack-sources-1.4.3" = {
       name = "webpack-sources";
       packageName = "webpack-sources";
@@ -44818,6 +45151,15 @@ let
         sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==";
       };
     };
+    "whatwg-url-8.0.0" = {
+      name = "whatwg-url";
+      packageName = "whatwg-url";
+      version = "8.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.0.0.tgz";
+        sha512 = "41ou2Dugpij8/LPO5Pq64K5q++MnRCBpEHvQr26/mArEKTkCV5aoXIqyhuYtE0pkqScXwhf2JP57rkRTYM29lQ==";
+      };
+    };
     "whatwg-url-compat-0.6.5" = {
       name = "whatwg-url-compat";
       packageName = "whatwg-url-compat";
@@ -45737,13 +46079,13 @@ let
         sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943";
       };
     };
-    "xregexp-4.2.4" = {
+    "xregexp-4.3.0" = {
       name = "xregexp";
       packageName = "xregexp";
-      version = "4.2.4";
+      version = "4.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xregexp/-/xregexp-4.2.4.tgz";
-        sha512 = "sO0bYdYeJAJBcJA8g7MJJX7UrOZIfJPd8U2SC7B2Dd/J24U0aQNoGp33shCaBSWeb0rD5rh6VBUIXOkGal1TZA==";
+        url = "https://registry.npmjs.org/xregexp/-/xregexp-4.3.0.tgz";
+        sha512 = "7jXDIFXh5yJ/orPn4SXjuVrWWoi4Cr8jfV1eHv9CixKSbU+jY4mxfrBwAuDvupPNKpMUY+FeIqsVw/JLT9+B8g==";
       };
     };
     "xsalsa20-1.1.0" = {
@@ -45953,15 +46295,6 @@ let
         sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==";
       };
     };
-    "yargs-14.0.0" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "14.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-14.0.0.tgz";
-        sha512 = "ssa5JuRjMeZEUjg7bEL99AwpitxU/zWGAGpdj0di41pOEmJti8NR6kyUIJBkR78DTYNPZOU08luUo0GTHuB+ow==";
-      };
-    };
     "yargs-14.2.2" = {
       name = "yargs";
       packageName = "yargs";
@@ -45971,13 +46304,13 @@ let
         sha512 = "/4ld+4VV5RnrynMhPZJ/ZpOCGSCeghMykZ3BhdFBDa9Wy/RH6uEGNWDJog+aUlq+9OM1CFTgtYRW5Is1Po9NOA==";
       };
     };
-    "yargs-15.0.2" = {
+    "yargs-15.1.0" = {
       name = "yargs";
       packageName = "yargs";
-      version = "15.0.2";
+      version = "15.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-15.0.2.tgz";
-        sha512 = "GH/X/hYt+x5hOat4LMnCqMd8r5Cv78heOMIJn1hr7QPPBqfeC6p89Y78+WB9yGDvfpCvgasfmWLzNzEioOUD9Q==";
+        url = "https://registry.npmjs.org/yargs/-/yargs-15.1.0.tgz";
+        sha512 = "T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==";
       };
     };
     "yargs-3.10.0" = {
@@ -46223,13 +46556,13 @@ let
         sha512 = "CP0fwGk5Y+jel+A0AQbyqnIFZRRpkKOeYUibiTSmlgV9PcgNFFVwn86VcUIpDLOqVjF+9v+O9FWQMo+IUcV2mA==";
       };
     };
-    "yeoman-environment-2.7.0" = {
+    "yeoman-environment-2.8.0" = {
       name = "yeoman-environment";
       packageName = "yeoman-environment";
-      version = "2.7.0";
+      version = "2.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.7.0.tgz";
-        sha512 = "YNzSUWgJVSgnm0qgLON4Gb2nTm+kywBiWjK4MbvosjUP2YJJ30lNhEx7ukyzKRPUlsavd5IsuALtF6QaVrq81A==";
+        url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.8.0.tgz";
+        sha512 = "BbJeEna23Qx90fBiJt1awcZ9okfPY/rP3xZYsk1rD3x8LuQgpo4BfegPvQT1sqqh2+gYVZmYZMv5pS8+Muyr9Q==";
       };
     };
     "yn-3.1.1" = {
@@ -46346,17 +46679,17 @@ in
   "@angular/cli" = nodeEnv.buildNodePackage {
     name = "_at_angular_slash_cli";
     packageName = "@angular/cli";
-    version = "9.0.1";
+    version = "9.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@angular/cli/-/cli-9.0.1.tgz";
-      sha512 = "/nykTIqZq1plxaXVoMzAqjnExGhkYoSoq88AE4Mb31d6n/SW2DFh62C3hze+atI6YLqeFaPhYuA5zG+z3oOXbQ==";
+      url = "https://registry.npmjs.org/@angular/cli/-/cli-9.0.2.tgz";
+      sha512 = "ih3bnvav94MXI9YpwJ4AaETfUGwzc+S2jg4vkfYMuBeWO8kJ7Ma4f2ZriIwWyfHWHlBLHDF6OjAVdisBKPpQag==";
     };
     dependencies = [
-      sources."@angular-devkit/architect-0.900.1"
-      sources."@angular-devkit/core-9.0.1"
-      sources."@angular-devkit/schematics-9.0.1"
-      sources."@schematics/angular-9.0.1"
-      (sources."@schematics/update-0.900.1" // {
+      sources."@angular-devkit/architect-0.900.2"
+      sources."@angular-devkit/core-9.0.2"
+      sources."@angular-devkit/schematics-9.0.2"
+      sources."@schematics/angular-9.0.2"
+      (sources."@schematics/update-0.900.2" // {
         dependencies = [
           (sources."npm-package-arg-7.0.0" // {
             dependencies = [
@@ -46395,7 +46728,7 @@ in
       sources."caseless-0.12.0"
       sources."chalk-2.4.2"
       sources."chardet-0.7.0"
-      sources."chownr-1.1.3"
+      sources."chownr-1.1.4"
       sources."cli-cursor-3.1.0"
       sources."cli-spinners-2.2.0"
       sources."cli-width-2.2.0"
@@ -46436,7 +46769,7 @@ in
       sources."fast-deep-equal-2.0.1"
       sources."fast-json-stable-stringify-2.0.0"
       sources."figgy-pudding-3.5.1"
-      sources."figures-3.1.0"
+      sources."figures-3.2.0"
       sources."flush-write-stream-1.1.1"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
@@ -46541,7 +46874,7 @@ in
           sources."semver-5.7.1"
         ];
       })
-      sources."npm-registry-fetch-4.0.2"
+      sources."npm-registry-fetch-4.0.3"
       sources."oauth-sign-0.9.0"
       sources."object-inspect-1.7.0"
       sources."object-keys-1.1.1"
@@ -46585,7 +46918,7 @@ in
         ];
       })
       sources."readdir-scoped-modules-1.1.0"
-      sources."request-2.88.0"
+      sources."request-2.88.2"
       sources."resolve-1.15.1"
       sources."restore-cursor-3.1.0"
       sources."retry-0.10.1"
@@ -46639,11 +46972,7 @@ in
       sources."through-2.3.8"
       sources."through2-2.0.5"
       sources."tmp-0.0.33"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."tslib-1.10.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
@@ -46875,7 +47204,7 @@ in
       })
       sources."handlebars-4.5.3"
       sources."has-symbols-1.0.1"
-      sources."http-cache-semantics-4.0.3"
+      sources."http-cache-semantics-4.0.4"
       sources."ignore-5.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -46914,7 +47243,7 @@ in
       sources."matcher-2.0.0"
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
-      sources."mimic-response-2.0.0"
+      sources."mimic-response-2.1.0"
       sources."minimatch-3.0.4"
       sources."minimatch-all-1.1.0"
       sources."minimist-1.2.0"
@@ -46956,7 +47285,7 @@ in
       sources."pumpify-1.5.1"
       sources."queue-4.5.1"
       sources."quick-lru-4.0.1"
-      sources."readable-stream-3.5.0"
+      sources."readable-stream-3.6.0"
       sources."remove-bom-buffer-3.0.0"
       (sources."remove-bom-stream-1.2.0" // {
         dependencies = [
@@ -47156,12 +47485,7 @@ in
       sources."psl-1.7.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
-      (sources."request-2.88.0" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-          sources."tough-cookie-2.4.3"
-        ];
-      })
+      sources."request-2.88.2"
       sources."request-promise-core-1.1.3"
       sources."request-promise-native-1.0.8"
       sources."restore-cursor-2.0.0"
@@ -47227,14 +47551,10 @@ in
     };
     dependencies = [
       sources."@akryum/winattr-3.0.0"
-      (sources."@apollo/federation-0.11.3" // {
-        dependencies = [
-          sources."apollo-graphql-0.3.7"
-        ];
-      })
+      sources."@apollo/federation-0.12.0"
       (sources."@apollo/protobufjs-1.0.3" // {
         dependencies = [
-          sources."@types/node-10.17.14"
+          sources."@types/node-10.17.15"
         ];
       })
       sources."@apollographql/apollo-tools-0.4.3"
@@ -47377,7 +47697,7 @@ in
           sources."semver-5.7.1"
         ];
       })
-      sources."@oclif/config-1.13.3"
+      sources."@oclif/config-1.14.0"
       (sources."@oclif/errors-1.2.2" // {
         dependencies = [
           sources."clean-stack-1.3.0"
@@ -47442,12 +47762,12 @@ in
       sources."@types/graphql-upload-8.0.3"
       sources."@types/http-assert-1.5.1"
       sources."@types/keygrip-1.0.2"
-      sources."@types/koa-2.11.0"
+      sources."@types/koa-2.11.1"
       sources."@types/koa-compose-3.2.5"
       sources."@types/long-4.0.1"
       sources."@types/mime-2.0.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.0"
+      sources."@types/node-13.7.1"
       sources."@types/node-fetch-2.5.4"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/range-parser-1.2.3"
@@ -47479,7 +47799,7 @@ in
           sources."normalize-path-2.1.1"
         ];
       })
-      (sources."apollo-2.22.0" // {
+      (sources."apollo-2.22.1" // {
         dependencies = [
           sources."graphql-tag-2.10.1"
           sources."strip-ansi-5.2.0"
@@ -47489,21 +47809,17 @@ in
       sources."apollo-cache-control-0.8.11"
       sources."apollo-cache-inmemory-1.6.5"
       sources."apollo-client-2.6.8"
-      sources."apollo-codegen-core-0.36.0"
-      sources."apollo-codegen-flow-0.34.0"
-      sources."apollo-codegen-scala-0.35.0"
-      sources."apollo-codegen-swift-0.36.0"
-      sources."apollo-codegen-typescript-0.36.0"
+      sources."apollo-codegen-core-0.36.1"
+      sources."apollo-codegen-flow-0.34.1"
+      sources."apollo-codegen-scala-0.35.1"
+      sources."apollo-codegen-swift-0.36.1"
+      sources."apollo-codegen-typescript-0.36.1"
       sources."apollo-datasource-0.7.0"
-      sources."apollo-engine-reporting-1.5.0"
+      sources."apollo-engine-reporting-1.6.0"
       sources."apollo-engine-reporting-protobuf-0.4.4"
       sources."apollo-env-0.6.1"
       sources."apollo-graphql-0.4.0"
-      (sources."apollo-language-server-1.19.0" // {
-        dependencies = [
-          sources."apollo-datasource-0.6.4"
-        ];
-      })
+      sources."apollo-language-server-1.19.1"
       sources."apollo-link-1.2.13"
       sources."apollo-link-context-1.0.19"
       sources."apollo-link-error-1.1.12"
@@ -47513,10 +47829,10 @@ in
       sources."apollo-link-state-0.4.2"
       sources."apollo-link-ws-1.0.19"
       sources."apollo-server-caching-0.5.1"
-      sources."apollo-server-core-2.10.0"
+      sources."apollo-server-core-2.10.1"
       sources."apollo-server-env-2.4.3"
       sources."apollo-server-errors-2.3.4"
-      sources."apollo-server-express-2.10.0"
+      sources."apollo-server-express-2.10.1"
       sources."apollo-server-plugin-base-0.6.10"
       sources."apollo-server-types-0.2.10"
       sources."apollo-tracing-0.8.11"
@@ -47611,7 +47927,7 @@ in
       })
       sources."brace-expansion-1.1.11"
       sources."braces-2.3.2"
-      sources."browserslist-4.8.6"
+      sources."browserslist-4.8.7"
       sources."buffer-5.4.3"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
@@ -47629,7 +47945,7 @@ in
       sources."callsites-2.0.0"
       sources."camel-case-3.0.0"
       sources."camelcase-4.1.0"
-      sources."caniuse-lite-1.0.30001025"
+      sources."caniuse-lite-1.0.30001027"
       sources."capture-stack-trace-1.0.1"
       sources."cardinal-2.1.1"
       sources."caseless-0.12.0"
@@ -47794,7 +48110,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.3.346"
+      sources."electron-to-chromium-1.3.353"
       sources."elegant-spinner-1.0.1"
       sources."emoji-regex-7.0.3"
       sources."encodeurl-1.0.2"
@@ -47929,7 +48245,7 @@ in
           sources."slash-2.0.0"
         ];
       })
-      sources."globule-1.3.0"
+      sources."globule-1.3.1"
       sources."good-listener-1.2.2"
       (sources."got-6.7.1" // {
         dependencies = [
@@ -47976,7 +48292,7 @@ in
       sources."hosted-git-info-2.8.5"
       (sources."htmlparser2-3.10.1" // {
         dependencies = [
-          sources."readable-stream-3.5.0"
+          sources."readable-stream-3.6.0"
         ];
       })
       (sources."http-call-5.3.0" // {
@@ -48201,7 +48517,7 @@ in
           sources."is-wsl-2.1.1"
         ];
       })
-      sources."node-releases-1.1.48"
+      sources."node-releases-1.1.49"
       (sources."nodemon-1.19.4" // {
         dependencies = [
           sources."debug-3.2.6"
@@ -48353,7 +48669,7 @@ in
       sources."registry-auth-token-3.4.0"
       sources."registry-url-3.1.0"
       sources."regjsgen-0.5.1"
-      (sources."regjsparser-0.6.2" // {
+      (sources."regjsparser-0.6.3" // {
         dependencies = [
           sources."jsesc-0.5.0"
         ];
@@ -48361,7 +48677,7 @@ in
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
-      sources."request-2.88.0"
+      sources."request-2.88.2"
       sources."request-promise-core-1.1.3"
       sources."request-promise-native-1.0.8"
       sources."resolve-1.15.1"
@@ -48587,11 +48903,7 @@ in
       sources."to-regex-range-2.1.1"
       sources."toidentifier-1.0.0"
       sources."touch-3.1.0"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."treeify-1.1.0"
       sources."trim-repeated-1.0.0"
       sources."ts-invariant-0.4.4"
@@ -48604,7 +48916,7 @@ in
       sources."type-is-1.6.18"
       sources."typescript-3.7.5"
       sources."unbzip2-stream-1.3.3"
-      (sources."undefsafe-2.0.2" // {
+      (sources."undefsafe-2.0.3" // {
         dependencies = [
           sources."debug-2.6.9"
         ];
@@ -49169,7 +49481,7 @@ in
       sources."psl-1.7.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
-      sources."request-2.88.0"
+      sources."request-2.88.2"
       sources."request-promise-core-1.1.3"
       sources."request-promise-native-1.0.8"
       sources."safe-buffer-5.2.0"
@@ -49179,11 +49491,7 @@ in
       sources."sshpk-1.16.1"
       sources."stealthy-require-1.1.1"
       sources."symbol-tree-3.2.4"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."tr46-1.0.1"
       sources."tunnel-agent-0.6.0"
       sources."turndown-4.0.2"
@@ -49383,7 +49691,7 @@ in
       sources."JSONStream-1.3.5"
       sources."acorn-7.1.0"
       sources."acorn-node-1.8.2"
-      sources."acorn-walk-7.0.0"
+      sources."acorn-walk-7.1.1"
       sources."asn1.js-4.10.1"
       (sources."assert-1.5.0" // {
         dependencies = [
@@ -49510,7 +49818,7 @@ in
       sources."stream-combiner2-1.1.1"
       (sources."stream-http-3.1.0" // {
         dependencies = [
-          sources."readable-stream-3.5.0"
+          sources."readable-stream-3.6.0"
         ];
       })
       sources."stream-splicer-2.0.1"
@@ -49573,7 +49881,7 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-10.17.14"
+      sources."@types/node-10.17.15"
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.2.16"
       sources."ajv-6.11.0"
@@ -49639,7 +49947,7 @@ in
       sources."concat-map-0.0.1"
       (sources."concat-stream-2.0.0" // {
         dependencies = [
-          sources."readable-stream-3.5.0"
+          sources."readable-stream-3.6.0"
           sources."string_decoder-1.3.0"
         ];
       })
@@ -49858,7 +50166,7 @@ in
       sources."readline2-0.1.1"
       sources."redent-1.0.0"
       sources."repeating-2.0.1"
-      sources."request-2.88.0"
+      sources."request-2.88.2"
       sources."resolve-1.15.1"
       sources."rimraf-2.7.1"
       sources."router-0.6.2"
@@ -49926,11 +50234,7 @@ in
           sources."thirty-two-0.0.2"
         ];
       })
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."trim-newlines-1.0.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
@@ -50106,7 +50410,7 @@ in
       sources."ms-2.1.2"
       sources."one-time-0.0.4"
       sources."process-nextick-args-2.0.1"
-      sources."readable-stream-3.5.0"
+      sources."readable-stream-3.6.0"
       sources."requires-port-1.0.0"
       sources."safe-buffer-5.2.0"
       sources."simple-swizzle-0.2.2"
@@ -50150,7 +50454,7 @@ in
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.0"
+      sources."@types/node-13.7.1"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       sources."ajv-6.11.0"
@@ -50582,11 +50886,10 @@ in
       sources."registry-url-3.1.0"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
-      (sources."request-2.88.0" // {
+      (sources."request-2.88.2" // {
         dependencies = [
-          sources."punycode-1.4.1"
           sources."qs-6.5.2"
-          sources."tough-cookie-2.4.3"
+          sources."tough-cookie-2.5.0"
         ];
       })
       sources."resolve-1.14.2"
@@ -50775,10 +51078,10 @@ in
   cpy-cli = nodeEnv.buildNodePackage {
     name = "cpy-cli";
     packageName = "cpy-cli";
-    version = "3.0.0";
+    version = "3.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/cpy-cli/-/cpy-cli-3.0.0.tgz";
-      sha512 = "fxNNpGrnuVMbaDBpHdgwReMy48BelhAoS6OUUX6Zv5nMwSPZOMxL/kB5VxM9xQoB1vvw38zG9drLRS8gvavxeg==";
+      url = "https://registry.npmjs.org/cpy-cli/-/cpy-cli-3.1.0.tgz";
+      sha512 = "LJhHvFragWvIsJH1kjhzZwGSagukewJZ5nV5yjMc5TILs+Z/CbZSvX0W9t9XC26Mw32j56UHjR3co5kAXaeTwg==";
     };
     dependencies = [
       sources."@mrmlnc/readdir-enhanced-2.2.1"
@@ -50786,7 +51089,7 @@ in
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.0"
+      sources."@types/node-13.7.1"
       sources."arr-diff-4.0.0"
       sources."arr-flatten-1.1.0"
       sources."arr-union-3.1.0"
@@ -50936,7 +51239,7 @@ in
       })
       sources."locate-path-2.0.0"
       sources."loud-rejection-1.6.0"
-      sources."make-dir-3.0.0"
+      sources."make-dir-3.0.2"
       sources."map-cache-0.2.2"
       sources."map-obj-2.0.0"
       sources."map-visit-1.0.0"
@@ -51127,7 +51430,7 @@ in
       sources."@cycle/run-3.4.0"
       sources."@cycle/time-0.10.1"
       sources."@types/cookiejar-2.1.1"
-      sources."@types/node-13.7.0"
+      sources."@types/node-13.7.1"
       sources."@types/superagent-3.8.2"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-2.1.1"
@@ -51269,10 +51572,10 @@ in
   create-react-app = nodeEnv.buildNodePackage {
     name = "create-react-app";
     packageName = "create-react-app";
-    version = "3.3.1";
+    version = "3.4.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.3.1.tgz";
-      sha512 = "ORmuc0m6zCt65Vqh5c/h0Z0RbWBqMssEHjD4Zx/j/L4+KvdkXqKFuwfU0I/bDpGMqSqpSq1AzuPy67KCxA/TkA==";
+      url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.4.0.tgz";
+      sha512 = "BR5jXjJH6Bz0vHAIoF0pH2K+hX+Frd93UGZjjCUB1k1JJDZbM+QyigTXZ08ddJ02AQ+iYfNyM77WgDwKQBl00g==";
     };
     dependencies = [
       sources."@types/color-name-1.1.1"
@@ -51304,7 +51607,7 @@ in
           sources."tmp-0.0.33"
         ];
       })
-      sources."figures-3.1.0"
+      sources."figures-3.2.0"
       sources."fs-extra-8.1.0"
       sources."fs.realpath-1.0.0"
       sources."fstream-1.0.12"
@@ -51818,7 +52121,7 @@ in
       sources."mime-2.4.4"
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
-      sources."mimic-response-2.0.0"
+      sources."mimic-response-2.1.0"
       sources."min-document-2.19.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
@@ -51835,14 +52138,14 @@ in
       })
       sources."ms-2.1.2"
       sources."multi-random-access-2.1.1"
-      sources."multicast-dns-7.2.0"
+      sources."multicast-dns-7.2.1"
       sources."multistream-2.1.1"
       sources."mute-stream-0.0.8"
       sources."mutexify-1.2.0"
       sources."nan-2.14.0"
       sources."nanoassert-1.1.0"
       sources."nanobus-4.4.0"
-      sources."nanoguard-1.2.2"
+      sources."nanoguard-1.3.0"
       sources."nanomatch-1.2.13"
       sources."nanoscheduler-1.0.3"
       sources."nanotiming-7.3.1"
@@ -51923,7 +52226,7 @@ in
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
-      sources."request-2.88.0"
+      sources."request-2.88.2"
       sources."resolve-url-0.2.1"
       sources."ret-0.1.15"
       sources."revalidator-0.1.8"
@@ -52056,11 +52359,7 @@ in
           sources."ms-2.0.0"
         ];
       })
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       (sources."township-client-1.3.2" // {
         dependencies = [
           sources."is-number-2.1.0"
@@ -52099,7 +52398,7 @@ in
       (sources."utp-native-2.1.7" // {
         dependencies = [
           sources."node-gyp-build-4.2.0"
-          sources."readable-stream-3.5.0"
+          sources."readable-stream-3.6.0"
           sources."unordered-set-2.0.1"
         ];
       })
@@ -52302,16 +52601,16 @@ in
   dockerfile-language-server-nodejs = nodeEnv.buildNodePackage {
     name = "dockerfile-language-server-nodejs";
     packageName = "dockerfile-language-server-nodejs";
-    version = "0.0.21";
+    version = "0.0.22";
     src = fetchurl {
-      url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.0.21.tgz";
-      sha512 = "lZ7VFAlS4vTm5MvxmwpREcYMARB3RQaGX0OZdcY8oSytsu4i5mMGVa6mi9/pZ9soqcUC08uxEA8EcqIeL3lyAA==";
+      url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.0.22.tgz";
+      sha512 = "Vf/Zieb/BBs/VQnaxntshlTExR3FyE6FO1NxS+yO3SVqzcEVHYkHMC8f/+XRRROVHFh41YfzVfPhSxdCxfbviQ==";
     };
     dependencies = [
-      sources."dockerfile-ast-0.0.16"
-      (sources."dockerfile-language-service-0.0.8" // {
+      sources."dockerfile-ast-0.0.20"
+      (sources."dockerfile-language-service-0.0.9" // {
         dependencies = [
-          (sources."dockerfile-utils-0.0.13" // {
+          (sources."dockerfile-utils-0.0.14" // {
             dependencies = [
               sources."vscode-languageserver-types-3.6.0"
             ];
@@ -52324,15 +52623,10 @@ in
           sources."vscode-languageserver-types-3.6.0"
         ];
       })
-      sources."vscode-jsonrpc-4.0.0"
-      sources."vscode-languageserver-5.2.1"
-      (sources."vscode-languageserver-protocol-3.14.1" // {
-        dependencies = [
-          sources."vscode-languageserver-types-3.14.0"
-        ];
-      })
+      sources."vscode-jsonrpc-5.0.1"
+      sources."vscode-languageserver-6.1.1"
+      sources."vscode-languageserver-protocol-3.15.3"
       sources."vscode-languageserver-types-3.15.1"
-      sources."vscode-uri-1.0.8"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -52347,10 +52641,10 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "6.20.1";
+    version = "6.21.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.20.1.tgz";
-      sha512 = "nolk1wEQZOETEq8x6eBVHRhBPNUsLRS1Z4zjzjsf8lK6S1DO9e1dNMMgTdFq2LwNNhIxdSkFyQjie4382UbgQg==";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.21.0.tgz";
+      sha512 = "Ym6TP6yWNXwueViA0e2cByyGfbr1sFThsI3vzQHy3xiDKZVDcMCE2eFiUen342VksZznzM0R8L61SQ3T39hBTw==";
     };
     dependencies = [
       sources."JSONStream-1.3.5"
@@ -52359,7 +52653,7 @@ in
       sources."assert-plus-1.0.0"
       sources."async-2.6.3"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.614.0"
+      sources."aws-sdk-2.620.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.9.1"
       sources."base64-js-1.3.1"
@@ -52415,7 +52709,7 @@ in
       sources."once-1.4.0"
       sources."optimist-0.6.1"
       sources."p-finally-1.0.0"
-      sources."p-queue-6.2.1"
+      sources."p-queue-6.3.0"
       sources."p-timeout-3.2.0"
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.1"
@@ -52429,7 +52723,7 @@ in
           sources."safe-buffer-5.1.2"
         ];
       })
-      sources."request-2.88.0"
+      sources."request-2.88.2"
       sources."requestretry-4.1.0"
       sources."s3-stream-upload-2.0.2"
       sources."s3signed-0.1.0"
@@ -52452,9 +52746,9 @@ in
         ];
       })
       sources."through-2.3.8"
-      (sources."tough-cookie-2.4.3" // {
+      (sources."tough-cookie-2.5.0" // {
         dependencies = [
-          sources."punycode-1.4.1"
+          sources."punycode-2.1.1"
         ];
       })
       sources."tunnel-agent-0.6.0"
@@ -52804,7 +53098,7 @@ in
       sources."eslint-visitor-keys-1.1.0"
       sources."espree-6.1.2"
       sources."esprima-4.0.1"
-      sources."esquery-1.0.1"
+      sources."esquery-1.1.0"
       sources."esrecurse-4.2.1"
       sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
@@ -52812,7 +53106,7 @@ in
       sources."fast-deep-equal-3.1.1"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-2.0.6"
-      sources."figures-3.1.0"
+      sources."figures-3.2.0"
       sources."file-entry-cache-5.0.1"
       sources."flat-cache-2.0.1"
       sources."flatted-2.0.1"
@@ -52963,7 +53257,7 @@ in
       sources."eslint-visitor-keys-1.1.0"
       sources."espree-6.1.2"
       sources."esprima-4.0.1"
-      sources."esquery-1.0.1"
+      sources."esquery-1.1.0"
       sources."esrecurse-4.2.1"
       sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
@@ -52971,7 +53265,7 @@ in
       sources."fast-deep-equal-3.1.1"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-2.0.6"
-      sources."figures-3.1.0"
+      sources."figures-3.2.0"
       sources."file-entry-cache-5.0.1"
       sources."flat-cache-2.0.1"
       sources."flatted-2.0.1"
@@ -53220,7 +53514,7 @@ in
       sources."readable-stream-2.3.7"
       sources."redent-1.0.0"
       sources."repeating-2.0.1"
-      sources."request-2.88.0"
+      sources."request-2.88.2"
       sources."request-progress-2.0.1"
       sources."resolve-1.15.1"
       sources."restore-cursor-1.0.1"
@@ -53240,11 +53534,7 @@ in
       sources."supports-color-2.0.0"
       sources."throttleit-1.0.0"
       sources."tmp-0.0.31"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."trim-newlines-1.0.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
@@ -53271,180 +53561,193 @@ in
   fkill-cli = nodeEnv.buildNodePackage {
     name = "fkill-cli";
     packageName = "fkill-cli";
-    version = "5.2.0";
+    version = "6.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/fkill-cli/-/fkill-cli-5.2.0.tgz";
-      sha512 = "8MT/0AQi9hFOo1j4qQ0URs0FdSoOLGJSNn3CM+1QQj9LKvs2w34yvoSGAJu2EfNvB+W/KJ8wLDyoK7Bs5YdC9w==";
+      url = "https://registry.npmjs.org/fkill-cli/-/fkill-cli-6.0.0.tgz";
+      sha512 = "YlxeZ1Oid9No7mUMVAuHX1hHhzaydXihUNM2s52y/EkCyVAbQyrSt7+E/Ij+jLO3houXG2k4d2pz4vev0jVqlQ==";
     };
     dependencies = [
-      sources."aggregate-error-1.0.0"
-      sources."ansi-escapes-3.2.0"
-      sources."ansi-regex-3.0.0"
-      sources."ansi-styles-3.2.1"
-      sources."array-find-index-1.0.2"
-      sources."arrify-1.0.1"
-      sources."buffer-alloc-1.2.0"
-      sources."buffer-alloc-unsafe-1.1.0"
-      sources."buffer-fill-1.0.0"
-      sources."buffer-from-1.1.1"
-      sources."camelcase-4.1.0"
-      sources."camelcase-keys-4.2.0"
-      sources."chalk-2.4.2"
+      sources."@babel/code-frame-7.8.3"
+      (sources."@babel/highlight-7.8.3" // {
+        dependencies = [
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.2"
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
+          sources."has-flag-3.0.0"
+          sources."supports-color-5.5.0"
+        ];
+      })
+      sources."@types/color-name-1.1.1"
+      sources."@types/minimist-1.2.0"
+      sources."@types/normalize-package-data-2.4.0"
+      sources."aggregate-error-3.0.1"
+      sources."ansi-escapes-4.3.0"
+      sources."ansi-regex-5.0.0"
+      sources."ansi-styles-4.2.1"
+      sources."arrify-2.0.1"
+      sources."astral-regex-2.0.0"
+      sources."camelcase-5.3.1"
+      sources."camelcase-keys-6.1.2"
+      sources."chalk-3.0.0"
       sources."chardet-0.7.0"
-      sources."clean-stack-1.3.0"
-      sources."cli-cursor-2.1.0"
-      sources."cli-truncate-1.1.0"
+      sources."clean-stack-2.2.0"
+      sources."cli-cursor-3.1.0"
+      sources."cli-truncate-2.1.0"
       sources."cli-width-2.2.0"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
-      sources."core-util-is-1.0.2"
-      sources."cross-spawn-6.0.5"
-      sources."cross-spawn-async-2.2.5"
-      sources."csv-parser-1.12.1"
-      sources."currently-unhandled-0.4.1"
+      sources."color-convert-2.0.1"
+      sources."color-name-1.1.4"
+      sources."cross-spawn-7.0.1"
       sources."decamelize-1.2.0"
       (sources."decamelize-keys-1.1.0" // {
         dependencies = [
           sources."map-obj-1.0.1"
         ];
       })
+      sources."emoji-regex-8.0.0"
+      sources."end-of-stream-1.4.4"
       sources."error-ex-1.3.2"
       sources."esc-exit-2.0.2"
       sources."escape-string-regexp-1.0.5"
-      sources."execa-0.10.0"
+      sources."esutils-2.0.3"
+      sources."execa-4.0.0"
       sources."external-editor-3.1.0"
-      sources."figures-2.0.0"
-      sources."find-up-2.1.0"
-      sources."fkill-5.3.0"
-      sources."from2-2.3.0"
-      sources."generate-function-1.1.0"
-      sources."generate-object-property-1.2.0"
-      sources."get-stream-3.0.0"
-      sources."graceful-fs-4.2.3"
-      sources."has-flag-3.0.0"
+      sources."figures-3.2.0"
+      sources."find-up-4.1.0"
+      (sources."fkill-7.0.0" // {
+        dependencies = [
+          sources."ps-list-7.0.0"
+        ];
+      })
+      sources."get-stream-5.1.0"
+      sources."hard-rejection-2.1.0"
+      sources."has-flag-4.0.0"
       sources."hosted-git-info-2.8.5"
+      sources."human-signals-1.1.1"
       sources."iconv-lite-0.4.24"
-      sources."indent-string-3.2.0"
-      sources."inherits-2.0.4"
-      (sources."inquirer-6.5.2" // {
+      sources."indent-string-4.0.0"
+      (sources."inquirer-7.0.4" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.2"
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
+          sources."has-flag-3.0.0"
           sources."strip-ansi-5.2.0"
+          sources."supports-color-5.5.0"
+        ];
+      })
+      (sources."inquirer-autocomplete-prompt-1.0.2" // {
+        dependencies = [
+          sources."ansi-escapes-3.2.0"
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.2"
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
+          sources."figures-2.0.0"
+          sources."has-flag-3.0.0"
+          sources."supports-color-5.5.0"
         ];
       })
-      sources."inquirer-autocomplete-prompt-1.0.2"
-      sources."into-stream-2.0.1"
       sources."is-arrayish-0.2.1"
-      sources."is-fullwidth-code-point-2.0.0"
+      sources."is-fullwidth-code-point-3.0.0"
       sources."is-plain-obj-1.1.0"
       sources."is-promise-2.1.0"
-      sources."is-property-1.0.2"
-      sources."is-stream-1.1.0"
-      sources."isarray-1.0.0"
+      sources."is-stream-2.0.0"
       sources."isexe-2.0.0"
+      sources."js-tokens-4.0.0"
       sources."json-parse-better-errors-1.0.2"
-      sources."json-stringify-safe-5.0.1"
-      sources."load-json-file-4.0.0"
-      sources."locate-path-2.0.0"
+      sources."lines-and-columns-1.1.6"
+      sources."locate-path-5.0.0"
       sources."lodash-4.17.15"
-      sources."loud-rejection-1.6.0"
       sources."lru-cache-4.1.5"
-      sources."map-obj-2.0.0"
-      sources."meow-5.0.0"
-      sources."mimic-fn-1.2.0"
-      sources."minimist-1.2.0"
-      sources."minimist-options-3.0.2"
-      sources."mute-stream-0.0.7"
-      sources."ndjson-1.5.0"
-      (sources."neat-csv-2.1.0" // {
+      sources."map-obj-4.1.0"
+      sources."meow-6.0.1"
+      sources."merge-stream-2.0.0"
+      sources."mimic-fn-2.1.0"
+      sources."min-indent-1.0.0"
+      (sources."minimist-options-4.0.2" // {
         dependencies = [
-          sources."get-stream-2.3.1"
+          sources."arrify-1.0.1"
         ];
       })
-      sources."nice-try-1.0.5"
+      sources."mute-stream-0.0.8"
       sources."normalize-package-data-2.5.0"
-      sources."npm-run-path-2.0.2"
-      sources."num-sort-1.0.0"
-      sources."number-is-nan-1.0.1"
-      sources."object-assign-4.1.1"
-      sources."onetime-2.0.1"
+      sources."npm-run-path-4.0.1"
+      sources."num-sort-2.0.0"
+      sources."once-1.4.0"
+      sources."onetime-5.1.0"
       sources."os-tmpdir-1.0.2"
-      sources."p-finally-1.0.0"
-      sources."p-limit-1.3.0"
-      sources."p-locate-2.0.0"
-      sources."p-try-1.0.0"
-      sources."parse-json-4.0.0"
-      sources."path-exists-3.0.0"
-      sources."path-key-2.0.1"
+      sources."p-finally-2.0.1"
+      sources."p-limit-2.2.2"
+      sources."p-locate-4.1.0"
+      sources."p-try-2.2.0"
+      sources."parse-json-5.0.0"
+      sources."path-exists-4.0.0"
+      sources."path-key-3.1.1"
       sources."path-parse-1.0.6"
-      sources."path-type-3.0.0"
       (sources."pid-from-port-1.1.3" // {
         dependencies = [
           sources."cross-spawn-5.1.0"
           sources."execa-0.9.0"
+          sources."get-stream-3.0.0"
+          sources."is-stream-1.1.0"
+          sources."npm-run-path-2.0.2"
+          sources."p-finally-1.0.0"
+          sources."path-key-2.0.1"
+          sources."shebang-command-1.2.0"
+          sources."shebang-regex-1.0.0"
+          sources."which-1.3.1"
         ];
       })
-      sources."pify-3.0.0"
-      sources."pinkie-2.0.4"
-      sources."pinkie-promise-2.0.1"
-      (sources."process-exists-3.1.0" // {
-        dependencies = [
-          sources."ps-list-4.1.0"
-        ];
-      })
-      sources."process-nextick-args-2.0.1"
-      sources."ps-list-5.0.1"
+      sources."process-exists-4.0.0"
+      sources."ps-list-6.3.0"
       sources."pseudomap-1.0.2"
-      sources."quick-lru-1.1.0"
-      sources."read-pkg-3.0.0"
-      sources."read-pkg-up-3.0.0"
-      sources."readable-stream-2.3.7"
-      sources."redent-2.0.0"
+      sources."pump-3.0.0"
+      sources."quick-lru-4.0.1"
+      (sources."read-pkg-5.2.0" // {
+        dependencies = [
+          sources."type-fest-0.6.0"
+        ];
+      })
+      sources."read-pkg-up-7.0.1"
+      sources."redent-3.0.0"
       sources."resolve-1.15.1"
-      sources."restore-cursor-2.0.0"
+      sources."restore-cursor-3.1.0"
       sources."run-async-2.3.0"
       sources."rxjs-6.5.4"
-      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
-      sources."sec-1.0.0"
       sources."semver-5.7.1"
-      sources."shebang-command-1.2.0"
-      sources."shebang-regex-1.0.0"
+      sources."shebang-command-2.0.0"
+      sources."shebang-regex-3.0.0"
       sources."signal-exit-3.0.2"
-      sources."slice-ansi-1.0.0"
+      sources."slice-ansi-3.0.0"
       sources."spdx-correct-3.1.0"
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.5"
-      sources."split2-2.2.0"
-      sources."string-width-2.1.1"
-      sources."string_decoder-1.1.1"
-      sources."strip-ansi-4.0.0"
-      sources."strip-bom-3.0.0"
+      sources."string-width-4.2.0"
+      sources."strip-ansi-6.0.0"
       sources."strip-eof-1.0.0"
-      sources."strip-indent-2.0.0"
-      sources."supports-color-5.5.0"
-      (sources."taskkill-2.0.0" // {
+      sources."strip-final-newline-2.0.0"
+      sources."strip-indent-3.0.0"
+      sources."supports-color-7.1.0"
+      (sources."taskkill-3.1.0" // {
         dependencies = [
-          sources."execa-0.1.1"
-        ];
-      })
-      (sources."tasklist-3.1.1" // {
-        dependencies = [
-          sources."pify-2.3.0"
+          sources."execa-3.4.0"
         ];
       })
       sources."through-2.3.8"
-      sources."through2-2.0.5"
       sources."tmp-0.0.33"
-      sources."trim-newlines-2.0.0"
+      sources."trim-newlines-3.0.0"
       sources."tslib-1.10.0"
-      sources."util-deprecate-1.0.2"
+      sources."type-fest-0.8.1"
       sources."validate-npm-package-license-3.0.4"
-      sources."which-1.3.1"
-      sources."xtend-4.0.2"
+      sources."which-2.0.2"
+      sources."wrappy-1.0.2"
       sources."yallist-2.1.2"
-      sources."yargs-parser-10.1.0"
+      sources."yargs-parser-16.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -54043,7 +54346,7 @@ in
       (sources."sodium-browserify-tweetnacl-0.2.6" // {
         dependencies = [
           sources."sha.js-2.4.11"
-          sources."tweetnacl-1.0.2"
+          sources."tweetnacl-1.0.3"
         ];
       })
       sources."sodium-chloride-1.1.2"
@@ -54051,7 +54354,7 @@ in
       sources."split-buffer-1.0.0"
       sources."ssb-avatar-0.2.0"
       sources."ssb-caps-1.1.0"
-      (sources."ssb-client-4.8.0" // {
+      (sources."ssb-client-4.9.0" // {
         dependencies = [
           sources."ssb-config-3.4.4"
         ];
@@ -54173,7 +54476,7 @@ in
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
       sources."conf-6.2.0"
-      sources."configstore-5.0.0"
+      sources."configstore-5.0.1"
       sources."cross-spawn-7.0.1"
       sources."crypto-random-string-2.0.0"
       sources."debounce-fn-3.0.1"
@@ -54193,13 +54496,14 @@ in
       sources."end-of-stream-1.4.4"
       sources."env-paths-2.2.0"
       sources."error-ex-1.3.2"
+      sources."escape-goat-2.1.1"
       sources."escape-string-regexp-1.0.5"
       sources."esutils-2.0.3"
       sources."execa-4.0.0"
       sources."external-editor-3.1.0"
       sources."fast-deep-equal-3.1.1"
       sources."fast-json-stable-stringify-2.1.0"
-      sources."figures-3.1.0"
+      sources."figures-3.2.0"
       sources."find-up-3.0.0"
       sources."fuse.js-3.4.6"
       sources."get-stream-5.1.0"
@@ -54214,7 +54518,7 @@ in
       sources."has-flag-4.0.0"
       sources."has-yarn-2.1.0"
       sources."hosted-git-info-2.8.5"
-      sources."http-cache-semantics-4.0.3"
+      sources."http-cache-semantics-4.0.4"
       sources."human-signals-1.1.1"
       sources."iconv-lite-0.4.24"
       sources."import-lazy-2.1.0"
@@ -54278,9 +54582,9 @@ in
         ];
       })
       sources."lowercase-keys-1.0.1"
-      sources."make-dir-3.0.0"
+      sources."make-dir-3.0.2"
       sources."map-obj-4.1.0"
-      sources."meow-6.0.0"
+      sources."meow-6.0.1"
       sources."merge-stream-2.0.0"
       sources."mimic-fn-2.1.0"
       sources."mimic-response-1.0.1"
@@ -54317,6 +54621,7 @@ in
       sources."prepend-http-2.0.0"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
+      sources."pupa-2.0.1"
       sources."quick-lru-4.0.1"
       sources."rc-1.2.8"
       (sources."read-pkg-5.2.0" // {
@@ -54373,7 +54678,7 @@ in
       sources."type-fest-0.8.1"
       sources."typedarray-to-buffer-3.1.5"
       sources."unique-string-2.0.0"
-      sources."update-notifier-4.0.0"
+      sources."update-notifier-4.1.0"
       sources."uri-js-4.2.2"
       sources."url-parse-lax-3.0.0"
       sources."validate-npm-package-license-3.0.4"
@@ -54497,7 +54802,7 @@ in
       sources."chalk-2.4.2"
       sources."change-case-3.1.0"
       sources."chardet-0.7.0"
-      sources."chownr-1.1.3"
+      sources."chownr-1.1.4"
       sources."ci-info-2.0.0"
       sources."cli-boxes-2.2.0"
       sources."cli-cursor-3.1.0"
@@ -54645,7 +54950,7 @@ in
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.1"
       sources."fast-json-stable-stringify-2.1.0"
-      sources."figures-3.1.0"
+      sources."figures-3.2.0"
       sources."finalhandler-1.1.2"
       sources."find-0.2.9"
       sources."find-up-2.1.0"
@@ -54709,7 +55014,7 @@ in
       sources."header-case-1.0.1"
       sources."homedir-polyfill-1.0.3"
       sources."hosted-git-info-2.8.5"
-      sources."http-cache-semantics-4.0.3"
+      sources."http-cache-semantics-4.0.4"
       (sources."http-errors-1.7.2" // {
         dependencies = [
           sources."inherits-2.0.3"
@@ -54781,7 +55086,7 @@ in
       })
       sources."isstream-0.1.2"
       sources."iterall-1.3.0"
-      sources."js-base64-2.5.1"
+      sources."js-base64-2.5.2"
       sources."js-yaml-3.13.1"
       sources."jsbn-0.1.1"
       sources."jsesc-2.5.2"
@@ -54972,7 +55277,7 @@ in
       sources."registry-auth-token-4.1.1"
       sources."registry-url-5.1.0"
       sources."replaceall-0.1.6"
-      sources."request-2.88.0"
+      sources."request-2.88.2"
       sources."request-promise-4.2.5"
       sources."request-promise-core-1.1.3"
       sources."require-directory-2.1.1"
@@ -55056,11 +55361,7 @@ in
       sources."to-fast-properties-2.0.0"
       sources."to-readable-stream-1.0.0"
       sources."toidentifier-1.0.0"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."traverse-chain-0.1.0"
       sources."trim-right-1.0.1"
       sources."tslib-1.10.0"
@@ -55478,7 +55779,7 @@ in
       sources."string_decoder-0.10.31"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."systeminformation-4.21.1"
+      sources."systeminformation-4.22.0"
       sources."term-canvas-0.0.5"
       sources."wordwrap-0.0.3"
       sources."x256-0.0.2"
@@ -56541,7 +56842,7 @@ in
       sources."npm-2.15.12"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
-      sources."readable-stream-3.5.0"
+      sources."readable-stream-3.6.0"
       sources."safe-buffer-5.2.0"
       sources."sprintf-js-1.0.3"
       sources."string_decoder-1.3.0"
@@ -56692,7 +56993,7 @@ in
         ];
       })
       sources."chardet-0.7.0"
-      sources."chownr-1.1.3"
+      sources."chownr-1.1.4"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.2.0"
       sources."co-4.6.0"
@@ -56745,7 +57046,7 @@ in
       sources."extend-3.0.2"
       sources."external-editor-3.1.0"
       sources."fast-levenshtein-2.0.6"
-      sources."figures-3.1.0"
+      sources."figures-3.2.0"
       sources."file-uri-to-path-1.0.0"
       sources."form-data-2.5.1"
       sources."formidable-1.2.1"
@@ -56878,7 +57179,7 @@ in
       sources."pump-3.0.0"
       sources."qs-6.9.1"
       sources."raw-body-2.4.1"
-      sources."readable-stream-3.5.0"
+      sources."readable-stream-3.6.0"
       sources."restore-cursor-2.0.0"
       sources."rimraf-3.0.2"
       sources."rsvp-3.6.2"
@@ -57249,7 +57550,7 @@ in
       sources."read-pkg-2.0.0"
       sources."read-pkg-up-2.0.0"
       sources."readable-stream-2.3.7"
-      sources."request-2.88.0"
+      sources."request-2.88.2"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."resolve-1.15.1"
@@ -57305,11 +57606,7 @@ in
       sources."tiny-emitter-2.1.0"
       sources."toml-3.0.0"
       sources."topsort-0.0.2"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."ts-process-promises-1.0.2"
       sources."tslib-1.9.3"
       sources."ttf2woff-2.0.1"
@@ -57591,7 +57888,7 @@ in
       sources."caseless-0.12.0"
       sources."chalk-2.4.2"
       sources."charenc-0.0.2"
-      sources."chownr-1.1.3"
+      sources."chownr-1.1.4"
       sources."chroma-js-2.1.0"
       sources."clean-css-4.2.3"
       sources."clean-html-1.5.0"
@@ -57828,7 +58125,7 @@ in
       sources."mime-2.4.4"
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
-      sources."mimic-response-2.0.0"
+      sources."mimic-response-2.1.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
       sources."minipass-3.1.1"
@@ -57852,7 +58149,7 @@ in
       sources."needle-2.4.0"
       sources."nextgen-events-1.3.0"
       sources."no-case-2.3.2"
-      (sources."node-abi-2.14.0" // {
+      (sources."node-abi-2.15.0" // {
         dependencies = [
           sources."semver-5.7.1"
         ];
@@ -57917,15 +58214,13 @@ in
       sources."random-bytes-1.0.0"
       sources."rc-1.2.8"
       sources."read-chunk-2.1.0"
-      sources."readable-stream-3.5.0"
+      sources."readable-stream-3.6.0"
       sources."reduce-flatten-1.0.1"
       sources."redux-3.7.2"
       sources."relateurl-0.2.7"
-      (sources."request-2.88.0" // {
+      (sources."request-2.88.2" // {
         dependencies = [
           sources."form-data-2.3.3"
-          sources."punycode-1.4.1"
-          sources."tough-cookie-2.4.3"
         ];
       })
       sources."request-promise-core-1.1.3"
@@ -57942,7 +58237,7 @@ in
       sources."set-blocking-2.0.0"
       sources."setimmediate-1.0.5"
       sources."setprototypeof-1.1.1"
-      sources."seventh-0.7.30"
+      sources."seventh-0.7.34"
       (sources."sharp-0.23.4" // {
         dependencies = [
           sources."tar-5.0.5"
@@ -58016,7 +58311,7 @@ in
           sources."q-0.9.7"
         ];
       })
-      sources."terminal-kit-1.32.3"
+      sources."terminal-kit-1.33.10"
       (sources."tkwidgets-0.5.26" // {
         dependencies = [
           sources."is-fullwidth-code-point-2.0.0"
@@ -58356,19 +58651,24 @@ in
   json-server = nodeEnv.buildNodePackage {
     name = "json-server";
     packageName = "json-server";
-    version = "0.15.1";
+    version = "0.16.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/json-server/-/json-server-0.15.1.tgz";
-      sha512 = "6Vc6tC1uLasnMd6Ksnq+4gSQcRqLuSJ/yLoIG4fr4P8f5dAR1gbCqgaVRlk8jfRune0NXcrfDrz7liwAD2WEeQ==";
+      url = "https://registry.npmjs.org/json-server/-/json-server-0.16.0.tgz";
+      sha512 = "vdqfkMAiHUCHMkTRgxNJsd0c+lnczxFCxM8bewyalEiunDD8XWXsvgsezAt4iycqWV5aVoR//irtyUX50ZpSdA==";
     };
     dependencies = [
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
+      sources."@types/color-name-1.1.1"
       sources."accepts-1.3.7"
       sources."ajv-6.11.0"
-      sources."ansi-align-3.0.0"
+      (sources."ansi-align-3.0.0" // {
+        dependencies = [
+          sources."string-width-3.1.0"
+        ];
+      })
       sources."ansi-regex-4.1.0"
-      sources."ansi-styles-3.2.1"
+      sources."ansi-styles-4.2.1"
       sources."array-flatten-1.1.1"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
@@ -58378,7 +58678,7 @@ in
       sources."basic-auth-2.0.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."body-parser-1.19.0"
-      sources."boxen-3.2.0"
+      sources."boxen-4.2.0"
       sources."bytes-3.1.0"
       (sources."cacheable-request-6.1.0" // {
         dependencies = [
@@ -58388,13 +58688,18 @@ in
       })
       sources."camelcase-5.3.1"
       sources."caseless-0.12.0"
-      sources."chalk-2.4.2"
+      sources."chalk-3.0.0"
       sources."ci-info-2.0.0"
       sources."cli-boxes-2.2.0"
-      sources."cliui-5.0.0"
+      (sources."cliui-6.0.0" // {
+        dependencies = [
+          sources."ansi-regex-5.0.0"
+          sources."strip-ansi-6.0.0"
+        ];
+      })
       sources."clone-response-1.0.2"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
+      sources."color-convert-2.0.1"
+      sources."color-name-1.1.4"
       sources."combined-stream-1.0.8"
       sources."compressible-2.0.18"
       (sources."compression-1.7.4" // {
@@ -58402,7 +58707,7 @@ in
           sources."bytes-3.0.0"
         ];
       })
-      sources."configstore-4.0.0"
+      sources."configstore-5.0.1"
       sources."connect-pause-0.1.1"
       sources."content-disposition-0.5.3"
       sources."content-type-1.0.4"
@@ -58410,8 +58715,7 @@ in
       sources."cookie-signature-1.0.6"
       sources."core-util-is-1.0.2"
       sources."cors-2.8.5"
-      sources."cross-spawn-5.1.0"
-      sources."crypto-random-string-1.0.0"
+      sources."crypto-random-string-2.0.0"
       sources."dashdash-1.14.1"
       sources."debug-2.6.9"
       sources."decamelize-1.2.0"
@@ -58421,7 +58725,7 @@ in
       sources."delayed-stream-1.0.0"
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
-      sources."dot-prop-4.2.0"
+      sources."dot-prop-5.2.0"
       sources."duplexer3-0.1.4"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
@@ -58429,10 +58733,9 @@ in
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
       sources."errorhandler-1.5.1"
+      sources."escape-goat-2.1.1"
       sources."escape-html-1.0.3"
-      sources."escape-string-regexp-1.0.5"
       sources."etag-1.8.1"
-      sources."execa-0.7.0"
       sources."express-4.17.1"
       (sources."express-urlrewrite-1.2.0" // {
         dependencies = [
@@ -58444,26 +58747,22 @@ in
       sources."fast-deep-equal-3.1.1"
       sources."fast-json-stable-stringify-2.1.0"
       sources."finalhandler-1.1.2"
-      sources."find-up-3.0.0"
+      sources."find-up-4.1.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
       sources."get-caller-file-2.0.5"
-      sources."get-stream-3.0.0"
+      sources."get-stream-4.1.0"
       sources."getpass-0.1.7"
-      sources."global-dirs-0.1.1"
-      (sources."got-9.6.0" // {
-        dependencies = [
-          sources."get-stream-4.1.0"
-        ];
-      })
+      sources."global-dirs-2.0.1"
+      sources."got-9.6.0"
       sources."graceful-fs-4.2.3"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
-      sources."has-flag-3.0.0"
+      sources."has-flag-4.0.0"
       sources."has-yarn-2.1.0"
-      sources."http-cache-semantics-4.0.3"
+      sources."http-cache-semantics-4.0.4"
       sources."http-errors-1.7.2"
       sources."http-signature-1.2.0"
       sources."iconv-lite-0.4.24"
@@ -58474,16 +58773,14 @@ in
       sources."ipaddr.js-1.9.0"
       sources."is-ci-2.0.0"
       sources."is-fullwidth-code-point-2.0.0"
-      sources."is-installed-globally-0.1.0"
-      sources."is-npm-3.0.0"
-      sources."is-obj-1.0.1"
-      sources."is-path-inside-1.0.1"
+      sources."is-installed-globally-0.3.1"
+      sources."is-npm-4.0.0"
+      sources."is-obj-2.0.0"
+      sources."is-path-inside-3.0.2"
       sources."is-promise-2.1.0"
-      sources."is-stream-1.1.0"
       sources."is-typedarray-1.0.0"
       sources."is-yarn-global-0.3.0"
       sources."isarray-0.0.1"
-      sources."isexe-2.0.0"
       sources."isstream-0.1.2"
       sources."jju-1.4.0"
       sources."jsbn-0.1.1"
@@ -58495,13 +58792,12 @@ in
       sources."jsprim-1.4.1"
       sources."keyv-3.1.0"
       sources."latest-version-5.1.0"
-      sources."locate-path-3.0.0"
+      sources."locate-path-5.0.0"
       sources."lodash-4.17.15"
       sources."lodash-id-0.14.0"
       sources."lowdb-1.0.0"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-4.1.5"
-      sources."make-dir-1.3.0"
+      sources."make-dir-3.0.2"
       sources."media-typer-0.3.0"
       sources."merge-descriptors-1.0.1"
       (sources."method-override-3.0.0" // {
@@ -58520,22 +58816,18 @@ in
       sources."nanoid-2.1.11"
       sources."negotiator-0.6.2"
       sources."normalize-url-4.5.0"
-      sources."npm-run-path-2.0.2"
       sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."p-cancelable-1.1.0"
-      sources."p-finally-1.0.0"
       sources."p-limit-2.2.2"
-      sources."p-locate-3.0.0"
+      sources."p-locate-4.1.0"
       sources."p-try-2.2.0"
       sources."package-json-6.5.0"
       sources."parseurl-1.3.3"
-      sources."path-exists-3.0.0"
-      sources."path-is-inside-1.0.2"
-      sources."path-key-2.0.1"
+      sources."path-exists-4.0.0"
       sources."path-to-regexp-0.1.7"
       sources."performance-now-2.1.0"
       sources."pify-3.0.0"
@@ -58543,17 +58835,17 @@ in
       sources."pluralize-8.0.0"
       sources."prepend-http-2.0.0"
       sources."proxy-addr-2.0.5"
-      sources."pseudomap-1.0.2"
       sources."psl-1.7.0"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
+      sources."pupa-2.0.1"
       sources."qs-6.7.0"
       sources."range-parser-1.2.1"
       sources."raw-body-2.4.0"
       sources."rc-1.2.8"
       sources."registry-auth-token-4.1.1"
       sources."registry-url-5.1.0"
-      (sources."request-2.88.0" // {
+      (sources."request-2.88.2" // {
         dependencies = [
           sources."qs-6.5.2"
         ];
@@ -58565,11 +58857,7 @@ in
       sources."safer-buffer-2.1.2"
       sources."semver-6.3.0"
       sources."semver-compare-1.0.0"
-      (sources."semver-diff-2.1.0" // {
-        dependencies = [
-          sources."semver-5.7.1"
-        ];
-      })
+      sources."semver-diff-3.1.1"
       (sources."send-0.17.1" // {
         dependencies = [
           sources."ms-2.1.1"
@@ -58579,59 +58867,57 @@ in
       sources."server-destroy-1.0.1"
       sources."set-blocking-2.0.0"
       sources."setprototypeof-1.1.1"
-      sources."shebang-command-1.2.0"
-      sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
       sources."sshpk-1.16.1"
       sources."statuses-1.5.0"
       sources."steno-0.4.4"
-      sources."string-width-3.1.0"
-      sources."strip-ansi-5.2.0"
-      sources."strip-eof-1.0.0"
-      sources."strip-json-comments-2.0.1"
-      sources."supports-color-5.5.0"
-      sources."term-size-1.2.0"
-      sources."to-readable-stream-1.0.0"
-      sources."toidentifier-1.0.0"
-      (sources."tough-cookie-2.4.3" // {
+      (sources."string-width-4.2.0" // {
         dependencies = [
-          sources."punycode-1.4.1"
+          sources."ansi-regex-5.0.0"
+          sources."emoji-regex-8.0.0"
+          sources."is-fullwidth-code-point-3.0.0"
+          sources."strip-ansi-6.0.0"
         ];
       })
+      sources."strip-ansi-5.2.0"
+      sources."strip-json-comments-2.0.1"
+      sources."supports-color-7.1.0"
+      sources."term-size-2.2.0"
+      sources."to-readable-stream-1.0.0"
+      sources."toidentifier-1.0.0"
+      sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."type-fest-0.3.1"
+      sources."type-fest-0.8.1"
       sources."type-is-1.6.18"
-      sources."unique-string-1.0.0"
+      sources."typedarray-to-buffer-3.1.5"
+      sources."unique-string-2.0.0"
       sources."unpipe-1.0.0"
-      sources."update-notifier-3.0.1"
+      sources."update-notifier-4.1.0"
       sources."uri-js-4.2.2"
       sources."url-parse-lax-3.0.0"
       sources."utils-merge-1.0.1"
       sources."uuid-3.4.0"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
-      sources."which-1.3.1"
       sources."which-module-2.0.0"
-      (sources."widest-line-2.0.1" // {
+      sources."widest-line-3.1.0"
+      (sources."wrap-ansi-6.2.0" // {
         dependencies = [
-          sources."ansi-regex-3.0.0"
-          sources."string-width-2.1.1"
-          sources."strip-ansi-4.0.0"
+          sources."ansi-regex-5.0.0"
+          sources."strip-ansi-6.0.0"
         ];
       })
-      sources."wrap-ansi-5.1.0"
       sources."wrappy-1.0.2"
-      sources."write-file-atomic-2.4.3"
-      sources."xdg-basedir-3.0.0"
+      sources."write-file-atomic-3.0.1"
+      sources."xdg-basedir-4.0.0"
       sources."y18n-4.0.0"
-      sources."yallist-2.1.2"
-      sources."yargs-14.2.2"
-      sources."yargs-parser-15.0.0"
+      sources."yargs-15.1.0"
+      sources."yargs-parser-16.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
-      description = "Serves JSON files through REST routes.";
+      description = "Get a full fake REST API with zero coding in less than 30 seconds";
       homepage = https://github.com/typicode/json-server;
       license = "MIT";
     };
@@ -59330,7 +59616,7 @@ in
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.0"
+      sources."@types/node-13.7.1"
       sources."@zkochan/cmd-shim-3.1.0"
       sources."JSONStream-1.3.5"
       sources."abbrev-1.1.1"
@@ -59398,7 +59684,7 @@ in
       sources."caseless-0.12.0"
       sources."chalk-2.4.2"
       sources."chardet-0.7.0"
-      sources."chownr-1.1.3"
+      sources."chownr-1.1.4"
       sources."ci-info-2.0.0"
       (sources."class-utils-0.3.6" // {
         dependencies = [
@@ -59468,7 +59754,7 @@ in
           sources."concat-stream-2.0.0"
           sources."meow-4.0.1"
           sources."minimist-1.2.0"
-          sources."readable-stream-3.5.0"
+          sources."readable-stream-3.6.0"
         ];
       })
       sources."copy-concurrently-1.0.5"
@@ -59943,7 +60229,7 @@ in
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
       sources."repeating-2.0.1"
-      sources."request-2.88.0"
+      sources."request-2.88.2"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
       sources."resolve-1.15.1"
@@ -60086,11 +60372,7 @@ in
       })
       sources."to-regex-3.0.2"
       sources."to-regex-range-2.1.1"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."tr46-1.0.1"
       sources."trim-newlines-2.0.0"
       sources."trim-off-newlines-1.0.1"
@@ -60185,10 +60467,10 @@ in
   less = nodeEnv.buildNodePackage {
     name = "less";
     packageName = "less";
-    version = "3.11.0";
+    version = "3.11.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/less/-/less-3.11.0.tgz";
-      sha512 = "dAui5qzfxuWY7BIEt9/gy5EbDhwDb44rqaIUFYeu8wEE8huMZ/PzB+gNFONEG5DUPrOrOGcAjGeYVg6AFiA9KQ==";
+      url = "https://registry.npmjs.org/less/-/less-3.11.1.tgz";
+      sha512 = "tlWX341RECuTOvoDIvtFqXsKj072hm3+9ymRBe76/mD6O5ZZecnlAOVDlWAleF2+aohFrxNidXhv2773f6kY7g==";
     };
     dependencies = [
       sources."ajv-6.11.0"
@@ -60238,16 +60520,13 @@ in
       sources."psl-1.7.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
-      sources."request-2.88.0"
+      sources."request-2.88.2"
       sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
       sources."source-map-0.6.1"
       sources."sshpk-1.16.1"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
+      sources."tslib-1.10.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."uri-js-4.2.2"
@@ -60974,7 +61253,7 @@ in
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
-      (sources."request-2.88.0" // {
+      (sources."request-2.88.2" // {
         dependencies = [
           sources."qs-6.5.2"
         ];
@@ -61084,11 +61363,7 @@ in
         ];
       })
       sources."toidentifier-1.0.0"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.18"
@@ -61229,7 +61504,7 @@ in
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.0"
+      sources."@types/node-13.7.1"
       sources."@webassemblyjs/ast-1.8.5"
       sources."@webassemblyjs/floating-point-hex-parser-1.8.5"
       sources."@webassemblyjs/helper-api-error-1.8.5"
@@ -61423,7 +61698,7 @@ in
       sources."browserify-rsa-4.0.1"
       sources."browserify-sign-4.0.4"
       sources."browserify-zlib-0.2.0"
-      sources."browserslist-4.8.6"
+      sources."browserslist-4.8.7"
       sources."buffer-5.4.3"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
@@ -61446,7 +61721,7 @@ in
       })
       sources."call-me-maybe-1.0.1"
       sources."camelcase-5.3.1"
-      sources."caniuse-lite-1.0.30001025"
+      sources."caniuse-lite-1.0.30001027"
       sources."caw-2.0.1"
       (sources."chalk-2.4.2" // {
         dependencies = [
@@ -61473,7 +61748,7 @@ in
           sources."normalize-path-3.0.0"
         ];
       })
-      sources."chownr-1.1.3"
+      sources."chownr-1.1.4"
       sources."chrome-trace-event-1.0.2"
       sources."cipher-base-1.0.4"
       (sources."class-utils-0.3.6" // {
@@ -61603,7 +61878,7 @@ in
       })
       sources."duplexer3-0.1.4"
       sources."duplexify-3.7.1"
-      sources."electron-to-chromium-1.3.346"
+      sources."electron-to-chromium-1.3.353"
       sources."elliptic-6.5.2"
       sources."emoji-regex-7.0.3"
       sources."emojis-list-2.1.0"
@@ -61795,7 +62070,7 @@ in
             ];
           })
           sources."get-stream-4.1.0"
-          sources."http-cache-semantics-4.0.3"
+          sources."http-cache-semantics-4.0.4"
           sources."normalize-url-4.5.0"
           sources."p-cancelable-1.1.0"
         ];
@@ -61980,7 +62255,7 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      (sources."node-releases-1.1.48" // {
+      (sources."node-releases-1.1.49" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
@@ -62166,7 +62441,7 @@ in
       sources."regex-not-1.0.2"
       sources."regexpu-core-4.6.0"
       sources."regjsgen-0.5.1"
-      (sources."regjsparser-0.6.2" // {
+      (sources."regjsparser-0.6.3" // {
         dependencies = [
           sources."jsesc-0.5.0"
         ];
@@ -62394,7 +62669,7 @@ in
       sources."vm-browserify-1.1.2"
       sources."watchpack-1.6.0"
       sources."wcwidth-1.0.1"
-      (sources."webpack-4.41.5" // {
+      (sources."webpack-4.41.6" // {
         dependencies = [
           sources."arr-diff-4.0.0"
           sources."array-unique-0.3.2"
@@ -62437,7 +62712,7 @@ in
           sources."ms-2.0.0"
         ];
       })
-      (sources."webpack-cli-3.3.10" // {
+      (sources."webpack-cli-3.3.11" // {
         dependencies = [
           sources."enhanced-resolve-4.1.0"
           sources."memory-fs-0.4.1"
@@ -62498,10 +62773,10 @@ in
   madoko = nodeEnv.buildNodePackage {
     name = "madoko";
     packageName = "madoko";
-    version = "1.1.8";
+    version = "1.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/madoko/-/madoko-1.1.8.tgz";
-      sha512 = "SYChn9LZ7X8hXFHe/y11cebSC4N1+F7LncYCunRX2IW4u5w2y0J2wWw+RicYm6+JZORI61EdzgJFWqQDjgsAEQ==";
+      url = "https://registry.npmjs.org/madoko/-/madoko-1.2.0.tgz";
+      sha512 = "MTpclhNPFArohFqLNqA+3/6JycVgwiFD8d6i7zuELvs1BDKQv8m4fw2SOSnkFddFnU/FcYLl0P0UkIe0YZ4GZA==";
     };
     dependencies = [
       sources."amdefine-1.0.1"
@@ -62580,16 +62855,12 @@ in
       sources."psl-1.7.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
-      sources."request-2.88.0"
+      sources."request-2.88.2"
       sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
       sources."sshpk-1.16.1"
       sources."supports-color-5.5.0"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."uri-js-4.2.2"
@@ -62835,7 +63106,11 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."end-of-stream-0.1.5"
       sources."errno-0.1.7"
-      sources."es5-ext-0.10.53"
+      (sources."es5-ext-0.10.53" // {
+        dependencies = [
+          sources."next-tick-1.0.0"
+        ];
+      })
       sources."es6-iterator-2.0.3"
       sources."es6-symbol-3.1.3"
       sources."es6-weak-map-2.0.3"
@@ -63132,7 +63407,7 @@ in
       sources."multipipe-0.1.2"
       sources."nanomatch-1.2.13"
       sources."natives-1.1.6"
-      sources."next-tick-1.0.0"
+      sources."next-tick-1.1.0"
       sources."normalize-path-2.1.1"
       sources."now-and-later-2.0.1"
       sources."oauth-sign-0.8.2"
@@ -63618,9 +63893,9 @@ in
       sources."ms-2.1.2"
       sources."one-time-0.0.4"
       sources."process-nextick-args-2.0.1"
-      sources."readable-stream-3.5.0"
+      sources."readable-stream-3.6.0"
       sources."safe-buffer-5.2.0"
-      sources."semver-7.1.2"
+      sources."semver-7.1.3"
       sources."simple-swizzle-0.2.2"
       sources."stack-trace-0.0.10"
       sources."string_decoder-1.3.0"
@@ -63691,7 +63966,7 @@ in
       sources."bcrypt-pbkdf-1.0.2"
       sources."brace-expansion-1.1.11"
       sources."caseless-0.12.0"
-      sources."chownr-1.1.3"
+      sources."chownr-1.1.4"
       sources."code-point-at-1.1.0"
       sources."combined-stream-1.0.8"
       sources."concat-map-0.0.1"
@@ -63753,7 +64028,7 @@ in
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."readable-stream-2.3.7"
-      sources."request-2.88.0"
+      sources."request-2.88.2"
       sources."rimraf-2.7.1"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
@@ -63765,11 +64040,7 @@ in
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."tar-4.4.13"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."uri-js-4.2.2"
@@ -64123,7 +64394,7 @@ in
       sources."are-we-there-yet-1.1.5"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
-      sources."chownr-1.1.3"
+      sources."chownr-1.1.4"
       sources."code-point-at-1.1.0"
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
@@ -64292,7 +64563,7 @@ in
       })
       sources."caseless-0.12.0"
       sources."cheerio-0.22.0"
-      sources."chownr-1.1.3"
+      sources."chownr-1.1.4"
       sources."clone-2.1.2"
       sources."code-point-at-1.1.0"
       sources."combined-stream-1.0.8"
@@ -64585,7 +64856,7 @@ in
       sources."range-parser-1.2.1"
       sources."raw-body-2.4.0"
       sources."rc-1.2.8"
-      sources."readable-stream-3.5.0"
+      sources."readable-stream-3.6.0"
       sources."regenerator-runtime-0.13.3"
       sources."reinterval-1.1.0"
       sources."remove-trailing-separator-1.1.0"
@@ -64728,7 +64999,7 @@ in
       sources."buffer-from-1.1.1"
       sources."builtins-1.0.3"
       sources."caseless-0.12.0"
-      sources."chownr-1.1.3"
+      sources."chownr-1.1.4"
       sources."code-point-at-1.1.0"
       sources."combined-stream-1.0.8"
       sources."concat-map-0.0.1"
@@ -64836,7 +65107,7 @@ in
           sources."safe-buffer-5.1.2"
         ];
       })
-      sources."request-2.88.0"
+      sources."request-2.88.2"
       sources."resolve-1.15.1"
       sources."retry-0.10.1"
       sources."rimraf-2.6.3"
@@ -64862,11 +65133,7 @@ in
       sources."strip-ansi-3.0.1"
       sources."tar-4.4.13"
       sources."temp-0.9.1"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."typedarray-0.0.6"
@@ -64994,7 +65261,7 @@ in
       sources."timed-out-4.0.1"
       sources."to-regex-range-5.0.1"
       sources."touch-3.1.0"
-      (sources."undefsafe-2.0.2" // {
+      (sources."undefsafe-2.0.3" // {
         dependencies = [
           sources."debug-2.6.9"
           sources."ms-2.0.0"
@@ -65083,7 +65350,7 @@ in
       })
       sources."camelcase-5.3.1"
       sources."chalk-3.0.0"
-      sources."chownr-1.1.3"
+      sources."chownr-1.1.4"
       sources."ci-info-2.0.0"
       sources."cint-8.2.1"
       sources."clean-stack-2.2.0"
@@ -65148,7 +65415,7 @@ in
       sources."has-flag-4.0.0"
       sources."has-yarn-2.1.0"
       sources."hosted-git-info-3.0.2"
-      sources."http-cache-semantics-4.0.3"
+      sources."http-cache-semantics-4.0.4"
       sources."http-proxy-agent-3.0.0"
       sources."https-proxy-agent-4.0.0"
       sources."humanize-ms-1.2.1"
@@ -65241,19 +65508,19 @@ in
       sources."npm-normalize-package-bin-1.0.1"
       (sources."npm-package-arg-8.0.0" // {
         dependencies = [
-          sources."semver-7.1.2"
+          sources."semver-7.1.3"
         ];
       })
-      sources."npm-packlist-2.0.3"
+      sources."npm-packlist-2.1.0"
       (sources."npm-pick-manifest-5.0.0" // {
         dependencies = [
-          sources."semver-7.1.2"
+          sources."semver-7.1.3"
         ];
       })
-      (sources."npm-registry-fetch-6.0.0" // {
+      (sources."npm-registry-fetch-6.0.2" // {
         dependencies = [
           sources."safe-buffer-5.2.0"
-          sources."semver-7.1.2"
+          sources."semver-7.1.3"
         ];
       })
       sources."npm-run-path-2.0.2"
@@ -65270,7 +65537,7 @@ in
       sources."package-json-6.5.0"
       (sources."pacote-10.3.2" // {
         dependencies = [
-          sources."semver-7.1.2"
+          sources."semver-7.1.3"
         ];
       })
       sources."path-exists-4.0.0"
@@ -65284,7 +65551,7 @@ in
       sources."progress-2.0.3"
       sources."promise-inflight-1.0.1"
       sources."promise-retry-1.1.1"
-      sources."prompts-2.3.0"
+      sources."prompts-2.3.1"
       sources."pseudomap-1.0.2"
       sources."pump-3.0.0"
       (sources."rc-1.2.8" // {
@@ -65509,7 +65776,7 @@ in
           sources."safe-buffer-5.1.2"
         ];
       })
-      sources."request-2.88.0"
+      sources."request-2.88.2"
       sources."retry-0.6.0"
       sources."rimraf-2.7.1"
       sources."safe-buffer-5.2.0"
@@ -65537,11 +65804,7 @@ in
           sources."rimraf-2.1.4"
         ];
       })
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."underscore-1.4.4"
@@ -65796,7 +66059,7 @@ in
           sources."pako-1.0.11"
         ];
       })
-      sources."browserslist-4.8.6"
+      sources."browserslist-4.8.7"
       (sources."buffer-4.9.2" // {
         dependencies = [
           sources."isarray-1.0.0"
@@ -65813,7 +66076,7 @@ in
       sources."callsites-2.0.0"
       sources."camelcase-5.3.1"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001025"
+      sources."caniuse-lite-1.0.30001027"
       sources."caseless-0.12.0"
       sources."chalk-2.4.2"
       sources."chokidar-2.1.8"
@@ -65943,13 +66206,13 @@ in
       sources."domexception-1.0.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."dot-prop-4.2.0"
+      sources."dot-prop-5.2.0"
       sources."dotenv-5.0.1"
       sources."dotenv-expand-5.1.0"
       sources."duplexer2-0.1.4"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.346"
+      sources."electron-to-chromium-1.3.353"
       sources."elliptic-6.5.2"
       sources."emoji-regex-7.0.3"
       sources."encodeurl-1.0.2"
@@ -66052,7 +66315,7 @@ in
       })
       (sources."htmlparser2-3.10.1" // {
         dependencies = [
-          sources."readable-stream-3.5.0"
+          sources."readable-stream-3.6.0"
         ];
       })
       sources."http-errors-1.7.3"
@@ -66095,7 +66358,7 @@ in
       sources."is-glob-4.0.1"
       sources."is-html-1.1.0"
       sources."is-number-3.0.0"
-      sources."is-obj-1.0.1"
+      sources."is-obj-2.0.0"
       sources."is-plain-object-2.0.4"
       sources."is-regex-1.0.5"
       sources."is-resolvable-1.1.0"
@@ -66199,7 +66462,7 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      (sources."node-releases-1.1.48" // {
+      (sources."node-releases-1.1.49" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
@@ -66261,7 +66524,7 @@ in
       sources."postcss-merge-longhand-4.0.11"
       (sources."postcss-merge-rules-4.0.3" // {
         dependencies = [
-          sources."postcss-selector-parser-3.1.1"
+          sources."postcss-selector-parser-3.1.2"
         ];
       })
       sources."postcss-minify-font-values-4.0.2"
@@ -66269,7 +66532,7 @@ in
       sources."postcss-minify-params-4.0.2"
       (sources."postcss-minify-selectors-4.0.2" // {
         dependencies = [
-          sources."postcss-selector-parser-3.1.1"
+          sources."postcss-selector-parser-3.1.2"
         ];
       })
       (sources."postcss-modules-extract-imports-1.1.0" // {
@@ -66354,7 +66617,7 @@ in
       })
       sources."regexpu-core-4.6.0"
       sources."regjsgen-0.5.1"
-      (sources."regjsparser-0.6.2" // {
+      (sources."regjsparser-0.6.3" // {
         dependencies = [
           sources."jsesc-0.5.0"
         ];
@@ -66362,12 +66625,7 @@ in
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
-      (sources."request-2.88.0" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-          sources."tough-cookie-2.4.3"
-        ];
-      })
+      sources."request-2.88.2"
       sources."request-promise-core-1.1.3"
       sources."request-promise-native-1.0.8"
       sources."require-directory-2.1.1"
@@ -66463,7 +66721,7 @@ in
       sources."strip-ansi-4.0.0"
       (sources."stylehacks-4.0.3" // {
         dependencies = [
-          sources."postcss-selector-parser-3.1.1"
+          sources."postcss-selector-parser-3.1.2"
         ];
       })
       sources."supports-color-5.5.0"
@@ -66493,7 +66751,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
       sources."typedarray-0.0.6"
-      (sources."uncss-0.17.2" // {
+      (sources."uncss-0.17.3" // {
         dependencies = [
           sources."cssesc-3.0.0"
           sources."is-absolute-url-3.0.3"
@@ -67153,8 +67411,8 @@ in
       sources."raw-body-2.4.0"
       sources."re-emitter-1.1.4"
       sources."read-torrent-1.3.1"
-      sources."readable-stream-3.5.0"
-      (sources."request-2.88.0" // {
+      sources."readable-stream-3.6.0"
+      (sources."request-2.88.2" // {
         dependencies = [
           sources."qs-6.5.2"
         ];
@@ -67233,11 +67491,7 @@ in
           sources."once-1.3.3"
         ];
       })
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.18"
@@ -67321,7 +67575,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."gaze-1.1.3"
       sources."glob-7.1.6"
-      sources."globule-1.3.0"
+      sources."globule-1.3.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."isexe-2.0.0"
@@ -67355,7 +67609,7 @@ in
       sources."JSONStream-1.3.5"
       sources."acorn-7.1.0"
       sources."acorn-node-1.8.2"
-      sources."acorn-walk-7.0.0"
+      sources."acorn-walk-7.1.1"
       sources."asn1.js-4.10.1"
       (sources."assert-1.5.0" // {
         dependencies = [
@@ -67405,7 +67659,7 @@ in
       sources."concat-map-0.0.1"
       (sources."concat-stream-2.0.0" // {
         dependencies = [
-          sources."readable-stream-3.5.0"
+          sources."readable-stream-3.6.0"
         ];
       })
       sources."console-browserify-1.2.0"
@@ -67438,7 +67692,7 @@ in
       sources."gaze-1.1.3"
       sources."get-assigned-identifiers-1.2.0"
       sources."glob-7.1.6"
-      sources."globule-1.3.0"
+      sources."globule-1.3.1"
       sources."graceful-fs-4.2.3"
       sources."has-1.0.3"
       sources."hash-base-3.0.4"
@@ -67537,7 +67791,7 @@ in
       sources."stream-combiner2-1.1.1"
       (sources."stream-http-3.1.0" // {
         dependencies = [
-          sources."readable-stream-3.5.0"
+          sources."readable-stream-3.6.0"
         ];
       })
       sources."stream-splicer-2.0.1"
@@ -67869,7 +68123,7 @@ in
       (sources."openid-2.0.6" // {
         dependencies = [
           sources."qs-6.5.2"
-          sources."request-2.88.0"
+          sources."request-2.88.2"
         ];
       })
       sources."pause-0.0.1"
@@ -67889,11 +68143,7 @@ in
       sources."stream-counter-0.2.0"
       sources."string-1.6.1"
       sources."string_decoder-0.10.31"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."uid2-0.0.3"
@@ -67914,10 +68164,10 @@ in
   semver = nodeEnv.buildNodePackage {
     name = "semver";
     packageName = "semver";
-    version = "7.1.2";
+    version = "7.1.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/semver/-/semver-7.1.2.tgz";
-      sha512 = "BJs9T/H8sEVHbeigqzIEo57Iu/3DG6c4QoqTfbQB3BPA4zgzAomh/Fk9E7QtjWQ8mx2dgA9YCfSF4y9k9bHNpQ==";
+      url = "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz";
+      sha512 = "ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -68057,11 +68307,11 @@ in
           sources."semver-6.3.0"
         ];
       })
-      (sources."@serverless/enterprise-plugin-3.3.0" // {
+      (sources."@serverless/enterprise-plugin-3.4.0" // {
         dependencies = [
           sources."fs-extra-8.1.0"
           sources."node-fetch-2.6.0"
-          sources."semver-7.1.2"
+          sources."semver-6.3.0"
           sources."uuid-3.4.0"
         ];
       })
@@ -68108,7 +68358,7 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.614.0" // {
+      (sources."aws-sdk-2.620.0" // {
         dependencies = [
           sources."buffer-4.9.1"
           sources."uuid-3.3.2"
@@ -68302,7 +68552,7 @@ in
       sources."external-editor-3.1.0"
       sources."fast-levenshtein-2.0.6"
       sources."fd-slicer-1.1.0"
-      sources."figures-3.1.0"
+      sources."figures-3.2.0"
       sources."file-type-8.1.0"
       sources."filename-reserved-regex-2.0.0"
       sources."filenamify-2.1.0"
@@ -68359,7 +68609,7 @@ in
           sources."kind-of-4.0.0"
         ];
       })
-      sources."http-cache-semantics-4.0.3"
+      sources."http-cache-semantics-4.0.4"
       sources."https-proxy-agent-4.0.0"
       sources."iconv-lite-0.4.24"
       sources."ieee754-1.1.13"
@@ -68623,7 +68873,7 @@ in
       sources."split-string-3.1.0"
       (sources."split2-3.1.1" // {
         dependencies = [
-          sources."readable-stream-3.5.0"
+          sources."readable-stream-3.6.0"
         ];
       })
       sources."sprintf-js-1.0.3"
@@ -68915,7 +69165,7 @@ in
       sources."raw-body-2.4.0"
       sources."read-1.0.7"
       sources."readable-stream-1.1.14"
-      (sources."request-2.88.0" // {
+      (sources."request-2.88.2" // {
         dependencies = [
           sources."qs-6.5.2"
         ];
@@ -68966,11 +69216,7 @@ in
       sources."tinycolor-0.0.1"
       sources."to-array-0.1.3"
       sources."toidentifier-1.0.0"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.18"
@@ -69393,10 +69639,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.290.2";
+    version = "1.292.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.290.2.tgz";
-      sha512 = "siieHkSY/b3Yw1Gf84L07j65m2Bht1PamAbX3cmZ1zAzsUxfXpqZq5W9PlAp5z1d0Tp1vxsQmXw6UGW0K1Tq1Q==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.292.0.tgz";
+      sha512 = "ga4ouBqRc897Ts80yzdZG25zqGgbU3ah8VKtLyRjK1ZmApHy+PRi2zBVJcwMspyfhyaCh47vr1siIqHler4rxg==";
     };
     dependencies = [
       sources."@snyk/cli-interface-2.3.0"
@@ -69417,7 +69663,7 @@ in
       sources."@types/debug-4.1.5"
       sources."@types/events-3.0.0"
       sources."@types/js-yaml-3.12.2"
-      sources."@types/node-13.7.0"
+      sources."@types/node-13.7.1"
       sources."@types/restify-4.3.6"
       sources."@types/semver-5.5.0"
       sources."@types/xml2js-0.4.3"
@@ -69437,7 +69683,7 @@ in
       sources."balanced-match-1.0.0"
       (sources."bl-3.0.0" // {
         dependencies = [
-          sources."readable-stream-3.5.0"
+          sources."readable-stream-3.6.0"
           sources."string_decoder-1.3.0"
         ];
       })
@@ -69687,7 +69933,7 @@ in
         ];
       })
       sources."snyk-module-1.9.1"
-      (sources."snyk-mvn-plugin-2.8.0" // {
+      (sources."snyk-mvn-plugin-2.9.0" // {
         dependencies = [
           sources."@snyk/cli-interface-2.3.1"
           sources."debug-4.1.1"
@@ -69747,7 +69993,7 @@ in
       sources."supports-color-5.5.0"
       (sources."tar-stream-2.1.0" // {
         dependencies = [
-          sources."readable-stream-3.5.0"
+          sources."readable-stream-3.6.0"
           sources."string_decoder-1.3.0"
         ];
       })
@@ -70355,7 +70601,7 @@ in
       sources."level-errors-2.0.1"
       (sources."level-iterator-stream-4.0.2" // {
         dependencies = [
-          sources."readable-stream-3.5.0"
+          sources."readable-stream-3.6.0"
         ];
       })
       sources."level-js-4.0.2"
@@ -70708,7 +70954,7 @@ in
       (sources."sodium-browserify-tweetnacl-0.2.6" // {
         dependencies = [
           sources."sha.js-2.4.11"
-          sources."tweetnacl-1.0.2"
+          sources."tweetnacl-1.0.3"
         ];
       })
       sources."sodium-chloride-1.1.2"
@@ -70720,7 +70966,7 @@ in
       sources."split-string-3.1.0"
       sources."ssb-blobs-1.2.2"
       sources."ssb-caps-1.1.0"
-      sources."ssb-client-4.8.0"
+      sources."ssb-client-4.9.0"
       sources."ssb-config-3.4.4"
       sources."ssb-db-19.2.0"
       sources."ssb-ebt-5.6.7"
@@ -70948,7 +71194,7 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      (sources."aws-sdk-2.614.0" // {
+      (sources."aws-sdk-2.620.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -71221,7 +71467,7 @@ in
       sources."isstream-0.1.2"
       sources."jmespath-0.15.0"
       sources."jpeg-turbo-0.4.0"
-      sources."js-base64-2.5.1"
+      sources."js-base64-2.5.2"
       sources."js-stringify-1.0.2"
       sources."js-yaml-3.2.7"
       sources."jsbn-0.1.1"
@@ -71427,7 +71673,7 @@ in
       })
       sources."regenerator-runtime-0.11.1"
       sources."repeat-string-1.6.1"
-      (sources."request-2.88.0" // {
+      (sources."request-2.88.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
           sources."aws-sign2-0.7.0"
@@ -71436,8 +71682,9 @@ in
           sources."har-validator-5.1.3"
           sources."http-signature-1.2.0"
           sources."oauth-sign-0.9.0"
+          sources."punycode-2.1.1"
           sources."qs-6.5.2"
-          sources."tough-cookie-2.4.3"
+          sources."tough-cookie-2.5.0"
           sources."tunnel-agent-0.6.0"
         ];
       })
@@ -72372,7 +72619,7 @@ in
           sources."source-map-0.6.1"
         ];
       })
-      sources."undefsafe-2.0.2"
+      sources."undefsafe-2.0.3"
       (sources."union-value-1.0.1" // {
         dependencies = [
           sources."is-extendable-0.1.1"
@@ -72438,7 +72685,7 @@ in
       sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b";
     };
     dependencies = [
-      sources."@types/node-13.7.0"
+      sources."@types/node-13.7.1"
       sources."ajv-6.11.0"
       sources."ansi-regex-4.1.0"
       sources."ansi-styles-3.2.1"
@@ -72511,7 +72758,7 @@ in
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."ramda-0.25.0"
-      sources."request-2.88.0"
+      sources."request-2.88.2"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
       sources."safe-buffer-5.2.0"
@@ -72530,13 +72777,9 @@ in
       sources."strip-ansi-5.2.0"
       sources."telegraf-3.36.0"
       sources."telegram-typings-3.6.1"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
-      sources."tweetnacl-1.0.2"
+      sources."tweetnacl-1.0.3"
       sources."uri-js-4.2.2"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
@@ -73165,12 +73408,12 @@ in
       sources."unified-message-control-1.0.4"
       sources."unique-string-1.0.0"
       sources."unist-util-is-3.0.0"
-      sources."unist-util-modify-children-1.1.5"
-      sources."unist-util-position-3.0.4"
+      sources."unist-util-modify-children-1.1.6"
+      sources."unist-util-position-3.1.0"
       sources."unist-util-remove-position-1.1.4"
       sources."unist-util-stringify-position-1.1.2"
       sources."unist-util-visit-1.4.1"
-      sources."unist-util-visit-children-1.1.3"
+      sources."unist-util-visit-children-1.1.4"
       sources."unist-util-visit-parents-2.1.2"
       sources."untildify-2.1.0"
       sources."unzip-response-2.0.1"
@@ -73365,7 +73608,7 @@ in
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.0"
       sources."object.values-1.1.1"
-      sources."readable-stream-3.5.0"
+      sources."readable-stream-3.6.0"
       sources."safe-buffer-5.2.0"
       sources."sentence-splitter-3.2.0"
       sources."string.prototype.trimleft-2.1.1"
@@ -73431,10 +73674,10 @@ in
   textlint-rule-stop-words = nodeEnv.buildNodePackage {
     name = "textlint-rule-stop-words";
     packageName = "textlint-rule-stop-words";
-    version = "2.0.1";
+    version = "2.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.1.tgz";
-      sha512 = "TUnOIMXl850Px9bl3H522UeeStmh92EYwXXnkMZOBIerHwFLG2KaaH+qGN+FaL0EugKj6WY8QKG6jOufGAiJsQ==";
+      url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.2.tgz";
+      sha512 = "Z96YepMqs2iS3shN8BxegxLQg0g6CQdmvooJ6MA/pmJPZyD+EMuBHqXOkE52GRuz2Z73m3vnh3/BLaryzsMNtw==";
     };
     dependencies = [
       sources."@textlint/ast-node-types-4.2.5"
@@ -73461,10 +73704,10 @@ in
   textlint-rule-terminology = nodeEnv.buildNodePackage {
     name = "textlint-rule-terminology";
     packageName = "textlint-rule-terminology";
-    version = "2.1.1";
+    version = "2.1.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-2.1.1.tgz";
-      sha512 = "955Q289wCubt67iar/U3jnsPvwHkRhWnOM0gqE3fQDBMJkFsoDnYNummU8CmAPXK7usnbwa2r48q0s4FtATWbw==";
+      url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-2.1.3.tgz";
+      sha512 = "RpbATk2+M35bAXnDQZGL54ILNPXHy8e8GIl3AJLiywG251L2bQYqvAhLaA7ad9qsrDOXQiGFIkd562KnP5CPkw==";
     };
     dependencies = [
       sources."@textlint/ast-node-types-4.2.5"
@@ -73581,7 +73824,7 @@ in
       sources."@types/color-name-1.1.1"
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-13.7.0"
+      sources."@types/node-13.7.1"
       sources."@types/responselike-1.0.0"
       sources."abbrev-1.1.1"
       sources."abstract-logging-1.0.0"
@@ -73631,7 +73874,7 @@ in
       sources."caseless-0.12.0"
       sources."chalk-3.0.0"
       sources."cheerio-1.0.0-rc.3"
-      sources."chownr-1.1.3"
+      sources."chownr-1.1.4"
       (sources."clone-response-1.0.2" // {
         dependencies = [
           sources."mimic-response-1.0.1"
@@ -73737,7 +73980,7 @@ in
       sources."has-flag-4.0.0"
       sources."has-unicode-2.0.1"
       sources."htmlparser2-3.10.1"
-      sources."http-cache-semantics-4.0.3"
+      sources."http-cache-semantics-4.0.4"
       (sources."http-errors-1.7.2" // {
         dependencies = [
           sources."inherits-2.0.3"
@@ -73791,7 +74034,7 @@ in
       sources."mime-1.6.0"
       sources."mime-db-1.42.0"
       sources."mime-types-2.1.25"
-      sources."mimic-response-2.0.0"
+      sources."mimic-response-2.1.0"
       sources."minimalistic-assert-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
@@ -73880,11 +74123,11 @@ in
       sources."rc-1.2.8"
       sources."read-1.0.7"
       sources."read-chunk-3.2.0"
-      sources."readable-stream-3.5.0"
+      sources."readable-stream-3.6.0"
       sources."regenerator-runtime-0.13.3"
       sources."registry-auth-token-4.1.1"
       sources."registry-url-5.1.0"
-      (sources."request-2.88.0" // {
+      (sources."request-2.88.2" // {
         dependencies = [
           sources."qs-6.5.2"
         ];
@@ -73949,11 +74192,7 @@ in
       sources."to-array-0.1.4"
       sources."to-readable-stream-2.1.0"
       sources."toidentifier-1.0.0"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."trim-repeated-1.0.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
@@ -74458,7 +74697,7 @@ in
       sources."universalify-0.1.2"
       sources."vscode-jsonrpc-5.0.1"
       sources."vscode-languageserver-5.3.0-next.10"
-      sources."vscode-languageserver-protocol-3.15.2"
+      sources."vscode-languageserver-protocol-3.15.3"
       sources."vscode-languageserver-types-3.15.1"
       sources."vscode-textbuffer-1.0.0"
       sources."vscode-uri-1.0.8"
@@ -74708,7 +74947,7 @@ in
       sources."map-age-cleaner-0.1.3"
       sources."media-typer-0.3.0"
       sources."mem-4.3.0"
-      (sources."memorystore-1.6.1" // {
+      (sources."memorystore-1.6.2" // {
         dependencies = [
           sources."debug-3.1.0"
         ];
@@ -74795,7 +75034,7 @@ in
         ];
       })
       sources."readable-stream-2.3.7"
-      (sources."request-2.88.0" // {
+      (sources."request-2.88.2" // {
         dependencies = [
           sources."qs-6.5.2"
         ];
@@ -74862,18 +75101,14 @@ in
           sources."debug-4.1.1"
           sources."mime-2.4.4"
           sources."ms-2.1.2"
-          sources."readable-stream-3.5.0"
+          sources."readable-stream-3.6.0"
           sources."semver-6.3.0"
         ];
       })
       sources."temp-0.9.1"
       sources."to-array-0.1.4"
       sources."toidentifier-1.0.0"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.18"
@@ -74940,7 +75175,7 @@ in
       sources."vscode-css-languageservice-3.0.13"
       sources."vscode-jsonrpc-5.0.1"
       sources."vscode-languageserver-4.4.2"
-      sources."vscode-languageserver-protocol-3.15.2"
+      sources."vscode-languageserver-protocol-3.15.3"
       sources."vscode-languageserver-protocol-foldingprovider-2.0.1"
       sources."vscode-languageserver-types-3.15.1"
       sources."vscode-nls-4.1.1"
@@ -74978,7 +75213,7 @@ in
       })
       sources."vscode-jsonrpc-5.0.1"
       sources."vscode-languageserver-4.4.2"
-      sources."vscode-languageserver-protocol-3.15.2"
+      sources."vscode-languageserver-protocol-3.15.3"
       sources."vscode-languageserver-protocol-foldingprovider-2.0.1"
       sources."vscode-languageserver-types-3.15.1"
       sources."vscode-nls-3.2.5"
@@ -75204,7 +75439,7 @@ in
         ];
       })
       sources."recursive-readdir-2.2.2"
-      sources."request-2.88.0"
+      sources."request-2.88.2"
       sources."restore-cursor-2.0.0"
       sources."rimraf-2.7.1"
       sources."run-async-2.3.0"
@@ -75249,11 +75484,7 @@ in
       sources."tmp-0.0.33"
       sources."to-buffer-1.1.1"
       sources."toml-2.3.6"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."trim-repeated-1.0.0"
       sources."tslib-1.10.0"
       sources."tunnel-agent-0.6.0"
@@ -75316,7 +75547,7 @@ in
       sources."@starptech/rehype-webparser-0.10.0"
       sources."@starptech/webparser-0.10.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-13.7.0"
+      sources."@types/node-13.7.1"
       sources."@types/unist-2.0.3"
       sources."@types/vfile-3.0.2"
       sources."@types/vfile-message-2.0.0"
@@ -75523,7 +75754,7 @@ in
           sources."ignore-4.0.6"
         ];
       })
-      (sources."eslint-plugin-vue-6.1.2" // {
+      (sources."eslint-plugin-vue-6.2.1" // {
         dependencies = [
           sources."acorn-7.1.0"
           sources."debug-4.1.1"
@@ -75537,7 +75768,7 @@ in
       sources."eslint-visitor-keys-1.1.0"
       sources."espree-5.0.1"
       sources."esprima-4.0.1"
-      sources."esquery-1.0.1"
+      sources."esquery-1.1.0"
       sources."esrecurse-4.2.1"
       sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
@@ -75663,7 +75894,7 @@ in
       sources."hosted-git-info-2.8.5"
       sources."html-void-elements-1.0.5"
       sources."html-whitespace-sensitive-tag-names-1.0.1"
-      sources."http-cache-semantics-4.0.3"
+      sources."http-cache-semantics-4.0.4"
       sources."iconv-lite-0.4.24"
       sources."ignore-3.3.10"
       (sources."import-fresh-3.2.1" // {
@@ -75752,7 +75983,7 @@ in
       sources."lodash.merge-4.6.2"
       sources."lodash.rest-4.0.5"
       sources."lodash.unescape-4.0.1"
-      sources."loglevel-1.6.6"
+      sources."loglevel-1.6.7"
       (sources."loglevel-colored-level-prefix-1.0.0" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
@@ -76186,7 +76417,7 @@ in
       sources."unist-util-find-1.0.1"
       sources."unist-util-inspect-4.1.4"
       sources."unist-util-is-2.1.3"
-      sources."unist-util-modify-children-1.1.5"
+      sources."unist-util-modify-children-1.1.6"
       sources."unist-util-remove-position-1.1.4"
       sources."unist-util-stringify-position-2.0.2"
       sources."unist-util-visit-1.4.1"
@@ -76233,7 +76464,7 @@ in
       sources."vscode-emmet-helper-1.2.17"
       sources."vscode-jsonrpc-5.0.1"
       sources."vscode-languageserver-5.3.0-next.10"
-      sources."vscode-languageserver-protocol-3.15.2"
+      sources."vscode-languageserver-protocol-3.15.3"
       sources."vscode-languageserver-types-3.15.1"
       sources."vscode-nls-4.1.1"
       sources."vscode-textbuffer-1.0.0"
@@ -76287,39 +76518,40 @@ in
   web-ext = nodeEnv.buildNodePackage {
     name = "web-ext";
     packageName = "web-ext";
-    version = "4.0.0";
+    version = "4.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/web-ext/-/web-ext-4.0.0.tgz";
-      sha512 = "778HKIoWpIrZzOq7rPA7Fu7YQ/fnZ6w9XCKUqGJRjo2NgOtgtkLmkd7lCw3gU7KJYe7hurI5XYossJMgjmyNaQ==";
+      url = "https://registry.npmjs.org/web-ext/-/web-ext-4.1.0.tgz";
+      sha512 = "nhAeZ3BHI4rCT/J+s7JHg0U3G6qUMV8Bi44ohWm8X6GjlQV8tGcD6rkvN4Zk2zzMGaF9sHUOcRjyN79Ih8P/PQ==";
     };
     dependencies = [
       sources."@babel/code-frame-7.8.3"
-      sources."@babel/highlight-7.8.3"
+      (sources."@babel/highlight-7.8.3" // {
+        dependencies = [
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.2"
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
+          sources."has-flag-3.0.0"
+          sources."supports-color-5.5.0"
+        ];
+      })
       sources."@babel/polyfill-7.7.0"
       sources."@babel/runtime-7.7.7"
-      sources."@babel/runtime-corejs2-7.8.4"
+      sources."@babel/runtime-corejs3-7.8.4"
       sources."@cliqz-oss/firefox-client-0.3.1"
       sources."@cliqz-oss/node-firefox-connect-1.2.1"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@types/color-name-1.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.0"
+      sources."@types/node-13.7.1"
       sources."JSONSelect-0.2.1"
       sources."acorn-6.4.0"
       sources."acorn-jsx-5.1.0"
       sources."adbkit-2.11.1"
       sources."adbkit-logcat-1.1.0"
       sources."adbkit-monkey-1.0.1"
-      (sources."addons-linter-1.19.0" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."decamelize-1.2.0"
-          sources."string-width-3.1.0"
-          sources."strip-ansi-5.2.0"
-          sources."yargs-14.0.0"
-        ];
-      })
+      sources."addons-linter-1.20.0"
       sources."adm-zip-0.4.14"
       sources."ajv-6.10.2"
       sources."ajv-keywords-1.5.1"
@@ -76333,7 +76565,7 @@ in
       })
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-2.1.1"
-      sources."ansi-styles-3.2.1"
+      sources."ansi-styles-4.2.1"
       sources."any-promise-1.3.0"
       sources."anymatch-2.0.0"
       (sources."archiver-2.1.1" // {
@@ -76409,16 +76641,10 @@ in
       (sources."boxen-4.2.0" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
-          sources."ansi-styles-4.2.1"
-          sources."chalk-3.0.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
           sources."emoji-regex-8.0.0"
-          sources."has-flag-4.0.0"
           sources."is-fullwidth-code-point-3.0.0"
           sources."string-width-4.2.0"
           sources."strip-ansi-6.0.0"
-          sources."supports-color-7.1.0"
         ];
       })
       sources."brace-expansion-1.1.11"
@@ -76447,7 +76673,7 @@ in
       sources."callsites-0.2.0"
       sources."camelcase-5.3.1"
       sources."caseless-0.12.0"
-      sources."chalk-2.4.2"
+      sources."chalk-3.0.0"
       sources."chardet-0.7.0"
       sources."cheerio-1.0.0-rc.3"
       (sources."chokidar-2.1.8" // {
@@ -76479,11 +76705,13 @@ in
       sources."cli-boxes-2.2.0"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.2.0"
-      (sources."cliui-5.0.0" // {
+      (sources."cliui-6.0.0" // {
         dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."string-width-3.1.0"
-          sources."strip-ansi-5.2.0"
+          sources."ansi-regex-5.0.0"
+          sources."emoji-regex-8.0.0"
+          sources."is-fullwidth-code-point-3.0.0"
+          sources."string-width-4.2.0"
+          sources."strip-ansi-6.0.0"
         ];
       })
       sources."clone-1.0.4"
@@ -76491,8 +76719,8 @@ in
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
       sources."collection-visit-1.0.0"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
+      sources."color-convert-2.0.1"
+      sources."color-name-1.1.4"
       sources."colors-0.5.1"
       sources."columnify-1.5.4"
       sources."combined-stream-1.0.8"
@@ -76514,9 +76742,10 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
-      sources."configstore-5.0.0"
+      sources."configstore-5.0.1"
       sources."copy-descriptor-0.1.1"
       sources."core-js-2.6.11"
+      sources."core-js-pure-3.6.4"
       sources."core-util-is-1.0.2"
       sources."crc-3.8.0"
       (sources."crc32-stream-2.0.0" // {
@@ -76551,7 +76780,7 @@ in
       sources."define-properties-1.1.3"
       sources."define-property-2.0.2"
       sources."delayed-stream-1.0.0"
-      (sources."dispensary-0.48.1" // {
+      (sources."dispensary-0.49.0" // {
         dependencies = [
           sources."async-3.1.1"
         ];
@@ -76590,12 +76819,18 @@ in
       (sources."eslint-5.16.0" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.2"
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
           sources."debug-4.1.1"
           sources."espree-5.0.1"
+          sources."has-flag-3.0.0"
           sources."ms-2.1.2"
           sources."semver-5.7.1"
           sources."strip-ansi-4.0.0"
           sources."strip-json-comments-2.0.1"
+          sources."supports-color-5.5.0"
         ];
       })
       (sources."eslint-plugin-no-unsafe-innerhtml-1.0.16" // {
@@ -76650,7 +76885,7 @@ in
         ];
       })
       sources."esprima-4.0.1"
-      sources."esquery-1.0.1"
+      sources."esquery-1.1.0"
       sources."esrecurse-4.2.1"
       sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
@@ -76713,7 +76948,7 @@ in
           sources."is-extendable-0.1.1"
         ];
       })
-      sources."find-up-3.0.0"
+      sources."find-up-4.1.0"
       (sources."firefox-profile-1.3.0" // {
         dependencies = [
           sources."async-2.5.0"
@@ -76769,7 +77004,7 @@ in
       sources."har-validator-5.1.3"
       sources."has-1.0.3"
       sources."has-ansi-2.0.0"
-      sources."has-flag-3.0.0"
+      sources."has-flag-4.0.0"
       sources."has-symbols-1.0.1"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
@@ -76779,7 +77014,7 @@ in
       })
       sources."has-yarn-2.1.0"
       sources."htmlparser2-3.10.1"
-      sources."http-cache-semantics-4.0.3"
+      sources."http-cache-semantics-4.0.4"
       sources."http-signature-1.2.0"
       sources."iconv-lite-0.4.24"
       sources."ieee754-1.1.13"
@@ -76797,7 +77032,13 @@ in
       (sources."inquirer-6.5.2" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.2"
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
+          sources."has-flag-3.0.0"
           sources."strip-ansi-5.2.0"
+          sources."supports-color-5.5.0"
         ];
       })
       sources."interpret-1.2.0"
@@ -76887,7 +77128,7 @@ in
       sources."levn-0.3.0"
       sources."lighthouse-logger-1.2.0"
       sources."lines-and-columns-1.1.6"
-      sources."locate-path-3.0.0"
+      sources."locate-path-5.0.0"
       sources."lodash-4.17.15"
       sources."lodash.includes-4.3.0"
       sources."lodash.isboolean-3.0.3"
@@ -76898,12 +77139,16 @@ in
       sources."lodash.once-4.1.1"
       sources."lodash.sortby-4.7.0"
       sources."lowercase-keys-1.0.1"
-      sources."make-dir-3.0.0"
+      (sources."make-dir-3.0.2" // {
+        dependencies = [
+          sources."semver-6.3.0"
+        ];
+      })
       sources."map-age-cleaner-0.1.3"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       sources."marky-1.2.1"
-      sources."mdn-browser-compat-data-1.0.1"
+      sources."mdn-browser-compat-data-1.0.3"
       (sources."mem-5.1.1" // {
         dependencies = [
           sources."mimic-fn-2.1.0"
@@ -76942,7 +77187,11 @@ in
       sources."next-tick-1.0.0"
       sources."nice-try-1.0.5"
       sources."node-forge-0.7.6"
-      sources."node-notifier-6.0.0"
+      (sources."node-notifier-6.0.0" // {
+        dependencies = [
+          sources."semver-6.3.0"
+        ];
+      })
       sources."normalize-path-2.1.1"
       sources."normalize-url-4.5.0"
       sources."npm-run-path-2.0.2"
@@ -76982,9 +77231,13 @@ in
       sources."p-finally-1.0.0"
       sources."p-is-promise-2.1.0"
       sources."p-limit-2.2.2"
-      sources."p-locate-3.0.0"
+      sources."p-locate-4.1.0"
       sources."p-try-2.2.0"
-      sources."package-json-6.5.0"
+      (sources."package-json-6.5.0" // {
+        dependencies = [
+          sources."semver-6.3.0"
+        ];
+      })
       sources."pako-1.0.11"
       (sources."parent-module-1.0.1" // {
         dependencies = [
@@ -76995,19 +77248,28 @@ in
       sources."parse5-3.0.3"
       sources."pascalcase-0.1.1"
       sources."path-dirname-1.0.2"
-      sources."path-exists-3.0.0"
+      sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-is-inside-1.0.2"
       sources."path-key-2.0.1"
       sources."path-parse-1.0.6"
       sources."pend-1.2.0"
       sources."performance-now-2.1.0"
-      sources."pino-5.14.0"
+      sources."pino-5.15.0"
       sources."pino-std-serializers-2.4.2"
       sources."pluralize-1.2.1"
       sources."posix-character-classes-0.1.1"
-      (sources."postcss-7.0.24" // {
+      (sources."postcss-7.0.26" // {
         dependencies = [
+          sources."ansi-styles-3.2.1"
+          (sources."chalk-2.4.2" // {
+            dependencies = [
+              sources."supports-color-5.5.0"
+            ];
+          })
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
+          sources."has-flag-3.0.0"
           sources."supports-color-6.1.0"
         ];
       })
@@ -77026,7 +77288,7 @@ in
           sources."strip-json-comments-2.0.1"
         ];
       })
-      sources."readable-stream-3.5.0"
+      sources."readable-stream-3.6.0"
       (sources."readdirp-2.2.1" // {
         dependencies = [
           sources."readable-stream-2.3.7"
@@ -77047,11 +77309,20 @@ in
       sources."regexpp-2.0.1"
       sources."registry-auth-token-4.1.1"
       sources."registry-url-5.1.0"
-      sources."relaxed-json-1.0.3"
+      (sources."relaxed-json-1.0.3" // {
+        dependencies = [
+          sources."ansi-styles-3.2.1"
+          sources."chalk-2.4.2"
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
+          sources."has-flag-3.0.0"
+          sources."supports-color-5.5.0"
+        ];
+      })
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
-      sources."request-2.88.0"
+      sources."request-2.88.2"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
       sources."require-uncached-1.0.3"
@@ -77070,8 +77341,12 @@ in
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
-      sources."semver-6.3.0"
-      sources."semver-diff-3.1.1"
+      sources."semver-7.1.1"
+      (sources."semver-diff-3.1.1" // {
+        dependencies = [
+          sources."semver-6.3.0"
+        ];
+      })
       sources."set-blocking-2.0.0"
       (sources."set-value-2.0.1" // {
         dependencies = [
@@ -77085,13 +77360,22 @@ in
       sources."shell-quote-1.6.1"
       sources."shelljs-0.7.8"
       sources."shellwords-0.1.1"
-      (sources."sign-addon-2.0.4" // {
+      (sources."sign-addon-2.0.5" // {
         dependencies = [
-          sources."core-js-3.6.0"
+          sources."core-js-3.6.4"
+          sources."punycode-1.4.1"
+          sources."request-2.88.0"
+          sources."tough-cookie-2.4.3"
         ];
       })
       sources."signal-exit-3.0.2"
-      sources."slice-ansi-2.1.0"
+      (sources."slice-ansi-2.1.0" // {
+        dependencies = [
+          sources."ansi-styles-3.2.1"
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
+        ];
+      })
       (sources."snapdragon-0.8.2" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -77172,7 +77456,7 @@ in
       sources."strip-bom-stream-4.0.0"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-3.0.1"
-      sources."supports-color-5.5.0"
+      sources."supports-color-7.1.0"
       (sources."table-5.4.6" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
@@ -77203,12 +77487,8 @@ in
       sources."to-regex-3.0.2"
       sources."to-regex-range-2.1.1"
       sources."tosource-1.0.0"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
-      sources."tr46-1.0.1"
+      sources."tough-cookie-2.5.0"
+      sources."tr46-2.0.0"
       sources."traverse-0.4.6"
       sources."tslib-1.10.0"
       sources."tunnel-agent-0.6.0"
@@ -77237,16 +77517,7 @@ in
         ];
       })
       sources."upath-1.2.0"
-      (sources."update-notifier-4.0.0" // {
-        dependencies = [
-          sources."ansi-styles-4.2.1"
-          sources."chalk-3.0.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
-          sources."has-flag-4.0.0"
-          sources."supports-color-7.1.0"
-        ];
-      })
+      sources."update-notifier-4.0.0"
       sources."uri-js-4.2.2"
       sources."urix-0.1.0"
       sources."url-parse-lax-3.0.0"
@@ -77257,8 +77528,8 @@ in
       sources."verror-1.10.0"
       sources."watchpack-1.6.0"
       sources."wcwidth-1.0.1"
-      sources."webidl-conversions-4.0.2"
-      sources."whatwg-url-7.1.0"
+      sources."webidl-conversions-5.0.0"
+      sources."whatwg-url-8.0.0"
       sources."when-3.7.7"
       sources."which-1.3.1"
       sources."which-module-2.0.0"
@@ -77273,11 +77544,13 @@ in
       })
       sources."winreg-0.0.12"
       sources."word-wrap-1.2.3"
-      (sources."wrap-ansi-5.1.0" // {
+      (sources."wrap-ansi-6.2.0" // {
         dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."string-width-3.1.0"
-          sources."strip-ansi-5.2.0"
+          sources."ansi-regex-5.0.0"
+          sources."emoji-regex-8.0.0"
+          sources."is-fullwidth-code-point-3.0.0"
+          sources."string-width-4.2.0"
+          sources."strip-ansi-6.0.0"
         ];
       })
       sources."wrappy-1.0.2"
@@ -77287,30 +77560,20 @@ in
       sources."xdg-basedir-4.0.0"
       sources."xml2js-0.4.23"
       sources."xmlbuilder-11.0.1"
-      sources."xregexp-4.2.4"
+      sources."xregexp-4.3.0"
       sources."xtend-4.0.2"
       sources."y18n-4.0.0"
-      (sources."yargs-15.0.2" // {
+      (sources."yargs-15.1.0" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
-          sources."ansi-styles-4.2.1"
-          sources."cliui-6.0.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
           sources."decamelize-1.2.0"
           sources."emoji-regex-8.0.0"
-          sources."find-up-4.1.0"
           sources."is-fullwidth-code-point-3.0.0"
-          sources."locate-path-5.0.0"
-          sources."p-locate-4.1.0"
-          sources."path-exists-4.0.0"
           sources."string-width-4.2.0"
           sources."strip-ansi-6.0.0"
-          sources."wrap-ansi-6.2.0"
-          sources."yargs-parser-16.1.0"
         ];
       })
-      (sources."yargs-parser-13.1.1" // {
+      (sources."yargs-parser-16.1.0" // {
         dependencies = [
           sources."decamelize-1.2.0"
         ];
@@ -77342,10 +77605,10 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "4.41.5";
+    version = "4.41.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-4.41.5.tgz";
-      sha512 = "wp0Co4vpyumnp3KlkmpM5LWuzvZYayDwM2n17EHFr4qxBBbRokC7DJawPJC7TfSFZ9HZ6GsdH40EBj4UV0nmpw==";
+      url = "https://registry.npmjs.org/webpack/-/webpack-4.41.6.tgz";
+      sha512 = "yxXfV0Zv9WMGRD+QexkZzmGIh54bsvEs+9aRWxnN8erLWEOehAKUTeNBoUbA6HPEZPlRo7KDi2ZcNveoZgK9MA==";
     };
     dependencies = [
       sources."@webassemblyjs/ast-1.8.5"
@@ -77424,7 +77687,7 @@ in
       sources."cacache-12.0.3"
       sources."cache-base-1.0.1"
       sources."chokidar-2.1.8"
-      sources."chownr-1.1.3"
+      sources."chownr-1.1.4"
       sources."chrome-trace-event-1.0.2"
       sources."cipher-base-1.0.4"
       (sources."class-utils-0.3.6" // {
@@ -77823,10 +78086,10 @@ in
   webpack-cli = nodeEnv.buildNodePackage {
     name = "webpack-cli";
     packageName = "webpack-cli";
-    version = "3.3.10";
+    version = "3.3.11";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.10.tgz";
-      sha512 = "u1dgND9+MXaEt74sJR4PR7qkPxXUSQ0RXYq8x1L6Jg1MYVEmGPrH6Ah6C4arD4r0J1P5HKjRqpab36k0eIzPqg==";
+      url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.11.tgz";
+      sha512 = "dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g==";
     };
     dependencies = [
       sources."ansi-regex-4.1.0"
@@ -78149,6 +78412,744 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  webpack-dev-server = nodeEnv.buildNodePackage {
+    name = "webpack-dev-server";
+    packageName = "webpack-dev-server";
+    version = "3.10.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz";
+      sha512 = "e4nWev8YzEVNdOMcNzNeCN947sWJNd43E5XvsJzbAL08kGc2frm1tQ32hTJslRS+H65LCb/AaUCYU7fjHCpDeQ==";
+    };
+    dependencies = [
+      sources."@types/events-3.0.0"
+      sources."@types/glob-7.1.1"
+      sources."@types/minimatch-3.0.3"
+      sources."@types/node-13.7.1"
+      sources."accepts-1.3.7"
+      sources."ajv-6.11.0"
+      sources."ajv-errors-1.0.1"
+      sources."ajv-keywords-3.4.1"
+      sources."ansi-colors-3.2.4"
+      sources."ansi-html-0.0.7"
+      sources."ansi-regex-2.1.1"
+      (sources."anymatch-2.0.0" // {
+        dependencies = [
+          sources."normalize-path-2.1.1"
+        ];
+      })
+      sources."arr-diff-4.0.0"
+      sources."arr-flatten-1.1.0"
+      sources."arr-union-3.1.0"
+      sources."array-flatten-2.1.2"
+      sources."array-union-1.0.2"
+      sources."array-uniq-1.0.3"
+      sources."array-unique-0.3.2"
+      sources."assign-symbols-1.0.0"
+      sources."async-2.6.3"
+      sources."async-each-1.0.3"
+      sources."async-limiter-1.0.1"
+      sources."atob-2.1.2"
+      sources."balanced-match-1.0.0"
+      (sources."base-0.11.2" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+        ];
+      })
+      sources."batch-0.6.1"
+      sources."binary-extensions-1.13.1"
+      sources."bindings-1.5.0"
+      (sources."body-parser-1.19.0" // {
+        dependencies = [
+          sources."bytes-3.1.0"
+          sources."debug-2.6.9"
+        ];
+      })
+      sources."bonjour-3.5.0"
+      sources."brace-expansion-1.1.11"
+      (sources."braces-2.3.2" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
+        ];
+      })
+      sources."buffer-indexof-1.1.1"
+      sources."bytes-3.0.0"
+      sources."cache-base-1.0.1"
+      sources."camelcase-5.3.1"
+      sources."chokidar-2.1.8"
+      (sources."class-utils-0.3.6" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      (sources."cliui-4.1.0" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
+      sources."code-point-at-1.1.0"
+      sources."collection-visit-1.0.0"
+      sources."component-emitter-1.3.0"
+      sources."compressible-2.0.18"
+      (sources."compression-1.7.4" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."safe-buffer-5.1.2"
+        ];
+      })
+      sources."concat-map-0.0.1"
+      sources."connect-history-api-fallback-1.6.0"
+      (sources."content-disposition-0.5.3" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
+      sources."content-type-1.0.4"
+      sources."cookie-0.4.0"
+      sources."cookie-signature-1.0.6"
+      sources."copy-descriptor-0.1.1"
+      sources."core-util-is-1.0.2"
+      (sources."cross-spawn-6.0.5" // {
+        dependencies = [
+          sources."semver-5.7.1"
+        ];
+      })
+      (sources."debug-4.1.1" // {
+        dependencies = [
+          sources."ms-2.1.2"
+        ];
+      })
+      sources."decamelize-1.2.0"
+      sources."decode-uri-component-0.2.0"
+      sources."deep-equal-1.1.1"
+      sources."default-gateway-4.2.0"
+      sources."define-properties-1.1.3"
+      sources."define-property-2.0.2"
+      sources."del-4.1.1"
+      sources."depd-1.1.2"
+      sources."destroy-1.0.4"
+      sources."detect-node-2.0.4"
+      sources."dns-equal-1.0.0"
+      sources."dns-packet-1.3.1"
+      sources."dns-txt-2.0.2"
+      sources."ee-first-1.1.1"
+      sources."encodeurl-1.0.2"
+      sources."end-of-stream-1.4.4"
+      sources."errno-0.1.7"
+      sources."es-abstract-1.17.4"
+      sources."es-to-primitive-1.2.1"
+      sources."escape-html-1.0.3"
+      sources."etag-1.8.1"
+      sources."eventemitter3-4.0.0"
+      sources."eventsource-1.0.7"
+      sources."execa-1.0.0"
+      (sources."expand-brackets-2.1.4" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."is-extendable-0.1.1"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      (sources."express-4.17.1" // {
+        dependencies = [
+          sources."array-flatten-1.1.1"
+          sources."debug-2.6.9"
+          sources."safe-buffer-5.1.2"
+        ];
+      })
+      sources."extend-shallow-3.0.2"
+      (sources."extglob-2.0.4" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
+        ];
+      })
+      sources."fast-deep-equal-3.1.1"
+      sources."fast-json-stable-stringify-2.1.0"
+      sources."faye-websocket-0.10.0"
+      sources."file-uri-to-path-1.0.0"
+      (sources."fill-range-4.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
+        ];
+      })
+      (sources."finalhandler-1.1.2" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
+      sources."find-up-3.0.0"
+      (sources."follow-redirects-1.10.0" // {
+        dependencies = [
+          sources."debug-3.2.6"
+          sources."ms-2.1.2"
+        ];
+      })
+      sources."for-in-1.0.2"
+      sources."forwarded-0.1.2"
+      sources."fragment-cache-0.2.1"
+      sources."fresh-0.5.2"
+      sources."fs.realpath-1.0.0"
+      sources."fsevents-1.2.11"
+      sources."function-bind-1.1.1"
+      sources."get-caller-file-1.0.3"
+      sources."get-stream-4.1.0"
+      sources."get-value-2.0.6"
+      sources."glob-7.1.6"
+      (sources."glob-parent-3.1.0" // {
+        dependencies = [
+          sources."is-glob-3.1.0"
+        ];
+      })
+      (sources."globby-6.1.0" // {
+        dependencies = [
+          sources."pify-2.3.0"
+        ];
+      })
+      sources."graceful-fs-4.2.3"
+      sources."handle-thing-2.0.0"
+      sources."has-1.0.3"
+      sources."has-flag-3.0.0"
+      sources."has-symbols-1.0.1"
+      sources."has-value-1.0.0"
+      (sources."has-values-1.0.0" // {
+        dependencies = [
+          sources."kind-of-4.0.0"
+        ];
+      })
+      sources."hpack.js-2.1.6"
+      sources."html-entities-1.2.1"
+      sources."http-deceiver-1.2.7"
+      (sources."http-errors-1.7.2" // {
+        dependencies = [
+          sources."inherits-2.0.3"
+        ];
+      })
+      sources."http-parser-js-0.4.10"
+      sources."http-proxy-1.18.0"
+      sources."http-proxy-middleware-0.19.1"
+      sources."iconv-lite-0.4.24"
+      sources."import-local-2.0.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
+      sources."internal-ip-4.3.0"
+      sources."invert-kv-2.0.0"
+      sources."ip-1.1.5"
+      sources."ip-regex-2.1.0"
+      sources."ipaddr.js-1.9.0"
+      sources."is-absolute-url-3.0.3"
+      sources."is-accessor-descriptor-1.0.0"
+      sources."is-arguments-1.0.4"
+      sources."is-binary-path-1.0.1"
+      sources."is-buffer-1.1.6"
+      sources."is-callable-1.1.5"
+      sources."is-data-descriptor-1.0.0"
+      sources."is-date-object-1.0.2"
+      sources."is-descriptor-1.0.2"
+      sources."is-extendable-1.0.1"
+      sources."is-extglob-2.1.1"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-glob-4.0.1"
+      (sources."is-number-3.0.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."is-path-cwd-2.2.0"
+      sources."is-path-in-cwd-2.1.0"
+      sources."is-path-inside-2.1.0"
+      sources."is-plain-object-2.0.4"
+      sources."is-regex-1.0.5"
+      sources."is-stream-1.1.0"
+      sources."is-symbol-1.0.3"
+      sources."is-windows-1.0.2"
+      sources."is-wsl-1.1.0"
+      sources."isarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."isobject-3.0.1"
+      sources."json-schema-traverse-0.4.1"
+      sources."json3-3.3.3"
+      sources."killable-1.0.1"
+      sources."kind-of-6.0.3"
+      sources."lcid-2.0.0"
+      sources."locate-path-3.0.0"
+      sources."lodash-4.17.15"
+      sources."loglevel-1.6.7"
+      sources."map-age-cleaner-0.1.3"
+      sources."map-cache-0.2.2"
+      sources."map-visit-1.0.0"
+      sources."media-typer-0.3.0"
+      sources."mem-4.3.0"
+      sources."memory-fs-0.4.1"
+      sources."merge-descriptors-1.0.1"
+      sources."methods-1.1.2"
+      sources."micromatch-3.1.10"
+      sources."mime-1.6.0"
+      sources."mime-db-1.43.0"
+      sources."mime-types-2.1.26"
+      sources."mimic-fn-2.1.0"
+      sources."minimalistic-assert-1.0.1"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mixin-deep-1.3.2"
+      sources."mkdirp-0.5.1"
+      sources."ms-2.0.0"
+      sources."multicast-dns-6.2.3"
+      sources."multicast-dns-service-types-1.1.0"
+      sources."nan-2.14.0"
+      sources."nanomatch-1.2.13"
+      sources."negotiator-0.6.2"
+      sources."nice-try-1.0.5"
+      sources."node-forge-0.9.0"
+      sources."normalize-path-3.0.0"
+      sources."npm-run-path-2.0.2"
+      sources."number-is-nan-1.0.1"
+      sources."object-assign-4.1.1"
+      (sources."object-copy-0.1.0" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."object-inspect-1.7.0"
+      sources."object-is-1.0.2"
+      sources."object-keys-1.1.1"
+      sources."object-visit-1.0.1"
+      sources."object.assign-4.1.0"
+      sources."object.pick-1.3.0"
+      sources."obuf-1.1.2"
+      sources."on-finished-2.3.0"
+      sources."on-headers-1.0.2"
+      sources."once-1.4.0"
+      sources."opn-5.5.0"
+      sources."original-1.0.2"
+      sources."os-locale-3.1.0"
+      sources."p-defer-1.0.0"
+      sources."p-finally-1.0.0"
+      sources."p-is-promise-2.1.0"
+      sources."p-limit-2.2.2"
+      sources."p-locate-3.0.0"
+      sources."p-map-2.1.0"
+      sources."p-retry-3.0.1"
+      sources."p-try-2.2.0"
+      sources."parseurl-1.3.3"
+      sources."pascalcase-0.1.1"
+      sources."path-dirname-1.0.2"
+      sources."path-exists-3.0.0"
+      sources."path-is-absolute-1.0.1"
+      sources."path-is-inside-1.0.2"
+      sources."path-key-2.0.1"
+      sources."path-to-regexp-0.1.7"
+      sources."pify-4.0.1"
+      sources."pinkie-2.0.4"
+      sources."pinkie-promise-2.0.1"
+      sources."pkg-dir-3.0.0"
+      (sources."portfinder-1.0.25" // {
+        dependencies = [
+          sources."debug-3.2.6"
+          sources."ms-2.1.2"
+        ];
+      })
+      sources."posix-character-classes-0.1.1"
+      sources."process-nextick-args-2.0.1"
+      sources."proxy-addr-2.0.5"
+      sources."prr-1.0.1"
+      sources."pump-3.0.0"
+      sources."punycode-2.1.1"
+      sources."qs-6.7.0"
+      sources."querystring-0.2.0"
+      sources."querystringify-2.1.1"
+      sources."range-parser-1.2.1"
+      (sources."raw-body-2.4.0" // {
+        dependencies = [
+          sources."bytes-3.1.0"
+        ];
+      })
+      (sources."readable-stream-2.3.7" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
+      sources."readdirp-2.2.1"
+      sources."regex-not-1.0.2"
+      sources."regexp.prototype.flags-1.3.0"
+      sources."remove-trailing-separator-1.1.0"
+      sources."repeat-element-1.1.3"
+      sources."repeat-string-1.6.1"
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-1.0.1"
+      sources."requires-port-1.0.0"
+      sources."resolve-cwd-2.0.0"
+      sources."resolve-from-3.0.0"
+      sources."resolve-url-0.2.1"
+      sources."ret-0.1.15"
+      sources."retry-0.12.0"
+      sources."rimraf-2.7.1"
+      sources."safe-buffer-5.2.0"
+      sources."safe-regex-1.1.0"
+      sources."safer-buffer-2.1.2"
+      sources."schema-utils-1.0.0"
+      sources."select-hose-2.0.0"
+      sources."selfsigned-1.10.7"
+      sources."semver-6.3.0"
+      (sources."send-0.17.1" // {
+        dependencies = [
+          (sources."debug-2.6.9" // {
+            dependencies = [
+              sources."ms-2.0.0"
+            ];
+          })
+          sources."ms-2.1.1"
+        ];
+      })
+      (sources."serve-index-1.9.1" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."http-errors-1.6.3"
+          sources."inherits-2.0.3"
+          sources."setprototypeof-1.1.0"
+        ];
+      })
+      sources."serve-static-1.14.1"
+      sources."set-blocking-2.0.0"
+      (sources."set-value-2.0.1" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+          sources."is-extendable-0.1.1"
+        ];
+      })
+      sources."setprototypeof-1.1.1"
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
+      sources."signal-exit-3.0.2"
+      (sources."snapdragon-0.8.2" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."is-extendable-0.1.1"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      (sources."snapdragon-node-2.1.1" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+        ];
+      })
+      (sources."snapdragon-util-3.0.1" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."sockjs-0.3.19"
+      (sources."sockjs-client-1.4.0" // {
+        dependencies = [
+          sources."debug-3.2.6"
+          sources."faye-websocket-0.11.3"
+          sources."ms-2.1.2"
+        ];
+      })
+      sources."source-map-0.5.7"
+      sources."source-map-resolve-0.5.3"
+      sources."source-map-url-0.4.0"
+      sources."spdy-4.0.1"
+      (sources."spdy-transport-3.0.0" // {
+        dependencies = [
+          sources."readable-stream-3.6.0"
+        ];
+      })
+      sources."split-string-3.1.0"
+      (sources."static-extend-0.1.2" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      sources."statuses-1.5.0"
+      (sources."string-width-2.1.1" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."strip-ansi-4.0.0"
+        ];
+      })
+      sources."string.prototype.trimleft-2.1.1"
+      sources."string.prototype.trimright-2.1.1"
+      (sources."string_decoder-1.1.1" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
+      sources."strip-ansi-3.0.1"
+      sources."strip-eof-1.0.0"
+      sources."supports-color-6.1.0"
+      sources."thunky-1.1.0"
+      (sources."to-object-path-0.3.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."to-regex-3.0.2"
+      sources."to-regex-range-2.1.1"
+      sources."toidentifier-1.0.0"
+      sources."type-is-1.6.18"
+      (sources."union-value-1.0.1" // {
+        dependencies = [
+          sources."is-extendable-0.1.1"
+        ];
+      })
+      sources."unpipe-1.0.0"
+      (sources."unset-value-1.0.0" // {
+        dependencies = [
+          (sources."has-value-0.3.1" // {
+            dependencies = [
+              sources."isobject-2.1.0"
+            ];
+          })
+          sources."has-values-0.1.4"
+        ];
+      })
+      sources."upath-1.2.0"
+      sources."uri-js-4.2.2"
+      sources."urix-0.1.0"
+      (sources."url-0.11.0" // {
+        dependencies = [
+          sources."punycode-1.3.2"
+        ];
+      })
+      sources."url-parse-1.4.7"
+      sources."use-3.1.1"
+      sources."util-deprecate-1.0.2"
+      sources."utils-merge-1.0.1"
+      sources."uuid-3.4.0"
+      sources."vary-1.1.2"
+      sources."wbuf-1.7.3"
+      (sources."webpack-dev-middleware-3.7.2" // {
+        dependencies = [
+          sources."mime-2.4.4"
+        ];
+      })
+      sources."webpack-log-2.0.0"
+      sources."websocket-driver-0.7.3"
+      sources."websocket-extensions-0.1.3"
+      sources."which-1.3.1"
+      sources."which-module-2.0.0"
+      (sources."wrap-ansi-2.1.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+        ];
+      })
+      sources."wrappy-1.0.2"
+      sources."ws-6.2.1"
+      sources."y18n-4.0.0"
+      sources."yargs-12.0.5"
+      sources."yargs-parser-11.1.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Serves a webpack app. Updates the browser on changes.";
+      homepage = "https://github.com/webpack/webpack-dev-server#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  copy-webpack-plugin = nodeEnv.buildNodePackage {
+    name = "copy-webpack-plugin";
+    packageName = "copy-webpack-plugin";
+    version = "5.1.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz";
+      sha512 = "P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg==";
+    };
+    dependencies = [
+      sources."ajv-6.11.0"
+      sources."ajv-errors-1.0.1"
+      sources."ajv-keywords-3.4.1"
+      sources."ansi-colors-3.2.4"
+      sources."aproba-1.2.0"
+      sources."array-union-1.0.2"
+      sources."array-uniq-1.0.3"
+      sources."balanced-match-1.0.0"
+      sources."big.js-5.2.2"
+      sources."bluebird-3.7.2"
+      sources."brace-expansion-1.1.11"
+      sources."buffer-from-1.1.1"
+      sources."cacache-12.0.3"
+      sources."chownr-1.1.4"
+      sources."commondir-1.0.1"
+      sources."concat-map-0.0.1"
+      sources."concat-stream-1.6.2"
+      sources."copy-concurrently-1.0.5"
+      sources."core-util-is-1.0.2"
+      sources."cyclist-1.0.1"
+      sources."dir-glob-2.2.2"
+      sources."duplexify-3.7.1"
+      sources."emojis-list-2.1.0"
+      sources."end-of-stream-1.4.4"
+      sources."fast-deep-equal-3.1.1"
+      sources."fast-json-stable-stringify-2.1.0"
+      sources."figgy-pudding-3.5.1"
+      sources."find-cache-dir-2.1.0"
+      sources."find-up-3.0.0"
+      sources."flush-write-stream-1.1.1"
+      sources."from2-2.3.0"
+      sources."fs-write-stream-atomic-1.0.10"
+      sources."fs.realpath-1.0.0"
+      sources."glob-7.1.6"
+      (sources."glob-parent-3.1.0" // {
+        dependencies = [
+          sources."is-glob-3.1.0"
+        ];
+      })
+      (sources."globby-7.1.1" // {
+        dependencies = [
+          sources."pify-3.0.0"
+        ];
+      })
+      sources."graceful-fs-4.2.3"
+      sources."iferr-0.1.5"
+      sources."ignore-3.3.10"
+      sources."imurmurhash-0.1.4"
+      sources."infer-owner-1.0.4"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
+      sources."is-extglob-2.1.1"
+      sources."is-glob-4.0.1"
+      sources."isarray-1.0.0"
+      sources."json-schema-traverse-0.4.1"
+      (sources."json5-1.0.1" // {
+        dependencies = [
+          sources."minimist-1.2.0"
+        ];
+      })
+      sources."loader-utils-1.2.3"
+      sources."locate-path-3.0.0"
+      sources."lru-cache-5.1.1"
+      sources."make-dir-2.1.0"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mississippi-3.0.0"
+      sources."mkdirp-0.5.1"
+      sources."move-concurrently-1.0.1"
+      sources."normalize-path-3.0.0"
+      sources."once-1.4.0"
+      sources."p-limit-2.2.2"
+      sources."p-locate-3.0.0"
+      sources."p-try-2.2.0"
+      sources."parallel-transform-1.2.0"
+      sources."path-dirname-1.0.2"
+      sources."path-exists-3.0.0"
+      sources."path-is-absolute-1.0.1"
+      (sources."path-type-3.0.0" // {
+        dependencies = [
+          sources."pify-3.0.0"
+        ];
+      })
+      sources."pify-4.0.1"
+      sources."pkg-dir-3.0.0"
+      sources."process-nextick-args-2.0.1"
+      sources."promise-inflight-1.0.1"
+      sources."pump-3.0.0"
+      (sources."pumpify-1.5.1" // {
+        dependencies = [
+          sources."pump-2.0.1"
+        ];
+      })
+      sources."punycode-2.1.1"
+      sources."readable-stream-2.3.7"
+      sources."rimraf-2.7.1"
+      sources."run-queue-1.0.3"
+      sources."safe-buffer-5.1.2"
+      sources."schema-utils-1.0.0"
+      sources."semver-5.7.1"
+      sources."serialize-javascript-2.1.2"
+      sources."slash-1.0.0"
+      sources."ssri-6.0.1"
+      sources."stream-each-1.2.3"
+      sources."stream-shift-1.0.1"
+      sources."string_decoder-1.1.1"
+      sources."through2-2.0.5"
+      sources."typedarray-0.0.6"
+      sources."unique-filename-1.1.1"
+      sources."unique-slug-2.0.2"
+      sources."uri-js-4.2.2"
+      sources."util-deprecate-1.0.2"
+      sources."uuid-3.4.0"
+      sources."webpack-log-2.0.0"
+      sources."wrappy-1.0.2"
+      sources."xtend-4.0.2"
+      sources."y18n-4.0.0"
+      sources."yallist-3.1.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Copy files && directories with webpack";
+      homepage = https://github.com/webpack-contrib/copy-webpack-plugin;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   webtorrent-cli = nodeEnv.buildNodePackage {
     name = "webtorrent-cli";
     packageName = "webtorrent-cli";
@@ -78169,7 +79170,7 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-10.17.14"
+      sources."@types/node-10.17.15"
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.3.0"
       sources."balanced-match-1.0.0"
@@ -78193,7 +79194,7 @@ in
         dependencies = [
           sources."debug-4.1.1"
           sources."decompress-response-4.2.1"
-          sources."mimic-response-2.0.0"
+          sources."mimic-response-2.1.0"
           sources."ms-2.1.2"
           sources."simple-get-3.1.0"
         ];
@@ -78288,7 +79289,7 @@ in
       (sources."load-ip-set-2.1.0" // {
         dependencies = [
           sources."decompress-response-4.2.1"
-          sources."mimic-response-2.0.0"
+          sources."mimic-response-2.1.0"
           sources."simple-get-3.1.0"
         ];
       })
@@ -78332,7 +79333,7 @@ in
       (sources."parse-torrent-7.0.1" // {
         dependencies = [
           sources."decompress-response-4.2.1"
-          sources."mimic-response-2.0.0"
+          sources."mimic-response-2.1.0"
           sources."simple-get-3.1.0"
         ];
       })
@@ -78356,7 +79357,7 @@ in
       sources."randombytes-2.1.0"
       sources."range-parser-1.2.1"
       sources."range-slice-stream-2.0.0"
-      sources."readable-stream-3.5.0"
+      sources."readable-stream-3.6.0"
       sources."record-cache-1.1.0"
       (sources."render-media-3.4.0" // {
         dependencies = [
@@ -78428,7 +79429,7 @@ in
         dependencies = [
           sources."debug-4.1.1"
           sources."decompress-response-4.2.1"
-          sources."mimic-response-2.0.0"
+          sources."mimic-response-2.1.0"
           sources."ms-2.1.2"
           sources."simple-get-3.1.0"
         ];
@@ -78564,7 +79565,7 @@ in
         ];
       })
       sources."bin-version-check-3.0.0"
-      sources."boolean-3.0.0"
+      sources."boolean-3.0.1"
       (sources."boxen-1.3.0" // {
         dependencies = [
           sources."camelcase-4.1.0"
@@ -78736,7 +79737,7 @@ in
       sources."glob-to-regexp-0.3.0"
       (sources."global-agent-2.1.8" // {
         dependencies = [
-          sources."semver-7.1.2"
+          sources."semver-7.1.3"
         ];
       })
       sources."global-dirs-0.1.1"
@@ -78750,7 +79751,7 @@ in
         ];
       })
       sources."graceful-fs-4.2.3"
-      sources."grouped-queue-0.3.3"
+      sources."grouped-queue-1.0.0"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       (sources."has-ansi-2.0.0" // {
@@ -79026,10 +80027,9 @@ in
       sources."repeat-string-1.6.1"
       sources."repeating-2.0.1"
       sources."replace-ext-0.0.1"
-      (sources."request-2.88.0" // {
+      (sources."request-2.88.2" // {
         dependencies = [
-          sources."punycode-1.4.1"
-          sources."tough-cookie-2.4.3"
+          sources."tough-cookie-2.5.0"
         ];
       })
       sources."resolve-1.15.1"
@@ -79264,7 +80264,7 @@ in
         ];
       })
       sources."yeoman-doctor-4.0.0"
-      (sources."yeoman-environment-2.7.0" // {
+      (sources."yeoman-environment-2.8.0" // {
         dependencies = [
           sources."debug-3.2.6"
           sources."ms-2.1.2"
diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix
index 1c6a3821925b..198bd0d33246 100644
--- a/pkgs/development/node-packages/node-packages-v12.nix
+++ b/pkgs/development/node-packages/node-packages-v12.nix
@@ -256,13 +256,13 @@ let
         sha1 = "1b681c21ff84033c826543090689420d187151dc";
       };
     };
-    "chownr-1.1.3" = {
+    "chownr-1.1.4" = {
       name = "chownr";
       packageName = "chownr";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz";
-        sha512 = "i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==";
+        url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz";
+        sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==";
       };
     };
     "class-utils-0.3.6" = {
@@ -1741,15 +1741,6 @@ let
         sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==";
       };
     };
-    "punycode-1.4.1" = {
-      name = "punycode";
-      packageName = "punycode";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
-        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
-      };
-    };
     "punycode-2.1.1" = {
       name = "punycode";
       packageName = "punycode";
@@ -1822,13 +1813,13 @@ let
         sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
       };
     };
-    "request-2.88.0" = {
+    "request-2.88.2" = {
       name = "request";
       packageName = "request";
-      version = "2.88.0";
+      version = "2.88.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz";
-        sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==";
+        url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz";
+        sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==";
       };
     };
     "resolve-1.15.1" = {
@@ -2227,13 +2218,13 @@ let
         sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38";
       };
     };
-    "tough-cookie-2.4.3" = {
+    "tough-cookie-2.5.0" = {
       name = "tough-cookie";
       packageName = "tough-cookie";
-      version = "2.4.3";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz";
-        sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==";
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz";
+        sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==";
       };
     };
     "tunnel-agent-0.6.0" = {
@@ -2760,7 +2751,7 @@ in
       sources."buffer-from-1.1.1"
       sources."builtins-1.0.3"
       sources."caseless-0.12.0"
-      sources."chownr-1.1.3"
+      sources."chownr-1.1.4"
       sources."code-point-at-1.1.0"
       sources."combined-stream-1.0.8"
       sources."concat-map-0.0.1"
@@ -2868,7 +2859,7 @@ in
           sources."safe-buffer-5.1.2"
         ];
       })
-      sources."request-2.88.0"
+      sources."request-2.88.2"
       sources."resolve-1.15.1"
       sources."retry-0.10.1"
       sources."rimraf-2.6.3"
@@ -2894,11 +2885,7 @@ in
       sources."strip-ansi-3.0.1"
       sources."tar-4.4.13"
       sources."temp-0.9.1"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."typedarray-0.0.6"
@@ -2947,7 +2934,7 @@ in
       sources."bcrypt-pbkdf-1.0.2"
       sources."brace-expansion-1.1.11"
       sources."caseless-0.12.0"
-      sources."chownr-1.1.3"
+      sources."chownr-1.1.4"
       sources."code-point-at-1.1.0"
       sources."combined-stream-1.0.8"
       sources."concat-map-0.0.1"
@@ -3009,7 +2996,7 @@ in
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."readable-stream-2.3.7"
-      sources."request-2.88.0"
+      sources."request-2.88.2"
       sources."rimraf-2.7.1"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
@@ -3021,11 +3008,7 @@ in
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."tar-4.4.13"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."uri-js-4.2.2"
@@ -3080,7 +3063,7 @@ in
       sources."are-we-there-yet-1.1.5"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
-      sources."chownr-1.1.3"
+      sources."chownr-1.1.4"
       sources."code-point-at-1.1.0"
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
diff --git a/pkgs/development/node-packages/node-packages-v13.nix b/pkgs/development/node-packages/node-packages-v13.nix
index 0335d6fc3771..6e6c0cb4736d 100644
--- a/pkgs/development/node-packages/node-packages-v13.nix
+++ b/pkgs/development/node-packages/node-packages-v13.nix
@@ -157,13 +157,13 @@ let
         sha1 = "1b681c21ff84033c826543090689420d187151dc";
       };
     };
-    "chownr-1.1.3" = {
+    "chownr-1.1.4" = {
       name = "chownr";
       packageName = "chownr";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz";
-        sha512 = "i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==";
+        url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz";
+        sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==";
       };
     };
     "code-point-at-1.1.0" = {
@@ -850,15 +850,6 @@ let
         sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==";
       };
     };
-    "punycode-1.4.1" = {
-      name = "punycode";
-      packageName = "punycode";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
-        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
-      };
-    };
     "punycode-2.1.1" = {
       name = "punycode";
       packageName = "punycode";
@@ -886,13 +877,13 @@ let
         sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==";
       };
     };
-    "request-2.88.0" = {
+    "request-2.88.2" = {
       name = "request";
       packageName = "request";
-      version = "2.88.0";
+      version = "2.88.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz";
-        sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==";
+        url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz";
+        sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==";
       };
     };
     "resolve-1.15.1" = {
@@ -1120,13 +1111,13 @@ let
         sha512 = "WMuOgiua1xb5R56lE0eH6ivpVmg/lq2OHm4+LtT/xtEtPQ+sz6N3bBM6WZ5FvO1lO4IKIOb43qnhoc4qxP5OeA==";
       };
     };
-    "tough-cookie-2.4.3" = {
+    "tough-cookie-2.5.0" = {
       name = "tough-cookie";
       packageName = "tough-cookie";
-      version = "2.4.3";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz";
-        sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==";
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz";
+        sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==";
       };
     };
     "tunnel-agent-0.6.0" = {
@@ -1284,7 +1275,7 @@ in
       sources."buffer-from-1.1.1"
       sources."builtins-1.0.3"
       sources."caseless-0.12.0"
-      sources."chownr-1.1.3"
+      sources."chownr-1.1.4"
       sources."code-point-at-1.1.0"
       sources."combined-stream-1.0.8"
       sources."concat-map-0.0.1"
@@ -1392,7 +1383,7 @@ in
           sources."safe-buffer-5.1.2"
         ];
       })
-      sources."request-2.88.0"
+      sources."request-2.88.2"
       sources."resolve-1.15.1"
       sources."retry-0.10.1"
       sources."rimraf-2.6.3"
@@ -1418,11 +1409,7 @@ in
       sources."strip-ansi-3.0.1"
       sources."tar-4.4.13"
       sources."temp-0.9.1"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."typedarray-0.0.6"

From 7f5a2ba1ae5e63c0bcba913a9df3c18aeb91ab5a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 18 Feb 2020 07:13:57 -0500
Subject: [PATCH 0977/4636] gnome3.gnome-photos: 3.34.0 -> 3.34.1

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

diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix
index 0eb4f21e53ca..6cbe5448b40a 100644
--- a/pkgs/applications/graphics/gnome-photos/default.nix
+++ b/pkgs/applications/graphics/gnome-photos/default.nix
@@ -35,13 +35,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-photos";
-  version = "3.34.0";
+  version = "3.34.1";
 
   outputs = [ "out" "installedTests" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "12j455id5g616cn0nnj73v83aqgpavrsqszw1r5yhbpyc76lg03m";
+    sha256 = "1ifm8hmxpf9nnxddfcpkbc5wc5f5hz43yj83nnakzqr6x1mq7gdp";
   };
 
   patches = [

From 9f00427bdd250fe79a685bfef8e7c4ad423321b1 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 18 Feb 2020 07:14:40 -0500
Subject: [PATCH 0978/4636] meld: 3.20.1 -> 3.20.2

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

diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 5342a0697ab2..be1e8ff841dd 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -5,11 +5,11 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "meld";
-  version = "3.20.1";
+  version = "3.20.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0jdj7kd6vj1mdc16gvrj1kar88b2j5875ajq18fx7cbc9ny46j55";
+    sha256 = "0a0x156zr3w2yg0rnhwy39giy3xnfm6sqcfa4xcw4i6ahvwqa2dc";
   };
 
   nativeBuildInputs = [

From 2fd97821a66781edcb5062fe0d7d436e454ad1bb Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 18 Feb 2020 07:15:34 -0500
Subject: [PATCH 0979/4636] gnome3.evolution: 3.34.3 -> 3.34.4

---
 pkgs/desktops/gnome-3/apps/evolution/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index a82bd0d18433..60c7fc3872bf 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -43,11 +43,11 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution";
-  version = "3.34.3";
+  version = "3.34.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1s4y29iszvd3zppgxx2qc2jr1lg7ipl3072jnn8g2l3bghcvq7xq";
+    sha256 = "136vpaq94ymyn8pf3a3z1w45xlk1xbvwjdnzasq0d7iwbac0jwks";
   };
 
   nativeBuildInputs = [

From 539493f2cd43a359505502c942043f74384dd34a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 18 Feb 2020 07:16:11 -0500
Subject: [PATCH 0980/4636] gnome3.gnome-music: 3.34.3 -> 3.34.4

---
 pkgs/desktops/gnome-3/apps/gnome-music/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index 9926672aa4be..26c46b1f7b9f 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -29,13 +29,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gnome-music";
-  version = "3.34.3";
+  version = "3.34.4";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0kp7r6l8hb8aq9j2fdiw49p7hyls4gllz258qy6fp3bbfzmbn4g7";
+    sha256 = "1l2jaf5jfdkqqpjxwahsjslb3sa2vlhjgpi1ib51is04ln729xb6";
   };
 
   nativeBuildInputs = [

From c5590c6efabf085b86f99e82ef318d07c8b6c27a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 18 Feb 2020 07:16:47 -0500
Subject: [PATCH 0981/4636] gnome3.dconf-editor: 3.34.3 -> 3.34.4

---
 pkgs/desktops/gnome-3/core/dconf-editor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
index 93d22a99e15c..19d2255ab5f9 100644
--- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
@@ -3,13 +3,13 @@
 
 let
   pname = "dconf-editor";
-  version = "3.34.3";
+  version = "3.34.4";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "12q2cjds5fbarc5zajmhbx9vrbfn28hrklrk1fbgdv1ykxm1ljcv";
+    sha256 = "129a2klywvnrj49rz6p5camwsamajldqpsfkl1rgpm6nw0q2lnyy";
   };
 
   nativeBuildInputs = [

From 391ab233f9ac7148ce2e740f1f6279b66297b1d0 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 18 Feb 2020 07:17:33 -0500
Subject: [PATCH 0982/4636] gnome3.gnome-disk-utility: 3.34.0 -> 3.34.4

---
 pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index 86739bb0f45a..15be3e3178ce 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-disk-utility";
-  version = "3.34.0";
+  version = "3.34.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1mb7q90lnlp97dhxhnadhjagcfd12dfqzp0vj9h6b1r61pzhy97y";
+    sha256 = "0p7pifmihg1vpsvym4qabdjqdp96yx9b4cbc6cnmf5i055js7i8y";
   };
 
   nativeBuildInputs = [

From 509e1b4763ce62f9b12ab85cebe484fa2cf798f3 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 18 Feb 2020 07:18:13 -0500
Subject: [PATCH 0983/4636] gnome3.simple-scan: 3.34.2 -> 3.34.4

---
 pkgs/desktops/gnome-3/core/simple-scan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index 8d737b22a7ac..9b28ca7cf919 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "simple-scan";
-  version = "3.34.2";
+  version = "3.34.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1fk3g4f9slckqfwm576jrjq1d1qihw0dlgzdf00ns7qbhzb0kxsp";
+    sha256 = "0xvy672zyl6jsdlnxma8nc2aqsx9k92jhp6wfxs0msj9ppp1nd3z";
   };
 
   buildInputs = [

From f330f46c15b3ecf977ecb855fac2e230318ad47b Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 18 Feb 2020 07:19:10 -0500
Subject: [PATCH 0984/4636] gnome3.geary: 3.34.1 -> 3.34.2

---
 pkgs/desktops/gnome-3/misc/geary/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix
index 07319337a9a0..7e2a8050b410 100644
--- a/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "geary";
-  version = "3.34.1";
+  version = "3.34.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1bx57g8199pcqh1p90dlnca2g1kpyrifr6g8m1rdjmpm2a1r993v";
+    sha256 = "1a6j70pzr57ga7m4nypqdkqwlzk2dablpz93yaympgrlqpf5zkvm";
   };
 
   nativeBuildInputs = [

From dfdfa745c56cd016e7d6c242a4b3bee70d588a27 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 18 Feb 2020 07:19:27 -0500
Subject: [PATCH 0985/4636] gnome3.file-roller: 3.32.3 -> 3.32.4

---
 pkgs/desktops/gnome-3/apps/file-roller/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
index 387f0ebdc446..57c7a93a5337 100644
--- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "file-roller";
-  version = "3.32.3";
+  version = "3.32.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0ap2hxvjljh4p6wsd9ikh2my3vsxp9r2nvjxxj3v87nwfyw1y4dy";
+    sha256 = "05s046br4fcli1d3wngh4jmwi0aikpfkl1px1cahskj4rfzjqfqv";
   };
 
   LANG = "en_US.UTF-8"; # postinstall.py

From 66472c3c241934b1fabfe468e41ce04e49a40e00 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 18 Feb 2020 07:22:02 -0500
Subject: [PATCH 0986/4636] gnome3.four-in-a-row: 3.34.3 -> 3.34.4

---
 pkgs/desktops/gnome-3/games/four-in-a-row/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
index 078b5051c846..94466b38e226 100644
--- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
+++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "four-in-a-row";
-  version = "3.34.3";
+  version = "3.34.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1agdjg9kcfcfaq3d2w4s4ksci6is1jzfnxanp3f84zqdq55s0k1y";
+    sha256 = "1gw54llbmbv4w2rxmmkzq2wq6sacnpj99maw06zpn071cga0g4z5";
   };
 
   nativeBuildInputs = [

From 34aba8056fa8324df5995ee12497befa94d6dea8 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 18 Feb 2020 07:22:19 -0500
Subject: [PATCH 0987/4636] gnome3.gnome-klotski: 3.34.3 -> 3.34.4

---
 pkgs/desktops/gnome-3/games/gnome-klotski/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
index 5b2b797e3623..f7a7a75533db 100644
--- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
@@ -5,13 +5,13 @@
 
 let
   pname = "gnome-klotski";
-  version = "3.34.3";
+  version = "3.34.4";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0swbyjlgrkd1hgcmp23h7p8fpjm2rpmnn87n6is0jx1x4cl8ab18";
+    sha256 = "1bg7hl64lmjryzvp51qfak5jqs7vbqfmj0s7h1g3c7snscca7rx6";
   };
 
   nativeBuildInputs = [

From 0bd27fd551e96c6dfb2b4328970c5c8a9f73d0b7 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 18 Feb 2020 07:22:35 -0500
Subject: [PATCH 0988/4636] gnome3.gnome-taquin: 3.34.3 -> 3.34.4

---
 pkgs/desktops/gnome-3/games/gnome-taquin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
index 00f138ee7626..623572f980b7 100644
--- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-taquin";
-  version = "3.34.3";
+  version = "3.34.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0njlcqb316qbi0dm2j39s42ca8gc2fqmk5aqill5gpb57znb4d81";
+    sha256 = "0s8gsgaj1mxldg5yaq6k9anfha9bc4n16wms66kbbpqi8k5hcm40";
   };
 
   passthru = {

From d02a96dd6c7c62124b1c63e485416accf3635c03 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 18 Feb 2020 07:22:54 -0500
Subject: [PATCH 0989/4636] gnome3.gnome-tetravex: 3.34.1 -> 3.34.4

---
 pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
index 1337a8108072..843211822f91 100644
--- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
+++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-tetravex";
-  version = "3.34.1";
+  version = "3.34.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "05i9y6x9ai7fay0khr4zb4ji92qs49v88p3lqx9lac8hz04dnvg0";
+    sha256 = "1sm90nkpig02hwk7bh5bnf65awgssxl63bvvh2a7gmlaln8x99iy";
   };
 
   passthru = {

From 769786b4a63fceb9e9e8b081adbc9ed1050d12da Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 18 Feb 2020 07:23:10 -0500
Subject: [PATCH 0990/4636] gnome3.iagno: 3.34.4 -> 3.34.5

---
 pkgs/desktops/gnome-3/games/iagno/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix
index 9f1b52990caa..028684114ecd 100644
--- a/pkgs/desktops/gnome-3/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/games/iagno/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "iagno";
-  version = "3.34.4";
+  version = "3.34.5";
 
   src = fetchurl {
     url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0v0x2dmgcgfcjmbx21arnrwdx9xwa5q05wrm8a9sgrjjzqx6ynwb";
+    sha256 = "05qywjcar29vk29yvbxwlddxhwlrvllgjw7srmlz5811hc5m0a1m";
   };
 
   nativeBuildInputs = [

From a5000f07a64689ccc6fb926485bb84b0ae297244 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 18 Feb 2020 07:25:06 -0500
Subject: [PATCH 0991/4636] gnome3.evolution-data-server: 3.34.3 -> 3.34.4

---
 pkgs/desktops/gnome-3/core/evolution-data-server/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
index d0273f0fac1d..ff4e499204c3 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution-data-server";
-  version = "3.34.3";
+  version = "3.34.4";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1af3f218i5h3df81xkjdij0n9knsw355fsmhzdrfh1bflxfarpyj";
+    sha256 = "1wz8mizblmvficxap6z9w62ymjwa8x99spnaljcwjl1wc55lnp4q";
   };
 
   patches = [

From 52920a6b2c1052f8c02ec4332b865b0c7112e21c Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 18 Feb 2020 13:26:40 +0100
Subject: [PATCH 0992/4636] firefox: 73.0 -> 73.0.1

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

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index dd9222fef034..2a5a82aed6ad 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -16,10 +16,10 @@ in
 rec {
   firefox = common rec {
     pname = "firefox";
-    ffversion = "73.0";
+    ffversion = "73.0.1";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
-      sha512 = "2da2jn3gwck6qys3ys146jsjl9fgq10s3ii62y4ssnhl76ryir8f1mv9i1d6hyv8381hplasnxb553d5bgwnq87ymgqabakmr48n2p1";
+      sha512 = "1vdz711v44xdiry5vm4rrg7fjkrlnyn5jjkaq0bcf98jwrn9bjklmgwblrrnvmpc9pjd2ff3m7354q7vy6gd6c3yh2jhbq91v2w5yl9";
     };
 
     patches = [

From 1de94d59af634516ce1085f6e99f2a33b086e22f Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 18 Feb 2020 07:39:25 -0500
Subject: [PATCH 0993/4636] gnome3.gnome-control-center: 3.34.2 -> 3.34.4

* hardcode usermod which was added absolute this release
---
 .../core/gnome-control-center/default.nix     |  6 +++--
 .../core/gnome-control-center/paths.patch     | 25 ++++++++++++++-----
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index d23469583038..ea38ed883209 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -62,16 +62,17 @@
 , vino
 , gnome-user-share
 , gnome-remote-desktop
+, shadow
 , wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-control-center";
-  version = "3.34.2";
+  version = "3.34.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "054igagvmyzpaa5nwzz98gv7bk7l5dwp6g813707132si3szlpx8";
+    sha256 = "0bi7lsmr5hcf0v17brsa8j33p6i0wnh620bzwycmxryfp6s6vshp";
   };
 
   nativeBuildInputs = [
@@ -138,6 +139,7 @@ stdenv.mkDerivation rec {
     (substituteAll {
       src = ./paths.patch;
       gcm = gnome-color-manager;
+      usermod = "${shadow}/bin/usermod";
       gnome_desktop = gnome-desktop;
       inherit glibc libgnomekbd tzdata;
       inherit cups networkmanagerapplet;
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch b/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch
index 97d8f0bee683..63ca038d8027 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch
@@ -55,7 +55,7 @@ index 96b25140c..1ad704d4a 100644
  typedef struct _TzDB TzDB;
  typedef struct _TzLocation TzLocation;
 diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c
-index 4541986db..da7826bfe 100644
+index 7fce8691e..b839f8b69 100644
 --- a/panels/info/cc-info-overview-panel.c
 +++ b/panels/info/cc-info-overview-panel.c
 @@ -187,7 +187,7 @@ load_gnome_version (char **version,
@@ -84,10 +84,10 @@ index 9390a3308..d30b4a68e 100644
          }
  
 diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c
-index 360fbfc72..870157a11 100644
+index dd99a7485..4baa88a4e 100644
 --- a/panels/network/net-device-wifi.c
 +++ b/panels/network/net-device-wifi.c
-@@ -1385,7 +1385,7 @@ device_wifi_edit (NetObject *object)
+@@ -1445,7 +1445,7 @@ device_wifi_edit (NetObject *object)
                  return;
          }
          uuid = nm_connection_get_uuid (NM_CONNECTION (connection));
@@ -123,10 +123,10 @@ index f53ba217e..d24bcaeb9 100644
  
    /* Use SNMP to get printer's informations */
 diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
-index 35859526d..21486c917 100644
+index e0604b8c3..fc323c1b2 100644
 --- a/panels/region/cc-region-panel.c
 +++ b/panels/region/cc-region-panel.c
-@@ -755,10 +755,10 @@ row_layout_cb (CcRegionPanel *self,
+@@ -763,10 +763,10 @@ row_layout_cb (CcRegionPanel *self,
          layout_variant = cc_input_source_get_layout_variant (source);
  
          if (layout_variant && layout_variant[0])
@@ -140,7 +140,7 @@ index 35859526d..21486c917 100644
  
          g_spawn_command_line_async (commandline, NULL);
 diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c
-index 00239ce0f..617c98870 100644
+index 19934f186..9f41a9620 100644
 --- a/panels/user-accounts/run-passwd.c
 +++ b/panels/user-accounts/run-passwd.c
 @@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error)
@@ -152,6 +152,19 @@ index 00239ce0f..617c98870 100644
          argv[1] = NULL;
  
          envp = g_get_environ ();
+diff --git a/panels/user-accounts/user-utils.c b/panels/user-accounts/user-utils.c
+index 83d4cd091..e8784c722 100644
+--- a/panels/user-accounts/user-utils.c
++++ b/panels/user-accounts/user-utils.c
+@@ -486,7 +486,7 @@ is_valid_username_async (const gchar *username,
+          * future, so it would be nice to have some official way for this
+          * instead of relying on the current "--login" implementation.
+          */
+-        argv[0] = "/usr/sbin/usermod";
++        argv[0] = "@usermod@";
+         argv[1] = "--login";
+         argv[2] = data->username;
+         argv[3] = "--";
 diff --git a/tests/datetime/test-endianess.c b/tests/datetime/test-endianess.c
 index 9cb92007a..84d2f0fa3 100644
 --- a/tests/datetime/test-endianess.c

From 9704297c5d3e319fc09ec6e609b15601ef1b694f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 18 Feb 2020 09:40:38 +0100
Subject: [PATCH 0994/4636] date: init at 2020-01-24

Needed for waybar-0.9.1.
Closes #78458

Co-authored-by: Cole Mickens <cole.mickens@gmail.com>
---
 .../libraries/howard-hinnant-date/default.nix | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/libraries/howard-hinnant-date/default.nix

diff --git a/pkgs/development/libraries/howard-hinnant-date/default.nix b/pkgs/development/libraries/howard-hinnant-date/default.nix
new file mode 100644
index 000000000000..30e5c92b8f09
--- /dev/null
+++ b/pkgs/development/libraries/howard-hinnant-date/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, cmake, curl, fetchpatch }:
+
+stdenv.mkDerivation rec {
+  pname = "howard-hinnant-date-unstable";
+  version = "2020-01-24";
+
+  src = fetchFromGitHub {
+    owner = "HowardHinnant";
+    repo = "date";
+    rev = "9a0ee2542848ab8625984fc8cdbfb9b5414c0082";
+    sha256 = "0yxsn0hj22n61bjywysxqgfv7hj5xvsl6isma95fl8xrimpny083";
+  };
+
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/HowardHinnant/date/commit/e56b2dce7e89a92e1b9b35caa13b3e938c4cedea.patch";
+      sha256 = "0m3qbhq7kmm9qa3jm6d2px7c1dxdj5k9lffgdvqnrwmhxwj1p9n2";
+    })
+  ];
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ curl ];
+
+  cmakeFlags = [
+    "-DBUILD_TZ_LIB=true"
+    "-DBUILD_SHARED_LIBS=true"
+  ];
+
+  outputs = [ "out" "dev" ];
+
+  meta = with stdenv.lib; {
+    license = licenses.mit;
+    description = "A date and time library based on the C++11/14/17 <chrono> header";
+    homepage = "https://github.com/HowardHinnant/date";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ ma27 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2785da848b80..af27a12f427e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1562,6 +1562,8 @@ in
 
   datasette = with python3Packages; toPythonApplication datasette;
 
+  howard-hinnant-date = callPackage ../development/libraries/howard-hinnant-date { };
+
   datefudge = callPackage ../tools/system/datefudge { };
 
   dateutils = callPackage ../tools/misc/dateutils { };

From 89e2a4330077cd1807909b9990b9adda3ada53d3 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 18 Feb 2020 09:41:40 +0100
Subject: [PATCH 0995/4636] waybar: 0.9.0 -> 0.9.1, fix build

ZHF: #80379
https://hydra.nixos.org/build/113067187
---
 pkgs/applications/misc/waybar/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix
index 212013fb655d..69d6ff842682 100644
--- a/pkgs/applications/misc/waybar/default.nix
+++ b/pkgs/applications/misc/waybar/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchFromGitHub, meson, pkgconfig, ninja, wrapGAppsHook
 , wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt, scdoc, spdlog, gtk-layer-shell
+, howard-hinnant-date, cmake
 , traySupport  ? true,  libdbusmenu-gtk3
 , pulseSupport ? false, libpulseaudio
 , nlSupport    ? true,  libnl
@@ -9,21 +10,21 @@
 }:
   stdenv.mkDerivation rec {
     pname = "waybar";
-    version = "0.9.0";
+    version = "0.9.1";
 
     src = fetchFromGitHub {
       owner = "Alexays";
       repo = "Waybar";
       rev = version;
-      sha256 = "1w8a6jih872ry288k8ic6mjfi9ccf1jwc24wnh9p5c7w73247c2c";
+      sha256 = "0drlv8im5phz39jxp3gxkc40b6f85bb3piff2v3hmnfzh7ib915s";
     };
 
     nativeBuildInputs = [
-      meson ninja pkgconfig scdoc wrapGAppsHook
+      meson ninja pkgconfig scdoc wrapGAppsHook cmake
     ];
 
     buildInputs = with stdenv.lib;
-      [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog gtk-layer-shell ]
+      [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ]
       ++ optional  traySupport  libdbusmenu-gtk3
       ++ optional  pulseSupport libpulseaudio
       ++ optional  nlSupport    libnl
@@ -50,5 +51,6 @@
       license = licenses.mit;
       maintainers = with maintainers; [ FlorianFranzen minijackson synthetica ];
       platforms = platforms.unix;
+      homepage = "https://github.com/alexays/waybar";
     };
   }

From 1619ec97685ea462cbb6cebb4cf096206093b24a Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <emmanuelrosa@protonmail.com>
Date: Tue, 18 Feb 2020 19:42:15 +0700
Subject: [PATCH 0996/4636] qutebrowser: 1.10.0 -> 1.10.1

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

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 4824e6aabdda..12cf9b30fa61 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -21,12 +21,12 @@ let
 
 in mkDerivationWith python3Packages.buildPythonApplication rec {
   pname = "qutebrowser";
-  version = "1.10.0";
+  version = "1.10.1";
 
   # the release tarballs are different from the git checkout!
   src = fetchurl {
     url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "1prvd3cysmcjfybn0dmr3ih0bl6lm5ml9i7wd09fn8hb7047mkby";
+    sha256 = "06bcnsfb4kz92bh8xjxwaghhy9x2mmcb76wk3fv868jb1ga75vd8";
   };
 
   # Needs tox

From 0c403efde9a57c58585a75c1678c08a32e3f877c Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Thu, 13 Feb 2020 11:14:31 +0000
Subject: [PATCH 0997/4636] google-cloud-sdk: disable checking for gsutil
 updates

The update checking mechanism references the tests, and thus
dbaafbbf73ef5aeb2fa7d5aea73bb32b9d78e4f3 turned it into a crash at
startup.

It isn't much use in nixpkgs, so we're better off without it.
---
 pkgs/tools/admin/google-cloud-sdk/default.nix |  1 +
 .../gsutil-disable-updates.patch              | 50 +++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/tools/admin/google-cloud-sdk/gsutil-disable-updates.patch

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 07a81a5c5254..93cbb63ce9c9 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -42,6 +42,7 @@ in stdenv.mkDerivation rec {
 
   patches = [
     ./gcloud-path.patch
+    ./gsutil-disable-updates.patch
   ];
 
   installPhase = ''
diff --git a/pkgs/tools/admin/google-cloud-sdk/gsutil-disable-updates.patch b/pkgs/tools/admin/google-cloud-sdk/gsutil-disable-updates.patch
new file mode 100644
index 000000000000..de44ea7e7915
--- /dev/null
+++ b/pkgs/tools/admin/google-cloud-sdk/gsutil-disable-updates.patch
@@ -0,0 +1,50 @@
+diff --git a/platform/gsutil/gslib/command_runner.py b/platform/gsutil/gslib/command_runner.py
+index 06ca5e5..4a4e225 100644
+--- a/platform/gsutil/gslib/command_runner.py
++++ b/platform/gsutil/gslib/command_runner.py
+@@ -61,7 +61,6 @@ from gslib.utils.text_util import InsistAsciiHeaderValue
+ from gslib.utils.text_util import print_to_fd
+ from gslib.utils.unit_util import SECONDS_PER_DAY
+ from gslib.utils.update_util import LookUpGsutilVersion
+-from gslib.tests.util import HAS_NON_DEFAULT_GS_HOST
+ 
+ 
+ def HandleHeaderCoding(headers):
+@@ -331,17 +330,6 @@ class CommandRunner(object):
+     Returns:
+       Return value(s) from Command that was run.
+     """
+-    command_changed_to_update = False
+-    if (not skip_update_check and
+-        self.MaybeCheckForAndOfferSoftwareUpdate(command_name, debug)):
+-      command_name = 'update'
+-      command_changed_to_update = True
+-      args = [_StringToSysArgType('-n')]
+-
+-      # Check for opt-in analytics.
+-      if system_util.IsRunningInteractively() and collect_analytics:
+-        metrics.CheckAndMaybePromptForAnalyticsEnabling()
+-
+     if not args:
+       args = []
+ 
+@@ -414,18 +402,10 @@ class CommandRunner(object):
+       ShutDownGsutil()
+     if GetFailureCount() > 0:
+       return_code = 1
+-    if command_changed_to_update:
+-      # If the command changed to update, the user's original command was
+-      # not executed.
+-      return_code = 1
+-      print('\n'.join(
+-          textwrap.wrap(
+-              'Update was successful. Exiting with code 1 as the original command '
+-              'issued prior to the update was not executed and should be re-run.'
+-          )))
+     return return_code
+ 
+   def MaybeCheckForAndOfferSoftwareUpdate(self, command_name, debug):
++    return False
+     """Checks the last time we checked for an update and offers one if needed.
+ 
+     Offer is made if the time since the last update check is longer

From 5bda7e7fb2655eab3f8ae5cf1839baf5a35d00a6 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Thu, 13 Feb 2020 11:14:31 +0000
Subject: [PATCH 0998/4636] google-cloud-sdk: remove gsutil test

The command module references the tests, and since all command modules
get imported at startup, dbaafbbf73ef5aeb2fa7d5aea73bb32b9d78e4f3
turned it into a startup crash.

Unless you're actively hacking on gsutil, this command isn't much use,
so we're better off without it.
---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 93cbb63ce9c9..326d15a9318e 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -84,6 +84,7 @@ in stdenv.mkDerivation rec {
 
     # remove tests and test data
     find $out -name tests -type d -exec rm -rf '{}' +
+    rm $out/google-cloud-sdk/platform/gsutil/gslib/commands/test.py
 
     # compact all the JSON
     find $out -name \*.json | while read path; do

From c95bfd235b6a94a9bf748abff408f9a598974183 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Mon, 17 Feb 2020 14:50:38 +0100
Subject: [PATCH 0999/4636] libreoffice: wrapper: add hunspell dirs to DICPATH

LibreOffice doesn't know where to look for hunspell dictionaries on
NixOS but we can use the DICPATH env var to point to them. Now
spellchecking with system dictionaries works.

Note that some of these dictionaries are built from LibreOffice repos -
this is preferable to building them as part of LO as other applications
can use them.
---
 pkgs/applications/office/libreoffice/src-fresh/primary.nix | 3 ++-
 pkgs/applications/office/libreoffice/src-still/primary.nix | 3 ++-
 pkgs/applications/office/libreoffice/wrapper.sh            | 7 +++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix
index 28bf127c3988..636f4b360eaa 100644
--- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix
+++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix
@@ -26,7 +26,8 @@ rec {
     sha256 = "0730fw2kr00b2d56jkdzjdz49c4k4mxiz879c7ikw59c5zvrh009";
   };
 
-  # TODO: dictionaries
+  # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
+  # it and LibreOffice can use these by pointing DICPATH environment variable at the hunspell directory
 
   help = fetchSrc {
     name = "help";
diff --git a/pkgs/applications/office/libreoffice/src-still/primary.nix b/pkgs/applications/office/libreoffice/src-still/primary.nix
index a27087a1b051..502bcc54d0ca 100644
--- a/pkgs/applications/office/libreoffice/src-still/primary.nix
+++ b/pkgs/applications/office/libreoffice/src-still/primary.nix
@@ -25,7 +25,8 @@ rec {
     sha256 = "1l5v9bb7n9s6i24q4mdyqyp5v4f8iy0a9dmpgw649vngj1zxdxfh";
   };
 
-  # TODO: dictionaries
+  # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
+  # it and LibreOffice can use these by pointing DICPATH environment variable at the hunspell directory
 
   help = fetchSrc {
     name = "help";
diff --git a/pkgs/applications/office/libreoffice/wrapper.sh b/pkgs/applications/office/libreoffice/wrapper.sh
index 62569734745c..806dd0806ad5 100644
--- a/pkgs/applications/office/libreoffice/wrapper.sh
+++ b/pkgs/applications/office/libreoffice/wrapper.sh
@@ -17,6 +17,13 @@ if uname | grep Linux > /dev/null &&
     export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session"
 fi
 
+for PROFILE in $NIX_PROFILES; do
+    HDIR="$PROFILE/share/hunspell"
+    if [ -d "$HDIR" ]; then
+        export DICPATH=$DICPATH''${DICPATH:+:}$HDIR
+    fi
+done
+
 "@libreoffice@/bin/$(basename "$0")" "$@"
 code="$?"
 

From bdcee483b657df03e46e1a6357671adaddbc838f Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 17 Sep 2019 19:48:22 -0500
Subject: [PATCH 1000/4636] nm-tray: init at 0.4.3

---
 .../tools/networking/network-manager/tray.nix | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/networking/network-manager/tray.nix

diff --git a/pkgs/tools/networking/network-manager/tray.nix b/pkgs/tools/networking/network-manager/tray.nix
new file mode 100644
index 000000000000..e8ce8ad342fd
--- /dev/null
+++ b/pkgs/tools/networking/network-manager/tray.nix
@@ -0,0 +1,31 @@
+{ lib, mkDerivation, fetchFromGitHub, cmake, qttools, qtbase, networkmanager-qt, modemmanager-qt }:
+
+mkDerivation rec {
+  pname = "nm-tray";
+  version = "0.4.3";
+
+  src = fetchFromGitHub {
+    owner = "palinek";
+    repo = pname;
+    rev = version;
+    sha256 = "08c86kd613wlvw9571q7a3lb7g6skyyasjw6h1g543rbl4jn2c2v";
+  };
+
+  postPatch = ''
+    sed -i -e '1i#include <QMetaEnum>' src/nmmodel.cpp
+  '';
+
+  nativeBuildInputs = [ cmake qttools ];
+
+  cmakeFlags = [ "-DWITH_MODEMMANAGER_SUPPORT=ON" ];
+
+  buildInputs = [ qtbase networkmanager-qt modemmanager-qt ];
+
+  meta = with lib; {
+    description = "Simple Network Manager frontend written in Qt";
+    homepage = "https://github.com/palinek/nm-tray";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ dtzWill ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0716e4113010..5d48b9449893 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5291,6 +5291,8 @@ in
 
   networkmanager_dmenu = callPackage ../tools/networking/network-manager/dmenu  { };
 
+  nm-tray = libsForQt5.callPackage ../tools/networking/network-manager/tray.nix { };
+
   newsboat = callPackage ../applications/networking/feedreaders/newsboat {
     inherit (darwin.apple_sdk.frameworks) Security;
   };

From fc479ad23fe2f2b12165bb11ae535aeb7e1d8c24 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Tue, 18 Feb 2020 15:08:44 +0100
Subject: [PATCH 1001/4636] uni-vega: fix build on darwin

---
 pkgs/data/fonts/uni-vga/default.nix | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/data/fonts/uni-vga/default.nix
index 44619bf3424c..9cc0fb9adcc5 100644
--- a/pkgs/data/fonts/uni-vga/default.nix
+++ b/pkgs/data/fonts/uni-vga/default.nix
@@ -2,6 +2,8 @@
 , libfaketime, fonttosfnt, mkfontscale
 }:
 
+with stdenv.lib;
+
 stdenv.mkDerivation {
   name = "uni-vga";
 
@@ -11,9 +13,9 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs =
-    [ perl kbd bdftopcf libfaketime
+    [ bdftopcf libfaketime
       fonttosfnt mkfontscale
-    ];
+    ] ++ optionals stdenv.isLinux [ perl kbd ];
 
   postPatch = "patchShebangs .";
 
@@ -21,20 +23,19 @@ stdenv.mkDerivation {
     # convert font to compressed pcf
     bdftopcf u_vga16.bdf | gzip -c -9 -n  > u_vga16.pcf.gz
 
+    # convert bdf font to otb
+    faketime -f "1970-01-01 00:00:01" \
+    fonttosfnt -v -o u_vga16.otb u_vga16.bdf
+  '' + optionalString stdenv.isLinux ''
     # convert font to compressed psf
     ./bdf2psf.pl -s UniCyrX.sfm u_vga16.bdf \
       | psfaddtable - UniCyrX.sfm - \
       | gzip -c -9 -n > u_vga16.psf.gz
-
-    # convert bdf font to otb
-    faketime -f "1970-01-01 00:00:01" \
-    fonttosfnt -v -o u_vga16.otb u_vga16.bdf
   '';
 
   installPhase = ''
-    # install pcf (for X11 applications) and psf (virtual terminal)
+    # install pcf (for X11 applications)
     install -m 644 -D *.pcf.gz -t "$out/share/fonts"
-    install -m 644 -D *.psf.gz -t "$out/share/consolefonts"
     mkfontdir "$out/share/fonts"
 
     # install bdf font
@@ -44,14 +45,17 @@ stdenv.mkDerivation {
     # install otb font (for GTK applications)
     install -m 644 -D *.otb -t "$otb/share/fonts"
     mkfontdir "$otb/share/fonts"
+  '' + optionalString stdenv.isLinux ''
+    # install psf (for linux virtual terminal)
+    install -m 644 -D *.psf.gz -t "$out/share/consolefonts"
   '';
 
   outputs = [ "out" "bdf" "otb" ];
 
   meta = {
     description = "Unicode VGA font";
-    maintainers = [stdenv.lib.maintainers.ftrvxmtrx];
+    maintainers = [ maintainers.ftrvxmtrx ];
     homepage = http://www.inp.nsk.su/~bolkhov/files/fonts/univga/;
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
   };
 }

From 66556afb5ab4ff4b30eb9b3f9d7eec2f1e5de32a Mon Sep 17 00:00:00 2001
From: Johan Thomsen <jth@dbc.dk>
Date: Tue, 18 Feb 2020 10:48:37 +0100
Subject: [PATCH 1002/4636] kubernetes: 1.16.5 -> 1.17.3

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

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index a5e2b3743260..5178b7a2bd41 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -15,13 +15,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   pname = "kubernetes";
-  version = "1.16.5";
+  version = "1.17.3";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "12ks79sjgbd0c97pipid4j3l5fwiimaxa25rvmf2vccdrw4ngx4m";
+    sha256 = "0caqczz8hrwqb8j94158hz6919i7c9v1v0zknh9m2zbbng4b1awi";
   };
 
   buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];

From 68558d8c5d1c3c307e58ee215f9affb821a97655 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 18 Feb 2020 09:04:57 -0500
Subject: [PATCH 1003/4636] vivaldi: 2.11.1811.33-1 -> 2.11.1811.38-1

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

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index ce3530728aa2..d2de889bf7bd 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -17,11 +17,11 @@ let
   vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
 in stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "2.11.1811.33-1";
+  version = "2.11.1811.38-1";
 
   src = fetchurl {
     url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
-    sha256 = "1z0cscvmhxh1wjs7r0sjdr3f3mcg8i6avpal6spp0ymkxp2rn0h3";
+    sha256 = "0nz7yhxp7fxv6pj1i2684di1wgk4k78hw4icfjqzjwmvc3i710jw";
   };
 
   unpackPhase = ''

From ae607de23dbb441b2bc3c1a967d158fbf68c3f80 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Tue, 1 Oct 2019 15:40:47 +0900
Subject: [PATCH 1004/4636] linkFarmFromDrvs: Add a trivial builder to create a
 linkFarm from a list of derivations

---
 pkgs/build-support/trivial-builders.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index e107db2db5c9..f2e6f7d38d50 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -335,6 +335,21 @@ rec {
       '') entries}
     '';
 
+  /*
+   * Easily create a linkFarm from a set of derivations.
+   *
+   * This calls linkFarm with a list of entries created from the list of input
+   * derivations.  It turns each input derivation into an attribute set
+   * like { name = drv.name ; path = drv }, and passes this to linkFarm.
+   *
+   * Example:
+   *
+   * # Symlinks the hello, gcc, and ghc derivations in $out
+   * linkFarmFromDrvs "example" [ pkgs.hello pkgs.gcc pkgs.ghc ]
+   */
+  linkFarmFromDrvs = name: drvs:
+    let mkEntryFromDrv = drv: { name = drv.name; path = drv; };
+    in linkFarm name (map mkEntryFromDrv drvs);
 
   /* Print an error message if the file with the specified name and
    * hash doesn't exist in the Nix store. This function should only

From 55e15293359935cceec8c6380bfb9edd3ceb7714 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Fri, 14 Feb 2020 13:46:49 +0900
Subject: [PATCH 1005/4636] symlinkJoin: add more documentation

---
 pkgs/build-support/trivial-builders.nix | 143 ++++++++++++++++--------
 1 file changed, 96 insertions(+), 47 deletions(-)

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index f2e6f7d38d50..c67f5845135b 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -234,17 +234,48 @@ rec {
     '';
 
   /*
-  * Create a forest of symlinks to the files in `paths'.
-  *
-  * Examples:
-  * # adds symlinks of hello to current build.
-  * { symlinkJoin, hello }:
-  * symlinkJoin { name = "myhello"; paths = [ hello ]; }
-  *
-  * # adds symlinks of hello to current build and prints "links added"
-  * { symlinkJoin, hello }:
-  * symlinkJoin { name = "myhello"; paths = [ hello ]; postBuild = "echo links added"; }
-  */
+   * Create a forest of symlinks to the files in `paths'.
+   *
+   * This creates a single derivation that replicates the directory structure
+   * of all the input paths.
+   *
+   * Examples:
+   * # adds symlinks of hello to current build.
+   * symlinkJoin { name = "myhello"; paths = [ pkgs.hello ]; }
+   *
+   * # adds symlinks of hello and stack to current build and prints "links added"
+   * symlinkJoin { name = "myexample"; paths = [ pkgs.hello pkgs.stack ]; postBuild = "echo links added"; }
+   *
+   * This creates a derivation with a directory structure like the following:
+   *
+   * /nix/store/sglsr5g079a5235hy29da3mq3hv8sjmm-myexample
+   * |-- bin
+   * |   |-- hello -> /nix/store/qy93dp4a3rqyn2mz63fbxjg228hffwyw-hello-2.10/bin/hello
+   * |   `-- stack -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/bin/stack
+   * `-- share
+   *     |-- bash-completion
+   *     |   `-- completions
+   *     |       `-- stack -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/share/bash-completion/completions/stack
+   *     |-- fish
+   *     |   `-- vendor_completions.d
+   *     |       `-- stack.fish -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/share/fish/vendor_completions.d/stack.fish
+   * ...
+   *
+   * symlinkJoin and linkFarm are similar functions, but they output
+   * derivations with different structure.
+   *
+   * symlinkJoin is used to create a derivation with a familiar directory
+   * structure (top-level bin/, share/, etc), but with all actual files being symlinks to
+   * the files in the input derivations.
+   *
+   * symlinkJoin is used many places in nixpkgs to create a single derivation
+   * that appears to contain binaries, libraries, documentation, etc from
+   * multiple input derivations.
+   *
+   * linkFarm is instead used to create a simple derivation with symlinks to
+   * other derivations.  A derivation created with linkFarm is often used in CI
+   * as a easy way to build multiple derivations at once.
+   */
   symlinkJoin =
     args_@{ name
          , paths
@@ -268,6 +299,60 @@ rec {
         ${postBuild}
       '';
 
+  /*
+   * Quickly create a set of symlinks to derivations.
+   *
+   * This creates a simple derivation with symlinks to all inputs.
+   *
+   * entries is a list of attribute sets like
+   * { name = "name" ; path = "/nix/store/..."; }
+   *
+   * Example:
+   *
+   * # Symlinks hello and stack paths in store to current $out/hello-test and
+   * # $out/foobar.
+   * linkFarm "myexample" [ { name = "hello-test"; path = pkgs.hello; } { name = "foobar"; path = pkgs.stack; } ]
+   *
+   * This creates a derivation with a directory structure like the following:
+   *
+   * /nix/store/qc5728m4sa344mbks99r3q05mymwm4rw-myexample
+   * |-- foobar -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1
+   * `-- hello-test -> /nix/store/qy93dp4a3rqyn2mz63fbxjg228hffwyw-hello-2.10
+   *
+   * See the note on symlinkJoin for the difference between linkFarm and symlinkJoin.
+   */
+  linkFarm = name: entries: runCommand name { preferLocalBuild = true; allowSubstitutes = false; }
+    ''mkdir -p $out
+      cd $out
+      ${lib.concatMapStrings (x: ''
+          mkdir -p "$(dirname ${lib.escapeShellArg x.name})"
+          ln -s ${lib.escapeShellArg x.path} ${lib.escapeShellArg x.name}
+      '') entries}
+    '';
+
+  /*
+   * Easily create a linkFarm from a set of derivations.
+   *
+   * This calls linkFarm with a list of entries created from the list of input
+   * derivations.  It turns each input derivation into an attribute set
+   * like { name = drv.name ; path = drv }, and passes this to linkFarm.
+   *
+   * Example:
+   *
+   * # Symlinks the hello, gcc, and ghc derivations in $out
+   * linkFarmFromDrvs "myexample" [ pkgs.hello pkgs.gcc pkgs.ghc ]
+   *
+   * This creates a derivation with a directory structure like the following:
+   *
+   * /nix/store/m3s6wkjy9c3wy830201bqsb91nk2yj8c-myexample
+   * |-- gcc-wrapper-9.2.0 -> /nix/store/fqhjxf9ii4w4gqcsx59fyw2vvj91486a-gcc-wrapper-9.2.0
+   * |-- ghc-8.6.5 -> /nix/store/gnf3s07bglhbbk4y6m76sbh42siym0s6-ghc-8.6.5
+   * `-- hello-2.10 -> /nix/store/k0ll91c4npk4lg8lqhx00glg2m735g74-hello-2.10
+   */
+  linkFarmFromDrvs = name: drvs:
+    let mkEntryFromDrv = drv: { name = drv.name; path = drv; };
+    in linkFarm name (map mkEntryFromDrv drvs);
+
 
   /*
    * Make a package that just contains a setup hook with the given contents.
@@ -315,42 +400,6 @@ rec {
     '';
 
 
-  /*
-   * Quickly create a set of symlinks to derivations.
-   * entries is a list of attribute sets like
-   * { name = "name" ; path = "/nix/store/..."; }
-   *
-   * Example:
-   *
-   * # Symlinks hello path in store to current $out/hello
-   * linkFarm "hello" [ { name = "hello"; path = pkgs.hello; } ];
-   *
-   */
-  linkFarm = name: entries: runCommand name { preferLocalBuild = true; allowSubstitutes = false; }
-    ''mkdir -p $out
-      cd $out
-      ${lib.concatMapStrings (x: ''
-          mkdir -p "$(dirname ${lib.escapeShellArg x.name})"
-          ln -s ${lib.escapeShellArg x.path} ${lib.escapeShellArg x.name}
-      '') entries}
-    '';
-
-  /*
-   * Easily create a linkFarm from a set of derivations.
-   *
-   * This calls linkFarm with a list of entries created from the list of input
-   * derivations.  It turns each input derivation into an attribute set
-   * like { name = drv.name ; path = drv }, and passes this to linkFarm.
-   *
-   * Example:
-   *
-   * # Symlinks the hello, gcc, and ghc derivations in $out
-   * linkFarmFromDrvs "example" [ pkgs.hello pkgs.gcc pkgs.ghc ]
-   */
-  linkFarmFromDrvs = name: drvs:
-    let mkEntryFromDrv = drv: { name = drv.name; path = drv; };
-    in linkFarm name (map mkEntryFromDrv drvs);
-
   /* Print an error message if the file with the specified name and
    * hash doesn't exist in the Nix store. This function should only
    * be used by non-redistributable software with an unfree license

From 55819e6c861f53450030eea832a76583a6786370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 18 Feb 2020 13:30:02 +0000
Subject: [PATCH 1006/4636] Revert "zsh: don't clobber the environment of
 non-login shells"

This reverts commit 6a756af3e7a50c22a45f7d958657527ac47d2902.

Currently zshenv by default only set fpath and HELPDIR without exporting them.
A parent shell would also not set those variables usually as they are shell local.

It also sources a file called set-environment but this is protected by an
environment variable called __NIXOS_SET_ENVIRONMENT_DONE. Hence any modification
done by the parent shell should persist as long as __NIXOS_SET_ENVIRONMENT_DONE
is not unset.

This behavior deviates from what we do in bashrc and breaks common setups such
as tmux/mosh or screen.

Fixes #80437
---
 nixos/modules/programs/zsh/zsh.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index 4fbdba47b1df..930cc1987a33 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -162,9 +162,8 @@ in
         # This file is read for all shells.
 
         # Only execute this file once per shell.
-        # But don't clobber the environment of interactive non-login children!
         if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
-        export __ETC_ZSHENV_SOURCED=1
+        __ETC_ZSHENV_SOURCED=1
 
         if [ -z "$__NIXOS_SET_ENVIRONMENT_DONE" ]; then
             . ${config.system.build.setEnvironment}

From 72c145115b76b9e1eb77f0d374dd106c6da7475a Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 18 Feb 2020 14:38:25 +1000
Subject: [PATCH 1007/4636] metasploit: 5.0.45 -> 5.0.74

---
 pkgs/tools/security/metasploit/Gemfile      |   2 +-
 pkgs/tools/security/metasploit/Gemfile.lock | 114 +++++----
 pkgs/tools/security/metasploit/default.nix  |   4 +-
 pkgs/tools/security/metasploit/gemset.nix   | 259 +++++++++-----------
 4 files changed, 174 insertions(+), 205 deletions(-)

diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile
index 2aae6fc49d96..3924e6919d37 100644
--- a/pkgs/tools/security/metasploit/Gemfile
+++ b/pkgs/tools/security/metasploit/Gemfile
@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 source "https://rubygems.org"
 
-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/5.0.45"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/5.0.74"
diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock
index 931ea65f54a7..2eaf8aa6c715 100644
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,16 +1,15 @@
 GIT
   remote: https://github.com/rapid7/metasploit-framework
-  revision: 2b9e74c7a8a4423ea195e75abca1f56c354e5541
-  ref: refs/tags/5.0.45
+  revision: 22104a154544b3ee57d3ce98a490c4b42a4a8776
+  ref: refs/tags/5.0.74
   specs:
-    metasploit-framework (5.0.45)
+    metasploit-framework (5.0.74)
       actionpack (~> 4.2.6)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)
       aws-sdk-ec2
       aws-sdk-iam
       aws-sdk-s3
-      backports
       bcrypt (= 3.1.12)
       bcrypt_pbkdf
       bit-struct
@@ -18,16 +17,19 @@ GIT
       dnsruby
       ed25519
       em-http-request
+      eventmachine
       faker
+      faraday (<= 0.17.0)
+      faye-websocket
       filesize
       jsobfu
       json
       metasm
-      metasploit-concern
-      metasploit-credential
-      metasploit-model
-      metasploit-payloads (= 1.3.70)
-      metasploit_data_models (= 3.0.10)
+      metasploit-concern (~> 2.0.0)
+      metasploit-credential (~> 3.0.0)
+      metasploit-model (~> 2.0.4)
+      metasploit-payloads (= 1.3.84)
+      metasploit_data_models (~> 3.0.10)
       metasploit_payloads-mettle (= 0.5.16)
       mqtt
       msgpack
@@ -61,7 +63,7 @@ GIT
       rex-random_identifier
       rex-registry
       rex-rop_builder
-      rex-socket (= 0.1.17)
+      rex-socket
       rex-sslscan
       rex-struct2
       rex-text
@@ -114,39 +116,38 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     afm (0.2.2)
     arel (6.0.4)
-    arel-helpers (2.10.0)
+    arel-helpers (2.11.0)
       activerecord (>= 3.1.0, < 7)
     aws-eventstream (1.0.3)
-    aws-partitions (1.208.0)
-    aws-sdk-core (3.66.0)
+    aws-partitions (1.274.0)
+    aws-sdk-core (3.90.1)
       aws-eventstream (~> 1.0, >= 1.0.2)
-      aws-partitions (~> 1.0)
+      aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.106.0)
-      aws-sdk-core (~> 3, >= 3.61.1)
+    aws-sdk-ec2 (1.144.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-iam (1.29.0)
-      aws-sdk-core (~> 3, >= 3.61.1)
+    aws-sdk-iam (1.33.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.24.0)
-      aws-sdk-core (~> 3, >= 3.61.1)
+    aws-sdk-kms (1.29.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.48.0)
-      aws-sdk-core (~> 3, >= 3.61.1)
+    aws-sdk-s3 (1.60.2)
+      aws-sdk-core (~> 3, >= 3.83.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.1.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
-    backports (3.15.0)
     bcrypt (3.1.12)
     bcrypt_pbkdf (1.0.1)
     bindata (2.4.4)
     bit-struct (0.16)
-    builder (3.2.3)
+    builder (3.2.4)
     concurrent-ruby (1.0.5)
     cookiejar (0.3.3)
-    crass (1.0.4)
+    crass (1.0.6)
     daemons (1.3.1)
     dnsruby (1.61.3)
       addressable (~> 2.5)
@@ -163,8 +164,11 @@ GEM
     eventmachine (1.2.7)
     faker (2.2.1)
       i18n (>= 0.8)
-    faraday (0.15.4)
+    faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
+    faye-websocket (0.10.9)
+      eventmachine (>= 0.12.0)
+      websocket-driver (>= 0.5.1)
     filesize (0.2.0)
     hashery (2.1.2)
     http_parser.rb (0.6.0)
@@ -173,8 +177,8 @@ GEM
     jmespath (1.4.0)
     jsobfu (0.4.2)
       rkelly-remix
-    json (2.2.0)
-    loofah (2.2.3)
+    json (2.3.0)
+    loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     metasm (1.0.4)
@@ -182,7 +186,7 @@ GEM
       activemodel (~> 4.2.6)
       activesupport (~> 4.2.6)
       railties (~> 4.2.6)
-    metasploit-credential (3.0.3)
+    metasploit-credential (3.0.4)
       metasploit-concern
       metasploit-model
       metasploit_data_models (>= 3.0.0)
@@ -196,7 +200,7 @@ GEM
       activemodel (~> 4.2.6)
       activesupport (~> 4.2.6)
       railties (~> 4.2.6)
-    metasploit-payloads (1.3.70)
+    metasploit-payloads (1.3.84)
     metasploit_data_models (3.0.10)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)
@@ -209,17 +213,18 @@ GEM
       recog (~> 2.0)
     metasploit_payloads-mettle (0.5.16)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
+    minitest (5.14.0)
     mqtt (0.5.0)
-    msgpack (1.3.1)
+    msgpack (1.3.3)
     multipart-post (2.1.1)
     nessus_rest (0.1.6)
     net-ssh (5.2.0)
     network_interface (0.0.2)
     nexpose (7.2.1)
-    nokogiri (1.10.4)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
-    octokit (4.14.0)
+    octokit (4.16.0)
+      faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     openssl-ccm (1.2.2)
     openvas-omp (0.0.4)
@@ -227,7 +232,7 @@ GEM
       pcaprub
     patch_finder (1.0.2)
     pcaprub (0.13.0)
-    pdf-reader (2.2.1)
+    pdf-reader (2.4.0)
       Ascii85 (~> 1.0.0)
       afm (~> 0.2.1)
       hashery (~> 2.0)
@@ -239,8 +244,8 @@ GEM
       activerecord (~> 4.0)
       arel (>= 4.0.1)
       pg_array_parser (~> 0.0.9)
-    public_suffix (4.0.1)
-    rack (1.6.11)
+    public_suffix (4.0.3)
+    rack (1.6.13)
     rack-protection (1.5.5)
       rack
     rack-test (0.6.3)
@@ -251,16 +256,16 @@ GEM
       activesupport (>= 4.2.0, < 5.0)
       nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.2.0)
-      loofah (~> 2.2, >= 2.2.2)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
     railties (4.2.11.1)
       actionpack (= 4.2.11.1)
       activesupport (= 4.2.11.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.3.3)
+    rake (13.0.1)
     rb-readline (0.5.5)
-    recog (2.3.2)
+    recog (2.3.6)
       nokogiri
     redcarpet (3.5.0)
     rex-arch (0.1.13)
@@ -276,7 +281,7 @@ GEM
       metasm
       rex-arch
       rex-text
-    rex-exploitation (0.1.21)
+    rex-exploitation (0.1.22)
       jsobfu
       metasm
       rex-arch
@@ -289,7 +294,7 @@ GEM
       rex-arch
     rex-ole (0.1.6)
       rex-text
-    rex-powershell (0.1.82)
+    rex-powershell (0.1.86)
       rex-random_identifier
       rex-text
     rex-random_identifier (0.1.4)
@@ -299,14 +304,14 @@ GEM
       metasm
       rex-core
       rex-text
-    rex-socket (0.1.17)
+    rex-socket (0.1.21)
       rex-core
     rex-sslscan (0.1.5)
       rex-core
       rex-socket
       rex-text
     rex-struct2 (0.1.2)
-    rex-text (0.2.23)
+    rex-text (0.2.24)
     rex-zip (0.1.3)
       rex-text
     rkelly-remix (0.0.7)
@@ -317,7 +322,7 @@ GEM
       rubyntlm
       windows_error
     rubyntlm (0.6.2)
-    rubyzip (1.2.3)
+    rubyzip (2.2.0)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
@@ -325,22 +330,25 @@ GEM
       rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    sqlite3 (1.4.1)
+    sqlite3 (1.4.2)
     sshkey (2.0.0)
     thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
-    thor (0.20.3)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tilt (2.0.9)
-    ttfunk (1.5.1)
-    tzinfo (1.2.5)
+    tilt (2.0.10)
+    ttfunk (1.6.2.1)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2019.2)
+    tzinfo-data (1.2019.3)
       tzinfo (>= 1.0.0)
     warden (1.2.7)
       rack (>= 1.0)
+    websocket-driver (0.7.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.4)
     windows_error (0.1.2)
     xdr (2.0.0)
       activemodel (>= 4.2.7)
@@ -354,4 +362,4 @@ DEPENDENCIES
   metasploit-framework!
 
 BUNDLED WITH
-   1.17.2
+   1.17.3
diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix
index 8486f10bab05..31d45c30db73 100644
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@@ -17,13 +17,13 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "metasploit-framework";
-  version = "5.0.45";
+  version = "5.0.74";
 
   src = fetchFromGitHub {
     owner = "rapid7";
     repo = "metasploit-framework";
     rev = version;
-    sha256 = "16jl3fkfbwl4wwbj2zrq9yr8y8brkhj9641hplc8idv8gaqkgmm5";
+    sha256 = "1ml4d6xfaxyv1mamc2qldd39db92qkic8660f8clabi9f1k0ghpp";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix
index 28cc83b240f2..a35aa958a1df 100644
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@@ -1,6 +1,5 @@
 {
   actionpack = {
-    dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -11,7 +10,6 @@
     version = "4.2.11.1";
   };
   actionview = {
-    dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -22,7 +20,6 @@
     version = "4.2.11.1";
   };
   activemodel = {
-    dependencies = ["activesupport" "builder"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -33,7 +30,6 @@
     version = "4.2.11.1";
   };
   activerecord = {
-    dependencies = ["activemodel" "activesupport" "arel"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -44,7 +40,6 @@
     version = "4.2.11.1";
   };
   activesupport = {
-    dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -55,7 +50,6 @@
     version = "4.2.11.1";
   };
   addressable = {
-    dependencies = ["public_suffix"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -86,15 +80,14 @@
     version = "6.0.4";
   };
   arel-helpers = {
-    dependencies = ["activerecord"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0lb52rd20ix7khh70vrwd85qivir9sis62s055k3zr5h9iy3lyqi";
+      sha256 = "16irs6rai9pasv36yy31glijs3p2pvgry5g1lh03vnzg8xpb1msp";
       type = "gem";
     };
-    version = "2.10.0";
+    version = "2.11.0";
   };
   Ascii85 = {
     groups = ["default"];
@@ -121,68 +114,62 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0vkjw8cxssfwplrcl593gp4jxxiajihb8gqmpgzyac8i3xigpacb";
+      sha256 = "1k2dpn0xznksh5y9bq9gbvbych06pzyswsdak7bz8nlkbsgf38x3";
       type = "gem";
     };
-    version = "1.208.0";
+    version = "1.274.0";
   };
   aws-sdk-core = {
-    dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "18h35j7wp7n6zc5r6dpixjcyjshqmpkhwph9qgpv2g0db37zlxyk";
+      sha256 = "1q7f9jkpmpppj31kh3wnzybkphq4piy8ays3vld0zsibfjs9iw7i";
       type = "gem";
     };
-    version = "3.66.0";
+    version = "3.90.1";
   };
   aws-sdk-ec2 = {
-    dependencies = ["aws-sdk-core" "aws-sigv4"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1sb04blmc0lgdgq909cj8cm63zl2idgc5mcysj6cg4rvm8699ahp";
+      sha256 = "1wnql5rzwkn97w4l3pq6k97grqdci1qs7h132pnd6lc3bx62v4h5";
       type = "gem";
     };
-    version = "1.106.0";
+    version = "1.144.0";
   };
   aws-sdk-iam = {
-    dependencies = ["aws-sdk-core" "aws-sigv4"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ypv1cmmrc496myllqd8dqz422qm1i0bhskkvqb9b2lbagmzr3l9";
+      sha256 = "0s78ssjcp974v7r1znrgk78bqz23jhws4gy1nm659z5390zsn1fz";
+      type = "gem";
+    };
+    version = "1.33.0";
+  };
+  aws-sdk-kms = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "191qnrpg9qhwj24pisha28fwqx30sqkj75ibgpqcf4q389l3a2gw";
       type = "gem";
     };
     version = "1.29.0";
   };
-  aws-sdk-kms = {
-    dependencies = ["aws-sdk-core" "aws-sigv4"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "14blvvfz67rhffi4ahby50jiip5f0hm85mcxlx6y93g0cfrnxh3m";
-      type = "gem";
-    };
-    version = "1.24.0";
-  };
   aws-sdk-s3 = {
-    dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "14iv2wqvvbiz0gdms21i9n6rh8390r1yg4zcf8pzzfplbqfwqw4w";
+      sha256 = "1pblkq7rw465w08hs2xy6v7w10x9n004hk43yqzswqxirki68ldz";
       type = "gem";
     };
-    version = "1.48.0";
+    version = "1.60.2";
   };
   aws-sigv4 = {
-    dependencies = ["aws-eventstream"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -192,16 +179,6 @@
     };
     version = "1.1.0";
   };
-  backports = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0cczfi1yp7a68bg7ipzi4lvrmi4xsi36n9a19krr4yb3nfwd8fn2";
-      type = "gem";
-    };
-    version = "3.15.0";
-  };
   bcrypt = {
     groups = ["default"];
     platforms = [];
@@ -247,10 +224,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1";
+      sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr";
       type = "gem";
     };
-    version = "3.2.3";
+    version = "3.2.4";
   };
   concurrent-ruby = {
     groups = ["default"];
@@ -277,10 +254,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi";
+      sha256 = "0pfl5c0pyqaparxaqxi6s4gfl21bdldwiawrc0aknyvflli60lfw";
       type = "gem";
     };
-    version = "1.0.4";
+    version = "1.0.6";
   };
   daemons = {
     groups = ["default"];
@@ -293,7 +270,6 @@
     version = "1.3.1";
   };
   dnsruby = {
-    dependencies = ["addressable"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -314,7 +290,6 @@
     version = "1.2.4";
   };
   em-http-request = {
-    dependencies = ["addressable" "cookiejar" "em-socksify" "eventmachine" "http_parser.rb"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -325,7 +300,6 @@
     version = "1.1.5";
   };
   em-socksify = {
-    dependencies = ["eventmachine"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -356,7 +330,6 @@
     version = "1.2.7";
   };
   faker = {
-    dependencies = ["i18n"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -367,15 +340,24 @@
     version = "2.2.1";
   };
   faraday = {
-    dependencies = ["multipart-post"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0";
+      sha256 = "0jk2bar4x6miq2cr73lv0lsbmw4cymiljvp29xb85jifsb3ba6az";
       type = "gem";
     };
-    version = "0.15.4";
+    version = "0.17.0";
+  };
+  faye-websocket = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kbp3rjwm74zdj0wy2n1cyyvd7ak4k8i8zva6ib4vqfcv8d2j11a";
+      type = "gem";
+    };
+    version = "0.10.9";
   };
   filesize = {
     groups = ["default"];
@@ -408,7 +390,6 @@
     version = "0.6.0";
   };
   i18n = {
-    dependencies = ["concurrent-ruby"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -429,7 +410,6 @@
     version = "1.4.0";
   };
   jsobfu = {
-    dependencies = ["rkelly-remix"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -444,21 +424,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
+      sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.3.0";
   };
   loofah = {
-    dependencies = ["crass" "nokogiri"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg";
+      sha256 = "1g7ps9m3s14cajhxrfgbzahv9i3gy47s4hqrv3mpybpj5cyr0srn";
       type = "gem";
     };
-    version = "2.2.3";
+    version = "2.4.0";
   };
   metasm = {
     groups = ["default"];
@@ -471,7 +450,6 @@
     version = "1.0.4";
   };
   metasploit-concern = {
-    dependencies = ["activemodel" "activesupport" "railties"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -482,31 +460,28 @@
     version = "2.0.5";
   };
   metasploit-credential = {
-    dependencies = ["metasploit-concern" "metasploit-model" "metasploit_data_models" "net-ssh" "pg" "railties" "rex-socket" "rubyntlm" "rubyzip"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0m6j149x502p00y2jzra65281dhhw3m8a41pwfn1sk9wv7aiclvl";
+      sha256 = "1jh1mzvjpsmqamhwjqs6x2bx550mxkqjvl0f1gl1g87w5qvg3w69";
       type = "gem";
     };
-    version = "3.0.3";
+    version = "3.0.4";
   };
   metasploit-framework = {
-    dependencies = ["actionpack" "activerecord" "activesupport" "aws-sdk-ec2" "aws-sdk-iam" "aws-sdk-s3" "backports" "bcrypt" "bcrypt_pbkdf" "bit-struct" "concurrent-ruby" "dnsruby" "ed25519" "em-http-request" "faker" "filesize" "jsobfu" "json" "metasm" "metasploit-concern" "metasploit-credential" "metasploit-model" "metasploit-payloads" "metasploit_data_models" "metasploit_payloads-mettle" "mqtt" "msgpack" "nessus_rest" "net-ssh" "network_interface" "nexpose" "nokogiri" "octokit" "openssl-ccm" "openvas-omp" "packetfu" "patch_finder" "pcaprub" "pdf-reader" "pg" "railties" "rb-readline" "recog" "redcarpet" "rex-arch" "rex-bin_tools" "rex-core" "rex-encoder" "rex-exploitation" "rex-java" "rex-mime" "rex-nop" "rex-ole" "rex-powershell" "rex-random_identifier" "rex-registry" "rex-rop_builder" "rex-socket" "rex-sslscan" "rex-struct2" "rex-text" "rex-zip" "ruby-macho" "ruby_smb" "rubyntlm" "rubyzip" "sinatra" "sqlite3" "sshkey" "thin" "tzinfo" "tzinfo-data" "warden" "windows_error" "xdr" "xmlrpc"];
     groups = ["default"];
     platforms = [];
     source = {
       fetchSubmodules = false;
-      rev = "2b9e74c7a8a4423ea195e75abca1f56c354e5541";
-      sha256 = "16jl3fkfbwl4wwbj2zrq9yr8y8brkhj9641hplc8idv8gaqkgmm5";
+      rev = "22104a154544b3ee57d3ce98a490c4b42a4a8776";
+      sha256 = "1ml4d6xfaxyv1mamc2qldd39db92qkic8660f8clabi9f1k0ghpp";
       type = "git";
       url = "https://github.com/rapid7/metasploit-framework";
     };
-    version = "5.0.45";
+    version = "5.0.74";
   };
   metasploit-model = {
-    dependencies = ["activemodel" "activesupport" "railties"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -521,13 +496,12 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01s3xmgw4fp2ic0wql8lswa86q3lgr3z687idx3xkfii3dskjpp3";
+      sha256 = "1wz72w5a34r6jcgbl97ha3zhl8d28r974clcp99qj5sg71k280c0";
       type = "gem";
     };
-    version = "1.3.70";
+    version = "1.3.84";
   };
   metasploit_data_models = {
-    dependencies = ["activerecord" "activesupport" "arel-helpers" "metasploit-concern" "metasploit-model" "pg" "postgres_ext" "railties" "recog"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -562,10 +536,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
+      sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz";
       type = "gem";
     };
-    version = "5.11.3";
+    version = "5.14.0";
   };
   mqtt = {
     groups = ["default"];
@@ -582,10 +556,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1qr2mkm2i3m76zarvy7qgjl9596hmvjrg7x6w42vx8cfsbf5p0y1";
+      sha256 = "1lva6bkvb4mfa0m3bqn4lm4s4gi81c40jvdcsrxr6vng49q9daih";
       type = "gem";
     };
-    version = "1.3.1";
+    version = "1.3.3";
   };
   multipart-post = {
     groups = ["default"];
@@ -638,26 +612,24 @@
     version = "7.2.1";
   };
   nokogiri = {
-    dependencies = ["mini_portile2"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv";
+      sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8";
       type = "gem";
     };
-    version = "1.10.4";
+    version = "1.10.8";
   };
   octokit = {
-    dependencies = ["sawyer"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1w7agbfg39jzqk81yad9xhscg31869277ysr2iwdvpjafl5lj4ha";
+      sha256 = "06kx258qa5k24q5pv8i4daaw3g57gif6p5k5h3gndj3q2jk6vhkn";
       type = "gem";
     };
-    version = "4.14.0";
+    version = "4.16.0";
   };
   openssl-ccm = {
     groups = ["default"];
@@ -680,7 +652,6 @@
     version = "0.0.4";
   };
   packetfu = {
-    dependencies = ["pcaprub"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -711,15 +682,14 @@
     version = "0.13.0";
   };
   pdf-reader = {
-    dependencies = ["Ascii85" "afm" "hashery" "ruby-rc4" "ttfunk"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "14lqdbiwn2qwgbvnnzxg7haqiy026d8x37hp45c3m9jb9rym92ps";
+      sha256 = "1g3gr2m46275hjv6fv4jwq3qlvdbnhf1jxir9vzgxhv45ncnhffy";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "2.4.0";
   };
   pg = {
     groups = ["default"];
@@ -742,7 +712,6 @@
     version = "0.0.9";
   };
   postgres_ext = {
-    dependencies = ["activerecord" "arel" "pg_array_parser"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -757,23 +726,22 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0";
+      sha256 = "1c6kq6s13idl2036b5lch8r7390f8w82cal8hcp4ml76fm2vdac7";
       type = "gem";
     };
-    version = "4.0.1";
+    version = "4.0.3";
   };
   rack = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f";
+      sha256 = "0wr1f3g9rc9i8svfxa9cijajl1661d817s56b2w7rd572zwn0zi0";
       type = "gem";
     };
-    version = "1.6.11";
+    version = "1.6.13";
   };
   rack-protection = {
-    dependencies = ["rack"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -784,7 +752,6 @@
     version = "1.5.5";
   };
   rack-test = {
-    dependencies = ["rack"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -795,7 +762,6 @@
     version = "0.6.3";
   };
   rails-deprecated_sanitizer = {
-    dependencies = ["activesupport"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -806,7 +772,6 @@
     version = "1.0.3";
   };
   rails-dom-testing = {
-    dependencies = ["activesupport" "nokogiri" "rails-deprecated_sanitizer"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -817,18 +782,16 @@
     version = "1.0.9";
   };
   rails-html-sanitizer = {
-    dependencies = ["loofah"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ilwxzm3a7bql5c9q2n9g9nb1hax7vd8d65a5yp3d967ld97nvrq";
+      sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f";
       type = "gem";
     };
-    version = "1.2.0";
+    version = "1.3.0";
   };
   railties = {
-    dependencies = ["actionpack" "activesupport" "rake" "thor"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -843,10 +806,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1cvaqarr1m84mhc006g3l1vw7sa5qpkcw0138lsxlf769zdllsgp";
+      sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9";
       type = "gem";
     };
-    version = "12.3.3";
+    version = "13.0.1";
   };
   rb-readline = {
     groups = ["default"];
@@ -859,15 +822,14 @@
     version = "0.5.5";
   };
   recog = {
-    dependencies = ["nokogiri"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0kbv0j82zf90sc9hhwna2bkb5zv0nxagk22gxyfy82kjmcz71c6k";
+      sha256 = "0kw753vq5m5m8pzn1avafzz757gdzzsv7ck94y6d8n4jzqa50isv";
       type = "gem";
     };
-    version = "2.3.2";
+    version = "2.3.6";
   };
   redcarpet = {
     groups = ["default"];
@@ -880,7 +842,6 @@
     version = "3.5.0";
   };
   rex-arch = {
-    dependencies = ["rex-text"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -891,7 +852,6 @@
     version = "0.1.13";
   };
   rex-bin_tools = {
-    dependencies = ["metasm" "rex-arch" "rex-core" "rex-struct2" "rex-text"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -912,7 +872,6 @@
     version = "0.1.13";
   };
   rex-encoder = {
-    dependencies = ["metasm" "rex-arch" "rex-text"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -923,15 +882,14 @@
     version = "0.1.4";
   };
   rex-exploitation = {
-    dependencies = ["jsobfu" "metasm" "rex-arch" "rex-encoder" "rex-text"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0b2jg7mccwc34j9mfpndh7b387723qas38qsd906bs4s8b6hf05c";
+      sha256 = "16anprj4pc4pi2yb1y6b7c8nrqgpk49g40wy1384snmii24jiwyx";
       type = "gem";
     };
-    version = "0.1.21";
+    version = "0.1.22";
   };
   rex-java = {
     groups = ["default"];
@@ -944,7 +902,6 @@
     version = "0.1.5";
   };
   rex-mime = {
-    dependencies = ["rex-text"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -955,7 +912,6 @@
     version = "0.1.5";
   };
   rex-nop = {
-    dependencies = ["rex-arch"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -966,7 +922,6 @@
     version = "0.1.1";
   };
   rex-ole = {
-    dependencies = ["rex-text"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -977,18 +932,16 @@
     version = "0.1.6";
   };
   rex-powershell = {
-    dependencies = ["rex-random_identifier" "rex-text"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fcyiz8cgcv6pcn5w969ac4wwhr1cz6jk6kf6p8gyw5rjrlwfz0j";
+      sha256 = "150nmpgrvpd6hyx9cghah8dxpcfb1h7inpcwmz7ijpir60zxxfdj";
       type = "gem";
     };
-    version = "0.1.82";
+    version = "0.1.86";
   };
   rex-random_identifier = {
-    dependencies = ["rex-text"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -1009,7 +962,6 @@
     version = "0.1.3";
   };
   rex-rop_builder = {
-    dependencies = ["metasm" "rex-core" "rex-text"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -1020,18 +972,16 @@
     version = "0.1.3";
   };
   rex-socket = {
-    dependencies = ["rex-core"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "136szyv31fcdzmcgs44vg009k3ssyawkqppkhm3xyv2ivpp1mlgv";
+      sha256 = "0jkmff92ga9qd9gg13cd6s99qcdmr5n354l9br70j784mpyl9apb";
       type = "gem";
     };
-    version = "0.1.17";
+    version = "0.1.21";
   };
   rex-sslscan = {
-    dependencies = ["rex-core" "rex-socket" "rex-text"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -1056,13 +1006,12 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0cmfwzd3r6xzhaw5l2grgiivql1yynh620drg8h39q8hiixya6xz";
+      sha256 = "0wjrp4n7j2ifdgqc6z8z4jbz9gr7g5m5h35b7vx4k9cbaq9b5zxw";
       type = "gem";
     };
-    version = "0.2.23";
+    version = "0.2.24";
   };
   rex-zip = {
-    dependencies = ["rex-text"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -1103,7 +1052,6 @@
     version = "0.1.5";
   };
   ruby_smb = {
-    dependencies = ["bindata" "rubyntlm" "windows_error"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -1128,13 +1076,12 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1w9gw28ly3zyqydnm8phxchf4ymyjl2r7zf7c12z8kla10cpmhlc";
+      sha256 = "13b15icwx0c8zzjfzf7bmqq9ynilw0dy8ydgjb199nqzp93p6wqv";
       type = "gem";
     };
-    version = "1.2.3";
+    version = "2.2.0";
   };
   sawyer = {
-    dependencies = ["addressable" "faraday"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -1145,7 +1092,6 @@
     version = "0.8.2";
   };
   sinatra = {
-    dependencies = ["rack" "rack-protection" "tilt"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -1160,10 +1106,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1v903nbcws3ifm6jnxrdfcpgl1qg2x3lbif16mhlbyfn0npzb494";
+      sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78";
       type = "gem";
     };
-    version = "1.4.1";
+    version = "1.4.2";
   };
   sshkey = {
     groups = ["default"];
@@ -1176,7 +1122,6 @@
     version = "2.0.0";
   };
   thin = {
-    dependencies = ["daemons" "eventmachine" "rack"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -1191,10 +1136,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
+      sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm";
       type = "gem";
     };
-    version = "0.20.3";
+    version = "1.0.1";
   };
   thread_safe = {
     groups = ["default"];
@@ -1211,45 +1156,42 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz";
+      sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv";
       type = "gem";
     };
-    version = "2.0.9";
+    version = "2.0.10";
   };
   ttfunk = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1mgrnqla5n51v4ivn844albsajkck7k6lviphfqa8470r46c58cd";
+      sha256 = "0w0bjn6k38xv46mr02p3038gwk5jj5hl398bv5kr625msxkdhqzn";
       type = "gem";
     };
-    version = "1.5.1";
+    version = "1.6.2.1";
   };
   tzinfo = {
-    dependencies = ["thread_safe"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
+      sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp";
       type = "gem";
     };
-    version = "1.2.5";
+    version = "1.2.6";
   };
   tzinfo-data = {
-    dependencies = ["tzinfo"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1m507in0d7vlfgasxpkz3y1a44zp532k9qlqcaz90ay939sz9h5q";
+      sha256 = "17fbf05qhcxp8anmp7k5wnafw3ypy607h5ybnqg92dqgh4b1c3yi";
       type = "gem";
     };
-    version = "1.2019.2";
+    version = "1.2019.3";
   };
   warden = {
-    dependencies = ["rack"];
     groups = ["default"];
     platforms = [];
     source = {
@@ -1259,6 +1201,26 @@
     };
     version = "1.2.7";
   };
+  websocket-driver = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2";
+      type = "gem";
+    };
+    version = "0.7.1";
+  };
+  websocket-extensions = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m";
+      type = "gem";
+    };
+    version = "0.1.4";
+  };
   windows_error = {
     groups = ["default"];
     platforms = [];
@@ -1270,7 +1232,6 @@
     version = "0.1.2";
   };
   xdr = {
-    dependencies = ["activemodel" "activesupport"];
     groups = ["default"];
     platforms = [];
     source = {

From 502c0ee8994b13b14ac77fe3e6e559d3e215bf32 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Mon, 17 Feb 2020 17:58:48 -0800
Subject: [PATCH 1008/4636] clippy: add rustc.llvm to buildInputs

The Hydra build [1] failed because it was unable to link to `LLVM9`; add
`llvmShared` to `passthru` in order to stay up to date with required
LLVM versions. Also quote the homepage URLs, since that's preferred.

[1] https://hydra.nixos.org/build/112989779/nixlog/1
---
 pkgs/development/compilers/rust/clippy.nix | 4 ++--
 pkgs/development/compilers/rust/rustc.nix  | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix
index 56b70f21d4c7..4857b587847e 100644
--- a/pkgs/development/compilers/rust/clippy.nix
+++ b/pkgs/development/compilers/rust/clippy.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage {
   # changes hash of vendor directory otherwise
   dontUpdateAutotoolsGnuConfigScripts = true;
 
-  buildInputs = [ rustc ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
+  buildInputs = [ rustc rustc.llvm ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
   # fixes: error: the option `Z` is only accepted on the nightly compiler
   RUSTC_BOOTSTRAP = 1;
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://rust-lang.github.io/rust-clippy/;
+    homepage = "https://rust-lang.github.io/rust-clippy/";
     description = "A bunch of lints to catch common mistakes and improve your Rust code";
     maintainers = with maintainers; [ basvandijk ];
     license = with licenses; [ mit asl20 ];
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index b0c26f3dffdf..7857dbc7ee6f 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -155,8 +155,10 @@ in stdenv.mkDerivation rec {
 
   requiredSystemFeatures = [ "big-parallel" ];
 
+  passthru.llvm = llvmShared;
+
   meta = with stdenv.lib; {
-    homepage = https://www.rust-lang.org/;
+    homepage = "https://www.rust-lang.org/";
     description = "A safe, concurrent, practical language";
     maintainers = with maintainers; [ madjar cstrahan globin havvy ];
     license = [ licenses.mit licenses.asl20 ];

From f518e280b168088392193ca339adabd8e8fbae36 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Tue, 18 Feb 2020 08:48:34 -0800
Subject: [PATCH 1009/4636] nixos/fish: fix completions patch

Upstream decided to split the lines we were patching out, so the patch
would fail.
---
 .../modules/programs/fish_completion-generator.patch | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/programs/fish_completion-generator.patch b/nixos/modules/programs/fish_completion-generator.patch
index a8c797d185a6..997f38c5066d 100644
--- a/nixos/modules/programs/fish_completion-generator.patch
+++ b/nixos/modules/programs/fish_completion-generator.patch
@@ -1,11 +1,13 @@
 --- a/create_manpage_completions.py
 +++ b/create_manpage_completions.py
-@@ -776,8 +776,6 @@ def parse_manpage_at_path(manpage_path, output_directory):
-
+@@ -844,10 +844,6 @@ def parse_manpage_at_path(manpage_path, output_directory):
+ 
              built_command_output.insert(0, "# " + CMDNAME)
-
+ 
 -            # Output the magic word Autogenerated so we can tell if we can overwrite this
--            built_command_output.insert(1, "# Autogenerated from man page " + manpage_path)
+-            built_command_output.insert(
+-                1, "# Autogenerated from man page " + manpage_path
+-            )
              # built_command_output.insert(2, "# using " + parser.__class__.__name__) # XXX MISATTRIBUTES THE CULPABILE PARSER! Was really using Type2 but reporting TypeDeroffManParser
-
+ 
              for line in built_command_output:

From 44c7211625bd52501f70bf64589aff461cb36a49 Mon Sep 17 00:00:00 2001
From: Brett Lyons <blyons@fastmail.com>
Date: Mon, 17 Feb 2020 10:28:31 -0700
Subject: [PATCH 1010/4636] vimPlugins: Update

---
 pkgs/misc/vim-plugins/generated.nix | 96 ++++++++++++++---------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index b4464eed825c..e44de3190459 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -347,12 +347,12 @@ let
 
   coc-git = buildVimPluginFrom2Nix {
     pname = "coc-git";
-    version = "2020-02-04";
+    version = "2020-02-16";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-git";
-      rev = "e75395a9064dd88b2434c8824e6de1f173944595";
-      sha256 = "1ga01205rdq1zgdpbn3xk4rnd0p4bbfn7wn4jn04wxfyb5rkdnkq";
+      rev = "f67abbe05f535086167b3cb4cde6c2c309905959";
+      sha256 = "0fl3hgapcwr5sjgmm02lx6vg18qlw5g03ysv926rjb0r0nl3rhh5";
     };
   };
 
@@ -898,12 +898,12 @@ let
 
   denite-nvim = buildVimPluginFrom2Nix {
     pname = "denite-nvim";
-    version = "2020-02-05";
+    version = "2020-02-17";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "21645215f941034f0bfaa081f9146914afd5d563";
-      sha256 = "01ywp49ambc3nk0cyv9f7m6gfnf5hkp1dxfiihjxf96whg8p3kwj";
+      rev = "eeb067ca291b7f677b6faab590344a4ca84c0e70";
+      sha256 = "0irz8g9qpm7d36gig86j3dqk4mdbzl5rnzg07cgizh88jqhzxvin";
     };
   };
 
@@ -2060,12 +2060,12 @@ let
 
   neoterm = buildVimPluginFrom2Nix {
     pname = "neoterm";
-    version = "2020-02-14";
+    version = "2020-02-15";
     src = fetchFromGitHub {
       owner = "kassio";
       repo = "neoterm";
-      rev = "41b309e5528ce07c9471ea4f2fae41e2a539ae49";
-      sha256 = "1knqa3gd9jbj865p8zhy2yks8wfszp7fdnnd29088i82d0sl8g10";
+      rev = "dacbae9d844e678c785db7c9d7988df7a405e572";
+      sha256 = "03aah6lgygf7rj78kf4rh5hw593l4qi83ivh5amy9yw8lc630pjv";
     };
   };
 
@@ -2203,12 +2203,12 @@ let
 
   nvim-lsp = buildVimPluginFrom2Nix {
     pname = "nvim-lsp";
-    version = "2020-02-13";
+    version = "2020-02-17";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lsp";
-      rev = "63d8e18a1003ad986ce0c95199839adb10283dbd";
-      sha256 = "1q1myv0hqlscsnmmxqbl5bxvqkgl896p1b1l93826wbfsnpr6wn6";
+      rev = "8c78ca42072d14ca678cd1e138f665a5d42df558";
+      sha256 = "10w7rzpfl70bg6w665pfq6mgdz9gsw5i341sd4f0ncr2asrd7l76";
     };
   };
 
@@ -2533,12 +2533,12 @@ let
 
   riv-vim = buildVimPluginFrom2Nix {
     pname = "riv-vim";
-    version = "2019-09-14";
+    version = "2020-02-17";
     src = fetchFromGitHub {
       owner = "Rykka";
       repo = "riv.vim";
-      rev = "87a1f2c1e487ee0021855fd0c65c3f3244f4fc61";
-      sha256 = "13430czv87r16wcyb2f8izfihkhm2q6k1ki5bhzpbakzk7vwxwms";
+      rev = "d52844691ca2f139e4b634db65aa49c57a0fc2b3";
+      sha256 = "0s4jvqwlnmmh2zw9v9rlwynwx44ypdrzhhyfb20sippxg9g6z0c5";
     };
   };
 
@@ -3315,23 +3315,23 @@ let
 
   vim-airline = buildVimPluginFrom2Nix {
     pname = "vim-airline";
-    version = "2020-02-07";
+    version = "2020-02-17";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "099dd92eebe09ab27a483e381f2a708945e34330";
-      sha256 = "04rmghvl29hlmlhh4j90m466m0a4sfflk0qrvx87q8ab1salq6iz";
+      rev = "7e00ee1107d0ed24ac09af51e576ea7d85e114a3";
+      sha256 = "02ax3y8kh503dh7gsi0nwsvlas02vd4issawriydy1wl8ngfgdbh";
     };
   };
 
   vim-airline-themes = buildVimPluginFrom2Nix {
     pname = "vim-airline-themes";
-    version = "2020-02-07";
+    version = "2020-02-17";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline-themes";
-      rev = "6270e7d58828999da7239785ad4269899fab99b5";
-      sha256 = "1pjgsp4ki1ii5rw75wvzcj3ssz51w5369j8kqaf6awqimyl1ygsd";
+      rev = "9772475fcc24bee50c884aba20161465211520c8";
+      sha256 = "1nbwwaky9j4w9qjsbgg2a9zl3f2i9zjqqbh1lmz4z9m1mixj6djp";
     };
   };
 
@@ -3964,12 +3964,12 @@ let
 
   vim-fugitive = buildVimPluginFrom2Nix {
     pname = "vim-fugitive";
-    version = "2020-02-06";
+    version = "2020-02-16";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "460664018a8eaecd89fb2b095fad59c0e16f5f06";
-      sha256 = "1xznsxk63gjzhxldzngc0kx10ygkl8ank0xm75qqs92zciwg1xqx";
+      rev = "98f67310aa3ae324d725a3b6b68a63e5a48372f4";
+      sha256 = "177dk2b2mb13d6hf6hp97p91qsbafd29z8n3zdfwxjgxf9fjgl4c";
     };
   };
 
@@ -4515,12 +4515,12 @@ let
 
   vim-localvimrc = buildVimPluginFrom2Nix {
     pname = "vim-localvimrc";
-    version = "2019-05-10";
+    version = "2020-02-17";
     src = fetchFromGitHub {
       owner = "embear";
       repo = "vim-localvimrc";
-      rev = "0b36a367f4d46b7f060836fcbfec029cce870ea9";
-      sha256 = "119ah0mx7ais335spdy5apk40wbfvhr1mnvjfs429fvym3xdqfk3";
+      rev = "1e3238470d833c8622453245694ba107eca46133";
+      sha256 = "1agiyycrjkh1ajfpfj4vzl9sd3xpxv68c7jrqkxqq0rfg74rksbc";
     };
   };
 
@@ -4966,12 +4966,12 @@ let
 
   vim-ps1 = buildVimPluginFrom2Nix {
     pname = "vim-ps1";
-    version = "2019-12-06";
+    version = "2020-02-17";
     src = fetchFromGitHub {
       owner = "PProvost";
       repo = "vim-ps1";
-      rev = "d11593b4a65551cc3391d36b088cc87a59c62da6";
-      sha256 = "08d9mp6ig3vkvmynm6qfvb18hc128wwssffkwdd9xnqkr7c3dmlv";
+      rev = "72de10080dcb7a906a51ed4eba67611c400df142";
+      sha256 = "1ml521kkgiazjizpmn25p4kbmwdl46sc5mq6yzp9cskssbj2c416";
     };
   };
 
@@ -5043,12 +5043,12 @@ let
 
   vim-rooter = buildVimPluginFrom2Nix {
     pname = "vim-rooter";
-    version = "2019-05-18";
+    version = "2020-02-17";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-rooter";
-      rev = "eef98131fef264d0f4e4f95c42e0de476c78009c";
-      sha256 = "144wwvi295q387w6cy9mv2inzla8ngd735gmf65lf33llp8hga59";
+      rev = "8a0a201a17fae3f7656b99f74d67741986faba37";
+      sha256 = "1r8kzzljs39ycc6jjh5anpl2gw73c2wb1bs8hjv6xnw1scln6gwq";
     };
   };
 
@@ -5219,12 +5219,12 @@ let
 
   vim-slime = buildVimPluginFrom2Nix {
     pname = "vim-slime";
-    version = "2019-12-20";
+    version = "2020-02-16";
     src = fetchFromGitHub {
       owner = "jpalardy";
       repo = "vim-slime";
-      rev = "cf896c1f4f37a9feb15d657dfd120aeeb6215ad8";
-      sha256 = "19caali0yy1cy4hk9y9z21nzp0kj916551h0p0x7nmzxiiakp9nn";
+      rev = "80c04d49b8d3c2a182e5cd745c52153de6ae272c";
+      sha256 = "12k1xq8xmwb7v7i8yx55mpg7fzin0ag2rvxvz77kdiwwni4vdrii";
     };
   };
 
@@ -5450,12 +5450,12 @@ let
 
   vim-test = buildVimPluginFrom2Nix {
     pname = "vim-test";
-    version = "2020-02-02";
+    version = "2020-02-16";
     src = fetchFromGitHub {
       owner = "janko-m";
       repo = "vim-test";
-      rev = "d0b1e060a7d6dce541f5535f9cc5a24bab1f45aa";
-      sha256 = "0z0002nij5n5y9vkx7c1fhngpz60py2xp2lkyy0xd7b1wynh3pgw";
+      rev = "330b0911f13bcb48a3e28dedcf71e19de5bd4864";
+      sha256 = "0iibm4nzxf7fhn5ka3pmnw324xnnxcf1lkia20w0wbx39axn4br3";
     };
   };
 
@@ -5527,12 +5527,12 @@ let
 
   vim-themis = buildVimPluginFrom2Nix {
     pname = "vim-themis";
-    version = "2020-02-13";
+    version = "2020-02-16";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-themis";
-      rev = "002eb3566e2cd6426e1d32713d585389da40abeb";
-      sha256 = "066r6132dr37xgl3gz661iyhcx4qb8k548b88smrpar8k8vsgj9n";
+      rev = "734262315544ec4c78acdabd1ac9aae18644fcad";
+      sha256 = "0sh9kqnkbbbiqsl8qwqslygl72h3wi83iw9iy2aj4zmw7k2g3i8w";
     };
   };
 
@@ -5659,12 +5659,12 @@ let
 
   vim-visual-multi = buildVimPluginFrom2Nix {
     pname = "vim-visual-multi";
-    version = "2020-02-10";
+    version = "2020-02-16";
     src = fetchFromGitHub {
       owner = "mg979";
       repo = "vim-visual-multi";
-      rev = "9d03a5d366b4198b7b505dfda538e87f76c9ce60";
-      sha256 = "0yqqd25l7zzfn31216qpnccb3a3lvv75j6020q02s0wgapiw15y9";
+      rev = "0f85922ec3cc0c497ac91ce02e5252643bcf7947";
+      sha256 = "1kgqns7a8px13hh0kfdn12zg3f6zv0s3sphxl899mywnp4nx3489";
     };
   };
 
@@ -5824,12 +5824,12 @@ let
 
   vimoutliner = buildVimPluginFrom2Nix {
     pname = "vimoutliner";
-    version = "2018-07-04";
+    version = "2020-02-09";
     src = fetchFromGitHub {
       owner = "vimoutliner";
       repo = "vimoutliner";
-      rev = "aad0a213069b8a1b5de91cca07d153fc8352c957";
-      sha256 = "0pgkgs6xky0skhpp3s9vrw3h48j80im0j39q4vc2b3pd1ydy6rx2";
+      rev = "1031b16e6b0069229fe0f33a66489f81174fa4d9";
+      sha256 = "1gn21b8yr0bjg0y1nidk13zcl4f6z8wkrxncgkd1hlc14d99jkg0";
     };
   };
 

From 0eb33b0485b6a681aebdc99ce3c169c6faac1158 Mon Sep 17 00:00:00 2001
From: Brett Lyons <blyons@fastmail.com>
Date: Mon, 17 Feb 2020 10:30:37 -0700
Subject: [PATCH 1011/4636] vimPlugins.notational-fzf-vim: init at 2019-12-03

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index e44de3190459..25d78e3be461 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2157,6 +2157,17 @@ let
     };
   };
 
+  notational-fzf-vim = buildVimPluginFrom2Nix {
+    pname = "notational-fzf-vim";
+    version = "2019-12-03";
+    src = fetchFromGitHub {
+      owner = "alok";
+      repo = "notational-fzf-vim";
+      rev = "16ea3477c8dbf3167f15246a29bd1d1fcc18c914";
+      sha256 = "1j1nfb297rqmg2h96hx4bmgxq55z179fh4f1ak79d6v815mr72bi";
+    };
+  };
+
   nvim-cm-racer = buildVimPluginFrom2Nix {
     pname = "nvim-cm-racer";
     version = "2017-07-27";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 0fc5edffe486..fcde3fdc5c6a 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -4,6 +4,7 @@ airblade/vim-rooter
 ajh17/Spacegray.vim
 aklt/plantuml-syntax
 albfan/nerdtree-git-plugin
+alok/notational-fzf-vim
 altercation/vim-colors-solarized
 alvan/vim-closetag
 alx741/vim-hindent

From 29b98e4cf51530e4b9bb2aa00afe7678b262e912 Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Mon, 20 Jan 2020 18:15:10 -0500
Subject: [PATCH 1012/4636] pythonPackages.dill: enable tests

Disable a few failing tests, see comments for what's failing.
---
 .../python-modules/dill/default.nix           | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/dill/default.nix b/pkgs/development/python-modules/dill/default.nix
index 88ffbd32e9d5..0983805780fa 100644
--- a/pkgs/development/python-modules/dill/default.nix
+++ b/pkgs/development/python-modules/dill/default.nix
@@ -1,7 +1,8 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, python
+, isPy27
+, nose
 }:
 
 buildPythonPackage rec {
@@ -13,15 +14,20 @@ buildPythonPackage rec {
     sha256 = "42d8ef819367516592a825746a18073ced42ca169ab1f5f4044134703e7a049c";
   };
 
-  # Messy test suite. Even when running the tests like tox does, it fails
-  doCheck = false;
+  # python2 can't import a test fixture
+  doCheck = !isPy27;
+  checkInputs = [ nose ];
   checkPhase = ''
-    for test in tests/*.py; do
-      ${python.interpreter} $test
-    done
+    PYTHONPATH=$PWD/tests:$PYTHONPATH
+    nosetests \
+      --ignore-files="test_classdef" \
+      --ignore-files="test_objects" \
+      --ignore-files="test_selected" \
+      --exclude="test_the_rest" \
+      --exclude="test_importable"
   '';
-  # Following error without setting checkPhase
-  # TypeError: don't know how to make test from: {'byref': False, 'recurse': False, 'protocol': 3, 'fmode': 0}
+  # Tests seem to fail because of import pathing and referencing items/classes in modules.
+  # Seems to be a Nix/pathing related issue, not the codebase, so disabling failing tests.
 
   meta = {
     description = "Serialize all of python (almost)";

From 11beaa4251dd1b45eb9772a46b8447466a08dbc2 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Thu, 6 Feb 2020 16:00:01 +0000
Subject: [PATCH 1013/4636] jirafeau: init at 4.1.1

Signed-off-by: David Wood <david.wood@codeplay.com>
---
 pkgs/servers/web-apps/jirafeau/default.nix | 34 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/servers/web-apps/jirafeau/default.nix

diff --git a/pkgs/servers/web-apps/jirafeau/default.nix b/pkgs/servers/web-apps/jirafeau/default.nix
new file mode 100644
index 000000000000..3dc9fb171901
--- /dev/null
+++ b/pkgs/servers/web-apps/jirafeau/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitLab, writeText }:
+
+let
+  localConfig = writeText "config.local.php" ''
+    <?php
+      return require(getenv('JIRAFEAU_CONFIG'));
+    ?>
+  '';
+in
+stdenv.mkDerivation rec {
+  pname = "jirafeau";
+  version = "4.1.1";
+
+  src = fetchFromGitLab {
+    owner = "mojo42";
+    repo = "Jirafeau";
+    rev = "${version}";
+    sha256 = "09gq5zhynygpqj0skq7ifnn9yjjg7qnc6kjvaas7f53av2707z4c";
+  };
+
+  installPhase = ''
+    mkdir $out
+    cp -r * $out/
+    cp ${localConfig} $out/lib/config.local.php
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Jirafeau is a web site permitting to upload a file in a simple way and give an unique link to it.";
+    license = licenses.agpl3;
+    homepage = "https://gitlab.com/mojo42/Jirafeau";
+    platforms = platforms.all;
+    maintainers = with maintainers; [ davidtwco ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b214b09da946..9867494cd7b5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4312,6 +4312,8 @@ in
 
   jira-cli = callPackage ../development/tools/jira_cli { };
 
+  jirafeau = callPackage ../servers/web-apps/jirafeau { };
+
   jitterentropy = callPackage ../development/libraries/jitterentropy { };
 
   jl = haskellPackages.callPackage ../development/tools/jl { };

From 60a3d9dd6b3216902626fabf6b7b8d5dbcd358db Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Thu, 6 Feb 2020 16:00:19 +0000
Subject: [PATCH 1014/4636] nixos/jirefeau: add `services.jirafeau` module

Signed-off-by: David Wood <david.wood@codeplay.com>
---
 nixos/modules/module-list.nix                |   1 +
 nixos/modules/services/web-apps/jirafeau.nix | 169 +++++++++++++++++++
 nixos/tests/all-tests.nix                    |   1 +
 nixos/tests/jirafeau.nix                     |  22 +++
 4 files changed, 193 insertions(+)
 create mode 100644 nixos/modules/services/web-apps/jirafeau.nix
 create mode 100644 nixos/tests/jirafeau.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f7e4ee6cd1ed..6734929b9d4e 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -820,6 +820,7 @@
   ./services/web-apps/icingaweb2/icingaweb2.nix
   ./services/web-apps/icingaweb2/module-monitoring.nix
   ./services/web-apps/ihatemoney
+  ./services/web-apps/jirafeau.nix
   ./services/web-apps/limesurvey.nix
   ./services/web-apps/mattermost.nix
   ./services/web-apps/mediawiki.nix
diff --git a/nixos/modules/services/web-apps/jirafeau.nix b/nixos/modules/services/web-apps/jirafeau.nix
new file mode 100644
index 000000000000..4f181257ef7c
--- /dev/null
+++ b/nixos/modules/services/web-apps/jirafeau.nix
@@ -0,0 +1,169 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+  cfg = config.services.jirafeau;
+
+  group = config.services.nginx.group;
+  user = config.services.nginx.user;
+
+  withTrailingSlash = str: if hasSuffix "/" str then str else "${str}/";
+
+  localConfig = pkgs.writeText "config.local.php" ''
+    <?php
+      $cfg['admin_password'] = '${cfg.adminPasswordSha256}';
+      $cfg['web_root'] = 'http://${withTrailingSlash cfg.hostName}';
+      $cfg['var_root'] = '${withTrailingSlash cfg.dataDir}';
+      $cfg['maximal_upload_size'] = ${builtins.toString cfg.maxUploadSizeMegabytes};
+      $cfg['installation_done'] = true;
+
+      ${cfg.extraConfig}
+  '';
+in
+{
+  options.services.jirafeau = {
+    adminPasswordSha256 = mkOption {
+      type = types.str;
+      default = "";
+      description = ''
+        SHA-256 of the desired administration password. Leave blank/unset for no password.
+      '';
+    };
+
+    dataDir = mkOption {
+      type = types.path;
+      default = "/var/lib/jirafeau/data/";
+      description = "Location of Jirafeau storage directory.";
+    };
+
+    enable = mkEnableOption "Jirafeau file upload application.";
+
+    extraConfig = mkOption {
+      type = types.lines;
+      default = "";
+      example = ''
+        $cfg['style'] = 'courgette';
+        $cfg['organisation'] = 'ACME';
+      '';
+      description = let
+        documentationLink =
+          "https://gitlab.com/mojo42/Jirafeau/-/blob/${cfg.package.version}/lib/config.original.php";
+      in
+        ''
+          Jirefeau configuration. Refer to <link xlink:href="${documentationLink}"/> for supported
+          values.
+        '';
+    };
+
+    hostName = mkOption {
+      type = types.str;
+      default = "localhost";
+      description = "URL of instance. Must have trailing slash.";
+    };
+
+    maxUploadSizeMegabytes = mkOption {
+      type = types.int;
+      default = 0;
+      description = "Maximum upload size of accepted files.";
+    };
+
+    maxUploadTimeout = mkOption {
+      type = types.str;
+      default = "30m";
+      description = let
+        nginxCoreDocumentation = "http://nginx.org/en/docs/http/ngx_http_core_module.html";
+      in
+        ''
+          Timeout for reading client request bodies and headers. Refer to
+          <link xlink:href="${nginxCoreDocumentation}#client_body_timeout"/> and
+          <link xlink:href="${nginxCoreDocumentation}#client_header_timeout"/> for accepted values.
+        '';
+    };
+
+    nginxConfig = mkOption {
+      type = types.submodule
+        (import ../web-servers/nginx/vhost-options.nix { inherit config lib; });
+      default = {};
+      example = {
+        serverAliases = [ "wiki.\${config.networking.domain}" ];
+      };
+      description = "Extra configuration for the nginx virtual host of Jirafeau.";
+    };
+
+    package = mkOption {
+      type = types.package;
+      default = pkgs.jirafeau;
+      defaultText = "pkgs.jirafeau";
+      description = "Jirafeau package to use";
+      example = "pkgs.jirafeau";
+    };
+
+    poolConfig = mkOption {
+      type = with types; attrsOf (oneOf [ str int bool ]);
+      default = {
+        "pm" = "dynamic";
+        "pm.max_children" = 32;
+        "pm.start_servers" = 2;
+        "pm.min_spare_servers" = 2;
+        "pm.max_spare_servers" = 4;
+        "pm.max_requests" = 500;
+      };
+      description = ''
+        Options for Jirafeau PHP pool. See documentation on <literal>php-fpm.conf</literal> for
+        details on configuration directives.
+      '';
+    };
+  };
+
+
+  config = mkIf cfg.enable {
+    services = {
+      nginx = {
+        enable = true;
+        virtualHosts."${cfg.hostName}" = mkMerge [
+          cfg.nginxConfig
+          {
+            extraConfig = let
+              clientMaxBodySize =
+                if cfg.maxUploadSizeMegabytes == 0 then "0" else "${cfg.maxUploadSizeMegabytes}m";
+            in
+              ''
+                index index.php;
+                client_max_body_size ${clientMaxBodySize};
+                client_body_timeout ${cfg.maxUploadTimeout};
+                client_header_timeout ${cfg.maxUploadTimeout};
+              '';
+            locations = {
+              "~ \\.php$".extraConfig = ''
+                include ${pkgs.nginx}/conf/fastcgi_params;
+                fastcgi_split_path_info ^(.+\.php)(/.+)$;
+                fastcgi_index index.php;
+                fastcgi_pass unix:${config.services.phpfpm.pools.jirafeau.socket};
+                fastcgi_param PATH_INFO $fastcgi_path_info;
+                fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+              '';
+            };
+            root = mkForce "${cfg.package}";
+          }
+        ];
+      };
+
+      phpfpm.pools.jirafeau = {
+        inherit group user;
+        phpEnv."JIRAFEAU_CONFIG" = "${localConfig}";
+        settings = {
+          "listen.mode" = "0660";
+          "listen.owner" = user;
+          "listen.group" = group;
+        } // cfg.poolConfig;
+      };
+    };
+
+    systemd.tmpfiles.rules = [
+      "d ${cfg.dataDir} 0750 ${user} ${group} - -"
+      "d ${cfg.dataDir}/files/ 0750 ${user} ${group} - -"
+      "d ${cfg.dataDir}/links/ 0750 ${user} ${group} - -"
+      "d ${cfg.dataDir}/async/ 0750 ${user} ${group} - -"
+    ];
+  };
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index a854365f752e..2e547780439a 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -137,6 +137,7 @@ in
   jackett = handleTest ./jackett.nix {};
   jellyfin = handleTest ./jellyfin.nix {};
   jenkins = handleTest ./jenkins.nix {};
+  jirafeau = handleTest ./jirafeau.nix {};
   kafka = handleTest ./kafka.nix {};
   keepalived = handleTest ./keepalived.nix {};
   kerberos = handleTest ./kerberos/default.nix {};
diff --git a/nixos/tests/jirafeau.nix b/nixos/tests/jirafeau.nix
new file mode 100644
index 000000000000..0f5af7f718a4
--- /dev/null
+++ b/nixos/tests/jirafeau.nix
@@ -0,0 +1,22 @@
+import ./make-test-python.nix ({ lib, ... }:
+
+with lib;
+
+{
+  name = "jirafeau";
+  meta.maintainers = with maintainers; [ davidtwco ];
+
+  nodes.machine = { pkgs, ... }: {
+    services.jirafeau = {
+      enable = true;
+    };
+  };
+
+  testScript = ''
+    machine.start()
+    machine.wait_for_unit("phpfpm-jirafeau.service")
+    machine.wait_for_unit("nginx.service")
+    machine.wait_for_open_port(80)
+    machine.succeed("curl -sSfL http://localhost/ | grep 'Jirafeau'")
+  '';
+})

From 02213fdff268d2296e7e495954e8decaa8b2825e Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 18 Feb 2020 11:48:24 -0500
Subject: [PATCH 1015/4636] flatpak: use correct p11-kit output

Fixes #80452
---
 pkgs/development/libraries/flatpak/default.nix     | 2 +-
 pkgs/development/libraries/flatpak/fix-paths.patch | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index d0d548bb8969..205bcd7c600d 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
     # Hardcode paths used by Flatpak itself.
     (substituteAll {
       src = ./fix-paths.patch;
-      p11 = p11-kit;
+      p11kit = "${p11-kit.dev}/bin/p11-kit";
     })
 
     # Adapt paths exposed to sandbox for NixOS.
diff --git a/pkgs/development/libraries/flatpak/fix-paths.patch b/pkgs/development/libraries/flatpak/fix-paths.patch
index 746b4382864b..67f0d4eba71f 100644
--- a/pkgs/development/libraries/flatpak/fix-paths.patch
+++ b/pkgs/development/libraries/flatpak/fix-paths.patch
@@ -7,7 +7,7 @@ index 5dd7629e..ddc71a4c 100644
    int i;
    char *p11_argv[] = {
 -    "p11-kit", "server",
-+    "@p11@/bin/p11-kit", "server",
++    "@p11kit@", "server",
      /* We explicitly request --sh here, because we then fail on earlier versions that doesn't support
       * this flag. This is good, because those earlier versions did not properly daemonize and caused
       * the spawn_sync to hang forever, waiting for the pipe to close.

From 2c7ba2060d11445974a8fbcbe4043b66bcb7310e Mon Sep 17 00:00:00 2001
From: Kovacsics Robert <rmk35@cam.ac.uk>
Date: Tue, 18 Feb 2020 13:16:37 +0000
Subject: [PATCH 1016/4636] xonsh: Fix broken tests

Pulls in a patch committed a couple of days after the 0.9.13 release
(the one here), to fix the tests.

(cherry picked from commit bf822c4caa96666d5ee1c20870229b9f6484e5cd)
---
 pkgs/shells/xonsh/default.nix | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index 0e2490ff4341..2bc65164d582 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -1,4 +1,11 @@
-{ stdenv, fetchFromGitHub, python3Packages, glibcLocales, coreutils, git }:
+{ stdenv
+, fetchFromGitHub
+, fetchpatch
+, python3Packages
+, glibcLocales
+, coreutils
+, git
+}:
 
 python3Packages.buildPythonApplication rec {
   pname = "xonsh";
@@ -12,6 +19,14 @@ python3Packages.buildPythonApplication rec {
     sha256 = "0nk6rjdkbxli510iwqspvray48kdxvbdmq1k8nxn14kqfpqzlbcv";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "fix-ptk-tests.patch";
+      url = "https://github.com/xonsh/xonsh/commit/ca7acecc968dcda7dd56c1f5d5b4df349c98d734.patch";
+      sha256 = "00nhbf9wzm6r86r9zq8mnhds30w6gdhkgsx5kpl0jppiz4ll96iw";
+    })
+  ];
+
   LC_ALL = "en_US.UTF-8";
   postPatch = ''
     sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py

From 77aa1a7f5b1a8e4bda7c009e2d7f2687936efb00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Tue, 18 Feb 2020 19:42:55 +0100
Subject: [PATCH 1017/4636] python3Packages.ftfy: 5.6 -> 5.7

Changelog:

https://github.com/LuminosoInsight/python-ftfy/blob/master/CHANGELOG.md#version-57-february-18-2020

The most important change in this version is the update of Unicode
character categories data to Unicode 12.1. This fixes the Python 3.8
build.
---
 pkgs/development/python-modules/ftfy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix
index d7a9fd2a0b08..1b8b8c17846d 100644
--- a/pkgs/development/python-modules/ftfy/default.nix
+++ b/pkgs/development/python-modules/ftfy/default.nix
@@ -10,7 +10,7 @@
 buildPythonPackage rec {
   pname = "ftfy";
 
-  version = "5.6";
+  version = "5.7";
   # ftfy v5 only supports python3. Since at the moment the only
   # packages that use ftfy are spacy and textacy which both support
   # python 2 and 3, they have pinned ftfy to the v4 branch.
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1k4vr5rfa62yafwpmb4827n50pwb79if0vhg1y4yqbb0bv20jxbd";
+    sha256 = "1j143kfpnskksfzs0pnr37kwph6m7c71p8gdldv26x2b7arwiyb7";
   };
 
   propagatedBuildInputs = [

From 493c357720bceb8f7eb21c130b5d955c2c4b6fe6 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 18 Feb 2020 19:53:18 +0100
Subject: [PATCH 1018/4636] pkgs/build-support/writers: use `runCommandLocal`
 for scripts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If we just want to write a non-compiled script (e.g. writeDash), it’s
usually a lot faster just doing it locally. That’s what
`runCommandLocal` was introduced for, so let’s use it in `writers`.
---
 pkgs/build-support/writers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix
index b90c6490e4a6..af492d80db01 100644
--- a/pkgs/build-support/writers/default.nix
+++ b/pkgs/build-support/writers/default.nix
@@ -15,7 +15,7 @@ rec {
       name = last (builtins.split "/" nameOrPath);
     in
 
-    pkgs.runCommand name (if (types.str.check content) then {
+    pkgs.runCommandLocal name (if (types.str.check content) then {
       inherit content interpreter;
       passAsFile = [ "content" ];
     } else {
@@ -192,7 +192,7 @@ rec {
     {id="";for(i=idx;i<ctx;i++)id=sprintf("%s%s", id, "\t");printf "%s%s\n", id, $0}
    '';
 
-  writeNginxConfig = name: text: pkgs.runCommand name {
+  writeNginxConfig = name: text: pkgs.runCommandLocal name {
     inherit text;
     passAsFile = [ "text" ];
   } /* sh */ ''

From 7f3091f26a78508c84896c57c218a3042d4cfcea Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 18 Feb 2020 19:59:48 +0100
Subject: [PATCH 1019/4636] CODEOWNERS: add lassulus and Profpatsch to
 build-support/writers

---
 .github/CODEOWNERS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3392fa5dab95..27f4da36f2d2 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -31,6 +31,9 @@
 /pkgs/build-support/bintools-wrapper  @Ericson2314 @orivej
 /pkgs/build-support/setup-hooks       @Ericson2314
 
+# Nixpkgs build-support
+/pkgs/build-support/writers @lassulus @Profpatsch
+
 # NixOS Internals
 /nixos/default.nix          @nbp @infinisil
 /nixos/lib/from-env.nix     @nbp @infinisil

From f37edb5bd158f379567b2206ce988d7cb90af4ed Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 18 Feb 2020 21:03:21 +0200
Subject: [PATCH 1020/4636] sundials: 5.0.0 -> 5.1.0

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

diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix
index d19ecf34ab95..fb6f773459eb 100644
--- a/pkgs/development/libraries/sundials/default.nix
+++ b/pkgs/development/libraries/sundials/default.nix
@@ -10,14 +10,14 @@ let openblas32 = openblas.override { blas64 = false; };
 
 in stdenv.mkDerivation rec {
   pname = "sundials";
-  version = "5.0.0";
+  version = "5.1.0";
 
   buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran openblas32 ];
   nativeBuildInputs = [ cmake ];
 
   src = fetchurl {
     url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
-    sha256 = "1lvx5pddjxgyr8kqlira36kxckz7nxwc8xilzfyx0hf607n42l9l";
+    sha256 = "08cvzmbr2qc09ayq4f5j07lw97hl06q4dl26vh4kh822mm7x28pv";
   };
 
   patches = [
@@ -26,11 +26,6 @@ in stdenv.mkDerivation rec {
       url = "https://github.com/LLNL/sundials/commit/1350421eab6c5ab479de5eccf6af2dcad1eddf30.patch";
       sha256 = "0g67lixp9m85fqpb9rzz1hl1z8ibdg0ldwq5z6flj5zl8a7cw52l";
     })
-    (fetchurl {
-      # https://github.com/LLNL/sundials/pull/20
-      url = "https://github.com/LLNL/sundials/pull/20/commits/2d951bbe1ff7842fcd0dafa28c61b0aa94015f66.patch";
-      sha256 = "0lcr6m4lk14yqrxah4rdscpczny5l7m1zpfsjh8bgspadfsgk512";
-    })
   ];
 
   cmakeFlags = [

From 0688cba0cdc50f18e4350f3c32039334076ec476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Tue, 18 Feb 2020 20:39:12 +0100
Subject: [PATCH 1021/4636] python3Packages.vowpalwabbit: fix build

- Drop the Boost patch. The patch does not apply anymore and the new
  CMake infrastructure picks up boost.
- Distable setuptools reStructuredText check. This check fails, but
  is (as far as I understand) an upstream bug.
- Clean up derivation a bit.
---
 .../python-modules/vowpalwabbit/default.nix   | 50 +++++++++++++------
 .../vowpal-wabbit-find-boost.diff             | 34 -------------
 2 files changed, 34 insertions(+), 50 deletions(-)
 delete mode 100644 pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff

diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix
index d23f45b122f5..65dbce862a46 100644
--- a/pkgs/development/python-modules/vowpalwabbit/default.nix
+++ b/pkgs/development/python-modules/vowpalwabbit/default.nix
@@ -1,5 +1,17 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, python, zlib, clang
-, ncurses, pytest, docutils, pygments, numpy, scipy, scikitlearn }:
+{ stdenv
+, lib
+, fetchPypi
+, buildPythonPackage
+, cmake
+, python
+, zlib
+, ncurses
+, pytest
+, docutils
+, pygments
+, numpy
+, scipy
+, scikitlearn }:
 
 buildPythonPackage rec {
   pname = "vowpalwabbit";
@@ -10,21 +22,27 @@ buildPythonPackage rec {
     sha256 = "bd4c7e49a6ddaa1afedf97b22b822c7322328d686d45151b47a5127fc409c2af";
   };
 
-  # Should be fixed in next Python release after 8.5.0:
-  # https://github.com/JohnLangford/vowpal_wabbit/pull/1533
-  patches = [
-    ./vowpal-wabbit-find-boost.diff
+  nativeBuildInputs = [
+    cmake
   ];
 
-  # vw tries to write some explicit things to home
-  # python installed: The directory '/homeless-shelter/.cache/pip/http'
-  preInstall = ''
-    export HOME=$PWD
-  '';
+  buildInputs = [
+    docutils
+    ncurses
+    pygments
+    python.pkgs.boost
+    zlib.dev
+  ];
 
-  nativeBuildInputs = [ clang ];
-  buildInputs = [ python.pkgs.boost zlib.dev ncurses pytest docutils pygments ];
-  propagatedBuildInputs = [ numpy scipy scikitlearn ];
+  propagatedBuildInputs = [
+    numpy
+    scikitlearn
+    scipy
+  ];
+
+  # Python build script uses CMake, but we don't want CMake to do the
+  # configuration.
+  dontUseCmakeConfigure = true;
 
   # Python ctypes.find_library uses DYLD_LIBRARY_PATH.
   preConfigure = lib.optionalString stdenv.isDarwin ''
@@ -34,12 +52,12 @@ buildPythonPackage rec {
   checkPhase = ''
     # check-manifest requires a git clone, not a tarball
     # check-manifest --ignore "Makefile,PACKAGE.rst,*.cc,tox.ini,tests*,examples*,src*"
-    ${python.interpreter} setup.py check -mrs
+    ${python.interpreter} setup.py check -ms
   '';
 
   meta = with lib; {
     description = "Vowpal Wabbit is a fast machine learning library for online learning, and this is the python wrapper for the project.";
-    homepage    = https://github.com/JohnLangford/vowpal_wabbit;
+    homepage    = "https://github.com/JohnLangford/vowpal_wabbit";
     license     = licenses.bsd3;
     broken      = stdenv.isAarch64;
     maintainers = with maintainers; [ teh ];
diff --git a/pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff b/pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff
deleted file mode 100644
index 645956594bf6..000000000000
--- a/pkgs/development/python-modules/vowpalwabbit/vowpal-wabbit-find-boost.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- vowpalwabbit-8.5.0.orig/setup.py	2018-09-03 20:32:39.000000000 +0200
-+++ vowpalwabbit-8.5.0/setup.py	2018-09-03 20:34:09.000000000 +0200
-@@ -23,18 +23,11 @@
- 
- def find_boost():
-     """Find correct boost-python library information """
--    if system == 'Linux':
-+    if system == 'Linux' or system == 'Darwin':
-         # use version suffix if present
--        boost_lib = 'boost_python-py{v[0]}{v[1]}'.format(v=sys.version_info)
--        if sys.version_info.major == 3:
--            for candidate in ['-py36', '-py35', '-py34', '3']:
--                boost_lib = 'boost_python{}'.format(candidate)
--                if find_library(boost_lib):
--                    exit
-+        boost_lib = 'boost_python{v[0]}{v[1]}'.format(v=sys.version_info)
-         if not find_library(boost_lib):
-             boost_lib = "boost_python"
--    elif system == 'Darwin':
--        boost_lib = 'boost_python-mt' if sys.version_info[0] == 2 else 'boost_python3-mt'
-     elif system == 'Cygwin':
-         boost_lib = 'boost_python-mt' if sys.version_info[0] == 2 else 'boost_python3-mt'
-     else:
---- vowpalwabbit-8.5.0.orig/src/Makefile	2018-09-03 20:32:40.000000000 +0200
-+++ vowpalwabbit-8.5.0/src/Makefile	2018-09-03 21:42:30.000000000 +0200
-@@ -37,7 +37,7 @@
-   NPROCS:=$(shell grep -c ^processor /proc/cpuinfo)
- endif
- ifeq ($(UNAME), Darwin)
--  LIBS = -lboost_program_options-mt -lboost_serialization-mt -l pthread -l z
-+  LIBS = -lboost_program_options -lboost_serialization -l pthread -l z
-   # On Macs, the location isn't always clear
-   #	brew uses /usr/local
-   #	but /opt/local seems to be preferred by some users

From 2cfad8fa28ea7c33a6855e748ed69845d7cc6c2b Mon Sep 17 00:00:00 2001
From: tviti <tviti@hawaii.edu>
Date: Tue, 18 Feb 2020 09:52:22 -1000
Subject: [PATCH 1022/4636] Revert "hdf5-fortran: Mark broken on Darwin"
 (#80419)

This reverts commit 8836c4d71b13a3052fc5f360a987dea859c9bf5e.

Closes #79952
---
 pkgs/tools/misc/hdf5/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index 59055e4114a7..b0d69fb98b08 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -70,6 +70,5 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.bsd3; # Lawrence Berkeley National Labs BSD 3-Clause variant
     homepage = https://www.hdfgroup.org/HDF5/;
     platforms = stdenv.lib.platforms.unix;
-    broken = (gfortran != null) && stdenv.isDarwin;
   };
 }

From eeaad8d225d21ee2bc52743f9d40506846e077a1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 27 Jan 2019 10:12:49 +0100
Subject: [PATCH 1023/4636] =?UTF-8?q?mypaint-brushes:=201.3.0=20=E2=86=92?=
 =?UTF-8?q?=202.0.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/graphics/gimp/default.nix   |  4 +-
 .../libraries/mypaint-brushes/1.0.nix         | 43 +++++++++++++++++++
 .../libraries/mypaint-brushes/default.nix     | 13 +-----
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 49 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/development/libraries/mypaint-brushes/1.0.nix

diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index 2b3b992d24b5..d3950c06c339 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -36,7 +36,7 @@
 , libmypaint
 , gexiv2
 , harfbuzz
-, mypaint-brushes
+, mypaint-brushes1
 , libwebp
 , libheif
 , libgudev
@@ -102,7 +102,7 @@ in stdenv.mkDerivation rec {
     xorg.libXpm
     glib-networking
     libmypaint
-    mypaint-brushes
+    mypaint-brushes1
   ] ++ lib.optionals stdenv.isDarwin [
     AppKit
     Cocoa
diff --git a/pkgs/development/libraries/mypaint-brushes/1.0.nix b/pkgs/development/libraries/mypaint-brushes/1.0.nix
new file mode 100644
index 000000000000..115d818d9365
--- /dev/null
+++ b/pkgs/development/libraries/mypaint-brushes/1.0.nix
@@ -0,0 +1,43 @@
+{ stdenv
+, fetchpatch
+, autoconf
+, automake
+, fetchFromGitHub
+, pkgconfig
+}:
+
+stdenv.mkDerivation rec {
+  pname = "mypaint-brushes";
+  version = "1.3.0";
+
+  src = fetchFromGitHub {
+    owner = "mypaint";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1iz89z6v2mp8j1lrf942k561s8311i3s34ap36wh4rybb2lq15m0";
+  };
+
+  patches = [
+    # build with automake 1.16
+    (fetchpatch {
+      url = https://github.com/Jehan/mypaint-brushes/commit/1e9109dde3bffd416ed351c3f30ecd6ffd0ca2cd.patch;
+      sha256 = "0mi8rwbirl0ib22f2hz7kdlgi4hw8s3ab29b003dsshdyzn5iha9";
+    })
+  ];
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+    pkgconfig
+  ];
+
+  preConfigure = "./autogen.sh";
+
+  meta = with stdenv.lib; {
+    homepage = "http://mypaint.org/";
+    description = "Brushes used by MyPaint and other software using libmypaint.";
+    license = licenses.cc0;
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/mypaint-brushes/default.nix b/pkgs/development/libraries/mypaint-brushes/default.nix
index 115d818d9365..20caf6e57752 100644
--- a/pkgs/development/libraries/mypaint-brushes/default.nix
+++ b/pkgs/development/libraries/mypaint-brushes/default.nix
@@ -1,5 +1,4 @@
 { stdenv
-, fetchpatch
 , autoconf
 , automake
 , fetchFromGitHub
@@ -8,23 +7,15 @@
 
 stdenv.mkDerivation rec {
   pname = "mypaint-brushes";
-  version = "1.3.0";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "mypaint";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1iz89z6v2mp8j1lrf942k561s8311i3s34ap36wh4rybb2lq15m0";
+    sha256 = "0kcqz13vzpy24dhmrx9hbs6s7hqb8y305vciznm15h277sabpmw9";
   };
 
-  patches = [
-    # build with automake 1.16
-    (fetchpatch {
-      url = https://github.com/Jehan/mypaint-brushes/commit/1e9109dde3bffd416ed351c3f30ecd6ffd0ca2cd.patch;
-      sha256 = "0mi8rwbirl0ib22f2hz7kdlgi4hw8s3ab29b003dsshdyzn5iha9";
-    })
-  ];
-
   nativeBuildInputs = [
     autoconf
     automake
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1994c2eafec..26701c9301b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20645,6 +20645,8 @@ in
 
   mypaint = callPackage ../applications/graphics/mypaint { };
 
+  mypaint-brushes1 = callPackage ../development/libraries/mypaint-brushes/1.0.nix { };
+
   mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { };
 
   mythtv = libsForQt5.callPackage ../applications/video/mythtv {

From 84fa1d2fb363a04c729da9058e3ee92d3cff9198 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@iohk.io>
Date: Tue, 18 Feb 2020 22:29:38 +0100
Subject: [PATCH 1024/4636] rubyWithPackages.libv8: fix compilation

---
 pkgs/development/ruby-modules/gem-config/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 088bcedf6de3..f26e33ca2427 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -294,6 +294,12 @@ in
   libv8 = attrs: {
     buildInputs = [ which v8 python ];
     buildFlags = [ "--with-system-v8=true" ];
+    dontBuild = false;
+    postPatch = ''
+      substituteInPlace ext/libv8/extconf.rb \
+        --replace "location = Libv8::Location::Vendor.new" \
+                  "location = Libv8::Location::System.new"
+    '';
   };
 
   execjs = attrs: {

From b9db3f8ca0f880cf0623cb34822c9d4949ff2bf2 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 13 Feb 2020 17:32:12 -0500
Subject: [PATCH 1025/4636] nixos/mate: use upstream session

---
 .../services/x11/desktop-managers/mate.nix    | 43 +++++++++----------
 .../mate/mate-session-manager/default.nix     |  8 ++++
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
index 910a246d776c..5183f8b747cd 100644
--- a/nixos/modules/services/x11/desktop-managers/mate.nix
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -44,35 +44,32 @@ in
 
   config = mkIf cfg.enable {
 
-    services.xserver.desktopManager.session = singleton {
-      name = "mate";
-      bgSupport = true;
-      start = ''
-        export XDG_MENU_PREFIX=mate-
+    services.xserver.displayManager.sessionPackages = [
+      pkgs.mate.mate-session-manager
+    ];
 
-        # Let caja find extensions
-        export CAJA_EXTENSION_DIRS=$CAJA_EXTENSION_DIRS''${CAJA_EXTENSION_DIRS:+:}${config.system.path}/lib/caja/extensions-2.0
+    services.xserver.displayManager.sessionCommands = ''
+      if test "$XDG_CURRENT_DESKTOP" = "MATE"; then
+          export XDG_MENU_PREFIX=mate-
 
-        # Let caja extensions find gsettings schemas
-        ${concatMapStrings (p: ''
+          # Let caja find extensions
+          export CAJA_EXTENSION_DIRS=$CAJA_EXTENSION_DIRS''${CAJA_EXTENSION_DIRS:+:}${config.system.path}/lib/caja/extensions-2.0
+
+          # Let caja extensions find gsettings schemas
+          ${concatMapStrings (p: ''
           if [ -d "${p}/lib/caja/extensions-2.0" ]; then
-            ${addToXDGDirs p}
+              ${addToXDGDirs p}
           fi
-          '')
-          config.environment.systemPackages
-        }
+          '') config.environment.systemPackages}
 
-        # Let mate-panel find applets
-        export MATE_PANEL_APPLETS_DIR=$MATE_PANEL_APPLETS_DIR''${MATE_PANEL_APPLETS_DIR:+:}${config.system.path}/share/mate-panel/applets
-        export MATE_PANEL_EXTRA_MODULES=$MATE_PANEL_EXTRA_MODULES''${MATE_PANEL_EXTRA_MODULES:+:}${config.system.path}/lib/mate-panel/applets
+          # Add mate-control-center paths to some XDG variables because its schemas are needed by mate-settings-daemon, and mate-settings-daemon is a dependency for mate-control-center (that is, they are mutually recursive)
+          ${addToXDGDirs pkgs.mate.mate-control-center}
+      fi
+    '';
 
-        # Add mate-control-center paths to some XDG variables because its schemas are needed by mate-settings-daemon, and mate-settings-daemon is a dependency for mate-control-center (that is, they are mutually recursive)
-        ${addToXDGDirs pkgs.mate.mate-control-center}
-
-        ${pkgs.mate.mate-session-manager}/bin/mate-session ${optionalString cfg.debug "--debug"} &
-        waitPID=$!
-      '';
-    };
+    # Let mate-panel find applets
+    environment.sessionVariables."MATE_PANEL_APPLETS_DIR" = "${config.system.path}/share/mate-panel/applets";
+    environment.sessionVariables."MATE_PANEL_EXTRA_MODULES" = "${config.system.path}/lib/mate-panel/applets";
 
     environment.systemPackages =
       pkgs.mate.basePackages ++
diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix
index 1db0947bf2a4..04eb487adba9 100644
--- a/pkgs/desktops/mate/mate-session-manager/default.nix
+++ b/pkgs/desktops/mate/mate-session-manager/default.nix
@@ -33,6 +33,14 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  postFixup = ''
+    substituteInPlace $out/share/xsessions/mate.desktop \
+      --replace "Exec=mate-session" "Exec=$out/bin/mate-session" \
+      --replace "TryExec=mate-session" "TryExec=$out/bin/mate-session"
+  '';
+
+  passthru.providedSessions = [ "mate" ];
+
   meta = with stdenv.lib; {
     description = "MATE Desktop session manager";
     homepage = "https://github.com/mate-desktop/mate-session-manager";

From 153b0db9675da00bbd72c01ad0c2ddc9d49cedee Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Tue, 18 Feb 2020 22:19:03 +0100
Subject: [PATCH 1026/4636] perlPackages.CPAN: apply patch to fix changed YAML
 module default

ZHF: #80379
https://hydra.nixos.org/build/112819370
https://hydra.nixos.org/build/112832567

A default has changed in YAML, breaking the latest release of CPAN. This commit
applies a A patch from the PR fixing the problem.

https://github.com/andk/cpanpm/pull/133
---
 pkgs/top-level/perl-packages.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 562e96246bf0..d16f65e4a93e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3279,6 +3279,13 @@ let
       url = mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.27.tar.gz;
       sha256 = "b4b1471a2881e2d616f59e723879b4110ae485b79d5962f115119c28cf69e07f";
     };
+    patches = [
+      (fetchpatch {
+        url = "https://patch-diff.githubusercontent.com/raw/andk/cpanpm/pull/133.diff";
+        name = "patch-YAML-modules-default-for-LoadBlessed-was-changed-to-false";
+        sha256 = "0i8648cwshzzd0b34gyfn68s1vs85d8336ggk2kl99awah1ydsfr";
+      })
+    ];
     propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ];
     meta = {
       description = "Query, download and build perl modules from CPAN sites";

From 67034d584f120a0fe2a32c2b7c874862f6fd1591 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 18 Feb 2020 16:33:48 -0500
Subject: [PATCH 1027/4636] mate.mate-session-manager: debugging from
 environment variable

---
 pkgs/desktops/mate/mate-session-manager/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix
index 04eb487adba9..09973e04bc0a 100644
--- a/pkgs/desktops/mate/mate-session-manager/default.nix
+++ b/pkgs/desktops/mate/mate-session-manager/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, gettext, xtrans, dbus-glib, systemd,
   libSM, libXtst, gtk3, epoxy, polkit, hicolor-icon-theme, mate,
-  wrapGAppsHook
+  wrapGAppsHook, fetchpatch
 }:
 
 stdenv.mkDerivation rec {
@@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
     sha256 = "01scj5d1xlri9b2id8gm9kfni9nzhdjdf7rag7fvcxwqp7baz3h3";
   };
 
+  patches = [
+    # allow turning on debugging from environment variable
+    (fetchpatch {
+      url = "https://github.com/mate-desktop/mate-session-manager/commit/3ab6fbfc811d00100d7a2959f8bbb157b536690d.patch";
+      sha256 = "0yjaklq0mp44clymyhy240kxlw95z3azmravh4f5pfm9dys33sg0";
+    })
+  ];
+
   nativeBuildInputs = [
     pkgconfig
     gettext

From af73425b825c18fa923ca6abf7fd6293ac8a306e Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 18 Feb 2020 16:34:26 -0500
Subject: [PATCH 1028/4636] nixos/mate: debugging via environment variable

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

diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
index 5183f8b747cd..f236c14fcf3e 100644
--- a/nixos/modules/services/x11/desktop-managers/mate.nix
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -71,6 +71,9 @@ in
     environment.sessionVariables."MATE_PANEL_APPLETS_DIR" = "${config.system.path}/share/mate-panel/applets";
     environment.sessionVariables."MATE_PANEL_EXTRA_MODULES" = "${config.system.path}/lib/mate-panel/applets";
 
+    # Debugging
+    environment.sessionVariables.MATE_SESSION_DEBUG = mkIf cfg.debug "1";
+
     environment.systemPackages =
       pkgs.mate.basePackages ++
       (pkgs.gnome3.removePackagesByName

From 765f72d037ebe7d15feb095fa194efd9488a53b2 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@iohk.io>
Date: Tue, 18 Feb 2020 22:47:20 +0100
Subject: [PATCH 1029/4636] crystal: remove 0.25 and 0.26

---
 .../development/compilers/crystal/default.nix | 23 -------------------
 pkgs/top-level/all-packages.nix               |  4 +---
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 124643443482..5253d6e5a9e3 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -178,15 +178,6 @@ let
   }));
 
 in rec {
-  binaryCrystal_0_26 = genericBinary {
-    version = "0.26.1";
-    sha256s = {
-      x86_64-linux  = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45";
-      i686-linux    = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic";
-      x86_64-darwin = "1mri8bfrcldl69gczxpihxpv1shn4bijx28m3qby8vnk0ii63n9s";
-    };
-  };
-
   binaryCrystal_0_27 = genericBinary {
     version = "0.27.2";
     sha256s = {
@@ -223,20 +214,6 @@ in rec {
     };
   };
 
-  crystal_0_25 = generic {
-    version = "0.25.1";
-    sha256  = "15xmbkalsdk9qpc6wfpkly3sifgw6a4ai5jzlv78dh3jp7glmgyl";
-    doCheck = false;
-    binary = binaryCrystal_0_26;
-  };
-
-  crystal_0_26 = generic {
-    version = "0.26.1";
-    sha256  = "0jwxrqm99zcjj82gyl6bzvnfj79nwzqf8sa1q3f66q9p50v44f84";
-    doCheck = false; # about 20 tests out of more than 14000 are failing
-    binary = binaryCrystal_0_26;
-  };
-
   crystal_0_27 = generic {
     version = "0.27.2";
     sha256  = "0vxqnpqi85yh0167nrkbksxsni476iwbh6y3znbvbjbbfhsi3nsj";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9867494cd7b5..dccb5669a917 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7933,8 +7933,6 @@ in
     stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
     inherit (llvmPackages_6) clang llvm;
   })
-    crystal_0_25
-    crystal_0_26
     crystal_0_27
     crystal_0_29
     crystal_0_30
@@ -15410,7 +15408,7 @@ in
   miniHttpd = callPackage ../servers/http/mini-httpd {};
 
   mlflow-server = callPackage ../servers/mlflow-server { };
-  
+
   mlmmj = callPackage ../servers/mail/mlmmj { };
 
   moodle = callPackage ../servers/web-apps/moodle { };

From 6fecb16af6682bf847a73002ef246b513f1ab679 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 27 Jan 2019 10:25:23 +0100
Subject: [PATCH 1030/4636] =?UTF-8?q?mypaint:=201.2.1=20=E2=86=92=202.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../applications/graphics/mypaint/default.nix | 50 +++++++++++++------
 1 file changed, 36 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix
index 1acaf4850ebe..5ebbee0e4d6f 100644
--- a/pkgs/applications/graphics/mypaint/default.nix
+++ b/pkgs/applications/graphics/mypaint/default.nix
@@ -7,59 +7,81 @@
 , libpng
 , librsvg
 , gobject-introspection
+, libmypaint
+, mypaint-brushes
 , gdk-pixbuf
 , pkgconfig
-, python2
-, scons
+, python3
 , swig
 , wrapGAppsHook
 }:
 
 let
-  inherit (python2.pkgs) pycairo pygobject3 numpy;
-in stdenv.mkDerivation {
+  inherit (python3.pkgs) pycairo pygobject3 numpy buildPythonApplication;
+in buildPythonApplication rec {
   pname = "mypaint";
-  version = "1.2.1";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "mypaint";
     repo = "mypaint";
-    rev = "bcf5a28d38bbd586cc9d4cee223f849fa303864f";
-    sha256 = "1zwx7n629vz1jcrqjqmw6vl6sxdf81fq6a5jzqiga8167gg8s9pf";
+    rev = "v${version}";
+    sha256 = "180kyilhf81ndhwl1hlvy82gh6hxpcvka2d1nkghbpgy431rls6r";
     fetchSubmodules = true;
   };
 
   nativeBuildInputs = [
     intltool
     pkgconfig
-    scons
     swig
     wrapGAppsHook
     gobject-introspection # for setup hook
   ];
-
   buildInputs = [
     gtk3
     gdk-pixbuf
+    libmypaint
+    mypaint-brushes
     json_c
     lcms2
     libpng
     librsvg
     pycairo
     pygobject3
-    python2
   ];
 
   propagatedBuildInputs = [
     numpy
+    pycairo
+    pygobject3
   ];
 
-  postInstall = ''
-    sed -i -e 's|/usr/bin/env python2.7|${python2}/bin/python|' $out/bin/mypaint
+  checkInputs = [
+    gtk3
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    ${python3.interpreter} setup.py build
+
+    runHook postBuild
   '';
 
-  preFixup = ''
-    gappsWrapperArgs+=(--prefix PYTHONPATH : $PYTHONPATH)
+  installPhase = ''
+    runHook preInstall
+
+    ${python3.interpreter} setup.py managed_install --prefix=$out
+
+    runHook postInstall
+  '';
+
+  checkPhase = ''
+    runHook preCheck
+
+    HOME=$TEMPDIR ${python3.interpreter} setup.py test
+
+    runHook postCheck
   '';
 
   meta = with stdenv.lib; {

From 3f448f08aa082b5698e0697dd2224c0d2b4db509 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 18 Feb 2020 16:53:46 -0500
Subject: [PATCH 1031/4636] linux: 5.6-rc1 -> 5.6-rc2

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 6e3abb792bd9..81e39ad647cd 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.6-rc1";
+  version = "5.6-rc2";
   extraMeta.branch = "5.6";
 
   # modDirVersion needs to be x.y.z, will always add .0
@@ -11,7 +11,7 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "1ir7mdzxrin7k6a7ldfmpl9bbapkr99l3pd07dv8589vcrd43zlh";
+    sha256 = "1b3ds8dv5rc9f4c3czj689dxbl8lyrmnfk6ywa51h9vx3lsd5jrp";
   };
 
   # Should the testing kernels ever be built on Hydra?

From 0600e36589fbda4eb081962e37205e5659cc61c3 Mon Sep 17 00:00:00 2001
From: Serg Nesterov <i.am.cust0dian@gmail.com>
Date: Wed, 19 Feb 2020 00:57:31 +0300
Subject: [PATCH 1032/4636] nushell: 0.9.0 -> 0.10.0

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

diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index e08b23afcdd0..811ef762f78a 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -15,16 +15,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nushell";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "0p1aykhkz5rixj6x0rskg77q31xw11mirvjhzp7n4nmbx3rfkagc";
+    sha256 = "08zqvk8qkilynfivx1jnr2yqrav64p9cy9i30jjgcqrh2gsrb9dd";
   };
 
-  cargoSha256 = "14v25smx23d5d386dyw0gspddj6g9am1qpg4ykc1a8lmr0h4ccrk";
+  cargoSha256 = "1gpg0jpd5pmmny9gzzbkph1h2kqmjlapdsw04jzx852yg89lls5v";
 
   nativeBuildInputs = [ pkg-config ]
     ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ];

From 490615ef6308041a22cc2a377fdbfd3c2ca31c7f Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 18 Feb 2020 20:19:16 +0100
Subject: [PATCH 1033/4636] pythonPackages.pyparted: 3.10.4 -> 3.11.4

---
 .../python-modules/pyparted/default.nix       | 21 ++++++++++-----
 .../pyparted/fix-test-pythonpath.patch        | 26 +++++++++++++++++++
 2 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/python-modules/pyparted/fix-test-pythonpath.patch

diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix
index 3defe979d378..c51c55a5eb23 100644
--- a/pkgs/development/python-modules/pyparted/default.nix
+++ b/pkgs/development/python-modules/pyparted/default.nix
@@ -1,18 +1,22 @@
 { stdenv
+, fetchFromGitHub
 , buildPythonPackage
 , isPyPy
 , pkgs
 , python
+, six
 }:
 
 buildPythonPackage rec {
   pname = "pyparted";
-  version = "3.10.7";
+  version = "3.11.4";
   disabled = isPyPy;
 
-  src = pkgs.fetchurl {
-    url = "https://github.com/rhinstaller/pyparted/archive/v${version}.tar.gz";
-    sha256 = "0c9ljrdggwawd8wdzqqqzrna9prrlpj6xs59b0vkxzip0jkf652r";
+  src = fetchFromGitHub {
+    repo = pname;
+    owner = "dcantrell";
+    rev = "v${version}";
+    sha256 = "0wd0xhv1y1zw7djzcnimj8irif3mg0shbhgz0jn5yi914is88h6n";
   };
 
   postPatch = ''
@@ -26,11 +30,16 @@ buildPythonPackage rec {
       tests/test__ped_ped.py
   '';
 
+  patches = [
+    ./fix-test-pythonpath.patch
+  ];
+
   preConfigure = ''
     PATH="${pkgs.parted}/sbin:$PATH"
   '';
 
   nativeBuildInputs = [ pkgs.pkgconfig ];
+  checkInputs = [ six ];
   propagatedBuildInputs = [ pkgs.parted ];
 
   checkPhase = ''
@@ -39,10 +48,10 @@ buildPythonPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "https://fedorahosted.org/pyparted/";
+    homepage = "https://github.com/dcantrell/pyparted/";
     description = "Python interface for libparted";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
+    maintainers = with maintainers; [ lsix ];
   };
-
 }
diff --git a/pkgs/development/python-modules/pyparted/fix-test-pythonpath.patch b/pkgs/development/python-modules/pyparted/fix-test-pythonpath.patch
new file mode 100644
index 000000000000..740bffbef6d8
--- /dev/null
+++ b/pkgs/development/python-modules/pyparted/fix-test-pythonpath.patch
@@ -0,0 +1,26 @@
+diff -ur a/Makefile b/Makefile
+--- a/Makefile	1980-01-02 00:00:00.000000000 +0100
++++ b/Makefile	2020-02-18 20:04:14.068243263 +0100
+@@ -39,19 +39,19 @@
+ 	@$(PYTHON) setup.py build
+ 
+ test: all
+-	@env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src \
++	@env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src:$$PYTHONPATH \
+ 	$(PYTHON) -m unittest discover -v
+ 
+ coverage: all
+ 	@echo "*** Running unittests with $(COVERAGE) for $(PYTHON) ***"
+-	@env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src \
++	@env PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src:$$PYTHONPATH \
+ 	$(COVERAGE) run --branch -m unittest discover -v
+ 	$(COVERAGE) report --include="build/lib.*/parted/*" --show-missing
+ 	$(COVERAGE) report --include="build/lib.*/parted/*" > coverage-report.log
+ 
+ check: clean
+ 	env PYTHON=python3 $(MAKE) ; \
+-	env PYTHON=python3 PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src \
++	env PYTHON=python3 PYTHONPATH=$$(find $$(pwd) -name "*.so" | head -n 1 | xargs dirname):src/parted:src:$$PYTHONPATH \
+ 	tests/pylint/runpylint.py
+ 
+ dist:

From 88a79a7a37bfc9fc20e78317b07bfd56529ae019 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 18 Feb 2020 22:22:10 +0000
Subject: [PATCH 1034/4636] graalvm{8,11}-ee: 19.3.1 -> 20.0.0

---
 .../compilers/graalvm/enterprise-edition.nix  | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/compilers/graalvm/enterprise-edition.nix b/pkgs/development/compilers/graalvm/enterprise-edition.nix
index c34c4695a236..f8271baa5883 100644
--- a/pkgs/development/compilers/graalvm/enterprise-edition.nix
+++ b/pkgs/development/compilers/graalvm/enterprise-edition.nix
@@ -5,33 +5,40 @@ let
     let
       graalvmXXX-ee = stdenv.mkDerivation rec {
         pname = "graalvm${javaVersion}-ee";
-        version = "19.3.1";
+        version = "20.0.0";
         srcs = [
           (requireFile {
              name   = "graalvm-ee-java${javaVersion}-linux-amd64-${version}.tar.gz";
-             sha256 = {  "8" = "b4833f1996e0e271d8abde1d0af3420e2bc6797624515a3720bdbedfa99b1e82";
-                        "11" = "a965abb093934712f31cd2183f3f0d68ed1410a50365489f665a30e5382908dc";
+             sha256 = {  "8" = "2df9b31b96f7a24b6a2fe3ecea0b5e819d5d058fde6320016dba1787ce59e99e";
+                        "11" = "b704fd27b5993584a1ad659b41f42ff0ae8893c066b64a6f6a1719fbee382536";
                       }.${javaVersion};
              url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
           })
           (requireFile {
              name   = "native-image-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
-             sha256 = {  "8" = "fe3447dd60fbe3da39c650654594796873cd6bc9995d1430a421363e71d41702";
-                        "11" = "53357b7facb36c7b38857a2369471d0e869c0ff45555aa8baf2ab84de0c4782c";
-                      }.${javaVersion};
-             url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
-          })
-          (requireFile {
-             name   = "python-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
-             sha256 = {  "8" = "003e9574e18656a82626aa5d310fac31979abc04955587d68ff977808829a91d";
-                        "11" = "65558e14a25802001f3c79571a09170fa11564de34df6987724163416d3889bf";
+             sha256 = {  "8" = "a9f3f86d880d133bd24ad3b1d95129a96e80ea1d8fbc865d09e9410b921e6897";
+                        "11" = "57086123a95f1e9d4e67b92f830bad9325431908c69a40ef10f28ed586d8bd35";
                       }.${javaVersion};
              url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
           })
           (requireFile {
              name   = "ruby-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
-             sha256 = {  "8" = "45abe74d10e09680f1e40101f93def5615e65f29ced328054a40c8517e054290";
-                        "11" = "3d4de372b78b68dbd966b36489d1c6d84a326990e91a0314fb77404eed0741ad";
+             sha256 = {  "8" = "28b2910736f41070c84b97f1b1a3c5fa43ebdcd926ec92c8f145550b5b975b3c";
+                        "11" = "27ff1befa67fe5cc9eb0216b6b1105876f44d13eff6137f36f29f13377ea687b";
+                      }.${javaVersion};
+             url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
+          })
+          (requireFile {
+             name   = "python-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
+             sha256 = {  "8" = "9c83bcd71e316805c2914c9002ce348ae44829606adc2375d9188b1eaaaf82f9";
+                        "11" = "5ca51478bcb5ea5bd9be35856dd7fb2ef03b888cd1b7284a8c15531979025fb4";
+                      }.${javaVersion};
+             url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
+          })
+          (requireFile {
+             name   = "wasm-installable-svm-svmee-java${javaVersion}-linux-amd64-${version}.jar";
+             sha256 = {  "8" = "e8bd14d3f9bf652104e4346e0899a0351afaecae030a9c0ce0f91b1f93d9e660";
+                        "11" = "d24eeb84625bb7a5e330b897fd6dde7fc579a687997b64625199c33fa83c40b4";
                       }.${javaVersion};
              url    = "https://www.oracle.com/technetwork/graalvm/downloads/index.html";
           })
@@ -62,6 +69,7 @@ let
           unpack_jar ''${arr[1]}
           unpack_jar ''${arr[2]}
           unpack_jar ''${arr[3]}
+          unpack_jar ''${arr[4]}
         '';
 
         installPhase = {

From 8585628622766ed59b142142eed24449346cb258 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
Date: Wed, 19 Feb 2020 01:30:32 +0100
Subject: [PATCH 1035/4636] rclone-browser: 1.2 -> 1.8.0 (#80445)

https://github.com/kapitainsky/RcloneBrowser/releases/tag/1.8.0
---
 pkgs/applications/networking/sync/rclone/browser.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/sync/rclone/browser.nix b/pkgs/applications/networking/sync/rclone/browser.nix
index 00edcd411fd5..fb2020f0d3a2 100644
--- a/pkgs/applications/networking/sync/rclone/browser.nix
+++ b/pkgs/applications/networking/sync/rclone/browser.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, cmake, qtbase }:
+{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook, qtbase }:
 
 stdenv.mkDerivation rec {
   pname = "rclone-browser";
-  version = "1.2";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
-    owner = "mmozeiko";
+    owner = "kapitainsky";
     repo = "RcloneBrowser";
     rev = version;
-    sha256 = "1ldradd5c606mfkh46y4mhcvf9kbjhamw0gahksp9w43h5dh3ir7";
+    sha256 = "14ckkdypkfyiqpnz0y2b73wh1py554iyc3gnymj4smy0kg70ai33";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake wrapQtAppsHook ];
 
   buildInputs = [ qtbase ];
 

From bc6c7f648b9e713cefd4104f4307f51c48aa4ab7 Mon Sep 17 00:00:00 2001
From: Ian-Woo Kim <ianwookim@gmail.com>
Date: Tue, 18 Feb 2020 16:49:02 -0800
Subject: [PATCH 1036/4636] ogdf: init at 2020.02 (#80143)

Restricted to i686/x86_64 as it imports cpuid.h on gnu toolchain

Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
---
 pkgs/development/libraries/ogdf/default.nix | 43 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/libraries/ogdf/default.nix

diff --git a/pkgs/development/libraries/ogdf/default.nix b/pkgs/development/libraries/ogdf/default.nix
new file mode 100644
index 000000000000..bbef1d8b93d6
--- /dev/null
+++ b/pkgs/development/libraries/ogdf/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, cmake, doxygen }:
+
+stdenv.mkDerivation rec {
+  pname = "ogdf";
+  version = "2020.02";
+
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = "catalpa-202002";
+    sha256 = "0drrs8zh1097i5c60z9g658vs9k1iinkav8crlwk722ihfm1vxqd";
+  };
+
+  nativeBuildInputs = [ cmake doxygen ];
+
+  cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-fPIC" ];
+
+  # Without disabling hardening for format, the build fails with
+  # the following error.
+  #> /build/source/src/coin/CoinUtils/CoinMessageHandler.cpp:766:35: error: format not a string literal and no format arguments [-Werror=format-security]
+  #> 766 |      sprintf(messageOut_,format_+2);
+  hardeningDisable = [ "format" ];
+
+  meta = with stdenv.lib; {
+    description = "Open Graph Drawing Framework/Open Graph algorithms and Data structure Framework";
+    homepage = "http://www.ogdf.net";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.ianwookim ];
+    platforms = platforms.i686 ++ platforms.x86_64;
+    longDescription = ''
+      OGDF stands both for Open Graph Drawing Framework (the original name) and
+      Open Graph algorithms and Data structures Framework.
+
+      OGDF is a self-contained C++ library for graph algorithms, in particular
+      for (but not restricted to) automatic graph drawing. It offers sophisticated
+      algorithms and data structures to use within your own applications or
+      scientific projects.
+
+      OGDF is developed and supported by Osnabrück University, TU Dortmund,
+      University of Cologne, University of Konstanz, and TU Ilmenau.
+    '';
+   };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9867494cd7b5..9bac1e91b0dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5469,6 +5469,8 @@ in
 
   ofono-phonesim = libsForQt5.callPackage ../development/tools/ofono-phonesim/default.nix { };
 
+  ogdf = callPackage ../development/libraries/ogdf { };
+
   oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { };
 
   ola = callPackage ../applications/misc/ola { };

From 3c47f78e8297cdef7f00399ed7db6ada0d5243ba Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 19 Feb 2020 01:38:13 +0100
Subject: [PATCH 1037/4636] nix: 2.3.2 -> 2.3.3

---
 nixos/modules/installer/tools/nix-fallback-paths.nix | 8 ++++----
 pkgs/tools/package-management/nix/default.nix        | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index c2f2578733ba..72b5850a4d92 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,6 +1,6 @@
 {
-  x86_64-linux = "/nix/store/0q5qnh10m2sfrriszc1ysmggw659q6qm-nix-2.3.2";
-  i686-linux = "/nix/store/i7ad7r5d8a5b3l22hg4a1im2qq05y6vd-nix-2.3.2";
-  aarch64-linux = "/nix/store/bv06pavfw0dbqzr8w3l7s71nx27gnxa0-nix-2.3.2";
-  x86_64-darwin = "/nix/store/x6mnl1nij7y4v5ihlplr4k937ayr403r-nix-2.3.2";
+  x86_64-linux = "/nix/store/68mycwwczrciryylq2a66jwfhxp09zsg-nix-2.3.3-debug";
+  i686-linux = "/nix/store/5axys7hsggb4282dsbps5k5p0v59yv13-nix-2.3.3";
+  aarch64-linux = "/nix/store/k80nwvi19hxwbz3c9cxgp24f1jjxwmcc-nix-2.3.3";
+  x86_64-darwin = "/nix/store/lrnvapsqmf0ja6zfyx4cpxr7ahdr7f9b-nix-2.3.3";
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index a51a4cab4f08..06e987f6f2bc 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -173,10 +173,10 @@ in rec {
   };
 
   nixStable = callPackage common (rec {
-    name = "nix-2.3.2";
+    name = "nix-2.3.3";
     src = fetchurl {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-      sha256 = "9fea4b52db0b296dcf05d36f7ecad9f48396af3a682bb21e31f8d04c469beef8";
+      sha256 = "332fffb8dfc33eab854c136ef162a88cec15b701def71fa63714d160831ba224";
     };
 
     inherit storeDir stateDir confDir boehmgc;

From 013008ae7e44408bd6532cd038143458f8db7b7c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 18 Feb 2020 20:00:00 -0500
Subject: [PATCH 1038/4636] brakeman: 4.7.2 -> 4.8.0

Changelog: https://github.com/presidentbeef/brakeman/releases/tag/v4.8.0
---
 pkgs/development/tools/analysis/brakeman/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/brakeman/default.nix b/pkgs/development/tools/analysis/brakeman/default.nix
index edf37efbce99..de351524f39b 100644
--- a/pkgs/development/tools/analysis/brakeman/default.nix
+++ b/pkgs/development/tools/analysis/brakeman/default.nix
@@ -4,12 +4,13 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "brakeman";
-  version = "4.7.2";
-  source.sha256 = "1j1svldxvbl27kpyp9yngfwa0fdqal926sjk0cha7h520wvnz79k";
+  version = "4.8.0";
+  source.sha256 = "0xy28pq4x1i7xns5af9k8fx35sqffz2lg94fgbsi9zhi877b7srg";
 
   meta = with lib; {
     description = "Static analysis security scanner for Ruby on Rails";
     homepage = "https://brakemanscanner.org/";
+    changelog = "https://github.com/presidentbeef/brakeman/releases/tag/v${version}";
     license = [ licenses.unfreeRedistributable ];
     platforms = ruby.meta.platforms;
     maintainers = [ maintainers.marsam ];

From a43d20b8b4b5f7e2a1ea29bfb8539c58214cd1be Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Tue, 18 Feb 2020 23:06:46 +0100
Subject: [PATCH 1039/4636] perlPackages.{CryptCurve25519,MathGMP}: fixed build
 failures

ZHF: #80379
https://hydra.nixos.org/build/112817446
https://hydra.nixos.org/build/112813918
https://hydra.nixos.org/build/112814931
https://hydra.nixos.org/build/112833536
https://hydra.nixos.org/build/112804942
https://hydra.nixos.org/build/112809869

perlPackages.CryptCurve25519: apply patch from gentoo to fix fmul conflicting
types build breakage.
https://gitweb.gentoo.org/repo/gentoo.git/commit/dev-perl/Crypt-Curve25519?id=e07299f804a8376bb5bf85d28916e0a360199f3e

perlPackages.MathGMP: 2.19 -> 2.20
Updated to latest upstream, which passes tests. This is a dependency of
perlPackages.NetSSH
---
 pkgs/top-level/perl-packages.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 562e96246bf0..da505b1a81c6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3437,6 +3437,12 @@ let
       url = mirror://cpan/authors/id/A/AJ/AJGB/Crypt-Curve25519-0.06.tar.gz;
       sha256 = "1ir0gfxm8i7r9zyfs2zvil5jgwirl7j6cb9cm1p2kjpfnhyp0j4z";
     };
+    patches = [
+      (fetchpatch {
+        url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-perl/Crypt-Curve25519/files/Crypt-Curve25519-0.60.0-fmul-fixedvar.patch?id=cec727ad614986ca1e6b9468eea7f1a5a9183382";
+        sha256 = "0l005jzxp6q6vyl3p43ji47if0v9inscnjl0vxaqzf6c17akgbhf";
+      })
+    ];
     meta = {
       description = "Generate shared secret using elliptic-curve Diffie-Hellman function";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@@ -11113,10 +11119,10 @@ let
 
   MathGMP = buildPerlPackage {
     pname = "Math-GMP";
-    version = "2.19";
+    version = "2.20";
     src = fetchurl {
-      url = mirror://cpan/authors/id/S/SH/SHLOMIF/Math-GMP-2.19.tar.gz;
-      sha256 = "1c07521m4d38hy2yx21hkwz22n2672bvrc4i21ldc68h85qy1q8i";
+      url = mirror://cpan/authors/id/S/SH/SHLOMIF/Math-GMP-2.20.tar.gz;
+      sha256 = "0psmpj3j8cw02b5bzb7qnkd4rcpxm82891rwpdi2hx2jxy0mznhn";
     };
     buildInputs = [ pkgs.gmp AlienGMP ];
     NIX_CFLAGS_COMPILE = "-I${pkgs.gmp.dev}/include";

From 38c37f473d2d0842d6bf37ff781c6d983917da95 Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Mon, 27 Jan 2020 14:33:31 -0500
Subject: [PATCH 1040/4636] pythonPackages.osqp: init at 0.6.1

Oxford Splitting QP solver.
Dependency for cvxpy -> qiskit-aer.
---
 .../python-modules/osqp/default.nix           | 51 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/python-modules/osqp/default.nix

diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix
new file mode 100644
index 000000000000..237ad7a7a00a
--- /dev/null
+++ b/pkgs/development/python-modules/osqp/default.nix
@@ -0,0 +1,51 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, cmake
+, future
+, numpy
+  # check inputs
+, scipy
+, pytestCheckHook
+, mkl
+}:
+
+buildPythonPackage rec {
+  pname = "osqp";
+  version = "0.6.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "130frig5bznfacqp9jwbshmbqd2xw3ixdspsbkrwsvkdaab7kca7";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  dontUseCmakeConfigure = true;
+
+  propagatedBuildInputs = [
+    numpy
+    future
+  ];
+
+  checkInputs = [ scipy pytestCheckHook mkl ];
+  pythonImportsCheck = [ "osqp" ];
+  dontUseSetuptoolsCheck = true;  # running setup.py fails if false
+  preCheck = ''
+    export LD_LIBRARY_PATH=${lib.strings.makeLibraryPath [ mkl ]}:$LD_LIBRARY_PATH;
+  '';
+
+  meta = with lib; {
+    description = "The Operator Splitting QP Solver";
+    longDescription = ''
+      Numerical optimization package for solving problems in the form
+        minimize        0.5 x' P x + q' x
+        subject to      l <= A x <= u
+
+      where x in R^n is the optimization variable
+    '';
+    homepage = "https://osqp.org/";
+    downloadPage = "https://github.com/oxfordcontrol/osqp";
+    license = licenses.asl20;
+    maintainers = with lib.maintainers; [ drewrisinger ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 63cde6669fe8..8ee05ad69e69 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2985,6 +2985,8 @@ in {
 
   oscrypto = callPackage ../development/python-modules/oscrypto { };
 
+  osqp = callPackage ../development/python-modules/osqp { };
+
   oyaml = callPackage ../development/python-modules/oyaml { };
 
   pamela = callPackage ../development/python-modules/pamela { };

From a26f334e219d2b9a7d28b4a6c24442fe7204edb0 Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Fri, 24 Jan 2020 10:54:04 -0500
Subject: [PATCH 1041/4636] pythonPackages.pylatexenc: init at 2.1

Latex converter for Python.
Check dependency of qiskit.
---
 .../python-modules/pylatexenc/default.nix     | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/pylatexenc/default.nix

diff --git a/pkgs/development/python-modules/pylatexenc/default.nix b/pkgs/development/python-modules/pylatexenc/default.nix
new file mode 100644
index 000000000000..146aed9a3ecf
--- /dev/null
+++ b/pkgs/development/python-modules/pylatexenc/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "pylatexenc";
+  version = "2.1";
+
+  src = fetchFromGitHub {
+    owner = "phfaist";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0wnl00y5dl56aw9j4y21kqapraaravbycwfxdmjsbgl11nk4llx9";
+  };
+
+  pythonImportsCheck = [ "pylatexenc" ];
+  checkInputs = [ pytest ];
+  checkPhase = ''
+    pytest
+  '';
+
+  meta = with lib; {
+    description = "Simple LaTeX parser providing latex-to-unicode and unicode-to-latex conversion";
+    homepage = "https://pylatexenc.readthedocs.io";
+    downloadPage = "https;//www.github.com/phfaist/pylatexenc";
+    license = licenses.mit;
+    maintainers = with maintainers; [ drewrisinger ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8ee05ad69e69..b2be86291d1b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3084,6 +3084,8 @@ in {
 
   pylama = callPackage ../development/python-modules/pylama { };
 
+  pylatexenc = callPackage ../development/python-modules/pylatexenc { };
+
   pymbolic = callPackage ../development/python-modules/pymbolic { };
 
   pymediainfo = callPackage ../development/python-modules/pymediainfo { };

From 0030d391d229a2d5983752741d6bc0153dc82f1b Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Tue, 18 Feb 2020 21:34:08 -0500
Subject: [PATCH 1042/4636] bluez: 5.52 -> 5.53

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

diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix
index cf9bcec554c3..844a9faf739c 100644
--- a/pkgs/os-specific/linux/bluez/default.nix
+++ b/pkgs/os-specific/linux/bluez/default.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bluez";
-  version = "5.52";
+  version = "5.53";
 
   src = fetchurl {
     url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz";
-    sha256 = "02jng21lp6fb3c2bh6vf9y7cj4gaxwk29dfc32ncy0lj0gi4q57p";
+    sha256 = "1g1qg6dz6hl3csrmz75ixr12lwv836hq3ckb259svvrg62l2vaiq";
   };
 
   pythonPath = with python3.pkgs; [
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Bluetooth support for Linux";
-    homepage = http://www.bluez.org/;
+    homepage = "http://www.bluez.org/";
     license = with licenses; [ gpl2 lgpl21 ];
     platforms = platforms.linux;
     repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git;

From 3adda62dc3c80c7f6666c364b3c966a823f66eb5 Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Sat, 25 Jan 2020 18:02:57 -0500
Subject: [PATCH 1043/4636] pythonPackages.ecos: init at 2.0.7.post1

Embedded cone solver interface for optimization problems in Python.
Dependency of qiskit-ignis.
---
 .../python-modules/ecos/default.nix           | 50 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/python-modules/ecos/default.nix

diff --git a/pkgs/development/python-modules/ecos/default.nix b/pkgs/development/python-modules/ecos/default.nix
new file mode 100644
index 000000000000..6c07a5d485a6
--- /dev/null
+++ b/pkgs/development/python-modules/ecos/default.nix
@@ -0,0 +1,50 @@
+{ lib
+, pythonOlder
+, buildPythonPackage
+, fetchFromGitHub
+, pkgs
+, numpy
+, scipy
+  # check inputs
+, nose
+}:
+
+buildPythonPackage rec {
+  pname = "ecos";
+  version = "2.0.7.post1";
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "embotech";
+    repo = "ecos-python";
+    rev = version;
+    sha256 = "1wzmamz2r4xr2zxgfwnm5q283185d1q6a7zn30vip18lxpys70z0";
+    fetchSubmodules = true;
+  };
+
+  prePatch = ''
+    echo '__version__ = "${version}"' >> ./src/ecos/version.py
+  '';
+
+  propagatedBuildInputs = [
+    numpy
+    scipy
+  ];
+
+  checkInputs = [ nose ];
+  checkPhase = ''
+    # Run tests
+    cd ./src
+    nosetests test_interface.py test_interface_bb.py
+  '';
+  pythonImportsCheck = [ "ecos" ];
+
+  meta = with lib; {
+    description = "Python package for ECOS: Embedded Cone Solver";
+    downloadPage = "https://github.com/embotech/ecos-python/releases";
+    homepage = pkgs.ecos.meta.homepage;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ drewrisinger ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b2be86291d1b..07afcd0a1546 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3435,6 +3435,8 @@ in {
 
   ecdsa = callPackage ../development/python-modules/ecdsa { };
 
+  ecos = callPackage ../development/python-modules/ecos { };
+
   effect = callPackage ../development/python-modules/effect {};
 
   enum = callPackage ../development/python-modules/enum { };

From 3f3ead76fdb741a0dd71a694a7b24efa024848d8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Feb 2020 03:34:52 +0000
Subject: [PATCH 1044/4636] clightning: 0.8.0 -> 0.8.1

---
 pkgs/applications/blockchains/clightning.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix
index f6c9fee7a1c5..0add60cc19e4 100644
--- a/pkgs/applications/blockchains/clightning.nix
+++ b/pkgs/applications/blockchains/clightning.nix
@@ -4,11 +4,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "clightning";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchurl {
     url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
-    sha256 = "053e43bbe71564e9be8b2b56346a88986646ef6849a0af67cece01858b93306a";
+    sha256 = "079d3yx7yr7qrilqgaayvn18lxl8h6a1gwwbsgm5xsyxj4vdlz7r";
   };
 
   enableParallelBuilding = true;

From 4478766b64d6d86a0ff983249effc4eedd792294 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Mon, 10 Feb 2020 23:54:16 -0500
Subject: [PATCH 1045/4636] make-bootstrap-tools: add libssp to allow stack
 protector to work

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

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 90a679756d77..ec5f1092a469 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -123,6 +123,8 @@ in with pkgs; rec {
         cp -d ${bootGCC.out}/bin/g++ $out/bin
         cp -d ${bootGCC.lib}/lib/libgcc_s.so* $out/lib
         cp -d ${bootGCC.lib}/lib/libstdc++.so* $out/lib
+        cp -d ${bootGCC.out}/lib/libssp.a* $out/lib
+        cp -d ${bootGCC.out}/lib/libssp_nonshared.a $out/lib
         cp -rd ${bootGCC.out}/lib/gcc $out/lib
         chmod -R u+w $out/lib
         rm -f $out/lib/gcc/*/*/include*/linux

From f84bc7264c8027097f6365d81f490ba1c726b16d Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Tue, 18 Feb 2020 17:42:40 -1000
Subject: [PATCH 1046/4636] pythonPackages.ansible-runner: skip failing test on
 Catalina (#80484)

Catalina replaced the director /home with a symbolic link to `/System/Volumes/Data/home` and this test is looking for `/home` explicitly.

I filed https://github.com/ansible/ansible-runner/issues/413 to get this fix upstream.
---
 pkgs/development/python-modules/ansible-runner/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix
index 62f95c3cefce..6a71ae9e1d3e 100644
--- a/pkgs/development/python-modules/ansible-runner/default.nix
+++ b/pkgs/development/python-modules/ansible-runner/default.nix
@@ -6,6 +6,7 @@
 , python-daemon
 , pyyaml
 , six
+, stdenv
 , ansible
 , pytest
 , mock
@@ -30,8 +31,12 @@ buildPythonPackage rec {
     six
   ];
 
+  # test_process_isolation_settings is currently broken on Darwin Catalina
+  # https://github.com/ansible/ansible-runner/issues/413
   checkPhase = ''
-    HOME=$(mktemp -d) pytest --ignore test/unit/test_runner.py -k "not test_prepare"
+    HOME=$TMPDIR pytest \
+      --ignore test/unit/test_runner.py \
+      -k "not prepare ${lib.optionalString stdenv.isDarwin "and not process_isolation_settings"}"
   '';
 
   meta = with lib; {

From a2a65222870b49d721caf71898f85cdfbddd6820 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Feb 2020 04:44:49 +0000
Subject: [PATCH 1047/4636] ephemeral: 6.2.0 -> 6.2.1

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

diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix
index c25e41de5db3..20ecbebd6d8e 100644
--- a/pkgs/applications/networking/browsers/ephemeral/default.nix
+++ b/pkgs/applications/networking/browsers/ephemeral/default.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ephemeral";
-  version = "6.2.0";
+  version = "6.2.1";
 
   src = fetchFromGitHub {
     owner = "cassidyjames";
     repo = "ephemeral";
     rev = version;
-    sha256 = "1y0n1p14kg24qnybi201181q7j6vm20ka4xwmgggjll9v6qflvaz";
+    sha256 = "182kzk68l6rr878aaaqx31c6npb65x77qzhbc5rbqlrrdrb69zsg";
   };
 
   nativeBuildInputs = [

From 0f5acc5ebe23e3c3d315900cf840d2ce0595d0d7 Mon Sep 17 00:00:00 2001
From: Benjamin Herr <ben@0x539.de>
Date: Tue, 18 Feb 2020 20:58:40 -0800
Subject: [PATCH 1048/4636] silence warning from #63103 in
 encrypted-devices.nix

---
 nixos/modules/tasks/encrypted-devices.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix
index 2c9231f55236..bc0933f16fec 100644
--- a/nixos/modules/tasks/encrypted-devices.nix
+++ b/nixos/modules/tasks/encrypted-devices.nix
@@ -65,7 +65,7 @@ in
     boot.initrd = {
       luks = {
         devices =
-          map (dev: { name = dev.encrypted.label; device = dev.encrypted.blkDev; } ) keylessEncDevs;
+          builtins.listToAttrs (map (dev: { name = dev.encrypted.label; value = { device = dev.encrypted.blkDev; }; }) keylessEncDevs);
         forceLuksSupportInInitrd = true;
       };
       postMountCommands =

From 1895236d373b227889b5dd64d162f80aa593eace Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Wed, 19 Feb 2020 00:22:10 -0500
Subject: [PATCH 1049/4636] cargo-audit: 0.10.0 -> 0.11.2

---
 pkgs/tools/package-management/cargo-audit/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix
index 6c56fbe476d7..fba2b82ff32b 100644
--- a/pkgs/tools/package-management/cargo-audit/default.nix
+++ b/pkgs/tools/package-management/cargo-audit/default.nix
@@ -1,16 +1,16 @@
 { stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security, libiconv }:
 rustPlatform.buildRustPackage rec {
   pname = "cargo-audit";
-  version = "0.10.0";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "RustSec";
     repo = "cargo-audit";
     rev = "v${version}";
-    sha256 = "1977ykablfi4mc6j2iil0bxc6diy07vi5hm56xmqj3n37ziavf1m";
+    sha256 = "0py4z50ld4vs0g7vh8ga6v5h11nz2yfcpr3xqzpihf4p7sg1mdf4";
   };
 
-  cargoSha256 = "0bpqsg8mv94ivwmbfxfcnd89yx5vry33395ynqrzhqq9s1jwq0dq";
+  cargoSha256 = "0n4q8767aby6fgq0z7wj966zgqydlwirrzgyahf234dz6arsxw2l";
 
   buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ];
   nativeBuildInputs = [ pkg-config ];

From 7b04af1b89e06d6436e939439def2b72bbab9284 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Tue, 18 Feb 2020 08:22:38 +0200
Subject: [PATCH 1050/4636] zola: 0.9.0 -> 0.10.0

---
 pkgs/applications/misc/zola/cargo-lock.patch | 28 --------------------
 pkgs/applications/misc/zola/default.nix      | 16 +++++------
 2 files changed, 6 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/applications/misc/zola/cargo-lock.patch

diff --git a/pkgs/applications/misc/zola/cargo-lock.patch b/pkgs/applications/misc/zola/cargo-lock.patch
deleted file mode 100644
index b9d97e3c328a..000000000000
--- a/pkgs/applications/misc/zola/cargo-lock.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index df5fef3..80f071a 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -2158,12 +2158,12 @@ version = "0.2.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
-- "sass-sys 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "sass-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
- [[package]]
- name = "sass-sys"
--version = "0.4.13"
-+version = "0.4.15"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -3410,7 +3410,7 @@ dependencies = [
- "checksum safemem 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0"
- "checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"
- "checksum sass-rs 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cabcf7c6e55053f359911187ac401409aad2dc14338cae972dec266fee486abd"
--"checksum sass-sys 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6e16ac97c2335bc367e2d675f54c1823558f1b19a6c67671d48b70e30ae22972"
-+"checksum sass-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)" = "304b6f9501d1da13f17404aeee85486d7383d06074906669b3ea032f81e83d22"
- "checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021"
- "checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
- "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix
index be00070d2a50..201a3eda3cc7 100644
--- a/pkgs/applications/misc/zola/default.nix
+++ b/pkgs/applications/misc/zola/default.nix
@@ -1,23 +1,19 @@
-{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkgconfig, openssl, CoreServices }:
+{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkg-config, openssl, CoreServices }:
 
 rustPlatform.buildRustPackage rec {
   pname = "zola";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "getzola";
     repo = pname;
     rev = "v${version}";
-    sha256 = "13kbgxh7r6124d1fjdf0x599j1kpgixp1y9d299zb5vrd6rf5wy5";
+    sha256 = "112aqv21gy1fbly5v2x3ph32pr82d1mwh0q57yfaaqygz2madypb";
   };
-  cargoPatches = [ ./cargo-lock.patch ];
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
+  cargoSha256 = "0hqa60bx8pxhgad7x6r4zbwddrkcspnnp53bl94zbf3j47p10ggz";
 
-  cargoSha256 = "03rwf5l1l3ap03qi0xqcxsbyvpg3cqmr50j8ql6c5v55xl0ki9w8";
-
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ openssl ]
     ++ stdenv.lib.optional stdenv.isDarwin CoreServices;
 
@@ -32,7 +28,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with stdenv.lib; {
     description = "A fast static site generator with everything built-in";
-    homepage = https://www.getzola.org/;
+    homepage = "https://www.getzola.org/";
     license = licenses.mit;
     maintainers = with maintainers; [ dywedir ];
     platforms = platforms.all;

From ed982f6b6e6a2e3399c28ec83e04084602a98bf6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Feb 2020 06:21:47 +0000
Subject: [PATCH 1051/4636] i3-gaps: 4.17.1 -> 4.18

---
 pkgs/applications/window-managers/i3/gaps.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix
index e5c478987df4..731555ce9f8c 100644
--- a/pkgs/applications/window-managers/i3/gaps.nix
+++ b/pkgs/applications/window-managers/i3/gaps.nix
@@ -3,12 +3,12 @@
 i3.overrideAttrs (oldAttrs : rec {
 
   name = "i3-gaps-${version}";
-  version = "4.17.1";
+  version = "4.18";
   releaseDate = "2019-01-27";
 
   src = fetchurl {
     url = "https://github.com/Airblader/i3/archive/${version}.tar.gz";
-    sha256 = "02jpvwmfwv58dfdwvcvkdfcyca7l7zw7hx18aj4cqm3gg0r5pmqh";
+    sha256 = "04sq2sik7j09kgnn1k87yg3vzy56pk4688bmxh49l6drl0wr1m2v";
   };
 
   nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ];

From 6986f40254f04ba0f7eb50a14d865ba44e5cb586 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Feb 2020 06:29:42 +0000
Subject: [PATCH 1052/4636] ideogram: 1.3.0 -> 1.3.2

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

diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix
index ba5ee230ce4a..386916083bb6 100644
--- a/pkgs/applications/graphics/ideogram/default.nix
+++ b/pkgs/applications/graphics/ideogram/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ideogram";
-  version = "1.3.0";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "cassidyjames";
     repo = pname;
     rev = version;
-    sha256 = "0ghc7hk4b4r3a0x9r30rrgv3rarxyjr2hf9ig244xwvhh5rn3j10";
+    sha256 = "08nl11gj3234nrqyigqkq3yiyrqf2hha24x5jkl78ypj2xhcnhw8";
   };
 
   nativeBuildInputs = [

From 711617f5e3e9087c9b193a5573d33b2063611b55 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 19 Feb 2020 16:59:50 +1000
Subject: [PATCH 1053/4636] Revert "postgresql: build < 9.5 with openssl 1.0.2"
 (#80481)

This reverts commit 2d6f0cb1764e24f186ff52002aedf230b6496af5.

postgresql versions < 9.5 have been removed from nixpkgs.
---
 pkgs/servers/sql/postgresql/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index b9cd50aa5fe0..129292e88907 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -3,7 +3,7 @@ let
   generic =
       # dependencies
       { stdenv, lib, fetchurl, makeWrapper
-      , glibc, zlib, readline, openssl, openssl_1_0_2, icu, systemd, libossp_uuid
+      , glibc, zlib, readline, openssl, icu, systemd, libossp_uuid
       , pkgconfig, libxml2, tzdata
 
       # This is important to obtain a version of `libpq` that does not depend on systemd.
@@ -32,10 +32,9 @@ let
     setOutputFlags = false; # $out retains configureFlags :-/
 
     buildInputs =
-      [ zlib readline libxml2 makeWrapper ]
+      [ zlib readline openssl libxml2 makeWrapper ]
       ++ lib.optionals icuEnabled [ icu ]
       ++ lib.optionals enableSystemd [ systemd ]
-      ++ [ (if atLeast "9.5" then openssl else openssl_1_0_2) ]
       ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ];
 
     nativeBuildInputs = lib.optionals icuEnabled [ pkgconfig ];

From 01d0bf7dd7b5d23487f3e08a3f1d3e944581de33 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Feb 2020 07:25:07 +0000
Subject: [PATCH 1054/4636] libiio: 0.18 -> 0.19

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

diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix
index 9392061a269e..461c6f111645 100644
--- a/pkgs/development/libraries/libiio/default.nix
+++ b/pkgs/development/libraries/libiio/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libiio";
-  version = "0.18";
+  version = "0.19";
 
   src = fetchFromGitHub {
     owner  = "analogdevicesinc";
     repo   = "libiio";
     rev    = "refs/tags/v${version}";
-    sha256 = "1cmg3ipam101iy9yncwz2y48idaqaw4fg7i9i4c8vfjisfcycnkk";
+    sha256 = "1r67h5mayx9krh3mmzs5vz20mvwb2lw04hpbyyisygl01ndc77kq";
   };
 
   outputs = [ "out" "lib" "dev" "python" ];

From 89416dab81914b7a5e3bf4d9ea35861b5f6fa07e Mon Sep 17 00:00:00 2001
From: Enno Lohmeier <enno@nerdworks.de>
Date: Wed, 19 Feb 2020 08:40:12 +0100
Subject: [PATCH 1055/4636] drone: 1.6.0 -> 1.6.5

---
 .../tools/continuous-integration/drone/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix
index 8e63daab2d61..05257f65af52 100644
--- a/pkgs/development/tools/continuous-integration/drone/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   name = "drone.io-${version}";
-  version = "1.6.0";
+  version = "1.6.5";
   goPackagePath = "github.com/drone/drone";
 
-  modSha256 = "0l33qib9riknrjdpsvd7n6slqp485vx66xl6w7m24b5sc7yfsg7m";
+  modSha256 = "1fyb9218s52w8c6c3v6rgivbyzy5hz4q4z8r75ng2yrmjmmiv2gr";
 
   src = fetchFromGitHub {
     owner = "drone";
     repo = "drone";
     rev = "v${version}";
-    sha256 = "0ij4a6rh17ib360bxrpncf8lp839b6sl17bd0fp3xvwmibk6xgjz";
+    sha256 = "05cgd72qyss836fby0adhrm5p8g7639psk2yslhg6pmz0cqfbq9m";
   };
 
   meta = with stdenv.lib; {

From 7b9d9fe076a0a231043cf9dcc4b1308aad55ea1a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Feb 2020 05:06:30 +0000
Subject: [PATCH 1056/4636] freenect: 0.5.7 -> 0.6.0

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

diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix
index 9520542481c8..17b2a6b7c990 100644
--- a/pkgs/development/libraries/freenect/default.nix
+++ b/pkgs/development/libraries/freenect/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "freenect";
-  version = "0.5.7";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "OpenKinect";
     repo = "libfreenect";
     rev = "v${version}";
-    sha256 = "0vnc7z2avckh4mccqq6alsd2z7xvsh3kaslc5b0gnfxw0j269gl6";
+    sha256 = "1963xndbiwgj01q17zv6xbqlsbhfd236dkbdwkbjw4b0gr8kqzq9";
   };
 
   buildInputs = [ libusb freeglut libGLU libGL libXi libXmu ]

From 58af3177c08fb6055ad82ff9fa9378582bfe379e Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Wed, 19 Feb 2020 09:03:39 +0100
Subject: [PATCH 1057/4636] tor: fix build

Monotonic timer test expects sleep(200ms) to take at most 1s. On
loaded systems like hydra, it's possible for such a test to take
longer than 1 second.

Tests expecting sleep(200ms) to take at least 175ms weren't removed,
because load shouldn't cause sleep to be shorter.
---
 pkgs/tools/security/tor/default.nix           |  3 ++-
 .../tor/disable-monotonic-timer-tests.patch   | 26 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/security/tor/disable-monotonic-timer-tests.patch

diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 698693be95e5..78d5b4441d53 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ libevent openssl zlib lzma zstd scrypt ] ++
     stdenv.lib.optionals stdenv.isLinux [ libseccomp systemd libcap ];
 
+  patches = [ ./disable-monotonic-timer-tests.patch ];
+
   NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s";
 
   postPatch = ''
@@ -39,7 +41,6 @@ stdenv.mkDerivation rec {
   '';
 
   enableParallelBuilding = true;
-  enableParallelChecking = false; # 4 tests fail randomly
 
   doCheck = true;
 
diff --git a/pkgs/tools/security/tor/disable-monotonic-timer-tests.patch b/pkgs/tools/security/tor/disable-monotonic-timer-tests.patch
new file mode 100644
index 000000000000..a95a373bbb64
--- /dev/null
+++ b/pkgs/tools/security/tor/disable-monotonic-timer-tests.patch
@@ -0,0 +1,26 @@
+diff --git a/src/test/test_util.c b/src/test/test_util.c
+index 0d86a5ab5..e93c6ba89 100644
+--- a/src/test/test_util.c
++++ b/src/test/test_util.c
+@@ -5829,13 +5829,9 @@ test_util_monotonic_time(void *arg)
+   /* We need to be a little careful here since we don't know the system load.
+    */
+   tt_i64_op(monotime_diff_msec(&mt1, &mt2), OP_GE, 175);
+-  tt_i64_op(monotime_diff_msec(&mt1, &mt2), OP_LT, 1000);
+   tt_i64_op(monotime_coarse_diff_msec(&mtc1, &mtc2), OP_GE, 125);
+-  tt_i64_op(monotime_coarse_diff_msec(&mtc1, &mtc2), OP_LT, 1000);
+   tt_u64_op(nsec2-nsec1, OP_GE, 175000000);
+-  tt_u64_op(nsec2-nsec1, OP_LT, 1000000000);
+   tt_u64_op(nsecc2-nsecc1, OP_GE, 125000000);
+-  tt_u64_op(nsecc2-nsecc1, OP_LT, 1000000000);
+ 
+   tt_u64_op(msec1, OP_GE, nsec1 / 1000000);
+   tt_u64_op(usec1, OP_GE, nsec1 / 1000);
+@@ -5849,7 +5845,6 @@ test_util_monotonic_time(void *arg)
+   uint64_t coarse_stamp_diff =
+     monotime_coarse_stamp_units_to_approx_msec(stamp2-stamp1);
+   tt_u64_op(coarse_stamp_diff, OP_GE, 120);
+-  tt_u64_op(coarse_stamp_diff, OP_LE, 1200);
+ 
+   {
+     uint64_t units = monotime_msec_to_approx_coarse_stamp_units(5000);

From e4442fbf23d55ad940897a121762c1070b95c0f2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Feb 2020 08:19:39 +0000
Subject: [PATCH 1058/4636] mapnik: 3.0.22 -> 3.0.23

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

diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix
index 53c4594f535b..351b38b3345e 100644
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/pkgs/development/libraries/mapnik/default.nix
@@ -8,12 +8,12 @@
 
 stdenv.mkDerivation rec {
   pname = "mapnik";
-  version = "3.0.22";
+  version = "3.0.23";
 
   src = fetchzip {
     # this one contains all git submodules and is cheaper than fetchgit
     url = "https://github.com/mapnik/mapnik/releases/download/v${version}/mapnik-v${version}.tar.bz2";
-    sha256 = "18yvnnbwqndagzaa2nwh3g7gb52dghaypxpkmc2h5l88770bl17f";
+    sha256 = "1754m8y7fyk0dyf7cglhavsk66g5kdqhnmgicib1jkcgjbl69f15";
   };
 
   # a distinct dev output makes python-mapnik fail

From 4f97819812562c80549157054f797199e660deeb Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 13 Feb 2020 09:53:32 +1000
Subject: [PATCH 1059/4636] pcre: 8.43 -> 8.44

https://lists.exim.org/lurker/message/20200212.174850.6edd8277.en.html
---
 pkgs/development/libraries/pcre/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index cf08f9893697..dc14ab73dcfa 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -8,7 +8,7 @@ with stdenv.lib;
 assert elem variant [ null "cpp" "pcre16" "pcre32" ];
 
 let
-  version = "8.43";
+  version = "8.44";
   pname = if (variant == null) then "pcre"
     else  if (variant == "cpp") then "pcre-cpp"
     else  variant;
@@ -18,7 +18,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://ftp.pcre.org/pub/pcre/pcre-${version}.tar.bz2";
-    sha256 = "0sxg1wlknq05ryq63h21cchjmcjkin9lmnqsmhs3h08301965rwi";
+    sha256 = "0v9nk51wh55pcbnf2jr36yarz8ayajn6d7ywiq2wagivn9c8c40r";
   };
 
   outputs = [ "bin" "dev" "out" "doc" "man" ];

From 1caac6f2dc467dd67eff688f3a9befdad5d0f9d0 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Tue, 18 Feb 2020 14:13:46 +0100
Subject: [PATCH 1060/4636] hunspell: add patch for CVE-2019-16707

Fixes #70098, #73651.
---
 pkgs/development/libraries/hunspell/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix
index f2f8cdcab205..a9b28253171f 100644
--- a/pkgs/development/libraries/hunspell/default.nix
+++ b/pkgs/development/libraries/hunspell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, readline, autoreconfHook }:
+{ stdenv, fetchurl, fetchpatch, ncurses, readline, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   version = "1.7.0";
@@ -14,7 +14,14 @@ stdenv.mkDerivation rec {
   buildInputs = [ ncurses readline ];
   nativeBuildInputs = [ autoreconfHook ];
 
-  patches = [ ./0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch ];
+  patches = [
+    ./0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch
+    (fetchpatch {
+      name = "CVE-2019-16707.patch";
+      url = "https://github.com/hunspell/hunspell/commit/ac938e2ecb48ab4dd21298126c7921689d60571b.patch";
+      sha256 = "0bwfksz87iy7ikx3fb54zd5ww169qfm9kl076hsch3cs8p30s8az";
+    })
+  ];
 
   postPatch = ''
     patchShebangs tests

From 56debabe34166f38d23b563c1c0467813e31ad81 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Feb 2020 08:54:38 +0000
Subject: [PATCH 1061/4636] mod_wsgi: 4.7.0 -> 4.7.1

---
 pkgs/servers/http/apache-modules/mod_wsgi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
index c0e4cefa40a5..0e4804c1a39a 100644
--- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mod_wsgi";
-  version = "4.7.0";
+  version = "4.7.1";
 
   src = fetchurl {
     url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz";
-    sha256 = "079f4py20jd6n3d7djak5l9j8p6hfq96lf577iir6qpfsk2p0k3n";
+    sha256 = "0dbxhrp3x689ccrhvm2lw2icmmj8i4p86z2lq3xn1zlsf43fax16";
   };
 
   buildInputs = [ apacheHttpd python ncurses ];

From 8ae07bfe792abf93f723c700a7ff374fe6d39c52 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Feb 2020 09:12:39 +0000
Subject: [PATCH 1062/4636] nco: 4.9.1 -> 4.9.2

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

diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix
index 7b03c32ada58..321e4e0560d9 100644
--- a/pkgs/development/libraries/nco/default.nix
+++ b/pkgs/development/libraries/nco/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex }:
 
 stdenv.mkDerivation rec {
-  version = "4.9.1";
+  version = "4.9.2";
   pname = "nco";
 
   nativeBuildInputs = [ flex which ];
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchzip {
     url = "https://github.com/nco/nco/archive/${version}.tar.gz";
-    sha256 = "14r44wi9ina8h8gh5cmkcddxl5ziwv42mv60sp4l5wfmjz5xwa4x";
+    sha256 = "0nip9dmdx3d5nc30bz1d2w9his1dph136l53r160aa3bmb29xwqn";
   };
 
   meta = {

From 799192f20f573703376e20da005578eb38ea3d55 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Feb 2020 09:18:01 +0000
Subject: [PATCH 1063/4636] neo-cowsay: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/tools/misc/neo-cowsay/default.nix b/pkgs/tools/misc/neo-cowsay/default.nix
index 128d582e32e7..a4fe58fb1075 100644
--- a/pkgs/tools/misc/neo-cowsay/default.nix
+++ b/pkgs/tools/misc/neo-cowsay/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "neo-cowsay";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "Code-Hex";
     repo = "Neo-cowsay";
     rev = "v${version}";
-    sha256 = "1in6kadczv05v62qhskqbdx7wppch0gwl0bshr5ihmi39k8l7v3z";
+    sha256 = "0c6lygdqi26mczij41sn8ckc3g6qaakkkh3iasf10a4d07amxci1";
   };
 
   modSha256 = "063ds35dzv8m4bjk7v1q3f6jwyp7j5jrkrhrl41z1c1mbzzkagkq";

From 20e399e579216065935308142ac415a1e83401f1 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 19 Feb 2020 04:20:00 -0500
Subject: [PATCH 1064/4636] nodejs-12_x: 12.16.0 -> 12.16.1

Changelog: https://github.com/nodejs/node/releases/tag/v12.16.1
---
 pkgs/development/web/nodejs/v12.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix
index e8a4634773d6..3fa5216ccf82 100644
--- a/pkgs/development/web/nodejs/v12.nix
+++ b/pkgs/development/web/nodejs/v12.nix
@@ -5,6 +5,6 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "12.16.0";
-    sha256 = "09grij355z210mkzkzarb6gwz8b02lnaxzdll1249kiz8wvhdjdq";
+    version = "12.16.1";
+    sha256 = "0ba1dla31z6i31z3723l74nky1v04irwbl3iaqmi0iicl1dq958a";
   }

From 53bd4a215663a1729578cdd3db545bbcc2db162a Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 19 Feb 2020 04:20:00 -0500
Subject: [PATCH 1065/4636] nodejs-13_x: 13.8.0 -> 13.9.0

Changelog: https://github.com/nodejs/node/releases/tag/v13.9.0
---
 pkgs/development/web/nodejs/v13.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix
index dcd0f3dd2b7d..89ef27c8c5e2 100644
--- a/pkgs/development/web/nodejs/v13.nix
+++ b/pkgs/development/web/nodejs/v13.nix
@@ -5,6 +5,6 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "13.8.0";
-    sha256 = "1h437yvg43xci35rvp55gvb94rddkf4j9i9iw81bmkwhvb4h8qdv";
+    version = "13.9.0";
+    sha256 = "0z68hj3z2y8aj4bc14h77mj5l99jb4ljjc10gp0dpg8s4g1x5xzw";
   }

From b1774b201e1a9dc7065ba1b99eb3dbc9e7a865f1 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Wed, 19 Feb 2020 10:20:59 +0100
Subject: [PATCH 1066/4636] golangci-lint: 1.22.2 -> 1.23.6

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/development/tools/golangci-lint/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix
index 8304d95d99f2..75bb50f25a49 100644
--- a/pkgs/development/tools/golangci-lint/default.nix
+++ b/pkgs/development/tools/golangci-lint/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "golangci-lint";
-  version = "1.22.2";
+  version = "1.23.6";
 
   src = fetchFromGitHub {
     owner = "golangci";
     repo = "golangci-lint";
     rev = "v${version}";
-    sha256 = "1wwp6ppm5p2cf7jbcgmqm6alzaj34sa079d98afw21yr81qxvvid";
+    sha256 = "0y5kjlqbz9xxlxd8kagrsyz9wvjqf7i28i6zb2m8x9c9zg82kvsn";
   };
 
-  modSha256 = "02j2cf5778ds0vwz0kkd9c1x5ap732vkq20bfg440spfajscvndm";
+  modSha256 = "0sckz298bvkf4p4fdmsmza0zrj2s2pvc86qwg6i76vdh9yzvq5gx";
   subPackages = [ "cmd/golangci-lint" ];
 
   meta = with lib; {

From 20dd176e5e376c39cea0dea35626a2574d7b2ddc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Feb 2020 09:25:58 +0000
Subject: [PATCH 1067/4636] nixpkgs-review: 2.1.1 -> 2.2.0

---
 pkgs/tools/package-management/nixpkgs-review/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix
index 928c946de2be..9f54d82d3cd2 100644
--- a/pkgs/tools/package-management/nixpkgs-review/default.nix
+++ b/pkgs/tools/package-management/nixpkgs-review/default.nix
@@ -8,13 +8,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "nixpkgs-review";
-  version = "2.1.1";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nixpkgs-review";
     rev = version;
-    sha256 = "0rx0ld2ihsvlr1yiap5cq7h227jr79zf3xhkninh2m00x384s6bd";
+    sha256 = "0qsvrcxl97nih1yprydzlqc6n1ppg726664d6harx5kjzp5776mr";
   };
 
   makeWrapperArgs = [

From f7d199f22772ac8680e61ae0709aaca304a3e9ac Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 19 Feb 2020 12:38:31 +0200
Subject: [PATCH 1068/4636] gotify-server: 2.0.13 -> 2.0.14

---
 pkgs/servers/gotify/default.nix  | 4 ++--
 pkgs/servers/gotify/ui.nix       | 4 ++--
 pkgs/servers/gotify/yarndeps.nix | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix
index 9782b2890550..f2014aac9fdc 100644
--- a/pkgs/servers/gotify/default.nix
+++ b/pkgs/servers/gotify/default.nix
@@ -12,13 +12,13 @@ buildGoModule rec {
   pname = "gotify-server";
   # Note that when this is updated, along with the hash, the `ui.nix` file
   # should include the same changes to the version and the sha256.
-  version = "2.0.13";
+  version = "2.0.14";
 
   src = fetchFromGitHub {
     owner = "gotify";
     repo = "server";
     rev = "v${version}";
-    sha256 = "11ycs1ci1z8wm4fjgk4454kgszr4s8q9dc96pl77yvlngi4dk46d";
+    sha256 = "0hyy9fki2626cgd78l7fkk67lik6g1pkcpf6xr3gl07dxwcclyr8";
   };
 
   modSha256 = "1awhbc8qs2bwv6y2vwd92r4ys0l1bzymrb36iamr040x961682wv";
diff --git a/pkgs/servers/gotify/ui.nix b/pkgs/servers/gotify/ui.nix
index 2c1bddec68f6..403f01c2a856 100644
--- a/pkgs/servers/gotify/ui.nix
+++ b/pkgs/servers/gotify/ui.nix
@@ -8,13 +8,13 @@ yarn2nix-moretea.mkYarnPackage rec {
   packageJSON = ./package.json;
   yarnNix = ./yarndeps.nix;
 
-  version = "2.0.13";
+  version = "2.0.14";
 
   src_all = fetchFromGitHub {
     owner = "gotify";
     repo = "server";
     rev = "v${version}";
-    sha256 = "11ycs1ci1z8wm4fjgk4454kgszr4s8q9dc96pl77yvlngi4dk46d";
+    sha256 = "0hyy9fki2626cgd78l7fkk67lik6g1pkcpf6xr3gl07dxwcclyr8";
   };
   src = "${src_all}/ui";
 
diff --git a/pkgs/servers/gotify/yarndeps.nix b/pkgs/servers/gotify/yarndeps.nix
index 0e81e890a9fe..3f74ad74ccc2 100644
--- a/pkgs/servers/gotify/yarndeps.nix
+++ b/pkgs/servers/gotify/yarndeps.nix
@@ -1234,11 +1234,11 @@
       };
     }
     {
-      name = "_types_notifyjs___notifyjs_3.0.0.tgz";
+      name = "_types_notifyjs___notifyjs_3.0.1.tgz";
       path = fetchurl {
-        name = "_types_notifyjs___notifyjs_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/@types/notifyjs/-/notifyjs-3.0.0.tgz";
-        sha1 = "a57126a90be2827d511d00a0615816cd5ca8a740";
+        name = "_types_notifyjs___notifyjs_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/notifyjs/-/notifyjs-3.0.1.tgz";
+        sha1 = "eba3bec10e44309df4aba31a73bfd26a562bc755";
       };
     }
     {

From 1b351f81f4e0e350b26154509023035f852d0c00 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Wed, 19 Feb 2020 12:22:35 +0100
Subject: [PATCH 1069/4636] nixos/buildkite-agents: fix hooksDir assertion

---
 .../services/continuous-integration/buildkite-agents.nix        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/continuous-integration/buildkite-agents.nix b/nixos/modules/services/continuous-integration/buildkite-agents.nix
index fbda2731bbf3..c17d89c387a1 100644
--- a/nixos/modules/services/continuous-integration/buildkite-agents.nix
+++ b/nixos/modules/services/continuous-integration/buildkite-agents.nix
@@ -258,7 +258,7 @@ in
   });
 
   config.assertions = mapAgents (name: cfg: [
-      { assertion = cfg.hooksPath == hooksDir || all (v: v == null) (attrValues cfg.hooks);
+      { assertion = cfg.hooksPath == (hooksDir cfg) || all (v: v == null) (attrValues cfg.hooks);
         message = ''
           Options `services.buildkite-agents.${name}.hooksPath' and
           `services.buildkite-agents.${name}.hooks.<name>' are mutually exclusive.

From db0b13969cedcaa7389c59d7df1acdcfd131acce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 19 Feb 2020 08:54:42 -0300
Subject: [PATCH 1070/4636] numix-icon-theme-square: 19.09.20 -> 19.12.27

---
 pkgs/data/icons/numix-icon-theme-square/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix
index 620ef02fde72..4d872f206e47 100644
--- a/pkgs/data/icons/numix-icon-theme-square/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-square/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "numix-icon-theme-square";
-  version = "19.09.20";
+  version = "19.12.27";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = pname;
     rev = version;
-    sha256 = "0q3d4d4wndknz3043bh8ardjvdpds2hkzk73kyyh1848wg4ff0ly";
+    sha256 = "0pjbi2g7wk8gyr4lvp8fvcb8z29kc3l6v19a45axgadnc609hqw7";
   };
 
   nativeBuildInputs = [ gtk3 numix-icon-theme ];

From ee53155c26f0b790f3c619e3553fe399c8c276ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 19 Feb 2020 09:02:14 -0300
Subject: [PATCH 1071/4636] numix-icon-theme-square: numix-icon-theme is a
 runtime dependency

---
 pkgs/data/icons/numix-icon-theme-square/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix
index 4d872f206e47..644d20cccfdb 100644
--- a/pkgs/data/icons/numix-icon-theme-square/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-square/default.nix
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
     sha256 = "0pjbi2g7wk8gyr4lvp8fvcb8z29kc3l6v19a45axgadnc609hqw7";
   };
 
-  nativeBuildInputs = [ gtk3 numix-icon-theme ];
+  nativeBuildInputs = [ gtk3 ];
 
-  propagatedBuildInputs = [
-    hicolor-icon-theme
-  ];
+  buildInputs = [ numix-icon-theme ];
+
+  propagatedBuildInputs = [ hicolor-icon-theme ];
 
   dontDropIconThemeCache = true;
 

From 1ba1b9a70943b93499deb05601bc228123f6d3b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 19 Feb 2020 08:58:09 -0300
Subject: [PATCH 1072/4636] numix-icon-theme-circle: numix-icon-theme is a
 runtime dependency

---
 pkgs/data/icons/numix-icon-theme-circle/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index c85f01d2718a..96ad0e2c2b81 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
     sha256 = "0za44h7f4vk37yl30xlaa6w76maiipb6p63gl9hl1rshdn9nxq0y";
   };
 
-  nativeBuildInputs = [ gtk3 numix-icon-theme ];
+  nativeBuildInputs = [ gtk3 ];
 
-  propagatedBuildInputs = [
-    hicolor-icon-theme
-  ];
+  buildInputs = [ numix-icon-theme ];
+
+  propagatedBuildInputs = [ hicolor-icon-theme ];
 
   dontDropIconThemeCache = true;
 

From ee65cd9c4040c5e62a29d124c41e0e71e76d1a41 Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Tue, 21 Jan 2020 13:21:51 -0500
Subject: [PATCH 1073/4636] pythonPackages.docplex: init at 2.12.182

The IBM Decision Optimization CPLEX Modeling for Python.

Dependency of qiskit-aqua.
---
 .../python-modules/docplex/default.nix        | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/docplex/default.nix

diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix
new file mode 100644
index 000000000000..42f1270dc1b5
--- /dev/null
+++ b/pkgs/development/python-modules/docplex/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy27
+, futures
+, docloud
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "docplex";
+  version = "2.12.182";
+
+  # No source available from official repo
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "aaf150b06d44f07639aca48be1fca69c7732d57507e6adc4e8451c7a93489116";
+  };
+
+  propagatedBuildInputs = [
+    docloud
+    requests
+  ] ++ lib.optional isPy27 futures;
+
+  doCheck = false;
+  pythonImportsCheck = [ "docplex" ];
+
+  meta = with lib; {
+    description = "IBM Decision Optimization CPLEX Modeling for Python";
+    homepage = "https://onboarding-oaas.docloud.ibmcloud.com/software/analytics/docloud/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ drewrisinger ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 07afcd0a1546..2b9a8bb8c25c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2548,6 +2548,8 @@ in {
 
   docloud = callPackage ../development/python-modules/docloud { };
 
+  docplex = callPackage ../development/python-modules/docplex { };
+
   docopt = callPackage ../development/python-modules/docopt { };
 
   doctest-ignore-unicode = callPackage ../development/python-modules/doctest-ignore-unicode { };

From 482642a733f1254d33b816f51c152fbd269db818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Wed, 19 Feb 2020 13:13:22 +0100
Subject: [PATCH 1074/4636] dnsmasq: fixup build after kernel header changes

https://github.com/torvalds/linux/commit/0768e17073d
---
 pkgs/tools/networking/dnsmasq/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index f224ab1ac935..22609eff9aec 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -27,6 +27,9 @@ stdenv.mkDerivation rec {
       sha256 = "1hnixij3jp1p6zc3bx2dr92yyf9jp1ahhl9hiiq7bkbhbrw6mbic";
     })
   ];
+  postPatch = ''
+    sed '1i#include <linux/sockios.h>' -i src/dhcp.c
+  '';
 
   preBuild = ''
     makeFlagsArray=("COPTS=${copts}")

From 9bab9e2ec6be97489ab712b69f7fbb3ece4739d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Wed, 19 Feb 2020 13:10:26 +0100
Subject: [PATCH 1075/4636] nixos/i2pd: address #63103

As a comment to 1d61efb7f177f7b70c467ab4940fde0a3481d4dc
Note that collect returns a list from a set
---
 nixos/modules/services/networking/i2pd.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index 326d34f6ca92..93a21fd4c97e 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -158,10 +158,10 @@ let
       (sec "addressbook")
       (strOpt "defaulturl" cfg.addressbook.defaulturl)
     ] ++ (optionalEmptyList "subscriptions" cfg.addressbook.subscriptions)
-      ++ (flip mapAttrs
-      (collect (name: proto: proto ? port && proto ? address && proto ? name) cfg.proto)
+      ++ (flip map
+      (collect (proto: proto ? port && proto ? address) cfg.proto)
       (proto: let protoOpts = [
-        (sec name)
+        (sec proto.name)
         (boolOpt "enabled" proto.enable)
         (strOpt "address" proto.address)
         (intOpt "port" proto.port)
@@ -181,10 +181,10 @@ let
 
   tunnelConf = let opts = [
     notice
-    (flip mapAttrs
-      (collect (name: tun: tun ? port && tun ? destination) cfg.outTunnels)
+    (flip map
+      (collect (tun: tun ? port && tun ? destination) cfg.outTunnels)
       (tun: let outTunOpts = [
-        (sec name)
+        (sec tun.name)
         "type = client"
         (intOpt "port" tun.port)
         (strOpt "destination" tun.destination)
@@ -204,10 +204,10 @@ let
         ++ (if tun ? crypto.tagsToSend then
             optionalNullInt "crypto.tagstosend" tun.crypto.tagsToSend else []);
         in concatStringsSep "\n" outTunOpts))
-    (flip mapAttrs
-      (collect (name: tun: tun ? port && tun ? address) cfg.inTunnels)
+    (flip map
+      (collect (tun: tun ? port && tun ? address) cfg.inTunnels)
       (tun: let inTunOpts = [
-        (sec name)
+        (sec tun.name)
         "type = server"
         (intOpt "port" tun.port)
         (strOpt "host" tun.address)
@@ -606,7 +606,7 @@ in
 
       outTunnels = mkOption {
         default = {};
-        type = with types; loaOf (submodule (
+        type = with types; attrsOf (submodule (
           { name, ... }: {
             options = {
               destinationPort = mkOption {
@@ -627,7 +627,7 @@ in
 
       inTunnels = mkOption {
         default = {};
-        type = with types; loaOf (submodule (
+        type = with types; attrsOf (submodule (
           { name, ... }: {
             options = {
               inPort = mkOption {

From 425db300c1a090368d1ec4d3342736d82848ca01 Mon Sep 17 00:00:00 2001
From: Matthijs Steen <emailmatthijs@gmail.com>
Date: Wed, 19 Feb 2020 13:26:48 +0100
Subject: [PATCH 1076/4636] bitwarden_rs-vault: 2.12.0b -> 2.12.0c

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

diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix
index 9cbf067d40b4..6c6ef6ccaa9f 100644
--- a/pkgs/tools/security/bitwarden_rs/vault.nix
+++ b/pkgs/tools/security/bitwarden_rs/vault.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bitwarden_rs-vault";
-  version = "2.12.0b";
+  version = "2.12.0c";
 
   src = fetchurl {
     url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz";
-    sha256 = "01jwyhcam9kh8lpxfgzzw7r3nn9sn6jbgmd78a7h8r50z5hy04g5";
+    sha256 = "040bqbx6hpwq4qvv4s7d77gwp5n2ay9rr7kdb135582d80wjq5sp";
   };
 
   buildCommand = ''
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Integrates the web vault into bitwarden_rs";
-    homepage = https://github.com/dani-garcia/bw_web_builds;
+    homepage = "https://github.com/dani-garcia/bw_web_builds";
     platforms = platforms.all;
     license = licenses.gpl3;
     maintainers = with maintainers; [ msteen ];

From f90c64865f8010cd3033bb2b2550434f8b0edc5b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Feb 2020 12:30:17 +0000
Subject: [PATCH 1077/4636] shotcut: 19.12.31 -> 20.02.17

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

diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 6926f7e8eae2..f0959284d669 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -8,13 +8,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.18.0";
 
 mkDerivation rec {
   pname = "shotcut";
-  version = "19.12.31";
+  version = "20.02.17";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "shotcut";
     rev = "v${version}";
-    sha256 = "1vwgah8pp2kbd0iaz952d3bwxphk06yxqc0pi4hk1mklkh87qzm9";
+    sha256 = "0nsqlbapqgxccb7mnvxqw4hdddj944d4z5jxafpv0cwj7s3z8wj0";
   };
 
   patches = [ ./0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch ];

From 3d3ba53897ef385ade917fa05b1923fc47d80b0f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 19 Feb 2020 12:44:21 +0000
Subject: [PATCH 1078/4636] gomuks: 2019-06-28 -> 2020-02-19

---
 .../networking/instant-messengers/gomuks/default.nix   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
index 5e6e2f9b8d8d..a36f72c03d08 100644
--- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
@@ -2,24 +2,24 @@
 
 buildGoModule rec {
   pname = "gomuks";
-  version = "2019-06-28";
+  version = "2020-02-19";
 
   goPackagePath = "maunium.net/go/gomuks";
 
   src = fetchFromGitHub {
     owner = "tulir";
     repo = pname;
-    rev = "37df8eb454088e61db7a14f382851205bc1806ad";
-    sha256 = "1hr15d9sbq6mddaxv3pwz86qp1hhzssgrvakfpc49xl4h04dq33g";
+    rev = "702592bf89dfcf1ec382c0a09d99318bce7a3943";
+    sha256 = "0g638q8ypkp6dbfy1s4hz798cpkld301f914il3yd70yf05vvysc";
   };
 
-  modSha256 = "1qrqgzzsxqvmy4m9shypa94bzw34mc941jhmyccip9grk9fzsxws";
+  modSha256 = "03vbrh50pvx71rp6c23qc2sh0ir4jm1wl0gvi3z1c14ndzhsqky4";
 
   meta = with stdenv.lib; {
     homepage = "https://maunium.net/go/gomuks/";
     description = "A terminal based Matrix client written in Go";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ tilpner ];
+    maintainers = with maintainers; [ tilpner emily ];
     platforms = platforms.unix;
   };
 }

From 7b73eefda84c75f33ce5dc52461b87f9fa992fed Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 19 Feb 2020 08:01:22 -0500
Subject: [PATCH 1079/4636] mumble: fix build (#80500)

---
 pkgs/applications/networking/mumble/default.nix  |  4 +++-
 .../networking/mumble/fix-rnnoise-argument.patch | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/networking/mumble/fix-rnnoise-argument.patch

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 86ef850e291e..da7c5d4af741 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -19,7 +19,9 @@ let
     pname = overrides.type;
     version = source.version;
 
-    patches = (source.patches or []) ++ optional jackSupport ./mumble-jack-support.patch;
+    patches = (source.patches or [])
+      ++ optional jackSupport ./mumble-jack-support.patch
+      ++ [ ./fix-rnnoise-argument.patch ];
 
     nativeBuildInputs = [ pkgconfig python qt5.qmake ]
       ++ (overrides.nativeBuildInputs or [ ]);
diff --git a/pkgs/applications/networking/mumble/fix-rnnoise-argument.patch b/pkgs/applications/networking/mumble/fix-rnnoise-argument.patch
new file mode 100644
index 000000000000..78e8ed24d58f
--- /dev/null
+++ b/pkgs/applications/networking/mumble/fix-rnnoise-argument.patch
@@ -0,0 +1,16 @@
+nixpkgs has a more recent rnnoise than the one used by mumble, and rnnoise
+changed the argument rnnoise_create[1],
+
+[1] https://github.com/xiph/rnnoise/commit/231b9c02d14a74cb449a98004cb7a2cf1bdeca2f
+
+--- old/src/mumble/AudioInput.cpp	2020-02-18 22:55:32.000000000 -0500
++++ new/src/mumble/AudioInput.cpp	2020-02-18 22:58:08.000000000 -0500
+@@ -106,7 +106,7 @@
+ #endif
+ 
+ #ifdef USE_RNNOISE
+-	denoiseState = rnnoise_create();
++	denoiseState = rnnoise_create(NULL);
+ #endif
+ 
+ 	qWarning("AudioInput: %d bits/s, %d hz, %d sample", iAudioQuality, iSampleRate, iFrameSize);

From 563baa1ea9ed884545f95b4071f483f9121a67c4 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 19 Feb 2020 14:39:59 +0100
Subject: [PATCH 1080/4636] clipman: 2019-12-10 -> 1.3.0

https://github.com/yory8/clipman/releases/tag/v1.3.0
---
 pkgs/tools/misc/clipman/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/clipman/default.nix b/pkgs/tools/misc/clipman/default.nix
index b8873e2bcac2..560dbecd4bf6 100644
--- a/pkgs/tools/misc/clipman/default.nix
+++ b/pkgs/tools/misc/clipman/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "clipman";
-  version = "unstable-2019-12-10";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "yory8";
     repo = pname;
-    rev = "c57453be90bb4496f67275db8c0beb2116a6ce14";
-    sha256 = "0zvqk3gcpx67dsn7qr0p9bgjp0sljl3yrlsfbqzrbrmj2lwr98ys";
+    rev = "v${version}";
+    sha256 = "0b27rgyjwvdm9qjq824imda3yjbxxcwwyv8rzzk95ggvyayxw8an";
   };
 
   modSha256 = "0aw0ng8pk8qzn1iv79iw0v9zr8xdc8p9xnigr3ij86038f7aqdhv";

From 301c706f779633b553df5879824cdc363d869d20 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Feb 2020 09:25:58 +0000
Subject: [PATCH 1081/4636] nixpkgs-review: 2.1.1 -> 2.2.0

---
 pkgs/tools/package-management/nixpkgs-review/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix
index 928c946de2be..9f54d82d3cd2 100644
--- a/pkgs/tools/package-management/nixpkgs-review/default.nix
+++ b/pkgs/tools/package-management/nixpkgs-review/default.nix
@@ -8,13 +8,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "nixpkgs-review";
-  version = "2.1.1";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nixpkgs-review";
     rev = version;
-    sha256 = "0rx0ld2ihsvlr1yiap5cq7h227jr79zf3xhkninh2m00x384s6bd";
+    sha256 = "0qsvrcxl97nih1yprydzlqc6n1ppg726664d6harx5kjzp5776mr";
   };
 
   makeWrapperArgs = [

From 944775e0c5c0c477e48a2c1a557ca94e232b9fe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Wed, 19 Feb 2020 13:18:06 +0100
Subject: [PATCH 1082/4636] dnsmasq: correct previous change for Darwin

I was a bit hasty in commit 482642a73.
---
 pkgs/tools/networking/dnsmasq/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index 22609eff9aec..2a6b776c14d5 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       sha256 = "1hnixij3jp1p6zc3bx2dr92yyf9jp1ahhl9hiiq7bkbhbrw6mbic";
     })
   ];
-  postPatch = ''
+  postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isLinux ''
     sed '1i#include <linux/sockios.h>' -i src/dhcp.c
   '';
 

From eeb087bc61f699be9a624761b9dd2121c0f79c39 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 18 Feb 2020 04:20:00 -0500
Subject: [PATCH 1083/4636] terraform-lsp: 0.0.9 -> 0.0.10

Changelog: https://github.com/juliosueiras/terraform-lsp/releases/tag/v0.0.10
---
 .../development/tools/misc/terraform-lsp/default.nix | 12 +++++++-----
 pkgs/top-level/all-packages.nix                      |  6 +-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/misc/terraform-lsp/default.nix b/pkgs/development/tools/misc/terraform-lsp/default.nix
index 94492395a589..9a661f276772 100644
--- a/pkgs/development/tools/misc/terraform-lsp/default.nix
+++ b/pkgs/development/tools/misc/terraform-lsp/default.nix
@@ -1,17 +1,19 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
-buildGoModule rec {
+buildGoPackage rec {
   pname = "terraform-lsp";
-  version = "0.0.9";
+  version = "0.0.10";
 
   src = fetchFromGitHub {
     owner = "juliosueiras";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1m133fznf58fkjl5yx0gxa3cjfb0h8f9fv760c9h1d5cg279bghk";
+    sha256 = "1j69j1pkd0q6bds1c6pcaars5hl3hk93q2p31mymkzmy640k8zfn";
   };
 
-  modSha256 = "1mb3169vdlv4h10k15pg88s48s2b6y7v5frk9j9ahg52grygcqb2";
+  goPackagePath = "github.com/juliosueiras/terraform-lsp";
+
+  buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version} -X main.GitCommit=${src.rev}" ];
 
   meta = with lib; {
     description = "Language Server Protocol for Terraform";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3af321398cd4..439afc272ab8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10682,11 +10682,7 @@ in
 
   terracognita = callPackage ../development/tools/misc/terracognita { };
 
-  terraform-lsp = callPackage ../development/tools/misc/terraform-lsp {
-    # Version 0.0.5 fails to build with go 1.13 due to dependency:
-    #   build github.com/juliosueiras/terraform-lsp: cannot load github.com/googleapis/gax-go/v2: github.com/googleapis/gax-go@v2.0.0+incompatible: reading file:///nix/store/ihiyd3mqa5gvfm2k2716hpl16knak798-terraform-lsp-0.0.5-go-modules/github.com/googleapis/gax-go/@v/v2.0.0+incompatible.zip: Not Found
-    buildGoModule = buildGo112Module;
-  };
+  terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { };
 
   texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
   texinfo4 = texinfo413;

From 712fba51916fe5bcc99aa80bfa82c25490a7926a Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 19 Feb 2020 15:38:11 +0100
Subject: [PATCH 1084/4636] python.pkgs.scikits-odes: 2.4.0-9-g93075ae -> 2.6.1

---
 .../python-modules/scikits-odes/default.nix         | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/scikits-odes/default.nix b/pkgs/development/python-modules/scikits-odes/default.nix
index 89ffe334e7ff..32809be7bde9 100644
--- a/pkgs/development/python-modules/scikits-odes/default.nix
+++ b/pkgs/development/python-modules/scikits-odes/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , lib
 , buildPythonPackage
-, fetchFromGitHub
+, fetchPypi
 , fetchurl
 , cython
 , enum34
@@ -16,14 +16,11 @@
 
 buildPythonPackage rec {
   pname = "scikits.odes";
-  version = "2.4.0-9-g93075ae";
+  version = "2.6.1";
 
-  # we fetch github instead of Pypi, as we want #104 and #105, which don't apply cleanly on 2.4.0
-  src = fetchFromGitHub {
-    owner = "bmcage";
-    repo = "odes";
-    rev = "93075ae25c409f572f13ca7207fada5706f73c73";
-    sha256 = "161rab7hy6r1a9xw1zby9xhnnmxi0zwdpzxfpjkw9651xn2k5xyw";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0kbf2n16h9s35x6pavlx6sff0pqr68i0x0609z92a4vadni32n6b";
   };
 
   nativeBuildInputs = [

From 10f9b277d596e7fb9558d3a603db2ebcad685acc Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 19 Feb 2020 15:29:38 +0100
Subject: [PATCH 1085/4636] python.pkgs.scikits-odes: use latest sundials

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

diff --git a/pkgs/development/python-modules/scikits-odes/default.nix b/pkgs/development/python-modules/scikits-odes/default.nix
index 32809be7bde9..ba3d5eaaff0e 100644
--- a/pkgs/development/python-modules/scikits-odes/default.nix
+++ b/pkgs/development/python-modules/scikits-odes/default.nix
@@ -11,7 +11,7 @@
 , pytest
 , python
 , scipy
-, sundials_3
+, sundials
 }:
 
 buildPythonPackage rec {
@@ -30,7 +30,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     numpy
-    sundials_3
+    sundials
     scipy
   ] ++ lib.optionals (!isPy3k) [ enum34 ];
 

From fb17ac37863ebd9733a0642d9205952d2fb271e0 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 19 Feb 2020 15:32:06 +0100
Subject: [PATCH 1086/4636] sundials_3: remove

This package has only been used for python.pkgs.scikits-odes, which
should compile with sundials 5 by now.
---
 pkgs/development/libraries/sundials/3.x.nix | 52 ---------------------
 pkgs/top-level/aliases.nix                  |  1 +
 pkgs/top-level/all-packages.nix             |  4 +-
 3 files changed, 2 insertions(+), 55 deletions(-)
 delete mode 100644 pkgs/development/libraries/sundials/3.x.nix

diff --git a/pkgs/development/libraries/sundials/3.x.nix b/pkgs/development/libraries/sundials/3.x.nix
deleted file mode 100644
index 879f13e8bf53..000000000000
--- a/pkgs/development/libraries/sundials/3.x.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ stdenv
-, cmake
-, fetchurl
-, python
-, liblapack
-, gfortran
-, lapackSupport ? true }:
-
-let liblapackShared = liblapack.override {
-  shared = true;
-};
-
-in stdenv.mkDerivation rec {
-  pname = "sundials";
-  version = "3.2.1";
-
-  buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran ];
-  nativeBuildInputs = [ cmake ];
-
-  src = fetchurl {
-    url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
-    sha256 = "0238r1qnwqz13wcjzfsbcfi8rfnlxcjjmxq2vpf2qf5jgablvna7";
-  };
-
-  patches = [
-    (fetchurl {
-      # https://github.com/LLNL/sundials/pull/19
-      url = "https://github.com/LLNL/sundials/commit/1350421eab6c5ab479de5eccf6af2dcad1eddf30.patch";
-      sha256 = "0g67lixp9m85fqpb9rzz1hl1z8ibdg0ldwq5z6flj5zl8a7cw52l";
-    })
-  ];
-
-  cmakeFlags = [
-    "-DEXAMPLES_INSTALL_PATH=${placeholder "out"}/share/examples"
-  ] ++ stdenv.lib.optionals (lapackSupport) [
-    "-DSUNDIALS_INDEX_TYPE=int32_t"
-    "-DLAPACK_ENABLE=ON"
-    "-DLAPACK_LIBRARIES=${liblapackShared}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary};${liblapackShared}/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}"
-  ];
-
-  # flaky tests, and patch in https://github.com/LLNL/sundials/pull/21 doesn't apply cleanly for sundials_3
-  doCheck = false;
-  checkPhase = "make test";
-
-  meta = with stdenv.lib; {
-    description = "Suite of nonlinear differential/algebraic equation solvers";
-    homepage    = https://computation.llnl.gov/projects/sundials;
-    platforms   = platforms.all;
-    maintainers = with maintainers; [ flokli idontgetoutmuch ];
-    license     = licenses.bsd3;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index dabbfcd6d49b..42478f38b84d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -423,6 +423,7 @@ mapAliases ({
   smbclient = samba; # added 2018-04-25
   slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11
   slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11
+  sundials_3 = throw "removed 2020-02. outdated and no longer needed";
   net_snmp = net-snmp; # added 2019-12-21
   spaceOrbit = space-orbit; # addewd 2016-05-23
   speech_tools = speech-tools; # added 2018-04-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8accbf10b664..34604e53a43d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14398,8 +14398,6 @@ in
 
   sundials = callPackage ../development/libraries/sundials { };
 
-  sundials_3 = callPackage ../development/libraries/sundials/3.x.nix { };
-
   sutils = callPackage ../tools/misc/sutils { };
 
   svrcore = callPackage ../development/libraries/svrcore { };
@@ -15414,7 +15412,7 @@ in
   miniHttpd = callPackage ../servers/http/mini-httpd {};
 
   mlflow-server = callPackage ../servers/mlflow-server { };
-  
+
   mlmmj = callPackage ../servers/mail/mlmmj { };
 
   moodle = callPackage ../servers/web-apps/moodle { };

From bd9a0f022efead53bab76da7819379d0d5ad4125 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 18 Feb 2020 18:00:00 -0500
Subject: [PATCH 1087/4636] vale: 1.7.1 -> 2.0.0

Changelog: https://github.com/errata-ai/vale/releases/tag/v2.0.0
---
 pkgs/tools/text/vale/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix
index 308f893e73b7..6035c2950a96 100644
--- a/pkgs/tools/text/vale/default.nix
+++ b/pkgs/tools/text/vale/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "vale";
-  version = "1.7.1";
+  version = "2.0.0";
 
   subPackages = [ "." ];
 
@@ -10,13 +10,15 @@ buildGoPackage rec {
     owner  = "errata-ai";
     repo   = "vale";
     rev    = "v${version}";
-    sha256 = "1qi3brjppiymk6as0xic2n3bhq8g8qw1z8d9a24w60x9gp52yq5m";
+    sha256 = "068973ayd883kzkxl60lpammf3icjz090nw07kfccvhcf24x07bh";
   };
 
   goPackagePath = "github.com/errata-ai/vale";
 
+  buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
+
   meta = with stdenv.lib; {
-    homepage = https://errata-ai.github.io/vale/;
+    homepage = "https://errata-ai.gitbook.io/vale/";
     description = "A syntax-aware linter for prose built with speed and extensibility in mind";
     license = licenses.mit;
     maintainers = [ maintainers.marsam ];

From 8df76db7390cef3db68b278fc18ad7bf8c75a1c6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Feb 2020 10:58:07 +0000
Subject: [PATCH 1088/4636] picard: 2.2.3 -> 2.3

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

diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index b40ab6d4f7a5..d6cf17c159f4 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -4,13 +4,13 @@ let
   pythonPackages = python3Packages;
 in pythonPackages.buildPythonApplication rec {
   pname = "picard";
-  version = "2.2.3";
+  version = "2.3";
 
   src = fetchFromGitHub {
     owner = "metabrainz";
     repo = pname;
     rev = "release-${version}";
-    sha256 = "0lb4pzl03mr5hrzrzva99rxqd5yfip62b7sjmlg4j0imw8mxaj16";
+    sha256 = "0msdnp6wh97lnm3m084jsvbp95h5d35y5fm71j64cgf4g39zp5ds";
   };
 
   nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ];

From a00f226244ae70129129c6fc4eb74e0c883e7ab3 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 19 Feb 2020 15:41:19 +0100
Subject: [PATCH 1089/4636] poetry2nix: fix typo fetchPyPi -> fetchPypi

nixpkgs' fetchPypi is called fetchPypi, not fetchPyPi.
---
 pkgs/development/tools/poetry2nix/poetry2nix/lib.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
index 68d854f26488..d49e6ce36db3 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
@@ -65,7 +65,7 @@ let
       else { pkg = []; str = null; };
 
   # Fetch the artifacts from the PyPI index. Since we get all
-  # info we need from the lock file we don't use nixpkgs' fetchPyPi
+  # info we need from the lock file we don't use nixpkgs' fetchPypi
   # as it modifies casing while not providing anything we don't already
   # have.
   #

From a803234213925fecfc14686ff08ac899ea144290 Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Wed, 19 Feb 2020 15:46:14 +0100
Subject: [PATCH 1090/4636] nixos/acme: Fix a.example.com test

---
 nixos/tests/acme.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix
index 732f41a4905d..e045f3415fa0 100644
--- a/nixos/tests/acme.nix
+++ b/nixos/tests/acme.nix
@@ -75,6 +75,7 @@ in import ./make-test-python.nix {
       systemd.services."acme-a.example.com" = {
         wants = [ "acme-finished-a.example.com.target" ];
         before = [ "acme-finished-a.example.com.target" ];
+        after = [ "nginx.service" ];
       };
 
       services.nginx.enable = true;

From e8343960a914cea6edf71c7be3a1feee4e690bcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 19 Feb 2020 14:58:43 +0000
Subject: [PATCH 1091/4636] hopper: libffi compatibility symlink

---
 pkgs/development/tools/analysis/hopper/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix
index 8bb1c5d04f87..f6c5dcaf1adb 100644
--- a/pkgs/development/tools/analysis/hopper/default.nix
+++ b/pkgs/development/tools/analysis/hopper/default.nix
@@ -8,6 +8,7 @@
 , gmpxx
 , ncurses5
 , gnustep
+, libffi
 }:
 stdenv.mkDerivation rec {
   pname = "hopper";
@@ -30,7 +31,6 @@ stdenv.mkDerivation rec {
     libbsd
     python27
     gmpxx
-
     ncurses5
     gnustep.libobjc
   ];
@@ -54,6 +54,9 @@ stdenv.mkDerivation rec {
       $sourceRoot/opt/hopper-${rev}/lib/libpthread_workqueue.so* \
       $out/lib
 
+    # we already ship libffi.so.7
+    ln -s ${lib.getLib libffi}/lib/libffi.so $out/lib/libffi.so.6
+
     cp -r $sourceRoot/usr/share $out
 
     runHook postInstall

From 720a81b46f07e41a7ad36cb53a29f85a73895eaa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Feb 2020 15:09:12 +0000
Subject: [PATCH 1092/4636] asdf: 3.3.3 -> 3.3.4

---
 pkgs/development/lisp-modules/asdf/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix
index 8d316d06fbbf..25d179fe9689 100644
--- a/pkgs/development/lisp-modules/asdf/default.nix
+++ b/pkgs/development/lisp-modules/asdf/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="asdf";
-    version="3.3.3";
+    version="3.3.4";
     name="${baseName}-${version}";
-    hash="1167445kmb0dbixc5l2r58cswg5s6jays0l1zxrk3aij0490bkgg";
-    url="http://common-lisp.net/project/asdf/archives/asdf-3.3.3.tar.gz";
-    sha256="1167445kmb0dbixc5l2r58cswg5s6jays0l1zxrk3aij0490bkgg";
+    hash="07npcxgq2m07w78k8gnz9i73kbw6ky2zh2pylhh9b69jvncdqkpy";
+    url="http://common-lisp.net/project/asdf/archives/asdf-3.3.4.tar.gz";
+    sha256="07npcxgq2m07w78k8gnz9i73kbw6ky2zh2pylhh9b69jvncdqkpy";
   };
   buildInputs = [
     texinfo texLive perl

From ed8df1d98ed72315ca59dd9f4be4e8efab3471e2 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 19 Feb 2020 16:39:36 +0100
Subject: [PATCH 1093/4636] php72: 7.2.26 -> 7.2.27

https://www.php.net/ChangeLog-7.php#7.2.27
---
 pkgs/development/interpreters/php/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 0fa605a4cac7..5febc96dff6e 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -263,8 +263,8 @@ let
 
 in {
   php72 = generic {
-    version = "7.2.26";
-    sha256 = "0yw49v3rk3cd0fb4gsli74pgd4qrykhn9c37dyfr3zsprzp8cvgk";
+    version = "7.2.27";
+    sha256 = "0jbhc8x2i6xx6p7zc30ahg9xplsqlz334m1w13mhr1qv2xdnkh2v";
 
     # https://bugs.php.net/bug.php?id=76826
     extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch;

From b55ded5d8bab83c20792db16a03201403023bb0d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 19 Feb 2020 16:40:44 +0100
Subject: [PATCH 1094/4636] php73: 7.3.13 -> 7.3.14

https://www.php.net/ChangeLog-7.php#7.3.14
---
 pkgs/development/interpreters/php/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 5febc96dff6e..b69d343de248 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -271,8 +271,8 @@ in {
   };
 
   php73 = generic {
-    version = "7.3.13";
-    sha256 = "1g376b9caw21mw8738z354llbzb3shzgc60m7naw7wql5038jysw";
+    version = "7.3.14";
+    sha256 = "0wn2qsfrnch90l8nxbpcjd2q0ijzdiiyhvcpbycngki9r6xwppxr";
 
     # https://bugs.php.net/bug.php?id=76826
     extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch;

From ade3e99a1da4b89cb2c2b3c81b646adef8ebe45b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 19 Feb 2020 16:41:44 +0100
Subject: [PATCH 1095/4636] php74: 7.4.1 -> 7.4.2

https://www.php.net/ChangeLog-7.php#7.4.2
---
 pkgs/development/interpreters/php/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index b69d343de248..911795cc1922 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -279,7 +279,7 @@ in {
   };
 
   php74 = generic {
-    version = "7.4.1";
-    sha256 = "0klfwhm2935ariwzqdri1fwh4a0vbrk3jis53qzi18isp3qa073b";
+    version = "7.4.2";
+    sha256 = "05p8z0ld058yjanxaphy3ka20hn7x7d6nak5sm782w4wprs9k402";
   };
 }

From ff80331317ac50b80c8cb15918421885d341d63e Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Tue, 10 Dec 2019 16:40:13 +0100
Subject: [PATCH 1096/4636] maintainers: add Luflosi

---
 maintainers/maintainer-list.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a9573c0a8a9a..04f0d882d8d2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4299,6 +4299,16 @@
     githubId = 1784379;
     name = "Kyohei Kadota";
   };
+  Luflosi = {
+    name = "Luflosi";
+    email = "luflosi@luflosi.de";
+    github = "Luflosi";
+    githubId = 15217907;
+    keys = [{
+      longkeyid = "rsa4096/0x6F987CCF224D20B9";
+      fingerprint = "66D1 3048 2B5F 2069 81A6  6B83 6F98 7CCF 224D 20B9";
+    }];
+  };
   luispedro = {
     email = "luis@luispedro.org";
     github = "luispedro";

From 2a15e3ba751d1f1a9337335262f3b3e26753c7b3 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Tue, 18 Feb 2020 16:51:31 +0100
Subject: [PATCH 1097/4636] kitty: better fix for build error

Without the `no-werror.patch`, the compilation would fail with the following warning:
```
clang-7: error: argument unused during compilation: '-fno-strict-overflow' [-Werror,-Wunused-command-line-argument]
```
To fix this, the compiler command line options `-pedantic-errors` and `-Werror` were patched out of the build script so that the warning would not become an error and stop the build. This is not ideal as this piece of code is changed fairly frequently, which requires fixing the patch. In the next kitty version the patch would need to be fixed again.
A better alternative is to just not pass `-fno-strict-overflow` to the compiler. This is done by disabling the `strictoverflow` hardening feature.
---
 pkgs/applications/misc/kitty/default.nix     |  6 ++++--
 pkgs/applications/misc/kitty/no-werror.patch | 11 -----------
 2 files changed, 4 insertions(+), 13 deletions(-)
 delete mode 100644 pkgs/applications/misc/kitty/no-werror.patch

diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 188e902614fa..cdba8c3f686b 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -74,10 +74,12 @@ buildPythonApplication rec {
     })
   ] ++ stdenv.lib.optionals stdenv.isDarwin [
     ./no-lto.patch
-    ./no-werror.patch
     ./png2icns.patch
   ];
 
+  # Causes build failure due to warning
+  hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow";
+
   buildPhase = if stdenv.isDarwin then ''
     ${python.interpreter} setup.py kitty.app --update-check-interval=0
   '' else ''
@@ -123,6 +125,6 @@ buildPythonApplication rec {
     description = "A modern, hackable, featureful, OpenGL based terminal emulator";
     license = licenses.gpl3;
     platforms = platforms.darwin ++ platforms.linux;
-    maintainers = with maintainers; [ tex rvolosatovs ma27 ];
+    maintainers = with maintainers; [ tex rvolosatovs ma27 Luflosi ];
   };
 }
diff --git a/pkgs/applications/misc/kitty/no-werror.patch b/pkgs/applications/misc/kitty/no-werror.patch
deleted file mode 100644
index bc1b369d98d9..000000000000
--- a/pkgs/applications/misc/kitty/no-werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -217,7 +217,7 @@ def init_env(
-     cflags = os.environ.get(
-         'OVERRIDE_CFLAGS', (
-             '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11'
--            ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
-+            ' {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
-         ).format(
-             float_conversion,
-             optimize,

From 194f3aa4b548330af1bac5bc526e151a457d3db5 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Tue, 18 Feb 2020 03:57:05 +0100
Subject: [PATCH 1098/4636] mimalloc: 1.1.0 -> 1.6.1

---
 .../libraries/mimalloc/default.nix            | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix
index b3f63ec7e9b9..03a1e77e7bfb 100644
--- a/pkgs/development/libraries/mimalloc/default.nix
+++ b/pkgs/development/libraries/mimalloc/default.nix
@@ -7,39 +7,42 @@ let
 in
 stdenv.mkDerivation rec {
   pname   = "mimalloc";
-  version = "1.1.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner  = "microsoft";
     repo   = pname;
-    rev    = "refs/tags/v${version}";
-    sha256 = "1i8pwzpcmbf7dxncb984xrnczn1737xqhf1jaizlyw0k1hpiam4v";
+    rev    = "v${version}";
+    sha256 = "1zql498587wvb0gaavnzxj2zm535sgm22x0sjgl4ncfk7ragnv9c";
   };
 
   nativeBuildInputs = [ cmake ninja ];
   enableParallelBuilding = true;
   cmakeFlags = stdenv.lib.optional secureBuild [ "-DMI_SECURE=ON" ];
 
-  postInstall = ''
+  postInstall = let
+    rel = stdenv.lib.versions.majorMinor version;
+  in ''
     # first, install headers, that's easy
     mkdir -p $dev
     mv $out/lib/*/include $dev/include
 
     # move .a and .o files into place
-    mv $out/lib/mimalloc-1.0/libmimalloc*.a           $out/lib/libmimalloc.a
-    mv $out/lib/mimalloc-1.0/mimalloc*.o              $out/lib/mimalloc.o
+    find $out/lib
+    mv $out/lib/mimalloc-${rel}/libmimalloc*.a           $out/lib/libmimalloc.a
+    mv $out/lib/mimalloc-${rel}/mimalloc*.o              $out/lib/mimalloc.o
 
   '' + (if secureBuild then ''
-    mv $out/lib/mimalloc-1.0/libmimalloc-secure${soext}.1.0 $out/lib/libmimalloc-secure${soext}.1.0
-    ln -sfv $out/lib/libmimalloc-secure${soext}.1.0 $out/lib/libmimalloc-secure${soext}
-    ln -sfv $out/lib/libmimalloc-secure${soext}.1.0 $out/lib/libmimalloc${soext}
+    mv $out/lib/mimalloc-${rel}/libmimalloc-secure${soext}.${rel} $out/lib/libmimalloc-secure${soext}.${rel}
+    ln -sfv $out/lib/libmimalloc-secure${soext}.${rel} $out/lib/libmimalloc-secure${soext}
+    ln -sfv $out/lib/libmimalloc-secure${soext}.${rel} $out/lib/libmimalloc${soext}
   '' else ''
-    mv $out/lib/mimalloc-1.0/libmimalloc${soext}.1.0 $out/lib/libmimalloc${soext}.1.0
-    ln -sfv $out/lib/libmimalloc${soext}.1.0 $out/lib/libmimalloc${soext}
+    mv $out/lib/mimalloc-${rel}/libmimalloc${soext}.${rel} $out/lib/libmimalloc${soext}.${rel}
+    ln -sfv $out/lib/libmimalloc${soext}.${rel} $out/lib/libmimalloc${soext}
   '') + ''
     # remote duplicate dir. FIXME: try to fix the .cmake file distribution
     # so we can re-use it for dependencies...
-    rm -rf $out/lib/mimalloc-1.0
+    rm -rf $out/lib/mimalloc-${rel}
   '';
 
   outputs = [ "out" "dev" ];
@@ -50,5 +53,6 @@ stdenv.mkDerivation rec {
     license     = licenses.bsd2;
     platforms   = platforms.unix;
     maintainers = with maintainers; [ thoughtpolice ];
+    badPlatforms = platforms.darwin;
   };
 }

From 890c3191d79edd652758dac1515f6d12c83f6aa8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Feb 2020 15:59:36 +0000
Subject: [PATCH 1099/4636] abcm2ps: 8.14.6 -> 8.14.7

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

diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix
index 575517829fff..4a824050c9fd 100644
--- a/pkgs/tools/audio/abcm2ps/default.nix
+++ b/pkgs/tools/audio/abcm2ps/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "abcm2ps";
-  version = "8.14.6";
+  version = "8.14.7";
 
   src = fetchFromGitHub {
     owner = "leesavide";
     repo = "abcm2ps";
     rev = "v${version}";
-    sha256 = "1gqjqbd8wj0655vi8gcg2r5jqzafdlnfjzwa9z331ywhrskpm53w";
+    sha256 = "0k12wf37vl31w2qpj3dsmv8c4ifrsg3qa30gqsx553jw7n0f3ma2";
   };
 
   configureFlags = [

From 5b51c88b5b95df07cc3fca6f0fc9839ab0968452 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Feb 2020 17:05:53 +0000
Subject: [PATCH 1100/4636] anydesk: 5.5.1 -> 5.5.2

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

diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix
index 573752b5b533..8b194e53b445 100644
--- a/pkgs/applications/networking/remote/anydesk/default.nix
+++ b/pkgs/applications/networking/remote/anydesk/default.nix
@@ -5,7 +5,7 @@
 
 let
   sha256 = {
-    x86_64-linux = "1ysd8fwzm0360qs6ijr6l0y2agqb3njz20h7am1x4kxmhy8ravq9";
+    x86_64-linux = "0az7n4lhmd4pz0spjvyiwd4w1gnqbh8f1fvr1jinsssyq0j26ldj";
     i386-linux   = "0vjxbg5hwkqkh600rr75xviwy848r1xw9mxwf6bb6l8b0isvlsgg";
   }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported");
 
@@ -28,7 +28,7 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "anydesk";
-  version = "5.5.1";
+  version = "5.5.2";
 
   src = fetchurl {
     urls = [

From 170f42098d2144fe11d90d9788852332c2dd71d9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Feb 2020 19:05:34 +0000
Subject: [PATCH 1101/4636] cvs_fast_export: 1.50 -> 1.51

---
 .../version-management/cvs-fast-export/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix
index 81b779f02069..fd4c9793d38b 100644
--- a/pkgs/applications/version-management/cvs-fast-export/default.nix
+++ b/pkgs/applications/version-management/cvs-fast-export/default.nix
@@ -7,7 +7,7 @@ with stdenv; with lib;
 mkDerivation rec {
   name = "cvs-fast-export-${meta.version}";
   meta = {
-    version = "1.50";
+    version = "1.51";
     description = "Export an RCS or CVS history as a fast-import stream";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ dfoxfranke ];
@@ -16,8 +16,8 @@ mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.50.tar.gz";
-    sha256 = "01m5l9xnl387hpyik5jvyhghkffj5v1wyxqpxpjxv69q9ly905yk";
+    url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.51.tar.gz";
+    sha256 = "0nn5cf8syb5nbjvkn8w561pk25clv187h4hs9pnc700g9w56chzf";
   };
 
   buildInputs = [

From b756e7282d01aebf081e52258d30e3da4f88099f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Feb 2020 19:25:51 +0000
Subject: [PATCH 1102/4636] eternal-terminal: 6.0.5 -> 6.0.6

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

diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix
index 8dd18df28c7e..7ee959905cee 100644
--- a/pkgs/tools/networking/eternal-terminal/default.nix
+++ b/pkgs/tools/networking/eternal-terminal/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "eternal-terminal";
-  version = "6.0.5";
+  version = "6.0.6";
 
   src = fetchFromGitHub {
     owner = "MisterTea";
     repo = "EternalTerminal";
     rev = "et-v${version}";
-    sha256 = "04jn0189vq5lc795izkxq1zdv9fnpxz2xchg2mm37armpz7n06id";
+    sha256 = "0vhhiccyvp9pjdmmscwdwcynxfwd2kgv418z90blnir0yfkvsryq";
   };
 
   nativeBuildInputs = [ cmake ];

From bacb0969f215faf1ef51ee68bad35b273bc0b418 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 18 Feb 2020 01:04:50 +0100
Subject: [PATCH 1103/4636] maintainers/scripts/update.nix: allow updating
 overlays

---
 maintainers/scripts/update.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix
index bbc3004b1c4e..7c45e148e822 100755
--- a/maintainers/scripts/update.nix
+++ b/maintainers/scripts/update.nix
@@ -2,6 +2,7 @@
 , maintainer ? null
 , path ? null
 , max-workers ? null
+, include-overlays ? false
 , keep-going ? null
 }:
 
@@ -20,9 +21,7 @@ let
       in
         [x] ++ nubOn f xs;
 
-  pkgs = import ./../../default.nix {
-    overlays = [];
-  };
+  pkgs = import ./../../default.nix (if include-overlays then { } else { overlays = []; });
 
   packagesWith = cond: return: set:
     nubOn (pkg: pkg.updateScript)

From d0e817f63fea1a609ae58bff958f4972c5b477be Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Wed, 19 Feb 2020 14:28:05 -0500
Subject: [PATCH 1104/4636] phpPackages.pdo_oci: init

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index e439ebe71881..eb0ddf2dc29f 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -287,6 +287,20 @@ let
     meta.broken = isPhp74; # Build error
   };
 
+  pdo_oci = buildPecl rec {
+    inherit (php) src version;
+
+    pname = "pdo_oci";
+    sourceRoot = "php-${version}/ext/pdo_oci";
+
+    buildInputs = [ pkgs.oracle-instantclient ];
+    configureFlags = [ "--with-pdo-oci=instantclient,${pkgs.oracle-instantclient.lib}/lib" ];
+
+    postPatch = ''
+      sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4
+    '';
+  };
+
   pdo_sqlsrv = buildPecl {
     version = "5.8.0";
     pname = "pdo_sqlsrv";

From 896f19d28c6712b66c499379481256aabef401f3 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 19 Feb 2020 11:54:25 +0200
Subject: [PATCH 1105/4636] brotab: 1.1.0 -> 1.2.1

Cleanup and fix deps a little bit.
---
 pkgs/tools/misc/brotab/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/brotab/default.nix b/pkgs/tools/misc/brotab/default.nix
index 2b6274c631da..7e827f007eb9 100644
--- a/pkgs/tools/misc/brotab/default.nix
+++ b/pkgs/tools/misc/brotab/default.nix
@@ -1,29 +1,32 @@
 { lib, fetchFromGitHub, glibcLocales, python }:
 
 python.pkgs.buildPythonApplication rec {
-  version = "1.1.0";
+  version = "1.2.1";
   pname = "brotab";
 
   src = fetchFromGitHub {
     owner = "balta2ar";
     repo = pname;
     rev = version;
-    sha256 = "17yj5i8p28a7zmixdfa1i4gfc7c2fmdkxlymazasar58dz8m68mw";
+    sha256 = "14yz0szwzdjvwkw24rma34y6iiwnw9qzsm89gkglc0xxa6msg6j3";
   };
 
   propagatedBuildInputs = with python.pkgs; [
     requests
     flask
-    requests
-    pytest
     psutil
+    setuptools
+  ];
+
+  checkBuildInputs = with python.pkgs; [
+    pytest
   ];
 
   # test_integration.py requires Chrome browser session
   checkPhase = ''
     ${python.interpreter} -m unittest brotab/tests/test_{brotab,utils}.py
   '';
-  
+
   meta = with lib; {
     homepage = "https://github.com/balta2ar/brotab";
     description = "Control your browser's tabs from the command line";

From 24bc04b9d27c2e743b6d3afe6dac80c4a49af3f2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Feb 2020 01:56:16 +0000
Subject: [PATCH 1106/4636] bmake: 20181221 -> 20200212

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

diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix
index d895261c4b5b..ed1e6a174ce4 100644
--- a/pkgs/development/tools/build-managers/bmake/default.nix
+++ b/pkgs/development/tools/build-managers/bmake/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bmake";
-  version = "20181221";
+  version = "20200212";
 
   src = fetchurl {
     url    = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz";
-    sha256 = "0zp6yy27z52qb12bgm3hy1dwal2i570615pqqk71zwhcxfs4h2gw";
+    sha256 = "134ibplk5rj7s3ig2czbhqs89l45jl6vswg3cy6xzm0anz5smhb2";
   };
 
   nativeBuildInputs = [ getopt ];

From c8a873560fa002b713d90259c31ac3d05eddb416 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Wed, 19 Feb 2020 12:27:29 -0800
Subject: [PATCH 1107/4636] nixos/tinydns: use local dns server to fix test

---
 nixos/tests/tinydns.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/tinydns.nix b/nixos/tests/tinydns.nix
index c7740d5ade35..b80e3451700a 100644
--- a/nixos/tests/tinydns.nix
+++ b/nixos/tests/tinydns.nix
@@ -21,6 +21,6 @@ import ./make-test-python.nix ({ lib, ...} : {
   testScript = ''
     nameserver.start()
     nameserver.wait_for_unit("tinydns.service")
-    nameserver.succeed("host bla.foo.bar | grep '1\.2\.3\.4'")
+    nameserver.succeed("host bla.foo.bar 192.168.1.1 | grep '1\.2\.3\.4'")
   '';
 })

From e49c0a0976eede0292f54089711e590d0ff15636 Mon Sep 17 00:00:00 2001
From: Milan Svoboda <milan.svoboda@centrum.cz>
Date: Wed, 19 Feb 2020 21:36:28 +0100
Subject: [PATCH 1108/4636] freeorion: fix build fail

fixes #79805
---
 pkgs/games/freeorion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix
index 527e41680831..e32943fa8be8 100644
--- a/pkgs/games/freeorion/default.nix
+++ b/pkgs/games/freeorion/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, doxygen, graphviz, makeWrapper
-, boost, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff
+, boost168, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff
 , libjpeg, libGLU, libGL, glew, libxslt
 }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-	(boost.override { enablePython = true; })
+	(boost168.override { enablePython = true; })
     SDL2 python2 freetype openal libogg libvorbis zlib libpng libtiff libjpeg libGLU libGL glew ];
 
   nativeBuildInputs = [ cmake doxygen graphviz makeWrapper ];

From 848a79ae668579f20d3ebae41d5fc83a35ddd19f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Feb 2020 20:49:35 +0000
Subject: [PATCH 1109/4636] fava: 1.12 -> 1.13

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

diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix
index 6693d35dbd1d..d62c6c0e4cc8 100644
--- a/pkgs/applications/office/fava/default.nix
+++ b/pkgs/applications/office/fava/default.nix
@@ -5,11 +5,11 @@ let
 in
 buildPythonApplication rec {
   pname = "fava";
-  version = "1.12";
+  version = "1.13";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0309y25l7aijk7il9hpjia23yc5dfac0h78xdmzb0w0ynxbjsmi6";
+    sha256 = "1pjfa5xb2imhcf7q037h8g0bp9nrnj1xyblgqphnjnz6hbr58a59";
   };
 
   checkInputs = [ python3.pkgs.pytest ];

From ef712ff2f5eed5d350d26b28fd1fb8eed5f37e22 Mon Sep 17 00:00:00 2001
From: hlolli <hlolli@gmail.com>
Date: Wed, 19 Feb 2020 23:16:40 +0100
Subject: [PATCH 1110/4636] lumo 1.9.0 -> 1.10.1 plus darwin support

---
 .../clojurescript/lumo/default.nix            |  244 +-
 .../interpreters/clojurescript/lumo/deps.edn  |    8 +-
 .../interpreters/clojurescript/lumo/deps.nix  |  435 ++--
 .../clojurescript/lumo/mkdir_promise.patch    |   20 +
 .../clojurescript/lumo/no_mangle.patch        |   13 +
 .../clojurescript/lumo/package.json           |   45 +-
 pkgs/development/node-packages/node-env.nix   |    2 +-
 .../node-packages/node-packages-v10.nix       | 2072 +++++++++--------
 pkgs/top-level/all-packages.nix               |    2 +-
 9 files changed, 1465 insertions(+), 1376 deletions(-)
 create mode 100644 pkgs/development/interpreters/clojurescript/lumo/mkdir_promise.patch
 create mode 100644 pkgs/development/interpreters/clojurescript/lumo/no_mangle.patch

diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix
index 0e9d81d5e959..23dd19b6114e 100644
--- a/pkgs/development/interpreters/clojurescript/lumo/default.nix
+++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix
@@ -1,18 +1,30 @@
-{ stdenv, lib, fetchurl, clojure,
-  nodejs, jre, unzip,  nodePackages,
-  python, openssl, pkgs }:
+{ stdenv
+, lib
+, fetchurl
+, clojure
+, gnutar
+, nodejs
+, jre
+, unzip
+, nodePackages
+, xcbuild
+, python
+, openssl
+, pkgs
+, fetchgit
+, darwin
+}:
+let
+  version = "1.10.1";
+  nodeVersion = "11.13.0";
+  nodeSources = fetchurl {
+    url = "https://nodejs.org/dist/v${nodeVersion}/node-v${nodeVersion}.tar.gz";
+    sha256 = "1cjzjbshxnysxkvbf41p3m8298cnhs9kfvdczgvvvlp6w16x4aac";
+  };
+  lumo-internal-classpath = "LUMO__INTERNAL__CLASSPATH";
 
-let # packageJSON=./package.json;
-    version = "1.9.0";
-    nodeVersion = "10.9.0";
-    nodeSources = fetchurl {
-      url="https://nodejs.org/dist/v${nodeVersion}/node-v${nodeVersion}.tar.gz";
-      sha256="0wgawq3wzw07pir73bxz13dggcc1fj0538y7y69n3cc0a2kiplqy";
-    };
-    lumo-internal-classpath = "LUMO__INTERNAL__CLASSPATH";
-
-    # as found in cljs/snapshot/lumo/repl.cljs
-    requireDeps = '' \
+  # as found in cljs/snapshot/lumo/repl.cljs
+  requireDeps = '' \
       cljs.analyzer \
       cljs.compiler \
       cljs.env \
@@ -50,104 +62,125 @@ let # packageJSON=./package.json;
       lumo.js-deps \
       lumo.common '';
 
-    compileClojurescript = (simple: ''
-      (require '[cljs.build.api :as cljs])
-      (cljs/build \"src/cljs/snapshot\"
-        {:optimizations      ${if simple then ":simple" else ":none"}
-         :main               'lumo.core
-         :cache-analysis     true
-         :source-map         false
-         :dump-core          false
-         :static-fns         true
-         :optimize-constants false
-         :npm-deps           false
-         :verbose            true
-         :closure-defines    {'cljs.core/*target*       \"nodejs\"
-                              'lumo.core/*lumo-version* \"${version}\"}
-         :compiler-stats     true
-         :process-shim       false
-         :fn-invoke-direct   true
-         :parallel-build     false
-         :browser-repl       false
-         :target             :nodejs
-         :hashbang           false
-         ;; :libs               [ \"src/cljs/bundled\" \"src/js\" ]
-         :output-dir         ${if simple
-                                    then ''\"cljstmp\"''
-                                  else ''\"target\"''}
-         :output-to          ${if simple
-                                    then ''\"cljstmp/main.js\"''
-                                  else ''\"target/deleteme.js\"'' }})
-    '');
+  compileClojurescript = (simple: ''
+    (require '[cljs.build.api :as cljs])
+    (cljs/build \"src/cljs/snapshot\"
+      {:optimizations      ${if simple then ":simple" else ":none"}
+       :main               'lumo.core
+       :cache-analysis     true
+       :source-map         false
+       :dump-core          false
+       :static-fns         true
+       :optimize-constants false
+       :npm-deps           false
+       :verbose            true
+       :closure-defines    {'cljs.core/*target*       \"nodejs\"
+                            'lumo.core/*lumo-version* \"${version}\"}
+       :compiler-stats     true
+       :process-shim       false
+       :fn-invoke-direct   true
+       :parallel-build     false
+       :browser-repl       false
+       :target             :nodejs
+       :hashbang           false
+       ;; :libs               [ \"src/cljs/bundled\" \"src/js\" ]
+       :output-dir         ${if simple
+  then ''\"cljstmp\"''
+  else ''\"target\"''}
+       :output-to          ${if simple
+  then ''\"cljstmp/main.js\"''
+  else ''\"target/deleteme.js\"'' }})
+  ''
+  );
 
 
-    cacheToJsons = ''
-      (import [java.io ByteArrayOutputStream FileInputStream])
-      (require '[cognitect.transit :as transit]
-               '[clojure.edn :as edn]
-               '[clojure.string :as str])
+  cacheToJsons = ''
+    (import [java.io ByteArrayOutputStream FileInputStream])
+    (require '[cognitect.transit :as transit]
+             '[clojure.edn :as edn]
+             '[clojure.string :as str])
 
-      (defn write-transit-json [cache]
-        (let [out (ByteArrayOutputStream. 1000000)
-              writer (transit/writer out :json)]
-          (transit/write writer cache)
-          (.toString out)))
+    (defn write-transit-json [cache]
+      (let [out (ByteArrayOutputStream. 1000000)
+            writer (transit/writer out :json)]
+        (transit/write writer cache)
+        (.toString out)))
 
-      (defn process-caches []
-        (let [cache-aot-path      \"target/cljs/core.cljs.cache.aot.edn\"
-              cache-aot-edn       (edn/read-string (slurp cache-aot-path))
-              cache-macros-path   \"target/cljs/core\$macros.cljc.cache.json\"
-              cache-macros-stream (FileInputStream. cache-macros-path)
-              cache-macros-edn    (transit/read (transit/reader cache-macros-stream :json))
-              caches              [[cache-aot-path cache-aot-edn]
-                                   [cache-macros-path cache-macros-edn]]]
-          (doseq [[path cache-edn] caches]
-            (doseq [key (keys cache-edn)]
-              (let [out-path (str/replace path #\"(\.json|\.edn)\$\"
-                               (str \".\" (munge key) \".json\"))
-                    tr-json  (write-transit-json (key cache-edn))]
-                (spit out-path tr-json))))))
+    (defn process-caches []
+      (let [cache-aot-path      \"target/cljs/core.cljs.cache.aot.edn\"
+            cache-aot-edn       (edn/read-string (slurp cache-aot-path))
+            cache-macros-path   \"target/cljs/core\$macros.cljc.cache.json\"
+            cache-macros-stream (FileInputStream. cache-macros-path)
+            cache-macros-edn    (transit/read (transit/reader cache-macros-stream :json))
+            caches              [[cache-aot-path cache-aot-edn]
+                                 [cache-macros-path cache-macros-edn]]]
+        (doseq [[path cache-edn] caches]
+          (doseq [key (keys cache-edn)]
+            (let [out-path (str/replace path #\"(\.json|\.edn)\$\"
+                             (str \".\" (munge key) \".json\"))
+                  tr-json  (write-transit-json (key cache-edn))]
+              (spit out-path tr-json))))))
 
-      (process-caches)
-    '';
+    (process-caches)
+  '';
 
-    trimMainJsEnd = ''
-      (let [string (slurp \"target/main.js\")]
-        (spit \"target/main.js\"
-          (subs string  0 (.indexOf string \"cljs.nodejs={};\"))))
-    '';
+  trimMainJsEnd = ''
+    (let [string (slurp \"target/main.js\")]
+      (spit \"target/main.js\"
+        (subs string  0 (.indexOf string \"cljs.nodejs={};\"))))
+  '';
 
 
-    cljdeps   = import ./deps.nix { inherit pkgs; };
-    classp    = cljdeps.makeClasspaths {
-                  extraClasspaths=["src/js" "src/cljs/bundled" "src/cljs/snapshot"];
-                };
-    
-
-    getJarPath = jarName: (lib.findFirst (p: p.name == jarName) null cljdeps.packages).path.jar;
-
-in stdenv.mkDerivation {
-  inherit version;
-  pname = "lumo";
-
-  src = fetchurl {
-    url    = "https://github.com/anmonteiro/lumo/archive/${version}.tar.gz";
-    sha256 = "1mr3zjslznhv7y3mzvg1pmmvzn10d6di26izz4x8p4nfnshacwgw";
+  cljdeps = import ./deps.nix { inherit pkgs; };
+  classp = cljdeps.makeClasspaths {
+    extraClasspaths = [ "src/js" "src/cljs/bundled" "src/cljs/snapshot" ];
   };
 
 
-  buildInputs = [ nodejs clojure jre unzip python openssl
-                  nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo" ];
+  getJarPath = jarName: (lib.findFirst (p: p.name == jarName) null cljdeps.packages).path.jar;
+in
+stdenv.mkDerivation {
+  inherit version;
+  pname = "lumo";
+
+  src = fetchgit {
+    url = "https://github.com/anmonteiro/lumo.git";
+    rev = "${version}";
+    sha256 = "12agi6bacqic2wq6q3l28283badzamspajmajzqm7fbdl2aq1a4p";
+  };
+
+  buildInputs = [
+    nodejs
+    clojure
+    jre
+    unzip
+    python
+    openssl
+    gnutar
+    nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo"
+  ]
+  ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+    ApplicationServices
+    xcbuild
+  ]
+  );
+
+  patches = [ ./no_mangle.patch ./mkdir_promise.patch ];
+
+  postPatch = ''
+    substituteInPlace $NIX_BUILD_TOP/lumo/vendor/nexe/exe.js \
+      --replace 'glob.sync(dir + "/*")' 'glob.sync(dir + "/../*")'
+  '';
 
   buildPhase = ''
-    # Copy over lumo-build-deps environment
+       # Copy over lumo-build-deps environment
     rm yarn.lock
     cp -rf ${nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo"}/lib/node_modules/lumo-build-deps/* ./
 
     # configure clojure-cli
     mkdir ./.cpcache
     export CLJ_CONFIG=`pwd`
-    export CLJ_CACHE=`pwd`/.cpcache 
+    export CLJ_CACHE=`pwd`/.cpcache
 
     # require more namespaces for cljs-bundle
     sed -i "s!ns lumo.core! \
@@ -155,7 +188,7 @@ in stdenv.mkDerivation {
                (:require ${requireDeps}) \
                (:require-macros [clojure.template :as temp] \
                                 [cljs.test :as test])!g" \
-              ./src/cljs/snapshot/lumo/core.cljs          
+              ./src/cljs/snapshot/lumo/core.cljs
 
     # Step 1: compile clojurescript with :none and :simple
     ${clojure}/bin/clojure -Scp ${classp} -e "${compileClojurescript true}"
@@ -204,10 +237,13 @@ in stdenv.mkDerivation {
     # Step 3: generate munged cache jsons
     ${clojure}/bin/clojure -Scp ${classp} -e "${cacheToJsons}"
     rm  ./target/cljs/core\$macros\.cljc\.cache\.json
-    
+
 
     # Step 4: Bunde javascript
+echo 1111
+cat scripts/bundle.js
     NODE_ENV=production node scripts/bundle.js
+echo 2222
     node scripts/bundleForeign.js
 
     # Step 5: Backup resources
@@ -215,21 +251,20 @@ in stdenv.mkDerivation {
 
     # Step 6: Package executeable 1st time
     # fetch node sources and copy to palce that nexe will find
-    mkdir -p tmp/${nodeVersion}
-    cp ${nodeSources} tmp/${nodeVersion}/node-${nodeVersion}.tar.gz
-    tar -C ./tmp/${nodeVersion} -xf ${nodeSources}
-    mv ./tmp/${nodeVersion}/node-v${nodeVersion}/* ./tmp/${nodeVersion}/
+    mkdir -p tmp/node/${nodeVersion}
+    cp ${nodeSources} tmp/node/${nodeVersion}/node-${nodeVersion}.tar.gz
+    tar -C ./tmp/node/${nodeVersion} -xf ${nodeSources} --warning=no-unknown-keyword
+    mv ./tmp/node/${nodeVersion}/node-v${nodeVersion}/* ./tmp/node/${nodeVersion}/
     rm -rf ${lumo-internal-classpath}
-    mv target ${lumo-internal-classpath}
+    cp -rf target ${lumo-internal-classpath}
     node scripts/package.js ${nodeVersion}
-    rm -rf ${lumo-internal-classpath}
+    rm -rf target
+    mv ${lumo-internal-classpath} target
 
     # Step 7: AOT Macros
     sh scripts/aot-bundle-macros.sh
 
     # Step 8: Package executeable 2nd time
-    rm -rf ${lumo-internal-classpath}
-    mv target ${lumo-internal-classpath}
     node scripts/package.js ${nodeVersion}
   '';
 
@@ -250,7 +285,6 @@ in stdenv.mkDerivation {
     homepage = https://github.com/anmonteiro/lumo;
     license = stdenv.lib.licenses.epl10;
     maintainers = [ stdenv.lib.maintainers.hlolli ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 }
-
diff --git a/pkgs/development/interpreters/clojurescript/lumo/deps.edn b/pkgs/development/interpreters/clojurescript/lumo/deps.edn
index e1563599a8cc..7a2faee1d7a5 100644
--- a/pkgs/development/interpreters/clojurescript/lumo/deps.edn
+++ b/pkgs/development/interpreters/clojurescript/lumo/deps.edn
@@ -1,12 +1,12 @@
 {:deps
- {org.clojure/clojure       {:mvn/version "1.10.0-beta5"}
-  org.clojure/clojurescript {:mvn/version "1.10.439"}
-  org.clojure/test.check    {:mvn/version "0.10.0-alpha3"}
+ {org.clojure/clojure       {:mvn/version "1.10.1"}
+  org.clojure/clojurescript {:mvn/version "1.10.520"}
+  org.clojure/test.check    {:mvn/version "0.10.0-alpha4"}
   org.clojure/tools.reader   {:mvn/version "1.3.2"
                               :exclusions  [org.clojure/clojure org.clojure/clojurescript]}
   com.cognitect/transit-cljs {:mvn/version "0.8.256"
                               :exclusions  [org.clojure/clojure org.clojure/clojurescript]}
   malabarba/lazy-map         {:mvn/version "1.3"
                               :exclusions  [org.clojure/clojure org.clojure/clojurescript]}
-  fipp                       {:mvn/version "0.6.14"
+  fipp                       {:mvn/version "0.6.17"
                               :exclusions  [org.clojure/clojure org.clojure/clojurescript]}}}
diff --git a/pkgs/development/interpreters/clojurescript/lumo/deps.nix b/pkgs/development/interpreters/clojurescript/lumo/deps.nix
index 3e53c7f98dd7..4f3beff3b819 100644
--- a/pkgs/development/interpreters/clojurescript/lumo/deps.nix
+++ b/pkgs/development/interpreters/clojurescript/lumo/deps.nix
@@ -1,241 +1,240 @@
-# generated by clj2nix-1.0.3
+# generated by clj2nix-1.0.4
 { pkgs }:
 
-  let repos = [
-        "https://repo.clojars.org/"
-        "https://repo1.maven.org/"
-        "http://central.maven.org/maven2/"
-        "http://oss.sonatype.org/content/repositories/releases/"
-        "http://oss.sonatype.org/content/repositories/public/"
-        "http://repo.typesafe.com/typesafe/releases/"
-      ];
+let repos = [
+      "https://repo.clojars.org/"
+      "https://repo1.maven.org/"
+      "http://oss.sonatype.org/content/repositories/releases/"
+      "http://oss.sonatype.org/content/repositories/public/"
+      "http://repo.typesafe.com/typesafe/releases/"
+    ];
 
-  in rec {
-      makePaths = {extraClasspaths ? []}: (builtins.map (dep: if builtins.hasAttr "jar" dep.path then dep.path.jar else dep.path) packages) ++ extraClasspaths;
-      makeClasspaths = {extraClasspaths ? []}: builtins.concatStringsSep ":" (makePaths {inherit extraClasspaths;});
+in rec {
+  makePaths = {extraClasspaths ? []}: (builtins.map (dep: if builtins.hasAttr "jar" dep.path then dep.path.jar else dep.path) packages) ++ extraClasspaths;
+  makeClasspaths = {extraClasspaths ? []}: builtins.concatStringsSep ":" (makePaths {inherit extraClasspaths;});
 
-      packages = [
-  {
-    name = "com.cognitect/transit-java";
-    path = pkgs.fetchMavenArtifact {
-      inherit repos;
-      artifactId = "transit-java";
-      groupId = "com.cognitect";
-      sha512 = "80365a4f244e052b6c4fdfd2fd3b91288835599cb4dd88e0e0dae19883dcda39afee83966810ed81beff342111c3a45a66f5601c443f3ad49904908c43631708";
-      version = "0.8.332";
-    };
-  }
+  packages = [
+    {
+      name = "com.cognitect/transit-java";
+      path = pkgs.fetchMavenArtifact {
+        inherit repos;
+        artifactId = "transit-java";
+        groupId = "com.cognitect";
+        sha512 = "80365a4f244e052b6c4fdfd2fd3b91288835599cb4dd88e0e0dae19883dcda39afee83966810ed81beff342111c3a45a66f5601c443f3ad49904908c43631708";
+        version = "0.8.332";
+      };
+    }
 
-  {
-    name = "org.clojure/data.json";
-    path = pkgs.fetchMavenArtifact {
-      inherit repos;
-      artifactId = "data.json";
-      groupId = "org.clojure";
-      sha512 = "ce526bef01bedd31b772954d921a61832ae60af06121f29080853f7932326438b33d183240a9cffbe57e00dc3744700220753948da26b8973ee21c30e84227a6";
-      version = "0.2.6";
-    };
-  }
+    {
+      name = "org.clojure/data.json";
+      path = pkgs.fetchMavenArtifact {
+        inherit repos;
+        artifactId = "data.json";
+        groupId = "org.clojure";
+        sha512 = "ce526bef01bedd31b772954d921a61832ae60af06121f29080853f7932326438b33d183240a9cffbe57e00dc3744700220753948da26b8973ee21c30e84227a6";
+        version = "0.2.6";
+      };
+    }
 
-  {
-    name = "org.clojure/clojure";
-    path = pkgs.fetchMavenArtifact {
-      inherit repos;
-      artifactId = "clojure";
-      groupId = "org.clojure";
-      sha512 = "f7a6b207b1bcbb6523d32ecfdd3c8c25d4d0b0a59c78baf06cdc69ba3c21c5e96b5dac8e9efcb331efd94e10bccbb9b54fca62a4312309db65a1f9d89d9da3f4";
-      version = "1.10.0-beta5";
-    };
-  }
+    {
+      name = "org.clojure/clojure";
+      path = pkgs.fetchMavenArtifact {
+        inherit repos;
+        artifactId = "clojure";
+        groupId = "org.clojure";
+        sha512 = "f28178179483531862afae13e246386f8fda081afa523d3c4ea3a083ab607d23575d38ecb9ec0ee7f4d65cbe39a119f680e6de4669bc9cf593aa92be0c61562b";
+        version = "1.10.1";
+      };
+    }
 
-  {
-    name = "commons-codec/commons-codec";
-    path = pkgs.fetchMavenArtifact {
-      inherit repos;
-      artifactId = "commons-codec";
-      groupId = "commons-codec";
-      sha512 = "8edecc0faf38e8620460909d8191837f34e2bb2ce853677c486c5e79bb79e88d043c3aed69c11f1365c4884827052ee4e1c18ca56e38d1a5bc0ce15c57daeee3";
-      version = "1.10";
-    };
-  }
+    {
+      name = "commons-codec/commons-codec";
+      path = pkgs.fetchMavenArtifact {
+        inherit repos;
+        artifactId = "commons-codec";
+        groupId = "commons-codec";
+        sha512 = "8edecc0faf38e8620460909d8191837f34e2bb2ce853677c486c5e79bb79e88d043c3aed69c11f1365c4884827052ee4e1c18ca56e38d1a5bc0ce15c57daeee3";
+        version = "1.10";
+      };
+    }
 
-  {
-    name = "com.google.errorprone/error_prone_annotations";
-    path = pkgs.fetchMavenArtifact {
-      inherit repos;
-      artifactId = "error_prone_annotations";
-      groupId = "com.google.errorprone";
-      sha512 = "bd2135cc9eb2c652658a2814ec9c565fa3e071d4cff590cbe17b853885c78c9f84c1b7b24ba736f4f30ed8cec60a6af983827fcbed61ff142f27ac808e97fc6b";
-      version = "2.1.3";
-    };
-  }
+    {
+      name = "com.google.errorprone/error_prone_annotations";
+      path = pkgs.fetchMavenArtifact {
+        inherit repos;
+        artifactId = "error_prone_annotations";
+        groupId = "com.google.errorprone";
+        sha512 = "bd2135cc9eb2c652658a2814ec9c565fa3e071d4cff590cbe17b853885c78c9f84c1b7b24ba736f4f30ed8cec60a6af983827fcbed61ff142f27ac808e97fc6b";
+        version = "2.1.3";
+      };
+    }
 
-  {
-    name = "org.clojure/core.specs.alpha";
-    path = pkgs.fetchMavenArtifact {
-      inherit repos;
-      artifactId = "core.specs.alpha";
-      groupId = "org.clojure";
-      sha512 = "348c0ea0911bc0dcb08655e61b97ba040649b4b46c32a62aa84d0c29c245a8af5c16d44a4fa5455d6ab076f4bb5bbbe1ad3064a7befe583f13aeb9e32a169bf4";
-      version = "0.2.44";
-    };
-  }
+    {
+      name = "org.clojure/core.specs.alpha";
+      path = pkgs.fetchMavenArtifact {
+        inherit repos;
+        artifactId = "core.specs.alpha";
+        groupId = "org.clojure";
+        sha512 = "348c0ea0911bc0dcb08655e61b97ba040649b4b46c32a62aa84d0c29c245a8af5c16d44a4fa5455d6ab076f4bb5bbbe1ad3064a7befe583f13aeb9e32a169bf4";
+        version = "0.2.44";
+      };
+    }
 
-  {
-    name = "org.clojure/spec.alpha";
-    path = pkgs.fetchMavenArtifact {
-      inherit repos;
-      artifactId = "spec.alpha";
-      groupId = "org.clojure";
-      sha512 = "18c97fb2b74c0bc2ff4f6dc722a3edec539f882ee85d0addf22bbf7e6fe02605d63f40c2b8a2905868ccd6f96cfc36a65f5fb70ddac31c6ec93da228a456edbd";
-      version = "0.2.176";
-    };
-  }
+    {
+      name = "org.clojure/spec.alpha";
+      path = pkgs.fetchMavenArtifact {
+        inherit repos;
+        artifactId = "spec.alpha";
+        groupId = "org.clojure";
+        sha512 = "18c97fb2b74c0bc2ff4f6dc722a3edec539f882ee85d0addf22bbf7e6fe02605d63f40c2b8a2905868ccd6f96cfc36a65f5fb70ddac31c6ec93da228a456edbd";
+        version = "0.2.176";
+      };
+    }
 
-  {
-    name = "org.codehaus.mojo/animal-sniffer-annotations";
-    path = pkgs.fetchMavenArtifact {
-      inherit repos;
-      artifactId = "animal-sniffer-annotations";
-      groupId = "org.codehaus.mojo";
-      sha512 = "9e5e3ea9e06e0ac9463869fd0e08ed38f7042784995a7b50c9bfd7f692a53f0e1430b9e1367dc772d0d4eafe5fd2beabbcc60da5008bd792f9e7ec8436c0f136";
-      version = "1.14";
-    };
-  }
+    {
+      name = "org.codehaus.mojo/animal-sniffer-annotations";
+      path = pkgs.fetchMavenArtifact {
+        inherit repos;
+        artifactId = "animal-sniffer-annotations";
+        groupId = "org.codehaus.mojo";
+        sha512 = "9e5e3ea9e06e0ac9463869fd0e08ed38f7042784995a7b50c9bfd7f692a53f0e1430b9e1367dc772d0d4eafe5fd2beabbcc60da5008bd792f9e7ec8436c0f136";
+        version = "1.14";
+      };
+    }
 
-  {
-    name = "com.googlecode.json-simple/json-simple";
-    path = pkgs.fetchMavenArtifact {
-      inherit repos;
-      artifactId = "json-simple";
-      groupId = "com.googlecode.json-simple";
-      sha512 = "f8798bfbcc8ab8001baf90ce47ec2264234dc1da2d4aa97fdcdc0990472a6b5a5a32f828e776140777d598a99d8a0c0f51c6d0767ae1a829690ab9200ae35742";
-      version = "1.1.1";
-    };
-  }
+    {
+      name = "com.googlecode.json-simple/json-simple";
+      path = pkgs.fetchMavenArtifact {
+        inherit repos;
+        artifactId = "json-simple";
+        groupId = "com.googlecode.json-simple";
+        sha512 = "f8798bfbcc8ab8001baf90ce47ec2264234dc1da2d4aa97fdcdc0990472a6b5a5a32f828e776140777d598a99d8a0c0f51c6d0767ae1a829690ab9200ae35742";
+        version = "1.1.1";
+      };
+    }
 
-  {
-    name = "com.cognitect/transit-cljs";
-    path = pkgs.fetchMavenArtifact {
-      inherit repos;
-      artifactId = "transit-cljs";
-      groupId = "com.cognitect";
-      sha512 = "318b98ddd63629f37b334bb90e625bc31ab6abcf0b1fa80d8e097551658f2d9219b5ee35869a31f2976d7d385da83bea0c07b0d097babcae241ecbd0fe8a7ecd";
-      version = "0.8.256";
-    };
-  }
+    {
+      name = "com.cognitect/transit-cljs";
+      path = pkgs.fetchMavenArtifact {
+        inherit repos;
+        artifactId = "transit-cljs";
+        groupId = "com.cognitect";
+        sha512 = "318b98ddd63629f37b334bb90e625bc31ab6abcf0b1fa80d8e097551658f2d9219b5ee35869a31f2976d7d385da83bea0c07b0d097babcae241ecbd0fe8a7ecd";
+        version = "0.8.256";
+      };
+    }
 
-  {
-    name = "org.clojure/google-closure-library";
-    path = pkgs.fetchMavenArtifact {
-      inherit repos;
-      artifactId = "google-closure-library";
-      groupId = "org.clojure";
-      sha512 = "75631182ef12f21723fe3eba1003d8cf9b8348a51512961e4e1b87bc24d8f3abb14a70c856f08cdaa5588a2d7c2b1b0c03aeaa3c4c5f2ed745a85f59ceeab83a";
-      version = "0.0-20170809-b9c14c6b";
-    };
-  }
+    {
+      name = "org.clojure/google-closure-library";
+      path = pkgs.fetchMavenArtifact {
+        inherit repos;
+        artifactId = "google-closure-library";
+        groupId = "org.clojure";
+        sha512 = "75631182ef12f21723fe3eba1003d8cf9b8348a51512961e4e1b87bc24d8f3abb14a70c856f08cdaa5588a2d7c2b1b0c03aeaa3c4c5f2ed745a85f59ceeab83a";
+        version = "0.0-20170809-b9c14c6b";
+      };
+    }
 
-  {
-    name = "fipp";
-    path = pkgs.fetchMavenArtifact {
-      inherit repos;
-      artifactId = "fipp";
-      groupId = "fipp";
-      sha512 = "155b5bb7045ac7c3a75c638e65464ca1fc90e5b4692328fc2da73b26792178fdbce5ab01ba0397e1986b6162b06b8904712d2c366f32ea43ea5fa2b454a526a5";
-      version = "0.6.14";
-    };
-  }
+    {
+      name = "fipp";
+      path = pkgs.fetchMavenArtifact {
+        inherit repos;
+        artifactId = "fipp";
+        groupId = "fipp";
+        sha512 = "d844ab63d28cb5e31657cc38e574bbc7072a78419c997f25445ac6ea4a719904a4f4844b37e3f664a8d2e49bd38ff1006a9e8c6e63fb4e2f0a2322d6c2638275";
+        version = "0.6.17";
+      };
+    }
 
-  {
-    name = "org.clojure/clojurescript";
-    path = pkgs.fetchMavenArtifact {
-      inherit repos;
-      artifactId = "clojurescript";
-      groupId = "org.clojure";
-      sha512 = "4aec5abdd48aaf95f7a729e11d225a99d02caa3a4ddff3e9e4f8db80dea83ab70a4440691cb372562c8c16e73c2850b22806a2851df3849c852fddd49b57fc58";
-      version = "1.10.439";
-    };
-  }
+    {
+      name = "org.clojure/clojurescript";
+      path = pkgs.fetchMavenArtifact {
+        inherit repos;
+        artifactId = "clojurescript";
+        groupId = "org.clojure";
+        sha512 = "b241959d6bd2ab659920965d301508226e26b3edcee469e4cd516cd4ed014b1a6b132c17ee7d96a8e66fe27fd01a74813ac8b85958d260f9fdbbeb4348d57ff1";
+        version = "1.10.520";
+      };
+    }
 
-  {
-    name = "com.google.jsinterop/jsinterop-annotations";
-    path = pkgs.fetchMavenArtifact {
-      inherit repos;
-      artifactId = "jsinterop-annotations";
-      groupId = "com.google.jsinterop";
-      sha512 = "b6fd98a9167d031f6bff571567d4658fda62c132dc74d47ca85e02c9bb3ce8812b1012c67f4c81501ab0cbd9ccd9cda5dcf32d306e04368ace7a173cecae975d";
-      version = "1.0.0";
-    };
-  }
+    {
+      name = "com.google.jsinterop/jsinterop-annotations";
+      path = pkgs.fetchMavenArtifact {
+        inherit repos;
+        artifactId = "jsinterop-annotations";
+        groupId = "com.google.jsinterop";
+        sha512 = "b6fd98a9167d031f6bff571567d4658fda62c132dc74d47ca85e02c9bb3ce8812b1012c67f4c81501ab0cbd9ccd9cda5dcf32d306e04368ace7a173cecae975d";
+        version = "1.0.0";
+      };
+    }
 
-  {
-    name = "com.fasterxml.jackson.core/jackson-core";
-    path = pkgs.fetchMavenArtifact {
-      inherit repos;
-      artifactId = "jackson-core";
-      groupId = "com.fasterxml.jackson.core";
-      sha512 = "a1bd6c264b9ab07aad3d0f26b65757e35ff47904ab895bb7f997e3e1fd063129c177ad6f69876907b04ff8a43c6b1770a26f53a811633a29e66a5dce57194f64";
-      version = "2.8.7";
-    };
-  }
+    {
+      name = "com.fasterxml.jackson.core/jackson-core";
+      path = pkgs.fetchMavenArtifact {
+        inherit repos;
+        artifactId = "jackson-core";
+        groupId = "com.fasterxml.jackson.core";
+        sha512 = "a1bd6c264b9ab07aad3d0f26b65757e35ff47904ab895bb7f997e3e1fd063129c177ad6f69876907b04ff8a43c6b1770a26f53a811633a29e66a5dce57194f64";
+        version = "2.8.7";
+      };
+    }
 
-  {
-    name = "malabarba/lazy-map";
-    path = pkgs.fetchMavenArtifact {
-      inherit repos;
-      artifactId = "lazy-map";
-      groupId = "malabarba";
-      sha512 = "ce56d6f03ac344579e15f062cdd4c477c0323da716d4d4106c4edb746959699e0b294b25aacf8ecf1579a6bdd5556a60f4bcb1648d22832984c069a0431c840f";
-      version = "1.3";
-    };
-  }
+    {
+      name = "malabarba/lazy-map";
+      path = pkgs.fetchMavenArtifact {
+        inherit repos;
+        artifactId = "lazy-map";
+        groupId = "malabarba";
+        sha512 = "ce56d6f03ac344579e15f062cdd4c477c0323da716d4d4106c4edb746959699e0b294b25aacf8ecf1579a6bdd5556a60f4bcb1648d22832984c069a0431c840f";
+        version = "1.3";
+      };
+    }
 
-  {
-    name = "com.cognitect/transit-js";
-    path = pkgs.fetchMavenArtifact {
-      inherit repos;
-      artifactId = "transit-js";
-      groupId = "com.cognitect";
-      sha512 = "6ca0978e633e41b45ff5a76df79099ba7c4900a8ca9f6acd2a903e4ab10a1ec0c83d4127009df9dac1337debaba01f7ff1d5cced1c2159c05ef94845f73f0623";
-      version = "0.8.846";
-    };
-  }
+    {
+      name = "com.cognitect/transit-js";
+      path = pkgs.fetchMavenArtifact {
+        inherit repos;
+        artifactId = "transit-js";
+        groupId = "com.cognitect";
+        sha512 = "6ca0978e633e41b45ff5a76df79099ba7c4900a8ca9f6acd2a903e4ab10a1ec0c83d4127009df9dac1337debaba01f7ff1d5cced1c2159c05ef94845f73f0623";
+        version = "0.8.846";
+      };
+    }
 
-  {
-    name = "org.mozilla/rhino";
-    path = pkgs.fetchMavenArtifact {
-      inherit repos;
-      artifactId = "rhino";
-      groupId = "org.mozilla";
-      sha512 = "466e7a76303ea191802b5e7adb3dff64c1d6283a25ce87447296b693b87b166f4cdd191ef7dc130a5739bfa0e4a81b08550f607c84eec167406d9be2225562dc";
-      version = "1.7R5";
-    };
-  }
+    {
+      name = "org.mozilla/rhino";
+      path = pkgs.fetchMavenArtifact {
+        inherit repos;
+        artifactId = "rhino";
+        groupId = "org.mozilla";
+        sha512 = "466e7a76303ea191802b5e7adb3dff64c1d6283a25ce87447296b693b87b166f4cdd191ef7dc130a5739bfa0e4a81b08550f607c84eec167406d9be2225562dc";
+        version = "1.7R5";
+      };
+    }
 
-  {
-    name = "org.clojure/google-closure-library-third-party";
-    path = pkgs.fetchMavenArtifact {
-      inherit repos;
-      artifactId = "google-closure-library-third-party";
-      groupId = "org.clojure";
-      sha512 = "57fa84fbbca3eb9e612d2842e4476b74f64d13dd076ffca6c9d9e15c4ca8a2f2c56cc19307bcad0ab5b4f9cb0c3e7900ccc845bd570ebc92e2633885ab621f35";
-      version = "0.0-20170809-b9c14c6b";
-    };
-  }
+    {
+      name = "org.clojure/google-closure-library-third-party";
+      path = pkgs.fetchMavenArtifact {
+        inherit repos;
+        artifactId = "google-closure-library-third-party";
+        groupId = "org.clojure";
+        sha512 = "57fa84fbbca3eb9e612d2842e4476b74f64d13dd076ffca6c9d9e15c4ca8a2f2c56cc19307bcad0ab5b4f9cb0c3e7900ccc845bd570ebc92e2633885ab621f35";
+        version = "0.0-20170809-b9c14c6b";
+      };
+    }
 
-  {
-    name = "com.google.javascript/closure-compiler-externs";
-    path = pkgs.fetchMavenArtifact {
-      inherit repos;
-      artifactId = "closure-compiler-externs";
-      groupId = "com.google.javascript";
-      sha512 = "1a47c8559144095c0b23a8e40acd7185625cea5a4c103eb75fbacd32d5809d087bfb60aaf57066329649c6017ec5f993756024e767a5b8f84926371ba6183a82";
-      version = "v20180805";
-    };
-  }
+    {
+      name = "com.google.javascript/closure-compiler-externs";
+      path = pkgs.fetchMavenArtifact {
+        inherit repos;
+        artifactId = "closure-compiler-externs";
+        groupId = "com.google.javascript";
+        sha512 = "1a47c8559144095c0b23a8e40acd7185625cea5a4c103eb75fbacd32d5809d087bfb60aaf57066329649c6017ec5f993756024e767a5b8f84926371ba6183a82";
+        version = "v20180805";
+      };
+    }
 
-  {
+    {
     name = "org.javassist/javassist";
     path = pkgs.fetchMavenArtifact {
       inherit repos;
@@ -307,8 +306,8 @@
       inherit repos;
       artifactId = "core.rrb-vector";
       groupId = "org.clojure";
-      sha512 = "5f737bf3ca3acf567b2b5c14b5761c8c38e94e1f6168f8cba9f46d2ae41334ae3d68d2c00663827a6214094d96b9767f6803f66ab44b0012c6f2e3c2997b1796";
-      version = "0.0.13";
+      sha512 = "4e410c4a90a869e98d5d69a8a6dd6427e9d77b70e1a2b54cf24baf23389f22e7a208375783c2fdc5c1a5acfb8511a5c5ed57ad1a946d5bffd203f453d90a6155";
+      version = "0.0.14";
     };
   }
 
@@ -351,8 +350,8 @@
       inherit repos;
       artifactId = "test.check";
       groupId = "org.clojure";
-      sha512 = "bf57571a9d31d50cf15b38134f4d7c34d03eb458bc62b30c7a1dbf233e300c67f1fda6673dbd1584a0497cf8875f972e6697e7f13d0c3e70e4254697b1b75cc6";
-      version = "0.10.0-alpha3";
+      sha512 = "60fa3bd38c32cf193c573f1bd47c6abd7e7a5bb2fc7f7f9f97aa9dcd54d5e2eab9e351f5f83b01bb96b32811a9f2f5ab384c6b7b7ebbb6c86d1ad4f2789351bf";
+      version = "0.10.0-alpha4";
     };
   }
 
diff --git a/pkgs/development/interpreters/clojurescript/lumo/mkdir_promise.patch b/pkgs/development/interpreters/clojurescript/lumo/mkdir_promise.patch
new file mode 100644
index 000000000000..e9504bb5c1a0
--- /dev/null
+++ b/pkgs/development/interpreters/clojurescript/lumo/mkdir_promise.patch
@@ -0,0 +1,20 @@
+diff --git a/vendor/nexe/exe.js b/vendor/nexe/exe.js
+index 21e78bb..ecbfca4 100644
+--- a/vendor/nexe/exe.js
++++ b/vendor/nexe/exe.js
+@@ -254,9 +254,7 @@ return initModule._compile(${JSON.stringify(source)}, process.execPath);
+      */
+ 
+     function makeOutputDirectory(next) {
+-      mkdirp(path.dirname(options.output), function() {
+-        next();
+-      });
++        mkdirp(path.dirname(options.output)).then(() => next());
+     },
+ 
+     /**
+@@ -1107,4 +1105,3 @@ exports.package = function(path, options) {
+ 
+   return obj;
+ }
+-
diff --git a/pkgs/development/interpreters/clojurescript/lumo/no_mangle.patch b/pkgs/development/interpreters/clojurescript/lumo/no_mangle.patch
new file mode 100644
index 000000000000..9af223411958
--- /dev/null
+++ b/pkgs/development/interpreters/clojurescript/lumo/no_mangle.patch
@@ -0,0 +1,13 @@
+diff --git a/scripts/bundle.js b/scripts/bundle.js
+index 16425a4..0d510fc 100644
+--- a/scripts/bundle.js
++++ b/scripts/bundle.js
+@@ -73,6 +73,8 @@ const plugins = [
+ if (!isDevBuild) {
+   plugins.push(
+     babelMinify({
++     evaluate: false,
++      mangle: false,
+       comments: false,
+       removeConsole: true,
+       removeDebugger: true,
diff --git a/pkgs/development/interpreters/clojurescript/lumo/package.json b/pkgs/development/interpreters/clojurescript/lumo/package.json
index cfffdc890d1e..6ab3f9616c78 100644
--- a/pkgs/development/interpreters/clojurescript/lumo/package.json
+++ b/pkgs/development/interpreters/clojurescript/lumo/package.json
@@ -1,40 +1,49 @@
 {
   "name": "lumo-build-deps",
-  "version": "1.9.0",
+  "version": "1.10.1",
   "dependencies": {
     "@babel/core": "^7.1.5",
-    "@babel/plugin-external-helpers": "7.0.0",
+    "@babel/plugin-external-helpers": "7.8.3",
     "@babel/plugin-proposal-class-properties": "^7.1.0",
     "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
     "@babel/plugin-transform-runtime": "^7.1.0",
     "@babel/preset-env": "^7.1.5",
-    "@babel/preset-stage-2": "7.0.0",
+    "@babel/preset-stage-2": "7.8.3",
     "@babel/runtime": "^7.1.5",
+    "async": "^3.1.1",
     "async-retry": "^1.2.3",
     "babel-core": "^7.0.0-bridge.0",
-    "babel-eslint": "10.0.1",
-    "babel-jest": "^23.6.0",
+    "babel-eslint": "10.0.3",
+    "babel-jest": "^25.1.0",
     "babel-loader": "^8.0.4",
     "babel-plugin-transform-flow-strip-types": "6.22.0",
-    "chalk": "^2.4.1",
-    "cross-env": "5.2.0",
+    "browserify": "^16.2.3",
+    "chalk": "^3.0.0",
+    "colors": "^1.3.3",
+    "cross-env": "7.0.0",
     "death": "^1.1.0",
-    "flow-bin": "0.85.0",
+    "flow-bin": "0.118.0",
     "google-closure-compiler-js": "20170910.0.1",
+    "glob": "^7.1.3",
+    "gunzip-maybe": "^1.4.1",
+    "insert-module-globals": "^7.2.0",
     "jszip": "github:anmonteiro/jszip#patch-1",
-    "nexe": "3.0.0-beta.7",
+    "mkdirp": "^1.0.3",
+    "ncp": "^2.0.0",
     "node-fetch": "^2.2.1",
-    "paredit.js": "0.3.4",
+    "paredit.js": "0.3.6",
     "posix-getopt": "github:anmonteiro/node-getopt#master",
-    "prettier": "1.15.1",
+    "prettier": "1.19.1",
     "progress": "^2.0.0",
-    "read-pkg": "^4.0.1",
-    "rollup": "0.67.0",
-    "rollup-plugin-babel": "4.0.3",
-    "rollup-plugin-babel-minify": "6.1.1",
-    "rollup-plugin-commonjs": "9.2.0",
-    "rollup-plugin-node-resolve": "3.4.0",
-    "rollup-plugin-replace": "2.1.0",
+    "read-pkg": "^5.2.0",
+    "request": "^2.88.0",
+    "rollup": "^1.9.0",
+    "rollup-plugin-babel": "^4.3.2",
+    "rollup-plugin-babel-minify": "^9.1.1",
+    "rollup-plugin-commonjs": "^10.0.0",
+    "rollup-plugin-node-resolve": "^5.0.0",
+    "rollup-plugin-replace": "^2.1.1",
+    "tar-stream": "^2.0.1",
     "webpack": "^4.25.1",
     "webpack-cli": "^3.2.3",
     "which-promise": "^1.0.0"
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index 7cc212c41bd6..670556bf271a 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -363,7 +363,7 @@ let
 
         npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
 
-        if [ "''${dontNpmInstall-}" != "1" ]
+        if [ "$dontNpmInstall" != "1" ]
         then
             # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
             rm -f npm-shrinkwrap.json
diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
index 5497679f4f67..7cfa47198915 100644
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -535,13 +535,13 @@ let
         sha512 = "0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==";
       };
     };
-    "@babel/plugin-external-helpers-7.0.0" = {
+    "@babel/plugin-external-helpers-7.8.3" = {
       name = "_at_babel_slash_plugin-external-helpers";
       packageName = "@babel/plugin-external-helpers";
-      version = "7.0.0";
+      version = "7.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-external-helpers/-/plugin-external-helpers-7.0.0.tgz";
-        sha512 = "tZKTMdhZvTy0KCEX5EGQQm1RHr7jUa36q/yax1baEA0yZapVYmu10yW7LTqijITgSq416gPVjrcexiA6y4pJlA==";
+        url = "https://registry.npmjs.org/@babel/plugin-external-helpers/-/plugin-external-helpers-7.8.3.tgz";
+        sha512 = "mx0WXDDiIl5DwzMtzWGRSPugXi9BxROS05GQrhLNbEamhBiicgn994ibwkyiBH+6png7bm/yA7AUsvHyCXi4Vw==";
       };
     };
     "@babel/plugin-proposal-async-generator-functions-7.8.3" = {
@@ -634,6 +634,15 @@ let
         sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==";
       };
     };
+    "@babel/plugin-syntax-bigint-7.8.3" = {
+      name = "_at_babel_slash_plugin-syntax-bigint";
+      packageName = "@babel/plugin-syntax-bigint";
+      version = "7.8.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz";
+        sha512 = "wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==";
+      };
+    };
     "@babel/plugin-syntax-dynamic-import-7.8.3" = {
       name = "_at_babel_slash_plugin-syntax-dynamic-import";
       packageName = "@babel/plugin-syntax-dynamic-import";
@@ -1066,13 +1075,13 @@ let
         sha512 = "iCXFk+T4demnq+dNLLvlGOgvYF6sPZ/hS1EmswugOqh1Ysp2vuiqJzpgsnp5rW8+6dLJT/0CXDzye28ZH6BAfQ==";
       };
     };
-    "@babel/preset-stage-2-7.0.0" = {
+    "@babel/preset-stage-2-7.8.3" = {
       name = "_at_babel_slash_preset-stage-2";
       packageName = "@babel/preset-stage-2";
-      version = "7.0.0";
+      version = "7.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/preset-stage-2/-/preset-stage-2-7.0.0.tgz";
-        sha512 = "A8ia2Wus0OAP6hh28ZgPSCBJEX3Jnql3kg9di/I+Lmg1gbJXgDZBrHr/UGZXl20Vi1lXgMuUq8c8J899KFr5gA==";
+        url = "https://registry.npmjs.org/@babel/preset-stage-2/-/preset-stage-2-7.8.3.tgz";
+        sha512 = "dStnEQgejNYIHFNACdDCigK4BF7wgW6Zahv9Dc2un7rGjbeVtZhBfR3sy0I7ZJOhBexkFxVdMZ5hqmll7BFShw==";
       };
     };
     "@babel/preset-typescript-7.8.3" = {
@@ -1156,15 +1165,6 @@ let
         sha512 = "jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==";
       };
     };
-    "@calebboyd/semaphore-1.3.1" = {
-      name = "_at_calebboyd_slash_semaphore";
-      packageName = "@calebboyd/semaphore";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@calebboyd/semaphore/-/semaphore-1.3.1.tgz";
-        sha512 = "17z9me12RgAEcMhIgR7f+BiXKbzwF9p1VraI69OxrUUSWGuSMOyOTEHQNVtMKuVrkEDVD0/Av5uiGZPBMYZljw==";
-      };
-    };
     "@cliqz-oss/firefox-client-0.3.1" = {
       name = "_at_cliqz-oss_slash_firefox-client";
       packageName = "@cliqz-oss/firefox-client";
@@ -1183,13 +1183,22 @@ let
         sha512 = "O/IyiB5pfztCdmxQZg0/xeq5w+YiP3gtJz8d4We2EpLPKzbDVjOrtfLKYgVfm6Ya6mbvDge1uLkSRwaoVCWKnA==";
       };
     };
-    "@comandeer/babel-plugin-banner-4.1.0" = {
+    "@cnakazawa/watch-1.0.4" = {
+      name = "_at_cnakazawa_slash_watch";
+      packageName = "@cnakazawa/watch";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz";
+        sha512 = "v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==";
+      };
+    };
+    "@comandeer/babel-plugin-banner-5.0.0" = {
       name = "_at_comandeer_slash_babel-plugin-banner";
       packageName = "@comandeer/babel-plugin-banner";
-      version = "4.1.0";
+      version = "5.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@comandeer/babel-plugin-banner/-/babel-plugin-banner-4.1.0.tgz";
-        sha512 = "9hKVIN2+maygxkngnXDsZXRZqCYDY4pxIRljJqqJ5A+eJZzW3k/NZj5lixEmStjWFjlPlOHGYBytBehpf0l+hA==";
+        url = "https://registry.npmjs.org/@comandeer/babel-plugin-banner/-/babel-plugin-banner-5.0.0.tgz";
+        sha512 = "sR9Go0U6puXoXyW9UgIiIQhRcJ8jVOvGl4BptUiXAtheMs72WcakZ1udh6J0ZOivr3o8jAM+MTCHLP8FZMbVpQ==";
       };
     };
     "@cronvel/get-pixels-3.3.1" = {
@@ -1480,6 +1489,42 @@ let
         sha512 = "ODXbta2kvFNkMIEGwl7KX5gJTcZZHkzSLoBh3wND2H+EsG0KpIqOZKWMtkj+suuPut85wyLZ7fGfARnrNf7dtA==";
       };
     };
+    "@istanbuljs/load-nyc-config-1.0.0" = {
+      name = "_at_istanbuljs_slash_load-nyc-config";
+      packageName = "@istanbuljs/load-nyc-config";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz";
+        sha512 = "ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg==";
+      };
+    };
+    "@istanbuljs/schema-0.1.2" = {
+      name = "_at_istanbuljs_slash_schema";
+      packageName = "@istanbuljs/schema";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz";
+        sha512 = "tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==";
+      };
+    };
+    "@jest/transform-25.1.0" = {
+      name = "_at_jest_slash_transform";
+      packageName = "@jest/transform";
+      version = "25.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@jest/transform/-/transform-25.1.0.tgz";
+        sha512 = "4ktrQ2TPREVeM+KxB4zskAT84SnmG1vaz4S+51aTefyqn3zocZUnliLLm5Fsl85I3p/kFPN4CRp1RElIfXGegQ==";
+      };
+    };
+    "@jest/types-25.1.0" = {
+      name = "_at_jest_slash_types";
+      packageName = "@jest/types";
+      version = "25.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz";
+        sha512 = "VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==";
+      };
+    };
     "@kbrandwijk/swagger-to-graphql-2.4.3" = {
       name = "_at_kbrandwijk_slash_swagger-to-graphql";
       packageName = "@kbrandwijk/swagger-to-graphql";
@@ -2965,6 +3010,42 @@ let
         sha512 = "dBtBbrc+qTHy1WdfHYjBwRln4+LWqASWakLHsWHR2NWHIFkv4W3O070IGoGLEBrJBvct3r0L1BUPuvURi7kYUQ==";
       };
     };
+    "@types/babel__core-7.1.4" = {
+      name = "_at_types_slash_babel__core";
+      packageName = "@types/babel__core";
+      version = "7.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.4.tgz";
+        sha512 = "c/5MuRz5HM4aizqL5ViYfW4iEnmfPcfbH4Xa6GgLT21dMc1NGeNnuS6egHheOmP+kCJ9CAzC4pv4SDCWTnRkbg==";
+      };
+    };
+    "@types/babel__generator-7.6.1" = {
+      name = "_at_types_slash_babel__generator";
+      packageName = "@types/babel__generator";
+      version = "7.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.1.tgz";
+        sha512 = "bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew==";
+      };
+    };
+    "@types/babel__template-7.0.2" = {
+      name = "_at_types_slash_babel__template";
+      packageName = "@types/babel__template";
+      version = "7.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz";
+        sha512 = "/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==";
+      };
+    };
+    "@types/babel__traverse-7.0.8" = {
+      name = "_at_types_slash_babel__traverse";
+      packageName = "@types/babel__traverse";
+      version = "7.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.8.tgz";
+        sha512 = "yGeB2dHEdvxjP0y4UbRtQaSkXJ9649fYCmIdRoul5kfAoGCwxuCbMhag0k3RPfnuh9kPGm8x89btcfDEXdVWGw==";
+      };
+    };
     "@types/babylon-6.16.5" = {
       name = "_at_types_slash_babylon";
       packageName = "@types/babylon";
@@ -3064,6 +3145,15 @@ let
         sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==";
       };
     };
+    "@types/estree-0.0.42" = {
+      name = "_at_types_slash_estree";
+      packageName = "@types/estree";
+      version = "0.0.42";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.42.tgz";
+        sha512 = "K1DPVvnBCPxzD+G51/cxVIoc2X8uUVl1zpJeE6iKcgHMj4+tbat5Xu4TjV7v2QSDbIeAfLi2hIk+u2+s0MlpUQ==";
+      };
+    };
     "@types/events-3.0.0" = {
       name = "_at_types_slash_events";
       packageName = "@types/events";
@@ -3136,6 +3226,33 @@ let
         sha512 = "c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A==";
       };
     };
+    "@types/istanbul-lib-coverage-2.0.1" = {
+      name = "_at_types_slash_istanbul-lib-coverage";
+      packageName = "@types/istanbul-lib-coverage";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz";
+        sha512 = "hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==";
+      };
+    };
+    "@types/istanbul-lib-report-3.0.0" = {
+      name = "_at_types_slash_istanbul-lib-report";
+      packageName = "@types/istanbul-lib-report";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz";
+        sha512 = "plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==";
+      };
+    };
+    "@types/istanbul-reports-1.1.1" = {
+      name = "_at_types_slash_istanbul-reports";
+      packageName = "@types/istanbul-reports";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz";
+        sha512 = "UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==";
+      };
+    };
     "@types/js-yaml-3.12.2" = {
       name = "_at_types_slash_js-yaml";
       packageName = "@types/js-yaml";
@@ -3226,22 +3343,22 @@ let
         sha1 = "69a23a3ad29caf0097f06eda59b361ee2f0639f6";
       };
     };
-    "@types/node-10.17.15" = {
+    "@types/node-10.17.16" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "10.17.15";
+      version = "10.17.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-10.17.15.tgz";
-        sha512 = "daFGV9GSs6USfPgxceDA8nlSe48XrVCJfDeYm7eokxq/ye7iuOH87hKXgMtEAVLFapkczbZsx868PMDT1Y0a6A==";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.17.16.tgz";
+        sha512 = "A4283YSA1OmnIivcpy/4nN86YlnKRiQp8PYwI2KdPCONEBN093QTb0gCtERtkLyVNGKKIGazTZ2nAmVzQU51zA==";
       };
     };
-    "@types/node-13.7.1" = {
+    "@types/node-13.7.4" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "13.7.1";
+      version = "13.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-13.7.1.tgz";
-        sha512 = "Zq8gcQGmn4txQEJeiXo/KiLpon8TzAl0kmKH4zdWctPj05nWwp1ClMdAVEloqrQKfaC48PNLdgN/aVaLqUrluA==";
+        url = "https://registry.npmjs.org/@types/node/-/node-13.7.4.tgz";
+        sha512 = "oVeL12C6gQS/GAExndigSaLxTrKpQPxewx9bOcwfvJiJge4rr7wNaph4J+ns5hrmIV2as5qxqN8YKthn9qh0jw==";
       };
     };
     "@types/node-6.14.9" = {
@@ -3289,6 +3406,15 @@ let
         sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==";
       };
     };
+    "@types/resolve-0.0.8" = {
+      name = "_at_types_slash_resolve";
+      packageName = "@types/resolve";
+      version = "0.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz";
+        sha512 = "auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==";
+      };
+    };
     "@types/responselike-1.0.0" = {
       name = "_at_types_slash_responselike";
       packageName = "@types/responselike";
@@ -3379,6 +3505,24 @@ let
         sha512 = "Pv2HGRE4gWLs31In7nsyXEH4uVVsd0HNV9i2dyASvtDIlOtSTr1eczPLDpdEuyv5LWH5LT20GIXwPjkshKWI1g==";
       };
     };
+    "@types/yargs-15.0.3" = {
+      name = "_at_types_slash_yargs";
+      packageName = "@types/yargs";
+      version = "15.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.3.tgz";
+        sha512 = "XCMQRK6kfpNBixHLyHUsGmXrpEmFFxzMrcnSXFMziHd8CoNJo8l16FkHyQq4x+xbM7E2XL83/O78OD8u+iZTdQ==";
+      };
+    };
+    "@types/yargs-parser-15.0.0" = {
+      name = "_at_types_slash_yargs-parser";
+      packageName = "@types/yargs-parser";
+      version = "15.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz";
+        sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==";
+      };
+    };
     "@types/zen-observable-0.8.0" = {
       name = "_at_types_slash_zen-observable";
       packageName = "@types/zen-observable";
@@ -5368,15 +5512,6 @@ let
         sha512 = "F14aX2R/fKNYMvhuP2t9GD9fggID7zp5I96MF5QeKYWDWTrkRdHRp4+SVfXUVN+cXOaB/IebfvRtzPf25CM0zw==";
       };
     };
-    "app-builder-5.2.0" = {
-      name = "app-builder";
-      packageName = "app-builder";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/app-builder/-/app-builder-5.2.0.tgz";
-        sha512 = "RRj/vu8WhmMM71G9BxMLRvcwpr1QUJZ9NXURGGo1v3fPiauzkQfNi31kM7irRNqR87NV+lJ/qI62iTzcAc+V0Q==";
-      };
-    };
     "app-module-path-2.2.0" = {
       name = "app-module-path";
       packageName = "app-module-path";
@@ -6457,13 +6592,13 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.620.0" = {
+    "aws-sdk-2.622.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.620.0";
+      version = "2.622.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.620.0.tgz";
-        sha512 = "j+PGKbYwk5OjzbCFbxzRkcJVEvfdn9YFkrU8dJdjleYf9AzUSUpTjMyZsyUPOKxJxdNdA9FYTs43WdtSKHZa0A==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.622.0.tgz";
+        sha512 = "CV5RZjoh2PZ/wALQXx932dTYukPTZXZmfjlRTJqNibRhyN36/E1KwkX1va1CROii2AnfnxjzV7OqymH0TgKlUg==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -6529,13 +6664,13 @@ let
         sha512 = "poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==";
       };
     };
-    "babel-eslint-10.0.1" = {
+    "babel-eslint-10.0.3" = {
       name = "babel-eslint";
       packageName = "babel-eslint";
-      version = "10.0.1";
+      version = "10.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.1.tgz";
-        sha512 = "z7OT1iNV+TjOwHNLLyJk+HN+YVWX+CLE6fPD2SymJZOZQBs+QIexFjhm4keGTm8MW9xr4EC9Q0PbaLB24V5GoQ==";
+        url = "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.3.tgz";
+        sha512 = "z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA==";
       };
     };
     "babel-generator-6.26.1" = {
@@ -6628,13 +6763,13 @@ let
         sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2";
       };
     };
-    "babel-jest-23.6.0" = {
+    "babel-jest-25.1.0" = {
       name = "babel-jest";
       packageName = "babel-jest";
-      version = "23.6.0";
+      version = "25.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-jest/-/babel-jest-23.6.0.tgz";
-        sha512 = "lqKGG6LYXYu+DQh/slrQ8nxXQkEkhugdXsU6St7GmhVS7Ilc/22ArwqXNJrf0QaOBjZB0360qZMwXqDYQHXaew==";
+        url = "https://registry.npmjs.org/babel-jest/-/babel-jest-25.1.0.tgz";
+        sha512 = "tz0VxUhhOE2y+g8R2oFrO/2VtVjA1lkJeavlhExuRBg3LdNJY9gwQ+Vcvqt9+cqy71MCTJhewvTB7Qtnnr9SWg==";
       };
     };
     "babel-loader-8.0.6" = {
@@ -6664,22 +6799,22 @@ let
         sha512 = "o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==";
       };
     };
-    "babel-plugin-istanbul-4.1.6" = {
+    "babel-plugin-istanbul-6.0.0" = {
       name = "babel-plugin-istanbul";
       packageName = "babel-plugin-istanbul";
-      version = "4.1.6";
+      version = "6.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz";
-        sha512 = "PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ==";
+        url = "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz";
+        sha512 = "AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==";
       };
     };
-    "babel-plugin-jest-hoist-23.2.0" = {
+    "babel-plugin-jest-hoist-25.1.0" = {
       name = "babel-plugin-jest-hoist";
       packageName = "babel-plugin-jest-hoist";
-      version = "23.2.0";
+      version = "25.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz";
-        sha1 = "e61fae05a1ca8801aadee57a6d66b8cefaf44167";
+        url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.1.0.tgz";
+        sha512 = "oIsopO41vW4YFZ9yNYoLQATnnN46lp+MZ6H4VvPKFkcc2/fkl3CfE/NZZSmnEIEsJRmJAgkVEK0R7Zbl50CpTw==";
       };
     };
     "babel-plugin-minify-builtins-0.5.0" = {
@@ -6952,13 +7087,13 @@ let
         sha1 = "379937abc67d7895970adc621f284cd966cf2153";
       };
     };
-    "babel-preset-jest-23.2.0" = {
+    "babel-preset-jest-25.1.0" = {
       name = "babel-preset-jest";
       packageName = "babel-preset-jest";
-      version = "23.2.0";
+      version = "25.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz";
-        sha1 = "8ec7a03a138f001a1a8fb1e8113652bf1a55da46";
+        url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.1.0.tgz";
+        sha512 = "eCGn64olaqwUMaugXsTtGAM2I0QTahjEtnRu0ql8Ie+gDWAc1N6wqN0k2NilnyTunM69Pad7gJY7LOtwLimoFQ==";
       };
     };
     "babel-preset-minify-0.5.1" = {
@@ -8203,6 +8338,15 @@ let
         sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298";
       };
     };
+    "browserify-zlib-0.1.4" = {
+      name = "browserify-zlib";
+      packageName = "browserify-zlib";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz";
+        sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d";
+      };
+    };
     "browserify-zlib-0.2.0" = {
       name = "browserify-zlib";
       packageName = "browserify-zlib";
@@ -8221,6 +8365,15 @@ let
         sha512 = "gFOnZNYBHrEyUML0xr5NJ6edFaaKbTFX9S9kQHlYfCP0Rit/boRIz4G+Avq6/4haEKJXdGGUnoolx+5MWW2BoA==";
       };
     };
+    "bser-2.1.1" = {
+      name = "bser";
+      packageName = "bser";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz";
+        sha512 = "gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==";
+      };
+    };
     "btoa-lite-1.0.0" = {
       name = "btoa-lite";
       packageName = "btoa-lite";
@@ -8482,15 +8635,6 @@ let
         sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f";
       };
     };
-    "builtin-modules-2.0.0" = {
-      name = "builtin-modules";
-      packageName = "builtin-modules";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-2.0.0.tgz";
-        sha512 = "3U5kUA5VPsRUA3nofm/BXX7GVHKfxz0hOBAPxXrIvHzlDRkQVqEn6yi8QJegxl4LzOHLdvb7XF5dVawa/VVYBg==";
-      };
-    };
     "builtin-modules-3.1.0" = {
       name = "builtin-modules";
       packageName = "builtin-modules";
@@ -8932,13 +9076,22 @@ let
         sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
       };
     };
-    "caniuse-lite-1.0.30001027" = {
+    "caniuse-lite-1.0.30001028" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001027";
+      version = "1.0.30001028";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001027.tgz";
-        sha512 = "7xvKeErvXZFtUItTHgNtLgS9RJpVnwBlWX8jSo/BO8VsF6deszemZSkJJJA1KOKrXuzZH4WALpAJdq5EyfgMLg==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001028.tgz";
+        sha512 = "Vnrq+XMSHpT7E+LWoIYhs3Sne8h9lx9YJV3acH3THNCwU/9zV93/ta4xVfzTtnqd3rvnuVpVjE3DFqf56tr3aQ==";
+      };
+    };
+    "capture-exit-2.0.0" = {
+      name = "capture-exit";
+      packageName = "capture-exit";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz";
+        sha512 = "PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==";
       };
     };
     "capture-stack-trace-1.0.1" = {
@@ -9310,15 +9463,6 @@ let
         sha512 = "0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==";
       };
     };
-    "cherow-1.6.9" = {
-      name = "cherow";
-      packageName = "cherow";
-      version = "1.6.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cherow/-/cherow-1.6.9.tgz";
-        sha512 = "pmmkpIQRcnDA7EawKcg9+ncSZNTYfXqDx+K3oqqYvpZlqVBChjTomTfw+hePnkqYR3Y013818c0R1Q5P/7PGrQ==";
-      };
-    };
     "child-process-ext-2.1.0" = {
       name = "child-process-ext";
       packageName = "child-process-ext";
@@ -11722,15 +11866,6 @@ let
         sha512 = "+SaJ2OfeRvfQqwXQ2kgr0Y5pzBR/lijf5OpnnaruwWnmI799JfWr2jN2ItOV9s3A/+TFOt6mxvKzQq5F0Jp6VQ==";
       };
     };
-    "cross-env-5.2.0" = {
-      name = "cross-env";
-      packageName = "cross-env";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz";
-        sha512 = "jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==";
-      };
-    };
     "cross-env-6.0.3" = {
       name = "cross-env";
       packageName = "cross-env";
@@ -11740,6 +11875,15 @@ let
         sha512 = "+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag==";
       };
     };
+    "cross-env-7.0.0" = {
+      name = "cross-env";
+      packageName = "cross-env";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cross-env/-/cross-env-7.0.0.tgz";
+        sha512 = "rV6M9ldNgmwP7bx5u6rZsTbYidzwvrwIYZnT08hSGLcQCcggofgFW+sNe7IhA1SRauPS0QuLbbX+wdNtpqE5CQ==";
+      };
+    };
     "cross-fetch-2.2.2" = {
       name = "cross-fetch";
       packageName = "cross-fetch";
@@ -11965,15 +12109,6 @@ let
         sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==";
       };
     };
-    "css-unit-converter-1.1.1" = {
-      name = "css-unit-converter";
-      packageName = "css-unit-converter";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.1.tgz";
-        sha1 = "d9b9281adcfd8ced935bdbaba83786897f64e996";
-      };
-    };
     "css-what-2.1.3" = {
       name = "css-what";
       packageName = "css-what";
@@ -12010,15 +12145,6 @@ let
         sha1 = "c814903e45623371a0477b40109aaafbeeaddbb4";
       };
     };
-    "cssesc-2.0.0" = {
-      name = "cssesc";
-      packageName = "cssesc";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz";
-        sha512 = "MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==";
-      };
-    };
     "cssesc-3.0.0" = {
       name = "cssesc";
       packageName = "cssesc";
@@ -14368,13 +14494,13 @@ let
         sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==";
       };
     };
-    "electron-to-chromium-1.3.353" = {
+    "electron-to-chromium-1.3.355" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.353";
+      version = "1.3.355";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.353.tgz";
-        sha512 = "CkG24biyy9qQTQs8U2vGQaiyWSFDxAXP/UGHBveXZ1TGoWOAw+eYZXryrX0UeIMKnQjcaHx33hzYuydv98kqGQ==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.355.tgz";
+        sha512 = "zKO/wS+2ChI/jz9WAo647xSW8t2RmgRLFdbUb/77cORkUTargO+SCj4ctTHjBn2VeNFrsLgDT7IuDVrd3F8mLQ==";
       };
     };
     "elegant-spinner-1.0.1" = {
@@ -14495,6 +14621,15 @@ let
         sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
       };
     };
+    "emojis-list-3.0.0" = {
+      name = "emojis-list";
+      packageName = "emojis-list";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz";
+        sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==";
+      };
+    };
     "emphasize-1.5.0" = {
       name = "emphasize";
       packageName = "emphasize";
@@ -15242,15 +15377,6 @@ let
         sha512 = "MiIDOotoWseIfLIfGeDzF6sDvHkVvGd2JgkvjyHtN3q4RoxdAXrAMuI3SXTOKatljgacKwpNAYShmcKZa4yZzw==";
       };
     };
-    "eslint-scope-3.7.1" = {
-      name = "eslint-scope";
-      packageName = "eslint-scope";
-      version = "3.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz";
-        sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8";
-      };
-    };
     "eslint-scope-3.7.3" = {
       name = "eslint-scope";
       packageName = "eslint-scope";
@@ -15476,15 +15602,6 @@ let
         sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==";
       };
     };
-    "estree-walker-0.5.2" = {
-      name = "estree-walker";
-      packageName = "estree-walker";
-      version = "0.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/estree-walker/-/estree-walker-0.5.2.tgz";
-        sha512 = "XpCnW/AE10ws/kDAs37cngSkvgIR8aN3G0MS85m7dUpuK2EREo9VJ00uvw6Dg/hXEpfsE1I1TvJOJr+Z+TL+ig==";
-      };
-    };
     "estree-walker-0.6.1" = {
       name = "estree-walker";
       packageName = "estree-walker";
@@ -15755,6 +15872,15 @@ let
         sha512 = "FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==";
       };
     };
+    "exec-sh-0.3.4" = {
+      name = "exec-sh";
+      packageName = "exec-sh";
+      version = "0.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz";
+        sha512 = "sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==";
+      };
+    };
     "execa-0.1.1" = {
       name = "execa";
       packageName = "execa";
@@ -16466,6 +16592,15 @@ let
         sha512 = "D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==";
       };
     };
+    "fb-watchman-2.0.1" = {
+      name = "fb-watchman";
+      packageName = "fb-watchman";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz";
+        sha512 = "DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==";
+      };
+    };
     "fd-lock-1.0.2" = {
       name = "fd-lock";
       packageName = "fd-lock";
@@ -17060,13 +17195,13 @@ let
         sha1 = "554440766da0a0d603999f433453f6c2fc6a75c1";
       };
     };
-    "flow-bin-0.85.0" = {
+    "flow-bin-0.118.0" = {
       name = "flow-bin";
       packageName = "flow-bin";
-      version = "0.85.0";
+      version = "0.118.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flow-bin/-/flow-bin-0.85.0.tgz";
-        sha512 = "ougBA2q6Rn9sZrjZQ9r5pTFxCotlGouySpD2yRIuq5AYwwfIT8HHhVMeSwrN5qJayjHINLJyrnsSkkPCZyfMrQ==";
+        url = "https://registry.npmjs.org/flow-bin/-/flow-bin-0.118.0.tgz";
+        sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg==";
       };
     };
     "flow-parser-0.118.0" = {
@@ -19086,13 +19221,13 @@ let
         sha512 = "4FOv3ZKfA4WdOKJeHdz6B3F/vxBLSgmBcGeAFPf4n1F64ltJUvOOerNj0rsJxONQGdhUMynQIvd6LzB+1J5oKA==";
       };
     };
-    "graphql-tools-4.0.6" = {
+    "graphql-tools-4.0.7" = {
       name = "graphql-tools";
       packageName = "graphql-tools";
-      version = "4.0.6";
+      version = "4.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.6.tgz";
-        sha512 = "jHLQw8x3xmSNRBCsaZqelXXsFfUSUSktSCUP8KYHiX1Z9qEuwcMpAf+FkdBzk8aTAFqOlPdNZ3OI4DKKqGKUqg==";
+        url = "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.7.tgz";
+        sha512 = "rApl8sT8t/W1uQRcwzxMYyUBiCl/XicluApiDkNze5TX/GR0BSTQMjM2UcRGdTmkbsb1Eqq6afkyyeG/zMxZYQ==";
       };
     };
     "graphql-type-json-0.3.1" = {
@@ -19266,6 +19401,15 @@ let
         sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5";
       };
     };
+    "gunzip-maybe-1.4.1" = {
+      name = "gunzip-maybe";
+      packageName = "gunzip-maybe";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.1.tgz";
+        sha512 = "qtutIKMthNJJgeHQS7kZ9FqDq59/Wn0G2HYCRNjpup7yKfVI6/eqwpmroyZGFoCYaG+sW6psNVb4zoLADHpp2g==";
+      };
+    };
     "handle-thing-2.0.0" = {
       name = "handle-thing";
       packageName = "handle-thing";
@@ -21589,6 +21733,15 @@ let
         sha512 = "RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==";
       };
     };
+    "is-deflate-1.0.0" = {
+      name = "is-deflate";
+      packageName = "is-deflate";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-deflate/-/is-deflate-1.0.0.tgz";
+        sha1 = "c862901c3c161fb09dac7cdc7e784f80e98f2f14";
+      };
+    };
     "is-descriptor-0.1.6" = {
       name = "is-descriptor";
       packageName = "is-descriptor";
@@ -21796,6 +21949,15 @@ let
         sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==";
       };
     };
+    "is-gzip-1.0.0" = {
+      name = "is-gzip";
+      packageName = "is-gzip";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz";
+        sha1 = "6ca8b07b99c77998025900e555ced8ed80879a83";
+      };
+    };
     "is-hexadecimal-1.0.4" = {
       name = "is-hexadecimal";
       packageName = "is-hexadecimal";
@@ -22174,6 +22336,15 @@ let
         sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24";
       };
     };
+    "is-reference-1.1.4" = {
+      name = "is-reference";
+      packageName = "is-reference";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-reference/-/is-reference-1.1.4.tgz";
+        sha512 = "uJA/CDPO3Tao3GTrxYn6AwkM4nUPJiGGYu5+cB8qbC7WGFlrKZbiRo7SFKxUAEpFUfiHofWCXBUNhvYJMh+6zw==";
+      };
+    };
     "is-regex-1.0.5" = {
       name = "is-regex";
       packageName = "is-regex";
@@ -22678,22 +22849,22 @@ let
         sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
       };
     };
-    "istanbul-lib-coverage-1.2.1" = {
+    "istanbul-lib-coverage-3.0.0" = {
       name = "istanbul-lib-coverage";
       packageName = "istanbul-lib-coverage";
-      version = "1.2.1";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz";
-        sha512 = "PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==";
+        url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz";
+        sha512 = "UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==";
       };
     };
-    "istanbul-lib-instrument-1.10.2" = {
+    "istanbul-lib-instrument-4.0.1" = {
       name = "istanbul-lib-instrument";
       packageName = "istanbul-lib-instrument";
-      version = "1.10.2";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz";
-        sha512 = "aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==";
+        url = "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz";
+        sha512 = "imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==";
       };
     };
     "isurl-1.0.0" = {
@@ -22795,6 +22966,51 @@ let
         sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4";
       };
     };
+    "jest-haste-map-25.1.0" = {
+      name = "jest-haste-map";
+      packageName = "jest-haste-map";
+      version = "25.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.1.0.tgz";
+        sha512 = "/2oYINIdnQZAqyWSn1GTku571aAfs8NxzSErGek65Iu5o8JYb+113bZysRMcC/pjE5v9w0Yz+ldbj9NxrFyPyw==";
+      };
+    };
+    "jest-regex-util-25.1.0" = {
+      name = "jest-regex-util";
+      packageName = "jest-regex-util";
+      version = "25.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.1.0.tgz";
+        sha512 = "9lShaDmDpqwg+xAd73zHydKrBbbrIi08Kk9YryBEBybQFg/lBWR/2BDjjiSE7KIppM9C5+c03XiDaZ+m4Pgs1w==";
+      };
+    };
+    "jest-serializer-25.1.0" = {
+      name = "jest-serializer";
+      packageName = "jest-serializer";
+      version = "25.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.1.0.tgz";
+        sha512 = "20Wkq5j7o84kssBwvyuJ7Xhn7hdPeTXndnwIblKDR2/sy1SUm6rWWiG9kSCgJPIfkDScJCIsTtOKdlzfIHOfKA==";
+      };
+    };
+    "jest-util-25.1.0" = {
+      name = "jest-util";
+      packageName = "jest-util";
+      version = "25.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jest-util/-/jest-util-25.1.0.tgz";
+        sha512 = "7did6pLQ++87Qsj26Fs/TIwZMUFBXQ+4XXSodRNy3luch2DnRXsSnmpVtxxQ0Yd6WTipGpbhh2IFP1mq6/fQGw==";
+      };
+    };
+    "jest-worker-25.1.0" = {
+      name = "jest-worker";
+      packageName = "jest-worker";
+      version = "25.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jest-worker/-/jest-worker-25.1.0.tgz";
+        sha512 = "ZHhHtlxOWSxCoNOKHGbiLzXnl42ga9CxDr27H36Qn+15pQZd3R/F24jrmjDelw9j/iHUIWMWs08/u2QN50HHOg==";
+      };
+    };
     "jetpack-id-1.0.0" = {
       name = "jetpack-id";
       packageName = "jetpack-id";
@@ -24533,6 +24749,15 @@ let
         sha512 = "fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==";
       };
     };
+    "loader-utils-1.4.0" = {
+      name = "loader-utils";
+      packageName = "loader-utils";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz";
+        sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==";
+      };
+    };
     "locate-path-2.0.0" = {
       name = "locate-path";
       packageName = "locate-path";
@@ -26207,13 +26432,13 @@ let
         sha512 = "rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==";
       };
     };
-    "make-error-1.3.5" = {
+    "make-error-1.3.6" = {
       name = "make-error";
       packageName = "make-error";
-      version = "1.3.5";
+      version = "1.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz";
-        sha512 = "c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==";
+        url = "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz";
+        sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==";
       };
     };
     "make-error-cause-1.2.2" = {
@@ -26252,6 +26477,15 @@ let
         sha512 = "pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==";
       };
     };
+    "makeerror-1.0.11" = {
+      name = "makeerror";
+      packageName = "makeerror";
+      version = "1.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz";
+        sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c";
+      };
+    };
     "mamacro-0.0.3" = {
       name = "mamacro";
       packageName = "mamacro";
@@ -27161,6 +27395,15 @@ let
         sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==";
       };
     };
+    "micromatch-4.0.2" = {
+      name = "micromatch";
+      packageName = "micromatch";
+      version = "4.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz";
+        sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==";
+      };
+    };
     "middleware-handler-0.2.0" = {
       name = "middleware-handler";
       packageName = "middleware-handler";
@@ -28767,15 +29010,6 @@ let
         sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e";
       };
     };
-    "nexe-3.0.0-beta.7" = {
-      name = "nexe";
-      packageName = "nexe";
-      version = "3.0.0-beta.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nexe/-/nexe-3.0.0-beta.7.tgz";
-        sha512 = "Vnvd/rHCDyvc3ZxEX/sSw6lCMsBLHqkhGQS627MtetIiFBj1G7oRw9y1All8a7Tzi560o+SGIkAbnjFR60wNlQ==";
-      };
-    };
     "next-event-1.0.0" = {
       name = "next-event";
       packageName = "next-event";
@@ -28839,22 +29073,22 @@ let
         sha1 = "04b035cb530d46859d1018839a518c029133f676";
       };
     };
-    "nlcst-is-literal-1.2.0" = {
+    "nlcst-is-literal-1.2.1" = {
       name = "nlcst-is-literal";
       packageName = "nlcst-is-literal";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nlcst-is-literal/-/nlcst-is-literal-1.2.0.tgz";
-        sha512 = "0f7SKVXHdQvXvibPzLL90Lp8KXbhO0ktZGvythpwyoc7mmXKGe2VtDjnPRailPWBO8TgzHRzvQzkPIz81PSyBA==";
+        url = "https://registry.npmjs.org/nlcst-is-literal/-/nlcst-is-literal-1.2.1.tgz";
+        sha512 = "abNv1XY7TUoyLn5kSSorMIYHfRvVfXbgftNFNvEMiQQkyKteLdjrGuDqEMMyK70sMbn7uPA6oUbRvykM6pg+pg==";
       };
     };
-    "nlcst-normalize-2.1.3" = {
+    "nlcst-normalize-2.1.4" = {
       name = "nlcst-normalize";
       packageName = "nlcst-normalize";
-      version = "2.1.3";
+      version = "2.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nlcst-normalize/-/nlcst-normalize-2.1.3.tgz";
-        sha512 = "TtAmaUsjZPU6zH+yksmLwTezMti5Db8R+kdViCmWv44pWGxNr4C90p7X33YbiULxDfA7i7J7gUutDX4fT9pn7g==";
+        url = "https://registry.npmjs.org/nlcst-normalize/-/nlcst-normalize-2.1.4.tgz";
+        sha512 = "dWJ3XUoAoWoau24xOM59Y1FPozv7DyYWy+rdUaXj9Ow0hBCVuwqDQbXzTF7H+HskyTVpTkRPXYPu4YsMEScmRw==";
       };
     };
     "nlcst-search-1.5.1" = {
@@ -28866,13 +29100,13 @@ let
         sha512 = "G3ws0fgNlVsUvHvA2G1PTjyxzGOJ0caI0+WOvlZzev5iSUTX+R1q4lnlL4Y7E+he4ZMUW/0FMn9rYwdYon/13g==";
       };
     };
-    "nlcst-to-string-2.0.3" = {
+    "nlcst-to-string-2.0.4" = {
       name = "nlcst-to-string";
       packageName = "nlcst-to-string";
-      version = "2.0.3";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nlcst-to-string/-/nlcst-to-string-2.0.3.tgz";
-        sha512 = "OY2QhGdf6jpYfHqS4vJwqF7aIBZkaMjMUkcHcskMPitvXLuYNGdQvgVWI/5yKwkmIdmhft3ounSJv+Re2yydng==";
+        url = "https://registry.npmjs.org/nlcst-to-string/-/nlcst-to-string-2.0.4.tgz";
+        sha512 = "3x3jwTd6UPG7vi5k4GEzvxJ5rDA7hVUIRNHPblKuMVP9Z3xmlsd9cgLcpAMkc5uPOBna82EeshROFhsPkbnTZg==";
       };
     };
     "no-case-2.3.2" = {
@@ -31217,13 +31451,13 @@ let
         sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247";
       };
     };
-    "paredit.js-0.3.4" = {
+    "paredit.js-0.3.6" = {
       name = "paredit.js";
       packageName = "paredit.js";
-      version = "0.3.4";
+      version = "0.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/paredit.js/-/paredit.js-0.3.4.tgz";
-        sha512 = "b6t7ORo/MwT6xvRiuu1c1do3+CAUd7/0rgc1d3qNHUeP64zxy4ttLIvK7SEHzyfyDLvD9pPuV9mYKHf6MgUkmg==";
+        url = "https://registry.npmjs.org/paredit.js/-/paredit.js-0.3.6.tgz";
+        sha512 = "Z97Go1ucly6XzJDWsX8g6aXKIapx610JElNEgAvOQ8DA3A5uTAzEIaPZyn3r/WskHS+HpaO17oALcy2dUsKlQA==";
       };
     };
     "parent-module-1.0.1" = {
@@ -31973,6 +32207,15 @@ let
         sha512 = "U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==";
       };
     };
+    "peek-stream-1.1.3" = {
+      name = "peek-stream";
+      packageName = "peek-stream";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/peek-stream/-/peek-stream-1.1.3.tgz";
+        sha512 = "FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==";
+      };
+    };
     "peer-wire-protocol-0.7.1" = {
       name = "peer-wire-protocol";
       packageName = "peer-wire-protocol";
@@ -32460,13 +32703,22 @@ let
         sha512 = "IY4oRjpXWYshuTDFxMVkJDtWIk2LhsTlu8bZnbEJA4+bYT16Lvpo8Qv6EvDumhYRgzjZl489pmsY3qVgJQ08nA==";
       };
     };
-    "postcss-calc-7.0.1" = {
+    "postcss-7.0.27" = {
+      name = "postcss";
+      packageName = "postcss";
+      version = "7.0.27";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz";
+        sha512 = "WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==";
+      };
+    };
+    "postcss-calc-7.0.2" = {
       name = "postcss-calc";
       packageName = "postcss-calc";
-      version = "7.0.1";
+      version = "7.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.1.tgz";
-        sha512 = "oXqx0m6tb4N3JGdmeMSc/i91KppbYsFZKdH0xMOqK8V1rJlzrKlTdokz8ozUXLVejydRN6u2IddxpcijRj2FqQ==";
+        url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.2.tgz";
+        sha512 = "rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ==";
       };
     };
     "postcss-colormin-4.0.3" = {
@@ -32730,15 +32982,6 @@ let
         sha512 = "h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==";
       };
     };
-    "postcss-selector-parser-5.0.0" = {
-      name = "postcss-selector-parser";
-      packageName = "postcss-selector-parser";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz";
-        sha512 = "w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==";
-      };
-    };
     "postcss-selector-parser-6.0.2" = {
       name = "postcss-selector-parser";
       packageName = "postcss-selector-parser";
@@ -32775,6 +33018,15 @@ let
         sha512 = "pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==";
       };
     };
+    "postcss-value-parser-4.0.3" = {
+      name = "postcss-value-parser";
+      packageName = "postcss-value-parser";
+      version = "4.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz";
+        sha512 = "N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==";
+      };
+    };
     "posthtml-0.11.6" = {
       name = "posthtml";
       packageName = "posthtml";
@@ -32865,15 +33117,6 @@ let
         sha1 = "815ed1f6ebc65926f865b310c0713bcb3315ce4b";
       };
     };
-    "prettier-1.15.1" = {
-      name = "prettier";
-      packageName = "prettier";
-      version = "1.15.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prettier/-/prettier-1.15.1.tgz";
-        sha512 = "4rgV2hyc/5Pk0XHH4VjJWHRgVjgRbpMfLQjREAhHBtyW1UvTFkjJEsueGYNYYZd9mn97K+1qv0EBwm11zoaSgA==";
-      };
-    };
     "prettier-1.19.1" = {
       name = "prettier";
       packageName = "prettier";
@@ -34890,15 +35133,6 @@ let
         sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389";
       };
     };
-    "read-pkg-4.0.1" = {
-      name = "read-pkg";
-      packageName = "read-pkg";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg/-/read-pkg-4.0.1.tgz";
-        sha1 = "963625378f3e1c4d48c85872b5a6ec7d5d093237";
-      };
-    };
     "read-pkg-5.2.0" = {
       name = "read-pkg";
       packageName = "read-pkg";
@@ -35070,6 +35304,15 @@ let
         sha1 = "41059608ffc154757b715d9989d199ffbf372e35";
       };
     };
+    "realpath-native-1.1.0" = {
+      name = "realpath-native";
+      packageName = "realpath-native";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz";
+        sha512 = "wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==";
+      };
+    };
     "recast-0.11.23" = {
       name = "recast";
       packageName = "recast";
@@ -35889,15 +36132,6 @@ let
         sha1 = "00a9f7387556e27038eae232caa372a6a59b665a";
       };
     };
-    "resolve-dependencies-2.2.3" = {
-      name = "resolve-dependencies";
-      packageName = "resolve-dependencies";
-      version = "2.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resolve-dependencies/-/resolve-dependencies-2.2.3.tgz";
-        sha512 = "EIZcqEE3q+fWNapzpQ2iiCPal+J7TsLfLnoeGq4h5L4GYjnf4xKzVHN7VBjLGgOJwUs/Z+a6nqA80AhwP7IPlQ==";
-      };
-    };
     "resolve-dir-1.0.1" = {
       name = "resolve-dir";
       packageName = "resolve-dir";
@@ -36330,58 +36564,58 @@ let
         sha512 = "jmaDhK9CO4YbQAV8zzCnq9vjAqeO489MS5ehZ+rXmFiPFFE6B+S9KYO6prjmLJ5A0zY3QxVlQdrIya7E/azz/Q==";
       };
     };
-    "rollup-0.67.0" = {
+    "rollup-1.31.1" = {
       name = "rollup";
       packageName = "rollup";
-      version = "0.67.0";
+      version = "1.31.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rollup/-/rollup-0.67.0.tgz";
-        sha512 = "p34buXxArhwv9ieTdHvdhdo65Cbig68s/Z8llbZuiX5e+3zCqnBF02Ck9IH0tECrmvvrJVMws32Ry84hTnS1Tw==";
+        url = "https://registry.npmjs.org/rollup/-/rollup-1.31.1.tgz";
+        sha512 = "2JREN1YdrS/kpPzEd33ZjtuNbOuBC3ePfuZBdKEybvqcEcszW1ckyVqzcEiEe0nE8sqHK+pbJg+PsAgRJ8+1dg==";
       };
     };
-    "rollup-plugin-babel-4.0.3" = {
+    "rollup-plugin-babel-4.3.3" = {
       name = "rollup-plugin-babel";
       packageName = "rollup-plugin-babel";
-      version = "4.0.3";
+      version = "4.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.0.3.tgz";
-        sha512 = "/PP0MgbPQyRywI4zRIJim6ySjTcOLo4kQbEbROqp9kOR3kHC3FeU++QpBDZhS2BcHtJTVZMVbBV46flbBN5zxQ==";
+        url = "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.3.3.tgz";
+        sha512 = "tKzWOCmIJD/6aKNz0H1GMM+lW1q9KyFubbWzGiOG540zxPPifnEAHTZwjo0g991Y+DyOZcLqBgqOdqazYE5fkw==";
       };
     };
-    "rollup-plugin-babel-minify-6.1.1" = {
+    "rollup-plugin-babel-minify-9.1.1" = {
       name = "rollup-plugin-babel-minify";
       packageName = "rollup-plugin-babel-minify";
-      version = "6.1.1";
+      version = "9.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rollup-plugin-babel-minify/-/rollup-plugin-babel-minify-6.1.1.tgz";
-        sha512 = "MX0lqOHp1vHd7WbHTK5OG679msgPxzGzYf4VBEg6kKptO05fgheCbN51i3EoFYSa+8/VtNDjPc23iDdZfhO2uw==";
+        url = "https://registry.npmjs.org/rollup-plugin-babel-minify/-/rollup-plugin-babel-minify-9.1.1.tgz";
+        sha512 = "/Jph4PungzuB4h8uPSNKJQ16GjxVTfaRT6f4EwZW5NfD7RU7niFSEMMCZAlM6ezf11MBo1ttQcei+FisyCxicg==";
       };
     };
-    "rollup-plugin-commonjs-9.2.0" = {
+    "rollup-plugin-commonjs-10.1.0" = {
       name = "rollup-plugin-commonjs";
       packageName = "rollup-plugin-commonjs";
-      version = "9.2.0";
+      version = "10.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.2.0.tgz";
-        sha512 = "0RM5U4Vd6iHjL6rLvr3lKBwnPsaVml+qxOGaaNUWN1lSq6S33KhITOfHmvxV3z2vy9Mk4t0g4rNlVaJJsNQPWA==";
+        url = "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz";
+        sha512 = "jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q==";
       };
     };
-    "rollup-plugin-node-resolve-3.4.0" = {
+    "rollup-plugin-node-resolve-5.2.0" = {
       name = "rollup-plugin-node-resolve";
       packageName = "rollup-plugin-node-resolve";
-      version = "3.4.0";
+      version = "5.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.4.0.tgz";
-        sha512 = "PJcd85dxfSBWih84ozRtBkB731OjXk0KnzN0oGp7WOWcarAFkVa71cV5hTJg2qpVsV2U8EUwrzHP3tvy9vS3qg==";
+        url = "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz";
+        sha512 = "jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw==";
       };
     };
-    "rollup-plugin-replace-2.1.0" = {
+    "rollup-plugin-replace-2.2.0" = {
       name = "rollup-plugin-replace";
       packageName = "rollup-plugin-replace";
-      version = "2.1.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rollup-plugin-replace/-/rollup-plugin-replace-2.1.0.tgz";
-        sha512 = "SxrAIgpH/B5/W4SeULgreOemxcpEgKs2gcD42zXw50bhqGWmcnlXneVInQpAqzA/cIly4bJrOpeelmB9p4YXSQ==";
+        url = "https://registry.npmjs.org/rollup-plugin-replace/-/rollup-plugin-replace-2.2.0.tgz";
+        sha512 = "/5bxtUPkDHyBJAKketb4NfaeZjL5yLZdeUihSfbF2PQMz+rSTEb8ARKoOl3UBT4m7/X+QOXJo3sLTcq+yMMYTA==";
       };
     };
     "rollup-pluginutils-2.8.2" = {
@@ -36438,6 +36672,15 @@ let
         sha512 = "OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==";
       };
     };
+    "rsvp-4.8.5" = {
+      name = "rsvp";
+      packageName = "rsvp";
+      version = "4.8.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz";
+        sha512 = "nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==";
+      };
+    };
     "rttc-4.5.2" = {
       name = "rttc";
       packageName = "rttc";
@@ -36708,6 +36951,15 @@ let
         sha512 = "jLYV0DORrzY3xaz/S9ydJL6Iz7essZeAfnAavsJ+zsJGZ1MOnsS52yRjU3uF3pJa/lla7+wisp//fxOwOH8SKQ==";
       };
     };
+    "sane-4.1.0" = {
+      name = "sane";
+      packageName = "sane";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz";
+        sha512 = "hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==";
+      };
+    };
     "sanitize-filename-1.6.3" = {
       name = "sanitize-filename";
       packageName = "sanitize-filename";
@@ -38004,22 +38256,22 @@ let
         sha512 = "43HbJj6QatuL2BNG+Uq2Taa73wdfSQSID8FJWW4q5/LYgd9D+RtdiE4lAMwxqYYbvThU9uuza4epuF/B1CAlYw==";
       };
     };
-    "snyk-go-parser-1.3.1" = {
+    "snyk-go-parser-1.3.3" = {
       name = "snyk-go-parser";
       packageName = "snyk-go-parser";
-      version = "1.3.1";
+      version = "1.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-go-parser/-/snyk-go-parser-1.3.1.tgz";
-        sha512 = "jrFRfIk6yGHFeipGD66WV9ei/A/w/lIiGqI80w1ndMbg6D6M5pVNbK7ngDTmo4GdHrZDYqx/VBGBsUm2bol3Rg==";
+        url = "https://registry.npmjs.org/snyk-go-parser/-/snyk-go-parser-1.3.3.tgz";
+        sha512 = "h65vi4UDH3ier7+r/E1GTZhruBSbGv3z4dGmzB+pc+g8ljOJd0BfqN6pUPIHB7hjrIbLh6KxT/XtJcV4X7LdeQ==";
       };
     };
-    "snyk-go-plugin-1.11.1" = {
+    "snyk-go-plugin-1.12.0" = {
       name = "snyk-go-plugin";
       packageName = "snyk-go-plugin";
-      version = "1.11.1";
+      version = "1.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.11.1.tgz";
-        sha512 = "IsNi7TmpHoRHzONOWJTT8+VYozQJnaJpKgnYNQjzNm2JlV8bDGbdGQ1a8LcEoChxnJ8v8aMZy7GTiQyGGABtEQ==";
+        url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.12.0.tgz";
+        sha512 = "8rba/qn/hrUtPL0tDgdhJvp5HoN/3OMOUTmrtPiI0JHfVW6fqBTM9UnCFXJdK7UCUt9ITKIWIL0UBAzTc4hgKg==";
       };
     };
     "snyk-gradle-plugin-3.2.4" = {
@@ -40686,13 +40938,13 @@ let
         sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==";
       };
     };
-    "systeminformation-4.22.0" = {
+    "systeminformation-4.22.1" = {
       name = "systeminformation";
       packageName = "systeminformation";
-      version = "4.22.0";
+      version = "4.22.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.22.0.tgz";
-        sha512 = "Sq6H99xxvBeN54kUdM9DCdbesSLb+S5MZnUD2qy7gutyfS0REYZ4QN6tfsWbYhcsaocrvcpCwoOHblbO+caN4A==";
+        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.22.1.tgz";
+        sha512 = "TjUA91kxGOcwWCic/OLc+zI0twe+GyHFp4mpjZcpG9LpXh0EVMD4zMeIVaEqsmxCWVOM+/FA3V6OB3W/IpLypA==";
       };
     };
     "syswide-cas-5.3.0" = {
@@ -41074,13 +41326,13 @@ let
         sha512 = "a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==";
       };
     };
-    "terminal-kit-1.33.10" = {
+    "terminal-kit-1.33.15" = {
       name = "terminal-kit";
       packageName = "terminal-kit";
-      version = "1.33.10";
+      version = "1.33.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.33.10.tgz";
-        sha512 = "xKJAeyfm9EIkHWWz0C/GXbYW5LytAMzuVT9xZdI9kgLnm9Z7lNkly0WdBCH8WOPD4inZpKjNzBKr0StEOJXBNA==";
+        url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.33.15.tgz";
+        sha512 = "zGZpZRXXAKJw/fyWxY7k8rOzo56OBzzhfPQGloPBP4irhQs6cv4VWMOoVFHze8o7L4YzwtijBotfI479xA4QxQ==";
       };
     };
     "terser-3.17.0" = {
@@ -41110,13 +41362,13 @@ let
         sha512 = "QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==";
       };
     };
-    "test-exclude-4.2.3" = {
+    "test-exclude-6.0.0" = {
       name = "test-exclude";
       packageName = "test-exclude";
-      version = "4.2.3";
+      version = "6.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/test-exclude/-/test-exclude-4.2.3.tgz";
-        sha512 = "SYbXgY64PT+4GAL2ocI3HwPa4Q4TBKm0cwAVeKOt/Aoc0gSpNRjJX8w0pA1LMKZ3LBmd8pYBqApFNQLII9kavA==";
+        url = "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz";
+        sha512 = "cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==";
       };
     };
     "text-extensions-1.9.0" = {
@@ -41569,6 +41821,15 @@ let
         sha512 = "8+Ah9aB1IRXCnIOxXZ0uFozV1nMU5xiu7hhFVUSxZ3bYu+psD4TzagCzVbexUCgNNGJnsmNDQlS4nG3mTyoNkw==";
       };
     };
+    "tmpl-1.0.4" = {
+      name = "tmpl";
+      packageName = "tmpl";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz";
+        sha1 = "23640dd7b42d00433911140820e5cf440e521dd1";
+      };
+    };
     "to-absolute-glob-2.0.2" = {
       name = "to-absolute-glob";
       packageName = "to-absolute-glob";
@@ -42631,13 +42892,13 @@ let
         sha512 = "pcnnhaoG6RtrvHJ1dFncAe8Od6Nuy30oaJ82ts6//sGSXOP5UjBMEthiProjXmMNHOfd93sqlkztifFMcb+4yw==";
       };
     };
-    "uglify-js-3.7.7" = {
+    "uglify-js-3.8.0" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.7.7";
+      version = "3.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.7.tgz";
-        sha512 = "FeSU+hi7ULYy6mn8PKio/tXsdSXN35lm4KgV2asx00kzrLU9Pi3oAslcJT70Jdj7PHX29gGUPOT6+lXGBbemhA==";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.0.tgz";
+        sha512 = "ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ==";
       };
     };
     "uglify-to-browserify-1.0.2" = {
@@ -44899,6 +45160,15 @@ let
         sha1 = "a16d025eb931bd03b52f308caed0f40fcebe9532";
       };
     };
+    "walker-1.0.7" = {
+      name = "walker";
+      packageName = "walker";
+      version = "1.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz";
+        sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb";
+      };
+    };
     "ware-1.3.0" = {
       name = "ware";
       packageName = "ware";
@@ -47338,7 +47608,7 @@ in
         ];
       })
       sources."to-utf8-0.0.1"
-      sources."uglify-js-3.7.7"
+      sources."uglify-js-3.8.0"
       sources."unc-path-regex-0.1.2"
       sources."unique-stream-2.3.1"
       sources."universalify-0.1.2"
@@ -47554,7 +47824,7 @@ in
       sources."@apollo/federation-0.12.0"
       (sources."@apollo/protobufjs-1.0.3" // {
         dependencies = [
-          sources."@types/node-10.17.15"
+          sources."@types/node-10.17.16"
         ];
       })
       sources."@apollographql/apollo-tools-0.4.3"
@@ -47767,7 +48037,7 @@ in
       sources."@types/long-4.0.1"
       sources."@types/mime-2.0.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.1"
+      sources."@types/node-13.7.4"
       sources."@types/node-fetch-2.5.4"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/range-parser-1.2.3"
@@ -47945,7 +48215,7 @@ in
       sources."callsites-2.0.0"
       sources."camel-case-3.0.0"
       sources."camelcase-4.1.0"
-      sources."caniuse-lite-1.0.30001027"
+      sources."caniuse-lite-1.0.30001028"
       sources."capture-stack-trace-1.0.1"
       sources."cardinal-2.1.1"
       sources."caseless-0.12.0"
@@ -48110,7 +48380,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.3.353"
+      sources."electron-to-chromium-1.3.355"
       sources."elegant-spinner-1.0.1"
       sources."emoji-regex-7.0.3"
       sources."encodeurl-1.0.2"
@@ -48263,7 +48533,7 @@ in
       sources."graphql-extensions-0.10.10"
       sources."graphql-subscriptions-1.1.0"
       sources."graphql-tag-2.10.3"
-      sources."graphql-tools-4.0.6"
+      sources."graphql-tools-4.0.7"
       sources."graphql-type-json-0.3.1"
       sources."graphql-upload-8.1.0"
       sources."growly-1.3.0"
@@ -48454,7 +48724,7 @@ in
         ];
       })
       sources."make-dir-1.3.0"
-      sources."make-error-1.3.5"
+      sources."make-error-1.3.6"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       sources."media-typer-0.3.0"
@@ -49351,12 +49621,16 @@ in
   asar = nodeEnv.buildNodePackage {
     name = "asar";
     packageName = "asar";
-    version = "2.0.3";
+    version = "2.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/asar/-/asar-2.0.3.tgz";
-      sha512 = "QdHKO+HOYVtE4B/M3up3i4LSJeJgsa2CTVBrjBf9GgLUPGGUFZowcdJ5yE4gOJuRAHNdqB9JFeRfFfaOu5x8Rw==";
+      url = "https://registry.npmjs.org/asar/-/asar-2.1.0.tgz";
+      sha512 = "d2Ovma+bfqNpvBzY/KU8oPY67ZworixTpkjSx0PCXnQi67c2cXmssaTxpFDUM0ttopXoGx/KRxNg/GDThYbXQA==";
     };
     dependencies = [
+      sources."@types/events-3.0.0"
+      sources."@types/glob-7.1.1"
+      sources."@types/minimatch-3.0.3"
+      sources."@types/node-13.7.4"
       sources."balanced-match-1.0.0"
       sources."bluebird-3.7.2"
       sources."brace-expansion-1.1.11"
@@ -49881,7 +50155,7 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-10.17.15"
+      sources."@types/node-10.17.16"
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.2.16"
       sources."ajv-6.11.0"
@@ -50454,7 +50728,7 @@ in
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.1"
+      sources."@types/node-13.7.4"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       sources."ajv-6.11.0"
@@ -51089,7 +51363,7 @@ in
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.1"
+      sources."@types/node-13.7.4"
       sources."arr-diff-4.0.0"
       sources."arr-flatten-1.1.0"
       sources."arr-union-3.1.0"
@@ -51430,7 +51704,7 @@ in
       sources."@cycle/run-3.4.0"
       sources."@cycle/time-0.10.1"
       sources."@types/cookiejar-2.1.1"
-      sources."@types/node-13.7.1"
+      sources."@types/node-13.7.4"
       sources."@types/superagent-3.8.2"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-2.1.1"
@@ -52653,7 +52927,7 @@ in
       sources."assert-plus-1.0.0"
       sources."async-2.6.3"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.620.0"
+      sources."aws-sdk-2.622.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.9.1"
       sources."base64-js-1.3.1"
@@ -53214,10 +53488,10 @@ in
   eslint_d = nodeEnv.buildNodePackage {
     name = "eslint_d";
     packageName = "eslint_d";
-    version = "8.0.0";
+    version = "8.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint_d/-/eslint_d-8.0.0.tgz";
-      sha512 = "9I+AC6Y7WTX4J1O3GGg1LqGiDxOUedLxzIxtKSWnD1FP3z2MPQbnWNNycg9Pq/L5B0NlszdaBlajUexZ8qzuag==";
+      url = "https://registry.npmjs.org/eslint_d/-/eslint_d-8.1.0.tgz";
+      sha512 = "cNZFOYG+Quphqj+GPoTNe9nsDCRJo2AjHVpu4RkvAxH8+vR2ckvm7ksr+Lwi+kkKuMf4h+QifTAXJ0HuBkJ7FA==";
     };
     dependencies = [
       sources."@babel/code-frame-7.8.3"
@@ -55724,10 +55998,10 @@ in
   gtop = nodeEnv.buildNodePackage {
     name = "gtop";
     packageName = "gtop";
-    version = "1.0.1";
+    version = "1.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/gtop/-/gtop-1.0.1.tgz";
-      sha512 = "rDONVL6bOSKi9H2PuZ+nItRvFML39EeLgV65JRkGPdLri5saUAMVISZV/4jW8LylZBRHysVmaI1nCu5S/0Iilg==";
+      url = "https://registry.npmjs.org/gtop/-/gtop-1.0.2.tgz";
+      sha512 = "Dn/8Kt57CsFLHd9vJIqWuhzXETpm+J86tD444rOz04uUu0kQBUTEBXmwu7zOVntb+TRr4EuyRxBo2tecJAPFmA==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -55779,7 +56053,7 @@ in
       sources."string_decoder-0.10.31"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."systeminformation-4.22.0"
+      sources."systeminformation-4.22.1"
       sources."term-canvas-0.0.5"
       sources."wordwrap-0.0.3"
       sources."x256-0.0.2"
@@ -56619,7 +56893,7 @@ in
       sources."param-case-2.1.1"
       sources."relateurl-0.2.7"
       sources."source-map-0.6.1"
-      sources."uglify-js-3.7.7"
+      sources."uglify-js-3.8.0"
       sources."upper-case-1.1.3"
     ];
     buildInputs = globalBuildInputs;
@@ -58311,7 +58585,7 @@ in
           sources."q-0.9.7"
         ];
       })
-      sources."terminal-kit-1.33.10"
+      sources."terminal-kit-1.33.15"
       (sources."tkwidgets-0.5.26" // {
         dependencies = [
           sources."is-fullwidth-code-point-2.0.0"
@@ -59616,7 +59890,7 @@ in
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.1"
+      sources."@types/node-13.7.4"
       sources."@zkochan/cmd-shim-3.1.0"
       sources."JSONStream-1.3.5"
       sources."abbrev-1.1.1"
@@ -60381,7 +60655,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-fest-0.3.1"
       sources."typedarray-0.0.6"
-      (sources."uglify-js-3.7.7" // {
+      (sources."uglify-js-3.8.0" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -61406,7 +61680,7 @@ in
   "lumo-build-deps-../interpreters/clojurescript/lumo" = nodeEnv.buildNodePackage {
     name = "lumo-build-deps";
     packageName = "lumo-build-deps";
-    version = "1.9.0";
+    version = "1.10.1";
     src = ../interpreters/clojurescript/lumo;
     dependencies = [
       sources."@babel/code-frame-7.8.3"
@@ -61436,9 +61710,13 @@ in
       sources."@babel/helper-split-export-declaration-7.8.3"
       sources."@babel/helper-wrap-function-7.8.3"
       sources."@babel/helpers-7.8.4"
-      sources."@babel/highlight-7.8.3"
+      (sources."@babel/highlight-7.8.3" // {
+        dependencies = [
+          sources."chalk-2.4.2"
+        ];
+      })
       sources."@babel/parser-7.8.4"
-      sources."@babel/plugin-external-helpers-7.0.0"
+      sources."@babel/plugin-external-helpers-7.8.3"
       sources."@babel/plugin-proposal-async-generator-functions-7.8.3"
       sources."@babel/plugin-proposal-class-properties-7.8.3"
       sources."@babel/plugin-proposal-dynamic-import-7.8.3"
@@ -61449,6 +61727,7 @@ in
       sources."@babel/plugin-proposal-optional-chaining-7.8.3"
       sources."@babel/plugin-proposal-unicode-property-regex-7.8.3"
       sources."@babel/plugin-syntax-async-generators-7.8.4"
+      sources."@babel/plugin-syntax-bigint-7.8.3"
       sources."@babel/plugin-syntax-dynamic-import-7.8.3"
       sources."@babel/plugin-syntax-json-strings-7.8.3"
       sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3"
@@ -61489,22 +61768,35 @@ in
       sources."@babel/plugin-transform-typeof-symbol-7.8.4"
       sources."@babel/plugin-transform-unicode-regex-7.8.3"
       sources."@babel/preset-env-7.8.4"
-      sources."@babel/preset-stage-2-7.0.0"
+      sources."@babel/preset-stage-2-7.8.3"
       sources."@babel/runtime-7.8.4"
       sources."@babel/template-7.8.3"
       sources."@babel/traverse-7.8.4"
       sources."@babel/types-7.8.3"
-      sources."@calebboyd/semaphore-1.3.1"
-      sources."@comandeer/babel-plugin-banner-4.1.0"
-      sources."@mrmlnc/readdir-enhanced-2.2.1"
-      sources."@nodelib/fs.stat-1.1.3"
-      sources."@sindresorhus/is-0.7.0"
-      sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/estree-0.0.39"
-      sources."@types/events-3.0.0"
-      sources."@types/glob-7.1.1"
-      sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.1"
+      sources."@cnakazawa/watch-1.0.4"
+      sources."@comandeer/babel-plugin-banner-5.0.0"
+      sources."@istanbuljs/load-nyc-config-1.0.0"
+      sources."@istanbuljs/schema-0.1.2"
+      (sources."@jest/transform-25.1.0" // {
+        dependencies = [
+          sources."source-map-0.6.1"
+        ];
+      })
+      sources."@jest/types-25.1.0"
+      sources."@types/babel__core-7.1.4"
+      sources."@types/babel__generator-7.6.1"
+      sources."@types/babel__template-7.0.2"
+      sources."@types/babel__traverse-7.0.8"
+      sources."@types/color-name-1.1.1"
+      sources."@types/estree-0.0.42"
+      sources."@types/istanbul-lib-coverage-2.0.1"
+      sources."@types/istanbul-lib-report-3.0.0"
+      sources."@types/istanbul-reports-1.1.1"
+      sources."@types/node-13.7.4"
+      sources."@types/normalize-package-data-2.4.0"
+      sources."@types/resolve-0.0.8"
+      sources."@types/yargs-15.0.3"
+      sources."@types/yargs-parser-15.0.0"
       sources."@webassemblyjs/ast-1.8.5"
       sources."@webassemblyjs/floating-point-hex-parser-1.8.5"
       sources."@webassemblyjs/helper-api-error-1.8.5"
@@ -61525,69 +61817,25 @@ in
       sources."@webassemblyjs/wast-printer-1.8.5"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
+      sources."JSONStream-1.3.5"
       sources."ace.improved-0.2.1"
-      sources."acorn-6.4.0"
+      sources."acorn-7.1.0"
+      sources."acorn-node-1.8.2"
+      sources."acorn-walk-7.1.1"
       sources."ajv-6.11.0"
       sources."ajv-errors-1.0.1"
       sources."ajv-keywords-3.4.1"
       sources."amdefine-1.0.1"
-      sources."ansi-regex-2.1.1"
-      sources."ansi-styles-2.2.1"
-      (sources."anymatch-2.0.0" // {
-        dependencies = [
-          sources."arr-diff-4.0.0"
-          sources."array-unique-0.3.2"
-          sources."braces-2.3.2"
-          sources."debug-2.6.9"
-          sources."define-property-1.0.0"
-          (sources."expand-brackets-2.1.4" // {
-            dependencies = [
-              sources."define-property-0.2.5"
-            ];
-          })
-          sources."extend-shallow-2.0.1"
-          sources."extglob-2.0.4"
-          sources."fill-range-4.0.0"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-5.1.0"
-            ];
-          })
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."isobject-3.0.1"
-          sources."kind-of-6.0.3"
-          sources."micromatch-3.1.10"
-          sources."ms-2.0.0"
-        ];
-      })
-      sources."app-builder-5.2.0"
+      sources."ansi-regex-4.1.0"
+      sources."ansi-styles-3.2.1"
+      sources."anymatch-3.1.1"
       sources."aproba-1.2.0"
-      (sources."archive-type-4.0.0" // {
-        dependencies = [
-          sources."file-type-4.4.0"
-        ];
-      })
-      sources."arr-diff-2.0.0"
+      sources."argparse-1.0.10"
+      sources."arr-diff-4.0.0"
       sources."arr-flatten-1.1.0"
       sources."arr-union-3.1.0"
-      sources."array-union-1.0.2"
-      sources."array-uniq-1.0.3"
-      sources."array-unique-0.2.1"
-      sources."arrify-1.0.1"
+      sources."array-unique-0.3.2"
+      sources."asn1-0.2.4"
       sources."asn1.js-4.10.1"
       (sources."assert-1.5.0" // {
         dependencies = [
@@ -61595,23 +61843,17 @@ in
           sources."util-0.10.3"
         ];
       })
+      sources."assert-plus-1.0.0"
       sources."assign-symbols-1.0.0"
+      sources."async-3.1.1"
       sources."async-each-1.0.3"
       sources."async-retry-1.3.1"
+      sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."babel-code-frame-6.26.0" // {
-        dependencies = [
-          sources."chalk-1.1.3"
-          sources."js-tokens-3.0.2"
-        ];
-      })
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.9.1"
       sources."babel-core-7.0.0-bridge.0"
-      sources."babel-eslint-10.0.1"
-      (sources."babel-generator-6.26.1" // {
-        dependencies = [
-          sources."jsesc-1.3.0"
-        ];
-      })
+      sources."babel-eslint-10.0.3"
       sources."babel-helper-evaluate-path-0.5.0"
       sources."babel-helper-flip-expressions-0.4.3"
       sources."babel-helper-is-nodes-equiv-0.0.1"
@@ -61619,16 +61861,16 @@ in
       sources."babel-helper-mark-eval-scopes-0.4.3"
       sources."babel-helper-remove-or-void-0.4.3"
       sources."babel-helper-to-multiple-sequence-expressions-0.5.0"
-      sources."babel-jest-23.6.0"
+      sources."babel-jest-25.1.0"
       (sources."babel-loader-8.0.6" // {
         dependencies = [
-          sources."pify-4.0.1"
+          sources."minimist-0.0.8"
+          sources."mkdirp-0.5.1"
         ];
       })
-      sources."babel-messages-6.23.0"
       sources."babel-plugin-dynamic-import-node-2.3.0"
-      sources."babel-plugin-istanbul-4.1.6"
-      sources."babel-plugin-jest-hoist-23.2.0"
+      sources."babel-plugin-istanbul-6.0.0"
+      sources."babel-plugin-jest-hoist-25.1.0"
       sources."babel-plugin-minify-builtins-0.5.0"
       sources."babel-plugin-minify-constant-folding-0.5.0"
       sources."babel-plugin-minify-dead-code-elimination-0.5.1"
@@ -61641,7 +61883,6 @@ in
       sources."babel-plugin-minify-simplify-0.5.1"
       sources."babel-plugin-minify-type-constructors-0.4.3"
       sources."babel-plugin-syntax-flow-6.18.0"
-      sources."babel-plugin-syntax-object-rest-spread-6.13.0"
       sources."babel-plugin-transform-flow-strip-types-6.22.0"
       sources."babel-plugin-transform-inline-consecutive-adds-0.4.3"
       sources."babel-plugin-transform-member-expression-literals-6.9.4"
@@ -61654,44 +61895,50 @@ in
       sources."babel-plugin-transform-remove-undefined-0.5.0"
       sources."babel-plugin-transform-simplify-comparison-operators-6.9.4"
       sources."babel-plugin-transform-undefined-to-void-6.9.4"
-      sources."babel-preset-jest-23.2.0"
+      sources."babel-preset-jest-25.1.0"
       sources."babel-preset-minify-0.5.1"
       (sources."babel-runtime-6.26.0" // {
         dependencies = [
           sources."regenerator-runtime-0.11.1"
         ];
       })
-      sources."babel-template-6.26.0"
-      (sources."babel-traverse-6.26.0" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."globals-9.18.0"
-          sources."ms-2.0.0"
-        ];
-      })
-      (sources."babel-types-6.26.0" // {
-        dependencies = [
-          sources."to-fast-properties-1.0.3"
-        ];
-      })
-      sources."babylon-6.18.0"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
           sources."define-property-1.0.0"
-          sources."isobject-3.0.1"
         ];
       })
       sources."base64-js-1.3.1"
+      sources."bcrypt-pbkdf-1.0.2"
       sources."big.js-5.2.2"
       sources."binary-extensions-1.13.1"
       sources."bindings-1.5.0"
-      sources."bl-1.2.2"
+      (sources."bl-3.0.0" // {
+        dependencies = [
+          sources."readable-stream-3.6.0"
+        ];
+      })
       sources."bluebird-3.7.2"
       sources."bn.js-4.11.8"
       sources."brace-expansion-1.1.11"
-      sources."braces-1.8.5"
+      (sources."braces-2.3.2" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
       sources."brorand-1.1.0"
+      sources."browser-pack-6.1.0"
+      (sources."browser-resolve-1.11.3" // {
+        dependencies = [
+          sources."resolve-1.1.7"
+        ];
+      })
+      (sources."browserify-16.5.0" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+          sources."mkdirp-0.5.1"
+        ];
+      })
       sources."browserify-aes-1.2.0"
       sources."browserify-cipher-1.0.1"
       sources."browserify-des-1.0.2"
@@ -61699,57 +61946,47 @@ in
       sources."browserify-sign-4.0.4"
       sources."browserify-zlib-0.2.0"
       sources."browserslist-4.8.7"
+      sources."bser-2.1.1"
       sources."buffer-5.4.3"
-      sources."buffer-alloc-1.2.0"
-      sources."buffer-alloc-unsafe-1.1.0"
-      sources."buffer-crc32-0.2.13"
-      sources."buffer-fill-1.0.0"
       sources."buffer-from-1.1.1"
       sources."buffer-xor-1.0.3"
-      sources."builtin-modules-2.0.0"
+      sources."builtin-modules-3.1.0"
       sources."builtin-status-codes-3.0.0"
-      sources."cacache-12.0.3"
-      (sources."cache-base-1.0.1" // {
+      (sources."cacache-12.0.3" // {
         dependencies = [
-          sources."isobject-3.0.1"
+          sources."minimist-0.0.8"
+          sources."mkdirp-0.5.1"
         ];
       })
-      (sources."cacheable-request-2.1.4" // {
-        dependencies = [
-          sources."lowercase-keys-1.0.0"
-        ];
-      })
-      sources."call-me-maybe-1.0.1"
+      sources."cache-base-1.0.1"
+      sources."cached-path-relative-1.0.2"
       sources."camelcase-5.3.1"
-      sources."caniuse-lite-1.0.30001027"
-      sources."caw-2.0.1"
-      (sources."chalk-2.4.2" // {
+      sources."caniuse-lite-1.0.30001028"
+      sources."capture-exit-2.0.0"
+      sources."caseless-0.12.0"
+      (sources."chalk-3.0.0" // {
         dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."supports-color-5.5.0"
+          sources."ansi-styles-4.2.1"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+          sources."has-flag-4.0.0"
+          sources."supports-color-7.1.0"
         ];
       })
-      sources."cherow-1.6.9"
       (sources."chokidar-2.1.8" // {
         dependencies = [
-          sources."array-unique-0.3.2"
-          sources."braces-2.3.2"
-          sources."extend-shallow-2.0.1"
-          sources."fill-range-4.0.0"
-          (sources."glob-parent-3.1.0" // {
+          (sources."anymatch-2.0.0" // {
             dependencies = [
-              sources."is-glob-3.1.0"
+              sources."normalize-path-2.1.1"
             ];
           })
-          sources."is-extglob-2.1.1"
-          sources."is-glob-4.0.1"
-          sources."is-number-3.0.0"
-          sources."isobject-3.0.1"
-          sources."normalize-path-3.0.0"
+          sources."fsevents-1.2.11"
+          sources."micromatch-3.1.10"
         ];
       })
       sources."chownr-1.1.4"
       sources."chrome-trace-event-1.0.2"
+      sources."ci-info-2.0.0"
       sources."cipher-base-1.0.4"
       (sources."class-utils-0.3.6" // {
         dependencies = [
@@ -61765,37 +62002,38 @@ in
             ];
           })
           sources."is-descriptor-0.1.6"
-          sources."isobject-3.0.1"
           sources."kind-of-5.1.0"
         ];
       })
-      sources."cli-cursor-2.1.0"
-      sources."cli-spinners-2.2.0"
-      (sources."cliui-5.0.0" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."strip-ansi-5.2.0"
-        ];
-      })
+      sources."cliui-5.0.0"
       sources."clone-2.1.2"
       sources."clone-buffer-1.0.0"
-      sources."clone-response-1.0.2"
       sources."clone-stats-1.0.0"
       sources."cloneable-readable-1.1.3"
       sources."collection-visit-1.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."commander-2.8.1"
+      sources."colors-1.4.0"
+      (sources."combine-source-map-0.8.0" // {
+        dependencies = [
+          sources."convert-source-map-1.1.3"
+        ];
+      })
+      sources."combined-stream-1.0.8"
+      sources."commander-2.20.3"
       sources."commondir-1.0.1"
       sources."component-emitter-1.3.0"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
-      sources."config-chain-1.1.12"
       sources."console-browserify-1.2.0"
       sources."constants-browserify-1.0.0"
-      sources."content-disposition-0.5.3"
       sources."convert-source-map-1.7.0"
-      sources."copy-concurrently-1.0.5"
+      (sources."copy-concurrently-1.0.5" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+          sources."mkdirp-0.5.1"
+        ];
+      })
       sources."copy-descriptor-0.1.1"
       sources."core-js-2.6.11"
       (sources."core-js-compat-3.6.4" // {
@@ -61807,293 +62045,162 @@ in
       sources."create-ecdh-4.0.3"
       sources."create-hash-1.2.0"
       sources."create-hmac-1.1.7"
-      sources."cross-env-5.2.0"
+      (sources."cross-env-7.0.0" // {
+        dependencies = [
+          sources."cross-spawn-7.0.1"
+          sources."path-key-3.1.1"
+          sources."shebang-command-2.0.0"
+          sources."shebang-regex-3.0.0"
+          sources."which-2.0.2"
+        ];
+      })
       sources."cross-spawn-6.0.5"
       sources."crypto-browserify-3.12.0"
       sources."cyclist-1.0.1"
+      sources."dash-ast-1.0.0"
+      sources."dashdash-1.14.1"
       sources."death-1.1.0"
       sources."debug-4.1.1"
       sources."decamelize-1.2.0"
       sources."decode-uri-component-0.2.0"
-      (sources."decompress-4.2.0" // {
-        dependencies = [
-          (sources."make-dir-1.3.0" // {
-            dependencies = [
-              sources."pify-3.0.0"
-            ];
-          })
-        ];
-      })
-      sources."decompress-response-3.3.0"
-      (sources."decompress-tar-4.1.1" // {
-        dependencies = [
-          sources."file-type-5.2.0"
-        ];
-      })
-      (sources."decompress-tarbz2-4.1.1" // {
-        dependencies = [
-          sources."file-type-6.2.0"
-        ];
-      })
-      (sources."decompress-targz-4.1.1" // {
-        dependencies = [
-          sources."file-type-5.2.0"
-        ];
-      })
-      (sources."decompress-unzip-4.0.1" // {
-        dependencies = [
-          sources."file-type-3.9.0"
-          sources."get-stream-2.3.1"
-        ];
-      })
-      (sources."defaults-1.0.3" // {
-        dependencies = [
-          sources."clone-1.0.4"
-        ];
-      })
-      sources."defer-to-connect-1.1.3"
       sources."define-properties-1.1.3"
-      (sources."define-property-2.0.2" // {
-        dependencies = [
-          sources."isobject-3.0.1"
-        ];
-      })
+      sources."define-property-2.0.2"
+      sources."defined-1.0.0"
+      sources."delayed-stream-1.0.0"
+      sources."deps-sort-2.0.1"
       sources."des.js-1.0.1"
       sources."detect-file-1.0.0"
-      sources."detect-indent-4.0.0"
+      sources."detective-5.2.0"
       sources."diffie-hellman-5.0.3"
-      (sources."dir-glob-2.0.0" // {
-        dependencies = [
-          sources."path-type-3.0.0"
-          sources."pify-3.0.0"
-        ];
-      })
       sources."domain-browser-1.2.0"
-      (sources."download-7.1.0" // {
-        dependencies = [
-          sources."got-8.3.2"
-          sources."make-dir-1.3.0"
-          sources."pify-3.0.0"
-        ];
-      })
-      sources."duplexer3-0.1.4"
+      sources."duplexer2-0.1.4"
       sources."duplexify-3.7.1"
-      sources."electron-to-chromium-1.3.353"
+      sources."ecc-jsbn-0.1.2"
+      sources."electron-to-chromium-1.3.355"
       sources."elliptic-6.5.2"
       sources."emoji-regex-7.0.3"
-      sources."emojis-list-2.1.0"
+      sources."emojis-list-3.0.0"
       sources."end-of-stream-1.4.4"
-      sources."enhanced-resolve-4.1.1"
+      (sources."enhanced-resolve-4.1.1" // {
+        dependencies = [
+          sources."memory-fs-0.5.0"
+        ];
+      })
       sources."errno-0.1.7"
       sources."error-ex-1.3.2"
+      sources."es-abstract-1.17.4"
+      sources."es-to-primitive-1.2.1"
       sources."escape-string-regexp-1.0.5"
-      sources."eslint-scope-3.7.1"
+      sources."eslint-scope-4.0.3"
       sources."eslint-visitor-keys-1.1.0"
+      sources."esprima-4.0.1"
       sources."esrecurse-4.2.1"
       sources."estraverse-4.3.0"
       sources."estree-walker-0.6.1"
       sources."esutils-2.0.3"
-      sources."events-3.1.0"
+      sources."events-2.1.0"
       sources."evp_bytestokey-1.0.3"
-      (sources."execa-1.0.0" // {
+      sources."exec-sh-0.3.4"
+      sources."execa-1.0.0"
+      (sources."expand-brackets-2.1.4" // {
         dependencies = [
-          sources."get-stream-4.1.0"
+          sources."debug-2.6.9"
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+          sources."ms-2.0.0"
         ];
       })
-      sources."expand-brackets-0.1.5"
-      sources."expand-range-1.8.2"
       sources."expand-tilde-2.0.2"
-      sources."ext-list-2.2.2"
-      sources."ext-name-5.0.0"
+      sources."extend-3.0.2"
       (sources."extend-shallow-3.0.2" // {
         dependencies = [
           sources."is-extendable-1.0.1"
         ];
       })
-      sources."extglob-0.3.2"
-      sources."fast-deep-equal-3.1.1"
-      (sources."fast-glob-2.2.7" // {
+      (sources."extglob-2.0.4" // {
         dependencies = [
-          sources."arr-diff-4.0.0"
-          sources."array-unique-0.3.2"
-          (sources."braces-2.3.2" // {
-            dependencies = [
-              sources."extend-shallow-2.0.1"
-            ];
-          })
-          sources."debug-2.6.9"
-          (sources."expand-brackets-2.1.4" // {
-            dependencies = [
-              sources."define-property-0.2.5"
-              sources."extend-shallow-2.0.1"
-            ];
-          })
-          (sources."extglob-2.0.4" // {
-            dependencies = [
-              sources."define-property-1.0.0"
-              sources."extend-shallow-2.0.1"
-            ];
-          })
-          (sources."fill-range-4.0.0" // {
-            dependencies = [
-              sources."extend-shallow-2.0.1"
-            ];
-          })
-          (sources."glob-parent-3.1.0" // {
-            dependencies = [
-              sources."is-glob-3.1.0"
-            ];
-          })
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-5.1.0"
-            ];
-          })
-          sources."is-extglob-2.1.1"
-          sources."is-glob-4.0.1"
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."isobject-3.0.1"
-          sources."kind-of-6.0.3"
-          sources."micromatch-3.1.10"
-          sources."ms-2.0.0"
+          sources."define-property-1.0.0"
+          sources."extend-shallow-2.0.1"
         ];
       })
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-3.1.1"
       sources."fast-json-stable-stringify-2.1.0"
-      sources."fd-slicer-1.1.0"
+      sources."fast-safe-stringify-2.0.7"
+      sources."fb-watchman-2.0.1"
       sources."figgy-pudding-3.5.1"
-      sources."file-type-8.1.0"
       sources."file-uri-to-path-1.0.0"
-      sources."filename-regex-2.0.1"
-      sources."filename-reserved-regex-2.0.0"
-      sources."filenamify-2.1.0"
-      sources."fill-range-2.2.4"
+      (sources."fill-range-4.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
       sources."find-cache-dir-2.1.0"
-      sources."find-up-2.1.0"
+      sources."find-up-4.1.0"
       (sources."findup-sync-3.0.0" // {
         dependencies = [
-          sources."arr-diff-4.0.0"
-          sources."array-unique-0.3.2"
-          sources."braces-2.3.2"
-          sources."debug-2.6.9"
-          sources."define-property-1.0.0"
-          (sources."expand-brackets-2.1.4" // {
-            dependencies = [
-              sources."define-property-0.2.5"
-            ];
-          })
-          sources."extend-shallow-2.0.1"
-          sources."extglob-2.0.4"
-          sources."fill-range-4.0.0"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-5.1.0"
-            ];
-          })
-          sources."is-extglob-2.1.1"
-          sources."is-glob-4.0.1"
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."isobject-3.0.1"
-          sources."kind-of-6.0.3"
           sources."micromatch-3.1.10"
-          sources."ms-2.0.0"
         ];
       })
-      sources."flow-bin-0.85.0"
+      sources."flow-bin-0.118.0"
       sources."flush-write-stream-1.1.1"
       sources."for-in-1.0.2"
-      sources."for-own-0.1.5"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.3"
       sources."fragment-cache-0.2.1"
       sources."from2-2.3.0"
       sources."fs-constants-1.0.0"
       sources."fs-write-stream-atomic-1.0.10"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.2.11"
+      sources."fsevents-2.1.2"
       sources."function-bind-1.1.1"
       sources."gensync-1.0.0-beta.1"
+      sources."get-assigned-identifiers-1.2.0"
       sources."get-caller-file-2.0.5"
-      sources."get-proxy-2.1.0"
-      sources."get-stream-3.0.0"
+      sources."get-stream-4.1.0"
       sources."get-value-2.0.6"
+      sources."getpass-0.1.7"
       sources."glob-7.1.6"
-      sources."glob-base-0.3.0"
-      sources."glob-parent-2.0.0"
-      sources."glob-to-regexp-0.3.0"
+      (sources."glob-parent-3.1.0" // {
+        dependencies = [
+          sources."is-glob-3.1.0"
+        ];
+      })
       (sources."global-modules-2.0.0" // {
         dependencies = [
           sources."global-prefix-3.0.0"
-          sources."kind-of-6.0.3"
         ];
       })
       sources."global-prefix-1.0.2"
       sources."globals-11.12.0"
-      (sources."globby-8.0.2" // {
-        dependencies = [
-          sources."pify-3.0.0"
-        ];
-      })
       sources."google-closure-compiler-js-20170910.0.1"
-      (sources."got-9.6.0" // {
-        dependencies = [
-          sources."@sindresorhus/is-0.14.0"
-          (sources."cacheable-request-6.1.0" // {
-            dependencies = [
-              sources."get-stream-5.1.0"
-              sources."lowercase-keys-2.0.0"
-            ];
-          })
-          sources."get-stream-4.1.0"
-          sources."http-cache-semantics-4.0.4"
-          sources."normalize-url-4.5.0"
-          sources."p-cancelable-1.1.0"
-        ];
-      })
       sources."graceful-fs-4.2.3"
-      sources."graceful-readlink-1.0.1"
-      sources."has-ansi-2.0.0"
-      sources."has-flag-3.0.0"
-      sources."has-symbol-support-x-1.4.2"
-      sources."has-symbols-1.0.1"
-      sources."has-to-string-tag-x-1.4.1"
-      (sources."has-value-1.0.0" // {
+      (sources."gunzip-maybe-1.4.1" // {
         dependencies = [
-          sources."isobject-3.0.1"
+          sources."browserify-zlib-0.1.4"
+          sources."pako-0.2.9"
         ];
       })
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.1.3"
+      sources."has-1.0.3"
+      sources."has-flag-3.0.0"
+      sources."has-symbols-1.0.1"
+      sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
         dependencies = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
           sources."kind-of-4.0.0"
         ];
       })
@@ -62102,119 +62209,134 @@ in
       sources."hmac-drbg-1.0.1"
       sources."homedir-polyfill-1.0.3"
       sources."hosted-git-info-2.8.5"
-      sources."http-cache-semantics-3.8.1"
+      sources."htmlescape-1.1.1"
+      sources."http-signature-1.2.0"
       sources."https-browserify-1.0.0"
       sources."ieee754-1.1.13"
       sources."iferr-0.1.5"
-      sources."ignore-3.3.10"
       sources."import-local-2.0.0"
       sources."imurmurhash-0.1.4"
       sources."infer-owner-1.0.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
+      sources."inline-source-map-0.6.2"
+      sources."insert-module-globals-7.2.0"
       sources."interpret-1.2.0"
-      sources."into-stream-3.1.0"
       sources."invariant-2.2.4"
       sources."invert-kv-2.0.0"
-      (sources."is-accessor-descriptor-1.0.0" // {
-        dependencies = [
-          sources."kind-of-6.0.3"
-        ];
-      })
+      sources."is-accessor-descriptor-1.0.0"
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
-      (sources."is-data-descriptor-1.0.0" // {
-        dependencies = [
-          sources."kind-of-6.0.3"
-        ];
-      })
-      (sources."is-descriptor-1.0.2" // {
-        dependencies = [
-          sources."kind-of-6.0.3"
-        ];
-      })
-      sources."is-dotfile-1.0.3"
-      sources."is-equal-shallow-0.1.3"
+      sources."is-callable-1.1.5"
+      sources."is-ci-2.0.0"
+      sources."is-data-descriptor-1.0.0"
+      sources."is-date-object-1.0.2"
+      sources."is-deflate-1.0.0"
+      sources."is-descriptor-1.0.2"
       sources."is-extendable-0.1.1"
-      sources."is-extglob-1.0.0"
-      sources."is-finite-1.1.0"
+      sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-2.0.0"
-      sources."is-glob-2.0.1"
+      sources."is-glob-4.0.1"
+      sources."is-gzip-1.0.0"
       sources."is-module-1.0.0"
-      sources."is-natural-number-4.0.1"
-      sources."is-number-2.1.0"
-      sources."is-object-1.0.1"
-      sources."is-plain-obj-1.1.0"
-      (sources."is-plain-object-2.0.4" // {
+      (sources."is-number-3.0.0" // {
         dependencies = [
-          sources."isobject-3.0.1"
+          sources."kind-of-3.2.2"
         ];
       })
-      sources."is-posix-bracket-0.1.1"
-      sources."is-primitive-2.0.0"
-      sources."is-retry-allowed-1.2.0"
+      sources."is-plain-object-2.0.4"
+      (sources."is-reference-1.1.4" // {
+        dependencies = [
+          sources."@types/estree-0.0.39"
+        ];
+      })
+      sources."is-regex-1.0.5"
       sources."is-stream-1.1.0"
-      sources."is-utf8-0.2.1"
+      sources."is-symbol-1.0.3"
+      sources."is-typedarray-1.0.0"
       sources."is-windows-1.0.2"
       sources."is-wsl-1.1.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
-      sources."isobject-2.1.0"
-      sources."istanbul-lib-coverage-1.2.1"
-      sources."istanbul-lib-instrument-1.10.2"
-      sources."isurl-1.0.0"
+      sources."isobject-3.0.1"
+      sources."isstream-0.1.2"
+      sources."istanbul-lib-coverage-3.0.0"
+      (sources."istanbul-lib-instrument-4.0.1" // {
+        dependencies = [
+          sources."semver-6.3.0"
+        ];
+      })
+      sources."jest-haste-map-25.1.0"
+      sources."jest-regex-util-25.1.0"
+      sources."jest-serializer-25.1.0"
+      (sources."jest-util-25.1.0" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+          sources."mkdirp-0.5.1"
+        ];
+      })
+      (sources."jest-worker-25.1.0" // {
+        dependencies = [
+          sources."has-flag-4.0.0"
+          sources."supports-color-7.1.0"
+        ];
+      })
       sources."js-tokens-4.0.0"
+      sources."js-yaml-3.13.1"
+      sources."jsbn-0.1.1"
       sources."jsesc-2.5.2"
-      sources."json-buffer-3.0.0"
       sources."json-parse-better-errors-1.0.2"
+      sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.4.1"
+      sources."json-stable-stringify-0.0.1"
+      sources."json-stringify-safe-5.0.1"
       sources."json5-2.1.1"
+      sources."jsonify-0.0.0"
+      sources."jsonparse-1.3.1"
+      sources."jsprim-1.4.1"
       sources."jszip-git://github.com/anmonteiro/jszip#patch-1"
-      sources."keyv-3.0.0"
-      sources."kind-of-3.2.2"
+      sources."kind-of-6.0.3"
+      sources."labeled-stream-splicer-2.0.2"
       sources."lcid-2.0.0"
       sources."leven-3.1.0"
       sources."levenary-1.1.1"
-      sources."load-json-file-1.1.0"
+      sources."lines-and-columns-1.1.6"
       sources."loader-runner-2.4.0"
-      (sources."loader-utils-1.2.3" // {
+      (sources."loader-utils-1.4.0" // {
         dependencies = [
           sources."json5-1.0.1"
         ];
       })
-      sources."locate-path-2.0.0"
+      sources."locate-path-5.0.0"
       sources."lodash-4.17.15"
-      sources."log-symbols-2.2.0"
+      sources."lodash.memoize-3.0.4"
       sources."loose-envify-1.4.0"
-      sources."lowercase-keys-1.0.1"
       sources."lru-cache-5.1.1"
       sources."magic-string-0.25.6"
-      (sources."make-dir-2.1.0" // {
-        dependencies = [
-          sources."pify-4.0.1"
-        ];
-      })
+      sources."make-dir-2.1.0"
+      sources."makeerror-1.0.11"
       sources."mamacro-0.0.3"
       sources."map-age-cleaner-0.1.3"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
-      sources."math-random-1.0.4"
       sources."md5.js-1.3.5"
-      (sources."mem-4.3.0" // {
+      sources."mem-4.3.0"
+      sources."memory-fs-0.4.1"
+      sources."merge-stream-2.0.0"
+      (sources."micromatch-4.0.2" // {
         dependencies = [
-          sources."mimic-fn-2.1.0"
-          sources."p-is-promise-2.1.0"
+          sources."braces-3.0.2"
+          sources."fill-range-7.0.1"
+          sources."is-number-7.0.0"
+          sources."to-regex-range-5.0.1"
         ];
       })
-      sources."memory-fs-0.5.0"
-      sources."merge2-1.3.0"
-      sources."micromatch-2.3.11"
       sources."miller-rabin-4.0.1"
       sources."mime-db-1.43.0"
-      sources."mimic-fn-1.2.0"
-      sources."mimic-response-1.0.1"
+      sources."mime-types-2.1.26"
+      sources."mimic-fn-2.1.0"
       sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
@@ -62225,54 +62347,43 @@ in
           sources."is-extendable-1.0.1"
         ];
       })
-      (sources."mkdirp-0.5.1" // {
+      sources."mkdirp-1.0.3"
+      sources."module-deps-6.2.2"
+      (sources."move-concurrently-1.0.1" // {
         dependencies = [
           sources."minimist-0.0.8"
+          sources."mkdirp-0.5.1"
         ];
       })
-      sources."move-concurrently-1.0.1"
       sources."ms-2.1.2"
-      sources."multistream-2.1.1"
       sources."nan-2.14.0"
-      (sources."nanomatch-1.2.13" // {
-        dependencies = [
-          sources."arr-diff-4.0.0"
-          sources."array-unique-0.3.2"
-          sources."kind-of-6.0.3"
-        ];
-      })
+      sources."nanomatch-1.2.13"
+      sources."ncp-2.0.0"
       sources."neo-async-2.6.1"
-      (sources."nexe-3.0.0-beta.7" // {
-        dependencies = [
-          sources."pify-4.0.1"
-        ];
-      })
       sources."nice-try-1.0.5"
       sources."node-fetch-2.6.0"
+      sources."node-int64-0.4.0"
       (sources."node-libs-browser-2.2.1" // {
         dependencies = [
           sources."buffer-4.9.2"
-          sources."punycode-1.4.1"
+          sources."events-3.1.0"
+          sources."inherits-2.0.3"
+          sources."stream-http-2.8.3"
+          sources."timers-browserify-2.0.11"
+          sources."tty-browserify-0.0.0"
+          sources."util-0.11.1"
         ];
       })
+      sources."node-modules-regexp-1.0.0"
       (sources."node-releases-1.1.49" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
       })
       sources."normalize-package-data-2.5.0"
-      sources."normalize-path-2.1.1"
-      (sources."normalize-url-2.0.1" // {
-        dependencies = [
-          sources."sort-keys-2.0.0"
-        ];
-      })
-      (sources."npm-conf-1.1.3" // {
-        dependencies = [
-          sources."pify-3.0.0"
-        ];
-      })
+      sources."normalize-path-3.0.0"
       sources."npm-run-path-2.0.2"
+      sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
       (sources."object-copy-0.1.0" // {
         dependencies = [
@@ -62284,81 +62395,65 @@ in
               sources."kind-of-5.1.0"
             ];
           })
+          sources."kind-of-3.2.2"
         ];
       })
+      sources."object-inspect-1.7.0"
       sources."object-keys-1.1.1"
-      (sources."object-visit-1.0.1" // {
-        dependencies = [
-          sources."isobject-3.0.1"
-        ];
-      })
+      sources."object-visit-1.0.1"
       sources."object.assign-4.1.0"
-      sources."object.omit-2.0.1"
-      (sources."object.pick-1.3.0" // {
-        dependencies = [
-          sources."isobject-3.0.1"
-        ];
-      })
+      sources."object.getownpropertydescriptors-2.1.0"
+      sources."object.pick-1.3.0"
       sources."once-1.4.0"
-      sources."onetime-2.0.1"
-      (sources."ora-3.4.0" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."strip-ansi-5.2.0"
-        ];
-      })
       sources."os-browserify-0.3.0"
       sources."os-locale-3.1.0"
-      sources."p-cancelable-0.4.1"
       sources."p-defer-1.0.0"
-      sources."p-event-2.3.1"
       sources."p-finally-1.0.0"
-      sources."p-is-promise-1.1.0"
-      sources."p-limit-1.3.0"
-      sources."p-locate-2.0.0"
-      sources."p-timeout-2.0.1"
-      sources."p-try-1.0.0"
+      sources."p-is-promise-2.1.0"
+      sources."p-limit-2.2.2"
+      sources."p-locate-4.1.0"
+      sources."p-try-2.2.0"
       sources."pako-1.0.11"
       sources."parallel-transform-1.2.0"
-      sources."paredit.js-0.3.4"
+      sources."paredit.js-0.3.6"
+      sources."parents-1.0.1"
       sources."parse-asn1-5.1.5"
-      sources."parse-glob-3.0.4"
-      sources."parse-json-2.2.0"
+      sources."parse-json-5.0.0"
       sources."parse-passwd-1.0.0"
       sources."pascalcase-0.1.1"
       sources."path-browserify-0.0.1"
       sources."path-dirname-1.0.2"
-      sources."path-exists-3.0.0"
+      sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-key-2.0.1"
       sources."path-parse-1.0.6"
-      sources."path-type-1.1.0"
+      sources."path-platform-0.11.15"
       sources."pbkdf2-3.0.17"
-      sources."pend-1.2.0"
-      sources."pify-2.3.0"
-      sources."pinkie-2.0.4"
-      sources."pinkie-promise-2.0.1"
+      sources."peek-stream-1.1.3"
+      sources."performance-now-2.1.0"
+      sources."picomatch-2.2.1"
+      sources."pify-4.0.1"
+      sources."pinkie-1.0.0"
+      sources."pinkie-promise-1.0.0"
+      sources."pirates-4.0.1"
       (sources."pkg-dir-3.0.0" // {
         dependencies = [
           sources."find-up-3.0.0"
           sources."locate-path-3.0.0"
-          sources."p-limit-2.2.2"
           sources."p-locate-3.0.0"
-          sources."p-try-2.2.0"
+          sources."path-exists-3.0.0"
         ];
       })
       sources."posix-character-classes-0.1.1"
       sources."posix-getopt-git://github.com/anmonteiro/node-getopt#master"
-      sources."prepend-http-2.0.0"
-      sources."preserve-0.2.0"
-      sources."prettier-1.15.1"
+      sources."prettier-1.19.1"
       sources."private-0.1.8"
       sources."process-0.11.10"
       sources."process-nextick-args-2.0.1"
       sources."progress-2.0.3"
       sources."promise-inflight-1.0.1"
-      sources."proto-list-1.2.4"
       sources."prr-1.0.1"
+      sources."psl-1.7.0"
       sources."public-encrypt-4.0.3"
       sources."pump-3.0.0"
       (sources."pumpify-1.5.1" // {
@@ -62366,78 +62461,29 @@ in
           sources."pump-2.0.1"
         ];
       })
-      sources."punycode-2.1.1"
-      sources."query-string-5.1.1"
+      sources."punycode-1.4.1"
+      sources."qs-6.5.2"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
-      (sources."randomatic-3.1.1" // {
-        dependencies = [
-          sources."is-number-4.0.0"
-          sources."kind-of-6.0.3"
-        ];
-      })
       sources."randombytes-2.1.0"
       sources."randomfill-1.0.4"
-      (sources."read-pkg-4.0.1" // {
+      sources."read-only-stream-2.0.0"
+      sources."read-pkg-5.2.0"
+      (sources."readable-stream-2.3.7" // {
         dependencies = [
-          sources."parse-json-4.0.0"
-          sources."pify-3.0.0"
+          sources."string_decoder-1.1.1"
         ];
       })
-      (sources."read-pkg-up-1.0.1" // {
-        dependencies = [
-          sources."find-up-1.1.2"
-          sources."path-exists-2.1.0"
-          sources."read-pkg-1.1.0"
-        ];
-      })
-      sources."readable-stream-2.3.7"
       (sources."readdirp-2.2.1" // {
         dependencies = [
-          sources."arr-diff-4.0.0"
-          sources."array-unique-0.3.2"
-          sources."braces-2.3.2"
-          sources."debug-2.6.9"
-          sources."define-property-1.0.0"
-          (sources."expand-brackets-2.1.4" // {
-            dependencies = [
-              sources."define-property-0.2.5"
-            ];
-          })
-          sources."extend-shallow-2.0.1"
-          sources."extglob-2.0.4"
-          sources."fill-range-4.0.0"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-5.1.0"
-            ];
-          })
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."isobject-3.0.1"
-          sources."kind-of-6.0.3"
           sources."micromatch-3.1.10"
-          sources."ms-2.0.0"
         ];
       })
+      sources."realpath-native-1.1.0"
       sources."regenerate-1.4.0"
       sources."regenerate-unicode-properties-8.1.0"
       sources."regenerator-runtime-0.13.3"
       sources."regenerator-transform-0.14.1"
-      sources."regex-cache-0.4.4"
       sources."regex-not-1.0.2"
       sources."regexpu-core-4.6.0"
       sources."regjsgen-0.5.1"
@@ -62449,24 +62495,14 @@ in
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
-      sources."repeating-2.0.1"
       sources."replace-ext-1.0.0"
+      sources."request-2.88.2"
       sources."require-directory-2.1.1"
-      sources."require-main-filename-1.0.1"
+      sources."require-main-filename-2.0.0"
       sources."resolve-1.15.1"
-      sources."resolve-cwd-2.0.0"
-      (sources."resolve-dependencies-2.2.3" // {
+      (sources."resolve-cwd-2.0.0" // {
         dependencies = [
-          sources."dir-glob-2.2.2"
-          sources."globby-9.2.0"
-          sources."ignore-4.0.6"
-          (sources."path-type-3.0.0" // {
-            dependencies = [
-              sources."pify-3.0.0"
-            ];
-          })
-          sources."pify-4.0.1"
-          sources."slash-2.0.0"
+          sources."resolve-from-3.0.0"
         ];
       })
       (sources."resolve-dir-1.0.1" // {
@@ -62474,30 +62510,32 @@ in
           sources."global-modules-1.0.0"
         ];
       })
-      sources."resolve-from-3.0.0"
+      sources."resolve-from-5.0.0"
       sources."resolve-url-0.2.1"
-      sources."responselike-1.0.2"
-      sources."restore-cursor-2.0.0"
       sources."ret-0.1.15"
       sources."retry-0.12.0"
       sources."rimraf-2.7.1"
       sources."ripemd160-2.0.2"
-      sources."rollup-0.67.0"
-      sources."rollup-plugin-babel-4.0.3"
-      sources."rollup-plugin-babel-minify-6.1.1"
-      (sources."rollup-plugin-commonjs-9.2.0" // {
-        dependencies = [
-          sources."estree-walker-0.5.2"
-        ];
-      })
-      sources."rollup-plugin-node-resolve-3.4.0"
-      sources."rollup-plugin-replace-2.1.0"
+      sources."rollup-1.31.1"
+      sources."rollup-plugin-babel-4.3.3"
+      sources."rollup-plugin-babel-minify-9.1.1"
+      sources."rollup-plugin-commonjs-10.1.0"
+      sources."rollup-plugin-node-resolve-5.2.0"
+      sources."rollup-plugin-replace-2.2.0"
       sources."rollup-pluginutils-2.8.2"
+      sources."rsvp-4.8.5"
       sources."run-queue-1.0.3"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
+      sources."safer-buffer-2.1.2"
+      (sources."sane-4.1.0" // {
+        dependencies = [
+          sources."anymatch-2.0.0"
+          sources."micromatch-3.1.10"
+          sources."normalize-path-2.1.1"
+        ];
+      })
       sources."schema-utils-1.0.0"
-      sources."seek-bzip-1.0.5"
       sources."semver-5.7.1"
       sources."serialize-javascript-2.1.2"
       sources."set-blocking-2.0.0"
@@ -62508,10 +62546,14 @@ in
       })
       sources."setimmediate-1.0.5"
       sources."sha.js-2.4.11"
+      sources."shasum-1.0.2"
+      sources."shasum-object-1.0.0"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
+      sources."shell-quote-1.7.2"
       sources."signal-exit-3.0.2"
-      sources."slash-1.0.0"
+      sources."simple-concat-1.0.0"
+      sources."slash-3.0.0"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -62535,12 +62577,13 @@ in
       (sources."snapdragon-node-2.1.1" // {
         dependencies = [
           sources."define-property-1.0.0"
-          sources."isobject-3.0.1"
         ];
       })
-      sources."snapdragon-util-3.0.1"
-      sources."sort-keys-1.1.2"
-      sources."sort-keys-length-1.0.1"
+      (sources."snapdragon-util-3.0.1" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."source-list-map-0.1.8"
       sources."source-map-0.5.7"
       sources."source-map-resolve-0.5.3"
@@ -62556,6 +62599,8 @@ in
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.5"
       sources."split-string-3.1.0"
+      sources."sprintf-js-1.0.3"
+      sources."sshpk-1.16.1"
       sources."ssri-6.0.1"
       (sources."static-extend-0.1.2" // {
         dependencies = [
@@ -62575,28 +62620,36 @@ in
         ];
       })
       sources."stream-browserify-2.0.2"
+      sources."stream-combiner2-1.1.1"
       sources."stream-each-1.2.3"
-      sources."stream-http-2.8.3"
-      sources."stream-shift-1.0.1"
-      sources."strict-uri-encode-1.1.0"
-      (sources."string-width-3.1.0" // {
+      (sources."stream-http-3.1.0" // {
         dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."strip-ansi-5.2.0"
+          sources."readable-stream-3.6.0"
         ];
       })
-      sources."string_decoder-1.1.1"
-      sources."strip-ansi-3.0.1"
-      sources."strip-bom-2.0.0"
-      sources."strip-dirs-2.1.0"
+      sources."stream-shift-1.0.1"
+      sources."stream-splicer-2.0.1"
+      sources."string-width-3.1.0"
+      sources."string.prototype.trimleft-2.1.1"
+      sources."string.prototype.trimright-2.1.1"
+      (sources."string_decoder-1.3.0" // {
+        dependencies = [
+          sources."safe-buffer-5.2.0"
+        ];
+      })
+      sources."strip-ansi-5.2.0"
       sources."strip-eof-1.0.0"
-      sources."strip-outer-1.0.1"
-      sources."supports-color-2.0.0"
+      sources."subarg-1.0.0"
+      sources."supports-color-5.5.0"
+      sources."syntax-error-1.4.0"
       sources."tapable-1.1.3"
-      sources."tar-stream-1.6.2"
+      (sources."tar-stream-2.1.0" // {
+        dependencies = [
+          sources."readable-stream-3.6.0"
+        ];
+      })
       (sources."terser-4.6.3" // {
         dependencies = [
-          sources."commander-2.20.3"
           sources."source-map-0.6.1"
         ];
       })
@@ -62605,29 +62658,34 @@ in
           sources."source-map-0.6.1"
         ];
       })
-      sources."test-exclude-4.2.3"
+      sources."test-exclude-6.0.0"
       sources."through-2.3.8"
       sources."through2-2.0.5"
-      sources."timed-out-4.0.1"
-      sources."timers-browserify-2.0.11"
+      sources."timers-browserify-1.4.2"
+      sources."tmpl-1.0.4"
       sources."to-arraybuffer-1.0.1"
-      sources."to-buffer-1.1.1"
       sources."to-fast-properties-2.0.0"
-      sources."to-object-path-0.3.0"
-      sources."to-readable-stream-1.0.0"
-      sources."to-regex-3.0.2"
-      (sources."to-regex-range-2.1.1" // {
+      (sources."to-object-path-0.3.0" // {
         dependencies = [
-          sources."is-number-3.0.0"
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."to-regex-3.0.2"
+      sources."to-regex-range-2.1.1"
+      (sources."tough-cookie-2.5.0" // {
+        dependencies = [
+          sources."punycode-2.1.1"
         ];
       })
-      sources."trim-repeated-1.0.0"
-      sources."trim-right-1.0.1"
       sources."tslib-1.10.0"
-      sources."tty-browserify-0.0.0"
+      sources."tty-browserify-0.0.1"
       sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."type-fest-0.6.0"
       sources."typedarray-0.0.6"
-      sources."unbzip2-stream-1.3.3"
+      sources."typedarray-to-buffer-3.1.5"
+      sources."umd-3.0.3"
+      sources."undeclared-identifiers-1.1.3"
       sources."unicode-canonical-property-names-ecmascript-1.0.4"
       sources."unicode-match-property-ecmascript-1.0.4"
       sources."unicode-match-property-value-ecmascript-1.1.0"
@@ -62643,79 +62701,55 @@ in
             ];
           })
           sources."has-values-0.1.4"
-          sources."isobject-3.0.1"
         ];
       })
       sources."upath-1.2.0"
-      sources."uri-js-4.2.2"
+      (sources."uri-js-4.2.2" // {
+        dependencies = [
+          sources."punycode-2.1.1"
+        ];
+      })
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
           sources."punycode-1.3.2"
         ];
       })
-      sources."url-parse-lax-3.0.0"
-      sources."url-to-options-1.0.1"
       sources."use-3.1.1"
-      (sources."util-0.11.1" // {
+      (sources."util-0.10.4" // {
         dependencies = [
           sources."inherits-2.0.3"
         ];
       })
       sources."util-deprecate-1.0.2"
+      sources."util.promisify-1.0.1"
+      sources."uuid-3.4.0"
       sources."v8-compile-cache-2.0.3"
       sources."validate-npm-package-license-3.0.4"
+      sources."verror-1.10.0"
       sources."vinyl-2.2.0"
       sources."vm-browserify-1.1.2"
+      sources."walker-1.0.7"
       sources."watchpack-1.6.0"
-      sources."wcwidth-1.0.1"
       (sources."webpack-4.41.6" // {
         dependencies = [
-          sources."arr-diff-4.0.0"
-          sources."array-unique-0.3.2"
-          sources."braces-2.3.2"
-          sources."debug-2.6.9"
-          sources."define-property-1.0.0"
-          sources."eslint-scope-4.0.3"
-          (sources."expand-brackets-2.1.4" // {
-            dependencies = [
-              sources."define-property-0.2.5"
-            ];
-          })
-          sources."extend-shallow-2.0.1"
-          sources."extglob-2.0.4"
-          sources."fill-range-4.0.0"
-          (sources."is-accessor-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-data-descriptor-0.1.4" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          (sources."is-descriptor-0.1.6" // {
-            dependencies = [
-              sources."kind-of-5.1.0"
-            ];
-          })
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
-          sources."isobject-3.0.1"
-          sources."kind-of-6.0.3"
-          sources."memory-fs-0.4.1"
+          sources."acorn-6.4.0"
           sources."micromatch-3.1.10"
-          sources."ms-2.0.0"
+          sources."minimist-0.0.8"
+          sources."mkdirp-0.5.1"
         ];
       })
       (sources."webpack-cli-3.3.11" // {
         dependencies = [
+          (sources."chalk-2.4.2" // {
+            dependencies = [
+              sources."supports-color-5.5.0"
+            ];
+          })
+          sources."emojis-list-2.1.0"
           sources."enhanced-resolve-4.1.0"
-          sources."memory-fs-0.4.1"
+          sources."json5-1.0.1"
+          sources."loader-utils-1.2.3"
           sources."supports-color-6.1.0"
         ];
       })
@@ -62734,19 +62768,13 @@ in
       sources."which-module-2.0.0"
       (sources."which-promise-1.0.0" // {
         dependencies = [
-          sources."pinkie-1.0.0"
-          sources."pinkie-promise-1.0.0"
+          sources."pify-2.3.0"
         ];
       })
       sources."worker-farm-1.7.0"
-      (sources."wrap-ansi-5.1.0" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."ansi-styles-3.2.1"
-          sources."strip-ansi-5.2.0"
-        ];
-      })
+      sources."wrap-ansi-5.1.0"
       sources."wrappy-1.0.2"
+      sources."write-file-atomic-3.0.1"
       sources."xtend-4.0.2"
       sources."y18n-4.0.0"
       sources."yallist-3.1.1"
@@ -62754,14 +62782,11 @@ in
         dependencies = [
           sources."find-up-3.0.0"
           sources."locate-path-3.0.0"
-          sources."p-limit-2.2.2"
           sources."p-locate-3.0.0"
-          sources."p-try-2.2.0"
-          sources."require-main-filename-2.0.0"
+          sources."path-exists-3.0.0"
         ];
       })
       sources."yargs-parser-13.1.1"
-      sources."yauzl-2.10.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -63381,7 +63406,7 @@ in
       sources."longest-1.0.1"
       sources."lru-cache-2.7.3"
       sources."lru-queue-0.1.0"
-      sources."make-error-1.3.5"
+      sources."make-error-1.3.6"
       sources."make-error-cause-1.2.2"
       sources."make-iterator-1.0.1"
       sources."map-cache-0.2.2"
@@ -63595,7 +63620,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-1.2.0"
       sources."typescript-3.7.5"
-      (sources."uglify-js-3.7.7" // {
+      (sources."uglify-js-3.8.0" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -66076,7 +66101,7 @@ in
       sources."callsites-2.0.0"
       sources."camelcase-5.3.1"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001027"
+      sources."caniuse-lite-1.0.30001028"
       sources."caseless-0.12.0"
       sources."chalk-2.4.2"
       sources."chokidar-2.1.8"
@@ -66149,7 +66174,6 @@ in
         ];
       })
       sources."css-tree-1.0.0-alpha.37"
-      sources."css-unit-converter-1.1.1"
       sources."css-what-3.2.1"
       sources."cssesc-0.1.0"
       sources."cssnano-4.1.10"
@@ -66212,7 +66236,7 @@ in
       sources."duplexer2-0.1.4"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.353"
+      sources."electron-to-chromium-1.3.355"
       sources."elliptic-6.5.2"
       sources."emoji-regex-7.0.3"
       sources."encodeurl-1.0.2"
@@ -66509,12 +66533,16 @@ in
       sources."physical-cpu-count-2.0.0"
       sources."pn-1.1.0"
       sources."posix-character-classes-0.1.1"
-      (sources."postcss-7.0.26" // {
+      (sources."postcss-7.0.27" // {
         dependencies = [
           sources."supports-color-6.1.0"
         ];
       })
-      sources."postcss-calc-7.0.1"
+      (sources."postcss-calc-7.0.2" // {
+        dependencies = [
+          sources."postcss-value-parser-4.0.3"
+        ];
+      })
       sources."postcss-colormin-4.0.3"
       sources."postcss-convert-values-4.0.1"
       sources."postcss-discard-comments-4.0.2"
@@ -66567,9 +66595,9 @@ in
       sources."postcss-ordered-values-4.1.2"
       sources."postcss-reduce-initial-4.0.3"
       sources."postcss-reduce-transforms-4.0.2"
-      (sources."postcss-selector-parser-5.0.0" // {
+      (sources."postcss-selector-parser-6.0.2" // {
         dependencies = [
-          sources."cssesc-2.0.0"
+          sources."cssesc-3.0.0"
         ];
       })
       sources."postcss-svgo-4.0.2"
@@ -66585,12 +66613,7 @@ in
       sources."psl-1.7.0"
       sources."public-encrypt-4.0.3"
       sources."punycode-2.1.1"
-      (sources."purgecss-1.4.2" // {
-        dependencies = [
-          sources."cssesc-3.0.0"
-          sources."postcss-selector-parser-6.0.2"
-        ];
-      })
+      sources."purgecss-1.4.2"
       sources."q-1.5.1"
       sources."qs-6.5.2"
       sources."querystring-0.2.0"
@@ -66753,9 +66776,7 @@ in
       sources."typedarray-0.0.6"
       (sources."uncss-0.17.3" // {
         dependencies = [
-          sources."cssesc-3.0.0"
           sources."is-absolute-url-3.0.3"
-          sources."postcss-selector-parser-6.0.2"
         ];
       })
       sources."unicode-canonical-property-names-ecmascript-1.0.4"
@@ -68288,10 +68309,10 @@ in
   serverless = nodeEnv.buildNodePackage {
     name = "serverless";
     packageName = "serverless";
-    version = "1.63.0";
+    version = "1.64.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/serverless/-/serverless-1.63.0.tgz";
-      sha512 = "dMwUiAsVoE+25R2jmD0+DfRf9VpvjBN8mgqweXtvm3k6TP536a9Wug8Ue6pc0KpEPc++zg5lIyd1zlTlrSHnPg==";
+      url = "https://registry.npmjs.org/serverless/-/serverless-1.64.0.tgz";
+      sha512 = "N1Ls4ecV1++ZYqZ6RRVUOqMrHZrwBW/nvy/P1N7FCfJX1k9LQMtUe6wa4X5+q0kiFdhIHYYCteHcpSGJbyOwTw==";
     };
     dependencies = [
       sources."2-thenable-1.0.0"
@@ -68358,7 +68379,7 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.620.0" // {
+      (sources."aws-sdk-2.622.0" // {
         dependencies = [
           sources."buffer-4.9.1"
           sources."uuid-3.3.2"
@@ -68469,32 +68490,19 @@ in
       sources."debug-4.1.1"
       sources."decamelize-1.2.0"
       sources."decode-uri-component-0.2.0"
-      (sources."decompress-4.2.0" // {
-        dependencies = [
-          sources."pify-2.3.0"
-        ];
-      })
+      sources."decompress-4.2.0"
       sources."decompress-response-3.3.0"
-      (sources."decompress-tar-4.1.1" // {
-        dependencies = [
-          sources."file-type-5.2.0"
-        ];
-      })
+      sources."decompress-tar-4.1.1"
       (sources."decompress-tarbz2-4.1.1" // {
         dependencies = [
           sources."file-type-6.2.0"
         ];
       })
-      (sources."decompress-targz-4.1.1" // {
-        dependencies = [
-          sources."file-type-5.2.0"
-        ];
-      })
+      sources."decompress-targz-4.1.1"
       (sources."decompress-unzip-4.0.1" // {
         dependencies = [
           sources."file-type-3.9.0"
           sources."get-stream-2.3.1"
-          sources."pify-2.3.0"
         ];
       })
       sources."deep-extend-0.6.0"
@@ -68508,6 +68516,7 @@ in
         dependencies = [
           sources."@sindresorhus/is-0.7.0"
           sources."cacheable-request-2.1.4"
+          sources."file-type-8.1.0"
           sources."get-stream-3.0.0"
           sources."got-8.3.2"
           sources."http-cache-semantics-3.8.1"
@@ -68515,6 +68524,7 @@ in
           sources."lowercase-keys-1.0.0"
           sources."normalize-url-2.0.1"
           sources."p-cancelable-0.4.1"
+          sources."pify-3.0.0"
           sources."sort-keys-2.0.0"
         ];
       })
@@ -68553,7 +68563,7 @@ in
       sources."fast-levenshtein-2.0.6"
       sources."fd-slicer-1.1.0"
       sources."figures-3.2.0"
-      sources."file-type-8.1.0"
+      sources."file-type-5.2.0"
       sources."filename-reserved-regex-2.0.0"
       sources."filenamify-2.1.0"
       sources."filesize-3.6.1"
@@ -68585,11 +68595,7 @@ in
       sources."glob-7.1.6"
       sources."glob-parent-5.1.0"
       sources."global-dirs-0.1.1"
-      (sources."globby-6.1.0" // {
-        dependencies = [
-          sources."pify-2.3.0"
-        ];
-      })
+      sources."globby-6.1.0"
       sources."got-9.6.0"
       sources."graceful-fs-4.2.3"
       sources."graceful-readlink-1.0.1"
@@ -68701,7 +68707,11 @@ in
       sources."lru-cache-4.1.5"
       sources."lru-queue-0.1.0"
       sources."lsmod-1.0.0"
-      sources."make-dir-1.3.0"
+      (sources."make-dir-1.3.0" // {
+        dependencies = [
+          sources."pify-3.0.0"
+        ];
+      })
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       sources."memoizee-0.4.14"
@@ -68732,7 +68742,11 @@ in
       sources."node-fetch-1.7.3"
       sources."normalize-path-3.0.0"
       sources."normalize-url-4.5.0"
-      sources."npm-conf-1.1.3"
+      (sources."npm-conf-1.1.3" // {
+        dependencies = [
+          sources."pify-3.0.0"
+        ];
+      })
       sources."npm-run-path-2.0.2"
       sources."object-assign-4.1.1"
       (sources."object-copy-0.1.0" // {
@@ -68780,7 +68794,7 @@ in
       sources."path-loader-1.0.10"
       sources."pend-1.2.0"
       sources."picomatch-2.2.1"
-      sources."pify-3.0.0"
+      sources."pify-2.3.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
       sources."prepend-http-2.0.0"
@@ -69639,10 +69653,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.292.0";
+    version = "1.294.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.292.0.tgz";
-      sha512 = "ga4ouBqRc897Ts80yzdZG25zqGgbU3ah8VKtLyRjK1ZmApHy+PRi2zBVJcwMspyfhyaCh47vr1siIqHler4rxg==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.294.0.tgz";
+      sha512 = "F+kDV9GvZUPtkAnssUae1bxoh471fNR2vNDUXsvgdAiZuqHw+N6i/ZTTWuCf3T7GWSuNb5OlGray/5uvS7WJAw==";
     };
     dependencies = [
       sources."@snyk/cli-interface-2.3.0"
@@ -69663,7 +69677,7 @@ in
       sources."@types/debug-4.1.5"
       sources."@types/events-3.0.0"
       sources."@types/js-yaml-3.12.2"
-      sources."@types/node-13.7.1"
+      sources."@types/node-13.7.4"
       sources."@types/restify-4.3.6"
       sources."@types/semver-5.5.0"
       sources."@types/xml2js-0.4.3"
@@ -69921,8 +69935,8 @@ in
           sources."debug-4.1.1"
         ];
       })
-      sources."snyk-go-parser-1.3.1"
-      (sources."snyk-go-plugin-1.11.1" // {
+      sources."snyk-go-parser-1.3.3"
+      (sources."snyk-go-plugin-1.12.0" // {
         dependencies = [
           sources."debug-4.1.1"
         ];
@@ -71194,7 +71208,7 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      (sources."aws-sdk-2.620.0" // {
+      (sources."aws-sdk-2.622.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -72614,7 +72628,7 @@ in
       sources."truncate-utf8-bytes-1.0.2"
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
-      (sources."uglify-js-3.7.7" // {
+      (sources."uglify-js-3.8.0" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -72685,7 +72699,7 @@ in
       sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b";
     };
     dependencies = [
-      sources."@types/node-13.7.1"
+      sources."@types/node-13.7.4"
       sources."ajv-6.11.0"
       sources."ansi-regex-4.1.0"
       sources."ansi-styles-3.2.1"
@@ -73286,10 +73300,10 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
       sources."ms-2.1.2"
-      sources."nlcst-is-literal-1.2.0"
-      sources."nlcst-normalize-2.1.3"
+      sources."nlcst-is-literal-1.2.1"
+      sources."nlcst-normalize-2.1.4"
       sources."nlcst-search-1.5.1"
-      sources."nlcst-to-string-2.0.3"
+      sources."nlcst-to-string-2.0.4"
       sources."normalize-package-data-2.5.0"
       sources."npm-prefix-1.2.0"
       sources."npm-run-path-2.0.2"
@@ -73824,7 +73838,7 @@ in
       sources."@types/color-name-1.1.1"
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-13.7.1"
+      sources."@types/node-13.7.4"
       sources."@types/responselike-1.0.0"
       sources."abbrev-1.1.1"
       sources."abstract-logging-1.0.0"
@@ -74714,10 +74728,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.7.7";
+    version = "3.8.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.7.tgz";
-      sha512 = "FeSU+hi7ULYy6mn8PKio/tXsdSXN35lm4KgV2asx00kzrLU9Pi3oAslcJT70Jdj7PHX29gGUPOT6+lXGBbemhA==";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.0.tgz";
+      sha512 = "ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ==";
     };
     dependencies = [
       sources."commander-2.20.3"
@@ -75489,7 +75503,7 @@ in
       sources."tslib-1.10.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."uglify-js-3.7.7"
+      sources."uglify-js-3.8.0"
       sources."uid-0.0.2"
       sources."unbzip2-stream-1.3.3"
       sources."unyield-0.0.1"
@@ -75547,7 +75561,7 @@ in
       sources."@starptech/rehype-webparser-0.10.0"
       sources."@starptech/webparser-0.10.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-13.7.1"
+      sources."@types/node-13.7.4"
       sources."@types/unist-2.0.3"
       sources."@types/vfile-3.0.2"
       sources."@types/vfile-message-2.0.0"
@@ -76544,7 +76558,7 @@ in
       sources."@szmarczak/http-timer-1.1.2"
       sources."@types/color-name-1.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.1"
+      sources."@types/node-13.7.4"
       sources."JSONSelect-0.2.1"
       sources."acorn-6.4.0"
       sources."acorn-jsx-5.1.0"
@@ -77731,7 +77745,7 @@ in
       sources."domain-browser-1.2.0"
       sources."duplexify-3.7.1"
       sources."elliptic-6.5.2"
-      sources."emojis-list-2.1.0"
+      sources."emojis-list-3.0.0"
       sources."end-of-stream-1.4.4"
       (sources."enhanced-resolve-4.1.1" // {
         dependencies = [
@@ -77838,7 +77852,7 @@ in
       sources."json5-1.0.1"
       sources."kind-of-6.0.3"
       sources."loader-runner-2.4.0"
-      sources."loader-utils-1.2.3"
+      sources."loader-utils-1.4.0"
       sources."locate-path-3.0.0"
       sources."lru-cache-5.1.1"
       sources."make-dir-2.1.0"
@@ -78424,7 +78438,7 @@ in
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.1"
+      sources."@types/node-13.7.4"
       sources."accepts-1.3.7"
       sources."ajv-6.11.0"
       sources."ajv-errors-1.0.1"
@@ -79043,7 +79057,7 @@ in
       sources."cyclist-1.0.1"
       sources."dir-glob-2.2.2"
       sources."duplexify-3.7.1"
-      sources."emojis-list-2.1.0"
+      sources."emojis-list-3.0.0"
       sources."end-of-stream-1.4.4"
       sources."fast-deep-equal-3.1.1"
       sources."fast-json-stable-stringify-2.1.0"
@@ -79081,7 +79095,7 @@ in
           sources."minimist-1.2.0"
         ];
       })
-      sources."loader-utils-1.2.3"
+      sources."loader-utils-1.4.0"
       sources."locate-path-3.0.0"
       sources."lru-cache-5.1.1"
       sources."make-dir-2.1.0"
@@ -79170,7 +79184,7 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-10.17.15"
+      sources."@types/node-10.17.16"
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.3.0"
       sources."balanced-match-1.0.0"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 844036d83e5f..d8c6ca55f5fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9130,7 +9130,7 @@ in
   kanif = callPackage ../applications/networking/cluster/kanif { };
 
   lumo = callPackage ../development/interpreters/clojurescript/lumo {
-    nodejs = nodejs-10_x;
+    nodejs = nodejs-13_x;
   };
 
   lxappearance = callPackage ../desktops/lxde/core/lxappearance {

From ad566721969e9e765cabfaa6ef972713260757c0 Mon Sep 17 00:00:00 2001
From: hlolli <hlolli@gmail.com>
Date: Wed, 19 Feb 2020 23:40:14 +0100
Subject: [PATCH 1111/4636] cleanup

---
 pkgs/development/interpreters/clojurescript/lumo/default.nix | 3 ---
 pkgs/development/node-packages/node-env.nix                  | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix
index 23dd19b6114e..d6252a7506aa 100644
--- a/pkgs/development/interpreters/clojurescript/lumo/default.nix
+++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix
@@ -240,10 +240,7 @@ stdenv.mkDerivation {
 
 
     # Step 4: Bunde javascript
-echo 1111
-cat scripts/bundle.js
     NODE_ENV=production node scripts/bundle.js
-echo 2222
     node scripts/bundleForeign.js
 
     # Step 5: Backup resources
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index 670556bf271a..7cc212c41bd6 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -363,7 +363,7 @@ let
 
         npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
 
-        if [ "$dontNpmInstall" != "1" ]
+        if [ "''${dontNpmInstall-}" != "1" ]
         then
             # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
             rm -f npm-shrinkwrap.json

From 6c6d7cb2e36c7e1292f0f5bae11f9137cb98934a Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 19 Feb 2020 23:57:37 +0100
Subject: [PATCH 1112/4636] roundcube: 1.4.2 -> 1.4.3

https://github.com/roundcube/roundcubemail/releases/tag/1.4.3
---
 pkgs/servers/roundcube/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix
index 27ff5b409f79..939424ff2bfd 100644
--- a/pkgs/servers/roundcube/default.nix
+++ b/pkgs/servers/roundcube/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "roundcube";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchurl {
     url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
-    sha256 = "0s8gkfnyid1r4xv07vjrbl6558xv6dyn4aapvx8snqdm79n78fn8";
+    sha256 = "1gsl9rpdkv388i6zvciladhb15fw94a8xjyh4ai1664nkwl51wi4";
   };
 
   patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];

From 4e5aeca90bba12fb23e87e63dfedbd0890bc6139 Mon Sep 17 00:00:00 2001
From: Tom Hall <tahall256@protonmail.ch>
Date: Wed, 19 Feb 2020 22:57:41 +0000
Subject: [PATCH 1113/4636] R: Enable java support on all platforms

---
 pkgs/applications/science/math/R/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 517fc9d7b320..914f6a49b179 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -7,7 +7,6 @@
 # R as of writing does not support outputting both .so and .a files; it outputs:
 #     --enable-R-static-lib conflicts with --enable-R-shlib and will be ignored
 , static ? false
-, javaSupport ? (!stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64)
 }:
 
 stdenv.mkDerivation rec {
@@ -23,9 +22,8 @@ stdenv.mkDerivation rec {
   buildInputs = [
     bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses
     pango pcre perl readline texLive xz zlib less texinfo graphviz icu
-    pkgconfig bison imake which openblas curl tcl tk
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]
-    ++ stdenv.lib.optional javaSupport jdk;
+    pkgconfig bison imake which openblas curl tcl tk jdk
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ];
 
   patches = [
     ./no-usr-local-search-paths.patch
@@ -57,7 +55,7 @@ stdenv.mkDerivation rec {
       CC=$(type -p cc)
       CXX=$(type -p c++)
       FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran"
-      ${stdenv.lib.optionalString javaSupport "JAVA_HOME=\"${jdk}\""}
+      JAVA_HOME="${jdk}"
       RANLIB=$(type -p ranlib)
       R_SHELL="${stdenv.shell}"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''

From d7f608e43a8171de3c99975ec9a7349008a7a7f3 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 19 Feb 2020 18:00:00 -0500
Subject: [PATCH 1114/4636] terraform: 0.12.20 -> 0.12.21

Changelog: https://github.com/hashicorp/terraform/releases/tag/v0.12.21
---
 pkgs/applications/networking/cluster/terraform/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 5c1319486497..da943c2aa7ea 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -112,8 +112,8 @@ in rec {
   terraform_0_11-full = terraform_0_11.full;
 
   terraform_0_12 = pluggable (generic {
-    version = "0.12.20";
-    sha256 = "1k94iwhdvp1ifg9w7y26cl89ihki2w9kxv8mz06pp9bnfwfw67x5";
+    version = "0.12.21";
+    sha256 = "128mrqib8rigy6kk6fby0pjh4jh2qm2qwkrlbn0wgfln0637d9ff";
     patches = [ ./provider-path.patch ];
     passthru = { inherit plugins; };
   });

From 66977041bacb98c76edd6ecf5118c6c6f32463a2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Feb 2020 23:07:07 +0000
Subject: [PATCH 1115/4636] glusterfs: 7.2 -> 7.3

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

diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index db5c469e63b6..dad032073c04 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -15,10 +15,10 @@ let
     #       The command
     #         find /nix/store/...-glusterfs-.../ -name '*.py' -executable
     #       can help with finding new Python scripts.
-    version = "7.2";
+    version = "7.3";
     name="${baseName}-${version}";
     url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz";
-    sha256 = "0v333q217rvgh6bnmq4bcafkjz2gq0p4xqmxd3carkyl1zyyp8q5";
+    sha256 = "08g8394vk88cb71z4k5sknld1nsd20f4mk2yyjvdp1hwm97z12pq";
   };
 
   buildInputs = [

From ed85c9981a9c64f21974af3fc1d9aa9bc35a8e07 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Wed, 19 Feb 2020 18:17:27 -0500
Subject: [PATCH 1116/4636] elan: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; ran `nixpkgs-review wip` successfully.
---
 pkgs/applications/science/logic/elan/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix
index 2ac7c208a5f1..b77f5110521c 100644
--- a/pkgs/applications/science/logic/elan/default.nix
+++ b/pkgs/applications/science/logic/elan/default.nix
@@ -1,14 +1,9 @@
-{ stdenv, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }:
+{ lib, pkgconfig, curl, openssl, zlib, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
   pname = "elan";
   version = "0.7.5";
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0q0xlvyyf88dbz43r7kk9v8rrp6hj0nl5i2i9mg6ibk2gphgdv6v";
-
   src = fetchFromGitHub {
     owner = "kha";
     repo = "elan";
@@ -16,6 +11,8 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1147f3lzr6lgvf580ppspn20bdwnf6l8idh1h5ana0p0lf5a0dn1";
   };
 
+  cargoSha256 = "0vja1cq6z7jlr4nzfdzn4gl8l31yld82zmgzwihnalif13q3fcps";
+
   nativeBuildInputs = [ pkgconfig ];
 
   buildInputs = [ curl zlib openssl ];
@@ -38,7 +35,7 @@ rustPlatform.buildRustPackage rec {
     $out/bin/elan completions zsh >  "$out/share/zsh/site-functions/_elan"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Small tool to manage your installations of the Lean theorem prover";
     homepage = "https://github.com/Kha/elan";
     license = with licenses; [ asl20 /* or */ mit ];

From 1d0ea761cf3d115f390361825157fd39f5b33643 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 19 Feb 2020 18:18:18 -0500
Subject: [PATCH 1117/4636] du-dust: 0.4.4 -> 0.5.1

---
 pkgs/tools/misc/dust/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix
index c0aa9180aedb..7fa9ac9c9712 100644
--- a/pkgs/tools/misc/dust/default.nix
+++ b/pkgs/tools/misc/dust/default.nix
@@ -2,25 +2,27 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "dust";
-  version = "0.4.4";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "bootandy";
     repo = "dust";
     rev = "v${version}";
-    sha256 = "1qbh9vgdh0xmh4c78fm0rd1sgb01n656p3cr4my7ymsy81ypx9y7";
+    sha256 = "1l5fh7yl8mbgahvzfa251cyp8j5awqdl66jblz565b1wb536kig7";
+    # Remove unicode file names which leads to different checksums on HFS+
+    # vs. other filesystems because of unicode normalisation.
+    extraPostFetch = ''
+      rm -rf $out/src/test_dir3/
+    '';
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "07ynz6y1z3rz84662d4rfl2sw1sx46a3k48z8dckr0b3fqs2zj6a";
+  cargoSha256 = "1sjzcawyg1xsi4xrx2zwnj8yavzph8k1wgxsffgp55wghzypafwl";
 
   doCheck = false;
 
   meta = with stdenv.lib; {
     description = "du + rust = dust. Like du but more intuitive";
-    homepage = https://github.com/bootandy/dust;
+    homepage = "https://github.com/bootandy/dust";
     license = licenses.asl20;
     maintainers = [ maintainers.infinisil ];
     platforms = platforms.all;

From 991276361b775991e62f754738c8a28e9ccadf4c Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 14 Feb 2020 20:31:42 -0500
Subject: [PATCH 1118/4636] parity: 2.5.11 -> 2.7.2

Per comment in the upstream release notes, the `beta` track is no longer
maintained, and parity only has `stable` releases, so this deletes the beta
expression entirely.
https://github.com/paritytech/parity-ethereum/releases

This also updates to the new fetchCargoTarball implementation as part of #79975
---
 pkgs/applications/blockchains/parity/beta.nix |  6 ---
 .../blockchains/parity/default.nix            | 52 ++++++++++++++++---
 .../blockchains/parity/parity.nix             | 47 -----------------
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 47 insertions(+), 60 deletions(-)
 delete mode 100644 pkgs/applications/blockchains/parity/beta.nix
 delete mode 100644 pkgs/applications/blockchains/parity/parity.nix

diff --git a/pkgs/applications/blockchains/parity/beta.nix b/pkgs/applications/blockchains/parity/beta.nix
deleted file mode 100644
index ffa509d2320e..000000000000
--- a/pkgs/applications/blockchains/parity/beta.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-let
-  version     = "2.6.6";
-  sha256      = "1gx5qg9c588d5m564bnbly86663yrzb2hmlgv9zplwba7p0lpphl";
-  cargoSha256 = "1xqmnirx2r91q5gy1skxl0f79xvaqzimq3l0cj4xvfms7mpdfbg1";
-in
-  import ./parity.nix { inherit version sha256 cargoSha256; }
diff --git a/pkgs/applications/blockchains/parity/default.nix b/pkgs/applications/blockchains/parity/default.nix
index 1b5870b429b1..e390b78b86df 100644
--- a/pkgs/applications/blockchains/parity/default.nix
+++ b/pkgs/applications/blockchains/parity/default.nix
@@ -1,6 +1,46 @@
-let
-  version     = "2.5.11";
-  sha256      = "1x2p559g2f30520v3kn46n737l5s1kwrn962dv73s6mb6n1lhs55";
-  cargoSha256 = "16nf6y0hyffwdhxn1w4ms4zycs5lkzir8sj6c2lgsabig057hb6z";
-in
-  import ./parity.nix { inherit version sha256 cargoSha256; }
+{ lib
+, fetchFromGitHub
+, rustPlatform
+, cmake
+, llvmPackages
+, openssl
+, pkg-config
+, systemd
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "parity";
+  version = "2.7.2";
+
+  src = fetchFromGitHub {
+    owner = "paritytech";
+    repo = "parity-ethereum";
+    rev = "v${version}";
+    sha256 = "09cvqk0h9c26famh3f1nc3g74cd0zk6klys977yr1f13bgqmzx0x";
+  };
+
+  cargoSha256 = "1fdymy8hvn137i5y4flyhlxwjxkd2cd6gq81i1429gk7j3h085ig";
+
+  LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
+  nativeBuildInputs = [
+    cmake
+    llvmPackages.clang
+    llvmPackages.libclang
+    pkg-config
+  ];
+
+  buildInputs = [ openssl systemd ];
+
+  cargoBuildFlags = [ "--features final" ];
+
+  # test result: FAILED. 88 passed; 13 failed; 0 ignored; 0 measured; 0 filtered out
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Fast, light, robust Ethereum implementation";
+    homepage = "http://parity.io";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ akru xrelkd ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/blockchains/parity/parity.nix b/pkgs/applications/blockchains/parity/parity.nix
deleted file mode 100644
index 6937d6efb099..000000000000
--- a/pkgs/applications/blockchains/parity/parity.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ version
-, sha256
-, cargoSha256
-}:
-
-{ lib
-, fetchFromGitHub
-, rustPlatform
-
-, cmake
-, openssl
-, pkgconfig
-, systemd
-}:
-
-rustPlatform.buildRustPackage {
-  pname = "parity";
-  inherit version;
-  inherit cargoSha256;
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-
-  src = fetchFromGitHub {
-    owner = "paritytech";
-    repo = "parity-ethereum";
-    rev = "v${version}";
-    inherit sha256;
-  };
-
-  nativeBuildInputs = [ cmake pkgconfig ];
-
-  buildInputs = [ openssl systemd ];
-
-  cargoBuildFlags = [ "--features final" ];
-
-  # test result: FAILED. 80 passed; 12 failed; 0 ignored; 0 measured; 0 filtered out
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Fast, light, robust Ethereum implementation";
-    homepage = "http://parity.io";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ akru xrelkd ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f768541ad806..702e81514c39 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22742,7 +22742,7 @@ in
   zcash = callPackage ../applications/blockchains/zcash { };
 
   parity = callPackage ../applications/blockchains/parity { };
-  parity-beta = callPackage ../applications/blockchains/parity/beta.nix { };
+
   parity-ui = callPackage ../applications/blockchains/parity-ui { };
 
   polkadot = callPackage ../applications/blockchains/polkadot { };

From 80650ae4f0cd38f7305fe0c1bed018350421474c Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Wed, 19 Feb 2020 23:27:50 +0100
Subject: [PATCH 1119/4636] qt5.qtbase: backport cmake macro fix

Backport fix of QT5_MAKE_OUTPUT_FILE CMake macro which causes FreeCAD
build failure when building with qt-5.12.7.

https://bugreports.qt.io/browse/QTBUG-81715
---
 pkgs/development/libraries/qt-5/5.12/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix
index 8d27f3a0d4ba..c0bba5e5c010 100644
--- a/pkgs/development/libraries/qt-5/5.12/default.nix
+++ b/pkgs/development/libraries/qt-5/5.12/default.nix
@@ -67,6 +67,13 @@ let
         ./qtbase.patch.d/0010-qtbase-qtpluginpath.patch
         ./qtbase.patch.d/0011-qtbase-assert.patch
         ./qtbase.patch.d/0012-fix-header_module.patch
+        # https://bugreports.qt.io/browse/QTBUG-81715
+        # remove after updating to qt > 5.12.7
+        (fetchpatch {
+          name = "fix-qt5_make_output_file-cmake-macro.patch";
+          url = "https://code.qt.io/cgit/qt/qtbase.git/patch/?id=8a3fde00bf53d99e9e4853e8ab97b0e1bcf74915";
+          sha256 = "1gpcbdpyazdxnmldvhsf3pfwr2gjvi08x3j6rxf543rq01bp6cpx";
+        })
       ];
     qtdeclarative = [ ./qtdeclarative.patch ];
     qtscript = [ ./qtscript.patch ];

From 9c6b5041c5ee6e55d56c5a03551a4589d2b1c743 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Feb 2020 01:08:17 +0000
Subject: [PATCH 1120/4636] graylog: 3.2.0 -> 3.2.1

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

diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index e331e43956e4..48b471e3b40b 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "graylog";
-  version = "3.2.0";
+  version = "3.2.1";
 
   src = fetchurl {
     url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
-    sha256 = "128hlk2m7dy1ajvxkkazbi2npx738jfrkkznvmhyxm0hllcw4r9z";
+    sha256 = "1pilksik3bbd4sgmnpns9gg9sddybzxzxkn9sknn40dav08k1x6h";
   };
 
   dontBuild = true;

From 4d2a8257edc33f03fc4bb26ff32f9db1d96c7d95 Mon Sep 17 00:00:00 2001
From: Jason Felice <jason.m.felice@gmail.com>
Date: Wed, 19 Feb 2020 20:31:14 -0500
Subject: [PATCH 1121/4636] plan9port: fix linker flags for macosx

---
 pkgs/tools/system/plan9port/builder.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh
index f5c447ea0a53..57716614a13e 100644
--- a/pkgs/tools/system/plan9port/builder.sh
+++ b/pkgs/tools/system/plan9port/builder.sh
@@ -8,13 +8,20 @@ plan9portLinkFlags()
     local -a linkFlags=()
     eval set -- "$NIX_LDFLAGS"
     while (( $# > 0 )); do
-        if [[ $1 = -rpath ]]; then
-            linkFlags+=( "-Wl,-rpath,$2" )
+        case "$1" in
+        -rpath|-macosx_version_min|-sdk_version)
+            linkFlags+=( "-Wl,$1,$2" )
             shift 2
-        else
+            ;;
+        -no_uuid)
+            linkFlags+=( "-Wl,$1" )
+            shift
+            ;;
+        *)
             linkFlags+=( "$1" )
             shift
-        fi
+            ;;
+        esac
     done
     echo "${linkFlags[*]}"
 }

From 686274ea62caf12ca5181e8979e3fc52233402ed Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Tue, 18 Feb 2020 13:55:56 +0100
Subject: [PATCH 1122/4636] pythonPackages.decorator: fix Python 2 build

---
 pkgs/development/python-modules/decorator/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix
index f23d59291925..efdd5023a246 100644
--- a/pkgs/development/python-modules/decorator/default.nix
+++ b/pkgs/development/python-modules/decorator/default.nix
@@ -1,5 +1,6 @@
 { lib
 , buildPythonPackage
+, fetchpatch
 , fetchPypi
 }:
 
@@ -12,9 +13,12 @@ buildPythonPackage rec {
     sha256 = "54c38050039232e1db4ad7375cfce6748d7b41c29e95a081c8a6d2c30364a2ce";
   };
 
-  postPatch = ''
-    substituteInPlace src/tests/test.py --replace "DocumentationTestCase" "NoDocumentation"
-  '';
+  patches = [
+    (fetchpatch {
+      url = https://github.com/micheles/decorator/commit/3265f2755d16c0a3dfc9f1feee39722ddc11ee80.patch;
+      sha256 = "1q5nmff30vccqq5swf2ivm8cn7x3lhz8c9qpj0zddgs2y7fw8syz";
+    })
+  ];
 
   meta = with lib; {
     homepage = https://pypi.python.org/pypi/decorator;

From da45483b35735a621a07cd928bf36bd6e94e5d23 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 20 Feb 2020 02:36:21 +0100
Subject: [PATCH 1123/4636] riot-web: 1.5.9 -> 1.5.10

https://github.com/vector-im/riot-web/releases/tag/v1.5.10
---
 .../networking/instant-messengers/riot/riot-web.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index ea8626d6b06e..3688bb6af75a 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -12,11 +12,11 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "riot-web";
-  version = "1.5.9";
+  version = "1.5.10";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "1qibbgjzhiwn1lnfm3pbfn6jahphgyf6625mp4v0ah2is75x16ys";
+    sha256 = "1c11x8903p38c0f9k3ff4pnpb3n7hzs4pj6g65a4cvp6jgg1zfnn";
   };
 
   installPhase = ''

From 8acd3c804d829d900d333f44917a14b3e6011f1b Mon Sep 17 00:00:00 2001
From: Shahrukh Khan <shahrukh330@gmail.com>
Date: Thu, 20 Feb 2020 06:48:39 +0500
Subject: [PATCH 1124/4636] argocd: Fix build flags (#80545)

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

diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix
index 4842f31c40d6..7f9ebda93c0a 100644
--- a/pkgs/applications/networking/cluster/argocd/default.nix
+++ b/pkgs/applications/networking/cluster/argocd/default.nix
@@ -3,6 +3,7 @@
 buildGoModule rec {
   pname = "argocd";
   version = "1.4.2";
+  commit = "48cced9d925b5bc94f6aa9fa4a8a19b2a59e128a";
 
   src = fetchFromGitHub {
     owner = "argoproj";
@@ -16,6 +17,14 @@ buildGoModule rec {
   nativeBuildInputs = [ packr ];
 
   patches = [ ./use-go-module.patch ];
+
+  buildFlagsArray = ''
+     -ldflags=
+      -X github.com/argoproj/argo-cd/common.version=${version}
+      -X github.com/argoproj/argo-cd/common.buildDate=unknown
+      -X github.com/argoproj/argo-cd/common.gitCommit=${commit}
+      -X github.com/argoproj/argo-cd/common.gitTreeState=clean
+  '';
  
   # run packr to embed assets
   preBuild = ''

From e474ce247f319e18089aa6ecf0176caa6e418d5f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 20 Feb 2020 02:50:23 +0100
Subject: [PATCH 1125/4636] riot-web: add myself as maintainer

---
 .../networking/instant-messengers/riot/riot-web.nix             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index 3688bb6af75a..ee86ba658912 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
   meta = {
     description = "A glossy Matrix collaboration client for the web";
     homepage = http://riot.im/;
-    maintainers = with stdenv.lib.maintainers; [ bachp pacien ];
+    maintainers = with stdenv.lib.maintainers; [ bachp pacien ma27 ];
     license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.all;
     hydraPlatforms = [];

From 9a46a6919829414df82cbcaabc138952bb7aa681 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Feb 2020 01:51:20 +0000
Subject: [PATCH 1126/4636] i3: 4.17.1 -> 4.18

---
 pkgs/applications/window-managers/i3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 403d9939e134..fd964215d455 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "i3";
-  version = "4.17.1";
+  version = "4.18";
 
   src = fetchurl {
     url = "https://i3wm.org/downloads/${pname}-${version}.tar.bz2";
-    sha256 = "0iazv2i2rgmakzh95pgj6iapyzn7bdpcbcd35a79mhlml4ry33qy";
+    sha256 = "0dv5g8ycfmijxfjyw8hzsxaf80v09lb73zh7x2vszy78h3amifqz";
   };
 
   nativeBuildInputs = [ which pkgconfig makeWrapper ];

From f3fddcb9cc8e30e8606db01368d30783e1153a69 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 19 Feb 2020 20:55:10 -0500
Subject: [PATCH 1127/4636] gnome3.gnome-boxes: 3.34.3 -> 3.34.4

---
 pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index 1fecf80e9ae9..4b76679f9eee 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -51,11 +51,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-boxes";
-  version = "3.34.3";
+  version = "3.34.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1izhqgsb658lzrzj12dw06w47bjhqdpfl0j74aq7bzql7nqsb3wa";
+    sha256 = "1bqrl36nngbd8jpj31ipnywg2k0rg2j3bcgnyvn8r86ysh1gnm0f";
   };
 
   doCheck = true;

From d1adec38cf4ed3601aa574f48479c329199387f9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Feb 2020 01:58:27 +0000
Subject: [PATCH 1128/4636] hevea: 2.32 -> 2.33

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

diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix
index 2a126ac5c839..d5ede51ba0c3 100644
--- a/pkgs/tools/typesetting/hevea/default.nix
+++ b/pkgs/tools/typesetting/hevea/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ocamlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "hevea-2.32";
+  name = "hevea-2.33";
 
   src = fetchurl {
     url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz";
-    sha256 = "1s4yqphfcr1pf5mcj5c84mvmd107k525iiym5jdwsxz0ka0ccmfy";
+    sha256 = "0115bn6n6hhb08rmj0m508wjcsn1mggiagqly6s941pq811wxymb";
   };
 
   buildInputs = with ocamlPackages; [ ocaml ocamlbuild ];

From 0adc23bdaf561be7434c5cac457fa08ce9b3dfe6 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Wed, 19 Feb 2020 18:07:15 -0800
Subject: [PATCH 1129/4636] starship: 0.36.0 -> 0.36.1

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

diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index 0c0820837f50..80e3e02ceeec 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -3,13 +3,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "starship";
-  version = "0.36.0";
+  version = "0.36.1";
 
   src = fetchFromGitHub {
     owner = "starship";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0vkp6yfafzyhilkk5rfvgka91gmhm9nrrvy3m6gdza4ayslmcpam";
+    sha256 = "1ip6jfnlw0maabvihzbmmka453njnw1yf7hq3fd89l6dx57315m5";
   };
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   # Delete this on next update; see #79975 for details
   legacyCargoFetcher = true;
 
-  cargoSha256 = "05q527bd5q6a7kd03hwic4bynyc4sipyvi0bf2g2jqxzcsmswyyk";
+  cargoSha256 = "1i5g7j6x3pcrgc0mz2sqzl8kv9crm0h5zrszzbjrdyy2svfzqmp2";
   checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root";
 
   meta = with stdenv.lib; {

From 7bdc103ac8424e08f02f6e9344979d0a821caa62 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 20 Feb 2020 03:07:46 +0100
Subject: [PATCH 1130/4636] geogebra: 5-0-570-0 -> 5-0-573-0

---
 pkgs/applications/science/math/geogebra/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index a08c0ee34033..de84d35c2e89 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "geogebra";
-  version = "5-0-570-0";
+  version = "5-0-573-0";
 
   preferLocalBuild = true;
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
       "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
       "http://web.archive.org/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
     ];
-    sha256 = "0q6brg5rkl2gyyg9vhiilvb8zy23zlp4a1xcwnv501xzcccv0p37";
+    sha256 = "0lj0k49sjsjqs716n74xbq6a4gids5903f5s6fhqyahrwyldhzrj";
   };
 
   srcIcon = fetchurl {

From 9018faac96a4722bcb5353063d1d1be58eecac55 Mon Sep 17 00:00:00 2001
From: Jeff Labonte <jeff.labonte12@gmail.com>
Date: Wed, 19 Feb 2020 21:15:03 -0500
Subject: [PATCH 1131/4636] brave: 1.3.115 -> 1.3.118

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

diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index caaecd0ab9f6..53d58334b86f 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -82,11 +82,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "brave";
-  version = "1.3.115";
+  version = "1.3.118";
 
   src = fetchurl {
     url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-    sha256 = "1k9g1zjnn0bhyw133padpyym73x8v1i3nm65a040bgkwh6a5jaj8";
+    sha256 = "1pmz10h35fm54453h7m0qiynyfpfmwaicmwzs41c4h8xavqgr6mb";
   };
 
   dontConfigure = true;

From 1b24c1afcc96229ca2777d5cd3209bc2096dcb5b Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 19 Feb 2020 21:06:16 -0500
Subject: [PATCH 1132/4636] gnome3.gnome-desktop: 3.34.2 -> 3.34.4

---
 pkgs/desktops/gnome-3/core/gnome-desktop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index 6e7776367478..1717bfc7fde6 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-desktop";
-  version = "3.34.2";
+  version = "3.34.4";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1v983xirwp1y6ggz97bh742ak6gff0hxb359dgn37nikjxhvm0a0";
+    sha256 = "1g0cvsx0gk65kfa91knkqg7l2isrnlpvqwjbzpr3a5f2girp4gn5";
   };
 
   nativeBuildInputs = [

From fede9f643bfe1a9d8b9d39b6c3e81239b5769d0a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 19 Feb 2020 21:06:33 -0500
Subject: [PATCH 1133/4636] folks: 0.13.1 -> 0.13.2

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

diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix
index c08be846915e..6179ea983e33 100644
--- a/pkgs/development/libraries/folks/default.nix
+++ b/pkgs/development/libraries/folks/default.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation rec {
   pname = "folks";
-  version = "0.13.1";
+  version = "0.13.2";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0pda8sx4ap3lyri5fdrnakl29la1zkhwlc9bmnp13qigp1iwdw9x";
+    sha256 = "0wq14yjs7m3axziy679a854vc7r7fj1l38p9jnyapb21vswdcqq2";
   };
 
   mesonFlags = [

From df2d5fbad749ff46aa32a2d4670035aba65b80eb Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 19 Feb 2020 21:06:51 -0500
Subject: [PATCH 1134/4636] gjs: 1.58.4 -> 1.58.5

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

diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix
index dc2a7ed4859f..d63c06981273 100644
--- a/pkgs/development/libraries/gjs/default.nix
+++ b/pkgs/development/libraries/gjs/default.nix
@@ -19,11 +19,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gjs";
-  version = "1.58.4";
+  version = "1.58.5";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0pxxgsb9gvymgr7qsglfdbaa7hy29y01prszjr27f7bpdik3y6i6";
+    sha256 = "0fm1szmhdawvgbf9fh6vvkv1fdvbn888fciyi2wkhx48kz09jvg7";
   };
 
   outputs = [ "out" "dev" "installedTests" ];

From 647241011cc7071456bf8e3a7b2acda1b5cfb7d1 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Wed, 19 Feb 2020 18:44:21 -0800
Subject: [PATCH 1135/4636] starship: drop legacyCargoFetcher

---
 pkgs/tools/misc/starship/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index 80e3e02ceeec..338452e213cf 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -19,10 +19,7 @@ rustPlatform.buildRustPackage rec {
       --replace "/bin/echo" "echo"
   '';
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1i5g7j6x3pcrgc0mz2sqzl8kv9crm0h5zrszzbjrdyy2svfzqmp2";
+  cargoSha256 = "16wsd8z4cfb5pplwfvwgi5qawwv8c0aa220wnvphplmgz8cpq35r";
   checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root";
 
   meta = with stdenv.lib; {

From b4f0854fcfa85039568d574b15863b6162245507 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Feb 2020 03:05:17 +0000
Subject: [PATCH 1136/4636] gptfdisk: 1.0.4 -> 1.0.5

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

diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix
index 71f82bfc3864..72d9d70ed8bb 100644
--- a/pkgs/tools/system/gptfdisk/default.nix
+++ b/pkgs/tools/system/gptfdisk/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gptfdisk";
-  version = "1.0.4";
+  version = "1.0.5";
 
   src = fetchurl {
     # https://www.rodsbooks.com/gdisk/${name}.tar.gz also works, but the home
     # page clearly implies a preference for using SourceForge's bandwidth:
     url = "mirror://sourceforge/gptfdisk/${pname}-${version}.tar.gz";
-    sha256 = "13d7gff4prl1nsdknjigmb7bbqhn79165n01v4y9mwbnd0d3jqxn";
+    sha256 = "0bybgp30pqxb6x5krxazkq4drca0gz4inxj89fpyr204rn3kjz8f";
   };
 
   postPatch = ''

From 2edec098de2479304d91c9b69dc3067c4dc14a3c Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 19 Feb 2020 19:57:34 -0800
Subject: [PATCH 1137/4636] rls: add llvm to buildInputs

The Hydra build [1] was failing because it was unable to link `LLVM-9`.
Additionally, quote the homepage URL for compliance with RFC 45.

[1] https://hydra.nixos.org/build/112823631/nixlog/2
---
 pkgs/development/compilers/rust/rls/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/rust/rls/default.nix b/pkgs/development/compilers/rust/rls/default.nix
index 942e23c6170d..4cf507fbf5c7 100644
--- a/pkgs/development/compilers/rust/rls/default.nix
+++ b/pkgs/development/compilers/rust/rls/default.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage {
   CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null;
 
   nativeBuildInputs = [ pkgconfig cmake ];
-  buildInputs = [ openssh openssl curl zlib libiconv ]
+  buildInputs = [ openssh openssl curl zlib libiconv rustPlatform.rust.rustc.llvm ]
     ++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]);
 
   doCheck = true;
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage {
 
   meta = with stdenv.lib; {
     description = "Rust Language Server - provides information about Rust programs to IDEs and other tools";
-    homepage = https://github.com/rust-lang/rls/;
+    homepage = "https://github.com/rust-lang/rls/";
     license = with licenses; [ asl20 /* or */ mit ];
     maintainers = with maintainers; [ symphorien ];
     platforms = platforms.all;

From 4431542b8267143a5876f687ed429f5589cba5e5 Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Mon, 27 Jan 2020 15:14:46 -0500
Subject: [PATCH 1138/4636] pythonPackages.scs: init at 2.1.1

Depends on libraries.science.math.scs.
Required by cvxpy -> qiskit-aer.

Co-authored-by: bhipple <bhipple@users.noreply.github.com>
---
 .../python-modules/scs/default.nix            | 56 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 58 insertions(+)
 create mode 100644 pkgs/development/python-modules/scs/default.nix

diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix
new file mode 100644
index 000000000000..4e500d685352
--- /dev/null
+++ b/pkgs/development/python-modules/scs/default.nix
@@ -0,0 +1,56 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, blas
+, liblapack
+, numpy
+, scipy
+, scs
+  # check inputs
+, nose
+}:
+
+buildPythonPackage rec {
+  inherit (scs) pname version;
+
+  src = fetchFromGitHub {
+    owner = "bodono";
+    repo = "scs-python";
+    rev = "f02abdc0e2e0a5851464e30f6766ccdbb19d73f0"; # need to choose commit manually, untagged
+    sha256 = "174b5s7cwgrn1m55jlrszdl403zhpzc4yl9acs6kjv9slmg1mmjr";
+  };
+
+  preConfigure = ''
+    rm -r scs
+    ln -s ${scs.src} scs
+  '';
+
+  buildInputs = [
+    liblapack
+    blas
+  ];
+
+  propagatedBuildInputs = [
+    numpy
+    scipy
+  ];
+
+  checkInputs = [ nose ];
+  checkPhase = ''
+    nosetests
+  '';
+  pythonImportsCheck = [ "scs" ];
+
+  meta = with lib; {
+    description = "Python interface for SCS: Splitting Conic Solver";
+    longDescription = ''
+      Solves convex cone programs via operator splitting.
+      Can solve: linear programs (LPs), second-order cone programs (SOCPs), semidefinite programs (SDPs),
+      exponential cone programs (ECPs), and power cone programs (PCPs), or problems with any combination of those cones.
+    '';
+    homepage = "https://github.com/cvxgrp/scs"; # upstream C package
+    downloadPage = "https://github.com/bodono/scs-python";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ drewrisinger ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2b9a8bb8c25c..7451215072d5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5080,6 +5080,8 @@ in {
   python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat {};
   python_simple_hipchat = self.python-simple-hipchat;
 
+  scs = callPackage ../development/python-modules/scs { scs = pkgs.scs; };
+
   python_keyczar = callPackage ../development/python-modules/python_keyczar { };
 
   python-language-server = callPackage ../development/python-modules/python-language-server {};

From 14d6777962337b609c6eb4337e6baa9b31ee9fe3 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 10 Feb 2020 02:37:17 +0000
Subject: [PATCH 1139/4636] virglrenderer: 0.7.0 -> 0.8.1

freedesktop.org tarballs haven't been published since 0.7.0.  I've
sent a message to the mailing list (<87eev3cgcz.fsf@alyssa.is>),
suggesting newer tarballs be published.

Build system has changed from autoconf to meson+cmake/ninja, and the
vtest/util.c patch doesn't seem to be necessary any more.
---
 .../libraries/virglrenderer/default.nix       | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix
index 71bd608e93a1..5c508f133e14 100644
--- a/pkgs/development/libraries/virglrenderer/default.nix
+++ b/pkgs/development/libraries/virglrenderer/default.nix
@@ -1,24 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, libGLU, epoxy, libX11, libdrm, mesa }:
-
+{ stdenv, fetchurl, cmake, meson, ninja, pkgconfig, python3
+, libGLU, epoxy, libX11, libdrm, mesa
+}:
 
 stdenv.mkDerivation rec {
-
   pname = "virglrenderer";
-  version = "0.7.0";
+  version = "0.8.1";
 
   src = fetchurl {
-    url = "https://www.freedesktop.org/software/virgl/${pname}-${version}.tar.bz2";
-    sha256 = "041agg1d6i8hg250y30f08n3via0hs9rbijxdrfifb8ara805v0m";
+    url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/virglrenderer-${version}/virglrenderer-virglrenderer-${version}.tar.bz2";
+    sha256 = "0ac39mplmy6lmcd6cljmfsrfby7m6ac3dzvmnn5pv200drl415l4";
   };
 
   buildInputs = [ libGLU epoxy libX11 libdrm mesa ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake meson ninja pkgconfig python3 ];
 
-  # Fix use of fd_set without proper include
-  prePatch = ''
-    sed -e '1i#include <sys/select.h>' -i vtest/util.c
-  '';
+  dontUseCmakeConfigure = true;
 
   meta = with stdenv.lib; {
     description = "A virtual 3D GPU library that allows a qemu guest to use the host GPU for accelerated 3D rendering";
@@ -27,5 +24,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = [ maintainers.xeji ];
   };
-
 }

From 2e9eb449eb2ae8b8f699d05817f1a9697953c78e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 19 Feb 2020 21:05:22 +0100
Subject: [PATCH 1140/4636] common-updater-scripts: Handle errors in src
 hashing

Previously, when downloading src failed for other reason than hash mismatch,
the error ended up in newHash. This made evaluation fail since the error message
is not valid hash. Now the failure will make newHash empty.

It is also much cleaner than previously since \K is very cool thing
and we no longer grep for legacy messages.
---
 pkgs/common-updater/scripts/update-source-version | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version
index 7fb5e413a26a..a756d5047e8d 100755
--- a/pkgs/common-updater/scripts/update-source-version
+++ b/pkgs/common-updater/scripts/update-source-version
@@ -168,12 +168,12 @@ fi
 if [[ -z "$newHash" ]]; then
     nix-build $systemArg --no-out-link -A "$attr.src" 2>"$attr.fetchlog" >/dev/null || true
     # FIXME: use nix-build --hash here once https://github.com/NixOS/nix/issues/1172 is fixed
-    newHash=$(grep --extended-regexp --invert-match "killing process|dependencies couldn't be built|wanted: " "$attr.fetchlog" | tail -n2 | sed "s~output path .* has .* hash ‘\(.*\)’ when .* was expected\|fixed-output derivation produced path '.*' with .* hash '\(.*\)' instead of the expected hash '.*'\|  got:    .*:\(.*\)~\1\2\3~" | head -n1)
-fi
+    newHash=$(sed '1,/hash mismatch in fixed-output derivation/d' "$attr.fetchlog" | grep --perl-regexp --only-matching 'got: +.+[:-]\K.+')
 
-if [[ -n "$sri" ]]; then
-    # nix-build preserves the hashing scheme so we can just convert the result to SRI using the old type
-    newHash="$(nix to-sri --type "$oldHashAlgo" "$newHash")"
+    if [[ -n "$sri" ]]; then
+        # nix-build preserves the hashing scheme so we can just convert the result to SRI using the old type
+        newHash="$(nix to-sri --type "$oldHashAlgo" "$newHash")"
+    fi
 fi
 
 if [[ -z "$newHash" ]]; then

From 09a4a051e88eb0ea62b02fe0970f9c63bb576e57 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 20 Feb 2020 07:18:36 +0100
Subject: [PATCH 1141/4636] common-updater-scripts: Fix replacing SRI hashes

SRI hashes (base64 encoded) can contain + sign which is a special character
in extended regular expressions so it needs to be escaped.
---
 pkgs/common-updater/scripts/update-source-version | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version
index a756d5047e8d..6a66f94597f4 100755
--- a/pkgs/common-updater/scripts/update-source-version
+++ b/pkgs/common-updater/scripts/update-source-version
@@ -144,6 +144,10 @@ if [[ -n "$sri" ]]; then
     tempHash="$(nix to-sri --type "$oldHashAlgo" "$tempHash")"
 fi
 
+# Escape regex metacharacter that are allowed in hashes (+)
+oldHashEscaped=$(echo "$oldHash" | sed -re 's|[+]|\\&|g')
+tempHashEscaped=$(echo "$tempHash" | sed -re 's|[+]|\\&|g')
+
 # Replace new version
 sed -i.bak "$nixFile" -re "$pattern"
 if cmp -s "$nixFile" "$nixFile.bak"; then
@@ -159,7 +163,7 @@ if [[ -n "$newUrl" ]]; then
     fi
 fi
 
-sed -i "$nixFile" -re "s|\"$oldHash\"|\"$tempHash\"|"
+sed -i "$nixFile" -re "s|\"$oldHashEscaped\"|\"$tempHash\"|"
 if cmp -s "$nixFile" "$nixFile.bak"; then
     die "Failed to replace source hash of '$attr' to a temporary hash!"
 fi
@@ -186,7 +190,7 @@ if [[ -z "${ignoreSameHash}" && "$oldVersion" != "$newVersion" && "$oldHash" = "
     die "Both the old and new source hashes of '$attr.src' were equivalent. Please fix the package's source URL to be dependent on '\${version}'!"
 fi
 
-sed -i "$nixFile" -re "s|\"$tempHash\"|\"$newHash\"|"
+sed -i "$nixFile" -re "s|\"$tempHashEscaped\"|\"$newHash\"|"
 if cmp -s "$nixFile" "$nixFile.bak"; then
     die "Failed to replace temporary source hash of '$attr' to the final source hash!"
 fi

From cd97c055a09c076de0cecf28f683d43d4da35d20 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 19 Feb 2020 18:36:56 -0800
Subject: [PATCH 1142/4636] python: execute pythonImportsCheckPhase in subshell

Execute in subshell so that the cwd returns back
to the original directory. This is important as
it enables pythonImportsCheck to work with checkPhase
---
 .../interpreters/python/hooks/python-imports-check-hook.sh      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh
index 0fc55145a8eb..f8ca84cd573a 100644
--- a/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/python-imports-check-hook.sh
@@ -6,7 +6,7 @@ pythonImportsCheckPhase () {
 
     if [ -n "$pythonImportsCheck" ]; then
         echo "Check whether the following modules can be imported: $pythonImportsCheck"
-        cd $out && eval "@pythonCheckInterpreter@ -c 'import os; import importlib; list(map(lambda mod: importlib.import_module(mod), os.environ[\"pythonImportsCheck\"].split()))'"
+        ( cd $out && eval "@pythonCheckInterpreter@ -c 'import os; import importlib; list(map(lambda mod: importlib.import_module(mod), os.environ[\"pythonImportsCheck\"].split()))'" )
     fi
 }
 

From 6d8539c1d8fd0578aa7a10d5e0bea07bc6d8a2d9 Mon Sep 17 00:00:00 2001
From: Nikola Knezevic <nikola@knezevic.ch>
Date: Wed, 20 Nov 2019 14:06:27 +0100
Subject: [PATCH 1143/4636] perl: Enable threading on darwin

Perl on darwin (and any other sane platform) has a pretty good threading
support, enable it.

As it turns out, we were building non-multithreaded perl on all systems,
since glibc was not part of the stdenv anymore:

    nix-repl> pkgs = import <nixpkgs> {}

    nix-repl> pkgs.stdenv ? glibc
    false

meaning that the comments were incorrect. Thus, clear up the confusion
and remove the misleading comments, while enabling multithreading by
default. The builds will fail on unsupported platforms, and in this case
the only place is the bootstrap, where we already force
non-multithreaded perl.

As a consequence of the above, this change will cause the full rebuild
of stdenv on all platforms, including linux.
---
 pkgs/development/interpreters/perl/default.nix | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 751b9667a1f1..8f8b63a261e5 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -1,21 +1,9 @@
 { config, lib, stdenv, fetchurl, pkgs, buildPackages, callPackage
-, enableThreading ? stdenv ? glibc, coreutils, makeWrapper
+, enableThreading ? true, coreutils, makeWrapper
 }:
 
 with lib;
 
-# We can only compile perl with threading on platforms where we have a
-# real glibc in the stdenv.
-#
-# Instead of silently building an unthreaded perl if this is not the
-# case, we force callers to disableThreading explicitly, therefore
-# documenting the platforms where the perl is not threaded.
-#
-# In the case of stdenv linux boot stage1 it's not possible to use
-# threading because of the simpleness of the bootstrap glibc, so we
-# use enableThreading = false there.
-assert enableThreading -> (stdenv ? glibc);
-
 let
 
   libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr";

From 37a0429f7536307aafc4c4ceec779b8d49b990c2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Feb 2020 08:46:07 +0000
Subject: [PATCH 1144/4636] lyx: 2.3.4 -> 2.3.4.3

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

diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index 675f0adfc7f8..f9d8599e329c 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -3,12 +3,12 @@
 }:
 
 mkDerivation rec {
-  version = "2.3.4";
+  version = "2.3.4.3";
   pname = "lyx";
 
   src = fetchurl {
     url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz";
-    sha256 = "0qgvc19flnf6ny3ffyj8civwaxrnwcdlw2v708hg49cbmg6f8igh";
+    sha256 = "1rpp6wq0dc0bxwc0pipajv98vi7cpg391nq10d3c4pmpq38m08wx";
   };
 
   # LaTeX is used from $PATH, as people often want to have it with extra pkgs

From 3e9d2f80a43858713584847ffbe0e7ee438036d1 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 19 Feb 2020 13:53:00 +0100
Subject: [PATCH 1145/4636] chromium: 80.0.3987.106 -> 80.0.3987.116

---
 .../networking/browsers/chromium/upstream-info.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index bfc4fd028404..9e5c2e4f7995 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -11,8 +11,8 @@
     version = "81.0.4044.17";
   };
   stable = {
-    sha256 = "10myihiyrgnm0ly41k4h8ayl3vv3cpshs3pshpqaba0l8i5r5b9f";
-    sha256bin64 = "0pd4ygmyinaq22lmaqjqi1gs3svnb863mkhcf85dzm1354iz1g9k";
-    version = "80.0.3987.106";
+    sha256 = "00c9czjyk1h3i40lvmh2rshp1mq7pcxwsfh1qrq22w8ba6ydkib5";
+    sha256bin64 = "0sydv69hnssbvkrl1zc3qpb1czmfxv9kq6qs9gdiy2i3zskfvhkx";
+    version = "80.0.3987.116";
   };
 }

From 3dd0593020532dee552929b3be089865099dca93 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 20 Feb 2020 04:20:00 -0500
Subject: [PATCH 1146/4636] bazel-buildtools: 0.29.0 -> 1.0.0

---
 .../bazel/buildtools/default.nix               | 18 +++++++++++-------
 .../build-managers/bazel/buildtools/deps.nix   |  9 ++++-----
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
index fc5f98a8ccb6..bd95e2b63404 100644
--- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
@@ -1,20 +1,24 @@
-{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "bazel-buildtools";
-  version = "0.29.0";
-  rev = "5bcc31df55ec1de770cb52887f2e989e7068301f";
+  version = "1.0.0";
 
   goPackagePath = "github.com/bazelbuild/buildtools";
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/bazelbuild/buildtools";
-    sha256 = "0p2kgyawh3l46h7dzglqh9c7i16zr5mhmqlhy7qvr4skwif1l089";
+  src = fetchFromGitHub {
+    owner = "bazelbuild";
+    repo = "buildtools";
+    rev = version;
+    sha256 = "1rgz1bpg2db6z4q04z061h5b9qjk8padi71xyjcwqfchwqpl7hiv";
   };
 
   goDeps = ./deps.nix;
 
+  excludedPackages = [ "generatetables" ];
+
+  buildFlagsArray = [ "-ldflags=-s -w -X main.buildVersion=${version} -X main.buildScmRevision=${src.rev}" ];
+
   meta = with stdenv.lib; {
     description = "Tools for working with Google's bazel buildtool. Includes buildifier, buildozer, and unused_deps.";
     homepage = https://github.com/bazelbuild/buildtools;
diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix b/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix
index 4aaa37aa9a7b..38be0dedc371 100644
--- a/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix
+++ b/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix
@@ -1,12 +1,11 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
 [
   {
     goPackagePath = "github.com/golang/protobuf";
     fetch = {
       type = "git";
       url = "https://github.com/golang/protobuf";
-      rev = "4c88cc3f1a34ffade77b79abc53335d1e511f25b";
-      sha256 = "0chbdc4q55z7myiwnbvhryc5ihf6cxh8p4w3c1imy2gyzjn9sf4r";
+      rev = "d23c5127dc24889085f8ccea5c9d560a57a879d8";
+      sha256 = "1cyyr52yhj3fzrily3rmsbqyj8va4ld75lmry0857m39rgpv8sy1";
     };
   }
   {
@@ -14,8 +13,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/google/starlark-go";
-      rev = "988906f77f657477aa7ebf4d8fb5f12d6c50b767";
-      sha256 = "0ivmbcq3avaxj8ixbc60h706d6wk9wi2mnsid6a483ia4yn7w9k8";
+      rev = "6677ee5c7211380ec7e6a1b50dc45287e40ca9e1";
+      sha256 = "1dl8q1lwvmm38w2lzfwray2djdcq40z89yy6vzy387w0xrax0jj0";
     };
   }
 ]

From d1ee615f1cb48a193bbe194adced53ecb7395d8e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 20 Feb 2020 04:20:00 -0500
Subject: [PATCH 1147/4636] bazel: fix linker flags for darwin

---
 .../tools/build-managers/bazel/default.nix           | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index da69000a5e49..884f0253f1a5 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -326,6 +326,14 @@ stdenv.mkDerivation rec {
   postPatch = let
 
     darwinPatches = ''
+      bazelLinkFlags () {
+        eval set -- "$NIX_LDFLAGS"
+        local flag
+        for flag in "$@"; do
+          printf ' -Wl,%s' "$flag"
+        done
+      }
+
       # Disable Bazel's Xcode toolchain detection which would configure compilers
       # and linkers from Xcode instead of from PATH
       export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
@@ -335,14 +343,14 @@ stdenv.mkDerivation rec {
 
       # Framework search paths aren't added by bintools hook
       # https://github.com/NixOS/nixpkgs/pull/41914
-      export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks"
+      export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks"
 
       # libcxx includes aren't added by libcxx hook
       # https://github.com/NixOS/nixpkgs/pull/41589
       export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1"
 
       # don't use system installed Xcode to run clang, use Nix clang instead
-      sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \
+      sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \
         scripts/bootstrap/compile.sh \
         src/tools/xcode/realpath/BUILD \
         src/tools/xcode/stdredirect/BUILD \

From 612130c267ac6c3dd5bd40325255be35927c3f2e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 20 Feb 2020 04:20:00 -0500
Subject: [PATCH 1148/4636] fluent-bit: 1.3.7 -> 1.3.8

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

diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix
index 042ed2b03341..f25c095dade9 100644
--- a/pkgs/tools/misc/fluent-bit/default.nix
+++ b/pkgs/tools/misc/fluent-bit/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fluent-bit";
-  version = "1.3.7";
+  version = "1.3.8";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     rev = "v${version}";
-    sha256 = "1j0fzhakk4kpfpq4p4c0byw99adxd9w7irfn83rlvw8bw32j2lrj";
+    sha256 = "1b14hm809zy4idg8p2ah1sg4pgzqyy459mlf7rfc2msvf716sicr";
   };
 
   nativeBuildInputs = [ cmake flex bison ];

From 572a6672d00322d2a1af1aed517c249a5ab8adea Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 20 Feb 2020 04:21:00 -0500
Subject: [PATCH 1149/4636] bazel-buildtools: add marsam to maintainers

---
 .../tools/build-managers/bazel/buildtools/default.nix           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
index bd95e2b63404..e1d5b6699824 100644
--- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
@@ -23,7 +23,7 @@ buildGoPackage rec {
     description = "Tools for working with Google's bazel buildtool. Includes buildifier, buildozer, and unused_deps.";
     homepage = https://github.com/bazelbuild/buildtools;
     license = licenses.asl20;
-    maintainers = with maintainers; [ elasticdog uri-canva ];
+    maintainers = with maintainers; [ elasticdog uri-canva marsam ];
     platforms = platforms.all;
   };
 }

From 1f4d7a71a85b709f9f002797eb4828af00de2bbd Mon Sep 17 00:00:00 2001
From: Riley Inman <rileyminman@gmail.com>
Date: Thu, 20 Feb 2020 04:37:04 -0500
Subject: [PATCH 1150/4636] iosevka: disable update check in build

---
 pkgs/data/fonts/iosevka/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index e6e3aeba9dea..4ff0ed5fe49b 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''
     runHook preBuild
-    npm run build -- ttf::$pname >/dev/null
+    npm run build --no-update-notifier -- ttf::$pname >/dev/null
     runHook postBuild
   '';
 

From bb73acd27fabcdca1e4b39e48629e94902daf611 Mon Sep 17 00:00:00 2001
From: Richard Marko <srk@48.io>
Date: Sat, 1 Feb 2020 18:39:23 +0100
Subject: [PATCH 1151/4636] blackmagic: v1.6.1-317-gc9c8b08 ->
 v1.6.1-409-g7a595ea

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

diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix
index ddc15f856b53..c5d85dd8d0ce 100644
--- a/pkgs/development/tools/misc/blackmagic/default.nix
+++ b/pkgs/development/tools/misc/blackmagic/default.nix
@@ -7,15 +7,15 @@ with lib;
 
 stdenv.mkDerivation rec {
   pname = "blackmagic";
-  version = "unstable-2019-08-13";
+  version = "unstable-2020-02-20";
   # `git describe --always`
-  firmwareVersion = "v1.6.1-317-gc9c8b08";
+  firmwareVersion = "v1.6.1-409-g7a595ea";
 
   src = fetchFromGitHub {
     owner = "blacksphere";
     repo = "blackmagic";
-    rev = "c9c8b089f716c31433432f5ee54c5c206e4945cf";
-    sha256 = "0175plba7h3r1p584ygkjlvg2clvxa2m0xfdcb2v8jza2vzc8ywd";
+    rev = "7a595ead255f2a052fe4561c24a0577112c9de84";
+    sha256 = "01kdm1rkj7ll0px882crf9w27d2ka8f3hcdmvhb9jwd60bf5dlap";
     fetchSubmodules = true;
   };
 

From 87057d9bdcd69ccb7fde94738a134259ddb3f5b9 Mon Sep 17 00:00:00 2001
From: Richard Marko <srk@48.io>
Date: Sat, 1 Feb 2020 18:40:01 +0100
Subject: [PATCH 1152/4636] blackmagic: add libusb, pkgconfig. expose pc-*
 (hosted) targets

Add myself to maintainers and change meta.platforms to platforms.linux
due to build failures on Darwin.
---
 pkgs/development/tools/misc/blackmagic/default.nix | 11 +++++++----
 pkgs/development/tools/misc/blackmagic/helper.sh   | 13 +++++++++++--
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix
index c5d85dd8d0ce..29aa99d3a15b 100644
--- a/pkgs/development/tools/misc/blackmagic/default.nix
+++ b/pkgs/development/tools/misc/blackmagic/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub
-, gcc-arm-embedded, libftdi1
+, gcc-arm-embedded, libftdi1, libusb, pkgconfig
 , python, pythonPackages
 }:
 
@@ -20,11 +20,12 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    gcc-arm-embedded
+    gcc-arm-embedded pkgconfig
   ];
 
   buildInputs = [
     libftdi1
+    libusb
     python
     pythonPackages.intelhex
   ];
@@ -60,7 +61,9 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://github.com/blacksphere/blackmagic;
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ pjones emily ];
-    platforms = platforms.unix;
+    maintainers = with maintainers; [ pjones emily sorki ];
+    # fails on darwin with
+    # arm-none-eabi-gcc: error: unrecognized command line option '-iframework'
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/misc/blackmagic/helper.sh b/pkgs/development/tools/misc/blackmagic/helper.sh
index 991d0249e169..278a758c186a 100755
--- a/pkgs/development/tools/misc/blackmagic/helper.sh
+++ b/pkgs/development/tools/misc/blackmagic/helper.sh
@@ -23,11 +23,18 @@ make_platform() {
   make clean
   make PROBE_HOST="$1"
 
-  if [ "$1" = libftdi ]; then
-    mkdir -p "$out/bin"
+  if [ "$1" = "libftdi" ]; then
     install -m 0555 blackmagic "$out/bin"
   fi
 
+  if [ "$1" = "pc-hosted" ]; then
+    install -m 0555 blackmagic_hosted "$out/bin"
+  fi
+
+  if [ "$1" = "pc-stlinkv2" ]; then
+    install -m 0555 blackmagic_stlinkv2 "$out/bin"
+  fi
+
   for f in $PRODUCTS; do
     if [ -r "$f" ]; then
       mkdir -p "$out/firmware/$1"
@@ -45,6 +52,8 @@ make -C libopencm3
 # And now all of the platforms:
 cd src
 
+mkdir -p "$out/bin"
+
 for platform in platforms/*/Makefile.inc; do
   probe=$(basename "$(dirname "$platform")")
   make_platform "$probe"

From c852f024cc575f3408c3ba6855c842fdfd2974d3 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 20 Feb 2020 10:01:29 +0100
Subject: [PATCH 1153/4636] rav1e: 0.3.0 -> 0.3.1

Changelog: https://github.com/xiph/rav1e/releases/tag/v0.3.1
---
 pkgs/tools/video/rav1e/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix
index 9d4f7b514a35..099a02e8f658 100644
--- a/pkgs/tools/video/rav1e/default.nix
+++ b/pkgs/tools/video/rav1e/default.nix
@@ -2,7 +2,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rav1e";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = stdenv.mkDerivation rec {
     name = "${pname}-${version}-source";
@@ -11,11 +11,11 @@ rustPlatform.buildRustPackage rec {
       owner = "xiph";
       repo = "rav1e";
       rev = "v${version}";
-      sha256 = "1z8wdwhmczd7qq61gpngnyhl9614csccm0vnavvzjmaqsljlm0qi";
+      sha256 = "001v29baa77pkab13d7imi71llixyvffqax8kgjwhm1dhsqlm7bl";
     };
     cargoLock = fetchurl {
       url = "https://github.com/xiph/rav1e/releases/download/v${version}/Cargo.lock";
-      sha256 = "0qhgiryb71qgil5nawy7n3mj5g9aiikl3hq3nlikg94rm9dl0dhv";
+      sha256 = "06l8jj75ma5kvz1m14x58an2zvx12i6wcq70gzq5k47nvj5l0zax";
     };
 
     installPhase = ''
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
   # Delete this on next update; see #79975 for details
   legacyCargoFetcher = true;
 
-  cargoSha256 = "185jnmyirfhrv8bxvmwizf3lvq49sjj1696g3gflph31d8bfpb0c";
+  cargoSha256 = "0jxc8qsp5fasnh5cbg6yl9d878n7dppay9gzjndlb65kj9j43h84";
 
   nativeBuildInputs = [ nasm ];
 

From 91250fe6256a6a467445c2254262010c85c441b5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Feb 2020 11:27:23 +0000
Subject: [PATCH 1154/4636] nextcloud: 18.0.0 -> 18.0.1

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

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 9fb7a2e3e0eb..22fc4ebf39e4 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "nextcloud";
-  version = "18.0.0";
+  version = "18.0.1";
 
   src = fetchurl {
     url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2";
-    sha256 = "0yr6sh9nf15dpnpcj4ypdmm9l3y8ls57pxsmqh5h913db2jrah0r";
+    sha256 = "1h0rxpdssn1hc65k41zbvww9r4f79vbd9bixc9ri5n7hp0say3vp";
   };
 
   installPhase = ''

From d7ceb1738e26e2f2fcdf51985cf10c2ae4d15bfc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Feb 2020 11:49:08 +0000
Subject: [PATCH 1155/4636] networkmanager: 1.22.6 -> 1.22.8

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

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 571b907ee2f1..bbec39b9502b 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -10,11 +10,11 @@ let
   pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]);
 in stdenv.mkDerivation rec {
   pname = "network-manager";
-  version = "1.22.6";
+  version = "1.22.8";
 
   src = fetchurl {
     url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
-    sha256 = "0r65hk7nw44jq4k6h91wrprr0x9410ibd1n7mpmlh4f4kgy276dw";
+    sha256 = "0kxbgln78lb1cxhd79vbpdbncsb0cppr15fycgqb9df6f8nbj4cm";
   };
 
   outputs = [ "out" "dev" "devdoc" "man" "doc" ];

From b878000c66c8f0b61aa4f5feba03d372e64e061a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 20 Feb 2020 11:52:49 +0000
Subject: [PATCH 1156/4636] r2: 4.2.0 -> 4.2.1

---
 .../development/tools/analysis/radare2/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index a1140dbab814..49c749b21237 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -110,17 +110,17 @@ in {
   #<generated>
   # DO NOT EDIT! Automatically generated by ./update.py
   radare2 = generic {
-    version_commit = "23710";
-    gittap = "4.2.0";
-    gittip = "57a60ba8c5e782ca0807e3c7b1d26a8b3923073d";
-    rev = "4.2.0";
-    version = "4.2.0";
-    sha256 = "1xkvc9msbcvwgcasx9q10098ciw1zpnwgrciw397rq9ayrrvpngz";
+    version_commit = "23781";
+    gittap = "4.2.1";
+    gittip = "08478fdd29d8ce2a6c61fbd7b207bffc10682938";
+    rev = "4.2.1";
+    version = "4.2.1";
+    sha256 = "14b9433cgc2nabhz836zfgvgh2dwailcmvy05krsa0inmzbvx9fg";
     cs_ver = "4.0.1";
     cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6";
   };
   r2-for-cutter = generic {
-    version_commit = "23710";
+    version_commit = "23781";
     gittap = "4.2.1";
     gittip = "08478fdd29d8ce2a6c61fbd7b207bffc10682938";
     rev = "08478fdd29d8ce2a6c61fbd7b207bffc10682938";

From a905deb826ecece24a738f8ad30cfb0ec71ca7bc Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 20 Feb 2020 08:12:47 -0500
Subject: [PATCH 1157/4636] alacritty: Correct xdg-open behavior

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

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index a4d777151992..78e7249a0873 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -78,6 +78,10 @@ in buildRustPackage rec {
     ++ lib.optionals stdenv.isDarwin [ AppKit CoreGraphics CoreServices CoreText Foundation OpenGL ];
 
   outputs = [ "out" "terminfo" ];
+  postPatch = ''
+    substituteInPlace alacritty/src/config/mouse.rs \
+      --replace xdg-open ${xdg_utils}/bin/xdg-open
+  '';
 
   postBuild = lib.optionalString stdenv.isDarwin "make app";
 

From 49b4266ad2c779b11c0c492418a3e28be4822320 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 20 Feb 2020 08:05:17 -0500
Subject: [PATCH 1158/4636] linux: 4.19.104 -> 4.19.105

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 248e5334d507..53c44bc5b728 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.104";
+  version = "4.19.105";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1s3bsqcsjrpjiqlxwq89llb5pb37fkbr1pwircpnh1r6ijrgzsr3";
+    sha256 = "04mz4amafbhia0lwyh7wc9mxiqg2kw4gz2y0wvfb7zh4nj57fb7q";
   };
 } // (args.argsOverride or {}))

From 887d2886e349ba8f6284036c42b3e660ec9f8b4b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 20 Feb 2020 08:05:33 -0500
Subject: [PATCH 1159/4636] linux: 5.4.20 -> 5.4.21

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 4692ef7dc56f..ef021fa211dd 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.4.20";
+  version = "5.4.21";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1fv7bknwjyzh176rwn11dxvpymp97h5v94mhpdhxqx3hkb6nsgvr";
+    sha256 = "1yjv8qg47kb4j4jkcpi9z7v07p0vz3gszpmhrfji5866j97748vd";
   };
 } // (args.argsOverride or {}))

From 86bdbe2c9bdb7c236df713edf0f3ef02ed0d7e16 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 20 Feb 2020 08:05:39 -0500
Subject: [PATCH 1160/4636] linux: 5.5.4 -> 5.5.5

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.5.nix b/pkgs/os-specific/linux/kernel/linux-5.5.nix
index 375743dda150..806ba4d4f6c6 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.5.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.5.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.5.4";
+  version = "5.5.5";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1yx60d22c3x2qnwdhrwdr2nxir59gk33jh5d5334780bxc6zsh7a";
+    sha256 = "11shmhalrj6k25alarsgyh9ml48sgpq9v9r59n99y59d7z07ph3s";
   };
 } // (args.argsOverride or {}))

From b2a903a3e7ac9c038ed5f6a3ee744496622e0b65 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 20 Feb 2020 08:17:01 -0500
Subject: [PATCH 1161/4636] git: 2.25.0 -> 2.25.1

---
 .../version-management/git-and-tools/git/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index a7f13905e7cd..9396c6cd99c4 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -21,7 +21,7 @@ assert sendEmailSupport -> perlSupport;
 assert svnSupport -> perlSupport;
 
 let
-  version = "2.25.0";
+  version = "2.25.1";
   svn = subversionClient.override { perlBindings = perlSupport; };
 
   gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "1l58v42aazj0x9276gk8r9mwyl9pgp9w99aakz4xfhzv7wd2jq60";
+    sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2";
   };
 
   outputs = [ "out" ];

From 803d4e1a71de60d7936208bfb92267b259cbcf63 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 20 Feb 2020 08:21:12 -0500
Subject: [PATCH 1162/4636] oh-my-zsh: 2020-02-11 -> 2020-02-19

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

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 3b67d2a2280d..39672a7608a8 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2020-02-11";
+  version = "2020-02-19";
   pname = "oh-my-zsh";
-  rev = "17428f3c9a99c8d81e57bcf565d39011669e65ed";
+  rev = "bc9fe7423f5d8c639b208ebb9a7dbfce078bfd9b";
 
   src = fetchgit { inherit rev;
     url = "https://github.com/ohmyzsh/ohmyzsh";
-    sha256 = "1i2f5gvr8gdvwx4x135j949x4q1q721jq2936p33c1zk9wq4kzwc";
+    sha256 = "0nhqnhgp6y70q2p70qi7n4qzhahcb9q6hyqij7wfcdsws0lbf6nn";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];

From 8700c4b7def65c817f7e8f4486afc13d328511d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 20 Feb 2020 11:12:35 -0300
Subject: [PATCH 1163/4636] mojave-gtk-theme: 2019-12-12 -> 2020-02-20

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

diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix
index 6c38e3aaba41..d560e3fe5838 100644
--- a/pkgs/data/themes/mojave/default.nix
+++ b/pkgs/data/themes/mojave/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "mojave-gtk-theme";
-  version = "2019-12-12";
+  version = "2020-02-20";
 
   srcs = [
     (fetchFromGitHub {
       owner = "vinceliuice";
       repo = pname;
       rev = version;
-      sha256 = "0d5m9gh97db01ygqlp2sv9v1m183d9fgid9n9wms9r5rrrw6bs8m";
+      sha256 = "0fbpjfdx53g4qicr97jl1dssykjwwca9xzrfyh53dmd81vr6znpy";
     })
     (fetchurl {
       url = "https://github.com/vinceliuice/Mojave-gtk-theme/raw/11741a99d96953daf9c27e44c94ae50a7247c0ed/macOS_Mojave_Wallpapers.tar.xz";

From 2c21434d11fb90bffff45bd3c1686071b9a582b2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Feb 2020 14:23:52 +0000
Subject: [PATCH 1164/4636] pax-utils: 1.2.4 -> 1.2.5

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

diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix
index 917652ca6f79..f8c75b1913bc 100644
--- a/pkgs/os-specific/linux/pax-utils/default.nix
+++ b/pkgs/os-specific/linux/pax-utils/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pax-utils";
-  version = "1.2.4";
+  version = "1.2.5";
 
   src = fetchurl {
     url = "http://distfiles.gentoo.org/distfiles/${pname}-${version}.tar.xz";
-    sha256 = "01kr6l2c3bhbgdrmwgzh6jk0jjkw3pi9xrzzl9cpn0ibyf68p1aj";
+    sha256 = "1v4jwbda25w07qhlx5xc5i0hwsv3pjy8hfy0r93vnmfjxq61grvw";
   };
 
   makeFlags = [ "PREFIX=$(out)" ];

From 78d5a13cf8fc6f19cfb7ea8f39e397ddbd031568 Mon Sep 17 00:00:00 2001
From: Lengyel Balazs <ikervagyok@gmail.com>
Date: Thu, 20 Feb 2020 13:59:21 +0100
Subject: [PATCH 1165/4636] ucx: init at 1.7.0

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

diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix
new file mode 100644
index 000000000000..d1e3934d882c
--- /dev/null
+++ b/pkgs/development/libraries/ucx/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, doxygen
+, numactl, rdma-core, libbfd, libiberty, perl, zlib
+}:
+
+let
+  version = "1.7.0";
+
+in stdenv.mkDerivation {
+  name = "ucx-${version}";
+
+  src = fetchFromGitHub {
+    owner = "openucx";
+    repo = "ucx";
+    rev = "v${version}";
+    sha256 = "149p8s7jrg7pbbq0hw0qm8va119bsl19q4scgk94vjqliyc1s33h";
+  };
+
+  nativeBuildInputs = [ autoreconfHook doxygen ];
+
+  buildInputs = [ numactl rdma-core libbfd libiberty perl zlib ];
+
+  configureFlags = [
+    "--with-rdmacm=${rdma-core}"
+    "--with-dc"
+    "--with-rc"
+    "--with-dm"
+    "--with-verbs=${rdma-core}"
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Unified Communication X library";
+    homepage = http://www.openucx.org;
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.markuskowa ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 439afc272ab8..8a9511e64618 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6007,6 +6007,8 @@ in
 
   openmpi = callPackage ../development/libraries/openmpi { };
 
+  ucx = callPackage ../development/libraries/ucx {};
+
   openmodelica = callPackage ../applications/science/misc/openmodelica { };
 
   qarte = libsForQt5.callPackage ../applications/video/qarte { };

From 7667207f3da9d566b86e62bf28e2bc72b5053c78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Maret?= <sebastien.maret@icloud.com>
Date: Thu, 20 Feb 2020 15:26:04 +0100
Subject: [PATCH 1166/4636] gildas: 20200101_a -> 20200201_a

 - Upgrade gildas to the latest version

 - Remove a patch that has been included upstream

 - Re-enable parallel building (fixed upstream)
---
 .../science/astronomy/gildas/default.nix             | 12 ++++--------
 .../science/astronomy/gildas/imager-py3.patch        | 12 ------------
 2 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/applications/science/astronomy/gildas/imager-py3.patch

diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix
index cc6af8a17c06..9908439e10d4 100644
--- a/pkgs/applications/science/astronomy/gildas/default.nix
+++ b/pkgs/applications/science/astronomy/gildas/default.nix
@@ -7,8 +7,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  srcVersion = "jan20a";
-  version = "20200101_a";
+  srcVersion = "feb20a";
+  version = "20200201_a";
   pname = "gildas";
 
   src = fetchurl {
@@ -16,19 +16,15 @@ stdenv.mkDerivation rec {
     # source code of the previous release to a different directory
     urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
       "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ];
-    sha256 = "12n08pax7gwg2z121ix3ah5prq3yswqnf2yc8jgs4i9rgkpbsfzz";
+    sha256 = "05f34kpi3pfgf4dsyka7mkcln26yzb2mixnnc306krq0isjm7m26";
   };
 
-  # Python scripts are not converted to Python 3 syntax when parallel
-  # building is turned on. Disable it until this is fixed upstream.
-  enableParallelBuilding = false;
-
   nativeBuildInputs = [ pkgconfig groff perl getopt gfortran which ];
 
   buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ]
     ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]);
 
-  patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ./imager-py3.patch ];
+  patches = [ ./wrapper.patch ./clang.patch ./aarch64.patch ];
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";
 
diff --git a/pkgs/applications/science/astronomy/gildas/imager-py3.patch b/pkgs/applications/science/astronomy/gildas/imager-py3.patch
deleted file mode 100644
index 71a129164bac..000000000000
--- a/pkgs/applications/science/astronomy/gildas/imager-py3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN gildas-src-jan20a.orig/contrib/imager/pro/define.ima gildas-src-jan20a/contrib/imager/pro/define.ima
---- gildas-src-jan20a.orig/contrib/imager/pro/define.ima	2020-01-01 02:15:16.000000000 +0100
-+++ gildas-src-jan20a/contrib/imager/pro/define.ima	2020-01-14 11:18:46.000000000 +0100
-@@ -9,7 +9,7 @@
- !
- ! Patch for a Bug on Mac-OS/X where Python blocks if activated first
- ! from a script launched by a widget.
--python print "Starting Python" 
-+python print("Starting Python")
- !
- ! INPUT, GO and UVT_CONVERT always defined by GreG
- define command GO "@ p_go.ima" gag_pro:go_greg.hlp  

From 2ce41a54ac8bfc98448d17a67047fa48573577dc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Feb 2020 15:04:21 +0000
Subject: [PATCH 1167/4636] ocrmypdf: 9.5.0 -> 9.6.0

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

diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix
index cdc6878bb5a7..6f7b4d487ef1 100644
--- a/pkgs/tools/text/ocrmypdf/default.nix
+++ b/pkgs/tools/text/ocrmypdf/default.nix
@@ -29,14 +29,14 @@ let
 
 in buildPythonApplication rec {
   pname = "ocrmypdf";
-  version = "9.5.0";
+  version = "9.6.0";
   disabled = ! python3Packages.isPy3k;
 
   src = fetchFromGitHub {
     owner = "jbarlow83";
     repo = "OCRmyPDF";
     rev = "v${version}";
-    sha256 = "0rvwxykyscpcvfgm8zzyvjgzl9x9ddi9cxmqyxrc031mxpc0lzyy";
+    sha256 = "1cpj8fj1mzp6mbd1z9dj38fmlcg5q2gbya4vbag1ddd4vp7rvn2m";
   };
 
   nativeBuildInputs = with python3Packages; [

From 4bad7d67cd3c5b7b67c2609a6892d45a2b141f19 Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Thu, 20 Feb 2020 16:07:44 +0100
Subject: [PATCH 1168/4636] cmake_2_8: fix build

---
 pkgs/development/tools/build-managers/cmake/2.8.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix
index ac438080b9ab..88ebc5ebfaed 100644
--- a/pkgs/development/tools/build-managers/cmake/2.8.nix
+++ b/pkgs/development/tools/build-managers/cmake/2.8.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
       --replace '"-framework CoreServices"' '""'
   '';
 
-  buildInputs = [ curl expat zlib bzip2 ]
+  buildInputs = [ setupHook curl expat zlib bzip2 ]
     ++ optional useNcurses ncurses
     ++ optional useQt4 qt4;
 
@@ -67,7 +67,6 @@ stdenv.mkDerivation rec {
   dontUseCmakeConfigure = true;
 
   preConfigure = with stdenv; ''
-      source $setupHook
       fixCmakeFiles .
       substituteInPlace Modules/Platform/UnixPaths.cmake \
         --subst-var-by libc_bin ${getBin cc.libc} \
@@ -82,7 +81,7 @@ stdenv.mkDerivation rec {
     homepage = https://cmake.org;
     description = "Cross-Platform Makefile Generator";
     platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ ];
+    maintainers = with stdenv.lib.maintainers; [ xfix ];
     license = stdenv.lib.licenses.bsd3;
   };
 }

From 7dd1b77ee2ee362457b69b01334e543eed81051e Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Thu, 20 Feb 2020 07:29:56 -0800
Subject: [PATCH 1169/4636] hugo: 0.64.1 -> 0.65.1

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

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 18f7153b1eb9..4b099270df54 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "hugo";
-  version = "0.64.1";
+  version = "0.65.1";
 
   goPackagePath = "github.com/gohugoio/hugo";
 
@@ -10,10 +10,10 @@ buildGoModule rec {
     owner = "gohugoio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1h5n5d7g3l2lp25sjrcmavbkqqm1csgv2q5z7afwbb57j0m1nkn8";
+    sha256 = "09kaa5zvi0kmmhms9n162fmrxacidga9241in0vrnn8lwl3rbgam";
   };
 
-  modSha256 = "18wfsp3ypfxj5qljmb19kzyc5byf413nkabz5mfvq8srjhcq1ifl";
+  modSha256 = "1f320zbqnv2ybsp3qmlgn3rsjgp2zdb24qjd3gcys30mw48cx3na";
 
   buildFlags = [ "-tags" "extended" ];
 

From 5091da07ad49dda77a8edf344793f2726bedb18a Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Thu, 20 Feb 2020 16:46:50 +0100
Subject: [PATCH 1170/4636] riot-desktop: 1.5.9 -> 1.5.10

Synching with the riot-web update (commit da45483).
---
 .../instant-messengers/riot/riot-desktop-package.json         | 2 +-
 .../networking/instant-messengers/riot/riot-desktop.nix       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
index 11e2cf5c7e45..3dc7c79b00b9 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "1.5.9",
+  "version": "1.5.10",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "dependencies": {
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
index bf0feda42780..f94d7ad165db 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
@@ -6,12 +6,12 @@
 
 let
   executableName = "riot-desktop";
-  version = "1.5.9";
+  version = "1.5.10";
   riot-web-src = fetchFromGitHub {
     owner = "vector-im";
     repo = "riot-web";
     rev = "v${version}";
-    sha256 = "13bskp8nj1h44y7x4dibnfa8sdnzl744x4xckcw5lxnlkccfr69m";
+    sha256 = "0yr5f3i24qh9b8hjfalpqxwr0qhs7hax450g83vf06skap1l5i5j";
   };
 
 in mkYarnPackage rec {

From bd3319d28c43580c74839a10dca5d348cc3e0b29 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Thu, 20 Feb 2020 08:12:32 -0800
Subject: [PATCH 1171/4636] snmp_exporter: 0.15.0 -> 0.17.0

---
 pkgs/servers/monitoring/prometheus/snmp-exporter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
index f3dfccee3bce..612066edb6d4 100644
--- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "snmp_exporter";
-  version = "0.15.0";
+  version = "0.17.0";
 
   goPackagePath = "github.com/prometheus/snmp_exporter";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "prometheus";
     repo = "snmp_exporter";
     rev = "v${version}";
-    sha256 = "1cnz1wapxs3fkghzy6v90s56vd0ngynypyapcpbmx5y66rlpdxx6";
+    sha256 = "0s2vgcpxannyl1zllc3ixww02832s53zijws64lhd8mxrylqvpcp";
   };
 
   buildInputs = [ net-snmp ];

From 5b80220d53261b231cc82bb825471f4b16be05c5 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Thu, 20 Feb 2020 08:33:16 -0800
Subject: [PATCH 1172/4636] grafana: 6.6.1 -> 6.6.2

---
 pkgs/servers/monitoring/grafana/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 427d3d1d42e7..cbb13074afc8 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "grafana";
-  version = "6.6.1";
+  version = "6.6.2";
 
   goPackagePath = "github.com/grafana/grafana";
 
@@ -12,12 +12,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "0yw7yq201f5c3dzy51jaa2mgn0bdh69341a7r9hz9bxpb21w0zq9";
+    sha256 = "0zbc9jcr3w7rwsv96csqaifn5d0b435wyrrajr5wzsmhljygvrcy";
   };
 
   srcStatic = fetchurl {
     url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "0xrkaiz3kl1avq040xyyal35rkf2mg6s2y0wggmndvsnwc3q5p0f";
+    sha256 = "1plijm7cy92k79ypcnxjmdf2vhlxa4dzwjyl9lkf2npm7kswswsl";
   };
 
   postPatch = ''

From 8dd592e3b2cdcf232a8d905ba4fc6d499491e10e Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Thu, 20 Feb 2020 15:00:08 +0100
Subject: [PATCH 1173/4636] pythonPackages.can: remove pytest-timeout check
 input

pytest-timeout can cause tests to be flaky. It's not
necessary to patch the code, as pytest ignores unrecognized
marks with an ignorable warning.
---
 pkgs/development/python-modules/can/default.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix
index b9d2b4b7751a..8aa80a750678 100644
--- a/pkgs/development/python-modules/can/default.nix
+++ b/pkgs/development/python-modules/can/default.nix
@@ -24,12 +24,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ wrapt pyserial aenum ] ++ lib.optional (pythonOlder "3.5") typing;
-  checkInputs = [ nose mock pytest pytest-timeout hypothesis future ];
-
-  # Tests won't work with hypothesis 4.7.3 under Python 2. So skip the tests in
-  # that case. This clause can be removed once hypothesis has been upgraded in
-  # nixpkgs.
-  doCheck = !(isPy27 && (hypothesis.version == "4.7.3"));
+  checkInputs = [ nose mock pytest hypothesis future ];
 
   # Add the scripts to PATH
   checkPhase = ''

From 40376f17248a0217e796df599f4403211f91c725 Mon Sep 17 00:00:00 2001
From: Valentin Robert <valentin.robert.42@gmail.com>
Date: Sat, 15 Feb 2020 00:49:28 +0100
Subject: [PATCH 1174/4636] coqPackages.coq-ext-lib: 0.10.3 -> 0.11.1

---
 pkgs/development/coq-modules/coq-ext-lib/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix
index 977039223959..8bbf74b60784 100644
--- a/pkgs/development/coq-modules/coq-ext-lib/default.nix
+++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix
@@ -2,11 +2,13 @@
 
 let params =
   {
-    "8.5" = { version = "0.9.4"; sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; };
-    "8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; };
-    "8.7" = { version = "0.9.7"; sha256 = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; };
-    "8.8" = { version = "0.10.3"; sha256 = "0795gs2dlr663z826mp63c8h2zfadn541dr8q0fvnvi2z7kfyslb"; };
-    "8.9" = { version = "0.10.3"; sha256 = "0795gs2dlr663z826mp63c8h2zfadn541dr8q0fvnvi2z7kfyslb"; };
+    "8.5"  = { version = "0.9.4";  sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; };
+    "8.6"  = { version = "0.9.5";  sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; };
+    "8.7"  = { version = "0.9.7";  sha256 = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; };
+    "8.8"  = { version = "0.11.1"; sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; };
+    "8.9"  = { version = "0.11.1"; sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; };
+    "8.10" = { version = "0.11.1"; sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; };
+    "8.11" = { version = "0.11.1"; sha256 = "0dmf1p9j8lm0hwaq0af18jxdwg869xi2jm8447zng7krrq3kvkg5"; };
   };
   param = params.${coq.coq-version};
 in

From d57c05acd165ba8a428b13457c87d24175f58136 Mon Sep 17 00:00:00 2001
From: koral <chahine.moreau@gmail.com>
Date: Sun, 16 Feb 2020 14:40:48 +0100
Subject: [PATCH 1175/4636] mps-youtube: 0.2.8 -> unstable-2020-01-28

Also move derivation from python-packages to all-packages,
as this is a standalone application.
---
 .../misc}/mps-youtube/default.nix               | 17 ++++++++---------
 pkgs/top-level/all-packages.nix                 |  2 ++
 pkgs/top-level/python-packages.nix              |  2 --
 3 files changed, 10 insertions(+), 11 deletions(-)
 rename pkgs/{development/python-modules => applications/misc}/mps-youtube/default.nix (67%)

diff --git a/pkgs/development/python-modules/mps-youtube/default.nix b/pkgs/applications/misc/mps-youtube/default.nix
similarity index 67%
rename from pkgs/development/python-modules/mps-youtube/default.nix
rename to pkgs/applications/misc/mps-youtube/default.nix
index 753a0d24d0a3..b1118cfc5977 100644
--- a/pkgs/development/python-modules/mps-youtube/default.nix
+++ b/pkgs/applications/misc/mps-youtube/default.nix
@@ -1,17 +1,16 @@
-{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
-, pafy
-}:
+{ lib, python3Packages, fetchFromGitHub }:
 
-buildPythonPackage rec {
+with python3Packages;
+
+buildPythonApplication rec {
   pname = "mps-youtube";
-  version = "0.2.8";
-  disabled = (!isPy3k);
+  version = "unstable-2020-01-28";
 
   src = fetchFromGitHub {
     owner = "mps-youtube";
     repo = "mps-youtube";
-    rev = "v${version}";
-    sha256 = "1w1jhw9rg3dx7vp97cwrk5fymipkcy2wrbl1jaa38ivcjhqg596y";
+    rev = "b808697133ec2ad7654953232d1e841b20aa7cc3";
+    sha256 = "0lqprlpc0v092xqkjc0cc395ag45lijwgd34dpg2jy6i0f2szywv";
   };
 
   propagatedBuildInputs = [ pafy ];
@@ -30,6 +29,6 @@ buildPythonPackage rec {
     description = "Terminal based YouTube player and downloader";
     homepage = "https://github.com/mps-youtube/mps-youtube";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ odi ];
+    maintainers = with maintainers; [ koral odi ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d29413530b9f..91fd0aeaf019 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20448,6 +20448,8 @@ in
 
   mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { };
 
+  mps-youtube = callPackage ../applications/misc/mps-youtube { };
+
   mplayer = callPackage ../applications/video/mplayer ({
     libdvdnav = libdvdnav_4_2_1;
   } // (config.mplayer or {}));
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7451215072d5..84672f066006 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6493,8 +6493,6 @@ in {
 
   maildir-deduplicate = callPackage ../development/python-modules/maildir-deduplicate { };
 
-  mps-youtube = callPackage ../development/python-modules/mps-youtube { };
-
   d2to1 = callPackage ../development/python-modules/d2to1 { };
 
   ovh = callPackage ../development/python-modules/ovh { };

From 185aabefb01b24177f781a6b10e559d252a223a9 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 20 Feb 2020 23:21:56 +1000
Subject: [PATCH 1176/4636] gitAndTools.gh: 0.5.5 -> 0.5.6

https://github.com/cli/cli/releases/tag/v0.5.6
---
 .../version-management/git-and-tools/gh/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix
index 19f97e8994cf..fe3bca6c1899 100644
--- a/pkgs/applications/version-management/git-and-tools/gh/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "gh";
-  version = "0.5.5";
+  version = "0.5.6";
 
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "0jmkcx95kngzylqhllg33s094rggpsrgky704z8v6j4969xgrfnc";
+    sha256 = "0bn7l1q1d85zg7za8bfz12wwz6ff17vwdsriazvhwia3a93g9ad0";
   };
 
-  modSha256 = "0ina3m2ixkkz2fws6ifwy34pmp6kn5s3j7w40alz6vmybn2smy1h";
+  modSha256 = "1qwcl74sg5az9vaivnvn7f40p72ilmkms5rp52sp5imfrql81lxf";
 
   buildFlagsArray = [
     "-ldflags=-X github.com/cli/cli/command.Version=${version}"

From 4af086aa94c192adaba1bbb75a85c387d3416856 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 20 Feb 2020 18:50:39 +0100
Subject: [PATCH 1177/4636] tdesktop: 1.9.13 -> 1.9.14

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

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index ec7e4e68312d..9cd181c591d6 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -19,12 +19,12 @@ with lib;
 
 mkDerivation rec {
   pname = "telegram-desktop";
-  version = "1.9.13";
+  version = "1.9.14";
 
   # Telegram-Desktop with submodules
   src = fetchurl {
     url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
-    sha256 = "1cd1vy5f0hin01jp7agdr56axwd8539rkngb7c16x17bhj5r7rm7";
+    sha256 = "0jsss4b51ylf4qk58frvh2yap1s3cjf3isnlc273cc0fh5g1skc6";
   };
 
   postPatch = ''

From 7fa751b7c685e7d91f20c2a17ce1a9728a718e7c Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Thu, 20 Feb 2020 19:32:10 +0100
Subject: [PATCH 1178/4636] bluez-alsa: 2.0.0 -> 2.1.0

---
 pkgs/tools/bluetooth/bluez-alsa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/pkgs/tools/bluetooth/bluez-alsa/default.nix
index 7db28b581e28..326366f4f0d3 100644
--- a/pkgs/tools/bluetooth/bluez-alsa/default.nix
+++ b/pkgs/tools/bluetooth/bluez-alsa/default.nix
@@ -13,13 +13,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "bluez-alsa";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "Arkq";
     repo = "bluez-alsa";
     rev = "v${version}";
-    sha256 = "08mppgnjf1j2733bk9yf0cny6rfxxwiys0s62lz2zd2lpdl6d9lz";
+    sha256 = "112dfqxc144a61jqil2s3181gngfw5vz7yy10ml4f5a1nd90qnci";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];

From 4979ccb4b0e2b6a6293c666a56f2fadf86344bfb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Feb 2020 18:58:16 +0000
Subject: [PATCH 1179/4636] python27Packages.bsddb3: 6.2.6 -> 6.2.7

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

diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix
index a286249ea0f3..7a541a479527 100644
--- a/pkgs/development/python-modules/bsddb3/default.nix
+++ b/pkgs/development/python-modules/bsddb3/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "bsddb3";
-  version = "6.2.6";
+  version = "6.2.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "42d621f4037425afcb16b67d5600c4556271a071a9a7f7f2c2b1ba65bc582d05";
+    sha256 = "17yw0by4lycwpvnx06cnzbbchz4zvzbx3j89b20xa314xdizmxxh";
   };
 
   buildInputs = [ pkgs.db ];

From 436a6784b0f9e7260077a7579b92bbc6ad2d99e6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Feb 2020 19:01:14 +0000
Subject: [PATCH 1180/4636] python27Packages.braintree: 3.58.0 -> 3.59.0

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

diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix
index b96e0b7874a6..db5ed5410e3e 100644
--- a/pkgs/development/python-modules/braintree/default.nix
+++ b/pkgs/development/python-modules/braintree/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "braintree";
-  version = "3.58.0";
+  version = "3.59.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0n8k9m3kifj34rzi2a3jgjsik91w8z32xaaxcmvqs7x8m5m3kjj4";
+    sha256 = "08g8qlnsp9wd2zbf6x3npp1425g7ih4lyljzvybd3vazsbqlw4yq";
   };
 
   propagatedBuildInputs = [ requests ];

From c6f02f028c090fcf01b64c0c95813b73bc101117 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Feb 2020 19:17:29 +0000
Subject: [PATCH 1181/4636] plantuml: 1.2020.0 -> 1.2020.1

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

diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index b42be5b548cd..34a6cb03d8bb 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre, graphviz }:
 
 stdenv.mkDerivation rec {
-  version = "1.2020.0";
+  version = "1.2020.1";
   pname = "plantuml";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
-    sha256 = "1ibhyj51wib2d8q7zyjbzp65hqm0a1jczqwqdw3834zdmrb2v7bs";
+    sha256 = "02a55na86561fnxf6pk0cpg13mx8qr7pvigyp65rqks0f9ygj9ga";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 627a9ff43348c6b91102e0b4c9a4c338918b9ddd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Thu, 20 Feb 2020 21:07:43 +0100
Subject: [PATCH 1182/4636] lkl: fixup build after PR #78994

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

diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix
index cd6600387cde..d56318555e5e 100644
--- a/pkgs/applications/virtualization/lkl/default.nix
+++ b/pkgs/applications/virtualization/lkl/default.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
 
   # Fix a /usr/bin/env reference in here that breaks sandboxed builds
   prePatch = "patchShebangs arch/lkl/scripts";
+  # Fixup build with newer Linux headers: https://github.com/lkl/linux/pull/484
+  postPatch = "sed '1i#include <linux/sockios.h>' -i tools/lkl/lib/hijack/xlate.c";
 
   installPhase = ''
     mkdir -p $out/bin $lib/lib $dev

From f04825cc31b261e393978bdabdf6b7dde64c1599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Thu, 20 Feb 2020 21:16:50 +0100
Subject: [PATCH 1183/4636] can-utils: fixup build after PR #78994

---
 pkgs/os-specific/linux/can-utils/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/os-specific/linux/can-utils/default.nix
index 6e26ef4bbce8..1451a4e96c08 100644
--- a/pkgs/os-specific/linux/can-utils/default.nix
+++ b/pkgs/os-specific/linux/can-utils/default.nix
@@ -13,6 +13,12 @@ stdenv.mkDerivation {
     sha256 = "1ygzp8rjr8f1gs48mb1pz7psdgbfhlvr6kjdnmzbsqcml06zvrpr";
   };
 
+  # Fixup build with newer Linux headers.
+  postPatch = ''
+    sed '1i#include <linux/sockios.h>' -i \
+      slcanpty.c cansniffer.c canlogserver.c isotpdump.c isotpsniffer.c isotpperf.c
+  '';
+
   preConfigure = ''makeFlagsArray+=(PREFIX="$out")'';
 
   meta = with stdenv.lib; {

From a08a4165c8b7e6f5558f7d2554c3ed71b033f492 Mon Sep 17 00:00:00 2001
From: wucke13 <wucke13@gmail.com>
Date: Thu, 20 Feb 2020 22:50:37 +0100
Subject: [PATCH 1184/4636] webdis: init at 0.1.9

Co-Authored-By: Doron Behar <doron.behar@gmail.com>
---
 .../tools/database/webdis/default.nix         | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/tools/database/webdis/default.nix

diff --git a/pkgs/development/tools/database/webdis/default.nix b/pkgs/development/tools/database/webdis/default.nix
new file mode 100644
index 000000000000..fd705c4fc1b0
--- /dev/null
+++ b/pkgs/development/tools/database/webdis/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, hiredis, http-parser, jansson, libevent, fetchpatch }:
+
+stdenv.mkDerivation rec {
+  pname = "webdis";
+  version = "0.1.9";
+
+  src = fetchFromGitHub {
+    owner = "nicolasff";
+    repo = pname;
+    rev = version;
+    sha256 = "1kglzbs1sw3w05i678qr3lv4pxia20k2a8s3pjhfcxdlnlcy23sk";
+  };
+
+  patches = [
+    # Do not use DESTDIR. See: https://github.com/nicolasff/webdis/pull/172
+    (fetchpatch {
+      url = "https://github.com/nicolasff/webdis/commit/a44a2964a59f2e583f4945eeb65cd19235059270.patch";
+      sha256 = "0i41p98gc201vpp5ppjc9gxdyb1bpimr0qrvibaf3iq3sy4jr1gb";
+    })
+  ];
+
+  buildInputs = [ hiredis http-parser jansson libevent ];
+
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "CONFDIR=${placeholder "out"}/share/webdis"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A Redis HTTP interface with JSON output";
+    homepage = "https://webd.is/";
+    license = licenses.bsd2;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wucke13 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 20016724d171..1d5e9d0e1964 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10855,6 +10855,8 @@ in
 
   watson-ruby = callPackage ../development/tools/misc/watson-ruby {};
 
+  webdis = callPackage ../development/tools/database/webdis { };
+
   xc3sprog = callPackage ../development/tools/misc/xc3sprog { };
 
   xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix {

From 143a1305eb37efe92a0283171b18baa3a5b62df0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Feb 2020 21:37:23 +0000
Subject: [PATCH 1185/4636] python37Packages.aiorun: 2020.1.3 -> 2020.2.1

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

diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix
index aa7462ba831f..16a8a167fbba 100644
--- a/pkgs/development/python-modules/aiorun/default.nix
+++ b/pkgs/development/python-modules/aiorun/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "aiorun";
-  version = "2020.1.3";
+  version = "2020.2.1";
   format = "flit";
 
   disabled = isPy27;
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "cjrh";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0ka0pj6xr47j7rw6kd5mkrr5jyhn631pfpd95ig7vbln4434qnb4";
+    sha256 = "0wcj8prkijb889ic8n6varms7xkwy028hhw0imgkd1i0p64lm3m4";
   };
 
   checkInputs = [

From 2d77fc3053400059d70feaa97b1980dd0daa6886 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 20 Feb 2020 23:11:52 +0100
Subject: [PATCH 1186/4636] weechat: 2.7 -> 2.7.1

Release notes:

irc: fix crash when receiving a malformed message 352 (who)
irc: fix crash when a new message 005 is received with longer nick prefixes
irc: fix crash when receiving a malformed message 324 (channel mode) (CVE-2020-8955)
---
 pkgs/applications/networking/irc/weechat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 13ac80677ee9..96d7b3faaede 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -27,12 +27,12 @@ let
   in
     assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
     stdenv.mkDerivation rec {
-      version = "2.7";
+      version = "2.7.1";
       pname = "weechat";
 
       src = fetchurl {
         url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
-        sha256 = "00hzchzw1w2181kczcrrnj8ngml3bwk7qciha3higxq3qynf0h8c";
+        sha256 = "0acz41jg7lmipni9z2agfqw4dhmx5hf6k9w4pvr4zih1fhkldva2";
       };
 
       outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;

From 3338225cd2b57a6233c682b5ffbe2dc58ddd8c38 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 21 Feb 2020 08:19:47 +1000
Subject: [PATCH 1187/4636] gitAndTools.gh: 0.5.6 -> 0.5.7

https://github.com/cli/cli/releases/tag/v0.5.7
---
 .../version-management/git-and-tools/gh/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix
index fe3bca6c1899..594d2a3abae0 100644
--- a/pkgs/applications/version-management/git-and-tools/gh/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "gh";
-  version = "0.5.6";
+  version = "0.5.7";
 
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "0bn7l1q1d85zg7za8bfz12wwz6ff17vwdsriazvhwia3a93g9ad0";
+    sha256 = "14j8210c1dndnhb8l2ifxcljzhajjhil86lvk9y7ndjkq09805q1";
   };
 
   modSha256 = "1qwcl74sg5az9vaivnvn7f40p72ilmkms5rp52sp5imfrql81lxf";

From 7724ef793adcfbbd9cd46f8836a3618687ee110d Mon Sep 17 00:00:00 2001
From: Jason Felice <jason.m.felice@gmail.com>
Date: Thu, 20 Feb 2020 17:40:30 -0500
Subject: [PATCH 1188/4636] plan9port: wrap ALL linker flags

---
 pkgs/tools/system/plan9port/builder.sh | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh
index 57716614a13e..7750de700617 100644
--- a/pkgs/tools/system/plan9port/builder.sh
+++ b/pkgs/tools/system/plan9port/builder.sh
@@ -5,25 +5,11 @@ export PLAN9_TARGET=$PLAN9
 
 plan9portLinkFlags()
 {
-    local -a linkFlags=()
     eval set -- "$NIX_LDFLAGS"
-    while (( $# > 0 )); do
-        case "$1" in
-        -rpath|-macosx_version_min|-sdk_version)
-            linkFlags+=( "-Wl,$1,$2" )
-            shift 2
-            ;;
-        -no_uuid)
-            linkFlags+=( "-Wl,$1" )
-            shift
-            ;;
-        *)
-            linkFlags+=( "$1" )
-            shift
-            ;;
-        esac
+    local flag
+    for flag in "$@"; do
+        printf ' -Wl,%s' "$flag"
     done
-    echo "${linkFlags[*]}"
 }
 
 configurePhase()

From fd198bc821b1de9ea341999eb9e9c35eefb0cdd2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Feb 2020 18:48:35 +0000
Subject: [PATCH 1189/4636] python37Packages.azure-core: 1.2.1 -> 1.2.2

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

diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix
index aab979f3a8fb..24675200b5b1 100644
--- a/pkgs/development/python-modules/azure-core/default.nix
+++ b/pkgs/development/python-modules/azure-core/default.nix
@@ -11,14 +11,14 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.2.1";
+  version = "1.2.2";
   pname = "azure-core";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1fff6g5lszn97qz1h4l1n255r9538yybb329ilb2rwdfq3q9kkg2";
+    sha256 = "0bz4m6kmqymxlxf9qk6jw8v895d13rsggbgsjpsbvi9px6w15nwb";
   };
 
   propagatedBuildInputs = [

From bbf34acab704afff24e6f1faaa9dc0b41c0bd4e2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Feb 2020 21:46:29 +0000
Subject: [PATCH 1190/4636] python37Packages.ckcc-protocol: 0.8.0 -> 1.0.0

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

diff --git a/pkgs/development/python-modules/ckcc-protocol/default.nix b/pkgs/development/python-modules/ckcc-protocol/default.nix
index 599f91f2d070..f1136851f8a8 100644
--- a/pkgs/development/python-modules/ckcc-protocol/default.nix
+++ b/pkgs/development/python-modules/ckcc-protocol/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "ckcc-protocol";
-  version = "0.8.0";
+  version = "1.0.0";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1mbs9l8qycy50j5lq6az7l5d8i40nb0vmlyhcyax298qp6c1r1gh";
+    sha256 = "1glws7z7kk9qyl1j4446hb6vv3l4s5xca40zb4fzhsh6chm76h11";
   };
 
   checkInputs = [

From 9cd683ccc0b31d5ea06373b2f2e3b728a5167d83 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 16 Feb 2020 15:49:51 -0800
Subject: [PATCH 1191/4636] steamPackages.chrootenv: add file command

Noticed that the setup.sh for steam was trying to call the file command.
I'm not sure what the ramifications are for these missing,
but some steam features are quietly disabled when they
don't follow happy paths.
---
 pkgs/games/steam/chrootenv.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 8832f3bbc184..d7a962104299 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -100,6 +100,9 @@ in buildFHSUserEnv rec {
 
     # friends options won't display "Launch Game" without it
     lsof
+
+    # called by steam's setup.sh
+    file
   ] ++ (if (!nativeOnly) then [
     (steamPackages.steam-runtime-wrapped.override {
       inherit runtimeOnly;

From 687e2195d8076b0cef3e29c719fb5ab35975c160 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 20 Feb 2020 18:19:05 -0500
Subject: [PATCH 1192/4636] runInLinuxVM: Ensure tools requiring /etc/passwd
 work

This includes, but is not limited to:

 * whoami
 * nix >= 2.3.1

See

 * https://github.com/NixOS/nixpkgs/issues/71157
 * https://github.com/NixOS/nixops/issues/1216
 * https://github.com/nix-community/nixops-libvirtd/issues/5
---
 pkgs/build-support/vm/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index a7050f52e521..488c7f2ce2c7 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -126,6 +126,10 @@ rec {
     mkdir -p /fs/etc
     ln -sf /proc/mounts /fs/etc/mtab
     echo "127.0.0.1 localhost" > /fs/etc/hosts
+    # Ensures tools requiring /etc/passwd will work (e.g. nix)
+    if [ ! -e /fs/etc/passwd ]; then
+      echo "root:x:0:0:System administrator:/root:/bin/sh" > /fs/etc/passwd
+    fi
 
     echo "starting stage 2 ($command)"
     exec switch_root /fs $command $out

From 7d1842b5b937dd35813e3e1c5be6904a85f6f134 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Feb 2020 23:43:16 +0000
Subject: [PATCH 1193/4636] python27Packages.nbsphinx: 0.5.0 -> 0.5.1

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

diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix
index 788a8f73ab89..4557d6656502 100644
--- a/pkgs/development/python-modules/nbsphinx/default.nix
+++ b/pkgs/development/python-modules/nbsphinx/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "nbsphinx";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "03g0mqbgk143cq3l3r42js2iy5l6iyvpckpqip4p468rlzrddyhn";
+    sha256 = "0kh0d83xavpffdp4xp4hq8xy43l6lyv3d1a25rnc15jcbdf1nghw";
   };
 
   propagatedBuildInputs = [

From 4fcce2abab410f9c1fc996476ff0ca3fbbe74ffc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Feb 2020 23:14:58 +0000
Subject: [PATCH 1194/4636] python27Packages.nbval: 0.9.4 -> 0.9.5

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

diff --git a/pkgs/development/python-modules/nbval/default.nix b/pkgs/development/python-modules/nbval/default.nix
index ff9d6f134e0f..020fab8f8887 100644
--- a/pkgs/development/python-modules/nbval/default.nix
+++ b/pkgs/development/python-modules/nbval/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "nbval";
-  version = "0.9.4";
+  version = "0.9.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5273c2d958335e24b170fe59b689b13e4b1855b569626e18b1c7e420f5110cc6";
+    sha256 = "1xh2p7g5s5g06caaraf3dsz69bpj7dgw2h3ss67kci789aspnwp8";
   };
 
   checkInputs = [

From 4dd173560d472ff15703d6b5225f08f6dfeb771a Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 20 Feb 2020 15:08:41 -0800
Subject: [PATCH 1195/4636] azure-cli: 2.0.81 -> 2.1.0

---
 pkgs/tools/admin/azure-cli/default.nix        |  4 +--
 .../tools/admin/azure-cli/python-packages.nix | 27 ++++++++++---------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix
index 9a6b512ce1fc..69e0a2afe6e2 100644
--- a/pkgs/tools/admin/azure-cli/default.nix
+++ b/pkgs/tools/admin/azure-cli/default.nix
@@ -1,12 +1,12 @@
 { stdenv, lib, python, fetchFromGitHub, installShellFiles }:
 
 let
-  version = "2.0.81";
+  version = "2.1.0";
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-cli";
     rev = "azure-cli-${version}";
-    sha256 = "1fpdc59qqkx9s5aip62jzcky92fhlbvc97hi1x047sldh9ibp02n";
+    sha256 = "0f4wrqp9f4n4mk73ybx08ybvmxx88r6g5cvx8ld6ybhl2w8bbn9v";
   };
 
   # put packages that needs to be overriden in the py package scope
diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix
index 4cf0a5d35545..2ac74a16edd1 100644
--- a/pkgs/tools/admin/azure-cli/python-packages.nix
+++ b/pkgs/tools/admin/azure-cli/python-packages.nix
@@ -119,11 +119,14 @@ let
       azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.4.0" "zip"
         "1b69rz9wm0jvc54vx3b7h633x8gags51xwxrkp6myar40jggxw6g";
 
-      azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.5.0" "zip"
-        "0jhq8fi3dn2cncyv2rrgr4kldd254f30zgwf6p85rdgvg2p9k4hl";
+      azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.6.0" "zip"
+        "13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd";
 
-      azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "6.0.0" "zip"
-        "08n6r6ja7p20qlhb9pp51nwwxz2mal19an98zry276i8z5x8ckp0";
+      azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "8.0.1" "zip"
+        "0gngm7w17r5922ji11pnpa6gp5vh5z6la025v9cda6smsnx0fxx7";
+
+      azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.4.0" "zip"
+        "1dn5585nsizszjivx6lp677ka0mrg0ayqgag4yzfdz9ml8mj1xl5";
 
       azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "10.0.0" "zip"
         "1s3bx6knxw5dxycp43yimvgrh0i19drzd09asglcwz2x5mr3bpyg";
@@ -161,8 +164,8 @@ let
       azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip"
         "1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p";
 
-      azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "7.0.0" "zip"
-        "0ss5yc9k3dh78lb88nfh3z98yz1pcd8d7d7cfjlxmv4n3dlr1kij";
+      azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "9.0.0" "zip"
+        "12bsdbh37xiz42hvrp8ghszyqkiali3pk50x44f3aip12pgx6kix";
 
       azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "1.1.1" "zip"
         "16wk0ksycrscsn3n14qk4vvf7i567vq6f96lwf5dwbc81wx6n32x";
@@ -194,11 +197,11 @@ let
       azure-mgmt-relay = overrideAzureMgmtPackage super.azure-mgmt-relay "0.1.0" "zip"
         "1jss6qhvif8l5s0lblqw3qzijjf0h88agciiydaa7f4q577qgyfr";
 
-      azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "2.6.0" "zip"
-        "1nnp2ki4iz4f4897psmwb0v5khrwh84fgxja7nl7g73g3ym20sz8";
+      azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "3.0.0" "zip"
+        "05c6isg13dslds94kv28v6navxj4bp4c5lsd9df0g3ndsxvpdrxp";
 
-      azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "1.1.0" "zip"
-        "16a0d3j5dilbp7pd7gbwf8jr46vzbjim1p9alcmisi12m4km7885";
+      azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "2.1.0" "zip"
+        "1ikv8b2h1r91fa0srz95ymn54qpqgb5a4faxwp4hf92r5h85c8j9";
 
       azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "4.0.0" "zip"
         "0aphqh4mvrc1yiyis8zvks0d19d1m3lqylr9jc8fj73iw84rwgm5";
@@ -218,8 +221,8 @@ let
       azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.52.0" "zip"
         "0357laxgldb7lvvws81r8xb6mrq9dwwnr1bnwdnyj4bw6p21i9hn";
 
-      azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "7.1.0" "zip"
-        "03yjvw1dwkwsadsv60i625mr9zpdryy7ywvh7p8fg60djszh1p5l";
+      azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "7.2.0" "zip"
+        "01ck1ankgr9ikvfghhdcs777yrl2j2p8cw9q8nfdrjp22lpchabl";
 
       azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.4.0" "zip"
         "1x18grkjf2p2r1ihlwv607sna9yjvsr2jwnkjc55askrgrwx5jx2";

From 621c4239c3ec9a2414c25740f4bde481b0793923 Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Thu, 20 Feb 2020 14:23:39 +0100
Subject: [PATCH 1196/4636] pythonPackages.aiohttp: remove pytest-timeout check
 dependency

---
 pkgs/development/python-modules/aiohttp/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 737d1eec3c21..304a2a362e97 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
   };
 
   checkInputs = [
-    pytestrunner pytest gunicorn pytest-timeout async_generator pytest_xdist
+    pytestrunner pytest gunicorn async_generator pytest_xdist
     pytest-mock pytestcov trustme brotlipy freezegun
   ];
 

From a87baff257b8f9c4aa0ee8a934261cd370b6ee51 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <meurerbernardo@gmail.com>
Date: Thu, 20 Feb 2020 21:39:41 -0800
Subject: [PATCH 1197/4636] throttled: 0.6 -> 0.7

---
 pkgs/tools/system/throttled/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/system/throttled/default.nix b/pkgs/tools/system/throttled/default.nix
index 4f52b5e09455..02ff75113824 100644
--- a/pkgs/tools/system/throttled/default.nix
+++ b/pkgs/tools/system/throttled/default.nix
@@ -2,24 +2,24 @@
 
 stdenv.mkDerivation rec {
   pname = "throttled";
-  version = "0.6";
+  version = "0.7";
 
   src = fetchFromGitHub {
     owner = "erpalma";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1icb2288pj25vbdnd16zvisw9c01hp8vkk25ilkc74gy76xhpcs4";
+    sha256 = "1y1sczvj2qc8ml9i1rdzr8hklvci9bdphm3mmri2ncaqys8wdbh4";
   };
 
   nativeBuildInputs = [ python3Packages.wrapPython ];
 
-  pythonPath = with python3Packages; [ 
+  pythonPath = with python3Packages; [
     configparser
     dbus-python
     pygobject3
   ];
 
-  # The upstream unit both assumes the install location, and tries to run in a virtualenv 
+  # The upstream unit both assumes the install location, and tries to run in a virtualenv
   postPatch = ''sed -e 's|ExecStart=.*|ExecStart=${placeholder "out"}/bin/lenovo_fix.py|' -i systemd/lenovo_fix.service'';
 
   installPhase = ''

From cdd25d4b4b427f50e553934cbd2fea9b3261a406 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 21 Feb 2020 03:29:40 +0000
Subject: [PATCH 1198/4636] python27Packages.fuzzywuzzy: 0.17.0 -> 0.18.0

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

diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix
index 7091799decab..551f5f4c3dde 100644
--- a/pkgs/development/python-modules/fuzzywuzzy/default.nix
+++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "fuzzywuzzy";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6f49de47db00e1c71d40ad16da42284ac357936fa9b66bea1df63fed07122d62";
+    sha256 = "1s00zn75y2dkxgnbw8kl8dw4p1mc77cv78fwfa4yb0274s96w0a5";
   };
 
   propagatedBuildInputs = [ python-Levenshtein ];

From 204786644b6cd428e5aa1f20a20b772c4b417a78 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Feb 2020 20:27:38 +0000
Subject: [PATCH 1199/4636] python37Packages.aioresponses: 0.6.2 -> 0.6.3

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

diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix
index 446bb9e63791..01c37275fc31 100644
--- a/pkgs/development/python-modules/aioresponses/default.nix
+++ b/pkgs/development/python-modules/aioresponses/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "aioresponses";
-  version = "0.6.2";
+  version = "0.6.3";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0srqbxxxffi3idqd161n5b90xyqy9gibigxxmvqag3nxab5vw1j6";
+    sha256 = "06w15iyr07s861hkzqfdclzxkpvgg83sx8f235mz8k2490hnyqvv";
   };
 
   nativeBuildInputs = [

From a9ef3e3f48591ff6931946e4dec4382d52aed31d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 21 Feb 2020 05:50:13 +0000
Subject: [PATCH 1200/4636] python27Packages.pyroute2: 0.5.7 -> 0.5.9

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

diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix
index 3563edce792e..e13472dafb4f 100644
--- a/pkgs/development/python-modules/pyroute2/default.nix
+++ b/pkgs/development/python-modules/pyroute2/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pyroute2";
-  version = "0.5.7";
+  version = "0.5.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "963fce07da2841456d39e3b932b071f6de28d23dadfae014022d67a752916f98";
+    sha256 = "1dymaa3rif05k42sh4c3g2m057v2dsc2f3f49hl2rw5yz8bd23i4";
   };
 
   # requires root priviledges

From ca6391a7c4abb4497aed1eeb5c0afbe32a822dd4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 14 Feb 2020 07:18:32 +0100
Subject: [PATCH 1201/4636] =?UTF-8?q?ocaml-ng.ocamlPackages=5F4=5F10.ocaml?=
 =?UTF-8?q?:=204.10.0+rc1=20=E2=86=92=204.10.0+rc2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/compilers/ocaml/4.10.nix b/pkgs/development/compilers/ocaml/4.10.nix
index 046ea84a0d8a..234b2c446318 100644
--- a/pkgs/development/compilers/ocaml/4.10.nix
+++ b/pkgs/development/compilers/ocaml/4.10.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
   major_version = "4";
   minor_version = "10";
-  patch_version = "0+rc1";
-  sha256 = "1nzmn9wszixsyzz4bhpwqw8dx0m1iy83xmanp4g9f5dfywgcss2c";
+  patch_version = "0+rc2";
+  sha256 = "1iv8x9xr4k2s1x1p4rj4fqdh2iwzhgi56lyshvh6gg224i14rkbz";
 }

From ac4831238a55170ec57216e35186b2f98d41922e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 21 Feb 2020 05:24:06 +0000
Subject: [PATCH 1202/4636] python27Packages.pytest-flask: 0.15.0 -> 0.15.1

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

diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix
index b58b934dadc4..0ad858444403 100644
--- a/pkgs/development/python-modules/pytest-flask/default.nix
+++ b/pkgs/development/python-modules/pytest-flask/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pytest-flask";
-  version = "0.15.0";
+  version = "0.15.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0jdzrib94vwfpl8524h34aqzqndh3h4xn706v32xh412c8dphx6q";
+    sha256 = "1ri3p3hibb1r2wcblpvs64s4jz40ci4jki4s2nf3xf7iz2wwbn6b";
   };
 
   doCheck = false;

From 0bffd2150e5bbd9671bf98817a72e87ae41bc0ed Mon Sep 17 00:00:00 2001
From: elseym <elseym@me.com>
Date: Fri, 21 Feb 2020 01:38:35 +0100
Subject: [PATCH 1203/4636] plex: 1.18.6.2368 -> 1.18.7.2438

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

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index 2586171a7cf0..24422842e355 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -8,13 +8,13 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.18.6.2368-97add474d";
+  version = "1.18.7.2438-f342a5a43";
   pname = "plexmediaserver";
 
   # Fetch the source
   src = fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm";
-    sha256 = "0d2nnvw9qpmsra6g044bz192v67igcp1mfayy4sk0j2yqgiqvcgl";
+    sha256 = "07lill29ck5h6lnrxj4k709afh36d6giy4jzv1jwcvcq1hdrvmzh";
   };
 
   outputs = [ "out" "basedb" ];

From bbbb49c450bcfee3cb8541e6e99049aaf94c894d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Fri, 21 Feb 2020 09:00:45 +0100
Subject: [PATCH 1204/4636] p11-kit: 0.23.19 -> 0.23.20

Small bug fix release. Fixes a bunch of flatpak issues (eg. no playback
on spotify).

news: https://github.com/p11-glue/p11-kit/releases/tag/0.23.20
---
 pkgs/development/libraries/p11-kit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index d127f9713503..d3faa04633e5 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "p11-kit";
-  version = "0.23.19";
+  version = "0.23.20";
 
   src = fetchFromGitHub {
     owner = "p11-glue";
     repo = pname;
     rev = version;
-    sha256 = "0hsg06mqsd90a0nxj5484b40cbfq7vna4w0sv6y5ihbj5l2hz06b";
+    sha256 = "00xxhzgd7cpin9nzwrrzykvhjwqg5l45p0cq2gv68y3sxq2p9q6y";
   };
 
   outputs = [ "out" "dev"];

From de8bc79c425c0bca95cee95a8de9b94a0157b347 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Fri, 21 Feb 2020 10:01:41 +0100
Subject: [PATCH 1205/4636] .github/CODEOWNERS: remove myself from the Haskell
 code owners

---
 .github/CODEOWNERS | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 27f4da36f2d2..d84c6a595383 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -66,11 +66,11 @@
 /doc/languages-frameworks/python.section.md     @FRidh
 
 # Haskell
-/pkgs/development/compilers/ghc                       @basvandijk @cdepillabout
-/pkgs/development/haskell-modules                     @basvandijk @cdepillabout @infinisil
-/pkgs/development/haskell-modules/default.nix         @basvandijk @cdepillabout
-/pkgs/development/haskell-modules/generic-builder.nix @basvandijk @cdepillabout
-/pkgs/development/haskell-modules/hoogle.nix          @basvandijk @cdepillabout
+/pkgs/development/compilers/ghc                       @cdepillabout
+/pkgs/development/haskell-modules		      @cdepillabout @infinisil
+/pkgs/development/haskell-modules/default.nix	      @cdepillabout
+/pkgs/development/haskell-modules/generic-builder.nix @cdepillabout
+/pkgs/development/haskell-modules/hoogle.nix	      @cdepillabout
 
 # Perl
 /pkgs/development/interpreters/perl @volth

From 7d8a33125f5e65c764bc500bccf3faac5549a61c Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Fri, 21 Feb 2020 10:02:16 +0100
Subject: [PATCH 1206/4636] swift: Fix build for glibc 2.30

---
 pkgs/development/compilers/swift/default.nix  | 10 ++++++++
 .../swift-package-manager-glibc-2.30.patch    | 25 +++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/compilers/swift/patches/swift-package-manager-glibc-2.30.patch

diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
index 77bc3cc5b73e..25accf8c9493 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/pkgs/development/compilers/swift/default.nix
@@ -26,6 +26,7 @@
 , git
 , libgit2
 , fetchFromGitHub
+, fetchpatch
 , findutils
 , makeWrapper
 , gnumake
@@ -224,6 +225,15 @@ stdenv.mkDerivation {
     # uuid.h is not part of glibc, but of libuuid
     sed -i 's|''${GLIBC_INCLUDE_PATH}/uuid/uuid.h|${libuuid.dev}/include/uuid/uuid.h|' swift/stdlib/public/Platform/glibc.modulemap.gyb
 
+    # Compatibility with glibc 2.30
+    # Adapted from https://github.com/apple/swift-package-manager/pull/2408
+    patch -p1 -d swiftpm -i ${./patches/swift-package-manager-glibc-2.30.patch}
+    # https://github.com/apple/swift/pull/27288
+    patch -p1 -d swift -i ${fetchpatch {
+      url = "https://github.com/apple/swift/commit/f968f4282d53f487b29cf456415df46f9adf8748.patch";
+      sha256 = "1aa7l66wlgip63i4r0zvi9072392bnj03s4cn12p706hbpq0k37c";
+    }}
+
     PREFIX=''${out/#\/}
     substituteInPlace indexstore-db/Utilities/build-script-helper.py \
       --replace usr "$PREFIX"
diff --git a/pkgs/development/compilers/swift/patches/swift-package-manager-glibc-2.30.patch b/pkgs/development/compilers/swift/patches/swift-package-manager-glibc-2.30.patch
new file mode 100644
index 000000000000..14ef38497645
--- /dev/null
+++ b/pkgs/development/compilers/swift/patches/swift-package-manager-glibc-2.30.patch
@@ -0,0 +1,25 @@
+diff --git a/Sources/Basic/Process.swift b/Sources/Basic/Process.swift
+index f388c769..8f208691 100644
+--- a/Sources/Basic/Process.swift
++++ b/Sources/Basic/Process.swift
+@@ -322,7 +322,10 @@ public final class Process: ObjectIdentifierProtocol {
+         defer { posix_spawn_file_actions_destroy(&fileActions) }
+ 
+         // Workaround for https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=89e435f3559c53084498e9baad22172b64429362
+-        let devNull = strdup("/dev/null")
++        // Change allowing for newer version of glibc
++        guard let devNull = strdup("/dev/null") else {
++            throw SystemError.posix_spawn(0, arguments)
++        }
+         defer { free(devNull) }
+         // Open /dev/null as stdin.
+         posix_spawn_file_actions_addopen(&fileActions, 0, devNull, O_RDONLY, 0)
+@@ -348,7 +351,7 @@ public final class Process: ObjectIdentifierProtocol {
+ 
+         let argv = CStringArray(arguments)
+         let env = CStringArray(environment.map({ "\($0.0)=\($0.1)" }))
+-        let rv = posix_spawnp(&processID, argv.cArray[0], &fileActions, &attributes, argv.cArray, env.cArray)
++        let rv = posix_spawnp(&processID, argv.cArray[0]!, &fileActions, &attributes, argv.cArray, env.cArray)
+ 
+         guard rv == 0 else {
+             throw SystemError.posix_spawn(rv, arguments)

From bf88bf47d1976b396fb06c5e608bb68e879e6952 Mon Sep 17 00:00:00 2001
From: Renato Alves <alves.rjc@gmail.com>
Date: Mon, 17 Feb 2020 16:22:13 +0100
Subject: [PATCH 1207/4636] pysam: 0.15.3 -> 0.15.4

Also disable tests until upstream test data issues are resolved.
See link in comment in code for more information.
---
 .../python-modules/pysam/default.nix          | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix
index 46dd54c62e20..38b55c4563da 100644
--- a/pkgs/development/python-modules/pysam/default.nix
+++ b/pkgs/development/python-modules/pysam/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname   = "pysam";
-  version = "0.15.3";
+  version = "0.15.4";
 
   # Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is
   # missing some files which cause test failures.
@@ -23,26 +23,35 @@ buildPythonPackage rec {
     owner = "pysam-developers";
     repo = "pysam";
     rev = "v${version}";
-    sha256 = "0g6md20gsr24pdr9b8nj403w31ixfjv8bjhdvg3x476kjiq1kvyb";
+    sha256 = "04w6h6mv6lsr74hj9gy4r2laifcbhgl2bjcr4r1l9r73xdd45mdy";
   };
 
+  nativeBuildInputs = [ samtools ];
   buildInputs = [ bzip2 curl cython lzma zlib ];
 
-  checkInputs = [ pytest bcftools htslib samtools ];
-
+  checkInputs = [ pytest bcftools htslib ];
   checkPhase = "py.test";
 
-  preInstall = ''
+  # tests require samtools<=1.9
+  doCheck = false;
+  preCheck = ''
     export HOME=$(mktemp -d)
     make -C tests/pysam_data
     make -C tests/cbcf_data
   '';
 
-  meta = {
-    homepage = https://pysam.readthedocs.io/;
+  pythonImportsCheck = [
+    "pysam"
+    "pysam.bcftools"
+    "pysam.libcutils"
+    "pysam.libcvcf"
+  ];
+
+  meta = with lib; {
     description = "A python module for reading, manipulating and writing genome data sets";
-    maintainers = with lib.maintainers; [ unode ];
-    license = lib.licenses.mit;
+    homepage = "https://pysam.readthedocs.io/";
+    maintainers = with maintainers; [ unode ];
+    license = licenses.mit;
     platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }

From 18570590e4685f21174182d7dca4e84a423403c0 Mon Sep 17 00:00:00 2001
From: uosis <uosisl@gmail.com>
Date: Fri, 21 Feb 2020 02:14:45 -0700
Subject: [PATCH 1208/4636] ammonite: fix source reference to allow dynamic
 binding

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

diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index 69e81596574b..eba5a2b67149 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   phases = "installPhase";
 
   installPhase = ''
-    install -Dm755 ${src} $out/bin/amm
+    install -Dm755 $src $out/bin/amm
     sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm
   '' + optionalString (disableRemoteLogging) ''
     sed -i '0,/ammonite.Main/{s|ammonite.Main|ammonite.Main --no-remote-logging|}' $out/bin/amm

From 9b6faedb18f1bc7e0005bb83e3c11adc0b74efed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Fri, 21 Feb 2020 10:56:29 +0100
Subject: [PATCH 1209/4636] shogun: 6.0.0 -> 6.1.4

Also migrate to opencv3 to address #72739, the PR didn't build for me.
Disable testing and ccache since they were broken.

Co-authored-by: Robert Scott <code@humanleg.org.uk>
---
 .../machine-learning/shogun/default.nix       | 82 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  9 ++
 2 files changed, 66 insertions(+), 25 deletions(-)

diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix
index be15bba979ff..988ea8c855c0 100644
--- a/pkgs/applications/science/machine-learning/shogun/default.nix
+++ b/pkgs/applications/science/machine-learning/shogun/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, ccache, cmake, ctags, swig
+{ stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, ctags, swig
 # data, compression
 , bzip2, curl, hdf5, json_c, lzma, lzo, protobuf, snappy
 # maths
-, openblasCompat, eigen, nlopt, lp_solve, colpack
+, openblasCompat, eigen, nlopt, lp_solve, colpack, liblapack, glpk
 # libraries
 , libarchive, libxml2
 # extra support
@@ -13,47 +13,79 @@
 assert pythonSupport -> pythonPackages != null;
 assert opencvSupport -> opencv != null;
 
-stdenv.mkDerivation rec {
+let
   pname = "shogun";
-  version = "6.0.0";
-
-  src = fetchFromGitHub {
-    owner = pname + "-toolbox";
-    repo = pname;
-    rev = pname + "_" + version;
-    sha256 = "0f2zwzvn5apvwypkfkq371xp7c5bdb4g1fwqfh8c2d57ysjxhmgf";
-    fetchSubmodules = true;
+  version = "6.1.4";
+  rxcppVersion = "4.0.0";
+  gtestVersion = "1.8.0";
+  srcs = {
+    toolbox = fetchFromGitHub {
+      owner = pname + "-toolbox";
+      repo = pname;
+      rev = pname + "_" + version;
+      sha256 = "38aULxK50wQ2+/ERosSpRyBmssmYSGv5aaWfWSlrSRc=";
+      fetchSubmodules = true;
+    };
+    # we need the packed archive
+    rxcpp = fetchurl {
+      url = "https://github.com/Reactive-Extensions/RxCpp/archive/v${rxcppVersion}.tar.gz";
+      sha256 = "0y2isr8dy2n1yjr9c5570kpc9lvdlch6jv0jvw000amwn5d3krsh";
+    };
+    gtest = fetchurl {
+      url = "https://github.com/google/googletest/archive/release-${gtestVersion}.tar.gz";
+      sha256 = "1n5p1m2m3fjrjdj752lf92f9wq3pl5cbsfrb49jqbg52ghkz99jq";
+    };
   };
+in
+
+stdenv.mkDerivation rec {
+
+  inherit pname version;
+
+  src = srcs.toolbox;
+
+  postUnpack = ''
+    mkdir -p $sourceRoot/third_party/{rxcpp,gtest}
+    ln -s ${srcs.rxcpp} $sourceRoot/third_party/rxcpp/v${rxcppVersion}.tar.gz
+    ln -s ${srcs.gtest} $sourceRoot/third_party/gtest/release-${gtestVersion}.tar.gz
+  '';
+
+  # broken
+  doCheck = false;
 
   patches = [
-    (fetchpatch {
-      name = "Fix-meta-example-parser-bug-in-parallel-builds.patch";
-      url = "https://github.com/shogun-toolbox/shogun/commit/ecd6a8f11ac52748e89d27c7fab7f43c1de39f05.patch";
-      sha256 = "1hrwwrj78sxhwcvgaz7n4kvh5y9snfcc4jf5xpgji5hjymnl311n";
-    })
     (fetchpatch {
       url = "https://github.com/awild82/shogun/commit/365ce4c4c700736d2eec8ba6c975327a5ac2cd9b.patch";
       sha256 = "158hqv4xzw648pmjbwrhxjp7qcppqa7kvriif87gn3zdn711c49s";
     })
   ];
 
+  CCACHE_DISABLE="1";
   CCACHE_DIR=".ccache";
 
   buildInputs = with lib; [
-      openblasCompat bzip2 ccache cmake colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo
-      protobuf nlopt snappy swig (libarchive.dev) libxml2
+      openblasCompat bzip2 cmake colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo
+      protobuf nlopt snappy swig (libarchive.dev) libxml2 liblapack glpk
     ]
     ++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ])
     ++ optional  (opencvSupport) opencv;
 
-  cmakeFlags = with lib; []
-    ++ (optional (pythonSupport) "-DPythonModular=ON")
-    ++ (optional (opencvSupport) "-DOpenCV=ON")
-    ;
+  NIX_CFLAGS_COMPILE="-faligned-new";
 
-  # Previous attempts to fix parallel builds (see patch above) were not entirely successful.
-  # Sporadic build failures still exist. Dislable parallel builds for now.
-  enableParallelBuilding = false;
+  cmakeFlags =
+  let
+      onOff = b: if b then "ON" else "OFF";
+      flag = n: b: "-D"+n+"="+onOff b;
+  in
+  with lib; [
+    (flag "ENABLE_TESTING" doCheck)
+    (flag "BUILD_META_EXAMPLES" doCheck)
+    (flag "CMAKE_VERBOSE_MAKEFILE:BOOL" doCheck)
+    (flag "PythonModular" pythonSupport)
+    (flag "OpenCV" opencvSupport)
+  ];
+
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "A toolbox which offers a wide range of efficient and unified machine learning methods";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65a960a96302..4c8282ef729d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20608,6 +20608,15 @@ in
 
   shogun = callPackage ../applications/science/machine-learning/shogun {
     stdenv = gcc8Stdenv;
+
+    # Workaround for the glibc abi version mismatch.
+    # Please note that opencv builds are by default disabled.
+    opencv = opencv3.override {
+      stdenv = gcc8Stdenv;
+      openexr = openexr.override {
+        stdenv = gcc8Stdenv;
+      };
+    };
   };
 
   sky = callPackage ../applications/networking/instant-messengers/sky {};

From 031db7bf17e56c93b7563f7842561348f44a74a4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 21 Feb 2020 10:09:23 +0000
Subject: [PATCH 1210/4636] rtl_433: 19.08 -> 20.02

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

diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix
index 148ad35a1f05..5faac96d28f0 100644
--- a/pkgs/applications/radio/rtl_433/default.nix
+++ b/pkgs/applications/radio/rtl_433/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation {
 
-  version = "19.08";
+  version = "20.02";
   pname = "rtl_433";
 
   src = fetchFromGitHub {
     owner = "merbanan";
     repo = "rtl_433";
-    rev = "19.08";
-    sha256 = "0cm82gm5c86qfl4dw37h8wyk77947k6fv2n1pn3xvk3wz2ygsdi6";
+    rev = "20.02";
+    sha256 = "11991xky9gawkragdyg27qsf7kw5bhlg7ygvf3fn7ng00x4xbh1z";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From dc71384f67e2043617c47f14500ad8c9b1bec0f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lengyel=20Bal=C3=A1zs?= <ikervagyok@gmail.com>
Date: Mon, 10 Feb 2020 02:14:03 +0100
Subject: [PATCH 1211/4636] SLURM/NixOS: increase ulimit for IB/RDMA

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

diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index c70d999ca96d..050872e933fb 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -355,6 +355,7 @@ in
         ExecStart = "${wrappedSlurm}/bin/slurmd";
         PIDFile = "/run/slurmd.pid";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        LimitMEMLOCK = "infinity";
       };
 
       preStart = ''

From 7598200b9bc09f95cd032c6956c7b87d6d783629 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lengyel=20Bal=C3=A1zs?= <ikervagyok@gmail.com>
Date: Mon, 10 Feb 2020 12:24:11 +0100
Subject: [PATCH 1212/4636] SLURM: added rdma-core as a dependency

---
 pkgs/servers/computing/slurm/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix
index 637ac0607db1..18ef3bf3fa55 100644
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/pkgs/servers/computing/slurm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, libtool, curl
 , python, munge, perl, pam, openssl, zlib
 , ncurses, libmysqlclient, gtk2, lua, hwloc, numactl
-, readline, freeipmi, libssh2, xorg, lz4
+, readline, freeipmi, libssh2, xorg, lz4, rdma-core
 # enable internal X11 support via libssh2
 , enableX11 ? true
 }:
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig libtool ];
   buildInputs = [
     curl python munge perl pam openssl zlib
-      libmysqlclient ncurses gtk2 lz4
+      libmysqlclient ncurses gtk2 lz4 rdma-core
       lua hwloc numactl readline freeipmi
   ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ];
 
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
       "--with-munge=${munge}"
       "--with-ssl=${openssl.dev}"
       "--with-zlib=${zlib}"
+      "--with-ofed=${rdma-core}"
       "--sysconfdir=/etc/slurm"
     ] ++ (optional (gtk2 == null)  "--disable-gtktest")
       ++ (optional enableX11 "--with-libssh2=${libssh2.dev}")

From 104dad8cb962fe228ed139acda2283a1cd175259 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 20 Feb 2020 11:51:31 -0300
Subject: [PATCH 1213/4636] qogir-theme: 2019-10-25 -> 2020-02-20

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

diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix
index 44993c7e2eca..286b2922953e 100644
--- a/pkgs/data/themes/qogir/default.nix
+++ b/pkgs/data/themes/qogir/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qogir-theme";
-  version = "2019-10-25";
+  version = "2020-02-20";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    sha256 = "027c9pbfv5flqrjcvmbyjrfi37nzq33z19bai4zjjxjvryfqpmlm";
+    sha256 = "0f0fa13ql59j9zv24vnsai76i0qwawh3jxzj1p78yfvcfmg45jcn";
   };
 
   buildInputs = [ gdk-pixbuf librsvg ];

From 928c365a1b0ca95cdf2fd2305f944c0f65dbdb05 Mon Sep 17 00:00:00 2001
From: Dirk-Willem van Gulik <dirkx@webweaving.org>
Date: Sat, 15 Feb 2020 17:01:49 +0100
Subject: [PATCH 1214/4636] redwax-modules: 0.2.1 -> 0.2.2/0.2.3

---
 .../http/apache-modules/mod_ca/default.nix    |  8 +--
 .../http/apache-modules/mod_crl/default.nix   |  5 +-
 .../http/apache-modules/mod_csr/default.nix   | 22 +------
 .../mod_csr/openssl_setter_compat.h           | 66 -------------------
 .../http/apache-modules/mod_ocsp/default.nix  |  4 +-
 .../apache-modules/mod_pkcs12/default.nix     |  4 +-
 .../http/apache-modules/mod_scep/default.nix  | 21 +-----
 .../mod_scep/openssl_setter_compat.h          | 66 -------------------
 .../http/apache-modules/mod_spkac/default.nix |  4 +-
 .../apache-modules/mod_timestamp/default.nix  |  4 +-
 10 files changed, 20 insertions(+), 184 deletions(-)
 delete mode 100644 pkgs/servers/http/apache-modules/mod_csr/openssl_setter_compat.h
 delete mode 100644 pkgs/servers/http/apache-modules/mod_scep/openssl_setter_compat.h

diff --git a/pkgs/servers/http/apache-modules/mod_ca/default.nix b/pkgs/servers/http/apache-modules/mod_ca/default.nix
index 37f2a397ae6d..c4551108338b 100644
--- a/pkgs/servers/http/apache-modules/mod_ca/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_ca/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, apacheHttpd, openssl, openldap }:
+{ stdenv, fetchurl, pkgconfig, apacheHttpd, openssl, openldap, apr, aprutil }:
 
 stdenv.mkDerivation rec {
   pname = "mod_ca";
-  version = "0.2.1";
+  version = "0.2.2";
 
   src = fetchurl {
     url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
-    sha256 = "1pxapjrzdsk2s25vhgvf56fkakdqcbn9hjncwmqh0asl1pa25iic";
+    sha256 = "0gs66br3aig749rzifxn6j1rz2kps4hc4jppscly48lypgyygy8s";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ apacheHttpd openssl openldap ];
+  buildInputs = [ apacheHttpd openssl openldap apr aprutil ];
 
   # Note that configureFlags and installFlags are inherited by
   # the various submodules.
diff --git a/pkgs/servers/http/apache-modules/mod_crl/default.nix b/pkgs/servers/http/apache-modules/mod_crl/default.nix
index 54c0de1c7013..ee7dbe3245d4 100644
--- a/pkgs/servers/http/apache-modules/mod_crl/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_crl/default.nix
@@ -1,12 +1,13 @@
 { stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
 
+
 stdenv.mkDerivation rec {
   pname = "mod_crl";
-  version = "0.2.1";
+  version = "0.2.3";
 
   src = fetchurl {
     url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
-    sha256 = "0k6iqn5a4bqdz3yx6d53f1r75c21jnwhxmmcq071zq0361xjzzj6";
+    sha256 = "1x186kp6fr8nwg0jlv5phagxndvw4rjqfga9mkibmn6dx252p61d";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/http/apache-modules/mod_csr/default.nix b/pkgs/servers/http/apache-modules/mod_csr/default.nix
index 60f97d2f3615..6547d3aa2b5c 100644
--- a/pkgs/servers/http/apache-modules/mod_csr/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_csr/default.nix
@@ -1,35 +1,19 @@
 { stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
 
+
 stdenv.mkDerivation rec {
   pname = "mod_csr";
-  version = "0.2.1";
+  version = "0.2.3";
 
   src = fetchurl {
     url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
-    sha256 = "01sdvv07kchdd6ssrmd2cbhj50qh2ibp5g5h6jy1jqbzp0b3j9ja";
+    sha256 = "1p4jc0q40453wpvwqgnr1n007b4jxpkizzy3r4jygsxxgg4x9w7x";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ mod_ca apr aprutil ];
   inherit (mod_ca) configureFlags installFlags;
 
-  # After openssl-1.0.2t, starting in  openssl-1.1.0l
-  # parts of the OpenSSL struct API was replaced by
-  # getters - but some setters where forgotten.
-  #
-  # It is expected that these are back/retrofitted in version
-  # openssl-1.1.1d -- but while fixing this it was found
-  # that there were quite a few other setters missing and
-  # that some of the memory management needed was at odds
-  # with the principles used sofar.
-  #
-  # See https://github.com/openssl/openssl/pull/10563
-  #
-  # So as a stopgap - use a minimalist compat. layer
-  # https://source.redwax.eu/projects/RS/repos/mod_csr/browse/openssl_setter_compat.h
-  #
-  preBuild = "cp ${./openssl_setter_compat.h} openssl_setter_compat.h";
-
   meta = with stdenv.lib; {
     description = "RedWax CA service module to handle Certificate Signing Requests";
 
diff --git a/pkgs/servers/http/apache-modules/mod_csr/openssl_setter_compat.h b/pkgs/servers/http/apache-modules/mod_csr/openssl_setter_compat.h
deleted file mode 100644
index a2a9e0f7a18d..000000000000
--- a/pkgs/servers/http/apache-modules/mod_csr/openssl_setter_compat.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Licensed to Stichting The Commons Conservancy (TCC) under one or more
- * contributor license agreements.  See the AUTHORS file distributed with
- * this work for additional information regarding copyright ownership.
- * TCC licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// These routines are copies from OpenSSL/1.1.1 its x509/x509_req.c
-// and the private header files for that. They are needed as
-// starting with OpenSSL 1.1.0 the X509_req structure became
-// private; and got some get0 functions to access its internals.
-// But no getter's until post 1.1.1 (PR#10563). So this is a
-// stopgap for these lacking releases.
-//
-// Testest against: 
-//   openssl-1.0.2t 0x01000214fL (does not need it, privates still accessile)
-//   openssl-1.1.0l 0x0101000cfL (needs it)
-//   openssl-1.1.1d 0x01010104fL (last version that needs it)
-//   openssl-1.1.1-dev		 (should not need it - post PR#10563).
-//
-/* #if OPENSSL_VERSION_NUMBER >= 0x010100000L &&  OPENSSL_VERSION_NUMBER  <= 0x01010104fL */
-#if OPENSSL_VERSION_NUMBER >= 0x010100000L 
-#include "openssl/x509.h"
-
-#define HAS_OPENSSL_PR10563_WORK_AROUND
-
-struct X509_req_info_st {
-    ASN1_ENCODING enc;          
-    ASN1_INTEGER *version;     
-    X509_NAME *subject;       
-    X509_PUBKEY *pubkey;     
-    STACK_OF(X509_ATTRIBUTE) *attributes;
-};
-
-typedef _Atomic int CRYPTO_REF_COUNT;
-
-struct X509_req_st {
-    X509_REQ_INFO req_info; 
-    X509_ALGOR sig_alg;       
-    ASN1_BIT_STRING *signature; /* signature */
-    CRYPTO_REF_COUNT references;
-    CRYPTO_RWLOCK *lock;
-# ifndef OPENSSL_NO_SM2
-    ASN1_OCTET_STRING *sm2_id;
-# endif
-};
-
-
-static void _X509_REQ_set1_signature(X509_REQ *req, X509_ALGOR *palg)
-{
-    if (req->sig_alg.algorithm)
-        ASN1_OBJECT_free(req->sig_alg.algorithm);
-    if (req->sig_alg.parameter)
-        ASN1_TYPE_free(req->sig_alg.parameter);
-    req->sig_alg = *palg;
-}
-#endif
diff --git a/pkgs/servers/http/apache-modules/mod_ocsp/default.nix b/pkgs/servers/http/apache-modules/mod_ocsp/default.nix
index 6730ca16f104..6ec3f246fad5 100644
--- a/pkgs/servers/http/apache-modules/mod_ocsp/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_ocsp/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mod_ocsp";
-  version = "0.2.1";
+  version = "0.2.2";
 
   src = fetchurl {
     url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
-    sha256 = "1vwgai56krdf8knb0mgy07ni9mqxk82bcb4gibwpnxvl6qwgv2i0";
+    sha256 = "0wy5363m4gq1w08iny2b3sh925bnznlln88pr9lgj9vgbn8pqnrn";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix b/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix
index 2bcf3b1d9c2f..1cf68f2a2768 100644
--- a/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mod_pkcs12";
-  version = "0.2.1";
+  version = "0.2.2";
 
   src = fetchurl {
     url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
-    sha256 = "0by4qfjs3a8q0amzwazfq8ii6ydv36v2mjga0jzc9i6xyl4rs6ai";
+    sha256 = "1jfyax3qrw9rpf2n0pn6iw4dpn2nl4j0i2a998n5p1mdmjx9ch73";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/http/apache-modules/mod_scep/default.nix b/pkgs/servers/http/apache-modules/mod_scep/default.nix
index 98703659c359..1331c6da3e41 100644
--- a/pkgs/servers/http/apache-modules/mod_scep/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_scep/default.nix
@@ -2,34 +2,17 @@
 
 stdenv.mkDerivation rec {
   pname = "mod_scep";
-  version = "0.2.1";
+  version = "0.2.3";
 
   src = fetchurl {
     url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
-    sha256 = "14l8v6y6kx5dg8avb5ny95qdcgrw40ss80nqrgmw615mk7zcj81f";
+    sha256 = "1imddqyi81l90valvndx9r0ywn32ggijrdfrjmbx8j1abaccagrc";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ mod_ca apr aprutil ];
   inherit (mod_ca) configureFlags installFlags;
 
-  # After openssl-1.0.2t, starting in  openssl-1.1.0l
-  # parts of the OpenSSL struct API was replaced by
-  # getters - but some setters where forgotten.
-  #
-  # It is expected that these are back/retrofitted in version
-  # openssl-1.1.1d -- but while fixing this it was found
-  # that there were quite a few other setters missing and
-  # that some of the memory management needed was at odds
-  # with the principles used sofar.
-  #
-  # See https://github.com/openssl/openssl/pull/10563
-  #
-  # So as a stopgap - use a minimalist compat. layer
-  # https://source.redwax.eu/projects/RS/repos/mod_csr/browse/openssl_setter_compat.h
-  #
-  preBuild = "cp ${./openssl_setter_compat.h} openssl_setter_compat.h";
-
   meta = with stdenv.lib; {
     description = "RedWax CA service modules for SCEP (Automatic ceritifcate issue/renewal)";
 
diff --git a/pkgs/servers/http/apache-modules/mod_scep/openssl_setter_compat.h b/pkgs/servers/http/apache-modules/mod_scep/openssl_setter_compat.h
deleted file mode 100644
index a2a9e0f7a18d..000000000000
--- a/pkgs/servers/http/apache-modules/mod_scep/openssl_setter_compat.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Licensed to Stichting The Commons Conservancy (TCC) under one or more
- * contributor license agreements.  See the AUTHORS file distributed with
- * this work for additional information regarding copyright ownership.
- * TCC licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// These routines are copies from OpenSSL/1.1.1 its x509/x509_req.c
-// and the private header files for that. They are needed as
-// starting with OpenSSL 1.1.0 the X509_req structure became
-// private; and got some get0 functions to access its internals.
-// But no getter's until post 1.1.1 (PR#10563). So this is a
-// stopgap for these lacking releases.
-//
-// Testest against: 
-//   openssl-1.0.2t 0x01000214fL (does not need it, privates still accessile)
-//   openssl-1.1.0l 0x0101000cfL (needs it)
-//   openssl-1.1.1d 0x01010104fL (last version that needs it)
-//   openssl-1.1.1-dev		 (should not need it - post PR#10563).
-//
-/* #if OPENSSL_VERSION_NUMBER >= 0x010100000L &&  OPENSSL_VERSION_NUMBER  <= 0x01010104fL */
-#if OPENSSL_VERSION_NUMBER >= 0x010100000L 
-#include "openssl/x509.h"
-
-#define HAS_OPENSSL_PR10563_WORK_AROUND
-
-struct X509_req_info_st {
-    ASN1_ENCODING enc;          
-    ASN1_INTEGER *version;     
-    X509_NAME *subject;       
-    X509_PUBKEY *pubkey;     
-    STACK_OF(X509_ATTRIBUTE) *attributes;
-};
-
-typedef _Atomic int CRYPTO_REF_COUNT;
-
-struct X509_req_st {
-    X509_REQ_INFO req_info; 
-    X509_ALGOR sig_alg;       
-    ASN1_BIT_STRING *signature; /* signature */
-    CRYPTO_REF_COUNT references;
-    CRYPTO_RWLOCK *lock;
-# ifndef OPENSSL_NO_SM2
-    ASN1_OCTET_STRING *sm2_id;
-# endif
-};
-
-
-static void _X509_REQ_set1_signature(X509_REQ *req, X509_ALGOR *palg)
-{
-    if (req->sig_alg.algorithm)
-        ASN1_OBJECT_free(req->sig_alg.algorithm);
-    if (req->sig_alg.parameter)
-        ASN1_TYPE_free(req->sig_alg.parameter);
-    req->sig_alg = *palg;
-}
-#endif
diff --git a/pkgs/servers/http/apache-modules/mod_spkac/default.nix b/pkgs/servers/http/apache-modules/mod_spkac/default.nix
index 72e0d521e3ba..00f054f755ea 100644
--- a/pkgs/servers/http/apache-modules/mod_spkac/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_spkac/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mod_spkac";
-  version = "0.2.1";
+  version = "0.2.2";
 
   src = fetchurl {
     url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
-    sha256 = "0x6ia9qcr7lx2awpv9cr4ndic5f4g8yqzmp2hz66zpzkmk2b2pyz";
+    sha256 = "0hpr58yazbi21m0sjn22a8ns4h81s4jlab9szcdw7j9w9jdc7j0h";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix b/pkgs/servers/http/apache-modules/mod_timestamp/default.nix
index 139da2890786..9cd2a822b098 100644
--- a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_timestamp/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mod_timestamp";
-  version = "0.2.1";
+  version = "0.2.2";
 
   src = fetchurl {
     url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz";
-    sha256 = "0j4b04dbdwn9aff3da9m0lnqi0qbw6c6hhi81skl15kyc3vzp67f";
+    sha256 = "1p18mgxx2ainfrc2wm27rl3lh6yl0ihx6snib60jnp694587bfwg";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 01a9f0edbe33380da3e58e79b484e73e73d47f08 Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Tue, 18 Feb 2020 14:30:24 +0100
Subject: [PATCH 1215/4636] ssb-patchwork: 3.17.2 -> 3.17.4

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

diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/pkgs/applications/networking/ssb/patchwork/default.nix
index cf1159b83f8e..a332ac665c01 100644
--- a/pkgs/applications/networking/ssb/patchwork/default.nix
+++ b/pkgs/applications/networking/ssb/patchwork/default.nix
@@ -2,12 +2,12 @@
 
 let
   pname = "ssb-patchwork";
-  version = "3.17.2";
+  version = "3.17.4";
   name = "Patchwork-${version}";
 
   src = fetchurl {
     url = "https://github.com/ssbc/patchwork/releases/download/v${version}/${name}.AppImage";
-    sha256 = "1pmy01jwdr461vsl4fsxi3jaqnjx9yl5dw4987y5g73qx21qc5d5";
+    sha256 = "0mjyrd0d9wfsfd9ajg1xf7ijg4k8jp76swjsiydxpgfk1sdljswv";
   };
 
   binary = appimageTools.wrapType2 {
@@ -45,9 +45,9 @@ in
     longDescription = ''
       sea-slang for gossip - a scuttlebutt is basically a watercooler on a ship.
     '';
-    homepage = https://www.scuttlebutt.nz/;
+    homepage = "https://www.scuttlebutt.nz/";
     license = licenses.agpl3;
-    maintainers = with maintainers; [ thedavidmeister ninjatrappeur flokli ];
+    maintainers = with maintainers; [ asymmetric ninjatrappeur thedavidmeister ];
     platforms = [ "x86_64-linux" ];
   };
 }

From 0328d77cb8134d7dc79c0e4c4fd967f6647ac1bc Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 21 Feb 2020 03:57:13 +0100
Subject: [PATCH 1216/4636] =?UTF-8?q?mypaint-brushes1:=201.3.0=20=E2=86=92?=
 =?UTF-8?q?=201.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/mypaint/mypaint-brushes/releases/tag/v1.3.1
---
 pkgs/development/libraries/mypaint-brushes/1.0.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/mypaint-brushes/1.0.nix b/pkgs/development/libraries/mypaint-brushes/1.0.nix
index 115d818d9365..c66329fa633a 100644
--- a/pkgs/development/libraries/mypaint-brushes/1.0.nix
+++ b/pkgs/development/libraries/mypaint-brushes/1.0.nix
@@ -1,5 +1,4 @@
 { stdenv
-, fetchpatch
 , autoconf
 , automake
 , fetchFromGitHub
@@ -8,23 +7,15 @@
 
 stdenv.mkDerivation rec {
   pname = "mypaint-brushes";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "mypaint";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1iz89z6v2mp8j1lrf942k561s8311i3s34ap36wh4rybb2lq15m0";
+    sha256 = "1c95l1vfz7sbrdlzrbz7h1p6s1k113kyjfd9wfnxlm0p6562cz3j";
   };
 
-  patches = [
-    # build with automake 1.16
-    (fetchpatch {
-      url = https://github.com/Jehan/mypaint-brushes/commit/1e9109dde3bffd416ed351c3f30ecd6ffd0ca2cd.patch;
-      sha256 = "0mi8rwbirl0ib22f2hz7kdlgi4hw8s3ab29b003dsshdyzn5iha9";
-    })
-  ];
-
   nativeBuildInputs = [
     autoconf
     automake

From abacc68138675956c01eccfb120de5ce525bd86c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 21 Feb 2020 12:01:06 +0100
Subject: [PATCH 1217/4636] =?UTF-8?q?gegl=5F0=5F4:=200.4.20=20=E2=86=92=20?=
 =?UTF-8?q?0.4.22?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gegl/blob/GEGL_0_4_22/docs/NEWS.txt#L1-9
---
 pkgs/development/libraries/gegl/4.0.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix
index 639ad8d0e51a..803cf853be14 100644
--- a/pkgs/development/libraries/gegl/4.0.nix
+++ b/pkgs/development/libraries/gegl/4.0.nix
@@ -18,6 +18,7 @@
 , netsurf
 , pango
 , poly2tri-c
+, poppler
 , bzip2
 , json-glib
 , gettext
@@ -34,14 +35,14 @@
 
 stdenv.mkDerivation rec {
   pname = "gegl";
-  version = "0.4.20";
+  version = "0.4.22";
 
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev";
 
   src = fetchurl {
     url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1zrxnxlhn0jmshg4n2m2xlgi886w059ynkiiihm7rpi05fs8pg93";
+    sha256 = "0q9cckf90fb82qc5d496fjz459f1xw4j4p3rff1f57yivx0yr20q";
   };
 
   patches = [
@@ -71,6 +72,7 @@ stdenv.mkDerivation rec {
     netsurf.libnsgif
     pango
     poly2tri-c
+    poppler
     bzip2
     libraw
     libwebp

From 75132e6eb54b826b4ecab37f2ecd0159c77e40d9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 21 Feb 2020 12:02:55 +0100
Subject: [PATCH 1218/4636] =?UTF-8?q?gimp:=202.10.14=20=E2=86=92=202.10.16?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gimp/blob/GIMP_2_10_16/NEWS#L11-211
---
 pkgs/applications/graphics/gimp/default.nix      |  5 +++--
 .../graphics/gimp/remove-cc-reference.patch      | 16 +++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index d3950c06c339..e9223b1453e2 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -50,13 +50,13 @@ let
   inherit (python2Packages) pygtk wrapPython python;
 in stdenv.mkDerivation rec {
   pname = "gimp";
-  version = "2.10.14";
+  version = "2.10.16";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "0m6wdnfvsxyhimdd4v3351g4r1fklllnbipbwcfym3h7q88hz6yz";
+    sha256 = "1sybf1yilw272lr8qbyx3zbvysf5rc89gk80gd4aj4xr6jazxyfb";
   };
 
   nativeBuildInputs = [
@@ -155,6 +155,7 @@ in stdenv.mkDerivation rec {
 
   configureFlags = [
     "--without-webkit" # old version is required
+    "--disable-check-update"
     "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new"
     "--with-icc-directory=/run/current-system/sw/share/color/icc"
     # fix libdir in pc files (${exec_prefix} needs to be passed verbatim)
diff --git a/pkgs/applications/graphics/gimp/remove-cc-reference.patch b/pkgs/applications/graphics/gimp/remove-cc-reference.patch
index 0d6a87000ccd..e37351cfd463 100644
--- a/pkgs/applications/graphics/gimp/remove-cc-reference.patch
+++ b/pkgs/applications/graphics/gimp/remove-cc-reference.patch
@@ -1,13 +1,15 @@
 diff --git a/app/gimp-version.c b/app/gimp-version.c
-index 12605c6..a9083da 100644
+index 0f7bfb9bf9..1679624b8e 100644
 --- a/app/gimp-version.c
 +++ b/app/gimp-version.c
-@@ -203,7 +203,7 @@ gimp_version (gboolean be_verbose,
-       lib_versions = gimp_library_versions (localized);
-       verbose_info = g_strdup_printf ("git-describe: %s\n"
-                                       "C compiler:\n%s\n%s",
--                                      GIMP_GIT_VERSION, CC_VERSION,
-+                                      GIMP_GIT_VERSION, "@cc_version@",
+@@ -228,9 +228,9 @@
+                                       "# Libraries #\n%s",
+                                       GIMP_GIT_VERSION,
+                                       GIMP_BUILD_ID,
+                                       gimp_version_get_revision (),
+                                       GIMP_BUILD_PLATFORM,
+-                                      CC_VERSION,
++                                      "@cc_version@",
                                        lib_versions);
        g_free (lib_versions);
  

From c4bdd776db2615a840deb5008cbb25a1e3abe15c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 21 Feb 2020 11:39:45 +0000
Subject: [PATCH 1219/4636] seafile-shared: 7.0.5 -> 7.0.6

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

diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix
index 6236b3a71ba8..3277abbb77b9 100644
--- a/pkgs/misc/seafile-shared/default.nix
+++ b/pkgs/misc/seafile-shared/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "seafile-shared";
-  version = "7.0.5";
+  version = "7.0.6";
 
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "seafile";
     rev = "v${version}";
-    sha256 = "162dnm3sf7bkrnyqd8bcb6il6f2cam9gnaxj6d5dn48k77fw9ryc";
+    sha256 = "0pc6xbwxljpj7h37za63kspdi90ap58x6x5b7hsmlhahblvlw0b8";
   };
 
   nativeBuildInputs = [

From 41944946de3a9ddb9dbe7c091bf6bc1d92f9c34b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Fri, 21 Feb 2020 11:32:20 +0100
Subject: [PATCH 1220/4636] weechatScripts.weechat-matrix: enable on darwin

---
 .../networking/irc/weechat/scripts/weechat-matrix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
index 845dd9287663..038611ca2898 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
@@ -64,7 +64,7 @@ in buildPythonPackage {
       --replace '/usr/bin/env -S python3' '${scriptPython}/bin/python'
     substituteInPlace $out/bin/matrix_decrypt \
       --replace '/usr/bin/env python3' '${scriptPython}/bin/python'
-   
+
     mkdir -p $out/${python.sitePackages}
     cp -r $src/matrix $out/${python.sitePackages}/matrix
   '';
@@ -75,7 +75,7 @@ in buildPythonPackage {
     description = "A Python plugin for Weechat that lets Weechat communicate over the Matrix protocol";
     homepage = "https://github.com/poljar/weechat-matrix";
     license = licenses.isc;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ tilpner emily ];
   };
 }

From 852d2bcfd402d0076bbe7f6d1ed62ed6763c2a23 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Fri, 21 Feb 2020 11:11:50 +0100
Subject: [PATCH 1221/4636] libfido2: linux build only

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

diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix
index a0f44a332205..9736f0b15332 100644
--- a/pkgs/development/libraries/libfido2/default.nix
+++ b/pkgs/development/libraries/libfido2/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/Yubico/libfido2;
     license = licenses.bsd2;
     maintainers = with maintainers; [ dtzWill ];
-
+    platforms = platforms.linux;
   };
 }

From 1e2c51f5c792b925c2f50886d7bcb3d6a439cfa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 21 Feb 2020 09:02:19 -0300
Subject: [PATCH 1222/4636] qogir-icon-theme: 2020-01-29 -> 2020-02-21

---
 pkgs/data/icons/qogir-icon-theme/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix
index 8bfde381633c..641b3da883e8 100644
--- a/pkgs/data/icons/qogir-icon-theme/default.nix
+++ b/pkgs/data/icons/qogir-icon-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qogir-icon-theme";
-  version = "2020-01-29";
+  version = "2020-02-21";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    sha256 = "0g6qiry4gzkr48xn4qi8sdna0hi3982sywskz9adkzqcznir542h";
+    sha256 = "0m7f26dzzz5gkxi9dbbc96pl0xcvayr1ibxbjkrlsjcdvfg7p3rr";
   };
 
   nativeBuildInputs = [ gtk3 ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "A colorful design icon theme for linux desktops";
+    description = "Flat colorful design icon theme";
     homepage = "https://github.com/vinceliuice/Qogir-icon-theme";
     license = with licenses; [ gpl3 ];
     platforms = platforms.linux;

From 65593304e0b2d9faa3416cdabe3af7eb241b3315 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 21 Feb 2020 07:35:00 -0500
Subject: [PATCH 1223/4636] go-tools: 2019.2.2 -> 2020.1.3

---
 pkgs/development/tools/go-tools/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix
index 4c80c2aff182..1fd17060bd4f 100644
--- a/pkgs/development/tools/go-tools/default.nix
+++ b/pkgs/development/tools/go-tools/default.nix
@@ -5,22 +5,21 @@
 
 buildGoModule rec {
   pname = "go-tools";
-  version = "2019.2.2";
+  version = "2020.1.3";
 
-  goPackagePath = "honnef.co/go/tools";
   excludedPackages = ''\(simple\|ssa\|ssa/ssautil\|lint\|staticcheck\|stylecheck\|unused\)/testdata'';
 
   src = fetchFromGitHub {
     owner = "dominikh";
     repo = "go-tools";
     rev = version;
-    sha256 = "1vndpwg797z2gw9h9378iq99aqy7nalqx82lgvcsaqnkypdmppnd";
+    sha256 = "0pvi1mzhy6zgx4zfgdypbl4zhvgg11hl5qv7blf2qs0a96j2djhf";
   };
 
-  modSha256 = "0ysaq94m7pkziliz4z4dl8ad84mbn17m2hqxvs9wbw4iwhkpi7gz";
+  modSha256 = "03560xjr2531xj87paskfx2zs364fz6y4kpsid8x08s1syq9nq7p";
 
   meta = with lib; {
-    description = "A collection of tools and libraries for working with Go code, including linters and static analysis.";
+    description = "A collection of tools and libraries for working with Go code, including linters and static analysis";
     homepage = https://staticcheck.io;
     license = licenses.mit;
     maintainers = with maintainers; [ rvolosatovs kalbasit ];

From c4865b8933b53ea7eb48637aff33f43a09e0eab8 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Fri, 21 Feb 2020 12:53:08 +0100
Subject: [PATCH 1224/4636] pythonPackages.pytest-timeout: disable flaky test

---
 pkgs/development/python-modules/pytest-timeout/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix
index 3997e716817f..3849fffd47c0 100644
--- a/pkgs/development/python-modules/pytest-timeout/default.nix
+++ b/pkgs/development/python-modules/pytest-timeout/default.nix
@@ -21,7 +21,10 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ pytest pexpect ];
-  checkPhase = ''pytest -ra'';
+  checkPhase = ''
+    # test_suppresses_timeout_when_pdb_is_entered fails under heavy load
+    pytest -ra -k 'not test_suppresses_timeout_when_pdb_is_entered'
+  '';
 
   meta = with lib;{
     description = "py.test plugin to abort hanging tests";

From 119ed06061c6789177ac7b0c225d64a02d86749a Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@jnanam.net>
Date: Fri, 21 Feb 2020 05:44:57 -0700
Subject: [PATCH 1225/4636] mullvad-vpn: 2020.2 -> 2020.3

- Security update:
Fix stack overflow caused by WireGuard key rotation timers. When the daemon
crashed it was restarted automatically. But it did not connect (depending
on settings), leaving a leak.
---
 pkgs/applications/networking/mullvad-vpn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix
index d673c75764a3..add6bb48a774 100644
--- a/pkgs/applications/networking/mullvad-vpn/default.nix
+++ b/pkgs/applications/networking/mullvad-vpn/default.nix
@@ -40,11 +40,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "mullvad-vpn";
-  version = "2020.2";
+  version = "2020.3";
 
   src = fetchurl {
     url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb";
-    sha256 = "4f5970714684a86fba44b742d77f9bbe1147a111330e487d160d9844f34ae3d5";
+    sha256 = "fac3896db78cc2ddac81abec8bc0aa324e66b453126ed35a501e422ce64b1362";
   };
 
   nativeBuildInputs = [

From 1ea0a243d2b5558dc4dc441d6775d12671d32b00 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Fri, 21 Feb 2020 13:53:27 +0100
Subject: [PATCH 1226/4636] libfido2: evaluate systemd only on Linux

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

diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix
index 9736f0b15332..32d19283974c 100644
--- a/pkgs/development/libraries/libfido2/default.nix
+++ b/pkgs/development/libraries/libfido2/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = [ libcbor libressl udev ];
+  buildInputs = [ libcbor libressl ] ++ stdenv.lib.optionals stdenv.isLinux [ udev ];
 
   cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" ];
 

From 14dd10497daaec86cca9e298ef981465d991b0f2 Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Fri, 21 Feb 2020 14:02:18 +0100
Subject: [PATCH 1227/4636] fixup! ssb-patchwork: 3.17.2 -> 3.17.4

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

diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/pkgs/applications/networking/ssb/patchwork/default.nix
index a332ac665c01..3d3f60c7f62f 100644
--- a/pkgs/applications/networking/ssb/patchwork/default.nix
+++ b/pkgs/applications/networking/ssb/patchwork/default.nix
@@ -23,7 +23,7 @@ let
     name = "ssb-patchwork";
     exec = "${binary}/bin/ssb-patchwork";
     icon = "ssb-patchwork.png";
-    comment = "Decentralized messaging and sharing app";
+    comment = "Client for the decentralized social network Secure Scuttlebutt";
     desktopName = "Patchwork";
     genericName = "Patchwork";
     categories = "Network;";

From fb089e2b742c9074ca70327ad7dd3c7f0d4fac8a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 21 Feb 2020 13:13:57 +0000
Subject: [PATCH 1228/4636] sunvox: 1.9.5 -> 1.9.5c

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

diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix
index 738b876026a8..a7d61598f3e2 100644
--- a/pkgs/applications/audio/sunvox/default.nix
+++ b/pkgs/applications/audio/sunvox/default.nix
@@ -13,11 +13,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "SunVox";
-  version = "1.9.5";
+  version = "1.9.5c";
 
   src = fetchurl {
     url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip";
-    sha256 = "011cyagbqqkvnrxxq196zsvcyn3gksjfsaas02xl8ncjwfj084di";
+    sha256 = "19ilif221nw8lvw0fgpjqzawibyvxk16aaylizwygf7c4j40wayi";
   };
 
   buildInputs = [ unzip ];

From 0141cfefbc49b475cdff57b1e8d9390f24acd309 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 21 Feb 2020 14:26:33 +0100
Subject: [PATCH 1229/4636] maven: make jdk overridable

This makes it possible to use maven with different (newer) jdks.

Fixes #75630
---
 pkgs/development/tools/build-managers/apache-maven/builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/apache-maven/builder.sh b/pkgs/development/tools/build-managers/apache-maven/builder.sh
index 8d06352b1356..2760bb95fcf5 100644
--- a/pkgs/development/tools/build-managers/apache-maven/builder.sh
+++ b/pkgs/development/tools/build-managers/apache-maven/builder.sh
@@ -5,7 +5,7 @@ unpackPhase
 mkdir -p $out/maven
 cp -r $name/* $out/maven
 
-makeWrapper $out/maven/bin/mvn $out/bin/mvn --set JAVA_HOME "$jdk"
+makeWrapper $out/maven/bin/mvn $out/bin/mvn --set-default JAVA_HOME "$jdk"
 
 # Add the maven-axis and JIRA plugin by default when using maven 1.x
 if [ -e $out/maven/bin/maven ]

From 3e95c7884698e52eff398cafbcbdc92c4fd0f6df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 21 Feb 2020 10:34:05 -0300
Subject: [PATCH 1230/4636] nordic: 1.6.5 -> 1.8.1

---
 pkgs/data/themes/nordic/default.nix | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix
index 5172b2992ccc..4979738231d7 100644
--- a/pkgs/data/themes/nordic/default.nix
+++ b/pkgs/data/themes/nordic/default.nix
@@ -2,24 +2,32 @@
 
 stdenv.mkDerivation rec {
   pname = "nordic";
-  version = "1.6.5";
+  version = "1.8.1";
 
   srcs = [
     (fetchurl {
-      url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic.tar.xz";
-      sha256 = "163g1kh92fhgbwi91053xs39bpdd032w2v67c3jf8lf4cgvkwggp";
+      url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic.tar.xz";
+      sha256 = "0jvc6l093gj9azkrjswdc1kqlyc6drnhsxgpzylzcgjxvxyi9vmd";
     })
     (fetchurl {
-      url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-blue.tar.xz";
-      sha256 = "05qq1v8sil8s51aa78q2najcqdnkpgdzc8dckrx47wy36cfxbxwz";
+      url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic-standard-buttons.tar.xz";
+      sha256 = "049hcvccjds465v78sk3cjg7zck36l1zpyrf4p8xinj2h3b74zr8";
     })
     (fetchurl {
-      url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-standard-buttons.tar.xz";
-      sha256 = "17r450xxd8v8125a4bwd0yj3f3vnwcad2f19a0vgmk63s9grvkg0";
+      url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic-darker.tar.xz";
+      sha256 = "1qaj4x451ic8mx4aak1axw29jm6ymwgh5w3n3mw5kjm1fwg4b5dz";
     })
     (fetchurl {
-      url = "https://github.com/EliverLara/Nordic/releases/download/v${version}/Nordic-blue-standard-buttons.tar.xz";
-      sha256 = "0894naw0wkl2h9l27qz9h1k02dfgfqyb02icmgadg0cb44j3zlpb";
+      url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic-darker-standard-buttons.tar.xz";
+      sha256 = "19wczzppimp7sql9v0sq1sc5j0ix51270c58j22mg01kd2h2iivy";
+    })
+    (fetchurl {
+      url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic-bluish-accent.tar.xz";
+      sha256 = "1jvjjxiz8q9583f3gidky65s2g5pd5bkvbx0jvwn0p0kz8vlzmzk";
+    })
+    (fetchurl {
+      url = "https://github.com/EliverLara/Nordic/releases/download/V${version}/Nordic-bluish-accent-standard-buttons.tar.xz";
+      sha256 = "0wqn0aszddq8nbh6c667rwhy7c1zky23a9q3d8gci421n20l6lyd";
     })
   ];
 
@@ -35,7 +43,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Dark Gtk theme created using the awesome Nord color pallete";
-    homepage = https://github.com/EliverLara/Nordic;
+    homepage = "https://github.com/EliverLara/Nordic";
     license = licenses.gpl3;
     platforms = platforms.all;
     maintainers = [ maintainers.romildo ];

From 99931d3bba6824d6f22b43a6a6da350825739fd9 Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <emmanuelrosa@protonmail.com>
Date: Thu, 20 Feb 2020 18:00:20 +0700
Subject: [PATCH 1231/4636] electrum: remove qdarkstyle<2.7 restriction

---
 pkgs/applications/misc/electrum/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index df95b26b9c5b..924d4dc9e0b5 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -90,6 +90,7 @@ python3Packages.buildPythonApplication {
   '' + (if enableQt then ''
     substituteInPlace ./electrum/qrscanner.py \
       --replace ${libzbar_name} ${zbar.lib}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary}
+    sed -i 's/qdarkstyle<2.7/qdarkstyle<3.0/' contrib/requirements/requirements.txt
   '' else ''
     sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt
   '');

From 25a9659f5a2c707eaa37095e63f3d66f79e6e9d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 21 Feb 2020 10:42:53 -0300
Subject: [PATCH 1232/4636] nordic-polar: 1.5.0 -> 1.6.0

---
 pkgs/data/themes/nordic-polar/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/data/themes/nordic-polar/default.nix b/pkgs/data/themes/nordic-polar/default.nix
index d1cfb800001b..1ec260f5033e 100644
--- a/pkgs/data/themes/nordic-polar/default.nix
+++ b/pkgs/data/themes/nordic-polar/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   pname = "nordic-polar";
-  version = "1.5.0";
+  version = "1.6.0";
 
   srcs = [
     (fetchurl {
-      url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v.${version}/Nordic-Polar.tar.xz";
-      sha256 = "0ddccxvyf929045x6fm8xyx6rvb0d6wh6pylycwgqqm4vxbdwnly";
+      url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar.tar.xz";
+      sha256 = "0cym8rcg8jpfraqlfrmymkm0jrsk1s9p7z6vcil4vxbyim9q9w16";
     })
     (fetchurl {
-      url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v.${version}/Nordic-Polar-standard-buttons.tar.xz";
-      sha256 = "0q0qfy0aw80rds6isx3pjrqx4zrq2crxrm29nrmyzh4gr7n17li6";
+      url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar-standard-buttons.tar.xz";
+      sha256 = "0s4wf9nqpa75km905jh03gl2d2hjcdvfacmkdz3njviqm6pwqxsv";
     })
   ];
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Gtk theme created using the awesome Nord color pallete";
-    homepage = https://github.com/EliverLara/Nordic-Polar;
+    homepage = "https://github.com/EliverLara/Nordic-Polar";
     license = licenses.gpl3;
     platforms = platforms.all;
     maintainers = [ maintainers.romildo ];

From 09c1342c70c6b31c6065b2b46e0b1c50f0ef990e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 21 Feb 2020 04:20:00 -0500
Subject: [PATCH 1233/4636] dune_2: 2.3.0 -> 2.3.1

Changelog: https://github.com/ocaml/dune/releases/tag/2.3.1
---
 pkgs/development/tools/ocaml/dune/2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix
index 860602cb684c..cec1aeab6c56 100644
--- a/pkgs/development/tools/ocaml/dune/2.nix
+++ b/pkgs/development/tools/ocaml/dune/2.nix
@@ -6,11 +6,11 @@ else
 
 stdenv.mkDerivation rec {
   pname = "dune";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchurl {
     url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
-    sha256 = "1zswdp2gran8djk718q5g3ldbvw0qp34j9jj1n7m1xp870g3590l";
+    sha256 = "166a6lncx0nlmn0kxgx9qkn1dnbphm30vy1wncxcpsqspxhkqfra";
   };
 
   buildInputs = [ ocaml findlib ];

From 0d3da7efcab555aec5fa829d8f7de898778b69e6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 21 Feb 2020 15:20:56 +0000
Subject: [PATCH 1234/4636] spectmorph: 0.5.0 -> 0.5.1

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

diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/applications/audio/spectmorph/default.nix
index 7544a3520c76..a4f48aa0c21c 100644
--- a/pkgs/applications/audio/spectmorph/default.nix
+++ b/pkgs/applications/audio/spectmorph/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "spectmorph";
-  version = "0.5.0";
+  version = "0.5.1";
   src = fetchurl {
     url = "http://spectmorph.org/files/releases/${pname}-${version}.tar.bz2";
-    sha256 = "003wznv3sy1b4g55vqii9pr3i3bb3zmj7nqvwrz7vjsfn2xyd1bn";
+    sha256 = "06jrfx5g9c56swxn78lix0gyrjkhi21l9wqs56knp8iqcgfi3m0s";
   };
 
   buildInputs = [  libjack2 lv2 glib qt5.qtbase libao cairo libsndfile fftwFloat ];

From f5b761175fb78b47c88985503115e6ac08433d8d Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Fri, 21 Feb 2020 18:25:21 +0300
Subject: [PATCH 1235/4636] rambox: don't build from sources

---
 .../instant-messengers/rambox/bare.nix        | 56 --------------
 .../instant-messengers/rambox/default.nix     | 74 +++++++++----------
 .../rambox/fetchNodeModules.nix               | 26 -------
 .../instant-messengers/rambox/isDev.patch     | 14 ----
 .../instant-messengers/rambox/sencha/bare.nix | 43 -----------
 .../rambox/sencha/default.nix                 | 17 -----
 .../rambox/sencha/response.varfile            | 13 ----
 7 files changed, 36 insertions(+), 207 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/rambox/bare.nix
 delete mode 100644 pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix
 delete mode 100644 pkgs/applications/networking/instant-messengers/rambox/isDev.patch
 delete mode 100644 pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
 delete mode 100644 pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix
 delete mode 100644 pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile

diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix
deleted file mode 100644
index 1a11e8c04439..000000000000
--- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ stdenv, fetchFromGitHub, fetchNodeModules, nodejs-10_x, ruby, sencha
-, auth0ClientID, auth0Domain }:
-
-stdenv.mkDerivation rec {
-  pname = "rambox-bare";
-  version = "0.7.3";
-
-  src = fetchFromGitHub {
-    owner = "ramboxapp";
-    repo = "community-edition";
-    rev = version;
-    sha256 = "03pwzyij2i5m23qzhyqdcipixmqj46qbjmq626swwqy03a0p91qv";
-  };
-
-  nativeBuildInputs = [ nodejs-10_x ruby sencha ];
-
-  node_modules = fetchNodeModules {
-    inherit src;
-
-    nodejs = nodejs-10_x;
-    sha256 = "05vb0r0q3ckg2g87fsm22j0cbfvk81q5z43zwmrzh3pb3zh54xj1";
-  };
-
-  patches = [ ./isDev.patch ];
-
-  configurePhase = ''
-    echo 'var auth0Cfg = { clientID: "${auth0ClientID}", domain: "${auth0Domain}" };' > env.js
-    ln -s ${node_modules} node_modules
-  '';
-
-  buildPhase = ''
-    mkdir ../rambox-build
-    npm run sencha:compile:build
-  '';
-
-  installPhase = ''
-    mv ../rambox-build/ $out
-
-    # https://github.com/saenzramiro/rambox/issues/1281
-    echo '{"name": "rambox", "version": "${version}", "main": "electron/main.js"}' > $out/package.json
-
-    # https://github.com/saenzramiro/rambox/issues/1282
-    cp --parents ext/packages/ext-locale/build/ext-locale-*.js $out
-
-    # Symbolic link causes `Uncaught Error: Cannot find module 'immutable'`
-    cp -r ${node_modules} $out/node_modules
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Messaging and emailing app that combines common web applications into one";
-    homepage = http://rambox.pro;
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ gnidorah ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index f588c31c183d..488da12c18c2 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -1,52 +1,50 @@
-{ stdenv, newScope, makeWrapper
-, electron, xdg_utils, makeDesktopItem
-, auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU"
-, auth0Domain ? "nixpkgs.auth0.com" }:
+{ stdenv, fetchurl, xdg_utils, dpkg, makeWrapper, autoPatchelfHook
+, libXtst, libXScrnSaver, gtk3, nss, alsaLib, udev, libnotify
+}:
 
 let
-  callPackage = newScope self;
-  self = {
-    fetchNodeModules = callPackage ./fetchNodeModules.nix {};
-    rambox-bare = callPackage ./bare.nix {
-      inherit auth0ClientID auth0Domain;
+  version = "0.7.3";
+in stdenv.mkDerivation rec {
+  pname = "rambox";
+  inherit version;
+  src = {
+    x86_64-linux = fetchurl {
+      url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-amd64.deb";
+      sha256 = "09v8zlayas906zhqy2aw4wkvyl87ykr09sjf0nmgmf69piwmjgg6";
     };
-    sencha = callPackage ./sencha {};
-  };
-  desktopItem = makeDesktopItem rec {
-    name = "Rambox";
-    exec = "rambox";
-    icon = "${self.rambox-bare}/resources/Icon.png";
-    desktopName = name;
-    genericName = "Rambox messenger";
-    categories = "Network;";
-  };
-in
+    i686-linux = fetchurl {
+      url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.deb";
+      sha256 = "0gv4pf3vhrw4xyccm24ivv92d9qy4zpwsh0m82ib1w764lyxmyrz";
+    };
+  }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
 
-with self;
+  nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook ];
+  buildInputs = [ libXtst libXScrnSaver gtk3 nss alsaLib ];
+  runtimeDependencies = [ udev.lib libnotify ];
 
-stdenv.mkDerivation {
-  name = "rambox-${rambox-bare.version}";
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  dontUnpack = true;
-
-  dontWrapGApps = true; # we only want $gappsWrapperArgs here
+  unpackPhase = "dpkg-deb -x $src .";
 
   installPhase = ''
-    runHook preInstall
-    mkdir -p $out/share/applications
-    ln -s ${desktopItem}/share/applications/* $out/share/applications
-    runHook postInstall
+    mkdir -p $out/bin
+    cp -r opt $out
+    ln -s $out/opt/Rambox/rambox $out/bin
+
+    # provide resources
+    cp -r usr/share $out
+    substituteInPlace $out/share/applications/rambox.desktop \
+      --replace Exec=/opt/Rambox/rambox Exec=rambox
   '';
 
   postFixup = ''
-    makeWrapper ${electron}/bin/electron $out/bin/rambox \
-      --add-flags "${rambox-bare} --without-update" \
-      --prefix PATH : ${xdg_utils}/bin
+    wrapProgram $out/opt/Rambox/rambox --prefix PATH : ${xdg_utils}/bin
   '';
 
-  meta = rambox-bare.meta // {
-    platforms = [ "i686-linux" "x86_64-linux" ];
+  meta = with stdenv.lib; {
+    description = "Free and Open Source messaging and emailing app that combines common web applications into one";
+    homepage = http://rambox.pro;
+    license = licenses.mit;
+    maintainers = [ maintainers.gnidorah ];
+    platforms = ["i686-linux" "x86_64-linux"];
+    hydraPlatforms = [];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix b/pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix
deleted file mode 100644
index 047890a932ca..000000000000
--- a/pkgs/applications/networking/instant-messengers/rambox/fetchNodeModules.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, jq }: { src, nodejs, sha256 }:
-
-# Only npm >= 5.4.2 is deterministic, see:
-# https://github.com/npm/npm/issues/17979#issuecomment-332701215
-assert stdenv.lib.versionAtLeast nodejs.version "8.9.0";
-
-stdenv.mkDerivation {
-  name = "node_modules";
-
-  outputHashAlgo = "sha256";
-  outputHash = sha256;
-  outputHashMode = "recursive";
-
-  nativeBuildInputs = [ jq nodejs ];
-
-  buildCommand = ''
-    cp -r ${src}/* .
-    HOME=. npm install --force --ignore-scripts --only=production
-    for f in $(find node_modules -name package.json); do
-      # https://github.com/npm/npm/issues/10393
-      jq -S 'delpaths(keys | map(select(startswith("_")) | [.]))' $f > $f.tmp
-      mv $f.tmp $f
-    done
-    mv node_modules $out
-  '';
-}
diff --git a/pkgs/applications/networking/instant-messengers/rambox/isDev.patch b/pkgs/applications/networking/instant-messengers/rambox/isDev.patch
deleted file mode 100644
index b918144c7662..000000000000
--- a/pkgs/applications/networking/instant-messengers/rambox/isDev.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://github.com/saenzramiro/rambox/issues/1280
-
-diff -urNZ a/electron/main.js b/electron/main.js
---- a/electron/main.js	2017-11-02 14:58:06.085127616 +0000
-+++ b/electron/main.js	2017-11-02 14:58:18.316887679 +0000
-@@ -8,7 +8,7 @@
- // Configuration
- const Config = require('electron-config');
- // Development
--const isDev = require('electron-is-dev');
-+const isDev = false;
- // Updater
- const updater = require('./updater');
- // File System
diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
deleted file mode 100644
index 30b12963b337..000000000000
--- a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv, fetchurl, gzip, which, unzip, jdk }:
-
-let
-  version = "6.6.0.13";
-  srcs = {
-    i686-linux = fetchurl {
-      url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-i386.sh.zip";
-      sha256 = "15b197108b49mf0afpihkh3p68lxm7580zz2w0xsbahglnvhwyfz";
-    };
-    x86_64-linux = fetchurl {
-      url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-amd64.sh.zip";
-      sha256 = "1cxhckmx1802p9qiw09cgb1v5f30wcvnrwkshmia8p8n0q47lpp4";
-    };
-  };
-in
-
-stdenv.mkDerivation {
-  inherit version;
-
-  pname = "sencha-bare";
-  src = srcs.${stdenv.hostPlatform.system};
-
-  nativeBuildInputs = [ gzip which unzip ];
-  buildInputs = [ jdk ];
-
-  sourceRoot = ".";
-
-  configurePhase = ''
-    substituteAll ${./response.varfile} response.varfile
-  '';
-
-  installPhase = ''
-    ./SenchaCmd*.sh -q -dir $out -varfile response.varfile
-    # disallow sencha writing into /nix/store/repo
-    echo "repo.local.dir=$TMP/repo" >> $out/sencha.cfg
-    rm $out/shell-wrapper.sh $out/Uninstaller
-  '';
-
-  meta = with stdenv.lib; {
-    license = licenses.unfree;
-    platforms = attrNames srcs;
-  };
-}
diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix
deleted file mode 100644
index 4be8edaf9b85..000000000000
--- a/pkgs/applications/networking/instant-messengers/rambox/sencha/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, callPackage, makeWrapper }:
-
-let
-  sencha-bare = callPackage ./bare.nix {};
-in
-
-stdenv.mkDerivation {
-  name = "sencha-${sencha-bare.version}";
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  dontUnpack = true;
-
-  installPhase = ''
-    makeWrapper ${sencha-bare}/sencha $out/bin/sencha
-  '';
-}
diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile b/pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile
deleted file mode 100644
index 0ff6f0a30d50..000000000000
--- a/pkgs/applications/networking/instant-messengers/rambox/sencha/response.varfile
+++ /dev/null
@@ -1,13 +0,0 @@
-addToPath$Integer=1
-parentDir=.
-sys.adminRights$Boolean=false
-sys.component.148$Boolean=true
-sys.component.157$Boolean=true
-sys.component.26$Boolean=true
-sys.component.30$Boolean=true
-sys.component.90$Boolean=true
-sys.component.91$Boolean=true
-sys.component.92$Boolean=true
-sys.component.94$Boolean=true
-sys.installationDir=@out@
-sys.languageId=en
\ No newline at end of file

From 53864089919a44ce5951dbaa1bd42be83d65f35a Mon Sep 17 00:00:00 2001
From: Ersin Akinci <me@ersinakinci.com>
Date: Fri, 21 Feb 2020 15:39:43 +0000
Subject: [PATCH 1236/4636] slack: 4.3.3 -> 4.2.0

4.3.3 not available yet for Linux
---
 .../networking/instant-messengers/slack/default.nix             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 8037f68c8d11..32f50b6fd638 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -6,7 +6,7 @@ at-spi2-atk, at-spi2-core, libuuid, nodePackages, libpulseaudio, xdg_utils
 
 let
 
-  version = "4.3.3";
+  version = "4.2.0";
 
   inherit (stdenv.hostPlatform) system;
 

From be255392dd85e8d649aa2b278b5a5227de1543d4 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Fri, 21 Feb 2020 01:02:47 +0100
Subject: [PATCH 1237/4636] nixos/virtualbox-image: add params

---
 .../virtualisation/virtualbox-image.nix       | 39 ++++++++++++++++---
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index ab65523592d7..788b4d9d9761 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -45,10 +45,41 @@ in {
           The file name of the VirtualBox appliance.
         '';
       };
+      params = mkOption {
+        type = with types; attrsOf (oneOf [ str int bool (listOf str) ]);
+        example = {
+          audio = "alsa";
+          rtcuseutc = "on";
+          usb = "off";
+        };
+        description = ''
+          Parameters passed to the Virtualbox appliance.
+
+          Run <literal>VBoxManage modifyvm --help</literal> to see more options.
+        '';
+     };
     };
   };
 
   config = {
+
+    virtualbox.params = mkMerge [
+      (mapAttrs (name: mkDefault) {
+        acpi = "on";
+        vram = 32;
+        nictype1 = "virtio";
+        nic1 = "nat";
+        audiocontroller = "ac97";
+        audio = "alsa";
+        audioout = "on";
+        rtcuseutc = "on";
+        usb = "on";
+        usbehci = "on";
+        mouse = "usbtablet";
+      })
+      (mkIf (pkgs.stdenv.hostPlatform.system == "i686-linux") { pae = "on"; })
+    ];
+
     system.build.virtualBoxOVA = import ../../lib/make-disk-image.nix {
       name = cfg.vmDerivationName;
 
@@ -69,12 +100,8 @@ in {
           VBoxManage createvm --name "$vmName" --register \
             --ostype ${if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then "Linux26_64" else "Linux26"}
           VBoxManage modifyvm "$vmName" \
-            --memory ${toString cfg.memorySize} --acpi on --vram 32 \
-            ${optionalString (pkgs.stdenv.hostPlatform.system == "i686-linux") "--pae on"} \
-            --nictype1 virtio --nic1 nat \
-            --audiocontroller ac97 --audio alsa --audioout on \
-            --rtcuseutc on \
-            --usb on --usbehci on --mouse usbtablet
+            --memory ${toString cfg.memorySize} \
+            ${lib.cli.toGNUCommandLineShell { } cfg.params}
           VBoxManage storagectl "$vmName" --name SATA --add sata --portcount 4 --bootable on --hostiocache on
           VBoxManage storageattach "$vmName" --storagectl SATA --port 0 --device 0 --type hdd \
             --medium disk.vmdk

From 193e2ed86ea122b288ff8a616512bf821656ac47 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sat, 12 Oct 2019 14:18:00 +0300
Subject: [PATCH 1238/4636] nixos/gtk: init

---
 nixos/modules/config/gtk/gtk.nix | 160 +++++++++++++++++++++++++++++++
 nixos/modules/module-list.nix    |   1 +
 2 files changed, 161 insertions(+)
 create mode 100644 nixos/modules/config/gtk/gtk.nix

diff --git a/nixos/modules/config/gtk/gtk.nix b/nixos/modules/config/gtk/gtk.nix
new file mode 100644
index 000000000000..22f1e5d74835
--- /dev/null
+++ b/nixos/modules/config/gtk/gtk.nix
@@ -0,0 +1,160 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.gtk;
+  gtk2 = cfg.enable && cfg.gtk2;
+
+  toGtk2File = key: value:
+    let
+      value' =
+        if isBool value then (if value then "true" else "false")
+        else if isString value then "\"${value}\""
+        else toString value;
+    in
+      "${key} = ${value'}";
+  toGtk3File = generators.toINI {
+    mkKeyValue = key: value:
+      let
+        value' =
+          if isBool value then (if value then "true" else "false")
+          else toString value;
+      in
+        "${key}=${value'}";
+  };
+
+  settings =
+    optionalAttrs (cfg.font != null)
+      { gtk-font-name = cfg.font.name; }
+    //
+    optionalAttrs (cfg.theme != null)
+      { gtk-theme-name = cfg.theme.name; }
+    //
+    optionalAttrs (cfg.iconTheme != null)
+      { gtk-icon-theme-name = cfg.iconTheme.name; }
+    //
+    optionalAttrs (cfg.cursorTheme != null)
+      { gtk-cursor-theme-name = cfg.cursorTheme.name; };
+
+  fontType = types.submodule {
+    options = {
+      package = mkOption {
+        internal = true;
+        type = types.nullOr types.package;
+        default = null;
+      };
+      name = mkOption {
+        internal = true;
+        type = types.str;
+      };
+    };
+  };
+  themeType = types.submodule {
+    options = {
+      package = mkOption {
+        internal = true;
+        type = types.nullOr types.package;
+        default = null;
+      };
+      name = mkOption {
+        internal = true;
+        type = types.str;
+      };
+    };
+  };
+
+  optionalPackage = opt:
+    optional (opt != null && opt.package != null) opt.package;
+in
+{
+  options = {
+    gtk = {
+      enable = mkEnableOption "Gtk theming configuration";
+
+      gtk2 = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to enable theming for obsolete GTK2 engine.
+        '';
+      };
+
+      font = mkOption {
+        type = types.nullOr fontType;
+        default = null;
+        example = literalExample ''
+          {
+            name = "Cantarell 11";
+            package = pkgs.cantarell-fonts;
+          };
+        '';
+        description = ''
+          The font to use in GTK+ applications.
+        '';
+      };
+
+      iconTheme = mkOption {
+        type = types.nullOr themeType;
+        default = null;
+        example = literalExample ''
+          {
+            name = "Adwaita";
+            package = pkgs.gnome3.adwaita-icon-theme;
+          };
+        '';
+        description = "The icon theme to use.";
+      };
+
+      cursorTheme = mkOption {
+        type = types.nullOr themeType;
+        default = null;
+        example = literalExample ''
+          {
+            name = "Adwaita";
+            package = pkgs.gnome3.adwaita-icon-theme;
+          };
+        '';
+        description = "The cursor theme to use.";
+      };
+
+      theme = mkOption {
+        type = types.nullOr themeType;
+        default = null;
+        example = literalExample ''
+          {
+            name = "Adwaita";
+            package = pkgs.gnome-themes-extra;
+          };
+        '';
+        description = "The GTK+ theme to use.";
+      };
+    };
+  };
+
+  config = mkMerge [
+
+    (mkIf gtk2 {
+      environment.etc."xdg/gtk-2.0/gtkrc".text =
+        concatStringsSep "\n" (
+          mapAttrsToList toGtk2File settings
+        );
+    })
+
+    (mkIf cfg.enable {
+      environment.systemPackages =
+        optionalPackage cfg.font
+        ++ optionalPackage cfg.theme
+        ++ optionalPackage cfg.iconTheme
+        ++ optionalPackage cfg.cursorTheme;
+
+      environment.etc."xdg/gtk-3.0/settings.ini".text =
+        toGtk3File { Settings = settings; };
+
+      # TODO: support Wayland/XSettings
+      # once https://github.com/NixOS/nixpkgs/issues/54150 is fixed
+    })
+  ];
+
+  meta.maintainers = [ maintainers.gnidorah ];
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 878b77969af1..101c235e63f4 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -13,6 +13,7 @@
   ./config/appstream.nix
   ./config/console.nix
   ./config/xdg/sounds.nix
+  ./config/gtk/gtk.nix
   ./config/gtk/gtk-icon-cache.nix
   ./config/gnu.nix
   ./config/i18n.nix

From 23107a32c4c637dc1091cfb89ae2fce443ce21cd Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sun, 13 Oct 2019 00:07:36 +0300
Subject: [PATCH 1239/4636] nixos/qt5: refactor to support more platform themes

---
 nixos/modules/config/qt5.nix | 134 +++++++++++++++++++----------------
 1 file changed, 73 insertions(+), 61 deletions(-)

diff --git a/nixos/modules/config/qt5.nix b/nixos/modules/config/qt5.nix
index d9dec74f1552..bc3be7068a0e 100644
--- a/nixos/modules/config/qt5.nix
+++ b/nixos/modules/config/qt5.nix
@@ -6,13 +6,63 @@ let
 
   cfg = config.qt5;
 
-  isQGnome = cfg.platformTheme == "gnome" && cfg.style == "adwaita";
-  isQtStyle = cfg.platformTheme == "gtk2" && cfg.style != "adwaita";
+  themeType = types.submodule {
+    options = {
+      package = mkOption {
+        internal = true;
+        type = types.nullOr types.package;
+        default = null;
+      };
+      name = mkOption {
+        internal = true;
+        type = types.str;
+      };
+    };
+  };
 
-  packages = if isQGnome then [ pkgs.qgnomeplatform pkgs.adwaita-qt ]
-    else if isQtStyle then [ pkgs.libsForQt5.qtstyleplugins ]
-    else throw "`qt5.platformTheme` ${cfg.platformTheme} and `qt5.style` ${cfg.style} are not compatible.";
+  optionalPackage = opt:
+    optional (opt != null && opt.package != null) opt.package;
 
+  platforms = {
+    gtk2 = rec {
+      description = ''
+        <varlistentry>
+          <term><literal>gtk2</literal></term>
+          <listitem><para>Use GTK2 theme with
+            <link xlink:href="https://github.com/qt/qtstyleplugins">qtstyleplugins</link>
+          </para></listitem>
+        </varlistentry>
+      '';
+      styles = [ "cleanlooks" "gtk2" "cde" "motif" "plastique" ];
+
+      assertions = [
+        {
+          assertion = cfg.style != null && any (name: name == cfg.style.name) styles;
+          message = "`qt5.style.name` is not one of [ ${toString styles} ].";
+        }
+      ];
+      environment.variables.QT_QPA_PLATFORMTHEME = "gtk2";
+      environment.variables.QT_STYLE_OVERRIDE = cfg.style.name;
+      environment.systemPackages = [ pkgs.libsForQt5.qtstyleplugins ];
+    };
+    qgnomeplatform = {
+      description = ''
+        <varlistentry>
+          <term><literal>qgnomeplatform</literal></term>
+          <listitem><para>Use GNOME theme with
+            <link xlink:href="https://github.com/FedoraQt/QGnomePlatform">qgnomeplatform</link>
+          </para></listitem>
+        </varlistentry>
+      '';
+
+      environment.variables.QT_QPA_PLATFORMTHEME = "qgnomeplatform";
+      # TODO: make this optional once https://github.com/NixOS/nixpkgs/issues/54150 is fixed
+      # qgnomeplatform reads theme and other settings from dconf db
+      environment.variables.QT_STYLE_OVERRIDE = cfg.style.name;
+      environment.variables.XDG_DATA_DIRS = [ "${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}" ];
+      environment.systemPackages = [ pkgs.qgnomeplatform ];
+    };
+  };
 in
 
 {
@@ -23,80 +73,42 @@ in
       enable = mkEnableOption "Qt5 theming configuration";
 
       platformTheme = mkOption {
-        type = types.enum [
-          "gtk2"
-          "gnome"
-        ];
-        example = "gnome";
-        relatedPackages = [
-          "qgnomeplatform"
-          ["libsForQt5" "qtstyleplugins"]
-        ];
+        type = types.enum (attrNames platforms);
+        example = head (attrNames platforms);
         description = ''
           Selects the platform theme to use for Qt5 applications.</para>
           <para>The options are
           <variablelist>
-            <varlistentry>
-              <term><literal>gtk</literal></term>
-              <listitem><para>Use GTK theme with
-                <link xlink:href="https://github.com/qt/qtstyleplugins">qtstyleplugins</link>
-              </para></listitem>
-            </varlistentry>
-            <varlistentry>
-              <term><literal>gnome</literal></term>
-              <listitem><para>Use GNOME theme with
-                <link xlink:href="https://github.com/FedoraQt/QGnomePlatform">qgnomeplatform</link>
-              </para></listitem>
-            </varlistentry>
+            ${concatStrings (mapAttrsToList (name: value: value.description) platforms)}
           </variablelist>
         '';
       };
 
       style = mkOption {
-        type = types.enum [
-          "adwaita"
-          "cleanlooks"
-          "gtk2"
-          "motif"
-          "plastique"
-        ];
-        example = "adwaita";
-        relatedPackages = [
-          "adwaita-qt"
-          ["libsForQt5" "qtstyleplugins"]
-        ];
-        description = ''
-          Selects the style to use for Qt5 applications.</para>
-          <para>The options are
-          <variablelist>
-            <varlistentry>
-              <term><literal>adwaita</literal></term>
-              <listitem><para>Use Adwaita Qt style with
-                <link xlink:href="https://github.com/FedoraQt/adwaita-qt">adwaita</link>
-              </para></listitem>
-            </varlistentry>
-            <varlistentry>
-              <term><literal>cleanlooks</literal></term>
-              <term><literal>gtk2</literal></term>
-              <term><literal>motif</literal></term>
-              <term><literal>plastique</literal></term>
-              <listitem><para>Use styles from
-                <link xlink:href="https://github.com/qt/qtstyleplugins">qtstyleplugins</link>
-              </para></listitem>
-            </varlistentry>
-          </variablelist>
+        type = types.nullOr themeType;
+        default = null;
+        example = literalExample ''
+          {
+            name = "Breeze";
+            package = pkgs.breeze-qt5;
+          };
         '';
+        description = "The Qt style to use.";
       };
+
     };
   };
 
   config = mkIf cfg.enable {
 
-    environment.variables.QT_QPA_PLATFORMTHEME = cfg.platformTheme;
+    assertions = attrByPath [ cfg.platformTheme "assertions" ] [] platforms;
 
-    environment.variables.QT_STYLE_OVERRIDE = cfg.style;
+    environment.variables = attrByPath [ cfg.platformTheme "environment" "variables" ] {} platforms;
 
-    environment.systemPackages = packages;
+    environment.systemPackages = attrByPath [ cfg.platformTheme "environment" "systemPackages" ] [] platforms
+      ++ optionalPackage cfg.style;
 
   };
+
+  meta.maintainers = with maintainers; [ worldofpeace gnidorah ];
 }

From 379c3f685c925f57dc38805a602a96d2f35db130 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sun, 13 Oct 2019 08:38:32 +0300
Subject: [PATCH 1240/4636] nixos/qt5: extend qt5 theming support

---
 nixos/modules/config/qt5.nix | 120 ++++++++++++++++++++++++++++++++++-
 1 file changed, 119 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/config/qt5.nix b/nixos/modules/config/qt5.nix
index bc3be7068a0e..fb3e03c4b3fe 100644
--- a/nixos/modules/config/qt5.nix
+++ b/nixos/modules/config/qt5.nix
@@ -6,6 +6,43 @@ let
 
   cfg = config.qt5;
 
+  toQtIni = generators.toINI {
+    mkKeyValue = key: value:
+      let
+        value' =
+          if isBool value then (if value then "true" else "false")
+          else toString value;
+      in
+        "${key}=${value'}";
+  };
+
+  general =
+    optionalAttrs (cfg.font != null)
+      {
+        font = cfg.font.name;
+        menuFont = cfg.font.name;
+        toolBarFont = cfg.font.name;
+      }
+    //
+    optionalAttrs (cfg.style != null)
+      { widgetStyle = cfg.style.name; };
+  icons =
+    optionalAttrs (cfg.iconTheme != null)
+      { Theme = cfg.iconTheme.name; };
+
+  fontType = types.submodule {
+    options = {
+      package = mkOption {
+        internal = true;
+        type = types.nullOr types.package;
+        default = null;
+      };
+      name = mkOption {
+        internal = true;
+        type = types.str;
+      };
+    };
+  };
   themeType = types.submodule {
     options = {
       package = mkOption {
@@ -40,6 +77,10 @@ let
           assertion = cfg.style != null && any (name: name == cfg.style.name) styles;
           message = "`qt5.style.name` is not one of [ ${toString styles} ].";
         }
+        {
+          assertion = cfg.font == null && cfg.iconTheme == null;
+          message = "`qt5.font` and `qt5.iconTheme` are only supported by kde platform.";
+        }
       ];
       environment.variables.QT_QPA_PLATFORMTHEME = "gtk2";
       environment.variables.QT_STYLE_OVERRIDE = cfg.style.name;
@@ -55,6 +96,12 @@ let
         </varlistentry>
       '';
 
+      assertions = [
+        {
+          assertion = cfg.font == null && cfg.iconTheme == null;
+          message = "`qt5.font` and `qt5.iconTheme` are only supported by kde platform.";
+        }
+      ];
       environment.variables.QT_QPA_PLATFORMTHEME = "qgnomeplatform";
       # TODO: make this optional once https://github.com/NixOS/nixpkgs/issues/54150 is fixed
       # qgnomeplatform reads theme and other settings from dconf db
@@ -62,6 +109,47 @@ let
       environment.variables.XDG_DATA_DIRS = [ "${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}" ];
       environment.systemPackages = [ pkgs.qgnomeplatform ];
     };
+    gtk3 = {
+      description = ''
+        <varlistentry>
+          <term><literal>gtk3</literal></term>
+          <listitem><para>Use GNOME theme with
+            <link xlink:href="https://code.qt.io/cgit/qt/qtbase.git/tree/src/plugins/platformthemes/gtk3">gtk3</link>
+          </para></listitem>
+        </varlistentry>
+      '';
+
+      assertions = [
+        {
+          assertion = cfg.style != null;
+          message = "`qt5.platformTheme` gtk3 requires `qt5.style` to be set.";
+        }
+        {
+          assertion = cfg.font == null && cfg.iconTheme == null;
+          message = "`qt5.font` and `qt5.iconTheme` are only supported by kde platform.";
+        }
+      ];
+      environment.variables.QT_QPA_PLATFORMTHEME = "gtk3";
+      environment.variables.QT_STYLE_OVERRIDE = cfg.style.name;
+    };
+    kde = {
+      description = ''
+        <varlistentry>
+          <term><literal>kde</literal></term>
+          <listitem><para>Use Qt theme with
+            <link xlink:href="https://code.qt.io/cgit/qt/qtbase.git/tree/src/platformsupport/themes/genericunix">qkdetheme</link>
+          </para></listitem>
+        </varlistentry>
+      '';
+
+      environment.variables.XDG_CURRENT_DESKTOP = mkForce "KDE";
+      environment.variables.KDE_SESSION_VERSION = "5";
+      environment.etc."xdg/kdeglobals".text =
+        toQtIni {
+          General = general;
+          Icons = icons;
+        };
+    };
   };
 in
 
@@ -84,6 +172,32 @@ in
         '';
       };
 
+      font = mkOption {
+        type = types.nullOr fontType;
+        default = null;
+        example = literalExample ''
+          {
+            name = "Noto Sans,10,-1,5,50,0,0,0,0,0,Regular";
+            package = pkgs.noto-fonts;
+          }
+        '';
+        description = ''
+          The font to use in Qt applications.
+        '';
+      };
+
+      iconTheme = mkOption {
+        type = types.nullOr themeType;
+        default = null;
+        example = literalExample ''
+          {
+            name = "breeze";
+            package = pkgs.breeze-icons;
+          }
+        '';
+        description = "The icon theme to use.";
+      };
+
       style = mkOption {
         type = types.nullOr themeType;
         default = null;
@@ -105,8 +219,12 @@ in
 
     environment.variables = attrByPath [ cfg.platformTheme "environment" "variables" ] {} platforms;
 
+    environment.etc = attrByPath [ cfg.platformTheme "environment" "etc" ] {} platforms;
+
     environment.systemPackages = attrByPath [ cfg.platformTheme "environment" "systemPackages" ] [] platforms
-      ++ optionalPackage cfg.style;
+      ++ optionalPackage cfg.font
+      ++ optionalPackage cfg.style
+      ++ optionalPackage cfg.iconTheme;
 
   };
 

From 1bd7ea84ad7e2bb4643ecf0f62e376aeb05ad7be Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sun, 13 Oct 2019 08:55:36 +0300
Subject: [PATCH 1241/4636] nixos/qt5: rename to qt

---
 nixos/modules/config/{qt5.nix => qt.nix}      | 24 ++++++++++++-------
 nixos/modules/module-list.nix                 |  2 +-
 .../x11/desktop-managers/pantheon.nix         |  6 ++---
 3 files changed, 20 insertions(+), 12 deletions(-)
 rename nixos/modules/config/{qt5.nix => qt.nix} (88%)

diff --git a/nixos/modules/config/qt5.nix b/nixos/modules/config/qt.nix
similarity index 88%
rename from nixos/modules/config/qt5.nix
rename to nixos/modules/config/qt.nix
index fb3e03c4b3fe..a145eaab4f1a 100644
--- a/nixos/modules/config/qt5.nix
+++ b/nixos/modules/config/qt.nix
@@ -4,7 +4,7 @@ with lib;
 
 let
 
-  cfg = config.qt5;
+  cfg = config.qt;
 
   toQtIni = generators.toINI {
     mkKeyValue = key: value:
@@ -79,7 +79,7 @@ let
         }
         {
           assertion = cfg.font == null && cfg.iconTheme == null;
-          message = "`qt5.font` and `qt5.iconTheme` are only supported by kde platform.";
+          message = "`qt.font` and `qt.iconTheme` are only supported by kde platform.";
         }
       ];
       environment.variables.QT_QPA_PLATFORMTHEME = "gtk2";
@@ -99,7 +99,7 @@ let
       assertions = [
         {
           assertion = cfg.font == null && cfg.iconTheme == null;
-          message = "`qt5.font` and `qt5.iconTheme` are only supported by kde platform.";
+          message = "`qt.font` and `qt.iconTheme` are only supported by kde platform.";
         }
       ];
       environment.variables.QT_QPA_PLATFORMTHEME = "qgnomeplatform";
@@ -126,7 +126,7 @@ let
         }
         {
           assertion = cfg.font == null && cfg.iconTheme == null;
-          message = "`qt5.font` and `qt5.iconTheme` are only supported by kde platform.";
+          message = "`qt.font` and `qt.iconTheme` are only supported by kde platform.";
         }
       ];
       environment.variables.QT_QPA_PLATFORMTHEME = "gtk3";
@@ -155,16 +155,24 @@ in
 
 {
 
-  options = {
-    qt5 = {
+  imports = [
+    (mkRenamedOptionModule [ "qt5" "style" ] [ "qt" "style" ])
+    (mkRenamedOptionModule [ "qt5" "enable" ] [ "qt" "enable" ])
+    (mkRenamedOptionModule [ "qt5" "platformTheme" ] [ "qt" "platformTheme" ])
+    (mkRenamedOptionModule [ "qt5" "font" ] [ "qt" "font" ])
+    (mkRenamedOptionModule [ "qt5" "iconTheme" ] [ "qt" "iconTheme" ])
+  ];
 
-      enable = mkEnableOption "Qt5 theming configuration";
+  options = {
+    qt = {
+
+      enable = mkEnableOption "Qt theming configuration";
 
       platformTheme = mkOption {
         type = types.enum (attrNames platforms);
         example = head (attrNames platforms);
         description = ''
-          Selects the platform theme to use for Qt5 applications.</para>
+          Selects the platform theme to use for Qt applications.</para>
           <para>The options are
           <variablelist>
             ${concatStrings (mapAttrsToList (name: value: value.description) platforms)}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 101c235e63f4..089737fcf0ae 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -27,7 +27,7 @@
   ./config/nsswitch.nix
   ./config/power-management.nix
   ./config/pulseaudio.nix
-  ./config/qt5.nix
+  ./config/qt.nix
   ./config/resolvconf.nix
   ./config/shells-environment.nix
   ./config/swap.nix
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index b46a2d189ef9..5b3fea845964 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -242,9 +242,9 @@ in
       programs.zsh.vteIntegration = mkDefault true;
 
       # Harmonize Qt5 applications under Pantheon
-      qt5.enable = true;
-      qt5.platformTheme = "gnome";
-      qt5.style = "adwaita";
+      qt.enable = true;
+      qt.platformTheme = "qgnomeplatform";
+      qt.style.name = "adwaita";
 
       # Default Fonts
       fonts.fonts = with pkgs; [

From 956c60eda8408b9aff735afdcdeb16b21a27b480 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Mon, 14 Oct 2019 20:45:39 +0300
Subject: [PATCH 1242/4636] nixos/qt: support theming qt4

---
 nixos/modules/config/qt.nix | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/config/qt.nix b/nixos/modules/config/qt.nix
index a145eaab4f1a..87d07ccfb342 100644
--- a/nixos/modules/config/qt.nix
+++ b/nixos/modules/config/qt.nix
@@ -30,6 +30,12 @@ let
     optionalAttrs (cfg.iconTheme != null)
       { Theme = cfg.iconTheme.name; };
 
+  qt =
+    optionalAttrs (cfg.font != null)
+      { font = ''"${cfg.font.name}"''; }
+    //
+      { style = "GTK+"; };
+
   fontType = types.submodule {
     options = {
       package = mkOption {
@@ -168,6 +174,14 @@ in
 
       enable = mkEnableOption "Qt theming configuration";
 
+      qt4 = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to enable theming for obsolete Qt4 engine.
+        '';
+      };
+
       platformTheme = mkOption {
         type = types.enum (attrNames platforms);
         example = head (attrNames platforms);
@@ -227,7 +241,12 @@ in
 
     environment.variables = attrByPath [ cfg.platformTheme "environment" "variables" ] {} platforms;
 
-    environment.etc = attrByPath [ cfg.platformTheme "environment" "etc" ] {} platforms;
+    environment.etc = attrByPath [ cfg.platformTheme "environment" "etc" ] {} platforms // {
+      "xdg/Trolltech.conf".text =
+        toQtIni {
+          Qt = qt;
+        };
+    };
 
     environment.systemPackages = attrByPath [ cfg.platformTheme "environment" "systemPackages" ] [] platforms
       ++ optionalPackage cfg.font

From ffdc7dc3be1b07ac1ebdd7b6d839c6585e786ff5 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Fri, 21 Feb 2020 18:55:05 +0300
Subject: [PATCH 1243/4636] nixos/doc: mention qt and gtk modules

---
 nixos/doc/manual/configuration/x-windows.xml | 32 ++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml
index 06dd7c8bfb94..e0207b5f2ae8 100644
--- a/nixos/doc/manual/configuration/x-windows.xml
+++ b/nixos/doc/manual/configuration/x-windows.xml
@@ -160,6 +160,38 @@
    package into your system environment. It should work for all Qt 5 library
    versions.
   </para>
+  <para>
+   With help of
+   <option>
+    <link linkend="opt-gtk.enable">
+     gtk
+    </link>
+   </option>
+   and
+   <option>
+    <link linkend="opt-qt.enable">
+     qt
+    </link>
+   </option>
+   modules you can declaratively set system-wide themes settings.
+<programlisting>
+  gtk.enable = true;
+  gtk.theme = {
+    name = "Adwaita-dark";
+    package = pkgs.gnome-themes-extra;
+  };
+  gtk.iconTheme = {
+    name = "Adwaita";
+    package = pkgs.gnome3.adwaita-icon-theme;
+  };
+  qt.enable = true;
+  qt.platformTheme = "gtk3";
+  qt.style = {
+    name = "adwaita-dark";
+    package = pkgs.adwaita-qt;
+  };
+</programlisting>
+  </para>
  </simplesect>
  <simplesect xml:id="custom-xkb-layouts">
   <title>Custom XKB layouts</title>

From 6f824c38fd0deb455e832b46735948cc230cab8a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 21 Feb 2020 07:11:36 +0000
Subject: [PATCH 1244/4636] python27Packages.pyodbc: 4.0.28 -> 4.0.30

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

diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix
index bef4969d7d2e..7451b1102ed2 100644
--- a/pkgs/development/python-modules/pyodbc/default.nix
+++ b/pkgs/development/python-modules/pyodbc/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pyodbc";
-  version = "4.0.28";
+  version = "4.0.30";
   disabled = isPyPy;  # use pypypdbc instead
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "510643354c4c687ed96bf7e7cec4d02d6c626ecf3e18696f5a0228dd6d11b769";
+    sha256 = "0skjpraar6hcwsy82612bpj8nw016ncyvvq88j5syrikxgp5saw5";
   };
 
   buildInputs = [ unixODBC ];

From 2c9fd5b8995fdb93e07c4f80ba92f3b0dbb72a76 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 21 Feb 2020 16:21:40 +0000
Subject: [PATCH 1245/4636] tixati: 2.66 -> 2.67

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

diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix
index 72003f417210..05268bdaead1 100644
--- a/pkgs/applications/networking/p2p/tixati/default.nix
+++ b/pkgs/applications/networking/p2p/tixati/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "tixati";
-  version = "2.66";
+  version = "2.67";
 
   src = fetchurl {
     url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz";
-    sha256 = "1qwmxfkgc5q7v6ickxr29khil6mh9crv5mwdm72bp6k64w0akbs7";
+    sha256 = "0510wkwmwrlv61958zd5nsc4lr0l0lka3jf4pq3dyiyfsf4k20rq";
   };
 
   installPhase = ''

From cf4130c9ec20282875d77c345ff9917ff8cb593a Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Fri, 21 Feb 2020 17:56:24 +0100
Subject: [PATCH 1246/4636] turses: Fix build

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

diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix
index 780dab79e997..27977dae15f8 100644
--- a/pkgs/applications/networking/instant-messengers/turses/default.nix
+++ b/pkgs/applications/networking/instant-messengers/turses/default.nix
@@ -15,6 +15,8 @@ buildPythonPackage rec {
   checkInputs = [ mock pytest coverage tox ];
   propagatedBuildInputs = [ urwid tweepy future ];
 
+  LC_ALL = "en_US.UTF-8";
+
   patches = [
     (fetchpatch {
       url = "https://github.com/louipc/turses/commit/be0961b51f502d49fd9e2e5253ac130e543a31c7.patch";

From 26319e6504eb749aeb86a030761c97b98fc7311b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 21 Feb 2020 17:07:25 +0000
Subject: [PATCH 1247/4636] whois: 5.5.5 -> 5.5.6

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

diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix
index 2306359addf8..1010c5d9cda3 100644
--- a/pkgs/tools/networking/whois/default.nix
+++ b/pkgs/tools/networking/whois/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }:
 
 stdenv.mkDerivation rec {
-  version = "5.5.5";
+  version = "5.5.6";
   pname = "whois";
 
   src = fetchFromGitHub {
     owner = "rfc1036";
     repo = "whois";
     rev = "v${version}";
-    sha256 = "01gni315lnkyrwd173fqw0c12qrisfb38wy066s2j85nq64a3nqv";
+    sha256 = "0iqbn2ky9j7qdpv5hycy56knnfhl8nz4l4905rnr0p703lvxxx8d";
   };
 
   nativeBuildInputs = [ perl gettext pkgconfig ];

From 9b8a14bb7e1d10b413a96b0c7c5c6e09243bd9b7 Mon Sep 17 00:00:00 2001
From: Aaron Olson <934893+honkfestival@users.noreply.github.com>
Date: Fri, 21 Feb 2020 12:28:54 -0500
Subject: [PATCH 1248/4636] google-cloud-sdk: fix Darwin build by only
 stripping local symbols (#80554)

Darwin won't strip relocatable symbols, so strip only local symbols
from cygrpc.so

See also https://github.com/NixOS/nixpkgs/commit/6ceebc441c43c0fd0ef5c61058c1c8ec3b93bc02#commitcomment-37355193
---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 326d15a9318e..1d37f71f0a83 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -30,6 +30,8 @@ let
     };
   }.${system};
 
+  strip = if stdenv.isDarwin then "strip -x" else "strip";
+
 in stdenv.mkDerivation rec {
   pname = "google-cloud-sdk";
   version = "268.0.0";
@@ -93,7 +95,7 @@ in stdenv.mkDerivation rec {
     done
 
     # strip the Cython gRPC library
-    strip $out/google-cloud-sdk/lib/third_party/grpc/_cython/cygrpc.so
+    ${strip} $out/google-cloud-sdk/lib/third_party/grpc/_cython/cygrpc.so
   '';
 
   meta = with stdenv.lib; {

From 7cda2823be93e412b9c167f92ae87e65ebc05ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 21 Feb 2020 18:17:48 +0100
Subject: [PATCH 1249/4636] openssl_1_0_2: mark as insecure; fixes #77503
 (kinda)

No vulnerabilities are know so far (to me), but still I'd go this way.
Especially for 20.03 it seems better to deprecate it before official
release happens.

Current casualties:
$ ./maintainers/scripts/rebuild-amount.sh --print HEAD HEAD^
Estimating rebuild amount by counting changed Hydra jobs.
     87 x86_64-darwin
    161 x86_64-linux
---
 pkgs/development/libraries/openssl/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 63657cfc5e6e..d9028ddfbb5b 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -7,7 +7,8 @@
 with stdenv.lib;
 
 let
-  common = { version, sha256, patches ? [], withDocs ? false }: stdenv.mkDerivation rec {
+  common = { version, sha256, patches ? [], withDocs ? false, extraMeta ? {} }:
+   stdenv.mkDerivation rec {
     pname = "openssl";
     inherit version;
 
@@ -130,7 +131,7 @@ let
       license = licenses.openssl;
       platforms = platforms.all;
       maintainers = [ maintainers.peti ];
-    };
+    } // extraMeta;
   };
 
 in {
@@ -145,6 +146,7 @@ in {
        then ./1.0.2/use-etc-ssl-certs-darwin.patch
        else ./1.0.2/use-etc-ssl-certs.patch)
     ];
+    extraMeta.knownVulnerabilities = [ "Support for OpenSSL 1.0.2 ended with 2019." ];
   };
 
   openssl_1_1 = common {

From b7566d771544af8f581003455b87c32878e00933 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 21 Feb 2020 19:43:56 +0100
Subject: [PATCH 1250/4636] python3Packages.face_recognition: 1.2.3 -> 1.3.0

https://pypi.org/project/face-recognition/1.3.0/
---
 .../development/python-modules/face_recognition/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/face_recognition/default.nix b/pkgs/development/python-modules/face_recognition/default.nix
index 2856eeeab1b9..93502a296dc7 100644
--- a/pkgs/development/python-modules/face_recognition/default.nix
+++ b/pkgs/development/python-modules/face_recognition/default.nix
@@ -4,13 +4,13 @@
 
 buildPythonPackage rec {
   pname = "face_recognition";
-  version = "1.2.3";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     repo = pname;
     owner = "ageitgey";
-    rev = "634db2e4309a365cee2503cb65d6f2e88f519d1e";
-    sha256 = "06zw5hq417d5yp17zynhxhb73074lx2qy64fqfzf711rw5vrn2mx";
+    rev = "d34c622bf42e2c619505a4884017051ecf61ac77";
+    sha256 = "052878vnh3vbrsvmpgr0bx78k524dlxn47b2xakzbxk7dyjrgcli";
   };
 
   postPatch = ''

From e263acc115ffc75e46e1a2942bd4624de921fac3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 21 Feb 2020 18:56:01 +0000
Subject: [PATCH 1251/4636] trac: 1.4 -> 1.4.1

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

diff --git a/pkgs/tools/misc/trac/default.nix b/pkgs/tools/misc/trac/default.nix
index f41087ca3fdc..1d0f9a5d8288 100644
--- a/pkgs/tools/misc/trac/default.nix
+++ b/pkgs/tools/misc/trac/default.nix
@@ -16,12 +16,12 @@
 
 buildPythonApplication rec {
   pname = "trac";
-  version = "1.4";
+  version = "1.4.1";
 
   src = fetchPypi {
     inherit version;
     pname = "Trac";
-    sha256 = "1cg51rg0vb9vf23wgn28z3szlxhwnxprj5m0mvibqyypi123bvx1";
+    sha256 = "0d61ypn0j9wb8119bj3pj7s8swfjykdl0sz398p92k9bvxh4dayz";
   };
 
   prePatch = ''

From 349a991bfbdf85a7baa65a4e5bdfcc7320d78e43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Thu, 20 Feb 2020 23:50:26 +0100
Subject: [PATCH 1252/4636] mariadb-connector-c: add mysqlclient.pc pkgconfig
 symlink

---
 pkgs/servers/sql/mariadb/connector-c/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix
index af344d637217..fb41890d4328 100644
--- a/pkgs/servers/sql/mariadb/connector-c/default.nix
+++ b/pkgs/servers/sql/mariadb/connector-c/default.nix
@@ -41,6 +41,7 @@ stdenv.mkDerivation {
     ln -sv mariadb $out/lib/mysql
     ln -sv mariadb $out/include/mysql
     ln -sv mariadb_version.h $out/include/mariadb/mysql_version.h
+    ln -sv libmariadb.pc $out/lib/pkgconfig/mysqlclient.pc
   '';
 
   meta = {

From 75b79b76d846a3b507e21fcc1a6d7949955c8344 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 20 Feb 2020 22:10:42 -0800
Subject: [PATCH 1253/4636] pulseaudio-dlna: add missing setuptools dep

---
 .../audio/pulseaudio-dlna/default.nix         | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix
index a9f56cca0015..75990d593dfe 100644
--- a/pkgs/applications/audio/pulseaudio-dlna/default.nix
+++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix
@@ -16,10 +16,10 @@ assert vorbisSupport -> vorbisTools != null;
 
 let
   zeroconf = pythonPackages.callPackage ./zeroconf.nix { };
-
-in pythonPackages.buildPythonApplication {
+in
+pythonPackages.buildPythonApplication {
   pname = "pulseaudio-dlna";
-  version = "2017-11-01";
+  version = "unstable-2017-11-01";
 
   src = fetchFromGitHub {
     owner = "masmu";
@@ -28,12 +28,9 @@ in pythonPackages.buildPythonApplication {
     sha256 = "1dfn7036vrq49kxv4an7rayypnm5dlawsf02pfsldw877hzdamqk";
   };
 
-  # pulseaudio-dlna has no tests
-  doCheck = false;
-
   propagatedBuildInputs = with pythonPackages; [
     dbus-python docopt requests setproctitle protobuf psutil futures
-    chardet notify2 netifaces pyroute2 pygobject2 lxml ]
+    chardet notify2 netifaces pyroute2 pygobject2 lxml setuptools ]
     ++ [ zeroconf ]
     ++ stdenv.lib.optional mp3Support lame
     ++ stdenv.lib.optional opusSupport opusTools
@@ -42,12 +39,15 @@ in pythonPackages.buildPythonApplication {
     ++ stdenv.lib.optional soxSupport sox
     ++ stdenv.lib.optional vorbisSupport vorbisTools;
 
+  # upstream has no tests
+  checkPhase = ''
+    $out/bin/pulseaudio-dlna --help > /dev/null
+  '';
+
   meta = with stdenv.lib; {
     description = "A lightweight streaming server which brings DLNA / UPNP and Chromecast support to PulseAudio and Linux";
-    homepage = https://github.com/masmu/pulseaudio-dlna;
-
+    homepage = "https://github.com/masmu/pulseaudio-dlna";
     license = licenses.gpl3Plus;
-
     maintainers = with maintainers; [ mog ];
     platforms = platforms.linux;
   };

From 15ad2d77ddf152ad1633c4372f0fa75440312329 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 22 Feb 2020 00:12:59 +0200
Subject: [PATCH 1254/4636] abcde: use python3 eyeD3

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65a960a96302..69e3bd95fa65 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18119,7 +18119,7 @@ in
   aacgain = callPackage ../applications/audio/aacgain { };
 
   abcde = callPackage ../applications/audio/abcde {
-    inherit (pythonPackages) eyeD3;
+    inherit (python3Packages) eyeD3;
   };
 
   abiword = callPackage ../applications/office/abiword { };

From af12b02b902c9aa617a2d72c43b2afd123fbcf71 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 21 Feb 2020 23:31:20 +0000
Subject: [PATCH 1255/4636] grails: 4.0.1 -> 4.0.2

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

diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix
index 1c5557f76243..4086566f681f 100644
--- a/pkgs/development/web/grails/default.nix
+++ b/pkgs/development/web/grails/default.nix
@@ -11,11 +11,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "grails";
-  version = "4.0.1";
+  version = "4.0.2";
 
   src = fetchurl {
     url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip";
-    sha256 = "0igkzxqfm6lvp4s8w6kavdvjriq59q42jmj9ynbc669dvy6y6725";
+    sha256 = "0ry2z4xn0zmdr38k0aa9qiwvfg3q4yxd1wxdwmhzp1vd3g39cx49";
   };
 
   buildInputs = [ unzip ];

From 50fb52d4e1fcf854c43f59ea052ed13916d2983c Mon Sep 17 00:00:00 2001
From: Lengyel Balazs <ikervagyok@gmail.com>
Date: Sat, 22 Feb 2020 00:26:26 +0100
Subject: [PATCH 1256/4636] fix wireguard service as well after it got
 upstreamed.

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

diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index 7785861a730f..ff8e54a1ce20 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -435,7 +435,7 @@ in
           message = "networking.wireguard.interfaces.${interfaceName} peer «${peer.publicKey}» has both presharedKey and presharedKeyFile set, but only one can be used.";
         }) all_peers;
 
-    boot.extraModulePackages = [ kernel.wireguard ];
+    boot.extraModulePackages = optional (versionOlder kernel.kernel.version "5.6") kernel.wireguard;
     environment.systemPackages = [ pkgs.wireguard-tools ];
 
     systemd.services =

From eb8ae2166e9335add1555d96444d32b8a259c172 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 21 Feb 2020 18:59:26 -0500
Subject: [PATCH 1257/4636] gifski: 0.9.1 -> 0.10.2

---
 pkgs/tools/graphics/gifski/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix
index d5656db29a7e..3d1e2114196a 100644
--- a/pkgs/tools/graphics/gifski/default.nix
+++ b/pkgs/tools/graphics/gifski/default.nix
@@ -2,25 +2,22 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gifski";
-  version = "0.9.1";
+  version = "0.10.2";
 
   src = fetchFromGitHub {
     owner = "ImageOptim";
     repo = "gifski";
     rev = version;
-    sha256 = "0dl5725imb2a2s0fskdqlnh2207ryyi2v5gz37cr5mf6khz898p2";
+    sha256 = "0gsk1pagg89q1mi3d28q6dsnanncwphw9lrb7qybppw0vyvqlqbx";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0wngsd0pmmxlwzxmyp8pvphh1ijs5s9k1mkkv688xpc4b8w0z10j";
+  cargoSha256 = "0k7pzcll7hn2a354vviyj8dr0kq63cwsldgv303kwklmxji02d0v";
 
   nativeBuildInputs = [ pkgconfig ];
 
   meta = with stdenv.lib; {
     description = "GIF encoder based on libimagequant (pngquant)";
-    homepage = https://gif.ski/;
+    homepage = "https://gif.ski/";
     license = licenses.agpl3;
     maintainers = [ maintainers.marsam ];
   };

From 8f5956e63de82599d41992ef6b45379a70f7689c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 22 Feb 2020 00:12:32 +0000
Subject: [PATCH 1258/4636] ibus: 1.5.21 -> 1.5.22

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

diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index 4951074bc43a..644fd5eef3b2 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -51,13 +51,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "ibus";
-  version = "1.5.21";
+  version = "1.5.22";
 
   src = fetchFromGitHub {
     owner = "ibus";
     repo = "ibus";
     rev = version;
-    sha256 = "0fjbqj7d2g5c8i1wdggzhz269xisxv4xb1pa9swalm5p2b2vrjlx";
+    sha256 = "09ynn7gq84q18hhbg6wq2yrliwil42qbzxbwbpggry1s955jg5xb";
   };
 
   patches = [

From 2cb50840881482fc638e67e57fbb83e5984be649 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 22 Feb 2020 00:29:20 +0000
Subject: [PATCH 1259/4636] weechatScripts.weechat-autosort: 3.4 -> 3.8

---
 .../irc/weechat/scripts/weechat-autosort/default.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix
index 17e07f91c031..c39b7fe15963 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "weechat-autosort";
-  version = "3.4";
+  version = "3.8";
 
   src = fetchFromGitHub {
     owner = "de-vri-es";
     repo = pname;
     rev = version;
-    sha256 = "1sbr6ga9krrfgqznvsxjd3hdxzkvslh41ls5xrj7l2p4ws4gwlkn";
+    sha256 = "0a2gc8nhklvlivradhqy2pkymsqyy01pvzrmwg60cln8snmcqpd5";
   };
 
   passthru.scripts = [ "autosort.py" ];
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     description = "Autosort is a weechat script to automatically or manually keep your buffers sorted";
     homepage = https://github.com/de-vri-es/weechat-autosort;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ma27 ];
+    maintainers = with maintainers; [ ma27 emily ];
   };
 }

From b83257ca5f95f9d1119259fef759870eb0679b6f Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 21 Feb 2020 19:36:34 -0500
Subject: [PATCH 1260/4636] lhapdf.pdf_sets: fix download url

---
 pkgs/development/libraries/physics/lhapdf/pdf_sets.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
index 8f693a32e35c..2309e6671f85 100644
--- a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
+++ b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
@@ -6,7 +6,7 @@ let
       inherit name;
 
       src = fetchurl {
-        url = "https://www.hepforge.org/archive/lhapdf/pdfsets/6.2/${name}.tar.gz";
+        url = "http://lhapdfsets.web.cern.ch/lhapdfsets/current/${name}.tar.gz";
         inherit sha256;
       };
 

From 20e7a3d6a698f2c0a6edc9182cdcb9926075537f Mon Sep 17 00:00:00 2001
From: Wael Nasreddine <wael.nasreddine@gmail.com>
Date: Fri, 21 Feb 2020 14:39:23 -1000
Subject: [PATCH 1261/4636] yq-go: 3.1.0 -> 3.1.2 (#80762)

---
 pkgs/development/tools/yq-go/default.nix |  21 +-
 pkgs/development/tools/yq-go/deps.nix    | 363 -----------------------
 2 files changed, 6 insertions(+), 378 deletions(-)
 delete mode 100644 pkgs/development/tools/yq-go/deps.nix

diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix
index a230b0e7ce1e..eb507857ca83 100644
--- a/pkgs/development/tools/yq-go/default.nix
+++ b/pkgs/development/tools/yq-go/default.nix
@@ -1,30 +1,21 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
-# buildGoModule is not supported by the project
-# See https://github.com/mikefarah/yq/issues/227
-buildGoPackage rec {
+buildGoModule rec {
   pname = "yq-go";
-  version = "3.1.0";
-
-  goPackagePath = "github.com/mikefarah/yq/v3";
+  version = "3.1.2";
 
   src = fetchFromGitHub {
     owner = "mikefarah";
     rev = version;
     repo = "yq";
-    sha256 = "0hsb9m0pq2agsg7392r6h9sv5vqa2r7fl0ff1q24vpx8jlpq1vc6";
+    sha256 = "0gjxmnmphav8ms4zdkcjcsgrjs77ccwdfpc1qpxjp6fr2g4v5vmq";
   };
 
-  goDeps = ./deps.nix;
-
-  postInstall = ''
-    mv $bin/bin/v3 $bin/bin/yq
-  '';
+  modSha256 = "035w9bh96rr2x21w7bwwpngyng6839wglpgwf7gy8p6difvnn2v9";
 
   meta = with stdenv.lib; {
     description = "Portable command-line YAML processor";
-    homepage = http://mikefarah.github.io/yq/;
+    homepage = "https://mikefarah.gitbook.io/yq/";
     license = [ licenses.mit ];
     maintainers = [ maintainers.lewo ];
   };
diff --git a/pkgs/development/tools/yq-go/deps.nix b/pkgs/development/tools/yq-go/deps.nix
deleted file mode 100644
index 2ca5e0ffd1bb..000000000000
--- a/pkgs/development/tools/yq-go/deps.nix
+++ /dev/null
@@ -1,363 +0,0 @@
-# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
-[
-  {
-    goPackagePath = "github.com/BurntSushi/toml";
-    fetch = {
-      type = "git";
-      url = "https://github.com/BurntSushi/toml";
-      rev = "v0.3.1";
-      sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
-    };
-  }
-  {
-    goPackagePath = "github.com/armon/consul-api";
-    fetch = {
-      type = "git";
-      url = "https://github.com/armon/consul-api";
-      rev = "eb2c6b5be1b6";
-      sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9";
-    };
-  }
-  {
-    goPackagePath = "github.com/coreos/etcd";
-    fetch = {
-      type = "git";
-      url = "https://github.com/coreos/etcd";
-      rev = "v3.3.10";
-      sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl";
-    };
-  }
-  {
-    goPackagePath = "github.com/coreos/go-etcd";
-    fetch = {
-      type = "git";
-      url = "https://github.com/coreos/go-etcd";
-      rev = "v2.0.0";
-      sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj";
-    };
-  }
-  {
-    goPackagePath = "github.com/coreos/go-semver";
-    fetch = {
-      type = "git";
-      url = "https://github.com/coreos/go-semver";
-      rev = "v0.2.0";
-      sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0";
-    };
-  }
-  {
-    goPackagePath = "github.com/cpuguy83/go-md2man";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cpuguy83/go-md2man";
-      rev = "v1.0.10";
-      sha256 = "1bqkf2bvy1dns9zd24k81mh2p1zxsx2nhq5cj8dz2vgkv1xkh60i";
-    };
-  }
-  {
-    goPackagePath = "github.com/davecgh/go-spew";
-    fetch = {
-      type = "git";
-      url = "https://github.com/davecgh/go-spew";
-      rev = "v1.1.1";
-      sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
-    };
-  }
-  {
-    goPackagePath = "github.com/fsnotify/fsnotify";
-    fetch = {
-      type = "git";
-      url = "https://github.com/fsnotify/fsnotify";
-      rev = "v1.4.7";
-      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/hcl";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/hcl";
-      rev = "v1.0.0";
-      sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66";
-    };
-  }
-  {
-    goPackagePath = "github.com/inconshreveable/mousetrap";
-    fetch = {
-      type = "git";
-      url = "https://github.com/inconshreveable/mousetrap";
-      rev = "v1.0.0";
-      sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
-    };
-  }
-  {
-    goPackagePath = "github.com/kylelemons/godebug";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kylelemons/godebug";
-      rev = "v1.1.0";
-      sha256 = "0dkk3friykg8p6wgqryx6745ahhb9z1j740k7px9dac6v5xjp78c";
-    };
-  }
-  {
-    goPackagePath = "github.com/magiconair/properties";
-    fetch = {
-      type = "git";
-      url = "https://github.com/magiconair/properties";
-      rev = "v1.8.0";
-      sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
-    };
-  }
-  {
-    goPackagePath = "github.com/mitchellh/go-homedir";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mitchellh/go-homedir";
-      rev = "v1.1.0";
-      sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
-    };
-  }
-  {
-    goPackagePath = "github.com/mitchellh/mapstructure";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mitchellh/mapstructure";
-      rev = "v1.1.2";
-      sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr";
-    };
-  }
-  {
-    goPackagePath = "github.com/pelletier/go-toml";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pelletier/go-toml";
-      rev = "v1.2.0";
-      sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
-    };
-  }
-  {
-    goPackagePath = "github.com/pkg/errors";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pkg/errors";
-      rev = "v0.8.1";
-      sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
-    };
-  }
-  {
-    goPackagePath = "github.com/pmezard/go-difflib";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pmezard/go-difflib";
-      rev = "v1.0.0";
-      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
-    };
-  }
-  {
-    goPackagePath = "github.com/russross/blackfriday";
-    fetch = {
-      type = "git";
-      url = "https://github.com/russross/blackfriday";
-      rev = "v1.5.2";
-      sha256 = "0jzbfzcywqcrnym4gxlz6nphmm1grg6wsl4f0r9x384rn83wkj7c";
-    };
-  }
-  {
-    goPackagePath = "github.com/spf13/afero";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/afero";
-      rev = "v1.1.2";
-      sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k";
-    };
-  }
-  {
-    goPackagePath = "github.com/spf13/cast";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/cast";
-      rev = "v1.3.0";
-      sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5";
-    };
-  }
-  {
-    goPackagePath = "github.com/spf13/cobra";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/cobra";
-      rev = "v0.0.5";
-      sha256 = "0z4x8js65mhwg1gf6sa865pdxfgn45c3av9xlcc1l3xjvcnx32v2";
-    };
-  }
-  {
-    goPackagePath = "github.com/spf13/jwalterweatherman";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/jwalterweatherman";
-      rev = "v1.0.0";
-      sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8";
-    };
-  }
-  {
-    goPackagePath = "github.com/spf13/pflag";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/pflag";
-      rev = "v1.0.3";
-      sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd";
-    };
-  }
-  {
-    goPackagePath = "github.com/spf13/viper";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/viper";
-      rev = "v1.3.2";
-      sha256 = "1829hvf805kda65l59r17wvid7y0vr390s23zfhf4w7vdb4wp3zh";
-    };
-  }
-  {
-    goPackagePath = "github.com/stretchr/testify";
-    fetch = {
-      type = "git";
-      url = "https://github.com/stretchr/testify";
-      rev = "v1.2.2";
-      sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
-    };
-  }
-  {
-    goPackagePath = "github.com/ugorji/go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ugorji/go";
-      rev = "d75b2dcb6bc8";
-      sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps";
-    };
-  }
-  {
-    goPackagePath = "github.com/xordataexchange/crypt";
-    fetch = {
-      type = "git";
-      url = "https://github.com/xordataexchange/crypt";
-      rev = "b2862e3d0a77";
-      sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev = "87dc89f01550";
-      sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/mod";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/mod";
-      rev = "c90efee705ee";
-      sha256 = "0i5md645rmcy5z5ij9ng428k9rz4g3k1kjy3blsq1264rn426gdf";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev = "3b0461eec859";
-      sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/sync";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sync";
-      rev = "112230192c58";
-      sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev = "97732733099d";
-      sha256 = "118hkp01i4z1f5h6hcjm0ff2ngqhrzj1f7731n0kw8dr6hvbx0sw";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/text";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/text";
-      rev = "v0.3.0";
-      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/tools";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/tools";
-      rev = "04c2e8eff935";
-      sha256 = "0xfif9h5ssf5f7f65k35zr5n6z524zv65kv68zg2qybnmb3c008d";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/xerrors";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/xerrors";
-      rev = "1b5146add898";
-      sha256 = "0w2akj91krxjag0xdhsg78470888nicc5ismc2ap9jqpss6v1zih";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/check.v1";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/check.v1";
-      rev = "20d25e280405";
-      sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/imdario/mergo.v0";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/imdario/mergo.v0";
-      rev = "v0.3.7";
-      sha256 = "05ir0jj74w0yfi1lrhjd97v759in1dpsma64cgmbiqvyp6hfmmf8";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/op/go-logging.v1";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/op/go-logging.v1";
-      rev = "b2cb9fa56473";
-      sha256 = "01a6lkpj5p82gplddh55az194s9y3014p4j8x4zc8yv886z9c8gn";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/yaml.v2";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/yaml.v2";
-      rev = "v2.2.2";
-      sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/yaml.v3";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/yaml.v3";
-      rev = "4206685974f2";
-      sha256 = "1ff5fd8x45cay9100ds63hxd32s7czsrric0ql6a1jrxczsgqk1g";
-    };
-  }
-]

From d38b8d8ff7cc6bee57d7cbec85a9367760cf1d10 Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Tue, 28 Jan 2020 09:59:40 -0500
Subject: [PATCH 1262/4636] pythonPackages.cvxpy: init at 1.0.25

Convex optimization problem modeler in Python.
Dependency of qiskit-aer.
---
 .../python-modules/cvxpy/default.nix          | 49 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  8 +--
 2 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/python-modules/cvxpy/default.nix

diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix
new file mode 100644
index 000000000000..2a77f45217a0
--- /dev/null
+++ b/pkgs/development/python-modules/cvxpy/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, pythonOlder
+, buildPythonPackage
+, fetchPypi
+, cvxopt
+, ecos
+, multiprocess
+, numpy
+, osqp
+, scipy
+, scs
+, six
+  # Check inputs
+, nose
+}:
+
+buildPythonPackage rec {
+  pname = "cvxpy";
+  version = "1.0.25";
+
+  disabled = pythonOlder "3.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "04zalvc8lckjfzm3i2ir32ib5pd6v7hxqqcnsnq6fw40vffm4dc5";
+  };
+
+  propagatedBuildInputs = [
+    cvxopt
+    ecos
+    multiprocess
+    osqp
+    scs
+    six
+  ];
+
+  checkInputs = [ nose ];
+  checkPhase = ''
+    nosetests
+  '';
+
+  meta = {
+    description = "A domain-specific language for modeling convex optimization problems in Python.";
+    homepage = "https://www.cvxpy.org/";
+    downloadPage = "https://github.com/cvxgrp/cvxpy/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ drewrisinger ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 84672f066006..c00033b3a720 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1496,7 +1496,7 @@ in {
   webapp2 = callPackage ../development/python-modules/webapp2 { };
 
   wordcloud = callPackage ../development/python-modules/wordcloud { };
-  
+
   wrf-python = callPackage ../development/python-modules/wrf-python { };
 
   pyunbound = callPackage ../tools/networking/unbound/python.nix { };
@@ -1690,7 +1690,7 @@ in {
 
   asn1ate = callPackage ../development/python-modules/asn1ate { };
 
-  atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { };  
+  atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { };
 
   atomiclong = callPackage ../development/python-modules/atomiclong { };
 
@@ -1904,6 +1904,8 @@ in {
 
   cvxopt = callPackage ../development/python-modules/cvxopt { };
 
+  cvxpy = callPackage ../development/python-modules/cvxpy { };
+
   cycler = callPackage ../development/python-modules/cycler { };
 
   cysignals = callPackage ../development/python-modules/cysignals { };
@@ -4406,7 +4408,7 @@ in {
 
   nbconvert = callPackage ../development/python-modules/nbconvert { };
 
-  nbformat = if isPy3k then 
+  nbformat = if isPy3k then
     callPackage ../development/python-modules/nbformat { }
   else callPackage ../development/python-modules/nbformat/2.nix { };
 

From f14a49c5dd693de07c7c1bd301f9f019dad74d96 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 22 Feb 2020 00:56:40 +0000
Subject: [PATCH 1263/4636] kubectx: 0.7.1 -> 0.8.0

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

diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix
index b3116a9b2f9d..87807355413b 100644
--- a/pkgs/development/tools/kubectx/default.nix
+++ b/pkgs/development/tools/kubectx/default.nix
@@ -4,13 +4,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   pname = "kubectx";
-  version = "0.7.1";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "ahmetb";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0mv40jh94by99i5wkf3p52wk4l68hvly1k5gnn7zsy9avc8fjd0p";
+    sha256 = "1wkvmic29mkzfs6619wjs3mya8ffigwv9n1w9y7zkfvpi8gxa0a6";
   };
 
   buildInputs = [ makeWrapper ];

From 8ba4961b1aca6680a76e750e8b934937a5771761 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 21 Feb 2020 20:00:00 -0500
Subject: [PATCH 1264/4636] sudo-font: 0.41 -> 0.42

---
 pkgs/data/fonts/sudo/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix
index 3906353d82b8..8becdf83f5dc 100644
--- a/pkgs/data/fonts/sudo/default.nix
+++ b/pkgs/data/fonts/sudo/default.nix
@@ -1,19 +1,21 @@
 { lib, fetchzip }:
 
 let
-  version = "0.41";
+  version = "0.42";
 in fetchzip {
   name = "sudo-font-${version}";
   url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip";
-  sha256 = "055sz9jg3fg7ypk9nia4dl9haaaq3w8zx5c2cdi3iq9kj8k5gg53";
+  sha256 = "1rqpwihf2sakrhkaw041r3xc9fhafaqn22n79haqkmwv4vmnspch";
 
   postFetch = ''
-    mkdir -p $out/share/fonts/truetype/
+    mkdir -p $out/share/fonts/
     unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/
+    unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff/
+    unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2/
   '';
   meta = with lib; {
     description = "Font for programmers and command line users";
-    homepage = https://www.kutilek.de/sudo-font/;
+    homepage = "https://www.kutilek.de/sudo-font/";
     license = licenses.ofl;
     maintainers = with maintainers; [ dtzWill ];
     platforms = platforms.all;

From 08191abfa5375f1929cc4348728e7d369244033f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 22 Feb 2020 01:30:53 +0000
Subject: [PATCH 1265/4636] luigi: 2.8.11 -> 2.8.12

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

diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix
index def13e2b9d06..af20be1b0da6 100644
--- a/pkgs/applications/networking/cluster/luigi/default.nix
+++ b/pkgs/applications/networking/cluster/luigi/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "luigi";
-  version = "2.8.11";
+  version = "2.8.12";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "17nc5xrqp6hp3ayscvdpsiiga8gsfpa4whsk0n97gzk5qpndrcy2";
+    sha256 = "1p83mxqs7w5v27a58ps7wji5mlyfz66cpkbyrndix0pv9hdyzpxn";
   };
 
   propagatedBuildInputs = with python3Packages; [ dateutil tornado_4 python-daemon boto3 ];

From 951ceca9df63a16195920b919675745029d57b4b Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Fri, 21 Feb 2020 20:31:35 -0500
Subject: [PATCH 1266/4636] mariadb: do not delete runtime plugins from package

---
 pkgs/servers/sql/mariadb/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index c86ed3defbcc..59d357eba7b9 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -87,7 +87,6 @@ common = rec { # attributes common to both builds
     # Remove Development components. Need to use libmysqlclient.
     rm "$out"/lib/mysql/plugin/daemon_example.ini
     rm "$out"/lib/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a}
-    rm "$out"/lib/mysql/plugin/{caching_sha2_password.so,dialog.so,mysql_clear_password.so,sha256_password.so}
     rm "$out"/bin/{mariadb_config,mysql_config}
     rm -r $out/include
     rm -r $out/lib/pkgconfig

From 05a564d48c120a1b7f9b8e958f8ca055fa2a2b53 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Sat, 22 Feb 2020 11:18:41 +0900
Subject: [PATCH 1267/4636] nix-query-tree-viewer: init at 0.2.0

---
 .../nix/nix-query-tree-viewer/default.nix     | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/nix/nix-query-tree-viewer/default.nix

diff --git a/pkgs/tools/nix/nix-query-tree-viewer/default.nix b/pkgs/tools/nix/nix-query-tree-viewer/default.nix
new file mode 100644
index 000000000000..de0b88378a48
--- /dev/null
+++ b/pkgs/tools/nix/nix-query-tree-viewer/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, rustPlatform, glib, gtk3, wrapGAppsHook }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "nix-query-tree-viewer";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "cdepillabout";
+    repo  = "nix-query-tree-viewer";
+    rev = "v${version}";
+    sha256 = "0vjcllhgq64n7mwxvyhmbqd6fpa9lwrpsnggc1kdlgd14ggq6jj6";
+  };
+
+  nativeBuildInputs = [
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    glib
+    gtk3
+  ];
+
+  cargoSha256 = "1pbyi7knqmqxbpi3jhl492is9zkaxdpdnmbm11nqwc1nvvbjblzc";
+
+  meta = with stdenv.lib; {
+    description = "GTK viewer for the output of `nix store --query --tree`";
+    homepage    = "https://github.com/cdepillabout/nix-query-tree-viewer";
+    license     = with licenses; [ mit ];
+    maintainers = with maintainers; [ cdepillabout ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 025c6a4631cc..4fba286384e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25217,6 +25217,8 @@ in
     nix-prefetch-svn
     nix-prefetch-scripts;
 
+  nix-query-tree-viewer = callPackage ../tools/nix/nix-query-tree-viewer { };
+
   nix-update-source = callPackage ../tools/package-management/nix-update-source {};
 
   nix-script = callPackage ../tools/nix/nix-script {};

From c29436c38858f60c37d874dc960f9451cb8369f9 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Sat, 22 Feb 2020 08:54:36 +0200
Subject: [PATCH 1268/4636] exiftool: 11.70 -> 11.85

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9401a76ca3e8..f1bd3ce42748 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9478,11 +9478,11 @@ let
   # TODO: use CPAN version
   ImageExifTool = buildPerlPackage {
     pname = "Image-ExifTool";
-    version = "11.70";
+    version = "11.85";
 
     src = fetchurl {
-      url = "https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-11.70.tar.gz";
-      sha256 = "1z0s0zvga24m9dzp1lnrsvwv9qmvn21ifd9in520sd54ld774ifp";
+      url = "https://exiftool.org/Image-ExifTool-11.85.tar.gz";
+      sha256 = "15zqm0ly2b3paqg0ym44ib2mvh6k18a9q5rvdirwipqa127al2lb";
     };
 
     nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang;
@@ -9492,7 +9492,7 @@ let
 
     meta = with stdenv.lib; {
       description = "A tool to read, write and edit EXIF meta information";
-      homepage = https://www.sno.phy.queensu.ca/~phil/exiftool/;
+      homepage = "https://exiftool.org/";
 
       longDescription = ''
         ExifTool is a platform-independent Perl library plus a command-line

From 66df83f4f7a659532ef30538890d3ed6034dfe65 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 22 Feb 2020 08:11:03 +0000
Subject: [PATCH 1269/4636] cassowary: 0.3.0 -> 0.7.0

---
 pkgs/tools/networking/cassowary/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix
index bc1f9cebb42f..6156f43b04b8 100644
--- a/pkgs/tools/networking/cassowary/default.nix
+++ b/pkgs/tools/networking/cassowary/default.nix
@@ -1,21 +1,23 @@
-{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "cassowary";
-  version = "0.3.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "rogerwelin";
     repo = pname;
-    rev = "33b7e81a5d147980f4ddc689818df2b071f6ab4e";
-    sha256 = "01cdmh2v9rz8rna08hdsddllck6zp9wcrhxdy6hs77zfsbzyfflx";
+    rev = "v${version}";
+    sha256 = "0p5vcs25h5nj36dm9yjmdjymcq0zldm3zlqfppxcjx862h48k8zj";
   };
 
   modSha256 = "1iylnnmj5slji89pkb3shp4xqar1zbpl7bzwddbzpp8y52fmsv1c";
 
+  buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
+
   meta = with lib; {
     homepage = "https://github.com/rogerwelin/cassowary";
-    description = "Modern cross-platform HTTP load-testing tool written in Go ";
+    description = "Modern cross-platform HTTP load-testing tool written in Go";
     license = licenses.mit;
     maintainers = with maintainers; [ hugoreeves ];
     platforms = platforms.unix;

From 3d95727892c347ef056f49923fcdc8c248cf282a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 21 Feb 2020 18:32:54 +0000
Subject: [PATCH 1270/4636] uftrace: 0.9.3 -> 0.9.4

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

diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix
index 796d3509c1c4..a364f2eed0c7 100644
--- a/pkgs/development/tools/uftrace/default.nix
+++ b/pkgs/development/tools/uftrace/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "uftrace";
-  version = "0.9.3";
+  version = "0.9.4";
 
   src = fetchFromGitHub {
     owner = "namhyung";
     repo = "uftrace";
     rev = "v${version}";
-    sha256 = "0m5f4azm2gdl0li7dfq00ys07j8r2lfjkbb4rx5l7q0kj67ldr7s";
+    sha256 = "09zj4lgsbx0yp4i8ij9nh7wzylfcj421jzf1kkc2zpnn5hgynsb5";
   };
 
   postUnpack = ''

From 25b70da19d136961742255dc4285900e885d2a52 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Sat, 22 Feb 2020 16:07:19 +0800
Subject: [PATCH 1271/4636] restic: fix cross compilation

Remove the custom build phase
---
 pkgs/tools/backup/restic/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index 1eb02e9a4834..345d14fd10b9 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub, nixosTests}:
 
 buildGoPackage rec {
   pname = "restic";
@@ -13,20 +13,19 @@ buildGoPackage rec {
     sha256 = "0lydll93n1lcn1fl669b9cikmzz9d6vfpc8ky3ng5fi8kj3v1dz7";
   };
 
-  buildPhase = ''
-    cd go/src/${goPackagePath}
-    go run build.go
-  '';
-
   passthru.tests.restic = nixosTests.restic;
 
+  # Use a custom install phase here as by default the
+  # build-release-binaries and prepare-releases binaries are
+  # installed.
   installPhase = ''
+    mkdir -p "$bin/bin"
+    cp go/bin/restic "$bin/bin"
+  '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
     mkdir -p \
-      $bin/bin \
       $bin/etc/bash_completion.d \
       $bin/share/zsh/vendor-completions \
       $bin/share/man/man1
-    cp restic $bin/bin/
     $bin/bin/restic generate \
       --bash-completion $bin/etc/bash_completion.d/restic.sh \
       --zsh-completion $bin/share/zsh/vendor-completions/_restic \

From 82b5cef58dd31bf8bb484e7e169f5c838f4d2ae1 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Tue, 10 Dec 2019 20:24:55 +0300
Subject: [PATCH 1272/4636] php: drop support libmysqlclient

---
 pkgs/development/interpreters/php/default.nix | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 911795cc1922..4b21bec6a3fd 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -1,6 +1,6 @@
 # pcre functionality is tested in nixos/tests/php-pcre.nix
 { lib, stdenv, fetchurl, autoconf, bison, libtool, pkgconfig, re2c
-, libmysqlclient, libxml2, readline, zlib, curl, postgresql, gettext
+, libxml2, readline, zlib, curl, postgresql, gettext
 , openssl, pcre, pcre2, sqlite, config, libjpeg, libpng, freetype
 , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC
 , uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2
@@ -19,8 +19,8 @@ let
   , ldapSupport ? config.php.ldap or true
   , mhashSupport ? config.php.mhash or false
   , mysqlndSupport ? config.php.mysqlnd or true
-  , mysqliSupport ? config.php.mysqli or true
-  , pdo_mysqlSupport ? config.php.pdo_mysql or true
+  , mysqliSupport ? (config.php.mysqli or true) && (mysqlndSupport)
+  , pdo_mysqlSupport ? (config.php.pdo_mysql or true) && (mysqlndSupport)
   , libxml2Support ? config.php.libxml2 or true
   , apxs2Support ? config.php.apxs2 or (!stdenv.isDarwin)
   , embedSupport ? config.php.embed or false
@@ -64,7 +64,6 @@ let
   }:
 
     let
-      mysqlBuildInputs = optional (!mysqlndSupport) libmysqlclient;
       libmcrypt' = libmcrypt.override { disablePosixThreads = true; };
     in stdenv.mkDerivation {
 
@@ -95,8 +94,6 @@ let
         ++ optional postgresqlSupport postgresql
         ++ optional pdo_odbcSupport unixODBC
         ++ optional pdo_pgsqlSupport postgresql
-        ++ optionals pdo_mysqlSupport mysqlBuildInputs
-        ++ optionals mysqliSupport mysqlBuildInputs
         ++ optional gmpSupport gmp
         ++ optional gettextSupport gettext
         ++ optional intlSupport icu
@@ -152,11 +149,9 @@ let
       ++ optional postgresqlSupport "--with-pgsql=${postgresql}"
       ++ optional pdo_odbcSupport "--with-pdo-odbc=unixODBC,${unixODBC}"
       ++ optional pdo_pgsqlSupport "--with-pdo-pgsql=${postgresql}"
-      ++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else libmysqlclient}"
-      ++ optionals mysqliSupport [
-        "--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${libmysqlclient}/bin/mysql_config"}"
-      ]
-      ++ optional ( pdo_mysqlSupport || mysqliSupport ) "--with-mysql-sock=/run/mysqld/mysqld.sock"
+      ++ optional (pdo_mysqlSupport && mysqlndSupport) "--with-pdo-mysql=mysqlnd"
+      ++ optional (mysqliSupport && mysqlndSupport) "--with-mysqli=mysqlnd"
+      ++ optional (pdo_mysqlSupport || mysqliSupport) "--with-mysql-sock=/run/mysqld/mysqld.sock"
       ++ optional bcmathSupport "--enable-bcmath"
       # FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108.
       ++ optionals (gdSupport && versionAtLeast version "7.4") [

From 5dae87ec2df67e498153877702dd842bff3409ad Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Tue, 10 Dec 2019 20:25:36 +0300
Subject: [PATCH 1273/4636] php: remove unused configureFlags

---
 pkgs/development/interpreters/php/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 4b21bec6a3fd..9781bf43c7ef 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -211,9 +211,6 @@ let
 
         export EXTENSION_DIR=$out/lib/php/extensions
 
-        configureFlags+=(--with-config-file-path=$out/etc \
-          --includedir=$dev/include)
-
         ./buildconf --force
       '';
 

From a74fb5a1afb59f0300c73019e75768f28692bce6 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Tue, 10 Dec 2019 20:26:58 +0300
Subject: [PATCH 1274/4636] php: add option ipv6Support

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

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 9781bf43c7ef..c33492948cc0 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -61,6 +61,7 @@ let
   , xmlrpcSupport ? (config.php.xmlrpc or false) && (libxml2Support)
   , cgotoSupport ? config.php.cgoto or false
   , valgrindSupport ? (config.php.valgrind or true) && (versionAtLeast version "7.2")
+  , ipv6Support ? config.php.ipv6 or true
   }:
 
     let
@@ -193,7 +194,8 @@ let
       ++ optional (!pharSupport) "--disable-phar"
       ++ optional xmlrpcSupport "--with-xmlrpc"
       ++ optional cgotoSupport "--enable-re2c-cgoto"
-      ++ optional valgrindSupport "--with-valgrind=${valgrind.dev}";
+      ++ optional valgrindSupport "--with-valgrind=${valgrind.dev}"
+      ++ optional (!ipv6Support) "--disable-ipv6";
 
       hardeningDisable = [ "bindnow" ];
 

From ac3c11a980a2e9c0ce69eba8b6c10f10190180ee Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Tue, 10 Dec 2019 20:28:01 +0300
Subject: [PATCH 1275/4636] php: add option pearSupport

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

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index c33492948cc0..e62d461b5c7a 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -62,6 +62,7 @@ let
   , cgotoSupport ? config.php.cgoto or false
   , valgrindSupport ? (config.php.valgrind or true) && (versionAtLeast version "7.2")
   , ipv6Support ? config.php.ipv6 or true
+  , pearSupport ? (config.php.pear or true) && (libxml2Support)
   }:
 
     let
@@ -195,7 +196,8 @@ let
       ++ optional xmlrpcSupport "--with-xmlrpc"
       ++ optional cgotoSupport "--enable-re2c-cgoto"
       ++ optional valgrindSupport "--with-valgrind=${valgrind.dev}"
-      ++ optional (!ipv6Support) "--disable-ipv6";
+      ++ optional (!ipv6Support) "--disable-ipv6"
+      ++ optional (pearSupport && libxml2Support) "--with-pear=$(out)/lib/php/pear";
 
       hardeningDisable = [ "bindnow" ];
 

From 0ee5d55d3b3a014dba4a76e52901e638387c3ba0 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Tue, 10 Dec 2019 20:34:06 +0300
Subject: [PATCH 1276/4636] php: use external GD library

---
 pkgs/development/interpreters/php/default.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index e62d461b5c7a..73fb29a5c864 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -1,9 +1,10 @@
 # pcre functionality is tested in nixos/tests/php-pcre.nix
 { lib, stdenv, fetchurl, autoconf, bison, libtool, pkgconfig, re2c
 , libxml2, readline, zlib, curl, postgresql, gettext
-, openssl, pcre, pcre2, sqlite, config, libjpeg, libpng, freetype
+, openssl, pcre, pcre2, sqlite, config
 , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC
 , uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2
+, gd, freetype, libXpm, libjpeg, libpng, libwebp
 , libzip, valgrind, oniguruma
 }:
 
@@ -84,7 +85,7 @@ let
         ++ optionals imapSupport [ uwimap openssl pam ]
         ++ optionals curlSupport [ curl openssl ]
         ++ optionals ldapSupport [ openldap openssl ]
-        ++ optionals gdSupport [ libpng libjpeg freetype ]
+        ++ optionals gdSupport [ gd freetype libXpm libjpeg libpng libwebp ]
         ++ optionals opensslSupport [ openssl openssl.dev ]
         ++ optional apxs2Support apacheHttpd
         ++ optional (ldapSupport && stdenv.isLinux) cyrus_sasl
@@ -155,17 +156,22 @@ let
       ++ optional (mysqliSupport && mysqlndSupport) "--with-mysqli=mysqlnd"
       ++ optional (pdo_mysqlSupport || mysqliSupport) "--with-mysql-sock=/run/mysqld/mysqld.sock"
       ++ optional bcmathSupport "--enable-bcmath"
-      # FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108.
       ++ optionals (gdSupport && versionAtLeast version "7.4") [
         "--enable-gd"
+        "--with-external-gd=${gd.dev}"
+        "--with-webp=${libwebp}"
         "--with-jpeg=${libjpeg.dev}"
+        "--with-xpm=${libXpm.dev}"
         "--with-freetype=${freetype.dev}"
         "--enable-gd-jis-conv"
       ] ++ optionals (gdSupport && versionOlder version "7.4") [
-        "--with-gd"
-        "--with-freetype-dir=${freetype.dev}"
-        "--with-png-dir=${libpng.dev}"
+        "--with-gd=${gd.dev}"
+        "--with-webp-dir=${libwebp}"
         "--with-jpeg-dir=${libjpeg.dev}"
+        "--with-png-dir=${libpng.dev}"
+        "--with-freetype-dir=${freetype.dev}"
+        "--with-xpm-dir=${libXpm.dev}"
+        "--enable-gd-jis-conv"
       ]
       ++ optional gmpSupport "--with-gmp=${gmp.dev}"
       ++ optional soapSupport "--enable-soap"

From ffe90532f79efeb5c58a5ddf0b4beab02e89be47 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Tue, 10 Dec 2019 20:40:33 +0300
Subject: [PATCH 1277/4636] php: update build configuration

---
 pkgs/development/interpreters/php/default.nix | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 73fb29a5c864..0e4d83c1352e 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -1,7 +1,8 @@
 # pcre functionality is tested in nixos/tests/php-pcre.nix
-{ lib, stdenv, fetchurl, autoconf, bison, libtool, pkgconfig, re2c
+{ config, lib, stdenv, fetchurl
+, autoconf, automake, bison, file, flex, libtool, pkgconfig, re2c
 , libxml2, readline, zlib, curl, postgresql, gettext
-, openssl, pcre, pcre2, sqlite, config
+, openssl, pcre, pcre2, sqlite
 , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC
 , uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2
 , gd, freetype, libXpm, libjpeg, libpng, libwebp
@@ -72,11 +73,14 @@ let
 
       inherit version;
 
-      name = "php-${version}";
+      pname = "php";
 
       enableParallelBuilding = true;
 
-      nativeBuildInputs = [ autoconf bison libtool pkgconfig re2c ];
+      nativeBuildInputs = [
+        autoconf automake bison file flex libtool pkgconfig re2c
+      ];
+
       buildInputs = [ ]
         ++ optional (versionOlder version "7.3") pcre
         ++ optional (versionAtLeast version "7.3") pcre2
@@ -138,7 +142,6 @@ let
       ++ optional (libxml2Support && (versionOlder version "7.4")) "--with-libxml-dir=${libxml2.dev}"
       ++ optional (!libxml2Support) [
         "--disable-dom"
-        "--disable-libxml"
         (if (versionOlder version "7.4") then "--disable-libxml" else "--without-libxml")
         "--disable-simplexml"
         "--disable-xml"
@@ -217,11 +220,17 @@ let
             --replace '@PHP_LDFLAGS@' ""
         done
 
-        #[[ -z "$libxml2" ]] || addToSearchPath PATH $libxml2/bin
+        substituteInPlace ./build/libtool.m4 --replace /usr/bin/file ${file}/bin/file
 
         export EXTENSION_DIR=$out/lib/php/extensions
 
-        ./buildconf --force
+        ./buildconf --copy --force
+
+        if test -f $src/genfiles; then
+          ./genfiles
+        fi
+      '' + optionalString stdenv.isDarwin ''
+        substituteInPlace configure --replace "-lstdc++" "-lc++"
       '';
 
       postInstall = ''
@@ -233,8 +242,8 @@ let
         mkdir -p $dev/bin $dev/share/man/man1
         mv $out/bin/phpize $out/bin/php-config $dev/bin/
         mv $out/share/man/man1/phpize.1.gz \
-          $out/share/man/man1/php-config.1.gz \
-          $dev/share/man/man1/
+           $out/share/man/man1/php-config.1.gz \
+           $dev/share/man/man1/
       '';
 
       src = fetchurl {
@@ -253,10 +262,6 @@ let
 
       patches = [ ./fix-paths-php7.patch ] ++ extraPatches;
 
-      postPatch = optional stdenv.isDarwin ''
-        substituteInPlace configure --replace "-lstdc++" "-lc++"
-      '';
-
       stripDebugList = "bin sbin lib modules";
 
       outputs = [ "out" "dev" ];

From e4f17a2b17f85117817805d30cd0f71240c8dcc6 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Thu, 6 Feb 2020 14:10:05 +0300
Subject: [PATCH 1278/4636] mariadb: 10.3.20 -> 10.3.22

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

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index c86ed3defbcc..ef7221a5051f 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -19,14 +19,14 @@ mariadb = server // {
 };
 
 common = rec { # attributes common to both builds
-  version = "10.3.20";
+  version = "10.3.22";
 
   src = fetchurl {
     urls = [
       "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz"
       "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz"
     ];
-    sha256 = "14n4zfpwhvafz02r95bidmkwq2bz9jj3safqni1h21jfd0nqz0ak";
+    sha256 = "1iyf1hl82nqsci5h327a537rvdrc5qcbrd1v3fc4cxy2pmfha01j";
     name   = "mariadb-${version}.tar.gz";
   };
 

From c6d159d6964b5a4b9a4828082ceefd8e368e70fa Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Thu, 6 Feb 2020 14:25:28 +0300
Subject: [PATCH 1279/4636] mariadb: build server with NUMA

---
 pkgs/servers/sql/mariadb/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index ef7221a5051f..38e1857d7384 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, zlib, xz, lzo, lz4, bzip2, snappy
 , libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl
-, libaio, libevent, jemalloc, cracklib, systemd, numactl, perl
+, libaio, libevent, jemalloc, cracklib, systemd, perl
 , fixDarwinDylibNames, cctools, CoreServices, less
+, numactl # NUMA Support
 , withoutClient ? false
 }:
 
@@ -164,6 +165,8 @@ server = stdenv.mkDerivation (common // {
     "-DWITH_INNODB_DISALLOW_WRITES=ON"
     "-DWITHOUT_EXAMPLE=1"
     "-DWITHOUT_FEDERATED=1"
+  ] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) [
+    "-DWITH_NUMA=ON"
   ] ++ optionals withoutClient [
     "-DWITHOUT_CLIENT=ON"
   ] ++ optionals stdenv.hostPlatform.isDarwin [

From 982a23de945a9b89c6f69213a39faf0c676f00b1 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Thu, 6 Feb 2020 16:33:59 +0300
Subject: [PATCH 1280/4636] mariadb: add needed packages

---
 pkgs/servers/sql/mariadb/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 38e1857d7384..1f5c9c414571 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -3,6 +3,7 @@
 , libaio, libevent, jemalloc, cracklib, systemd, perl
 , fixDarwinDylibNames, cctools, CoreServices, less
 , numactl # NUMA Support
+, withStorageMroonga ? true, kytea, msgpack, zeromq
 , withoutClient ? false
 }:
 
@@ -145,6 +146,7 @@ server = stdenv.mkDerivation (common // {
     xz lzo lz4 bzip2 snappy
     libxml2 boost judy libevent cracklib
   ] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) numactl
+    ++ optionals withStorageMroonga [ kytea msgpack zeromq ]
     ++ optional stdenv.hostPlatform.isLinux linux-pam
     ++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv;
 
@@ -167,6 +169,8 @@ server = stdenv.mkDerivation (common // {
     "-DWITHOUT_FEDERATED=1"
   ] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) [
     "-DWITH_NUMA=ON"
+  ] ++ optional (!withStorageMroonga) [
+    "-DWITHOUT_MROONGA=ON"
   ] ++ optionals withoutClient [
     "-DWITHOUT_CLIENT=ON"
   ] ++ optionals stdenv.hostPlatform.isDarwin [
@@ -182,7 +186,6 @@ server = stdenv.mkDerivation (common // {
     chmod +x "$out"/bin/wsrep_sst_common
     rm "$out"/bin/{mysql_client_test,mysqltest}
     rm -r "$out"/data # Don't need testing data
-    mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql
   '' + optionalString withoutClient ''
     ${ # We don't build with GSSAPI on Darwin
       optionalString (!stdenv.hostPlatform.isDarwin) ''
@@ -191,6 +194,8 @@ server = stdenv.mkDerivation (common // {
     }
     rm "$out"/lib/mysql/plugin/client_ed25519.so
     rm "$out"/lib/{libmysqlclient${libExt},libmysqlclient_r${libExt}}
+  '' + optionalString withStorageMroonga ''
+    mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql
   '' + optionalString (!stdenv.hostPlatform.isDarwin) ''
     sed -i 's/-mariadb/-mysql/' "$out"/bin/galera_new_cluster
   '';

From de4f68d8fa62a68614e42dfebbbaa556c1a6ddbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 22 Feb 2020 10:05:45 +0100
Subject: [PATCH 1281/4636] release-combined: readd firefox-esr test

It was added in PR #79786 (7a625e7) and then removed in commit 2de3caf
(apparently unintentionally as a rebase conflict).

_I think the ordering used by Eelco would sort the line this way._
---
 nixos/release-combined.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index a2c78752581c..fb2743e178cb 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -64,6 +64,7 @@ in rec {
       "nixos.tests.docker.x86_64-linux"
       "nixos.tests.ecryptfs.x86_64-linux"
       "nixos.tests.env.x86_64-linux"
+      "nixos.tests.firefox-esr.x86_64-linux"
       "nixos.tests.firefox.x86_64-linux"
       "nixos.tests.firewall.x86_64-linux"
       "nixos.tests.fontconfig-default-fonts.x86_64-linux"

From ea79a830dcf9c0059656da7f52835d2663d5c436 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 22 Feb 2020 10:43:26 +0100
Subject: [PATCH 1282/4636] release-combined.tested: readd boot.biosUsb test

It has been commented-out for some time and now removed
in commit 2de3caf, but it seems reliable in past months:
https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.boot.biosUsb.x86_64-linux/all
so I can't see why not re-add it.  Close #15690.
---
 nixos/release-combined.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index fb2743e178cb..9377a931a75e 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -55,6 +55,7 @@ in rec {
       "nixos.ova.x86_64-linux"
       "nixos.sd_image.aarch64-linux"
       "nixos.tests.boot.biosCdrom.x86_64-linux"
+      "nixos.tests.boot.biosUsb.x86_64-linux"
       "nixos.tests.boot-stage1.x86_64-linux"
       "nixos.tests.boot.uefiCdrom.x86_64-linux"
       "nixos.tests.boot.uefiUsb.x86_64-linux"

From 749afca8dcf424aad3dfd22ec5b904e94609accf Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 11 Feb 2020 22:42:33 +0200
Subject: [PATCH 1283/4636] sundials: Add version 2.7.0 as sundials_2

---
 pkgs/development/libraries/sundials/2.x.nix | 61 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  4 ++
 2 files changed, 65 insertions(+)
 create mode 100644 pkgs/development/libraries/sundials/2.x.nix

diff --git a/pkgs/development/libraries/sundials/2.x.nix b/pkgs/development/libraries/sundials/2.x.nix
new file mode 100644
index 000000000000..12840b769403
--- /dev/null
+++ b/pkgs/development/libraries/sundials/2.x.nix
@@ -0,0 +1,61 @@
+{ stdenv
+, cmake
+, fetchurl
+, python
+# GNU Octave needs KLU for ODE solvers
+, suitesparse
+, liblapack
+, gfortran
+, lapackSupport ? true }:
+
+let liblapackShared = liblapack.override {
+  shared = true;
+};
+
+in stdenv.mkDerivation rec {
+  pname = "sundials";
+  version = "2.7.0";
+
+  buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [
+    gfortran
+    suitesparse
+  ];
+  nativeBuildInputs = [ cmake ];
+
+  src = fetchurl {
+    url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
+    sha256 = "01513g0j7nr3rh7hqjld6mw0mcx5j9z9y87bwjc16w2x2z3wm7yk";
+  };
+
+  patches = [
+    (fetchurl {
+      # https://github.com/LLNL/sundials/pull/19
+      url = "https://github.com/LLNL/sundials/commit/1350421eab6c5ab479de5eccf6af2dcad1eddf30.patch";
+      sha256 = "0g67lixp9m85fqpb9rzz1hl1z8ibdg0ldwq5z6flj5zl8a7cw52l";
+    })
+  ];
+
+  cmakeFlags = [
+    "-DEXAMPLES_INSTALL_PATH=${placeholder "out"}/share/examples"
+  ] ++ stdenv.lib.optionals (lapackSupport) [
+    "-DSUNDIALS_INDEX_TYPE=int32_t"
+    # GNU Octave needs KLU for ODE solvers
+    "-DKLU_ENABLE=ON"
+    "-DKLU_INCLUDE_DIR=${suitesparse}/include"
+    "-DKLU_LIBRARY_DIR=${suitesparse}/lib"
+    "-DLAPACK_ENABLE=ON"
+    "-DLAPACK_LIBRARIES=${liblapackShared}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary};${liblapackShared}/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}"
+  ];
+
+  # flaky tests, and patch in https://github.com/LLNL/sundials/pull/21 doesn't apply cleanly for sundials_3
+  doCheck = false;
+  checkPhase = "make test";
+
+  meta = with stdenv.lib; {
+    description = "Suite of nonlinear differential/algebraic equation solvers";
+    homepage    = https://computation.llnl.gov/projects/sundials;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ flokli idontgetoutmuch ];
+    license     = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 025c6a4631cc..37023b220efb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14400,6 +14400,10 @@ in
 
   sundials = callPackage ../development/libraries/sundials { };
 
+  sundials_2 = callPackage ../development/libraries/sundials/2.x.nix {
+    python = python3;
+  };
+
   sutils = callPackage ../tools/misc/sutils { };
 
   svrcore = callPackage ../development/libraries/svrcore { };

From 0df00a6cebb02086db5bca5c317e3ddbc3addf8c Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 11 Feb 2020 22:43:53 +0200
Subject: [PATCH 1284/4636] octave: cleanup callPackages and use sundials_2

---
 pkgs/top-level/all-packages.nix | 70 ++++++++++++++++++++++++++-------
 1 file changed, 56 insertions(+), 14 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 37023b220efb..0ae81aac45a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9220,24 +9220,66 @@ in
     git = gitMinimal;
   };
 
+  # Build summary for this flavor
+  # - Build Octave Qt GUI:                  no (missing:QtCore QtGui QtNetwork QtHelp QtXml)
+  # - JIT compiler for loops:               no
+  # - Build Java interface:                 yes
+  # - Build static libraries:               no
+  # - Build shared libraries:               yes
+  # - Dynamic Linking API:                  dlopen
+  # - Include support for GNU readline:     yes
+  # - 64-bit array dims and indexing:       yes
+  # - 64-bit BLAS array dims and indexing:  yes
+  # - OpenMP SMP multithreading:            yes
+  # - Truncate intermediate FP results:     yes
+  # - Build cross tools:                    no
+  # - Build docs:                           yes
   octave = callPackage ../development/interpreters/octave {
-    qt = null;
-    qscintilla = null;
-    ghostscript = null;
-    graphicsmagick = null;
-    llvm = null;
-    hdf5 = null;
-    glpk = null;
-    suitesparse = null;
-    jdk = null;
+    python = python3;
+    sundials = sundials_2;
     openblas = if stdenv.isDarwin then openblasCompat else openblas;
   };
-
-  octaveFull = (lowPrio (octave.override {
-    qt = qt4;
-    inherit qscintilla;
-    overridePlatforms = ["x86_64-linux" "x86_64-darwin"];
+  # Build summary for this flavor
+  # - Build Octave Qt GUI:                  no (missing:QtCore QtGui QtNetwork QtHelp QtXml)
+  # - JIT compiler for loops:               yes
+  # - Build Java interface:                 yes
+  # - Build static libraries:               no
+  # - Build shared libraries:               yes
+  # - Dynamic Linking API:                  dlopen
+  # - Include support for GNU readline:     yes
+  # - 64-bit array dims and indexing:       yes
+  # - 64-bit BLAS array dims and indexing:  yes
+  # - OpenMP SMP multithreading:            yes
+  # - Truncate intermediate FP results:     yes
+  # - Build cross tools:                    no
+  # - Build docs:                           yes
+  octave-jit = callPackage ../development/interpreters/octave {
+    python = python3;
+    sundials = sundials_2;
     openblas = if stdenv.isDarwin then openblasCompat else openblas;
+    enableJIT = true;
+  };
+  # Build summary for this flavor
+  # - Build Octave Qt GUI:                  yes
+  # - JIT compiler for loops:               no
+  # - Build Java interface:                 yes
+  # - Build static libraries:               no
+  # - Build shared libraries:               yes
+  # - Dynamic Linking API:                  dlopen
+  # - Include support for GNU readline:     yes
+  # - 64-bit array dims and indexing:       yes
+  # - 64-bit BLAS array dims and indexing:  yes
+  # - OpenMP SMP multithreading:            yes
+  # - Truncate intermediate FP results:     yes
+  # - Build cross tools:                    no
+  # - Build docs:                           yes
+  # Build summary for this flavor
+  octaveFull = (lowPrio (libsForQt512.callPackage ../development/interpreters/octave {
+    python = python3;
+    sundials = sundials_2;
+    openblas = if stdenv.isDarwin then openblasCompat else openblas;
+    enableQt = true;
+    overridePlatforms = ["x86_64-linux" "x86_64-darwin"];
   }));
 
   ocropus = callPackage ../applications/misc/ocropus { };

From b74fe1a248915c0b4d3a863cb97e1c9f953a9928 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 11 Feb 2020 22:45:30 +0200
Subject: [PATCH 1285/4636] octave: order arguments at top and import qt5 libs

---
 .../interpreters/octave/default.nix           | 52 +++++++++++++++++--
 1 file changed, 47 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index f0f80f758548..28fcf4dd6ff0 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -1,8 +1,50 @@
-{ stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull
-, libsndfile, portaudio, libX11, graphicsmagick, pcre, pkgconfig, libGL, libGLU, fltk
-, fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp, gl2ps
-, qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null
-, suitesparse ? null, gnuplot ? null, jdk ? null, python ? null, overridePlatforms ? null
+{ stdenv
+, fetchurl
+, gfortran
+, readline
+, ncurses
+, perl
+, flex
+, texinfo
+, qhull
+, libsndfile
+, portaudio
+, libX11
+, graphicsmagick
+, pcre
+, pkgconfig
+, libGL
+, libGLU
+, fltk
+# Both are needed for discrete Fourier transform
+, fftw
+, fftwSinglePrec
+, zlib
+, curl
+, qrupdate
+, openblas
+, arpack
+, libwebp
+, gl2ps
+, ghostscript ? null
+, hdf5 ? null
+, glpk ? null
+, suitesparse ? null
+, gnuplot ? null
+, jdk ? null
+, python ? null
+, overridePlatforms ? null
+, sundials ? null
+# Qt / GUI is disabled by default
+, enableQt ? false
+, qtbase ? null
+, qtsvg ? null
+, qtscript ? null
+, qscintilla ? null
+, qttools ? null
+# JIT is disabled by default
+, enableJIT ? false
+, llvm ? null
 }:
 
 let

From 40c2fb8b1e1bd1aea27f10288022ffb7c8759969 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 11 Feb 2020 22:46:17 +0200
Subject: [PATCH 1286/4636] octave: Makeinfo is no longer needed at runtime

---
 pkgs/development/interpreters/octave/default.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 28fcf4dd6ff0..f870a609cf9d 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -62,6 +62,7 @@ in
 stdenv.mkDerivation rec {
   version = "5.2.0";
   pname = "octave";
+
   src = fetchurl {
     url = "mirror://gnu/octave/${pname}-${version}.tar.gz";
     sha256 = "1qcmcpsq1lfka19fxzvxjwjhg113c39a9a0x8plkhvwdqyrn5sig";
@@ -83,12 +84,6 @@ stdenv.mkDerivation rec {
     ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ])
     ;
 
-  # makeinfo is required by Octave at runtime to display help
-  prePatch = ''
-    substituteInPlace libinterp/corefcn/help.cc \
-      --replace 'Vmakeinfo_program = "makeinfo"' \
-                'Vmakeinfo_program = "${texinfo}/bin/makeinfo"'
-  '';
 
   doCheck = !stdenv.isDarwin;
 

From acf2ad387697fab187de321fe585a75ecc04a987 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 11 Feb 2020 22:47:24 +0200
Subject: [PATCH 1287/4636] octave: clean up configure flags - remove
 --enable-dl

---
 .../interpreters/octave/default.nix           | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index f870a609cf9d..355dcb07d957 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -92,15 +92,16 @@ stdenv.mkDerivation rec {
   # See https://savannah.gnu.org/bugs/?50339
   F77_INTEGER_8_FLAG = if openblas.blas64 then "-fdefault-integer-8" else "";
 
-  configureFlags =
-    [ "--enable-readline"
-      "--enable-dl"
-      "--with-blas=openblas"
-      "--with-lapack=openblas"
-    ]
-    ++ stdenv.lib.optional openblas.blas64 "--enable-64"
-    ++ stdenv.lib.optionals stdenv.isDarwin ["--with-x=no"]
-    ;
+  configureFlags = [
+    "--enable-readline"
+    "--with-blas=openblas"
+    "--with-lapack=openblas"
+  ]
+    ++ stdenv.lib.optionals openblas.blas64 [ "--enable-64" ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ "--with-x=no" ]
+    ++ stdenv.lib.optionals enableQt [ "--with-qt=5" ]
+    ++ stdenv.lib.optionals enableJIT [ "--enable-jit" ]
+  ;
 
   # Keep a copy of the octave tests detailed results in the output
   # derivation, because someone may care

From b3a20c4febe4c6565b5340bee9cfdace294a3aa0 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 11 Feb 2020 22:49:09 +0200
Subject: [PATCH 1288/4636] octave: remove old fix for build issue

---
 pkgs/development/interpreters/octave/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 355dcb07d957..df886088f322 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -89,9 +89,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  # See https://savannah.gnu.org/bugs/?50339
-  F77_INTEGER_8_FLAG = if openblas.blas64 then "-fdefault-integer-8" else "";
-
   configureFlags = [
     "--enable-readline"
     "--with-blas=openblas"

From 2b18e72064173e195ceabffb322803ae35e4a426 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 11 Feb 2020 22:49:31 +0200
Subject: [PATCH 1289/4636] octave: mark package as broken if JIT is enabled

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

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index df886088f322..473176ec9a9a 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -116,6 +116,8 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl3Plus;
     maintainers = with stdenv.lib.maintainers; [raskin];
     description = "Scientific Pragramming Language";
+    # https://savannah.gnu.org/bugs/?func=detailitem&item_id=56425 is the best attempt to fix JIT
+    broken = enableJIT;
     platforms = if overridePlatforms == null then
       (with stdenv.lib.platforms; linux ++ darwin)
     else overridePlatforms;

From d4861e2b18a47b21b60d9a0018e1b96878458588 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 11 Feb 2020 22:50:27 +0200
Subject: [PATCH 1290/4636] octave: clean up all build inputs - use qt5

---
 .../interpreters/octave/default.nix           | 67 ++++++++++++++-----
 1 file changed, 51 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 473176ec9a9a..14d1913a1ab9 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -68,22 +68,57 @@ stdenv.mkDerivation rec {
     sha256 = "1qcmcpsq1lfka19fxzvxjwjhg113c39a9a0x8plkhvwdqyrn5sig";
   };
 
-  buildInputs = [ gfortran readline ncurses perl flex texinfo qhull
-    graphicsmagick pcre pkgconfig fltk zlib curl openblas libsndfile fftw
-    fftwSinglePrec portaudio qrupdate arpack libwebp gl2ps ]
-    ++ (stdenv.lib.optional (qt != null) qt)
-    ++ (stdenv.lib.optional (qscintilla != null) qscintilla)
-    ++ (stdenv.lib.optional (ghostscript != null) ghostscript)
-    ++ (stdenv.lib.optional (llvm != null) llvm)
-    ++ (stdenv.lib.optional (hdf5 != null) hdf5)
-    ++ (stdenv.lib.optional (glpk != null) glpk)
-    ++ (stdenv.lib.optional (suitesparse != null) suitesparse)
-    ++ (stdenv.lib.optional (jdk != null) jdk)
-    ++ (stdenv.lib.optional (gnuplot != null) gnuplot)
-    ++ (stdenv.lib.optional (python != null) python)
-    ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ])
-    ;
-
+  buildInputs = [
+    readline
+    ncurses
+    perl
+    flex
+    qhull
+    graphicsmagick
+    pcre
+    fltk
+    zlib
+    curl
+    openblas
+    libsndfile
+    fftw
+    fftwSinglePrec
+    portaudio
+    qrupdate
+    arpack
+    libwebp
+    gl2ps
+  ]
+  ++ (stdenv.lib.optionals enableQt [
+    qtbase
+    qtsvg
+    qscintilla
+  ])
+  ++ (stdenv.lib.optional (ghostscript != null) ghostscript)
+  ++ (stdenv.lib.optional (hdf5 != null) hdf5)
+  ++ (stdenv.lib.optional (glpk != null) glpk)
+  ++ (stdenv.lib.optional (suitesparse != null) suitesparse)
+  ++ (stdenv.lib.optional (jdk != null) jdk)
+  ++ (stdenv.lib.optional (sundials != null) sundials)
+  ++ (stdenv.lib.optional (gnuplot != null) gnuplot)
+  ++ (stdenv.lib.optional (python != null) python)
+  ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ])
+  ;
+  nativeBuildInputs = [
+    pkgconfig
+    gfortran 
+    # Listed here as well because it's outputs are split
+    fftw
+    fftwSinglePrec
+    texinfo
+  ]
+  ++ (stdenv.lib.optional (sundials != null) sundials)
+  ++ (stdenv.lib.optional enableJIT llvm)
+  ++ (stdenv.lib.optionals enableQt [
+    qtscript
+    qttools
+  ])
+  ;
 
   doCheck = !stdenv.isDarwin;
 

From b631f620d46d2a6103ad8ba4de4ba40152cf3741 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 18 Feb 2020 16:33:08 +0200
Subject: [PATCH 1291/4636] octave: Revert "remove old fix for build issue"

This reverts commit 3beeacfd58239bb6e95aa716dedddae17716b6eb.
---
 pkgs/development/interpreters/octave/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 14d1913a1ab9..78f927dc4ee7 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -124,6 +124,9 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  # See https://savannah.gnu.org/bugs/?50339
+  F77_INTEGER_8_FLAG = if openblas.blas64 then "-fdefault-integer-8" else "";
+
   configureFlags = [
     "--enable-readline"
     "--with-blas=openblas"

From 62d7ad930993813a05f277bd9091f6ab2e3b9e80 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 19 Feb 2020 18:39:39 +0200
Subject: [PATCH 1292/4636] octave: Use sundials_2 in package's signature
 instead of callPackage

---
 pkgs/development/interpreters/octave/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                  | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 78f927dc4ee7..2e926e16dc6e 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -34,7 +34,7 @@
 , jdk ? null
 , python ? null
 , overridePlatforms ? null
-, sundials ? null
+, sundials_2 ? null
 # Qt / GUI is disabled by default
 , enableQt ? false
 , qtbase ? null
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
   ++ (stdenv.lib.optional (glpk != null) glpk)
   ++ (stdenv.lib.optional (suitesparse != null) suitesparse)
   ++ (stdenv.lib.optional (jdk != null) jdk)
-  ++ (stdenv.lib.optional (sundials != null) sundials)
+  ++ (stdenv.lib.optional (sundials_2 != null) sundials_2)
   ++ (stdenv.lib.optional (gnuplot != null) gnuplot)
   ++ (stdenv.lib.optional (python != null) python)
   ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ])
@@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
     fftwSinglePrec
     texinfo
   ]
-  ++ (stdenv.lib.optional (sundials != null) sundials)
+  ++ (stdenv.lib.optional (sundials_2 != null) sundials_2)
   ++ (stdenv.lib.optional enableJIT llvm)
   ++ (stdenv.lib.optionals enableQt [
     qtscript
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0ae81aac45a1..14ed58a1086d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9236,7 +9236,6 @@ in
   # - Build docs:                           yes
   octave = callPackage ../development/interpreters/octave {
     python = python3;
-    sundials = sundials_2;
     openblas = if stdenv.isDarwin then openblasCompat else openblas;
   };
   # Build summary for this flavor
@@ -9255,7 +9254,6 @@ in
   # - Build docs:                           yes
   octave-jit = callPackage ../development/interpreters/octave {
     python = python3;
-    sundials = sundials_2;
     openblas = if stdenv.isDarwin then openblasCompat else openblas;
     enableJIT = true;
   };
@@ -9276,7 +9274,6 @@ in
   # Build summary for this flavor
   octaveFull = (lowPrio (libsForQt512.callPackage ../development/interpreters/octave {
     python = python3;
-    sundials = sundials_2;
     openblas = if stdenv.isDarwin then openblasCompat else openblas;
     enableQt = true;
     overridePlatforms = ["x86_64-linux" "x86_64-darwin"];

From f93a4389b9ad41b7af85f5f1e7e98caf8018855f Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 22 Feb 2020 12:36:19 +0200
Subject: [PATCH 1293/4636] sundials: use python3

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 14ed58a1086d..97cb0d5e22dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14437,7 +14437,9 @@ in
     withQt5 = false;
   };
 
-  sundials = callPackage ../development/libraries/sundials { };
+  sundials = callPackage ../development/libraries/sundials {
+    python = python3;
+  };
 
   sundials_2 = callPackage ../development/libraries/sundials/2.x.nix {
     python = python3;

From bba9b7fe6e51482be4a9ba4287e3b6b1558a3c71 Mon Sep 17 00:00:00 2001
From: Maxim Krivchikov <maxim.krivchikov@gmail.com>
Date: Sat, 22 Feb 2020 10:45:35 +0000
Subject: [PATCH 1294/4636] whitebox-tools: 0.16.0 -> 1.2.0

---
 pkgs/applications/gis/whitebox-tools/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix
index 1ee1d3376db3..8ff2ed36fdc3 100644
--- a/pkgs/applications/gis/whitebox-tools/default.nix
+++ b/pkgs/applications/gis/whitebox-tools/default.nix
@@ -1,13 +1,13 @@
 { stdenv, rustPlatform , fetchFromGitHub, Security }:
 rustPlatform.buildRustPackage rec {
   pname = "whitebox_tools";
-  version = "0.16.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "jblindsay";
     repo = "whitebox-tools";
     rev = "v${version}";
-    sha256 = "1vs4hf2x3qjnffs9kjx56rzl67kpcy8xvng6p0r9fp9mfnblxg6j";
+    sha256 = "0zi32d0wrbl2763dcllv2g0liwacsfiza5lkx52620prjjbhby8i";
   };
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
   # Delete this on next update; see #79975 for details
   legacyCargoFetcher = true;
 
-  cargoSha256 = "1y3vk8bzsaisx7wrncjxcqdh355f2wk4n59vq5qgj37fph2zpy7f";
+  cargoSha256 = "0zn4b4md3pn1rvb15rnz3zcx9a359x26nfy7zcfp7nx27ais13n5";
 
   # failures: structures::polyline::test::test_polyline_split
   doCheck = false;

From 1dff3413c5339ead892f2e8a959c218594f6d4b4 Mon Sep 17 00:00:00 2001
From: Fabian Thorand <f.thorand@gmail.com>
Date: Sat, 22 Feb 2020 12:07:00 +0100
Subject: [PATCH 1295/4636] lmms: 1.2.0-rc7 -> 1.2.1

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

diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix
index 99503fc3942b..0420a52d89b8 100644
--- a/pkgs/applications/audio/lmms/default.nix
+++ b/pkgs/applications/audio/lmms/default.nix
@@ -5,13 +5,13 @@
 
 mkDerivation rec {
   pname = "lmms";
-  version = "1.2.0-rc7";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "LMMS";
     repo = "lmms";
     rev = "v${version}";
-    sha256 = "1hshzf2sbdfw37y9rz1ksgvn81kp2n23dp74lsaasc2n7wzjwdis";
+    sha256 = "08k2nfj0rw9mahr7pr90n79wviqmjmflrgcljc6y3x30v84wbp26";
     fetchSubmodules = true;
   };
 

From a01db4abd4c6eb4e611a30de59dfd3917bb429f8 Mon Sep 17 00:00:00 2001
From: Moritz Heidkamp <moritz@twoticketsplease.de>
Date: Sat, 22 Feb 2020 12:09:02 +0100
Subject: [PATCH 1296/4636] babashka: init at 0.0.71

---
 pkgs/tools/misc/babashka/default.nix | 55 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 +
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/tools/misc/babashka/default.nix

diff --git a/pkgs/tools/misc/babashka/default.nix b/pkgs/tools/misc/babashka/default.nix
new file mode 100644
index 000000000000..bef5c334c7c6
--- /dev/null
+++ b/pkgs/tools/misc/babashka/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchurl, graalvm8 } :
+
+stdenv.mkDerivation rec {
+  pname = "babashka";
+  version = "0.0.71";
+
+  src = fetchurl {
+    url = "https://github.com/borkdude/babashka/releases/download/v${version}/babashka-${version}-standalone.jar";
+    sha256 = "0gyahrxrvyfkvqg4dhzx81mg2hw56ji3aa1yxb9ycwa5bawb6080";
+  };
+
+  reflectionJson = fetchurl {
+    url = "https://github.com/borkdude/babashka/releases/download/v${version}/reflection.json";
+    sha256 = "13p1yw27sjvfi130pw7m9c1yzdgh7wxh8r6z8b4qmr3iifidfrcr";
+  };
+
+  dontUnpack = true;
+
+  buildInputs = [ graalvm8 ];
+
+  buildPhase = ''
+    native-image \
+      -jar ${src} \
+      -H:Name=bb \
+      -H:+ReportExceptionStackTraces \
+      -J-Dclojure.spec.skip-macros=true \
+      -J-Dclojure.compiler.direct-linking=true \
+      "-H:IncludeResources=BABASHKA_VERSION" \
+      "-H:IncludeResources=SCI_VERSION" \
+      -H:ReflectionConfigurationFiles=${reflectionJson} \
+      --initialize-at-run-time=java.lang.Math\$RandomNumberGeneratorHolder \
+      --initialize-at-build-time \
+      -H:Log=registerResource: \
+      -H:EnableURLProtocols=http,https \
+      --enable-all-security-services \
+      -H:+JNI \
+      --verbose \
+      --no-fallback \
+      --no-server \
+      -J-Xmx3g
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp bb $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Tool for executing Clojure snippets or scripts in the same space where you would use Bash";
+    homepage = "https://github.com/borkdude/babashka/";
+    license = licenses.epl10;
+    platforms = graalvm8.meta.platforms;
+    maintainers = with maintainers; [ DerGuteMoritz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fca1c429672e..4e0dcc2b5934 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -782,6 +782,8 @@ in
 
   automirror = callPackage ../tools/misc/automirror { };
 
+  babashka = callPackage ../tools/misc/babashka { };
+
   bash-my-aws = callPackage ../tools/admin/bash-my-aws { };
 
   bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { };

From 9567d805f01932f4933a07a15a73c64f16166b48 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 22 Feb 2020 21:53:04 +1000
Subject: [PATCH 1297/4636] ostree: 2019.6 -> 2020.2

https://github.com/ostreedev/ostree/releases/tag/v2020.1
https://github.com/ostreedev/ostree/releases/tag/v2020.2
---
 pkgs/tools/misc/ostree/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix
index 4bc690bc45fd..05e7f9c05ef0 100644
--- a/pkgs/tools/misc/ostree/default.nix
+++ b/pkgs/tools/misc/ostree/default.nix
@@ -37,13 +37,13 @@ let
   ]));
 in stdenv.mkDerivation rec {
   pname = "ostree";
-  version = "2019.6";
+  version = "2020.2";
 
   outputs = [ "out" "dev" "man" "installedTests" ];
 
   src = fetchurl {
     url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
-    sha256 = "1bhrfbjna3rnymijxagzkdq2zl74g71s2xmimihjhvcw2zybi0jl";
+    sha256 = "0bbk0sg4m38g7j00hy358p2azxas87minpgz3avwma6jsylj1qjg";
   };
 
   patches = [
@@ -52,12 +52,6 @@ in stdenv.mkDerivation rec {
     # Patch from https://github.com/ostreedev/ostree/pull/1633
     ./01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch
 
-    # Fix tests running in Catalan instead of C locale.
-    (fetchpatch {
-      url = "https://github.com/ostreedev/ostree/commit/5135a1e58ade2bfafc8c1fda359540eafd72531e.patch";
-      sha256 = "1crzaagw1zzx8v6rsnxb9jnc3ij9hlpvdl91w3skqdm28adx7yx8";
-    })
-
     # Workarounds for https://github.com/ostreedev/ostree/issues/1592
     ./fix-1592.patch
 

From ae9e09a2e1ee1d003074b888a5cccd30faf93b03 Mon Sep 17 00:00:00 2001
From: Tom Hall <tahall256@protonmail.ch>
Date: Fri, 21 Feb 2020 23:01:36 +0000
Subject: [PATCH 1298/4636] R: fix build on aarch64 by removing a failing test

I believe this test is currently incorrect on aarch64 and expects a
warning about loss of precision with much smaller numbers than the
platform's long doubles can handle.
---
 ...01-Disable-test-pending-upstream-fix.patch | 26 +++++++++++++++++++
 pkgs/applications/science/math/R/default.nix  |  4 +++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/science/math/R/0001-Disable-test-pending-upstream-fix.patch

diff --git a/pkgs/applications/science/math/R/0001-Disable-test-pending-upstream-fix.patch b/pkgs/applications/science/math/R/0001-Disable-test-pending-upstream-fix.patch
new file mode 100644
index 000000000000..7bf32df0b7a3
--- /dev/null
+++ b/pkgs/applications/science/math/R/0001-Disable-test-pending-upstream-fix.patch
@@ -0,0 +1,26 @@
+From 85ede2cf452800710de136f4f864921d3bb9773c Mon Sep 17 00:00:00 2001
+From: Tom Hall <tahall256@protonmail.ch>
+Date: Fri, 21 Feb 2020 22:56:06 +0000
+Subject: [PATCH] Disable test pending upstream fix
+
+See https://bugs.r-project.org/bugzilla/show_bug.cgi?id=17718
+---
+ tests/reg-tests-1d.R | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/reg-tests-1d.R b/tests/reg-tests-1d.R
+index 9b551a1fc8..18ce6027ed 100644
+--- a/tests/reg-tests-1d.R
++++ b/tests/reg-tests-1d.R
+@@ -3079,7 +3079,7 @@ stopifnot(exprs = {
+     x[1:52] %% 3 == 2:1
+    -x[1:52] %% 3 == 1:2
+ }) # larger x suffer from cancellation (well, warning too early now):
+-tools::assertWarning(x[60:68] %% 3)
++#tools::assertWarning(x[60:68] %% 3)
+ 
+ 
+ ## Hilmar Berger's on R-devel list: 'data.frame() == NULL' etc
+-- 
+2.24.1
+
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 914f6a49b179..f613f94b9ccd 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./no-usr-local-search-paths.patch
+  ] ++ stdenv.lib.optionals stdenv.hostPlatform.isAarch64 [
+    # Remove a test which fails on aarch64.
+    # See https://bugs.r-project.org/bugzilla/show_bug.cgi?id=17718
+    ./0001-Disable-test-pending-upstream-fix.patch
   ];
 
   prePatch = stdenv.lib.optionalString stdenv.isDarwin ''

From 8e08f7515aed91689db2c978b00911043781a651 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sat, 22 Feb 2020 14:28:32 +0100
Subject: [PATCH 1299/4636] netpbm: fix typo on substituteInPlace parameters

It seems like originally `-dSAFER` should have been replaced with
`-dPARANOIDSAFER` instead of `-DSAFER` (capital D vs lower case d).

This was pointed out in #75153. This might now finally (properly?) fix
CVE-2005-2471.
---
 pkgs/tools/graphics/netpbm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index 9de7603c9730..b67e71c0fdf0 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
 
   postPatch = /* CVE-2005-2471, from Arch */ ''
     substituteInPlace converter/other/pstopnm.c \
-      --replace '"-DSAFER"' '"-DPARANOIDSAFER"'
+      --replace '"-dSAFER"' '"-dPARANOIDSAFER"'
   '';
 
   buildInputs =

From 75f604eb2c7803bdc503e92930afa874505ed5d5 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 22 Feb 2020 09:28:03 -0500
Subject: [PATCH 1300/4636] nixos release process: use rev-list --count like
 Hydra does.

---
 nixos/doc/manual/development/releases.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml
index a22a0a3707b4..cc0ec78cc74e 100755
--- a/nixos/doc/manual/development/releases.xml
+++ b/nixos/doc/manual/development/releases.xml
@@ -71,8 +71,9 @@
      <para>
       <link xlink:href="https://github.com/NixOS/nixpkgs/commit/d6b08acd1ccac0d9d502c4b635e00b04d3387f06">
       Update <literal>versionSuffix</literal> in
-      <literal>nixos/release.nix</literal></link>, use <literal>git log
-      --format=%an|wc -l</literal> to get the commit count
+      <literal>nixos/release.nix</literal></link>, use
+      <literal>git rev-list --count 17.09-beta</literal>
+      to get the commit count.
      </para>
     </listitem>
     <listitem>

From cf0e6a48e9fdb5de85783747d89eafb76593db38 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 20 Feb 2020 14:00:51 +0100
Subject: [PATCH 1301/4636] s-tui: migrate to python3

Includes LC_ALL = "en_US.UTF-8"; that resolves a locale.Error exception
during the check phase.

[...]
  File "/build/s-tui-1.0.0/s_tui/sensors_menu.py", line 27, in <module>
    import urwid
  File "/nix/store/xxhpq1kcjy0kimfwnwqlzh2pchkp9khi-python3.7-urwid-2.1.0/lib/python3.7/site-packages/urwid/__init__.py", line 26, in <module>
    from urwid.widget import (FLOW, BOX, FIXED, LEFT, RIGHT, CENTER, TOP, MIDDLE,
  File "/nix/store/xxhpq1kcjy0kimfwnwqlzh2pchkp9khi-python3.7-urwid-2.1.0/lib/python3.7/site-packages/urwid/widget.py", line 27, in <module>
    from urwid.util import (MetaSuper, decompose_tagmarkup, calc_width,
  File "/nix/store/xxhpq1kcjy0kimfwnwqlzh2pchkp9khi-python3.7-urwid-2.1.0/lib/python3.7/site-packages/urwid/util.py", line 61, in <module>
    detected_encoding = detect_encoding()
  File "/nix/store/xxhpq1kcjy0kimfwnwqlzh2pchkp9khi-python3.7-urwid-2.1.0/lib/python3.7/site-packages/urwid/util.py", line 58, in detect_encoding
    locale.setlocale(locale.LC_ALL, initial)
  File "/nix/store/ja04f3cmapzb3f2mvjrb883bfqclsirq-python3-3.7.6/lib/python3.7/locale.py", line 608, in setlocale
    return _setlocale(category, locale)
locale.Error: unsupported locale setting
---
 pkgs/tools/system/s-tui/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix
index 924269b6637c..a6816daae33a 100644
--- a/pkgs/tools/system/s-tui/default.nix
+++ b/pkgs/tools/system/s-tui/default.nix
@@ -1,19 +1,21 @@
-{ stdenv, pythonPackages }:
+{ stdenv, python3Packages }:
 
-pythonPackages.buildPythonPackage rec {
+python3Packages.buildPythonPackage rec {
   pname = "s-tui";
   version = "1.0.0";
 
-  src = pythonPackages.fetchPypi {
+  src = python3Packages.fetchPypi {
     inherit pname version;
     sha256 = "0r5yhlsi5xiy7ii1w4kqkaxz9069v5bbfwi3x3xnxhk51yjfgr8n";
   };
 
-  propagatedBuildInputs = with pythonPackages; [
+  propagatedBuildInputs = with python3Packages; [
     urwid
     psutil
   ];
 
+  LC_ALL = "en_US.UTF-8";
+
   meta = with stdenv.lib; {
     homepage = https://amanusk.github.io/s-tui/;
     description = "Stress-Terminal UI monitoring tool";

From 8009c2071179ee3490f244b91a49202728efe403 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 22 Feb 2020 12:37:46 -0500
Subject: [PATCH 1302/4636] lib/systems: Assume newlib when no kernel and no
 libc is provided

newlib is the default for most tools when no kernel is provided. Other
exist, but this seems like a safe default.
---
 lib/systems/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 026117cc34fd..045a40bd5b4b 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -36,9 +36,8 @@ rec {
         else if final.isUClibc              then "uclibc"
         else if final.isAndroid             then "bionic"
         else if final.isLinux /* default */ then "glibc"
-        else if final.isMsp430              then "newlib"
-        else if final.isVc4                 then "newlib"
         else if final.isAvr                 then "avrlibc"
+        else if final.isNone                then "newlib"
         else if final.isNetBSD              then "nblibc"
         # TODO(@Ericson2314) think more about other operating systems
         else                                     "native/impure";

From e30abffb66446ae59e95fb888745269be546ad92 Mon Sep 17 00:00:00 2001
From: Renato Alves <alves.rjc@gmail.com>
Date: Tue, 18 Feb 2020 12:25:59 +0100
Subject: [PATCH 1303/4636] pythonPackages.googletrans: init at 2.4.0

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

diff --git a/pkgs/development/python-modules/googletrans/default.nix b/pkgs/development/python-modules/googletrans/default.nix
new file mode 100644
index 000000000000..06d008200059
--- /dev/null
+++ b/pkgs/development/python-modules/googletrans/default.nix
@@ -0,0 +1,34 @@
+{ lib, buildPythonPackage, fetchFromGitHub, requests, pytest, coveralls }:
+
+buildPythonPackage rec {
+  pname = "googletrans";
+  version = "2.4.0";
+
+  src = fetchFromGitHub {
+    owner = "ssut";
+    repo = "py-googletrans";
+    rev = "v${version}";
+    sha256 = "0wzzinn0k9rfv9z1gmfk9l4kljyd4n6kizsjw4wjxv91kfhj92hz";
+  };
+
+  propagatedBuildInputs = [
+    requests
+  ];
+
+  checkInputs = [ pytest coveralls ];
+
+  # majority of tests just try to ping Google's Translate API endpoint
+  doCheck = false;
+  checkPhase = ''
+    pytest
+  '';
+
+  pythonImportsCheck = [ "googletrans" ];
+
+  meta = with lib; {
+    description = "Googletrans is python library to interact with Google Translate API";
+    homepage = "https://py-googletrans.readthedocs.io";
+    license = licenses.mit;
+    maintainers = with maintainers; [ unode ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c00033b3a720..891dc4165ad6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2739,6 +2739,8 @@ in {
 
   google-pasta = callPackage ../development/python-modules/google-pasta { };
 
+  googletrans = callPackage ../development/python-modules/googletrans { };
+
   gpapi = callPackage ../development/python-modules/gpapi { };
   gplaycli = callPackage ../development/python-modules/gplaycli { };
 

From 8fd1365953871a77e9557ea37914de9f3dc522ee Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 21 Feb 2020 07:52:38 +0000
Subject: [PATCH 1304/4636] python27Packages.qtawesome: 0.6.1 -> 0.7.0

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

diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix
index 9392504ce263..8150290ca748 100644
--- a/pkgs/development/python-modules/qtawesome/default.nix
+++ b/pkgs/development/python-modules/qtawesome/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "QtAwesome";
-  version = "0.6.1";
+  version = "0.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1w4im0hzx497binyx6a6awbyszk1bsz34prm4j72gl5kszkiq7yq";
+    sha256 = "1k9nn6z8lhaznas509h9cjy434haggz2n1mhs29bycmds716k7j8";
   };
 
   propagatedBuildInputs = [ qtpy six ];

From 1c07ee79255bb3fe8a7eb382cd5a8348e0b85893 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sat, 22 Feb 2020 13:10:30 -0500
Subject: [PATCH 1305/4636] haskell shellFor: Fix hoogle

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

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index d23df0df3171..b99ac9cbab9a 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -312,10 +312,10 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
 
           in self.mkDerivation genericBuilderArgs;
 
-        envFuncArgs = builtins.removeAttrs args [ "packages" ];
-      in (combinedPackageFor packages).env.overrideAttrs (old: envFuncArgs // {
-        nativeBuildInputs = old.nativeBuildInputs ++ envFuncArgs.nativeBuildInputs or [];
-        buildInputs = old.buildInputs ++ envFuncArgs.buildInputs or [];
+        mkDerivationArgs = builtins.removeAttrs args [ "packages" "withHoogle" ];
+      in ((combinedPackageFor packages).envFunc { inherit withHoogle; }).overrideAttrs (old: mkDerivationArgs // {
+        nativeBuildInputs = old.nativeBuildInputs ++ mkDerivationArgs.nativeBuildInputs or [];
+        buildInputs = old.buildInputs ++ mkDerivationArgs.buildInputs or [];
       });
 
     ghc = ghc // {

From 082c7f01811826bcd6fa82f9196fe037a36c0126 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 21 Feb 2020 06:30:30 +0000
Subject: [PATCH 1306/4636] python27Packages.pyftpdlib: 1.5.5 -> 1.5.6

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

diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix
index 9fc654292ab3..e7c5b922dc06 100644
--- a/pkgs/development/python-modules/pyftpdlib/default.nix
+++ b/pkgs/development/python-modules/pyftpdlib/default.nix
@@ -8,12 +8,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.5.5";
+  version = "1.5.6";
   pname = "pyftpdlib";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1adf1c03d1508749e7c2f26dc9850ec0ef834318d725b7ae5ac91698f5c86752";
+    sha256 = "0pnv2byzmzg84q5nmmhn1xafvfil85qa5y52bj455br93zc5b9px";
   };
 
   checkInputs = [ mock psutil ];

From 69668e93d82945ed36f165407b4831276b6a1530 Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Fri, 21 Feb 2020 08:54:53 +0100
Subject: [PATCH 1307/4636] kodi: fix build

---
 pkgs/applications/video/kodi/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 4fae93aa1a18..eef390d30ed8 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders
+{ stdenv, lib, fetchpatch, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders
 , pkgconfig, cmake, gnumake, yasm, python2Packages
 , libgcrypt, libgpgerror, libunistring
 , boost, avahi, lame, autoreconfHook
@@ -194,6 +194,15 @@ in stdenv.mkDerivation {
       autoconf automake libtool # still needed for some components. Check if that is the case with 19.0
     ] ++ lib.optionals useWayland [ wayland-protocols ];
 
+    patches = [
+      # Adds missing cassert includes, fixing builds. This will be unnecessary
+      # after 18.6 is released (which will contain this patch)
+      (fetchpatch {
+        url = "https://github.com/xbmc/xbmc/commit/d5947e6733fd564edb68df91fd6d389d9fb82319.patch";
+        sha256 = "1shlbsbfba3074wdyhl42vgin6jfzl7sy3zsvxaxkpx8g7my9jn2";
+      })
+    ];
+
     cmakeFlags = [
       "-Dlibdvdcss_URL=${libdvdcss.src}"
       "-Dlibdvdnav_URL=${libdvdnav.src}"

From 98552bf69b1fe5614374e3d6aaad865f12097daa Mon Sep 17 00:00:00 2001
From: Jean-Philippe Braun <eon@patapon.info>
Date: Sat, 22 Feb 2020 12:43:47 +0100
Subject: [PATCH 1308/4636] vimPlugins: update

---
 pkgs/misc/vim-plugins/generated.nix | 214 ++++++++++++++--------------
 1 file changed, 107 insertions(+), 107 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 25d78e3be461..7e1f786b3494 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -61,11 +61,11 @@ let
 
   ale = buildVimPluginFrom2Nix {
     pname = "ale";
-    version = "2020-02-08";
+    version = "2020-02-22";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "d6d2a0c77010db6a75a8942e2af9606971738c23";
+      rev = "8012809c3f30a767db8395c5b8e3651cdb995635";
       sha256 = "1g3zws7zi18plvwd6m7wrvj83siczsnwx0yr892v1m0gh7x2452y";
     };
   };
@@ -215,12 +215,12 @@ let
 
   bufexplorer = buildVimPluginFrom2Nix {
     pname = "bufexplorer";
-    version = "2020-01-10";
+    version = "2020-02-17";
     src = fetchFromGitHub {
       owner = "jlanzarotta";
       repo = "bufexplorer";
-      rev = "8014787603fff635dfae6afd4dbe9297673a0b39";
-      sha256 = "0drj8q6wg9h08nf517l0dks1fbcnc558zg7dqavxc43maymq5mxm";
+      rev = "29258f58357acc10c672585a9efe8913d756734d";
+      sha256 = "00wjwk9yzfclrbd4p59b5wpl21s2vjs4ahn30xhpza93bk513wnq";
     };
   };
 
@@ -347,12 +347,12 @@ let
 
   coc-git = buildVimPluginFrom2Nix {
     pname = "coc-git";
-    version = "2020-02-16";
+    version = "2020-02-19";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-git";
-      rev = "f67abbe05f535086167b3cb4cde6c2c309905959";
-      sha256 = "0fl3hgapcwr5sjgmm02lx6vg18qlw5g03ysv926rjb0r0nl3rhh5";
+      rev = "b0b6d913f2faaf02a79542c41cfa4db0c1d9b373";
+      sha256 = "0xg90a2h6g97m3wiakniqk60kdzi4ijgyc1p0bk1cxbj7gxvc7yg";
     };
   };
 
@@ -391,12 +391,12 @@ let
 
   coc-imselect = buildVimPluginFrom2Nix {
     pname = "coc-imselect";
-    version = "2019-11-04";
+    version = "2020-02-18";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-imselect";
-      rev = "19d89413b3b00db8de6ccd7db619149f542f496c";
-      sha256 = "12w36mkw6b1bxpw51h04xxg703zdwrnww0wh3j32x2bx3bycdla4";
+      rev = "01442d2fb7d344122e59755f59782a0e1bf7d294";
+      sha256 = "1vqx9yna66njdw1my15ac6djr3yvnb6das96nx12mpingnw85kky";
     };
   };
 
@@ -446,12 +446,12 @@ let
 
   coc-metals = buildVimPluginFrom2Nix {
     pname = "coc-metals";
-    version = "2020-02-13";
+    version = "2020-02-19";
     src = fetchFromGitHub {
       owner = "ckipp01";
       repo = "coc-metals";
-      rev = "23ec84c855cb791f3d3030fff83aa343e15607b9";
-      sha256 = "1x6ain64aip83h0fhqx7xqnc7jqamgf72q77fddp42id6cws0v61";
+      rev = "973360108311862d6b49711af20671329d22fef5";
+      sha256 = "0f1chb6f18bqzcrps1nl871k98i91833lp1d2ql2rpl7kk7bsl72";
     };
   };
 
@@ -490,12 +490,12 @@ let
 
   coc-python = buildVimPluginFrom2Nix {
     pname = "coc-python";
-    version = "2020-01-15";
+    version = "2020-02-21";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-python";
-      rev = "3e03f98a1979b3ef1901c28cdd8d27a8d03bf399";
-      sha256 = "1va1z1w0hjb1h03n6shsyg2i54f6wdpdpq4gl79fl96jd94k8ihp";
+      rev = "6a5104d18ae5ebf7d9b84af7c4a34c6ced62aee8";
+      sha256 = "0l8zrb2bhv1apx2vp8gswqh7v64dxfd8124cggxfkkzdqyxr10w0";
     };
   };
 
@@ -534,12 +534,12 @@ let
 
   coc-snippets = buildVimPluginFrom2Nix {
     pname = "coc-snippets";
-    version = "2020-02-10";
+    version = "2020-02-19";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-snippets";
-      rev = "e5ebdaae28474a9e7a21bddc5fcdd3d1c9729437";
-      sha256 = "0j5wcjbmip14zx7aizb8ma2vmr03w6nzym9kpc98x4v8vwswqjhg";
+      rev = "aaa059bb998418850ec2d7958a5df16e96e76d59";
+      sha256 = "1ardzqassj1kgfjp0vxsi0kimi7w61rxdhr8ng272nrkaxbxz25j";
     };
   };
 
@@ -887,23 +887,23 @@ let
 
   denite-git = buildVimPluginFrom2Nix {
     pname = "denite-git";
-    version = "2019-09-09";
+    version = "2020-02-18";
     src = fetchFromGitHub {
       owner = "chemzqm";
       repo = "denite-git";
-      rev = "db4ad6c3717272fc347a46466e4337bba6b4c4cc";
-      sha256 = "0rlv9q7fzgiapann3r83szr87mfpxcvhmrsjzrxrimqk3m992wa2";
+      rev = "52b47c249ba67bc089c9fdcbab5628fc1b767651";
+      sha256 = "000vv7jka1911b9sb8vbb6y25npqrw95nx6wmcj7vnm9pn64izdb";
     };
   };
 
   denite-nvim = buildVimPluginFrom2Nix {
     pname = "denite-nvim";
-    version = "2020-02-17";
+    version = "2020-02-19";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "eeb067ca291b7f677b6faab590344a4ca84c0e70";
-      sha256 = "0irz8g9qpm7d36gig86j3dqk4mdbzl5rnzg07cgizh88jqhzxvin";
+      rev = "a22e597a2950510b5bef4f9cc972ae7f1d66b269";
+      sha256 = "1acwb4r20xmsj0cvjc7ql0vfbyj74zmi8ncns678afj7qc595mxq";
     };
   };
 
@@ -1077,12 +1077,12 @@ let
 
   deoplete-nvim = buildVimPluginFrom2Nix {
     pname = "deoplete-nvim";
-    version = "2020-02-01";
+    version = "2020-02-19";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "6e01000280edc9c9c56ef7b1d59977fc93e3bf4c";
-      sha256 = "00qvpp7r7wnccfzfxq9xa4cyxzr25zy32mpxscnbixc7cv5y981x";
+      rev = "1ec8428fc4a150756dc793295b44f7e62544b5ed";
+      sha256 = "00ywghgprbq9x1m5l5d00c10n9yk83ai6gxlw6gmjl67bya65ikg";
     };
   };
 
@@ -1300,12 +1300,12 @@ let
 
   fzf-vim = buildVimPluginFrom2Nix {
     pname = "fzf-vim";
-    version = "2020-02-05";
+    version = "2020-02-19";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
-      rev = "467c3277884240f7b5430f8f4d600e3415c38f3b";
-      sha256 = "1bnml1gfrzbbp6j1lwcip4k9ncf4br604z4h1snw29qsf0wgcyv3";
+      rev = "48a2d80a24d19bfaafd91005786653bc49303c62";
+      sha256 = "0p4ifdl70iwsdqsgpbs66lam7fzdc2jxa9hvzslwi0gllccpfsm5";
     };
   };
 
@@ -1752,12 +1752,12 @@ let
 
   lh-vim-lib = buildVimPluginFrom2Nix {
     pname = "lh-vim-lib";
-    version = "2020-01-12";
+    version = "2020-02-19";
     src = fetchFromGitHub {
       owner = "LucHermitte";
       repo = "lh-vim-lib";
-      rev = "13a59968c0d76884f2ef1feb27493ba90d62deb0";
-      sha256 = "0g9dfg7y7znj3iiz67323jbflg6d34hq8hc8v4gcjnrinagyydnv";
+      rev = "3077a653988ff1f3d6483a2281650ac6da5b7559";
+      sha256 = "04g5rf1wcvxpkqbf3vkyjmkykqwi4dhp3l8i0mvng03gwpzfp0ym";
     };
   };
 
@@ -2005,12 +2005,12 @@ let
 
   neomake = buildVimPluginFrom2Nix {
     pname = "neomake";
-    version = "2020-02-13";
+    version = "2020-02-20";
     src = fetchFromGitHub {
       owner = "neomake";
       repo = "neomake";
-      rev = "acbbd0e0ce2277c33926c189d0f54825e2ed59d3";
-      sha256 = "1s9pg7pz39z4xz80v5i2vh3hd664zfxg2769mfj2nqz38f0qnk97";
+      rev = "76e5b2bad8e98e805ff4749068e6be6206bec2a0";
+      sha256 = "17713a1bd405c8k2qa0b7mgw2pj58r83qnz3qhjxvg877vybag6n";
     };
   };
 
@@ -2104,23 +2104,23 @@ let
 
   nerdcommenter = buildVimPluginFrom2Nix {
     pname = "nerdcommenter";
-    version = "2020-01-25";
+    version = "2020-02-19";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdcommenter";
-      rev = "cbadb3d93e5dcb121793b182880ee784dbd78978";
-      sha256 = "0zk9a6ns5552nc9d65cxigv84v1p8dkdm9zwrvhi37vjznknb7gy";
+      rev = "c62e618a1ab5a50a4028e3296500ba29d9b033d8";
+      sha256 = "0w4bxj423dxxkcxnfmipf8x5jfm058rq4g3m98wzcz5zbambv3qs";
     };
   };
 
   nerdtree = buildVimPluginFrom2Nix {
     pname = "nerdtree";
-    version = "2020-02-07";
+    version = "2020-02-20";
     src = fetchFromGitHub {
       owner = "scrooloose";
       repo = "nerdtree";
-      rev = "07612557ebb4118ef4a337faa7033d0270773c71";
-      sha256 = "17l4nd62riyfnzn5i1g5blmrivlx9m3gf5qf7x0rw31y3d8k64g3";
+      rev = "e67324fdea7a192c7ce1b4c6b3c3b9f82f11eee7";
+      sha256 = "0y7hd69k0i21cqgs11n80ljv6cl0gfcjjwa0dvdywpd8mmn1ad4k";
     };
   };
 
@@ -2214,12 +2214,12 @@ let
 
   nvim-lsp = buildVimPluginFrom2Nix {
     pname = "nvim-lsp";
-    version = "2020-02-17";
+    version = "2020-02-22";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lsp";
-      rev = "8c78ca42072d14ca678cd1e138f665a5d42df558";
-      sha256 = "10w7rzpfl70bg6w665pfq6mgdz9gsw5i341sd4f0ncr2asrd7l76";
+      rev = "be0f71585eb3185b214c84c643e43e9647ef67d1";
+      sha256 = "1rrlq70yx9ks19xbnic4k2vnq0i7xnfm7s0z5lsxp6xl2w3di78z";
     };
   };
 
@@ -2280,12 +2280,12 @@ let
 
   open-browser-vim = buildVimPluginFrom2Nix {
     pname = "open-browser-vim";
-    version = "2020-02-07";
+    version = "2020-02-20";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "open-browser.vim";
-      rev = "a78ae55a6f5d76347d36515e930cad711b8d324b";
-      sha256 = "1gzbabm81q16n6i40rk3r63xpf5rkfgwi4akhdvhxhdavk7z5dzs";
+      rev = "a1091492328a57fac02e80641a86c9c64a95ebe1";
+      sha256 = "10pbad4ad3lslx0kl4a79z8rlg19xcqi7wicfldk1l003badw7cw";
     };
   };
 
@@ -2687,12 +2687,12 @@ let
 
   SpaceCamp = buildVimPluginFrom2Nix {
     pname = "SpaceCamp";
-    version = "2020-02-15";
+    version = "2020-02-22";
     src = fetchFromGitHub {
       owner = "jaredgorski";
       repo = "SpaceCamp";
-      rev = "68e8d592237a61fd322c0305d0e7415d64153ec9";
-      sha256 = "1njg0hqcbcqiyyjq5vldbwhndz9d7x9gxksdyr5yygc58463zk2l";
+      rev = "35187bc15654196c3f7cbf3eabb194dc0ee499de";
+      sha256 = "119chhmz561rfjag778a6yp9w6vdi9kxgv5756rnnav7rrp8ap9a";
     };
   };
 
@@ -2786,12 +2786,12 @@ let
 
   swift-vim = buildVimPluginFrom2Nix {
     pname = "swift-vim";
-    version = "2019-12-05";
+    version = "2020-02-21";
     src = fetchFromGitHub {
       owner = "keith";
       repo = "swift.vim";
-      rev = "245e5f7aae6f1bc96849a0a01a58cb81cf56e721";
-      sha256 = "0hj7ln0qvfpb0pmvkzj21zd8a2zribdahwwl4rn1yn8skclcq149";
+      rev = "c4053da88208cef5a32a5862694d36b73f6ce310";
+      sha256 = "0awz0pf3awrwhay40wngfllpmmh24zwm02ra530x4n1hk74iwf2v";
     };
   };
 
@@ -2874,23 +2874,23 @@ let
 
   tcomment_vim = buildVimPluginFrom2Nix {
     pname = "tcomment_vim";
-    version = "2020-01-04";
+    version = "2020-02-21";
     src = fetchFromGitHub {
       owner = "tomtom";
       repo = "tcomment_vim";
-      rev = "239c0c08d3e691a2c447278b88de91b602fa50bd";
-      sha256 = "1v2v6zp59mblz7dj5fad640qsz92dgjsb2qzir42df2h86qx0zwa";
+      rev = "20e85e8c2346bd1f60f1ef55c5e32bb54a7a22fc";
+      sha256 = "0k8w924gyrx71kifj6cdgxbzlv5v4cp9gdy5bhc53cgn9nfjgapw";
     };
   };
 
   tender-vim = buildVimPluginFrom2Nix {
     pname = "tender-vim";
-    version = "2020-02-12";
+    version = "2020-02-18";
     src = fetchFromGitHub {
       owner = "jacoborus";
       repo = "tender.vim";
-      rev = "0c3c715d27ba8fcc13ad1343bda069710b49b259";
-      sha256 = "1rpwl3xd46nb4ghklbffpacg4f8plmjxgbnckd5jc7wwjfs1sl7q";
+      rev = "f93b2f373cc21826524c94fbd1f3b3a4c55173d2";
+      sha256 = "0bfns5vsbyh1s01s295hbf8h04n21cfkfp8b2r3cfr8mcvazpmpq";
     };
   };
 
@@ -3326,12 +3326,12 @@ let
 
   vim-airline = buildVimPluginFrom2Nix {
     pname = "vim-airline";
-    version = "2020-02-17";
+    version = "2020-02-21";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "7e00ee1107d0ed24ac09af51e576ea7d85e114a3";
-      sha256 = "02ax3y8kh503dh7gsi0nwsvlas02vd4issawriydy1wl8ngfgdbh";
+      rev = "0b2683464877c1e39d0c67427c7fdc4bc6697d15";
+      sha256 = "010cqvszgfvwci1iw8w0kwjdy4284i16yarfcsq5zcd0786sn8s6";
     };
   };
 
@@ -3392,12 +3392,12 @@ let
 
   vim-autoformat = buildVimPluginFrom2Nix {
     pname = "vim-autoformat";
-    version = "2020-02-05";
+    version = "2020-02-21";
     src = fetchFromGitHub {
       owner = "Chiel92";
       repo = "vim-autoformat";
-      rev = "f5d5d07731005adbd2dc76cf8f47ae9a68db9783";
-      sha256 = "15szhh1i52wv5p6l1a9755fk8yndpipvhxjbc2y9dgbx35zyvpm2";
+      rev = "db57d849f31cd81075c82d4827426a326de76dae";
+      sha256 = "057clz1p9lkb0nvrqxgdsmm760sksg8pwa2wny3vc69hi7m1wr9w";
     };
   };
 
@@ -3799,12 +3799,12 @@ let
 
   vim-elixir = buildVimPluginFrom2Nix {
     pname = "vim-elixir";
-    version = "2020-02-11";
+    version = "2020-02-21";
     src = fetchFromGitHub {
       owner = "elixir-lang";
       repo = "vim-elixir";
-      rev = "95a0e08e9bc3ebb3d2606c83b06cef3db4092337";
-      sha256 = "00l3qi8dg5qvq67d1wqijf00ahvp7bhcp6l0z87szdr8fs5r2ak1";
+      rev = "85afa5e0de0ba0d640898e9d232552795fc726d2";
+      sha256 = "1askl7ridl6np25ldf4mwqp7iavb9wj119qjqmjga8niylq80hnm";
     };
   };
 
@@ -3975,12 +3975,12 @@ let
 
   vim-fugitive = buildVimPluginFrom2Nix {
     pname = "vim-fugitive";
-    version = "2020-02-16";
+    version = "2020-02-20";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "98f67310aa3ae324d725a3b6b68a63e5a48372f4";
-      sha256 = "177dk2b2mb13d6hf6hp97p91qsbafd29z8n3zdfwxjgxf9fjgl4c";
+      rev = "9e4a5239ee2a91f71605a288810419ce3a603df2";
+      sha256 = "1ssw5q3wn9jdq9zyr176b2g24263rpm22gn4sswjylz5d5m2f6yq";
     };
   };
 
@@ -4052,12 +4052,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2020-02-14";
+    version = "2020-02-20";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "13c943aaad7ad98ddf0c35f6b758318f53e144fb";
-      sha256 = "1qik4knd96py6f5y4xylshdxbf5fvf0960aadwvk1ninvsazxqic";
+      rev = "26c00294a0726ebfe80174f310b868af5e0f2042";
+      sha256 = "1ymdqdl0bfingkh7gdprvdmp5q3wka3kwnw0cw1nyzq8m3sn1803";
     };
   };
 
@@ -4239,12 +4239,12 @@ let
 
   vim-illuminate = buildVimPluginFrom2Nix {
     pname = "vim-illuminate";
-    version = "2019-11-21";
+    version = "2020-02-21";
     src = fetchFromGitHub {
       owner = "RRethy";
       repo = "vim-illuminate";
-      rev = "4929d19cc8483d9d9872cb3669915e6a8cc381a2";
-      sha256 = "1rbhnmqrw8gdpf60lx4akhadz3q80fykal1a9c4mnn5nrqymv9va";
+      rev = "80dafb9b0e7b9f4ce7c843d4104f455c8c5b1f42";
+      sha256 = "1yijaj1dqfmw4dsdmgj01sxizyraisxwjqh2hhbq93pdln4lm51f";
     };
   };
 
@@ -4680,12 +4680,12 @@ let
 
   vim-nftables = buildVimPluginFrom2Nix {
     pname = "vim-nftables";
-    version = "2019-07-25";
+    version = "2020-02-21";
     src = fetchFromGitHub {
       owner = "nfnty";
       repo = "vim-nftables";
-      rev = "aad8540ef56f495baa589f646edc1253db990f1a";
-      sha256 = "1fzi2zzrdzscnjzv8js0ln3bwyxnacilvfcklpndmss67gxbnbkm";
+      rev = "01c7b97eff12fd4b624e6efa2c0468163db61ebc";
+      sha256 = "1n3mpaa60k4w0sqpkgw19aksa1sbcqz7vl8fp6bj6i63bhiprsqf";
     };
   };
 
@@ -5285,12 +5285,12 @@ let
 
   vim-snippets = buildVimPluginFrom2Nix {
     pname = "vim-snippets";
-    version = "2020-02-05";
+    version = "2020-02-20";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "cca8bdc4df751c1f262030b8409845aa657f5043";
-      sha256 = "18iyl4axash340lqq3j5b3jisk2zpz5gsaz307sjclsf1s6860xr";
+      rev = "35067caeca1c17fa5d38d5de031b26610e939cba";
+      sha256 = "00y608jfrw72wfvzyl82f8m1qxmb1m3c5micncca8qvyjyya07y7";
     };
   };
 
@@ -5461,12 +5461,12 @@ let
 
   vim-test = buildVimPluginFrom2Nix {
     pname = "vim-test";
-    version = "2020-02-16";
+    version = "2020-02-19";
     src = fetchFromGitHub {
       owner = "janko-m";
       repo = "vim-test";
-      rev = "330b0911f13bcb48a3e28dedcf71e19de5bd4864";
-      sha256 = "0iibm4nzxf7fhn5ka3pmnw324xnnxcf1lkia20w0wbx39axn4br3";
+      rev = "3ffaea971fe579c028242e79d7823dd8e8dbeebd";
+      sha256 = "0f3sn7zkwmdj3adxvclm8yqwkhxlbjzph8jmlr6kyx8xk8axdin8";
     };
   };
 
@@ -5516,12 +5516,12 @@ let
 
   vim-textobj-user = buildVimPluginFrom2Nix {
     pname = "vim-textobj-user";
-    version = "2019-10-16";
+    version = "2020-02-21";
     src = fetchFromGitHub {
       owner = "kana";
       repo = "vim-textobj-user";
-      rev = "9861dc6829a0ce253e40b4d947a9432b58eb499b";
-      sha256 = "1gyz6y5f9bf5hnmb54lqmddy3g9y7bc28k9mrqfr49cd9nziywa5";
+      rev = "41a675ddbeefd6a93664a4dc52f302fe3086a933";
+      sha256 = "1y1g3vcm97fqjyigiajbvbck4nlc04vxl3535x4sl40s5jbm5vz3";
     };
   };
 
@@ -5670,12 +5670,12 @@ let
 
   vim-visual-multi = buildVimPluginFrom2Nix {
     pname = "vim-visual-multi";
-    version = "2020-02-16";
+    version = "2020-02-18";
     src = fetchFromGitHub {
       owner = "mg979";
       repo = "vim-visual-multi";
-      rev = "0f85922ec3cc0c497ac91ce02e5252643bcf7947";
-      sha256 = "1kgqns7a8px13hh0kfdn12zg3f6zv0s3sphxl899mywnp4nx3489";
+      rev = "7417eaf7349db2c904f1ff85e69b14122a1c07ae";
+      sha256 = "14cxpwq0r0c8aq3n6vk5b9rqlazvvjszm9fdlbsrggx52llkpq3z";
     };
   };
 
@@ -5879,12 +5879,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2020-02-15";
+    version = "2020-02-18";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "aa4d8f9d39a112f09f30872962a0c79cd121bedf";
-      sha256 = "1rlhb8srp9dgmspp92qvp79sjw17m04ps90m2zlslh07xm5v2aag";
+      rev = "20f47baff2a981d6d72a8404adfd878c8736e4ee";
+      sha256 = "1bw4fh1c9xi1hfa3c3dpk605zkmg1hr4qnxrl02jlpiy631lalq2";
     };
   };
 
@@ -5923,12 +5923,12 @@ let
 
   vista-vim = buildVimPluginFrom2Nix {
     pname = "vista-vim";
-    version = "2020-02-15";
+    version = "2020-02-19";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "vista.vim";
-      rev = "ae2c79d97547d3e048e7138ac8721825b5a47a09";
-      sha256 = "0j5ya2rwl11daqgdfsqpr8svmhp9hs5zzhabq5xf3d3hlb7nvcpq";
+      rev = "73ce1d884987910f3c219a99cf659ae4146e6bf4";
+      sha256 = "0815pjnzf3pgvf45y801bzigjq79dscl7xdcs3p7qj4b8afazygg";
     };
   };
 
@@ -6033,24 +6033,24 @@ let
 
   yats-vim = buildVimPluginFrom2Nix {
     pname = "yats-vim";
-    version = "2020-01-31";
+    version = "2020-02-20";
     src = fetchFromGitHub {
       owner = "HerringtonDarkholme";
       repo = "yats.vim";
-      rev = "ae182ee2449db2cce3055f7430b3adf6c0867948";
-      sha256 = "0s96pd5ky2mxngxbw7lkhxbjzq74ay9jyk0zjy0q3ldd3xv4ssx5";
+      rev = "97f53f67097ddc87ab64bf8931c2798ea56e6184";
+      sha256 = "15g38zl0x0a9vn4xql4siwvshlnvlz404d7w2falqp72hr91zzmn";
       fetchSubmodules = true;
     };
   };
 
   youcompleteme = buildVimPluginFrom2Nix {
     pname = "youcompleteme";
-    version = "2020-02-14";
+    version = "2020-02-19";
     src = fetchFromGitHub {
       owner = "valloric";
       repo = "youcompleteme";
-      rev = "de8bad012d66e652a2b5ecc77c2a23c8f97489b3";
-      sha256 = "1my5j2fk6c80sqmj353909dky78jr92g8bxhp02ky2mcwxlg6qrm";
+      rev = "dd4a583e06f64751ac1439c30a9a40d82cdb741d";
+      sha256 = "1imlp6sw6a2qgr6ih5fap1x83fzil5glq44lrs9d5an6wf1z8jzk";
       fetchSubmodules = true;
     };
   };

From 089d85baba8e4a136dc180fe0bb30084f2912edb Mon Sep 17 00:00:00 2001
From: Jean-Philippe Braun <eon@patapon.info>
Date: Sat, 22 Feb 2020 12:45:25 +0100
Subject: [PATCH 1309/4636] vimPlugins.vim-cue: init at 2020-02-06

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 7e1f786b3494..f98e7abbeddc 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3632,6 +3632,17 @@ let
     };
   };
 
+  vim-cue = buildVimPluginFrom2Nix {
+    pname = "vim-cue";
+    version = "2020-02-06";
+    src = fetchFromGitHub {
+      owner = "jjo";
+      repo = "vim-cue";
+      rev = "482f0b1df03f59bbd1bf4bca99314770289a7f35";
+      sha256 = "05c9amxpn4zyb8hvcnzrzq43r70hzs32rhn5rjaf5jflgmwaph0q";
+    };
+  };
+
   vim-cursorword = buildVimPluginFrom2Nix {
     pname = "vim-cursorword";
     version = "2020-02-01";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index fcde3fdc5c6a..c3978069bc5c 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -158,6 +158,7 @@ jhradilek/vim-docbk
 jhradilek/vim-snippets as vim-docbk-snippets
 jiangmiao/auto-pairs
 jistr/vim-nerdtree-tabs
+jjo/vim-cue
 jlanzarotta/bufexplorer
 jnurmine/zenburn
 jonbri/vim-colorstepper

From 9bab3b5a61a68486359ef0b0b7c9181cc44c9631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Fri, 21 Feb 2020 15:38:07 +0100
Subject: [PATCH 1310/4636] sentencepiece: set platforms to unix to support
 Darwin

- The sentencepiece library builds fine on Darwin as well.
- Remove superfluous `enableParallelBuilding = true`.
- Make the value of homepage a string.
---
 pkgs/development/libraries/sentencepiece/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/development/libraries/sentencepiece/default.nix
index 907e0cc50760..05c641fab891 100644
--- a/pkgs/development/libraries/sentencepiece/default.nix
+++ b/pkgs/development/libraries/sentencepiece/default.nix
@@ -17,15 +17,13 @@ stdenv.mkDerivation rec {
     sha256 = "1ncvyw9ar0z7nd47cysxg5xrjm01y1shdlhp8l2pdpx059p3yx3w";
   };
 
-  enableParallelBuilding = true;
-
   nativeBuildInputs = [ cmake gperftools ];
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/google/sentencepiece;
+    homepage = "https://github.com/google/sentencepiece";
     description = "Unsupervised text tokenizer for Neural Network-based text generation";
     license = licenses.asl20;
-    platforms = [ "x86_64-linux" ];
+    platforms = platforms.unix;
     maintainers = with maintainers; [ pashashocky ];
   };
 }

From 54cbe01782057817426df996f99c455281671a36 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Mon, 18 Nov 2019 23:01:12 +0000
Subject: [PATCH 1311/4636] doctest: init at 2.3.5

Signed-off-by: David Wood <david@davidtw.co>
---
 .../development/libraries/doctest/default.nix | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/doctest/default.nix

diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix
new file mode 100644
index 000000000000..e55313bc9fe4
--- /dev/null
+++ b/pkgs/development/libraries/doctest/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, installShellFiles, cmake }:
+
+stdenv.mkDerivation rec {
+  pname = "doctest";
+  version = "2.3.5";
+
+  src = fetchFromGitHub {
+    owner = "onqtam";
+    repo = "doctest";
+    rev = version;
+    sha256 = "0rddlzhnv0f5036q0m0p019pismka7sx6x8cnzk65sk77b1dsbhg";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/onqtam/doctest";
+    description = "The fastest feature-rich C++11/14/17/20 single-header testing framework";
+    platforms = platforms.linux;
+    license = licenses.mit;
+    maintainers = with maintainers; [ davidtwco ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4fba286384e3..beaffb2013e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11230,6 +11230,8 @@ in
 
   dlib = callPackage ../development/libraries/dlib { };
 
+  doctest = callPackage ../development/libraries/doctest { };
+
   docopt_cpp = callPackage ../development/libraries/docopt_cpp { };
 
   dotconf = callPackage ../development/libraries/dotconf { };

From 0ce1b1a380765fab1edca6f8ecd5b08a6c94ec80 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Mon, 18 Nov 2019 23:01:32 +0000
Subject: [PATCH 1312/4636] lyra: init at 1.1

Signed-off-by: David Wood <david@davidtw.co>
---
 pkgs/development/libraries/lyra/default.nix | 32 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/libraries/lyra/default.nix

diff --git a/pkgs/development/libraries/lyra/default.nix b/pkgs/development/libraries/lyra/default.nix
new file mode 100644
index 000000000000..3e73c9266a03
--- /dev/null
+++ b/pkgs/development/libraries/lyra/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, installShellFiles, meson, ninja }:
+
+stdenv.mkDerivation rec {
+  pname = "lyra";
+  version = "1.1";
+
+  src = fetchFromGitHub {
+    owner = "bfgroup";
+    repo = "lyra";
+    rev = version;
+    sha256 = "1wcwsmg41bmjir6pjrjxrwccqj25d9068ifi9m6xz6q3fhaq6s81";
+  };
+
+  nativeBuildInputs = [ meson ninja ];
+
+  enableParallelBuilding = true;
+
+  postPatch = "sed -i s#/usr#$out#g meson.build";
+
+  postInstall = ''
+    mkdir -p $out/include
+    cp -R $src/include/* $out/include
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/bfgroup/Lyra";
+    description = "A simple to use, composable, command line parser for C++ 11 and beyond";
+    platforms = platforms.linux;
+    license = licenses.boost;
+    maintainers = with maintainers; [ davidtwco ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index beaffb2013e9..3e69da72cc9f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13311,6 +13311,8 @@ in
     asciidoc = asciidoc-full;
   };
 
+  lyra = callPackage ../development/libraries/lyra { };
+
   lzo = callPackage ../development/libraries/lzo { };
 
   opencl-clang = callPackage ../development/libraries/opencl-clang { };

From b0d7d8527bd246eb4504f96c1e15a913d9974037 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Mon, 18 Nov 2019 23:01:43 +0000
Subject: [PATCH 1313/4636] sycl-info: init at unstable-2019-11-19

Signed-off-by: David Wood <david@davidtw.co>
---
 .../libraries/sycl-info/default.nix           | 57 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/development/libraries/sycl-info/default.nix

diff --git a/pkgs/development/libraries/sycl-info/default.nix b/pkgs/development/libraries/sycl-info/default.nix
new file mode 100644
index 000000000000..f294c887b0ce
--- /dev/null
+++ b/pkgs/development/libraries/sycl-info/default.nix
@@ -0,0 +1,57 @@
+{ stdenv
+, fetchFromGitHub
+, installShellFiles
+, cmake
+, ninja
+, ocl-icd
+, opencl-headers
+, lyra
+, nlohmann_json
+, ronn
+, doctest
+}:
+
+stdenv.mkDerivation rec {
+  pname = "sycl-info";
+  version = "unstable-2019-11-19";
+
+  src = fetchFromGitHub {
+    owner = "codeplaysoftware";
+    repo = "sycl-info";
+    rev = "b47d498ee2d6b77ec21972de5882e8e12efecd6c";
+    sha256 = "0fy0y1rcfb11p3vijd8wym6xkaicav49pv2bv2l18rma929n1m1m";
+  };
+
+  buildInputs = [
+    nlohmann_json
+    ronn
+    opencl-headers
+    ocl-icd
+    doctest
+    lyra
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+  ];
+
+  cmakeFlags = [
+    "-DBUILD_TESTING=ON"
+    "-DBUILD_DOCS=ON"
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DLYRA_INCLUDE_DIRS=${stdenv.lib.getDev lyra}/include"
+  ];
+
+  # Required for ronn to compile the manpage.
+  RUBYOPT = "-KU -E utf-8:utf-8";
+
+  meta = with stdenv.lib;
+    {
+      homepage = "https://github.com/codeplaysoftware/sycl-info";
+      description = "Tool to show information about available SYCL implementations";
+      platforms = platforms.linux;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ davidtwco ];
+    };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e69da72cc9f..de90b4137b52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6710,6 +6710,8 @@ in
 
   svtplay-dl = callPackage ../tools/misc/svtplay-dl { };
 
+  sycl-info = callPackage ../development/libraries/sycl-info { };
+
   symengine = callPackage ../development/libraries/symengine { };
 
   sysbench = callPackage ../development/tools/misc/sysbench {};

From e9578b9736c3569d8801f2f7946f441cd32c826e Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Fri, 3 Jan 2020 16:11:48 +0100
Subject: [PATCH 1314/4636] pythonPackages.pyscrypt: init at 1.6.2

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

diff --git a/pkgs/development/python-modules/pyscrypt/default.nix b/pkgs/development/python-modules/pyscrypt/default.nix
new file mode 100644
index 000000000000..372f6db08324
--- /dev/null
+++ b/pkgs/development/python-modules/pyscrypt/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchPypi, python }:
+
+buildPythonPackage rec {
+  pname = "pyscrypt";
+  version = "1.6.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1sd5pd5fpcdnpp4h58kdnvkf0s3afh4ssfqky2ap6z0gy6ax3zds";
+  };
+
+  checkPhase = ''
+    ${python.interpreter} tests/run-tests-hash.py
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/ricmoo/pyscrypt/";
+    description = "Pure-Python implementation of Scrypt PBKDF and scrypt file format library";
+    license = licenses.mit;
+    maintainers = with maintainers; [ valodim ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 891dc4165ad6..32211448664d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1203,6 +1203,8 @@ in {
 
   simplefix = callPackage ../development/python-modules/simplefix { };
 
+  pyscrypt = callPackage ../development/python-modules/pyscrypt { };
+
   pyside2-tools = toPythonModule (callPackage ../development/python-modules/pyside2-tools {
     inherit (pkgs) cmake qt5;
   });

From 384afdc82c032bb419621f325f8c7c30ea395324 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Wed, 19 Feb 2020 13:12:43 +0100
Subject: [PATCH 1315/4636] pythonPackages.furl: 2.0.0 -> 2.1.0

---
 .../python-modules/furl/default.nix           | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/furl/default.nix b/pkgs/development/python-modules/furl/default.nix
index ecb455b51e4a..5893e5a6b941 100644
--- a/pkgs/development/python-modules/furl/default.nix
+++ b/pkgs/development/python-modules/furl/default.nix
@@ -1,22 +1,27 @@
-{ stdenv, buildPythonPackage, fetchPypi, flake8, six, orderedmultidict }:
+{ stdenv, buildPythonPackage, fetchPypi, flake8, six, orderedmultidict, pytest }:
 
 buildPythonPackage rec {
   pname = "furl";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1v2lakx03d5w8954a39ki44xv5mllnq0a0avhxykv9hrzg0yvjpx";
+    sha256 = "08dnw3bs1mk0f1ccn466a5a7fi1ivwrp0jspav9arqpf3wd27q60";
   };
 
-  checkInputs = [ flake8 ];
+  checkInputs = [ flake8 pytest ];
 
   propagatedBuildInputs = [ six orderedmultidict ];
 
+  # see https://github.com/gruns/furl/issues/121
+  checkPhase = ''
+    pytest -k 'not join'
+  '';
+
   meta = with stdenv.lib; {
-    description = "URL manipulation made simple.";
-    homepage = https://github.com/gruns/furl;
-    license = licenses.publicDomain;
+    description = "furl is a small Python library that makes parsing and manipulating URLs easy";
+    homepage = "https://github.com/gruns/furl";
+    license = licenses.unlicense;
     maintainers = with maintainers; [ vanzef ];
   };
 }

From 5b244b986d79b99a692afaa745fe16f6924b6cef Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Wed, 22 Jan 2020 13:18:01 +0100
Subject: [PATCH 1316/4636] pythonPackages.etesync: init at 0.9.3

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

diff --git a/pkgs/development/python-modules/etesync/default.nix b/pkgs/development/python-modules/etesync/default.nix
new file mode 100644
index 000000000000..f96c3e10883c
--- /dev/null
+++ b/pkgs/development/python-modules/etesync/default.nix
@@ -0,0 +1,55 @@
+{ lib, buildPythonPackage, fetchPypi, isPy27,
+  appdirs, asn1crypto, cffi, cryptography, furl, idna, orderedmultidict,
+  packaging, peewee, py, pyasn1, pycparser, pyparsing, pyscrypt,
+  python-dateutil, pytz, requests, six, vobject,
+  pytest
+}:
+
+buildPythonPackage rec {
+  pname = "etesync";
+  version = "0.9.3";
+  disabled = isPy27;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1i6v7i4xmbpkc1pgpzq8gyl2kvg3a1kpdwp8q6l3l0vf9p5qm06w";
+  };
+
+  propagatedBuildInputs = [
+    appdirs
+    asn1crypto
+    cffi
+    cryptography
+    furl
+    idna
+    orderedmultidict
+    packaging
+    peewee
+    py
+    pyasn1
+    pycparser
+    pyparsing
+    pyscrypt
+    python-dateutil
+    pytz
+    requests
+    six
+    vobject
+  ];
+
+  checkInputs = [
+    pytest
+  ];
+
+  checkPhase = ''
+    pytest tests/test_collections.py
+    pytest tests/test_crypto.py
+  '';
+
+  meta = with lib; {
+    homepage = "https://www.etesync.com/";
+    description = "A python API to interact with an EteSync server.";
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ valodim ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 32211448664d..28090e0075a9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3457,6 +3457,8 @@ in {
 
   et_xmlfile = callPackage ../development/python-modules/et_xmlfile { };
 
+  etesync = callPackage ../development/python-modules/etesync { };
+
   eventlet = callPackage ../development/python-modules/eventlet { };
 
   exifread = callPackage ../development/python-modules/exifread { };

From bd91cacadf82b517c082e2a034ca90dd7b9fcd29 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Wed, 22 Jan 2020 13:18:13 +0100
Subject: [PATCH 1317/4636] etesync-dav: init at 0.14.2

---
 .../applications/misc/etesync-dav/default.nix | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/misc/etesync-dav/default.nix

diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix
new file mode 100644
index 000000000000..d99d1890563e
--- /dev/null
+++ b/pkgs/applications/misc/etesync-dav/default.nix
@@ -0,0 +1,33 @@
+{ lib, python3Packages, radicale2 }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "etesync-dav";
+  version = "0.14.2";
+
+  src = python3Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "05kzy74r2hd44sqjgd0bc588ganrzbz5brpiginb8sh8z38igb60";
+  };
+
+  propagatedBuildInputs = with python3Packages; [
+    etesync
+    flask
+    flask_wtf
+    radicale2
+  ];
+
+  checkInputs = with python3Packages; [
+    pytest
+  ];
+
+  checkPhase = ''
+    pytest
+  '';
+
+  meta = with lib; {
+    homepage = "https://www.etesync.com/";
+    description = "Secure, end-to-end encrypted, and privacy respecting sync for contacts, calendars and tasks";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ valodim ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de90b4137b52..ac6e671840b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18939,6 +18939,8 @@ in
 
   eteroj.lv2 = libsForQt5.callPackage ../applications/audio/eteroj.lv2 { };
 
+  etesync-dav = callPackage ../applications/misc/etesync-dav {};
+
   etherape = callPackage ../applications/networking/sniffers/etherape { };
 
   evilvte = callPackage ../applications/misc/evilvte (config.evilvte or {});

From 20d5f3f23d391154029177f57569b3757f698b7d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 9 Feb 2020 10:52:15 +0000
Subject: [PATCH 1318/4636] python27Packages.azure-mgmt-resource: 7.0.0 ->
 8.0.1

---
 .../python-modules/azure-mgmt-resource/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix
index 8f9128a62a03..c418dca1ec71 100644
--- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix
@@ -8,13 +8,13 @@
 
 
 buildPythonPackage rec {
-  version = "7.0.0";
+  version = "8.0.1";
   pname = "azure-mgmt-resource";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "eaea8b5d05495d1b74220052275d46b6bed93b59245bcaa747279a52e41c3bdf";
+    sha256 = "0gngm7w17r5922ji11pnpa6gp5vh5z6la025v9cda6smsnx0fxx7";
   };
 
   postInstall = if isPy3k then "" else ''

From 0d7ae2a5c6375921a93da1eafe538ce85f7213c5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 1 Feb 2020 20:13:40 +0000
Subject: [PATCH 1319/4636] python27Packages.azure-mgmt-network: 8.0.0 -> 9.0.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix
index 4663b9fa0356..ac99b98f0e5e 100644
--- a/pkgs/development/python-modules/azure-mgmt-network/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix
@@ -7,13 +7,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "8.0.0";
+  version = "9.0.0";
   pname = "azure-mgmt-network";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1prg4b1agda9bsn6zmvffkj22rr6jy784rdfp6154yifjr6z5jiv";
+    sha256 = "12bsdbh37xiz42hvrp8ghszyqkiali3pk50x44f3aip12pgx6kix";
   };
 
   postInstall = if isPy3k then "" else ''

From 2758e3975a16568bd4004565f3aaf8a5d3ced8ba Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 22 Jan 2020 15:44:24 +0000
Subject: [PATCH 1320/4636] python27Packages.azure-mgmt-storage: 7.0.0 -> 7.1.0

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

diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
index 552b1c88792a..719e1eae3ccf 100644
--- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
@@ -7,13 +7,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "7.0.0";
+  version = "7.1.0";
   pname = "azure-mgmt-storage";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "7f5e6b18dee267c99f08f6a716a93173bbae433c8665f5c59153fb1a963bc105";
+    sha256 = "03yjvw1dwkwsadsv60i625mr9zpdryy7ywvh7p8fg60djszh1p5l";
   };
 
   postInstall = if isPy3k then "" else ''

From be18a3bd59408adb6f1c2b8ab71f9eb2f820f40a Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Sat, 22 Feb 2020 20:50:47 +0100
Subject: [PATCH 1321/4636] sonic-lineup: init at 1.0.1

---
 .../audio/sonic-lineup/default.nix            | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/applications/audio/sonic-lineup/default.nix

diff --git a/pkgs/applications/audio/sonic-lineup/default.nix b/pkgs/applications/audio/sonic-lineup/default.nix
new file mode 100644
index 000000000000..4ad9e51b6455
--- /dev/null
+++ b/pkgs/applications/audio/sonic-lineup/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, alsaLib, boost, bzip2, fftw, fftwFloat, libfishsound
+, libid3tag, liblo, liblrdf, libmad, liboggz, libpulseaudio, libsamplerate
+, libsndfile, opusfile, portaudio, rubberband, serd, sord, vampSDK, capnproto
+, wrapQtAppsHook, pkgconfig
+}:
+
+stdenv.mkDerivation rec {
+  pname = "sonic-lineup";
+  version = "1.0.1";
+
+  src = fetchurl {
+    url = "https://code.soundsoftware.ac.uk/attachments/download/2610/${pname}-${version}.tar.gz";
+    sha256 = "0w4v5zr81d8fh97y820r0vj1rrbl0kwgvhfkdnyl4hiabs97b1i7";
+  };
+
+  buildInputs =
+    [ alsaLib boost bzip2 fftw fftwFloat libfishsound libid3tag liblo liblrdf
+      libmad liboggz libpulseaudio libsamplerate libsndfile opusfile pkgconfig
+      portaudio rubberband serd sord capnproto
+    ];
+
+  nativeBuildInputs = [ pkgconfig wrapQtAppsHook ];
+
+  enableParallelBuilding = true;
+
+  # comment out the tests
+  preConfigure = ''
+    sed -i 's/sub_test_svcore_/#sub_test_svcore_/' sonic-lineup.pro
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Comparative visualisation of related audio recordings";
+    homepage = https://www.sonicvisualiser.org/sonic-lineup/;
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.vandenoever ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4fba286384e3..aca655785475 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21550,6 +21550,10 @@ in
 
   skanlite = libsForQt5.callPackage ../applications/office/skanlite { };
 
+  sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup {
+    inherit (pkgs.vamp) vampSDK;
+  };
+
   sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser {
     inherit (pkgs.vamp) vampSDK;
   };

From df54d70e3e15b3f91018f1608353724be5081f5e Mon Sep 17 00:00:00 2001
From: Cassidy Dingenskirchen <admin@15318.de>
Date: Sat, 22 Feb 2020 19:25:57 +0100
Subject: [PATCH 1322/4636] poetry: 0.12.17 -> 1.0.3

---
 .../python-modules/poetry/default.nix         | 45 ++++++++++---------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix
index 8f1136c46546..44621d353830 100644
--- a/pkgs/development/python-modules/poetry/default.nix
+++ b/pkgs/development/python-modules/poetry/default.nix
@@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchPypi, callPackage
-, isPy27, isPy34
+, isPy27, isPy34, pythonOlder
 , cleo
 , requests
 , cachy
@@ -7,7 +7,6 @@
 , pyrsistent
 , pyparsing
 , cachecontrol
-, lockfile
 , pkginfo
 , html5lib
 , shellingham
@@ -17,42 +16,43 @@
 , pathlib2
 , virtualenv
 , functools32
+, clikit
+, keyring
+, pexpect
+, importlib-metadata
 , pytest
 , jsonschema
+, intreehooks
+, lockfile
 }:
 
 let
-  cleo6 = cleo.overridePythonAttrs (oldAttrs: rec {
-    version = "0.6.8";
-    src = fetchPypi {
-      inherit (oldAttrs) pname;
-      inherit version;
-      sha256 = "06zp695hq835rkaq6irr1ds1dp2qfzyf32v60vxpd8rcnxv319l5";
-    };
-  });
   glob2 = callPackage ./glob2.nix { };
 
 in buildPythonPackage rec {
   pname = "poetry";
-  version = "0.12.17";
+  version = "1.0.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0gxwcd65qjmzqzppf53x51sic1rbcd9py6cdzx3aprppipimslvf";
+    sha256 = "0fx1ilgkrsqjjnpgv5zljsp0wpcsywdqvvi8im9z396qq6qpk830";
   };
 
   postPatch = ''
-    substituteInPlace setup.py --replace \
-      "requests-toolbelt>=0.8.0,<0.9.0" \
-      "requests-toolbelt>=0.8.0,<0.10.0" \
-      --replace 'pyrsistent>=0.14.2,<0.15.0' 'pyrsistent>=0.14.2,<0.16.0'
+    substituteInPlace pyproject.toml \
+     --replace "pyrsistent = \"^0.14.2\"" "pyrsistent = \"^0.15.0\"" \
+     --replace "requests-toolbelt = \"^0.8.0\"" "requests-toolbelt = \"^0.9.0\"" \
+     --replace "importlib-metadata = {version = \"~1.1.3\", python = \"<3.8\"}" \
+       "importlib-metadata = {version = \"~1.3.0\", python = \"<3.8\"}"
   '';
 
   format = "pyproject";
 
+  nativeBuildInputs = [ intreehooks ];
+
   propagatedBuildInputs = [
-    cachy
-    cleo6
+    cleo
+    clikit
     requests
     cachy
     requests-toolbelt
@@ -60,13 +60,16 @@ in buildPythonPackage rec {
     pyrsistent
     pyparsing
     cachecontrol
-    lockfile
     pkginfo
     html5lib
     shellingham
     tomlkit
+    pexpect
+    keyring
+    lockfile
   ] ++ lib.optionals (isPy27 || isPy34) [ typing pathlib2 glob2 ]
-    ++ lib.optionals isPy27 [ virtualenv functools32 subprocess32 ];
+    ++ lib.optionals isPy27 [ virtualenv functools32 subprocess32 ]
+    ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
   postInstall = ''
     mkdir -p "$out/share/bash-completion/completions"
@@ -85,7 +88,7 @@ in buildPythonPackage rec {
   '';
 
   meta = with lib; {
-    homepage = https://github.com/sdispater/poetry;
+    homepage = "https://python-poetry.org/";
     description = "Python dependency management and packaging made easy";
     license = licenses.mit;
     maintainers = with maintainers; [ jakewaksbaum ];

From 2fea715779b23c03ba13096824e9084a933f5cc8 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 22 Feb 2020 12:13:22 -0800
Subject: [PATCH 1323/4636] pythonPackages.acoustics: disable

no longer compatible with pandas>=1
---
 pkgs/development/python-modules/acoustics/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix
index 85ce02be1c3d..bf3f31d351fa 100644
--- a/pkgs/development/python-modules/acoustics/default.nix
+++ b/pkgs/development/python-modules/acoustics/default.nix
@@ -25,6 +25,7 @@ buildPythonPackage rec {
     description = "A package for acousticians";
     maintainers = with maintainers; [ fridh ];
     license = with licenses; [ bsd3 ];
-    homepage = https://github.com/python-acoustics/python-acoustics;
+    homepage = "https://github.com/python-acoustics/python-acoustics";
+    broken = true; # no longer compatible with pandas>=1
   };
 }

From 076e16989d68300ebffe64f4e7b010fc97cff478 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 22 Feb 2020 07:45:50 +0000
Subject: [PATCH 1324/4636] netdata: 1.19.0 -> 1.20.0

---
 pkgs/tools/system/netdata/default.nix         |  15 +-
 pkgs/tools/system/netdata/deps.nix            | 534 ++++++++++++++++++
 pkgs/tools/system/netdata/go.d.plugin.nix     |  30 +
 .../netdata/no-files-in-etc-and-var.patch     | 176 +++---
 4 files changed, 649 insertions(+), 106 deletions(-)
 create mode 100644 pkgs/tools/system/netdata/deps.nix
 create mode 100644 pkgs/tools/system/netdata/go.d.plugin.nix

diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index 4f8cfb966e86..714efb918539 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+{ stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkgconfig
 , CoreFoundation, IOKit, libossp_uuid
 , curl, libcap,  libuuid, lm_sensors, zlib
 , withCups ? false, cups
@@ -11,15 +11,17 @@
 
 with stdenv.lib;
 
-stdenv.mkDerivation rec {
-  version = "1.19.0";
+let
+  go-d-plugin = callPackage ./go.d.plugin.nix {};
+in stdenv.mkDerivation rec {
+  version = "1.20.0";
   pname = "netdata";
 
   src = fetchFromGitHub {
     owner = "netdata";
     repo = "netdata";
     rev = "v${version}";
-    sha256 = "1s6kzx4xh8b6v7ki8h2mfzprj5rxvlgx2md20cr8c0v81qpz3q3q";
+    sha256 = "0g7iv5w14wndl5iv2q81dppgwq09sm93vpnyq7p49nl7q1dsz1d6";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -38,7 +40,10 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1";
 
-  postInstall = optionalString (!stdenv.isDarwin) ''
+  postInstall = ''
+    ln -s ${go-d-plugin.bin}/lib/netdata/conf.d/* $out/lib/netdata/conf.d
+    ln -s ${go-d-plugin.bin}/bin/godplugind $out/libexec/netdata/plugins.d/go.d.plugin
+  '' + optionalString (!stdenv.isDarwin) ''
     # rename this plugin so netdata will look for setuid wrapper
     mv $out/libexec/netdata/plugins.d/apps.plugin \
        $out/libexec/netdata/plugins.d/apps.plugin.org
diff --git a/pkgs/tools/system/netdata/deps.nix b/pkgs/tools/system/netdata/deps.nix
new file mode 100644
index 000000000000..10d933c5a568
--- /dev/null
+++ b/pkgs/tools/system/netdata/deps.nix
@@ -0,0 +1,534 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
+[
+  {
+    goPackagePath = "github.com/OneOfOne/xxhash";
+    fetch = {
+      type = "git";
+      url = "https://github.com/OneOfOne/xxhash";
+      rev = "v1.2.2";
+      sha256 = "1mjfhrwhvxa48rycjnqpqzm521i38h1hdyz6pdwmhd7xb8j6gwi6";
+    };
+  }
+  {
+    goPackagePath = "github.com/Wing924/ltsv";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Wing924/ltsv";
+      rev = "v0.3.1";
+      sha256 = "05jl8myq16y847wmx6cmlxl50z86cpiv9pq4fflmac7lp4hf67m3";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/template";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/template";
+      rev = "fb15b899a751";
+      sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/units";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/units";
+      rev = "c3de453c63f4";
+      sha256 = "0js37zlgv37y61j4a2d46jh72xm5kxmpaiw0ya9v944bjpc386my";
+    };
+  }
+  {
+    goPackagePath = "github.com/axiomhq/hyperloglog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/axiomhq/hyperloglog";
+      rev = "a4c4c47bc57f";
+      sha256 = "0pwjxyhn0ms3n1q0hbqb5gz2lxb28giflkya9ck2lwfyd28y254s";
+    };
+  }
+  {
+    goPackagePath = "github.com/beorn7/perks";
+    fetch = {
+      type = "git";
+      url = "https://github.com/beorn7/perks";
+      rev = "v1.0.0";
+      sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x";
+    };
+  }
+  {
+    goPackagePath = "github.com/cespare/xxhash";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cespare/xxhash";
+      rev = "v1.1.0";
+      sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x";
+    };
+  }
+  {
+    goPackagePath = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev = "v1.1.1";
+      sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+    };
+  }
+  {
+    goPackagePath = "github.com/davecgh/go-xdr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-xdr";
+      rev = "e6a2ba005892";
+      sha256 = "0vifrz4iil4r7k8sz5iqlfbh80ysgs5abp2simgyhsbrkxrrsrrd";
+    };
+  }
+  {
+    goPackagePath = "github.com/dgryski/go-metro";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dgryski/go-metro";
+      rev = "280f6062b5bc";
+      sha256 = "1a82ksyklh1lcpgzh07ik78pgz4m0b3q921yfglafd7v0ld6xljr";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-kit/kit";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-kit/kit";
+      rev = "v0.9.0";
+      sha256 = "09038mnw705h7isbjp8dzgp2i04bp5rqkmifxvwc5xkh75s00qpw";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-logfmt/logfmt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-logfmt/logfmt";
+      rev = "v0.4.0";
+      sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-sql-driver/mysql";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-sql-driver/mysql";
+      rev = "v1.5.0";
+      sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-stack/stack";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-stack/stack";
+      rev = "v1.8.0";
+      sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v";
+    };
+  }
+  {
+    goPackagePath = "github.com/gogo/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogo/protobuf";
+      rev = "v1.1.1";
+      sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "v1.3.2";
+      sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/uuid";
+      rev = "6a5e28554805";
+      sha256 = "0q1zwabj77agp1yljqjlf31ip8c6lr25xwqlw3zzfgha81y45lv0";
+    };
+  }
+  {
+    goPackagePath = "github.com/influxdata/influxdb";
+    fetch = {
+      type = "git";
+      url = "https://github.com/influxdata/influxdb";
+      rev = "v1.7.6";
+      sha256 = "07abzhmsgj7krmhf7jis50a4fc4w29h48nyzgvrll5lz3cax979q";
+    };
+  }
+  {
+    goPackagePath = "github.com/jessevdk/go-flags";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jessevdk/go-flags";
+      rev = "v1.4.0";
+      sha256 = "0algnnigph27spgn655zm4723yfjxjjvlf4k14z9drj3682df25a";
+    };
+  }
+  {
+    goPackagePath = "github.com/json-iterator/go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/json-iterator/go";
+      rev = "v1.1.6";
+      sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r";
+    };
+  }
+  {
+    goPackagePath = "github.com/julienschmidt/httprouter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/julienschmidt/httprouter";
+      rev = "v1.2.0";
+      sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666";
+    };
+  }
+  {
+    goPackagePath = "github.com/konsorten/go-windows-terminal-sequences";
+    fetch = {
+      type = "git";
+      url = "https://github.com/konsorten/go-windows-terminal-sequences";
+      rev = "v1.0.1";
+      sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/logfmt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/logfmt";
+      rev = "b84e30acd515";
+      sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/pretty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/pretty";
+      rev = "v0.1.0";
+      sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/pty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/pty";
+      rev = "v1.1.1";
+      sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/text";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/text";
+      rev = "v0.1.0";
+      sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-isatty";
+      rev = "v0.0.7";
+      sha256 = "1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd";
+    };
+  }
+  {
+    goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+    fetch = {
+      type = "git";
+      url = "https://github.com/matttproud/golang_protobuf_extensions";
+      rev = "v1.0.1";
+      sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
+    };
+  }
+  {
+    goPackagePath = "github.com/miekg/dns";
+    fetch = {
+      type = "git";
+      url = "https://github.com/miekg/dns";
+      rev = "v1.1.27";
+      sha256 = "0fpd9alvhzrkb1c31n4lrxlpv1nlhy51w1yg39xxb3mjmrb7lby1";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/go-homedir";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-homedir";
+      rev = "v1.1.0";
+      sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
+    };
+  }
+  {
+    goPackagePath = "github.com/modern-go/concurrent";
+    fetch = {
+      type = "git";
+      url = "https://github.com/modern-go/concurrent";
+      rev = "bacd9c7ef1dd";
+      sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
+    };
+  }
+  {
+    goPackagePath = "github.com/modern-go/reflect2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/modern-go/reflect2";
+      rev = "v1.0.1";
+      sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf";
+    };
+  }
+  {
+    goPackagePath = "github.com/mwitkow/go-conntrack";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mwitkow/go-conntrack";
+      rev = "cc309e4a2223";
+      sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf";
+    };
+  }
+  {
+    goPackagePath = "github.com/netdata/go-orchestrator";
+    fetch = {
+      type = "git";
+      url = "https://github.com/netdata/go-orchestrator";
+      rev = "c793edba0e8f";
+      sha256 = "0bqvqdkd510yl3c9f86h6ii7r1l5sjx0x655lzgv6cahq90k3pr7";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev = "v0.8.1";
+      sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
+    };
+  }
+  {
+    goPackagePath = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev = "v1.0.0";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_golang";
+      rev = "v1.0.0";
+      sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_model";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_model";
+      rev = "v0.2.0";
+      sha256 = "0jffnz94d6ff39fr96b5w8i8yk26pwnrfggzz8jhi8k0yihg2c9d";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/common";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/common";
+      rev = "v0.9.0";
+      sha256 = "0gvfb622fjybvhwh8rjpgnz2zxrz9cdc1kzn40hk4hyqg5435w3b";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/procfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/procfs";
+      rev = "v0.0.2";
+      sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/prometheus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/prometheus";
+      rev = "v2.5.0";
+      sha256 = "07sgsmazjr5lgkbaz63qanpg536pyfb7asljz67rqz6c47ngzifp";
+    };
+  }
+  {
+    goPackagePath = "github.com/sirupsen/logrus";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sirupsen/logrus";
+      rev = "v1.4.2";
+      sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x";
+    };
+  }
+  {
+    goPackagePath = "github.com/spaolacci/murmur3";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spaolacci/murmur3";
+      rev = "f09979ecbc72";
+      sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25";
+    };
+  }
+  {
+    goPackagePath = "github.com/stretchr/objx";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/objx";
+      rev = "v0.1.1";
+      sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
+    };
+  }
+  {
+    goPackagePath = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev = "v1.4.0";
+      sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb";
+    };
+  }
+  {
+    goPackagePath = "github.com/vmware/govmomi";
+    fetch = {
+      type = "git";
+      url = "https://github.com/vmware/govmomi";
+      rev = "v0.22.1";
+      sha256 = "1z4am6143jrrls0023flnqgadm1z9p60w09cp1j5pnslm60vvw78";
+    };
+  }
+  {
+    goPackagePath = "github.com/vmware/vmw-guestinfo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/vmware/vmw-guestinfo";
+      rev = "25eff159a728";
+      sha256 = "1nag33p0i6zxh25kf0hpdsc3n1agrjsncdqqj8sxd2q1zf7lhf5j";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "87dc89f01550";
+      sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/mod";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/mod";
+      rev = "c90efee705ee";
+      sha256 = "0i5md645rmcy5z5ij9ng428k9rz4g3k1kjy3blsq1264rn426gdf";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "aa69164e4478";
+      sha256 = "1w0r52a9csj5vkhysvdx6l5v2dq1lnmvs95ffhpibypjha7lq214";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sync";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sync";
+      rev = "112230192c58";
+      sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "2837fb4f24fe";
+      sha256 = "01wrq33y1bjkk0kpxhs59iq7i95llhs2f8k0v5mr3f6wd46v4h5b";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "v0.3.0";
+      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev = "49a3e744a425";
+      sha256 = "0xx4gv9wpv36crk7gv7imf5vzzs2mz7zla2q2jkck3xnzff8fw3v";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/xerrors";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/xerrors";
+      rev = "1b5146add898";
+      sha256 = "0w2akj91krxjag0xdhsg78470888nicc5ismc2ap9jqpss6v1zih";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/alecthomas/kingpin.v2";
+      rev = "v2.2.6";
+      sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/check.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/check.v1";
+      rev = "20d25e280405";
+      sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/yaml.v2";
+      rev = "v2.2.7";
+      sha256 = "0k5xcwkd3wmcx54isk7ck9cwp8fapfhyqdz3f13kxp77cxqizazj";
+    };
+  }
+  {
+    goPackagePath = "layeh.com/radius";
+    fetch = {
+      type = "git";
+      url = "https://github.com/layeh/radius";
+      rev = "890bc1058917";
+      sha256 = "01ncxwmlj5xjz4kd4pbp77xqqgixip492ilczk7ac0fivjcvdnb3";
+    };
+  }
+]
diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix
new file mode 100644
index 000000000000..0e1de1bbd8e7
--- /dev/null
+++ b/pkgs/tools/system/netdata/go.d.plugin.nix
@@ -0,0 +1,30 @@
+{ lib, fetchFromGitHub, buildGoPackage }:
+
+buildGoPackage rec {
+  pname = "netdata-go.d.plugin";
+  version = "0.15.0";
+
+  src = fetchFromGitHub {
+    owner = "netdata";
+    repo = "go.d.plugin";
+    rev = "v${version}";
+    sha256 = "0v732mndhgrbqiwsdndqd08pvgbvl4ffn5rqbyv7iw1dwwr08f67";
+  };
+
+  goPackagePath = "github.com/netdata/go.d.plugin";
+
+  postInstall = ''
+    mkdir -p $bin/lib/netdata/conf.d
+    cp -r go/src/${goPackagePath}/config/* $bin/lib/netdata/conf.d
+  '';
+
+  goDeps = ./deps.nix;
+
+  meta = with lib; {
+    description = "Netdata orchestrator for data collection modules written in go";
+    homepage = https://github.com/netdata/go.d.plugin;
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch b/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch
index 138787b98f1f..594805fdf187 100644
--- a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch
+++ b/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch
@@ -1,155 +1,129 @@
-diff --git a/Makefile.am b/Makefile.am
-index 2625dcc..1fdd645 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -113,10 +113,10 @@ AM_CFLAGS = \
-     $(NULL)
- 
- sbin_PROGRAMS =
--dist_cache_DATA = packaging/installer/.keep
--dist_varlib_DATA = packaging/installer/.keep
--dist_registry_DATA = packaging/installer/.keep
--dist_log_DATA = packaging/installer/.keep
-+dist_cache_DATA =
-+dist_varlib_DATA =
-+dist_registry_DATA =
-+dist_log_DATA =
- plugins_PROGRAMS =
- 
- LIBNETDATA_FILES = \
+From 4ecc1475be94a384c122594b5f7d455beb64a2f0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
+Date: Sat, 22 Feb 2020 06:42:14 +0000
+Subject: [PATCH] no files in etc and var
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
+---
+ collectors/Makefile.am                 | 2 +-
+ collectors/charts.d.plugin/Makefile.am | 2 +-
+ collectors/node.d.plugin/Makefile.am   | 2 +-
+ collectors/python.d.plugin/Makefile.am | 2 +-
+ collectors/statsd.plugin/Makefile.am   | 2 +-
+ health/Makefile.am                     | 2 +-
+ system/Makefile.am                     | 3 +--
+ web/Makefile.am                        | 2 +-
+ 8 files changed, 8 insertions(+), 9 deletions(-)
+
 diff --git a/collectors/Makefile.am b/collectors/Makefile.am
-index 7431025..f62f8ac 100644
+index 9bb52958..c9799165 100644
 --- a/collectors/Makefile.am
 +++ b/collectors/Makefile.am
-@@ -30,11 +30,6 @@ SUBDIRS = \
- usercustompluginsconfigdir=$(configdir)/custom-plugins.d
+@@ -32,7 +32,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d
  usergoconfigdir=$(configdir)/go.d
  
--# Explicitly install directories to avoid permission issues due to umask
+ # Explicitly install directories to avoid permission issues due to umask
 -install-exec-local:
--	$(INSTALL) -d $(DESTDIR)$(usercustompluginsconfigdir)
--	$(INSTALL) -d $(DESTDIR)$(usergoconfigdir)
--
- dist_noinst_DATA = \
-     README.md \
-     $(NULL)
++no-install-exec-local:
+ 	$(INSTALL) -d $(DESTDIR)$(usercustompluginsconfigdir)
+ 	$(INSTALL) -d $(DESTDIR)$(usergoconfigdir)
+ 
 diff --git a/collectors/charts.d.plugin/Makefile.am b/collectors/charts.d.plugin/Makefile.am
-index b3b2fb9..68b768e 100644
+index 03c7f0a9..01985db0 100644
 --- a/collectors/charts.d.plugin/Makefile.am
 +++ b/collectors/charts.d.plugin/Makefile.am
-@@ -31,13 +31,8 @@ dist_charts_DATA = \
- 
- userchartsconfigdir=$(configdir)/charts.d
- dist_userchartsconfig_DATA = \
--    .keep \
+@@ -34,7 +34,7 @@ dist_userchartsconfig_DATA = \
      $(NULL)
  
--# Explicitly install directories to avoid permission issues due to umask
+ # Explicitly install directories to avoid permission issues due to umask
 -install-exec-local:
--	$(INSTALL) -d $(DESTDIR)$(userchartsconfigdir)
--
++no-install-exec-local:
+ 	$(INSTALL) -d $(DESTDIR)$(userchartsconfigdir)
+ 
  chartsconfigdir=$(libconfigdir)/charts.d
- dist_chartsconfig_DATA = \
-     $(NULL)
 diff --git a/collectors/node.d.plugin/Makefile.am b/collectors/node.d.plugin/Makefile.am
-index 411bce9..ba60276 100644
+index c3142d43..95e32445 100644
 --- a/collectors/node.d.plugin/Makefile.am
 +++ b/collectors/node.d.plugin/Makefile.am
-@@ -23,13 +23,8 @@ dist_noinst_DATA = \
- 
- usernodeconfigdir=$(configdir)/node.d
- dist_usernodeconfig_DATA = \
--    .keep \
+@@ -26,7 +26,7 @@ dist_usernodeconfig_DATA = \
      $(NULL)
  
--# Explicitly install directories to avoid permission issues due to umask
+ # Explicitly install directories to avoid permission issues due to umask
 -install-exec-local:
--	$(INSTALL) -d $(DESTDIR)$(usernodeconfigdir)
--
++no-install-exec-local:
+ 	$(INSTALL) -d $(DESTDIR)$(usernodeconfigdir)
+ 
  nodeconfigdir=$(libconfigdir)/node.d
- dist_nodeconfig_DATA = \
-     $(NULL)
 diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am
-index cb14e35..8a6c5a7 100644
+index e678f86a..29a319da 100644
 --- a/collectors/python.d.plugin/Makefile.am
 +++ b/collectors/python.d.plugin/Makefile.am
-@@ -29,13 +29,8 @@ dist_python_DATA = \
- 
- userpythonconfigdir=$(configdir)/python.d
- dist_userpythonconfig_DATA = \
--    .keep \
+@@ -32,7 +32,7 @@ dist_userpythonconfig_DATA = \
      $(NULL)
  
--# Explicitly install directories to avoid permission issues due to umask
+ # Explicitly install directories to avoid permission issues due to umask
 -install-exec-local:
--	$(INSTALL) -d $(DESTDIR)$(userpythonconfigdir)
--
++no-install-exec-local:
+ 	$(INSTALL) -d $(DESTDIR)$(userpythonconfigdir)
+ 
  pythonconfigdir=$(libconfigdir)/python.d
- dist_pythonconfig_DATA = \
-     $(NULL)
 diff --git a/collectors/statsd.plugin/Makefile.am b/collectors/statsd.plugin/Makefile.am
-index 87b6ca7..9d010c7 100644
+index b01302d1..f5b77da4 100644
 --- a/collectors/statsd.plugin/Makefile.am
 +++ b/collectors/statsd.plugin/Makefile.am
-@@ -14,9 +14,4 @@ dist_statsdconfig_DATA = \
- 
- userstatsdconfigdir=$(configdir)/statsd.d
- dist_userstatsdconfig_DATA = \
--    .keep \
+@@ -17,5 +17,5 @@ dist_userstatsdconfig_DATA = \
      $(NULL)
--
--# Explicitly install directories to avoid permission issues due to umask
+ 
+ # Explicitly install directories to avoid permission issues due to umask
 -install-exec-local:
--	$(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir)
++no-install-exec-local:
+ 	$(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir)
 diff --git a/health/Makefile.am b/health/Makefile.am
-index f63faa8..8912ef2 100644
+index 853ed0d7..210330a6 100644
 --- a/health/Makefile.am
 +++ b/health/Makefile.am
-@@ -16,13 +16,8 @@ dist_noinst_DATA = \
- 
- userhealthconfigdir=$(configdir)/health.d
- dist_userhealthconfig_DATA = \
--    .keep \
+@@ -19,7 +19,7 @@ dist_userhealthconfig_DATA = \
      $(NULL)
  
--# Explicitly install directories to avoid permission issues due to umask
+ # Explicitly install directories to avoid permission issues due to umask
 -install-exec-local:
--	$(INSTALL) -d $(DESTDIR)$(userhealthconfigdir)
--
++no-install-exec-local:
+ 	$(INSTALL) -d $(DESTDIR)$(userhealthconfigdir)
+ 
  healthconfigdir=$(libconfigdir)/health.d
- dist_healthconfig_DATA = \
-     health.d/adaptec_raid.conf \
 diff --git a/system/Makefile.am b/system/Makefile.am
-index ad68c65..bf6a840 100644
+index ad68c655..74f032f9 100644
 --- a/system/Makefile.am
 +++ b/system/Makefile.am
-@@ -16,14 +16,6 @@ CLEANFILES = \
- include $(top_srcdir)/build/subst.inc
+@@ -17,11 +17,10 @@ include $(top_srcdir)/build/subst.inc
  SUFFIXES = .in
  
--dist_config_SCRIPTS = \
+ dist_config_SCRIPTS = \
 -    edit-config \
--    $(NULL)
--
--# Explicitly install directories to avoid permission issues due to umask
+     $(NULL)
+ 
+ # Explicitly install directories to avoid permission issues due to umask
 -install-exec-local:
--	$(INSTALL) -d $(DESTDIR)$(configdir)
--
++no-install-exec-local:
+ 	$(INSTALL) -d $(DESTDIR)$(configdir)
+ 
  nodist_noinst_DATA = \
-     netdata-openrc \
-     netdata.logrotate \
 diff --git a/web/Makefile.am b/web/Makefile.am
-index ccaccd7..f2fed50 100644
+index ccaccd76..16a2977e 100644
 --- a/web/Makefile.am
 +++ b/web/Makefile.am
-@@ -11,10 +11,6 @@ SUBDIRS = \
- 
+@@ -12,7 +12,7 @@ SUBDIRS = \
  usersslconfigdir=$(configdir)/ssl
  
--# Explicitly install directories to avoid permission issues due to umask
+ # Explicitly install directories to avoid permission issues due to umask
 -install-exec-local:
--	$(INSTALL) -d $(DESTDIR)$(usersslconfigdir)
--
++no-install-exec-local:
+ 	$(INSTALL) -d $(DESTDIR)$(usersslconfigdir)
+ 
  dist_noinst_DATA = \
-     README.md \
-     gui/confluence/README.md \
+-- 
+2.25.0
+

From 72c2f16d769260f57530b0fdea0300bab230394f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 22 Feb 2020 21:47:15 +0000
Subject: [PATCH 1325/4636] inadyn: 2.5 -> 2.6

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

diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix
index 20169121cd9a..9f7d79bdd88c 100644
--- a/pkgs/tools/networking/inadyn/default.nix
+++ b/pkgs/tools/networking/inadyn/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "inadyn";
-  version = "2.5";
+  version = "2.6";
 
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "inadyn";
     rev = "v${version}";
-    sha256 = "0izhynqfj4xafsrc653wym8arwps0qim203w8l0g5z9vzfxfnvqw";
+    sha256 = "013kxlglxliajv3lrsix4w88w40g709rvycajb6ad6gbh8giqv47";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://troglobit.com/project/inadyn/;
+    homepage = "http://troglobit.com/project/inadyn/";
     description = "Free dynamic DNS client";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ ];

From 50f3704c2f8bf4fbdcdfb7aeca967d94028045e8 Mon Sep 17 00:00:00 2001
From: Maxim Krivchikov <maxim.krivchikov@gmail.com>
Date: Sat, 22 Feb 2020 22:05:18 +0000
Subject: [PATCH 1326/4636] pythonPackages.ldaptor: fix build

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

diff --git a/pkgs/development/python-modules/ldaptor/default.nix b/pkgs/development/python-modules/ldaptor/default.nix
index 49dc9a9b25b3..614fe60ada9d 100644
--- a/pkgs/development/python-modules/ldaptor/default.nix
+++ b/pkgs/development/python-modules/ldaptor/default.nix
@@ -2,9 +2,11 @@
 , buildPythonPackage
 , fetchPypi
 , twisted
+, passlib
 , pycrypto
 , pyopenssl
 , pyparsing
+, service-identity
 , zope_interface
 , isPy3k
 }:
@@ -19,7 +21,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    twisted pycrypto pyopenssl pyparsing zope_interface
+    twisted passlib pycrypto pyopenssl pyparsing service-identity zope_interface
   ];
 
   disabled = isPy3k;
@@ -32,4 +34,4 @@ buildPythonPackage rec {
     homepage = https://github.com/twisted/ldaptor;
     license = lib.licenses.mit;
   };
-}
\ No newline at end of file
+}

From 4a3262fcf2be9991aae68f97350b5333da2c8c36 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 23 Feb 2020 08:04:57 +1000
Subject: [PATCH 1327/4636] skaffold: 1.3.1 -> 1.4.0

https://github.com/GoogleContainerTools/skaffold/releases/tag/v1.4.0
---
 pkgs/development/tools/skaffold/default.nix | 26 ++++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix
index 325338c376a2..bab881cf4a49 100644
--- a/pkgs/development/tools/skaffold/default.nix
+++ b/pkgs/development/tools/skaffold/default.nix
@@ -1,10 +1,10 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }:
 
 buildGoPackage rec {
   pname = "skaffold";
-  version = "1.3.1";
-  # rev is the 1.3.1 commit, mainly for skaffold version command output
-  rev = "6ba887a42438d1da578a005cf550e618fee6dfb8";
+  version = "1.4.0";
+  # rev is the ${version} commit, mainly for skaffold version command output
+  rev = "bb324609b4254ceb9f76d35eb03642a6a1807867";
 
   goPackagePath = "github.com/GoogleContainerTools/skaffold";
   subPackages = ["cmd/skaffold"];
@@ -20,13 +20,21 @@ buildGoPackage rec {
     owner = "GoogleContainerTools";
     repo = "skaffold";
     rev = "v${version}";
-    sha256 = "1ph7qyk5khdinxbhgqhhja8fz8b6q8yz5rj5xh0nwaff4bmlfd99";
+    sha256 = "0nrz2gnp722cq4p8lcfl0nlws53c2bfq17jgr2jad4vyjglgfscw";
   };
 
-  meta = {
+  nativeBuildInputs = [ installShellFiles ];
+  postInstall = ''
+    for shell in bash zsh; do
+      $bin/bin/skaffold completion $shell > skaffold.$shell
+      installShellCompletion skaffold.$shell
+    done
+  '';
+
+  meta = with lib; {
     description = "Easy and Repeatable Kubernetes Development";
-    homepage = https://github.com/GoogleContainerTools/skaffold;
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ vdemeester ];
+    homepage = "https://skaffold.dev/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ vdemeester ];
   };
 }

From 4644a4c482ef66ac54d5860629cfd1b8f1820537 Mon Sep 17 00:00:00 2001
From: Maxim Krivchikov <maxim.krivchikov@gmail.com>
Date: Sat, 22 Feb 2020 22:29:49 +0000
Subject: [PATCH 1328/4636] pythonPackages.pyfribidi: fix build

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

diff --git a/pkgs/development/python-modules/pyfribidi/default.nix b/pkgs/development/python-modules/pyfribidi/default.nix
index 50a0bfa1e22f..6e9e56eee33c 100644
--- a/pkgs/development/python-modules/pyfribidi/default.nix
+++ b/pkgs/development/python-modules/pyfribidi/default.nix
@@ -1,14 +1,14 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
-, isPy3k
 , isPyPy
+, six
 }:
 
 buildPythonPackage rec {
   version = "0.12.0";
   pname = "pyfribidi";
-  disabled = isPy3k || isPyPy;
+  disabled = isPyPy;
 
   src = fetchPypi {
     inherit pname version;
@@ -16,6 +16,8 @@ buildPythonPackage rec {
     sha256 = "64726a4a56783acdc79c6b9b3a15f16e6071077c897a0b999f3b43f744bc621c";
   };
 
+  propagatedBuildInputs = [ six ];
+
   meta = with stdenv.lib; {
     description = "A simple wrapper around fribidi";
     homepage = https://github.com/pediapress/pyfribidi;

From f0b586c6121a608af1c03be5c372323912012997 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 22 Feb 2020 22:39:51 +0000
Subject: [PATCH 1329/4636] libite: 2.1.0 -> 2.1.2

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

diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix
index 34ca7406d697..26d7e1e961d4 100644
--- a/pkgs/development/libraries/libite/default.nix
+++ b/pkgs/development/libraries/libite/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libite";
-  version = "2.1.0";
+  version = "2.1.2";
 
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "libite";
     rev = "v${version}";
-    sha256 = "0fi3j3y37id24cgy3868pyvxkd6mvbbraalvpm99f5dhrxdlv961";
+    sha256 = "0pvki6cm3ia27nsd6dljddjgz1bd6avf6c0ppj63fa3sz52lfmga";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 4e9b94836fb3b548685bab95d4c07caa03fc0748 Mon Sep 17 00:00:00 2001
From: Echo Nolan <echo@echonolan.net>
Date: Sat, 22 Feb 2020 02:16:29 -0800
Subject: [PATCH 1330/4636] libeatmydata: fix launcher script - find shell
 library properly

The new version of the launcher script in version 105 doesn't have the #8665
bug, but it does try to find the shell library using Debian tools, which
obviously doesn't work on Nix. Removed the now-unneccessary makeWrapper and
patched out the Debian bits.
---
 .../libraries/libeatmydata/default.nix        | 11 +++++-----
 .../libeatmydata/find-shell-lib.patch         | 20 +++++++++++++++++++
 2 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/libraries/libeatmydata/find-shell-lib.patch

diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix
index 5127231dab60..29ca85cdeb01 100644
--- a/pkgs/development/libraries/libeatmydata/default.nix
+++ b/pkgs/development/libraries/libeatmydata/default.nix
@@ -2,17 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "libeatmydata-105";
-  
+
   src = fetchurl {
     url = "https://www.flamingspork.com/projects/libeatmydata/${name}.tar.gz";
     sha256 = "1pd8sc73cgc41ldsvq6g8ics1m5k8gdcb91as9yg8z5jnrld1lmx";
   };
 
-  buildInputs = [ makeWrapper ];
-
-  postInstall = ''
-    wrapProgram $out/bin/eatmydata \
-      --prefix PATH : $out/bin
+  patches = [ ./find-shell-lib.patch ];
+  patchFlags = "-p0";
+  postPatch = ''
+    substituteInPlace eatmydata.in --replace NIX_OUT_DIR $out
   '';
 
   meta = {
diff --git a/pkgs/development/libraries/libeatmydata/find-shell-lib.patch b/pkgs/development/libraries/libeatmydata/find-shell-lib.patch
new file mode 100644
index 000000000000..a6320edda29d
--- /dev/null
+++ b/pkgs/development/libraries/libeatmydata/find-shell-lib.patch
@@ -0,0 +1,20 @@
+--- eatmydata.in	2020-02-01 18:10:59.618679823 -0800
++++ eatmydata.in.new	2020-02-01 18:08:25.092620247 -0800
+@@ -15,15 +15,8 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+-export `dpkg-architecture|grep DEB_BUILD_MULTIARCH`
+-
+-shlib="/usr/lib/$DEB_BUILD_MULTIARCH/eatmydata.sh"
+-if [ -f "$shlib" ]; then
+-    . "$shlib"
+-else
+-    echo "Unable to locate eatmydata shell library, it was not enabled" >&2
+-    exec "$@"
+-fi
++shlib="NIX_OUT_DIR/libexec/eatmydata.sh"
++. "$shlib"
+ 
+ usage()
+ {

From 4ac9af7bd346e4e3b9d73fd46b8106e9fcea3af5 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 19 Feb 2020 21:07:13 -0500
Subject: [PATCH 1331/4636] glib: 2.62.4 -> 2.62.5

---
 pkgs/development/libraries/glib/default.nix   |  4 ++--
 .../libraries/glib/split-dev-programs.patch   | 22 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 187562132300..6bc5a6c2535a 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -48,11 +48,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "glib";
-  version = "2.62.4";
+  version = "2.62.5";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1g2vj9lyh032kcwij7avx5d6a99rcsnkd07sbl9i55zsfw6h712c";
+    sha256 = "0bj5hagvfiqcjd20w543pvbnrlqvs8nbxvqjflyvcn36ljpwvldq";
   };
 
   patches = optionals stdenv.isDarwin [
diff --git a/pkgs/development/libraries/glib/split-dev-programs.patch b/pkgs/development/libraries/glib/split-dev-programs.patch
index 9d3989a30a54..9a949ea1226c 100644
--- a/pkgs/development/libraries/glib/split-dev-programs.patch
+++ b/pkgs/development/libraries/glib/split-dev-programs.patch
@@ -1,5 +1,5 @@
 diff --git a/gio/gdbus-2.0/codegen/meson.build b/gio/gdbus-2.0/codegen/meson.build
-index 121e9e6bb..b76fa0188 100644
+index 5ea6bae2f..e0b584a86 100644
 --- a/gio/gdbus-2.0/codegen/meson.build
 +++ b/gio/gdbus-2.0/codegen/meson.build
 @@ -16,7 +16,7 @@ gdbus_codegen_conf.set('DATADIR', glib_datadir)
@@ -12,15 +12,15 @@ index 121e9e6bb..b76fa0188 100644
  )
    # Provide tools for others when we're a subproject and they use the Meson GNOME module
 diff --git a/gio/meson.build b/gio/meson.build
-index 9a9e621b3..12e1d146a 100644
+index 3535788ab..99c3b48d6 100644
 --- a/gio/meson.build
 +++ b/gio/meson.build
-@@ -830,14 +830,15 @@ pkg.generate(libgio,
+@@ -831,14 +831,15 @@ pkg.generate(libgio,
    variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')),
                 'schemasdir=' + join_paths('${datadir}', schemas_subdir),
                 'bindir=' + join_paths('${prefix}', get_option('bindir')),
 +               'devbindir=' + get_option('devbindir'),
-                'giomoduledir=' + giomodulesdir,
+                'giomoduledir=' + pkgconfig_giomodulesdir,
                 'gio=' + join_paths('${bindir}', 'gio'),
 -               'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'),
 -               'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'),
@@ -36,7 +36,7 @@ index 9a9e621b3..12e1d146a 100644
                 'gsettings=' + join_paths('${bindir}', 'gsettings')],
    version : glib_version,
    install_dir : glib_pkgconfigreldir,
-@@ -938,12 +939,14 @@ executable('gio', gio_tool_sources,
+@@ -939,12 +940,14 @@ executable('gio', gio_tool_sources,
  
  executable('gresource', 'gresource-tool.c',
    install : true,
@@ -51,7 +51,7 @@ index 9a9e621b3..12e1d146a 100644
    c_args : gio_c_args,
    # intl.lib is not compatible with SAFESEH
    link_args : noseh_link_args,
-@@ -952,6 +955,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu
+@@ -953,6 +956,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu
  glib_compile_schemas = executable('glib-compile-schemas',
    [gconstructor_as_data_h, 'gvdb/gvdb-builder.c', 'glib-compile-schemas.c'],
    install : true,
@@ -59,7 +59,7 @@ index 9a9e621b3..12e1d146a 100644
    # intl.lib is not compatible with SAFESEH
    link_args : noseh_link_args,
    dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
-@@ -959,6 +963,7 @@ glib_compile_schemas = executable('glib-compile-schemas',
+@@ -960,6 +964,7 @@ glib_compile_schemas = executable('glib-compile-schemas',
  glib_compile_resources = executable('glib-compile-resources',
    [gconstructor_as_data_h, 'gvdb/gvdb-builder.c', 'glib-compile-resources.c'],
    install : true,
@@ -68,7 +68,7 @@ index 9a9e621b3..12e1d146a 100644
    # intl.lib is not compatible with SAFESEH
    link_args : noseh_link_args,
 diff --git a/glib/meson.build b/glib/meson.build
-index 91a48f194..80472a06b 100644
+index aaf5f00f5..09edd291a 100644
 --- a/glib/meson.build
 +++ b/glib/meson.build
 @@ -375,9 +375,10 @@ pkg.generate(libglib,
@@ -103,7 +103,7 @@ index 91a48f194..80472a06b 100644
    install_mode: 'rwxr-xr-x'
  )
 diff --git a/gobject/meson.build b/gobject/meson.build
-index c7805c556..22ec629a4 100644
+index 85e283bab..386ad5e4e 100644
 --- a/gobject/meson.build
 +++ b/gobject/meson.build
 @@ -75,7 +75,7 @@ foreach tool: python_tools
@@ -124,10 +124,10 @@ index c7805c556..22ec629a4 100644
  
  install_data('gobject_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb'))
 diff --git a/meson.build b/meson.build
-index 717d1bccb..fb0bee8a1 100644
+index 484f4c750..c7f9327d9 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -2118,7 +2118,7 @@ if have_sh
+@@ -2122,7 +2122,7 @@ if have_sh
    gettextize_conf.set('datarootdir', glib_datadir)
    gettextize_conf.set('datadir', glib_datadir)
    configure_file(input : 'glib-gettextize.in',

From 0def916454de639b5a5374e454659a19f3fa7186 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 19 Feb 2020 21:07:25 -0500
Subject: [PATCH 1332/4636] grilo: 0.3.11 -> 0.3.12

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

diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix
index 734a103e0b78..b52ddbb0408e 100644
--- a/pkgs/development/libraries/grilo/default.nix
+++ b/pkgs/development/libraries/grilo/default.nix
@@ -4,7 +4,7 @@
 
 let
   pname = "grilo";
-  version = "0.3.11"; # if you change minor, also change ./setup-hook.sh
+  version = "0.3.12"; # if you change minor, also change ./setup-hook.sh
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0s7b50nbyvi75x2l507q9pnpp4ynrx9qa0hm2bkw7wd2nl61r48g";
+    sha256 = "0w8sq5g6g1rg85h53vbll8va70fcp6082mlpmy98aa03444ddyyv";
   };
 
   setupHook = ./setup-hook.sh;

From 1e234806e12d5e9ab0646246c53a133a7a62c62a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 19 Feb 2020 21:07:39 -0500
Subject: [PATCH 1333/4636] grilo-plugins: 0.3.10 -> 0.3.11

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

diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix
index ddf29c2dcd8c..21530c000dae 100644
--- a/pkgs/development/libraries/grilo-plugins/default.nix
+++ b/pkgs/development/libraries/grilo-plugins/default.nix
@@ -31,11 +31,11 @@
 
 stdenv.mkDerivation rec {
   pname = "grilo-plugins";
-  version = "0.3.10";
+  version = "0.3.11";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0jldaixc4kzycn5v8ixkjld1n0z3dp0l1p3vchgdwpvdvc7kcfw0";
+    sha256 = "0wyd3n5mn7b77hxylkc3f62v01mlavh96901pz342hwrn42ydqnx";
   };
 
   patches = [

From 7e22c873a256549e375e4799ecabebce23449650 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 19 Feb 2020 21:07:54 -0500
Subject: [PATCH 1334/4636] gtk3: 3.24.13 -> 3.24.14

---
 pkgs/development/libraries/gtk/3.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix
index f0d5d9d9bf2e..7caf32921de3 100644
--- a/pkgs/development/libraries/gtk/3.x.nix
+++ b/pkgs/development/libraries/gtk/3.x.nix
@@ -48,7 +48,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "gtk+3";
-  version = "3.24.13";
+  version = "3.24.14";
 
   outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc";
   outputBin = "dev";
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
-    sha256 = "1a9hi7k59q0kqx0n3xhsk1ly23w9g9ncllnay1756g0yrww5qxsc";
+    sha256 = "120yz5gxqbv7sgdbcy4i0b6ixm8jpjzialdrqs0gv15q7bwnjk8w";
   };
 
   patches = [

From 8bf3b33cf232e3babe07d4f7b5d4ee6bcdcd2512 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 19 Feb 2020 21:08:16 -0500
Subject: [PATCH 1335/4636] libpeas: 1.24.0 -> 1.24.1

---
 .../development/libraries/libpeas/default.nix |  8 ++-----
 .../libpeas/fix-libpeas-gtk-pc.patch          | 22 -------------------
 2 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch

diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix
index a4632924a93a..e73f98cd21dc 100644
--- a/pkgs/development/libraries/libpeas/default.nix
+++ b/pkgs/development/libraries/libpeas/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libpeas";
-  version = "1.24.0";
+  version = "1.24.1";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1yg6r0srz3knhgvplprl3pikrq5c02dmdxgfwcynd6hjih9h16hb";
+    sha256 = "1162dr7smmfb02czmhshr0f93hqj7w0nw29bys5lzfvwarxcyflw";
   };
 
   nativeBuildInputs = [ pkgconfig meson ninja gettext gobject-introspection ];
@@ -20,10 +20,6 @@ stdenv.mkDerivation rec {
     gobject-introspection
   ];
 
-  patches = [
-    ./fix-libpeas-gtk-pc.patch
-  ];
-
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
diff --git a/pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch b/pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch
deleted file mode 100644
index 8016939716d9..000000000000
--- a/pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/libpeas-gtk/meson.build b/libpeas-gtk/meson.build
-index bf590de..00def42 100644
---- a/libpeas-gtk/meson.build
-+++ b/libpeas-gtk/meson.build
-@@ -111,10 +111,17 @@ libpeas_gtk_test_dep = declare_dependency(
-   sources: libpeas_gtk_dep_sources,
- )
- 
-+libpeas_gtk_pc_reqs = [
-+  glib_dep,
-+  gtk_dep,
-+  package_string + ' >= @0@'.format(version)
-+]
-+
- libpeas_gtk_pc = pkg.generate(
-   libpeas_gtk_sha,
-   name: package_gtk_string,
-   description: 'GObject plugins library widgetery',
-+  requires: libpeas_gtk_pc_reqs,
-   subdirs: package_string,
-   install_dir: pkgconfigdir,
- )

From c6a1e23eb7337ced431644d218e4f684ddde3842 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 19 Feb 2020 21:08:27 -0500
Subject: [PATCH 1336/4636] libsecret: 0.20.0 -> 0.20.1

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

diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix
index d62fc1508c01..9292760c6e66 100644
--- a/pkgs/development/libraries/libsecret/default.nix
+++ b/pkgs/development/libraries/libsecret/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libsecret";
-  version = "0.20.0";
+  version = "0.20.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0hxfpm8f4rlx685igd4bv89wb80v2952h373g3w6l42kniq7667i";
+    sha256 = "0ir4ynpf8b64xss1azvsi5x6697lik7hkf3z0xxa2qv2xja3xxsp";
   };
 
   patches = [

From 9c1c68a96e0a3c93f2006727bd1c4e83f71bd81a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 19 Feb 2020 21:08:41 -0500
Subject: [PATCH 1337/4636] tracker: 2.3.1 -> 2.3.2

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

diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix
index 79b0b2e92031..b34c03d95197 100644
--- a/pkgs/development/libraries/tracker/default.nix
+++ b/pkgs/development/libraries/tracker/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tracker";
-  version = "2.3.1";
+  version = "2.3.2";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1888vyz2l5n46ywb70fryd0qipyh3x5n6q0mk56jzbb5whk8fx5n";
+    sha256 = "1nzbnvwwsk6kv6kqbxwlz8vk70l9ai6b4r9qypw51vp4qy72ny54";
   };
 
   nativeBuildInputs = [

From 8d2827fd530bd027051e2d542cddfe90b97633df Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 19 Feb 2020 21:08:59 -0500
Subject: [PATCH 1338/4636] tracker-miners: 2.3.1 -> 2.3.2

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

diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix
index 3f171f47e79c..a9d02f0629fd 100644
--- a/pkgs/development/libraries/tracker-miners/default.nix
+++ b/pkgs/development/libraries/tracker-miners/default.nix
@@ -45,11 +45,11 @@
 
 stdenv.mkDerivation rec {
   pname = "tracker-miners";
-  version = "2.3.1";
+  version = "2.3.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1q4hlpl3nkr0y13rzkwryyajnpy5s661z8n82dw1rskrg9mf07bv";
+    sha256 = "1kizavw9gbdjkw4wykgv0fcl2y6fj788nycx9p4byn6ylb1277h6";
   };
 
   nativeBuildInputs = [

From dfa418772b612ade1b0cce17c7552376b3f37871 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 19 Feb 2020 21:09:13 -0500
Subject: [PATCH 1339/4636] vte: 0.58.2 -> 0.58.3

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

diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix
index 8b19e1ee9ae0..d786bc271ccf 100644
--- a/pkgs/development/libraries/vte/default.nix
+++ b/pkgs/development/libraries/vte/default.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vte";
-  version = "0.58.2";
+  version = "0.58.3";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1h1bljr090cgnzim00q4pnsmjqblzn1sig3d87wv1hzjn796dj9k";
+    sha256 = "0xa9ipwic4jnhhbzlnqbhssz10xkzv61cpkl1ammc6mdq95bbp12";
   };
 
   passthru = {

From 0b0e6918331b1e99d2b148e296a9bd0cd0dd5479 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sat, 22 Feb 2020 18:34:05 -0500
Subject: [PATCH 1340/4636] rust 1.41: Fix build with no_std only target

See https://github.com/rust-lang/rust/pull/69381
---
 pkgs/development/compilers/rust/1_41_0.nix  | 19 +++++++++++++++++++
 pkgs/development/compilers/rust/default.nix |  3 +++
 pkgs/development/compilers/rust/rustc.nix   |  3 +++
 3 files changed, 25 insertions(+)

diff --git a/pkgs/development/compilers/rust/1_41_0.nix b/pkgs/development/compilers/rust/1_41_0.nix
index 2762f441171e..b73d9b8ef269 100644
--- a/pkgs/development/compilers/rust/1_41_0.nix
+++ b/pkgs/development/compilers/rust/1_41_0.nix
@@ -6,6 +6,16 @@
 #    request review, in case platforms cannot be covered.
 # 2. The LLVM version used for building should match with rust upstream.
 # 3. Firefox and Thunderbird should still build on x86_64-linux.
+
+{ stdenv, lib
+, buildPackages
+, newScope, callPackage
+, CoreFoundation, Security
+, llvmPackages_5
+, pkgsBuildTarget, pkgsBuildBuild
+, fetchpatch
+} @ args:
+
 import ./default.nix {
   rustcVersion = "1.41.0";
   rustcSha256 = "0jypz2mrzac41sj0zh07yd1z36g2s2rvgsb8g624sk4l14n84ijm";
@@ -26,4 +36,13 @@ import ./default.nix {
   };
 
   selectRustPackage = pkgs: pkgs.rust_1_41_0;
+
+  rustcPatches = [
+    (fetchpatch {
+      url = "https://github.com/QuiltOS/rust/commit/f1803452b9e95bfdbc3b8763138b9f92c7d12b46.diff";
+      sha256 = "1mzxaj46bq7ll617wg0mqnbnwr1da3hd4pbap8bjwhs3kfqnr7kk";
+    })
+  ];
 }
+
+(builtins.removeAttrs args [ "fetchpatch" ])
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index da3421a987da..22c56eaee94d 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -4,6 +4,7 @@
 , bootstrapVersion
 , bootstrapHashes
 , selectRustPackage
+, rustcPatches ? []
 }:
 { stdenv, lib
 , buildPackages
@@ -73,6 +74,8 @@
         sha256 = rustcSha256;
         inherit enableRustcDev;
 
+        patches = rustcPatches;
+
         # Use boot package set to break cycle
         rustPlatform = bootRustPlatform;
       } // lib.optionalAttrs (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) {
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index b0c26f3dffdf..80a45119bad5 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -7,6 +7,7 @@
 , enableRustcDev ? true
 , version
 , sha256
+, patches ? []
 }:
 
 let
@@ -104,6 +105,8 @@ in stdenv.mkDerivation rec {
   # the rust build system complains that nix alters the checksums
   dontFixLibtool = true;
 
+  inherit patches;
+
   postPatch = ''
     patchShebangs src/etc
 

From 7e1b21778500df915ac09dcf0f82467e75ec1ae9 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 22 Feb 2020 12:58:33 -0800
Subject: [PATCH 1341/4636] powershell: update supported platforms

---
 pkgs/shells/powershell/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix
index faab933ae25f..d4c18f9f5815 100644
--- a/pkgs/shells/powershell/default.nix
+++ b/pkgs/shells/powershell/default.nix
@@ -30,22 +30,23 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     mkdir -p $out/share/powershell
     cp -r * $out/share/powershell
-    makeWrapper $out/share/powershell/pwsh $out/bin/pwsh --prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath libraries}" \
-                                           --set TERM xterm --set POWERSHELL_TELEMETRY_OPTOUT 1 --set DOTNET_CLI_TELEMETRY_OPTOUT 1
+    makeWrapper $out/share/powershell/pwsh $out/bin/pwsh \
+      --prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath libraries}" \
+      --set TERM xterm --set POWERSHELL_TELEMETRY_OPTOUT 1 --set DOTNET_CLI_TELEMETRY_OPTOUT 1
   '';
 
   dontStrip = true;
 
   meta = with stdenv.lib; {
     description = "Cross-platform (Windows, Linux, and macOS) automation and configuration tool/framework";
-    homepage = https://github.com/PowerShell/PowerShell;
+    homepage = "https://github.com/PowerShell/PowerShell";
     maintainers = [ maintainers.yrashk ];
-    platforms = platforms.unix;
+    platforms = [ "x86_64-darwin" "x86_64-linux" ];
     license = with licenses; [ mit ];
   };
 
-  passthru = { 
-    shellPath = "/bin/pwsh"; 
+  passthru = {
+    shellPath = "/bin/pwsh";
   };
 
 }

From 444370f1d8f553a9b8563f60a973567745f3e909 Mon Sep 17 00:00:00 2001
From: Maxim Krivchikov <maxim.krivchikov@gmail.com>
Date: Sat, 22 Feb 2020 21:29:55 +0000
Subject: [PATCH 1342/4636] pythonPackages.seaborn: use v0.9.1 for python 2

required for poretools
---
 .../python-modules/seaborn/0.9.1.nix          | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  5 ++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/seaborn/0.9.1.nix

diff --git a/pkgs/development/python-modules/seaborn/0.9.1.nix b/pkgs/development/python-modules/seaborn/0.9.1.nix
new file mode 100644
index 000000000000..c87d2fac1f9a
--- /dev/null
+++ b/pkgs/development/python-modules/seaborn/0.9.1.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, nose
+, pandas
+, matplotlib
+}:
+
+buildPythonPackage rec {
+  pname = "seaborn";
+  version = "0.9.1";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "da33aa8c20a9a342ce73831d02831a10413f54a05471c7f31edf34f225d456ae";
+  };
+
+  checkInputs = [ nose ];
+  propagatedBuildInputs = [ pandas matplotlib ];
+
+  checkPhase = ''
+    nosetests -v
+  '';
+
+  # Computationally very demanding tests
+  doCheck = false;
+
+  meta = {
+    description = "Statisitical data visualization";
+    homepage = "http://stanford.edu/~mwaskom/software/seaborn/";
+    license = with lib.licenses; [ bsd3 ];
+    maintainers = with lib.maintainers; [ fridh ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 28090e0075a9..e32dc03cd602 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5488,7 +5488,10 @@ in {
 
   scp = callPackage ../development/python-modules/scp {};
 
-  seaborn = callPackage ../development/python-modules/seaborn { };
+  seaborn = if isPy3k then
+    callPackage ../development/python-modules/seaborn { }
+  else
+    callPackage ../development/python-modules/seaborn/0.9.1.nix { };
 
   seabreeze = callPackage ../development/python-modules/seabreeze { };
 

From db32158bbddc218426bd4e0698af82a033ab3852 Mon Sep 17 00:00:00 2001
From: Benjamin Koch <bbbsnowball@gmail.com>
Date: Sun, 23 Feb 2020 00:09:35 +0000
Subject: [PATCH 1343/4636] nixos/nextcloud: avoid loading imagick extension
 more than once

This avoids the following error message:
  Module 'imagick' already loaded at Unknown#0
---
 nixos/modules/services/web-apps/nextcloud.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index d79f2bb735fa..2622db630509 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -443,7 +443,7 @@ in {
         pools.nextcloud = {
           user = "nextcloud";
           group = "nginx";
-          phpOptions = phpOptionsExtensions + phpOptionsStr;
+          phpOptions = phpOptionsStr;
           phpPackage = phpPackage;
           phpEnv = {
             NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config";

From 794fc2269993c05f426724cbd9f86945e98a7cdf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 23 Feb 2020 01:22:20 +0000
Subject: [PATCH 1344/4636] peek: 1.4.0 -> 1.5.1

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

diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix
index 4872b5ec2eb6..ce0ea532c4cd 100644
--- a/pkgs/applications/video/peek/default.nix
+++ b/pkgs/applications/video/peek/default.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation rec {
   pname = "peek";
-  version = "1.4.0";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "phw";
     repo = "peek";
     rev = version;
-    sha256 = "0q70hz9anqywqgksd43i8v9ijwy6djyzwnzzd94j44xqwsk9zdbb";
+    sha256 = "1xwlfizga6hvjqq127py8vabaphsny928ar7mwqj9cyqfl6fx41x";
   };
 
   nativeBuildInputs = [
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/phw/peek;
+    homepage = "https://github.com/phw/peek";
     description = "Simple animated GIF screen recorder with an easy to use interface";
     license = licenses.gpl3;
     maintainers = with maintainers; [ puffnfresh worldofpeace ];

From 2442f99d40228b4fbe5d1987c148974115950e63 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 22 Feb 2020 20:42:27 -0500
Subject: [PATCH 1345/4636] Revert "Theming options for Gtk and Qt"

---
 nixos/doc/manual/configuration/x-windows.xml  |  32 ---
 nixos/modules/config/gtk/gtk.nix              | 160 -----------
 nixos/modules/config/qt.nix                   | 259 ------------------
 nixos/modules/config/qt5.nix                  | 102 +++++++
 nixos/modules/module-list.nix                 |   3 +-
 .../x11/desktop-managers/pantheon.nix         |   6 +-
 6 files changed, 106 insertions(+), 456 deletions(-)
 delete mode 100644 nixos/modules/config/gtk/gtk.nix
 delete mode 100644 nixos/modules/config/qt.nix
 create mode 100644 nixos/modules/config/qt5.nix

diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml
index e0207b5f2ae8..06dd7c8bfb94 100644
--- a/nixos/doc/manual/configuration/x-windows.xml
+++ b/nixos/doc/manual/configuration/x-windows.xml
@@ -160,38 +160,6 @@
    package into your system environment. It should work for all Qt 5 library
    versions.
   </para>
-  <para>
-   With help of
-   <option>
-    <link linkend="opt-gtk.enable">
-     gtk
-    </link>
-   </option>
-   and
-   <option>
-    <link linkend="opt-qt.enable">
-     qt
-    </link>
-   </option>
-   modules you can declaratively set system-wide themes settings.
-<programlisting>
-  gtk.enable = true;
-  gtk.theme = {
-    name = "Adwaita-dark";
-    package = pkgs.gnome-themes-extra;
-  };
-  gtk.iconTheme = {
-    name = "Adwaita";
-    package = pkgs.gnome3.adwaita-icon-theme;
-  };
-  qt.enable = true;
-  qt.platformTheme = "gtk3";
-  qt.style = {
-    name = "adwaita-dark";
-    package = pkgs.adwaita-qt;
-  };
-</programlisting>
-  </para>
  </simplesect>
  <simplesect xml:id="custom-xkb-layouts">
   <title>Custom XKB layouts</title>
diff --git a/nixos/modules/config/gtk/gtk.nix b/nixos/modules/config/gtk/gtk.nix
deleted file mode 100644
index 22f1e5d74835..000000000000
--- a/nixos/modules/config/gtk/gtk.nix
+++ /dev/null
@@ -1,160 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.gtk;
-  gtk2 = cfg.enable && cfg.gtk2;
-
-  toGtk2File = key: value:
-    let
-      value' =
-        if isBool value then (if value then "true" else "false")
-        else if isString value then "\"${value}\""
-        else toString value;
-    in
-      "${key} = ${value'}";
-  toGtk3File = generators.toINI {
-    mkKeyValue = key: value:
-      let
-        value' =
-          if isBool value then (if value then "true" else "false")
-          else toString value;
-      in
-        "${key}=${value'}";
-  };
-
-  settings =
-    optionalAttrs (cfg.font != null)
-      { gtk-font-name = cfg.font.name; }
-    //
-    optionalAttrs (cfg.theme != null)
-      { gtk-theme-name = cfg.theme.name; }
-    //
-    optionalAttrs (cfg.iconTheme != null)
-      { gtk-icon-theme-name = cfg.iconTheme.name; }
-    //
-    optionalAttrs (cfg.cursorTheme != null)
-      { gtk-cursor-theme-name = cfg.cursorTheme.name; };
-
-  fontType = types.submodule {
-    options = {
-      package = mkOption {
-        internal = true;
-        type = types.nullOr types.package;
-        default = null;
-      };
-      name = mkOption {
-        internal = true;
-        type = types.str;
-      };
-    };
-  };
-  themeType = types.submodule {
-    options = {
-      package = mkOption {
-        internal = true;
-        type = types.nullOr types.package;
-        default = null;
-      };
-      name = mkOption {
-        internal = true;
-        type = types.str;
-      };
-    };
-  };
-
-  optionalPackage = opt:
-    optional (opt != null && opt.package != null) opt.package;
-in
-{
-  options = {
-    gtk = {
-      enable = mkEnableOption "Gtk theming configuration";
-
-      gtk2 = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          Whether to enable theming for obsolete GTK2 engine.
-        '';
-      };
-
-      font = mkOption {
-        type = types.nullOr fontType;
-        default = null;
-        example = literalExample ''
-          {
-            name = "Cantarell 11";
-            package = pkgs.cantarell-fonts;
-          };
-        '';
-        description = ''
-          The font to use in GTK+ applications.
-        '';
-      };
-
-      iconTheme = mkOption {
-        type = types.nullOr themeType;
-        default = null;
-        example = literalExample ''
-          {
-            name = "Adwaita";
-            package = pkgs.gnome3.adwaita-icon-theme;
-          };
-        '';
-        description = "The icon theme to use.";
-      };
-
-      cursorTheme = mkOption {
-        type = types.nullOr themeType;
-        default = null;
-        example = literalExample ''
-          {
-            name = "Adwaita";
-            package = pkgs.gnome3.adwaita-icon-theme;
-          };
-        '';
-        description = "The cursor theme to use.";
-      };
-
-      theme = mkOption {
-        type = types.nullOr themeType;
-        default = null;
-        example = literalExample ''
-          {
-            name = "Adwaita";
-            package = pkgs.gnome-themes-extra;
-          };
-        '';
-        description = "The GTK+ theme to use.";
-      };
-    };
-  };
-
-  config = mkMerge [
-
-    (mkIf gtk2 {
-      environment.etc."xdg/gtk-2.0/gtkrc".text =
-        concatStringsSep "\n" (
-          mapAttrsToList toGtk2File settings
-        );
-    })
-
-    (mkIf cfg.enable {
-      environment.systemPackages =
-        optionalPackage cfg.font
-        ++ optionalPackage cfg.theme
-        ++ optionalPackage cfg.iconTheme
-        ++ optionalPackage cfg.cursorTheme;
-
-      environment.etc."xdg/gtk-3.0/settings.ini".text =
-        toGtk3File { Settings = settings; };
-
-      # TODO: support Wayland/XSettings
-      # once https://github.com/NixOS/nixpkgs/issues/54150 is fixed
-    })
-  ];
-
-  meta.maintainers = [ maintainers.gnidorah ];
-}
diff --git a/nixos/modules/config/qt.nix b/nixos/modules/config/qt.nix
deleted file mode 100644
index 87d07ccfb342..000000000000
--- a/nixos/modules/config/qt.nix
+++ /dev/null
@@ -1,259 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  cfg = config.qt;
-
-  toQtIni = generators.toINI {
-    mkKeyValue = key: value:
-      let
-        value' =
-          if isBool value then (if value then "true" else "false")
-          else toString value;
-      in
-        "${key}=${value'}";
-  };
-
-  general =
-    optionalAttrs (cfg.font != null)
-      {
-        font = cfg.font.name;
-        menuFont = cfg.font.name;
-        toolBarFont = cfg.font.name;
-      }
-    //
-    optionalAttrs (cfg.style != null)
-      { widgetStyle = cfg.style.name; };
-  icons =
-    optionalAttrs (cfg.iconTheme != null)
-      { Theme = cfg.iconTheme.name; };
-
-  qt =
-    optionalAttrs (cfg.font != null)
-      { font = ''"${cfg.font.name}"''; }
-    //
-      { style = "GTK+"; };
-
-  fontType = types.submodule {
-    options = {
-      package = mkOption {
-        internal = true;
-        type = types.nullOr types.package;
-        default = null;
-      };
-      name = mkOption {
-        internal = true;
-        type = types.str;
-      };
-    };
-  };
-  themeType = types.submodule {
-    options = {
-      package = mkOption {
-        internal = true;
-        type = types.nullOr types.package;
-        default = null;
-      };
-      name = mkOption {
-        internal = true;
-        type = types.str;
-      };
-    };
-  };
-
-  optionalPackage = opt:
-    optional (opt != null && opt.package != null) opt.package;
-
-  platforms = {
-    gtk2 = rec {
-      description = ''
-        <varlistentry>
-          <term><literal>gtk2</literal></term>
-          <listitem><para>Use GTK2 theme with
-            <link xlink:href="https://github.com/qt/qtstyleplugins">qtstyleplugins</link>
-          </para></listitem>
-        </varlistentry>
-      '';
-      styles = [ "cleanlooks" "gtk2" "cde" "motif" "plastique" ];
-
-      assertions = [
-        {
-          assertion = cfg.style != null && any (name: name == cfg.style.name) styles;
-          message = "`qt5.style.name` is not one of [ ${toString styles} ].";
-        }
-        {
-          assertion = cfg.font == null && cfg.iconTheme == null;
-          message = "`qt.font` and `qt.iconTheme` are only supported by kde platform.";
-        }
-      ];
-      environment.variables.QT_QPA_PLATFORMTHEME = "gtk2";
-      environment.variables.QT_STYLE_OVERRIDE = cfg.style.name;
-      environment.systemPackages = [ pkgs.libsForQt5.qtstyleplugins ];
-    };
-    qgnomeplatform = {
-      description = ''
-        <varlistentry>
-          <term><literal>qgnomeplatform</literal></term>
-          <listitem><para>Use GNOME theme with
-            <link xlink:href="https://github.com/FedoraQt/QGnomePlatform">qgnomeplatform</link>
-          </para></listitem>
-        </varlistentry>
-      '';
-
-      assertions = [
-        {
-          assertion = cfg.font == null && cfg.iconTheme == null;
-          message = "`qt.font` and `qt.iconTheme` are only supported by kde platform.";
-        }
-      ];
-      environment.variables.QT_QPA_PLATFORMTHEME = "qgnomeplatform";
-      # TODO: make this optional once https://github.com/NixOS/nixpkgs/issues/54150 is fixed
-      # qgnomeplatform reads theme and other settings from dconf db
-      environment.variables.QT_STYLE_OVERRIDE = cfg.style.name;
-      environment.variables.XDG_DATA_DIRS = [ "${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}" ];
-      environment.systemPackages = [ pkgs.qgnomeplatform ];
-    };
-    gtk3 = {
-      description = ''
-        <varlistentry>
-          <term><literal>gtk3</literal></term>
-          <listitem><para>Use GNOME theme with
-            <link xlink:href="https://code.qt.io/cgit/qt/qtbase.git/tree/src/plugins/platformthemes/gtk3">gtk3</link>
-          </para></listitem>
-        </varlistentry>
-      '';
-
-      assertions = [
-        {
-          assertion = cfg.style != null;
-          message = "`qt5.platformTheme` gtk3 requires `qt5.style` to be set.";
-        }
-        {
-          assertion = cfg.font == null && cfg.iconTheme == null;
-          message = "`qt.font` and `qt.iconTheme` are only supported by kde platform.";
-        }
-      ];
-      environment.variables.QT_QPA_PLATFORMTHEME = "gtk3";
-      environment.variables.QT_STYLE_OVERRIDE = cfg.style.name;
-    };
-    kde = {
-      description = ''
-        <varlistentry>
-          <term><literal>kde</literal></term>
-          <listitem><para>Use Qt theme with
-            <link xlink:href="https://code.qt.io/cgit/qt/qtbase.git/tree/src/platformsupport/themes/genericunix">qkdetheme</link>
-          </para></listitem>
-        </varlistentry>
-      '';
-
-      environment.variables.XDG_CURRENT_DESKTOP = mkForce "KDE";
-      environment.variables.KDE_SESSION_VERSION = "5";
-      environment.etc."xdg/kdeglobals".text =
-        toQtIni {
-          General = general;
-          Icons = icons;
-        };
-    };
-  };
-in
-
-{
-
-  imports = [
-    (mkRenamedOptionModule [ "qt5" "style" ] [ "qt" "style" ])
-    (mkRenamedOptionModule [ "qt5" "enable" ] [ "qt" "enable" ])
-    (mkRenamedOptionModule [ "qt5" "platformTheme" ] [ "qt" "platformTheme" ])
-    (mkRenamedOptionModule [ "qt5" "font" ] [ "qt" "font" ])
-    (mkRenamedOptionModule [ "qt5" "iconTheme" ] [ "qt" "iconTheme" ])
-  ];
-
-  options = {
-    qt = {
-
-      enable = mkEnableOption "Qt theming configuration";
-
-      qt4 = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          Whether to enable theming for obsolete Qt4 engine.
-        '';
-      };
-
-      platformTheme = mkOption {
-        type = types.enum (attrNames platforms);
-        example = head (attrNames platforms);
-        description = ''
-          Selects the platform theme to use for Qt applications.</para>
-          <para>The options are
-          <variablelist>
-            ${concatStrings (mapAttrsToList (name: value: value.description) platforms)}
-          </variablelist>
-        '';
-      };
-
-      font = mkOption {
-        type = types.nullOr fontType;
-        default = null;
-        example = literalExample ''
-          {
-            name = "Noto Sans,10,-1,5,50,0,0,0,0,0,Regular";
-            package = pkgs.noto-fonts;
-          }
-        '';
-        description = ''
-          The font to use in Qt applications.
-        '';
-      };
-
-      iconTheme = mkOption {
-        type = types.nullOr themeType;
-        default = null;
-        example = literalExample ''
-          {
-            name = "breeze";
-            package = pkgs.breeze-icons;
-          }
-        '';
-        description = "The icon theme to use.";
-      };
-
-      style = mkOption {
-        type = types.nullOr themeType;
-        default = null;
-        example = literalExample ''
-          {
-            name = "Breeze";
-            package = pkgs.breeze-qt5;
-          };
-        '';
-        description = "The Qt style to use.";
-      };
-
-    };
-  };
-
-  config = mkIf cfg.enable {
-
-    assertions = attrByPath [ cfg.platformTheme "assertions" ] [] platforms;
-
-    environment.variables = attrByPath [ cfg.platformTheme "environment" "variables" ] {} platforms;
-
-    environment.etc = attrByPath [ cfg.platformTheme "environment" "etc" ] {} platforms // {
-      "xdg/Trolltech.conf".text =
-        toQtIni {
-          Qt = qt;
-        };
-    };
-
-    environment.systemPackages = attrByPath [ cfg.platformTheme "environment" "systemPackages" ] [] platforms
-      ++ optionalPackage cfg.font
-      ++ optionalPackage cfg.style
-      ++ optionalPackage cfg.iconTheme;
-
-  };
-
-  meta.maintainers = with maintainers; [ worldofpeace gnidorah ];
-}
diff --git a/nixos/modules/config/qt5.nix b/nixos/modules/config/qt5.nix
new file mode 100644
index 000000000000..d9dec74f1552
--- /dev/null
+++ b/nixos/modules/config/qt5.nix
@@ -0,0 +1,102 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.qt5;
+
+  isQGnome = cfg.platformTheme == "gnome" && cfg.style == "adwaita";
+  isQtStyle = cfg.platformTheme == "gtk2" && cfg.style != "adwaita";
+
+  packages = if isQGnome then [ pkgs.qgnomeplatform pkgs.adwaita-qt ]
+    else if isQtStyle then [ pkgs.libsForQt5.qtstyleplugins ]
+    else throw "`qt5.platformTheme` ${cfg.platformTheme} and `qt5.style` ${cfg.style} are not compatible.";
+
+in
+
+{
+
+  options = {
+    qt5 = {
+
+      enable = mkEnableOption "Qt5 theming configuration";
+
+      platformTheme = mkOption {
+        type = types.enum [
+          "gtk2"
+          "gnome"
+        ];
+        example = "gnome";
+        relatedPackages = [
+          "qgnomeplatform"
+          ["libsForQt5" "qtstyleplugins"]
+        ];
+        description = ''
+          Selects the platform theme to use for Qt5 applications.</para>
+          <para>The options are
+          <variablelist>
+            <varlistentry>
+              <term><literal>gtk</literal></term>
+              <listitem><para>Use GTK theme with
+                <link xlink:href="https://github.com/qt/qtstyleplugins">qtstyleplugins</link>
+              </para></listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><literal>gnome</literal></term>
+              <listitem><para>Use GNOME theme with
+                <link xlink:href="https://github.com/FedoraQt/QGnomePlatform">qgnomeplatform</link>
+              </para></listitem>
+            </varlistentry>
+          </variablelist>
+        '';
+      };
+
+      style = mkOption {
+        type = types.enum [
+          "adwaita"
+          "cleanlooks"
+          "gtk2"
+          "motif"
+          "plastique"
+        ];
+        example = "adwaita";
+        relatedPackages = [
+          "adwaita-qt"
+          ["libsForQt5" "qtstyleplugins"]
+        ];
+        description = ''
+          Selects the style to use for Qt5 applications.</para>
+          <para>The options are
+          <variablelist>
+            <varlistentry>
+              <term><literal>adwaita</literal></term>
+              <listitem><para>Use Adwaita Qt style with
+                <link xlink:href="https://github.com/FedoraQt/adwaita-qt">adwaita</link>
+              </para></listitem>
+            </varlistentry>
+            <varlistentry>
+              <term><literal>cleanlooks</literal></term>
+              <term><literal>gtk2</literal></term>
+              <term><literal>motif</literal></term>
+              <term><literal>plastique</literal></term>
+              <listitem><para>Use styles from
+                <link xlink:href="https://github.com/qt/qtstyleplugins">qtstyleplugins</link>
+              </para></listitem>
+            </varlistentry>
+          </variablelist>
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    environment.variables.QT_QPA_PLATFORMTHEME = cfg.platformTheme;
+
+    environment.variables.QT_STYLE_OVERRIDE = cfg.style;
+
+    environment.systemPackages = packages;
+
+  };
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index db655f6dc857..6734929b9d4e 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -13,7 +13,6 @@
   ./config/appstream.nix
   ./config/console.nix
   ./config/xdg/sounds.nix
-  ./config/gtk/gtk.nix
   ./config/gtk/gtk-icon-cache.nix
   ./config/gnu.nix
   ./config/i18n.nix
@@ -27,7 +26,7 @@
   ./config/nsswitch.nix
   ./config/power-management.nix
   ./config/pulseaudio.nix
-  ./config/qt.nix
+  ./config/qt5.nix
   ./config/resolvconf.nix
   ./config/shells-environment.nix
   ./config/swap.nix
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index 5b3fea845964..b46a2d189ef9 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -242,9 +242,9 @@ in
       programs.zsh.vteIntegration = mkDefault true;
 
       # Harmonize Qt5 applications under Pantheon
-      qt.enable = true;
-      qt.platformTheme = "qgnomeplatform";
-      qt.style.name = "adwaita";
+      qt5.enable = true;
+      qt5.platformTheme = "gnome";
+      qt5.style = "adwaita";
 
       # Default Fonts
       fonts.fonts = with pkgs; [

From 84f839b9ac9e8cbacdea5f4bd614363363ff056f Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Sat, 22 Feb 2020 18:48:10 -0500
Subject: [PATCH 1346/4636] chefdk: 2.4.17 -> 4.7.73

---
 pkgs/development/tools/chefdk/Gemfile      |    4 +-
 pkgs/development/tools/chefdk/Gemfile.lock |  794 +++++---
 pkgs/development/tools/chefdk/default.nix  |    4 +-
 pkgs/development/tools/chefdk/gemset.nix   | 1972 ++++++++++++++++----
 4 files changed, 2211 insertions(+), 563 deletions(-)

diff --git a/pkgs/development/tools/chefdk/Gemfile b/pkgs/development/tools/chefdk/Gemfile
index 4d9640c8e9f9..47451c66d27f 100644
--- a/pkgs/development/tools/chefdk/Gemfile
+++ b/pkgs/development/tools/chefdk/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'chef-dk', '2.4.17'
+gem 'chef-dk', '4.7.73'
 gem 'pry'
 gem 'test-kitchen'
 gem 'inspec'
@@ -12,6 +12,6 @@ gem 'foodcritic'
 gem 'ohai'
 gem 'rubocop'
 gem 'knife-spork'
-gem 'fauxhai'
+gem 'fauxhai-ng'
 gem 'chefspec'
 gem 'chef-provisioning'
diff --git a/pkgs/development/tools/chefdk/Gemfile.lock b/pkgs/development/tools/chefdk/Gemfile.lock
index 545375d87805..47346c1bc45a 100644
--- a/pkgs/development/tools/chefdk/Gemfile.lock
+++ b/pkgs/development/tools/chefdk/Gemfile.lock
@@ -1,90 +1,251 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (5.2.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     app_conf (0.4.2)
-    ast (2.3.0)
-    backports (3.10.3)
-    berkshelf (6.3.1)
-      buff-config (~> 2.0)
-      buff-extensions (~> 2.0)
-      chef (>= 12.7.2)
+    ast (2.4.0)
+    aws-eventstream (1.0.3)
+    aws-partitions (1.275.0)
+    aws-sdk-apigateway (1.36.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-apigatewayv2 (1.15.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-athena (1.22.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-autoscaling (1.22.0)
+      aws-sdk-core (~> 3, >= 3.52.1)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-budgets (1.27.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-cloudformation (1.30.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-cloudhsm (1.19.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-cloudhsmv2 (1.20.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-cloudtrail (1.20.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-cloudwatch (1.32.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-cloudwatchlogs (1.28.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-codecommit (1.30.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-codedeploy (1.27.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-codepipeline (1.28.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-configservice (1.40.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-core (3.90.1)
+      aws-eventstream (~> 1.0, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.239.0)
+      aws-sigv4 (~> 1.1)
+      jmespath (~> 1.0)
+    aws-sdk-costandusagereportservice (1.18.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-dynamodb (1.43.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-ec2 (1.144.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-ecr (1.25.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-ecs (1.57.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-eks (1.31.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-elasticache (1.29.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-elasticbeanstalk (1.26.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-elasticloadbalancing (1.19.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-elasticloadbalancingv2 (1.39.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-elasticsearchservice (1.30.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-firehose (1.24.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-iam (1.33.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-kafka (1.17.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-kinesis (1.20.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-kms (1.29.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-lambda (1.36.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-organizations (1.17.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-rds (1.78.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-redshift (1.37.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-route53 (1.30.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-route53domains (1.18.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-route53resolver (1.11.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.60.2)
+      aws-sdk-core (~> 3, >= 3.83.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-securityhub (1.18.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-ses (1.27.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-sms (1.17.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-sns (1.21.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-sqs (1.23.1)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-ssm (1.71.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.1.0)
+      aws-eventstream (~> 1.0, >= 1.0.2)
+    azure_graph_rbac (0.17.1)
+      ms_rest_azure (~> 0.11.0)
+    azure_mgmt_key_vault (0.17.5)
+      ms_rest_azure (~> 0.11.1)
+    azure_mgmt_resources (0.17.8)
+      ms_rest_azure (~> 0.11.1)
+    azure_mgmt_security (0.18.0)
+      ms_rest_azure (~> 0.11.1)
+    azure_mgmt_storage (0.19.2)
+      ms_rest_azure (~> 0.11.1)
+    backports (3.16.1)
+    bcrypt_pbkdf (1.0.1)
+    berkshelf (7.0.9)
+      chef (>= 13.6.52)
+      chef-config
       cleanroom (~> 1.0)
       concurrent-ruby (~> 1.0)
-      faraday (~> 0.9)
-      httpclient (~> 2.7)
-      minitar (~> 0.5, >= 0.5.4)
-      mixlib-archive (~> 0.4)
-      mixlib-shellout (~> 2.0)
+      minitar (>= 0.6)
+      mixlib-archive (>= 0.4, < 2.0)
+      mixlib-config (>= 2.2.5)
+      mixlib-shellout (>= 2.0, < 4.0)
       octokit (~> 4.0)
-      retryable (~> 2.0)
-      ridley (~> 5.0)
+      retryable (>= 2.0, < 4.0)
       solve (~> 4.0)
-      thor (~> 0.19, < 0.19.2)
-    buff-config (2.0.0)
-      buff-extensions (~> 2.0)
-      varia_model (~> 0.6)
-    buff-extensions (2.0.0)
-    buff-ignore (1.2.0)
-    buff-ruby_engine (1.0.0)
-    buff-shell_out (1.1.0)
-      buff-ruby_engine (~> 1.0)
-    builder (3.2.3)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
-    celluloid-io (0.16.2)
-      celluloid (>= 0.16.0)
-      nio4r (>= 1.1.0)
-    chef (13.6.4)
+      thor (>= 0.20)
+    builder (3.2.4)
+    chef (15.8.23)
       addressable
+      bcrypt_pbkdf (~> 1.0)
       bundler (>= 1.10)
-      chef-config (= 13.6.4)
-      chef-zero (>= 13.0)
+      chef-config (= 15.8.23)
+      chef-utils (= 15.8.23)
+      chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
+      ed25519 (~> 1.2)
       erubis (~> 2.7)
+      ffi (~> 1.9, >= 1.9.25)
+      ffi-libarchive
       ffi-yajl (~> 2.2)
-      highline (~> 1.6, >= 1.6.9)
+      highline (>= 1.6.9, < 2)
       iniparse (~> 1.4)
-      iso8601 (~> 0.9.1)
-      mixlib-archive (~> 0.4)
-      mixlib-authentication (~> 1.4)
-      mixlib-cli (~> 1.7)
-      mixlib-log (~> 1.3)
-      mixlib-shellout (~> 2.0)
+      license-acceptance (~> 1.0, >= 1.0.5)
+      mixlib-archive (>= 0.4, < 2.0)
+      mixlib-authentication (>= 2.1, < 4)
+      mixlib-cli (>= 2.1.1, < 3.0)
+      mixlib-log (>= 2.0.3, < 4.0)
+      mixlib-shellout (>= 3.0.3, < 4.0)
       net-sftp (~> 2.1, >= 2.1.2)
-      net-ssh (>= 2.9, < 5.0)
+      net-ssh (>= 4.2, < 6)
       net-ssh-multi (~> 1.2, >= 1.2.1)
-      ohai (~> 13.0)
+      ohai (~> 15.0)
       plist (~> 3.2)
       proxifier (~> 1.0)
-      rspec-core (~> 3.5)
-      rspec-expectations (~> 3.5)
-      rspec-mocks (~> 3.5)
-      rspec_junit_formatter (~> 0.2.0)
-      serverspec (~> 2.7)
-      specinfra (~> 2.10)
       syslog-logger (~> 1.6)
+      train-core (~> 3.1)
+      train-winrm (>= 0.2.5)
+      tty-screen (~> 0.6)
       uuidtools (~> 2.1.5)
-    chef-config (13.6.4)
-      addressable
-      fuzzyurl
-      mixlib-config (~> 2.0)
-      mixlib-shellout (~> 2.0)
-    chef-dk (2.4.17)
+    chef-cli (2.0.0)
       addressable (>= 2.3.5, < 2.6)
-      chef (~> 13.0)
-      chef-provisioning (~> 2.0)
+      chef (>= 14.0)
       cookbook-omnifetch (~> 0.5)
       diff-lcs (~> 1.0)
       ffi-yajl (>= 1.0, < 3.0)
-      minitar (~> 0.5.4)
-      mixlib-cli (~> 1.7)
-      mixlib-shellout (~> 2.0)
+      license-acceptance (~> 1.0, >= 1.0.11)
+      minitar (~> 0.6)
+      mixlib-cli (>= 1.7, < 3.0)
+      mixlib-shellout (>= 2.0, < 4.0)
       paint (~> 1.0)
       solve (> 2.0, < 5.0)
-    chef-provisioning (2.6.0)
-      cheffish (>= 4.0, < 14.0)
+    chef-config (15.8.23)
+      addressable
+      chef-utils (= 15.8.23)
+      fuzzyurl
+      mixlib-config (>= 2.2.12, < 4.0)
+      mixlib-shellout (>= 2.0, < 4.0)
+      tomlrb (~> 1.2)
+    chef-dk (4.7.73)
+      addressable (>= 2.3.5, < 2.6)
+      chef (~> 15.0)
+      cookbook-omnifetch (~> 0.5)
+      diff-lcs (~> 1.0)
+      ffi-yajl (>= 1.0, < 3.0)
+      license-acceptance (~> 1.0, >= 1.0.11)
+      minitar (~> 0.6)
+      mixlib-cli (>= 1.7, < 3.0)
+      mixlib-shellout (>= 2.0, < 4.0)
+      paint (~> 1.0)
+      solve (> 2.0, < 5.0)
+    chef-provisioning (2.7.6)
+      cheffish (>= 4.0, < 15.0)
       inifile (>= 2.0.2)
       mixlib-install (>= 1.0)
       net-scp (~> 1.0)
@@ -93,46 +254,67 @@ GEM
       winrm (~> 2.0)
       winrm-elevated (~> 1.0)
       winrm-fs (~> 1.0)
-    chef-vault (3.3.0)
-    chef-zero (13.1.0)
+    chef-telemetry (1.0.3)
+      chef-config
+      concurrent-ruby (~> 1.0)
+      ffi-yajl (~> 2.2)
+      http (~> 2.2)
+    chef-utils (15.8.23)
+    chef-vault (4.0.1)
+    chef-zero (14.0.17)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
-      mixlib-log (~> 1.3)
-      rack (~> 2.0)
+      mixlib-log (>= 2.0, < 4.0)
+      rack (~> 2.0, >= 2.0.6)
       uuidtools (~> 2.1)
-    cheffish (13.1.0)
-      chef-zero (~> 13.0)
+    cheffish (14.0.13)
+      chef-zero (~> 14.0)
       net-ssh
-    chefspec (7.1.1)
-      chef (>= 12.14.89)
-      fauxhai (>= 4, < 6)
+    chefspec (9.1.0)
+      chef (>= 14)
+      chef-cli
+      fauxhai-ng (>= 7.5)
       rspec (~> 3.0)
     cleanroom (1.0.0)
     coderay (1.1.2)
-    concurrent-ruby (1.0.5)
-    cookbook-omnifetch (0.8.0)
-      mixlib-archive (~> 0.4)
-    cucumber-core (3.1.0)
+    concurrent-ruby (1.1.6)
+    cookbook-omnifetch (0.9.1)
+      mixlib-archive (>= 0.4, < 2.0)
+    cucumber-core (3.2.1)
       backports (>= 3.8.0)
       cucumber-tag_expressions (~> 1.1.0)
-      gherkin (>= 5.0.0)
+      gherkin (~> 5.0)
     cucumber-tag_expressions (1.1.1)
+    declarative (0.0.10)
+    declarative-option (0.1.0)
     diff-lcs (1.3)
-    diffy (3.2.0)
-    docker-api (1.34.0)
+    diffy (3.3.0)
+    docker-api (1.34.2)
       excon (>= 0.47.0)
       multi_json
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    ed25519 (1.2.4)
+    equatable (0.6.1)
+    erubi (1.9.0)
     erubis (2.7.0)
-    excon (0.59.0)
-    faraday (0.13.1)
+    excon (0.72.0)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
-    fauxhai (5.5.0)
+    faraday-cookie_jar (0.0.6)
+      faraday (>= 0.7.4)
+      http-cookie (~> 1.0.0)
+    faraday_middleware (0.12.2)
+      faraday (>= 0.7.4, < 1.0)
+    fauxhai-ng (7.6.0)
       net-ssh
-    ffi (1.9.18)
-    ffi-yajl (2.3.1)
+    ffi (1.12.2)
+    ffi-libarchive (1.0.0)
+      ffi (~> 1.0)
+    ffi-yajl (2.3.3)
       libyajl2 (~> 1.2)
-    foodcritic (12.2.1)
-      cucumber-core (>= 1.3)
+    foodcritic (16.2.0)
+      cucumber-core (>= 1.3, < 4.0)
       erubis
       ffi-yajl (~> 2.0)
       nokogiri (>= 1.5, < 2.0)
@@ -140,252 +322,396 @@ GEM
       rufus-lru (~> 1.0)
       treetop (~> 1.4)
     fuzzyurl (0.9.0)
-    gherkin (5.0.0)
-    git (1.3.0)
-    gssapi (1.2.0)
+    gherkin (5.1.0)
+    git (1.6.0)
+      rchardet (~> 1.8)
+    google-api-client (0.34.1)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (~> 0.9)
+      httpclient (>= 2.8.1, < 3.0)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.0)
+      signet (~> 0.12)
+    googleauth (0.10.0)
+      faraday (~> 0.12)
+      jwt (>= 1.4, < 3.0)
+      memoist (~> 0.16)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (~> 0.12)
+    gssapi (1.3.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hashie (3.5.6)
+    hashie (3.6.0)
     highline (1.7.10)
-    hitimes (1.2.6)
     htmlentities (4.3.4)
+    http (2.2.2)
+      addressable (~> 2.3)
+      http-cookie (~> 1.0)
+      http-form_data (~> 1.0.1)
+      http_parser.rb (~> 0.6.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    http-form_data (1.0.3)
+    http_parser.rb (0.6.0)
     httpclient (2.8.3)
+    i18n (1.8.2)
+      concurrent-ruby (~> 1.0)
     inifile (3.0.0)
     iniparse (1.4.4)
-    inspec (1.47.0)
+    inspec (4.18.85)
+      faraday_middleware (~> 0.12.2)
+      inspec-core (= 4.18.85)
+      train (~> 3.0)
+      train-aws (~> 0.1)
+      train-habitat (~> 0.1)
+      train-winrm (~> 0.2)
+    inspec-core (4.18.85)
       addressable (~> 2.4)
+      chef-telemetry (~> 1.0)
       faraday (>= 0.9.0)
       hashie (~> 3.4)
-      htmlentities
-      json (>= 1.8, < 3.0)
+      htmlentities (~> 4.3)
+      json-schema (~> 2.8)
+      license-acceptance (>= 0.2.13, < 2.0)
       method_source (~> 0.8)
-      mixlib-log
+      mixlib-log (~> 3.0)
+      multipart-post (~> 2.0)
       parallel (~> 1.9)
       parslet (~> 1.5)
       pry (~> 0)
-      rainbow (~> 2)
-      rspec (~> 3)
+      rspec (~> 3.9)
       rspec-its (~> 1.2)
-      rubyzip (~> 1.1)
-      semverse
+      rubyzip (~> 1.2, >= 1.2.2)
+      semverse (~> 3.0)
       sslshake (~> 1.2)
-      thor (~> 0.19)
+      term-ansicolor (~> 1.7)
+      thor (>= 0.20, < 2.0)
       tomlrb (~> 1.2)
-      train (~> 0.30)
+      train-core (~> 3.0)
+      tty-prompt (~> 0.17)
+      tty-table (~> 0.10)
     ipaddress (0.8.3)
-    iso8601 (0.9.1)
-    json (2.1.0)
-    kitchen-inspec (0.20.0)
+    jaro_winkler (1.5.4)
+    jmespath (1.4.0)
+    json (2.3.0)
+    json-schema (2.8.1)
+      addressable (>= 2.4)
+    jwt (2.2.1)
+    kitchen-inspec (1.3.1)
       hashie (~> 3.4)
-      inspec (>= 0.34.0, < 2.0.0)
-      test-kitchen (~> 1.6)
-    kitchen-vagrant (1.2.1)
-      test-kitchen (~> 1.4)
-    knife-spork (1.7.1)
+      inspec (>= 1.47, < 5.0)
+      test-kitchen (>= 1.6, < 3)
+    kitchen-vagrant (1.6.1)
+      test-kitchen (>= 1.4, < 3)
+    knife-spork (1.7.2)
       app_conf (>= 0.4.0)
       chef (>= 11.0.0)
       diffy (>= 3.0.1)
       git (>= 1.2.5)
     libyajl2 (1.2.0)
+    license-acceptance (1.0.13)
+      pastel (~> 0.7)
+      tomlrb (~> 1.2)
+      tty-box (~> 0.3)
+      tty-prompt (~> 0.18)
     little-plugger (1.1.4)
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    method_source (0.9.0)
-    mini_portile2 (2.3.0)
-    minitar (0.5.4)
-    mixlib-archive (0.4.1)
+    memoist (0.16.2)
+    method_source (0.9.2)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitar (0.9)
+    minitest (5.14.0)
+    mixlib-archive (1.0.5)
       mixlib-log
-    mixlib-authentication (1.4.2)
-    mixlib-cli (1.7.0)
-    mixlib-config (2.2.4)
-    mixlib-install (3.8.0)
+    mixlib-authentication (3.0.6)
+    mixlib-cli (2.1.5)
+    mixlib-config (3.0.6)
+      tomlrb
+    mixlib-install (3.11.26)
       mixlib-shellout
       mixlib-versioning
       thor
-    mixlib-log (1.7.1)
-    mixlib-shellout (2.3.2)
-    mixlib-versioning (1.2.2)
-    molinillo (0.6.4)
-    multi_json (1.12.2)
-    multipart-post (2.0.0)
+    mixlib-log (3.0.8)
+    mixlib-shellout (3.0.9)
+    mixlib-versioning (1.2.12)
+    molinillo (0.6.6)
+    ms_rest (0.7.5)
+      concurrent-ruby (~> 1.0)
+      faraday (~> 0.9)
+      timeliness (~> 0.3.10)
+    ms_rest_azure (0.11.1)
+      concurrent-ruby (~> 1.0)
+      faraday (~> 0.9)
+      faraday-cookie_jar (~> 0.0.6)
+      ms_rest (~> 0.7.4)
+      unf_ext (= 0.0.7.2)
+    multi_json (1.14.1)
+    multipart-post (2.1.1)
+    necromancer (0.5.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (4.2.0)
-    net-ssh-gateway (1.3.0)
-      net-ssh (>= 2.6.5)
+    net-ssh-gateway (2.0.0)
+      net-ssh (>= 4.0.0)
     net-ssh-multi (1.2.1)
       net-ssh (>= 2.6.5)
       net-ssh-gateway (>= 1.2.0)
-    net-telnet (0.1.1)
-    nio4r (2.1.0)
-    nokogiri (1.8.1)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.10.8)
+      mini_portile2 (~> 2.4.0)
     nori (2.6.0)
-    octokit (4.7.0)
+    octokit (4.16.0)
+      faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohai (13.7.0)
-      chef-config (>= 12.5.0.alpha.1, < 14)
+    ohai (15.7.4)
+      chef-config (>= 12.8, < 16)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
-      mixlib-cli
-      mixlib-config (~> 2.0)
-      mixlib-log (>= 1.7.1, < 2.0)
-      mixlib-shellout (~> 2.0)
+      mixlib-cli (>= 1.7.0)
+      mixlib-config (>= 2.0, < 4.0)
+      mixlib-log (>= 2.0.1, < 4.0)
+      mixlib-shellout (>= 2.0, < 4.0)
       plist (~> 3.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
+    os (1.0.1)
     paint (1.0.1)
-    parallel (1.12.0)
-    parser (2.4.0.2)
-      ast (~> 2.3)
-    parslet (1.8.1)
-    plist (3.3.0)
+    parallel (1.19.1)
+    parser (2.7.0.2)
+      ast (~> 2.4.0)
+    parslet (1.8.2)
+    pastel (0.7.3)
+      equatable (~> 0.6)
+      tty-color (~> 0.5)
+    plist (3.5.0)
     polyglot (0.3.5)
-    powerpack (0.1.1)
     proxifier (1.0.3)
-    pry (0.11.3)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.0.1)
-    rack (2.0.6)
-    rainbow (2.2.2)
-      rake
-    rake (12.3.0)
-    retryable (2.0.4)
-    ridley (5.1.1)
-      addressable
-      buff-config (~> 2.0)
-      buff-extensions (~> 2.0)
-      buff-ignore (~> 1.2)
-      buff-shell_out (~> 1.0)
-      celluloid (~> 0.16.0)
-      celluloid-io (~> 0.16.1)
-      chef-config (>= 12.5.0)
-      erubis
-      faraday (~> 0.9)
-      hashie (>= 2.0.2, < 4.0.0)
-      httpclient (~> 2.7)
-      json (>= 1.7.7)
-      mixlib-authentication (>= 1.3.0)
-      retryable (~> 2.0)
-      semverse (~> 2.0)
-      varia_model (~> 0.6)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    public_suffix (3.1.1)
+    rack (2.2.2)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    rchardet (1.8.0)
+    representable (3.0.4)
+      declarative (< 0.1.0)
+      declarative-option (< 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.2)
+    retryable (3.0.5)
+    rexml (3.2.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-its (1.2.0)
+      rspec-support (~> 3.9.0)
+    rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.7.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    rspec_junit_formatter (0.2.3)
-      builder (< 4)
-      rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.51.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    rubocop (0.80.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 3.0)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
     rubyntlm (0.6.2)
-    rubyzip (1.2.1)
+    rubyzip (1.3.0)
     rufus-lru (1.1.0)
-    safe_yaml (1.0.4)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
-    semverse (2.0.0)
-    serverspec (2.41.3)
-      multi_json
-      rspec (~> 3.0)
-      rspec-its
-      specinfra (~> 2.72)
-    sfl (2.3)
-    solve (4.0.0)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
+    semverse (3.0.0)
+    signet (0.12.0)
+      addressable (~> 2.3)
+      faraday (~> 0.9)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    solve (4.0.3)
       molinillo (~> 0.6)
-      semverse (>= 1.1, < 3.0)
-    specinfra (2.72.1)
-      net-scp
-      net-ssh (>= 2.7, < 5.0)
-      net-telnet
-      sfl
-    sslshake (1.2.0)
+      semverse (>= 1.1, < 4.0)
+    sslshake (1.3.0)
+    strings (0.1.8)
+      strings-ansi (~> 0.1)
+      unicode-display_width (~> 1.5)
+      unicode_utils (~> 1.4)
+    strings-ansi (0.2.0)
+    sync (0.5.0)
     syslog-logger (1.6.8)
     systemu (2.6.5)
-    test-kitchen (1.19.2)
+    term-ansicolor (1.7.1)
+      tins (~> 1.0)
+    test-kitchen (2.3.4)
+      bcrypt_pbkdf (~> 1.0)
+      ed25519 (~> 1.2)
+      license-acceptance (~> 1.0, >= 1.0.11)
       mixlib-install (~> 3.6)
-      mixlib-shellout (>= 1.2, < 3.0)
-      net-scp (~> 1.1)
-      net-ssh (>= 2.9, < 5.0)
-      net-ssh-gateway (~> 1.2)
-      safe_yaml (~> 1.0)
-      thor (~> 0.19, < 0.19.2)
+      mixlib-shellout (>= 1.2, < 4.0)
+      net-scp (>= 1.1, < 3.0)
+      net-ssh (>= 2.9, < 6.0)
+      net-ssh-gateway (>= 1.2, < 3.0)
+      thor (~> 0.19)
       winrm (~> 2.0)
       winrm-elevated (~> 1.0)
-      winrm-fs (~> 1.1.0)
-    thor (0.19.1)
-    timers (4.0.4)
-      hitimes
-    tomlrb (1.2.6)
-    train (0.31.1)
+      winrm-fs (~> 1.1)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    timeliness (0.3.10)
+    tins (1.24.1)
+      sync
+    tomlrb (1.2.9)
+    train (3.2.22)
+      activesupport (~> 5.2.3)
+      azure_graph_rbac (~> 0.16)
+      azure_mgmt_key_vault (~> 0.17)
+      azure_mgmt_resources (~> 0.15)
+      azure_mgmt_security (~> 0.18)
+      azure_mgmt_storage (~> 0.18)
       docker-api (~> 1.26)
+      google-api-client (>= 0.23.9, < 0.35.0)
+      googleauth (>= 0.6.6, < 0.11.0)
+      train-core (= 3.2.22)
+      train-winrm (~> 0.2)
+    train-aws (0.1.15)
+      aws-sdk-apigateway (~> 1.0)
+      aws-sdk-apigatewayv2 (~> 1.0)
+      aws-sdk-athena (~> 1.0)
+      aws-sdk-autoscaling (~> 1.22.0)
+      aws-sdk-budgets (~> 1.0)
+      aws-sdk-cloudformation (~> 1.0)
+      aws-sdk-cloudhsm (~> 1.0)
+      aws-sdk-cloudhsmv2 (~> 1.0)
+      aws-sdk-cloudtrail (~> 1.8)
+      aws-sdk-cloudwatch (~> 1.13)
+      aws-sdk-cloudwatchlogs (~> 1.13)
+      aws-sdk-codecommit (~> 1.0)
+      aws-sdk-codedeploy (~> 1.0)
+      aws-sdk-codepipeline (~> 1.0)
+      aws-sdk-configservice (~> 1.21)
+      aws-sdk-core (~> 3.0)
+      aws-sdk-costandusagereportservice (~> 1.6)
+      aws-sdk-dynamodb (~> 1.31)
+      aws-sdk-ec2 (~> 1.70)
+      aws-sdk-ecr (~> 1.18)
+      aws-sdk-ecs (~> 1.30)
+      aws-sdk-eks (~> 1.9)
+      aws-sdk-elasticache (~> 1.0)
+      aws-sdk-elasticbeanstalk (~> 1.0)
+      aws-sdk-elasticloadbalancing (~> 1.8)
+      aws-sdk-elasticloadbalancingv2 (~> 1.0)
+      aws-sdk-elasticsearchservice (~> 1.0)
+      aws-sdk-firehose (~> 1.0)
+      aws-sdk-iam (~> 1.13)
+      aws-sdk-kafka (~> 1.0)
+      aws-sdk-kinesis (~> 1.0)
+      aws-sdk-kms (~> 1.13)
+      aws-sdk-lambda (~> 1.0)
+      aws-sdk-organizations (~> 1.17.0)
+      aws-sdk-rds (~> 1.43)
+      aws-sdk-redshift (~> 1.0)
+      aws-sdk-route53 (~> 1.0)
+      aws-sdk-route53domains (~> 1.0)
+      aws-sdk-route53resolver (~> 1.0)
+      aws-sdk-s3 (~> 1.30)
+      aws-sdk-securityhub (~> 1.0)
+      aws-sdk-ses (~> 1.0)
+      aws-sdk-sms (~> 1.0)
+      aws-sdk-sns (~> 1.9)
+      aws-sdk-sqs (~> 1.10)
+      aws-sdk-ssm (~> 1.0)
+    train-core (3.2.22)
+      addressable (~> 2.5)
+      inifile (~> 3.0)
       json (>= 1.8, < 3.0)
-      mixlib-shellout (~> 2.0)
-      net-scp (~> 1.2)
-      net-ssh (>= 2.9, < 5.0)
+      mixlib-shellout (>= 2.0, < 4.0)
+      net-scp (>= 1.2, < 3.0)
+      net-ssh (>= 2.9, < 6.0)
+    train-habitat (0.2.13)
+    train-winrm (0.2.6)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    treetop (1.6.9)
+    treetop (1.6.10)
       polyglot (~> 0.3)
-    unicode-display_width (1.3.0)
+    tty-box (0.5.0)
+      pastel (~> 0.7.2)
+      strings (~> 0.1.6)
+      tty-cursor (~> 0.7)
+    tty-color (0.5.1)
+    tty-cursor (0.7.1)
+    tty-prompt (0.20.0)
+      necromancer (~> 0.5.0)
+      pastel (~> 0.7.0)
+      tty-reader (~> 0.7.0)
+    tty-reader (0.7.0)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.7)
+      wisper (~> 2.0.0)
+    tty-screen (0.7.1)
+    tty-table (0.11.0)
+      equatable (~> 0.6)
+      necromancer (~> 0.5)
+      pastel (~> 0.7.2)
+      strings (~> 0.1.5)
+      tty-screen (~> 0.7)
+    tzinfo (1.2.6)
+      thread_safe (~> 0.1)
+    uber (0.1.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.2)
+    unicode-display_width (1.6.1)
+    unicode_utils (1.4.0)
     uuidtools (2.1.5)
-    varia_model (0.6.0)
-      buff-extensions (~> 2.0)
-      hashie (>= 2.0.2, < 4.0.0)
-    winrm (2.2.3)
+    winrm (2.3.4)
       builder (>= 2.1.2)
-      erubis (~> 2.7)
+      erubi (~> 1.8)
       gssapi (~> 1.2)
       gyoku (~> 1.0)
       httpclient (~> 2.2, >= 2.2.0.2)
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-elevated (1.1.0)
+    winrm-elevated (1.2.1)
+      erubi (~> 1.8)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    winrm-fs (1.1.1)
-      erubis (~> 2.7)
+    winrm-fs (1.3.3)
+      erubi (~> 1.8)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
       winrm (~> 2.0)
-    wmi-lite (1.0.0)
+    wisper (2.0.1)
+    wmi-lite (1.0.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   berkshelf
-  chef-dk (= 2.4.17)
+  chef-dk (= 4.7.73)
   chef-provisioning
   chef-vault
   chefspec
-  fauxhai
+  fauxhai-ng
   foodcritic
   inspec
   kitchen-inspec
@@ -397,4 +723,4 @@ DEPENDENCIES
   test-kitchen
 
 BUNDLED WITH
-   1.16.4
+   1.17.3
diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix
index 5f6c2b156f36..6ad4b378d8c5 100644
--- a/pkgs/development/tools/chefdk/default.nix
+++ b/pkgs/development/tools/chefdk/default.nix
@@ -1,7 +1,7 @@
 { lib, bundlerEnv, bundlerUpdateScript, ruby, perl, autoconf }:
 
 bundlerEnv {
-  name = "chef-dk-2.4.17";
+  name = "chef-dk-4.7.73";
 
   inherit ruby;
   gemdir = ./.;
@@ -16,7 +16,5 @@ bundlerEnv {
     license     = licenses.asl20;
     maintainers = with maintainers; [ offline nicknovitski ];
     platforms   = platforms.unix;
-    # chefdk depends on ruby 2.4 which we don't support anymore
-    broken      = true;
   };
 }
diff --git a/pkgs/development/tools/chefdk/gemset.nix b/pkgs/development/tools/chefdk/gemset.nix
index 228b3cd85135..326dfae79311 100644
--- a/pkgs/development/tools/chefdk/gemset.nix
+++ b/pkgs/development/tools/chefdk/gemset.nix
@@ -1,6 +1,19 @@
 {
+  activesupport = {
+    dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lmlnx79sv18xv1ddm4vq7z3mwdfa4468mq5186av0k8n1k471sp";
+      type = "gem";
+    };
+    version = "5.2.4.1";
+  };
   addressable = {
     dependencies = ["public_suffix"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
@@ -9,6 +22,8 @@
     version = "2.5.2";
   };
   app_conf = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1yqwhr7d9i0cgavqkkq0b4pfqpn213dbhj5ayygr293wplm0jh57";
@@ -17,170 +32,770 @@
     version = "0.4.2";
   };
   ast = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0pp82blr5fakdk27d1d21xq9zchzb6vmyb1zcsl520s3ygvprn8m";
+      sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7";
       type = "gem";
     };
-    version = "2.3.0";
+    version = "2.4.0";
   };
-  backports = {
+  aws-eventstream = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1agsk23kfr194s690jnrpijh9pf3hq4a9yy66j1wzzj2x19ss9y0";
+      sha256 = "100g77a5ixg4p5zwq77f28n2pdkk0y481f7v83qrlmnj22318qq6";
       type = "gem";
     };
-    version = "3.10.3";
+    version = "1.0.3";
   };
-  berkshelf = {
-    dependencies = ["buff-config" "buff-extensions" "chef" "cleanroom" "concurrent-ruby" "faraday" "httpclient" "minitar" "mixlib-archive" "mixlib-shellout" "octokit" "retryable" "ridley" "solve" "thor"];
+  aws-partitions = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "03rwq5njxh3d3fcr3ap0wivqlavfcm1ywxj50m4arfndsdvvjih1";
+      sha256 = "0bkzzk4mxsxvnd8sr5xx57vc29j69h48gj2g24fzjn7ika6az18z";
       type = "gem";
     };
-    version = "6.3.1";
+    version = "1.275.0";
   };
-  buff-config = {
-    dependencies = ["buff-extensions" "varia_model"];
+  aws-sdk-apigateway = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "06zx175sww4grk1rwyn1g3b1j2y324jf1506wl4xx96iss8spa4r";
+      sha256 = "106wn66gnn1rk9z4w84iwqb26wbyz3i2q9ck3xxabc47ly9mj03m";
       type = "gem";
     };
-    version = "2.0.0";
+    version = "1.36.0";
   };
-  buff-extensions = {
+  aws-sdk-apigatewayv2 = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1qjyx97b9gavrk1r77bif1wv7z2mwlqy0v42q0vb7jd609n7vgcg";
+      sha256 = "1x9qaxi1614pfp9hy5ywk7y76gfmk5d0iz6lj9p9qy92gfzx169c";
       type = "gem";
     };
-    version = "2.0.0";
+    version = "1.15.0";
   };
-  buff-ignore = {
+  aws-sdk-athena = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1vn0jh4l8np1xlyvsrrhlzhapcwvrjfni92jmg1an5qdw1qlgxmh";
+      sha256 = "0hvskqq406vh9xa29jzyjhfpf6m834872p87a2j0ly5kh4ydldkz";
       type = "gem";
     };
-    version = "1.2.0";
+    version = "1.22.0";
   };
-  buff-ruby_engine = {
+  aws-sdk-autoscaling = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1njpndvhvq7idfrwfw3p0hs5ch6nygwscjmksh23dz49dsirk7a9";
+      sha256 = "0jrz4brxbi8rxqk1jg5wcdsa1knfrgzrmx9dygfzbfi2szcfmbhv";
       type = "gem";
     };
-    version = "1.0.0";
+    version = "1.22.0";
   };
-  buff-shell_out = {
-    dependencies = ["buff-ruby_engine"];
+  aws-sdk-budgets = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0zg1li17759whsi2yhb08wvbbqn5cy6i5v51384yjk2a29vs9lck";
+      sha256 = "0xxgldgin1gavz7w37pmsxrhiwr8bvssjgv3lwzbwdsjqk0jd0f3";
+      type = "gem";
+    };
+    version = "1.27.0";
+  };
+  aws-sdk-cloudformation = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bxipaq1g6c5g8zirqlbq74kmy8fglavhyrxyd91sy9yj2d9q26r";
+      type = "gem";
+    };
+    version = "1.30.0";
+  };
+  aws-sdk-cloudhsm = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "096dpm87k0q1kqnvf5v0sb98gdsq41390pxvs014qphqycqjchc6";
+      type = "gem";
+    };
+    version = "1.19.0";
+  };
+  aws-sdk-cloudhsmv2 = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10cyc1brjppnkmynkb3qf7ar78a4dhngg3fmmfxnxlcrigwbrxpa";
+      type = "gem";
+    };
+    version = "1.20.0";
+  };
+  aws-sdk-cloudtrail = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "034psp0g7ab9al7389y64pr2ar2jvxsg6p1djj4w53700xrj602g";
+      type = "gem";
+    };
+    version = "1.20.0";
+  };
+  aws-sdk-cloudwatch = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jvjjlcyp1sx0gsgm82h84n32sb51m8ih53ab4qq94m9jcxk49cr";
+      type = "gem";
+    };
+    version = "1.32.0";
+  };
+  aws-sdk-cloudwatchlogs = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bhnlh3skqw3l2yfr6nd97arlcmijpm51k664m51l5xw2971bc51";
+      type = "gem";
+    };
+    version = "1.28.0";
+  };
+  aws-sdk-codecommit = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00mkgfywxqzbbin2qidx4qvb5xcjjl41v6am023bl2yww5x8hi5p";
+      type = "gem";
+    };
+    version = "1.30.0";
+  };
+  aws-sdk-codedeploy = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06m5i5g2j2yylksficbla25cjsdw42y5gbzmx5ycxvxz3c4n3qh1";
+      type = "gem";
+    };
+    version = "1.27.0";
+  };
+  aws-sdk-codepipeline = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09dkyclanvxz77hh933ph2ad4yh7midy09hbprszfikhfkvi4z2m";
+      type = "gem";
+    };
+    version = "1.28.0";
+  };
+  aws-sdk-configservice = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1gjw5jv4p9zhdh4cg982x7x3lpfhgi7an14gjwz1llxmmkzv15wr";
+      type = "gem";
+    };
+    version = "1.40.0";
+  };
+  aws-sdk-core = {
+    dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1q7f9jkpmpppj31kh3wnzybkphq4piy8ays3vld0zsibfjs9iw7i";
+      type = "gem";
+    };
+    version = "3.90.1";
+  };
+  aws-sdk-costandusagereportservice = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18yzz7av4z8qh321r0ih6m5lc1x4mh10pn67z6y70ny8syxm4kl6";
+      type = "gem";
+    };
+    version = "1.18.0";
+  };
+  aws-sdk-dynamodb = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06nbf297r85ix92x9ilx8ysz67sm59mprscmmdp4rsn74v78dzaj";
+      type = "gem";
+    };
+    version = "1.43.0";
+  };
+  aws-sdk-ec2 = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1wnql5rzwkn97w4l3pq6k97grqdci1qs7h132pnd6lc3bx62v4h5";
+      type = "gem";
+    };
+    version = "1.144.0";
+  };
+  aws-sdk-ecr = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1smq30avqjq6h4yvw9h0k2gwp97c4l4868f2vdj93l84i80gh1pi";
+      type = "gem";
+    };
+    version = "1.25.0";
+  };
+  aws-sdk-ecs = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "113kwczkqr4jsyrnnxkm0kpdqs3ysc0913nclb5mdwapd5dbq3br";
+      type = "gem";
+    };
+    version = "1.57.0";
+  };
+  aws-sdk-eks = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1h3bvqizz95lngmpsgysdpnn1fshrppfc6zq3qphv5hagpa1gj5n";
+      type = "gem";
+    };
+    version = "1.31.0";
+  };
+  aws-sdk-elasticache = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0805g31chgr65bc74g8s33vk8id0gmyzvwpxjvf5drsrplbv1kca";
+      type = "gem";
+    };
+    version = "1.29.0";
+  };
+  aws-sdk-elasticbeanstalk = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nxrcfwngmbrvcbxh0cl6mqbvxda82k9kpjr1a0agypazapmy980";
+      type = "gem";
+    };
+    version = "1.26.0";
+  };
+  aws-sdk-elasticloadbalancing = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13mc6mahnnrcgf2ah3p12sm538mfdygz6a6afgwijaar0za126l3";
+      type = "gem";
+    };
+    version = "1.19.0";
+  };
+  aws-sdk-elasticloadbalancingv2 = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "17rvv3wlp7bm2f1cfkd8cvwz51kg6pzj8cw6jh4fvlnahx7cilr0";
+      type = "gem";
+    };
+    version = "1.39.0";
+  };
+  aws-sdk-elasticsearchservice = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lzm94grzggz6vrlzbk6226vlyfnxbq0rih71vdnj1h63f8gj73m";
+      type = "gem";
+    };
+    version = "1.30.0";
+  };
+  aws-sdk-firehose = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xpx6r6z2gfybfsndi7n6wr6zv6gqzfz9fm39wj8ljhsmbf2p2ch";
+      type = "gem";
+    };
+    version = "1.24.0";
+  };
+  aws-sdk-iam = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0s78ssjcp974v7r1znrgk78bqz23jhws4gy1nm659z5390zsn1fz";
+      type = "gem";
+    };
+    version = "1.33.0";
+  };
+  aws-sdk-kafka = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0k6pixxh9vfq2bhm89h1jpdzpikh600xmp1m1zqh9k8qa62g0glm";
+      type = "gem";
+    };
+    version = "1.17.0";
+  };
+  aws-sdk-kinesis = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mx60qi7sgr8a2k8h1c0ify2l3dvp509hflmbwq87jgq6npz89jr";
+      type = "gem";
+    };
+    version = "1.20.0";
+  };
+  aws-sdk-kms = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "191qnrpg9qhwj24pisha28fwqx30sqkj75ibgpqcf4q389l3a2gw";
+      type = "gem";
+    };
+    version = "1.29.0";
+  };
+  aws-sdk-lambda = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "16llkc8dl88m2f58kpn81lnw37zlh0ghlb1g5bzli5hm8ygn1z5s";
+      type = "gem";
+    };
+    version = "1.36.0";
+  };
+  aws-sdk-organizations = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0z71zxsvz1g3i6mnpvb05gzk2lay4dzrl45lby8n7acpp4wb2j1g";
+      type = "gem";
+    };
+    version = "1.17.0";
+  };
+  aws-sdk-rds = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09ld8vrhrhywc4imvbj238pic7qi2mg1n3421s0iwd1xhf5fvakp";
+      type = "gem";
+    };
+    version = "1.78.0";
+  };
+  aws-sdk-redshift = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1w8y5vlzzws2fqpjjq59gmgrf1l5whm1zcm7fhlkikxspq9iw16b";
+      type = "gem";
+    };
+    version = "1.37.0";
+  };
+  aws-sdk-route53 = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "132c11g43zbmn2wzrnys7viymcdsznzl26igpv6ixv4jvi62r7fq";
+      type = "gem";
+    };
+    version = "1.30.0";
+  };
+  aws-sdk-route53domains = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01flbzipphp2qm4lcrxbmwqlgl7jy5w7gyj6hbgb8aich927w5qx";
+      type = "gem";
+    };
+    version = "1.18.0";
+  };
+  aws-sdk-route53resolver = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hlyd4h49sa3s61l1w362l2qmnm78kfj2ks6mshrjwr8l8zql1q5";
+      type = "gem";
+    };
+    version = "1.11.0";
+  };
+  aws-sdk-s3 = {
+    dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pblkq7rw465w08hs2xy6v7w10x9n004hk43yqzswqxirki68ldz";
+      type = "gem";
+    };
+    version = "1.60.2";
+  };
+  aws-sdk-securityhub = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0a88i8bkqjy91ydj95h9v9mmlsqnx62hkinsprrx6ym0ix78kzim";
+      type = "gem";
+    };
+    version = "1.18.0";
+  };
+  aws-sdk-ses = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "046bsyj6zblcbffj15qbdz5fp8ipr6vfhrycsv6hznciy6jvpq4h";
+      type = "gem";
+    };
+    version = "1.27.0";
+  };
+  aws-sdk-sms = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1x1x1hrs8v4vb5l79dp5qpdi0znb5cxviwk1zcx6zajpzabv7hdl";
+      type = "gem";
+    };
+    version = "1.17.0";
+  };
+  aws-sdk-sns = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vfyn7hc21qgarhrfghyw3qi550656834b51n5vnginraryk6ji8";
+      type = "gem";
+    };
+    version = "1.21.0";
+  };
+  aws-sdk-sqs = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1c81w75ph7c3g8fkq8xxs1f5zkvv5yv0k3xy6441gjxvwkpiaih6";
+      type = "gem";
+    };
+    version = "1.23.1";
+  };
+  aws-sdk-ssm = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "116vbhw7l2hk1vk3dq79czp857bcw7giw00ip4par1cgwkxym03c";
+      type = "gem";
+    };
+    version = "1.71.0";
+  };
+  aws-sigv4 = {
+    dependencies = ["aws-eventstream"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1dfc8i5cxjwlvi4b665lbpbwvks8a6wfy3vfmwr3pjdmxwdmc2cs";
       type = "gem";
     };
     version = "1.1.0";
   };
+  azure_graph_rbac = {
+    dependencies = ["ms_rest_azure"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fq9gnsihrrljmlsg70kmryf72rxyy8kb4v9fa9z28abj0lncqgk";
+      type = "gem";
+    };
+    version = "0.17.1";
+  };
+  azure_mgmt_key_vault = {
+    dependencies = ["ms_rest_azure"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18vcdhzndwa81lg877b1mg2804vhvvnw83qagx6v99adicjf8y8b";
+      type = "gem";
+    };
+    version = "0.17.5";
+  };
+  azure_mgmt_resources = {
+    dependencies = ["ms_rest_azure"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "036p2d59jdjx5a49jz4swf37kfpc9ryyrb13xrdyghk1q79qli8p";
+      type = "gem";
+    };
+    version = "0.17.8";
+  };
+  azure_mgmt_security = {
+    dependencies = ["ms_rest_azure"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01rk0wbfbhrxnm0vv520ilxd55hv7n3w0sq5j0v17mnwjgm7pa6d";
+      type = "gem";
+    };
+    version = "0.18.0";
+  };
+  azure_mgmt_storage = {
+    dependencies = ["ms_rest_azure"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0m1xajw39958kcv4qlhad2n19flijn9aqzxks2wx4b0k207vp87c";
+      type = "gem";
+    };
+    version = "0.19.2";
+  };
+  backports = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sp3l5wa77klj34sqib95ppxyam53x3p57xk0y6gy2c3z29z6hs5";
+      type = "gem";
+    };
+    version = "3.16.1";
+  };
+  bcrypt_pbkdf = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02vssr285m7kpsr47jdmzbar1h1d0mnkmyrpr1zg828isfmwii35";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  berkshelf = {
+    dependencies = ["chef" "chef-config" "cleanroom" "concurrent-ruby" "minitar" "mixlib-archive" "mixlib-config" "mixlib-shellout" "octokit" "retryable" "solve" "thor"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0pb20i2blbj9w4cf9nxxxskbd7q5zk8rrirppsfjx8r02dywpq8f";
+      type = "gem";
+    };
+    version = "7.0.9";
+  };
   builder = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1";
+      sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr";
       type = "gem";
     };
-    version = "3.2.3";
-  };
-  celluloid = {
-    dependencies = ["timers"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "044xk0y7i1xjafzv7blzj5r56s7zr8nzb619arkrl390mf19jxv3";
-      type = "gem";
-    };
-    version = "0.16.0";
-  };
-  celluloid-io = {
-    dependencies = ["celluloid" "nio4r"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1l1x0p6daa5vskywrvaxdlanwib3k5pps16axwyy4p8d49pn9rnx";
-      type = "gem";
-    };
-    version = "0.16.2";
+    version = "3.2.4";
   };
   chef = {
-    dependencies = ["addressable" "chef-config" "chef-zero" "diff-lcs" "erubis" "ffi-yajl" "highline" "iniparse" "iso8601" "mixlib-archive" "mixlib-authentication" "mixlib-cli" "mixlib-log" "mixlib-shellout" "net-sftp" "net-ssh" "net-ssh-multi" "ohai" "plist" "proxifier" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec_junit_formatter" "serverspec" "specinfra" "syslog-logger" "uuidtools"];
+    dependencies = ["addressable" "bcrypt_pbkdf" "chef-config" "chef-utils" "chef-zero" "diff-lcs" "ed25519" "erubis" "ffi" "ffi-libarchive" "ffi-yajl" "highline" "iniparse" "license-acceptance" "mixlib-archive" "mixlib-authentication" "mixlib-cli" "mixlib-log" "mixlib-shellout" "net-sftp" "net-ssh" "net-ssh-multi" "ohai" "plist" "proxifier" "syslog-logger" "train-core" "train-winrm" "tty-screen" "uuidtools"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1whvkx1a3877vnpv6q84bp9sb4aq5p5hgv9frln90l61f5nrx1gb";
+      sha256 = "0lfx43yl77x074vjg77ixfxnxwl103ywjya55m4lj4vj0b2nxxxn";
       type = "gem";
     };
-    version = "13.6.4";
+    version = "15.8.23";
+  };
+  chef-cli = {
+    dependencies = ["addressable" "chef" "cookbook-omnifetch" "diff-lcs" "ffi-yajl" "license-acceptance" "minitar" "mixlib-cli" "mixlib-shellout" "paint" "solve"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "05178w55vwqgrv8jaic2f77h6hx5b40lsmlaqfvdq63a459wl5sd";
+      type = "gem";
+    };
+    version = "2.0.0";
   };
   chef-config = {
-    dependencies = ["addressable" "fuzzyurl" "mixlib-config" "mixlib-shellout"];
+    dependencies = ["addressable" "chef-utils" "fuzzyurl" "mixlib-config" "mixlib-shellout" "tomlrb"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0r5bd2901bwcr8zffhvri1ypkqfmqinbg78aj0xnndg6lkbr9rd5";
+      sha256 = "0xbl4pgn4kavi6b1m1f232xx4l9fhlz7d4ndmb11m36wb8l05hsk";
       type = "gem";
     };
-    version = "13.6.4";
+    version = "15.8.23";
   };
   chef-dk = {
-    dependencies = ["addressable" "chef" "chef-provisioning" "cookbook-omnifetch" "diff-lcs" "ffi-yajl" "minitar" "mixlib-cli" "mixlib-shellout" "paint" "solve"];
+    dependencies = ["addressable" "chef" "cookbook-omnifetch" "diff-lcs" "ffi-yajl" "license-acceptance" "minitar" "mixlib-cli" "mixlib-shellout" "paint" "solve"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0zqbwkad61rn4wli6z8a7l7glfnnrhbg474vfshvr0k1sicy8z2d";
+      sha256 = "0zhfq3kwchay6aj6128pr13xabrfprs288ma9abnv9d6vz3ddpw6";
       type = "gem";
     };
-    version = "2.4.17";
+    version = "4.7.73";
   };
   chef-provisioning = {
     dependencies = ["cheffish" "inifile" "mixlib-install" "net-scp" "net-ssh" "net-ssh-gateway" "winrm" "winrm-elevated" "winrm-fs"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0mxax73kblcbsz5bzqc655igbjwqjpl5f7vz478afr6amh3lsxsw";
+      sha256 = "16l3hahc5b57bi61kssdzqywh8ydkbmj0mgdj4lvj0v68hnjc6f1";
       type = "gem";
     };
-    version = "2.6.0";
+    version = "2.7.6";
+  };
+  chef-telemetry = {
+    dependencies = ["chef-config" "concurrent-ruby" "ffi-yajl" "http"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lx85wy6d1khrya0idwqkdvh1x57qak3d8y699gwccfhl88xymg3";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  chef-utils = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "149pgbybdpi9y11qfsm4bmnqm655s682yv7qkwxhzwqn2fylzb2j";
+      type = "gem";
+    };
+    version = "15.8.23";
   };
   chef-vault = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ks248hqd3s9w0nq8pnpp6and3522b128f2avg63cx5gq6889hwh";
+      sha256 = "0k0famr2cbrrarp4rpzcymqnpnwg734psbf0pxhasxdsjjg8nl6f";
       type = "gem";
     };
-    version = "3.3.0";
+    version = "4.0.1";
   };
   chef-zero = {
     dependencies = ["ffi-yajl" "hashie" "mixlib-log" "rack" "uuidtools"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nzmc0fzi73k692j09zipm3gqx1fkrw4r4r4g2b3i1zvasaxbi7x";
+      sha256 = "1pjvg3djnzkwkjj5pmgk9dc14q5bdd7na8js1d4gr8x6b6z58my3";
       type = "gem";
     };
-    version = "13.1.0";
+    version = "14.0.17";
   };
   cheffish = {
     dependencies = ["chef-zero" "net-ssh"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0mpyf9bhnxil5mwy8cffcfl5l9alxhdnjzsmpzcdwihbz401qrn3";
+      sha256 = "0axv7mkx0s4nqa85ns1xg70s9sq3h6fg86nda13b6q9k7gbifkvl";
       type = "gem";
     };
-    version = "13.1.0";
+    version = "14.0.13";
   };
   chefspec = {
-    dependencies = ["chef" "fauxhai" "rspec"];
+    dependencies = ["chef" "chef-cli" "fauxhai-ng" "rspec"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0zpycdwp18k6nkgyx7l3ndhyaby1v4bfqh9by6ld2fbksnx29p6k";
+      sha256 = "1ry6707plcrj7aicadmzxzfmlvz43i2g55k2iph8m390wpxhnhcl";
       type = "gem";
     };
-    version = "7.1.1";
+    version = "9.1.0";
   };
   cleanroom = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1r6qa4b248jasv34vh7rw91pm61gzf8g5dvwx2gxrshjs7vbhfml";
@@ -189,6 +804,8 @@
     version = "1.0.0";
   };
   coderay = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y";
@@ -197,32 +814,40 @@
     version = "1.1.2";
   };
   concurrent-ruby = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf";
+      sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl";
       type = "gem";
     };
-    version = "1.0.5";
+    version = "1.1.6";
   };
   cookbook-omnifetch = {
     dependencies = ["mixlib-archive"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0dm93zjr2a9pappkncnw4hlrn7dl9vwmrx5xly4128rnzbcgn41p";
+      sha256 = "1w4xh4ffcm4jd3fys9yg3rb8asngll15mvra8lfi2328alvbanvb";
       type = "gem";
     };
-    version = "0.8.0";
+    version = "0.9.1";
   };
   cucumber-core = {
     dependencies = ["backports" "cucumber-tag_expressions" "gherkin"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "06lip8ds4lw3wyjwsjv1laimk5kz39vsmvv9if7hiq9v611kd3sn";
+      sha256 = "1iavlh8hqj9lwljbpkw06259gdicbr1bdb6pbj5yy3n8szgr8k3c";
       type = "gem";
     };
-    version = "3.1.0";
+    version = "3.2.1";
   };
   cucumber-tag_expressions = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0cvmbljybws0qzjs1l67fvr9gqr005l8jk1ni5gcsis9pfmqh3vc";
@@ -230,7 +855,29 @@
     };
     version = "1.1.1";
   };
+  declarative = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0642xvwzzbgi3kp1bg467wma4g3xqrrn0sk369hjam7w579gnv5j";
+      type = "gem";
+    };
+    version = "0.0.10";
+  };
+  declarative-option = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1g4ibxq566f1frnhdymzi9hxxcm4g2gw4n21mpjk2mhwym4q6l0p";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
   diff-lcs = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza";
@@ -239,23 +886,70 @@
     version = "1.3";
   };
   diffy = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "015nn9zaciqj43mfpjlw619r5dvnfkrjcka8nsa6j260v6qya941";
+      sha256 = "0qhx743lcx61r2d3925jk61c6r8clfjmpf5g93cdy5sq00ig76lh";
       type = "gem";
     };
-    version = "3.2.0";
+    version = "3.3.0";
   };
   docker-api = {
     dependencies = ["excon" "multi_json"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09wsm6ims9gndfkh1ndhq3mps581g0slmvlvcdmsjfjb3qgm6fj5";
+      sha256 = "04dkbg7x2m4102dnwil2v688gblxh1skh374nkzksn18jjrivkdp";
       type = "gem";
     };
-    version = "1.34.0";
+    version = "1.34.2";
+  };
+  domain_name = {
+    dependencies = ["unf"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0";
+      type = "gem";
+    };
+    version = "0.5.20190701";
+  };
+  ed25519 = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1f5kr8za7hvla38fc0n9jiv55iq62k5bzclsa5kdb14l3r4w6qnw";
+      type = "gem";
+    };
+    version = "1.2.4";
+  };
+  equatable = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fzx2ishipnp6c124ka6fiw5wk42s7c7gxid2c4c1mb55b30dglf";
+      type = "gem";
+    };
+    version = "0.6.1";
+  };
+  erubi = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x";
+      type = "gem";
+    };
+    version = "1.9.0";
   };
   erubis = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
@@ -264,58 +958,105 @@
     version = "2.7.0";
   };
   excon = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0mnc9lqlzwqj5ayp0lh7impisqm55mdg3mw5q4gi9yjic5sidc40";
+      sha256 = "1vhc5c16i8zrm3d98ppsnw514d7jvwdg0wk60kc9i1xw3797qkkd";
       type = "gem";
     };
-    version = "0.59.0";
+    version = "0.72.0";
   };
   faraday = {
     dependencies = ["multipart-post"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1gyqsj7vlqynwvivf9485zwmcj04v1z7gq362z0b8zw2zf4ag0hw";
+      sha256 = "13aghksmni2sl15y7wfpx6k5l3lfd8j9gdyqi6cbw6jgc7bqyyn2";
       type = "gem";
     };
-    version = "0.13.1";
+    version = "0.17.3";
   };
-  fauxhai = {
-    dependencies = ["net-ssh"];
+  faraday-cookie_jar = {
+    dependencies = ["faraday" "http-cookie"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0145yfn48qh64wbr55lzs1xjd6fi0z9000ix1z086dziks508c2v";
+      sha256 = "1di4gx6446a6zdkrpj679m5k515i53wvb4yxcsqvy8d8zacxiiv6";
       type = "gem";
     };
-    version = "5.5.0";
+    version = "0.0.6";
+  };
+  faraday_middleware = {
+    dependencies = ["faraday"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1p7icfl28nvl8qqdsngryz1snqic9l8x6bk0dxd7ygn230y0k41d";
+      type = "gem";
+    };
+    version = "0.12.2";
+  };
+  fauxhai-ng = {
+    dependencies = ["net-ssh"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vm9hz6k8v4i7r1s5z489n58liaaxmb8bgcvklfg1hf8k3d5afdp";
+      type = "gem";
+    };
+    version = "7.6.0";
   };
   ffi = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0";
+      sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4";
       type = "gem";
     };
-    version = "1.9.18";
+    version = "1.12.2";
+  };
+  ffi-libarchive = {
+    dependencies = ["ffi"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vs8s37lr3bgw5d3mb6vamcqy16dj61yzzq0xf453lhr3dcampkb";
+      type = "gem";
+    };
+    version = "1.0.0";
   };
   ffi-yajl = {
     dependencies = ["libyajl2"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0mv7h8bjzgv96kpbmgkmg43rwy96w54kg39vldcdwym6kpqyfgr5";
+      sha256 = "11m9pkx2a1vssplzb3fwx4kc25bg5xmjf0j97l5kv6mhnhd93sik";
       type = "gem";
     };
-    version = "2.3.1";
+    version = "2.3.3";
   };
   foodcritic = {
     dependencies = ["cucumber-core" "erubis" "ffi-yajl" "nokogiri" "rake" "rufus-lru" "treetop"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0snnfv95zwv3rc9ilkzvw1pjch8cykkxq5q42ckx9zr9yd4bzmhz";
+      sha256 = "11dzfcf6p1z75anizwqm48nadd84j5wk0vm4mp4s5a7xfqjh3psi";
       type = "gem";
     };
-    version = "12.2.1";
+    version = "16.2.0";
   };
   fuzzyurl = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "03qchs33vfwbsv5awxg3acfmlcrf5xbhnbrc83fdpamwya0glbjl";
@@ -324,32 +1065,63 @@
     version = "0.9.0";
   };
   gherkin = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0arfhyjcsf5bv1anj4ysqhgl621nwl9qfcs7gg20y3sapcjwl2y7";
+      sha256 = "1cgcdchwwdm10rsk44frjwqd4ihprhxjbm799nscqy2q1raqfj5s";
       type = "gem";
     };
-    version = "5.0.0";
+    version = "5.1.0";
   };
   git = {
+    dependencies = ["rchardet"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1waikaggw7a1d24nw0sh8fd419gbf7awh000qhsf411valycj6q3";
+      sha256 = "15sbv16dlap5d6naybl8cc99zffrpzygkhjz3m6l3r5y5yrhwwjc";
+      type = "gem";
+    };
+    version = "1.6.0";
+  };
+  google-api-client = {
+    dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "signet"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xndfscxxaw73qah484vmhcd60hlbyrr9rlh7sf2n2sjfcqikjsf";
+      type = "gem";
+    };
+    version = "0.34.1";
+  };
+  googleauth = {
+    dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1dnkh017ln5g7x3y0w743g61bxb2cdcyr1vax9ic3gx7vkrfj3iw";
+      type = "gem";
+    };
+    version = "0.10.0";
+  };
+  gssapi = {
+    dependencies = ["ffi"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13l6pqbfrx3vv7cw26nq9p8rnyp9br31gaz85q32wx6hnzfcriwh";
       type = "gem";
     };
     version = "1.3.0";
   };
-  gssapi = {
-    dependencies = ["ffi"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0j93nsf9j57p7x4aafalvjg8hia2mmqv3aky7fmw2ck5yci343ix";
-      type = "gem";
-    };
-    version = "1.2.0";
-  };
   gyoku = {
     dependencies = ["builder"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1wn0sl14396g5lyvp8sjmcb1hw9rbyi89gxng91r7w4df4jwiidh";
@@ -358,14 +1130,18 @@
     version = "1.3.1";
   };
   hashie = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "120mkd2hkwhcfj7avi1dphb0lm7wx364d1cjm9yr4fibqpvsgqi7";
+      sha256 = "13bdzfp25c8k51ayzxqkbzag3wj5gc1jd8h7d985nsq6pn57g5xh";
       type = "gem";
     };
-    version = "3.5.6";
+    version = "3.6.0";
   };
   highline = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y";
@@ -373,15 +1149,9 @@
     };
     version = "1.7.10";
   };
-  hitimes = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "06222h9236jw9jgmdlpi0q7psac1shvxqxqx905qkvabmxdxlfar";
-      type = "gem";
-    };
-    version = "1.2.6";
-  };
   htmlentities = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj";
@@ -389,7 +1159,51 @@
     };
     version = "4.3.4";
   };
+  http = {
+    dependencies = ["addressable" "http-cookie" "http-form_data" "http_parser.rb"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kcd9qp8vm1rkyp7gfh8j0dbl3zpi97vz2vbhpbcsdsa7l21a59r";
+      type = "gem";
+    };
+    version = "2.2.2";
+  };
+  http-cookie = {
+    dependencies = ["domain_name"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  http-form_data = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0j8dwwbfpf8kc0lcsqcgy29lflszd1x4d7kc0f7227892m7r6y0m";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  "http_parser.rb" = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi";
+      type = "gem";
+    };
+    version = "0.6.0";
+  };
   httpclient = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99";
@@ -397,7 +1211,20 @@
     };
     version = "2.8.3";
   };
+  i18n = {
+    dependencies = ["concurrent-ruby"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm";
+      type = "gem";
+    };
+    version = "1.8.2";
+  };
   inifile = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1c5zmk7ia63yw5l2k14qhfdydxwi1sah1ppjdiicr4zcalvfn0xi";
@@ -406,6 +1233,8 @@
     version = "3.0.0";
   };
   iniparse = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1xbik6838gfh5yq9ahh1m7dzszxlk0g7x5lvhb8amk60mafkrgws";
@@ -414,15 +1243,30 @@
     version = "1.4.4";
   };
   inspec = {
-    dependencies = ["addressable" "faraday" "hashie" "htmlentities" "json" "method_source" "mixlib-log" "parallel" "parslet" "pry" "rainbow" "rspec" "rspec-its" "rubyzip" "semverse" "sslshake" "thor" "tomlrb" "train"];
+    dependencies = ["faraday_middleware" "inspec-core" "train" "train-aws" "train-habitat" "train-winrm"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0yvmqdhpag7v6m9z1mcwqj6y1rnrx6hbqws0lhh1zp4xky3w7fn4";
+      sha256 = "04cyv81rgspr9xachq2dk9xgb740jrq7vpy2r88lqdzlzbpz3f4n";
       type = "gem";
     };
-    version = "1.47.0";
+    version = "4.18.85";
+  };
+  inspec-core = {
+    dependencies = ["addressable" "chef-telemetry" "faraday" "hashie" "htmlentities" "json-schema" "license-acceptance" "method_source" "mixlib-log" "multipart-post" "parallel" "parslet" "pry" "rspec" "rspec-its" "rubyzip" "semverse" "sslshake" "term-ansicolor" "thor" "tomlrb" "train-core" "tty-prompt" "tty-table"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ha6dmi5lywv4gldpv2pyj0zwqv4wsf422jd4x8licmkpkcrwc2r";
+      type = "gem";
+    };
+    version = "4.18.85";
   };
   ipaddress = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1x86s0s11w202j6ka40jbmywkrx8fhq8xiy8mwvnkhllj57hqr45";
@@ -430,57 +1274,114 @@
     };
     version = "0.8.3";
   };
-  iso8601 = {
+  jaro_winkler = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0diaqrf9lxmjamasydmd8mbc9p1lh01mb2d9y66kd1mmi7ml85yp";
+      sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh";
       type = "gem";
     };
-    version = "0.9.1";
+    version = "1.5.4";
+  };
+  jmespath = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf";
+      type = "gem";
+    };
+    version = "1.4.0";
   };
   json = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp";
+      sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "2.3.0";
+  };
+  json-schema = {
+    dependencies = ["addressable"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1yv5lfmr2nzd14af498xqd5p89f3g080q8wk0klr3vxgypsikkb5";
+      type = "gem";
+    };
+    version = "2.8.1";
+  };
+  jwt = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01zg1vp3lyl3flyjdkrcc93ghf833qgfgh2p1biqfhkzz11r129c";
+      type = "gem";
+    };
+    version = "2.2.1";
   };
   kitchen-inspec = {
     dependencies = ["hashie" "inspec" "test-kitchen"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0giqlpwhc7d91245pa9wkjad6ag6wd0q1757kwxmpgz4rh59xwnz";
+      sha256 = "1v85hnmhqdbl9zxphvbqfgma9rl095mq9jz223mkffdh9q5xv282";
       type = "gem";
     };
-    version = "0.20.0";
+    version = "1.3.1";
   };
   kitchen-vagrant = {
     dependencies = ["test-kitchen"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0nd09fwk6ncb6rflhl8pwfnq8iyhfzrfqdx4pyhjqq18n5pp3nk6";
+      sha256 = "01wwryb4ha6gzhnmbg7xir32rpynbw4zc2l9dch02pwizw0n669x";
       type = "gem";
     };
-    version = "1.2.1";
+    version = "1.6.1";
   };
   knife-spork = {
     dependencies = ["app_conf" "chef" "diffy" "git"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0h9ifjwlqhav04j40psmz22vdz1s3xvq35kzqyc22ir3w6s9nrlj";
+      sha256 = "1rcry9fbsi9kqfi8rrdda17yzmfyg21g9jv01sgzg1sj59kzb79s";
       type = "gem";
     };
-    version = "1.7.1";
+    version = "1.7.2";
   };
   libyajl2 = {
+    groups = ["default"];
+    platforms = [];
     source = {
+      remotes = ["https://rubygems.org"];
       sha256 = "0n5j0p8dxf9xzb9n4bkdr8w0a8gg3jzrn9indri3n0fv90gcs5qi";
       type = "gem";
     };
     version = "1.2.0";
   };
+  license-acceptance = {
+    dependencies = ["pastel" "tomlrb" "tty-box" "tty-prompt"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lxgpmzb9hafzx7f5fssb1mamcbzbdp87awvjr33fk6nsvyg3zaj";
+      type = "gem";
+    };
+    version = "1.0.13";
+  };
   little-plugger = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym";
@@ -490,6 +1391,8 @@
   };
   logging = {
     dependencies = ["little-plugger" "multi_json"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn";
@@ -497,122 +1400,215 @@
     };
     version = "2.2.2";
   };
-  method_source = {
+  memoist = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xqj21j3vfq4ldia6i2akhn2qd84m0iqcnsl49kfpq3xk6x0dzgn";
+      sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55";
       type = "gem";
     };
-    version = "0.9.0";
+    version = "0.16.2";
+  };
+  method_source = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq";
+      type = "gem";
+    };
+    version = "0.9.2";
+  };
+  mini_mime = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha";
+      type = "gem";
+    };
+    version = "1.0.2";
   };
   mini_portile2 = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
+      sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
       type = "gem";
     };
-    version = "2.3.0";
+    version = "2.4.0";
   };
   minitar = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1vpdjfmdq1yc4i620frfp9af02ia435dnpj8ybsd7dc3rypkvbka";
+      sha256 = "126mq86x67d1p63acrfka4zx0cx2r0vc93884jggxnrmmnzbxh13";
       type = "gem";
     };
-    version = "0.5.4";
+    version = "0.9";
+  };
+  minitest = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz";
+      type = "gem";
+    };
+    version = "5.14.0";
   };
   mixlib-archive = {
     dependencies = ["mixlib-log"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1b56iprv8cdhxjpzb8ck0mc54cl0kmyzlkn6bzzdqws4gxvdf6gk";
+      sha256 = "01c7g55x126cj2493wx03n9b83i9m1rdfx2aivg1yg8d1lmj8jdg";
       type = "gem";
     };
-    version = "0.4.1";
+    version = "1.0.5";
   };
   mixlib-authentication = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1lh8vrkq2nnf0rx69mlyiqkx664baxbp32imb7l517lbcw5xspgb";
+      sha256 = "0d854b55d0hx0q12gwbycfdcpnxx88zz0jk557ngq2cqq94g96jy";
       type = "gem";
     };
-    version = "1.4.2";
+    version = "3.0.6";
   };
   mixlib-cli = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp";
+      sha256 = "1yrfgg18hlm0hkg81w5bw3fbk0m89lg96a0b65q9mrrscg37rvn2";
       type = "gem";
     };
-    version = "1.7.0";
+    version = "2.1.5";
   };
   mixlib-config = {
+    dependencies = ["tomlrb"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0s2ag6jz59r1gn8rbhf5c1g2mpbkc5jmz2fxh3n7hzv80dfzk42w";
+      sha256 = "14lb9dg4wg86qhbd0rykdjr00arkyvmrg20a5ylf0zd6wp7w01jk";
       type = "gem";
     };
-    version = "2.2.4";
+    version = "3.0.6";
   };
   mixlib-install = {
     dependencies = ["mixlib-shellout" "mixlib-versioning" "thor"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0rsi3f3rcg3vky3biy59rvllk3wvx8xnyfch0d4h74r6sxcgbf79";
+      sha256 = "0bsn4d0m3xw142v1vssyrxwa6y64fqd5hx2hsnm5vc1xj4xmcg0f";
       type = "gem";
     };
-    version = "3.8.0";
+    version = "3.11.26";
   };
   mixlib-log = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "14sknyi9r7rg28m21c8ixzyndhbmi0d6vk02y4hf42dd60hmdbgp";
+      sha256 = "00kmwx7s3xpxmy44saxjk36gbhsywyxy4f8jf4gjvwwpr0ps8q0g";
       type = "gem";
     };
-    version = "1.7.1";
+    version = "3.0.8";
   };
   mixlib-shellout = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1aszrg8b6nrsb3avdm2x04f2n0xx81rdip0waxibkqpslcmb8zx5";
+      sha256 = "0c2nqa82xp0hg8sj69cypar8n7p3azl5pl2v2mjbkhgmmhqxa8km";
       type = "gem";
     };
-    version = "2.3.2";
+    version = "3.0.9";
   };
   mixlib-versioning = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04ayjzsqqgi0ax8c657wwnmclxh53jvn82mnsf7jb2h7fzlb59v3";
+      sha256 = "0cqyrcgw2xwxmjhwa31ipmphkg5aa6x4fd5c5j9y7hifw32pb1vr";
       type = "gem";
     };
-    version = "1.2.2";
+    version = "1.2.12";
   };
   molinillo = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0hiy8qvk7hsy5bl5x5b19zf3v3qbmcpa0a9w1kywhvd9051a9vnr";
+      sha256 = "1hh40z1adl4lw16dj4hxgabx4rr28mgqycih1y1d91bwww0jjdg6";
       type = "gem";
     };
-    version = "0.6.4";
+    version = "0.6.6";
+  };
+  ms_rest = {
+    dependencies = ["concurrent-ruby" "faraday" "timeliness"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10mgfspn3g75mhmfprpr2pnkmav34gix8cfga43g7162d0i1pd9l";
+      type = "gem";
+    };
+    version = "0.7.5";
+  };
+  ms_rest_azure = {
+    dependencies = ["concurrent-ruby" "faraday" "faraday-cookie_jar" "ms_rest" "unf_ext"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "135va1hzxwn0apb2lf7b9yi8d1czid250cgf91dm331rqz84jnvz";
+      type = "gem";
+    };
+    version = "0.11.1";
   };
   multi_json = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1raim9ddjh672m32psaa9niw67ywzjbxbdb8iijx3wv9k5b0pk2x";
+      sha256 = "0xy54mjf7xg41l8qrg1bqri75agdqmxap9z466fjismc1rn2jwfr";
       type = "gem";
     };
-    version = "1.12.2";
+    version = "1.14.1";
   };
   multipart-post = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
+      sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj";
       type = "gem";
     };
-    version = "2.0.0";
+    version = "2.1.1";
+  };
+  necromancer = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1w2y31947axs62bsf0xrpgalsw4ip1m44vpw7p8f4s9zvnayj2vd";
+      type = "gem";
+    };
+    version = "0.5.1";
   };
   net-scp = {
     dependencies = ["net-ssh"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j";
@@ -622,6 +1618,8 @@
   };
   net-sftp = {
     dependencies = ["net-ssh"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "04674g4n6mryjajlcd82af8g8k95la4b1bj712dh71hw1c9vhw1y";
@@ -630,6 +1628,8 @@
     version = "2.1.2";
   };
   net-ssh = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "07c4v97zl1daabmri9zlbzs6yvkl56z1q14bw74d53jdj0c17nhx";
@@ -639,15 +1639,19 @@
   };
   net-ssh-gateway = {
     dependencies = ["net-ssh"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04ws9bvf3ppvcj9vrnwyabcwv4lz1m66ni443z2cf4wvvqssifsa";
+      sha256 = "1l3v761y32aw0n8lm0c0m42lr4ay8cq6q4sc5yc68b9fwlfvb70x";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "2.0.0";
   };
   net-ssh-multi = {
     dependencies = ["net-ssh" "net-ssh-gateway"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "13kxz9b6kgr9mcds44zpavbndxyi6pvyzyda6bhk1kfmb5c10m71";
@@ -655,32 +1659,20 @@
     };
     version = "1.2.1";
   };
-  net-telnet = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "13qxznpwmc3hs51b76wqx2w29r158gzzh8719kv2gpi56844c8fx";
-      type = "gem";
-    };
-    version = "0.1.1";
-  };
-  nio4r = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1n7csawahihc4z0d1888l2c9hlxxd06m093c58gkp1mcbj9bvyb0";
-      type = "gem";
-    };
-    version = "2.1.0";
-  };
   nokogiri = {
     dependencies = ["mini_portile2"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "105xh2zkr8nsyfaj2izaisarpnkrrl9000y3nyflg9cbzrfxv021";
+      sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8";
       type = "gem";
     };
-    version = "1.8.1";
+    version = "1.10.8";
   };
   nori = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn";
@@ -689,24 +1681,40 @@
     version = "2.6.0";
   };
   octokit = {
-    dependencies = ["sawyer"];
+    dependencies = ["faraday" "sawyer"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0h6cm7bi0y7ysjgwws3paaipqdld6c0m0niazrjahhpz88qqq1g4";
+      sha256 = "06kx258qa5k24q5pv8i4daaw3g57gif6p5k5h3gndj3q2jk6vhkn";
       type = "gem";
     };
-    version = "4.7.0";
+    version = "4.16.0";
   };
   ohai = {
     dependencies = ["chef-config" "ffi" "ffi-yajl" "ipaddress" "mixlib-cli" "mixlib-config" "mixlib-log" "mixlib-shellout" "plist" "systemu" "wmi-lite"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "05dx2nsswcnd9f7qvz4jgiwwh18z4qbx6mqvflzlx276adx68i0s";
+      sha256 = "1c6c22nqg905sivr099qrwbvnwwyvm37xzxxrysvkalxglkvxr23";
       type = "gem";
     };
-    version = "13.7.0";
+    version = "15.7.4";
+  };
+  os = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06r55k01g32lvz4wf2s6hpjlxbbag113jsvff3w64jllfr315a73";
+      type = "gem";
+    };
+    version = "1.0.1";
   };
   paint = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1z1fqyyc2jiv6yabv467h652cxr2lmxl5gqqg7p14y28kdqf0nhj";
@@ -715,39 +1723,60 @@
     version = "1.0.1";
   };
   parallel = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0qv2yj4sxr36ga6xdxvbq9h05hn10bwcbkqv6j6q1fiixhsdnnzd";
+      sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2";
       type = "gem";
     };
-    version = "1.12.0";
+    version = "1.19.1";
   };
   parser = {
     dependencies = ["ast"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0bqc29xx4zwlshvi6krrd0sl82d7xjfhcrxvgf38wvdqcl3b7ck3";
+      sha256 = "145lv6rbbnbddbk79l10kadycjq05vyrzq5d733zswmypshpq6ni";
       type = "gem";
     };
-    version = "2.4.0.2";
+    version = "2.7.0.2";
   };
   parslet = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15ls4zgarhic522r767nbsfn7hddrhd7zv8hvlx5flas8b2ybirf";
+      sha256 = "12nrzfwjphjlakb9pmpj70hgjwgzvnr8i1zfzddifgyd44vspl88";
       type = "gem";
     };
-    version = "1.8.1";
+    version = "1.8.2";
+  };
+  pastel = {
+    dependencies = ["equatable" "tty-color"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0m43wk7gswwkl6lfxwlliqc9v1qp8arfygihyz91jc9icf270xzm";
+      type = "gem";
+    };
+    version = "0.7.3";
   };
   plist = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0k0pyqrjcz9kn1b3ahsfs9aqym7s7yzz0vavya0zn0mca3jw2zqc";
+      sha256 = "0ra0910xxbhfsmdi0ig36pr3q0khdqzwb5da3wg7y3n8d1sh9ffp";
       type = "gem";
     };
-    version = "3.3.0";
+    version = "3.5.0";
   };
   polyglot = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr";
@@ -755,15 +1784,9 @@
     };
     version = "0.3.5";
   };
-  powerpack = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43";
-      type = "gem";
-    };
-    version = "0.1.1";
-  };
   proxifier = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1abzlg39cfji1nx3i8kmb5k3anr2rd392yg2icms24wkqz9g9zj0";
@@ -773,143 +1796,195 @@
   };
   pry = {
     dependencies = ["coderay" "method_source"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1mh312k3y94sj0pi160wpia0ps8f4kmzvm505i6bvwynfdh7v30g";
+      sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69";
       type = "gem";
     };
-    version = "0.11.3";
+    version = "0.12.2";
   };
   public_suffix = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0mvzd9ycjw8ydb9qy3daq3kdzqs2vpqvac4dqss6ckk4rfcjc637";
+      sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm";
       type = "gem";
     };
-    version = "3.0.1";
+    version = "3.1.1";
   };
   rack = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1pcgv8dv4vkaczzlix8q3j68capwhk420cddzijwqgi2qb4lm1zm";
-      type = "gem";
-    };
-    version = "2.0.6";
-  };
-  rainbow = {
-    dependencies = ["rake"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "08w2ghc5nv0kcq5b257h7dwjzjz1pqcavajfdx2xjyxqsvh2y34w";
+      sha256 = "10mp9s48ssnw004aksq90gvhdvwczh8j6q82q2kqiqq92jd1zxbp";
       type = "gem";
     };
     version = "2.2.2";
   };
-  rake = {
+  rainbow = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "190p7cs8zdn07mjj6xwwsdna3g0r98zs4crz7jh2j2q5b0nbxgjf";
+      sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
       type = "gem";
     };
-    version = "12.3.0";
+    version = "3.0.0";
+  };
+  rake = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9";
+      type = "gem";
+    };
+    version = "13.0.1";
+  };
+  rchardet = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1isj1b3ywgg2m1vdlnr41lpvpm3dbyarf1lla4dfibfmad9csfk9";
+      type = "gem";
+    };
+    version = "1.8.0";
+  };
+  representable = {
+    dependencies = ["declarative" "declarative-option" "uber"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07";
+      type = "gem";
+    };
+    version = "3.0.4";
+  };
+  retriable = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1q48hqws2dy1vws9schc0kmina40gy7sn5qsndpsfqdslh65snha";
+      type = "gem";
+    };
+    version = "3.1.2";
   };
   retryable = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1pxv5xgr08s9gv5npj7h3raxibywznrv2wcrb85ibhlhzgzcxggf";
+      sha256 = "0pymcs9fqcnz6n6h033yfp0agg6y2s258crzig05kkxs6rldvwy9";
       type = "gem";
     };
-    version = "2.0.4";
+    version = "3.0.5";
   };
-  ridley = {
-    dependencies = ["addressable" "buff-config" "buff-extensions" "buff-ignore" "buff-shell_out" "celluloid" "celluloid-io" "chef-config" "erubis" "faraday" "hashie" "httpclient" "json" "mixlib-authentication" "retryable" "semverse" "varia_model"];
+  rexml = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0n2ykdnr1cn9fk8ns2dh3qf7g5dywl8p8kw4zbw4amb4v5xlkwjh";
+      sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3";
       type = "gem";
     };
-    version = "5.1.1";
+    version = "3.2.4";
   };
   rspec = {
     dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0134g96wzxjlig2gxzd240gm2dxfw8izcyi2h6hjmr40syzcyx01";
+      sha256 = "1hzsig4pi9ybr0xl5540m1swiyxa74c8h09225y5sdh2rjkkg84h";
       type = "gem";
     };
-    version = "3.7.0";
+    version = "3.9.0";
   };
   rspec-core = {
     dependencies = ["rspec-support"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15c4mgivvs9hpi0i1a8gypdl1f0hg6xknsbizgpm3khc95lqd9r9";
+      sha256 = "1qzc1wdjb1qnbimjl8i1q1r1z5hdv2lmcw7ysz7jawj4d1cvpqvd";
       type = "gem";
     };
-    version = "3.7.0";
+    version = "3.9.1";
   };
   rspec-expectations = {
     dependencies = ["diff-lcs" "rspec-support"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fw06wm8jdj8k7wrb8xmzj0fr1wjyb0ya13x31hidnyblm41hmvy";
+      sha256 = "1gjqfb39da6gywdcp4h77738r7khbrn2v4y45589z25bj4z9paf0";
       type = "gem";
     };
-    version = "3.7.0";
+    version = "3.9.0";
   };
   rspec-its = {
     dependencies = ["rspec-core" "rspec-expectations"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1pwphny5jawcm1hda3vs9pjv1cybaxy17dc1s75qd7drrvx697p3";
+      sha256 = "15zafd70gxly5i0s00nky14sj2n92dnj3xpj83ysl3c2wx0119ad";
       type = "gem";
     };
-    version = "1.2.0";
+    version = "1.3.0";
   };
   rspec-mocks = {
     dependencies = ["diff-lcs" "rspec-support"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0b02ya3qhqgmcywqv4570dlhav70r656f7dmvwg89whpkq1z1xr3";
+      sha256 = "19vmdqym1v2g1zbdnq37zwmyj87y9yc9ijwc8js55igvbb9hx0mr";
       type = "gem";
     };
-    version = "3.7.0";
+    version = "3.9.1";
   };
   rspec-support = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0hvpqpkh7j5rbwkkc0qwicwpgn0xlnpq935ikmx8n1wxxf553v3p";
+      sha256 = "1zwpyq1na23pvgacpxs2v9nwfbjbw6x3arca5j3l1xagigqmzhc3";
       type = "gem";
     };
-    version = "3.7.0";
-  };
-  rspec_junit_formatter = {
-    dependencies = ["builder" "rspec-core"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0hphl8iggqh1mpbbv0avf8735x6jgry5wmkqyzgv1zwnimvja1ai";
-      type = "gem";
-    };
-    version = "0.2.3";
+    version = "3.9.2";
   };
   rubocop = {
-    dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
+    dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "rexml" "ruby-progressbar" "unicode-display_width"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0cy2plq67b47ql06ypx3svbnnjmr2q616scwyhfd6330cg0aacf1";
+      sha256 = "0adfpv76whv5dy5wr5brqkki39jfv6r08482saj64h9j4wzwcznb";
       type = "gem";
     };
-    version = "0.51.0";
+    version = "0.80.0";
   };
   ruby-progressbar = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk";
+      sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf";
       type = "gem";
     };
-    version = "1.9.0";
+    version = "1.10.1";
   };
   rubyntlm = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "1p6bxsklkbcqni4bcq6jajc2n57g0w5rzn4r49c3lb04wz5xg0dy";
@@ -918,14 +1993,18 @@
     version = "0.6.2";
   };
   rubyzip = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "06js4gznzgh8ac2ldvmjcmg9v1vg9llm357yckkpylaj6z456zqz";
+      sha256 = "1qxc2zxwwipm6kviiar4gfhcakpx1jdcs89v6lvzivn5hq1xk78l";
       type = "gem";
     };
-    version = "1.2.1";
+    version = "1.3.0";
   };
   rufus-lru = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0sp7ymz054md75fnn2hx5d2axmhrh0abbn8c2p759j4g4lxn11ip";
@@ -933,75 +2012,93 @@
     };
     version = "1.1.0";
   };
-  safe_yaml = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
-      type = "gem";
-    };
-    version = "1.0.4";
-  };
   sawyer = {
     dependencies = ["addressable" "faraday"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd";
+      sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz";
       type = "gem";
     };
-    version = "0.8.1";
+    version = "0.8.2";
   };
   semverse = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1cf6iv5wgwb7b8jf7il751223k9yahz9aym06s9r0prda5mwddyy";
+      sha256 = "1qs9jk2kkbpy4gfrh90g3wsbi7i5n4di21haii3pn2bn6dyq5p18";
       type = "gem";
     };
-    version = "2.0.0";
+    version = "3.0.0";
   };
-  serverspec = {
-    dependencies = ["multi_json" "rspec" "rspec-its" "specinfra"];
+  signet = {
+    dependencies = ["addressable" "faraday" "jwt" "multi_json"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zsi7nb7mn6jsxbs6gbbkavmbnpdpk9xn2rsd5hbayzmqnb7qk43";
+      sha256 = "1m8brljfgrxpr5j7kggv3dphqj9in3rkbf5dryx8f7nprkk85wdd";
       type = "gem";
     };
-    version = "2.41.3";
-  };
-  sfl = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1qm4hvhq9pszi9zs1cl9qgwx1n4wxq0af0hq9sbf6qihqd8rwwwr";
-      type = "gem";
-    };
-    version = "2.3";
+    version = "0.12.0";
   };
   solve = {
     dependencies = ["molinillo" "semverse"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08jywdc6wgfb57ncjnsdjb694fzq8aqw0iv289nijpw5hccd32g4";
+      sha256 = "0zymaik4cxd4kmd8f4n1ij8ykrfinhnlvlhjnsdv2cv1xnqnjqmk";
       type = "gem";
     };
-    version = "4.0.0";
-  };
-  specinfra = {
-    dependencies = ["net-scp" "net-ssh" "net-telnet" "sfl"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1dh4ydl4rr6dc8dw9nqns9z3d4f5inmpjnspnvgppvy9hk9lnx9h";
-      type = "gem";
-    };
-    version = "2.72.1";
+    version = "4.0.3";
   };
   sslshake = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "19j8q4mnjvjnhlbzs9r0pn608bv5a4cihf6lswv36l3lc35gp9zl";
+      sha256 = "1dy7pnvn0zb3qbfahgksfxqw1hxhk2i2wlw34bvr2iyzqlw04a3s";
       type = "gem";
     };
-    version = "1.2.0";
+    version = "1.3.0";
+  };
+  strings = {
+    dependencies = ["strings-ansi" "unicode-display_width" "unicode_utils"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "111876lcqrykh30w7zzkrl06d6rj9lq24y625m28674vgfxkkcz0";
+      type = "gem";
+    };
+    version = "0.1.8";
+  };
+  strings-ansi = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "120wa6yjc63b84lprglc52f40hx3fx920n4dmv14rad41rv2s9lh";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  sync = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1z9qlq4icyiv3hz1znvsq1wz2ccqjb1zwd6gkvnwg6n50z65d0v6";
+      type = "gem";
+    };
+    version = "0.5.0";
   };
   syslog-logger = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "14y20phq1khdla4z9wvf98k7j3x6n0rjgs4f7vb0xlf7h53g6hbm";
@@ -1010,6 +2107,8 @@
     version = "1.6.8";
   };
   systemu = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0gmkbakhfci5wnmbfx5i54f25j9zsvbw858yg3jjhfs5n4ad1xq1";
@@ -1017,67 +2116,283 @@
     };
     version = "2.6.5";
   };
-  test-kitchen = {
-    dependencies = ["mixlib-install" "mixlib-shellout" "net-scp" "net-ssh" "net-ssh-gateway" "safe_yaml" "thor" "winrm" "winrm-elevated" "winrm-fs"];
+  term-ansicolor = {
+    dependencies = ["tins"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0wypsc0yl5zgw4f39i8nwq35z0lnjpqx333w9ginmiifs9jydlvm";
+      sha256 = "1xq5kci9215skdh27npyd3y55p812v4qb4x2hv3xsjvwqzz9ycwj";
       type = "gem";
     };
-    version = "1.19.2";
+    version = "1.7.1";
+  };
+  test-kitchen = {
+    dependencies = ["bcrypt_pbkdf" "ed25519" "license-acceptance" "mixlib-install" "mixlib-shellout" "net-scp" "net-ssh" "net-ssh-gateway" "thor" "winrm" "winrm-elevated" "winrm-fs"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14wvv8vgm3lqqk9ifywjhhxlvnbx5gpl4f8zbw5gj41sq8hdqgqj";
+      type = "gem";
+    };
+    version = "2.3.4";
   };
   thor = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
+      sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
       type = "gem";
     };
-    version = "0.19.1";
+    version = "0.20.3";
   };
-  timers = {
-    dependencies = ["hitimes"];
+  thread_safe = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1jx4wb0x182gmbcs90vz0wzfyp8afi1mpl9w5ippfncyk4kffvrz";
+      sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
       type = "gem";
     };
-    version = "4.0.4";
+    version = "0.3.6";
+  };
+  timeliness = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gvp9b7yn4pykn794cibylc9ys1lw7fzv7djx1433icxw4y26my3";
+      type = "gem";
+    };
+    version = "0.3.10";
+  };
+  tins = {
+    dependencies = ["sync"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nghqcdg7ak91n2h6igx8i2ykbhna93xpg33w6232451vphlwdm0";
+      type = "gem";
+    };
+    version = "1.24.1";
   };
   tomlrb = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09gh67v8s1pr7c37490sjp782gi4wf9k9cadp4l926h1sp27bcgz";
+      sha256 = "0njkyq5csj4km8spmw33b5902v254wvyvqq1b0f0kky5hs7bvrgg";
+      type = "gem";
+    };
+    version = "1.2.9";
+  };
+  train = {
+    dependencies = ["activesupport" "azure_graph_rbac" "azure_mgmt_key_vault" "azure_mgmt_resources" "azure_mgmt_security" "azure_mgmt_storage" "docker-api" "google-api-client" "googleauth" "train-core" "train-winrm"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1y7aggjyarc531a0vmh86vdqr6ws3y3h64jnkh8cavpqns4jhmjg";
+      type = "gem";
+    };
+    version = "3.2.22";
+  };
+  train-aws = {
+    dependencies = ["aws-sdk-apigateway" "aws-sdk-apigatewayv2" "aws-sdk-athena" "aws-sdk-autoscaling" "aws-sdk-budgets" "aws-sdk-cloudformation" "aws-sdk-cloudhsm" "aws-sdk-cloudhsmv2" "aws-sdk-cloudtrail" "aws-sdk-cloudwatch" "aws-sdk-cloudwatchlogs" "aws-sdk-codecommit" "aws-sdk-codedeploy" "aws-sdk-codepipeline" "aws-sdk-configservice" "aws-sdk-core" "aws-sdk-costandusagereportservice" "aws-sdk-dynamodb" "aws-sdk-ec2" "aws-sdk-ecr" "aws-sdk-ecs" "aws-sdk-eks" "aws-sdk-elasticache" "aws-sdk-elasticbeanstalk" "aws-sdk-elasticloadbalancing" "aws-sdk-elasticloadbalancingv2" "aws-sdk-elasticsearchservice" "aws-sdk-firehose" "aws-sdk-iam" "aws-sdk-kafka" "aws-sdk-kinesis" "aws-sdk-kms" "aws-sdk-lambda" "aws-sdk-organizations" "aws-sdk-rds" "aws-sdk-redshift" "aws-sdk-route53" "aws-sdk-route53domains" "aws-sdk-route53resolver" "aws-sdk-s3" "aws-sdk-securityhub" "aws-sdk-ses" "aws-sdk-sms" "aws-sdk-sns" "aws-sdk-sqs" "aws-sdk-ssm"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1dvwzk9h5kzbb9v6qm387mfysjz4nfcr56685ccl5c1jj5a59553";
+      type = "gem";
+    };
+    version = "0.1.15";
+  };
+  train-core = {
+    dependencies = ["addressable" "inifile" "json" "mixlib-shellout" "net-scp" "net-ssh"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1dfqyfi4q2vykbiw4b373n7n2aqzhq9gkn8sr3sx2w7hpd7lkd3x";
+      type = "gem";
+    };
+    version = "3.2.22";
+  };
+  train-habitat = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1w642zkvgq0d1dy622lk50ngr0872v6ghd4r1g692qv8g4k6d90n";
+      type = "gem";
+    };
+    version = "0.2.13";
+  };
+  train-winrm = {
+    dependencies = ["winrm" "winrm-fs"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0x4sv6hblq9y259aka6j868di2w669f6aj2m7ssi5jxhanaf5mqk";
+      type = "gem";
+    };
+    version = "0.2.6";
+  };
+  treetop = {
+    dependencies = ["polyglot"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0g31pijhnv7z960sd09lckmw9h8rs3wmc8g4ihmppszxqm99zpv7";
+      type = "gem";
+    };
+    version = "1.6.10";
+  };
+  tty-box = {
+    dependencies = ["pastel" "strings" "tty-cursor"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14g63v0jx87hba50rlv3c521zg9rw0f5d31cihcvym19xxa7v3l5";
+      type = "gem";
+    };
+    version = "0.5.0";
+  };
+  tty-color = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0czbnp19cfnf5zwdd22payhqjv57mgi3gj5n726s20vyq3br6bsp";
+      type = "gem";
+    };
+    version = "0.5.1";
+  };
+  tty-cursor = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr";
+      type = "gem";
+    };
+    version = "0.7.1";
+  };
+  tty-prompt = {
+    dependencies = ["necromancer" "pastel" "tty-reader"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19kbxny8cfsy1r02awih1gf76mi3a7zqg3ymxpmf9720khlmziax";
+      type = "gem";
+    };
+    version = "0.20.0";
+  };
+  tty-reader = {
+    dependencies = ["tty-cursor" "tty-screen" "wisper"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1977ajs9sxwhd88qqmf6l1hw63dqxlvg9mx626rymsc5ap2xa1r4";
+      type = "gem";
+    };
+    version = "0.7.0";
+  };
+  tty-screen = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jwgr2i3wilng3mx851xczmkzllbirmsmr42ik4amqyyvry1yzyf";
+      type = "gem";
+    };
+    version = "0.7.1";
+  };
+  tty-table = {
+    dependencies = ["equatable" "necromancer" "pastel" "strings" "tty-screen"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1y07yikpk65jqmxinw8l4c45pbw1b2h4fv9fikb43a7sdlr6sn69";
+      type = "gem";
+    };
+    version = "0.11.0";
+  };
+  tzinfo = {
+    dependencies = ["thread_safe"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp";
       type = "gem";
     };
     version = "1.2.6";
   };
-  train = {
-    dependencies = ["docker-api" "json" "mixlib-shellout" "net-scp" "net-ssh" "winrm" "winrm-fs"];
+  uber = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ic719ghmyvf93p4y91y00rc09s946sg4n1h855yip9h5795q9i5";
+      sha256 = "1p1mm7mngg40x05z52md3mbamkng0zpajbzqjjwmsyw0zw3v9vjv";
       type = "gem";
     };
-    version = "0.31.1";
+    version = "0.1.0";
   };
-  treetop = {
-    dependencies = ["polyglot"];
+  unf = {
+    dependencies = ["unf_ext"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0sdkd1v2h8dhj9ncsnpywmqv7w1mdwsyc5jwyxlxwriacv8qz8bd";
+      sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
       type = "gem";
     };
-    version = "1.6.9";
+    version = "0.1.4";
+  };
+  unf_ext = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04d13bp6lyg695x94whjwsmzc2ms72d94vx861nx1y40k3817yp8";
+      type = "gem";
+    };
+    version = "0.0.7.2";
   };
   unicode-display_width = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "12pi0gwqdnbx1lv5136v3vyr0img9wr0kxcn4wn54ipq4y41zxq8";
+      sha256 = "1pppclzq4qb26g321553nm9xqca3zgllvpwb2kqxsdadwj51s09x";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "1.6.1";
+  };
+  unicode_utils = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0h1a5yvrxzlf0lxxa1ya31jcizslf774arnsd89vgdhk4g7x08mr";
+      type = "gem";
+    };
+    version = "1.4.0";
   };
   uuidtools = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
       sha256 = "0zjvq1jrrnzj69ylmz1xcr30skf9ymmvjmdwbvscncd7zkr8av5g";
@@ -1085,48 +2400,57 @@
     };
     version = "2.1.5";
   };
-  varia_model = {
-    dependencies = ["buff-extensions" "hashie"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0kgj37rc3yia4pr5pma0psgar6xjk064qdfii3nwr6dj1v73cyxz";
-      type = "gem";
-    };
-    version = "0.6.0";
-  };
   winrm = {
-    dependencies = ["builder" "erubis" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"];
+    dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "02lzbixdbjvhmb0byqx9rl9x4xx9pqc8jwm7y6mmp7w7mri72zh6";
+      sha256 = "13c0vf32vinkp3ia86rvq779dacl37v4v2814v4g9qrk3liv0dym";
       type = "gem";
     };
-    version = "2.2.3";
+    version = "2.3.4";
   };
   winrm-elevated = {
-    dependencies = ["winrm" "winrm-fs"];
+    dependencies = ["erubi" "winrm" "winrm-fs"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04krbwnj4cw7jy42w3n2y5kp2fbcp3v9mbf59pdhfk1py18bswcr";
+      sha256 = "1yawwrs3pnvbbm9xn0nbzvyl92kgf1jr439qfbqx0mb8zzkyi2dv";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.2.1";
   };
   winrm-fs = {
-    dependencies = ["erubis" "logging" "rubyzip" "winrm"];
+    dependencies = ["erubi" "logging" "rubyzip" "winrm"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0vax34qbr3n6jifxyzr4nngaz8vrmzw6ydw21cnnrhidfkqgh7ja";
+      sha256 = "0phhzliw47hmpi3ddygs500kfxa7il5yzmp7dw4ix2dvhrxrj7s6";
       type = "gem";
     };
-    version = "1.1.1";
+    version = "1.3.3";
+  };
+  wisper = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rpsi0ziy78cj82sbyyywby4d0aw0a5q84v65qd28vqn79fbq5yf";
+      type = "gem";
+    };
+    version = "2.0.1";
   };
   wmi-lite = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "06pm7jr2gcnphhhswha2kqw0vhxy91i68942s7gqriadbc8pq9z3";
+      sha256 = "110dv4arvwyky6f2pq19f20f1xcjpiz3zfbals0y49ijpq8agvql";
       type = "gem";
     };
-    version = "1.0.0";
+    version = "1.0.5";
   };
 }
\ No newline at end of file

From c597007cce813c7fa5afb8ed9866d6aa0694bae5 Mon Sep 17 00:00:00 2001
From: Klaas van Schelven <klaas@vanschelven.com>
Date: Fri, 21 Feb 2020 09:12:05 +0100
Subject: [PATCH 1347/4636] python.pkgs.httpretty: disable flaky test

As noted upstream: https://github.com/gabrielfalcao/HTTPretty/issues/376
---
 pkgs/development/python-modules/httpretty/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix
index 86b8ef13a7ae..79c0fbfcac8a 100644
--- a/pkgs/development/python-modules/httpretty/default.nix
+++ b/pkgs/development/python-modules/httpretty/default.nix
@@ -37,6 +37,7 @@ buildPythonPackage rec {
     "tests.functional.test_httplib2.test_callback_response"
     "tests.functional.test_requests.test_streaming_responses"
     "tests.functional.test_httplib2.test_callback_response"
+    "tests.functional.test_requests.test_httpretty_should_allow_adding_and_overwritting_by_kwargs_u2"
   ];
 
   meta = with stdenv.lib; {

From 5cf7c7fa8294418b7eb70a139b6e8e14e2485981 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 23 Feb 2020 13:56:25 +1000
Subject: [PATCH 1348/4636] gnomeExtensions.impatience: move to directory

---
 .../extensions/{impatience.nix => impatience/default.nix}       | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/desktops/gnome-3/extensions/{impatience.nix => impatience/default.nix} (100%)

diff --git a/pkgs/desktops/gnome-3/extensions/impatience.nix b/pkgs/desktops/gnome-3/extensions/impatience/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/extensions/impatience.nix
rename to pkgs/desktops/gnome-3/extensions/impatience/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac6e671840b1..2ea26ebb0278 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23751,7 +23751,7 @@ in
     drop-down-terminal = callPackage ../desktops/gnome-3/extensions/drop-down-terminal { };
     gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { };
     icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { };
-    impatience = callPackage ../desktops/gnome-3/extensions/impatience.nix { };
+    impatience = callPackage ../desktops/gnome-3/extensions/impatience { };
     mpris-indicator-button = callPackage ../desktops/gnome-3/extensions/mpris-indicator-button { };
     night-theme-switcher = callPackage ../desktops/gnome-3/extensions/night-theme-switcher { };
     no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { };

From ee5506c430dc2a6b8267c61ec0cd16570db3e25a Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 23 Feb 2020 14:00:21 +1000
Subject: [PATCH 1349/4636] gnomeExtensions.volume-mixer: remove

This doesn't seem to have had a top-level entry for several years.
---
 .../gnome-3/extensions/volume-mixer.nix       | 34 -------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/extensions/volume-mixer.nix

diff --git a/pkgs/desktops/gnome-3/extensions/volume-mixer.nix b/pkgs/desktops/gnome-3/extensions/volume-mixer.nix
deleted file mode 100644
index 072d31b84fed..000000000000
--- a/pkgs/desktops/gnome-3/extensions/volume-mixer.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchFromGitHub, glib }:
-
-stdenv.mkDerivation rec {
-  pname = "gnome-shell-volume-mixer";
-  version = "844ed80ad448855d8f6218847183a80474b523c7";
-
-  src = fetchFromGitHub {
-    owner = "aleho";
-    repo = "gnome-shell-volume-mixer";
-    rev = version;
-    sha256 = "1vcj2spbymhdi1nazvhldvcfgad23r3h7f0ihh4nianbxn7hjs9w";
-  };
-
-  buildInputs = [
-    glib
-  ];
-
-  buildPhase = ''
-    glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas
-  '';
-
-  installPhase = ''
-    cp -r ${uuid} $out
-  '';
-
-  uuid = "shell-volume-mixer@derhofbauer.at";
-
-  meta = with stdenv.lib; {
-    description = "GNOME Shell Extension allowing separate configuration of PulseAudio devices";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ aneeshusa ];
-    homepage = https://github.com/aleho/gnome-shell-volume-mixer;
-  };
-}

From 8ecbd97f82997063192cd97188422b93b90b95ca Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 23 Feb 2020 03:46:35 +0000
Subject: [PATCH 1350/4636] nixos/acme: move the crt to fullchain.pem

lego already bundles the chain with the certificate,[1] so the current
code, designed for simp_le, was resulting in duplicate certificate
chains, manifesting as "Chain issues: Incorrect order, Extra certs" on
the Qualys SSL Server Test.

cert.pem stays around as a symlink for backwards compatibility.

[1] https://github.com/go-acme/lego/blob/5cdc0002e9abb2463fffc962dadc3479f72d7486/acme/api/certificate.go#L40-L44
---
 nixos/modules/security/acme.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 7da6666f79c6..238c18242c19 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -325,10 +325,10 @@ in
                           KEY=${spath}/certificates/${keyName}.key
                           if [ -e $KEY -a $KEY -nt key.pem ]; then
                             cp -p ${spath}/certificates/${keyName}.key key.pem
-                            cp -p ${spath}/certificates/${keyName}.crt cert.pem
+                            cp -p ${spath}/certificates/${keyName}.crt fullchain.pem
                             cp -p ${spath}/certificates/${keyName}.issuer.crt chain.pem
-                            cat cert.pem chain.pem > fullchain.pem
-                            cat key.pem cert.pem chain.pem > full.pem
+                            ln -s fullchain.pem cert.pem
+                            cat key.pem fullchain.pem > full.pem
                             chmod ${rights} *.pem
                             chown '${data.user}:${data.group}' *.pem
                           fi

From 91340144dcb8c6f0653d7b0af29920e0e0c91678 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 23 Feb 2020 05:55:36 +0000
Subject: [PATCH 1351/4636] alsaPlugins: 1.2.1 -> 1.2.2

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

diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix
index a5262d6ae9ed..b524d7906da4 100644
--- a/pkgs/os-specific/linux/alsa-plugins/default.nix
+++ b/pkgs/os-specific/linux/alsa-plugins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "alsa-plugins";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchurl {
     url = "mirror://alsa/plugins/${pname}-${version}.tar.bz2";
-    sha256 = "1nj8cpbi05rb62yzs01c1k7lymdn1ch229b599hbhd0psixdx52d";
+    sha256 = "0z9k3ssbfk2ky2w13avgyf202j1drsz9sv3834bp33cj1i2hc3qw";
   };
 
   # ToDo: a52, etc.?
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Various plugins for ALSA";
-    homepage = http://alsa-project.org/;
+    homepage = "http://alsa-project.org/";
     license = licenses.lgpl21;
     maintainers = [maintainers.marcweber];
     platforms = platforms.linux;

From a517238f9f165429d53531074f91a5c7a53426d7 Mon Sep 17 00:00:00 2001
From: Maxim Krivchikov <maxim.krivchikov@gmail.com>
Date: Sun, 23 Feb 2020 07:21:10 +0000
Subject: [PATCH 1352/4636] Add patch for python2 build with clang

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

diff --git a/pkgs/development/python-modules/pyfribidi/default.nix b/pkgs/development/python-modules/pyfribidi/default.nix
index 6e9e56eee33c..fcb201c03110 100644
--- a/pkgs/development/python-modules/pyfribidi/default.nix
+++ b/pkgs/development/python-modules/pyfribidi/default.nix
@@ -16,6 +16,8 @@ buildPythonPackage rec {
     sha256 = "64726a4a56783acdc79c6b9b3a15f16e6071077c897a0b999f3b43f744bc621c";
   };
 
+  patches = stdenv.lib.optional stdenv.cc.isClang ./pyfribidi-clang.patch;
+
   propagatedBuildInputs = [ six ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/pyfribidi/pyfribidi-clang.patch b/pkgs/development/python-modules/pyfribidi/pyfribidi-clang.patch
new file mode 100644
index 000000000000..c570843f7e8b
--- /dev/null
+++ b/pkgs/development/python-modules/pyfribidi/pyfribidi-clang.patch
@@ -0,0 +1,17 @@
+diff --git a/pyfribidi.c b/pyfribidi.c
+index 9a0120d..238134a 100644
+--- a/pyfribidi.c
++++ b/pyfribidi.c
+@@ -148,10 +148,11 @@ init_pyfribidi (void)
+ {
+ #if PY_MAJOR_VERSION >= 3
+         PyObject *module = PyModule_Create (&pyfribidi_moduledef);
++        if (module == NULL) return NULL;
+ #else
+         PyObject *module = Py_InitModule ("_pyfribidi", PyfribidiMethods);
++        if (module == NULL) return;
+ #endif
+-	if (module == NULL) return NULL;
+ 
+ 	PyModule_AddIntConstant (module, "RTL", (long) FRIBIDI_TYPE_RTL);
+ 	PyModule_AddIntConstant (module, "LTR", (long) FRIBIDI_TYPE_LTR);

From d4879a69620f4175482c952754d2fb61be72823d Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 23 Feb 2020 17:22:25 +1000
Subject: [PATCH 1353/4636] shfmt: 3.0.1 -> 3.0.2 (#80842)

https://github.com/mvdan/sh/releases/tag/v3.0.2
---
 pkgs/tools/text/shfmt/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix
index 0bcd663ae5a9..265141ad534c 100644
--- a/pkgs/tools/text/shfmt/default.nix
+++ b/pkgs/tools/text/shfmt/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "shfmt";
-  version = "3.0.1";
+  version = "3.0.2";
 
   src = fetchFromGitHub {
     owner = "mvdan";
     repo = "sh";
     rev = "v${version}";
-    sha256 = "1y6n2xi8m579xksnnsdzb4zvcvij48kywjfqzp7qm43ni8g7w9a8";
+    sha256 = "1q0gazh87y7sl5sl5m046a83d64aas9xnbg2d1d1h2vwcqdaccp2";
   };
 
   modSha256 = "1ll2cxhgf8hh19wzdykgc81c4yfcp8bzmfaif08nvvb63rhjdb5y";
   subPackages = ["cmd/shfmt"];
 
-  meta = with stdenv.lib; {
-    homepage = https://github.com/mvdan/sh;
+  meta = with lib; {
+    homepage = "https://github.com/mvdan/sh";
     description = "A shell parser and formatter";
     longDescription = ''
       shfmt formats shell programs. It can use tabs or any number of spaces to indent.

From ca4cec7c87ba4efd17392565471b7faba5e08894 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Sun, 23 Feb 2020 10:36:38 +0300
Subject: [PATCH 1354/4636] mariadb-connector-c: 3.1.5 -> 3.1.7

---
 pkgs/servers/sql/mariadb/connector-c/3_1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/connector-c/3_1.nix b/pkgs/servers/sql/mariadb/connector-c/3_1.nix
index 257fa93d2b51..e3fc66045301 100644
--- a/pkgs/servers/sql/mariadb/connector-c/3_1.nix
+++ b/pkgs/servers/sql/mariadb/connector-c/3_1.nix
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:
 
 callPackage ./. (args // {
-  version = "3.1.5";
-  sha256 = "1mfrm595kfnpjladaq6m184npa3rxff9pr1vwa35r057s7nmzpm9";
+  version = "3.1.7";
+  sha256 = "16pmdms454jbralaw6rpx0rjlf2297p6h3q8wfk0n87kbn7vrxv4";
 })

From 458a7772bcd4efa9ef20e8133d46929d8b374353 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 23 Feb 2020 07:36:49 +0000
Subject: [PATCH 1355/4636] alsaUtils: 1.2.1 -> 1.2.2

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

diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix
index 7b356746861f..f05bb6a0d59c 100644
--- a/pkgs/os-specific/linux/alsa-utils/default.nix
+++ b/pkgs/os-specific/linux/alsa-utils/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "alsa-utils";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchurl {
     url = "mirror://alsa/utils/${pname}-${version}.tar.bz2";
-    sha256 = "039c19b7091is0czl9jlrfczp7pp1jpdri0vvc4k07gl3skhn48b";
+    sha256 = "1wz460by17rmxrcydn583rd4lhj6wlvqs6x1j5pdzxn5g3app024";
   };
 
   patchPhase = ''
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   installFlags = [ "ASOUND_STATE_DIR=$(TMPDIR)/dummy" ];
 
   meta = with stdenv.lib; {
-    homepage = http://www.alsa-project.org/;
+    homepage = "http://www.alsa-project.org/";
     description = "ALSA, the Advanced Linux Sound Architecture utils";
     longDescription = ''
       The Advanced Linux Sound Architecture (ALSA) provides audio and

From 92ef705954c570b6ad3c246488ad5923d399acd7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 23 Feb 2020 08:16:52 +0000
Subject: [PATCH 1356/4636] cgal_5: 5.0 -> 5.0.1

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

diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index d2d74769a1fc..b3ae8c7aa31c 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }:
 
 stdenv.mkDerivation rec {
-  version = "5.0";
+  version = "5.0.1";
   name = "cgal-" + version;
 
   src = fetchFromGitHub {
     owner = "CGAL";
     repo = "releases";
     rev = "CGAL-${version}";
-    sha256 = "15r631kddphw3wsvrxrkdbq9y7m0q8kx0kwc9zq97x6ksg3v0gs3";
+    sha256 = "0mmz7kdpzs7xf40qypn4qyka4nq2dykz9sdkimfgpdka9l7lrfwv";
   };
 
   # note: optional component libCGAL_ImageIO would need zlib and opengl;
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Computational Geometry Algorithms Library";
-    homepage = http://cgal.org;
+    homepage = "http://cgal.org";
     license = with licenses; [ gpl3Plus lgpl3Plus];
     platforms = platforms.all;
     maintainers = [ maintainers.raskin ];

From 8f5b5baed7eb09aa84e09bffb33a437e90186ba7 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Sun, 23 Feb 2020 10:09:24 +0100
Subject: [PATCH 1357/4636] poetry: Fix build with Python 3.8

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

diff --git a/pkgs/development/tools/poetry/default.nix b/pkgs/development/tools/poetry/default.nix
index 1517e53f219c..5035677beb00 100644
--- a/pkgs/development/tools/poetry/default.nix
+++ b/pkgs/development/tools/poetry/default.nix
@@ -8,6 +8,12 @@ poetry2nix.mkPoetryApplication {
   pyproject = ./pyproject.toml;
   poetrylock = ./poetry.lock;
 
+  overrides = [ (poetry2nix.defaultPoetryOverrides.overrideOverlay (self: super: {
+    # Needed because poetry2nix currently doesn't handle pyproject.toml python bounds
+    # See https://github.com/nix-community/poetry2nix/issues/50
+    importlib-metadata = if python.pythonOlder "3.8" then super.importlib-metadata else null;
+  }))];
+
   src = fetchFromGitHub (lib.importJSON ./src.json);
 
   # "Vendor" dependencies (for build-system support)

From b9a8355555297bbf60440d309cafaeb052f6a4e1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 23 Feb 2020 09:43:59 +0000
Subject: [PATCH 1358/4636] crispyDoom: 5.6.4 -> 5.7

---
 pkgs/games/crispy-doom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix
index e85cebde0408..e6b669b8d675 100644
--- a/pkgs/games/crispy-doom/default.nix
+++ b/pkgs/games/crispy-doom/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "crispy-doom";
-  version = "5.6.4";
+  version = "5.7";
 
   src = fetchFromGitHub {
     owner = "fabiangreffrath";
     repo = pname;
     rev = "${pname}-${version}";
-    sha256 = "1ls4v2kpb7vi7xji5yqbmyc5lfkz497h1vvj9w86wkrw8k59hlg2";
+    sha256 = "1m9bk7hp3d4sdd3y3isvf26rxya7511mnwyv99l2f80adbsv3nq2";
   };
 
   postPatch = ''

From 23f265cdf5133209984a511af9b39f61538121f6 Mon Sep 17 00:00:00 2001
From: Maxim Krivchikov <maxim.krivchikov@gmail.com>
Date: Sun, 23 Feb 2020 09:33:41 +0000
Subject: [PATCH 1359/4636] python27Packages.seaborn: remove FRidh from
 maintainers

---
 pkgs/development/python-modules/seaborn/0.9.1.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/seaborn/0.9.1.nix b/pkgs/development/python-modules/seaborn/0.9.1.nix
index c87d2fac1f9a..552262bb514c 100644
--- a/pkgs/development/python-modules/seaborn/0.9.1.nix
+++ b/pkgs/development/python-modules/seaborn/0.9.1.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "Statisitical data visualization";
     homepage = "http://stanford.edu/~mwaskom/software/seaborn/";
     license = with lib.licenses; [ bsd3 ];
-    maintainers = with lib.maintainers; [ fridh ];
+    maintainers = [ ];
   };
 }

From 073727fcac64b078b47b40b12ce17421250ca864 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= <felix@alternativebit.fr>
Date: Sun, 23 Feb 2020 11:15:25 +0100
Subject: [PATCH 1360/4636] ssb-patchwork: 3.17.4 -> 3.17.5

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

diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/pkgs/applications/networking/ssb/patchwork/default.nix
index 3d3f60c7f62f..2b4618b05b35 100644
--- a/pkgs/applications/networking/ssb/patchwork/default.nix
+++ b/pkgs/applications/networking/ssb/patchwork/default.nix
@@ -2,12 +2,12 @@
 
 let
   pname = "ssb-patchwork";
-  version = "3.17.4";
+  version = "3.17.5";
   name = "Patchwork-${version}";
 
   src = fetchurl {
     url = "https://github.com/ssbc/patchwork/releases/download/v${version}/${name}.AppImage";
-    sha256 = "0mjyrd0d9wfsfd9ajg1xf7ijg4k8jp76swjsiydxpgfk1sdljswv";
+    sha256 = "0zmi6d9v92icbkln69n50648xbaz6jih5sal1fm5a8kw5is8qg4s";
   };
 
   binary = appimageTools.wrapType2 {

From 128c99978dcf7d793fb2f88ed8dfe70ec4609e1d Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 23 Feb 2020 12:10:53 +0100
Subject: [PATCH 1361/4636] blender: enable alembic

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

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index c14d0cda1df5..277bb5fe1f25 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -2,7 +2,7 @@
 , ilmbase, libXi, libX11, libXext, libXrender
 , libjpeg, libpng, libsamplerate, libsndfile
 , libtiff, libGLU, libGL, openal, opencolorio, openexr, openimageio2, openjpeg, python3Packages
-, openvdb, libXxf86vm, tbb
+, openvdb, libXxf86vm, tbb, alembic
 , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath
 , jackaudioSupport ? false, libjack2
 , cudaSupport ? config.cudaSupport or false, cudatoolkit
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
     [ boost ffmpeg gettext glew ilmbase
       freetype libjpeg libpng libsamplerate libsndfile libtiff
       opencolorio openexr openimageio2 openjpeg python zlib fftw jemalloc
+      alembic
       (opensubdiv.override { inherit cudaSupport; })
       tbb
       makeWrapper
@@ -76,7 +77,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags =
     [
-      "-DWITH_ALEMBIC=OFF"
+      "-DWITH_ALEMBIC=ON"
       "-DWITH_MOD_OCEANSIM=ON"
       "-DWITH_CODEC_FFMPEG=ON"
       "-DWITH_CODEC_SNDFILE=ON"

From 9fd425e56f4e7a01e795b0ddd97fbeda311a841d Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sun, 23 Feb 2020 13:10:16 +0100
Subject: [PATCH 1362/4636] firefox: remove unused function arguments

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

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 2a5a82aed6ad..ab4e09a3add7 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -1,4 +1,4 @@
-{ config, lib, callPackage, fetchurl, fetchFromGitHub, overrideCC, gccStdenv, gcc6 }:
+{ config, lib, callPackage, fetchurl }:
 
 let
 

From a5ae1b2ffda5effc80e9f83efbb7c5dd75a9b7b1 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sun, 23 Feb 2020 13:11:42 +0100
Subject: [PATCH 1363/4636] firefox: remove unused patches

---
 .../fix-pa-context-connect-retval.patch       | 26 -------------------
 .../browsers/firefox/no-buildconfig.patch     | 25 ------------------
 .../networking/browsers/firefox/packages.nix  |  9 -------
 3 files changed, 60 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/firefox/fix-pa-context-connect-retval.patch
 delete mode 100644 pkgs/applications/networking/browsers/firefox/no-buildconfig.patch

diff --git a/pkgs/applications/networking/browsers/firefox/fix-pa-context-connect-retval.patch b/pkgs/applications/networking/browsers/firefox/fix-pa-context-connect-retval.patch
deleted file mode 100644
index 1c3c32948944..000000000000
--- a/pkgs/applications/networking/browsers/firefox/fix-pa-context-connect-retval.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Yep, it's a "return code was ignored" bug.
-diff --git a/media/libcubeb/src/cubeb_pulse.c b/media/libcubeb/src/cubeb_pulse.c
-index aaaaaaaaaaa..bbbbbbbbbbb 100644
---- a/media/libcubeb/src/cubeb_pulse.c
-+++ b/media/libcubeb/src/cubeb_pulse.c
-@@ -473,6 +473,8 @@
- static int
- pulse_context_init(cubeb * ctx)
- {
-+  int r;
-+
-   if (ctx->context) {
-     assert(ctx->error == 1);
-     pulse_context_destroy(ctx);
-@@ -486,9 +488,9 @@
-   WRAP(pa_context_set_state_callback)(ctx->context, context_state_callback, ctx);
- 
-   WRAP(pa_threaded_mainloop_lock)(ctx->mainloop);
--  WRAP(pa_context_connect)(ctx->context, NULL, 0, NULL);
-+  r = WRAP(pa_context_connect)(ctx->context, NULL, 0, NULL);
- 
--  if (wait_until_context_ready(ctx) != 0) {
-+  if (r < 0 || wait_until_context_ready(ctx) != 0) {
-     WRAP(pa_threaded_mainloop_unlock)(ctx->mainloop);
-     pulse_context_destroy(ctx);
-     ctx->context = NULL;
diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch
deleted file mode 100644
index de278152f978..000000000000
--- a/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ru -x '*~' firefox-55.0.3-orig/docshell/base/nsAboutRedirector.cpp firefox-55.0.3/docshell/base/nsAboutRedirector.cpp
---- firefox-55.0.3-orig/docshell/base/nsAboutRedirector.cpp	2017-07-31 18:20:51.000000000 +0200
-+++ firefox-55.0.3/docshell/base/nsAboutRedirector.cpp	2017-09-26 22:02:00.814151731 +0200
-@@ -36,10 +36,6 @@
-     nsIAboutModule::ALLOW_SCRIPT
-   },
-   {
--    "buildconfig", "chrome://global/content/buildconfig.html",
--    nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT
--  },
--  {
-     "checkerboard", "chrome://global/content/aboutCheckerboard.xhtml",
-     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
-       nsIAboutModule::ALLOW_SCRIPT
-diff -ru -x '*~' firefox-55.0.3-orig/toolkit/content/jar.mn firefox-55.0.3/toolkit/content/jar.mn
---- firefox-55.0.3-orig/toolkit/content/jar.mn	2017-07-31 18:20:52.000000000 +0200
-+++ firefox-55.0.3/toolkit/content/jar.mn	2017-09-26 22:01:42.383350314 +0200
-@@ -40,7 +40,6 @@
-    content/global/plugins.css
-    content/global/browser-child.js
-    content/global/browser-content.js
--*   content/global/buildconfig.html
-    content/global/buildconfig.css
-    content/global/contentAreaUtils.js
-    content/global/datepicker.xhtml
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index ab4e09a3add7..b94a33bfa871 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -1,16 +1,7 @@
 { config, lib, callPackage, fetchurl }:
 
 let
-
   common = opts: callPackage (import ./common.nix opts) {};
-
-  # Needed on older branches since rustc: 1.32.0 -> 1.33.0
-  missing-documentation-patch = fetchurl {
-    name = "missing-documentation.patch";
-    url = "https://aur.archlinux.org/cgit/aur.git/plain/deny_missing_docs.patch"
-        + "?h=firefox-esr&id=03bdd01f9cf";
-    sha256 = "1i33n3fgwc8d0v7j4qn7lbdax0an6swar12gay3q2nwrhg3ic4fb";
-  };
 in
 
 rec {

From ad4565caa1a8ecaee79295178b07c07273b478d8 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 7 Aug 2019 19:47:07 -0400
Subject: [PATCH 1364/4636] installation-cd-graphical-gnome: updates

Note we're not using wayland default in the graphical media because it
could cause headaches for Nvidia users. But the session is still available
if someone logs out.
---
 .../installation-cd-graphical-gnome.nix       | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
index 23c3426bff08..62cbdbcfd17b 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
@@ -1,5 +1,4 @@
-# This module defines a NixOS installation CD that contains X11 and
-# GNOME 3.
+# This module defines a NixOS installation CD that contains GNOME.
 
 { lib, ... }:
 
@@ -10,10 +9,22 @@ with lib;
 
   services.xserver.desktopManager.gnome3.enable = true;
 
-  # Auto-login as root.
-  services.xserver.displayManager.gdm.autoLogin = {
+  # Wayland can be problematic for some hardware like Nvidia graphics cards.
+  services.xserver.displayManager.defaultSession = "gnome-xorg";
+
+  services.xserver.displayManager.gdm = {
     enable = true;
-    user = "root";
+    # autoSuspend makes the machine automatically suspend after inactivity.
+    # It's possible someone could/try to ssh'd into the machine and obviously
+    # have issues because it's inactive.
+    # See:
+    # * https://github.com/NixOS/nixpkgs/pull/63790
+    # * https://gitlab.gnome.org/GNOME/gnome-control-center/issues/22
+    autoSuspend = false;
+    autoLogin = {
+      enable = true;
+      user = "nixos";
+    };
   };
 
 }

From b974f0595f318efbb03f6d9451f3a4edd2271a63 Mon Sep 17 00:00:00 2001
From: TANIGUCHI Kohei <a.d.xvii.kal.mai@gmail.com>
Date: Sun, 23 Feb 2020 20:19:24 +0900
Subject: [PATCH 1365/4636] ghq: 0.12.6 -> 1.1.0

---
 .../git-and-tools/ghq/default.nix             | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
index 477b628c4d7b..d0c468ab68ea 100644
--- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "ghq";
-  version = "0.12.6";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
-    owner = "motemen";
+    owner = "x-motemen";
     repo = "ghq";
     rev = "v${version}";
-    sha256 = "14rm7fvphr7r9x0ys10vhzjwhfhhscgr574n1i1z4lzw551lrnp4";
+    sha256 = "1i0q9lxdxbyj0l0510cbkwkbycawrx8cxlbdrhb2p2fnk0vqnyiv";
   };
 
-  modSha256 = "1y2v8ir7kc2avgri06nagfyaxqr3xrg4g5pxl9rwzq9dyzm6ci5z";
+  modSha256 = "0hlbhky3c6zva9khn73n6xgq57k5p8anskxy3g2m0wzhr72cyc41";
 
   buildFlagsArray = ''
     -ldflags=
@@ -19,20 +19,13 @@ buildGoModule rec {
   '';
 
   postInstall = ''
-    install -m 444 -D ${src}/zsh/_ghq $out/share/zsh/site-functions/_ghq
+    install -m 444 -D ${src}/misc/zsh/_ghq $out/share/zsh/site-functions/_ghq
+    install -m 444 -D ${src}/misc/bash/_ghq $out/share/bash-completion/completions/_ghq
   '';
 
-  patches = [
-    (fetchpatch {
-      # remove once the commit lands in a release.
-      url = "https://github.com/motemen/ghq/commit/38ac89e60e60182b5870108f9753c9fe8d00e4a6.patch";
-      sha256 = "1z8yvzmka3sh44my6jnwc39p8zs7mczxgvwc9z0pkqk4vgvaj8gj";
-    })
-  ];
-
   meta = {
     description = "Remote repository management made easy";
-    homepage = https://github.com/motemen/ghq;
+    homepage = https://github.com/x-motemen/ghq;
     maintainers = with stdenv.lib.maintainers; [ sigma ];
     license = stdenv.lib.licenses.mit;
   };

From 44a4a3839c2255d0801c17638c8427a550686143 Mon Sep 17 00:00:00 2001
From: tobim <tobim+github@fastmail.fm>
Date: Sun, 23 Feb 2020 13:50:19 +0100
Subject: [PATCH 1366/4636] nixos/gdm: Fix pulseaudio tmpfiles structure
 (#80274)

* nixos/gdm: Fix pulseaudio tmpfiles structure

Fix the following startup failure of the sound service in the gdm
session that was introduced by #75893:
```
Feb 16 11:44:15 qp pulseaudio[1432]: W: [pulseaudio] core-util.c: Failed to open configuration file '/run/gdm/.config/pulse//daemon.conf': Not a directory
Feb 16 11:44:15 qp pulseaudio[1432]: W: [pulseaudio] daemon-conf.c: Failed to open configuration file: Not a directory
Feb 16 11:44:15 qp systemd[1380]: pulseaudio.service: Main process exited, code=exited, status=1/FAILURE
Feb 16 11:44:15 qp systemd[1380]: pulseaudio.service: Failed with result 'exit-code'.
Feb 16 11:44:15 qp systemd[1380]: Failed to start Sound Service.
```

Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
---
 nixos/modules/services/x11/display-managers/gdm.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 325023f4121a..e0ac47bb766d 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -166,9 +166,10 @@ in
       };
 
     systemd.tmpfiles.rules = [
-      "d /run/gdm/.config 0711 gdm gdm -"
+      "d /run/gdm/.config 0711 gdm gdm"
     ] ++ optionals config.hardware.pulseaudio.enable [
-      "L+ /run/gdm/.config/pulse - - - - ${pulseConfig}"
+      "d /run/gdm/.config/pulse 0711 gdm gdm"
+      "L+ /run/gdm/.config/pulse/${pulseConfig.name} - - - - ${pulseConfig}"
     ] ++ optionals config.services.gnome3.gnome-initial-setup.enable [
       # Create stamp file for gnome-initial-setup to prevent it starting in GDM.
       "f /run/gdm/.config/gnome-initial-setup-done 0711 gdm gdm - yes"

From 60575b2fb70b8220b295b3dabacd8732e4a42084 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 23 Feb 2020 14:44:46 +0100
Subject: [PATCH 1367/4636] pythonPackages.pysaml2: fix tests on 32bit systems

---
 pkgs/development/python-modules/pysaml2/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix
index b4552b264d5a..593911c064ec 100644
--- a/pkgs/development/python-modules/pysaml2/default.nix
+++ b/pkgs/development/python-modules/pysaml2/default.nix
@@ -36,6 +36,11 @@ buildPythonPackage rec {
     })
   ];
 
+  postPatch = ''
+    # fix failing tests on systems with 32bit time_t
+    sed -i 's/2999\(-.*T\)/2029\1/g' tests/*.xml
+  '';
+
   propagatedBuildInputs = [ cryptography defusedxml future pyopenssl dateutil pytz requests six ];
 
   checkInputs = [ mock pyasn1 pymongo pytest responses ];

From c0c1f118891a6ab977e20f3aab4fdc4dd3d88af4 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 23 Feb 2020 09:26:57 -0500
Subject: [PATCH 1368/4636] maintainers: correct my name stylization

Out of many variations, it's almost never like that.
---
 maintainers/maintainer-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 04f0d882d8d2..f1d9439fec32 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7748,7 +7748,7 @@
     email = "worldofpeace@protonmail.ch";
     github = "worldofpeace";
     githubId = 28888242;
-    name = "Worldofpeace";
+    name = "worldofpeace";
   };
   wscott = {
     email = "wsc9tt@gmail.com";

From 0302cbf42bde897a275087bc3d18dcdd7c4b4db5 Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Fri, 21 Feb 2020 12:19:25 +0100
Subject: [PATCH 1369/4636] icon-lang: fix build

---
 .../development/interpreters/icon-lang/default.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix
index 0d3fe100329c..d243ae9bc580 100644
--- a/pkgs/development/interpreters/icon-lang/default.nix
+++ b/pkgs/development/interpreters/icon-lang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libX11, libXt , withGraphics ? true }:
+{ stdenv, fetchFromGitHub, fetchpatch, libX11, libXt, withGraphics ? true }:
 
 stdenv.mkDerivation rec {
   pname = "icon-lang";
@@ -12,6 +12,18 @@ stdenv.mkDerivation rec {
 
   buildInputs = stdenv.lib.optionals withGraphics [ libX11 libXt ];
 
+  patches = [
+    # Patch on git master, likely won't be necessary in future release
+    (fetchpatch {
+      url = "https://github.com/gtownsend/icon/commit/bfc4a6004d0d3984c8066289b8d8e563640c4ddd.patch";
+      sha256 = "1pqapjghk10rb73a1mfflki2wipjy4kvnravhmrilkqzb9hd6v8m";
+      excludes = [
+        "doc/relnotes.htm"
+        "src/h/version.h"
+      ];
+    })
+  ];
+
   configurePhase =
     let
       _name = if stdenv.isDarwin then "macintosh" else "linux";

From 420b4447738e4aa2c50ed2c5fedc68847ca5e1a3 Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Fri, 21 Feb 2020 12:38:25 +0100
Subject: [PATCH 1370/4636] noweb: fix build

---
 pkgs/development/tools/literate-programming/noweb/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix
index 7a2252c6b273..8806b5a81cd1 100644
--- a/pkgs/development/tools/literate-programming/noweb/default.nix
+++ b/pkgs/development/tools/literate-programming/noweb/default.nix
@@ -57,7 +57,7 @@ let noweb = stdenv.mkDerivation rec {
 
     # HACK: This is ugly, but functional.
     PATH=$out/bin:$PATH make -BC xdoc
-    make "''${installFlags[@]}" install-man
+    make "''${installFlags[@]} install-man"
 
     ln -s "$tex" "$out/share/texmf"
   '';

From 5111cf2da99481bf9f00b1f9bc9e996f01deb611 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 23 Feb 2020 14:45:18 +0100
Subject: [PATCH 1371/4636] neatvnc: init at 0.1.0

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

diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix
new file mode 100644
index 000000000000..8dbcf92feed8
--- /dev/null
+++ b/pkgs/development/libraries/neatvnc/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, meson, pkg-config, ninja
+, pixman, libuv, gnutls, libdrm
+# libjpeg_turbo: Optional, for tight encoding (disabled because experimental)
+}:
+
+stdenv.mkDerivation rec {
+  pname = "neatvnc";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "any1";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "04wcpwxlcf0bczcs97j21346mn6finfj7xgc2dsrwrw9xq8qa7wc";
+  };
+
+  nativeBuildInputs = [ meson pkg-config ninja ];
+  buildInputs = [ pixman libuv gnutls libdrm ];
+
+  meta = with stdenv.lib; {
+    description = "A VNC server library";
+    longDescription = ''
+      This is a liberally licensed VNC server library that's intended to be
+      fast and neat. Goals:
+      - Speed
+      - Clean interface
+      - Interoperability with the Freedesktop.org ecosystem
+    '';
+    inherit (src.meta) homepage;
+    license = licenses.isc;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ primeos ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 025c6a4631cc..608300709aca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13465,6 +13465,8 @@ in
 
   neardal = callPackage ../development/libraries/neardal { };
 
+  neatvnc = callPackage ../development/libraries/neatvnc { };
+
   neon = callPackage ../development/libraries/neon { };
 
   neon_0_29 = callPackage ../development/libraries/neon/0.29.nix {

From f58a7349f92d830f1e496375f815452da3e5d192 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 23 Feb 2020 14:49:02 +0100
Subject: [PATCH 1372/4636] wayvnc: init at 0.1.0

---
 .../networking/remote/wayvnc/default.nix      | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/networking/remote/wayvnc/default.nix

diff --git a/pkgs/applications/networking/remote/wayvnc/default.nix b/pkgs/applications/networking/remote/wayvnc/default.nix
new file mode 100644
index 000000000000..b1498d0a9ce7
--- /dev/null
+++ b/pkgs/applications/networking/remote/wayvnc/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, meson, pkg-config, ninja
+, pixman, libuv, libGL, libxkbcommon, wayland, neatvnc, libdrm, libX11
+}:
+
+stdenv.mkDerivation rec {
+  pname = "wayvnc";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "any1";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "17c30c33zzhhlqzc4a5dd1y74ch7c8gsm98wvcn4n1fv50fbmpbd";
+  };
+
+  nativeBuildInputs = [ meson pkg-config ninja ];
+  buildInputs = [ pixman libuv libGL libxkbcommon wayland neatvnc libdrm libX11 ];
+
+  meta = with stdenv.lib; {
+    description = "A VNC server for wlroots based Wayland compositors";
+    longDescription = ''
+      This is a VNC server for wlroots based Wayland compositors. It attaches
+      to a running Wayland session, creates virtual input devices and exposes a
+      single display via the RFB protocol. The Wayland session may be a
+      headless one, so it is also possible to run wayvnc without a physical
+      display attached.
+    '';
+    inherit (src.meta) homepage;
+    license = licenses.isc;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ primeos ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 608300709aca..cfb5369593bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22166,6 +22166,8 @@ in
 
   wayv = callPackage ../tools/X11/wayv {};
 
+  wayvnc = callPackage ../applications/networking/remote/wayvnc { };
+
   webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {};
 
   webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {};

From 5259b4f9cca28cf0f7db72a7394c8aed5ba91c60 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Sun, 23 Feb 2020 18:34:56 +0200
Subject: [PATCH 1373/4636] skim: 0.7.0 -> 0.8.0

---
 pkgs/tools/misc/skim/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix
index 550db58895d0..1472b4ae72f6 100644
--- a/pkgs/tools/misc/skim/default.nix
+++ b/pkgs/tools/misc/skim/default.nix
@@ -2,21 +2,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "skim";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "lotabout";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0is6zymvy673f1g466i3ayi4jawdl7pm9l3cbdxcw32h3snbkgqp";
+    sha256 = "0b0x389khdqyzdb6mwbf31wdfn8xila756hb11l555iwipl271ci";
   };
 
   outputs = [ "out" "vim" ];
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1dl530ac8i4wdw7lziskl7rhh3ak9ykcws3kpy64808kxg3b1jnz";
+  cargoSha256 = "0xcsj8wprp9r6s7r2d2fnbicrc5pfnnx1gxyrq2qkj3rwr1q8ndg";
 
   patchPhase = ''
     sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim

From 9d5cc98363d0cb4376f49e9c9275d58584e5c3c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 23 Feb 2020 19:16:02 +0100
Subject: [PATCH 1374/4636] gnulib: 20190811 -> 20200223

This update makes gnulib work even if it is installed into a readonly
location, so some hacks in nixpkgs can be removed.
---
 pkgs/development/tools/gnulib/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix
index 316c38706d3d..368a1520ca00 100644
--- a/pkgs/development/tools/gnulib/default.nix
+++ b/pkgs/development/tools/gnulib/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation {
   pname = "gnulib";
-  version = "20190811";
+  version = "20200223";
 
   src = fetchgit {
     url = https://git.savannah.gnu.org/r/gnulib.git;
-    rev = "6430babe47ece6953cf18ef07c1d8642c8588e89";
-    sha256 = "14kgykbjly03dlb25sllcfcrpk7zkypa449gr3zbqv4rhpmnzizg";
+    rev = "292fd5d6ff5ecce81ec3c648f353732a9ece83c0";
+    sha256 = "0hkg3nql8nsll0vrqk4ifda0v4kpi67xz42r8daqsql6c4rciqnw";
   };
 
   dontFixup = true;

From 4ca87c08a2bd9c332bf45c8655aaada844181a07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 23 Feb 2020 19:17:03 +0100
Subject: [PATCH 1375/4636] xprintidle-ng: simplify gnulib usage

---
 pkgs/tools/X11/xprintidle-ng/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/X11/xprintidle-ng/default.nix b/pkgs/tools/X11/xprintidle-ng/default.nix
index 117a612381f6..4ae457dab4a8 100644
--- a/pkgs/tools/X11/xprintidle-ng/default.nix
+++ b/pkgs/tools/X11/xprintidle-ng/default.nix
@@ -19,20 +19,18 @@ stdenv.mkDerivation rec {
       --replace "AC_PREREQ([2.62])" "AC_PREREQ([2.63])"
   '';
 
-  nativeBuildInputs = [ 
+  nativeBuildInputs = [
     autoconf automake gettext git gnulib
     help2man libtool perl pkgconfig texinfo
   ];
 
   configurePhase = ''
-    cp -r "${gnulib}" gnulib
-    chmod a+rX,u+w -R gnulib
-    ./bootstrap --gnulib-srcdir=gnulib
+    ./bootstrap --gnulib-srcdir=${gnulib}
     ./configure --prefix="$out"
   '';
 
   buildInputs = [
-    libX11 libXScrnSaver libXext  
+    libX11 libXScrnSaver libXext
   ];
 
   meta = {

From 98bb71f41b194f00607308fab704397a9aaf971d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 23 Feb 2020 19:17:48 +0100
Subject: [PATCH 1376/4636] grub2: simplify gnulib usage

---
 pkgs/tools/misc/grub/2.0x.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 3f5485718dc5..3eec453824d7 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -83,12 +83,9 @@ stdenv.mkDerivation rec {
 
       unset CPP # setting CPP intereferes with dependency calculation
 
-      cp -r ${gnulib} $PWD/gnulib
-      chmod u+w -R $PWD/gnulib
-
       patchShebangs .
 
-      ./bootstrap --no-git --gnulib-srcdir=$PWD/gnulib
+      ./bootstrap --no-git --gnulib-srcdir=${gnulib}
 
       substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts'
     '';

From 07cf03630f88e8e0b1c8eab755734fa7e3c225d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 23 Feb 2020 19:22:30 +0100
Subject: [PATCH 1377/4636] lbzip2: fix build

The release tarball is no longer available at the specified URL, so
building from git. Also, the gnulib in the release tarball was too old
for our recent glibc version.
---
 pkgs/tools/compression/lbzip2/default.nix | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix
index 7e9cc055abf5..99d41c06ec64 100644
--- a/pkgs/tools/compression/lbzip2/default.nix
+++ b/pkgs/tools/compression/lbzip2/default.nix
@@ -1,13 +1,23 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, gnulib, perl, autoconf, automake }:
 
 stdenv.mkDerivation rec {
-  name = "lbzip2-2.5";
+  version = "2.5";
+  name = "lbzip2-${version}";
 
-  src = fetchurl {
-    url = "http://archive.lbzip2.org/${name}.tar.gz";
-    sha256 = "1sahaqc5bw4i0iyri05syfza4ncf5cml89an033fspn97klmxis6";
+  src = fetchFromGitHub {
+    owner = "kjn";
+    repo = "lbzip2";
+    sha256 = "1h321wva6fp6khz6x0i6rqb76xh327nw6v5jhgjpcckwdarj5jv8";
+    rev = "v${version}";
   };
 
+  buildInputs = [ gnulib perl ];
+  nativeBuildInputs = [ autoconf automake ];
+
+  preConfigure = ''
+    ./build-aux/autogen.sh
+  '';
+
   meta = with stdenv.lib; {
     homepage = "https://github.com/kjn/lbzip2"; # Formerly http://lbzip2.org/
     description = "Parallel bzip2 compression utility";

From b23de14ebdf03ce24d1fc746c7b98175a7e05c0b Mon Sep 17 00:00:00 2001
From: Alex Rice <alexrice999@hotmail.co.uk>
Date: Wed, 28 Aug 2019 09:28:46 +0100
Subject: [PATCH 1378/4636] Variant Ant themes: init at 1.3.0

---
 pkgs/data/themes/ant-theme/ant-bloody.nix     | 40 +++++++++++++++++++
 pkgs/data/themes/ant-theme/ant-dracula.nix    | 40 +++++++++++++++++++
 pkgs/data/themes/ant-theme/ant-nebula.nix     | 40 +++++++++++++++++++
 .../themes/ant-theme/{default.nix => ant.nix} | 17 ++++----
 pkgs/top-level/all-packages.nix               |  8 +++-
 5 files changed, 137 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/data/themes/ant-theme/ant-bloody.nix
 create mode 100644 pkgs/data/themes/ant-theme/ant-dracula.nix
 create mode 100644 pkgs/data/themes/ant-theme/ant-nebula.nix
 rename pkgs/data/themes/ant-theme/{default.nix => ant.nix} (54%)

diff --git a/pkgs/data/themes/ant-theme/ant-bloody.nix b/pkgs/data/themes/ant-theme/ant-bloody.nix
new file mode 100644
index 000000000000..4ec1c3281d55
--- /dev/null
+++ b/pkgs/data/themes/ant-theme/ant-bloody.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, gtk-engine-murrine }:
+
+let
+  themeName = "Ant-Bloody";
+in
+stdenv.mkDerivation rec {
+  pname = "ant-bloody-theme";
+  version = "1.3.0";
+
+  src = fetchurl {
+    url = "https://github.com/EliverLara/${themeName}/releases/download/v${version}/${themeName}.tar";
+    sha256 = "0rrz50kmzjmqj17hvrw67pbaclwxv85i5m08s7842iky6dnn5z8s";
+  };
+
+  propagatedUserEnvPkgs = [
+    gtk-engine-murrine
+  ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/share/themes/${themeName}
+    cp -a * $out/share/themes/${themeName}
+    rm -r $out/share/themes/${themeName}/{Art,LICENSE,README.md,gtk-2.0/render-assets.sh}
+    runHook postInstall
+  '';
+
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "0v5pdhysa2460sh400cpq11smcfsi9g1lbfzx8nj1w5a21d811cz";
+
+  meta = with stdenv.lib; {
+    description = "Bloody variant of the Ant theme";
+    homepage = "https://github.com/EliverLara/${themeName}";
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ alexarice ];
+  };
+}
diff --git a/pkgs/data/themes/ant-theme/ant-dracula.nix b/pkgs/data/themes/ant-theme/ant-dracula.nix
new file mode 100644
index 000000000000..baeafb255275
--- /dev/null
+++ b/pkgs/data/themes/ant-theme/ant-dracula.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, gtk-engine-murrine }:
+
+let
+  themeName = "Ant-Dracula";
+in
+stdenv.mkDerivation rec {
+  pname = "ant-dracula-theme";
+  version = "1.3.0";
+
+  src = fetchurl {
+    url = "https://github.com/EliverLara/${themeName}/releases/download/v${version}/${themeName}.tar";
+    sha256 = "00b8w69xapqy8kc7zqwlfz1xpld6hibbh35djvhcnd905gzzymkd";
+  };
+
+  propagatedUserEnvPkgs = [
+    gtk-engine-murrine
+  ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/share/themes/${themeName}
+    cp -a * $out/share/themes/${themeName}
+    rm -r $out/share/themes/${themeName}/{Art,LICENSE,README.md,gtk-2.0/render-assets.sh}
+    runHook postInstall
+  '';
+
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "1a9mkxfb0zixx8s05h15lhnnzygh2qzc8k2q10i0khx90bf72x14";
+
+  meta = with stdenv.lib; {
+    description = "Dracula variant of the Ant theme";
+    homepage = "https://github.com/EliverLara/${themeName}";
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ alexarice ];
+  };
+}
diff --git a/pkgs/data/themes/ant-theme/ant-nebula.nix b/pkgs/data/themes/ant-theme/ant-nebula.nix
new file mode 100644
index 000000000000..75aeb91f9022
--- /dev/null
+++ b/pkgs/data/themes/ant-theme/ant-nebula.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, gtk-engine-murrine }:
+
+let
+  themeName = "Ant-Nebula";
+in
+stdenv.mkDerivation rec {
+  pname = "ant-nebula-theme";
+  version = "1.3.0";
+
+  src = fetchurl {
+    url = "https://github.com/EliverLara/${themeName}/releases/download/v${version}/${themeName}.tar";
+    sha256 = "1xpgw577nmgjk547mg2vvv0gdai60srgncykm5pb1w8dnlk69jbz";
+  };
+
+  propagatedUserEnvPkgs = [
+    gtk-engine-murrine
+  ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/share/themes/${themeName}
+    cp -a * $out/share/themes/${themeName}
+    rm -r $out/share/themes/${themeName}/{Art,LICENSE,README.md,gtk-2.0/render-assets.sh}
+    runHook postInstall
+  '';
+
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "1lmlc4fvjnp05gshc0arfysh8r1xxzpzdv3j0bk40mjf3d59814c";
+
+  meta = with stdenv.lib; {
+    description = "Nebula variant of the Ant theme";
+    homepage = "https://github.com/EliverLara/${themeName}";
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ alexarice ];
+  };
+}
diff --git a/pkgs/data/themes/ant-theme/default.nix b/pkgs/data/themes/ant-theme/ant.nix
similarity index 54%
rename from pkgs/data/themes/ant-theme/default.nix
rename to pkgs/data/themes/ant-theme/ant.nix
index c60fb4d33558..0908883e20ec 100644
--- a/pkgs/data/themes/ant-theme/default.nix
+++ b/pkgs/data/themes/ant-theme/ant.nix
@@ -1,11 +1,14 @@
 { stdenv, fetchurl, gtk-engine-murrine }:
 
+let
+  themeName = "Ant";
+in
 stdenv.mkDerivation rec {
   pname = "ant-theme";
   version = "1.3.0";
 
   src = fetchurl {
-    url = "https://github.com/EliverLara/Ant/releases/download/v${version}/Ant.tar";
+    url = "https://github.com/EliverLara/${themeName}/releases/download/v${version}/${themeName}.tar";
     sha256 = "1r795v96ywzcb4dq08q2fdbmfia32g36cc512mhy41s8fb1a47dz";
   };
 
@@ -17,21 +20,21 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     runHook preInstall
-    mkdir -p $out/share/themes/Ant
-    cp -a * $out/share/themes/Ant
-    rm -r $out/share/themes/Ant/{Art,LICENSE,README.md,gtk-2.0/render-assets.sh}
+    mkdir -p $out/share/themes/${themeName}
+    cp -a * $out/share/themes/${themeName}
+    rm -r $out/share/themes/${themeName}/{Art,LICENSE,README.md,gtk-2.0/render-assets.sh}
     runHook postInstall
   '';
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "1gpacrmi5y87shp39jgy78n0ca2xdpvbqfh0mgldlxx99ca9rvvy";
+  outputHash = "07iv4jangqnzrvjr749vl3x31z7dxds51bq1bhz5acbjbwf25wjf";
 
   meta = with stdenv.lib; {
     description = "A flat and light theme with a modern look";
-    homepage = https://github.com/EliverLara/Ant;
+    homepage = "https://github.com/EliverLara/${themeName}";
     license = licenses.gpl3;
     platforms = platforms.all;
-    maintainers = [ ];
+    maintainers = with maintainers; [ alexarice ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff9be76afba0..cdea540cfec4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17370,7 +17370,13 @@ in
 
   anonymousPro = callPackage ../data/fonts/anonymous-pro { };
 
-  ant-theme = callPackage ../data/themes/ant-theme { };
+  ant-theme = callPackage ../data/themes/ant-theme/ant.nix { };
+
+  ant-bloody-theme = callPackage ../data/themes/ant-theme/ant-bloody.nix { };
+
+  ant-dracula-theme = callPackage ../data/themes/ant-theme/ant-dracula.nix { };
+
+  ant-nebula-theme = callPackage ../data/themes/ant-theme/ant-nebula.nix { };
 
   arc-icon-theme = callPackage ../data/icons/arc-icon-theme { };
 

From 099359afc72d34255b78cdcc6291b77b2e7ed2f9 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Sun, 23 Feb 2020 15:59:41 +0000
Subject: [PATCH 1379/4636] libfido2: add macOS support

* pass IOKit to libfido2
* Add a patch so that cmake uses lld flags when linking
* Upgrade from 1.3.0 to 1.3.1 (based off #80781)
* Specify CMAKE_INSTALL_LIBDIR so that the demo binaries link
  correctly on macOS and libfido2.pc specifies correct arguments
---
 pkgs/development/libraries/libfido2/default.nix | 17 +++++++++++------
 .../libraries/libfido2/detect_apple_ld.patch    | 11 +++++++++++
 pkgs/top-level/all-packages.nix                 |  4 +++-
 3 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/development/libraries/libfido2/detect_apple_ld.patch

diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix
index 32d19283974c..01a73f4a1308 100644
--- a/pkgs/development/libraries/libfido2/default.nix
+++ b/pkgs/development/libraries/libfido2/default.nix
@@ -1,17 +1,22 @@
-{ stdenv, fetchurl, cmake, pkgconfig, libcbor, libressl, udev }:
+{ stdenv, fetchurl, cmake, pkgconfig, libcbor, libressl, udev, IOKit }:
 
 stdenv.mkDerivation rec {
   pname = "libfido2";
-  version = "1.3.0";
+  version = "1.3.1";
   src = fetchurl {
     url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz";
-    sha256 = "1izyl3as9rn7zcxpsvgngjwr55gli5gy822ac3ajzm65qiqkcbhb";
+    sha256 = "0hdgxbmjbnm9kjwc07nrl2zy87qclvb3rzvdwr5iw35n2qhf4dds";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = [ libcbor libressl ] ++ stdenv.lib.optionals stdenv.isLinux [ udev ];
+  buildInputs = [ libcbor libressl ]
+    ++ stdenv.lib.optionals stdenv.isLinux [ udev ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
 
-  cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" ];
+  patches = [ ./detect_apple_ld.patch ];
+
+  cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d"
+                 "-DCMAKE_INSTALL_LIBDIR=lib" ];
 
   meta = with stdenv.lib; {
     description = ''
@@ -20,6 +25,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/Yubico/libfido2;
     license = licenses.bsd2;
     maintainers = with maintainers; [ dtzWill ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libfido2/detect_apple_ld.patch b/pkgs/development/libraries/libfido2/detect_apple_ld.patch
new file mode 100644
index 000000000000..de972e0f3586
--- /dev/null
+++ b/pkgs/development/libraries/libfido2/detect_apple_ld.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2020-02-19 17:21:59.000000000 +0000
++++ b/CMakeLists.txt	2020-02-23 15:57:34.241115306 +0000
+@@ -296,7 +296,7 @@
+ endif()
+ 
+ # export list
+-if(CMAKE_C_COMPILER_ID STREQUAL "AppleClang")
++if(APPLE AND CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang")	
+ 	# clang + lld
+ 	string(CONCAT CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS}
+ 	    " -exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/src/export.llvm")
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff9be76afba0..5eee9b6bad4b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12468,7 +12468,9 @@ in
 
   libfakekey = callPackage ../development/libraries/libfakekey { };
 
-  libfido2 = callPackage ../development/libraries/libfido2 { };
+  libfido2 = callPackage ../development/libraries/libfido2 {
+    inherit (darwin.apple_sdk.frameworks) IOKit;
+  };
 
   libfilezilla = callPackage ../development/libraries/libfilezilla { };
 

From f128322912a2543966d4555bcb0a451dcb2e7559 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 22 Feb 2020 16:06:36 -0800
Subject: [PATCH 1380/4636] lutris.chrootenv: add libbsd

---
 pkgs/applications/misc/lutris/chrootenv.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix
index 5b9bb925a4e6..a3a5d0ce751a 100644
--- a/pkgs/applications/misc/lutris/chrootenv.nix
+++ b/pkgs/applications/misc/lutris/chrootenv.nix
@@ -97,7 +97,7 @@ in buildFHSUserEnv {
     libcap libtiff libva libgphoto2 libxslt libtxc_dxtn libsndfile giflib zlib glib
     alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils
     readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd
-    vulkan-loader xdg_utils sqlite gnutls
+    vulkan-loader xdg_utils sqlite gnutls libbsd
 
     # PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64"
 

From 35e5fc34ffda72cd14156eac14c8a16d5883790d Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Wed, 27 Nov 2019 11:30:51 +0100
Subject: [PATCH 1381/4636] pythonPackages.bespon: init at 0.3.0

Co-Authored-By: Jon <jonringer@users.noreply.github.com>
---
 .../python-modules/bespon/default.nix         | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/python-modules/bespon/default.nix

diff --git a/pkgs/development/python-modules/bespon/default.nix b/pkgs/development/python-modules/bespon/default.nix
new file mode 100644
index 000000000000..7949675d6517
--- /dev/null
+++ b/pkgs/development/python-modules/bespon/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  version = "0.3.0";
+  pname = "BespON";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0698vx1kh8c84f5qfhl4grdlyn1lljvdih8yczdz0pql8wkn8i7v";
+  };
+
+  propagatedBuildInputs = [ ];
+  # upstream doesn't contain tests
+  doCheck = false;
+  
+  pythonImportsCheck = [ "bespon" ];
+  meta = with stdenv.lib; {
+    description = "Encodes and decodes data in the BespON format.";
+    homepage = "https://github.com/gpoore/bespon_py";
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ synthetica ];
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e32dc03cd602..989fabf8b717 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1772,6 +1772,8 @@ in {
 
   beaker = callPackage ../development/python-modules/beaker { };
 
+  bespon = callPackage ../development/python-modules/bespon { };
+
   betamax = callPackage ../development/python-modules/betamax {};
 
   betamax-matchers = callPackage ../development/python-modules/betamax-matchers { };

From 7062fa3d576e5223653ae3c115368c5777343fe9 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Wed, 27 Nov 2019 11:32:13 +0100
Subject: [PATCH 1382/4636] codebraid: init at 0.5.0-unstable-2019-12-11

Co-Authored-By: Jon <jonringer@users.noreply.github.com>
---
 pkgs/tools/misc/codebraid/default.nix | 39 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/tools/misc/codebraid/default.nix

diff --git a/pkgs/tools/misc/codebraid/default.nix b/pkgs/tools/misc/codebraid/default.nix
new file mode 100644
index 000000000000..bc4a7084cdda
--- /dev/null
+++ b/pkgs/tools/misc/codebraid/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, python3Packages, fetchFromGitHub }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "codebraid";
+  version = "0.5.0-unstable-2019-12-11";
+
+  src = fetchFromGitHub {
+    owner = "gpoore";
+    repo = pname;
+    rev = "fac1b29";
+    sha256 = "0ldfrkkip7i1fdyz1iydyik3mhm0xv0jvxnl37r7g707dl38vf3h";
+  };
+
+  propagatedBuildInputs = with python3Packages; [ bespon ];
+  # unfortunately upstream doesn't contain tests
+  checkPhase = ''
+    $out/bin/codebraid --help > /dev/null
+  '';
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/gpoore/codebraid";
+    description = ''
+      Live code in Pandoc Markdown.
+
+      Codebraid is a Python program that enables executable code in Pandoc
+      Markdown documents. Using Codebraid can be as simple as adding a class to
+      your code blocks' attributes, and then running codebraid rather than
+      pandoc to convert your document from Markdown to another format.
+      codebraid supports almost all of pandoc's options and passes them to
+      pandoc internally.
+
+      Codebraid provides two options for executing code. It includes a built-in
+      code execution system that currently supports Python 3.5+, Julia, Rust,
+      R, Bash, and JavaScript. Code can also be executed using Jupyter kernels,
+      with support for rich output like plots.
+    '';
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ synthetica ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff9be76afba0..94aae7151053 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2626,6 +2626,8 @@ in
 
   cocoapods-beta = lowPrio (callPackage ../development/mobile/cocoapods { beta = true; });
 
+  codebraid = callPackage ../tools/misc/codebraid { };
+
   compass = callPackage ../development/tools/compass { };
 
   conda = callPackage ../tools/package-management/conda { };

From 36a1d1023ac9f6f731cc1a6389870a567d206e05 Mon Sep 17 00:00:00 2001
From: Kevin Amado <kamadorueda@gmail.com>
Date: Wed, 29 Jan 2020 12:37:58 -0500
Subject: [PATCH 1383/4636] pythonPackages.pywinrm: missing dependency

- Keberos is a dependency that you really want included in the pkg,
  this is also needed to run the test suite by default
---
 pkgs/development/python-modules/pywinrm/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix
index 9ed44c83b602..798364afd0d2 100644
--- a/pkgs/development/python-modules/pywinrm/default.nix
+++ b/pkgs/development/python-modules/pywinrm/default.nix
@@ -1,6 +1,8 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, isPy38
+, kerberos
 , mock
 , pytest
 , requests
@@ -12,6 +14,7 @@
 buildPythonPackage rec {
   pname = "pywinrm";
   version = "0.4.1";
+  disabled = isPy38;
 
   src = fetchPypi {
     inherit pname version;
@@ -19,13 +22,16 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ mock pytest ];
-  propagatedBuildInputs = [ requests requests_ntlm six xmltodict ];
+  propagatedBuildInputs = [ requests requests_ntlm six kerberos xmltodict ];
 
   meta = with lib; {
     description = "Python library for Windows Remote Management";
-    homepage = https://github.com/diyan/pywinrm/;
+    homepage = "https://github.com/diyan/pywinrm";
     license = licenses.mit;
-    maintainers = with maintainers; [ elasticdog ];
+    maintainers = with maintainers; [
+      elasticdog
+      kamadorueda
+    ];
     platforms = platforms.all;
   };
 }

From 58dac999c200153564f085620f115159d4fe24da Mon Sep 17 00:00:00 2001
From: Kevin Amado <kamadorueda@gmail.com>
Date: Sun, 9 Feb 2020 09:47:03 -0500
Subject: [PATCH 1384/4636] pythonPackages.graphql-core: init at 2.3.1

---
 .../python-modules/graphql-core/default.nix   | 54 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/development/python-modules/graphql-core/default.nix

diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix
new file mode 100644
index 000000000000..21cc58e67fcd
--- /dev/null
+++ b/pkgs/development/python-modules/graphql-core/default.nix
@@ -0,0 +1,54 @@
+{ buildPythonPackage
+, fetchFromGitHub
+, lib
+
+, coveralls
+, promise
+, pytest
+, pytest-benchmark
+, pytest-mock
+, rx
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "graphql-core";
+  version = "2.3.1";
+
+  src = fetchFromGitHub {
+    owner = "graphql-python";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "029jnwy6zbj4x7f3ffpn1gyx0w9ala9cj2g115g6aa7im3xd2jma";
+  };
+
+  propagatedBuildInputs = [
+    promise
+    rx
+    six
+  ];
+
+  checkInputs = [
+    coveralls
+    pytest
+    pytest-benchmark
+    pytest-mock
+  ];
+
+  checkPhase = "pytest";
+
+  configurePhase = ''
+    substituteInPlace setup.py \
+      --replace 'pytest-mock==1.2' 'pytest-mock==1.13.0' \
+      --replace 'pytest-benchmark==3.0.0' 'pytest-benchmark==3.2.2'
+  '';
+
+  meta = with lib; {
+    description = "Port of graphql-js to Python";
+    homepage = "https://github.com/graphql-python/graphql-core";
+    license = licenses.mit;
+    maintainers = with maintainers; [
+      kamadorueda
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 989fabf8b717..c1797cb79a06 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3817,6 +3817,8 @@ in {
     inherit (pkgs) pkgconfig;
   };
 
+  graphql-core = callPackage ../development/python-modules/graphql-core { };
+
   grammalecte = callPackage ../development/python-modules/grammalecte { };
 
   greenlet = callPackage ../development/python-modules/greenlet { };

From c6f75c74df9fb26e53a3874088fcac4a0ed28863 Mon Sep 17 00:00:00 2001
From: Kevin Amado <kamadorueda@gmail.com>
Date: Sun, 9 Feb 2020 09:48:25 -0500
Subject: [PATCH 1385/4636] pythonPackages.graphql-server-core: init at 1.2.0

---
 .../graphql-server-core/default.nix           | 40 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/python-modules/graphql-server-core/default.nix

diff --git a/pkgs/development/python-modules/graphql-server-core/default.nix b/pkgs/development/python-modules/graphql-server-core/default.nix
new file mode 100644
index 000000000000..e12d71836f18
--- /dev/null
+++ b/pkgs/development/python-modules/graphql-server-core/default.nix
@@ -0,0 +1,40 @@
+{ buildPythonPackage
+, fetchFromGitHub
+, lib
+
+, black
+, graphql-core
+, promise
+}:
+
+buildPythonPackage rec {
+  pname = "graphql-server-core";
+  version = "1.2.0";
+
+  src = fetchFromGitHub {
+    owner = "graphql-python";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "123q3xziv0s22h10v3f5slirf4b6nxj0hnmarwx9vws6x21bgrgh";
+  };
+
+  propagatedBuildInputs = [
+    graphql-core
+    promise
+  ];
+
+  checkPhase = "black --check graphql_server tests";
+
+  checkInputs = [
+    black
+  ];
+
+  meta = with lib; {
+    description = "Core package for using GraphQL in a custom server easily";
+    homepage = "https://github.com/graphql-python/graphql-server-core";
+    license = licenses.mit;
+    maintainers = with maintainers; [
+      kamadorueda
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c1797cb79a06..49bda83cddcf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3819,6 +3819,8 @@ in {
 
   graphql-core = callPackage ../development/python-modules/graphql-core { };
 
+  graphql-server-core = callPackage ../development/python-modules/graphql-server-core { };
+
   grammalecte = callPackage ../development/python-modules/grammalecte { };
 
   greenlet = callPackage ../development/python-modules/greenlet { };

From 638251852eeed0bfaa7193269b2b079f821e7c07 Mon Sep 17 00:00:00 2001
From: Kevin Amado <kamadorueda@gmail.com>
Date: Sun, 9 Feb 2020 09:49:08 -0500
Subject: [PATCH 1386/4636] pythonPackages.promise: init at 2.3

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

diff --git a/pkgs/development/python-modules/promise/default.nix b/pkgs/development/python-modules/promise/default.nix
new file mode 100644
index 000000000000..68668812fc8a
--- /dev/null
+++ b/pkgs/development/python-modules/promise/default.nix
@@ -0,0 +1,49 @@
+{ buildPythonPackage
+, fetchPypi
+, lib
+
+, coveralls
+, gevent
+, mock
+, pytest-asyncio
+, pytest-benchmark
+, pytestcov
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "promise";
+  version = "2.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1l4kknj97dj5pxfpsz3ln78x9a843561c740b1m4pfi3qlvq7lfz";
+  };
+
+  patchPhase = ''
+    substituteInPlace setup.py \
+      --replace '"futures",' ""
+  '';
+
+  propagatedBuildInputs = [
+    gevent
+    six
+  ];
+
+  checkInputs = [
+    coveralls
+    mock
+    pytest-asyncio
+    pytest-benchmark
+    pytestcov
+  ];
+
+  meta = with lib; {
+    description = "Ultra-performant Promise implementation in Python";
+    homepage = "https://github.com/syrusakbary/promise";
+    license = licenses.mit;
+    maintainers = with maintainers; [
+      kamadorueda
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 49bda83cddcf..3b5e60ae9607 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4793,6 +4793,8 @@ in {
 
   precis-i18n = callPackage ../development/python-modules/precis-i18n { };
 
+  promise = callPackage ../development/python-modules/promise { };
+
   prox-tv = callPackage ../development/python-modules/prox-tv {
     # We need to use blas instead of openblas on darwin,
     # see https://github.com/NixOS/nixpkgs/pull/45013.

From 3c72558ef0ca95c77b88b87fac37919e3a871dec Mon Sep 17 00:00:00 2001
From: Kevin Amado <kamadorueda@gmail.com>
Date: Sat, 22 Feb 2020 15:45:16 -0500
Subject: [PATCH 1387/4636] pythonPackages.fluidasserts: 20.1.33141 ->
 20.2.30165

- Release entirely the version pinning, the active development of
  the package makes it be compatible with the latest dependency
  versions
- Added more tests, and missing packages
---
 .../python-modules/fluidasserts/default.nix   | 82 +++++++++++++------
 1 file changed, 58 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/python-modules/fluidasserts/default.nix b/pkgs/development/python-modules/fluidasserts/default.nix
index f1f5397c0a82..7275199fca4d 100644
--- a/pkgs/development/python-modules/fluidasserts/default.nix
+++ b/pkgs/development/python-modules/fluidasserts/default.nix
@@ -7,17 +7,16 @@
 , aiohttp
 , androguard
 , azure-identity
-, azure-keyvault-keys
-, azure-keyvault-secrets
+, azure-keyvault
 , azure-mgmt-compute
 , azure-mgmt-keyvault
 , azure-mgmt-network
 , azure-mgmt-resource
 , azure-mgmt-security
 , azure-mgmt-storage
+, azure-mgmt-sql
 , azure-mgmt-web
-, azure-storage-file
-, azure-storage-file-share
+, azure-storage
 , bandit
 , bcrypt
 , beautifulsoup4
@@ -45,11 +44,14 @@
 , pyhcl
 , pyjks
 , pynacl
+, pyodbc
 , pyopenssl
 , pypdf2
 , pysmb
+, pytesseract
 , python_magic
 , pytz
+, pywinrm
 , requirements-detector
 , selenium
 , tlslite-ng
@@ -57,35 +59,30 @@
 
 # pythonPackages to test the derivation
 , pytest
+, flask
+, flask-httpauth
+, docker
 }:
 
 buildPythonPackage rec {
   pname = "fluidasserts";
-  version = "20.1.33141";
+  version = "20.2.30165";
   disabled = !isPy37;
 
   src = fetchPypi {
     inherit pname version;
-    extension = "zip";
-    sha256 = "01l6yb3r19q8b4kwqkrzn7mpfsr65zsgzax2fbs43hb6pq6vavnx";
+    sha256 = "0wcplzfx89d3c6hvdgag860sl3infqmymy6ly6y6ah77pkc98x15";
   };
 
   patchPhase = ''
-    # Version mismatches between current FluidAsserts and Nixpkgs
-    substituteInPlace ./setup.py \
-      --replace 'tlslite-ng==0.8.0-alpha36' 'tlslite-ng==0.7.5' \
-      --replace 'boto3==1.11.7' 'boto3==1.10.1' \
-      --replace 'typed-ast==1.4.1' 'typed-ast==1.4.0' \
-      --replace 'pillow==7.0.0' 'pillow==6.2.1' \
+    # Release packages from their hard pinned versions
+    sed -i -E "s/(.*)==.*/\1/g" requirements.txt
 
     # Functionality that will be not present for the momment
     #   but that we'll work to add in the future
     # Just a minimal portion of fluidasserts use this
-    substituteInPlace ./setup.py \
-      --replace "'pymssql==2.1.4'," "" \
-      --replace "'pytesseract==0.3.1'," "" \
-      --replace "'pywinrm==0.4.1'," "" \
-      --replace "'mitmproxy==5.0.1'," "" \
+    substituteInPlace ./requirements.txt \
+      --replace "mitmproxy" "" \
 
   '';
 
@@ -94,17 +91,16 @@ buildPythonPackage rec {
     aiohttp
     androguard
     azure-identity
-    azure-keyvault-keys
-    azure-keyvault-secrets
+    azure-keyvault
     azure-mgmt-compute
     azure-mgmt-keyvault
     azure-mgmt-network
     azure-mgmt-resource
     azure-mgmt-security
     azure-mgmt-storage
+    azure-mgmt-sql
     azure-mgmt-web
-    azure-storage-file
-    azure-storage-file-share
+    azure-storage
     bandit
     bcrypt
     beautifulsoup4
@@ -132,28 +128,67 @@ buildPythonPackage rec {
     pyhcl
     pyjks
     pynacl
+    pyodbc
     pyopenssl
     pypdf2
     pysmb
+    pytesseract
     python_magic
     pytz
+    pywinrm
     requirements-detector
     selenium
     tlslite-ng
     viewstate
   ];
 
+  configurePhase = ''
+    mkdir -p build/config
+    touch build/config/README.rst
+  '';
+
   checkInputs = [
+    docker
+    flask
+    flask-httpauth
     pytest
   ];
 
   checkPhase = ''
+    # This tests require BWAPP Docker Container
+    sed -ie 's/test_a[0-9]//g' ./test/test_proto_http_open.py
+    sed -ie 's/test_a[0-9]//g' ./test/test_proto_http_close.py
+
+    # This tests require network connectivity
+    sed -ie 's/test_is_date_unsyncd//g' ./test/test_proto_http_open.py
+    sed -ie 's/test_is_date_unsyncd//g' ./test/test_proto_http_close.py
+
+    # Remove impurities
+    substituteInPlace ./test/conftest.py \
+      --replace "import wait" "" \
+      --replace "if not os.path.exists(name):" "if os.path.exists(name):" \
+      --replace "from test.mock import graphql_server" "" \
+      --replace "(graphql_server.start, 'MockGraphQLServer', ['proto_graphql'])," "" \
+
+    pytest --asserts-module 'iot' \
+      test/test_iot_phone.py
+
+    pytest --asserts-module 'ot' \
+      test/test_ot_powerlogic.py
+
+    pytest --asserts-module 'proto_http' \
+      test/test_proto_{http_close,http_open}.py
+
+    pytest --asserts-module 'proto_rest' \
+      test/test_proto_rest.py
+
     # This file launches mock docker containers and servers
     #   let's remove it to create a custom test environment
     rm test/conftest.py
 
     pytest \
-      test/test_cloud_aws_terraform_{ebs,ec2}.py \
+      test/test_cloud_aws_terraform_{cloudfront,dynamodb,ebs,ec2,elb}.py \
+      test/test_cloud_aws_terraform_{fsx,iam,kms,rds,s3}.py \
       test/test_cloud_aws_cloudformation_{cloudfront,dynamodb,ec2,elb,elb2}.py \
       test/test_cloud_aws_cloudformation_{fsx,iam,kms,rds,s3,secretsmanager}.py \
       test/test_format_{apk,jks,jwt,pdf,pkcs12,string}.py \
@@ -161,7 +196,6 @@ buildPythonPackage rec {
       test/test_lang_{javascript,java}.py \
       test/test_lang_{core,csharp,docker,dotnetconfig,html,php,python,rpgle}.py \
       test/test_utils_generic.py
-
   '';
 
   meta = with lib; {

From 2c12bb39a8c5667ea399fac68ccab0794f044bb5 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sat, 22 Feb 2020 10:06:41 -0800
Subject: [PATCH 1388/4636] pythonPackages.chalice: disable pip version bounds

---
 pkgs/development/python-modules/chalice/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix
index d354c5239496..62f3731632d7 100644
--- a/pkgs/development/python-modules/chalice/default.nix
+++ b/pkgs/development/python-modules/chalice/default.nix
@@ -44,8 +44,9 @@ buildPythonPackage rec {
   doCheck = false;
 
   postPatch = ''
+    sed -i setup.py -e "/pip>=/c\'pip',"
     substituteInPlace setup.py \
-      --replace 'pip>=9,<=18.1' 'pip' \
+      --replace 'pip>=9,<=19.4' 'pip' \
       --replace 'typing==3.6.4' 'typing' \
       --replace 'attrs==17.4.0' 'attrs' \
       --replace 'click>=6.6,<7.0' 'click'

From 883ba2fa3821dfe21631eb08b8b00bfa0f589cf4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 23 Feb 2020 21:36:46 +0000
Subject: [PATCH 1389/4636] lsscsi: 0.30 -> 0.31

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

diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/os-specific/linux/lsscsi/default.nix
index aba907039aca..57778357d006 100644
--- a/pkgs/os-specific/linux/lsscsi/default.nix
+++ b/pkgs/os-specific/linux/lsscsi/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "lsscsi-0.30";
+  name = "lsscsi-0.31";
 
   src = fetchurl {
-    url = "http://sg.danny.cz/scsi/lsscsi-0.30.tgz";
-    sha256 = "05cba72m0hj3kpikk26h7j02cly7zy5lgww2fvswa0jz823j36k1";
+    url = "http://sg.danny.cz/scsi/lsscsi-0.31.tgz";
+    sha256 = "1jpk15y9vqjb1lcj4pdzygpg0jf0lja7azjldpywc0s805rikgqj";
   };
 
   preConfigure = ''

From 6082646affa8f28a3485a714aa3667b10db12eba Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 23 Feb 2020 16:28:13 +0000
Subject: [PATCH 1390/4636] jython: 2.7.2b2 -> 2.7.2b3

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

diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix
index 84941f9a6fa6..35af365c1f7d 100644
--- a/pkgs/development/interpreters/jython/default.nix
+++ b/pkgs/development/interpreters/jython/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   pname = "jython";
 
-  version = "2.7.2b2";
+  version = "2.7.2b3";
 
   src = fetchurl {
     url = "http://search.maven.org/remotecontent?filepath=org/python/jython-standalone/${version}/jython-standalone-${version}.jar";
-    sha256 = "0mmrrydr94q2siwjynkw1gw677navmcvjvbi1jpdbp6idfx0jh6b";
+    sha256 = "142285hd9mx0nx5zw0jvkpqkb4kbhgyyy52p5bj061ya8bg5jizy";
   };
 
   buildInputs = [ makeWrapper ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Python interpreter written in Java";
-    homepage = https://jython.org/;
+    homepage = "https://jython.org/";
     license = stdenv.lib.licenses.psfl;
     platforms = jre.meta.platforms;
   };

From 9090ce676b6b0db2a8b552ad1613b1c68f0bb4cc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 23 Feb 2020 13:23:23 +0000
Subject: [PATCH 1391/4636] ghostwriter: 1.8.0 -> 1.8.1

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

diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix
index 1e07902365d2..8c1b95a1d26e 100644
--- a/pkgs/applications/editors/ghostwriter/default.nix
+++ b/pkgs/applications/editors/ghostwriter/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "ghostwriter";
-  version = "1.8.0";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "wereturtle";
     repo = pname;
     rev = "v${version}";
-    sha256 = "13yn82m1l2pq93wbl569a2lzpc3sn8a8g30hsgdch1l9xlmhwran";
+    sha256 = "0jc6szfh5sdnafhwsr1xv7cn1fznniq58bix41hb9wlbkvq7wzi6";
   };
 
   nativeBuildInputs = [ qmake pkgconfig qttools ];

From 2b337d2778ca88b0a48fe91fe394e206341cb623 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 23 Feb 2020 11:06:36 +0000
Subject: [PATCH 1392/4636] eventstore: 5.0.5 -> 5.0.6

---
 pkgs/servers/nosql/eventstore/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix
index 21658a273b48..90dd16417465 100644
--- a/pkgs/servers/nosql/eventstore/default.nix
+++ b/pkgs/servers/nosql/eventstore/default.nix
@@ -16,13 +16,13 @@ in
 stdenv.mkDerivation rec {
 
   pname = "EventStore";
-  version = "5.0.5";
+  version = "5.0.6";
 
   src = fetchFromGitHub {
     owner = "EventStore";
     repo = "EventStore";
     rev = "oss-v${version}";
-    sha256 = "0cnpw24fvnj0q644p9jlijcqz6bxi61g0b59g52d3qxfydr0lgs0";
+    sha256 = "0jlyyqs1z2xrw0dkai2k2zr3dsdbdsvmhx81qa92k7ga9hv04sqj";
   };
 
   buildInputs = [
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = https://geteventstore.com/;
+    homepage = "https://geteventstore.com/";
     description = "Event sourcing database with processing logic in JavaScript";
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ puffnfresh ];

From c8c9d617fb5914f5767c44b4e0d7e529a80f0247 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 23 Feb 2020 09:14:59 +0000
Subject: [PATCH 1393/4636] calibre: 4.8.0 -> 4.11.2

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index fc7575ea92ce..07612c96beef 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -30,11 +30,11 @@ let
 in
 mkDerivation rec {
   pname = "calibre";
-  version = "4.8.0";
+  version = "4.11.2";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
-    sha256 = "1lk44qh3hzqhpz2b00iik7cgjg4xm36qjh2pxflkjnbk691gbpqk";
+    sha256 = "0fxmpygc2ybx8skwhp9j6gnk9drlfiz2cl9g55h10zgxkfzqzqgv";
   };
 
   patches = [

From 394762391ee96051af47e7d0076ea35a8356b8e1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 23 Feb 2020 09:23:42 +0000
Subject: [PATCH 1394/4636] cantata: 2.3.3 -> 2.4.1

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

diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index 876889416daa..cd1783ff6853 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -28,7 +28,7 @@ assert withOnlineServices -> withTaglib;
 assert withReplaygain -> withTaglib;
 
 let
-  version = "2.3.3";
+  version = "2.4.1";
   pname = "cantata";
   fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF");
   fstats = x: map (fstat x);
@@ -42,7 +42,7 @@ in mkDerivation {
     owner  = "CDrummond";
     repo   = "cantata";
     rev    = "v${version}";
-    sha256 = "1m651fmdbnb50glym75kzma0bllvqbmrb2afp1g9g5cxm1898c0f";
+    sha256 = "0ix7xp352bziwz31mw79y7wxxmdn6060p8ry2px243ni1lz1qx1c";
   };
 
   buildInputs = [ vlc qtbase qtmultimedia qtsvg ]
@@ -77,7 +77,7 @@ in mkDerivation {
   ];
 
   meta = with lib; {
-    homepage    = https://github.com/cdrummond/cantata;
+    homepage    = "https://github.com/cdrummond/cantata";
     description = "A graphical client for MPD";
     license     = licenses.gpl3;
     maintainers = with maintainers; [ peterhoeg ];

From 16ef1be71061ecfbdbb48fa137ff9072f29ce140 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Feb 2020 22:19:08 +0000
Subject: [PATCH 1395/4636] python27Packages.filebytes: 0.10.0 -> 0.10.2

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

diff --git a/pkgs/development/python-modules/filebytes/default.nix b/pkgs/development/python-modules/filebytes/default.nix
index e3f638276c26..7404620896c9 100644
--- a/pkgs/development/python-modules/filebytes/default.nix
+++ b/pkgs/development/python-modules/filebytes/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "filebytes";
-  version = "0.10.0";
+  version = "0.10.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "97d1f1f4ba660d8df6c51beea36ea7185704307d54b0b5d72ce57415c9ece082";
+    sha256 = "0h97i6h525hg401dvvaa5krxi184qpvldbdn0izmirvr9pvh4hkn";
   };
 
   meta = with stdenv.lib; {

From f4b1d118a4b6e799fd20b68b6e5c1d0ed4449b2b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Feb 2020 05:11:18 +0000
Subject: [PATCH 1396/4636] libreswan: 3.29 -> 3.30

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

diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix
index 4c8b926b5827..afe37dc07706 100644
--- a/pkgs/tools/networking/libreswan/default.nix
+++ b/pkgs/tools/networking/libreswan/default.nix
@@ -6,7 +6,7 @@
 
 let
   optional = stdenv.lib.optional;
-  version = "3.29";
+  version = "3.30";
   name = "libreswan-${version}";
   binPath = stdenv.lib.makeBinPath [
     bash iproute iptables procps coreutils gnused gawk nss.tools which python
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://download.libreswan.org/${name}.tar.gz";
-    sha256 = "0gmbb1m5in5dvnbk1n31r8myrdankzvi6yk9gcqbcwijyih423nn";
+    sha256 = "1bww4w5r6hx0xf9xdxvkfmcv7zyas58ls1mklk6k197kv2i0p24w";
   };
 
   # These flags were added to compile v3.18. Try to lift them when updating.

From b5788ccdf3a981e9685e0b1d118307c373974b56 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Feb 2020 03:48:39 +0000
Subject: [PATCH 1397/4636] jruby: 9.2.9.0 -> 9.2.10.0

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

diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index 4e3f92d7cdc2..82624d2272b2 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" "";
 jruby = stdenv.mkDerivation rec {
   pname = "jruby";
 
-  version = "9.2.9.0";
+  version = "9.2.10.0";
 
   src = fetchurl {
     url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
-    sha256 = "04grdf57c1dgragm17yyjk69ak8mwiwfc1vjzskzcaag3fwgplyf";
+    sha256 = "0lwmqyg06rv3iyhmfnqcg4xzaxcfrgjivjrc4ljwb0y629vp16ci";
   };
 
   buildInputs = [ makeWrapper ];

From e4f4fab2c679dbb8903f12f0fd6ac0bbc15e3126 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 23 Feb 2020 03:10:50 +0000
Subject: [PATCH 1398/4636] shairport-sync: 3.3.5 -> 3.3.6

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

diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix
index 99402b3e1be4..af14a3e176c5 100644
--- a/pkgs/servers/shairport-sync/default.nix
+++ b/pkgs/servers/shairport-sync/default.nix
@@ -2,11 +2,11 @@
 , libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }:
 
 stdenv.mkDerivation rec {
-  version = "3.3.5";
+  version = "3.3.6";
   pname = "shairport-sync";
 
   src = fetchFromGitHub {
-    sha256 = "1qaxx1g4dvdx54mc1kw07hm445zij37w6qmkdcwymy13krvsfd4b";
+    sha256 = "0s5aq1a7dmf3n2d6ps6x7xarpn53vvlcbms8k23wl2h5vrx91rwi";
     rev = version;
     repo = "shairport-sync";
     owner = "mikebrady";

From 68481e3a02b05c20b16ea8e5af34eff1dd65993e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 22 Feb 2020 23:56:12 +0000
Subject: [PATCH 1399/4636] nfdump: 1.6.18 -> 1.6.19

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

diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/tools/networking/nfdump/default.nix
index 0ae309cf94d9..256bb8243102 100644
--- a/pkgs/tools/networking/nfdump/default.nix
+++ b/pkgs/tools/networking/nfdump/default.nix
@@ -2,7 +2,7 @@
 , autoconf, automake, libtool, pkg-config
 , bzip2, libpcap, flex, yacc }:
 
-let version = "1.6.18"; in
+let version = "1.6.19"; in
 
 stdenv.mkDerivation {
   pname = "nfdump";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     owner = "phaag";
     repo = "nfdump";
     rev = "v${version}";
-    sha256 = "0hfgj9lghkjrjxww0jdk8gxr6g4gbmbdmfg9ddg5jj6gcra21gha";
+    sha256 = "0idhg7pdkv602h0d0dz7msk8gsxz32ingn16dkqbxp4mgfiakp9r";
   };
 
   nativeBuildInputs = [ autoconf automake flex libtool pkg-config yacc ];
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
     longDescription = ''
       nfdump is a set of tools for working with netflow data.
     '';
-    homepage = https://github.com/phaag/nfdump;
+    homepage = "https://github.com/phaag/nfdump";
     license = licenses.bsd3;
     maintainers = [ maintainers.takikawa ];
     platforms = platforms.unix;

From 0d1d43d49c20a14c253bc73bb1ac2123f2997588 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 21 Feb 2020 20:22:10 -0800
Subject: [PATCH 1400/4636] pythonPackages.psutil: 5.6.7 -> 5.7.0

---
 .../python-modules/psutil/default.nix         | 37 +++++++++++++------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix
index 388716cb7005..59dd94b30188 100644
--- a/pkgs/development/python-modules/psutil/default.nix
+++ b/pkgs/development/python-modules/psutil/default.nix
@@ -1,26 +1,41 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
+{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, python
 , darwin
+, pytest
+, mock
+, ipaddress
 }:
 
 buildPythonPackage rec {
   pname = "psutil";
-  version = "5.6.7";
+  version = "5.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ffad8eb2ac614518bbe3c0b8eb9dffdb3a8d2e3a7d5da51c5b974fb723a5c5aa";
+    sha256 = "03jykdi3dgf1cdal9bv4fq9zjvzj9l9bs99gi5ar81sdl5nc2pk8";
   };
 
-  # No tests in archive
-  doCheck = false;
+  # arch doesn't report frequency is the same way
+  doCheck = stdenv.isx86_64;
+  checkInputs = [ pytest ]
+    ++ lib.optionals isPy27 [ mock ipaddress ];
+  # out must be referenced as test import paths are relative
+  # disable tests which don't work in sandbox
+  # cpu_times is flakey on darwin
+  checkPhase = ''
+    pytest $out/${python.sitePackages}/psutil/tests/test_system.py \
+      -k 'not user \
+          and not disk_io_counters and not sensors_battery \
+          and not cpu_times'
+  '';
 
-  buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.IOKit ];
+  buildInputs = lib.optionals stdenv.isDarwin [ darwin.IOKit ];
 
-  meta = {
+  pythonImportsCheck = [ "psutil" ];
+
+  meta = with lib; {
     description = "Process and system utilization information interface for python";
-    homepage = https://github.com/giampaolo/psutil;
-    license = stdenv.lib.licenses.bsd3;
+    homepage = "https://github.com/giampaolo/psutil";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ jonringer ];
   };
 }

From eda05110a0bf6cad66ef894b373ff86568432fce Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Feb 2020 03:02:29 +0000
Subject: [PATCH 1401/4636] hpx: 1.4.0 -> 1.4.1

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

diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix
index eafd85cc92aa..8e3327d880f9 100644
--- a/pkgs/development/libraries/hpx/default.nix
+++ b/pkgs/development/libraries/hpx/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "hpx";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "STEllAR-GROUP";
     repo = "hpx";
     rev = version;
-    sha256 = "1wkipk7240vqpy8and2r8n7wnqyl4dcn41cyla4zcns2jhbr23vb";
+    sha256 = "0yjsrb11hlfwbiw0xi71ami9nrvz6jwj160h9qgl50icd79ngn46";
   };
 
   buildInputs = [ boost hwloc gperftools ];

From 74f312e042c3fc77343c5334322dd92bb47077bf Mon Sep 17 00:00:00 2001
From: Michael Lingelbach <m.j.lbach@gmail.com>
Date: Sat, 22 Feb 2020 19:06:28 -0800
Subject: [PATCH 1402/4636] python.pkgs.pybullet: 2.6.1 -> 2.6.6

Update static-libs.patch

Add numpy to pybullet propagatedBuildInputs

Added numpy to build inputs
---
 pkgs/development/python-modules/pybullet/default.nix   |  7 +++++--
 .../python-modules/pybullet/static-libs.patch          | 10 +++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix
index d7b46f07749d..e2d391493d2d 100644
--- a/pkgs/development/python-modules/pybullet/default.nix
+++ b/pkgs/development/python-modules/pybullet/default.nix
@@ -3,15 +3,16 @@
 , fetchPypi
 , libGLU, libGL
 , xorg
+, numpy
 }:
 
 buildPythonPackage rec {
   pname = "pybullet";
-  version = "2.6.1";
+  version = "2.6.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c6da064687ae481c73b744b9f3a62d8231349a6bf368d7a2e564f71ef73e9403";
+    sha256 = "1lsvjqij1vb9w8j6lvnq7lppflc7svz4cj37n74q67mb46gq3dxr";
   };
 
   buildInputs = [
@@ -19,6 +20,8 @@ buildPythonPackage rec {
     xorg.libX11
   ];
 
+  propagatedBuildInputs =  [ numpy ];
+
   patches = [
     # make sure X11 and OpenGL can be found at runtime
     ./static-libs.patch
diff --git a/pkgs/development/python-modules/pybullet/static-libs.patch b/pkgs/development/python-modules/pybullet/static-libs.patch
index 08a68b814866..8b58e3659e05 100644
--- a/pkgs/development/python-modules/pybullet/static-libs.patch
+++ b/pkgs/development/python-modules/pybullet/static-libs.patch
@@ -1,13 +1,13 @@
 diff --git a/setup.py b/setup.py
-index 98efabdbf..e69e79084 100644
+index 6f7bd7589..321fc6ab0 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -563,6 +563,8 @@ print("-----")
+@@ -465,6 +465,8 @@ print("-----")
  
  extensions = []
  
 +libraries += [ "X11", "GL" ] # statically link x11 and opengl
 +
- pybullet_ext = Extension("pybullet",
-         sources =  sources,
-         libraries = libraries,
+ pybullet_ext = Extension(
+     "pybullet",
+     sources=sources,

From a9b0ccd68e7ac9ad301c2e3d86dbdd70604ebd0e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 23 Feb 2020 23:22:46 +0100
Subject: [PATCH 1403/4636] diffoscope: 136 -> 137

https://salsa.debian.org/reproducible-builds/diffoscope/-/tags/137
---
 pkgs/tools/misc/diffoscope/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 12e6e1af93ab..9273d82455de 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -9,11 +9,11 @@
 # Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
 python3Packages.buildPythonApplication rec {
   pname = "diffoscope";
-  version = "136";
+  version = "137";
 
   src = fetchurl {
     url    = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
-    sha256 = "0an9c63xgy1bvqnpnn9mfphsq1qx8ba69yk15nqa9p78iqq2hf4h";
+    sha256 = "1qa508nlqvz0s0cd6jk5c8m43kqfx1h2mgx50iphy4y0spnyv946";
   };
 
   patches = [
@@ -69,9 +69,9 @@ python3Packages.buildPythonApplication rec {
       diffoscope is developed as part of the "reproducible builds" Debian
       project and was formerly known as "debbindiff".
     '';
-    homepage    = https://wiki.debian.org/ReproducibleBuilds;
+    homepage    = "https://diffoscope.org/";
     license     = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dezgeg ];
+    maintainers = with maintainers; [ dezgeg ma27 ];
     platforms   = platforms.unix;
   };
 }

From 2ae7a8d710d80f01a439ae1b567005e1e3230d57 Mon Sep 17 00:00:00 2001
From: Tyler Compton <xaviosx@gmail.com>
Date: Sun, 23 Feb 2020 15:08:58 -0800
Subject: [PATCH 1404/4636] go_1_12, go_1_13: remove velovix from maintainers

---
 pkgs/development/compilers/go/1.12.nix | 2 +-
 pkgs/development/compilers/go/1.13.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix
index 78ffa9658752..35bcfa36e993 100644
--- a/pkgs/development/compilers/go/1.12.nix
+++ b/pkgs/development/compilers/go/1.12.nix
@@ -242,7 +242,7 @@ stdenv.mkDerivation rec {
     homepage = http://golang.org/;
     description = "The Go Programming language";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs Frostman ];
+    maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs Frostman ];
     platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix
index 71a056109224..aa8812730323 100644
--- a/pkgs/development/compilers/go/1.13.nix
+++ b/pkgs/development/compilers/go/1.13.nix
@@ -239,7 +239,7 @@ stdenv.mkDerivation rec {
     homepage = http://golang.org/;
     description = "The Go Programming language";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ cstrahan orivej velovix mic92 rvolosatovs kalbasit Frostman ];
+    maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs kalbasit Frostman ];
     platforms = platforms.linux ++ platforms.darwin;
   };
 }

From 9c0ab2f26db26c21950e5c61fb06570cb4c5c79a Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 24 Feb 2020 00:15:36 +0100
Subject: [PATCH 1405/4636] lib/modules.nix: Add file context to unmerged
 values in mergeDefinitions

This helps with troubleshooting exceptions in config values, which were hard
to track down for options with many definitions.
The trace will look like:

    error: while evaluating the attribute 'config.foo' at undefined position:
    [...]
    while evaluating the option `foo':
    [...]
    while evaluating definitions from `/home/user/mymod.nix':
    while evaluating 'dischargeProperties' at /home/user/nixpkgs/lib/modules.nix:464:25, called from /home/user/nixpkgs/lib/modules.nix:392:137:
    while evaluating the attribute 'value' at /home/user/nixpkgs/lib/modules.nix:277:44:
    Value error!

where the `/home/user/mymod.nix` module is

    { lib, ... }: {
      options.foo = lib.mkOption {
        type = lib.types.lines;
      };
      config.foo = builtins.throw "Value error!";
    }
---
 lib/modules.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index 2b1faf4f0c28..6cbef5632bd7 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -389,7 +389,7 @@ rec {
       let
         # Process mkMerge and mkIf properties.
         defs' = concatMap (m:
-          map (value: { inherit (m) file; inherit value; }) (dischargeProperties m.value)
+          map (value: { inherit (m) file; inherit value; }) (builtins.addErrorContext "while evaluating definitions from `${m.file}':" (dischargeProperties m.value))
         ) defs;
 
         # Process mkOverride properties.

From 923b41eab10507440747d6fdfc505086c2dbdde2 Mon Sep 17 00:00:00 2001
From: skykanin <3789764+skykanin@users.noreply.github.com>
Date: Sat, 15 Feb 2020 18:22:35 +0100
Subject: [PATCH 1406/4636] colorz: init at 1.0.3

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

diff --git a/pkgs/tools/misc/colorz/default.nix b/pkgs/tools/misc/colorz/default.nix
new file mode 100644
index 000000000000..aadd050dae2b
--- /dev/null
+++ b/pkgs/tools/misc/colorz/default.nix
@@ -0,0 +1,24 @@
+{ lib, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "colorz";
+  version = "1.0.3";
+
+  src = python3Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "0ghd90lgplf051fs5n5bb42zffd3fqpgzkbv6bhjw7r8jqwgcky0";
+  };
+
+  propagatedBuildInputs = with python3Packages; [ pillow scipy ];
+
+  checkPhase = ''
+    $out/bin/colorz --help > /dev/null
+  '';
+
+  meta = with lib; {
+    description = "Color scheme generator";
+    homepage = "https://github.com/metakirby5/colorz";
+    license = licenses.mit;
+    maintainers = with maintainers; [ skykanin ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94aae7151053..ad0159345cdd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -165,6 +165,8 @@ in
 
   corgi = callPackage ../development/tools/corgi { };
 
+  colorz = callPackage ../tools/misc/colorz { };
+
   dhallToNix = callPackage ../build-support/dhall-to-nix.nix {
     inherit dhall-nix;
   };

From deb4c21865f47027baa3856f2cacee4d0c3ee9a3 Mon Sep 17 00:00:00 2001
From: skykanin <3789764+skykanin@users.noreply.github.com>
Date: Sat, 15 Feb 2020 19:19:49 +0100
Subject: [PATCH 1407/4636] maintainers: add skykanin

---
 maintainers/maintainer-list.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f1d9439fec32..6beba4aa74a7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6648,6 +6648,12 @@
     email = "jot.skrzyp@gmail.com";
     name = "Jakub Skrzypnik";
   };
+  skykanin = {
+    email = "skykanin@users.noreply.github.com";
+    github = "skykanin";
+    githubId = 3789764;
+    name = "skykanin";
+  };
   sleexyz = {
     email = "freshdried@gmail.com";
     github = "sleexyz";
@@ -8103,3 +8109,5 @@
     name = "Asad Saeeduddin";
   };
 }
+
+  

From fa7615023554f6ab140ee0cd7728551beb3be56c Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 23 Feb 2020 18:53:52 -0500
Subject: [PATCH 1408/4636] nixos/rngd: fix clean shutdown

It seems disabling DefaultDependencies
removes these implicit dependencies [0] that
we needed for shutdown to happen cleanly.

Fixes #80871

[0]: https://www.freedesktop.org/software/systemd/man/systemd.service.html#Default%20Dependencies
---
 nixos/modules/security/rngd.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/modules/security/rngd.nix b/nixos/modules/security/rngd.nix
index 5566c53897dc..cffa1a5849f9 100644
--- a/nixos/modules/security/rngd.nix
+++ b/nixos/modules/security/rngd.nix
@@ -37,6 +37,13 @@ in
 
       after = [ "dev-random.device" ];
 
+      # Clean shutdown without DefaultDependencies
+      conflicts = [ "shutdown.target" ];
+      before = [
+        "sysinit.target"
+        "shutdown.target"
+      ];
+
       description = "Hardware RNG Entropy Gatherer Daemon";
 
       # rngd may have to start early to avoid entropy starvation during boot with encrypted swap

From 976aa974354aa7f05d341a33e7c6854a8410f172 Mon Sep 17 00:00:00 2001
From: Brett Lyons <blyons@fastmail.com>
Date: Sun, 23 Feb 2020 17:53:51 -0700
Subject: [PATCH 1409/4636] vimPlugins.notational-fzf-vim: Fix missing runtime
 deps

---
 pkgs/misc/vim-plugins/overrides.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index c115f9b1cd62..cecd53ae8201 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -28,6 +28,9 @@
 
 # vCoolor dependency
 , gnome3
+
+# notational-fzf-vim dependencies
+, ripgrep
 }:
 
 self: super: {
@@ -249,6 +252,17 @@ self: super: {
   ncm2-ultisnips = super.ncm2-ultisnips.overrideAttrs(old: {
     dependencies = with super; [ ultisnips ];
   });
+  
+  notational-fzf-vim = super.notational-fzf-vim.overrideAttrs(old: {
+    dependencies = with self; [ fzf-vim ];
+    patchPhase = ''
+      substituteInPlace plugin/notational_fzf.vim \
+        --replace "'rg'" "'${ripgrep}/bin/rg'" \
+        --replace \
+        "let s:python_executable = executable('pypy3') ? 'pypy3' : 'python3'" \
+        "let s:python_executable = '${python3}/bin/python3'"
+    '';
+  });
 
   fzf-vim = super.fzf-vim.overrideAttrs(old: {
     dependencies = [ self.fzfWrapper ];

From 9ceb05adc029900e9f4e0452dc0955e52c5ddef2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 23 Feb 2020 21:55:49 -0300
Subject: [PATCH 1410/4636] mate.mate-themes: 3.22.20 -> 3.22.21

---
 pkgs/desktops/mate/mate-themes/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index b2a0eea6d5e0..d14bcd728375 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, intltool, mate, gtk2, gtk3,
+{ stdenv, fetchurl, pkgconfig, intltool, mate-icon-theme, gtk2, gtk3,
   gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg }:
 
 stdenv.mkDerivation rec {
   pname = "mate-themes";
-  version = "3.22.20";
+  version = "3.22.21";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/themes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0c3dhf8p9nc2maky4g9xr04iil9wwbdkmhpzynlc6lfg4ksqq2bx";
+    sha256 = "051g2vq817g84yrqzf7hjcqr4xrghnw1rprjd6jf5mhhzmwcas6n";
   };
 
   nativeBuildInputs = [ pkgconfig intltool gtk3 ];
 
-  buildInputs = [ mate.mate-icon-theme gtk2 gtk_engines gdk-pixbuf librsvg ];
+  buildInputs = [ mate-icon-theme gtk2 gtk_engines gdk-pixbuf librsvg ];
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 

From a6f12202d0ed45d32982a6f9cc70786f7814852a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 14 Feb 2020 08:07:38 +0100
Subject: [PATCH 1411/4636] =?UTF-8?q?fwupd:=201.3.7=20=E2=86=92=201.3.8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/fwupd/fwupd/compare/1.3.7...1.3.8
---
 pkgs/os-specific/linux/firmware/fwupd/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index eac2ed4acd00..aa6aeca9549e 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -2,6 +2,7 @@
 
 { stdenv
 , fetchurl
+, fetchpatch
 , substituteAll
 , gtk-doc
 , pkgconfig
@@ -87,11 +88,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "fwupd";
-  version = "1.3.7";
+  version = "1.3.8";
 
   src = fetchurl {
     url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
-    sha256 = "02mzn3whk5mba4nxyrkypawr1gzjx79n4nrkhrp8vja6mxxgsf10";
+    sha256 = "14hbwp3263n4z61ws62vj50kh9a89fz2l29hyv7f1xlas4zz6j8x";
   };
 
   # libfwupd goes to lib
@@ -162,6 +163,12 @@ stdenv.mkDerivation rec {
       # needs a different set of modules than po/make-images
       inherit installedTestsPython;
     })
+
+    # Find the correct lds and crt name when specifying -Defi_ldsdir
+    (fetchpatch {
+      url = "https://github.com/fwupd/fwupd/commit/52cda3db9ca9ab4faf99310edf29df926a713b5c.patch";
+      sha256 = "0hsj79dzamys7ryz33iwxwd58kb1h7gaw637whm0nkvzkqq6rm16";
+    })
   ];
 
   postPatch = ''

From 10c7a4d1764c198586ba62b0516def1a04c1e076 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 24 Feb 2020 03:10:20 +0100
Subject: [PATCH 1412/4636] =?UTF-8?q?rictydiminished-with-firacode:=201.2.?=
 =?UTF-8?q?0=20=E2=86=92=201.2.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rictydiminished-with-firacode/default.nix   | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
index bf19fb8238ff..ccfc72dc1809 100644
--- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
+++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchgit, fontforge, python2, python3 }:
+{ stdenv, fetchgit, fontforge, python3 }:
 
 stdenv.mkDerivation rec {
   pname = "rictydiminished-with-firacode";
-  version = "1.2.0";
+  version = "1.2.2";
 
   src = fetchgit {
     url = "https://github.com/hakatashi/RictyDiminished-with-FiraCode.git";
     rev = version;
-    sha256 = "1vlzx5dsx6j9d9q84pdnwcxjy7mr1sv8sacx0zgfxhxnj66n1gnn";
+    sha256 = "sha256-twh3yLAM4MUjWzSDNmo8gNIRf01hieXeOS334sNdFk4=";
     fetchSubmodules = true;
   };
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     substituteInPlace apply-feature.py --replace \
       'ricty = ttLib.TTFont(options.in_font)' \
       'ricty = ttLib.TTFont(options.in_font, recalcTimestamp=False)'
-    substituteInPlace build-py3.py --replace \
+    substituteInPlace build.py --replace \
       'datetime.date.today()' \
       'datetime.date.fromtimestamp(float(os.environ["SOURCE_DATE_EPOCH"]))'
   '';
@@ -30,21 +30,16 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    # Python 3 not supported by parts of the build system
-    # https://github.com/hakatashi/RictyDiminished-with-FiraCode/pull/3
-    (fontforge.override {
-      python = python2;
-    })
     (python3.withPackages (ps: [
       ps.jinja2
-      ps.py3to2
       ps.fonttools
+      ps.fontforge
     ]))
   ];
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/hakatashi/RictyDiminished-with-FiraCode";
-    description = "The best Japanese programming font meets the awesone ligatures of Firacode";
+    description = "The best Japanese programming font meets the awesome ligatures of Firacode";
     license = licenses.ofl;
     platforms = platforms.all;
     maintainers = with maintainers; [ mt-caret ];

From a3ac72c33793b046297cf6d81beb45dc4c202af1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Feb 2020 03:35:34 +0000
Subject: [PATCH 1413/4636] ocamlPackages.uri: 3.0.0 -> 3.1.0

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

diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix
index e17e99cdc67c..cfbcc27ba9cc 100644
--- a/pkgs/development/ocaml-modules/uri/default.nix
+++ b/pkgs/development/ocaml-modules/uri/default.nix
@@ -4,11 +4,11 @@
 
 buildDunePackage rec {
   pname = "uri";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
-    sha256 = "1yhrgm3hbn0hh4jdmcrvxinazgg8vrm0vn425sg8ggzblvxk9cwg";
+    sha256 = "0hxc2mshmqxz2qmjya47dzf858s6lsf3xvqswpzprkvhv0zq4ln4";
   };
 
   buildInputs = [ ounit ];

From 9bdb928d360530119860eee1be545bc79a869fb9 Mon Sep 17 00:00:00 2001
From: Harry Ying <lexugeyky@outlook.com>
Date: Mon, 24 Feb 2020 13:32:11 +0800
Subject: [PATCH 1414/4636] maintainers: add lexuge

---
 maintainers/maintainer-list.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6beba4aa74a7..ebc4937a001c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4107,6 +4107,16 @@
     githubId = 3425311;
     name = "Antoine Eiche";
   };
+  lexuge = {
+    name = "Harry Ying";
+    email = "lexugeyky@outlook.com";
+    github = "LEXUGE";
+    githubId = 13804737;
+    keys = [{
+      longkeyid = "rsa4096/0xAE53B4C2E58EDD45";
+      fingerprint = "7FE2 113A A08B 695A C8B8  DDE6 AE53 B4C2 E58E DD45";
+    }];
+  };
   lheckemann = {
     email = "git@sphalerite.org";
     github = "lheckemann";

From 5c11e174b243849bf896cf68a445f8564cbfd8cb Mon Sep 17 00:00:00 2001
From: Guillaume Bouchard <guillaume.bouchard@tweag.io>
Date: Mon, 3 Feb 2020 11:52:40 +0100
Subject: [PATCH 1415/4636] pythonPackages.pyopengl: fix runtime shared library
 loading failure

This closes #76822.

pyopengl 3.1.4 introduced a new logic for shared library loading: it
tests a few combinations of library name and suffix (such as .so.X).

Our previous patch was just replacing the library name (e.g. 'glut') by
the full path to the nix store. This does not work anymore with pyopengl
3.1.4 new heuristic.

This commit just keep the behavior of pyopengl but adds the nix store
path to the list of tried paths.
---
 pkgs/development/python-modules/pyopengl/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix
index a425fcf5be96..ed643eb21983 100644
--- a/pkgs/development/python-modules/pyopengl/default.nix
+++ b/pkgs/development/python-modules/pyopengl/default.nix
@@ -19,6 +19,8 @@ buildPythonPackage rec {
 
   patchPhase = let
     ext = stdenv.hostPlatform.extensions.sharedLibrary; in ''
+    # Theses lines are patching the name of dynamic libraries
+    # so pyopengl can find them at runtime.
     substituteInPlace OpenGL/platform/glx.py \
       --replace "'GL'" "'${pkgs.libGL}/lib/libGL${ext}'" \
       --replace "'GLU'" "'${pkgs.libGLU}/lib/libGLU${ext}'" \
@@ -26,6 +28,16 @@ buildPythonPackage rec {
     substituteInPlace OpenGL/platform/darwin.py \
       --replace "'OpenGL'" "'${pkgs.libGL}/lib/libGL${ext}'" \
       --replace "'GLUT'" "'${pkgs.freeglut}/lib/libglut${ext}'"
+
+    # https://github.com/NixOS/nixpkgs/issues/76822
+    # pyopengl introduced a new "robust" way of loading libraries in 3.1.4.
+    # The later patch of the filepath does not work anymore because
+    # pyopengl takes the "name" (for us: the path) and tries to add a
+    # few suffix during its loading phase.
+    # The following patch put back the "name" (i.e. the path) in the
+    # list of possible files.
+    substituteInPlace OpenGL/platform/ctypesloader.py \
+      --replace "filenames_to_try = []" "filenames_to_try = [name]"
   '';
 
   # Need to fix test runner

From 99e0ed1339bc58ccf7fdd0eb2fba221a5b7f78cb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Feb 2020 00:43:25 +0000
Subject: [PATCH 1416/4636] mnemosyne: 2.7 -> 2.7.1

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

diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix
index 5c65203c93a6..2fb675359511 100644
--- a/pkgs/games/mnemosyne/default.nix
+++ b/pkgs/games/mnemosyne/default.nix
@@ -5,11 +5,11 @@
 
 python.pkgs.buildPythonApplication rec {
   pname = "mnemosyne";
-  version = "2.7";
+  version = "2.7.1";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/mnemosyne-proj/mnemosyne/mnemosyne-${version}/Mnemosyne-${version}.tar.gz";
-    sha256 = "0lx70vl3pa3c42lr59s459b2bqi7fm0c80lsm06l34ggfwdadq24";
+    sha256 = "0dhvg9cxc6m6kzk75h363h1g0bl80cqz11cijh0zpz9f4w6lnqsq";
   };
 
   nativeBuildInputs = with python.pkgs; [ wrapPython pyqtwebengine.wrapQtAppsHook ];
@@ -46,7 +46,7 @@ python.pkgs.buildPythonApplication rec {
   '';
 
   meta = {
-    homepage = https://mnemosyne-proj.org/;
+    homepage = "https://mnemosyne-proj.org/";
     description = "Spaced-repetition software";
     longDescription = ''
       The Mnemosyne Project has two aspects:

From 9ad04f069c2df6a5a212a404a2a6177dc8f5a8f8 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 23 Feb 2020 04:20:00 -0500
Subject: [PATCH 1417/4636] vazir-fonts: 19.2.0 -> 22.1.0

---
 pkgs/data/fonts/vazir-fonts/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/vazir-fonts/default.nix b/pkgs/data/fonts/vazir-fonts/default.nix
index f39867538099..a41013fd490c 100755
--- a/pkgs/data/fonts/vazir-fonts/default.nix
+++ b/pkgs/data/fonts/vazir-fonts/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "vazir-fonts";
-  version = "19.2.0";
+  version = "22.1.0";
 in fetchFromGitHub {
   name = "${pname}-${version}";
 
@@ -12,12 +12,12 @@ in fetchFromGitHub {
 
   postFetch = ''
     tar xf $downloadedFile --strip=1
-    find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/vazir-fonts {} \;
+    find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \;
   '';
-  sha256 = "008h095rjrcjhz9h02v6cf3gv64khj21lii4zffgpdlmvfs29f8l";
+  sha256 = "1nh3pyyw3082aizdwgyihh4z122z7kzp45ry7lzdhq9lshkpzglc";
 
   meta = with lib; {
-    homepage = https://github.com/rastikerdar/vazir-font;
+    homepage = "https://github.com/rastikerdar/vazir-font";
     description = "A Persian (Farsi) Font - قلم (فونت) فارسی وزیر";
     license = licenses.ofl;
     platforms = platforms.all;

From 8cbb538be5fc6422d4ba292bc2586ea3ee92474a Mon Sep 17 00:00:00 2001
From: Jesse Wattenbarger <jwatt@broken.watch>
Date: Sun, 23 Feb 2020 21:39:43 -0500
Subject: [PATCH 1418/4636] devede: Add needed setuptools dependency

- devede_ng.py fails trying to import pkg_resources in a clean env w/o python3.7 installed
- Adding setuptools (which has pkg_resources) to the dependencies seems to fix it
---
 pkgs/applications/video/devede/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix
index 388476cbf8e7..aee6fab77a23 100644
--- a/pkgs/applications/video/devede/default.nix
+++ b/pkgs/applications/video/devede/default.nix
@@ -2,7 +2,7 @@
 , gtk3, gettext, wrapGAppsHook, gdk-pixbuf, gobject-introspection }:
 
 let
-  inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3;
+  inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3 setuptools;
 
 in buildPythonApplication {
   name = "devede-4.8.8";
@@ -34,7 +34,7 @@ in buildPythonApplication {
   ];
 
   propagatedBuildInputs = [
-    gtk3 pygobject3 gdk-pixbuf dbus-python ffmpeg mplayer dvdauthor vcdimager cdrkit urllib3
+    gtk3 pygobject3 gdk-pixbuf dbus-python ffmpeg mplayer dvdauthor vcdimager cdrkit urllib3 setuptools
   ];
 
   postPatch = ''

From 2f893b54bb37c6b628a835131c573813b42e2707 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Sun, 23 Feb 2020 13:05:13 +0000
Subject: [PATCH 1419/4636] pythonPackages.importlib-metadata: 1.3.0 -> 1.5.0

---
 .../python-modules/importlib-metadata/default.nix      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix
index 5b7a249d65a7..f22354e41b5c 100644
--- a/pkgs/development/python-modules/importlib-metadata/default.nix
+++ b/pkgs/development/python-modules/importlib-metadata/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "importlib-metadata";
-  version = "1.3.0";
+  version = "1.5.0";
 
   src = fetchPypi {
     pname = "importlib_metadata";
     inherit version;
-    sha256 = "0ibvvqajphwdclbr236gikvyja0ynvqjlix38kvsabgrf0jqafh7";
+    sha256 = "00ikdj4gjhankdljnz7g5ggak4k9lql2926x0x117ir9j2lv7x86";
   };
 
   nativeBuildInputs = [ setuptools_scm ];
@@ -28,6 +28,12 @@ buildPythonPackage rec {
 
   checkInputs = [ importlib-resources packaging ];
 
+  # removing test_main.py - it requires 'pyflakefs'
+  # and adding `pyflakefs` to `checkInputs` causes infinite recursion.
+  preCheck = ''
+    rm importlib_metadata/tests/test_main.py
+  '';
+
   meta = with lib; {
     description = "Read metadata from Python packages";
     homepage = https://importlib-metadata.readthedocs.io/;

From 6d92e54174c449b4605db34fbba78b43be6b5335 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Mon, 20 Jan 2020 17:37:11 +0100
Subject: [PATCH 1420/4636] nixos/transmission: Allow others to read the
 directory

Directory mode 755 is standard for running services. Without this,
downloadDirPermissions doesn't have any use since other users can't even
look inside the main transmission directory
---
 nixos/modules/services/torrent/transmission.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index 5ba72e8d7730..fd28b94f7be3 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -23,7 +23,8 @@ let
     for DIR in "${homeDir}" "${settingsDir}" "${fullSettings.download-dir}" "${fullSettings.incomplete-dir}"; do
       mkdir -p "$DIR"
     done
-    chmod 700 "${homeDir}" "${settingsDir}"
+    chmod 755 "${homeDir}"
+    chmod 700 "${settingsDir}"
     chmod ${downloadDirPermissions} "${fullSettings.download-dir}" "${fullSettings.incomplete-dir}"
     cp -f ${settingsFile} ${settingsDir}/settings.json
   '';

From f75906dbc99c0fbb87ac47e4f42c4982c8835b1e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Feb 2020 08:23:01 +0000
Subject: [PATCH 1421/4636] python27Packages.gssapi: 1.6.1 -> 1.6.2

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

diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix
index 00c9b86c5eba..622360edd24e 100644
--- a/pkgs/development/python-modules/gssapi/default.nix
+++ b/pkgs/development/python-modules/gssapi/default.nix
@@ -18,13 +18,13 @@
 
 buildPythonPackage rec {
   pname = "gssapi";
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "pythongssapi";
     repo = "python-${pname}";
     rev = "v${version}";
-    sha256 = "0n13vb3v50vr04vrnql2w00gri0gcf08i0pr0q2p4w8scbsw7kjk";
+    sha256 = "195x3zqzyv491i9hf7l4asmic5pb2w3l1r7bps89651wkb3mrz1l";
   };
 
   # It's used to locate headers
@@ -63,7 +63,7 @@ buildPythonPackage rec {
   '';
 
   meta = with lib; {
-    homepage = https://pypi.python.org/pypi/gssapi;
+    homepage = "https://pypi.python.org/pypi/gssapi";
     description = "Python GSSAPI Wrapper";
     license = licenses.mit;
   };

From 193c58489ec31d58cf2bbb66ea9aeec0ef4d51a8 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 24 Feb 2020 00:14:17 -0800
Subject: [PATCH 1422/4636] pythonPackages.locustio: 0.9.0 -> 0.14.4

disable python3.8 version, as tests hang indefinitely
---
 .../python-modules/locustio/default.nix       | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/locustio/default.nix b/pkgs/development/python-modules/locustio/default.nix
index 2203fa4c6ad0..0b64fc39feb7 100644
--- a/pkgs/development/python-modules/locustio/default.nix
+++ b/pkgs/development/python-modules/locustio/default.nix
@@ -1,17 +1,18 @@
-{ buildPythonPackage
-, fetchFromGitHub
-, mock
-, unittest2
-, msgpack
-, requests
+{ buildPythonPackage, fetchFromGitHub, isPy38
 , flask
 , gevent
+, mock
+, msgpack
 , pyzmq
+, requests
+, unittest2
 }:
 
 buildPythonPackage rec {
   pname = "locustio";
-  version = "0.9.0";
+  version = "0.14.4";
+  # tests hang on python38
+  disabled = isPy38;
 
   src = fetchFromGitHub {
     owner = "locustio";
@@ -21,10 +22,14 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ msgpack requests flask gevent pyzmq ];
-  buildInputs = [ mock unittest2 ];
+  checkInputs = [ mock unittest2 ];
+  # remove file which attempts to do GET request
+  preCheck = ''
+    rm locust/test/test_stats.py
+  '';
 
   meta = {
-    homepage = https://locust.io/;
+    homepage = "https://locust.io/";
     description = "A load testing tool";
   };
 }

From 5d9266266d60d2182129f8378731c292c312f1d6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Feb 2020 08:42:09 +0000
Subject: [PATCH 1423/4636] python27Packages.jug: 1.6.9 -> 2.0.0

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

diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix
index ad26b62931d8..e96950c496cc 100644
--- a/pkgs/development/python-modules/jug/default.nix
+++ b/pkgs/development/python-modules/jug/default.nix
@@ -5,7 +5,7 @@
 
 buildPythonPackage rec {
   pname = "Jug";
-  version = "1.6.9";
+  version = "2.0.0";
   buildInputs = [ nose numpy ];
   propagatedBuildInputs = [
     bottle
@@ -18,13 +18,13 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0193hp8ap6caw57jdch3vw0hl5m8942lxhjdsfaxk4bfb239l5kz";
+    sha256 = "1am73pis8qrbgmpwrkja2qr0n9an6qha1k1yp87nx6iq28w5h7cv";
   };
 
   meta = with stdenv.lib; {
     description = "A Task-Based Parallelization Framework";
     license = licenses.mit;
-    homepage = https://jug.readthedocs.io/;
+    homepage = "https://jug.readthedocs.io/";
     maintainers = with maintainers; [ luispedro ];
   };
 }

From 6036633e2b4aefec698d2f7a4cf1ce4c182bc4bb Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 16 Feb 2020 15:24:43 +0100
Subject: [PATCH 1424/4636] =?UTF-8?q?ocamlPackages.ppx=5Ftools:=205.3=20?=
 =?UTF-8?q?=E2=86=92=206.{0,1}?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/ppx_tools/default.nix       | 45 ++++++++++++-------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix
index 984906342bc5..8173fc87aba1 100644
--- a/pkgs/development/ocaml-modules/ppx_tools/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib }:
+{ stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib }:
 
 let param = {
   "4.02" = {
@@ -24,18 +24,39 @@ let param = {
     version = "5.3+4.08.0";
     sha256 = "0vdmhs3hpmh5iclx4lzgdpf362m4l35zprxs73r84z1yhr4jcr4m"; };
   "4.09" = {
-    version = "5.3+4.08.0";
-    sha256 = "0vdmhs3hpmh5iclx4lzgdpf362m4l35zprxs73r84z1yhr4jcr4m"; };
+    version = "6.0+4.08.0";
+    sha256 = "056cmdajap8mbb8k0raj0cq0y4jf7pf5x0hlivm92w2v7xxf59ns"; };
+  "4.10" = {
+    version = "6.1+4.10.0";
+    sha256 = "0ccx2g4zpwnv52bbzhgxji1nvzmn80jwiqalwwc4s60i9qg51llw"; };
 }.${ocaml.meta.branch};
 in
-  stdenv.mkDerivation {
-    name = "ocaml${ocaml.version}-ppx_tools-${param.version}";
-    src = fetchFromGitHub {
+
+let src = fetchFromGitHub {
       owner = "alainfrisch";
-      repo = "ppx_tools";
-      rev = if param ? rev then param.rev else param.version;
+      repo = pname;
+      rev = param.rev or param.version;
       inherit (param) sha256;
     };
+    pname = "ppx_tools";
+    meta = with stdenv.lib; {
+      description = "Tools for authors of ppx rewriters";
+      homepage = http://www.lexifi.com/ppx_tools;
+      license = licenses.mit;
+      maintainers = with maintainers; [ vbgl ];
+    };
+in
+if stdenv.lib.versionAtLeast param.version "6.0"
+then
+  buildDunePackage {
+    inherit pname src meta;
+    inherit (param) version;
+  }
+else
+  stdenv.mkDerivation {
+    name = "ocaml${ocaml.version}-${pname}-${param.version}";
+
+    inherit src;
 
     nativeBuildInputs = [ ocaml findlib ];
     buildInputs = [ ocaml findlib ];
@@ -44,11 +65,5 @@ in
 
     dontStrip = true;
 
-    meta = with stdenv.lib; {
-      description = "Tools for authors of ppx rewriters";
-      homepage = http://www.lexifi.com/ppx_tools;
-      license = licenses.mit;
-      platforms = ocaml.meta.platforms or [];
-      maintainers = with maintainers; [ vbgl ];
-    };
+    meta = meta // { inherit (ocaml.meta) platforms; };
   }

From 0507717aae26fc5b8a7ac24b926e985e9fb55cd0 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 23 Feb 2020 04:20:00 -0500
Subject: [PATCH 1425/4636] flow: 0.118.0 -> 0.119.0

Changelog: https://github.com/facebook/flow/releases/tag/v0.119.0
---
 pkgs/development/tools/analysis/flow/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 1efbaa2c0ffd..4772a0e2308e 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flow";
-  version = "0.118.0";
+  version = "0.119.0";
 
   src = fetchFromGitHub {
     owner  = "facebook";
     repo   = "flow";
     rev    = "refs/tags/v${version}";
-    sha256 = "103dgj61qhbqzfgqjbcww2bfipk894glj9xjg1r2zwfsgpxy6x26";
+    sha256 = "0myvhdanhwljqa3irmkkdchd81416xnh9w0mgdajyh4az4safc1k";
   };
 
   installPhase = ''

From 21a3b141c36b6267b893a1136e650e4297990446 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 24 Feb 2020 10:16:26 +0100
Subject: [PATCH 1426/4636] nix-fallback-paths.nix: Fix x86_64-linux path

https://github.com/NixOS/nix/issues/3370
---
 nixos/modules/installer/tools/nix-fallback-paths.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 72b5850a4d92..2068f27f1c9f 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,5 +1,5 @@
 {
-  x86_64-linux = "/nix/store/68mycwwczrciryylq2a66jwfhxp09zsg-nix-2.3.3-debug";
+  x86_64-linux = "/nix/store/ddmmzn4ggz1f66lwxjy64n89864yj9w9-nix-2.3.3";
   i686-linux = "/nix/store/5axys7hsggb4282dsbps5k5p0v59yv13-nix-2.3.3";
   aarch64-linux = "/nix/store/k80nwvi19hxwbz3c9cxgp24f1jjxwmcc-nix-2.3.3";
   x86_64-darwin = "/nix/store/lrnvapsqmf0ja6zfyx4cpxr7ahdr7f9b-nix-2.3.3";

From 53a5d6918a35f68cdd6920a74295d606794a5977 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 24 Feb 2020 04:20:00 -0500
Subject: [PATCH 1427/4636] postgresqlPackages.postgis: 3.0.0 -> 3.0.1

Release notes: https://postgis.net/2020/02/20/postgis-3.0.1/
---
 pkgs/servers/sql/postgresql/ext/postgis.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
index c7bceb232f66..70ba715cf66e 100644
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -14,13 +14,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "postgis";
-  version = "3.0.0";
+  version = "3.0.1";
 
   outputs = [ "out" "doc" ];
 
   src = fetchurl {
     url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";
-    sha256 = "15557fbk0xkngihwhqsbdyz2ng49blisf5zydw81j0gabk6x4vy0";
+    sha256 = "0lv37v8f3143kfm9sdvw59461q2lndxiqvaw47lvmnaha7wk4m2s";
   };
 
   buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ]

From 9a3e3037d65ce7db2c4d80fca652eadb94faed38 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Feb 2020 09:40:26 +0000
Subject: [PATCH 1428/4636] python27Packages.datadog: 0.33.0 -> 0.34.1

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

diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix
index 6dc19a17462d..204a14eb0da8 100644
--- a/pkgs/development/python-modules/datadog/default.nix
+++ b/pkgs/development/python-modules/datadog/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "datadog";
-  version = "0.33.0";
+  version = "0.34.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bce73f33a4496b004402baa502251150e3b48a48f610ff89d4cd110b366ee0ab";
+    sha256 = "1msi3wm0khmzh0ad7lwd5gigmqrxj25hd4w0qrsarihmd4ywrn1v";
   };
 
   postPatch = ''
@@ -25,6 +25,6 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "The Datadog Python library";
     license = licenses.bsd3;
-    homepage = https://github.com/DataDog/datadogpy;
+    homepage = "https://github.com/DataDog/datadogpy";
   };
 }

From 39892985b00987c9bce89310b6d6b5d02d04daa5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 24 Feb 2020 10:52:45 +0100
Subject: [PATCH 1429/4636] nixFlakes: 2.4pre20200207_d2032ed ->
 2.4pre20200220_4a4521f

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 06e987f6f2bc..eed14a129785 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -197,10 +197,10 @@ in rec {
 
   nixFlakes = lib.lowPrio (callPackage common rec {
     name = "nix-2.4${suffix}";
-    suffix = "pre20200207_d2032ed";
+    suffix = "pre20200220_4a4521f";
     src = fetchurl {
-      url = "https://hydra.nixos.org/build/111815420/download/3/nix-2.4${suffix}.tar.xz";
-      sha256 = "e72a20efeee4ccc704cca3a06de9185fb8742bc7ef1a62af5896ec0f379b9ceb";
+      url = "https://hydra.nixos.org/build/113373394/download/3/nix-2.4${suffix}.tar.xz";
+      sha256 = "31fe87c40f40a590bc8f575283725d5f04ecb9aebb6b404f679d77438d75265d";
     };
 
     inherit storeDir stateDir confDir boehmgc;

From 56e6074c07b83cfd04384214e06aaf20ca9f4631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 22 Feb 2020 20:21:10 +0000
Subject: [PATCH 1430/4636] netdata: fix openldap plugin

---
 pkgs/tools/system/netdata/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index 714efb918539..482e6253a52a 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -1,6 +1,6 @@
 { stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkgconfig
 , CoreFoundation, IOKit, libossp_uuid
-, curl, libcap,  libuuid, lm_sensors, zlib
+, curl, libcap,  libuuid, lm_sensors, zlib, fetchpatch
 , withCups ? false, cups
 , withDBengine ? true, libuv, lz4, judy
 , withIpmi ? (!stdenv.isDarwin), freeipmi
@@ -36,6 +36,11 @@ in stdenv.mkDerivation rec {
 
   patches = [
     ./no-files-in-etc-and-var.patch
+    # part of the next release
+    (fetchpatch {
+      url = "https://github.com/netdata/netdata/commit/5c992b7d92cf008ce91627efccf8644732db1f87.patch";
+      sha256 = "1nvbmhy5rir4kw77dhx1qr0l0wcspakr7z7ivva1ilz1aml8nbnm";
+    })
   ];
 
   NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1";

From 10bdcdd80064aeafd48551de8615011eff122c42 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Mon, 24 Feb 2020 10:41:31 +0000
Subject: [PATCH 1431/4636] firefox-beta-bin: 73.0b3 -> 74.0b7

---
 .../browsers/firefox-bin/beta_sources.nix     | 770 +++++++++---------
 1 file changed, 385 insertions(+), 385 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index d7d840de8d60..67936928d297 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,965 +1,965 @@
 {
-  version = "73.0b3";
+  version = "74.0b7";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ach/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ach/firefox-74.0b7.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "2cf55dffbab78993b9be7e4f78a8143c813114177a018b79f0e0973bd842847ad2a7f58d0626be8aac79ba586f8c8d8f26dce1c00781d8f3eebe941d951bfd52";
+      sha512 = "371391df688dab86c5126b1af61cdd94a05ffe5fd001c465406000f5d50eb66bbb24d0d18e4b4d4293f06f02913344ed6ab1241841441dbd9696e20ae806efc8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/af/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/af/firefox-74.0b7.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "838f46238f86bcf4a19170303a3fdd2b427f9e2f7b16ea4e4fdb9f79ef9c86ebe61b402d84499ee0a791a758f521908b30f6970a5310c69364dcfc6a94caafe3";
+      sha512 = "8ae751f86a6cef220e586f64fe0253a9d86b69c90034665ea94bcaa9981b2a9e8844988a8940853f58837577c00a275b8f5c316bab51709c829b0135524e372a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/an/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/an/firefox-74.0b7.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "d8af28cec80715e1a8ac73eedebcd207bc5ea02a0fea48d92648776597da83be38325b858f9366cf135441b49511f3071cb61237ae2951076c23288741b0b051";
+      sha512 = "a141d87b3e9d447174b34b8c835542d2287f88fda576171a86147251331b2dff62d1ac404566bf98348cf8d9ecd21c48be5b06fa989cfb276fe9ddca3aa35852";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ar/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ar/firefox-74.0b7.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "b9a0b00fc4f83706928da2260547bed62f58e3b113b57a020682bb647ed2eb2670912dff48db18a4bd3f54dda98d0158039c4de9a828205d85032a2cc77a52ec";
+      sha512 = "e964ce1088b8e129d66bdf815a0585ad1861b77c36106c088774f642f687b0097fbbc22cea7b8b7fac8598ea6e076ff74c41804333788ddbde2fa80d8e466e36";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ast/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ast/firefox-74.0b7.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "77576261a8ac6c76d7cbe72b833cbd4f4cda70142468277a84ab8947553bba570e7094110d04d76beb20f6d97def6b99d4ed7be65c8b34655d6df763f998ffde";
+      sha512 = "8833edd124f20d62213f8e22925caecad4b5cff3b6bdad997930c60a351da87dbd4d4516c441570a621314dc1d86666448c1de95bfa7a84ed1d0494088529a83";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/az/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/az/firefox-74.0b7.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "ae84dbf5348c6b9e37694ffbb0645be5dc70866cc093923865050b524f500ad6893a547f131a0a07069b09a1d9eb693a7cd9a643813f57701bd40ea3c61ef92b";
+      sha512 = "04856c83309a1f1c0f8ac99e998495702fa70d0dc65f6adf7a21f81e96da016dcd9b4c8d3363bff03f0bedeedcadd9fc101c54500f3b319f5e1e09269a283997";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/be/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/be/firefox-74.0b7.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "19aa8077fa3e7795b2af8381a14935a8af344b9c2d539840c488153adf9e929fed877fe860c6fef878b3eb9d7a85c0bf5915975e9243220c2075bbf165c70f4d";
+      sha512 = "cbf7858cc233b87163fd985396367dd6459cbfdfbfdbd54d3bcf9419233f03934011f1df9381725c250d6b69bb02a5b7c4a752d1d282e358998494d74c6385bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/bg/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/bg/firefox-74.0b7.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "5a96793fe865eba35f90c38c5fd8b0d62f81e9922f39d25f3791f04514cbda86a123b23e6eb90117af0b1fe5b64b85d644a83e279a45055d4de78647541689e4";
+      sha512 = "4d142b7dc4ae68106a39196d79c92ed857354e1a4896ec30b94de26a764da07434b713faf7ddc74886e20735969b5b2dc316f9ac1b5a57b43545d9282a675441";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/bn/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/bn/firefox-74.0b7.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha512 = "b6e095346e9151f86887bed103e0bae70a1dd3bd6fa2a227809569f96656ba6c2d57327b24af6e1e87d45cf956641ae8b2de81fcbcbc91ecac6fc5ba4f2fc64b";
+      sha512 = "916a3f4f76a944ffd13d26d630985e85bfea416d714ff95423a0761341e569a2100397ee06c32005c3f98f7926a1dba6cde817a1d94f638168edab2005c5ad63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/br/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/br/firefox-74.0b7.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "861730396b2d3c7ca0dde9bf018b60e2b2ba8b929a124f86ac474c1852f07290a01c5351b82fb8f858d98e1867146cccbf7ca3527546804328983f34be65d505";
+      sha512 = "d127065bfd273aae19cc9194a2f5df9a4ae797f9d1b2c8bf50df0fd177c4cc5651e5acc752ee45aeaf1b6bc419680de0a55d8c022df71fbcb6a2188b9fd99207";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/bs/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/bs/firefox-74.0b7.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "b667afb631a2afd6555fc9efeb4b72b804d29e9a4567318e56cb3f367beb523a7acb2ca39144077412ac611574ba766aa1749f964dc60a56140e26a05824b95f";
+      sha512 = "0b4706f44d63070e2d0438c0fe43d9f157cc770c6777df17e71243a6c7a9ee694aca554de5a7857dc8f450acdcde93a5c75a874cdb7cfa46d16d39b3cd97d791";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ca-valencia/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ca-valencia/firefox-74.0b7.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha512 = "511b6c6085b9fe321f65fa385e354025096cbdafd87998b90166d51d568e7f9e1065e69f94f358976141477d4edb4b04307e00d0b6a558f7025f9482f0c910c0";
+      sha512 = "73103b02b91cf205d0cd69e0af10bf7c864062703f4b11a4c47beffeeb656aa8e73796f30edcb458382bd31c728b28ce2a122681aee5b41db666cb3c647e76ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ca/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ca/firefox-74.0b7.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "2e7c3dee71bac0ff2ada5f7332cd5d32e00d4890a9c4ee3d31b804b3433812069050649fbfaefd8a71c1a7ad53fd781beccf10cfbb5b789860704e52501b0bf2";
+      sha512 = "6bef2c5a242d7cdbe511cdb4491fae34c5897900b5a61aaad34f6511916fdd937f39fe53c29249eb0309191a5f7c7ba3c2c6e44522bc3033c0adb6086967bcfc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/cak/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/cak/firefox-74.0b7.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "d1e8f3792249b65202bf3f05ac710a5e163264c04e71ee218914434852ff91698584b7074f19ea2446db464d57e722250db5a9ace64ffc4fc6d29e1b6e1354f9";
+      sha512 = "91893441b0ca1ad8d2887a52569374ec4fa51522bdff7b468fb2664414406b54ee6910c5c9fdc70b2b9ec502c999829594c24a20240acdf2f2fef7dda06e7e2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/cs/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/cs/firefox-74.0b7.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "df94e13955565f01735deb81a49e50536c02dc573908481ece70bce78d6d78507e7be635d046cae6f18bbf3995d0e9488bf908c1577099242961c6740f145f4c";
+      sha512 = "dd1da900168651d2ed545f1084f2968f7678b462773f2547a11034360170d981ba9bd813d9392ade20755e72145eaf6c1e6d0b6e2d128d1f884f0d8756d49227";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/cy/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/cy/firefox-74.0b7.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "f9a296e3caf6a095933637510ee6f327496bbb530c0e459c2aae297b60d5c41f678f8fc705baf105ce6183511bea7d6bd88ead342e1d97bc1a036e8f834edaf7";
+      sha512 = "a7a343140c7fb381278de6475fb5204ac4d38eb07bc3813b1d84f649e69aea3807336831cf364a4a90aa8c6c6d54a202da764f59ad70c8e5509866fcf3e8e1dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/da/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/da/firefox-74.0b7.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "64242fad2236821d169ab2691850d4c24877c1a7a4643d142cd3eb4abad72cd15e6a8c0c9c2bc1d09ef8f7f0e189c300fd3749654d39d72b9941b114d4c3ac98";
+      sha512 = "e0ed22aff77496deb13843e7907e8c02f86ff9b73aa97236aff4d1ea1c6127ceb69cf7722fad2dc8a3766d863b7f728fb0ae29f64cdfb0209bc41d9db9700ee3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/de/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/de/firefox-74.0b7.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "fe5b87df4baa2bd2dd87f42d8c2ae203f25bb7e7fe6ca6b04a8a9e18cd1cd95b508ce91c7567f974a48548f0f5fe2cccb89024ccd3131b3f2b54c82c3bdf5e2e";
+      sha512 = "a8234fcd9d02f7ca55c99ad2bb8584f525196670111e9dc4fe8c28d3592030cf98a4619939408853f04f004828c15269ba1ab0b63b97fe04dcbf61f0318cf5b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/dsb/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/dsb/firefox-74.0b7.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "256daa30e5b5bd16abd1b72953c7986bc019cc0050b71439af24166a84ab47640b660051c3d9367cd919c7b505eb40a81a0b2237cdb19fd62d1e80e9d900c083";
+      sha512 = "98933acc4e74a1d88e4fbf8bbcdcd0310eea9af7ce88d708146408a157529fd727104fd827fa445a139721c1e1f1523637b0cb6ccc20ae0267ea723928384155";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/el/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/el/firefox-74.0b7.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "8793a20c37f21a94de542e0e2771603ab50c3145462ad52338a12705bda9028c36080dab0a0fc461be2a7473c3b81ba8f835704aba7639c6fc4069b546c6c9d9";
+      sha512 = "a6656de1898fbaa3a67c1b7e0c7c45dd9f5a6f3117bf2b044bf266556750606b3eb0c00ace7e32f32ce37367d5196d28bc5bbec3a6ddb5f0fc7629f6a2156a90";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/en-CA/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/en-CA/firefox-74.0b7.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "d4ef93e73d79c72da4ae88640fbc4640e63e1f7748f4f27307ae39cb8e0d567aa2027263692d750ff7391c3e210ebbae8fdefc6915cec2e7cc356c4a992472e7";
+      sha512 = "b1be0cbdc584520038e3df24607e8342ee71745f11c7e89f574d45270d2f024a4974d353549098ff3e5300a5c618f7274615f05858d2b9c5df090464d473387a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/en-GB/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/en-GB/firefox-74.0b7.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "023e2127eff59cf4f7df0c583e6113efe9d120fec1ae877bfd3c31c4819eee16469ae34718857757dbf68e2a6a4c7941d33afd38c77122847c8392a81ace43e7";
+      sha512 = "072c48287c0346c28bed4ccae0b71b984f4b656f917b0a6c6f20ac4fbffc9bc8248070fd584ea3444f40a65ac02202b09d26548c417d8a9abe8f54e385daa609";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/en-US/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/en-US/firefox-74.0b7.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "675555b854a27009aeb02260f4e3916e04f693fc031b9420384f79371837130372318c6178c27640448fecbc08a536bbf218cf5fc504a0270e3109aa30ab188c";
+      sha512 = "70a350c3122e8565aabb3155bbf532f75958ea0ab83576f98b1f1a819fc54ccbffab6e0db3f5996814cd199b1a30aedf586b6bc3e6b2037c7374cbcf78fc3dea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/eo/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/eo/firefox-74.0b7.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "118bfc3e503fe5a998930e197a1528396463473fb6ab9df06953e1de808f9e3d50559004a1c6b5612de7bb9f9198cd135f18634523e668de5f3ee99f7cdba1d6";
+      sha512 = "35d35b253084fee933c828ff38b8219cb742ace5c36f407fe1235cd5aebd956b813111b9cb05306ce5f85ca42634d4ab903ad409c3055ee0ae4975c007e029fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/es-AR/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/es-AR/firefox-74.0b7.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "605cac3b3cd27d27460a04a727cd3db0a7831f52474473d62d7b0a8f3ffa71a4be7a2b4e94e87f3cc9b35bef844749a315ca53c2d46011255d66edc17cd0c912";
+      sha512 = "0448e25a909dc951812bf5b8ff3eb39e1ba0825900ad4a4d78b3c182830a37fe8c6f226128341178e0b6612b4c9ebbb826d2484505ffed4e23097ec1210e8238";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/es-CL/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/es-CL/firefox-74.0b7.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "9c06b14b530b9b555919a87a3ec352aa2dd8fb070c141ac5083ea875af95bcf202baf8b0d4951868c7a9ab67aac54f62e928e70cf5bd57b58f80ed748a24f899";
+      sha512 = "703c9e4cfbf94522c1b4526bb68e7ea6941169fe1f45ef155f96587701064dd3d1c2056fb59a582fd14b4a41ff4d9b82094b40f4c95da6c8d5da66d96b012e80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/es-ES/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/es-ES/firefox-74.0b7.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "422a1ed25e05b120cb632698622e3b374b920a207fd1acf19b19b0040425d77574e3e2b4aff0d5cf01d20d87522878b3cf76b6b58a06688b6036608d02d95b92";
+      sha512 = "e4666af45ec236cf8f14b69ff0bbcaa4070ed9205a04cf5dd37823feb1230e66f726d980de97326c1ebc7b93c2b3b43cab61efbb1983d8882a78abba5eeab313";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/es-MX/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/es-MX/firefox-74.0b7.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "11bfa4525a9e60521a01fc008034bc82d5af05c2b04b74d59f572ecc02c62e3fe8cadb19970bf0689bdec56ec34b2c827d635058b31534bd56285883bb93d979";
+      sha512 = "1aba3fb4f7d34c55b433fe886eba74b0c71ff2a759a015fa31becc8c8a207b70b816d6cdd1ab648d3b8fa220268c8c95d19689fea65dd963de6750f1ea0f2905";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/et/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/et/firefox-74.0b7.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "c24aaccdd757d4e25981d39dfd32c5c7f90e1537196feb5ec4f381c6a270da2160b5c95c2c0ae24af25e27a614839988d8a27befd8fc8704c7c5dd0c2612e676";
+      sha512 = "485cf19a8bf5a8e877ddec241a98d580b8ebd187c0b92185b116fdfb3936d31cd379f10211241b591f8927a077d7482668abc411ba67c4d5b83ef5e47e0ce6ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/eu/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/eu/firefox-74.0b7.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "884e9501e232a5038787743161089da139530f7a45fec92883b6719a736442963f670c63429399c10695ae27f8acd443760d09f281173a23b8e845183ab067c5";
+      sha512 = "4bb9b8f3a38379011240c4ee9d0d1db9457271c5bbcddf691e42d33e281e2a63d781e962375e8dd55860ca49c872922384ddcc1f1d9ead98fafa213d2095de32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/fa/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/fa/firefox-74.0b7.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "3822983825639beebc52a0adc5c029327da62ed8c3bd182a437d0a2b02f89b047b2df18c112fc7738113a421ed1c7f9b028fc5472b2facc8bf8bd50c501d5f33";
+      sha512 = "995e24fdcddf91ab5eb2d5809b84997506c8c3967fbc2735a120c11fc69cb87c02a2d1f0b6c477946a5406bb585c73ca6361110dad6a3927745b24fa509d5018";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ff/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ff/firefox-74.0b7.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "15f50945928ab83c48ce49c136f738c1f289303c9a1a6b3c9183f3fb02713685bf38289f06e4892c1f21e37b691deadc85e8914e803362f39d0d9d93e52e2398";
+      sha512 = "f504e9157265dabd9340b2974051ed9da7b4f8f56cf652c44d96fb949a3381dea16b9782a7d029f2c3e19793a9fb4aeab703f30773dbc1b9e70e937b00e4e77b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/fi/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/fi/firefox-74.0b7.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "c88fcda868b18510e0a49cf96c753803211c50a11dd849b242f324d574d31dd5d74398b99ecac5158d6f4cbc3f878322ba2296f8001b041ed32b3c2819e8a8bd";
+      sha512 = "f97ad7cc1c1e170bef9e2da7ea51df57b32445a3b13478372735af5336251cf4da6ac2955edfb70c1ff9fd9eb997eecdac6e63c867ae80e18f2391ecaab1406f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/fr/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/fr/firefox-74.0b7.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "2eb84dc3714a03294043c07bf00d2d87cecafbb8297aee9b82317b0cef1fccc32dbda94056d0122dd8384da81e2e7477f1fd5d8466a34d9af51c288ce1af1a76";
+      sha512 = "aabf2b7b4d3e564a9aa250c3bdbc3c3f3ece0c69a6047f76bff316534637ddc00eb24d1e59c419ffb9b7c4193b7a151682cf75b4470c378ed5305c1cd9329843";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/fy-NL/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/fy-NL/firefox-74.0b7.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "a187c7c806a5e7eebd8d121d0e84063702f7d8142a78dad46866f7b1e5b87950badbbeed394394e805d74536719756e87ea9a0c1ae016c9274983244943c9547";
+      sha512 = "057bb572d45eef62599debed8390f45a53f5b9ed720ac37bf46c3a6f352235598f17a1627989f50c0e10a5f22d1882a8170024bb9583bc2fa7923cff32feef48";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ga-IE/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ga-IE/firefox-74.0b7.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "7d6809783ca7d04d836fe6b108d8e5b417d1d0b71211b46d08820826368003924f2b45e4e65eb827704c10fa6300b2b8f1f45a8744be4d28e862f66d5c2c5bc5";
+      sha512 = "9872d3692571fde83a8237a41c51c64e8a1c099174262b33032b281fc76b5f564b29f3ad1ccc7dc5ba4c8ef709810cc1a3ccdc34942361453ef15ede006b42a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/gd/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/gd/firefox-74.0b7.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "21a2f38bc70f9015d0e85e82b778ff02d52698fe361fc76b2b2a372acf2ffe7d673b353961fcc752051a43c1f2bebe1c9d06ba292f327b5d1e5cf98636d162b4";
+      sha512 = "c3e5613572ecccc67989c5d3ac5f590092bb05fb43166b931ea49fdf7cd0cca150a6208970009ffc8063d7d87dd9e5b371a9d317af8b9094240ac9314eb8499c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/gl/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/gl/firefox-74.0b7.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "7488b041f11b54b267d4c9dcdc68d6c1089313e617ab012b1a61eef50f2eb53c7d823f3a8dfb4eda82ee6d6eb9484bafc431da9989c11a4d31a39ef5947f3ec4";
+      sha512 = "766b0ce2b5b4a78e0470dd708a83423e8e756a7f44a6bb7e74ef06699e48bc848c2f1e5e452db090f1a8b8c33fe20036f1059500a14c878824516868056ac45a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/gn/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/gn/firefox-74.0b7.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "849309594d09f2320e845ff027de1eaaf421ee8066a3b0afa960119312e480c2d1399fb85adecf4b96f848be534911377705b87118d68c04a616399a4765f71a";
+      sha512 = "f6937fec4839c3a06fe36e78958b549cd1bb0ee6ce2490ba3f05716a6853807781a51c7ddd4eb8c5c10c38624818f9ee70a3115fe53e426b27c8d9162691e3d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/gu-IN/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/gu-IN/firefox-74.0b7.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "e9695ca0e26dbe43d3887d4b22416058ea86585b7d9ede321624e2ad4f4acb1d8c39c9e2f9ed3b3ecff2d9cb6273186bf0b407c6418b24b0dd275b573729e5cf";
+      sha512 = "005223824b6ec5e3ed8c404ac9fea73b1ca57412247ed625c667709e81be1727b04a0a1b0b59add46864601b04efaf01dcb592016b3e25c026204444a6c411a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/he/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/he/firefox-74.0b7.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "696f8ea1dcbe5e814e7bf66113971571d85c0313c1d18ac4dd0bd7cf9ff46ac72c198bf0e68b9a76ea0f5133aad0b8b1f53e3a914c88c0e5c998e877c49e2a67";
+      sha512 = "29ff04367e36a3df0e5d93d69bcedc6c698692a42cc80fb2f51171b784c030de832593a617e35483bb6acd849b77b5d19340a31a0322e1421d5ccc07a1b90161";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/hi-IN/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/hi-IN/firefox-74.0b7.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "c17751255f00ad7506caabccf79a915cd8e99e6f4fa4ddd414b5ba4f3024e55f0dcc0ef72696e7479fea960739aeec094ddac80681e6875eacbf477d1857990c";
+      sha512 = "6c78e91ed89ea3ccd7d67d46548993aae9375648ede8edd76cbbf6bcaa97ceb55f13506b8c9418b6fa94fcf15e0d4052196334f3f2b804439c3fa9db564e9b4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/hr/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/hr/firefox-74.0b7.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "7409ed690da2cf0bb71be4e7da9a77c7fddb33900870e55cba7fe7fdc75e1cc4fdf590d73f8e9afd3845789987e98f22a83193e47ccaf5b8e57962fa25be43bb";
+      sha512 = "0935d78afd0739eb510f24e0ca21d9007bf89c3d587b2661e0bca2383b0a7361071a529c67c213312b390ace44e79b07826d0ddba4ed5756bd800027ecfeaba2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/hsb/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/hsb/firefox-74.0b7.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "c3e83bd51b63a5fee1630151742956625605f1d76ea10e7a7ed09dd87c0b86ebf2950909ac199eb8974e34072cb75e1adefd2fd4629b7b695aa86c2b007d4ffa";
+      sha512 = "1372280c8770db01aeb2fa5992a5ae702318b84e972c379752ca7c1a15e00dc44cc7a5e9fc212c928e987aa0599f240a73828c7296769064e41b8699bf4d1173";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/hu/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/hu/firefox-74.0b7.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "47ab25f67e2fa813c3bfdb11f5810f6c9b7d515d80509e469c6841a0de45b03f7d4f14867a3dd823e0fd0092ef1e39697e2e18adea267d89d17b15dce0b58aa0";
+      sha512 = "6ad396d94908a40b4263866163c6de6ac3a414b27fc57a9b272df2db3b5bedb6f1a0fb31170bff456858fe8185761e58f44011a77295c41afc8dab1d7ab6550d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/hy-AM/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/hy-AM/firefox-74.0b7.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "685bf2df4290a05781bce59aebd539c6e045ea9a70d2782082f5ab5ce94157bf50bd3e81d14516282e4e16d200a775f3970ff3266520f9df0ad8ba55a88d63fa";
+      sha512 = "c59a6adf717d489b9de000be2f9cd4c166f3b25217d2add4f790d6261cfd8395aafa5a40cf8f41a3596916b265df5734236e7ccb02e9d7958e90e6e96d616468";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ia/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ia/firefox-74.0b7.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "d58fd9f9199e68463798b17c5d09bd73d8e36382e52d9932b2da1ad3ff48092fabb076761ad9c41dcbd2ed34d8f92c601e8191c1ec0e689a0e9415807bed4447";
+      sha512 = "c971f1eddfa61f0abb9053c106688eb42dbdcae9bf96ad3b4860280c7939d38599c9cc00f41056eb5297eacd6b90bea7efd2722ddd3f4b33284468837a8a0439";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/id/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/id/firefox-74.0b7.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "33035f69d26e97fcc2b3e57f25f9b0201f9a7381fb83caf53c0c70ced67bc1e3726c7e50884746015e1e3f2d20f509299e066897563bd01245d3088bf86f4af9";
+      sha512 = "7d161578a96265e1a3fca8efcb6f54b93b3831a1b7f1ecfb7dfb5717bf9859767a136a3182482bd06946bf8b50fb8fb4a118a7e4ecc16d3a3ccd9cef54303d5e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/is/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/is/firefox-74.0b7.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "db79a8253a2cca8fd1378ea0e81b0248b78c080b61a31299714f107d737889afb4992e399a173323a69cf47cc4a2f1e3f4e750fde9908be9ed40359003f3bdad";
+      sha512 = "aa462c1c49ccae93dfd16bb7f2fcaec55eb26b093332b24658a120349c9e2de233a6bf75585221c187b668f77b2bb675ac44ec9a1d5896f0845c91eeedf969fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/it/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/it/firefox-74.0b7.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "161f48227a51b6a2f20e7baff9abe0782ad35c28af05344b8214f9cfb1ba1b4485135198353ff05b8c17a9fff6fb57c857e7031d92bb7a9e480b50d974e9d553";
+      sha512 = "50a3d1a7dc05531cbed59ad0bb3289706c1e4558a2b160ec80f2762979ba13f84bb5ac689ffa21c58e1ee6cd3b60fc4bb96ece54aa0b2755adf28c10231dbeeb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ja/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ja/firefox-74.0b7.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "d37ea12de0f1efcd472acf2ea7073538a7bc0be86816b86e0d2919201f11549b62760cd1efdd9c1315aaabfad4424664a6f75560c671873ba8977892fce728a6";
+      sha512 = "255c6b9291a38d431210c014433ce8d986245e30dc3bafcf13c1dfcdcead06e1988a1e960a9f3a23d37f1d527635630e2e76c3aae4a81b0ae3edd9c6daf161d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ka/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ka/firefox-74.0b7.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "c4b93af5cd91946b90a35f9deee8eb7269ec74dee93523ebca869b12e0866200f177a4c49d94e2eb2151302ddf09b8a4aee9ea6e2c87a27baed6554e3d418ef7";
+      sha512 = "6cce90df66e85fa5d3fc96f9962d9140dad36f6fff840a5e80af608cca20c2557a79f5e01338d0fe64f6a0d1d6b15c72c883147cb3fe932a368ad04353b26ba3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/kab/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/kab/firefox-74.0b7.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "4722c5bb6baeedd5f1e9c51bd1611285a20f33e610ee5665db8f52f77d46c46e501f074e2c0cd41b3fb1b26f1803e872505390404a085813d5910d6086b28ef5";
+      sha512 = "3170509b386ae0d0390dbde71fbd9397ce587bec4a47e2328796ca04c9b379585a2311b28c373ee34672b549db6c1e69471fec65de581d11d177eae536407af4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/kk/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/kk/firefox-74.0b7.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "48e10eff6b37ba34ba4c00a3c2af3fe4a2a533c5bfc5eebba1c5158a5a97e5a077cd71f74b0d86148376d74af549611aee7208ffa8b3f5c2a649fb142d7b816c";
+      sha512 = "71ef08a02731831cf6fc863012f58bca054017dc854f17ade9ef885c391c437b40bda9c89c1a06f9258047b1c9e74250f67ccf07fa8ed0c47d52a425b447e21b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/km/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/km/firefox-74.0b7.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "5bf396dc2b596ecc06505daa919994ca8fd74f7dd147d3c1436ca8da862d223925f32feb833b0f7e0aa3e0f81fb3729eb8c117f10b24e72c3ec4ef7c4ecf7a0d";
+      sha512 = "a1411bbca99f8c45c5b7a3d3793df3496d653c61d022cb7bc5d223e3dfc4b6f27228a888e429656930c05442b8e8087bca6553848f01304760483e2486ef071d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/kn/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/kn/firefox-74.0b7.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "1d156c2de119b06fa17e2dc4c209b34a63d980e8ad548582c1eea314e2151b8d8a79c8634ab473bd8ed0c471114d22091ba3abafa91150e93ede009b3524a56c";
+      sha512 = "a7d8e7349e65f21085b4fdf69284eeb70d0cafa528d034b5c2220cc2ba6aa2edcc846d736d288307115cb3e6139597dd47316b3d0a0a9e327b72b61f901c4eba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ko/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ko/firefox-74.0b7.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "cd1e0b60b6013b073ab90b1581f5c9686ccedb81fc414f7ef21af1ae86691ee5d7d9789b144abb1ce689cf3aa9f32ea88fc7734b3db11e46c9df6743d4d0e6b3";
+      sha512 = "e6afa5b7d32e641b5f4c04d4afdc91c7cd7422102658b932ca927daaf6652e035d8d9ce6348a9bbe07cd562f69f74bea7746df8c85aa292751b4cc3ec764600f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/lij/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/lij/firefox-74.0b7.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "7f8c9f3c11c17dff706bead9c85ed6d9009579e05b1631b70e7d9e0d813e18e9043eb1287dc71fad293596ff23a53d49de2c1bde829149f73e99da6227e852f9";
+      sha512 = "4ae2955412987487c37d24f8a4a935b14a84048627e6fbfca15a8f4fb5eb4f4339ed3c32afc1be2e9c5725a7caf6d0894ba2fd80eb79150cbf364c3927ed80f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/lt/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/lt/firefox-74.0b7.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "34f90d1891b7d7d9b9dc576c20cb7a17b2c7d04850b96a1fabef34cd03da8925c3e6e2dfacd6371b2a1b59732279f1c3d90dd8ca495b2f175dbe2c8008fb2f08";
+      sha512 = "df9b514e06272fd0eb3f73e14d9a9ae9c22e5e3e7bf456a63a95054158f2c3fe81bb6750cbc6ed3a53d5a3f11f63a801b6c6d412df50bc08bc3ebde71028efc8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/lv/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/lv/firefox-74.0b7.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "fa8d8b14db57a51f02a5c41285fb9d37c5331188a26060571cdfdec8362f6ac6382533ee4a7678085d0c95134edf4cb9eaa9a523ae9dfd701c5481d9bb286eb1";
+      sha512 = "28471815ab78ba35fed8b77fc2722920e848eba3ee8cf9cda62dccecb055b8684e2ff5587f477b38b286a515899b1b9c23b38fd04a8f510a3dc4a48d05bd3c9e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/mk/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/mk/firefox-74.0b7.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "b7c22b2e6cd47be25accbc7d7fc91200addf8ab0ea2ee2edb2978315f2e6fb08fe1cfb2f04be872d0f466a3be5f1aa6e66af551b22dd643498bb641130df2172";
+      sha512 = "3cc80253d3dd1b5a55035a5b2ac0ba1b10b8cae71537fd277ed95c91fa5d88e75f0c95a4373a0a2c5f9d887709679cdbd154b1babbd1089f6c63cf2484a3176a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/mr/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/mr/firefox-74.0b7.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "2f01647d916e723cba7bc7b0f67ec11101377ac3f3b0954e412f4bcb23eae5008ca7b175dbd5ef20e5a4a06381ee176969fe6407975f85742dc84a712b942e7a";
+      sha512 = "e7d702978faac40984d1fc5ceb7b689ca6e5acb30c3b4e119431013a8efcd89421ff57ff74ae8283ed3c818cc171c1cbba461d17106e22f1cb7ebc1e1080d832";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ms/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ms/firefox-74.0b7.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "f138851c8930c1ba357d347519f1a97226152a5a3a37efe32c2ac0b670cb14735bb8c3d4c4463b87d2cf463a39f4baa05b775b456a419de42d062c081ffc8f77";
+      sha512 = "6912c3bf5b7dabffb89b9814c4d451aab946233a489a76ad2d456856b56d94c3403179436facb4aa344844fd130b550b7223113db7155084be2176c07c4b04e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/my/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/my/firefox-74.0b7.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "14380f48c0f0d2985a2e48f40712302318ad2fe1c7517acc13967202f28d98900062d530ba197520f6c710548ac7c2641c48386d0a3f9a9e293b7584b21ab6f1";
+      sha512 = "07a5cd6d3376b0e4b4dcc4db5801cf9e8cc17e2ba7269953c10c8620e597f837bdb29cbe4707da17f87e3778f42257b4ac71511dc8941b72c4a7b7e5e1f8373d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/nb-NO/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/nb-NO/firefox-74.0b7.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "70f8dab495b1c81e2a4af830181e926b92ead8f5fb8b4a8fd48d60504539094a2244777df9fc78ae7b5404cc451907b9060732ef37a0dbdb1874bd2c4659203f";
+      sha512 = "d974a6686d12df092f84aa6bf4519de0700565fe2c96b5a80b9b994bef08e1f2879d602019d8f9f42db771586558f2b50dc474478fe8880d08c95a3b17a800b7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ne-NP/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ne-NP/firefox-74.0b7.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "b92d7b2232cf42cca6dcde40a1a7b32b38a2469d9dfd598907bf6c12fb007bd25763bdad2077b70b218eb59f3d0f24c104c9f605193c27ffcadad26e87699ee9";
+      sha512 = "832b0d811e6adf9f0539f359f3b13d3e0f8fa8583e3d862979e6c44d3da94b4375c5ccff27ba9dc23936dc666fba8cbf1e55dfd6b8bf563f9ba35dc46d600502";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/nl/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/nl/firefox-74.0b7.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "0356bdbaa9f44c1782736c3ec70d993481e14a63655cad5f3c031de8c76d474c2784f663cf854dc8c2b678c87205f763b8457d3359e17810122adb0185a79ab0";
+      sha512 = "436421d93e8daf719fbea0a0e5f71163f150091e00ccd2bf64f9eab9be8359247c57fa7b66d16786644f9d96738d57316b75feff4da1a2a75f5d4a302fc6cd08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/nn-NO/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/nn-NO/firefox-74.0b7.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "d7a9d8f11d83d94fe4ef84900574fe49cf00d2403fe13acd45c8164d2f080e4d7ac45d06b5fb194569debd5dd31af929d359a92c361896b9c3c872dd8e74b666";
+      sha512 = "cb3cf186419c3303cacc92326d901a4f1b79991ec5054a8438047df06e052ed981eac7cad8a6bf5a360c673f232d623ad40af83537de962caa361e0e8839210c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/oc/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/oc/firefox-74.0b7.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "a59a43f379cf368e4444f573fb7a8970a18562eca6d9ee3c70a8ba706e86172691d29d75d003063b420339ddbee18d5b5c59e8b3505c6566c769429f54016cd3";
+      sha512 = "28b65b10cda0c34ec99975d3612576619a897eb2bff5ed215068b133c3c32793810994cfc15877529fe1fcdd9abe48001a873ad929f1f6578a91dafb075375eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/pa-IN/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/pa-IN/firefox-74.0b7.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "4911d2365f6aad5966004235fa209bcf043055bab1fa3e03316f0d8a57906ae3db0e3242198f95c90ed1ff94519f334978d1aeb9d4f300e8fae2313a2eb1a73a";
+      sha512 = "a4068e759d8af078c3e7f9cf58c00c2fbebe09fc2c204373d5850d195c9d6923721d43091aae2cd27430967254a16dc3f1dbad44da9eadd3974f5b38257a21bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/pl/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/pl/firefox-74.0b7.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "8292a813f5841fdf4c6b0ca7e4d2ab0f9b4492fb8885154cdbbd1c104eaf48622e961cacc096a37f34491bfde57033432a10f17054cb35590cf2ccfb7e517a77";
+      sha512 = "49e50aa82149d9c0bb06d6351326c43a08198e321cda4b8023b02a48d53931447dffe70c3fab55eeae979898749cf884b57a4b49bcdc223231ba9034ed9ce089";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/pt-BR/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/pt-BR/firefox-74.0b7.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "8a2857897b0108029fd8511d21ff6d6c3195d764156012ee2fc84a49ee3f025311b6c73f6d2cd5b655e2f339169a6cb5f5f574d294f2ef23d1ac68ab7289581c";
+      sha512 = "0c2b334dc66242cf7653665a66536b23be1bcf5b8e8278714b437b894f80a679f13bc92e409ff9674f60015c8046e97b9847f4d613eecb64787b766898bdf9e3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/pt-PT/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/pt-PT/firefox-74.0b7.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "f385375e761183d358efe684b7c70b0bda36035cffe81f78547b1a8b78b7d2f42762d3a94b663e8084f8aaeae59641698e811c779769f858f2886b39dd1e9a25";
+      sha512 = "ecd47ca036187a034913b59510081d009b6932e8e7d328ff917aa99c717523da96468f843b25e5044dafa15d1858e8331d6558dd344e31263de27d0dfd76c2c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/rm/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/rm/firefox-74.0b7.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "1a536d76992dcdd96e64417dc52fe210e1814cf49b258c04d1a18caa246d901c6c62633ababcf141756aacf06dd4ce8cdf4d8365c319d24deee4dbc3903455b8";
+      sha512 = "fd6d6db19134f494e72991f300e1990b78db9391b0a3a447eccc57add51ba7a1008a492532149d39afc561ee188a7836c3a0fc75c222c59400dbf60dc28080ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ro/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ro/firefox-74.0b7.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "1472c96ca414a4d0ec3ee0ed9fefff8049be7cb7367c8a9d4a27245fd583debbeb2cdae95da762dbe38727bf414a0e4ba0f1b4f4658e8e0d61cd0d718ee1c5ad";
+      sha512 = "62ec3ba94ca44e2ca92fb0dc02834d39b91f7a1ce6446407531019332f1b9d129bdd8ef9de7c0cc26cd8857ae82d03539f7d0f2a51e5f755d4311fa3ae410eb5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ru/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ru/firefox-74.0b7.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "218c3c6fc4e55aa2914cd88c57bfe5870030b7554c01c51f8ea23630eb9fc3e04b0e2b0bd91aad8dee2a6976daffd69765ffc205d5b50363bd12e8b6b3a45c5e";
+      sha512 = "2b89defde47592774464b8570b81636d94d77a891c22e353e5bafede7c370b4331aa8aa49b2701239ca58eb8d08d74a7525661a57374f1686a427346fc425f9f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/si/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/si/firefox-74.0b7.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "62af3f3a0d40255e75cac716d39db53fc1a760079933a04e9366f866c6593628d7d69ef699cdcee634cabeaeb254caabb407bd0ccc73a2f160d270f794b40afd";
+      sha512 = "8a86deb917486f679316b9f8d2d7bc54ea175d87f972cd9697d1ddd3e1fc357059fb6383a777d409d5b3a110ae7f74505e327eace3593ec4b4fb35290edbc0d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/sk/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/sk/firefox-74.0b7.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "e9a62c81865a1ca8e98eda1026911d910c4ddd7b18c3895e74a77f315e7f479bfaf6c52c1b6f96c1f87bc04275649779ca15b1f986e912861ba3d08ab75ef56d";
+      sha512 = "ea15d6e49b8987f4c6136de6fec19a627d71434378f2839046a3fe443ee340a925773bcb09c5dfd3779cd1118aebdac808f54c5872245b11ab882564f81467aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/sl/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/sl/firefox-74.0b7.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "3ec9b91051bba53794abfda08b1d02ac7ca4fbed7f4f187d1c2dfb542a058514ccb24d946929b522ec88a30c6584df4269d3b53a9a2474c9634f875ab2eedafd";
+      sha512 = "3dd20c0ee05318cc7f80a27d895af4952bb13b8ee3af1fd733a0bc03902f470fa31fd8b3231d608e76df3885c6036f27ddc5241bb889fbb43b09467d34fe77bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/son/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/son/firefox-74.0b7.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "7a97a2ae04db0780f62b24cbe941ac3ac5c9e2bd9f0281e23910d7b4c3e9c43f8834af0b633c6c0c88bd1b609e297aae4f6638cf28f6dd9d3fa417b6687bd658";
+      sha512 = "513c17a2d91d28f5ac958d45f872a931b3f3db198355a70b72e0238938811e2387fa5d15b0106feb3fcaaf455e19e7603c37b27dd39d8d81dff4106face87481";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/sq/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/sq/firefox-74.0b7.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "303181c208b738dedee0cbc0e8ce7092d73aafc485d50273aaf791c8f7a960ea3ebf6c033cedbce84d25442a614d265d1d7a3653a5a3dee8f859393ccab35aa8";
+      sha512 = "ce96e1f7f0f0152afc053d4f2ae2c8774cd79e12ee250de311fe39c22b933fdba701dddbc2430c5aaa3ddef8d4920c2a04d9373fe8e8aab7a3bab9a6863ba68c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/sr/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/sr/firefox-74.0b7.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "5f0c19e789c07f06e6acf6f477721bb6b7f986df8f55e88f8fd7ec7293d489af9d6f7517865900bb97ece61ede3d4137a7a3b3c00714796bbcbdd9c6004ec807";
+      sha512 = "67691bade82b21bffbe312b6dd3db5c7aab2bcc28ec59cd0ac378ede98d92c15d98b2c4ccdd6d7bcb77d88f760e7c8880d3db5d93286cf6a71a79816adcdb0ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/sv-SE/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/sv-SE/firefox-74.0b7.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "8480c74a1bc8b143fd60efecac05264da9b539d0fe23e941429eb467b58656f7a9427c43f2e724ec383508b02a076e1c8ae08de8b3a1296edb6f26ad2854ff4d";
+      sha512 = "5e890e03090c8d3317f8910c16602e9d26df02d91a05159d4610a3b8f0c3b8a026e6256c59406d40d979f93a20f162e1d344d6c430b33e86709dd66b211246ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ta/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ta/firefox-74.0b7.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "aeea547b18f69d2861f757c0e91e6366ca07b6de51373f1711eb34352dd893a8dd6c77d796a88723bb5df1e38f3f18b17de8062eac8c38b7c521066feea07fb6";
+      sha512 = "30a030bfb1e92f3375411c9bd38b8c75db01783ed45bd6d1b3919442bf386ffbabca7a3064ca22800e22b9255b81d415e8487f00a50e0641c9f8bff297d0a4c5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/te/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/te/firefox-74.0b7.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "d0b3f9e8929c993d594f3e71cfeb93389fc09c55f8bfb09aded4511cb5f216cf15334fb4c7b4b55bfafec8f1bbcfcc09a4900a67bb4bdb9015cef1a78763022a";
+      sha512 = "bc2685e7a6e4e1e744367e01222b192cb35a5cbbc0e5e5f8e3c03e9ef8dd54b599f854bd045d03b02c2fadc36bd778b9f4c72e660357f96e7fe8e49a9b555331";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/th/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/th/firefox-74.0b7.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "5b9b210591525544667a204bb8190d9a02208c67cbccd109c492a6353a1812c5bbea550a199fa097a2f9295326946d7fb1725537a27859a4bfbafe4520fc2e5a";
+      sha512 = "8cb0fdf71183382c11d3d8244cca52dc9ab1d95a929809e016867ebfdfe1e9ff722a6a54d8e829cd659d218097df8ad503286fa2d60aeab0bc29d514cc1cb304";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/tl/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/tl/firefox-74.0b7.tar.bz2";
       locale = "tl";
       arch = "linux-x86_64";
-      sha512 = "9be7096bd4d0208dd1d67ebdcbf95a27bc1f83c32fdfc4dc0b310919e1416b3000448fea6fd9bcb2e4f22d95572adb0a541ee4fac23015a79e8e1bb330c07f9b";
+      sha512 = "807581a2d4f4b87938058ba8173cfeb944cc54790c01d6477fe9a9b75848341f785768b4b011c33f3010ddc02fb1937cceea27a8260e3d53c386acbc21d7152e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/tr/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/tr/firefox-74.0b7.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "b395c8c4051dfc328731f28d8292ae2b2ea6366dbdee73d6d1c359eb2f9a66e7247bb9574f3a9fb81c7e09966b0f8bf2736b9bc69a6c36fa11309d697a4bb92c";
+      sha512 = "089f764a47b35d5a96edb36f3f056fefd2a2e649036b713a28a482a5cf5a61f5ccadd5e8f20588a0c40bf707f556ae238688b605db189e9a1efc2dcb7d9ecdc4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/trs/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/trs/firefox-74.0b7.tar.bz2";
       locale = "trs";
       arch = "linux-x86_64";
-      sha512 = "72449ddbf314b4e023b7e8bc2604689800e17318b67545d856c7a5560ad6606a611a2712959d18680a493792e5ea0a7a6260f85cd13117afae47b84f8ca74048";
+      sha512 = "35622a3df18be8710530531cf934b5d3c79b942e4f1024edc75b810bd71d45d52ce88ef051fd051083f45b50152602b76d854d2ae56bb64a38739be937884a87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/uk/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/uk/firefox-74.0b7.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "b944b5e844698f7f430043a54ac50fca000378b558e64da555e345a658093e12fe50df4827650e1ac9927bfb916e486d29764602e4385b147ccade3219e1e519";
+      sha512 = "77a2383129c6f60f77458e3e17bc57015f91d8f58d9d0211dda918d075b57398d7cf80cc2409eef2c6053c843667e6b094733026533e5ae665845bc925a67f40";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/ur/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ur/firefox-74.0b7.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "d3298470e187ce25934e392056c1e4aa34a8644237414f91697b459e22c6a0e13eb7ece5ba6564b6ea8c1cd86e47d96a9d0fb6d4f028841574c3cca15213bbb1";
+      sha512 = "45d49bb2de384d12749c45f02cc726627123f9b50f920f144a2aebae694407226497df5c0273eda168f11f2adec22495cafc82c114f711c858b9b207d997e1f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/uz/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/uz/firefox-74.0b7.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "c3779fa2cbcdf8faa537c06144ede677b6788e58802a09c530dd7f92fee1f8786e2e22e9dfc7b36d72db9e9a576ffa09da34a2c8067df7e4aa342077de96877d";
+      sha512 = "14bdd8d672660b0cfa8099276870e54b725d1effdd7128666dc77e942c7295e466544806ea134d48b56e8c5b37518876c5a14c79419fa232f30e35cadc217948";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/vi/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/vi/firefox-74.0b7.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "46263dab55ac771b3e9730493c27d18fbf72b30fff75b46a0e9a6de5442c442ff667584793c394b9a9534ecb6d2a71665b923dcbe02f3e2e7a1dc99e17f8fb0e";
+      sha512 = "3633f9e834c5ff0dd0a888a35f414d87ca35ff0acf63fa41ca4169531f20c21a7debc649c583ed2826b1217b209e42355625a7d822c8e354d4d973aeeb07c359";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/xh/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/xh/firefox-74.0b7.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "6cac93014f00eeff30115006c8bd52a469fda04c8cf8a0b4a70330bc5c9f45afc96080a03d7e8bc5c10f3e1b33658806731f2e80dfcbc3f973b80104979916eb";
+      sha512 = "b49201efcbaa9254d94940d87529ea15c1ec18682098e46bb4c6df96d20396e6884538bd93ef79a0539d52bea808f9c9e621f4a157b0fa48310bc89ecc659052";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/zh-CN/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/zh-CN/firefox-74.0b7.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "c1f1102d12b68f1e14c8b0ac0a77e5890d9f0dd279893f1892888f6549560d9ea91a1e73a4cb51343a27486805e6d6144fbe70dc79896ce1c87655517c846096";
+      sha512 = "5d00ab9e02db12e34a69d5a8301075f695e103c73bc5d3942e8aa6312010fd9bcbbfae2db19dffb12e369e4abcda0919842a839eae48e27b63a9a40a2d152943";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-x86_64/zh-TW/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/zh-TW/firefox-74.0b7.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "e964a4ec85e6de84de9c6908933b5f7dc35812913720271b3c9abfc6c76c929e59a8396a18557f089ba29f39ec021674dd19110f3fe58c95c6c6af569dd1bb5d";
+      sha512 = "8b5c6e59a6a93c1e569ab0549deb0ed529ff7463b999c39e1f737805d71edab8553bed6bce5335aa75657c1356fb847d8389829f74e0d8977765fe6b5f7ae615";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ach/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ach/firefox-74.0b7.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "ff9198d1212aae39a0c8ecb92d633e594cf83678d669509b2b73afb402e48eda15bfd92104e059516988c563a77e8b3122a9782d9af4426ce6e861611ef447cb";
+      sha512 = "4182a91809587cb00b5b15cf244385625dbd1043f64ec67719fd4532315f02983c605554fcec94e3ac9e152c5a69519b9f3cb274c4dfa4850b509669214ab970";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/af/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/af/firefox-74.0b7.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "634075f2f106f581abcb2a09b053dbaf4f5c9a248248a77ddcccf98b41ca6b3a826378d7f30efb397951349517180b6cb0aa13580d8931a0676b2bbde5a5fa9d";
+      sha512 = "37505dd57623b9b8ed5c9481b3c355790f4a83758629fecde8f286126455f83b4908f0dcafaa6b53a78ac2d1c0d77e8f8d3721d3677461729561b0460c0e3da5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/an/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/an/firefox-74.0b7.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "a8df8dbb81253471d97649e3ed2c79a2c8c1fe4c0730e5b4e048c44afb3db5f1dbc95f98f13c08a2a81efe4eeb0b242b6fa93233f51f0f848629c410399bf30e";
+      sha512 = "bdf45ce1f39caee0addced219c3702e888d749249c81082f0fd851375029557c995cad40bd3ead24aba1c52b96b440b3004b43994a4a9268c1bd041a7dd92e07";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ar/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ar/firefox-74.0b7.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "2460223644611db68c1b3111340a4c4cef3c5327ea3b5fd679171c18f92ba09bc5dbd37a847efa65b1c297410eb931397eed52d967595a38fbf732c7272592e3";
+      sha512 = "c69b667ef5066064fffdbe8adce20784c23e0985e30490d4ab7905da6cebdbf49557ddc321221130e6e7af63753bc7b9bbd290960ce1b86591cccf0ec53fd171";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ast/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ast/firefox-74.0b7.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "7ca5adee6a38c2fb16cc45ba22891dcabb513f3c3b4c69a68eeb94085a0263281d3c70cdcb42971086165974018f3d26044845d8538595dec6414f612b23c31d";
+      sha512 = "a697e44af702f500d72e8142cd76230b886b893a310dad7136b583204f8201b0718b97f5b11cbe3af4baa0e95f46fe6f1e69ccf4b9ed42c34d782c320d6d2f19";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/az/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/az/firefox-74.0b7.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "abf86da5833fd56a3b3f5b7cda7954b1f62dd641ea8a62cc2a17d8c4a406be8d2e63e6b6443dcf7f0b0b275ca2f0b2fd9fa4b4f316a38e794b0e87f696a7e5b8";
+      sha512 = "ebe0786c3790da17fc1dd5ca0f10ab3fb854e90b08c3093aeb14d5df09b58d8ae0954b7bb99d159736f0cbb70391d81a47dcc9e229b02ed5fbb2b9ac7e19cda4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/be/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/be/firefox-74.0b7.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "99fab30dc81ae8c1a536f0754e9f85f6b18b89bfd57217fc8c9bcb13e98fd40aedefa29cbcde506507a713f79e38d72fa067e5e4647ff5a01890828087adc8bf";
+      sha512 = "74003379f102a2c8c8079eab756afe16ab1037d985fbd266bfc80abaa5ce6dfe911b20ddcbe5dc228e87dcda4f0f7f874cf2dd762dff90c89c5e865c77304d1a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/bg/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/bg/firefox-74.0b7.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "f7705501978c415dc52644ce095cea5f6940d052f8c5ba04ef51d71cd8469bc55179c29de3279b05b5ed84b0479258d2eee02445e080b246c6751f3117afebad";
+      sha512 = "71ad6c25955e6c840e583ad8a7f83c5de21445f0784c36f2073e42a036a16e58ca768ba43468bf5432148ff6d254b5cc547341cc38dcf844c7f40c3225df21c1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/bn/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/bn/firefox-74.0b7.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha512 = "ee8bc5d2eb469c91c9173bcd787168e2291d8d6498411c8fb96a4f110ed9340dbf6073cfa822dee5e433f93e6c252561b9276f911cb440296d314815de1255db";
+      sha512 = "840e225c9112502bccdda79146dd5c9b920f1eed97afe7423e539f750f02a0b343bf3313ba8826145efdf318fdd17bbff5de142fcd3e1178334af55fecec67dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/br/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/br/firefox-74.0b7.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "430f14bd4a67d7f00c06406da9fca433cb945a00b63e463c0735edfbe8353e6a32f0ef737bbe346e0b5535ba2fabe3e423d58839af3334f67713a097629efda4";
+      sha512 = "6dfaa0af20e6b874fe675b879da9e7edb80b0486ef283d3e957be8d7804781c083f9ee12c9b5da758e9e38806cd35cc0ec78ea3aca3f7e2dd994e6c06c167abd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/bs/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/bs/firefox-74.0b7.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "bdd6adf295d32106f76cf5cc26e680c6a85f740a6bb662c5e3a8c262048e20749e8240a943136ac1dade2359da065578a0c6a0fcd48cca77ffaba01b7f88552b";
+      sha512 = "ee62dbead4c185915d72facdb7ddfd42f6e543d3dcb48ede83cb0026581e0b4236e3b29c89053c302441b51b13333d3cc46500eb389fc1c72c7d467da0f21d06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ca-valencia/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ca-valencia/firefox-74.0b7.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha512 = "7a53608f4ae40d6c46945bba045ab5c8de03b7a33dd3a7e8517b81e758900bec21ebadcf1fb5ffd35e24a7dedb9990d11d03d91c57fc6af4b24236cd229f0fe3";
+      sha512 = "56ef6d6859e260058cdcca261452524eead1cd1f57811f64776f3703e16e44599c665c2071f1c29188fbb5f02481467d1bb569722460970f951f7c50ed44f2bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ca/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ca/firefox-74.0b7.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "59b46688b233758e4dd3cc64bd1af821f5bfd72c0ab842d5c6a281da6ede00b1d77614d0f89fd96e004bbb617d38204dcbb1e17635fa4d0e6b5d57131526b7f1";
+      sha512 = "32249eeeeb5bfd1155d9a7e8ec13d5da92a49193ff6d3298df01f525ff08186ca2a6e7e14bbcba048abbffa1fcad3ca0ee3394f8ee548b6470f9c961a26a8276";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/cak/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/cak/firefox-74.0b7.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "135ba9fbe2c94845b1c4daaa1ea311fd6963488f6e9de972c4a288f5d6585715ab2fa954f9fc0ad81bcda264aede4decb991e8e17b92a90c675f94bbfe2e6c1e";
+      sha512 = "00b5766bc6b96dd85222d9a9e9ba58b22bd0f78d42c0ed929279242a3973efee0b7c6fbaa5b8796b3b6488a3c2883a06e221916201740c8352be134fa2f988ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/cs/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/cs/firefox-74.0b7.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "aa7256aaac8427198ef215f651a2a1948d32241ec9aa753241ea225101a530cf8b1c7eb7c2ce97302a0431349296225a65db5377cbbeadcc416dee46513bc7fc";
+      sha512 = "2d6ffdbb0ac90d626f613942f3c1e474e39dd73c7f54ee9587882ef09006f78f5bc9e9738d25d63e55123c9e8652b4b5484e9881720e911f1f5e01d55209884d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/cy/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/cy/firefox-74.0b7.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "e0760ca8699a2ff6b6639c10883adea4d77fbc5c77c4963ba930079755828d977a9395313402fff09ead9f81683e9304a03ca7e1964aa3c64135a6b293cfc21c";
+      sha512 = "867b673671dbe387069de42909aaccd04f4c164ee73cd1ae4170fc0333c54a48ba557b2d3956b60953f39463b86a6d6525b2a5e325e22c22cfa3c446f7fc3340";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/da/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/da/firefox-74.0b7.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "e83dae84d532556b7e702cbb4b1708a4be587aa8fb17601fe13a036941a3152f5c23eae37f7578cd0b4af3b07f022c35594bf56e265d0dd55ccbbf6ce81ec47e";
+      sha512 = "d0cfbf8493cb53096d1667b2a453b569c1ea9fc3815f95de9128fe784416671ef770fc3e70701ba0a5a935563b3b055cf3db5cd849520ec2d75d52527111156b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/de/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/de/firefox-74.0b7.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "1f46cce2007a7fa10763e0491f3bf120fddaf8943046eb17b343f5f3cd8edb755b4fdbe8e4753cb96c3d6c735c1d7c28b67e2dc6bc00f554353e2b9ae49a632c";
+      sha512 = "c52ec2293b4f7d61ddf1860a63d76e01555023f203420bc6fb53bfb24e407aefb4276896b343bfea2517bed9674fb39431bf1a38124288b6376d480b9432a51f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/dsb/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/dsb/firefox-74.0b7.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "3e0c1c594404bad4675418ff2f7b3c06c90d734d7359a83820af17b387045ea744ddfc85a8b943b1428d34fee1207db187d347c6e8bc1e90f6ccfae35c44f846";
+      sha512 = "9ad7846365072c32a841f30e1c040c56144e95fe4d9f4cab9adb282ce9a5dbd481d498fc71b0330feadaa68f23a35ca512c1ebe3d07f7a4032567a6225c875c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/el/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/el/firefox-74.0b7.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "3002644598b7726ec4a2a2c7235268085f2d1e41461bb1868ef08b449b97a638bbc8d7742bf92ac45e606f90d091c8ebbdf6f80fc4d0461dde85ff33d5f7ce81";
+      sha512 = "526d4562e8b1e239b2e15ab89c90646fff6b85daa309a9388dfdc60c4be743ce39a03505af58f827e9549fa4b8e658bffa2a5a7f22921a94f54c1737b6df11b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/en-CA/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/en-CA/firefox-74.0b7.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "4a070956b29ac116884c8d8959ecfab0e244e580885913ba33abdbf43caea380b11e6078edaffd504ef340528381b14b1ec16f5ed9f1bba34b2b2107eff34acb";
+      sha512 = "6a7c18c9581327c40f128acc56e8a9f4c7575b85472ebf120047d3f5abb220fdc03f78b5a182c9e3ac93970d24ecec3a57224cd02ca2537ab5b86e594cb7bc2f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/en-GB/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/en-GB/firefox-74.0b7.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "98f416aca8964192843cd4723e5c731427f61d3d582001f8a5e76ca5217421d2c6e5f4ca796520c773d345c79087b95b37f6a35b0d1295716193f65e3a080106";
+      sha512 = "48cc9068571767366a5086f340a5d4566e1d8261e4bb715fa3463106db4c02a5af316b37775e4720344ae2068eb35fe004bf893ac1ebe923336f13978e2ac955";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/en-US/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/en-US/firefox-74.0b7.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "82b45b5920caecc7aa9c93963b5977bbe0a7bd7ff150deb6fb7be277dcb0d0c5811d8d7f62756d0c70ca887184ea81c175302732f56c556b6a38159531bd0cf6";
+      sha512 = "e50c0d061aba197a2f2e153731dc5169fab02416733669a593387338a1acfba1bbaa2d26aa0ffc75fc972524ad70ceabceec30912e06cb827a25036607acb7d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/eo/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/eo/firefox-74.0b7.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "130685fab546fe659fe375f426b191919812d43a6fef1d20efbad92fb4c9b81bb4880fe4061eb6f8183a80b9480b7f207b0c18b7faf6aefb596b05e8261e82f2";
+      sha512 = "23586c04536846ef9b0750fde66b04efa265f97a5d8c30c7f5e435010b80b0d6556caa9b6c579126080fd3d58abd957dabe5723779af1936ebe4c21c185d333a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/es-AR/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/es-AR/firefox-74.0b7.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "b7605a051db772909b7e2382826fe928d52b26248dd6ec3dcb234be9657734b142d07656c5b2d87f97e240509d63049bc8e37f7162f15a931abdf2cc64048014";
+      sha512 = "6d2c87e248b8e4e395af916d6b91eba9451e1b6664b31d843409b06e4589daa044392a1f4f31cab9411350c753d21a817411cf7149dde4eaa87ec20ab724f63f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/es-CL/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/es-CL/firefox-74.0b7.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "4f8a5b856ce70310885cd657ea398db4c6153dc2ef821eb1708f71ce7506e628da6e59aa7bdfa1e5804c0da254a818a1d0f69e1be61e538c879827db9a457405";
+      sha512 = "b9576b60cb40716707c5037de36ce278c9d8410bdb68ea0e1bacab310e8c0679fe80d0a5ada111e9f605a4eb313a7d7519fde7dede3de43eed40cd88386f16ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/es-ES/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/es-ES/firefox-74.0b7.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "a4061b50e23c796cdd4a8788359b8d9dd5914ec36e0022e7b9806a0b8d3e569fd9dcab0b888fe4ab848ee2b3ebfdc6aad95c2f8ae642184dc7781d362323c497";
+      sha512 = "602e5a02e5a534650036067f87fb844ddc564aa54ee219ada4098ebd4e7c60635c59b0ec1435f2a7d963cf0fc35e0850e0a86007e4562155bc1bc07b78349e95";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/es-MX/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/es-MX/firefox-74.0b7.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "eb73b17efdaf28fbb56277407edb7bb822f3e91d330763235b526f639eae8b6b2c043237faa75cadf3dbaccfe5d793b899e16bd8feb2f449f2f97d5da5eb181a";
+      sha512 = "0088acbde6764febe9b37b8485110d34bf72c20b1aa4fa9435712c3b58609ac082c7d1ea203157394ecd9d7609f35fa05e784e6fc5273f14d8c216a392d4ce9f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/et/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/et/firefox-74.0b7.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "febed7ea65436ba33509cf7bea9c6a52342b6d4618d8131ef0b07ee70e291554a31b2b556f1ca2ebbb243f7d89af591764cafff13fbee592d000566d4931a2fa";
+      sha512 = "a88ad46ba958dde4ce6589e05bb941707b894ac8b5289f7dc4763d5960a7a4754fbf5dc669ef8318867482a9fff61e711e2c13befc08dc1201ddf5c3273051c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/eu/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/eu/firefox-74.0b7.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "d59a52c8ab5ddcd9ca1d51d152d074e6cc9d730bdd14df688050f7c845d8ed95d4e6b5f4cc06745fa3e664c4d743b84329e63ea2f6a5e4de59dc9ea844015b17";
+      sha512 = "c24c9ac1869ab82ea8ce162cf441e45356583e4e5466058460ddf925c25a88580bad7672ba82abad090faf29dc804e098abf0aba72f1cec18736bab1f3410c1d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/fa/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/fa/firefox-74.0b7.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "64a68e992b2a9158683dedf6fdbcdf18ff0bef4aad8f68bf277baa7bc92c0f55d75e4020f15dddeb18e32bba42f94d37c14c5b9c1978273fccb13961ddfebe52";
+      sha512 = "16e30c57680a2ad0c7557f4819a0aa28e4e066d3a7b39ef9e1b99fe69d0c8825120f086ad628f3cd0fb85c28d9059a9ead5f9dbc695777ad06bb7430857a966a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ff/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ff/firefox-74.0b7.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "d87c5edc038571d31b147fa1555e8bec7988958e0de661dcc77282ea052acb5d427d07862412431557699ba85b69abecd350207ebee36aa935b59d9a8e981bc0";
+      sha512 = "e4b53574e12f35124c3fad67f53524b8788ed2625156fd5d73742414c179a71892732643cc9d29dae3e036820f1ce1701552a4ac29c2a9de0af89094e9dbd937";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/fi/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/fi/firefox-74.0b7.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "e026d27700ac603e63155130b020fec3bced265e226e3aacf9865c4d9673fbb1c76ec048a3eaf45733a7f86a88a87c32856184c6136e088528f377eb5fed2c75";
+      sha512 = "0005ff250d51f48dbac887e2a9c4d74253f4c01a8cd1f4fceceefd2596dc5290f24147f3ec7b7e4b487b7c6036c05a74025fc7f736daba943e599d93c9c5e789";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/fr/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/fr/firefox-74.0b7.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "57f8ccd042ec0f388cb2f9dd33ab44a8937a7984e563345fcf4178007a015575961f66042a96412468480dd2225f82f5a7f8ce9ce2c42f7d5eaa1c4bdfe12e32";
+      sha512 = "419ed2989376b876c13851f98c4d278b79b81f9dd5be9c2121e2fc365681e7348e077f5e70013cfa8d271ce7d10cab487f1479c031d3a4d428885ae3614db2bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/fy-NL/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/fy-NL/firefox-74.0b7.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "c2947cd50ef4b29c1121d02980f6fd641dcf394f0202faebec82e54baeeeb7af5b4f8c1a113abd30b29511a1e1cc796618a39eaad347ee5c108895af914e2e26";
+      sha512 = "ebba32714ef12a12a7a1c1cc485cc5d0287c3d7657278a599f906cd5c214612bf1be0a786d2c8079b483406c4c1161fb96b50f046cd9c878bddae5f927453588";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ga-IE/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ga-IE/firefox-74.0b7.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "c64f524aff159f744024d10e809e579d2ad8d6e5842c90a436ed1e45a4bcd0beaeaecc53e1ab5359cb660f5627553be062518aa20b5a9f4ba823e9eb8f47bf10";
+      sha512 = "86d2d878625c230cb251f2f88dda89fcd82e6ab8535b1eb7476a11f023145c6d5b38f3615920b11079357e8af7ff17801326380543e6b0a5d9e4d9e1356a8ea8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/gd/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/gd/firefox-74.0b7.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "f0e0ce12f5db6b5e14f8faddf678f25c670932071fb3e0c2d6a09a3ec55a94c9b7ca91c829d4b88f65095e766216623c4efa42a8e355dd6628960a7f8d75c9dd";
+      sha512 = "ed5cfc312da1b7c336f449301a37b8ff6f5c83c8ae0aee3ef83bae8f3e4accf56da7680694327a5ae6294df7015037f31afdc30a409678406fdc83c821aaf490";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/gl/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/gl/firefox-74.0b7.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "33b2f5fabba352a89fc04a09e3a751bc59140d6405e07f823052f8ce2deccad29ec7efcf2093db467811031a1f4ba45c93cf8604cc22d20dc88985c1608681b2";
+      sha512 = "701fe5b9dee8b64314b3e1bfce55ae3d1d33aceb871650098c8e10826f5e88e6c734698937cbaf2f0fbe07e2e6c914270842a3df399cdbc82a3556b1ec048a45";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/gn/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/gn/firefox-74.0b7.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "82cd31100fcf4e59e45800345e4c2aadc1b22f9ecd1b2c6eda25e90914b3c3780b5fb2fdd3934d4e127d9933f5384cad5376c3279aaab5a0f995654b16b08b3b";
+      sha512 = "40be9288775e6411f7f682cac10ba9d5ca3618a7b8d64086278c4fe9e2766c6bb24b5c1444d344643adfa93a2751f1855107d66b4b2260e0da3f4f473b71d2b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/gu-IN/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/gu-IN/firefox-74.0b7.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "31068b937c0fd4990e7b6d9c3f827ca4a0cb549cf342847d0e9fce649ebb5b147dfba61edfc2493f37c05df4c4a411df5e9de57533a80d2f88c55c9dd9d79f5e";
+      sha512 = "057941bb40197fca1069bf7eb787b2bafcf998d1cc83af1b64abee3c17cb5a0b5d2975f4183ed33dbbc2c056e3e316f29b8aaf21f2c711b7a474000dc159d5b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/he/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/he/firefox-74.0b7.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "5247e1c19b3ec8b7ba2130a643f65216e96cf46e2ad82124f241490ae6fa50e8fe240a8c420b1b8f0f5d2b471fbe97d97a066c46082e13085ee0bdd07ad003bc";
+      sha512 = "f75b88b8de0aca5e31594a592b3827d2f0925d9c307200dbf8c2cf0ea04239d371412daabecc29a689ce5cd273ffdcfcd40fb03c2e91fe9162fe48bde5178a74";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/hi-IN/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/hi-IN/firefox-74.0b7.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "1733900f55e2e7bb1adcb1fdf0b0a3a41721276dd721c1c6cf7e51b881f1e2b607edd95b3065a8ca0708a83fb6251db57309c192c11cab4521b0c240c9637710";
+      sha512 = "f4890834127bac76196e2b94461f28916b4467e35b43f40a6153e43ce90eee60903ac7d1d7cdbfc1eec8d27fa47e2cde6d2c95a1a996a5179b9d1cd9b160d927";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/hr/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/hr/firefox-74.0b7.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "204d4f0fedadbccba86ba97105b8cd14bc5f1677d7fa40c05ee1e5d7728b3e6fd4e39d9bf77339e29ae1da01190e75ecfc4c5b1f70998769242875cd4a774ae5";
+      sha512 = "ffd75c9101ebcea645f704c2fda287a7365f473a8d9efea75df889ad7a9d36c1c170690adafe20a1b2b09cd39014ea4913b440044d08b0e9c2f412dd17ed2ea4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/hsb/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/hsb/firefox-74.0b7.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "8fa5b5cd0aedd9a933ba28e430d726c81e9dd32780d763750eba1fb043e4b53ec610ff29218e913f6690881312a8f460805aef4774d1edc5bf119e6b72bd927d";
+      sha512 = "0c0912b483c984f6ea58e2a35f07a2932c3ea56e1e49324d979638ec8d6652d89c6690672f17dcf6ba4a751d8d2395b9a1e2a6503f3c8476f8e3a199e2ce3843";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/hu/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/hu/firefox-74.0b7.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "2f721ce1ca93dd43554b78efa89932891f6bcf8844e87996d1e79f4a91f5595cb8653d8196f78f11e9ea63375e6efb133dc5bdd714ac51b85fb1e64cf582283c";
+      sha512 = "716dc8e392758954849fc7928864bed6cd0fe40aaa51872f4dfdbccb28edeed138b1eed6f7d1c401bdb7b080c7c5fbd0e62c0133bff270c68421fb48579783eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/hy-AM/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/hy-AM/firefox-74.0b7.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "be074edd4daf2507d6a42995950f333b7fb81ecd2cf63e91070d78207399c0c7a90caee7dd4c5773989e82688c090e9625891d32e4ff07911940b859ab26035b";
+      sha512 = "bf28485aa9ff76aa20db8be6020763e46151d87d3e4f8fbe8c8e72af9e81198ec645d47cfac29254fe802304269fa00addbd75aac6fc2928880b92feb87e11d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ia/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ia/firefox-74.0b7.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "7b50878cc42ac790d54908f60a898b26be95c0d5e7c70ff82e309c9f0d614bb58837d359aae406cdcba861edfaff3b342c8d279962dcb5f076b7aec01949a7d8";
+      sha512 = "1a3811dce3493851734afc5b955533edee0029783a5cabce62e72649a0cdadab52206dc72d414ae2b92f34b425f111bf5b399f07c15f7b5c81f7eec3ddfb82fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/id/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/id/firefox-74.0b7.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "a352fa281b614f6e5aa64c2d10075e314066aa8f5dd5dea415dcee228eecf762a699d67955d42ee1e6db9e2c83ddfda95641d165d8fcbb97d42313b9771dc945";
+      sha512 = "67b851f947407b7735d7335bc3d9fad5ea736e9bdf03cde7a28b3854b398263ca6956c2baef014bd6969b254d203d0784afc53127f66270ab8df1922ea8f1ca1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/is/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/is/firefox-74.0b7.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "9b145f44a91d80fc844cae8ca5ef6bf9c4911cdf3ce5b6f2393c186abfe634123905deef0d6d2aca3a457054e26d946b134d6cf3354a87c89075b6c0dd7c0a68";
+      sha512 = "5eea1c115b5725fefaad5be3cd401fbac96ea50886ec3bdfff586cfb08c48b2f5611a797f476f34f43706c0708ef460e7b0b75e104f87ad358369f07743a9b76";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/it/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/it/firefox-74.0b7.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "32c20eaaccad71e0a5125881cb726ab91d24821fbb416361eec16075a884a763a80749b458b684e29291407387174d7e08ccbcf18eb2c587c6d2034a26751709";
+      sha512 = "0f44fdc04418f28d24638cc1893bb8aa6ca790e8afdf5d29da8b13e491f3acc53a0edc91c61679feef7eb4a2714308c36453f19a20c16d939dd7c248ba35dad3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ja/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ja/firefox-74.0b7.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "220d0fd243ffe8ff87fbb3f070286f8f10475c937d53066b52d6d6fa4d3096a403f4e8f84bbea8f5da463a5fd0a34fc2b936b59951ea4c17438c0272267623d2";
+      sha512 = "e951694a4d8f1f9570a869cc5a0dcca733fa3d9c4089528ea55ee8ee70251dbc0e873530c87df293c2259dca59b8c92ae247897846c93b0f9e2b510643ccbdd3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ka/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ka/firefox-74.0b7.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "f7a155f925e7fe1ad3282afa12e9eb0444c549bac719c18028fe9833b104d229ea122498e232a60ce49e446d2d8ca78d6346b12fae48158fbda40143753cc509";
+      sha512 = "f4613efe42a9b2ac03d85e5d8164031d869d8e253c681f2d002e180eb2bf214a33671da7a39d9e0149ceef1ea27f783a5b69be7d2e02e0497c474b2149477f4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/kab/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/kab/firefox-74.0b7.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "217af3c935d9200f936865e613561116969a5b1ff0560e59a2f9d4e94c5250a207be9e9ff4f848f167397d52e0519a8d9732321faa05414396745ccb4a9f6e60";
+      sha512 = "e59813d89542a9fc68291a3a8cb75de567b247142596147f54e6a2e83170444d684003274e449649055225c0c8b882d96924a265b8d2de98711299e21776563d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/kk/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/kk/firefox-74.0b7.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "4be47ab65def786216ec5296f8481cee46ba62b4979ce43cc44ded720a2a0fdc6273504179dba2bc2eba8b901559ee13d15aeebe9ec5f88c90b4e83fae88af69";
+      sha512 = "b944ab903eb5b7075f3ea633e1ec40b4c688a2a97103f81ac80f6de77a3bfd4384de1314010b82937c986240e8e8dd40841a07c27e72c56b962a428aed24aa39";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/km/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/km/firefox-74.0b7.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "546268e76a66fa11ef0631fdd78c10fbb9a8cb9a6083a94ec52e91558a63f2e6d1730c4e9cf368dbedba9ecfdf3bf3cceba063dff94b1890788e9c72509ebe4b";
+      sha512 = "83eec772f2bb78198a955dad41ad6d68d9247006bb3430bc058da6da2d0d42c4a691ae20a4cee1a7b8c3495f6b07c15cb1487e7e3d4b30b3cf79ec42ab76dfae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/kn/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/kn/firefox-74.0b7.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "9e44a65ea9ff34a894ab2d183bb120e51f55698c86f816a6b72b194023a6fb9541e1c0f4644d933467a4994f067564ebe1d949affa171a7f9f7485961beb7771";
+      sha512 = "f9f85e4a01b56b74c062b9b06a7a372426ab43ff2635fecf9b9eeb1c83d60682f17a19d1451e773593a0cefe15e39711a70e73ac3ce76a43b1274175faec06ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ko/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ko/firefox-74.0b7.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "f1b99828870aca3fae634c74af62205b1bec1085c378a9fad228325cc7c28043c0995c6ec1725c5038da5bfe57a5ea0227e5852595f9bd4da14fb609102592ff";
+      sha512 = "f0da90b5634db1db5576b8506f208a7e3810473d63c78228833eadffb512b202dd2866fab1964150a271c61c869589adef317c6be82978d5caeae148058dd819";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/lij/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/lij/firefox-74.0b7.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "b8b835ac11e295259756416430b3b973ce33d353e24fc9611445256950bebf03712ee80ff01a273fbff2e16e042c9bb52803cac7468cfd5d5898f6dcfddd533e";
+      sha512 = "2d580111b1b20aade3eb7dfd607ecb7b7003b268dbad127eac13625d62396562c0e2d39f04597c1225f43ea84555307f9a3805df23743a1a5304175d5bd7a0c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/lt/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/lt/firefox-74.0b7.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "fb4874ea658e5eda4fcaed15e7c18c5c8700e9d9a3b94ec9e95b1b5c610dd70412e35b27a67921f65e9285fc8fb1c6079fda1da9c015770f6cc26e2f73a56410";
+      sha512 = "b786f7f6b5ec6910d994f48d625365a386ed461f86a4397cd9ab074b164ff30c2c88ab8d4edad93b55d082bc806f7648c048c4a76ec6a68dd18b5f65dc6c6e4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/lv/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/lv/firefox-74.0b7.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "f676d8029ba766cfa527388241170cf391b648e617ab0c81930ec663eca027e70625146fbf279951ea062468e7c9d5731ee177e20e7d09b93ee0972c16336d77";
+      sha512 = "cfdf66bd7eef43a619cdf3cfa67fbc863a0bd886adde00d1d5286d17608f4e3c605001a0e5fff1b01fbba3f28b371cffca78b4ee82fe8f2c487e6df32c2d8ae6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/mk/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/mk/firefox-74.0b7.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "fd473e113f89bc94cf53c2d8a8973d974efff836d7cf00d3ad8a957b31751d45ecd72c1e9943eebc74263747788629234346d51c9f49e2e00acdec823ce6c23d";
+      sha512 = "d27d5ff71a465081b931ba2d3dbe8d69ff7e8532f630f541ffb24861808e43988e11f4fb3427809197cee3e7fc488dfa7bf0ea274b5aafd8e1bcf910b4e3e239";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/mr/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/mr/firefox-74.0b7.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "b2f25777da4de54364a1e5aa909a96859d23a18d4fe0c01799c2ae26e86d21e7dae8a6c6e694f10731cdefe6d8954227cd37d635cb9a2575ab87ba5ba9741660";
+      sha512 = "b455f77ec2a081f4ce8f45e5bca6348c7b62a524e7d5439e1f79417ea57b33508aa97fa9fad149d207f59a8507dbf0be8fb18d19b72c822b030cf7061b0d5d20";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ms/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ms/firefox-74.0b7.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "80798f0dcab4d792569032fdf8761081e3570a3ee358986ce318c99ba342cefa1e72ae69008f29cfd4fc6e43db3973e17a3679c2c9a9e951016f6dd6f9520cbf";
+      sha512 = "a81696357fa5138622e5f2032ceb5c271749bf412d5e6e5b88087918397732727ccb57186193ff36e80f9109aa4b5c0313245c2bb62d73b6821e10f1ccaf64e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/my/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/my/firefox-74.0b7.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "20195c08ec9824e64c9ba0496224b227142ab9d081ba2eb0df74b0a79412d767d626194eef07cb5cd184914a5ae3da73c712c40a54ed52e7273a09521ca26cd1";
+      sha512 = "1c280d2d0b608b5c718a7c829b6b8a10f806d6206ca88d7246b4401d9c60c9905dc4aad659b4ffdd183897a3b7f497ce5adc963f5813ec498d0db313a6597c25";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/nb-NO/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/nb-NO/firefox-74.0b7.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "e1d80aa8eae8bda7a6d618e0ce0d5186c95c2a3db3d9f1df49946129ca3cdaae7bea07f78d1d460eda57b4bd081a0bf84d6d9c878b21abd12dab56a36b0e341f";
+      sha512 = "425cf32bb16362a3a7270413ec6c95ef81a1f35c3fe18e21f55773ae68ceeb9d07c3ef309e8593e613a0238a5946e1b431b37dddf7ce44c336b35ecdc4115927";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ne-NP/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ne-NP/firefox-74.0b7.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "ce1941cf4a8881daae3d77b01b2488148dad34459b9274abb63de25dfcc3e54d8ce3fcd117b1e6fd0b18e2ee78dba403d321aeaa724023462475b239a8b2d1dd";
+      sha512 = "91abdccdcdfb2af196d5ee78837143d515198649c4345c9d19d79a01b35381e6fb813f9c99e4b69ff5efadfafdd11deb53418190bf223122ca40d9449d3cdc80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/nl/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/nl/firefox-74.0b7.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "a20244712edffd519ce1dcef28b12ff9e25993ec54b045bbc9c3654d3e8d40d8b1589cc22d60e5bb0aee7e52c9ead1fd5eb0a634253704d28f201d71e69004eb";
+      sha512 = "61e31c484176e95852e02181f2a3f892603b3e2ee021d6f2a000016f76db99e9c82989792379f39520edf9374ee57f49b08ae4245d629a4aa8910add52b36725";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/nn-NO/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/nn-NO/firefox-74.0b7.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "ddaf423b62a8875e2918fa500d30584b226721dd986758e0583e55fa2860f9b9295c01eed0f44cb3bb360fd68b6bf76d6b4b26549992b56160883e1873491b54";
+      sha512 = "cd51b29ff5c5815496974f80190dfe34e6ec6cd4eef605f94306e7576d332eceb1007edba11d2d0d072b1b02601efc7f2fa8f27ff5ab14a92dd75c29db25998e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/oc/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/oc/firefox-74.0b7.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "66323fb9679800b326397573108ccfd970cf218ac0f9d6e283b3ab892e15b31c234f810ebb436af02b58a1ce7f07b42a369e304b3472ecb9728cad626e0ad219";
+      sha512 = "f6a5f5f3ca08b6439d02e5a8fbdf5805374d10b2512b8cda0eb45e5b0d0c4001f40144f5984791ddd8c7c147d9e96d399dc466d0004da00f245d1251d24dda7a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/pa-IN/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/pa-IN/firefox-74.0b7.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "494b8c8ac441788ffbecce5d247bf78bdd0de44078aa4db5f1c0daa24849198b99cbacccc5f0f972bd0b69c8a5d1be5d5303ffd0a2c97583eab9c24a504a4260";
+      sha512 = "42d4d089260373e5d16895c44b2f47610b96c0a01a0bb70c39876c376e70a58dca27efdc4a0d21996fd9479d0dd1255d6a7a448f6be8fe5d45fe675180d70d55";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/pl/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/pl/firefox-74.0b7.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "ecc7942da5452cce5e203f6074b9434fcba205c50a50eb8e018eb368579831bf524a52b181a0af275d23818f469e24d1efb7df7e43e517e9fca349aaec9db8fe";
+      sha512 = "cbe18d3fa35ec9c4f8a43e42bf4a5b5e38c8fb8b0624eb594a340ec866f0f8eee77093cb7fc3ad9cf85aa8c8177a43ddcc1d0f34933d34c414c4d7f6c74d5ff7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/pt-BR/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/pt-BR/firefox-74.0b7.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "9bcbcd89da3741b343433980751640476aa65f037a69d6347f98385a02e777617a698f2d8842b4e880549ab7d89902bbbf9cc020858e20b6354e9be3afe06877";
+      sha512 = "92e983cb0139204f51e97d4fe0510750f98cf93fe20f8a4b5bcd24874e266b7ebdff00170b25acdc492a7eff65f1c9c6aa1c44b29d8209c04fe5c6a43eb3ac5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/pt-PT/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/pt-PT/firefox-74.0b7.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "829976d56fb891cdfae4952a9f887575e464118a3b906b457e539c4deeecdec36a2cf18615c37182e82941395154525e1b7ceac2f84720640fdbd96b849f3aa9";
+      sha512 = "1a576f343b3b93b786038ec5fe0dbcbb3df4eeacfb94c447d5242622e207dcf360500942957d0019c124c32698448c23e231b336b8681526d4d2cdd8ec78202f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/rm/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/rm/firefox-74.0b7.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "4d49ded918d2810c74ba755a81c3a095b237e353e31e54c2aaa99f135a24a036a3436c08d0cd3be4c495ceb4afab46cfd88ab18f5e72df136bb0258b2b2bc78c";
+      sha512 = "c5e1ca70aec643d00531d4a485e515d17bc7be7242bb66c7df5818ed68f69e33542e57719fc0cd8852e4efcc4d73d76bc2646dc75e428052c078e260d9c8d2b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ro/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ro/firefox-74.0b7.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "0fbed6fba8d3680b5ee170b4b44c19f79bd088b385d343961229668dc637a95649f41482af1d224cf2678e421be15cce61cf170dcc4f2108711e0c07c09d1373";
+      sha512 = "ddff96dc6073cfeb7462b160280e996335e3dbc48ca717ff3ab09d93d686d9b5697144fe0dad7be12bb293557e431522844f9265e71d3839ad6e070b75a213fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ru/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ru/firefox-74.0b7.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "f3bd0dac4dd67bb079dba21fe677a52f61cc7ce0f5fe8628cdf70a86087064233cfd5716713d2ad29cd940cac6bf67af4993bdb9abeb35098949190c1dd13d68";
+      sha512 = "c33ac5097ab81d90cbfbcadd38b9d9906f660559ef5cf0d8978f603680d3e30505f8c65b55edf5b83fa91db2643cb893a8ae1d8d7542316d082868e341a19294";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/si/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/si/firefox-74.0b7.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "07f42c470ce8a719fd10507a6146f99722b63c8fbc35bc3460402a699cffe6a183e2a3bfb08c69db3adff1f94d439f0f7073a472d1f333d2236859d81852a832";
+      sha512 = "f99a34d222b07758af6a49067f2993d49ba5099b8ea8987ebae00a5ad908ff71782aadc49086152d84f1f1698a55ab027362247a15e05f62fabfadb7f45fc2d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/sk/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/sk/firefox-74.0b7.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "ddb5dca06ad37c54ad7e97526cb1bbc6dacfb53d9692e125badb63093ac969f0f7381c306ea811f0fd04cc65b62ef1793287caa3e3a33773518c0b6b45fd63d4";
+      sha512 = "a18af4cc09828a567b9c6bf162a8800034f4b094bac20c15dbcad8a33b2a17792bd1470f77f75d8da8f954b69cee74929d8aa7ef4fd47a078f84b03824658a52";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/sl/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/sl/firefox-74.0b7.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "c617dc91548e02a65222b4c418d2f8edc0e9f64e8cd8e4bc661cef3626b728a83e1c0b667d7c50dd836ab1e6f81bc03a022e83a820f46dec51df08209d35f56c";
+      sha512 = "401c261b1a523c90aecf1432bd01bfa151087d36a8331d0f4138330bc21272c4980c90dee46d2ba323a20825367bb54a15fc22ce14c7b3b91c8901d6e243f86b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/son/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/son/firefox-74.0b7.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "725ab271cb9b9f66022249f46e7658b31732107416d3374e53f53ef16f8c8f40957433c6bedefa18f301b78eac592ee079018b700def09a7b83ff9acf09d8f52";
+      sha512 = "63cc0aeb2b8b74166bdcb5db839ae7cb2befe7f444397337f73dd8b56bd763f7844283f72837b775ab923d70dc44797f8f99f3a155cec361cec9ba6e83ff6a7b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/sq/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/sq/firefox-74.0b7.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "50de90b50d270714d4f8bc81cef21d3ca1dc0bd1ce650b8202a7e0edf25f4c4bab651c1708293efc3830a8381b082e941db1c58e542ce9bc23648a5f522d08ce";
+      sha512 = "04667fa706cbe244ee04c2e36dd7fc496899d3b09d0a251dbf15371c9e0ae00a999131642c2b137ce0f23ea1149da1d487753fa7cad96fca8de11c5225617001";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/sr/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/sr/firefox-74.0b7.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "ca2c296c7a36b7c28315eb8b7746779f5aeaab6eebc2e20ffdb9080d443208fd051ba2eb6b40bb103015c403da0c1cfb3d7210fea36534ea541e3481a3db8598";
+      sha512 = "8254f5af29e06e3a83ad2b9746e90fa9b9b9eb876b64a849bedbbd2375a01a2e5d369ad8f3686bf524504cf085f463171aa9b0acbaa823b8a50c123d19dd5bea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/sv-SE/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/sv-SE/firefox-74.0b7.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "1669c987e3c8708978b95697f61f7390138f85d36bfef3866e71befc75cd4ef2ae28878bc9bc06e6c4875e3a653c80a146f6229123da222b5b93d08f3c916a04";
+      sha512 = "89a165c71ddccc04f8b6c86bd199267bd8fdcf274db601c68903868b67b5d3c3205c4b359076adef4ec48e95ad03f2034b7cae9fae981c584214a2cf4d607806";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ta/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ta/firefox-74.0b7.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "c6a8c9b6ec314f2a3602e3bcaba555a9826ee9575da5376d355145963538c233dd7c63a3fc0cbd0d1158ae2bfc667be6936a42a3f14dbd134e0580ee7d231fd2";
+      sha512 = "0a8f218a94ebe7e667c62c0c2c2752fe0df57885abad3916dc9ecba186f1420c77c1011b05f9512c37b75eebf9062f345f0d7580b9c7dba36c8043b581965e43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/te/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/te/firefox-74.0b7.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "ad5d8cac04fa3c50ee553bae8459b32cfaa342a90e68919600c025b6536f1e7e7c64ba40e8793eda76ddbf573f2a3c3c103df38be1c3d521798ff802d82dee00";
+      sha512 = "3a4cc3a66e8ed7a42a31c69c314ad6935fbdc3062d3a82c35e7f215f0a3e29e841c196e32f5368e2b24ce8a7abb71c65307004478269d156f68de78a945f3e1d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/th/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/th/firefox-74.0b7.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "1cba0960e666d0db889357e7cc189a373c27ea75a362ecf499cd9f4d69d4b3f6040b858121e198454602c0286fd7e4b4ac637495d755f9df59f1151f0fa87e4b";
+      sha512 = "fcd070aaec8d12509047fbc4cd3a7040830e9af6b5ece30ada6388cf458daf0a26e381db22515a440d6bfaad700a0d628c3036996dd9d6b3263b192b45da33aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/tl/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/tl/firefox-74.0b7.tar.bz2";
       locale = "tl";
       arch = "linux-i686";
-      sha512 = "935a443bd4051c5f199792fa2ebcf658ed88f72996f473756f00c8d67a2dfc7e821cb861fd9babeda9d6912adad0fb06bf0e8d4033fc855b0fdc1d996883e2fa";
+      sha512 = "cec3476e88d5d1551fe8a6e75416d0397001eada288d270273b004777a099bdfd2b63eaa5e2f81994bc86b0a720f35602308089a469adabfe457a48b8f11a88a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/tr/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/tr/firefox-74.0b7.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "5d80ea9137c1e963041d37adca91152b1ba27edcb61445e3a018759669eec4240db9c343888d5b22197f4b38db31f9372fb3858ae6e1b9c612ed4a243694222d";
+      sha512 = "22e71e68ccfeb4774570a94033ad7de3d90c8f327886b7c3555082b03b46bea090eaf16d63208897cfaa47094d7eeb8ee89d1d43af78cf8af2753b669d0c1fa0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/trs/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/trs/firefox-74.0b7.tar.bz2";
       locale = "trs";
       arch = "linux-i686";
-      sha512 = "2981eaf9d3487e5946a17ec61e4be9ef799107ab81cc54957ac5544270d5a2f26df2cd577669e4cdbf2451d6bf92232f49857358d1ddb95fbb6d6e7c6e469acf";
+      sha512 = "a6d7673761a590e7d714f8e5949e9962a7f693bf35ac9e5425c84d1d9173b220d9af3e1468c9c83aa930f31cbd2df9844f65a1b749883ec35fd5ddd4ec310463";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/uk/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/uk/firefox-74.0b7.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "1146c9ed03be550212d9593527de8f044fb47fd5ce33234f52e26b934920b3d5c40c7aafb607e1f57773cd79a664ef68d8ca9244a97d465f52771a04607ff027";
+      sha512 = "2944b38a4b71702aa04d11c68cc5fc0253614015d8ee7b63f9138ccb90a2190c52131722477218f99e917260ae7beb0736f8d8fcf275093f423fe884e9370a67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/ur/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ur/firefox-74.0b7.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "c54d497945fe94ab4e66452828b3e0b3eb6e3b4b14f787703175899b5a14331c5685fcab1f361d3a82b7fc3185ad25d4b1887ca0b11e24b89ea451ac8d1c3751";
+      sha512 = "e42728c0a24a131d831fd65c1b0006a28be594dd5011fe5a510f7b1b62c7937d06b1f0077a1ac2d454211e27f5d03c8d60f3fc725a58eebbe72f6064d875c6ee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/uz/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/uz/firefox-74.0b7.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "0790525ab6b0387a51b7b11010c3f8ce0612390f8bd768bf93b841a28f1cafdf928473598007fd1b3b27ce785e62a751b7a9f11cbb9d6ea99f384f9c83397cba";
+      sha512 = "9f777b1fd31953b903123250250f7dc55d63513c49b69c3ba782702f8faf4a831b1fc84137e8554b4af6e23d1203a89ab2a61947a39f3f9a801acc1312a7ebe8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/vi/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/vi/firefox-74.0b7.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "1288e5650ef2122c39babf6a23fc55f708d2fbc87e8c81457e511b84acd7cdb7e5a9dd934beaf10708c00e154d2a4119a990cbd6414c5f3d89c5ab83c09f33e5";
+      sha512 = "7023655042219b9e818fb921bd6da1941b7c75a22f7570559d06c2e10de2bb81191b266323fdd132c4c7ae881d932eae78c93dc6d8d5e20a6adf6325f87778a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/xh/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/xh/firefox-74.0b7.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "b8de4d48dfceac7714889a8ff8401d4e21b3f49e54c44a8763311720f7e29f938ad7992355e9225f5413060e34a97803a04ce1ff91405785e7a73bb13e8b283c";
+      sha512 = "6475fa9eb12145e13a9433fc4f1d28a8e40bbab39e9c33337deafd7021982a22e64f795382c2cea09d767df2600b39824f8cbca948a2fc6ad24fb6a94b3737a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/zh-CN/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/zh-CN/firefox-74.0b7.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "4c257e7054fac26b8e4d3c5e74d5833721278f5ea91c139b7350b776c169c9e5401288c511b817f6ebefc0c15963b665f793b988bbe4f4aba9fc5723cb055f5f";
+      sha512 = "51bd5cacf3dbcd6df7c887226641464ebe723bec4952f071da9dcfde89d714217f8677b8819425a8f1f3ce272a4228b08b4eeebe9c3aa61fe473138b891f385a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0b3/linux-i686/zh-TW/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/zh-TW/firefox-74.0b7.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "3845d207572adfb150dfcdd7fbd44febfcab17ec52a864f98573f9bea525dccf2deb5d940b9a487c8b4192efd21effade113a810af2bdcf6de1f91441e119a10";
+      sha512 = "741766345cb235586333866fcce8b33e80895b4e313306f26971f013e53189dfe4e119e1d9d6e94b09b334496cf8c49240a86c9ce1032d7ad5b5fada3e352767";
     }
     ];
 }

From 1b53ed149ea766dcf2389b4bff4452060235f96b Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Mon, 24 Feb 2020 10:41:59 +0000
Subject: [PATCH 1432/4636] firefox-devedition-bin: 73.0b3 -> 74.0b7

---
 .../firefox-bin/devedition_sources.nix        | 770 +++++++++---------
 1 file changed, 385 insertions(+), 385 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index f7a23816a203..00c8ff548d27 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,965 +1,965 @@
 {
-  version = "73.0b3";
+  version = "74.0b7";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ach/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ach/firefox-74.0b7.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "424e0708ee24b9db2faa8b46fa55b4da17a9a9028c265dc3d1392b15b5df491953d97591435e6da54c17ef63156f10b661e38d905fae63fbc417c9b97f053ebf";
+      sha512 = "2dca0c3b07364118aa4b7950769e94b75e932836ed139eee3c91168236d7e0f3bb4775a6463550e7a4b20ba57a75e62bf31c4db5ad1c46c47fb256dbaf78820d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/af/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/af/firefox-74.0b7.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "8ca2ef501af06726c8563b378f3c5a9a427db9c637c7057726451cb099a8bf2acd89e3036e48c0e1de4bd727163c11e2d4220b05e0b250b1ec27c8fc32816ded";
+      sha512 = "e39a8d3a8cce92984fe786d6e1d8272eea27ed049ae1fc1a6c9f5202665c84436fbbd48f04ea16b16a046521536f741c92f217c09db13d84483ed934091b3b83";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/an/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/an/firefox-74.0b7.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "fd153f8c2e59eeab7219f8c6756535865407834e6a8fcf6ca0b00d3222478f032a18b08b787d6d93435c03f8553f976298630b2b2c1c13581221559822196a80";
+      sha512 = "75e5e95ce56a748d6c193374741f6f2c53503dcb0aa8ea33e2695b74937ade76ae723ca7b397157aecc46d04419be3de19e020427083e5002043438e1461154c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ar/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ar/firefox-74.0b7.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "970773bc5d0f39c00e56ffce18c6f65bd11fd6828eaf1d03da47410486e7e1db988055f01fb269d6442c4997533630564575a5413316dfbefbfb947ae029170f";
+      sha512 = "fffbb5e730f1ca4925c0fca2597b29a359bb3835c5338024f15614c720a11087d36edb9a7eab4b99e42e75b3f622c80a709cc7ce08aee6acab23287f030f5683";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ast/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ast/firefox-74.0b7.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "ab26fc31dd53adee1fa976a23cc69b2754318e07bcf250d3ac1f5ebf6820dc87e99048de25d2027fa7636642b73fe5f9e698f311d144ca60421ce117c21fb3bc";
+      sha512 = "b820e187245a7c22f959600e52d386188c1f9a7fa914ff03a9da9a7901ed2c090b7a057967121ac0c061047099ba800a33944fb5c629b8a41ea3e789b3385203";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/az/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/az/firefox-74.0b7.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "a0e346298a2d4b37895cd4774ad85e2692e7e006cd0215aed0e3c2f1a1b1ac6945ebc9e6706af769ae54a79d8a15404d3ef41174ae992eb60a51d02bc92ea2c5";
+      sha512 = "69b5a0f326c9c9cdb2f98709e0400da6fdf05c4abe7bbf385dc0593daee61f1e4874ef6ec6f1fc12f5a1ef6b290b6b44664c8977b17496133f7bb95683937ad6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/be/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/be/firefox-74.0b7.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "500fb614558649ca571bd6fb975b0ae138c3287d8cd4641f4fed17261203d310f793f7e5d4cb6b20906aad065cee46d2cddf007ae09078f1035dd91f5a58b695";
+      sha512 = "2734e21739a5fd0fddc3ea52d85ae268aa12f45d83e2a3a2529d96657bf03396d84bf9549decba412988e637989014b88cba773c2586a1fb04a0dfc439d71caf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/bg/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/bg/firefox-74.0b7.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "93ed78c58fccc60f96eac5f373bf95e86f3ff71272ae57ff1dd06b09bc8f2cf7fad11d9e64f16247024fb5f3cf8d15ad8e0950de9b0b59c5d97cc7ca56354531";
+      sha512 = "d67ad4c4f282db155b41368df5094d6cd614d4e4deccb348b2873f710c3522ecd30511da368df97c4b9eb53a0588c134c7af298bf9abab602014d18d7586ef74";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/bn/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/bn/firefox-74.0b7.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha512 = "b6c343ad995cfe04fd18ff48926784e58d52337bd8b206b4cc83ca13be9f51d76bd2b02d165dada97738b7822c170bd1c5b5db22f1a55e9512b81fa457284b85";
+      sha512 = "0d8b5dcaf19166878c8fdbc1dc2b1743398cbcf7506089098dba170a5999a205653a048ebfd2017c4a69da4b71c8202245b64fa0835db14d41879e8a9772a511";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/br/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/br/firefox-74.0b7.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "b0bb5ec1ba87a8ac9e43c26913cd31d01f184d0df0f7026143dad53e0bbb1ac912760923412cd29042ca4f43809616a2f2dd7cb4b1f7676a75bd4800a6a7ddd3";
+      sha512 = "9d26f9c77c6e723cf942d5a656282857db008542a451fd2db59911f07acc7387a8ccc874c1c9ee25bc8e20248dedc72d9e1289c36d1018487929bf0d53093924";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/bs/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/bs/firefox-74.0b7.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "8b4e19f65ccfe0d79ac318e2e85a90e34ee6cf37a1c444fef41b4e3fd65f874a0ab493fa1ab2730c5347de1c7f96f3211666b215b430cec9afb2e1f329683701";
+      sha512 = "b7d973d03d5c25c08b2515510ccf3115ebe498c73a23823254e8955f47e065c8ca2ecfd651c1762d36d7841d48a15b76792fa2ce9282f5115fa9bfed8f411b40";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ca-valencia/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ca-valencia/firefox-74.0b7.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha512 = "9eefa08b2e796d917910455b5e6557230b329ce21889e9b07a4d992b35294b572762ab771e87f4b0a3917c3ab7e73dbb3122fa68386444ceaea7b8a2dc47ec8c";
+      sha512 = "94912a03c29f673de7e0bc1ea8af77ec5b28e3694f042573e3f44d0b1298d2a8520ee5c062697ba838532d2247662ff771426de00ac6cc50d011a0bff1bc0348";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ca/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ca/firefox-74.0b7.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "f37aaee00d8502d0a84f5130182975149835c0e8be2295f6b0456e5893016fd32097435d20c50b3d85cc8d425ebc279ad6220b1014cf070bec8caaffeba4f9a5";
+      sha512 = "6ff2ef52764e1bdd04861373cab88ed59bd4640e420a1e9567a974b1920957f14ac1e578bf32e1cb57297455aeca40cb84609d1adfab86a751306a0554008f70";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/cak/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/cak/firefox-74.0b7.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "e4e53bd16c71614106e01a7d1a616f3c8c84d31e9a4a313aa3a0b52f5188b8b576cd79d0982cbbf64ac37c304758dc17dbd35be8feb911af924634b7e617b661";
+      sha512 = "0a870236f57d9927361906b4098383dbc8430766b3b915e5a872ccd2c8b56b56d78edbe025aea8e8a120bf8a95c9159e26065fb24541d9e4a4860174b1d9b78f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/cs/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/cs/firefox-74.0b7.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "844902cdbbcd491e7a87bd0a888e7a61e3edce3574cf3c596e885ffdec2aead01e0d5a7f8656b11812c61f3dfcfed4c37e7e0a1f911e3f2e63204b045227a01d";
+      sha512 = "38dcb5650759007495e76bd62a18b95c63db7f63e77e5d0c488722d00b4f7ae00df3adcb771d7a73454655b8192e3008988e742733eb56f043481e40c357b847";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/cy/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/cy/firefox-74.0b7.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "03857201fb0cd9cc36144140dc0a0fedeaad1ae705f135b3977cb88fa313f9faf5e7af1d620acc32dd167618106ddcbf2f05706a8f8b2d7a7ae3ac5fe35208f3";
+      sha512 = "d07b503f1cf8b4b11a94fd2adea08ad0c37474d779d2cf7590e6700464260c81b0221ce5344f17e19634e1e6cd5f0a5addf50dce2cd4eacb10b6ff3783ef2424";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/da/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/da/firefox-74.0b7.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "d1bce5710a377a29a85178e4291369c5a069d964bb94d061a0564fc4f062bc778be48669ef50d899c439e38d33cc5fe463c9d9edd83f9f974486a36fab587865";
+      sha512 = "5386f303e45ec533e7fefc75d29252c9612126ee1d1415745c9f3bb9d2f9c12ec1cf5f93d488f83dcb51177b17f26ded417b5c93d0ccf207749bce8f1dd9de63";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/de/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/de/firefox-74.0b7.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "d7c8f6918440ba77093b5aaf69650cfe80e331411b536d0b24d999da7649c06e4365d42ef2de3db2d4ca9d5dce434cc6f5062177ecf748b440f66b531adb2c15";
+      sha512 = "26003755df79996a18fde1e1f0dc73178a3eda884be22a5848dca65d9d1b60677cd6dc67435e3e40100149d894185b0b3347e418f302b21bc056d1f982547de7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/dsb/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/dsb/firefox-74.0b7.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "ae7d3daa752af8a4dff2602afc7b0abd5b7d90d725ce0eeb9760dfc54d479e16bc53e7488d5cadd11f1d33bd6631c5d43a9c56e4356de7c0d12cf32a5aed6420";
+      sha512 = "a0512e2996326fd8bfa63a97509dfbae54ed8114af1ffd4e260e0389ea6e64207095cd5cd9fb4e5c4a2b98ab61a91498db2838d72e6d259a200c636bd9521eb5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/el/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/el/firefox-74.0b7.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "739ad0199e848aca996acb189b610ebba605cfb6526b16ea3790a287277ff099bc60f837f516bd9fd5c3d2bfcbeb189b1b0948edecf0379c3da8bf458bea5960";
+      sha512 = "832df3733c81629f0d432ac7fbf0ba0523104532673f0b584525b5238c9a18eb30d2919ef47361a70b5a8dbd11742767a1b7f57030814dce05f07a9b54a17475";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/en-CA/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/en-CA/firefox-74.0b7.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "65c90cbc816df3da6bebd8986ce99be193b304f7cff327ecb0191374c908e523bab5b9005e8022229af787828f513ef8fe814462b1a691f56288e9852c9bf187";
+      sha512 = "e50ef2f8a7ef4defcb7aa151ca5a8140d28da1111dba92b1ef8a618a65dbe812345f3737f1945e0f0c31d14e3fbffa833ff8f50e0390efc004d81bd2eb5705b9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/en-GB/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/en-GB/firefox-74.0b7.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "ca748676b9fcaf3e2e48b114fb9945355683bdb3bf89affc87fe36d7856cf433e901bd5ad3a5975984294d9023421e3acef892e64de4de17f908d3de5e43ca7d";
+      sha512 = "127ecc18969dc3226ca7e8a0b75cd7bd5ae96ab4f325655a049d4f57fd5471ed3e83e8587edb96e3a2c4cff0b370871266cd4d7b468791ce2e28eeed7ed91286";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/en-US/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/en-US/firefox-74.0b7.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "d1d5d2e202299f29a568245c20dc307141986ee99af108ef40aac24f2e2a49e12dbb42ba1a6d07c132400a608802e90465af8010329fbc48cb97f65236a723bb";
+      sha512 = "c4f47f02ec25a34590159f3e04b8e49841aad1092156b54b342869a3330cb7b36317196f3c65f57e73e4ecc6cc53f4cb19168425930febc100c53f626631fb78";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/eo/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/eo/firefox-74.0b7.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "9fa1e7a0a3b98ca67aa1cb693b26a0e4fa6a261ba1a34274f6c8c82ef67092aed94f399513be5089ef7b300cc598da1dfe0d08f811c6daacc534f4c2aec63e00";
+      sha512 = "07f5f34b74c768d8748a32103163fd6d0d390241e8cc7a1c7e0c90d627d822457ffa5406d06ff28b7b18ab1f9ec4cbe42a9712d56a5881351efa40ea6deb7dbd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/es-AR/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/es-AR/firefox-74.0b7.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "ca6802d8c226a0fd8bc15a926ecff00fe1cde4a69116233cf94c5f85d37023d311d25057ec2be5a0994c2e19671e3a984dac469a0a26cfddde805b18299304bb";
+      sha512 = "6f3531ab56ed0dffa9a1e22c86dca8f7869cfdf9b9adf8ae3c7d5ed12a567c1033db7b5c15daf98edbbecf0b450ff5a064e48ede479ada4b72ccaf0c851932ca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/es-CL/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/es-CL/firefox-74.0b7.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "77257cf06c50a8407adbbdce1b07943c8921f0296e599020f93d01096aa7b32bc08c8c0b3931b31e69460307a82bb4c93155c585f3312feac751f1ae88f98af3";
+      sha512 = "c969ce949167600c414b9f0ab649a72cd9b9c12e766b6b92ddf36735939d4d5471bf8312e309db5b2b6e1f508b0af33ebe35b8e76b67af663b300893b539cc5c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/es-ES/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/es-ES/firefox-74.0b7.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "06d8c8c6e4978d62c4549700fafe6380bd2a33509f128bc028d4d34293003cbba278154855cc1e2d46b00237c26615fb779584cdf307111abcebe39af96c9f32";
+      sha512 = "e5060f9a575b6cb430265f214a554b21794673db9334665d6cb72c476bebd3c1b2797c8fb3447297c2a06f0e243a6da5da7f9d22a403472d81dc8f754eead226";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/es-MX/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/es-MX/firefox-74.0b7.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "a5bb660b5e3d14a8abbb98894114427e537ea5c848085e04eb7513d5cb38efeaba060fbd92de4374f513730c57c6e7bb3cd434e74f5d488a92c169f9347005b4";
+      sha512 = "48048e589d5b57c75a5eb7e3048f541766129f5c63d7e3773d5d62fdefa5afb02338e14f76d44c6ca0c4ca0a688cf259fe98d0fe23759808b9c45414d5009389";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/et/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/et/firefox-74.0b7.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "454d9e2f1d4c7aad02bd67eb5ce28ad481383f6ca43d0d2e0e1386ddac4e9015a2ca2f423b7d05b78c41f196ecbecac8b240ecadf0291ff81945276232a4c67c";
+      sha512 = "3f196d585242bc7387233223210f444bbff50309ed2638e16a19f42f48c06701af560e65f127addf861536151717e099f548fc837d5bcb7982831c0e20384055";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/eu/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/eu/firefox-74.0b7.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "ecffdc18654bb030be8a09bf7f86d444ae8fa570e94d6184b0fe2f1a7c16f0d49f5ad594205b0d0c79a2b90078aa7b1529fc784ecb5980846e74178021ac609e";
+      sha512 = "9b831ad80c7e5234243607b3391d422015fdc5276e083291e75ec1b2074c69e824c49481bee0ca9f7d23ec31f02a9fb72540dcf0634afed2a8427ece7d4e0503";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/fa/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/fa/firefox-74.0b7.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "589e73827314af1d5819e93cfc1dffdb1dfe050ee09f927a0d6c049541e5f218a46a6e23bad3d5927c92fe31f3268fb8cbf5ad0aee6a0c6a67ca294158ca8d7a";
+      sha512 = "8318bd18537396c99f496ef5d43b1d70756cbf7ebd153c6dcc272c13eacc57737a48c186e055bb9fcd10936510b038560257ea03ae1bc8afd563df4e703b05a5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ff/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ff/firefox-74.0b7.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "d12c967c89baf8f96726e83b3047c75a58d8e2ac77fdd37b71f686d42dabebc30770eed87d57c897ed764d55ea1d8373d50c4def1c202d5d455ed0918f3cd46e";
+      sha512 = "d2c46c0569d98f96415f451d2956e0a86fb030b254852cc552c48b546e31f75c5a6bc54a97607f3653ab330f1b3ea5d988fc933f1d0654919f2abf4d1e7c396c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/fi/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/fi/firefox-74.0b7.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "69afcf98da111e683c6fb5adb83946c3bf61b63c9b85ede26f397f42d86acaa2257e45716622029e6917625ccba742de876f927f5508b55d70f6b16372ee4511";
+      sha512 = "8b1cac6cbb141bc7dbf8bd33f6cf8b0abc7b97f38df83181241948b8d376d67c77125795a24ff64506e9ee5f986508005120b7952bafcbcd76fe0e802c23bdba";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/fr/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/fr/firefox-74.0b7.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "f119df35876a10175f129a04ba988ca41ee66ae843711f2b6c1dcd1b370d91f02ac70f3cc7de3882743a26241dbe2c32bf6e11f0f39293287091a084a4353b34";
+      sha512 = "41b55258d992c751aeb60ea8c9819f05fa5365d98a0d305c3129c989c46d1022e667edf654856b666c84e48eb799f3194acbe8c2a278baab8ca5984656317e54";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/fy-NL/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/fy-NL/firefox-74.0b7.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "69b9a51dc956705b8569976fb72460c034872d5e62505a69cd6ea6bd81175479e8641d1931504b047d9e8c5580af8aeb0b0500022141a0d7cb1df886d52063b1";
+      sha512 = "cb2368446de46f90a567c6a2d698e6fc0e48aca18093c7feff581b5b7fd15d5699e3d4bbf02254b3c54cb28acf95c29b1f86cf8e2fcd40b0759dfd068907ae6a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ga-IE/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ga-IE/firefox-74.0b7.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "a6739397f1a51e1944dd7ac5a9528433f8b0963ecd28d28ac2fce94042659bda964c98e5784a72fad58484ffdf870d3888c68acca7abed4b85660b31fc033cc7";
+      sha512 = "0c55d65e2b1ebab4c2e976c76eff205c6232b0f9ddbdace008c9d27d9bf25773e91b516a2536b1e7f069b4c7b468703da22d1814cc2fdd3ac1eff798184147df";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/gd/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/gd/firefox-74.0b7.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "ae71c727b6e37a83b1789f167de49f3de43662ac1f4a9e0b3005b3f68c6fd5d43b141b1b960a8800cd3c2cfb2a3b1ff7483f07c2f24d8bc2e967d50791f622b6";
+      sha512 = "4723a47718cf1dec08bd9b3d6e0e7a4f857b5ff16ebba926f26cc6bd2000bfd19c238d05df1362d602da57864578fc2fc14c9f9c6c49e6b430a5118b22636cf0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/gl/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/gl/firefox-74.0b7.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "5c8be99ab328ff792861d28851d664c03bc9ffd6fa2861253856eb350906dc49571533731c22e15f3eace1a2041e08434a2e77946f622fc8e6e3aadc1903ba50";
+      sha512 = "69e719b5f65c0b8392f1515bd46ac0d22d763ac3911b082bd1201f7dd70db53862a60a0a43157f3e3cc468bd133eda0d5ef915b225159736d936e754237b711d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/gn/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/gn/firefox-74.0b7.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "b55c72cb0b7e81539e63a155c896e8d4f2dd821122379d4a98e9efb72b72f67d5fc97bed4a1979a0e2e22378a19ff2380b4bd9d6164804e679f1e0d4ae92ce1b";
+      sha512 = "cfcdc2deda122556e89f7b32b97e0cd5a9a01970babd11c3fcec205de1adb0744674dba06d0a5b725c379d2a98dee592724d5310f4c8ce55d9fb46e58dbf113c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/gu-IN/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/gu-IN/firefox-74.0b7.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "77bbf000241b5d7a4e7ad4b7e01f0edd4930fc73b2d142f40184ea6ee62c0b278cf790b5872b666366ce4384b278f1728ea2ef18e632cfbdff379c8c480270ce";
+      sha512 = "b2c9551e6cb5c047c6169e5bb1e3eaa6272391fe3905554762b21037b832e2db75497b3e3d680e886821390a5df1df8c28cef64022e4fea77e439c97b5608ba8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/he/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/he/firefox-74.0b7.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "a7ac1700342e2b69c3f1a6cfb24baa7b67cb186bad85e9ba6919e68f0b0b2105ffd4b4c20cd40a9fa4b842a53a277fe84f958ba8649e775500214df73d3ddf39";
+      sha512 = "ec076d4f9f178c3ad69f38e10796057e6650c4771002ae3ab06b7334634482db783ad1ff946e291e55d6112bcd1fd07e37cb8a475af268ddb6fc4541e4ba31fb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/hi-IN/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/hi-IN/firefox-74.0b7.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "574065abac633c814d3380180bf2e9296250d15fb182784393396ad971388e2a00e1b04eb20d66f41e4611faae532d4765029977d281b93616f8aa503fe5fb23";
+      sha512 = "3c7e6b5343c6bbce4aba4069f543a09fba4df38350e30bd792028209d1f3f6a862a5ad8b08ece57b0e10b49775d97a5846a0fe71872cb3b8e7de0ff11059eb23";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/hr/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/hr/firefox-74.0b7.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "3e8637bdfd6b0f99c6c03743242c2b560b1c088ea69bfa3e2f5657e76e9e6e1b72a638c34b6fbfbacee74b68b7e7249bc8a66e7c4b384a978448a44441ab4782";
+      sha512 = "44b3186b2de73acc348b2114818c3361dc6e09b8a865f6ca81af5956a7a5bbf84932d39e2a970d8eb314524bff6c0b59923e50ddff203c3844a7e075b01d16f6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/hsb/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/hsb/firefox-74.0b7.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "43d1b2c699372e30a04e1c8e84646f6fe07f54f6734c8d0155e35cdfde2ce327380aaa3313f4c3da8cf9773bf3a1f4a9793fa539af577f1d025e0228aa50d56c";
+      sha512 = "b367e8059e20aaabbb53bcdcf6b84d2687e748d832b1eba6fbc23ff097b5b8351d303fcfaf6cc12cb9921231072838c3c865ea1737e25ed533f523cf70cce194";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/hu/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/hu/firefox-74.0b7.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "d755fd0f7248523458f490457d47fb8a6804b36cfe1eba9fac28b68919b2f0c30769a149ea34f91b909b407a11838a65fd6d3b21ca9508d335672d410b1dee59";
+      sha512 = "bdf99f29203f13973eb100e83827ae669bc0d42bd12488a3653caab92c1b73edeef5304db2678bf6ad59a86e40aa14c552518765468bacde63ec4b4b12da09a2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/hy-AM/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/hy-AM/firefox-74.0b7.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "10a3725db9b9c4ade65768974c96106d142ab39b7dae6fd9a452d0f9d831a3d9d05a84575c6970add6af8882f62c71e8b2d9a3352745e71a3156a6cdac534157";
+      sha512 = "4677da96c94600d9becd6870acc2911e385093775969afde671c900700eaa56b25a4292862ebf3873a704897995c87bb249bc17d0da8394bca4d71d13bb85369";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ia/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ia/firefox-74.0b7.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "72f0269b9279fa88c7252689619e68b08a1238a790940b3cff1f82ddef9c14c4b743a260faa3e63874439de95593e1496b5d56283caee779f486c7ccf591b8ec";
+      sha512 = "277cf81214b0cb0a41f9dce8704d387eee36e6d947e7f625239fd84bca25d850d6f43db92a88bf68b3aeb12bc6e2174421fe0a006b80b89bade5de949914bd71";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/id/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/id/firefox-74.0b7.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "9d5229c81495296628c3b8cf6f3181b2531d339c34faf531cbaac7630959fae86b6a07e3ed3cdb450488285f2427680d0b2f7ea00a5dafa96f374ae5f4821232";
+      sha512 = "26b3e8b4d375e57bcc3c1b7a641f27240106a1c42fc97913eb3fe4cf5f51885ca9d004cd95df1a798270a7a16c5407ec519e2ceeef4626480e7a3440e45f237c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/is/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/is/firefox-74.0b7.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "afb2c487b0f2f1713750bd222b03841f0c36ad7ce38cf219336d867465c02fa4f2fb30db0d7f456bbcaea1bf92e4d463db256fa84855bfa93e0a4c97f010895b";
+      sha512 = "ad3bd0a308f8444ba01b84175b3bd72dec2c234edac61d5ad839644d4a09b89fbda61951229ac43b4f152c5ad8af7055477fac2fdaf71c2ff737ea73089339f3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/it/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/it/firefox-74.0b7.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "83525986faecf23f7282a2d406bac08d5d538df07eb04abba8f2334de19ffa5de5990cd7c73000156c3abb54e895f39c0eb59e5241484d92733505cf264143cb";
+      sha512 = "a6c2ae689f748c8c306122057b267191e59e9b8bf273600beeff7181586c54c3c014b74aa88dc286132b8c998607b0246012a12255025899e7c44619a3940a9c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ja/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ja/firefox-74.0b7.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "f8c01a7b0a3172d3e03621dfbf507b61c320acba371e408155a3ce325db65135dfb4023ae09758c19c078794a38ae34aa2c115159e491010f46ef74dcdcfcbfe";
+      sha512 = "1418d6e286a20860d7b7073e5f3a15127545e27cc8692a50c178e7d5311948716823bb9ab713450f6bc3fe2d443165971a8e6ad2c8251ffbb2379d4953b37714";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ka/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ka/firefox-74.0b7.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "ba041dffc57d9c15690e689ebd90f5c2d09d5b6972713b1249f01c190ba4b4062e41fb061a32fc69953cc8b2d2d6eb4593fb13287795f40f8882cb3ef35943cc";
+      sha512 = "039af653f9e75736027acec1f0e405c350ec66f4d343044297089601bae01fa76d6baae8a9b2eedfd31981d8022f4ff350817fb2505ad3f5e59aafce3441fde7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/kab/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/kab/firefox-74.0b7.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "e2f42c9a510205e88978b05de9d2b1871dd5756272da992a9c25a1ab67f6054f4a052c3da1eb2882d908d0a56b1c64426f73ed1994b466abdd78ac2cc4d3f012";
+      sha512 = "688930d5d2e67d03695abbcaad36880a052a4196fbe8ff406cbd7bfa0e540394836b15762e2ff64627a4f4e9abc16a58cbcd2d362624bf84db2efd6a4008c612";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/kk/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/kk/firefox-74.0b7.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "77d20f9f753197492158a4926106d9436b74afe4905119fa8ed5255ab270a1e04e76a515151f5a20110652b77e59ca4a562f04d001482a85dafa9b3e5aafdf59";
+      sha512 = "1f794ac9678b81af8cfb8ebc6c379d9e0603f2da337c23df1161170d54dc3967d6f89411e7b550da0ad1a2b7cd5db11ed5040d4056b333ce5dc66c1cd4629534";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/km/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/km/firefox-74.0b7.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "120a68421dcc63e14425556a68677203e95be4a5ed9c8f7b85d6c8665b93debf2ac4ff685ff199162a7c347770bec787a6aef4ca0111472a177e6ac46d1a97f4";
+      sha512 = "54057be25090fcfef69ab8ca2e4bacdfb96769f4e797fe83932bea198605a183e8bd8941484cf0e91c3e3a4fd4ffbc384be09894cf381b777649cbe340bfbb6e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/kn/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/kn/firefox-74.0b7.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "5ee256b56533a0c11996b9fcb611e97122e572162d5a5463faf17464352b9242dce2d2bfab9074fff8340ec06b4b741e6a3bff4e4d584fb0f52d13d77cf87ad1";
+      sha512 = "6e36f0aff051302132e5f83667638171b3bd7437b9d0fb3160d0f069b1131c617df6668d0de0a866e905073e57d6ac1990c9f00d59d6cfb179dd4eaff6384aa2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ko/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ko/firefox-74.0b7.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "ade37f0d1ea0d318b414bd5d9b293683610aadd19d5d6d99afc4ce5745b3b43a25c6f95e5a574e547af89de558d04aace4aec80a109a022147bc2629ed7114cb";
+      sha512 = "6be107f8f29914633196903bb687f7d23ecbfe70f4655247a5a260ef01a0841cd843600791867de64575caa63e0d3f09935eaa7ff154673d72fe044e5dce7c4e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/lij/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/lij/firefox-74.0b7.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "b439c512f322e7762cab97b967b80fe695229bf10e406a7c1e3c12fb0b8b752716ddd6d7790acbed6d0bcc5763cca8447b9d071dc7bee245a1f86b81f8ec3810";
+      sha512 = "7b2ce6efa438363584daec053c99a4f61133ecf151070c9fb7a44b340a60f3c132ab92b9df50ec7ffc8ae556951876d3a4a3ef32551fdba4a359d7fb80da13de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/lt/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/lt/firefox-74.0b7.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "4208d0bcb28151fbfd80e5ca22f2d9cbdeb0a31f009e86dcf01733582635ae6e9944e4ef623ccd97e466893e58f9039f19d951253abc84c6a74465cf7619d3b7";
+      sha512 = "723dbdbd1881f8f072a63ec43050855dbf147e811eedd983f568fa33516f150fae2af615c565689690b3e9effb119bb0b3934022c3a5800ee9d5eecad4e42c05";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/lv/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/lv/firefox-74.0b7.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "a3d3338683d84a4bd093e70dae1b3a85bd88f952c84f1248c46b1043e80771df2acc851d9b5ee207ba6e8a907e3bf7dd4f2acec700f268344d6de9369f2923f8";
+      sha512 = "3da0b6dcb24bacee313a5c654ede55885f538d4c18385533ba92b32543da0e6a790c242c9b6cee92c4320292aa2c7a4975241feab89647d430fe0f7cefec350f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/mk/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/mk/firefox-74.0b7.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "4cdc928f24bbe037690970bfe293b3af4ee2db74af53f5ea8c57956ffe2b3699da76bbb5c78949b9856112aa93ff5e6adff80207f70fce0f7d0b49cf9cd9c6ca";
+      sha512 = "e84a8051a9e8fdcf9e27084166e8da04898dc143045feae305c676a02c6381e3d0f3ef2cc4a74c6395075d9172fd75b4763ce262c42284669d542c56ff0056d9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/mr/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/mr/firefox-74.0b7.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "a7b67c1592a59ed556d086380753e20b3cd6924ab0cc6aa22f441c70d10feef049ebcfa89c216caa42104e34695eaf492e4abbb654b5aa8115a0f8a5cb3db85a";
+      sha512 = "23b8ce5221190e3d147752e8267d27edde8f4f2981e4c329a5e223063839881417204076335df8c5f50f9a0a754d4b391020ea7ba5222c64ad7ccfef3ef0da68";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ms/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ms/firefox-74.0b7.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "2772a5fbc812e99b259afabb73085b64968c5a23269199579c22c9c4d7b7e85723d72a575aaf6bbf3a1fcb6c2d442202bb4017d6bfe562a8b535caa240f8591d";
+      sha512 = "6b9d37b331fc1f45cbf0ebfc005f47375a24cf0bbd7e68940c6804d9afaa82aac048ad4bdfd0a018c2ba4d275a145a2a64f3c62b1f46193b2d59f7a9f0ca8b5c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/my/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/my/firefox-74.0b7.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "d7115f8e44e7155e5b0ae474fb7a7236160f7f28e8eabf25ce5e42fcbf706e5336f314194f47842689ead602e176696a55b85983ef43439172ee4942752fc3ca";
+      sha512 = "bf2d1cec77a74608db287c5079db8a7681f18486ace763e59b59ba0833c2e1f61d10127fbe34678fcd15f4864b1e94be2160fcffd14a62612e7a543d8380661f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/nb-NO/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/nb-NO/firefox-74.0b7.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "ac575bb2f12c03a04bbe1bdf16f14388b43b2c4a449d0a71f3486baf0b488bc44cb7764864324da498ddbf8af08684e51cb9f9bd45ef25d2162b12318a8c4c12";
+      sha512 = "2c93b5c1bbb1d629e9d3fe38170b610e8f2f4332a12ae841959955051e6e6f4d56c6162f7298b9ebba78c36c81c150dd28c10b18d194c3ba7116733df5bcf7da";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ne-NP/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ne-NP/firefox-74.0b7.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "fec1a4d5a018c4e3bbed6c4664c993dd3103146c80c96f88f90e65c2ea0ee12ae1e8ece3116e9af23b7af63220666b3682db12efd43773fc1803dcb0e8685d5d";
+      sha512 = "e6443dedebdb4d11e3a07adccdf92d221f7ea05e257389792962331d9f3f8839d24509dc996b39843ae9079828a21975a026f6e0dc75e06296e2c392781f70e9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/nl/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/nl/firefox-74.0b7.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "3aa8bd22b20b01e1703345b4961d6a0be6d207d3f5009264410b4e1523d70a26995288a5084b5a5df4e54783d723be0d22b075d4619e4ea66120497651a674bd";
+      sha512 = "b6c0e5a0ef7af5cb1c9ff89e682e9aeb0b954ba754591dc54c8a73fa1de8e3f37f5f78f614e5aa82eca5289dfd62782f9128e984f79fc3d36486a2dbd4affc54";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/nn-NO/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/nn-NO/firefox-74.0b7.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "416c6f87f6ba7e339082a232bc9a6669fc1d0594777e33215cc4dd801e6765f3f130a732650ebb83499fbb03e6af6819009090fd1268b77c61eaa06b74965e30";
+      sha512 = "9b2c0e29d4bc92685ef2c914c783dbbc663cd6bc9ea6f15e398ab8f8fb238159ad0dd84647c28b2c9e5991e75195fa2f305690d9f7f98360c8d40754c10d4bab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/oc/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/oc/firefox-74.0b7.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "43b62c8b25703fcc0bf2df581c0434efe5fe0718820daf5d953335efe8171f8a052b9e5cde5ada8f0576c1e38e844e082724ec4d1a1a90e91a616667227e22d6";
+      sha512 = "9a50ee9b626f3f96e9d08a5f5df174f8b89692ea2fc3b927f260e9579174273f78a9d11efbd1007b4165331dd52e52bbaed83a77ed458aef166b764a2bc5d559";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/pa-IN/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/pa-IN/firefox-74.0b7.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "b519af2d1b7d404f6cf7f46c0806b909c2b9675b8af6da39d2cb8d006ad8e79ca6a9e5cb18fc69f1415a961129b6bf2248d9e4ac1d65e895771b504aa2dcd34f";
+      sha512 = "9f29ce7b0002e41a08c64129a08a0946dd622fe69e6dcc30747d432990bcf4fa209256e74b1a7ed51364fc142449e010f6dcd61606441f1c4cfaeb4440269ae8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/pl/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/pl/firefox-74.0b7.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "e7570576016b72764b0046586e82aa059883529c20e1b14a939ef27f2a8d083024bb131eec90be6e8f33f3bf798475fc47494ece617b966251162c4638582a48";
+      sha512 = "c8ae484055f3b0dbc81043355903f8f8b60c3c07f431b904d4a181488461a810b8912099cc0ac23adf026e377a71a2248ba216f840ad35193d774367d484a1cf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/pt-BR/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/pt-BR/firefox-74.0b7.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "daac9ed0155445874110fb161c8056277dec011300cb0ceceece63394892cd346f3e1ba200a6516c6e02ab1d24afef0bc5c02e27ff9fd701d0df299314908f00";
+      sha512 = "7708ab164dbffcec1a90a42b18bf6520e0d1657cc33a7e96a2b241b170649c2a3808b3877bd413af835d269c3ecadcdead912bf471c6f84f811a293612257087";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/pt-PT/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/pt-PT/firefox-74.0b7.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "d819d3787bad21052fd6f870606ca216dec51e0034e307aa1490b945aca4870f7540dded944e787d0ef85154b8aa085696e8e765a70bfd1bdb88058f942f91a7";
+      sha512 = "229d4ce0e510f178d08474dc663a598bddb85bcbf23db6a98aaa2179d9e8824be65da0b49313854dd96077abcbb401c1fbeb9a5e3fcff1fce457b52bf97112a6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/rm/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/rm/firefox-74.0b7.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "d3d6eed9506bb95a7c5b78cbdf4f82f3ba2735086241ed0f90c9010496d8e7233a2fd9e7cf09704bab762590dd03fe8cbd30c50188e3b51846a18390b84f0516";
+      sha512 = "1ad93043f33239894c9d38b49347445fd0e462dce882bbaea39242be93d71233fdc621c2778980bcba089d5d72e60a751fba4df663b19c0cb061bbefac5ad637";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ro/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ro/firefox-74.0b7.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "f147967c9ba077e629dd1302e4dc1bcece89b94f8495e785892495d7d2100c465426cc318904f127fdae7ace3d2cd878b6a98e5fb4d7e56118f7b4bc5820c33e";
+      sha512 = "4968c4a27122bac5f4bbbcf2f55064d6d42b35e7877da3a2cabc0c877e4bd70b1a5c9beb81edc4e13cd0bf34495332cc137b08a6dd223a52b8033e4a1cf10126";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ru/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ru/firefox-74.0b7.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "6d1fc4b8e4763e84bc99f8771ac95d8f439038b21dbe555badc42ca58f7ae0d55a355b4de8fd623e0014e6fb1c53d1bb01d3701139d7c23ab70f86bfee18762c";
+      sha512 = "5fe2e24d79d716822463a3aa89ea63a578819a028e1f4715a5852ea1f8b05cae906b4140dc21c6fe8a2f9a33c3d37363f254dd0cc38b4c480a7e80becd2fccd8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/si/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/si/firefox-74.0b7.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "6f8ddf92a984e1172e9fb84f482bdfdef4d76eeff4bbf6e9ee1ec16c0154b9042132ba2806bc31e7d66ae0f9f2f938e78a8b1272b8d0f02bb3b100dc12da0b33";
+      sha512 = "10e1023ff62b4e66244a8f0e9d937b338087934d12cd9ddbb1d5935612d47668bb2e704406662efe962eec89b2dd4ea53c2369c524cfcce0b38dbed01cc3fa1b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/sk/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/sk/firefox-74.0b7.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "d31f250bc38982d2760bc4e57350a650653910ad972ea444709f1cc9dbc86f7b1bd614ba1976898f2cb7ce6c0017f7cc5905b5658dddeb6061883d7ac06c6de3";
+      sha512 = "15fdb81e23eddf249eb5c2fd2f0f5ea824560a8a34f3080efa29ef484251379b9eb86afb66987311fc892c38021f81fc2664fc41d0f9eef6135e426188083a34";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/sl/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/sl/firefox-74.0b7.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "986c0e11f5131c756a3490a2ab772b792eedc57554b2229c501a11bd7f39c60b7b916d18b9f3881cb595fee8659ae7ecf8e3a98c0f8a1dac17d13129a4c50e30";
+      sha512 = "44cd71b632c0012133d68537aa4cfb5512f992ddf227901d35f9ac6034e38cf36190c4c75b95e0ab93ca172e0317922a62497e9458edb0b724d8b66ccbb06190";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/son/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/son/firefox-74.0b7.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "55b602a8e9aa299e4cf0cdcde126ef07c9ddb9243b871734a7ace76fd476c67531b760722c19955e5039579c920a8c3f77a16b3846c78f8855ec5b099487d993";
+      sha512 = "419ee0cc45d6d0bef462f093b017856cbf33e1dbb190d822ea0b85bf91452f583244a876771e1680de1e68bcb0977039187dcef56b44b1cc14e4e5e2e7c3478d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/sq/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/sq/firefox-74.0b7.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "c7e4a285a228c1453b47368827fb2d602373335c4889a4b7221a3c2fcf8ccffac1c04291d967bf0cf885deff0f887e04b35a2220cbe9eb3eadefb9003634bbda";
+      sha512 = "787ca501dcda265430e825fd890b6760b2295c812ae882bb7d07ce40f349ad2dcf4852bbfff0c6cdb56011f3948afafaf0dbe76842e0f011f9e4e15214e07b9a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/sr/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/sr/firefox-74.0b7.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "2d1909a4e8b91aeb0e42d491201f67b733994e3a82b6f899da467eab1c7760cf21888a2e5e693f8cf18bcb7b53e3c60ded962aef09898dc2e1ffae189186c3ec";
+      sha512 = "8bf08f9460852e66649d60b551d3d628f7507c2302f56d457f2649437d6523e74ea702115895fe2ab8ecd4a3994969b89d24094c0c41cf8ef81eca140c63f80b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/sv-SE/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/sv-SE/firefox-74.0b7.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "21a6d9faed19e72df514b2fe0e07e7ea4c6e167a985d8fa830b15d1fa754382dd05e49c1b7f1f173e01fcdc03af5d05b3151e35df3e3c9854742a8a5c2d5be95";
+      sha512 = "75f71a1c906d86ab92c0bfa6b2d07e54b3b411037614f27b463f7f97b39a73df920300ac3c227a7c35a062c99903fee84fa685050cb9eb25bcdbacc99650ad12";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ta/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ta/firefox-74.0b7.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "ebd2806835bf2a54a716dee6dca94310fcb61d55679cb2f9d3df5ad84a61bf040c36e286ed51ce0011c6a7a56a5baba9228ffe26fadfb2e62233fc1704e29c98";
+      sha512 = "cc147836101fd0b17d24f696fa0e5d4a4fdc2579f21deaf95757a3213d967e6e934691af5c7fa84bee9a5e0a3dab37067c8d44be821eb5f145fdbb5cd96c30dd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/te/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/te/firefox-74.0b7.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "1c18c4d53a1851a8b68cc33ee3e63c3c2b7ff7b194fe70d68ee29bfb2fba6a6f6d88937d61fa58972fa00eb64ebc50d3b472f8f6e52bff7d1ebd713700298af7";
+      sha512 = "f4ec0d17d604caad1b3eb37b413b9685bcd39517e680e1636ab007cc4cdb253e71a2643c85436be72de2fa62bda13dad6787e2e8fdda3689e421818d2bfa4fa5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/th/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/th/firefox-74.0b7.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "a79967f2fd94b987cc8b04b536960536f0bb7bbf25fa64d48423f3a382f18dde33605aeb9fc551f99c2c4be56a9b3c01bfde553b2457d84833e4e126ab35c8b9";
+      sha512 = "f09b98036d5822d588a1afd3befeca14748d9f7938ff101f0555d740f5586462c07ebf76c90a3238636a3d37fe3f5a90b26fcae1de8658cc0db712e2ce3d2116";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/tl/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/tl/firefox-74.0b7.tar.bz2";
       locale = "tl";
       arch = "linux-x86_64";
-      sha512 = "4fcb7329a0e331c9a2f78382e276bb856f47bee1472c993fef54b526cc5cb0647ac9b49674ffd35e1dcea714a8ca7374ae59c52074af75132c8403c23f3ca41c";
+      sha512 = "28ff7d5cbd6a41ad2887dee8c04b4e129d588cd20758a2f2233cc69e6ea24cfe7013f5f21524be30139e243fd6bcae1193949b653360db65d8544e6cb654459c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/tr/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/tr/firefox-74.0b7.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "0c768fc110fdea49298c334cf425d88cf5c7d16c1bd638640066abefc7821da41f4468c121d09347ca258ecfea86a8141731b6b84e88677a45fe4ebda5bc15a1";
+      sha512 = "2b676a0d0db8edb3f1af3174b7543f6cd704a61197ce9f505eecc53f7431c66c1b0853a0d5cf57c9ec601377bbf66efddbe648ec992b4e518e85bc83c8f052e1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/trs/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/trs/firefox-74.0b7.tar.bz2";
       locale = "trs";
       arch = "linux-x86_64";
-      sha512 = "379e1bfa5ae54fda8fe5664329b147e5f2b7356865ccb202a01a30b77fbd3e308063537c8ac585341ce6f63b4bb0b1ff52e25d09c520daee3ae7ba376df7349f";
+      sha512 = "0a934e3106d9e99e6bc2d93d7f50d6a87e146f0a5d771a6a9f52a18db8cbc59ded661443d6bed42c148e6981e8d809f3449b27bce9194d584f6d457edab1b549";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/uk/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/uk/firefox-74.0b7.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "43f07a1a5a7df971696b6350f800536d670fda1802774b5f02f033699b3d08d152ca23cd8da737b86013db11dc6b410f0723808f33fd07bae802d2c566e5776a";
+      sha512 = "3860b93570cb44849ba351b15318425c8a5a2e3dc82f6a229cfaba21d22245f74b56672ab82fc48d52c250c528b9bccf53d25b6d358e5b02493b6fdd82037f4d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/ur/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ur/firefox-74.0b7.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "2afa0052ab11080f9a1933fff0d087feaf57e983d4f6e9ad1954afaae97c7ba3fe6d0e3d961f78369771b2fb4894144696b9bf628aa3b255a83856adbaf2eb2c";
+      sha512 = "89ff25d895fd5a484ea78ee6be21b7789998215847445d8aec7487966042fd88e5703938274245b940807d7f668f21b41b8eca5eff0d5ac715f3958ed8a32dce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/uz/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/uz/firefox-74.0b7.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "c0e27e017fe5dbd1a2346e38e467bd785d41143b428b0fd2dc3da698ba9be73033c45beecc72a50562bc7d2f7900ce27be021f74db00dd6a32c7845d6e8284ba";
+      sha512 = "60cb02c912f359915ceb6732a1b8c358177966bb24ac7849362b865b1570b31266e9a9f2790384eb2ba6c15298642e8e112ee85c9cae1da65b62eea5332f65a1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/vi/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/vi/firefox-74.0b7.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "55754603578038d0ca49294b228ea5cc5976f899faa59615cf392f7391a152788dc154603521fbc2a9018279e35649c402011b32fbe0d03ce29139baff57261f";
+      sha512 = "b19c3a265bd2f218d1f7012397c081690f8c949d4146c0d504409858b323a9084c00e04e540904d82c31ebe586a47d1cadf3f9ed74be0d20544af7ab95583486";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/xh/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/xh/firefox-74.0b7.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "943c6c8ccc8c58fb62eca7d40b5afdac7e16bdc8c4426968e67827884dbb5e0b2b6732b5329d4df2efc98b198992e5ca51a4b380df14e1b1ebc1bb09b3a57556";
+      sha512 = "d0e177251ee7c2f756083f1f19993d16c365d77f4be3811a11e6f93384cf58c23ae8579a9a65cf289264e0e45705226b4cd1365dda3f8731d95c2b0d20912066";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/zh-CN/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/zh-CN/firefox-74.0b7.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "c3c023f4169b98bf5d165b29d159a9d234da40740a92d29b6ee1690ff5e09f2fbee19d38e3114339937d58c7deeb1be3bcefbf9e7247688e123ba35e3b5f87b6";
+      sha512 = "30bf6bc54b91826ed9fa30988f069afa7b13e35d3ca0441f10107abb367c970080217123b22bf4ddf046db99394e9df46d825d91e5fd4ff717f3f025b3d54159";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-x86_64/zh-TW/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/zh-TW/firefox-74.0b7.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "118be7d6cea9fcc55e68530e984a7ea2a42168004913ca4a6ec46ec6d8f131d0df5c50559dace8a80612e06fb589abe1f0cd1f48bf02018e9fb9ac1e7941dd73";
+      sha512 = "b10365171ba6fc4265f9684524d1270c7dbbc1890fe01154c7c4286335523a3ee7bc98fe8e86f874a584fdf30bd64746c9e3c62ffc48b55e97f9f728ec844910";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ach/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ach/firefox-74.0b7.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "ab6e1475a19c711f105d8f1a5f5701a60e76e7ad8614c65b0b8381285ecbae42b3a21c427309246a4104513dd793ade952465a3339def3d62fe83e355d030642";
+      sha512 = "54cf3f1a2b73f95e6ebd276c5b9ca40ee598c67e8a8f308ca969a79532614a10c9dd4e06f0a5f2d580a514009938a493676d46c969a257c1d3d90ea20d588a4d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/af/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/af/firefox-74.0b7.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "1d19e09a10e40ed4867ac42ac6160852c06c5154399e733829ecf0d80955132856fad6f3062a33901c6da5fcd4376ab3b83e001ff387ffe6b241df71eb931858";
+      sha512 = "dede24db1ca9c1064b8afa51e87187e9eddfe8f3f159bf268227e941c7d9edd08823927c10b6681eb79c335db567575c0e0a10eeb24561deff0e587d4d5d6f78";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/an/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/an/firefox-74.0b7.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "4f45cb52d55b5a2575de02eba0bd7f256943adf0cc4858cca8d5160e7a13181cab8d0cb331352edd7abec92661cfcf2970506bf6dec3a8c5d6ec2b32a6ec1bd9";
+      sha512 = "841d9c1b70a1ec0a58939abfd7c5932c7db76ccf1b77f7950ef3e4a7541219120d638562d96159d9f6606ad9090db04796c7b5e1048192fadf5a490ee2489135";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ar/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ar/firefox-74.0b7.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "9beb42f010832b8cd58a335f07a848210030ad4de3fd594123bfc9babab85ad232daecad112b1abada7c0428882d4021ad159ded58fbae309d0e55cf607d24d2";
+      sha512 = "7e12b8cae568f82de67d8f4848a092ddab634fb8c3ef3caeba4f7bceacdb260a12cce70df7fd80c30ac3b227647755141fb367aafe692db31c0e58415a9fbf85";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ast/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ast/firefox-74.0b7.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "0008b51f70ea6ecb0ea88aab8303521aece7377f9fcda2f09b18a5890806889d537880d3b0adc49f7e9af55f693b8215143659545b85b06b106758ad805badfc";
+      sha512 = "c3b52dc3eb427e24e2566c383f8acc1119f6f6db5447ff6aeffccd65c97f370532252aca2bfc7bc83ae1c98824c8ee9e39b76a50ab3b5849669621ca9446e136";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/az/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/az/firefox-74.0b7.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "bf54af8891f8519daa6b8c3b99b4d0fe9b93c3b2a2108f4e2a3f5b3287680e127bc8246558fa58b5380ba19e1f924d6a15b130a1ccd07dd9c2b9b0c28d455f3b";
+      sha512 = "7d61d36d5dddb26de5face1f53aa74104b3a451eed26a194d4918cfd5e1c8983007b2ec37c60327d1c733b6595521c88d327a2b71e3e237b0ba2b52f06d6c659";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/be/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/be/firefox-74.0b7.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "452e4d3ce27ea806f3e7e1055a0e91e2c4e337fae7544323dd2c967861470c46907cbd1bb5e154bb3f7b605e5b9355f1a0b57988d77667fa7597f88917ff1af1";
+      sha512 = "233258a22818b7a3b6726dfa3fa8d3e702d3ee28440ff987676472e8b865bc23907adab61ce994648617a9e83fd530afce567f77536c3fcdb7434c9d1663ca5c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/bg/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/bg/firefox-74.0b7.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "bd4fad19039b3442f8db7f8cf6709686fe1ac64e7789f5e4c61fbe94b02fd2c14059633c1268358e809aaa2759278a10056457eb0625a8f6a8341c0c493be37b";
+      sha512 = "8a5170979d50e1e2546fbad96dcba9d5fbc1618b4c6faf770c417e44308dd22ee0aa27a5b18f5f073f7b555f064744c4b1b627e6648afc2c5a120093c747682c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/bn/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/bn/firefox-74.0b7.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha512 = "f0351ea913dc78c1df1015303a0587b6e68789e07611f220f3c1816366537cb0777783df8bbe4ee3c317053886314c2bd8d8c1ba2af27f222930d4d48e9c570c";
+      sha512 = "76a3a07092cf6d921b94031a2b3baa8e7d356df3b49dfa9e0d7310c87f020236d7b8525532e26a77156a465bc70bdc477f285223e4f3adba81dab63165023951";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/br/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/br/firefox-74.0b7.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "4fb87b89c2d7b1961463e554ed1123d03a65994cddcc23a9c0cdc35fd913ac42b58a51ee1e2650645748ddfb22cfbc54813c8e18432b9eb106d701d495bf6b7c";
+      sha512 = "b64af8927deeda0460144e05ef1c8bf8eae4fa3932fdf8f1e0d23a9df417296e7e195946b2d5090c8986af0b5561a26a3098cd0b01b4dd1353ac8b55a192ae8a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/bs/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/bs/firefox-74.0b7.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "85e2f335c8be9378f76f89a97aa70fe968e522ee82e0741b6927b8dc26cfcbe30e2da538d72f1edab559372611c55508672a29f8bfe367eaabf3032d1a691250";
+      sha512 = "ec02811bdc0ee960fa05e676a1d5d92dac953e8db66919d2e1f2ec1f4ef426438b242bf34e0e1fe10d7735605e17da0efbc5b50a7caea2827cd41d0f2cc22e3d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ca-valencia/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ca-valencia/firefox-74.0b7.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha512 = "d2a85f873ba9a9b993c36d1369dae29482a109bf0ace3c2f153b2580fd8bb6481c8c21b5be21065abb72376e5c932af0f24a383737aef4f2b4854106254242dc";
+      sha512 = "5d2191d153d02525a50667faf39f8454da9fd87154e205fc00d085bd2e8ffb4216f5b08716ef6464e0788ea100f4241bfe2d746f57a503e9098929fb5674f286";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ca/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ca/firefox-74.0b7.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "2e9c9d0be0f31ccc115d994c08c5261ddd4b171b0ad9dc3ded6f5e0e0b3a3cfc0c3404462507dc41b57915b3e5e3f99fc580a216ebf914fc9077da56010f62ce";
+      sha512 = "74ff21b0633a76c726bb3de02d6f148083e72e1db622ddf8f188e5181bff9808475db7d7f94a0384f6b17682ef74b0f531c1e00aed2ac572f5690ebf5cb8c6cf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/cak/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/cak/firefox-74.0b7.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "e24b214e626c9c3dc7e508069c7f164bdecc02c7adc53e91a894cad8c9be75f52ea0a0247eb531584d431b0daca0c0fc9fcf8ef41b44f1a3dda4f58f0a4057fc";
+      sha512 = "3a303ff95a0ac27ed0c8b4993b858305e36c95d69e144af2b7ac9eb08de5527739f37c97f7cc762094ec9b68f86a2a676b1c59768b447ca95cb4f7674e86e579";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/cs/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/cs/firefox-74.0b7.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "fc993a9b4196ce08cce40cb76c289a47ce5f6626df96d383ecc086f7485a8a9d4720f7c55eaa1bb11fc7a0fa7a891ad685b8cf6f53b60825e73e0f7299e08dcf";
+      sha512 = "15e5a4c4c6a81c3c23ddca3deb09766c22525681075e3f488b0e4bf9c2dac5fdeb859aa41522d76eac5ae342b7cf9b962968d186bd86d1a5d942ba554bb7980a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/cy/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/cy/firefox-74.0b7.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "a031707aa831719b7fa6d00c5ee03108c8e5b2989de7eda9518f84aef863d84f9785b6fa0a9d55d686b4b732c7dabcc00d39db2a0853c5691e96d10b7a288475";
+      sha512 = "3d8b06c9cbd823c331184c5372748881d91b6673f2bcb2c201bd052ca7bc6db36f502fb5b6d8b5880df34574ca860fee32f675c32157c9cc2fd022f1bb420672";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/da/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/da/firefox-74.0b7.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "fb9669674d6ff3100e2b459e82de810fd3ef2da4c8969a50b51e3b185e3b4dfcd4264fc58a4589fcf89c81ec7c7af8a92e241a5193a394fb36d8b039dad72bce";
+      sha512 = "8bf4415f1c2402767a7d7cb30fb32f5f7f3ebe8131790c4bc5d8520447b4970a4e55b7b102e532bb24ed8ca431027f7d407932cae0ea7b06f23415854910c677";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/de/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/de/firefox-74.0b7.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "bbd5d9d4279e7f72470c39aaf0f6f858caadf19bb12cbe19624b4fa25775210999ebf64805d4e15ed7494917bffb3e352d0099059e2cf76b5b0afeff0a732060";
+      sha512 = "8163578f08c87792a890c52fb1b7a5af1ed16b7065013593d72e7af6b8321467b2230eb5537e5443bf86c8a4eafd47710a9181e4fb3c22f5039dc40fd2f9fa84";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/dsb/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/dsb/firefox-74.0b7.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "8d44af7c18cf9de5dadde8ba482509dd33b201a66a61126d3f0717a550d0fe85543edf08049288eabc678ed859e2123f5234e325a6d69d4138ccbc6676e19d93";
+      sha512 = "3c7fe1cd45fa52f5d0f385c2549f4b146291fafd8828ed4a5e68f8b79c5163ca81f052149222f80c48246da45bfc0ec35769dedccb4b3af66a1b35b983007ee1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/el/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/el/firefox-74.0b7.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "b26a3b664d1f2b0735a8518a25eefac1ba71e0959f91a90cd638c27299a3690c595a912331c7d62039df6f5a238c50e57af5897cc89f4eba8043c60eea47b9bb";
+      sha512 = "a5319e5daaa3721e6b47fd7b338acb1ccc6f9f316d127d4fc83fe5be13411e68b0fa597f5ab5f44a290eeb848fd58b5db28fa25749ca4a8180cd32e765bcfbd8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/en-CA/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/en-CA/firefox-74.0b7.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "9ae79724ddc932755b293ae359ac15537128c9d7b0b4b0719cc34f7e4cbdddc49cd89dbde2d445fd7971904e7825c6e5e55cdf6d95ead6057cf5900c14dbefbb";
+      sha512 = "bb9a61e88c9d847fb579b35e4fd603c7d1b18114de00b155cd7816bb72f4bfbb3f5988703f2c2333446fb9e0092c0656c5d6cddc41f84a0c004fce9f057787b9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/en-GB/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/en-GB/firefox-74.0b7.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "c97e6b95482106d30efbf322c20db52c0a6021ff90af87b54e8f03997bc01f0033ea6ddad221e19d38b89344d4311d3bd576bff1568c865bade2348a4873b87f";
+      sha512 = "6e2afbf7ca225ce980928931073be020e9c4421d8780449a8ce5d46e3e1cd122d5be813054b2abf57c9e5f8f680ae1dc05ea733336e7e9479c3b04116a119f51";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/en-US/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/en-US/firefox-74.0b7.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "102419fc53525643cd208fce53474c4d8f936527a027c7f16e41c5b87c8fac6c62e8c3d848fa0355db6eb8b2cae71fedd9206ef414213caf7e08ddc1f36cb8d6";
+      sha512 = "d0a72bac65daf49aba93e84c781830fb4f6fa365d8e5aa23571aa52fb0f0058465afe7b84b40330d6e5abd8403ca075fc787343af724664ce1d328a0d7523864";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/eo/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/eo/firefox-74.0b7.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "b03765ca142f26db991fa5412246add6987a5f3ed92ad6f554a7c3367107a6f1a5c6daa1c80504dd5fdb3347bb0efb23f0266e8e60327310c8e41821fa0ab56d";
+      sha512 = "3ccb3970b2623a31e741d7c88aa2e5f3c71bdca83ffded16508939fe9d2ed431b2b83d09deb00e2d5fadb0915b8d17c8a7e1073f5585167c28bbe41c9e03d94d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/es-AR/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/es-AR/firefox-74.0b7.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "a71e4c912ffff9cefad99a01105cb911389e0cd89ecf0b0e70531d5993ca7630246023a82c6f4fd480c121c419d9826e633d8310a4e9669f4eaf55c9728d2145";
+      sha512 = "c59405042b68ef5f7e50428700440972c082436950d03e2988ff2187c28767d709ac4a4cda71241c3c2f619db2f9e5cad38e3c9631300fa86ada966d6659015c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/es-CL/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/es-CL/firefox-74.0b7.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "8ef11a37acd621741cb3a84b7250d9aeb03bb45ef7f2cb2763493aa4e3b884c9dfc987ecf9347de6be8322e376ccc4f1d34b06e0d8107d3e338d484951e8daa8";
+      sha512 = "12666d98f08d3de2385d47e6b864c548c9dbc95dc34a1dc52b2a893650859bd383586e7870cceb591471e3e9edb47027198896971e29d2e5eff4ec3bbab978f7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/es-ES/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/es-ES/firefox-74.0b7.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "73d69ab48824449ef4d63d65c9f09ecd3f890b67514bafaa5061ba77de2ec05f4b59dad32c4b4ecb50cdf5289117949ed5a3bb3d7dc8a9f26abc7fd3ed452ac2";
+      sha512 = "0af2573f041b1b7e4fa8b1698c221e986bf83389966f5937b66d13e68a544fb366871e1a5316b675a5af00db9992478b00a1569953c194754dd6bb449bda4da3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/es-MX/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/es-MX/firefox-74.0b7.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "21bc857470880094695085b310aeb990fda5d4c9e46bd60db9511ce2cac486dba71cae6dc7b5130e8390cf5be0712ee4122946bbf01e87580c01215d17aac74a";
+      sha512 = "6eaa4cb7db3d5c129853a8457eff48fc619c8da16127bb4158633f001a8459578550f9feb3883bf1590857dd9ecfc99666372306ff86d6275d66523d2ea7f590";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/et/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/et/firefox-74.0b7.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "f894998a24814b22e40fda5b0a0d3ca123fc7a9d311f3534ca7daef3ab113307aa94b1a1959b2669affe995e9d646ca46b40334b893c24c81f13a49b58111dbe";
+      sha512 = "fb0fcef92df95bf3d9be3ff49a87bee5e98d123008d07455557fe2f282ca53a3763103ffcde2d63c395c45ffc24e994b4d182dc6b72f78118ed972ce007f5405";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/eu/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/eu/firefox-74.0b7.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "53e4e213a524b481835679b33362434b3a0f7cc128a82e30bec4f25fe38b1a0ecf4f8784307d64c63eb7cfc533b8047a8df2f59f04fcd7bc4d49c2a187621f44";
+      sha512 = "63528ff70397a343c23660b6e281924056c3d15581f9d090b1f546422074bbc4727732c763d03670bee0d7e58dcfc5753418a885b10a36b09c11c1ab3b55a643";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/fa/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/fa/firefox-74.0b7.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "2d43a2c3d4971734ed4b02426bee301e792a801e0c707e75e54d3819e4f6131d3b9b01c16d392a685c90cf67a7b7fe9338eb387375d3435e5a4fb990279f6ce9";
+      sha512 = "1a5416eb730a81ace3675542f7c870f1c0b083a86dfadc7b027244caa283a29486175c6a2cf1ffac3ed8d2e0a1600dad1e2d63216a91c6322164308cd1e590ce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ff/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ff/firefox-74.0b7.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "fbeaa892ec89272bb5ecd07186bd85f216d937734517694745f7e5af2b3b7f28dd1793cedbe137595141948e499703653942387e2608574b2235722cb7921390";
+      sha512 = "29017cf396ad93e5c9ed098ee6324a0a49183965c1983935187d3de644cd3522c2fec34b61d12b4527d4cff307e0f2945b616711ac5ebfddaa982ec3467697e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/fi/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/fi/firefox-74.0b7.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "62c2db72d523ca7b4b289fbe3339b5a9b92f4b4e363fe1f74eae9cb2b1d02366549e0aee786915e6cc054209bdb067916975ac676b8d89968c0fd343f981917a";
+      sha512 = "653ec6123b84002602413e89c152d6cb406be55d9a9fa5ff72839c0b90d3bf1a87a32d2e113ae907721f53f85397621d7a06bf3e38a32bc274b89bf1a7487e98";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/fr/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/fr/firefox-74.0b7.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "d396922106139cb72d21c69b42af8ad4467ddf5123b32dd11f6d25ef3d0bbab178e8ebb4ef7b5aaee3eff2ea8cd5b3d212e2f39897931d8c7d2604c6fff6650e";
+      sha512 = "7845a7c8c1e9f844e4f01414bd52f172bf397c6eb8bfa0033c0216c30f8c14ff7ccc5a213428d187f571e8fc4ff393dbe37180510da4a1b4154f63b2a4285e55";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/fy-NL/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/fy-NL/firefox-74.0b7.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "45821498e7678ba6b39e738ba24378366c91641d264159abb64df86bfc2286ff614946d1985f520d92be20bfcf378e7efa5caf2448e079b45ac282af78b0594c";
+      sha512 = "9cd9f134c4ce2b5d465c608f211acb45f50d9d3a0c200e9080fbbeba13f25f5faed6b6baa1a9149f88b3806f4027e72866e004e3934d0331f10e25673fb213cb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ga-IE/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ga-IE/firefox-74.0b7.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "175c93f81607ad3c8372de5d923b743b4ce1c44e1c515754be95df47497e9d2cc7eeacd43544a7a21a126384bf0a7df735370c5bff8c51dc6707bd9620671e97";
+      sha512 = "2a75c341c77530075d8598efef163f245040c602a62380fa0792b32c746e455ffd2a1220fecdf321db665cb6ac0d1d7963a7750e733ca59f1c413449ec1df9e8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/gd/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/gd/firefox-74.0b7.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "d9fbadde30e1a68838050fc27b9f737aedcb231c2b5116124f21c4cb9b8463dabcac437d6a6bd36463fce5626bf599eb28561d80cc438b6ba62dec50bd218fbc";
+      sha512 = "5bed7e36547adcfed70f68ffe5112029e5a03dd900f9f35efb7ac2d5c9e18e051bb26000ae9b157f9d2855db701122fdec826944e1ced7a67d78d257801c17e9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/gl/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/gl/firefox-74.0b7.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "56330fc2edf51ecf1f2f2d5e6b7eeaaf86e8ba37a0991d8ea29d33ea427e3e558eed0986c178bf686ef1de80536535502e06c42484859120c97358e9b03b94d8";
+      sha512 = "fa5c6453ba164c5c14c33bcdba3defe56bc19df2494a26f4666477d950606f69e69fe2d3d162b9dea506308b28b8728e0cfd31c343b0b1ffcd164c2f580246b8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/gn/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/gn/firefox-74.0b7.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "19aba8b00edca670e9e98d01305b76d2ffe58bea4fcc6d8a0b5566f630ffa02ed8008774235bf78b1729fbf0b43a5e85b45bfe53574b53336eae04a8ec7a563f";
+      sha512 = "29a584ba3ec860fb44b06bad43fa9ef02cabf5bb14ae65e54f732d195af11b9acd3dcca5be7939b3790126cdd4882109a645dd31cb0da41e8469f81edcc87b99";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/gu-IN/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/gu-IN/firefox-74.0b7.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "3715355921ee26120f8ebff18a55448742b33bc8db055194a0ec6825f0eabc0244b7646bb53af9e908454a4c8c179cf39450ad6eabf25aa4a9d1f04c03e95cc3";
+      sha512 = "553942bf2da825b5173b4076b534db357a56f180e77663c132cb1392a678ab2d42d532d073aa99c0de40e0f0ebb622d321c01fc0f2f20d2ec6ba426588219955";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/he/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/he/firefox-74.0b7.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "855277b384edc288f1c17f54b228b2886b4376b1170ebe04d7df63cf681d8efa0bb1859ba9c2e8bfd9488204041c022977e570d65455cc309ace211c8d20e723";
+      sha512 = "7dcdb7443875614d0ef9820390c672b324a4742c4b3f50bcf0b42caaadd5c113777ae684406f5a5beed975c81d12e9d2df4e0211e4187dafe2cad351d23d5140";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/hi-IN/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/hi-IN/firefox-74.0b7.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "ba9c5c50b2663684e1547ac9b940bda4b667ca7240fc406f9adb66b9e750565090bf2cf5f3e238fa755f67631bf5f06c0b0bdc77aab086c0d50bfb6819e60bc1";
+      sha512 = "2267a22af52773bbd793ec9591ac0fe42db52b61d396a040bf2583ca58c8a97a651dac26922335aa35c830523f4d0074568d45c5e74c4aef7b541d0a76a08189";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/hr/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/hr/firefox-74.0b7.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "9013f01047bf4f455fe6a100af62fd02bd700d97839049173e9e5256ff7747d78b3e9485d72c3474b0e1361e833f185d58267accec965c1e6e272b45a9fd87c3";
+      sha512 = "8b0cdf350f423fd695b291296a345cf8d5b194d0a762f99b6d0d066b723f9e374ea40f93e08657c9e6ca8d824ca6a5465c7fc935688c1c859a6c783a1b409cea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/hsb/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/hsb/firefox-74.0b7.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "e593d1e791bc957959271117b86a726fb402073eddd8a4048204adae73c491108e75f90b8cb757893bc3c9292fb372ba97c7151c5216de3416a7a994a05ca310";
+      sha512 = "214d1b272b9d1c6aeae23c221ed76b0966e0d9d2b9c52f53b65f3eac6727e4d9e840f427ff62f37fb8a1103f2a81c2baff18f5f9ca6e3b776ccf00127a2796ed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/hu/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/hu/firefox-74.0b7.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "b147ca817d4b30cb1935d086873f0d3885538cb4ea6036d98b6374fc67f8bcdeaa9762a6b60c650617cadbf9b232f308ddac90383f6ce5f9da426641ca44e5c4";
+      sha512 = "37f1f312899525e83103062d1d51074303459ba845570781b0ed34702cff5779329615cb38846db9728f8ae242ead2c7ce7dc8207e8dfb8419c1f9146570f4b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/hy-AM/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/hy-AM/firefox-74.0b7.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "6c6d317967b18198fc0ad380356b9ee1a686097e7fa9de0a7698e3afdf49b3a0699fa4bb53d0559f7e815cf5c4c31aeffae4c93f4387b3a0dec26d0a7324a2d0";
+      sha512 = "64fd466a0d9d6e32cfda8a320f189f40bd8426c41e5401097936d1bc92cd760ea8ed2dd86366a914311a7994d904e55ef7310433cb91b7edfbb3b3a5248005b0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ia/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ia/firefox-74.0b7.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "406c28af9096c3cfa1c4c235d5d8a380d0d33e56a34aeb3367bbece314faa35b342ff765c070f170d0ab3e5dbef6f82d0cf7fae16f67a4519c11abc2ed53535b";
+      sha512 = "e13b02893891cae774fba02de7d2f15d57d0912f3985d2d5ec2d4c9299f54cdd0fb7d0f75a2e1643ff2be4e85944ab71df822b3dfa4e189b7728d4f97cbe3dd0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/id/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/id/firefox-74.0b7.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "18febb0b70cec71b4dd16a30267184c61f770d2bcd341b97ef9d97fa0f08648d8dcbad8826993c783437c848caa56a80fe87eb63eb327d3bd4944a4d2cbbbc3f";
+      sha512 = "1aa455734b272e4b1d31c8c252604fd9d8a37def3fa6085cf6927815a661344c22d2b100c1c155b508d1b2a809dcaa68ba1090020a852699756c7f494ac1980b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/is/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/is/firefox-74.0b7.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "40fdc20ff3ef9e140366fe361ac232b0810cf44d0ae1fe99e3aa820859a5c4d79a32ed7f38a4f0a5b8b16d9887012345ef25fa38cb28516386ebf8ddfa0cef64";
+      sha512 = "60a50ea36dfb707ce877074fd68ca8fe95d9367f57350e35af9a252c1235a34b05f4d8ec2d76daa2f4bdc1026086924c53ea1f75d130286a124425b3d6dc603b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/it/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/it/firefox-74.0b7.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "4b21d5c247705f3109b8183c937c87e77424d4dd1f9dd6a5cc7c86f53efe06d756db7a9f569cecfb985e8910dd37217c6fb7a5a6cad7146430b26a4d507118b5";
+      sha512 = "6d6119b936c957d54bc4c5dfcd2df3ee42543024a89e48ec5cb08645d7b7ce9f53a8437a92afcd2c4cf4395724324599f9bde922fd0c88e6ccd2ed76a1141359";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ja/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ja/firefox-74.0b7.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "9c48ffa427ffff6eece2f58c327804c5a8e305673ecb8c56e54e5bc0a25a42e72367fa34110ee7492502c6c62e9938fd1a42d64cc152bf77d4992c2c2da1e684";
+      sha512 = "8f76e03d072e9d6c4bf9b6fda4425f29f4645e089886d8ed9a648ea82a7a602ee6296ff7c5c0e505195bbf9e051d758095d23c622cdb5b606a285b550b3b0488";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ka/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ka/firefox-74.0b7.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "07a6017a3f5790e6a611d471d3b1695dfa5a454b5d6f9bd951c8cb57041c7b161089e2de72d0293767b552a74fd72ec5cd6c3e30e8cca25dd2f9c17c9fbb6e2d";
+      sha512 = "f173d6bd7ced596da30f9c76366d1caec34548e08d676286bdacb1ae336f01174b391588eba9b725f25079271d9e8378f5248ab9896532dbe395f925912f1f56";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/kab/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/kab/firefox-74.0b7.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "309959ec518f581e8a231592cc3e2549a96692420f30048861c165b9ece41f396bd793b030a4f3825a65f54a0a7812e34cbfa03f68ac1294a5cb3a0b40dbcc7b";
+      sha512 = "ae1633a7dc1ef1120f5922ac237020d54e1e3783f339948394d3811e87baff35a8fbfbc17fe1efd7b0c5ee0ef5fbd4b28f9ca734a3cf03e6c19255ae5ad9d2eb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/kk/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/kk/firefox-74.0b7.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "20387e41e2b539b2ed5cc1302cfc5643f77ecc87b14b8642e56958b5abf06de32bd1d5552a31375b25f07f66fcc481dc13a907e3027e0b9a6a804fa05ed36810";
+      sha512 = "6389efbbb824b59a1817fff041b3529a1466b310b8b93229b2d8cacaf6b009210ceef136b579c154b232cd0b756e13676487fc8018a00ab22ba800eefb183e55";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/km/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/km/firefox-74.0b7.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "b6cc0dd8e364c785978997a2becc439999fa2c9654fc8522faa079483ebf4fc85ff66371cce67cbdcc0555e5bf6972b2a817aff7f7be1c71f13d4ab56797f93a";
+      sha512 = "e57271974dac3818ad52838fc9db0e486eff210ce85a74ccad57a76072aae7a7eb46fb88b8080473098619279c515122a22d986b38c53c34b5cb6d80303f2220";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/kn/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/kn/firefox-74.0b7.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "a623bb91f11ae69ac21a5ca6c9e8ddb1dba12157318c7947e11271f9cb29ab4a5a370b71c80377d71a6dc5f3fb5fa1e95b80dd740f2ca0f265f162ab13d8ad55";
+      sha512 = "49d5f860bba705238eebe7f94dc2efba3f05c69f3c1813a27479e514031ffc1f6ff0e1c6316424bd73f2c750f5bfceb07212486122c5b3575ffa7930690cf214";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ko/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ko/firefox-74.0b7.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "2278a542e53e84c8cf896d38865eff81c86e9b2964e35eb917b3c51b0939cdf4646451a9daf8337952954611941a46094ce7ccee39495356e88c247b0ce950f5";
+      sha512 = "47f90c68de6663bd0ae774cda94c2a0a85a92e743834c74f667049f18faa4836e403da8abcbe04b8dfb5f12f6518925e672967fe23754dd045e37a26a3d8d285";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/lij/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/lij/firefox-74.0b7.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "61f3719dea99c3bfa5ac2acf2a7b9d1dabe886c17475c68a2db0013a3f6328d7d281712dfc804fddc851585732cf3bf76c7f53a43d3a7412f3d581578f5aa785";
+      sha512 = "5ccb1acea6a156d972854b6396a1a6d3c7d8bfc297113fd8354f9062d954bdebd5c0566ae4886453fdc4aca27dd3e1732c0d45d91d859fdcfda230f50e1bf826";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/lt/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/lt/firefox-74.0b7.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "3a14e219ff56c24cd0f418992ebdc813c63c53e22c79317a4369642ab4aaea2d071149613570d71e2e88c3791e8b4e111511347473827329d460bb090ffdc230";
+      sha512 = "1a877afa01166cf14116633aaf2d3fe3112c0adf5e45272bc71de9b6c56343da0c1c87a459529a318262cd80e5d0d3a436f92b79ec4cc5b92329dcc15fe11871";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/lv/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/lv/firefox-74.0b7.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "35a3cbd4b28eb7104f7b87dc8db31825fd941da28d9888c7cbffee753a08d2364882a0844ef671dd78ff1e9d5b7a63dd76f6b8b92d72afaa572fada385835b92";
+      sha512 = "37403fcda86c796c082941e8e8e14b621c0de2a7080b413b7868b79ebc0fa5ae6069a8127739a7d271de109e7a9fc8f7562fa5d342b03926f05e247d7d5299da";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/mk/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/mk/firefox-74.0b7.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "8d8022c243f4bca2c6d2b9a14b503aa7391dc160cc7f2841f95aa61e168a6676a0510ff9d798f8f582ab75847ab616599393c7ad5643aad70bab2be1fe810e5d";
+      sha512 = "f87d35121c20aaccb8b344940d86114f3ba34878f9cba2c5031e10e54d29e7fc548ef1a58882cd5e8bcb97b170760581e6df787ba1ad05960d61c5f67e6aa878";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/mr/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/mr/firefox-74.0b7.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "845ac2db77e84c1cac13eb240a7ea2fc73a2dc442df8ec078699b2e7aa6bb36d218adeaba493273caeed9b476c0a1550046dce6371404c25154747f1d4457f99";
+      sha512 = "07b5750823b4973c494b9b4f9c76d4269097489c7362630fb59eb995b12a58f3b69dc9931d802f40f3109e939ffa026402455afd57e487225564169cb14a198c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ms/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ms/firefox-74.0b7.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "87cdc7b6a1fd42808cc06b5931530b4cae06ad6497c3abf33f5b4569a500a7c294c0c8aff95c74e3441cd25b8a8a47f64d9563cd95430d22f5d65f0296cd8984";
+      sha512 = "c13597c3dceab6935def4c629b24a52fce3ff3406fc3fea395c68444993cd2d9ac25a10647a2d4818db49faa36a69faff61e5b648886b4c662caaf69e435158b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/my/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/my/firefox-74.0b7.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "57f6b0c7b01feef4a0ba078e45c37e6f1a2e1e6af59bb117cffa63341125ac99e7dde105110e42c0c4940b9688e66d1814656dc018464a5b9f23ca6c56d6d6df";
+      sha512 = "1dd123936837ef7d806449df7458ee0879d3da33d16824587e55830a88f5c52dac9c66d4d4678e9cad35ea1456ccc6a9f282caf3e6b8888145729123aad33556";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/nb-NO/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/nb-NO/firefox-74.0b7.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "c0013df0b0166749e1eba8e26023393d1f26ca764d430aed1f00d9afa47d2f89148f401e902a58227c73059a7de6ed59d16ecb6ff09b3caa018c26ad0639af8d";
+      sha512 = "b9c4ddcc16a8403f82f1b2c9bbf390fdd94efbcf442a9010b8a127193826cd4c21258edadbb887dabe5cc5aa642842e371be01cc3fffd353ecf3c2815a2dee2e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ne-NP/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ne-NP/firefox-74.0b7.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "c1d90ba6a63316b7c7aab6728cccdbc3fbc2101b5b6e07a7a18b23e87fb14340b03c00cfc2485ef2148147786c1dae51c1526f6e6d6b163246ccfd394f1947d5";
+      sha512 = "1bdd91de19876c54223c43543b73df2d9c37d27a8986544d48707810f12657626c2491ba09313c0fc51733232c4b5008e0236148feecc415b9d3bcb52b126536";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/nl/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/nl/firefox-74.0b7.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "eb99fe6fa16f5d94da7cd018cd771e91b99029b4335b4548eaef3515ebece162e41fd212f7ae21f66d545dbab150224811c6030608e4f4d59f96812a065483cb";
+      sha512 = "6cfd830592b5342b18a0c0382b33be36fa060df7fa8892ae6aba2b7dac37f2578108491e2eeddeab73546336c354ef0456206c37be4638942ad28124c14a7792";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/nn-NO/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/nn-NO/firefox-74.0b7.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "db55a9343d1cfda37c15010ff844f8a4e4f75e89c7fae1074e36f371c0baf6d409e2e13fcba8ce14af1c70b973e80c3f7137bfcf13dff79f9cdce021caa098af";
+      sha512 = "b092affa3674da00ead882e26b27fe61d3719b69ac0ceb5ece2e88225c26d78c066a47ddb642e539a77f01263ba85f503b7dbfe1bad0529f1cb68275cfef6ef4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/oc/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/oc/firefox-74.0b7.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "22dbbd932dfa8a8d15fd368f8119e4772e36351047acfbb1bebe722011ed7a8b65457fd5cd10a585fb6b58dff5941e9f6e528fa7507dbf8937094eef42a4b061";
+      sha512 = "44971c64acd96da8c144671c82be145ec46118f0f38bde69580c83d2e7a6b6f0d6bb1a9b6f21cd2e84b70725aea9c388ca2b4d6545061bd4a4f9f4f5eaf2d929";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/pa-IN/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/pa-IN/firefox-74.0b7.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "c4ee5d90be98a344bb2c366e7893e63b46f23ede940a66d8361dfff17753ccf526578e4d8d99ffbd289a2fa72e939350b0b6097e1a1153ac6cf18a1711027ed5";
+      sha512 = "0583f4b15cce5c1c4fe70d0f9c9d446035510c158fee6da27a135b9efaeac7007177b4ded5983c8130f1d1e9c377990545318f5955a99737426424dad50e448a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/pl/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/pl/firefox-74.0b7.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "451c60d012244939f40c6f5e1a7860a00ec50c4f36cc797222fa8d112c89370dc4714d5ee89b918bdf1479eed08e0cec0573b4aa34b0c4b7c0f691d7c5997e0b";
+      sha512 = "75046f40fe1dd1950091f61e487c6b8c9f424db14f05872c528e602fdac0a0f00ff147194f953fae941cb3bb93b75367c7434c1db95d8a31e7961278fa820a27";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/pt-BR/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/pt-BR/firefox-74.0b7.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "6d494f8befe9652f1f088223805e28bbae891f47735a04b6b547a2a0fd436025fb2fc324215da31f9ea18ff93b3e5125c63daf3dc7b808627255e1e0db03fdb4";
+      sha512 = "25df8753b7363b4cfca6882fbd1941e8d4b532708f17ff7299f685c9ea2d15df61b12bd0ad293daa80e6b184d53ef2e36aafcbb4b2a7cd5b976bf81700d4c68a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/pt-PT/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/pt-PT/firefox-74.0b7.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "0b1e87ab692e628472fe5b13b673e3c19f67563dbd0c27d43376d3821203067816223acd561d22a0b4a75fdf9a357cd3838a9b81e31410512fcb0f62d647f6ae";
+      sha512 = "f06faae5ecf8c873c8fd2c1999adf23b8b08c1b782f33e929bc97630d4094a098324454c87af9321332ab39f8543013bd827f10299237dda8d7decfaf29fb59b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/rm/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/rm/firefox-74.0b7.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "0279e1f9adada4962a9c34648abf744e5c0519393411694a03eb33df04800a68814534a4f60205a64a7384f18ed8973a63954f1e83f7429ba11910d26543cc21";
+      sha512 = "9b026decebb2be032a7ebef1e5d7a18643bb3ebfd31baff4022d1fbed444edf93ba4db70c9df2f899de3d4f9c1fe8c0a218e0ec40015f0d46ee156c5181d1235";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ro/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ro/firefox-74.0b7.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "4b367c76863834e7551f9b75e9596203de328f0273587b34fa0a506ab3afe5c7b70860fa16f28bf93b51ae55f3d3206ecc84f79ed0519c9b9c8c4af67689b1a7";
+      sha512 = "6977c73f7207944ba646cc6593aefbc5b24b94d8e63b95508412967b6da6c5076e6875827789330bebd02c50b0f6b9a1d40dd49e3c079e614ee0e273cf2a8c59";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ru/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ru/firefox-74.0b7.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "674d878bd0073d92600c86e8c86e42d1bb336456996eb5e35d202dcf2207bb94a3c9bcfadb8e3b4be10ad4644658b9e75ee10d4a813b3e7693881a229f0a4542";
+      sha512 = "49c458fc0c307904c25e7d55dd1b4acf41020777ed559828cd01bf416585a1479c853909dbe29d2d90b1d52471f8628cabecbcd98918dad7eca7a0cf4096f1a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/si/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/si/firefox-74.0b7.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "d6b74e81a8d2bdc3cc109a02d402fa1f6496e0947c63262ec0fef8497b7509bb423a5488633b0aaa56bf9b002fd9a3ce0606df433589218f08d8b6dfd0b37ff5";
+      sha512 = "54078ba7d22c1a280347d18ed30dbef9079adac167e8b79f3bec686693acebcca90bad4ba8747d173fc762499bfbbb6bf8fd23906666ed005f568ae8c5683392";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/sk/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/sk/firefox-74.0b7.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "44518f7bebf255456dc609465832efb4073b4558d6eb98adfb147d80c533adf4d37adc4a9aad3989125cdd9b88644222b86e8d84b074f23ae978f6ae13763f9d";
+      sha512 = "47fc04108bdebcefa46cb366d071adcc45508609530bf02eddc65eb6d13b34ca223b2a9e552563b475c2f8dfeda58101ed8af21312170330bc8c48ae79427a35";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/sl/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/sl/firefox-74.0b7.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "5bc271ccd953b7fe1108e4b2cfa0e8f38b44c0d2daeca5642551976a6f713d3c666679e5af8a5547c9ceba9e3bee4b3b85be91339c414e0636e311a307c4d50d";
+      sha512 = "cba41a4178b971c136b3853d96568152a1583a00c9d859327e41dbdc278fa7bb31b2bde537551bbc5549c2d506cc09871bc53aa3da486018210b0f86634b3865";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/son/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/son/firefox-74.0b7.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "97c2634291d7754ca63ea70cf726f3af649d5f1456663af8b4897fdb22486e2b3f0468c86d41b0df4924dd5ef1fdc5ee38cf6e14a0301ee466334617e2d5f779";
+      sha512 = "2a4fbdec227edeb83448ea9575b991b574e467d2e2ff14d75f000a1d912d3bac6cb6caa6cb7fa3c61236d2729decfa5f0aa9f0e756e503dcde076bc095ffb786";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/sq/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/sq/firefox-74.0b7.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "fba81f43e1a27e85e6fb4746c7c86825edb66a44d60e4655afe85ebed7df4e0862c9c0afb24d2e6b232a651d607f1ec31b1655a3a6770b01e7456a31898b323c";
+      sha512 = "c0743b88f8c33e8bfa934f0b63eb67a9ea55489b01167e5bdde91362f7217375d2e2834eccce5a7e61543ae81fbc45c296a7fa31126f61cd0f2dd8b04c807df4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/sr/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/sr/firefox-74.0b7.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "29629f3fe03bbcd26794d7e7d3ece4e727bde980abb4eed3dc42e76c8f8c84b65a28a5a7ebba698fe85c6672bc818b1172cfad7e8a61e004b21898feaa8a7b9d";
+      sha512 = "20faa1be8b168ca94c8c4a8a22c4ebb3f1aa3555358b0d8ae765a13ff5a185a7c16ed8bd9f9f1e137cd02cd3f5119acf912649e46d84a180e285c4f5f9b25f0d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/sv-SE/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/sv-SE/firefox-74.0b7.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "c6b2aad865fcae6f376fb6feac993157981e8fb3eb43e406be0835db884206d2a031afc19dad089549d8680b9612bb0a0d8370a45b09abf97a9eeb19321fa081";
+      sha512 = "cf272cbb87e59751eb5f24c1d07b1a5926aef006d6c199b58c3cd90f853b9ebc78d11d03a2c7600c0cfefd07499c0946f26465e22c29cf69b74f6e0c8474a15e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ta/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ta/firefox-74.0b7.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "b37ab878c001880f7e4f066017c62d6c0bc87ab57fa953a466b9043f10f3a0d89bb692440b8f8a374c4af52ccd3b4faaf42b78b297e310bbc4845f0b5986f65a";
+      sha512 = "8ea559be2b493eb925dcb01dc5091b7bf776ce7af47fc95dbc33e1e1038ddd5bbe31c85c19e616746e1c6fbac42f4476bd1f2b62df03850a144bfa880ac6c27b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/te/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/te/firefox-74.0b7.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "77ded17897c73b1ad654b96edba79dee11e156154c4190974279b433fdfa4928ddf9c8907095a5741a559f70d82323d13339a74c3e940c2b9a293bcbba9775c6";
+      sha512 = "10190b94faac8db9385119b21d8fa46b930eca4a4371dc53415995d132430a9aa83d7e6af4d406d96a831b4318ff160be1f301d7f91b02a082d90285f03b6ef0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/th/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/th/firefox-74.0b7.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "79d114ca86c4c4419575cff9062658864e7feac2139b17c5784a2793ff519645ab11b6dd45035bf6fbb46c8eb5769c860ea86ec9e22a55084ffa2e29f8c7d854";
+      sha512 = "b95d95ce5bb0f42502aa88d24884a14f84af84133ab0702cc84c0c8c2e3b4ca1471133da971e85aee81f5979d99af575712366fe38f470e030275f73071c20f2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/tl/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/tl/firefox-74.0b7.tar.bz2";
       locale = "tl";
       arch = "linux-i686";
-      sha512 = "4fd86a16bae99cb84fbe66e8a16b20c7eaef65933ad5476f6169f670644bd972532b02e4cfe3decbb5ab0c1bb12e93fade15465657e24820cc76c433ea16513e";
+      sha512 = "149891af8ad8016d33e7db3144a9c5167be895cd7bb098972a51f35a5f4f97ae03fb3349c7d0c2222217d7f133d483344a3a4796c1be89402f8843cd7cfa5cf4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/tr/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/tr/firefox-74.0b7.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "2195cdcb9335b878d4e9d19505fb10f8d4bce375434ce0c8e5f57615ce00065fb2ff060fb26ce8fd64164bad534813504130d678044414ce43c80de3b239422a";
+      sha512 = "bb152289951ca25f42b227c8e851c5fc8cd6788d654d64478417760b4999e10103247ac21216ecdc6d4e3faa5e39bcb3ecd3b0f4c03cccb67ca546fa673de03f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/trs/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/trs/firefox-74.0b7.tar.bz2";
       locale = "trs";
       arch = "linux-i686";
-      sha512 = "cf5368ae0a0952dd86897d6ddca528553e9638a40a6e0835bbbd4dbe2b9827be55a8456143e419a8123f69825c21490f1992626f659fb5764a8bc8696dc1242f";
+      sha512 = "f1f47c635364e7da15a80ed33bb2c0841dbaf2734bb24fc21b33967e909e1cd047496c1c30fa83d3ba11802e46eccadedac14b033705a66f542b3b084b9e729d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/uk/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/uk/firefox-74.0b7.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "bcacc5f07f9e06d6dbfcac985caa2137b42665844ed306628406f99531d513dd7f32b23928849561708cbd935843e03e63a0830599b6b9bcba856f5ef57ecf2c";
+      sha512 = "a5cae41b115e9ef41bc5f5bfe618dd7f317333083b83ec9c52a0a56e4962135cf3d644d136fb03b5b12d1e0609bb2c554cec87215a279ff42cd3b3a6b3a357a2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/ur/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ur/firefox-74.0b7.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "49f74d806155a3b4f9e07b097d38ab455fd128c7438e6f02a9972e5dd4b630501fa04bdbd2e738bfc88728f60072cc8bb5c14835e2bc58ff6365635693c9a1ba";
+      sha512 = "077667c2264347c301c3744a0f65fa2546e2168b8aeadf13b8b86a251bbcc16b65d10d0e91aa9368a4aecd86abe3f2b6685b16bdf8e2bc1b9003bb41fb4f0ef2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/uz/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/uz/firefox-74.0b7.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "a24cb69911a2fa80c41776dae8d4292ccfe5c5950f48e4f97f5012cff7e85fb212ab5ce3f7323345378781c37ba46b10b384d11860ef6d58aa2d470dcd88429d";
+      sha512 = "6b4aa50c39d355f9a8d55d1bc58e07b17a72bbdcd5e9b45816dd00e7f45105bad90e1ea0d38990af8d7c481a45f7de4f164cda6db2b35f85b1b903f403211c16";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/vi/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/vi/firefox-74.0b7.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "d824495245722d80f796fc8f5e9e1a39dc87dff95c90e57eec5c46ca6de62e9a18f185d50b343a41383021d9c918f734c3167885e7f5584f54244c954b1ade9d";
+      sha512 = "a2e91a40f0ff57f800ba2ebb6a6f7bf355b2780acb4e72d759cd01d1ddec134d0f7e33852cee2e15c1382ca6f432d58a7ff653e1885b21b9657a85b9c52f11f7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/xh/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/xh/firefox-74.0b7.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "31898ab796e3ae9221375a243fbb58d5fccb78024945c625e8b76631ee2c0408518029e35595b33de0f97ae9f47a63b7bc7f47277e2676d2c290da2db18229ae";
+      sha512 = "d86daca8654c7b3ba1687ad6be2f00f42fa66caaf6086339045323b2f1c7d127b07f3e7c6104147402ab4aaf9265610b4514d8e6f7c73c1698711aedf0800ad0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/zh-CN/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/zh-CN/firefox-74.0b7.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "a1477ac4728fdf7b395ab10cd27d3a595ece76e5f57bbf79e1d9cdc210a7fe52ad2648c0c34612169545ae5b06e341ec67eb8b0c3c8aee48ec81e531f5efafe4";
+      sha512 = "169e02a6bdc822547feea77359ac35932dade565c99d9b9cbff9d6d3a7a007b5dfe98d006f9b4b12d03e8fa0a96ba3fb2552c7c15196c5c269f07ae21fe9bd98";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/73.0b3/linux-i686/zh-TW/firefox-73.0b3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/zh-TW/firefox-74.0b7.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "2ebf7a3b54940aefd36666450441ecf69ed62ecc43bd7ae5caf57da1f98242eaa8cba5d8ad017e42a481e7bdc4e30dba6ed259a3c65d123ee5615ab62d37500d";
+      sha512 = "3eb488a91dda4c3ab1b8eb421519e196da4bd78f66bc49716f1c743e961ef397f3d24cac2e30e7c21c8c898d8b96f84a34de8d0a0c85908a68fa8225978544b4";
     }
     ];
 }

From 8cfd0032956f49a9998b2b438c09df4e274956c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 24 Feb 2020 10:51:43 +0000
Subject: [PATCH 1433/4636] stubby: configure cache directory

This is needed for local dnssec validation
---
 nixos/modules/services/networking/stubby.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/networking/stubby.nix b/nixos/modules/services/networking/stubby.nix
index b38bcd4cec05..849d266576d5 100644
--- a/nixos/modules/services/networking/stubby.nix
+++ b/nixos/modules/services/networking/stubby.nix
@@ -72,6 +72,7 @@ let
     resolution_type: GETDNS_RESOLUTION_STUB
     dns_transport_list:
       ${fallbacks}
+    appdata_dir: "/var/cache/stubby"
     tls_authentication: ${cfg.authenticationMode}
     tls_query_padding_blocksize: ${toString cfg.queryPaddingBlocksize}
     edns_client_subnet_private: ${if cfg.subnetPrivate then "1" else "0"}
@@ -208,6 +209,7 @@ in
         CapabilityBoundingSet = "CAP_NET_BIND_SERVICE";
         ExecStart = "${pkgs.stubby}/bin/stubby -C ${confFile} ${optionalString cfg.debugLogging "-l"}";
         DynamicUser = true;
+        CacheDirectory = "stubby";
       };
     };
   };

From e1791c1fcc0eecab6a4141d5a2a625c57dec2d34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 24 Feb 2020 08:17:09 -0300
Subject: [PATCH 1434/4636] mate.mate-themes: migrate from intltool to gettext

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

diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index d14bcd728375..7c32656b9705 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, mate-icon-theme, gtk2, gtk3,
+{ stdenv, fetchurl, pkgconfig, gettext, mate-icon-theme, gtk2, gtk3,
   gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg }:
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "051g2vq817g84yrqzf7hjcqr4xrghnw1rprjd6jf5mhhzmwcas6n";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool gtk3 ];
+  nativeBuildInputs = [ pkgconfig gettext gtk3 ];
 
   buildInputs = [ mate-icon-theme gtk2 gtk_engines gdk-pixbuf librsvg ];
 

From de19630ba933b512d0a9b2772ed424e63bba9504 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 24 Feb 2020 08:19:03 -0300
Subject: [PATCH 1435/4636] mate.mate-themes: don't drop icon caches

Set dontDropIconThemeCache so the gtk setup hook doesn't remove the
icon cache.
---
 pkgs/desktops/mate/mate-themes/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index 7c32656b9705..ffa902a28916 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
+  dontDropIconThemeCache = true;
+
   postInstall = ''
     gtk-update-icon-cache "$out"/share/icons/ContrastHigh
   '';

From 897a5c327e8f47490045d510798a0b29b9c4ed43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 18 Nov 2019 17:06:50 -0300
Subject: [PATCH 1436/4636] ocamlPackages.printbox: 0.2 -> 0.4

---
 pkgs/development/ocaml-modules/printbox/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/printbox/default.nix b/pkgs/development/ocaml-modules/printbox/default.nix
index 555ccef34951..f2bbfdcec18a 100644
--- a/pkgs/development/ocaml-modules/printbox/default.nix
+++ b/pkgs/development/ocaml-modules/printbox/default.nix
@@ -1,8 +1,8 @@
-{ lib, fetchFromGitHub, buildDunePackage, ocaml, mdx }:
+{ lib, fetchFromGitHub, buildDunePackage, uucp, uutf }:
 
 buildDunePackage rec {
   pname = "printbox";
-  version = "0.2";
+  version = "0.4";
 
   minimumOCamlVersion = "4.05";
 
@@ -10,15 +10,15 @@ buildDunePackage rec {
     owner = "c-cube";
     repo = pname;
     rev = version;
-    sha256 = "16nwwpp13hzlcm9xqfxc558afm3i5s802dkj69l9s2vp04lgms5n";
+    sha256 = "0bq2v37v144i00h1zwyqhkfycxailr245n97yff0f7qnidxprix0";
   };
 
-  checkInputs = lib.optional doCheck mdx.bin;
+  checkInputs = lib.optionals doCheck [ uucp uutf ];
 
-  doCheck = !lib.versionAtLeast ocaml.version "4.08";
+  doCheck = true;
 
   meta = {
-    homepage = https://github.com/c-cube/printbox/;
+    homepage = "https://github.com/c-cube/printbox/";
     description = "Allows to print nested boxes, lists, arrays, tables in several formats";
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.romildo ];

From 2e1198cb477d79fe6606ebad70781c04885e0191 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 24 Feb 2020 05:51:00 -0500
Subject: [PATCH 1437/4636] dune_2: fix hash

---
 pkgs/development/tools/ocaml/dune/2.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix
index cec1aeab6c56..45a2a3123041 100644
--- a/pkgs/development/tools/ocaml/dune/2.nix
+++ b/pkgs/development/tools/ocaml/dune/2.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
-    sha256 = "166a6lncx0nlmn0kxgx9qkn1dnbphm30vy1wncxcpsqspxhkqfra";
+    sha256 = "1jzm29z58l34kpqll9jcz5dkkhh36lncba1yb32ghknkvyfdvcxj";
   };
 
   buildInputs = [ ocaml findlib ];

From fb90fea6e85ba70c82bce69a3cd6250573437f83 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Mon, 24 Feb 2020 12:00:00 +0000
Subject: [PATCH 1438/4636] todoman: install shell completions

---
 pkgs/applications/office/todoman/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix
index bfa162a54a28..9aeddf1a021f 100644
--- a/pkgs/applications/office/todoman/default.nix
+++ b/pkgs/applications/office/todoman/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python3, glibcLocales }:
+{ stdenv, python3, glibcLocales, installShellFiles, jq }:
 
 let
   inherit (python3.pkgs) buildPythonApplication fetchPypi;
@@ -17,6 +17,7 @@ buildPythonApplication rec {
     LANG = "en_US.UTF-8";
     LC_TYPE = "en_US.UTF-8";
 
+  nativeBuildInputs = [ installShellFiles ];
   buildInputs = [ glibcLocales ];
   propagatedBuildInputs = with python3.pkgs;
     [ atomicwrites click click-log click-repl configobj humanize icalendar parsedatetime
@@ -28,6 +29,12 @@ buildPythonApplication rec {
   makeWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive"
                       "--set CHARSET en_us.UTF-8" ];
 
+  postInstall = ''
+    installShellCompletion --bash contrib/completion/bash/_todo
+    substituteInPlace contrib/completion/zsh/_todo --replace "jq " "${jq}/bin/jq "
+    installShellCompletion --zsh contrib/completion/zsh/_todo
+  '';
+
   preCheck = ''
     # Remove one failing test that only checks whether the command line works
     rm tests/test_main.py

From 7d553eea3a1a6e276e92b5e7e872765a3f424b38 Mon Sep 17 00:00:00 2001
From: cw <789@webuhu.at>
Date: Wed, 5 Feb 2020 10:05:31 +0100
Subject: [PATCH 1439/4636] beamPackages.hex: 0.20.1 -> 0.20.5

---
 pkgs/development/beam-modules/hex/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix
index e8faa9c0a9ce..e3ff823924eb 100644
--- a/pkgs/development/beam-modules/hex/default.nix
+++ b/pkgs/development/beam-modules/hex/default.nix
@@ -8,13 +8,13 @@ let
 
   pkg = self: stdenv.mkDerivation rec {
     pname = "hex";
-    version = "0.20.1";
+    version = "0.20.5";
 
     src = fetchFromGitHub {
-        owner = "hexpm";
-        repo = "hex";
-        rev = "v${version}";
-        sha256 = "0yxw7r31kk45b1nk48pajwwv9zl746kc9pwqfb73za8b1g8bgxd3";
+      owner = "hexpm";
+      repo = "hex";
+      rev = "v${version}";
+      sha256 = "1wz6n4qrmsb4kkww6lrdbs99xzwp4dyjjmr8m4drcwn3sd2k9ba6";
     };
 
     setupHook = writeText "setupHook.sh" ''

From 4aaab192a79bbdb4a21726acf6e05feecc3e0fc4 Mon Sep 17 00:00:00 2001
From: Suraj Barkale <suraj@barkale.com>
Date: Mon, 24 Feb 2020 23:08:05 +1100
Subject: [PATCH 1440/4636] aws-vault: 4.5.1 to 5.3.2 (#80949)

The aws-vault development has switched to using go modules.
Therefore this package has also been updated to use `buildGoModule`
helper.
---
 pkgs/tools/admin/aws-vault/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix
index ddecd15b6ade..48a1de61cd80 100644
--- a/pkgs/tools/admin/aws-vault/default.nix
+++ b/pkgs/tools/admin/aws-vault/default.nix
@@ -1,17 +1,18 @@
-{ buildGoPackage, lib, fetchFromGitHub }:
-buildGoPackage rec {
+{ buildGoModule, lib, fetchFromGitHub }:
+buildGoModule rec {
   pname = "aws-vault";
-  version = "4.5.1";
-
-  goPackagePath = "github.com/99designs/${pname}";
+  version = "5.3.2";
 
   src = fetchFromGitHub {
     owner = "99designs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0y64fx15p9ls829lif7c0jaxyclzpnr8l5cyw25q545878dzmcs5";
+    sha256 = "04dyibcaijv5011laycf39m4gvprvvsn5zkxslyih1kqd170w3wg";
   };
 
+  modSha256 = "1d3hjfmfmlpw2scfyn597zkzz864w97p0wrsxjp49m9mi0pgmhq9";
+  subPackages = [ "." ];
+
   # set the version. see: aws-vault's Makefile
   buildFlagsArray = ''
     -ldflags=
@@ -19,10 +20,10 @@ buildGoPackage rec {
   '';
 
   meta = with lib; {
-    description = "A vault for securely storing and accessing AWS credentials in development environments";
+    description =
+      "A vault for securely storing and accessing AWS credentials in development environments";
     homepage = "https://github.com/99designs/aws-vault";
     license = licenses.mit;
     maintainers = with maintainers; [ zimbatm ];
   };
-
 }

From 3e47a8781fa690fe13eb0a796b6153a0e8f074b4 Mon Sep 17 00:00:00 2001
From: Max Wittig <max.wittig@siemens.com>
Date: Mon, 24 Feb 2020 13:09:01 +0100
Subject: [PATCH 1441/4636] gitlab-runner: 12.7.0 -> 12.8.0 (#80947)

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

diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 91ef9d4a222d..01c6ec0df29e 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
 { lib, buildGoPackage, fetchFromGitLab, fetchurl }:
 
 let
-  version = "12.7.0";
+  version = "12.8.0";
   # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
   docker_x86_64 = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
-    sha256 = "0vaaaw6hxmr55kgcn86rim9in96zmyv0zhl7asr4b7qknabsjp4m";
+    sha256 = "02k9nzfqlsd78dan522qynbz2i2ggvf960968vmg0wdg6rjv19z2";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
-    sha256 = "031fv7f15wiqq7209n2ab7n3qzjf7cjzvbp4pkz24bkc3lr3y773";
+    sha256 = "098g6948w8skbz9z5212ndsxvf3k12aijy0v2a7c86r0zhlga52x";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     rev = "v${version}";
-    sha256 = "0f08syk7v7w89pcdbzwgscsxl54gnms1qd4spjppnq4h5r959jp2";
+    sha256 = "17cs7bs3dxkj6r7hip6kv7cj7g5lq9x1g3gcl2kjj8djxzkhfc4m";
   };
 
   patches = [ ./fix-shell-path.patch ];

From dcd43950095b54c39da58a763fdb72fe4482705f Mon Sep 17 00:00:00 2001
From: elseym <elseym@me.com>
Date: Mon, 24 Feb 2020 13:16:30 +0100
Subject: [PATCH 1442/4636] termshark: 1.0.0 -> 2.1.1

---
 pkgs/tools/networking/termshark/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/tools/networking/termshark/default.nix
index 3361127afede..35b92e0f653b 100644
--- a/pkgs/tools/networking/termshark/default.nix
+++ b/pkgs/tools/networking/termshark/default.nix
@@ -2,19 +2,19 @@
 
 buildGoModule rec {
   pname = "termshark";
-  version = "1.0.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "gcla";
     repo = "termshark";
     rev = "v${version}";
-    sha256 = "1h9wysvd7i4vzn9qyswrmckmshxmh24ypvca98balkyhsxjwlb6j";
+    sha256 = "14h548apg3zvjvq6yy22hpw2ziy5vmwyr04vv59ls1mjg4qf2v8b";
   };
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ wireshark-cli ];
 
-  modSha256 = "09mbjbk5wa18z4xis5b2v2v0b04mf4d896yp88vcj8d8hsmbmc6g";
+  modSha256 = "0lp4gky76di7as78421p3lsirfr7mic3z204ildvj6gf6d15svpr";
 
   postFixup = ''
     wrapProgram $out/bin/termshark --prefix PATH : ${stdenv.lib.makeBinPath [ wireshark-cli ]}
@@ -28,8 +28,7 @@ buildGoModule rec {
   meta = with stdenv.lib; {
     homepage = https://termshark.io/;
     description = "A terminal UI for wireshark-cli, inspired by Wireshark";
-    platforms = platforms.linux;
     license = licenses.mit;
-    maintainers = [ maintainers.winpat ];
+    maintainers = with maintainers; [ winpat elseym ];
   };
 }

From 40b2619fef4d03b49685ab73e14ff75b55fe8706 Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Mon, 24 Feb 2020 13:58:15 +0100
Subject: [PATCH 1443/4636] mopidy-iris: 3.44.0 -> 3.45.1

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

diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index 6d9147a7f5d9..2f3e5f64767d 100644
--- a/pkgs/applications/audio/mopidy/iris.nix
+++ b/pkgs/applications/audio/mopidy/iris.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "Mopidy-Iris";
-  version = "3.44.0";
+  version = "3.45.1";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "0gap0cyw6sfb4487i1x220rr9fbsz6xyw68l15ar0vfll0zv0760";
+    sha256 = "02jmylz76wlwxlv8drndprb7r9l8kqqgjkp17mjx5ngnl545pc2w";
   };
 
   propagatedBuildInputs = [

From e6e1f767d24a18002ff0f07f3bcfab809f483cbc Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 24 Feb 2020 08:11:28 -0500
Subject: [PATCH 1444/4636] linux: 4.19.105 -> 4.19.106

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 53c44bc5b728..fd2bf0b8f155 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.105";
+  version = "4.19.106";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "04mz4amafbhia0lwyh7wc9mxiqg2kw4gz2y0wvfb7zh4nj57fb7q";
+    sha256 = "1nlwgs15mc3hlfhqw95pz7wisg8yshzrxzzq2a0y30mjm5vbvj33";
   };
 } // (args.argsOverride or {}))

From 33780083d77bfed05693cc094ddaefc1423cc077 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 24 Feb 2020 08:12:12 -0500
Subject: [PATCH 1445/4636] linux: 5.4.21 -> 5.4.22

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index ef021fa211dd..8c75304da7fc 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.4.21";
+  version = "5.4.22";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1yjv8qg47kb4j4jkcpi9z7v07p0vz3gszpmhrfji5866j97748vd";
+    sha256 = "06kx9bmrrk1brici8wvvd6dxqawgcig4i59pwllcq39rgs6wn6v6";
   };
 } // (args.argsOverride or {}))

From faaa55f4c37da138a036250aa5075145976f2801 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 24 Feb 2020 08:13:14 -0500
Subject: [PATCH 1446/4636] linux: 5.5.5 -> 5.5.6

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.5.nix b/pkgs/os-specific/linux/kernel/linux-5.5.nix
index 806ba4d4f6c6..061e719cc2b4 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.5.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.5.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.5.5";
+  version = "5.5.6";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "11shmhalrj6k25alarsgyh9ml48sgpq9v9r59n99y59d7z07ph3s";
+    sha256 = "0dgfwqmkqlrn2anwf2bj7lgl9bi4fhkmp44jhmyjc5vmknmqik2l";
   };
 } // (args.argsOverride or {}))

From e3c10922323352ab0e3f9b967932f3cf1e230976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ferry=20J=C3=A9r=C3=A9mie?= <ferryjeremie@free.fr>
Date: Mon, 24 Feb 2020 14:15:27 +0100
Subject: [PATCH 1447/4636] drawing: init at 0.4.11

---
 .../applications/graphics/drawing/default.nix | 69 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 71 insertions(+)
 create mode 100644 pkgs/applications/graphics/drawing/default.nix

diff --git a/pkgs/applications/graphics/drawing/default.nix b/pkgs/applications/graphics/drawing/default.nix
new file mode 100644
index 000000000000..67fa5da398bc
--- /dev/null
+++ b/pkgs/applications/graphics/drawing/default.nix
@@ -0,0 +1,69 @@
+{ lib
+, fetchFromGitHub
+, meson
+, ninja
+, pkgconfig
+, python3
+, gtk3
+, appstream-glib
+, desktop-file-utils
+, gobject-introspection
+, wrapGAppsHook
+, glib
+, gdk-pixbuf
+, pango
+, gettext
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "drawing";
+  version = "0.4.11";
+
+  format = "other";
+  
+  src = fetchFromGitHub {
+    owner = "maoschanz";
+    repo = pname;
+    rev = version;
+    sha256 = "00c1h6jns11rmsg35gy40fb6ahvik80wpbm2133bjcqxfwwnlal6";
+  };
+
+  nativeBuildInputs = [
+    appstream-glib
+    desktop-file-utils
+    gobject-introspection
+    meson
+    ninja
+    pkgconfig
+    wrapGAppsHook
+    glib
+    gettext
+  ];
+
+  buildInputs = [
+    glib
+    gtk3
+    gdk-pixbuf
+    pango
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    pycairo
+    pygobject3
+  ];
+
+  postPatch = ''
+    chmod +x build-aux/meson/postinstall.py # patchShebangs requires executable file
+    patchShebangs build-aux/meson/postinstall.py
+  '';
+
+  strictDeps = false;
+
+  meta = with lib; {
+    description = "A free basic image editor, similar to Microsoft Paint, but aiming at the GNOME desktop";
+    homepage = "https://maoschanz.github.io/drawing/";
+    maintainers = with maintainers; [ mothsart ];
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d3691ce2293..9f89510da1d6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18686,6 +18686,8 @@ in
 
   dragonfly-reverb = callPackage ../applications/audio/dragonfly-reverb { };
 
+  drawing = callPackage ../applications/graphics/drawing { };
+
   drawio = callPackage ../applications/graphics/drawio {};
 
   drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { };

From bd118f6375087411356df8e77da731301562f410 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 24 Feb 2020 08:16:18 -0500
Subject: [PATCH 1448/4636] vivaldi: 2.11.1811.38-1 -> 2.11.1811.41-1

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

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index d2de889bf7bd..16e2214a4c28 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -17,11 +17,11 @@ let
   vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
 in stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "2.11.1811.38-1";
+  version = "2.11.1811.41-1";
 
   src = fetchurl {
     url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
-    sha256 = "0nz7yhxp7fxv6pj1i2684di1wgk4k78hw4icfjqzjwmvc3i710jw";
+    sha256 = "1d0n9il9jj2790npp1ppnkc9g1pdb5v0x5kgl45xyqw0fd5fry08";
   };
 
   unpackPhase = ''

From da84ff331bf3d7a12c5fb591ac5ae65c2847162b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 24 Feb 2020 08:17:10 -0500
Subject: [PATCH 1449/4636] zoom-us: 3.5.352596.0119 -> 3.5.359165.0223

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

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index d22c1cefc2f4..4047968cf621 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -14,11 +14,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
 let
   inherit (stdenv.lib) concatStringsSep makeBinPath optional;
 
-  version = "3.5.352596.0119";
+  version = "3.5.359165.0223";
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
-      sha256 = "1h8wki0b920k0hcy812w91ara59z4rmfllxx04nbmzsxh0bvsx90";
+      sha256 = "19x8qypqlq3yxs05vzmjdbn6qd60zrqjn0s4n10cnfzl21vf6d44";
     };
   };
 

From e648441eef4d562a602d86627dd44268c3d8c7df Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Feb 2020 13:25:54 +0000
Subject: [PATCH 1450/4636] python27Packages.django-gravatar2: 1.4.2 -> 1.4.4

---
 .../development/python-modules/django-gravatar2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/django-gravatar2/default.nix b/pkgs/development/python-modules/django-gravatar2/default.nix
index be153feb2a7c..4ea3b7e7ee58 100644
--- a/pkgs/development/python-modules/django-gravatar2/default.nix
+++ b/pkgs/development/python-modules/django-gravatar2/default.nix
@@ -2,18 +2,18 @@
 
 buildPythonPackage rec {
   pname = "django-gravatar2";
-  version = "1.4.2";
+  version = "1.4.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1qsv40xywbqsf4mkrmsswrpzqd7nfljxpfiim9an2z3dykn5rka6";
+    sha256 = "1vn921fb6jjx7rf5dzhy66rkb71nwmh9ydd0xs9ys72icw4jh4y8";
   };
 
   doCheck = false;
 
   meta = with stdenv.lib; {
     description = "Essential Gravatar support for Django";
-    homepage = https://github.com/twaddington/django-gravatar;
+    homepage = "https://github.com/twaddington/django-gravatar";
     license = licenses.mit;
   };
 }

From e90bf5782ebb7554e27f8190933dd990f1473afa Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Mon, 24 Feb 2020 13:36:01 +0000
Subject: [PATCH 1451/4636] poetry2nix: 1.4.0 -> 1.5.0

---
 .../tools/poetry2nix/poetry2nix/default.nix   | 83 ++++++++++---------
 .../poetry2nix/poetry2nix/hooks/default.nix   | 25 ++++++
 .../{ => hooks}/pyproject-without-path.py     |  0
 .../hooks/remove-path-dependencies.sh         |  8 ++
 .../tools/poetry2nix/poetry2nix/lib.nix       | 48 ++++++-----
 .../poetry2nix/poetry2nix/mk-poetry-dep.nix   | 14 +++-
 .../tools/poetry2nix/poetry2nix/overrides.nix |  2 +-
 pkgs/development/tools/poetry2nix/update      |  2 +-
 8 files changed, 118 insertions(+), 64 deletions(-)
 create mode 100644 pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix
 rename pkgs/development/tools/poetry2nix/poetry2nix/{ => hooks}/pyproject-without-path.py (100%)
 create mode 100644 pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh

diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
index 0d1c243d0975..ac866a139d97 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
@@ -25,19 +25,21 @@ let
   # Get license by id falling back to input string
   getLicenseBySpdxId = spdxId: spdxLicenses.${spdxId} or spdxId;
 
-  #
-  # Returns an attrset { python, poetryPackages } for the given lockfile
-  #
-  mkPoetryPython =
-    { poetrylock
+  /*
+     Returns an attrset { python, poetryPackages, pyProject, poetryLock } for the given pyproject/lockfile.
+  */
+  mkPoetryPackages =
+    { pyproject
+    , poetrylock
     , poetryPkg
     , overrides ? [ defaultPoetryOverrides ]
     , meta ? {}
     , python ? pkgs.python3
     , pwd ? null
     }@attrs: let
-      lockData = readTOML poetrylock;
-      lockFiles = lib.getAttrFromPath [ "metadata" "files" ] lockData;
+      pyProject = readTOML pyproject;
+      poetryLock = readTOML poetrylock;
+      lockFiles = lib.getAttrFromPath [ "metadata" "files" ] poetryLock;
 
       specialAttrs = [
         "overrides"
@@ -48,11 +50,18 @@ let
 
       evalPep508 = mkEvalPep508 python;
 
-      # Filter packages by their PEP508 markers
+      # Filter packages by their PEP508 markers & pyproject interpreter version
       partitions = let
-        supportsPythonVersion = pkgMeta: if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true;
+        supportsPythonVersion = pkgMeta: let
+          pep508Result = if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true;
+
+          flatDeps = (pyProject.tool.poetry.dependencies or {}) // (pyProject.tool.poetry.dev-dependencies or {});
+          constraints = flatDeps.${pkgMeta.name}.python or "";
+          pyprojectResult = isCompatible python.pythonVersion constraints;
+        in
+          pyprojectResult && pep508Result;
       in
-        lib.partition supportsPythonVersion lockData.package;
+        lib.partition supportsPythonVersion poetryLock.package;
 
       compatible = partitions.right;
       incompatible = partitions.wrong;
@@ -82,18 +91,22 @@ let
           );
         in
           lockPkgs;
-
       overlays = builtins.map getFunctorFn (
         [
           (
-            self: super: {
-              mkPoetryDep = self.callPackage ./mk-poetry-dep.nix {
-                inherit pkgs lib python poetryLib;
-              };
-              poetry = poetryPkg;
-              # The canonical name is setuptools-scm
-              setuptools-scm = super.setuptools_scm;
-            }
+            self: super: let
+              hooks = self.callPackage ./hooks {};
+            in
+              {
+                mkPoetryDep = self.callPackage ./mk-poetry-dep.nix {
+                  inherit pkgs lib python poetryLib;
+                };
+                poetry = poetryPkg;
+                # The canonical name is setuptools-scm
+                setuptools-scm = super.setuptools_scm;
+
+                inherit (hooks) removePathDependenciesHook;
+              }
           )
           # Null out any filtered packages, we don't want python.pkgs from nixpkgs
           (self: super: builtins.listToAttrs (builtins.map (x: { name = x.name; value = null; }) incompatible))
@@ -110,6 +123,8 @@ let
       {
         python = py;
         poetryPackages = map (pkg: py.pkgs.${pkg.name}) compatible;
+        poetryLock = poetryLock;
+        inherit pyProject;
       };
 
   /* Returns a package with a python interpreter and all packages specified in the poetry.lock lock file.
@@ -118,7 +133,8 @@ let
        poetry2nix.mkPoetryEnv { poetrylock = ./poetry.lock; python = python3; }
   */
   mkPoetryEnv =
-    { poetrylock
+    { pyproject
+    , poetrylock
     , overrides ? [ defaultPoetryOverrides ]
     , meta ? {}
     , pwd ? null
@@ -126,9 +142,9 @@ let
     }:
       let
         poetryPkg = poetry.override { inherit python; };
-        py = mkPoetryPython (
+        py = mkPoetryPackages (
           {
-            inherit poetryPkg poetrylock overrides meta python pwd;
+            inherit poetryPkg pyproject poetrylock overrides meta python pwd;
           }
         );
       in
@@ -147,13 +163,12 @@ let
     }@attrs: let
       poetryPkg = poetry.override { inherit python; };
 
-      py = (
-        mkPoetryPython {
-          inherit poetryPkg poetrylock overrides meta python pwd;
-        }
-      ).python;
+      poetryPython = mkPoetryPackages {
+        inherit poetryPkg pyproject poetrylock overrides meta python pwd;
+      };
+      py = poetryPython.python;
 
-      pyProject = readTOML pyproject;
+      inherit (poetryPython) pyProject;
 
       specialAttrs = [
         "overrides"
@@ -187,21 +202,13 @@ let
 
           buildInputs = mkInput "buildInputs" buildSystemPkgs;
           propagatedBuildInputs = mkInput "propagatedBuildInputs" (getDeps "dependencies") ++ ([ py.pkgs.setuptools ]);
-          nativeBuildInputs = mkInput "nativeBuildInputs" [ pkgs.yj ];
+          nativeBuildInputs = mkInput "nativeBuildInputs" [ pkgs.yj py.pkgs.removePathDependenciesHook ];
           checkInputs = mkInput "checkInputs" (getDeps "dev-dependencies");
 
           passthru = {
             python = py;
           };
 
-          postPatch = (passedAttrs.postPatch or "") + ''
-            # Tell poetry not to resolve the path dependencies. Any version is
-            # fine !
-            yj -tj < pyproject.toml | ${python.interpreter} ${./pyproject-without-path.py} > pyproject.json
-            yj -jt < pyproject.json > pyproject.toml
-            rm pyproject.json
-          '';
-
           meta = meta // {
             inherit (pyProject.tool.poetry) description homepage;
             license = getLicenseBySpdxId (pyProject.tool.poetry.license or "unknown");
@@ -240,7 +247,7 @@ let
 
 in
 {
-  inherit mkPoetryEnv mkPoetryApplication cli doc;
+  inherit mkPoetryEnv mkPoetryApplication mkPoetryPackages cli doc;
 
   /*
   The default list of poetry2nix override overlays
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix
new file mode 100644
index 000000000000..dd24b2634e00
--- /dev/null
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix
@@ -0,0 +1,25 @@
+{ python
+, callPackage
+, makeSetupHook
+, yj
+}:
+
+let
+  pythonInterpreter = python.pythonForBuild.interpreter;
+in
+{
+
+  removePathDependenciesHook = callPackage (
+    {}:
+      makeSetupHook {
+        name = "remove-path-dependencies.sh";
+        deps = [];
+        substitutions = {
+          inherit pythonInterpreter;
+          yj = "${yj}/bin/yj";
+          pyprojectPatchScript = "${./pyproject-without-path.py}";
+        };
+      } ./remove-path-dependencies.sh
+  ) {};
+
+}
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pyproject-without-path.py b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-path.py
similarity index 100%
rename from pkgs/development/tools/poetry2nix/poetry2nix/pyproject-without-path.py
rename to pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-path.py
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh
new file mode 100644
index 000000000000..900fe66908bf
--- /dev/null
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh
@@ -0,0 +1,8 @@
+remove-path-dependencies-hook() {
+    # Tell poetry not to resolve the path dependencies. Any version is fine!
+    @yj@ -tj < pyproject.toml | @pythonInterpreter@ @pyprojectPatchScript@ > pyproject.json
+    @yj@ -jt < pyproject.json > pyproject.toml
+    rm pyproject.json
+}
+
+postPatchHooks+=(remove-path-dependencies-hook)
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
index d49e6ce36db3..64ba0293132e 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
@@ -8,27 +8,30 @@ let
     genList (i: if i == idx then value else (builtins.elemAt list i)) (length list)
   );
 
-  # Returns true if pythonVersion matches with the expression in pythonVersions
-  isCompatible = pythonVersion: pythonVersions:
-    let
-      operators = {
-        "||" = cond1: cond2: cond1 || cond2;
-        "," = cond1: cond2: cond1 && cond2; # , means &&
-      };
-      # split string at "," and "||"
-      tokens = builtins.filter (x: x != "") (builtins.split "(,|\\|\\|)" pythonVersions);
-      combine = acc: v:
-        let
-          isOperator = builtins.typeOf v == "list";
-          operator = if isOperator then (builtins.elemAt v 0) else acc.operator;
-        in
-          if isOperator then (acc // { inherit operator; }) else {
-            inherit operator;
-            state = operators."${operator}" acc.state (satisfiesSemver pythonVersion v);
-          };
-      initial = { operator = ","; state = true; };
-    in
-      (builtins.foldl' combine initial tokens).state;
+  # Compare a semver expression with a version
+  isCompatible = version: let
+    operators = {
+      "||" = cond1: cond2: cond1 || cond2;
+      "," = cond1: cond2: cond1 && cond2; # , means &&
+      "&&" = cond1: cond2: cond1 && cond2;
+    };
+    splitRe = "(" + (builtins.concatStringsSep "|" (builtins.map (x: lib.replaceStrings [ "|" ] [ "\\|" ] x) (lib.attrNames operators))) + ")";
+  in
+    expr:
+      let
+        tokens = builtins.filter (x: x != "") (builtins.split splitRe expr);
+        combine = acc: v:
+          let
+            isOperator = builtins.typeOf v == "list";
+            operator = if isOperator then (builtins.elemAt v 0) else acc.operator;
+          in
+            if isOperator then (acc // { inherit operator; }) else {
+              inherit operator;
+              state = operators."${operator}" acc.state (satisfiesSemver version v);
+            };
+        initial = { operator = "&&"; state = true; };
+      in
+        if expr == "" then true else (builtins.foldl' combine initial tokens).state;
 
   fromTOML = builtins.fromTOML or
     (
@@ -65,7 +68,7 @@ let
       else { pkg = []; str = null; };
 
   # Fetch the artifacts from the PyPI index. Since we get all
-  # info we need from the lock file we don't use nixpkgs' fetchPypi
+  # info we need from the lock file we don't use nixpkgs' fetchPyPi
   # as it modifies casing while not providing anything we don't already
   # have.
   #
@@ -101,5 +104,6 @@ in
     isCompatible
     readTOML
     getBuildSystemPkgs
+    satisfiesSemver
     ;
 }
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
index cbfa3dafa753..5113ad25e4b6 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
@@ -83,7 +83,13 @@ pythonPackages.callPackage (
             else (builtins.elemAt (lib.strings.splitString "-" name) 2);
         };
 
-      baseBuildInputs = lib.optional (name != "setuptools_scm" && name != "setuptools-scm") pythonPackages.setuptools-scm;
+      # Prevent infinite recursion
+      skipSetupToolsSCM = [
+        "setuptools_scm"
+        "setuptools-scm"
+        "toml" # Toml is an extra for setuptools-scm
+      ];
+      baseBuildInputs = lib.optional (! lib.elem name skipSetupToolsSCM) pythonPackages.setuptools-scm;
 
       format = if isLocal then "pyproject" else if isGit then "setuptools" else fileInfo.format;
 
@@ -100,7 +106,11 @@ pythonPackages.callPackage (
         # Stripping pre-built wheels lead to `ELF load command address/offset not properly aligned`
         dontStrip = format == "wheel";
 
-        nativeBuildInputs = if (!isSource && (getManyLinuxDeps fileInfo.name).str != null) then [ autoPatchelfHook ] else [];
+        nativeBuildInputs = (if (!isSource && (getManyLinuxDeps fileInfo.name).str != null) then [ autoPatchelfHook ] else [])
+        ++ lib.optional (isLocal) pkgs.yj
+        ++ lib.optional (format == "pyproject") pythonPackages.removePathDependenciesHook
+        ;
+
         buildInputs = (
           baseBuildInputs
           ++ lib.optional (!isSource) (getManyLinuxDeps fileInfo.name).pkg
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
index 86260c037036..6316dcf51c0c 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
@@ -103,7 +103,7 @@ self: super:
   );
 
   # importlib-metadata has an incomplete dependency specification
-  importlib-metadata = super.importlib-metadata.overrideAttrs (
+  importlib-metadata = if super.importlib-metadata == null then null else super.importlib-metadata.overrideAttrs (
     old: {
       propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional self.python.isPy2 self.pathlib2;
     }
diff --git a/pkgs/development/tools/poetry2nix/update b/pkgs/development/tools/poetry2nix/update
index a5d367590be1..4840c23c3b81 100755
--- a/pkgs/development/tools/poetry2nix/update
+++ b/pkgs/development/tools/poetry2nix/update
@@ -15,7 +15,7 @@ mv poetry2nix-master/* .
 
 mkdir build
 cp *.nix *.json *.py build/
-cp -r bin build/
+cp -r hooks bin build/
 rm build/shell.nix build/generate.py build/overlay.nix build/flake.nix
 
 cat > build/README.md << EOF

From 48e4304adf59fa65d73abfdecaef4ef094ed29bd Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Mon, 24 Feb 2020 13:37:34 +0000
Subject: [PATCH 1452/4636] poetry: Remove importlib-metadata override

This workaround is no longer required as the bug requiring it has been
fixed in poetry2nix.
---
 pkgs/development/tools/poetry/default.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/tools/poetry/default.nix b/pkgs/development/tools/poetry/default.nix
index 5035677beb00..1517e53f219c 100644
--- a/pkgs/development/tools/poetry/default.nix
+++ b/pkgs/development/tools/poetry/default.nix
@@ -8,12 +8,6 @@ poetry2nix.mkPoetryApplication {
   pyproject = ./pyproject.toml;
   poetrylock = ./poetry.lock;
 
-  overrides = [ (poetry2nix.defaultPoetryOverrides.overrideOverlay (self: super: {
-    # Needed because poetry2nix currently doesn't handle pyproject.toml python bounds
-    # See https://github.com/nix-community/poetry2nix/issues/50
-    importlib-metadata = if python.pythonOlder "3.8" then super.importlib-metadata else null;
-  }))];
-
   src = fetchFromGitHub (lib.importJSON ./src.json);
 
   # "Vendor" dependencies (for build-system support)

From 655b9c3400c5c2cc75c674a8c7d2fd321f23270a Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 23 Feb 2020 12:17:50 +0100
Subject: [PATCH 1453/4636] python2Packages.jinja2: disable tests on 32bit
 systems

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

diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix
index cc08d2cf3757..90dfc6fa7daf 100644
--- a/pkgs/development/python-modules/jinja2/default.nix
+++ b/pkgs/development/python-modules/jinja2/default.nix
@@ -1,5 +1,9 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, pytest, markupsafe }:
+{ stdenv
+, buildPythonPackage
+, isPy3k
+, fetchPypi
+, pytest
+, markupsafe }:
 
 buildPythonPackage rec {
   pname = "Jinja2";
@@ -13,6 +17,10 @@ buildPythonPackage rec {
   checkInputs = [ pytest ];
   propagatedBuildInputs = [ markupsafe ];
 
+  # Multiple tests run out of stack space on 32bit systems with python2.
+  # See https://github.com/pallets/jinja/issues/1158
+  doCheck = !stdenv.is32bit || isPy3k;
+
   checkPhase = ''
     pytest -v tests
   '';

From 09796a644c20f6bc76883bcc3c89ab14718ee2ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Mon, 24 Feb 2020 14:43:05 +0100
Subject: [PATCH 1454/4636] pythonPackages.mysql-connector: fix build for
 python != python3

---
 .../python-modules/mysql-connector/default.nix            | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix
index 61a055b5ea8a..e66f102e6cab 100644
--- a/pkgs/development/python-modules/mysql-connector/default.nix
+++ b/pkgs/development/python-modules/mysql-connector/default.nix
@@ -1,9 +1,7 @@
-{ lib, buildPythonPackage, fetchFromGitHub
-, python3, protobuf3_6
-}:
+{ lib, buildPythonPackage, fetchFromGitHub, python, protobuf3_6 }:
 
 let
-  python = python3.override {
+  py = python.override {
     packageOverrides = self: super: {
       protobuf = super.protobuf.override {
         protobuf = protobuf3_6;
@@ -21,7 +19,7 @@ in buildPythonPackage rec {
     sha256 = "1jscmc5s7mwx43gvxjlqc30ylp5jjpmkqx7s3b9nllbh926p3ixg";
   };
 
-  propagatedBuildInputs = with python.pkgs; [ protobuf dnspython ];
+  propagatedBuildInputs = with py.pkgs; [ protobuf dnspython ];
 
   # Tests are failing (TODO: unknown reason)
   # TypeError: __init__() missing 1 required positional argument: 'string'

From 229dc013b37bf4a8ab18e210bd87f8f9d94275af Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 18 Feb 2020 10:23:03 +0100
Subject: [PATCH 1455/4636] coqPackages.mathcomp_1_10: init at 1.10.0

---
 pkgs/development/coq-modules/mathcomp/default.nix | 14 +++++++++++---
 pkgs/top-level/coq-packages.nix                   |  7 ++++++-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
index 647a13afa8f8..aeb53a995e55 100644
--- a/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -8,6 +8,7 @@ let
   ####################################
   # sha256 of released mathcomp versions
   mathcomp-sha256 = {
+    "1.10.0" = "1b9m6pwxxyivw7rgx82gn5kmgv2mfv3h3y0mmjcjfypi8ydkrlbv";
     "1.9.0" = "0lid9zaazdi3d38l8042lczb02pw5m9wq0yysiilx891hgq2p81r";
     "1.8.0" = "07l40is389ih8bi525gpqs3qp4yb2kl11r9c8ynk1ifpjzpnabwp";
     "1.7.0" = "0wnhj9nqpx2bw6n1l4i8jgrw3pjajvckvj3lr4vzjb3my2lbxdd1";
@@ -15,6 +16,7 @@ let
   };
   # versions of coq compatible with released mathcomp versions
   mathcomp-coq-versions = {
+    "1.10.0" = flip elem [ "8.7" "8.8" "8.9" "8.10" "8.11" ];
     "1.9.0" = flip elem ["8.7" "8.8" "8.9" "8.10"];
     "1.8.0" = flip elem ["8.7" "8.8" "8.9"];
     "1.7.0" = flip elem ["8.6" "8.7" "8.8" "8.9"];
@@ -24,7 +26,7 @@ let
   max-mathcomp-version = last (naturalSort (attrNames mathcomp-coq-versions));
   # mathcomp prefered version by decreasing order
   # (the first version in the list will be tried first)
-  mathcomp-version-preference = [ "1.8.0" "1.9.0" "1.7.0" "1.6.1" ];
+  mathcomp-version-preference = [ "1.8.0" "1.9.0" "1.10.0" "1.7.0" "1.6.1" ];
 
   ##############################################################
   # COMPUTED using the configuration above (edit with caution) #
@@ -133,6 +135,7 @@ getAttrOr = a: n: a.${n} or (throw a.error);
 mathcompCorePkgs_1_7 = mathcompGen "1.7.0";
 mathcompCorePkgs_1_8 = mathcompGen "1.8.0";
 mathcompCorePkgs_1_9 = mathcompGen "1.9.0";
+mathcompCorePkgs_1_10 = mathcompGen "1.10.0";
 mathcompCorePkgs     = recurseIntoAttrs
   (mapDerivationAttrset dontDistribute (mathcompGen default-mathcomp-version));
 
@@ -143,6 +146,7 @@ inherit mathcompGenSingle;
 mathcomp_1_7_single = getAttrOr (mathcompGenSingle "1.7.0") "single";
 mathcomp_1_8_single = getAttrOr (mathcompGenSingle "1.8.0") "single";
 mathcomp_1_9_single = getAttrOr (mathcompGenSingle "1.9.0") "single";
+mathcomp_1_10_single = getAttrOr (mathcompGenSingle "1.10.0") "single";
 mathcomp_single     = dontDistribute
  (getAttrOr (mathcompGenSingle default-mathcomp-version) "single");
 
@@ -151,13 +155,16 @@ mathcomp_single     = dontDistribute
 # each of these have a special attribute overrideMathcomp which
 # must be used instead of overrideAttrs in order to also fix the dependencies
 inherit mathcompGen mathcompCorePkgs
-        mathcompCorePkgs_1_7 mathcompCorePkgs_1_8 mathcompCorePkgs_1_9;
+        mathcompCorePkgs_1_7 mathcompCorePkgs_1_8 mathcompCorePkgs_1_9
+	mathcompCorePkgs_1_10
+	;
 
 
 mathcomp     = getAttrOr mathcompCorePkgs     "all";
 mathcomp_1_7 = getAttrOr mathcompCorePkgs_1_7 "all";
 mathcomp_1_8 = getAttrOr mathcompCorePkgs_1_8 "all";
 mathcomp_1_9 = getAttrOr mathcompCorePkgs_1_9 "all";
+mathcomp_1_10 = getAttrOr mathcompCorePkgs_1_10 "all";
 
 ssreflect     = getAttrOr mathcompCorePkgs    "ssreflect";
 
@@ -165,4 +172,5 @@ ssreflect     = getAttrOr mathcompCorePkgs    "ssreflect";
 (mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = pkg;}) mathcompCorePkgs) //
 (mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_7"; value = pkg;}) mathcompCorePkgs_1_7) //
 (mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_8"; value = pkg;}) mathcompCorePkgs_1_8) //
-(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_9"; value = pkg;}) mathcompCorePkgs_1_9)
+(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_9"; value = pkg;}) mathcompCorePkgs_1_9) //
+(mapAttrs' (n: pkg: {name = "mathcomp-${n}_1_10"; value = pkg;}) mathcompCorePkgs_1_10)
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 4faaf86040db..565410cc5f67 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -54,7 +54,12 @@ let
 
         mathcompCorePkgs_1_9 mathcomp_1_9
         mathcomp-ssreflect_1_9 mathcomp-fingroup_1_9 mathcomp-algebra_1_9
-        mathcomp-solvable_1_9 mathcomp-field_1_9 mathcomp-character_1_9;
+        mathcomp-solvable_1_9 mathcomp-field_1_9 mathcomp-character_1_9
+
+        mathcompCorePkgs_1_10 mathcomp_1_10
+        mathcomp-ssreflect_1_10 mathcomp-fingroup_1_10 mathcomp-algebra_1_10
+        mathcomp-solvable_1_10 mathcomp-field_1_10 mathcomp-character_1_10
+        ;
       inherit (callPackage ../development/coq-modules/mathcomp/extra.nix { })
         mathcompExtraGen multinomials coqeal
 

From 86d1378d3e49e8dcaf3b6135a7fffe8f789609df Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 17 Feb 2020 17:57:45 +0100
Subject: [PATCH 1456/4636] =?UTF-8?q?ocamlPackages.batteries:=202.11.0=20?=
 =?UTF-8?q?=E2=86=92=203.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix
index 1b3bb9a79812..263da89d1dfe 100644
--- a/pkgs/development/ocaml-modules/batteries/default.nix
+++ b/pkgs/development/ocaml-modules/batteries/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }:
 
-let version = "2.11.0"; in
+let version = "3.0.0"; in
 
 stdenv.mkDerivation {
   name = "ocaml${ocaml.version}-batteries-${version}";
 
   src = fetchurl {
     url = "https://github.com/ocaml-batteries-team/batteries-included/releases/download/v${version}/batteries-${version}.tar.gz";
-    sha256 = "0swdnm9c3sd3yzzyg7yh1lkqhfikmga4fzx2416ja1q62nv26j53";
+    sha256 = "0d833amm4p0pczgl7wriv99f3r5r6345p5gi9d97sm0hqx27vzwi";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild qtest ];

From 2509166f719de8885c56800a9a757220f9384df5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 24 Feb 2020 12:51:12 -0300
Subject: [PATCH 1457/4636] vimix-gtk-themes: init at 2020-02-24

---
 pkgs/data/themes/vimix/default.nix | 32 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/data/themes/vimix/default.nix

diff --git a/pkgs/data/themes/vimix/default.nix b/pkgs/data/themes/vimix/default.nix
new file mode 100644
index 000000000000..1b3d2005f08a
--- /dev/null
+++ b/pkgs/data/themes/vimix/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, gtk_engines, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  pname = "vimix-gtk-themes";
+  version = "2020-02-24";
+
+  src = fetchFromGitHub {
+    owner = "vinceliuice";
+    repo = pname;
+    rev = version;
+    sha256 = "18v7yhwzachjgy276rdhj5cg353f0qysa2kxk9gyc6s71q2gjzcv";
+  };
+
+  buildInputs = [ gtk_engines ];
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  installPhase = ''
+    patchShebangs .
+    mkdir -p $out/share/themes
+    name= ./install.sh -d $out/share/themes
+    rm $out/share/themes/*/{AUTHORS,LICENSE}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Flat Material Design theme for GTK based desktop environments";
+    homepage = "https://github.com/vinceliuice/vimix-gtk-themes";
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57870b2a4e76..60d2570e0d67 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18085,6 +18085,8 @@ in
 
   victor-mono = callPackage ../data/fonts/victor-mono { };
 
+  vimix-gtk-themes = callPackage ../data/themes/vimix {};
+
   vistafonts = callPackage ../data/fonts/vista-fonts { };
 
   vistafonts-chs = callPackage ../data/fonts/vista-fonts-chs { };

From 53488b27beeb8398d894ab01bf9e039ff7992b56 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 18 Feb 2020 21:46:40 +0100
Subject: [PATCH 1458/4636] systemd: 243.4 -> 243.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This bumps to the latest state of the systemd 242 stable, published at
https://github.com/systemd/systemd-stable/tree/v243-stable.

Should cover CVE-2020-1712.

Git Log:

f8dd0f2f15 (tag: v243.7, systemd-stable/v243-stable) Revert "Support Plugable UD-PRO8 dock"
1a5428c2ab hibernate-resume-generator: wait "infinitely" for the resume device
eb3148c468 (tag: v243.6) hwdb: update to v245-rc1
f14fa558ae Fix typo in function name
fb21e13e8e polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it
2e504c92d1 sd-bus: introduce API for re-enqueuing incoming messages
4d80c8f158 polkit: use structured initialization
54791aff01 polkit: on async pk requests, re-validate action/details
81532beddc polkit: reuse some common bus message appending code
4441844d58 bus-polkit: rename return error parameter to ret_error
31a1d569db shared: split out polkit stuff from bus-util.c → bus-polkit.c
560eb5babf test: adapt to the new capsh format
275b266bde meson: update efi path detection to gnu-efi-3.0.11
9239154545 presets: "disable" all passive targets by default
a827c41851 shared/sysctl-util: normalize repeated slashes or dots to a single value
fb1bfd6804 dhcp6: do not use T1 and T2 longer than one provided by the lease
ca43a515c6 network: fix implicit type conversion warning by GCC-10
421eca7edf bootspec: parse random-seed-mode line in loader.conf
34e21fc6de sd-boot: fix typo
df7b3a05c9 test: Synchronize journal before reading from it
9326efee71 sd-bus: fix introspection bug in signal parameter names
7bbdc56aaf efi: fix build.
486f8ca365 generator: order growfs for the root fs after systemd-remount-fs
56d442e29d loginctl: use /org/freedesktop/login1/session/auto when "lock-session" is called without argument
6ed1152282 Documentation update for x-systemd.{before,after}
dba3efa34a man: fix typo in systemd.netdev Xfrm example
6f9a8621d8 timesyncd: log louder when we refuse a server due to root distance
0637255d3b resolved: drop DNSSEC root key that is not valid anymore
9a135baa40 journal: don't use startswith() on something that is not a NUL-terminated string
1ff3972a0f test: add test for https://github.com/systemd/systemd/issues/14560
cac79b606b core: make sure StandardInput=file: doesn't get dup'ed to stdout/stderr by default
906ba9a67d pkgconf: add full generator paths
01b93e2c68 tree-wide: we forgot to destroy some bus errors
5c9455657e mount: make checks on perpetual mount units more lax
28c58beca1 core: never allow perpetual units to be masked
d3b044b3e7 typo: "May modify to" -> "May modify"
fd378d3d3c sysctl: downgrade message when we have no permission
db4fbf5c61 Clarify journald.conf MaxLevelStore documentation
c8365f71c0 logind: refuse overriding idle hint on tty sessions
cd91f567b6 cgroup: update only siblings that got realized once
c672dcd212 mount: mark an existing "mounting" unit from /proc/self/mountinfo as "just_mounted"
a592a40564 journalctl: Correctly handle combination of --reverse and --lines (fixes #1596)
0aa144ab1d journalctl: Correctly handle --show-cursor in combination with --until or --since and --reverse
3b803a5e66 core: fix re-realization of cgroup siblings
7549dd40fc core: propagate service state to socket in more load states
af6df343b2 man: describe "symlink" and "systemctl link" explicitly in UNIT FILE LOAD PATH
a3c1ce25a7 core: be more restrictive on the dependency types we allow to be created transiently
2b9ec8384c udev: don't import parent ID_FS_ data on partitions
ecd95c507c man: fix option name
0d4f06156b Support Plugable UD-PRO8 dock
7fba869abd gpt-auto: don't assume XBOOTLDR is vfat
494c281b67 man: fix documentation of IBM VIO device naming
7271fb056a man: slightly extend documentation on difference between ID_NET_NAME_ONBOARD and ID_NET_LABEL_ONBOARD
852ae28e68 boot: fix osrel parser
2613200370 udev: do not use exact match of file permission
46477397c1 network: lower the log-level of harmless message
7163b1fe86 hwdb: ignore keys added in kernel 5.5
92f90837dc systemctl: skip non-existent units in the 'cat' verb
a67227cc99 systemd.exec: document the file system for EnvironmentFile paths
cfb4c0aca5 systemd-analyze: fixed typo in documentation
017fddd998 test-condition: fix group check condition
9d5e3cb774 umount: show correct error message
252f1a5277 Revert "Drop dbus activation stub service"
20bbfac95e man: add section about user manager units
c93ef60212 man: add remote-*.targets to the bootup sequence
55e0f99689 time-util: also use 32bit hack on EOVERFLOW
7afe2ecb02 [man] note which UID ranges will get user journals
a43b67a4c9 [man] fix URL
dedb26a8d6 analyze: badness if neither of RootImage and RootDirectory exists
714c93862a initrd: make udev cleanup service confict trigger and settle too
8932407ae1 man: we support growing xfs too these days
19af11dc07 time-util: deal with systems where userspace has 64bit time_t but kernel does not
c90229d81d [import] fix stdin/stdout pipe behavior in import/export tar/raw
39910328da cryptsetup-generator: unconfuse writing of the device timeout
fc5e6c87a4 shared/install: log syntax error for invalid DefaultInstance=
409c94a407 shared/install: provide a nicer error message for invalid WantedBy=/Required= values
70e8c1978a seccomp: real syscall numbers are >= 0
a0a1977d9a seccomp: more comprehensive protection against libseccomp's __NR_xyz namespace invasion
7f936c60d5 network: set ipv6 mtu after link-up or device mtu change
b59d88cc62 man: fix typo in net-naming-scheme man page
c5e5ac0958 man: fix typos (#14304)
9a2f26564d ipv4ll: do not reset conflict counter on restart
bc9e1ebfdd Fix typo (duplicate "or")
c6cb71b7e7 network: if /sys is rw, then udev should be around
67dcdfd956 nspawn: do not fail if udev is not running
a7938a1bc6 Create parent directories when creating systemd-private subdirs
53aa44f873 network: do not return error but return UINT64_MAX if speed meter is disabled
65abf12674 core: swap priority can be negative
b1cf452ff5 systemctl: enhance message about kexec missing kernel
07a0e5b425 man: use mkswap@ instead of makeswap@
57dc017c6b journald: don't ask for the machine ID if we don't need it
ac392a57c0 journalctl: pager_close() calls fflush(stdout) anyway as first thing
ee7dfadc82 journald: remove unused field
471073f1b5 journalctl: return EOPNOTSUPP if pcre is not enabled
002ededb61 man: drop reference to machined, add one for journald instead
fd3bd4be3b pid1: make TimeoutAbortSec settable for transient units
eb2ef4d664 pid1: fix setting of DefaultTimeoutAbortSec
1d75e29b23 shared/ask-password-api: modify keyctl break value
a16b1ee7e5 cryptsetup: reduce the chance that we will be OOM killed
4836fb010a core: write out correct field name when creating transient service units
3e2c547f6d udevd: don't use monitor after manager_exit()
d42f7d45a8 Revert "udevd: fix crash when workers time out after exit is signal caught"
c9a287eee8 man/systemd.link: Add missing verb *be*
a67a3ae04b man: document all pager variables for systemctl and systemd
3a8fce3f38 core.timer: fix "systemd-analyze dump" and docs syntax inconsistencies wrt OnTimezoneChange=
fdffd284b6 core/service: downgrade "scheduling restart" message to debug
733e7f19d3 travis: add missing closing quote sign
0d7b7817fc systemd-tmpfiles: don't install timer when service isn't installed either
0e7f83cd2b pam_systemd: prolong method call timeout when allocating session
---
 pkgs/os-specific/linux/systemd/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 2f8f898ceafe..1dd2f30b9bfc 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -30,7 +30,7 @@ let gnupg-minimal = gnupg.override {
   bzip2 = null;
 };
 in stdenv.mkDerivation {
-  version = "243.4";
+  version = "243.7";
   pname = "systemd";
 
   # When updating, use https://github.com/systemd/systemd-stable tree, not the development one!
@@ -38,8 +38,8 @@ in stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "systemd";
-    rev = "d8853d39a28b9884e0acd3ae5732a1e7caaf08af";
-    sha256 = "1wqm51i2czbbb3nara11mnxzqng4na1l8fvz7qnbxcrjsqm7hz18";
+    rev = "e7d881488292fc8bdf96acd12767eca1bd65adae";
+    sha256 = "0haj3iff3y13pm4w5dbqj1drp5wryqfad58jbbmnb6zdgis56h8f";
   };
 
   outputs = [ "out" "lib" "man" "dev" ];
@@ -258,7 +258,7 @@ in stdenv.mkDerivation {
   passthru.interfaceVersion = 2;
 
   meta = with stdenv.lib; {
-    homepage = http://www.freedesktop.org/wiki/Software/systemd;
+    homepage = "https://www.freedesktop.org/wiki/Software/systemd/";
     description = "A system and service manager for Linux";
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;

From 00e09ed6c0a66c2dba7fda39c9f42f7b011345f0 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Mon, 24 Feb 2020 08:21:55 -0800
Subject: [PATCH 1459/4636] helm: 3.1.0 -> 3.1.1

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

diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 92ce038afa16..12e20e9c13b4 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "helm";
-  version = "3.1.0";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "helm";
     repo = "helm";
     rev = "v${version}";
-    sha256 = "0byc3si0ysjzbgb91vlbvbmawy8wprs1ajk5xzsb66c5hlhq1il9";
+    sha256 = "16hbwmgq14g28r9s0ipnpiqlppyh57yrcqcspmj05vrf9jsg5vwj";
   };
   modSha256 = "0618zzi4x37ahsrazsr82anghhfva8yaryzb3p5d737p3ixbiyv8";
 

From 745750d685fe1e7093d939afa1f99f53a337eca2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Feb 2020 16:32:00 +0000
Subject: [PATCH 1460/4636] python27Packages.mockito: 1.2.0 -> 1.2.1

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

diff --git a/pkgs/development/python-modules/mockito/default.nix b/pkgs/development/python-modules/mockito/default.nix
index f0673b64ef3a..74887b995362 100644
--- a/pkgs/development/python-modules/mockito/default.nix
+++ b/pkgs/development/python-modules/mockito/default.nix
@@ -1,12 +1,12 @@
 { stdenv, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }:
 
 buildPythonPackage rec {
-  version = "1.2.0";
+  version = "1.2.1";
   pname = "mockito";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2a1cbae9d0aef4ae7586b03f2a463e8c5ba96aa937c0535ced4a5621f851feeb";
+    sha256 = "1ilj73bdk81v4l7ir6hbfvmslzbsxkgvz1asngbyf7w5gl2y5nyf";
   };
 
   propagatedBuildInputs = stdenv.lib.optionals (!isPy3k) [ funcsigs ];
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Spying framework";
-    homepage = https://github.com/kaste/mockito-python;
+    homepage = "https://github.com/kaste/mockito-python";
     license = licenses.mit;
     maintainers = [ maintainers.marsam ];
   };

From c5efe372fa64e17f9c20acf47e40664fea18061a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Feb 2020 16:36:42 +0000
Subject: [PATCH 1461/4636] python37Packages.tablib: 1.0.0 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix
index 4cf2200eda72..a4933f1b206d 100644
--- a/pkgs/development/python-modules/tablib/default.nix
+++ b/pkgs/development/python-modules/tablib/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "tablib";
-  version = "1.0.0";
+  version = "1.1.0";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ddvcgycv5m7q4rn5bch9qnhxjgn7192z537b1wzpmwd5s074cgz";
+    sha256 = "19wvx40lgm1d1zqscznwjklchczcmv07cqfigalmpj7i7ym0j6ad";
   };
 
   propagatedBuildInputs = [ xlwt openpyxl pyyaml xlrd odfpy ];

From 7c8351de974817e67988ee3adc5d5e8b4de43598 Mon Sep 17 00:00:00 2001
From: Leigh Perry <lperry.breakpoint@gmail.com>
Date: Tue, 25 Feb 2020 04:12:25 +1100
Subject: [PATCH 1462/4636] google-cloud-sdk: 268.0.0 -> 281.0.0 (#80944)

---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 1d37f71f0a83..95878ef09ab6 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -21,12 +21,12 @@ let
   sources = name: system: {
     x86_64-darwin = {
       url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
-      sha256 = "10h0khh8npj2j5f7h3z86h46zbb1skbfs74firssich6jk7rx6km";
+      sha256 = "0hg4823dlnf9ahqh9dr05wsi6cdxn9mbwhg65jng3d2aws3ski6r";
     };
 
     x86_64-linux = {
       url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
-      sha256 = "182r9lgpks50ihcrkarc5w6l4rfmpdnx825lazamj5j2jsha73xw";
+      sha256 = "00ziqr60q1la716c9cy3hjpyq3hiw3m75d4wry6prn5655jw4ph6";
     };
   }.${system};
 
@@ -34,7 +34,7 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "google-cloud-sdk";
-  version = "268.0.0";
+  version = "281.0.0";
 
   src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);
 

From b9f7819bd337491b0dda0ee6962653ef5d1a19b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Mon, 16 Dec 2019 20:53:52 +0100
Subject: [PATCH 1463/4636] ettercap: fix pango not finding hb.h from harfbuzz
 (#75789)

---
 pkgs/applications/networking/sniffers/ettercap/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix
index dbff491fa807..38b7f1c1740c 100644
--- a/pkgs/applications/networking/sniffers/ettercap/default.nix
+++ b/pkgs/applications/networking/sniffers/ettercap/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre
-, openssl, ncurses, glib, gtk3, atk, pango, flex, bison, geoip
+, openssl, ncurses, glib, gtk3, atk, pango, flex, bison, geoip, harfbuzz
 , pkgconfig }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake flex bison pkgconfig ];
   buildInputs = [
     libpcap libnet zlib curl pcre openssl ncurses
-    glib gtk3 atk pango geoip
+    glib gtk3 atk pango geoip harfbuzz
   ];
 
   preConfigure = ''
@@ -30,6 +30,9 @@ stdenv.mkDerivation rec {
     "-DGTK3_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
   ];
 
+  # TODO: Remove after the next release (0.8.4 should work without this):
+  NIX_CFLAGS_COMPILE = [ "-I${harfbuzz.dev}/include/harfbuzz" ];
+
   meta = with stdenv.lib; {
     description = "Comprehensive suite for man in the middle attacks";
     homepage = http://ettercap.github.io/ettercap/;

From 4080e7976e71a147c056120a1694b0d54d638f49 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Feb 2020 01:44:10 +0000
Subject: [PATCH 1464/4636] gtkwave: 3.3.103 -> 3.3.104

---
 pkgs/applications/science/electronics/gtkwave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index 75d69d3e499e..694adc4d6349 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gtkwave";
-  version = "3.3.103";
+  version = "3.3.104";
 
   src = fetchurl {
     url    = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz";
-    sha256 = "0djqfnxy772a9p44wnm5ansbih7jg76xv1hvcpkv3gblhkzg49ay";
+    sha256 = "1qvldbnlp3wkqr5ff93f6pdvv9yzij7lxfhpqlizakz08l1xb391";
   };
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

From ee8935d6356cd7c545cf626e4bd6e1ef54d9616a Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 24 Feb 2020 18:41:14 +0100
Subject: [PATCH 1465/4636] ettercap: Switch to OpenSSL 1.1.1

I noticed that Ettercap was listed in #80746.
---
 .../networking/sniffers/ettercap/default.nix             | 9 ++++++++-
 pkgs/top-level/all-packages.nix                          | 4 +---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/ettercap/default.nix b/pkgs/applications/networking/sniffers/ettercap/default.nix
index 38b7f1c1740c..c548098baa7e 100644
--- a/pkgs/applications/networking/sniffers/ettercap/default.nix
+++ b/pkgs/applications/networking/sniffers/ettercap/default.nix
@@ -35,7 +35,14 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Comprehensive suite for man in the middle attacks";
-    homepage = http://ettercap.github.io/ettercap/;
+    longDescription = ''
+      Ettercap is a comprehensive suite for man in the middle attacks. It
+      features sniffing of live connections, content filtering on the fly and
+      many other interesting tricks. It supports active and passive dissection
+      of many protocols and includes many features for network and host
+      analysis.
+    '';
+    homepage = https://www.ettercap-project.org/;
     license = licenses.gpl2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ pSub ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85181bd59501..e39ead06e9b3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3166,9 +3166,7 @@ in
 
   ethtool = callPackage ../tools/misc/ethtool { };
 
-  ettercap = callPackage ../applications/networking/sniffers/ettercap {
-    openssl = openssl_1_0_2;
-  };
+  ettercap = callPackage ../applications/networking/sniffers/ettercap { };
 
   euca2ools = callPackage ../tools/virtualization/euca2ools { };
 

From 737995d20a4d214a2c6d537907119a6b90f5c4e6 Mon Sep 17 00:00:00 2001
From: Brett Lyons <blyons@fastmail.com>
Date: Mon, 24 Feb 2020 11:03:05 -0700
Subject: [PATCH 1466/4636] maintainers: add brettlyons

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f1d9439fec32..414bd6a88788 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1085,6 +1085,12 @@
     githubId = 7716744;
     name = "Berno Strik";
   };
+  brettlyons = {
+    email = "blyons@fastmail.com";
+    github = "brettlyons";
+    githubId = 3043718;
+    name = "Brett Lyons";
+  };
   btlvr = {
     email = "btlvr@protonmail.com";
     github = "btlvr";

From 26bd210afc2deb524417d447e42687f7fb28f5fe Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 24 Feb 2020 20:33:39 +0100
Subject: [PATCH 1467/4636] ostree: fix gjs installed tests

---
 pkgs/tools/misc/ostree/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix
index 05e7f9c05ef0..9a41f5e857ad 100644
--- a/pkgs/tools/misc/ostree/default.nix
+++ b/pkgs/tools/misc/ostree/default.nix
@@ -113,9 +113,14 @@ in stdenv.mkDerivation rec {
     "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/libostree"
   ];
 
-  postFixup = ''
+  postFixup = let
+    typelibPath = stdenv.lib.makeSearchPath "/lib/girepository-1.0" [
+      (placeholder "out")
+      gobject-introspection
+    ];
+  in ''
     for test in $installedTests/libexec/installed-tests/libostree/*.js; do
-      wrapProgram "$test" --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0"
+      wrapProgram "$test" --prefix GI_TYPELIB_PATH : "${typelibPath}"
     done
   '';
 

From 56d58ecb241bcec3b0a55cc1c9748f358b2a02ef Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Feb 2020 19:40:14 +0000
Subject: [PATCH 1468/4636] quantum-espresso: 6.4.1 -> 6.5

---
 .../science/chemistry/quantum-espresso/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix
index ea80e9fd5ca7..bd420519ce01 100644
--- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix
+++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix
@@ -4,12 +4,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "6.4.1";
+  version = "6.5";
   pname = "quantum-espresso";
 
   src = fetchurl {
     url = "https://gitlab.com/QEF/q-e/-/archive/qe-${version}/q-e-qe-${version}.tar.gz";
-    sha256 = "027skhp2zzx0f4mh6azqjljdimchak5cdn13v4x7aj5q2zvfkmxh";
+    sha256 = "00nnsq1vq579xsmkvwrgs6bdqdcbdlsmcp4yfynnvs40ca52m2r5";
   };
 
   passthru = {
@@ -35,7 +35,7 @@ configureFlags = if (mpi != null) then [ "LD=${mpi}/bin/mpif90" ] else [ "LD=${g
         nanoscale. It is based on density-functional theory, plane waves, and
         pseudopotentials.
       '';
-    homepage = https://www.quantum-espresso.org/;
+    homepage = "https://www.quantum-espresso.org/";
     license = licenses.gpl2;
     platforms = [ "x86_64-linux" ];
     maintainers = [ maintainers.costrouc ];

From 09725e5f9e896befcb7a1e292eae99c85a7a13b2 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 24 Feb 2020 20:50:51 +0100
Subject: [PATCH 1469/4636] opensmtpd: 6.6.3p1 -> 6.6.4p1

Release notes aren't available at this time [1] it is likely to be
related to a recent mail to oss-security (either [2] or [3]).

[1] https://www.mail-archive.com/misc@opensmtpd.org/msg04888.html
[2] https://www.openwall.com/lists/oss-security/2020/02/24/5
[3] https://www.openwall.com/lists/oss-security/2020/02/24/4
---
 pkgs/servers/mail/opensmtpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index 7174b45a6f77..76b247cfd841 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   pname = "opensmtpd";
-  version = "6.6.3p1";
+  version = "6.6.4p1";
 
   nativeBuildInputs = [ autoconf automake libtool bison ];
   buildInputs = [ libasr libevent zlib libressl db pam ];
 
   src = fetchurl {
     url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz";
-    sha256 = "1dqysjlyl0x3qzdzc9sjrla0063vpmlyq735lzf88p7wgzmw1xwy";
+    sha256 = "1kyph9ycq0j21dl9n1sq5fns9p4gckdi0fmnf8awrcwrdcm9dyg2";
   };
 
   patches = [

From 2bd5d8c04a87675c9e41f3f9fc0121f467f42d24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Mon, 24 Feb 2020 21:28:00 +0100
Subject: [PATCH 1470/4636] seasocks: remove unneeded patch

---
 pkgs/development/libraries/seasocks/default.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/seasocks/default.nix b/pkgs/development/libraries/seasocks/default.nix
index 8efcd0de2f14..9825c0c40355 100644
--- a/pkgs/development/libraries/seasocks/default.nix
+++ b/pkgs/development/libraries/seasocks/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, python, zlib, fetchpatch }:
+{ stdenv, fetchFromGitHub, cmake, python, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "seasocks";
@@ -11,13 +11,6 @@ stdenv.mkDerivation rec {
     sha256 = "1c2gc0k9wgbgn7y7wmq2ylp0gvdbmagc1x8c4jwbsncl1gy6x4g2";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/mattgodbolt/seasocks/commit/5753b50ce3b2232d166843450043f88a4a362422.patch";
-      sha256 = "1c20xjma8jdgcr5m321srpmys6b4jvqkazfqr668km3r2ck5xncl";
-    })
-  ];
-
   nativeBuildInputs = [ cmake ];
   buildInputs = [ zlib python ];
 

From 4ddbe3f2630220bbf97680bb5ddcf7f426e4d4d0 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 25 Feb 2020 06:52:34 +1000
Subject: [PATCH 1471/4636] umoci: 0.4.4 -> 0.4.5

---
 .../virtualization/umoci/default.nix             | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/virtualization/umoci/default.nix b/pkgs/applications/virtualization/umoci/default.nix
index 245bb841af63..f07bb0fc164e 100644
--- a/pkgs/applications/virtualization/umoci/default.nix
+++ b/pkgs/applications/virtualization/umoci/default.nix
@@ -1,21 +1,23 @@
-{ stdenv, fetchFromGitHub, buildGoPackage }:
+{ lib, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
   pname = "umoci";
-  version = "0.4.4";
-
-  goPackagePath = "github.com/openSUSE/umoci";
+  version = "0.4.5";
 
   src = fetchFromGitHub {
     owner = "openSUSE";
     repo = "umoci";
     rev = "v${version}";
-    sha256 = "1mmk9y6xk0qk5rgysmm7x16b025zzwa2sd13jd32drd48scai2dw";
+    sha256 = "1gzj4nnys73wajdwjn5jsskvnhzh8s2vmyl76ax8drpvw19bd5g3";
   };
 
-  meta = with stdenv.lib; {
+  goPackagePath = "github.com/openSUSE/umoci";
+
+  buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
+
+  meta = with lib; {
     description = "umoci modifies Open Container images";
-    homepage = https://umo.ci;
+    homepage = "https://umo.ci";
     license = licenses.asl20;
     maintainers = with maintainers; [ zokrezyl ];
     platforms = platforms.linux;

From 119a7aae504aea03654d39c68666e1cd4e28bd56 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sun, 26 Jan 2020 21:35:05 +0100
Subject: [PATCH 1472/4636] nixos/nextcloud: prevent warning about missing
 X-Frame-Option

---
 nixos/modules/services/web-apps/nextcloud.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index d79f2bb735fa..53bd518d857e 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -533,6 +533,7 @@ in {
                 add_header X-Robots-Tag none;
                 add_header X-Download-Options noopen;
                 add_header X-Permitted-Cross-Domain-Policies none;
+                add_header X-Frame-Options sameorigin;
                 add_header Referrer-Policy no-referrer;
                 access_log off;
               '';
@@ -547,6 +548,7 @@ in {
               add_header X-Robots-Tag none;
               add_header X-Download-Options noopen;
               add_header X-Permitted-Cross-Domain-Policies none;
+              add_header X-Frame-Options sameorigin;
               add_header Referrer-Policy no-referrer;
               add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always;
               error_page 403 /core/templates/403.php;

From 43bb5bffda01e7a6e7c18d24f755b729b43b957a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 24 Feb 2020 16:12:31 -0500
Subject: [PATCH 1473/4636] seafile-client: use qt5's mkDerivation

Fixes #80976
---
 pkgs/applications/networking/seafile-client/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index 1b96e9fb663c..75ba68db3a80 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools
+{ mkDerivation, lib, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools
 , seafile-shared, ccnet, jansson, libsearpc
 , withShibboleth ? true, qtwebengine }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "seafile-client";
   version = "7.0.5";
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     ++ lib.optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON";
 
   qtWrapperArgs = [
-    "--suffix PATH : ${stdenv.lib.makeBinPath [ ccnet seafile-shared ]}"
+    "--suffix PATH : ${lib.makeBinPath [ ccnet seafile-shared ]}"
   ];
 
   meta = with lib; {

From a8eba26d2c040740f9fa1215df3dfede9cffad13 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 24 Feb 2020 16:11:41 -0500
Subject: [PATCH 1474/4636] qview: use qt5's mkDerivation

---
 pkgs/applications/graphics/qview/default.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/qview/default.nix b/pkgs/applications/graphics/qview/default.nix
index 8df6ce4f80ba..b6f25795665a 100644
--- a/pkgs/applications/graphics/qview/default.nix
+++ b/pkgs/applications/graphics/qview/default.nix
@@ -1,18 +1,27 @@
-{stdenv, fetchFromGitHub, qmake}:
-stdenv.mkDerivation rec {
+{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase }:
+
+mkDerivation rec {
   pname = "qview";
   version = "3.0";
+
   src = fetchFromGitHub {
     owner = "jurplel";
     repo = "qView";
     rev = version;
     sha256 = "15a91bs3wcqhgf76wzigbn10hayg628j84pq4j2vaxar94ak0vk7";
   };
+
   nativeBuildInputs = [ qmake ];
+
+  buildInputs = [
+    qtbase
+  ];
+
   patchPhase = ''
     sed "s|/usr/|$out/|g" -i qView.pro
   '';
-  meta = with stdenv.lib; {
+
+  meta = with lib; {
     description = "Practical and minimal image viewer";
     homepage = "https://interversehq.com/qview/";
     license = licenses.gpl3;

From f8da067a2a4106df938c274433c868a6bb058b87 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 24 Feb 2020 16:11:50 -0500
Subject: [PATCH 1475/4636] qgo: use qt5's mkDerivation

---
 pkgs/games/qgo/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix
index 610be7efdce9..17441d14e7c7 100644
--- a/pkgs/games/qgo/default.nix
+++ b/pkgs/games/qgo/default.nix
@@ -1,17 +1,17 @@
-{ stdenv
+{ lib
+, mkDerivation
 , fetchFromGitHub
-, makeWrapper
 , qmake
 , qtbase
 , qtmultimedia
 , qttranslations
 }:
 
-stdenv.mkDerivation {
+mkDerivation {
   pname = "qgo";
   version = "unstable-2017-12-18";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Go client based on Qt5";
     longDescription = ''
       qGo is a Go Client based on Qt 5. It supports playing online at
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
   postPatch = ''
     sed -i 's|@out@|'"''${out}"'|g' src/src.pro src/defines.h
   '';
-  nativeBuildInputs = [ makeWrapper qmake ];
+  nativeBuildInputs = [ qmake ];
   buildInputs = [ qtbase qtmultimedia qttranslations ];
   enableParallelBuilding = true;
 

From ffe40094ab87db2f7fde572914c06a9194033541 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 24 Feb 2020 16:12:02 -0500
Subject: [PATCH 1476/4636] tikzit: use qt5's mkDerivation

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

diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix
index 5ee1adda483b..0a1f6591b860 100644
--- a/pkgs/tools/typesetting/tikzit/default.nix
+++ b/pkgs/tools/typesetting/tikzit/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, qmake, qttools, qtbase, libsForQt5, flex, bison }:
+{ stdenv, mkDerivation, fetchFromGitHub, qmake, qttools, qtbase, poppler, flex, bison }:
 
-stdenv.mkDerivation {
+mkDerivation {
   pname = "tikzit";
   version = "2.1.4";
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ qmake qttools flex bison ];
-  buildInputs = [ qtbase libsForQt5.poppler ];
+  buildInputs = [ qtbase poppler ];
 
   # src/data/tikzlexer.l:29:10: fatal error: tikzparser.parser.hpp: No such file or directory
   enableParallelBuilding = false;

From bad546f87294d516169d755391f1eff3c203fa4e Mon Sep 17 00:00:00 2001
From: Brett Lyons <blyons@fastmail.com>
Date: Mon, 24 Feb 2020 11:08:57 -0700
Subject: [PATCH 1477/4636] cozette: init at 1.5.1

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

diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/data/fonts/cozette/default.nix
new file mode 100644
index 000000000000..a5d9f9055624
--- /dev/null
+++ b/pkgs/data/fonts/cozette/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchurl, mkfontscale }:
+
+let
+  version = "1.5.1";
+  releaseUrl =
+    "https://github.com/slavfox/Cozette/releases/download/v.${version}";
+in stdenv.mkDerivation rec {
+  pname = "Cozette";
+  inherit version;
+
+  srcs = map fetchurl [
+    {
+      url = "${releaseUrl}/cozette.otb";
+      sha256 = "05k45n7jar11gnng2awpmc7zk9jdlzd6wz87xx49cp75jm4z9xm8";
+    }
+    {
+      url = "${releaseUrl}/CozetteVector.otf";
+      sha256 = "1sqhnjpizn1wi26lc7z2zml7yr7zkcpa72mh1drvd74rlcs1ip30";
+    }
+    {
+      url = "${releaseUrl}/CozetteVector.ttf";
+      sha256 = "1q4ml8shv9lmyc6bwhffwvbvl92s73j7xkb0rkqvci4f0zbz7mcy";
+    }
+  ];
+
+  nativeBuildInputs = [ mkfontscale ];
+
+  sourceRoot = "./";
+
+  unpackCmd = ''
+    otName=$(stripHash "$curSrc")
+    cp $curSrc ./$otName
+  '';
+
+  installPhase = ''
+
+    install -D -m 644 *.otf -t "$out/share/fonts/opentype"
+    install -D -m 644 *.ttf -t "$out/share/fonts/truetype"
+    install -D -m 644 *.otb -t "$out/share/fonts/misc"
+
+    mkfontdir "$out/share/fonts/misc"
+    mkfontscale "$out/share/fonts/truetype"
+    mkfontscale "$out/share/fonts/opentype"
+  '';
+
+  outputs = [ "out" ];
+
+  meta = with stdenv.lib; {
+    description = "A bitmap programming font optimized for coziness.";
+    homepage = "https://github.com/slavfox/cozette";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ brettlyons ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94aae7151053..9c8f7fe36898 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17438,6 +17438,8 @@ in
 
   corefonts = callPackage ../data/fonts/corefonts { };
 
+  cozette = callPackage ../data/fonts/cozette { };
+
   culmus = callPackage ../data/fonts/culmus { };
 
   clearlyU = callPackage ../data/fonts/clearlyU

From 4928d8ca89261d4fbd1811324e402a6025c77574 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Mon, 24 Feb 2020 13:26:01 -0800
Subject: [PATCH 1478/4636] hugo: 0.65.1 -> 0.65.3 (#80965)

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

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 4b099270df54..b32004d0cc77 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "hugo";
-  version = "0.65.1";
+  version = "0.65.3";
 
   goPackagePath = "github.com/gohugoio/hugo";
 
@@ -10,7 +10,7 @@ buildGoModule rec {
     owner = "gohugoio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "09kaa5zvi0kmmhms9n162fmrxacidga9241in0vrnn8lwl3rbgam";
+    sha256 = "1m0xhzm1w6y778x3fplzr9dif7lcqlkfvk4b7plywrisv3ic8yqs";
   };
 
   modSha256 = "1f320zbqnv2ybsp3qmlgn3rsjgp2zdb24qjd3gcys30mw48cx3na";

From 1b00f471ddd6c91f123af6c0cb62bf7a8f67c64d Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 24 Feb 2020 16:51:18 -0500
Subject: [PATCH 1479/4636] perl-packages: don't use openssl_1_0_2

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f1bd3ce42748..57f24021739f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3652,8 +3652,8 @@ let
       url = mirror://cpan/authors/id/T/TT/TTAR/Crypt-OpenSSL-AES-0.02.tar.gz;
       sha256 = "b66fab514edf97fc32f58da257582704a210c2b35e297d5c31b7fa2ffd08e908";
     };
-    NIX_CFLAGS_COMPILE = "-I${pkgs.openssl_1_0_2.dev}/include";
-    NIX_CFLAGS_LINK = "-L${pkgs.openssl_1_0_2.out}/lib -lcrypto";
+    NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include";
+    NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
     meta = with stdenv.lib; {
       description = "Perl wrapper around OpenSSL's AES library";
       license = with licenses; [ artistic1 gpl1Plus ];
@@ -3667,8 +3667,8 @@ let
       url = mirror://cpan/authors/id/K/KM/KMX/Crypt-OpenSSL-Bignum-0.09.tar.gz;
       sha256 = "1p22znbajq91lbk2k3yg12ig7hy5b4vy8igxwqkmbm4nhgxp4ki3";
     };
-    NIX_CFLAGS_COMPILE = "-I${pkgs.openssl_1_0_2.dev}/include";
-    NIX_CFLAGS_LINK = "-L${pkgs.openssl_1_0_2.out}/lib -lcrypto";
+    NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include";
+    NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
   };
 
   CryptOpenSSLGuess = buildPerlPackage {
@@ -3705,8 +3705,8 @@ let
       sha256 = "4173403ad4cf76732192099f833fbfbf3cd8104e0246b3844187ae384d2c5436";
     };
     propagatedBuildInputs = [ CryptOpenSSLRandom ];
-    NIX_CFLAGS_COMPILE = "-I${pkgs.openssl_1_0_2.dev}/include";
-    NIX_CFLAGS_LINK = "-L${pkgs.openssl_1_0_2.out}/lib -lcrypto";
+    NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include";
+    NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
     buildInputs = [ CryptOpenSSLGuess ];
   };
 
@@ -3769,7 +3769,7 @@ let
       url = mirror://cpan/authors/id/N/NA/NANIS/Crypt-SSLeay-0.72.tar.gz;
       sha256 = "1s7zm6ph37kg8jzaxnhi4ff4snxl7mi5h14arxbri0kp6s0lzlzm";
     };
-    makeMakerFlags = "--libpath=${pkgs.openssl_1_0_2.out}/lib --incpath=${pkgs.openssl_1_0_2.dev}/include";
+    makeMakerFlags = "--libpath=${pkgs.openssl.out}/lib --incpath=${pkgs.openssl.dev}/include";
     buildInputs = [ PathClass ];
     propagatedBuildInputs = [ LWPProtocolHttps ];
   };

From 06238ced3c77dde5b222f318dea0f1d1340c5981 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 24 Feb 2020 17:06:41 -0500
Subject: [PATCH 1480/4636] vde2: fix build with latest openssl

---
 pkgs/tools/networking/vde2/default.nix | 15 +++++++++++----
 pkgs/top-level/all-packages.nix        |  4 +---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix
index e43c174ab3f5..55d83eb719ce 100644
--- a/pkgs/tools/networking/vde2/default.nix
+++ b/pkgs/tools/networking/vde2/default.nix
@@ -8,12 +8,19 @@ stdenv.mkDerivation rec {
     sha256 = "14xga0ib6p1wrv3hkl4sa89yzjxv7f1vfqaxsch87j6scdm59pr2";
   };
 
-  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl (
-    fetchpatch {
+  patches = [
+    # Fix build with openssl 1.1.0
+    (fetchpatch {
+      name = "vde_cryptcab-compile-against-openssl-1.1.0.patch";
+      url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/vde_cryptcab-compile-against-openssl-1.1.0.patch?h=packages/vde2&id=15b11be49997fa94b603e366064690b7cc6bce61";
+      sha256 = "07z1yabwigq35mkwzqa934n7vjnjlqz5xfzq8cfj87lgyjjp00qi";
+    })
+  ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl [
+    (fetchpatch {
       url = "https://git.alpinelinux.org/cgit/aports/plain/main/vde2/musl-build-fix.patch?id=ddee2f86a48e087867d4a2c12849b2e3baccc238";
       sha256 = "0b5382v541bkxhqylilcy34bh83ag96g71f39m070jzvi84kx8af";
-    }
-  );
+    })
+  ];
 
   configureFlags = stdenv.lib.optional (!withPython) "--disable-python";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 17b0779bc904..c1179161d3a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7102,9 +7102,7 @@ in
 
   vbetool = callPackage ../tools/system/vbetool { };
 
-  vde2 = callPackage ../tools/networking/vde2 {
-    openssl = openssl_1_0_2;
-  };
+  vde2 = callPackage ../tools/networking/vde2 { };
 
   vboot_reference = callPackage ../tools/system/vboot_reference {};
 

From 9db6ae02c2a7b45f2aa479374c35f898b344d531 Mon Sep 17 00:00:00 2001
From: snicket2100 <57048005+snicket2100@users.noreply.github.com>
Date: Mon, 24 Feb 2020 23:27:55 +0100
Subject: [PATCH 1481/4636] siege: 4.0.4 -> 4.0.5

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

diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix
index a0a659974148..ff01fc89f09b 100644
--- a/pkgs/tools/networking/siege/default.nix
+++ b/pkgs/tools/networking/siege/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "siege-4.0.4";
+  name = "siege-4.0.5";
 
   src = fetchurl {
     url = "http://download.joedog.org/siege/${name}.tar.gz";
-    sha256 = "0vzaj5nzb0fir2a4l7ghv3wa5d1nk2ss8gmwjb6bjavjplccyzcg";
+    sha256 = "0c82h0idkvfbzspy7h6w97wyk671694nl1ir94zhzn54mw0p0jrv";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";

From 47036e173ac617e2dfe3152e4481a4b19d4ce710 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 24 Feb 2020 23:04:25 +0100
Subject: [PATCH 1482/4636] nodePackages: update package versions

---
 .../node-packages/node-packages-v10.nix       | 1097 ++++++++---------
 .../node-packages/node-packages-v12.nix       |   12 +-
 .../node-packages/node-packages-v13.nix       |   10 +-
 3 files changed, 543 insertions(+), 576 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
index 7cfa47198915..9ae72c026270 100644
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -22,31 +22,31 @@ let
         sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ==";
       };
     };
-    "@angular-devkit/architect-0.900.2" = {
+    "@angular-devkit/architect-0.900.3" = {
       name = "_at_angular-devkit_slash_architect";
       packageName = "@angular-devkit/architect";
-      version = "0.900.2";
+      version = "0.900.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.900.2.tgz";
-        sha512 = "uClqp4QEY/m6CB7SsNZGdVNTEgMzkI1Fkt0TOdE9huN1iCi/0+h3nQb+NZ1vBqD2afg9EqDwIPu2KCU0p1BR2A==";
+        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.900.3.tgz";
+        sha512 = "4UHc58Dlc5XHY3eiYSX9gytLyPNYixGSRwLcc/LRwuPgrmUFKPzCN3nwgB+9kc03/HN89CsJ1rS1scid6N6vxQ==";
       };
     };
-    "@angular-devkit/core-9.0.2" = {
+    "@angular-devkit/core-9.0.3" = {
       name = "_at_angular-devkit_slash_core";
       packageName = "@angular-devkit/core";
-      version = "9.0.2";
+      version = "9.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.0.2.tgz";
-        sha512 = "lEmfYs7+oHmXEQ3y97QGm73zs7i6chpx+ZSaBUvMM9oCKj/lytcn+diVG+t4hMavH6TK0lai7DO1rAbYkbmdrA==";
+        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.0.3.tgz";
+        sha512 = "3+abmv9K9d+BVgUAolYgoOqlGAA2Jb1pWo2biapSDG6KjUZHUCJdnsKigLtLorCdv0SrjTp56FFplkcqKsFQgA==";
       };
     };
-    "@angular-devkit/schematics-9.0.2" = {
+    "@angular-devkit/schematics-9.0.3" = {
       name = "_at_angular-devkit_slash_schematics";
       packageName = "@angular-devkit/schematics";
-      version = "9.0.2";
+      version = "9.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.0.2.tgz";
-        sha512 = "+MiSBWErz8hxcbyHioCQtTnFpbqaoCEQEknK0vCb15fFEY2Hi3u2TXK59QNKsqn8w+Mye5dHYhwmpsAC8Wcgtw==";
+        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.0.3.tgz";
+        sha512 = "BQnZtFQPLZZOijhuEndtzL6cOnhaE8nNxupkRHavWohOMStnLsRyvVJj6JVDkf37wvT5koqTNjHhbdMxcCRc6A==";
       };
     };
     "@antora/asciidoc-loader-2.2.0" = {
@@ -157,13 +157,13 @@ let
         sha512 = "3d6SqtknM3PiLRw2wLtcMVVfmyHtfNuWo8+ZBRmUrZs8HfhGteV8/s4vpiOJZmLYhW4KLFgIgG09lFdD5t78Ow==";
       };
     };
-    "@apollo/federation-0.12.0" = {
+    "@apollo/federation-0.12.1" = {
       name = "_at_apollo_slash_federation";
       packageName = "@apollo/federation";
-      version = "0.12.0";
+      version = "0.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.12.0.tgz";
-        sha512 = "jJb4CzJDLWghkVkhQE5go9XvekQZgL8MsHAGWHzrgHXfUNHZhAjkxODH0duPEq2WunGSp6rSu4rerW1cC89JvA==";
+        url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.12.1.tgz";
+        sha512 = "ZzTHtZH9b0JXtP55hicN42/+qX99qomN2MhTnTkM7jrcAWzE1V5spX/60GHTAeEQGf0zbmAOwzKCgIQS2AU6Bw==";
       };
     };
     "@apollo/protobufjs-1.0.3" = {
@@ -2281,13 +2281,13 @@ let
         sha512 = "eoOVMjILna7FVQf96iWc3+ZtE/ZT6y8ob8ZzcqKY1ibSQCnu4O/B7pJvzMx5cyZ/RjAff6DAdEb0O0Cjcxidkg==";
       };
     };
-    "@octokit/endpoint-5.5.2" = {
+    "@octokit/endpoint-5.5.3" = {
       name = "_at_octokit_slash_endpoint";
       packageName = "@octokit/endpoint";
-      version = "5.5.2";
+      version = "5.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.5.2.tgz";
-        sha512 = "ICDcRA0C2vtTZZGud1nXRrBLXZqFayodXAKZfo3dkdcLNqcHsgaz3YSTupbURusYeucSVRjjG+RTcQhx6HPPcg==";
+        url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.5.3.tgz";
+        sha512 = "EzKwkwcxeegYYah5ukEeAI/gYRLv2Y9U5PpIsseGSFDk+G3RbipQGBs8GuYS1TLCtQaqoO66+aQGtITPalxsNQ==";
       };
     };
     "@octokit/plugin-enterprise-rest-3.6.2" = {
@@ -2326,13 +2326,13 @@ let
         sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ==";
       };
     };
-    "@octokit/request-5.3.1" = {
+    "@octokit/request-5.3.2" = {
       name = "_at_octokit_slash_request";
       packageName = "@octokit/request";
-      version = "5.3.1";
+      version = "5.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/request/-/request-5.3.1.tgz";
-        sha512 = "5/X0AL1ZgoU32fAepTfEoggFinO3rxsMLtzhlUX+RctLrusn/CApJuGFCd0v7GMFhF+8UiCsTTfsu7Fh1HnEJg==";
+        url = "https://registry.npmjs.org/@octokit/request/-/request-5.3.2.tgz";
+        sha512 = "7NPJpg19wVQy1cs2xqXjjRq/RmtSomja/VSWnptfYwuBxLdbYh2UjhGi0Wx7B1v5Iw5GKhfFDQL7jM7SSp7K2g==";
       };
     };
     "@octokit/request-error-1.2.1" = {
@@ -2353,13 +2353,13 @@ let
         sha512 = "gfFKwRT/wFxq5qlNjnW2dh+qh74XgTQ2B179UX5K1HYCluioWj8Ndbgqw2PVqa1NnVJkGHp2ovMpVn/DImlmkw==";
       };
     };
-    "@octokit/types-2.1.1" = {
+    "@octokit/types-2.2.0" = {
       name = "_at_octokit_slash_types";
       packageName = "@octokit/types";
-      version = "2.1.1";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/types/-/types-2.1.1.tgz";
-        sha512 = "89LOYH+d/vsbDX785NOfLxTW88GjNd0lWRz1DVPVsZgg9Yett5O+3MOvwo7iHgvUwbFz0mf/yPIjBkUbs4kxoQ==";
+        url = "https://registry.npmjs.org/@octokit/types/-/types-2.2.0.tgz";
+        sha512 = "iEeW3XlkxeM/CObeoYvbUv24Oe+DldGofY+3QyeJ5XKKA6B+V94ePk14EDCarseWdMs6afKZPv3dFq8C+SY5lw==";
       };
     };
     "@parcel/fs-1.11.0" = {
@@ -2524,22 +2524,22 @@ let
         sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==";
       };
     };
-    "@schematics/angular-9.0.2" = {
+    "@schematics/angular-9.0.3" = {
       name = "_at_schematics_slash_angular";
       packageName = "@schematics/angular";
-      version = "9.0.2";
+      version = "9.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.0.2.tgz";
-        sha512 = "H6ZyxLYoIN68bbNKnUjBCPtB0fcwnpIyTkqXQHa3B4HITcU3uee4PLAl3xCkTS2NGv8m/0eWND9zt5wryGf8PQ==";
+        url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.0.3.tgz";
+        sha512 = "6XSnPW4G7aoKXccg0FTpZ02y/yi9y/bj7swnSL9Z4RRPIvPVapDjB7uJPg8sm8+PTIpcMhEFQrchIqM3LXW4zA==";
       };
     };
-    "@schematics/update-0.900.2" = {
+    "@schematics/update-0.900.3" = {
       name = "_at_schematics_slash_update";
       packageName = "@schematics/update";
-      version = "0.900.2";
+      version = "0.900.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/update/-/update-0.900.2.tgz";
-        sha512 = "CRDb2pax8DtSyO32b2D5uKlQZ+s5h9feD4oEMvm2zU7z/4wcoTNC0T9ols20aHYeNhKYD9FuMI3KQWlgMTPgbw==";
+        url = "https://registry.npmjs.org/@schematics/update/-/update-0.900.3.tgz";
+        sha512 = "mlRsm3/HM1f/10Wdz4xMYA+mpW3EDCB+whlV5cJ7PGMhjUMaxA9DuWvoP06h05le6XmgnjIEoxL6NJ7CgesHcA==";
       };
     };
     "@serverless/cli-1.4.0" = {
@@ -2569,13 +2569,13 @@ let
         sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ==";
       };
     };
-    "@serverless/enterprise-plugin-3.4.0" = {
+    "@serverless/enterprise-plugin-3.4.1" = {
       name = "_at_serverless_slash_enterprise-plugin";
       packageName = "@serverless/enterprise-plugin";
-      version = "3.4.0";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.4.0.tgz";
-        sha512 = "QaJUQwtej6LsBlmPldPYNHOApjrHrpGvreVcXy2GBqr0hpPFy+o2xmSKek+NDjmpyzHraeHKb5DoKemTWUxsTg==";
+        url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.4.1.tgz";
+        sha512 = "xo887e8GdumWY4iUxlgm3vrIZqVxFXvYk/fGORS+uTa4QG5t6iiJlPy7P0S8KKr90UBWE3eSg9w4tGAgVw2fIg==";
       };
     };
     "@serverless/event-mocks-1.1.1" = {
@@ -2677,6 +2677,15 @@ let
         sha512 = "JZvsmhDXSyjv1dkc12lPI3tNTNYlIaOiIQMYFg2RgqF3QmWjTyBUgRZcF7LoKyufHtS4dIudM6k1aHBpSaDrhw==";
       };
     };
+    "@snyk/cli-interface-2.3.2" = {
+      name = "_at_snyk_slash_cli-interface";
+      packageName = "@snyk/cli-interface";
+      version = "2.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.2.tgz";
+        sha512 = "jmZyxVHqzYU1GfdnWCGdd68WY/lAzpPVyqalHazPj4tFJehrSfEFc82RMTYAMgXEJuvFRFIwhsvXh3sWUhIQmg==";
+      };
+    };
     "@snyk/cocoapods-lockfile-parser-3.0.0" = {
       name = "_at_snyk_slash_cocoapods-lockfile-parser";
       packageName = "@snyk/cocoapods-lockfile-parser";
@@ -3010,13 +3019,13 @@ let
         sha512 = "dBtBbrc+qTHy1WdfHYjBwRln4+LWqASWakLHsWHR2NWHIFkv4W3O070IGoGLEBrJBvct3r0L1BUPuvURi7kYUQ==";
       };
     };
-    "@types/babel__core-7.1.4" = {
+    "@types/babel__core-7.1.5" = {
       name = "_at_types_slash_babel__core";
       packageName = "@types/babel__core";
-      version = "7.1.4";
+      version = "7.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.4.tgz";
-        sha512 = "c/5MuRz5HM4aizqL5ViYfW4iEnmfPcfbH4Xa6GgLT21dMc1NGeNnuS6egHheOmP+kCJ9CAzC4pv4SDCWTnRkbg==";
+        url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.5.tgz";
+        sha512 = "+ckxwNj892FWgvwrUWLOghQ2JDgOgeqTPwrcl+0t1pG59CP8qMJ6S/efmEd999vCFSJKOpyMakvU+w380rduUQ==";
       };
     };
     "@types/babel__generator-7.6.1" = {
@@ -3037,13 +3046,13 @@ let
         sha512 = "/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==";
       };
     };
-    "@types/babel__traverse-7.0.8" = {
+    "@types/babel__traverse-7.0.9" = {
       name = "_at_types_slash_babel__traverse";
       packageName = "@types/babel__traverse";
-      version = "7.0.8";
+      version = "7.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.8.tgz";
-        sha512 = "yGeB2dHEdvxjP0y4UbRtQaSkXJ9649fYCmIdRoul5kfAoGCwxuCbMhag0k3RPfnuh9kPGm8x89btcfDEXdVWGw==";
+        url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.9.tgz";
+        sha512 = "jEFQ8L1tuvPjOI8lnpaf73oCJe+aoxL6ygqSy6c8LcW98zaC+4mzWuQIRCEvKeCOu+lbqdXcg4Uqmm1S8AP1tw==";
       };
     };
     "@types/babylon-6.16.5" = {
@@ -4639,13 +4648,13 @@ let
         sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==";
       };
     };
-    "ajv-6.11.0" = {
+    "ajv-6.12.0" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.11.0";
+      version = "6.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz";
-        sha512 = "nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==";
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz";
+        sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==";
       };
     };
     "ajv-6.5.3" = {
@@ -5134,13 +5143,13 @@ let
         sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw==";
       };
     };
-    "apollo-2.22.1" = {
+    "apollo-2.23.0" = {
       name = "apollo";
       packageName = "apollo";
-      version = "2.22.1";
+      version = "2.23.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo/-/apollo-2.22.1.tgz";
-        sha512 = "FONVPKvK0gg+loWCh7KOAAa/HlvbKcR7pdiC3Mtpohe3RWKqKb/QLsBPHjCgz1mjVyVL+05Cv/SjnQ9WHUO6/g==";
+        url = "https://registry.npmjs.org/apollo/-/apollo-2.23.0.tgz";
+        sha512 = "X6BKom6trsIOpn0AuH811HWMi2DyL/KvQ09yd5h2V726SD09jhzaNrR/1m/3RI7bVRTFHK4xncn1V3Z8KKRduQ==";
       };
     };
     "apollo-cache-1.3.4" = {
@@ -5197,13 +5206,13 @@ let
         sha512 = "sanUIqXWyyDpxY3fYOVU+Hsxwxdj5fmn3Zcy6CcMGnWmh9o7tautQAuod2a63wrDs1jcNQcFq3EKIpeB+2xECw==";
       };
     };
-    "apollo-codegen-core-0.36.1" = {
+    "apollo-codegen-core-0.36.2" = {
       name = "apollo-codegen-core";
       packageName = "apollo-codegen-core";
-      version = "0.36.1";
+      version = "0.36.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.36.1.tgz";
-        sha512 = "PSucYRG29+BAnQE8A4KhGqUK0LdFfAiep8az1qNDq6RDfqVhdqzMF32ZpQWuEx7cz4YTRcBs9cg2/ZjXxAgJwA==";
+        url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.36.2.tgz";
+        sha512 = "XQMOg4eUlEBEGCLTaqwu89gP/BdHwBMKUQPeo+voWhRI3D0ZxP4CfmCZ5khf0M4peh1OiTDG30hSn4DPzSOloA==";
       };
     };
     "apollo-codegen-flow-0.20.0" = {
@@ -5215,13 +5224,13 @@ let
         sha512 = "XgKE19B0Q74PBLVqHP/77NcCFrcvrN9wi3CcotH+FV8BeHTjvpHlilTsQMmd2STPt19cCvY2Qtz0EOeLXTUQ2Q==";
       };
     };
-    "apollo-codegen-flow-0.34.1" = {
+    "apollo-codegen-flow-0.34.2" = {
       name = "apollo-codegen-flow";
       packageName = "apollo-codegen-flow";
-      version = "0.34.1";
+      version = "0.34.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.34.1.tgz";
-        sha512 = "q28f5rY+KwVWNoPyTJHSSJfA+y9JdXFxvzDZNQ7odUKuLZRDJSswYZkBYk/Nq/rkl7RwOJ7qgwEG6AxhPMvH1g==";
+        url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.34.2.tgz";
+        sha512 = "gba1iSDAetw+c+/Ip/zYKoUsO7mGcTGJCgzoH+Q0Ww6KpKiIvg5PppBVhsg2sleomgL7gnGx2juqx6dAj1iSTg==";
       };
     };
     "apollo-codegen-flow-legacy-0.20.0" = {
@@ -5242,13 +5251,13 @@ let
         sha512 = "NbnMOfUXXovlTGRj4mIZGXB9HvidQhwKfAmdYHox5peHPkjjsqEzxGCIuWCSnubWiCF2uHZnQoIkg4sXWf0KLw==";
       };
     };
-    "apollo-codegen-scala-0.35.1" = {
+    "apollo-codegen-scala-0.35.2" = {
       name = "apollo-codegen-scala";
       packageName = "apollo-codegen-scala";
-      version = "0.35.1";
+      version = "0.35.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.35.1.tgz";
-        sha512 = "9yywcpwZiclKRXXSFGYuJcQIOTlPyPKSYH/+Rls1Vu5CafPGgkhIJQLtvtc80PJMaK1vmYVvsrDsAO91Tu/frw==";
+        url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.35.2.tgz";
+        sha512 = "Wq+WF8p1SGEqgkWJuTDsGMX16VzWxsJE/Nsy/BystG0Ys9RuhG4lPmpEpLYqsMX0O4OyWet+Yvio/H4xzOZQIA==";
       };
     };
     "apollo-codegen-swift-0.20.0" = {
@@ -5260,13 +5269,13 @@ let
         sha512 = "L9Y4StbXw0t/nuF+miz0ybSt/io6tsLc063Yeh1A8GCvhFFQyXE/yK0Rf3nO1Bl5Z9UZ5o8Aae9kK4GSWYIGNQ==";
       };
     };
-    "apollo-codegen-swift-0.36.1" = {
+    "apollo-codegen-swift-0.36.2" = {
       name = "apollo-codegen-swift";
       packageName = "apollo-codegen-swift";
-      version = "0.36.1";
+      version = "0.36.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.36.1.tgz";
-        sha512 = "no5bq4xiTqeT591bpGTdy3ATfflmmQXc9h6q935lVrak5uqGigd72RPWHNeN/BbnGg6khaL9jBbSs2+VqrOGug==";
+        url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.36.2.tgz";
+        sha512 = "fzoMb9YIk9z2IPyf7hPFyooQfbEtSl/EOKjILsqRIO7HTD7B0Vup/Jbu7W5GrwYZAsZH3MU1IpdULRfVNoIOhw==";
       };
     };
     "apollo-codegen-typescript-0.20.0" = {
@@ -5278,13 +5287,13 @@ let
         sha512 = "mzlIJXz+5WPwzeALqRHHR9aPPEf6IlhSrjCawpUHmFU1NK9hgwbguYCEYZv9mKkYBUUgDY+9cGFK1cafJX70AQ==";
       };
     };
-    "apollo-codegen-typescript-0.36.1" = {
+    "apollo-codegen-typescript-0.36.2" = {
       name = "apollo-codegen-typescript";
       packageName = "apollo-codegen-typescript";
-      version = "0.36.1";
+      version = "0.36.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.36.1.tgz";
-        sha512 = "iQ2FGxA9Neb5728eqtvC9J4Ig6heOEMdgVcfsIrUQRTRKiPp7iIKc2DS8ReMX6LMdRhm000ldcquJFQJldFjLg==";
+        url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.36.2.tgz";
+        sha512 = "DuoDVP8DiiucXCT17rkP8fUPGF+oqCwNt3/PdywVc7pokQfYMHhJJPxVNzIWJZ7Pqs4eD25VoJCp40DLIkLAfA==";
       };
     };
     "apollo-codegen-typescript-legacy-0.20.0" = {
@@ -5341,13 +5350,13 @@ let
         sha512 = "abCHcKln1EGbzSItW087EjBI5wnluikyUqEn4VsdeWHCtdENWpHCn/MnM0+jJa1prNasxN7tCukp4nMpJYYVqg==";
       };
     };
-    "apollo-language-server-1.19.1" = {
+    "apollo-language-server-1.19.2" = {
       name = "apollo-language-server";
       packageName = "apollo-language-server";
-      version = "1.19.1";
+      version = "1.19.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.19.1.tgz";
-        sha512 = "Xq9DL+7rl1I78hU5TTJG1zxfPWbz08l/XOthI+rCEhzhIFafzOlUjrtJziuYr1AmAAjA9CJLzaaUDC9ixm+Sfw==";
+        url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.19.2.tgz";
+        sha512 = "ZPMlqwVaAN96LGZiliW1ALbGFkZ6N0jYowhvM9SMlqNzKzIKCVi3mUjNAcIB0CIP4YvgLjUfL0IqUE7qw/ZOHw==";
       };
     };
     "apollo-link-1.2.13" = {
@@ -6079,13 +6088,13 @@ let
         sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428";
       };
     };
-    "array.prototype.find-2.1.0" = {
+    "array.prototype.find-2.1.1" = {
       name = "array.prototype.find";
       packageName = "array.prototype.find";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.1.0.tgz";
-        sha512 = "Wn41+K1yuO5p7wRZDl7890c3xvv5UBrfVXTVIe28rSQb6LS0fZMDrQB6PAcxQFRFy6vJTLDc3A2+3CjQdzVKRg==";
+        url = "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.1.1.tgz";
+        sha512 = "mi+MYNJYLTx2eNYy+Yh6raoQacCsNeeMUaspFPh9Y141lFSsWxxB8V9mM2ye+eqiRs917J6/pJ4M9ZPzenWckA==";
       };
     };
     "arraybuffer.slice-0.0.6" = {
@@ -6403,6 +6412,15 @@ let
         sha512 = "X5Dj8hK1pJNC2Wzo2Rcp9FBVdJMGRR/S7V+lH46s8GVFhtbo5O4Le5GECCF/8PISVdkUA6mMPvgz7qTTD1rf1g==";
       };
     };
+    "async-3.2.0" = {
+      name = "async";
+      packageName = "async";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async/-/async-3.2.0.tgz";
+        sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==";
+      };
+    };
     "async-done-1.3.2" = {
       name = "async-done";
       packageName = "async-done";
@@ -6592,13 +6610,13 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.622.0" = {
+    "aws-sdk-2.625.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.622.0";
+      version = "2.625.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.622.0.tgz";
-        sha512 = "CV5RZjoh2PZ/wALQXx932dTYukPTZXZmfjlRTJqNibRhyN36/E1KwkX1va1CROii2AnfnxjzV7OqymH0TgKlUg==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.625.0.tgz";
+        sha512 = "8OoXw5SE/IliSo8q204amuLN46E2g1pGJQjVFTstoiETfaZvRxabL+DzIigJSV8QdybzzETGV3w50jvMfbsJ8A==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -9076,13 +9094,13 @@ let
         sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
       };
     };
-    "caniuse-lite-1.0.30001028" = {
+    "caniuse-lite-1.0.30001030" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001028";
+      version = "1.0.30001030";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001028.tgz";
-        sha512 = "Vnrq+XMSHpT7E+LWoIYhs3Sne8h9lx9YJV3acH3THNCwU/9zV93/ta4xVfzTtnqd3rvnuVpVjE3DFqf56tr3aQ==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001030.tgz";
+        sha512 = "QGK0W4Ft/Ac+zTjEiRJfwDNATvS3fodDczBXrH42784kcfqcDKpEPfN08N0HQjrAp8He/Jw8QiSS9QRn7XAbUw==";
       };
     };
     "capture-exit-2.0.0" = {
@@ -11002,13 +11020,13 @@ let
         sha512 = "bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg==";
       };
     };
-    "conf-6.2.0" = {
+    "conf-6.2.1" = {
       name = "conf";
       packageName = "conf";
-      version = "6.2.0";
+      version = "6.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conf/-/conf-6.2.0.tgz";
-        sha512 = "fvl40R6YemHrFsNiyP7TD0tzOe3pQD2dfT2s20WvCaq57A1oV+RImbhn2Y4sQGDz1lB0wNSb7dPcPIvQB69YNA==";
+        url = "https://registry.npmjs.org/conf/-/conf-6.2.1.tgz";
+        sha512 = "GbPshJUwZY8/+WXTLLyJplzCVAljX0vECBdUy1Es8npc8naGIEivexdhZP2zt8x/REzgtB9IONaB+ZNB9Ciz6w==";
       };
     };
     "config-1.31.0" = {
@@ -11740,13 +11758,13 @@ let
         sha512 = "0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw==";
       };
     };
-    "cpy-8.0.0" = {
+    "cpy-8.0.1" = {
       name = "cpy";
       packageName = "cpy";
-      version = "8.0.0";
+      version = "8.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cpy/-/cpy-8.0.0.tgz";
-        sha512 = "iTjLUqtVr45e17GFAyxA0lqFinbGMblMCTtAqrPzT/IETNtDuyyhDDk8weEZ08MiCc6EcuyNq2KtGH5J2BIAoQ==";
+        url = "https://registry.npmjs.org/cpy/-/cpy-8.0.1.tgz";
+        sha512 = "XplonbFkGld3KST+wKFutU+Al3srtT9RaeLTJeRY47QzzLDlA5kpK4s+o0DdgRx7W0cdkifOehGnCBCGIFfdeg==";
       };
     };
     "crc-0.2.0" = {
@@ -13621,13 +13639,13 @@ let
         sha512 = "Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg==";
       };
     };
-    "diff2html-2.8.0" = {
+    "diff2html-3.1.2" = {
       name = "diff2html";
       packageName = "diff2html";
-      version = "2.8.0";
+      version = "3.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff2html/-/diff2html-2.8.0.tgz";
-        sha512 = "YDadfvH7ge833dKRGNr1gWZLa00tihMhwACUuQwrIQcPu/tnZ9t/Dq5W6fTQaKnLZ7iY7snGoyikTmF9mqBx+Q==";
+        url = "https://registry.npmjs.org/diff2html/-/diff2html-3.1.2.tgz";
+        sha512 = "yn4SXS6Em3Ml9ejsj8cWBcjWwSFOFwOd4Qd3U7pJHpyM3agY2lU+gxU2WedLxAgCMXffsublB96gG26efheCxQ==";
       };
     };
     "diff3-0.0.3" = {
@@ -14494,13 +14512,13 @@ let
         sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==";
       };
     };
-    "electron-to-chromium-1.3.355" = {
+    "electron-to-chromium-1.3.360" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.355";
+      version = "1.3.360";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.355.tgz";
-        sha512 = "zKO/wS+2ChI/jz9WAo647xSW8t2RmgRLFdbUb/77cORkUTargO+SCj4ctTHjBn2VeNFrsLgDT7IuDVrd3F8mLQ==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.360.tgz";
+        sha512 = "RE1pv2sjQiDRRN1nI0fJ0eQHZ9le4oobu16OArnwEUV5ycAU5SNjFyvzjZ1gPUAqBa2Ud1XagtW8j3ZXfHuQHA==";
       };
     };
     "elegant-spinner-1.0.1" = {
@@ -14729,13 +14747,13 @@ let
         sha1 = "a432755ab4f51e7fc74f3a719c6b81df5d668bdc";
       };
     };
-    "endent-1.4.0" = {
+    "endent-1.4.1" = {
       name = "endent";
       packageName = "endent";
-      version = "1.4.0";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/endent/-/endent-1.4.0.tgz";
-        sha512 = "V9cYHc4IcnE9hYCuZat9YVUxIsK3gLB3gEUnr07rqElI+3TB+yC/wmMTNZ7L4xDmDFwg4Lypl5Gc3i+23komhA==";
+        url = "https://registry.npmjs.org/endent/-/endent-1.4.1.tgz";
+        sha512 = "buHTb5c8AC9NshtP6dgmNLYkiT+olskbq1z6cEGvfGCF3Qphbu/1zz5Xu+yjTDln8RbxNhPoUyJ5H8MSrp1olQ==";
       };
     };
     "ends-with-0.2.0" = {
@@ -17204,13 +17222,13 @@ let
         sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg==";
       };
     };
-    "flow-parser-0.118.0" = {
+    "flow-parser-0.119.0" = {
       name = "flow-parser";
       packageName = "flow-parser";
-      version = "0.118.0";
+      version = "0.119.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.118.0.tgz";
-        sha512 = "PM3aKA5K3e5kK2hJPsSVdQD4/SVZUQni9qfB0+JHBCjqoAS5mSe3SlhLR9TlH3WDQccL0H2b6zpP8LjOzx9Wtg==";
+        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.119.0.tgz";
+        sha512 = "P49kGSnCII6c5/P4QsVDtoam83zrXrdq4EUJDVOpbeURy48RM8BOboKcEfFHS1xnNID01UXu8Hf60b+m23T81w==";
       };
     };
     "fluent-ffmpeg-2.1.2" = {
@@ -18419,13 +18437,13 @@ let
         sha1 = "97fb5d96bfde8973313f20e8288ef9a167fa64ce";
       };
     };
-    "github-slugger-1.2.1" = {
+    "github-slugger-1.3.0" = {
       name = "github-slugger";
       packageName = "github-slugger";
-      version = "1.2.1";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/github-slugger/-/github-slugger-1.2.1.tgz";
-        sha512 = "SsZUjg/P03KPzQBt7OxJPasGw6NRO5uOgiZ5RGXVud5iSIZ0eNZeNp5rTwCxtavrRUa/A77j8mePVc5lEvk0KQ==";
+        url = "https://registry.npmjs.org/github-slugger/-/github-slugger-1.3.0.tgz";
+        sha512 = "gwJScWVNhFYSRDvURk/8yhcFBee6aFjye2a7Lhb2bUyRulpIoek9p0I9Kt7PT67d/nUlZbFu8L9RLiA0woQN8Q==";
       };
     };
     "gl-matrix-2.8.1" = {
@@ -19626,6 +19644,15 @@ let
         sha1 = "a6a2e55486011940482e13e2c93791c449acf449";
       };
     };
+    "has-glob-1.0.0" = {
+      name = "has-glob";
+      packageName = "has-glob";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-glob/-/has-glob-1.0.0.tgz";
+        sha1 = "9aaa9eedbffb1ba3990a7b0010fb678ee0081207";
+      };
+    };
     "has-gulplog-0.1.0" = {
       name = "has-gulplog";
       packageName = "has-gulplog";
@@ -21418,15 +21445,6 @@ let
         sha1 = "296aca878a821816e5b85d0a285a99bcff4582f0";
       };
     };
-    "ipaddr.js-1.9.0" = {
-      name = "ipaddr.js";
-      packageName = "ipaddr.js";
-      version = "1.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz";
-        sha512 = "M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==";
-      };
-    };
     "ipaddr.js-1.9.1" = {
       name = "ipaddr.js";
       packageName = "ipaddr.js";
@@ -23047,13 +23065,13 @@ let
         sha1 = "06d4912255093419477d425633606e0e90782967";
       };
     };
-    "joplin-turndown-4.0.19" = {
+    "joplin-turndown-4.0.22" = {
       name = "joplin-turndown";
       packageName = "joplin-turndown";
-      version = "4.0.19";
+      version = "4.0.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.19.tgz";
-        sha512 = "B9XeR7bjsPWhwevnCk+EN8VQmaesDqGP3sjkk+ROMuNoQAj0p0RMkZB3actv6Ej6Q9EnRJm3JokfM3Ua4TVYvA==";
+        url = "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.22.tgz";
+        sha512 = "jg3jo2tDwEzSErujU755iyO50IOLSzcEC8fq5CChbpzBMOp6GdPzphVcxFROClhFoZggJAyx2JerJ7LBRhpfgQ==";
       };
     };
     "joplin-turndown-plugin-gfm-1.0.12" = {
@@ -24434,13 +24452,13 @@ let
         sha512 = "rXM7GYnW8gsl1vedTJIbzOrRv85c/2uCMpiiCzO2fndd06U/kUXEEU9evYn4zFggBOg36IsBW8LzqIpETwwQzg==";
       };
     };
-    "leveldown-5.4.1" = {
+    "leveldown-5.5.1" = {
       name = "leveldown";
       packageName = "leveldown";
-      version = "5.4.1";
+      version = "5.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/leveldown/-/leveldown-5.4.1.tgz";
-        sha512 = "3lMPc7eU3yj5g+qF1qlALInzIYnkySIosR1AsUKFjL9D8fYbTLuENBAeDRZXIG4qeWOAyqRItOoLu2v2avWiMA==";
+        url = "https://registry.npmjs.org/leveldown/-/leveldown-5.5.1.tgz";
+        sha512 = "GoC455/ncfg4yLLItr192HuXpA+CcQ2q9GncXJhewvvlpsBBEegChn5tMPP+kGvJt7u2LuXAd8fY2moQxFD+sQ==";
       };
     };
     "levelup-0.19.1" = {
@@ -26927,13 +26945,13 @@ let
         sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==";
       };
     };
-    "mdast-comment-marker-1.1.1" = {
+    "mdast-comment-marker-1.1.2" = {
       name = "mdast-comment-marker";
       packageName = "mdast-comment-marker";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mdast-comment-marker/-/mdast-comment-marker-1.1.1.tgz";
-        sha512 = "TWZDaUtPLwKX1pzDIY48MkSUQRDwX/HqbTB4m3iYdL/zosi/Z6Xqfdv0C0hNVKvzrPjZENrpWDt4p4odeVO0Iw==";
+        url = "https://registry.npmjs.org/mdast-comment-marker/-/mdast-comment-marker-1.1.2.tgz";
+        sha512 = "vTFXtmbbF3rgnTh3Zl3irso4LtvwUq/jaDvT2D1JqTGAwaipcS7RpTxzi6KjoRqI9n2yuAhzLDAC8xVTF3XYVQ==";
       };
     };
     "mdast-util-to-nlcst-3.2.3" = {
@@ -28016,13 +28034,13 @@ let
         sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4";
       };
     };
-    "moment-timezone-0.5.27" = {
+    "moment-timezone-0.5.28" = {
       name = "moment-timezone";
       packageName = "moment-timezone";
-      version = "0.5.27";
+      version = "0.5.28";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.27.tgz";
-        sha512 = "EIKQs7h5sAsjhPCqN6ggx6cEbs94GK050254TIJySD1bzoM5JTYDwAU1IoVOeTOL6Gm27kYJ51/uuvq1kIlrbw==";
+        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.28.tgz";
+        sha512 = "TDJkZvAyKIVWg5EtVqRzU97w0Rb0YVbfpqyjgu6GwXCAohVRqwZjf4fOzDE6p1Ch98Sro/8hQQi65WDXW5STPw==";
       };
     };
     "monotonic-timestamp-0.0.9" = {
@@ -29479,13 +29497,13 @@ let
         sha512 = "wEiT7bSeU9oVHPK7S+mHb3cR6cIf9l205wTiHzhnUAuoDJS+IdwQkkpFgKTYmkL4Py2LvqCU90h85YpQul7QFQ==";
       };
     };
-    "node-releases-1.1.49" = {
+    "node-releases-1.1.50" = {
       name = "node-releases";
       packageName = "node-releases";
-      version = "1.1.49";
+      version = "1.1.50";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.49.tgz";
-        sha512 = "xH8t0LS0disN0mtRCh+eByxFPie+msJUBL/lJDBuap53QGiYPa9joh83K4pCZgWJ+2L4b9h88vCVdXQ60NO2bg==";
+        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.50.tgz";
+        sha512 = "lgAmPv9eYZ0bGwUYAKlr8MG6K4CvWliWqnkcT2P8mMAgVrH3lqfBPorFlxiG1pHQnqmavJZ9vbMXUTNyMLbrgQ==";
       };
     };
     "node-request-by-swagger-1.1.4" = {
@@ -29767,15 +29785,6 @@ let
         sha1 = "df7c3ed5a277c3f9d4b5d819b05311d10a200ae6";
       };
     };
-    "npm-6.12.1" = {
-      name = "npm";
-      packageName = "npm";
-      version = "6.12.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm/-/npm-6.12.1.tgz";
-        sha512 = "+pMvUpgSXVBythrv//64j4i6DaLLJ1O0y8kwjNgjAE7atBNGzX4rcOEWvmsuiei6J+mA38O0nUZ/P35GuCD/jg==";
-      };
-    };
     "npm-bundled-1.1.1" = {
       name = "npm-bundled";
       packageName = "npm-bundled";
@@ -30371,13 +30380,13 @@ let
         sha512 = "WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==";
       };
     };
-    "objectorarray-1.0.3" = {
+    "objectorarray-1.0.4" = {
       name = "objectorarray";
       packageName = "objectorarray";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.3.tgz";
-        sha512 = "kPoflSYkAf/Onvjr4ZLaq37vDuOXjVzfwLCRuORRzYGdXkHa/vacPT0RgR+KmtkwOYFcxTMM62BRrZk8GGKHjw==";
+        url = "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.4.tgz";
+        sha512 = "91k8bjcldstRz1bG6zJo8lWD7c6QXcB4nTDUqiEvIL1xAsLoZlOOZZG+nd6YPz+V7zY1580J4Xxh1vZtyv4i/w==";
       };
     };
     "observ-0.2.0" = {
@@ -33621,13 +33630,13 @@ let
         sha1 = "71c0ee3b102de3f202f3b64f608d173fcba1a918";
       };
     };
-    "proxy-addr-2.0.5" = {
+    "proxy-addr-2.0.6" = {
       name = "proxy-addr";
       packageName = "proxy-addr";
-      version = "2.0.5";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz";
-        sha512 = "t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==";
+        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz";
+        sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==";
       };
     };
     "proxy-agent-3.1.1" = {
@@ -35322,13 +35331,13 @@ let
         sha1 = "451fd3004ab1e4df9b4e4b66376b2a21912462d3";
       };
     };
-    "recast-0.18.5" = {
+    "recast-0.18.7" = {
       name = "recast";
       packageName = "recast";
-      version = "0.18.5";
+      version = "0.18.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/recast/-/recast-0.18.5.tgz";
-        sha512 = "sD1WJrpLQAkXGyQZyGzTM75WJvyAd98II5CHdK3IYbt/cZlU0UzCRVU11nUFNXX9fBVEt4E9ajkMjBlUlG+Oog==";
+        url = "https://registry.npmjs.org/recast/-/recast-0.18.7.tgz";
+        sha512 = "qNfoxvMkW4k8jJgNCfmIES7S31MEejXcEQs57eKUcQGiJUuX7cXNOD2h+W9z0rjNun2EkKqf0WvuRtmHw4NPNg==";
       };
     };
     "rechoir-0.6.2" = {
@@ -35493,13 +35502,22 @@ let
         sha512 = "naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==";
       };
     };
-    "regenerator-transform-0.14.1" = {
+    "regenerator-runtime-0.13.4" = {
+      name = "regenerator-runtime";
+      packageName = "regenerator-runtime";
+      version = "0.13.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz";
+        sha512 = "plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==";
+      };
+    };
+    "regenerator-transform-0.14.2" = {
       name = "regenerator-transform";
       packageName = "regenerator-transform";
-      version = "0.14.1";
+      version = "0.14.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.1.tgz";
-        sha512 = "flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==";
+        url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.2.tgz";
+        sha512 = "V4+lGplCM/ikqi5/mkkpJ06e9Bujq1NFmNLvsCs56zg3ZbzrnUzAtizZ24TXxtRX/W2jcdScwQCnbL0CICTFkQ==";
       };
     };
     "regex-cache-0.4.4" = {
@@ -38256,31 +38274,31 @@ let
         sha512 = "43HbJj6QatuL2BNG+Uq2Taa73wdfSQSID8FJWW4q5/LYgd9D+RtdiE4lAMwxqYYbvThU9uuza4epuF/B1CAlYw==";
       };
     };
-    "snyk-go-parser-1.3.3" = {
+    "snyk-go-parser-1.4.0" = {
       name = "snyk-go-parser";
       packageName = "snyk-go-parser";
-      version = "1.3.3";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-go-parser/-/snyk-go-parser-1.3.3.tgz";
-        sha512 = "h65vi4UDH3ier7+r/E1GTZhruBSbGv3z4dGmzB+pc+g8ljOJd0BfqN6pUPIHB7hjrIbLh6KxT/XtJcV4X7LdeQ==";
+        url = "https://registry.npmjs.org/snyk-go-parser/-/snyk-go-parser-1.4.0.tgz";
+        sha512 = "zcLA8u/WreycCjFKBblYfxszg7Fmnemuu9Ug/CE/jqF0yBXsI5DCWMteUvFkoa8DRntfGTlgf98TRl2aTSc2MQ==";
       };
     };
-    "snyk-go-plugin-1.12.0" = {
+    "snyk-go-plugin-1.13.0" = {
       name = "snyk-go-plugin";
       packageName = "snyk-go-plugin";
-      version = "1.12.0";
+      version = "1.13.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.12.0.tgz";
-        sha512 = "8rba/qn/hrUtPL0tDgdhJvp5HoN/3OMOUTmrtPiI0JHfVW6fqBTM9UnCFXJdK7UCUt9ITKIWIL0UBAzTc4hgKg==";
+        url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.13.0.tgz";
+        sha512 = "6lN9S8uO6LE1Y6ZJMZm3EZ8kvvI/vZh8r+JJGAPfVO2C265xymEpFBJ4Nn2or0Q0LlqZ8W8lWi1HUMXXid6k+w==";
       };
     };
-    "snyk-gradle-plugin-3.2.4" = {
+    "snyk-gradle-plugin-3.2.5" = {
       name = "snyk-gradle-plugin";
       packageName = "snyk-gradle-plugin";
-      version = "3.2.4";
+      version = "3.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.2.4.tgz";
-        sha512 = "XmS1gl7uZNHP9HP5RaPuRXW3VjkbdWe+EgSOlvmspztkubIOIainqc87k7rIJ6u3tLBhqsZK8b5ru0/E9Q69hQ==";
+        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.2.5.tgz";
+        sha512 = "XxPi/B16dGkV1USoyFbpn6LlSJ9SUC6Y6z/4lWuF4spLnKtWwpEb1bwTdBFsxnkUfqzIRtPr0+wcxxXvv9Rvcw==";
       };
     };
     "snyk-module-1.9.1" = {
@@ -40938,13 +40956,13 @@ let
         sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==";
       };
     };
-    "systeminformation-4.22.1" = {
+    "systeminformation-4.22.3" = {
       name = "systeminformation";
       packageName = "systeminformation";
-      version = "4.22.1";
+      version = "4.22.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.22.1.tgz";
-        sha512 = "TjUA91kxGOcwWCic/OLc+zI0twe+GyHFp4mpjZcpG9LpXh0EVMD4zMeIVaEqsmxCWVOM+/FA3V6OB3W/IpLypA==";
+        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.22.3.tgz";
+        sha512 = "wsIXxaR6dbLrOp8/KwyiEdXsQVFPOayIhNWI6WwMJg/G6oPX2NIZ4jo8MePMXrTb5VkA7Rihl5343eVqiL+jlg==";
       };
     };
     "syswide-cas-5.3.0" = {
@@ -41344,13 +41362,13 @@ let
         sha512 = "/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==";
       };
     };
-    "terser-4.6.3" = {
+    "terser-4.6.4" = {
       name = "terser";
       packageName = "terser";
-      version = "4.6.3";
+      version = "4.6.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terser/-/terser-4.6.3.tgz";
-        sha512 = "Lw+ieAXmY69d09IIc/yqeBqXpEQIpDGZqT34ui1QWXIUpR2RjbqEkT8X7Lgex19hslSqcWM5iMN2kM11eMsESQ==";
+        url = "https://registry.npmjs.org/terser/-/terser-4.6.4.tgz";
+        sha512 = "5fqgBPLgVHZ/fVvqRhhUp9YUiGXhFJ9ZkrZWD9vQtFBR4QIGTnbsb+/kKqSqfgp3WnBwGWAFnedGTtmX1YTn0w==";
       };
     };
     "terser-webpack-plugin-1.4.3" = {
@@ -41650,13 +41668,13 @@ let
         sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f";
       };
     };
-    "timeout-refresh-1.0.1" = {
+    "timeout-refresh-1.0.2" = {
       name = "timeout-refresh";
       packageName = "timeout-refresh";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/timeout-refresh/-/timeout-refresh-1.0.1.tgz";
-        sha512 = "bW5oSShdwFCN9K7RpB5dkq5bqNlGt8Lwbfxr8vprysk8hDiK5yy7Mgf2Qlz2ssE0gfQfoYhk4VLY9Hhsnr9Ulw==";
+        url = "https://registry.npmjs.org/timeout-refresh/-/timeout-refresh-1.0.2.tgz";
+        sha512 = "lsO23gD/EeW53AvEoTOleUFqTIapZTu5NPzD6ndUGs0+G1IuN0+hu2kT6I3AmNX2fiOrcC6umtzMEv1XQmajgQ==";
       };
     };
     "timers-browserify-1.4.2" = {
@@ -42235,13 +42253,13 @@ let
         sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09";
       };
     };
-    "tr46-2.0.0" = {
+    "tr46-2.0.2" = {
       name = "tr46";
       packageName = "tr46";
-      version = "2.0.0";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tr46/-/tr46-2.0.0.tgz";
-        sha512 = "LrErSqfhdUw73AC/eXV2fEmNkvgSYxfm5lvxnLvuVgoVDknvD28Pa5FeDGc8RuVouDxUD3GnHHFv7xnBp7As5w==";
+        url = "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz";
+        sha512 = "3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==";
       };
     };
     "transliteration-1.6.6" = {
@@ -42469,13 +42487,13 @@ let
         sha512 = "6qWWz2HdFbD2uAfgS5t65Dd6HQKYjfra+YXQzKzxIG+RKTpoeDi+x+TW85SEF3cWUI2UecrOXJobvD+04MiTZg==";
       };
     };
-    "tslib-1.10.0" = {
+    "tslib-1.11.0" = {
       name = "tslib";
       packageName = "tslib";
-      version = "1.10.0";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz";
-        sha512 = "qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==";
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.11.0.tgz";
+        sha512 = "BmndXUtiTn/VDDrJzQE7Mm22Ix3PxgLltW9bSNLoeCY31gnG2OPx0QqJnuc9oMIKioYrz487i6K9o4Pdn0j+Kg==";
       };
     };
     "tslib-1.9.3" = {
@@ -42631,13 +42649,13 @@ let
         sha1 = "b75bc2df15649bb84e8b9aa3c0669c6c4bce0d25";
       };
     };
-    "twig-1.14.0" = {
+    "twig-1.15.0" = {
       name = "twig";
       packageName = "twig";
-      version = "1.14.0";
+      version = "1.15.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/twig/-/twig-1.14.0.tgz";
-        sha512 = "ut1LslUKAeF56TYQglabJaATUqbNuGO3EcXDhUspAdNbxez5VwTk2n8H00V0VfNy9Scet+VGQP8oPxt4v6mykQ==";
+        url = "https://registry.npmjs.org/twig/-/twig-1.15.0.tgz";
+        sha512 = "kJkEbF4sTyZcaMAXffCjaUt6ZSD3v6qZQZd9b6mySvfuUIseTCJCvikphAJvrNJTDw7nZDfGorvTtUkzge1HPg==";
       };
     };
     "txt-to-ast-3.0.3" = {
@@ -42793,6 +42811,15 @@ let
         sha512 = "/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==";
       };
     };
+    "typescript-3.8.2" = {
+      name = "typescript";
+      packageName = "typescript";
+      version = "3.8.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typescript/-/typescript-3.8.2.tgz";
+        sha512 = "EgOVgL/4xfVrCMbhYKUQTdF37SQn4Iw73H5BgCrF1Abdun7Kwy/QZsE/ssAy0y4LxBbvua3PIbFsbRczWWnDdQ==";
+      };
+    };
     "typescript-eslint-parser-16.0.1" = {
       name = "typescript-eslint-parser";
       packageName = "typescript-eslint-parser";
@@ -43504,13 +43531,22 @@ let
         sha512 = "gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==";
       };
     };
-    "universal-user-agent-4.0.0" = {
+    "universal-user-agent-4.0.1" = {
       name = "universal-user-agent";
       packageName = "universal-user-agent";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-4.0.0.tgz";
-        sha512 = "eM8knLpev67iBDizr/YtqkJsF3GK8gzDc6st/WKzrTuPtcsOKW/0IdL4cnMBsU69pOx0otavLWBDGTwg+dB0aA==";
+        url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-4.0.1.tgz";
+        sha512 = "LnST3ebHwVL2aNe4mejI9IQh2HfZ1RLo8Io2HugSif8ekzD1TlWpHpColOB/eh8JHMLkGH3Akqf040I+4ylNxg==";
+      };
+    };
+    "universal-user-agent-5.0.0" = {
+      name = "universal-user-agent";
+      packageName = "universal-user-agent";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-5.0.0.tgz";
+        sha512 = "B5TPtzZleXyPrUMKCpEHFmVhMN6EhmJYjG5PQna9s7mXeSqGTLap4OpqLl5FCEFUI3UBmllkETwKf/db66Y54Q==";
       };
     };
     "universalify-0.1.2" = {
@@ -44809,13 +44845,13 @@ let
         sha512 = "RWkO/c/A7iXhHEy3OuEqkCqavDjpD4NF2Ca8vjai+ZtEYNeHrm1ybTnBYLP4Ft1uXvvaaVtYA9HrDjD6+CUONg==";
       };
     };
-    "vscode-css-languageservice-4.0.2" = {
+    "vscode-css-languageservice-4.1.0" = {
       name = "vscode-css-languageservice";
       packageName = "vscode-css-languageservice";
-      version = "4.0.2";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.0.2.tgz";
-        sha512 = "pTnfXbsME3pl+yDfhUp/mtvPyIJk0Le4zqJxDn56s9GY9LqY0RmkSEh0oHH6D0HXR3Ni6wKosIaqu8a2G0+jdw==";
+        url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.1.0.tgz";
+        sha512 = "iTX3dTp0Y0RFWhIux5jasI8r9swdiWVB1Z3OrZ10iDHxzkETjVPxAQ5BEQU4ag0Awc8TTg1C7sJriHQY2LO14g==";
       };
     };
     "vscode-emmet-helper-1.2.17" = {
@@ -44953,6 +44989,15 @@ let
         sha512 = "N8bOS8i0xuQMn/y0bijyefDbOsMl6hiH6LDREYWavTLTM5jbj44EiQfStsbmAv/0eaFKkL/jf5hW7nWwBy2HBw==";
       };
     };
+    "vscode-languageserver-textdocument-1.0.1" = {
+      name = "vscode-languageserver-textdocument";
+      packageName = "vscode-languageserver-textdocument";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz";
+        sha512 = "UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA==";
+      };
+    };
     "vscode-languageserver-types-3.14.0" = {
       name = "vscode-languageserver-types";
       packageName = "vscode-languageserver-types";
@@ -45034,6 +45079,15 @@ let
         sha512 = "obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ==";
       };
     };
+    "vscode-uri-2.1.1" = {
+      name = "vscode-uri";
+      packageName = "vscode-uri";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.1.tgz";
+        sha512 = "eY9jmGoEnVf8VE8xr5znSah7Qt1P/xsCdErz+g8HYZtJ7bZqKH5E3d+6oVNm1AC/c6IHUDokbmVXKOi4qPAC9A==";
+      };
+    };
     "vstream-0.1.0" = {
       name = "vstream";
       packageName = "vstream";
@@ -45889,13 +45943,13 @@ let
         sha512 = "GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==";
       };
     };
-    "write-file-atomic-3.0.1" = {
+    "write-file-atomic-3.0.3" = {
       name = "write-file-atomic";
       packageName = "write-file-atomic";
-      version = "3.0.1";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.1.tgz";
-        sha512 = "JPStrIyyVJ6oCSz/691fAjFtefZ6q+fP6tm+OS4Qw6o+TGQxNp1ziY2PgS+X/m0V8OWhZiO/m4xSj+Pr4RrZvw==";
+        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz";
+        sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==";
       };
     };
     "write-good-0.11.3" = {
@@ -46949,17 +47003,17 @@ in
   "@angular/cli" = nodeEnv.buildNodePackage {
     name = "_at_angular_slash_cli";
     packageName = "@angular/cli";
-    version = "9.0.2";
+    version = "9.0.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@angular/cli/-/cli-9.0.2.tgz";
-      sha512 = "ih3bnvav94MXI9YpwJ4AaETfUGwzc+S2jg4vkfYMuBeWO8kJ7Ma4f2ZriIwWyfHWHlBLHDF6OjAVdisBKPpQag==";
+      url = "https://registry.npmjs.org/@angular/cli/-/cli-9.0.3.tgz";
+      sha512 = "DYa2k6ihYmvfKgv2SE/OqP76D8EEHkIFcJ3ZgVdnxEyCmUXUD4zqOVDzDIK794BdditLF88g4Mezz142bn6XUA==";
     };
     dependencies = [
-      sources."@angular-devkit/architect-0.900.2"
-      sources."@angular-devkit/core-9.0.2"
-      sources."@angular-devkit/schematics-9.0.2"
-      sources."@schematics/angular-9.0.2"
-      (sources."@schematics/update-0.900.2" // {
+      sources."@angular-devkit/architect-0.900.3"
+      sources."@angular-devkit/core-9.0.3"
+      sources."@angular-devkit/schematics-9.0.3"
+      sources."@schematics/angular-9.0.3"
+      (sources."@schematics/update-0.900.3" // {
         dependencies = [
           (sources."npm-package-arg-7.0.0" // {
             dependencies = [
@@ -47243,7 +47297,7 @@ in
       sources."through2-2.0.5"
       sources."tmp-0.0.33"
       sources."tough-cookie-2.5.0"
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-fest-0.8.1"
@@ -47660,7 +47714,7 @@ in
       sources."acorn-globals-4.3.4"
       sources."acorn-walk-6.2.0"
       sources."agent-base-4.3.0"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
@@ -47782,7 +47836,7 @@ in
       sources."tmp-0.0.33"
       sources."tough-cookie-2.5.0"
       sources."tr46-1.0.1"
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
@@ -47821,7 +47875,7 @@ in
     };
     dependencies = [
       sources."@akryum/winattr-3.0.0"
-      sources."@apollo/federation-0.12.0"
+      sources."@apollo/federation-0.12.1"
       (sources."@apollo/protobufjs-1.0.3" // {
         dependencies = [
           sources."@types/node-10.17.16"
@@ -47943,7 +47997,7 @@ in
       })
       (sources."@babel/runtime-7.8.4" // {
         dependencies = [
-          sources."regenerator-runtime-0.13.3"
+          sources."regenerator-runtime-0.13.4"
         ];
       })
       sources."@babel/template-7.8.3"
@@ -48057,7 +48111,7 @@ in
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       sources."aggregate-error-3.0.1"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ansi-align-2.0.0"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-4.1.0"
@@ -48069,9 +48123,10 @@ in
           sources."normalize-path-2.1.1"
         ];
       })
-      (sources."apollo-2.22.1" // {
+      (sources."apollo-2.23.0" // {
         dependencies = [
           sources."graphql-tag-2.10.1"
+          sources."mkdirp-1.0.3"
           sources."strip-ansi-5.2.0"
         ];
       })
@@ -48079,17 +48134,17 @@ in
       sources."apollo-cache-control-0.8.11"
       sources."apollo-cache-inmemory-1.6.5"
       sources."apollo-client-2.6.8"
-      sources."apollo-codegen-core-0.36.1"
-      sources."apollo-codegen-flow-0.34.1"
-      sources."apollo-codegen-scala-0.35.1"
-      sources."apollo-codegen-swift-0.36.1"
-      sources."apollo-codegen-typescript-0.36.1"
+      sources."apollo-codegen-core-0.36.2"
+      sources."apollo-codegen-flow-0.34.2"
+      sources."apollo-codegen-scala-0.35.2"
+      sources."apollo-codegen-swift-0.36.2"
+      sources."apollo-codegen-typescript-0.36.2"
       sources."apollo-datasource-0.7.0"
       sources."apollo-engine-reporting-1.6.0"
       sources."apollo-engine-reporting-protobuf-0.4.4"
       sources."apollo-env-0.6.1"
       sources."apollo-graphql-0.4.0"
-      sources."apollo-language-server-1.19.1"
+      sources."apollo-language-server-1.19.2"
       sources."apollo-link-1.2.13"
       sources."apollo-link-context-1.0.19"
       sources."apollo-link-error-1.1.12"
@@ -48215,7 +48270,7 @@ in
       sources."callsites-2.0.0"
       sources."camel-case-3.0.0"
       sources."camelcase-4.1.0"
-      sources."caniuse-lite-1.0.30001028"
+      sources."caniuse-lite-1.0.30001030"
       sources."capture-stack-trace-1.0.1"
       sources."cardinal-2.1.1"
       sources."caseless-0.12.0"
@@ -48380,7 +48435,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.3.355"
+      sources."electron-to-chromium-1.3.360"
       sources."elegant-spinner-1.0.1"
       sources."emoji-regex-7.0.3"
       sources."encodeurl-1.0.2"
@@ -48464,7 +48519,7 @@ in
       })
       sources."find-up-3.0.0"
       sources."fkill-6.2.0"
-      sources."flow-parser-0.118.0"
+      sources."flow-parser-0.119.0"
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
@@ -48597,7 +48652,7 @@ in
       sources."interpret-1.2.0"
       sources."into-stream-2.0.1"
       sources."invariant-2.2.4"
-      sources."ipaddr.js-1.9.0"
+      sources."ipaddr.js-1.9.1"
       sources."is-accessor-descriptor-1.0.0"
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-1.0.1"
@@ -48787,7 +48842,7 @@ in
           sources."is-wsl-2.1.1"
         ];
       })
-      sources."node-releases-1.1.49"
+      sources."node-releases-1.1.50"
       (sources."nodemon-1.19.4" // {
         dependencies = [
           sources."debug-3.2.6"
@@ -48895,7 +48950,7 @@ in
       sources."process-exists-3.1.0"
       sources."process-nextick-args-2.0.1"
       sources."proto-list-1.2.4"
-      sources."proxy-addr-2.0.5"
+      sources."proxy-addr-2.0.6"
       sources."ps-list-4.1.0"
       sources."pseudomap-1.0.2"
       sources."psl-1.7.0"
@@ -48918,7 +48973,7 @@ in
         ];
       })
       sources."readdirp-2.2.1"
-      (sources."recast-0.18.5" // {
+      (sources."recast-0.18.7" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -48928,7 +48983,7 @@ in
       sources."regenerate-1.4.0"
       sources."regenerate-unicode-properties-8.1.0"
       sources."regenerator-runtime-0.10.5"
-      sources."regenerator-transform-0.14.1"
+      sources."regenerator-transform-0.14.2"
       (sources."regex-not-1.0.2" // {
         dependencies = [
           sources."extend-shallow-3.0.2"
@@ -49178,7 +49233,7 @@ in
       sources."trim-repeated-1.0.0"
       sources."ts-invariant-0.4.4"
       sources."ts-node-8.6.2"
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.0"
       sources."tty-1.0.1"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
@@ -49502,10 +49557,10 @@ in
   alloy = nodeEnv.buildNodePackage {
     name = "alloy";
     packageName = "alloy";
-    version = "1.14.5";
+    version = "1.14.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.14.5.tgz";
-      sha512 = "zMCw1CCc2sR70pwLMCrSReTBWOHUClV28s7gD83eewkF7VM7e+fsPKtlKMRRzrxnVdzvRWXipZKWU3GjYZi95w==";
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.14.6.tgz";
+      sha512 = "M+DxWKG35yfUrJj58i6ohTrf8EaRkk9mFj/QSXxUvmqsyYrBmpQT1RnITzk7HY0QVxW1Oiw9zjxGVrQeozJL/w==";
     };
     dependencies = [
       sources."@babel/code-frame-7.8.3"
@@ -49679,7 +49734,7 @@ in
         ];
       })
       sources."acorn-walk-6.2.0"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."array-equal-1.0.0"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
@@ -50158,7 +50213,7 @@ in
       sources."@types/node-10.17.16"
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.2.16"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ansi-regex-1.1.1"
       sources."ansi-styles-2.2.1"
       sources."append-0.1.1"
@@ -50731,7 +50786,7 @@ in
       sources."@types/node-13.7.4"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ansi-0.3.1"
       sources."ansi-align-2.0.0"
       sources."ansi-escapes-3.2.0"
@@ -50849,11 +50904,8 @@ in
       sources."debug-2.6.9"
       sources."decode-uri-component-0.2.0"
       sources."dedent-0.7.0"
-      sources."deep-equal-1.1.1"
       sources."deep-extend-0.6.0"
-      sources."define-properties-1.1.3"
       sources."define-property-2.0.2"
-      sources."defined-1.0.0"
       sources."delayed-stream-1.0.0"
       (sources."dep-graph-1.1.0" // {
         dependencies = [
@@ -50865,7 +50917,6 @@ in
       sources."detect-indent-5.0.0"
       sources."dir-glob-2.2.2"
       sources."dot-prop-4.2.0"
-      sources."dotignore-0.1.2"
       sources."duplexer3-0.1.4"
       sources."ecc-jsbn-0.1.2"
       sources."editor-1.0.0"
@@ -50873,10 +50924,8 @@ in
       sources."elementtree-0.1.7"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
-      sources."endent-1.4.0"
+      sources."endent-1.4.1"
       sources."env-paths-1.0.0"
-      sources."es-abstract-1.17.4"
-      sources."es-to-primitive-1.2.1"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
       sources."etag-1.8.1"
@@ -50926,7 +50975,6 @@ in
       })
       sources."finalhandler-1.1.2"
       sources."find-up-2.1.0"
-      sources."for-each-0.3.3"
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
@@ -50935,7 +50983,6 @@ in
       sources."fresh-0.5.2"
       sources."fs-extra-8.1.0"
       sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.1"
       sources."get-stream-4.1.0"
       sources."get-value-2.0.6"
       sources."getpass-0.1.7"
@@ -50960,9 +51007,7 @@ in
       sources."graceful-fs-4.2.3"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
-      sources."has-1.0.3"
       sources."has-flag-3.0.0"
-      sources."has-symbols-1.0.1"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
         dependencies = [
@@ -50993,14 +51038,11 @@ in
       })
       sources."insight-0.10.3"
       sources."ip-regex-2.1.0"
-      sources."ipaddr.js-1.9.0"
+      sources."ipaddr.js-1.9.1"
       sources."is-accessor-descriptor-1.0.0"
-      sources."is-arguments-1.0.4"
       sources."is-buffer-1.1.6"
-      sources."is-callable-1.1.5"
       sources."is-ci-1.2.1"
       sources."is-data-descriptor-1.0.0"
-      sources."is-date-object-1.0.2"
       sources."is-descriptor-1.0.2"
       sources."is-extendable-0.1.1"
       sources."is-extglob-2.1.1"
@@ -51018,10 +51060,8 @@ in
       sources."is-plain-object-2.0.4"
       sources."is-promise-2.1.0"
       sources."is-redirect-1.0.0"
-      sources."is-regex-1.0.5"
       sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
-      sources."is-symbol-1.0.3"
       sources."is-typedarray-1.0.0"
       sources."is-url-1.2.4"
       sources."is-windows-1.0.2"
@@ -51090,13 +51130,9 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."object-inspect-1.7.0"
-      sources."object-is-1.0.2"
-      sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
-      sources."object.assign-4.1.0"
       sources."object.pick-1.3.0"
-      sources."objectorarray-1.0.3"
+      sources."objectorarray-1.0.4"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
@@ -51133,7 +51169,7 @@ in
       sources."posix-character-classes-0.1.1"
       sources."prepend-http-1.0.4"
       sources."promzard-0.3.0"
-      sources."proxy-addr-2.0.5"
+      sources."proxy-addr-2.0.6"
       sources."pseudomap-1.0.2"
       sources."psl-1.7.0"
       sources."pump-3.0.0"
@@ -51155,7 +51191,6 @@ in
       })
       sources."read-package-json-2.1.1"
       sources."regex-not-1.0.2"
-      sources."regexp.prototype.flags-1.3.0"
       sources."registry-auth-token-3.4.0"
       sources."registry-url-3.1.0"
       sources."repeat-element-1.1.3"
@@ -51166,11 +51201,10 @@ in
           sources."tough-cookie-2.5.0"
         ];
       })
-      sources."resolve-1.14.2"
+      sources."resolve-1.15.1"
       sources."resolve-from-4.0.0"
       sources."resolve-url-0.2.1"
       sources."restore-cursor-2.0.0"
-      sources."resumer-0.0.0"
       sources."ret-0.1.15"
       sources."run-async-2.3.0"
       sources."rxjs-6.5.4"
@@ -51256,9 +51290,6 @@ in
           sources."strip-ansi-4.0.0"
         ];
       })
-      sources."string.prototype.trim-1.2.1"
-      sources."string.prototype.trimleft-2.1.1"
-      sources."string.prototype.trimright-2.1.1"
       (sources."strip-ansi-5.2.0" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
@@ -51268,7 +51299,6 @@ in
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-5.5.0"
-      sources."tape-4.13.0"
       (sources."term-size-1.2.0" // {
         dependencies = [
           sources."cross-spawn-5.1.0"
@@ -51288,7 +51318,7 @@ in
       sources."to-regex-range-2.1.1"
       sources."toidentifier-1.0.0"
       sources."tough-cookie-3.0.1"
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.18"
@@ -51412,7 +51442,7 @@ in
       sources."concat-map-0.0.1"
       sources."copy-descriptor-0.1.1"
       sources."cp-file-7.0.0"
-      sources."cpy-8.0.0"
+      sources."cpy-8.0.1"
       sources."currently-unhandled-0.4.1"
       sources."debug-2.6.9"
       sources."decamelize-1.2.0"
@@ -51474,6 +51504,11 @@ in
       sources."glob-to-regexp-0.3.0"
       sources."globby-9.2.0"
       sources."graceful-fs-4.2.3"
+      (sources."has-glob-1.0.0" // {
+        dependencies = [
+          sources."is-glob-3.1.0"
+        ];
+      })
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
         dependencies = [
@@ -51959,7 +51994,7 @@ in
         ];
       })
       sources."tmp-0.1.0"
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.0"
       sources."type-fest-0.8.1"
       sources."uid-number-0.0.6"
       sources."universalify-0.1.2"
@@ -52058,7 +52093,7 @@ in
     };
     dependencies = [
       sources."abstract-random-access-1.1.2"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ansi-align-2.0.0"
       sources."ansi-diff-1.1.1"
       sources."ansi-regex-3.0.0"
@@ -52618,7 +52653,7 @@ in
       sources."throttle-1.0.3"
       sources."thunky-1.1.0"
       sources."timed-out-4.0.1"
-      sources."timeout-refresh-1.0.1"
+      sources."timeout-refresh-1.0.2"
       sources."to-buffer-1.1.1"
       (sources."to-object-path-0.3.0" // {
         dependencies = [
@@ -52915,19 +52950,19 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "6.21.0";
+    version = "6.22.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.21.0.tgz";
-      sha512 = "Ym6TP6yWNXwueViA0e2cByyGfbr1sFThsI3vzQHy3xiDKZVDcMCE2eFiUen342VksZznzM0R8L61SQ3T39hBTw==";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.22.0.tgz";
+      sha512 = "ZoZzAb8kwldRgdr1cSbdyQwmIGUI8V89NhCR0+t9sEmgALHYB9BclcslAZPmjrZ9T7iN7LX63gnwp0wMBcgkig==";
     };
     dependencies = [
       sources."JSONStream-1.3.5"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."async-2.6.3"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.622.0"
+      sources."aws-sdk-2.625.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.9.1"
       sources."base64-js-1.3.1"
@@ -53341,7 +53376,7 @@ in
       sources."@babel/highlight-7.8.3"
       sources."acorn-7.1.0"
       sources."acorn-jsx-5.1.0"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ansi-escapes-4.3.0"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-3.2.1"
@@ -53465,7 +53500,7 @@ in
       sources."text-table-0.2.0"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.0"
       sources."type-check-0.3.2"
       sources."type-fest-0.8.1"
       sources."uri-js-4.2.2"
@@ -53498,7 +53533,7 @@ in
       sources."@babel/highlight-7.8.3"
       sources."acorn-7.1.0"
       sources."acorn-jsx-5.1.0"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ansi-escapes-4.3.0"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-3.2.1"
@@ -53627,7 +53662,7 @@ in
       sources."text-table-0.2.0"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.0"
       sources."type-check-0.3.2"
       sources."type-fest-0.8.1"
       sources."uri-js-4.2.2"
@@ -53656,7 +53691,7 @@ in
       sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010";
     };
     dependencies = [
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ansi-escapes-1.4.0"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
@@ -54015,7 +54050,7 @@ in
       sources."through-2.3.8"
       sources."tmp-0.0.33"
       sources."trim-newlines-3.0.0"
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.0"
       sources."type-fest-0.8.1"
       sources."validate-npm-package-license-3.0.4"
       sources."which-2.0.2"
@@ -54678,10 +54713,10 @@ in
   git-standup = nodeEnv.buildNodePackage {
     name = "git-standup";
     packageName = "git-standup";
-    version = "2.3.1";
+    version = "2.3.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/git-standup/-/git-standup-2.3.1.tgz";
-      sha512 = "c3ASD4cakIYrReY2lb4xKayyDgh4SICA8aFjuV5HRhabzrputa2Adj/eCJpnOV3Teoe9QNq1MgA2Rc4h45DJhw==";
+      url = "https://registry.npmjs.org/git-standup/-/git-standup-2.3.2.tgz";
+      sha512 = "vDYicak+2y+u6TCtneCx/j6LuT9WhJShyWjTB5dhjXqTB9TJ/uF444OmYwrMlaT0/CqxHOV9NXlML+CR8AJxdA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -54718,7 +54753,7 @@ in
       sources."@types/color-name-1.1.1"
       sources."@types/minimist-1.2.0"
       sources."@types/normalize-package-data-2.4.0"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       (sources."ansi-align-3.0.0" // {
         dependencies = [
           sources."emoji-regex-7.0.3"
@@ -54749,7 +54784,7 @@ in
       sources."clone-response-1.0.2"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
-      sources."conf-6.2.0"
+      sources."conf-6.2.1"
       sources."configstore-5.0.1"
       sources."cross-spawn-7.0.1"
       sources."crypto-random-string-2.0.0"
@@ -54948,7 +54983,7 @@ in
       sources."tmp-0.0.33"
       sources."to-readable-stream-1.0.0"
       sources."trim-newlines-3.0.0"
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.0"
       sources."type-fest-0.8.1"
       sources."typedarray-to-buffer-3.1.5"
       sources."unique-string-2.0.0"
@@ -54960,7 +54995,7 @@ in
       sources."which-2.0.2"
       sources."widest-line-3.1.0"
       sources."wrappy-1.0.2"
-      sources."write-file-atomic-3.0.1"
+      sources."write-file-atomic-3.0.3"
       sources."xdg-basedir-4.0.0"
       sources."yargs-parser-16.1.0"
     ];
@@ -55000,7 +55035,7 @@ in
       sources."@types/color-name-1.1.1"
       sources."accepts-1.3.7"
       sources."agent-base-4.3.0"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       (sources."ansi-align-3.0.0" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
@@ -55330,7 +55365,7 @@ in
       })
       sources."invert-kv-1.0.0"
       sources."ip-regex-1.0.3"
-      sources."ipaddr.js-1.9.0"
+      sources."ipaddr.js-1.9.1"
       sources."is-arrayish-0.2.1"
       sources."is-ci-2.0.0"
       sources."is-directory-0.3.1"
@@ -55529,7 +55564,7 @@ in
       })
       sources."process-nextick-args-2.0.1"
       sources."protochain-1.0.5"
-      sources."proxy-addr-2.0.5"
+      sources."proxy-addr-2.0.6"
       sources."prr-1.0.1"
       sources."pseudomap-1.0.2"
       sources."psl-1.7.0"
@@ -55638,7 +55673,7 @@ in
       sources."tough-cookie-2.5.0"
       sources."traverse-chain-0.1.0"
       sources."trim-right-1.0.1"
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-fest-0.8.1"
@@ -56053,7 +56088,7 @@ in
       sources."string_decoder-0.10.31"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."systeminformation-4.22.1"
+      sources."systeminformation-4.22.3"
       sources."term-canvas-0.0.5"
       sources."wordwrap-0.0.3"
       sources."x256-0.0.2"
@@ -56915,7 +56950,7 @@ in
       sha512 = "uXuRyVhQa0HlNmZg5LJ1BRJvRq5f7IJL/34tItHhZr9re15pwaqAuLUAIcqtwd1bLUCE++7HVPtR+NSReFW0iA==";
     };
     dependencies = [
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."async-2.6.1"
@@ -57520,7 +57555,7 @@ in
       sources."tmp-0.0.33"
       sources."toidentifier-1.0.0"
       sources."tree-kill-1.2.2"
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.0"
       sources."type-check-0.3.2"
       sources."type-fest-0.8.1"
       sources."typedarray-to-buffer-3.1.5"
@@ -57540,7 +57575,7 @@ in
         ];
       })
       sources."wrappy-1.0.2"
-      sources."write-file-atomic-3.0.1"
+      sources."write-file-atomic-3.0.3"
       sources."ws-7.2.1"
       sources."xregexp-2.0.0"
       sources."yallist-3.1.1"
@@ -57581,7 +57616,7 @@ in
     dependencies = [
       sources."JSONStream-1.3.5"
       sources."abbrev-1.1.1"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."amdefine-1.0.1"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-3.2.1"
@@ -58118,7 +58153,7 @@ in
         ];
       })
       sources."acorn-walk-6.2.0"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       (sources."ansi-escape-sequences-4.1.0" // {
         dependencies = [
           sources."array-back-3.1.0"
@@ -58335,7 +58370,7 @@ in
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
       sources."isstream-0.1.2"
-      sources."joplin-turndown-4.0.19"
+      sources."joplin-turndown-4.0.22"
       sources."joplin-turndown-plugin-gfm-1.0.12"
       sources."jpeg-js-0.1.2"
       sources."js-tokens-4.0.0"
@@ -58925,17 +58960,17 @@ in
   json-server = nodeEnv.buildNodePackage {
     name = "json-server";
     packageName = "json-server";
-    version = "0.16.0";
+    version = "0.16.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/json-server/-/json-server-0.16.0.tgz";
-      sha512 = "vdqfkMAiHUCHMkTRgxNJsd0c+lnczxFCxM8bewyalEiunDD8XWXsvgsezAt4iycqWV5aVoR//irtyUX50ZpSdA==";
+      url = "https://registry.npmjs.org/json-server/-/json-server-0.16.1.tgz";
+      sha512 = "aVUTdpt+X27iIuWuxBChJywykPSP4opEiFrH044pG+34Gde3eHZRTzeMyx8ts5/kY2gK1Ru2YBmF2k/vI0lQug==";
     };
     dependencies = [
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@types/color-name-1.1.1"
       sources."accepts-1.3.7"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       (sources."ansi-align-3.0.0" // {
         dependencies = [
           sources."string-width-3.1.0"
@@ -59044,7 +59079,7 @@ in
       sources."imurmurhash-0.1.4"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
-      sources."ipaddr.js-1.9.0"
+      sources."ipaddr.js-1.9.1"
       sources."is-ci-2.0.0"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-installed-globally-0.3.1"
@@ -59108,7 +59143,7 @@ in
       sources."please-upgrade-node-3.2.0"
       sources."pluralize-8.0.0"
       sources."prepend-http-2.0.0"
-      sources."proxy-addr-2.0.5"
+      sources."proxy-addr-2.0.6"
       sources."psl-1.7.0"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
@@ -59183,7 +59218,7 @@ in
         ];
       })
       sources."wrappy-1.0.2"
-      sources."write-file-atomic-3.0.1"
+      sources."write-file-atomic-3.0.3"
       sources."xdg-basedir-4.0.0"
       sources."y18n-4.0.0"
       sources."yargs-15.1.0"
@@ -59519,7 +59554,7 @@ in
       sources."abab-1.0.4"
       sources."acorn-2.7.0"
       sources."acorn-globals-1.0.9"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-3.2.1"
       sources."asn1-0.2.4"
@@ -59868,25 +59903,27 @@ in
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.3"
       sources."@octokit/auth-token-2.4.0"
-      (sources."@octokit/endpoint-5.5.2" // {
+      (sources."@octokit/endpoint-5.5.3" // {
         dependencies = [
           sources."is-plain-object-3.0.0"
           sources."isobject-4.0.0"
+          sources."universal-user-agent-5.0.0"
         ];
       })
       sources."@octokit/plugin-enterprise-rest-3.6.2"
       sources."@octokit/plugin-paginate-rest-1.1.2"
       sources."@octokit/plugin-request-log-1.0.0"
       sources."@octokit/plugin-rest-endpoint-methods-2.4.0"
-      (sources."@octokit/request-5.3.1" // {
+      (sources."@octokit/request-5.3.2" // {
         dependencies = [
           sources."is-plain-object-3.0.0"
           sources."isobject-4.0.0"
+          sources."universal-user-agent-5.0.0"
         ];
       })
       sources."@octokit/request-error-1.2.1"
       sources."@octokit/rest-16.43.1"
-      sources."@octokit/types-2.1.1"
+      sources."@octokit/types-2.2.0"
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
@@ -59896,7 +59933,7 @@ in
       sources."abbrev-1.1.1"
       sources."agent-base-4.3.0"
       sources."agentkeepalive-3.5.2"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-3.2.1"
@@ -60650,7 +60687,7 @@ in
       sources."tr46-1.0.1"
       sources."trim-newlines-2.0.0"
       sources."trim-off-newlines-1.0.1"
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-fest-0.3.1"
@@ -60665,7 +60702,7 @@ in
       sources."union-value-1.0.1"
       sources."unique-filename-1.1.1"
       sources."unique-slug-2.0.2"
-      sources."universal-user-agent-4.0.0"
+      sources."universal-user-agent-4.0.1"
       sources."universalify-0.1.2"
       (sources."unset-value-1.0.0" // {
         dependencies = [
@@ -60747,7 +60784,7 @@ in
       sha512 = "tlWX341RECuTOvoDIvtFqXsKj072hm3+9ymRBe76/mD6O5ZZecnlAOVDlWAleF2+aohFrxNidXhv2773f6kY7g==";
     };
     dependencies = [
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."asap-2.0.6"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
@@ -60800,7 +60837,7 @@ in
       sources."source-map-0.6.1"
       sources."sshpk-1.16.1"
       sources."tough-cookie-2.5.0"
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."uri-js-4.2.2"
@@ -61177,7 +61214,7 @@ in
     dependencies = [
       sources."accepts-1.3.7"
       sources."after-0.8.2"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."anymatch-1.3.2"
       sources."argparse-1.0.10"
       sources."arr-diff-2.0.0"
@@ -61310,7 +61347,7 @@ in
       sources."fsevents-1.2.11"
       sources."get-value-2.0.6"
       sources."getpass-0.1.7"
-      sources."github-slugger-1.2.1"
+      sources."github-slugger-1.3.0"
       sources."glob-base-0.3.0"
       sources."glob-parent-2.0.0"
       sources."graceful-fs-4.2.3"
@@ -61344,7 +61381,7 @@ in
       sources."indexof-0.0.1"
       sources."inherits-2.0.3"
       sources."innertext-1.0.3"
-      sources."ipaddr.js-1.9.0"
+      sources."ipaddr.js-1.9.1"
       (sources."is-accessor-descriptor-1.0.0" // {
         dependencies = [
           sources."kind-of-6.0.3"
@@ -61458,7 +61495,7 @@ in
       sources."posix-character-classes-0.1.1"
       sources."preserve-0.2.0"
       sources."process-nextick-args-2.0.1"
-      sources."proxy-addr-2.0.5"
+      sources."proxy-addr-2.0.6"
       sources."psl-1.7.0"
       sources."punycode-2.1.1"
       sources."qs-6.7.0"
@@ -61783,10 +61820,10 @@ in
         ];
       })
       sources."@jest/types-25.1.0"
-      sources."@types/babel__core-7.1.4"
+      sources."@types/babel__core-7.1.5"
       sources."@types/babel__generator-7.6.1"
       sources."@types/babel__template-7.0.2"
-      sources."@types/babel__traverse-7.0.8"
+      sources."@types/babel__traverse-7.0.9"
       sources."@types/color-name-1.1.1"
       sources."@types/estree-0.0.42"
       sources."@types/istanbul-lib-coverage-2.0.1"
@@ -61822,7 +61859,7 @@ in
       sources."acorn-7.1.0"
       sources."acorn-node-1.8.2"
       sources."acorn-walk-7.1.1"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ajv-errors-1.0.1"
       sources."ajv-keywords-3.4.1"
       sources."amdefine-1.0.1"
@@ -61845,7 +61882,7 @@ in
       })
       sources."assert-plus-1.0.0"
       sources."assign-symbols-1.0.0"
-      sources."async-3.1.1"
+      sources."async-3.2.0"
       sources."async-each-1.0.3"
       sources."async-retry-1.3.1"
       sources."asynckit-0.4.0"
@@ -61961,7 +61998,7 @@ in
       sources."cache-base-1.0.1"
       sources."cached-path-relative-1.0.2"
       sources."camelcase-5.3.1"
-      sources."caniuse-lite-1.0.30001028"
+      sources."caniuse-lite-1.0.30001030"
       sources."capture-exit-2.0.0"
       sources."caseless-0.12.0"
       (sources."chalk-3.0.0" // {
@@ -62076,7 +62113,7 @@ in
       sources."duplexer2-0.1.4"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.3.355"
+      sources."electron-to-chromium-1.3.360"
       sources."elliptic-6.5.2"
       sources."emoji-regex-7.0.3"
       sources."emojis-list-3.0.0"
@@ -62375,7 +62412,7 @@ in
         ];
       })
       sources."node-modules-regexp-1.0.0"
-      (sources."node-releases-1.1.49" // {
+      (sources."node-releases-1.1.50" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
@@ -62482,8 +62519,8 @@ in
       sources."realpath-native-1.1.0"
       sources."regenerate-1.4.0"
       sources."regenerate-unicode-properties-8.1.0"
-      sources."regenerator-runtime-0.13.3"
-      sources."regenerator-transform-0.14.1"
+      sources."regenerator-runtime-0.13.4"
+      sources."regenerator-transform-0.14.2"
       sources."regex-not-1.0.2"
       sources."regexpu-core-4.6.0"
       sources."regjsgen-0.5.1"
@@ -62648,7 +62685,7 @@ in
           sources."readable-stream-3.6.0"
         ];
       })
-      (sources."terser-4.6.3" // {
+      (sources."terser-4.6.4" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -62677,7 +62714,7 @@ in
           sources."punycode-2.1.1"
         ];
       })
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.0"
       sources."tty-browserify-0.0.1"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
@@ -62774,7 +62811,7 @@ in
       sources."worker-farm-1.7.0"
       sources."wrap-ansi-5.1.0"
       sources."wrappy-1.0.2"
-      sources."write-file-atomic-3.0.1"
+      sources."write-file-atomic-3.0.3"
       sources."xtend-4.0.2"
       sources."y18n-4.0.0"
       sources."yallist-3.1.1"
@@ -62826,11 +62863,11 @@ in
       sha512 = "tpBlUsnJfJ5xMHAjBC/10s8Un/WT/FmF+xXaZjeaegESmjcPlEcxZ+UuCtxArETovLS5gZ8lZXzdhgslHziLsg==";
     };
     dependencies = [
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ansi-styles-3.2.1"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
-      sources."async-3.1.1"
+      sources."async-3.2.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.9.1"
@@ -63619,7 +63656,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-1.2.0"
-      sources."typescript-3.7.5"
+      sources."typescript-3.8.2"
       (sources."uglify-js-3.8.0" // {
         dependencies = [
           sources."source-map-0.6.1"
@@ -63978,7 +64015,7 @@ in
     };
     dependencies = [
       sources."abbrev-1.1.1"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
       sources."are-we-there-yet-1.1.5"
@@ -64213,7 +64250,7 @@ in
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
       sources."invert-kv-1.0.0"
-      sources."ipaddr.js-1.9.0"
+      sources."ipaddr.js-1.9.1"
       sources."is-arrayish-0.2.1"
       sources."is-finite-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
@@ -64287,7 +64324,7 @@ in
       sources."pinkie-promise-2.0.1"
       sources."plist-1.2.0"
       sources."process-nextick-args-2.0.1"
-      sources."proxy-addr-2.0.5"
+      sources."proxy-addr-2.0.6"
       sources."punycode-1.4.1"
       sources."qs-6.7.0"
       sources."range-parser-1.2.1"
@@ -64735,7 +64772,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
-      sources."ipaddr.js-1.9.0"
+      sources."ipaddr.js-1.9.1"
       sources."is-absolute-1.0.0"
       sources."is-callable-1.1.5"
       sources."is-date-object-1.0.2"
@@ -64800,7 +64837,7 @@ in
         ];
       })
       sources."moment-2.24.0"
-      sources."moment-timezone-0.5.27"
+      sources."moment-timezone-0.5.28"
       (sources."mqtt-2.18.8" // {
         dependencies = [
           sources."readable-stream-2.3.7"
@@ -64866,7 +64903,7 @@ in
       sources."pause-0.0.1"
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.1"
-      sources."proxy-addr-2.0.5"
+      sources."proxy-addr-2.0.6"
       sources."pseudomap-1.0.2"
       sources."psl-1.7.0"
       sources."pump-3.0.0"
@@ -64882,7 +64919,7 @@ in
       sources."raw-body-2.4.0"
       sources."rc-1.2.8"
       sources."readable-stream-3.6.0"
-      sources."regenerator-runtime-0.13.3"
+      sources."regenerator-runtime-0.13.4"
       sources."reinterval-1.1.0"
       sources."remove-trailing-separator-1.1.0"
       (sources."request-2.88.0" // {
@@ -65008,7 +65045,7 @@ in
     };
     dependencies = [
       sources."abbrev-1.1.1"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
       sources."are-we-there-yet-1.1.5"
@@ -65689,7 +65726,7 @@ in
     };
     dependencies = [
       sources."abbrev-1.1.1"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
       sources."are-we-there-yet-1.1.5"
@@ -66013,7 +66050,7 @@ in
         ];
       })
       sources."acorn-walk-6.2.0"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."alphanum-sort-1.0.2"
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
@@ -66101,7 +66138,7 @@ in
       sources."callsites-2.0.0"
       sources."camelcase-5.3.1"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001028"
+      sources."caniuse-lite-1.0.30001030"
       sources."caseless-0.12.0"
       sources."chalk-2.4.2"
       sources."chokidar-2.1.8"
@@ -66236,7 +66273,7 @@ in
       sources."duplexer2-0.1.4"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.355"
+      sources."electron-to-chromium-1.3.360"
       sources."elliptic-6.5.2"
       sources."emoji-regex-7.0.3"
       sources."encodeurl-1.0.2"
@@ -66334,7 +66371,7 @@ in
       (sources."htmlnano-0.2.5" // {
         dependencies = [
           sources."posthtml-0.12.0"
-          sources."terser-4.6.3"
+          sources."terser-4.6.4"
         ];
       })
       (sources."htmlparser2-3.10.1" // {
@@ -66486,7 +66523,7 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      (sources."node-releases-1.1.49" // {
+      (sources."node-releases-1.1.50" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
@@ -66630,8 +66667,8 @@ in
       sources."readdirp-2.2.1"
       sources."regenerate-1.4.0"
       sources."regenerate-unicode-properties-8.1.0"
-      sources."regenerator-runtime-0.13.3"
-      sources."regenerator-transform-0.14.1"
+      sources."regenerator-runtime-0.13.4"
+      sources."regenerator-transform-0.14.2"
       (sources."regex-not-1.0.2" // {
         dependencies = [
           sources."extend-shallow-3.0.2"
@@ -67190,7 +67227,7 @@ in
       sources."accepts-1.3.7"
       sources."addr-to-ip-port-1.5.1"
       sources."after-0.8.2"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."archiver-3.1.1"
       (sources."archiver-utils-2.1.0" // {
         dependencies = [
@@ -67340,7 +67377,7 @@ in
       sources."inherits-2.0.4"
       sources."ip-1.1.5"
       sources."ip-set-1.0.2"
-      sources."ipaddr.js-1.9.0"
+      sources."ipaddr.js-1.9.1"
       sources."is-typedarray-1.0.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
@@ -67418,7 +67455,7 @@ in
       sources."pend-1.2.0"
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.1"
-      sources."proxy-addr-2.0.5"
+      sources."proxy-addr-2.0.6"
       sources."psl-1.7.0"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
@@ -68059,7 +68096,7 @@ in
       sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198";
     };
     dependencies = [
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
@@ -68328,7 +68365,7 @@ in
           sources."semver-6.3.0"
         ];
       })
-      (sources."@serverless/enterprise-plugin-3.4.0" // {
+      (sources."@serverless/enterprise-plugin-3.4.1" // {
         dependencies = [
           sources."fs-extra-8.1.0"
           sources."node-fetch-2.6.0"
@@ -68379,7 +68416,7 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.622.0" // {
+      (sources."aws-sdk-2.625.0" // {
         dependencies = [
           sources."buffer-4.9.1"
           sources."uuid-3.3.2"
@@ -68817,7 +68854,7 @@ in
       sources."rc-1.2.8"
       sources."readable-stream-2.3.7"
       sources."readdirp-3.3.0"
-      sources."regenerator-runtime-0.13.3"
+      sources."regenerator-runtime-0.13.4"
       sources."regex-not-1.0.2"
       sources."registry-auth-token-4.1.1"
       sources."registry-url-5.1.0"
@@ -68945,7 +68982,7 @@ in
       sources."to-regex-range-5.0.1"
       sources."traverse-0.6.6"
       sources."trim-repeated-1.0.0"
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.0"
       sources."tunnel-agent-0.6.0"
       sources."type-2.0.0"
       sources."type-fest-0.8.1"
@@ -69039,7 +69076,7 @@ in
       sources."CSSwhat-0.4.7"
       sources."accepts-1.3.7"
       sources."after-0.8.1"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."array-flatten-1.1.1"
       sources."arraybuffer.slice-0.0.6"
       sources."asn1-0.2.4"
@@ -69133,7 +69170,7 @@ in
       sources."iconv-lite-0.4.24"
       sources."indexof-0.0.1"
       sources."inherits-2.0.4"
-      sources."ipaddr.js-1.9.0"
+      sources."ipaddr.js-1.9.1"
       sources."irc-replies-2.0.1"
       sources."is-typedarray-1.0.0"
       sources."isarray-0.0.1"
@@ -69171,7 +69208,7 @@ in
       sources."path-to-regexp-0.1.7"
       sources."pause-stream-0.0.11"
       sources."performance-now-2.1.0"
-      sources."proxy-addr-2.0.5"
+      sources."proxy-addr-2.0.6"
       sources."psl-1.7.0"
       sources."punycode-2.1.1"
       sources."qs-6.7.0"
@@ -69653,13 +69690,13 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.294.0";
+    version = "1.296.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.294.0.tgz";
-      sha512 = "F+kDV9GvZUPtkAnssUae1bxoh471fNR2vNDUXsvgdAiZuqHw+N6i/ZTTWuCf3T7GWSuNb5OlGray/5uvS7WJAw==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.296.1.tgz";
+      sha512 = "Je0fww4Ak473uMli1Vzw4fkQ4I04H200hXkdVHVCK169seG/HOBZaese+AncYnzGpvMtH1hTZrDlpSNolrDvLw==";
     };
     dependencies = [
-      sources."@snyk/cli-interface-2.3.0"
+      sources."@snyk/cli-interface-2.3.2"
       sources."@snyk/cocoapods-lockfile-parser-3.0.0"
       sources."@snyk/composer-lockfile-parser-1.2.0"
       sources."@snyk/configstore-3.2.0-rc1"
@@ -69935,14 +69972,16 @@ in
           sources."debug-4.1.1"
         ];
       })
-      sources."snyk-go-parser-1.3.3"
-      (sources."snyk-go-plugin-1.12.0" // {
+      sources."snyk-go-parser-1.4.0"
+      (sources."snyk-go-plugin-1.13.0" // {
         dependencies = [
           sources."debug-4.1.1"
+          sources."tmp-0.1.0"
         ];
       })
-      (sources."snyk-gradle-plugin-3.2.4" // {
+      (sources."snyk-gradle-plugin-3.2.5" // {
         dependencies = [
+          sources."@snyk/cli-interface-2.3.0"
           sources."debug-4.1.1"
         ];
       })
@@ -70022,7 +70061,7 @@ in
       sources."toidentifier-1.0.0"
       sources."toml-3.0.0"
       sources."tree-kill-1.2.2"
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.0"
       sources."type-check-0.3.2"
       sources."unique-string-1.0.0"
       sources."unpipe-1.0.0"
@@ -70643,7 +70682,7 @@ in
         ];
       })
       sources."level-supports-1.0.1"
-      (sources."leveldown-5.4.1" // {
+      (sources."leveldown-5.5.1" // {
         dependencies = [
           sources."abstract-leveldown-6.2.2"
           sources."node-gyp-build-4.1.1"
@@ -71191,7 +71230,7 @@ in
           sources."semver-5.0.3"
         ];
       })
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."align-text-0.1.4"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
@@ -71208,7 +71247,7 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      (sources."aws-sdk-2.622.0" // {
+      (sources."aws-sdk-2.625.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -71373,7 +71412,7 @@ in
       })
       (sources."express-4.17.1" // {
         dependencies = [
-          sources."proxy-addr-2.0.5"
+          sources."proxy-addr-2.0.6"
           sources."qs-6.7.0"
         ];
       })
@@ -71459,7 +71498,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."invert-kv-2.0.0"
-      sources."ipaddr.js-1.9.0"
+      sources."ipaddr.js-1.9.1"
       sources."is-arrayish-0.2.1"
       sources."is-buffer-1.1.6"
       (sources."is-expression-3.0.0" // {
@@ -72700,7 +72739,7 @@ in
     };
     dependencies = [
       sources."@types/node-13.7.4"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ansi-regex-4.1.0"
       sources."ansi-styles-3.2.1"
       sources."argparse-1.0.10"
@@ -73294,7 +73333,7 @@ in
       sources."map-obj-1.0.1"
       sources."map-stream-0.1.0"
       sources."markdown-escapes-1.0.4"
-      sources."mdast-comment-marker-1.1.1"
+      sources."mdast-comment-marker-1.1.2"
       sources."mdast-util-to-nlcst-3.2.3"
       sources."meow-3.7.0"
       sources."minimatch-3.0.4"
@@ -73655,7 +73694,7 @@ in
       sha512 = "47yQZ14SbNfyBGKcSV/89eXwxLlGIwj8WzbKk1jvDh/uPy59skVfFbWoF4tUn09mYnRyVldMsdqB0llYgQMLUA==";
     };
     dependencies = [
-      sources."array.prototype.find-2.1.0"
+      sources."array.prototype.find-2.1.1"
       sources."check-ends-with-period-1.0.1"
       sources."define-properties-1.1.3"
       sources."emoji-regex-6.5.1"
@@ -73845,7 +73884,7 @@ in
       sources."accepts-1.3.7"
       sources."after-0.8.2"
       sources."agent-base-4.3.0"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-4.2.1"
       sources."aproba-1.2.0"
@@ -74014,7 +74053,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
-      sources."ipaddr.js-1.9.0"
+      sources."ipaddr.js-1.9.1"
       sources."irc-framework-4.6.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-typedarray-1.0.0"
@@ -74127,7 +74166,7 @@ in
       sources."precond-0.2.3"
       sources."prepend-http-2.0.0"
       sources."process-nextick-args-2.0.1"
-      sources."proxy-addr-2.0.5"
+      sources."proxy-addr-2.0.6"
       sources."psl-1.7.0"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
@@ -74138,7 +74177,7 @@ in
       sources."read-1.0.7"
       sources."read-chunk-3.2.0"
       sources."readable-stream-3.6.0"
-      sources."regenerator-runtime-0.13.3"
+      sources."regenerator-runtime-0.13.4"
       sources."registry-auth-token-4.1.1"
       sources."registry-url-5.1.0"
       (sources."request-2.88.2" // {
@@ -74291,7 +74330,7 @@ in
     };
     dependencies = [
       sources."adm-zip-0.4.13"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."async-2.6.3"
@@ -74634,7 +74673,7 @@ in
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
       sources."temp-0.8.4"
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.0"
       sources."wordwrap-0.0.3"
       sources."wrappy-1.0.2"
     ];
@@ -74674,10 +74713,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "3.7.5";
+    version = "3.8.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-3.7.5.tgz";
-      sha512 = "/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==";
+      url = "https://registry.npmjs.org/typescript/-/typescript-3.8.2.tgz";
+      sha512 = "EgOVgL/4xfVrCMbhYKUQTdF37SQn4Iw73H5BgCrF1Abdun7Kwy/QZsE/ssAy0y4LxBbvua3PIbFsbRczWWnDdQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -74750,57 +74789,47 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.5.3";
+    version = "1.5.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.5.3.tgz";
-      sha512 = "P47B9tvsJMtEJqQL9hwmkt/ygklfliLsHMAYJ9HdK5cv2Bn7vk+NhNphNgGjr/SgfnlW+jZP8QJky+JBT20m4w==";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.5.4.tgz";
+      sha512 = "jSqAjax1FKpzcyvpsvMyJHF1k/QW2MetI2fq7FOwU2NDRL9sa5jWqTUSsgNBYHe0I+fSAoj2OAZStEByUpHo4A==";
     };
     dependencies = [
       sources."@primer/octicons-9.4.0"
+      sources."@sindresorhus/is-0.14.0"
+      sources."@szmarczak/http-timer-1.1.2"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       sources."after-0.8.2"
-      sources."ajv-6.11.0"
-      sources."ansi-regex-2.1.1"
+      sources."ansi-regex-4.1.0"
       sources."ansi-styles-3.2.1"
-      sources."aproba-1.2.0"
-      sources."are-we-there-yet-1.1.5"
       sources."array-flatten-1.1.1"
       sources."arraybuffer.slice-0.0.7"
-      sources."asn1-0.2.4"
-      sources."assert-plus-1.0.0"
       sources."async-1.0.0"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      sources."aws-sign2-0.7.0"
-      sources."aws4-1.9.1"
       sources."backo2-1.0.2"
       sources."balanced-match-1.0.0"
       sources."base64-arraybuffer-0.1.5"
       sources."base64id-1.0.0"
-      sources."bcrypt-pbkdf-1.0.2"
       sources."better-assert-1.0.2"
       sources."blob-0.0.5"
       sources."bluebird-3.5.5"
       sources."blueimp-md5-2.10.0"
       sources."body-parser-1.19.0"
       sources."brace-expansion-1.1.11"
-      sources."buffer-from-1.1.1"
-      sources."builtins-1.0.3"
       sources."bytes-3.1.0"
-      sources."callsite-1.0.0"
-      sources."camelcase-5.3.1"
-      sources."caseless-0.12.0"
-      (sources."cliui-5.0.0" // {
+      (sources."cacheable-request-6.1.0" // {
         dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."string-width-3.1.0"
-          sources."strip-ansi-5.2.0"
+          sources."get-stream-5.1.0"
+          sources."lowercase-keys-2.0.0"
         ];
       })
+      sources."callsite-1.0.0"
+      sources."camelcase-5.3.1"
+      sources."cliui-5.0.0"
       sources."clone-2.1.2"
-      sources."code-point-at-1.1.0"
+      sources."clone-response-1.0.2"
       sources."color-3.1.2"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
@@ -74811,15 +74840,12 @@ in
       sources."component-emitter-1.2.1"
       sources."component-inherit-0.0.3"
       sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.2"
-      sources."console-control-strings-1.1.0"
       sources."content-disposition-0.5.2"
       sources."content-type-1.0.4"
       sources."cookie-0.3.1"
       sources."cookie-parser-1.4.4"
       sources."cookie-signature-1.0.6"
       sources."cookiejar-2.1.2"
-      sources."core-util-is-1.0.2"
       (sources."cross-spawn-6.0.5" // {
         dependencies = [
           sources."semver-5.7.1"
@@ -74827,20 +74853,20 @@ in
       })
       sources."crossroads-0.12.2"
       sources."cycle-1.0.3"
-      sources."dashdash-1.14.1"
       sources."debug-2.6.9"
       sources."decamelize-1.2.0"
+      sources."decompress-response-3.3.0"
       sources."dedent-0.7.0"
       sources."deep-extend-0.6.0"
+      sources."defer-to-connect-1.1.3"
       sources."delayed-stream-1.0.0"
-      sources."delegates-1.0.0"
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
       sources."diff-4.0.2"
-      sources."diff2html-2.8.0"
+      sources."diff2html-3.1.2"
       sources."dnd-page-scroll-0.0.4"
+      sources."duplexer3-0.1.4"
       sources."eachr-3.3.0"
-      sources."ecc-jsbn-0.1.2"
       (sources."editions-2.3.0" // {
         dependencies = [
           sources."semver-6.3.0"
@@ -74883,12 +74909,8 @@ in
           sources."depd-2.0.0"
         ];
       })
-      sources."extend-3.0.2"
       sources."extract-opts-3.4.0"
-      sources."extsprintf-1.3.0"
       sources."eyes-0.1.8"
-      sources."fast-deep-equal-3.1.1"
-      sources."fast-json-stable-stringify-2.1.0"
       sources."fast-safe-stringify-2.0.7"
       (sources."finalhandler-1.1.1" // {
         dependencies = [
@@ -74896,37 +74918,26 @@ in
         ];
       })
       sources."find-up-3.0.0"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.3.3"
+      sources."form-data-2.5.1"
       sources."formidable-1.2.1"
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
       sources."fs.realpath-1.0.0"
-      sources."gauge-2.7.4"
       sources."get-caller-file-2.0.5"
       sources."get-stream-4.1.0"
       sources."getmac-1.4.6"
-      sources."getpass-0.1.7"
       sources."glob-7.1.6"
-      sources."graceful-fs-4.2.3"
-      sources."har-schema-2.0.0"
-      sources."har-validator-5.1.3"
-      (sources."has-binary2-1.0.3" // {
-        dependencies = [
-          sources."isarray-2.0.1"
-        ];
-      })
+      sources."got-9.6.0"
+      sources."has-binary2-1.0.3"
       sources."has-cors-1.1.0"
-      sources."has-unicode-2.0.1"
       sources."hasher-1.2.0"
       (sources."hogan.js-3.0.2" // {
         dependencies = [
           sources."mkdirp-0.3.0"
         ];
       })
-      sources."hosted-git-info-2.8.5"
+      sources."http-cache-semantics-4.0.4"
       sources."http-errors-1.7.2"
-      sources."http-signature-1.2.0"
       sources."iconv-lite-0.4.24"
       sources."ignore-5.1.4"
       sources."indexof-0.0.1"
@@ -74934,29 +74945,26 @@ in
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
       sources."invert-kv-2.0.0"
-      sources."ipaddr.js-1.9.0"
+      sources."ipaddr.js-1.9.1"
       sources."is-arrayish-0.3.2"
-      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-fullwidth-code-point-2.0.0"
       sources."is-stream-1.1.0"
-      sources."is-typedarray-1.0.0"
       sources."is-wsl-1.1.0"
-      sources."isarray-1.0.0"
+      sources."isarray-2.0.1"
       sources."isexe-2.0.0"
       sources."isstream-0.1.2"
       sources."jquery-3.4.1"
       sources."jquery-ui-bundle-1.12.1"
-      sources."jsbn-0.1.1"
-      sources."json-schema-0.2.3"
-      sources."json-schema-traverse-0.4.1"
-      sources."json-stringify-safe-5.0.1"
-      sources."jsprim-1.4.1"
+      sources."json-buffer-3.0.0"
       sources."just-detect-adblock-1.0.0"
+      sources."keyv-3.1.0"
       sources."knockout-3.5.1"
+      sources."latest-version-5.1.0"
       sources."lcid-2.0.0"
       sources."locate-path-3.0.0"
       sources."locks-0.2.2"
       sources."lodash-4.17.15"
-      sources."lodash.merge-4.6.2"
+      sources."lowercase-keys-1.0.1"
       sources."lru-cache-4.1.5"
       sources."map-age-cleaner-0.1.3"
       sources."media-typer-0.3.0"
@@ -74972,6 +74980,7 @@ in
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
       sources."mimic-fn-2.1.0"
+      sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
@@ -74981,43 +74990,28 @@ in
       sources."nice-try-1.0.5"
       sources."node-cache-4.2.1"
       sources."nopt-1.0.10"
-      (sources."normalize-package-data-2.5.0" // {
-        dependencies = [
-          sources."semver-5.7.1"
-        ];
-      })
-      sources."npm-6.12.1"
-      (sources."npm-package-arg-6.1.1" // {
-        dependencies = [
-          sources."semver-5.7.1"
-        ];
-      })
-      (sources."npm-registry-client-8.6.0" // {
-        dependencies = [
-          sources."semver-5.7.1"
-        ];
-      })
+      sources."normalize-url-4.5.0"
       sources."npm-run-path-2.0.2"
-      sources."npmlog-4.1.2"
       sources."nprogress-0.2.0"
-      sources."number-is-nan-1.0.1"
-      sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
       sources."object-component-0.0.3"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."open-6.1.0"
-      sources."os-homedir-1.0.2"
       sources."os-locale-3.1.0"
-      sources."os-tmpdir-1.0.2"
-      sources."osenv-0.1.5"
+      sources."p-cancelable-1.1.0"
       sources."p-defer-1.0.0"
       sources."p-finally-1.0.0"
       sources."p-is-promise-2.1.0"
       sources."p-limit-2.2.2"
       sources."p-locate-3.0.0"
       sources."p-try-2.2.0"
+      (sources."package-json-6.5.0" // {
+        dependencies = [
+          sources."semver-6.3.0"
+        ];
+      })
       sources."parseqs-0.0.5"
       sources."parseuri-0.0.5"
       sources."parseurl-1.3.3"
@@ -75027,16 +75021,12 @@ in
       sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-key-2.0.1"
-      sources."path-parse-1.0.6"
       sources."path-to-regexp-0.1.7"
       sources."pause-0.0.1"
-      sources."performance-now-2.1.0"
-      sources."process-nextick-args-2.0.1"
-      sources."proxy-addr-2.0.5"
+      sources."prepend-http-2.0.0"
+      sources."proxy-addr-2.0.6"
       sources."pseudomap-1.0.2"
-      sources."psl-1.7.0"
       sources."pump-3.0.0"
-      sources."punycode-2.1.1"
       sources."qs-6.7.0"
       sources."random-bytes-1.0.0"
       sources."range-parser-1.2.1"
@@ -75047,16 +75037,12 @@ in
           sources."minimist-1.2.0"
         ];
       })
-      sources."readable-stream-2.3.7"
-      (sources."request-2.88.2" // {
-        dependencies = [
-          sources."qs-6.5.2"
-        ];
-      })
+      sources."readable-stream-3.6.0"
+      sources."registry-auth-token-4.1.1"
+      sources."registry-url-5.1.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
-      sources."resolve-1.15.1"
-      sources."retry-0.10.1"
+      sources."responselike-1.0.2"
       sources."rimraf-2.6.3"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
@@ -75076,7 +75062,6 @@ in
       sources."signal-exit-3.0.2"
       sources."signals-1.0.0"
       sources."simple-swizzle-0.2.2"
-      sources."slide-1.1.6"
       sources."snapsvg-0.5.1"
       (sources."socket.io-2.2.0" // {
         dependencies = [
@@ -75093,20 +75078,17 @@ in
       (sources."socket.io-parser-3.3.0" // {
         dependencies = [
           sources."debug-3.1.0"
-          sources."isarray-2.0.1"
         ];
       })
-      sources."spdx-correct-3.1.0"
-      sources."spdx-exceptions-2.2.0"
-      sources."spdx-expression-parse-3.0.0"
-      sources."spdx-license-ids-3.0.5"
-      sources."sshpk-1.16.1"
-      sources."ssri-5.3.0"
       sources."stack-trace-0.0.10"
       sources."statuses-1.5.0"
-      sources."string-width-1.0.2"
-      sources."string_decoder-1.1.1"
-      sources."strip-ansi-3.0.1"
+      sources."string-width-3.1.0"
+      (sources."string_decoder-1.3.0" // {
+        dependencies = [
+          sources."safe-buffer-5.2.0"
+        ];
+      })
+      sources."strip-ansi-5.2.0"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
       (sources."superagent-5.0.9" // {
@@ -75115,55 +75097,31 @@ in
           sources."debug-4.1.1"
           sources."mime-2.4.4"
           sources."ms-2.1.2"
-          sources."readable-stream-3.6.0"
           sources."semver-6.3.0"
         ];
       })
       sources."temp-0.9.1"
       sources."to-array-0.1.4"
+      sources."to-readable-stream-1.0.0"
       sources."toidentifier-1.0.0"
-      sources."tough-cookie-2.5.0"
-      sources."tunnel-agent-0.6.0"
-      sources."tweetnacl-0.14.5"
       sources."type-is-1.6.18"
       sources."typechecker-4.11.0"
-      sources."typedarray-0.0.6"
       sources."uid-safe-2.1.5"
       sources."unpipe-1.0.0"
-      sources."uri-js-4.2.2"
+      sources."url-parse-lax-3.0.0"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.4.0"
-      sources."validate-npm-package-license-3.0.4"
-      sources."validate-npm-package-name-3.0.0"
       sources."vary-1.1.2"
-      sources."verror-1.10.0"
-      sources."whatwg-fetch-3.0.0"
       sources."which-1.3.1"
       sources."which-module-2.0.0"
-      sources."wide-align-1.1.3"
       sources."winston-2.4.0"
-      (sources."wrap-ansi-5.1.0" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."string-width-3.1.0"
-          sources."strip-ansi-5.2.0"
-        ];
-      })
+      sources."wrap-ansi-5.1.0"
       sources."wrappy-1.0.2"
       sources."ws-6.1.4"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."y18n-4.0.0"
       sources."yallist-2.1.2"
-      (sources."yargs-13.2.4" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."string-width-3.1.0"
-          sources."strip-ansi-5.2.0"
-        ];
-      })
+      sources."yargs-13.2.4"
       sources."yargs-parser-13.1.1"
       sources."yeast-0.1.2"
     ];
@@ -75253,7 +75211,7 @@ in
     };
     dependencies = [
       sources."absolute-0.0.1"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ansi-escapes-3.2.0"
       sources."ansi-red-0.1.1"
       sources."ansi-regex-3.0.0"
@@ -75500,7 +75458,7 @@ in
       sources."toml-2.3.6"
       sources."tough-cookie-2.5.0"
       sources."trim-repeated-1.0.0"
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."uglify-js-3.8.0"
@@ -75568,7 +75526,7 @@ in
       sources."abbrev-1.1.1"
       sources."acorn-6.4.0"
       sources."acorn-jsx-5.1.0"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ajv-keywords-2.1.1"
       (sources."ansi-align-3.0.0" // {
         dependencies = [
@@ -76393,13 +76351,13 @@ in
       sources."trim-newlines-2.0.0"
       sources."trim-trailing-lines-1.1.3"
       sources."trough-1.0.5"
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.0"
       sources."tslint-5.20.1"
       sources."tsutils-2.29.0"
       sources."type-check-0.3.2"
       sources."type-fest-0.3.1"
       sources."typedarray-0.0.6"
-      sources."typescript-3.7.5"
+      sources."typescript-3.8.2"
       (sources."typescript-eslint-parser-16.0.1" // {
         dependencies = [
           sources."semver-5.5.0"
@@ -76474,11 +76432,16 @@ in
       })
       sources."vfile-sort-2.2.1"
       sources."vfile-statistics-1.1.3"
-      sources."vscode-css-languageservice-4.0.2"
+      (sources."vscode-css-languageservice-4.1.0" // {
+        dependencies = [
+          sources."vscode-uri-2.1.1"
+        ];
+      })
       sources."vscode-emmet-helper-1.2.17"
       sources."vscode-jsonrpc-5.0.1"
       sources."vscode-languageserver-5.3.0-next.10"
       sources."vscode-languageserver-protocol-3.15.3"
+      sources."vscode-languageserver-textdocument-1.0.1"
       sources."vscode-languageserver-types-3.15.1"
       sources."vscode-nls-4.1.1"
       sources."vscode-textbuffer-1.0.0"
@@ -76565,7 +76528,11 @@ in
       sources."adbkit-2.11.1"
       sources."adbkit-logcat-1.1.0"
       sources."adbkit-monkey-1.0.1"
-      sources."addons-linter-1.20.0"
+      (sources."addons-linter-1.20.0" // {
+        dependencies = [
+          sources."regenerator-runtime-0.13.3"
+        ];
+      })
       sources."adm-zip-0.4.14"
       sources."ajv-6.10.2"
       sources."ajv-keywords-1.5.1"
@@ -77317,7 +77284,7 @@ in
         ];
       })
       sources."rechoir-0.6.2"
-      sources."regenerator-runtime-0.13.3"
+      sources."regenerator-runtime-0.13.4"
       sources."regex-not-1.0.2"
       sources."regexp.prototype.flags-1.3.0"
       sources."regexpp-2.0.1"
@@ -77502,9 +77469,9 @@ in
       sources."to-regex-range-2.1.1"
       sources."tosource-1.0.0"
       sources."tough-cookie-2.5.0"
-      sources."tr46-2.0.0"
+      sources."tr46-2.0.2"
       sources."traverse-0.4.6"
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-1.2.0"
@@ -77569,7 +77536,7 @@ in
       })
       sources."wrappy-1.0.2"
       sources."write-1.0.3"
-      sources."write-file-atomic-3.0.1"
+      sources."write-file-atomic-3.0.3"
       sources."ws-7.2.1"
       sources."xdg-basedir-4.0.0"
       sources."xml2js-0.4.23"
@@ -77646,7 +77613,7 @@ in
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
       sources."acorn-6.4.0"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ajv-errors-1.0.1"
       sources."ajv-keywords-3.4.1"
       (sources."anymatch-2.0.0" // {
@@ -78023,7 +77990,7 @@ in
       sources."stream-shift-1.0.1"
       sources."string_decoder-1.1.1"
       sources."tapable-1.1.3"
-      (sources."terser-4.6.3" // {
+      (sources."terser-4.6.4" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -78043,7 +78010,7 @@ in
       })
       sources."to-regex-3.0.2"
       sources."to-regex-range-2.1.1"
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.0"
       sources."tty-browserify-0.0.0"
       sources."typedarray-0.0.6"
       sources."union-value-1.0.1"
@@ -78440,7 +78407,7 @@ in
       sources."@types/minimatch-3.0.3"
       sources."@types/node-13.7.4"
       sources."accepts-1.3.7"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ajv-errors-1.0.1"
       sources."ajv-keywords-3.4.1"
       sources."ansi-colors-3.2.4"
@@ -78678,7 +78645,7 @@ in
       sources."invert-kv-2.0.0"
       sources."ip-1.1.5"
       sources."ip-regex-2.1.0"
-      sources."ipaddr.js-1.9.0"
+      sources."ipaddr.js-1.9.1"
       sources."is-absolute-url-3.0.3"
       sources."is-accessor-descriptor-1.0.0"
       sources."is-arguments-1.0.4"
@@ -78801,7 +78768,7 @@ in
       })
       sources."posix-character-classes-0.1.1"
       sources."process-nextick-args-2.0.1"
-      sources."proxy-addr-2.0.5"
+      sources."proxy-addr-2.0.6"
       sources."prr-1.0.1"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
@@ -79035,7 +79002,7 @@ in
       sha512 = "P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg==";
     };
     dependencies = [
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ajv-errors-1.0.1"
       sources."ajv-keywords-3.4.1"
       sources."ansi-colors-3.2.4"
@@ -79542,7 +79509,7 @@ in
       sources."@nodelib/fs.stat-1.1.3"
       sources."@sindresorhus/is-0.7.0"
       sources."aggregate-error-3.0.1"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ansi-0.3.1"
       sources."ansi-align-2.0.0"
       sources."ansi-escapes-3.2.0"
@@ -80033,7 +80000,7 @@ in
           sources."indent-string-2.1.0"
         ];
       })
-      sources."regenerator-runtime-0.13.3"
+      sources."regenerator-runtime-0.13.4"
       sources."regex-not-1.0.2"
       sources."registry-auth-token-3.4.0"
       sources."registry-url-3.1.0"
@@ -80216,11 +80183,11 @@ in
       sources."to-regex-range-2.1.1"
       sources."tough-cookie-3.0.1"
       sources."trim-newlines-1.0.0"
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.0"
       sources."tunnel-0.0.6"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."twig-1.14.0"
+      sources."twig-1.15.0"
       sources."type-fest-0.3.1"
       sources."typedarray-0.0.6"
       sources."union-value-1.0.1"
diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix
index 198bd0d33246..910e9284ebc9 100644
--- a/pkgs/development/node-packages/node-packages-v12.nix
+++ b/pkgs/development/node-packages/node-packages-v12.nix
@@ -13,13 +13,13 @@ let
         sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
       };
     };
-    "ajv-6.11.0" = {
+    "ajv-6.12.0" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.11.0";
+      version = "6.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz";
-        sha512 = "nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==";
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz";
+        sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==";
       };
     };
     "ansi-regex-2.1.1" = {
@@ -2735,7 +2735,7 @@ in
     };
     dependencies = [
       sources."abbrev-1.1.1"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
       sources."are-we-there-yet-1.1.5"
@@ -2921,7 +2921,7 @@ in
     };
     dependencies = [
       sources."abbrev-1.1.1"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
       sources."are-we-there-yet-1.1.5"
diff --git a/pkgs/development/node-packages/node-packages-v13.nix b/pkgs/development/node-packages/node-packages-v13.nix
index 6e6c0cb4736d..a18a73523110 100644
--- a/pkgs/development/node-packages/node-packages-v13.nix
+++ b/pkgs/development/node-packages/node-packages-v13.nix
@@ -13,13 +13,13 @@ let
         sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
       };
     };
-    "ajv-6.11.0" = {
+    "ajv-6.12.0" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.11.0";
+      version = "6.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz";
-        sha512 = "nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==";
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz";
+        sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==";
       };
     };
     "ansi-regex-2.1.1" = {
@@ -1259,7 +1259,7 @@ in
     };
     dependencies = [
       sources."abbrev-1.1.1"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ansi-regex-2.1.1"
       sources."aproba-1.2.0"
       sources."are-we-there-yet-1.1.5"

From 8883371fd116b7a56d22b47ab95e62b41503d756 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 30 Jan 2020 23:29:22 +0100
Subject: [PATCH 1483/4636] yaml-language-server: init at 0.7.2

---
 .../node-packages/node-packages-v10.json      |  1 +
 .../node-packages/node-packages-v10.nix       | 98 ++++++++++++++++++-
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 100 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json
index cbae97149d36..6bbc2eef5374 100644
--- a/pkgs/development/node-packages/node-packages-v10.json
+++ b/pkgs/development/node-packages/node-packages-v10.json
@@ -163,6 +163,7 @@
 , "webtorrent-cli"
 , "wring"
 , "write-good"
+, "yaml-language-server"
 , "yarn"
 , "yo"
 ]
diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
index 9ae72c026270..7ce7063073c1 100644
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -23614,6 +23614,15 @@ let
         sha512 = "hk/69oAeaIzchq/v3lS50PXuzn5O2ynldopMC+SWBql7J2WtdptfB9dy8Y7+Og5rPkTCpn83zTiO8FMcqlXJ/g==";
       };
     };
+    "jsonc-parser-2.2.1" = {
+      name = "jsonc-parser";
+      packageName = "jsonc-parser";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.2.1.tgz";
+        sha512 = "o6/yDBYccGvTz1+QFevz6l6OBZ2+fMVu2JZ9CIhzsYRX4mjaK5IyX9eldUdCmga16zlgQxyrj5pt9kzuj2C02w==";
+      };
+    };
     "jsonfile-1.0.1" = {
       name = "jsonfile";
       packageName = "jsonfile";
@@ -35961,6 +35970,15 @@ let
         sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a";
       };
     };
+    "request-light-0.2.5" = {
+      name = "request-light";
+      packageName = "request-light";
+      version = "0.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request-light/-/request-light-0.2.5.tgz";
+        sha512 = "eBEh+GzJAftUnex6tcL6eV2JCifY0+sZMIUpUPOVXbs2nV5hla4ZMmO3icYKGuGVuQ2zHE9evh4OrRcH4iyYYw==";
+      };
+    };
     "request-progress-2.0.1" = {
       name = "request-progress";
       packageName = "request-progress";
@@ -44872,6 +44890,15 @@ let
         sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w==";
       };
     };
+    "vscode-json-languageservice-3.5.1" = {
+      name = "vscode-json-languageservice";
+      packageName = "vscode-json-languageservice";
+      version = "3.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.5.1.tgz";
+        sha512 = "F8jPqcAC1mbQOMKvGYS4dGEw9JCZxVEi7tc5ASZLfcfwKq2URZKB4fOtdy1GEsTLsrW11tVrBjEPntpXzqp/NA==";
+      };
+    };
     "vscode-jsonrpc-3.6.0" = {
       name = "vscode-jsonrpc";
       packageName = "vscode-jsonrpc";
@@ -45952,6 +45979,15 @@ let
         sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==";
       };
     };
+    "write-file-atomic-3.0.3" = {
+      name = "write-file-atomic";
+      packageName = "write-file-atomic";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz";
+        sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==";
+      };
+    };
     "write-good-0.11.3" = {
       name = "write-good";
       packageName = "write-good";
@@ -46529,6 +46565,15 @@ let
         sha512 = "2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==";
       };
     };
+    "yaml-ast-parser-custom-tags-0.0.43" = {
+      name = "yaml-ast-parser-custom-tags";
+      packageName = "yaml-ast-parser-custom-tags";
+      version = "0.0.43";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yaml-ast-parser-custom-tags/-/yaml-ast-parser-custom-tags-0.0.43.tgz";
+        sha512 = "R5063FF/JSAN6qXCmylwjt9PcDH6M0ExEme/nJBzLspc6FJDmHHIqM7xh2WfEmsTJqClF79A9VkXjkAqmZw9SQ==";
+      };
+    };
     "yaml-front-matter-3.4.1" = {
       name = "yaml-front-matter";
       packageName = "yaml-front-matter";
@@ -79477,6 +79522,57 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  yaml-language-server = nodeEnv.buildNodePackage {
+    name = "yaml-language-server";
+    packageName = "yaml-language-server";
+    version = "0.7.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.7.2.tgz";
+      sha512 = "3jBsYrtnlaI5H6psW+0qzVh9LoQ21fuvC8KIupjPbQURb6cAMUGH5aElKREAevSSpgs7VIoqU1ZMCglIHm32OA==";
+    };
+    dependencies = [
+      sources."agent-base-4.3.0"
+      sources."argparse-1.0.10"
+      sources."debug-3.1.0"
+      sources."es6-promise-4.2.8"
+      sources."es6-promisify-5.0.0"
+      sources."esprima-4.0.1"
+      sources."http-proxy-agent-2.1.0"
+      sources."https-proxy-agent-2.2.4"
+      sources."js-yaml-3.13.1"
+      sources."jsonc-parser-2.2.1"
+      sources."ms-2.0.0"
+      sources."prettier-1.19.1"
+      sources."request-light-0.2.5"
+      sources."sprintf-js-1.0.3"
+      sources."vscode-json-languageservice-3.5.1"
+      sources."vscode-jsonrpc-4.0.0"
+      (sources."vscode-languageserver-5.2.1" // {
+        dependencies = [
+          sources."vscode-uri-1.0.8"
+        ];
+      })
+      (sources."vscode-languageserver-protocol-3.14.1" // {
+        dependencies = [
+          sources."vscode-languageserver-types-3.14.0"
+        ];
+      })
+      sources."vscode-languageserver-textdocument-1.0.1"
+      sources."vscode-languageserver-types-3.15.1"
+      sources."vscode-nls-4.1.1"
+      sources."vscode-uri-2.1.1"
+      sources."yaml-ast-parser-custom-tags-0.0.43"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "YAML language server";
+      homepage = "https://github.com/redhat-developer/yaml-language-server#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   yarn = nodeEnv.buildNodePackage {
     name = "yarn";
     packageName = "yarn";
@@ -80275,4 +80371,4 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8506747f2890..e4bdf46e5406 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9039,6 +9039,8 @@ in
     inherit bintools libc;
   } // extraArgs; in self);
 
+  yaml-language-server = nodePackages.yaml-language-server;
+
   # prolog
   yap = callPackage ../development/compilers/yap { };
 

From ad19bb5ff849dfa9af2ad52afda361198391db43 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 24 Feb 2020 23:08:00 +0100
Subject: [PATCH 1484/4636] ipmitool: migrate to openssl 1.1

This adds a patch from debian to switch ipmitool to openssl 1.1.
Upstream seems to already carry a version of this but that is yet to be
part of a release.
---
 pkgs/tools/system/ipmitool/default.nix | 11 +++++++++--
 pkgs/top-level/all-packages.nix        |  4 +---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix
index 3105cba5a344..e86dc14b0201 100644
--- a/pkgs/tools/system/ipmitool/default.nix
+++ b/pkgs/tools/system/ipmitool/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, openssl, static ? false }:
+{ stdenv, lib, fetchurl, openssl, fetchpatch, static ? false }:
 
 let
   pkgname = "ipmitool";
@@ -12,7 +12,14 @@ stdenv.mkDerivation {
     sha256 = "0kfh8ny35rvwxwah4yv91a05qwpx74b5slq2lhrh71wz572va93m";
   };
 
-  patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
+  patches = [
+    (fetchpatch {
+      url = "https://sources.debian.org/data/main/i/ipmitool/1.8.18-6/debian/patches/0120-openssl1.1.patch";
+      sha256 = "1xvsjxb782lzy72bnqqnsk3r5h4zl3na95s4pqn2qg7cic2mnbfk";
+    })
+  ];
+
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace src/plugins/ipmi_intf.c --replace "s6_addr16" "s6_addr"
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 17b0779bc904..e71fd37682df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4261,9 +4261,7 @@ in
 
   ipget = callPackage ../applications/networking/ipget { };
 
-  ipmitool = callPackage ../tools/system/ipmitool {
-    openssl = openssl_1_0_2;
-  };
+  ipmitool = callPackage ../tools/system/ipmitool {};
 
   ipmiutil = callPackage ../tools/system/ipmiutil {};
 

From c5cd289b13ccd9e0a0b18a54ba9b97aad3ad48e0 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 25 Feb 2020 00:10:11 +0100
Subject: [PATCH 1485/4636] nodePackages: remove duplicate package

---
 pkgs/development/node-packages/node-packages-v10.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
index 7ce7063073c1..a101eb15feee 100644
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -45979,15 +45979,6 @@ let
         sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==";
       };
     };
-    "write-file-atomic-3.0.3" = {
-      name = "write-file-atomic";
-      packageName = "write-file-atomic";
-      version = "3.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz";
-        sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==";
-      };
-    };
     "write-good-0.11.3" = {
       name = "write-good";
       packageName = "write-good";

From b32a057425b337b37db41d3b4a67d39657477c05 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 24 Feb 2020 23:12:37 +0000
Subject: [PATCH 1486/4636] srcOnly: remove the ellipsis (#80903)

The function doesn't make use of the extra arguments.
---
 pkgs/build-support/src-only/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/src-only/default.nix b/pkgs/build-support/src-only/default.nix
index a93b36480908..c2f7cfb93998 100644
--- a/pkgs/build-support/src-only/default.nix
+++ b/pkgs/build-support/src-only/default.nix
@@ -1,4 +1,4 @@
-{stdenv, name, src, patches ? [], buildInputs ? [], ...}: 
+{ stdenv, name, src, patches ? [], buildInputs ? [] }:
 stdenv.mkDerivation {
   inherit src buildInputs patches name;
   installPhase = "cp -r . $out";

From e5c3bb410334699acc59a8a52fd1176a13c0779d Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 24 Feb 2020 18:36:50 -0500
Subject: [PATCH 1487/4636] vde2: update homepage

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

diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix
index 55d83eb719ce..be3d12678613 100644
--- a/pkgs/tools/networking/vde2/default.nix
+++ b/pkgs/tools/networking/vde2/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" ];
 
   meta = with stdenv.lib; {
-    homepage = http://vde.sourceforge.net/;
+    homepage = "https://github.com/virtualsquare/vde-2";
     description = "Virtual Distributed Ethernet, an Ethernet compliant virtual network";
     platforms = platforms.unix;
     license = licenses.gpl2;

From 403280a516297486368583561cfaa5276f7b4668 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 24 Feb 2020 19:05:42 -0500
Subject: [PATCH 1488/4636] nix-plugins: Build against default nix.

---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e4bdf46e5406..97ef392bce27 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13502,9 +13502,7 @@ in
   nghttp2 = callPackage ../development/libraries/nghttp2 { };
   libnghttp2 = nghttp2.lib;
 
-  nix-plugins = callPackage ../development/libraries/nix-plugins {
-    nix = nixUnstable;
-  };
+  nix-plugins = callPackage ../development/libraries/nix-plugins {};
 
   nika-fonts = callPackage ../data/fonts/nika-fonts { };
 

From 9264a0fabf97a4c9209921c52771271e25b9b8f6 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Tue, 25 Feb 2020 01:32:12 +0100
Subject: [PATCH 1489/4636] nodePackages.parsoid: init at 0.11.0

---
 .../node-packages/node-packages-v10.json      |   1 +
 .../node-packages/node-packages-v10.nix       | 568 +++++++++++++++++-
 2 files changed, 563 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json
index 6bbc2eef5374..258c90615a23 100644
--- a/pkgs/development/node-packages/node-packages-v10.json
+++ b/pkgs/development/node-packages/node-packages-v10.json
@@ -99,6 +99,7 @@
 , {"npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0"}
 , "ocaml-language-server"
 , "parcel-bundler"
+, "parsoid"
 , "peerflix"
 , "peerflix-server"
 , "pnpm"
diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
index a101eb15feee..199962d26302 100644
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -7168,6 +7168,15 @@ let
         sha1 = "a3b073f94ab49eb6fa55cd65227a334380632497";
       };
     };
+    "babybird-0.0.1" = {
+      name = "babybird";
+      packageName = "babybird";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babybird/-/babybird-0.0.1.tgz";
+        sha1 = "da80c79c6d7441cdfec7c2ff2dcbd7c13ebdbea2";
+      };
+    };
     "babylon-6.18.0" = {
       name = "babylon";
       packageName = "babylon";
@@ -8707,6 +8716,15 @@ let
         sha1 = "f150f0f6748abdd72aeae84f04403be2ef113797";
       };
     };
+    "bunyan-syslog-udp-0.2.0" = {
+      name = "bunyan-syslog-udp";
+      packageName = "bunyan-syslog-udp";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bunyan-syslog-udp/-/bunyan-syslog-udp-0.2.0.tgz";
+        sha512 = "tY6iaw+iYbCjlsAgAyO4CeA7Usnj5VndygMfd2PcHK++626oMoHANcdsH5tq5VxRPsbk9M1fbuk0a5pX9axV2w==";
+      };
+    };
     "busboy-0.2.14" = {
       name = "busboy";
       packageName = "busboy";
@@ -9751,6 +9769,15 @@ let
         sha512 = "UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==";
       };
     };
+    "clarinet-0.11.0" = {
+      name = "clarinet";
+      packageName = "clarinet";
+      version = "0.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clarinet/-/clarinet-0.11.0.tgz";
+        sha1 = "6cc912b93138dc867fc273cd34ea90e83e054719";
+      };
+    };
     "class-utils-0.3.6" = {
       name = "class-utils";
       packageName = "class-utils";
@@ -11110,6 +11137,15 @@ let
         sha512 = "ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==";
       };
     };
+    "connect-busboy-0.0.2" = {
+      name = "connect-busboy";
+      packageName = "connect-busboy";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/connect-busboy/-/connect-busboy-0.0.2.tgz";
+        sha1 = "ac5c9c96672171885e576c66b2bfd95d3bb11097";
+      };
+    };
     "connect-history-api-fallback-1.6.0" = {
       name = "connect-history-api-fallback";
       packageName = "connect-history-api-fallback";
@@ -11272,6 +11308,16 @@ let
         sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==";
       };
     };
+    "content-type-git+https://github.com/wikimedia/content-type.git#master" = {
+      name = "content-type";
+      packageName = "content-type";
+      version = "1.0.1";
+      src = fetchgit {
+        url = "https://github.com/wikimedia/content-type.git";
+        rev = "47b2632d0a2ee79a7d67268e2f6621becd95d05b";
+        sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04";
+      };
+    };
     "content-types-0.1.0" = {
       name = "content-types";
       packageName = "content-types";
@@ -13873,6 +13919,15 @@ let
         sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6";
       };
     };
+    "dnscache-1.0.2" = {
+      name = "dnscache";
+      packageName = "dnscache";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dnscache/-/dnscache-1.0.2.tgz";
+        sha512 = "2FFKzmLGOnD+Y378bRKH+gTjRMuSpH7OKgPy31KjjfCoKZx7tU8Dmqfd/3fhG2d/4bppuN8/KtWMUZBAcUCRnQ==";
+      };
+    };
     "dockerfile-ast-0.0.12" = {
       name = "dockerfile-ast";
       packageName = "dockerfile-ast";
@@ -13990,6 +14045,15 @@ let
         sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==";
       };
     };
+    "dom-storage-2.1.0" = {
+      name = "dom-storage";
+      packageName = "dom-storage";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dom-storage/-/dom-storage-2.1.0.tgz";
+        sha512 = "g6RpyWXzl0RR6OTElHKBl7nwnK87GUyZMYC7JWsB/IA73vpqK2K6LT39x4VepLxlSsWBFrPVLnsSR5Jyty0+2Q==";
+      };
+    };
     "dom-walk-0.1.1" = {
       name = "dom-walk";
       packageName = "dom-walk";
@@ -14071,6 +14135,15 @@ let
         sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==";
       };
     };
+    "domino-2.1.4" = {
+      name = "domino";
+      packageName = "domino";
+      version = "2.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domino/-/domino-2.1.4.tgz";
+        sha512 = "l70mlQ7IjPKC8kT7GljQXJZmt5OqFL+RE91ik5y5WWQtsd9wP8R7gpFnNu96fK5MqAAZRXfLLsnzKtkty5fWGQ==";
+      };
+    };
     "domutils-1.4.3" = {
       name = "domutils";
       packageName = "domutils";
@@ -16106,6 +16179,15 @@ let
         sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==";
       };
     };
+    "express-handlebars-3.1.0" = {
+      name = "express-handlebars";
+      packageName = "express-handlebars";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/express-handlebars/-/express-handlebars-3.1.0.tgz";
+        sha512 = "7QlaXnSREMmN5P2o4gmpUZDfJlLtfBka9d6r7/ccXaU7rPp76odw9YYtwZYdIiha2JqwiaG6o2Wu6NZJQ0u7Fg==";
+      };
+    };
     "express-history-api-fallback-2.2.1" = {
       name = "express-history-api-fallback";
       packageName = "express-history-api-fallback";
@@ -18023,6 +18105,33 @@ let
         sha512 = "BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==";
       };
     };
+    "gc-stats-1.4.0" = {
+      name = "gc-stats";
+      packageName = "gc-stats";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gc-stats/-/gc-stats-1.4.0.tgz";
+        sha512 = "4FcCj9e8j8rCjvLkqRpGZBLgTC/xr9XEf5By3x77cDucWWB3pJK6FEwXZCTCbb4z8xdaOoi4owBNrvn3ciDdxA==";
+      };
+    };
+    "gelf-stream-1.1.1" = {
+      name = "gelf-stream";
+      packageName = "gelf-stream";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-1.1.1.tgz";
+        sha1 = "9cea9b6386ac301c741838ca3cb91e66dbfbf669";
+      };
+    };
+    "gelfling-0.3.1" = {
+      name = "gelfling";
+      packageName = "gelfling";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gelfling/-/gelfling-0.3.1.tgz";
+        sha1 = "336a98f81510f9ae0af2a494e17468a116a9dc04";
+      };
+    };
     "generate-function-1.1.0" = {
       name = "generate-function";
       packageName = "generate-function";
@@ -19932,6 +20041,15 @@ let
         sha1 = "087e1f10b046932fc8594dd9e6d378afc9d1e5ac";
       };
     };
+    "heapdump-0.3.15" = {
+      name = "heapdump";
+      packageName = "heapdump";
+      version = "0.3.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/heapdump/-/heapdump-0.3.15.tgz";
+        sha512 = "n8aSFscI9r3gfhOcAECAtXFaQ1uy4QSke6bnaL+iymYZ/dWs9cqDqHM+rALfsHUwukUbxsdlECZ0pKmJdQ/4OA==";
+      };
+    };
     "help-me-1.1.0" = {
       name = "help-me";
       packageName = "help-me";
@@ -20085,6 +20203,15 @@ let
         sha512 = "ezZMWtHXm7Eb7Rq4Mwnx2vs79WUx2QmRg3+ZqeGroKzfDO+EprOcgRPYghsOP9JuYBfK18VojmRTGCg8Ma+ktw==";
       };
     };
+    "hot-shots-6.8.7" = {
+      name = "hot-shots";
+      packageName = "hot-shots";
+      version = "6.8.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hot-shots/-/hot-shots-6.8.7.tgz";
+        sha512 = "XH8iezBSZgVw2jegu96pUfF1Zv0VZ/iXjb7L5yE3F7mn7/bdhf4qeniXjO0wQWeefe433rhOsazNKLxM+XMI9w==";
+      };
+    };
     "hpack.js-2.1.6" = {
       name = "hpack.js";
       packageName = "hpack.js";
@@ -20410,13 +20537,13 @@ let
         sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
       };
     };
-    "http-signature-1.3.1" = {
+    "http-signature-1.3.2" = {
       name = "http-signature";
       packageName = "http-signature";
-      version = "1.3.1";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.3.1.tgz";
-        sha512 = "Y29YKEc8MQsjch/VzkUVJ+2MXd9WcR42fK5u36CZf4G8bXw2DXMTWuESiB0R6m59JAWxlPPw5/Fri/t/AyyueA==";
+        url = "https://registry.npmjs.org/http-signature/-/http-signature-1.3.2.tgz";
+        sha512 = "sjgXeFLIVJ54n1+HWOvazGkIQpaawFGIQ1PYPORaFNWpPHJ28ZuDgWljvMIhAIcOelTtrh9e5wVB3IorxjiZDA==";
       };
     };
     "http_ece-1.1.0" = {
@@ -23948,6 +24075,43 @@ let
         sha512 = "8xtA8oqbZ6v1Niryp2/g4GxW16EQh5MvrUylQoOG+zcrDff5CKttON2XUXvMwlIHq4/2zfPVFiinAccJ+WhxoA==";
       };
     };
+    "kad-fs-0.0.4" = {
+      name = "kad-fs";
+      packageName = "kad-fs";
+      version = "0.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kad-fs/-/kad-fs-0.0.4.tgz";
+        sha1 = "02ea5aa5cf22225725579627ccfd6d266372289a";
+      };
+    };
+    "kad-git+https://github.com/wikimedia/kad.git#master" = {
+      name = "kad";
+      packageName = "kad";
+      version = "1.3.6";
+      src = fetchgit {
+        url = "https://github.com/wikimedia/kad.git";
+        rev = "96f8f5c8e5a88f5dffed47abc20756e93e16387e";
+        sha256 = "12e5b6430f57389c974e7a393f2c7ac9a26df06a58cfe1afbcb5a5f3f00249ea";
+      };
+    };
+    "kad-localstorage-0.0.7" = {
+      name = "kad-localstorage";
+      packageName = "kad-localstorage";
+      version = "0.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kad-localstorage/-/kad-localstorage-0.0.7.tgz";
+        sha1 = "f7a2e780da53fb28b943c2c5a894c279aa810f17";
+      };
+    };
+    "kad-memstore-0.0.1" = {
+      name = "kad-memstore";
+      packageName = "kad-memstore";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kad-memstore/-/kad-memstore-0.0.1.tgz";
+        sha1 = "83cb748496ac491c7135104cbe56b88ca7392477";
+      };
+    };
     "katex-0.11.1" = {
       name = "katex";
       packageName = "katex";
@@ -24632,6 +24796,15 @@ let
         sha1 = "cc09c24467a0f0a1ed10a5196dba597cad3f65dc";
       };
     };
+    "limitation-0.2.1" = {
+      name = "limitation";
+      packageName = "limitation";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/limitation/-/limitation-0.2.1.tgz";
+        sha512 = "5lMmsPc9ZtMjBk8rJ8ADKIj6AOgYvRtAuNfboO2TVPZsmcn6gSRyijUsA8KG6DUcJ89/hyQ3cnVRyzO1hbDavw==";
+      };
+    };
     "lines-and-columns-1.1.6" = {
       name = "lines-and-columns";
       packageName = "lines-and-columns";
@@ -27062,6 +27235,15 @@ let
         sha512 = "fqm86UwHvAnneIv40Uy1sDQaFtAByq/k0SQ3uCtbnEeSQNT1s5TDHCZOD1VmYCHwfY1jL2NjoZVwzZKYqy3L7A==";
       };
     };
+    "mediawiki-title-0.6.5" = {
+      name = "mediawiki-title";
+      packageName = "mediawiki-title";
+      version = "0.6.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.5.tgz";
+        sha512 = "fPcI4r2yH02UUgMo308CVzIuXUaRUrBzMvjXX8J4XfcHgX9Y73iB0/VLp+S3TnxnTgIGrQ3BFb7kWGR7kkyS8g==";
+      };
+    };
     "megaminx-0.3.3" = {
       name = "megaminx";
       packageName = "megaminx";
@@ -28169,6 +28351,15 @@ let
         sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
       };
     };
+    "ms-0.7.3" = {
+      name = "ms";
+      packageName = "ms";
+      version = "0.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz";
+        sha1 = "708155a5e44e33f5fd0fc53e81d0d40a91be1fff";
+      };
+    };
     "ms-2.0.0" = {
       name = "ms";
       packageName = "ms";
@@ -28196,6 +28387,15 @@ let
         sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
       };
     };
+    "msgpack5-3.6.0" = {
+      name = "msgpack5";
+      packageName = "msgpack5";
+      version = "3.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.6.0.tgz";
+        sha512 = "6HuCZHA57WtNUzrKIvjJ8OMxigzveJ6D5i13y6TsgGu3X3zxABpuBvChpppOoGdB9SyWZcmqUs1fwUV/PpSQ7Q==";
+      };
+    };
     "multer-1.4.2" = {
       name = "multer";
       packageName = "multer";
@@ -28974,6 +29174,16 @@ let
         sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
       };
     };
+    "negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" = {
+      name = "negotiator";
+      packageName = "negotiator";
+      version = "0.6.1";
+      src = fetchgit {
+        url = "https://github.com/arlolra/negotiator.git";
+        rev = "0418ab4e9a665772b7e233564a4525c9d9a8ec3a";
+        sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394";
+      };
+    };
     "neo-async-2.6.1" = {
       name = "neo-async";
       packageName = "neo-async";
@@ -33216,6 +33426,15 @@ let
         sha512 = "G2gJwLzLcYS+2m6bTAe+CcDpwak9YpcvpScI0tE4WYb2O3lEZD/YywkMNpGqsSx5wttGvh2UXaKROTKKCyM2dw==";
       };
     };
+    "prfun-2.1.5" = {
+      name = "prfun";
+      packageName = "prfun";
+      version = "2.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/prfun/-/prfun-2.1.5.tgz";
+        sha512 = "UCDQscAfQ1HArwvSUobJWbc3sTGLqGpYkRqXUpBZgf+zOWpOjz2dxnpRsOu+qxIj1K0n5UT1wgbCCgetsIwiug==";
+      };
+    };
     "primitive-quadify-off-curves-0.4.1" = {
       name = "primitive-quadify-off-curves";
       packageName = "primitive-quadify-off-curves";
@@ -33414,6 +33633,15 @@ let
         sha512 = "nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==";
       };
     };
+    "promise-8.0.3" = {
+      name = "promise";
+      packageName = "promise";
+      version = "8.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promise/-/promise-8.0.3.tgz";
+        sha512 = "HeRDUL1RJiLhyA0/grn+PTShlBAcLuh/1BJGtrvjwbvRDCTLLMEz9rOGCV+R3vHY4MixIuoMEd9Yq/XvsTPcjw==";
+      };
+    };
     "promise-inflight-1.0.1" = {
       name = "promise-inflight";
       packageName = "promise-inflight";
@@ -37590,6 +37818,15 @@ let
         sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd";
       };
     };
+    "service-runner-2.7.6" = {
+      name = "service-runner";
+      packageName = "service-runner";
+      version = "2.7.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.7.6.tgz";
+        sha512 = "EBiEpdTwH/Cbx4Yeeo+a8i93ollOkF1vRQrvt6VuSXuCv9WFZgoK5AOEp8JZF/Bk+9ueVnyKfIiDUn8Nehj0Pg==";
+      };
+    };
     "set-blocking-1.0.0" = {
       name = "set-blocking";
       packageName = "set-blocking";
@@ -38013,6 +38250,15 @@ let
         sha512 = "06I3cwOD5Q3LdVd6qfyDGp1U9eau9x9qniSL3b/aDgM5bsJX4nZfCuii2UCFcTfrDq0jCXF4NQ/38qeC8CJZTg==";
       };
     };
+    "simplediff-0.1.1" = {
+      name = "simplediff";
+      packageName = "simplediff";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/simplediff/-/simplediff-0.1.1.tgz";
+        sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c";
+      };
+    };
     "single-line-log-0.4.1" = {
       name = "single-line-log";
       packageName = "single-line-log";
@@ -43585,6 +43831,15 @@ let
         sha512 = "8rMeVYWSIyccIJscb9NdCfZKSRBKYTeVnwmiRYT2ulE3qd1RaDQ0xQDP+rI3ccIWbhu/zuo5cgN8z73belNZgw==";
       };
     };
+    "unix-dgram-2.0.3" = {
+      name = "unix-dgram";
+      packageName = "unix-dgram";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unix-dgram/-/unix-dgram-2.0.3.tgz";
+        sha512 = "Bay5CkSLcdypcBCsxvHEvaG3mftzT5FlUnRToPWEAVxwYI8NI/8zSJ/Gknlp86MPhV6hBA8I8TBsETj2tssoHQ==";
+      };
+    };
     "unixify-1.0.0" = {
       name = "unixify";
       packageName = "unixify";
@@ -45646,6 +45901,24 @@ let
         sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==";
       };
     };
+    "wikimedia-langconv-0.1.0" = {
+      name = "wikimedia-langconv";
+      packageName = "wikimedia-langconv";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wikimedia-langconv/-/wikimedia-langconv-0.1.0.tgz";
+        sha512 = "nSiLDIIMAmnulDIRcophSU4oOLW1AGnQKNim+SI5MtzE5gwlD+VJNTkBbSYq8Nov8WjD9jWobaKxo+5yeiC1vA==";
+      };
+    };
+    "wikipeg-2.0.3" = {
+      name = "wikipeg";
+      packageName = "wikipeg";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wikipeg/-/wikipeg-2.0.3.tgz";
+        sha512 = "VMVqiZRIFqb5rQYhRqvzPy5yFwJyCkjEdNAsSnq6ZxYH+7EN7/U+R3LrIx1Lf16pq+DZuWY3wrkq6YFhU8c0lg==";
+      };
+    };
     "win-detect-browsers-1.0.2" = {
       name = "win-detect-browsers";
       packageName = "win-detect-browsers";
@@ -66929,6 +67202,289 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  parsoid = nodeEnv.buildNodePackage {
+    name = "parsoid";
+    packageName = "parsoid";
+    version = "0.11.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/parsoid/-/parsoid-0.11.0.tgz";
+      sha512 = "EGaqfG5nB5J+1P1qCZVkhLqIl1H9saR8a6Ro90yMmGRKCyPUDMEBkju4yNiOtV3cSJncl8jYk/Xz6wdmnV95Mw==";
+    };
+    dependencies = [
+      (sources."accepts-1.3.7" // {
+        dependencies = [
+          sources."negotiator-0.6.2"
+        ];
+      })
+      sources."ajv-6.12.0"
+      sources."ansi-regex-4.1.0"
+      sources."ansi-styles-3.2.1"
+      sources."argparse-1.0.10"
+      sources."array-flatten-1.1.1"
+      sources."asap-2.0.6"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."async-0.9.2"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.9.1"
+      sources."babybird-0.0.1"
+      sources."balanced-match-1.0.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."bindings-1.5.0"
+      sources."bl-1.2.2"
+      sources."bluebird-3.7.2"
+      (sources."body-parser-1.19.0" // {
+        dependencies = [
+          sources."bytes-3.1.0"
+          sources."content-type-1.0.4"
+        ];
+      })
+      sources."brace-expansion-1.1.11"
+      sources."bunyan-1.8.12"
+      sources."bunyan-syslog-udp-0.2.0"
+      sources."busboy-0.3.1"
+      sources."bytes-3.0.0"
+      sources."camelcase-5.3.1"
+      sources."caseless-0.12.0"
+      sources."clarinet-0.11.0"
+      sources."cliui-5.0.0"
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
+      sources."colors-1.4.0"
+      sources."combined-stream-1.0.8"
+      sources."commander-2.20.3"
+      sources."compressible-2.0.18"
+      sources."compression-1.7.4"
+      sources."concat-map-0.0.1"
+      sources."connect-busboy-0.0.2"
+      sources."content-disposition-0.5.3"
+      sources."content-type-git+https://github.com/wikimedia/content-type.git#master"
+      sources."cookie-0.4.0"
+      sources."cookie-signature-1.0.6"
+      sources."core-js-2.6.11"
+      sources."core-util-is-1.0.2"
+      sources."dashdash-1.14.1"
+      sources."debug-2.6.9"
+      sources."decamelize-1.2.0"
+      sources."define-properties-1.1.3"
+      sources."delayed-stream-1.0.0"
+      sources."depd-1.1.2"
+      sources."destroy-1.0.4"
+      sources."dicer-0.3.0"
+      sources."dnscache-1.0.2"
+      sources."dom-storage-2.1.0"
+      sources."domino-2.1.4"
+      sources."dtrace-provider-0.8.8"
+      sources."ecc-jsbn-0.1.2"
+      sources."ee-first-1.1.1"
+      sources."emoji-regex-7.0.3"
+      sources."encodeurl-1.0.2"
+      sources."entities-1.1.2"
+      sources."errno-0.1.7"
+      sources."escape-html-1.0.3"
+      sources."esprima-4.0.1"
+      sources."etag-1.8.1"
+      (sources."express-4.17.1" // {
+        dependencies = [
+          sources."content-type-1.0.4"
+        ];
+      })
+      sources."express-handlebars-3.1.0"
+      sources."extend-3.0.2"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-3.1.1"
+      sources."fast-json-stable-stringify-2.1.0"
+      sources."file-uri-to-path-1.0.0"
+      sources."finalhandler-1.1.2"
+      sources."find-up-3.0.0"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.3"
+      sources."forwarded-0.1.2"
+      sources."fresh-0.5.2"
+      sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
+      sources."gc-stats-1.4.0"
+      sources."gelf-stream-1.1.1"
+      sources."gelfling-0.3.1"
+      sources."get-caller-file-2.0.5"
+      sources."getpass-0.1.7"
+      sources."glob-7.1.6"
+      sources."graceful-fs-4.2.3"
+      sources."handlebars-4.7.3"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.1.3"
+      sources."has-symbols-1.0.1"
+      sources."hat-0.0.3"
+      sources."heapdump-0.3.15"
+      sources."hot-shots-6.8.7"
+      sources."http-errors-1.7.2"
+      sources."http-signature-1.2.0"
+      sources."iconv-lite-0.4.24"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."ipaddr.js-1.9.1"
+      sources."is-arguments-1.0.4"
+      sources."is-fullwidth-code-point-2.0.0"
+      sources."is-typedarray-1.0.0"
+      sources."isarray-1.0.0"
+      sources."isstream-0.1.2"
+      sources."js-yaml-3.13.1"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.4.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsprim-1.4.1"
+      (sources."kad-git+https://github.com/wikimedia/kad.git#master" // {
+        dependencies = [
+          sources."ms-0.7.3"
+        ];
+      })
+      sources."kad-fs-0.0.4"
+      sources."kad-localstorage-0.0.7"
+      sources."kad-memstore-0.0.1"
+      sources."limitation-0.2.1"
+      sources."locate-path-3.0.0"
+      sources."lodash-4.17.15"
+      sources."lodash.clone-4.5.0"
+      sources."media-typer-0.3.0"
+      sources."mediawiki-title-0.6.5"
+      sources."merge-1.2.1"
+      sources."merge-descriptors-1.0.1"
+      sources."methods-1.1.2"
+      sources."mime-1.6.0"
+      sources."mime-db-1.43.0"
+      sources."mime-types-2.1.26"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.10"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      sources."moment-2.24.0"
+      sources."ms-2.0.0"
+      sources."msgpack5-3.6.0"
+      sources."mv-2.1.1"
+      sources."nan-2.14.0"
+      sources."ncp-2.0.0"
+      sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access"
+      sources."neo-async-2.6.1"
+      sources."oauth-sign-0.9.0"
+      sources."object-keys-1.1.1"
+      sources."object.assign-4.1.0"
+      sources."on-finished-2.3.0"
+      sources."on-headers-1.0.2"
+      sources."once-1.4.0"
+      sources."optimist-0.6.1"
+      sources."p-limit-2.2.2"
+      sources."p-locate-3.0.0"
+      sources."p-try-2.2.0"
+      sources."parseurl-1.3.3"
+      sources."path-exists-3.0.0"
+      sources."path-is-absolute-1.0.1"
+      sources."path-to-regexp-0.1.7"
+      sources."performance-now-2.1.0"
+      sources."pn-1.1.0"
+      sources."prfun-2.1.5"
+      sources."process-nextick-args-2.0.1"
+      sources."promise-8.0.3"
+      sources."proxy-addr-2.0.6"
+      sources."prr-1.0.1"
+      sources."psl-1.7.0"
+      sources."punycode-2.1.1"
+      sources."qs-6.7.0"
+      sources."range-parser-1.2.1"
+      (sources."raw-body-2.4.0" // {
+        dependencies = [
+          sources."bytes-3.1.0"
+        ];
+      })
+      sources."readable-stream-2.3.7"
+      (sources."request-2.88.2" // {
+        dependencies = [
+          sources."qs-6.5.2"
+        ];
+      })
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-2.0.0"
+      (sources."rimraf-2.4.5" // {
+        dependencies = [
+          sources."glob-6.0.4"
+        ];
+      })
+      sources."safe-buffer-5.1.2"
+      sources."safe-json-stringify-1.2.0"
+      sources."safer-buffer-2.1.2"
+      sources."semver-6.3.0"
+      (sources."send-0.17.1" // {
+        dependencies = [
+          sources."ms-2.1.1"
+        ];
+      })
+      (sources."serve-favicon-2.5.0" // {
+        dependencies = [
+          sources."ms-2.1.1"
+          sources."safe-buffer-5.1.1"
+        ];
+      })
+      sources."serve-static-1.14.1"
+      (sources."service-runner-2.7.6" // {
+        dependencies = [
+          sources."semver-7.1.3"
+          sources."yargs-14.2.2"
+        ];
+      })
+      sources."set-blocking-2.0.0"
+      sources."setprototypeof-1.1.1"
+      sources."simplediff-0.1.1"
+      sources."source-map-0.6.1"
+      sources."sprintf-js-1.0.3"
+      sources."sshpk-1.16.1"
+      sources."statuses-1.5.0"
+      sources."streamsearch-0.1.2"
+      sources."string-width-3.1.0"
+      sources."string_decoder-1.1.1"
+      sources."strip-ansi-5.2.0"
+      sources."toidentifier-1.0.0"
+      sources."tough-cookie-2.5.0"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."type-is-1.6.18"
+      sources."uglify-js-3.8.0"
+      sources."unix-dgram-2.0.3"
+      sources."unpipe-1.0.0"
+      sources."uri-js-4.2.2"
+      sources."util-deprecate-1.0.2"
+      sources."utils-merge-1.0.1"
+      sources."uuid-3.4.0"
+      sources."vary-1.1.2"
+      sources."verror-1.10.0"
+      sources."which-module-2.0.0"
+      sources."wikimedia-langconv-0.1.0"
+      sources."wikipeg-2.0.3"
+      sources."wordwrap-0.0.3"
+      sources."worker-farm-1.7.0"
+      sources."wrap-ansi-5.1.0"
+      sources."wrappy-1.0.2"
+      sources."y18n-4.0.0"
+      (sources."yargs-13.3.0" // {
+        dependencies = [
+          sources."yargs-parser-13.1.1"
+        ];
+      })
+      sources."yargs-parser-15.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A bidirectional runtime wikitext parser. Converts back and forth between wikitext and HTML/XML DOM with RDFa.";
+      homepage = "https://github.com/wikimedia/parsoid#readme";
+      license = "GPL-2.0+";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   peerflix = nodeEnv.buildNodePackage {
     name = "peerflix";
     packageName = "peerflix";
@@ -69662,7 +70218,7 @@ in
           sources."clone-0.1.5"
           sources."dashdash-1.10.1"
           sources."extsprintf-1.0.0"
-          (sources."http-signature-1.3.1" // {
+          (sources."http-signature-1.3.2" // {
             dependencies = [
               sources."assert-plus-1.0.0"
               sources."dashdash-1.14.1"
@@ -74523,7 +75079,7 @@ in
         ];
       })
       sources."glob-5.0.15"
-      (sources."http-signature-1.3.1" // {
+      (sources."http-signature-1.3.2" // {
         dependencies = [
           sources."assert-plus-1.0.0"
         ];

From 3b27f4d9455c0b7962f22f0be2d04126984aad31 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Tue, 25 Feb 2020 00:26:54 +0100
Subject: [PATCH 1490/4636] nixos/parsoid: fix package name

Original package was removed in 2b8cde0ce25b4f35fce23c9ad388b3726d285d0b.
---
 nixos/modules/services/misc/parsoid.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/parsoid.nix b/nixos/modules/services/misc/parsoid.nix
index 61626e78f8b3..9c2afa3207ae 100644
--- a/nixos/modules/services/misc/parsoid.nix
+++ b/nixos/modules/services/misc/parsoid.nix
@@ -6,7 +6,7 @@ let
 
   cfg = config.services.parsoid;
 
-  parsoid = pkgs.nodePackages."parsoid-git://github.com/abbradar/parsoid#stable";
+  parsoid = pkgs.nodePackages.parsoid;
 
   confTree = {
     worker_heartbeat_timeout = 300000;

From 9b0a9577f78fc8fc619cd75cc87cfe8e1c39b7b9 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Tue, 25 Feb 2020 00:46:21 +0100
Subject: [PATCH 1491/4636] nixos/parsoid: enable systemd sandboxing

---
 nixos/modules/services/misc/parsoid.nix | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/parsoid.nix b/nixos/modules/services/misc/parsoid.nix
index 9c2afa3207ae..09b7f977bfbf 100644
--- a/nixos/modules/services/misc/parsoid.nix
+++ b/nixos/modules/services/misc/parsoid.nix
@@ -98,8 +98,29 @@ in
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
       serviceConfig = {
-        User = "nobody";
         ExecStart = "${parsoid}/lib/node_modules/parsoid/bin/server.js -c ${confFile} -n ${toString cfg.workers}";
+
+        DynamicUser = true;
+        User = "parsoid";
+        Group = "parsoid";
+
+        CapabilityBoundingSet = "";
+        NoNewPrivileges = true;
+        ProtectSystem = "strict";
+        ProtectHome = true;
+        PrivateTmp = true;
+        PrivateDevices = true;
+        ProtectHostname = true;
+        ProtectKernelTunables = true;
+        ProtectKernelModules = true;
+        ProtectControlGroups = true;
+        RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
+        RestrictNamespaces = true;
+        LockPersonality = true;
+        #MemoryDenyWriteExecute = true;
+        RestrictRealtime = true;
+        RestrictSUIDSGID = true;
+        RemoveIPC = true;
       };
     };
 

From ad337f7f3ac02616132b39a07822d1254bd36ba3 Mon Sep 17 00:00:00 2001
From: tollb <4109762+tollb@users.noreply.github.com>
Date: Mon, 24 Feb 2020 20:18:09 -0500
Subject: [PATCH 1492/4636] gdb: Fix abort w/NIX_DEBUG_INFO_DIRS patch (#80929)

The current gdb patch to support NIX_DEBUG_INFO_DIRS fails if
the user attempts to change the debug file directory to a
value other than the default. For instance:

(gdb) set debug-file-directory /run/booted-system/sw/lib/debug

results in:

munmap_chunk(): invalid pointer
Aborted (core dumped)

To fix this issue, the debug_file_directory is allocated
with xstrdup so that a subsequent call to xfree will succeed.
---
 pkgs/development/tools/misc/gdb/debug-info-from-env.patch | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/gdb/debug-info-from-env.patch b/pkgs/development/tools/misc/gdb/debug-info-from-env.patch
index a7eda2c7e173..499b61ba8696 100644
--- a/pkgs/development/tools/misc/gdb/debug-info-from-env.patch
+++ b/pkgs/development/tools/misc/gdb/debug-info-from-env.patch
@@ -3,11 +3,13 @@ of directories with separate debugging information files.
 
 --- a/gdb/main.c
 +++ b/gdb/main.c
-@@ -551,3 +551,6 @@ captured_main_1 (struct captured_main_args *context)
+@@ -556,3 +556,8 @@ captured_main_1 (struct captured_main_args *context)
  
 -  debug_file_directory = relocate_gdb_directory (DEBUGDIR,
 +  debug_file_directory = getenv("NIX_DEBUG_INFO_DIRS");
 +
-+  if (debug_file_directory == NULL)
++  if (debug_file_directory != NULL)
++    debug_file_directory = xstrdup(debug_file_directory);
++  else
 +    debug_file_directory = relocate_gdb_directory (DEBUGDIR,
  						 DEBUGDIR_RELOCATABLE);

From 633bdfc1dea9d427bf85560fa20ae6f6fb5558d1 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 24 Feb 2020 20:20:20 -0500
Subject: [PATCH 1493/4636] spotify-tui: 0.14.0 -> 0.15.0

Changelog: https://github.com/Rigellute/spotify-tui/releases/tag/v0.15.0
---
 pkgs/applications/audio/spotify-tui/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix
index db54055def40..9613df6df0b7 100644
--- a/pkgs/applications/audio/spotify-tui/default.nix
+++ b/pkgs/applications/audio/spotify-tui/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "spotify-tui";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "Rigellute";
     repo = "spotify-tui";
     rev = "v${version}";
-    sha256 = "06xqj83m4hz00p8796m0df7lv9875p8zc1v6l9yqbiak1h95lq7h";
+    sha256 = "19mnnpsidwr5y6igs478gfp7rq76378f66nzfhj4mraqd2jc4nzj";
   };
 
-  cargoSha256 = "1pc4n6lm1w0660ivm0kxzicpckvb351y62dpv0cxa7ckd3raa5pr";
+  cargoSha256 = "1zhv3sla92z7pjdnf0r4x85n7z9spi70vgy4kw72rdc5v9bmj7q8";
 
   nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ];
   buildInputs = [ openssl ]

From bdbbe6f34fd361d63d49f974b4b3ec7679e37577 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Mon, 24 Feb 2020 21:43:12 -0500
Subject: [PATCH 1494/4636] libyamlcpp: don't use multiple outputs

This package uses CMake's install(EXPORT ...) command which assumes that
libraries are installed in the same location as the CMake files.
---
 pkgs/development/libraries/libyaml-cpp/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix
index 0dec9daee6ac..3d0a94a35d0b 100644
--- a/pkgs/development/libraries/libyaml-cpp/default.nix
+++ b/pkgs/development/libraries/libyaml-cpp/default.nix
@@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
     sha256 = "0ykkxzxcwwiv8l8r697gyqh1nl582krpvi7m7l6b40ijnk4pw30s";
   };
 
-  outputs = [ "out" "dev" ];
-
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DYAML_CPP_BUILD_TESTS=OFF" ];

From f54d8b68d611efc53f88c87940efe6f30d3eb301 Mon Sep 17 00:00:00 2001
From: Jason Felice <jason.m.felice@gmail.com>
Date: Mon, 24 Feb 2020 23:29:40 -0500
Subject: [PATCH 1495/4636] parinfer-rust: 0.4.2 -> 0.4.3

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

diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/development/tools/parinfer-rust/default.nix
index 47e7ab254817..a313683f2ae5 100644
--- a/pkgs/development/tools/parinfer-rust/default.nix
+++ b/pkgs/development/tools/parinfer-rust/default.nix
@@ -2,19 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "parinfer-rust";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "eraserhd";
     repo = "parinfer-rust";
     rev = "v${version}";
-    sha256 = "1k2kr1zlxx3w3kwb634kngzx8vl5iif1yr6zk2xh46gjwqb3223l";
+    sha256 = "0hj5in5h7pj72m4ag80ing513fh65q8xlsf341qzm3vmxm3y3jgd";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0i5wy15w985nxwl4b6rzb06hchzjwph6ygzjkkmigm9diw9jcycn";
+  cargoSha256 = "16ylk125p368mcz8nandmfqlygrqjlf8mqaxlbpixqga378saidl";
 
   buildInputs = [ llvmPackages.libclang llvmPackages.clang ];
   LIBCLANG_PATH = "${llvmPackages.libclang}/lib";

From 7340dd1d9b6498c661cc7b2e08941562406ffd71 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Sat, 22 Feb 2020 10:18:10 +0200
Subject: [PATCH 1496/4636] dua: 2.1.11 -> 2.3.1

---
 pkgs/tools/misc/dua/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix
index 3e5f12da0c39..0b56b03b9de6 100644
--- a/pkgs/tools/misc/dua/default.nix
+++ b/pkgs/tools/misc/dua/default.nix
@@ -2,19 +2,23 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "dua";
-  version = "2.1.11";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "Byron";
     repo = "dua-cli";
     rev = "v${version}";
-    sha256 = "08zgi2yiynb20l1f9rhly4a7zgqnr7lq3cr5vkmh1jnfs6z27dv6";
+    sha256 = "15pmmjnzjbjlf7np5zf2yahccqx8iw1jlzl3nkhqbs673ns0gjml";
+    # Remove unicode file names which leads to different checksums on HFS+
+    # vs. other filesystems because of unicode normalisation.
+    extraPostFetch = ''
+      rm -r $out/tests/fixtures
+    '';
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
+  cargoSha256 = "0xqjbhqb08bk40i0rfzfkcl9kp67b8a285ksil4f663nidycmgw3";
 
-  cargoSha256 = "0hd46h4wwh81hnida0in3142884y8n6ygk7qm09i5wj52g73bivv";
+  doCheck = false;
 
   meta = with lib; {
     description = "A tool to conveniently learn about the disk usage of directories, fast!";

From 4f7484f03895a75d375dbe9da1e2f370e3a9a9ac Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 19 Feb 2020 17:22:51 +0100
Subject: [PATCH 1497/4636] ocamlPackages.pgocaml_ppx: init at 4.0

---
 pkgs/development/ocaml-modules/pgocaml/ppx.nix | 8 ++++++++
 pkgs/top-level/ocaml-packages.nix              | 2 ++
 2 files changed, 10 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/pgocaml/ppx.nix

diff --git a/pkgs/development/ocaml-modules/pgocaml/ppx.nix b/pkgs/development/ocaml-modules/pgocaml/ppx.nix
new file mode 100644
index 000000000000..f8bc4a40e7f9
--- /dev/null
+++ b/pkgs/development/ocaml-modules/pgocaml/ppx.nix
@@ -0,0 +1,8 @@
+{ buildDunePackage, pgocaml, ppx_tools, ppx_tools_versioned, rresult }:
+
+buildDunePackage {
+  pname = "pgocaml_ppx";
+  inherit (pgocaml) src version meta;
+
+  propagatedBuildInputs = [ pgocaml ppx_tools ppx_tools_versioned rresult ];
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index baa1d862e53e..dc7abbd15a62 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -623,6 +623,8 @@ let
 
     pgocaml = callPackage ../development/ocaml-modules/pgocaml {};
 
+    pgocaml_ppx = callPackage ../development/ocaml-modules/pgocaml/ppx.nix {};
+
     ocaml-sat-solvers = callPackage ../development/ocaml-modules/ocaml-sat-solvers { };
 
     ocamlscript = callPackage ../development/tools/ocaml/ocamlscript { };

From 0c3ca28e8eb426fd358c21e06bd5bc6fe371c4ca Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 25 Feb 2020 09:12:47 +0200
Subject: [PATCH 1498/4636] sccache: 0.2.12 -> 0.2.13

Quote homepage URL.
---
 pkgs/development/tools/misc/sccache/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix
index 140b7679ab2c..51c22199cc15 100644
--- a/pkgs/development/tools/misc/sccache/default.nix
+++ b/pkgs/development/tools/misc/sccache/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkgconfig, glib, openssl, darwin }:
 
 rustPlatform.buildRustPackage rec {
-  version = "0.2.12";
+  version = "0.2.13";
   pname = "sccache";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "sccache";
     rev = version;
-    sha256 = "1yd3rfp032crwlmfn2p3z12f67q7bxm78fhvdlc7azm2a4hkif4k";
+    sha256 = "19z9fdkn3bnr8q33m66h2by6bs6kmhw3a2lq2n8bywmnhrjwhxpw";
   };
-  cargoSha256 = "17i3m7hj7kvdbicabmz2wl3g6s6c8lcyi3pririkq77jxm87shfh";
+  cargoSha256 = "1pm7il0x7i9mqx4vsmkcs8nq0dqr5ck3x3x7la6k39igaxn9vkwz";
 
   cargoBuildFlags = [ "--features=all" ];
   nativeBuildInputs = [
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with stdenv.lib; {
     description = "Ccache with Cloud Storage";
-    homepage = https://github.com/mozilla/sccache;
+    homepage = "https://github.com/mozilla/sccache";
     maintainers = with maintainers; [ doronbehar ];
     license = licenses.asl20;
     platforms = platforms.unix;

From e6c42d3740077defd180abcc4e1e2a86ceca9b48 Mon Sep 17 00:00:00 2001
From: Souvik Sen <nixpkgs-commits@deshaw.com>
Date: Mon, 17 Feb 2020 00:54:18 -0500
Subject: [PATCH 1499/4636] patroni: init at 1.6.4

---
 pkgs/servers/sql/patroni/default.nix | 57 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 +
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/servers/sql/patroni/default.nix

diff --git a/pkgs/servers/sql/patroni/default.nix b/pkgs/servers/sql/patroni/default.nix
new file mode 100644
index 000000000000..a9fc3fd1a174
--- /dev/null
+++ b/pkgs/servers/sql/patroni/default.nix
@@ -0,0 +1,57 @@
+{ lib, pythonPackages, fetchFromGitHub }:
+
+pythonPackages.buildPythonApplication rec {
+  pname = "patroni";
+  version = "1.6.4";
+
+  src = fetchFromGitHub {
+    owner = "zalando";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0w0mz4a1cyxdsqmv7jrkw163jll8ir5zmf93zcidlqx13knrk80g";
+  };
+
+  # cdiff renamed to ydiff; remove when patroni source reflects this.
+  postPatch = ''
+    for i in requirements.txt patroni/ctl.py tests/test_ctl.py; do
+      substituteInPlace $i --replace cdiff ydiff
+    done
+  '';
+
+  propagatedBuildInputs = with pythonPackages; [
+    boto
+    click
+    consul
+    dns
+    kazoo
+    kubernetes
+    prettytable
+    psutil
+    psycopg2
+    python-dateutil
+    python-etcd
+    pyyaml
+    tzlocal
+    urllib3
+    ydiff
+  ];
+
+  checkInputs = with pythonPackages; [
+    flake8
+    mock
+    pytest
+    pytestcov
+    requests
+  ];
+
+  # Fix tests by preventing them from writing to /homeless-shelter.
+  preCheck = "export HOME=$(mktemp -d)";
+
+  meta = with lib; {
+    homepage = "https://patroni.readthedocs.io/en/latest/";
+    description = "A Template for PostgreSQL HA with ZooKeeper, etcd or Consul";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.limeytexan ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 025c6a4631cc..9c9b98563dd6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15673,6 +15673,8 @@ in
 
   vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { };
 
+  patroni = callPackage ../servers/sql/patroni { pythonPackages = python3Packages; };
+
   pgbouncer = callPackage ../servers/sql/pgbouncer { };
 
   pgpool = callPackage ../servers/sql/pgpool {

From 58f608339a40f4bfb8fd0d3a0fe1d8390d5d4900 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Feb 2020 09:21:27 +0000
Subject: [PATCH 1500/4636] python27Packages.flask-babelex: 0.9.3 -> 0.9.4

---
 pkgs/development/python-modules/flask-babelex/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/flask-babelex/default.nix b/pkgs/development/python-modules/flask-babelex/default.nix
index c61967af6bcd..cdcb400983b1 100644
--- a/pkgs/development/python-modules/flask-babelex/default.nix
+++ b/pkgs/development/python-modules/flask-babelex/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "flask-babelex";
-  version = "0.9.3";
+  version = "0.9.4";
 
   src = fetchPypi {
     inherit version;
     pname = "Flask-BabelEx";
-    sha256 = "cf79cdedb5ce860166120136b0e059e9d97b8df07a3bc2411f6243de04b754b4";
+    sha256 = "09yfr8hlwvpgvq8kp1y7qbnnl0q28hi0348bv199ssiqx779r99r";
   };
 
   propagatedBuildInputs = [
@@ -40,7 +40,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Adds i18n/l10n support to Flask applications";
-    homepage = https://github.com/mrjoes/flask-babelex;
+    homepage = "https://github.com/mrjoes/flask-babelex";
     license = licenses.bsd3;
     maintainers = [ maintainers.costrouc ];
   };

From e1e71e5886576a5054fecb47d21b0515aff08367 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 23 Feb 2020 12:38:55 -0800
Subject: [PATCH 1501/4636] pythonPackages.ansible-lint: disable for python2

raumel.yaml is not importable, which makes pip
fail during installation
---
 pkgs/development/python-modules/ansible-lint/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix
index a8a7fc3a7bff..b704fd7453fe 100644
--- a/pkgs/development/python-modules/ansible-lint/default.nix
+++ b/pkgs/development/python-modules/ansible-lint/default.nix
@@ -1,17 +1,21 @@
 { lib
 , fetchPypi
 , buildPythonPackage
+, isPy27
 , ansible
 , pyyaml
 , six
 , nose
 , setuptools_scm
 , ruamel_yaml
+, pathlib2
 }:
 
 buildPythonPackage rec {
   pname = "ansible-lint";
   version = "4.2.0";
+  # pip is not able to import version info on raumel.yaml
+  disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
@@ -21,7 +25,8 @@ buildPythonPackage rec {
   format = "pyproject";
 
   nativeBuildInputs = [ setuptools_scm ];
-  propagatedBuildInputs = [ pyyaml six ansible ruamel_yaml ];
+  propagatedBuildInputs = [ pyyaml six ansible ruamel_yaml ]
+    ++ lib.optionals isPy27 [ pathlib2 ];
   checkInputs = [ nose ];
 
   postPatch = ''

From d7c6c9a79366fa1075d3442adbc212d44bff1e92 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 25 Feb 2020 10:36:57 +0200
Subject: [PATCH 1502/4636] cpp-utilities: patch upstream issue 18 (#80014)

See https://github.com/Martchus/cpp-utilities/issues/18
---
 .../libraries/cpp-utilities/default.nix        | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix
index c3cc9d84aa45..93ee2ddc7046 100644
--- a/pkgs/development/libraries/cpp-utilities/default.nix
+++ b/pkgs/development/libraries/cpp-utilities/default.nix
@@ -1,4 +1,9 @@
-{ stdenv, fetchFromGitHub, cmake, cppunit }:
+{ stdenv
+, fetchFromGitHub
+, fetchpatch
+, cmake
+, cppunit
+}:
 
 stdenv.mkDerivation rec {
   pname = "cpp-utilities";
@@ -10,6 +15,17 @@ stdenv.mkDerivation rec {
     rev = "v${version}";
     sha256 = "0cghk1a0ki1063ci63imakmggwzkky1hx6lhrvc0wjfv754wsklb";
   };
+  # See https://github.com/Martchus/cpp-utilities/issues/18
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/Martchus/cpp-utilities/commit/b2a2773cdfb2b0017a3fa3d0ed2259a9a5fda666.patch";
+      sha256 = "01js90ba4xxljifncm48zbxmg7mwwz1gla1hn87yzbic47d85hfj";
+    })
+    (fetchpatch {
+      url = "https://github.com/Martchus/cpp-utilities/commit/4dd2179f191d1ace113f26177944684fa1561dc1.patch";
+      sha256 = "0chw33mwsvj7cigd1c4xl2zhpbfsp5rrijdm46qpn78bq70xcz9j";
+    })
+  ];
 
   nativeBuildInputs = [ cmake ];
   checkInputs = [ cppunit ];

From cc2ade3d7f5abdc494bc710ed67c2fa16a2d84ab Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 25 Feb 2020 09:44:16 +0100
Subject: [PATCH 1503/4636] gitRepo: 2.3 -> 2.4.1

---
 .../version-management/git-repo/default.nix          |  4 ++--
 .../git-repo/import-ssl-module.patch                 | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index 7af3e70f211d..543ca58401a9 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "git-repo";
-  version = "2.3";
+  version = "2.4.1";
 
   src = fetchFromGitHub {
     owner = "android";
     repo = "tools_repo";
     rev = "v${version}";
-    sha256 = "0jrll0mjfwakyjvlhbxwsdi32jhgss9mwz8c8h24n1qbqqxysrk4";
+    sha256 = "0khg1731927gvin73dcbw1657kbfq4k7agla5rpzqcnwkk5agzg3";
   };
 
   patches = [ ./import-ssl-module.patch ];
diff --git a/pkgs/applications/version-management/git-repo/import-ssl-module.patch b/pkgs/applications/version-management/git-repo/import-ssl-module.patch
index 783a2c17dee9..f1ec4e3a7ddb 100644
--- a/pkgs/applications/version-management/git-repo/import-ssl-module.patch
+++ b/pkgs/applications/version-management/git-repo/import-ssl-module.patch
@@ -1,9 +1,11 @@
---- a/repo	2020-02-05 21:11:52.773854798 +0100
-+++ b/repo	2020-02-05 21:12:34.018329462 +0100
-@@ -137,6 +137,7 @@
+diff --git a/repo b/repo
+index 8b05def..f394b3e 100755
+--- a/repo
++++ b/repo
+@@ -236,6 +236,7 @@ import optparse
+ import re
+ import shutil
  import stat
- import subprocess
- import sys
 +import ssl
  
  if sys.version_info[0] == 3:

From f111c6f9cebacc0201f59c25d6be0683014a3935 Mon Sep 17 00:00:00 2001
From: Gabor Greif <ggreif@gmail.com>
Date: Sat, 25 Jan 2020 00:17:00 +0100
Subject: [PATCH 1504/4636] llvmPackages_10: copy llvmPackages_9

* starting with rc2
* make `lldb` compilable again on Darwin
* separate out manpage creation for `lldb` into a new derivation
* minor tweaks to the patching of sources,
  some of which are backportable to earlier versions
---
 .../compilers/llvm/10/bintools.nix            |  19 +
 .../llvm/10/clang/compiler-rt-baremetal.patch |  53 +++
 .../compilers/llvm/10/clang/default.nix       | 122 ++++++
 .../compilers/llvm/10/clang/purity.patch      |  30 ++
 .../llvm/10/compiler-rt-codesign.patch        |  33 ++
 .../compilers/llvm/10/compiler-rt.nix         |  73 ++++
 .../development/compilers/llvm/10/default.nix | 204 +++++++++
 .../llvm/10/find-darwin-sdk-version.patch     |  62 +++
 .../compilers/llvm/10/libc++/default.nix      |  55 +++
 .../compilers/llvm/10/libc++/setup-hook.sh    |   6 +
 .../compilers/llvm/10/libc++abi.nix           |  67 +++
 .../llvm/10/libcxxabi-no-threads.patch        |  12 +
 .../compilers/llvm/10/libcxxabi-wasm.patch    |  16 +
 .../compilers/llvm/10/libunwind.nix           |  14 +
 pkgs/development/compilers/llvm/10/lld.nix    |  33 ++
 .../compilers/llvm/10/lldb-procfs.patch       |  31 ++
 pkgs/development/compilers/llvm/10/lldb.nix   | 101 +++++
 .../compilers/llvm/10/llvm-outputs.patch      |  26 ++
 pkgs/development/compilers/llvm/10/llvm.nix   | 185 ++++++++
 pkgs/development/compilers/llvm/10/openmp.nix |  26 ++
 .../compilers/llvm/10/sanitizers-nongnu.patch | 412 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  14 +-
 22 files changed, 1593 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/llvm/10/bintools.nix
 create mode 100644 pkgs/development/compilers/llvm/10/clang/compiler-rt-baremetal.patch
 create mode 100644 pkgs/development/compilers/llvm/10/clang/default.nix
 create mode 100644 pkgs/development/compilers/llvm/10/clang/purity.patch
 create mode 100644 pkgs/development/compilers/llvm/10/compiler-rt-codesign.patch
 create mode 100644 pkgs/development/compilers/llvm/10/compiler-rt.nix
 create mode 100644 pkgs/development/compilers/llvm/10/default.nix
 create mode 100644 pkgs/development/compilers/llvm/10/find-darwin-sdk-version.patch
 create mode 100644 pkgs/development/compilers/llvm/10/libc++/default.nix
 create mode 100644 pkgs/development/compilers/llvm/10/libc++/setup-hook.sh
 create mode 100644 pkgs/development/compilers/llvm/10/libc++abi.nix
 create mode 100644 pkgs/development/compilers/llvm/10/libcxxabi-no-threads.patch
 create mode 100644 pkgs/development/compilers/llvm/10/libcxxabi-wasm.patch
 create mode 100644 pkgs/development/compilers/llvm/10/libunwind.nix
 create mode 100644 pkgs/development/compilers/llvm/10/lld.nix
 create mode 100644 pkgs/development/compilers/llvm/10/lldb-procfs.patch
 create mode 100644 pkgs/development/compilers/llvm/10/lldb.nix
 create mode 100644 pkgs/development/compilers/llvm/10/llvm-outputs.patch
 create mode 100644 pkgs/development/compilers/llvm/10/llvm.nix
 create mode 100644 pkgs/development/compilers/llvm/10/openmp.nix
 create mode 100644 pkgs/development/compilers/llvm/10/sanitizers-nongnu.patch

diff --git a/pkgs/development/compilers/llvm/10/bintools.nix b/pkgs/development/compilers/llvm/10/bintools.nix
new file mode 100644
index 000000000000..72a2a7331930
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/bintools.nix
@@ -0,0 +1,19 @@
+{ runCommand, stdenv, llvm, lld, version }:
+
+let
+  prefix =
+    if stdenv.hostPlatform != stdenv.targetPlatform
+    then "${stdenv.targetPlatform.config}-"
+    else "";
+in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } ''
+   mkdir -p $out/bin
+   for prog in ${lld}/bin/*; do
+     ln -s $prog $out/bin/${prefix}$(basename $prog)
+   done
+   for prog in ${llvm}/bin/*; do
+     ln -s $prog $out/bin/${prefix}$(echo $(basename $prog) | sed -e "s|llvm-||")
+     ln -sf $prog $out/bin/${prefix}$(basename $prog)
+   done
+   rm -f $out/bin/${prefix}cat
+   ln -s ${lld}/bin/lld $out/bin/${prefix}ld
+''
diff --git a/pkgs/development/compilers/llvm/10/clang/compiler-rt-baremetal.patch b/pkgs/development/compilers/llvm/10/clang/compiler-rt-baremetal.patch
new file mode 100644
index 000000000000..a4a0f21b0fcd
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/clang/compiler-rt-baremetal.patch
@@ -0,0 +1,53 @@
+Index: lib/Driver/ToolChains/BareMetal.cpp
+===================================================================
+--- a/lib/Driver/ToolChains/BareMetal.cpp
++++ b/lib/Driver/ToolChains/BareMetal.cpp
+@@ -157,7 +157,7 @@
+ void BareMetal::AddLinkRuntimeLib(const ArgList &Args,
+                                   ArgStringList &CmdArgs) const {
+   CmdArgs.push_back(Args.MakeArgString("-lclang_rt.builtins-" +
+-                                       getTriple().getArchName() + ".a"));
++                                       getTriple().getArchName()));
+ }
+ 
+ void baremetal::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+Index: test/Driver/baremetal.cpp
+===================================================================
+--- a/test/Driver/baremetal.cpp
++++ b/test/Driver/baremetal.cpp
+@@ -13,7 +13,7 @@
+ // CHECK-V6M-C-NEXT: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
+ // CHECK-V6M-C-SAME: "-L[[RESOURCE_DIR:[^"]+]]{{[/\\]+}}lib{{[/\\]+}}baremetal"
+ // CHECK-V6M-C-SAME: "-T" "semihosted.lds" "-Lsome{{[/\\]+}}directory{{[/\\]+}}user{{[/\\]+}}asked{{[/\\]+}}for"
+-// CHECK-V6M-C-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
++// CHECK-V6M-C-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
+ // CHECK-V6M-C-SAME: "-o" "{{.*}}.o"
+ 
+ // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+@@ -35,7 +35,7 @@
+ // CHECK-V6M-DEFAULTCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
+ // CHECK-V6M-DEFAULTCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"
+ // CHECK-V6M-DEFAULTCXX-SAME: "-lc++" "-lc++abi" "-lunwind"
+-// CHECK-V6M-DEFAULTCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
++// CHECK-V6M-DEFAULTCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
+ // CHECK-V6M-DEFAULTCXX-SAME: "-o" "{{.*}}.o"
+ 
+ // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+@@ -48,7 +48,7 @@
+ // CHECK-V6M-LIBCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
+ // CHECK-V6M-LIBCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"
+ // CHECK-V6M-LIBCXX-SAME: "-lc++" "-lc++abi" "-lunwind"
+-// CHECK-V6M-LIBCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
++// CHECK-V6M-LIBCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
+ // CHECK-V6M-LIBCXX-SAME: "-o" "{{.*}}.o"
+ 
+ // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \
+@@ -61,7 +61,7 @@
+ // CHECK-V6M-LIBSTDCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
+ // CHECK-V6M-LIBSTDCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"
+ // CHECK-V6M-LIBSTDCXX-SAME: "-lstdc++" "-lsupc++" "-lunwind"
+-// CHECK-V6M-LIBSTDCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
++// CHECK-V6M-LIBSTDCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
+ // CHECK-V6M-LIBSTDCXX-SAME: "-o" "{{.*}}.o"
+ 
+ // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \
diff --git a/pkgs/development/compilers/llvm/10/clang/default.nix b/pkgs/development/compilers/llvm/10/clang/default.nix
new file mode 100644
index 000000000000..fcabe6d430f4
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/clang/default.nix
@@ -0,0 +1,122 @@
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld
+, fixDarwinDylibNames
+, enableManpages ? false
+, enablePolly ? false # TODO: get this info from llvm (passthru?)
+}:
+
+let
+  self = stdenv.mkDerivation ({
+    pname = "clang";
+    inherit version;
+
+    src = fetch "clang" "1npwv0j6812q9jar79bb5m2j4lmvp11680in45nlma8czrs52w0v";
+
+    unpackPhase = ''
+      unpackFile $src
+      mv clang-${version}* clang
+      sourceRoot=$PWD/clang
+      unpackFile ${clang-tools-extra_src}
+      mv clang-tools-extra-* $sourceRoot/tools/extra
+    '';
+
+    nativeBuildInputs = [ cmake python3 lld ]
+      ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
+
+    buildInputs = [ libxml2 llvm ]
+      ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+    cmakeFlags = [
+      "-DCMAKE_CXX_FLAGS=-std=c++14"
+      "-DCLANGD_BUILD_XPC=OFF"
+    ] ++ stdenv.lib.optionals enableManpages [
+      "-DCLANG_INCLUDE_DOCS=ON"
+      "-DLLVM_ENABLE_SPHINX=ON"
+      "-DSPHINX_OUTPUT_MAN=ON"
+      "-DSPHINX_OUTPUT_HTML=OFF"
+      "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
+    ] ++ stdenv.lib.optionals enablePolly [
+      "-DWITH_POLLY=ON"
+      "-DLINK_POLLY_INTO_TOOLS=ON"
+    ];
+
+    patches = [
+      ./purity.patch
+      # https://reviews.llvm.org/D51899
+      ./compiler-rt-baremetal.patch
+    ];
+
+    postPatch = ''
+      sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \
+             -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \
+             lib/Driver/ToolChains/*.cpp
+
+      # Patch for standalone doc building
+      sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
+    '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+      sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp
+    '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
+      substituteInPlace tools/extra/clangd/CMakeLists.txt \
+        --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE
+    '';
+
+    outputs = [ "out" "lib" "python" ];
+
+    # Clang expects to find LLVMgold in its own prefix
+    postInstall = ''
+      if [ -e ${llvm}/lib/LLVMgold.so ]; then
+        ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      fi
+
+      ln -sv $out/bin/clang $out/bin/cpp
+
+      # Move libclang to 'lib' output
+      moveToOutput "lib/libclang.*" "$lib"
+      moveToOutput "lib/libclang-cpp.*" "$lib"
+      substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \
+          --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \
+          --replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp."
+
+      mkdir -p $python/bin $python/share/clang/
+      mv $out/bin/{git-clang-format,scan-view} $python/bin
+      if [ -e $out/bin/set-xcode-analyzer ]; then
+        mv $out/bin/set-xcode-analyzer $python/bin
+      fi
+      mv $out/share/clang/*.py $python/share/clang
+      rm $out/bin/c-index-test
+    '';
+
+    enableParallelBuilding = true;
+
+    passthru = {
+      isClang = true;
+      inherit llvm;
+    } // stdenv.lib.optionalAttrs (stdenv.targetPlatform.isLinux || (stdenv.cc.isGNU && stdenv.cc.cc ? gcc)) {
+      gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
+    };
+
+    meta = {
+      description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
+      homepage    = http://llvm.org/;
+      license     = stdenv.lib.licenses.ncsa;
+      platforms   = stdenv.lib.platforms.all;
+    };
+  } // stdenv.lib.optionalAttrs enableManpages {
+    pname = "clang-manpages";
+
+    buildPhase = ''
+      make docs-clang-man
+    '';
+
+    installPhase = ''
+      mkdir -p $out/share/man/man1
+      # Manually install clang manpage
+      cp docs/man/*.1 $out/share/man/man1/
+    '';
+
+    outputs = [ "out" ];
+
+    doCheck = false;
+
+    meta.description = "man page for Clang ${version}";
+  });
+in self
diff --git a/pkgs/development/compilers/llvm/10/clang/purity.patch b/pkgs/development/compilers/llvm/10/clang/purity.patch
new file mode 100644
index 000000000000..a6729a9b004e
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/clang/purity.patch
@@ -0,0 +1,30 @@
+From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Thu, 18 May 2017 11:56:12 -0500
+Subject: [PATCH] "purity" patch for 5.0
+
+---
+ lib/Driver/ToolChains/Gnu.cpp | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp
+index fe3c0191bb..c6a482bece 100644
+--- a/lib/Driver/ToolChains/Gnu.cpp
++++ b/lib/Driver/ToolChains/Gnu.cpp
+@@ -494,13 +494,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
+   if (!IsStatic) {
+     if (Args.hasArg(options::OPT_rdynamic))
+       CmdArgs.push_back("-export-dynamic");
+-
+-    if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE) {
+-      const std::string Loader =
+-          D.DyldPrefix + ToolChain.getDynamicLinker(Args);
+-      CmdArgs.push_back("-dynamic-linker");
+-      CmdArgs.push_back(Args.MakeArgString(Loader));
+-    }
+   }
+ 
+   CmdArgs.push_back("-o");
+-- 
+2.11.0
+
diff --git a/pkgs/development/compilers/llvm/10/compiler-rt-codesign.patch b/pkgs/development/compilers/llvm/10/compiler-rt-codesign.patch
new file mode 100644
index 000000000000..3cc12b94b200
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/compiler-rt-codesign.patch
@@ -0,0 +1,33 @@
+From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Tue, 19 Sep 2017 13:13:06 -0500
+Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that
+ needs it
+
+---
+ cmake/Modules/AddCompilerRT.cmake |  8 ------
+ test/asan/CMakeLists.txt          | 52 ---------------------------------------
+ test/tsan/CMakeLists.txt          | 47 -----------------------------------
+ 3 files changed, 107 deletions(-)
+
+diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake
+index bc5fb9ff7..b64eb4246 100644
+--- a/cmake/Modules/AddCompilerRT.cmake
++++ b/cmake/Modules/AddCompilerRT.cmake
+@@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type)
+         set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "")
+         set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib")
+       endif()
+-      if(APPLE)
+-        # Ad-hoc sign the dylibs
+-        add_custom_command(TARGET ${libname}
+-          POST_BUILD  
+-          COMMAND codesign --sign - $<TARGET_FILE:${libname}>
+-          WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR}
+-        )
+-      endif()
+     endif()
+     install(TARGETS ${libname}
+       ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR}
+2.14.1
+
diff --git a/pkgs/development/compilers/llvm/10/compiler-rt.nix b/pkgs/development/compilers/llvm/10/compiler-rt.nix
new file mode 100644
index 000000000000..c9eed4d0070e
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/compiler-rt.nix
@@ -0,0 +1,73 @@
+{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }:
+stdenv.mkDerivation rec {
+  pname = "compiler-rt";
+  inherit version;
+  src = fetch pname "11qiass6gbpq3m1srqlk5gm0zcm8j4jk2cmingra237qhaxz8wv9";
+
+  nativeBuildInputs = [ cmake python3 llvm ];
+  buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
+
+  NIX_CFLAGS_COMPILE = [
+    "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0"
+  ];
+
+  cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
+    "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
+    "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}"
+    "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}"
+    "-DCMAKE_C_FLAGS=-nodefaultlibs"
+    "-DCMAKE_CXX_COMPILER_WORKS=ON"
+    "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
+    "-DCOMPILER_RT_BUILD_XRAY=OFF"
+    "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
+    "-DCOMPILER_RT_BUILD_PROFILE=OFF"
+    "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
+    #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
+    "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
+    "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"
+  ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+    "-DCOMPILER_RT_BUILD_SANITIZERS=OFF"
+    "-DCOMPILER_RT_BUILD_XRAY=OFF"
+    "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF"
+    "-DCOMPILER_RT_BUILD_PROFILE=OFF"
+  ] ++ stdenv.lib.optionals (stdenv.hostPlatform.parsed.kernel.name == "none") [
+    "-DCOMPILER_RT_BAREMETAL_BUILD=ON"
+    "-DCOMPILER_RT_OS_DIR=baremetal"
+  ];
+
+  outputs = [ "out" "dev" ];
+
+  patches = [
+    ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
+    ./find-darwin-sdk-version.patch # don't test for macOS being >= 10.15
+  ];# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
+
+  # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
+  # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
+  # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
+  # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
+  # a flag and turn the flag off during the stdenv build.
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace cmake/config-ix.cmake \
+      --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
+  '' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) ''
+    substituteInPlace lib/builtins/int_util.c \
+      --replace "#include <stdlib.h>" ""
+    substituteInPlace lib/builtins/clear_cache.c \
+      --replace "#include <assert.h>" ""
+    substituteInPlace lib/builtins/cpu_model.c \
+      --replace "#include <assert.h>" ""
+  '';
+
+  # Hack around weird upsream RPATH bug
+  postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''
+    ln -s "$out/lib"/*/* "$out/lib"
+  '' + stdenv.lib.optionalString (stdenv.hostPlatform.useLLVM or false) ''
+    ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o
+    ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o
+    ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o
+    ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o
+  '';
+
+  enableParallelBuilding = true;
+}
diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix
new file mode 100644
index 000000000000..0f9d302f7cf4
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/default.nix
@@ -0,0 +1,204 @@
+{ lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook
+, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith
+, buildLlvmTools # tools, but from the previous stage, for cross
+, targetLlvmLibraries # libraries, but from the next stage, for cross
+}:
+
+let
+  release_version = "10.0.0";
+  candidate = "rc2";
+  version = "10.0.0${candidate}"; # differentiating these is important for rc's
+
+  fetch = name: sha256: fetchurl {
+    url = "https://prereleases.llvm.org/${release_version}/${candidate}/${name}-${version}.src.tar.xz";
+    inherit sha256;
+  };
+
+  clang-tools-extra_src = fetch "clang-tools-extra" "1yi34b6lspcpig0gnws2ba0shgmrs2jgjb3hp08mm0dg3blzk8ss";
+
+  tools = stdenv.lib.makeExtensible (tools: let
+    callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
+    mkExtraBuildCommands = cc: ''
+      rsrc="$out/resource-root"
+      mkdir "$rsrc"
+      ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
+      ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
+      echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
+    '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && tools.clang-unwrapped ? gcc && !(stdenv.targetPlatform.useLLVM or false)) ''
+      echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags
+    '';
+  in {
+
+    llvm = callPackage ./llvm.nix { };
+    llvm-polly = callPackage ./llvm.nix { enablePolly = true; };
+
+    clang-unwrapped = callPackage ./clang {
+      inherit (tools) lld;
+      inherit clang-tools-extra_src;
+    };
+    clang-polly-unwrapped = callPackage ./clang {
+      inherit clang-tools-extra_src;
+      llvm = tools.llvm-polly;
+      enablePolly = true;
+    };
+
+    llvm-manpages = lowPrio (tools.llvm.override {
+      enableManpages = true;
+      python3 = pkgs.python3;  # don't use python-boot
+    });
+
+    clang-manpages = lowPrio (tools.clang-unwrapped.override {
+      enableManpages = true;
+      python3 = pkgs.python3;  # don't use python-boot
+    });
+
+    lldb-manpages = lowPrio (tools.lldb.override {
+      enableManpages = true;
+      python3 = pkgs.python3;  # don't use python-boot
+    });
+
+    libclang = tools.clang-unwrapped.lib;
+
+    clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
+
+    libstdcxxClang = wrapCCWith rec {
+      cc = tools.clang-unwrapped;
+      extraPackages = [
+        libstdcxxHook
+        targetLlvmLibraries.compiler-rt
+      ];
+      extraBuildCommands = mkExtraBuildCommands cc;
+    };
+
+    libcxxClang = wrapCCWith rec {
+      cc = tools.clang-unwrapped;
+      libcxx = targetLlvmLibraries.libcxx;
+      extraPackages = [
+        targetLlvmLibraries.libcxx
+        targetLlvmLibraries.libcxxabi
+        targetLlvmLibraries.compiler-rt
+      ];
+      extraBuildCommands = mkExtraBuildCommands cc;
+    };
+
+    lld = callPackage ./lld.nix {};
+
+    lldb = callPackage ./lldb.nix {};
+
+    # Below, is the LLVM bootstrapping logic. It handles building a
+    # fully LLVM toolchain from scratch. No GCC toolchain should be
+    # pulled in. As a consequence, it is very quick to build different
+    # targets provided by LLVM and we can also build for what GCC
+    # doesn’t support like LLVM. Probably we should move to some other
+    # file.
+
+    bintools = callPackage ./bintools.nix {};
+
+    lldClang = wrapCCWith rec {
+      cc = tools.clang-unwrapped;
+      libcxx = targetLlvmLibraries.libcxx;
+      bintools = wrapBintoolsWith {
+        inherit (tools) bintools;
+      };
+      extraPackages = [
+        targetLlvmLibraries.libcxx
+        targetLlvmLibraries.libcxxabi
+        targetLlvmLibraries.compiler-rt
+      ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [
+        targetLlvmLibraries.libunwind
+      ];
+      extraBuildCommands = ''
+        echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
+        echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags
+        echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
+      '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) ''
+        echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags
+      '' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm ''
+        echo "-fno-exceptions" >> $out/nix-support/cc-cflags
+      '' + mkExtraBuildCommands cc;
+    };
+
+    lldClangNoLibcxx = wrapCCWith rec {
+      cc = tools.clang-unwrapped;
+      libcxx = null;
+      bintools = wrapBintoolsWith {
+        inherit (tools) bintools;
+      };
+      extraPackages = [
+        targetLlvmLibraries.compiler-rt
+      ];
+      extraBuildCommands = ''
+        echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
+        echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags
+        echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
+        echo "-nostdlib++" >> $out/nix-support/cc-cflags
+      '' + mkExtraBuildCommands cc;
+    };
+
+    lldClangNoLibc = wrapCCWith rec {
+      cc = tools.clang-unwrapped;
+      libcxx = null;
+      bintools = wrapBintoolsWith {
+        inherit (tools) bintools;
+        libc = null;
+      };
+      extraPackages = [
+        targetLlvmLibraries.compiler-rt
+      ];
+      extraBuildCommands = ''
+        echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
+        echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags
+        echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
+      '' + mkExtraBuildCommands cc;
+    };
+
+    lldClangNoCompilerRt = wrapCCWith {
+      cc = tools.clang-unwrapped;
+      libcxx = null;
+      bintools = wrapBintoolsWith {
+        inherit (tools) bintools;
+        libc = null;
+      };
+      extraPackages = [ ];
+      extraBuildCommands = ''
+        echo "-nostartfiles" >> $out/nix-support/cc-cflags
+        echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags
+      '';
+    };
+
+  });
+
+  libraries = stdenv.lib.makeExtensible (libraries: let
+    callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
+  in {
+
+    compiler-rt = callPackage ./compiler-rt.nix ({} //
+      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+        stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt;
+      }));
+
+    stdenv = overrideCC stdenv buildLlvmTools.clang;
+
+    libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
+
+    libcxx = callPackage ./libc++ ({} //
+      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+        stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
+      }));
+
+    libcxxabi = callPackage ./libc++abi.nix ({} //
+      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+        stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
+        libunwind = libraries.libunwind;
+      }));
+
+    openmp = callPackage ./openmp.nix {};
+
+    libunwind = callPackage ./libunwind.nix ({} //
+      (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
+        stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
+      }));
+
+  });
+
+in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/10/find-darwin-sdk-version.patch b/pkgs/development/compilers/llvm/10/find-darwin-sdk-version.patch
new file mode 100644
index 000000000000..fc16ddda76b7
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/find-darwin-sdk-version.patch
@@ -0,0 +1,62 @@
+--- a/cmake/Modules/CompilerRTDarwinUtils.cmake	2020-01-25 23:13:55.000000000 +0100
++++ b/cmake/Modules/CompilerRTDarwinUtils.cmake	2020-01-25 23:19:37.000000000 +0100
+@@ -43,41 +43,6 @@
+   set(DARWIN_${sdk_name}_CACHED_SYSROOT ${var_internal} CACHE STRING "Darwin SDK path for SDK ${sdk_name}." FORCE)
+ endfunction()
+ 
+-function(find_darwin_sdk_version var sdk_name)
+-  # We deliberately don't cache the result here because
+-  # CMake's caching causes too many problems.
+-  set(result_process 1)
+-  if(NOT DARWIN_PREFER_PUBLIC_SDK)
+-    # Let's first try the internal SDK, otherwise use the public SDK.
+-    execute_process(
+-      COMMAND xcrun --sdk ${sdk_name}.internal --show-sdk-version
+-      RESULT_VARIABLE result_process
+-      OUTPUT_VARIABLE var_internal
+-      OUTPUT_STRIP_TRAILING_WHITESPACE
+-      ERROR_FILE /dev/null
+-    )
+-  endif()
+-  if((NOT ${result_process} EQUAL 0) OR "" STREQUAL "${var_internal}")
+-    execute_process(
+-      COMMAND xcrun --sdk ${sdk_name} --show-sdk-version
+-      RESULT_VARIABLE result_process
+-      OUTPUT_VARIABLE var_internal
+-      OUTPUT_STRIP_TRAILING_WHITESPACE
+-      ERROR_FILE /dev/null
+-    )
+-  endif()
+-  if(NOT result_process EQUAL 0)
+-    message(FATAL_ERROR
+-      "Failed to determine SDK version for \"${sdk_name}\" SDK")
+-  endif()
+-  # Check reported version looks sane.
+-  if (NOT "${var_internal}" MATCHES "^[0-9]+\\.[0-9]+(\\.[0-9]+)?$")
+-    message(FATAL_ERROR
+-      "Reported SDK version \"${var_internal}\" does not look like a version")
+-  endif()
+-  set(${var} ${var_internal} PARENT_SCOPE)
+-endfunction()
+-
+ # There isn't a clear mapping of what architectures are supported with a given
+ # target platform, but ld's version output does list the architectures it can
+ # link for.
+@@ -119,17 +84,6 @@
+     foreach(flag ${DARWIN_${os}_LINK_FLAGS})
+       set(os_linker_flags "${os_linker_flags} ${flag}")
+     endforeach()
+-
+-    # Disable building for i386 for macOS SDK >= 10.15. The SDK doesn't support
+-    # linking for i386 and the corresponding OS doesn't allow running macOS i386
+-    # binaries.
+-    if ("${os}" STREQUAL "osx")
+-      find_darwin_sdk_version(macosx_sdk_version "macosx")
+-      if ("${macosx_sdk_version}" VERSION_GREATER 10.15 OR "${macosx_sdk_version}" VERSION_EQUAL 10.15)
+-        message(STATUS "Disabling i386 slice for ${valid_archs}")
+-        list(REMOVE_ITEM archs "i386")
+-      endif()
+-    endif()
+   endif()
+ 
+   # The simple program will build for x86_64h on the simulator because it is 
diff --git a/pkgs/development/compilers/llvm/10/libc++/default.nix b/pkgs/development/compilers/llvm/10/libc++/default.nix
new file mode 100644
index 000000000000..2d2bc4db2d7e
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/libc++/default.nix
@@ -0,0 +1,55 @@
+{ lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version
+, enableShared ? true }:
+
+stdenv.mkDerivation {
+  pname = "libc++";
+  inherit version;
+
+  src = fetch "libcxx" "0d83z1dbr6kkwcq72kqpdkvnndjvcjx7w80qlkvqlv7r2zai5kjg";
+
+  postUnpack = ''
+    unpackFile ${libcxxabi.src}
+    export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
+  '';
+
+  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
+
+  preConfigure = ''
+    # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package
+    cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR")
+  '' + lib.optionalString stdenv.hostPlatform.isMusl ''
+    patchShebangs utils/cat_files.py
+  '';
+  nativeBuildInputs = [ cmake ]
+    ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3;
+
+  buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+  cmakeFlags = [
+    "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
+    "-DLIBCXX_LIBCPPABI_VERSION=2"
+    "-DLIBCXX_CXX_ABI=libcxxabi"
+  ] ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"
+    ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"
+    ++ stdenv.lib.optional stdenv.hostPlatform.isWasm [
+      "-DLIBCXX_ENABLE_THREADS=OFF"
+      "-DLIBCXX_ENABLE_FILESYSTEM=OFF"
+      "-DLIBCXX_ENABLE_EXCEPTIONS=OFF"
+    ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF";
+
+  enableParallelBuilding = true;
+
+  linkCxxAbi = stdenv.isLinux;
+
+  setupHooks = [
+    ../../../../../build-support/setup-hooks/role.bash
+    ./setup-hook.sh
+  ];
+
+  meta = {
+    homepage = http://libcxx.llvm.org/;
+    description = "A new implementation of the C++ standard library, targeting C++11";
+    license = with stdenv.lib.licenses; [ ncsa mit ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/10/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/10/libc++/setup-hook.sh
new file mode 100644
index 000000000000..6611259165ae
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/libc++/setup-hook.sh
@@ -0,0 +1,6 @@
+# See pkgs/build-support/setup-hooks/role.bash
+getHostRole
+
+linkCxxAbi="@linkCxxAbi@"
+export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/10/libc++abi.nix b/pkgs/development/compilers/llvm/10/libc++abi.nix
new file mode 100644
index 000000000000..3715ce36ec0a
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/libc++abi.nix
@@ -0,0 +1,67 @@
+{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version
+, enableShared ? true }:
+
+stdenv.mkDerivation {
+  pname = "libc++abi";
+  inherit version;
+
+  src = fetch "libcxxabi" "001rnpgya6y0vcsy5jqcc7ria666mswbzw4avdps6dgs6caqrfpd";
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
+
+  cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [
+    "-DLLVM_ENABLE_LIBCXX=ON"
+    "-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
+  ] ++ stdenv.lib.optionals stdenv.hostPlatform.isWasm [
+    "-DLIBCXXABI_ENABLE_THREADS=OFF"
+    "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF"
+  ] ++ stdenv.lib.optionals (!enableShared) [
+    "-DLIBCXXABI_ENABLE_SHARED=OFF"
+  ];
+
+  patches = [ ./libcxxabi-no-threads.patch ];
+
+  postUnpack = ''
+    unpackFile ${libcxx.src}
+    unpackFile ${llvm.src}
+    cmakeFlags+=" -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    export TRIPLE=x86_64-apple-darwin
+  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch}
+  '' + stdenv.lib.optionalString stdenv.hostPlatform.isWasm ''
+    patch -p1 -d $(ls -d llvm-*) -i ${./libcxxabi-wasm.patch}
+  '';
+
+  installPhase = if stdenv.isDarwin
+    then ''
+      for file in lib/*.dylib; do
+        # this should be done in CMake, but having trouble figuring out
+        # the magic combination of necessary CMake variables
+        # if you fancy a try, take a look at
+        # http://www.cmake.org/Wiki/CMake_RPATH_handling
+        install_name_tool -id $out/$file $file
+      done
+      make install
+      install -d 755 $out/include
+      install -m 644 ../include/*.h $out/include
+    ''
+    else ''
+      install -d -m 755 $out/include $out/lib
+      install -m 644 lib/libc++abi.a $out/lib
+      install -m 644 ../include/cxxabi.h $out/include
+    '' + stdenv.lib.optionalString enableShared ''
+      install -m 644 lib/libc++abi.so.1.0 $out/lib
+      ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
+      ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
+    '';
+
+  meta = {
+    homepage = http://libcxxabi.llvm.org/;
+    description = "A new implementation of low level support for a standard C++ library";
+    license = with stdenv.lib.licenses; [ ncsa mit ];
+    maintainers = with stdenv.lib.maintainers; [ vlstill ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/10/libcxxabi-no-threads.patch b/pkgs/development/compilers/llvm/10/libcxxabi-no-threads.patch
new file mode 100644
index 000000000000..787f3e16500e
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/libcxxabi-no-threads.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4138acf..41b4763 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -362,6 +362,7 @@ if (NOT LIBCXXABI_ENABLE_THREADS)
+                         " is also set to ON.")
+   endif()
+   add_definitions(-D_LIBCXXABI_HAS_NO_THREADS)
++  add_definitions(-D_LIBCPP_HAS_NO_THREADS)
+ endif()
+ 
+ if (LIBCXXABI_HAS_EXTERNAL_THREAD_API)
diff --git a/pkgs/development/compilers/llvm/10/libcxxabi-wasm.patch b/pkgs/development/compilers/llvm/10/libcxxabi-wasm.patch
new file mode 100644
index 000000000000..4ebfe46aa813
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/libcxxabi-wasm.patch
@@ -0,0 +1,16 @@
+diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake
+index 15497d405e0..33f7f18193a 100644
+--- a/cmake/modules/HandleLLVMOptions.cmake
++++ b/cmake/modules/HandleLLVMOptions.cmake
+@@ -127,7 +127,10 @@ else(WIN32)
+       set(LLVM_HAVE_LINK_VERSION_SCRIPT 1)
+     endif()
+   else(FUCHSIA OR UNIX)
+-    MESSAGE(SEND_ERROR "Unable to determine platform")
++    if(${CMAKE_SYSTEM_NAME} MATCHES "Wasi")
++    else()
++      MESSAGE(SEND_ERROR "Unable to determine platform")
++    endif()
+   endif(FUCHSIA OR UNIX)
+ endif(WIN32)
+ 
diff --git a/pkgs/development/compilers/llvm/10/libunwind.nix b/pkgs/development/compilers/llvm/10/libunwind.nix
new file mode 100644
index 000000000000..7a8fb13dad27
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/libunwind.nix
@@ -0,0 +1,14 @@
+{ stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }:
+
+stdenv.mkDerivation rec {
+  pname = "libunwind";
+  inherit version;
+
+  src = fetch pname "0194s3qqqz4qcrzdfy7c931sm3d9hnjk624gldja85mwz1v1x9a8";
+
+  nativeBuildInputs = [ cmake ];
+
+  enableParallelBuilding = true;
+
+  cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF";
+}
diff --git a/pkgs/development/compilers/llvm/10/lld.nix b/pkgs/development/compilers/llvm/10/lld.nix
new file mode 100644
index 000000000000..cea5ab3ee06e
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/lld.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, fetch
+, cmake
+, libxml2
+, llvm
+, version
+}:
+
+stdenv.mkDerivation rec {
+  pname = "lld";
+  inherit version;
+
+  src = fetch pname "0z0a1h94hx0wj5289gvp99bvvj2ghid94xj2c5acmh1df8cx1vna";
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ llvm libxml2 ];
+
+  outputs = [ "out" "dev" ];
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    moveToOutput include "$dev"
+    moveToOutput lib "$dev"
+  '';
+
+  meta = {
+    description = "The LLVM Linker";
+    homepage    = http://lld.llvm.org/;
+    license     = stdenv.lib.licenses.ncsa;
+    platforms   = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/10/lldb-procfs.patch b/pkgs/development/compilers/llvm/10/lldb-procfs.patch
new file mode 100644
index 000000000000..b075dbaeee0a
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/lldb-procfs.patch
@@ -0,0 +1,31 @@
+--- a/source/Plugins/Process/Linux/Procfs.h
++++ b/source/Plugins/Process/Linux/Procfs.h
+@@ -11,21 +11,12 @@
+ // sys/procfs.h on Android/Linux for all supported architectures.
+ 
+ #include <sys/ptrace.h>
++#include <asm/ptrace.h>
+ 
+-#ifdef __ANDROID__
+-#if defined(__arm64__) || defined(__aarch64__)
+-typedef unsigned long elf_greg_t;
+-typedef elf_greg_t
+-    elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))];
+-typedef struct user_fpsimd_state elf_fpregset_t;
+-#ifndef NT_FPREGSET
+-#define NT_FPREGSET NT_PRFPREG
+-#endif // NT_FPREGSET
+-#elif defined(__mips__)
+-#ifndef NT_FPREGSET
+-#define NT_FPREGSET NT_PRFPREG
+-#endif // NT_FPREGSET
+-#endif
+-#else // __ANDROID__
++#if !defined(__GLIBC__) && defined(__powerpc__)
++#define pt_regs musl_pt_regs
++#include <sys/procfs.h>
++#undef pt_regs
++#else
+ #include <sys/procfs.h>
+-#endif // __ANDROID__
++#endif
diff --git a/pkgs/development/compilers/llvm/10/lldb.nix b/pkgs/development/compilers/llvm/10/lldb.nix
new file mode 100644
index 000000000000..63df2d08454a
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/lldb.nix
@@ -0,0 +1,101 @@
+{ stdenv
+, fetch
+, cmake
+, zlib
+, ncurses
+, swig
+, which
+, libedit
+, libxml2
+, llvm
+, clang-unwrapped
+, python3
+, version
+, darwin
+, lit
+, enableManpages ? false
+}:
+
+stdenv.mkDerivation (rec {
+  pname = "lldb";
+  inherit version;
+
+  src = fetch pname "0nh26a4mxd54k5f9gpizr55vdalkzym2l82kvfh3lm8lvimypga1";
+
+  patches = [ ./lldb-procfs.patch ];
+
+  nativeBuildInputs = [ cmake python3 which swig lit ]
+    ++ stdenv.lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ];
+
+  buildInputs = [
+    ncurses
+    zlib
+    libedit
+    libxml2
+    llvm
+  ]
+  ++ stdenv.lib.optionals stdenv.isDarwin [
+    darwin.libobjc
+    darwin.apple_sdk.libs.xpc
+    darwin.apple_sdk.frameworks.Foundation
+    darwin.bootstrap_cmds
+    darwin.apple_sdk.frameworks.Carbon
+    darwin.apple_sdk.frameworks.Cocoa
+  ];
+
+  CXXFLAGS = "-fno-rtti";
+  hardeningDisable = [ "format" ];
+
+  cmakeFlags = [
+    "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
+    "-DClang_DIR=${clang-unwrapped}/lib/cmake"
+    "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit"
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON"
+  ] ++ stdenv.lib.optionals enableManpages [
+    "-DLLVM_ENABLE_SPHINX=ON"
+    "-DSPHINX_OUTPUT_MAN=ON"
+    "-DSPHINX_OUTPUT_HTML=OFF"
+  ]
+;
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    # Editor support
+    # vscode:
+    install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json
+    mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
+    ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A next-generation high-performance debugger";
+    homepage = http://lldb.llvm.org;
+    license = licenses.ncsa;
+    platforms = platforms.all;
+  };
+} // stdenv.lib.optionalAttrs enableManpages {
+  pname = "lldb-manpages";
+
+  buildPhase = ''
+    make docs-lldb-man
+  '';
+
+  propagatedBuildInputs = [];
+
+  installPhase = ''
+    # manually install lldb man page
+    mkdir -p $out/share/man/man1
+    install docs/man/lldb.1 -t $out/share/man/man1/
+  '';
+
+  postPatch = null;
+  postInstall = null;
+
+  outputs = [ "out" ];
+
+  doCheck = false;
+
+  meta.description = "man pages for LLDB ${version}";
+})
diff --git a/pkgs/development/compilers/llvm/10/llvm-outputs.patch b/pkgs/development/compilers/llvm/10/llvm-outputs.patch
new file mode 100644
index 000000000000..40096fa3497f
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/llvm-outputs.patch
@@ -0,0 +1,26 @@
+diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
+index 94d426b..37f7794 100644
+--- a/tools/llvm-config/llvm-config.cpp
++++ b/tools/llvm-config/llvm-config.cpp
+@@ -333,6 +333,21 @@ int main(int argc, char **argv) {
+     ActiveIncludeOption = "-I" + ActiveIncludeDir;
+   }
+ 
++  /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared
++  if (!IsInDevelopmentTree) {
++    bool WantShared = true;
++    for (int i = 1; i < argc; ++i) {
++      StringRef Arg = argv[i];
++      if (Arg == "--link-shared")
++        WantShared = true;
++      else if (Arg == "--link-static")
++        WantShared = false; // the last one wins
++    }
++
++    if (WantShared)
++      ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
++  }
++
+   /// We only use `shared library` mode in cases where the static library form
+   /// of the components provided are not available; note however that this is
+   /// skipped if we're run from within the build dir. However, once installed,
diff --git a/pkgs/development/compilers/llvm/10/llvm.nix b/pkgs/development/compilers/llvm/10/llvm.nix
new file mode 100644
index 000000000000..4496b5abcf45
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/llvm.nix
@@ -0,0 +1,185 @@
+{ stdenv
+, fetch
+, cmake
+, python3
+, libffi
+, libbfd
+, libpfm
+, libxml2
+, ncurses
+, version
+, release_version
+, zlib
+, buildPackages
+, debugVersion ? false
+, enableManpages ? false
+, enableSharedLibraries ? true
+, enablePFM ? !(stdenv.isDarwin
+  || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245
+)
+, enablePolly ? false
+}:
+
+let
+  inherit (stdenv.lib) optional optionals optionalString;
+
+  # Used when creating a version-suffixed symlink of libLLVM.dylib
+  shortVersion = with stdenv.lib;
+    concatStringsSep "." (take 1 (splitString "." release_version));
+
+in stdenv.mkDerivation (rec {
+  pname = "llvm";
+  inherit version;
+
+  src = fetch pname "01azqqygm83s6l1g35kqkc7da06dkc8jxpb4zsd420lmhfhw4gws";
+  polly_src = fetch "polly" "00nvnh0jhi1s5gcyfnb30h9g2j18z79kipiy878bkawg53f4z2xf";
+
+  unpackPhase = ''
+    unpackFile $src
+    mv llvm-${version}* llvm
+    sourceRoot=$PWD/llvm
+  '' + optionalString enablePolly ''
+    unpackFile $polly_src
+    mv polly-* $sourceRoot/tools/polly
+  '';
+
+  outputs = [ "out" "python" ]
+    ++ optional enableSharedLibraries "lib";
+
+  nativeBuildInputs = [ cmake python3 ]
+    ++ optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ];
+
+  buildInputs = [ libxml2 libffi ]
+    ++ optional enablePFM libpfm; # exegesis
+
+  propagatedBuildInputs = [ ncurses zlib ];
+
+  postPatch = optionalString stdenv.isDarwin ''
+    substituteInPlace cmake/modules/AddLLVM.cmake \
+      --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \
+      --replace 'set(_install_rpath "@loader_path/../lib''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' ""
+  ''
+  # Patch llvm-config to return correct library path based on --link-{shared,static}.
+  + optionalString (enableSharedLibraries) ''
+    substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib
+    patch -p1 < ./llvm-outputs.patch
+  '' + ''
+    # FileSystem permissions tests fail with various special bits
+    substituteInPlace unittests/Support/CMakeLists.txt \
+      --replace "Path.cpp" ""
+    rm unittests/Support/Path.cpp
+  '' + optionalString stdenv.hostPlatform.isMusl ''
+    patch -p1 -i ${../TLI-musl.patch}
+    substituteInPlace unittests/Support/CMakeLists.txt \
+      --replace "add_subdirectory(DynamicLibrary)" ""
+    rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
+    # valgrind unhappy with musl or glibc, but fails w/musl only
+    rm test/CodeGen/AArch64/wineh4.mir
+  '' + optionalString stdenv.hostPlatform.isAarch32 ''
+    # skip failing X86 test cases on 32-bit ARM
+    rm test/DebugInfo/X86/convert-debugloc.ll
+    rm test/DebugInfo/X86/convert-inlined.ll
+    rm test/DebugInfo/X86/convert-linked.ll
+    rm test/tools/dsymutil/X86/op-convert.test
+  '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") ''
+    # Seems to require certain floating point hardware (NEON?)
+    rm test/ExecutionEngine/frem.ll
+  '' + ''
+    patchShebangs test/BugPoint/compile-custom.ll.py
+  '';
+
+  # hacky fix: created binaries need to be run before installation
+  preBuild = ''
+    mkdir -p $out/
+    ln -sv $PWD/lib $out
+  '';
+
+  cmakeFlags = with stdenv; [
+    "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}"
+    "-DLLVM_INSTALL_UTILS=ON"  # Needed by rustc
+    "-DLLVM_BUILD_TESTS=ON"
+    "-DLLVM_ENABLE_FFI=ON"
+    "-DLLVM_ENABLE_RTTI=ON"
+    "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
+    "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
+    "-DLLVM_ENABLE_DUMP=ON"
+  ] ++ optionals enableSharedLibraries [
+    "-DLLVM_LINK_LLVM_DYLIB=ON"
+  ] ++ optionals enableManpages [
+    "-DLLVM_BUILD_DOCS=ON"
+    "-DLLVM_ENABLE_SPHINX=ON"
+    "-DSPHINX_OUTPUT_MAN=ON"
+    "-DSPHINX_OUTPUT_HTML=OFF"
+    "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
+  ] ++ optionals (!isDarwin) [
+    "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
+  ] ++ optionals isDarwin [
+    "-DLLVM_ENABLE_LIBCXX=ON"
+    "-DCAN_TARGET_i386=false"
+  ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "-DCMAKE_CROSSCOMPILING=True"
+    "-DLLVM_TABLEGEN=${buildPackages.llvm_10}/bin/llvm-tblgen"
+  ];
+
+  postBuild = ''
+    rm -fR $out
+  '';
+
+  preCheck = ''
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib
+  '';
+
+  postInstall = ''
+    mkdir -p $python/share
+    mv $out/share/opt-viewer $python/share/opt-viewer
+  ''
+  + optionalString enableSharedLibraries ''
+    moveToOutput "lib/libLLVM-*" "$lib"
+    moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib"
+  ''
+  + optionalString (enableSharedLibraries && (!stdenv.isDarwin)) ''
+    substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
+      --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-"
+  ''
+  + optionalString (stdenv.isDarwin && enableSharedLibraries) ''
+    substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
+      --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
+    ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
+    ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
+  '';
+
+  doCheck = stdenv.isLinux && (!stdenv.isx86_32);
+
+  checkTarget = "check-all";
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Collection of modular and reusable compiler and toolchain technologies";
+    homepage    = http://llvm.org/;
+    license     = stdenv.lib.licenses.ncsa;
+    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
+    platforms   = stdenv.lib.platforms.all;
+  };
+} // stdenv.lib.optionalAttrs enableManpages {
+  pname = "llvm-manpages";
+
+  buildPhase = ''
+    make docs-llvm-man
+  '';
+
+  propagatedBuildInputs = [];
+
+  installPhase = ''
+    make -C docs install
+  '';
+
+  postPatch = null;
+  postInstall = null;
+
+  outputs = [ "out" ];
+
+  doCheck = false;
+
+  meta.description = "man pages for LLVM ${version}";
+})
diff --git a/pkgs/development/compilers/llvm/10/openmp.nix b/pkgs/development/compilers/llvm/10/openmp.nix
new file mode 100644
index 000000000000..ff6d77c1bf64
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/openmp.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, fetch
+, cmake
+, llvm
+, perl
+, version
+}:
+
+stdenv.mkDerivation rec {
+  pname = "openmp";
+  inherit version;
+
+  src = fetch pname "1fpvpsbrrpngm8zplhdbkhnk79mhfdf3xsw1rwcfcv564gilla3w";
+
+  nativeBuildInputs = [ cmake perl ];
+  buildInputs = [ llvm ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Components required to build an executable OpenMP program";
+    homepage    = http://openmp.llvm.org/;
+    license     = stdenv.lib.licenses.mit;
+    platforms   = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/10/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/10/sanitizers-nongnu.patch
new file mode 100644
index 000000000000..1f2ac97818eb
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/sanitizers-nongnu.patch
@@ -0,0 +1,412 @@
+From f7a253f8f85d0f49df6b73996737a3e84ac64236 Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Mon, 24 Sep 2018 11:17:25 -0500
+Subject: [PATCH] Ported to 7.0, taken from gentoo-musl project.
+
+------
+Ported to compiler-rt-sanitizers-5.0.0. Taken from
+
+https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch
+Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
+
+Taken from gentoo-musl project, with a few additional minor fixes.
+---
+ lib/asan/asan_linux.cc                        |  4 +-
+ lib/interception/interception_linux.cc        |  2 +-
+ lib/interception/interception_linux.h         |  2 +-
+ lib/msan/msan_linux.cc                        |  2 +-
+ lib/sanitizer_common/sanitizer_allocator.cc   |  2 +-
+ .../sanitizer_common_interceptors_ioctl.inc   |  4 +-
+ .../sanitizer_common_syscalls.inc             |  2 +-
+ lib/sanitizer_common/sanitizer_linux.cc       |  8 +++-
+ .../sanitizer_linux_libcdep.cc                | 10 ++---
+ lib/sanitizer_common/sanitizer_platform.h     |  6 +++
+ .../sanitizer_platform_interceptors.h         |  4 +-
+ .../sanitizer_platform_limits_posix.cc        | 37 +++++++++++--------
+ lib/tsan/rtl/tsan_platform_linux.cc           |  2 +-
+ 13 files changed, 51 insertions(+), 34 deletions(-)
+
+diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc
+index 625f32d40..73cf77aca 100644
+--- a/lib/asan/asan_linux.cc
++++ b/lib/asan/asan_linux.cc
+@@ -46,7 +46,7 @@
+ #include <link.h>
+ #endif
+ 
+-#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS
++#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
+ #include <ucontext.h>
+ extern "C" void* _DYNAMIC;
+ #elif SANITIZER_NETBSD
+@@ -139,7 +139,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) {
+   UNIMPLEMENTED();
+ }
+ 
+-#if SANITIZER_ANDROID
++#if SANITIZER_ANDROID || SANITIZER_NONGNU
+ // FIXME: should we do anything for Android?
+ void AsanCheckDynamicRTPrereqs() {}
+ void AsanCheckIncompatibleRT() {}
+diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc
+index 26bfcd8f6..529b234f7 100644
+--- a/lib/interception/interception_linux.cc
++++ b/lib/interception/interception_linux.cc
+@@ -43,7 +43,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr,
+ }
+ 
+ // Android and Solaris do not have dlvsym
+-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
+ void *GetFuncAddrVer(const char *func_name, const char *ver) {
+   return dlvsym(RTLD_NEXT, func_name, ver);
+ }
+diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h
+index 942c25609..24a4d5080 100644
+--- a/lib/interception/interception_linux.h
++++ b/lib/interception/interception_linux.h
+@@ -36,7 +36,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver);
+       (::__interception::uptr) & WRAP(func))
+ 
+ // Android,  Solaris and OpenBSD do not have dlvsym
+-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD
++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
+ #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \
+   (::__interception::real_##func = (func##_f)(                \
+        unsigned long)::__interception::GetFuncAddrVer(#func, symver))
+diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
+index 385a650c4..6e30a8ce9 100644
+--- a/lib/msan/msan_linux.cc
++++ b/lib/msan/msan_linux.cc
+@@ -13,7 +13,7 @@
+ //===----------------------------------------------------------------------===//
+ 
+ #include "sanitizer_common/sanitizer_platform.h"
+-#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD
++#if SANITIZER_FREEBSD || (SANITIZER_LINUX && !SANITIZER_NONGNU) || SANITIZER_NETBSD
+ 
+ #include "msan.h"
+ #include "msan_report.h"
+diff --git a/lib/sanitizer_common/sanitizer_allocator.cc b/lib/sanitizer_common/sanitizer_allocator.cc
+index 6bfd5e5ee..048f6154f 100644
+--- a/lib/sanitizer_common/sanitizer_allocator.cc
++++ b/lib/sanitizer_common/sanitizer_allocator.cc
+@@ -27,7 +27,7 @@ const char *SecondaryAllocatorName = "LargeMmapAllocator";
+ 
+ // ThreadSanitizer for Go uses libc malloc/free.
+ #if SANITIZER_GO || defined(SANITIZER_USE_MALLOC)
+-# if SANITIZER_LINUX && !SANITIZER_ANDROID
++# if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ extern "C" void *__libc_malloc(uptr size);
+ #  if !SANITIZER_GO
+ extern "C" void *__libc_memalign(uptr alignment, uptr size);
+diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+index 2d633c173..b6eb23116 100644
+--- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
++++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+@@ -104,7 +104,7 @@ static void ioctl_table_fill() {
+   _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz);
+ #endif
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+   // Conflicting request ids.
+   // _(CDROMAUDIOBUFSIZ, NONE, 0);
+   // _(SNDCTL_TMR_CONTINUE, NONE, 0);
+@@ -365,7 +365,7 @@ static void ioctl_table_fill() {
+   _(VT_WAITACTIVE, NONE, 0);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
+   _(CYGETDEFTHRESH, WRITE, sizeof(int));
+   _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
+diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc
+index 469c8eb7e..24f87867d 100644
+--- a/lib/sanitizer_common/sanitizer_common_syscalls.inc
++++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc
+@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) {
+   }
+ }
+ 
+-#if !SANITIZER_ANDROID
++#if !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim,
+                        void *old_rlim) {
+   if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz);
+diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc
+index 96d6c1eff..9e2b7fb9d 100644
+--- a/lib/sanitizer_common/sanitizer_linux.cc
++++ b/lib/sanitizer_common/sanitizer_linux.cc
+@@ -541,13 +541,13 @@ const char *GetEnv(const char *name) {
+ #endif
+ }
+ 
+-#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD
++#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_NONGNU
+ extern "C" {
+ SANITIZER_WEAK_ATTRIBUTE extern void *__libc_stack_end;
+ }
+ #endif
+ 
+-#if !SANITIZER_GO && !SANITIZER_FREEBSD && !SANITIZER_NETBSD &&                \
++#if (!SANITIZER_GO || SANITIZER_NONGNU) && !SANITIZER_FREEBSD && !SANITIZER_NETBSD &&                \
+     !SANITIZER_OPENBSD
+ static void ReadNullSepFileToArray(const char *path, char ***arr,
+                                    int arr_size) {
+@@ -590,6 +590,10 @@ static void GetArgsAndEnv(char ***argv, char ***envp) {
+ #elif SANITIZER_NETBSD
+   *argv = __ps_strings->ps_argvstr;
+   *envp = __ps_strings->ps_envstr;
++#elif SANITIZER_NONGNU
++    static const int kMaxArgv = 2000, kMaxEnvp = 2000;
++    ReadNullSepFileToArray("/proc/self/cmdline", argv, kMaxArgv);
++    ReadNullSepFileToArray("/proc/self/environ", envp, kMaxEnvp);
+ #else // SANITIZER_FREEBSD
+ #if !SANITIZER_GO
+   if (&__libc_stack_end) {
+diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+index 4962ff832..438f94dbe 100644
+--- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc
++++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+@@ -179,7 +179,7 @@ __attribute__((unused)) static bool GetLibcVersion(int *major, int *minor,
+ }
+ 
+ #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO &&               \
+-    !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS
++    !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS && !SANITIZER_NONGNU
+ static uptr g_tls_size;
+ 
+ #ifdef __i386__
+@@ -261,7 +261,7 @@ void InitTlsSize() { }
+ #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) ||          \
+      defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) ||    \
+      defined(__arm__)) &&                                                      \
+-    SANITIZER_LINUX && !SANITIZER_ANDROID
++    SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ // sizeof(struct pthread) from glibc.
+ static atomic_uintptr_t thread_descriptor_size;
+ 
+@@ -426,7 +426,7 @@ int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) {
+ 
+ #if !SANITIZER_GO
+ static void GetTls(uptr *addr, uptr *size) {
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ # if defined(__x86_64__) || defined(__i386__) || defined(__s390__)
+   *addr = ThreadSelf();
+   *size = GetTlsSize();
+@@ -470,7 +470,7 @@ static void GetTls(uptr *addr, uptr *size) {
+ #elif SANITIZER_OPENBSD
+   *addr = 0;
+   *size = 0;
+-#elif SANITIZER_ANDROID
++#elif SANITIZER_ANDROID || SANITIZER_NONGNU
+   *addr = 0;
+   *size = 0;
+ #elif SANITIZER_SOLARIS
+@@ -486,7 +486,7 @@ static void GetTls(uptr *addr, uptr *size) {
+ #if !SANITIZER_GO
+ uptr GetTlsSize() {
+ #if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD ||              \
+-    SANITIZER_OPENBSD || SANITIZER_SOLARIS
++    SANITIZER_OPENBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU
+   uptr addr, size;
+   GetTls(&addr, &size);
+   return size;
+diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h
+index d81e25580..e10680ac8 100644
+--- a/lib/sanitizer_common/sanitizer_platform.h
++++ b/lib/sanitizer_common/sanitizer_platform.h
+@@ -208,6 +208,12 @@
+ # define SANITIZER_SOLARIS32 0
+ #endif
+ 
++#if defined(__linux__) && !defined(__GLIBC__)
++# define SANITIZER_NONGNU 1
++#else
++# define SANITIZER_NONGNU 0
++#endif
++
+ #if defined(__myriad2__)
+ # define SANITIZER_MYRIAD2 1
+ #else
+diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h
+index f95539a73..6c53b3415 100644
+--- a/lib/sanitizer_common/sanitizer_platform_interceptors.h
++++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h
+@@ -39,7 +39,7 @@
+ # include "sanitizer_platform_limits_solaris.h"
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ # define SI_LINUX_NOT_ANDROID 1
+ #else
+ # define SI_LINUX_NOT_ANDROID 0
+@@ -322,7 +322,7 @@
+ #define SANITIZER_INTERCEPT_ETHER_R (SI_FREEBSD || SI_LINUX_NOT_ANDROID)
+ #define SANITIZER_INTERCEPT_SHMCTL          \
+   (SI_NETBSD || SI_OPENBSD || SI_SOLARIS || \
+-  ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && \
++  ((SI_FREEBSD || SI_LINUX_NOT_ANDROID || SANITIZER_NONGNU) && \
+     SANITIZER_WORDSIZE == 64))  // NOLINT
+ #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX
+diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+index 54da635d7..2f6ff69c3 100644
+--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -14,6 +14,9 @@
+ 
+ #include "sanitizer_platform.h"
+ 
++// Workaround musl <--> linux conflicting definition of 'struct sysinfo'
++#define _LINUX_SYSINFO_H
++
+ #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC
+ // Tests in this file assume that off_t-dependent data structures match the
+ // libc ABI. For example, struct dirent here is what readdir() function (as
+@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t;
+ 
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+ #include <glob.h>
+-#include <obstack.h>
++#  if !SANITIZER_NONGNU
++#    include <obstack.h>
++#  endif
+ #include <mqueue.h>
+-#include <net/if_ppp.h>
+-#include <netax25/ax25.h>
+-#include <netipx/ipx.h>
+-#include <netrom/netrom.h>
++#include <linux/if_ppp.h>
++#include <linux/ax25.h>
++#include <linux/ipx.h>
++#include <linux/netrom.h>
+ #if HAVE_RPC_XDR_H
+ # include <rpc/xdr.h>
+ #elif HAVE_TIRPC_RPC_XDR_H
+@@ -251,7 +256,7 @@ namespace __sanitizer {
+   unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which
+   // has been removed from glibc 2.28.
+ #if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
+@@ -322,7 +327,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr));
+ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+ #endif
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   int glob_nomatch = GLOB_NOMATCH;
+   int glob_altdirfunc = GLOB_ALTDIRFUNC;
+ #endif
+@@ -416,7 +421,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned struct_termios_sz = sizeof(struct termios);
+   unsigned struct_winsize_sz = sizeof(struct winsize);
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+   unsigned struct_arpreq_sz = sizeof(struct arpreq);
+   unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf);
+   unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession);
+@@ -466,7 +471,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned struct_vt_mode_sz = sizeof(struct vt_mode);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
+   unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
+ #if EV_VERSION > (0x010000)
+@@ -834,7 +839,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
+   unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE;
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
+   unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
+   unsigned IOCTL_CYGETMON = CYGETMON;
+@@ -989,7 +994,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr);
+ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum);
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(glob_t);
+ CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc);
+ CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv);
+@@ -1023,6 +1028,7 @@ CHECK_TYPE_SIZE(iovec);
+ CHECK_SIZE_AND_OFFSET(iovec, iov_base);
+ CHECK_SIZE_AND_OFFSET(iovec, iov_len);
+ 
++#if !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(msghdr);
+ CHECK_SIZE_AND_OFFSET(msghdr, msg_name);
+ CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen);
+@@ -1036,6 +1042,7 @@ CHECK_TYPE_SIZE(cmsghdr);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level);
+ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);
++#endif
+ 
+ #ifndef __GLIBC_PREREQ
+ #define __GLIBC_PREREQ(x, y) 0
+@@ -1145,7 +1152,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
+ 
+ CHECK_TYPE_SIZE(ether_addr);
+ 
+-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ CHECK_TYPE_SIZE(ipc_perm);
+ # if SANITIZER_FREEBSD
+ CHECK_SIZE_AND_OFFSET(ipc_perm, key);
+@@ -1206,7 +1213,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
+ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data);
+ #endif
+ 
+-#if SANITIZER_LINUX
++#if SANITIZER_LINUX && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo));
+ #endif
+ 
+@@ -1256,7 +1263,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE);
+ COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE));
+ CHECK_SIZE_AND_OFFSET(FILE, _flags);
+ CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr);
+@@ -1275,7 +1282,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain);
+ CHECK_SIZE_AND_OFFSET(FILE, _fileno);
+ #endif
+ 
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+ COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk));
+ CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit);
+ CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev);
+diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc
+index de989b780..51a97b554 100644
+--- a/lib/tsan/rtl/tsan_platform_linux.cc
++++ b/lib/tsan/rtl/tsan_platform_linux.cc
+@@ -294,7 +294,7 @@ void InitializePlatform() {
+ // This is required to properly "close" the fds, because we do not see internal
+ // closes within glibc. The code is a pure hack.
+ int ExtractResolvFDs(void *state, int *fds, int nfd) {
+-#if SANITIZER_LINUX && !SANITIZER_ANDROID
++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU
+   int cnt = 0;
+   struct __res_state *statp = (struct __res_state*)state;
+   for (int i = 0; i < MAXNS && cnt < nfd; i++) {
+-- 
+2.19.0
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97ef392bce27..57873c619d72 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7895,6 +7895,7 @@ in
   llvm-polly = llvmPackages_latest.llvm-polly;
   clang-polly = llvmPackages_latest.clang.override { cc = llvmPackages_latest.clang-polly-unwrapped; };
 
+  clang_10 = llvmPackages_10.clang;
   clang_9  = llvmPackages_9.clang;
   clang_8  = llvmPackages_8.clang;
   clang_7  = llvmPackages_7.clang;
@@ -8589,6 +8590,7 @@ in
   lld_7 = llvmPackages_7.lld;
   lld_8 = llvmPackages_8.lld;
   lld_9 = llvmPackages_9.lld;
+  lld_10 = llvmPackages_10.lld;
 
   lldb = llvmPackages.lldb;
   lldb_5 = llvmPackages_5.lldb;
@@ -8596,10 +8598,12 @@ in
   lldb_7 = llvmPackages_7.lldb;
   lldb_8 = llvmPackages_8.lldb;
   lldb_9 = llvmPackages_9.lldb;
+  lldb_10 = llvmPackages_10.lldb;
 
   llvm = llvmPackages.llvm;
   llvm-manpages = llvmPackages.llvm-manpages;
 
+  llvm_10 = llvmPackages_10.llvm;
   llvm_9  = llvmPackages_9.llvm;
   llvm_8  = llvmPackages_8.llvm;
   llvm_7  = llvmPackages_7.llvm;
@@ -8650,7 +8654,15 @@ in
     stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
   });
 
-  llvmPackages_latest = llvmPackages_9;
+  llvmPackages_10 = callPackage ../development/compilers/llvm/10 ({
+    inherit (stdenvAdapters) overrideCC;
+    buildLlvmTools = buildPackages.llvmPackages_10.tools;
+    targetLlvmLibraries = targetPackages.llvmPackages_10.libraries;
+  } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) {
+    stdenv = gcc7Stdenv;
+  });
+
+  llvmPackages_latest = llvmPackages_9; # llvmPackages_10: when out of RC
 
   lorri = callPackage ../tools/misc/lorri {
     inherit (darwin.apple_sdk.frameworks) CoreServices Security;

From efa25157e92af69d8871ecd1c3e7abeb4a2877c3 Mon Sep 17 00:00:00 2001
From: Klaas van Schelven <klaas@vanschelven.com>
Date: Tue, 25 Feb 2020 14:11:41 +0100
Subject: [PATCH 1505/4636] pythonPackages.swagger-spec-validator 2.4.3 ->
 2.5.0

Includes various upstream fixes of the tests, see

* https://github.com/Yelp/swagger_spec_validator/pull/117
* https://github.com/Yelp/swagger_spec_validator/pull/121
---
 .../python-modules/swagger-spec-validator/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/swagger-spec-validator/default.nix b/pkgs/development/python-modules/swagger-spec-validator/default.nix
index 3c83aa643f5d..bdb78096aef2 100644
--- a/pkgs/development/python-modules/swagger-spec-validator/default.nix
+++ b/pkgs/development/python-modules/swagger-spec-validator/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "swagger-spec-validator";
-  version = "2.4.3";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "Yelp";
     repo = "swagger_spec_validator";
     rev = "v" + version;
-    sha256 = "02f8amc6iq2clxxmrz8hirbb57sizaxijp0higqy16shk63ibalw";
+    sha256 = "0qlkiyncdh7cdyjvnwjpv9i7y75ghwnpyqkkpfaa8hg698na13pw";
   };
 
   checkInputs = [

From 58dac371d5edcf52786333dad6d9391bb8ff4c58 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 25 Feb 2020 08:32:00 -0500
Subject: [PATCH 1506/4636] tflint: 0.14.0 -> 0.15.0

Changelog: https://github.com/terraform-linters/tflint/releases/tag/v0.15.0
---
 pkgs/development/tools/analysis/tflint/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix
index 05237d0080c3..c98eba0abe63 100644
--- a/pkgs/development/tools/analysis/tflint/default.nix
+++ b/pkgs/development/tools/analysis/tflint/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "tflint";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0awb8mjdqdwg4g6lpl6g4vavkhy1hby6gsv6mqsycm1a6z1n7q4k";
+    sha256 = "0j1bx2180z6znfrg8k4sjwvm3cbvnklqjxdssbr2yd47h8kfwk3g";
   };
 
-  modSha256 = "0ihfrlpi45q4acwfqxkk5ha8x76qk0z4ly3ipdck3a525mfdmk23";
+  modSha256 = "1qa7qfxpc43n9xyyfcd24d17g4fdcffkd57ny078ja219x13kay3";
 
   subPackages = [ "." ];
 

From c1e376e4f906539d6e580d73f092f75c964f1463 Mon Sep 17 00:00:00 2001
From: Nick Braga <nick.braga@bookbub.com>
Date: Tue, 25 Feb 2020 10:05:34 -0500
Subject: [PATCH 1507/4636] elasticsearchPlugins: add analysis-icu plugin

---
 pkgs/servers/search/elasticsearch/plugins.nix | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix
index cdab1fce7b0d..ad3654f17dfb 100644
--- a/pkgs/servers/search/elasticsearch/plugins.nix
+++ b/pkgs/servers/search/elasticsearch/plugins.nix
@@ -18,6 +18,9 @@ let
       inherit installPhase;
       pname = "elasticsearch-${pluginName}";
       dontUnpack = true;
+      # Work around the "unpacker appears to have produced no directories"
+      # case that happens when the archive doesn't have a subdirectory.
+      setSourceRoot = "sourceRoot=$(pwd)";
       buildInputs = [ unzip ];
       meta = a.meta // {
         platforms = elasticsearch.meta.platforms;
@@ -26,6 +29,24 @@ let
     });
 in {
 
+  analysis-icu = esPlugin rec {
+    name = "elasticsearch-analysis-icu-${version}";
+    pluginName = "analysis-icu";
+    version = esVersion;
+    src = fetchurl {
+      url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip";
+      sha256 =
+        if version == "7.5.1" then "0v6ynbk34g7pl9cwy8ga8bk1my18jb6pc3pqbjl8p93w38219vi6"
+        else if version == "6.8.3" then "0vbaqyj0lfy3ijl1c9h92b0nh605h5mjs57bk2zhycdvbw5sx2lv"
+        else throw "unsupported version ${version} for plugin ${pluginName}";
+    };
+    meta = with stdenv.lib; {
+      homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/analysis-icu;
+      description = "The ICU Analysis plugin integrates the Lucene ICU module into elasticsearch";
+      license = licenses.asl20;
+    };
+  };
+
   analysis-lemmagen = esPlugin rec {
     pluginName = "analysis-lemmagen";
     version = esVersion;

From 1a73b69e2067a3b3daf0fc7a9d9479e8a5f16b2f Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Wed, 26 Feb 2020 00:31:53 +0900
Subject: [PATCH 1508/4636] liblinear: use absolute install name on Darwin
 (#81015)

nixpkgs prefers absolute install names. Replace the manually specified
relative install name with the standard hook.
---
 pkgs/development/libraries/liblinear/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix
index 7b70510dec3c..a306eb2ed68f 100644
--- a/pkgs/development/libraries/liblinear/default.nix
+++ b/pkgs/development/libraries/liblinear/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
   pname = "liblinear";
@@ -14,14 +14,11 @@ stdenv.mkDerivation rec {
     make lib
   '';
 
-  installPhase = let
-    libSuff = stdenv.hostPlatform.extensions.sharedLibrary;
-  in ''
+  installPhase = ''
     mkdir -p $out/lib $out/bin $out/include
     ${if stdenv.isDarwin then ''
       cp liblinear.so.3 $out/lib/liblinear.3.dylib
       ln -s $out/lib/liblinear.3.dylib $out/lib/liblinear.dylib
-      install_name_tool -id liblinear.3.dylib $out/lib/liblinear.3.dylib
     '' else ''
       cp liblinear.so.3 $out/lib/liblinear.so.3
       ln -s $out/lib/liblinear.so.3 $out/lib/liblinear.so
@@ -31,6 +28,8 @@ stdenv.mkDerivation rec {
     cp linear.h $out/include
   '';
 
+  nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ];
+
   meta = with stdenv.lib; {
     description = "A library for large linear classification";
     homepage = https://www.csie.ntu.edu.tw/~cjlin/liblinear/;

From ee3226bc656a1afa03a91e52c266e9e9a055dc50 Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Tue, 21 Jan 2020 13:06:50 -0500
Subject: [PATCH 1509/4636] pythonPackages.fastdtw: init at 0.3.4

Fast implementation of Dynamic Time Warping algorithm.

Dependency for qiskit-aqua.
---
 .../python-modules/fastdtw/default.nix        | 65 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 67 insertions(+)
 create mode 100644 pkgs/development/python-modules/fastdtw/default.nix

diff --git a/pkgs/development/python-modules/fastdtw/default.nix b/pkgs/development/python-modules/fastdtw/default.nix
new file mode 100644
index 000000000000..cb75a599d03a
--- /dev/null
+++ b/pkgs/development/python-modules/fastdtw/default.nix
@@ -0,0 +1,65 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, fetchpatch
+, cython
+, numpy
+  # Check Inputs
+, pytestCheckHook
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "fastdtw";
+  version = "0.3.4";
+
+  src = fetchFromGitHub {
+    owner = "slaypni";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0irc5x4ahfp7f7q4ic97qa898s2awi0vdjznahxrfjirn8b157dw";
+  };
+
+  patches = [
+    # Removes outdated cythonized C++ file, which doesn't match CPython. Will be auto-used if left.
+    # Remove when PR 40 merged
+    (fetchpatch {
+      url = "https://patch-diff.githubusercontent.com/raw/slaypni/fastdtw/pull/40.patch";
+      sha256 = "0xjma0h84bk1n32wgk99rwfc85scp187a7fykhnylmcc73ppal9q";
+    })
+  ];
+
+  nativeBuildInputs = [
+    cython
+  ];
+
+  propagatedBuildInputs = [
+    numpy
+  ];
+
+  pythonImportsCheck = [ "fastdtw.fastdtw" ];
+  checkInputs = [ pytestCheckHook ];
+  dontUseSetuptoolsCheck = true;  # looks for pytest-runner
+  preCheck = ''
+    echo "Temporarily moving tests to $OUT to find cython modules"
+    export PACKAGEDIR=$out/${python.sitePackages}
+    cp -r $TMP/source/tests $PACKAGEDIR
+    pushd $PACKAGEDIR
+  '';
+  postCheck = ''
+    rm -rf tests
+    popd
+  '';
+
+
+  meta = with lib; {
+    description = "Python implementation of FastDTW (Dynamic Time Warping)";
+    longDescription = ''
+      FastDTW is an approximate Dynamic Time Warping (DTW) algorithm that provides
+      optimal or near-optimal alignments with an O(N) time and memory complexity.
+    '';
+    homepage = "https://github.com/slaypni/fastdtw";
+    license = licenses.mit;
+    maintainers = with maintainers; [ drewrisinger ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3b5e60ae9607..b9a6fc9f448e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2647,6 +2647,8 @@ in {
 
   Fabric = callPackage ../development/python-modules/Fabric { };
 
+  fastdtw = callPackage ../development/python-modules/fastdtw { };
+
   faulthandler = if ! isPy3k
     then callPackage ../development/python-modules/faulthandler {}
     else throw "faulthandler is built into ${python.executable}";

From 49ad19b25770485835eb8886642904babf303772 Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Mon, 20 Jan 2020 18:56:43 -0500
Subject: [PATCH 1510/4636] pythonPackages.qiskit-terra: init at 0.12.0

Qiskit is a quantum information toolkit from IBM. This commit
follows the new Qiskit scheme of breaking from one large package into
smaller packages (terra, aer, etc), and then having a single
meta-package "qiskit" that comprises them.
---
 .../python-modules/qiskit-terra/default.nix   | 119 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |   2 +
 2 files changed, 121 insertions(+)
 create mode 100644 pkgs/development/python-modules/qiskit-terra/default.nix

diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix
new file mode 100644
index 000000000000..4a015e15d5d6
--- /dev/null
+++ b/pkgs/development/python-modules/qiskit-terra/default.nix
@@ -0,0 +1,119 @@
+{ lib
+, pythonOlder
+, buildPythonPackage
+, fetchFromGitHub
+, cython
+, dill
+, jsonschema
+, numpy
+, marshmallow
+, marshmallow-polyfield
+, matplotlib
+, networkx
+, ply
+, psutil
+, scipy
+, sympy
+  # test requirements
+, ddt
+, hypothesis
+, ipywidgets
+, nbformat
+, nbconvert
+, pillow
+, pydot
+, python
+, pygraphviz
+, pylatexenc
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "qiskit-terra";
+  version = "0.12.0";
+
+  disabled = pythonOlder "3.5";
+
+  src = fetchFromGitHub {
+    owner = "Qiskit";
+    repo = pname;
+    rev = version;
+    sha256 = "1yarfziy2w8n1d7zyyxykfs68608j8md4kwfyhbyc6wy483fk9sy";
+  };
+
+  nativeBuildInputs = [ cython ];
+
+  propagatedBuildInputs = [
+    dill
+    jsonschema
+    numpy
+    marshmallow
+    marshmallow-polyfield
+    matplotlib
+    networkx
+    ply
+    psutil
+    scipy
+    sympy
+  ];
+
+
+  # *** Tests ***
+  checkInputs = [
+    ddt
+    hypothesis
+    ipywidgets
+    nbformat
+    nbconvert
+    pillow
+    pydot
+    pygraphviz
+    pylatexenc
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "qiskit"
+    "qiskit.transpiler.passes.routing.cython.stochastic_swap.swap_trial"
+  ];
+
+  dontUseSetuptoolsCheck = true;  # can't find setup.py, so fails. tested by pytest
+
+  disabledTests = [
+    "test_long_name"  # generated circuit images differ for some reason
+    "test_jupyter_jobs_pbars" # needs IBMQ provider package (qiskit-ibmq-provider), circular dependency
+  ];
+
+  pytestFlagsArray = [
+    "--ignore=test/randomized/test_transpiler_equivalence.py" # collection requires qiskit-aer, which would cause circular dependency
+  ];
+
+  # Moves tests to $PACKAGEDIR/test. They can't be run from /build because of finding
+  # cythonized modules and expecting to find some resource files in the test directory.
+  preCheck = ''
+    export PACKAGEDIR=$out/${python.sitePackages}
+    echo "Moving Qiskit test files to package directory"
+    cp -r $TMP/source/test $PACKAGEDIR
+    cp -r $TMP/source/examples $PACKAGEDIR
+    cp -r $TMP/source/qiskit/schemas/examples $PACKAGEDIR/qiskit/schemas/
+
+    # run pytest from Nix's $out path
+    pushd $PACKAGEDIR
+  '';
+  postCheck = ''
+    rm -rf test
+    rm -rf examples
+    popd
+  '';
+
+
+  meta = with lib; {
+    description = "Provides the foundations for Qiskit.";
+    longDescription = ''
+      Allows the user to write quantum circuits easily, and takes care of the constraints of real hardware.
+    '';
+    homepage = "https://github.com/QISKit/qiskit-terra";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ drewrisinger ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b9a6fc9f448e..409fff8994c8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6969,6 +6969,8 @@ in {
 
   qiskit = callPackage ../development/python-modules/qiskit { };
 
+  qiskit-terra = callPackage ../development/python-modules/qiskit-terra { };
+
   qasm2image = callPackage ../development/python-modules/qasm2image { };
 
   simpy = callPackage ../development/python-modules/simpy { };

From 2649e58d1f070e90937e138e8e4790cc7369da60 Mon Sep 17 00:00:00 2001
From: Brett Lyons <blyons@fastmail.com>
Date: Sun, 23 Feb 2020 16:23:57 -0700
Subject: [PATCH 1511/4636] vimPlugins: Update

---
 pkgs/misc/vim-plugins/generated.nix | 48 ++++++++++++++---------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index f98e7abbeddc..1a1175b9a4a1 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -160,12 +160,12 @@ let
 
   awesome-vim-colorschemes = buildVimPluginFrom2Nix {
     pname = "awesome-vim-colorschemes";
-    version = "2019-11-23";
+    version = "2020-02-23";
     src = fetchFromGitHub {
       owner = "rafi";
       repo = "awesome-vim-colorschemes";
-      rev = "b5037cbf87ee4b0beed91adb33c339122e58326f";
-      sha256 = "1yxjdb2cmha6vqhmsv8vy80whs201wwwx0xmyp76mz9zkcsyljak";
+      rev = "fc222a81de4734eeccd89e81d66319d4a2e8fee7";
+      sha256 = "08wk7i2p62zghvk7q22z6ac6qidpd58r1pkx5lbxg6l9zv7sb8j3";
     };
   };
 
@@ -898,12 +898,12 @@ let
 
   denite-nvim = buildVimPluginFrom2Nix {
     pname = "denite-nvim";
-    version = "2020-02-19";
+    version = "2020-02-23";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "a22e597a2950510b5bef4f9cc972ae7f1d66b269";
-      sha256 = "1acwb4r20xmsj0cvjc7ql0vfbyj74zmi8ncns678afj7qc595mxq";
+      rev = "e435b78c3fa878dba7bbb03ee7cd95df6ce7a836";
+      sha256 = "10lz16l34ran96i5902hw9zw3qbfdz712bdjkdwvaijmgnj464s5";
     };
   };
 
@@ -1077,12 +1077,12 @@ let
 
   deoplete-nvim = buildVimPluginFrom2Nix {
     pname = "deoplete-nvim";
-    version = "2020-02-19";
+    version = "2020-02-23";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "1ec8428fc4a150756dc793295b44f7e62544b5ed";
-      sha256 = "00ywghgprbq9x1m5l5d00c10n9yk83ai6gxlw6gmjl67bya65ikg";
+      rev = "ebc9c155b0247314609e8d326e030adb3391f243";
+      sha256 = "1y51fn2lxal6kf7cls913kl51f67in08xhv2waqngv71bd377bjj";
     };
   };
 
@@ -1399,12 +1399,12 @@ let
 
   gruvbox = buildVimPluginFrom2Nix {
     pname = "gruvbox";
-    version = "2018-02-25";
+    version = "2020-02-23";
     src = fetchFromGitHub {
       owner = "morhetz";
       repo = "gruvbox";
-      rev = "cb4e7a5643f7d2dd40e694bcbd28c4b89b185e86";
-      sha256 = "12qkq1x96bm1cmqfg6sb8jxpl2b6gwvhc5qn3gva6vl4nx3ianqi";
+      rev = "040138616bec342d5ea94d4db296f8ddca17007a";
+      sha256 = "0qk2mqs04qlxkc1ldgjbiv1yisi2xl2b8svmjz0hdp9y2l5vfccw";
     };
   };
 
@@ -2214,12 +2214,12 @@ let
 
   nvim-lsp = buildVimPluginFrom2Nix {
     pname = "nvim-lsp";
-    version = "2020-02-22";
+    version = "2020-02-23";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lsp";
-      rev = "be0f71585eb3185b214c84c643e43e9647ef67d1";
-      sha256 = "1rrlq70yx9ks19xbnic4k2vnq0i7xnfm7s0z5lsxp6xl2w3di78z";
+      rev = "2dc39ef00bedde68aa7fab7023646a5ff8ca9986";
+      sha256 = "0l6blvqj2fh942farbwk02gfl2skqr59m6zz1kn4drybvr0sdw8k";
     };
   };
 
@@ -2687,12 +2687,12 @@ let
 
   SpaceCamp = buildVimPluginFrom2Nix {
     pname = "SpaceCamp";
-    version = "2020-02-22";
+    version = "2020-02-23";
     src = fetchFromGitHub {
       owner = "jaredgorski";
       repo = "SpaceCamp";
-      rev = "35187bc15654196c3f7cbf3eabb194dc0ee499de";
-      sha256 = "119chhmz561rfjag778a6yp9w6vdi9kxgv5756rnnav7rrp8ap9a";
+      rev = "44d2e55286bc04588b35b356e36c56ae15e78ad2";
+      sha256 = "1qzlcp46x4pm6dyf2k4n2rrdh27zj7j719gh853gvhdbvjk650yr";
     };
   };
 
@@ -3986,12 +3986,12 @@ let
 
   vim-fugitive = buildVimPluginFrom2Nix {
     pname = "vim-fugitive";
-    version = "2020-02-20";
+    version = "2020-02-23";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "9e4a5239ee2a91f71605a288810419ce3a603df2";
-      sha256 = "1ssw5q3wn9jdq9zyr176b2g24263rpm22gn4sswjylz5d5m2f6yq";
+      rev = "31629d8bd18ddb5db6d9c55585d1eeb325a6bb43";
+      sha256 = "1qvhdxha29wj7fw88i72n16m05hd9apfqwf16g6wi6v2nfqfwpnp";
     };
   };
 
@@ -4063,12 +4063,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2020-02-20";
+    version = "2020-02-23";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "26c00294a0726ebfe80174f310b868af5e0f2042";
-      sha256 = "1ymdqdl0bfingkh7gdprvdmp5q3wka3kwnw0cw1nyzq8m3sn1803";
+      rev = "dc02b2192ff2f652379f94791b7c7e311c946068";
+      sha256 = "1h6hb870zqx7wdk49wpcp7rrd70nvvb4wk311j8439z4f6ibfsdq";
     };
   };
 

From 6ea0a466b6a8904fb454cdb227a2c80ed861037e Mon Sep 17 00:00:00 2001
From: Brett Lyons <blyons@fastmail.com>
Date: Mon, 24 Feb 2020 16:55:44 -0700
Subject: [PATCH 1512/4636] vimPlugins.nrrwrgn: Init at 2019-12-12

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names | 15 ++++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 1a1175b9a4a1..3c5e76e2a4af 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2168,6 +2168,17 @@ let
     };
   };
 
+  NrrwRgn = buildVimPluginFrom2Nix {
+    pname = "NrrwRgn";
+    version = "2019-12-12";
+    src = fetchFromGitHub {
+      owner = "chrisbra";
+      repo = "NrrwRgn";
+      rev = "8a2930141ada6719aae6c53bf4e4a8dfc3f8dbed";
+      sha256 = "0mns43i7jj0kragylfhpawbkd9wwky8fbyvwx33406193ymyn3y3";
+    };
+  };
+
   nvim-cm-racer = buildVimPluginFrom2Nix {
     pname = "nvim-cm-racer";
     version = "2017-07-27";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index c3978069bc5c..af06e12ab6bc 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -42,6 +42,7 @@ chikatoike/concealedyank.vim
 chikatoike/sourcemap.vim
 chrisbra/CheckAttach
 chrisbra/csv.vim
+chrisbra/NrrwRgn
 chrisbra/Recover.vim
 chrisbra/unicode.vim
 chrisgeo/sparkup
@@ -56,8 +57,8 @@ cocopon/iceberg.vim
 cohama/lexima.vim
 ctjhoa/spacevim
 ctrlpvim/ctrlp.vim
-dag/vim-fish
 dag/vim2hs
+dag/vim-fish
 dannyob/quickfixstatus
 darfink/starsearch.vim
 dart-lang/dart-vim-plugin
@@ -310,8 +311,8 @@ neoclide/coc-neco
 neoclide/coc-pairs
 neoclide/coc-prettier
 neoclide/coc-python
-neoclide/coc-r-lsp
 neoclide/coc-rls
+neoclide/coc-r-lsp
 neoclide/coc-smartf
 neoclide/coc-snippets
 neoclide/coc-solargraph
@@ -327,10 +328,10 @@ neoclide/coc-yaml
 neoclide/coc-yank
 neoclide/vim-easygit
 neomake/neomake
-neovim/nvim-lsp
-neovim/nvimdev.nvim
 neovimhaskell/haskell-vim
 neovimhaskell/nvim-hs.vim
+neovim/nvimdev.nvim
+neovim/nvim-lsp
 neutaaaaan/iosvkem
 nfnty/vim-nftables
 nicoe/deoplete-khard
@@ -501,14 +502,16 @@ Valodim/deoplete-notmuch
 vhda/verilog_systemverilog.vim
 vim-airline/vim-airline
 vim-airline/vim-airline-themes
+vimlab/split-term.vim
+vimoutliner/vimoutliner
 vim-pandoc/vim-pandoc
 vim-pandoc/vim-pandoc-after
 vim-pandoc/vim-pandoc-syntax
 vim-ruby/vim-ruby
-vim-scripts/a.vim
 vim-scripts/align
 vim-scripts/argtextobj.vim
 vim-scripts/autoload_cscope.vim
+vim-scripts/a.vim
 vim-scripts/bats.vim
 vim-scripts/changeColorScheme.vim
 vim-scripts/Colour-Sampler-Pack
@@ -531,8 +534,6 @@ vim-scripts/utl.vim
 vim-scripts/wombat256.vim
 vim-scripts/YankRing.vim
 vim-utils/vim-husk
-vimlab/split-term.vim
-vimoutliner/vimoutliner
 vimwiki/vimwiki
 vito-c/jq.vim
 vmchale/dhall-vim

From 7aee5b838b25a353a453aa7db0560390dc8089cf Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Tue, 25 Feb 2020 17:34:29 +0100
Subject: [PATCH 1513/4636] build-lua-package: dont patchShebangs folder

It can be source of trouble for some read-only folders (libluv for
instance) and slow down install.
---
 pkgs/development/interpreters/lua-5/build-lua-package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix
index be7aa5fc09d7..3b16ca68342b 100644
--- a/pkgs/development/interpreters/lua-5/build-lua-package.nix
+++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix
@@ -199,8 +199,6 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps"] // {
         LUAROCKS="$LUAROCKS --verbose"
     fi
 
-    patchShebangs .
-
     runHook postBuild
   '';
 

From b2758c9995022869acfd44f3590cf47206623496 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCtke-Stetzkamp?=
 <46303707+clkamp@users.noreply.github.com>
Date: Tue, 25 Feb 2020 18:51:28 +0100
Subject: [PATCH 1514/4636] coreboot-utils: 4.10 -> 4.11 (#81031)

Closes #79210
---
 pkgs/tools/misc/coreboot-utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix
index 3f6988f1f657..e769cb25a731 100644
--- a/pkgs/tools/misc/coreboot-utils/default.nix
+++ b/pkgs/tools/misc/coreboot-utils/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }:
 
 let
-  version = "4.10";
+  version = "4.11";
 
   meta = with stdenv.lib; {
     description = "Various coreboot-related tools";
@@ -16,7 +16,7 @@ let
 
     src = fetchurl {
       url = "https://coreboot.org/releases/coreboot-${version}.tar.xz";
-      sha256 = "1jsiz17afi2lqg1jv6lsl8s05w7vr7iwgg86y2qp369hcz6kcwfa";
+      sha256 = "11xdm2c1blaqb32j98085sak78jldsw0xhrkzqs5b8ir9jdqbzcp";
     };
 
     enableParallelBuilding = true;

From 538ec50639f94d8a87f34b4c63c11f7bba922bc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Tue, 25 Feb 2020 19:45:51 +0100
Subject: [PATCH 1515/4636] i2pd: 2.29.0 -> 2.30.0

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

diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index 971d8e696864..3b9680770951 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null;
 
 stdenv.mkDerivation rec {
   pname = "i2pd";
-  version = "2.29.0";
+  version = "2.30.0";
 
   src = fetchFromGitHub {
     owner = "PurpleI2P";
     repo = pname;
     rev = version;
-    sha256 = "1issg3aidwikk4g12sa8q81zzp0hd0g8wdy2dx4899z8yrscl300";
+    sha256 = "nGl7c5UY9kJPRaMveMF+aIf8T11WFrB//37oKzREdvM=";
   };
 
   buildInputs = with stdenv.lib; [ boost zlib openssl ]

From 58c7a952a13a65398bed3f539061e69f523ee377 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 24 Feb 2020 03:38:29 +0100
Subject: [PATCH 1516/4636] nixos/networkd: disable vrf sub-test which tests
 the behavior of tcp-packets

The subtest was mainly written to demonstrate the VRF-issues with a
5.x-kernel. However this breaks the entire test now as we have 5.4 as
default kernel. Disabling the test for now, I still need to find some
time to investigate.
---
 nixos/tests/systemd-networkd-vrf.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/nixos/tests/systemd-networkd-vrf.nix b/nixos/tests/systemd-networkd-vrf.nix
index 5bc824531e82..af7813a2e604 100644
--- a/nixos/tests/systemd-networkd-vrf.nix
+++ b/nixos/tests/systemd-networkd-vrf.nix
@@ -197,15 +197,15 @@ in {
     # Test whether SSH through a VRF IP is possible.
     # (Note: this seems to be an issue on Linux 5.x, so I decided to add this to
     # ensure that we catch this when updating the default kernel).
-    with subtest("tcp traffic through vrf works"):
-        node1.wait_for_open_port(22)
-        client.succeed(
-            "cat ${snakeOilPrivateKey} > privkey.snakeoil"
-        )
-        client.succeed("chmod 600 privkey.snakeoil")
-        client.succeed(
-            "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil root@192.168.1.2 true"
-        )
+    # with subtest("tcp traffic through vrf works"):
+    #     node1.wait_for_open_port(22)
+    #     client.succeed(
+    #         "cat ${snakeOilPrivateKey} > privkey.snakeoil"
+    #     )
+    #     client.succeed("chmod 600 privkey.snakeoil")
+    #     client.succeed(
+    #         "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil root@192.168.1.2 true"
+    #     )
 
     # Only configured routes through the VRF from the main routing table should
     # work. Additional IPs are only reachable when binding to the vrf interface.

From d5db5d12aa93251aa65a8501b4d5be6d1fa6e70d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 24 Feb 2020 03:42:11 +0100
Subject: [PATCH 1517/4636] swaylock-fancy: 2019-03-31 -> 2020-02-22

---
 pkgs/applications/window-managers/sway/lock-fancy.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/sway/lock-fancy.nix b/pkgs/applications/window-managers/sway/lock-fancy.nix
index aa2db698f747..338d626d9908 100644
--- a/pkgs/applications/window-managers/sway/lock-fancy.nix
+++ b/pkgs/applications/window-managers/sway/lock-fancy.nix
@@ -14,13 +14,13 @@ let
   ];
 in stdenv.mkDerivation rec {
   pname = "swaylock-fancy-unstable";
-  version = "2019-03-31";
+  version = "2020-02-22";
 
   src = fetchFromGitHub {
     owner = "Big-B";
     repo = "swaylock-fancy";
-    rev = "35618ceec70338047355b6b057825e68f16971b5";
-    sha256 = "06fjqwblmj0d9pq6y11rr73mizirna4ixy6xkvblf1c7sn5n8lpc";
+    rev = "5cf977b12f372740aa7b7e5a607d583f93f1e028";
+    sha256 = "0laqwzi6069sgz91i69438ns0g2nq4zkqickavrf80h4g3gcs8vm";
   };
 
   postPatch = ''

From 243b4cd69ed1ae75b9697b5da4b4f5a9193f920e Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Mon, 24 Feb 2020 23:17:22 +0100
Subject: [PATCH 1518/4636] perlPackages.MozillaCA: replace outdated cacert.pem
 with pkgs.cacert

Mozilla::CA returns a path to a bundled cacert.pem file, this commit replaces
the bundled certificates with pkgs.cacert.
---
 pkgs/top-level/perl-packages.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9401a76ca3e8..43f99ba97247 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13120,6 +13120,11 @@ let
       url = mirror://cpan/authors/id/A/AB/ABH/Mozilla-CA-20180117.tar.gz;
       sha256 = "f2cc9fbe119f756313f321e0d9f1fac0859f8f154ac9d75b1a264c1afdf4e406";
     };
+
+    postPatch = ''
+      ln -s --force ${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt lib/Mozilla/CA/cacert.pem
+    '';
+
     meta = {
       description = "Mozilla's CA cert bundle in PEM format";
       license = stdenv.lib.licenses.mpl20;

From 5330ac74500a0e8d59a2d25c1a4747cc23b3bbfc Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <brightone@protonmail.com>
Date: Tue, 25 Feb 2020 21:36:09 +0200
Subject: [PATCH 1519/4636] topgrade: 3.9.0 -> 4.0.2

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

diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix
index 191d66a6de80..e0aba2724af2 100644
--- a/pkgs/tools/misc/topgrade/default.nix
+++ b/pkgs/tools/misc/topgrade/default.nix
@@ -2,22 +2,21 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "topgrade";
-  version = "3.9.0";
+  version = "4.0.2";
 
   src = fetchFromGitHub {
     owner = "r-darwish";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0g9pb4f5skigyahv8kpx7wkvv625lvgnbqz6iq7j7wgixxf4nl1i";
+    sha256 = "0kkk718s65r3j5k3a3wz9p0q1v8rjz0yshmfwxak3aw99nj9yyvq";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1y85hl7xl60vsj3ivm6pyd6bvk39wqg25bqxfx00r9myha94iqmd";
+  cargoSha256 = "1g6jzbmicyqnp0dkcbw7sa36b3qxag8f596mb47wq2fl25pg0d3x";
 
   buildInputs = lib.optional stdenv.isDarwin Foundation;
 
+  # TODO: add manpage (topgrade.8) to postInstall on next update
+
   meta = with lib; {
     description = "Upgrade all the things";
     homepage = "https://github.com/r-darwish/topgrade";

From 9f0014b6f209f54b4025a001555dd8e1b1d9ef4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Netix=20=28Espinet=20Franc=CC=A7ois=29?=
 <dev.espinetfrancois@gmail.com>
Date: Thu, 20 Feb 2020 22:05:20 +0100
Subject: [PATCH 1520/4636] grafana: made phantomjs2 optional

On servers especially, phantomjs2 pulls graphical dependencies which is unecessary.
This pathes enable the package to be linked/installed without
phantomjs2. Phantomjs2 is disabled by default since it has been deprecated in grafana https://grafana.com/docs/grafana/latest/guides/whats-new-in-v6-4/
---
 nixos/doc/manual/release-notes/rl-2009.xml  | 13 ++++++++++++-
 pkgs/servers/monitoring/grafana/default.nix |  3 ++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index d07b7cf49c39..2c407a5130c8 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -59,7 +59,18 @@
 
   <itemizedlist>
    <listitem>
-    <para />
+    <para>
+     Grafana is now built without support for phantomjs by default. Phantomjs support has been
+     <link xlink:href="https://grafana.com/docs/grafana/latest/guides/whats-new-in-v6-4/">deprecated in Grafana</link>
+     and the <package>phantomjs</package> project is
+     <link xlink:href="https://github.com/ariya/phantomjs/issues/15344#issue-302015362">currently unmaintained</link>.
+     It can still be enabled by providing <literal>phantomJsSupport = true</literal> to the package instanciation:
+<programlisting>{
+  services.grafana.package = pkgs.grafana.overrideAttrs (oldAttrs: rec {
+    phantomJsSupport = false;
+  });
+}</programlisting>
+    </para>
    </listitem>
   </itemizedlist>
  </section>
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index cbb13074afc8..a4a4796a8cdf 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
+{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomJsSupport ? false, phantomjs2 ? null }:
 
 buildGoPackage rec {
   pname = "grafana";
@@ -31,6 +31,7 @@ buildGoPackage rec {
     tar -xvf $srcStatic
     mkdir -p $bin/share/grafana
     mv grafana-*/{public,conf,tools} $bin/share/grafana/
+  '' + lib.optionalString phantomJsSupport ''
     ln -sf ${phantomjs2}/bin/phantomjs $bin/share/grafana/tools/phantomjs/phantomjs
   '';
 

From 7458509972f3e30ac0484fd571d8228358f1e1ea Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 25 Feb 2020 20:49:46 +0100
Subject: [PATCH 1521/4636] nixos/manual: fix dates for support-plan of 20.09

---
 nixos/doc/manual/release-notes/rl-2009.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index d07b7cf49c39..87c39d1be558 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -20,7 +20,7 @@
   <itemizedlist>
    <listitem>
     <para>
-     Support is planned until the end of October 2020, handing over to 20.09.
+     Support is planned until the end of April 2021, handing over to 21.03.
     </para>
    </listitem>
   </itemizedlist>

From 3ec9925f2187fc1d1bb9a6c0e15306ccf5b7261c Mon Sep 17 00:00:00 2001
From: kraem <ebrin.ronnie@protonmail.com>
Date: Tue, 25 Feb 2020 19:47:57 +0100
Subject: [PATCH 1522/4636] discord: 0.0.9 -> 0.0.10

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

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 70b36c663873..7e753049da5c 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -7,10 +7,10 @@ in {
     pname = "discord";
     binaryName = "Discord";
     desktopName = "Discord";
-    version = "0.0.9";
+    version = "0.0.10";
     src = fetchurl {
       url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
-      sha256 = "1i0f8id10rh2fx381hx151qckvvh8hbznfsfav8w0dfbd1bransf";
+      sha256 = "0kx92i8naqr3algmyy3wyzbh8146z7gigxwf1nbpg1gl16wlplaq";
     };
   };
   ptb = callPackage ./base.nix rec {

From 9285eee2cc8429898d2efa2b9ab9fd8c75f83586 Mon Sep 17 00:00:00 2001
From: Stephane <stephane@github.frozenid.net>
Date: Mon, 24 Feb 2020 13:33:52 +0100
Subject: [PATCH 1523/4636] maintainers: add sstef

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index bb500b354918..c979a6fa6fbe 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6802,6 +6802,12 @@
     githubId = 4061736;
     name = "Severen Redwood";
   };
+  sstef = {
+    email = "stephane@nix.frozenid.net";
+    github = "fkstef";
+    githubId = 8668915;
+    name = "Stephane Schitter";
+  };
   steell = {
     email = "steve@steellworks.com";
     github = "Steell";

From e1d05e30f89a9699cb0f64cd2da32de25c79c22c Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 25 Feb 2020 11:59:59 -0800
Subject: [PATCH 1524/4636] discord-ptb: 0.0.16 -> 0.0.18

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

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 7e753049da5c..48f4eb49b1d7 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -17,10 +17,10 @@ in {
     pname = "discord-ptb";
     binaryName = "DiscordPTB";
     desktopName = "Discord PTB";
-    version = "0.0.16";
+    version = "0.0.18";
     src = fetchurl {
       url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
-      sha256 = "1ia94xvzygim9rx1sjnnss518ggw0i20mhp9pby33q70ha35n0aq";
+      sha256 = "1v9xph7shpmabwysbc08qqlkydzgsir8rwarrjf01xmpcpyia17g";
     };
   };
   canary = callPackage ./base.nix rec {

From da5e340f74b1bdc0e0283f468b7cf8c027cc1a9d Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 25 Feb 2020 12:00:27 -0800
Subject: [PATCH 1525/4636] discord-canary: 0.0.98 -> 0.0.102

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

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 48f4eb49b1d7..ab15cbb22af4 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -27,10 +27,10 @@ in {
     pname = "discord-canary";
     binaryName = "DiscordCanary";
     desktopName = "Discord Canary";
-    version = "0.0.98";
+    version = "0.0.102";
     src = fetchurl {
       url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-      sha256 = "0raqsfakjbcsh7g280yi7sg2jsrmy2q4jldg73wb868z35radld4";
+      sha256 = "1zl53vprkwbkfn3v0lddpp1swignqjxksi4qxl5zqj7482j372a4";
     };
   };
 }.${branch}

From 140d5b3445901da7e1a8817cf7a524885a832b82 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 25 Feb 2020 21:59:13 +0100
Subject: [PATCH 1526/4636] androidStudioPackages.beta: 3.6.0.20 -> 4.0.0.10

androidStudioPackages.{dev,canary}: 4.0.0.9 -> 4.0.0.10
---
 pkgs/applications/editors/android-studio/default.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 414e205b9a95..429d9719f6a1 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -12,15 +12,11 @@ let
     build = "191.6010548";
     sha256Hash = "1nsm4d3vdx90szqd78a8mjq65xc9m5ipd35cqrlx3c3ny900sqxg";
   };
-  betaVersion = {
-    version = "3.6.0.20"; # "Android Studio 3.6 RC 3"
-    build = "192.6186006";
-    sha256Hash = "153piq67yps5jwqrbciam4kpxziavml29d8ya5bi2rvfhipdd7da";
-  };
+  betaVersion = latestVersion;
   latestVersion = { # canary & dev
-    version = "4.0.0.9"; # "Android Studio 4.0 Canary 9"
-    build = "193.6137316";
-    sha256Hash = "1cgxyqp85z5x2jnjh1qabn2cfiziiwvfr6iggzb531dlhllyfyqw";
+    version = "4.0.0.10"; # "Android Studio 4.0 Beta 1"
+    build = "193.6220182";
+    sha256Hash = "0ibp54wcss4ihm454hbavv1bhar6cd4alp5b0z248ryjr5w9mixf";
   };
 in {
   # Attributes are named by their corresponding release channels

From d574fffd6cadb89c4791200043859e17f07a6303 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 25 Feb 2020 22:05:43 +0100
Subject: [PATCH 1527/4636] android-studio: 3.5.3.0 -> 3.6.0.21

Changelog: https://developer.android.com/studio/releases/#3-6-0
---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 429d9719f6a1..28490f2ce7bb 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -8,9 +8,9 @@ let
     inherit (gnome2) GConf gnome_vfs;
   };
   stableVersion = {
-    version = "3.5.3.0"; # "Android Studio 3.5.3"
-    build = "191.6010548";
-    sha256Hash = "1nsm4d3vdx90szqd78a8mjq65xc9m5ipd35cqrlx3c3ny900sqxg";
+    version = "3.6.0.21"; # "Android Studio 3.6"
+    build = "192.6200805";
+    sha256Hash = "1rf79fh6fbaxsj26q9bgl4vvmakv4wc0amjz026cm89hcwwzrb4d";
   };
   betaVersion = latestVersion;
   latestVersion = { # canary & dev

From cf0cc0596e58d86d4657714b741ac666a42b112c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 25 Feb 2020 22:14:02 +0100
Subject: [PATCH 1528/4636] scalafmt: 2.3.2 -> 2.4.2

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

diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix
index 5c0fc6f28edf..0c2b94807c0c 100644
--- a/pkgs/development/tools/scalafmt/default.nix
+++ b/pkgs/development/tools/scalafmt/default.nix
@@ -2,7 +2,7 @@
 
 let
   baseName = "scalafmt";
-  version = "2.3.2";
+  version = "2.4.2";
   deps = stdenv.mkDerivation {
     name = "${baseName}-deps-${version}";
     buildCommand = ''
@@ -13,7 +13,7 @@ let
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "0q42qa6k4wqnfj710lcarkg8hv7wpvfhvjh9ygil1ah8936xmj72";
+    outputHash     = "0axinxfyycnmxg561n80s90swr6d0pgsw669gvpsk557nhmcclja";
   };
 in
 stdenv.mkDerivation {

From a47195b5168633507cc4cca00633d11f307613ea Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Feb 2020 21:19:16 +0000
Subject: [PATCH 1529/4636] bfs: 1.5.2 -> 1.6

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

diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix
index 1387a6c6ed17..50146f0aad31 100644
--- a/pkgs/tools/system/bfs/default.nix
+++ b/pkgs/tools/system/bfs/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "bfs";
-  version = "1.5.2";
+  version = "1.6";
 
   src = fetchFromGitHub {
     repo = "bfs";
     owner = "tavianator";
     rev = version;
-    sha256 = "04jgah6yvz3i2bwrv1ki2nmj1yinba7djbfq8n8ism4gffsza9dz";
+    sha256 = "0qrxd1vdz2crk7jf7cdda5bhm1f841hjvin7fn497wymwr5qyjah";
   };
 
   buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       bfs is a variant of the UNIX find command that operates breadth-first rather than
       depth-first. It is otherwise intended to be compatible with many versions of find.
     '';
-    homepage = https://github.com/tavianator/bfs;
+    homepage = "https://github.com/tavianator/bfs";
     license = licenses.bsd0;
     platforms = platforms.unix;
     maintainers = with maintainers; [ yesbox ];

From 09a8f9297c965dd2acd297f010211792cb603347 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 25 Feb 2020 22:18:43 +0100
Subject: [PATCH 1530/4636] gns3-{gui,server}: Fix the build by disabling the
 psutil tests

The tests where only enabled recently in 0d1d43d49c2 but apparently fail
for the older version (I didn't have a closer look as they should work
after the next GNS3 release anyway).
---
 pkgs/applications/networking/gns3/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index 2dae8377055f..6dcfb27b7ba6 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -15,6 +15,7 @@ let
           src = oldAttrs.src.override {
             inherit version sha256;
           };
+          doCheck = oldAttrs.doCheck && (attrname != "psutil");
         });
       };
   };

From 2d41dab849fbb6400578a5fe44858995a576c2b2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Feb 2020 21:52:09 +0000
Subject: [PATCH 1531/4636] claws-mail: 3.17.4 -> 3.17.5

---
 .../networking/mailreaders/claws-mail/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index f62ab292d669..ffe75eaac7c8 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -30,11 +30,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "claws-mail";
-  version = "3.17.4";
+  version = "3.17.5";
 
   src = fetchurl {
     url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz";
-    sha256 = "00mfhaac16sv67rwiq98hr4nl5zmd1h2afswwwksdcsi3q9x23jr";
+    sha256 = "1gjrmdmhc7zzilrlss9yl86ybv9sra8v0qi7mkwv7d9azidx5kns";
   };
 
   outputs = [ "out" "dev" ];
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "The user-friendly, lightweight, and fast email client";
-    homepage = https://www.claws-mail.org/;
+    homepage = "https://www.claws-mail.org/";
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ fpletz globin ];

From fca772a5517120f88fd83573d20dc725803dfcd7 Mon Sep 17 00:00:00 2001
From: Stephane <stephane@github.frozenid.net>
Date: Sun, 23 Feb 2020 22:38:49 +0100
Subject: [PATCH 1532/4636] metastore: init at 1.1.2

---
 pkgs/os-specific/linux/metastore/default.nix | 24 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/os-specific/linux/metastore/default.nix

diff --git a/pkgs/os-specific/linux/metastore/default.nix b/pkgs/os-specific/linux/metastore/default.nix
new file mode 100644
index 000000000000..590b931ac920
--- /dev/null
+++ b/pkgs/os-specific/linux/metastore/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, libbsd, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  version = "1.1.2";
+  pname = "metastore";
+
+  src = fetchFromGitHub {
+    owner = "przemoc";
+    repo = "metastore";
+    rev = "v${version}";
+    sha256 = "0mb10wfckswqgi0bq25ncgabnd3iwj7s7hhg3wpcyfgckdynwizv";
+  };
+
+  buildInputs = [ libbsd ];
+  installFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "Store and restore metadata from a filesystem";
+    homepage = "https://software.przemoc.net/#metastore";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ sstef ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0ad721bb4a96..33d42fec8512 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16907,6 +16907,8 @@ in
   mdadm = mdadm4;
   mdadm4 = callPackage ../os-specific/linux/mdadm { };
 
+  metastore = callPackage ../os-specific/linux/metastore { };
+
   mingetty = callPackage ../os-specific/linux/mingetty { };
 
   miraclecast = callPackage ../os-specific/linux/miraclecast { };

From 1464a412ff08e30469767d13f5295504a4b6ef07 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 25 Feb 2020 23:08:32 +0100
Subject: [PATCH 1533/4636] nixos/tests/opensmtpd: bump test (&build) timeout
 to 30m from 30s

I am not sure how this ever passed on hydra but 30s is barely enough to
pass the configure phase of opensmtpd. It is likely the package was
built as part of another jobset. Whenever it is built as part of the
test execution the timeout propagates and 30s is clearly not enough for
that.
---
 nixos/tests/opensmtpd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix
index e6f52db1d984..17c1a569ba0d 100644
--- a/nixos/tests/opensmtpd.nix
+++ b/nixos/tests/opensmtpd.nix
@@ -121,5 +121,5 @@ import ./make-test-python.nix {
     client.succeed("check-mail-landed >&2")
   '';
 
-  meta.timeout = 30;
+  meta.timeout = 1800;
 }

From 10f3643c7c5e7acdf9a36d8f728cf4f11583d2b8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Feb 2020 23:38:27 +0000
Subject: [PATCH 1534/4636] datamash: 1.5 -> 1.6

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

diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix
index 18e80ab6e4aa..f66f2b97d141 100644
--- a/pkgs/tools/misc/datamash/default.nix
+++ b/pkgs/tools/misc/datamash/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   pname = "datamash";
-  version = "1.5";
+  version = "1.6";
 
   src = fetchurl {
     url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "1b91pbdarnfmbhid8aa2f50k0fln8n7pg62782b4y0jlzvaljqi2";
+    sha256 = "1jvqxcyh0aghnqh3m2rk5av1x0038flcmfzd493vasv1k69vgfdr";
   };
 
   meta = with stdenv.lib; {
     description = "A command-line program which performs basic numeric,textual and statistical operations on input textual data files";
-    homepage = https://www.gnu.org/software/datamash/;
+    homepage = "https://www.gnu.org/software/datamash/";
     license = licenses.gpl3Plus;
     platforms = platforms.all;
     maintainers = with maintainers; [ pSub vrthra ];

From f2d2d69203d869389b136cc22410967ffe358980 Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Tue, 25 Feb 2020 10:12:06 -0800
Subject: [PATCH 1535/4636] nodePackages.insect: init at 5.4.0

---
 .../development/node-packages/default-v10.nix |   4 +
 .../node-packages/node-packages-v10.json      |   1 +
 .../node-packages/node-packages-v10.nix       | 388 ++++++++++++------
 3 files changed, 262 insertions(+), 131 deletions(-)

diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix
index 65b537ad50f7..54bd0337fade 100644
--- a/pkgs/development/node-packages/default-v10.nix
+++ b/pkgs/development/node-packages/default-v10.nix
@@ -62,6 +62,10 @@ nodePackages // {
     buildInputs = [ nodePackages.node-gyp-build ];
   };
 
+  insect = nodePackages.insect.override (drv: {
+    nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.psc-package pkgs.purescript nodePackages.pulp ];
+  });
+
   node-inspector = nodePackages.node-inspector.override {
     buildInputs = [ nodePackages.node-pre-gyp ];
   };
diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json
index 258c90615a23..f8e7c3f3441b 100644
--- a/pkgs/development/node-packages/node-packages-v10.json
+++ b/pkgs/development/node-packages/node-packages-v10.json
@@ -54,6 +54,7 @@
 , "hueadm"
 , "imapnotify"
 , "indium"
+, "insect"
 , "ionic"
 , "ios-deploy"
 , { "iosevka-build-deps": "../../data/fonts/iosevka" }
diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
index 199962d26302..a87b6d30a380 100644
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -3019,13 +3019,13 @@ let
         sha512 = "dBtBbrc+qTHy1WdfHYjBwRln4+LWqASWakLHsWHR2NWHIFkv4W3O070IGoGLEBrJBvct3r0L1BUPuvURi7kYUQ==";
       };
     };
-    "@types/babel__core-7.1.5" = {
+    "@types/babel__core-7.1.6" = {
       name = "_at_types_slash_babel__core";
       packageName = "@types/babel__core";
-      version = "7.1.5";
+      version = "7.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.5.tgz";
-        sha512 = "+ckxwNj892FWgvwrUWLOghQ2JDgOgeqTPwrcl+0t1pG59CP8qMJ6S/efmEd999vCFSJKOpyMakvU+w380rduUQ==";
+        url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.6.tgz";
+        sha512 = "tTnhWszAqvXnhW7m5jQU9PomXSiKXk2sFxpahXvI20SZKu9ylPi8WtIxueZ6ehDWikPT0jeFujMj3X4ZHuf3Tg==";
       };
     };
     "@types/babel__generator-7.6.1" = {
@@ -3262,6 +3262,15 @@ let
         sha512 = "UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==";
       };
     };
+    "@types/jquery-3.3.33" = {
+      name = "_at_types_slash_jquery";
+      packageName = "@types/jquery";
+      version = "3.3.33";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.33.tgz";
+        sha512 = "U6IdXYGkfUI42SR79vB2Spj+h1Ly3J3UZjpd8mi943lh126TK7CB+HZOxGh2nM3IySor7wqVQdemD/xtydsBKA==";
+      };
+    };
     "@types/js-yaml-3.12.2" = {
       name = "_at_types_slash_js-yaml";
       packageName = "@types/js-yaml";
@@ -3289,13 +3298,13 @@ let
         sha512 = "MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw==";
       };
     };
-    "@types/koa-2.11.1" = {
+    "@types/koa-2.11.2" = {
       name = "_at_types_slash_koa";
       packageName = "@types/koa";
-      version = "2.11.1";
+      version = "2.11.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.1.tgz";
-        sha512 = "/kqQs+8Qd9GL0cdl39HEhK91k7xq6+Zci76RUdqtTLj1Mg1aVG7zwJm3snkeyFUeAvY8noY27eMXgqg1wHZgwA==";
+        url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.2.tgz";
+        sha512 = "2UPelagNNW6bnc1I5kIzluCaheXRA9S+NyOdXEFFj9Az7jc15ek5V03kb8OTbb3tdZ5i2BIJObe86PhHvpMolg==";
       };
     };
     "@types/koa-compose-3.2.5" = {
@@ -3361,13 +3370,13 @@ let
         sha512 = "A4283YSA1OmnIivcpy/4nN86YlnKRiQp8PYwI2KdPCONEBN093QTb0gCtERtkLyVNGKKIGazTZ2nAmVzQU51zA==";
       };
     };
-    "@types/node-13.7.4" = {
+    "@types/node-13.7.5" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "13.7.4";
+      version = "13.7.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-13.7.4.tgz";
-        sha512 = "oVeL12C6gQS/GAExndigSaLxTrKpQPxewx9bOcwfvJiJge4rr7wNaph4J+ns5hrmIV2as5qxqN8YKthn9qh0jw==";
+        url = "https://registry.npmjs.org/@types/node/-/node-13.7.5.tgz";
+        sha512 = "PfSBCTQhAQg6QBP4UhXgrZ/wQ3pjfwBr4sA7Aul+pC9XwGgm9ezrJF7OiC/I4Kf+7VPu/5ThKngAruqxyctZfA==";
       };
     };
     "@types/node-6.14.9" = {
@@ -3460,6 +3469,15 @@ let
         sha512 = "oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g==";
       };
     };
+    "@types/sizzle-2.3.2" = {
+      name = "_at_types_slash_sizzle";
+      packageName = "@types/sizzle";
+      version = "2.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz";
+        sha512 = "7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==";
+      };
+    };
     "@types/superagent-3.8.2" = {
       name = "_at_types_slash_superagent";
       packageName = "@types/superagent";
@@ -3514,13 +3532,13 @@ let
         sha512 = "Pv2HGRE4gWLs31In7nsyXEH4uVVsd0HNV9i2dyASvtDIlOtSTr1eczPLDpdEuyv5LWH5LT20GIXwPjkshKWI1g==";
       };
     };
-    "@types/yargs-15.0.3" = {
+    "@types/yargs-15.0.4" = {
       name = "_at_types_slash_yargs";
       packageName = "@types/yargs";
-      version = "15.0.3";
+      version = "15.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.3.tgz";
-        sha512 = "XCMQRK6kfpNBixHLyHUsGmXrpEmFFxzMrcnSXFMziHd8CoNJo8l16FkHyQq4x+xbM7E2XL83/O78OD8u+iZTdQ==";
+        url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.4.tgz";
+        sha512 = "9T1auFmbPZoxHz0enUFlUuKRy3it01R+hlggyVUMtnCTQRunsQYifnSGb8hET4Xo8yiC0o0r1paW3ud5+rbURg==";
       };
     };
     "@types/yargs-parser-15.0.0" = {
@@ -6610,13 +6628,13 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.625.0" = {
+    "aws-sdk-2.626.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.625.0";
+      version = "2.626.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.625.0.tgz";
-        sha512 = "8OoXw5SE/IliSo8q204amuLN46E2g1pGJQjVFTstoiETfaZvRxabL+DzIigJSV8QdybzzETGV3w50jvMfbsJ8A==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.626.0.tgz";
+        sha512 = "1D5slT34OI1NseXLszpWwZ+N/Jla8BsY+XsGDH/4yNDDN8Cf+8zKb1AqqSw4T4onz9xhoTHWCTWqTLDL+8XAnw==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -12929,6 +12947,15 @@ let
         sha512 = "vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw==";
       };
     };
+    "decimal.js-7.5.1" = {
+      name = "decimal.js";
+      packageName = "decimal.js";
+      version = "7.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decimal.js/-/decimal.js-7.5.1.tgz";
+        sha512 = "1K5Y6MykxQYfHBcFfAj2uBaLmwreq4MsjsvrlgcEOvg+X82IeeXlIVIVkBMiypksu+yo9vcYP6lfU3qTedofSQ==";
+      };
+    };
     "decode-uri-component-0.2.0" = {
       name = "decode-uri-component";
       packageName = "decode-uri-component";
@@ -13937,13 +13964,13 @@ let
         sha512 = "cIV8oXkAxpIuN5XgG0TGg07nLDgrj4olkfrdT77OTA3VypscsYHBUg/FjHxW9K3oA+CyH4Th/qtoMgTVpzSobw==";
       };
     };
-    "dockerfile-ast-0.0.18" = {
+    "dockerfile-ast-0.0.19" = {
       name = "dockerfile-ast";
       packageName = "dockerfile-ast";
-      version = "0.0.18";
+      version = "0.0.19";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.18.tgz";
-        sha512 = "SEp95qCox1KAzf8BBtjHoBDD0a7/eNlZJ6fgDf9RxqeSEDwLuEN9YjdZ/tRlkrYLxXR4i+kqZzS4eDRSqs8VKQ==";
+        url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.19.tgz";
+        sha512 = "iDRNFeAB2j4rh/Ecc2gh3fjciVifCMsszfCfHlYF5Wv8yybjZLiRDZUBt/pS3xrAz8uWT8fCHLq4pOQMmwCDwA==";
       };
     };
     "dockerfile-ast-0.0.20" = {
@@ -17304,13 +17331,13 @@ let
         sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg==";
       };
     };
-    "flow-parser-0.119.0" = {
+    "flow-parser-0.119.1" = {
       name = "flow-parser";
       packageName = "flow-parser";
-      version = "0.119.0";
+      version = "0.119.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.119.0.tgz";
-        sha512 = "P49kGSnCII6c5/P4QsVDtoam83zrXrdq4EUJDVOpbeURy48RM8BOboKcEfFHS1xnNID01UXu8Hf60b+m23T81w==";
+        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.119.1.tgz";
+        sha512 = "yFd4z6ZBXq//TJo/gtSzGKhz6wEVeI2m+6JB25JzXuRAOhM5Ze4xFkc3FSIStbYjrAx4H1IUiUTI/yy30oKp8A==";
       };
     };
     "fluent-ffmpeg-2.1.2" = {
@@ -17637,13 +17664,13 @@ let
         sha1 = "ef5491490f9433b705faa77249c99029ae348559";
       };
     };
-    "formidable-1.2.1" = {
+    "formidable-1.2.2" = {
       name = "formidable";
       packageName = "formidable";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz";
-        sha512 = "Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==";
+        url = "https://registry.npmjs.org/formidable/-/formidable-1.2.2.tgz";
+        sha512 = "V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q==";
       };
     };
     "forwarded-0.1.2" = {
@@ -20131,6 +20158,15 @@ let
         sha1 = "aab4dcfd0fc4cbdb219d268005f2335a3c639e8f";
       };
     };
+    "historic-readline-1.0.8" = {
+      name = "historic-readline";
+      packageName = "historic-readline";
+      version = "1.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/historic-readline/-/historic-readline-1.0.8.tgz";
+        sha1 = "6f36e770769275113a57ae1a6007001af771cff6";
+      };
+    };
     "hmac-drbg-1.0.1" = {
       name = "hmac-drbg";
       packageName = "hmac-drbg";
@@ -20185,22 +20221,22 @@ let
         sha1 = "08a74d9272a9cc83ae8e6bbe0303f0ee76432094";
       };
     };
-    "hosted-git-info-2.8.5" = {
+    "hosted-git-info-2.8.6" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
-      version = "2.8.5";
+      version = "2.8.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz";
-        sha512 = "kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.6.tgz";
+        sha512 = "Kp6rShEsCHhF5dD3EWKdkgVA8ix90oSUJ0VY4g9goxxa0+f4lx63muTftn0mlJ/+8IESGWyKnP//V2D7S4ZbIQ==";
       };
     };
-    "hosted-git-info-3.0.2" = {
+    "hosted-git-info-3.0.3" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
-      version = "3.0.2";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.2.tgz";
-        sha512 = "ezZMWtHXm7Eb7Rq4Mwnx2vs79WUx2QmRg3+ZqeGroKzfDO+EprOcgRPYghsOP9JuYBfK18VojmRTGCg8Ma+ktw==";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.3.tgz";
+        sha512 = "1ZStA49Bj7WGT+GF2ee50gWMkltL+04v+FgXs20OQbe/usWm9Vh6El9UViiGvD/CEYvsej3AMzABmKmd9DYwnw==";
       };
     };
     "hot-shots-6.8.7" = {
@@ -23246,6 +23282,15 @@ let
         sha1 = "d6be2e4c377494e2378b1cae2920a91d1182d8c4";
       };
     };
+    "jquery.terminal-2.14.1" = {
+      name = "jquery.terminal";
+      packageName = "jquery.terminal";
+      version = "2.14.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.14.1.tgz";
+        sha512 = "cYHjjJb4W29WhHP12n40MZ1ljBhB5IHK5VpBYQzzK9KV5ImlO5vLEAr+vcEEZhZ26UXPLVenOMXB0xIZTAxPKA==";
+      };
+    };
     "js-base64-2.5.2" = {
       name = "js-base64";
       packageName = "js-base64";
@@ -23534,13 +23579,13 @@ let
         sha1 = "b9eb01fe29f5ea3e92878f15aea10ad38b5acf89";
       };
     };
-    "json-refs-3.0.13" = {
+    "json-refs-3.0.15" = {
       name = "json-refs";
       packageName = "json-refs";
-      version = "3.0.13";
+      version = "3.0.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.13.tgz";
-        sha512 = "/FJ+BJ6BASjmNsBJHE8qMVj46HTS2Pfq5gI5BQRhyUsdrw9HaHRWSOsOh87deTOyWMtGas5Qr8H6ikrcWHdZbw==";
+        url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.15.tgz";
+        sha512 = "0vOQd9eLNBL18EGl5yYaO44GhixmImes2wiYn9Z3sag3QnehWrYWlB9AFtMxCL2Bj3fyxgDYkxGFEU/chlYssw==";
       };
     };
     "json-rpc2-0.8.1" = {
@@ -24139,6 +24184,15 @@ let
         sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b";
       };
     };
+    "keyboardevent-key-polyfill-1.1.0" = {
+      name = "keyboardevent-key-polyfill";
+      packageName = "keyboardevent-key-polyfill";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/keyboardevent-key-polyfill/-/keyboardevent-key-polyfill-1.1.0.tgz";
+        sha1 = "8a319d8e45a13172fca56286372f90c1d4c7014c";
+      };
+    };
     "keygrip-1.1.0" = {
       name = "keygrip";
       packageName = "keygrip";
@@ -24805,6 +24859,15 @@ let
         sha512 = "5lMmsPc9ZtMjBk8rJ8ADKIj6AOgYvRtAuNfboO2TVPZsmcn6gSRyijUsA8KG6DUcJ89/hyQ3cnVRyzO1hbDavw==";
       };
     };
+    "line-reader-0.4.0" = {
+      name = "line-reader";
+      packageName = "line-reader";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/line-reader/-/line-reader-0.4.0.tgz";
+        sha1 = "17e44818da0ac335675ba300954f94ef670e66fd";
+      };
+    };
     "lines-and-columns-1.1.6" = {
       name = "lines-and-columns";
       packageName = "lines-and-columns";
@@ -33282,13 +33345,13 @@ let
         sha512 = "BUIorsYJTvS9UhXxPTzupIztOMVNPa/HtAm9KHni9z6qEfiJ1bpOBL5DfUOL9XAc3XkLIEzBzpph+Zbm4AdRAg==";
       };
     };
-    "posthtml-render-1.1.5" = {
+    "posthtml-render-1.2.0" = {
       name = "posthtml-render";
       packageName = "posthtml-render";
-      version = "1.1.5";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/posthtml-render/-/posthtml-render-1.1.5.tgz";
-        sha512 = "yvt54j0zCBHQVEFAuR+yHld8CZrCa/E1Z/OcFNCV1IEWTLVxT8O7nYnM4IIw1CD4r8kaRd3lc42+0lgCKgm87w==";
+        url = "https://registry.npmjs.org/posthtml-render/-/posthtml-render-1.2.0.tgz";
+        sha512 = "dQB+hoAKDtnI94RZm/wxBUH9My8OJcXd0uhWmGh2c7tVtQ85A+OS3yCN3LNbFtPz3bViwBJXAeoi+CBGMXM0DA==";
       };
     };
     "prebuild-install-5.3.3" = {
@@ -38529,13 +38592,13 @@ let
         sha512 = "9NjxHVMd1U1LFw66Lya4LXgrsFUiuRiL4opxfTFo0LmMNzUoU5Bk/p0zDdg3FE5Wg61r4fP2D8w+QTl6M8CGiw==";
       };
     };
-    "snyk-docker-plugin-1.38.0" = {
+    "snyk-docker-plugin-2.2.0" = {
       name = "snyk-docker-plugin";
       packageName = "snyk-docker-plugin";
-      version = "1.38.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.38.0.tgz";
-        sha512 = "43HbJj6QatuL2BNG+Uq2Taa73wdfSQSID8FJWW4q5/LYgd9D+RtdiE4lAMwxqYYbvThU9uuza4epuF/B1CAlYw==";
+        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-2.2.0.tgz";
+        sha512 = "adoerkNsYNNZFKnvtjJLJeEgjUf2js0hnG32aUJSRtbDN1Ejgbj88a0UYc90C+s2xZJaulJgImy9/5IsG5/omg==";
       };
     };
     "snyk-go-parser-1.4.0" = {
@@ -46405,6 +46468,15 @@ let
         sha1 = "c9af18876f7a175801d564fe70ad9e8317784934";
       };
     };
+    "xdg-basedir-2.0.0" = {
+      name = "xdg-basedir";
+      packageName = "xdg-basedir";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz";
+        sha1 = "edbc903cc385fc04523d966a335504b5504d1bd2";
+      };
+    };
     "xdg-basedir-3.0.0" = {
       name = "xdg-basedir";
       packageName = "xdg-basedir";
@@ -47421,7 +47493,7 @@ in
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
       sources."has-symbols-1.0.1"
-      sources."hosted-git-info-3.0.2"
+      sources."hosted-git-info-3.0.3"
       sources."http-cache-semantics-3.8.1"
       (sources."http-proxy-agent-2.1.0" // {
         dependencies = [
@@ -47489,7 +47561,7 @@ in
       sources."node-fetch-npm-2.0.2"
       (sources."normalize-package-data-2.5.0" // {
         dependencies = [
-          sources."hosted-git-info-2.8.5"
+          sources."hosted-git-info-2.8.6"
           sources."semver-5.7.1"
         ];
       })
@@ -47497,7 +47569,7 @@ in
       sources."npm-normalize-package-bin-1.0.1"
       (sources."npm-package-arg-6.1.1" // {
         dependencies = [
-          sources."hosted-git-info-2.8.5"
+          sources."hosted-git-info-2.8.6"
           sources."semver-5.7.1"
         ];
       })
@@ -48395,12 +48467,12 @@ in
       sources."@types/graphql-upload-8.0.3"
       sources."@types/http-assert-1.5.1"
       sources."@types/keygrip-1.0.2"
-      sources."@types/koa-2.11.1"
+      sources."@types/koa-2.11.2"
       sources."@types/koa-compose-3.2.5"
       sources."@types/long-4.0.1"
       sources."@types/mime-2.0.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.4"
+      sources."@types/node-13.7.5"
       sources."@types/node-fetch-2.5.4"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/range-parser-1.2.3"
@@ -48828,7 +48900,7 @@ in
       })
       sources."find-up-3.0.0"
       sources."fkill-6.2.0"
-      sources."flow-parser-0.119.0"
+      sources."flow-parser-0.119.1"
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
@@ -48923,7 +48995,7 @@ in
       sources."he-1.2.0"
       sources."header-case-1.0.1"
       sources."homedir-polyfill-1.0.3"
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.6"
       (sources."htmlparser2-3.10.1" // {
         dependencies = [
           sources."readable-stream-3.6.0"
@@ -49994,7 +50066,7 @@ in
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.4"
+      sources."@types/node-13.7.5"
       sources."balanced-match-1.0.0"
       sources."bluebird-3.7.2"
       sources."brace-expansion-1.1.11"
@@ -50221,7 +50293,7 @@ in
       sources."get-stdin-4.0.1"
       sources."glob-6.0.4"
       sources."graceful-fs-3.0.12"
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.6"
       sources."indent-string-2.1.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -50646,7 +50718,7 @@ in
       sources."har-validator-5.1.3"
       sources."has-ansi-1.0.3"
       sources."hat-0.0.3"
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.6"
       sources."http-signature-1.2.0"
       sources."immediate-chunk-store-1.0.8"
       sources."indent-string-2.1.0"
@@ -51092,7 +51164,7 @@ in
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.4"
+      sources."@types/node-13.7.5"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       sources."ajv-6.12.0"
@@ -51323,7 +51395,7 @@ in
           sources."kind-of-4.0.0"
         ];
       })
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.6"
       (sources."http-errors-1.7.2" // {
         dependencies = [
           sources."inherits-2.0.3"
@@ -51702,7 +51774,7 @@ in
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.4"
+      sources."@types/node-13.7.5"
       sources."arr-diff-4.0.0"
       sources."arr-flatten-1.1.0"
       sources."arr-union-3.1.0"
@@ -51824,7 +51896,7 @@ in
           sources."kind-of-4.0.0"
         ];
       })
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.6"
       sources."ignore-4.0.6"
       sources."indent-string-3.2.0"
       sources."inflight-1.0.6"
@@ -52048,7 +52120,7 @@ in
       sources."@cycle/run-3.4.0"
       sources."@cycle/time-0.10.1"
       sources."@types/cookiejar-2.1.1"
-      sources."@types/node-13.7.4"
+      sources."@types/node-13.7.5"
       sources."@types/superagent-3.8.2"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-2.1.1"
@@ -52097,7 +52169,7 @@ in
       sources."external-editor-2.2.0"
       sources."figures-2.0.0"
       sources."form-data-2.5.1"
-      sources."formidable-1.2.1"
+      sources."formidable-1.2.2"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
       sources."iconv-lite-0.4.24"
@@ -53271,7 +53343,7 @@ in
       sources."assert-plus-1.0.0"
       sources."async-2.6.3"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.625.0"
+      sources."aws-sdk-2.626.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.9.1"
       sources."base64-js-1.3.1"
@@ -53496,7 +53568,7 @@ in
       sources."has-symbol-support-x-1.4.2"
       sources."has-to-string-tag-x-1.4.1"
       sources."home-or-tmp-2.0.0"
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.6"
       sources."import-jsx-1.3.2"
       sources."imurmurhash-0.1.4"
       sources."indent-string-3.2.0"
@@ -54052,7 +54124,7 @@ in
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
       sources."hasha-2.2.0"
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.6"
       sources."http-signature-1.2.0"
       sources."indent-string-2.1.0"
       sources."inherits-2.0.4"
@@ -54240,7 +54312,7 @@ in
       sources."get-stream-5.1.0"
       sources."hard-rejection-2.1.0"
       sources."has-flag-4.0.0"
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.6"
       sources."human-signals-1.1.1"
       sources."iconv-lite-0.4.24"
       sources."indent-string-4.0.0"
@@ -55135,7 +55207,7 @@ in
       sources."hard-rejection-2.1.0"
       sources."has-flag-4.0.0"
       sources."has-yarn-2.1.0"
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.6"
       sources."http-cache-semantics-4.0.4"
       sources."human-signals-1.1.1"
       sources."iconv-lite-0.4.24"
@@ -55631,7 +55703,7 @@ in
       sources."has-yarn-2.1.0"
       sources."header-case-1.0.1"
       sources."homedir-polyfill-1.0.3"
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.6"
       sources."http-cache-semantics-4.0.4"
       (sources."http-errors-1.7.2" // {
         dependencies = [
@@ -56615,7 +56687,7 @@ in
         ];
       })
       sources."homedir-polyfill-1.0.3"
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.6"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
@@ -56995,7 +57067,7 @@ in
         ];
       })
       sources."homedir-polyfill-1.0.3"
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
       sources."interpret-1.2.0"
@@ -57570,6 +57642,60 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  insect = nodeEnv.buildNodePackage {
+    name = "insect";
+    packageName = "insect";
+    version = "5.4.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/insect/-/insect-5.4.0.tgz";
+      sha512 = "l4g7U75E+WgrgNGH774djfTyp5Aw+2jJokYe9iCunSAbi/w+nRGHqTJfwbODLwiJQTnbXkM42FxgPRA29Ce7Bg==";
+    };
+    dependencies = [
+      sources."@types/jquery-3.3.33"
+      sources."@types/sizzle-2.3.2"
+      sources."balanced-match-1.0.0"
+      sources."brace-expansion-1.1.11"
+      sources."clipboard-2.0.4"
+      sources."clone-1.0.4"
+      sources."concat-map-0.0.1"
+      sources."decimal.js-7.5.1"
+      sources."defaults-1.0.3"
+      sources."delegate-3.2.0"
+      sources."fs-extra-0.24.0"
+      sources."fs.realpath-1.0.0"
+      sources."glob-7.1.6"
+      sources."good-listener-1.2.2"
+      sources."graceful-fs-4.2.3"
+      sources."historic-readline-1.0.8"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
+      sources."jquery-3.4.1"
+      sources."jquery.terminal-2.14.1"
+      sources."jsonfile-2.4.0"
+      sources."keyboardevent-key-polyfill-1.1.0"
+      sources."line-reader-0.4.0"
+      sources."minimatch-3.0.4"
+      sources."once-1.4.0"
+      sources."os-homedir-1.0.2"
+      sources."path-is-absolute-1.0.1"
+      sources."prismjs-1.19.0"
+      sources."rimraf-2.7.1"
+      sources."select-1.1.2"
+      sources."tiny-emitter-2.1.0"
+      sources."wcwidth-1.0.1"
+      sources."wrappy-1.0.2"
+      sources."xdg-basedir-2.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "High precision scientific calculator with support for physical units";
+      homepage = https://github.com/sharkdp/insect;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   ionic = nodeEnv.buildNodePackage {
     name = "ionic";
     packageName = "ionic";
@@ -57667,7 +57793,7 @@ in
       sources."figures-3.2.0"
       sources."file-uri-to-path-1.0.0"
       sources."form-data-2.5.1"
-      sources."formidable-1.2.1"
+      sources."formidable-1.2.2"
       sources."fs-extra-8.1.0"
       sources."fs-minipass-1.2.7"
       sources."fs.realpath-1.0.0"
@@ -58045,7 +58171,7 @@ in
       sources."har-validator-5.1.3"
       sources."has-flag-3.0.0"
       sources."has-unicode-2.0.1"
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.6"
       sources."http-signature-1.2.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -58318,10 +58444,10 @@ in
   jake = nodeEnv.buildNodePackage {
     name = "jake";
     packageName = "jake";
-    version = "10.4.5";
+    version = "10.4.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/jake/-/jake-10.4.5.tgz";
-      sha512 = "C3lYe6+tTk8mLq3aD+p59kHTjnRgW8U5A6tMBQKug0CMbLZ/sLnAwcH9SDHFZH/D9irbedbkvqCGaRbkGJ/QBg==";
+      url = "https://registry.npmjs.org/jake/-/jake-10.4.6.tgz";
+      sha512 = "bfxWbCowItajx7PV0xyoRfLC1DCND7z308JD5OvMhmsjO9232onI0jbbFZFWnvLSMzniRBhOee9EggsWBQ1+Ew==";
     };
     dependencies = [
       sources."ansi-styles-3.2.1"
@@ -59213,16 +59339,16 @@ in
   json-refs = nodeEnv.buildNodePackage {
     name = "json-refs";
     packageName = "json-refs";
-    version = "3.0.13";
+    version = "3.0.14";
     src = fetchurl {
-      url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.13.tgz";
-      sha512 = "/FJ+BJ6BASjmNsBJHE8qMVj46HTS2Pfq5gI5BQRhyUsdrw9HaHRWSOsOh87deTOyWMtGas5Qr8H6ikrcWHdZbw==";
+      url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.14.tgz";
+      sha512 = "+4j+3FzUO3EjQA3QJX5LIMakunOIGQ7nnQsOFwYj2hZQWrPZdmlvwQPnmjcdJ7bHdPju2u/s7jM7WAF+0alXTg==";
     };
     dependencies = [
       sources."argparse-1.0.10"
       sources."asynckit-0.4.0"
       sources."combined-stream-1.0.8"
-      sources."commander-2.19.0"
+      sources."commander-4.1.1"
       sources."component-emitter-1.3.0"
       sources."cookiejar-2.1.2"
       sources."core-util-is-1.0.2"
@@ -59231,7 +59357,7 @@ in
       sources."esprima-4.0.1"
       sources."extend-3.0.2"
       sources."form-data-2.5.1"
-      sources."formidable-1.2.1"
+      sources."formidable-1.2.2"
       sources."graphlib-2.1.8"
       sources."inherits-2.0.4"
       sources."isarray-1.0.0"
@@ -59249,7 +59375,7 @@ in
       sources."qs-6.9.1"
       sources."readable-stream-2.3.7"
       sources."safe-buffer-5.1.2"
-      sources."slash-2.0.0"
+      sources."slash-3.0.0"
       sources."sprintf-js-1.0.3"
       sources."string_decoder-1.1.1"
       sources."superagent-3.8.3"
@@ -60236,7 +60362,7 @@ in
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.4"
+      sources."@types/node-13.7.5"
       sources."@zkochan/cmd-shim-3.1.0"
       sources."JSONStream-1.3.5"
       sources."abbrev-1.1.1"
@@ -60578,7 +60704,7 @@ in
           sources."kind-of-4.0.0"
         ];
       })
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.6"
       sources."http-cache-semantics-3.8.1"
       sources."http-proxy-agent-2.1.0"
       sources."http-signature-1.2.0"
@@ -62129,7 +62255,7 @@ in
         ];
       })
       sources."@jest/types-25.1.0"
-      sources."@types/babel__core-7.1.5"
+      sources."@types/babel__core-7.1.6"
       sources."@types/babel__generator-7.6.1"
       sources."@types/babel__template-7.0.2"
       sources."@types/babel__traverse-7.0.9"
@@ -62138,10 +62264,10 @@ in
       sources."@types/istanbul-lib-coverage-2.0.1"
       sources."@types/istanbul-lib-report-3.0.0"
       sources."@types/istanbul-reports-1.1.1"
-      sources."@types/node-13.7.4"
+      sources."@types/node-13.7.5"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/resolve-0.0.8"
-      sources."@types/yargs-15.0.3"
+      sources."@types/yargs-15.0.4"
       sources."@types/yargs-parser-15.0.0"
       sources."@webassemblyjs/ast-1.8.5"
       sources."@webassemblyjs/floating-point-hex-parser-1.8.5"
@@ -62554,7 +62680,7 @@ in
       sources."hash.js-1.1.7"
       sources."hmac-drbg-1.0.1"
       sources."homedir-polyfill-1.0.3"
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.6"
       sources."htmlescape-1.1.1"
       sources."http-signature-1.2.0"
       sources."https-browserify-1.0.0"
@@ -64189,14 +64315,14 @@ in
       sources."esprima-4.0.1"
       sources."extend-3.0.2"
       sources."form-data-2.5.1"
-      sources."formidable-1.2.1"
+      sources."formidable-1.2.2"
       sources."graphlib-2.1.8"
       sources."inherits-2.0.4"
       sources."isarray-1.0.0"
       sources."js-yaml-3.13.1"
-      (sources."json-refs-3.0.13" // {
+      (sources."json-refs-3.0.15" // {
         dependencies = [
-          sources."commander-2.19.0"
+          sources."commander-4.1.1"
         ];
       })
       sources."lodash-4.17.15"
@@ -64212,7 +64338,7 @@ in
       sources."qs-6.9.1"
       sources."readable-stream-2.3.7"
       sources."safe-buffer-5.1.2"
-      sources."slash-2.0.0"
+      sources."slash-3.0.0"
       sources."sprintf-js-1.0.3"
       sources."string_decoder-1.1.1"
       sources."superagent-3.8.3"
@@ -64550,7 +64676,7 @@ in
       sources."hawk-3.1.3"
       sources."headless-0.1.7"
       sources."hoek-2.16.3"
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.6"
       sources."http-errors-1.7.2"
       sources."http-signature-1.1.1"
       sources."iconv-lite-0.4.24"
@@ -65410,7 +65536,7 @@ in
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       sources."has-unicode-2.0.1"
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.6"
       sources."http-signature-1.2.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -65661,10 +65787,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "6.13.7";
+    version = "6.14.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-6.13.7.tgz";
-      sha512 = "X967EKTT407CvgrWFjXusnPh0VLERcmR9hZFSVgkEquOomZkvpwLJ5zrQ3qrG9SpPLKJE4bPLUu76exKQ4a3Cg==";
+      url = "https://registry.npmjs.org/npm/-/npm-6.14.0.tgz";
+      sha512 = "OgfdLadz7j6dikbpaimmLzMxwLKbXthQXHiJwtegorwtBVnhecfUeYkHopwd5ICaiClQnqlYQCHERXDiYK3Jcw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -65785,7 +65911,7 @@ in
       sources."has-ansi-2.0.0"
       sources."has-flag-4.0.0"
       sources."has-yarn-2.1.0"
-      sources."hosted-git-info-3.0.2"
+      sources."hosted-git-info-3.0.3"
       sources."http-cache-semantics-4.0.4"
       sources."http-proxy-agent-3.0.0"
       sources."https-proxy-agent-4.0.0"
@@ -66951,7 +67077,7 @@ in
       sources."postcss-value-parser-3.3.1"
       sources."posthtml-0.11.6"
       sources."posthtml-parser-0.4.2"
-      sources."posthtml-render-1.1.5"
+      sources."posthtml-render-1.2.0"
       sources."prelude-ls-1.1.2"
       sources."private-0.1.8"
       sources."process-0.11.10"
@@ -67593,7 +67719,7 @@ in
       sources."has-flag-3.0.0"
       sources."has-symbols-1.0.1"
       sources."hat-0.0.3"
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.6"
       sources."http-headers-3.0.2"
       sources."iconv-lite-0.4.24"
       sources."immediate-chunk-store-1.0.8"
@@ -69008,7 +69134,7 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.625.0" // {
+      (sources."aws-sdk-2.626.0" // {
         dependencies = [
           sources."buffer-4.9.1"
           sources."uuid-3.3.2"
@@ -69201,7 +69327,7 @@ in
       sources."flat-5.0.0"
       sources."for-in-1.0.2"
       sources."form-data-2.5.1"
-      sources."formidable-1.2.1"
+      sources."formidable-1.2.2"
       sources."fragment-cache-0.2.1"
       sources."from2-2.3.0"
       sources."fs-constants-1.0.0"
@@ -70158,7 +70284,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."escape-regexp-component-1.0.2"
       sources."extsprintf-1.2.0"
-      sources."formidable-1.2.1"
+      sources."formidable-1.2.2"
       (sources."getpass-0.1.7" // {
         dependencies = [
           sources."assert-plus-1.0.0"
@@ -70282,10 +70408,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.296.1";
+    version = "1.297.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.296.1.tgz";
-      sha512 = "Je0fww4Ak473uMli1Vzw4fkQ4I04H200hXkdVHVCK169seG/HOBZaese+AncYnzGpvMtH1hTZrDlpSNolrDvLw==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.297.1.tgz";
+      sha512 = "o+BfGFrgEdko8TWbZUPc6LZXB6Ma0frL7A82uz0SoE5/dMHYNj8ko9cJ8AUf3kDZ9JoMuuQDVn4UPHAfffUkNA==";
     };
     dependencies = [
       sources."@snyk/cli-interface-2.3.2"
@@ -70306,7 +70432,7 @@ in
       sources."@types/debug-4.1.5"
       sources."@types/events-3.0.0"
       sources."@types/js-yaml-3.12.2"
-      sources."@types/node-13.7.4"
+      sources."@types/node-13.7.5"
       sources."@types/restify-4.3.6"
       sources."@types/semver-5.5.0"
       sources."@types/xml2js-0.4.3"
@@ -70374,7 +70500,7 @@ in
       })
       sources."depd-1.1.2"
       sources."diff-4.0.2"
-      sources."dockerfile-ast-0.0.18"
+      sources."dockerfile-ast-0.0.19"
       sources."dot-prop-5.2.0"
       (sources."dotnet-deps-parser-4.9.0" // {
         dependencies = [
@@ -70421,7 +70547,7 @@ in
       sources."graceful-fs-4.2.3"
       sources."graphlib-2.1.8"
       sources."has-flag-3.0.0"
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.6"
       sources."http-errors-1.7.3"
       (sources."http-proxy-agent-2.1.0" // {
         dependencies = [
@@ -70559,7 +70685,7 @@ in
       sources."signal-exit-3.0.2"
       sources."smart-buffer-4.1.0"
       sources."snyk-config-2.2.3"
-      (sources."snyk-docker-plugin-1.38.0" // {
+      (sources."snyk-docker-plugin-2.2.0" // {
         dependencies = [
           sources."debug-4.1.1"
         ];
@@ -70836,7 +70962,7 @@ in
       sources."got-6.7.1"
       sources."graceful-fs-4.2.3"
       sources."has-flag-3.0.0"
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.6"
       sources."http-proxy-agent-2.1.0"
       sources."https-proxy-agent-3.0.1"
       sources."import-lazy-2.1.0"
@@ -71839,7 +71965,7 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      (sources."aws-sdk-2.625.0" // {
+      (sources."aws-sdk-2.626.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -72030,7 +72156,7 @@ in
       })
       sources."forever-agent-0.6.1"
       sources."form-data-2.1.4"
-      sources."formidable-1.2.1"
+      sources."formidable-1.2.2"
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
       sources."fs.realpath-1.0.0"
@@ -72070,7 +72196,7 @@ in
         ];
       })
       sources."hoek-2.16.3"
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.6"
       (sources."http-errors-1.7.2" // {
         dependencies = [
           sources."inherits-2.0.3"
@@ -72876,7 +73002,7 @@ in
       sources."finalhandler-1.1.2"
       sources."for-in-1.0.2"
       sources."form-data-2.5.1"
-      sources."formidable-1.2.1"
+      sources."formidable-1.2.2"
       sources."fragment-cache-0.2.1"
       sources."fresh-0.5.2"
       sources."fs-extra-0.24.0"
@@ -73330,7 +73456,7 @@ in
       sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b";
     };
     dependencies = [
-      sources."@types/node-13.7.4"
+      sources."@types/node-13.7.5"
       sources."ajv-6.12.0"
       sources."ansi-regex-4.1.0"
       sources."ansi-styles-3.2.1"
@@ -73570,7 +73696,7 @@ in
       sources."has-1.0.3"
       sources."has-ansi-2.0.0"
       sources."has-symbols-1.0.1"
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.6"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."is-alphabetical-1.0.4"
@@ -73874,7 +74000,7 @@ in
       sources."got-6.7.1"
       sources."graceful-fs-4.2.3"
       sources."has-flag-3.0.0"
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.6"
       sources."ignore-3.3.10"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
@@ -74469,7 +74595,7 @@ in
       sources."@types/color-name-1.1.1"
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-13.7.4"
+      sources."@types/node-13.7.5"
       sources."@types/responselike-1.0.0"
       sources."abbrev-1.1.1"
       sources."abstract-logging-1.0.0"
@@ -75511,7 +75637,7 @@ in
       })
       sources."find-up-3.0.0"
       sources."form-data-2.5.1"
-      sources."formidable-1.2.1"
+      sources."formidable-1.2.2"
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
       sources."fs.realpath-1.0.0"
@@ -76111,7 +76237,7 @@ in
       sources."@starptech/rehype-webparser-0.10.0"
       sources."@starptech/webparser-0.10.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-13.7.4"
+      sources."@types/node-13.7.5"
       sources."@types/unist-2.0.3"
       sources."@types/vfile-3.0.2"
       sources."@types/vfile-message-2.0.0"
@@ -76455,7 +76581,7 @@ in
       sources."hast-util-parse-selector-2.2.3"
       sources."hast-util-to-string-1.0.2"
       sources."hast-util-whitespace-1.0.3"
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.6"
       sources."html-void-elements-1.0.5"
       sources."html-whitespace-sensitive-tag-names-1.0.1"
       sources."http-cache-semantics-4.0.4"
@@ -77113,7 +77239,7 @@ in
       sources."@szmarczak/http-timer-1.1.2"
       sources."@types/color-name-1.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.4"
+      sources."@types/node-13.7.5"
       sources."JSONSelect-0.2.1"
       sources."acorn-6.4.0"
       sources."acorn-jsx-5.1.0"
@@ -78997,7 +79123,7 @@ in
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.4"
+      sources."@types/node-13.7.5"
       sources."accepts-1.3.7"
       sources."ajv-6.12.0"
       sources."ajv-errors-1.0.1"
@@ -80393,7 +80519,7 @@ in
           sources."kind-of-4.0.0"
         ];
       })
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.6"
       sources."http-cache-semantics-3.8.1"
       sources."http-signature-1.2.0"
       sources."humanize-string-1.0.2"
@@ -80918,4 +81044,4 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-}
+}
\ No newline at end of file

From 9d4aab7880a6556f7cf5ff9e1be62da5ace7f4bd Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 24 Feb 2020 18:24:21 -0800
Subject: [PATCH 1536/4636] steam.chrootenv: add udev

Needed by Shadow of the Tomb Raider
---
 pkgs/games/steam/chrootenv.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index d7a962104299..cb85426c23b3 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -86,6 +86,8 @@ in buildFHSUserEnv rec {
     mono
     xorg.xkeyboardconfig
     xorg.libpciaccess
+    udev # shadow of the tomb raider
+
     ## screeps dependencies
     gtk3
     dbus

From 6eeb434b3397b47f26589e3ceeb2aa88857ff33e Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Wed, 26 Feb 2020 01:09:31 +0100
Subject: [PATCH 1537/4636] buildLuarocksPackage: extraVariables is now an
 attrset

---
 .../interpreters/lua-5/build-lua-package.nix        | 13 ++++++++-----
 pkgs/development/lua-modules/overrides.nix          | 10 +++++-----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix
index 3b16ca68342b..f46f88f5e1fa 100644
--- a/pkgs/development/interpreters/lua-5/build-lua-package.nix
+++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix
@@ -56,7 +56,7 @@ name ? "${attrs.pname}-${attrs.version}"
 # Appended to the generated luarocks config
 , extraConfig ? ""
 # Inserted into the generated luarocks config in the "variables" table
-, extraVariables ? ""
+, extraVariables ? {}
 # The two above arguments have access to builder variables -- e.g. to $out
 
 # relative to srcRoot, path to the rockspec to use when using rocks
@@ -77,7 +77,10 @@ let
   # luarocks only looks for rockspecs in the default/system tree instead of all
   # configured trees)
   luarocks_config = "luarocks-config.lua";
-  luarocks_content = ''
+  luarocks_content = let
+    extraVariablesStr = lib.concatStringsSep "\n "
+      (lib.mapAttrsToList (k: v: "${k}='${v}';") extraVariables);
+  in ''
     local_cache = ""
     -- To prevent collisions when creating environments, we install the rock
     -- files into per-package subdirectories
@@ -105,8 +108,8 @@ let
       -- Some needed machinery to handle multiple-output external dependencies,
       -- as per https://github.com/luarocks/luarocks/issues/766
       ${lib.optionalString (lib.length depVariables > 0) ''
-      ${lib.concatStringsSep "\n  " depVariables}''}
-      ${extraVariables}
+        ${lib.concatStringsSep "\n  " depVariables}''}
+      ${extraVariablesStr}
     }
     ${extraConfig}
   '';
@@ -139,7 +142,7 @@ let
   externalDeps' = lib.filter (dep: !lib.isDerivation dep) externalDeps;
 in
 toLuaModule ( lua.stdenv.mkDerivation (
-builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps"] // {
+builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariables"] // {
 
   name = namePrefix + name;
 
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index fd99a70de3a6..cb429e59c927 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -153,11 +153,11 @@ with super;
   });
 
   luadbi-mysql = super.luadbi-mysql.override({
-    extraVariables = ''
-      -- Can't just be /include and /lib, unfortunately needs the trailing 'mysql'
-      MYSQL_INCDIR='${pkgs.libmysqlclient}/include/mysql';
-      MYSQL_LIBDIR='${pkgs.libmysqlclient}/lib/mysql';
-    '';
+    extraVariables = {
+      # Can't just be /include and /lib, unfortunately needs the trailing 'mysql'
+      MYSQL_INCDIR="${pkgs.libmysqlclient}/include/mysql";
+      MYSQL_LIBDIR="${pkgs.libmysqlclient}/lib/mysql";
+    };
     buildInputs = [
       pkgs.mysql.client
       pkgs.libmysqlclient

From 006aeb5704123f259d5cda435a991b3d72225b32 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Wed, 26 Feb 2020 01:13:29 +0100
Subject: [PATCH 1538/4636] buidLuarocksPackage: add a checkPhase

---
 pkgs/development/interpreters/lua-5/build-lua-package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/interpreters/lua-5/build-lua-package.nix b/pkgs/development/interpreters/lua-5/build-lua-package.nix
index f46f88f5e1fa..98a98c0dd348 100644
--- a/pkgs/development/interpreters/lua-5/build-lua-package.nix
+++ b/pkgs/development/interpreters/lua-5/build-lua-package.nix
@@ -230,6 +230,13 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab
     runHook postInstall
   '';
 
+
+  checkPhase = attrs.checkPhase or ''
+    runHook preCheck
+    $LUAROCKS test
+    runHook postCheck
+  '';
+
   passthru = {
     inherit lua; # The lua interpreter
     inherit externalDeps;

From fa166b77d19ec78d4cd01b9696a47f1118ff74f4 Mon Sep 17 00:00:00 2001
From: Jeff Labonte <grimsleepless@protonmail.com>
Date: Tue, 25 Feb 2020 20:03:02 -0500
Subject: [PATCH 1539/4636] brave: 1.3.118 -> 1.4.95

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

diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index 53d58334b86f..63d56a48038c 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -82,11 +82,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "brave";
-  version = "1.3.118";
+  version = "1.4.95";
 
   src = fetchurl {
     url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-    sha256 = "1pmz10h35fm54453h7m0qiynyfpfmwaicmwzs41c4h8xavqgr6mb";
+    sha256 = "1a7rk4r7phlf1y3ap3942z5sfvb6i4qglvq06qqhz49wq1wbgvq1";
   };
 
   dontConfigure = true;

From d032f5a8d22c57eca9a710ea3662586236437ed9 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 25 Feb 2020 20:23:21 -0500
Subject: [PATCH 1540/4636] pastel: 0.6.1 -> 0.7.0

Changelog: https://github.com/sharkdp/pastel/releases/tag/v0.7.0
---
 pkgs/applications/misc/pastel/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix
index 7b070e32ca56..4847f06ebb82 100644
--- a/pkgs/applications/misc/pastel/default.nix
+++ b/pkgs/applications/misc/pastel/default.nix
@@ -2,22 +2,23 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pastel";
-  version = "0.6.1";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1c47bph1qraq3g0g5bp23jqlz7qdn4f8vh264y937jz17avvacx5";
+    sha256 = "1fh0l64bvpbgm1725qmyq3042pglr8wz3w1azjv6lml9ivrm4b0k";
   };
 
-  cargoSha256 = "1hkqahsrhmgcpgp0pvfpc0wmwqivnqylsxzjrz63k1s9ssdv9syy";
+  cargoSha256 = "0q7p66r6hwqaalwm9fd2bshadlynhjf3pzd6rnamr07mknyfzh5s";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 
   meta = with stdenv.lib; {
     description = "A command-line tool to generate, analyze, convert and manipulate colors";
-    homepage = https://github.com/sharkdp/pastel;
+    homepage = "https://github.com/sharkdp/pastel";
+    changelog = "https://github.com/sharkdp/pastel/releases/tag/v${version}";
     license = with licenses; [ asl20 /* or */ mit ];
     maintainers = with maintainers; [ davidtwco ];
     platforms = platforms.all;

From 675dcd3618ea37b97a868382333ce7bc19d3026c Mon Sep 17 00:00:00 2001
From: Evan Stoll <evanjsx@gmail.com>
Date: Tue, 25 Feb 2020 21:25:38 -0500
Subject: [PATCH 1541/4636] gitkraken: 6.5.1 -> 6.5.3

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

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 73d376396a66..b14d183705c6 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -13,11 +13,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "gitkraken";
-  version = "6.5.1";
+  version = "6.5.3";
 
   src = fetchzip {
     url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
-    sha256 = "0dwjwismv4rfw58801g2ay51h9qrffcxgbl910frd4i530w0y44p";
+    sha256 = "0pw39cxh6p49h8gxxqfn1a2qf3gpxr5naz2cffd7dz0gwslgia2d";
   };
 
   dontBuild = true;

From a0f50fe24b639b3974183f02eb61d205791bcd3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Maret?= <sebastien.maret@icloud.com>
Date: Tue, 25 Feb 2020 17:51:15 +0100
Subject: [PATCH 1542/4636] pythonPackages.reproject: fix tests

Co-Authored-By: Jon <jonringer@users.noreply.github.com>
---
 pkgs/development/python-modules/reproject/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix
index 18fdd682f712..2d4d24cf8057 100644
--- a/pkgs/development/python-modules/reproject/default.nix
+++ b/pkgs/development/python-modules/reproject/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, fetchpatch
 , numpy
 , astropy
 , astropy-healpix
@@ -24,6 +25,12 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ astropy-helpers cython ];
 
+  # Fix tests
+  patches = [ (fetchpatch {
+    url = "https://github.com/astropy/reproject/pull/218/commits/4661e075137424813ed77f1ebcbc251fee1b8467.patch";
+    sha256 = "13g3h824pqn2lgypzg1b87vkd44y7m302lhw3kh4rfww1dkzhm9v";
+  }) ];
+
   # Disable automatic update of the astropy-helper module
   postPatch = ''
     substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False"

From a93903de395aedbe5ef3be1945aa045f746958cc Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Tue, 25 Feb 2020 22:18:50 -0500
Subject: [PATCH 1543/4636] boringtun: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/networking/boringtun/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/tools/networking/boringtun/default.nix
index 60a9469bced4..59654501a396 100644
--- a/pkgs/tools/networking/boringtun/default.nix
+++ b/pkgs/tools/networking/boringtun/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1mijy51hd8c4as9g4ivpfxismc9m5m3nhibfvclh3wrlcmp1ha9c";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1gvmshwg9b486933vfgkg2r8nn6w6dyz42hqjy74p785fcg0v5hs";
+  cargoSha256 = "1kbbkbrfjff4yicwanydmcjr2av6s6wrsgafpvbh255vvkd7mr6x";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
 

From 42850aabd124d360a556fa5b01de9fb32a8e0fc8 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Tue, 25 Feb 2020 23:03:55 -0500
Subject: [PATCH 1544/4636] gitAndTools.git-absorb: upgrade cargo fetcher and
 cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 .../version-management/git-and-tools/git-absorb/default.nix  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix
index f07e05e23e2e..3f5cbad4c12f 100644
--- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix
@@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1khplyglavsidh13nnq9y5rxd5w89ail08wgzn29a5m03zir1yfd";
+  cargoSha256 = "13gikjswbb0kkpvb5zhj88qq5l667624gkfb7hd3zygh4qyhsy05";
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/tummychow/git-absorb";

From 71137f918245edff17ab722c9f5a2200adb2a824 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Tue, 25 Feb 2020 23:05:14 -0500
Subject: [PATCH 1545/4636] gitAndTools.git-interactive-rebase-tool: upgrade
 cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 .../git-and-tools/git-interactive-rebase-tool/default.nix    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix
index 1e343cdb1800..6d548f040541 100644
--- a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "10z3di2qypgsmg2z7xfs9nlrf9vng5i7l8dvqadv1l4lb9zz7i8q";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "002kr52vlpv1rhnxki29xflpmgk6bszrw0dsxcc34kyal0593ajk";
+  cargoSha256 = "0jc6mhszxmwsdjk73wkfi0jjp9vkzzl9kk0dbnry6w7dyr5if8cc";
 
   buildInputs = [ ncurses5 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
 

From 69ac30f87d824a5f5cc9d38b3c5311c62610515a Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Tue, 25 Feb 2020 23:12:45 -0500
Subject: [PATCH 1546/4636] gitAndTools.git-gone: upgrade cargo fetcher and
 cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 .../version-management/git-and-tools/git-gone/default.nix    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix
index 54f7e935ea33..aaf22c940cb1 100644
--- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "05wlng563p9iy0ky3z23a4jakcix887fb45r7j2mk0fp5ykdjmzh";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1s3v5p6qgz74sh34gvajf453fsgl13sds4v8hz8c6ivipz4hpby2";
+  cargoSha256 = "1scp9rzn59akxsf9p48j1zq6clbwdyasnyi4j28nj03ghvdv2i33";
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];
 

From a71745713589c3a2a140e39d2ab6b8fa3e2f7c73 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Tue, 25 Feb 2020 23:15:04 -0500
Subject: [PATCH 1547/4636] gitAndTools.git-codeowners: upgrade cargo fetcher
 and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 .../git-and-tools/git-codeowners/default.nix                 | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
index 635393b1deb0..2517e20ce9d7 100644
--- a/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-codeowners/default.nix
@@ -10,10 +10,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0bzq4ridzb4l1zqrj1r0vlzkjpgfaqwky5jf49cwjhz4ybwrfpkq";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1k5gxbjv4a8l5y9rm0n4vwzlwp4hk1rb59v0wvcirmj0p7hpw9x9";
+  cargoSha256 = "0r0hyp15knbbs4l9rcn395pzrx2vbibmwvs4pmga363irmi8mcy5";
 
   meta = with lib; {
     homepage = "https://github.com/softprops/git-codeowners";

From f2b14397d4106a47d12d16a4a57a7210a758d77d Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Tue, 25 Feb 2020 23:20:29 -0500
Subject: [PATCH 1548/4636] gitAndTools.git-ignore: upgrade cargo fetcher and
 cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 .../version-management/git-and-tools/git-ignore/default.nix  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
index e50efb5c6b7d..d8125f604bf6 100644
--- a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
@@ -13,10 +13,7 @@ buildRustPackage rec {
     sha256 = "0krz50pw9bkyzl78bvppk6skbpjp8ga7bd34jya4ha1xfmd8p89c";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1ccipxifnm38315qigaq28hlzam2wr8q2p2dbcq96kar6pq377vf";
+  cargoSha256 = "0vcg2pl0s329fr8p23pwdx2jy7qahbr7n337ib61f69aaxi1xmq0";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ openssl ]

From c3f7554a34bf267654d4328d83eb7b75769a2e1c Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Tue, 25 Feb 2020 23:24:48 -0500
Subject: [PATCH 1549/4636] gitAndTools.delta: upgrade cargo fetcher and
 cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 .../version-management/git-and-tools/delta/default.nix       | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix
index 36ce0a484b3e..91c448e78575 100644
--- a/pkgs/applications/version-management/git-and-tools/delta/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "01jiqizg1ywvrrwhqzfqzbaqrzyfaqm66sixas0mpyzmd6cdwmh6";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1zmk70hccrxn1gdr1bksnvh6sa2h4518s0ni8k2ihxi4ld1ch5p2";
+  cargoSha256 = "0hah0qfgnl4w2h0djyh4xx1jks5dkzwin01qw001dqiasl60prn2";
 
   meta = with lib; {
     homepage = "https://github.com/dandavison/delta";

From ff41002b802a8d8dd77b60ca83e4f614feceeaf3 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 25 Feb 2020 23:25:43 -0500
Subject: [PATCH 1550/4636] exiv2: fix exiv2.pc file

This fix comes from #71669.
---
 pkgs/development/libraries/exiv2/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index 425346df816e..dc7610ee1782 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -26,6 +26,11 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DEXIV2_BUILD_PO=ON"
     "-DEXIV2_BUILD_DOC=ON"
+    # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly
+    # (setting it to an absolute path causes include files to go to $out/$out/include,
+    #  because the absolute path is interpreted with root at $out).
+    "-DCMAKE_INSTALL_INCLUDEDIR=include"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
   ];
 
   outputs = [ "out" "dev" "doc" "man" ];

From 590f5684e56d864e8e2ea836cceb96c8d70a3f87 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Feb 2020 21:00:05 -0800
Subject: [PATCH 1551/4636] calls: 0.1.1 -> 0.1.2

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

diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix
index d57775c3d8fa..71997ff8ffa7 100644
--- a/pkgs/applications/networking/calls/default.nix
+++ b/pkgs/applications/networking/calls/default.nix
@@ -22,14 +22,14 @@
 
 stdenv.mkDerivation rec {
   pname = "calls";
-  version = "0.1.1";
+  version = "0.1.2";
 
   src = fetchFromGitLab {
     domain = "source.puri.sm";
     owner = "Librem5";
     repo = "calls";
     rev = "v${version}";
-    sha256 = "01inx4mvrzvklwrfryw5hw9p89v8cn78m3qmv97g7a3v0h5c0n35";
+    sha256 = "105r631a0rva1k1fa50lravsfk5dd3f0k3gfc7lvpn2jkd99s1g6";
   };
 
   nativeBuildInputs = [
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A phone dialer and call handler";
-    homepage = https://source.puri.sm/Librem5/calls;
+    homepage = "https://source.puri.sm/Librem5/calls";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ craigem lheckemann ];
     platforms = platforms.linux;

From d35009ee63af7a43ae3ebe6367cd01c40012b83f Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 24 Feb 2020 03:30:16 -0500
Subject: [PATCH 1552/4636] python3Packages.ipykernel: fix build on darwin

Also python34 is not supported:

https://github.com/ipython/ipykernel/commit/979e6fd2db9824934a89d97011d3f3eccc6d4499

nixpkgs doesn't provide python34 anymore, so pythonOlder "3.5" is always
true and can be removed.
---
 .../python-modules/ipykernel/default.nix         | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix
index 6e356665d044..9c0ab175004e 100644
--- a/pkgs/development/python-modules/ipykernel/default.nix
+++ b/pkgs/development/python-modules/ipykernel/default.nix
@@ -16,7 +16,6 @@
 buildPythonPackage rec {
   pname = "ipykernel";
   version = "5.1.4";
-  disabled = pythonOlder "3.4";
 
   src = fetchPypi {
     inherit pname version;
@@ -38,12 +37,23 @@ buildPythonPackage rec {
   preCheck = ''
     export HOME=$(mktemp -d)
   '';
-  disabledTests = lib.optionals stdenv.isDarwin [
+  disabledTests = lib.optionals stdenv.isDarwin ([
     # see https://github.com/NixOS/nixpkgs/issues/76197
     "test_subprocess_print"
     "test_subprocess_error"
     "test_ipython_start_kernel_no_userns"
-  ];
+  ] ++ lib.optionals (pythonOlder "3.8") [
+    # flaky test https://github.com/ipython/ipykernel/issues/485
+    "test_shutdown"
+
+    # test regression https://github.com/ipython/ipykernel/issues/486
+    "test_sys_path_profile_dir"
+    "test_save_history"
+    "test_help_output"
+    "test_write_kernel_spec"
+    "test_ipython_start_kernel_userns"
+    "ZMQDisplayPublisherTests"
+  ]);
 
   # Some of the tests use localhost networking.
   __darwinAllowLocalNetworking = true;

From 38b0c556011e8910c10ceb3d03080e12e4a66c1e Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Tue, 25 Feb 2020 22:46:05 -0800
Subject: [PATCH 1553/4636] smartmontools: 7.0 -> 7.1 and devicedb updated to
 latest

---
 pkgs/tools/system/smartmontools/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix
index 2da76cce0cdd..c4d943cafe7e 100644
--- a/pkgs/tools/system/smartmontools/default.nix
+++ b/pkgs/tools/system/smartmontools/default.nix
@@ -2,13 +2,13 @@
 , IOKit ? null , ApplicationServices ? null }:
 
 let
-  version = "7.0";
+  version = "7.1";
 
-  dbrev = "4883";
-  drivedbBranch = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}_DRIVEDB";
+  dbrev = "5033";
+  drivedbBranch = "RELEASE_7_0_DRIVEDB";
   driverdb = fetchurl {
     url    = "https://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw";
-    sha256 = "07x3haz65jyhj579h4z17v6jkw6bbyid34442gl4qddmgv2qzvwx";
+    sha256 = "029j118lwiazn56vg6d3i7ayv73wrpv1fypw3ff4nd4hgs2mlcrg";
     name   = "smartmontools-drivedb.h";
   };
 
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/smartmontools/${pname}-${version}.tar.gz";
-    sha256 = "077nx2rn9szrg6isdh0938zbp7vr3dsyxl4jdyyzv1xwhqksrqg5";
+    sha256 = "0imqb7ka4ia5573w8rnpck571pjjc9698pdjcapy9cfyk4n4swrz";
   };
 
   patches = [ ./smartmontools.patch ];

From 925404027a5d81b89e624110de7d07cde9173bcb Mon Sep 17 00:00:00 2001
From: bb010g <me@bb010g.com>
Date: Tue, 25 Feb 2020 22:51:00 -0800
Subject: [PATCH 1554/4636] hub-unstable: remove

This has been here for 2 years; we can remove it.

Co-Authored-By: worldofpeace <worldofpeace@protonmail.ch>
---
 pkgs/applications/version-management/git-and-tools/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 0f6dea75c6fb..33626a126492 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -167,8 +167,6 @@ let
     inherit (darwin) Security;
   };
 
-  hubUnstable = throw "use gitAndTools.hub instead";
-
   lab = callPackage ./lab { };
 
   lefthook = callPackage ./lefthook { };

From a7cb757af42a53af19c393a603600d77d447d234 Mon Sep 17 00:00:00 2001
From: bb010g <me@bb010g.com>
Date: Fri, 18 Oct 2019 19:30:06 -0700
Subject: [PATCH 1555/4636] git-and-tools: canonicalize hyphenated names

Old intercaps names are aliased.

darcs-to-git: rename from darcsToGit
git-fast-export: rename from gitFastExport
git-remote-gcrypt: rename from gitRemoteGcrypt
hub-unstable: rename from hubUnstable
top-git: rename from topGit
---
 .../version-management/git-and-tools/default.nix     | 12 ++++++++----
 pkgs/development/tools/misc/hydra/default.nix        |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 33626a126492..7d5e08b9c1ce 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -24,7 +24,7 @@ let
 
   bump2version = pkgs.python37Packages.callPackage ./bump2version { };
 
-  darcsToGit = callPackage ./darcs-to-git { };
+  darcs-to-git = callPackage ./darcs-to-git { };
 
   delta = callPackage ./delta { };
 
@@ -153,9 +153,9 @@ let
 
   git2cl = callPackage ./git2cl { };
 
-  gitFastExport = callPackage ./fast-export { };
+  git-fast-export = callPackage ./fast-export { };
 
-  gitRemoteGcrypt = callPackage ./git-remote-gcrypt { };
+  git-remote-gcrypt = callPackage ./git-remote-gcrypt { };
 
   gitflow = callPackage ./gitflow { };
 
@@ -192,7 +192,7 @@ let
 
   tig = callPackage ./tig { };
 
-  topGit = callPackage ./topgit { };
+  top-git = callPackage ./topgit { };
 
   transcrypt = callPackage ./transcrypt { };
 
@@ -200,8 +200,12 @@ let
 
 } // lib.optionalAttrs (config.allowAliases or true) (with self; {
   # aliases
+  darcsToGit = darcs-to-git;
   gitAnnex = git-annex;
+  gitFastExport = git-fast-export;
+  gitRemoteGcrypt = git-remote-gcrypt;
   svn_all_fast_export = svn-all-fast-export;
+  topGit = top-git;
 });
 in
   self
diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index e66341b5f8cd..72aecf20ca39 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -85,7 +85,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs =
     [ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx
-      gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt
+      gitAndTools.top-git mercurial darcs subversion bazaar openssl bzip2 libxslt
       guile # optional, for Guile + Guix support
       perlDeps perl nix
       postgresql # for running the tests
@@ -95,7 +95,7 @@ in stdenv.mkDerivation rec {
 
   hydraPath = lib.makeBinPath (
     [ sqlite subversion openssh nix coreutils findutils pixz
-      gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar
+      gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial darcs gnused bazaar
     ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 846097b7af5ee4262ed3e07872e7787f48a4fd75 Mon Sep 17 00:00:00 2001
From: bb010g <me@bb010g.com>
Date: Fri, 18 Oct 2019 19:38:41 -0700
Subject: [PATCH 1556/4636] git-and-tools: strongly alphabetize

---
 .../git-and-tools/default.nix                 | 61 +++++++++----------
 1 file changed, 30 insertions(+), 31 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 7d5e08b9c1ce..50301342e755 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -40,29 +40,6 @@ let
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  git-appraise = callPackage ./git-appraise {};
-
-  git-fame = callPackage ./git-fame {};
-
-  git-filter-repo = callPackage ./git-filter-repo {
-    pythonPackages = python3Packages;
-  };
-
-  gita = python3Packages.callPackage ./gita {};
-
-  # The full-featured Git.
-  gitFull = gitBase.override {
-    svnSupport = true;
-    guiSupport = true;
-    sendEmailSupport = true;
-    withLibsecret = !stdenv.isDarwin;
-  };
-
-  # Git with SVN support, but without GUI.
-  gitSVN = lowPrio (appendToName "with-svn" (gitBase.override {
-    svnSupport = true;
-  }));
-
   git-annex = pkgs.haskellPackages.git-annex;
 
   git-annex-metadata-gui = libsForQt5.callPackage ./git-annex-metadata-gui {
@@ -84,6 +61,8 @@ let
 
   git-annex-utils = callPackage ./git-annex-utils { };
 
+  git-appraise = callPackage ./git-appraise {};
+
   git-bug = callPackage ./git-bug { };
 
   # support for bugzilla
@@ -101,6 +80,14 @@ let
 
   git-extras = callPackage ./git-extras { };
 
+  git-fame = callPackage ./git-fame {};
+
+  git-fast-export = callPackage ./fast-export { };
+
+  git-filter-repo = callPackage ./git-filter-repo {
+    pythonPackages = python3Packages;
+  };
+
   git-gone = callPackage ./git-gone {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -127,6 +114,8 @@ let
     utillinux = if stdenv.isLinux then utillinuxMinimal else utillinux;
   };
 
+  git-remote-gcrypt = callPackage ./git-remote-gcrypt { };
+
   git-remote-hg = callPackage ./git-remote-hg { };
 
   git-reparent = callPackage ./git-reparent { };
@@ -153,9 +142,20 @@ let
 
   git2cl = callPackage ./git2cl { };
 
-  git-fast-export = callPackage ./fast-export { };
+  # The full-featured Git.
+  gitFull = gitBase.override {
+    svnSupport = true;
+    guiSupport = true;
+    sendEmailSupport = true;
+    withLibsecret = !stdenv.isDarwin;
+  };
 
-  git-remote-gcrypt = callPackage ./git-remote-gcrypt { };
+  # Git with SVN support, but without GUI.
+  gitSVN = lowPrio (appendToName "with-svn" (gitBase.override {
+    svnSupport = true;
+  }));
+
+  gita = python3Packages.callPackage ./gita {};
 
   gitflow = callPackage ./gitflow { };
 
@@ -171,23 +171,22 @@ let
 
   lefthook = callPackage ./lefthook { };
 
-  pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit;
-
   pass-git-helper = python3Packages.callPackage ./pass-git-helper { };
 
+  pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit;
+
   qgit = qt5.callPackage ./qgit { };
 
-  stgit = callPackage ./stgit {
-  };
+  stgit = callPackage ./stgit { };
 
   subgit = callPackage ./subgit { };
 
+  svn-all-fast-export = libsForQt5.callPackage ./svn-all-fast-export { };
+
   svn2git = callPackage ./svn2git {
     git = gitSVN;
   };
 
-  svn-all-fast-export = libsForQt5.callPackage ./svn-all-fast-export { };
-
   thicket = callPackage ./thicket { };
 
   tig = callPackage ./tig { };

From ddb272bf1d738ec0ae812ecc72e8d65eb06d2173 Mon Sep 17 00:00:00 2001
From: bb010g <me@bb010g.com>
Date: Fri, 18 Oct 2019 19:39:16 -0700
Subject: [PATCH 1557/4636] git-my: init at 1.1.2

---
 .../git-and-tools/default.nix                 |  2 ++
 .../git-and-tools/git-my/default.nix          | 29 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-my/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 50301342e755..a7008bf44b39 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -104,6 +104,8 @@ let
 
   git-machete = python3Packages.callPackage ./git-machete { };
 
+  git-my = callPackage ./git-my { };
+
   git-octopus = callPackage ./git-octopus { };
 
   git-open = callPackage ./git-open { };
diff --git a/pkgs/applications/version-management/git-and-tools/git-my/default.nix b/pkgs/applications/version-management/git-and-tools/git-my/default.nix
new file mode 100644
index 000000000000..8a5ec250932d
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-my/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "git-my";
+  version = "1.1.2";
+
+  src = fetchFromGitHub {
+    owner = "davidosomething";
+    repo = "git-my";
+    rev = version;
+    sha256 = "0jji5zw25jygj7g4f6f3k0p0s9g37r8iad8pa0s67cxbq2v4sc0v";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    install -Dm755 -t "$out"/bin ./git-my
+  '';
+
+  meta = with stdenv.lib; {
+    description =
+      "List remote branches if they're merged and/or available locally";
+    homepage = https://github.com/davidosomething/git-my;
+    license = licenses.free;
+    maintainers = with maintainers; [ bb010g ];
+    platforms = platforms.all;
+  };
+}
+

From 7e63e254a1557075b3deaecfb38c9c778718204b Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Wed, 26 Feb 2020 08:05:56 +0100
Subject: [PATCH 1558/4636] cadence: fix dbus,libjack and missing dependancies

---
 pkgs/applications/audio/cadence/default.nix | 37 +++++++++++++++------
 pkgs/top-level/all-packages.nix             |  2 +-
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix
index 52f5a6540e8b..3cde3d9009ce 100644
--- a/pkgs/applications/audio/cadence/default.nix
+++ b/pkgs/applications/audio/cadence/default.nix
@@ -1,15 +1,23 @@
 { stdenv
-, mkDerivation
+, a2jmidid
+, coreutils
 , lib
+, libjack2
 , fetchpatch
 , fetchzip
+, jack_capture
 , pkgconfig
+, pulseaudio
 , qtbase
 , makeWrapper
-, python3Packages
+, mkDerivation
+, python3
 }:
+#ladish missing, claudia can't work.
+#pulseaudio needs fixes (patchShebangs .pa ...)
+#desktop needs icons and exec fixing.
 
- mkDerivation rec {
+mkDerivation rec {
   version = "0.9.1";
   pname = "cadence";
 
@@ -26,12 +34,25 @@
     })
   ];
 
+  postPatch = ''
+      libjackso=$(realpath ${lib.makeLibraryPath [libjack2]}/libjack.so.0);
+      substituteInPlace ./src/jacklib.py --replace libjack.so.0 $libjackso
+      substituteInPlace ./src/cadence.py --replace "/usr/bin/pulseaudio" \
+        "${lib.makeBinPath[pulseaudio]}/pulseaudio"
+      substituteInPlace ./c++/jackbridge/JackBridge.cpp --replace libjack.so.0 $libjackso
+  '';
+
   nativeBuildInputs = [
     pkgconfig
   ];
 
   buildInputs = [
     qtbase
+    jack_capture
+    ((python3.withPackages (ps: with ps; [
+          pyqt5
+          dbus-python
+        ])))
   ];
 
   makeFlags = [
@@ -39,10 +60,6 @@
     "SYSCONFDIR=${placeholder "out"}/etc"
   ];
 
-  propagatedBuildInputs = with python3Packages; [
-    pyqt5_with_qtwebkit
-  ];
-
   dontWrapQtApps = true;
 
   # Replace with our own wrappers. They need to be changed manually since it wouldn't work otherwise.
@@ -65,10 +82,8 @@
     };
   in lib.mapAttrsToList (script: source: ''
     rm -f ${script}
-    makeWrapper ${python3Packages.python.interpreter} ${script} \
-      --set PYTHONPATH "$PYTHONPATH:${outRef}/share/cadence" \
-      ''${qtWrapperArgs[@]} \
-      --add-flags "-O ${source}"
+    makeQtWrapper ${source} ${script} \
+      --prefix PATH : "${lib.makeBinPath [jack_capture]}"
   '') scriptAndSource;
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dbe63bdee2dd..295e44549442 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18286,7 +18286,7 @@ in
 
   azpainter = callPackage ../applications/graphics/azpainter { };
 
-  cadence =  libsForQt5.callPackage ../applications/audio/cadence { };
+  cadence =  qt5.callPackage ../applications/audio/cadence { };
 
   milkytracker = callPackage ../applications/audio/milkytracker { };
 

From e85f0a8970e269d584ae3e3a0917f6705c1044a9 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Tue, 25 Feb 2020 23:10:05 -0800
Subject: [PATCH 1559/4636] smartmontools: add Frostman to maintainers

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

diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix
index c4d943cafe7e..077e1326f208 100644
--- a/pkgs/tools/system/smartmontools/default.nix
+++ b/pkgs/tools/system/smartmontools/default.nix
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
     description = "Tools for monitoring the health of hard drives";
     homepage    = https://www.smartmontools.org/;
     license     = licenses.gpl2Plus;
-    maintainers = with maintainers; [ peti ];
+    maintainers = with maintainers; [ peti Frostman ];
     platforms   = with platforms; linux ++ darwin;
   };
 }

From 3fa64cd5de6a724ea984d73b3db7212d73dbded7 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 26 Feb 2020 10:09:07 +0200
Subject: [PATCH 1560/4636] octave: make optional features declarative in
 default.nix

Instead of in all-packages.nix .
---
 .../interpreters/octave/default.nix           | 14 +++---
 pkgs/top-level/all-packages.nix               | 43 -------------------
 2 files changed, 9 insertions(+), 48 deletions(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 2e926e16dc6e..b32d15b2a1f9 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , fetchurl
 , gfortran
-, readline
 , ncurses
 , perl
 , flex
@@ -31,18 +30,23 @@
 , glpk ? null
 , suitesparse ? null
 , gnuplot ? null
+# - Include support for GNU readline:
+, enableReadline ? true
+, readline ? null
+# - Build Java interface:
+, enableJava ? true
 , jdk ? null
 , python ? null
 , overridePlatforms ? null
 , sundials_2 ? null
-# Qt / GUI is disabled by default
+# - Build Octave Qt GUI:
 , enableQt ? false
 , qtbase ? null
 , qtsvg ? null
 , qtscript ? null
 , qscintilla ? null
 , qttools ? null
-# JIT is disabled by default
+# - JIT compiler for loops:
 , enableJIT ? false
 , llvm ? null
 }:
@@ -98,7 +102,7 @@ stdenv.mkDerivation rec {
   ++ (stdenv.lib.optional (hdf5 != null) hdf5)
   ++ (stdenv.lib.optional (glpk != null) glpk)
   ++ (stdenv.lib.optional (suitesparse != null) suitesparse)
-  ++ (stdenv.lib.optional (jdk != null) jdk)
+  ++ (stdenv.lib.optional (enableJava) jdk)
   ++ (stdenv.lib.optional (sundials_2 != null) sundials_2)
   ++ (stdenv.lib.optional (gnuplot != null) gnuplot)
   ++ (stdenv.lib.optional (python != null) python)
@@ -128,10 +132,10 @@ stdenv.mkDerivation rec {
   F77_INTEGER_8_FLAG = if openblas.blas64 then "-fdefault-integer-8" else "";
 
   configureFlags = [
-    "--enable-readline"
     "--with-blas=openblas"
     "--with-lapack=openblas"
   ]
+    ++ stdenv.lib.optionals enableReadline [ "--enable-readline" ]
     ++ stdenv.lib.optionals openblas.blas64 [ "--enable-64" ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ "--with-x=no" ]
     ++ stdenv.lib.optionals enableQt [ "--with-qt=5" ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97cb0d5e22dd..446fb437561d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9220,58 +9220,15 @@ in
     git = gitMinimal;
   };
 
-  # Build summary for this flavor
-  # - Build Octave Qt GUI:                  no (missing:QtCore QtGui QtNetwork QtHelp QtXml)
-  # - JIT compiler for loops:               no
-  # - Build Java interface:                 yes
-  # - Build static libraries:               no
-  # - Build shared libraries:               yes
-  # - Dynamic Linking API:                  dlopen
-  # - Include support for GNU readline:     yes
-  # - 64-bit array dims and indexing:       yes
-  # - 64-bit BLAS array dims and indexing:  yes
-  # - OpenMP SMP multithreading:            yes
-  # - Truncate intermediate FP results:     yes
-  # - Build cross tools:                    no
-  # - Build docs:                           yes
   octave = callPackage ../development/interpreters/octave {
     python = python3;
     openblas = if stdenv.isDarwin then openblasCompat else openblas;
   };
-  # Build summary for this flavor
-  # - Build Octave Qt GUI:                  no (missing:QtCore QtGui QtNetwork QtHelp QtXml)
-  # - JIT compiler for loops:               yes
-  # - Build Java interface:                 yes
-  # - Build static libraries:               no
-  # - Build shared libraries:               yes
-  # - Dynamic Linking API:                  dlopen
-  # - Include support for GNU readline:     yes
-  # - 64-bit array dims and indexing:       yes
-  # - 64-bit BLAS array dims and indexing:  yes
-  # - OpenMP SMP multithreading:            yes
-  # - Truncate intermediate FP results:     yes
-  # - Build cross tools:                    no
-  # - Build docs:                           yes
   octave-jit = callPackage ../development/interpreters/octave {
     python = python3;
     openblas = if stdenv.isDarwin then openblasCompat else openblas;
     enableJIT = true;
   };
-  # Build summary for this flavor
-  # - Build Octave Qt GUI:                  yes
-  # - JIT compiler for loops:               no
-  # - Build Java interface:                 yes
-  # - Build static libraries:               no
-  # - Build shared libraries:               yes
-  # - Dynamic Linking API:                  dlopen
-  # - Include support for GNU readline:     yes
-  # - 64-bit array dims and indexing:       yes
-  # - 64-bit BLAS array dims and indexing:  yes
-  # - OpenMP SMP multithreading:            yes
-  # - Truncate intermediate FP results:     yes
-  # - Build cross tools:                    no
-  # - Build docs:                           yes
-  # Build summary for this flavor
   octaveFull = (lowPrio (libsForQt512.callPackage ../development/interpreters/octave {
     python = python3;
     openblas = if stdenv.isDarwin then openblasCompat else openblas;

From d5b5ff5ae5460ecc05ce86e50eeda0b5cc164ace Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Wed, 26 Feb 2020 09:43:40 +0100
Subject: [PATCH 1561/4636] rPackages.ggbio: patch away spelling mistake

---
 pkgs/development/r-modules/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 06fb1bb8157c..d340f3c46365 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -721,6 +721,15 @@ let
       preConfigure = "patchShebangs configure";
     });
 
+    ggbio = old.ggbio.overrideDerivation (attrs: {
+      patches = [
+        (pkgs.fetchpatch {
+          url = "https://github.com/tengfei/ggbio/commit/b04a9840cf5c0bd0514db2536f2e610bbd364727.patch";
+          sha256 = "blwtObyIYo1UBWz4nlmcJ8Nyw/n0qwmJrtwFWuoUyMg=";
+        })
+      ];
+    });
+
     RcppArmadillo = old.RcppArmadillo.overrideDerivation (attrs: {
       patchPhase = "patchShebangs configure";
     });

From 5ddadce27b98fc52c4ba82432513d8f38106b178 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Tue, 11 Feb 2020 11:57:42 +0100
Subject: [PATCH 1562/4636] arrow-cpp: 0.15.1 -> 0.16.0

This switches to explicitly enabling dependency lookups for
optional features (they were not picked up before).
It also enables building of the Parquet command line tools.
---
 .../libraries/arrow-cpp/default.nix           | 41 ++++++++++++++-----
 .../arrow-cpp/jemalloc-disable-shared.patch   | 16 ++++----
 .../python-modules/pyarrow/default.nix        |  4 +-
 3 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index 87684a4bbe4a..e152848a70f0 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/pkgs/development/libraries/arrow-cpp/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, lib, fetchurl, fetchFromGitHub, fixDarwinDylibNames, autoconf, boost
-, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl
-, python, rapidjson, snappy, thrift, uriparser, which, zlib, zstd
+{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, fixDarwinDylibNames, autoconf, boost
+, brotli, cmake, flatbuffers, gflags, glog, gtest, lz4, perl
+, python, rapidjson, snappy, thrift, which, zlib, zstd
 , enableShared ? true }:
 
 let
   parquet-testing = fetchFromGitHub {
     owner = "apache";
     repo = "parquet-testing";
-    rev = "a277dc4e55ded3e3ea27dab1e4faf98c112442df";
-    sha256 = "1yh5a8l4ship36hwmgmp2kl72s5ac9r8ly1qcs650xv2g9q7yhnq";
+    rev = "46c9e977f58f6c5ef1b81f782f3746b3656e5a8c";
+    sha256 = "1z2s6zh58nf484s0yraw7b1aqgx66dn2wzp1bzv9ndq03msklwly";
   };
 
 in stdenv.mkDerivation rec {
   pname = "arrow-cpp";
-  version = "0.15.1";
+  version = "0.16.0";
 
   src = fetchurl {
     url =
       "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
-    sha256 = "1jbghpppabsix2rkxbnh41inj9lcxfz4q94p96xzxshh4g3mhb4s";
+    sha256 = "1xdp1yni9i1cpml326s78qql1g832m800h7zjlqmk89983g94696";
   };
 
   sourceRoot = "apache-arrow-${version}/cpp";
@@ -35,6 +35,14 @@ in stdenv.mkDerivation rec {
   patches = [
     # patch to fix python-test
     ./darwin.patch
+    # Adjust CMake target names to make -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON work.
+    # Remove this when updating to the next version.
+    (fetchpatch {
+      name = "arrow-use-upstream-cmake-target-names.patch";
+      url = "https://github.com/apache/arrow/commit/396861b38d2f4e805db7c2ecd2c96fff0ca2678b.patch";
+      sha256 = "0ki7nx858374anvwyi4szz5hgnnzv4fghdd05c38bzry9rfljgb1";
+      stripLen = 1;
+    })
   ] ++ lib.optionals (!enableShared) [
     # The shared jemalloc lib is unused and breaks in static mode due to missing -fpic.
     ./jemalloc-disable-shared.patch
@@ -48,7 +56,6 @@ in stdenv.mkDerivation rec {
   buildInputs = [
     boost
     brotli
-    double-conversion
     flatbuffers
     gflags
     glog
@@ -57,7 +64,6 @@ in stdenv.mkDerivation rec {
     rapidjson
     snappy
     thrift
-    uriparser
     zlib
     zstd
     python.pkgs.python
@@ -71,15 +77,28 @@ in stdenv.mkDerivation rec {
   '';
 
   cmakeFlags = [
+    "-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON"
     "-DARROW_BUILD_TESTS=ON"
     "-DARROW_DEPENDENCY_SOURCE=SYSTEM"
-    "-DARROW_PARQUET=ON"
     "-DARROW_PLASMA=ON"
     # Disable Python for static mode because openblas is currently broken there.
     "-DARROW_PYTHON=${if enableShared then "ON" else "OFF"}"
-    "-Duriparser_SOURCE=SYSTEM"
+    "-DARROW_USE_GLOG=ON"
+    "-DARROW_WITH_BROTLI=ON"
+    "-DARROW_WITH_LZ4=ON"
+    "-DARROW_WITH_SNAPPY=ON"
+    "-DARROW_WITH_ZLIB=ON"
+    "-DARROW_WITH_ZSTD=ON"
+    # Parquet options:
+    "-DARROW_PARQUET=ON"
+    "-DPARQUET_BUILD_EXECUTABLES=ON"
+    "-DTHRIFT_COMPILER=${thrift}/bin/thrift"
+    "-DTHRIFT_VERSION=${thrift.version}"
   ] ++ lib.optionals (!enableShared) [
     "-DARROW_BUILD_SHARED=OFF"
+    "-DARROW_BOOST_USE_SHARED=OFF"
+    "-DARROW_GFLAGS_USE_SHARED=OFF"
+    "-DARROW_PROTOBUF_USE_SHARED=OFF"
     "-DARROW_TEST_LINKAGE=static"
     "-DOPENSSL_USE_STATIC_LIBS=ON"
   ] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF";
diff --git a/pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch b/pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch
index 0f7955724e16..564f67273886 100644
--- a/pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch
+++ b/pkgs/development/libraries/arrow-cpp/jemalloc-disable-shared.patch
@@ -1,11 +1,11 @@
 diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
 --- a/cmake_modules/ThirdpartyToolchain.cmake
 +++ b/cmake_modules/ThirdpartyToolchain.cmake
-@@ -1428,6 +1428,7 @@ if(ARROW_JEMALLOC)
-                       "--with-jemalloc-prefix=je_arrow_"
-                       "--with-private-namespace=je_arrow_private_"
-                       "--without-export"
-+                      "--disable-shared"
-                       # Don't override operator new()
-                       "--disable-cxx" "--disable-libdl"
-                       # See https://github.com/jemalloc/jemalloc/issues/1237
+@@ -1317,6 +1317,7 @@ if(ARROW_JEMALLOC)
+               "--with-jemalloc-prefix=je_arrow_"
+               "--with-private-namespace=je_arrow_private_"
+               "--without-export"
++              "--disable-shared"
+               # Don't override operator new()
+               "--disable-cxx" "--disable-libdl"
+               # See https://github.com/jemalloc/jemalloc/issues/1237
diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix
index 5590337951b4..ab05f49ac38f 100644
--- a/pkgs/development/python-modules/pyarrow/default.nix
+++ b/pkgs/development/python-modules/pyarrow/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytest, pkgconfig, setuptools_scm, six }:
+{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytest, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }:
 
 let
   _arrow-cpp = arrow-cpp.override { inherit python; };
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ];
   propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ];
-  checkInputs = [ hypothesis pandas pytest ];
+  checkInputs = [ hypothesis pandas pytest pytest-lazy-fixture ];
 
   PYARROW_BUILD_TYPE = "release";
   PYARROW_WITH_PARQUET = true;

From 19e98d1917c28999102ffb65ae6e51e557a7b147 Mon Sep 17 00:00:00 2001
From: foxit64 <foxit64@users.noreply.github.com>
Date: Wed, 26 Feb 2020 11:46:35 +0100
Subject: [PATCH 1563/4636] update telegraf 1.13.3 => 1.13.4

---
 pkgs/servers/monitoring/telegraf/default.nix | 4 ++--
 pkgs/servers/monitoring/telegraf/deps.nix    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index 67474797c485..c6189e124715 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "telegraf";
-  version = "1.13.3";
+  version = "1.13.4";
 
   goPackagePath = "github.com/influxdata/telegraf";
 
@@ -14,7 +14,7 @@ buildGoPackage rec {
     owner = "influxdata";
     repo = "telegraf";
     rev = version;
-    sha256 = "093695n83m1ywy4l7nswjh1xc0gkg7pxilxav7jjxkgl4p15yf28";
+    sha256 = "031hq9dg87cqj4am7qkbgfan2s6bqc2hf48h0gnrv78hbz8icxa1";
   };
 
   buildFlagsArray = [ ''-ldflags=
diff --git a/pkgs/servers/monitoring/telegraf/deps.nix b/pkgs/servers/monitoring/telegraf/deps.nix
index 84be580c4f10..4292d9aa7914 100644
--- a/pkgs/servers/monitoring/telegraf/deps.nix
+++ b/pkgs/servers/monitoring/telegraf/deps.nix
@@ -932,8 +932,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/safchain/ethtool";
-      rev =  "ef7e7c9c27639f149a3c4bfae07a9c0fc3a1691a";
-      sha256 = "140bd01ngh2jgqhr2av3d4xmwk71c2mq5crg8gy89al76dwrjb7b";
+      rev =  "f459e2d136648a780248aba0fcac44740fe3b500";
+      sha256 = "0zhxq588vkicxy4cbjjd20l4n1pzpi7q734595y6zz4zljsp24cs";
     };
   }
   {
@@ -1013,8 +1013,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/stretchr/testify";
-      rev =  "f35b8ab0b5a2cef36673838d662e249dd9c94686";
-      sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs";
+      rev =  "3ebf1ddaeb260c4b1ae502a01c7844fa8c1fa0e9";
+      sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl";
     };
   }
   {

From d617e54692507f31b1c546ad6221e7f96aa1b6dc Mon Sep 17 00:00:00 2001
From: Richard Marko <srk@48.io>
Date: Wed, 19 Feb 2020 14:35:57 +0100
Subject: [PATCH 1564/4636] talloc: 2.1.14 -> 2.1.16, build with python3

---
 pkgs/development/libraries/talloc/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix               | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix
index 5a8ebe84ba69..6acbb66e15ce 100644
--- a/pkgs/development/libraries/talloc/default.nix
+++ b/pkgs/development/libraries/talloc/default.nix
@@ -4,11 +4,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "talloc-2.1.14";
+  pname = "talloc";
+  version = "2.1.16";
 
   src = fetchurl {
-    url = "mirror://samba/talloc/${name}.tar.gz";
-    sha256 = "1kk76dyav41ip7ddbbf04yfydb4jvywzi2ps0z2vla56aqkn11di";
+    url = "mirror://samba/talloc/${pname}-${version}.tar.gz";
+    sha256 = "1aajda08yf7njgvg6r21ccxlvkarb9bwvf4jqh8yn3871a1zcnqr";
   };
 
   nativeBuildInputs = [ pkgconfig fixDarwinDylibNames python wafHook
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 865b8543f469..78282e708c20 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14459,7 +14459,7 @@ in
   taglib-sharp = callPackage ../development/libraries/taglib-sharp { };
 
   talloc = callPackage ../development/libraries/talloc {
-    python = buildPackages.python2;
+    python = buildPackages.python3;
   };
 
   tclap = callPackage ../development/libraries/tclap {};

From 8c34c230a63bfcaa0a3ddc3689fd56e897ceb65d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 26 Feb 2020 08:26:28 -0300
Subject: [PATCH 1565/4636] qogir-theme: 2020-02-20 -> 2020-02-26

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

diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix
index 286b2922953e..47056ac64d56 100644
--- a/pkgs/data/themes/qogir/default.nix
+++ b/pkgs/data/themes/qogir/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qogir-theme";
-  version = "2020-02-20";
+  version = "2020-02-26";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    sha256 = "0f0fa13ql59j9zv24vnsai76i0qwawh3jxzj1p78yfvcfmg45jcn";
+    sha256 = "1s14knj0ral5a62ymwbg5k5g94v8cq0acq0kyam8ay0rfi7wycdm";
   };
 
   buildInputs = [ gdk-pixbuf librsvg ];

From ceeb83a02aaa3370f269910e80d054baaf9f21bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 26 Feb 2020 08:27:21 -0300
Subject: [PATCH 1566/4636] qogir-theme: quote homepage

---
 pkgs/data/themes/qogir/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix
index 47056ac64d56..d13060abb8ed 100644
--- a/pkgs/data/themes/qogir/default.nix
+++ b/pkgs/data/themes/qogir/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Flat Design theme for GTK based desktop environments";
-    homepage = https://vinceliuice.github.io/Qogir-theme;
+    homepage = "https://vinceliuice.github.io/Qogir-theme";
     license = licenses.gpl3;
     platforms = platforms.unix;
     maintainers = [ maintainers.romildo ];

From 9d2f62ce6ff9603c4bb920a570960fe128796668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 26 Feb 2020 08:27:38 -0300
Subject: [PATCH 1567/4636] qogir-theme: install firefox theme to doc directory

---
 pkgs/data/themes/qogir/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix
index d13060abb8ed..23afcf5ece22 100644
--- a/pkgs/data/themes/qogir/default.nix
+++ b/pkgs/data/themes/qogir/default.nix
@@ -19,6 +19,9 @@ stdenv.mkDerivation rec {
     patchShebangs .
     mkdir -p $out/share/themes
     name= ./install.sh -d $out/share/themes
+    mkdir -p $out/share/doc/${pname}
+    cp -a src/firefox $out/share/doc/${pname}
+    rm $out/share/themes/*/{AUTHORS,COPYING}
   '';
 
   meta = with stdenv.lib; {

From da473475d543d937b44ec49e315d3575a7915bdc Mon Sep 17 00:00:00 2001
From: cw <789@webuhu.at>
Date: Wed, 26 Feb 2020 13:12:21 +0100
Subject: [PATCH 1568/4636] elixir_1_10: 1.10.1 -> 1.10.2

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

diff --git a/pkgs/development/interpreters/elixir/1.10.nix b/pkgs/development/interpreters/elixir/1.10.nix
index 7f4162cade8f..afab770da353 100644
--- a/pkgs/development/interpreters/elixir/1.10.nix
+++ b/pkgs/development/interpreters/elixir/1.10.nix
@@ -3,7 +3,7 @@
 # How to obtain `sha256`:
 # nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz
 mkDerivation {
-  version = "1.10.1";
-  sha256 = "07iccn90yp11ms58mwkwd9ixd9vma0025l9zm6l7y0jjzrj3vycy";
+  version = "1.10.2";
+  sha256 = "04yi1hljq7ii9flh6pmb5411z7q1bdq9f9sq8323k9hm1f5jwkx6";
   minimumOTPVersion = "21";
 }

From 5214b7244c72e2ae8b1607dae999456644671ab2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Tue, 25 Feb 2020 15:59:34 +0100
Subject: [PATCH 1569/4636] ssh-import-id: init at 5.8

---
 pkgs/tools/admin/ssh-import-id/default.nix | 36 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/tools/admin/ssh-import-id/default.nix

diff --git a/pkgs/tools/admin/ssh-import-id/default.nix b/pkgs/tools/admin/ssh-import-id/default.nix
new file mode 100644
index 000000000000..77d30e56d5fc
--- /dev/null
+++ b/pkgs/tools/admin/ssh-import-id/default.nix
@@ -0,0 +1,36 @@
+{ buildPythonPackage
+, stdenv
+, fetchgit
+, requests
+, makeWrapper
+, extraHandlers ? []
+}:
+
+buildPythonPackage rec {
+  pname = "ssh-import-id";
+  version = "5.8";
+
+  src = fetchgit {
+    url = "https://git.launchpad.net/ssh-import-id";
+    rev = version;
+    sha256 = "0l9gya1hyf2qfidlmvg2cgfils1fp9rn5r8sihwvx4qfsfp5yaak";
+  };
+
+  propagatedBuildInputs = [
+    requests
+  ] ++ extraHandlers;
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  # handlers require main bin, main bin requires handlers
+  makeWrapperArgs = [ "--prefix" ":" "$out/bin" ];
+
+  meta = with stdenv.lib; {
+    description = "Retrieves an SSH public key and installs it locally";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ mkg20001 ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57870b2a4e76..3e1097c42339 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1019,6 +1019,8 @@ in
 
   ssh-agents = callPackage ../tools/networking/ssh-agents { };
 
+  ssh-import-id = python3Packages.callPackage ../tools/admin/ssh-import-id { };
+
   titaniumenv = callPackage ../development/mobile/titaniumenv { };
 
   abootimg = callPackage ../development/mobile/abootimg {};

From 5e55ebb2b40910a970a8562c1ab434e47f8dc838 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Wed, 26 Feb 2020 13:54:00 +0100
Subject: [PATCH 1570/4636] megasync: format with nixfmt

---
 pkgs/applications/misc/megasync/default.nix | 78 +++++++--------------
 1 file changed, 25 insertions(+), 53 deletions(-)

diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix
index 6e51e3cda762..5de4cb002dcd 100644
--- a/pkgs/applications/misc/megasync/default.nix
+++ b/pkgs/applications/misc/megasync/default.nix
@@ -1,28 +1,6 @@
-{ stdenv
-, autoconf
-, automake
-, c-ares
-, cryptopp
-, curl
-, doxygen
-, fetchFromGitHub
-, ffmpeg
-, libmediainfo
-, libraw
-, libsodium
-, libtool
-, libuv
-, libzen
-, lsb-release
-, mkDerivation
-, pkgconfig
-, qtbase
-, qttools
-, sqlite
-, swig
-, unzip
-, wget
-}:
+{ stdenv, autoconf, automake, c-ares, cryptopp, curl, doxygen, fetchFromGitHub
+, ffmpeg, libmediainfo, libraw, libsodium, libtool, libuv, libzen, lsb-release
+, mkDerivation, pkgconfig, qtbase, qttools, sqlite, swig, unzip, wget }:
 
 mkDerivation rec {
   pname = "megasync";
@@ -36,15 +14,8 @@ mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [
-    autoconf
-    automake
-    doxygen
-    lsb-release
-    pkgconfig
-    qttools
-    swig
-  ];
+  nativeBuildInputs =
+    [ autoconf automake doxygen lsb-release pkgconfig qttools swig ];
   buildInputs = [
     c-ares
     cryptopp
@@ -85,21 +56,21 @@ mkDerivation rec {
   '';
 
   configureFlags = [
-          "--disable-examples"
-          "--disable-java"
-          "--disable-php"
-          "--enable-chat"
-          "--with-cares"
-          "--with-cryptopp"
-          "--with-curl"
-          "--with-ffmpeg"
-          "--without-freeimage"  # unreferenced even when found
-          "--without-readline"
-          "--without-termcap"
-          "--with-sodium"
-          "--with-sqlite"
-          "--with-zlib"
-    ];
+    "--disable-examples"
+    "--disable-java"
+    "--disable-php"
+    "--enable-chat"
+    "--with-cares"
+    "--with-cryptopp"
+    "--with-curl"
+    "--with-ffmpeg"
+    "--without-freeimage" # unreferenced even when found
+    "--without-readline"
+    "--without-termcap"
+    "--with-sodium"
+    "--with-sqlite"
+    "--with-zlib"
+  ];
 
   postConfigure = ''
     cd ../..
@@ -114,10 +85,11 @@ mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Easy automated syncing between your computers and your MEGA Cloud Drive";
-    homepage    = https://mega.nz/;
-    license     = licenses.unfree;
-    platforms   = [ "i686-linux" "x86_64-linux" ];
+    description =
+      "Easy automated syncing between your computers and your MEGA Cloud Drive";
+    homepage = "https://mega.nz/";
+    license = licenses.unfree;
+    platforms = [ "i686-linux" "x86_64-linux" ];
     maintainers = [ maintainers.michojel ];
   };
 }

From 080a6b0dab56b625dbd4b508624414a6bb362d93 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Wed, 26 Feb 2020 13:57:29 +0100
Subject: [PATCH 1571/4636] megasync: 4.2.3.0 -> 4.2.5.0

Also pull in an (as of yet unmerged) upstream patch to fix
the build, it was failing on both .3 and .5
---
 pkgs/applications/misc/megasync/default.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix
index 5de4cb002dcd..27e1b9d1f462 100644
--- a/pkgs/applications/misc/megasync/default.nix
+++ b/pkgs/applications/misc/megasync/default.nix
@@ -1,16 +1,17 @@
 { stdenv, autoconf, automake, c-ares, cryptopp, curl, doxygen, fetchFromGitHub
-, ffmpeg, libmediainfo, libraw, libsodium, libtool, libuv, libzen, lsb-release
-, mkDerivation, pkgconfig, qtbase, qttools, sqlite, swig, unzip, wget }:
+, fetchpatch, ffmpeg, libmediainfo, libraw, libsodium, libtool, libuv, libzen
+, lsb-release, mkDerivation, pkgconfig, qtbase, qttools, sqlite, swig, unzip
+, wget }:
 
 mkDerivation rec {
   pname = "megasync";
-  version = "4.2.3.0";
+  version = "4.2.5.0";
 
   src = fetchFromGitHub {
     owner = "meganz";
     repo = "MEGAsync";
     rev = "v${version}_Linux";
-    sha256 = "0l4yfrxjb62vc9dnlzy8rjqi68ga1bys5x5rfzs40daw13yf1adv";
+    sha256 = "1zw7x8gpvzhnzyirs5ishjl5idzyyin4wdxa67d6gzfgvqi33n7w";
     fetchSubmodules = true;
   };
 
@@ -39,6 +40,13 @@ mkDerivation rec {
     ./noinstall-distro-version.patch
     # megasync target is not part of the install rule thanks to a commented block
     ./install-megasync.patch
+
+    # Fix build errror also described upstream:
+    # https://github.com/meganz/MEGAsync/pull/313
+    (fetchpatch {
+      url = "https://github.com/meganz/MEGAsync/pull/313.patch";
+      sha256 = "1ld00cnh9afxibvkzkqi8gz59xlzidw2dy4yqngwwdqy76sfsn3w";
+    })
   ];
 
   postPatch = ''

From cce53a5a1424443ca979ab482a56bacc1bbc847b Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Wed, 26 Feb 2020 14:25:11 +0100
Subject: [PATCH 1572/4636] perlPackages.Applify: init at 0.21

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 57f24021739f..38798c000cf2 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -532,6 +532,21 @@ let
     };
   };
 
+  Applify = buildPerlPackage {
+    pname = "Applify";
+    version = "0.21";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Applify-0.21.tar.gz";
+      sha256 = "e34bc64c12c42369af6db7d17e3e20059b9d97ed50f8e487bf610008525eb84d";
+    };
+    meta = {
+      homepage = "https://github.com/jhthorsen/applify";
+      description = "Write object oriented scripts with ease";
+      license = stdenv.lib.licenses.artistic2;
+      maintainers = [ maintainers.sgo ];
+    };
+  };
+
   Appperlbrew = buildPerlModule {
     pname = "App-perlbrew";
     version = "0.88";

From 6df119a6ecd5e8fa624b4b7d012843883be6391c Mon Sep 17 00:00:00 2001
From: tilpner <till@hoeppner.ws>
Date: Wed, 26 Feb 2020 14:05:00 +0100
Subject: [PATCH 1573/4636] nixos/git-daemon: only create git user if it will
 be used

---
 .../services/networking/git-daemon.nix        |  4 +-
 nixos/tests/all-tests.nix                     |  1 +
 nixos/tests/gitdaemon.nix                     | 64 +++++++++++++++++++
 3 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 nixos/tests/gitdaemon.nix

diff --git a/nixos/modules/services/networking/git-daemon.nix b/nixos/modules/services/networking/git-daemon.nix
index 6f2e149433f3..52c895215fbe 100644
--- a/nixos/modules/services/networking/git-daemon.nix
+++ b/nixos/modules/services/networking/git-daemon.nix
@@ -104,14 +104,14 @@ in
 
   config = mkIf cfg.enable {
 
-    users.users = optionalAttrs (cfg.user != "git") {
+    users.users = optionalAttrs (cfg.user == "git") {
       git = {
         uid = config.ids.uids.git;
         description = "Git daemon user";
       };
     };
 
-    users.groups = optionalAttrs (cfg.group != "git") {
+    users.groups = optionalAttrs (cfg.group == "git") {
       git.gid = config.ids.gids.git;
     };
 
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 2e547780439a..893c2c423efd 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -98,6 +98,7 @@ in
   fsck = handleTest ./fsck.nix {};
   gotify-server = handleTest ./gotify-server.nix {};
   grocy = handleTest ./grocy.nix {};
+  gitdaemon = handleTest ./gitdaemon.nix {};
   gitea = handleTest ./gitea.nix {};
   gitlab = handleTest ./gitlab.nix {};
   gitolite = handleTest ./gitolite.nix {};
diff --git a/nixos/tests/gitdaemon.nix b/nixos/tests/gitdaemon.nix
new file mode 100644
index 000000000000..b610caf06fb2
--- /dev/null
+++ b/nixos/tests/gitdaemon.nix
@@ -0,0 +1,64 @@
+import ./make-test-python.nix ({ pkgs, ... }:
+
+let
+  hashes = pkgs.writeText "hashes" ''
+    b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c  /project/bar
+  '';
+in {
+  name = "gitdaemon";
+
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ tilpner ];
+  };
+
+  nodes = {
+    server =
+      { config, ... }: {
+        networking.firewall.allowedTCPPorts = [ config.services.gitDaemon.port ];
+
+        environment.systemPackages = [ pkgs.git ];
+
+        services.gitDaemon = {
+          enable = true;
+          basePath = "/git";
+        };
+      };
+
+    client =
+      { pkgs, ... }: {
+        environment.systemPackages = [ pkgs.git ];
+      };
+  };
+
+  testScript = ''
+    start_all()
+
+    with subtest("create project.git"):
+        server.succeed(
+            "mkdir /git",
+            "git init --bare /git/project.git",
+            "touch /git/project.git/git-daemon-export-ok",
+        )
+
+    with subtest("add file to project.git"):
+        server.succeed(
+            "git clone /git/project.git /project",
+            "echo foo > /project/bar",
+            "git config --global user.email 'you@example.com'",
+            "git config --global user.name 'Your Name'",
+            "git -C /project add bar",
+            "git -C /project commit -m 'quux'",
+            "git -C /project push",
+            "rm -r /project",
+        )
+
+    with subtest("git daemon starts"):
+        server.wait_for_unit("git-daemon.service")
+
+    with subtest("client can clone project.git"):
+        client.succeed(
+            "git clone git://server/project.git /project",
+            "sha256sum -c ${hashes}",
+        )
+  '';
+})

From 5f881209f930b36e8b32a725586d373686c45964 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Wed, 26 Feb 2020 15:10:53 +0100
Subject: [PATCH 1574/4636] nixos/kresd: never force `extraFeatures = false`

Fixes #81109.  Regressed in PR #78392 (26858063).
---
 nixos/modules/services/networking/kresd.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix
index a2f91a4200bf..c5a84eebd46f 100644
--- a/nixos/modules/services/networking/kresd.nix
+++ b/nixos/modules/services/networking/kresd.nix
@@ -32,9 +32,9 @@ let
     + cfg.extraConfig
   );
 
-  package = pkgs.knot-resolver.override {
-    extraFeatures = cfg.listenDoH != [];
-  };
+  package = if cfg.listenDoH == []
+    then pkgs.knot-resolver # never force `extraFeatures = false`
+    else pkgs.knot-resolver.override { extraFeatures = true; };
 in {
   meta.maintainers = [ maintainers.vcunat /* upstream developer */ ];
 

From ca3531850844e185d483fb878fcd00c6b44069e5 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 26 Feb 2020 11:15:02 +0200
Subject: [PATCH 1575/4636] luaPackages.nvim-client: 0.2.0-1 -> 0.2.2-1

---
 pkgs/development/lua-modules/generated-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 2a4146577ff0..33946b7213aa 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -1432,17 +1432,17 @@ moonscript = buildLuarocksPackage {
 };
 nvim-client = buildLuarocksPackage {
   pname = "nvim-client";
-  version = "0.2.0-1";
+  version = "0.2.2-1";
 
   src = fetchurl {
-    url    = https://luarocks.org/nvim-client-0.2.0-1.src.rock;
-    sha256 = "1ah9mjvz28hrbwnyb5n60znz3m0m41rn7jpnxwfx773cys3skidx";
+    url    = https://luarocks.org/nvim-client-0.2.2-1.src.rock;
+    sha256 = "0bgx94ziiq0004zw9lz2zb349xaqs5pminqd8bwdrfdnfjnbp8x0";
   };
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua mpack luv coxpcall ];
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/neovim/lua-client/archive/0.2.0-1.tar.gz";
+    homepage = "https://github.com/neovim/lua-client/archive/0.2.2-1.tar.gz";
     description = "Lua client to Nvim";
     license = {
       fullName = "Apache";

From 0cf1e8ee05a6dd1b1bd5c8ced87373d6baa41583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 26 Feb 2020 14:53:41 +0000
Subject: [PATCH 1576/4636] homeassistant: reformat parse-requirements.py with
 black

---
 .../home-assistant/parse-requirements.py      | 107 +++++++++++-------
 1 file changed, 66 insertions(+), 41 deletions(-)

diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py
index 96cf1d86050e..bf81ce2afbe2 100755
--- a/pkgs/servers/home-assistant/parse-requirements.py
+++ b/pkgs/servers/home-assistant/parse-requirements.py
@@ -15,92 +15,117 @@
 # nixpkgs' python3Packages are searched for appropriate names.
 # Then, a Nix attribute set mapping integration name to dependencies is created.
 
-from io import BytesIO
 import json
-import pathlib
 import os
+import pathlib
 import re
 import subprocess
 import sys
-import tempfile
 import tarfile
+import tempfile
+from io import BytesIO
 from urllib.request import urlopen
 
-COMPONENT_PREFIX = 'homeassistant.components'
-PKG_SET = 'python3Packages'
+COMPONENT_PREFIX = "homeassistant.components"
+PKG_SET = "python3Packages"
 
 # If some requirements are matched by multiple python packages,
 # the following can be used to choose one of them
 PKG_PREFERENCES = {
     # Use python3Packages.youtube-dl-light instead of python3Packages.youtube-dl
-    'youtube-dl': 'youtube-dl-light',
-    'tensorflow-bin': 'tensorflow',
-    'tensorflowWithoutCuda': 'tensorflow'
+    "youtube-dl": "youtube-dl-light",
+    "tensorflow-bin": "tensorflow",
+    "tensorflowWithoutCuda": "tensorflow",
 }
 
+
 def get_version():
-    with open(os.path.dirname(sys.argv[0]) + '/default.nix') as f:
+    with open(os.path.dirname(sys.argv[0]) + "/default.nix") as f:
         # A version consists of digits, dots, and possibly a "b" (for beta)
         m = re.search('hassVersion = "([\\d\\.b]+)";', f.read())
         return m.group(1)
 
-def parse_components(version='master'):
+
+def parse_components(version="master"):
     components = {}
     with tempfile.TemporaryDirectory() as tmp:
-        with urlopen(f'https://github.com/home-assistant/home-assistant/archive/{version}.tar.gz') as response:
+        with urlopen(
+            f"https://github.com/home-assistant/home-assistant/archive/{version}.tar.gz"
+        ) as response:
             tarfile.open(fileobj=BytesIO(response.read())).extractall(tmp)
         # Use part of a script from the Home Assistant codebase
-        sys.path.append(os.path.join(tmp, f'home-assistant-{version}'))
+        sys.path.append(os.path.join(tmp, f"home-assistant-{version}"))
         from script.hassfest.model import Integration
-        integrations = Integration.load_dir(pathlib.Path(
-            os.path.join(tmp, f'home-assistant-{version}', 'homeassistant/components')
-        ))
+
+        integrations = Integration.load_dir(
+            pathlib.Path(
+                os.path.join(
+                    tmp, f"home-assistant-{version}", "homeassistant/components"
+                )
+            )
+        )
         for domain in sorted(integrations):
             integration = integrations[domain]
             components[domain] = integration.manifest
     return components
 
+
 # Recursively get the requirements of a component and its dependencies
 def get_reqs(components, component):
-    requirements = set(components[component]['requirements'])
-    for dependency in components[component]['dependencies']:
+    requirements = set(components[component]["requirements"])
+    for dependency in components[component]["dependencies"]:
         requirements.update(get_reqs(components, dependency))
     return requirements
 
+
 # Store a JSON dump of Nixpkgs' python3Packages
-output = subprocess.check_output(['nix-env', '-f', os.path.dirname(sys.argv[0]) + '/../../..', '-qa', '-A', PKG_SET, '--json'])
+output = subprocess.check_output(
+    [
+        "nix-env",
+        "-f",
+        os.path.dirname(sys.argv[0]) + "/../../..",
+        "-qa",
+        "-A",
+        PKG_SET,
+        "--json",
+    ]
+)
 packages = json.loads(output)
 
+
 def name_to_attr_path(req):
     attr_paths = set()
     names = [req]
     # E.g. python-mpd2 is actually called python3.6-mpd2
     # instead of python-3.6-python-mpd2 inside Nixpkgs
-    if req.startswith('python-') or req.startswith('python_'):
-        names.append(req[len('python-'):])
+    if req.startswith("python-") or req.startswith("python_"):
+        names.append(req[len("python-") :])
     for name in names:
         # treat "-" and "_" equally
-        name = re.sub('[-_]', '[-_]', name)
-        pattern = re.compile('^python\\d\\.\\d-{}-\\d'.format(name), re.I)
+        name = re.sub("[-_]", "[-_]", name)
+        pattern = re.compile("^python\\d\\.\\d-{}-\\d".format(name), re.I)
         for attr_path, package in packages.items():
-            if pattern.match(package['name']):
+            if pattern.match(package["name"]):
                 attr_paths.add(attr_path)
     if len(attr_paths) > 1:
         for to_replace, replacement in PKG_PREFERENCES.items():
             try:
-                attr_paths.remove(PKG_SET + '.' + to_replace)
-                attr_paths.add(PKG_SET + '.' + replacement)
+                attr_paths.remove(PKG_SET + "." + to_replace)
+                attr_paths.add(PKG_SET + "." + replacement)
             except KeyError:
                 pass
     # Let's hope there's only one derivation with a matching name
-    assert len(attr_paths) <= 1, "{} matches more than one derivation: {}".format(req, attr_paths)
+    assert len(attr_paths) <= 1, "{} matches more than one derivation: {}".format(
+        req, attr_paths
+    )
     if len(attr_paths) == 1:
         return attr_paths.pop()
     else:
         return None
 
+
 version = get_version()
-print('Generating component-packages.nix for version {}'.format(version))
+print("Generating component-packages.nix for version {}".format(version))
 components = parse_components(version=version)
 build_inputs = {}
 for component in sorted(components.keys()):
@@ -110,12 +135,12 @@ for component in sorted(components.keys()):
     for req in reqs:
         # Some requirements are specified by url, e.g. https://example.org/foobar#xyz==1.0.0
         # Therefore, if there's a "#" in the line, only take the part after it
-        req = req[req.find('#') + 1:]
-        name = req.split('==')[0]
+        req = req[req.find("#") + 1 :]
+        name = req.split("==")[0]
         attr_path = name_to_attr_path(name)
         if attr_path is not None:
             # Add attribute path without "python3Packages." prefix
-            attr_paths.append(attr_path[len(PKG_SET + '.'):])
+            attr_paths.append(attr_path[len(PKG_SET + ".") :])
         else:
             missing_reqs.append(name)
     else:
@@ -125,15 +150,15 @@ for component in sorted(components.keys()):
         print("Component {} is missing {} dependencies".format(component, n_diff))
         print("missing requirements: {}".format(missing_reqs))
 
-with open(os.path.dirname(sys.argv[0]) + '/component-packages.nix', 'w') as f:
-    f.write('# Generated by parse-requirements.py\n')
-    f.write('# Do not edit!\n\n')
-    f.write('{\n')
-    f.write('  version = "{}";\n'.format(version))
-    f.write('  components = {\n')
+with open(os.path.dirname(sys.argv[0]) + "/component-packages.nix", "w") as f:
+    f.write("# Generated by parse-requirements.py\n")
+    f.write("# Do not edit!\n\n")
+    f.write("{\n")
+    f.write(f'  version = "{version}";\n')
+    f.write("  components = {\n")
     for component, attr_paths in build_inputs.items():
-        f.write('    "{}" = ps: with ps; [ '.format(component))
-        f.write(' '.join(attr_paths))
-        f.write(' ];\n')
-    f.write('  };\n')
-    f.write('}\n')
+        f.write('    "{component}" = ps: with ps; [ ')
+        f.write(" ".join(attr_paths))
+        f.write(" ];\n")
+    f.write("  };\n")
+    f.write("}\n")

From 5f8a157c3b8a3b640d363470e22c91f534865d9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 26 Feb 2020 13:17:39 -0300
Subject: [PATCH 1577/4636] snowblind: init at 2020-02-26

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

diff --git a/pkgs/data/themes/snowblind/default.nix b/pkgs/data/themes/snowblind/default.nix
new file mode 100644
index 000000000000..db7b34d78e76
--- /dev/null
+++ b/pkgs/data/themes/snowblind/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitLab, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  pname = "snowblind";
+  version = "2020-02-26";
+
+  src = fetchFromGitLab {
+    domain = "www.opencode.net";
+    owner = "ju1464";
+    repo = pname;
+    rev = "94c35410be5cccc142c9cd6be9dff973ce0761c4";
+    sha256 = "1aqmpg1vyqwp6s6iikp5c5yfrvdkzq75jdr9mmv2ijcam1g0jhnv";
+  };
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  installPhase = ''
+    mkdir -p $out/share/themes
+    cp -a Snowblind* $out/share/themes
+    rm $out/share/themes/*/{COPYING,CREDITS}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Smooth blue theme based on Materia Design";
+    homepage = "https://www.opencode.net/ju1464/Snowblind";
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 93ce705a5df2..ee406223e5f9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17924,6 +17924,8 @@ in
 
   sierra-gtk-theme = callPackage ../data/themes/sierra { };
 
+  snowblind = callPackage ../data/themes/snowblind { };
+
   solarc-gtk-theme = callPackage ../data/themes/solarc { };
 
   soundfont-fluid = callPackage ../data/soundfonts/fluid { };

From c694fcfb3e4eb668fa39e9f177d0934f96b4d01f Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Wed, 26 Feb 2020 19:32:13 +0300
Subject: [PATCH 1578/4636] vk-messenger: 4.5.2 -> 5.0.1

---
 .../networking/instant-messengers/vk-messenger/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
index 165e3e959e0c..7f2ce9553e9b 100644
--- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix
@@ -3,18 +3,18 @@
 , wrapGAppsHook }:
 
 let
-  version = "4.5.2";
+  version = "5.0.1";
 in stdenv.mkDerivation {
   pname = "vk-messenger";
   inherit version;
   src = {
     i686-linux = fetchurl {
       url = "https://desktop.userapi.com/rpm/master/vk-${version}.i686.rpm";
-      sha256 = "11xsdmvd2diq3m61si87x2c08nap0vakcypm90wjmdjwayg3fdlw";
+      sha256 = "1ji23x13lzbkiqfrrwx1pj6gmms0p58cjmjc0y4g16kqhlxl60v6";
     };
     x86_64-linux = fetchurl {
       url = "https://desktop.userapi.com/rpm/master/vk-${version}.x86_64.rpm";
-      sha256 = "0j65d6mwj6rxczi0p9fsr6jh37jxw3a3h6w67xwgdvibb7lf3gbb";
+      sha256 = "01vvmia2qrxvrvavk9hkkyvfg4pg15m01grwb28884vy4nqw400y";
     };
   }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
 

From 87854a7457fa269d5cbdc9225bc0ed2156df6dd2 Mon Sep 17 00:00:00 2001
From: Cassidy Dingenskirchen <admin@15318.de>
Date: Wed, 26 Feb 2020 17:33:05 +0100
Subject: [PATCH 1579/4636] keybase,kbfs,keybase-gui: 5.1.1 -> 5.2.1

---
 pkgs/tools/security/keybase/default.nix | 4 ++--
 pkgs/tools/security/keybase/gui.nix     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index 284ee2cab21b..9a8a283d799d 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -6,7 +6,7 @@
 
 buildGoPackage rec {
   pname = "keybase";
-  version = "5.1.1";
+  version = "5.2.1";
 
   goPackagePath = "github.com/keybase/client";
   subPackages = [ "go/kbnm" "go/keybase" ];
@@ -17,7 +17,7 @@ buildGoPackage rec {
     owner = "keybase";
     repo = "client";
     rev = "v${version}";
-    sha256 = "06rhnmk59was7dd5pd4czlrwqvmh02l9gka9561dkpl6w3j6814a";
+    sha256 = "1gq5s202zlf6z6fd4qwbgzmddrzj50js3kzyln63xh0svc3sgfvl";
   };
 
   patches = [
diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix
index 3095142d3629..e46da9ca9b6a 100644
--- a/pkgs/tools/security/keybase/gui.nix
+++ b/pkgs/tools/security/keybase/gui.nix
@@ -4,16 +4,16 @@
 , runtimeShell, gsettings-desktop-schemas }:
 
 let
-  versionSuffix = "20191211223501.15bbb94c23";
+  versionSuffix = "20200225210944.9845113a89";
 in
 
 stdenv.mkDerivation rec {
   pname = "keybase-gui";
-  version = "5.1.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
+  version = "5.2.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
 
   src = fetchurl {
     url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb";
-    sha256 = "1frmk4ldmcz9rkl5bpsinzzwh39vavww67lsklln76xmkm3nacvq";
+    sha256 = "183vkwm12frdy50z6gyb1mffn3w8jvxxj472868af813r0n1akl5";
   };
 
   nativeBuildInputs = [

From de1119f5fb42d614baff5f67e54e74d7f1652d6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 26 Feb 2020 15:22:48 +0000
Subject: [PATCH 1580/4636] home-assistant/parse-requirements: write missing
 deps to component-packages.nix

---
 .../home-assistant/parse-requirements.py      | 111 ++++++++++--------
 1 file changed, 61 insertions(+), 50 deletions(-)

diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py
index bf81ce2afbe2..3efdc01c9141 100755
--- a/pkgs/servers/home-assistant/parse-requirements.py
+++ b/pkgs/servers/home-assistant/parse-requirements.py
@@ -24,6 +24,7 @@ import sys
 import tarfile
 import tempfile
 from io import BytesIO
+from typing import Dict, Optional
 from urllib.request import urlopen
 
 COMPONENT_PREFIX = "homeassistant.components"
@@ -78,22 +79,23 @@ def get_reqs(components, component):
     return requirements
 
 
-# Store a JSON dump of Nixpkgs' python3Packages
-output = subprocess.check_output(
-    [
-        "nix-env",
-        "-f",
-        os.path.dirname(sys.argv[0]) + "/../../..",
-        "-qa",
-        "-A",
-        PKG_SET,
-        "--json",
-    ]
-)
-packages = json.loads(output)
+def dump_packages() -> Dict[str, Dict[str, str]]:
+    # Store a JSON dump of Nixpkgs' python3Packages
+    output = subprocess.check_output(
+        [
+            "nix-env",
+            "-f",
+            os.path.dirname(sys.argv[0]) + "/../../..",
+            "-qa",
+            "-A",
+            PKG_SET,
+            "--json",
+        ]
+    )
+    return json.loads(output)
 
 
-def name_to_attr_path(req):
+def name_to_attr_path(req: str, packages: Dict[str, Dict[str, str]]) -> Optional[str]:
     attr_paths = set()
     names = [req]
     # E.g. python-mpd2 is actually called python3.6-mpd2
@@ -124,41 +126,50 @@ def name_to_attr_path(req):
         return None
 
 
-version = get_version()
-print("Generating component-packages.nix for version {}".format(version))
-components = parse_components(version=version)
-build_inputs = {}
-for component in sorted(components.keys()):
-    attr_paths = []
-    missing_reqs = []
-    reqs = sorted(get_reqs(components, component))
-    for req in reqs:
-        # Some requirements are specified by url, e.g. https://example.org/foobar#xyz==1.0.0
-        # Therefore, if there's a "#" in the line, only take the part after it
-        req = req[req.find("#") + 1 :]
-        name = req.split("==")[0]
-        attr_path = name_to_attr_path(name)
-        if attr_path is not None:
-            # Add attribute path without "python3Packages." prefix
-            attr_paths.append(attr_path[len(PKG_SET + ".") :])
+def main() -> None:
+    packages = dump_packages()
+    version = get_version()
+    print("Generating component-packages.nix for version {}".format(version))
+    components = parse_components(version=version)
+    build_inputs = {}
+    for component in sorted(components.keys()):
+        attr_paths = []
+        missing_reqs = []
+        reqs = sorted(get_reqs(components, component))
+        for req in reqs:
+            # Some requirements are specified by url, e.g. https://example.org/foobar#xyz==1.0.0
+            # Therefore, if there's a "#" in the line, only take the part after it
+            req = req[req.find("#") + 1 :]
+            name = req.split("==")[0]
+            attr_path = name_to_attr_path(name, packages)
+            if attr_path is not None:
+                # Add attribute path without "python3Packages." prefix
+                attr_paths.append(attr_path[len(PKG_SET + ".") :])
+            else:
+                missing_reqs.append(name)
         else:
-            missing_reqs.append(name)
-    else:
-        build_inputs[component] = attr_paths
-    n_diff = len(reqs) > len(build_inputs[component])
-    if n_diff > 0:
-        print("Component {} is missing {} dependencies".format(component, n_diff))
-        print("missing requirements: {}".format(missing_reqs))
+            build_inputs[component] = (attr_paths, missing_reqs)
+        n_diff = len(reqs) > len(build_inputs[component])
+        if n_diff > 0:
+            print("Component {} is missing {} dependencies".format(component, n_diff))
+            print("missing requirements: {}".format(missing_reqs))
 
-with open(os.path.dirname(sys.argv[0]) + "/component-packages.nix", "w") as f:
-    f.write("# Generated by parse-requirements.py\n")
-    f.write("# Do not edit!\n\n")
-    f.write("{\n")
-    f.write(f'  version = "{version}";\n')
-    f.write("  components = {\n")
-    for component, attr_paths in build_inputs.items():
-        f.write('    "{component}" = ps: with ps; [ ')
-        f.write(" ".join(attr_paths))
-        f.write(" ];\n")
-    f.write("  };\n")
-    f.write("}\n")
+    with open(os.path.dirname(sys.argv[0]) + "/component-packages.nix", "w") as f:
+        f.write("# Generated by parse-requirements.py\n")
+        f.write("# Do not edit!\n\n")
+        f.write("{\n")
+        f.write(f'  version = "{version}";\n')
+        f.write("  components = {\n")
+        for component, deps in build_inputs.items():
+            available, missing = deps
+            f.write(f"    \"{component}\" = ps: with ps; [ ")
+            f.write(" ".join(available))
+            f.write("];")
+            if len(missing) > 0:
+                f.write(f" # missing inputs: {' '.join(missing)}")
+            f.write("\n")
+        f.write("  };\n")
+        f.write("}\n")
+
+if __name__ == '__main__':
+    main()

From 059ee2a8b1c526acc216c2f3cfc7f3de345041bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 26 Feb 2020 15:52:47 +0000
Subject: [PATCH 1581/4636] python3.pkgs.pushover-complete: init at 1.1.1

---
 .../pushover-complete/default.nix             | 38 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/python-modules/pushover-complete/default.nix

diff --git a/pkgs/development/python-modules/pushover-complete/default.nix b/pkgs/development/python-modules/pushover-complete/default.nix
new file mode 100644
index 000000000000..b526ba6cab11
--- /dev/null
+++ b/pkgs/development/python-modules/pushover-complete/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+, six
+, tox
+, pytest
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "pushover-complete";
+  version = "1.1.1";
+
+  src = fetchPypi {
+    pname = "pushover_complete";
+    inherit version;
+    sha256 = "8a8f867e1f27762a28a0832c33c6003ca54ee04c935678d124b4c071f7cf5a1f";
+  };
+
+  propagatedBuildInputs = [
+    requests
+    six
+  ];
+
+  checkInputs = [ pytest tox ];
+
+  # Fails also on their travis right now:
+  # - https://travis-ci.org/scolby33/pushover_complete/builds?utm_medium=notification&utm_source=github_status
+  doCheck = pythonOlder "3.7";
+
+  meta = with lib; {
+    description = "A Python package for interacting with *all* aspects of the Pushover API";
+    homepage = https://github.com/scolby33/pushover_complete;
+    license = licenses.mit;
+    maintainers = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 409fff8994c8..b5c9ae1da451 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -965,6 +965,8 @@ in {
 
   pdfx = callPackage ../development/python-modules/pdfx { };
 
+  pushover-complete = callPackage ../development/python-modules/pushover-complete { };
+
   pyicloud = callPackage ../development/python-modules/pyicloud { };
 
   pyperf = callPackage ../development/python-modules/pyperf { };

From e0ba4b2e12bf71cbc03f1c096293adeacc7ffdb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 26 Feb 2020 16:30:05 +0000
Subject: [PATCH 1582/4636] python3.pkgs.jsonpath: init at 0.82

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

diff --git a/pkgs/development/python-modules/jsonpath/default.nix b/pkgs/development/python-modules/jsonpath/default.nix
new file mode 100644
index 000000000000..383df6e2652e
--- /dev/null
+++ b/pkgs/development/python-modules/jsonpath/default.nix
@@ -0,0 +1,21 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "jsonpath";
+  version = "0.82";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "46d3fd2016cd5b842283d547877a02c418a0fe9aa7a6b0ae344115a2c990fef4";
+  };
+
+  meta = with lib; {
+    description = "An XPath for JSON";
+    homepage = "https://github.com/json-path/JsonPath";
+    license = licenses.mit;
+    maintainers = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b5c9ae1da451..b2af2dae72b1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -801,6 +801,8 @@ in {
 
   jira = callPackage ../development/python-modules/jira { };
 
+  jsonpath = callPackage ../development/python-modules/jsonpath { };
+
   junit-xml = callPackage ../development/python-modules/junit-xml { };
 
   junitparser = callPackage ../development/python-modules/junitparser { };

From c094972a458179e4d752b6c12f45a635232f66d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 26 Feb 2020 15:51:51 +0000
Subject: [PATCH 1583/4636] hass-nabucasa: 0.29 -> 0.31

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

diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix
index e14b97d94ceb..87a4a21568c8 100644
--- a/pkgs/development/python-modules/hass-nabucasa/default.nix
+++ b/pkgs/development/python-modules/hass-nabucasa/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "hass-nabucasa";
-  version = "0.29";
+  version = "0.31";
 
   src = fetchFromGitHub {
     owner = "nabucasa";
     repo = pname;
     rev = version;
-    sha256 = "182nh5i3hlj0kqkbynk69md0ddq83w02l8lz4m03d8xbjixzi1k1";
+    sha256 = "0hxdvdj41gq5ryafjhrcgf6y8l33lyf45a1vgwwbk0q29sir9bnr";
   };
 
   # upstreamed in https://github.com/NabuCasa/hass-nabucasa/pull/119

From a8d4fc718b32e48f82f7fcdd41773f9a420c41a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 26 Feb 2020 15:52:07 +0000
Subject: [PATCH 1584/4636] home-assistant/frontent: 20200108.0 -> 20200220.4

---
 pkgs/servers/home-assistant/frontend.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 75d02ed06351..f297212442c3 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -4,11 +4,11 @@ buildPythonPackage rec {
   # the frontend version corresponding to a specific home-assistant version can be found here
   # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
   pname = "home-assistant-frontend";
-  version = "20200108.0";
+  version = "20200220.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1h6fgkx8fffzs829893gjbh0wbjgxjzz2ca64v8r5sb938bfayg8";
+    sha256 = "0cb8b6xizxz1q5r0qgwsqs53va9bxdqnp4vwf5lh8ppv9zy7hssc";
   };
 
   # no Python tests implemented

From 9497ce5dd3b718c5424cb1b64912fdf3bbbd24fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 26 Feb 2020 16:07:57 +0000
Subject: [PATCH 1585/4636] homeassistant/parse-requirements: run mypy check

---
 pkgs/servers/home-assistant/parse-requirements.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py
index 3efdc01c9141..65c2bcfbfd45 100755
--- a/pkgs/servers/home-assistant/parse-requirements.py
+++ b/pkgs/servers/home-assistant/parse-requirements.py
@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ attrs ])
+#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ mypy attrs ])
 #
 # This script downloads Home Assistant's source tarball.
 # Inside the homeassistant/components directory, each integration has an associated manifest.json,
@@ -40,6 +40,12 @@ PKG_PREFERENCES = {
 }
 
 
+def run_mypy() -> None:
+    cmd = ["mypy", "--ignore-missing-imports", __file__]
+    print(f"$ {' '.join(cmd)}")
+    subprocess.run(cmd, check=True)
+
+
 def get_version():
     with open(os.path.dirname(sys.argv[0]) + "/default.nix") as f:
         # A version consists of digits, dots, and possibly a "b" (for beta)
@@ -162,7 +168,7 @@ def main() -> None:
         f.write("  components = {\n")
         for component, deps in build_inputs.items():
             available, missing = deps
-            f.write(f"    \"{component}\" = ps: with ps; [ ")
+            f.write(f'    "{component}" = ps: with ps; [ ')
             f.write(" ".join(available))
             f.write("];")
             if len(missing) > 0:
@@ -171,5 +177,7 @@ def main() -> None:
         f.write("  };\n")
         f.write("}\n")
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
+    run_mypy()
     main()

From c95293c5035d4fbf163c8c631fa44b7ee4a12bd5 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 26 Feb 2020 11:44:23 -0500
Subject: [PATCH 1586/4636] vivaldi: 2.11.1811.41-1 -> 2.11.1811.44-1

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

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 16e2214a4c28..70c93ee03e53 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -17,11 +17,11 @@ let
   vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
 in stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "2.11.1811.41-1";
+  version = "2.11.1811.44-1";
 
   src = fetchurl {
     url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
-    sha256 = "1d0n9il9jj2790npp1ppnkc9g1pdb5v0x5kgl45xyqw0fd5fry08";
+    sha256 = "1hzlcvbp056nzxdiig91rsm5f0s0cjqs0imlgn7822jadp9wwnwn";
   };
 
   unpackPhase = ''

From 8f3f727e06b65631561dfb38924819d801a76b9e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 26 Feb 2020 11:45:29 -0500
Subject: [PATCH 1587/4636] zoom-us: 3.5.359165.0223 -> 3.5.359539.0224

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

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 4047968cf621..25e273bda51e 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -14,11 +14,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
 let
   inherit (stdenv.lib) concatStringsSep makeBinPath optional;
 
-  version = "3.5.359165.0223";
+  version = "3.5.359539.0224";
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
-      sha256 = "19x8qypqlq3yxs05vzmjdbn6qd60zrqjn0s4n10cnfzl21vf6d44";
+      sha256 = "1n6rcsl86150y2dzkcgy5rzdij0d6ib3nvg4dz4a4dkyhq5hbla2";
     };
   };
 

From b880ee9bb6265c741452c4f63b99f594302368d4 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 26 Feb 2020 11:47:28 -0500
Subject: [PATCH 1588/4636] oh-my-zsh: 2020-02-19 -> 2020-02-26

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

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 39672a7608a8..1e533c1df048 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2020-02-19";
+  version = "2020-02-26";
   pname = "oh-my-zsh";
-  rev = "bc9fe7423f5d8c639b208ebb9a7dbfce078bfd9b";
+  rev = "01bfb57446fdc77e8b4ae696729688284392c0e6";
 
   src = fetchgit { inherit rev;
     url = "https://github.com/ohmyzsh/ohmyzsh";
-    sha256 = "0nhqnhgp6y70q2p70qi7n4qzhahcb9q6hyqij7wfcdsws0lbf6nn";
+    sha256 = "1mkmdyzz89c48zncszv67lkhgkincpzx5hfssbyfyj3pkrgf97xx";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];

From 368c8ae3980fffda8eda3d39e0c358f1b8acd031 Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Wed, 26 Feb 2020 17:54:08 +0100
Subject: [PATCH 1589/4636] cadence: fix pulseaudio bridge

---
 pkgs/applications/audio/cadence/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix
index 3cde3d9009ce..7aa2872224d7 100644
--- a/pkgs/applications/audio/cadence/default.nix
+++ b/pkgs/applications/audio/cadence/default.nix
@@ -7,7 +7,7 @@
 , fetchzip
 , jack_capture
 , pkgconfig
-, pulseaudio
+, pulseaudioFull
 , qtbase
 , makeWrapper
 , mkDerivation
@@ -38,7 +38,7 @@ mkDerivation rec {
       libjackso=$(realpath ${lib.makeLibraryPath [libjack2]}/libjack.so.0);
       substituteInPlace ./src/jacklib.py --replace libjack.so.0 $libjackso
       substituteInPlace ./src/cadence.py --replace "/usr/bin/pulseaudio" \
-        "${lib.makeBinPath[pulseaudio]}/pulseaudio"
+        "${lib.makeBinPath[pulseaudioFull]}/pulseaudio"
       substituteInPlace ./c++/jackbridge/JackBridge.cpp --replace libjack.so.0 $libjackso
   '';
 
@@ -49,6 +49,7 @@ mkDerivation rec {
   buildInputs = [
     qtbase
     jack_capture
+    pulseaudioFull
     ((python3.withPackages (ps: with ps; [
           pyqt5
           dbus-python
@@ -83,7 +84,10 @@ mkDerivation rec {
   in lib.mapAttrsToList (script: source: ''
     rm -f ${script}
     makeQtWrapper ${source} ${script} \
-      --prefix PATH : "${lib.makeBinPath [jack_capture]}"
+      --prefix PATH : "${lib.makeBinPath [
+        jack_capture # cadence-render
+        pulseaudioFull # cadence, cadence-session-start
+        ]}"
   '') scriptAndSource;
 
   meta = {

From 0b919c249f6c23937fc7772ced75a7cea5064e3c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 26 Feb 2020 09:18:16 -0800
Subject: [PATCH 1590/4636] mill: 0.6.0 -> 0.6.1 (#81017)

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

diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix
index ab9ba1758d00..844442611327 100644
--- a/pkgs/development/tools/build-managers/mill/default.nix
+++ b/pkgs/development/tools/build-managers/mill/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mill";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchurl {
     url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}";
-    sha256 = "0pdyv3bk2d50gqqd9h4a2i4yym4k01p7qkwhzz2mxa18f64777s9";
+    sha256 = "1blar5dxhmxlwxhmq8wv0xvhy200qks6xj12n54qx9d5qp300ncw";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://www.lihaoyi.com/mill;
+    homepage = "https://www.lihaoyi.com/mill";
     license = licenses.mit;
     description = "A build tool for Scala, Java and more";
     longDescription = ''

From 65461ea1f27ac93e31544f9fae7b481ddd7e3474 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Wed, 26 Feb 2020 13:01:03 -0500
Subject: [PATCH 1591/4636] python3Packages.nitime: init at 0.8.1

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

diff --git a/pkgs/development/python-modules/nitime/default.nix b/pkgs/development/python-modules/nitime/default.nix
new file mode 100644
index 000000000000..b61c3d92bc9f
--- /dev/null
+++ b/pkgs/development/python-modules/nitime/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, python
+, fetchPypi
+, pytest
+, cython
+, numpy
+, scipy
+, matplotlib
+, networkx
+, nibabel
+}:
+
+buildPythonPackage rec {
+  pname = "nitime";
+  version = "0.8.1";
+  disabled = python.pythonVersion != "3.7";  # gcc error when running Cython with Python 3.8
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0hb3x5196z2zaawb8s7lhja0vd3n983ncaynqfl9qg315x9ax7i6";
+  };
+
+  checkInputs = [ pytest ];
+  buildInputs = [ cython ];
+  propagatedBuildInputs = [ numpy scipy matplotlib networkx nibabel ];
+
+  checkPhase = "pytest nitime/tests";
+
+  meta = with lib; {
+    homepage = https://nipy.org/nitime;
+    description = "Algorithms and containers for time-series analysis in time and spectral domains";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.bcdarwin ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3b5e60ae9607..6d5a2907520e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4458,6 +4458,8 @@ in {
     inherit (pkgs) which;
   };
 
+  nitime = callPackage ../development/python-modules/nitime { };
+
   nixpkgs = callPackage ../development/python-modules/nixpkgs { };
 
   nixpkgs-pytools = callPackage ../development/python-modules/nixpkgs-pytools { };

From 8be566d288d3dce263394e68a10dc5852fcf24e8 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 25 Feb 2020 11:33:40 +0100
Subject: [PATCH 1592/4636] chromium: 80.0.3987.116 -> 80.0.3987.122

https://chromereleases.googleblog.com/2020/02/stable-channel-update-for-desktop_24.html

This update includes 3 security fixes.

CVEs:
CVE-2020-6407 CVE-2020-6418
---
 .../browsers/chromium/upstream-info.nix        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 9e5c2e4f7995..8c8e8149f93b 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "0vsykl3gaql8fp1h5007ljds8m8q2n6n34dsbcqqav2008zlks61";
-    sha256bin64 = "1bmszzgmzv7hkczs6kcsa2r8vv6nhg39q1sv74695mr3j3j4bdp8";
-    version = "81.0.4044.17";
+    sha256 = "1bahnvn6i08gg10r9p012n7xjwhnjk1xq4c70kw6sqr4p53423mn";
+    sha256bin64 = "066lvnh18k5982dv9481g9i31g9pq6a8q92g93xkqgj2bipbv6si";
+    version = "81.0.4044.26";
   };
   dev = {
-    sha256 = "0vsykl3gaql8fp1h5007ljds8m8q2n6n34dsbcqqav2008zlks61";
-    sha256bin64 = "0xx4h82w6jklwlk8p2a2qqk2a9vnf004hmgw69i8iwk6l1d9hxfb";
-    version = "81.0.4044.17";
+    sha256 = "0k35sa1qq54cixybb12nyzkjyrwb4cbjfffwfvr5dl859i5bz1kk";
+    sha256bin64 = "0ckbgk6jw3zq3gqvvwdlcrqlm110hkvija6jfh9dk0ip1wdx8wkm";
+    version = "82.0.4062.3";
   };
   stable = {
-    sha256 = "00c9czjyk1h3i40lvmh2rshp1mq7pcxwsfh1qrq22w8ba6ydkib5";
-    sha256bin64 = "0sydv69hnssbvkrl1zc3qpb1czmfxv9kq6qs9gdiy2i3zskfvhkx";
-    version = "80.0.3987.116";
+    sha256 = "0wr487drgd030d7p84rdz1cys0c87wbgh2qg3d7qd98gqbfcpss8";
+    sha256bin64 = "0kipzd0q3p3wwklcl1fb937xhklc0s76apsfrjwy0jcmcy47blzf";
+    version = "80.0.3987.122";
   };
 }

From 1d961a4c6d6015a9adb9283e582f05e45e5fb34e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 26 Feb 2020 19:14:44 +0100
Subject: [PATCH 1593/4636] chromiumDev: Fix the build

Building Chromium 82 requires LLVM 10 for the new argument
"-fintegrated-cc1". LLVM 9 fails with:
clang++: error: unknown argument: '-fintegrated-cc1'
---
 .../applications/networking/browsers/chromium/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index c3522e17379b..8968a10bed00 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,4 +1,4 @@
-{ newScope, config, stdenv, llvmPackages_9
+{ newScope, config, stdenv, llvmPackages_9, llvmPackages_10
 , makeWrapper, ed
 , glib, gtk3, gnome3, gsettings-desktop-schemas
 , libva ? null
@@ -19,8 +19,10 @@
 }:
 
 let
-  stdenv = llvmPackages_9.stdenv;
-  llvmPackages = llvmPackages_9;
+  llvmPackages = if channel == "dev"
+    then llvmPackages_10
+    else llvmPackages_9;
+  stdenv = llvmPackages.stdenv;
 
   callPackage = newScope chromium;
 

From 620bb12d5109897be4852f058a4a8c0c9f57173e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 26 Feb 2020 18:54:26 +0000
Subject: [PATCH 1594/4636] pagemon: 0.01.17 -> 0.01.18

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

diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix
index 772ef56cde2e..64177fa5d00b 100644
--- a/pkgs/os-specific/linux/pagemon/default.nix
+++ b/pkgs/os-specific/linux/pagemon/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "pagemon";
-  version = "0.01.17";
+  version = "0.01.18";
 
   src = fetchFromGitHub {
-    sha256 = "11r84nwjvnjyxc3jqhbvlgb89ajfj7v8212mz61dq5ilq5k7xa3d";
+    sha256 = "1aq1mq3k8n70h81s64w2zg4kksw1y05326bn4y8p94lpaypvxqfd";
     rev = "V${version}";
     repo = "pagemon";
     owner = "ColinIanKing";

From 180b61b0475708e62667acc55a20584ccb701ef6 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <brightone@protonmail.com>
Date: Wed, 5 Feb 2020 17:20:24 +0200
Subject: [PATCH 1595/4636] hey: init at 0.1.3

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

diff --git a/pkgs/tools/networking/hey/default.nix b/pkgs/tools/networking/hey/default.nix
new file mode 100644
index 000000000000..d65d5c9e3235
--- /dev/null
+++ b/pkgs/tools/networking/hey/default.nix
@@ -0,0 +1,22 @@
+{ buildGoModule, lib, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "hey";
+  version = "0.1.3";
+
+  src = fetchFromGitHub {
+    owner = "rakyll";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "06w5hf0np0ayvjnfy8zgy605yrs5j326nk2gm0fy7amhwx1fzkwv";
+  };
+
+  modSha256 = "0a00kcyagqczw0vhl8qs2xs1y8myw080y9kjs4qrcmj6kibdy55q";
+
+  meta = with lib; {
+    description = "HTTP load generator, ApacheBench (ab) replacement";
+    homepage = "https://github.com/rakyll/hey";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ filalex77 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d9f945a6209..8a43ffa894ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4028,6 +4028,8 @@ in
   hexd = callPackage ../tools/misc/hexd { };
   pixd = callPackage ../tools/misc/pixd { };
 
+  hey = callPackage ../tools/networking/hey { };
+  
   hhpc = callPackage ../tools/misc/hhpc { };
 
   hiera-eyaml = callPackage ../tools/system/hiera-eyaml { };

From fa838323dd7c9a8be5908748181ff9afbbd308eb Mon Sep 17 00:00:00 2001
From: Christian Poveda <git@christianpoveda.xyz>
Date: Sat, 22 Feb 2020 20:58:29 -0500
Subject: [PATCH 1596/4636] pythonPackages.msgpack: 0.6.2 -> 1.0.0

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

diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix
index 20be837782ab..8095c151da7c 100644
--- a/pkgs/development/python-modules/msgpack/default.nix
+++ b/pkgs/development/python-modules/msgpack/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "msgpack";
-  version = "0.6.2";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ea3c2f859346fcd55fc46e96885301d9c2f7a36d453f5d8f2967840efa1e1830";
+    sha256 = "1h5mxh84rcw04dvxy1qbfn2hisavfqgilh9k09rgyjhd936dad4m";
   };
 
   checkPhase = ''

From e964450670ec717effb2e612e32b186a1b0a62ab Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Sat, 7 Dec 2019 01:34:14 +0000
Subject: [PATCH 1597/4636] legit: init at 1.2.0

---
 .../git-and-tools/default.nix                 |  2 ++
 .../git-and-tools/legit/default.nix           | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/legit/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index a7008bf44b39..6d1c235856fe 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -173,6 +173,8 @@ let
 
   lefthook = callPackage ./lefthook { };
 
+  legit = callPackage ./legit { };
+
   pass-git-helper = python3Packages.callPackage ./pass-git-helper { };
 
   pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit;
diff --git a/pkgs/applications/version-management/git-and-tools/legit/default.nix b/pkgs/applications/version-management/git-and-tools/legit/default.nix
new file mode 100644
index 000000000000..7dbdd6071a57
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/legit/default.nix
@@ -0,0 +1,30 @@
+{ lib, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "legit";
+  version = "1.2.0";
+  src = python3Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "0ngh3ar6v15516f52j21k6qz7hykmxfjadhb2rakvl27b5xvjy1c";
+  };
+
+  propagatedBuildInputs = with python3Packages; [
+    click
+    clint
+    crayons
+    GitPython
+    six
+  ];
+
+  # Prevent tests from trying to create configuration in /homeless-shelter.
+  preCheck = ''
+    export HOME=$PWD/test-home
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/frostming/legit";
+    description = "Git for Humans, Inspired by GitHub for Mac";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ryneeverett ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4fff36312704..a2cbfb2c2eb6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20094,6 +20094,8 @@ in
 
   lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { };
 
+  legit = gitAndTools.legit;
+
   leo-editor = callPackage ../applications/editors/leo-editor { };
 
   libowfat = callPackage ../development/libraries/libowfat { };

From 1b79fb8c94a3f1dc143ea02a3579068ff7b50d0c Mon Sep 17 00:00:00 2001
From: Klaas van Schelven <klaas@vanschelven.com>
Date: Wed, 26 Feb 2020 15:17:07 +0100
Subject: [PATCH 1598/4636] readline: remove vanschelven from maintainers

---
 pkgs/development/libraries/readline/7.0.nix | 2 +-
 pkgs/development/libraries/readline/8.0.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix
index 065d65449867..486c6eaa2241 100644
--- a/pkgs/development/libraries/readline/7.0.nix
+++ b/pkgs/development/libraries/readline/7.0.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
 
     license = licenses.gpl3Plus;
 
-    maintainers = [ maintainers.vanschelven ];
+    maintainers = [ ];
 
     platforms = platforms.unix;
     branch = "7.0";
diff --git a/pkgs/development/libraries/readline/8.0.nix b/pkgs/development/libraries/readline/8.0.nix
index 7fbef9a986ab..9b9f459e4c3b 100644
--- a/pkgs/development/libraries/readline/8.0.nix
+++ b/pkgs/development/libraries/readline/8.0.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
 
     license = licenses.gpl3Plus;
 
-    maintainers = with maintainers; [ vanschelven dtzWill ];
+    maintainers = with maintainers; [ dtzWill ];
 
     platforms = platforms.unix;
     branch = "8.0";

From 2358ecf2526ddd66424bc8f315ad685ab2352572 Mon Sep 17 00:00:00 2001
From: Klaas van Schelven <klaas@vanschelven.com>
Date: Wed, 26 Feb 2020 15:18:51 +0100
Subject: [PATCH 1599/4636] pythonPackages.google-api-core: remove vanschelven
 from maintainers

---
 pkgs/development/python-modules/google_api_core/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix
index 0f30be449c09..f3209c2d5203 100644
--- a/pkgs/development/python-modules/google_api_core/default.nix
+++ b/pkgs/development/python-modules/google_api_core/default.nix
@@ -30,6 +30,6 @@ buildPythonPackage rec {
     description = "This library is not meant to stand-alone. Instead it defines common helpers used by all Google API clients.";
     homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
     license = licenses.asl20;
-    maintainers = with maintainers; [ vanschelven ];
+    maintainers = with maintainers; [ ];
   };
 }

From 17c3ed4d30b9ed442123032a851f8cc54f70f026 Mon Sep 17 00:00:00 2001
From: Klaas van Schelven <klaas@vanschelven.com>
Date: Wed, 26 Feb 2020 15:19:08 +0100
Subject: [PATCH 1600/4636] pythonPackages.google-auth: remove vanschelven from
 maintainers

---
 pkgs/development/python-modules/google_auth/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix
index 56ca3358e890..1f86c2a2af2e 100644
--- a/pkgs/development/python-modules/google_auth/default.nix
+++ b/pkgs/development/python-modules/google_auth/default.nix
@@ -21,6 +21,6 @@ buildPythonPackage rec {
     description = "This library simplifies using Google’s various server-to-server authentication mechanisms to access Google APIs.";
     homepage = "https://google-auth.readthedocs.io/en/latest/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ vanschelven ];
+    maintainers = with maintainers; [ ];
   };
 }

From 1b56c107926145cbf2327e1f8f1b945fb5a853e0 Mon Sep 17 00:00:00 2001
From: Klaas van Schelven <klaas@vanschelven.com>
Date: Wed, 26 Feb 2020 15:19:27 +0100
Subject: [PATCH 1601/4636] pythonPackages.google-cloud-core: remove
 vanschelven from maintainers

---
 pkgs/development/python-modules/google_cloud_core/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/google_cloud_core/default.nix b/pkgs/development/python-modules/google_cloud_core/default.nix
index c74ad1d2e3ce..2a9a13b26307 100644
--- a/pkgs/development/python-modules/google_cloud_core/default.nix
+++ b/pkgs/development/python-modules/google_cloud_core/default.nix
@@ -22,6 +22,6 @@ buildPythonPackage rec {
     description = "API Client library for Google Cloud: Core Helpers";
     homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
     license = licenses.asl20;
-    maintainers = with maintainers; [ vanschelven ];
+    maintainers = with maintainers; [ ];
   };
 }

From 606253bee7cede95cd6fde7f777cabc65b3620d1 Mon Sep 17 00:00:00 2001
From: Klaas van Schelven <klaas@vanschelven.com>
Date: Wed, 26 Feb 2020 15:19:41 +0100
Subject: [PATCH 1602/4636] pythonPackages.google-cloud-speech: remove
 vanschelven from maintainers

---
 pkgs/development/python-modules/google_cloud_speech/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/google_cloud_speech/default.nix b/pkgs/development/python-modules/google_cloud_speech/default.nix
index c00ea6539009..bdf8031970f6 100644
--- a/pkgs/development/python-modules/google_cloud_speech/default.nix
+++ b/pkgs/development/python-modules/google_cloud_speech/default.nix
@@ -21,6 +21,6 @@ buildPythonPackage rec {
     description = "Cloud Speech API enables integration of Google speech recognition into applications.";
     homepage = "https://github.com/googleapis/google-cloud-python/tree/master/speech";
     license = licenses.asl20;
-    maintainers = with maintainers; [ vanschelven ];
+    maintainers = with maintainers; [ ];
   };
 }

From 3cef56f8d7aec6822b7d4a1be3e2585c672e8edd Mon Sep 17 00:00:00 2001
From: Klaas van Schelven <klaas@vanschelven.com>
Date: Wed, 26 Feb 2020 15:20:08 +0100
Subject: [PATCH 1603/4636] pythonPackages.googleapis-common-protos: remove
 vanschelven from maintainers

---
 .../python-modules/googleapis_common_protos/default.nix         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/googleapis_common_protos/default.nix b/pkgs/development/python-modules/googleapis_common_protos/default.nix
index 7a10ce12c38f..08d31b6920bb 100644
--- a/pkgs/development/python-modules/googleapis_common_protos/default.nix
+++ b/pkgs/development/python-modules/googleapis_common_protos/default.nix
@@ -19,6 +19,6 @@ buildPythonPackage rec {
     description = "Common protobufs used in Google APIs";
     homepage = "https://github.com/googleapis/googleapis";
     license = licenses.asl20;
-    maintainers = with maintainers; [ vanschelven ];
+    maintainers = with maintainers; [ ];
   };
 }

From 7db11155d09cf90631dfae35999cef717d22bb7d Mon Sep 17 00:00:00 2001
From: Klaas van Schelven <klaas@vanschelven.com>
Date: Wed, 26 Feb 2020 15:21:12 +0100
Subject: [PATCH 1604/4636] pythonPackages.grpcio-tools: remove vanschelven
 from maintainers

---
 pkgs/development/python-modules/grpcio-tools/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix
index 7965e200130d..fcfccf29efd8 100644
--- a/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/pkgs/development/python-modules/grpcio-tools/default.nix
@@ -20,6 +20,6 @@ buildPythonPackage rec {
     description = "Protobuf code generator for gRPC";
     license = licenses.asl20;
     homepage = "https://grpc.io/grpc/python/";
-    maintainers = with maintainers; [ vanschelven ];
+    maintainers = with maintainers; [ ];
   };
 }

From 256a07d3fb5500fd184118f3b4e6c27d3af60d5c Mon Sep 17 00:00:00 2001
From: Klaas van Schelven <klaas@vanschelven.com>
Date: Wed, 26 Feb 2020 15:21:43 +0100
Subject: [PATCH 1605/4636] pythonPackages.grpcio: remove vanschelven from
 maintainers

---
 pkgs/development/python-modules/grpcio/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix
index 60bfae8dca5b..cdb252f7434d 100644
--- a/pkgs/development/python-modules/grpcio/default.nix
+++ b/pkgs/development/python-modules/grpcio/default.nix
@@ -18,6 +18,6 @@ buildPythonPackage rec {
     description = "HTTP/2-based RPC framework";
     license = licenses.asl20;
     homepage = "https://grpc.io/grpc/python/";
-    maintainers = with maintainers; [ vanschelven ];
+    maintainers = with maintainers; [ ];
   };
 }

From a3c9bb7cd996b3aff5d7778f24e64c14fabad79b Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <brightone@protonmail.com>
Date: Wed, 26 Feb 2020 22:13:56 +0200
Subject: [PATCH 1606/4636] act: 0.1.3 -> 0.2.4

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

diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix
index bf1cae3edc72..227fb27051a2 100644
--- a/pkgs/development/tools/misc/act/default.nix
+++ b/pkgs/development/tools/misc/act/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "act";
-  version = "0.1.3";
+  version = "0.2.4";
 
   src = fetchFromGitHub {
     owner = "nektos";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1y1bvk93dzsxwjakmgpb5qyy3lqng7cdabi64b555c1z6b42mf58";
+    sha256 = "1sn36686nfmqvhmippdapk0pxqx3x1q4dwdyhjr8j8scyfrk68iv";
   };
 
-  modSha256 = "00d0wjnr5y3bl95lma8sdwvqqs7fd0k43azawp1kb29kqnrlismg";
+  modSha256 = "0ghp61m8fxg1iwq2ypmp99cqv3n16c06v2xzg9v34299vmd89gi2";
 
   meta = with lib; {
     description = "Run your GitHub Actions locally";

From bd938f6beabaabfd097594f64ef6158e26f32ee5 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 24 Feb 2020 14:47:45 -0800
Subject: [PATCH 1607/4636] dotnetCorePackages.{aspnetcore,netcore,sdk}_3_0:
 3.0.2 -> 3.0.3

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

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index 58d49a505156..3ce72ff1f8dd 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -35,18 +35,18 @@ in rec {
   # v3.0.2 (Maintenance)
 
   aspnetcore_3_0 = buildAspNetCore {
-    version = "3.0.2";
-    sha512 = "84dcc2a2a9e43afbc166771153d85b19cb09f964c85c787d77b362fd1d9e076345ae153305fa9040999846a56b69041eb89282804587478b926179d2613d259d";
+    version = "3.0.3";
+    sha512 = "342v6kxxbxky09d1c392vvr9rm30lf75wccka1bk2h4advlcga5nlgv93g7vrq48bsyxfi5gc36r3b0dlwl1g409g5mlk1042n6d0yq";
   };
 
   netcore_3_0 = buildNetCore {
-    version = "3.0.2";
-    sha512 = "c8f0e4eb220fa896c4a803a8d9d0c704ae7b8383801a977036f3089b1d779159f5a2d9293dc11ff5f4f6c76febc6f70f6cfcdff0debd3243cad5eb635f853d45";
+    version = "3.0.3";
+    sha512 = "32ykpcw2xx708r2lxcwcbxnmy4sk159rlfjfvkw990qh7n79pm3lm2qwa3zhqcslznmpg18kwxz8qb5fgsa0h49g843xx4kyai0n7rx";
   };
 
   sdk_3_0 = buildNetCoreSdk {
-    version = "3.0.102";
-    sha512 = "77bc287d9c20630976ac4c0736192ba4899154c9e7cc5b87bc9d94d5d8abafdd832cfe8f385b6ba584c702d9261566109df15ab46b0d62bd218d950d3b47893e";
+    version = "3.0.103";
+    sha512 = "2diiplgxs92fkb6ym68b02d79z4qn63x5qlky5lvr757c1zkh0vfpk3khawdg94kdn4qkn6dmyqr0msxqgmiqyhp63cadzqq4vx7b12";
   };
 
   # v3.1.1 (LTS)

From 3a3d15f1f685601fcae448fe457e4b8f4ff3066d Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 24 Feb 2020 14:50:14 -0800
Subject: [PATCH 1608/4636] dotnetCorePackages.{aspnetcore,netcore,sdk}_3_1:
 3.1.1 -> 3.1.2

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

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index 3ce72ff1f8dd..9e8cfeda1408 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -52,17 +52,17 @@ in rec {
   # v3.1.1 (LTS)
 
   aspnetcore_3_1 = buildAspNetCore {
-    version = "3.1.1";
-    sha512 = "cc27828cacbc783ef83cc1378078e14ac558aec30726b36c4f154fad0d08ff011e7e1dfc17bc851926ea3b0da9c7d71496af14ee13184bdf503856eca30a89ae";
+    version = "3.1.2";
+    sha512 = "27708bk5liz8r39p4dzs41clgq298d49g8ipzdj56pz613vkfyv7bp91666ydz36aazm265j2g9ji3sk1f9kbgv6024zwrly5w9vqrm";
   };
 
   netcore_3_1 = buildNetCore {
-    version = "3.1.1";
-    sha512 = "991a89ac7b52d3bf6c00359ce94c5a3f7488cd3d9e4663ba0575e1a5d8214c5fcc459e2cb923c369c2cdb789a96f0b1dfb5c5aae1a04df6e7f1f365122072611";
+    version = "3.1.2";
+    sha512 = "3zwg1anrcni9kagmjxn485bpjvb146hkm7irmikq3v879gjhd2fgpscg226ds83l4pxll3r7lwris6ij952xmy8lsqraapd9111ba14";
   };
 
   sdk_3_1 = buildNetCoreSdk {
-    version = "3.1.101";
-    sha512 = "eeee75323be762c329176d5856ec2ecfd16f06607965614df006730ed648a5b5d12ac7fd1942fe37cfc97e3013e796ef278e7c7bc4f32b8680585c4884a8a6a1";
+    version = "3.1.102";
+    sha512 = "0lmz8ac5j0i4zcq4904kr6qibvyjcm2ckfg27kqyqfii00qmm80xb5sk3i7f06xqkbgkrqkbg9rsldk75akw6m5dxg932j602bxrb4w";
   };
 }

From 0538dec989ed6556bdce0e8fe59e4f2ef184915f Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 24 Feb 2020 15:00:51 -0800
Subject: [PATCH 1609/4636] dotnetCorePackages.{aspnetcore,netcore,sdk}_2_1:
 2.1.15 -> 2.1.16

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

diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index 9e8cfeda1408..7b7a564ba374 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -14,18 +14,18 @@ in rec {
   # v2.1.15 (LTS)
 
   aspnetcore_2_1 = buildAspNetCore {
-    version = "2.1.15";
-    sha512 = "a557f175cca92bb1dd66cf638ff84fe85750fab67028bd4472748b22ef0591f5f3812446a3dbe21c3d1be28c47d459d854d690dbace1b95bc7136b248af87334";
+    version = "2.1.16";
+    sha512 = "0awdzi8dysbg8xcy4l8wx2sb8gaaklphmwv61qxh7dj6ih4nla34l02xdax1l8nw41znnnqzsa77avglnrz36pckm9mc52m7wc7877h";
   };
 
   netcore_2_1 = buildNetCore {
-    version = "2.1.15";
-    sha512 = "cfd7f7caea7e896dd4d68a05c827c86f38595f24e854edb3f934715ee1268e2623f17ff768215e465fe596cd474497384be2b1381f04ddd6d555665a341f65f6";
+    version = "2.1.16";
+    sha512 = "07vvmza32hsblpw4zpcksm2gicy4agh0d1fwradqj16y6xbh3frdp87mqgbj5m54mmyfp5bc8c46v1w6dfm1w3y80v2y46aynild45l";
   };
 
   sdk_2_1 = buildNetCoreSdk {
-    version = "2.1.803";
-    sha512 = "57d48d6ca1bd92ac348dc05220d984811c0cf005774d7afdfbbf125a842acb0a26572146ed25a7eb26f4e0404fe840b70d1e7ec1fb7c9a5c6cfe81fefc41b363";
+    version = "2.1.804";
+    sha512 = "1kbzxcdgyvs94kkm6ikr1j0p0k3zq30d10sl69ig0rgbqbqm4rpqi6dq94jjbw7q3jlwz83vgq3549q38d2s9kalmzv9lmddn2kkc42";
   };
 
   # v2.2

From e9834efebca3509f0d9c48d4d4bd111e2f469f69 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 26 Feb 2020 20:55:55 +0100
Subject: [PATCH 1610/4636] =?UTF-8?q?zsh-powerlevel10k:=201.1=20=E2=86=92?=
 =?UTF-8?q?=201.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changes since the last release

    New segments:
        wifi: shows WiFi data transfer speed; can optionally display security level, SSID, etc.
        asdf: tool versions from asdf.
        taskwarrior: task counts from taskwarrior.
        phpenv: PHP version from phpenv.
    New parameters:
        POWERLEVEL9K_${SEGMENT}_${STATE}_SHOW_ON_UPGLOB with regular fallback; this allows you to display a prompt segment only whethere is a file matching a certain pattern in the current directory, or in .., or in ../.., etc. For example: POWERLEVEL9K_NODE_VERSION_SHOW_ON_UPGLOB='package.json|node_modules' to show node_version segment only in Node project directories.
        POWERLEVEL9K_VPN_IP_SHOW_ALL: if set to true, vpn_ip will show IPs from all matching network interfaces instead of just the first.
        POWERLEVEL9K_DIR_TRUNCATE_BEFORE_MARKER: when set to true, drops path before the last marked directory (usually a Git repo root).
        More fine grained control over battery colors: POWERLEVEL9K_BATTERY_${state}_{STAGES,LEVEL_BACKGROUND,LEVEL_FOREGROUND}.
        Network transfer speed: P9K_IP_TX_RATE and P9K_IP_RX_RATE in ip segment.
    Configuration wizard:
        Gracefully handle non-writable ~/.zshrc.
        New segments enabled by default: asdf, taskwarrior, phpenv.
        New segments disabled by default: php_version, laravel_version.
        Git status now displays VCS_STATUS_PUSH_COMMITS_{AHEAD,BEHIND}.
        Git status now displays "─" when POWERLEVEL9K_VCS_MAX_INDEX_SIZE_DIRTY is in effect.
        Git status by default ignores the git repo rooted at $HOME; see POWERLEVEL9K_VCS_DISABLED_WORKDIR_PATTERN.
        Pure style now has context on the very left; upstream: sindresorhus/pure#530.
        When installing the recommended font for iTerm2, detect and attempt to delete (after confirmation from the user) other versions of MesloLGS NF.
    New style: robbyrussell; not exposed through the wizard; enable it with source .../powerlevel10k/config/p10k-robbyrussell.zsh.
    Prompt performance improvements:
        Async worker chatter is now 2x faster.
        Prompt rendering and gitstatus_query now run in parallel; this reduces prompt latency by up to 5ms.
    Bug fixes:
        truncate_to_last now behaves exactly like %1~.
        Don't crap out when file names contain colon.
        Don't crap out when using more than one prompt_char.
        Don't crap out when PATH is empty.
        gcloud now works when using non-default configs.
        timewarrior segment now respects $TIMEWARRIORDB (thanks, @errantepiphany!).
        Pick up ip and ifconfig tools from PATH (used to be /sbin/ip and /sbin/ifconfig).
        SHOW_ON_COMMAND now works with legacy custom prompt segments.
        Git status in Pure style now has correct number of spaces.
    Robustness improvements:
        Work around a bug in sysread in Zsh (fixed in Zsh 5.8).
        Replace all wide icons with narrow by default (many terminals choke on wide icons).
        Replace terraform icons with another (emacs crashes on the old icon).
        Prompt should now function even when locale is misconfigured as long as there is at least one UTF-8 locale installed on the system.
        Workarounds for Zsh bugs in handling of ZLE_RPROMPT_INDENT=0 are now applied in more cases.
    gitstatus:
        Support repositories where .git is a symbolic link.
        Support repositories with preciousObjects extension.
        Add VCS_STATUS_PUSH_{REMOTE_NAME,REMOTE_URL,COMMITS_AHEAD,COMMITS_BEHIND}: similar to VCS_STATUS_{REMOTE_NAME,REMOTE_URL,COMMITS_AHEAD,COMMITS_BEHIND} but for @push remote.
        Add VCS_STATUS_NUM_SKIP_WORKTREE and VCS_STATUS_NUM_ASSUME_UNCHANGED: the number of files in the index with --skip-worktree and --assume-unchanged bits respectively`.
        Support Cygwin on older versions of Windows
        Completely rewritten Zsh API (similar to async worker in powerlevel10k); this makes startup about 5x faster and should be more robust.
        The gitstatusd binary is now looked up as follows:
            If GITSTATUS_DAEMON is an absolute path, use that.
            Else if GITSTATUS_DAEMON is a valid command name (PATH lookup), use that.
            Else if GITSTATUS_DAEMON is not empty, try $gitstatus_dir/{usrbin,bin}/$GITSTATUS_DAEMON (in this order).
            Else try $gitstatus_dir/{usrbin,bin}/gitstatusd-$os-$arch{,-static} (in this order).
---
 pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
index 38d5cfdb8524..7daa8fa1fd75 100644
--- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
+++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
@@ -3,14 +3,15 @@
 # To make use of this derivation, use
 # `programs.zsh.promptInit = "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme";`
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "powerlevel10k";
-  version = "1.1";
+  version = "1.2.0";
+
   src = fetchFromGitHub {
     owner = "romkatv";
     repo = "powerlevel10k";
-    rev = "9d9c50611da19044370ee759e593ccadbad32a6a";
-    sha256 = "0jl4jamh7i8w7lp3qbbakh1wsyrrmslsrjwh9jgyvw50a83hp6fj";
+    rev = "v${version}";
+    sha256 = "1hvhql7564j6n6xwg4wckzvzs4fk5zlrdxkx5nd9i3g2d477nbac";
   };
 
   patches = [

From 7fa4d90d7ba5114a49887a90537b1d19f1f2ce5f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 26 Feb 2020 20:57:05 +0100
Subject: [PATCH 1611/4636] =?UTF-8?q?gitstatusd:=20unstable-2020-01-28=20?=
 =?UTF-8?q?=E2=86=92=20unstable-2020-02-26?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also updates the internally used libgit2 fork.
---
 .../git-and-tools/gitstatus/default.nix                   | 8 ++++----
 .../git-and-tools/gitstatus/romkatv_libgit2.nix           | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
index ca0c905874e3..ee4cc61c63f9 100644
--- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
@@ -1,14 +1,14 @@
-{callPackage, stdenv, fetchFromGitHub, ...}:
+{ callPackage, stdenv, fetchFromGitHub, ...}:
 
 stdenv.mkDerivation {
   pname = "gitstatus";
-  version = "unstable-2020-01-28";
+  version = "unstable-2020-02-26";
 
   src = fetchFromGitHub {
     owner = "romkatv";
     repo = "gitstatus";
-    rev = "edb99aa7b86d10ad0a1cfe25135b57c8031d82ad";
-    sha256 = "1nys74qswwc7hn9cv0j7syvbpnw0f15chc9pi11him4d6lsflrfd";
+    rev = "c0e5a24299c1a1a71434dac1de6ea650e80fbe49";
+    sha256 = "0fj84cvr5a895jqgg86raakx6lqyyhahf1dgzgx05y2gfvnxxh8m";
   };
 
   buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ];
diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
index 211ad1eccd85..1279e5dd6c99 100644
--- a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
@@ -1,4 +1,4 @@
-{fetchFromGitHub, libgit2, ...}:
+{ fetchFromGitHub, libgit2, ...}:
 
 libgit2.overrideAttrs (oldAttrs: {
   cmakeFlags = oldAttrs.cmakeFlags ++ [
@@ -13,7 +13,7 @@ libgit2.overrideAttrs (oldAttrs: {
   src = fetchFromGitHub {
     owner = "romkatv";
     repo = "libgit2";
-    rev = "75be63625a0de418ec3551306362ee1e21034039";
-    sha256 = "1bwr1ahfxn1nn2f78ri91icxpv8xhpmgypcvg042cmcpm2qrahz9";
+    rev = "bb77509f4436901f3958e30272026f63d2247d7d";
+    sha256 = "06iypr0sc6g11xipwfbgm6f039d4qy9krmwb3zww8k4y004s5jcv";
   };
 })

From fb25925056cd859f156c75e358a276c8180a46a0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 26 Feb 2020 21:34:10 +0000
Subject: [PATCH 1612/4636] python37Packages.ezdxf: 0.9 -> 0.11

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

diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix
index 94fca96b455b..0184ae9ffd77 100644
--- a/pkgs/development/python-modules/ezdxf/default.nix
+++ b/pkgs/development/python-modules/ezdxf/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pyparsing, pytest }:
 
 buildPythonPackage rec {
-  version = "0.9";
+  version = "0.11";
   pname = "ezdxf";
 
   disabled = pythonOlder "3.5";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     owner = "mozman";
     repo = "ezdxf";
     rev = "v${version}";
-    sha256 = "1ggimjd9060b696sgzgxy9j9sl45wh9qbxnf0035qclafshprlzl";
+    sha256 = "167iw1j1c6195bwv6i8z1m7s0i27r0y0acxd2w76hvnq3a72jbsd";
   };
 
   checkInputs = [ pytest ];
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Python package to read and write DXF drawings (interface to the DXF file format)";
-    homepage = https://github.com/mozman/ezdxf/;
+    homepage = "https://github.com/mozman/ezdxf/";
     license = licenses.mit;
     maintainers = with maintainers; [ hodapp ];
     platforms = platforms.unix;

From 9244aaab1f304685ef2e7b4d475728e781192dd9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 26 Feb 2020 22:27:55 +0000
Subject: [PATCH 1613/4636] python27Packages.gphoto2: 2.0.0 -> 2.1.0

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

diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix
index 9d760b37d379..2c8a5a0106a7 100644
--- a/pkgs/development/python-modules/gphoto2/default.nix
+++ b/pkgs/development/python-modules/gphoto2/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "gphoto2";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "01vcbjsy5zpfd9rzshk2d6150vhb66m5n420j0wd0k0i0p74ya98";
+    sha256 = "1fdmlyy3lbc6ggfn60fjizaz5icxd676y7gz9nzfy3l4id7mfyk4";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Python interface to libgphoto2";
-    homepage = https://github.com/jim-easterbrook/python-gphoto2;
+    homepage = "https://github.com/jim-easterbrook/python-gphoto2";
     license = licenses.gpl3;
     maintainers = with maintainers; [ jfrankenau ];
   };

From 7a86086b293670b81288fa9d352e8699d00f389d Mon Sep 17 00:00:00 2001
From: ngerstle <ngerstle@gmail.com>
Date: Tue, 25 Feb 2020 07:59:35 +0100
Subject: [PATCH 1614/4636] maintainers: add ngerstle

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0fc003959653..436ccb4ef01f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8126,6 +8126,11 @@
     githubId = 3674056;
     name = "Asad Saeeduddin";
   };
+  ngerstle = {
+    name  = "Nicholas Gerstle";
+    email = "ngerstle@gmail.com";
+    github = "ngerstle";
+  };
 }
 
   

From 2dd982956979fbc37950e9596282e073651edb23 Mon Sep 17 00:00:00 2001
From: ngerstle <ngerstle@gmail.com>
Date: Tue, 25 Feb 2020 08:00:40 +0100
Subject: [PATCH 1615/4636] keycloak: init at 9.0.0

PR #80897
---
 pkgs/servers/keycloak/default.nix | 34 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/servers/keycloak/default.nix

diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix
new file mode 100644
index 000000000000..5fe684cfe31f
--- /dev/null
+++ b/pkgs/servers/keycloak/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchzip, makeWrapper, jre }:
+
+stdenv.mkDerivation rec {
+  pname   = "keycloak";
+  version = "9.0.0";
+
+  src = fetchzip {
+    url    = "https://downloads.jboss.org/keycloak/${version}/keycloak-${version}.zip";
+    sha256 = "1w2d76v1rjghvdks1w32qi08gh88cd37vbf6vx0kq9a2gnhn7hip";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir $out
+    cp -r * $out
+
+    rm -rf $out/bin/*.{ps1,bat}
+    rm -rf $out/bin/add-user-keycloak.sh
+    rm -rf $out/bin/jconsole.sh
+
+    chmod +x $out/bin/standalone.sh
+    wrapProgram $out/bin/standalone.sh \
+      --prefix PATH ":" ${jre}/bin ;
+  '';
+
+  meta = with stdenv.lib; {
+    homepage    = "https://www.keycloak.org/";
+    description = "Identity and access management for modern applications and services";
+    license     = licenses.asl20;
+    maintainers = [ maintainers.ngerstle ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4fff36312704..8c33eb8517ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15375,6 +15375,8 @@ in
 
   jetty = callPackage ../servers/http/jetty { };
 
+  keycloak = callPackage ../servers/keycloak { };
+
   knot-dns = callPackage ../servers/dns/knot-dns { };
   knot-resolver = callPackage ../servers/dns/knot-resolver { };
 

From 79f057e2ebafc61e1172dd2961509b754d476098 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 26 Feb 2020 18:00:00 -0500
Subject: [PATCH 1616/4636] lean: 3.5.1 -> 3.6.0

---
 pkgs/applications/science/logic/lean/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index 726bac5c50e2..d718dd01ed42 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lean";
-  version = "3.5.1";
+  version = "3.6.0";
 
   src = fetchFromGitHub {
     owner  = "leanprover-community";
     repo   = "lean";
     rev    = "v${version}";
-    sha256 = "0m7knf1hfbn2v6p6kmqxlx8c40p5nzv8d975w2xwljaccc42j1yp";
+    sha256 = "1filkhyqcjglbavbkjra0nk3y7hw8993wyl7r87ikydb2bjishsc";
   };
 
   nativeBuildInputs = [ cmake ];

From 338da54af4790ffb4d0e5ae77ea06e96bd61da82 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Thu, 27 Feb 2020 00:15:47 +0100
Subject: [PATCH 1617/4636] perlPackages.JSONValidator: 3.18 -> 3.23

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 57f24021739f..f82a6a22e250 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9708,10 +9708,10 @@ let
 
   JSONValidator = buildPerlPackage {
     pname = "JSON-Validator";
-    version = "3.18";
+    version = "3.23";
     src = fetchurl {
-      url = mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-3.18.tar.gz;
-      sha256 = "a62474311b57c0a01ad06a5e340ec10d3723d74fd019304c769ffc7a61b5a47a";
+      url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-3.23.tar.gz";
+      sha256 = "1fzy2z7mkg5vgcjvykh5ay8yg6q496wi14x9wp5hc9agplsq7f0s";
     };
     buildInputs = [ TestDeep ];
     propagatedBuildInputs = [ DataValidateDomain DataValidateIP Mojolicious NetIDNEncode YAMLLibYAML ];

From 33323e4006b5eaaf44d3ed506083f297ba23f7eb Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Fri, 11 Oct 2019 21:45:41 +0900
Subject: [PATCH 1618/4636] node updater improvements

- Make it run from anywhere
- overwrite old packages only on success to prevent getting into a bad
state
---
 pkgs/development/node-packages/generate.sh    | 19 ++++++++++++-------
 .../node-packages/shell-generate.nix          |  9 +++++++++
 2 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/development/node-packages/shell-generate.nix

diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh
index ca6e06286422..3b1626f9afb3 100755
--- a/pkgs/development/node-packages/generate.sh
+++ b/pkgs/development/node-packages/generate.sh
@@ -1,10 +1,15 @@
 #!/usr/bin/env nix-shell
-#! nix-shell -I nixpkgs=../../.. -i bash -p nodePackages.node2nix
-# NOTE: Script must be run from the node-packages directory
-
+#! nix-shell shell-generate.nix -i bash
 set -eu -o pipefail
 
-rm -f node-env.nix
-node2nix --nodejs-10 -i node-packages-v10.json -o node-packages-v10.nix -c composition-v10.nix
-node2nix --nodejs-12 -i node-packages-v12.json -o node-packages-v12.nix -c composition-v12.nix
-node2nix --nodejs-13 -i node-packages-v13.json -o node-packages-v13.nix -c composition-v13.nix
+cd "$NODE_NIXPKGS_PATH/pkgs/development/node-packages"
+rm -f ./node-env.nix
+for version in 10 12 13; do
+    tmpdir=$(mktemp -d)
+    node2nix --nodejs-$version -i node-packages-v$version.json -o $tmpdir/node-packages-v$version.nix -c $tmpdir/composition-v$version.nix
+    if [ $? -eq 0 ]; then
+        mv $tmpdir/node-packages-v$version.nix .
+        mv $tmpdir/composition-v$version.nix .
+    fi
+done
+cd -
diff --git a/pkgs/development/node-packages/shell-generate.nix b/pkgs/development/node-packages/shell-generate.nix
new file mode 100644
index 000000000000..0ca5d494e564
--- /dev/null
+++ b/pkgs/development/node-packages/shell-generate.nix
@@ -0,0 +1,9 @@
+{ nixpkgs ? import ../../.. {} }:
+with nixpkgs;
+mkShell {
+  buildInputs = [
+    bash nodePackages.node2nix
+  ];
+  NODE_NIXPKGS_PATH = toString ./.;
+}
+

From d1293a70c7c58e72d65865861e847a3d516ffb31 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 25 Feb 2020 11:48:06 -0600
Subject: [PATCH 1619/4636] yosys: 2020.02.07 -> 2020.02.25

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/yosys/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index 739759a67fc3..de90a0c0695a 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "yosys";
-  version = "2020.02.07";
+  version = "2020.02.25";
 
   src = fetchFromGitHub {
     owner  = "YosysHQ";
     repo   = "yosys";
-    rev    = "2e8d6ec0b06b4e51e222c15c8049130bc264ae57";
-    sha256 = "0asnqhxs5r5r2xmvsk9pbgyqgk53j1snh7c9qizcppn4csapda81";
+    rev    = "6edca05793197a846bbfb0329e836c87fa5aabb6";
+    sha256 = "1cwps3nsld80bh2b66l8fx3fa2zsx174mw72kqxyihpfdm0m0z1s";
   };
 
   enableParallelBuilding = true;

From c134564c26d5d2c20cb857dfae69345c6aa5ad11 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 26 Feb 2020 15:54:26 -0600
Subject: [PATCH 1620/4636] bluespec: install utilities, too

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/bluespec/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix
index 5f6b44a58928..49737b48c575 100644
--- a/pkgs/development/compilers/bluespec/default.nix
+++ b/pkgs/development/compilers/bluespec/default.nix
@@ -71,6 +71,10 @@ in stdenv.mkDerivation rec {
       src/comp/update-build-version.sh \
       src/comp/update-build-system.sh \
       src/comp/wrapper.sh
+
+    substituteInPlace src/comp/Makefile \
+      --replace 'BINDDIR' 'BINDIR' \
+      --replace 'install-bsc install-bluetcl' 'install-bsc install-bluetcl $(UTILEXES) install-utils'
   '';
 
   makeFlags = [

From 3f34c5388fa640521498759fbf5fa14a172c1ff4 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 27 Feb 2020 10:35:25 +1000
Subject: [PATCH 1621/4636] wireshark: 3.2.1 -> 3.2.2

https://www.wireshark.org/docs/relnotes/wireshark-3.2.2.html
---
 pkgs/applications/networking/sniffers/wireshark/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 2da36be90de2..1dbc49512c6e 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -10,7 +10,7 @@ assert withQt  -> qt5  != null;
 with stdenv.lib;
 
 let
-  version = "3.2.1";
+  version = "3.2.2";
   variant = if withQt then "qt" else "cli";
 
 in stdenv.mkDerivation {
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
-    sha256 = "0nz84zyhs4177ljxmv34vgc9kgg7ssxhxa4mssxqwh6nb00697sq";
+    sha256 = "0ygdxpz0i4jxp55fg9x4xcan093wycjb66yas073gviz9kpj6naz";
   };
 
   cmakeFlags = [
@@ -100,7 +100,7 @@ in stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://www.wireshark.org/;
+    homepage = "https://www.wireshark.org/";
     description = "Powerful network protocol analyzer";
     license = licenses.gpl2;
 

From 0d422d500766d954e207009477ffa43ce98c454b Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Sat, 15 Feb 2020 19:26:35 -0500
Subject: [PATCH 1622/4636] gambit: set CC to full path, fixes #78921

Use -Os rather than -O2 as our compilation flag, document why.

Document why we always use gcc over clang.

Fix openssl path in gambit.
Stop trying to make static openssl.
---
 .../compilers/gambit/bootstrap.nix            |  6 +-
 pkgs/development/compilers/gambit/build.nix   | 85 ++++++++++++-------
 2 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix
index f00a8b6efc91..2fb9e3ce2fc4 100644
--- a/pkgs/development/compilers/gambit/bootstrap.nix
+++ b/pkgs/development/compilers/gambit/bootstrap.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, ... }:
+{ stdenv, fetchurl, autoconf, gcc, coreutils, ... }:
 
 stdenv.mkDerivation {
   pname = "gambit-bootstrap";
@@ -12,6 +12,10 @@ stdenv.mkDerivation {
   buildInputs = [ autoconf ];
 
   configurePhase = ''
+    export CC=${gcc}/bin/gcc CXX=${gcc}/bin/g++ \
+           CPP=${gcc}/bin/cpp CXXCPP=${gcc}/bin/cpp LD=${gcc}/bin/ld \
+           XMKMF=${coreutils}/bin/false
+    unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS
     ./configure --prefix=$out
   '';
 
diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix
index 7a3324d75602..e17241b6d98d 100644
--- a/pkgs/development/compilers/gambit/build.nix
+++ b/pkgs/development/compilers/gambit/build.nix
@@ -1,4 +1,19 @@
-{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, src }:
+{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, gcc, src, coreutils }:
+
+# Note that according to a benchmark run by Marc Feeley on May 2018,
+# clang is 10x (with default settings) to 15% (with -O2) slower than GCC at compiling
+# Gambit output, producing code that is 3x slower. IIRC the benchmarks from Gambit@30,
+# the numbers were still heavily in favor of GCC in October 2019.
+# Thus we use GCC over clang, even on macOS.
+
+# Also note that I (fare) just ran benchmarks from https://github.com/ecraven/r7rs-benchmarks
+# with Gambit 4.9.3 with -O1 vs -O2 vs -Os on Feb 2020. Which wins depends on the benchmark.
+# The fight is unclear between -O1 and -O2, where -O1 wins more often, by up to 17%,
+# but sometimes -O2 wins, once by up to 43%, so that overall -O2 is 5% faster.
+# However, -Os seems more consistent in winning slightly against both -O1 and -O2,
+# and is overall 15% faster than -O2. As for compile times, -O1 is fastest,
+# -Os is about 29%-33% slower than -O1, while -O2 is about 40%-50% slower than -O1.
+# Overall, -Os seems like the best choice, and that's what we now use.
 
 stdenv.mkDerivation rec {
   pname = "gambit";
@@ -7,38 +22,48 @@ stdenv.mkDerivation rec {
 
   bootstrap = import ./bootstrap.nix ( pkgs );
 
-  # Use makeStaticLibraries to enable creation of statically linked binaries
-  buildInputs = [ git autoconf bootstrap openssl (makeStaticLibraries openssl)];
+  # TODO: if/when we can get all the library packages we depend on to have static versions,
+  # we could use something like (makeStaticLibraries openssl) to enable creation
+  # of statically linked binaries by gsc.
+  buildInputs = [ git autoconf bootstrap openssl ];
+
+  configureFlags = [
+    "--enable-single-host"
+    "--enable-c-opt=-Os"
+    "--enable-gcc-opts"
+    "--enable-shared"
+    "--enable-absolute-shared-libs" # Yes, NixOS will want an absolute path, and fix it.
+    "--enable-poll"
+    "--enable-openssl"
+    "--enable-default-runtime-options=f8,-8,t8" # Default to UTF-8 for source and all I/O
+    # "--enable-debug" # Nope: enables plenty of good stuff, but also the costly console.log
+    # "--enable-multiple-versions" # Nope, NixOS already does version multiplexing
+    # "--enable-guide"
+    # "--enable-track-scheme"
+    # "--enable-high-res-timing"
+    # "--enable-max-processors=4"
+    # "--enable-multiple-vms"
+    # "--enable-dynamic-tls"
+    # "--enable-multiple-threaded-vms"  # when SMP branch is merged in
+    # "--enable-thread-system=posix"    # default when --enable-multiple-vms is on.
+    # "--enable-profile"
+    # "--enable-coverage"
+    # "--enable-inline-jumps"
+    # "--enable-char-size=1" # default is 4
+  ];
 
   configurePhase = ''
-    options=(
-      --prefix=$out
-      --enable-single-host
-      --enable-c-opt=-O2
-      --enable-gcc-opts
-      --enable-shared
-      --enable-absolute-shared-libs # Yes, NixOS will want an absolute path, and fix it.
-      --enable-poll
-      --enable-openssl
-      --enable-default-runtime-options="f8,-8,t8" # Default to UTF-8 for source and all I/O
-      #--enable-debug # Nope: enables plenty of good stuff, but also the costly console.log
+    export CC=${gcc}/bin/gcc CXX=${gcc}/bin/g++ \
+           CPP=${gcc}/bin/cpp CXXCPP=${gcc}/bin/cpp LD=${gcc}/bin/ld \
+           XMKMF=${coreutils}/bin/false
+    unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS
+    ./configure --prefix=$out ${builtins.concatStringsSep " " configureFlags}
 
-      #--enable-multiple-versions # Nope, NixOS already does version multiplexing
-      #--enable-guide
-      #--enable-track-scheme
-      #--enable-high-res-timing
-      #--enable-max-processors=4
-      #--enable-multiple-vms
-      #--enable-dynamic-tls
-      #--enable-multiple-vms
-      #--enable-multiple-threaded-vms  ## when SMP branch is merged in
-      #--enable-thread-system=posix    ## default when --enable-multiple-vms is on.
-      #--enable-profile
-      #--enable-coverage
-      #--enable-inline-jumps
-      #--enable-char-size=1" ; default is 4
-    )
-    ./configure ''${options[@]}
+    # OS-specific paths are hardcoded in ./configure
+    substituteInPlace config.status \
+      --replace /usr/local/opt/openssl/lib "${openssl.out}/lib" \
+      --replace /usr/local/opt/openssl@1.1/lib "${openssl.out}/lib"
+    ./config.status
   '';
 
   buildPhase = ''

From 32b3758b3d9fcb39094b44dc3114d86f712b0fb0 Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Mon, 23 Dec 2019 17:34:38 -0500
Subject: [PATCH 1623/4636] gambit-unstable: 2019-07-21 -> 2020-02-24

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

diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix
index d855b83f0afc..4c33c83c67b1 100644
--- a/pkgs/development/compilers/gambit/unstable.nix
+++ b/pkgs/development/compilers/gambit/unstable.nix
@@ -1,13 +1,13 @@
 { stdenv, callPackage, fetchFromGitHub }:
 
 callPackage ./build.nix {
-  version = "unstable-2019-07-21";
-# git-version = "4.9.3-109-g3b5f74fa";
+  version = "unstable-2020-02-24";
+# git-version = "4.9.3-979-gc69e9f70";
   src = fetchFromGitHub {
     owner = "feeley";
     repo = "gambit";
-    rev = "3b5f74fae74b2159e3bf6923f29a18b31cc15dcc";
-    sha256 = "07cb0d8754dqhxawkp5dp4y0bsa9kfald4dkj60j5yfnsp81y5mi";
+    rev = "c69e9f70dfdc6545353b135a5d5e2f9234f1e1cc";
+    sha256 = "1f69n7yzzdv3wpnjlrbck38xpa8115vbady43mc544l39ckklr0k";
   };
   inherit stdenv;
 }

From 05336f23b1abb389a490c15bae7f0cfd031338b6 Mon Sep 17 00:00:00 2001
From: Alexander Rodin <rodin.alexander@gmail.com>
Date: Tue, 25 Feb 2020 20:39:50 +0300
Subject: [PATCH 1624/4636] vector: 0.7.2 -> 0.8.0

---
 pkgs/tools/misc/vector/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix
index 2e01059b7366..92bcf98c9198 100644
--- a/pkgs/tools/misc/vector/default.nix
+++ b/pkgs/tools/misc/vector/default.nix
@@ -1,6 +1,7 @@
 { stdenv, lib, fetchFromGitHub, rustPlatform
 , openssl, pkg-config, protobuf
 , Security, libiconv, rdkafka
+, tzdata
 
 , features ?
     (if stdenv.isAarch64
@@ -10,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "vector";
-  version = "0.7.2";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner  = "timberio";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "1r6pqljrl0cqz5x09p6bmf4h52h8m02pg05a09idj86v0c0q6bw3";
+    sha256 = "0girph2icl95klwqh3ksyr7fwril2pyb2gmnphgxrs6bibp1a2ha";
   };
 
-  cargoSha256 = "1c742g7a4z5lhr991hxdhwk8h0d43r4vv5bxj80sf3lynyx60yzf";
+  cargoSha256 = "1f4c982i2r2y63h0a79nlwdwrp81ps93zan7a6ag5w7c4223ab5g";
   buildInputs = [ openssl pkg-config protobuf rdkafka ]
                 ++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv ];
 
@@ -28,8 +29,7 @@ rustPlatform.buildRustPackage rec {
   PROTOC_INCLUDE="${protobuf}/include";
 
   cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
-  # skip tests, too -- they don't respect the rdkafka flag...
-  doCheck = false;
+  checkPhase = "TZDIR=${tzdata}/share/zoneinfo cargo test --no-default-features --features ${lib.concatStringsSep "," features},disable-resolv-conf -- --test-threads 1";
 
   meta = with stdenv.lib; {
     description = "A high-performance logs, metrics, and events router";

From 471944b924882e1cd771814a9724f82967bca96a Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <meurerbernardo@gmail.com>
Date: Tue, 25 Feb 2020 17:39:35 -0800
Subject: [PATCH 1625/4636] tlp: 1.2.2 -> 1.3.1

---
 pkgs/tools/misc/tlp/default.nix               | 159 +++++++++++-------
 .../misc/tlp/patches/fix-makefile-sed.patch   |  46 +++++
 .../misc/tlp/patches/tlp-sleep-service.patch  |  95 +++++++++++
 3 files changed, 243 insertions(+), 57 deletions(-)
 create mode 100644 pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch
 create mode 100644 pkgs/tools/misc/tlp/patches/tlp-sleep-service.patch

diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix
index e5932d9e9462..c79d72f9ec04 100644
--- a/pkgs/tools/misc/tlp/default.nix
+++ b/pkgs/tools/misc/tlp/default.nix
@@ -1,79 +1,124 @@
-{ stdenv, lib, fetchFromGitHub, perl, makeWrapper, file, systemd, iw, rfkill
-, hdparm, ethtool, inetutils , kmod, pciutils, smartmontools
-, x86_energy_perf_policy, gawk, gnugrep, coreutils, utillinux
-, checkbashisms, shellcheck
-, enableRDW ? false, networkmanager
-}:
-
-let
-  paths = lib.makeBinPath
-          ([ iw rfkill hdparm ethtool inetutils systemd kmod pciutils smartmontools
-             x86_energy_perf_policy gawk gnugrep coreutils utillinux
-           ]
-           ++ lib.optional enableRDW networkmanager
-          );
-
-in stdenv.mkDerivation rec {
+{ stdenv
+, lib
+, checkbashisms
+, coreutils
+, ethtool
+, fetchFromGitHub
+, gawk
+, gnugrep
+, gnused
+, hdparm
+, iw
+, kmod
+, makeWrapper
+, pciutils
+, perl
+, shellcheck
+, smartmontools
+, systemd
+, utillinux
+, x86_energy_perf_policy
+  # RDW only works with NetworkManager, and thus is optional with default off
+, enableRDW ? false
+, networkmanager
+}: stdenv.mkDerivation rec {
   pname = "tlp";
-  version = "1.2.2";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "linrunner";
     repo = "TLP";
     rev = version;
-    sha256 = "0vm31ca6kdak9xzwskz7a8hvdp67drfh2zcdwlz3260r8r2ypgg1";
+    sha256 = "14fcnaz9pw534v4d8dddqq4wcvpf1kghr8zlrk62r5lrl46sp1p5";
   };
 
-  outRef = placeholder "out";
-
-  makeFlags = [
-    "DESTDIR=${outRef}"
-    "TLP_SBIN=${outRef}/bin"
-    "TLP_BIN=${outRef}/bin"
-    "TLP_TLIB=${outRef}/share/tlp"
-    "TLP_FLIB=${outRef}/share/tlp/func.d"
-    "TLP_ULIB=${outRef}/lib/udev"
-    "TLP_NMDSP=${outRef}/etc/NetworkManager/dispatcher.d"
-    "TLP_SHCPL=${outRef}/share/bash-completion/completions"
-    "TLP_MAN=${outRef}/share/man"
-    "TLP_META=${outRef}/share/metainfo"
-
-    "TLP_NO_INIT=1"
-  ];
-
-  nativeBuildInputs = [ makeWrapper file ];
+  # XXX: See patch files for relevant explanations.
+  patches = [ ./patches/fix-makefile-sed.patch ./patches/tlp-sleep-service.patch ];
 
   buildInputs = [ perl ];
+  nativeBuildInputs = [ makeWrapper gnused ];
 
-  installTargets = [ "install-tlp" "install-man" ] ++ stdenv.lib.optional enableRDW "install-rdw";
+  # XXX: While [1] states that DESTDIR should not be used, and that the correct
+  # variable to set is, in fact, PREFIX, tlp thinks otherwise. The Makefile for
+  # tlp concerns itself only with DESTDIR [2] (possibly incorrectly) and so we set
+  # that as opposed to PREFIX, despite what [1] says.
+  #
+  # [1]: https://github.com/NixOS/nixpkgs/issues/65718
+  # [2]: https://github.com/linrunner/TLP/blob/ab788abf4936dfb44fbb408afc34af834230a64d/Makefile#L4-L46
+  makeFlags = [
+    "DESTDIR=${placeholder "out"}"
 
-  checkInputs = [
-    checkbashisms
-    shellcheck
+    "TLP_NO_INIT=1"
+    "TLP_WITH_ELOGIND=0"
+    "TLP_WITH_SYSTEMD=1"
+
+    "TLP_BIN=/bin"
+    "TLP_CONFDEF=/share/tlp/defaults.conf"
+    "TLP_FLIB=/share/tlp/func.d"
+    "TLP_MAN=/share/man"
+    "TLP_META=/share/metainfo"
+    "TLP_SBIN=/sbin"
+    "TLP_SHCPL=/share/bash-completion/completions"
+    "TLP_TLIB=/share/tlp"
   ];
 
-  doCheck = true;
+  installTargets = [ "install-tlp" "install-man" ]
+  ++ lib.optionals enableRDW [ "install-rdw" "install-man-rdw" ];
+
+  # XXX: This is disabled because it's basically just noise since upstream
+  # itself does not seem to care about the zillion shellcheck errors.
+  doCheck = false;
+  checkInputs = [ checkbashisms shellcheck ];
   checkTarget = [ "checkall" ];
 
-  postInstall = ''
-    cp -r $out/$out/* $out
-    rm -rf $out/$(echo "$NIX_STORE" | cut -d "/" -f2)
+  postInstall = let
+    paths = lib.makeBinPath (
+      [
+        coreutils
+        ethtool
+        gawk
+        gnugrep
+        gnused
+        hdparm
+        iw
+        kmod
+        pciutils
+        perl
+        smartmontools
+        systemd
+        utillinux
+        x86_energy_perf_policy
+      ] ++ lib.optional enableRDW networkmanager
+    );
+  in
+    ''
+      fixup_perl=(
+        $out/share/tlp/tlp-pcilist
+        $out/share/tlp/tlp-readconfs
+        $out/share/tlp/tlp-usblist
+        $out/share/tlp/tpacpi-bat
+      )
+      for f in "''${fixup_perl[@]}"; do
+        wrapProgram "$f" --prefix PATH : "${paths}"
+      done
 
-    for i in $out/bin/* $out/lib/udev/tlp-* ${lib.optionalString enableRDW "$out/etc/NetworkManager/dispatcher.d/*"}; do
-      if file "$i" | grep -q Perl; then
-        # Perl script; use wrapProgram
-        wrapProgram "$i" \
-          --prefix PATH : "${paths}"
-      else
-        # Bash script
-        sed -i '2iexport PATH=${paths}:$PATH' "$i"
-      fi
-    done
-  '';
+      fixup_bash=(
+        $out/bin/*
+        $out/etc/NetworkManager/dispatcher.d/*
+        $out/lib/udev/tlp-*
+        $out/sbin/*
+        $out/share/tlp/func.d/*
+        $out/share/tlp/tlp-func-base
+      )
+      for f in "''${fixup_bash[@]}"; do
+        sed -i '2iexport PATH=${paths}:$PATH' "$f"
+      done
+    '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Advanced Power Management for Linux";
-    homepage = https://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html;
+    homepage =
+      "https://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html";
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
     license = licenses.gpl2Plus;
diff --git a/pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch b/pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch
new file mode 100644
index 000000000000..942c9a579f6f
--- /dev/null
+++ b/pkgs/tools/misc/tlp/patches/fix-makefile-sed.patch
@@ -0,0 +1,46 @@
+commit c44347b3b813e209fff537b4d46d23430727a5e2
+Author: Bernardo Meurer <meurerbernardo@gmail.com>
+Date:   Tue Feb 25 21:27:39 2020 -0800
+
+    makefile: correctly sed paths
+    
+    The default Makefile for tlp makes a mess with catenating `DESTDIR` to
+    everything, but then not actualy using the catenated (_ prefixed)
+    variables to sed it's `.in` files.
+    
+    This patch makes sure that it correctly sets the paths, taking `DESTDIR`
+    in account where it makes sense (e.g. /bin where we want $out/bin) but
+    not where it doesn't (/etc/tlp.conf should be just that).
+    
+    The reason DESTDIR is used at all, as opposed to the more appropriate
+    PREFIX, is covered in the nix formula, and is (also) due to the Makefile
+    being a bit "different."
+
+diff --git a/Makefile b/Makefile
+index b5af74e..95122df 100644
+--- a/Makefile
++++ b/Makefile
+@@ -47,17 +47,17 @@ _TPACPIBAT = $(DESTDIR)$(TPACPIBAT)
+ 
+ SED = sed \
+ 	-e "s|@TLPVER@|$(TLPVER)|g" \
+-	-e "s|@TLP_SBIN@|$(TLP_SBIN)|g" \
+-	-e "s|@TLP_TLIB@|$(TLP_TLIB)|g" \
+-	-e "s|@TLP_FLIB@|$(TLP_FLIB)|g" \
+-	-e "s|@TLP_ULIB@|$(TLP_ULIB)|g" \
++	-e "s|@TLP_SBIN@|$(_SBIN)|g" \
++	-e "s|@TLP_TLIB@|$(_TLIB)|g" \
++	-e "s|@TLP_FLIB@|$(_FLIB)|g" \
++	-e "s|@TLP_ULIB@|$(_ULIB)|g" \
+ 	-e "s|@TLP_CONFUSR@|$(TLP_CONFUSR)|g" \
+ 	-e "s|@TLP_CONFDIR@|$(TLP_CONFDIR)|g" \
+-	-e "s|@TLP_CONFDEF@|$(TLP_CONFDEF)|g" \
++	-e "s|@TLP_CONFDEF@|$(_CONFDEF)|g" \
+ 	-e "s|@TLP_CONF@|$(TLP_CONF)|g" \
+ 	-e "s|@TLP_RUN@|$(TLP_RUN)|g"   \
+ 	-e "s|@TLP_VAR@|$(TLP_VAR)|g"   \
+-	-e "s|@TPACPIBAT@|$(TPACPIBAT)|g"
++	-e "s|@TPACPIBAT@|$(_TPACPIBAT)|g"
+ 
+ INFILES = \
+ 	tlp \
diff --git a/pkgs/tools/misc/tlp/patches/tlp-sleep-service.patch b/pkgs/tools/misc/tlp/patches/tlp-sleep-service.patch
new file mode 100644
index 000000000000..b37c7280e382
--- /dev/null
+++ b/pkgs/tools/misc/tlp/patches/tlp-sleep-service.patch
@@ -0,0 +1,95 @@
+commit ca94cd56210067e2a55c1f413bd7713f7d338f9f
+Author: Bernardo Meurer <meurerbernardo@gmail.com>
+Date:   Wed Feb 26 10:46:23 2020 -0800
+
+    tlp-sleep.service: reintroduce
+    
+    This patch reintroduces tlp-sleep as a systemd unit as opposed to a
+    systemd system-sleep hook script. This is due to the recommendation by
+    systemd itself to not use the hook scripts. As per the manual:
+    
+    > Note that scripts or binaries dropped in /usr/lib/systemd/system-sleep/
+    > are intended for local use only and should be considered hacks. If
+    > applications want to react to system suspend/hibernation and resume,
+    > they should rather use the Inhibitor interface[1].
+
+diff --git a/Makefile b/Makefile
+index 95122df..0e9230a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -70,6 +70,7 @@ INFILES = \
+ 	tlp.rules \
+ 	tlp-readconfs \
+ 	tlp-run-on \
++	tlp-sleep.service \
+ 	tlp.service \
+ 	tlp-stat \
+ 	tlp.upstart \
+@@ -99,7 +100,6 @@ SHFILES = \
+ 	tlp-rdw-udev.in \
+ 	tlp-rf.in \
+ 	tlp-run-on.in \
+-	tlp-sleep \
+ 	tlp-sleep.elogind \
+ 	tlp-stat.in \
+ 	tlp-usb-udev.in
+@@ -147,7 +147,7 @@ ifneq ($(TLP_NO_INIT),1)
+ endif
+ ifneq ($(TLP_WITH_SYSTEMD),0)
+ 	install -D -m 644 tlp.service $(_SYSD)/tlp.service
+-	install -D -m 755 tlp-sleep $(_SDSL)/tlp
++	install -D -m 644 tlp-sleep.service $(_SYSD)/tlp-sleep.service
+ endif
+ ifneq ($(TLP_WITH_ELOGIND),0)
+ 	install -D -m 755 tlp-sleep.elogind $(_ELOD)/49-tlp-sleep
+@@ -204,7 +204,7 @@ uninstall-tlp:
+ 	rm $(_ULIB)/rules.d/85-tlp.rules
+ 	rm -f $(_SYSV)/tlp
+ 	rm -f $(_SYSD)/tlp.service
+-	rm -f $(_SDSL)/tlp-sleep
++	rm -f $(_SYSD)/tlp-sleep.service
+ 	rm -f $(_ELOD)/49-tlp-sleep
+ 	rm -f $(_SHCPL)/tlp-stat
+ 	rm -f $(_SHCPL)/bluetooth
+diff --git a/tlp-sleep b/tlp-sleep
+deleted file mode 100644
+index 3de85ce..0000000
+--- a/tlp-sleep
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#!/bin/sh
+-
+-# tlp - systemd suspend/resume hook
+-#
+-# Copyright (c) 2020 Thomas Koch <linrunner at gmx.net> and others.
+-# This software is licensed under the GPL v2 or later.
+-
+-case $1 in
+-    pre)  tlp suspend ;;
+-    post) tlp resume  ;;
+-esac
+diff --git a/tlp-sleep.service.in b/tlp-sleep.service.in
+new file mode 100644
+index 0000000..4ac17bd
+--- /dev/null
++++ b/tlp-sleep.service.in
+@@ -0,0 +1,19 @@
++# tlp - systemd suspend/resume service
++#
++# Copyright (c) 2020 Thomas Koch <linrunner at gmx.net> and others.
++# This software is licensed under the GPL v2 or later.
++
++[Unit]
++Description=TLP suspend/resume
++Before=sleep.target
++StopWhenUnneeded=yes
++Documentation=https://linrunner.de/tlp
++
++[Service]
++Type=oneshot
++RemainAfterExit=yes
++ExecStart=@TLP_SBIN@/tlp suspend
++ExecStop=@TLP_SBIN@/tlp resume
++
++[Install]
++WantedBy=sleep.target

From 07cc033524aeb2ea9b00009a33189a69b921d8ca Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <meurerbernardo@gmail.com>
Date: Tue, 25 Feb 2020 20:03:16 -0800
Subject: [PATCH 1626/4636] tlp: add lovesegfault as a maintainer

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

diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix
index c79d72f9ec04..5a467dd626da 100644
--- a/pkgs/tools/misc/tlp/default.nix
+++ b/pkgs/tools/misc/tlp/default.nix
@@ -120,7 +120,7 @@
     homepage =
       "https://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
+    maintainers = with maintainers; [ abbradar lovesegfault ];
     license = licenses.gpl2Plus;
   };
 }

From d1b61a9da1d29103e42ae507452d33c12ce960f7 Mon Sep 17 00:00:00 2001
From: Marc 'risson' Schmitt <marc.schmitt@risson.space>
Date: Thu, 27 Feb 2020 07:26:46 +0100
Subject: [PATCH 1627/4636] maintainers: add risson

---
 maintainers/maintainer-list.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 436ccb4ef01f..87da8503255c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6087,6 +6087,20 @@
     githubId = 807447;
     name = "Robert Scott";
   };
+  risson = {
+    name = "Marc Schmitt";
+    email = "marc.schmitt@risson.space";
+    github = "rissson";
+    githubId = 18313093;
+    keys = [
+      { longkeyid = "rsa4096/0xF6FD87B15C263EC9";
+        fingerprint = "8A0E 6A7C 08AB B9DE 67DE  2A13 F6FD 87B1 5C26 3EC9";
+      }
+      { longkeyid = "ed25519/0xBBB7A6801DF1E03F";
+        fingerprint = "C0A7 A9BB 115B C857 4D75  EA99 BBB7 A680 1DF1 E03F";
+      }
+    ];
+  };
   rittelle = {
     email = "rittelle@posteo.de";
     github = "rittelle";

From 3d0626f9508ae670f9ae1c99b04b975f1e5ef23c Mon Sep 17 00:00:00 2001
From: Marc 'risson' Schmitt <marc.schmitt@risson.space>
Date: Thu, 27 Feb 2020 07:27:04 +0100
Subject: [PATCH 1628/4636] yubioath-desktop: 4.3.6 -> 5.0.2

---
 .../misc/yubioath-desktop/default.nix         | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix
index d7a019c1c416..eb39a702f93f 100644
--- a/pkgs/applications/misc/yubioath-desktop/default.nix
+++ b/pkgs/applications/misc/yubioath-desktop/default.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchurl, mkDerivation
-, qmake, qtbase, qtquickcontrols
+, qmake, qtbase, qtquickcontrols2, qtgraphicaleffects
 , python3, pyotherside
 , pcsclite, yubikey-personalization
 , yubikey-manager, makeWrapper }:
 
 mkDerivation rec {
   pname = "yubioath-desktop";
-  version = "4.3.6";
+  version = "5.0.2";
 
   src = fetchurl {
     url = "https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz";
-    sha256 = "0s04anjbb5zm98kfdpp9hr68k3mx3gqlp8fa1miy7nq87pr4f7a5";
+    sha256 = "19ingk0ab88a22s04apcw8kx9xygxlbk8kp4xnb8pmf8z3k6l2gf";
   };
 
   doCheck = false;
 
-  buildInputs = [ stdenv qtbase qtquickcontrols python3 ];
+  buildInputs = [ stdenv qtbase qtquickcontrols2 qtgraphicaleffects python3 ];
 
   nativeBuildInputs = [ qmake makeWrapper python3.pkgs.wrapPython ];
 
@@ -48,11 +48,18 @@ mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Yubikey Desktop Authenticator";
+    description = "Yubico Authenticator";
+    longDescription = ''
+      Application for generating Open Authentication (OATH) time-based TOTP and
+      event-based HOTP one-time password codes, with the help of a YubiKey that
+      protects the shared secrets.
+    '';
 
-    homepage = https://www.yubico.com/support/knowledge-base/categories/articles/yubico-authenticator-download/;
+    homepage = "https://developers.yubico.com/yubioath-desktop";
+    downloadPage = "https://developers.yubico.com/yubioath-desktop/Releases/";
+    changelog = "https://developers.yubico.com/yubioath-desktop/Release_Notes.html";
 
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = with maintainers; [ mic92 ];
+    license = stdenv.lib.licenses.bsd2;
+    maintainers = with maintainers; [ mic92 risson ];
   };
 }

From 8706ed24e579c19bcf8281b60d1ac2f638b73bf1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 20 Feb 2020 06:13:47 +0100
Subject: [PATCH 1629/4636] ocamlPackages.dum: cleaning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Propagate the `easy-format` dependency.

Fix build with OCaml ≥ 4.09.
---
 pkgs/development/ocaml-modules/dum/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/ocaml-modules/dum/default.nix b/pkgs/development/ocaml-modules/dum/default.nix
index 37c00f6b31e9..5e5199c26905 100644
--- a/pkgs/development/ocaml-modules/dum/default.nix
+++ b/pkgs/development/ocaml-modules/dum/default.nix
@@ -1,25 +1,24 @@
-{ lib, fetchFromGitHub, buildOcaml, ocaml
+{ stdenv, fetchFromGitHub, ocaml, findlib
 , easy-format
 }:
 
-buildOcaml rec {
-  name = "dum";
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-dum-${version}";
   version = "1.0.1";
 
-  minimumOCamlVersion = "4.06";
-
   src = fetchFromGitHub {
     owner = "mjambon";
-    repo = name;
+    repo = "dum";
     rev = "v${version}";
     sha256 = "0yrxl97szjc0s2ghngs346x3y0xszx2chidgzxk93frjjpsr1mlr";
   };
 
-  buildInputs = [ easy-format ];
+  buildInputs = [ ocaml findlib ];
+  propagatedBuildInputs = [ easy-format ];
 
-  doCheck = true;
+  createFindlibDestdir = true;
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     homepage = https://github.com/mjambon/dum;
     description = "Inspect the runtime representation of arbitrary OCaml values";
     license = licenses.lgpl21Plus;

From 2922049a6c547f8bd38bd5b85c31e6b44d0d43dd Mon Sep 17 00:00:00 2001
From: Xavier Zwirtz <me@xavierzwirtz.com>
Date: Thu, 27 Feb 2020 01:15:02 -0600
Subject: [PATCH 1630/4636] hg-evolve: init at 9.2.2 (#81158)

* maintainers: add xavierzwirtz

* hg-evolve: init at 9.2.2
---
 maintainers/maintainer-list.nix               |  6 +++++
 .../python-modules/hg-evolve/default.nix      | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 3 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/python-modules/hg-evolve/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 436ccb4ef01f..6141eb465115 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8131,6 +8131,12 @@
     email = "ngerstle@gmail.com";
     github = "ngerstle";
   };
+  xavierzwirtz = {
+    email = "me@xavierzwirtz.com";
+    github = "xavierzwirtz";
+    githubId = 474343;
+    name = "Xavier Zwirtz";
+  };
 }
 
   
diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix
new file mode 100644
index 000000000000..b2857eb24579
--- /dev/null
+++ b/pkgs/development/python-modules/hg-evolve/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  pname = "hg-evolve";
+  version = "9.2.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "08bjrgxv8zrrz5xxydzkjl4a8cw3g62nmzfnvdzxxcrf1c96qw76";
+  };
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Enables the “changeset evolution” feature of Mercurial core";
+    homepage = "https://www.mercurial-scm.org/doc/evolution/";
+    maintainers = with maintainers; [ xavierzwirtz ];
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 409fff8994c8..99d321ada39a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3441,6 +3441,8 @@ in {
 
   hg-git = callPackage ../development/python-modules/hg-git { };
 
+  hg-evolve = callPackage ../development/python-modules/hg-evolve { };
+
   dtopt = callPackage ../development/python-modules/dtopt { };
 
   easywatch = callPackage ../development/python-modules/easywatch { };

From 915a3aa43737b180944766d8291d44e6cc96d3a8 Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Wed, 26 Feb 2020 23:56:34 -0800
Subject: [PATCH 1631/4636] cocoapods: 1.8.4 -> 1.9.0

---
 .../development/mobile/cocoapods/Gemfile.lock | 31 +++++---
 pkgs/development/mobile/cocoapods/gemset.nix  | 76 ++++++++++++++-----
 2 files changed, 74 insertions(+), 33 deletions(-)

diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock
index 958f36192f99..93478fa1fdac 100644
--- a/pkgs/development/mobile/cocoapods/Gemfile.lock
+++ b/pkgs/development/mobile/cocoapods/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.1)
+    CFPropertyList (3.0.2)
     activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -12,10 +12,10 @@ GEM
       json (>= 1.5.1)
     atomos (0.1.3)
     claide (1.0.3)
-    cocoapods (1.8.4)
+    cocoapods (1.9.0)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.8.4)
+      cocoapods-core (= 1.9.0)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -30,15 +30,17 @@ GEM
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.11.1, < 2.0)
-    cocoapods-core (1.8.4)
+      xcodeproj (>= 1.14.0, < 2.0)
+    cocoapods-core (1.9.0)
       activesupport (>= 4.0.2, < 6)
       algoliasearch (~> 1.0)
       concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
+      netrc (~> 0.11)
+      typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.4)
-    cocoapods-downloader (1.2.2)
+    cocoapods-downloader (1.3.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
@@ -48,25 +50,30 @@ GEM
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     escape (0.0.4)
+    ethon (0.12.0)
+      ffi (>= 1.3.0)
+    ffi (1.12.2)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    json (2.2.0)
-    minitest (5.12.2)
+    json (2.3.0)
+    minitest (5.14.0)
     molinillo (0.6.6)
     nanaimo (0.2.6)
     nap (1.1.0)
     netrc (0.11.0)
     ruby-macho (1.4.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    typhoeus (1.3.1)
+      ethon (>= 0.9.0)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
-    xcodeproj (1.13.0)
+    xcodeproj (1.15.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -80,4 +87,4 @@ DEPENDENCIES
   cocoapods!
 
 BUNDLED WITH
-   1.17.2
+   1.17.3
diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix
index 2f268a60c94c..26c198300207 100644
--- a/pkgs/development/mobile/cocoapods/gemset.nix
+++ b/pkgs/development/mobile/cocoapods/gemset.nix
@@ -34,10 +34,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fr8sdzs2q1969zqh790w223hjidlwx4hfm4c91gj0va5j5pv3n8";
+      sha256 = "1825ll26p28swjiw8n3x2pnh5ygsmg83spf82fnzcjn2p87vc5lf";
       type = "gem";
     };
-    version = "3.0.1";
+    version = "3.0.2";
   };
   claide = {
     groups = ["default"];
@@ -55,21 +55,21 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "007ssx75588ji2d8l8s6c95dng1c7b6yacng8nngpy7maijzjgzc";
+      sha256 = "1qywwpwdzspybi0772yscyiffq6bgqvzcppi2gjl6w4chxbmnphx";
       type = "gem";
     };
-    version = "1.8.4";
+    version = "1.9.0";
   };
   cocoapods-core = {
-    dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap"];
+    dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0zcisqb404828n5d3lbk9y2yyx8v2yr6rk1l8y9a4i1hp743fiad";
+      sha256 = "0wpjkps6q7lmd3cxhrcl9v3p5bk7y7bcjgnjw4ylbwirsl60bq95";
       type = "gem";
     };
-    version = "1.8.4";
+    version = "1.9.0";
   };
   cocoapods-deintegrate = {
     groups = ["default"];
@@ -86,10 +86,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09fd4zaqkz8vz3djplacngcs4n0j6j956wgq43s1y6bwl0zyjmd3";
+      sha256 = "08vn0pgcyn6w6fq5xjd7szv2h9s5rzl17kyidnd7fl5qdmzc9c54";
       type = "gem";
     };
-    version = "1.2.2";
+    version = "1.3.0";
   };
   cocoapods-plugins = {
     dependencies = ["nap"];
@@ -150,10 +150,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
+      sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl";
       type = "gem";
     };
-    version = "1.1.5";
+    version = "1.1.6";
   };
   escape = {
     source = {
@@ -163,6 +163,27 @@
     };
     version = "0.0.4";
   };
+  ethon = {
+    dependencies = ["ffi"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9";
+      type = "gem";
+    };
+    version = "0.12.0";
+  };
+  ffi = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4";
+      type = "gem";
+    };
+    version = "1.12.2";
+  };
   fourflusher = {
     groups = ["default"];
     platforms = [];
@@ -213,20 +234,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
+      sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.3.0";
   };
   minitest = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0zjm24aiz42i9n37mcw8lydd7n0y7wfk27by06jx77ypcld3qvkw";
+      sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz";
       type = "gem";
     };
-    version = "5.12.2";
+    version = "5.14.0";
   };
   molinillo = {
     source = {
@@ -278,14 +299,27 @@
     };
     version = "0.3.6";
   };
-  tzinfo = {
-    dependencies = ["thread_safe"];
+  typhoeus = {
+    dependencies = ["ethon"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
+      sha256 = "0cni8b1idcp0dk8kybmxydadhfpaj3lbs99w5kjibv8bsmip2zi5";
       type = "gem";
     };
-    version = "1.2.5";
+    version = "1.3.1";
+  };
+  tzinfo = {
+    dependencies = ["thread_safe"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp";
+      type = "gem";
+    };
+    version = "1.2.6";
   };
   xcodeproj = {
     dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
@@ -293,9 +327,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1c69yrhqd92q6nnpyhvnqyw9l7axnc91gnbd2gai8f5njdisd8wx";
+      sha256 = "1ldb1jckfzkk9c74nv500z0q936nn25fn5mywzwrh7sjwgkaxp5z";
       type = "gem";
     };
-    version = "1.13.0";
+    version = "1.15.0";
   };
 }
\ No newline at end of file

From c0af0c4763f4fa050051f2226a5d20cd9d8d290b Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Wed, 26 Feb 2020 23:56:46 -0800
Subject: [PATCH 1632/4636] cocoapods-beta: 1.9.0.beta.3 -> 1.9.0

---
 pkgs/development/mobile/cocoapods/Gemfile-beta.lock |  8 ++++----
 pkgs/development/mobile/cocoapods/gemset-beta.nix   | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
index 5ebc8b231f2b..4b632458c6a6 100644
--- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
+++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
@@ -12,10 +12,10 @@ GEM
       json (>= 1.5.1)
     atomos (0.1.3)
     claide (1.0.3)
-    cocoapods (1.9.0.beta.3)
+    cocoapods (1.9.0)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.9.0.beta.3)
+      cocoapods-core (= 1.9.0)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -31,7 +31,7 @@ GEM
       nap (~> 1.0)
       ruby-macho (~> 1.4)
       xcodeproj (>= 1.14.0, < 2.0)
-    cocoapods-core (1.9.0.beta.3)
+    cocoapods-core (1.9.0)
       activesupport (>= 4.0.2, < 6)
       algoliasearch (~> 1.0)
       concurrent-ruby (~> 1.1)
@@ -50,7 +50,7 @@ GEM
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     escape (0.0.4)
     ethon (0.12.0)
       ffi (>= 1.3.0)
diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix
index a57601068625..fb70f8aa6c9d 100644
--- a/pkgs/development/mobile/cocoapods/gemset-beta.nix
+++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix
@@ -57,10 +57,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0dd2a4m7axnqk2rj8piwprqrg91dp8gmyj2rala4viawfq0mj5mf";
+      sha256 = "1qywwpwdzspybi0772yscyiffq6bgqvzcppi2gjl6w4chxbmnphx";
       type = "gem";
     };
-    version = "1.9.0.beta.3";
+    version = "1.9.0";
   };
   cocoapods-core = {
     dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"];
@@ -68,10 +68,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0pf54634zi03vbi2m7n1g6kj0k2azgk2pahh9p2mqx814wka99nr";
+      sha256 = "0wpjkps6q7lmd3cxhrcl9v3p5bk7y7bcjgnjw4ylbwirsl60bq95";
       type = "gem";
     };
-    version = "1.9.0.beta.3";
+    version = "1.9.0";
   };
   cocoapods-deintegrate = {
     groups = ["default"];
@@ -160,10 +160,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
+      sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl";
       type = "gem";
     };
-    version = "1.1.5";
+    version = "1.1.6";
   };
   escape = {
     groups = ["default"];

From 250a5c996e295079042a083e773ecd8f3f69cb6a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 23 Feb 2020 10:50:05 +0000
Subject: [PATCH 1633/4636] ed: 1.15 -> 1.16

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

diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index 90a7eeffb047..37d055e26852 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/pkgs/applications/editors/ed/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation (rec {
   name = "ed-${version}";
-  version = "1.15";
+  version = "1.16";
 
   src = fetchurl {
     url = "mirror://gnu/ed/${name}.tar.lz";
-    sha256 = "0x6ivy5k0d7dy5z9g8q8nipr89m4qbk2ink2898qq43smp08ji5d";
+    sha256 = "0b4b1lwizvng9bvpcjnmpj2i80xz9xw2w8nfff27b2h4mca7mh6g";
   };
 
   nativeBuildInputs = [ lzip ];
@@ -30,7 +30,7 @@ stdenv.mkDerivation (rec {
 
     license = stdenv.lib.licenses.gpl3Plus;
 
-    homepage = https://www.gnu.org/software/ed/;
+    homepage = "https://www.gnu.org/software/ed/";
 
     maintainers = [ ];
     platforms = stdenv.lib.platforms.unix;

From 947c2d0cd566d15045f194662c315aad6c0c4fd6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 12 Feb 2020 16:51:51 +0000
Subject: [PATCH 1634/4636] libcap_ng: 0.7.9 -> 0.7.10

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

diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/os-specific/linux/libcap-ng/default.nix
index d0fc97d0dd35..476c5931d4d0 100644
--- a/pkgs/os-specific/linux/libcap-ng/default.nix
+++ b/pkgs/os-specific/linux/libcap-ng/default.nix
@@ -6,11 +6,11 @@ stdenv.mkDerivation rec {
   pname = "libcap-ng";
   # When updating make sure to test that the version with
   # all of the python bindings still works
-  version = "0.7.9";
+  version = "0.7.10";
 
   src = fetchurl {
     url = "${meta.homepage}/${pname}-${version}.tar.gz";
-    sha256 = "0a0k484kwv0zilry2mbl9k56cnpdhsjxdxin17jas6kkyfy345aa";
+    sha256 = "1gzzy12agfa9ddipdf72h9y68zqqnvsjjylv4vnq6hj4w2safk58";
   };
 
   nativeBuildInputs = [ swig ];

From df3849e5c7225ea9d11e454b2553ca87bffb7b60 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Sat, 22 Feb 2020 16:52:42 +0000
Subject: [PATCH 1635/4636] =?UTF-8?q?libinput:=201.15.1=20=E2=86=92=201.15?=
 =?UTF-8?q?.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 4c3fb6704843..2c84379aa8e5 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -27,11 +27,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "libinput";
-  version = "1.15.1";
+  version = "1.15.2";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz";
-    sha256 = "05hcjlsrc38yn1g1n7kia9m93nc703hx66gf977kw5vgbi4mfbvb";
+    sha256 = "0ivpb4sghl80cs7jg3xrs53kckif6wy81cny3a8mry94nszky74p";
   };
 
   outputs = [ "bin" "out" "dev" ];

From 2f060f6a676395d7e1f517122a629f12b793b5b4 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Tue, 25 Feb 2020 14:55:48 -0800
Subject: [PATCH 1636/4636] go_1_14: init at 1.14 and switch to it

---
 pkgs/development/compilers/go/1.14.nix        | 245 ++++++++++++++++++
 .../compilers/go/remove-test-pie-1.14.patch   |  34 +++
 .../skip-test-extra-files-on-386-1.14.patch   |  15 ++
 ...kip-test-extra-files-on-aarch32-1.14.patch |  15 ++
 pkgs/top-level/all-packages.nix               |  20 +-
 5 files changed, 325 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/compilers/go/1.14.nix
 create mode 100644 pkgs/development/compilers/go/remove-test-pie-1.14.patch
 create mode 100644 pkgs/development/compilers/go/skip-test-extra-files-on-386-1.14.patch
 create mode 100644 pkgs/development/compilers/go/skip-test-extra-files-on-aarch32-1.14.patch

diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix
new file mode 100644
index 000000000000..3651b9361166
--- /dev/null
+++ b/pkgs/development/compilers/go/1.14.nix
@@ -0,0 +1,245 @@
+{ stdenv, fetchurl, tzdata, iana-etc, runCommand
+, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation
+, mailcap, runtimeShell
+, buildPackages, pkgsTargetTarget
+}:
+
+let
+
+  inherit (stdenv.lib) optionals optionalString;
+
+  goBootstrap = runCommand "go-bootstrap" {} ''
+    mkdir $out
+    cp -rf ${buildPackages.go_bootstrap}/* $out/
+    chmod -R u+w $out
+    find $out -name "*.c" -delete
+    cp -rf $out/bin/* $out/share/go/bin/
+  '';
+
+  goarch = platform: {
+    "i686" = "386";
+    "x86_64" = "amd64";
+    "aarch64" = "arm64";
+    "arm" = "arm";
+    "armv5tel" = "arm";
+    "armv6l" = "arm";
+    "armv7l" = "arm";
+  }.${platform.parsed.cpu.name} or (throw "Unsupported system");
+
+in
+
+stdenv.mkDerivation rec {
+  pname = "go";
+  version = "1.14";
+
+  src = fetchurl {
+    url = "https://dl.google.com/go/go${version}.src.tar.gz";
+    sha256 = "12a3nzj4k4p5ica447sjfva9pvvj84a03b4xlg3mhl2nmm33wr3d";
+  };
+
+  # perl is used for testing go vet
+  nativeBuildInputs = [ perl which pkgconfig patch procps ];
+  buildInputs = [ cacert pcre ]
+    ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
+    ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
+
+
+  propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ];
+
+  hardeningDisable = [ "all" ];
+
+  prePatch = ''
+    patchShebangs ./ # replace /bin/bash
+
+    # This source produces shell script at run time,
+    # and thus it is not corrected by patchShebangs.
+    substituteInPlace misc/cgo/testcarchive/carchive_test.go \
+      --replace '#!/usr/bin/env bash' '#!${runtimeShell}'
+
+    # Patch the mimetype database location which is missing on NixOS.
+    # but also allow static binaries built with NixOS to run outside nix
+    sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go
+
+    # Disabling the 'os/http/net' tests (they want files not available in
+    # chroot builds)
+    rm src/net/{listen,parse}_test.go
+    rm src/syscall/exec_linux_test.go
+
+    # !!! substituteInPlace does not seems to be effective.
+    # The os test wants to read files in an existing path. Just don't let it be /usr/bin.
+    sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go
+    sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go
+    # Disable the unix socket test
+    sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go
+    # Disable the hostname test
+    sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go
+    # ParseInLocation fails the test
+    sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go
+    # Remove the api check as it never worked
+    sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
+    # Remove the coverage test as we have removed this utility
+    sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go
+    # Remove the timezone naming test
+    sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go
+    # Remove disable setgid test
+    sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go
+    # Remove cert tests that conflict with NixOS's cert resolution
+    sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go
+    # TestWritevError hangs sometimes
+    sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go
+    # TestVariousDeadlines fails sometimes
+    sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go
+
+    sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
+    sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
+
+    # Disable cgo lookup tests not works, they depend on resolver
+    rm src/net/cgo_unix_test.go
+
+  '' + optionalString stdenv.isLinux ''
+    # prepend the nix path to the zoneinfo files but also leave the original value for static binaries
+    # that run outside a nix server
+    sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go
+
+  '' + optionalString stdenv.isAarch32 ''
+    echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash
+  '' + optionalString stdenv.isDarwin ''
+    substituteInPlace src/race.bash --replace \
+      "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true
+    sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go
+    sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go
+    sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go
+
+    sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go
+    sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go
+    sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go
+    sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go
+
+    sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go
+    sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go
+
+    sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go
+
+    sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go
+
+    # TestCurrent fails because Current is not implemented on Darwin
+    sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go
+    sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go
+
+    touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
+  '';
+
+  patches = [
+    ./remove-tools-1.11.patch
+    ./ssl-cert-file-1.13.patch
+    ./remove-test-pie-1.14.patch
+    ./creds-test.patch
+    ./go-1.9-skip-flaky-19608.patch
+    ./go-1.9-skip-flaky-20072.patch
+    ./skip-external-network-tests.patch
+    ./skip-nohup-tests.patch
+  ] ++ [
+    # breaks under load: https://github.com/golang/go/issues/25628
+    (if stdenv.isAarch32
+    then ./skip-test-extra-files-on-aarch32-1.14.patch
+    else ./skip-test-extra-files-on-386-1.14.patch)
+  ];
+
+  postPatch = ''
+    find . -name '*.orig' -exec rm {} ';'
+  '';
+
+  GOOS = stdenv.targetPlatform.parsed.kernel.name;
+  GOARCH = goarch stdenv.targetPlatform;
+  # GOHOSTOS/GOHOSTARCH must match the building system, not the host system.
+  # Go will nevertheless build a for host system that we will copy over in
+  # the install phase.
+  GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name;
+  GOHOSTARCH = goarch stdenv.buildPlatform;
+
+  # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
+  # to be different from CC/CXX
+  CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then
+      "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc"
+    else
+      null;
+  CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then
+      "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++"
+    else
+      null;
+
+  GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
+  GO386 = 387; # from Arch: don't assume sse2 on i686
+  CGO_ENABLED = 1;
+  # Hopefully avoids test timeouts on Hydra
+  GO_TEST_TIMEOUT_SCALE = 3;
+
+  # Indicate that we are running on build infrastructure
+  # Some tests assume things like home directories and users exists
+  GO_BUILDER_NAME = "nix";
+
+  GOROOT_BOOTSTRAP="${goBootstrap}/share/go";
+
+  postConfigure = ''
+    export GOCACHE=$TMPDIR/go-cache
+    # this is compiled into the binary
+    export GOROOT_FINAL=$out/share/go
+
+    export PATH=$(pwd)/bin:$PATH
+
+    # Independent from host/target, CC should produce code for the building system.
+    export CC=${buildPackages.stdenv.cc}/bin/cc
+    ulimit -a
+  '';
+
+  postBuild = ''
+    (cd src && ./make.bash)
+  '';
+
+  doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin;
+
+  checkPhase = ''
+    runHook preCheck
+    (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild)
+    runHook postCheck
+  '';
+
+  preInstall = ''
+    rm -r pkg/obj
+    # Contains the wrong perl shebang when cross compiling,
+    # since it is not used for anything we can deleted as well.
+    rm src/regexp/syntax/make_perl_groups.pl
+  '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then ''
+    mv bin/*_*/* bin
+    rmdir bin/*_*
+    ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
+      rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH}
+    ''}
+  '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then ''
+    rm -rf bin/*_*
+    ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) ''
+      rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH}
+    ''}
+  '' else "");
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $GOROOT_FINAL
+    cp -a bin pkg src lib misc api doc $GOROOT_FINAL
+    ln -s $GOROOT_FINAL/bin $out/bin
+    runHook postInstall
+  '';
+
+  setupHook = ./setup-hook.sh;
+
+  disallowedReferences = [ goBootstrap ];
+
+  meta = with stdenv.lib; {
+    branch = "1.14";
+    homepage = http://golang.org/;
+    description = "The Go Programming language";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs kalbasit Frostman ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/development/compilers/go/remove-test-pie-1.14.patch b/pkgs/development/compilers/go/remove-test-pie-1.14.patch
new file mode 100644
index 000000000000..218fcd46d892
--- /dev/null
+++ b/pkgs/development/compilers/go/remove-test-pie-1.14.patch
@@ -0,0 +1,34 @@
+diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
+index 56bdfcac19..d7d67ab94d 100644
+--- a/src/cmd/dist/test.go
++++ b/src/cmd/dist/test.go
+@@ -580,29 +580,6 @@ func (t *tester) registerTests() {
+ 		})
+ 	}
+ 
+-	// Test internal linking of PIE binaries where it is supported.
+-	if goos == "linux" && (goarch == "amd64" || goarch == "arm64") {
+-		t.tests = append(t.tests, distTest{
+-			name:    "pie_internal",
+-			heading: "internal linking of -buildmode=pie",
+-			fn: func(dt *distTest) error {
+-				t.addCmd(dt, "src", t.goTest(), "reflect", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60))
+-				return nil
+-			},
+-		})
+-		// Also test a cgo package.
+-		if t.cgoEnabled && t.internalLink() {
+-			t.tests = append(t.tests, distTest{
+-				name:    "pie_internal_cgo",
+-				heading: "internal linking of -buildmode=pie",
+-				fn: func(dt *distTest) error {
+-					t.addCmd(dt, "src", t.goTest(), "os/user", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60))
+-					return nil
+-				},
+-			})
+-		}
+-	}
+-
+ 	// sync tests
+ 	if goos != "js" { // js doesn't support -cpu=10
+ 		t.tests = append(t.tests, distTest{
diff --git a/pkgs/development/compilers/go/skip-test-extra-files-on-386-1.14.patch b/pkgs/development/compilers/go/skip-test-extra-files-on-386-1.14.patch
new file mode 100644
index 000000000000..ab681826499a
--- /dev/null
+++ b/pkgs/development/compilers/go/skip-test-extra-files-on-386-1.14.patch
@@ -0,0 +1,15 @@
+diff --git a/src/os/exec/exec_test.go b/src/os/exec/exec_test.go
+index dce66c5c2e..2532224376 100644
+--- a/src/os/exec/exec_test.go
++++ b/src/os/exec/exec_test.go
+@@ -627,6 +627,10 @@ func TestExtraFiles(t *testing.T) {
+ 		t.Skipf("skipping test on %q", runtime.GOOS)
+ 	}
+ 
++	if runtime.GOOS == "linux" && runtime.GOARCH  == "386" {
++		t.Skipf("skipping test on %q %q", runtime.GOARCH, runtime.GOOS)
++	}
++
+ 	// Force network usage, to verify the epoll (or whatever) fd
+ 	// doesn't leak to the child,
+ 	ln, err := net.Listen("tcp", "127.0.0.1:0")
diff --git a/pkgs/development/compilers/go/skip-test-extra-files-on-aarch32-1.14.patch b/pkgs/development/compilers/go/skip-test-extra-files-on-aarch32-1.14.patch
new file mode 100644
index 000000000000..5251882fce83
--- /dev/null
+++ b/pkgs/development/compilers/go/skip-test-extra-files-on-aarch32-1.14.patch
@@ -0,0 +1,15 @@
+diff --git a/src/os/exec/exec_test.go b/src/os/exec/exec_test.go
+index dce66c5c2e..2532224376 100644
+--- a/src/os/exec/exec_test.go
++++ b/src/os/exec/exec_test.go
+@@ -627,6 +627,10 @@ func TestExtraFiles(t *testing.T) {
+ 		t.Skipf("skipping test on %q", runtime.GOOS)
+ 	}
+ 
++	if runtime.GOOS == "linux" && runtime.GOARCH  == "arm" {
++		t.Skipf("skipping test on %q %q", runtime.GOARCH, runtime.GOOS)
++	}
++
+ 	// Force network usage, to verify the epoll (or whatever) fd
+ 	// doesn't leak to the child,
+ 	ln, err := net.Listen("tcp", "127.0.0.1:0")
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d681fd0fe039..6cb84dda2b1e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8385,7 +8385,14 @@ in
     buildPackages = buildPackages // { stdenv = gcc8Stdenv; };
   });
 
-  go = go_1_13;
+  go_1_14 = callPackage ../development/compilers/go/1.14.nix ({
+    inherit (darwin.apple_sdk.frameworks) Security Foundation;
+  } // lib.optionalAttrs stdenv.isAarch64 {
+    stdenv = gcc8Stdenv;
+    buildPackages = buildPackages // { stdenv = gcc8Stdenv; };
+  });
+
+  go = go_1_14;
 
   go-repo-root = callPackage ../development/tools/go-repo-root { };
 
@@ -15012,18 +15019,23 @@ in
   buildGo113Package = callPackage ../development/go-packages/generic {
     go = buildPackages.go_1_13;
   };
+  buildGo114Package = callPackage ../development/go-packages/generic {
+    go = buildPackages.go_1_14;
+  };
 
-  buildGoPackage = buildGo113Package;
+  buildGoPackage = buildGo114Package;
 
   buildGo112Module = callPackage ../development/go-modules/generic {
     go = buildPackages.go_1_12;
   };
-
   buildGo113Module = callPackage ../development/go-modules/generic {
     go = buildPackages.go_1_13;
   };
+  buildGo114Module = callPackage ../development/go-modules/generic {
+    go = buildPackages.go_1_14;
+  };
 
-  buildGoModule = buildGo113Module;
+  buildGoModule = buildGo114Module;
 
   go2nix = callPackage ../development/tools/go2nix { };
 

From 1b7c71d5870030074f0aeec508195f194e072674 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Tue, 25 Feb 2020 16:12:56 -0800
Subject: [PATCH 1637/4636] grafana: switch to latest go

---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cb84dda2b1e..6335de18e200 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15344,9 +15344,7 @@ in
 
   gofish = callPackage ../servers/gopher/gofish { };
 
-  grafana = callPackage ../servers/monitoring/grafana {
-    buildGoPackage = buildGo113Package;
-  };
+  grafana = callPackage ../servers/monitoring/grafana { };
 
   grafana-loki = callPackage ../servers/monitoring/loki { };
 

From 014c95bc18ce9790569659f8a22a6381f8135605 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 27 Feb 2020 04:20:00 -0500
Subject: [PATCH 1638/4636] talloc: fix build on darwin

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

diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix
index 6acbb66e15ce..4c0b16c140b6 100644
--- a/pkgs/development/libraries/talloc/default.nix
+++ b/pkgs/development/libraries/talloc/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    ${stdenv.cc.targetPrefix}ar q $out/lib/libtalloc.a bin/default/talloc_[0-9]*.o
+    ${stdenv.cc.targetPrefix}ar q $out/lib/libtalloc.a bin/default/talloc.c.[0-9]*.o
   '';
 
   meta = with stdenv.lib; {

From c1d1a5da766a71cbc327c747faad4f4fcd083ca4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Feb 2020 00:31:30 +0000
Subject: [PATCH 1639/4636] sysstat: 12.2.0 -> 12.3.1

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

diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix
index b3d4576ac3ab..a27f65852023 100644
--- a/pkgs/os-specific/linux/sysstat/default.nix
+++ b/pkgs/os-specific/linux/sysstat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext, bzip2 }:
 
 stdenv.mkDerivation rec {
-  name = "sysstat-12.2.0";
+  name = "sysstat-12.3.1";
 
   src = fetchurl {
     url = "http://pagesperso-orange.fr/sebastien.godard/${name}.tar.xz";
-    sha256 = "0xc3983ccr0dwab1px2jhbgj86pfmmr29k7ggnwjwm1qigmriak1";
+    sha256 = "1hf1sy7akribmgavadqccxpy49yv0zfb3m81d2bj6jf8pyzwcrbq";
   };
 
   buildInputs = [ gettext ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   patches = [ ./install.patch ];
 
   meta = {
-    homepage = http://sebastien.godard.pagesperso-orange.fr/;
+    homepage = "http://sebastien.godard.pagesperso-orange.fr/";
     description = "A collection of performance monitoring tools for Linux (such as sar, iostat and pidstat)";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;

From 357f8bd0e7db723e2ef0321e7b4e5d7d401fab06 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 23 Feb 2020 22:54:01 +0000
Subject: [PATCH 1640/4636] libqmi: 1.24.2 -> 1.24.4

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

diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix
index 76c86d6f515a..c40e45afaf0b 100644
--- a/pkgs/development/libraries/libqmi/default.nix
+++ b/pkgs/development/libraries/libqmi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libqmi";
-  version = "1.24.2";
+  version = "1.24.4";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";
-    sha256 = "10mjfmiznaxvfk0f9wr18kyxz3mpdrvnh0qw9g8c1nv0z5vf9r2a";
+    sha256 = "12licfsszr6qxpg9b2b04qm2glk8d42fcy32zr8jzwrgr7gbl5h3";
   };
 
   outputs = [ "out" "dev" "devdoc" ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    homepage = https://www.freedesktop.org/wiki/Software/libqmi/;
+    homepage = "https://www.freedesktop.org/wiki/Software/libqmi/";
     description = "Modem protocol helper library";
     platforms = platforms.linux;
     license = licenses.gpl2;

From 5d33637dd940f2053724359c207c052647ce7112 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 20 Feb 2020 03:44:25 +0000
Subject: [PATCH 1641/4636] krb5: 1.17 -> 1.18

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

diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 124c961b96ac..42965c0ad07c 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -14,12 +14,12 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "${type}krb5-${version}";
-  majorVersion = "1.17";
+  majorVersion = "1.18";
   version = majorVersion;
 
   src = fetchurl {
     url = "https://kerberos.org/dist/krb5/${majorVersion}/krb5-${version}.tar.gz";
-    sha256 = "1xc1ly09697b7g2vngvx76szjqy9769kpgn27lnp1r9xln224vjs";
+    sha256 = "121c5xsy3x0i4wdkrpw62yhvji6virbh6n30ypazkp0isws3k4bk";
   };
 
   outputs = [ "out" "dev" ];

From 44864b292f041d96696155daa78eda8bd03d796f Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sat, 15 Feb 2020 20:51:49 +0100
Subject: [PATCH 1642/4636] openssh: 8.1p1 -> 8.2p1

https://www.openssh.com/txt/release-8.2

add libfido2 to enable hardware tokens support added in this release
---
 pkgs/tools/networking/openssh/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 90ecba0891d6..2603200e0f3d 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -4,6 +4,8 @@
 , withKerberos ? true
 , withGssapiPatches ? false
 , kerberos
+, libfido2
+, withFIDO ? stdenv.hostPlatform.isUnix
 , linkOpenssl? true
 }:
 
@@ -12,15 +14,15 @@ let
   # **please** update this patch when you update to a new openssh release.
   gssapiPatch = fetchpatch {
     name = "openssh-gssapi.patch";
-    url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%258.1p1-2/debian/patches/gssapi.patch";
-    sha256 = "0zfxx46a5lpjp317z354yyswa2wvmb1pp5p0nxsbhsrzw94jvxsj";
+    url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%258.2p1-1/debian/patches/gssapi.patch";
+    sha256 = "081gryqkfr5zr4f5m4v0piq1sxz06sb38z5lqxccgpivql7pa8d8";
   };
 
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "openssh";
-  version = if hpnSupport then "7.8p1" else "8.1p1";
+  version = if hpnSupport then "7.8p1" else "8.2p1";
 
   src = if hpnSupport then
       fetchurl {
@@ -30,7 +32,7 @@ stdenv.mkDerivation rec {
     else
       fetchurl {
         url = "mirror://openbsd/OpenSSH/portable/${pname}-${version}.tar.gz";
-        sha256 = "1zwk3g57gb13br206k6jdhgnp6y1nibwswzraqspbl1m73pxpx82";
+        sha256 = "0wg6ckzvvklbzznijxkk28fb8dnwyjd0w30ra0afwv6gwr8m34j3";
       };
 
   patches =
@@ -61,6 +63,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ] ++ optional (hpnSupport || withGssapiPatches) autoreconfHook;
   buildInputs = [ zlib openssl libedit pam ]
+    ++ optional withFIDO libfido2
     ++ optional withKerberos kerberos;
 
   preConfigure = ''
@@ -80,6 +83,7 @@ stdenv.mkDerivation rec {
     "--disable-strip"
     (if pam != null then "--with-pam" else "--without-pam")
   ] ++ optional (etcDir != null) "--sysconfdir=${etcDir}"
+    ++ optional withFIDO "--with-security-key-builtin=yes"
     ++ optional withKerberos (assert kerberos != null; "--with-kerberos5=${kerberos}")
     ++ optional stdenv.isDarwin "--disable-libutil"
     ++ optional (!linkOpenssl) "--without-openssl";

From 205f42b1422feda79cf8205e87ff0cd786bc042e Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sun, 16 Feb 2020 19:27:56 +0100
Subject: [PATCH 1643/4636] openssh_hpn: 7.8p1 -> 8.1p1

fix build failure
---
 pkgs/tools/networking/openssh/default.nix | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 2603200e0f3d..dd0151c89dac 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -22,12 +22,12 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "openssh";
-  version = if hpnSupport then "7.8p1" else "8.2p1";
+  version = if hpnSupport then "8.1p1" else "8.2p1";
 
   src = if hpnSupport then
       fetchurl {
-        url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-7_8_P1.tar.gz";
-        sha256 = "05q5hxx7fzcgd8a5i0zk4fwvmnz4xqk04j489irnwm7cka7xdqxw";
+        url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-8_1_P1.tar.gz";
+        sha256 = "1xiv28df9c15h44fv1i93fq8rvkyapjj9vj985ndnw3xk1nvqjyd";
       }
     else
       fetchurl {
@@ -43,15 +43,7 @@ stdenv.mkDerivation rec {
       ./dont_create_privsep_path.patch
 
       ./ssh-keysign.patch
-    ] ++ optional hpnSupport
-      # CVE-2018-20685, can probably be dropped with next version bump
-      # See https://sintonen.fi/advisories/scp-client-multiple-vulnerabilities.txt
-      # for details
-      (fetchpatch {
-        name = "CVE-2018-20685.patch";
-        url = https://github.com/openssh/openssh-portable/commit/6010c0303a422a9c5fa8860c061bf7105eb7f8b2.patch;
-        sha256 = "0q27i9ymr97yb628y44qi4m11hk5qikb1ji1vhvax8hp18lwskds";
-      })
+    ]
     ++ optional withGssapiPatches (assert withKerberos; gssapiPatch);
 
   postPatch =
@@ -112,6 +104,5 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.bsd2;
     platforms = platforms.unix ++ platforms.windows;
     maintainers = with maintainers; [ eelco aneeshusa ];
-    broken = hpnSupport;
   };
 }

From 07fc3ce302cec8d75196de4b58de45e9e741ad2e Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@iohk.io>
Date: Thu, 27 Feb 2020 10:30:46 +0100
Subject: [PATCH 1644/4636] vaultenv: 0.8.0 -> 0.13.0

---
 pkgs/development/tools/haskell/vaultenv/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix
index 1eb8bf75cdfb..6c339bf31b56 100644
--- a/pkgs/development/tools/haskell/vaultenv/default.nix
+++ b/pkgs/development/tools/haskell/vaultenv/default.nix
@@ -2,15 +2,15 @@
 , directory, hpack, hspec, hspec-discover, hspec-expectations
 , http-client, http-conduit, lens, lens-aeson, megaparsec, mtl
 , optparse-applicative, parser-combinators, retry, stdenv, text
-, unix, unordered-containers, utf8-string, fetchzip
+, unix, unordered-containers, utf8-string, fetchzip, dotenv
 }:
 mkDerivation rec {
   pname = "vaultenv";
-  version = "0.8.0";
+  version = "0.13.0";
 
   src = fetchzip {
     url = "https://github.com/channable/vaultenv/archive/v${version}.tar.gz";
-    sha256 = "04hrwyy7gsybdwljrks4ym3pshqk1i43f8wpirjx7b0dfjgsd2l5";
+    sha256 = "0kz5p57fq855mhbqrpb737sqrax9cdcyh2g57460hc8fyvs97lq0";
   };
 
   buildTools = [ hpack ];
@@ -21,6 +21,7 @@ mkDerivation rec {
     async base bytestring connection containers http-client
     http-conduit lens lens-aeson megaparsec mtl optparse-applicative
     parser-combinators retry text unix unordered-containers utf8-string
+    dotenv
   ];
   testHaskellDepends = [
     async base bytestring connection containers directory hspec
@@ -32,7 +33,5 @@ mkDerivation rec {
   homepage = "https://github.com/channable/vaultenv#readme";
   description = "Runs processes with secrets from HashiCorp Vault";
   license = stdenv.lib.licenses.bsd3;
-  maintainers = with stdenv.lib.maintainers; [ lnl7 ];
-  hydraPlatforms = [];
-  broken = true;  # does not compile any longer
+  maintainers = with stdenv.lib.maintainers; [ lnl7 manveru ];
 }

From fcdf22329aec76561413fa8122dac48e12e47af8 Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Thu, 27 Feb 2020 10:59:41 +0100
Subject: [PATCH 1645/4636] kops_1_16: init at 1.16.0

---
 pkgs/applications/networking/cluster/kops/default.nix | 5 +++++
 pkgs/top-level/all-packages.nix                       | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index 595cfae2e697..76afaa47cee7 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -70,4 +70,9 @@ in rec {
     version = "1.15.2";
     sha256 = "1sjfd7pfi81ccq1dkgkh9xx6y94bqzlp727pvyf7l01x3d14z2b3";
   };
+
+  kops_1_16 = mkKops {
+    version = "1.16.0";
+    sha256 = "1b2lzf6b29rs5imbpqp8gnp3b511lk7jrm2f62y32gmx0gyjws6a";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d681fd0fe039..7197839b238d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25043,8 +25043,9 @@ in
     kops_1_13
     kops_1_14
     kops_1_15
+    kops_1_16
     ;
-  kops = kops_1_15;
+  kops = kops_1_16;
 
   lguf-brightness = callPackage ../misc/lguf-brightness { };
 

From 57f2ea5ca13ee68bdf9f2e9965ee251301b7b8e8 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 27 Feb 2020 11:34:00 +0100
Subject: [PATCH 1646/4636] clipman: 1.3.0 -> 1.4.0

https://github.com/yory8/clipman/releases/tag/v1.4.0
---
 pkgs/tools/misc/clipman/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/clipman/default.nix b/pkgs/tools/misc/clipman/default.nix
index 560dbecd4bf6..3153c843025a 100644
--- a/pkgs/tools/misc/clipman/default.nix
+++ b/pkgs/tools/misc/clipman/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "clipman";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "yory8";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0b27rgyjwvdm9qjq824imda3yjbxxcwwyv8rzzk95ggvyayxw8an";
+    sha256 = "0d5w94cylrzhwyb4zfgidh6rr1h82dx5y7cxfa37wx5xxcjyyja1";
   };
 
-  modSha256 = "0aw0ng8pk8qzn1iv79iw0v9zr8xdc8p9xnigr3ij86038f7aqdhv";
+  modSha256 = "1sim3x794kj3wdw0g432zbgh1cimdmmg1hjgynh9jgm3y8w9q7ij";
 
   nativeBuildInputs = [ makeWrapper ];
 

From 757ea3948552317e70fc59f26ecb534ae4d1a791 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 27 Feb 2020 10:47:56 +0000
Subject: [PATCH 1647/4636] remmina: 1.3.10 -> 1.4.1

---
 pkgs/applications/networking/remote/remmina/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix
index de221fce3896..3e41649d8cc0 100644
--- a/pkgs/applications/networking/remote/remmina/default.nix
+++ b/pkgs/applications/networking/remote/remmina/default.nix
@@ -13,13 +13,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "remmina";
-  version = "1.3.10";
+  version = "1.4.1";
 
   src = fetchFromGitLab {
     owner  = "Remmina";
     repo   = "Remmina";
     rev    = "v${version}";
-    sha256 = "0gc7b88129avl9sbax3ncvm7zf2qvq35ixvvpr2zj74g3qnphl08";
+    sha256 = "084yw0fd3qmzzd6xinhf4plv5bg8gfj4jnfac7zi1nif8zilf456";
   };
 
   nativeBuildInputs = [ cmake ninja pkgconfig wrapGAppsHook ];
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     license = licenses.gpl2;
-    homepage = https://gitlab.com/Remmina/Remmina;
+    homepage = "https://gitlab.com/Remmina/Remmina";
     description = "Remote desktop client written in GTK";
     maintainers = with maintainers; [ melsigl ryantm ];
     platforms = platforms.linux;

From cc81ca7ee22171998d0f3b09162a956f3b0affeb Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Thu, 27 Feb 2020 07:57:13 -0500
Subject: [PATCH 1648/4636] zabbix: 3.0.29 -> 3.0.30

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

diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix
index aa27b6b18ead..89dc8c6059c7 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@@ -10,7 +10,7 @@ generic: {
   };
 
   v30 = generic {
-    version = "3.0.29";
-    sha256 = "1d81w68hnkjdj1a00iasg6aidw25syi4lrbsiyc98pdihmxbpiky";
+    version = "3.0.30";
+    sha256 = "0g2qw4ff02gsnmqza1cv9dq6bqyg7w9cdli6hsln07irf0hyrb07";
   };
 }

From 5d073b2fc7dd44e719e12a008e06cc8fca003566 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Thu, 27 Feb 2020 07:58:18 -0500
Subject: [PATCH 1649/4636] zabbix: 4.0.17 -> 4.0.18

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

diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix
index 89dc8c6059c7..b3498ef9763e 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@@ -5,8 +5,8 @@ generic: {
   };
 
   v40 = generic {
-    version = "4.0.17";
-    sha256 = "0h699awyw3rhjkm1b84ld0sh7bbpvy4bplmcik36q1303sfrkw21";
+    version = "4.0.18";
+    sha256 = "105f0mifgm56dd1y8vychq8m2f2wx9a7gv380xv0hrs1q038i1ki";
   };
 
   v30 = generic {

From 9059f31e6f6c95dd1799ce9cacf07960c7124151 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Thu, 27 Feb 2020 08:00:27 -0500
Subject: [PATCH 1650/4636] zabbix: 4.4.5 -> 4.4.6

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

diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix
index b3498ef9763e..2e7afe5266ea 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@@ -1,7 +1,7 @@
 generic: {
   v44 = generic {
-    version = "4.4.5";
-    sha256 = "1snhpqj5p16giplbxa6xfrsairnf0m1qdh378yrifbh6bf19ga4l";
+    version = "4.4.6";
+    sha256 = "03mf4sklnw1x0ixp41vnibkz0794yi9jhws7ixld8jj2czk2ifr2";
   };
 
   v40 = generic {

From 3edc73c2dd7f2f7008403cacbda86aba530533f5 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Thu, 27 Feb 2020 14:10:09 +0100
Subject: [PATCH 1651/4636] perlPackages.TextLorem: init at 0.3

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 57f24021739f..712e91295321 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -19261,6 +19261,20 @@ let
     buildInputs = [ FileFindRule TestPod TestPodCoverage ];
   };
 
+  TextLorem = buildPerlModule {
+    pname = "Text-Lorem";
+    version = "0.3";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/A/AD/ADEOLA/Text-Lorem-0.3.tar.gz";
+      sha256 = "64bb636fb21213101a646b414ecbdc1b55edf905cbcdc7f5d24774ec5061fe2d";
+    };
+    meta = {
+      description = "Generate random Latin looking text";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.sgo ];
+    };
+  };
+
   TestManifest = buildPerlPackage {
     pname = "Test-Manifest";
     version = "2.021";

From 1204e44cad3ecb4779c8d3d2d057f9674fa5aedc Mon Sep 17 00:00:00 2001
From: GRBurst <GRBurst@protonmail.com>
Date: Thu, 27 Feb 2020 13:21:35 +0100
Subject: [PATCH 1652/4636]  dart: 2.0.0 -> 2.7.1 (stable) + 2.0.0 ->
 2.8.0-dev.10.0 (dev)

- dart stable: make it default
- add aarch64 (arm64) packages
- set myself as maintainer
---
 .../development/interpreters/dart/default.nix | 70 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  6 +-
 2 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix
index 02ac6bfbcde7..cff1885e2798 100644
--- a/pkgs/development/interpreters/dart/default.nix
+++ b/pkgs/development/interpreters/dart/default.nix
@@ -1,50 +1,59 @@
-{ stdenv, fetchurl, unzip, version ? "2.0.0" }:
+{ stdenv, fetchurl, unzip, version ? "2.7.1" }:
 
 let
 
   sources = let
 
     base = "https://storage.googleapis.com/dart-archive/channels";
-    stable = "${base}/stable/release";
-    dev = "${base}/dev/release";
+    stable_version = "stable";
+    dev_version = "dev";
+    x86_64 = "x64";
+    i686 = "ia32";
+    aarch64 = "arm64";
 
   in {
-    "1.16.1-x86_64-linux" = fetchurl {
-      url = "${stable}/${version}/sdk/dartsdk-linux-x64-release.zip";
-      sha256 = "01cbnc8hd2wwprmivppmzvld9ps644k16wpgqv31h1596l5p82n2";
-    };
-    "1.16.1-i686-linux" = fetchurl {
-      url = "${stable}/${version}/sdk/dartsdk-linux-ia32-release.zip";
-      sha256 = "0jfwzc3jbk4n5j9ka59s9bkb25l5g85fl1nf676mvj36swcfykx3";
-    };
     "1.24.3-x86_64-linux" = fetchurl {
-      url = "${stable}/${version}/sdk/dartsdk-linux-x64-release.zip";
-      sha256 = "e323c97c35e6bc5d955babfe2e235a5484a82bb1e4870fa24562c8b9b800559b";
+      url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
+      sha256 = "16sm02wbkj328ni0z1z4n4msi12lb8ijxzmbbfamvg766mycj8z3";
     };
     "1.24.3-i686-linux" = fetchurl {
-      url = "${stable}/${version}/sdk/dartsdk-linux-ia32-release.zip";
-      sha256 = "d67b8f8f9186e7d460320e6bce25ab343c014b6af4b2f61369ee83755d4da528";
+      url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${i686}-release.zip";
+      sha256 = "0a559mfpb0zfd49zdcpld95h2g1lmcjwwsqf69hd9rw6j67qyyyn";
     };
-    "2.0.0-x86_64-linux" = fetchurl {
-      url = "${stable}/${version}/sdk/dartsdk-linux-x64-release.zip";
-      sha256 = "4014a1e8755d2d32cc1573b731a4a53acdf6dfca3e26ee437f63fe768501d336";
+    "1.24.3-aarch64-linux" = fetchurl {
+      url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
+      sha256 = "1p5bn04gr91chcszgmw5ng8mlzgwsrdr2v7k7ppwr1slkx97fsrh";
     };
-    "2.0.0-i686-linux" = fetchurl {
-      url = "${stable}/${version}/sdk/dartsdk-linux-ia32-release.zip";
-      sha256 = "3164a9de70bf11ab5b20af0d51c8b3303f2dce584604dce33bea0040bdc0bbba";
+    "2.7.1-x86_64-linux" = fetchurl {
+      url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
+      sha256 = "1zjd9hxxg1dsyzkzgqjvl933kprf8h143z5qi4mj1iczxv7zp27a";
     };
-    "2.0.0-dev.26.0-x86_64-linux" = fetchurl {
-      url = "${dev}/${version}/sdk/dartsdk-linux-x64-release.zip";
-      sha256 = "18360489a7914d5df09b34934393e16c7627ba673c1e9ab5cfd11cd1d58fd7df";
+    "2.7.1-i686-linux" = fetchurl {
+      url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${i686}-release.zip";
+      sha256 = "0cggr1jbhzahmazlhba0vw2chz9zxd98jgk6zxvxdnw5hvkx8si1";
     };
-    "2.0.0-dev.26.0-i686-linux" = fetchurl {
-      url = "${dev}/${version}/sdk/dartsdk-linux-ia32-release.zip";
-      sha256 = "83ba8b64c76f48d8de4e0eb887e49b7960053f570d27e7ea438cc0bac789955e";
+    "2.7.1-aarch64-linux" = fetchurl {
+      url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
+      sha256 = "0m4qlc3zy87habr61npykvpclggn5k4hadl59v2b0ymvxa4h5zfh";
+    };
+    "2.8.0-dev.10.0-x86_64-linux" = fetchurl {
+      url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip";
+      sha256 = "17x0q94zampm99dd2sn6q1644lfwcl0ig2rdlmfzd9i4llj2ddbl";
+    };
+    "2.8.0-dev.10.0-i686-linux" = fetchurl {
+      url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${i686}-release.zip";
+      sha256 = "0hmkg4jrffzh8x2mxn8nbf7dl7k0v2vacbmxgpsl382vw9wwj96j";
+    };
+    "2.8.0-dev.10.0-aarch64-linux" = fetchurl {
+      url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip";
+      sha256 = "185ipcmr9h76g44kzlj5pyj99cljlap82rhd1c2larfklyj5ryvv";
     };
   };
 
 in
 
+with stdenv.lib;
+
 stdenv.mkDerivation {
 
   pname = "dart";
@@ -65,19 +74,20 @@ stdenv.mkDerivation {
              $out/bin/dart
   '';
 
-  libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ];
+  libPath = makeLibraryPath [ stdenv.cc.cc ];
 
   dontStrip = true;
 
   meta = {
-    platforms = [ "i686-linux" "x86_64-linux" ];
     homepage = https://www.dartlang.org/;
+    maintainers = with maintainers; [ grburst ];
     description = "Scalable programming language, with robust libraries and runtimes, for building web, server, and mobile apps";
     longDescription = ''
       Dart is a class-based, single inheritance, object-oriented language
       with C-style syntax. It offers compilation to JavaScript, interfaces,
       mixins, abstract classes, reified generics, and optional typing.
     '';
-    license = stdenv.lib.licenses.bsd3;
+    platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
+    license = licenses.bsd3;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5733168d5cd2..1941d6cc3106 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25783,9 +25783,9 @@ in
   spdlog = spdlog_1;
 
   dart = callPackage ../development/interpreters/dart { };
-  dart_stable = dart.override { version = "2.0.0"; };
-  dart_old = dart.override { version = "1.24.3"; };
-  dart_dev = dart.override { version = "2.0.0-dev.26.0"; };
+  dart_old = dart.override    { version = "1.24.3"; };
+  dart_stable = dart.override { version = "2.7.1"; };
+  dart_dev = dart.override    { version = "2.8.0-dev.10.0"; };
 
   httrack = callPackage ../tools/backup/httrack { };
 

From ef5847b76f15678ce696464165e9f7ae0cc221ef Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 27 Feb 2020 23:29:12 +1000
Subject: [PATCH 1653/4636] kompose: 1.20.0 -> 1.21.0

https://github.com/kubernetes/kompose/releases/tag/v1.21.0
---
 .../networking/cluster/kompose/default.nix             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix
index 6b19cb8c43c3..09a69f4b80e2 100644
--- a/pkgs/applications/networking/cluster/kompose/default.nix
+++ b/pkgs/applications/networking/cluster/kompose/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }:
+{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }:
 
 buildGoPackage rec {
   pname = "kompose";
-  version = "1.20.0";
+  version = "1.21.0";
 
   goPackagePath = "github.com/kubernetes/kompose";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "kubernetes";
     repo = "kompose";
-    sha256 = "1zgxm3zcxapav4jxh1r597rmxmlxcgns1l8w632ch7d90x5ihvll";
+    sha256 = "15a1alf6ywwfc4z5kdcnv64fp3cfy3qrcw62ny6xyn1kh1w24vkh";
   };
 
   nativeBuildInputs = [ installShellFiles ];
@@ -20,9 +20,9 @@ buildGoPackage rec {
     installShellCompletion kompose.{bash,zsh}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool to help users who are familiar with docker-compose move to Kubernetes";
-    homepage = https://github.com/kubernetes/kompose;
+    homepage = "https://kompose.io";
     license = licenses.asl20;
     maintainers = with maintainers; [ thpham vdemeester ];
     platforms = platforms.unix;

From af1341142bede35b179891ca577803d0cd1b1162 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 27 Feb 2020 13:43:09 +0000
Subject: [PATCH 1654/4636] src: 1.27 -> 1.28

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

diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix
index 8ff384d84b7f..58549fed73a3 100644
--- a/pkgs/applications/version-management/src/default.nix
+++ b/pkgs/applications/version-management/src/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "src";
-  version = "1.27";
+  version = "1.28";
 
   src = fetchurl {
     url = "http://www.catb.org/~esr/src/${pname}-${version}.tar.gz";
-    sha256 = "0764kcyh54plzmvfyhh086wpszh67nv1nsxgk95n9bxxinr7sn3x";
+    sha256 = "1fkr5z3mlj13djz9w1sb644wc7r1fywz52qq97byw1yyw0bqyi7f";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 98791845cbdeba1d8dd08a5b822d92e9a8cd6873 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Thu, 27 Feb 2020 23:54:45 +0900
Subject: [PATCH 1655/4636] nixosTests.nesting: fix subtest scoping

---
 nixos/tests/nesting.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/nesting.nix b/nixos/tests/nesting.nix
index 6388b67a6e40..a75806b24ff6 100644
--- a/nixos/tests/nesting.nix
+++ b/nixos/tests/nesting.nix
@@ -29,10 +29,10 @@ import ./make-test-python.nix {
         )
         clone.succeed("cowsay hey")
         clone.succeed("hello")
-    
-        children.wait_for_unit("default.target")
-        children.succeed("cowsay hey")
-        children.fail("hello")
+
+    children.wait_for_unit("default.target")
+    children.succeed("cowsay hey")
+    children.fail("hello")
 
     with subtest("Nested children do not inherit from parent"):
         children.succeed(

From b83164a0499475c72affebb21e7f513e7fbd0ccd Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Thu, 27 Feb 2020 23:55:21 +0900
Subject: [PATCH 1656/4636] nixos/activation: propagate system to nested
 configurations

The current behavior lets `system` default to
`builtins.currentSystem`. The system value specified to
`eval-config.nix` has very low precedence, so this should compose
properly.

Fixes #80806
---
 nixos/modules/system/activation/top-level.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index f67d29005616..346e0b64230f 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -15,6 +15,7 @@ let
     map (childConfig:
       (import ../../../lib/eval-config.nix {
         inherit baseModules;
+        system = config.nixpkgs.system;
         modules =
            (optionals inheritParent modules)
         ++ [ ./no-clone.nix ]

From ca58f58a0b2bb6df5415ded1b740cbfff4653d23 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Thu, 27 Feb 2020 16:16:57 +0100
Subject: [PATCH 1657/4636] sphinxsearch: add valodim as maintainer

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

diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix
index 6241380ea0c6..fb2ad9482413 100644
--- a/pkgs/servers/search/sphinxsearch/default.nix
+++ b/pkgs/servers/search/sphinxsearch/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation {
     homepage    = http://sphinxsearch.com;
     license     = stdenv.lib.licenses.gpl2;
     platforms   = stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ ederoyd46 ];
+    maintainers = with stdenv.lib.maintainers; [ ederoyd46 valodim ];
   };
 }

From f14b3aa8c01834ac3baf62f4d590c539b5151b06 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Fri, 21 Feb 2020 13:33:57 +0100
Subject: [PATCH 1658/4636] sphinxsearch: add support for mysql sources

---
 pkgs/servers/search/sphinxsearch/default.nix | 27 ++++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix
index fb2ad9482413..bcba015333f4 100644
--- a/pkgs/servers/search/sphinxsearch/default.nix
+++ b/pkgs/servers/search/sphinxsearch/default.nix
@@ -1,24 +1,29 @@
-{ stdenv, fetchurl, pkgconfig,
-  version ? "2.2.11",
-  mainSrc ? fetchurl {
-    url = "http://sphinxsearch.com/files/sphinx-${version}-release.tar.gz";
-    sha256 = "1aa1mh32y019j8s3sjzn4vwi0xn83dwgl685jnbgh51k16gh6qk6";
-  }
+{ stdenv, fetchurl, pkg-config, libmysqlclient,
+  enableMysql ? true
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "sphinxsearch";
-  inherit version;
-  src = mainSrc;
+  version = "2.2.11";
+
+  src = fetchurl {
+    url = "http://sphinxsearch.com/files/sphinx-${version}-release.tar.gz";
+    sha256 = "1aa1mh32y019j8s3sjzn4vwi0xn83dwgl685jnbgh51k16gh6qk6";
+  };
 
   configureFlags = [
     "--program-prefix=sphinxsearch-"
-    "--without-mysql"
     "--enable-id64"
+  ] ++ stdenv.lib.optionals (!enableMysql) [
+    "--without-mysql"
   ];
 
   nativeBuildInputs = [
-    pkgconfig
+    pkg-config
+  ];
+
+  buildInputs = stdenv.lib.optionals enableMysql [
+    libmysqlclient
   ];
 
   meta = {

From f70dbff52912153c4ff6b21108dfd40ee6c091fe Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Fri, 21 Feb 2020 13:34:38 +0100
Subject: [PATCH 1659/4636] sphinxsearch: add optional support for xmlpipe2

---
 pkgs/servers/search/sphinxsearch/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix
index bcba015333f4..cee94bc81d58 100644
--- a/pkgs/servers/search/sphinxsearch/default.nix
+++ b/pkgs/servers/search/sphinxsearch/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pkg-config, libmysqlclient,
+{ stdenv, fetchurl, pkg-config, expat, libmysqlclient,
+  enableXmlpipe2 ? false,
   enableMysql ? true
 }:
 
@@ -24,6 +25,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = stdenv.lib.optionals enableMysql [
     libmysqlclient
+  ] ++ stdenv.lib.optionals enableXmlpipe2 [
+    expat
   ];
 
   meta = {

From f06174d1356f68feb0530eba33da25d326bd0d96 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Fri, 21 Feb 2020 13:46:57 +0100
Subject: [PATCH 1660/4636] sphinxsearch: enable parallel builds

---
 pkgs/servers/search/sphinxsearch/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix
index cee94bc81d58..f32bcf1a6ba3 100644
--- a/pkgs/servers/search/sphinxsearch/default.nix
+++ b/pkgs/servers/search/sphinxsearch/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "1aa1mh32y019j8s3sjzn4vwi0xn83dwgl685jnbgh51k16gh6qk6";
   };
 
+  enableParallelBuilding = true;
+
   configureFlags = [
     "--program-prefix=sphinxsearch-"
     "--enable-id64"

From cb3b472b14645a85bb208da6faf5f64048058cf9 Mon Sep 17 00:00:00 2001
From: Jacek Galowicz <jacek.galowicz@cyberus-technology.de>
Date: Fri, 14 Feb 2020 08:32:28 +0100
Subject: [PATCH 1661/4636] nixosTests.rsyslogd: Port to python

---
 nixos/tests/rsyslogd.nix | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/nixos/tests/rsyslogd.nix b/nixos/tests/rsyslogd.nix
index f17e61814c5e..50523920c60b 100644
--- a/nixos/tests/rsyslogd.nix
+++ b/nixos/tests/rsyslogd.nix
@@ -3,40 +3,38 @@
   pkgs ? import ../.. { inherit system config; }
 }:
 
-with import ../lib/testing.nix { inherit system pkgs; };
+with import ../lib/testing-python.nix { inherit system pkgs; };
 with pkgs.lib;
 
 {
   test1 = makeTest {
     name = "rsyslogd-test1";
-    meta.maintainers = [ maintainers.aanderse ];
+    meta.maintainers = [ pkgs.stdenv.lib.maintainers.aanderse ];
 
-    machine =
-      { config, pkgs, ... }:
-      { services.rsyslogd.enable = true;
-        services.journald.forwardToSyslog = false;
-      };
+    machine = { config, pkgs, ... }: {
+      services.rsyslogd.enable = true;
+      services.journald.forwardToSyslog = false;
+    };
 
     # ensure rsyslogd isn't receiving messages from journald if explicitly disabled
     testScript = ''
-      $machine->waitForUnit("default.target");
-      $machine->fail("test -f /var/log/messages");
+      machine.wait_for_unit("default.target")
+      machine.fail("test -f /var/log/messages")
     '';
   };
 
   test2 = makeTest {
     name = "rsyslogd-test2";
-    meta.maintainers = [ maintainers.aanderse ];
+    meta.maintainers = [ pkgs.stdenv.lib.maintainers.aanderse ];
 
-    machine =
-      { config, pkgs, ... }:
-      { services.rsyslogd.enable = true;
-      };
+    machine = { config, pkgs, ... }: {
+      services.rsyslogd.enable = true;
+    };
 
     # ensure rsyslogd is receiving messages from journald
     testScript = ''
-      $machine->waitForUnit("default.target");
-      $machine->succeed("test -f /var/log/messages");
+      machine.wait_for_unit("default.target")
+      machine.succeed("test -f /var/log/messages")
     '';
   };
 }

From d3e3cc12259e4f8f5145ae8a0dc19bae5d11a11b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 27 Feb 2020 09:48:36 -0600
Subject: [PATCH 1662/4636] nixos/plasma5: Fix activation script when
 XDG_CONFIG_HOME is unset

Fixes #80713
---
 .../services/x11/desktop-managers/plasma5.nix | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index f3bf9268b293..60ef0159ff1a 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -52,6 +52,8 @@ let
   '';
 
   activationScript = ''
+    ${set_XDG_CONFIG_HOME}
+
     # The KDE icon cache is supposed to update itself automatically, but it uses
     # the timestamp on the icon theme directory as a trigger. This doesn't work
     # on NixOS because the timestamp never changes. As a workaround, delete the
@@ -62,7 +64,7 @@ let
     # xdg-desktop-settings generates this empty file but
     # it makes kbuildsyscoca5 fail silently. To fix this
     # remove that menu if it exists.
-    rm -fv ''${XDG_CONFIG_HOME:?}/menus/applications-merged/xdg-desktop-menu-dummy.menu
+    rm -fv ''${XDG_CONFIG_HOME}/menus/applications-merged/xdg-desktop-menu-dummy.menu
 
     # Qt writes a weird ‘libraryPath’ line to
     # ~/.config/Trolltech.conf that causes the KDE plugin
@@ -71,7 +73,7 @@ let
     # disastrous, so here we nuke references to the Nix store
     # in Trolltech.conf.  A better solution would be to stop
     # Qt from doing this wackiness in the first place.
-    trolltech_conf="''${XDG_CONFIG_HOME:?}/Trolltech.conf"
+    trolltech_conf="''${XDG_CONFIG_HOME}/Trolltech.conf"
     if [ -e "$trolltech_conf" ]; then
         ${sed} -i "$trolltech_conf" -e '/nix\\store\|nix\/store/ d'
     fi
@@ -84,10 +86,20 @@ let
     ${pkgs.libsForQt5.kservice}/bin/kbuildsycoca5
   '';
 
+  set_XDG_CONFIG_HOME = ''
+      # Set the default XDG_CONFIG_HOME if it is unset.
+      # Per the XDG Base Directory Specification:
+      # https://specifications.freedesktop.org/basedir-spec/latest
+      # 1. Never export this variable! If it is unset, then child processes are
+      # expected to set the default themselves.
+      # 2. Contaminate / if $HOME is unset; do not check if $HOME is set.
+      XDG_CONFIG_HOME=''${XDG_CONFIG_HOME:-$HOME/.config}
+  '';
+
   startplasma =
     ''
-      export XDG_CONFIG_HOME="''${XDG_CONFIG_HOME:-$HOME/.config}"
-      mkdir -p "''${XDG_CONFIG_HOME:?}"
+      ${set_XDG_CONFIG_HOME}
+      mkdir -p "''${XDG_CONFIG_HOME}"
 
     ''
     + optionalString pulseaudio.enable ''
@@ -100,10 +112,10 @@ let
       ${activationScript}
 
       # Create default configurations if Plasma has never been started.
-      kdeglobals="''${XDG_CONFIG_HOME:?}/kdeglobals"
+      kdeglobals="''${XDG_CONFIG_HOME}/kdeglobals"
       if ! [ -f "$kdeglobals" ]
       then
-          kcminputrc="''${XDG_CONFIG_HOME:?}/kcminputrc"
+          kcminputrc="''${XDG_CONFIG_HOME}/kcminputrc"
           if ! [ -f "$kcminputrc" ]
           then
               cat ${kcminputrc} >"$kcminputrc"
@@ -115,7 +127,7 @@ let
               cat ${gtkrc2} >"$gtkrc2"
           fi
 
-          gtk3_settings="''${XDG_CONFIG_HOME:?}/gtk-3.0/settings.ini"
+          gtk3_settings="''${XDG_CONFIG_HOME}/gtk-3.0/settings.ini"
           if ! [ -f "$gtk3_settings" ]
           then
               mkdir -p "$(dirname "$gtk3_settings")"

From 6c1480733323111754e9d33e270f3de2f6e56db7 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 27 Feb 2020 16:56:24 +0100
Subject: [PATCH 1663/4636] =?UTF-8?q?gimp:=202.10.16=20=E2=86=92=202.10.18?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://www.gimp.org/news/2020/02/24/gimp-2-10-18-released/
https://gitlab.gnome.org/GNOME/gimp/-/blob/GIMP_2_10_18/NEWS#L11-69
---
 pkgs/applications/graphics/gimp/default.nix               | 4 ++--
 pkgs/applications/graphics/gimp/remove-cc-reference.patch | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index e9223b1453e2..b5df3d768d29 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -50,13 +50,13 @@ let
   inherit (python2Packages) pygtk wrapPython python;
 in stdenv.mkDerivation rec {
   pname = "gimp";
-  version = "2.10.16";
+  version = "2.10.18";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "1sybf1yilw272lr8qbyx3zbvysf5rc89gk80gd4aj4xr6jazxyfb";
+    sha256 = "Zb/hEejuv/093jAWzLUH+ZSNJmPZSXy0ONm7YJ4R1xY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/graphics/gimp/remove-cc-reference.patch b/pkgs/applications/graphics/gimp/remove-cc-reference.patch
index e37351cfd463..20c350bdaea1 100644
--- a/pkgs/applications/graphics/gimp/remove-cc-reference.patch
+++ b/pkgs/applications/graphics/gimp/remove-cc-reference.patch
@@ -1,13 +1,11 @@
 diff --git a/app/gimp-version.c b/app/gimp-version.c
-index 0f7bfb9bf9..1679624b8e 100644
+index 3d1894a036..48bb670b64 100644
 --- a/app/gimp-version.c
 +++ b/app/gimp-version.c
-@@ -228,9 +228,9 @@
-                                       "# Libraries #\n%s",
-                                       GIMP_GIT_VERSION,
+@@ -230,7 +230,7 @@ gimp_version (gboolean be_verbose,
                                        GIMP_BUILD_ID,
                                        gimp_version_get_revision (),
-                                       GIMP_BUILD_PLATFORM,
+                                       GIMP_BUILD_PLATFORM_FAMILY,
 -                                      CC_VERSION,
 +                                      "@cc_version@",
                                        lib_versions);

From 0a4969949907061110228e1af0ecf9b30acbf8ed Mon Sep 17 00:00:00 2001
From: Jacek Galowicz <jacek@galowicz.de>
Date: Thu, 13 Feb 2020 12:38:26 +0100
Subject: [PATCH 1664/4636] nixosTests.docker-tools: Port to Python

---
 nixos/tests/docker-tools.nix | 182 ++++++++++++++++++++++-------------
 1 file changed, 115 insertions(+), 67 deletions(-)

diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index ca750e8ba3cd..54dd97e5b139 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -1,93 +1,141 @@
 # this test creates a simple GNU image with docker tools and sees if it executes
 
-import ./make-test.nix ({ pkgs, ... }: {
+import ./make-test-python.nix ({ pkgs, ... }: {
   name = "docker-tools";
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ lnl7 ];
   };
 
   nodes = {
-    docker =
-      { ... }: {
-        virtualisation = {
-          diskSize = 2048;
-          docker.enable = true;
-        };
+    docker = { ... }: {
+      virtualisation = {
+        diskSize = 2048;
+        docker.enable = true;
       };
+    };
   };
 
-  testScript =
-    ''
-      $docker->waitForUnit("sockets.target");
+  testScript = with pkgs.dockerTools; ''
+    unix_time_second1 = "1970-01-01T00:00:01Z"
 
-      # Ensure Docker images use a stable date by default
-      $docker->succeed("docker load --input='${pkgs.dockerTools.examples.bash}'");
-      $docker->succeed("[ '1970-01-01T00:00:01Z' = \"\$(docker inspect ${pkgs.dockerTools.examples.bash.imageName} | ${pkgs.jq}/bin/jq -r .[].Created)\" ]");
+    docker.wait_for_unit("sockets.target")
 
-      $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.bash.imageName} bash --version");
-      $docker->succeed("docker rmi ${pkgs.dockerTools.examples.bash.imageName}");
+    with subtest("Ensure Docker images use a stable date by default"):
+        docker.succeed(
+            "docker load --input='${examples.bash}'"
+        )
+        assert unix_time_second1 in docker.succeed(
+            "docker inspect ${examples.bash.imageName} "
+            + "| ${pkgs.jq}/bin/jq -r .[].Created",
+        )
 
-      # Check if the nix store is correctly initialized by listing dependencies of the installed Nix binary
-      $docker->succeed("docker load --input='${pkgs.dockerTools.examples.nix}'");
-      $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.nix.imageName} nix-store -qR ${pkgs.nix}");
-      $docker->succeed("docker rmi ${pkgs.dockerTools.examples.nix.imageName}");
+    docker.succeed("docker run --rm ${examples.bash.imageName} bash --version")
+    docker.succeed("docker rmi ${examples.bash.imageName}")
 
-      # To test the pullImage tool
-      $docker->succeed("docker load --input='${pkgs.dockerTools.examples.nixFromDockerHub}'");
-      $docker->succeed("docker run --rm nix:2.2.1 nix-store --version");
-      $docker->succeed("docker rmi nix:2.2.1");
+    with subtest(
+        "Check if the nix store is correctly initialized by listing "
+        "dependencies of the installed Nix binary"
+    ):
+        docker.succeed(
+            "docker load --input='${examples.nix}'",
+            "docker run --rm ${examples.nix.imageName} nix-store -qR ${pkgs.nix}",
+            "docker rmi ${examples.nix.imageName}",
+        )
 
-      # To test runAsRoot and entry point
-      $docker->succeed("docker load --input='${pkgs.dockerTools.examples.nginx}'");
-      $docker->succeed("docker run --name nginx -d -p 8000:80 ${pkgs.dockerTools.examples.nginx.imageName}");
-      $docker->waitUntilSucceeds('curl http://localhost:8000/');
-      $docker->succeed("docker rm --force nginx");
-      $docker->succeed("docker rmi '${pkgs.dockerTools.examples.nginx.imageName}'");
+    with subtest("The pullImage tool works"):
+        docker.succeed(
+            "docker load --input='${examples.nixFromDockerHub}'",
+            "docker run --rm nix:2.2.1 nix-store --version",
+            "docker rmi nix:2.2.1",
+        )
 
-      # An pulled image can be used as base image
-      $docker->succeed("docker load --input='${pkgs.dockerTools.examples.onTopOfPulledImage}'");
-      $docker->succeed("docker run --rm ontopofpulledimage hello");
-      $docker->succeed("docker rmi ontopofpulledimage");
+    with subtest("runAsRoot and entry point work"):
+        docker.succeed(
+            "docker load --input='${examples.nginx}'",
+            "docker run --name nginx -d -p 8000:80 ${examples.nginx.imageName}",
+        )
+        docker.wait_until_succeeds("curl http://localhost:8000/")
+        docker.succeed(
+            "docker rm --force nginx", "docker rmi '${examples.nginx.imageName}'",
+        )
 
-      # Regression test for issue #34779
-      $docker->succeed("docker load --input='${pkgs.dockerTools.examples.runAsRootExtraCommands}'");
-      $docker->succeed("docker run --rm runasrootextracommands cat extraCommands");
-      $docker->succeed("docker run --rm runasrootextracommands cat runAsRoot");
-      $docker->succeed("docker rmi '${pkgs.dockerTools.examples.runAsRootExtraCommands.imageName}'");
+    with subtest("A pulled image can be used as base image"):
+        docker.succeed(
+            "docker load --input='${examples.onTopOfPulledImage}'",
+            "docker run --rm ontopofpulledimage hello",
+            "docker rmi ontopofpulledimage",
+        )
 
-      # Ensure Docker images can use an unstable date
-      $docker->succeed("docker load --input='${pkgs.dockerTools.examples.bash}'");
-      $docker->succeed("[ '1970-01-01T00:00:01Z' != \"\$(docker inspect ${pkgs.dockerTools.examples.unstableDate.imageName} | ${pkgs.jq}/bin/jq -r .[].Created)\" ]");
+    with subtest("Regression test for issue #34779"):
+        docker.succeed(
+            "docker load --input='${examples.runAsRootExtraCommands}'",
+            "docker run --rm runasrootextracommands cat extraCommands",
+            "docker run --rm runasrootextracommands cat runAsRoot",
+            "docker rmi '${examples.runAsRootExtraCommands.imageName}'",
+        )
 
-      # Ensure Layered Docker images work
-      $docker->succeed("docker load --input='${pkgs.dockerTools.examples.layered-image}'");
-      $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.layered-image.imageName}");
-      $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.layered-image.imageName} cat extraCommands");
+    with subtest("Ensure Docker images can use an unstable date"):
+        docker.succeed(
+            "docker load --input='${examples.bash}'"
+        )
+        assert unix_time_second1 not in docker.succeed(
+            "docker inspect ${examples.unstableDate.imageName} "
+            + "| ${pkgs.jq}/bin/jq -r .[].Created"
+        )
 
-      # Ensure building an image on top of a layered Docker images work
-      $docker->succeed("docker load --input='${pkgs.dockerTools.examples.layered-on-top}'");
-      $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.layered-on-top.imageName}");
+    with subtest("Ensure Layered Docker images work"):
+        docker.succeed(
+            "docker load --input='${examples.layered-image}'",
+            "docker run --rm ${examples.layered-image.imageName}",
+            "docker run --rm ${examples.layered-image.imageName} cat extraCommands",
+        )
 
-      # Ensure layers are shared between images
-      $docker->succeed("docker load --input='${pkgs.dockerTools.examples.another-layered-image}'");
-      $docker->succeed("docker inspect ${pkgs.dockerTools.examples.layered-image.imageName} | ${pkgs.jq}/bin/jq -r '.[] | .RootFS.Layers | .[]' | sort > layers1.sha256");
-      $docker->succeed("docker inspect ${pkgs.dockerTools.examples.another-layered-image.imageName} | ${pkgs.jq}/bin/jq -r '.[] | .RootFS.Layers | .[]' | sort > layers2.sha256");
-      $docker->succeed('[ $(comm -1 -2 layers1.sha256 layers2.sha256 | wc -l) -ne 0 ]');
+    with subtest("Ensure building an image on top of a layered Docker images work"):
+        docker.succeed(
+            "docker load --input='${examples.layered-on-top}'",
+            "docker run --rm ${examples.layered-on-top.imageName}",
+        )
 
-      # Ensure order of layers is correct
-      $docker->succeed("docker load --input='${pkgs.dockerTools.examples.layersOrder}'");
-      $docker->succeed("docker run --rm  ${pkgs.dockerTools.examples.layersOrder.imageName} cat /tmp/layer1 | grep -q layer1");
-      # This is to be sure the order of layers of the parent image is preserved
-      $docker->succeed("docker run --rm  ${pkgs.dockerTools.examples.layersOrder.imageName} cat /tmp/layer2 | grep -q layer2");
-      $docker->succeed("docker run --rm  ${pkgs.dockerTools.examples.layersOrder.imageName} cat /tmp/layer3 | grep -q layer3");
 
-      # Ensure image with only 2 layers can be loaded
-      $docker->succeed("docker load --input='${pkgs.dockerTools.examples.two-layered-image}'");
+    def set_of_layers(image_name):
+        return set(
+            docker.succeed(
+                f"docker inspect {image_name} "
+                + "| ${pkgs.jq}/bin/jq -r '.[] | .RootFS.Layers | .[]'"
+            ).split()
+        )
 
-      # Ensure the bulk layer didn't miss store paths
-      # Regression test for https://github.com/NixOS/nixpkgs/issues/78744
-      $docker->succeed("docker load --input='${pkgs.dockerTools.examples.bulk-layer}'");
-      # This ensure the two output paths (ls and hello) are in the layer
-      $docker->succeed("docker run bulk-layer ls /bin/hello");
-    '';
+
+    with subtest("Ensure layers are shared between images"):
+        docker.succeed(
+            "docker load --input='${examples.another-layered-image}'"
+        )
+        layers1 = set_of_layers("${examples.layered-image.imageName}")
+        layers2 = set_of_layers("${examples.another-layered-image.imageName}")
+        assert bool(layers1 & layers2)
+
+    with subtest("Ensure order of layers is correct"):
+        docker.succeed(
+            "docker load --input='${examples.layersOrder}'"
+        )
+
+        for index in 1, 2, 3:
+            assert f"layer{index}" in docker.succeed(
+                f"docker run --rm  ${examples.layersOrder.imageName} cat /tmp/layer{index}"
+            )
+
+    with subtest("Ensure image with only 2 layers can be loaded"):
+        docker.succeed(
+            "docker load --input='${examples.two-layered-image}'"
+        )
+
+    with subtest(
+        "Ensure the bulk layer doesn't miss store paths (regression test for #78744)"
+    ):
+        docker.succeed(
+            "docker load --input='${pkgs.dockerTools.examples.bulk-layer}'",
+            # Ensure the two output paths (ls and hello) are in the layer
+            "docker run bulk-layer ls /bin/hello",
+        )
+  '';
 })

From 6a6bf70e48680d23786e338806f940838e742394 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Thu, 27 Feb 2020 16:19:40 +0100
Subject: [PATCH 1665/4636] sphinxsearch: add workaround for darwin build
 failures

upstream bug: see http://sphinxsearch.com/bugs/view.php?id=2578
fix ported from Homebrew: https://github.com/Homebrew/homebrew-core/pull/8619
---
 pkgs/servers/search/sphinxsearch/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix
index f32bcf1a6ba3..5c29d8b47808 100644
--- a/pkgs/servers/search/sphinxsearch/default.nix
+++ b/pkgs/servers/search/sphinxsearch/default.nix
@@ -31,6 +31,14 @@ stdenv.mkDerivation rec {
     expat
   ];
 
+  CXXFLAGS = with stdenv.lib; concatStringsSep " " (optionals stdenv.isDarwin [
+    # see upstream bug: http://sphinxsearch.com/bugs/view.php?id=2578
+    # workaround for "error: invalid suffix on literal
+    "-Wno-reserved-user-defined-literal"
+    # workaround for "error: non-constant-expression cannot be narrowed from type 'long' to 'int'"
+    "-Wno-c++11-narrowing"
+  ]);
+
   meta = {
     description = "An open source full text search server";
     homepage    = http://sphinxsearch.com;

From 35feac339b924a54135bd4652062e874a64dc4b0 Mon Sep 17 00:00:00 2001
From: GRBurst <GRBurst@protonmail.com>
Date: Thu, 27 Feb 2020 17:38:53 +0100
Subject: [PATCH 1666/4636] xcwd: 2016-09-30 -> 2019-05-09

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

diff --git a/pkgs/tools/X11/xcwd/default.nix b/pkgs/tools/X11/xcwd/default.nix
index d50a7c006c89..f2fadd71427c 100644
--- a/pkgs/tools/X11/xcwd/default.nix
+++ b/pkgs/tools/X11/xcwd/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, libX11 }:
 
 stdenv.mkDerivation {
-  version = "2016-09-30";
+  version = "2019-05-09";
   pname = "xcwd";
 
   src = fetchFromGitHub {
     owner   = "schischi";
     repo    = "xcwd";
-    rev     = "3f0728b932904985b703b33bd5c936ea96cf15a0";
-    sha256  = "0lwfz6qg7fkiq86skp51vpav33yik22ps4dvr48asv3570skhlf9";
+    rev     = "99738e1176acf3f39c2e709236c3fd87b806f2ed";
+    sha256  = "1wvhj5x8ysi1q73f9cw1f6znvp2zivd8pp6z1p3znw732h4zlv6v";
   };
 
   buildInputs = [ libX11 ];

From 2e074b60e420f7ec16a9d1df7b3da13ef1e25b92 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 27 Feb 2020 16:45:44 +0000
Subject: [PATCH 1667/4636] xapian: 1.4.14 -> 1.4.15

---
 pkgs/development/libraries/xapian/default.nix                 | 4 ++--
 .../development/libraries/xapian/skip-flaky-darwin-test.patch | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 971ab485221d..ef50bf31a367 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -30,12 +30,12 @@ let
 
     meta = with stdenv.lib; {
       description = "Search engine library";
-      homepage = https://xapian.org/;
+      homepage = "https://xapian.org/";
       license = licenses.gpl2Plus;
       maintainers = with maintainers; [ ];
       platforms = platforms.unix;
     };
   };
 in {
-  xapian_1_4 = generic "1.4.14" "0ja95vn0lkf6qkjhg2blkx306i10hg4fr8wlrhalmly93307lnlp";
+  xapian_1_4 = generic "1.4.15" "1sjhz6vgql801rdgl6vrsjj0vy1mwlkcxjx6nr7h27m031cyjs5i";
 }
diff --git a/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch b/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch
index cce96a2762bf..d763a2a2b434 100644
--- a/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch
+++ b/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch
@@ -6,9 +6,9 @@ diff -Naur xapian-core.old/tests/api_db.cc xapian-core.new/tests/api_db.cc
  // test for keepalives
  DEFINE_TESTCASE(keepalive1, remote) {
 +    SKIP_TEST("Fails in darwin nix build environment");
-     XFAIL_FOR_BACKEND("multi_glass_remoteprog_glass",
- 		      "Multi remote databases are currently buggy");
+     Xapian::Database db(get_remote_database("apitest_simpledata", 5000));
  
+     /* Test that keep-alives work */
 diff -Naur xapian-core.old/tests/api_scalability.cc xapian-core.new/tests/api_scalability.cc
 --- xapian-core.old/tests/api_scalability.cc
 +++ xapian-core.new/tests/api_scalability.cc

From 5fc6b34dba9071b19a4c37c36ecde550075792a2 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Thu, 27 Feb 2020 12:03:28 -0500
Subject: [PATCH 1668/4636] ocamlPackages.eigen: 0.1.5 -> 0.2.0

---
 pkgs/development/ocaml-modules/eigen/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/eigen/default.nix b/pkgs/development/ocaml-modules/eigen/default.nix
index 7c1ec79f7da3..8f26213c23ae 100644
--- a/pkgs/development/ocaml-modules/eigen/default.nix
+++ b/pkgs/development/ocaml-modules/eigen/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, buildDunePackage, fetchFromGitHub, ctypes }:
+{ stdenv, buildDune2Package, fetchFromGitHub, ctypes }:
 
-buildDunePackage rec {
+buildDune2Package rec {
   pname = "eigen";
-  version = "0.1.5";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "owlbarn";
     repo   = pname;
     rev    = version;
-    sha256 = "0pbqd87i9h7qpx84hr8k4iw0rhmjgma4s3wihxh992jjvsrgdyfi";
+    sha256 = "1zaw03as14hyvfpyj6bjrfbcxp2ljdbqcqqgm53kms244mig425f";
   };
 
-  minimumOCamlVersion = "4.04";
+  minimumOCamlVersion = "4.02";
 
   propagatedBuildInputs = [ ctypes ];
 

From 290b09847ac87c18370fdf3b6a9bb771c9c400f8 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Wed, 26 Feb 2020 23:27:01 -0500
Subject: [PATCH 1669/4636] ocamlPackages.owl: 0.7.2 -> 0.8.0

---
 .../ocaml-modules/owl-base/default.nix        |  8 ++++----
 .../development/ocaml-modules/owl/default.nix | 20 +++++++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/ocaml-modules/owl-base/default.nix b/pkgs/development/ocaml-modules/owl-base/default.nix
index 12cd54363085..ce6ee124466c 100644
--- a/pkgs/development/ocaml-modules/owl-base/default.nix
+++ b/pkgs/development/ocaml-modules/owl-base/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, buildDunePackage, fetchFromGitHub, stdlib-shims }:
+{ stdenv, buildDune2Package, fetchFromGitHub, stdlib-shims }:
 
-buildDunePackage rec {
+buildDune2Package rec {
   pname = "owl-base";
-  version = "0.7.2";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner  = "owlbarn";
     repo   = "owl";
     rev    = version;
-    sha256 = "1a2lbhywrb3bmm4k48wwbp6iszpd3aj1f23v10i78cbqm5slk6dj";
+    sha256 = "1j3xmr4izfznmv8lbn8vkx9c77py2xr6fqyn6ypjlf5k9b8g4mmw";
   };
 
   propagatedBuildInputs = [ stdlib-shims ];
diff --git a/pkgs/development/ocaml-modules/owl/default.nix b/pkgs/development/ocaml-modules/owl/default.nix
index 0cc1c1db42a4..c6eaf69b704b 100644
--- a/pkgs/development/ocaml-modules/owl/default.nix
+++ b/pkgs/development/ocaml-modules/owl/default.nix
@@ -1,14 +1,26 @@
-{ stdenv, buildDunePackage, fetchFromGitHub, alcotest
-, eigen, stdio, stdlib-shims, openblasCompat, owl-base
+{ stdenv
+, buildDune2Package
+, dune-configurator
+, fetchFromGitHub
+, alcotest
+, eigen
+, stdio
+, stdlib-shims
+, openblasCompat
+, owl-base
+, npy
 }:
 
-buildDunePackage rec {
+buildDune2Package rec {
   pname = "owl";
 
   inherit (owl-base) version src meta;
 
   checkInputs = [ alcotest ];
-  propagatedBuildInputs = [ eigen stdio stdlib-shims openblasCompat owl-base ];
+  buildInputs = [ dune-configurator ];
+  propagatedBuildInputs = [
+    eigen stdio stdlib-shims openblasCompat owl-base npy
+  ];
 
   doCheck = !stdenv.isDarwin;  # https://github.com/owlbarn/owl/issues/462
 }

From 2b622911af6b2297ff82fc06737c064f5da047be Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 27 Feb 2020 18:18:20 +0100
Subject: [PATCH 1670/4636] cargo-deps: 1.1.1 -> 1.4.1

---
 pkgs/tools/package-management/cargo-deps/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-deps/default.nix b/pkgs/tools/package-management/cargo-deps/default.nix
index d0768300d82e..e648990ccf8f 100644
--- a/pkgs/tools/package-management/cargo-deps/default.nix
+++ b/pkgs/tools/package-management/cargo-deps/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-deps";
-  version = "1.1.1";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "m-cat";
     repo = pname;
-    rev = "ab93f5655900e49fb0360ccaf72b2b61b6b428ef";
-    sha256 = "16181p7ghvy9mqippg1xi2cw7yxvicis8v6n39wly5qw05i57aw2";
+    rev = "4033018eaa53134fd6169653b709b195a5f5958b";
+    sha256 = "1cdmgdag9chjifsp2hxr9j15hb6l6anqq38y8srj1nk047a3kbcw";
   };
 
-  cargoSha256 = "1zk6pf7agqs1mpld40rn05cwp4wy0vpjnn5ip6m83bxm8b3i87wk";
+  cargoSha256 = "1gjbvgpicy9n311qh9a5n0gdyd2rnc0b9zypnzk2ibn1pgaikafy";
 
   meta = with lib; {
     description = "Cargo subcommand for building dependency graphs of Rust projects";

From fd9b40d07650e428fd8dc74505cd7ec5c0163cd4 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Thu, 27 Feb 2020 00:00:53 -0500
Subject: [PATCH 1671/4636] ocamlPackages_latest.phylogenetics: dune2/fix meta

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

diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix
index e665a3235788..049a9a97c8e2 100644
--- a/pkgs/development/ocaml-modules/phylogenetics/default.nix
+++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, buildDunePackage, fetchFromGitHub, ppx_deriving
+{ stdenv, buildDune2Package, fetchFromGitHub, ppx_deriving
 , alcotest, biocaml, gnuplot, lacaml, menhir, owl }:
 
-buildDunePackage rec {
+buildDune2Package rec {
   pname = "phylogenetics";
   version = "unstable-2019-11-15";
 
@@ -20,7 +20,7 @@ buildDunePackage rec {
   doCheck = false;  # many tests require bppsuite
 
   meta = with stdenv.lib; {
-    inherit (std.meta) homepage;
+    inherit (src.meta) homepage;
     description = "Bioinformatics library for Ocaml";
     maintainers = [ maintainers.bcdarwin ];
     license = licenses.cecill-b;

From 4b65f859c945b699e1ba91c62b6eb464ec314892 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 27 Feb 2020 12:49:44 -0500
Subject: [PATCH 1672/4636] pythonPackages.pytest-lazy-fixture: use
 pytestCheckHook

---
 .../python-modules/pytest-lazy-fixture/default.nix        | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-lazy-fixture/default.nix b/pkgs/development/python-modules/pytest-lazy-fixture/default.nix
index 779b710f92ba..2b9c57b99d8a 100644
--- a/pkgs/development/python-modules/pytest-lazy-fixture/default.nix
+++ b/pkgs/development/python-modules/pytest-lazy-fixture/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, pytest
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
@@ -14,13 +14,9 @@ buildPythonPackage rec {
   };
 
   checkInputs = [
-    pytest
+    pytestCheckHook
   ];
 
-  checkPhase = ''
-    pytest
-  '';
-
   meta = with lib; {
     description = "Helps to use fixtures in pytest.mark.parametrize";
     homepage = "https://github.com/pytest-dev/pytest-repeat";

From 56c2b7cb9a97f2ac86685c19488d32d91e5105cf Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 27 Feb 2020 12:50:23 -0500
Subject: [PATCH 1673/4636] arrow-cpp: fix RPATH on darwin

Instead of patching test binaries with install_name_tool just set
CMAKE_SKIP_BUILD_RPATH to OFF let cmake compile them with RPATH set
correctly.

Add CMAKE_INSTALL_RPATH to set correct RPATH for the installed
executables for parquet tools. We could set it to an absolute path using
"-DCMAKE_INSTALL_RPATH=${placeholder "out"}", but instead we use
@loader_path to provide a relocable solution.
---
 pkgs/development/libraries/arrow-cpp/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index e152848a70f0..50de0c88a5be 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/pkgs/development/libraries/arrow-cpp/default.nix
@@ -101,18 +101,17 @@ in stdenv.mkDerivation rec {
     "-DARROW_PROTOBUF_USE_SHARED=OFF"
     "-DARROW_TEST_LINKAGE=static"
     "-DOPENSSL_USE_STATIC_LIBS=ON"
+  ] ++ lib.optionals stdenv.isDarwin [
+    "-DCMAKE_SKIP_BUILD_RPATH=OFF" # needed for tests
+    "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables
   ] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF";
 
   doInstallCheck = true;
   PARQUET_TEST_DATA =
     if doInstallCheck then "${parquet-testing}/data" else null;
   installCheckInputs = [ perl which ];
-  installCheckPhase = (lib.optionalString stdenv.isDarwin ''
-    for f in release/*test{,s}; do
-      install_name_tool -add_rpath "$out"/lib  "$f"
-    done
-  '')
-  + (let
+  installCheckPhase =
+  let
     excludedTests = lib.optionals stdenv.isDarwin [
       # Some plasma tests need to be patched to use a shorter AF_UNIX socket
       # path on Darwin. See https://github.com/NixOS/nix/pull/1085
@@ -122,7 +121,7 @@ in stdenv.mkDerivation rec {
   in ''
     ctest -L unittest -V \
       --exclude-regex '^(${builtins.concatStringsSep "|" excludedTests})$'
-  '');
+  '';
 
   meta = {
     description = "A  cross-language development platform for in-memory data";

From ee7becd91863609bb39055e3c8a9fa7451d0ac03 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <meurerbernardo@gmail.com>
Date: Tue, 25 Feb 2020 20:19:27 -0800
Subject: [PATCH 1674/4636] nixos/tlp: revamp

---
 nixos/modules/services/hardware/tlp.nix | 146 ++++++++++--------------
 1 file changed, 60 insertions(+), 86 deletions(-)

diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix
index 955a60677997..3962d7b15989 100644
--- a/nixos/modules/services/hardware/tlp.nix
+++ b/nixos/modules/services/hardware/tlp.nix
@@ -1,39 +1,26 @@
 { config, lib, pkgs, ... }:
-
 with lib;
-
 let
-
-cfg = config.services.tlp;
-
-enableRDW = config.networking.networkmanager.enable;
-
-tlp = pkgs.tlp.override {
-  inherit enableRDW;
-};
-
-# XXX: We can't use writeTextFile + readFile here because it triggers
-# TLP build to get the .drv (even on --dry-run).
-confFile = pkgs.runCommand "tlp"
-  { config = cfg.extraConfig;
-    passAsFile = [ "config" ];
-    preferLocalBuild = true;
-  }
-  ''
-    cat ${tlp}/etc/default/tlp > $out
-    cat $configPath >> $out
-  '';
-
+  cfg = config.services.tlp;
+  enableRDW = config.networking.networkmanager.enable;
+  tlp = pkgs.tlp.override { inherit enableRDW; };
+  # TODO: Use this for having proper parameters in the future
+  mkTlpConfig = tlpConfig: generators.toKeyValue {
+    mkKeyValue = generators.mkKeyValueDefault {
+      mkValueString = val:
+        if isInt val then toString val
+        else if isString val then val
+        else if true == val then "1"
+        else if false == val then "0"
+        else if isList val then "\"" + (concatStringsSep " " val) + "\""
+        else err "invalid value provided to mkTlpConfig:" (toString val);
+    } "=";
+  } tlpConfig;
 in
-
 {
-
   ###### interface
-
   options = {
-
     services.tlp = {
-
       enable = mkOption {
         type = types.bool;
         default = false;
@@ -45,77 +32,64 @@ in
         default = "";
         description = "Additional configuration variables for TLP";
       };
-
     };
-
   };
 
-
   ###### implementation
-
   config = mkIf cfg.enable {
+    boot.kernelModules = [ "msr" ];
 
-    powerManagement.scsiLinkPolicy = null;
-    powerManagement.cpuFreqGovernor = null;
-    powerManagement.cpufreq.max = null;
-    powerManagement.cpufreq.min = null;
+    environment.etc = {
+      "tlp.conf".text = cfg.extraConfig;
+    } // optionalAttrs enableRDW {
+      "NetworkManager/dispatcher.d/99tlp-rdw-nm".source =
+        "${tlp}/etc/NetworkManager/dispatcher.d/99tlp-rdw-nm";
+    };
 
-    systemd.sockets.systemd-rfkill.enable = false;
+    environment.systemPackages = [ tlp ];
 
-    systemd.services = {
-      "systemd-rfkill@".enable = false;
-      systemd-rfkill.enable = false;
-
-      tlp = {
-        description = "TLP system startup/shutdown";
-
-        after = [ "multi-user.target" ];
-        wantedBy = [ "multi-user.target" ];
-        before = [ "shutdown.target" ];
-        restartTriggers = [ confFile ];
-
-        serviceConfig = {
-          Type = "oneshot";
-          RemainAfterExit = true;
-          ExecStart = "${tlp}/bin/tlp init start";
-          ExecStop = "${tlp}/bin/tlp init stop";
-        };
-      };
-
-      tlp-sleep = {
-        description = "TLP suspend/resume";
-
-        wantedBy = [ "sleep.target" ];
-        before = [ "sleep.target" ];
-
-        unitConfig = {
-          StopWhenUnneeded = true;
-        };
-
-        serviceConfig = {
-          Type = "oneshot";
-          RemainAfterExit = true;
-          ExecStart = "${tlp}/bin/tlp suspend";
-          ExecStop = "${tlp}/bin/tlp resume";
-        };
-      };
+    # FIXME: When the config is parametrized we need to move these into a
+    # conditional on the relevant options being enabled.
+    powerManagement = {
+      scsiLinkPolicy = null;
+      cpuFreqGovernor = null;
+      cpufreq.max = null;
+      cpufreq.min = null;
     };
 
     services.udev.packages = [ tlp ];
 
-    environment.etc =
-      {
-        "default/tlp".source = confFile;
-      } // optionalAttrs enableRDW {
-        "NetworkManager/dispatcher.d/99tlp-rdw-nm" = {
-          source = "${tlp}/etc/NetworkManager/dispatcher.d/99tlp-rdw-nm";
-        };
+    systemd = {
+      packages = [ tlp ];
+      # XXX: These must always be disabled/masked according to [1].
+      #
+      # [1]: https://github.com/linrunner/TLP/blob/a9ada09e0821f275ce5f93dc80a4d81a7ff62ae4/tlp-stat.in#L319
+      sockets.systemd-rfkill.enable = false;
+      services.systemd-rfkill.enable = false;
+
+      services.tlp = {
+        # XXX: The service should reload whenever the configuration changes,
+        # otherwise newly set power options remain inactive until reboot (or
+        # manual unit restart.)
+        restartTriggers = [ config.environment.etc."tlp.conf".source ];
+        # XXX: When using systemd.packages (which we do above) the [Install]
+        # section of systemd units does not work (citation needed) so we manually
+        # enforce it here.
+        wantedBy = [ "multi-user.target" ];
       };
 
-    environment.systemPackages = [ tlp ];
-
-    boot.kernelModules = [ "msr" ];
-
+      services.tlp-sleep = {
+        # XXX: When using systemd.packages (which we do above) the [Install]
+        # section of systemd units does not work (citation needed) so we manually
+        # enforce it here.
+        before = [ "sleep.target" ];
+        wantedBy = [ "sleep.target" ];
+        # XXX: `tlp suspend` requires /var/lib/tlp to exist in order to save
+        # some stuff in there. There is no way, that I know of, to do this in
+        # the package itself, so we do it here instead making sure the unit
+        # won't fail due to the save dir not existing.
+        serviceConfig.StateDirectory = "tlp";
+      };
+    };
   };
-
 }

From 2936fa8f1f5c5d0ee8691ebadc9ba497ff3cb1ab Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Feb 2020 01:16:26 +0000
Subject: [PATCH 1675/4636] stlink: 1.5.1 -> 1.6.0

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

diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix
index 98c400d52851..56332a12dc1b 100644
--- a/pkgs/development/tools/misc/stlink/default.nix
+++ b/pkgs/development/tools/misc/stlink/default.nix
@@ -4,7 +4,7 @@
 # Add services.udev.pkgs = [ pkgs.stlink ] to your configuration.nix
 
 let
-  version = "1.5.1";
+  version = "1.6.0";
 in
 stdenv.mkDerivation {
   pname = "stlink";
@@ -13,8 +13,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "texane";
     repo = "stlink";
-    rev = "v1.5.1";
-    sha256 = "1d5gxiqpsm8fc105cxlp27af9fk339fap5h6nay21x5a7n61jgyc";
+    rev = "v1.6.0";
+    sha256 = "1mlkrxjxg538335g59hjb0zc739dx4mhbspb26z5gz3lf7d4xv6x";
   };
 
   buildInputs = [ cmake libusb1 ];

From 5341720ca7be5240957ae916c3f831b4326ef7dc Mon Sep 17 00:00:00 2001
From: Jon <jonringer@users.noreply.github.com>
Date: Thu, 27 Feb 2020 08:40:28 -0800
Subject: [PATCH 1676/4636] stlink: inline version info

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

diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix
index 56332a12dc1b..c59847b1e0f7 100644
--- a/pkgs/development/tools/misc/stlink/default.nix
+++ b/pkgs/development/tools/misc/stlink/default.nix
@@ -3,17 +3,14 @@
 # IMPORTANT: You need permissions to access the stlink usb devices. 
 # Add services.udev.pkgs = [ pkgs.stlink ] to your configuration.nix
 
-let
-  version = "1.6.0";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "stlink";
-  inherit version;
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "texane";
     repo = "stlink";
-    rev = "v1.6.0";
+    rev = "v${version}";
     sha256 = "1mlkrxjxg538335g59hjb0zc739dx4mhbspb26z5gz3lf7d4xv6x";
   };
 

From 5bd18634a6ef05a0879eb765bb02c854e7c07cd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 27 Feb 2020 15:50:06 -0300
Subject: [PATCH 1677/4636] matcha: 2020-02-06 -> 2020-02-27

---
 pkgs/data/themes/matcha/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
index 6e00bc2d88d9..b7f146ed69ec 100644
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "matcha";
-  version = "2020-02-06";
+  version = "2020-02-27";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    sha256 = "14kii4dn028yqbsd0pr195di067harh9z2h753856dlxvs8d6vkx";
+    sha256 = "1ngndd8lz1m2c9zm9m0wgnz35mdyrxnxxaxbg09zckqp1nrj4lm9";
   };
 
   buildInputs = [ gdk-pixbuf librsvg ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     patchShebangs .
     mkdir -p $out/share/themes
-    name= ./Install -d $out/share/themes
+    name= ./install.sh -d $out/share/themes
     install -D -t $out/share/gtksourceview-3.0/styles src/extra/gedit/matcha.xml
   '';
 

From 9edb3b6e218fc162f29ce0a3a46fed6f54963df3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 27 Feb 2020 15:50:44 -0300
Subject: [PATCH 1678/4636] matcha: install firefox theme at the doc dir

---
 pkgs/data/themes/matcha/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
index b7f146ed69ec..e1a383fb10b7 100644
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
     mkdir -p $out/share/themes
     name= ./install.sh -d $out/share/themes
     install -D -t $out/share/gtksourceview-3.0/styles src/extra/gedit/matcha.xml
+    mkdir -p $out/share/doc/${pname}
+    cp -a src/extra/firefox $out/share/doc/${pname}
   '';
 
   meta = with stdenv.lib; {

From 8f98a2c38f57df6891a67d92e6362b0842900745 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 27 Feb 2020 19:04:24 +0000
Subject: [PATCH 1679/4636] zenmonitor: 1.3 -> 1.4.0

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

diff --git a/pkgs/os-specific/linux/zenmonitor/default.nix b/pkgs/os-specific/linux/zenmonitor/default.nix
index c333b94f40e2..e9e0e82a0932 100644
--- a/pkgs/os-specific/linux/zenmonitor/default.nix
+++ b/pkgs/os-specific/linux/zenmonitor/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "zenmonitor";
-  version = "1.3";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "ocerman";
     repo = "zenmonitor";
     rev = "v${version}";
-    sha256 = "16p2njrgik8zfkidm64v4qy53qlsqqxxgr9m3n84pr9l3pk25dwk";
+    sha256 = "1mn496iqfmhqsac7a5r0bdfddzrfiz6l34qiga0pip925g7hsm52";
   };
 
   buildInputs = [ gtk3 ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Monitoring software for AMD Zen-based CPUs";
-    homepage = https://github.com/ocerman/zenmonitor;
+    homepage = "https://github.com/ocerman/zenmonitor";
     license = licenses.mit;
     platforms = [ "i686-linux" "x86_64-linux" ];
     maintainers = with maintainers; [ alexbakker ];

From 29b495d4d74203224a14c9d8991fc11985a42ad5 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 27 Feb 2020 20:26:50 +0100
Subject: [PATCH 1680/4636] cargo-make: 0.27.0 -> 0.28.0

https://github.com/sagiegurari/cargo-make/releases/tag/0.28.0
---
 .../tools/rust/cargo-make/Cargo.lock          | 32 +++++++++++++------
 .../tools/rust/cargo-make/default.nix         | 13 ++++----
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-make/Cargo.lock b/pkgs/development/tools/rust/cargo-make/Cargo.lock
index cd14accb7419..dd5a492de6a9 100644
--- a/pkgs/development/tools/rust/cargo-make/Cargo.lock
+++ b/pkgs/development/tools/rust/cargo-make/Cargo.lock
@@ -99,22 +99,22 @@ dependencies = [
 
 [[package]]
 name = "cargo-make"
-version = "0.27.0"
+version = "0.28.0"
 dependencies = [
  "ci_info 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "duckscript 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "duckscriptsdk 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "duckscript 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "duckscriptsdk 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fsio 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "run_script 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rust_info 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -235,18 +235,22 @@ dependencies = [
 
 [[package]]
 name = "duckscript"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "fsio 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "duckscriptsdk"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "attohttpc 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "duckscript 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "duckscript 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fsio 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "java-properties 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "meval 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -363,6 +367,15 @@ name = "fs_extra"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "fsio"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "users 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.1.14"
@@ -956,8 +969,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
 "checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
 "checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
-"checksum duckscript 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "747bb4e541a0830b4581bffc001045d3dc259683546fbf35a35f47af831634b5"
-"checksum duckscriptsdk 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "799c03843d05bb809ea1ee653c4f9ba9a5ee766c07490cc684cf6b259b68ba94"
+"checksum duckscript 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c0f699115ffc264c2d6ed8eed098b48d7d08122ba8d59d44f93170c5d33972c7"
+"checksum duckscriptsdk 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dad6bba01030a40c5c26a1393926220d046319c00352520b83e02bedf324c805"
 "checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
 "checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"
 "checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81"
@@ -972,6 +985,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 "checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 "checksum fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674"
+"checksum fsio 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2131cb03096f67334dfba2f0bc46afc5564b08a919d042c6e217e2665741fc54"
 "checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
 "checksum git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "add3a9c3c08c8905a2165ff06891dd1c3bb32d81b2a32d79528abc9793dfb06f"
 "checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix
index a622a822cfa1..35dba1149820 100644
--- a/pkgs/development/tools/rust/cargo-make/default.nix
+++ b/pkgs/development/tools/rust/cargo-make/default.nix
@@ -2,7 +2,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-make";
-  version = "0.27.0";
+  version = "0.28.0";
 
   src =
     let
@@ -10,10 +10,10 @@ rustPlatform.buildRustPackage rec {
         owner = "sagiegurari";
         repo = pname;
         rev = version;
-        sha256 = "197r7rlgk8csvq612gz4431vvrvyxhcmfswarsdczp4b94pzaa6h";
+        sha256 = "1sf4hjsylk68d3wb7bs8gfkz5az41hjs7hvb8mbhyc7nryklkq4d";
       };
     in
-    runCommand "cargo-make-src" {} ''
+    runCommand "source" {} ''
       cp -R ${source} $out
       chmod +w $out
       cp ${./Cargo.lock} $out/Cargo.lock
@@ -24,10 +24,9 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
+  legacyCargoFetcher = false;
 
-  cargoSha256 = "02bx8nz8kkr0l8m1b8nfc9576qx9is6s72x4ji3bzwimy76jvx3j";
+  cargoSha256 = "1x0lb68d47nhggnj7jf90adz7shb0cg305mavgqvxizd2s9789dx";
 
   # Some tests fail because they need network access.
   # However, Travis ensures a proper build.
@@ -39,7 +38,7 @@ rustPlatform.buildRustPackage rec {
     description = "A Rust task runner and build tool";
     homepage = "https://github.com/sagiegurari/cargo-make";
     license = licenses.asl20;
-    maintainers = with maintainers; [ xrelkd ];
+    maintainers = with maintainers; [ xrelkd ma27 ];
     platforms = platforms.all;
   };
 }

From d607564d6824612f3c9f8a4e7d5477981a1b1193 Mon Sep 17 00:00:00 2001
From: Millian Poquet <millian.poquet@inria.fr>
Date: Sat, 22 Feb 2020 12:37:36 +0100
Subject: [PATCH 1681/4636] meson: 0.52.1 -> 0.53.2

https://mesonbuild.com/Release-notes-for-0-53-0.html

https://github.com/mesonbuild/meson/releases/tag/0.53.0
https://github.com/mesonbuild/meson/releases/tag/0.53.1
https://github.com/mesonbuild/meson/releases/tag/0.53.2
---
 .../tools/build-managers/meson/default.nix          | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index e4d4994a7814..f9f4c344e322 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -1,6 +1,5 @@
 { lib
 , python3Packages
-, fetchpatch
 , stdenv
 , writeTextDir
 , substituteAll
@@ -20,11 +19,11 @@ let
 in
 python3Packages.buildPythonApplication rec {
   pname = "meson";
-  version = "0.52.1";
+  version = "0.53.2";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "02fnrk1fjf3yiix0ak0m9vgbpl4h97fafii5pmw7phmvnlv9fyan";
+    sha256 = "Po+DDzMYQ5fC6wtlHsUCrbY97LKJeL3ISzVY1xKEwh8=";
   };
 
   postFixup = ''
@@ -62,14 +61,6 @@ python3Packages.buildPythonApplication rec {
       src = ./fix-rpath.patch;
       inherit (builtins) storeDir;
     })
-
-    # Fix detecting incorrect compiler in the store path hash.
-    # https://github.com/NixOS/nixpkgs/issues/73417#issuecomment-554077964
-    # https://github.com/mesonbuild/meson/pull/6185
-    (fetchpatch {
-      url = "https://github.com/mesonbuild/meson/commit/972ede1d14fdf17fe5bb8fb99be220f9395c2392.patch";
-      sha256 = "19bfsylhpy0b2xv3ks8ac9x3q6vvvyj1wjcy971v9d5f1455xhbb";
-    })
   ];
 
   setupHook = ./setup-hook.sh;

From 4ee219ef8ebf8f3b60106156d2f6a81a156b25fe Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Mon, 23 Dec 2019 17:35:10 -0500
Subject: [PATCH 1682/4636] gerbil-unstable: 2019-11-15 -> 2020-02-27

Let Gerbil Scheme find its GERBIL_HOME where Nix put it
when the environment variable is left unspecified.

Comment out work in progress for static linking.

Notes about working on macOS.
---
 pkgs/development/compilers/gerbil/build.nix   | 37 ++++++++++++-------
 .../development/compilers/gerbil/unstable.nix |  8 ++--
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix
index e2ab09764827..21c2936fa0f8 100644
--- a/pkgs/development/compilers/gerbil/build.nix
+++ b/pkgs/development/compilers/gerbil/build.nix
@@ -3,9 +3,6 @@
   openssl, zlib, sqlite, libxml2, libyaml, libmysqlclient, lmdb, leveldb, postgresql,
   version, git-version, gambit, src }:
 
-# TODO: distinct packages for gerbil-release and gerbil-devel
-# TODO: make static compilation work
-
 stdenv.mkDerivation rec {
   pname = "gerbil";
   inherit version;
@@ -32,19 +29,23 @@ stdenv.mkDerivation rec {
       substituteInPlace "$f" --replace '"gsc"' '"${gambit}/bin/gsc"'
     done
     substituteInPlace "etc/gerbil.el" --replace '"gxc"' "\"$out/bin/gxc\""
+'';
 
-    cat > etc/gerbil_static_libraries.sh <<EOF
-#OPENSSL_LIBCRYPTO=${makeStaticLibraries openssl}/lib/libcrypto.a # MISSING!
-#OPENSSL_LIBSSL=${makeStaticLibraries openssl}/lib/libssl.a # MISSING!
-ZLIB=${makeStaticLibraries zlib}/lib/libz.a
+## TODO: make static compilation work.
+## For that, get all the packages below to somehow expose static libraries,
+## so we can offer users the option to statically link them into Gambit and/or Gerbil.
+## Then add the following to the postPatch script above:
+#     cat > etc/gerbil_static_libraries.sh <<EOF
+# OPENSSL_LIBCRYPTO=${makeStaticLibraries openssl}/lib/libcrypto.a # MISSING!
+# OPENSSL_LIBSSL=${makeStaticLibraries openssl}/lib/libssl.a # MISSING!
+# ZLIB=${makeStaticLibraries zlib}/lib/libz.a
 # SQLITE=${makeStaticLibraries sqlite}/lib/sqlite.a # MISSING!
 # LIBXML2=${makeStaticLibraries libxml2}/lib/libxml2.a # MISSING!
 # YAML=${makeStaticLibraries libyaml}/lib/libyaml.a # MISSING!
-MYSQL=${makeStaticLibraries libmysqlclient}/lib/mariadb/libmariadb.a
+# MYSQL=${makeStaticLibraries libmysqlclient}/lib/mariadb/libmariadb.a
 # LMDB=${makeStaticLibraries lmdb}/lib/mysql/libmysqlclient_r.a # MISSING!
-LEVELDB=${makeStaticLibraries lmdb}/lib/libleveldb.a
-EOF
-  '';
+# LEVELDB=${makeStaticLibraries leveldb}/lib/libleveldb.a
+# EOF
 
   buildPhase = ''
     runHook preBuild
@@ -52,6 +53,14 @@ EOF
     # Enable all optional libraries
     substituteInPlace "src/std/build-features.ss" --replace '#f' '#t'
 
+    # Enable autodetection of a default GERBIL_HOME
+    for i in src/gerbil/boot/gx-init-exe.scm src/gerbil/boot/gx-init.scm ; do
+      substituteInPlace "$i" --replace '(getenv "GERBIL_HOME" #f)' "(getenv \"GERBIL_HOME\" \"$out\")"
+    done
+    for i in src/gerbil/boot/gxi-init.scm src/gerbil/compiler/driver.ss src/gerbil/runtime/gx-gambc.scm src/std/build.ss src/tools/build.ss ; do
+      substituteInPlace "$i" --replace '(getenv "GERBIL_HOME")' "(getenv \"GERBIL_HOME\" \"$out\")"
+    done
+
     # gxprof testing uses $HOME/.cache/gerbil/gxc
     export HOME=$$PWD
 
@@ -71,7 +80,7 @@ EOF
 export GERBIL_HOME=$out
 case "\$1" in -:*) GSIOPTIONS=\$1 ; shift ;; esac
 if [[ \$# = 0 ]] ; then
-  exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init \$GERBIL_HOME/lib/gxi-interactive - ;
+  exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init \$GERBIL_HOME/lib/gxi-interactive -
 else
   exec ${gambit}/bin/gsi \$GSIOPTIONS \$GERBIL_HOME/lib/gxi-init "\$@"
 fi
@@ -85,8 +94,8 @@ EOF
     description = "Gerbil Scheme";
     homepage    = "https://github.com/vyzo/gerbil";
     license     = stdenv.lib.licenses.lgpl2;
-    # NB regarding platforms: only actually tested on Linux, *should* work everywhere,
-    # but *might* need adaptation e.g. on macOS. Please report success and/or failure to fare.
+    # NB regarding platforms: regularly tested on Linux, only occasionally on macOS.
+    # Please report success and/or failure to fare.
     platforms   = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ fare ];
   };
diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix
index 5f0347aa9a66..eb78eed35ee9 100644
--- a/pkgs/development/compilers/gerbil/unstable.nix
+++ b/pkgs/development/compilers/gerbil/unstable.nix
@@ -1,15 +1,15 @@
 { stdenv, callPackage, fetchFromGitHub, gambit, gambit-unstable }:
 
 callPackage ./build.nix {
-  version = "unstable-2019-11-15";
-  git-version = "0.15.1-461-gee22de62";
+  version = "unstable-2020-02-27";
+  git-version = "0.16-DEV-493-g1ffb74db";
   #gambit = gambit-unstable;
   gambit = gambit;
   src = fetchFromGitHub {
     owner = "vyzo";
     repo = "gerbil";
-    rev = "ee22de628a656ee59c6c72bc25d7b2e25a4ece2f";
-    sha256 = "1n1j596b91k9xcmv22l72nga6wv20bka2q51ik2jw2vkcw8zkc1c";
+    rev = "1ffb74db5ffd49b4bad751586cef5e619c891d41";
+    sha256 = "1szmdp8lvy5gpcwn5bpa7x383m6vywl35xa7hz9a5vs1rq4w2097";
   };
   inherit stdenv;
 }

From 35f00b429b54b01a753a16339305d14a3d9d087e Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 27 Feb 2020 13:25:49 -0800
Subject: [PATCH 1683/4636] libsecret: remove obsolete patch

remove patch that was merged into the 0.20.1 patch.

regression introduced in c6a1e23eb7337ced431644d218e4f684ddde3842
---
 pkgs/development/libraries/libsecret/default.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix
index 9292760c6e66..e4e87eba8587 100644
--- a/pkgs/development/libraries/libsecret/default.nix
+++ b/pkgs/development/libraries/libsecret/default.nix
@@ -11,14 +11,6 @@ stdenv.mkDerivation rec {
     sha256 = "0ir4ynpf8b64xss1azvsi5x6697lik7hkf3z0xxa2qv2xja3xxsp";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "rename-internal-functions-to-avoid-conflicts-and-fix-build.patch";
-      url = "https://gitlab.gnome.org/GNOME/libsecret/commit/cf21ad50b62f7c8e4b22ef374f0a73290a99bdb8.patch";
-      sha256 = "1n9nyzq5qrvw7s6sj5gzj33ia3rrx719jpys1cfhfbayg2sxyd4n";
-    })
-  ];
-
   postPatch = ''
     patchShebangs .
   '';

From b6cad64ef6cbbfe48b920bfab51a41eeefe8b636 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Thu, 27 Feb 2020 16:40:10 -0500
Subject: [PATCH 1684/4636] NixOS/auto-upgrade: Add optional randomized delay

---
 nixos/modules/tasks/auto-upgrade.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/nixos/modules/tasks/auto-upgrade.nix b/nixos/modules/tasks/auto-upgrade.nix
index 7fe066991918..57ca7cd94194 100644
--- a/nixos/modules/tasks/auto-upgrade.nix
+++ b/nixos/modules/tasks/auto-upgrade.nix
@@ -63,6 +63,17 @@ let cfg = config.system.autoUpgrade; in
         '';
       };
 
+      randomizedDelaySec = mkOption {
+        default = "0";
+        type = types.str;
+        example = "45min";
+        description = ''
+          Add a randomized delay to wait before automatically upgrading.
+          The delay will be between zero and this value.
+          This value must be a valid systemd timestamp.
+        '';
+      };
+
     };
 
   };
@@ -109,6 +120,8 @@ let cfg = config.system.autoUpgrade; in
       startAt = cfg.dates;
     };
 
+    systemd.timers.nixos-upgrade.timerConfig.RandomizedDelaySec = cfg.randomizedDelaySec;
+
   };
 
 }

From 70081ecc173a1c7691e6b123d5672acf0bec684f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 27 Feb 2020 21:42:17 +0000
Subject: [PATCH 1685/4636] dnnl: 1.2 -> 1.2.1

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

diff --git a/pkgs/development/libraries/dnnl/default.nix b/pkgs/development/libraries/dnnl/default.nix
index 73a6ff77522f..23824e350016 100644
--- a/pkgs/development/libraries/dnnl/default.nix
+++ b/pkgs/development/libraries/dnnl/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dnnl";
-  version = "1.2";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "mkl-dnn";
     rev = "v${version}";
-    sha256 = "17xpdwqjfb2bq586gnk3hq94r06jd8pk6qfs703qqd7155fkbil9";
+    sha256 = "17bydid5v43lgwvgxv25i67iiyirmwgbdzvv9wpjig34ryhx8hvf";
   };
 
   # Generic fix merged upstream in https://github.com/intel/mkl-dnn/pull/631

From 64b0e3b91f81fb514324bc38a9fd1bebb439b7ab Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 27 Feb 2020 22:41:48 +0000
Subject: [PATCH 1686/4636] fsmon: 1.6.1 -> 1.7.0

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

diff --git a/pkgs/tools/misc/fsmon/default.nix b/pkgs/tools/misc/fsmon/default.nix
index e8e48d7879a7..5e59d34fe4a2 100644
--- a/pkgs/tools/misc/fsmon/default.nix
+++ b/pkgs/tools/misc/fsmon/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fsmon";
-  version = "1.6.1";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "nowsecure";
     repo = "fsmon";
     rev = version;
-    sha256 = "1zpac37biy8jz8234q0krn7pjggz33k0grz590ravbjgfawm1ccy";
+    sha256 = "18p80nmax8lniza324kvwq06r4w2yxcq90ypk2kqym3bnv0jm938";
   };
 
   installPhase = ''
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "FileSystem Monitor utility";
-    homepage = https://github.com/nowsecure/fsmon;
+    homepage = "https://github.com/nowsecure/fsmon";
     license = licenses.mit;
     maintainers = [ maintainers.dezgeg ];
     platforms = platforms.linux;

From 9ab5fbfb96506730b56689a40e9205256483c780 Mon Sep 17 00:00:00 2001
From: dawidsowa <dawid_sowa@posteo.net>
Date: Thu, 27 Feb 2020 23:49:27 +0100
Subject: [PATCH 1687/4636] thinkpad-scripts: init at 4.12.0

---
 pkgs/tools/misc/thinkpad-scripts/default.nix | 22 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/tools/misc/thinkpad-scripts/default.nix

diff --git a/pkgs/tools/misc/thinkpad-scripts/default.nix b/pkgs/tools/misc/thinkpad-scripts/default.nix
new file mode 100644
index 000000000000..5b9b9eae7ad5
--- /dev/null
+++ b/pkgs/tools/misc/thinkpad-scripts/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchFromGitHub, python3Packages }:
+
+buildPythonPackage rec {
+  pname = "thinkpad-scripts";
+  version = "4.12.0";
+
+  src = fetchFromGitHub {
+    owner = "martin-ueding";
+    repo = "thinkpad-scripts";
+    rev = "v${version}";
+    sha256 = "08adx8r5pwwazbnfahay42l5f203mmvcn2ipz5hg8myqc9jxm2ky";
+  };
+
+  propagatedBuildInputs = with python3Packages; [ setuptools ];
+
+  meta = {
+    description = "Screen rotation, docking and other scripts for ThinkPad® X220 and X230 Tablet";
+    homepage = "https://github.com/martin-ueding/thinkpad-scripts";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ dawidsowa ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8143360e49be..bea0ed0f5467 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6653,6 +6653,8 @@ in
 
   thin-provisioning-tools = callPackage ../tools/misc/thin-provisioning-tools {  };
 
+  thinkpad-scripts = python3.pkgs.callPackage ../tools/misc/thinkpad-scripts { };
+
   tiled = libsForQt5.callPackage ../applications/editors/tiled { };
 
   tiledb = callPackage ../development/libraries/tiledb { };

From 5e895e535c180d080ae5b497e195fcff0145a3be Mon Sep 17 00:00:00 2001
From: Evan Stoll <evanjsx@gmail.com>
Date: Tue, 25 Feb 2020 10:28:26 -0500
Subject: [PATCH 1688/4636] ycmd: 2019-09-19 -> 2020-02-22

drop support for python2

ycmd dropped support for python2 with https://github.com/ycm-core/ycmd/pull/1382

youcompleteme dropped support for python2 with https://github.com/ycm-core/YouCompleteMe/pull/3566
---
 pkgs/development/tools/misc/ycmd/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index eac81aa7f171..7befc0fef2d7 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -8,12 +8,13 @@
 
 stdenv.mkDerivation {
   pname = "ycmd";
-  version = "2019-09-19";
+  version = "2020-02-22";
+  disabled = !python.isPy3k;
 
   src = fetchgit {
     url = "https://github.com/Valloric/ycmd.git";
-    rev = "c6d360775b0c5c82e2513dce7b625f8bf3812702";
-    sha256 = "19rxlval20gg65xc5p7q9cnzfm9zw2j0m6vxxk0vqlalcyh0rnzd";
+    rev = "9a6b86e3a156066335b678c328f226229746bae5";
+    sha256 = "1c5axdngxaxj5vc6lr8sxb99mr5adsm1dnjckaxc23kq78pc8cn7";
   };
 
   nativeBuildInputs = [ cmake ];

From 6bb6882e316740d2b2fa21f64f41e0ddd62d75b9 Mon Sep 17 00:00:00 2001
From: Evan Stoll <evanjsx@gmail.com>
Date: Tue, 25 Feb 2020 10:43:47 -0500
Subject: [PATCH 1689/4636] vimPlugins: update

---
 pkgs/misc/vim-plugins/generated.nix | 182 ++++++++++++++--------------
 1 file changed, 91 insertions(+), 91 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 3c5e76e2a4af..e018e3d44793 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -61,12 +61,12 @@ let
 
   ale = buildVimPluginFrom2Nix {
     pname = "ale";
-    version = "2020-02-22";
+    version = "2020-02-25";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "8012809c3f30a767db8395c5b8e3651cdb995635";
-      sha256 = "1g3zws7zi18plvwd6m7wrvj83siczsnwx0yr892v1m0gh7x2452y";
+      rev = "634c81fd465269f59e3db878fe8405828e6d2da9";
+      sha256 = "1lcqyj0yjdhm2kdk0p6pr8avjnb7gm4hg0dygm6fpjz3f078n9py";
     };
   };
 
@@ -160,12 +160,12 @@ let
 
   awesome-vim-colorschemes = buildVimPluginFrom2Nix {
     pname = "awesome-vim-colorschemes";
-    version = "2020-02-23";
+    version = "2020-02-27";
     src = fetchFromGitHub {
       owner = "rafi";
       repo = "awesome-vim-colorschemes";
-      rev = "fc222a81de4734eeccd89e81d66319d4a2e8fee7";
-      sha256 = "08wk7i2p62zghvk7q22z6ac6qidpd58r1pkx5lbxg6l9zv7sb8j3";
+      rev = "b8bdaca805a059eed03a4f439578d373798c6d74";
+      sha256 = "1gmip6fggm5scbry9r1ggaq2fiy5xhwsj6ql24fa5jylyf1gfm26";
     };
   };
 
@@ -347,12 +347,12 @@ let
 
   coc-git = buildVimPluginFrom2Nix {
     pname = "coc-git";
-    version = "2020-02-19";
+    version = "2020-02-27";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-git";
-      rev = "b0b6d913f2faaf02a79542c41cfa4db0c1d9b373";
-      sha256 = "0xg90a2h6g97m3wiakniqk60kdzi4ijgyc1p0bk1cxbj7gxvc7yg";
+      rev = "fc720742d1f7fed7a0737ee92235d743f2a86a12";
+      sha256 = "0qx3wsdnjnfxi6dg3z9pdcqnj2rhwnprz3ypch6ysyshlbvbs9ag";
     };
   };
 
@@ -402,12 +402,12 @@ let
 
   coc-java = buildVimPluginFrom2Nix {
     pname = "coc-java";
-    version = "2019-12-17";
+    version = "2020-02-27";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-java";
-      rev = "4be4a57ad8f888ef92974ccb6e685358498863f1";
-      sha256 = "15175bphaiih5j63bigj5sblcyqjj68g3k81wn7dwgwdpglf1mwf";
+      rev = "4c5124b38f1b2a252bf4713cce67a1bb0cf04b5d";
+      sha256 = "1ygr4dpbjgy3872fc9kaivgbplkyc9l9wmifxkapp9s9ll11c7l0";
     };
   };
 
@@ -446,12 +446,12 @@ let
 
   coc-metals = buildVimPluginFrom2Nix {
     pname = "coc-metals";
-    version = "2020-02-19";
+    version = "2020-02-27";
     src = fetchFromGitHub {
       owner = "ckipp01";
       repo = "coc-metals";
-      rev = "973360108311862d6b49711af20671329d22fef5";
-      sha256 = "0f1chb6f18bqzcrps1nl871k98i91833lp1d2ql2rpl7kk7bsl72";
+      rev = "4dd4685ef44f1a38ea20b373f2a20b82304d68e0";
+      sha256 = "1q165kh4k59ikivs9pwp6w9jla6li8hcln5zbpkxhis6sh9g3bn6";
     };
   };
 
@@ -854,12 +854,12 @@ let
 
   defx-nvim = buildVimPluginFrom2Nix {
     pname = "defx-nvim";
-    version = "2020-02-09";
+    version = "2020-02-27";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "defx.nvim";
-      rev = "17c86251515e18a2791552d88d6142495fa78a69";
-      sha256 = "184mwc8iapjzdysc5fsabdm77kyvr2p2a1azsryji7b65h1pzdal";
+      rev = "f962b9908f48f823b817b7fd61ce9d706bbb41fd";
+      sha256 = "1sv2g6sx9ap71937ky8iysck9q32mracmanc0vnyvffvqy7jwksf";
     };
   };
 
@@ -887,12 +887,12 @@ let
 
   denite-git = buildVimPluginFrom2Nix {
     pname = "denite-git";
-    version = "2020-02-18";
+    version = "2020-02-26";
     src = fetchFromGitHub {
       owner = "chemzqm";
       repo = "denite-git";
-      rev = "52b47c249ba67bc089c9fdcbab5628fc1b767651";
-      sha256 = "000vv7jka1911b9sb8vbb6y25npqrw95nx6wmcj7vnm9pn64izdb";
+      rev = "0c7ffefa872ca19d61ecec6e014a797f0c25e98f";
+      sha256 = "11mz76x7pj2p3k3d8ycjvrwdjrabrdcssw5lr529r9dardkqchzl";
     };
   };
 
@@ -1077,12 +1077,12 @@ let
 
   deoplete-nvim = buildVimPluginFrom2Nix {
     pname = "deoplete-nvim";
-    version = "2020-02-23";
+    version = "2020-02-25";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "ebc9c155b0247314609e8d326e030adb3391f243";
-      sha256 = "1y51fn2lxal6kf7cls913kl51f67in08xhv2waqngv71bd377bjj";
+      rev = "3a8e68d09c6d1a62991c883279f6f647c9e23b7f";
+      sha256 = "0h87i51w0xll2nyib4fqhspdwzh4ynrv1zs74dz7a8nl1v3lzlnx";
     };
   };
 
@@ -1121,12 +1121,12 @@ let
 
   echodoc-vim = buildVimPluginFrom2Nix {
     pname = "echodoc-vim";
-    version = "2020-02-12";
+    version = "2020-02-27";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "echodoc.vim";
-      rev = "42d0ac0f41601f5e09bd9d62d6c14a5de99f0964";
-      sha256 = "19mydl8r6cqmv2z93p7rww0bxvr7b1y1ag8qml5ajfcsfaz9r1i2";
+      rev = "577b7e7d083e37c0c15158cbd761de7cd831e682";
+      sha256 = "1cmp80s4k7sslj4vd919wwlinzmy0yghnczwzrwgk9yf0jclk4nv";
     };
   };
 
@@ -1189,12 +1189,12 @@ let
 
   falcon = buildVimPluginFrom2Nix {
     pname = "falcon";
-    version = "2020-02-07";
+    version = "2020-02-26";
     src = fetchFromGitHub {
       owner = "fenetikm";
       repo = "falcon";
-      rev = "b37f45f0a25dbbebe86470e72d735e110e193b4e";
-      sha256 = "148s39lm13m825ax48p0lrj2bg0i80lli8x18f3xnaqjad0lb1fk";
+      rev = "7128e3a6778347ff7848d9f8a423f63b94e6d9b9";
+      sha256 = "0s4sd982z3f8cppcz4hja788jgcm1gsh6qn8lw9535i6bmphn027";
     };
   };
 
@@ -1586,12 +1586,12 @@ let
 
   jedi-vim = buildVimPluginFrom2Nix {
     pname = "jedi-vim";
-    version = "2020-02-03";
+    version = "2020-02-27";
     src = fetchFromGitHub {
       owner = "davidhalter";
       repo = "jedi-vim";
-      rev = "8d24b837547688f19f3184d99e96a430b3c3722e";
-      sha256 = "1xbk0d4r02hmxj7y33jjazr0ri5a4bw7v29fl5qll3dgqjbijmjm";
+      rev = "686f39ac002ca31acd663ae8749982144484ff95";
+      sha256 = "0ll0rnw00kl58a3dpvcx85dmd5j2figg6cc87qld2mn169qcx354";
       fetchSubmodules = true;
     };
   };
@@ -2027,12 +2027,12 @@ let
 
   neosnippet-snippets = buildVimPluginFrom2Nix {
     pname = "neosnippet-snippets";
-    version = "2020-01-26";
+    version = "2020-02-24";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neosnippet-snippets";
-      rev = "0d7f506538a82b594e3527c58f7b2bccd44d9a85";
-      sha256 = "0clb394pkxwrh14rbll4ffpx45sqgvmlbrr9bl3q58q7b5qhg54d";
+      rev = "aed6074642363d0c97da5cd86e1b23027479df84";
+      sha256 = "1smfyghn7sxdqx867145xyjranvrjaa8s9fp1wvyzb3s3jfwh3mk";
     };
   };
 
@@ -2225,12 +2225,12 @@ let
 
   nvim-lsp = buildVimPluginFrom2Nix {
     pname = "nvim-lsp";
-    version = "2020-02-23";
+    version = "2020-02-25";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lsp";
-      rev = "2dc39ef00bedde68aa7fab7023646a5ff8ca9986";
-      sha256 = "0l6blvqj2fh942farbwk02gfl2skqr59m6zz1kn4drybvr0sdw8k";
+      rev = "1739274e24087565760b35a789a28bc217308ecf";
+      sha256 = "08lmpagkxqgn06375bib8z9k3hm7b6q139vbkzc2hxpbg3xd4jfs";
     };
   };
 
@@ -2632,12 +2632,12 @@ let
 
   seoul256-vim = buildVimPluginFrom2Nix {
     pname = "seoul256-vim";
-    version = "2019-12-13";
+    version = "2020-02-25";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "seoul256.vim";
-      rev = "b68f4032c49b64065072b449dc0f0f1f30616d8d";
-      sha256 = "0bxw0ks5gndzrgixa6xqhnf78b7n75w2jnc3s6bv75lz0fn0gypx";
+      rev = "fb0607ff91ac3b2fb2fa226be12bec1ccef4f1e1";
+      sha256 = "1d2rsxb8ag42ba0bqj9g7ax56v36vch6x2q768q73plagiwr4jzy";
     };
   };
 
@@ -2702,8 +2702,8 @@ let
     src = fetchFromGitHub {
       owner = "jaredgorski";
       repo = "SpaceCamp";
-      rev = "44d2e55286bc04588b35b356e36c56ae15e78ad2";
-      sha256 = "1qzlcp46x4pm6dyf2k4n2rrdh27zj7j719gh853gvhdbvjk650yr";
+      rev = "c35ee8509a9f690366b7d8c04cded9d9f07d8a86";
+      sha256 = "18y7z79469lkcn293zyly306hm7dr1sq9dvnl69nc4a82cdpaha8";
     };
   };
 
@@ -3018,12 +3018,12 @@ let
 
   ultisnips = buildVimPluginFrom2Nix {
     pname = "ultisnips";
-    version = "2020-02-12";
+    version = "2020-02-27";
     src = fetchFromGitHub {
       owner = "SirVer";
       repo = "ultisnips";
-      rev = "a6c9d4fd1b23e1480b973e7cee1fe20c79248b75";
-      sha256 = "1imqxb04gmqf5v4rd3pb26g5px3sd2pgvb6s0l0bg0qxhg8ksq0p";
+      rev = "129d33fc34a72ced857f3cfb72ff10caf10f0020";
+      sha256 = "1hf6d4rr2y4msjxqh0pjpdh6237992497wfj8jy0jalnp2j8icbx";
     };
   };
 
@@ -3040,12 +3040,12 @@ let
 
   unicode-vim = buildVimPluginFrom2Nix {
     pname = "unicode-vim";
-    version = "2020-02-07";
+    version = "2020-02-27";
     src = fetchFromGitHub {
       owner = "chrisbra";
       repo = "unicode.vim";
-      rev = "749a38330c5cfb2557636137a3ab8183004173e6";
-      sha256 = "1lzp691a7q9hvc6vg0gl2v871sgryki3yifza7rdfwaxiam4yy0k";
+      rev = "582b715562c953ea9a1f043443f98793cfbc0d47";
+      sha256 = "1wjmdjn129d8p6nrx69xdrrzg05l930a5lfbrvhyic3aiqn5x1mf";
     };
   };
 
@@ -3337,12 +3337,12 @@ let
 
   vim-airline = buildVimPluginFrom2Nix {
     pname = "vim-airline";
-    version = "2020-02-21";
+    version = "2020-02-27";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "0b2683464877c1e39d0c67427c7fdc4bc6697d15";
-      sha256 = "010cqvszgfvwci1iw8w0kwjdy4284i16yarfcsq5zcd0786sn8s6";
+      rev = "774cd8b08ff1569f86cba78e24ee06e448f86b4f";
+      sha256 = "09hhgsbg5nnmzdpz4wclwgjnkxg2l1rvizhmv0wd7g6sshs9i83w";
     };
   };
 
@@ -3524,12 +3524,12 @@ let
 
   vim-codefmt = buildVimPluginFrom2Nix {
     pname = "vim-codefmt";
-    version = "2020-01-13";
+    version = "2020-02-26";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-codefmt";
-      rev = "af796cf4084a3d32b85313ccc82675d626d40b59";
-      sha256 = "0pbwirsh8nx0dgf82w1sy6az6mpwdnxzy0ycqrx6qxs6bbf1kf74";
+      rev = "6d69f933f243ed3d7797641bd41c0e65d245c931";
+      sha256 = "0vzzyz7v03ihky3vx12rji4l1r6vbxgslvc1fvi4dznfqn5m9gfn";
     };
   };
 
@@ -3722,12 +3722,12 @@ let
 
   vim-dirvish = buildVimPluginFrom2Nix {
     pname = "vim-dirvish";
-    version = "2020-01-26";
+    version = "2020-02-24";
     src = fetchFromGitHub {
       owner = "justinmk";
       repo = "vim-dirvish";
-      rev = "5d84cb9ce7fdf7d3fd729a9d3f59060ca5ab3a6e";
-      sha256 = "0jsssvh1h4kzs51fcgd1gyrkrx6ldf5z3dcnllc26qz4fki1ds89";
+      rev = "0a53fadc22ab6df6aed9cc580c9e498715870522";
+      sha256 = "09q5xpc4xbskzxppp66ypzd5mnic5bcwxahmhb259ch9xs8qmrc6";
     };
   };
 
@@ -4001,8 +4001,8 @@ let
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "31629d8bd18ddb5db6d9c55585d1eeb325a6bb43";
-      sha256 = "1qvhdxha29wj7fw88i72n16m05hd9apfqwf16g6wi6v2nfqfwpnp";
+      rev = "c452181975761f8b055b88eb1c98f736323510fd";
+      sha256 = "0zx9p9y45h26imrzw9nm5balxw7dmv94ynd7cn8mvml29v0awv2g";
     };
   };
 
@@ -4041,12 +4041,12 @@ let
 
   vim-gitgutter = buildVimPluginFrom2Nix {
     pname = "vim-gitgutter";
-    version = "2020-02-13";
+    version = "2020-02-24";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
-      rev = "da2c785221810b3d57479bb4b3678aabf32f3b88";
-      sha256 = "1kgyzraz48c4zlpkz4qxlvzqzmh6dy7qwlq7gz8n8pbpr7kahmhb";
+      rev = "c337eef1b735906411577f488e977be69506ef08";
+      sha256 = "10sz744djns1qn9lh7npzvnmkqbr34zgk78cag6ss45bnczqx1h7";
     };
   };
 
@@ -4074,12 +4074,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2020-02-23";
+    version = "2020-02-27";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "dc02b2192ff2f652379f94791b7c7e311c946068";
-      sha256 = "1h6hb870zqx7wdk49wpcp7rrd70nvvb4wk311j8439z4f6ibfsdq";
+      rev = "1bf0d57e01f930ccc1db3dacb3c169d6dc78d2cb";
+      sha256 = "18imfrn948c20y7ymgh1xqsd82939dswj7hkf0b0fnsi0w9ydddk";
     };
   };
 
@@ -4548,12 +4548,12 @@ let
 
   vim-localvimrc = buildVimPluginFrom2Nix {
     pname = "vim-localvimrc";
-    version = "2020-02-17";
+    version = "2020-02-25";
     src = fetchFromGitHub {
       owner = "embear";
       repo = "vim-localvimrc";
-      rev = "1e3238470d833c8622453245694ba107eca46133";
-      sha256 = "1agiyycrjkh1ajfpfj4vzl9sd3xpxv68c7jrqkxqq0rfg74rksbc";
+      rev = "fc2f789ce7afa4bbdefbbb4599a802b39b7e7596";
+      sha256 = "19drgnsn4rb9kv30ykndwjgflsfs328dhm44a9hcp8f8faqpim3d";
     };
   };
 
@@ -5252,12 +5252,12 @@ let
 
   vim-slime = buildVimPluginFrom2Nix {
     pname = "vim-slime";
-    version = "2020-02-16";
+    version = "2020-02-26";
     src = fetchFromGitHub {
       owner = "jpalardy";
       repo = "vim-slime";
-      rev = "80c04d49b8d3c2a182e5cd745c52153de6ae272c";
-      sha256 = "12k1xq8xmwb7v7i8yx55mpg7fzin0ag2rvxvz77kdiwwni4vdrii";
+      rev = "73449cc1bf3375ce6f92a1018821cdd0ae91959d";
+      sha256 = "1wsrgchjxhircgdvwphvswnl7jq5b63l360wnjjlmcff6nvwhm77";
     };
   };
 
@@ -5307,12 +5307,12 @@ let
 
   vim-snippets = buildVimPluginFrom2Nix {
     pname = "vim-snippets";
-    version = "2020-02-20";
+    version = "2020-02-27";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "35067caeca1c17fa5d38d5de031b26610e939cba";
-      sha256 = "00y608jfrw72wfvzyl82f8m1qxmb1m3c5micncca8qvyjyya07y7";
+      rev = "66975121c7c824cb7c4fa8f2ea53f824e538e3cb";
+      sha256 = "0m1pw3iq29jpp439yzkaszjg1jiz5qkd16vfkskmk2kkg84y3kqn";
     };
   };
 
@@ -5472,23 +5472,23 @@ let
 
   vim-terraform = buildVimPluginFrom2Nix {
     pname = "vim-terraform";
-    version = "2020-02-07";
+    version = "2020-02-27";
     src = fetchFromGitHub {
       owner = "hashivim";
       repo = "vim-terraform";
-      rev = "c8c9bbd70da65e2c0bcba2947c4061a7c3e24e69";
-      sha256 = "0mpzy2y8k5kyz7pvg41pqy88g15mqay8lxhribi288smmbyswsyl";
+      rev = "a0046044670c412bcccc44aa80e5642785fb57a2";
+      sha256 = "0c1qzc3ds7gvsp2vk7cszy11x57angmjwq1skfsk1zz7vgzhcj2i";
     };
   };
 
   vim-test = buildVimPluginFrom2Nix {
     pname = "vim-test";
-    version = "2020-02-19";
+    version = "2020-02-24";
     src = fetchFromGitHub {
       owner = "janko-m";
       repo = "vim-test";
-      rev = "3ffaea971fe579c028242e79d7823dd8e8dbeebd";
-      sha256 = "0f3sn7zkwmdj3adxvclm8yqwkhxlbjzph8jmlr6kyx8xk8axdin8";
+      rev = "1dba5d0328b2d632a418dfc7b417ae83455cc342";
+      sha256 = "0rm1ckriwajhskyybnq83m027lhki8p7c5cykzl5f05ax9rfiva6";
     };
   };
 
@@ -5692,12 +5692,12 @@ let
 
   vim-visual-multi = buildVimPluginFrom2Nix {
     pname = "vim-visual-multi";
-    version = "2020-02-18";
+    version = "2020-02-26";
     src = fetchFromGitHub {
       owner = "mg979";
       repo = "vim-visual-multi";
-      rev = "7417eaf7349db2c904f1ff85e69b14122a1c07ae";
-      sha256 = "14cxpwq0r0c8aq3n6vk5b9rqlazvvjszm9fdlbsrggx52llkpq3z";
+      rev = "32fa278c458d8790a2604a71f3ac3d2500112040";
+      sha256 = "0v7asrgbqz70jq4avpi72338fcrs81bgapyvar18l43k6vgb867a";
     };
   };
 
@@ -5901,12 +5901,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2020-02-18";
+    version = "2020-02-27";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "20f47baff2a981d6d72a8404adfd878c8736e4ee";
-      sha256 = "1bw4fh1c9xi1hfa3c3dpk605zkmg1hr4qnxrl02jlpiy631lalq2";
+      rev = "63593e05440bde5f1f4dbcd30447f410940f94c3";
+      sha256 = "19fxcqbvxx2b60cj03qcaawwi88b7y4wamw9fk278d7q64933h2z";
     };
   };
 
@@ -5945,12 +5945,12 @@ let
 
   vista-vim = buildVimPluginFrom2Nix {
     pname = "vista-vim";
-    version = "2020-02-19";
+    version = "2020-02-27";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "vista.vim";
-      rev = "73ce1d884987910f3c219a99cf659ae4146e6bf4";
-      sha256 = "0815pjnzf3pgvf45y801bzigjq79dscl7xdcs3p7qj4b8afazygg";
+      rev = "6c8173a10633541fe99d54cc693874806e08858c";
+      sha256 = "08p4xkrgzfb9b3r738lnsp4hrly9p5bbzcv446qcflbxmbmy3fw4";
     };
   };
 

From 1e20ec8835fdab9d04518d8bab77b84be3a4e362 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 28 Feb 2020 00:26:52 +0100
Subject: [PATCH 1690/4636] vimPlugins.deoplete-github: init at 2018-03-04

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index e018e3d44793..5f465283d8ed 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -963,6 +963,17 @@ let
     };
   };
 
+  deoplete-github = buildVimPluginFrom2Nix {
+    pname = "deoplete-github";
+    version = "2018-03-04";
+    src = fetchFromGitHub {
+      owner = "SevereOverfl0w";
+      repo = "deoplete-github";
+      rev = "8e30256e50b3914a7e57ea4d5976b6a499fb936f";
+      sha256 = "11n15nqi417sdcqgb6gkk6z4wrrdd8vdbd7wzqpg41140c73v5gm";
+    };
+  };
+
   deoplete-go = buildVimPluginFrom2Nix {
     pname = "deoplete-go";
     version = "2020-01-01";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index af06e12ab6bc..72afd0b0d743 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -398,6 +398,7 @@ scrooloose/nerdcommenter
 scrooloose/nerdtree
 scrooloose/syntastic
 sebastianmarkow/deoplete-rust
+SevereOverfl0w/deoplete-github
 sheerun/vim-polyglot
 Shougo/context_filetype.vim
 Shougo/defx.nvim

From 89790413a6af4cfdebaddc137bb464991b1ce1ac Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 28 Feb 2020 00:27:23 +0100
Subject: [PATCH 1691/4636] vimPlugins.deoplete-greek: init at 2019-12-23

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 5f465283d8ed..b6d8fa84e067 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -986,6 +986,17 @@ let
     };
   };
 
+  deoplete-greek = buildVimPluginFrom2Nix {
+    pname = "deoplete-greek";
+    version = "2019-12-23";
+    src = fetchFromGitHub {
+      owner = "Inazuma110";
+      repo = "deoplete-greek";
+      rev = "aecf3b2f8acfab20c93a6dc88d55260a0df04cbf";
+      sha256 = "086qjbqps05zb2vnyb5q7a67i7al8mxxi86n0h5nsqdd0ws6qqhx";
+    };
+  };
+
   deoplete-jedi = buildVimPluginFrom2Nix {
     pname = "deoplete-jedi";
     version = "2020-02-03";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 72afd0b0d743..bf20a35888b9 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -136,6 +136,7 @@ hsitz/VimOrganizer
 ianks/vim-tsx
 icymind/NeoSolarized
 idris-hackers/idris-vim
+Inazuma110/deoplete-greek
 inkarkat/vim-SyntaxRange
 int3/vim-extradite
 itchyny/calendar.vim

From fbc88db18575a3e4992cad4da4fd6536e9d0aa42 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 28 Feb 2020 01:04:39 +0100
Subject: [PATCH 1692/4636] vimPlugins.deoplete-phpactor: init at 2019-02-22

---
 pkgs/misc/vim-plugins/generated.nix    | 17 ++++++++++++++---
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index b6d8fa84e067..4181ddbdd9dc 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -1053,6 +1053,17 @@ let
     };
   };
 
+  deoplete-phpactor = buildVimPluginFrom2Nix {
+    pname = "deoplete-phpactor";
+    version = "2019-02-22";
+    src = fetchFromGitHub {
+      owner = "kristijanhusak";
+      repo = "deoplete-phpactor";
+      rev = "53e239effb8ff20fc0a192206e96d98d4f9001ad";
+      sha256 = "14097r9fmyp9zxfgv0fj2s52qd1v5cxdckfg4zph7lg3yri1hx9p";
+    };
+  };
+
   deoplete-rust = buildVimPluginFrom2Nix {
     pname = "deoplete-rust";
     version = "2017-07-18";
@@ -1099,12 +1110,12 @@ let
 
   deoplete-nvim = buildVimPluginFrom2Nix {
     pname = "deoplete-nvim";
-    version = "2020-02-25";
+    version = "2020-02-27";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "3a8e68d09c6d1a62991c883279f6f647c9e23b7f";
-      sha256 = "0h87i51w0xll2nyib4fqhspdwzh4ynrv1zs74dz7a8nl1v3lzlnx";
+      rev = "08582f7c52aa53d63f9a7a714fab9137d6ea48f0";
+      sha256 = "1bnz9q6rz95w8xw9vhzhfrfr6r8zdgf0ihylvjaa2kzxir7sngm2";
     };
   };
 
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index bf20a35888b9..7f271aa0adc0 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -205,6 +205,7 @@ kien/rainbow_parentheses.vim
 konfekt/fastfold
 kristijanhusak/defx-git
 kristijanhusak/defx-icons
+kristijanhusak/deoplete-phpactor
 kristijanhusak/vim-hybrid-material
 kshenoy/vim-signature
 lambdalisue/vim-gista

From 11464a5611ba140f3ffa7e99fed9d97f710e6c3c Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 28 Feb 2020 10:56:29 +1000
Subject: [PATCH 1693/4636] tealdeer: 1.2.0 -> 1.3.0

https://github.com/dbrgn/tealdeer/blob/master/CHANGELOG.md#v130-2020-02-28
---
 pkgs/tools/misc/tealdeer/default.nix | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix
index 5e4b1bec1e6e..aa8f9be38b6d 100644
--- a/pkgs/tools/misc/tealdeer/default.nix
+++ b/pkgs/tools/misc/tealdeer/default.nix
@@ -1,25 +1,37 @@
-{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, cacert, curl
+{ stdenv
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, installShellFiles
+, openssl
+, cacert
 , Security
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "tealdeer";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "dbrgn";
     repo = "tealdeer";
     rev = "v${version}";
-    sha256 = "1v9wq4k7k4lmdz6xy6kabchjpbx9lds20yh6va87shypdh9iva29";
+    sha256 = "0l16qqkrya22nnm4j3dxyq4gb85i3c07p10s00bpqcvki6n6v6r8";
   };
 
-  cargoSha256 = "0rr9mqylcs3nb7wgilp810qia0rv2pnalyhh28q0wnqyz0kqfrzr";
+  cargoSha256 = "0jvgcf493rmkrh85j0fkf8ffanva80syyxclzkvkrzvvwwj78b5l";
 
-  buildInputs = [ openssl cacert curl ]
+  buildInputs = [ openssl cacert ]
     ++ (stdenv.lib.optional stdenv.isDarwin Security);
 
-  nativeBuildInputs = [ pkgconfig ];
-  
+  nativeBuildInputs = [ installShellFiles pkg-config ];
+
+  postInstall = ''
+    installShellCompletion --bash --name tealdeer.bash bash_tealdeer
+    installShellCompletion --fish --name tealdeer.fish fish_tealdeer
+    installShellCompletion --zsh --name _tealdeer zsh_tealdeer
+  '';
+
   NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
 
   # disable tests for now since one needs network

From f93ae928aed7d2b803ca6a7df2e087d2f00c1e19 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 21:07:02 -0500
Subject: [PATCH 1694/4636] i3status-rust: upgrade cargo fetcher and
 cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/applications/window-managers/i3/status-rust.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix
index 1899be9a038a..b28c95e6bfb1 100644
--- a/pkgs/applications/window-managers/i3/status-rust.nix
+++ b/pkgs/applications/window-managers/i3/status-rust.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0va6ny1v7lk30hhx4i5qyk9fwg3apy2nmh6kbmxhcf0rs5449ikg";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "099hn0pm9ppply3m3dwns3f5p43rdag2d3niaj8jyc1mnavviwjv";
+  cargoSha256 = "1lywr21kk3idjyc10gy4848dmmgyqc2jjf7hpzq0vywkp639bf2x";
 
   nativeBuildInputs = [ pkgconfig ];
 

From 75c0bbb99039f9bb32b504b7a56e9fdb0f46de0b Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 21:23:08 -0500
Subject: [PATCH 1695/4636] fd: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/fd/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix
index f012aa120eb8..75ca158b5f59 100644
--- a/pkgs/tools/misc/fd/default.nix
+++ b/pkgs/tools/misc/fd/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "108p1p9bxhg4qzwfs6wqcakcvlpqw3w498jkz1vhmg6jp1mbmgdr";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0ylanxcb1vrhvm9h3lvq8nh28362wi5hjy0pqdv5lh40pphcknnz";
+  cargoSha256 = "1nhlarrl0m6as3j2547yf1xxjm88qy3v8jgvhd47z3f5s63bb6w5";
 
   preFixup = ''
     install -Dm644 "$src/doc/fd.1" "$out/man/man1/fd.1"

From af3093420aae5ad727fed0e4e2f823e77a83acaa Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 21:31:11 -0500
Subject: [PATCH 1696/4636] diffr: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/text/diffr/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/text/diffr/default.nix b/pkgs/tools/text/diffr/default.nix
index d93ffa9d090e..9ddaa3468ff3 100644
--- a/pkgs/tools/text/diffr/default.nix
+++ b/pkgs/tools/text/diffr/default.nix
@@ -14,10 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1fpcyl4kc4djfl6a2jlj56xqra42334vygz8n7614zgjpyxz3zx2";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1dddb3a547qnpm1vvrgffb3v9m8sh19hmhy0fg6xjqpm032lqx3v";
+  cargoSha256 = "17xgjk8li29b8q8p2bi56klqg0v2q0j6ich438c4p06jrszccx1f";
 
   nativeBuildInputs = [];
   buildInputs = (stdenv.lib.optional stdenv.isDarwin Security);

From 24a3710b742c2e5ab973eae8dc60f24c49eaa12e Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 21:39:37 -0500
Subject: [PATCH 1697/4636] tensorman: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/tensorman/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/tensorman/default.nix b/pkgs/tools/misc/tensorman/default.nix
index 88d437e56af6..eca80cbcadf3 100644
--- a/pkgs/tools/misc/tensorman/default.nix
+++ b/pkgs/tools/misc/tensorman/default.nix
@@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   buildInputs = [ pkgconfig openssl ];
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1gh5w6zzrvjk60bqaf355fagijy723rvmqjh4laksd96pmzdfwn9";
+  cargoSha256 = "0vckay4jhg02xg68mvh7ys0yjj0p30m6wsjriqc8k24wjsrhiw9k";
 
   meta = with stdenv.lib; {
     description = "Utility for easy management of Tensorflow containers";

From 3c6d7e6ba4cb1d5f5c3d600e9d27a10e278b9efb Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 21:43:41 -0500
Subject: [PATCH 1698/4636] termplay: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/termplay/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/termplay/default.nix b/pkgs/tools/misc/termplay/default.nix
index 7e5b0e7d7361..e988ef5182e2 100644
--- a/pkgs/tools/misc/termplay/default.nix
+++ b/pkgs/tools/misc/termplay/default.nix
@@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   cargoBuildFlags = ["--features" "bin"];
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "15i7qid91awlk74n823im1n6isqanf4vlcal90n1w9izyddzs9j0";
+  cargoSha256 = "0nxm2k8dx6nxyghvpw44wqfd1n65947v2wqxxvy641hin4d7xzma";
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [

From 146f3e3d495fe7f21e34f23023f24b1c4339dda8 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 28 Feb 2020 03:46:23 +0100
Subject: [PATCH 1699/4636] fd: add myself as maintainer

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

diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix
index 75ca158b5f59..3136381dd8eb 100644
--- a/pkgs/tools/misc/fd/default.nix
+++ b/pkgs/tools/misc/fd/default.nix
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://github.com/sharkdp/fd";
     license = with licenses; [ asl20 /* or */ mit ];
-    maintainers = with maintainers; [ dywedir globin ];
+    maintainers = with maintainers; [ dywedir globin ma27 ];
     platforms = platforms.all;
   };
 }

From c51bc2b9fc6855df430b75202da330e07dbc5f55 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 21:50:06 -0500
Subject: [PATCH 1700/4636] ffsend: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/ffsend/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix
index 6637f2d2a4ae..38619f537151 100644
--- a/pkgs/tools/misc/ffsend/default.nix
+++ b/pkgs/tools/misc/ffsend/default.nix
@@ -25,10 +25,7 @@ buildRustPackage rec {
     sha256 = "0yqigqh5vldzmp7wc1mxi5a4bxzm81xycx5h0ghak74vbjibps49";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1wwdnm6a5g4gpd1f89qii8v4f6mcfc1bif1v6mdlcbrpwax5skh4";
+  cargoSha256 = "0m2931fmc8jczjpb08077cpz9klhhf3aq15j2h76sb254qndagzy";
 
   nativeBuildInputs = [ cmake pkgconfig installShellFiles ];
   buildInputs = [ openssl ]

From d9a342e4f20625722b07eaf1fe85bb9bc9c65c14 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 21:56:58 -0500
Subject: [PATCH 1701/4636] rdedup: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/backup/rdedup/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix
index bf4b2eb5351d..b3cf971970a5 100644
--- a/pkgs/tools/backup/rdedup/default.nix
+++ b/pkgs/tools/backup/rdedup/default.nix
@@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0y34a3mpghdmcb2rx4z62q0s351bfmy1287d75mm07ryfgglgsd7";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "19j1xscchnckqq1nddx9nr9wxxv124ab40l4mdalqbkli4zd748j";
+  cargoSha256 = "1zvg68ilgpnd95b36jvna9h1jr5d72x1a0g6flw2x6sd0msc0mdw";
 
   patches = [
     ./v3.1.1-fix-Cargo.lock.patch

From a49d7187aea1383e525fd244bce4a4a6133378d2 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 21:58:56 -0500
Subject: [PATCH 1702/4636] svgcleaner: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/graphics/svgcleaner/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix
index e3cb3334b583..350fdefba5c3 100644
--- a/pkgs/tools/graphics/svgcleaner/default.nix
+++ b/pkgs/tools/graphics/svgcleaner/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1jpnqsln37kkxz98vj7gly3c2170v6zamd876nc9nfl9vns41s0f";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0kzrklw5nrzgvrfzq1mlnri06s19p4f3w38v39247baz2xd6j1n2";
+  cargoSha256 = "1xhwlsq9b6cnafbapm5jf48zqdx5k2vxlr701lh5f8nqvd7nxi6g";
 
   meta = with stdenv.lib; {
     description = "A tool for tidying and optimizing SVGs";

From 26d5e7edffcdf2309504dfbb0044ed271ba8481d Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 22:04:51 -0500
Subject: [PATCH 1703/4636] oxipng: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/graphics/oxipng/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix
index 1998ac67713c..7326e2427d03 100644
--- a/pkgs/tools/graphics/oxipng/default.nix
+++ b/pkgs/tools/graphics/oxipng/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1cx026g1gdvk4qmnrbsmg46y2lizx0wqny25hhdjnh9pwzjc77mh";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1213mg7xhv9ymgm0xqdai5wgammz9n07whw2d42m83208k94zss3";
+  cargoSha256 = "17wgsj2fcxhpsib3ps20sninbf236f9ihf4lnnfrawknmqfvq4s9";
 
   # https://crates.io/crates/cloudflare-zlib#arm-vs-nightly-rust
   cargoBuildFlags = [ "--features=cloudflare-zlib/arm-always" ];

From c8e2a33e1ee0bb2ae3dba9d7941e63c5baf9f909 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 22:10:07 -0500
Subject: [PATCH 1704/4636] fselect: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/fselect/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix
index 5c2e5e3da2d4..2a3813eb184f 100644
--- a/pkgs/tools/misc/fselect/default.nix
+++ b/pkgs/tools/misc/fselect/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1zccl60l557lhaaqb33myys4vp3jsnjqh3dxb22i46bff28s1w6c";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1496zjrkwj5bv08k575m064x0hfk0gpci0dmxvvspj6jf8f8bfm6";
+  cargoSha256 = "0023adx4xkm24p3nwj0j669xns4qf8insalcnlv3r2iv4138w10l";
 
   meta = with stdenv.lib; {
     description = "Find files with SQL-like queries";

From d0b13982c90a5780ce0364216bc263891d70f40f Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 22:11:16 -0500
Subject: [PATCH 1705/4636] lsd: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/lsd/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix
index ae3b57238506..24006e5cbd95 100644
--- a/pkgs/tools/misc/lsd/default.nix
+++ b/pkgs/tools/misc/lsd/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0fh5rz6slyjzz03bpjcl9gplk36vm7qcc0i0gvhsikwvw0cf3hym";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0377jbjkrrjss3w8xmjsjjynycpdk19grp20hffxschg4ryvniin";
+  cargoSha256 = "1z7sg9b7qsjw1hhc7dkvxz8xgf4k8jddr7gbnjr4d2569g97jf3f";
 
   preFixup = ''
     install -Dm644 -t $out/share/zsh/site-functions/ target/release/build/lsd-*/out/_lsd

From 572a63faf8d63332f31c6318c3fc510821dc9fbc Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 28 Feb 2020 04:12:22 +0100
Subject: [PATCH 1706/4636] termplay: switch to fetchFromGitLab

See also https://gitlab.com/jD91mZM2/termplay
---
 pkgs/tools/misc/termplay/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/termplay/default.nix b/pkgs/tools/misc/termplay/default.nix
index e988ef5182e2..a17994706bb3 100644
--- a/pkgs/tools/misc/termplay/default.nix
+++ b/pkgs/tools/misc/termplay/default.nix
@@ -1,14 +1,13 @@
-{ rustPlatform, fetchFromGitHub, lib, makeWrapper, gst_all_1, libsixel }:
+{ rustPlatform, fetchFromGitLab, lib, makeWrapper, gst_all_1, libsixel }:
 
 rustPlatform.buildRustPackage rec {
   pname = "termplay";
   version = "2.0.6";
 
-  src = fetchFromGitHub {
+  src = fetchFromGitLab {
     owner = "jD91mZM2";
     repo = "termplay";
     rev = "v${version}";
-
     sha256 = "1w7hdqgqr1jgxid3k7f2j52wz31gv8bzr9rsm6xzp7nnihp6i45p";
   };
 

From 07f35e7aeeaa622c44e2c5f6ec6c29f2f57dd377 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 22:31:56 -0500
Subject: [PATCH 1707/4636] shotgun: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/graphics/shotgun/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/graphics/shotgun/default.nix b/pkgs/tools/graphics/shotgun/default.nix
index f5dba34202e4..aa9fbf55d86c 100644
--- a/pkgs/tools/graphics/shotgun/default.nix
+++ b/pkgs/tools/graphics/shotgun/default.nix
@@ -15,10 +15,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "tJnF1X+NI1hP0J/n3rGy8TD/yIveqRPVlJvJvn0C7Do=";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "TL2WehcCwygLMVVrBHOX1HgVtDhgVsIgUeiadEjCj1o=";
+  cargoSha256 = "0sbhij8qh9n05nzhp47dm46hbc59awar515f9nhd3wvahwz53zam";
 
   meta = with lib; {
     description = "Minimal X screenshot utility";

From 3d8efecda121f83febc89b45ee89d0625f84b4c5 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 27 Feb 2020 21:50:47 -0600
Subject: [PATCH 1708/4636] symbiyosys: fix calls to external programs

48085826f broke symbiyosys when it needed to call `yosys-abc`: when
`ABCEXTERNAL` is set in the Makefile, then `yosys-abc` is not built.

But in general `sby` was just calling programs out of the ambient
environment. Fix that for most programs it can invoke: it now has a
direct dependency on boolector, aiger, abc, yosys, etc.

This also does some other minor clean up.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../science/logic/symbiyosys/default.nix      | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix
index d6ff7a8b4a73..6b41a44a3583 100644
--- a/pkgs/applications/science/logic/symbiyosys/default.nix
+++ b/pkgs/applications/science/logic/symbiyosys/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchFromGitHub, yosys, bash, python3, yices }:
+{ stdenv, fetchFromGitHub
+, bash, python3, yosys
+, yices, boolector, aiger, abc-verifier
+}:
 
 stdenv.mkDerivation {
   pname = "symbiyosys";
@@ -11,9 +14,24 @@ stdenv.mkDerivation {
     sha256 = "1pwbirszc80r288x81nx032snniqgmc80i09bbha2i3zd0c3pj5h";
   };
 
-  buildInputs = [ python3 yosys ];
+  buildInputs = [ python3 ];
+  patchPhase = ''
+    patchShebangs .
 
-  propagatedBuildInputs = [ yices ];
+    # Fix up Yosys imports
+    substituteInPlace sbysrc/sby.py \
+      --replace "##yosys-sys-path##" \
+                "sys.path += [p + \"/share/yosys/python3/\" for p in [\"$out\", \"${yosys}\"]]"
+
+    # Fix various executable references
+    substituteInPlace sbysrc/sby_core.py \
+      --replace '"/usr/bin/env", "bash"' '"${bash}/bin/bash"' \
+      --replace ': "btormc"'       ': "${boolector}/bin/btormc"' \
+      --replace ': "yosys"'        ': "${yosys}/bin/yosys"' \
+      --replace ': "yosys-smtbmc"' ': "${yosys}/bin/yosys-smtbmc"' \
+      --replace ': "yosys-abc"' ': "${abc-verifier}/bin/abc"' \
+      --replace ': "aigbmc"' ': "${aiger}/bin/aigbmc"' \
+  '';
 
   buildPhase = "true";
   installPhase = ''
@@ -21,19 +39,13 @@ stdenv.mkDerivation {
 
     cp sbysrc/sby_*.py $out/share/yosys/python3/
     cp sbysrc/sby.py $out/bin/sby
-    chmod +x $out/bin/sby
 
-    # Fix up shebang and Yosys imports
-    patchShebangs $out/bin/sby
-    substituteInPlace $out/bin/sby \
-      --replace "##yosys-sys-path##" \
-                "sys.path += [p + \"/share/yosys/python3/\" for p in [\"$out\", \"${yosys}\"]]"
-    substituteInPlace $out/share/yosys/python3/sby_core.py \
-      --replace '"/usr/bin/env", "bash"' '"${bash}/bin/bash"'
+    chmod +x $out/bin/sby
   '';
+
   meta = {
     description = "Tooling for Yosys-based verification flows";
-    homepage    = https://symbiyosys.readthedocs.io/;
+    homepage    = "https://symbiyosys.readthedocs.io/";
     license     = stdenv.lib.licenses.isc;
     maintainers = with stdenv.lib.maintainers; [ thoughtpolice emily ];
     platforms   = stdenv.lib.platforms.all;

From 7e66ce29bfe1a91de153109c469d3b4dee05bbfa Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 27 Feb 2020 21:51:35 -0600
Subject: [PATCH 1709/4636] mcy: init at 2020.02.05

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../science/logic/mcy/default.nix             | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/applications/science/logic/mcy/default.nix

diff --git a/pkgs/applications/science/logic/mcy/default.nix b/pkgs/applications/science/logic/mcy/default.nix
new file mode 100644
index 000000000000..9f239f221b18
--- /dev/null
+++ b/pkgs/applications/science/logic/mcy/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub
+, yosys, symbiyosys, python3
+}:
+
+let
+  python = python3.withPackages (p: with p; [ flask ]);
+in
+stdenv.mkDerivation {
+  pname = "mcy";
+  version = "2020.02.05";
+
+  src = fetchFromGitHub {
+    owner  = "YosysHQ";
+    repo   = "mcy";
+    rev    = "83deeddd12d583a89ad4aa1d2147efa4d6adc33c";
+    sha256 = "1i0cabiqr68zflwzc6z894i4n7k6m3hbfck58vzh8zb9jwxwizav";
+  };
+
+  buildInputs = [ python ];
+  patchPhase = ''
+    substituteInPlace mcy.py \
+      --replace yosys '${yosys}/bin/yosys' \
+      --replace 'os.execvp("mcy-dash"' "os.execvp(\"$out/libexec/mcy/mcy-dash.py\""
+  '';
+
+  # the build needs a bit of work...
+  buildPhase = "true";
+  installPhase = ''
+    mkdir -p $out/bin $out/libexec/mcy
+    install mcy.py $out/bin/mcy && chmod +x $out/bin/mcy
+    install mcy-dash.py $out/libexec/mcy/mcy-dash.py
+  '';
+
+  meta = {
+    description = "Mutation-based coverage testing for hardware designs, with Yosys";
+    homepage    = "https://github.com/YosysHQ/mcy";
+    license     = stdenv.lib.licenses.isc;
+    maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
+    platforms   = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0679f2ddd73b..3004e0fac1ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24503,6 +24503,8 @@ in
 
   symbiyosys = callPackage ../applications/science/logic/symbiyosys {};
 
+  mcy = callPackage ../applications/science/logic/mcy {};
+
   lingeling = callPackage ../applications/science/logic/lingeling {};
 
   ### SCIENCE / ELECTRONICS

From 584a8522101cce3b23fe9f5cdae158af581a3656 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 22:53:52 -0500
Subject: [PATCH 1710/4636] bitwarden_rs: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/security/bitwarden_rs/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix
index 517de33fa88e..ac8091a91045 100644
--- a/pkgs/tools/security/bitwarden_rs/default.nix
+++ b/pkgs/tools/security/bitwarden_rs/default.nix
@@ -25,10 +25,7 @@ in rustPlatform.buildRustPackage rec {
 
   RUSTC_BOOTSTRAP = 1;
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1v6n4aqhd5pyvvhlzhpmq7ykclfxw82wn2bg7n49b53d9p72jwq6";
+  cargoSha256 = "1zzf71d2pr4mkc3xpm58z1apgskw2z8rklly7q23qxkzg5h4qasx";
   cargoBuildFlags = [ featuresFlag ];
 
   checkPhase = ''

From e660d86a4c2ffca569aa370a53af8d6b6ac2b9a2 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 22:59:05 -0500
Subject: [PATCH 1711/4636] rage: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/security/rage/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix
index 088dfc6c5a1a..2bb4e4aeea3e 100644
--- a/pkgs/tools/security/rage/default.nix
+++ b/pkgs/tools/security/rage/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1lfp9vyrk8880j7p5i73zja9dglvl1lvvh7286rwd1a9gbcj6grb";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "09dg43vba8hwivng2h70qmpxnijad171mf02vwjw0gqxk83ql28v";
+  cargoSha256 = "0jjzxzdlflzvy39zi8vwx53xiv66v90idllsfvhj9p9lhc5ssi24";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
 

From bca071a738748e7fa4410deebd0a5050773f600a Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 21:34:52 -0500
Subject: [PATCH 1712/4636] websocat: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/websocat/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix
index 003932551efd..14617f207dbe 100644
--- a/pkgs/tools/misc/websocat/default.nix
+++ b/pkgs/tools/misc/websocat/default.nix
@@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   cargoBuildFlags = [ "--features=ssl" ];
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "163kwpahrbb9v88kjkrc0jx2np3c068pspr8rqrm9cb8jyl2njrr";
+  cargoSha256 = "09chj0bgf4r8v5cjq0hvb84zvh98nrzrh1m0wdqjy5gi7zc30cis";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;

From ccb142916c47ec0bb7587cfa43de37e3ec23a0c2 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Wed, 26 Feb 2020 16:06:51 +0100
Subject: [PATCH 1713/4636] rakudo: 2020.01.1 -> 2020.02

dependencies:
moarvm: 2020.01.1 -> 2020.02
nqp: 2020.01 -> 2020.01

recommended:
zef: 0.8.2 -> 0.8.3
---
 pkgs/development/interpreters/rakudo/default.nix |  4 ++--
 pkgs/development/interpreters/rakudo/moarvm.nix  | 10 +++++-----
 pkgs/development/interpreters/rakudo/nqp.nix     |  4 ++--
 pkgs/development/interpreters/rakudo/zef.nix     |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index 1f832efee89a..ca8d2b2b0dab 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "rakudo";
-  version = "2020.01";
+  version = "2020.02";
 
   src = fetchurl {
     url    = "https://github.com/rakudo/rakudo/releases/download/${version}/rakudo-${version}.tar.gz";
-    sha256 = "1c63ns90zy13gyj0l27k63q7dv08w4589w605nywd7pplbygq0if";
+    sha256 = "0yhld3ij4mfa42chkfph7lzcl5q9b613hdjmw9rv46appmxvvmrs";
   };
 
   buildInputs = [ icu zlib gmp perl ];
diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix
index 48430ef548be..3c5c5f2a2f27 100644
--- a/pkgs/development/interpreters/rakudo/moarvm.nix
+++ b/pkgs/development/interpreters/rakudo/moarvm.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   pname = "moarvm";
-  version = "2020.01.1";
+  version = "2020.02";
 
   src = fetchurl {
-    url    = "https://github.com/MoarVM/MoarVM/releases/download/${version}/MoarVM-${version}.tar.gz";
-    sha256 = "11rmlps6r3nqa9m2yyv9i2imahirsqmxbfay71f3gs4ql121xdnw";
-  };
+    url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz";
+    sha256 = "1kz97yy357lax7xdz4mnnwswn7axhp14nq0dw3n6xbcpap6m82aw";
+   };
 
   buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
   doCheck = false; # MoarVM does not come with its own test suite
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "VM with adaptive optimization and JIT compilation, built for Rakudo";
-    homepage    = "https://github.com/MoarVM/MoarVM";
+    homepage    = "https://www.moarvm.org/";
     license     = licenses.artistic2;
     platforms   = platforms.unix;
     maintainers = with maintainers; [ thoughtpolice vrthra sgo ];
diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix
index 5a93a7f9dad9..84a214201a01 100644
--- a/pkgs/development/interpreters/rakudo/nqp.nix
+++ b/pkgs/development/interpreters/rakudo/nqp.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "nqp";
-  version = "2020.01";
+  version = "2020.02";
 
   src = fetchurl {
     url    = "https://github.com/perl6/nqp/releases/download/${version}/nqp-${version}.tar.gz";
-    sha256 = "0nwn6a9i9akw1zmywhkn631gqy8l4dvy50d6id63zir28ccrrk2c";
+    sha256 = "0ik3fscywxjx1qxlbjf68msz83alpckzw3myj9jmkalvy8q5v0nk";
   };
 
   buildInputs = [ perl ];
diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix
index 5c3597cf289c..9a8c11324a21 100644
--- a/pkgs/development/interpreters/rakudo/zef.nix
+++ b/pkgs/development/interpreters/rakudo/zef.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "zef";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchFromGitHub {
     owner = "ugexe";
     repo = "zef";
     rev = "v${version}";
-    sha256 = "064nbl2hz55mpxdcy9zi39s2z6bad3bj73xsna966a7hzkls0a70";
+    sha256 = "1fscv8fbaa5l8dcwclmq3hvg3c59l4dvyjqb316mgnc5anxpzy2f";
   };
 
   buildInputs = [ rakudo makeWrapper ];

From e0b072a36a86da7ab552fc2abbf68ffb5ca8ae33 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 23:05:34 -0500
Subject: [PATCH 1714/4636] findomain: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/networking/findomain/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix
index b7dd84fd43c0..5f65d9194d19 100644
--- a/pkgs/tools/networking/findomain/default.nix
+++ b/pkgs/tools/networking/findomain/default.nix
@@ -18,10 +18,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1hqvs6h6cfimg0y6hggnmc0mlddajwmh3h36n160n6imq0lfixka";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0brkza04b38hcjjmqz4bkd8gj0n0mrh0p7427007f5xlnhj7hrn4";
+  cargoSha256 = "1agijiq9cxpla2szy0j1n74dpvfsw63pgdscjidr8c00c088pw7g";
 
   nativeBuildInputs = [ installShellFiles perl ];
   buildInputs = lib.optional stdenv.isDarwin Security;

From 3330e84da7db99dda14b5625fc7056a58407eeb1 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 23:07:39 -0500
Subject: [PATCH 1715/4636] hexyl: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/hexyl/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/hexyl/default.nix b/pkgs/tools/misc/hexyl/default.nix
index b3cc549e018b..caef41cb3947 100644
--- a/pkgs/tools/misc/hexyl/default.nix
+++ b/pkgs/tools/misc/hexyl/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1n2q5a6697bxvl0askywhad2x560cajv456gxihdqqmmyq2vf63h";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1wcpbqlglf9r0xhfjmyym8bnd4pgrsf9lrmb14hn1ml5zlshpd7p";
+  cargoSha256 = "0dd7b6iibjmmriwi081pc65crq0y1j2pmbm1iq0lkqdd89c9f1yp";
 
   meta = with stdenv.lib; {
     description = "A command-line hex viewer";

From 556f7c1008a6c6ef75adf6b4be503ec4f364f51c Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 23:14:03 -0500
Subject: [PATCH 1716/4636] miniserve: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/miniserve/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix
index 0231d4df9239..603e24916d60 100644
--- a/pkgs/tools/misc/miniserve/default.nix
+++ b/pkgs/tools/misc/miniserve/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "06cxkkf3sf84prba65dymr1hg7mwizmsax0dlljh0lcmvlcpzi08";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "046xxxqcf1sdsi9dlilsn0nk36gyca20ck1a70ihj1k9kl7yj8sn";
+  cargoSha256 = "1v4rvk6h78797wshw3m0qabb7g4i4mbj1vs5d41izgb0swnzk4vy";
 
   RUSTC_BOOTSTRAP = 1;
 

From f8d59f15673925189c7d6c402964b61b4ba82f44 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 23:17:05 -0500
Subject: [PATCH 1717/4636] pazi: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/pazi/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/pazi/default.nix b/pkgs/tools/misc/pazi/default.nix
index 89ffdde2974e..dd64200e1301 100644
--- a/pkgs/tools/misc/pazi/default.nix
+++ b/pkgs/tools/misc/pazi/default.nix
@@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0nqcp54nwv4ic5jc3cgg15rh8dgkixfgkwb5q47rv8ding4cd0j5";
+  cargoSha256 = "0sja0q9i0b1zb3a0a6z561yg9lqykylwr3iwin4r6cmi7j2sw5j6";
 
   meta = with stdenv.lib; {
     description = "An autojump \"zap to directory\" helper";

From d31aae286512b4c288cc75ddec1a5c6df8842665 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 23:19:22 -0500
Subject: [PATCH 1718/4636] jwt-cli: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/security/jwt-cli/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix
index 06284c52f988..fc40129f6caa 100644
--- a/pkgs/tools/security/jwt-cli/default.nix
+++ b/pkgs/tools/security/jwt-cli/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1q6dqh8z6mhiksjrhi602cvq31jgc18pfbwf6mlm9gi1grpgm5dl";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0k3fla0zz2r66y5fvmbcdhjd2jq8md2sxgcjb3x8sipzqfv8bwi2";
+  cargoSha256 = "1krsr4a1f5rdba4l0i90yr5s8k8hg1np9n85ingx37gar9ahr1y3";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 

From 471d6854338acedefc23a1d11ef85cbe4e630c6d Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 23:22:49 -0500
Subject: [PATCH 1719/4636] lorri: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/lorri/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix
index c4175f77d055..7829a677b431 100644
--- a/pkgs/tools/misc/lorri/default.nix
+++ b/pkgs/tools/misc/lorri/default.nix
@@ -31,10 +31,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1415mhdr0pwvshs04clfz1ys76r5qf9jz8jchm63l6llaj6m7mrv";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1kdpzbn3353yk7i65hll480fcy16wdvppdr6xgfh06x88xhim4mp";
+  cargoSha256 = "1iwd0cad8dp8q5xz2mm7zn1wphr5brkw937dfygc88afj6bv3d68";
   doCheck = false;
 
   BUILD_REV_COUNT = src.revCount or 1;

From b39dbff3bd27c666289fdc2b32f4f0c73ce92e6e Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 23:27:13 -0500
Subject: [PATCH 1720/4636] bukubrow: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/networking/bukubrow/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/bukubrow/default.nix b/pkgs/tools/networking/bukubrow/default.nix
index eeb69417dc7f..2c97e1a17dc0 100644
--- a/pkgs/tools/networking/bukubrow/default.nix
+++ b/pkgs/tools/networking/bukubrow/default.nix
@@ -18,10 +18,7 @@ in rustPlatform.buildRustPackage rec {
     sha256 = "1a3gqxj6d1shv3w0v9m8x2xr0bvcynchy778yqalxkc3x4vr0nbn";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "06nh99cvg3y4f98fs0j5bkidzq6fg46wk47z5jfzz5lf72ha54lk";
+  cargoSha256 = "1k6mffcs9g0z5lh8hpflyharx6653cs1f2rjpldab0fc5fjmjfza";
 
   buildInputs = [ sqlite ];
 

From 1abd618353ef37c9f10af506f52ca6fd5d6145d3 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 23:34:03 -0500
Subject: [PATCH 1721/4636] powerline-rs: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/powerline-rs/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix
index 10844fc30c25..df0d344afaa9 100644
--- a/pkgs/tools/misc/powerline-rs/default.nix
+++ b/pkgs/tools/misc/powerline-rs/default.nix
@@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0rqlxxl58dpfvm2idhi0vzinraf4bgiapmawiih9wxs599fnhm3y";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1vdx5nwj4qmkb3rdgnchd9xixc5pmhvskvn6dmqgm91s41p2al1p";
+  cargoSha256 = "0a41a6kgwgz4040c2369jldvk6xy6s6fkgayca0qy7hdwc4bcxdp";
 
   nativeBuildInputs = [ pkgconfig file perl cmake curl ];
   buildInputs = [ openssl libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security;

From c363e53124d2bb4cac1f1020f3734180ea38235e Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 23:35:34 -0500
Subject: [PATCH 1722/4636] parallel-rust: upgrade cargo fetcher and
 cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/parallel-rust/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/parallel-rust/default.nix b/pkgs/tools/misc/parallel-rust/default.nix
index b4f939da3c96..213e8c8e378a 100644
--- a/pkgs/tools/misc/parallel-rust/default.nix
+++ b/pkgs/tools/misc/parallel-rust/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1bb1m3ckkrxlnw9w24ig70bd1zwyrbaw914q3xz5yv43c0l6pn9c";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0ssawp06fidsppvfzk0balf4fink2vym9688r7k7x7pb2z7cvyqc";
+  cargoSha256 = "1r5chjhmy6ivhsvgqf75ph1qxa4x7n20f7rb3b6maqpbsc64km9n";
 
   patches = [ ./fix_cargo_lock_version.patch ];
 

From de1c66853ef5093c34080a7cb15747593e3ade77 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 23:42:48 -0500
Subject: [PATCH 1723/4636] vivid: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/vivid/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/tools/misc/vivid/default.nix
index 2f665f199587..1696a54d0aa4 100644
--- a/pkgs/tools/misc/vivid/default.nix
+++ b/pkgs/tools/misc/vivid/default.nix
@@ -15,10 +15,7 @@ rustPlatform.buildRustPackage rec {
     substituteInPlace src/main.rs --replace /usr/share $out/share
   '';
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "04xx26ngz7hx7bv5g01q9h6dqa96xkx0xm3jb0qk6c3hp6500zpn";
+  cargoSha256 = "1l34i7qalid9mlcbpqhbb2bxgn2ylb2lwki4c0hf4kkq646ql0n1";
 
   postInstall = ''
     mkdir -p $out/share/${pname}

From 42b1edda9036abec9451879192ca005a683ae8db Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 23:54:43 -0500
Subject: [PATCH 1724/4636] shadowenv: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/shadowenv/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/shadowenv/default.nix b/pkgs/tools/misc/shadowenv/default.nix
index 670d8c193825..71cb3d23bebc 100644
--- a/pkgs/tools/misc/shadowenv/default.nix
+++ b/pkgs/tools/misc/shadowenv/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1s59ra99wcyyqz8gzly4qmcq5rh22c50c75cdi2kyajm7ghgryy9";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0s4p4mpz1p5v9hr4flxlzqvc1b3zbqr3nxp1nxjw39ng9g3hplpg";
+  cargoSha256 = "1nqzg5jnwvf6wiihi3wwrym3d6g0hsfaxcadhl95r3v4k35fn5qb";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
 

From bb8d5b8ac71182743a5cf6d5ca5416ba97370e03 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 27 Feb 2020 23:59:47 -0500
Subject: [PATCH 1725/4636] diskus: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/diskus/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix
index e83d13249d2f..e02811e03ebb 100644
--- a/pkgs/tools/misc/diskus/default.nix
+++ b/pkgs/tools/misc/diskus/default.nix
@@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "07wsl1vw2aimgmrlri03pfcxv13klqxyvmmsbzgnq9sc9qzzy8gp";
+  cargoSha256 = "0bivmjn7h4lfp5azbc6q0xiqq3fk68jdd4kwrwgbxiljg4xd2qy8";
 
   meta = with stdenv.lib; {
     description = "A minimal, fast alternative to 'du -sh'";

From 7dbb5ae0272a1982876b78227b7e0be3d5c735d5 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 28 Feb 2020 00:06:29 -0500
Subject: [PATCH 1726/4636] mcfly: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/mcfly/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix
index ee3d622a47a7..e9ba1c3b5d1f 100644
--- a/pkgs/tools/misc/mcfly/default.nix
+++ b/pkgs/tools/misc/mcfly/default.nix
@@ -17,10 +17,7 @@ rustPlatform.buildRustPackage rec {
     install -Dm644 -t $out/share/mcfly mcfly.bash
   '';
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1bf65kagvhsi6lg8187ihi5j45hkq9d8v6j7rzmmfhngdzvcfr69";
+  cargoSha256 = "0r2zb59rpja9z7q0gsylqaq4vqm5rp57fy56ajjrm6k6z06nq7bv";
 
   meta = with stdenv.lib; {
     homepage = https://github.com/cantino/mcfly;

From 25d102df2c87e2dc5d633e837509254a42184b28 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 28 Feb 2020 00:13:43 -0500
Subject: [PATCH 1727/4636] bandwhich: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/networking/bandwhich/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix
index 39024ff462f9..e42de87f58be 100644
--- a/pkgs/tools/networking/bandwhich/default.nix
+++ b/pkgs/tools/networking/bandwhich/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1c4lndrr7xndgp60zcdjqpciwibm9sjwwrd3921fyz4jg44g76zy";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1sa81570cvvpqgdcpnb08b0q4c6ap8a2wxfp2z336jzbv0zgv8a6";
+  cargoSha256 = "1jnkfiyp5mlwm6bn7i66g5vbbrhps2avlmbilip4346m2j8qc2qv";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 

From 596b3e6dba4422dc5ae2dc6ce5f439b1b5de9186 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 28 Feb 2020 00:20:46 -0500
Subject: [PATCH 1728/4636] uutils-coreutils: upgrade cargo fetcher and
 cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/uutils-coreutils/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix
index 6309cbc19612..9c58785e84ea 100644
--- a/pkgs/tools/misc/uutils-coreutils/default.nix
+++ b/pkgs/tools/misc/uutils-coreutils/default.nix
@@ -14,10 +14,7 @@ rustPlatform.buildRustPackage {
   # too many impure/platform-dependent tests
   doCheck = false;
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0qnpx2xhckb45q8cgn0xh31dg5k73hqp5mz5zg3micmg7as4b621";
+  cargoSha256 = "186hwzdpy7j0gw7491qx02vy4di5md47hipf1xxi1qccvmcfghwh";
 
   makeFlags =
     [ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ]

From a88fa07daff68b99f29b4d1818f8bfc32509b6c7 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 27 Feb 2020 23:59:14 -0600
Subject: [PATCH 1729/4636] fx_cast_bridge: 0.0.5 -> 0.0.6

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

diff --git a/pkgs/tools/misc/fx_cast/default.nix b/pkgs/tools/misc/fx_cast/default.nix
index 5fa57e830d22..5181610a0391 100644
--- a/pkgs/tools/misc/fx_cast/default.nix
+++ b/pkgs/tools/misc/fx_cast/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "fx_cast_bridge";
-  version = "0.0.5";
+  version = "0.0.6";
 
   src = fetchurl {
      url = "https://github.com/hensm/fx_cast/releases/download/v${version}/${pname}-${version}-x64.deb";
-     sha256 = "1qmp1d7miq7c2q8i4bhfp5ywxdngvyi7rjl6i82is2g5nhr7gbvv";
+     sha256 = "1mjpwd27b0cpigz4cc2mdl97d78rj5ikn2bqfdic50lqjciaqi1b";
   };
 
   nativeBuildInputs = [ dpkg ];

From e10900b0683d2bdc827a95d0bcf42f2bf8943ce9 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 28 Feb 2020 01:32:20 -0500
Subject: [PATCH 1730/4636] crystal: use latest openssl

---
 doc/languages-frameworks/crystal.section.md    | 2 +-
 pkgs/development/compilers/crystal/default.nix | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/languages-frameworks/crystal.section.md b/doc/languages-frameworks/crystal.section.md
index 07bfc65a553f..af0853dbf75b 100644
--- a/doc/languages-frameworks/crystal.section.md
+++ b/doc/languages-frameworks/crystal.section.md
@@ -66,6 +66,6 @@ crystal.buildCrystalPackage rec {
   shardsFile = ./shards.nix;
   crystalBinaries.mint.src = "src/mint.cr";
 
-  buildInputs = [ openssl_1_0_2 ];
+  buildInputs = [ openssl ];
 }
 ```
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 5253d6e5a9e3..89dbda4e2a9a 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper
-, coreutils, git, gmp, nettools, openssl_1_0_2, readline, tzdata, libxml2, libyaml
+, coreutils, git, gmp, nettools, openssl, readline, tzdata, libxml2, libyaml
 , boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib, pkgconfig
 , callPackage }:
 
@@ -20,7 +20,7 @@ let
 
   arch = archs.${stdenv.system} or (throw "system ${stdenv.system} not supported");
 
-  checkInputs = [ git gmp openssl_1_0_2 readline libxml2 libyaml ];
+  checkInputs = [ git gmp openssl readline libxml2 libyaml ];
 
   genericBinary = { version, sha256s, rel ? 1 }:
   stdenv.mkDerivation rec {
@@ -39,7 +39,7 @@ let
   };
 
   commonBuildInputs = extraBuildInputs: [
-    boehmgc libatomic_ops pcre libevent libyaml zlib libxml2 openssl_1_0_2
+    boehmgc libatomic_ops pcre libevent libyaml zlib libxml2 openssl
   ] ++ extraBuildInputs
     ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
 

From 18007d5656041b64b3843231087e1083997430ed Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Sat, 22 Feb 2020 17:23:28 -0800
Subject: [PATCH 1731/4636] xv: 0.1.1 -> 0.1.2, rename to xxv

Also update the license.
---
 pkgs/tools/misc/{xv => xxv}/default.nix | 17 +++++++----------
 pkgs/top-level/aliases.nix              |  1 +
 pkgs/top-level/all-packages.nix         |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)
 rename pkgs/tools/misc/{xv => xxv}/default.nix (67%)

diff --git a/pkgs/tools/misc/xv/default.nix b/pkgs/tools/misc/xxv/default.nix
similarity index 67%
rename from pkgs/tools/misc/xv/default.nix
rename to pkgs/tools/misc/xxv/default.nix
index bbf966d1c1f3..6b20c39b1858 100644
--- a/pkgs/tools/misc/xv/default.nix
+++ b/pkgs/tools/misc/xxv/default.nix
@@ -7,20 +7,17 @@ let useNcurses = !stdenv.hostPlatform.isWindows; in
 assert useNcurses -> ncurses != null;
 
 rustPlatform.buildRustPackage rec {
-  pname   = "xv";
-  version = "0.1.1";
+  pname   = "xxv";
+  version = "0.1.2";
 
   src = fetchFromGitHub {
     owner  = "chrisvest";
     repo   = pname;
     rev    = version;
-    sha256 = "0x2yd21sr4wik3z22rknkx1fgb64j119ynjls919za8gd83zk81g";
+    sha256 = "0ppfsgdigza2jppbkg4qanjhlkpnq7p115c4471vc6vpikpfrlk3";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0m69pcmnx3c3q7lgvbhxc8dl6lavv5ch4r6wg2bhdmapcmb4p7jq";
+  cargoSha256 = "1gnyig87a0yqgkng52fpn6hv629vym6k7ydljnxrhb5phmj2qbqx";
 
   buildInputs = lib.optionals useNcurses [ ncurses ]
   ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ])
@@ -33,10 +30,10 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "A visual hex viewer for the terminal";
     longDescription = ''
-      XV is a terminal hex viewer with a text user interface, written in 100% safe Rust.
+      XXV is a terminal hex viewer with a text user interface, written in 100% safe Rust.
     '';
-    homepage    = https://chrisvest.github.io/xv/;
-    license     = with licenses; [ asl20 ];
+    homepage    = "https://chrisvest.github.io/xxv/";
+    license     = with licenses; [ gpl3 ];
     maintainers = with maintainers; [ lilyball ];
     platforms   = platforms.all;
   };
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 42478f38b84d..4601dc37443f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -509,6 +509,7 @@ mapAliases ({
   xf86_input_multitouch = throw "xf86_input_multitouch has been removed from nixpkgs."; # added 2020-01-20
   xlibs = xorg; # added 2015-09
   xpraGtk3 = xpra; # added 2018-09-13
+  xv = xxv; # added 2020-02-22
   youtubeDL = youtube-dl;  # added 2014-10-26
   zdfmediathk = mediathekview; # added 2019-01-19
   gnome_user_docs = gnome-user-docs; # added 2019-11-20
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3004e0fac1ee..ae2e4d664949 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7586,7 +7586,7 @@ in
 
   xurls = callPackage ../tools/text/xurls {};
 
-  xv = callPackage ../tools/misc/xv {};
+  xxv = callPackage ../tools/misc/xxv {};
 
   xvfb_run = callPackage ../tools/misc/xvfb-run { inherit (texFunctions) fontsConf; };
 

From 8de8110ac7420680abe758ddc81f3be970201ef5 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 22 Feb 2020 04:20:00 -0500
Subject: [PATCH 1732/4636] pythonPackages.lazr-uri: init at 1.0.3

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

diff --git a/pkgs/development/python-modules/lazr-uri/default.nix b/pkgs/development/python-modules/lazr-uri/default.nix
new file mode 100644
index 000000000000..d6b3cc29324c
--- /dev/null
+++ b/pkgs/development/python-modules/lazr-uri/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildPythonPackage
+, isPy27
+, fetchPypi
+, setuptools
+}:
+
+buildPythonPackage rec {
+  pname = "lazr.uri";
+  version = "1.0.3";
+
+  disabled = isPy27; # namespace is broken for python2
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "5c620b5993c8c6a73084176bfc51de64972b8373620476ed841931a49752dc8b";
+  };
+
+  propagatedBuildInputs = [ setuptools ];
+
+  meta = with lib; {
+    description = "A self-contained, easily reusable library for parsing, manipulating";
+    homepage = "https://launchpad.net/lazr.uri";
+    license = licenses.lgpl3;
+    maintainers = [ maintainers.marsam ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3eb48b58c506..3f17b353dccb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -823,6 +823,8 @@ in {
 
   lazr_delegates = callPackage ../development/python-modules/lazr/delegates.nix { };
 
+  lazr-uri = callPackage ../development/python-modules/lazr-uri { };
+
   libmr = callPackage ../development/python-modules/libmr { };
 
   limitlessled = callPackage ../development/python-modules/limitlessled { };

From 14780770a70a1027db6f8e32ca6d4c89fc6d2cbf Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 22 Feb 2020 04:21:00 -0500
Subject: [PATCH 1733/4636] pythonPackages.wadllib: init at 1.3.3

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

diff --git a/pkgs/development/python-modules/wadllib/default.nix b/pkgs/development/python-modules/wadllib/default.nix
new file mode 100644
index 000000000000..87555fe774b7
--- /dev/null
+++ b/pkgs/development/python-modules/wadllib/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, setuptools
+, lazr-uri
+}:
+
+buildPythonPackage rec {
+  pname = "wadllib";
+  version = "1.3.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1234cfe81e2cf223e56816f86df3aa18801d1770261865d93337b8b603be366e";
+  };
+
+  propagatedBuildInputs = [ setuptools lazr-uri ];
+
+  doCheck = isPy3k;
+
+  meta = with lib; {
+    description = "Navigate HTTP resources using WADL files as guides";
+    homepage = "https://launchpad.net/wadllib";
+    license = licenses.lgpl3;
+    maintainers = [ maintainers.marsam ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3f17b353dccb..9073348d4011 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6182,6 +6182,8 @@ in {
 
   vultr = callPackage ../development/python-modules/vultr { };
 
+  wadllib = callPackage ../development/python-modules/wadllib { };
+
   waitress = callPackage ../development/python-modules/waitress { };
 
   waitress-django = callPackage ../development/python-modules/waitress-django { };

From e0efde5421d310e24a87252821fa57cc3b916e00 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 22 Feb 2020 04:22:00 -0500
Subject: [PATCH 1734/4636] pythonPackages.lazr-restfulclient: init at 0.14.3

---
 .../lazr-restfulclient/default.nix            | 36 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/python-modules/lazr-restfulclient/default.nix

diff --git a/pkgs/development/python-modules/lazr-restfulclient/default.nix b/pkgs/development/python-modules/lazr-restfulclient/default.nix
new file mode 100644
index 000000000000..93956c51b256
--- /dev/null
+++ b/pkgs/development/python-modules/lazr-restfulclient/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, isPy27
+, fetchPypi
+, distro
+, httplib2
+, oauthlib
+, setuptools
+, six
+, wadllib
+}:
+
+buildPythonPackage rec {
+  pname = "lazr.restfulclient";
+  version = "0.14.3";
+
+  disabled = isPy27; # namespace is broken for python2
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "9f28bbb7c00374159376bd4ce36b4dacde7c6b86a0af625aa5e3ae214651a690";
+  };
+
+  propagatedBuildInputs = [ distro httplib2 oauthlib setuptools six wadllib ];
+
+  doCheck = false; # requires to package lazr.restful, lazr.authentication, and wsgi_intercept
+
+  pythonImportsCheck = [ "lazr.restfulclient" ];
+
+  meta = with lib; {
+    description = "A programmable client library that takes advantage of the commonalities among";
+    homepage = "https://launchpad.net/lazr.restfulclient";
+    license = licenses.lgpl3;
+    maintainers = [ maintainers.marsam ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9073348d4011..5e8856266f21 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -823,6 +823,8 @@ in {
 
   lazr_delegates = callPackage ../development/python-modules/lazr/delegates.nix { };
 
+  lazr-restfulclient = callPackage ../development/python-modules/lazr-restfulclient { };
+
   lazr-uri = callPackage ../development/python-modules/lazr-uri { };
 
   libmr = callPackage ../development/python-modules/libmr { };

From 52e4c7516f8f40c3bdbe87116351a556c2d306a9 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 22 Feb 2020 04:23:00 -0500
Subject: [PATCH 1735/4636] pythonPackages.launchpadlib: init at 1.10.10

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

diff --git a/pkgs/development/python-modules/launchpadlib/default.nix b/pkgs/development/python-modules/launchpadlib/default.nix
new file mode 100644
index 000000000000..72e3c7f1cf77
--- /dev/null
+++ b/pkgs/development/python-modules/launchpadlib/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+, httplib2
+, keyring
+, lazr-restfulclient
+, lazr-uri
+, setuptools
+, six
+, testresources
+, wadllib
+}:
+
+buildPythonPackage rec {
+  pname = "launchpadlib";
+  version = "1.10.10";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "740580d72611452804ad7735c9af6944ed4a14fc1a2fcbcddba3fc719b5317f3";
+  };
+
+  propagatedBuildInputs = [
+    httplib2
+    keyring
+    lazr-restfulclient
+    lazr-uri
+    setuptools
+    six
+    testresources
+    wadllib
+  ];
+
+  preCheck = ''
+    export HOME=$TMPDIR
+  '';
+
+  doCheck = isPy3k;
+
+  meta = with lib; {
+    description = "Script Launchpad through its web services interfaces. Officially supported";
+    homepage = "https://help.launchpad.net/API/launchpadlib";
+    license = licenses.lgpl3;
+    maintainers = [ maintainers.marsam ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5e8856266f21..39d50778a428 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -819,6 +819,8 @@ in {
 
   langdetect = callPackage ../development/python-modules/langdetect { };
 
+  launchpadlib = callPackage ../development/python-modules/launchpadlib { };
+
   lazr_config = callPackage ../development/python-modules/lazr/config.nix { };
 
   lazr_delegates = callPackage ../development/python-modules/lazr/delegates.nix { };

From 4e50a048d15351e211dceaff504c5dfbf900d52c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 22 Feb 2020 04:24:00 -0500
Subject: [PATCH 1736/4636] breezy: init at 3.0.2

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

diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix
new file mode 100644
index 000000000000..79a80451d028
--- /dev/null
+++ b/pkgs/development/python-modules/breezy/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, configobj
+, six
+, fastimport
+, dulwich
+, launchpadlib
+, testtools
+}:
+
+buildPythonPackage rec {
+  pname = "breezy";
+  version = "3.0.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "50f16bc7faf299f98fe58573da55b0664078f94b1a0e7f0ce9e1e6a0d47e68e0";
+  };
+
+  propagatedBuildInputs = [ configobj six fastimport dulwich launchpadlib ];
+
+  checkInputs = [ testtools ];
+
+  # There is a conflict with their `lazy_import` and plugin tests
+  doCheck = false;
+
+  # symlink for bazaar compatibility
+  postInstall = ''
+    ln -s "$out/bin/brz" "$out/bin/bzr"
+  '';
+
+  pythonImportsCheck = [ "breezy" ];
+
+  meta = with lib; {
+    description = "Friendly distributed version control system";
+    homepage = "https://www.breezy-vcs.org/";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.marsam ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 203099fa457a..1d8b08c97b03 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18449,6 +18449,8 @@ in
 
   brave = callPackage ../applications/networking/browsers/brave { };
 
+  breezy = with python3Packages; toPythonApplication breezy;
+
   notmuch-bower = callPackage ../applications/networking/mailreaders/notmuch-bower { };
 
   brig = callPackage ../applications/networking/brig { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 39d50778a428..53b7eba5f30c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -502,6 +502,8 @@ in {
 
   braintree = callPackage ../development/python-modules/braintree { };
 
+  breezy = callPackage ../development/python-modules/breezy { };
+
   deepdiff = callPackage ../development/python-modules/deepdiff { };
 
   django-sesame = callPackage ../development/python-modules/django-sesame { };

From 6f63f323a60dc291c0c52dbb5440380a27baea43 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 28 Feb 2020 01:08:36 -0500
Subject: [PATCH 1737/4636] loop: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/loop/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix
index e3d8d15922d6..2b5bb1989f42 100644
--- a/pkgs/tools/misc/loop/default.nix
+++ b/pkgs/tools/misc/loop/default.nix
@@ -10,10 +10,7 @@ rustPlatform.buildRustPackage {
     sha256 = "0f33sc1slg97q1aisdrb465c3p7fgdh2swv8k3yphpnja37f5nl4";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "19x8n39yaa924naldw6fv7mq9qb500arkhwj9jz2fsbhz5nz607r";
+  cargoSha256 = "1ydd0sd4lvl6fdl4b13ncqcs03sbxb6v9dwfyqi64zihqzpblshv";
 
   meta = with stdenv.lib; {
     description = "UNIX's missing `loop` command";

From d6f23a291ce88f9fe85cabc4e9e90e390c0502c5 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 28 Feb 2020 01:34:10 -0500
Subject: [PATCH 1738/4636] void: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/void/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/void/default.nix b/pkgs/tools/misc/void/default.nix
index 7e570d21f7ae..f71151259c88 100644
--- a/pkgs/tools/misc/void/default.nix
+++ b/pkgs/tools/misc/void/default.nix
@@ -14,10 +14,7 @@ rustPlatform.buildRustPackage rec {
   # The tests are long-running and not that useful
   doCheck = false;
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "03g7155jpg8k1ymk95m8rlhlszkxyq0rv32966n4gk5yziijvk4k";
+  cargoSha256 = "0fnkcjxcsiw9j0ibh4z7zy0m6r5d84q5hvr2darwpckbn9ryrh3k";
 
   meta = with stdenv.lib; {
     description = "Terminal-based personal organizer";

From fdb98b936ff52624d4325f16a7f4ecc1705eeb4f Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 28 Feb 2020 01:49:48 -0500
Subject: [PATCH 1739/4636] clog-cli: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/development/tools/clog-cli/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix
index 696a0264767c..23c0fc06b6ac 100644
--- a/pkgs/development/tools/clog-cli/default.nix
+++ b/pkgs/development/tools/clog-cli/default.nix
@@ -13,10 +13,7 @@ buildRustPackage rec {
     sha256 = "1wxglc4n1dar5qphhj5pab7ps34cjr7jy611fwn72lz0f6c7jp3z";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1i1aq7bwkx8sqrlpxq24ldh908j72lwi2r3sg9zaz5p8xq1xgq6p";
+  cargoSha256 = "1s7g9mcjyp0pjjxma1mb290fi7fk54qy2khh1zksxhr4d3mciv08";
 
   meta = {
     description = "Generate changelogs from local git metadata";

From f336bf0f43e271cb22e18d4ff8d1e5d26ac13409 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 28 Feb 2020 01:32:27 -0500
Subject: [PATCH 1740/4636] kak-lsp: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/kak-lsp/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/kak-lsp/default.nix b/pkgs/tools/misc/kak-lsp/default.nix
index 55a3cf409eb1..4bcfd81f71de 100644
--- a/pkgs/tools/misc/kak-lsp/default.nix
+++ b/pkgs/tools/misc/kak-lsp/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1b9v417g0z9q1sqgnms5vy740xggg4fcz0fdwbc4hfvfj6jkyaad";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0kzrrphlilnyl79yfmlvd6an8iyi8zcs0inwiq74z383lnbdpk7q";
+  cargoSha256 = "1cmms8kvh24sjb0w77i1bwl09wkx3x65p49pkg1j0lipwic3apm3";
 
   buildInputs = lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 

From 28fa2d6f6fb18cd381594e5bed00d29dcb3ceef2 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 28 Feb 2020 00:54:17 -0500
Subject: [PATCH 1741/4636] tox-node: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/networking/tox-node/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix
index 3b94c61a7131..6f9ee7355df9 100644
--- a/pkgs/tools/networking/tox-node/default.nix
+++ b/pkgs/tools/networking/tox-node/default.nix
@@ -31,10 +31,7 @@ buildRustPackage rec {
 
   doCheck = false;
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1nv0630yb8k857n7km4bbgf41j747xdxv7xnc6a9746qpggmdbkh";
+  cargoSha256 = "1ka22krw8s05vpamg9naqqf7vv5h8dkpfdik0wy8nispkrxzgb92";
 
   meta = with stdenv.lib; {
     description = "A server application to run tox node written in pure Rust";

From e7f7cd262d94f2501013eb9a32abc98d09c71568 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 28 Feb 2020 00:33:17 -0500
Subject: [PATCH 1742/4636] shell-hist: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/shell-hist/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/shell-hist/default.nix b/pkgs/tools/misc/shell-hist/default.nix
index 19f69655bbf9..fd30d0370d80 100644
--- a/pkgs/tools/misc/shell-hist/default.nix
+++ b/pkgs/tools/misc/shell-hist/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage {
     sha256 = "0kc128xnnp1d56if70vfv0w3qnwhljhbnvzwwb7hfm3x2m0vqrqf";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1nqnkzwqk879qy1261g1gds668xz6islhzq7chzhilaqpmvf6039";
+  cargoSha256 = "0mfgax937na351qvi5n6s1ql9136djqiydzyfyax4684sp3kp613";
 
   meta = with lib; {
     description = "Inspect your shell history";

From d07ca7253a16851382deda6d827b91b0afd28169 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 28 Feb 2020 00:38:53 -0500
Subject: [PATCH 1743/4636] watchexec: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/watchexec/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix
index 26fc7107d41e..eede909ddceb 100644
--- a/pkgs/tools/misc/watchexec/default.nix
+++ b/pkgs/tools/misc/watchexec/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "03s9nsss4895x4lp90y65jajavk8c2nj1jjnmx0vbbwl210ghlv1";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "07whi9w51ddh8s7v06c3k6n5q9gfx74rdkhgfysi180y2rgnbanj";
+  cargoSha256 = "0p20d7paiafvl4k9iiazbgq75wk7k42sz2h1y5lalq16f5rp6dbp";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 7a7727af0974e858bd4ee1c66b80c3ef25061696 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 28 Feb 2020 15:41:08 +1000
Subject: [PATCH 1744/4636] picard: 2.3 -> 2.3.1

https://github.com/metabrainz/picard/releases/tag/release-2.3.1
---
 pkgs/applications/audio/picard/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index d6cf17c159f4..b241f750d036 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -4,13 +4,13 @@ let
   pythonPackages = python3Packages;
 in pythonPackages.buildPythonApplication rec {
   pname = "picard";
-  version = "2.3";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "metabrainz";
     repo = pname;
     rev = "release-${version}";
-    sha256 = "0msdnp6wh97lnm3m084jsvbp95h5d35y5fm71j64cgf4g39zp5ds";
+    sha256 = "0xalg4dvaqb396h4s6gzxnplgv1lcvsczmmrlhyrj0kfj10amhsj";
   };
 
   nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ];
@@ -33,7 +33,7 @@ in pythonPackages.buildPythonApplication rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://musicbrainz.org/doc/MusicBrainz_Picard;
+    homepage = "https://picard.musicbrainz.org/";
     description = "The official MusicBrainz tagger";
     maintainers = with maintainers; [ ehmry ];
     license = licenses.gpl2;

From 4c754602cf7a2302395d1754c966d1f21ad8f79d Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 28 Feb 2020 00:30:40 -0500
Subject: [PATCH 1745/4636] tdns-cli: upgrade cargo fetcher and cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/networking/tdns-cli/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/tdns-cli/default.nix b/pkgs/tools/networking/tdns-cli/default.nix
index 4ad924ee5b55..20bc456eea80 100644
--- a/pkgs/tools/networking/tdns-cli/default.nix
+++ b/pkgs/tools/networking/tdns-cli/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0nn036in5j1h0vxkwif0lf7fn900zy4f4kxlzy6qdx3jakgmxvwh";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0h41ws3jcxb90mhnznckfkfv0mpx6ykga7087bipbaw2fqhr7izd";
+  cargoSha256 = "0v1hx6kjsmydx6ckjqj31y2gcpvax4mshwrniicplkka3q6hx9ra";
 
   meta = with stdenv.lib; {
     description = "DNS tool that aims to replace dig and nsupdate";

From 38d58b29174e6b9b465108e0f3a78cac53715016 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 28 Feb 2020 00:27:08 -0500
Subject: [PATCH 1746/4636] shadowsocks-rust: upgrade cargo fetcher and
 cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/networking/shadowsocks-rust/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix
index d746d1f42b53..973d0287149b 100644
--- a/pkgs/tools/networking/shadowsocks-rust/default.nix
+++ b/pkgs/tools/networking/shadowsocks-rust/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0w7ysha46ml3j1i1knvll4pmqg291z8a2ypcy650m61dhrvkh2ng";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "18nlvqa9ha4vs9xb60hivhgcsqr69zsigfmqyig48slvwgqkbwda";
+  cargoSha256 = "0srmn8ndy7vdvcysyb7a5pjly0m3jchq0zrqzhrwicynm291w56h";
 
   buildInputs = [ openssl libsodium ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];

From 6a54fd3acfc33e6d06af319e1359713f8c052b81 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 28 Feb 2020 01:41:11 -0500
Subject: [PATCH 1747/4636] whitebox-tools: upgrade cargo fetcher and
 cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/applications/gis/whitebox-tools/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix
index 8ff2ed36fdc3..a10e62be4673 100644
--- a/pkgs/applications/gis/whitebox-tools/default.nix
+++ b/pkgs/applications/gis/whitebox-tools/default.nix
@@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0zn4b4md3pn1rvb15rnz3zcx9a359x26nfy7zcfp7nx27ais13n5";
+  cargoSha256 = "13k21akyfqgamywj39bw73sldby1s02vyvxfglxbaqq1x96xcy4i";
 
   # failures: structures::polyline::test::test_polyline_split
   doCheck = false;

From 865b27c3227c6316df2be53c32428ed9dcd2e711 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 28 Feb 2020 00:43:04 -0500
Subject: [PATCH 1748/4636] journaldriver: upgrade cargo fetcher and
 cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/misc/journaldriver/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/tools/misc/journaldriver/default.nix
index be199f7eb0af..77df7ab6908a 100644
--- a/pkgs/tools/misc/journaldriver/default.nix
+++ b/pkgs/tools/misc/journaldriver/default.nix
@@ -3,10 +3,7 @@
 rustPlatform.buildRustPackage rec {
   pname = "journaldriver";
   version     = "1.1.0";
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0wmr0r54ar7gvhvhv76a49ap74lx8hl79bf73vc4f4xlj7hj303g";
+  cargoSha256 = "1vyc9pglppfz5idahvcj01wpmmm6jw043zk896wdksywa5zcqn28";
 
   src = fetchFromGitHub {
     owner  = "tazjin";

From 644b931c49eaa740529bd19e6a02e384ec84466d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 21 Feb 2020 09:18:51 +0100
Subject: [PATCH 1749/4636] =?UTF-8?q?ocamlPackages.javalib:=203.1.1=20?=
 =?UTF-8?q?=E2=86=92=203.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ocamlPackages.sawja: 1.5.7 → 1.5.8
---
 .../ocaml-modules/javalib/default.nix         |  4 ++--
 .../ocaml-modules/sawja/default.nix           | 19 ++++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix
index c7586ad23e42..91ccbc9ca9ea 100644
--- a/pkgs/development/ocaml-modules/javalib/default.nix
+++ b/pkgs/development/ocaml-modules/javalib/default.nix
@@ -8,11 +8,11 @@ else
 
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-javalib-${version}";
-  version = "3.1.1";
+  version = "3.2.1";
 
   src = fetchzip {
     url = "https://github.com/javalib-team/javalib/archive/v${version}.tar.gz";
-    sha256 = "1myrf7kw7pi04pmp0bi4747nj4h4vfxlla05sz2hp4w8k76iscld";
+    sha256 = "1fkdaiiza145yv0r1cm0n2hsrr0rbn6b27vs66njgv405zwn3vbn";
   };
 
   buildInputs = [ which ocaml findlib ];
diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix
index d0dba6c2ceec..c6cda7d05736 100644
--- a/pkgs/development/ocaml-modules/sawja/default.nix
+++ b/pkgs/development/ocaml-modules/sawja/default.nix
@@ -1,19 +1,24 @@
-{stdenv, fetchurl, which, perl, ocaml, findlib, javalib }:
-
-assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
+{ stdenv, fetchFromGitHub, which, perl, ocaml, findlib, javalib }:
 
 let
   pname = "sawja";
-  version = "1.5.7";
+  version = "1.5.8";
   webpage = "http://sawja.inria.fr/";
 in
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.07"
+then throw "${pname} is not available for OCaml ${ocaml.version}"
+else
+
 stdenv.mkDerivation {
 
   name = "ocaml${ocaml.version}-${pname}-${version}";
 
-  src = fetchurl {
-    url = https://gforge.inria.fr/frs/download.php/file/38117/sawja-1.5.7.tar.bz2;
-    sha256 = "08xv1bq4pragc1g93w4dnbn0mighcjwfp3ixj9jzmhka2vzqm4cc";
+  src = fetchFromGitHub {
+    owner = "javalib-team";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0rawr0jav33rvagm8sxc0arc7ya1fd9w5nng3lhfk8p02f9z8wrp";
   };
 
   buildInputs = [ which perl ocaml findlib ];

From ca55015ed8270616118154f4b3cf20cb1fd75cd4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 28 Feb 2020 11:09:24 +0100
Subject: [PATCH 1750/4636] Revert "meson: 0.52.1 -> 0.53.2"

This reverts commit d607564d6824612f3c9f8a4e7d5477981a1b1193.

should go to staging
---
 .../tools/build-managers/meson/default.nix          | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index f9f4c344e322..e4d4994a7814 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -1,5 +1,6 @@
 { lib
 , python3Packages
+, fetchpatch
 , stdenv
 , writeTextDir
 , substituteAll
@@ -19,11 +20,11 @@ let
 in
 python3Packages.buildPythonApplication rec {
   pname = "meson";
-  version = "0.53.2";
+  version = "0.52.1";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "Po+DDzMYQ5fC6wtlHsUCrbY97LKJeL3ISzVY1xKEwh8=";
+    sha256 = "02fnrk1fjf3yiix0ak0m9vgbpl4h97fafii5pmw7phmvnlv9fyan";
   };
 
   postFixup = ''
@@ -61,6 +62,14 @@ python3Packages.buildPythonApplication rec {
       src = ./fix-rpath.patch;
       inherit (builtins) storeDir;
     })
+
+    # Fix detecting incorrect compiler in the store path hash.
+    # https://github.com/NixOS/nixpkgs/issues/73417#issuecomment-554077964
+    # https://github.com/mesonbuild/meson/pull/6185
+    (fetchpatch {
+      url = "https://github.com/mesonbuild/meson/commit/972ede1d14fdf17fe5bb8fb99be220f9395c2392.patch";
+      sha256 = "19bfsylhpy0b2xv3ks8ac9x3q6vvvyj1wjcy971v9d5f1455xhbb";
+    })
   ];
 
   setupHook = ./setup-hook.sh;

From 65336dc3cf71686e30390270c1c3f07f9c0cc830 Mon Sep 17 00:00:00 2001
From: Millian Poquet <millian.poquet@inria.fr>
Date: Sat, 22 Feb 2020 12:37:36 +0100
Subject: [PATCH 1751/4636] meson: 0.52.1 -> 0.53.2

https://mesonbuild.com/Release-notes-for-0-53-0.html

https://github.com/mesonbuild/meson/releases/tag/0.53.0
https://github.com/mesonbuild/meson/releases/tag/0.53.1
https://github.com/mesonbuild/meson/releases/tag/0.53.2
---
 .../tools/build-managers/meson/default.nix          | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index e4d4994a7814..f9f4c344e322 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -1,6 +1,5 @@
 { lib
 , python3Packages
-, fetchpatch
 , stdenv
 , writeTextDir
 , substituteAll
@@ -20,11 +19,11 @@ let
 in
 python3Packages.buildPythonApplication rec {
   pname = "meson";
-  version = "0.52.1";
+  version = "0.53.2";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "02fnrk1fjf3yiix0ak0m9vgbpl4h97fafii5pmw7phmvnlv9fyan";
+    sha256 = "Po+DDzMYQ5fC6wtlHsUCrbY97LKJeL3ISzVY1xKEwh8=";
   };
 
   postFixup = ''
@@ -62,14 +61,6 @@ python3Packages.buildPythonApplication rec {
       src = ./fix-rpath.patch;
       inherit (builtins) storeDir;
     })
-
-    # Fix detecting incorrect compiler in the store path hash.
-    # https://github.com/NixOS/nixpkgs/issues/73417#issuecomment-554077964
-    # https://github.com/mesonbuild/meson/pull/6185
-    (fetchpatch {
-      url = "https://github.com/mesonbuild/meson/commit/972ede1d14fdf17fe5bb8fb99be220f9395c2392.patch";
-      sha256 = "19bfsylhpy0b2xv3ks8ac9x3q6vvvyj1wjcy971v9d5f1455xhbb";
-    })
   ];
 
   setupHook = ./setup-hook.sh;

From 67e1df4422c5abca5cd9f8aac15a779e219abb77 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 28 Feb 2020 18:52:56 +0800
Subject: [PATCH 1752/4636] peruse: 1.2.2018016 -> 1.2.20200208

---
 pkgs/tools/misc/peruse/default.nix | 56 +++++++++++++++++++++---------
 1 file changed, 39 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix
index a5ce018545a7..264631120068 100644
--- a/pkgs/tools/misc/peruse/default.nix
+++ b/pkgs/tools/misc/peruse/default.nix
@@ -1,33 +1,55 @@
-{
-  mkDerivation, fetchFromGitHub, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
-  baloo, karchive, kconfig, kcrash, kfilemetadata, kinit, kirigami2, knewstuff, plasma-framework
+{ mkDerivation
+, fetchFromGitHub
+, lib
+, extra-cmake-modules
+, kdoctools
+, wrapGAppsHook
+, baloo
+, karchive
+, kconfig
+, kcrash
+, kfilemetadata
+, kinit
+, kirigami2
+, knewstuff
+, plasma-framework
 }:
 
-let
+mkDerivation rec {
   pname = "peruse";
-  version = "1.2.20180816";
-
-in mkDerivation {
-  name = "${pname}-${version}";
+  version = "1.2.20200208";
 
   # The last formal release from 2016 uses kirigami1 which is deprecated
   src = fetchFromGitHub {
-    owner  = "KDE";
-    repo   = pname;
-    rev    = "f50027c6c9c680c4e2ce1dba4ec43364e661e7a3";
-    sha256 = "1217fa6w9ryh499agcc67mnp8k9dah4r0sw74qzsbk4p154jbgch";
+    owner = "KDE";
+    repo = pname;
+    rev = "4a1b3f954d2fe7e4919c0c5dbee1917776da582e";
+    sha256 = "1s5yy240x4cvrk93acygnrp5m10xp7ln013gdfbm0r5xvd8xy19k";
   };
 
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+    wrapGAppsHook
+  ];
 
-  propagatedBuildInputs = [ baloo karchive kconfig kcrash kfilemetadata kinit kirigami2 knewstuff plasma-framework ];
+  propagatedBuildInputs = [
+    baloo
+    karchive
+    kconfig
+    kcrash
+    kfilemetadata
+    kinit
+    kirigami2
+    knewstuff
+    plasma-framework
+  ];
 
-  pathsToLink = [ "/etc/xdg/peruse.knsrc"];
+  pathsToLink = [ "/etc/xdg/peruse.knsrc" ];
 
   meta = with lib; {
-    homepage = "https://peruse.kde.org";
     description = "A comic book reader";
+    homepage = "https://peruse.kde.org";
     license = licenses.gpl2;
     maintainers = with maintainers; [ peterhoeg ];
   };

From dd413d4c2d0fdbbf359b0a9005908fa4464f5e4f Mon Sep 17 00:00:00 2001
From: Joao Neves <sevenjp@gmail.com>
Date: Fri, 21 Feb 2020 16:41:23 +0100
Subject: [PATCH 1753/4636] bazel: 2.0.0 -> 2.1.0

---
 .../tools/build-managers/bazel/default.nix       |  8 ++++----
 .../tools/build-managers/bazel/src-deps.json     | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 884f0253f1a5..a1eb69ea7a54 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -25,11 +25,11 @@
 }:
 
 let
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchurl {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    sha256 = "1fvc7lakdczim1i99hrwhwx2w75afd3q9fgbhrx7i3pnav3a6kbj";
+    sha256 = "0ijz9lxralyw18r5ra2h79jnafk5521ncr3knaip74cqa28csw9k";
   };
 
   # Update with `eval $(nix-build -A bazel.updater)`,
@@ -51,9 +51,9 @@ let
       (if stdenv.hostPlatform.isDarwin
        then srcs."java_tools_javac11_darwin-v7.0.zip"
        else srcs."java_tools_javac11_linux-v7.0.zip")
-      srcs."coverage_output_generator-v2.0.zip"
+      srcs."coverage_output_generator-v2.1.zip"
       srcs.build_bazel_rules_nodejs
-      srcs."android_tools_pkg-0.12.tar.gz"
+      srcs."android_tools_pkg-0.13.tar.gz"
       srcs."0.28.3.tar.gz"
       srcs.rules_pkg
       srcs.rules_cc
diff --git a/pkgs/development/tools/build-managers/bazel/src-deps.json b/pkgs/development/tools/build-managers/bazel/src-deps.json
index 171b1f9fc64e..7517a8c1b958 100644
--- a/pkgs/development/tools/build-managers/bazel/src-deps.json
+++ b/pkgs/development/tools/build-managers/bazel/src-deps.json
@@ -55,11 +55,11 @@
             "https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz"
         ]
     },
-    "android_tools_pkg-0.12.tar.gz": {
-        "name": "android_tools_pkg-0.12.tar.gz",
-        "sha256": "96c4eef4d195dd95e43a4259cf5b82a1e34f67333439e91955bbdc0e1c8e7a31",
+    "android_tools_pkg-0.13.tar.gz": {
+        "name": "android_tools_pkg-0.13.tar.gz",
+        "sha256": "3ca6a5e6576a9cda7c59f5fd33b1fe096725730712057c5893589ac15b019407",
         "urls": [
-            "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.12.tar.gz"
+            "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.13.tar.gz"
         ]
     },
     "bazel_j2objc": {
@@ -115,11 +115,11 @@
             "https://github.com/google/googletest/archive/release-1.10.0.tar.gz"
         ]
     },
-    "coverage_output_generator-v2.0.zip": {
-        "name": "coverage_output_generator-v2.0.zip",
-        "sha256": "3a6951051272d51613ac4c77af6ce238a3db321bf06506fde1b8866eb18a89dd",
+    "coverage_output_generator-v2.1.zip": {
+        "name": "coverage_output_generator-v2.1.zip",
+        "sha256": "96ac6bc9b9fbc67b532bcae562da1642409791e6a4b8e522f04946ee5cc3ff8e",
         "urls": [
-            "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.0.zip"
+            "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.1.zip"
         ]
     },
     "desugar_jdk_libs": {

From 95c91cebf132c7057da5d7a69b9dc90de09c96cc Mon Sep 17 00:00:00 2001
From: Joao Neves <sevenjp@gmail.com>
Date: Tue, 25 Feb 2020 18:40:13 +0100
Subject: [PATCH 1754/4636] bazel: output correct binary name

From Bazel 2.0.0 onwards, Bazel looks for a binary named
`bazel-${version}-${os_arch}` if the project root contains a
`.bazelversion` file or the USE_BAZEL_VERSION environment
variable is set.

This change ensures we output a binary with the correct name
for the current version and OS/arch combination.
---
 pkgs/development/tools/build-managers/bazel/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index a1eb69ea7a54..2a784b30b322 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -106,6 +106,7 @@ let
   # and libraries path.
   # We prefetch it, patch it, and override it in a global bazelrc.
   system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux";
+  arch = stdenv.hostPlatform.parsed.cpu.name;
 
   remote_java_tools = stdenv.mkDerivation {
     name = "remote_java_tools_${system}";
@@ -493,9 +494,11 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
 
     # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel
-    # if it can’t find something in tools, it calls $out/bin/bazel-real
+    # if it can’t find something in tools, it calls $out/bin/bazel-{version}-{os_arch}
+    # The binary _must_ exist with this naming if your project contains a .bazelversion
+    # file.
     cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel
-    mv ./bazel_src/output/bazel $out/bin/bazel-real
+    mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch}
 
     # shell completion files
     mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions
@@ -534,7 +537,7 @@ stdenv.mkDerivation rec {
     exec "$BAZEL_REAL" "$@"
     EOF
 
-    # second call succeeds because it defers to $out/bin/bazel-real
+    # second call succeeds because it defers to $out/bin/bazel-{version}-{os_arch}
     hello_test
   '';
 

From 74c82056c966b9e3cf39d427cd6ea99a887277ec Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 28 Feb 2020 12:31:02 +0100
Subject: [PATCH 1755/4636] lcov: Support gcc 9

https://github.com/linux-test-project/lcov/issues/58
https://github.com/Homebrew/homebrew-core/pull/50070
---
 .../tools/analysis/lcov/default.nix           | 19 +++++++++++++++++--
 pkgs/top-level/perl-packages.nix              | 15 +++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix
index 06c712588f8f..a5e8c81e313a 100644
--- a/pkgs/development/tools/analysis/lcov/default.nix
+++ b/pkgs/development/tools/analysis/lcov/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl}:
+ {stdenv, fetchurl, fetchpatch, perl, perlPackages, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "lcov-1.14";
@@ -8,13 +8,28 @@ stdenv.mkDerivation rec {
     sha256 = "06h7ixyznf6vz1qvksjgy5f3q2nw9akf6zx59npf0h3l32cmd68l";
   };
 
-  buildInputs = [ perl ];
+  patches =
+    [ (fetchpatch {
+        url = https://github.com/linux-test-project/lcov/commit/ebfeb3e179e450c69c3532f98cd5ea1fbf6ccba7.patch;
+        sha256 = "1z9jfqpj34jnzdvmqr5fs8hl56bvbwd8xhlbg3chcswbjj97vk7l";
+      })
+      (fetchpatch {
+        url = https://github.com/linux-test-project/lcov/commit/75fbae1cfc5027f818a0bb865bf6f96fab3202da.patch;
+        sha256 = "1wgd4y7vhvfnxyhdd0z2pi9ys6l0z88f14i69a7prb296m1zwg5j";
+      })
+    ];
+
+  buildInputs = [ perl makeWrapper ];
 
   preBuild = ''
     patchShebangs bin/
     makeFlagsArray=(PREFIX=$out LCOV_PERL_PATH=$(command -v perl))
   '';
 
+  postInstall = ''
+    wrapProgram $out/bin/lcov --set PERL5LIB ${perlPackages.makeFullPerlPath [ perlPackages.PerlIOgzip perlPackages.JSON ]}
+  '';
+
   meta = with stdenv.lib; {
     description = "Code coverage tool that enhances GNU gcov";
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 57f24021739f..903d4e40f54b 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14630,6 +14630,21 @@ let
     };
   };
 
+  PerlIOgzip = buildPerlPackage {
+    pname = "PerlIO-gzip";
+    version = "0.20";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/N/NW/NWCLARK/PerlIO-gzip-0.20.tar.gz";
+      sha256 = "4848679a3f201e3f3b0c5f6f9526e602af52923ffa471a2a3657db786bd3bdc5";
+    };
+    buildInputs = [ pkgs.zlib ];
+    NIX_CFLAGS_LINK = "-L${pkgs.zlib.out}/lib -lz";
+    meta = {
+      description = "Perl extension to provide a PerlIO layer to gzip/gunzip";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   PerlIOutf8_strict = buildPerlPackage {
     pname = "PerlIO-utf8_strict";
     version = "0.007";

From 4c0821461e1e3b7615b9fb894325ce7169b3075b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 28 Feb 2020 12:31:50 +0100
Subject: [PATCH 1756/4636] enable-coverage-instrumentation.sh: Fix unbound
 variable error

https://hydra.nixos.org/build/113299582
---
 .../setup-hooks/enable-coverage-instrumentation.sh  | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh b/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh
index 7175b408b02f..2b48fea4ff0b 100644
--- a/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh
+++ b/pkgs/build-support/setup-hooks/enable-coverage-instrumentation.sh
@@ -2,18 +2,7 @@ postPhases+=" cleanupBuildDir"
 
 # Force GCC to build with coverage instrumentation.  Also disable
 # optimisation, since it may confuse things.
-export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -O0 --coverage"
-
-# FIXME: Handle the case where postUnpack is already set.
-postUnpack() {
-    # This is an uberhack to prevent libtool from remoaving gcno
-    # files.  This has been fixed in libtool, but there are packages
-    # out there with old ltmain.sh scripts.  See
-    # http://www.mail-archive.com/libtool@gnu.org/msg10725.html
-    for i in $(find -name ltmain.sh); do
-        substituteInPlace $i --replace '*.$objext)' '*.$objext | *.gcno)'
-    done
-}
+export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE:-} -O0 --coverage"
 
 # Get rid of everything that isn't a gcno file or a C source file.
 # Also strip the `.tmp_' prefix from gcno files.  (The Linux kernel

From 8c1cb557c6dbd77281a2b16804310385faf27ca7 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 28 Feb 2020 13:17:10 +0000
Subject: [PATCH 1757/4636] fmt: 6.1.1 -> 6.1.2

Tests and parallel building are enabled by default.
---
 pkgs/development/libraries/fmt/default.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix
index 0c50b069d394..6eb6289d376d 100644
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  version = "6.1.1";
   pname = "fmt";
+  version = "6.1.2";
 
   src = fetchFromGitHub {
     owner = "fmtlib";
     repo = "fmt";
     rev = version;
-    sha256 = "0arii4hs33lqlbfwilnxiq8mqcvdwz66b24qa7fdjiga02j8kl2n";
+    sha256 = "1ngb2fd7c2jnxi3x5kjgxmpixmyc737f77vibij43dl77ybiaihi";
   };
 
   outputs = [ "out" "dev" ];
@@ -16,17 +16,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [
-    "-DFMT_TEST=TRUE"
-    "-DBUILD_SHARED_LIBS=TRUE"
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
   ];
 
-  enableParallelBuilding = true;
-
   doCheck = true;
-  # preCheckHook ensures the test binaries can find libfmt.so
-  preCheck = ''
-    export LD_LIBRARY_PATH="$PWD"
-  '';
 
   meta = with stdenv.lib; {
     description = "Small, safe and fast formatting library";

From 43521ac96522000b12c61e0e582ffb19b10a29d5 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 28 Feb 2020 12:17:01 +0100
Subject: [PATCH 1758/4636] nixos/service-runner.nix: Allow quotes in commands
 + test

---
 nixos/modules/testing/service-runner.nix | 28 ++++++++++++------
 nixos/tests/all-tests.nix                |  1 +
 nixos/tests/service-runner.nix           | 36 ++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100644 nixos/tests/service-runner.nix

diff --git a/nixos/modules/testing/service-runner.nix b/nixos/modules/testing/service-runner.nix
index 17d5e3376908..99a9f979068d 100644
--- a/nixos/modules/testing/service-runner.nix
+++ b/nixos/modules/testing/service-runner.nix
@@ -12,7 +12,10 @@ let
 
       sub run {
           my ($cmd) = @_;
-          my @args = split " ", $cmd;
+          my @args = ();
+          while ($cmd =~ /([^ \t\n']+)|(\'([^'])\')\s*/g) {
+            push @args, $1;
+          }
           my $prog;
           if (substr($args[0], 0, 1) eq "@") {
               $prog = substr($args[0], 1);
@@ -48,15 +51,20 @@ let
       '') service.environment)}
 
       # Run the ExecStartPre program.  FIXME: this could be a list.
-      my $preStart = '${service.serviceConfig.ExecStartPre or ""}';
-      if ($preStart ne "") {
+      my $preStart = <<END_CMD;
+      ${service.serviceConfig.ExecStartPre or ""}
+      END_CMD
+      if (defined $preStart && $preStart ne "\n") {
           print STDERR "running ExecStartPre: $preStart\n";
           my $res = run_wait $preStart;
           die "$0: ExecStartPre failed with status $res\n" if $res;
       };
 
       # Run the ExecStart program.
-      my $cmd = '${service.serviceConfig.ExecStart}';
+      my $cmd = <<END_CMD;
+      ${service.serviceConfig.ExecStart}
+      END_CMD
+
       print STDERR "running ExecStart: $cmd\n";
       my $mainPid = run $cmd;
       $ENV{'MAINPID'} = $mainPid;
@@ -70,8 +78,10 @@ let
       $SIG{'QUIT'} = \&intHandler;
 
       # Run the ExecStartPost program.
-      my $postStart = '${service.serviceConfig.ExecStartPost or ""}';
-      if ($postStart ne "") {
+      my $postStart = <<END_CMD;
+      ${service.serviceConfig.ExecStartPost or ""}
+      END_CMD
+      if (defined $postStart && $postStart ne "\n") {
           print STDERR "running ExecStartPost: $postStart\n";
           my $res = run_wait $postStart;
           die "$0: ExecStartPost failed with status $res\n" if $res;
@@ -82,8 +92,10 @@ let
       my $mainRes = $?;
 
       # Run the ExecStopPost program.
-      my $postStop = '${service.serviceConfig.ExecStopPost or ""}';
-      if ($postStop ne "") {
+      my $postStop = <<END_CMD;
+      ${service.serviceConfig.ExecStopPost or ""}
+      END_CMD
+      if (defined $postStop && $postStop ne "\n") {
           print STDERR "running ExecStopPost: $postStop\n";
           my $res = run_wait $postStop;
           die "$0: ExecStopPost failed with status $res\n" if $res;
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 2e547780439a..1286155b6c1d 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -262,6 +262,7 @@ in
   samba = handleTest ./samba.nix {};
   sanoid = handleTest ./sanoid.nix {};
   sddm = handleTest ./sddm.nix {};
+  service-runner = handleTest ./service-runner.nix {};
   shiori = handleTest ./shiori.nix {};
   signal-desktop = handleTest ./signal-desktop.nix {};
   simple = handleTest ./simple.nix {};
diff --git a/nixos/tests/service-runner.nix b/nixos/tests/service-runner.nix
new file mode 100644
index 000000000000..adb3fcd36d7a
--- /dev/null
+++ b/nixos/tests/service-runner.nix
@@ -0,0 +1,36 @@
+import ./make-test-python.nix ({ pkgs, ... }: {
+  name = "service-runner";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ roberth ];
+  };
+
+  nodes = {
+    machine = { pkgs, lib, ... }: {
+      services.nginx.enable = true;
+      services.nginx.virtualHosts.machine.root = pkgs.runCommand "webroot" {} ''
+        mkdir $out
+        echo 'yay' >$out/index.html
+      '';
+      systemd.services.nginx.enable = false;
+    };
+
+  };
+
+  testScript = { nodes, ... }: ''
+    url = "http://localhost/index.html"
+
+    with subtest("check systemd.services.nginx.runner"):
+        machine.fail(f"curl {url}")
+        machine.succeed(
+            """
+            mkdir -p /run/nginx /var/spool/nginx/logs
+            ${nodes.machine.config.systemd.services.nginx.runner} &
+            echo $!>my-nginx.pid
+            """
+        )
+        machine.wait_for_open_port(80)
+        machine.succeed(f"curl {url}")
+        machine.succeed("kill -INT $(cat my-nginx.pid)")
+        machine.wait_for_closed_port(80)
+  '';
+})

From 2699f48f844e17f1df63c415b3fd6230ec4587f4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Feb 2020 13:26:46 +0000
Subject: [PATCH 1759/4636] amiri: 0.111 -> 0.112

---
 pkgs/data/fonts/amiri/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/amiri/default.nix b/pkgs/data/fonts/amiri/default.nix
index 36d8ed3c6747..9ecde1939e8c 100644
--- a/pkgs/data/fonts/amiri/default.nix
+++ b/pkgs/data/fonts/amiri/default.nix
@@ -1,14 +1,14 @@
 { lib, fetchzip }:
 
 let
-  version = "0.111";
+  version = "0.112";
 
 in fetchzip rec {
   name = "Amiri-${version}";
 
   url = "https://github.com/alif-type/amiri/releases/download/${version}/${name}.zip";
 
-  sha256 = "1w3a5na4mazspwy8j2hvpjha10sgd287kamm51p49jcr90cvwbdr";
+  sha256 = "13j8kglgca296czxjz1xvrbz6yx05s2xassiliyszndbkrhn6bkl";
 
   postFetch = ''
     unzip $downloadedFile

From 6c2284090a6fb234f7267cd8b1d1c3225de7516a Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Wed, 19 Feb 2020 15:14:26 +0100
Subject: [PATCH 1760/4636] codimd: 1.5.0 -> 1.6.0

---
 pkgs/servers/web-apps/codimd/default.nix  |    4 +-
 pkgs/servers/web-apps/codimd/package.json |   61 +-
 pkgs/servers/web-apps/codimd/yarn.lock    | 5983 +++++++--------------
 pkgs/servers/web-apps/codimd/yarn.nix     | 5528 ++++++-------------
 4 files changed, 3608 insertions(+), 7968 deletions(-)

diff --git a/pkgs/servers/web-apps/codimd/default.nix b/pkgs/servers/web-apps/codimd/default.nix
index 5b61de48b8d2..6771f459b68b 100644
--- a/pkgs/servers/web-apps/codimd/default.nix
+++ b/pkgs/servers/web-apps/codimd/default.nix
@@ -3,13 +3,13 @@
 
 mkYarnPackage rec {
   name = "codimd";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner  = "codimd";
     repo   = "server";
     rev    = version;
-    sha256 = "1sd7r5ws1k7dxmr57m67c1k23pzbkn25k2wvcnbrqn7gza6mhlf0";
+    sha256 = "1208a24v664ha9qzr7ky6i3ynphkaj0xi5l3rsw743i22nv5aj33";
   };
 
   nativeBuildInputs = [ which makeWrapper ];
diff --git a/pkgs/servers/web-apps/codimd/package.json b/pkgs/servers/web-apps/codimd/package.json
index 172822a26b30..7f78d14ff305 100644
--- a/pkgs/servers/web-apps/codimd/package.json
+++ b/pkgs/servers/web-apps/codimd/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CodiMD",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Realtime collaborative markdown notes on all platforms.",
   "main": "app.js",
   "license": "AGPL-3.0",
@@ -47,8 +47,8 @@
     "formidable": "^1.0.17",
     "gist-embed": "~2.6.0",
     "graceful-fs": "^4.1.11",
-    "handlebars": "^4.1.2",
-    "helmet": "^3.13.0",
+    "handlebars": "^4.5.2",
+    "helmet": "^3.21.1",
     "highlight.js": "~9.12.0",
     "i18n": "^0.8.3",
     "imgur": "git+https://github.com/hackmdio/node-imgur.git",
@@ -65,7 +65,8 @@
     "lodash": "^4.17.11",
     "lutim": "^1.0.2",
     "lz-string": "git+https://github.com/hackmdio/lz-string.git",
-    "markdown-it": "^8.2.2",
+    "mariadb": "^2.1.2",
+    "markdown-it": "^10.0.0",
     "markdown-it-abbr": "^1.0.4",
     "markdown-it-container": "^2.0.0",
     "markdown-it-deflist": "^2.0.1",
@@ -78,17 +79,17 @@
     "markdown-it-regexp": "^0.4.0",
     "markdown-it-sub": "^1.0.0",
     "markdown-it-sup": "^1.0.0",
-    "markdown-pdf": "^9.0.0",
-    "mathjax": "~2.7.0",
+    "markdown-pdf": "^10.0.0",
+    "mathjax": "~2.7.6",
     "mattermost": "^3.4.0",
-    "mermaid": "~8.2.3",
+    "mermaid": "~8.4.6",
     "meta-marked": "git+https://github.com/codimd/meta-marked#semver:^0.4.5",
     "method-override": "^2.3.7",
     "minimist": "^1.2.0",
     "minio": "^6.0.0",
     "moment": "^2.17.1",
     "morgan": "^1.7.0",
-    "mysql2": "^1.6.5",
+    "mysql2": "^2.0.0",
     "passport": "^0.4.0",
     "passport-dropbox-oauth2": "^1.1.0",
     "passport-facebook": "^2.1.1",
@@ -102,26 +103,27 @@
     "passport-twitter": "^1.0.4",
     "passport.socketio": "^3.7.0",
     "pdfobject": "^2.0.201604172",
-    "pg": "^6.1.2",
-    "pg-hstore": "^2.3.2",
+    "pg": "^7.12.1",
+    "pg-hstore": "^2.3.3",
     "prismjs": "^1.6.0",
     "randomcolor": "^0.5.3",
     "raphael": "git+https://github.com/dmitrybaranovskiy/raphael",
     "readline-sync": "^1.4.7",
     "request": "^2.88.0",
-    "reveal.js": "~3.7.0",
+    "reveal.js": "~3.9.2",
     "scrypt-async": "^2.0.1",
     "scrypt-kdf": "^2.0.1",
     "select2": "^3.5.2-browserify",
-    "sequelize": "^5.8.12",
+    "sequelize": "^5.21.1",
+    "sequelize-cli": "^5.5.1",
     "shortid": "2.2.8",
     "socket.io": "~2.1.1",
     "socket.io-client": "~2.1.1",
     "spin.js": "^2.3.2",
-    "sqlite3": "^4.0.7",
+    "sqlite3": "^4.1.0",
     "store": "^2.0.12",
     "string": "^3.3.3",
-    "tedious": "^1.14.0",
+    "tedious": "^6.6.0",
     "toobusy-js": "^0.5.1",
     "turndown": "^5.0.1",
     "uuid": "^3.1.0",
@@ -172,37 +174,32 @@
     "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.7.0",
     "babel-runtime": "^6.26.0",
-    "copy-webpack-plugin": "^4.5.2",
-    "css-loader": "^1.0.0",
-    "ejs-loader": "^0.3.1",
+    "copy-webpack-plugin": "^5.0.5",
+    "css-loader": "^3.2.0",
     "eslint": "^5.9.0",
     "eslint-config-standard": "^12.0.0",
     "eslint-plugin-import": "^2.14.0",
     "eslint-plugin-node": "^8.0.0",
     "eslint-plugin-promise": "^4.0.1",
     "eslint-plugin-standard": "^4.0.0",
-    "exports-loader": "^0.7.0",
     "expose-loader": "^0.7.5",
-    "file-loader": "^2.0.0",
-    "html-webpack-plugin": "4.0.0-beta.2",
+    "file-loader": "^4.3.0",
+    "html-webpack-plugin": "^4.0.0-beta.11",
     "imports-loader": "^0.8.0",
     "jsonlint": "^1.6.2",
-    "less": "^2.7.1",
-    "less-loader": "^4.1.0",
-    "mini-css-extract-plugin": "^0.4.1",
+    "less": "^3.10.3",
+    "less-loader": "^5.0.0",
+    "mini-css-extract-plugin": "^0.8.0",
     "mocha": "^5.2.0",
     "mock-require": "^3.0.3",
-    "optimize-css-assets-webpack-plugin": "^5.0.0",
+    "optimize-css-assets-webpack-plugin": "^5.0.3",
     "script-loader": "^0.7.2",
-    "sequelize-cli": "^5.4.0",
     "string-loader": "^0.0.1",
-    "style-loader": "^0.21.0",
-    "uglifyjs-webpack-plugin": "^1.2.7",
-    "url-loader": "^1.0.1",
-    "webpack": "^4.14.0",
-    "webpack-cli": "^3.1.0",
-    "webpack-merge": "^4.1.4",
-    "webpack-parallel-uglify-plugin": "^1.1.0"
+    "style-loader": "^1.0.0",
+    "url-loader": "^2.3.0",
+    "webpack": "^4.41.2",
+    "webpack-cli": "^3.3.10",
+    "webpack-merge": "^4.2.2"
   },
   "optionalDependencies": {
     "bufferutil": "^4.0.0",
diff --git a/pkgs/servers/web-apps/codimd/yarn.lock b/pkgs/servers/web-apps/codimd/yarn.lock
index 7c9d4997d79e..46474683679d 100644
--- a/pkgs/servers/web-apps/codimd/yarn.lock
+++ b/pkgs/servers/web-apps/codimd/yarn.lock
@@ -2,949 +2,50 @@
 # yarn lockfile v1
 
 
+"@azure/ms-rest-azure-env@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@azure/ms-rest-azure-env/-/ms-rest-azure-env-1.1.2.tgz#8505873afd4a1227ec040894a64fdd736b4a101f"
+  integrity sha512-l7z0DPCi2Hp88w12JhDTtx5d0Y3+vhfE7JKJb9O7sEz71Cwp053N8piTtTnnk/tUor9oZHgEKi/p3tQQmLPjvA==
+
+"@azure/ms-rest-js@^1.8.7":
+  version "1.8.14"
+  resolved "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-1.8.14.tgz#657fc145db20b6eb3d58d1a2055473aa72eb609d"
+  integrity sha512-IrCPN22c8RbKWA06ZXuFwwEb15cSnr0zZ6J8Fspp9ns1SSNTERf7hv+gWvTIis1FlwHy42Mfk8hVu0/r3a0AWA==
+  dependencies:
+    "@types/tunnel" "0.0.0"
+    axios "^0.19.0"
+    form-data "^2.3.2"
+    tough-cookie "^2.4.3"
+    tslib "^1.9.2"
+    tunnel "0.0.6"
+    uuid "^3.2.1"
+    xml2js "^0.4.19"
+
+"@azure/ms-rest-nodeauth@2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@azure/ms-rest-nodeauth/-/ms-rest-nodeauth-2.0.2.tgz#037e29540c5625eaec718b8fcc178dd7ad5dfb96"
+  integrity sha512-KmNNICOxt3EwViAJI3iu2VH8t8BQg5J2rSAyO4IUYLF9ZwlyYsP419pdvl4NBUhluAP2cgN7dfD2V6E6NOMZlQ==
+  dependencies:
+    "@azure/ms-rest-azure-env" "^1.1.2"
+    "@azure/ms-rest-js" "^1.8.7"
+    adal-node "^0.1.28"
+
 "@babel/code-frame@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
-  integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
+  integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
   dependencies:
-    "@babel/highlight" "^7.0.0"
+    "@babel/highlight" "^7.8.3"
 
-"@babel/code-frame@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d"
-  integrity sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==
-  dependencies:
-    "@babel/highlight" "^7.0.0"
-
-"@babel/core@^7.1.2":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.5.5.tgz#17b2686ef0d6bc58f963dddd68ab669755582c30"
-  integrity sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==
-  dependencies:
-    "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.5.5"
-    "@babel/helpers" "^7.5.5"
-    "@babel/parser" "^7.5.5"
-    "@babel/template" "^7.4.4"
-    "@babel/traverse" "^7.5.5"
-    "@babel/types" "^7.5.5"
-    convert-source-map "^1.1.0"
-    debug "^4.1.0"
-    json5 "^2.1.0"
-    lodash "^4.17.13"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.1.3", "@babel/generator@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.5.5.tgz#873a7f936a3c89491b43536d12245b626664e3cf"
-  integrity sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==
-  dependencies:
-    "@babel/types" "^7.5.5"
-    jsesc "^2.5.1"
-    lodash "^4.17.13"
-    source-map "^0.5.0"
-    trim-right "^1.0.1"
-
-"@babel/helper-annotate-as-pure@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"
-  integrity sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f"
-  integrity sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==
-  dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-builder-react-jsx@^7.3.0":
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz#a1ac95a5d2b3e88ae5e54846bf462eeb81b318a4"
-  integrity sha512-MjA9KgwCuPEkQd9ncSXvSyJ5y+j2sICHyrI0M3L+6fnS4wMSNDc1ARXsbTfbb2cXHn17VisSnU/sHFTCxVxSMw==
-  dependencies:
-    "@babel/types" "^7.3.0"
-    esutils "^2.0.0"
-
-"@babel/helper-call-delegate@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz#87c1f8ca19ad552a736a7a27b1c1fcf8b1ff1f43"
-  integrity sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.4.4"
-    "@babel/traverse" "^7.4.4"
-    "@babel/types" "^7.4.4"
-
-"@babel/helper-create-class-features-plugin@^7.4.4", "@babel/helper-create-class-features-plugin@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.5.tgz#401f302c8ddbc0edd36f7c6b2887d8fa1122e5a4"
-  integrity sha512-ZsxkyYiRA7Bg+ZTRpPvB6AbOFKTFFK4LrvTet8lInm0V468MWCaSYJE+I7v2z2r8KNLtYiV+K5kTCnR7dvyZjg==
-  dependencies:
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-member-expression-to-functions" "^7.5.5"
-    "@babel/helper-optimise-call-expression" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.5.5"
-    "@babel/helper-split-export-declaration" "^7.4.4"
-
-"@babel/helper-define-map@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz#3dec32c2046f37e09b28c93eb0b103fd2a25d369"
-  integrity sha512-fTfxx7i0B5NJqvUOBBGREnrqbTxRh7zinBANpZXAVDlsZxYdclDp467G1sQ8VZYMnAURY3RpBUAgOYT9GfzHBg==
-  dependencies:
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/types" "^7.5.5"
-    lodash "^4.17.13"
-
-"@babel/helper-explode-assignable-expression@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz#537fa13f6f1674df745b0c00ec8fe4e99681c8f6"
-  integrity sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==
-  dependencies:
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-function-name@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53"
-  integrity sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.0.0"
-    "@babel/template" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-get-function-arity@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
-  integrity sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-hoist-variables@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz#0298b5f25c8c09c53102d52ac4a98f773eb2850a"
-  integrity sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==
-  dependencies:
-    "@babel/types" "^7.4.4"
-
-"@babel/helper-member-expression-to-functions@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz#1fb5b8ec4453a93c439ee9fe3aeea4a84b76b590"
-  integrity sha512-5qZ3D1uMclSNqYcXqiHoA0meVdv+xUEex9em2fqMnrk/scphGlGgg66zjMrPJESPwrFJ6sbfFQYUSa0Mz7FabA==
-  dependencies:
-    "@babel/types" "^7.5.5"
-
-"@babel/helper-module-imports@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d"
-  integrity sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-module-transforms@^7.1.0", "@babel/helper-module-transforms@^7.4.4":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz#f84ff8a09038dcbca1fd4355661a500937165b4a"
-  integrity sha512-jBeCvETKuJqeiaCdyaheF40aXnnU1+wkSiUs/IQg3tB85up1LyL8x77ClY8qJpuRJUcXQo+ZtdNESmZl4j56Pw==
-  dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/helper-simple-access" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.4.4"
-    "@babel/template" "^7.4.4"
-    "@babel/types" "^7.5.5"
-    lodash "^4.17.13"
-
-"@babel/helper-optimise-call-expression@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5"
-  integrity sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-plugin-utils@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
-  integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==
-
-"@babel/helper-regex@^7.0.0", "@babel/helper-regex@^7.4.4":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.5.5.tgz#0aa6824f7100a2e0e89c1527c23936c152cab351"
-  integrity sha512-CkCYQLkfkiugbRDO8eZn6lRuR8kzZoGXCg3149iTk5se7g6qykSpy3+hELSwquhu+TgHn8nkLiBwHvNX8Hofcw==
-  dependencies:
-    lodash "^4.17.13"
-
-"@babel/helper-remap-async-to-generator@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz#361d80821b6f38da75bd3f0785ece20a88c5fe7f"
-  integrity sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.0.0"
-    "@babel/helper-wrap-function" "^7.1.0"
-    "@babel/template" "^7.1.0"
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-replace-supers@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz#f84ce43df031222d2bad068d2626cb5799c34bc2"
-  integrity sha512-XvRFWrNnlsow2u7jXDuH4jDDctkxbS7gXssrP4q2nUD606ukXHRvydj346wmNg+zAgpFx4MWf4+usfC93bElJg==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.5.5"
-    "@babel/helper-optimise-call-expression" "^7.0.0"
-    "@babel/traverse" "^7.5.5"
-    "@babel/types" "^7.5.5"
-
-"@babel/helper-simple-access@^7.1.0":
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c"
-  integrity sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==
-  dependencies:
-    "@babel/template" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@babel/helper-split-export-declaration@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677"
-  integrity sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==
-  dependencies:
-    "@babel/types" "^7.4.4"
-
-"@babel/helper-wrap-function@^7.1.0", "@babel/helper-wrap-function@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz#c4e0012445769e2815b55296ead43a958549f6fa"
-  integrity sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==
-  dependencies:
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/template" "^7.1.0"
-    "@babel/traverse" "^7.1.0"
-    "@babel/types" "^7.2.0"
-
-"@babel/helpers@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.5.tgz#63908d2a73942229d1e6685bc2a0e730dde3b75e"
-  integrity sha512-nRq2BUhxZFnfEn/ciJuhklHvFOqjJUD5wpx+1bxUF2axL9C+v4DE/dmp5sT2dKnpOs4orZWzpAZqlCy8QqE/7g==
-  dependencies:
-    "@babel/template" "^7.4.4"
-    "@babel/traverse" "^7.5.5"
-    "@babel/types" "^7.5.5"
-
-"@babel/highlight@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
-  integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==
+"@babel/highlight@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797"
+  integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==
   dependencies:
     chalk "^2.0.0"
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@7.1.3":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.3.tgz#2c92469bac2b7fbff810b67fca07bd138b48af77"
-  integrity sha512-gqmspPZOMW3MIRb9HlrnbZHXI1/KHTOroBwN1NcLL6pWxzqzEKGvRTq0W/PxS45OtQGbaFikSQpkS5zbnsQm2w==
-
-"@babel/parser@^7.4.4", "@babel/parser@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.5.5.tgz#02f077ac8817d3df4a832ef59de67565e71cca4b"
-  integrity sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==
-
-"@babel/plugin-proposal-async-generator-functions@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz#b289b306669dce4ad20b0252889a15768c9d417e"
-  integrity sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-remap-async-to-generator" "^7.1.0"
-    "@babel/plugin-syntax-async-generators" "^7.2.0"
-
-"@babel/plugin-proposal-class-properties@^7.1.0":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz#a974cfae1e37c3110e71f3c6a2e48b8e71958cd4"
-  integrity sha512-AF79FsnWFxjlaosgdi421vmYG6/jg79bVD0dpD44QdgobzHKuLZ6S3vl8la9qIeSwGi8i1fS0O1mfuDAAdo1/A==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.5.5"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-proposal-decorators@^7.1.2":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.4.4.tgz#de9b2a1a8ab0196f378e2a82f10b6e2a36f21cc0"
-  integrity sha512-z7MpQz3XC/iQJWXH9y+MaWcLPNSMY9RQSthrLzak8R8hCj0fuyNk+Dzi9kfNe/JxxlWQ2g7wkABbgWjW36MTcw==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.4.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-decorators" "^7.2.0"
-
-"@babel/plugin-proposal-do-expressions@^7.0.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-do-expressions/-/plugin-proposal-do-expressions-7.5.0.tgz#ceb594d4a618545b00aa0b5cd61cad4aaaeb7a5a"
-  integrity sha512-xe0QQrhm+DGj6H23a6XtwkJNimy1fo71O/YVBfrfvfSl0fsq9T9dfoQBIY4QceEIdUo7u9s7OPEdsWEuizfGeg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-do-expressions" "^7.2.0"
-
-"@babel/plugin-proposal-dynamic-import@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz#e532202db4838723691b10a67b8ce509e397c506"
-  integrity sha512-x/iMjggsKTFHYC6g11PL7Qy58IK8H5zqfm9e6hu4z1iH2IRyAp9u9dL80zA6R76yFovETFLKz2VJIC2iIPBuFw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.2.0"
-
-"@babel/plugin-proposal-export-default-from@^7.0.0":
-  version "7.5.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.5.2.tgz#2c0ac2dcc36e3b2443fead2c3c5fc796fb1b5145"
-  integrity sha512-wr9Itk05L1/wyyZKVEmXWCdcsp/e185WUNl6AfYZeEKYaUPPvHXRDqO5K1VH7/UamYqGJowFRuCv30aDYZawsg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-export-default-from" "^7.2.0"
-
-"@babel/plugin-proposal-export-namespace-from@^7.0.0":
-  version "7.5.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.5.2.tgz#ccd5ed05b06d700688ff1db01a9dd27155e0d2a0"
-  integrity sha512-TKUdOL07anjZEbR1iSxb5WFh810KyObdd29XLFLGo1IDsSuGrjH3ouWSbAxHNmrVKzr9X71UYl2dQ7oGGcRp0g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-export-namespace-from" "^7.2.0"
-
-"@babel/plugin-proposal-function-bind@^7.0.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-function-bind/-/plugin-proposal-function-bind-7.2.0.tgz#94dc2cdc505cafc4e225c0014335a01648056bf7"
-  integrity sha512-qOFJ/eX1Is78sywwTxDcsntLOdb5ZlHVVqUz5xznq8ldAfOVIyZzp1JE2rzHnaksZIhrqMrwIpQL/qcEprnVbw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-function-bind" "^7.2.0"
-
-"@babel/plugin-proposal-function-sent@^7.1.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-function-sent/-/plugin-proposal-function-sent-7.5.0.tgz#39233aa801145e7d8072077cdb2d25f781c1ffd7"
-  integrity sha512-JXdfiQpKoC6UgQliZkp3NX7K3MVec1o1nfTWiCCIORE5ag/QZXhL0aSD8/Y2K+hIHonSTxuJF9rh9zsB6hBi2A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-wrap-function" "^7.2.0"
-    "@babel/plugin-syntax-function-sent" "^7.2.0"
-
-"@babel/plugin-proposal-json-strings@^7.0.0", "@babel/plugin-proposal-json-strings@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz#568ecc446c6148ae6b267f02551130891e29f317"
-  integrity sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-json-strings" "^7.2.0"
-
-"@babel/plugin-proposal-logical-assignment-operators@^7.0.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.2.0.tgz#8a5cea6c42a7c87446959e02fff5fad012c56f57"
-  integrity sha512-0w797xwdPXKk0m3Js74hDi0mCTZplIu93MOSfb1ZLd/XFe3abWypx1QknVk0J+ohnsjYpvjH4Gwfo2i3RicB6Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.2.0"
-
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.0.0":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.4.4.tgz#41c360d59481d88e0ce3a3f837df10121a769b39"
-  integrity sha512-Amph7Epui1Dh/xxUxS2+K22/MUi6+6JVTvy3P58tja3B6yKTSjwwx0/d83rF7551D6PVSSoplQb8GCwqec7HRw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.2.0"
-
-"@babel/plugin-proposal-numeric-separator@^7.0.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.2.0.tgz#646854daf4cd22fd6733f6076013a936310443ac"
-  integrity sha512-DohMOGDrZiMKS7LthjUZNNcWl8TAf5BZDwZAH4wpm55FuJTHgfqPGdibg7rZDmont/8Yg0zA03IgT6XLeP+4sg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-numeric-separator" "^7.2.0"
-
-"@babel/plugin-proposal-object-rest-spread@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz#61939744f71ba76a3ae46b5eea18a54c16d22e58"
-  integrity sha512-F2DxJJSQ7f64FyTVl5cw/9MWn6naXGdk3Q3UhDbFEEHv+EilCPoeRD3Zh/Utx1CJz4uyKlQ4uH+bJPbEhMV7Zw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
-
-"@babel/plugin-proposal-optional-catch-binding@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz#135d81edb68a081e55e56ec48541ece8065c38f5"
-  integrity sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
-
-"@babel/plugin-proposal-optional-chaining@^7.0.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.2.0.tgz#ae454f4c21c6c2ce8cb2397dc332ae8b420c5441"
-  integrity sha512-ea3Q6edZC/55wEBVZAEz42v528VulyO0eir+7uky/sT4XRcdkWJcFi1aPtitTlwUzGnECWJNExWww1SStt+yWw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.2.0"
-
-"@babel/plugin-proposal-pipeline-operator@^7.0.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-pipeline-operator/-/plugin-proposal-pipeline-operator-7.5.0.tgz#4100ec55ef4f6a4c2490b5f5a4f2a22dfa272c06"
-  integrity sha512-HFYuu/yGnkn69ligXxU0ohOVvQDsMNOUJs/c4PYLUVS6ntCYOyGmRQQaSYJARJ9rvc7/ulZKIzxd4wk91hN63A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-pipeline-operator" "^7.5.0"
-
-"@babel/plugin-proposal-throw-expressions@^7.0.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-throw-expressions/-/plugin-proposal-throw-expressions-7.2.0.tgz#2d9e452d370f139000e51db65d0a85dc60c64739"
-  integrity sha512-adsydM8DQF4i5DLNO4ySAU5VtHTPewOtNBV3u7F4lNMPADFF9bWQ+iDtUUe8+033cYCUz+bFlQdXQJmJOwoLpw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-throw-expressions" "^7.2.0"
-
-"@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz#501ffd9826c0b91da22690720722ac7cb1ca9c78"
-  integrity sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.4.4"
-    regexpu-core "^4.5.4"
-
-"@babel/plugin-syntax-async-generators@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz#69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f"
-  integrity sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-decorators@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.2.0.tgz#c50b1b957dcc69e4b1127b65e1c33eef61570c1b"
-  integrity sha512-38QdqVoXdHUQfTpZo3rQwqQdWtCn5tMv4uV6r2RMfTqNBuv4ZBhz79SfaQWKTVmxHjeFv/DnXVC/+agHCklYWA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-do-expressions@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-do-expressions/-/plugin-syntax-do-expressions-7.2.0.tgz#f3d4b01be05ecde2892086d7cfd5f1fa1ead5a2a"
-  integrity sha512-/u4rJ+XEmZkIhspVuKRS+7WLvm7Dky9j9TvGK5IgId8B3FKir9MG+nQxDZ9xLn10QMBvW58dZ6ABe2juSmARjg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-dynamic-import@^7.0.0", "@babel/plugin-syntax-dynamic-import@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz#69c159ffaf4998122161ad8ebc5e6d1f55df8612"
-  integrity sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-export-default-from@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.2.0.tgz#edd83b7adc2e0d059e2467ca96c650ab6d2f3820"
-  integrity sha512-c7nqUnNST97BWPtoe+Ssi+fJukc9P9/JMZ71IOMNQWza2E+Psrd46N6AEvtw6pqK+gt7ChjXyrw4SPDO79f3Lw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-export-namespace-from@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.2.0.tgz#8d257838c6b3b779db52c0224443459bd27fb039"
-  integrity sha512-1zGA3UNch6A+A11nIzBVEaE3DDJbjfB+eLIcf0GGOh/BJr/8NxL3546MGhV/r0RhH4xADFIEso39TKCfEMlsGA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-flow@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz#a765f061f803bc48f240c26f8747faf97c26bf7c"
-  integrity sha512-r6YMuZDWLtLlu0kqIim5o/3TNRAlWb073HwT3e2nKf9I8IIvOggPrnILYPsrrKilmn/mYEMCf/Z07w3yQJF6dg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-function-bind@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-function-bind/-/plugin-syntax-function-bind-7.2.0.tgz#68fe85b0c0da67125f87bf239c68051b06c66309"
-  integrity sha512-/WzU1lLU2l0wDfB42Wkg6tahrmtBbiD8C4H6EGSX0M4GAjzN6JiOpq/Uh8G6GSoR6lPMvhjM0MNiV6znj6y/zg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-function-sent@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-function-sent/-/plugin-syntax-function-sent-7.2.0.tgz#91474d4d400604e4c6cbd4d77cd6cb3b8565576c"
-  integrity sha512-2MOVuJ6IMAifp2cf0RFkHQaOvHpbBYyWCvgtF/WVqXhTd7Bgtov8iXVCadLXp2FN1BrI2EFl+JXuwXy0qr3KoQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-import-meta@^7.0.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.2.0.tgz#2333ef4b875553a3bcd1e93f8ebc09f5b9213a40"
-  integrity sha512-Hq6kFSZD7+PHkmBN8bCpHR6J8QEoCuEV/B38AIQscYjgMZkGlXB7cHNFzP5jR4RCh5545yP1ujHdmO7hAgKtBA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-json-strings@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz#72bd13f6ffe1d25938129d2a186b11fd62951470"
-  integrity sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-jsx@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz#0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7"
-  integrity sha512-VyN4QANJkRW6lDBmENzRszvZf3/4AXaj9YR7GwrWeeN9tEBPuXbmDYVU9bYBN0D70zCWVwUy0HWq2553VCb6Hw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-logical-assignment-operators@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.2.0.tgz#fcab7388530e96c6f277ce494c55caa6c141fcfb"
-  integrity sha512-l/NKSlrnvd73/EL540t9hZhcSo4TULBrIPs9Palju8Oc/A8DXDO+xQf04whfeuZLpi8AuIvCAdpKmmubLN4EfQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-nullish-coalescing-operator@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.2.0.tgz#f75083dfd5ade73e783db729bbd87e7b9efb7624"
-  integrity sha512-lRCEaKE+LTxDQtgbYajI04ddt6WW0WJq57xqkAZ+s11h4YgfRHhVA/Y2VhfPzzFD4qeLHWg32DMp9HooY4Kqlg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-numeric-separator@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.2.0.tgz#7470fe070c2944469a756752a69a6963135018be"
-  integrity sha512-DroeVNkO/BnGpL2R7+ZNZqW+E24aR/4YWxP3Qb15d6lPU8KDzF8HlIUIRCOJRn4X77/oyW4mJY+7FHfY82NLtQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-object-rest-spread@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e"
-  integrity sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-optional-catch-binding@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz#a94013d6eda8908dfe6a477e7f9eda85656ecf5c"
-  integrity sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-optional-chaining@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.2.0.tgz#a59d6ae8c167e7608eaa443fda9fa8fa6bf21dff"
-  integrity sha512-HtGCtvp5Uq/jH/WNUPkK6b7rufnCPLLlDAFN7cmACoIjaOOiXxUt3SswU5loHqrhtqTsa/WoLQ1OQ1AGuZqaWA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-pipeline-operator@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-pipeline-operator/-/plugin-syntax-pipeline-operator-7.5.0.tgz#8ea7c2c22847c797748bf07752722a317079dc1e"
-  integrity sha512-5FVxPiMTMXWk4R7Kq9pt272nDu8VImJdaIzvXFSTcXFbgKWWaOdbic12TvUvl6cK+AE5EgnhwvxuWik4ZYYdzg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-syntax-throw-expressions@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-throw-expressions/-/plugin-syntax-throw-expressions-7.2.0.tgz#79001ee2afe1b174b1733cdc2fc69c9a46a0f1f8"
-  integrity sha512-ngwynuqu1Rx0JUS9zxSDuPgW1K8TyVZCi2hHehrL4vyjqE7RGoNHWlZsS7KQT2vw9Yjk4YLa0+KldBXTRdPLRg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-arrow-functions@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz#9aeafbe4d6ffc6563bf8f8372091628f00779550"
-  integrity sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-async-to-generator@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz#89a3848a0166623b5bc481164b5936ab947e887e"
-  integrity sha512-mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg==
-  dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-remap-async-to-generator" "^7.1.0"
-
-"@babel/plugin-transform-block-scoped-functions@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz#5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190"
-  integrity sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-block-scoping@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz#a35f395e5402822f10d2119f6f8e045e3639a2ce"
-  integrity sha512-82A3CLRRdYubkG85lKwhZB0WZoHxLGsJdux/cOVaJCJpvYFl1LVzAIFyRsa7CvXqW8rBM4Zf3Bfn8PHt5DP0Sg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    lodash "^4.17.13"
-
-"@babel/plugin-transform-classes@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz#d094299d9bd680a14a2a0edae38305ad60fb4de9"
-  integrity sha512-U2htCNK/6e9K7jGyJ++1p5XRU+LJjrwtoiVn9SzRlDT2KubcZ11OOwy3s24TjHxPgxNwonCYP7U2K51uVYCMDg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.0.0"
-    "@babel/helper-define-map" "^7.5.5"
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-optimise-call-expression" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.5.5"
-    "@babel/helper-split-export-declaration" "^7.4.4"
-    globals "^11.1.0"
-
-"@babel/plugin-transform-computed-properties@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz#83a7df6a658865b1c8f641d510c6f3af220216da"
-  integrity sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-destructuring@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz#f6c09fdfe3f94516ff074fe877db7bc9ef05855a"
-  integrity sha512-YbYgbd3TryYYLGyC7ZR+Tq8H/+bCmwoaxHfJHupom5ECstzbRLTch6gOQbhEY9Z4hiCNHEURgq06ykFv9JZ/QQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz#361a148bc951444312c69446d76ed1ea8e4450c3"
-  integrity sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.4.4"
-    regexpu-core "^4.5.4"
-
-"@babel/plugin-transform-duplicate-keys@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz#c5dbf5106bf84cdf691222c0974c12b1df931853"
-  integrity sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-exponentiation-operator@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz#a63868289e5b4007f7054d46491af51435766008"
-  integrity sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-flow-strip-types@^7.0.0":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz#d267a081f49a8705fc9146de0768c6b58dccd8f7"
-  integrity sha512-WyVedfeEIILYEaWGAUWzVNyqG4sfsNooMhXWsu/YzOvVGcsnPb5PguysjJqI3t3qiaYj0BR8T2f5njdjTGe44Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-flow" "^7.2.0"
-
-"@babel/plugin-transform-for-of@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz#0267fc735e24c808ba173866c6c4d1440fc3c556"
-  integrity sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-function-name@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz#e1436116abb0610c2259094848754ac5230922ad"
-  integrity sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA==
-  dependencies:
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-literals@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz#690353e81f9267dad4fd8cfd77eafa86aba53ea1"
-  integrity sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-member-expression-literals@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz#fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d"
-  integrity sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-modules-amd@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz#ef00435d46da0a5961aa728a1d2ecff063e4fb91"
-  integrity sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.1.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    babel-plugin-dynamic-import-node "^2.3.0"
-
-"@babel/plugin-transform-modules-commonjs@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz#425127e6045231360858eeaa47a71d75eded7a74"
-  integrity sha512-xmHq0B+ytyrWJvQTc5OWAC4ii6Dhr0s22STOoydokG51JjWhyYo5mRPXoi+ZmtHQhZZwuXNN+GG5jy5UZZJxIQ==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.4.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-simple-access" "^7.1.0"
-    babel-plugin-dynamic-import-node "^2.3.0"
-
-"@babel/plugin-transform-modules-systemjs@^7.5.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz#e75266a13ef94202db2a0620977756f51d52d249"
-  integrity sha512-Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.4.4"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    babel-plugin-dynamic-import-node "^2.3.0"
-
-"@babel/plugin-transform-modules-umd@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz#7678ce75169f0877b8eb2235538c074268dd01ae"
-  integrity sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.1.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-named-capturing-groups-regex@^7.4.5":
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz#9d269fd28a370258199b4294736813a60bbdd106"
-  integrity sha512-z7+2IsWafTBbjNsOxU/Iv5CvTJlr5w4+HGu1HovKYTtgJ362f7kBcQglkfmlspKKZ3bgrbSGvLfNx++ZJgCWsg==
-  dependencies:
-    regexp-tree "^0.1.6"
-
-"@babel/plugin-transform-new-target@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz#18d120438b0cc9ee95a47f2c72bc9768fbed60a5"
-  integrity sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-object-super@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz#c70021df834073c65eb613b8679cc4a381d1a9f9"
-  integrity sha512-un1zJQAhSosGFBduPgN/YFNvWVpRuHKU7IHBglLoLZsGmruJPOo6pbInneflUdmq7YvSVqhpPs5zdBvLnteltQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-replace-supers" "^7.5.5"
-
-"@babel/plugin-transform-parameters@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz#7556cf03f318bd2719fe4c922d2d808be5571e16"
-  integrity sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==
-  dependencies:
-    "@babel/helper-call-delegate" "^7.4.4"
-    "@babel/helper-get-function-arity" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-property-literals@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz#03e33f653f5b25c4eb572c98b9485055b389e905"
-  integrity sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-react-display-name@^7.0.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz#ebfaed87834ce8dc4279609a4f0c324c156e3eb0"
-  integrity sha512-Htf/tPa5haZvRMiNSQSFifK12gtr/8vwfr+A9y69uF0QcU77AVu4K7MiHEkTxF7lQoHOL0F9ErqgfNEAKgXj7A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-react-jsx-self@^7.0.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.2.0.tgz#461e21ad9478f1031dd5e276108d027f1b5240ba"
-  integrity sha512-v6S5L/myicZEy+jr6ielB0OR8h+EH/1QFx/YJ7c7Ua+7lqsjj/vW6fD5FR9hB/6y7mGbfT4vAURn3xqBxsUcdg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-jsx" "^7.2.0"
-
-"@babel/plugin-transform-react-jsx-source@^7.0.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.5.0.tgz#583b10c49cf057e237085bcbd8cc960bd83bd96b"
-  integrity sha512-58Q+Jsy4IDCZx7kqEZuSDdam/1oW8OdDX8f+Loo6xyxdfg1yF0GE2XNJQSTZCaMol93+FBzpWiPEwtbMloAcPg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-jsx" "^7.2.0"
-
-"@babel/plugin-transform-react-jsx@^7.0.0":
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz#f2cab99026631c767e2745a5368b331cfe8f5290"
-  integrity sha512-a/+aRb7R06WcKvQLOu4/TpjKOdvVEKRLWFpKcNuHhiREPgGRB4TQJxq07+EZLS8LFVYpfq1a5lDUnuMdcCpBKg==
-  dependencies:
-    "@babel/helper-builder-react-jsx" "^7.3.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-jsx" "^7.2.0"
-
-"@babel/plugin-transform-regenerator@^7.4.5":
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz#629dc82512c55cee01341fb27bdfcb210354680f"
-  integrity sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA==
-  dependencies:
-    regenerator-transform "^0.14.0"
-
-"@babel/plugin-transform-reserved-words@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz#4792af87c998a49367597d07fedf02636d2e1634"
-  integrity sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-shorthand-properties@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz#6333aee2f8d6ee7e28615457298934a3b46198f0"
-  integrity sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-spread@^7.2.0":
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz#3103a9abe22f742b6d406ecd3cd49b774919b406"
-  integrity sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-sticky-regex@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz#a1e454b5995560a9c1e0d537dfc15061fd2687e1"
-  integrity sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.0.0"
-
-"@babel/plugin-transform-template-literals@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz#9d28fea7bbce637fb7612a0750989d8321d4bcb0"
-  integrity sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-typeof-symbol@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz#117d2bcec2fbf64b4b59d1f9819894682d29f2b2"
-  integrity sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-
-"@babel/plugin-transform-unicode-regex@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz#ab4634bb4f14d36728bf5978322b35587787970f"
-  integrity sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/helper-regex" "^7.4.4"
-    regexpu-core "^4.5.4"
-
-"@babel/preset-env@^7.1.0":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.5.5.tgz#bc470b53acaa48df4b8db24a570d6da1fef53c9a"
-  integrity sha512-GMZQka/+INwsMz1A5UEql8tG015h5j/qjptpKY2gJ7giy8ohzU710YciJB5rcKsWGWHiW3RUnHib0E5/m3Tp3A==
-  dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-async-generator-functions" "^7.2.0"
-    "@babel/plugin-proposal-dynamic-import" "^7.5.0"
-    "@babel/plugin-proposal-json-strings" "^7.2.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.5.5"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.2.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
-    "@babel/plugin-syntax-async-generators" "^7.2.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.2.0"
-    "@babel/plugin-syntax-json-strings" "^7.2.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
-    "@babel/plugin-transform-arrow-functions" "^7.2.0"
-    "@babel/plugin-transform-async-to-generator" "^7.5.0"
-    "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
-    "@babel/plugin-transform-block-scoping" "^7.5.5"
-    "@babel/plugin-transform-classes" "^7.5.5"
-    "@babel/plugin-transform-computed-properties" "^7.2.0"
-    "@babel/plugin-transform-destructuring" "^7.5.0"
-    "@babel/plugin-transform-dotall-regex" "^7.4.4"
-    "@babel/plugin-transform-duplicate-keys" "^7.5.0"
-    "@babel/plugin-transform-exponentiation-operator" "^7.2.0"
-    "@babel/plugin-transform-for-of" "^7.4.4"
-    "@babel/plugin-transform-function-name" "^7.4.4"
-    "@babel/plugin-transform-literals" "^7.2.0"
-    "@babel/plugin-transform-member-expression-literals" "^7.2.0"
-    "@babel/plugin-transform-modules-amd" "^7.5.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.5.0"
-    "@babel/plugin-transform-modules-systemjs" "^7.5.0"
-    "@babel/plugin-transform-modules-umd" "^7.2.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.4.5"
-    "@babel/plugin-transform-new-target" "^7.4.4"
-    "@babel/plugin-transform-object-super" "^7.5.5"
-    "@babel/plugin-transform-parameters" "^7.4.4"
-    "@babel/plugin-transform-property-literals" "^7.2.0"
-    "@babel/plugin-transform-regenerator" "^7.4.5"
-    "@babel/plugin-transform-reserved-words" "^7.2.0"
-    "@babel/plugin-transform-shorthand-properties" "^7.2.0"
-    "@babel/plugin-transform-spread" "^7.2.0"
-    "@babel/plugin-transform-sticky-regex" "^7.2.0"
-    "@babel/plugin-transform-template-literals" "^7.4.4"
-    "@babel/plugin-transform-typeof-symbol" "^7.2.0"
-    "@babel/plugin-transform-unicode-regex" "^7.4.4"
-    "@babel/types" "^7.5.5"
-    browserslist "^4.6.0"
-    core-js-compat "^3.1.1"
-    invariant "^2.2.2"
-    js-levenshtein "^1.1.3"
-    semver "^5.5.0"
-
-"@babel/preset-flow@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.0.0.tgz#afd764835d9535ec63d8c7d4caf1c06457263da2"
-  integrity sha512-bJOHrYOPqJZCkPVbG1Lot2r5OSsB+iUOaxiHdlOeB1yPWS6evswVHwvkDLZ54WTaTRIk89ds0iHmGZSnxlPejQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-transform-flow-strip-types" "^7.0.0"
-
-"@babel/preset-react@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0.tgz#e86b4b3d99433c7b3e9e91747e2653958bc6b3c0"
-  integrity sha512-oayxyPS4Zj+hF6Et11BwuBkmpgT/zMxyuZgFrMeZID6Hdh3dGlk4sHCAhdBCpuCKW2ppBfl2uCCetlrUIJRY3w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-transform-react-display-name" "^7.0.0"
-    "@babel/plugin-transform-react-jsx" "^7.0.0"
-    "@babel/plugin-transform-react-jsx-self" "^7.0.0"
-    "@babel/plugin-transform-react-jsx-source" "^7.0.0"
-
-"@babel/preset-stage-0@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-stage-0/-/preset-stage-0-7.0.0.tgz#999aaec79ee8f0a763042c68c06539c97c6e0646"
-  integrity sha512-FBMd0IiARPtH5aaOFUVki6evHiJQiY0pFy7fizyRF7dtwc+el3nwpzvhb9qBNzceG1OIJModG1xpE0DDFjPXwA==
-
-"@babel/template@^7.1.0", "@babel/template@^7.4.4":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz#f4b88d1225689a08f5bc3a17483545be9e4ed237"
-  integrity sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.4.4"
-    "@babel/types" "^7.4.4"
-
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.1.4", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.5.5.tgz#f664f8f368ed32988cd648da9f72d5ca70f165bb"
-  integrity sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==
-  dependencies:
-    "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.5.5"
-    "@babel/helper-function-name" "^7.1.0"
-    "@babel/helper-split-export-declaration" "^7.4.4"
-    "@babel/parser" "^7.5.5"
-    "@babel/types" "^7.5.5"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.13"
-
-"@babel/types@^7.0.0", "@babel/types@^7.1.3", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5":
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.5.5.tgz#97b9f728e182785909aa4ab56264f090a028d18a"
-  integrity sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==
-  dependencies:
-    esutils "^2.0.2"
-    lodash "^4.17.13"
-    to-fast-properties "^2.0.0"
-
 "@braintree/sanitize-url@^3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-3.1.0.tgz#8ff71d51053cd5ee4981e5a501d80a536244f7fd"
@@ -964,17 +65,17 @@
   integrity sha512-2KhFjtPueJG6xVj2HnqXt9BlANOfYCVLyu+pXYjPGBDT8yk+vQwc/6tsceIj+mayKcoxMau2JimggXRPHgoc8w==
 
 "@types/body-parser@*":
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.0.tgz#9f5c9d9bd04bb54be32d5eb9fc0d8c974e6cf58c"
-  integrity sha512-a2+YeUjPkztKJu5aIF2yArYFQQp8d51wZ7DavSHjFuY1mqVgidGyzEQ41JIVNy82fXj8yPgy2vJmfIywgESW6w==
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f"
+  integrity sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==
   dependencies:
     "@types/connect" "*"
     "@types/node" "*"
 
 "@types/connect@*":
-  version "3.4.32"
-  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.32.tgz#aa0e9616b9435ccad02bc52b5b454ffc2c70ba28"
-  integrity sha512-4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg==
+  version "3.4.33"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.33.tgz#31610c901eca573b8713c3330abc6e6b9f588546"
+  integrity sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==
   dependencies:
     "@types/node" "*"
 
@@ -984,26 +85,31 @@
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
 "@types/express-serve-static-core@*":
-  version "4.16.6"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.16.6.tgz#66d4b29ece3e2fb6e5aac2232723002426e651bd"
-  integrity sha512-8wr3CA/EMybyb6/V8qvTRKiNkPmgUA26uA9XWD6hlA0yFDuqi4r2L0C2B0U2HAYltJamoYJszlkaWM31vrKsHg==
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.2.tgz#f6f41fa35d42e79dbf6610eccbb2637e6008a0cf"
+  integrity sha512-El9yMpctM6tORDAiBwZVLMcxoTMcqqRO9dVyYcn7ycLWbvR8klrDn8CAOwRfZujZtWD7yS/mshTdz43jMOejbg==
   dependencies:
     "@types/node" "*"
     "@types/range-parser" "*"
 
 "@types/express@*":
-  version "4.16.1"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.16.1.tgz#d756bd1a85c34d87eaf44c888bad27ba8a4b7cf0"
-  integrity sha512-V0clmJow23WeyblmACoxbHBu2JKlE5TiIme6Lem14FnPW9gsttyHtk6wq7njcdIWH1njAaFgR8gW09lgY98gQg==
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.2.tgz#a0fb7a23d8855bac31bc01d5a58cadd9b2173e6c"
+  integrity sha512-5mHFNyavtLoJmnusB8OKJ5bshSzw+qkMIBAobLrIM48HJvunFva9mOa6aBwh64lBFyNwBbs0xiEFuj4eU/NjCA==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "*"
     "@types/serve-static" "*"
 
+"@types/geojson@^7946.0.7":
+  version "7946.0.7"
+  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz#c8fa532b60a0042219cdf173ca21a975ef0666ad"
+  integrity sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==
+
 "@types/ldapjs@^1.0.0":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-1.0.4.tgz#06774665035fbb277133d8cde800d18c7993707f"
-  integrity sha512-TXOYipuauiZV+nRslqgm02+wP007GNN7ZFHZtXe8GhnRJw2zxCOtVDi3ZnKTBxbZhFz3xPFSwJ5bCIRmXDMqTg==
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-1.0.5.tgz#2b078dff23dc068e12a8236b280d5fb4fd9db4db"
+  integrity sha512-hrtMZjVfWNPxkwFkYhLAU0ITZ3/reDft4jDzLBvrGDSKCbEvW+GeZb4PgM3jlSwSsv0cXqnDeWcupFLIgW9E0Q==
   dependencies:
     "@types/node" "*"
 
@@ -1012,20 +118,30 @@
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz#dc488842312a7f075149312905b5e3c0b054c79d"
   integrity sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw==
 
-"@types/node@*":
-  version "12.0.3"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.3.tgz#5d8d24e0033fc6393efadc85cb59c1f638095c9a"
-  integrity sha512-zkOxCS/fA+3SsdA+9Yun0iANxzhQRiNwTvJSr6N95JhuJ/x27z9G2URx1Jpt3zYFfCGUXZGL5UDxt5eyLE7wgw==
+"@types/node@*", "@types/node@>=8.0.0":
+  version "13.7.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.1.tgz#238eb34a66431b71d2aaddeaa7db166f25971a0d"
+  integrity sha512-Zq8gcQGmn4txQEJeiXo/KiLpon8TzAl0kmKH4zdWctPj05nWwp1ClMdAVEloqrQKfaC48PNLdgN/aVaLqUrluA==
 
 "@types/node@^10.12.12", "@types/node@^10.12.26":
-  version "10.14.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.7.tgz#1854f0a9aa8d2cd6818d607b3d091346c6730362"
-  integrity sha512-on4MmIDgHXiuJDELPk1NFaKVUxxCFr37tm8E9yN6rAiF5Pzp/9bBfBHkoexqRiY+hk/Z04EJU9kKEb59YqJ82A==
+  version "10.17.15"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.15.tgz#bfff4e23e9e70be6eec450419d51e18de1daf8e7"
+  integrity sha512-daFGV9GSs6USfPgxceDA8nlSe48XrVCJfDeYm7eokxq/ye7iuOH87hKXgMtEAVLFapkczbZsx868PMDT1Y0a6A==
+
+"@types/node@^12.12.17":
+  version "12.12.27"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.27.tgz#d7506f73160ad30fcebbcf5b8b7d2d976e649e42"
+  integrity sha512-odQFl/+B9idbdS0e8IxDl2ia/LP8KZLXhV3BUeI98TrZp0uoIzQPhGd+5EtzHmT0SMOIaPd7jfz6pOHLWTtl7A==
+
+"@types/node@^8.0.47":
+  version "8.10.59"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.59.tgz#9e34261f30183f9777017a13d185dfac6b899e04"
+  integrity sha512-8RkBivJrDCyPpBXhVZcjh7cQxVBSmRk9QM7hOketZzp6Tg79c0N8kkpAIito9bnJ3HCVCHVYz+KHTEbfQNfeVQ==
 
 "@types/passport@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/passport/-/passport-1.0.0.tgz#747fa127a747a145ff279f3df3e07c425e5ff297"
-  integrity sha512-R2FXqM+AgsMIym0PuKj08Ybx+GR6d2rU3b1/8OcHolJ+4ga2pRPX105wboV6hq1AJvMo2frQzYKdqXS5+4cyMw==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@types/passport/-/passport-1.0.2.tgz#f085033e2b301b1f97d4b57bfa73d8e934650c63"
+  integrity sha512-Pf39AYKf8q+YoONym3150cEwfUD66dtwHJWvbeOzKxnA0GZZ/vAXhNWv9vMhKyRQBQZiQyWQnhYBEBlKW6G8wg==
   dependencies:
     "@types/express" "*"
 
@@ -1039,18 +155,28 @@
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c"
   integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
 
+"@types/readable-stream@^2.3.5":
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.5.tgz#99c215f9c78563ebdfeff400246a724fb36bae4a"
+  integrity sha512-Mq2eLkGYamlcolW603FY2ROBvcl90jPF+3jLkjpBV6qS+2aVeJqlgRG0TVAa1oWbmPdb5yOWlOPVvQle76nUNw==
+  dependencies:
+    "@types/node" "*"
+    safe-buffer "*"
+
 "@types/serve-static@*":
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.2.tgz#f5ac4d7a6420a99a6a45af4719f4dcd8cd907a48"
-  integrity sha512-/BZ4QRLpH/bNYgZgwhKEh+5AsboDBcUdlBYgzoLX0fpj3Y2gp6EApyOlM3bK53wQS/OE1SrdSYBAbux2D1528Q==
+  version "1.13.3"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.3.tgz#eb7e1c41c4468272557e897e9171ded5e2ded9d1"
+  integrity sha512-oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g==
   dependencies:
     "@types/express-serve-static-core" "*"
     "@types/mime" "*"
 
-"@types/unist@^2.0.0", "@types/unist@^2.0.2":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
-  integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
+"@types/tunnel@0.0.0":
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/@types/tunnel/-/tunnel-0.0.0.tgz#c2a42943ee63c90652a5557b8c4e56cda77f944e"
+  integrity sha512-FGDp0iBRiBdPjOgjJmn1NH0KDLN+Z8fRmo+9J7XGBhubq1DPrGrbmG4UTlGzrpbCpesMqD0sWkzi27EYkOMHyg==
+  dependencies:
+    "@types/node" "*"
 
 "@webassemblyjs/ast@1.8.5":
   version "1.8.5"
@@ -1212,23 +338,15 @@
   version "0.0.1"
   resolved "git+https://github.com/shawnmclean/Idle.js#db9beb3483a460ad638ec947867720f0ed066a62"
 
-JSONStream@^1.0.3:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
-  integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
-  dependencies:
-    jsonparse "^1.2.0"
-    through ">=2.2.7 <3"
-
 JSV@^4.0.x:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/JSV/-/JSV-4.0.2.tgz#d077f6825571f82132f9dffaed587b4029feff57"
   integrity sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c=
 
 abab@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f"
-  integrity sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
+  integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
 
 abbrev@1:
   version "1.1.1"
@@ -1249,32 +367,57 @@ acorn-dynamic-import@^4.0.0:
   integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
 
 acorn-globals@^4.1.0:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.2.tgz#4e2c2313a597fd589720395f6354b41cd5ec8006"
-  integrity sha512-BbzvZhVtZP+Bs1J1HcwrQe8ycfO0wStkSGxuul3He3GkHOIZ6eTqOkPuw9IP1X3+IkOo4wiJmwkobzXYz4wewQ==
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7"
+  integrity sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==
   dependencies:
     acorn "^6.0.1"
     acorn-walk "^6.0.1"
 
 acorn-jsx@^5.0.0, acorn-jsx@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e"
-  integrity sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384"
+  integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==
 
 acorn-walk@^6.0.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913"
-  integrity sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"
+  integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
 
-acorn@^5.1.0, acorn@^5.2.1, acorn@^5.5.3:
+acorn-walk@^7.0.0:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz#345f0dffad5c735e7373d2fec9a1023e6a44b83e"
+  integrity sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==
+
+acorn@^5.5.3:
   version "5.7.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
   integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
 
-acorn@^6.0.1, acorn@^6.0.5, acorn@^6.0.7, acorn@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
-  integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
+acorn@^6.0.1, acorn@^6.0.7, acorn@^6.1.1, acorn@^6.2.1:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784"
+  integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==
+
+acorn@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c"
+  integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==
+
+adal-node@^0.1.28:
+  version "0.1.28"
+  resolved "https://registry.yarnpkg.com/adal-node/-/adal-node-0.1.28.tgz#468c4bb3ebbd96b1270669f4b9cba4e0065ea485"
+  integrity sha1-RoxLs+u9lrEnBmn0ucuk4AZepIU=
+  dependencies:
+    "@types/node" "^8.0.47"
+    async ">=0.6.0"
+    date-utils "*"
+    jws "3.x.x"
+    request ">= 2.52.0"
+    underscore ">= 1.3.1"
+    uuid "^3.1.0"
+    xmldom ">= 0.1.x"
+    xpath.js "~1.1.0"
 
 after@0.8.2:
   version "0.8.2"
@@ -1286,17 +429,17 @@ ajv-errors@^1.0.0:
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
   integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
 
-ajv-keywords@^3.1.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d"
-  integrity sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==
+ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
+  integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
 
-ajv@^6.1.0, ajv@^6.5.5, ajv@^6.9.1:
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
-  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
+ajv@^6.1.0, ajv@^6.10.2, ajv@^6.5.5, ajv@^6.9.1:
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz#c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9"
+  integrity sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==
   dependencies:
-    fast-deep-equal "^2.0.1"
+    fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
@@ -1315,15 +458,7 @@ alphanum-sort@^1.0.0:
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
   integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
 
-ambi@^2.2.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/ambi/-/ambi-2.5.0.tgz#7c8e372be48891157e7cea01cb6f9143d1f74220"
-  integrity sha1-fI43K+SIkRV+fOoBy2+RQ9H3QiA=
-  dependencies:
-    editions "^1.1.1"
-    typechecker "^4.3.0"
-
-ansi-colors@^3.2.4:
+ansi-colors@^3.0.0:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
   integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
@@ -1333,18 +468,6 @@ ansi-escapes@^3.2.0:
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
-ansi-gray@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
-  integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE=
-  dependencies:
-    ansi-wrap "0.1.0"
-
-ansi-html@^0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
-  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
-
 ansi-regex@^2.0.0, ansi-regex@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@@ -1377,10 +500,10 @@ ansi-styles@~1.0.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
   integrity sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=
 
-ansi-wrap@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
-  integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
+ansicolors@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
+  integrity sha1-ZlWX3oap/+Oqm/vmyuXG6kJrSXk=
 
 any-promise@^1.3.0:
   version "1.3.0"
@@ -1403,13 +526,6 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-append-buffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz#d8220cf466081525efea50614f3de6514dfa58f1"
-  integrity sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=
-  dependencies:
-    buffer-equal "^1.0.0"
-
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@@ -1449,21 +565,13 @@ are-we-there-yet@~1.1.2:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
 
-argparse@^1.0.7:
+argparse@^1.0.10, argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
   integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
-argparse@~0.1.15:
-  version "0.1.16"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-0.1.16.tgz#cfd01e0fbba3d6caed049fbd758d40f65196f57c"
-  integrity sha1-z9AeD7uj1srtBJ+9dY1A9lGW9Xw=
-  dependencies:
-    underscore "~1.7.0"
-    underscore.string "~2.4.0"
-
 arr-diff@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
@@ -1497,12 +605,13 @@ array-flatten@1.1.1:
   integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
 
 array-includes@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
-  integrity sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348"
+  integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==
   dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.7.0"
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0"
+    is-string "^1.0.5"
 
 array-union@^1.0.1:
   version "1.0.2"
@@ -1526,6 +635,14 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
+array.prototype.flat@^1.2.1:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b"
+  integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+
 arraybuffer.slice@~0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
@@ -1591,45 +708,52 @@ async-each@^1.0.0, async-each@^1.0.1:
   integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
 
 async-limiter@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
-  integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
+  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
 
-async@^1.4.0, async@^1.5.2, async@~1.5.2:
+async@>=0.6.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.1.1.tgz#dd3542db03de837979c9ebbca64ca01b06dc98df"
+  integrity sha512-X5Dj8hK1pJNC2Wzo2Rcp9FBVdJMGRR/S7V+lH46s8GVFhtbo5O4Le5GECCF/8PISVdkUA6mMPvgz7qTTD1rf1g==
+
+async@^1.4.0, async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
   integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
-async@^2.0.0, async@^2.1.4, async@^2.1.5, async@^2.6.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381"
-  integrity sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==
+async@^2.0.0, async@^2.1.4, async@^2.6.1:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
+  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
   dependencies:
-    lodash "^4.17.11"
+    lodash "^4.17.14"
 
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
-atob@^2.1.1:
+atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-autolinker@~0.15.0:
-  version "0.15.3"
-  resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.15.3.tgz#342417d8f2f3461b14cf09088d5edf8791dc9832"
-  integrity sha1-NCQX2PLzRhsUzwkIjV7fh5HcmDI=
+autolinker@^3.11.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-3.12.0.tgz#1184397c85828041975a3b3135032b7b931966c6"
+  integrity sha512-iQAz75LAZ0dmlaMaIXX0Z+X4yuI6gxONZ14h0YTO0j/3d9DltyD+qkbINpocVZ8oCjMSJUdBeRfrXzGf/zvGZQ==
+  dependencies:
+    tslib "^1.9.3"
 
 aws-sdk@^2.345.0:
-  version "2.465.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.465.0.tgz#60948a0930473f50bac23311bc48426118e79f12"
-  integrity sha512-eS3g80QUbhOo0Rd/WTudtlc4cuNpLget6Re1KyDod6319QvW2il1q28VyvZK0/Yiu8GyVh5xGbThaLEQem+fLQ==
+  version "2.619.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.619.0.tgz#daacd97fb8d948c10278071129c12908039ab542"
+  integrity sha512-qujQf27p3mrGZGCL+C+vXCEB08AMm6gS1572fgHrVLBXfy6SjhV4dzEYtt+ZptQm+8z0zuHsDqghJuBCcdpxqQ==
   dependencies:
     buffer "4.9.1"
     events "1.1.1"
-    ieee754 "1.1.8"
+    ieee754 "1.1.13"
     jmespath "0.15.0"
     querystring "0.2.0"
     sax "1.2.1"
@@ -1643,9 +767,16 @@ aws-sign2@~0.7.0:
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
-  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
+  integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
+
+axios@^0.19.0:
+  version "0.19.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
+  integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
+  dependencies:
+    follow-redirects "1.5.10"
 
 azure-storage@^2.7.0:
   version "2.10.3"
@@ -1657,7 +788,7 @@ azure-storage@^2.7.0:
     json-edm-parser "0.1.2"
     md5.js "1.3.4"
     readable-stream "~2.0.0"
-    request "^2.88.0"
+    request "^2.86.0"
     underscore "~1.8.3"
     uuid "^3.0.0"
     validator "~9.4.1"
@@ -1870,13 +1001,6 @@ babel-plugin-check-es2015-constants@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-dynamic-import-node@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f"
-  integrity sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==
-  dependencies:
-    object.assign "^4.1.0"
-
 babel-plugin-syntax-async-functions@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
@@ -2180,7 +1304,7 @@ babel-register@^6.26.0:
     mkdirp "^0.5.1"
     source-map-support "^0.4.15"
 
-babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.26.0, babel-runtime@^6.9.2:
+babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
   integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
@@ -2224,11 +1348,6 @@ babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
     lodash "^4.17.4"
     to-fast-properties "^1.0.3"
 
-babelify@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/babelify/-/babelify-10.0.0.tgz#fe73b1a22583f06680d8d072e25a1e0d1d1d7fb5"
-  integrity sha512-X40FaxyH7t3X+JFAKvb1H9wooWKLRCi8pg3m8poqtdZaIng+bjzp9RvKQCvRjF9isHiPkXspbbXT/zwXLtwgwg==
-
 babylon@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
@@ -2246,11 +1365,6 @@ backoff@^2.5.0:
   dependencies:
     precond "0.2"
 
-bail@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.4.tgz#7181b66d508aa3055d3f6c13f0a0c720641dde9b"
-  integrity sha512-S8vuDB4w6YpRhICUDET3guPlQpaJl7od94tpZ0Fvnyp+MKW/HyDTcRDck+29C9g+d/qQHnddRH3+94kZdrW0Ww==
-
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
@@ -2262,9 +1376,9 @@ base64-arraybuffer@0.1.5:
   integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
 
 base64-js@^1.0.2:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
-  integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
+  integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
 
 base64id@1.0.0:
   version "1.0.0"
@@ -2315,16 +1429,6 @@ better-assert@~1.0.0:
   dependencies:
     callsite "1.0.0"
 
-big-number@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/big-number/-/big-number-0.3.1.tgz#ac73020c0a59bb79eb17c2ce2db77f77d974e013"
-  integrity sha1-rHMCDApZu3nrF8LOLbd/d9l04BM=
-
-big.js@^3.1.3:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
-  integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==
-
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
@@ -2335,6 +1439,13 @@ binary-extensions@^1.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
   integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
+bindings@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
+  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
+  dependencies:
+    file-uri-to-path "1.0.0"
+
 bl@^1.0.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
@@ -2343,12 +1454,20 @@ bl@^1.0.0:
     readable-stream "^2.3.5"
     safe-buffer "^5.1.1"
 
-blint@^1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/blint/-/blint-1.0.3.tgz#a58d344ae4bf0ebb917316cfa3a5948e8d92fe10"
-  integrity sha512-6RwH3oJYMujQNd38WWU+jUSRqWfECrmpfL8o3fn3Q3fE9nn5iAktLZJHGEHqeecownbZZwZneTLbaNbIWwU9/A==
+bl@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-3.0.0.tgz#3611ec00579fd18561754360b21e9f784500ff88"
+  integrity sha512-EUAyP5UHU5hxF8BPT0LKW8gjYLhq1DQIcneOX/pL/m2Alo+OYDQAJlHq+yseMP50Os2nHXOSic6Ss3vSQeyf4A==
   dependencies:
-    acorn "^5.1.0"
+    readable-stream "^3.0.1"
+
+blint@^1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/blint/-/blint-1.1.0.tgz#9fcc8134296651099062f8d2ee359e83c7bff8ba"
+  integrity sha512-XSNoVy5Hu6fE3xSL4M7EDrIL5UrxkMlSpOChF9rf3aEKyx1/hI/WIetmfS72JVcDUozbl7usaVt5hWx620Fjig==
+  dependencies:
+    acorn "^7.0.0"
+    acorn-walk "^7.0.0"
     nomnom "^1.8.1"
 
 blob@0.0.5:
@@ -2365,10 +1484,10 @@ block-stream2@^1.0.0:
     inherits "^2.0.1"
     readable-stream "^2.0.4"
 
-bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.3:
-  version "3.5.5"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
-  integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==
+bluebird@^3.5.0, bluebird@^3.5.3, bluebird@^3.5.5:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
@@ -2391,16 +1510,6 @@ body-parser@1.19.0, body-parser@^1.15.2:
     raw-body "2.4.0"
     type-is "~1.6.17"
 
-body@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069"
-  integrity sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=
-  dependencies:
-    continuable-cache "^0.3.1"
-    error "^7.0.0"
-    raw-body "~1.1.0"
-    safe-json-parse "~1.0.1"
-
 boolbase@^1.0.0, boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
@@ -2416,6 +1525,11 @@ bootstrap@^3.4.0:
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz#c3a347d419e289ad11f4033e3c4132b87c081d72"
   integrity sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==
 
+bowser@^2.7.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.9.0.tgz#3bed854233b419b9a7422d9ee3e85504373821c9"
+  integrity sha512-2ld76tuLBNFekRgmJfT2+3j5MIrP6bFict8WAIT3beq+srz1gcKNAdNKMqHqauQt63NmAa88HfP1/Ypa9Er3HA==
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -2459,13 +1573,6 @@ browser-process-hrtime@^0.1.2:
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4"
   integrity sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==
 
-browser-resolve@^1.7.0:
-  version "1.11.3"
-  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"
-  integrity sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==
-  dependencies:
-    resolve "1.1.7"
-
 browser-stdout@1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
@@ -2544,35 +1651,26 @@ browserslist@^3.2.6:
     electron-to-chromium "^1.3.47"
 
 browserslist@^4.0.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.1.tgz#ee5059b1aec18cbec9d055d6cb5e24ae50343a9b"
-  integrity sha512-1MC18ooMPRG2UuVFJTHFIAkk6mpByJfxCrnUyvSlu/hyQSFHMrlhM02SzNuCV+quTP4CKmqtOMAIjrifrpBJXQ==
+  version "4.8.7"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.7.tgz#ec8301ff415e6a42c949d0e66b405eb539c532d0"
+  integrity sha512-gFOnZNYBHrEyUML0xr5NJ6edFaaKbTFX9S9kQHlYfCP0Rit/boRIz4G+Avq6/4haEKJXdGGUnoolx+5MWW2BoA==
   dependencies:
-    caniuse-lite "^1.0.30000971"
-    electron-to-chromium "^1.3.137"
-    node-releases "^1.1.21"
+    caniuse-lite "^1.0.30001027"
+    electron-to-chromium "^1.3.349"
+    node-releases "^1.1.49"
 
-browserslist@^4.6.0, browserslist@^4.6.2:
-  version "4.6.6"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.6.tgz#6e4bf467cde520bc9dbdf3747dafa03531cec453"
-  integrity sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==
-  dependencies:
-    caniuse-lite "^1.0.30000984"
-    electron-to-chromium "^1.3.191"
-    node-releases "^1.1.25"
-
-buble@^0.19.6:
-  version "0.19.7"
-  resolved "https://registry.yarnpkg.com/buble/-/buble-0.19.7.tgz#1dfd080ab688101aad5388d3304bc82601a244fd"
-  integrity sha512-YLgWxX/l+NnfotydBlxqCMPR4FREE4ubuHphALz0FxQ7u2hp3BzxTKQ4nKpapOaRJfEm1gukC68KnT2OymRK0g==
+buble@^0.19.8:
+  version "0.19.8"
+  resolved "https://registry.yarnpkg.com/buble/-/buble-0.19.8.tgz#d642f0081afab66dccd897d7b6360d94030b9d3d"
+  integrity sha512-IoGZzrUTY5fKXVkgGHw3QeXFMUNBFv+9l8a4QJKG1JhG3nCMHTdEX1DCOg8568E2Q9qvAQIiSokv6Jsgx8p2cA==
   dependencies:
     acorn "^6.1.1"
     acorn-dynamic-import "^4.0.0"
     acorn-jsx "^5.0.1"
     chalk "^2.4.2"
-    magic-string "^0.25.2"
+    magic-string "^0.25.3"
     minimist "^1.2.0"
-    os-homedir "^1.0.1"
+    os-homedir "^2.0.0"
     regexpu-core "^4.5.4"
 
 buffer-alloc-unsafe@^1.1.0:
@@ -2593,10 +1691,10 @@ buffer-crc32@^0.2.1:
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
   integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
 
-buffer-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe"
-  integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74=
+buffer-equal-constant-time@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
+  integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=
 
 buffer-fill@^1.0.0:
   version "1.0.0"
@@ -2608,22 +1706,17 @@ buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
-buffer-shims@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
-  integrity sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=
-
-buffer-writer@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-1.0.1.tgz#22a936901e3029afcd7547eb4487ceb697a3bf08"
-  integrity sha1-Iqk2kB4wKa/NdUfrRIfOtpejvwg=
+buffer-writer@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz#ce7eb81a38f7829db09c873f2fbb792c0c98ec04"
+  integrity sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==
 
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
   integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
 
-buffer@4.9.1, buffer@^4.3.0:
+buffer@4.9.1:
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
   integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
@@ -2632,10 +1725,19 @@ buffer@4.9.1, buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
+buffer@^4.3.0:
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
+  integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+    isarray "^1.0.0"
+
 buffer@^5.1.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.2.1.tgz#dd57fa0f109ac59c602479044dca7b8b3d0b71d6"
-  integrity sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==
+  version "5.4.3"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.4.3.tgz#3fbc9c69eb713d323e3fc1a895eee0710c072115"
+  integrity sha512-zvj65TkFeIt3i6aj5bIvJDzjjQQGs4o/sNoezg1F1kYap9Nu2jcUdpwzRSJTHMMzG0H7bZkn4rNQpImhuxWX2A==
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
@@ -2662,11 +1764,6 @@ bunyan@^1.8.3:
     mv "~2"
     safe-json-stringify "~1"
 
-bytes@1:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz#3569ede8ba34315fab99c3e92cb04c7220de1fa8"
-  integrity sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=
-
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
@@ -2677,41 +1774,23 @@ bytes@3.1.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
   integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
-cacache@^10.0.4:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
-  integrity sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==
+cacache@^12.0.2, cacache@^12.0.3:
+  version "12.0.3"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390"
+  integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==
   dependencies:
-    bluebird "^3.5.1"
-    chownr "^1.0.1"
-    glob "^7.1.2"
-    graceful-fs "^4.1.11"
-    lru-cache "^4.1.1"
-    mississippi "^2.0.0"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    promise-inflight "^1.0.1"
-    rimraf "^2.6.2"
-    ssri "^5.2.4"
-    unique-filename "^1.1.0"
-    y18n "^4.0.0"
-
-cacache@^11.3.2:
-  version "11.3.2"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
-  integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==
-  dependencies:
-    bluebird "^3.5.3"
+    bluebird "^3.5.5"
     chownr "^1.1.1"
     figgy-pudding "^3.5.1"
-    glob "^7.1.3"
+    glob "^7.1.4"
     graceful-fs "^4.1.15"
+    infer-owner "^1.0.3"
     lru-cache "^5.1.1"
     mississippi "^3.0.0"
     mkdirp "^0.5.1"
     move-concurrently "^1.0.1"
     promise-inflight "^1.0.1"
-    rimraf "^2.6.2"
+    rimraf "^2.6.3"
     ssri "^6.0.1"
     unique-filename "^1.1.1"
     y18n "^4.0.0"
@@ -2731,11 +1810,6 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
-cached-path-relative@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.2.tgz#a13df4196d26776220cc3356eb147a52dba2c6db"
-  integrity sha512-5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg==
-
 caller-callsite@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
@@ -2765,7 +1839,7 @@ callsites@^3.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camel-case@3.0.x, camel-case@^3.0.0:
+camel-case@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
   integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=
@@ -2778,7 +1852,7 @@ camelcase@^1.0.2:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
   integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
 
-camelcase@^5.0.0:
+camelcase@^5.0.0, camelcase@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
@@ -2798,26 +1872,24 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000971:
-  version "1.0.30000971"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000971.tgz#d1000e4546486a6977756547352bc96a4cfd2b13"
-  integrity sha512-TQFYFhRS0O5rdsmSbF1Wn+16latXYsQJat66f7S7lizXW1PVpWJeZw9wqqVLIjuxDRz7s7xRUj13QCfd8hKn6g==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001027:
+  version "1.0.30001027"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001027.tgz#283e2ef17d94889cc216a22c6f85303d78ca852d"
+  integrity sha512-7xvKeErvXZFtUItTHgNtLgS9RJpVnwBlWX8jSo/BO8VsF6deszemZSkJJJA1KOKrXuzZH4WALpAJdq5EyfgMLg==
 
-caniuse-lite@^1.0.30000984:
-  version "1.0.30000988"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000988.tgz#742f35ec1b8b75b9628d705d7652eea1fef983db"
-  integrity sha512-lPj3T8poYrRc/bniW5SQPND3GRtSrQdUM/R4mCYTbZxyi3jQiggLvZH4+BYUuX0t4TXjU+vMM7KFDQg+rSzZUQ==
+cardinal@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-2.1.1.tgz#7cc1055d822d212954d07b085dea251cc7bc5505"
+  integrity sha1-fMEFXYItISlU0HsIXeolHMe8VQU=
+  dependencies:
+    ansicolors "~0.3.2"
+    redeyed "~2.1.0"
 
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-ccount@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.4.tgz#9cf2de494ca84060a2a8d2854edd6dfb0445f386"
-  integrity sha512-fpZ81yYfzentuieinmGnphk0pLkOTMm6MZdVqwd77ROvhko6iujLNGrHH5E7utq3ygWklwfmwuG+A7P+NpqT6w==
-
 center-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
@@ -2826,6 +1898,15 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
+chalk@2.4.2, chalk@^2.0.0, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
 chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -2837,15 +1918,6 @@ chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
 chalk@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
@@ -2856,29 +1928,9 @@ chalk@~0.4.0:
     strip-ansi "~0.1.0"
 
 chance@^1.0.4:
-  version "1.0.18"
-  resolved "https://registry.yarnpkg.com/chance/-/chance-1.0.18.tgz#79788fe6fca4c338bf404321c347eecc80f969ee"
-  integrity sha512-g9YLQVHVZS/3F+zIicfB58vjcxopvYQRp7xHzvyDFDhXH1aRZI/JhwSAO0X5qYiQluoGnaNAU6wByD2KTxJN1A==
-
-character-entities-html4@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.3.tgz#5ce6e01618e47048ac22f34f7f39db5c6fd679ef"
-  integrity sha512-SwnyZ7jQBCRHELk9zf2CN5AnGEc2nA+uKMZLHvcqhpPprjkYhiLn0DywMHgN5ttFZuITMATbh68M6VIVKwJbcg==
-
-character-entities-legacy@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.3.tgz#3c729991d9293da0ede6dddcaf1f2ce1009ee8b4"
-  integrity sha512-YAxUpPoPwxYFsslbdKkhrGnXAtXoHNgYjlBM3WMXkWGTl5RsY3QmOyhwAgL8Nxm9l5LBThXGawxKPn68y6/fww==
-
-character-entities@^1.0.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.3.tgz#bbed4a52fe7ef98cc713c6d80d9faa26916d54e6"
-  integrity sha512-yB4oYSAa9yLcGyTbB4ItFwHw43QHdH129IJ5R+WvxOkWlyFnR5FAaBNnUq4mcxsTVZGh28bHoeTHMKXH1wZf3w==
-
-character-reference-invalid@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.3.tgz#1647f4f726638d3ea4a750cf5d1975c1c7919a85"
-  integrity sha512-VOq6PRzQBam/8Jm6XBGk2fNEnHXAdGd6go0rtd4weAGECBamHDwwCQSOT12TACIYUZegUXnV6xBXqUssijtxIg==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/chance/-/chance-1.1.4.tgz#d8743bf8e40bb05e024c305ca1ff441195eb23db"
+  integrity sha512-pXPDSu3knKlb6H7ahQfpq//J9mSOxYK8SMtp8MV/nRJh8aLRDIl0ipLH8At8+nVogVwtvPZzyIzY/EbcY/cLuQ==
 
 chardet@^0.7.0:
   version "0.7.0"
@@ -2923,10 +1975,10 @@ chokidar@^1.6.1, chokidar@^1.7.0:
   optionalDependencies:
     fsevents "^1.0.0"
 
-chokidar@^2.0.2, chokidar@^2.0.4:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.6.tgz#b6cad653a929e244ce8a834244164d241fa954c5"
-  integrity sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==
+chokidar@^2.0.2:
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
+  integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.1"
@@ -2942,12 +1994,12 @@ chokidar@^2.0.2, chokidar@^2.0.4:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chownr@^1.0.1, chownr@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
-  integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
+chownr@^1.1.1:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
+  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
 
-chrome-trace-event@^1.0.0:
+chrome-trace-event@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
   integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==
@@ -2972,10 +2024,10 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-clean-css@4.2.x, clean-css@^4.1.6, clean-css@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
-  integrity sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==
+clean-css@^4.1.6, clean-css@^4.2.1:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
+  integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==
   dependencies:
     source-map "~0.6.0"
 
@@ -3021,15 +2073,6 @@ cliui@^2.1.0:
     right-align "^0.1.1"
     wordwrap "0.0.2"
 
-cliui@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
-  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
-  dependencies:
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-    wrap-ansi "^2.0.0"
-
 cliui@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
@@ -3039,30 +2082,11 @@ cliui@^5.0.0:
     strip-ansi "^5.2.0"
     wrap-ansi "^5.1.0"
 
-clone-buffer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
-  integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg=
-
-clone-stats@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
-  integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=
-
-clone@^2.1.1:
+clone@^2.1.1, clone@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
   integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
 
-cloneable-readable@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec"
-  integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==
-  dependencies:
-    inherits "^2.0.1"
-    process-nextick-args "^2.0.0"
-    readable-stream "^2.3.5"
-
 cls-bluebird@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cls-bluebird/-/cls-bluebird-2.1.0.tgz#37ef1e080a8ffb55c2f4164f536f1919e7968aee"
@@ -3086,8 +2110,8 @@ code-point-at@^1.0.0:
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
 "codemirror@git+https://github.com/hackmdio/CodeMirror.git":
-  version "5.46.1"
-  resolved "git+https://github.com/hackmdio/CodeMirror.git#8ce8e8820da8f51d852bda1e0b9a5394eb8ea8d3"
+  version "5.49.3"
+  resolved "git+https://github.com/hackmdio/CodeMirror.git#2ac9b9f25707606b0c09b99decaf9d08dd434570"
   dependencies:
     blint "^1"
     node-static "0.7.11"
@@ -3097,11 +2121,6 @@ code-point-at@^1.0.0:
     rollup-watch "^4.3.1"
     uglify-js "^2.8.15"
 
-collapse-white-space@^1.0.0, collapse-white-space@^1.0.2:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.5.tgz#c2495b699ab1ed380d29a1091e01063e75dbbe3a"
-  integrity sha512-703bOOmytCYAX9cXYqoikYIx6twmFCXsnzRQheBcTG3nzKYBR4P/+wkYeH+Mvj7qUz8zZDtdyzbxfnEi/kYzRQ==
-
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -3135,11 +2154,6 @@ color-string@^1.5.2:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
-color-support@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
-  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
-
 color@3.0.x:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/color/-/color-3.0.0.tgz#d920b4328d534a3ac8295d68f7bd4ba6c427be9a"
@@ -3149,9 +2163,9 @@ color@3.0.x:
     color-string "^1.5.2"
 
 color@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/color/-/color-3.1.1.tgz#7abf5c0d38e89378284e873c207ae2172dcc8a61"
-  integrity sha512-PvUltIXRjehRKPSy89VnDWFKY58xyhTLyxIg21vwQBI6qLwZNPmC8k3C1uytIgFKEpOIzN4y32iPm8231zFHIg==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/color/-/color-3.1.2.tgz#68148e7f85d41ad7649c5fa8c8106f098d229e10"
+  integrity sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==
   dependencies:
     color-convert "^1.9.1"
     color-string "^1.5.2"
@@ -3162,9 +2176,9 @@ colornames@^1.1.1:
   integrity sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=
 
 colors@>=0.6.0, colors@^1.2.1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.3.tgz#39e005d546afe01e01f9c4ca8fa50f686a01205d"
-  integrity sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
 colorspace@1.1.x:
   version "1.1.2"
@@ -3181,35 +2195,25 @@ combined-stream@^1.0.5, combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-comma-separated-tokens@^1.0.1:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.7.tgz#419cd7fb3258b1ed838dc0953167a25e152f5b59"
-  integrity sha512-Jrx3xsP4pPv4AwJUDWY9wOXGtwPXARej6Xd99h4TUGotmf8APuquKMpK+dnD3UgyxK7OEWaisjZz+3b5jtL6xQ==
-
-commander@2, commander@^2.11.0, commander@^2.13.0, commander@^2.19.0, commander@^2.2.0, commander@^2.9.0, commander@~2.20.0:
-  version "2.20.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
-  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
+commander@2, commander@^2.11.0, commander@^2.13.0, commander@^2.19.0, commander@^2.20.0, commander@^2.9.0, commander@~2.20.3:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
 commander@2.15.1:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
   integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==
 
-commander@2.17.x:
-  version "2.17.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
-  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
+commander@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e"
+  integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==
 
-commander@~2.13.0:
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
-  integrity sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==
-
-commander@~2.19.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
-  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
+commander@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
+  integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
 commondir@^1.0.1:
   version "1.0.1"
@@ -3247,11 +2251,11 @@ compress-commons@^1.2.0:
     readable-stream "^2.0.0"
 
 compressible@~2.0.16:
-  version "2.0.17"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.17.tgz#6e8c108a16ad58384a977f3a482ca20bff2f38c1"
-  integrity sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
+  integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
   dependencies:
-    mime-db ">= 1.40.0 < 2"
+    mime-db ">= 1.43.0 < 2"
 
 compression@^1.6.2:
   version "1.7.4"
@@ -3271,7 +2275,7 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@1.6.2, concat-stream@^1.4.7, concat-stream@^1.4.8, concat-stream@^1.5.0, concat-stream@^1.6.0:
+concat-stream@1.6.2, concat-stream@^1.4.7, concat-stream@^1.4.8, concat-stream@^1.5.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -3281,15 +2285,6 @@ concat-stream@1.6.2, concat-stream@^1.4.7, concat-stream@^1.4.8, concat-stream@^
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-concat-stream@~1.5.0:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266"
-  integrity sha1-cIl4Yk2FavQaWnQd790mHadSwmY=
-  dependencies:
-    inherits "~2.0.1"
-    readable-stream "~2.0.0"
-    typedarray "~0.0.5"
-
 config-chain@^1.1.12:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
@@ -3304,19 +2299,17 @@ connect-flash@^0.1.1:
   integrity sha1-2GMPJtlaf4UfmVax6MxnMvO2qjA=
 
 connect-session-sequelize@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/connect-session-sequelize/-/connect-session-sequelize-6.0.0.tgz#afd4456c65d92c9b6b955fdff00afff795e8a420"
-  integrity sha512-XC71xJd5rqObdL7700S/qFD+gSRA4o6WVJAyFY0Vjah73id5bBElM0SHQR1ME5Bxrt4JL8alvggseNDVTlKyxA==
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/connect-session-sequelize/-/connect-session-sequelize-6.1.1.tgz#0155d01fbffc67352df795aa53b7ab397ab95094"
+  integrity sha512-BwD1FYgds9T+5ZxnvcCvE/0B0clj3b3WwfGLEhE3GiYUbl3fhQzlLjUGBql9Ce/X9isOQWMKGy1br4TenIG9Cg==
   dependencies:
     debug "^3.1.0"
     deep-equal "^1.0.1"
 
 console-browserify@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
-  integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=
-  dependencies:
-    date-now "^0.1.4"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
+  integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
@@ -3340,25 +2333,20 @@ content-disposition@0.5.3:
   dependencies:
     safe-buffer "5.1.2"
 
-content-security-policy-builder@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/content-security-policy-builder/-/content-security-policy-builder-2.0.0.tgz#8749a1d542fcbe82237281ea9f716ce68b394dd2"
-  integrity sha512-j+Nhmj1yfZAikJLImCvPJFE29x/UuBi+/MWqggGGc515JKaZrjuei2RhULJmy0MsstW3E3htl002bwmBNMKr7w==
+content-security-policy-builder@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/content-security-policy-builder/-/content-security-policy-builder-2.1.0.tgz#0a2364d769a3d7014eec79ff7699804deb8cfcbb"
+  integrity sha512-/MtLWhJVvJNkA9dVLAp6fg9LxD2gfI6R2Fi1hPmfjYXSahJJzcfvoeDOxSyp4NvxMuwWv3WMssE9o31DoULHrQ==
 
 content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
-continuable-cache@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz#bd727a7faed77e71ff3985ac93351a912733ad0f"
-  integrity sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=
-
-convert-source-map@^1.1.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
-  integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
+convert-source-map@^1.5.0, convert-source-map@^1.5.1:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
+  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
   dependencies:
     safe-buffer "~5.1.1"
 
@@ -3407,38 +2395,28 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-copy-webpack-plugin@^4.5.2:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz#e7f40dd8a68477d405dd1b7a854aae324b158bae"
-  integrity sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==
+copy-webpack-plugin@^5.0.5:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz#5481a03dea1123d88a988c6ff8b78247214f0b88"
+  integrity sha512-P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg==
   dependencies:
-    cacache "^10.0.4"
-    find-cache-dir "^1.0.0"
+    cacache "^12.0.3"
+    find-cache-dir "^2.1.0"
+    glob-parent "^3.1.0"
     globby "^7.1.1"
-    is-glob "^4.0.0"
-    loader-utils "^1.1.0"
+    is-glob "^4.0.1"
+    loader-utils "^1.2.3"
     minimatch "^3.0.4"
-    p-limit "^1.0.0"
-    serialize-javascript "^1.4.0"
-
-core-js-compat@^3.1.1:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.1.4.tgz#e4d0c40fbd01e65b1d457980fe4112d4358a7408"
-  integrity sha512-Z5zbO9f1d0YrJdoaQhphVAnKPimX92D6z8lCGphH89MNRxlL1prI9ExJPqVwP0/kgkQCv8c4GJGT8X16yUncOg==
-  dependencies:
-    browserslist "^4.6.2"
-    core-js-pure "3.1.4"
-    semver "^6.1.1"
-
-core-js-pure@3.1.4:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.1.4.tgz#5fa17dc77002a169a3566cc48dc774d2e13e3769"
-  integrity sha512-uJ4Z7iPNwiu1foygbcZYJsJs1jiXrTTCvxfLDXNhI/I+NHbSIEyr548y4fcsCEyWY0XgfAG/qqaunJ1SThHenA==
+    normalize-path "^3.0.0"
+    p-limit "^2.2.1"
+    schema-utils "^1.0.0"
+    serialize-javascript "^2.1.2"
+    webpack-log "^2.0.0"
 
 core-js@^2.4.0, core-js@^2.5.0:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2"
-  integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==
+  version "2.6.11"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
+  integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -3501,7 +2479,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-cross-spawn@^6.0.0, cross-spawn@^6.0.5:
+cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
@@ -3529,10 +2507,12 @@ crypto-browserify@^3.11.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
-csextends@^1.0.3:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/csextends/-/csextends-1.2.0.tgz#6374b210984b54d4495f29c99d3dd069b80543e5"
-  integrity sha512-S/8k1bDTJIwuGgQYmsRoE+8P+ohV32WhQ0l4zqrc0XDdxOhjQQD7/wTZwCzoZX53jSX3V/qwjT+OkPTxWQcmjg==
+crypto-random-string@^3.0.1:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-3.1.0.tgz#0368382de82e914179ad2ca9c7a788e260184bae"
+  integrity sha512-Tip3yGB+bA7B0W8E4K4mNf2rZhu5r2G5Tb89/utEl5tP1QuLjTF/S9a1b8ifDrR4ORc9Utf6tscpSEtBY3YcPQ==
+  dependencies:
+    type-fest "^0.8.1"
 
 css-b64-images@~0.2.5:
   version "0.2.5"
@@ -3552,23 +2532,23 @@ css-declaration-sorter@^4.0.1:
     postcss "^7.0.1"
     timsort "^0.3.0"
 
-css-loader@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-1.0.1.tgz#6885bb5233b35ec47b006057da01cc640b6b79fe"
-  integrity sha512-+ZHAZm/yqvJ2kDtPne3uX0C+Vr3Zn5jFn2N4HywtS5ujwvsVkyg0VArEXpl3BgczDA8anieki1FIzhchX4yrDw==
+css-loader@^3.2.0:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.4.2.tgz#d3fdb3358b43f233b78501c5ed7b1c6da6133202"
+  integrity sha512-jYq4zdZT0oS0Iykt+fqnzVLRIeiPWhka+7BqPn+oSIpWJAHak5tmB/WZrJ2a21JhCeFyNnnlroSl8c+MtVndzA==
   dependencies:
-    babel-code-frame "^6.26.0"
-    css-selector-tokenizer "^0.7.0"
-    icss-utils "^2.1.0"
-    loader-utils "^1.0.2"
-    lodash "^4.17.11"
-    postcss "^6.0.23"
-    postcss-modules-extract-imports "^1.2.0"
-    postcss-modules-local-by-default "^1.2.0"
-    postcss-modules-scope "^1.1.0"
-    postcss-modules-values "^1.3.0"
-    postcss-value-parser "^3.3.0"
-    source-list-map "^2.0.0"
+    camelcase "^5.3.1"
+    cssesc "^3.0.0"
+    icss-utils "^4.1.1"
+    loader-utils "^1.2.3"
+    normalize-path "^3.0.0"
+    postcss "^7.0.23"
+    postcss-modules-extract-imports "^2.0.0"
+    postcss-modules-local-by-default "^3.0.2"
+    postcss-modules-scope "^2.1.1"
+    postcss-modules-values "^3.0.0"
+    postcss-value-parser "^4.0.2"
+    schema-utils "^2.6.0"
 
 css-select-base-adapter@^0.1.1:
   version "0.1.1"
@@ -3586,65 +2566,48 @@ css-select@^1.1.0, css-select@~1.2.0:
     nth-check "~1.0.1"
 
 css-select@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.0.2.tgz#ab4386cec9e1f668855564b17c3733b43b2a5ede"
-  integrity sha512-dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef"
+  integrity sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==
   dependencies:
     boolbase "^1.0.0"
-    css-what "^2.1.2"
+    css-what "^3.2.1"
     domutils "^1.7.0"
     nth-check "^1.0.2"
 
-css-selector-tokenizer@^0.7.0:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz#a177271a8bca5019172f4f891fc6eed9cbf68d5d"
-  integrity sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==
+css-tree@1.0.0-alpha.37:
+  version "1.0.0-alpha.37"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22"
+  integrity sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==
   dependencies:
-    cssesc "^0.1.0"
-    fastparse "^1.1.1"
-    regexpu-core "^1.0.0"
-
-css-tree@1.0.0-alpha.28:
-  version "1.0.0-alpha.28"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.28.tgz#8e8968190d886c9477bc8d61e96f61af3f7ffa7f"
-  integrity sha512-joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w==
-  dependencies:
-    mdn-data "~1.1.0"
-    source-map "^0.5.3"
-
-css-tree@1.0.0-alpha.29:
-  version "1.0.0-alpha.29"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.29.tgz#3fa9d4ef3142cbd1c301e7664c1f352bd82f5a39"
-  integrity sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==
-  dependencies:
-    mdn-data "~1.1.0"
-    source-map "^0.5.3"
+    mdn-data "2.0.4"
+    source-map "^0.6.1"
 
 css-unit-converter@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.1.tgz#d9b9281adcfd8ced935bdbaba83786897f64e996"
   integrity sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY=
 
-css-url-regex@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/css-url-regex/-/css-url-regex-1.1.0.tgz#83834230cc9f74c457de59eebd1543feeb83b7ec"
-  integrity sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w=
-
-css-what@2.1, css-what@^2.1.2:
+css-what@2.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
   integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
 
-cssesc@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
-  integrity sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=
+css-what@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.2.1.tgz#f4a8f12421064621b456755e34a03a2c22df5da1"
+  integrity sha512-WwOrosiQTvyms+Ti5ZC5vGEK0Vod3FTt1ca+payZqvKuGJF+dq7bG63DstxtN0dpm6FxY27a/zS3Wten+gEtGw==
 
 cssesc@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703"
   integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==
 
+cssesc@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
+  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
+
 cssfilter@0.0.10:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae"
@@ -3708,7 +2671,7 @@ cssnano-util-same-parent@^4.0.0:
   resolved "https://registry.yarnpkg.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz#574082fb2859d2db433855835d9a8456ea18bbf3"
   integrity sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==
 
-cssnano@^4.1.0:
+cssnano@^4.1.10:
   version "4.1.10"
   resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.10.tgz#0ac41f0b13d13d465487e111b778d42da631b8b2"
   integrity sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==
@@ -3718,17 +2681,17 @@ cssnano@^4.1.0:
     is-resolvable "^1.0.0"
     postcss "^7.0.0"
 
-csso@^3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-3.5.1.tgz#7b9eb8be61628973c1b261e169d2f024008e758b"
-  integrity sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==
+csso@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/csso/-/csso-4.0.2.tgz#e5f81ab3a56b8eefb7f0092ce7279329f454de3d"
+  integrity sha512-kS7/oeNVXkHWxby5tHVxlhjizRCSv8QdU7hB2FpdAibDU8FjTAolhNjKNTiLzXtUrKT6HwClE81yXwEk1309wg==
   dependencies:
-    css-tree "1.0.0-alpha.29"
+    css-tree "1.0.0-alpha.37"
 
 cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.6.tgz#f85206cee04efa841f3c5982a74ba96ab20d65ad"
-  integrity sha512-DtUeseGk9/GBW0hl0vVPpU22iHL6YB5BUX7ml1hB+GMpo0NX5G4voX3kdWiMSEguFtcW3Vh3djqNF4aIe6ne0A==
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
+  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
 
 cssom@~0.2.5:
   version "0.2.5"
@@ -3736,9 +2699,9 @@ cssom@~0.2.5:
   integrity sha1-JoJwm1kC5yEt9SkRb/eIzVslSJQ=
 
 cssstyle@^1.0.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.2.2.tgz#427ea4d585b18624f6fdbf9de7a2a1a3ba713077"
-  integrity sha512-43wY3kl1CVQSvL7wUY1qXkxVGkStjpkDmVjiIKX8R97uhajy8Bybay78uOtqvh7Q5GK75dNPfW0geWjE6qQQow==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.4.0.tgz#9d31328229d3c565c61e586b02041a28fccdccf1"
+  integrity sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==
   dependencies:
     cssom "0.3.x"
 
@@ -3749,10 +2712,10 @@ cssstyle@~0.2.3:
   dependencies:
     cssom "0.3.x"
 
-cyclist@~0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
-  integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
+cyclist@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
+  integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
 
 d3-array@1, d3-array@^1.1.1, d3-array@^1.2.0:
   version "1.2.4"
@@ -3765,9 +2728,9 @@ d3-axis@1:
   integrity sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ==
 
 d3-brush@1:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.0.6.tgz#33691f2032d9db6c5d8cb684ff255a9883629e21"
-  integrity sha512-lGSiF5SoSqO5/mYGD5FAeGKKS62JdA1EV7HPrU2b5rTX4qEJJtpjaGLJngjnkewQy7UnGstnFd3168wpf5z76w==
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.1.5.tgz#066b8e84d17b192986030446c97c0fba7e1bacdc"
+  integrity sha512-rEaJ5gHlgLxXugWjIkolTA0OyMvw8UWU1imYXy1v642XyyswmI1ybKOv05Ft+ewq+TFmdliD3VuK0pRp1VT/5A==
   dependencies:
     d3-dispatch "1"
     d3-drag "1"
@@ -3789,9 +2752,9 @@ d3-collection@1:
   integrity sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==
 
 d3-color@1:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.2.8.tgz#4eaf9b60ef188c893fcf8b28f3546aafebfbd9f4"
-  integrity sha512-yeANXzP37PHk0DbSTMNPhnJD+Nn4G//O5E825bR6fAfHH43hobSBpgB9G9oWVl9+XgUaQ4yCnsX1H+l8DoaL9A==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.0.tgz#89c45a995ed773b13314f06460df26d60ba0ecaf"
+  integrity sha512-TzNPeJy2+iEepfiL92LAAB7fvnp/dV2YwANPVHdDWmYMm23qIJBYww3qT8I8C1wXrmrg4UWs7BKc2tKIgyjzHg==
 
 d3-contour@1:
   version "1.3.2"
@@ -3801,31 +2764,31 @@ d3-contour@1:
     d3-array "^1.1.1"
 
 d3-dispatch@1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.5.tgz#e25c10a186517cd6c82dd19ea018f07e01e39015"
-  integrity sha512-vwKx+lAqB1UuCeklr6Jh1bvC4SZgbSqbkGBLClItFBIYH4vqDJCA7qfoy14lXmJdnBOdxndAMxjCbImJYW7e6g==
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.6.tgz#00d37bcee4dd8cd97729dd893a0ac29caaba5d58"
+  integrity sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA==
 
 d3-drag@1:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.2.3.tgz#46e206ad863ec465d88c588098a1df444cd33c64"
-  integrity sha512-8S3HWCAg+ilzjJsNtWW1Mutl74Nmzhb9yU6igspilaJzeZVFktmY6oO9xOh5TDk+BM2KrNFjttZNoJJmDnkjkg==
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.2.5.tgz#2537f451acd39d31406677b7dc77c82f7d988f70"
+  integrity sha512-rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w==
   dependencies:
     d3-dispatch "1"
     d3-selection "1"
 
 d3-dsv@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.1.1.tgz#aaa830ecb76c4b5015572c647cc6441e3c7bb701"
-  integrity sha512-1EH1oRGSkeDUlDRbhsFytAXU6cAmXFzc52YUe6MRlPClmWb85MP1J5x+YJRzya4ynZWnbELdSAvATFW/MbxaXw==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.2.0.tgz#9d5f75c3a5f8abd611f74d3f5847b0d4338b885c"
+  integrity sha512-9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g==
   dependencies:
     commander "2"
     iconv-lite "0.4"
     rw "1"
 
 d3-ease@1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.5.tgz#8ce59276d81241b1b72042d6af2d40e76d936ffb"
-  integrity sha512-Ct1O//ly5y5lFM9YTdu+ygq7LleSgSE4oj7vUt9tPLHUi8VCV7QoizGpdWRWAwCO9LdYzIrQDg97+hGVdsSGPQ==
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.6.tgz#ebdb6da22dfac0a22222f2d4da06f66c416a0ec0"
+  integrity sha512-SZ/lVU7LRXafqp7XtIcBdxnWl8yyLpgOmzAk0mWBI9gXNzLDx5ybZgnRbH9dN/yY5tzVBqCQ9avltSnqVwessQ==
 
 d3-fetch@1:
   version "1.1.2"
@@ -3845,43 +2808,43 @@ d3-force@1:
     d3-timer "1"
 
 d3-format@1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.3.2.tgz#6a96b5e31bcb98122a30863f7d92365c00603562"
-  integrity sha512-Z18Dprj96ExragQ0DeGi+SYPQ7pPfRMtUXtsg/ChVIKNBCzjO8XYJvRTC1usblx52lqge56V5ect+frYTQc8WQ==
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.3.tgz#4e8eb4dff3fdcb891a8489ec6e698601c41b96f1"
+  integrity sha512-mm/nE2Y9HgGyjP+rKIekeITVgBtX97o1nrvHCWX8F/yBYyevUTvu9vb5pUnKwrcSw7o7GuwMOWjS9gFDs4O+uQ==
 
 d3-geo@1:
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.11.6.tgz#134f2ef035ff75a448075fafdea92702a2e0e0cf"
-  integrity sha512-z0J8InXR9e9wcgNtmVnPTj0TU8nhYT6lD/ak9may2PdKqXIeHUr8UbFLoCtrPYNsjv6YaLvSDQVl578k6nm7GA==
+  version "1.11.9"
+  resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.11.9.tgz#77eaed14ba62fc2c0aef55cd2943849c866f7ae6"
+  integrity sha512-9edcH6J3s/Aa3KJITWqFJbyB/8q3mMlA9Fi7z6yy+FAYMnRaxmC7jBhUnsINxVWD14GmqX3DK8uk7nV6/Ekt4A==
   dependencies:
     d3-array "1"
 
 d3-hierarchy@1:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.8.tgz#7a6317bd3ed24e324641b6f1e76e978836b008cc"
-  integrity sha512-L+GHMSZNwTpiq4rt9GEsNcpLa4M96lXMR8M/nMG9p5hBE0jy6C+3hWtyZMenPQdwla249iJy7Nx0uKt3n+u9+w==
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz#2f6bee24caaea43f8dc37545fa01628559647a83"
+  integrity sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ==
 
 d3-interpolate@1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.3.2.tgz#417d3ebdeb4bc4efcc8fd4361c55e4040211fd68"
-  integrity sha512-NlNKGopqaz9qM1PXh9gBF1KSCVh+jSFErrSlD/4hybwoNX/gt1d8CDbDW+3i+5UOHhjC6s6nMvRxcuoMVNgL2w==
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.4.0.tgz#526e79e2d80daa383f9e0c1c1c7dcc0f0583e987"
+  integrity sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==
   dependencies:
     d3-color "1"
 
 d3-path@1:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.8.tgz#4a0606a794d104513ec4a8af43525f374b278719"
-  integrity sha512-J6EfUNwcMQ+aM5YPOB8ZbgAZu6wc82f/0WFxrxwV6Ll8wBwLaHLKCqQ5Imub02JriCVVdPjgI+6P3a4EWJCxAg==
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.9.tgz#48c050bb1fe8c262493a8caf5524e3e9591701cf"
+  integrity sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg==
 
 d3-polygon@1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-1.0.5.tgz#9a645a0a64ff6cbf9efda96ee0b4a6909184c363"
-  integrity sha512-RHhh1ZUJZfhgoqzWWuRhzQJvO7LavchhitSTHGu9oj6uuLFzYZVeBzaWTQ2qSO6bz2w55RMoOCf0MsLCDB6e0w==
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-1.0.6.tgz#0bf8cb8180a6dc107f518ddf7975e12abbfbd38e"
+  integrity sha512-k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ==
 
 d3-quadtree@1:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.6.tgz#d1ab2a95a7f27bbde88582c94166f6ae35f32056"
-  integrity sha512-NUgeo9G+ENQCQ1LsRr2qJg3MQ4DJvxcDNCiohdJGHt5gRhBW6orIB5m5FJ9kK3HNL8g9F4ERVoBzcEwQBfXWVA==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.7.tgz#ca8b84df7bb53763fe3c2f24bd435137f4e53135"
+  integrity sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA==
 
 d3-random@1:
   version "1.1.2"
@@ -3889,9 +2852,9 @@ d3-random@1:
   integrity sha512-6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ==
 
 d3-scale-chromatic@1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-1.3.3.tgz#dad4366f0edcb288f490128979c3c793583ed3c0"
-  integrity sha512-BWTipif1CimXcYfT02LKjAyItX5gKiwxuPRgr4xM58JwlLocWbjPLI7aMEjkcoOQXMkYsmNsvv3d2yl/OKuHHw==
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz#54e333fc78212f439b14641fb55801dd81135a98"
+  integrity sha512-ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg==
   dependencies:
     d3-color "1"
     d3-interpolate "1"
@@ -3909,38 +2872,38 @@ d3-scale@2:
     d3-time-format "2"
 
 d3-selection@1, d3-selection@^1.1.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.0.tgz#ab9ac1e664cf967ebf1b479cc07e28ce9908c474"
-  integrity sha512-EYVwBxQGEjLCKF2pJ4+yrErskDnz5v403qvAid96cNdCMr8rmCYfY5RGzWz24mdIbxmDf6/4EAH+K9xperD5jg==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.1.tgz#98eedbbe085fbda5bafa2f9e3f3a2f4d7d622a98"
+  integrity sha512-BTIbRjv/m5rcVTfBs4AMBLKs4x8XaaLkwm28KWu9S2vKNqXkXt2AH2Qf0sdPZHjFxcWg/YL53zcqAz+3g4/7PA==
 
 d3-shape@1:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.3.5.tgz#e81aea5940f59f0a79cfccac012232a8987c6033"
-  integrity sha512-VKazVR3phgD+MUCldapHD7P9kcrvPcexeX/PkMJmkUov4JM8IxsSg1DvbYoYich9AtdTsa5nNk2++ImPiDiSxg==
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.3.7.tgz#df63801be07bc986bc54f63789b4fe502992b5d7"
+  integrity sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==
   dependencies:
     d3-path "1"
 
 d3-time-format@2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.1.3.tgz#ae06f8e0126a9d60d6364eac5b1533ae1bac826b"
-  integrity sha512-6k0a2rZryzGm5Ihx+aFMuO1GgelgIz+7HhB4PH4OEndD5q2zGn1mDfRdNrulspOfR6JXkb2sThhDK41CSK85QA==
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.2.3.tgz#0c9a12ee28342b2037e5ea1cf0b9eb4dd75f29cb"
+  integrity sha512-RAHNnD8+XvC4Zc4d2A56Uw0yJoM7bsvOlJR33bclxq399Rak/b9bhvu/InjxdWhPtkgU53JJcleJTGkNRnN6IA==
   dependencies:
     d3-time "1"
 
 d3-time@1:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.0.11.tgz#1d831a3e25cd189eb256c17770a666368762bbce"
-  integrity sha512-Z3wpvhPLW4vEScGeIMUckDW7+3hWKOQfAWg/U7PlWBnQmeKQ00gCUsTtWSYulrKNA7ta8hJ+xXc6MHrMuITwEw==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.1.0.tgz#b1e19d307dae9c900b7e5b25ffc5dcc249a8a0f1"
+  integrity sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA==
 
 d3-timer@1:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.9.tgz#f7bb8c0d597d792ff7131e1c24a36dd471a471ba"
-  integrity sha512-rT34J5HnQUHhcLvhSB9GjCkN0Ddd5Y8nCwDBG2u6wQEeYxT/Lf51fTFFkldeib/sE/J0clIe0pnCfs6g/lRbyg==
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.10.tgz#dfe76b8a91748831b13b6d9c793ffbd508dd9de5"
+  integrity sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw==
 
 d3-transition@1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.2.0.tgz#f538c0e21b2aa1f05f3e965f8567e81284b3b2b8"
-  integrity sha512-VJ7cmX/FPIPJYuaL2r1o1EMHLttvoIuZhhuAlRoOxDzogV8iQS6jYulDm3xEU3TqL80IZIhI551/ebmCMrkvhw==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.3.2.tgz#a98ef2151be8d8600543434c1ca80140ae23b398"
+  integrity sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA==
   dependencies:
     d3-color "1"
     d3-dispatch "1"
@@ -3955,9 +2918,9 @@ d3-voronoi@1:
   integrity sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg==
 
 d3-zoom@1:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.7.3.tgz#f444effdc9055c38077c4299b4df999eb1d47ccb"
-  integrity sha512-xEBSwFx5Z9T3/VrwDkMt+mr0HCzv7XjpGURJ8lWmIC8wxe32L39eWHIasEe/e7Ox8MPU4p1hvH8PKN2olLzIBg==
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.8.3.tgz#b6a3dbe738c7763121cd05b8a7795ffe17f4fc0a"
+  integrity sha512-VoLXTK4wvy1a0JpH2Il+F2CiOhVu7VRXWF5M/LroMIh3/zBAC3WAt7QoIvPibOavVo20hN6/37vwAsdBejLyKQ==
   dependencies:
     d3-dispatch "1"
     d3-drag "1"
@@ -3965,10 +2928,10 @@ d3-zoom@1:
     d3-selection "1"
     d3-transition "1"
 
-d3@^5.7.0:
-  version "5.9.7"
-  resolved "https://registry.yarnpkg.com/d3/-/d3-5.9.7.tgz#f3835648a172b438e89ed57eb6c525bdabdcd7dc"
-  integrity sha512-jENytrmdXtGPw7HuSK2S4gxRM1eUGjKvWQkQ6ct4yK+DB8SG3VcnVrwesfnsv8rIcxMUg18TafT4Q8mOZUMP4Q==
+d3@^5.14, d3@^5.7.0:
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/d3/-/d3-5.15.0.tgz#ffd44958e6a3cb8a59a84429c45429b8bca5677a"
+  integrity sha512-C+E80SL2nLLtmykZ6klwYj5rPqB5nlfN5LdWEAVdWPppqTD8taoJi2PxLZjPeYT8FFRR2yucXq+kBlOnnvZeLg==
   dependencies:
     d3-array "1"
     d3-axis "1"
@@ -4002,28 +2965,31 @@ d3@^5.7.0:
     d3-voronoi "1"
     d3-zoom "1"
 
-d@1:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
-  integrity sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=
+d@1, d@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
+  integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
   dependencies:
-    es5-ext "^0.10.9"
+    es5-ext "^0.10.50"
+    type "^1.0.1"
 
-dagre-d3-renderer@^0.5.8:
-  version "0.5.8"
-  resolved "https://registry.yarnpkg.com/dagre-d3-renderer/-/dagre-d3-renderer-0.5.8.tgz#aa071bb71d3c4d67426925906f3f6ddead49c1a3"
-  integrity sha512-XH2a86isUHRxzIYbjQVEuZtJnWEufb64H5DuXIUmn8esuB40jgLEbUUclulWOW62/ZoXlj2ZDyL8SJ+YRxs+jQ==
+dagre-d3@^0.6.4:
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/dagre-d3/-/dagre-d3-0.6.4.tgz#0728d5ce7f177ca2337df141ceb60fbe6eeb7b29"
+  integrity sha512-e/6jXeCP7/ptlAM48clmX4xTZc5Ek6T6kagS7Oz2HrYSdqcLZFLqpAfh7ldbZRFfxCZVyh61NEPR08UQRVxJzQ==
   dependencies:
-    dagre-layout "^0.8.8"
-    lodash "^4.17.5"
+    d3 "^5.14"
+    dagre "^0.8.5"
+    graphlib "^2.1.8"
+    lodash "^4.17.15"
 
-dagre-layout@^0.8.8:
-  version "0.8.8"
-  resolved "https://registry.yarnpkg.com/dagre-layout/-/dagre-layout-0.8.8.tgz#9b6792f24229f402441c14162c1049e3f261f6d9"
-  integrity sha512-ZNV15T9za7X+fV8Z07IZquUKugCxm5owoiPPxfEx6OJRD331nkiIaF3vSt0JEY5FkrY0KfRQxcpQ3SpXB7pLPQ==
+dagre@^0.8.4, dagre@^0.8.5:
+  version "0.8.5"
+  resolved "https://registry.yarnpkg.com/dagre/-/dagre-0.8.5.tgz#ba30b0055dac12b6c1fcc247817442777d06afee"
+  integrity sha512-/aTqmnRta7x7MCCpExk7HQL2O4owCT2h8NT//9I1OQ9vt29Pa0BzSAkR5lwFUcQ7491yVi/3CXU9jQ5o0Mn2Sw==
   dependencies:
-    graphlibrary "^2.2.0"
-    lodash "^4.17.5"
+    graphlib "^2.1.8"
+    lodash "^4.17.15"
 
 dashdash@^1.12.0, dashdash@^1.14.0:
   version "1.14.1"
@@ -4046,15 +3012,10 @@ data-urls@^1.0.0:
     whatwg-mimetype "^2.2.0"
     whatwg-url "^7.0.0"
 
-date-now@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
-  integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
-
-de-indent@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
-  integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=
+date-utils@*:
+  version "1.2.21"
+  resolved "https://registry.yarnpkg.com/date-utils/-/date-utils-1.2.21.tgz#61fb16cdc1274b3c9acaaffe9fc69df8720a2b64"
+  integrity sha1-YfsWzcEnSzyayq/+n8ad+HIKK2Q=
 
 debug@*, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
   version "4.1.1"
@@ -4070,7 +3031,7 @@ debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@3.1.0, debug@~3.1.0:
+debug@3.1.0, debug@=3.1.0, debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
@@ -4095,9 +3056,16 @@ decode-uri-component@^0.2.0:
   integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 deep-equal@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
-  integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a"
+  integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==
+  dependencies:
+    is-arguments "^1.0.4"
+    is-date-object "^1.0.1"
+    is-regex "^1.0.4"
+    object-is "^1.0.1"
+    object-keys "^1.1.1"
+    regexp.prototype.flags "^1.2.0"
 
 deep-extend@^0.6.0:
   version "0.6.0"
@@ -4163,12 +3131,12 @@ delegates@^1.0.0:
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
   integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
-denque@^1.4.0:
+denque@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/denque/-/denque-1.4.1.tgz#6744ff7641c148c3f8a69c307e51235c1f4a37cf"
   integrity sha512-OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==
 
-depd@2.0.0, depd@~2.0.0:
+depd@2.0.0, depd@^2.0.0, depd@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
   integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
@@ -4179,9 +3147,9 @@ depd@~1.1.2:
   integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
 des.js@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
-  integrity sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
+  integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==
   dependencies:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
@@ -4191,13 +3159,6 @@ destroy@~1.0.4:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
   integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
-detab@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/detab/-/detab-2.0.2.tgz#074970d1a807b045d0258a4235df5928dd683561"
-  integrity sha512-Q57yPrxScy816TTE1P/uLRXLDKjXhvYTbfxS/e6lPD+YrqghbsMlGB9nQzj/zVtSPaF0DFPSdO916EWO4sQUyQ==
-  dependencies:
-    repeat-string "^1.5.4"
-
 detect-file@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
@@ -4215,14 +3176,6 @@ detect-libc@^1.0.2:
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
   integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
 
-detective@^4.0.0:
-  version "4.7.1"
-  resolved "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz#0eca7314338442febb6d65da54c10bb1c82b246e"
-  integrity sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==
-  dependencies:
-    acorn "^5.2.1"
-    defined "^1.0.0"
-
 diagnostics@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/diagnostics/-/diagnostics-1.1.1.tgz#cab6ac33df70c9d9a727490ae43ac995a769b22a"
@@ -4234,18 +3187,13 @@ diagnostics@^1.1.1:
 
 "diff-match-patch@git+https://github.com/hackmdio/diff-match-patch.git":
   version "1.1.1"
-  resolved "git+https://github.com/hackmdio/diff-match-patch.git#dd6e43a1df8f46ac17ba33217c00d4018ef5637f"
+  resolved "git+https://github.com/hackmdio/diff-match-patch.git#5b73bb82454a81ecdbdb81afb4bea4c36132fbaa"
 
 diff@3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
   integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
 
-diff@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"
-  integrity sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==
-
 diffie-hellman@^5.0.0:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
@@ -4262,24 +3210,10 @@ dir-glob@^2.0.0:
   dependencies:
     path-type "^3.0.0"
 
-dns-lookup-all@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/dns-lookup-all/-/dns-lookup-all-1.0.2.tgz#4d8b2b1af69c83a7b262eb5de92485b7b3a215eb"
-  integrity sha1-TYsrGvacg6eyYutd6SSFt7OiFes=
-  dependencies:
-    semver "^5.3.0"
-
-dns-prefetch-control@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/dns-prefetch-control/-/dns-prefetch-control-0.1.0.tgz#60ddb457774e178f1f9415f0cabb0e85b0b300b2"
-  integrity sha1-YN20V3dOF48flBXwyrsOhbCzALI=
-
-doctrine-temporary-fork@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/doctrine-temporary-fork/-/doctrine-temporary-fork-2.1.0.tgz#36f2154f556ee4f1e60311d391cd23de5187ed57"
-  integrity sha512-nliqOv5NkE4zMON4UA6AMJE6As35afs8aYXATpU4pTUdIKiARZwrJVEP1boA3Rx1ZXHVkwxkhcq4VkqvsuRLsA==
-  dependencies:
-    esutils "^2.0.2"
+dns-prefetch-control@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/dns-prefetch-control/-/dns-prefetch-control-0.2.0.tgz#73988161841f3dcc81f47686d539a2c702c88624"
+  integrity sha512-hvSnros73+qyZXhHFjx2CMLwoj3Fe7eR9EJsFsqmcI1bB2OBWL/+0YzaEaKssCHnj/6crawNnUyw74Gm2EKe+Q==
 
 doctrine@1.5.0:
   version "1.5.0"
@@ -4296,77 +3230,6 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
-documentation@^12.0.1:
-  version "12.1.0"
-  resolved "https://registry.yarnpkg.com/documentation/-/documentation-12.1.0.tgz#0cabc4e88507872fd847129c00ae7d0e2482049c"
-  integrity sha512-iAllbFhy1P5DvKAcrPw0h5R5rNMnaXAjExj3XKUzW/eBvQ6JhTbDELQnN8k3SrBvQAnm70+6NLsmxA+csp4f/Q==
-  dependencies:
-    "@babel/core" "^7.1.2"
-    "@babel/generator" "^7.1.3"
-    "@babel/parser" "7.1.3"
-    "@babel/plugin-proposal-class-properties" "^7.1.0"
-    "@babel/plugin-proposal-decorators" "^7.1.2"
-    "@babel/plugin-proposal-do-expressions" "^7.0.0"
-    "@babel/plugin-proposal-export-default-from" "^7.0.0"
-    "@babel/plugin-proposal-export-namespace-from" "^7.0.0"
-    "@babel/plugin-proposal-function-bind" "^7.0.0"
-    "@babel/plugin-proposal-function-sent" "^7.1.0"
-    "@babel/plugin-proposal-json-strings" "^7.0.0"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.0.0"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.0.0"
-    "@babel/plugin-proposal-numeric-separator" "^7.0.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.0.0"
-    "@babel/plugin-proposal-pipeline-operator" "^7.0.0"
-    "@babel/plugin-proposal-throw-expressions" "^7.0.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.0.0"
-    "@babel/plugin-syntax-import-meta" "^7.0.0"
-    "@babel/preset-env" "^7.1.0"
-    "@babel/preset-flow" "^7.0.0"
-    "@babel/preset-react" "^7.0.0"
-    "@babel/preset-stage-0" "^7.0.0"
-    "@babel/traverse" "^7.1.4"
-    "@babel/types" "^7.1.3"
-    ansi-html "^0.0.7"
-    babelify "^10.0.0"
-    chalk "^2.3.0"
-    chokidar "^2.0.4"
-    concat-stream "^1.6.0"
-    diff "^4.0.1"
-    doctrine-temporary-fork "2.1.0"
-    get-port "^4.0.0"
-    git-url-parse "^10.0.1"
-    github-slugger "1.2.0"
-    glob "^7.1.2"
-    globals-docs "^2.4.0"
-    highlight.js "^9.15.5"
-    ini "^1.3.5"
-    js-yaml "^3.10.0"
-    lodash "^4.17.10"
-    mdast-util-inject "^1.1.0"
-    micromatch "^3.1.5"
-    mime "^2.2.0"
-    module-deps-sortable "5.0.0"
-    parse-filepath "^1.0.2"
-    pify "^4.0.0"
-    read-pkg-up "^4.0.0"
-    remark "^9.0.0"
-    remark-html "^8.0.0"
-    remark-reference-links "^4.0.1"
-    remark-toc "^5.0.0"
-    resolve "^1.8.1"
-    stream-array "^1.1.2"
-    strip-json-comments "^2.0.1"
-    tiny-lr "^1.1.0"
-    unist-builder "^1.0.2"
-    unist-util-visit "^1.3.0"
-    vfile "^4.0.0"
-    vfile-reporter "^6.0.0"
-    vfile-sort "^2.1.0"
-    vinyl "^2.1.0"
-    vinyl-fs "^3.0.2"
-    vue-template-compiler "^2.5.16"
-    yargs "^12.0.2"
-
 dom-converter@^0.2:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"
@@ -4374,7 +3237,15 @@ dom-converter@^0.2:
   dependencies:
     utila "~0.4"
 
-dom-serializer@0, dom-serializer@~0.1.0:
+dom-serializer@0:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
+  integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==
+  dependencies:
+    domelementtype "^2.0.1"
+    entities "^2.0.0"
+
+dom-serializer@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
   integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==
@@ -4392,6 +3263,11 @@ domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1:
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
   integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
+domelementtype@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz#1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"
+  integrity sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==
+
 domexception@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
@@ -4422,36 +3298,29 @@ domutils@^1.5.1, domutils@^1.7.0:
     dom-serializer "0"
     domelementtype "1"
 
-dont-sniff-mimetype@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/dont-sniff-mimetype/-/dont-sniff-mimetype-1.0.0.tgz#5932890dc9f4e2f19e5eb02a20026e5e5efc8f58"
-  integrity sha1-WTKJDcn04vGeXrAqIAJuXl78j1g=
+dont-sniff-mimetype@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/dont-sniff-mimetype/-/dont-sniff-mimetype-1.1.0.tgz#c7d0427f8bcb095762751252af59d148b0a623b2"
+  integrity sha512-ZjI4zqTaxveH2/tTlzS1wFp+7ncxNZaIEWYg3lzZRHkKf5zPT/MnEG6WL0BhHMJUabkh8GeU5NL5j+rEUCb7Ug==
 
-dot-prop@^4.1.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
-  integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==
+dot-prop@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"
+  integrity sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==
   dependencies:
-    is-obj "^1.0.0"
+    is-obj "^2.0.0"
 
 dottie@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/dottie/-/dottie-2.0.1.tgz#697ad9d72004db7574d21f892466a3c285893659"
-  integrity sha512-ch5OQgvGDK2u8pSZeSYAQaV/lczImd7pMJ7BcEPXmnFVjy4yJIzP6CsODJUTH8mg1tyH1Z2abOiuJO3DjZ/GBw==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/dottie/-/dottie-2.0.2.tgz#cc91c0726ce3a054ebf11c55fbc92a7f266dd154"
+  integrity sha512-fmrwR04lsniq/uSr8yikThDTrM7epXHBAAjH9TbeH3rEA8tdCO7mRzB9hdmdGyJCxF8KERo9CITcm3kGuoyMhg==
 
 dtrace-provider@~0.8:
-  version "0.8.7"
-  resolved "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.8.7.tgz#dc939b4d3e0620cfe0c1cd803d0d2d7ed04ffd04"
-  integrity sha1-3JObTT4GIM/gwc2APQ0tftBP/QQ=
+  version "0.8.8"
+  resolved "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.8.8.tgz#2996d5490c37e1347be263b423ed7b297fb0d97e"
+  integrity sha512-b7Z7cNtHPhH9EJhNNbbeqTcXB8LGFFZhq1PGgEvpeHlzd36bhbdTWoE/Ba/YguqpBSlAPKnARWhVlhunCMwfxg==
   dependencies:
-    nan "^2.10.0"
-
-duplexer2@^0.1.2, duplexer2@~0.1.0:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
-  integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=
-  dependencies:
-    readable-stream "^2.0.2"
+    nan "^2.14.0"
 
 duplexer@^0.1.1:
   version "0.1.1"
@@ -4468,13 +3337,6 @@ duplexify@^3.4.2, duplexify@^3.6.0:
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
-eachr@^2.0.2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/eachr/-/eachr-2.0.4.tgz#466f7caa10708f610509e32c807aafe57fc122bf"
-  integrity sha1-Rm98qhBwj2EFCeMsgHqv5X/BIr8=
-  dependencies:
-    typechecker "^2.0.8"
-
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -4483,18 +3345,12 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-editions@^1.1.1, editions@^1.3.3:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz#3662cb592347c3168eb8e498a0ff73271d67f50b"
-  integrity sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==
-
-editions@^2.1.0, editions@^2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/editions/-/editions-2.1.3.tgz#727ccf3ec2c7b12dcc652c71000f16c4824d6f7d"
-  integrity sha512-xDZyVm0A4nLgMNWVVLJvcwMjI80ShiH/27RyLiCnW1L273TcJIA25C4pwJ33AWV01OX6UriP35Xu+lH4S7HWQw==
+ecdsa-sig-formatter@1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"
+  integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==
   dependencies:
-    errlop "^1.1.1"
-    semver "^5.6.0"
+    safe-buffer "^5.0.1"
 
 editorconfig@^0.15.3:
   version "0.15.3"
@@ -4511,33 +3367,20 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-ejs-loader@^0.3.1:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/ejs-loader/-/ejs-loader-0.3.3.tgz#021aa196b8858f05b6f095576c4afe61012ccc2e"
-  integrity sha512-1pQNFYu+4VIeLLNrSZ8QaiyFk9oXv8koUyQ2Pz5k0dw89HHjeiliTPQ46GfqAzCqJ8cEq8QFNj/HsVjyIuzKEA==
-  dependencies:
-    loader-utils "^0.2.7"
-    lodash "^4.17.11"
+ejs@^2.5.5:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
+  integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
 
-ejs@^2.5.5, ejs@^2.5.6:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
-  integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==
-
-electron-to-chromium@^1.3.137, electron-to-chromium@^1.3.47:
-  version "1.3.138"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.138.tgz#3c27814d48040d3988eaee56ab839d032987aff4"
-  integrity sha512-V6gvA2zuVp2l8gT8tvaFp3z2IOnx0UeCPuG6Fyw4x/eZEbt9xD9npSgia6emmDFHAz3TU0bElnpKZ3xZ0CUNDw==
-
-electron-to-chromium@^1.3.191:
-  version "1.3.210"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.210.tgz#0ce6247366c5771d4f5663a5879388fd1adefb7e"
-  integrity sha512-m1i/F+gw9jkauxDx0mOr7Sj6vp6se1mfkQNYqZb1yL5VGTp0AC1NZH5CGI6YMSO7WaScILmkKDZFG9/hlR9axQ==
+electron-to-chromium@^1.3.349, electron-to-chromium@^1.3.47:
+  version "1.3.352"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.352.tgz#f0fc1e561104dbfba55cb3d45cad3626dc75d7e9"
+  integrity sha512-dL/RyoueFG3UMhG0q3weAQvr+Tbqx/axAnOXYIIOsoYnV+2i+nRvX2S6msEo2+JARbBP8MFkkSYQ8AoY9Bh4Og==
 
 elliptic@^6.0.0:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
-  integrity sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762"
+  integrity sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==
   dependencies:
     bn.js "^4.4.0"
     brorand "^1.0.1"
@@ -4547,21 +3390,11 @@ elliptic@^6.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.0"
 
-"emoji-regex@>=6.0.0 <=6.1.1":
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.1.1.tgz#c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e"
-  integrity sha1-xs0OwbBkLio8Z6ETfvxeeW2k+I4=
-
 emoji-regex@^7.0.1:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
   integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
 
-emoji-regex@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
-  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-
 emojify.js@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/emojify.js/-/emojify.js-1.1.0.tgz#079fff223307c9007f570785e8e4935d5c398beb"
@@ -4585,9 +3418,9 @@ encodeurl@~1.0.2:
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
-  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
   dependencies:
     once "^1.4.0"
 
@@ -4631,7 +3464,7 @@ engine.io@~3.2.0:
     engine.io-parser "~2.1.0"
     ws "~3.3.1"
 
-enhanced-resolve@^4.1.0:
+enhanced-resolve@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
   integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
@@ -4640,22 +3473,29 @@ enhanced-resolve@^4.1.0:
     memory-fs "^0.4.0"
     tapable "^1.0.0"
 
+enhanced-resolve@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz#2937e2b8066cd0fe7ce0990a98f0d71a35189f66"
+  integrity sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.5.0"
+    tapable "^1.0.0"
+
 entities@^1.1.1, entities@~1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
-env-variable@0.0.x:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.5.tgz#913dd830bef11e96a039c038d4130604eba37f88"
-  integrity sha512-zoB603vQReOFvTg5xMl9I1P2PnHsHQQKTEowsKKD7nseUfJq6UWzK+4YtlWUO1nhiQUxe6XMkk+JleSZD1NZFA==
+entities@^2.0.0, entities@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4"
+  integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==
 
-errlop@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/errlop/-/errlop-1.1.1.tgz#d9ae4c76c3e64956c5d79e6e035d6343bfd62250"
-  integrity sha512-WX7QjiPHhsny7/PQvrhS5VMizXXKoKCS3udaBp8gjlARdbn+XmK300eKBAAN0hGyRaTCtRpOaxK+xFVPUJ3zkw==
-  dependencies:
-    editions "^2.1.2"
+env-variable@0.0.x:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.6.tgz#74ab20b3786c545b62b4a4813ab8cf22726c9808"
+  integrity sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg==
 
 errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
   version "0.1.7"
@@ -4671,50 +3511,47 @@ error-ex@^1.2.0, error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-error@^7.0.0:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/error/-/error-7.0.2.tgz#a5f75fff4d9926126ddac0ea5dc38e689153cb02"
-  integrity sha1-pfdf/02ZJhJt2sDqXcOOaJFTywI=
+es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2:
+  version "1.17.4"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz#e3aedf19706b20e7c2594c35fc0d57605a79e184"
+  integrity sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==
   dependencies:
-    string-template "~0.2.1"
-    xtend "~4.0.0"
-
-es-abstract@^1.12.0, es-abstract@^1.5.1, es-abstract@^1.7.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
-  integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
-  dependencies:
-    es-to-primitive "^1.2.0"
+    es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
     has "^1.0.3"
-    is-callable "^1.1.4"
-    is-regex "^1.0.4"
-    object-keys "^1.0.12"
+    has-symbols "^1.0.1"
+    is-callable "^1.1.5"
+    is-regex "^1.0.5"
+    object-inspect "^1.7.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.0"
+    string.prototype.trimleft "^2.1.1"
+    string.prototype.trimright "^2.1.1"
 
-es-to-primitive@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
-  integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
+es-to-primitive@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
   dependencies:
     is-callable "^1.1.4"
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.45, es5-ext@^0.10.46, es5-ext@^0.10.9, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
-  version "0.10.50"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.50.tgz#6d0e23a0abdb27018e5ac4fd09b412bc5517a778"
-  integrity sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==
+es5-ext@^0.10.35, es5-ext@^0.10.45, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
+  version "0.10.53"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1"
+  integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==
   dependencies:
     es6-iterator "~2.0.3"
-    es6-symbol "~3.1.1"
-    next-tick "^1.0.0"
+    es6-symbol "~3.1.3"
+    next-tick "~1.0.0"
 
 es6-error@^2.0.2:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-2.1.1.tgz#91384301ec5ed1c9a7247d1128247216f03547cd"
   integrity sha1-kThDAexe0cmnJH0RKCRyFvA1R80=
 
-es6-iterator@^2.0.1, es6-iterator@^2.0.3, es6-iterator@~2.0.3:
+es6-iterator@^2.0.3, es6-iterator@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
   integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
@@ -4724,26 +3561,26 @@ es6-iterator@^2.0.1, es6-iterator@^2.0.3, es6-iterator@~2.0.3:
     es6-symbol "^3.1.1"
 
 es6-promise@^4.0.3:
-  version "4.2.6"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.6.tgz#b685edd8258886365ea62b57d30de28fadcd974f"
-  integrity sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q==
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
+  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
 
-es6-symbol@^3.1.1, es6-symbol@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
-  integrity sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=
+es6-symbol@^3.1.1, es6-symbol@~3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
+  integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
   dependencies:
-    d "1"
-    es5-ext "~0.10.14"
+    d "^1.0.1"
+    ext "^1.1.2"
 
 es6-weak-map@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
-  integrity sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz#b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53"
+  integrity sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==
   dependencies:
     d "1"
-    es5-ext "^0.10.14"
-    es6-iterator "^2.0.1"
+    es5-ext "^0.10.46"
+    es6-iterator "^2.0.3"
     es6-symbol "^3.1.1"
 
 escape-html@^1.0.3, escape-html@~1.0.3:
@@ -4762,11 +3599,11 @@ escaper@^2.5.3:
   integrity sha512-QGb9sFxBVpbzMggrKTX0ry1oiI4CSDAl9vIL702hzl1jGW8VZs7qfqTRX7WDOjoNDoEVGcEtu1ZOQgReSfT2kQ==
 
 escodegen@^1.9.1:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.1.tgz#c485ff8d6b4cdb89e27f4a856e91f118401ca510"
-  integrity sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457"
+  integrity sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==
   dependencies:
-    esprima "^3.1.3"
+    esprima "^4.0.1"
     estraverse "^4.2.0"
     esutils "^2.0.2"
     optionator "^0.8.1"
@@ -4779,45 +3616,46 @@ eslint-config-standard@^12.0.0:
   integrity sha512-COUz8FnXhqFitYj4DTqHzidjIL/t4mumGZto5c7DrBpvWoie+Sn3P4sLEzUGeYhRElWuFEf8K1S1EfvD1vixCQ==
 
 eslint-import-resolver-node@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a"
-  integrity sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz#dbaa52b6b2816b50bc6711af75422de808e98404"
+  integrity sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg==
   dependencies:
     debug "^2.6.9"
-    resolve "^1.5.0"
+    resolve "^1.13.1"
 
-eslint-module-utils@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.0.tgz#8b93499e9b00eab80ccb6614e69f03678e84e09a"
-  integrity sha512-14tltLm38Eu3zS+mt0KvILC3q8jyIAH518MlG+HO0p+yK885Lb1UHTY/UgR91eOyGdmxAPb+OLoW4znqIT6Ndw==
+eslint-module-utils@^2.4.1:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz#7878f7504824e1b857dd2505b59a8e5eda26a708"
+  integrity sha512-LGScZ/JSlqGKiT8OC+cYRxseMjyqt6QO54nl281CK93unD89ijSeRV6An8Ci/2nvWVKe8K/Tqdm75RQoIOCr+Q==
   dependencies:
-    debug "^2.6.8"
+    debug "^2.6.9"
     pkg-dir "^2.0.0"
 
 eslint-plugin-es@^1.3.1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-1.4.0.tgz#475f65bb20c993fc10e8c8fe77d1d60068072da6"
-  integrity sha512-XfFmgFdIUDgvaRAlaXUkxrRg5JSADoRC8IkKLc/cISeR3yHVMefFHQZpcyXXEUUPHfy5DwviBcrfqlyqEwlQVw==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-1.4.1.tgz#12acae0f4953e76ba444bfd1b2271081ac620998"
+  integrity sha512-5fa/gR2yR3NxQf+UXkeLeP8FBBl6tSgdrAz1+cF84v1FMM4twGwQoqTnn+QxFLcPOrF4pdKEJKDB/q9GoyJrCA==
   dependencies:
-    eslint-utils "^1.3.0"
+    eslint-utils "^1.4.2"
     regexpp "^2.0.1"
 
 eslint-plugin-import@^2.14.0:
-  version "2.17.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.17.3.tgz#00548b4434c18faebaba04b24ae6198f280de189"
-  integrity sha512-qeVf/UwXFJbeyLbxuY8RgqDyEKCkqV7YC+E5S5uOjAp4tOc8zj01JP3ucoBM8JcEqd1qRasJSg6LLlisirfy0Q==
+  version "2.20.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz#802423196dcb11d9ce8435a5fc02a6d3b46939b3"
+  integrity sha512-qQHgFOTjguR+LnYRoToeZWT62XM55MBVXObHM6SKFd1VzDcX/vqT1kAz8ssqigh5eMj8qXcRoXXGZpPP6RfdCw==
   dependencies:
     array-includes "^3.0.3"
+    array.prototype.flat "^1.2.1"
     contains-path "^0.1.0"
     debug "^2.6.9"
     doctrine "1.5.0"
     eslint-import-resolver-node "^0.3.2"
-    eslint-module-utils "^2.4.0"
+    eslint-module-utils "^2.4.1"
     has "^1.0.3"
-    lodash "^4.17.11"
     minimatch "^3.0.4"
+    object.values "^1.1.0"
     read-pkg-up "^2.0.0"
-    resolve "^1.11.0"
+    resolve "^1.12.0"
 
 eslint-plugin-node@^8.0.0:
   version "8.0.1"
@@ -4832,16 +3670,16 @@ eslint-plugin-node@^8.0.0:
     semver "^5.5.0"
 
 eslint-plugin-promise@^4.0.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.1.1.tgz#1e08cb68b5b2cd8839f8d5864c796f56d82746db"
-  integrity sha512-faAHw7uzlNPy7b45J1guyjazw28M+7gJokKUjC5JSFoYfUEyy6Gw/i7YQvmv2Yk00sUjWcmzXQLpU1Ki/C2IZQ==
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a"
+  integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==
 
 eslint-plugin-standard@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.0.tgz#f845b45109c99cd90e77796940a344546c8f6b5c"
-  integrity sha512-OwxJkR6TQiYMmt1EsNRMe5qG3GsbjlcOhbGUBY4LtavF9DsLaTcoR+j2Tdjqi23oUwKNUqX7qcn5fPStafMdlA==
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz#ff0519f7ffaff114f76d1bd7c3996eef0f6e20b4"
+  integrity sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ==
 
-eslint-scope@^4.0.0, eslint-scope@^4.0.3:
+eslint-scope@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
   integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
@@ -4849,15 +3687,17 @@ eslint-scope@^4.0.0, eslint-scope@^4.0.3:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-utils@^1.3.0, eslint-utils@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512"
-  integrity sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==
+eslint-utils@^1.3.1, eslint-utils@^1.4.2:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
+  integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
+  dependencies:
+    eslint-visitor-keys "^1.1.0"
 
-eslint-visitor-keys@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
-  integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==
+eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
+  integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
 
 eslint@^5.9.0:
   version "5.16.0"
@@ -4910,20 +3750,15 @@ espree@^5.0.1:
     acorn-jsx "^5.0.0"
     eslint-visitor-keys "^1.0.0"
 
-esprima@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
-  integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
-
-esprima@^4.0.0:
+esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esquery@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
-  integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.1.0.tgz#c5c0b66f383e7656404f86b31334d72524eddb48"
+  integrity sha512-MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q==
   dependencies:
     estraverse "^4.0.0"
 
@@ -4935,25 +3770,20 @@ esrecurse@^4.1.0:
     estraverse "^4.1.0"
 
 estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
-  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
-estree-walker@^0.6.0:
+estree-walker@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
   integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==
 
-esutils@^2.0.0:
+esutils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-esutils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
-  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
-
 etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
@@ -4983,9 +3813,9 @@ events@1.1.1:
   integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=
 
 events@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88"
-  integrity sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59"
+  integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==
 
 evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
   version "1.0.3"
@@ -5047,31 +3877,23 @@ expect-ct@0.2.0:
   resolved "https://registry.yarnpkg.com/expect-ct/-/expect-ct-0.2.0.tgz#3a54741b6ed34cc7a93305c605f63cd268a54a62"
   integrity sha512-6SK3MG/Bbhm8MsgyJAylg+ucIOU71/FzyFalcfu5nY19dH8y/z0tBJU0wrNBXD4B27EoQtqPF/9wqH0iYAd04g==
 
-exports-loader@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/exports-loader/-/exports-loader-0.7.0.tgz#84881c784dea6036b8e1cd1dac3da9b6409e21a5"
-  integrity sha512-RKwCrO4A6IiKm0pG3c9V46JxIHcDplwwGJn6+JJ1RcVnh/WSGJa0xkmk5cRVtgOPzCAtTMGj2F7nluh9L0vpSA==
-  dependencies:
-    loader-utils "^1.1.0"
-    source-map "0.5.0"
-
 expose-loader@^0.7.5:
   version "0.7.5"
   resolved "https://registry.yarnpkg.com/expose-loader/-/expose-loader-0.7.5.tgz#e29ea2d9aeeed3254a3faa1b35f502db9f9c3f6f"
   integrity sha512-iPowgKUZkTPX5PznYsmifVj9Bob0w2wTHVkt/eYNPSzyebkUgIedmskf/kcfEIWpiWjg3JRjnW+a17XypySMuw==
 
 express-session@^1.14.2:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.16.1.tgz#251ff9776c59382301de6c8c33411af357ed439c"
-  integrity sha512-pWvUL8Tl5jUy1MLH7DhgUlpoKeVPUTe+y6WQD9YhcN0C5qAhsh4a8feVjiUXo3TFhIy191YGZ4tewW9edbl2xQ==
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.17.0.tgz#9b50dbb5e8a03c3537368138f072736150b7f9b3"
+  integrity sha512-t4oX2z7uoSqATbMfsxWMbNjAL0T5zpvcJCk3Z9wnPPN7ibddhnmDZXHfEcoBMG2ojKXZoCyPMc5FbtK+G7SoDg==
   dependencies:
-    cookie "0.3.1"
+    cookie "0.4.0"
     cookie-signature "1.0.6"
     debug "2.6.9"
     depd "~2.0.0"
     on-headers "~1.0.2"
-    parseurl "~1.3.2"
-    safe-buffer "5.1.2"
+    parseurl "~1.3.3"
+    safe-buffer "5.2.0"
     uid-safe "~2.1.5"
 
 express@>=4.14:
@@ -5110,6 +3932,13 @@ express@>=4.14:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+ext@^1.1.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244"
+  integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==
+  dependencies:
+    type "^2.0.0"
+
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -5130,22 +3959,15 @@ extend@3.0.0:
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4"
   integrity sha1-WkdDU7nzNT3dgXbf03uRyDpG8dQ=
 
-extend@^3.0.0, extend@^3.0.2, extend@~3.0.2:
+extend@^3.0.2, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
-extendr@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/extendr/-/extendr-2.1.0.tgz#301aa0bbea565f4d2dc8f570f2a22611a8527b56"
-  integrity sha1-MBqgu+pWX00tyPVw8qImEahSe1Y=
-  dependencies:
-    typechecker "~2.0.1"
-
 external-editor@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
-  integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
+  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
   dependencies:
     chardet "^0.7.0"
     iconv-lite "^0.4.24"
@@ -5172,13 +3994,6 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-extract-opts@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/extract-opts/-/extract-opts-2.2.0.tgz#1fa28eba7352c6db480f885ceb71a46810be6d7d"
-  integrity sha1-H6KOunNSxttID4hc63GkaBC+bX0=
-  dependencies:
-    typechecker "~2.0.1"
-
 extract-zip@^1.6.5:
   version "1.6.7"
   resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9"
@@ -5204,47 +4019,25 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
-fancy-log@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
-  integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==
-  dependencies:
-    ansi-gray "^0.1.1"
-    color-support "^1.1.3"
-    parse-node-version "^1.0.0"
-    time-stamp "^1.0.0"
-
-fast-deep-equal@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
+fast-deep-equal@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
+  integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
 
 fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-levenshtein@~2.0.4:
+fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
 fast-safe-stringify@^2.0.4:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.6.tgz#04b26106cc56681f51a044cfc0d76cf0008ac2c2"
-  integrity sha512-q8BZ89jjc+mz08rSxROs8VsrBBcn1SIw1kq9NjolL509tkABRk9io01RAjSaEv1Xb2uFLt8VtRiZbGp5H8iDtg==
-
-fastparse@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
-  integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==
-
-faye-websocket@~0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
-  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
-  dependencies:
-    websocket-driver ">=0.5.1"
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743"
+  integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==
 
 fd-slicer@~1.0.1:
   version "1.0.1"
@@ -5282,19 +4075,24 @@ file-entry-cache@^5.0.1:
   dependencies:
     flat-cache "^2.0.1"
 
-file-loader@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-2.0.0.tgz#39749c82f020b9e85901dcff98e8004e6401cfde"
-  integrity sha512-YCsBfd1ZGCyonOKLxPiKPdu+8ld9HAaMEvJewzz+b2eTF7uL5Zm/HdBF6FjCrpCMRq25Mi0U1gl4pwn2TlH7hQ==
+file-loader@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.3.0.tgz#780f040f729b3d18019f20605f723e844b8a58af"
+  integrity sha512-aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA==
   dependencies:
-    loader-utils "^1.0.2"
-    schema-utils "^1.0.0"
+    loader-utils "^1.2.3"
+    schema-utils "^2.5.0"
 
 file-saver@^1.3.3:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.8.tgz#e68a30c7cb044e2fb362b428469feb291c2e09d8"
   integrity sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg==
 
+file-uri-to-path@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
+  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
+
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
@@ -5343,7 +4141,7 @@ find-cache-dir@^1.0.0:
     make-dir "^1.0.0"
     pkg-dir "^2.0.0"
 
-find-cache-dir@^2.0.0:
+find-cache-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
   integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
@@ -5366,13 +4164,13 @@ find-up@^3.0.0:
   dependencies:
     locate-path "^3.0.0"
 
-findup-sync@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
-  integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=
+findup-sync@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"
+  integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==
   dependencies:
     detect-file "^1.0.0"
-    is-glob "^3.1.0"
+    is-glob "^4.0.0"
     micromatch "^3.0.4"
     resolve-dir "^1.0.1"
 
@@ -5386,18 +4184,18 @@ flat-cache@^2.0.1:
     write "1.0.3"
 
 flatted@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz#55122b6536ea496b4b44893ee2608141d10d9916"
-  integrity sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
+  integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==
 
 flowchart.js@^1.6.4:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/flowchart.js/-/flowchart.js-1.12.0.tgz#ff5b4cf350b4e067a4232dc1b4dfdd87524acf5a"
-  integrity sha512-82mj9315e3+U87D147dbPu/MKBqAtngQu3JY1GFG0+3HmsT6yN/PbpI/tmjdchWEU3gAAKuVXxSGT9u3dNvYow==
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/flowchart.js/-/flowchart.js-1.13.0.tgz#fd966270bd310ddefb168d6826c792c5f345372f"
+  integrity sha512-kr+XrH9WSE40ufAec/hs8kbAvSxFx4Fgyf/mjkJwTxWea5USuQAjZt0j9cZJO4ZayWkin9OkWxH4ovLF/5KZFA==
   dependencies:
-    raphael "2.2.7"
+    raphael "2.3.0"
 
-flush-write-stream@^1.0.0, flush-write-stream@^1.0.2:
+flush-write-stream@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
   integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
@@ -5405,6 +4203,13 @@ flush-write-stream@^1.0.0, flush-write-stream@^1.0.2:
     inherits "^2.0.3"
     readable-stream "^2.3.6"
 
+follow-redirects@1.5.10:
+  version "1.5.10"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
+  integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
+  dependencies:
+    debug "=3.1.0"
+
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -5436,6 +4241,15 @@ form-data@1.0.0-rc3:
     combined-stream "^1.0.5"
     mime-types "^2.1.3"
 
+form-data@^2.3.2:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
+  integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
 form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
@@ -5509,19 +4323,11 @@ fs-extra@^7.0.1:
     universalify "^0.1.0"
 
 fs-minipass@^1.2.5:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz#2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07"
-  integrity sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
+  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
   dependencies:
-    minipass "^2.2.1"
-
-fs-mkdirp-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz#0b7815fc3201c6a69e14db98ce098c16935259eb"
-  integrity sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=
-  dependencies:
-    graceful-fs "^4.1.11"
-    through2 "^2.0.3"
+    minipass "^2.6.0"
 
 fs-readdir-recursive@^1.0.0:
   version "1.1.0"
@@ -5544,12 +4350,12 @@ fs.realpath@^1.0.0:
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^1.0.0, fsevents@^1.2.7:
-  version "1.2.9"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f"
-  integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==
+  version "1.2.11"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz#67bf57f4758f02ede88fb2a1712fef4d15358be3"
+  integrity sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==
   dependencies:
+    bindings "^1.5.0"
     nan "^2.12.1"
-    node-pre-gyp "^0.12.0"
 
 function-bind@^1.1.1:
   version "1.1.1"
@@ -5582,12 +4388,7 @@ generate-function@^2.3.1:
   dependencies:
     is-property "^1.0.2"
 
-generic-pool@2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.3.tgz#780c36f69dfad05a5a045dd37be7adca11a4f6ff"
-  integrity sha1-eAw29p360FpaBF3Te+etyhGk9v8=
-
-get-caller-file@^1.0.1, get-caller-file@^1.0.2:
+get-caller-file@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
   integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
@@ -5597,11 +4398,6 @@ get-caller-file@^2.0.1:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-port@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/get-port/-/get-port-4.2.0.tgz#e37368b1e863b7629c43c5a323625f95cf24b119"
-  integrity sha512-/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw==
-
 get-stream@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -5626,35 +4422,6 @@ gist-embed@~2.6.0:
   resolved "https://registry.yarnpkg.com/gist-embed/-/gist-embed-2.6.0.tgz#1ea95703fa1fc2a1255419f6f06c67e9920649ab"
   integrity sha1-HqlXA/ofwqElVBn28Gxn6ZIGSas=
 
-git-up@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/git-up/-/git-up-2.1.0.tgz#2f14cfe78327e7c4a2b92fcac7bfc674fdfad40c"
-  integrity sha512-MJgwfcSd9qxgDyEYpRU/CDxNpUadrK80JHuEQDG4Urn0m7tpSOgCBrtiSIa9S9KH8Tbuo/TN8SSQmJBvsw1HkA==
-  dependencies:
-    is-ssh "^1.3.0"
-    parse-url "^3.0.2"
-
-git-url-parse@^10.0.1:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-10.1.0.tgz#a27813218f8777e91d15f1c121b83bf14721b67e"
-  integrity sha512-goZOORAtFjU1iG+4zZgWq+N7It09PqS3Xsy43ZwhP5unDD0tTSmXTpqULHodMdJXGejm3COwXIhIRT6Z8DYVZQ==
-  dependencies:
-    git-up "^2.0.0"
-
-github-slugger@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.2.0.tgz#8ada3286fd046d8951c3c952a8d7854cfd90fd9a"
-  integrity sha512-wIaa75k1vZhyPm9yWrD08A5Xnx/V+RmzGrpjQuLemGKSb77Qukiaei58Bogrl/LZSADDfPzKJX8jhLs4CRTl7Q==
-  dependencies:
-    emoji-regex ">=6.0.0 <=6.1.1"
-
-github-slugger@^1.0.0, github-slugger@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.2.1.tgz#47e904e70bf2dccd0014748142d31126cfd49508"
-  integrity sha512-SsZUjg/P03KPzQBt7OxJPasGw6NRO5uOgiZ5RGXVud5iSIZ0eNZeNp5rTwCxtavrRUa/A77j8mePVc5lEvk0KQ==
-  dependencies:
-    emoji-regex ">=6.0.0 <=6.1.1"
-
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
@@ -5678,22 +4445,6 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-stream@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4"
-  integrity sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=
-  dependencies:
-    extend "^3.0.0"
-    glob "^7.1.1"
-    glob-parent "^3.1.0"
-    is-negated-glob "^1.0.0"
-    ordered-read-streams "^1.0.0"
-    pumpify "^1.3.5"
-    readable-stream "^2.1.5"
-    remove-trailing-separator "^1.0.1"
-    to-absolute-glob "^2.0.0"
-    unique-stream "^2.0.2"
-
 glob@7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
@@ -5706,7 +4457,7 @@ glob@7.1.2:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^6.0.1, glob@~6.0.4:
+glob@^6.0.1:
   version "6.0.4"
   resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
   integrity sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=
@@ -5717,10 +4468,10 @@ glob@^6.0.1, glob@~6.0.4:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
-  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
+glob@^7.0.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -5729,6 +4480,13 @@ glob@^7.0.0, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+global-modules@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
+  integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
+  dependencies:
+    global-prefix "^3.0.0"
+
 global-modules@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
@@ -5749,12 +4507,16 @@ global-prefix@^1.0.1:
     is-windows "^1.0.1"
     which "^1.2.14"
 
-globals-docs@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/globals-docs/-/globals-docs-2.4.0.tgz#f2c647544eb6161c7c38452808e16e693c2dafbb"
-  integrity sha512-B69mWcqCmT3jNYmSxRxxOXWfzu3Go8NQXPfl2o0qPd1EEFhwW0dFUg9ztTu915zPQzqwIhWAlw6hmfIcCK4kkQ==
+global-prefix@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97"
+  integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==
+  dependencies:
+    ini "^1.3.5"
+    kind-of "^6.0.2"
+    which "^1.3.1"
 
-globals@^11.1.0, globals@^11.7.0:
+globals@^11.7.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
@@ -5783,42 +4545,27 @@ good-listener@^1.2.2:
   dependencies:
     delegate "^3.1.2"
 
-graceful-fs@*, graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
-  version "4.1.15"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
-  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
+graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
+  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
 
-graceful-fs@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b"
-  integrity sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==
-
-graphlibrary@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/graphlibrary/-/graphlibrary-2.2.0.tgz#017a14899775228dec4497a39babfdd6bf56eac6"
-  integrity sha512-XTcvT55L8u4MBZrM37zXoUxsgxs/7sow7YSygd9CIwfWTVO8RVu7AYXhhCiTuFEf+APKgx6Jk4SuQbYR0vYKmQ==
+graphlib@^2.1.7, graphlib@^2.1.8:
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.8.tgz#5761d414737870084c92ec7b5dbcb0592c9d35da"
+  integrity sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==
   dependencies:
-    lodash "^4.17.5"
+    lodash "^4.17.15"
 
 growl@1.10.5:
   version "1.10.5"
   resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
   integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
 
-gulp-print@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/gulp-print/-/gulp-print-5.0.2.tgz#8f379148218d2e168461baa74352e11d1bf7aa75"
-  integrity sha512-iIpHMzC/b3gFvVXOfP9Jk94SWGIsDLVNUrxULRleQev+08ug07mh84b1AOlW6QDQdmInQiqDFqJN1UvhU2nXdg==
-  dependencies:
-    ansi-colors "^3.2.4"
-    fancy-log "^1.3.3"
-    map-stream "0.0.7"
-    vinyl "^2.2.0"
-
-handlebars@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"
-  integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==
+handlebars@^4.5.2:
+  version "4.7.3"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.3.tgz#8ece2797826886cf8082d1726ff21d2a022550ee"
+  integrity sha512-SRGwSYuNfx8DwHD/6InAPzD6RgeruWLT+B8e8a7gGs8FWgHzlExpTFMEq2IA6QpAfOClpKHy6+8IqTjeBCu6Kg==
   dependencies:
     neo-async "^2.6.0"
     optimist "^0.6.1"
@@ -5831,7 +4578,7 @@ har-schema@^2.0.0:
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
-har-validator@~5.1.0:
+har-validator@~5.1.3:
   version "5.1.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
   integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
@@ -5868,10 +4615,10 @@ has-flag@^3.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
-has-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
-  integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
+has-symbols@^1.0.0, has-symbols@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
+  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
 
 has-unicode@^2.0.0:
   version "2.0.1"
@@ -5909,7 +4656,7 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has@^1.0.0, has@^1.0.1, has@^1.0.3:
+has@^1.0.0, has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
   integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
@@ -5940,104 +4687,66 @@ hasha@^2.2.0:
     is-stream "^1.0.1"
     pinkie-promise "^2.0.0"
 
-hast-util-is-element@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/hast-util-is-element/-/hast-util-is-element-1.0.3.tgz#423b4b26fe8bf1f25950fe052e9ce8f83fd5f6a4"
-  integrity sha512-C62CVn7jbjp89yOhhy7vrkSaB7Vk906Gtcw/Ihd+Iufnq+2pwOZjdPmpzpKLWJXPJBMDX3wXg4FqmdOayPcewA==
-
-hast-util-sanitize@^1.0.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/hast-util-sanitize/-/hast-util-sanitize-1.3.1.tgz#4e60d66336bd67e52354d581967467029a933f2e"
-  integrity sha512-AIeKHuHx0Wk45nSkGVa2/ujQYTksnDl8gmmKo/mwQi7ag7IBZ8cM3nJ2G86SajbjGP/HRpud6kMkPtcM2i0Tlw==
-  dependencies:
-    xtend "^4.0.1"
-
-hast-util-to-html@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/hast-util-to-html/-/hast-util-to-html-4.0.1.tgz#3666b05afb62bd69f8f5e6c94db04dea19438e2a"
-  integrity sha512-2emzwyf0xEsc4TBIPmDJmBttIw8R4SXAJiJZoiRR/s47ODYWgOqNoDbf2SJAbMbfNdFWMiCSOrI3OVnX6Qq2Mg==
-  dependencies:
-    ccount "^1.0.0"
-    comma-separated-tokens "^1.0.1"
-    hast-util-is-element "^1.0.0"
-    hast-util-whitespace "^1.0.0"
-    html-void-elements "^1.0.0"
-    property-information "^4.0.0"
-    space-separated-tokens "^1.0.0"
-    stringify-entities "^1.0.1"
-    unist-util-is "^2.0.0"
-    xtend "^4.0.1"
-
-hast-util-whitespace@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-1.0.3.tgz#6d161b307bd0693b5ec000c7c7e8b5445109ee34"
-  integrity sha512-AlkYiLTTwPOyxZ8axq2/bCwRUPjIPBfrHkXuCR92B38b3lSdU22R5F/Z4DL6a2kxWpekWq1w6Nj48tWat6GeRA==
-
 he@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
   integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0=
 
-he@1.2.x, he@^1.1.0, he@^1.2.0:
+he@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
-helmet-crossdomain@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/helmet-crossdomain/-/helmet-crossdomain-0.3.0.tgz#707e2df930f13ad61f76ed08e1bb51ab2b2e85fa"
-  integrity sha512-YiXhj0E35nC4Na5EPE4mTfoXMf9JTGpN4OtB4aLqShKuH9d2HNaJX5MQoglO6STVka0uMsHyG5lCut5Kzsy7Lg==
+helmet-crossdomain@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/helmet-crossdomain/-/helmet-crossdomain-0.4.0.tgz#5f1fe5a836d0325f1da0a78eaa5fd8429078894e"
+  integrity sha512-AB4DTykRw3HCOxovD1nPR16hllrVImeFp5VBV9/twj66lJ2nU75DP8FPL0/Jp4jj79JhTfG+pFI2MD02kWJ+fA==
 
-helmet-csp@2.7.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/helmet-csp/-/helmet-csp-2.7.1.tgz#e8e0b5186ffd4db625cfcce523758adbfadb9dca"
-  integrity sha512-sCHwywg4daQ2mY0YYwXSZRsgcCeerUwxMwNixGA7aMLkVmPTYBl7gJoZDHOZyXkqPrtuDT3s2B1A+RLI7WxSdQ==
+helmet-csp@2.9.4:
+  version "2.9.4"
+  resolved "https://registry.yarnpkg.com/helmet-csp/-/helmet-csp-2.9.4.tgz#801382bac98f2f88706dc5c89d95c7e31af3a4a9"
+  integrity sha512-qUgGx8+yk7Xl8XFEGI4MFu1oNmulxhQVTlV8HP8tV3tpfslCs30OZz/9uQqsWPvDISiu/NwrrCowsZBhFADYqg==
   dependencies:
+    bowser "^2.7.0"
     camelize "1.0.0"
-    content-security-policy-builder "2.0.0"
+    content-security-policy-builder "2.1.0"
     dasherize "2.0.0"
-    platform "1.3.5"
 
-helmet@^3.13.0:
-  version "3.18.0"
-  resolved "https://registry.yarnpkg.com/helmet/-/helmet-3.18.0.tgz#37666f7c861bd1ff3015e0cdb903a43501e3da3e"
-  integrity sha512-TsKlGE5UVkV0NiQ4PllV9EVfZklPjyzcMEMjWlyI/8S6epqgRT+4s4GHVgc25x0TixsKvp3L7c91HQQt5l0+QA==
+helmet@^3.21.1:
+  version "3.21.2"
+  resolved "https://registry.yarnpkg.com/helmet/-/helmet-3.21.2.tgz#7e2a19d5f6d898a77b5d2858e8e4bb2cda59f19f"
+  integrity sha512-okUo+MeWgg00cKB8Csblu8EXgcIoDyb5ZS/3u0W4spCimeVuCUvVZ6Vj3O2VJ1Sxpyb8jCDvzu0L1KKT11pkIg==
   dependencies:
     depd "2.0.0"
-    dns-prefetch-control "0.1.0"
-    dont-sniff-mimetype "1.0.0"
+    dns-prefetch-control "0.2.0"
+    dont-sniff-mimetype "1.1.0"
     expect-ct "0.2.0"
     feature-policy "0.3.0"
     frameguard "3.1.0"
-    helmet-crossdomain "0.3.0"
-    helmet-csp "2.7.1"
-    hide-powered-by "1.0.0"
+    helmet-crossdomain "0.4.0"
+    helmet-csp "2.9.4"
+    hide-powered-by "1.1.0"
     hpkp "2.0.0"
     hsts "2.2.0"
     ienoopen "1.1.0"
     nocache "2.1.0"
     referrer-policy "1.2.0"
-    x-xss-protection "1.1.0"
+    x-xss-protection "1.3.0"
 
 hex-color-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
-hide-powered-by@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/hide-powered-by/-/hide-powered-by-1.0.0.tgz#4a85ad65881f62857fc70af7174a1184dccce32b"
-  integrity sha1-SoWtZYgfYoV/xwr3F0oRhNzM4ys=
+hide-powered-by@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/hide-powered-by/-/hide-powered-by-1.1.0.tgz#be3ea9cab4bdb16f8744be873755ca663383fa7a"
+  integrity sha512-Io1zA2yOA1YJslkr+AJlWSf2yWFkKjvkcL9Ni1XSUqnGLr/qRQe2UI3Cn/J9MsJht7yEVCe0SscY1HgVMujbgg==
 
-highlight.js@^9.1.0:
-  version "9.15.8"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.8.tgz#f344fda123f36f1a65490e932cf90569e4999971"
-  integrity sha512-RrapkKQWwE+wKdF73VsOa2RQdIoO3mxwJ4P8mhbI6KYJUraUHRKM5w5zQQKXNk0xNL4UVRdulV9SBJcmzJNzVA==
-
-highlight.js@^9.15.5:
-  version "9.15.9"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.9.tgz#865257da1dbb4a58c4552d46c4b3854f77f0e6d5"
-  integrity sha512-M0zZvfLr5p0keDMCAhNBp03XJbKBxUx5AfyfufMdFMEP4N/Xj6dh0IqC75ys7BAzceR34NgcvXjupRVaHBPPVQ==
+highlight.js@^9.15.9:
+  version "9.18.1"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.1.tgz#ed21aa001fe6252bb10a3d76d47573c6539fe13c"
+  integrity sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg==
 
 highlight.js@~9.12.0:
   version "9.12.0"
@@ -6069,9 +4778,9 @@ homedir-polyfill@^1.0.1:
     parse-passwd "^1.0.0"
 
 hosted-git-info@^2.1.4:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
-  integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"
+  integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==
 
 hpkp@2.0.0:
   version "2.0.0"
@@ -6107,18 +4816,18 @@ html-encoding-sniffer@^1.0.2:
   dependencies:
     whatwg-encoding "^1.0.1"
 
-html-minifier@^3.5.20:
-  version "3.5.21"
-  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.21.tgz#d0040e054730e354db008463593194015212d20c"
-  integrity sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==
+html-minifier-terser@^5.0.1:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.3.tgz#b33549b57be7f0357be0d0b892995aaed1ed90f8"
+  integrity sha512-It4No3H1V3Dhd/O0MePFdo0oX/M6u6YZTMw4My/010mT6vxdbqge7+0RoxGAmeSbKok6gjYZoP0p4rpZ2+J2yw==
   dependencies:
-    camel-case "3.0.x"
-    clean-css "4.2.x"
-    commander "2.17.x"
-    he "1.2.x"
-    param-case "2.1.x"
-    relateurl "0.2.x"
-    uglify-js "3.4.x"
+    camel-case "^3.0.0"
+    clean-css "^4.2.1"
+    commander "^4.0.0"
+    he "^1.2.0"
+    param-case "^2.1.1"
+    relateurl "^0.2.7"
+    terser "^4.3.9"
 
 html-minifier@^4.0.0:
   version "4.0.0"
@@ -6133,21 +4842,16 @@ html-minifier@^4.0.0:
     relateurl "^0.2.7"
     uglify-js "^3.5.1"
 
-html-void-elements@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.4.tgz#95e8bb5ecd6b88766569c2645f2b5f1591db9ba5"
-  integrity sha512-yMk3naGPLrfvUV9TdDbuYXngh/TpHbA6TrOw3HL9kS8yhwx7i309BReNg7CbAJXGE+UMJ6je5OqJ7lC63o6YuQ==
-
-html-webpack-plugin@4.0.0-beta.2:
-  version "4.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.2.tgz#c3a212448ee198a17dacd06525678ee12f917420"
-  integrity sha512-153QgkvYPOc1X5/v1GFPcq7GTinNheGA1lMZUGRMFkwIQ4kegGna+wQ0ByJ8uNgw4u1aEg9FtsSKs4AzsYMi9g==
+html-webpack-plugin@^4.0.0-beta.11:
+  version "4.0.0-beta.11"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.11.tgz#3059a69144b5aecef97708196ca32f9e68677715"
+  integrity sha512-4Xzepf0qWxf8CGg7/WQM5qBB2Lc/NFI7MhU59eUDTkuQp3skZczH4UA1d6oQyDEIoMDgERVhRyTdtUPZ5s5HBg==
   dependencies:
-    html-minifier "^3.5.20"
-    loader-utils "^1.1.0"
-    lodash "^4.17.11"
+    html-minifier-terser "^5.0.1"
+    loader-utils "^1.2.3"
+    lodash "^4.17.15"
     pretty-error "^2.1.1"
-    tapable "^1.1.0"
+    tapable "^1.1.3"
     util.promisify "1.0.0"
 
 "htmlparser2@>= 3.1.5 <4", htmlparser2@^3.3.0, htmlparser2@^3.9.1:
@@ -6162,7 +4866,7 @@ html-webpack-plugin@4.0.0-beta.2:
     inherits "^2.0.1"
     readable-stream "^3.1.1"
 
-http-errors@1.7.2, http-errors@~1.7.2:
+http-errors@1.7.2:
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
   integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
@@ -6173,10 +4877,16 @@ http-errors@1.7.2, http-errors@~1.7.2:
     statuses ">= 1.5.0 < 2"
     toidentifier "1.0.0"
 
-"http-parser-js@>=0.4.0 <0.4.11":
-  version "0.4.10"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4"
-  integrity sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=
+http-errors@~1.7.2:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
+  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.4"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
 
 http-signature@~1.2.0:
   version "1.2.0"
@@ -6193,42 +4903,39 @@ https-browserify@^1.0.0:
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
 i18n@^0.8.3:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/i18n/-/i18n-0.8.3.tgz#2d8cf1c24722602c2041d01ba6ae5eaa51388f0e"
-  integrity sha1-LYzxwkciYCwgQdAbpq5eqlE4jw4=
+  version "0.8.5"
+  resolved "https://registry.yarnpkg.com/i18n/-/i18n-0.8.5.tgz#3ae2db28fa1670e3f5ba30d3e505958b0b62e7ec"
+  integrity sha512-6UgLbhJGgn4XFeuZc/dDdrrri0ij24EK4hxv4Pbi5hloYAZ1B2+0eQchEryBFezLKYOHhVGV/5+H4i0oxng94w==
   dependencies:
     debug "*"
-    make-plural "^3.0.3"
-    math-interval-parser "^1.1.0"
-    messageformat "^0.3.1"
+    make-plural "^6.0.1"
+    math-interval-parser "^2.0.1"
+    messageformat "^2.3.0"
     mustache "*"
-    sprintf-js ">=1.0.3"
+    sprintf-js "^1.1.2"
 
-iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.11, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
+iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-icss-replace-symbols@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
-  integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=
-
-icss-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
-  integrity sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=
+iconv-lite@^0.5.0, iconv-lite@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.1.tgz#b2425d3c7b18f7219f2ca663d103bddb91718d64"
+  integrity sha512-ONHr16SQvKZNSqjQT9gy5z24Jw+uqfO02/ngBSBoqChZ+W8qXX7GPRa1RoUnzGADw8K63R1BXUMzarCVQBpY8Q==
   dependencies:
-    postcss "^6.0.1"
+    safer-buffer ">= 2.1.2 < 3"
 
-ieee754@1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
-  integrity sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=
+icss-utils@^4.0.0, icss-utils@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467"
+  integrity sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==
+  dependencies:
+    postcss "^7.0.14"
 
-ieee754@^1.1.4:
+ieee754@1.1.13, ieee754@^1.1.4:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
   integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
@@ -6244,9 +4951,9 @@ iferr@^0.1.5:
   integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
 ignore-walk@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
-  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
+  integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
   dependencies:
     minimatch "^3.0.4"
 
@@ -6261,22 +4968,9 @@ ignore@^4.0.6:
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
 ignore@^5.0.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.2.tgz#e28e584d43ad7e92f96995019cc43b9e1ac49558"
-  integrity sha512-vdqWBp7MyzdmHkkRWV5nY+PfGRbYbahfuvsBCh277tq+w9zyNi7h5CYJCK0kmzti9kU+O/cB7sE8HvKv6aXAKQ==
-
-ignorefs@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/ignorefs/-/ignorefs-1.2.0.tgz#da59fb858976e4a5e43702ccd1f282fdbc9e5756"
-  integrity sha1-2ln7hYl25KXkNwLM0fKC/byeV1Y=
-  dependencies:
-    editions "^1.3.3"
-    ignorepatterns "^1.1.0"
-
-ignorepatterns@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ignorepatterns/-/ignorepatterns-1.1.0.tgz#ac8f436f2239b5dfb66d5f0d3a904a87ac67cc5e"
-  integrity sha1-rI9DbyI5td+2bV8NOpBKh6xnzF4=
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
+  integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==
 
 image-size@~0.5.0:
   version "0.5.5"
@@ -6290,7 +4984,7 @@ image-size@~0.5.0:
     commander "^2.13.0"
     glob "^7.1.2"
     q "^2.0.3"
-    request "^2.88.0"
+    request "^2.83.0"
 
 import-fresh@^2.0.0:
   version "2.0.0"
@@ -6301,14 +4995,14 @@ import-fresh@^2.0.0:
     resolve-from "^3.0.0"
 
 import-fresh@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.0.0.tgz#a3d897f420cab0e671236897f75bc14b4885c390"
-  integrity sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ==
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
+  integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
   dependencies:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
-import-local@^2.0.0:
+import-local@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
   integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
@@ -6339,6 +5033,11 @@ indexof@0.0.1:
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
   integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
 
+infer-owner@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
+  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
+
 inflection@1.12.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416"
@@ -6352,25 +5051,30 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
 inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
   integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
 
+inherits@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+
 ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
   integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
 inquirer@^6.2.2:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.3.1.tgz#7a413b5e7950811013a3db491c61d1f3b776e8e7"
-  integrity sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
+  integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
   dependencies:
     ansi-escapes "^3.2.0"
     chalk "^2.4.2"
@@ -6378,7 +5082,7 @@ inquirer@^6.2.2:
     cli-width "^2.0.0"
     external-editor "^3.0.3"
     figures "^2.0.0"
-    lodash "^4.17.11"
+    lodash "^4.17.12"
     mute-stream "0.0.7"
     run-async "^2.2.0"
     rxjs "^6.4.0"
@@ -6386,7 +5090,7 @@ inquirer@^6.2.2:
     strip-ansi "^5.1.0"
     through "^2.3.6"
 
-interpret@^1.1.0:
+interpret@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
   integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
@@ -6418,14 +5122,6 @@ is-absolute-url@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
   integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=
 
-is-absolute@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
-  integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
-  dependencies:
-    is-relative "^1.0.0"
-    is-windows "^1.0.1"
-
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
@@ -6440,23 +5136,10 @@ is-accessor-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
-is-alphabetical@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.3.tgz#eb04cc47219a8895d8450ace4715abff2258a1f8"
-  integrity sha512-eEMa6MKpHFzw38eKm56iNNi6GJ7lf6aLLio7Kr23sJPAECscgRtZvOBYybejWDQ2bM949Y++61PY+udzj5QMLA==
-
-is-alphanumeric@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz#4a9cef71daf4c001c1d81d63d140cf53fd6889f4"
-  integrity sha1-Spzvcdr0wAHB2B1j0UDPU/1oifQ=
-
-is-alphanumerical@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.3.tgz#57ae21c374277b3defe0274c640a5704b8f6657c"
-  integrity sha512-A1IGAPO5AW9vSh7omxIlOGwIqEvpW/TA+DksVOPM5ODuxKlZS09+TEM1E3275lJqO2oJ38vDpeAL3DCIiHE6eA==
-  dependencies:
-    is-alphabetical "^1.0.0"
-    is-decimal "^1.0.0"
+is-arguments@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3"
+  integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==
 
 is-arrayish@^0.2.1:
   version "0.2.1"
@@ -6480,20 +5163,15 @@ is-bluebird@^1.0.2:
   resolved "https://registry.yarnpkg.com/is-bluebird/-/is-bluebird-1.0.2.tgz#096439060f4aa411abee19143a84d6a55346d6e2"
   integrity sha1-CWQ5Bg9KpBGr7hkUOoTWpVNG1uI=
 
-is-buffer@^1.1.4, is-buffer@^1.1.5:
+is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-buffer@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
-  integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==
-
-is-callable@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
-  integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
+is-callable@^1.1.4, is-callable@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
+  integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
 
 is-color-stop@^1.0.0:
   version "1.1.0"
@@ -6522,14 +5200,9 @@ is-data-descriptor@^1.0.0:
     kind-of "^6.0.0"
 
 is-date-object@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
-  integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
-
-is-decimal@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.3.tgz#381068759b9dc807d8c0dc0bfbae2b68e1da48b7"
-  integrity sha512-bvLSwoDg2q6Gf+E2LEPiklHZxxiSi3XAh4Mav65mKqTfCO1HM3uBs24TjEH8iJX3bbDdLXKJXBTmGzuTUuAEjQ==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
+  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
 
 is-descriptor@^0.1.0:
   version "0.1.6"
@@ -6589,11 +5262,9 @@ is-extglob@^2.1.0, is-extglob@^2.1.1:
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
 is-finite@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
-  integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=
-  dependencies:
-    number-is-nan "^1.0.0"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3"
+  integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==
 
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
@@ -6607,11 +5278,6 @@ is-fullwidth-code-point@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
-is-fullwidth-code-point@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
-  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
@@ -6626,23 +5292,13 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-glob@^4.0.0:
+is-glob@^4.0.0, is-glob@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
   integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
   dependencies:
     is-extglob "^2.1.1"
 
-is-hexadecimal@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.3.tgz#e8a426a69b6d31470d3a33a47bb825cda02506ee"
-  integrity sha512-zxQ9//Q3D/34poZf8fiy3m3XVpbQc7ren15iKqrTtLPwkPD/t3Scy9Imp63FujULGxuK0ZlCwoo5xNpktFgbOA==
-
-is-negated-glob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
-  integrity sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=
-
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
@@ -6662,17 +5318,17 @@ is-number@^4.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
   integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
 
-is-obj@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
+is-obj@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
+  integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
 
-is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
+is-plain-obj@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
   integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
-is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
   integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
@@ -6699,42 +5355,33 @@ is-property@^1.0.2:
   resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
   integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=
 
-is-regex@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
-  integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=
+is-regex@^1.0.4, is-regex@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
+  integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==
   dependencies:
-    has "^1.0.1"
+    has "^1.0.3"
 
 is-regexp@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
   integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
 
-is-relative@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
-  integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
-  dependencies:
-    is-unc-path "^1.0.0"
-
 is-resolvable@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
   integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
 
-is-ssh@^1.3.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.1.tgz#f349a8cadd24e65298037a522cf7520f2e81a0f3"
-  integrity sha512-0eRIASHZt1E68/ixClI8bp2YK2wmBPVWEismTs6M+M099jKgrzl/3E976zIbImSIob48N2/XGe9y7ZiYdImSlg==
-  dependencies:
-    protocols "^1.1.0"
-
 is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
+is-string@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
+  integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
+
 is-svg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75"
@@ -6743,49 +5390,22 @@ is-svg@^3.0.0:
     html-comment-regex "^1.1.0"
 
 is-symbol@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
-  integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
+  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
   dependencies:
-    has-symbols "^1.0.0"
+    has-symbols "^1.0.1"
 
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
-is-unc-path@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
-  integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
-  dependencies:
-    unc-path-regex "^0.1.2"
-
-is-utf8@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
-
-is-valid-glob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa"
-  integrity sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=
-
-is-whitespace-character@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.3.tgz#b3ad9546d916d7d3ffa78204bca0c26b56257fac"
-  integrity sha512-SNPgMLz9JzPccD3nPctcj8sZlX9DAMJSKH8bP7Z6bohCwuNgX8xbWr1eTAYXX9Vpi/aSn8Y1akL9WgM3t43YNQ==
-
 is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
-is-word-character@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.3.tgz#264d15541cbad0ba833d3992c34e6b40873b08aa"
-  integrity sha512-0wfcrFgOOOBdgRNT9H33xe6Zi6yhX/uoc4U8NBZGeQQB0ctU1dnlNTyL9JM2646bHDTpsDm1Brb3VPoCIMrd/A==
-
 is-wsl@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
@@ -6849,9 +5469,9 @@ jquery@^3.4.1:
   integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
 
 js-beautify@^1.8.8:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.10.0.tgz#9753a13c858d96828658cd18ae3ca0e5783ea672"
-  integrity sha512-OMwf/tPDpE/BLlYKqZOhqWsd3/z2N3KOlyn1wsCRGFwViE8LOQTcDtathQvHvZc+q+zWmcNAbwKSC+iJoMaH2Q==
+  version "1.10.3"
+  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.10.3.tgz#c73fa10cf69d3dfa52d8ed624f23c64c0a6a94c1"
+  integrity sha512-wfk/IAWobz1TfApSdivH5PJ0miIHgDoYb1ugSqHcODPmaYu46rYe5FVuIEkhjg8IQiv6rDNPyhsqbsohI/C2vQ==
   dependencies:
     config-chain "^1.1.12"
     editorconfig "^0.15.3"
@@ -6860,14 +5480,9 @@ js-beautify@^1.8.8:
     nopt "~4.0.1"
 
 js-cookie@^2.1.3:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.0.tgz#1b2c279a6eece380a12168b92485265b35b1effb"
-  integrity sha1-Gywnmm7s44ChIWi5JIUmWzWx7/s=
-
-js-levenshtein@^1.1.3:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
-  integrity sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8"
+  integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==
 
 "js-sequence-diagrams@git+https://github.com/codimd/js-sequence-diagrams.git":
   version "2.0.1"
@@ -6879,11 +5494,6 @@ js-levenshtein@^1.1.3:
     underscore "1.8.x"
     webfontloader "~1.6.x"
 
-js-string-escape@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
-  integrity sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8=
-
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -6894,7 +5504,7 @@ js-tokens@^3.0.2:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
   integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
-js-yaml@^3.10.0, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@~3.13.1:
+js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@~3.13.1:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -6902,6 +5512,11 @@ js-yaml@^3.10.0, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@~3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+jsbi@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-3.1.1.tgz#8ea18b3e08d102c6cc09acaa9a099921d775f4fa"
+  integrity sha512-+HQESPaV0mRiH614z4JPVPAftcRC2p53x92lySPzUzFwJbJTMpzHz8OYUkcXPN3fOcHUe0NdVcHnCtX/1+eCrA==
+
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -6916,7 +5531,7 @@ jsdom-nogyp@^0.8.3:
     cssstyle "~0.2.3"
     htmlparser2 ">= 3.1.5 <4"
     nwmatcher "~1.3.1"
-    request "^2.88.0"
+    request "2.x"
     xmlhttprequest ">=1.5.0"
 
 jsdom@^11.9.0:
@@ -6938,7 +5553,7 @@ jsdom@^11.9.0:
     nwsapi "^2.0.7"
     parse5 "4.0.0"
     pn "^1.1.0"
-    request "^2.88.0"
+    request "^2.87.0"
     request-promise-native "^1.0.5"
     sax "^1.2.4"
     symbol-tree "^3.2.2"
@@ -6956,11 +5571,6 @@ jsesc@^1.3.0:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
   integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
 
-jsesc@^2.5.1:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
-  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
-
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
@@ -7003,7 +5613,7 @@ json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json5@^0.5.0, json5@^0.5.1:
+json5@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
   integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
@@ -7015,13 +5625,6 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850"
-  integrity sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==
-  dependencies:
-    minimist "^1.2.0"
-
 jsonfile@^2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
@@ -7044,11 +5647,6 @@ jsonlint@^1.6.2:
     JSV "^4.0.x"
     nomnom "^1.5.x"
 
-jsonparse@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
-  integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
-
 jsonparse@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.2.0.tgz#5c0c5685107160e72fe7489bddea0b44c2bc67bd"
@@ -7064,6 +5662,23 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
+jwa@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
+  integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==
+  dependencies:
+    buffer-equal-constant-time "1.0.1"
+    ecdsa-sig-formatter "1.0.11"
+    safe-buffer "^5.0.1"
+
+jws@3.x.x:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
+  integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==
+  dependencies:
+    jwa "^1.4.1"
+    safe-buffer "^5.0.1"
+
 kew@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/kew/-/kew-0.7.0.tgz#79d93d2d33363d6fdd2970b335d9141ad591d79b"
@@ -7094,9 +5709,9 @@ kind-of@^5.0.0:
   integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
 kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
 klaw@^1.0.0:
   version "1.3.1"
@@ -7147,9 +5762,9 @@ ldap-filter@0.2.2:
     assert-plus "0.1.5"
 
 ldapauth-fork@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/ldapauth-fork/-/ldapauth-fork-4.2.0.tgz#3d2f809f973deb127a35eb523135661b7013e9d9"
-  integrity sha512-DFYhOO9UPX/fIUnwAjJ4zCq2osR3pyS9TK24oBRLHj7+iw9OAbckHLcdDkgI//IajUEsF6Ngz0uXod6A88L2HA==
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/ldapauth-fork/-/ldapauth-fork-4.3.1.tgz#500c04f339257ac0e189af8752ec5df43982ceac"
+  integrity sha512-IJUnkEDQg6D45jUKW3FFfMWZhUjZoGkN97WaMXF1cBod0gJq74d+iwRavPqiE3o/KNRgqwFesrdE4Ym4Fc1GIQ==
   dependencies:
     "@types/ldapjs" "^1.0.0"
     "@types/node" "^10.12.12"
@@ -7174,40 +5789,36 @@ ldapjs@^1.0.2:
   optionalDependencies:
     dtrace-provider "~0.8"
 
-lead@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz#6f14f99a37be3a9dd784f5495690e5903466ee42"
-  integrity sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=
-  dependencies:
-    flush-write-stream "^1.0.2"
-
 left-pad@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
   integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==
 
-less-loader@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-4.1.0.tgz#2c1352c5b09a4f84101490274fd51674de41363e"
-  integrity sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==
+less-loader@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-5.0.0.tgz#498dde3a6c6c4f887458ee9ed3f086a12ad1b466"
+  integrity sha512-bquCU89mO/yWLaUq0Clk7qCsKhsF/TZpJUzETRvJa9KSVEL9SO3ovCvdEHISBhrC81OwC8QSVX7E0bzElZj9cg==
   dependencies:
     clone "^2.1.1"
     loader-utils "^1.1.0"
-    pify "^3.0.0"
+    pify "^4.0.1"
 
-less@^2.7.1:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/less/-/less-2.7.3.tgz#cc1260f51c900a9ec0d91fb6998139e02507b63b"
-  integrity sha512-KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==
+less@^3.10.3:
+  version "3.11.1"
+  resolved "https://registry.yarnpkg.com/less/-/less-3.11.1.tgz#c6bf08e39e02404fe6b307a3dfffafdc55bd36e2"
+  integrity sha512-tlWX341RECuTOvoDIvtFqXsKj072hm3+9ymRBe76/mD6O5ZZecnlAOVDlWAleF2+aohFrxNidXhv2773f6kY7g==
+  dependencies:
+    clone "^2.1.2"
+    tslib "^1.10.0"
   optionalDependencies:
     errno "^0.1.1"
     graceful-fs "^4.1.2"
     image-size "~0.5.0"
-    mime "^1.2.11"
+    mime "^1.4.1"
     mkdirp "^0.5.0"
     promise "^7.1.1"
-    request "^2.88.0"
-    source-map "^0.5.3"
+    request "^2.83.0"
+    source-map "~0.6.0"
 
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
@@ -7218,9 +5829,9 @@ levn@^0.3.0, levn@~0.3.0:
     type-check "~0.3.2"
 
 linkify-it@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.1.0.tgz#c4caf38a6cd7ac2212ef3c7d2bde30a91561f9db"
-  integrity sha512-4REs8/062kV2DSHxNfq5183zrqXMl7WP0WzABH9IeJI+NLm429FgE1PDecltYfnOoFDFlZGh2T8PfZn0r+GTRg==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf"
+  integrity sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==
   dependencies:
     uc.micro "^1.0.1"
 
@@ -7231,11 +5842,6 @@ list.js@^1.5.0:
   dependencies:
     string-natural-compare "^2.0.2"
 
-livereload-js@^2.3.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz#447c31cf1ea9ab52fc20db615c5ddf678f78009c"
-  integrity sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==
-
 load-json-file@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
@@ -7246,32 +5852,12 @@ load-json-file@^2.0.0:
     pify "^2.0.0"
     strip-bom "^3.0.0"
 
-load-json-file@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
-  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^4.0.0"
-    pify "^3.0.0"
-    strip-bom "^3.0.0"
-
-loader-runner@^2.3.0:
+loader-runner@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
   integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
 
-loader-utils@^0.2.7:
-  version "0.2.17"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
-  integrity sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-    object-assign "^4.0.1"
-
-loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3:
+loader-utils@1.2.3, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
   integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
@@ -7337,9 +5923,9 @@ lodash.memoize@^4.1.2:
   integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
 
 lodash.merge@^4.4.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54"
-  integrity sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
 lodash.pick@^4.2.1:
   version "4.4.0"
@@ -7371,12 +5957,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@4.17.x, lodash@^4.14.2, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.8.0:
-  version "4.17.11"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
-  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
-
-lodash@^4.17.10, lodash@^4.17.13:
+lodash@4.17.x, lodash@^4.14.2, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.8.0:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -7397,11 +5978,6 @@ long@^4.0.0:
   resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
   integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
 
-longest-streak@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.3.tgz#3de7a3f47ee18e9074ded8575b5c091f5d0a4105"
-  integrity sha512-9lz5IVdpwsKLMzQi0MQ+oD9EA0mIGcWYP7jXMTZVXP8D42PwuAk+M/HBFYQoxt1G5OR8m7aSIgb1UymfWGBWEw==
-
 longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
@@ -7419,7 +5995,7 @@ lower-case@^1.1.1:
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
   integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
 
-lru-cache@^4.1.1, lru-cache@^4.1.3, lru-cache@^4.1.5:
+lru-cache@^4.1.3, lru-cache@^4.1.5:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
   integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -7453,10 +6029,10 @@ lutim@^1.0.2:
   version "1.4.4"
   resolved "git+https://github.com/hackmdio/lz-string.git#efd1f64676264d6d8871b01f4f375fc6ef4f9022"
 
-magic-string@^0.25.2:
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9"
-  integrity sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==
+magic-string@^0.25.3:
+  version "0.25.6"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.6.tgz#5586387d1242f919c6d223579cc938bf1420795e"
+  integrity sha512-3a5LOMSGoCTH5rbqobC2HuDNRtE2glHZ8J7pK+QZYppyWA36yuNpsX994rIY2nCuyP7CZYy7lQq/X2jygiZ89g==
   dependencies:
     sourcemap-codec "^1.4.4"
 
@@ -7475,13 +6051,18 @@ make-dir@^2.0.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
-make-plural@^3.0.3, make-plural@~3.0.3:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-3.0.6.tgz#2033a03bac290b8f3bb91258f65b9df7e8b01ca7"
-  integrity sha1-IDOgO6wpC487uRJY9lud9+iwHKc=
+make-plural@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-4.3.0.tgz#f23de08efdb0cac2e0c9ba9f315b0dff6b4c2735"
+  integrity sha512-xTYd4JVHpSCW+aqDof6w/MebaMVNTVYBZhbB/vi513xXdiPT92JMVCo0Jq8W2UZnzYRFeVbQiQ+I25l13JuKvA==
   optionalDependencies:
     minimist "^1.2.0"
 
+make-plural@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-6.0.1.tgz#ed3839fac3f469ebbe505751d48fe3319769edfc"
+  integrity sha512-h0uBNi4tpDkiWUyYKrJNj8Kif6q3Ba5zp/8jnfPy3pQE+4XcTj6h3eZM5SYVUyDNX9Zk69Isr/dx0I+78aJUaQ==
+
 mamacro@^0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
@@ -7494,16 +6075,11 @@ map-age-cleaner@^0.1.1:
   dependencies:
     p-defer "^1.0.0"
 
-map-cache@^0.2.0, map-cache@^0.2.2:
+map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
   integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
-map-stream@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.7.tgz#8a1f07896d82b10926bd3744a2420009f88974a8"
-  integrity sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=
-
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
@@ -7511,10 +6087,17 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-markdown-escapes@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.3.tgz#6155e10416efaafab665d466ce598216375195f5"
-  integrity sha512-XUi5HJhhV5R74k8/0H2oCbCiYf/u4cO/rX8tnGkRvrqhsr5BRNU6Mg0yt/8UIx1iIS8220BNJsDb7XnILhLepw==
+mariadb@^2.1.2:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-2.2.0.tgz#077e8c44ded718f2ecebef321c3703fe8d524504"
+  integrity sha512-YXPF11u4NVgm3FLetJoAbq9Fb0a/RSwNrDHdmAqpqgYErWAOes/IVbOfvWPWZQ0hI88j/81f15AGJZAVuR3bGg==
+  dependencies:
+    "@types/geojson" "^7946.0.7"
+    "@types/node" ">=8.0.0"
+    denque "^1.4.1"
+    iconv-lite "^0.5.1"
+    long "^4.0.0"
+    moment-timezone "^0.5.27"
 
 markdown-it-abbr@^1.0.4:
   version "1.0.4"
@@ -7537,9 +6120,9 @@ markdown-it-emoji@^1.3.0:
   integrity sha1-m+4OmpkKljupbfaYDE/dsF37Tcw=
 
 markdown-it-footnote@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/markdown-it-footnote/-/markdown-it-footnote-3.0.1.tgz#7f3730747cacc86e2fe0bf8a17a710f34791517a"
-  integrity sha1-fzcwdHysyG4v4L+KF6cQ80eRUXo=
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/markdown-it-footnote/-/markdown-it-footnote-3.0.2.tgz#1575ee7a093648d4e096aa33386b058d92ac8bc1"
+  integrity sha512-JVW6fCmZWjvMdDQSbOT3nnOQtd9iAXmw7hTSh26+v42BnvXeVyGMDBm5b/EZocMed2MbCAHiTX632vY0FyGB8A==
 
 markdown-it-imsize@^2.0.1:
   version "2.0.1"
@@ -7576,58 +6159,51 @@ markdown-it-sup@^1.0.0:
   resolved "https://registry.yarnpkg.com/markdown-it-sup/-/markdown-it-sup-1.0.0.tgz#cb9c9ff91a5255ac08f3fd3d63286e15df0a1fc3"
   integrity sha1-y5yf+RpSVawI8/09YyhuFd8KH8M=
 
-markdown-it@^8.2.2:
-  version "8.4.2"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54"
-  integrity sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==
+markdown-it@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-10.0.0.tgz#abfc64f141b1722d663402044e43927f1f50a8dc"
+  integrity sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==
   dependencies:
     argparse "^1.0.7"
-    entities "~1.1.1"
+    entities "~2.0.0"
     linkify-it "^2.0.0"
     mdurl "^1.0.1"
     uc.micro "^1.0.5"
 
-markdown-pdf@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/markdown-pdf/-/markdown-pdf-9.0.0.tgz#d699f29c3b6c41da4b9a2ec7d09ea8895daef146"
-  integrity sha512-5Ck+LJzsxfXR4Bjmg5sLfVW9JhfkG/WEUsFUVdYN7FSHRKLEYw4r/O6esrWA8hEb+mV3RvFNUQTp+DpFKMfyYg==
+markdown-pdf@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/markdown-pdf/-/markdown-pdf-10.0.0.tgz#0cf7a32740c2966aa79392a35742749d6ed2a491"
+  integrity sha512-o3lFfAOTpCgCXEXpNN86RaCVGE1YlxjWuAJ79XevAPoTyCBsl06BWhnFogYedg+JZxPjB3LWsA8JxZiCjsPPLA==
   dependencies:
-    commander "^2.2.0"
+    commander "^3.0.0"
     duplexer "^0.1.1"
-    extend "^3.0.0"
-    highlight.js "^9.1.0"
+    extend "^3.0.2"
+    highlight.js "^9.15.9"
     phantomjs-prebuilt "^2.1.3"
-    remarkable "^1.7.1"
+    remarkable "^2.0.0"
     stream-from-to "^1.4.2"
-    through2 "^2.0.0"
-    tmp "0.0.33"
+    through2 "^3.0.1"
+    tmp "^0.1.0"
 
-markdown-table@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.3.tgz#9fcb69bcfdb8717bfd0398c6ec2d93036ef8de60"
-  integrity sha512-1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q==
+marked@~0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.8.0.tgz#ec5c0c9b93878dc52dd54be8d0e524097bd81a99"
+  integrity sha512-MyUe+T/Pw4TZufHkzAfDj6HarCBWia2y27/bhuYkTaiUnfDYFnCP3KUN+9oM7Wi6JA2rymtVYbQu3spE0GCmxQ==
 
-marked@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-0.7.0.tgz#b64201f051d271b1edc10a04d1ae9b74bb8e5c0e"
-  integrity sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==
-
-math-interval-parser@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/math-interval-parser/-/math-interval-parser-1.1.0.tgz#dbeda5b06b3249973c6df6170fde2386f0afd893"
-  integrity sha1-2+2lsGsySZc8bfYXD94jhvCv2JM=
-  dependencies:
-    xregexp "^2.0.0"
+math-interval-parser@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/math-interval-parser/-/math-interval-parser-2.0.1.tgz#e22cd6d15a0a7f4c03aec560db76513da615bed4"
+  integrity sha512-VmlAmb0UJwlvMyx8iPhXUDnVW1F9IrGEd9CIOmv+XL8AErCUUuozoDMrgImvnYt2A+53qVX/tPW6YJurMKYsvA==
 
 math-random@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
   integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
 
-mathjax@~2.7.0:
-  version "2.7.5"
-  resolved "https://registry.yarnpkg.com/mathjax/-/mathjax-2.7.5.tgz#c9c5947f86f9be31651f5f3667d3c9a8bb01efe4"
-  integrity sha512-OzsJNitEHAJB3y4IIlPCAvS0yoXwYjlo2Y4kmm9KQzyIBZt2d8yKRalby3uTRNN4fZQiGL2iMXjpdP1u2Rq2DQ==
+mathjax@~2.7.6:
+  version "2.7.7"
+  resolved "https://registry.yarnpkg.com/mathjax/-/mathjax-2.7.7.tgz#22ff89550a7b1f5f06a037d13da5ff3c33e11ec4"
+  integrity sha512-OOl0B2/0tSJAtAZarXnQuLDBLgTNRqiI9VqHTQzPsxf4okT2iIpDrvaklK9x2QEMD1sDj4yRn11Ygci41DxMAQ==
 
 mattermost@^3.4.0:
   version "3.4.0"
@@ -7653,63 +6229,10 @@ md5.js@^1.3.4:
     inherits "^2.0.1"
     safe-buffer "^5.1.2"
 
-mdast-util-compact@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/mdast-util-compact/-/mdast-util-compact-1.0.3.tgz#98a25cc8a7865761a41477b3a87d1dcef0b1e79d"
-  integrity sha512-nRiU5GpNy62rZppDKbLwhhtw5DXoFMqw9UNZFmlPsNaQCZ//WLjGKUwWMdJrUH+Se7UvtO2gXtAMe0g/N+eI5w==
-  dependencies:
-    unist-util-visit "^1.1.0"
-
-mdast-util-definitions@^1.2.0:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-1.2.4.tgz#2b54ad4eecaff9d9fcb6bf6f9f6b68b232d77ca7"
-  integrity sha512-HfUArPog1j4Z78Xlzy9Q4aHLnrF/7fb57cooTHypyGoe2XFNbcx/kWZDoOz+ra8CkUzvg3+VHV434yqEd1DRmA==
-  dependencies:
-    unist-util-visit "^1.0.0"
-
-mdast-util-inject@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-inject/-/mdast-util-inject-1.1.0.tgz#db06b8b585be959a2dcd2f87f472ba9b756f3675"
-  integrity sha1-2wa4tYW+lZotzS+H9HK6m3VvNnU=
-  dependencies:
-    mdast-util-to-string "^1.0.0"
-
-mdast-util-to-hast@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-3.0.4.tgz#132001b266031192348d3366a6b011f28e54dc40"
-  integrity sha512-/eIbly2YmyVgpJNo+bFLLMCI1XgolO/Ffowhf+pHDq3X4/V6FntC9sGQCDLM147eTS+uSXv5dRzJyFn+o0tazA==
-  dependencies:
-    collapse-white-space "^1.0.0"
-    detab "^2.0.0"
-    mdast-util-definitions "^1.2.0"
-    mdurl "^1.0.1"
-    trim "0.0.1"
-    trim-lines "^1.0.0"
-    unist-builder "^1.0.1"
-    unist-util-generated "^1.1.0"
-    unist-util-position "^3.0.0"
-    unist-util-visit "^1.1.0"
-    xtend "^4.0.1"
-
-mdast-util-to-string@^1.0.0, mdast-util-to-string@^1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.0.6.tgz#7d85421021343b33de1552fc71cb8e5b4ae7536d"
-  integrity sha512-868pp48gUPmZIhfKrLbaDneuzGiw3OTDjHc5M1kAepR2CWBJ+HpEsm252K4aXdiP5coVZaJPOqGtVU6Po8xnXg==
-
-mdast-util-toc@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-toc/-/mdast-util-toc-3.1.0.tgz#395eeb877f067f9d2165d990d77c7eea6f740934"
-  integrity sha512-Za0hqL1PqWrvxGtA/3NH9D5nhGAUS9grMM4obEAz5+zsk1RIw/vWUchkaoDLNdrwk05A0CSC5eEXng36/1qE5w==
-  dependencies:
-    github-slugger "^1.2.1"
-    mdast-util-to-string "^1.0.5"
-    unist-util-is "^2.1.2"
-    unist-util-visit "^1.1.0"
-
-mdn-data@~1.1.0:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.4.tgz#50b5d4ffc4575276573c4eedb8780812a8419f01"
-  integrity sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA==
+mdn-data@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b"
+  integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==
 
 mdurl@^1.0.1:
   version "1.0.1"
@@ -7744,7 +6267,7 @@ memoizee@^0.4.14:
     next-tick "1"
     timers-ext "^0.1.5"
 
-memory-fs@^0.4.0, memory-fs@~0.4.1:
+memory-fs@^0.4.0, memory-fs@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
   integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
@@ -7752,46 +6275,61 @@ memory-fs@^0.4.0, memory-fs@~0.4.1:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
+memory-fs@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
+  integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
   integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
 
-mermaid@~8.2.3:
-  version "8.2.3"
-  resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.2.3.tgz#609bad45bedc3ee1a935161c11c3c22689cfecd9"
-  integrity sha512-G2p9BAAEeTtogPs4YXM8KyX+TsZULlgk0tGvmBPfBZ5j3YCPxgAxG9ZzleiYNItF7M1hGkE485BDLN8DbfR+/Q==
+mermaid@~8.4.6:
+  version "8.4.7"
+  resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.4.7.tgz#1af8f6bece99f022a514471c42b80cabf7706501"
+  integrity sha512-mj4mefncBd8y921auvsXMN5MbVqzkrXyCUPz1AbVdQ+W6XKO27Oyqnor4ZO2hlqlosJc+Dl273V+SJBmX5PTNw==
   dependencies:
     "@braintree/sanitize-url" "^3.1.0"
+    crypto-random-string "^3.0.1"
     d3 "^5.7.0"
-    dagre-d3-renderer "^0.5.8"
-    dagre-layout "^0.8.8"
-    documentation "^12.0.1"
-    graphlibrary "^2.2.0"
-    gulp-print "^5.0.2"
+    dagre "^0.8.4"
+    dagre-d3 "^0.6.4"
+    graphlib "^2.1.7"
     he "^1.2.0"
     lodash "^4.17.11"
     minify "^4.1.1"
     moment-mini "^2.22.1"
     scope-css "^1.2.1"
 
-messageformat@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/messageformat/-/messageformat-0.3.1.tgz#e58fff8245e9b3971799e5b43db58b3e9417f5a2"
-  integrity sha1-5Y//gkXps5cXmeW0PbWLPpQX9aI=
+messageformat-formatters@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/messageformat-formatters/-/messageformat-formatters-2.0.1.tgz#0492c1402a48775f751c9b17c0354e92be012b08"
+  integrity sha512-E/lQRXhtHwGuiQjI7qxkLp8AHbMD5r2217XNe/SREbBlSawe0lOqsFb7rflZJmlQFSULNLIqlcjjsCPlB3m3Mg==
+
+messageformat-parser@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/messageformat-parser/-/messageformat-parser-4.1.2.tgz#fd34ec39912a14868a1595eaeb742485ab8ab372"
+  integrity sha512-7dWuifeyldz7vhEuL96Kwq1fhZXBW+TUfbnHN4UCrCxoXQTYjHnR78eI66Gk9LaLLsAvzPNVJBaa66DRfFNaiA==
+
+messageformat@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/messageformat/-/messageformat-2.3.0.tgz#de263c49029d5eae65d7ee25e0754f57f425ad91"
+  integrity sha512-uTzvsv0lTeQxYI2y1NPa1lItL5VRI8Gb93Y2K2ue5gBPyrbJxfDi/EYWxh2PKv5yO42AJeeqblS9MJSh/IEk4w==
   dependencies:
-    async "~1.5.2"
-    glob "~6.0.4"
-    make-plural "~3.0.3"
-    nopt "~3.0.6"
-    watchr "~2.4.13"
+    make-plural "^4.3.0"
+    messageformat-formatters "^2.0.1"
+    messageformat-parser "^4.1.2"
 
 "meta-marked@git+https://github.com/codimd/meta-marked#semver:^0.4.5":
   version "0.4.5"
-  resolved "git+https://github.com/codimd/meta-marked#30852d0efa633418865df179f5956cd3df0fd0b3"
+  resolved "git+https://github.com/codimd/meta-marked#a7b45a287465f79656134ff7142d1d74c8fcacfd"
   dependencies:
     js-yaml "~3.13.1"
-    marked "~0.7.0"
+    marked "~0.8.0"
 
 method-override@^2.3.7:
   version "2.3.10"
@@ -7827,7 +6365,7 @@ micromatch@^2.1.5:
     parse-glob "^3.0.4"
     regex-cache "^0.4.2"
 
-micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.5, micromatch@^3.1.8:
+micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
@@ -7854,34 +6392,29 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-mime-db@1.40.0, "mime-db@>= 1.40.0 < 2":
-  version "1.40.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
-  integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
+mime-db@1.43.0, "mime-db@>= 1.43.0 < 2":
+  version "1.43.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58"
+  integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==
 
 mime-types@^2.1.12, mime-types@^2.1.14, mime-types@^2.1.3, mime-types@~2.1.19, mime-types@~2.1.24:
-  version "2.1.24"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
-  integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
+  version "2.1.26"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06"
+  integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==
   dependencies:
-    mime-db "1.40.0"
+    mime-db "1.43.0"
 
 mime@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
   integrity sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=
 
-mime@1.6.0, mime@^1.2.11, mime@^1.2.9:
+mime@1.6.0, mime@^1.2.9, mime@^1.4.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-mime@^2.0.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.3.tgz#229687331e86f68924e6cb59e1cdd937f18275fe"
-  integrity sha512-QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw==
-
-mime@^2.2.0:
+mime@^2.4.4:
   version "2.4.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5"
   integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==
@@ -7896,12 +6429,13 @@ mimic-fn@^2.0.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-mini-css-extract-plugin@^0.4.1:
-  version "0.4.5"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.5.tgz#c99e9e78d54f3fa775633aee5933aeaa4e80719a"
-  integrity sha512-dqBanNfktnp2hwL2YguV9Jh91PFX7gu7nRLs4TGsbAfAG6WOtlynFRYzwDwmmeSb5uIwHo9nx1ta0f7vAZVp2w==
+mini-css-extract-plugin@^0.8.0:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.2.tgz#a875e169beb27c88af77dd962771c9eedc3da161"
+  integrity sha512-a3Y4of27Wz+mqK3qrcd3VhYz6cU0iW5x3Sgvqzbj+XmlrSizmvu8QQMl5oMYJjgHOC4iyt+w7l4umP+dQeW3bw==
   dependencies:
     loader-utils "^1.1.0"
+    normalize-url "1.9.1"
     schema-utils "^1.0.0"
     webpack-sources "^1.1.0"
 
@@ -7940,7 +6474,7 @@ minimist@0.0.8:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@^1.1.0, minimist@^1.2.0:
+minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
@@ -7970,36 +6504,20 @@ minio@^6.0.0:
     xml "^1.0.0"
     xml2js "^0.4.15"
 
-minipass@^2.2.1, minipass@^2.3.4:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
-  integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
+minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
+  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
   dependencies:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
-minizlib@^1.1.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
-  integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==
+minizlib@^1.2.1:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
+  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
   dependencies:
-    minipass "^2.2.1"
-
-mississippi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
-  integrity sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==
-  dependencies:
-    concat-stream "^1.5.0"
-    duplexify "^3.4.2"
-    end-of-stream "^1.1.0"
-    flush-write-stream "^1.0.0"
-    from2 "^2.1.0"
-    parallel-transform "^1.1.0"
-    pump "^2.0.1"
-    pumpify "^1.3.3"
-    stream-each "^1.1.0"
-    through2 "^2.0.0"
+    minipass "^2.9.0"
 
 mississippi@^3.0.0:
   version "3.0.0"
@@ -8018,14 +6536,14 @@ mississippi@^3.0.0:
     through2 "^2.0.0"
 
 mixin-deep@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
-  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
@@ -8057,35 +6575,15 @@ mock-require@^3.0.3:
     get-caller-file "^1.0.2"
     normalize-path "^2.1.1"
 
-module-deps-sortable@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/module-deps-sortable/-/module-deps-sortable-5.0.0.tgz#99db5bb08f7eab55e4c31f6b7c722c6a2144ba74"
-  integrity sha512-bnGGeghQmz/t/6771/KC4FmxpVm126iR6AAzzq4N6hVZQVl4+ZZBv+VF3PJmDyxXtVtgcgTSSP7NL+jq1QAHrg==
-  dependencies:
-    JSONStream "^1.0.3"
-    browser-resolve "^1.7.0"
-    cached-path-relative "^1.0.0"
-    concat-stream "~1.5.0"
-    defined "^1.0.0"
-    detective "^4.0.0"
-    duplexer2 "^0.1.2"
-    inherits "^2.0.1"
-    readable-stream "^2.0.2"
-    resolve "^1.1.3"
-    stream-combiner2 "^1.1.1"
-    subarg "^1.0.0"
-    through2 "^2.0.0"
-    xtend "^4.0.0"
-
 moment-mini@^2.22.1:
-  version "2.22.1"
-  resolved "https://registry.yarnpkg.com/moment-mini/-/moment-mini-2.22.1.tgz#bc32d73e43a4505070be6b53494b17623183420d"
-  integrity sha512-OUCkHOz7ehtNMYuZjNciXUfwTuz8vmF1MTbAy59ebf+ZBYZO5/tZKuChVWCX+uDo+4idJBpGltNfV8st+HwsGw==
+  version "2.24.0"
+  resolved "https://registry.yarnpkg.com/moment-mini/-/moment-mini-2.24.0.tgz#fa68d98f7fe93ae65bf1262f6abb5fb6983d8d18"
+  integrity sha512-9ARkWHBs+6YJIvrIp0Ik5tyTTtP9PoV0Ssu2Ocq5y9v8+NOOpWiRshAp8c4rZVWTOe+157on/5G+zj5pwIQFEQ==
 
-moment-timezone@^0.5.21:
-  version "0.5.25"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.25.tgz#a11bfa2f74e088327f2cd4c08b3e7bdf55957810"
-  integrity sha512-DgEaTyN/z0HFaVcVbSyVCUU6HeFdnNC3vE4c9cgu2dgMTvjBUBdBzWfasTBmAW45u5OIMeCJtU8yNjM22DHucw==
+moment-timezone@^0.5.21, moment-timezone@^0.5.27:
+  version "0.5.27"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.27.tgz#73adec8139b6fe30452e78f210f27b1f346b8877"
+  integrity sha512-EIKQs7h5sAsjhPCqN6ggx6cEbs94GK050254TIJySD1bzoM5JTYDwAU1IoVOeTOL6Gm27kYJ51/uuvq1kIlrbw==
   dependencies:
     moment ">= 2.9.0"
 
@@ -8122,15 +6620,20 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@2.1.1, ms@^2.1.1:
+ms@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
+ms@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
 mustache@*:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/mustache/-/mustache-3.0.1.tgz#873855f23aa8a95b150fb96d9836edbc5a1d248a"
-  integrity sha512-jFI/4UVRsRYdUbuDTKT7KzfOp7FiD5WzYmmwNwXyUVypC0xjoTL78Fqc0jHUPIvvGD+6DQSPHIt1NE7D1ArsqA==
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.0.0.tgz#7f02465dbb5b435859d154831c032acdfbbefb31"
+  integrity sha512-FJgjyX/IVkbXBXYUwH+OYwQKqWpFPLaLVESd70yHjSDunwzV2hZOoTBvPf4KLoxesUzzyfTH6F784Uqd7Wm5yA==
 
 mute-stream@0.0.7:
   version "0.0.7"
@@ -8146,16 +6649,17 @@ mv@~2:
     ncp "~2.0.0"
     rimraf "~2.4.0"
 
-mysql2@^1.6.5:
-  version "1.6.5"
-  resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-1.6.5.tgz#6695304fa2ce793dda5c98e8bbec65cbd2e6cb9d"
-  integrity sha512-zedaOOyb3msuuZcJJnxIX/EGOpmljDG7B+UevRH5lqcv+yhy9eCwkArBz8/AO+/rlY3/oCsOdG8R5oD6k0hNfg==
+mysql2@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-2.1.0.tgz#55ecfd4353114c148cc4c253192dbbfd000e6642"
+  integrity sha512-9kGVyi930rG2KaHrz3sHwtc6K+GY9d8wWk1XRSYxQiunvGcn4DwuZxOwmK11ftuhhwrYDwGx9Ta4VBwznJn36A==
   dependencies:
-    denque "^1.4.0"
+    cardinal "^2.1.1"
+    denque "^1.4.1"
     generate-function "^2.3.1"
-    iconv-lite "^0.4.24"
+    iconv-lite "^0.5.0"
     long "^4.0.0"
-    lru-cache "^4.1.3"
+    lru-cache "^5.1.1"
     named-placeholders "^1.1.2"
     seq-queue "^0.0.5"
     sqlstring "^2.3.1"
@@ -8167,7 +6671,7 @@ named-placeholders@^1.1.2:
   dependencies:
     lru-cache "^4.1.3"
 
-nan@^2.10.0, nan@^2.12.1:
+nan@^2.12.1, nan@^2.14.0:
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
   integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
@@ -8189,6 +6693,11 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+native-duplexpair@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/native-duplexpair/-/native-duplexpair-1.0.0.tgz#7899078e64bf3c8a3d732601b3d40ff05db58fa0"
+  integrity sha1-eJkHjmS/PIo9cyYBs9QP8F21j6A=
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -8200,9 +6709,9 @@ ncp@~2.0.0:
   integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=
 
 needle@^2.2.1:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c"
-  integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.2.tgz#3342dea100b7160960a450dc8c22160ac712a528"
+  integrity sha512-DUzITvPVDUy6vczKKYTnWc/pBZ0EnjMJnQ3y+Jo5zfKFimJs7S3HFCxCRZYB9FUZcrzUQr3WsmvZgddMEIZv6w==
   dependencies:
     debug "^3.2.6"
     iconv-lite "^0.4.4"
@@ -8213,12 +6722,17 @@ negotiator@0.6.2:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
   integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
-neo-async@^2.5.0, neo-async@^2.6.0:
+neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
   integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
 
-next-tick@1, next-tick@^1.0.0:
+next-tick@1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
+  integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
+
+next-tick@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
   integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
@@ -8250,10 +6764,10 @@ node-gyp-build@~3.7.0:
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-3.7.0.tgz#daa77a4f547b9aed3e2aac779eaf151afd60ec8d"
   integrity sha512-L/Eg02Epx6Si2NXmedx+Okg+4UHqmaf3TNcxd50SF9NQGcJaON3AtU++kax69XV7YWz4tUspqZSAsVofhFKG2w==
 
-node-libs-browser@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.0.tgz#c72f60d9d46de08a940dedbb25f3ffa2f9bbaa77"
-  integrity sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==
+node-libs-browser@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
+  integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==
   dependencies:
     assert "^1.1.1"
     browserify-zlib "^0.2.0"
@@ -8265,7 +6779,7 @@ node-libs-browser@^2.0.0:
     events "^3.0.0"
     https-browserify "^1.0.0"
     os-browserify "^0.3.0"
-    path-browserify "0.0.0"
+    path-browserify "0.0.1"
     process "^0.11.10"
     punycode "^1.2.4"
     querystring-es3 "^0.2.0"
@@ -8277,7 +6791,23 @@ node-libs-browser@^2.0.0:
     tty-browserify "0.0.0"
     url "^0.11.0"
     util "^0.11.0"
-    vm-browserify "0.0.4"
+    vm-browserify "^1.0.1"
+
+node-pre-gyp@*:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
+  integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
+  dependencies:
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.1"
+    needle "^2.2.1"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.2.7"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^4.4.2"
 
 node-pre-gyp@^0.11.0:
   version "0.11.0"
@@ -8295,35 +6825,12 @@ node-pre-gyp@^0.11.0:
     semver "^5.3.0"
     tar "^4"
 
-node-pre-gyp@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
-  integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==
+node-releases@^1.1.49:
+  version "1.1.49"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.49.tgz#67ba5a3fac2319262675ef864ed56798bb33b93e"
+  integrity sha512-xH8t0LS0disN0mtRCh+eByxFPie+msJUBL/lJDBuap53QGiYPa9joh83K4pCZgWJ+2L4b9h88vCVdXQ60NO2bg==
   dependencies:
-    detect-libc "^1.0.2"
-    mkdirp "^0.5.1"
-    needle "^2.2.1"
-    nopt "^4.0.1"
-    npm-packlist "^1.1.6"
-    npmlog "^4.0.2"
-    rc "^1.2.7"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^4"
-
-node-releases@^1.1.21:
-  version "1.1.21"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.21.tgz#46c86f9adaceae4d63c75d3c2f2e6eee618e55f3"
-  integrity sha512-TwnURTCjc8a+ElJUjmDqU6+12jhli1Q61xOQmdZ7ECZVBZuQpN/1UnembiIHDM1wCcfLvh5wrWXUF5H6ufX64Q==
-  dependencies:
-    semver "^5.3.0"
-
-node-releases@^1.1.25:
-  version "1.1.26"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.26.tgz#f30563edc5c7dc20cf524cc8652ffa7be0762937"
-  integrity sha512-fZPsuhhUHMTlfkhDLGtfY80DSJTjOcx+qD1j5pqPkuhUHVS7xHZIg9EE4DHK8O3f0zTxXHX5VIkDG8pu98/wfQ==
-  dependencies:
-    semver "^5.3.0"
+    semver "^6.3.0"
 
 node-static@0.7.11:
   version "0.7.11"
@@ -8350,13 +6857,6 @@ nopt@^4.0.1, nopt@~4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
-nopt@~3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
-  dependencies:
-    abbrev "1"
-
 normalize-package-data@^2.3.2:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -8379,7 +6879,7 @@ normalize-path@^3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
-normalize-url@^1.9.1:
+normalize-url@1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
   integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=
@@ -8394,25 +6894,26 @@ normalize-url@^3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
   integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
 
-now-and-later@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz#8e579c8685764a7cc02cb680380e94f43ccb1f7c"
-  integrity sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==
-  dependencies:
-    once "^1.3.2"
-
 npm-bundled@^1.0.1:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd"
-  integrity sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
+  integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
+  dependencies:
+    npm-normalize-package-bin "^1.0.1"
+
+npm-normalize-package-bin@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
+  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
 
 npm-packlist@^1.1.6:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.1.tgz#19064cdf988da80ea3cee45533879d90192bbfbc"
-  integrity sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
+  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
+    npm-normalize-package-bin "^1.0.1"
 
 npm-run-path@^2.0.0:
   version "2.0.2"
@@ -8449,9 +6950,9 @@ nwmatcher@~1.3.1:
   integrity sha1-i6tIb/f6Pf0IZla76LFxFtNpLSo=
 
 nwsapi@^2.0.7:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.1.4.tgz#e006a878db23636f8e8a67d33ca0e4edf61a842f"
-  integrity sha512-iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
+  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
 
 oauth-sign@~0.9.0:
   version "0.9.0"
@@ -8463,11 +6964,6 @@ oauth@0.9.x:
   resolved "https://registry.yarnpkg.com/oauth/-/oauth-0.9.15.tgz#bd1fefaf686c96b75475aed5196412ff60cfb9c1"
   integrity sha1-vR/vr2hslrdUda7VGWQS/2DPucE=
 
-object-assign@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
-  integrity sha1-ejs9DpgGPUP0wD8uiubNUahog6A=
-
 object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -8487,7 +6983,17 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-keys@^1.0.11, object-keys@^1.0.12:
+object-inspect@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
+  integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
+
+object-is@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.2.tgz#6b80eb84fe451498f65007982f035a5b445edec4"
+  integrity sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ==
+
+object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -8499,7 +7005,7 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.0.4, object.assign@^4.1.0:
+object.assign@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
   integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
@@ -8509,13 +7015,13 @@ object.assign@^4.0.4, object.assign@^4.1.0:
     has-symbols "^1.0.0"
     object-keys "^1.0.11"
 
-object.getownpropertydescriptors@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
-  integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=
+object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649"
+  integrity sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==
   dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.5.1"
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
 
 object.omit@^2.0.0:
   version "2.0.1"
@@ -8533,12 +7039,12 @@ object.pick@^1.3.0:
     isobject "^3.0.1"
 
 object.values@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz#bf6810ef5da3e5325790eaaa2be213ea84624da9"
-  integrity sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
+  integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==
   dependencies:
     define-properties "^1.1.3"
-    es-abstract "^1.12.0"
+    es-abstract "^1.17.0-next.1"
     function-bind "^1.1.1"
     has "^1.0.3"
 
@@ -8554,7 +7060,7 @@ on-headers@~1.0.1, on-headers@~1.0.2:
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
   integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
 
-once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0:
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
@@ -8578,7 +7084,7 @@ openid@2.x.x:
   resolved "https://registry.yarnpkg.com/openid/-/openid-2.0.6.tgz#707375e59ab9f73025899727679b20328171c9aa"
   integrity sha1-cHN15Zq59zAliZcnZ5sgMoFxyao=
   dependencies:
-    request "^2.88.0"
+    request "^2.61.0"
 
 optimist@>=0.3.4, optimist@^0.6.1:
   version "0.6.1"
@@ -8588,44 +7094,42 @@ optimist@>=0.3.4, optimist@^0.6.1:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
 
-optimize-css-assets-webpack-plugin@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.1.tgz#9eb500711d35165b45e7fd60ba2df40cb3eb9159"
-  integrity sha512-Rqm6sSjWtx9FchdP0uzTQDc7GXDKnwVEGoSxjezPkzMewx7gEWE9IMUYKmigTRC4U3RaNSwYVnUDLuIdtTpm0A==
+optimize-css-assets-webpack-plugin@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.3.tgz#e2f1d4d94ad8c0af8967ebd7cf138dcb1ef14572"
+  integrity sha512-q9fbvCRS6EYtUKKSwI87qm2IxlyJK5b4dygW1rKUBT6mMDhdG5e5bZT63v6tnJR9F9FB/H5a0HTmtw+laUBxKA==
   dependencies:
-    cssnano "^4.1.0"
+    cssnano "^4.1.10"
     last-call-webpack-plugin "^3.0.0"
 
 optionator@^0.8.1, optionator@^0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
-  integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
   dependencies:
     deep-is "~0.1.3"
-    fast-levenshtein "~2.0.4"
+    fast-levenshtein "~2.0.6"
     levn "~0.3.0"
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
-    wordwrap "~1.0.0"
-
-ordered-read-streams@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e"
-  integrity sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=
-  dependencies:
-    readable-stream "^2.0.1"
+    word-wrap "~1.2.3"
 
 os-browserify@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
   integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
-os-homedir@^1.0.0, os-homedir@^1.0.1:
+os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
   integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
-os-locale@^3.0.0, os-locale@^3.1.0:
+os-homedir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-2.0.0.tgz#a0c76bb001a8392a503cbd46e7e650b3423a923c"
+  integrity sha512-saRNz0DSC5C/I++gFIaJTXoFJMRwiP5zHar5vV3xQ2TkgEw6hDCcU5F272JjUylpiVgBrZNQHnfjkLabTfb92Q==
+
+os-locale@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
   integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
@@ -8634,7 +7138,7 @@ os-locale@^3.0.0, os-locale@^3.1.0:
     lcid "^2.0.0"
     mem "^4.0.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
@@ -8671,17 +7175,17 @@ p-is-promise@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
   integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
 
-p-limit@^1.0.0, p-limit@^1.1.0:
+p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
   integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
   dependencies:
     p-try "^1.0.0"
 
-p-limit@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2"
-  integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==
+p-limit@^2.0.0, p-limit@^2.2.1:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e"
+  integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==
   dependencies:
     p-try "^2.0.0"
 
@@ -8709,26 +7213,26 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-packet-reader@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-0.3.1.tgz#cd62e60af8d7fea8a705ec4ff990871c46871f27"
-  integrity sha1-zWLmCvjX/qinBexP+ZCHHEaHHyc=
+packet-reader@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-1.0.0.tgz#9238e5480dedabacfe1fe3f2771063f164157d74"
+  integrity sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==
 
 pako@~1.0.5:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
-  integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
+  integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
 
 parallel-transform@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
-  integrity sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc"
+  integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==
   dependencies:
-    cyclist "~0.2.2"
+    cyclist "^1.0.1"
     inherits "^2.0.3"
     readable-stream "^2.1.5"
 
-param-case@2.1.x, param-case@^2.1.1:
+param-case@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
   integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc=
@@ -8743,9 +7247,9 @@ parent-module@^1.0.0:
     callsites "^3.0.0"
 
 parse-asn1@^5.0.0:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.4.tgz#37f6628f823fbdeb2273b4d540434a22f3ef1fcc"
-  integrity sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz#003271343da58dc94cace494faef3d2147ecea0e"
+  integrity sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==
   dependencies:
     asn1.js "^4.0.0"
     browserify-aes "^1.0.0"
@@ -8754,27 +7258,6 @@ parse-asn1@^5.0.0:
     pbkdf2 "^3.0.3"
     safe-buffer "^5.1.1"
 
-parse-entities@^1.0.2, parse-entities@^1.1.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.2.tgz#c31bf0f653b6661354f8973559cb86dd1d5edf50"
-  integrity sha512-NzfpbxW/NPrzZ/yYSoQxyqUZMZXIdCfE0OIN4ESsnptHJECoUk3FZktxNuzQf4tjt5UEopnxpYJbvYuxIFDdsg==
-  dependencies:
-    character-entities "^1.0.0"
-    character-entities-legacy "^1.0.0"
-    character-reference-invalid "^1.0.0"
-    is-alphanumerical "^1.0.0"
-    is-decimal "^1.0.0"
-    is-hexadecimal "^1.0.0"
-
-parse-filepath@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
-  integrity sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=
-  dependencies:
-    is-absolute "^1.0.0"
-    map-cache "^0.2.0"
-    path-root "^0.1.1"
-
 parse-glob@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
@@ -8800,34 +7283,11 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
-parse-node-version@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
-  integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
-
 parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
   integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
 
-parse-path@^3.0.1:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-3.0.4.tgz#a48b7b529da41f34d9d1428602a39b29fc7180e4"
-  integrity sha512-wP70vtwv2DyrM2YoA7ZHVv4zIXa4P7dGgHlj+VwyXNDduLLVJ7NMY1zsFxjUUJ3DAwJLupGb1H5gMDDiNlJaxw==
-  dependencies:
-    is-ssh "^1.3.0"
-    protocols "^1.4.0"
-
-parse-url@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-3.0.2.tgz#602787a7063a795d72b8673197505e72f60610be"
-  integrity sha1-YCeHpwY6eV1yuGcxl1BecvYGEL4=
-  dependencies:
-    is-ssh "^1.3.0"
-    normalize-url "^1.9.1"
-    parse-path "^3.0.1"
-    protocols "^1.4.0"
-
 parse5@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
@@ -8939,15 +7399,15 @@ passport-oauth@^1.0.0:
     passport-oauth2 "1.x.x"
 
 passport-saml@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/passport-saml/-/passport-saml-1.1.0.tgz#0fdd639b905b8f5db172bc07f2e73819a043c321"
-  integrity sha512-T2dKp++HQDg9dyJvb+5dyhIVVdIb5FX6DKMex0RALU16D65fiIbZ01vKZ2qtD+nW5nSOkbkfKJUolr9U689EdQ==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/passport-saml/-/passport-saml-1.3.2.tgz#6cd7e747d7fd0283877d9f48b84c55908ab4182b"
+  integrity sha512-oRtv1lF0AeOVGPD/UJMJnOO7AIc/Wgw7qfMxgejm2bjBo85a26LQfP+XnOD5gW7fxRdYKXDAIOvqPhFeGJmyBw==
   dependencies:
     debug "^3.1.0"
     passport-strategy "*"
     q "^1.5.0"
-    xml-crypto "^1.1.4"
-    xml-encryption "^0.11.0"
+    xml-crypto "^1.4.0"
+    xml-encryption "^1.0.0"
     xml2js "0.4.x"
     xmlbuilder "^11.0.0"
     xmldom "0.1.x"
@@ -8973,17 +7433,17 @@ passport.socketio@^3.7.0:
     xtend "^4.0.0"
 
 passport@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/passport/-/passport-0.4.0.tgz#c5095691347bd5ad3b5e180238c3914d16f05811"
-  integrity sha1-xQlWkTR71a07XhgCOMORTRbwWBE=
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/passport/-/passport-0.4.1.tgz#941446a21cb92fc688d97a0861c38ce9f738f270"
+  integrity sha512-IxXgZZs8d7uFSt3eqNjM9NQ3g3uQCW5avD8mRNoXV99Yig50vjuaez6dQK2qC0kVWPRTujxY0dWgGfT09adjYg==
   dependencies:
     passport-strategy "1.x.x"
     pause "0.0.1"
 
-path-browserify@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
-  integrity sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=
+path-browserify@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
+  integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
 
 path-dirname@^1.0.0:
   version "1.0.2"
@@ -9015,18 +7475,6 @@ path-parse@^1.0.6:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
-path-root-regex@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
-  integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=
-
-path-root@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
-  integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=
-  dependencies:
-    path-root-regex "^0.1.0"
-
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
@@ -9082,10 +7530,10 @@ pg-connection-string@0.1.3:
   resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz#da1847b20940e42ee1492beaf65d49d91b245df7"
   integrity sha1-2hhHsglA5C7hSSvq9l1J2RskXfc=
 
-pg-hstore@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/pg-hstore/-/pg-hstore-2.3.2.tgz#f7ef053e7b9b892ae986af2f7cbe86432dfcf24f"
-  integrity sha1-9+8FPnubiSrphq8vfL6GQy388k8=
+pg-hstore@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/pg-hstore/-/pg-hstore-2.3.3.tgz#d1978c12a85359830b1388d3b0ff233b88928e96"
+  integrity sha512-qpeTpdkguFgfdoidtfeTho1Q1zPVPbtMHgs8eQ+Aan05iLmIs3Z3oo5DOZRclPGoQ4i68I1kCtQSJSa7i0ZVYg==
   dependencies:
     underscore "^1.7.0"
 
@@ -9094,40 +7542,42 @@ pg-int8@1.0.1:
   resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c"
   integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
 
-pg-pool@1.*:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-1.8.0.tgz#f7ec73824c37a03f076f51bfdf70e340147c4f37"
-  integrity sha1-9+xzgkw3oD8Hb1G/33DjQBR8Tzc=
-  dependencies:
-    generic-pool "2.4.3"
-    object-assign "4.1.0"
+pg-packet-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/pg-packet-stream/-/pg-packet-stream-1.1.0.tgz#e45c3ae678b901a2873af1e17b92d787962ef914"
+  integrity sha512-kRBH0tDIW/8lfnnOyTwKD23ygJ/kexQVXZs7gEyBljw4FYqimZFxnMMx50ndZ8In77QgfGuItS5LLclC2TtjYg==
 
-pg-types@1.*:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-1.13.0.tgz#75f490b8a8abf75f1386ef5ec4455ecf6b345c63"
-  integrity sha512-lfKli0Gkl/+za/+b6lzENajczwZHc7D5kiUCZfgm914jipD2kIOIvEkAhZ8GrW3/TUoP9w8FHjwpPObBye5KQQ==
+pg-pool@^2.0.10:
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.10.tgz#842ee23b04e86824ce9d786430f8365082d81c4a"
+  integrity sha512-qdwzY92bHf3nwzIUcj+zJ0Qo5lpG/YxchahxIN8+ZVmXqkahKXsnl2aiJPHLYN9o5mB/leG+Xh6XKxtP7e0sjg==
+
+pg-types@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.2.0.tgz#2d0250d636454f7cfa3b6ae0382fdfa8063254a3"
+  integrity sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==
   dependencies:
     pg-int8 "1.0.1"
-    postgres-array "~1.0.0"
+    postgres-array "~2.0.0"
     postgres-bytea "~1.0.0"
-    postgres-date "~1.0.0"
+    postgres-date "~1.0.4"
     postgres-interval "^1.1.0"
 
-pg@^6.1.2:
-  version "6.4.2"
-  resolved "https://registry.yarnpkg.com/pg/-/pg-6.4.2.tgz#c364011060eac7a507a2ae063eb857ece910e27f"
-  integrity sha1-w2QBEGDqx6UHoq4GPrhX7OkQ4n8=
+pg@^7.12.1:
+  version "7.18.1"
+  resolved "https://registry.yarnpkg.com/pg/-/pg-7.18.1.tgz#67f59c47a99456fcb34f9fe53662b79d4a992f6d"
+  integrity sha512-1KtKBKg/zWrjEEv//klBbVOPGucuc7HHeJf6OEMueVcUeyF3yueHf+DvhVwBjIAe9/97RAydO/lWjkcMwssuEw==
   dependencies:
-    buffer-writer "1.0.1"
-    js-string-escape "1.0.1"
-    packet-reader "0.3.1"
+    buffer-writer "2.0.0"
+    packet-reader "1.0.0"
     pg-connection-string "0.1.3"
-    pg-pool "1.*"
-    pg-types "1.*"
-    pgpass "1.*"
+    pg-packet-stream "^1.1.0"
+    pg-pool "^2.0.10"
+    pg-types "^2.1.0"
+    pgpass "1.x"
     semver "4.3.2"
 
-pgpass@1.*:
+pgpass@1.x:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.2.tgz#2a7bb41b6065b67907e91da1b07c1847c877b306"
   integrity sha1-Knu0G2BltnkH6R2hsHwYR8h3swY=
@@ -9145,7 +7595,7 @@ phantomjs-prebuilt@^2.1.12, phantomjs-prebuilt@^2.1.3:
     hasha "^2.2.0"
     kew "^0.7.0"
     progress "^1.1.8"
-    request "^2.88.0"
+    request "^2.81.0"
     request-progress "^2.0.1"
     which "^1.2.10"
 
@@ -9159,7 +7609,7 @@ pify@^3.0.0:
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
   integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
 
-pify@^4.0.0, pify@^4.0.1:
+pify@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
   integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
@@ -9195,11 +7645,6 @@ pkginfo@^0.2.3:
   resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.2.3.tgz#7239c42a5ef6c30b8f328439d9b9ff71042490f8"
   integrity sha1-cjnEKl72wwuPMoQ52bn/cQQkkPg=
 
-platform@1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.5.tgz#fb6958c696e07e2918d2eeda0f0bc9448d733444"
-  integrity sha512-TuvHS8AOIZNAlE77WUDiR4rySV/VMptyMfcfeoMgs4P8apaZM3JrnbzBiixKUv+XR6i+BXrQh8WAnjaSPFO65Q==
-
 pn@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
@@ -9334,36 +7779,38 @@ postcss-minify-selectors@^4.0.2:
     postcss "^7.0.0"
     postcss-selector-parser "^3.0.0"
 
-postcss-modules-extract-imports@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz#dc87e34148ec7eab5f791f7cd5849833375b741a"
-  integrity sha512-6jt9XZwUhwmRUhb/CkyJY020PYaPJsCyt3UjbaWo6XEbH/94Hmv6MP7fG2C5NDU/BcHzyGYxNtHvM+LTf9HrYw==
+postcss-modules-extract-imports@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e"
+  integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==
   dependencies:
-    postcss "^6.0.1"
+    postcss "^7.0.5"
 
-postcss-modules-local-by-default@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
-  integrity sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=
+postcss-modules-local-by-default@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz#e8a6561be914aaf3c052876377524ca90dbb7915"
+  integrity sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ==
   dependencies:
-    css-selector-tokenizer "^0.7.0"
-    postcss "^6.0.1"
+    icss-utils "^4.1.1"
+    postcss "^7.0.16"
+    postcss-selector-parser "^6.0.2"
+    postcss-value-parser "^4.0.0"
 
-postcss-modules-scope@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
-  integrity sha1-1upkmUx5+XtipytCb75gVqGUu5A=
+postcss-modules-scope@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.1.tgz#33d4fc946602eb5e9355c4165d68a10727689dba"
+  integrity sha512-OXRUPecnHCg8b9xWvldG/jUpRIGPNRka0r4D4j0ESUU2/5IOnpsjfPPmDprM3Ih8CgZ8FXjWqaniK5v4rWt3oQ==
   dependencies:
-    css-selector-tokenizer "^0.7.0"
-    postcss "^6.0.1"
+    postcss "^7.0.6"
+    postcss-selector-parser "^6.0.0"
 
-postcss-modules-values@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
-  integrity sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=
+postcss-modules-values@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz#5b5000d6ebae29b4255301b4a3a54574423e7f10"
+  integrity sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==
   dependencies:
-    icss-replace-symbols "^1.1.0"
-    postcss "^6.0.1"
+    icss-utils "^4.0.0"
+    postcss "^7.0.6"
 
 postcss-normalize-charset@^4.0.1:
   version "4.0.1"
@@ -9476,11 +7923,11 @@ postcss-reduce-transforms@^4.0.2:
     postcss-value-parser "^3.0.0"
 
 postcss-selector-parser@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz#4f875f4afb0c96573d5cf4d74011aee250a7e865"
-  integrity sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz#b310f5c4c0fdaf76f94902bbaa30db6aa84f5270"
+  integrity sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==
   dependencies:
-    dot-prop "^4.1.1"
+    dot-prop "^5.2.0"
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
@@ -9493,6 +7940,15 @@ postcss-selector-parser@^5.0.0-rc.4:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
+postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c"
+  integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==
+  dependencies:
+    cssesc "^3.0.0"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
+
 postcss-svgo@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.2.tgz#17b997bc711b333bab143aaed3b8d3d6e3d38258"
@@ -9512,40 +7968,36 @@ postcss-unique-selectors@^4.0.1:
     postcss "^7.0.0"
     uniqs "^2.0.0"
 
-postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1:
+postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss@^6.0.1, postcss@^6.0.23:
-  version "6.0.23"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
-  integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
-  dependencies:
-    chalk "^2.4.1"
-    source-map "^0.6.1"
-    supports-color "^5.4.0"
+postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz#482282c09a42706d1fc9a069b73f44ec08391dc9"
+  integrity sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==
 
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.5:
-  version "7.0.16"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.16.tgz#48f64f1b4b558cb8b52c88987724359acb010da2"
-  integrity sha512-MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA==
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.23, postcss@^7.0.5, postcss@^7.0.6:
+  version "7.0.26"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.26.tgz#5ed615cfcab35ba9bbb82414a4fa88ea10429587"
+  integrity sha512-IY4oRjpXWYshuTDFxMVkJDtWIk2LhsTlu8bZnbEJA4+bYT16Lvpo8Qv6EvDumhYRgzjZl489pmsY3qVgJQ08nA==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
-postgres-array@~1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-1.0.3.tgz#c561fc3b266b21451fc6555384f4986d78ec80f5"
-  integrity sha512-5wClXrAP0+78mcsNX3/ithQ5exKvCyK5lr5NEEEeGwwM6NJdQgzIJBVxLvRW+huFpX92F2QnZ5CcokH0VhK2qQ==
+postgres-array@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e"
+  integrity sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==
 
 postgres-bytea@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz#027b533c0aa890e26d172d47cf9ccecc521acd35"
   integrity sha1-AntTPAqokOJtFy1Hz5zOzFIazTU=
 
-postgres-date@~1.0.0:
+postgres-date@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.4.tgz#1c2728d62ef1bff49abdd35c1f86d4bdf118a728"
   integrity sha512-bESRvKVuTrjoBluEcpv2346+6kgB7UlnqWZsnbnCccTNq/pqfj1j6oBaN5+b/NrDXepYUT/HKadqv3iS9lJuVA==
@@ -9586,9 +8038,9 @@ pretty-error@^2.1.1:
     utila "~0.4"
 
 prismjs@^1.6.0:
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.16.0.tgz#406eb2c8aacb0f5f0f1167930cb83835d10a4308"
-  integrity sha512-OA4MKxjFZHSvZcisLGe14THYsug/nF6O1f0pAJc0KN0wTyAcLqmsbE+lTGKSpyh+9pEW57+k6pg2AfYR+coyHA==
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.19.0.tgz#713afbd45c3baca4b321569f2df39e17e729d4dc"
+  integrity sha512-IVFtbW9mCWm9eOIaEkNyo2Vl4NnEifis2GQ7/MLRG5TQe6t+4Sj9J5QWI9i3v+SS43uZBlCAOn+zYTVYQcPXJw==
   optionalDependencies:
     clipboard "^2.0.0"
 
@@ -9597,20 +8049,15 @@ private@^0.1.6, private@^0.1.8:
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
   integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
 
-process-nextick-args@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
-  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-
 process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
   integrity sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=
 
 process-nextick-args@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
 process@^0.11.10:
   version "0.11.10"
@@ -9639,23 +8086,11 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
-property-information@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/property-information/-/property-information-4.2.0.tgz#f0e66e07cbd6fed31d96844d958d153ad3eb486e"
-  integrity sha512-TlgDPagHh+eBKOnH2VYvk8qbwsCG/TAJdmTL7f1PROUcSO8qt/KSmShEQ/OKvock8X9tFjtqjCScyOkkkvIKVQ==
-  dependencies:
-    xtend "^4.0.1"
-
 proto-list@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
   integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
 
-protocols@^1.1.0, protocols@^1.4.0:
-  version "1.4.7"
-  resolved "https://registry.yarnpkg.com/protocols/-/protocols-1.4.7.tgz#95f788a4f0e979b291ffefcf5636ad113d037d32"
-  integrity sha512-Fx65lf9/YDn3hUX08XUc0J8rSux36rEsyiv21ZGUC1mOyeM3lTRpZLcrm8aAolzS4itwVfm7TAPyxC2E5zd6xg==
-
 proxy-addr@~2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"
@@ -9675,9 +8110,9 @@ pseudomap@^1.0.2:
   integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
 psl@^1.1.24:
-  version "1.1.32"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.32.tgz#3f132717cf2f9c169724b2b6caf373cf694198db"
-  integrity sha512-MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g==
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c"
+  integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==
 
 public-encrypt@^4.0.0:
   version "4.0.3"
@@ -9691,7 +8126,7 @@ public-encrypt@^4.0.0:
     randombytes "^2.0.1"
     safe-buffer "^5.1.2"
 
-pump@^2.0.0, pump@^2.0.1:
+pump@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
   integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
@@ -9707,7 +8142,7 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-pumpify@^1.3.3, pumpify@^1.3.5:
+pumpify@^1.3.3:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
   integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
@@ -9750,7 +8185,7 @@ qs@2.3.3:
   resolved "https://registry.yarnpkg.com/qs/-/qs-2.3.3.tgz#e9e85adbe75da0bbe4c8e0476a086290f863b404"
   integrity sha1-6eha2+ddoLvkyOBHaghikPhjtAQ=
 
-qs@6.7.0, qs@^6.4.0:
+qs@6.7.0:
   version "6.7.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
   integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
@@ -9817,13 +8252,6 @@ range-parser@~1.2.1:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raphael@2.2.7:
-  version "2.2.7"
-  resolved "https://registry.yarnpkg.com/raphael/-/raphael-2.2.7.tgz#231b19141f8d086986d8faceb66f8b562ee2c810"
-  integrity sha1-IxsZFB+NCGmG2PrOtm+LVi7iyBA=
-  dependencies:
-    eve-raphael "0.5.0"
-
 raphael@2.2.x:
   version "2.2.8"
   resolved "https://registry.yarnpkg.com/raphael/-/raphael-2.2.8.tgz#4b18443c2c6030c3b492d8d11fbbca14ebe4d3f3"
@@ -9831,9 +8259,16 @@ raphael@2.2.x:
   dependencies:
     eve-raphael "0.5.0"
 
+raphael@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/raphael/-/raphael-2.3.0.tgz#eabeb09dba861a1d4cee077eaafb8c53f3131f89"
+  integrity sha512-w2yIenZAQnp257XUWGni4bLMVxpUpcIl7qgxEgDIXtmSypYtlNxfXWpOBxs7LBTps5sDwhRnrToJrMUrivqNTQ==
+  dependencies:
+    eve-raphael "0.5.0"
+
 "raphael@git+https://github.com/dmitrybaranovskiy/raphael":
-  version "2.2.8"
-  resolved "git+https://github.com/dmitrybaranovskiy/raphael#bf3dcd35317f76f915bcd04ed9db36a1b3775c4d"
+  version "2.3.0"
+  resolved "git+https://github.com/dmitrybaranovskiy/raphael#d8fbe4be81d362837f95e33886b80fb41de443b4"
   dependencies:
     eve-raphael "0.5.0"
 
@@ -9847,14 +8282,6 @@ raw-body@2.4.0:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-raw-body@~1.1.0:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz#1d027c2bfa116acc6623bca8f00016572a87d425"
-  integrity sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=
-  dependencies:
-    bytes "1"
-    string_decoder "0.10"
-
 raw-loader@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
@@ -9878,14 +8305,6 @@ read-pkg-up@^2.0.0:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
 
-read-pkg-up@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978"
-  integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==
-  dependencies:
-    find-up "^3.0.0"
-    read-pkg "^3.0.0"
-
 read-pkg@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
@@ -9895,19 +8314,10 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
-read-pkg@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
-  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
-  dependencies:
-    load-json-file "^4.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^3.0.0"
-
 "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
+  version "2.3.7"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -9927,6 +8337,15 @@ readable-stream@1.0.27-1:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
+"readable-stream@2 || 3", readable-stream@^3.0.1, readable-stream@^3.1.1, readable-stream@^3.4.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
 "readable-stream@>=1.0.33-1 <1.1.0-0":
   version "1.0.34"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
@@ -9937,15 +8356,6 @@ readable-stream@1.0.27-1:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@^3.1.1:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
-  integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
 readable-stream@~2.0.0:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
@@ -9958,19 +8368,6 @@ readable-stream@~2.0.0:
     string_decoder "~0.10.x"
     util-deprecate "~1.0.1"
 
-readable-stream@~2.1.0:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0"
-  integrity sha1-ZvqLcg4UOLNkaB8q0aY8YYRIydA=
-  dependencies:
-    buffer-shims "^1.0.0"
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    string_decoder "~0.10.x"
-    util-deprecate "~1.0.1"
-
 readdirp@^2.0.0, readdirp@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
@@ -9981,9 +8378,16 @@ readdirp@^2.0.0, readdirp@^2.2.1:
     readable-stream "^2.0.2"
 
 readline-sync@^1.4.7:
-  version "1.4.9"
-  resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.9.tgz#3eda8e65f23cd2a17e61301b1f0003396af5ecda"
-  integrity sha1-PtqOZfI80qF+YTAbHwADOWr17No=
+  version "1.4.10"
+  resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.10.tgz#41df7fbb4b6312d673011594145705bf56d8873b"
+  integrity sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw==
+
+redeyed@~2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-2.1.1.tgz#8984b5815d99cb220469c99eeeffe38913e6cc0b"
+  integrity sha1-iYS1gV2ZyyIEacme7v/jiRPmzAs=
+  dependencies:
+    esprima "~4.0.0"
 
 reduce-component@1.0.1:
   version "1.0.1"
@@ -9995,7 +8399,7 @@ referrer-policy@1.2.0:
   resolved "https://registry.yarnpkg.com/referrer-policy/-/referrer-policy-1.2.0.tgz#b99cfb8b57090dc454895ef897a4cc35ef67a98e"
   integrity sha512-LgQJIuS6nAy1Jd88DCQRemyE3mS+ispwlqMk3b0yjZ257fI1v9c+/p6SD5gP5FGyXUIgrNOAfmyioHwZtYv2VA==
 
-regenerate-unicode-properties@^8.0.2:
+regenerate-unicode-properties@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"
   integrity sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==
@@ -10026,13 +8430,6 @@ regenerator-transform@^0.10.0:
     babel-types "^6.19.0"
     private "^0.1.6"
 
-regenerator-transform@^0.14.0:
-  version "0.14.1"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz#3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb"
-  integrity sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==
-  dependencies:
-    private "^0.1.6"
-
 regex-cache@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
@@ -10048,25 +8445,19 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexp-tree@^0.1.6:
-  version "0.1.11"
-  resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.11.tgz#c9c7f00fcf722e0a56c7390983a7a63dd6c272f3"
-  integrity sha512-7/l/DgapVVDzZobwMCCgMlqiqyLFJ0cduo/j+3BcDJIB+yJdsYCfKuI3l/04NV+H/rfNRdPIDbXNZHM9XvQatg==
+regexp.prototype.flags@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"
+  integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
 
 regexpp@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
   integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
 
-regexpu-core@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
-  integrity sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=
-  dependencies:
-    regenerate "^1.2.1"
-    regjsgen "^0.2.0"
-    regjsparser "^0.1.4"
-
 regexpu-core@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
@@ -10077,12 +8468,12 @@ regexpu-core@^2.0.0:
     regjsparser "^0.1.4"
 
 regexpu-core@^4.5.4:
-  version "4.5.4"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.5.4.tgz#080d9d02289aa87fe1667a4f5136bc98a6aebaae"
-  integrity sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6"
+  integrity sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==
   dependencies:
     regenerate "^1.4.0"
-    regenerate-unicode-properties "^8.0.2"
+    regenerate-unicode-properties "^8.1.0"
     regjsgen "^0.5.0"
     regjsparser "^0.6.0"
     unicode-match-property-ecmascript "^1.0.4"
@@ -10094,9 +8485,9 @@ regjsgen@^0.2.0:
   integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
 
 regjsgen@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz#a7634dc08f89209c2049adda3525711fb97265dd"
-  integrity sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA==
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c"
+  integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
 
 regjsparser@^0.1.4:
   version "0.1.5"
@@ -10106,125 +8497,24 @@ regjsparser@^0.1.4:
     jsesc "~0.5.0"
 
 regjsparser@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz#f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c"
-  integrity sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.3.tgz#74192c5805d35e9f5ebe3c1fb5b40d40a8a38460"
+  integrity sha512-8uZvYbnfAtEm9Ab8NTb3hdLwL4g/LQzEYP7Xs27T96abJCCE2d6r3cPZPQEsLKy0vRSGVNG+/zVGtLr86HQduA==
   dependencies:
     jsesc "~0.5.0"
 
-relateurl@0.2.x, relateurl@^0.2.7:
+relateurl@^0.2.7:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
   integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
 
-remark-html@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/remark-html/-/remark-html-8.0.0.tgz#9fcb859a6f3cb40f3ef15402950f1a62ec301b3a"
-  integrity sha512-3V2391GL3hxKhrkzYOyfPpxJ6taIKLCfuLVqumeWQOk3H9nTtSQ8St8kMYkBVIEAquXN1chT83qJ/2lAW+dpEg==
+remarkable@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-2.0.0.tgz#795f965bede8300362ce51a716edc322d9e7a4ca"
+  integrity sha512-3gvKFAgL4xmmVRKAMNm6UzDo/rO2gPVkZrWagp6AXEA4JvCcMcRx9aapYbb7AJAmLLvi/u06+EhzqoS7ha9qOg==
   dependencies:
-    hast-util-sanitize "^1.0.0"
-    hast-util-to-html "^4.0.0"
-    mdast-util-to-hast "^3.0.0"
-    xtend "^4.0.1"
-
-remark-parse@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-5.0.0.tgz#4c077f9e499044d1d5c13f80d7a98cf7b9285d95"
-  integrity sha512-b3iXszZLH1TLoyUzrATcTQUZrwNl1rE70rVdSruJFlDaJ9z5aMkhrG43Pp68OgfHndL/ADz6V69Zow8cTQu+JA==
-  dependencies:
-    collapse-white-space "^1.0.2"
-    is-alphabetical "^1.0.0"
-    is-decimal "^1.0.0"
-    is-whitespace-character "^1.0.0"
-    is-word-character "^1.0.0"
-    markdown-escapes "^1.0.0"
-    parse-entities "^1.1.0"
-    repeat-string "^1.5.4"
-    state-toggle "^1.0.0"
-    trim "0.0.1"
-    trim-trailing-lines "^1.0.0"
-    unherit "^1.0.4"
-    unist-util-remove-position "^1.0.0"
-    vfile-location "^2.0.0"
-    xtend "^4.0.1"
-
-remark-reference-links@^4.0.1:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/remark-reference-links/-/remark-reference-links-4.0.4.tgz#190579a0d6b002859d6cdbdc5aeb8bbdae4e06ab"
-  integrity sha512-+2X8hwSQqxG4tvjYZNrTcEC+bXp8shQvwRGG6J/rnFTvBoU4G0BBviZoqKGZizLh/DG+0gSYhiDDWCqyxXW1iQ==
-  dependencies:
-    unist-util-visit "^1.0.0"
-
-remark-slug@^5.0.0:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/remark-slug/-/remark-slug-5.1.2.tgz#715ecdef8df1226786204b1887d31ab16aa24609"
-  integrity sha512-DWX+Kd9iKycqyD+/B+gEFO3jjnt7Yg1O05lygYSNTe5i5PIxxxPjp5qPBDxPIzp5wreF7+1ROCwRgjEcqmzr3A==
-  dependencies:
-    github-slugger "^1.0.0"
-    mdast-util-to-string "^1.0.0"
-    unist-util-visit "^1.0.0"
-
-remark-stringify@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-5.0.0.tgz#336d3a4d4a6a3390d933eeba62e8de4bd280afba"
-  integrity sha512-Ws5MdA69ftqQ/yhRF9XhVV29mhxbfGhbz0Rx5bQH+oJcNhhSM6nCu1EpLod+DjrFGrU0BMPs+czVmJZU7xiS7w==
-  dependencies:
-    ccount "^1.0.0"
-    is-alphanumeric "^1.0.0"
-    is-decimal "^1.0.0"
-    is-whitespace-character "^1.0.0"
-    longest-streak "^2.0.1"
-    markdown-escapes "^1.0.0"
-    markdown-table "^1.1.0"
-    mdast-util-compact "^1.0.0"
-    parse-entities "^1.0.2"
-    repeat-string "^1.5.4"
-    state-toggle "^1.0.0"
-    stringify-entities "^1.0.1"
-    unherit "^1.0.4"
-    xtend "^4.0.1"
-
-remark-toc@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/remark-toc/-/remark-toc-5.1.1.tgz#8c229d6f834cdb43fde6685e2d43248d3fc82d78"
-  integrity sha512-vCPW4YOsm2CfyuScdktM9KDnJXVHJsd/ZeRtst+dnBU3B3KKvt8bc+bs5syJjyptAHfqo7H+5Uhz+2blWBfwow==
-  dependencies:
-    mdast-util-toc "^3.0.0"
-    remark-slug "^5.0.0"
-
-remark@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/remark/-/remark-9.0.0.tgz#c5cfa8ec535c73a67c4b0f12bfdbd3a67d8b2f60"
-  integrity sha512-amw8rGdD5lHbMEakiEsllmkdBP+/KpjW/PRK6NSGPZKCQowh0BT4IWXDAkRMyG3SB9dKPXWMviFjNusXzXNn3A==
-  dependencies:
-    remark-parse "^5.0.0"
-    remark-stringify "^5.0.0"
-    unified "^6.0.0"
-
-remarkable@^1.7.1:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.1.tgz#aaca4972100b66a642a63a1021ca4bac1be3bff6"
-  integrity sha1-qspJchALZqZCpjoQIcpLrBvjv/Y=
-  dependencies:
-    argparse "~0.1.15"
-    autolinker "~0.15.0"
-
-remove-bom-buffer@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz#c2bf1e377520d324f623892e33c10cac2c252b53"
-  integrity sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==
-  dependencies:
-    is-buffer "^1.1.5"
-    is-utf8 "^0.2.1"
-
-remove-bom-stream@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz#05f1a593f16e42e1fb90ebf59de8e569525f9523"
-  integrity sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=
-  dependencies:
-    remove-bom-buffer "^3.0.0"
-    safe-buffer "^5.1.0"
-    through2 "^2.0.3"
+    argparse "^1.0.10"
+    autolinker "^3.11.0"
 
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
@@ -10247,7 +8537,7 @@ repeat-element@^1.1.2:
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
   integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
-repeat-string@^1.5.0, repeat-string@^1.5.2, repeat-string@^1.5.4, repeat-string@^1.6.1:
+repeat-string@^1.5.2, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
@@ -10259,11 +8549,6 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
-replace-ext@1.0.0, replace-ext@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
-  integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=
-
 request-progress@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-2.0.1.tgz#5d36bb57961c673aa5b788dbc8141fdf23b44e08"
@@ -10271,26 +8556,26 @@ request-progress@^2.0.1:
   dependencies:
     throttleit "^1.0.0"
 
-request-promise-core@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.2.tgz#339f6aababcafdb31c799ff158700336301d3346"
-  integrity sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==
+request-promise-core@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9"
+  integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==
   dependencies:
-    lodash "^4.17.11"
+    lodash "^4.17.15"
 
 request-promise-native@^1.0.5:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.7.tgz#a49868a624bdea5069f1251d0a836e0d89aa2c59"
-  integrity sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36"
+  integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==
   dependencies:
-    request-promise-core "1.1.2"
+    request-promise-core "1.1.3"
     stealthy-require "^1.1.1"
     tough-cookie "^2.3.3"
 
-request@^2.88.0:
-  version "2.88.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
-  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
+request@2.x, "request@>= 2.52.0", request@^2.61.0, request@^2.81.0, request@^2.83.0, request@^2.86.0, request@^2.87.0, request@^2.88.0:
+  version "2.88.2"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -10299,7 +8584,7 @@ request@^2.88.0:
     extend "~3.0.2"
     forever-agent "~0.6.1"
     form-data "~2.3.2"
-    har-validator "~5.1.0"
+    har-validator "~5.1.3"
     http-signature "~1.2.0"
     is-typedarray "~1.0.0"
     isstream "~0.1.2"
@@ -10309,7 +8594,7 @@ request@^2.88.0:
     performance-now "^2.1.0"
     qs "~6.5.2"
     safe-buffer "^5.1.2"
-    tough-cookie "~2.4.3"
+    tough-cookie "^2.4.3"
     tunnel-agent "^0.6.0"
     uuid "^3.3.2"
 
@@ -10318,11 +8603,6 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
-require-main-filename@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
-  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
-
 require-main-filename@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
@@ -10358,34 +8638,15 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
-resolve-options@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz#32bb9e39c06d67338dc9378c0d6d6074566ad131"
-  integrity sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=
-  dependencies:
-    value-or-function "^3.0.0"
-
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
-  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
-
-resolve@^1.1.3, resolve@^1.3.2:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6"
-  integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==
-  dependencies:
-    path-parse "^1.0.6"
-
-resolve@^1.10.0, resolve@^1.11.0, resolve@^1.5.0, resolve@^1.8.1:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.0.tgz#4014870ba296176b86343d50b60f3b50609ce232"
-  integrity sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw==
+resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.5.0, resolve@^1.8.1:
+  version "1.15.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
+  integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==
   dependencies:
     path-parse "^1.0.6"
 
@@ -10402,17 +8663,17 @@ ret@~0.1.10:
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
-retry-as-promised@^3.1.0:
+retry-as-promised@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/retry-as-promised/-/retry-as-promised-3.2.0.tgz#769f63d536bec4783549db0777cb56dadd9d8543"
   integrity sha512-CybGs60B7oYU/qSQ6kuaFmRd9sTZ6oXSc0toqePvV74Ac6/IFZSI1ReFQmtCN+uvW1Mtqdwpvt/LGOiCBAY2Mg==
   dependencies:
     any-promise "^1.3.0"
 
-reveal.js@~3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/reveal.js/-/reveal.js-3.7.0.tgz#7afaf72fd963000381289d58f3aa54c0c46b150c"
-  integrity sha512-HTOTNhF5mQAw6fcsptk4oql/DEEUwTG0YHk/LzTNNx0/3IgvOQZqKzvlK/zNpqqKMLlhn1gH9Nvp+FFoc/e5/w==
+reveal.js@~3.9.2:
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/reveal.js/-/reveal.js-3.9.2.tgz#7f63d3dfec338b6c313dcabdf006e8cf80e0b358"
+  integrity sha512-Dvv2oA9FrtOHE2DWj5js8pMRfwq++Wmvsn1EyAdYLC80lBjTphns+tPsB652Bnvep9AVviuVS/b4XoVY9rXHLA==
 
 rgb-regex@^1.0.1:
   version "1.0.1"
@@ -10431,13 +8692,20 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2.6.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
+rimraf@2.6.3:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
   integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
   dependencies:
     glob "^7.1.3"
 
+rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+  dependencies:
+    glob "^7.1.3"
+
 rimraf@~2.4.0:
   version "2.4.5"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.5.tgz#ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"
@@ -10454,20 +8722,19 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     inherits "^2.0.1"
 
 rollup-plugin-buble@^0.19.2:
-  version "0.19.6"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-buble/-/rollup-plugin-buble-0.19.6.tgz#55ee0995d8870d536f01f4277c3eef4276e8747e"
-  integrity sha512-El5Fut4/wEO17ZN/n9BZvqd7DXXB2WbJr/DKvr89LXChC/cHllE0XwiUDeAalrTkgr0WrnyLDTCQvEv+cGywWQ==
+  version "0.19.8"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-buble/-/rollup-plugin-buble-0.19.8.tgz#f9232e2bb62a7573d04f9705c1bd6f02c2a02c6a"
+  integrity sha512-8J4zPk2DQdk3rxeZvxgzhHh/rm5nJkjwgcsUYisCQg1QbT5yagW+hehYEW7ZNns/NVbDCTv4JQ7h4fC8qKGOKw==
   dependencies:
-    buble "^0.19.6"
+    buble "^0.19.8"
     rollup-pluginutils "^2.3.3"
 
 rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.3.3:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.7.1.tgz#a7915ce8b12c177364784bf38a1590cc6c2c8250"
-  integrity sha512-3nRf3buQGR9qz/IsSzhZAJyoK663kzseps8itkYHr+Z7ESuaffEPfgRinxbCRA0pf0gzLqkNKkSb8aNVTq75NA==
+  version "2.8.2"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
+  integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
   dependencies:
-    estree-walker "^0.6.0"
-    micromatch "^3.1.10"
+    estree-walker "^0.6.1"
 
 rollup-watch@^4.3.1:
   version "4.3.1"
@@ -10506,26 +8773,21 @@ rw@1:
   integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=
 
 rxjs@^6.4.0:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
-  integrity sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c"
+  integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-safe-buffer@>=5.1.0:
+safe-buffer@*, safe-buffer@5.2.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
   integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
 
-safe-json-parse@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"
-  integrity sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=
+safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
 safe-json-stringify@~1:
   version "1.2.0"
@@ -10539,13 +8801,6 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-safefs@^3.1.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/safefs/-/safefs-3.2.2.tgz#8170c1444d7038e08caea05a374fae2fa349e15c"
-  integrity sha1-gXDBRE1wOOCMrqBaN0+uL6NJ4Vw=
-  dependencies:
-    graceful-fs "*"
-
 "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
@@ -10566,23 +8821,6 @@ sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-scandirectory@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/scandirectory/-/scandirectory-2.5.0.tgz#6ce03f54a090b668e3cbedbf20edf9e310593e72"
-  integrity sha1-bOA/VKCQtmjjy+2/IO354xBZPnI=
-  dependencies:
-    ignorefs "^1.0.0"
-    safefs "^3.1.2"
-    taskgroup "^4.0.5"
-
-schema-utils@^0.4.5:
-  version "0.4.7"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
-  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
-  dependencies:
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
-
 schema-utils@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
@@ -10592,6 +8830,14 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
+schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.4:
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz#a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53"
+  integrity sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==
+  dependencies:
+    ajv "^6.10.2"
+    ajv-keywords "^3.4.1"
+
 scope-css@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/scope-css/-/scope-css-1.2.1.tgz#c35768bc900cad030a3e0d663a818c0f6a57f40e"
@@ -10628,20 +8874,20 @@ select@^1.1.2:
   resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
   integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
-  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
 semver@4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.2.tgz#c7a07158a80bedd052355b770d82d6640f803be7"
   integrity sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c=
 
-semver@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"
-  integrity sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==
+semver@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
 send@0.17.1:
   version "0.17.1"
@@ -10667,10 +8913,10 @@ seq-queue@^0.0.5:
   resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e"
   integrity sha1-1WgS4cAXpuTnw+Ojeh2m143TyT4=
 
-sequelize-cli@^5.4.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/sequelize-cli/-/sequelize-cli-5.5.0.tgz#b0570352f70eaa489a25dccf55cf316675d6ff06"
-  integrity sha512-twVQ02alCpr2XvxNmpi32C48WZs6xHTH1OFTfTS5Meg3BVqOM8ghiZoml4FITFjlD8sAJSQjlAHTwqTbuolA6Q==
+sequelize-cli@^5.5.1:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/sequelize-cli/-/sequelize-cli-5.5.1.tgz#0b9c2fc04d082cc8ae0a8fe270b96bb606152bab"
+  integrity sha512-ZM4kUZvY3y14y+Rq3cYxGH7YDJz11jWHcN2p2x7rhAIemouu4CEXr5ebw30lzTBtyXV4j2kTO+nUjZOqzG7k+Q==
   dependencies:
     bluebird "^3.5.3"
     cli-color "^1.4.0"
@@ -10681,36 +8927,36 @@ sequelize-cli@^5.4.0:
     umzug "^2.1.0"
     yargs "^13.1.0"
 
-sequelize-pool@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/sequelize-pool/-/sequelize-pool-2.2.0.tgz#fd4eb05ccefb5df5c23d2cc6fd934c20fd9c5dab"
-  integrity sha512-N/cYyxNHShfANGXAhHtMExjWNr+eYCS4/pF5fs5fvPYxn1VgUhEX8kDmVV5bNS0gZwt55fjU9Sgg48k3Dy/uMg==
+sequelize-pool@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/sequelize-pool/-/sequelize-pool-2.3.0.tgz#64f1fe8744228172c474f530604b6133be64993d"
+  integrity sha512-Ibz08vnXvkZ8LJTiUOxRcj1Ckdn7qafNZ2t59jYHMX1VIebTAOYefWdRYFt6z6+hy52WGthAHAoLc9hvk3onqA==
 
-sequelize@^5.8.12:
-  version "5.8.12"
-  resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-5.8.12.tgz#91f46f16789307d40c68f8c039c10d1d0f230ad2"
-  integrity sha512-TtgGgQx/+Nub/IdkV7hqEoozUnOYv28waB/l44fMk37Rr+4G3Inrn9opDb/g81zSuRUKsYGOucdWq0qLH+7ujA==
+sequelize@^5.21.1:
+  version "5.21.4"
+  resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-5.21.4.tgz#a49597dbd7862e4e1fb8ec819de04705d06d9d17"
+  integrity sha512-Ap1pZpvKb0o3H1HuBygMi9LfCJnwYLkXNBoISqkMJ17X6MbXuOB0Pz+XazawodU1uaMl9osCSrP+Uklkc6pgQg==
   dependencies:
     bluebird "^3.5.0"
     cls-bluebird "^2.1.0"
     debug "^4.1.1"
     dottie "^2.0.0"
     inflection "1.12.0"
-    lodash "^4.17.11"
+    lodash "^4.17.15"
     moment "^2.24.0"
     moment-timezone "^0.5.21"
-    retry-as-promised "^3.1.0"
-    semver "^6.1.1"
-    sequelize-pool "^2.2.0"
+    retry-as-promised "^3.2.0"
+    semver "^6.3.0"
+    sequelize-pool "^2.3.0"
     toposort-class "^1.0.1"
-    uuid "^3.2.1"
+    uuid "^3.3.3"
     validator "^10.11.0"
-    wkx "^0.4.6"
+    wkx "^0.4.8"
 
-serialize-javascript@^1.4.0, serialize-javascript@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.7.0.tgz#d6e0dfb2a3832a8c94468e6eb1db97e55a192a65"
-  integrity sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==
+serialize-javascript@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
+  integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
 
 series-stream@^1.0.1:
   version "1.0.1"
@@ -10732,20 +8978,10 @@ set-blocking@^2.0.0, set-blocking@~2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
-set-value@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
-  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.1"
-    to-object-path "^0.3.0"
-
-set-value@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
-  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
+set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -10824,9 +9060,9 @@ slice-ansi@^2.1.0:
     is-fullwidth-code-point "^2.0.0"
 
 slugify@^1.3.1:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.3.4.tgz#78d2792d7222b55cd9fc81fa018df99af779efeb"
-  integrity sha512-KP0ZYk5hJNBS8/eIjGkFDCzGQIoZ1mnfQRYS5WM3273z+fxGWXeN0fkwf2ebEweydv9tioZIHGZKoF21U07/nw==
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.3.6.tgz#ba5fd6159b570fe4811d02ea9b1f4906677638c3"
+  integrity sha512-wA9XS475ZmGNlEnYYLPReSfuz/c3VQsEMoU43mi6OnKMCdbnFXd4/Yg7J0lBv8jkPolacMpOrWEaoYxuE1+hoQ==
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
@@ -10866,9 +9102,9 @@ snapsvg@0.4.x:
     eve "~0.4.2"
 
 socket.io-adapter@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b"
-  integrity sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
+  integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==
 
 socket.io-client@2.1.1, socket.io-client@~2.1.1:
   version "2.1.1"
@@ -10924,11 +9160,11 @@ source-list-map@^2.0.0:
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
 source-map-resolve@^0.5.0:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
-  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
   dependencies:
-    atob "^2.1.1"
+    atob "^2.1.2"
     decode-uri-component "^0.2.0"
     resolve-url "^0.2.1"
     source-map-url "^0.4.0"
@@ -10941,10 +9177,10 @@ source-map-support@^0.4.12, source-map-support@^0.4.15:
   dependencies:
     source-map "^0.5.6"
 
-source-map-support@~0.5.10:
-  version "0.5.12"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
-  integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
+source-map-support@~0.5.12:
+  version "0.5.16"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
+  integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -10954,12 +9190,7 @@ source-map-url@^0.4.0:
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
   integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
-source-map@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.0.tgz#0fe96503ac86a5adb5de63f4e412ae4872cdbe86"
-  integrity sha1-D+llA6yGpa213mP05BKuSHLNvoY=
-
-source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
+source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
@@ -10970,14 +9201,9 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
 sourcemap-codec@^1.4.4:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz#c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f"
-  integrity sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg==
-
-space-separated-tokens@^1.0.0:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.4.tgz#27910835ae00d0adfcdbd0ad7e611fb9544351fa"
-  integrity sha512-UyhMSmeIqZrQn2UdjYpxEkwY9JUrn8pP+7L4f91zRzOQuI8MF1FGLfYU9DKCYeLdo7LXMxwrX5zKFy7eeeVHuA==
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
+  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
 
 spdx-correct@^3.0.0:
   version "3.1.0"
@@ -11001,9 +9227,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz#75ecd1a88de8c184ef015eafb51b5b48bfd11bb1"
-  integrity sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
+  integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==
 
 spin.js@^2.3.2:
   version "2.3.2"
@@ -11024,7 +9250,7 @@ split@^1.0.0:
   dependencies:
     through "2"
 
-sprintf-js@>=1.0.3:
+sprintf-js@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
   integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
@@ -11034,19 +9260,14 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
-sprintf@0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/sprintf/-/sprintf-0.1.5.tgz#8f83e39a9317c1a502cb7db8050e51c679f6edcf"
-  integrity sha1-j4PjmpMXwaUCy324BQ5Rxnn27c8=
-
-sqlite3@^4.0.7:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.0.8.tgz#81ee60d54befaa52f5421fe6337050bd43d4bb95"
-  integrity sha512-kgwHu4j10KhpCHtx//dejd/tVQot7jc3sw+Sn0vMuKOw0X00Ckyg9VceKgzPyGmmz+zEoYue9tOLriWTvYy0ww==
+sqlite3@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.1.1.tgz#539a42e476640796578e22d589b3283c28055242"
+  integrity sha512-CvT5XY+MWnn0HkbwVKJAyWEMfzpAPwnTiB3TobA5Mri44SrTovmmh499NPQP+gatkeOipqPlBLel7rn4E/PCQg==
   dependencies:
     nan "^2.12.1"
     node-pre-gyp "^0.11.0"
-    request "^2.88.0"
+    request "^2.87.0"
 
 sqlstring@^2.3.1:
   version "2.3.1"
@@ -11068,13 +9289,6 @@ sshpk@^1.7.0:
     safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
-ssri@^5.2.4:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
-  integrity sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==
-  dependencies:
-    safe-buffer "^5.1.1"
-
 ssri@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
@@ -11092,11 +9306,6 @@ stack-trace@0.0.x:
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
   integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
 
-state-toggle@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.2.tgz#75e93a61944116b4959d665c8db2d243631d6ddc"
-  integrity sha512-8LpelPGR0qQM4PnfLiplOQNJcIN1/r2Gy0xKB2zKnIW2YzPMt2sR4I/+gtPjhN7Svh9kw+zqEg2SFwpBO9iNiw==
-
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
@@ -11120,13 +9329,6 @@ store@^2.0.12:
   resolved "https://registry.yarnpkg.com/store/-/store-2.0.12.tgz#8c534e2a0b831f72b75fc5f1119857c44ef5d593"
   integrity sha1-jFNOKguDH3K3X8XxEZhXxE711ZM=
 
-stream-array@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/stream-array/-/stream-array-1.1.2.tgz#9e5f7345f2137c30ee3b498b9114e80b52bb7eb5"
-  integrity sha1-nl9zRfITfDDuO0mLkRToC1K7frU=
-  dependencies:
-    readable-stream "~2.1.0"
-
 stream-browserify@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
@@ -11135,14 +9337,6 @@ stream-browserify@^2.0.1:
     inherits "~2.0.1"
     readable-stream "^2.0.2"
 
-stream-combiner2@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz#fb4d8a1420ea362764e21ad4780397bebcb41cbe"
-  integrity sha1-+02KFCDqNidk4hrUeAOXvry0HL4=
-  dependencies:
-    duplexer2 "~0.1.0"
-    readable-stream "^2.0.2"
-
 stream-each@^1.1.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
@@ -11173,9 +9367,9 @@ stream-http@^2.7.2:
     xtend "^4.0.0"
 
 stream-shift@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
-  integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
+  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
 
 strict-uri-encode@^1.0.0:
   version "1.1.0"
@@ -11192,11 +9386,6 @@ string-natural-compare@^2.0.2:
   resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-2.0.3.tgz#9dbe1dd65490a5fe14f7a5c9bc686fc67cb9c6e4"
   integrity sha512-4Kcl12rNjc+6EKhY8QyDVuQTAlMWwRiNbsxnVwBUKFr7dYPQuXVrtNU4sEkjF9LHY0AY6uVbB3ktbkIH4LC+BQ==
 
-string-template@~0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
-  integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=
-
 string-width@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -11206,7 +9395,7 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
+"string-width@^1.0.2 || 2", string-width@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -11223,32 +9412,39 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
-string-width@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.1.0.tgz#ba846d1daa97c3c596155308063e075ed1c99aff"
-  integrity sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==
+string.prototype.trimleft@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74"
+  integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==
   dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^5.2.0"
+    define-properties "^1.1.3"
+    function-bind "^1.1.1"
+
+string.prototype.trimright@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9"
+  integrity sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==
+  dependencies:
+    define-properties "^1.1.3"
+    function-bind "^1.1.1"
 
 string@^3.3.3:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/string/-/string-3.3.3.tgz#5ea211cd92d228e184294990a6cc97b366a77cb0"
   integrity sha1-XqIRzZLSKOGEKUmQpsyXs2anfLA=
 
-string_decoder@0.10, string_decoder@~0.10.x:
+string_decoder@^1.0.0, string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
+string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
   integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
 
-string_decoder@^1.0.0, string_decoder@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
-  integrity sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==
-  dependencies:
-    safe-buffer "~5.1.0"
-
 string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
@@ -11256,16 +9452,6 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-stringify-entities@^1.0.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-1.3.2.tgz#a98417e5471fd227b3e45d3db1861c11caf668f7"
-  integrity sha512-nrBAQClJAPN2p+uGCVJRPIPakKeKWZ9GtBCmormE7pWOSlHat7+x5A8gx85M7HM5Dt0BP3pP5RhVW77WdbJJ3A==
-  dependencies:
-    character-entities-html4 "^1.0.0"
-    character-entities-legacy "^1.0.0"
-    is-alphanumerical "^1.0.0"
-    is-hexadecimal "^1.0.0"
-
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -11314,13 +9500,13 @@ strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
-style-loader@^0.21.0:
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.21.0.tgz#68c52e5eb2afc9ca92b6274be277ee59aea3a852"
-  integrity sha512-T+UNsAcl3Yg+BsPKs1vd22Fr8sVT+CJMtzqc6LEw9bbJZb43lm9GoeIfUcDEefBSWC0BhYbcdupV1GtI4DGzxg==
+style-loader@^1.0.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.1.3.tgz#9e826e69c683c4d9bf9db924f85e9abb30d5e200"
+  integrity sha512-rlkH7X/22yuwFYK357fMN/BxYOorfnfq0eD7+vqlemSK4wEcejFF1dg4zxP0euBW8NrYx2WZzZ8PPFevr7D+Kw==
   dependencies:
-    loader-utils "^1.1.0"
-    schema-utils "^0.4.5"
+    loader-utils "^1.2.3"
+    schema-utils "^2.6.4"
 
 stylehacks@^4.0.0:
   version "4.0.3"
@@ -11331,13 +9517,6 @@ stylehacks@^4.0.0:
     postcss "^7.0.0"
     postcss-selector-parser "^3.0.0"
 
-subarg@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2"
-  integrity sha1-9izxdYHplrSPyWVpn1TAauJouNI=
-  dependencies:
-    minimist "^1.1.0"
-
 superagent@1.8.3:
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/superagent/-/superagent-1.8.3.tgz#2b7d70fcc870eda4f2a61e619dd54009b86547c3"
@@ -11362,37 +9541,36 @@ supports-color@5.4.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
-
-supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^6.0.0, supports-color@^6.1.0:
+supports-color@6.1.0, supports-color@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
   integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
   dependencies:
     has-flag "^3.0.0"
 
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
+
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
 svgo@^1.0.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.2.2.tgz#0253d34eccf2aed4ad4f283e11ee75198f9d7316"
-  integrity sha512-rAfulcwp2D9jjdGu+0CuqlrAUin6bBWrpoqXWwKDZZZJfXcUXQSxLJOFJCQCSA0x0pP2U0TxSlJu2ROq5Bq6qA==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167"
+  integrity sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==
   dependencies:
     chalk "^2.4.1"
     coa "^2.0.2"
     css-select "^2.0.0"
     css-select-base-adapter "^0.1.1"
-    css-tree "1.0.0-alpha.28"
-    css-url-regex "^1.1.0"
-    csso "^3.5.1"
+    css-tree "1.0.0-alpha.37"
+    csso "^4.0.2"
     js-yaml "^3.13.1"
     mkdirp "~0.5.1"
     object.values "^1.1.0"
@@ -11402,21 +9580,21 @@ svgo@^1.0.0:
     util.promisify "~1.0.0"
 
 symbol-tree@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
-  integrity sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
+  integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
 table@^5.2.3:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/table/-/table-5.4.0.tgz#d772a3216e68829920a41a32c18eda286c95d780"
-  integrity sha512-nHFDrxmbrkU7JAFKqKbDJXfzrX2UBsWmrieXFTGxiI5e4ncg3VqsZeI4EzNmX0ncp4XNGVeoxIWJXfCIXwrsvw==
+  version "5.4.6"
+  resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
+  integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
   dependencies:
-    ajv "^6.9.1"
-    lodash "^4.17.11"
+    ajv "^6.10.2"
+    lodash "^4.17.14"
     slice-ansi "^2.1.0"
     string-width "^3.0.0"
 
-tapable@^1.0.0, tapable@^1.1.0:
+tapable@^1.0.0, tapable@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
@@ -11434,64 +9612,59 @@ tar-stream@^1.5.0:
     to-buffer "^1.1.1"
     xtend "^4.0.0"
 
-tar@^4:
-  version "4.4.8"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
-  integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==
+tar@^4, tar@^4.4.2:
+  version "4.4.13"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
+  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
   dependencies:
     chownr "^1.1.1"
     fs-minipass "^1.2.5"
-    minipass "^2.3.4"
-    minizlib "^1.1.1"
+    minipass "^2.8.6"
+    minizlib "^1.2.1"
     mkdirp "^0.5.0"
     safe-buffer "^5.1.2"
-    yallist "^3.0.2"
+    yallist "^3.0.3"
 
-taskgroup@^4.0.5, taskgroup@^4.2.0:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/taskgroup/-/taskgroup-4.3.1.tgz#7de193febd768273c457730497024d512c27915a"
-  integrity sha1-feGT/r12gnPEV3MElwJNUSwnkVo=
+tedious@^6.6.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/tedious/-/tedious-6.7.0.tgz#ad02365f16f9e0416b216e13d3f83c53addd42ca"
+  integrity sha512-8qr7+sB0h4SZVQBRWUgHmYuOEflAOl2eihvxk0fVNvpvGJV4V5UC/YmSvebyfgyfwWcPO22/AnSbYVZZqf9wuQ==
   dependencies:
-    ambi "^2.2.0"
-    csextends "^1.0.3"
+    "@azure/ms-rest-nodeauth" "2.0.2"
+    "@types/node" "^12.12.17"
+    "@types/readable-stream" "^2.3.5"
+    bl "^3.0.0"
+    depd "^2.0.0"
+    iconv-lite "^0.5.0"
+    jsbi "^3.1.1"
+    native-duplexpair "^1.0.0"
+    punycode "^2.1.0"
+    readable-stream "^3.4.0"
+    sprintf-js "^1.1.2"
 
-tedious@^1.14.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/tedious/-/tedious-1.15.0.tgz#9bda9e9798212c8fcd9438a70cb2a806abcae70a"
-  integrity sha1-m9qel5ghLI/NlDinDLKoBqvK5wo=
+terser-webpack-plugin@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
+  integrity sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==
   dependencies:
-    babel-runtime "^6.9.2"
-    big-number "0.3.1"
-    bl "^1.0.0"
-    dns-lookup-all "^1.0.2"
-    iconv-lite "^0.4.11"
-    readable-stream "^2.0.2"
-    sprintf "0.1.5"
-
-terser-webpack-plugin@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz#69aa22426299f4b5b3775cbed8cb2c5d419aa1d4"
-  integrity sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg==
-  dependencies:
-    cacache "^11.3.2"
-    find-cache-dir "^2.0.0"
+    cacache "^12.0.2"
+    find-cache-dir "^2.1.0"
     is-wsl "^1.1.0"
-    loader-utils "^1.2.3"
     schema-utils "^1.0.0"
-    serialize-javascript "^1.7.0"
+    serialize-javascript "^2.1.2"
     source-map "^0.6.1"
-    terser "^4.0.0"
-    webpack-sources "^1.3.0"
+    terser "^4.1.2"
+    webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.0.0.tgz#ef356f6f359a963e2cc675517f21c1c382877374"
-  integrity sha512-dOapGTU0hETFl1tCo4t56FN+2jffoKyER9qBGoUFyZ6y7WLoKT0bF+lAYi6B6YsILcGF3q1C2FBh8QcKSCgkgA==
+terser@^4.0.0, terser@^4.1.2, terser@^4.3.9:
+  version "4.6.3"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.3.tgz#e33aa42461ced5238d352d2df2a67f21921f8d87"
+  integrity sha512-Lw+ieAXmY69d09IIc/yqeBqXpEQIpDGZqT34ui1QWXIUpR2RjbqEkT8X7Lgex19hslSqcWM5iMN2kM11eMsESQ==
   dependencies:
-    commander "^2.19.0"
+    commander "^2.20.0"
     source-map "~0.6.1"
-    source-map-support "~0.5.10"
+    source-map-support "~0.5.12"
 
 text-hex@1.0.x:
   version "1.0.0"
@@ -11508,14 +9681,6 @@ throttleit@^1.0.0:
   resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c"
   integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=
 
-through2-filter@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254"
-  integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==
-  dependencies:
-    through2 "~2.0.0"
-    xtend "~4.0.0"
-
 through2@^0.6.5:
   version "0.6.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
@@ -11524,7 +9689,7 @@ through2@^0.6.5:
     readable-stream ">=1.0.33-1 <1.1.0-0"
     xtend ">=4.0.0 <4.1.0-0"
 
-through2@^2.0.0, through2@^2.0.3, through2@~2.0.0:
+through2@^2.0.0:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
   integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
@@ -11532,20 +9697,22 @@ through2@^2.0.0, through2@^2.0.3, through2@~2.0.0:
     readable-stream "~2.3.6"
     xtend "~4.0.1"
 
-through@2, "through@>=2.2.7 <3", through@^2.3.6:
+through2@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
+  integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
+  dependencies:
+    readable-stream "2 || 3"
+
+through@2, through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
-time-stamp@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
-  integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
-
 timers-browserify@^2.0.4:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
-  integrity sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz#800b1f3eee272e5bc53ee465a04d0e804c31211f"
+  integrity sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==
   dependencies:
     setimmediate "^1.0.4"
 
@@ -11567,39 +9734,19 @@ tiny-emitter@^2.0.0:
   resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
   integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==
 
-tiny-lr@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.1.1.tgz#9fa547412f238fedb068ee295af8b682c98b2aab"
-  integrity sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==
-  dependencies:
-    body "^5.1.0"
-    debug "^3.1.0"
-    faye-websocket "~0.10.0"
-    livereload-js "^2.3.0"
-    object-assign "^4.1.0"
-    qs "^6.4.0"
-
-tmp@0.0.29:
-  version "0.0.29"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.29.tgz#f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0"
-  integrity sha1-8lEl/w3Z2jzLDC3Tce4SiLuRKMA=
-  dependencies:
-    os-tmpdir "~1.0.1"
-
-tmp@0.0.33, tmp@^0.0.33:
+tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
   integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
   dependencies:
     os-tmpdir "~1.0.2"
 
-to-absolute-glob@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b"
-  integrity sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=
+tmp@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877"
+  integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==
   dependencies:
-    is-absolute "^1.0.0"
-    is-negated-glob "^1.0.0"
+    rimraf "^2.6.3"
 
 to-array@0.1.4:
   version "0.1.4"
@@ -11621,11 +9768,6 @@ to-fast-properties@^1.0.3:
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
   integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
 
-to-fast-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
-
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
@@ -11651,13 +9793,6 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-to-through@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz#fc92adaba072647bc0b67d6b03664aa195093af6"
-  integrity sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=
-  dependencies:
-    through2 "^2.0.3"
-
 toidentifier@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
@@ -11673,7 +9808,7 @@ toposort-class@^1.0.1:
   resolved "https://registry.yarnpkg.com/toposort-class/-/toposort-class-1.0.1.tgz#7ffd1f78c8be28c3ba45cd4e1a3f5ee193bd9988"
   integrity sha1-f/0feMi+KMO6Rc1OGj9e4ZO9mYg=
 
-tough-cookie@^2.3.3, tough-cookie@^2.3.4, tough-cookie@~2.4.0, tough-cookie@~2.4.3:
+tough-cookie@^2.3.3, tough-cookie@^2.3.4, tough-cookie@^2.4.3, tough-cookie@~2.4.0:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
   integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
@@ -11688,50 +9823,30 @@ tr46@^1.0.1:
   dependencies:
     punycode "^2.1.0"
 
-trim-lines@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/trim-lines/-/trim-lines-1.1.2.tgz#c8adbdbdae21bb5c2766240a661f693afe23e59b"
-  integrity sha512-3GOuyNeTqk3FAqc3jOJtw7FTjYl94XBR5aD9QnDbK/T4CA9sW/J0l9RoaRPE9wyPP7NF331qnHnvJFBJ+IDkmQ==
-
 trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
   integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
 
-trim-trailing-lines@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.2.tgz#d2f1e153161152e9f02fabc670fb40bec2ea2e3a"
-  integrity sha512-MUjYItdrqqj2zpcHFTkMa9WAv4JHTI6gnRQGPFLrt5L9a6tRMiDnIqYl8JBvu2d2Tc3lWJKQwlGCp0K8AvCM+Q==
-
-trim@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd"
-  integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0=
-
 triple-beam@^1.2.0, triple-beam@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9"
   integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==
 
-trough@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.4.tgz#3b52b1f13924f460c3fbfd0df69b587dbcbc762e"
-  integrity sha512-tdzBRDGWcI1OpPVmChbdSKhvSVurznZ8X36AYURAcl+0o2ldlCY2XPzyXNNxwJwwyIU+rIglTCG4kxtNKBQH7Q==
-
 try-catch@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/try-catch/-/try-catch-2.0.0.tgz#a491141d597f8b72b46757fe1c47059341a16aed"
-  integrity sha512-RPXpVjsbtWgymwGq5F/OWDFsjEzdvzwHFaMjWWW6f/p6+uk/N7YSKJHQfIfGqITfj8qH4cBqCLMnhKZBaKk7Kg==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/try-catch/-/try-catch-2.0.1.tgz#a35d354187c422f291a0bcfd9eb77e3a4f90c1e5"
+  integrity sha512-LsOrmObN/2WdM+y2xG+t16vhYrQsnV8wftXIcIOWZhQcBJvKGYuamJGwnU98A7Jxs2oZNkJztXlphEOoA0DWqg==
 
 try-to-catch@^1.0.2:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/try-to-catch/-/try-to-catch-1.1.1.tgz#770162dd13b9a0e55da04db5b7f888956072038a"
   integrity sha512-ikUlS+/BcImLhNYyIgZcEmq4byc31QpC+46/6Jm5ECWkVFhf8SM2Fp/0pMVXPX6vk45SMCwrP4Taxucne8I0VA==
 
-tslib@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
-  integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
+tslib@^1.10.0, tslib@^1.9.0, tslib@^1.9.2, tslib@^1.9.3:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
+  integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
 
 tty-browserify@0.0.0:
   version "0.0.0"
@@ -11745,6 +9860,11 @@ tunnel-agent@^0.6.0:
   dependencies:
     safe-buffer "^5.0.1"
 
+tunnel@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
+  integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
+
 turndown@^5.0.1:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/turndown/-/turndown-5.0.3.tgz#a1350b66155d7891f10e451432170b0f7cd7449a"
@@ -11764,6 +9884,11 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+type-fest@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
+  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
+
 type-is@~1.6.17, type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
@@ -11772,24 +9897,17 @@ type-is@~1.6.17, type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
-typechecker@^2.0.8:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/typechecker/-/typechecker-2.1.0.tgz#d1c2093a54ff8a19f58cff877eeaa54f2242d383"
-  integrity sha1-0cIJOlT/ihn1jP+HfuqlTyJC04M=
+type@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
+  integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
 
-typechecker@^4.3.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/typechecker/-/typechecker-4.7.0.tgz#5249f427358f45b7250c4924fd4d01ed9ba435e9"
-  integrity sha512-4LHc1KMNJ6NDGO+dSM/yNfZQRtp8NN7psYrPHUblD62Dvkwsp3VShsbM78kOgpcmMkRTgvwdKOTjctS+uMllgQ==
-  dependencies:
-    editions "^2.1.0"
+type@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz#5f16ff6ef2eb44f260494dae271033b29c09a9c3"
+  integrity sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==
 
-typechecker@~2.0.1:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/typechecker/-/typechecker-2.0.8.tgz#e83da84bb64c584ccb345838576c40b0337db82e"
-  integrity sha1-6D2oS7ZMWEzLNFg4V2xAsDN9uC4=
-
-typedarray@^0.0.6, typedarray@~0.0.5:
+typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
@@ -11799,22 +9917,6 @@ uc.micro@^1.0.1, uc.micro@^1.0.5:
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
   integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
 
-uglify-es@^3.0.26, uglify-es@^3.3.4:
-  version "3.3.9"
-  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
-  integrity sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==
-  dependencies:
-    commander "~2.13.0"
-    source-map "~0.6.1"
-
-uglify-js@3.4.x:
-  version "3.4.10"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"
-  integrity sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==
-  dependencies:
-    commander "~2.19.0"
-    source-map "~0.6.1"
-
 uglify-js@^2.8.15:
   version "2.8.29"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
@@ -11825,20 +9927,12 @@ uglify-js@^2.8.15:
   optionalDependencies:
     uglify-to-browserify "~1.0.0"
 
-uglify-js@^3.0.21, uglify-js@^3.1.4:
-  version "3.5.15"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.5.15.tgz#fe2b5378fd0b09e116864041437bff889105ce24"
-  integrity sha512-fe7aYFotptIddkwcm6YuA0HmknBZ52ZzOsUxZEdhhkSsz7RfjHDX2QDxwKTiv4JQ5t5NhfmpgAK+J7LiDhKSqg==
+uglify-js@^3.1.4, uglify-js@^3.5.1:
+  version "3.7.7"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.7.tgz#21e52c7dccda80a53bf7cde69628a7e511aec9c9"
+  integrity sha512-FeSU+hi7ULYy6mn8PKio/tXsdSXN35lm4KgV2asx00kzrLU9Pi3oAslcJT70Jdj7PHX29gGUPOT6+lXGBbemhA==
   dependencies:
-    commander "~2.20.0"
-    source-map "~0.6.1"
-
-uglify-js@^3.5.1:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz#704681345c53a8b2079fb6cec294b05ead242ff5"
-  integrity sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==
-  dependencies:
-    commander "~2.20.0"
+    commander "~2.20.3"
     source-map "~0.6.1"
 
 uglify-to-browserify@~1.0.0:
@@ -11846,20 +9940,6 @@ uglify-to-browserify@~1.0.0:
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
   integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc=
 
-uglifyjs-webpack-plugin@^1.2.7:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz#75f548160858163a08643e086d5fefe18a5d67de"
-  integrity sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==
-  dependencies:
-    cacache "^10.0.4"
-    find-cache-dir "^1.0.0"
-    schema-utils "^0.4.5"
-    serialize-javascript "^1.4.0"
-    source-map "^0.6.1"
-    uglify-es "^3.3.4"
-    webpack-sources "^1.1.0"
-    worker-farm "^1.5.2"
-
 uid-safe@~2.1.5:
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.5.tgz#2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a"
@@ -11885,44 +9965,21 @@ umzug@^2.1.0:
     babel-runtime "^6.23.0"
     bluebird "^3.5.3"
 
-unc-path-regex@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
-  integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
-
-underscore.string@~2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-2.4.0.tgz#8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"
-  integrity sha1-jN2PusTi0uoefi6Al8QvRCKA+Fs=
-
 underscore@1.8.x, underscore@~1.8.3:
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
   integrity sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=
 
-underscore@^1.7.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
-  integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==
+"underscore@>= 1.3.1", underscore@^1.7.0:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.2.tgz#0c8d6f536d6f378a5af264a72f7bec50feb7cf2f"
+  integrity sha512-D39qtimx0c1fI3ya1Lnhk3E9nONswSKhnffBI0gME9C99fYOkNi04xs8K6pePLhvl1frbDemkaBQ5ikWllR2HQ==
 
 underscore@~1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
   integrity sha1-izixDKze9jM3uLJOT/htRa6lKag=
 
-underscore@~1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.7.0.tgz#6bbaf0877500d36be34ecaa584e0db9fef035209"
-  integrity sha1-a7rwh3UA02vjTsqlhODbn+8DUgk=
-
-unherit@^1.0.4:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/unherit/-/unherit-1.1.2.tgz#14f1f397253ee4ec95cec167762e77df83678449"
-  integrity sha512-W3tMnpaMG7ZY6xe/moK04U9fBhi6wEiCYHUW5Mop/wQHf12+79EQGwxYejNdhEz2mkqkBlGwm7pxmgBKMVUj0w==
-  dependencies:
-    inherits "^2.0.1"
-    xtend "^4.0.1"
-
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
@@ -11946,27 +10003,15 @@ unicode-property-aliases-ecmascript@^1.0.4:
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57"
   integrity sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==
 
-unified@^6.0.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/unified/-/unified-6.2.0.tgz#7fbd630f719126d67d40c644b7e3f617035f6dba"
-  integrity sha512-1k+KPhlVtqmG99RaTbAv/usu85fcSRu3wY8X+vnsEhIxNP5VbVIDiXnLqyKIG+UMdyTg0ZX9EI6k2AfjJkHPtA==
-  dependencies:
-    bail "^1.0.0"
-    extend "^3.0.0"
-    is-plain-obj "^1.1.0"
-    trough "^1.0.0"
-    vfile "^2.0.0"
-    x-is-string "^0.1.0"
-
 union-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
-  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
   dependencies:
     arr-union "^3.1.0"
     get-value "^2.0.6"
     is-extendable "^0.1.1"
-    set-value "^0.4.3"
+    set-value "^2.0.1"
 
 uniq@^1.0.1:
   version "1.0.1"
@@ -11978,7 +10023,7 @@ uniqs@^2.0.0:
   resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
   integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI=
 
-unique-filename@^1.1.0, unique-filename@^1.1.1:
+unique-filename@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
   integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
@@ -11986,80 +10031,12 @@ unique-filename@^1.1.0, unique-filename@^1.1.1:
     unique-slug "^2.0.0"
 
 unique-slug@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.1.tgz#5e9edc6d1ce8fb264db18a507ef9bd8544451ca6"
-  integrity sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
+  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
   dependencies:
     imurmurhash "^0.1.4"
 
-unique-stream@^2.0.2:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz#c65d110e9a4adf9a6c5948b28053d9a8d04cbeac"
-  integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==
-  dependencies:
-    json-stable-stringify-without-jsonify "^1.0.1"
-    through2-filter "^3.0.0"
-
-unist-builder@^1.0.1, unist-builder@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unist-builder/-/unist-builder-1.0.4.tgz#e1808aed30bd72adc3607f25afecebef4dd59e17"
-  integrity sha512-v6xbUPP7ILrT15fHGrNyHc1Xda8H3xVhP7/HAIotHOhVPjH5dCXA097C3Rry1Q2O+HbOLCao4hfPB+EYEjHgVg==
-  dependencies:
-    object-assign "^4.1.0"
-
-unist-util-generated@^1.1.0:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.4.tgz#2261c033d9fc23fae41872cdb7663746e972c1a7"
-  integrity sha512-SA7Sys3h3X4AlVnxHdvN/qYdr4R38HzihoEVY2Q2BZu8NHWDnw5OGcC/tXWjQfd4iG+M6qRFNIRGqJmp2ez4Ww==
-
-unist-util-is@^2.0.0, unist-util-is@^2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-2.1.3.tgz#459182db31f4742fceaea88d429693cbf0043d20"
-  integrity sha512-4WbQX2iwfr/+PfM4U3zd2VNXY+dWtZsN1fLnWEi2QQXA4qyDYAZcDMfXUX0Cu6XZUHHAO9q4nyxxLT4Awk1qUA==
-
-unist-util-is@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-3.0.0.tgz#d9e84381c2468e82629e4a5be9d7d05a2dd324cd"
-  integrity sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A==
-
-unist-util-position@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.0.3.tgz#fff942b879538b242096c148153826664b1ca373"
-  integrity sha512-28EpCBYFvnMeq9y/4w6pbnFmCUfzlsc41NJui5c51hOFjBA1fejcwc+5W4z2+0ECVbScG3dURS3JTVqwenzqZw==
-
-unist-util-remove-position@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.3.tgz#d91aa8b89b30cb38bad2924da11072faa64fd972"
-  integrity sha512-CtszTlOjP2sBGYc2zcKA/CvNdTdEs3ozbiJ63IPBxh8iZg42SCCb8m04f8z2+V1aSk5a7BxbZKEdoDjadmBkWA==
-  dependencies:
-    unist-util-visit "^1.1.0"
-
-unist-util-stringify-position@^1.0.0, unist-util-stringify-position@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz#3f37fcf351279dcbca7480ab5889bb8a832ee1c6"
-  integrity sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ==
-
-unist-util-stringify-position@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.1.tgz#de2a2bc8d3febfa606652673a91455b6a36fb9f3"
-  integrity sha512-Zqlf6+FRI39Bah8Q6ZnNGrEHUhwJOkHde2MHVk96lLyftfJJckaPslKgzhVcviXj8KcE9UJM9F+a4JEiBUTYgA==
-  dependencies:
-    "@types/unist" "^2.0.2"
-
-unist-util-visit-parents@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz#25e43e55312166f3348cae6743588781d112c1e9"
-  integrity sha512-DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g==
-  dependencies:
-    unist-util-is "^3.0.0"
-
-unist-util-visit@^1.0.0, unist-util-visit@^1.1.0, unist-util-visit@^1.3.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.4.1.tgz#4724aaa8486e6ee6e26d7ff3c8685960d560b1e3"
-  integrity sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==
-  dependencies:
-    unist-util-visit-parents "^2.0.0"
-
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
@@ -12084,9 +10061,9 @@ unset-value@^1.0.0:
     isobject "^3.0.0"
 
 upath@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
-  integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
+  integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
 upper-case@^1.1.1:
   version "1.1.3"
@@ -12105,14 +10082,14 @@ urix@^0.1.0:
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
-url-loader@^1.0.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-1.1.2.tgz#b971d191b83af693c5e3fea4064be9e1f2d7f8d8"
-  integrity sha512-dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg==
+url-loader@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.3.0.tgz#e0e2ef658f003efb8ca41b0f3ffbf76bab88658b"
+  integrity sha512-goSdg8VY+7nPZKUEChZSEtW5gjbS66USIGCeSJ1OVOJ7Yfuh/36YxCwMi5HVEJh6mqUYOoy3NJ0vlOMrWsSHog==
   dependencies:
-    loader-utils "^1.1.0"
-    mime "^2.0.3"
-    schema-utils "^1.0.0"
+    loader-utils "^1.2.3"
+    mime "^2.4.4"
+    schema-utils "^2.5.0"
 
 url@0.10.3:
   version "0.10.3"
@@ -12152,7 +10129,7 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
-util.promisify@1.0.0, util.promisify@~1.0.0:
+util.promisify@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
   integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==
@@ -12160,6 +10137,16 @@ util.promisify@1.0.0, util.promisify@~1.0.0:
     define-properties "^1.1.2"
     object.getownpropertydescriptors "^2.0.3"
 
+util.promisify@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee"
+  integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.2"
+    has-symbols "^1.0.1"
+    object.getownpropertydescriptors "^2.1.0"
+
 util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
@@ -12184,12 +10171,17 @@ utils-merge@1.0.1, utils-merge@1.x.x:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
-uuid@3.3.2, uuid@^3.0.0, uuid@^3.1.0, uuid@^3.2.1, uuid@^3.3.2:
+uuid@3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
-v8-compile-cache@^2.0.2:
+uuid@^3.0.0, uuid@^3.1.0, uuid@^3.2.1, uuid@^3.3.2, uuid@^3.3.3:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
+v8-compile-cache@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"
   integrity sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==
@@ -12219,11 +10211,6 @@ validator@~9.4.1:
   resolved "https://registry.yarnpkg.com/validator/-/validator-9.4.1.tgz#abf466d398b561cd243050112c6ff1de6cc12663"
   integrity sha512-YV5KjzvRmSyJ1ee/Dm5UED0G+1L4GZnLN3w6/T+zZm8scVua4sOhYKWTUrKa0H/tMiJyO9QLHMPN+9mB/aMunA==
 
-value-or-function@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813"
-  integrity sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=
-
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
@@ -12242,9 +10229,9 @@ velocity-animate@^1.4.0:
   integrity sha512-m6EXlCAMetKztO1ppBhGU1/1MR3IiEevO6ESq6rcrSQ3Q77xYSW13jkfXW88o4xMrkXJhy/U7j4wFR/twMB0Eg==
 
 vendors@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.3.tgz#a6467781abd366217c050f8202e7e50cc9eef8c0"
-  integrity sha512-fOi47nsJP5Wqefa43kyWSg80qF+Q3XA6MUkgi7Hp1HQaKDQW4cQrK2D0P7mmbFtsV1N89am55Yru/nyEwRubcw==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"
+  integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==
 
 verror@1.10.0, verror@^1.8.1:
   version "1.10.0"
@@ -12262,117 +10249,6 @@ verror@1.6.0:
   dependencies:
     extsprintf "1.2.0"
 
-vfile-location@^2.0.0:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.5.tgz#c83eb02f8040228a8d2b3f10e485be3e3433e0a2"
-  integrity sha512-Pa1ey0OzYBkLPxPZI3d9E+S4BmvfVwNAAXrrqGbwTVXWaX2p9kM1zZ+n35UtVM06shmWKH4RPRN8KI80qE3wNQ==
-
-vfile-message@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-1.1.1.tgz#5833ae078a1dfa2d96e9647886cd32993ab313e1"
-  integrity sha512-1WmsopSGhWt5laNir+633LszXvZ+Z/lxveBf6yhGsqnQIhlhzooZae7zV6YVM1Sdkw68dtAW3ow0pOdPANugvA==
-  dependencies:
-    unist-util-stringify-position "^1.1.1"
-
-vfile-message@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.1.tgz#951881861c22fc1eb39f873c0b93e336a64e8f6d"
-  integrity sha512-KtasSV+uVU7RWhUn4Lw+wW1Zl/nW8JWx7JCPps10Y9JRRIDeDXf8wfBLoOSsJLyo27DqMyAi54C6Jf/d6Kr2Bw==
-  dependencies:
-    "@types/unist" "^2.0.2"
-    unist-util-stringify-position "^2.0.0"
-
-vfile-reporter@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-6.0.0.tgz#753119f51dec9289b7508b457afc0cddf5e07f2e"
-  integrity sha512-8Is0XxFxWJUhPJdOg3CyZTqd3ICCWg6r304PuBl818ZG91h4FMS3Q+lrOPS+cs5/DZK3H0+AkJdH0J8JEwKtDA==
-  dependencies:
-    repeat-string "^1.5.0"
-    string-width "^4.0.0"
-    supports-color "^6.0.0"
-    unist-util-stringify-position "^2.0.0"
-    vfile-sort "^2.1.2"
-    vfile-statistics "^1.1.0"
-
-vfile-sort@^2.1.0, vfile-sort@^2.1.2:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/vfile-sort/-/vfile-sort-2.2.1.tgz#74e714f9175618cdae96bcaedf1a3dc711d87567"
-  integrity sha512-5dt7xEhC44h0uRQKhbM2JAe0z/naHphIZlMOygtMBM9Nn0pZdaX5fshhwWit9wvsuP8t/wp43nTDRRErO1WK8g==
-
-vfile-statistics@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/vfile-statistics/-/vfile-statistics-1.1.3.tgz#e9c87071997fbcb4243764d2c3805e0bb0820c60"
-  integrity sha512-CstaK/ebTz1W3Qp41Bt9Lj/2DmumFsCwC2sKahDNSPh0mPh7/UyMLCoU8ZBX34CRU0d61B4W41yIFsV0NKMZeA==
-
-vfile@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/vfile/-/vfile-2.3.0.tgz#e62d8e72b20e83c324bc6c67278ee272488bf84a"
-  integrity sha512-ASt4mBUHcTpMKD/l5Q+WJXNtshlWxOogYyGYYrg4lt/vuRjC1EFQtlAofL5VmtVNIZJzWYFJjzGWZ0Gw8pzW1w==
-  dependencies:
-    is-buffer "^1.1.4"
-    replace-ext "1.0.0"
-    unist-util-stringify-position "^1.0.0"
-    vfile-message "^1.0.0"
-
-vfile@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.0.1.tgz#fc3d43a1c71916034216bf65926d5ee3c64ed60c"
-  integrity sha512-lRHFCuC4SQBFr7Uq91oJDJxlnftoTLQ7eKIpMdubhYcVMho4781a8MWXLy3qZrZ0/STD1kRiKc0cQOHm4OkPeA==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    is-buffer "^2.0.0"
-    replace-ext "1.0.0"
-    unist-util-stringify-position "^2.0.0"
-    vfile-message "^2.0.0"
-
-vinyl-fs@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz#c85849405f67428feabbbd5c5dbdd64f47d31bc7"
-  integrity sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==
-  dependencies:
-    fs-mkdirp-stream "^1.0.0"
-    glob-stream "^6.1.0"
-    graceful-fs "^4.0.0"
-    is-valid-glob "^1.0.0"
-    lazystream "^1.0.0"
-    lead "^1.0.0"
-    object.assign "^4.0.4"
-    pumpify "^1.3.5"
-    readable-stream "^2.3.3"
-    remove-bom-buffer "^3.0.0"
-    remove-bom-stream "^1.2.0"
-    resolve-options "^1.1.0"
-    through2 "^2.0.0"
-    to-through "^2.0.0"
-    value-or-function "^3.0.0"
-    vinyl "^2.0.0"
-    vinyl-sourcemap "^1.1.0"
-
-vinyl-sourcemap@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz#92a800593a38703a8cdb11d8b300ad4be63b3e16"
-  integrity sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=
-  dependencies:
-    append-buffer "^1.0.2"
-    convert-source-map "^1.5.0"
-    graceful-fs "^4.1.6"
-    normalize-path "^2.1.1"
-    now-and-later "^2.0.0"
-    remove-bom-buffer "^3.0.0"
-    vinyl "^2.0.0"
-
-vinyl@^2.0.0, vinyl@^2.1.0, vinyl@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86"
-  integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==
-  dependencies:
-    clone "^2.1.1"
-    clone-buffer "^1.0.0"
-    clone-stats "^1.0.0"
-    cloneable-readable "^1.0.0"
-    remove-trailing-separator "^1.0.1"
-    replace-ext "^1.0.0"
-
 visibilityjs@^1.2.4:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/visibilityjs/-/visibilityjs-1.2.8.tgz#4ccdcebdaef0b34fb89219ab8e10e39c3a7cbfd8"
@@ -12383,20 +10259,10 @@ viz.js@^1.7.0:
   resolved "https://registry.yarnpkg.com/viz.js/-/viz.js-1.8.2.tgz#d9cc04cd99f98ec986bf9054db76a6cbcdc5d97a"
   integrity sha512-W+1+N/hdzLpQZEcvz79n2IgUE9pfx6JLdHh3Kh8RGvLL8P1LdJVQmi2OsDcLdY4QVID4OUy+FPelyerX0nJxIQ==
 
-vm-browserify@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
-  integrity sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=
-  dependencies:
-    indexof "0.0.1"
-
-vue-template-compiler@^2.5.16:
-  version "2.6.10"
-  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.10.tgz#323b4f3495f04faa3503337a82f5d6507799c9cc"
-  integrity sha512-jVZkw4/I/HT5ZMvRnhv78okGusqe0+qH2A0Em0Cp8aq78+NK9TII263CDVz2QXZsIT+yyV/gZc/j/vlwa+Epyg==
-  dependencies:
-    de-indent "^1.0.2"
-    he "^1.1.0"
+vm-browserify@^1.0.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
+  integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
 w3c-hr-time@^1.0.1:
   version "1.0.1"
@@ -12405,7 +10271,7 @@ w3c-hr-time@^1.0.1:
   dependencies:
     browser-process-hrtime "^0.1.2"
 
-watchpack@^1.5.0:
+watchpack@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
   integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==
@@ -12414,20 +10280,6 @@ watchpack@^1.5.0:
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
 
-watchr@~2.4.13:
-  version "2.4.13"
-  resolved "https://registry.yarnpkg.com/watchr/-/watchr-2.4.13.tgz#d74847bb4d6f90f61fe2c74f9f68662aa0e07601"
-  integrity sha1-10hHu01vkPYf4sdPn2hmKqDgdgE=
-  dependencies:
-    eachr "^2.0.2"
-    extendr "^2.1.0"
-    extract-opts "^2.2.0"
-    ignorefs "^1.0.0"
-    safefs "^3.1.2"
-    scandirectory "^2.5.0"
-    taskgroup "^4.2.0"
-    typechecker "^2.0.8"
-
 weak-map@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/weak-map/-/weak-map-1.0.5.tgz#79691584d98607f5070bd3b70a40e6bb22e401eb"
@@ -12443,96 +10295,74 @@ webidl-conversions@^4.0.2:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
   integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
 
-webpack-cli@^3.1.0:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.2.tgz#aed2437b0db0a7faa2ad28484e166a5360014a91"
-  integrity sha512-FLkobnaJJ+03j5eplxlI0TUxhGCOdfewspIGuvDVtpOlrAuKMFC57K42Ukxqs1tn8947/PM6tP95gQc0DCzRYA==
+webpack-cli@^3.3.10:
+  version "3.3.11"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.11.tgz#3bf21889bf597b5d82c38f215135a411edfdc631"
+  integrity sha512-dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g==
   dependencies:
-    chalk "^2.4.1"
-    cross-spawn "^6.0.5"
-    enhanced-resolve "^4.1.0"
-    findup-sync "^2.0.0"
-    global-modules "^1.0.0"
-    import-local "^2.0.0"
-    interpret "^1.1.0"
-    loader-utils "^1.1.0"
-    supports-color "^5.5.0"
-    v8-compile-cache "^2.0.2"
-    yargs "^12.0.5"
+    chalk "2.4.2"
+    cross-spawn "6.0.5"
+    enhanced-resolve "4.1.0"
+    findup-sync "3.0.0"
+    global-modules "2.0.0"
+    import-local "2.0.0"
+    interpret "1.2.0"
+    loader-utils "1.2.3"
+    supports-color "6.1.0"
+    v8-compile-cache "2.0.3"
+    yargs "13.2.4"
 
-webpack-merge@^4.1.4:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.1.tgz#5e923cf802ea2ace4fd5af1d3247368a633489b4"
-  integrity sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==
+webpack-log@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
+  integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==
   dependencies:
-    lodash "^4.17.5"
+    ansi-colors "^3.0.0"
+    uuid "^3.3.2"
 
-webpack-parallel-uglify-plugin@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/webpack-parallel-uglify-plugin/-/webpack-parallel-uglify-plugin-1.1.0.tgz#252a6c796bf79a8047b00de2cf08c23aa9861441"
-  integrity sha512-HgNqQrXuCvV+S5qCgv9vrJfcldmxQ57KYZNMXVk842XFzunXQm/GbSM/Pwli7taOeiEX8ypFpSTGyMBRKc++rg==
+webpack-merge@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d"
+  integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==
   dependencies:
-    babel-code-frame "^6.26.0"
-    glob "^7.0.5"
-    mkdirp "^0.5.1"
-    pify "^3.0.0"
-    tmp "0.0.29"
-    uglify-es "^3.0.26"
-    uglify-js "^3.0.21"
-    webpack-sources "^1.0.0"
-    worker-farm "^1.3.1"
+    lodash "^4.17.15"
 
-webpack-sources@^1.0.0, webpack-sources@^1.1.0, webpack-sources@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
-  integrity sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==
+webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
+  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
   dependencies:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@^4.14.0:
-  version "4.32.2"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.32.2.tgz#3639375364a617e84b914ddb2c770aed511e5bc8"
-  integrity sha512-F+H2Aa1TprTQrpodRAWUMJn7A8MgDx82yQiNvYMaj3d1nv3HetKU0oqEulL9huj8enirKi8KvEXQ3QtuHF89Zg==
+webpack@^4.41.2:
+  version "4.41.6"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.6.tgz#12f2f804bf6542ef166755050d4afbc8f66ba7e1"
+  integrity sha512-yxXfV0Zv9WMGRD+QexkZzmGIh54bsvEs+9aRWxnN8erLWEOehAKUTeNBoUbA6HPEZPlRo7KDi2ZcNveoZgK9MA==
   dependencies:
     "@webassemblyjs/ast" "1.8.5"
     "@webassemblyjs/helper-module-context" "1.8.5"
     "@webassemblyjs/wasm-edit" "1.8.5"
     "@webassemblyjs/wasm-parser" "1.8.5"
-    acorn "^6.0.5"
-    acorn-dynamic-import "^4.0.0"
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
-    chrome-trace-event "^1.0.0"
+    acorn "^6.2.1"
+    ajv "^6.10.2"
+    ajv-keywords "^3.4.1"
+    chrome-trace-event "^1.0.2"
     enhanced-resolve "^4.1.0"
-    eslint-scope "^4.0.0"
+    eslint-scope "^4.0.3"
     json-parse-better-errors "^1.0.2"
-    loader-runner "^2.3.0"
-    loader-utils "^1.1.0"
-    memory-fs "~0.4.1"
-    micromatch "^3.1.8"
-    mkdirp "~0.5.0"
-    neo-async "^2.5.0"
-    node-libs-browser "^2.0.0"
+    loader-runner "^2.4.0"
+    loader-utils "^1.2.3"
+    memory-fs "^0.4.1"
+    micromatch "^3.1.10"
+    mkdirp "^0.5.1"
+    neo-async "^2.6.1"
+    node-libs-browser "^2.2.1"
     schema-utils "^1.0.0"
-    tapable "^1.1.0"
-    terser-webpack-plugin "^1.1.0"
-    watchpack "^1.5.0"
-    webpack-sources "^1.3.0"
-
-websocket-driver@>=0.5.1:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz#a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"
-  integrity sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==
-  dependencies:
-    http-parser-js ">=0.4.0 <0.4.11"
-    safe-buffer ">=5.1.0"
-    websocket-extensions ">=0.1.1"
-
-websocket-extensions@>=0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
-  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
+    tapable "^1.1.3"
+    terser-webpack-plugin "^1.4.3"
+    watchpack "^1.6.0"
+    webpack-sources "^1.4.1"
 
 whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
   version "1.0.5"
@@ -12556,9 +10386,9 @@ whatwg-url@^6.4.1:
     webidl-conversions "^4.0.2"
 
 whatwg-url@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz#fde926fa54a599f3adf82dff25a9f7be02dc6edd"
-  integrity sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06"
+  integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==
   dependencies:
     lodash.sortby "^4.7.0"
     tr46 "^1.0.1"
@@ -12569,7 +10399,7 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@^1.2.10, which@^1.2.14, which@^1.2.9:
+which@^1.2.10, which@^1.2.14, which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -12611,13 +10441,18 @@ winston@^3.1.0:
     triple-beam "^1.3.0"
     winston-transport "^4.3.0"
 
-wkx@^0.4.6:
-  version "0.4.7"
-  resolved "https://registry.yarnpkg.com/wkx/-/wkx-0.4.7.tgz#ba0e4f9e785e95c9975856c1834f19a95c65cfb5"
-  integrity sha512-pHf546L96TK8RradLt1cWaIffstgv/zXZ14CGz5KnBs1AxBX0wm+IDphjJw0qrEqRv8P9W9CdTt8Z1unMRZ19A==
+wkx@^0.4.8:
+  version "0.4.8"
+  resolved "https://registry.yarnpkg.com/wkx/-/wkx-0.4.8.tgz#a092cf088d112683fdc7182fd31493b2c5820003"
+  integrity sha512-ikPXMM9IR/gy/LwiOSqWlSL3X/J5uk9EO2hHNRXS41eTLXaUFEVw9fn/593jW/tE5tedNg8YjT5HkCa4FqQZyQ==
   dependencies:
     "@types/node" "*"
 
+word-wrap@~1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+
 wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
@@ -12628,26 +10463,13 @@ wordwrap@~0.0.2:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
   integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
 
-wordwrap@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
-
-worker-farm@^1.3.1, worker-farm@^1.5.2, worker-farm@^1.7.0:
+worker-farm@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
   integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==
   dependencies:
     errno "~0.1.7"
 
-wrap-ansi@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
-  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-
 wrap-ansi@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
@@ -12693,21 +10515,16 @@ ws@~3.3.1:
     ultron "~1.1.0"
 
 wurl@^2.5.3:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/wurl/-/wurl-2.5.3.tgz#79ff7c4d8c6584cb46d239517ecac334380af7fd"
-  integrity sha512-LWqZh3ox8gfPwB/xFYFJPnlNOytLtnDtvIDj+iUvD5hxDVWhNa2uhGEQbjyrmolbNFMycqkEnYVXJ7Y72n6h3w==
+  version "2.5.4"
+  resolved "https://registry.yarnpkg.com/wurl/-/wurl-2.5.4.tgz#6af35a6c623296c4a0c607c4651d01b8f4e3fdec"
+  integrity sha512-Vuo550m5YbqRcM/69zz3jVNsCUvFTWLRYQcYvnqNWQ4d0Bjg7aoaofbcsPTe4rM9A2/4xjd8uIf9viIUV9EMXQ==
 
-x-is-string@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz#474b50865af3a49a9c4657f05acd145458f77d82"
-  integrity sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=
+x-xss-protection@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/x-xss-protection/-/x-xss-protection-1.3.0.tgz#3e3a8dd638da80421b0e9fff11a2dbe168f6d52c"
+  integrity sha512-kpyBI9TlVipZO4diReZMAHWtS0MMa/7Kgx8hwG/EuZLiA6sg4Ah/4TRdASHhRRN3boobzcYgFRUFSgHRge6Qhg==
 
-x-xss-protection@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/x-xss-protection/-/x-xss-protection-1.1.0.tgz#4f1898c332deb1e7f2be1280efb3e2c53d69c1a7"
-  integrity sha512-rx3GzJlgEeZ08MIcDsU2vY2B1QEriUKJTSiNHHUIem6eg9pzVOr2TL3Y4Pd6TMAM5D5azGjcxqI62piITBDHVg==
-
-xml-crypto@^1.1.4:
+xml-crypto@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-1.4.0.tgz#de1cec8cd31cbd689cd90d3d6e8a27d4ae807de7"
   integrity sha512-K8FRdRxICVulK4WhiTUcJrRyAIJFPVOqxfurA3x/JlmXBTxy+SkEENF6GeRt7p/rB6WSOUS9g0gXNQw5n+407g==
@@ -12715,13 +10532,12 @@ xml-crypto@^1.1.4:
     xmldom "0.1.27"
     xpath "0.0.27"
 
-xml-encryption@^0.11.0:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-0.11.2.tgz#c217f5509547e34b500b829f2c0bca85cca73a21"
-  integrity sha512-jVvES7i5ovdO7N+NjgncA326xYKjhqeAnnvIgRnY7ROLCfFqEDLwP0Sxp/30SHG0AXQV1048T5yinOFyvwGFzg==
+xml-encryption@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-1.0.0.tgz#fe50d3bbbe2ae06876d6aa95aa3bf958284e1612"
+  integrity sha512-xTqcgKPN3XOswvDPXrhtyvWZ96IFcO9Azv3vS060kOpBsK5T7OxbQDxb59bPLl4b4c2IgmSZC3kJB0n5WPr2Mw==
   dependencies:
-    async "^2.1.5"
-    ejs "^2.5.6"
+    escape-html "^1.0.3"
     node-forge "^0.7.0"
     xmldom "~0.1.15"
     xpath "0.0.27"
@@ -12738,7 +10554,7 @@ xml2js@0.2.8:
   dependencies:
     sax "0.5.x"
 
-xml2js@0.4.19, xml2js@0.4.x, xml2js@^0.4.15:
+xml2js@0.4.19:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
   integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==
@@ -12746,12 +10562,20 @@ xml2js@0.4.19, xml2js@0.4.x, xml2js@^0.4.15:
     sax ">=0.6.0"
     xmlbuilder "~9.0.1"
 
+xml2js@0.4.x, xml2js@^0.4.15, xml2js@^0.4.19:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
+  integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
+  dependencies:
+    sax ">=0.6.0"
+    xmlbuilder "~11.0.0"
+
 xml@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
   integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=
 
-xmlbuilder@^11.0.0:
+xmlbuilder@^11.0.0, xmlbuilder@~11.0.0:
   version "11.0.1"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
   integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
@@ -12761,11 +10585,21 @@ xmlbuilder@^9.0.7, xmlbuilder@~9.0.1:
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
   integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
 
-xmldom@0.1.27, xmldom@0.1.x, xmldom@~0.1.15:
+xmldom@0.1.27:
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
   integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk=
 
+xmldom@0.1.x, xmldom@~0.1.15:
+  version "0.1.31"
+  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
+  integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==
+
+"xmldom@>= 0.1.x":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.2.1.tgz#cac9465066f161e1c3302793ea4dbe59c518274f"
+  integrity sha512-kXXiYvmblIgEemGeB75y97FyaZavx6SQhGppLw5TKWAD2Wd0KAly0g23eVLh17YcpxZpnFym1Qk/eaRjy1APPg==
+
 xmlhttprequest-ssl@~1.5.4:
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
@@ -12776,16 +10610,16 @@ xmlhttprequest@>=1.5.0:
   resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc"
   integrity sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=
 
+xpath.js@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/xpath.js/-/xpath.js-1.1.0.tgz#3816a44ed4bb352091083d002a383dd5104a5ff1"
+  integrity sha512-jg+qkfS4K8E7965sqaUl8mRngXiKb3WZGfONgE18pr03FUQiuSV6G+Ej4tS55B+rIQSFEIw3phdVAQ4pPqNWfQ==
+
 xpath@0.0.27:
   version "0.0.27"
   resolved "https://registry.yarnpkg.com/xpath/-/xpath-0.0.27.tgz#dd3421fbdcc5646ac32c48531b4d7e9d0c2cfa92"
   integrity sha512-fg03WRxtkCV6ohClePNAECYsmpKKTv5L8y/X3Dn1hQrec3POx2jHZ/0P2qQ6HvsrU1BmeqXcof3NGGueG6LxwQ==
 
-xregexp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
-  integrity sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=
-
 xss@^1.0.3:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.6.tgz#eaf11e9fc476e3ae289944a1009efddd8a124b51"
@@ -12795,11 +10629,6 @@ xss@^1.0.3:
     cssfilter "0.0.10"
 
 "xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
-
-xtend@^4.0.1, xtend@~4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
@@ -12811,7 +10640,7 @@ xtraverse@0.1.x:
   dependencies:
     xmldom "0.1.x"
 
-"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
+y18n@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
   integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
@@ -12821,20 +10650,12 @@ yallist@^2.1.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-yallist@^3.0.0, yallist@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
-  integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
+yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
-yargs-parser@^11.1.1:
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
-  integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs-parser@^13.1.0:
+yargs-parser@^13.1.0, yargs-parser@^13.1.1:
   version "13.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
   integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==
@@ -12842,25 +10663,7 @@ yargs-parser@^13.1.0:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs@^12.0.2, yargs@^12.0.5:
-  version "12.0.5"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
-  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
-  dependencies:
-    cliui "^4.0.0"
-    decamelize "^1.2.0"
-    find-up "^3.0.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.0.0"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^2.0.0"
-    which-module "^2.0.0"
-    y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^11.1.1"
-
-yargs@^13.1.0:
+yargs@13.2.4:
   version "13.2.4"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83"
   integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==
@@ -12877,6 +10680,22 @@ yargs@^13.1.0:
     y18n "^4.0.0"
     yargs-parser "^13.1.0"
 
+yargs@^13.1.0:
+  version "13.3.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83"
+  integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==
+  dependencies:
+    cliui "^5.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.1.1"
+
 yargs@~3.10.0:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
diff --git a/pkgs/servers/web-apps/codimd/yarn.nix b/pkgs/servers/web-apps/codimd/yarn.nix
index add7d6a9ba50..d97950dd7af2 100644
--- a/pkgs/servers/web-apps/codimd/yarn.nix
+++ b/pkgs/servers/web-apps/codimd/yarn.nix
@@ -2,891 +2,43 @@
   offline_cache = linkFarm "offline" packages;
   packages = [
     {
-      name = "_babel_code_frame___code_frame_7.0.0.tgz";
+      name = "_azure_ms_rest_azure_env___ms_rest_azure_env_1.1.2.tgz";
       path = fetchurl {
-        name = "_babel_code_frame___code_frame_7.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz";
-        sha1 = "06e2ab19bdb535385559aabb5ba59729482800f8";
+        name = "_azure_ms_rest_azure_env___ms_rest_azure_env_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/@azure/ms-rest-azure-env/-/ms-rest-azure-env-1.1.2.tgz";
+        sha1 = "8505873afd4a1227ec040894a64fdd736b4a101f";
       };
     }
     {
-      name = "_babel_code_frame___code_frame_7.5.5.tgz";
+      name = "_azure_ms_rest_js___ms_rest_js_1.8.14.tgz";
       path = fetchurl {
-        name = "_babel_code_frame___code_frame_7.5.5.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz";
-        sha1 = "bc0782f6d69f7b7d49531219699b988f669a8f9d";
+        name = "_azure_ms_rest_js___ms_rest_js_1.8.14.tgz";
+        url  = "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-1.8.14.tgz";
+        sha1 = "657fc145db20b6eb3d58d1a2055473aa72eb609d";
       };
     }
     {
-      name = "_babel_core___core_7.5.5.tgz";
+      name = "_azure_ms_rest_nodeauth___ms_rest_nodeauth_2.0.2.tgz";
       path = fetchurl {
-        name = "_babel_core___core_7.5.5.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/core/-/core-7.5.5.tgz";
-        sha1 = "17b2686ef0d6bc58f963dddd68ab669755582c30";
+        name = "_azure_ms_rest_nodeauth___ms_rest_nodeauth_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/@azure/ms-rest-nodeauth/-/ms-rest-nodeauth-2.0.2.tgz";
+        sha1 = "037e29540c5625eaec718b8fcc178dd7ad5dfb96";
       };
     }
     {
-      name = "_babel_generator___generator_7.5.5.tgz";
+      name = "_babel_code_frame___code_frame_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_generator___generator_7.5.5.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.5.5.tgz";
-        sha1 = "873a7f936a3c89491b43536d12245b626664e3cf";
+        name = "_babel_code_frame___code_frame_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz";
+        sha1 = "33e25903d7481181534e12ec0a25f16b6fcf419e";
       };
     }
     {
-      name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.0.0.tgz";
+      name = "_babel_highlight___highlight_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz";
-        sha1 = "323d39dd0b50e10c7c06ca7d7638e6864d8c5c32";
-      };
-    }
-    {
-      name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.1.0.tgz";
-      path = fetchurl {
-        name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz";
-        sha1 = "6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f";
-      };
-    }
-    {
-      name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.3.0.tgz";
-      path = fetchurl {
-        name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz";
-        sha1 = "a1ac95a5d2b3e88ae5e54846bf462eeb81b318a4";
-      };
-    }
-    {
-      name = "_babel_helper_call_delegate___helper_call_delegate_7.4.4.tgz";
-      path = fetchurl {
-        name = "_babel_helper_call_delegate___helper_call_delegate_7.4.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz";
-        sha1 = "87c1f8ca19ad552a736a7a27b1c1fcf8b1ff1f43";
-      };
-    }
-    {
-      name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.5.5.tgz";
-      path = fetchurl {
-        name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.5.5.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.5.tgz";
-        sha1 = "401f302c8ddbc0edd36f7c6b2887d8fa1122e5a4";
-      };
-    }
-    {
-      name = "_babel_helper_define_map___helper_define_map_7.5.5.tgz";
-      path = fetchurl {
-        name = "_babel_helper_define_map___helper_define_map_7.5.5.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz";
-        sha1 = "3dec32c2046f37e09b28c93eb0b103fd2a25d369";
-      };
-    }
-    {
-      name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.1.0.tgz";
-      path = fetchurl {
-        name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz";
-        sha1 = "537fa13f6f1674df745b0c00ec8fe4e99681c8f6";
-      };
-    }
-    {
-      name = "_babel_helper_function_name___helper_function_name_7.1.0.tgz";
-      path = fetchurl {
-        name = "_babel_helper_function_name___helper_function_name_7.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz";
-        sha1 = "a0ceb01685f73355d4360c1247f582bfafc8ff53";
-      };
-    }
-    {
-      name = "_babel_helper_get_function_arity___helper_get_function_arity_7.0.0.tgz";
-      path = fetchurl {
-        name = "_babel_helper_get_function_arity___helper_get_function_arity_7.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz";
-        sha1 = "83572d4320e2a4657263734113c42868b64e49c3";
-      };
-    }
-    {
-      name = "_babel_helper_hoist_variables___helper_hoist_variables_7.4.4.tgz";
-      path = fetchurl {
-        name = "_babel_helper_hoist_variables___helper_hoist_variables_7.4.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz";
-        sha1 = "0298b5f25c8c09c53102d52ac4a98f773eb2850a";
-      };
-    }
-    {
-      name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.5.5.tgz";
-      path = fetchurl {
-        name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.5.5.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz";
-        sha1 = "1fb5b8ec4453a93c439ee9fe3aeea4a84b76b590";
-      };
-    }
-    {
-      name = "_babel_helper_module_imports___helper_module_imports_7.0.0.tgz";
-      path = fetchurl {
-        name = "_babel_helper_module_imports___helper_module_imports_7.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz";
-        sha1 = "96081b7111e486da4d2cd971ad1a4fe216cc2e3d";
-      };
-    }
-    {
-      name = "_babel_helper_module_transforms___helper_module_transforms_7.5.5.tgz";
-      path = fetchurl {
-        name = "_babel_helper_module_transforms___helper_module_transforms_7.5.5.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz";
-        sha1 = "f84ff8a09038dcbca1fd4355661a500937165b4a";
-      };
-    }
-    {
-      name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.0.0.tgz";
-      path = fetchurl {
-        name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz";
-        sha1 = "a2920c5702b073c15de51106200aa8cad20497d5";
-      };
-    }
-    {
-      name = "_babel_helper_plugin_utils___helper_plugin_utils_7.0.0.tgz";
-      path = fetchurl {
-        name = "_babel_helper_plugin_utils___helper_plugin_utils_7.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz";
-        sha1 = "bbb3fbee98661c569034237cc03967ba99b4f250";
-      };
-    }
-    {
-      name = "_babel_helper_regex___helper_regex_7.5.5.tgz";
-      path = fetchurl {
-        name = "_babel_helper_regex___helper_regex_7.5.5.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.5.5.tgz";
-        sha1 = "0aa6824f7100a2e0e89c1527c23936c152cab351";
-      };
-    }
-    {
-      name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.1.0.tgz";
-      path = fetchurl {
-        name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz";
-        sha1 = "361d80821b6f38da75bd3f0785ece20a88c5fe7f";
-      };
-    }
-    {
-      name = "_babel_helper_replace_supers___helper_replace_supers_7.5.5.tgz";
-      path = fetchurl {
-        name = "_babel_helper_replace_supers___helper_replace_supers_7.5.5.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz";
-        sha1 = "f84ce43df031222d2bad068d2626cb5799c34bc2";
-      };
-    }
-    {
-      name = "_babel_helper_simple_access___helper_simple_access_7.1.0.tgz";
-      path = fetchurl {
-        name = "_babel_helper_simple_access___helper_simple_access_7.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz";
-        sha1 = "65eeb954c8c245beaa4e859da6188f39d71e585c";
-      };
-    }
-    {
-      name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.4.4.tgz";
-      path = fetchurl {
-        name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.4.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz";
-        sha1 = "ff94894a340be78f53f06af038b205c49d993677";
-      };
-    }
-    {
-      name = "_babel_helper_wrap_function___helper_wrap_function_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_helper_wrap_function___helper_wrap_function_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz";
-        sha1 = "c4e0012445769e2815b55296ead43a958549f6fa";
-      };
-    }
-    {
-      name = "_babel_helpers___helpers_7.5.5.tgz";
-      path = fetchurl {
-        name = "_babel_helpers___helpers_7.5.5.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.5.tgz";
-        sha1 = "63908d2a73942229d1e6685bc2a0e730dde3b75e";
-      };
-    }
-    {
-      name = "_babel_highlight___highlight_7.0.0.tgz";
-      path = fetchurl {
-        name = "_babel_highlight___highlight_7.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz";
-        sha1 = "f710c38c8d458e6dd9a201afb637fcb781ce99e4";
-      };
-    }
-    {
-      name = "_babel_parser___parser_7.1.3.tgz";
-      path = fetchurl {
-        name = "_babel_parser___parser_7.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.3.tgz";
-        sha1 = "2c92469bac2b7fbff810b67fca07bd138b48af77";
-      };
-    }
-    {
-      name = "_babel_parser___parser_7.5.5.tgz";
-      path = fetchurl {
-        name = "_babel_parser___parser_7.5.5.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.5.5.tgz";
-        sha1 = "02f077ac8817d3df4a832ef59de67565e71cca4b";
-      };
-    }
-    {
-      name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz";
-        sha1 = "b289b306669dce4ad20b0252889a15768c9d417e";
-      };
-    }
-    {
-      name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.5.5.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.5.5.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz";
-        sha1 = "a974cfae1e37c3110e71f3c6a2e48b8e71958cd4";
-      };
-    }
-    {
-      name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.4.4.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.4.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.4.4.tgz";
-        sha1 = "de9b2a1a8ab0196f378e2a82f10b6e2a36f21cc0";
-      };
-    }
-    {
-      name = "_babel_plugin_proposal_do_expressions___plugin_proposal_do_expressions_7.5.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_proposal_do_expressions___plugin_proposal_do_expressions_7.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-do-expressions/-/plugin-proposal-do-expressions-7.5.0.tgz";
-        sha1 = "ceb594d4a618545b00aa0b5cd61cad4aaaeb7a5a";
-      };
-    }
-    {
-      name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.5.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz";
-        sha1 = "e532202db4838723691b10a67b8ce509e397c506";
-      };
-    }
-    {
-      name = "_babel_plugin_proposal_export_default_from___plugin_proposal_export_default_from_7.5.2.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_proposal_export_default_from___plugin_proposal_export_default_from_7.5.2.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.5.2.tgz";
-        sha1 = "2c0ac2dcc36e3b2443fead2c3c5fc796fb1b5145";
-      };
-    }
-    {
-      name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.5.2.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.5.2.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.5.2.tgz";
-        sha1 = "ccd5ed05b06d700688ff1db01a9dd27155e0d2a0";
-      };
-    }
-    {
-      name = "_babel_plugin_proposal_function_bind___plugin_proposal_function_bind_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_proposal_function_bind___plugin_proposal_function_bind_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-function-bind/-/plugin-proposal-function-bind-7.2.0.tgz";
-        sha1 = "94dc2cdc505cafc4e225c0014335a01648056bf7";
-      };
-    }
-    {
-      name = "_babel_plugin_proposal_function_sent___plugin_proposal_function_sent_7.5.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_proposal_function_sent___plugin_proposal_function_sent_7.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-function-sent/-/plugin-proposal-function-sent-7.5.0.tgz";
-        sha1 = "39233aa801145e7d8072077cdb2d25f781c1ffd7";
-      };
-    }
-    {
-      name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz";
-        sha1 = "568ecc446c6148ae6b267f02551130891e29f317";
-      };
-    }
-    {
-      name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.2.0.tgz";
-        sha1 = "8a5cea6c42a7c87446959e02fff5fad012c56f57";
-      };
-    }
-    {
-      name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.4.4.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.4.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.4.4.tgz";
-        sha1 = "41c360d59481d88e0ce3a3f837df10121a769b39";
-      };
-    }
-    {
-      name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.2.0.tgz";
-        sha1 = "646854daf4cd22fd6733f6076013a936310443ac";
-      };
-    }
-    {
-      name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.5.5.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.5.5.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz";
-        sha1 = "61939744f71ba76a3ae46b5eea18a54c16d22e58";
-      };
-    }
-    {
-      name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz";
-        sha1 = "135d81edb68a081e55e56ec48541ece8065c38f5";
-      };
-    }
-    {
-      name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.2.0.tgz";
-        sha1 = "ae454f4c21c6c2ce8cb2397dc332ae8b420c5441";
-      };
-    }
-    {
-      name = "_babel_plugin_proposal_pipeline_operator___plugin_proposal_pipeline_operator_7.5.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_proposal_pipeline_operator___plugin_proposal_pipeline_operator_7.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-pipeline-operator/-/plugin-proposal-pipeline-operator-7.5.0.tgz";
-        sha1 = "4100ec55ef4f6a4c2490b5f5a4f2a22dfa272c06";
-      };
-    }
-    {
-      name = "_babel_plugin_proposal_throw_expressions___plugin_proposal_throw_expressions_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_proposal_throw_expressions___plugin_proposal_throw_expressions_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-throw-expressions/-/plugin-proposal-throw-expressions-7.2.0.tgz";
-        sha1 = "2d9e452d370f139000e51db65d0a85dc60c64739";
-      };
-    }
-    {
-      name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.4.4.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.4.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz";
-        sha1 = "501ffd9826c0b91da22690720722ac7cb1ca9c78";
-      };
-    }
-    {
-      name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz";
-        sha1 = "69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f";
-      };
-    }
-    {
-      name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.2.0.tgz";
-        sha1 = "c50b1b957dcc69e4b1127b65e1c33eef61570c1b";
-      };
-    }
-    {
-      name = "_babel_plugin_syntax_do_expressions___plugin_syntax_do_expressions_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_syntax_do_expressions___plugin_syntax_do_expressions_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-do-expressions/-/plugin-syntax-do-expressions-7.2.0.tgz";
-        sha1 = "f3d4b01be05ecde2892086d7cfd5f1fa1ead5a2a";
-      };
-    }
-    {
-      name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz";
-        sha1 = "69c159ffaf4998122161ad8ebc5e6d1f55df8612";
-      };
-    }
-    {
-      name = "_babel_plugin_syntax_export_default_from___plugin_syntax_export_default_from_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_syntax_export_default_from___plugin_syntax_export_default_from_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.2.0.tgz";
-        sha1 = "edd83b7adc2e0d059e2467ca96c650ab6d2f3820";
-      };
-    }
-    {
-      name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.2.0.tgz";
-        sha1 = "8d257838c6b3b779db52c0224443459bd27fb039";
-      };
-    }
-    {
-      name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz";
-        sha1 = "a765f061f803bc48f240c26f8747faf97c26bf7c";
-      };
-    }
-    {
-      name = "_babel_plugin_syntax_function_bind___plugin_syntax_function_bind_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_syntax_function_bind___plugin_syntax_function_bind_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-function-bind/-/plugin-syntax-function-bind-7.2.0.tgz";
-        sha1 = "68fe85b0c0da67125f87bf239c68051b06c66309";
-      };
-    }
-    {
-      name = "_babel_plugin_syntax_function_sent___plugin_syntax_function_sent_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_syntax_function_sent___plugin_syntax_function_sent_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-function-sent/-/plugin-syntax-function-sent-7.2.0.tgz";
-        sha1 = "91474d4d400604e4c6cbd4d77cd6cb3b8565576c";
-      };
-    }
-    {
-      name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.2.0.tgz";
-        sha1 = "2333ef4b875553a3bcd1e93f8ebc09f5b9213a40";
-      };
-    }
-    {
-      name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz";
-        sha1 = "72bd13f6ffe1d25938129d2a186b11fd62951470";
-      };
-    }
-    {
-      name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz";
-        sha1 = "0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7";
-      };
-    }
-    {
-      name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.2.0.tgz";
-        sha1 = "fcab7388530e96c6f277ce494c55caa6c141fcfb";
-      };
-    }
-    {
-      name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.2.0.tgz";
-        sha1 = "f75083dfd5ade73e783db729bbd87e7b9efb7624";
-      };
-    }
-    {
-      name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.2.0.tgz";
-        sha1 = "7470fe070c2944469a756752a69a6963135018be";
-      };
-    }
-    {
-      name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz";
-        sha1 = "3b7a3e733510c57e820b9142a6579ac8b0dfad2e";
-      };
-    }
-    {
-      name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz";
-        sha1 = "a94013d6eda8908dfe6a477e7f9eda85656ecf5c";
-      };
-    }
-    {
-      name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.2.0.tgz";
-        sha1 = "a59d6ae8c167e7608eaa443fda9fa8fa6bf21dff";
-      };
-    }
-    {
-      name = "_babel_plugin_syntax_pipeline_operator___plugin_syntax_pipeline_operator_7.5.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_syntax_pipeline_operator___plugin_syntax_pipeline_operator_7.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-pipeline-operator/-/plugin-syntax-pipeline-operator-7.5.0.tgz";
-        sha1 = "8ea7c2c22847c797748bf07752722a317079dc1e";
-      };
-    }
-    {
-      name = "_babel_plugin_syntax_throw_expressions___plugin_syntax_throw_expressions_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_syntax_throw_expressions___plugin_syntax_throw_expressions_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-syntax-throw-expressions/-/plugin-syntax-throw-expressions-7.2.0.tgz";
-        sha1 = "79001ee2afe1b174b1733cdc2fc69c9a46a0f1f8";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz";
-        sha1 = "9aeafbe4d6ffc6563bf8f8372091628f00779550";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.5.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz";
-        sha1 = "89a3848a0166623b5bc481164b5936ab947e887e";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz";
-        sha1 = "5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.5.5.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.5.5.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz";
-        sha1 = "a35f395e5402822f10d2119f6f8e045e3639a2ce";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_classes___plugin_transform_classes_7.5.5.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_classes___plugin_transform_classes_7.5.5.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz";
-        sha1 = "d094299d9bd680a14a2a0edae38305ad60fb4de9";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz";
-        sha1 = "83a7df6a658865b1c8f641d510c6f3af220216da";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.5.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz";
-        sha1 = "f6c09fdfe3f94516ff074fe877db7bc9ef05855a";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.4.4.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.4.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz";
-        sha1 = "361a148bc951444312c69446d76ed1ea8e4450c3";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.5.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz";
-        sha1 = "c5dbf5106bf84cdf691222c0974c12b1df931853";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz";
-        sha1 = "a63868289e5b4007f7054d46491af51435766008";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.4.4.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.4.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz";
-        sha1 = "d267a081f49a8705fc9146de0768c6b58dccd8f7";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.4.4.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.4.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz";
-        sha1 = "0267fc735e24c808ba173866c6c4d1440fc3c556";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.4.4.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.4.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz";
-        sha1 = "e1436116abb0610c2259094848754ac5230922ad";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_literals___plugin_transform_literals_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_literals___plugin_transform_literals_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz";
-        sha1 = "690353e81f9267dad4fd8cfd77eafa86aba53ea1";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz";
-        sha1 = "fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.5.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz";
-        sha1 = "ef00435d46da0a5961aa728a1d2ecff063e4fb91";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.5.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz";
-        sha1 = "425127e6045231360858eeaa47a71d75eded7a74";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.5.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz";
-        sha1 = "e75266a13ef94202db2a0620977756f51d52d249";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz";
-        sha1 = "7678ce75169f0877b8eb2235538c074268dd01ae";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.4.5.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.4.5.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz";
-        sha1 = "9d269fd28a370258199b4294736813a60bbdd106";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.4.4.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.4.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz";
-        sha1 = "18d120438b0cc9ee95a47f2c72bc9768fbed60a5";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.5.5.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.5.5.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz";
-        sha1 = "c70021df834073c65eb613b8679cc4a381d1a9f9";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.4.4.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.4.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz";
-        sha1 = "7556cf03f318bd2719fe4c922d2d808be5571e16";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz";
-        sha1 = "03e33f653f5b25c4eb572c98b9485055b389e905";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz";
-        sha1 = "ebfaed87834ce8dc4279609a4f0c324c156e3eb0";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.2.0.tgz";
-        sha1 = "461e21ad9478f1031dd5e276108d027f1b5240ba";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.5.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.5.0.tgz";
-        sha1 = "583b10c49cf057e237085bcbd8cc960bd83bd96b";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.3.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz";
-        sha1 = "f2cab99026631c767e2745a5368b331cfe8f5290";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.4.5.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.4.5.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz";
-        sha1 = "629dc82512c55cee01341fb27bdfcb210354680f";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz";
-        sha1 = "4792af87c998a49367597d07fedf02636d2e1634";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz";
-        sha1 = "6333aee2f8d6ee7e28615457298934a3b46198f0";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_spread___plugin_transform_spread_7.2.2.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_spread___plugin_transform_spread_7.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz";
-        sha1 = "3103a9abe22f742b6d406ecd3cd49b774919b406";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz";
-        sha1 = "a1e454b5995560a9c1e0d537dfc15061fd2687e1";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.4.4.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.4.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz";
-        sha1 = "9d28fea7bbce637fb7612a0750989d8321d4bcb0";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.2.0.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz";
-        sha1 = "117d2bcec2fbf64b4b59d1f9819894682d29f2b2";
-      };
-    }
-    {
-      name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.4.4.tgz";
-      path = fetchurl {
-        name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.4.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz";
-        sha1 = "ab4634bb4f14d36728bf5978322b35587787970f";
-      };
-    }
-    {
-      name = "_babel_preset_env___preset_env_7.5.5.tgz";
-      path = fetchurl {
-        name = "_babel_preset_env___preset_env_7.5.5.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.5.5.tgz";
-        sha1 = "bc470b53acaa48df4b8db24a570d6da1fef53c9a";
-      };
-    }
-    {
-      name = "_babel_preset_flow___preset_flow_7.0.0.tgz";
-      path = fetchurl {
-        name = "_babel_preset_flow___preset_flow_7.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.0.0.tgz";
-        sha1 = "afd764835d9535ec63d8c7d4caf1c06457263da2";
-      };
-    }
-    {
-      name = "_babel_preset_react___preset_react_7.0.0.tgz";
-      path = fetchurl {
-        name = "_babel_preset_react___preset_react_7.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0.tgz";
-        sha1 = "e86b4b3d99433c7b3e9e91747e2653958bc6b3c0";
-      };
-    }
-    {
-      name = "_babel_preset_stage_0___preset_stage_0_7.0.0.tgz";
-      path = fetchurl {
-        name = "_babel_preset_stage_0___preset_stage_0_7.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/preset-stage-0/-/preset-stage-0-7.0.0.tgz";
-        sha1 = "999aaec79ee8f0a763042c68c06539c97c6e0646";
-      };
-    }
-    {
-      name = "_babel_template___template_7.4.4.tgz";
-      path = fetchurl {
-        name = "_babel_template___template_7.4.4.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz";
-        sha1 = "f4b88d1225689a08f5bc3a17483545be9e4ed237";
-      };
-    }
-    {
-      name = "_babel_traverse___traverse_7.5.5.tgz";
-      path = fetchurl {
-        name = "_babel_traverse___traverse_7.5.5.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.5.5.tgz";
-        sha1 = "f664f8f368ed32988cd648da9f72d5ca70f165bb";
-      };
-    }
-    {
-      name = "_babel_types___types_7.5.5.tgz";
-      path = fetchurl {
-        name = "_babel_types___types_7.5.5.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/types/-/types-7.5.5.tgz";
-        sha1 = "97b9f728e182785909aa4ab56264f090a028d18a";
+        name = "_babel_highlight___highlight_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz";
+        sha1 = "28f173d04223eaaa59bc1d439a3836e6d1265797";
       };
     }
     {
@@ -914,19 +66,19 @@
       };
     }
     {
-      name = "_types_body_parser___body_parser_1.17.0.tgz";
+      name = "_types_body_parser___body_parser_1.19.0.tgz";
       path = fetchurl {
-        name = "_types_body_parser___body_parser_1.17.0.tgz";
-        url  = "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.0.tgz";
-        sha1 = "9f5c9d9bd04bb54be32d5eb9fc0d8c974e6cf58c";
+        name = "_types_body_parser___body_parser_1.19.0.tgz";
+        url  = "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz";
+        sha1 = "0685b3c47eb3006ffed117cdd55164b61f80538f";
       };
     }
     {
-      name = "_types_connect___connect_3.4.32.tgz";
+      name = "_types_connect___connect_3.4.33.tgz";
       path = fetchurl {
-        name = "_types_connect___connect_3.4.32.tgz";
-        url  = "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.32.tgz";
-        sha1 = "aa0e9616b9435ccad02bc52b5b454ffc2c70ba28";
+        name = "_types_connect___connect_3.4.33.tgz";
+        url  = "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.33.tgz";
+        sha1 = "31610c901eca573b8713c3330abc6e6b9f588546";
       };
     }
     {
@@ -938,27 +90,35 @@
       };
     }
     {
-      name = "_types_express_serve_static_core___express_serve_static_core_4.16.6.tgz";
+      name = "_types_express_serve_static_core___express_serve_static_core_4.17.2.tgz";
       path = fetchurl {
-        name = "_types_express_serve_static_core___express_serve_static_core_4.16.6.tgz";
-        url  = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.16.6.tgz";
-        sha1 = "66d4b29ece3e2fb6e5aac2232723002426e651bd";
+        name = "_types_express_serve_static_core___express_serve_static_core_4.17.2.tgz";
+        url  = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.2.tgz";
+        sha1 = "f6f41fa35d42e79dbf6610eccbb2637e6008a0cf";
       };
     }
     {
-      name = "_types_express___express_4.16.1.tgz";
+      name = "_types_express___express_4.17.2.tgz";
       path = fetchurl {
-        name = "_types_express___express_4.16.1.tgz";
-        url  = "https://registry.yarnpkg.com/@types/express/-/express-4.16.1.tgz";
-        sha1 = "d756bd1a85c34d87eaf44c888bad27ba8a4b7cf0";
+        name = "_types_express___express_4.17.2.tgz";
+        url  = "https://registry.yarnpkg.com/@types/express/-/express-4.17.2.tgz";
+        sha1 = "a0fb7a23d8855bac31bc01d5a58cadd9b2173e6c";
       };
     }
     {
-      name = "_types_ldapjs___ldapjs_1.0.4.tgz";
+      name = "_types_geojson___geojson_7946.0.7.tgz";
       path = fetchurl {
-        name = "_types_ldapjs___ldapjs_1.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-1.0.4.tgz";
-        sha1 = "06774665035fbb277133d8cde800d18c7993707f";
+        name = "_types_geojson___geojson_7946.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz";
+        sha1 = "c8fa532b60a0042219cdf173ca21a975ef0666ad";
+      };
+    }
+    {
+      name = "_types_ldapjs___ldapjs_1.0.5.tgz";
+      path = fetchurl {
+        name = "_types_ldapjs___ldapjs_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-1.0.5.tgz";
+        sha1 = "2b078dff23dc068e12a8236b280d5fb4fd9db4db";
       };
     }
     {
@@ -970,27 +130,43 @@
       };
     }
     {
-      name = "_types_node___node_12.0.3.tgz";
+      name = "_types_node___node_13.7.1.tgz";
       path = fetchurl {
-        name = "_types_node___node_12.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/@types/node/-/node-12.0.3.tgz";
-        sha1 = "5d8d24e0033fc6393efadc85cb59c1f638095c9a";
+        name = "_types_node___node_13.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/@types/node/-/node-13.7.1.tgz";
+        sha1 = "238eb34a66431b71d2aaddeaa7db166f25971a0d";
       };
     }
     {
-      name = "_types_node___node_10.14.7.tgz";
+      name = "_types_node___node_10.17.15.tgz";
       path = fetchurl {
-        name = "_types_node___node_10.14.7.tgz";
-        url  = "https://registry.yarnpkg.com/@types/node/-/node-10.14.7.tgz";
-        sha1 = "1854f0a9aa8d2cd6818d607b3d091346c6730362";
+        name = "_types_node___node_10.17.15.tgz";
+        url  = "https://registry.yarnpkg.com/@types/node/-/node-10.17.15.tgz";
+        sha1 = "bfff4e23e9e70be6eec450419d51e18de1daf8e7";
       };
     }
     {
-      name = "_types_passport___passport_1.0.0.tgz";
+      name = "_types_node___node_12.12.27.tgz";
       path = fetchurl {
-        name = "_types_passport___passport_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/@types/passport/-/passport-1.0.0.tgz";
-        sha1 = "747fa127a747a145ff279f3df3e07c425e5ff297";
+        name = "_types_node___node_12.12.27.tgz";
+        url  = "https://registry.yarnpkg.com/@types/node/-/node-12.12.27.tgz";
+        sha1 = "d7506f73160ad30fcebbcf5b8b7d2d976e649e42";
+      };
+    }
+    {
+      name = "_types_node___node_8.10.59.tgz";
+      path = fetchurl {
+        name = "_types_node___node_8.10.59.tgz";
+        url  = "https://registry.yarnpkg.com/@types/node/-/node-8.10.59.tgz";
+        sha1 = "9e34261f30183f9777017a13d185dfac6b899e04";
+      };
+    }
+    {
+      name = "_types_passport___passport_1.0.2.tgz";
+      path = fetchurl {
+        name = "_types_passport___passport_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/@types/passport/-/passport-1.0.2.tgz";
+        sha1 = "f085033e2b301b1f97d4b57bfa73d8e934650c63";
       };
     }
     {
@@ -1010,19 +186,27 @@
       };
     }
     {
-      name = "_types_serve_static___serve_static_1.13.2.tgz";
+      name = "_types_readable_stream___readable_stream_2.3.5.tgz";
       path = fetchurl {
-        name = "_types_serve_static___serve_static_1.13.2.tgz";
-        url  = "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.2.tgz";
-        sha1 = "f5ac4d7a6420a99a6a45af4719f4dcd8cd907a48";
+        name = "_types_readable_stream___readable_stream_2.3.5.tgz";
+        url  = "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.5.tgz";
+        sha1 = "99c215f9c78563ebdfeff400246a724fb36bae4a";
       };
     }
     {
-      name = "_types_unist___unist_2.0.3.tgz";
+      name = "_types_serve_static___serve_static_1.13.3.tgz";
       path = fetchurl {
-        name = "_types_unist___unist_2.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz";
-        sha1 = "9c088679876f374eb5983f150d4787aa6fb32d7e";
+        name = "_types_serve_static___serve_static_1.13.3.tgz";
+        url  = "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.3.tgz";
+        sha1 = "eb7e1c41c4468272557e897e9171ded5e2ded9d1";
+      };
+    }
+    {
+      name = "_types_tunnel___tunnel_0.0.0.tgz";
+      path = fetchurl {
+        name = "_types_tunnel___tunnel_0.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@types/tunnel/-/tunnel-0.0.0.tgz";
+        sha1 = "c2a42943ee63c90652a5557b8c4e56cda77f944e";
       };
     }
     {
@@ -1201,14 +385,6 @@
           tar cf $out --mode u+w -C ${repo} .
         '';
   }
-    {
-      name = "JSONStream___JSONStream_1.3.5.tgz";
-      path = fetchurl {
-        name = "JSONStream___JSONStream_1.3.5.tgz";
-        url  = "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz";
-        sha1 = "3208c1f08d3a4d99261ab64f92302bc15e111ca0";
-      };
-    }
     {
       name = "JSV___JSV_4.0.2.tgz";
       path = fetchurl {
@@ -1218,11 +394,11 @@
       };
     }
     {
-      name = "abab___abab_2.0.0.tgz";
+      name = "abab___abab_2.0.3.tgz";
       path = fetchurl {
-        name = "abab___abab_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz";
-        sha1 = "aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f";
+        name = "abab___abab_2.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz";
+        sha1 = "623e2075e02eb2d3f2475e49f99c91846467907a";
       };
     }
     {
@@ -1250,27 +426,35 @@
       };
     }
     {
-      name = "acorn_globals___acorn_globals_4.3.2.tgz";
+      name = "acorn_globals___acorn_globals_4.3.4.tgz";
       path = fetchurl {
-        name = "acorn_globals___acorn_globals_4.3.2.tgz";
-        url  = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.2.tgz";
-        sha1 = "4e2c2313a597fd589720395f6354b41cd5ec8006";
+        name = "acorn_globals___acorn_globals_4.3.4.tgz";
+        url  = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz";
+        sha1 = "9fa1926addc11c97308c4e66d7add0d40c3272e7";
       };
     }
     {
-      name = "acorn_jsx___acorn_jsx_5.0.1.tgz";
+      name = "acorn_jsx___acorn_jsx_5.1.0.tgz";
       path = fetchurl {
-        name = "acorn_jsx___acorn_jsx_5.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz";
-        sha1 = "32a064fd925429216a09b141102bfdd185fae40e";
+        name = "acorn_jsx___acorn_jsx_5.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz";
+        sha1 = "294adb71b57398b0680015f0a38c563ee1db5384";
       };
     }
     {
-      name = "acorn_walk___acorn_walk_6.1.1.tgz";
+      name = "acorn_walk___acorn_walk_6.2.0.tgz";
       path = fetchurl {
-        name = "acorn_walk___acorn_walk_6.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz";
-        sha1 = "d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913";
+        name = "acorn_walk___acorn_walk_6.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz";
+        sha1 = "123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c";
+      };
+    }
+    {
+      name = "acorn_walk___acorn_walk_7.1.1.tgz";
+      path = fetchurl {
+        name = "acorn_walk___acorn_walk_7.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz";
+        sha1 = "345f0dffad5c735e7373d2fec9a1023e6a44b83e";
       };
     }
     {
@@ -1282,11 +466,27 @@
       };
     }
     {
-      name = "acorn___acorn_6.1.1.tgz";
+      name = "acorn___acorn_6.4.0.tgz";
       path = fetchurl {
-        name = "acorn___acorn_6.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz";
-        sha1 = "7d25ae05bb8ad1f9b699108e1094ecd7884adc1f";
+        name = "acorn___acorn_6.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz";
+        sha1 = "b659d2ffbafa24baf5db1cdbb2c94a983ecd2784";
+      };
+    }
+    {
+      name = "acorn___acorn_7.1.0.tgz";
+      path = fetchurl {
+        name = "acorn___acorn_7.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz";
+        sha1 = "949d36f2c292535da602283586c2477c57eb2d6c";
+      };
+    }
+    {
+      name = "adal_node___adal_node_0.1.28.tgz";
+      path = fetchurl {
+        name = "adal_node___adal_node_0.1.28.tgz";
+        url  = "https://registry.yarnpkg.com/adal-node/-/adal-node-0.1.28.tgz";
+        sha1 = "468c4bb3ebbd96b1270669f4b9cba4e0065ea485";
       };
     }
     {
@@ -1306,19 +506,19 @@
       };
     }
     {
-      name = "ajv_keywords___ajv_keywords_3.4.0.tgz";
+      name = "ajv_keywords___ajv_keywords_3.4.1.tgz";
       path = fetchurl {
-        name = "ajv_keywords___ajv_keywords_3.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz";
-        sha1 = "4b831e7b531415a7cc518cd404e73f6193c6349d";
+        name = "ajv_keywords___ajv_keywords_3.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz";
+        sha1 = "ef916e271c64ac12171fd8384eaae6b2345854da";
       };
     }
     {
-      name = "ajv___ajv_6.10.0.tgz";
+      name = "ajv___ajv_6.11.0.tgz";
       path = fetchurl {
-        name = "ajv___ajv_6.10.0.tgz";
-        url  = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz";
-        sha1 = "90d0d54439da587cd7e843bfb7045f50bd22bdf1";
+        name = "ajv___ajv_6.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz";
+        sha1 = "c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9";
       };
     }
     {
@@ -1337,14 +537,6 @@
         sha1 = "97a1119649b211ad33691d9f9f486a8ec9fbe0a3";
       };
     }
-    {
-      name = "ambi___ambi_2.5.0.tgz";
-      path = fetchurl {
-        name = "ambi___ambi_2.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/ambi/-/ambi-2.5.0.tgz";
-        sha1 = "7c8e372be48891157e7cea01cb6f9143d1f74220";
-      };
-    }
     {
       name = "ansi_colors___ansi_colors_3.2.4.tgz";
       path = fetchurl {
@@ -1361,22 +553,6 @@
         sha1 = "8780b98ff9dbf5638152d1f1fe5c1d7b4442976b";
       };
     }
-    {
-      name = "ansi_gray___ansi_gray_0.1.1.tgz";
-      path = fetchurl {
-        name = "ansi_gray___ansi_gray_0.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz";
-        sha1 = "2962cf54ec9792c48510a3deb524436861ef7251";
-      };
-    }
-    {
-      name = "ansi_html___ansi_html_0.0.7.tgz";
-      path = fetchurl {
-        name = "ansi_html___ansi_html_0.0.7.tgz";
-        url  = "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz";
-        sha1 = "813584021962a9e9e6fd039f940d12f56ca7859e";
-      };
-    }
     {
       name = "ansi_regex___ansi_regex_2.1.1.tgz";
       path = fetchurl {
@@ -1426,11 +602,11 @@
       };
     }
     {
-      name = "ansi_wrap___ansi_wrap_0.1.0.tgz";
+      name = "ansicolors___ansicolors_0.3.2.tgz";
       path = fetchurl {
-        name = "ansi_wrap___ansi_wrap_0.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz";
-        sha1 = "a82250ddb0015e9a27ca82e82ea603bbfa45efaf";
+        name = "ansicolors___ansicolors_0.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz";
+        sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979";
       };
     }
     {
@@ -1457,14 +633,6 @@
         sha1 = "bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb";
       };
     }
-    {
-      name = "append_buffer___append_buffer_1.0.2.tgz";
-      path = fetchurl {
-        name = "append_buffer___append_buffer_1.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz";
-        sha1 = "d8220cf466081525efea50614f3de6514dfa58f1";
-      };
-    }
     {
       name = "aproba___aproba_1.2.0.tgz";
       path = fetchurl {
@@ -1505,14 +673,6 @@
         sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911";
       };
     }
-    {
-      name = "argparse___argparse_0.1.16.tgz";
-      path = fetchurl {
-        name = "argparse___argparse_0.1.16.tgz";
-        url  = "https://registry.yarnpkg.com/argparse/-/argparse-0.1.16.tgz";
-        sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c";
-      };
-    }
     {
       name = "arr_diff___arr_diff_2.0.0.tgz";
       path = fetchurl {
@@ -1562,11 +722,11 @@
       };
     }
     {
-      name = "array_includes___array_includes_3.0.3.tgz";
+      name = "array_includes___array_includes_3.1.1.tgz";
       path = fetchurl {
-        name = "array_includes___array_includes_3.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz";
-        sha1 = "184b48f62d92d7452bb31b323165c7f8bd02266d";
+        name = "array_includes___array_includes_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz";
+        sha1 = "cdd67e6852bdf9c1215460786732255ed2459348";
       };
     }
     {
@@ -1601,6 +761,14 @@
         sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428";
       };
     }
+    {
+      name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz";
+      path = fetchurl {
+        name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz";
+        sha1 = "0de82b426b0318dbfdb940089e38b043d37f6c7b";
+      };
+    }
     {
       name = "arraybuffer.slice___arraybuffer.slice_0.0.7.tgz";
       path = fetchurl {
@@ -1690,11 +858,19 @@
       };
     }
     {
-      name = "async_limiter___async_limiter_1.0.0.tgz";
+      name = "async_limiter___async_limiter_1.0.1.tgz";
       path = fetchurl {
-        name = "async_limiter___async_limiter_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz";
-        sha1 = "78faed8c3d074ab81f22b4e985d79e8738f720f8";
+        name = "async_limiter___async_limiter_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz";
+        sha1 = "dd379e94f0db8310b08291f9d64c3209766617fd";
+      };
+    }
+    {
+      name = "async___async_3.1.1.tgz";
+      path = fetchurl {
+        name = "async___async_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/async/-/async-3.1.1.tgz";
+        sha1 = "dd3542db03de837979c9ebbca64ca01b06dc98df";
       };
     }
     {
@@ -1706,11 +882,11 @@
       };
     }
     {
-      name = "async___async_2.6.2.tgz";
+      name = "async___async_2.6.3.tgz";
       path = fetchurl {
-        name = "async___async_2.6.2.tgz";
-        url  = "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz";
-        sha1 = "18330ea7e6e313887f5d2f2a904bac6fe4dd5381";
+        name = "async___async_2.6.3.tgz";
+        url  = "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz";
+        sha1 = "d72625e2344a3656e3a3ad4fa749fa83299d82ff";
       };
     }
     {
@@ -1730,19 +906,19 @@
       };
     }
     {
-      name = "autolinker___autolinker_0.15.3.tgz";
+      name = "autolinker___autolinker_3.12.0.tgz";
       path = fetchurl {
-        name = "autolinker___autolinker_0.15.3.tgz";
-        url  = "https://registry.yarnpkg.com/autolinker/-/autolinker-0.15.3.tgz";
-        sha1 = "342417d8f2f3461b14cf09088d5edf8791dc9832";
+        name = "autolinker___autolinker_3.12.0.tgz";
+        url  = "https://registry.yarnpkg.com/autolinker/-/autolinker-3.12.0.tgz";
+        sha1 = "1184397c85828041975a3b3135032b7b931966c6";
       };
     }
     {
-      name = "aws_sdk___aws_sdk_2.465.0.tgz";
+      name = "aws_sdk___aws_sdk_2.619.0.tgz";
       path = fetchurl {
-        name = "aws_sdk___aws_sdk_2.465.0.tgz";
-        url  = "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.465.0.tgz";
-        sha1 = "60948a0930473f50bac23311bc48426118e79f12";
+        name = "aws_sdk___aws_sdk_2.619.0.tgz";
+        url  = "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.619.0.tgz";
+        sha1 = "daacd97fb8d948c10278071129c12908039ab542";
       };
     }
     {
@@ -1754,11 +930,19 @@
       };
     }
     {
-      name = "aws4___aws4_1.8.0.tgz";
+      name = "aws4___aws4_1.9.1.tgz";
       path = fetchurl {
-        name = "aws4___aws4_1.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz";
-        sha1 = "f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f";
+        name = "aws4___aws4_1.9.1.tgz";
+        url  = "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz";
+        sha1 = "7e33d8f7d449b3f673cd72deb9abdc552dbe528e";
+      };
+    }
+    {
+      name = "axios___axios_0.19.2.tgz";
+      path = fetchurl {
+        name = "axios___axios_0.19.2.tgz";
+        url  = "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz";
+        sha1 = "3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27";
       };
     }
     {
@@ -1921,14 +1105,6 @@
         sha1 = "35157b101426fd2ffd3da3f75c7d1e91835bbf8a";
       };
     }
-    {
-      name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.0.tgz";
-      path = fetchurl {
-        name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz";
-        sha1 = "f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f";
-      };
-    }
     {
       name = "babel_plugin_syntax_async_functions___babel_plugin_syntax_async_functions_6.13.0.tgz";
       path = fetchurl {
@@ -2225,14 +1401,6 @@
         sha1 = "a3b073f94ab49eb6fa55cd65227a334380632497";
       };
     }
-    {
-      name = "babelify___babelify_10.0.0.tgz";
-      path = fetchurl {
-        name = "babelify___babelify_10.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/babelify/-/babelify-10.0.0.tgz";
-        sha1 = "fe73b1a22583f06680d8d072e25a1e0d1d1d7fb5";
-      };
-    }
     {
       name = "babylon___babylon_6.18.0.tgz";
       path = fetchurl {
@@ -2257,14 +1425,6 @@
         sha1 = "f616eda9d3e4b66b8ca7fca79f695722c5f8e26f";
       };
     }
-    {
-      name = "bail___bail_1.0.4.tgz";
-      path = fetchurl {
-        name = "bail___bail_1.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/bail/-/bail-1.0.4.tgz";
-        sha1 = "7181b66d508aa3055d3f6c13f0a0c720641dde9b";
-      };
-    }
     {
       name = "balanced_match___balanced_match_1.0.0.tgz";
       path = fetchurl {
@@ -2282,11 +1442,11 @@
       };
     }
     {
-      name = "base64_js___base64_js_1.3.0.tgz";
+      name = "base64_js___base64_js_1.3.1.tgz";
       path = fetchurl {
-        name = "base64_js___base64_js_1.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz";
-        sha1 = "cab1e6118f051095e58b5281aea8c1cd22bfc0e3";
+        name = "base64_js___base64_js_1.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz";
+        sha1 = "58ece8cb75dd07e71ed08c736abc5fac4dbf8df1";
       };
     }
     {
@@ -2345,22 +1505,6 @@
         sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522";
       };
     }
-    {
-      name = "big_number___big_number_0.3.1.tgz";
-      path = fetchurl {
-        name = "big_number___big_number_0.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/big-number/-/big-number-0.3.1.tgz";
-        sha1 = "ac73020c0a59bb79eb17c2ce2db77f77d974e013";
-      };
-    }
-    {
-      name = "big.js___big.js_3.2.0.tgz";
-      path = fetchurl {
-        name = "big.js___big.js_3.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz";
-        sha1 = "a5fc298b81b9e0dca2e458824784b65c52ba588e";
-      };
-    }
     {
       name = "big.js___big.js_5.2.2.tgz";
       path = fetchurl {
@@ -2377,6 +1521,14 @@
         sha1 = "598afe54755b2868a5330d2aff9d4ebb53209b65";
       };
     }
+    {
+      name = "bindings___bindings_1.5.0.tgz";
+      path = fetchurl {
+        name = "bindings___bindings_1.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz";
+        sha1 = "10353c9e945334bc0511a6d90b38fbc7c9c504df";
+      };
+    }
     {
       name = "bl___bl_1.2.2.tgz";
       path = fetchurl {
@@ -2386,11 +1538,19 @@
       };
     }
     {
-      name = "blint___blint_1.0.3.tgz";
+      name = "bl___bl_3.0.0.tgz";
       path = fetchurl {
-        name = "blint___blint_1.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/blint/-/blint-1.0.3.tgz";
-        sha1 = "a58d344ae4bf0ebb917316cfa3a5948e8d92fe10";
+        name = "bl___bl_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/bl/-/bl-3.0.0.tgz";
+        sha1 = "3611ec00579fd18561754360b21e9f784500ff88";
+      };
+    }
+    {
+      name = "blint___blint_1.1.0.tgz";
+      path = fetchurl {
+        name = "blint___blint_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/blint/-/blint-1.1.0.tgz";
+        sha1 = "9fcc8134296651099062f8d2ee359e83c7bff8ba";
       };
     }
     {
@@ -2410,11 +1570,11 @@
       };
     }
     {
-      name = "bluebird___bluebird_3.5.5.tgz";
+      name = "bluebird___bluebird_3.7.2.tgz";
       path = fetchurl {
-        name = "bluebird___bluebird_3.5.5.tgz";
-        url  = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz";
-        sha1 = "a8d0afd73251effbbd5fe384a77d73003c17a71f";
+        name = "bluebird___bluebird_3.7.2.tgz";
+        url  = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz";
+        sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f";
       };
     }
     {
@@ -2433,14 +1593,6 @@
         sha1 = "96b2709e57c9c4e09a6fd66a8fd979844f69f08a";
       };
     }
-    {
-      name = "body___body_5.1.0.tgz";
-      path = fetchurl {
-        name = "body___body_5.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz";
-        sha1 = "e4ba0ce410a46936323367609ecb4e6553125069";
-      };
-    }
     {
       name = "boolbase___boolbase_1.0.0.tgz";
       path = fetchurl {
@@ -2465,6 +1617,14 @@
         sha1 = "c3a347d419e289ad11f4033e3c4132b87c081d72";
       };
     }
+    {
+      name = "bowser___bowser_2.9.0.tgz";
+      path = fetchurl {
+        name = "bowser___bowser_2.9.0.tgz";
+        url  = "https://registry.yarnpkg.com/bowser/-/bowser-2.9.0.tgz";
+        sha1 = "3bed854233b419b9a7422d9ee3e85504373821c9";
+      };
+    }
     {
       name = "brace_expansion___brace_expansion_1.1.11.tgz";
       path = fetchurl {
@@ -2505,14 +1665,6 @@
         sha1 = "616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4";
       };
     }
-    {
-      name = "browser_resolve___browser_resolve_1.11.3.tgz";
-      path = fetchurl {
-        name = "browser_resolve___browser_resolve_1.11.3.tgz";
-        url  = "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz";
-        sha1 = "9b7cbb3d0f510e4cb86bdbd796124d28b5890af6";
-      };
-    }
     {
       name = "browser_stdout___browser_stdout_1.3.1.tgz";
       path = fetchurl {
@@ -2586,27 +1738,19 @@
       };
     }
     {
-      name = "browserslist___browserslist_4.6.1.tgz";
+      name = "browserslist___browserslist_4.8.7.tgz";
       path = fetchurl {
-        name = "browserslist___browserslist_4.6.1.tgz";
-        url  = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.1.tgz";
-        sha1 = "ee5059b1aec18cbec9d055d6cb5e24ae50343a9b";
+        name = "browserslist___browserslist_4.8.7.tgz";
+        url  = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.7.tgz";
+        sha1 = "ec8301ff415e6a42c949d0e66b405eb539c532d0";
       };
     }
     {
-      name = "browserslist___browserslist_4.6.6.tgz";
+      name = "buble___buble_0.19.8.tgz";
       path = fetchurl {
-        name = "browserslist___browserslist_4.6.6.tgz";
-        url  = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.6.tgz";
-        sha1 = "6e4bf467cde520bc9dbdf3747dafa03531cec453";
-      };
-    }
-    {
-      name = "buble___buble_0.19.7.tgz";
-      path = fetchurl {
-        name = "buble___buble_0.19.7.tgz";
-        url  = "https://registry.yarnpkg.com/buble/-/buble-0.19.7.tgz";
-        sha1 = "1dfd080ab688101aad5388d3304bc82601a244fd";
+        name = "buble___buble_0.19.8.tgz";
+        url  = "https://registry.yarnpkg.com/buble/-/buble-0.19.8.tgz";
+        sha1 = "d642f0081afab66dccd897d7b6360d94030b9d3d";
       };
     }
     {
@@ -2634,11 +1778,11 @@
       };
     }
     {
-      name = "buffer_equal___buffer_equal_1.0.0.tgz";
+      name = "buffer_equal_constant_time___buffer_equal_constant_time_1.0.1.tgz";
       path = fetchurl {
-        name = "buffer_equal___buffer_equal_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz";
-        sha1 = "59616b498304d556abd466966b22eeda3eca5fbe";
+        name = "buffer_equal_constant_time___buffer_equal_constant_time_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz";
+        sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819";
       };
     }
     {
@@ -2658,19 +1802,11 @@
       };
     }
     {
-      name = "buffer_shims___buffer_shims_1.0.0.tgz";
+      name = "buffer_writer___buffer_writer_2.0.0.tgz";
       path = fetchurl {
-        name = "buffer_shims___buffer_shims_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz";
-        sha1 = "9978ce317388c649ad8793028c3477ef044a8b51";
-      };
-    }
-    {
-      name = "buffer_writer___buffer_writer_1.0.1.tgz";
-      path = fetchurl {
-        name = "buffer_writer___buffer_writer_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-1.0.1.tgz";
-        sha1 = "22a936901e3029afcd7547eb4487ceb697a3bf08";
+        name = "buffer_writer___buffer_writer_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz";
+        sha1 = "ce7eb81a38f7829db09c873f2fbb792c0c98ec04";
       };
     }
     {
@@ -2690,11 +1826,19 @@
       };
     }
     {
-      name = "buffer___buffer_5.2.1.tgz";
+      name = "buffer___buffer_4.9.2.tgz";
       path = fetchurl {
-        name = "buffer___buffer_5.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/buffer/-/buffer-5.2.1.tgz";
-        sha1 = "dd57fa0f109ac59c602479044dca7b8b3d0b71d6";
+        name = "buffer___buffer_4.9.2.tgz";
+        url  = "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz";
+        sha1 = "230ead344002988644841ab0244af8c44bbe3ef8";
+      };
+    }
+    {
+      name = "buffer___buffer_5.4.3.tgz";
+      path = fetchurl {
+        name = "buffer___buffer_5.4.3.tgz";
+        url  = "https://registry.yarnpkg.com/buffer/-/buffer-5.4.3.tgz";
+        sha1 = "3fbc9c69eb713d323e3fc1a895eee0710c072115";
       };
     }
     {
@@ -2721,14 +1865,6 @@
         sha1 = "f150f0f6748abdd72aeae84f04403be2ef113797";
       };
     }
-    {
-      name = "bytes___bytes_1.0.0.tgz";
-      path = fetchurl {
-        name = "bytes___bytes_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz";
-        sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
-      };
-    }
     {
       name = "bytes___bytes_3.0.0.tgz";
       path = fetchurl {
@@ -2746,19 +1882,11 @@
       };
     }
     {
-      name = "cacache___cacache_10.0.4.tgz";
+      name = "cacache___cacache_12.0.3.tgz";
       path = fetchurl {
-        name = "cacache___cacache_10.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz";
-        sha1 = "6452367999eff9d4188aefd9a14e9d7c6a263460";
-      };
-    }
-    {
-      name = "cacache___cacache_11.3.2.tgz";
-      path = fetchurl {
-        name = "cacache___cacache_11.3.2.tgz";
-        url  = "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz";
-        sha1 = "2d81e308e3d258ca38125b676b98b2ac9ce69bfa";
+        name = "cacache___cacache_12.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz";
+        sha1 = "be99abba4e1bf5df461cd5a2c1071fc432573390";
       };
     }
     {
@@ -2769,14 +1897,6 @@
         sha1 = "0a7f46416831c8b662ee36fe4e7c59d76f666ab2";
       };
     }
-    {
-      name = "cached_path_relative___cached_path_relative_1.0.2.tgz";
-      path = fetchurl {
-        name = "cached_path_relative___cached_path_relative_1.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.2.tgz";
-        sha1 = "a13df4196d26776220cc3356eb147a52dba2c6db";
-      };
-    }
     {
       name = "caller_callsite___caller_callsite_2.0.0.tgz";
       path = fetchurl {
@@ -2858,19 +1978,19 @@
       };
     }
     {
-      name = "caniuse_lite___caniuse_lite_1.0.30000971.tgz";
+      name = "caniuse_lite___caniuse_lite_1.0.30001027.tgz";
       path = fetchurl {
-        name = "caniuse_lite___caniuse_lite_1.0.30000971.tgz";
-        url  = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000971.tgz";
-        sha1 = "d1000e4546486a6977756547352bc96a4cfd2b13";
+        name = "caniuse_lite___caniuse_lite_1.0.30001027.tgz";
+        url  = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001027.tgz";
+        sha1 = "283e2ef17d94889cc216a22c6f85303d78ca852d";
       };
     }
     {
-      name = "caniuse_lite___caniuse_lite_1.0.30000988.tgz";
+      name = "cardinal___cardinal_2.1.1.tgz";
       path = fetchurl {
-        name = "caniuse_lite___caniuse_lite_1.0.30000988.tgz";
-        url  = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000988.tgz";
-        sha1 = "742f35ec1b8b75b9628d705d7652eea1fef983db";
+        name = "cardinal___cardinal_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/cardinal/-/cardinal-2.1.1.tgz";
+        sha1 = "7cc1055d822d212954d07b085dea251cc7bc5505";
       };
     }
     {
@@ -2881,14 +2001,6 @@
         sha1 = "1b681c21ff84033c826543090689420d187151dc";
       };
     }
-    {
-      name = "ccount___ccount_1.0.4.tgz";
-      path = fetchurl {
-        name = "ccount___ccount_1.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/ccount/-/ccount-1.0.4.tgz";
-        sha1 = "9cf2de494ca84060a2a8d2854edd6dfb0445f386";
-      };
-    }
     {
       name = "center_align___center_align_0.1.3.tgz";
       path = fetchurl {
@@ -2897,14 +2009,6 @@
         sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
       };
     }
-    {
-      name = "chalk___chalk_1.1.3.tgz";
-      path = fetchurl {
-        name = "chalk___chalk_1.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz";
-        sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
-      };
-    }
     {
       name = "chalk___chalk_2.4.2.tgz";
       path = fetchurl {
@@ -2913,6 +2017,14 @@
         sha1 = "cd42541677a54333cf541a49108c1432b44c9424";
       };
     }
+    {
+      name = "chalk___chalk_1.1.3.tgz";
+      path = fetchurl {
+        name = "chalk___chalk_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz";
+        sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
+      };
+    }
     {
       name = "chalk___chalk_0.4.0.tgz";
       path = fetchurl {
@@ -2922,43 +2034,11 @@
       };
     }
     {
-      name = "chance___chance_1.0.18.tgz";
+      name = "chance___chance_1.1.4.tgz";
       path = fetchurl {
-        name = "chance___chance_1.0.18.tgz";
-        url  = "https://registry.yarnpkg.com/chance/-/chance-1.0.18.tgz";
-        sha1 = "79788fe6fca4c338bf404321c347eecc80f969ee";
-      };
-    }
-    {
-      name = "character_entities_html4___character_entities_html4_1.1.3.tgz";
-      path = fetchurl {
-        name = "character_entities_html4___character_entities_html4_1.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.3.tgz";
-        sha1 = "5ce6e01618e47048ac22f34f7f39db5c6fd679ef";
-      };
-    }
-    {
-      name = "character_entities_legacy___character_entities_legacy_1.1.3.tgz";
-      path = fetchurl {
-        name = "character_entities_legacy___character_entities_legacy_1.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.3.tgz";
-        sha1 = "3c729991d9293da0ede6dddcaf1f2ce1009ee8b4";
-      };
-    }
-    {
-      name = "character_entities___character_entities_1.2.3.tgz";
-      path = fetchurl {
-        name = "character_entities___character_entities_1.2.3.tgz";
-        url  = "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.3.tgz";
-        sha1 = "bbed4a52fe7ef98cc713c6d80d9faa26916d54e6";
-      };
-    }
-    {
-      name = "character_reference_invalid___character_reference_invalid_1.1.3.tgz";
-      path = fetchurl {
-        name = "character_reference_invalid___character_reference_invalid_1.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.3.tgz";
-        sha1 = "1647f4f726638d3ea4a750cf5d1975c1c7919a85";
+        name = "chance___chance_1.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/chance/-/chance-1.1.4.tgz";
+        sha1 = "d8743bf8e40bb05e024c305ca1ff441195eb23db";
       };
     }
     {
@@ -2986,19 +2066,19 @@
       };
     }
     {
-      name = "chokidar___chokidar_2.1.6.tgz";
+      name = "chokidar___chokidar_2.1.8.tgz";
       path = fetchurl {
-        name = "chokidar___chokidar_2.1.6.tgz";
-        url  = "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.6.tgz";
-        sha1 = "b6cad653a929e244ce8a834244164d241fa954c5";
+        name = "chokidar___chokidar_2.1.8.tgz";
+        url  = "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz";
+        sha1 = "804b3a7b6a99358c3c5c61e71d8728f041cff917";
       };
     }
     {
-      name = "chownr___chownr_1.1.1.tgz";
+      name = "chownr___chownr_1.1.4.tgz";
       path = fetchurl {
-        name = "chownr___chownr_1.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz";
-        sha1 = "54726b8b8fff4df053c42187e801fb4412df1494";
+        name = "chownr___chownr_1.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz";
+        sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b";
       };
     }
     {
@@ -3026,11 +2106,11 @@
       };
     }
     {
-      name = "clean_css___clean_css_4.2.1.tgz";
+      name = "clean_css___clean_css_4.2.3.tgz";
       path = fetchurl {
-        name = "clean_css___clean_css_4.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz";
-        sha1 = "2d411ef76b8569b6d0c84068dabe85b0aa5e5c17";
+        name = "clean_css___clean_css_4.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz";
+        sha1 = "507b5de7d97b48ee53d84adb0160ff6216380f78";
       };
     }
     {
@@ -3073,14 +2153,6 @@
         sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
       };
     }
-    {
-      name = "cliui___cliui_4.1.0.tgz";
-      path = fetchurl {
-        name = "cliui___cliui_4.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz";
-        sha1 = "348422dbe82d800b3022eef4f6ac10bf2e4d1b49";
-      };
-    }
     {
       name = "cliui___cliui_5.0.0.tgz";
       path = fetchurl {
@@ -3089,22 +2161,6 @@
         sha1 = "deefcfdb2e800784aa34f46fa08e06851c7bbbc5";
       };
     }
-    {
-      name = "clone_buffer___clone_buffer_1.0.0.tgz";
-      path = fetchurl {
-        name = "clone_buffer___clone_buffer_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz";
-        sha1 = "e3e25b207ac4e701af721e2cb5a16792cac3dc58";
-      };
-    }
-    {
-      name = "clone_stats___clone_stats_1.0.0.tgz";
-      path = fetchurl {
-        name = "clone_stats___clone_stats_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz";
-        sha1 = "b3782dff8bb5474e18b9b6bf0fdfe782f8777680";
-      };
-    }
     {
       name = "clone___clone_2.1.2.tgz";
       path = fetchurl {
@@ -3113,14 +2169,6 @@
         sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f";
       };
     }
-    {
-      name = "cloneable_readable___cloneable_readable_1.1.3.tgz";
-      path = fetchurl {
-        name = "cloneable_readable___cloneable_readable_1.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz";
-        sha1 = "120a00cb053bfb63a222e709f9683ea2e11d8cec";
-      };
-    }
     {
       name = "cls_bluebird___cls_bluebird_2.1.0.tgz";
       path = fetchurl {
@@ -3151,8 +2199,8 @@
       let
         repo = fetchgit {
           url = "https://github.com/hackmdio/CodeMirror.git";
-          rev = "8ce8e8820da8f51d852bda1e0b9a5394eb8ea8d3";
-          sha256 = "16qr61h1rrl6m627r29dvj991yvqvzja12sazp439mnz6px5zaj4";
+          rev = "2ac9b9f25707606b0c09b99decaf9d08dd434570";
+          sha256 = "0aw6lixljaj0z8dbak0s60qfyk48qs747fw249qa4s9i6gb7f48v";
         };
       in
         runCommandNoCC "CodeMirror.git" { buildInputs = [gnutar]; } ''
@@ -3161,14 +2209,6 @@
           tar cf $out --mode u+w -C ${repo} .
         '';
   }
-    {
-      name = "collapse_white_space___collapse_white_space_1.0.5.tgz";
-      path = fetchurl {
-        name = "collapse_white_space___collapse_white_space_1.0.5.tgz";
-        url  = "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.5.tgz";
-        sha1 = "c2495b699ab1ed380d29a1091e01063e75dbbe3a";
-      };
-    }
     {
       name = "collection_visit___collection_visit_1.0.0.tgz";
       path = fetchurl {
@@ -3209,14 +2249,6 @@
         sha1 = "c9bbc5f01b58b5492f3d6857459cb6590ce204cc";
       };
     }
-    {
-      name = "color_support___color_support_1.1.3.tgz";
-      path = fetchurl {
-        name = "color_support___color_support_1.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz";
-        sha1 = "93834379a1cc9a0c61f82f52f0d04322251bd5a2";
-      };
-    }
     {
       name = "color___color_3.0.0.tgz";
       path = fetchurl {
@@ -3226,11 +2258,11 @@
       };
     }
     {
-      name = "color___color_3.1.1.tgz";
+      name = "color___color_3.1.2.tgz";
       path = fetchurl {
-        name = "color___color_3.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/color/-/color-3.1.1.tgz";
-        sha1 = "7abf5c0d38e89378284e873c207ae2172dcc8a61";
+        name = "color___color_3.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/color/-/color-3.1.2.tgz";
+        sha1 = "68148e7f85d41ad7649c5fa8c8106f098d229e10";
       };
     }
     {
@@ -3242,11 +2274,11 @@
       };
     }
     {
-      name = "colors___colors_1.3.3.tgz";
+      name = "colors___colors_1.4.0.tgz";
       path = fetchurl {
-        name = "colors___colors_1.3.3.tgz";
-        url  = "https://registry.yarnpkg.com/colors/-/colors-1.3.3.tgz";
-        sha1 = "39e005d546afe01e01f9c4ca8fa50f686a01205d";
+        name = "colors___colors_1.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz";
+        sha1 = "c50491479d4c1bdaed2c9ced32cf7c7dc2360f78";
       };
     }
     {
@@ -3266,19 +2298,11 @@
       };
     }
     {
-      name = "comma_separated_tokens___comma_separated_tokens_1.0.7.tgz";
+      name = "commander___commander_2.20.3.tgz";
       path = fetchurl {
-        name = "comma_separated_tokens___comma_separated_tokens_1.0.7.tgz";
-        url  = "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.7.tgz";
-        sha1 = "419cd7fb3258b1ed838dc0953167a25e152f5b59";
-      };
-    }
-    {
-      name = "commander___commander_2.20.0.tgz";
-      path = fetchurl {
-        name = "commander___commander_2.20.0.tgz";
-        url  = "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz";
-        sha1 = "d58bb2b5c1ee8f87b0d340027e9e94e222c5a422";
+        name = "commander___commander_2.20.3.tgz";
+        url  = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz";
+        sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33";
       };
     }
     {
@@ -3290,27 +2314,19 @@
       };
     }
     {
-      name = "commander___commander_2.17.1.tgz";
+      name = "commander___commander_3.0.2.tgz";
       path = fetchurl {
-        name = "commander___commander_2.17.1.tgz";
-        url  = "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz";
-        sha1 = "bd77ab7de6de94205ceacc72f1716d29f20a77bf";
+        name = "commander___commander_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz";
+        sha1 = "6837c3fb677ad9933d1cfba42dd14d5117d6b39e";
       };
     }
     {
-      name = "commander___commander_2.13.0.tgz";
+      name = "commander___commander_4.1.1.tgz";
       path = fetchurl {
-        name = "commander___commander_2.13.0.tgz";
-        url  = "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz";
-        sha1 = "6964bca67685df7c1f1430c584f07d7597885b9c";
-      };
-    }
-    {
-      name = "commander___commander_2.19.0.tgz";
-      path = fetchurl {
-        name = "commander___commander_2.19.0.tgz";
-        url  = "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz";
-        sha1 = "f6198aa84e5b83c46054b94ddedbfed5ee9ff12a";
+        name = "commander___commander_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz";
+        sha1 = "9fd602bd936294e9e9ef46a3f4d6964044b18068";
       };
     }
     {
@@ -3362,11 +2378,11 @@
       };
     }
     {
-      name = "compressible___compressible_2.0.17.tgz";
+      name = "compressible___compressible_2.0.18.tgz";
       path = fetchurl {
-        name = "compressible___compressible_2.0.17.tgz";
-        url  = "https://registry.yarnpkg.com/compressible/-/compressible-2.0.17.tgz";
-        sha1 = "6e8c108a16ad58384a977f3a482ca20bff2f38c1";
+        name = "compressible___compressible_2.0.18.tgz";
+        url  = "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz";
+        sha1 = "af53cca6b070d4c3c0750fbd77286a6d7cc46fba";
       };
     }
     {
@@ -3393,14 +2409,6 @@
         sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34";
       };
     }
-    {
-      name = "concat_stream___concat_stream_1.5.2.tgz";
-      path = fetchurl {
-        name = "concat_stream___concat_stream_1.5.2.tgz";
-        url  = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz";
-        sha1 = "708978624d856af41a5a741defdd261da752c266";
-      };
-    }
     {
       name = "config_chain___config_chain_1.1.12.tgz";
       path = fetchurl {
@@ -3418,19 +2426,19 @@
       };
     }
     {
-      name = "connect_session_sequelize___connect_session_sequelize_6.0.0.tgz";
+      name = "connect_session_sequelize___connect_session_sequelize_6.1.1.tgz";
       path = fetchurl {
-        name = "connect_session_sequelize___connect_session_sequelize_6.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/connect-session-sequelize/-/connect-session-sequelize-6.0.0.tgz";
-        sha1 = "afd4456c65d92c9b6b955fdff00afff795e8a420";
+        name = "connect_session_sequelize___connect_session_sequelize_6.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/connect-session-sequelize/-/connect-session-sequelize-6.1.1.tgz";
+        sha1 = "0155d01fbffc67352df795aa53b7ab397ab95094";
       };
     }
     {
-      name = "console_browserify___console_browserify_1.1.0.tgz";
+      name = "console_browserify___console_browserify_1.2.0.tgz";
       path = fetchurl {
-        name = "console_browserify___console_browserify_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz";
-        sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10";
+        name = "console_browserify___console_browserify_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz";
+        sha1 = "67063cef57ceb6cf4993a2ab3a55840ae8c49336";
       };
     }
     {
@@ -3466,11 +2474,11 @@
       };
     }
     {
-      name = "content_security_policy_builder___content_security_policy_builder_2.0.0.tgz";
+      name = "content_security_policy_builder___content_security_policy_builder_2.1.0.tgz";
       path = fetchurl {
-        name = "content_security_policy_builder___content_security_policy_builder_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/content-security-policy-builder/-/content-security-policy-builder-2.0.0.tgz";
-        sha1 = "8749a1d542fcbe82237281ea9f716ce68b394dd2";
+        name = "content_security_policy_builder___content_security_policy_builder_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/content-security-policy-builder/-/content-security-policy-builder-2.1.0.tgz";
+        sha1 = "0a2364d769a3d7014eec79ff7699804deb8cfcbb";
       };
     }
     {
@@ -3482,19 +2490,11 @@
       };
     }
     {
-      name = "continuable_cache___continuable_cache_0.3.1.tgz";
+      name = "convert_source_map___convert_source_map_1.7.0.tgz";
       path = fetchurl {
-        name = "continuable_cache___continuable_cache_0.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz";
-        sha1 = "bd727a7faed77e71ff3985ac93351a912733ad0f";
-      };
-    }
-    {
-      name = "convert_source_map___convert_source_map_1.6.0.tgz";
-      path = fetchurl {
-        name = "convert_source_map___convert_source_map_1.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz";
-        sha1 = "51b537a8c43e0f04dec1993bffcdd504e758ac20";
+        name = "convert_source_map___convert_source_map_1.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz";
+        sha1 = "17a2cb882d7f77d3490585e2ce6c524424a3a442";
       };
     }
     {
@@ -3554,35 +2554,19 @@
       };
     }
     {
-      name = "copy_webpack_plugin___copy_webpack_plugin_4.6.0.tgz";
+      name = "copy_webpack_plugin___copy_webpack_plugin_5.1.1.tgz";
       path = fetchurl {
-        name = "copy_webpack_plugin___copy_webpack_plugin_4.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz";
-        sha1 = "e7f40dd8a68477d405dd1b7a854aae324b158bae";
+        name = "copy_webpack_plugin___copy_webpack_plugin_5.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz";
+        sha1 = "5481a03dea1123d88a988c6ff8b78247214f0b88";
       };
     }
     {
-      name = "core_js_compat___core_js_compat_3.1.4.tgz";
+      name = "core_js___core_js_2.6.11.tgz";
       path = fetchurl {
-        name = "core_js_compat___core_js_compat_3.1.4.tgz";
-        url  = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.1.4.tgz";
-        sha1 = "e4d0c40fbd01e65b1d457980fe4112d4358a7408";
-      };
-    }
-    {
-      name = "core_js_pure___core_js_pure_3.1.4.tgz";
-      path = fetchurl {
-        name = "core_js_pure___core_js_pure_3.1.4.tgz";
-        url  = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.1.4.tgz";
-        sha1 = "5fa17dc77002a169a3566cc48dc774d2e13e3769";
-      };
-    }
-    {
-      name = "core_js___core_js_2.6.9.tgz";
-      path = fetchurl {
-        name = "core_js___core_js_2.6.9.tgz";
-        url  = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz";
-        sha1 = "6b4b214620c834152e179323727fc19741b084f2";
+        name = "core_js___core_js_2.6.11.tgz";
+        url  = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz";
+        sha1 = "38831469f9922bded8ee21c9dc46985e0399308c";
       };
     }
     {
@@ -3658,11 +2642,11 @@
       };
     }
     {
-      name = "csextends___csextends_1.2.0.tgz";
+      name = "crypto_random_string___crypto_random_string_3.1.0.tgz";
       path = fetchurl {
-        name = "csextends___csextends_1.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/csextends/-/csextends-1.2.0.tgz";
-        sha1 = "6374b210984b54d4495f29c99d3dd069b80543e5";
+        name = "crypto_random_string___crypto_random_string_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-3.1.0.tgz";
+        sha1 = "0368382de82e914179ad2ca9c7a788e260184bae";
       };
     }
     {
@@ -3690,11 +2674,11 @@
       };
     }
     {
-      name = "css_loader___css_loader_1.0.1.tgz";
+      name = "css_loader___css_loader_3.4.2.tgz";
       path = fetchurl {
-        name = "css_loader___css_loader_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/css-loader/-/css-loader-1.0.1.tgz";
-        sha1 = "6885bb5233b35ec47b006057da01cc640b6b79fe";
+        name = "css_loader___css_loader_3.4.2.tgz";
+        url  = "https://registry.yarnpkg.com/css-loader/-/css-loader-3.4.2.tgz";
+        sha1 = "d3fdb3358b43f233b78501c5ed7b1c6da6133202";
       };
     }
     {
@@ -3714,35 +2698,19 @@
       };
     }
     {
-      name = "css_select___css_select_2.0.2.tgz";
+      name = "css_select___css_select_2.1.0.tgz";
       path = fetchurl {
-        name = "css_select___css_select_2.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/css-select/-/css-select-2.0.2.tgz";
-        sha1 = "ab4386cec9e1f668855564b17c3733b43b2a5ede";
+        name = "css_select___css_select_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz";
+        sha1 = "6a34653356635934a81baca68d0255432105dbef";
       };
     }
     {
-      name = "css_selector_tokenizer___css_selector_tokenizer_0.7.1.tgz";
+      name = "css_tree___css_tree_1.0.0_alpha.37.tgz";
       path = fetchurl {
-        name = "css_selector_tokenizer___css_selector_tokenizer_0.7.1.tgz";
-        url  = "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz";
-        sha1 = "a177271a8bca5019172f4f891fc6eed9cbf68d5d";
-      };
-    }
-    {
-      name = "css_tree___css_tree_1.0.0_alpha.28.tgz";
-      path = fetchurl {
-        name = "css_tree___css_tree_1.0.0_alpha.28.tgz";
-        url  = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.28.tgz";
-        sha1 = "8e8968190d886c9477bc8d61e96f61af3f7ffa7f";
-      };
-    }
-    {
-      name = "css_tree___css_tree_1.0.0_alpha.29.tgz";
-      path = fetchurl {
-        name = "css_tree___css_tree_1.0.0_alpha.29.tgz";
-        url  = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.29.tgz";
-        sha1 = "3fa9d4ef3142cbd1c301e7664c1f352bd82f5a39";
+        name = "css_tree___css_tree_1.0.0_alpha.37.tgz";
+        url  = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz";
+        sha1 = "98bebd62c4c1d9f960ec340cf9f7522e30709a22";
       };
     }
     {
@@ -3753,14 +2721,6 @@
         sha1 = "d9b9281adcfd8ced935bdbaba83786897f64e996";
       };
     }
-    {
-      name = "css_url_regex___css_url_regex_1.1.0.tgz";
-      path = fetchurl {
-        name = "css_url_regex___css_url_regex_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/css-url-regex/-/css-url-regex-1.1.0.tgz";
-        sha1 = "83834230cc9f74c457de59eebd1543feeb83b7ec";
-      };
-    }
     {
       name = "css_what___css_what_2.1.3.tgz";
       path = fetchurl {
@@ -3770,11 +2730,11 @@
       };
     }
     {
-      name = "cssesc___cssesc_0.1.0.tgz";
+      name = "css_what___css_what_3.2.1.tgz";
       path = fetchurl {
-        name = "cssesc___cssesc_0.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz";
-        sha1 = "c814903e45623371a0477b40109aaafbeeaddbb4";
+        name = "css_what___css_what_3.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/css-what/-/css-what-3.2.1.tgz";
+        sha1 = "f4a8f12421064621b456755e34a03a2c22df5da1";
       };
     }
     {
@@ -3785,6 +2745,14 @@
         sha1 = "3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703";
       };
     }
+    {
+      name = "cssesc___cssesc_3.0.0.tgz";
+      path = fetchurl {
+        name = "cssesc___cssesc_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz";
+        sha1 = "37741919903b868565e1c09ea747445cd18983ee";
+      };
+    }
     {
       name = "cssfilter___cssfilter_0.0.10.tgz";
       path = fetchurl {
@@ -3842,19 +2810,19 @@
       };
     }
     {
-      name = "csso___csso_3.5.1.tgz";
+      name = "csso___csso_4.0.2.tgz";
       path = fetchurl {
-        name = "csso___csso_3.5.1.tgz";
-        url  = "https://registry.yarnpkg.com/csso/-/csso-3.5.1.tgz";
-        sha1 = "7b9eb8be61628973c1b261e169d2f024008e758b";
+        name = "csso___csso_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/csso/-/csso-4.0.2.tgz";
+        sha1 = "e5f81ab3a56b8eefb7f0092ce7279329f454de3d";
       };
     }
     {
-      name = "cssom___cssom_0.3.6.tgz";
+      name = "cssom___cssom_0.3.8.tgz";
       path = fetchurl {
-        name = "cssom___cssom_0.3.6.tgz";
-        url  = "https://registry.yarnpkg.com/cssom/-/cssom-0.3.6.tgz";
-        sha1 = "f85206cee04efa841f3c5982a74ba96ab20d65ad";
+        name = "cssom___cssom_0.3.8.tgz";
+        url  = "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz";
+        sha1 = "9f1276f5b2b463f2114d3f2c75250af8c1a36f4a";
       };
     }
     {
@@ -3866,11 +2834,11 @@
       };
     }
     {
-      name = "cssstyle___cssstyle_1.2.2.tgz";
+      name = "cssstyle___cssstyle_1.4.0.tgz";
       path = fetchurl {
-        name = "cssstyle___cssstyle_1.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.2.2.tgz";
-        sha1 = "427ea4d585b18624f6fdbf9de7a2a1a3ba713077";
+        name = "cssstyle___cssstyle_1.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.4.0.tgz";
+        sha1 = "9d31328229d3c565c61e586b02041a28fccdccf1";
       };
     }
     {
@@ -3882,11 +2850,11 @@
       };
     }
     {
-      name = "cyclist___cyclist_0.2.2.tgz";
+      name = "cyclist___cyclist_1.0.1.tgz";
       path = fetchurl {
-        name = "cyclist___cyclist_0.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz";
-        sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640";
+        name = "cyclist___cyclist_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz";
+        sha1 = "596e9698fd0c80e12038c2b82d6eb1b35b6224d9";
       };
     }
     {
@@ -3906,11 +2874,11 @@
       };
     }
     {
-      name = "d3_brush___d3_brush_1.0.6.tgz";
+      name = "d3_brush___d3_brush_1.1.5.tgz";
       path = fetchurl {
-        name = "d3_brush___d3_brush_1.0.6.tgz";
-        url  = "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.0.6.tgz";
-        sha1 = "33691f2032d9db6c5d8cb684ff255a9883629e21";
+        name = "d3_brush___d3_brush_1.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.1.5.tgz";
+        sha1 = "066b8e84d17b192986030446c97c0fba7e1bacdc";
       };
     }
     {
@@ -3930,11 +2898,11 @@
       };
     }
     {
-      name = "d3_color___d3_color_1.2.8.tgz";
+      name = "d3_color___d3_color_1.4.0.tgz";
       path = fetchurl {
-        name = "d3_color___d3_color_1.2.8.tgz";
-        url  = "https://registry.yarnpkg.com/d3-color/-/d3-color-1.2.8.tgz";
-        sha1 = "4eaf9b60ef188c893fcf8b28f3546aafebfbd9f4";
+        name = "d3_color___d3_color_1.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.0.tgz";
+        sha1 = "89c45a995ed773b13314f06460df26d60ba0ecaf";
       };
     }
     {
@@ -3946,35 +2914,35 @@
       };
     }
     {
-      name = "d3_dispatch___d3_dispatch_1.0.5.tgz";
+      name = "d3_dispatch___d3_dispatch_1.0.6.tgz";
       path = fetchurl {
-        name = "d3_dispatch___d3_dispatch_1.0.5.tgz";
-        url  = "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.5.tgz";
-        sha1 = "e25c10a186517cd6c82dd19ea018f07e01e39015";
+        name = "d3_dispatch___d3_dispatch_1.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.6.tgz";
+        sha1 = "00d37bcee4dd8cd97729dd893a0ac29caaba5d58";
       };
     }
     {
-      name = "d3_drag___d3_drag_1.2.3.tgz";
+      name = "d3_drag___d3_drag_1.2.5.tgz";
       path = fetchurl {
-        name = "d3_drag___d3_drag_1.2.3.tgz";
-        url  = "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.2.3.tgz";
-        sha1 = "46e206ad863ec465d88c588098a1df444cd33c64";
+        name = "d3_drag___d3_drag_1.2.5.tgz";
+        url  = "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.2.5.tgz";
+        sha1 = "2537f451acd39d31406677b7dc77c82f7d988f70";
       };
     }
     {
-      name = "d3_dsv___d3_dsv_1.1.1.tgz";
+      name = "d3_dsv___d3_dsv_1.2.0.tgz";
       path = fetchurl {
-        name = "d3_dsv___d3_dsv_1.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.1.1.tgz";
-        sha1 = "aaa830ecb76c4b5015572c647cc6441e3c7bb701";
+        name = "d3_dsv___d3_dsv_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.2.0.tgz";
+        sha1 = "9d5f75c3a5f8abd611f74d3f5847b0d4338b885c";
       };
     }
     {
-      name = "d3_ease___d3_ease_1.0.5.tgz";
+      name = "d3_ease___d3_ease_1.0.6.tgz";
       path = fetchurl {
-        name = "d3_ease___d3_ease_1.0.5.tgz";
-        url  = "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.5.tgz";
-        sha1 = "8ce59276d81241b1b72042d6af2d40e76d936ffb";
+        name = "d3_ease___d3_ease_1.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.6.tgz";
+        sha1 = "ebdb6da22dfac0a22222f2d4da06f66c416a0ec0";
       };
     }
     {
@@ -3994,59 +2962,59 @@
       };
     }
     {
-      name = "d3_format___d3_format_1.3.2.tgz";
+      name = "d3_format___d3_format_1.4.3.tgz";
       path = fetchurl {
-        name = "d3_format___d3_format_1.3.2.tgz";
-        url  = "https://registry.yarnpkg.com/d3-format/-/d3-format-1.3.2.tgz";
-        sha1 = "6a96b5e31bcb98122a30863f7d92365c00603562";
+        name = "d3_format___d3_format_1.4.3.tgz";
+        url  = "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.3.tgz";
+        sha1 = "4e8eb4dff3fdcb891a8489ec6e698601c41b96f1";
       };
     }
     {
-      name = "d3_geo___d3_geo_1.11.6.tgz";
+      name = "d3_geo___d3_geo_1.11.9.tgz";
       path = fetchurl {
-        name = "d3_geo___d3_geo_1.11.6.tgz";
-        url  = "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.11.6.tgz";
-        sha1 = "134f2ef035ff75a448075fafdea92702a2e0e0cf";
+        name = "d3_geo___d3_geo_1.11.9.tgz";
+        url  = "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.11.9.tgz";
+        sha1 = "77eaed14ba62fc2c0aef55cd2943849c866f7ae6";
       };
     }
     {
-      name = "d3_hierarchy___d3_hierarchy_1.1.8.tgz";
+      name = "d3_hierarchy___d3_hierarchy_1.1.9.tgz";
       path = fetchurl {
-        name = "d3_hierarchy___d3_hierarchy_1.1.8.tgz";
-        url  = "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.8.tgz";
-        sha1 = "7a6317bd3ed24e324641b6f1e76e978836b008cc";
+        name = "d3_hierarchy___d3_hierarchy_1.1.9.tgz";
+        url  = "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz";
+        sha1 = "2f6bee24caaea43f8dc37545fa01628559647a83";
       };
     }
     {
-      name = "d3_interpolate___d3_interpolate_1.3.2.tgz";
+      name = "d3_interpolate___d3_interpolate_1.4.0.tgz";
       path = fetchurl {
-        name = "d3_interpolate___d3_interpolate_1.3.2.tgz";
-        url  = "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.3.2.tgz";
-        sha1 = "417d3ebdeb4bc4efcc8fd4361c55e4040211fd68";
+        name = "d3_interpolate___d3_interpolate_1.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.4.0.tgz";
+        sha1 = "526e79e2d80daa383f9e0c1c1c7dcc0f0583e987";
       };
     }
     {
-      name = "d3_path___d3_path_1.0.8.tgz";
+      name = "d3_path___d3_path_1.0.9.tgz";
       path = fetchurl {
-        name = "d3_path___d3_path_1.0.8.tgz";
-        url  = "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.8.tgz";
-        sha1 = "4a0606a794d104513ec4a8af43525f374b278719";
+        name = "d3_path___d3_path_1.0.9.tgz";
+        url  = "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.9.tgz";
+        sha1 = "48c050bb1fe8c262493a8caf5524e3e9591701cf";
       };
     }
     {
-      name = "d3_polygon___d3_polygon_1.0.5.tgz";
+      name = "d3_polygon___d3_polygon_1.0.6.tgz";
       path = fetchurl {
-        name = "d3_polygon___d3_polygon_1.0.5.tgz";
-        url  = "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-1.0.5.tgz";
-        sha1 = "9a645a0a64ff6cbf9efda96ee0b4a6909184c363";
+        name = "d3_polygon___d3_polygon_1.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-1.0.6.tgz";
+        sha1 = "0bf8cb8180a6dc107f518ddf7975e12abbfbd38e";
       };
     }
     {
-      name = "d3_quadtree___d3_quadtree_1.0.6.tgz";
+      name = "d3_quadtree___d3_quadtree_1.0.7.tgz";
       path = fetchurl {
-        name = "d3_quadtree___d3_quadtree_1.0.6.tgz";
-        url  = "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.6.tgz";
-        sha1 = "d1ab2a95a7f27bbde88582c94166f6ae35f32056";
+        name = "d3_quadtree___d3_quadtree_1.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.7.tgz";
+        sha1 = "ca8b84df7bb53763fe3c2f24bd435137f4e53135";
       };
     }
     {
@@ -4058,11 +3026,11 @@
       };
     }
     {
-      name = "d3_scale_chromatic___d3_scale_chromatic_1.3.3.tgz";
+      name = "d3_scale_chromatic___d3_scale_chromatic_1.5.0.tgz";
       path = fetchurl {
-        name = "d3_scale_chromatic___d3_scale_chromatic_1.3.3.tgz";
-        url  = "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-1.3.3.tgz";
-        sha1 = "dad4366f0edcb288f490128979c3c793583ed3c0";
+        name = "d3_scale_chromatic___d3_scale_chromatic_1.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz";
+        sha1 = "54e333fc78212f439b14641fb55801dd81135a98";
       };
     }
     {
@@ -4074,51 +3042,51 @@
       };
     }
     {
-      name = "d3_selection___d3_selection_1.4.0.tgz";
+      name = "d3_selection___d3_selection_1.4.1.tgz";
       path = fetchurl {
-        name = "d3_selection___d3_selection_1.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.0.tgz";
-        sha1 = "ab9ac1e664cf967ebf1b479cc07e28ce9908c474";
+        name = "d3_selection___d3_selection_1.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.1.tgz";
+        sha1 = "98eedbbe085fbda5bafa2f9e3f3a2f4d7d622a98";
       };
     }
     {
-      name = "d3_shape___d3_shape_1.3.5.tgz";
+      name = "d3_shape___d3_shape_1.3.7.tgz";
       path = fetchurl {
-        name = "d3_shape___d3_shape_1.3.5.tgz";
-        url  = "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.3.5.tgz";
-        sha1 = "e81aea5940f59f0a79cfccac012232a8987c6033";
+        name = "d3_shape___d3_shape_1.3.7.tgz";
+        url  = "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.3.7.tgz";
+        sha1 = "df63801be07bc986bc54f63789b4fe502992b5d7";
       };
     }
     {
-      name = "d3_time_format___d3_time_format_2.1.3.tgz";
+      name = "d3_time_format___d3_time_format_2.2.3.tgz";
       path = fetchurl {
-        name = "d3_time_format___d3_time_format_2.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.1.3.tgz";
-        sha1 = "ae06f8e0126a9d60d6364eac5b1533ae1bac826b";
+        name = "d3_time_format___d3_time_format_2.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.2.3.tgz";
+        sha1 = "0c9a12ee28342b2037e5ea1cf0b9eb4dd75f29cb";
       };
     }
     {
-      name = "d3_time___d3_time_1.0.11.tgz";
+      name = "d3_time___d3_time_1.1.0.tgz";
       path = fetchurl {
-        name = "d3_time___d3_time_1.0.11.tgz";
-        url  = "https://registry.yarnpkg.com/d3-time/-/d3-time-1.0.11.tgz";
-        sha1 = "1d831a3e25cd189eb256c17770a666368762bbce";
+        name = "d3_time___d3_time_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/d3-time/-/d3-time-1.1.0.tgz";
+        sha1 = "b1e19d307dae9c900b7e5b25ffc5dcc249a8a0f1";
       };
     }
     {
-      name = "d3_timer___d3_timer_1.0.9.tgz";
+      name = "d3_timer___d3_timer_1.0.10.tgz";
       path = fetchurl {
-        name = "d3_timer___d3_timer_1.0.9.tgz";
-        url  = "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.9.tgz";
-        sha1 = "f7bb8c0d597d792ff7131e1c24a36dd471a471ba";
+        name = "d3_timer___d3_timer_1.0.10.tgz";
+        url  = "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.10.tgz";
+        sha1 = "dfe76b8a91748831b13b6d9c793ffbd508dd9de5";
       };
     }
     {
-      name = "d3_transition___d3_transition_1.2.0.tgz";
+      name = "d3_transition___d3_transition_1.3.2.tgz";
       path = fetchurl {
-        name = "d3_transition___d3_transition_1.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.2.0.tgz";
-        sha1 = "f538c0e21b2aa1f05f3e965f8567e81284b3b2b8";
+        name = "d3_transition___d3_transition_1.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.3.2.tgz";
+        sha1 = "a98ef2151be8d8600543434c1ca80140ae23b398";
       };
     }
     {
@@ -4130,43 +3098,43 @@
       };
     }
     {
-      name = "d3_zoom___d3_zoom_1.7.3.tgz";
+      name = "d3_zoom___d3_zoom_1.8.3.tgz";
       path = fetchurl {
-        name = "d3_zoom___d3_zoom_1.7.3.tgz";
-        url  = "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.7.3.tgz";
-        sha1 = "f444effdc9055c38077c4299b4df999eb1d47ccb";
+        name = "d3_zoom___d3_zoom_1.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.8.3.tgz";
+        sha1 = "b6a3dbe738c7763121cd05b8a7795ffe17f4fc0a";
       };
     }
     {
-      name = "d3___d3_5.9.7.tgz";
+      name = "d3___d3_5.15.0.tgz";
       path = fetchurl {
-        name = "d3___d3_5.9.7.tgz";
-        url  = "https://registry.yarnpkg.com/d3/-/d3-5.9.7.tgz";
-        sha1 = "f3835648a172b438e89ed57eb6c525bdabdcd7dc";
+        name = "d3___d3_5.15.0.tgz";
+        url  = "https://registry.yarnpkg.com/d3/-/d3-5.15.0.tgz";
+        sha1 = "ffd44958e6a3cb8a59a84429c45429b8bca5677a";
       };
     }
     {
-      name = "d___d_1.0.0.tgz";
+      name = "d___d_1.0.1.tgz";
       path = fetchurl {
-        name = "d___d_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz";
-        sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f";
+        name = "d___d_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz";
+        sha1 = "8698095372d58dbee346ffd0c7093f99f8f9eb5a";
       };
     }
     {
-      name = "dagre_d3_renderer___dagre_d3_renderer_0.5.8.tgz";
+      name = "dagre_d3___dagre_d3_0.6.4.tgz";
       path = fetchurl {
-        name = "dagre_d3_renderer___dagre_d3_renderer_0.5.8.tgz";
-        url  = "https://registry.yarnpkg.com/dagre-d3-renderer/-/dagre-d3-renderer-0.5.8.tgz";
-        sha1 = "aa071bb71d3c4d67426925906f3f6ddead49c1a3";
+        name = "dagre_d3___dagre_d3_0.6.4.tgz";
+        url  = "https://registry.yarnpkg.com/dagre-d3/-/dagre-d3-0.6.4.tgz";
+        sha1 = "0728d5ce7f177ca2337df141ceb60fbe6eeb7b29";
       };
     }
     {
-      name = "dagre_layout___dagre_layout_0.8.8.tgz";
+      name = "dagre___dagre_0.8.5.tgz";
       path = fetchurl {
-        name = "dagre_layout___dagre_layout_0.8.8.tgz";
-        url  = "https://registry.yarnpkg.com/dagre-layout/-/dagre-layout-0.8.8.tgz";
-        sha1 = "9b6792f24229f402441c14162c1049e3f261f6d9";
+        name = "dagre___dagre_0.8.5.tgz";
+        url  = "https://registry.yarnpkg.com/dagre/-/dagre-0.8.5.tgz";
+        sha1 = "ba30b0055dac12b6c1fcc247817442777d06afee";
       };
     }
     {
@@ -4194,19 +3162,11 @@
       };
     }
     {
-      name = "date_now___date_now_0.1.4.tgz";
+      name = "date_utils___date_utils_1.2.21.tgz";
       path = fetchurl {
-        name = "date_now___date_now_0.1.4.tgz";
-        url  = "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz";
-        sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b";
-      };
-    }
-    {
-      name = "de_indent___de_indent_1.0.2.tgz";
-      path = fetchurl {
-        name = "de_indent___de_indent_1.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz";
-        sha1 = "b2038e846dc33baa5796128d0804b455b8c1e21d";
+        name = "date_utils___date_utils_1.2.21.tgz";
+        url  = "https://registry.yarnpkg.com/date-utils/-/date-utils-1.2.21.tgz";
+        sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64";
       };
     }
     {
@@ -4258,11 +3218,11 @@
       };
     }
     {
-      name = "deep_equal___deep_equal_1.0.1.tgz";
+      name = "deep_equal___deep_equal_1.1.1.tgz";
       path = fetchurl {
-        name = "deep_equal___deep_equal_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz";
-        sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5";
+        name = "deep_equal___deep_equal_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz";
+        sha1 = "b5c98c942ceffaf7cb051e24e1434a25a2e6076a";
       };
     }
     {
@@ -4378,11 +3338,11 @@
       };
     }
     {
-      name = "des.js___des.js_1.0.0.tgz";
+      name = "des.js___des.js_1.0.1.tgz";
       path = fetchurl {
-        name = "des.js___des.js_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz";
-        sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc";
+        name = "des.js___des.js_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz";
+        sha1 = "5382142e1bdc53f85d86d53e5f4aa7deb91e0843";
       };
     }
     {
@@ -4393,14 +3353,6 @@
         sha1 = "978857442c44749e4206613e37946205826abd80";
       };
     }
-    {
-      name = "detab___detab_2.0.2.tgz";
-      path = fetchurl {
-        name = "detab___detab_2.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/detab/-/detab-2.0.2.tgz";
-        sha1 = "074970d1a807b045d0258a4235df5928dd683561";
-      };
-    }
     {
       name = "detect_file___detect_file_1.0.0.tgz";
       path = fetchurl {
@@ -4425,14 +3377,6 @@
         sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b";
       };
     }
-    {
-      name = "detective___detective_4.7.1.tgz";
-      path = fetchurl {
-        name = "detective___detective_4.7.1.tgz";
-        url  = "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz";
-        sha1 = "0eca7314338442febb6d65da54c10bb1c82b246e";
-      };
-    }
     {
       name = "diagnostics___diagnostics_1.1.1.tgz";
       path = fetchurl {
@@ -4447,8 +3391,8 @@
       let
         repo = fetchgit {
           url = "https://github.com/hackmdio/diff-match-patch.git";
-          rev = "dd6e43a1df8f46ac17ba33217c00d4018ef5637f";
-          sha256 = "0rwkms53ggqxsvlhjh6wj4f3l4bw8r14xkq083zdnqn533rh7dlq";
+          rev = "5b73bb82454a81ecdbdb81afb4bea4c36132fbaa";
+          sha256 = "0awiyanl31n7n8ipx5yri713yvk6i692gphgvcr2nm9rr57hn6i7";
         };
       in
         runCommandNoCC "diff-match-patch.git" { buildInputs = [gnutar]; } ''
@@ -4465,14 +3409,6 @@
         sha1 = "800c0dd1e0a8bfbc95835c202ad220fe317e5a12";
       };
     }
-    {
-      name = "diff___diff_4.0.1.tgz";
-      path = fetchurl {
-        name = "diff___diff_4.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz";
-        sha1 = "0c667cb467ebbb5cea7f14f135cc2dba7780a8ff";
-      };
-    }
     {
       name = "diffie_hellman___diffie_hellman_5.0.3.tgz";
       path = fetchurl {
@@ -4490,27 +3426,11 @@
       };
     }
     {
-      name = "dns_lookup_all___dns_lookup_all_1.0.2.tgz";
+      name = "dns_prefetch_control___dns_prefetch_control_0.2.0.tgz";
       path = fetchurl {
-        name = "dns_lookup_all___dns_lookup_all_1.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/dns-lookup-all/-/dns-lookup-all-1.0.2.tgz";
-        sha1 = "4d8b2b1af69c83a7b262eb5de92485b7b3a215eb";
-      };
-    }
-    {
-      name = "dns_prefetch_control___dns_prefetch_control_0.1.0.tgz";
-      path = fetchurl {
-        name = "dns_prefetch_control___dns_prefetch_control_0.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/dns-prefetch-control/-/dns-prefetch-control-0.1.0.tgz";
-        sha1 = "60ddb457774e178f1f9415f0cabb0e85b0b300b2";
-      };
-    }
-    {
-      name = "doctrine_temporary_fork___doctrine_temporary_fork_2.1.0.tgz";
-      path = fetchurl {
-        name = "doctrine_temporary_fork___doctrine_temporary_fork_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/doctrine-temporary-fork/-/doctrine-temporary-fork-2.1.0.tgz";
-        sha1 = "36f2154f556ee4f1e60311d391cd23de5187ed57";
+        name = "dns_prefetch_control___dns_prefetch_control_0.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/dns-prefetch-control/-/dns-prefetch-control-0.2.0.tgz";
+        sha1 = "73988161841f3dcc81f47686d539a2c702c88624";
       };
     }
     {
@@ -4529,14 +3449,6 @@
         sha1 = "addebead72a6574db783639dc87a121773973961";
       };
     }
-    {
-      name = "documentation___documentation_12.1.0.tgz";
-      path = fetchurl {
-        name = "documentation___documentation_12.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/documentation/-/documentation-12.1.0.tgz";
-        sha1 = "0cabc4e88507872fd847129c00ae7d0e2482049c";
-      };
-    }
     {
       name = "dom_converter___dom_converter_0.2.0.tgz";
       path = fetchurl {
@@ -4545,6 +3457,14 @@
         sha1 = "6721a9daee2e293682955b6afe416771627bb768";
       };
     }
+    {
+      name = "dom_serializer___dom_serializer_0.2.2.tgz";
+      path = fetchurl {
+        name = "dom_serializer___dom_serializer_0.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz";
+        sha1 = "1afb81f533717175d478655debc5e332d9f9bb51";
+      };
+    }
     {
       name = "dom_serializer___dom_serializer_0.1.1.tgz";
       path = fetchurl {
@@ -4569,6 +3489,14 @@
         sha1 = "d048c44b37b0d10a7f2a3d5fee3f4333d790481f";
       };
     }
+    {
+      name = "domelementtype___domelementtype_2.0.1.tgz";
+      path = fetchurl {
+        name = "domelementtype___domelementtype_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz";
+        sha1 = "1f8bdfe91f5a78063274e803b4bdcedf6e94f94d";
+      };
+    }
     {
       name = "domexception___domexception_1.0.1.tgz";
       path = fetchurl {
@@ -4602,43 +3530,35 @@
       };
     }
     {
-      name = "dont_sniff_mimetype___dont_sniff_mimetype_1.0.0.tgz";
+      name = "dont_sniff_mimetype___dont_sniff_mimetype_1.1.0.tgz";
       path = fetchurl {
-        name = "dont_sniff_mimetype___dont_sniff_mimetype_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/dont-sniff-mimetype/-/dont-sniff-mimetype-1.0.0.tgz";
-        sha1 = "5932890dc9f4e2f19e5eb02a20026e5e5efc8f58";
+        name = "dont_sniff_mimetype___dont_sniff_mimetype_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/dont-sniff-mimetype/-/dont-sniff-mimetype-1.1.0.tgz";
+        sha1 = "c7d0427f8bcb095762751252af59d148b0a623b2";
       };
     }
     {
-      name = "dot_prop___dot_prop_4.2.0.tgz";
+      name = "dot_prop___dot_prop_5.2.0.tgz";
       path = fetchurl {
-        name = "dot_prop___dot_prop_4.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz";
-        sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57";
+        name = "dot_prop___dot_prop_5.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz";
+        sha1 = "c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb";
       };
     }
     {
-      name = "dottie___dottie_2.0.1.tgz";
+      name = "dottie___dottie_2.0.2.tgz";
       path = fetchurl {
-        name = "dottie___dottie_2.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/dottie/-/dottie-2.0.1.tgz";
-        sha1 = "697ad9d72004db7574d21f892466a3c285893659";
+        name = "dottie___dottie_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/dottie/-/dottie-2.0.2.tgz";
+        sha1 = "cc91c0726ce3a054ebf11c55fbc92a7f266dd154";
       };
     }
     {
-      name = "dtrace_provider___dtrace_provider_0.8.7.tgz";
+      name = "dtrace_provider___dtrace_provider_0.8.8.tgz";
       path = fetchurl {
-        name = "dtrace_provider___dtrace_provider_0.8.7.tgz";
-        url  = "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.8.7.tgz";
-        sha1 = "dc939b4d3e0620cfe0c1cd803d0d2d7ed04ffd04";
-      };
-    }
-    {
-      name = "duplexer2___duplexer2_0.1.4.tgz";
-      path = fetchurl {
-        name = "duplexer2___duplexer2_0.1.4.tgz";
-        url  = "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz";
-        sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1";
+        name = "dtrace_provider___dtrace_provider_0.8.8.tgz";
+        url  = "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.8.8.tgz";
+        sha1 = "2996d5490c37e1347be263b423ed7b297fb0d97e";
       };
     }
     {
@@ -4657,14 +3577,6 @@
         sha1 = "2a4df5317f6ccfd91f86d6fd25d8d8a103b88309";
       };
     }
-    {
-      name = "eachr___eachr_2.0.4.tgz";
-      path = fetchurl {
-        name = "eachr___eachr_2.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/eachr/-/eachr-2.0.4.tgz";
-        sha1 = "466f7caa10708f610509e32c807aafe57fc122bf";
-      };
-    }
     {
       name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz";
       path = fetchurl {
@@ -4674,19 +3586,11 @@
       };
     }
     {
-      name = "editions___editions_1.3.4.tgz";
+      name = "ecdsa_sig_formatter___ecdsa_sig_formatter_1.0.11.tgz";
       path = fetchurl {
-        name = "editions___editions_1.3.4.tgz";
-        url  = "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz";
-        sha1 = "3662cb592347c3168eb8e498a0ff73271d67f50b";
-      };
-    }
-    {
-      name = "editions___editions_2.1.3.tgz";
-      path = fetchurl {
-        name = "editions___editions_2.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/editions/-/editions-2.1.3.tgz";
-        sha1 = "727ccf3ec2c7b12dcc652c71000f16c4824d6f7d";
+        name = "ecdsa_sig_formatter___ecdsa_sig_formatter_1.0.11.tgz";
+        url  = "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz";
+        sha1 = "ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf";
       };
     }
     {
@@ -4706,51 +3610,27 @@
       };
     }
     {
-      name = "ejs_loader___ejs_loader_0.3.3.tgz";
+      name = "ejs___ejs_2.7.4.tgz";
       path = fetchurl {
-        name = "ejs_loader___ejs_loader_0.3.3.tgz";
-        url  = "https://registry.yarnpkg.com/ejs-loader/-/ejs-loader-0.3.3.tgz";
-        sha1 = "021aa196b8858f05b6f095576c4afe61012ccc2e";
+        name = "ejs___ejs_2.7.4.tgz";
+        url  = "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz";
+        sha1 = "48661287573dcc53e366c7a1ae52c3a120eec9ba";
       };
     }
     {
-      name = "ejs___ejs_2.6.1.tgz";
+      name = "electron_to_chromium___electron_to_chromium_1.3.352.tgz";
       path = fetchurl {
-        name = "ejs___ejs_2.6.1.tgz";
-        url  = "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz";
-        sha1 = "498ec0d495655abc6f23cd61868d926464071aa0";
+        name = "electron_to_chromium___electron_to_chromium_1.3.352.tgz";
+        url  = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.352.tgz";
+        sha1 = "f0fc1e561104dbfba55cb3d45cad3626dc75d7e9";
       };
     }
     {
-      name = "electron_to_chromium___electron_to_chromium_1.3.138.tgz";
+      name = "elliptic___elliptic_6.5.2.tgz";
       path = fetchurl {
-        name = "electron_to_chromium___electron_to_chromium_1.3.138.tgz";
-        url  = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.138.tgz";
-        sha1 = "3c27814d48040d3988eaee56ab839d032987aff4";
-      };
-    }
-    {
-      name = "electron_to_chromium___electron_to_chromium_1.3.210.tgz";
-      path = fetchurl {
-        name = "electron_to_chromium___electron_to_chromium_1.3.210.tgz";
-        url  = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.210.tgz";
-        sha1 = "0ce6247366c5771d4f5663a5879388fd1adefb7e";
-      };
-    }
-    {
-      name = "elliptic___elliptic_6.4.1.tgz";
-      path = fetchurl {
-        name = "elliptic___elliptic_6.4.1.tgz";
-        url  = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz";
-        sha1 = "c2d0b7776911b86722c632c3c06c60f2f819939a";
-      };
-    }
-    {
-      name = "emoji_regex___emoji_regex_6.1.1.tgz";
-      path = fetchurl {
-        name = "emoji_regex___emoji_regex_6.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.1.1.tgz";
-        sha1 = "c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e";
+        name = "elliptic___elliptic_6.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz";
+        sha1 = "05c5678d7173c049d8ca433552224a495d0e3762";
       };
     }
     {
@@ -4761,14 +3641,6 @@
         sha1 = "933a04052860c85e83c122479c4748a8e4c72156";
       };
     }
-    {
-      name = "emoji_regex___emoji_regex_8.0.0.tgz";
-      path = fetchurl {
-        name = "emoji_regex___emoji_regex_8.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz";
-        sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37";
-      };
-    }
     {
       name = "emojify.js___emojify.js_1.1.0.tgz";
       path = fetchurl {
@@ -4802,11 +3674,11 @@
       };
     }
     {
-      name = "end_of_stream___end_of_stream_1.4.1.tgz";
+      name = "end_of_stream___end_of_stream_1.4.4.tgz";
       path = fetchurl {
-        name = "end_of_stream___end_of_stream_1.4.1.tgz";
-        url  = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz";
-        sha1 = "ed29634d19baba463b6ce6b80a37213eab71ec43";
+        name = "end_of_stream___end_of_stream_1.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz";
+        sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0";
       };
     }
     {
@@ -4841,6 +3713,14 @@
         sha1 = "41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f";
       };
     }
+    {
+      name = "enhanced_resolve___enhanced_resolve_4.1.1.tgz";
+      path = fetchurl {
+        name = "enhanced_resolve___enhanced_resolve_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz";
+        sha1 = "2937e2b8066cd0fe7ce0990a98f0d71a35189f66";
+      };
+    }
     {
       name = "entities___entities_1.1.2.tgz";
       path = fetchurl {
@@ -4850,19 +3730,19 @@
       };
     }
     {
-      name = "env_variable___env_variable_0.0.5.tgz";
+      name = "entities___entities_2.0.0.tgz";
       path = fetchurl {
-        name = "env_variable___env_variable_0.0.5.tgz";
-        url  = "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.5.tgz";
-        sha1 = "913dd830bef11e96a039c038d4130604eba37f88";
+        name = "entities___entities_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz";
+        sha1 = "68d6084cab1b079767540d80e56a39b423e4abf4";
       };
     }
     {
-      name = "errlop___errlop_1.1.1.tgz";
+      name = "env_variable___env_variable_0.0.6.tgz";
       path = fetchurl {
-        name = "errlop___errlop_1.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/errlop/-/errlop-1.1.1.tgz";
-        sha1 = "d9ae4c76c3e64956c5d79e6e035d6343bfd62250";
+        name = "env_variable___env_variable_0.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.6.tgz";
+        sha1 = "74ab20b3786c545b62b4a4813ab8cf22726c9808";
       };
     }
     {
@@ -4882,35 +3762,27 @@
       };
     }
     {
-      name = "error___error_7.0.2.tgz";
+      name = "es_abstract___es_abstract_1.17.4.tgz";
       path = fetchurl {
-        name = "error___error_7.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/error/-/error-7.0.2.tgz";
-        sha1 = "a5f75fff4d9926126ddac0ea5dc38e689153cb02";
+        name = "es_abstract___es_abstract_1.17.4.tgz";
+        url  = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz";
+        sha1 = "e3aedf19706b20e7c2594c35fc0d57605a79e184";
       };
     }
     {
-      name = "es_abstract___es_abstract_1.13.0.tgz";
+      name = "es_to_primitive___es_to_primitive_1.2.1.tgz";
       path = fetchurl {
-        name = "es_abstract___es_abstract_1.13.0.tgz";
-        url  = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz";
-        sha1 = "ac86145fdd5099d8dd49558ccba2eaf9b88e24e9";
+        name = "es_to_primitive___es_to_primitive_1.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz";
+        sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a";
       };
     }
     {
-      name = "es_to_primitive___es_to_primitive_1.2.0.tgz";
+      name = "es5_ext___es5_ext_0.10.53.tgz";
       path = fetchurl {
-        name = "es_to_primitive___es_to_primitive_1.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz";
-        sha1 = "edf72478033456e8dda8ef09e00ad9650707f377";
-      };
-    }
-    {
-      name = "es5_ext___es5_ext_0.10.50.tgz";
-      path = fetchurl {
-        name = "es5_ext___es5_ext_0.10.50.tgz";
-        url  = "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.50.tgz";
-        sha1 = "6d0e23a0abdb27018e5ac4fd09b412bc5517a778";
+        name = "es5_ext___es5_ext_0.10.53.tgz";
+        url  = "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz";
+        sha1 = "93c5a3acfdbef275220ad72644ad02ee18368de1";
       };
     }
     {
@@ -4930,27 +3802,27 @@
       };
     }
     {
-      name = "es6_promise___es6_promise_4.2.6.tgz";
+      name = "es6_promise___es6_promise_4.2.8.tgz";
       path = fetchurl {
-        name = "es6_promise___es6_promise_4.2.6.tgz";
-        url  = "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.6.tgz";
-        sha1 = "b685edd8258886365ea62b57d30de28fadcd974f";
+        name = "es6_promise___es6_promise_4.2.8.tgz";
+        url  = "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz";
+        sha1 = "4eb21594c972bc40553d276e510539143db53e0a";
       };
     }
     {
-      name = "es6_symbol___es6_symbol_3.1.1.tgz";
+      name = "es6_symbol___es6_symbol_3.1.3.tgz";
       path = fetchurl {
-        name = "es6_symbol___es6_symbol_3.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz";
-        sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77";
+        name = "es6_symbol___es6_symbol_3.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz";
+        sha1 = "bad5d3c1bcdac28269f4cb331e431c78ac705d18";
       };
     }
     {
-      name = "es6_weak_map___es6_weak_map_2.0.2.tgz";
+      name = "es6_weak_map___es6_weak_map_2.0.3.tgz";
       path = fetchurl {
-        name = "es6_weak_map___es6_weak_map_2.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz";
-        sha1 = "5e3ab32251ffd1538a1f8e5ffa1357772f92d96f";
+        name = "es6_weak_map___es6_weak_map_2.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz";
+        sha1 = "b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53";
       };
     }
     {
@@ -4978,11 +3850,11 @@
       };
     }
     {
-      name = "escodegen___escodegen_1.11.1.tgz";
+      name = "escodegen___escodegen_1.14.1.tgz";
       path = fetchurl {
-        name = "escodegen___escodegen_1.11.1.tgz";
-        url  = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.1.tgz";
-        sha1 = "c485ff8d6b4cdb89e27f4a856e91f118401ca510";
+        name = "escodegen___escodegen_1.14.1.tgz";
+        url  = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz";
+        sha1 = "ba01d0c8278b5e95a9a45350142026659027a457";
       };
     }
     {
@@ -4994,35 +3866,35 @@
       };
     }
     {
-      name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.2.tgz";
+      name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.tgz";
       path = fetchurl {
-        name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.2.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz";
-        sha1 = "58f15fb839b8d0576ca980413476aab2472db66a";
+        name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz";
+        sha1 = "dbaa52b6b2816b50bc6711af75422de808e98404";
       };
     }
     {
-      name = "eslint_module_utils___eslint_module_utils_2.4.0.tgz";
+      name = "eslint_module_utils___eslint_module_utils_2.5.2.tgz";
       path = fetchurl {
-        name = "eslint_module_utils___eslint_module_utils_2.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.0.tgz";
-        sha1 = "8b93499e9b00eab80ccb6614e69f03678e84e09a";
+        name = "eslint_module_utils___eslint_module_utils_2.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz";
+        sha1 = "7878f7504824e1b857dd2505b59a8e5eda26a708";
       };
     }
     {
-      name = "eslint_plugin_es___eslint_plugin_es_1.4.0.tgz";
+      name = "eslint_plugin_es___eslint_plugin_es_1.4.1.tgz";
       path = fetchurl {
-        name = "eslint_plugin_es___eslint_plugin_es_1.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-1.4.0.tgz";
-        sha1 = "475f65bb20c993fc10e8c8fe77d1d60068072da6";
+        name = "eslint_plugin_es___eslint_plugin_es_1.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-1.4.1.tgz";
+        sha1 = "12acae0f4953e76ba444bfd1b2271081ac620998";
       };
     }
     {
-      name = "eslint_plugin_import___eslint_plugin_import_2.17.3.tgz";
+      name = "eslint_plugin_import___eslint_plugin_import_2.20.1.tgz";
       path = fetchurl {
-        name = "eslint_plugin_import___eslint_plugin_import_2.17.3.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.17.3.tgz";
-        sha1 = "00548b4434c18faebaba04b24ae6198f280de189";
+        name = "eslint_plugin_import___eslint_plugin_import_2.20.1.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz";
+        sha1 = "802423196dcb11d9ce8435a5fc02a6d3b46939b3";
       };
     }
     {
@@ -5034,19 +3906,19 @@
       };
     }
     {
-      name = "eslint_plugin_promise___eslint_plugin_promise_4.1.1.tgz";
+      name = "eslint_plugin_promise___eslint_plugin_promise_4.2.1.tgz";
       path = fetchurl {
-        name = "eslint_plugin_promise___eslint_plugin_promise_4.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.1.1.tgz";
-        sha1 = "1e08cb68b5b2cd8839f8d5864c796f56d82746db";
+        name = "eslint_plugin_promise___eslint_plugin_promise_4.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz";
+        sha1 = "845fd8b2260ad8f82564c1222fce44ad71d9418a";
       };
     }
     {
-      name = "eslint_plugin_standard___eslint_plugin_standard_4.0.0.tgz";
+      name = "eslint_plugin_standard___eslint_plugin_standard_4.0.1.tgz";
       path = fetchurl {
-        name = "eslint_plugin_standard___eslint_plugin_standard_4.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.0.tgz";
-        sha1 = "f845b45109c99cd90e77796940a344546c8f6b5c";
+        name = "eslint_plugin_standard___eslint_plugin_standard_4.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz";
+        sha1 = "ff0519f7ffaff114f76d1bd7c3996eef0f6e20b4";
       };
     }
     {
@@ -5058,19 +3930,19 @@
       };
     }
     {
-      name = "eslint_utils___eslint_utils_1.3.1.tgz";
+      name = "eslint_utils___eslint_utils_1.4.3.tgz";
       path = fetchurl {
-        name = "eslint_utils___eslint_utils_1.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz";
-        sha1 = "9a851ba89ee7c460346f97cf8939c7298827e512";
+        name = "eslint_utils___eslint_utils_1.4.3.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz";
+        sha1 = "74fec7c54d0776b6f67e0251040b5806564e981f";
       };
     }
     {
-      name = "eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz";
+      name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz";
       path = fetchurl {
-        name = "eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz";
-        sha1 = "3f3180fb2e291017716acb4c9d6d5b5c34a6a81d";
+        name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz";
+        sha1 = "e2a82cea84ff246ad6fb57f9bde5b46621459ec2";
       };
     }
     {
@@ -5089,14 +3961,6 @@
         sha1 = "5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a";
       };
     }
-    {
-      name = "esprima___esprima_3.1.3.tgz";
-      path = fetchurl {
-        name = "esprima___esprima_3.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz";
-        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
-      };
-    }
     {
       name = "esprima___esprima_4.0.1.tgz";
       path = fetchurl {
@@ -5106,11 +3970,11 @@
       };
     }
     {
-      name = "esquery___esquery_1.0.1.tgz";
+      name = "esquery___esquery_1.1.0.tgz";
       path = fetchurl {
-        name = "esquery___esquery_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz";
-        sha1 = "406c51658b1f5991a5f9b62b1dc25b00e3e5c708";
+        name = "esquery___esquery_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/esquery/-/esquery-1.1.0.tgz";
+        sha1 = "c5c0b66f383e7656404f86b31334d72524eddb48";
       };
     }
     {
@@ -5122,11 +3986,11 @@
       };
     }
     {
-      name = "estraverse___estraverse_4.2.0.tgz";
+      name = "estraverse___estraverse_4.3.0.tgz";
       path = fetchurl {
-        name = "estraverse___estraverse_4.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz";
-        sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13";
+        name = "estraverse___estraverse_4.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz";
+        sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d";
       };
     }
     {
@@ -5145,14 +4009,6 @@
         sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64";
       };
     }
-    {
-      name = "esutils___esutils_2.0.2.tgz";
-      path = fetchurl {
-        name = "esutils___esutils_2.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz";
-        sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b";
-      };
-    }
     {
       name = "etag___etag_1.8.1.tgz";
       path = fetchurl {
@@ -5194,11 +4050,11 @@
       };
     }
     {
-      name = "events___events_3.0.0.tgz";
+      name = "events___events_3.1.0.tgz";
       path = fetchurl {
-        name = "events___events_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz";
-        sha1 = "9a0a0dfaf62893d92b875b8f2698ca4114973e88";
+        name = "events___events_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz";
+        sha1 = "84279af1b34cb75aa88bf5ff291f6d0bd9b31a59";
       };
     }
     {
@@ -5257,14 +4113,6 @@
         sha1 = "3a54741b6ed34cc7a93305c605f63cd268a54a62";
       };
     }
-    {
-      name = "exports_loader___exports_loader_0.7.0.tgz";
-      path = fetchurl {
-        name = "exports_loader___exports_loader_0.7.0.tgz";
-        url  = "https://registry.yarnpkg.com/exports-loader/-/exports-loader-0.7.0.tgz";
-        sha1 = "84881c784dea6036b8e1cd1dac3da9b6409e21a5";
-      };
-    }
     {
       name = "expose_loader___expose_loader_0.7.5.tgz";
       path = fetchurl {
@@ -5274,11 +4122,11 @@
       };
     }
     {
-      name = "express_session___express_session_1.16.1.tgz";
+      name = "express_session___express_session_1.17.0.tgz";
       path = fetchurl {
-        name = "express_session___express_session_1.16.1.tgz";
-        url  = "https://registry.yarnpkg.com/express-session/-/express-session-1.16.1.tgz";
-        sha1 = "251ff9776c59382301de6c8c33411af357ed439c";
+        name = "express_session___express_session_1.17.0.tgz";
+        url  = "https://registry.yarnpkg.com/express-session/-/express-session-1.17.0.tgz";
+        sha1 = "9b50dbb5e8a03c3537368138f072736150b7f9b3";
       };
     }
     {
@@ -5289,6 +4137,14 @@
         sha1 = "4491fc38605cf51f8629d39c2b5d026f98a4c134";
       };
     }
+    {
+      name = "ext___ext_1.4.0.tgz";
+      path = fetchurl {
+        name = "ext___ext_1.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz";
+        sha1 = "89ae7a07158f79d35517882904324077e4379244";
+      };
+    }
     {
       name = "extend_shallow___extend_shallow_2.0.1.tgz";
       path = fetchurl {
@@ -5322,19 +4178,11 @@
       };
     }
     {
-      name = "extendr___extendr_2.1.0.tgz";
+      name = "external_editor___external_editor_3.1.0.tgz";
       path = fetchurl {
-        name = "extendr___extendr_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/extendr/-/extendr-2.1.0.tgz";
-        sha1 = "301aa0bbea565f4d2dc8f570f2a22611a8527b56";
-      };
-    }
-    {
-      name = "external_editor___external_editor_3.0.3.tgz";
-      path = fetchurl {
-        name = "external_editor___external_editor_3.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz";
-        sha1 = "5866db29a97826dbe4bf3afd24070ead9ea43a27";
+        name = "external_editor___external_editor_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz";
+        sha1 = "cb03f740befae03ea4d283caed2741a83f335495";
       };
     }
     {
@@ -5353,14 +4201,6 @@
         sha1 = "ad00fe4dc612a9232e8718711dc5cb5ab0285543";
       };
     }
-    {
-      name = "extract_opts___extract_opts_2.2.0.tgz";
-      path = fetchurl {
-        name = "extract_opts___extract_opts_2.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/extract-opts/-/extract-opts-2.2.0.tgz";
-        sha1 = "1fa28eba7352c6db480f885ceb71a46810be6d7d";
-      };
-    }
     {
       name = "extract_zip___extract_zip_1.6.7.tgz";
       path = fetchurl {
@@ -5394,27 +4234,19 @@
       };
     }
     {
-      name = "fancy_log___fancy_log_1.3.3.tgz";
+      name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz";
       path = fetchurl {
-        name = "fancy_log___fancy_log_1.3.3.tgz";
-        url  = "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz";
-        sha1 = "dbc19154f558690150a23953a0adbd035be45fc7";
+        name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz";
+        sha1 = "545145077c501491e33b15ec408c294376e94ae4";
       };
     }
     {
-      name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz";
+      name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz";
       path = fetchurl {
-        name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz";
-        sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
-      };
-    }
-    {
-      name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz";
-      path = fetchurl {
-        name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz";
-        sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
+        name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz";
+        sha1 = "874bf69c6f404c2b5d99c481341399fd55892633";
       };
     }
     {
@@ -5426,27 +4258,11 @@
       };
     }
     {
-      name = "fast_safe_stringify___fast_safe_stringify_2.0.6.tgz";
+      name = "fast_safe_stringify___fast_safe_stringify_2.0.7.tgz";
       path = fetchurl {
-        name = "fast_safe_stringify___fast_safe_stringify_2.0.6.tgz";
-        url  = "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.6.tgz";
-        sha1 = "04b26106cc56681f51a044cfc0d76cf0008ac2c2";
-      };
-    }
-    {
-      name = "fastparse___fastparse_1.1.2.tgz";
-      path = fetchurl {
-        name = "fastparse___fastparse_1.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz";
-        sha1 = "91728c5a5942eced8531283c79441ee4122c35a9";
-      };
-    }
-    {
-      name = "faye_websocket___faye_websocket_0.10.0.tgz";
-      path = fetchurl {
-        name = "faye_websocket___faye_websocket_0.10.0.tgz";
-        url  = "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz";
-        sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4";
+        name = "fast_safe_stringify___fast_safe_stringify_2.0.7.tgz";
+        url  = "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz";
+        sha1 = "124aa885899261f68aedb42a7c080de9da608743";
       };
     }
     {
@@ -5498,11 +4314,11 @@
       };
     }
     {
-      name = "file_loader___file_loader_2.0.0.tgz";
+      name = "file_loader___file_loader_4.3.0.tgz";
       path = fetchurl {
-        name = "file_loader___file_loader_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/file-loader/-/file-loader-2.0.0.tgz";
-        sha1 = "39749c82f020b9e85901dcff98e8004e6401cfde";
+        name = "file_loader___file_loader_4.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/file-loader/-/file-loader-4.3.0.tgz";
+        sha1 = "780f040f729b3d18019f20605f723e844b8a58af";
       };
     }
     {
@@ -5513,6 +4329,14 @@
         sha1 = "e68a30c7cb044e2fb362b428469feb291c2e09d8";
       };
     }
+    {
+      name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz";
+      path = fetchurl {
+        name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz";
+        sha1 = "553a7b8446ff6f684359c445f1e37a05dacc33dd";
+      };
+    }
     {
       name = "filename_regex___filename_regex_2.0.1.tgz";
       path = fetchurl {
@@ -5578,11 +4402,11 @@
       };
     }
     {
-      name = "findup_sync___findup_sync_2.0.0.tgz";
+      name = "findup_sync___findup_sync_3.0.0.tgz";
       path = fetchurl {
-        name = "findup_sync___findup_sync_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz";
-        sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc";
+        name = "findup_sync___findup_sync_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz";
+        sha1 = "17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1";
       };
     }
     {
@@ -5594,19 +4418,19 @@
       };
     }
     {
-      name = "flatted___flatted_2.0.0.tgz";
+      name = "flatted___flatted_2.0.1.tgz";
       path = fetchurl {
-        name = "flatted___flatted_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz";
-        sha1 = "55122b6536ea496b4b44893ee2608141d10d9916";
+        name = "flatted___flatted_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz";
+        sha1 = "69e57caa8f0eacbc281d2e2cb458d46fdb449e08";
       };
     }
     {
-      name = "flowchart.js___flowchart.js_1.12.0.tgz";
+      name = "flowchart.js___flowchart.js_1.13.0.tgz";
       path = fetchurl {
-        name = "flowchart.js___flowchart.js_1.12.0.tgz";
-        url  = "https://registry.yarnpkg.com/flowchart.js/-/flowchart.js-1.12.0.tgz";
-        sha1 = "ff5b4cf350b4e067a4232dc1b4dfdd87524acf5a";
+        name = "flowchart.js___flowchart.js_1.13.0.tgz";
+        url  = "https://registry.yarnpkg.com/flowchart.js/-/flowchart.js-1.13.0.tgz";
+        sha1 = "fd966270bd310ddefb168d6826c792c5f345372f";
       };
     }
     {
@@ -5617,6 +4441,14 @@
         sha1 = "8dd7d873a1babc207d94ead0c2e0e44276ebf2e8";
       };
     }
+    {
+      name = "follow_redirects___follow_redirects_1.5.10.tgz";
+      path = fetchurl {
+        name = "follow_redirects___follow_redirects_1.5.10.tgz";
+        url  = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz";
+        sha1 = "7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a";
+      };
+    }
     {
       name = "for_in___for_in_1.0.2.tgz";
       path = fetchurl {
@@ -5657,6 +4489,14 @@
         sha1 = "d35bc62e7fbc2937ae78f948aaa0d38d90607577";
       };
     }
+    {
+      name = "form_data___form_data_2.5.1.tgz";
+      path = fetchurl {
+        name = "form_data___form_data_2.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz";
+        sha1 = "f2cbec57b5e59e23716e128fe44d4e5dd23895f4";
+      };
+    }
     {
       name = "form_data___form_data_2.3.3.tgz";
       path = fetchurl {
@@ -5746,19 +4586,11 @@
       };
     }
     {
-      name = "fs_minipass___fs_minipass_1.2.6.tgz";
+      name = "fs_minipass___fs_minipass_1.2.7.tgz";
       path = fetchurl {
-        name = "fs_minipass___fs_minipass_1.2.6.tgz";
-        url  = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz";
-        sha1 = "2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07";
-      };
-    }
-    {
-      name = "fs_mkdirp_stream___fs_mkdirp_stream_1.0.0.tgz";
-      path = fetchurl {
-        name = "fs_mkdirp_stream___fs_mkdirp_stream_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz";
-        sha1 = "0b7815fc3201c6a69e14db98ce098c16935259eb";
+        name = "fs_minipass___fs_minipass_1.2.7.tgz";
+        url  = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz";
+        sha1 = "ccff8570841e7fe4265693da88936c55aed7f7c7";
       };
     }
     {
@@ -5786,11 +4618,11 @@
       };
     }
     {
-      name = "fsevents___fsevents_1.2.9.tgz";
+      name = "fsevents___fsevents_1.2.11.tgz";
       path = fetchurl {
-        name = "fsevents___fsevents_1.2.9.tgz";
-        url  = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz";
-        sha1 = "3f5ed66583ccd6f400b5a00db6f7e861363e388f";
+        name = "fsevents___fsevents_1.2.11.tgz";
+        url  = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz";
+        sha1 = "67bf57f4758f02ede88fb2a1712fef4d15358be3";
       };
     }
     {
@@ -5825,14 +4657,6 @@
         sha1 = "f069617690c10c868e73b8465746764f97c3479f";
       };
     }
-    {
-      name = "generic_pool___generic_pool_2.4.3.tgz";
-      path = fetchurl {
-        name = "generic_pool___generic_pool_2.4.3.tgz";
-        url  = "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.3.tgz";
-        sha1 = "780c36f69dfad05a5a045dd37be7adca11a4f6ff";
-      };
-    }
     {
       name = "get_caller_file___get_caller_file_1.0.3.tgz";
       path = fetchurl {
@@ -5849,14 +4673,6 @@
         sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e";
       };
     }
-    {
-      name = "get_port___get_port_4.2.0.tgz";
-      path = fetchurl {
-        name = "get_port___get_port_4.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/get-port/-/get-port-4.2.0.tgz";
-        sha1 = "e37368b1e863b7629c43c5a323625f95cf24b119";
-      };
-    }
     {
       name = "get_stream___get_stream_4.1.0.tgz";
       path = fetchurl {
@@ -5889,38 +4705,6 @@
         sha1 = "1ea95703fa1fc2a1255419f6f06c67e9920649ab";
       };
     }
-    {
-      name = "git_up___git_up_2.1.0.tgz";
-      path = fetchurl {
-        name = "git_up___git_up_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/git-up/-/git-up-2.1.0.tgz";
-        sha1 = "2f14cfe78327e7c4a2b92fcac7bfc674fdfad40c";
-      };
-    }
-    {
-      name = "git_url_parse___git_url_parse_10.1.0.tgz";
-      path = fetchurl {
-        name = "git_url_parse___git_url_parse_10.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-10.1.0.tgz";
-        sha1 = "a27813218f8777e91d15f1c121b83bf14721b67e";
-      };
-    }
-    {
-      name = "github_slugger___github_slugger_1.2.0.tgz";
-      path = fetchurl {
-        name = "github_slugger___github_slugger_1.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.2.0.tgz";
-        sha1 = "8ada3286fd046d8951c3c952a8d7854cfd90fd9a";
-      };
-    }
-    {
-      name = "github_slugger___github_slugger_1.2.1.tgz";
-      path = fetchurl {
-        name = "github_slugger___github_slugger_1.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.2.1.tgz";
-        sha1 = "47e904e70bf2dccd0014748142d31126cfd49508";
-      };
-    }
     {
       name = "glob_base___glob_base_0.3.0.tgz";
       path = fetchurl {
@@ -5945,14 +4729,6 @@
         sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
       };
     }
-    {
-      name = "glob_stream___glob_stream_6.1.0.tgz";
-      path = fetchurl {
-        name = "glob_stream___glob_stream_6.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz";
-        sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4";
-      };
-    }
     {
       name = "glob___glob_7.1.2.tgz";
       path = fetchurl {
@@ -5970,11 +4746,19 @@
       };
     }
     {
-      name = "glob___glob_7.1.4.tgz";
+      name = "glob___glob_7.1.6.tgz";
       path = fetchurl {
-        name = "glob___glob_7.1.4.tgz";
-        url  = "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz";
-        sha1 = "aa608a2f6c577ad357e1ae5a5c26d9a8d1969255";
+        name = "glob___glob_7.1.6.tgz";
+        url  = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz";
+        sha1 = "141f33b81a7c2492e125594307480c46679278a6";
+      };
+    }
+    {
+      name = "global_modules___global_modules_2.0.0.tgz";
+      path = fetchurl {
+        name = "global_modules___global_modules_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz";
+        sha1 = "997605ad2345f27f51539bea26574421215c7780";
       };
     }
     {
@@ -5994,11 +4778,11 @@
       };
     }
     {
-      name = "globals_docs___globals_docs_2.4.0.tgz";
+      name = "global_prefix___global_prefix_3.0.0.tgz";
       path = fetchurl {
-        name = "globals_docs___globals_docs_2.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/globals-docs/-/globals-docs-2.4.0.tgz";
-        sha1 = "f2c647544eb6161c7c38452808e16e693c2dafbb";
+        name = "global_prefix___global_prefix_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz";
+        sha1 = "fc85f73064df69f50421f47f883fe5b913ba9b97";
       };
     }
     {
@@ -6034,27 +4818,19 @@
       };
     }
     {
-      name = "graceful_fs___graceful_fs_4.1.15.tgz";
+      name = "graceful_fs___graceful_fs_4.2.3.tgz";
       path = fetchurl {
-        name = "graceful_fs___graceful_fs_4.1.15.tgz";
-        url  = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz";
-        sha1 = "ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00";
+        name = "graceful_fs___graceful_fs_4.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz";
+        sha1 = "4a12ff1b60376ef09862c2093edd908328be8423";
       };
     }
     {
-      name = "graceful_fs___graceful_fs_4.2.0.tgz";
+      name = "graphlib___graphlib_2.1.8.tgz";
       path = fetchurl {
-        name = "graceful_fs___graceful_fs_4.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz";
-        sha1 = "8d8fdc73977cb04104721cb53666c1ca64cd328b";
-      };
-    }
-    {
-      name = "graphlibrary___graphlibrary_2.2.0.tgz";
-      path = fetchurl {
-        name = "graphlibrary___graphlibrary_2.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/graphlibrary/-/graphlibrary-2.2.0.tgz";
-        sha1 = "017a14899775228dec4497a39babfdd6bf56eac6";
+        name = "graphlib___graphlib_2.1.8.tgz";
+        url  = "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.8.tgz";
+        sha1 = "5761d414737870084c92ec7b5dbcb0592c9d35da";
       };
     }
     {
@@ -6066,19 +4842,11 @@
       };
     }
     {
-      name = "gulp_print___gulp_print_5.0.2.tgz";
+      name = "handlebars___handlebars_4.7.3.tgz";
       path = fetchurl {
-        name = "gulp_print___gulp_print_5.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/gulp-print/-/gulp-print-5.0.2.tgz";
-        sha1 = "8f379148218d2e168461baa74352e11d1bf7aa75";
-      };
-    }
-    {
-      name = "handlebars___handlebars_4.1.2.tgz";
-      path = fetchurl {
-        name = "handlebars___handlebars_4.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz";
-        sha1 = "b6b37c1ced0306b221e094fc7aca3ec23b131b67";
+        name = "handlebars___handlebars_4.7.3.tgz";
+        url  = "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.3.tgz";
+        sha1 = "8ece2797826886cf8082d1726ff21d2a022550ee";
       };
     }
     {
@@ -6138,11 +4906,11 @@
       };
     }
     {
-      name = "has_symbols___has_symbols_1.0.0.tgz";
+      name = "has_symbols___has_symbols_1.0.1.tgz";
       path = fetchurl {
-        name = "has_symbols___has_symbols_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz";
-        sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44";
+        name = "has_symbols___has_symbols_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz";
+        sha1 = "9f5214758a44196c406d9bd76cebf81ec2dd31e8";
       };
     }
     {
@@ -6217,38 +4985,6 @@
         sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1";
       };
     }
-    {
-      name = "hast_util_is_element___hast_util_is_element_1.0.3.tgz";
-      path = fetchurl {
-        name = "hast_util_is_element___hast_util_is_element_1.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/hast-util-is-element/-/hast-util-is-element-1.0.3.tgz";
-        sha1 = "423b4b26fe8bf1f25950fe052e9ce8f83fd5f6a4";
-      };
-    }
-    {
-      name = "hast_util_sanitize___hast_util_sanitize_1.3.1.tgz";
-      path = fetchurl {
-        name = "hast_util_sanitize___hast_util_sanitize_1.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/hast-util-sanitize/-/hast-util-sanitize-1.3.1.tgz";
-        sha1 = "4e60d66336bd67e52354d581967467029a933f2e";
-      };
-    }
-    {
-      name = "hast_util_to_html___hast_util_to_html_4.0.1.tgz";
-      path = fetchurl {
-        name = "hast_util_to_html___hast_util_to_html_4.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/hast-util-to-html/-/hast-util-to-html-4.0.1.tgz";
-        sha1 = "3666b05afb62bd69f8f5e6c94db04dea19438e2a";
-      };
-    }
-    {
-      name = "hast_util_whitespace___hast_util_whitespace_1.0.3.tgz";
-      path = fetchurl {
-        name = "hast_util_whitespace___hast_util_whitespace_1.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-1.0.3.tgz";
-        sha1 = "6d161b307bd0693b5ec000c7c7e8b5445109ee34";
-      };
-    }
     {
       name = "he___he_1.1.1.tgz";
       path = fetchurl {
@@ -6266,27 +5002,27 @@
       };
     }
     {
-      name = "helmet_crossdomain___helmet_crossdomain_0.3.0.tgz";
+      name = "helmet_crossdomain___helmet_crossdomain_0.4.0.tgz";
       path = fetchurl {
-        name = "helmet_crossdomain___helmet_crossdomain_0.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/helmet-crossdomain/-/helmet-crossdomain-0.3.0.tgz";
-        sha1 = "707e2df930f13ad61f76ed08e1bb51ab2b2e85fa";
+        name = "helmet_crossdomain___helmet_crossdomain_0.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/helmet-crossdomain/-/helmet-crossdomain-0.4.0.tgz";
+        sha1 = "5f1fe5a836d0325f1da0a78eaa5fd8429078894e";
       };
     }
     {
-      name = "helmet_csp___helmet_csp_2.7.1.tgz";
+      name = "helmet_csp___helmet_csp_2.9.4.tgz";
       path = fetchurl {
-        name = "helmet_csp___helmet_csp_2.7.1.tgz";
-        url  = "https://registry.yarnpkg.com/helmet-csp/-/helmet-csp-2.7.1.tgz";
-        sha1 = "e8e0b5186ffd4db625cfcce523758adbfadb9dca";
+        name = "helmet_csp___helmet_csp_2.9.4.tgz";
+        url  = "https://registry.yarnpkg.com/helmet-csp/-/helmet-csp-2.9.4.tgz";
+        sha1 = "801382bac98f2f88706dc5c89d95c7e31af3a4a9";
       };
     }
     {
-      name = "helmet___helmet_3.18.0.tgz";
+      name = "helmet___helmet_3.21.2.tgz";
       path = fetchurl {
-        name = "helmet___helmet_3.18.0.tgz";
-        url  = "https://registry.yarnpkg.com/helmet/-/helmet-3.18.0.tgz";
-        sha1 = "37666f7c861bd1ff3015e0cdb903a43501e3da3e";
+        name = "helmet___helmet_3.21.2.tgz";
+        url  = "https://registry.yarnpkg.com/helmet/-/helmet-3.21.2.tgz";
+        sha1 = "7e2a19d5f6d898a77b5d2858e8e4bb2cda59f19f";
       };
     }
     {
@@ -6298,27 +5034,19 @@
       };
     }
     {
-      name = "hide_powered_by___hide_powered_by_1.0.0.tgz";
+      name = "hide_powered_by___hide_powered_by_1.1.0.tgz";
       path = fetchurl {
-        name = "hide_powered_by___hide_powered_by_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/hide-powered-by/-/hide-powered-by-1.0.0.tgz";
-        sha1 = "4a85ad65881f62857fc70af7174a1184dccce32b";
+        name = "hide_powered_by___hide_powered_by_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/hide-powered-by/-/hide-powered-by-1.1.0.tgz";
+        sha1 = "be3ea9cab4bdb16f8744be873755ca663383fa7a";
       };
     }
     {
-      name = "highlight.js___highlight.js_9.15.8.tgz";
+      name = "highlight.js___highlight.js_9.18.1.tgz";
       path = fetchurl {
-        name = "highlight.js___highlight.js_9.15.8.tgz";
-        url  = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.8.tgz";
-        sha1 = "f344fda123f36f1a65490e932cf90569e4999971";
-      };
-    }
-    {
-      name = "highlight.js___highlight.js_9.15.9.tgz";
-      path = fetchurl {
-        name = "highlight.js___highlight.js_9.15.9.tgz";
-        url  = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.9.tgz";
-        sha1 = "865257da1dbb4a58c4552d46c4b3854f77f0e6d5";
+        name = "highlight.js___highlight.js_9.18.1.tgz";
+        url  = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.1.tgz";
+        sha1 = "ed21aa001fe6252bb10a3d76d47573c6539fe13c";
       };
     }
     {
@@ -6354,11 +5082,11 @@
       };
     }
     {
-      name = "hosted_git_info___hosted_git_info_2.7.1.tgz";
+      name = "hosted_git_info___hosted_git_info_2.8.5.tgz";
       path = fetchurl {
-        name = "hosted_git_info___hosted_git_info_2.7.1.tgz";
-        url  = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz";
-        sha1 = "97f236977bd6e125408930ff6de3eec6281ec047";
+        name = "hosted_git_info___hosted_git_info_2.8.5.tgz";
+        url  = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz";
+        sha1 = "759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c";
       };
     }
     {
@@ -6410,11 +5138,11 @@
       };
     }
     {
-      name = "html_minifier___html_minifier_3.5.21.tgz";
+      name = "html_minifier_terser___html_minifier_terser_5.0.3.tgz";
       path = fetchurl {
-        name = "html_minifier___html_minifier_3.5.21.tgz";
-        url  = "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.21.tgz";
-        sha1 = "d0040e054730e354db008463593194015212d20c";
+        name = "html_minifier_terser___html_minifier_terser_5.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.3.tgz";
+        sha1 = "b33549b57be7f0357be0d0b892995aaed1ed90f8";
       };
     }
     {
@@ -6426,19 +5154,11 @@
       };
     }
     {
-      name = "html_void_elements___html_void_elements_1.0.4.tgz";
+      name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.11.tgz";
       path = fetchurl {
-        name = "html_void_elements___html_void_elements_1.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.4.tgz";
-        sha1 = "95e8bb5ecd6b88766569c2645f2b5f1591db9ba5";
-      };
-    }
-    {
-      name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.2.tgz";
-      path = fetchurl {
-        name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.2.tgz";
-        url  = "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.2.tgz";
-        sha1 = "c3a212448ee198a17dacd06525678ee12f917420";
+        name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.11.tgz";
+        url  = "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.11.tgz";
+        sha1 = "3059a69144b5aecef97708196ca32f9e68677715";
       };
     }
     {
@@ -6458,11 +5178,11 @@
       };
     }
     {
-      name = "http_parser_js___http_parser_js_0.4.10.tgz";
+      name = "http_errors___http_errors_1.7.3.tgz";
       path = fetchurl {
-        name = "http_parser_js___http_parser_js_0.4.10.tgz";
-        url  = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz";
-        sha1 = "92c9c1374c35085f75db359ec56cc257cbb93fa4";
+        name = "http_errors___http_errors_1.7.3.tgz";
+        url  = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz";
+        sha1 = "6c619e4f9c60308c38519498c14fbb10aacebb06";
       };
     }
     {
@@ -6482,11 +5202,11 @@
       };
     }
     {
-      name = "i18n___i18n_0.8.3.tgz";
+      name = "i18n___i18n_0.8.5.tgz";
       path = fetchurl {
-        name = "i18n___i18n_0.8.3.tgz";
-        url  = "https://registry.yarnpkg.com/i18n/-/i18n-0.8.3.tgz";
-        sha1 = "2d8cf1c24722602c2041d01ba6ae5eaa51388f0e";
+        name = "i18n___i18n_0.8.5.tgz";
+        url  = "https://registry.yarnpkg.com/i18n/-/i18n-0.8.5.tgz";
+        sha1 = "3ae2db28fa1670e3f5ba30d3e505958b0b62e7ec";
       };
     }
     {
@@ -6498,27 +5218,19 @@
       };
     }
     {
-      name = "icss_replace_symbols___icss_replace_symbols_1.1.0.tgz";
+      name = "iconv_lite___iconv_lite_0.5.1.tgz";
       path = fetchurl {
-        name = "icss_replace_symbols___icss_replace_symbols_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz";
-        sha1 = "06ea6f83679a7749e386cfe1fe812ae5db223ded";
+        name = "iconv_lite___iconv_lite_0.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.1.tgz";
+        sha1 = "b2425d3c7b18f7219f2ca663d103bddb91718d64";
       };
     }
     {
-      name = "icss_utils___icss_utils_2.1.0.tgz";
+      name = "icss_utils___icss_utils_4.1.1.tgz";
       path = fetchurl {
-        name = "icss_utils___icss_utils_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz";
-        sha1 = "83f0a0ec378bf3246178b6c2ad9136f135b1c962";
-      };
-    }
-    {
-      name = "ieee754___ieee754_1.1.8.tgz";
-      path = fetchurl {
-        name = "ieee754___ieee754_1.1.8.tgz";
-        url  = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz";
-        sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4";
+        name = "icss_utils___icss_utils_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz";
+        sha1 = "21170b53789ee27447c2f47dd683081403f9a467";
       };
     }
     {
@@ -6546,11 +5258,11 @@
       };
     }
     {
-      name = "ignore_walk___ignore_walk_3.0.1.tgz";
+      name = "ignore_walk___ignore_walk_3.0.3.tgz";
       path = fetchurl {
-        name = "ignore_walk___ignore_walk_3.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz";
-        sha1 = "a83e62e7d272ac0e3b551aaa82831a19b69f82f8";
+        name = "ignore_walk___ignore_walk_3.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz";
+        sha1 = "017e2447184bfeade7c238e4aefdd1e8f95b1e37";
       };
     }
     {
@@ -6570,27 +5282,11 @@
       };
     }
     {
-      name = "ignore___ignore_5.1.2.tgz";
+      name = "ignore___ignore_5.1.4.tgz";
       path = fetchurl {
-        name = "ignore___ignore_5.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.2.tgz";
-        sha1 = "e28e584d43ad7e92f96995019cc43b9e1ac49558";
-      };
-    }
-    {
-      name = "ignorefs___ignorefs_1.2.0.tgz";
-      path = fetchurl {
-        name = "ignorefs___ignorefs_1.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/ignorefs/-/ignorefs-1.2.0.tgz";
-        sha1 = "da59fb858976e4a5e43702ccd1f282fdbc9e5756";
-      };
-    }
-    {
-      name = "ignorepatterns___ignorepatterns_1.1.0.tgz";
-      path = fetchurl {
-        name = "ignorepatterns___ignorepatterns_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/ignorepatterns/-/ignorepatterns-1.1.0.tgz";
-        sha1 = "ac8f436f2239b5dfb66d5f0d3a904a87ac67cc5e";
+        name = "ignore___ignore_5.1.4.tgz";
+        url  = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz";
+        sha1 = "84b7b3dbe64552b6ef0eca99f6743dbec6d97adf";
       };
     }
     {
@@ -6626,11 +5322,11 @@
       };
     }
     {
-      name = "import_fresh___import_fresh_3.0.0.tgz";
+      name = "import_fresh___import_fresh_3.2.1.tgz";
       path = fetchurl {
-        name = "import_fresh___import_fresh_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.0.0.tgz";
-        sha1 = "a3d897f420cab0e671236897f75bc14b4885c390";
+        name = "import_fresh___import_fresh_3.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz";
+        sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66";
       };
     }
     {
@@ -6673,6 +5369,14 @@
         sha1 = "82dc336d232b9062179d05ab3293a66059fd435d";
       };
     }
+    {
+      name = "infer_owner___infer_owner_1.0.4.tgz";
+      path = fetchurl {
+        name = "infer_owner___infer_owner_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz";
+        sha1 = "c4cefcaa8e51051c2a40ba2ce8a3d27295af9467";
+      };
+    }
     {
       name = "inflection___inflection_1.12.0.tgz";
       path = fetchurl {
@@ -6690,11 +5394,11 @@
       };
     }
     {
-      name = "inherits___inherits_2.0.3.tgz";
+      name = "inherits___inherits_2.0.4.tgz";
       path = fetchurl {
-        name = "inherits___inherits_2.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz";
-        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+        name = "inherits___inherits_2.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz";
+        sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c";
       };
     }
     {
@@ -6705,6 +5409,14 @@
         sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
       };
     }
+    {
+      name = "inherits___inherits_2.0.3.tgz";
+      path = fetchurl {
+        name = "inherits___inherits_2.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz";
+        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+      };
+    }
     {
       name = "ini___ini_1.3.5.tgz";
       path = fetchurl {
@@ -6714,11 +5426,11 @@
       };
     }
     {
-      name = "inquirer___inquirer_6.3.1.tgz";
+      name = "inquirer___inquirer_6.5.2.tgz";
       path = fetchurl {
-        name = "inquirer___inquirer_6.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/inquirer/-/inquirer-6.3.1.tgz";
-        sha1 = "7a413b5e7950811013a3db491c61d1f3b776e8e7";
+        name = "inquirer___inquirer_6.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz";
+        sha1 = "ad50942375d036d327ff528c08bd5fab089928ca";
       };
     }
     {
@@ -6769,14 +5481,6 @@
         sha1 = "50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6";
       };
     }
-    {
-      name = "is_absolute___is_absolute_1.0.0.tgz";
-      path = fetchurl {
-        name = "is_absolute___is_absolute_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz";
-        sha1 = "395e1ae84b11f26ad1795e73c17378e48a301576";
-      };
-    }
     {
       name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz";
       path = fetchurl {
@@ -6794,27 +5498,11 @@
       };
     }
     {
-      name = "is_alphabetical___is_alphabetical_1.0.3.tgz";
+      name = "is_arguments___is_arguments_1.0.4.tgz";
       path = fetchurl {
-        name = "is_alphabetical___is_alphabetical_1.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.3.tgz";
-        sha1 = "eb04cc47219a8895d8450ace4715abff2258a1f8";
-      };
-    }
-    {
-      name = "is_alphanumeric___is_alphanumeric_1.0.0.tgz";
-      path = fetchurl {
-        name = "is_alphanumeric___is_alphanumeric_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz";
-        sha1 = "4a9cef71daf4c001c1d81d63d140cf53fd6889f4";
-      };
-    }
-    {
-      name = "is_alphanumerical___is_alphanumerical_1.0.3.tgz";
-      path = fetchurl {
-        name = "is_alphanumerical___is_alphanumerical_1.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.3.tgz";
-        sha1 = "57ae21c374277b3defe0274c640a5704b8f6657c";
+        name = "is_arguments___is_arguments_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz";
+        sha1 = "3faf966c7cba0ff437fb31f6250082fcf0448cf3";
       };
     }
     {
@@ -6858,19 +5546,11 @@
       };
     }
     {
-      name = "is_buffer___is_buffer_2.0.3.tgz";
+      name = "is_callable___is_callable_1.1.5.tgz";
       path = fetchurl {
-        name = "is_buffer___is_buffer_2.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz";
-        sha1 = "4ecf3fcf749cbd1e472689e109ac66261a25e725";
-      };
-    }
-    {
-      name = "is_callable___is_callable_1.1.4.tgz";
-      path = fetchurl {
-        name = "is_callable___is_callable_1.1.4.tgz";
-        url  = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz";
-        sha1 = "1e1adf219e1eeb684d691f9d6a05ff0d30a24d75";
+        name = "is_callable___is_callable_1.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz";
+        sha1 = "f7e46b596890456db74e7f6e976cb3273d06faab";
       };
     }
     {
@@ -6898,19 +5578,11 @@
       };
     }
     {
-      name = "is_date_object___is_date_object_1.0.1.tgz";
+      name = "is_date_object___is_date_object_1.0.2.tgz";
       path = fetchurl {
-        name = "is_date_object___is_date_object_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz";
-        sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16";
-      };
-    }
-    {
-      name = "is_decimal___is_decimal_1.0.3.tgz";
-      path = fetchurl {
-        name = "is_decimal___is_decimal_1.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.3.tgz";
-        sha1 = "381068759b9dc807d8c0dc0bfbae2b68e1da48b7";
+        name = "is_date_object___is_date_object_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz";
+        sha1 = "bda736f2cd8fd06d32844e7743bfa7494c3bfd7e";
       };
     }
     {
@@ -6986,11 +5658,11 @@
       };
     }
     {
-      name = "is_finite___is_finite_1.0.2.tgz";
+      name = "is_finite___is_finite_1.1.0.tgz";
       path = fetchurl {
-        name = "is_finite___is_finite_1.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz";
-        sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
+        name = "is_finite___is_finite_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz";
+        sha1 = "904135c77fb42c0641d6aa1bcdbc4daa8da082f3";
       };
     }
     {
@@ -7009,14 +5681,6 @@
         sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
       };
     }
-    {
-      name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz";
-      path = fetchurl {
-        name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz";
-        sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d";
-      };
-    }
     {
       name = "is_glob___is_glob_2.0.1.tgz";
       path = fetchurl {
@@ -7041,22 +5705,6 @@
         sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc";
       };
     }
-    {
-      name = "is_hexadecimal___is_hexadecimal_1.0.3.tgz";
-      path = fetchurl {
-        name = "is_hexadecimal___is_hexadecimal_1.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.3.tgz";
-        sha1 = "e8a426a69b6d31470d3a33a47bb825cda02506ee";
-      };
-    }
-    {
-      name = "is_negated_glob___is_negated_glob_1.0.0.tgz";
-      path = fetchurl {
-        name = "is_negated_glob___is_negated_glob_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz";
-        sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2";
-      };
-    }
     {
       name = "is_number___is_number_2.1.0.tgz";
       path = fetchurl {
@@ -7082,11 +5730,11 @@
       };
     }
     {
-      name = "is_obj___is_obj_1.0.1.tgz";
+      name = "is_obj___is_obj_2.0.0.tgz";
       path = fetchurl {
-        name = "is_obj___is_obj_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz";
-        sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f";
+        name = "is_obj___is_obj_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz";
+        sha1 = "473fb05d973705e3fd9620545018ca8e22ef4982";
       };
     }
     {
@@ -7138,11 +5786,11 @@
       };
     }
     {
-      name = "is_regex___is_regex_1.0.4.tgz";
+      name = "is_regex___is_regex_1.0.5.tgz";
       path = fetchurl {
-        name = "is_regex___is_regex_1.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz";
-        sha1 = "5517489b547091b0930e095654ced25ee97e9491";
+        name = "is_regex___is_regex_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz";
+        sha1 = "39d589a358bf18967f726967120b8fc1aed74eae";
       };
     }
     {
@@ -7153,14 +5801,6 @@
         sha1 = "fd2d883545c46bac5a633e7b9a09e87fa2cb5069";
       };
     }
-    {
-      name = "is_relative___is_relative_1.0.0.tgz";
-      path = fetchurl {
-        name = "is_relative___is_relative_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz";
-        sha1 = "a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d";
-      };
-    }
     {
       name = "is_resolvable___is_resolvable_1.1.0.tgz";
       path = fetchurl {
@@ -7169,14 +5809,6 @@
         sha1 = "fb18f87ce1feb925169c9a407c19318a3206ed88";
       };
     }
-    {
-      name = "is_ssh___is_ssh_1.3.1.tgz";
-      path = fetchurl {
-        name = "is_ssh___is_ssh_1.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.1.tgz";
-        sha1 = "f349a8cadd24e65298037a522cf7520f2e81a0f3";
-      };
-    }
     {
       name = "is_stream___is_stream_1.1.0.tgz";
       path = fetchurl {
@@ -7185,6 +5817,14 @@
         sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
       };
     }
+    {
+      name = "is_string___is_string_1.0.5.tgz";
+      path = fetchurl {
+        name = "is_string___is_string_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz";
+        sha1 = "40493ed198ef3ff477b8c7f92f644ec82a5cd3a6";
+      };
+    }
     {
       name = "is_svg___is_svg_3.0.0.tgz";
       path = fetchurl {
@@ -7194,11 +5834,11 @@
       };
     }
     {
-      name = "is_symbol___is_symbol_1.0.2.tgz";
+      name = "is_symbol___is_symbol_1.0.3.tgz";
       path = fetchurl {
-        name = "is_symbol___is_symbol_1.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz";
-        sha1 = "a055f6ae57192caee329e7a860118b497a950f38";
+        name = "is_symbol___is_symbol_1.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz";
+        sha1 = "38e1014b9e6329be0de9d24a414fd7441ec61937";
       };
     }
     {
@@ -7209,38 +5849,6 @@
         sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
       };
     }
-    {
-      name = "is_unc_path___is_unc_path_1.0.0.tgz";
-      path = fetchurl {
-        name = "is_unc_path___is_unc_path_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz";
-        sha1 = "d731e8898ed090a12c352ad2eaed5095ad322c9d";
-      };
-    }
-    {
-      name = "is_utf8___is_utf8_0.2.1.tgz";
-      path = fetchurl {
-        name = "is_utf8___is_utf8_0.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz";
-        sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72";
-      };
-    }
-    {
-      name = "is_valid_glob___is_valid_glob_1.0.0.tgz";
-      path = fetchurl {
-        name = "is_valid_glob___is_valid_glob_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz";
-        sha1 = "29bf3eff701be2d4d315dbacc39bc39fe8f601aa";
-      };
-    }
-    {
-      name = "is_whitespace_character___is_whitespace_character_1.0.3.tgz";
-      path = fetchurl {
-        name = "is_whitespace_character___is_whitespace_character_1.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.3.tgz";
-        sha1 = "b3ad9546d916d7d3ffa78204bca0c26b56257fac";
-      };
-    }
     {
       name = "is_windows___is_windows_1.0.2.tgz";
       path = fetchurl {
@@ -7249,14 +5857,6 @@
         sha1 = "d1850eb9791ecd18e6182ce12a30f396634bb19d";
       };
     }
-    {
-      name = "is_word_character___is_word_character_1.0.3.tgz";
-      path = fetchurl {
-        name = "is_word_character___is_word_character_1.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.3.tgz";
-        sha1 = "264d15541cbad0ba833d3992c34e6b40873b08aa";
-      };
-    }
     {
       name = "is_wsl___is_wsl_1.1.0.tgz";
       path = fetchurl {
@@ -7354,27 +5954,19 @@
       };
     }
     {
-      name = "js_beautify___js_beautify_1.10.0.tgz";
+      name = "js_beautify___js_beautify_1.10.3.tgz";
       path = fetchurl {
-        name = "js_beautify___js_beautify_1.10.0.tgz";
-        url  = "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.10.0.tgz";
-        sha1 = "9753a13c858d96828658cd18ae3ca0e5783ea672";
+        name = "js_beautify___js_beautify_1.10.3.tgz";
+        url  = "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.10.3.tgz";
+        sha1 = "c73fa10cf69d3dfa52d8ed624f23c64c0a6a94c1";
       };
     }
     {
-      name = "js_cookie___js_cookie_2.2.0.tgz";
+      name = "js_cookie___js_cookie_2.2.1.tgz";
       path = fetchurl {
-        name = "js_cookie___js_cookie_2.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.0.tgz";
-        sha1 = "1b2c279a6eece380a12168b92485265b35b1effb";
-      };
-    }
-    {
-      name = "js_levenshtein___js_levenshtein_1.1.6.tgz";
-      path = fetchurl {
-        name = "js_levenshtein___js_levenshtein_1.1.6.tgz";
-        url  = "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz";
-        sha1 = "c6cee58eb3550372df8deb85fad5ce66ce01d59d";
+        name = "js_cookie___js_cookie_2.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz";
+        sha1 = "69e106dc5d5806894562902aa5baec3744e9b2b8";
       };
     }
     {
@@ -7393,14 +5985,6 @@
           tar cf $out --mode u+w -C ${repo} .
         '';
   }
-    {
-      name = "js_string_escape___js_string_escape_1.0.1.tgz";
-      path = fetchurl {
-        name = "js_string_escape___js_string_escape_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz";
-        sha1 = "e2625badbc0d67c7533e9edc1068c587ae4137ef";
-      };
-    }
     {
       name = "js_tokens___js_tokens_4.0.0.tgz";
       path = fetchurl {
@@ -7425,6 +6009,14 @@
         sha1 = "aff151b30bfdfa8e49e05da22e7415e9dfa37847";
       };
     }
+    {
+      name = "jsbi___jsbi_3.1.1.tgz";
+      path = fetchurl {
+        name = "jsbi___jsbi_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/jsbi/-/jsbi-3.1.1.tgz";
+        sha1 = "8ea18b3e08d102c6cc09acaa9a099921d775f4fa";
+      };
+    }
     {
       name = "jsbn___jsbn_0.1.1.tgz";
       path = fetchurl {
@@ -7457,14 +6049,6 @@
         sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b";
       };
     }
-    {
-      name = "jsesc___jsesc_2.5.2.tgz";
-      path = fetchurl {
-        name = "jsesc___jsesc_2.5.2.tgz";
-        url  = "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz";
-        sha1 = "80564d2e483dacf6e8ef209650a67df3f0c283a4";
-      };
-    }
     {
       name = "jsesc___jsesc_0.5.0.tgz";
       path = fetchurl {
@@ -7545,14 +6129,6 @@
         sha1 = "779fb0018604fa854eacbf6252180d83543e3dbe";
       };
     }
-    {
-      name = "json5___json5_2.1.0.tgz";
-      path = fetchurl {
-        name = "json5___json5_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz";
-        sha1 = "e7a0c62c48285c628d20a10b85c89bb807c32850";
-      };
-    }
     {
       name = "jsonfile___jsonfile_2.4.0.tgz";
       path = fetchurl {
@@ -7577,14 +6153,6 @@
         sha1 = "cb5e31efc0b78291d0d862fbef05900adf212988";
       };
     }
-    {
-      name = "jsonparse___jsonparse_1.3.1.tgz";
-      path = fetchurl {
-        name = "jsonparse___jsonparse_1.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz";
-        sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280";
-      };
-    }
     {
       name = "jsonparse___jsonparse_1.2.0.tgz";
       path = fetchurl {
@@ -7601,6 +6169,22 @@
         sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
       };
     }
+    {
+      name = "jwa___jwa_1.4.1.tgz";
+      path = fetchurl {
+        name = "jwa___jwa_1.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz";
+        sha1 = "743c32985cb9e98655530d53641b66c8645b039a";
+      };
+    }
+    {
+      name = "jws___jws_3.2.2.tgz";
+      path = fetchurl {
+        name = "jws___jws_3.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz";
+        sha1 = "001099f3639468c9414000e99995fa52fb478304";
+      };
+    }
     {
       name = "kew___kew_0.7.0.tgz";
       path = fetchurl {
@@ -7642,11 +6226,11 @@
       };
     }
     {
-      name = "kind_of___kind_of_6.0.2.tgz";
+      name = "kind_of___kind_of_6.0.3.tgz";
       path = fetchurl {
-        name = "kind_of___kind_of_6.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz";
-        sha1 = "01146b36a6218e64e58f3a8d66de5d7fc6f6d051";
+        name = "kind_of___kind_of_6.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz";
+        sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd";
       };
     }
     {
@@ -7706,11 +6290,11 @@
       };
     }
     {
-      name = "ldapauth_fork___ldapauth_fork_4.2.0.tgz";
+      name = "ldapauth_fork___ldapauth_fork_4.3.1.tgz";
       path = fetchurl {
-        name = "ldapauth_fork___ldapauth_fork_4.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/ldapauth-fork/-/ldapauth-fork-4.2.0.tgz";
-        sha1 = "3d2f809f973deb127a35eb523135661b7013e9d9";
+        name = "ldapauth_fork___ldapauth_fork_4.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/ldapauth-fork/-/ldapauth-fork-4.3.1.tgz";
+        sha1 = "500c04f339257ac0e189af8752ec5df43982ceac";
       };
     }
     {
@@ -7721,14 +6305,6 @@
         sha1 = "544ff7032b7b83c68f0701328d9297aa694340f9";
       };
     }
-    {
-      name = "lead___lead_1.0.0.tgz";
-      path = fetchurl {
-        name = "lead___lead_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz";
-        sha1 = "6f14f99a37be3a9dd784f5495690e5903466ee42";
-      };
-    }
     {
       name = "left_pad___left_pad_1.3.0.tgz";
       path = fetchurl {
@@ -7738,19 +6314,19 @@
       };
     }
     {
-      name = "less_loader___less_loader_4.1.0.tgz";
+      name = "less_loader___less_loader_5.0.0.tgz";
       path = fetchurl {
-        name = "less_loader___less_loader_4.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/less-loader/-/less-loader-4.1.0.tgz";
-        sha1 = "2c1352c5b09a4f84101490274fd51674de41363e";
+        name = "less_loader___less_loader_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/less-loader/-/less-loader-5.0.0.tgz";
+        sha1 = "498dde3a6c6c4f887458ee9ed3f086a12ad1b466";
       };
     }
     {
-      name = "less___less_2.7.3.tgz";
+      name = "less___less_3.11.1.tgz";
       path = fetchurl {
-        name = "less___less_2.7.3.tgz";
-        url  = "https://registry.yarnpkg.com/less/-/less-2.7.3.tgz";
-        sha1 = "cc1260f51c900a9ec0d91fb6998139e02507b63b";
+        name = "less___less_3.11.1.tgz";
+        url  = "https://registry.yarnpkg.com/less/-/less-3.11.1.tgz";
+        sha1 = "c6bf08e39e02404fe6b307a3dfffafdc55bd36e2";
       };
     }
     {
@@ -7762,11 +6338,11 @@
       };
     }
     {
-      name = "linkify_it___linkify_it_2.1.0.tgz";
+      name = "linkify_it___linkify_it_2.2.0.tgz";
       path = fetchurl {
-        name = "linkify_it___linkify_it_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.1.0.tgz";
-        sha1 = "c4caf38a6cd7ac2212ef3c7d2bde30a91561f9db";
+        name = "linkify_it___linkify_it_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz";
+        sha1 = "e3b54697e78bf915c70a38acd78fd09e0058b1cf";
       };
     }
     {
@@ -7777,14 +6353,6 @@
         sha1 = "a4cbfc8281ddefc02fdb2d30c8748bfae25fbcda";
       };
     }
-    {
-      name = "livereload_js___livereload_js_2.4.0.tgz";
-      path = fetchurl {
-        name = "livereload_js___livereload_js_2.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz";
-        sha1 = "447c31cf1ea9ab52fc20db615c5ddf678f78009c";
-      };
-    }
     {
       name = "load_json_file___load_json_file_2.0.0.tgz";
       path = fetchurl {
@@ -7793,14 +6361,6 @@
         sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8";
       };
     }
-    {
-      name = "load_json_file___load_json_file_4.0.0.tgz";
-      path = fetchurl {
-        name = "load_json_file___load_json_file_4.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz";
-        sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b";
-      };
-    }
     {
       name = "loader_runner___loader_runner_2.4.0.tgz";
       path = fetchurl {
@@ -7809,14 +6369,6 @@
         sha1 = "ed47066bfe534d7e84c4c7b9998c2a75607d9357";
       };
     }
-    {
-      name = "loader_utils___loader_utils_0.2.17.tgz";
-      path = fetchurl {
-        name = "loader_utils___loader_utils_0.2.17.tgz";
-        url  = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz";
-        sha1 = "f86e6374d43205a6e6c60e9196f17c0299bfb348";
-      };
-    }
     {
       name = "loader_utils___loader_utils_1.2.3.tgz";
       path = fetchurl {
@@ -7906,11 +6458,11 @@
       };
     }
     {
-      name = "lodash.merge___lodash.merge_4.6.1.tgz";
+      name = "lodash.merge___lodash.merge_4.6.2.tgz";
       path = fetchurl {
-        name = "lodash.merge___lodash.merge_4.6.1.tgz";
-        url  = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz";
-        sha1 = "adc25d9cb99b9391c59624f379fbba60d7111d54";
+        name = "lodash.merge___lodash.merge_4.6.2.tgz";
+        url  = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz";
+        sha1 = "558aa53b43b661e1925a0afdfa36a9a1085fe57a";
       };
     }
     {
@@ -7961,14 +6513,6 @@
         sha1 = "d0225373aeb652adc1bc82e4945339a842754773";
       };
     }
-    {
-      name = "lodash___lodash_4.17.11.tgz";
-      path = fetchurl {
-        name = "lodash___lodash_4.17.11.tgz";
-        url  = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz";
-        sha1 = "b39ea6229ef607ecd89e2c8df12536891cac9b8d";
-      };
-    }
     {
       name = "lodash___lodash_4.17.15.tgz";
       path = fetchurl {
@@ -7993,14 +6537,6 @@
         sha1 = "9a7b71cfb7d361a194ea555241c92f7468d5bf28";
       };
     }
-    {
-      name = "longest_streak___longest_streak_2.0.3.tgz";
-      path = fetchurl {
-        name = "longest_streak___longest_streak_2.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.3.tgz";
-        sha1 = "3de7a3f47ee18e9074ded8575b5c091f5d0a4105";
-      };
-    }
     {
       name = "longest___longest_1.0.1.tgz";
       path = fetchurl {
@@ -8074,11 +6610,11 @@
         '';
   }
     {
-      name = "magic_string___magic_string_0.25.2.tgz";
+      name = "magic_string___magic_string_0.25.6.tgz";
       path = fetchurl {
-        name = "magic_string___magic_string_0.25.2.tgz";
-        url  = "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz";
-        sha1 = "139c3a729515ec55e96e69e82a11fe890a293ad9";
+        name = "magic_string___magic_string_0.25.6.tgz";
+        url  = "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.6.tgz";
+        sha1 = "5586387d1242f919c6d223579cc938bf1420795e";
       };
     }
     {
@@ -8098,11 +6634,19 @@
       };
     }
     {
-      name = "make_plural___make_plural_3.0.6.tgz";
+      name = "make_plural___make_plural_4.3.0.tgz";
       path = fetchurl {
-        name = "make_plural___make_plural_3.0.6.tgz";
-        url  = "https://registry.yarnpkg.com/make-plural/-/make-plural-3.0.6.tgz";
-        sha1 = "2033a03bac290b8f3bb91258f65b9df7e8b01ca7";
+        name = "make_plural___make_plural_4.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/make-plural/-/make-plural-4.3.0.tgz";
+        sha1 = "f23de08efdb0cac2e0c9ba9f315b0dff6b4c2735";
+      };
+    }
+    {
+      name = "make_plural___make_plural_6.0.1.tgz";
+      path = fetchurl {
+        name = "make_plural___make_plural_6.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/make-plural/-/make-plural-6.0.1.tgz";
+        sha1 = "ed3839fac3f469ebbe505751d48fe3319769edfc";
       };
     }
     {
@@ -8129,14 +6673,6 @@
         sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf";
       };
     }
-    {
-      name = "map_stream___map_stream_0.0.7.tgz";
-      path = fetchurl {
-        name = "map_stream___map_stream_0.0.7.tgz";
-        url  = "https://registry.yarnpkg.com/map-stream/-/map-stream-0.0.7.tgz";
-        sha1 = "8a1f07896d82b10926bd3744a2420009f88974a8";
-      };
-    }
     {
       name = "map_visit___map_visit_1.0.0.tgz";
       path = fetchurl {
@@ -8146,11 +6682,11 @@
       };
     }
     {
-      name = "markdown_escapes___markdown_escapes_1.0.3.tgz";
+      name = "mariadb___mariadb_2.2.0.tgz";
       path = fetchurl {
-        name = "markdown_escapes___markdown_escapes_1.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.3.tgz";
-        sha1 = "6155e10416efaafab665d466ce598216375195f5";
+        name = "mariadb___mariadb_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/mariadb/-/mariadb-2.2.0.tgz";
+        sha1 = "077e8c44ded718f2ecebef321c3703fe8d524504";
       };
     }
     {
@@ -8186,11 +6722,11 @@
       };
     }
     {
-      name = "markdown_it_footnote___markdown_it_footnote_3.0.1.tgz";
+      name = "markdown_it_footnote___markdown_it_footnote_3.0.2.tgz";
       path = fetchurl {
-        name = "markdown_it_footnote___markdown_it_footnote_3.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/markdown-it-footnote/-/markdown-it-footnote-3.0.1.tgz";
-        sha1 = "7f3730747cacc86e2fe0bf8a17a710f34791517a";
+        name = "markdown_it_footnote___markdown_it_footnote_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/markdown-it-footnote/-/markdown-it-footnote-3.0.2.tgz";
+        sha1 = "1575ee7a093648d4e096aa33386b058d92ac8bc1";
       };
     }
     {
@@ -8250,43 +6786,35 @@
       };
     }
     {
-      name = "markdown_it___markdown_it_8.4.2.tgz";
+      name = "markdown_it___markdown_it_10.0.0.tgz";
       path = fetchurl {
-        name = "markdown_it___markdown_it_8.4.2.tgz";
-        url  = "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz";
-        sha1 = "386f98998dc15a37722aa7722084f4020bdd9b54";
+        name = "markdown_it___markdown_it_10.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/markdown-it/-/markdown-it-10.0.0.tgz";
+        sha1 = "abfc64f141b1722d663402044e43927f1f50a8dc";
       };
     }
     {
-      name = "markdown_pdf___markdown_pdf_9.0.0.tgz";
+      name = "markdown_pdf___markdown_pdf_10.0.0.tgz";
       path = fetchurl {
-        name = "markdown_pdf___markdown_pdf_9.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/markdown-pdf/-/markdown-pdf-9.0.0.tgz";
-        sha1 = "d699f29c3b6c41da4b9a2ec7d09ea8895daef146";
+        name = "markdown_pdf___markdown_pdf_10.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/markdown-pdf/-/markdown-pdf-10.0.0.tgz";
+        sha1 = "0cf7a32740c2966aa79392a35742749d6ed2a491";
       };
     }
     {
-      name = "markdown_table___markdown_table_1.1.3.tgz";
+      name = "marked___marked_0.8.0.tgz";
       path = fetchurl {
-        name = "markdown_table___markdown_table_1.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.3.tgz";
-        sha1 = "9fcb69bcfdb8717bfd0398c6ec2d93036ef8de60";
+        name = "marked___marked_0.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/marked/-/marked-0.8.0.tgz";
+        sha1 = "ec5c0c9b93878dc52dd54be8d0e524097bd81a99";
       };
     }
     {
-      name = "marked___marked_0.7.0.tgz";
+      name = "math_interval_parser___math_interval_parser_2.0.1.tgz";
       path = fetchurl {
-        name = "marked___marked_0.7.0.tgz";
-        url  = "https://registry.yarnpkg.com/marked/-/marked-0.7.0.tgz";
-        sha1 = "b64201f051d271b1edc10a04d1ae9b74bb8e5c0e";
-      };
-    }
-    {
-      name = "math_interval_parser___math_interval_parser_1.1.0.tgz";
-      path = fetchurl {
-        name = "math_interval_parser___math_interval_parser_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/math-interval-parser/-/math-interval-parser-1.1.0.tgz";
-        sha1 = "dbeda5b06b3249973c6df6170fde2386f0afd893";
+        name = "math_interval_parser___math_interval_parser_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/math-interval-parser/-/math-interval-parser-2.0.1.tgz";
+        sha1 = "e22cd6d15a0a7f4c03aec560db76513da615bed4";
       };
     }
     {
@@ -8298,11 +6826,11 @@
       };
     }
     {
-      name = "mathjax___mathjax_2.7.5.tgz";
+      name = "mathjax___mathjax_2.7.7.tgz";
       path = fetchurl {
-        name = "mathjax___mathjax_2.7.5.tgz";
-        url  = "https://registry.yarnpkg.com/mathjax/-/mathjax-2.7.5.tgz";
-        sha1 = "c9c5947f86f9be31651f5f3667d3c9a8bb01efe4";
+        name = "mathjax___mathjax_2.7.7.tgz";
+        url  = "https://registry.yarnpkg.com/mathjax/-/mathjax-2.7.7.tgz";
+        sha1 = "22ff89550a7b1f5f06a037d13da5ff3c33e11ec4";
       };
     }
     {
@@ -8330,59 +6858,11 @@
       };
     }
     {
-      name = "mdast_util_compact___mdast_util_compact_1.0.3.tgz";
+      name = "mdn_data___mdn_data_2.0.4.tgz";
       path = fetchurl {
-        name = "mdast_util_compact___mdast_util_compact_1.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/mdast-util-compact/-/mdast-util-compact-1.0.3.tgz";
-        sha1 = "98a25cc8a7865761a41477b3a87d1dcef0b1e79d";
-      };
-    }
-    {
-      name = "mdast_util_definitions___mdast_util_definitions_1.2.4.tgz";
-      path = fetchurl {
-        name = "mdast_util_definitions___mdast_util_definitions_1.2.4.tgz";
-        url  = "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-1.2.4.tgz";
-        sha1 = "2b54ad4eecaff9d9fcb6bf6f9f6b68b232d77ca7";
-      };
-    }
-    {
-      name = "mdast_util_inject___mdast_util_inject_1.1.0.tgz";
-      path = fetchurl {
-        name = "mdast_util_inject___mdast_util_inject_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/mdast-util-inject/-/mdast-util-inject-1.1.0.tgz";
-        sha1 = "db06b8b585be959a2dcd2f87f472ba9b756f3675";
-      };
-    }
-    {
-      name = "mdast_util_to_hast___mdast_util_to_hast_3.0.4.tgz";
-      path = fetchurl {
-        name = "mdast_util_to_hast___mdast_util_to_hast_3.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-3.0.4.tgz";
-        sha1 = "132001b266031192348d3366a6b011f28e54dc40";
-      };
-    }
-    {
-      name = "mdast_util_to_string___mdast_util_to_string_1.0.6.tgz";
-      path = fetchurl {
-        name = "mdast_util_to_string___mdast_util_to_string_1.0.6.tgz";
-        url  = "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.0.6.tgz";
-        sha1 = "7d85421021343b33de1552fc71cb8e5b4ae7536d";
-      };
-    }
-    {
-      name = "mdast_util_toc___mdast_util_toc_3.1.0.tgz";
-      path = fetchurl {
-        name = "mdast_util_toc___mdast_util_toc_3.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/mdast-util-toc/-/mdast-util-toc-3.1.0.tgz";
-        sha1 = "395eeb877f067f9d2165d990d77c7eea6f740934";
-      };
-    }
-    {
-      name = "mdn_data___mdn_data_1.1.4.tgz";
-      path = fetchurl {
-        name = "mdn_data___mdn_data_1.1.4.tgz";
-        url  = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.4.tgz";
-        sha1 = "50b5d4ffc4575276573c4eedb8780812a8419f01";
+        name = "mdn_data___mdn_data_2.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz";
+        sha1 = "699b3c38ac6f1d728091a64650b65d388502fd5b";
       };
     }
     {
@@ -8425,6 +6905,14 @@
         sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552";
       };
     }
+    {
+      name = "memory_fs___memory_fs_0.5.0.tgz";
+      path = fetchurl {
+        name = "memory_fs___memory_fs_0.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz";
+        sha1 = "324c01288b88652966d161db77838720845a8e3c";
+      };
+    }
     {
       name = "merge_descriptors___merge_descriptors_1.0.1.tgz";
       path = fetchurl {
@@ -8434,19 +6922,35 @@
       };
     }
     {
-      name = "mermaid___mermaid_8.2.3.tgz";
+      name = "mermaid___mermaid_8.4.7.tgz";
       path = fetchurl {
-        name = "mermaid___mermaid_8.2.3.tgz";
-        url  = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.2.3.tgz";
-        sha1 = "609bad45bedc3ee1a935161c11c3c22689cfecd9";
+        name = "mermaid___mermaid_8.4.7.tgz";
+        url  = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.4.7.tgz";
+        sha1 = "1af8f6bece99f022a514471c42b80cabf7706501";
       };
     }
     {
-      name = "messageformat___messageformat_0.3.1.tgz";
+      name = "messageformat_formatters___messageformat_formatters_2.0.1.tgz";
       path = fetchurl {
-        name = "messageformat___messageformat_0.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/messageformat/-/messageformat-0.3.1.tgz";
-        sha1 = "e58fff8245e9b3971799e5b43db58b3e9417f5a2";
+        name = "messageformat_formatters___messageformat_formatters_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/messageformat-formatters/-/messageformat-formatters-2.0.1.tgz";
+        sha1 = "0492c1402a48775f751c9b17c0354e92be012b08";
+      };
+    }
+    {
+      name = "messageformat_parser___messageformat_parser_4.1.2.tgz";
+      path = fetchurl {
+        name = "messageformat_parser___messageformat_parser_4.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/messageformat-parser/-/messageformat-parser-4.1.2.tgz";
+        sha1 = "fd34ec39912a14868a1595eaeb742485ab8ab372";
+      };
+    }
+    {
+      name = "messageformat___messageformat_2.3.0.tgz";
+      path = fetchurl {
+        name = "messageformat___messageformat_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/messageformat/-/messageformat-2.3.0.tgz";
+        sha1 = "de263c49029d5eae65d7ee25e0754f57f425ad91";
       };
     }
     {
@@ -8455,8 +6959,8 @@
       let
         repo = fetchgit {
           url = "https://github.com/codimd/meta-marked";
-          rev = "30852d0efa633418865df179f5956cd3df0fd0b3";
-          sha256 = "0d112jhxvp2zy3gwdp1cc5hk61h2ggfrjdjjhr6qhikf78w10080";
+          rev = "a7b45a287465f79656134ff7142d1d74c8fcacfd";
+          sha256 = "0cd3mxxgr3h49y6df5py8d36pyxv2j8kafxfw0npqhss9233f491";
         };
       in
         runCommandNoCC "meta-marked" { buildInputs = [gnutar]; } ''
@@ -8506,19 +7010,19 @@
       };
     }
     {
-      name = "mime_db___mime_db_1.40.0.tgz";
+      name = "mime_db___mime_db_1.43.0.tgz";
       path = fetchurl {
-        name = "mime_db___mime_db_1.40.0.tgz";
-        url  = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz";
-        sha1 = "a65057e998db090f732a68f6c276d387d4126c32";
+        name = "mime_db___mime_db_1.43.0.tgz";
+        url  = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz";
+        sha1 = "0a12e0502650e473d735535050e7c8f4eb4fae58";
       };
     }
     {
-      name = "mime_types___mime_types_2.1.24.tgz";
+      name = "mime_types___mime_types_2.1.26.tgz";
       path = fetchurl {
-        name = "mime_types___mime_types_2.1.24.tgz";
-        url  = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz";
-        sha1 = "b6f8d0b3e951efb77dedeca194cff6d16f676f81";
+        name = "mime_types___mime_types_2.1.26.tgz";
+        url  = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz";
+        sha1 = "9c921fc09b7e149a65dfdc0da4d20997200b0a06";
       };
     }
     {
@@ -8537,14 +7041,6 @@
         sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1";
       };
     }
-    {
-      name = "mime___mime_2.4.3.tgz";
-      path = fetchurl {
-        name = "mime___mime_2.4.3.tgz";
-        url  = "https://registry.yarnpkg.com/mime/-/mime-2.4.3.tgz";
-        sha1 = "229687331e86f68924e6cb59e1cdd937f18275fe";
-      };
-    }
     {
       name = "mime___mime_2.4.4.tgz";
       path = fetchurl {
@@ -8570,11 +7066,11 @@
       };
     }
     {
-      name = "mini_css_extract_plugin___mini_css_extract_plugin_0.4.5.tgz";
+      name = "mini_css_extract_plugin___mini_css_extract_plugin_0.8.2.tgz";
       path = fetchurl {
-        name = "mini_css_extract_plugin___mini_css_extract_plugin_0.4.5.tgz";
-        url  = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.5.tgz";
-        sha1 = "c99e9e78d54f3fa775633aee5933aeaa4e80719a";
+        name = "mini_css_extract_plugin___mini_css_extract_plugin_0.8.2.tgz";
+        url  = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.2.tgz";
+        sha1 = "a875e169beb27c88af77dd962771c9eedc3da161";
       };
     }
     {
@@ -8642,27 +7138,19 @@
       };
     }
     {
-      name = "minipass___minipass_2.3.5.tgz";
+      name = "minipass___minipass_2.9.0.tgz";
       path = fetchurl {
-        name = "minipass___minipass_2.3.5.tgz";
-        url  = "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz";
-        sha1 = "cacebe492022497f656b0f0f51e2682a9ed2d848";
+        name = "minipass___minipass_2.9.0.tgz";
+        url  = "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz";
+        sha1 = "e713762e7d3e32fed803115cf93e04bca9fcc9a6";
       };
     }
     {
-      name = "minizlib___minizlib_1.2.1.tgz";
+      name = "minizlib___minizlib_1.3.3.tgz";
       path = fetchurl {
-        name = "minizlib___minizlib_1.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz";
-        sha1 = "dd27ea6136243c7c880684e8672bb3a45fd9b614";
-      };
-    }
-    {
-      name = "mississippi___mississippi_2.0.0.tgz";
-      path = fetchurl {
-        name = "mississippi___mississippi_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz";
-        sha1 = "3442a508fafc28500486feea99409676e4ee5a6f";
+        name = "minizlib___minizlib_1.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz";
+        sha1 = "2290de96818a34c29551c8a8d301216bd65a861d";
       };
     }
     {
@@ -8674,11 +7162,11 @@
       };
     }
     {
-      name = "mixin_deep___mixin_deep_1.3.1.tgz";
+      name = "mixin_deep___mixin_deep_1.3.2.tgz";
       path = fetchurl {
-        name = "mixin_deep___mixin_deep_1.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz";
-        sha1 = "a49e7268dce1a0d9698e45326c5626df3543d0fe";
+        name = "mixin_deep___mixin_deep_1.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz";
+        sha1 = "1120b43dc359a785dce65b55b82e257ccf479566";
       };
     }
     {
@@ -8706,27 +7194,19 @@
       };
     }
     {
-      name = "module_deps_sortable___module_deps_sortable_5.0.0.tgz";
+      name = "moment_mini___moment_mini_2.24.0.tgz";
       path = fetchurl {
-        name = "module_deps_sortable___module_deps_sortable_5.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/module-deps-sortable/-/module-deps-sortable-5.0.0.tgz";
-        sha1 = "99db5bb08f7eab55e4c31f6b7c722c6a2144ba74";
+        name = "moment_mini___moment_mini_2.24.0.tgz";
+        url  = "https://registry.yarnpkg.com/moment-mini/-/moment-mini-2.24.0.tgz";
+        sha1 = "fa68d98f7fe93ae65bf1262f6abb5fb6983d8d18";
       };
     }
     {
-      name = "moment_mini___moment_mini_2.22.1.tgz";
+      name = "moment_timezone___moment_timezone_0.5.27.tgz";
       path = fetchurl {
-        name = "moment_mini___moment_mini_2.22.1.tgz";
-        url  = "https://registry.yarnpkg.com/moment-mini/-/moment-mini-2.22.1.tgz";
-        sha1 = "bc32d73e43a4505070be6b53494b17623183420d";
-      };
-    }
-    {
-      name = "moment_timezone___moment_timezone_0.5.25.tgz";
-      path = fetchurl {
-        name = "moment_timezone___moment_timezone_0.5.25.tgz";
-        url  = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.25.tgz";
-        sha1 = "a11bfa2f74e088327f2cd4c08b3e7bdf55957810";
+        name = "moment_timezone___moment_timezone_0.5.27.tgz";
+        url  = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.27.tgz";
+        sha1 = "73adec8139b6fe30452e78f210f27b1f346b8877";
       };
     }
     {
@@ -8770,11 +7250,19 @@
       };
     }
     {
-      name = "mustache___mustache_3.0.1.tgz";
+      name = "ms___ms_2.1.2.tgz";
       path = fetchurl {
-        name = "mustache___mustache_3.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/mustache/-/mustache-3.0.1.tgz";
-        sha1 = "873855f23aa8a95b150fb96d9836edbc5a1d248a";
+        name = "ms___ms_2.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz";
+        sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009";
+      };
+    }
+    {
+      name = "mustache___mustache_4.0.0.tgz";
+      path = fetchurl {
+        name = "mustache___mustache_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/mustache/-/mustache-4.0.0.tgz";
+        sha1 = "7f02465dbb5b435859d154831c032acdfbbefb31";
       };
     }
     {
@@ -8794,11 +7282,11 @@
       };
     }
     {
-      name = "mysql2___mysql2_1.6.5.tgz";
+      name = "mysql2___mysql2_2.1.0.tgz";
       path = fetchurl {
-        name = "mysql2___mysql2_1.6.5.tgz";
-        url  = "https://registry.yarnpkg.com/mysql2/-/mysql2-1.6.5.tgz";
-        sha1 = "6695304fa2ce793dda5c98e8bbec65cbd2e6cb9d";
+        name = "mysql2___mysql2_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/mysql2/-/mysql2-2.1.0.tgz";
+        sha1 = "55ecfd4353114c148cc4c253192dbbfd000e6642";
       };
     }
     {
@@ -8825,6 +7313,14 @@
         sha1 = "b87a8aa4fc0de8fe6be88895b38983ff265bd119";
       };
     }
+    {
+      name = "native_duplexpair___native_duplexpair_1.0.0.tgz";
+      path = fetchurl {
+        name = "native_duplexpair___native_duplexpair_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/native-duplexpair/-/native-duplexpair-1.0.0.tgz";
+        sha1 = "7899078e64bf3c8a3d732601b3d40ff05db58fa0";
+      };
+    }
     {
       name = "natural_compare___natural_compare_1.4.0.tgz";
       path = fetchurl {
@@ -8842,11 +7338,11 @@
       };
     }
     {
-      name = "needle___needle_2.4.0.tgz";
+      name = "needle___needle_2.3.2.tgz";
       path = fetchurl {
-        name = "needle___needle_2.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz";
-        sha1 = "6833e74975c444642590e15a750288c5f939b57c";
+        name = "needle___needle_2.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/needle/-/needle-2.3.2.tgz";
+        sha1 = "3342dea100b7160960a450dc8c22160ac712a528";
       };
     }
     {
@@ -8865,6 +7361,14 @@
         sha1 = "ac27ada66167fa8849a6addd837f6b189ad2081c";
       };
     }
+    {
+      name = "next_tick___next_tick_1.1.0.tgz";
+      path = fetchurl {
+        name = "next_tick___next_tick_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz";
+        sha1 = "1836ee30ad56d67ef281b22bd199f709449b35eb";
+      };
+    }
     {
       name = "next_tick___next_tick_1.0.0.tgz";
       path = fetchurl {
@@ -8914,11 +7418,19 @@
       };
     }
     {
-      name = "node_libs_browser___node_libs_browser_2.2.0.tgz";
+      name = "node_libs_browser___node_libs_browser_2.2.1.tgz";
       path = fetchurl {
-        name = "node_libs_browser___node_libs_browser_2.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.0.tgz";
-        sha1 = "c72f60d9d46de08a940dedbb25f3ffa2f9bbaa77";
+        name = "node_libs_browser___node_libs_browser_2.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz";
+        sha1 = "b64f513d18338625f90346d27b0d235e631f6425";
+      };
+    }
+    {
+      name = "node_pre_gyp___node_pre_gyp_0.14.0.tgz";
+      path = fetchurl {
+        name = "node_pre_gyp___node_pre_gyp_0.14.0.tgz";
+        url  = "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz";
+        sha1 = "9a0596533b877289bcad4e143982ca3d904ddc83";
       };
     }
     {
@@ -8930,27 +7442,11 @@
       };
     }
     {
-      name = "node_pre_gyp___node_pre_gyp_0.12.0.tgz";
+      name = "node_releases___node_releases_1.1.49.tgz";
       path = fetchurl {
-        name = "node_pre_gyp___node_pre_gyp_0.12.0.tgz";
-        url  = "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz";
-        sha1 = "39ba4bb1439da030295f899e3b520b7785766149";
-      };
-    }
-    {
-      name = "node_releases___node_releases_1.1.21.tgz";
-      path = fetchurl {
-        name = "node_releases___node_releases_1.1.21.tgz";
-        url  = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.21.tgz";
-        sha1 = "46c86f9adaceae4d63c75d3c2f2e6eee618e55f3";
-      };
-    }
-    {
-      name = "node_releases___node_releases_1.1.26.tgz";
-      path = fetchurl {
-        name = "node_releases___node_releases_1.1.26.tgz";
-        url  = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.26.tgz";
-        sha1 = "f30563edc5c7dc20cf524cc8652ffa7be0762937";
+        name = "node_releases___node_releases_1.1.49.tgz";
+        url  = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.49.tgz";
+        sha1 = "67ba5a3fac2319262675ef864ed56798bb33b93e";
       };
     }
     {
@@ -8977,14 +7473,6 @@
         sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
       };
     }
-    {
-      name = "nopt___nopt_3.0.6.tgz";
-      path = fetchurl {
-        name = "nopt___nopt_3.0.6.tgz";
-        url  = "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz";
-        sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9";
-      };
-    }
     {
       name = "normalize_package_data___normalize_package_data_2.5.0.tgz";
       path = fetchurl {
@@ -9026,27 +7514,27 @@
       };
     }
     {
-      name = "now_and_later___now_and_later_2.0.1.tgz";
+      name = "npm_bundled___npm_bundled_1.1.1.tgz";
       path = fetchurl {
-        name = "now_and_later___now_and_later_2.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz";
-        sha1 = "8e579c8685764a7cc02cb680380e94f43ccb1f7c";
+        name = "npm_bundled___npm_bundled_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz";
+        sha1 = "1edd570865a94cdb1bc8220775e29466c9fb234b";
       };
     }
     {
-      name = "npm_bundled___npm_bundled_1.0.6.tgz";
+      name = "npm_normalize_package_bin___npm_normalize_package_bin_1.0.1.tgz";
       path = fetchurl {
-        name = "npm_bundled___npm_bundled_1.0.6.tgz";
-        url  = "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz";
-        sha1 = "e7ba9aadcef962bb61248f91721cd932b3fe6bdd";
+        name = "npm_normalize_package_bin___npm_normalize_package_bin_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz";
+        sha1 = "6e79a41f23fd235c0623218228da7d9c23b8f6e2";
       };
     }
     {
-      name = "npm_packlist___npm_packlist_1.4.1.tgz";
+      name = "npm_packlist___npm_packlist_1.4.8.tgz";
       path = fetchurl {
-        name = "npm_packlist___npm_packlist_1.4.1.tgz";
-        url  = "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.1.tgz";
-        sha1 = "19064cdf988da80ea3cee45533879d90192bbfbc";
+        name = "npm_packlist___npm_packlist_1.4.8.tgz";
+        url  = "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz";
+        sha1 = "56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e";
       };
     }
     {
@@ -9090,11 +7578,11 @@
       };
     }
     {
-      name = "nwsapi___nwsapi_2.1.4.tgz";
+      name = "nwsapi___nwsapi_2.2.0.tgz";
       path = fetchurl {
-        name = "nwsapi___nwsapi_2.1.4.tgz";
-        url  = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.1.4.tgz";
-        sha1 = "e006a878db23636f8e8a67d33ca0e4edf61a842f";
+        name = "nwsapi___nwsapi_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz";
+        sha1 = "204879a9e3d068ff2a55139c2c772780681a38b7";
       };
     }
     {
@@ -9113,14 +7601,6 @@
         sha1 = "bd1fefaf686c96b75475aed5196412ff60cfb9c1";
       };
     }
-    {
-      name = "object_assign___object_assign_4.1.0.tgz";
-      path = fetchurl {
-        name = "object_assign___object_assign_4.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz";
-        sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0";
-      };
-    }
     {
       name = "object_assign___object_assign_4.1.1.tgz";
       path = fetchurl {
@@ -9145,6 +7625,22 @@
         sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c";
       };
     }
+    {
+      name = "object_inspect___object_inspect_1.7.0.tgz";
+      path = fetchurl {
+        name = "object_inspect___object_inspect_1.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz";
+        sha1 = "f4f6bd181ad77f006b5ece60bd0b6f398ff74a67";
+      };
+    }
+    {
+      name = "object_is___object_is_1.0.2.tgz";
+      path = fetchurl {
+        name = "object_is___object_is_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/object-is/-/object-is-1.0.2.tgz";
+        sha1 = "6b80eb84fe451498f65007982f035a5b445edec4";
+      };
+    }
     {
       name = "object_keys___object_keys_1.1.1.tgz";
       path = fetchurl {
@@ -9170,11 +7666,11 @@
       };
     }
     {
-      name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz";
+      name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.0.tgz";
       path = fetchurl {
-        name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz";
-        sha1 = "8758c846f5b407adab0f236e0986f14b051caa16";
+        name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz";
+        sha1 = "369bf1f9592d8ab89d712dced5cb81c7c5352649";
       };
     }
     {
@@ -9194,11 +7690,11 @@
       };
     }
     {
-      name = "object.values___object.values_1.1.0.tgz";
+      name = "object.values___object.values_1.1.1.tgz";
       path = fetchurl {
-        name = "object.values___object.values_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz";
-        sha1 = "bf6810ef5da3e5325790eaaa2be213ea84624da9";
+        name = "object.values___object.values_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz";
+        sha1 = "68a99ecde356b7e9295a3c5e0ce31dc8c953de5e";
       };
     }
     {
@@ -9258,27 +7754,19 @@
       };
     }
     {
-      name = "optimize_css_assets_webpack_plugin___optimize_css_assets_webpack_plugin_5.0.1.tgz";
+      name = "optimize_css_assets_webpack_plugin___optimize_css_assets_webpack_plugin_5.0.3.tgz";
       path = fetchurl {
-        name = "optimize_css_assets_webpack_plugin___optimize_css_assets_webpack_plugin_5.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.1.tgz";
-        sha1 = "9eb500711d35165b45e7fd60ba2df40cb3eb9159";
+        name = "optimize_css_assets_webpack_plugin___optimize_css_assets_webpack_plugin_5.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.3.tgz";
+        sha1 = "e2f1d4d94ad8c0af8967ebd7cf138dcb1ef14572";
       };
     }
     {
-      name = "optionator___optionator_0.8.2.tgz";
+      name = "optionator___optionator_0.8.3.tgz";
       path = fetchurl {
-        name = "optionator___optionator_0.8.2.tgz";
-        url  = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz";
-        sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64";
-      };
-    }
-    {
-      name = "ordered_read_streams___ordered_read_streams_1.0.1.tgz";
-      path = fetchurl {
-        name = "ordered_read_streams___ordered_read_streams_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz";
-        sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e";
+        name = "optionator___optionator_0.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz";
+        sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495";
       };
     }
     {
@@ -9297,6 +7785,14 @@
         sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
       };
     }
+    {
+      name = "os_homedir___os_homedir_2.0.0.tgz";
+      path = fetchurl {
+        name = "os_homedir___os_homedir_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/os-homedir/-/os-homedir-2.0.0.tgz";
+        sha1 = "a0c76bb001a8392a503cbd46e7e650b3423a923c";
+      };
+    }
     {
       name = "os_locale___os_locale_3.1.0.tgz";
       path = fetchurl {
@@ -9362,11 +7858,11 @@
       };
     }
     {
-      name = "p_limit___p_limit_2.2.0.tgz";
+      name = "p_limit___p_limit_2.2.2.tgz";
       path = fetchurl {
-        name = "p_limit___p_limit_2.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz";
-        sha1 = "417c9941e6027a9abcba5092dd2904e255b5fbc2";
+        name = "p_limit___p_limit_2.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz";
+        sha1 = "61279b67721f5287aa1c13a9a7fbbc48c9291b1e";
       };
     }
     {
@@ -9402,27 +7898,27 @@
       };
     }
     {
-      name = "packet_reader___packet_reader_0.3.1.tgz";
+      name = "packet_reader___packet_reader_1.0.0.tgz";
       path = fetchurl {
-        name = "packet_reader___packet_reader_0.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/packet-reader/-/packet-reader-0.3.1.tgz";
-        sha1 = "cd62e60af8d7fea8a705ec4ff990871c46871f27";
+        name = "packet_reader___packet_reader_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/packet-reader/-/packet-reader-1.0.0.tgz";
+        sha1 = "9238e5480dedabacfe1fe3f2771063f164157d74";
       };
     }
     {
-      name = "pako___pako_1.0.10.tgz";
+      name = "pako___pako_1.0.11.tgz";
       path = fetchurl {
-        name = "pako___pako_1.0.10.tgz";
-        url  = "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz";
-        sha1 = "4328badb5086a426aa90f541977d4955da5c9732";
+        name = "pako___pako_1.0.11.tgz";
+        url  = "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz";
+        sha1 = "6c9599d340d54dfd3946380252a35705a6b992bf";
       };
     }
     {
-      name = "parallel_transform___parallel_transform_1.1.0.tgz";
+      name = "parallel_transform___parallel_transform_1.2.0.tgz";
       path = fetchurl {
-        name = "parallel_transform___parallel_transform_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz";
-        sha1 = "d410f065b05da23081fcd10f28854c29bda33b06";
+        name = "parallel_transform___parallel_transform_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz";
+        sha1 = "9049ca37d6cb2182c3b1d2c720be94d14a5814fc";
       };
     }
     {
@@ -9442,27 +7938,11 @@
       };
     }
     {
-      name = "parse_asn1___parse_asn1_5.1.4.tgz";
+      name = "parse_asn1___parse_asn1_5.1.5.tgz";
       path = fetchurl {
-        name = "parse_asn1___parse_asn1_5.1.4.tgz";
-        url  = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.4.tgz";
-        sha1 = "37f6628f823fbdeb2273b4d540434a22f3ef1fcc";
-      };
-    }
-    {
-      name = "parse_entities___parse_entities_1.2.2.tgz";
-      path = fetchurl {
-        name = "parse_entities___parse_entities_1.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.2.tgz";
-        sha1 = "c31bf0f653b6661354f8973559cb86dd1d5edf50";
-      };
-    }
-    {
-      name = "parse_filepath___parse_filepath_1.0.2.tgz";
-      path = fetchurl {
-        name = "parse_filepath___parse_filepath_1.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz";
-        sha1 = "a632127f53aaf3d15876f5872f3ffac763d6c891";
+        name = "parse_asn1___parse_asn1_5.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz";
+        sha1 = "003271343da58dc94cace494faef3d2147ecea0e";
       };
     }
     {
@@ -9489,14 +7969,6 @@
         sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0";
       };
     }
-    {
-      name = "parse_node_version___parse_node_version_1.0.1.tgz";
-      path = fetchurl {
-        name = "parse_node_version___parse_node_version_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz";
-        sha1 = "e2b5dbede00e7fa9bc363607f53327e8b073189b";
-      };
-    }
     {
       name = "parse_passwd___parse_passwd_1.0.0.tgz";
       path = fetchurl {
@@ -9505,22 +7977,6 @@
         sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6";
       };
     }
-    {
-      name = "parse_path___parse_path_3.0.4.tgz";
-      path = fetchurl {
-        name = "parse_path___parse_path_3.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/parse-path/-/parse-path-3.0.4.tgz";
-        sha1 = "a48b7b529da41f34d9d1428602a39b29fc7180e4";
-      };
-    }
-    {
-      name = "parse_url___parse_url_3.0.2.tgz";
-      path = fetchurl {
-        name = "parse_url___parse_url_3.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/parse-url/-/parse-url-3.0.2.tgz";
-        sha1 = "602787a7063a795d72b8673197505e72f60610be";
-      };
-    }
     {
       name = "parse5___parse5_4.0.0.tgz";
       path = fetchurl {
@@ -9642,11 +8098,11 @@
       };
     }
     {
-      name = "passport_saml___passport_saml_1.1.0.tgz";
+      name = "passport_saml___passport_saml_1.3.2.tgz";
       path = fetchurl {
-        name = "passport_saml___passport_saml_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/passport-saml/-/passport-saml-1.1.0.tgz";
-        sha1 = "0fdd639b905b8f5db172bc07f2e73819a043c321";
+        name = "passport_saml___passport_saml_1.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/passport-saml/-/passport-saml-1.3.2.tgz";
+        sha1 = "6cd7e747d7fd0283877d9f48b84c55908ab4182b";
       };
     }
     {
@@ -9674,19 +8130,19 @@
       };
     }
     {
-      name = "passport___passport_0.4.0.tgz";
+      name = "passport___passport_0.4.1.tgz";
       path = fetchurl {
-        name = "passport___passport_0.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/passport/-/passport-0.4.0.tgz";
-        sha1 = "c5095691347bd5ad3b5e180238c3914d16f05811";
+        name = "passport___passport_0.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/passport/-/passport-0.4.1.tgz";
+        sha1 = "941446a21cb92fc688d97a0861c38ce9f738f270";
       };
     }
     {
-      name = "path_browserify___path_browserify_0.0.0.tgz";
+      name = "path_browserify___path_browserify_0.0.1.tgz";
       path = fetchurl {
-        name = "path_browserify___path_browserify_0.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz";
-        sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a";
+        name = "path_browserify___path_browserify_0.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz";
+        sha1 = "e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a";
       };
     }
     {
@@ -9737,22 +8193,6 @@
         sha1 = "d62dbb5679405d72c4737ec58600e9ddcf06d24c";
       };
     }
-    {
-      name = "path_root_regex___path_root_regex_0.1.2.tgz";
-      path = fetchurl {
-        name = "path_root_regex___path_root_regex_0.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz";
-        sha1 = "bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d";
-      };
-    }
-    {
-      name = "path_root___path_root_0.1.1.tgz";
-      path = fetchurl {
-        name = "path_root___path_root_0.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz";
-        sha1 = "9a4a6814cac1c0cd73360a95f32083c8ea4745b7";
-      };
-    }
     {
       name = "path_to_regexp___path_to_regexp_0.1.7.tgz";
       path = fetchurl {
@@ -9826,11 +8266,11 @@
       };
     }
     {
-      name = "pg_hstore___pg_hstore_2.3.2.tgz";
+      name = "pg_hstore___pg_hstore_2.3.3.tgz";
       path = fetchurl {
-        name = "pg_hstore___pg_hstore_2.3.2.tgz";
-        url  = "https://registry.yarnpkg.com/pg-hstore/-/pg-hstore-2.3.2.tgz";
-        sha1 = "f7ef053e7b9b892ae986af2f7cbe86432dfcf24f";
+        name = "pg_hstore___pg_hstore_2.3.3.tgz";
+        url  = "https://registry.yarnpkg.com/pg-hstore/-/pg-hstore-2.3.3.tgz";
+        sha1 = "d1978c12a85359830b1388d3b0ff233b88928e96";
       };
     }
     {
@@ -9842,27 +8282,35 @@
       };
     }
     {
-      name = "pg_pool___pg_pool_1.8.0.tgz";
+      name = "pg_packet_stream___pg_packet_stream_1.1.0.tgz";
       path = fetchurl {
-        name = "pg_pool___pg_pool_1.8.0.tgz";
-        url  = "https://registry.yarnpkg.com/pg-pool/-/pg-pool-1.8.0.tgz";
-        sha1 = "f7ec73824c37a03f076f51bfdf70e340147c4f37";
+        name = "pg_packet_stream___pg_packet_stream_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/pg-packet-stream/-/pg-packet-stream-1.1.0.tgz";
+        sha1 = "e45c3ae678b901a2873af1e17b92d787962ef914";
       };
     }
     {
-      name = "pg_types___pg_types_1.13.0.tgz";
+      name = "pg_pool___pg_pool_2.0.10.tgz";
       path = fetchurl {
-        name = "pg_types___pg_types_1.13.0.tgz";
-        url  = "https://registry.yarnpkg.com/pg-types/-/pg-types-1.13.0.tgz";
-        sha1 = "75f490b8a8abf75f1386ef5ec4455ecf6b345c63";
+        name = "pg_pool___pg_pool_2.0.10.tgz";
+        url  = "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.10.tgz";
+        sha1 = "842ee23b04e86824ce9d786430f8365082d81c4a";
       };
     }
     {
-      name = "pg___pg_6.4.2.tgz";
+      name = "pg_types___pg_types_2.2.0.tgz";
       path = fetchurl {
-        name = "pg___pg_6.4.2.tgz";
-        url  = "https://registry.yarnpkg.com/pg/-/pg-6.4.2.tgz";
-        sha1 = "c364011060eac7a507a2ae063eb857ece910e27f";
+        name = "pg_types___pg_types_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/pg-types/-/pg-types-2.2.0.tgz";
+        sha1 = "2d0250d636454f7cfa3b6ae0382fdfa8063254a3";
+      };
+    }
+    {
+      name = "pg___pg_7.18.1.tgz";
+      path = fetchurl {
+        name = "pg___pg_7.18.1.tgz";
+        url  = "https://registry.yarnpkg.com/pg/-/pg-7.18.1.tgz";
+        sha1 = "67f59c47a99456fcb34f9fe53662b79d4a992f6d";
       };
     }
     {
@@ -9945,14 +8393,6 @@
         sha1 = "7239c42a5ef6c30b8f328439d9b9ff71042490f8";
       };
     }
-    {
-      name = "platform___platform_1.3.5.tgz";
-      path = fetchurl {
-        name = "platform___platform_1.3.5.tgz";
-        url  = "https://registry.yarnpkg.com/platform/-/platform-1.3.5.tgz";
-        sha1 = "fb6958c696e07e2918d2eeda0f0bc9448d733444";
-      };
-    }
     {
       name = "pn___pn_1.1.0.tgz";
       path = fetchurl {
@@ -10082,35 +8522,35 @@
       };
     }
     {
-      name = "postcss_modules_extract_imports___postcss_modules_extract_imports_1.2.1.tgz";
+      name = "postcss_modules_extract_imports___postcss_modules_extract_imports_2.0.0.tgz";
       path = fetchurl {
-        name = "postcss_modules_extract_imports___postcss_modules_extract_imports_1.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz";
-        sha1 = "dc87e34148ec7eab5f791f7cd5849833375b741a";
+        name = "postcss_modules_extract_imports___postcss_modules_extract_imports_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz";
+        sha1 = "818719a1ae1da325f9832446b01136eeb493cd7e";
       };
     }
     {
-      name = "postcss_modules_local_by_default___postcss_modules_local_by_default_1.2.0.tgz";
+      name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.2.tgz";
       path = fetchurl {
-        name = "postcss_modules_local_by_default___postcss_modules_local_by_default_1.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz";
-        sha1 = "f7d80c398c5a393fa7964466bd19500a7d61c069";
+        name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz";
+        sha1 = "e8a6561be914aaf3c052876377524ca90dbb7915";
       };
     }
     {
-      name = "postcss_modules_scope___postcss_modules_scope_1.1.0.tgz";
+      name = "postcss_modules_scope___postcss_modules_scope_2.1.1.tgz";
       path = fetchurl {
-        name = "postcss_modules_scope___postcss_modules_scope_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz";
-        sha1 = "d6ea64994c79f97b62a72b426fbe6056a194bb90";
+        name = "postcss_modules_scope___postcss_modules_scope_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.1.tgz";
+        sha1 = "33d4fc946602eb5e9355c4165d68a10727689dba";
       };
     }
     {
-      name = "postcss_modules_values___postcss_modules_values_1.3.0.tgz";
+      name = "postcss_modules_values___postcss_modules_values_3.0.0.tgz";
       path = fetchurl {
-        name = "postcss_modules_values___postcss_modules_values_1.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz";
-        sha1 = "ecffa9d7e192518389f42ad0e83f72aec456ea20";
+        name = "postcss_modules_values___postcss_modules_values_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz";
+        sha1 = "5b5000d6ebae29b4255301b4a3a54574423e7f10";
       };
     }
     {
@@ -10210,11 +8650,11 @@
       };
     }
     {
-      name = "postcss_selector_parser___postcss_selector_parser_3.1.1.tgz";
+      name = "postcss_selector_parser___postcss_selector_parser_3.1.2.tgz";
       path = fetchurl {
-        name = "postcss_selector_parser___postcss_selector_parser_3.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz";
-        sha1 = "4f875f4afb0c96573d5cf4d74011aee250a7e865";
+        name = "postcss_selector_parser___postcss_selector_parser_3.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz";
+        sha1 = "b310f5c4c0fdaf76f94902bbaa30db6aa84f5270";
       };
     }
     {
@@ -10225,6 +8665,14 @@
         sha1 = "249044356697b33b64f1a8f7c80922dddee7195c";
       };
     }
+    {
+      name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz";
+      path = fetchurl {
+        name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz";
+        sha1 = "934cf799d016c83411859e09dcecade01286ec5c";
+      };
+    }
     {
       name = "postcss_svgo___postcss_svgo_4.0.2.tgz";
       path = fetchurl {
@@ -10250,27 +8698,27 @@
       };
     }
     {
-      name = "postcss___postcss_6.0.23.tgz";
+      name = "postcss_value_parser___postcss_value_parser_4.0.2.tgz";
       path = fetchurl {
-        name = "postcss___postcss_6.0.23.tgz";
-        url  = "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz";
-        sha1 = "61c82cc328ac60e677645f979054eb98bc0e3324";
+        name = "postcss_value_parser___postcss_value_parser_4.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz";
+        sha1 = "482282c09a42706d1fc9a069b73f44ec08391dc9";
       };
     }
     {
-      name = "postcss___postcss_7.0.16.tgz";
+      name = "postcss___postcss_7.0.26.tgz";
       path = fetchurl {
-        name = "postcss___postcss_7.0.16.tgz";
-        url  = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.16.tgz";
-        sha1 = "48f64f1b4b558cb8b52c88987724359acb010da2";
+        name = "postcss___postcss_7.0.26.tgz";
+        url  = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.26.tgz";
+        sha1 = "5ed615cfcab35ba9bbb82414a4fa88ea10429587";
       };
     }
     {
-      name = "postgres_array___postgres_array_1.0.3.tgz";
+      name = "postgres_array___postgres_array_2.0.0.tgz";
       path = fetchurl {
-        name = "postgres_array___postgres_array_1.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/postgres-array/-/postgres-array-1.0.3.tgz";
-        sha1 = "c561fc3b266b21451fc6555384f4986d78ec80f5";
+        name = "postgres_array___postgres_array_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz";
+        sha1 = "48f8fce054fbc69671999329b8834b772652d82e";
       };
     }
     {
@@ -10338,11 +8786,11 @@
       };
     }
     {
-      name = "prismjs___prismjs_1.16.0.tgz";
+      name = "prismjs___prismjs_1.19.0.tgz";
       path = fetchurl {
-        name = "prismjs___prismjs_1.16.0.tgz";
-        url  = "https://registry.yarnpkg.com/prismjs/-/prismjs-1.16.0.tgz";
-        sha1 = "406eb2c8aacb0f5f0f1167930cb83835d10a4308";
+        name = "prismjs___prismjs_1.19.0.tgz";
+        url  = "https://registry.yarnpkg.com/prismjs/-/prismjs-1.19.0.tgz";
+        sha1 = "713afbd45c3baca4b321569f2df39e17e729d4dc";
       };
     }
     {
@@ -10353,14 +8801,6 @@
         sha1 = "2381edb3689f7a53d653190060fcf822d2f368ff";
       };
     }
-    {
-      name = "process_nextick_args___process_nextick_args_2.0.1.tgz";
-      path = fetchurl {
-        name = "process_nextick_args___process_nextick_args_2.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
-        sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2";
-      };
-    }
     {
       name = "process_nextick_args___process_nextick_args_1.0.7.tgz";
       path = fetchurl {
@@ -10370,11 +8810,11 @@
       };
     }
     {
-      name = "process_nextick_args___process_nextick_args_2.0.0.tgz";
+      name = "process_nextick_args___process_nextick_args_2.0.1.tgz";
       path = fetchurl {
-        name = "process_nextick_args___process_nextick_args_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz";
-        sha1 = "a37d732f4271b4ab1ad070d35508e8290788ffaa";
+        name = "process_nextick_args___process_nextick_args_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
+        sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2";
       };
     }
     {
@@ -10417,14 +8857,6 @@
         sha1 = "064b72602b18f90f29192b8b1bc418ffd1ebd3bf";
       };
     }
-    {
-      name = "property_information___property_information_4.2.0.tgz";
-      path = fetchurl {
-        name = "property_information___property_information_4.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/property-information/-/property-information-4.2.0.tgz";
-        sha1 = "f0e66e07cbd6fed31d96844d958d153ad3eb486e";
-      };
-    }
     {
       name = "proto_list___proto_list_1.2.4.tgz";
       path = fetchurl {
@@ -10433,14 +8865,6 @@
         sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
       };
     }
-    {
-      name = "protocols___protocols_1.4.7.tgz";
-      path = fetchurl {
-        name = "protocols___protocols_1.4.7.tgz";
-        url  = "https://registry.yarnpkg.com/protocols/-/protocols-1.4.7.tgz";
-        sha1 = "95f788a4f0e979b291ffefcf5636ad113d037d32";
-      };
-    }
     {
       name = "proxy_addr___proxy_addr_2.0.5.tgz";
       path = fetchurl {
@@ -10466,11 +8890,11 @@
       };
     }
     {
-      name = "psl___psl_1.1.32.tgz";
+      name = "psl___psl_1.7.0.tgz";
       path = fetchurl {
-        name = "psl___psl_1.1.32.tgz";
-        url  = "https://registry.yarnpkg.com/psl/-/psl-1.1.32.tgz";
-        sha1 = "3f132717cf2f9c169724b2b6caf373cf694198db";
+        name = "psl___psl_1.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz";
+        sha1 = "f1c4c47a8ef97167dea5d6bbf4816d736e884a3c";
       };
     }
     {
@@ -10641,14 +9065,6 @@
         sha1 = "3cf37023d199e1c24d1a55b84800c2f3e6468031";
       };
     }
-    {
-      name = "raphael___raphael_2.2.7.tgz";
-      path = fetchurl {
-        name = "raphael___raphael_2.2.7.tgz";
-        url  = "https://registry.yarnpkg.com/raphael/-/raphael-2.2.7.tgz";
-        sha1 = "231b19141f8d086986d8faceb66f8b562ee2c810";
-      };
-    }
     {
       name = "raphael___raphael_2.2.8.tgz";
       path = fetchurl {
@@ -10657,14 +9073,22 @@
         sha1 = "4b18443c2c6030c3b492d8d11fbbca14ebe4d3f3";
       };
     }
+    {
+      name = "raphael___raphael_2.3.0.tgz";
+      path = fetchurl {
+        name = "raphael___raphael_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/raphael/-/raphael-2.3.0.tgz";
+        sha1 = "eabeb09dba861a1d4cee077eaafb8c53f3131f89";
+      };
+    }
     {
     name = "raphael";
     path =
       let
         repo = fetchgit {
           url = "https://github.com/dmitrybaranovskiy/raphael";
-          rev = "bf3dcd35317f76f915bcd04ed9db36a1b3775c4d";
-          sha256 = "0x1jxadywz0xr61jisfhpdvd6jrr6q2jjv8r6x8rm3hkmgp5l93r";
+          rev = "d8fbe4be81d362837f95e33886b80fb41de443b4";
+          sha256 = "1g2jif250j3szn75fivns8d66m9s7msivhdh4jqbbmy8mvv8xzn9";
         };
       in
         runCommandNoCC "raphael" { buildInputs = [gnutar]; } ''
@@ -10681,14 +9105,6 @@
         sha1 = "a1ce6fb9c9bc356ca52e89256ab59059e13d0332";
       };
     }
-    {
-      name = "raw_body___raw_body_1.1.7.tgz";
-      path = fetchurl {
-        name = "raw_body___raw_body_1.1.7.tgz";
-        url  = "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz";
-        sha1 = "1d027c2bfa116acc6623bca8f00016572a87d425";
-      };
-    }
     {
       name = "raw_loader___raw_loader_0.5.1.tgz";
       path = fetchurl {
@@ -10713,14 +9129,6 @@
         sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be";
       };
     }
-    {
-      name = "read_pkg_up___read_pkg_up_4.0.0.tgz";
-      path = fetchurl {
-        name = "read_pkg_up___read_pkg_up_4.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz";
-        sha1 = "1b221c6088ba7799601c808f91161c66e58f8978";
-      };
-    }
     {
       name = "read_pkg___read_pkg_2.0.0.tgz";
       path = fetchurl {
@@ -10730,19 +9138,11 @@
       };
     }
     {
-      name = "read_pkg___read_pkg_3.0.0.tgz";
+      name = "readable_stream___readable_stream_2.3.7.tgz";
       path = fetchurl {
-        name = "read_pkg___read_pkg_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz";
-        sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389";
-      };
-    }
-    {
-      name = "readable_stream___readable_stream_2.3.6.tgz";
-      path = fetchurl {
-        name = "readable_stream___readable_stream_2.3.6.tgz";
-        url  = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz";
-        sha1 = "b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf";
+        name = "readable_stream___readable_stream_2.3.7.tgz";
+        url  = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz";
+        sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57";
       };
     }
     {
@@ -10753,6 +9153,14 @@
         sha1 = "6b67983c20357cefd07f0165001a16d710d91078";
       };
     }
+    {
+      name = "readable_stream___readable_stream_3.6.0.tgz";
+      path = fetchurl {
+        name = "readable_stream___readable_stream_3.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz";
+        sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198";
+      };
+    }
     {
       name = "readable_stream___readable_stream_1.0.34.tgz";
       path = fetchurl {
@@ -10761,14 +9169,6 @@
         sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c";
       };
     }
-    {
-      name = "readable_stream___readable_stream_3.4.0.tgz";
-      path = fetchurl {
-        name = "readable_stream___readable_stream_3.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz";
-        sha1 = "a51c26754658e0a3c21dbf59163bd45ba6f447fc";
-      };
-    }
     {
       name = "readable_stream___readable_stream_2.0.6.tgz";
       path = fetchurl {
@@ -10777,14 +9177,6 @@
         sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e";
       };
     }
-    {
-      name = "readable_stream___readable_stream_2.1.5.tgz";
-      path = fetchurl {
-        name = "readable_stream___readable_stream_2.1.5.tgz";
-        url  = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz";
-        sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0";
-      };
-    }
     {
       name = "readdirp___readdirp_2.2.1.tgz";
       path = fetchurl {
@@ -10794,11 +9186,19 @@
       };
     }
     {
-      name = "readline_sync___readline_sync_1.4.9.tgz";
+      name = "readline_sync___readline_sync_1.4.10.tgz";
       path = fetchurl {
-        name = "readline_sync___readline_sync_1.4.9.tgz";
-        url  = "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.9.tgz";
-        sha1 = "3eda8e65f23cd2a17e61301b1f0003396af5ecda";
+        name = "readline_sync___readline_sync_1.4.10.tgz";
+        url  = "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.10.tgz";
+        sha1 = "41df7fbb4b6312d673011594145705bf56d8873b";
+      };
+    }
+    {
+      name = "redeyed___redeyed_2.1.1.tgz";
+      path = fetchurl {
+        name = "redeyed___redeyed_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/redeyed/-/redeyed-2.1.1.tgz";
+        sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b";
       };
     }
     {
@@ -10857,14 +9257,6 @@
         sha1 = "1e4996837231da8b7f3cf4114d71b5691a0680dd";
       };
     }
-    {
-      name = "regenerator_transform___regenerator_transform_0.14.1.tgz";
-      path = fetchurl {
-        name = "regenerator_transform___regenerator_transform_0.14.1.tgz";
-        url  = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz";
-        sha1 = "3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb";
-      };
-    }
     {
       name = "regex_cache___regex_cache_0.4.4.tgz";
       path = fetchurl {
@@ -10882,11 +9274,11 @@
       };
     }
     {
-      name = "regexp_tree___regexp_tree_0.1.11.tgz";
+      name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz";
       path = fetchurl {
-        name = "regexp_tree___regexp_tree_0.1.11.tgz";
-        url  = "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.11.tgz";
-        sha1 = "c9c7f00fcf722e0a56c7390983a7a63dd6c272f3";
+        name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz";
+        sha1 = "7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75";
       };
     }
     {
@@ -10897,14 +9289,6 @@
         sha1 = "8d19d31cf632482b589049f8281f93dbcba4d07f";
       };
     }
-    {
-      name = "regexpu_core___regexpu_core_1.0.0.tgz";
-      path = fetchurl {
-        name = "regexpu_core___regexpu_core_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz";
-        sha1 = "86a763f58ee4d7c2f6b102e4764050de7ed90c6b";
-      };
-    }
     {
       name = "regexpu_core___regexpu_core_2.0.0.tgz";
       path = fetchurl {
@@ -10914,11 +9298,11 @@
       };
     }
     {
-      name = "regexpu_core___regexpu_core_4.5.4.tgz";
+      name = "regexpu_core___regexpu_core_4.6.0.tgz";
       path = fetchurl {
-        name = "regexpu_core___regexpu_core_4.5.4.tgz";
-        url  = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.5.4.tgz";
-        sha1 = "080d9d02289aa87fe1667a4f5136bc98a6aebaae";
+        name = "regexpu_core___regexpu_core_4.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz";
+        sha1 = "2037c18b327cfce8a6fea2a4ec441f2432afb8b6";
       };
     }
     {
@@ -10930,11 +9314,11 @@
       };
     }
     {
-      name = "regjsgen___regjsgen_0.5.0.tgz";
+      name = "regjsgen___regjsgen_0.5.1.tgz";
       path = fetchurl {
-        name = "regjsgen___regjsgen_0.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz";
-        sha1 = "a7634dc08f89209c2049adda3525711fb97265dd";
+        name = "regjsgen___regjsgen_0.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz";
+        sha1 = "48f0bf1a5ea205196929c0d9798b42d1ed98443c";
       };
     }
     {
@@ -10946,11 +9330,11 @@
       };
     }
     {
-      name = "regjsparser___regjsparser_0.6.0.tgz";
+      name = "regjsparser___regjsparser_0.6.3.tgz";
       path = fetchurl {
-        name = "regjsparser___regjsparser_0.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz";
-        sha1 = "f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c";
+        name = "regjsparser___regjsparser_0.6.3.tgz";
+        url  = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.3.tgz";
+        sha1 = "74192c5805d35e9f5ebe3c1fb5b40d40a8a38460";
       };
     }
     {
@@ -10962,83 +9346,11 @@
       };
     }
     {
-      name = "remark_html___remark_html_8.0.0.tgz";
+      name = "remarkable___remarkable_2.0.0.tgz";
       path = fetchurl {
-        name = "remark_html___remark_html_8.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/remark-html/-/remark-html-8.0.0.tgz";
-        sha1 = "9fcb859a6f3cb40f3ef15402950f1a62ec301b3a";
-      };
-    }
-    {
-      name = "remark_parse___remark_parse_5.0.0.tgz";
-      path = fetchurl {
-        name = "remark_parse___remark_parse_5.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/remark-parse/-/remark-parse-5.0.0.tgz";
-        sha1 = "4c077f9e499044d1d5c13f80d7a98cf7b9285d95";
-      };
-    }
-    {
-      name = "remark_reference_links___remark_reference_links_4.0.4.tgz";
-      path = fetchurl {
-        name = "remark_reference_links___remark_reference_links_4.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/remark-reference-links/-/remark-reference-links-4.0.4.tgz";
-        sha1 = "190579a0d6b002859d6cdbdc5aeb8bbdae4e06ab";
-      };
-    }
-    {
-      name = "remark_slug___remark_slug_5.1.2.tgz";
-      path = fetchurl {
-        name = "remark_slug___remark_slug_5.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/remark-slug/-/remark-slug-5.1.2.tgz";
-        sha1 = "715ecdef8df1226786204b1887d31ab16aa24609";
-      };
-    }
-    {
-      name = "remark_stringify___remark_stringify_5.0.0.tgz";
-      path = fetchurl {
-        name = "remark_stringify___remark_stringify_5.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-5.0.0.tgz";
-        sha1 = "336d3a4d4a6a3390d933eeba62e8de4bd280afba";
-      };
-    }
-    {
-      name = "remark_toc___remark_toc_5.1.1.tgz";
-      path = fetchurl {
-        name = "remark_toc___remark_toc_5.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/remark-toc/-/remark-toc-5.1.1.tgz";
-        sha1 = "8c229d6f834cdb43fde6685e2d43248d3fc82d78";
-      };
-    }
-    {
-      name = "remark___remark_9.0.0.tgz";
-      path = fetchurl {
-        name = "remark___remark_9.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/remark/-/remark-9.0.0.tgz";
-        sha1 = "c5cfa8ec535c73a67c4b0f12bfdbd3a67d8b2f60";
-      };
-    }
-    {
-      name = "remarkable___remarkable_1.7.1.tgz";
-      path = fetchurl {
-        name = "remarkable___remarkable_1.7.1.tgz";
-        url  = "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.1.tgz";
-        sha1 = "aaca4972100b66a642a63a1021ca4bac1be3bff6";
-      };
-    }
-    {
-      name = "remove_bom_buffer___remove_bom_buffer_3.0.0.tgz";
-      path = fetchurl {
-        name = "remove_bom_buffer___remove_bom_buffer_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz";
-        sha1 = "c2bf1e377520d324f623892e33c10cac2c252b53";
-      };
-    }
-    {
-      name = "remove_bom_stream___remove_bom_stream_1.2.0.tgz";
-      path = fetchurl {
-        name = "remove_bom_stream___remove_bom_stream_1.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz";
-        sha1 = "05f1a593f16e42e1fb90ebf59de8e569525f9523";
+        name = "remarkable___remarkable_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/remarkable/-/remarkable-2.0.0.tgz";
+        sha1 = "795f965bede8300362ce51a716edc322d9e7a4ca";
       };
     }
     {
@@ -11081,14 +9393,6 @@
         sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
       };
     }
-    {
-      name = "replace_ext___replace_ext_1.0.0.tgz";
-      path = fetchurl {
-        name = "replace_ext___replace_ext_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz";
-        sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb";
-      };
-    }
     {
       name = "request_progress___request_progress_2.0.1.tgz";
       path = fetchurl {
@@ -11098,27 +9402,27 @@
       };
     }
     {
-      name = "request_promise_core___request_promise_core_1.1.2.tgz";
+      name = "request_promise_core___request_promise_core_1.1.3.tgz";
       path = fetchurl {
-        name = "request_promise_core___request_promise_core_1.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.2.tgz";
-        sha1 = "339f6aababcafdb31c799ff158700336301d3346";
+        name = "request_promise_core___request_promise_core_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz";
+        sha1 = "e9a3c081b51380dfea677336061fea879a829ee9";
       };
     }
     {
-      name = "request_promise_native___request_promise_native_1.0.7.tgz";
+      name = "request_promise_native___request_promise_native_1.0.8.tgz";
       path = fetchurl {
-        name = "request_promise_native___request_promise_native_1.0.7.tgz";
-        url  = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.7.tgz";
-        sha1 = "a49868a624bdea5069f1251d0a836e0d89aa2c59";
+        name = "request_promise_native___request_promise_native_1.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz";
+        sha1 = "a455b960b826e44e2bf8999af64dff2bfe58cb36";
       };
     }
     {
-      name = "request___request_2.88.0.tgz";
+      name = "request___request_2.88.2.tgz";
       path = fetchurl {
-        name = "request___request_2.88.0.tgz";
-        url  = "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz";
-        sha1 = "9c2fca4f7d35b592efe57c7f0a55e81052124fef";
+        name = "request___request_2.88.2.tgz";
+        url  = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz";
+        sha1 = "d73c918731cb5a87da047e207234146f664d12b3";
       };
     }
     {
@@ -11129,14 +9433,6 @@
         sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
       };
     }
-    {
-      name = "require_main_filename___require_main_filename_1.0.1.tgz";
-      path = fetchurl {
-        name = "require_main_filename___require_main_filename_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz";
-        sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
-      };
-    }
     {
       name = "require_main_filename___require_main_filename_2.0.0.tgz";
       path = fetchurl {
@@ -11185,14 +9481,6 @@
         sha1 = "4abcd852ad32dd7baabfe9b40e00a36db5f392e6";
       };
     }
-    {
-      name = "resolve_options___resolve_options_1.1.0.tgz";
-      path = fetchurl {
-        name = "resolve_options___resolve_options_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz";
-        sha1 = "32bb9e39c06d67338dc9378c0d6d6074566ad131";
-      };
-    }
     {
       name = "resolve_url___resolve_url_0.2.1.tgz";
       path = fetchurl {
@@ -11202,27 +9490,11 @@
       };
     }
     {
-      name = "resolve___resolve_1.1.7.tgz";
+      name = "resolve___resolve_1.15.1.tgz";
       path = fetchurl {
-        name = "resolve___resolve_1.1.7.tgz";
-        url  = "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz";
-        sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
-      };
-    }
-    {
-      name = "resolve___resolve_1.12.0.tgz";
-      path = fetchurl {
-        name = "resolve___resolve_1.12.0.tgz";
-        url  = "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz";
-        sha1 = "3fc644a35c84a48554609ff26ec52b66fa577df6";
-      };
-    }
-    {
-      name = "resolve___resolve_1.11.0.tgz";
-      path = fetchurl {
-        name = "resolve___resolve_1.11.0.tgz";
-        url  = "https://registry.yarnpkg.com/resolve/-/resolve-1.11.0.tgz";
-        sha1 = "4014870ba296176b86343d50b60f3b50609ce232";
+        name = "resolve___resolve_1.15.1.tgz";
+        url  = "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz";
+        sha1 = "27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8";
       };
     }
     {
@@ -11250,11 +9522,11 @@
       };
     }
     {
-      name = "reveal.js___reveal.js_3.7.0.tgz";
+      name = "reveal.js___reveal.js_3.9.2.tgz";
       path = fetchurl {
-        name = "reveal.js___reveal.js_3.7.0.tgz";
-        url  = "https://registry.yarnpkg.com/reveal.js/-/reveal.js-3.7.0.tgz";
-        sha1 = "7afaf72fd963000381289d58f3aa54c0c46b150c";
+        name = "reveal.js___reveal.js_3.9.2.tgz";
+        url  = "https://registry.yarnpkg.com/reveal.js/-/reveal.js-3.9.2.tgz";
+        sha1 = "7f63d3dfec338b6c313dcabdf006e8cf80e0b358";
       };
     }
     {
@@ -11289,6 +9561,14 @@
         sha1 = "b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab";
       };
     }
+    {
+      name = "rimraf___rimraf_2.7.1.tgz";
+      path = fetchurl {
+        name = "rimraf___rimraf_2.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz";
+        sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec";
+      };
+    }
     {
       name = "rimraf___rimraf_2.4.5.tgz";
       path = fetchurl {
@@ -11306,19 +9586,19 @@
       };
     }
     {
-      name = "rollup_plugin_buble___rollup_plugin_buble_0.19.6.tgz";
+      name = "rollup_plugin_buble___rollup_plugin_buble_0.19.8.tgz";
       path = fetchurl {
-        name = "rollup_plugin_buble___rollup_plugin_buble_0.19.6.tgz";
-        url  = "https://registry.yarnpkg.com/rollup-plugin-buble/-/rollup-plugin-buble-0.19.6.tgz";
-        sha1 = "55ee0995d8870d536f01f4277c3eef4276e8747e";
+        name = "rollup_plugin_buble___rollup_plugin_buble_0.19.8.tgz";
+        url  = "https://registry.yarnpkg.com/rollup-plugin-buble/-/rollup-plugin-buble-0.19.8.tgz";
+        sha1 = "f9232e2bb62a7573d04f9705c1bd6f02c2a02c6a";
       };
     }
     {
-      name = "rollup_pluginutils___rollup_pluginutils_2.7.1.tgz";
+      name = "rollup_pluginutils___rollup_pluginutils_2.8.2.tgz";
       path = fetchurl {
-        name = "rollup_pluginutils___rollup_pluginutils_2.7.1.tgz";
-        url  = "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.7.1.tgz";
-        sha1 = "a7915ce8b12c177364784bf38a1590cc6c2c8250";
+        name = "rollup_pluginutils___rollup_pluginutils_2.8.2.tgz";
+        url  = "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz";
+        sha1 = "72f2af0748b592364dbd3389e600e5a9444a351e";
       };
     }
     {
@@ -11362,19 +9642,11 @@
       };
     }
     {
-      name = "rxjs___rxjs_6.5.2.tgz";
+      name = "rxjs___rxjs_6.5.4.tgz";
       path = fetchurl {
-        name = "rxjs___rxjs_6.5.2.tgz";
-        url  = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz";
-        sha1 = "2e35ce815cd46d84d02a209fb4e5921e051dbec7";
-      };
-    }
-    {
-      name = "safe_buffer___safe_buffer_5.1.2.tgz";
-      path = fetchurl {
-        name = "safe_buffer___safe_buffer_5.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz";
-        sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d";
+        name = "rxjs___rxjs_6.5.4.tgz";
+        url  = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz";
+        sha1 = "e0777fe0d184cec7872df147f303572d414e211c";
       };
     }
     {
@@ -11386,11 +9658,11 @@
       };
     }
     {
-      name = "safe_json_parse___safe_json_parse_1.0.1.tgz";
+      name = "safe_buffer___safe_buffer_5.1.2.tgz";
       path = fetchurl {
-        name = "safe_json_parse___safe_json_parse_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz";
-        sha1 = "3e76723e38dfdda13c9b1d29a1e07ffee4b30b57";
+        name = "safe_buffer___safe_buffer_5.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz";
+        sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d";
       };
     }
     {
@@ -11409,14 +9681,6 @@
         sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e";
       };
     }
-    {
-      name = "safefs___safefs_3.2.2.tgz";
-      path = fetchurl {
-        name = "safefs___safefs_3.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/safefs/-/safefs-3.2.2.tgz";
-        sha1 = "8170c1444d7038e08caea05a374fae2fa349e15c";
-      };
-    }
     {
       name = "safer_buffer___safer_buffer_2.1.2.tgz";
       path = fetchurl {
@@ -11449,22 +9713,6 @@
         sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9";
       };
     }
-    {
-      name = "scandirectory___scandirectory_2.5.0.tgz";
-      path = fetchurl {
-        name = "scandirectory___scandirectory_2.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/scandirectory/-/scandirectory-2.5.0.tgz";
-        sha1 = "6ce03f54a090b668e3cbedbf20edf9e310593e72";
-      };
-    }
-    {
-      name = "schema_utils___schema_utils_0.4.7.tgz";
-      path = fetchurl {
-        name = "schema_utils___schema_utils_0.4.7.tgz";
-        url  = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz";
-        sha1 = "ba74f597d2be2ea880131746ee17d0a093c68187";
-      };
-    }
     {
       name = "schema_utils___schema_utils_1.0.0.tgz";
       path = fetchurl {
@@ -11473,6 +9721,14 @@
         sha1 = "0b79a93204d7b600d4b2850d1f66c2a34951c770";
       };
     }
+    {
+      name = "schema_utils___schema_utils_2.6.4.tgz";
+      path = fetchurl {
+        name = "schema_utils___schema_utils_2.6.4.tgz";
+        url  = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz";
+        sha1 = "a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53";
+      };
+    }
     {
       name = "scope_css___scope_css_1.2.1.tgz";
       path = fetchurl {
@@ -11522,11 +9778,11 @@
       };
     }
     {
-      name = "semver___semver_5.7.0.tgz";
+      name = "semver___semver_5.7.1.tgz";
       path = fetchurl {
-        name = "semver___semver_5.7.0.tgz";
-        url  = "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz";
-        sha1 = "790a7cf6fea5459bac96110b29b60412dc8ff96b";
+        name = "semver___semver_5.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz";
+        sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7";
       };
     }
     {
@@ -11538,11 +9794,11 @@
       };
     }
     {
-      name = "semver___semver_6.1.1.tgz";
+      name = "semver___semver_6.3.0.tgz";
       path = fetchurl {
-        name = "semver___semver_6.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz";
-        sha1 = "53f53da9b30b2103cd4f15eab3a18ecbcb210c9b";
+        name = "semver___semver_6.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz";
+        sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d";
       };
     }
     {
@@ -11562,35 +9818,35 @@
       };
     }
     {
-      name = "sequelize_cli___sequelize_cli_5.5.0.tgz";
+      name = "sequelize_cli___sequelize_cli_5.5.1.tgz";
       path = fetchurl {
-        name = "sequelize_cli___sequelize_cli_5.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/sequelize-cli/-/sequelize-cli-5.5.0.tgz";
-        sha1 = "b0570352f70eaa489a25dccf55cf316675d6ff06";
+        name = "sequelize_cli___sequelize_cli_5.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/sequelize-cli/-/sequelize-cli-5.5.1.tgz";
+        sha1 = "0b9c2fc04d082cc8ae0a8fe270b96bb606152bab";
       };
     }
     {
-      name = "sequelize_pool___sequelize_pool_2.2.0.tgz";
+      name = "sequelize_pool___sequelize_pool_2.3.0.tgz";
       path = fetchurl {
-        name = "sequelize_pool___sequelize_pool_2.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/sequelize-pool/-/sequelize-pool-2.2.0.tgz";
-        sha1 = "fd4eb05ccefb5df5c23d2cc6fd934c20fd9c5dab";
+        name = "sequelize_pool___sequelize_pool_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/sequelize-pool/-/sequelize-pool-2.3.0.tgz";
+        sha1 = "64f1fe8744228172c474f530604b6133be64993d";
       };
     }
     {
-      name = "sequelize___sequelize_5.8.12.tgz";
+      name = "sequelize___sequelize_5.21.4.tgz";
       path = fetchurl {
-        name = "sequelize___sequelize_5.8.12.tgz";
-        url  = "https://registry.yarnpkg.com/sequelize/-/sequelize-5.8.12.tgz";
-        sha1 = "91f46f16789307d40c68f8c039c10d1d0f230ad2";
+        name = "sequelize___sequelize_5.21.4.tgz";
+        url  = "https://registry.yarnpkg.com/sequelize/-/sequelize-5.21.4.tgz";
+        sha1 = "a49597dbd7862e4e1fb8ec819de04705d06d9d17";
       };
     }
     {
-      name = "serialize_javascript___serialize_javascript_1.7.0.tgz";
+      name = "serialize_javascript___serialize_javascript_2.1.2.tgz";
       path = fetchurl {
-        name = "serialize_javascript___serialize_javascript_1.7.0.tgz";
-        url  = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.7.0.tgz";
-        sha1 = "d6e0dfb2a3832a8c94468e6eb1db97e55a192a65";
+        name = "serialize_javascript___serialize_javascript_2.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz";
+        sha1 = "ecec53b0e0317bdc95ef76ab7074b7384785fa61";
       };
     }
     {
@@ -11618,19 +9874,11 @@
       };
     }
     {
-      name = "set_value___set_value_0.4.3.tgz";
+      name = "set_value___set_value_2.0.1.tgz";
       path = fetchurl {
-        name = "set_value___set_value_0.4.3.tgz";
-        url  = "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz";
-        sha1 = "7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1";
-      };
-    }
-    {
-      name = "set_value___set_value_2.0.0.tgz";
-      path = fetchurl {
-        name = "set_value___set_value_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz";
-        sha1 = "71ae4a88f0feefbbf52d1ea604f3fb315ebb6274";
+        name = "set_value___set_value_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz";
+        sha1 = "a18d40530e6f07de4228c7defe4227af8cad005b";
       };
     }
     {
@@ -11730,11 +9978,11 @@
       };
     }
     {
-      name = "slugify___slugify_1.3.4.tgz";
+      name = "slugify___slugify_1.3.6.tgz";
       path = fetchurl {
-        name = "slugify___slugify_1.3.4.tgz";
-        url  = "https://registry.yarnpkg.com/slugify/-/slugify-1.3.4.tgz";
-        sha1 = "78d2792d7222b55cd9fc81fa018df99af779efeb";
+        name = "slugify___slugify_1.3.6.tgz";
+        url  = "https://registry.yarnpkg.com/slugify/-/slugify-1.3.6.tgz";
+        sha1 = "ba5fd6159b570fe4811d02ea9b1f4906677638c3";
       };
     }
     {
@@ -11770,11 +10018,11 @@
       };
     }
     {
-      name = "socket.io_adapter___socket.io_adapter_1.1.1.tgz";
+      name = "socket.io_adapter___socket.io_adapter_1.1.2.tgz";
       path = fetchurl {
-        name = "socket.io_adapter___socket.io_adapter_1.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz";
-        sha1 = "2a805e8a14d6372124dd9159ad4502f8cb07f06b";
+        name = "socket.io_adapter___socket.io_adapter_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz";
+        sha1 = "ab3f0d6f66b8fc7fca3959ab5991f82221789be9";
       };
     }
     {
@@ -11818,11 +10066,11 @@
       };
     }
     {
-      name = "source_map_resolve___source_map_resolve_0.5.2.tgz";
+      name = "source_map_resolve___source_map_resolve_0.5.3.tgz";
       path = fetchurl {
-        name = "source_map_resolve___source_map_resolve_0.5.2.tgz";
-        url  = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz";
-        sha1 = "72e2cc34095543e43b2c62b2c4c10d4a9054f259";
+        name = "source_map_resolve___source_map_resolve_0.5.3.tgz";
+        url  = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz";
+        sha1 = "190866bece7553e1f8f267a2ee82c606b5509a1a";
       };
     }
     {
@@ -11834,11 +10082,11 @@
       };
     }
     {
-      name = "source_map_support___source_map_support_0.5.12.tgz";
+      name = "source_map_support___source_map_support_0.5.16.tgz";
       path = fetchurl {
-        name = "source_map_support___source_map_support_0.5.12.tgz";
-        url  = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz";
-        sha1 = "b4f3b10d51857a5af0138d3ce8003b201613d599";
+        name = "source_map_support___source_map_support_0.5.16.tgz";
+        url  = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz";
+        sha1 = "0ae069e7fe3ba7538c64c98515e35339eac5a042";
       };
     }
     {
@@ -11849,14 +10097,6 @@
         sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3";
       };
     }
-    {
-      name = "source_map___source_map_0.5.0.tgz";
-      path = fetchurl {
-        name = "source_map___source_map_0.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.0.tgz";
-        sha1 = "0fe96503ac86a5adb5de63f4e412ae4872cdbe86";
-      };
-    }
     {
       name = "source_map___source_map_0.5.7.tgz";
       path = fetchurl {
@@ -11874,19 +10114,11 @@
       };
     }
     {
-      name = "sourcemap_codec___sourcemap_codec_1.4.4.tgz";
+      name = "sourcemap_codec___sourcemap_codec_1.4.8.tgz";
       path = fetchurl {
-        name = "sourcemap_codec___sourcemap_codec_1.4.4.tgz";
-        url  = "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz";
-        sha1 = "c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f";
-      };
-    }
-    {
-      name = "space_separated_tokens___space_separated_tokens_1.1.4.tgz";
-      path = fetchurl {
-        name = "space_separated_tokens___space_separated_tokens_1.1.4.tgz";
-        url  = "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.4.tgz";
-        sha1 = "27910835ae00d0adfcdbd0ad7e611fb9544351fa";
+        name = "sourcemap_codec___sourcemap_codec_1.4.8.tgz";
+        url  = "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz";
+        sha1 = "ea804bd94857402e6992d05a38ef1ae35a9ab4c4";
       };
     }
     {
@@ -11914,11 +10146,11 @@
       };
     }
     {
-      name = "spdx_license_ids___spdx_license_ids_3.0.4.tgz";
+      name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz";
       path = fetchurl {
-        name = "spdx_license_ids___spdx_license_ids_3.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz";
-        sha1 = "75ecd1a88de8c184ef015eafb51b5b48bfd11bb1";
+        name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz";
+        sha1 = "3694b5804567a458d3c8045842a6358632f62654";
       };
     }
     {
@@ -11962,19 +10194,11 @@
       };
     }
     {
-      name = "sprintf___sprintf_0.1.5.tgz";
+      name = "sqlite3___sqlite3_4.1.1.tgz";
       path = fetchurl {
-        name = "sprintf___sprintf_0.1.5.tgz";
-        url  = "https://registry.yarnpkg.com/sprintf/-/sprintf-0.1.5.tgz";
-        sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf";
-      };
-    }
-    {
-      name = "sqlite3___sqlite3_4.0.8.tgz";
-      path = fetchurl {
-        name = "sqlite3___sqlite3_4.0.8.tgz";
-        url  = "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.0.8.tgz";
-        sha1 = "81ee60d54befaa52f5421fe6337050bd43d4bb95";
+        name = "sqlite3___sqlite3_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.1.1.tgz";
+        sha1 = "539a42e476640796578e22d589b3283c28055242";
       };
     }
     {
@@ -11993,14 +10217,6 @@
         sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877";
       };
     }
-    {
-      name = "ssri___ssri_5.3.0.tgz";
-      path = fetchurl {
-        name = "ssri___ssri_5.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz";
-        sha1 = "ba3872c9c6d33a0704a7d71ff045e5ec48999d06";
-      };
-    }
     {
       name = "ssri___ssri_6.0.1.tgz";
       path = fetchurl {
@@ -12025,14 +10241,6 @@
         sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0";
       };
     }
-    {
-      name = "state_toggle___state_toggle_1.0.2.tgz";
-      path = fetchurl {
-        name = "state_toggle___state_toggle_1.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.2.tgz";
-        sha1 = "75e93a61944116b4959d665c8db2d243631d6ddc";
-      };
-    }
     {
       name = "static_extend___static_extend_0.1.2.tgz";
       path = fetchurl {
@@ -12065,14 +10273,6 @@
         sha1 = "8c534e2a0b831f72b75fc5f1119857c44ef5d593";
       };
     }
-    {
-      name = "stream_array___stream_array_1.1.2.tgz";
-      path = fetchurl {
-        name = "stream_array___stream_array_1.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/stream-array/-/stream-array-1.1.2.tgz";
-        sha1 = "9e5f7345f2137c30ee3b498b9114e80b52bb7eb5";
-      };
-    }
     {
       name = "stream_browserify___stream_browserify_2.0.2.tgz";
       path = fetchurl {
@@ -12081,14 +10281,6 @@
         sha1 = "87521d38a44aa7ee91ce1cd2a47df0cb49dd660b";
       };
     }
-    {
-      name = "stream_combiner2___stream_combiner2_1.1.1.tgz";
-      path = fetchurl {
-        name = "stream_combiner2___stream_combiner2_1.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz";
-        sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe";
-      };
-    }
     {
       name = "stream_each___stream_each_1.2.3.tgz";
       path = fetchurl {
@@ -12114,11 +10306,11 @@
       };
     }
     {
-      name = "stream_shift___stream_shift_1.0.0.tgz";
+      name = "stream_shift___stream_shift_1.0.1.tgz";
       path = fetchurl {
-        name = "stream_shift___stream_shift_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz";
-        sha1 = "d5c752825e5367e786f78e18e445ea223a155952";
+        name = "stream_shift___stream_shift_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz";
+        sha1 = "d7088281559ab2778424279b0877da3c392d5a3d";
       };
     }
     {
@@ -12145,14 +10337,6 @@
         sha1 = "9dbe1dd65490a5fe14f7a5c9bc686fc67cb9c6e4";
       };
     }
-    {
-      name = "string_template___string_template_0.2.1.tgz";
-      path = fetchurl {
-        name = "string_template___string_template_0.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz";
-        sha1 = "42932e598a352d01fc22ec3367d9d84eec6c9add";
-      };
-    }
     {
       name = "string_width___string_width_1.0.2.tgz";
       path = fetchurl {
@@ -12178,11 +10362,19 @@
       };
     }
     {
-      name = "string_width___string_width_4.1.0.tgz";
+      name = "string.prototype.trimleft___string.prototype.trimleft_2.1.1.tgz";
       path = fetchurl {
-        name = "string_width___string_width_4.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/string-width/-/string-width-4.1.0.tgz";
-        sha1 = "ba846d1daa97c3c596155308063e075ed1c99aff";
+        name = "string.prototype.trimleft___string.prototype.trimleft_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz";
+        sha1 = "9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74";
+      };
+    }
+    {
+      name = "string.prototype.trimright___string.prototype.trimright_2.1.1.tgz";
+      path = fetchurl {
+        name = "string.prototype.trimright___string.prototype.trimright_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz";
+        sha1 = "440314b15996c866ce8a0341894d45186200c5d9";
       };
     }
     {
@@ -12193,6 +10385,14 @@
         sha1 = "5ea211cd92d228e184294990a6cc97b366a77cb0";
       };
     }
+    {
+      name = "string_decoder___string_decoder_1.3.0.tgz";
+      path = fetchurl {
+        name = "string_decoder___string_decoder_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz";
+        sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e";
+      };
+    }
     {
       name = "string_decoder___string_decoder_0.10.31.tgz";
       path = fetchurl {
@@ -12201,14 +10401,6 @@
         sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
       };
     }
-    {
-      name = "string_decoder___string_decoder_1.2.0.tgz";
-      path = fetchurl {
-        name = "string_decoder___string_decoder_1.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz";
-        sha1 = "fe86e738b19544afe70469243b2a1ee9240eae8d";
-      };
-    }
     {
       name = "string_decoder___string_decoder_1.1.1.tgz";
       path = fetchurl {
@@ -12217,14 +10409,6 @@
         sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8";
       };
     }
-    {
-      name = "stringify_entities___stringify_entities_1.3.2.tgz";
-      path = fetchurl {
-        name = "stringify_entities___stringify_entities_1.3.2.tgz";
-        url  = "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-1.3.2.tgz";
-        sha1 = "a98417e5471fd227b3e45d3db1861c11caf668f7";
-      };
-    }
     {
       name = "strip_ansi___strip_ansi_3.0.1.tgz";
       path = fetchurl {
@@ -12290,11 +10474,11 @@
       };
     }
     {
-      name = "style_loader___style_loader_0.21.0.tgz";
+      name = "style_loader___style_loader_1.1.3.tgz";
       path = fetchurl {
-        name = "style_loader___style_loader_0.21.0.tgz";
-        url  = "https://registry.yarnpkg.com/style-loader/-/style-loader-0.21.0.tgz";
-        sha1 = "68c52e5eb2afc9ca92b6274be277ee59aea3a852";
+        name = "style_loader___style_loader_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/style-loader/-/style-loader-1.1.3.tgz";
+        sha1 = "9e826e69c683c4d9bf9db924f85e9abb30d5e200";
       };
     }
     {
@@ -12305,14 +10489,6 @@
         sha1 = "6718fcaf4d1e07d8a1318690881e8d96726a71d5";
       };
     }
-    {
-      name = "subarg___subarg_1.0.0.tgz";
-      path = fetchurl {
-        name = "subarg___subarg_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz";
-        sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2";
-      };
-    }
     {
       name = "superagent___superagent_1.8.3.tgz";
       path = fetchurl {
@@ -12329,6 +10505,14 @@
         sha1 = "1c6b337402c2137605efe19f10fec390f6faab54";
       };
     }
+    {
+      name = "supports_color___supports_color_6.1.0.tgz";
+      path = fetchurl {
+        name = "supports_color___supports_color_6.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz";
+        sha1 = "0764abc69c63d5ac842dd4867e8d025e880df8f3";
+      };
+    }
     {
       name = "supports_color___supports_color_2.0.0.tgz";
       path = fetchurl {
@@ -12346,35 +10530,27 @@
       };
     }
     {
-      name = "supports_color___supports_color_6.1.0.tgz";
+      name = "svgo___svgo_1.3.2.tgz";
       path = fetchurl {
-        name = "supports_color___supports_color_6.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz";
-        sha1 = "0764abc69c63d5ac842dd4867e8d025e880df8f3";
+        name = "svgo___svgo_1.3.2.tgz";
+        url  = "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz";
+        sha1 = "b6dc511c063346c9e415b81e43401145b96d4167";
       };
     }
     {
-      name = "svgo___svgo_1.2.2.tgz";
+      name = "symbol_tree___symbol_tree_3.2.4.tgz";
       path = fetchurl {
-        name = "svgo___svgo_1.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/svgo/-/svgo-1.2.2.tgz";
-        sha1 = "0253d34eccf2aed4ad4f283e11ee75198f9d7316";
+        name = "symbol_tree___symbol_tree_3.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz";
+        sha1 = "430637d248ba77e078883951fb9aa0eed7c63fa2";
       };
     }
     {
-      name = "symbol_tree___symbol_tree_3.2.2.tgz";
+      name = "table___table_5.4.6.tgz";
       path = fetchurl {
-        name = "symbol_tree___symbol_tree_3.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz";
-        sha1 = "ae27db38f660a7ae2e1c3b7d1bc290819b8519e6";
-      };
-    }
-    {
-      name = "table___table_5.4.0.tgz";
-      path = fetchurl {
-        name = "table___table_5.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/table/-/table-5.4.0.tgz";
-        sha1 = "d772a3216e68829920a41a32c18eda286c95d780";
+        name = "table___table_5.4.6.tgz";
+        url  = "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz";
+        sha1 = "1292d19500ce3f86053b05f0e8e7e4a3bb21079e";
       };
     }
     {
@@ -12394,43 +10570,35 @@
       };
     }
     {
-      name = "tar___tar_4.4.8.tgz";
+      name = "tar___tar_4.4.13.tgz";
       path = fetchurl {
-        name = "tar___tar_4.4.8.tgz";
-        url  = "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz";
-        sha1 = "b19eec3fde2a96e64666df9fdb40c5ca1bc3747d";
+        name = "tar___tar_4.4.13.tgz";
+        url  = "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz";
+        sha1 = "43b364bc52888d555298637b10d60790254ab525";
       };
     }
     {
-      name = "taskgroup___taskgroup_4.3.1.tgz";
+      name = "tedious___tedious_6.7.0.tgz";
       path = fetchurl {
-        name = "taskgroup___taskgroup_4.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/taskgroup/-/taskgroup-4.3.1.tgz";
-        sha1 = "7de193febd768273c457730497024d512c27915a";
+        name = "tedious___tedious_6.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/tedious/-/tedious-6.7.0.tgz";
+        sha1 = "ad02365f16f9e0416b216e13d3f83c53addd42ca";
       };
     }
     {
-      name = "tedious___tedious_1.15.0.tgz";
+      name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz";
       path = fetchurl {
-        name = "tedious___tedious_1.15.0.tgz";
-        url  = "https://registry.yarnpkg.com/tedious/-/tedious-1.15.0.tgz";
-        sha1 = "9bda9e9798212c8fcd9438a70cb2a806abcae70a";
+        name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz";
+        url  = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz";
+        sha1 = "5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c";
       };
     }
     {
-      name = "terser_webpack_plugin___terser_webpack_plugin_1.3.0.tgz";
+      name = "terser___terser_4.6.3.tgz";
       path = fetchurl {
-        name = "terser_webpack_plugin___terser_webpack_plugin_1.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz";
-        sha1 = "69aa22426299f4b5b3775cbed8cb2c5d419aa1d4";
-      };
-    }
-    {
-      name = "terser___terser_4.0.0.tgz";
-      path = fetchurl {
-        name = "terser___terser_4.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/terser/-/terser-4.0.0.tgz";
-        sha1 = "ef356f6f359a963e2cc675517f21c1c382877374";
+        name = "terser___terser_4.6.3.tgz";
+        url  = "https://registry.yarnpkg.com/terser/-/terser-4.6.3.tgz";
+        sha1 = "e33aa42461ced5238d352d2df2a67f21921f8d87";
       };
     }
     {
@@ -12457,14 +10625,6 @@
         sha1 = "9e785836daf46743145a5984b6268d828528ac6c";
       };
     }
-    {
-      name = "through2_filter___through2_filter_3.0.0.tgz";
-      path = fetchurl {
-        name = "through2_filter___through2_filter_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz";
-        sha1 = "700e786df2367c2c88cd8aa5be4cf9c1e7831254";
-      };
-    }
     {
       name = "through2___through2_0.6.5.tgz";
       path = fetchurl {
@@ -12481,6 +10641,14 @@
         sha1 = "01c1e39eb31d07cb7d03a96a70823260b23132cd";
       };
     }
+    {
+      name = "through2___through2_3.0.1.tgz";
+      path = fetchurl {
+        name = "through2___through2_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz";
+        sha1 = "39276e713c3302edf9e388dd9c812dd3b825bd5a";
+      };
+    }
     {
       name = "through___through_2.3.8.tgz";
       path = fetchurl {
@@ -12490,19 +10658,11 @@
       };
     }
     {
-      name = "time_stamp___time_stamp_1.1.0.tgz";
+      name = "timers_browserify___timers_browserify_2.0.11.tgz";
       path = fetchurl {
-        name = "time_stamp___time_stamp_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz";
-        sha1 = "764a5a11af50561921b133f3b44e618687e0f5c3";
-      };
-    }
-    {
-      name = "timers_browserify___timers_browserify_2.0.10.tgz";
-      path = fetchurl {
-        name = "timers_browserify___timers_browserify_2.0.10.tgz";
-        url  = "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz";
-        sha1 = "1d28e3d2aadf1d5a5996c4e9f95601cd053480ae";
+        name = "timers_browserify___timers_browserify_2.0.11.tgz";
+        url  = "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz";
+        sha1 = "800b1f3eee272e5bc53ee465a04d0e804c31211f";
       };
     }
     {
@@ -12529,22 +10689,6 @@
         sha1 = "1d1a56edfc51c43e863cbb5382a72330e3555423";
       };
     }
-    {
-      name = "tiny_lr___tiny_lr_1.1.1.tgz";
-      path = fetchurl {
-        name = "tiny_lr___tiny_lr_1.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.1.1.tgz";
-        sha1 = "9fa547412f238fedb068ee295af8b682c98b2aab";
-      };
-    }
-    {
-      name = "tmp___tmp_0.0.29.tgz";
-      path = fetchurl {
-        name = "tmp___tmp_0.0.29.tgz";
-        url  = "https://registry.yarnpkg.com/tmp/-/tmp-0.0.29.tgz";
-        sha1 = "f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0";
-      };
-    }
     {
       name = "tmp___tmp_0.0.33.tgz";
       path = fetchurl {
@@ -12554,11 +10698,11 @@
       };
     }
     {
-      name = "to_absolute_glob___to_absolute_glob_2.0.2.tgz";
+      name = "tmp___tmp_0.1.0.tgz";
       path = fetchurl {
-        name = "to_absolute_glob___to_absolute_glob_2.0.2.tgz";
-        url  = "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz";
-        sha1 = "1865f43d9e74b0822db9f145b78cff7d0f7c849b";
+        name = "tmp___tmp_0.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz";
+        sha1 = "ee434a4e22543082e294ba6201dcc6eafefa2877";
       };
     }
     {
@@ -12593,14 +10737,6 @@
         sha1 = "b83571fa4d8c25b82e231b06e3a3055de4ca1a47";
       };
     }
-    {
-      name = "to_fast_properties___to_fast_properties_2.0.0.tgz";
-      path = fetchurl {
-        name = "to_fast_properties___to_fast_properties_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz";
-        sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e";
-      };
-    }
     {
       name = "to_object_path___to_object_path_0.3.0.tgz";
       path = fetchurl {
@@ -12625,14 +10761,6 @@
         sha1 = "13cfdd9b336552f30b51f33a8ae1b42a7a7599ce";
       };
     }
-    {
-      name = "to_through___to_through_2.0.0.tgz";
-      path = fetchurl {
-        name = "to_through___to_through_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz";
-        sha1 = "fc92adaba072647bc0b67d6b03664aa195093af6";
-      };
-    }
     {
       name = "toidentifier___toidentifier_1.0.0.tgz";
       path = fetchurl {
@@ -12673,14 +10801,6 @@
         sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09";
       };
     }
-    {
-      name = "trim_lines___trim_lines_1.1.2.tgz";
-      path = fetchurl {
-        name = "trim_lines___trim_lines_1.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/trim-lines/-/trim-lines-1.1.2.tgz";
-        sha1 = "c8adbdbdae21bb5c2766240a661f693afe23e59b";
-      };
-    }
     {
       name = "trim_right___trim_right_1.0.1.tgz";
       path = fetchurl {
@@ -12689,22 +10809,6 @@
         sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003";
       };
     }
-    {
-      name = "trim_trailing_lines___trim_trailing_lines_1.1.2.tgz";
-      path = fetchurl {
-        name = "trim_trailing_lines___trim_trailing_lines_1.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.2.tgz";
-        sha1 = "d2f1e153161152e9f02fabc670fb40bec2ea2e3a";
-      };
-    }
-    {
-      name = "trim___trim_0.0.1.tgz";
-      path = fetchurl {
-        name = "trim___trim_0.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz";
-        sha1 = "5858547f6b290757ee95cccc666fb50084c460dd";
-      };
-    }
     {
       name = "triple_beam___triple_beam_1.3.0.tgz";
       path = fetchurl {
@@ -12714,19 +10818,11 @@
       };
     }
     {
-      name = "trough___trough_1.0.4.tgz";
+      name = "try_catch___try_catch_2.0.1.tgz";
       path = fetchurl {
-        name = "trough___trough_1.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/trough/-/trough-1.0.4.tgz";
-        sha1 = "3b52b1f13924f460c3fbfd0df69b587dbcbc762e";
-      };
-    }
-    {
-      name = "try_catch___try_catch_2.0.0.tgz";
-      path = fetchurl {
-        name = "try_catch___try_catch_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/try-catch/-/try-catch-2.0.0.tgz";
-        sha1 = "a491141d597f8b72b46757fe1c47059341a16aed";
+        name = "try_catch___try_catch_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/try-catch/-/try-catch-2.0.1.tgz";
+        sha1 = "a35d354187c422f291a0bcfd9eb77e3a4f90c1e5";
       };
     }
     {
@@ -12738,11 +10834,11 @@
       };
     }
     {
-      name = "tslib___tslib_1.9.3.tgz";
+      name = "tslib___tslib_1.10.0.tgz";
       path = fetchurl {
-        name = "tslib___tslib_1.9.3.tgz";
-        url  = "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz";
-        sha1 = "d7e4dd79245d85428c4d7e4822a79917954ca286";
+        name = "tslib___tslib_1.10.0.tgz";
+        url  = "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz";
+        sha1 = "c3c19f95973fb0a62973fb09d90d961ee43e5c8a";
       };
     }
     {
@@ -12761,6 +10857,14 @@
         sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd";
       };
     }
+    {
+      name = "tunnel___tunnel_0.0.6.tgz";
+      path = fetchurl {
+        name = "tunnel___tunnel_0.0.6.tgz";
+        url  = "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz";
+        sha1 = "72f1314b34a5b192db012324df2cc587ca47f92c";
+      };
+    }
     {
       name = "turndown___turndown_5.0.3.tgz";
       path = fetchurl {
@@ -12785,6 +10889,14 @@
         sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72";
       };
     }
+    {
+      name = "type_fest___type_fest_0.8.1.tgz";
+      path = fetchurl {
+        name = "type_fest___type_fest_0.8.1.tgz";
+        url  = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz";
+        sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d";
+      };
+    }
     {
       name = "type_is___type_is_1.6.18.tgz";
       path = fetchurl {
@@ -12794,27 +10906,19 @@
       };
     }
     {
-      name = "typechecker___typechecker_2.1.0.tgz";
+      name = "type___type_1.2.0.tgz";
       path = fetchurl {
-        name = "typechecker___typechecker_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/typechecker/-/typechecker-2.1.0.tgz";
-        sha1 = "d1c2093a54ff8a19f58cff877eeaa54f2242d383";
+        name = "type___type_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz";
+        sha1 = "848dd7698dafa3e54a6c479e759c4bc3f18847a0";
       };
     }
     {
-      name = "typechecker___typechecker_4.7.0.tgz";
+      name = "type___type_2.0.0.tgz";
       path = fetchurl {
-        name = "typechecker___typechecker_4.7.0.tgz";
-        url  = "https://registry.yarnpkg.com/typechecker/-/typechecker-4.7.0.tgz";
-        sha1 = "5249f427358f45b7250c4924fd4d01ed9ba435e9";
-      };
-    }
-    {
-      name = "typechecker___typechecker_2.0.8.tgz";
-      path = fetchurl {
-        name = "typechecker___typechecker_2.0.8.tgz";
-        url  = "https://registry.yarnpkg.com/typechecker/-/typechecker-2.0.8.tgz";
-        sha1 = "e83da84bb64c584ccb345838576c40b0337db82e";
+        name = "type___type_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz";
+        sha1 = "5f16ff6ef2eb44f260494dae271033b29c09a9c3";
       };
     }
     {
@@ -12833,22 +10937,6 @@
         sha1 = "9c411a802a409a91fc6cf74081baba34b24499ac";
       };
     }
-    {
-      name = "uglify_es___uglify_es_3.3.9.tgz";
-      path = fetchurl {
-        name = "uglify_es___uglify_es_3.3.9.tgz";
-        url  = "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz";
-        sha1 = "0c1c4f0700bed8dbc124cdb304d2592ca203e677";
-      };
-    }
-    {
-      name = "uglify_js___uglify_js_3.4.10.tgz";
-      path = fetchurl {
-        name = "uglify_js___uglify_js_3.4.10.tgz";
-        url  = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz";
-        sha1 = "9ad9563d8eb3acdfb8d38597d2af1d815f6a755f";
-      };
-    }
     {
       name = "uglify_js___uglify_js_2.8.29.tgz";
       path = fetchurl {
@@ -12858,19 +10946,11 @@
       };
     }
     {
-      name = "uglify_js___uglify_js_3.5.15.tgz";
+      name = "uglify_js___uglify_js_3.7.7.tgz";
       path = fetchurl {
-        name = "uglify_js___uglify_js_3.5.15.tgz";
-        url  = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.5.15.tgz";
-        sha1 = "fe2b5378fd0b09e116864041437bff889105ce24";
-      };
-    }
-    {
-      name = "uglify_js___uglify_js_3.6.0.tgz";
-      path = fetchurl {
-        name = "uglify_js___uglify_js_3.6.0.tgz";
-        url  = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz";
-        sha1 = "704681345c53a8b2079fb6cec294b05ead242ff5";
+        name = "uglify_js___uglify_js_3.7.7.tgz";
+        url  = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.7.tgz";
+        sha1 = "21e52c7dccda80a53bf7cde69628a7e511aec9c9";
       };
     }
     {
@@ -12881,14 +10961,6 @@
         sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
       };
     }
-    {
-      name = "uglifyjs_webpack_plugin___uglifyjs_webpack_plugin_1.3.0.tgz";
-      path = fetchurl {
-        name = "uglifyjs_webpack_plugin___uglifyjs_webpack_plugin_1.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz";
-        sha1 = "75f548160858163a08643e086d5fefe18a5d67de";
-      };
-    }
     {
       name = "uid_safe___uid_safe_2.1.5.tgz";
       path = fetchurl {
@@ -12921,22 +10993,6 @@
         sha1 = "6160bdc1817e4a63a625946775063c638623e62e";
       };
     }
-    {
-      name = "unc_path_regex___unc_path_regex_0.1.2.tgz";
-      path = fetchurl {
-        name = "unc_path_regex___unc_path_regex_0.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz";
-        sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa";
-      };
-    }
-    {
-      name = "underscore.string___underscore.string_2.4.0.tgz";
-      path = fetchurl {
-        name = "underscore.string___underscore.string_2.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/underscore.string/-/underscore.string-2.4.0.tgz";
-        sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
-      };
-    }
     {
       name = "underscore___underscore_1.8.3.tgz";
       path = fetchurl {
@@ -12946,11 +11002,11 @@
       };
     }
     {
-      name = "underscore___underscore_1.9.1.tgz";
+      name = "underscore___underscore_1.9.2.tgz";
       path = fetchurl {
-        name = "underscore___underscore_1.9.1.tgz";
-        url  = "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz";
-        sha1 = "06dce34a0e68a7babc29b365b8e74b8925203961";
+        name = "underscore___underscore_1.9.2.tgz";
+        url  = "https://registry.yarnpkg.com/underscore/-/underscore-1.9.2.tgz";
+        sha1 = "0c8d6f536d6f378a5af264a72f7bec50feb7cf2f";
       };
     }
     {
@@ -12961,22 +11017,6 @@
         sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8";
       };
     }
-    {
-      name = "underscore___underscore_1.7.0.tgz";
-      path = fetchurl {
-        name = "underscore___underscore_1.7.0.tgz";
-        url  = "https://registry.yarnpkg.com/underscore/-/underscore-1.7.0.tgz";
-        sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209";
-      };
-    }
-    {
-      name = "unherit___unherit_1.1.2.tgz";
-      path = fetchurl {
-        name = "unherit___unherit_1.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/unherit/-/unherit-1.1.2.tgz";
-        sha1 = "14f1f397253ee4ec95cec167762e77df83678449";
-      };
-    }
     {
       name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz";
       path = fetchurl {
@@ -13010,19 +11050,11 @@
       };
     }
     {
-      name = "unified___unified_6.2.0.tgz";
+      name = "union_value___union_value_1.0.1.tgz";
       path = fetchurl {
-        name = "unified___unified_6.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/unified/-/unified-6.2.0.tgz";
-        sha1 = "7fbd630f719126d67d40c644b7e3f617035f6dba";
-      };
-    }
-    {
-      name = "union_value___union_value_1.0.0.tgz";
-      path = fetchurl {
-        name = "union_value___union_value_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz";
-        sha1 = "5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4";
+        name = "union_value___union_value_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz";
+        sha1 = "0b6fe7b835aecda61c6ea4d4f02c14221e109847";
       };
     }
     {
@@ -13050,99 +11082,11 @@
       };
     }
     {
-      name = "unique_slug___unique_slug_2.0.1.tgz";
+      name = "unique_slug___unique_slug_2.0.2.tgz";
       path = fetchurl {
-        name = "unique_slug___unique_slug_2.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.1.tgz";
-        sha1 = "5e9edc6d1ce8fb264db18a507ef9bd8544451ca6";
-      };
-    }
-    {
-      name = "unique_stream___unique_stream_2.3.1.tgz";
-      path = fetchurl {
-        name = "unique_stream___unique_stream_2.3.1.tgz";
-        url  = "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz";
-        sha1 = "c65d110e9a4adf9a6c5948b28053d9a8d04cbeac";
-      };
-    }
-    {
-      name = "unist_builder___unist_builder_1.0.4.tgz";
-      path = fetchurl {
-        name = "unist_builder___unist_builder_1.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/unist-builder/-/unist-builder-1.0.4.tgz";
-        sha1 = "e1808aed30bd72adc3607f25afecebef4dd59e17";
-      };
-    }
-    {
-      name = "unist_util_generated___unist_util_generated_1.1.4.tgz";
-      path = fetchurl {
-        name = "unist_util_generated___unist_util_generated_1.1.4.tgz";
-        url  = "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.4.tgz";
-        sha1 = "2261c033d9fc23fae41872cdb7663746e972c1a7";
-      };
-    }
-    {
-      name = "unist_util_is___unist_util_is_2.1.3.tgz";
-      path = fetchurl {
-        name = "unist_util_is___unist_util_is_2.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-2.1.3.tgz";
-        sha1 = "459182db31f4742fceaea88d429693cbf0043d20";
-      };
-    }
-    {
-      name = "unist_util_is___unist_util_is_3.0.0.tgz";
-      path = fetchurl {
-        name = "unist_util_is___unist_util_is_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-3.0.0.tgz";
-        sha1 = "d9e84381c2468e82629e4a5be9d7d05a2dd324cd";
-      };
-    }
-    {
-      name = "unist_util_position___unist_util_position_3.0.3.tgz";
-      path = fetchurl {
-        name = "unist_util_position___unist_util_position_3.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.0.3.tgz";
-        sha1 = "fff942b879538b242096c148153826664b1ca373";
-      };
-    }
-    {
-      name = "unist_util_remove_position___unist_util_remove_position_1.1.3.tgz";
-      path = fetchurl {
-        name = "unist_util_remove_position___unist_util_remove_position_1.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.3.tgz";
-        sha1 = "d91aa8b89b30cb38bad2924da11072faa64fd972";
-      };
-    }
-    {
-      name = "unist_util_stringify_position___unist_util_stringify_position_1.1.2.tgz";
-      path = fetchurl {
-        name = "unist_util_stringify_position___unist_util_stringify_position_1.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz";
-        sha1 = "3f37fcf351279dcbca7480ab5889bb8a832ee1c6";
-      };
-    }
-    {
-      name = "unist_util_stringify_position___unist_util_stringify_position_2.0.1.tgz";
-      path = fetchurl {
-        name = "unist_util_stringify_position___unist_util_stringify_position_2.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.1.tgz";
-        sha1 = "de2a2bc8d3febfa606652673a91455b6a36fb9f3";
-      };
-    }
-    {
-      name = "unist_util_visit_parents___unist_util_visit_parents_2.1.2.tgz";
-      path = fetchurl {
-        name = "unist_util_visit_parents___unist_util_visit_parents_2.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz";
-        sha1 = "25e43e55312166f3348cae6743588781d112c1e9";
-      };
-    }
-    {
-      name = "unist_util_visit___unist_util_visit_1.4.1.tgz";
-      path = fetchurl {
-        name = "unist_util_visit___unist_util_visit_1.4.1.tgz";
-        url  = "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.4.1.tgz";
-        sha1 = "4724aaa8486e6ee6e26d7ff3c8685960d560b1e3";
+        name = "unique_slug___unique_slug_2.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz";
+        sha1 = "baabce91083fc64e945b0f3ad613e264f7cd4e6c";
       };
     }
     {
@@ -13178,11 +11122,11 @@
       };
     }
     {
-      name = "upath___upath_1.1.2.tgz";
+      name = "upath___upath_1.2.0.tgz";
       path = fetchurl {
-        name = "upath___upath_1.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz";
-        sha1 = "3db658600edaeeccbe6db5e684d67ee8c2acd068";
+        name = "upath___upath_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz";
+        sha1 = "8f66dbcd55a883acdae4408af8b035a5044c1894";
       };
     }
     {
@@ -13210,11 +11154,11 @@
       };
     }
     {
-      name = "url_loader___url_loader_1.1.2.tgz";
+      name = "url_loader___url_loader_2.3.0.tgz";
       path = fetchurl {
-        name = "url_loader___url_loader_1.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/url-loader/-/url-loader-1.1.2.tgz";
-        sha1 = "b971d191b83af693c5e3fea4064be9e1f2d7f8d8";
+        name = "url_loader___url_loader_2.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/url-loader/-/url-loader-2.3.0.tgz";
+        sha1 = "e0e2ef658f003efb8ca41b0f3ffbf76bab88658b";
       };
     }
     {
@@ -13273,6 +11217,14 @@
         sha1 = "440f7165a459c9a16dc145eb8e72f35687097030";
       };
     }
+    {
+      name = "util.promisify___util.promisify_1.0.1.tgz";
+      path = fetchurl {
+        name = "util.promisify___util.promisify_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz";
+        sha1 = "6baf7774b80eeb0f7520d8b81d07982a59abbaee";
+      };
+    }
     {
       name = "util___util_0.10.3.tgz";
       path = fetchurl {
@@ -13313,6 +11265,14 @@
         sha1 = "1b4af4955eb3077c501c23872fc6513811587131";
       };
     }
+    {
+      name = "uuid___uuid_3.4.0.tgz";
+      path = fetchurl {
+        name = "uuid___uuid_3.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz";
+        sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee";
+      };
+    }
     {
       name = "v8_compile_cache___v8_compile_cache_2.0.3.tgz";
       path = fetchurl {
@@ -13353,14 +11313,6 @@
         sha1 = "abf466d398b561cd243050112c6ff1de6cc12663";
       };
     }
-    {
-      name = "value_or_function___value_or_function_3.0.0.tgz";
-      path = fetchurl {
-        name = "value_or_function___value_or_function_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz";
-        sha1 = "1c243a50b595c1be54a754bfece8563b9ff8d813";
-      };
-    }
     {
       name = "vary___vary_1.1.2.tgz";
       path = fetchurl {
@@ -13386,11 +11338,11 @@
       };
     }
     {
-      name = "vendors___vendors_1.0.3.tgz";
+      name = "vendors___vendors_1.0.4.tgz";
       path = fetchurl {
-        name = "vendors___vendors_1.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/vendors/-/vendors-1.0.3.tgz";
-        sha1 = "a6467781abd366217c050f8202e7e50cc9eef8c0";
+        name = "vendors___vendors_1.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz";
+        sha1 = "e2b800a53e7a29b93506c3cf41100d16c4c4ad8e";
       };
     }
     {
@@ -13409,94 +11361,6 @@
         sha1 = "7d13b27b1facc2e2da90405eb5ea6e5bdd252ea5";
       };
     }
-    {
-      name = "vfile_location___vfile_location_2.0.5.tgz";
-      path = fetchurl {
-        name = "vfile_location___vfile_location_2.0.5.tgz";
-        url  = "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.5.tgz";
-        sha1 = "c83eb02f8040228a8d2b3f10e485be3e3433e0a2";
-      };
-    }
-    {
-      name = "vfile_message___vfile_message_1.1.1.tgz";
-      path = fetchurl {
-        name = "vfile_message___vfile_message_1.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/vfile-message/-/vfile-message-1.1.1.tgz";
-        sha1 = "5833ae078a1dfa2d96e9647886cd32993ab313e1";
-      };
-    }
-    {
-      name = "vfile_message___vfile_message_2.0.1.tgz";
-      path = fetchurl {
-        name = "vfile_message___vfile_message_2.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.1.tgz";
-        sha1 = "951881861c22fc1eb39f873c0b93e336a64e8f6d";
-      };
-    }
-    {
-      name = "vfile_reporter___vfile_reporter_6.0.0.tgz";
-      path = fetchurl {
-        name = "vfile_reporter___vfile_reporter_6.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-6.0.0.tgz";
-        sha1 = "753119f51dec9289b7508b457afc0cddf5e07f2e";
-      };
-    }
-    {
-      name = "vfile_sort___vfile_sort_2.2.1.tgz";
-      path = fetchurl {
-        name = "vfile_sort___vfile_sort_2.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/vfile-sort/-/vfile-sort-2.2.1.tgz";
-        sha1 = "74e714f9175618cdae96bcaedf1a3dc711d87567";
-      };
-    }
-    {
-      name = "vfile_statistics___vfile_statistics_1.1.3.tgz";
-      path = fetchurl {
-        name = "vfile_statistics___vfile_statistics_1.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/vfile-statistics/-/vfile-statistics-1.1.3.tgz";
-        sha1 = "e9c87071997fbcb4243764d2c3805e0bb0820c60";
-      };
-    }
-    {
-      name = "vfile___vfile_2.3.0.tgz";
-      path = fetchurl {
-        name = "vfile___vfile_2.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/vfile/-/vfile-2.3.0.tgz";
-        sha1 = "e62d8e72b20e83c324bc6c67278ee272488bf84a";
-      };
-    }
-    {
-      name = "vfile___vfile_4.0.1.tgz";
-      path = fetchurl {
-        name = "vfile___vfile_4.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/vfile/-/vfile-4.0.1.tgz";
-        sha1 = "fc3d43a1c71916034216bf65926d5ee3c64ed60c";
-      };
-    }
-    {
-      name = "vinyl_fs___vinyl_fs_3.0.3.tgz";
-      path = fetchurl {
-        name = "vinyl_fs___vinyl_fs_3.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz";
-        sha1 = "c85849405f67428feabbbd5c5dbdd64f47d31bc7";
-      };
-    }
-    {
-      name = "vinyl_sourcemap___vinyl_sourcemap_1.1.0.tgz";
-      path = fetchurl {
-        name = "vinyl_sourcemap___vinyl_sourcemap_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz";
-        sha1 = "92a800593a38703a8cdb11d8b300ad4be63b3e16";
-      };
-    }
-    {
-      name = "vinyl___vinyl_2.2.0.tgz";
-      path = fetchurl {
-        name = "vinyl___vinyl_2.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz";
-        sha1 = "d85b07da96e458d25b2ffe19fece9f2caa13ed86";
-      };
-    }
     {
       name = "visibilityjs___visibilityjs_1.2.8.tgz";
       path = fetchurl {
@@ -13514,19 +11378,11 @@
       };
     }
     {
-      name = "vm_browserify___vm_browserify_0.0.4.tgz";
+      name = "vm_browserify___vm_browserify_1.1.2.tgz";
       path = fetchurl {
-        name = "vm_browserify___vm_browserify_0.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz";
-        sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73";
-      };
-    }
-    {
-      name = "vue_template_compiler___vue_template_compiler_2.6.10.tgz";
-      path = fetchurl {
-        name = "vue_template_compiler___vue_template_compiler_2.6.10.tgz";
-        url  = "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.10.tgz";
-        sha1 = "323b4f3495f04faa3503337a82f5d6507799c9cc";
+        name = "vm_browserify___vm_browserify_1.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz";
+        sha1 = "78641c488b8e6ca91a75f511e7a3b32a86e5dda0";
       };
     }
     {
@@ -13545,14 +11401,6 @@
         sha1 = "4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00";
       };
     }
-    {
-      name = "watchr___watchr_2.4.13.tgz";
-      path = fetchurl {
-        name = "watchr___watchr_2.4.13.tgz";
-        url  = "https://registry.yarnpkg.com/watchr/-/watchr-2.4.13.tgz";
-        sha1 = "d74847bb4d6f90f61fe2c74f9f68662aa0e07601";
-      };
-    }
     {
       name = "weak_map___weak_map_1.0.5.tgz";
       path = fetchurl {
@@ -13578,59 +11426,43 @@
       };
     }
     {
-      name = "webpack_cli___webpack_cli_3.3.2.tgz";
+      name = "webpack_cli___webpack_cli_3.3.11.tgz";
       path = fetchurl {
-        name = "webpack_cli___webpack_cli_3.3.2.tgz";
-        url  = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.2.tgz";
-        sha1 = "aed2437b0db0a7faa2ad28484e166a5360014a91";
+        name = "webpack_cli___webpack_cli_3.3.11.tgz";
+        url  = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.11.tgz";
+        sha1 = "3bf21889bf597b5d82c38f215135a411edfdc631";
       };
     }
     {
-      name = "webpack_merge___webpack_merge_4.2.1.tgz";
+      name = "webpack_log___webpack_log_2.0.0.tgz";
       path = fetchurl {
-        name = "webpack_merge___webpack_merge_4.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.1.tgz";
-        sha1 = "5e923cf802ea2ace4fd5af1d3247368a633489b4";
+        name = "webpack_log___webpack_log_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz";
+        sha1 = "5b7928e0637593f119d32f6227c1e0ac31e1b47f";
       };
     }
     {
-      name = "webpack_parallel_uglify_plugin___webpack_parallel_uglify_plugin_1.1.0.tgz";
+      name = "webpack_merge___webpack_merge_4.2.2.tgz";
       path = fetchurl {
-        name = "webpack_parallel_uglify_plugin___webpack_parallel_uglify_plugin_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/webpack-parallel-uglify-plugin/-/webpack-parallel-uglify-plugin-1.1.0.tgz";
-        sha1 = "252a6c796bf79a8047b00de2cf08c23aa9861441";
+        name = "webpack_merge___webpack_merge_4.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz";
+        sha1 = "a27c52ea783d1398afd2087f547d7b9d2f43634d";
       };
     }
     {
-      name = "webpack_sources___webpack_sources_1.3.0.tgz";
+      name = "webpack_sources___webpack_sources_1.4.3.tgz";
       path = fetchurl {
-        name = "webpack_sources___webpack_sources_1.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz";
-        sha1 = "2a28dcb9f1f45fe960d8f1493252b5ee6530fa85";
+        name = "webpack_sources___webpack_sources_1.4.3.tgz";
+        url  = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz";
+        sha1 = "eedd8ec0b928fbf1cbfe994e22d2d890f330a933";
       };
     }
     {
-      name = "webpack___webpack_4.32.2.tgz";
+      name = "webpack___webpack_4.41.6.tgz";
       path = fetchurl {
-        name = "webpack___webpack_4.32.2.tgz";
-        url  = "https://registry.yarnpkg.com/webpack/-/webpack-4.32.2.tgz";
-        sha1 = "3639375364a617e84b914ddb2c770aed511e5bc8";
-      };
-    }
-    {
-      name = "websocket_driver___websocket_driver_0.7.3.tgz";
-      path = fetchurl {
-        name = "websocket_driver___websocket_driver_0.7.3.tgz";
-        url  = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz";
-        sha1 = "a2d4e0d4f4f116f1e6297eba58b05d430100e9f9";
-      };
-    }
-    {
-      name = "websocket_extensions___websocket_extensions_0.1.3.tgz";
-      path = fetchurl {
-        name = "websocket_extensions___websocket_extensions_0.1.3.tgz";
-        url  = "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz";
-        sha1 = "5d2ff22977003ec687a4b87073dfbbac146ccf29";
+        name = "webpack___webpack_4.41.6.tgz";
+        url  = "https://registry.yarnpkg.com/webpack/-/webpack-4.41.6.tgz";
+        sha1 = "12f2f804bf6542ef166755050d4afbc8f66ba7e1";
       };
     }
     {
@@ -13658,11 +11490,11 @@
       };
     }
     {
-      name = "whatwg_url___whatwg_url_7.0.0.tgz";
+      name = "whatwg_url___whatwg_url_7.1.0.tgz";
       path = fetchurl {
-        name = "whatwg_url___whatwg_url_7.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz";
-        sha1 = "fde926fa54a599f3adf82dff25a9f7be02dc6edd";
+        name = "whatwg_url___whatwg_url_7.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz";
+        sha1 = "c2c492f1eca612988efd3d2266be1b9fc6170d06";
       };
     }
     {
@@ -13714,11 +11546,19 @@
       };
     }
     {
-      name = "wkx___wkx_0.4.7.tgz";
+      name = "wkx___wkx_0.4.8.tgz";
       path = fetchurl {
-        name = "wkx___wkx_0.4.7.tgz";
-        url  = "https://registry.yarnpkg.com/wkx/-/wkx-0.4.7.tgz";
-        sha1 = "ba0e4f9e785e95c9975856c1834f19a95c65cfb5";
+        name = "wkx___wkx_0.4.8.tgz";
+        url  = "https://registry.yarnpkg.com/wkx/-/wkx-0.4.8.tgz";
+        sha1 = "a092cf088d112683fdc7182fd31493b2c5820003";
+      };
+    }
+    {
+      name = "word_wrap___word_wrap_1.2.3.tgz";
+      path = fetchurl {
+        name = "word_wrap___word_wrap_1.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz";
+        sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c";
       };
     }
     {
@@ -13737,14 +11577,6 @@
         sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
       };
     }
-    {
-      name = "wordwrap___wordwrap_1.0.0.tgz";
-      path = fetchurl {
-        name = "wordwrap___wordwrap_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz";
-        sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
-      };
-    }
     {
       name = "worker_farm___worker_farm_1.7.0.tgz";
       path = fetchurl {
@@ -13753,14 +11585,6 @@
         sha1 = "26a94c5391bbca926152002f69b84a4bf772e5a8";
       };
     }
-    {
-      name = "wrap_ansi___wrap_ansi_2.1.0.tgz";
-      path = fetchurl {
-        name = "wrap_ansi___wrap_ansi_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
-        sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
-      };
-    }
     {
       name = "wrap_ansi___wrap_ansi_5.1.0.tgz";
       path = fetchurl {
@@ -13810,27 +11634,19 @@
       };
     }
     {
-      name = "wurl___wurl_2.5.3.tgz";
+      name = "wurl___wurl_2.5.4.tgz";
       path = fetchurl {
-        name = "wurl___wurl_2.5.3.tgz";
-        url  = "https://registry.yarnpkg.com/wurl/-/wurl-2.5.3.tgz";
-        sha1 = "79ff7c4d8c6584cb46d239517ecac334380af7fd";
+        name = "wurl___wurl_2.5.4.tgz";
+        url  = "https://registry.yarnpkg.com/wurl/-/wurl-2.5.4.tgz";
+        sha1 = "6af35a6c623296c4a0c607c4651d01b8f4e3fdec";
       };
     }
     {
-      name = "x_is_string___x_is_string_0.1.0.tgz";
+      name = "x_xss_protection___x_xss_protection_1.3.0.tgz";
       path = fetchurl {
-        name = "x_is_string___x_is_string_0.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz";
-        sha1 = "474b50865af3a49a9c4657f05acd145458f77d82";
-      };
-    }
-    {
-      name = "x_xss_protection___x_xss_protection_1.1.0.tgz";
-      path = fetchurl {
-        name = "x_xss_protection___x_xss_protection_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/x-xss-protection/-/x-xss-protection-1.1.0.tgz";
-        sha1 = "4f1898c332deb1e7f2be1280efb3e2c53d69c1a7";
+        name = "x_xss_protection___x_xss_protection_1.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/x-xss-protection/-/x-xss-protection-1.3.0.tgz";
+        sha1 = "3e3a8dd638da80421b0e9fff11a2dbe168f6d52c";
       };
     }
     {
@@ -13842,11 +11658,11 @@
       };
     }
     {
-      name = "xml_encryption___xml_encryption_0.11.2.tgz";
+      name = "xml_encryption___xml_encryption_1.0.0.tgz";
       path = fetchurl {
-        name = "xml_encryption___xml_encryption_0.11.2.tgz";
-        url  = "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-0.11.2.tgz";
-        sha1 = "c217f5509547e34b500b829f2c0bca85cca73a21";
+        name = "xml_encryption___xml_encryption_1.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-1.0.0.tgz";
+        sha1 = "fe50d3bbbe2ae06876d6aa95aa3bf958284e1612";
       };
     }
     {
@@ -13873,6 +11689,14 @@
         sha1 = "686c20f213209e94abf0d1bcf1efaa291c7827a7";
       };
     }
+    {
+      name = "xml2js___xml2js_0.4.23.tgz";
+      path = fetchurl {
+        name = "xml2js___xml2js_0.4.23.tgz";
+        url  = "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz";
+        sha1 = "a0c69516752421eb2ac758ee4d4ccf58843eac66";
+      };
+    }
     {
       name = "xml___xml_1.0.1.tgz";
       path = fetchurl {
@@ -13905,6 +11729,22 @@
         sha1 = "d501f97b3bdb403af8ef9ecc20573187aadac0e9";
       };
     }
+    {
+      name = "xmldom___xmldom_0.1.31.tgz";
+      path = fetchurl {
+        name = "xmldom___xmldom_0.1.31.tgz";
+        url  = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz";
+        sha1 = "b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff";
+      };
+    }
+    {
+      name = "xmldom___xmldom_0.2.1.tgz";
+      path = fetchurl {
+        name = "xmldom___xmldom_0.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.2.1.tgz";
+        sha1 = "cac9465066f161e1c3302793ea4dbe59c518274f";
+      };
+    }
     {
       name = "xmlhttprequest_ssl___xmlhttprequest_ssl_1.5.5.tgz";
       path = fetchurl {
@@ -13921,6 +11761,14 @@
         sha1 = "67fe075c5c24fef39f9d65f5f7b7fe75171968fc";
       };
     }
+    {
+      name = "xpath.js___xpath.js_1.1.0.tgz";
+      path = fetchurl {
+        name = "xpath.js___xpath.js_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/xpath.js/-/xpath.js-1.1.0.tgz";
+        sha1 = "3816a44ed4bb352091083d002a383dd5104a5ff1";
+      };
+    }
     {
       name = "xpath___xpath_0.0.27.tgz";
       path = fetchurl {
@@ -13929,14 +11777,6 @@
         sha1 = "dd3421fbdcc5646ac32c48531b4d7e9d0c2cfa92";
       };
     }
-    {
-      name = "xregexp___xregexp_2.0.0.tgz";
-      path = fetchurl {
-        name = "xregexp___xregexp_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz";
-        sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943";
-      };
-    }
     {
       name = "xss___xss_1.0.6.tgz";
       path = fetchurl {
@@ -13945,14 +11785,6 @@
         sha1 = "eaf11e9fc476e3ae289944a1009efddd8a124b51";
       };
     }
-    {
-      name = "xtend___xtend_4.0.1.tgz";
-      path = fetchurl {
-        name = "xtend___xtend_4.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz";
-        sha1 = "a5c6d532be656e23db820efb943a1f04998d63af";
-      };
-    }
     {
       name = "xtend___xtend_4.0.2.tgz";
       path = fetchurl {
@@ -13986,19 +11818,11 @@
       };
     }
     {
-      name = "yallist___yallist_3.0.3.tgz";
+      name = "yallist___yallist_3.1.1.tgz";
       path = fetchurl {
-        name = "yallist___yallist_3.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz";
-        sha1 = "b4b049e314be545e3ce802236d6cd22cd91c3de9";
-      };
-    }
-    {
-      name = "yargs_parser___yargs_parser_11.1.1.tgz";
-      path = fetchurl {
-        name = "yargs_parser___yargs_parser_11.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz";
-        sha1 = "879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4";
+        name = "yallist___yallist_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz";
+        sha1 = "dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd";
       };
     }
     {
@@ -14009,14 +11833,6 @@
         sha1 = "d26058532aa06d365fe091f6a1fc06b2f7e5eca0";
       };
     }
-    {
-      name = "yargs___yargs_12.0.5.tgz";
-      path = fetchurl {
-        name = "yargs___yargs_12.0.5.tgz";
-        url  = "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz";
-        sha1 = "05f5997b609647b64f66b81e3b4b10a368e7ad13";
-      };
-    }
     {
       name = "yargs___yargs_13.2.4.tgz";
       path = fetchurl {
@@ -14025,6 +11841,14 @@
         sha1 = "0b562b794016eb9651b98bd37acf364aa5d6dc83";
       };
     }
+    {
+      name = "yargs___yargs_13.3.0.tgz";
+      path = fetchurl {
+        name = "yargs___yargs_13.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz";
+        sha1 = "4c657a55e07e5f2cf947f8a366567c04a0dedc83";
+      };
+    }
     {
       name = "yargs___yargs_3.10.0.tgz";
       path = fetchurl {

From 68410b08bea2e47ac2cd6be0749c41c0201a76ce Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Fri, 28 Feb 2020 11:57:27 +0100
Subject: [PATCH 1761/4636] nixos/codimd: update useCDN default to false

---
 nixos/modules/services/web-apps/codimd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/codimd.nix b/nixos/modules/services/web-apps/codimd.nix
index 5f56f8ed5a09..751f81649ddb 100644
--- a/nixos/modules/services/web-apps/codimd.nix
+++ b/nixos/modules/services/web-apps/codimd.nix
@@ -156,7 +156,7 @@ in
       };
       useCDN = mkOption {
         type = types.bool;
-        default = true;
+        default = false;
         description = ''
           Whether to use CDN resources or not.
         '';

From e68418d000fae545abba5c9cabbc12e666d6d4c9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Feb 2020 13:57:41 +0000
Subject: [PATCH 1762/4636] enchant: 2.2.7 -> 2.2.8

---
 pkgs/development/libraries/enchant/2.x.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix
index c92afee6dc94..65d85eddbe40 100644
--- a/pkgs/development/libraries/enchant/2.x.nix
+++ b/pkgs/development/libraries/enchant/2.x.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "enchant";
-  version = "2.2.7";
+  version = "2.2.8";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "029smcna98hllgkm2gy94qa7qphxs4xaa8cdbg5kaaw16mhrf8hv";
+    sha256 = "0m9m564qqwbssvvf7y3dlz1yxzqsjiqy1yd2zsmb3l0d7y2y5df7";
   };
 
   nativeBuildInputs = [
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Generic spell checking library";
-    homepage = https://abiword.github.io/enchant/;
+    homepage = "https://abiword.github.io/enchant/";
     license = licenses.lgpl21Plus; # with extra provision for non-free checkers
     maintainers = with maintainers; [ jtojnar ];
     platforms = platforms.unix;

From 6dab1b50a63fa6e9dfb9bd9eddd3f5d5c7b055ef Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 24 Feb 2020 00:41:55 +0100
Subject: [PATCH 1763/4636] buildLayeredImage: Allow empty store, no paths to
 add

This is useful when buildLayeredImage is called in a generic way
that should allow simple (base) images to be built, which may not
reference any store paths.
---
 nixos/tests/docker-tools.nix           | 17 +++++++++++++++++
 pkgs/build-support/docker/default.nix  |  9 +++++----
 pkgs/build-support/docker/examples.nix | 22 ++++++++++++++++++++++
 3 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index 54dd97e5b139..51b472fcf9ce 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -137,5 +137,22 @@ import ./make-test-python.nix ({ pkgs, ... }: {
             # Ensure the two output paths (ls and hello) are in the layer
             "docker run bulk-layer ls /bin/hello",
         )
+
+    with subtest("Ensure correct behavior when no store is needed"):
+        # This check tests two requirements simultaneously
+        #  1. buildLayeredImage can build images that don't need a store.
+        #  2. Layers of symlinks are eliminated by the customization layer.
+        #
+        docker.succeed(
+            "docker load --input='${pkgs.dockerTools.examples.no-store-paths}'"
+        )
+
+        # Busybox will not recognize argv[0] and print an error message with argv[0],
+        # but it confirms that the custom-true symlink is present.
+        docker.succeed("docker run --rm no-store-paths custom-true |& grep custom-true")
+
+        # This check may be loosened to allow an *empty* store rather than *no* store.
+        docker.succeed("docker run --rm no-store-paths ls /")
+        docker.fail("docker run --rm no-store-paths ls /nix/store")
   '';
 })
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index ff9949bc8dda..28c0d2dfcae1 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -319,6 +319,8 @@ rec {
       enableParallelBuilding = true;
     }
     ''
+      mkdir layers
+
       # Delete impurities for store path layers, so they don't get
       # shared and taint other projects.
       cat ${configJson} \
@@ -330,13 +332,12 @@ rec {
       # created, and that no paths are missed. If you change the
       # following head and tail call lines, double-check that your
       # code behaves properly when the number of layers equals:
-      #      maxLayers-1, maxLayers, and maxLayers+1
+      #      maxLayers-1, maxLayers, and maxLayers+1, 0
       paths() {
-        cat $paths ${lib.concatMapStringsSep " " (path: "| grep -v ${path}") (closures ++ [ overallClosure ])}
+        cat $paths ${lib.concatMapStringsSep " " (path: "| (grep -v ${path} || true)") (closures ++ [ overallClosure ])}
       }
 
-      # We need to sponge to avoid grep broken pipe error when maxLayers == 1
-      paths | sponge | head -n $((maxLayers - 1)) | cat -n | xargs -r -P$NIX_BUILD_CORES -n2 ${storePathToLayer}
+      paths | head -n $((maxLayers - 1)) | cat -n | xargs -r -P$NIX_BUILD_CORES -n2 ${storePathToLayer}
       if [ $(paths | wc -l) -ge $maxLayers ]; then
         paths | tail -n+$maxLayers | xargs ${storePathToLayer} $maxLayers
       fi
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index f0dcf236c0e4..f42b35e64943 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -258,4 +258,26 @@ rec {
     maxLayers = 2;
   };
 
+  # 17. Create a "layered" image without nix store layers. This is not
+  # recommended, but can be useful for base images in rare cases.
+  no-store-paths = pkgs.dockerTools.buildLayeredImage {
+    name = "no-store-paths";
+    tag = "latest";
+    extraCommands = ''
+      chmod a+w bin
+
+      # This removes sharing of busybox and is not recommended. We do this
+      # to make the example suitable as a test case with working binaries.
+      cp -r ${pkgs.pkgsStatic.busybox}/* .
+    '';
+    contents = [
+      # This layer has no dependencies and its symlinks will be dereferenced
+      # when creating the customization layer.
+      (pkgs.runCommand "layer-to-flatten" {} ''
+        mkdir -p $out/bin
+        ln -s /bin/true $out/bin/custom-true
+      ''
+      )
+    ];
+  };
 }

From 38903decbf2b6dd5c564ea0af19d12e60484665d Mon Sep 17 00:00:00 2001
From: kjuvi <quentin.vaucher@protonmail.com>
Date: Tue, 18 Feb 2020 19:05:55 +0100
Subject: [PATCH 1764/4636] khronos: init at 1.0.5

---
 pkgs/applications/office/khronos/default.nix | 64 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  4 +-
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/office/khronos/default.nix

diff --git a/pkgs/applications/office/khronos/default.nix b/pkgs/applications/office/khronos/default.nix
new file mode 100644
index 000000000000..d7726c13e647
--- /dev/null
+++ b/pkgs/applications/office/khronos/default.nix
@@ -0,0 +1,64 @@
+{ stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, vala
+, pkg-config
+, desktop-file-utils
+, pantheon
+, python3
+, glib
+, gtk3
+, json-glib
+, libgee
+, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+  pname = "khronos";
+  version = "1.0.5";
+
+  src = fetchFromGitHub {
+    owner = "lainsce";
+    repo = pname;
+    rev = version;
+    sha256 = "0dk1b2d82gli3z35dn5p002lfkgq326janql0vn1z5hs8jvjakqh";
+  };
+
+  nativeBuildInputs = [
+    desktop-file-utils
+    meson
+    ninja
+    vala
+    pkg-config
+    python3
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    glib
+    gtk3
+    json-glib
+    libgee
+    pantheon.granite
+  ];
+
+  postPatch = ''
+    chmod +x meson/post_install.py
+    patchShebangs meson/post_install.py
+  '';
+
+  passthru = {
+    updateScript = pantheon.updateScript {
+      attrPath = pname;
+    };
+  };
+
+  meta = with stdenv.lib; {
+    description = "Track each task's time in a simple inobtrusive way";
+    homepage = "https://github.com/lainsce/khronos";
+    maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers;
+    platforms = platforms.linux;
+    license = licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9eaa8525fc6b..38082e64bc4d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15384,7 +15384,7 @@ in
   miniHttpd = callPackage ../servers/http/mini-httpd {};
 
   mlflow-server = callPackage ../servers/mlflow-server { };
-  
+
   mlmmj = callPackage ../servers/mail/mlmmj { };
 
   moodle = callPackage ../servers/web-apps/moodle { };
@@ -19903,6 +19903,8 @@ in
 
   kexi = libsForQt5.callPackage ../applications/office/kexi { };
 
+  khronos = callPackage ../applications/office/khronos { };
+
   keyfinder = libsForQt5.callPackage ../applications/audio/keyfinder { };
 
   keyfinder-cli = libsForQt5.callPackage ../applications/audio/keyfinder-cli { };

From c3c7c3b486117ecfd0e17e6265c36e912346da62 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Feb 2020 14:30:08 +0000
Subject: [PATCH 1765/4636] fnotifystat: 0.02.03 -> 0.02.05

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

diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix
index c20206dc351a..ef247ad956b6 100644
--- a/pkgs/os-specific/linux/fnotifystat/default.nix
+++ b/pkgs/os-specific/linux/fnotifystat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "fnotifystat";
-  version = "0.02.03";
+  version = "0.02.05";
   src = fetchurl {
     url = "https://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz";
-    sha256 = "1b5s50dc8ag6k631nfp09chrqfpwai0r9ld822xqwp3qlszp0pv9";
+    sha256 = "1b8pxq731sj976m2daf0hnqfaaq688vqnjffinpwh2w9nzzi4gi9";
   };
   installFlags = [ "DESTDIR=$(out)" ];
   postInstall = ''
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   '';
   meta = with lib; {
     description = "File activity monitoring tool";
-    homepage = https://kernel.ubuntu.com/~cking/fnotifystat/;
+    homepage = "https://kernel.ubuntu.com/~cking/fnotifystat/";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ womfoo ];

From dddcfaccbb90df6da336421aef109bb573e466ab Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 11 Feb 2020 18:38:27 +0000
Subject: [PATCH 1766/4636] aliases: helpful 'fetchFromGithub' typo message

---
 pkgs/top-level/aliases.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4601dc37443f..7a7139cb3ceb 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -113,6 +113,7 @@ mapAliases ({
   etcdctl = etcd; # added 2018-04-25
   exfat-utils = exfat;                  # 2015-09-11
   facette = throw "facette has been removed."; # added 2020-01-06
+  fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H.";
   ffadoFull = ffado; # added 2018-05-01
   firefox-esr-wrapper = firefox-esr;  # 2016-01
   firefox-wrapper = firefox;          # 2016-01

From 0a545f61fcef1da67be31d30e56fca5e5bb48dc9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Feb 2020 11:14:30 +0000
Subject: [PATCH 1767/4636] buildbot: 2.6.0 -> 2.7.0

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

diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix
index 611cb5ad5ffe..528acf572f2a 100644
--- a/pkgs/development/python-modules/buildbot/default.nix
+++ b/pkgs/development/python-modules/buildbot/default.nix
@@ -25,11 +25,11 @@ let
 
   package = buildPythonPackage rec {
     pname = "buildbot";
-    version = "2.6.0";
+    version = "2.7.0";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "1l3ajhy68jddbgbizaa5hq65lgqkll6389hss4p2j36cbxbn7hiv";
+      sha256 = "0jj8fh611n7xc3vsfbgpqsllp38cfj3spkr2kz3ara2x7jvh3406";
     };
 
     propagatedBuildInputs = [

From 695c1339b8a962871bb646eae4ff5cd79e5d6814 Mon Sep 17 00:00:00 2001
From: Scott Worley <scottworley@scottworley.com>
Date: Sat, 22 Feb 2020 19:29:58 -0800
Subject: [PATCH 1768/4636] libu2f-host: Fix license

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

diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix
index ad0557049e3e..61fefc7d4dbb 100644
--- a/pkgs/development/libraries/libu2f-host/default.nix
+++ b/pkgs/development/libraries/libu2f-host/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://developers.yubico.com/libu2f-host;
     description = "A C library and command-line tool that implements the host-side of the U2F protocol";
-    license = licenses.bsd2;
+    license = with licenses; [ gpl3Plus lgpl21Plus ];
     platforms = platforms.unix;
   };
 }

From c6feb8a98ae731573169fdd4cde4aaf864dc6a61 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Feb 2020 14:59:37 +0000
Subject: [PATCH 1769/4636] gnome3.gnome-characters: 3.32.1 -> 3.34.0

---
 pkgs/desktops/gnome-3/apps/gnome-characters/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index 9e44573d2e38..fa9a7b003c3c 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@@ -20,11 +20,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-characters";
-  version = "3.32.1";
+  version = "3.34.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-characters/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1mpg125x9k879ryg8xgbm9w1amx6b3iq9sqv7xfii7kzaanjb4js";
+    sha256 = "0mqaxsa7hcmvid3zbzvxpfkp7s01ghiq6kaibmd3169axrr8ahql";
   };
 
   nativeBuildInputs = [
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Design/Apps/CharacterMap;
+    homepage = "https://wiki.gnome.org/Design/Apps/CharacterMap";
     description = "Simple utility application to find and insert unusual characters";
     maintainers = gnome3.maintainers;
     license = licenses.gpl2;

From 112cc9c0528396a5ab67820384543827a799cc1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 27 Feb 2020 07:48:28 +0000
Subject: [PATCH 1770/4636] python3.pkgs.pyicloud: 0.9.1 -> 0.9.2

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

diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix
index 50dd1a09890f..1c6fe286db5a 100644
--- a/pkgs/development/python-modules/pyicloud/default.nix
+++ b/pkgs/development/python-modules/pyicloud/default.nix
@@ -10,15 +10,16 @@
 , certifi
 , bitstring
 , unittest2
+, future
 }:
 
 buildPythonPackage rec {
   pname = "pyicloud";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "580b52e95f67a41ed86c56a514aa2b362f53fbaf23f16c69fb24e0d19fd373ee";
+    sha256 = "1jjkzf7vwms6pymnmdr893830vrymxnq455xnqp21wqhjjiy2amd";
   };
 
   propagatedBuildInputs = [
@@ -30,6 +31,7 @@ buildPythonPackage rec {
     tzlocal
     certifi
     bitstring
+    future
   ];
 
   checkInputs = [ unittest2 ];

From ee2ea82a6822ec8a43aded063923dada2bf6bfb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 28 Jan 2020 23:09:52 +0000
Subject: [PATCH 1771/4636] nixos/home-assistant: make config deep mergeable

This make it possible to split the home-assistant configuration
across multiple files and nix will merge the option in an intuitive
way.
---
 nixos/modules/services/misc/home-assistant.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix
index d63f38e93b8e..86033d02bf3f 100644
--- a/nixos/modules/services/misc/home-assistant.nix
+++ b/nixos/modules/services/misc/home-assistant.nix
@@ -96,7 +96,20 @@ in {
 
     config = mkOption {
       default = null;
-      type = with types; nullOr attrs;
+      # Migrate to new option types later: https://github.com/NixOS/nixpkgs/pull/75584
+      type =  with lib.types; let
+          valueType = nullOr (oneOf [
+            bool
+            int
+            float
+            str
+            (lazyAttrsOf valueType)
+            (listOf valueType)
+          ]) // {
+            description = "Yaml value";
+            emptyValue.value = {};
+          };
+        in valueType;
       example = literalExample ''
         {
           homeassistant = {

From 118e9e81535aa7f9cdcb547e72d5602a980240cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 26 Feb 2020 15:51:25 +0000
Subject: [PATCH 1772/4636] home-assistant: 0.104.3 -> 0.106.1

---
 .../home-assistant/component-packages.nix     | 1816 +++++++++--------
 pkgs/servers/home-assistant/default.nix       |    9 +-
 .../relax-importlib-metadata-pyaml.patch      |   22 +
 3 files changed, 939 insertions(+), 908 deletions(-)
 create mode 100644 pkgs/servers/home-assistant/relax-importlib-metadata-pyaml.patch

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 0dfb69b95384..2b2bdabc6265 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,911 +2,917 @@
 # Do not edit!
 
 {
-  version = "0.104.3";
+  version = "0.106.1";
   components = {
-    "abode" = ps: with ps; [  ];
-    "acer_projector" = ps: with ps; [ pyserial ];
-    "actiontec" = ps: with ps; [  ];
-    "adguard" = ps: with ps; [  ];
-    "ads" = ps: with ps; [  ];
-    "aftership" = ps: with ps; [  ];
-    "air_quality" = ps: with ps; [  ];
-    "airly" = ps: with ps; [  ];
-    "airvisual" = ps: with ps; [ pyairvisual ];
-    "aladdin_connect" = ps: with ps; [  ];
-    "alarm_control_panel" = ps: with ps; [  ];
-    "alarmdecoder" = ps: with ps; [  ];
-    "alarmdotcom" = ps: with ps; [  ];
-    "alert" = ps: with ps; [  ];
-    "alexa" = ps: with ps; [ aiohttp-cors ];
-    "almond" = ps: with ps; [ aiohttp-cors ];
-    "alpha_vantage" = ps: with ps; [  ];
-    "amazon_polly" = ps: with ps; [ boto3 ];
-    "ambiclimate" = ps: with ps; [ aiohttp-cors ];
-    "ambient_station" = ps: with ps; [  ];
-    "amcrest" = ps: with ps; [ ha-ffmpeg ];
-    "ampio" = ps: with ps; [  ];
-    "android_ip_webcam" = ps: with ps; [  ];
-    "androidtv" = ps: with ps; [  ];
-    "anel_pwrctrl" = ps: with ps; [  ];
-    "anthemav" = ps: with ps; [  ];
-    "apache_kafka" = ps: with ps; [ aiokafka ];
-    "apcupsd" = ps: with ps; [  ];
-    "api" = ps: with ps; [ aiohttp-cors ];
-    "apns" = ps: with ps; [  ];
-    "apple_tv" = ps: with ps; [ pyatv ];
-    "apprise" = ps: with ps; [ apprise ];
-    "aprs" = ps: with ps; [  ];
-    "aqualogic" = ps: with ps; [  ];
-    "aquostv" = ps: with ps; [  ];
-    "arcam_fmj" = ps: with ps; [  ];
-    "arduino" = ps: with ps; [  ];
-    "arest" = ps: with ps; [  ];
-    "arlo" = ps: with ps; [ ha-ffmpeg ];
-    "aruba" = ps: with ps; [ pexpect ];
-    "arwn" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt ];
-    "asterisk_cdr" = ps: with ps; [  ];
-    "asterisk_mbox" = ps: with ps; [  ];
-    "asuswrt" = ps: with ps; [  ];
-    "aten_pe" = ps: with ps; [  ];
-    "atome" = ps: with ps; [  ];
-    "august" = ps: with ps; [  ];
-    "aurora" = ps: with ps; [  ];
-    "aurora_abb_powerone" = ps: with ps; [  ];
-    "auth" = ps: with ps; [ aiohttp-cors ];
-    "automatic" = ps: with ps; [ aiohttp-cors ];
-    "automation" = ps: with ps; [ aiohttp-cors ];
-    "avea" = ps: with ps; [  ];
-    "avion" = ps: with ps; [  ];
-    "awair" = ps: with ps; [  ];
-    "aws" = ps: with ps; [  ];
-    "axis" = ps: with ps; [  ];
-    "azure_event_hub" = ps: with ps; [  ];
-    "azure_service_bus" = ps: with ps; [ azure-servicebus ];
-    "baidu" = ps: with ps; [  ];
-    "bayesian" = ps: with ps; [  ];
-    "bbb_gpio" = ps: with ps; [  ];
-    "bbox" = ps: with ps; [  ];
-    "beewi_smartclim" = ps: with ps; [  ];
-    "bh1750" = ps: with ps; [  ];
-    "binary_sensor" = ps: with ps; [  ];
-    "bitcoin" = ps: with ps; [  ];
-    "bizkaibus" = ps: with ps; [  ];
-    "blackbird" = ps: with ps; [  ];
-    "blink" = ps: with ps; [  ];
-    "blinksticklight" = ps: with ps; [ BlinkStick ];
-    "blinkt" = ps: with ps; [  ];
-    "blockchain" = ps: with ps; [  ];
-    "bloomsky" = ps: with ps; [  ];
-    "bluesound" = ps: with ps; [ xmltodict ];
-    "bluetooth_le_tracker" = ps: with ps; [  ];
-    "bluetooth_tracker" = ps: with ps; [ bt_proximity ];
-    "bme280" = ps: with ps; [  ];
-    "bme680" = ps: with ps; [  ];
-    "bmw_connected_drive" = ps: with ps; [  ];
-    "bom" = ps: with ps; [  ];
-    "braviatv" = ps: with ps; [  ];
-    "broadlink" = ps: with ps; [ broadlink ];
-    "brother" = ps: with ps; [  ];
-    "brottsplatskartan" = ps: with ps; [  ];
-    "browser" = ps: with ps; [  ];
-    "brunt" = ps: with ps; [  ];
-    "bt_home_hub_5" = ps: with ps; [  ];
-    "bt_smarthub" = ps: with ps; [  ];
-    "buienradar" = ps: with ps; [  ];
-    "caldav" = ps: with ps; [ caldav ];
-    "calendar" = ps: with ps; [ aiohttp-cors ];
-    "camera" = ps: with ps; [ aiohttp-cors ];
-    "canary" = ps: with ps; [ ha-ffmpeg ];
-    "cast" = ps: with ps; [ PyChromecast ];
-    "cert_expiry" = ps: with ps; [  ];
-    "channels" = ps: with ps; [  ];
-    "cisco_ios" = ps: with ps; [ pexpect ];
-    "cisco_mobility_express" = ps: with ps; [  ];
-    "cisco_webex_teams" = ps: with ps; [  ];
-    "ciscospark" = ps: with ps; [  ];
-    "citybikes" = ps: with ps; [  ];
-    "clementine" = ps: with ps; [  ];
-    "clickatell" = ps: with ps; [  ];
-    "clicksend" = ps: with ps; [  ];
-    "clicksend_tts" = ps: with ps; [  ];
-    "climate" = ps: with ps; [  ];
-    "cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa ];
-    "cloudflare" = ps: with ps; [  ];
-    "cmus" = ps: with ps; [  ];
-    "co2signal" = ps: with ps; [  ];
-    "coinbase" = ps: with ps; [  ];
-    "coinmarketcap" = ps: with ps; [ coinmarketcap ];
-    "comed_hourly_pricing" = ps: with ps; [  ];
-    "comfoconnect" = ps: with ps; [  ];
-    "command_line" = ps: with ps; [  ];
-    "concord232" = ps: with ps; [  ];
-    "config" = ps: with ps; [ aiohttp-cors ];
-    "configurator" = ps: with ps; [  ];
-    "conversation" = ps: with ps; [ aiohttp-cors ];
-    "coolmaster" = ps: with ps; [  ];
-    "counter" = ps: with ps; [  ];
-    "cover" = ps: with ps; [  ];
-    "cppm_tracker" = ps: with ps; [  ];
-    "cpuspeed" = ps: with ps; [ py-cpuinfo ];
-    "crimereports" = ps: with ps; [  ];
-    "cups" = ps: with ps; [ pycups ];
-    "currencylayer" = ps: with ps; [  ];
-    "daikin" = ps: with ps; [  ];
-    "danfoss_air" = ps: with ps; [  ];
-    "darksky" = ps: with ps; [ python-forecastio ];
-    "datadog" = ps: with ps; [ datadog ];
-    "ddwrt" = ps: with ps; [  ];
-    "deconz" = ps: with ps; [  ];
-    "decora" = ps: with ps; [  ];
-    "decora_wifi" = ps: with ps; [  ];
-    "default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro hass-nabucasa netdisco sqlalchemy zeroconf ];
-    "delijn" = ps: with ps; [  ];
-    "deluge" = ps: with ps; [ deluge-client ];
-    "demo" = ps: with ps; [ aiohttp-cors ];
-    "denon" = ps: with ps; [  ];
-    "denonavr" = ps: with ps; [  ];
-    "deutsche_bahn" = ps: with ps; [  ];
-    "device_automation" = ps: with ps; [ aiohttp-cors ];
-    "device_sun_light_trigger" = ps: with ps; [  ];
-    "device_tracker" = ps: with ps; [  ];
-    "dht" = ps: with ps; [  ];
-    "dialogflow" = ps: with ps; [ aiohttp-cors ];
-    "digital_ocean" = ps: with ps; [ digital-ocean ];
-    "digitalloggers" = ps: with ps; [  ];
-    "directv" = ps: with ps; [  ];
-    "discogs" = ps: with ps; [ discogs_client ];
-    "discord" = ps: with ps; [ discordpy ];
-    "discovery" = ps: with ps; [ netdisco ];
-    "dlib_face_detect" = ps: with ps; [ face_recognition ];
-    "dlib_face_identify" = ps: with ps; [ face_recognition ];
-    "dlink" = ps: with ps; [  ];
-    "dlna_dmr" = ps: with ps; [  ];
-    "dnsip" = ps: with ps; [ aiodns ];
-    "dominos" = ps: with ps; [ aiohttp-cors ];
-    "doods" = ps: with ps; [ pillow ];
-    "doorbird" = ps: with ps; [ aiohttp-cors ];
-    "dovado" = ps: with ps; [  ];
-    "downloader" = ps: with ps; [  ];
-    "dsmr" = ps: with ps; [  ];
-    "dsmr_reader" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt ];
-    "dte_energy_bridge" = ps: with ps; [  ];
-    "dublin_bus_transport" = ps: with ps; [  ];
-    "duckdns" = ps: with ps; [  ];
-    "duke_energy" = ps: with ps; [  ];
-    "dunehd" = ps: with ps; [  ];
-    "dwd_weather_warnings" = ps: with ps; [  ];
-    "dweet" = ps: with ps; [  ];
-    "dyson" = ps: with ps; [  ];
-    "ebox" = ps: with ps; [  ];
-    "ebusd" = ps: with ps; [  ];
-    "ecoal_boiler" = ps: with ps; [  ];
-    "ecobee" = ps: with ps; [  ];
-    "econet" = ps: with ps; [  ];
-    "ecovacs" = ps: with ps; [  ];
-    "eddystone_temperature" = ps: with ps; [ construct ];
-    "edimax" = ps: with ps; [  ];
-    "ee_brightbox" = ps: with ps; [  ];
-    "efergy" = ps: with ps; [  ];
-    "egardia" = ps: with ps; [  ];
-    "eight_sleep" = ps: with ps; [  ];
-    "elgato" = ps: with ps; [  ];
-    "eliqonline" = ps: with ps; [  ];
-    "elkm1" = ps: with ps; [  ];
-    "elv" = ps: with ps; [  ];
-    "emby" = ps: with ps; [  ];
-    "emoncms" = ps: with ps; [  ];
-    "emoncms_history" = ps: with ps; [  ];
-    "emulated_hue" = ps: with ps; [ aiohttp-cors ];
-    "emulated_roku" = ps: with ps; [  ];
-    "enigma2" = ps: with ps; [  ];
-    "enocean" = ps: with ps; [  ];
-    "enphase_envoy" = ps: with ps; [  ];
-    "entur_public_transport" = ps: with ps; [  ];
-    "environment_canada" = ps: with ps; [  ];
-    "envirophat" = ps: with ps; [  ];
-    "envisalink" = ps: with ps; [  ];
-    "ephember" = ps: with ps; [  ];
-    "epson" = ps: with ps; [  ];
-    "epsonworkforce" = ps: with ps; [  ];
-    "eq3btsmart" = ps: with ps; [ construct ];
-    "esphome" = ps: with ps; [ aioesphomeapi ];
-    "essent" = ps: with ps; [  ];
-    "etherscan" = ps: with ps; [  ];
-    "eufy" = ps: with ps; [  ];
-    "everlights" = ps: with ps; [  ];
-    "evohome" = ps: with ps; [  ];
-    "facebook" = ps: with ps; [  ];
-    "facebox" = ps: with ps; [  ];
-    "fail2ban" = ps: with ps; [  ];
-    "familyhub" = ps: with ps; [  ];
-    "fan" = ps: with ps; [  ];
-    "fastdotcom" = ps: with ps; [  ];
-    "feedreader" = ps: with ps; [  ];
-    "ffmpeg" = ps: with ps; [ ha-ffmpeg ];
-    "ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ];
-    "ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ];
-    "fibaro" = ps: with ps; [  ];
-    "fido" = ps: with ps; [  ];
-    "file" = ps: with ps; [  ];
-    "filesize" = ps: with ps; [  ];
-    "filter" = ps: with ps; [ aiohttp-cors sqlalchemy ];
-    "fints" = ps: with ps; [ fints ];
-    "fitbit" = ps: with ps; [ aiohttp-cors fitbit ];
-    "fixer" = ps: with ps; [  ];
-    "fleetgo" = ps: with ps; [  ];
-    "flexit" = ps: with ps; [  ];
-    "flic" = ps: with ps; [  ];
-    "flock" = ps: with ps; [  ];
-    "flume" = ps: with ps; [  ];
-    "flunearyou" = ps: with ps; [  ];
-    "flux" = ps: with ps; [  ];
-    "flux_led" = ps: with ps; [  ];
-    "folder" = ps: with ps; [  ];
-    "folder_watcher" = ps: with ps; [ watchdog ];
-    "foobot" = ps: with ps; [  ];
-    "fortigate" = ps: with ps; [  ];
-    "fortios" = ps: with ps; [  ];
-    "foscam" = ps: with ps; [  ];
-    "foursquare" = ps: with ps; [ aiohttp-cors ];
-    "free_mobile" = ps: with ps; [  ];
-    "freebox" = ps: with ps; [  ];
-    "freedns" = ps: with ps; [  ];
-    "fritz" = ps: with ps; [ fritzconnection ];
-    "fritzbox" = ps: with ps; [  ];
-    "fritzbox_callmonitor" = ps: with ps; [ fritzconnection ];
-    "fritzbox_netmonitor" = ps: with ps; [ fritzconnection ];
-    "fritzdect" = ps: with ps; [  ];
-    "fronius" = ps: with ps; [  ];
-    "frontend" = ps: with ps; [ aiohttp-cors ];
-    "frontier_silicon" = ps: with ps; [  ];
-    "futurenow" = ps: with ps; [  ];
-    "garadget" = ps: with ps; [  ];
-    "gc100" = ps: with ps; [  ];
-    "gearbest" = ps: with ps; [  ];
-    "geizhals" = ps: with ps; [  ];
-    "generic" = ps: with ps; [  ];
-    "generic_thermostat" = ps: with ps; [  ];
-    "geniushub" = ps: with ps; [  ];
-    "geo_json_events" = ps: with ps; [  ];
-    "geo_location" = ps: with ps; [  ];
-    "geo_rss_events" = ps: with ps; [  ];
-    "geofency" = ps: with ps; [ aiohttp-cors ];
-    "geonetnz_quakes" = ps: with ps; [  ];
-    "geonetnz_volcano" = ps: with ps; [  ];
-    "gios" = ps: with ps; [  ];
-    "github" = ps: with ps; [ PyGithub ];
-    "gitlab_ci" = ps: with ps; [ python-gitlab ];
-    "gitter" = ps: with ps; [  ];
-    "glances" = ps: with ps; [  ];
-    "gntp" = ps: with ps; [  ];
-    "goalfeed" = ps: with ps; [  ];
-    "gogogate2" = ps: with ps; [  ];
-    "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ];
-    "google_assistant" = ps: with ps; [ aiohttp-cors ];
-    "google_cloud" = ps: with ps; [ google_cloud_texttospeech ];
-    "google_domains" = ps: with ps; [  ];
-    "google_maps" = ps: with ps; [  ];
-    "google_pubsub" = ps: with ps; [ google_cloud_pubsub ];
-    "google_translate" = ps: with ps; [ gtts-token ];
-    "google_travel_time" = ps: with ps; [  ];
-    "google_wifi" = ps: with ps; [  ];
-    "gpmdp" = ps: with ps; [ websocket_client ];
-    "gpsd" = ps: with ps; [  ];
-    "gpslogger" = ps: with ps; [ aiohttp-cors ];
-    "graphite" = ps: with ps; [  ];
-    "greeneye_monitor" = ps: with ps; [  ];
-    "greenwave" = ps: with ps; [  ];
-    "group" = ps: with ps; [  ];
-    "growatt_server" = ps: with ps; [  ];
-    "gstreamer" = ps: with ps; [  ];
-    "gtfs" = ps: with ps; [  ];
-    "habitica" = ps: with ps; [  ];
-    "hangouts" = ps: with ps; [  ];
-    "harman_kardon_avr" = ps: with ps; [  ];
-    "harmony" = ps: with ps; [  ];
-    "hassio" = ps: with ps; [ aiohttp-cors ];
-    "haveibeenpwned" = ps: with ps; [  ];
-    "hddtemp" = ps: with ps; [  ];
-    "hdmi_cec" = ps: with ps; [  ];
-    "heatmiser" = ps: with ps; [  ];
-    "heos" = ps: with ps; [  ];
-    "here_travel_time" = ps: with ps; [  ];
-    "hikvision" = ps: with ps; [  ];
-    "hikvisioncam" = ps: with ps; [  ];
-    "hisense_aehw4a1" = ps: with ps; [  ];
-    "history" = ps: with ps; [ aiohttp-cors sqlalchemy ];
-    "history_graph" = ps: with ps; [ aiohttp-cors sqlalchemy ];
-    "history_stats" = ps: with ps; [ aiohttp-cors sqlalchemy ];
-    "hitron_coda" = ps: with ps; [  ];
-    "hive" = ps: with ps; [  ];
-    "hlk_sw16" = ps: with ps; [  ];
-    "homeassistant" = ps: with ps; [  ];
-    "homekit" = ps: with ps; [  ];
-    "homekit_controller" = ps: with ps; [  ];
-    "homematic" = ps: with ps; [ pyhomematic ];
-    "homematicip_cloud" = ps: with ps; [  ];
-    "homeworks" = ps: with ps; [  ];
-    "honeywell" = ps: with ps; [  ];
-    "hook" = ps: with ps; [  ];
-    "horizon" = ps: with ps; [  ];
-    "hp_ilo" = ps: with ps; [  ];
-    "html5" = ps: with ps; [ aiohttp-cors pywebpush ];
-    "http" = ps: with ps; [ aiohttp-cors ];
-    "htu21d" = ps: with ps; [  ];
-    "huawei_lte" = ps: with ps; [ stringcase ];
-    "huawei_router" = ps: with ps; [  ];
-    "hue" = ps: with ps; [ aiohue ];
-    "hunterdouglas_powerview" = ps: with ps; [  ];
-    "hydrawise" = ps: with ps; [  ];
-    "hyperion" = ps: with ps; [  ];
-    "ialarm" = ps: with ps; [  ];
-    "iaqualink" = ps: with ps; [  ];
-    "icloud" = ps: with ps; [ pyicloud ];
-    "idteck_prox" = ps: with ps; [  ];
-    "ifttt" = ps: with ps; [ aiohttp-cors pyfttt ];
-    "iglo" = ps: with ps; [  ];
-    "ign_sismologia" = ps: with ps; [  ];
-    "ihc" = ps: with ps; [ defusedxml ];
-    "image_processing" = ps: with ps; [ aiohttp-cors ];
-    "imap" = ps: with ps; [  ];
-    "imap_email_content" = ps: with ps; [  ];
-    "incomfort" = ps: with ps; [  ];
-    "influxdb" = ps: with ps; [ influxdb ];
-    "input_boolean" = ps: with ps; [  ];
-    "input_datetime" = ps: with ps; [  ];
-    "input_number" = ps: with ps; [  ];
-    "input_select" = ps: with ps; [  ];
-    "input_text" = ps: with ps; [  ];
-    "insteon" = ps: with ps; [  ];
-    "integration" = ps: with ps; [  ];
-    "intent" = ps: with ps; [ aiohttp-cors ];
-    "intent_script" = ps: with ps; [  ];
-    "intesishome" = ps: with ps; [  ];
-    "ios" = ps: with ps; [ aiohttp-cors zeroconf ];
-    "iota" = ps: with ps; [  ];
-    "iperf3" = ps: with ps; [  ];
-    "ipma" = ps: with ps; [  ];
-    "iqvia" = ps: with ps; [ numpy ];
-    "irish_rail_transport" = ps: with ps; [  ];
-    "islamic_prayer_times" = ps: with ps; [  ];
-    "iss" = ps: with ps; [  ];
-    "isy994" = ps: with ps; [  ];
-    "itach" = ps: with ps; [  ];
-    "itunes" = ps: with ps; [  ];
-    "izone" = ps: with ps; [  ];
-    "jewish_calendar" = ps: with ps; [  ];
-    "joaoapps_join" = ps: with ps; [  ];
-    "juicenet" = ps: with ps; [  ];
-    "kaiterra" = ps: with ps; [  ];
-    "kankun" = ps: with ps; [  ];
-    "keba" = ps: with ps; [  ];
-    "keenetic_ndms2" = ps: with ps; [  ];
-    "kef" = ps: with ps; [  ];
-    "keyboard" = ps: with ps; [  ];
-    "keyboard_remote" = ps: with ps; [ evdev ];
-    "kira" = ps: with ps; [  ];
-    "kiwi" = ps: with ps; [  ];
-    "knx" = ps: with ps; [  ];
-    "kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ];
-    "konnected" = ps: with ps; [ aiohttp-cors ];
-    "kwb" = ps: with ps; [  ];
-    "lacrosse" = ps: with ps; [  ];
-    "lametric" = ps: with ps; [  ];
-    "lannouncer" = ps: with ps; [  ];
-    "lastfm" = ps: with ps; [ pylast ];
-    "launch_library" = ps: with ps; [  ];
-    "lcn" = ps: with ps; [  ];
-    "lg_netcast" = ps: with ps; [  ];
-    "lg_soundbar" = ps: with ps; [  ];
-    "life360" = ps: with ps; [  ];
-    "lifx" = ps: with ps; [ aiolifx aiolifx-effects ];
-    "lifx_cloud" = ps: with ps; [  ];
-    "lifx_legacy" = ps: with ps; [  ];
-    "light" = ps: with ps; [  ];
-    "lightwave" = ps: with ps; [  ];
-    "limitlessled" = ps: with ps; [ limitlessled ];
-    "linksys_smart" = ps: with ps; [  ];
-    "linky" = ps: with ps; [  ];
-    "linode" = ps: with ps; [ linode-api ];
-    "linux_battery" = ps: with ps; [ batinfo ];
-    "lirc" = ps: with ps; [  ];
-    "litejet" = ps: with ps; [  ];
-    "liveboxplaytv" = ps: with ps; [  ];
-    "llamalab_automate" = ps: with ps; [  ];
-    "local_file" = ps: with ps; [  ];
-    "local_ip" = ps: with ps; [  ];
-    "locative" = ps: with ps; [ aiohttp-cors ];
-    "lock" = ps: with ps; [  ];
-    "lockitron" = ps: with ps; [  ];
-    "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy ];
-    "logentries" = ps: with ps; [  ];
-    "logger" = ps: with ps; [  ];
-    "logi_circle" = ps: with ps; [ aiohttp-cors ha-ffmpeg ];
-    "london_air" = ps: with ps; [  ];
-    "london_underground" = ps: with ps; [  ];
-    "loopenergy" = ps: with ps; [  ];
-    "lovelace" = ps: with ps; [  ];
-    "luci" = ps: with ps; [  ];
-    "luftdaten" = ps: with ps; [ luftdaten ];
-    "lupusec" = ps: with ps; [  ];
-    "lutron" = ps: with ps; [  ];
-    "lutron_caseta" = ps: with ps; [  ];
-    "lw12wifi" = ps: with ps; [  ];
-    "lyft" = ps: with ps; [  ];
-    "magicseaweed" = ps: with ps; [  ];
-    "mailbox" = ps: with ps; [ aiohttp-cors ];
-    "mailgun" = ps: with ps; [ aiohttp-cors ];
-    "manual" = ps: with ps; [  ];
-    "manual_mqtt" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt ];
-    "map" = ps: with ps; [ aiohttp-cors ];
-    "marytts" = ps: with ps; [  ];
-    "mastodon" = ps: with ps; [  ];
-    "matrix" = ps: with ps; [ matrix-client ];
-    "maxcube" = ps: with ps; [  ];
-    "mcp23017" = ps: with ps; [  ];
-    "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light ];
-    "media_player" = ps: with ps; [ aiohttp-cors ];
-    "mediaroom" = ps: with ps; [  ];
-    "melissa" = ps: with ps; [  ];
-    "meraki" = ps: with ps; [ aiohttp-cors ];
-    "message_bird" = ps: with ps; [  ];
-    "met" = ps: with ps; [  ];
-    "meteo_france" = ps: with ps; [  ];
-    "meteoalarm" = ps: with ps; [  ];
-    "metoffice" = ps: with ps; [  ];
-    "mfi" = ps: with ps; [  ];
-    "mhz19" = ps: with ps; [  ];
-    "microsoft" = ps: with ps; [  ];
-    "microsoft_face" = ps: with ps; [ aiohttp-cors ];
-    "microsoft_face_detect" = ps: with ps; [ aiohttp-cors ];
-    "microsoft_face_identify" = ps: with ps; [ aiohttp-cors ];
-    "miflora" = ps: with ps; [  ];
-    "mikrotik" = ps: with ps; [  ];
-    "mill" = ps: with ps; [  ];
-    "min_max" = ps: with ps; [  ];
-    "minio" = ps: with ps; [ minio ];
-    "mitemp_bt" = ps: with ps; [  ];
-    "mjpeg" = ps: with ps; [  ];
-    "mobile_app" = ps: with ps; [ pynacl aiohttp-cors ];
-    "mochad" = ps: with ps; [  ];
-    "modbus" = ps: with ps; [  ];
-    "modem_callerid" = ps: with ps; [  ];
-    "mold_indicator" = ps: with ps; [  ];
-    "monoprice" = ps: with ps; [  ];
-    "moon" = ps: with ps; [  ];
-    "mopar" = ps: with ps; [  ];
-    "mpchc" = ps: with ps; [  ];
-    "mpd" = ps: with ps; [ mpd2 ];
-    "mqtt" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt ];
-    "mqtt_eventstream" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt ];
-    "mqtt_json" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt ];
-    "mqtt_room" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt ];
-    "mqtt_statestream" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt ];
-    "msteams" = ps: with ps; [  ];
-    "mvglive" = ps: with ps; [ PyMVGLive ];
-    "mychevy" = ps: with ps; [  ];
-    "mycroft" = ps: with ps; [  ];
-    "myq" = ps: with ps; [  ];
-    "mysensors" = ps: with ps; [  ];
-    "mystrom" = ps: with ps; [ aiohttp-cors ];
-    "mythicbeastsdns" = ps: with ps; [  ];
-    "n26" = ps: with ps; [  ];
-    "nad" = ps: with ps; [  ];
-    "namecheapdns" = ps: with ps; [ defusedxml ];
-    "nanoleaf" = ps: with ps; [  ];
-    "neato" = ps: with ps; [ pybotvac ];
-    "nederlandse_spoorwegen" = ps: with ps; [  ];
-    "nello" = ps: with ps; [  ];
-    "ness_alarm" = ps: with ps; [  ];
-    "nest" = ps: with ps; [  ];
-    "netatmo" = ps: with ps; [ aiohttp-cors pyatmo ];
-    "netdata" = ps: with ps; [  ];
-    "netgear" = ps: with ps; [  ];
-    "netgear_lte" = ps: with ps; [  ];
-    "netio" = ps: with ps; [ aiohttp-cors ];
-    "neurio_energy" = ps: with ps; [  ];
-    "nextbus" = ps: with ps; [  ];
-    "nfandroidtv" = ps: with ps; [  ];
-    "niko_home_control" = ps: with ps; [  ];
-    "nilu" = ps: with ps; [  ];
-    "nissan_leaf" = ps: with ps; [  ];
-    "nmap_tracker" = ps: with ps; [  ];
-    "nmbs" = ps: with ps; [  ];
-    "no_ip" = ps: with ps; [  ];
-    "noaa_tides" = ps: with ps; [  ];
-    "norway_air" = ps: with ps; [  ];
-    "notify" = ps: with ps; [  ];
-    "notion" = ps: with ps; [  ];
-    "nsw_fuel_station" = ps: with ps; [  ];
-    "nsw_rural_fire_service_feed" = ps: with ps; [  ];
-    "nuheat" = ps: with ps; [  ];
-    "nuimo_controller" = ps: with ps; [  ];
-    "nuki" = ps: with ps; [  ];
-    "nut" = ps: with ps; [  ];
-    "nws" = ps: with ps; [  ];
-    "nx584" = ps: with ps; [  ];
-    "nzbget" = ps: with ps; [  ];
-    "oasa_telematics" = ps: with ps; [  ];
-    "obihai" = ps: with ps; [  ];
-    "octoprint" = ps: with ps; [  ];
-    "oem" = ps: with ps; [  ];
-    "ohmconnect" = ps: with ps; [ defusedxml ];
-    "ombi" = ps: with ps; [  ];
-    "onboarding" = ps: with ps; [ aiohttp-cors ];
-    "onewire" = ps: with ps; [  ];
-    "onkyo" = ps: with ps; [ onkyo-eiscp ];
-    "onvif" = ps: with ps; [ ha-ffmpeg ];
-    "openalpr_cloud" = ps: with ps; [  ];
-    "openalpr_local" = ps: with ps; [  ];
-    "opencv" = ps: with ps; [ numpy ];
-    "openevse" = ps: with ps; [  ];
-    "openexchangerates" = ps: with ps; [  ];
-    "opengarage" = ps: with ps; [  ];
-    "openhardwaremonitor" = ps: with ps; [  ];
-    "openhome" = ps: with ps; [  ];
-    "opensensemap" = ps: with ps; [  ];
-    "opensky" = ps: with ps; [  ];
-    "opentherm_gw" = ps: with ps; [  ];
-    "openuv" = ps: with ps; [  ];
-    "openweathermap" = ps: with ps; [ pyowm ];
-    "opple" = ps: with ps; [  ];
-    "orangepi_gpio" = ps: with ps; [  ];
-    "oru" = ps: with ps; [  ];
-    "orvibo" = ps: with ps; [  ];
-    "osramlightify" = ps: with ps; [  ];
-    "otp" = ps: with ps; [ pyotp ];
-    "owlet" = ps: with ps; [  ];
-    "owntracks" = ps: with ps; [ pynacl aiohttp-cors ];
-    "panasonic_bluray" = ps: with ps; [  ];
-    "panasonic_viera" = ps: with ps; [ wakeonlan ];
-    "pandora" = ps: with ps; [ pexpect ];
-    "panel_custom" = ps: with ps; [ aiohttp-cors ];
-    "panel_iframe" = ps: with ps; [ aiohttp-cors ];
-    "pcal9535a" = ps: with ps; [  ];
-    "pencom" = ps: with ps; [  ];
-    "persistent_notification" = ps: with ps; [  ];
-    "person" = ps: with ps; [  ];
-    "philips_js" = ps: with ps; [  ];
-    "pi_hole" = ps: with ps; [  ];
-    "picotts" = ps: with ps; [  ];
-    "piglow" = ps: with ps; [  ];
-    "pilight" = ps: with ps; [  ];
-    "ping" = ps: with ps; [  ];
-    "pioneer" = ps: with ps; [  ];
-    "pjlink" = ps: with ps; [  ];
-    "plaato" = ps: with ps; [ aiohttp-cors ];
-    "plant" = ps: with ps; [  ];
-    "plex" = ps: with ps; [ aiohttp-cors ];
-    "plugwise" = ps: with ps; [  ];
-    "plum_lightpad" = ps: with ps; [  ];
-    "pocketcasts" = ps: with ps; [  ];
-    "point" = ps: with ps; [ aiohttp-cors ];
-    "postnl" = ps: with ps; [  ];
-    "prezzibenzina" = ps: with ps; [  ];
-    "proliphix" = ps: with ps; [  ];
-    "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ];
-    "prowl" = ps: with ps; [  ];
-    "proximity" = ps: with ps; [  ];
-    "proxmoxve" = ps: with ps; [  ];
-    "proxy" = ps: with ps; [ pillow ];
-    "ps4" = ps: with ps; [  ];
-    "ptvsd" = ps: with ps; [  ];
-    "pulseaudio_loopback" = ps: with ps; [  ];
-    "push" = ps: with ps; [ aiohttp-cors ];
-    "pushbullet" = ps: with ps; [ pushbullet ];
-    "pushetta" = ps: with ps; [  ];
-    "pushover" = ps: with ps; [ python-pushover ];
-    "pushsafer" = ps: with ps; [  ];
-    "pvoutput" = ps: with ps; [  ];
-    "pyload" = ps: with ps; [  ];
-    "python_script" = ps: with ps; [ restrictedpython ];
-    "qbittorrent" = ps: with ps; [  ];
-    "qld_bushfire" = ps: with ps; [  ];
-    "qnap" = ps: with ps; [  ];
-    "qrcode" = ps: with ps; [ pillow ];
-    "quantum_gateway" = ps: with ps; [  ];
-    "qwikswitch" = ps: with ps; [  ];
-    "rachio" = ps: with ps; [ aiohttp-cors ];
-    "radarr" = ps: with ps; [  ];
-    "radiotherm" = ps: with ps; [  ];
-    "rainbird" = ps: with ps; [  ];
-    "raincloud" = ps: with ps; [  ];
-    "rainforest_eagle" = ps: with ps; [  ];
-    "rainmachine" = ps: with ps; [  ];
-    "random" = ps: with ps; [  ];
-    "raspihats" = ps: with ps; [  ];
-    "raspyrfm" = ps: with ps; [  ];
-    "recollect_waste" = ps: with ps; [  ];
-    "recorder" = ps: with ps; [ sqlalchemy ];
-    "recswitch" = ps: with ps; [  ];
-    "reddit" = ps: with ps; [ praw ];
-    "rejseplanen" = ps: with ps; [  ];
-    "remember_the_milk" = ps: with ps; [ httplib2 ];
-    "remote" = ps: with ps; [  ];
-    "remote_rpi_gpio" = ps: with ps; [  ];
-    "repetier" = ps: with ps; [  ];
-    "rest" = ps: with ps; [  ];
-    "rest_command" = ps: with ps; [  ];
-    "rflink" = ps: with ps; [  ];
-    "rfxtrx" = ps: with ps; [  ];
-    "ring" = ps: with ps; [ ha-ffmpeg ];
-    "ripple" = ps: with ps; [  ];
-    "rmvtransport" = ps: with ps; [  ];
-    "rocketchat" = ps: with ps; [  ];
-    "roku" = ps: with ps; [  ];
-    "roomba" = ps: with ps; [  ];
-    "route53" = ps: with ps; [ boto3 ];
-    "rova" = ps: with ps; [  ];
-    "rpi_camera" = ps: with ps; [  ];
-    "rpi_gpio" = ps: with ps; [  ];
-    "rpi_gpio_pwm" = ps: with ps; [  ];
-    "rpi_pfio" = ps: with ps; [  ];
-    "rpi_rf" = ps: with ps; [  ];
-    "rss_feed_template" = ps: with ps; [ aiohttp-cors ];
-    "rtorrent" = ps: with ps; [  ];
-    "russound_rio" = ps: with ps; [  ];
-    "russound_rnet" = ps: with ps; [  ];
-    "sabnzbd" = ps: with ps; [  ];
-    "saj" = ps: with ps; [  ];
-    "samsungtv" = ps: with ps; [ wakeonlan ];
-    "satel_integra" = ps: with ps; [  ];
-    "scene" = ps: with ps; [  ];
-    "scrape" = ps: with ps; [ beautifulsoup4 ];
-    "script" = ps: with ps; [  ];
-    "scsgate" = ps: with ps; [  ];
-    "season" = ps: with ps; [ ephem ];
-    "sendgrid" = ps: with ps; [  ];
-    "sense" = ps: with ps; [  ];
-    "sensehat" = ps: with ps; [  ];
-    "sensibo" = ps: with ps; [  ];
-    "sensor" = ps: with ps; [  ];
-    "sentry" = ps: with ps; [ sentry-sdk ];
-    "serial" = ps: with ps; [ pyserial-asyncio ];
-    "serial_pm" = ps: with ps; [  ];
-    "sesame" = ps: with ps; [  ];
-    "seven_segments" = ps: with ps; [ pillow ];
-    "seventeentrack" = ps: with ps; [  ];
-    "shell_command" = ps: with ps; [  ];
-    "shiftr" = ps: with ps; [ paho-mqtt ];
-    "shodan" = ps: with ps; [ shodan ];
-    "shopping_list" = ps: with ps; [ aiohttp-cors ];
-    "sht31" = ps: with ps; [  ];
-    "sigfox" = ps: with ps; [  ];
-    "signal_messenger" = ps: with ps; [  ];
-    "simplepush" = ps: with ps; [  ];
-    "simplisafe" = ps: with ps; [  ];
-    "simulated" = ps: with ps; [  ];
-    "sinch" = ps: with ps; [  ];
-    "sisyphus" = ps: with ps; [  ];
-    "sky_hub" = ps: with ps; [  ];
-    "skybeacon" = ps: with ps; [  ];
-    "skybell" = ps: with ps; [  ];
-    "slack" = ps: with ps; [  ];
-    "sleepiq" = ps: with ps; [  ];
-    "slide" = ps: with ps; [  ];
-    "sma" = ps: with ps; [  ];
-    "smappee" = ps: with ps; [  ];
-    "smarthab" = ps: with ps; [  ];
-    "smartthings" = ps: with ps; [ aiohttp-cors ];
-    "smarty" = ps: with ps; [  ];
-    "smhi" = ps: with ps; [  ];
-    "smtp" = ps: with ps; [  ];
-    "snapcast" = ps: with ps; [ snapcast ];
-    "snips" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt ];
-    "snmp" = ps: with ps; [ pysnmp ];
-    "sochain" = ps: with ps; [  ];
-    "socialblade" = ps: with ps; [  ];
-    "solaredge" = ps: with ps; [ stringcase ];
-    "solaredge_local" = ps: with ps; [  ];
-    "solarlog" = ps: with ps; [  ];
-    "solax" = ps: with ps; [  ];
-    "soma" = ps: with ps; [  ];
-    "somfy" = ps: with ps; [ aiohttp-cors ];
-    "somfy_mylink" = ps: with ps; [  ];
-    "sonarr" = ps: with ps; [  ];
-    "songpal" = ps: with ps; [  ];
-    "sonos" = ps: with ps; [ pysonos ];
-    "sony_projector" = ps: with ps; [  ];
-    "soundtouch" = ps: with ps; [ libsoundtouch ];
-    "spaceapi" = ps: with ps; [ aiohttp-cors ];
-    "spc" = ps: with ps; [  ];
-    "speedtestdotnet" = ps: with ps; [ speedtest-cli ];
-    "spider" = ps: with ps; [  ];
-    "splunk" = ps: with ps; [  ];
-    "spotcrime" = ps: with ps; [  ];
-    "spotify" = ps: with ps; [ aiohttp-cors ];
-    "sql" = ps: with ps; [ sqlalchemy ];
-    "squeezebox" = ps: with ps; [  ];
-    "ssdp" = ps: with ps; [ defusedxml netdisco ];
-    "starline" = ps: with ps; [  ];
-    "starlingbank" = ps: with ps; [  ];
-    "startca" = ps: with ps; [ xmltodict ];
-    "statistics" = ps: with ps; [  ];
-    "statsd" = ps: with ps; [ statsd ];
-    "steam_online" = ps: with ps; [  ];
-    "stiebel_eltron" = ps: with ps; [  ];
-    "stookalert" = ps: with ps; [  ];
-    "stream" = ps: with ps; [ aiohttp-cors av ];
-    "streamlabswater" = ps: with ps; [  ];
-    "stt" = ps: with ps; [ aiohttp-cors ];
-    "suez_water" = ps: with ps; [  ];
-    "sun" = ps: with ps; [  ];
-    "supervisord" = ps: with ps; [  ];
-    "supla" = ps: with ps; [  ];
-    "surepetcare" = ps: with ps; [  ];
-    "swiss_hydrological_data" = ps: with ps; [  ];
-    "swiss_public_transport" = ps: with ps; [  ];
-    "swisscom" = ps: with ps; [  ];
-    "switch" = ps: with ps; [  ];
-    "switchbot" = ps: with ps; [  ];
-    "switcher_kis" = ps: with ps; [  ];
-    "switchmate" = ps: with ps; [  ];
-    "syncthru" = ps: with ps; [  ];
-    "synology" = ps: with ps; [  ];
-    "synology_chat" = ps: with ps; [  ];
-    "synology_srm" = ps: with ps; [  ];
-    "synologydsm" = ps: with ps; [  ];
-    "syslog" = ps: with ps; [  ];
-    "system_health" = ps: with ps; [ aiohttp-cors ];
-    "system_log" = ps: with ps; [ aiohttp-cors ];
-    "systemmonitor" = ps: with ps; [ psutil ];
-    "tado" = ps: with ps; [  ];
-    "tahoma" = ps: with ps; [  ];
-    "tank_utility" = ps: with ps; [  ];
-    "tapsaff" = ps: with ps; [  ];
-    "tautulli" = ps: with ps; [  ];
-    "tcp" = ps: with ps; [  ];
-    "ted5000" = ps: with ps; [ xmltodict ];
-    "teksavvy" = ps: with ps; [  ];
-    "telegram" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ];
-    "telegram_bot" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ];
-    "tellduslive" = ps: with ps; [  ];
-    "tellstick" = ps: with ps; [  ];
-    "telnet" = ps: with ps; [  ];
-    "temper" = ps: with ps; [  ];
-    "template" = ps: with ps; [  ];
-    "tensorflow" = ps: with ps; [ numpy pillow protobuf tensorflow ];
-    "tesla" = ps: with ps; [  ];
-    "tfiac" = ps: with ps; [  ];
-    "thermoworks_smoke" = ps: with ps; [ stringcase ];
-    "thethingsnetwork" = ps: with ps; [  ];
-    "thingspeak" = ps: with ps; [  ];
-    "thinkingcleaner" = ps: with ps; [  ];
-    "thomson" = ps: with ps; [  ];
-    "threshold" = ps: with ps; [  ];
-    "tibber" = ps: with ps; [  ];
-    "tikteck" = ps: with ps; [  ];
-    "tile" = ps: with ps; [  ];
-    "time_date" = ps: with ps; [  ];
-    "timer" = ps: with ps; [  ];
-    "tmb" = ps: with ps; [  ];
-    "tod" = ps: with ps; [  ];
-    "todoist" = ps: with ps; [ todoist ];
-    "tof" = ps: with ps; [  ];
-    "tomato" = ps: with ps; [  ];
-    "toon" = ps: with ps; [  ];
-    "torque" = ps: with ps; [ aiohttp-cors ];
-    "totalconnect" = ps: with ps; [  ];
-    "touchline" = ps: with ps; [  ];
-    "tplink" = ps: with ps; [  ];
-    "tplink_lte" = ps: with ps; [  ];
-    "traccar" = ps: with ps; [ aiohttp-cors stringcase ];
-    "trackr" = ps: with ps; [  ];
-    "tradfri" = ps: with ps; [  ];
-    "trafikverket_train" = ps: with ps; [  ];
-    "trafikverket_weatherstation" = ps: with ps; [  ];
-    "transmission" = ps: with ps; [ transmissionrpc ];
-    "transport_nsw" = ps: with ps; [  ];
-    "travisci" = ps: with ps; [  ];
-    "trend" = ps: with ps; [ numpy ];
-    "tts" = ps: with ps; [ aiohttp-cors mutagen ];
-    "tuya" = ps: with ps; [  ];
-    "twentemilieu" = ps: with ps; [  ];
-    "twilio" = ps: with ps; [ aiohttp-cors twilio ];
-    "twilio_call" = ps: with ps; [ aiohttp-cors twilio ];
-    "twilio_sms" = ps: with ps; [ aiohttp-cors twilio ];
-    "twitch" = ps: with ps; [  ];
-    "twitter" = ps: with ps; [  ];
-    "ubee" = ps: with ps; [  ];
-    "ubus" = ps: with ps; [  ];
-    "ue_smart_radio" = ps: with ps; [  ];
-    "uk_transport" = ps: with ps; [  ];
-    "unifi" = ps: with ps; [ aiounifi ];
-    "unifi_direct" = ps: with ps; [ pexpect ];
-    "unifiled" = ps: with ps; [  ];
-    "universal" = ps: with ps; [  ];
-    "upc_connect" = ps: with ps; [  ];
-    "upcloud" = ps: with ps; [  ];
-    "updater" = ps: with ps; [ distro ];
-    "upnp" = ps: with ps; [  ];
-    "uptime" = ps: with ps; [  ];
-    "uptimerobot" = ps: with ps; [  ];
-    "uscis" = ps: with ps; [  ];
-    "usgs_earthquakes_feed" = ps: with ps; [  ];
-    "utility_meter" = ps: with ps; [  ];
-    "uvc" = ps: with ps; [  ];
-    "vacuum" = ps: with ps; [  ];
-    "vallox" = ps: with ps; [  ];
-    "vasttrafik" = ps: with ps; [  ];
-    "velbus" = ps: with ps; [  ];
-    "velux" = ps: with ps; [  ];
-    "venstar" = ps: with ps; [  ];
-    "vera" = ps: with ps; [  ];
-    "verisure" = ps: with ps; [  ];
-    "versasense" = ps: with ps; [  ];
-    "version" = ps: with ps; [ pyhaversion ];
-    "vesync" = ps: with ps; [  ];
-    "viaggiatreno" = ps: with ps; [  ];
-    "vicare" = ps: with ps; [  ];
-    "vivotek" = ps: with ps; [  ];
-    "vizio" = ps: with ps; [  ];
-    "vlc" = ps: with ps; [ python-vlc ];
-    "vlc_telnet" = ps: with ps; [  ];
-    "voicerss" = ps: with ps; [  ];
-    "volkszaehler" = ps: with ps; [  ];
-    "volumio" = ps: with ps; [  ];
-    "volvooncall" = ps: with ps; [  ];
-    "vultr" = ps: with ps; [ vultr ];
-    "w800rf32" = ps: with ps; [  ];
-    "wake_on_lan" = ps: with ps; [ wakeonlan ];
-    "waqi" = ps: with ps; [  ];
-    "water_heater" = ps: with ps; [  ];
-    "waterfurnace" = ps: with ps; [  ];
-    "watson_iot" = ps: with ps; [  ];
-    "watson_tts" = ps: with ps; [  ];
-    "waze_travel_time" = ps: with ps; [ WazeRouteCalculator ];
-    "weather" = ps: with ps; [  ];
-    "webhook" = ps: with ps; [ aiohttp-cors ];
-    "weblink" = ps: with ps; [  ];
-    "webostv" = ps: with ps; [  ];
-    "websocket_api" = ps: with ps; [ aiohttp-cors ];
-    "wemo" = ps: with ps; [  ];
-    "whois" = ps: with ps; [  ];
-    "wink" = ps: with ps; [ aiohttp-cors ];
-    "wirelesstag" = ps: with ps; [  ];
-    "withings" = ps: with ps; [ aiohttp-cors ];
-    "wled" = ps: with ps; [  ];
-    "workday" = ps: with ps; [ holidays ];
-    "worldclock" = ps: with ps; [  ];
-    "worldtidesinfo" = ps: with ps; [  ];
-    "worxlandroid" = ps: with ps; [  ];
-    "wsdot" = ps: with ps; [  ];
-    "wunderground" = ps: with ps; [  ];
-    "wunderlist" = ps: with ps; [  ];
-    "wwlln" = ps: with ps; [  ];
-    "x10" = ps: with ps; [  ];
-    "xbox_live" = ps: with ps; [  ];
-    "xeoma" = ps: with ps; [  ];
-    "xfinity" = ps: with ps; [  ];
-    "xiaomi" = ps: with ps; [ ha-ffmpeg ];
-    "xiaomi_aqara" = ps: with ps; [  ];
-    "xiaomi_miio" = ps: with ps; [ construct python-miio ];
-    "xiaomi_tv" = ps: with ps; [  ];
-    "xmpp" = ps: with ps; [ slixmpp ];
-    "xs1" = ps: with ps; [  ];
-    "yale_smart_alarm" = ps: with ps; [  ];
-    "yamaha" = ps: with ps; [ rxv ];
-    "yamaha_musiccast" = ps: with ps; [  ];
-    "yandex_transport" = ps: with ps; [  ];
-    "yandextts" = ps: with ps; [  ];
-    "yeelight" = ps: with ps; [  ];
-    "yeelightsunflower" = ps: with ps; [  ];
-    "yessssms" = ps: with ps; [  ];
-    "yi" = ps: with ps; [ aioftp ha-ffmpeg ];
-    "yr" = ps: with ps; [ xmltodict ];
-    "yweather" = ps: with ps; [ yahooweather ];
-    "zabbix" = ps: with ps; [  ];
-    "zamg" = ps: with ps; [  ];
-    "zengge" = ps: with ps; [  ];
-    "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ];
-    "zestimate" = ps: with ps; [ xmltodict ];
-    "zha" = ps: with ps; [ zha-quirks zigpy-deconz zigpy ];
-    "zhong_hong" = ps: with ps; [  ];
-    "zigbee" = ps: with ps; [  ];
-    "ziggo_mediabox_xl" = ps: with ps; [  ];
-    "zone" = ps: with ps; [  ];
-    "zoneminder" = ps: with ps; [ zm-py ];
-    "zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher ];
+    "abode" = ps: with ps; [ ]; # missing inputs: abodepy
+    "acer_projector" = ps: with ps; [ pyserial];
+    "actiontec" = ps: with ps; [ ];
+    "adguard" = ps: with ps; [ ]; # missing inputs: adguardhome
+    "ads" = ps: with ps; [ ]; # missing inputs: pyads
+    "aftership" = ps: with ps; [ ]; # missing inputs: pyaftership
+    "air_quality" = ps: with ps; [ ];
+    "airly" = ps: with ps; [ ]; # missing inputs: airly
+    "airvisual" = ps: with ps; [ pyairvisual];
+    "aladdin_connect" = ps: with ps; [ ]; # missing inputs: aladdin_connect
+    "alarm_control_panel" = ps: with ps; [ ];
+    "alarmdecoder" = ps: with ps; [ ]; # missing inputs: alarmdecoder
+    "alarmdotcom" = ps: with ps; [ ]; # missing inputs: pyalarmdotcom
+    "alert" = ps: with ps; [ ];
+    "alexa" = ps: with ps; [ aiohttp-cors];
+    "almond" = ps: with ps; [ aiohttp-cors]; # missing inputs: pyalmond
+    "alpha_vantage" = ps: with ps; [ ]; # missing inputs: alpha_vantage
+    "amazon_polly" = ps: with ps; [ boto3];
+    "ambiclimate" = ps: with ps; [ aiohttp-cors]; # missing inputs: ambiclimate
+    "ambient_station" = ps: with ps; [ ]; # missing inputs: aioambient
+    "amcrest" = ps: with ps; [ ha-ffmpeg]; # missing inputs: amcrest
+    "ampio" = ps: with ps; [ ]; # missing inputs: asmog
+    "android_ip_webcam" = ps: with ps; [ ]; # missing inputs: pydroid-ipcam
+    "androidtv" = ps: with ps; [ ]; # missing inputs: adb-shell androidtv pure-python-adb
+    "anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant
+    "anthemav" = ps: with ps; [ ]; # missing inputs: anthemav
+    "apache_kafka" = ps: with ps; [ aiokafka];
+    "apcupsd" = ps: with ps; [ ]; # missing inputs: apcaccess
+    "api" = ps: with ps; [ aiohttp-cors];
+    "apns" = ps: with ps; [ ]; # missing inputs: apns2
+    "apple_tv" = ps: with ps; [ pyatv];
+    "apprise" = ps: with ps; [ apprise];
+    "aprs" = ps: with ps; [ ]; # missing inputs: aprslib geopy
+    "aqualogic" = ps: with ps; [ ]; # missing inputs: aqualogic
+    "aquostv" = ps: with ps; [ ]; # missing inputs: sharp_aquos_rc
+    "arcam_fmj" = ps: with ps; [ ]; # missing inputs: arcam-fmj
+    "arduino" = ps: with ps; [ ]; # missing inputs: PyMata
+    "arest" = ps: with ps; [ ];
+    "arlo" = ps: with ps; [ ha-ffmpeg]; # missing inputs: pyarlo
+    "aruba" = ps: with ps; [ pexpect];
+    "arwn" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt];
+    "asterisk_cdr" = ps: with ps; [ ]; # missing inputs: asterisk_mbox
+    "asterisk_mbox" = ps: with ps; [ ]; # missing inputs: asterisk_mbox
+    "asuswrt" = ps: with ps; [ ]; # missing inputs: aioasuswrt
+    "aten_pe" = ps: with ps; [ ]; # missing inputs: atenpdu
+    "atome" = ps: with ps; [ ]; # missing inputs: pyatome
+    "august" = ps: with ps; [ ]; # missing inputs: py-august
+    "aurora" = ps: with ps; [ ];
+    "aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy
+    "auth" = ps: with ps; [ aiohttp-cors];
+    "automatic" = ps: with ps; [ aiohttp-cors]; # missing inputs: aioautomatic
+    "automation" = ps: with ps; [ aiohttp-cors];
+    "avea" = ps: with ps; [ ]; # missing inputs: avea
+    "avion" = ps: with ps; [ ]; # missing inputs: avion
+    "awair" = ps: with ps; [ ]; # missing inputs: python_awair
+    "aws" = ps: with ps; [ ]; # missing inputs: aiobotocore
+    "axis" = ps: with ps; [ ]; # missing inputs: axis
+    "azure_event_hub" = ps: with ps; [ ]; # missing inputs: azure-eventhub
+    "azure_service_bus" = ps: with ps; [ azure-servicebus];
+    "baidu" = ps: with ps; [ ]; # missing inputs: baidu-aip
+    "bayesian" = ps: with ps; [ ];
+    "bbb_gpio" = ps: with ps; [ ]; # missing inputs: Adafruit_BBIO
+    "bbox" = ps: with ps; [ ]; # missing inputs: pybbox
+    "beewi_smartclim" = ps: with ps; [ ]; # missing inputs: beewi_smartclim
+    "bh1750" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi
+    "binary_sensor" = ps: with ps; [ ];
+    "bitcoin" = ps: with ps; [ ]; # missing inputs: blockchain
+    "bizkaibus" = ps: with ps; [ ]; # missing inputs: bizkaibus
+    "blackbird" = ps: with ps; [ ]; # missing inputs: pyblackbird
+    "blink" = ps: with ps; [ ]; # missing inputs: blinkpy
+    "blinksticklight" = ps: with ps; [ BlinkStick];
+    "blinkt" = ps: with ps; [ ]; # missing inputs: blinkt
+    "blockchain" = ps: with ps; [ ]; # missing inputs: python-blockchain-api
+    "bloomsky" = ps: with ps; [ ];
+    "bluesound" = ps: with ps; [ xmltodict];
+    "bluetooth_le_tracker" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL]
+    "bluetooth_tracker" = ps: with ps; [ bt_proximity]; # missing inputs: pybluez
+    "bme280" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi
+    "bme680" = ps: with ps; [ ]; # missing inputs: bme680 smbus-cffi
+    "bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected
+    "bom" = ps: with ps; [ ]; # missing inputs: bomradarloop
+    "braviatv" = ps: with ps; [ getmac]; # missing inputs: bravia-tv
+    "broadlink" = ps: with ps; [ broadlink];
+    "brother" = ps: with ps; [ ]; # missing inputs: brother
+    "brottsplatskartan" = ps: with ps; [ ]; # missing inputs: brottsplatskartan
+    "browser" = ps: with ps; [ ];
+    "brunt" = ps: with ps; [ ]; # missing inputs: brunt
+    "bt_home_hub_5" = ps: with ps; [ ]; # missing inputs: bthomehub5-devicelist
+    "bt_smarthub" = ps: with ps; [ ]; # missing inputs: btsmarthub_devicelist
+    "buienradar" = ps: with ps; [ ]; # missing inputs: buienradar
+    "caldav" = ps: with ps; [ caldav];
+    "calendar" = ps: with ps; [ aiohttp-cors];
+    "camera" = ps: with ps; [ aiohttp-cors];
+    "canary" = ps: with ps; [ ha-ffmpeg]; # missing inputs: py-canary
+    "cast" = ps: with ps; [ PyChromecast];
+    "cert_expiry" = ps: with ps; [ ];
+    "channels" = ps: with ps; [ ]; # missing inputs: pychannels
+    "cisco_ios" = ps: with ps; [ pexpect];
+    "cisco_mobility_express" = ps: with ps; [ ]; # missing inputs: ciscomobilityexpress
+    "cisco_webex_teams" = ps: with ps; [ ]; # missing inputs: webexteamssdk
+    "citybikes" = ps: with ps; [ ];
+    "clementine" = ps: with ps; [ ]; # missing inputs: python-clementine-remote
+    "clickatell" = ps: with ps; [ ];
+    "clicksend" = ps: with ps; [ ];
+    "clicksend_tts" = ps: with ps; [ ];
+    "climate" = ps: with ps; [ ];
+    "cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa];
+    "cloudflare" = ps: with ps; [ ]; # missing inputs: pycfdns
+    "cmus" = ps: with ps; [ ]; # missing inputs: pycmus
+    "co2signal" = ps: with ps; [ ]; # missing inputs: co2signal
+    "coinbase" = ps: with ps; [ ]; # missing inputs: coinbase
+    "coinmarketcap" = ps: with ps; [ coinmarketcap];
+    "comed_hourly_pricing" = ps: with ps; [ ];
+    "comfoconnect" = ps: with ps; [ ]; # missing inputs: pycomfoconnect
+    "command_line" = ps: with ps; [ ];
+    "concord232" = ps: with ps; [ ]; # missing inputs: concord232
+    "config" = ps: with ps; [ aiohttp-cors];
+    "configurator" = ps: with ps; [ ];
+    "conversation" = ps: with ps; [ aiohttp-cors];
+    "coolmaster" = ps: with ps; [ ]; # missing inputs: pycoolmasternet
+    "counter" = ps: with ps; [ ];
+    "cover" = ps: with ps; [ ];
+    "cppm_tracker" = ps: with ps; [ ]; # missing inputs: clearpasspy
+    "cpuspeed" = ps: with ps; [ py-cpuinfo];
+    "crimereports" = ps: with ps; [ ]; # missing inputs: crimereports
+    "cups" = ps: with ps; [ pycups];
+    "currencylayer" = ps: with ps; [ ];
+    "daikin" = ps: with ps; [ ]; # missing inputs: pydaikin
+    "danfoss_air" = ps: with ps; [ ]; # missing inputs: pydanfossair
+    "darksky" = ps: with ps; [ python-forecastio];
+    "datadog" = ps: with ps; [ datadog];
+    "ddwrt" = ps: with ps; [ ];
+    "deconz" = ps: with ps; [ ]; # missing inputs: pydeconz
+    "decora" = ps: with ps; [ ]; # missing inputs: bluepy decora
+    "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi
+    "default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro hass-nabucasa netdisco sqlalchemy zeroconf]; # missing inputs: home-assistant-frontend
+    "delijn" = ps: with ps; [ ]; # missing inputs: pydelijn
+    "deluge" = ps: with ps; [ deluge-client];
+    "demo" = ps: with ps; [ aiohttp-cors];
+    "denon" = ps: with ps; [ ];
+    "denonavr" = ps: with ps; [ denonavr];
+    "derivative" = ps: with ps; [ ];
+    "deutsche_bahn" = ps: with ps; [ ]; # missing inputs: schiene
+    "device_automation" = ps: with ps; [ aiohttp-cors];
+    "device_sun_light_trigger" = ps: with ps; [ ];
+    "device_tracker" = ps: with ps; [ ];
+    "dht" = ps: with ps; [ ]; # missing inputs: Adafruit-DHT
+    "dialogflow" = ps: with ps; [ aiohttp-cors];
+    "digital_ocean" = ps: with ps; [ digital-ocean];
+    "digitalloggers" = ps: with ps; [ ]; # missing inputs: dlipower
+    "directv" = ps: with ps; [ ]; # missing inputs: directpy
+    "discogs" = ps: with ps; [ discogs_client];
+    "discord" = ps: with ps; [ discordpy];
+    "discovery" = ps: with ps; [ netdisco];
+    "dlib_face_detect" = ps: with ps; [ face_recognition];
+    "dlib_face_identify" = ps: with ps; [ face_recognition];
+    "dlink" = ps: with ps; [ ]; # missing inputs: pyW215
+    "dlna_dmr" = ps: with ps; [ ]; # missing inputs: async-upnp-client
+    "dnsip" = ps: with ps; [ aiodns];
+    "dominos" = ps: with ps; [ aiohttp-cors]; # missing inputs: pizzapi
+    "doods" = ps: with ps; [ pillow]; # missing inputs: pydoods
+    "doorbird" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: doorbirdpy home-assistant-frontend
+    "dovado" = ps: with ps; [ ]; # missing inputs: dovado
+    "downloader" = ps: with ps; [ ];
+    "dsmr" = ps: with ps; [ ]; # missing inputs: dsmr_parser
+    "dsmr_reader" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt];
+    "dte_energy_bridge" = ps: with ps; [ ];
+    "dublin_bus_transport" = ps: with ps; [ ];
+    "duckdns" = ps: with ps; [ ];
+    "dunehd" = ps: with ps; [ ]; # missing inputs: pdunehd
+    "dwd_weather_warnings" = ps: with ps; [ ];
+    "dweet" = ps: with ps; [ ]; # missing inputs: dweepy
+    "dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices
+    "dyson" = ps: with ps; [ ]; # missing inputs: libpurecool
+    "ebox" = ps: with ps; [ ]; # missing inputs: pyebox
+    "ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy
+    "ecoal_boiler" = ps: with ps; [ ]; # missing inputs: ecoaliface
+    "ecobee" = ps: with ps; [ ]; # missing inputs: python-ecobee-api
+    "econet" = ps: with ps; [ ]; # missing inputs: pyeconet
+    "ecovacs" = ps: with ps; [ ]; # missing inputs: sucks
+    "eddystone_temperature" = ps: with ps; [ construct]; # missing inputs: beacontools[scan]
+    "edimax" = ps: with ps; [ ]; # missing inputs: pyedimax
+    "ee_brightbox" = ps: with ps; [ ]; # missing inputs: eebrightbox
+    "efergy" = ps: with ps; [ ];
+    "egardia" = ps: with ps; [ ]; # missing inputs: pythonegardia
+    "eight_sleep" = ps: with ps; [ ]; # missing inputs: pyeight
+    "elgato" = ps: with ps; [ ]; # missing inputs: elgato
+    "eliqonline" = ps: with ps; [ ]; # missing inputs: eliqonline
+    "elkm1" = ps: with ps; [ ]; # missing inputs: elkm1-lib
+    "elv" = ps: with ps; [ ]; # missing inputs: pypca
+    "emby" = ps: with ps; [ ]; # missing inputs: pyemby
+    "emoncms" = ps: with ps; [ ];
+    "emoncms_history" = ps: with ps; [ ];
+    "emulated_hue" = ps: with ps; [ aiohttp-cors];
+    "emulated_roku" = ps: with ps; [ ]; # missing inputs: emulated_roku
+    "enigma2" = ps: with ps; [ ]; # missing inputs: openwebifpy
+    "enocean" = ps: with ps; [ ]; # missing inputs: enocean
+    "enphase_envoy" = ps: with ps; [ ]; # missing inputs: envoy_reader
+    "entur_public_transport" = ps: with ps; [ ]; # missing inputs: enturclient
+    "environment_canada" = ps: with ps; [ ]; # missing inputs: env_canada
+    "envirophat" = ps: with ps; [ ]; # missing inputs: envirophat smbus-cffi
+    "envisalink" = ps: with ps; [ ]; # missing inputs: pyenvisalink
+    "ephember" = ps: with ps; [ ]; # missing inputs: pyephember
+    "epson" = ps: with ps; [ ]; # missing inputs: epson-projector
+    "epsonworkforce" = ps: with ps; [ ]; # missing inputs: epsonprinter
+    "eq3btsmart" = ps: with ps; [ construct]; # missing inputs: python-eq3bt
+    "esphome" = ps: with ps; [ aioesphomeapi];
+    "essent" = ps: with ps; [ ]; # missing inputs: PyEssent
+    "etherscan" = ps: with ps; [ ]; # missing inputs: python-etherscan-api
+    "eufy" = ps: with ps; [ ]; # missing inputs: lakeside
+    "everlights" = ps: with ps; [ ]; # missing inputs: pyeverlights
+    "evohome" = ps: with ps; [ ]; # missing inputs: evohome-async
+    "facebook" = ps: with ps; [ ];
+    "facebox" = ps: with ps; [ ];
+    "fail2ban" = ps: with ps; [ ];
+    "familyhub" = ps: with ps; [ ]; # missing inputs: python-family-hub-local
+    "fan" = ps: with ps; [ ];
+    "fastdotcom" = ps: with ps; [ ]; # missing inputs: fastdotcom
+    "feedreader" = ps: with ps; [ ]; # missing inputs: feedparser-homeassistant
+    "ffmpeg" = ps: with ps; [ ha-ffmpeg];
+    "ffmpeg_motion" = ps: with ps; [ ha-ffmpeg];
+    "ffmpeg_noise" = ps: with ps; [ ha-ffmpeg];
+    "fibaro" = ps: with ps; [ ]; # missing inputs: fiblary3
+    "fido" = ps: with ps; [ ]; # missing inputs: pyfido
+    "file" = ps: with ps; [ ];
+    "filesize" = ps: with ps; [ ];
+    "filter" = ps: with ps; [ aiohttp-cors sqlalchemy];
+    "fints" = ps: with ps; [ fints];
+    "fitbit" = ps: with ps; [ aiohttp-cors fitbit];
+    "fixer" = ps: with ps; [ ]; # missing inputs: fixerio
+    "fleetgo" = ps: with ps; [ ]; # missing inputs: ritassist
+    "flexit" = ps: with ps; [ ]; # missing inputs: pyflexit pymodbus
+    "flic" = ps: with ps; [ ]; # missing inputs: pyflic-homeassistant
+    "flock" = ps: with ps; [ ];
+    "flume" = ps: with ps; [ ]; # missing inputs: pyflume
+    "flunearyou" = ps: with ps; [ ]; # missing inputs: pyflunearyou
+    "flux" = ps: with ps; [ ];
+    "flux_led" = ps: with ps; [ flux-led];
+    "folder" = ps: with ps; [ ];
+    "folder_watcher" = ps: with ps; [ watchdog];
+    "foobot" = ps: with ps; [ ]; # missing inputs: foobot_async
+    "fortigate" = ps: with ps; [ ]; # missing inputs: pyfgt
+    "fortios" = ps: with ps; [ ]; # missing inputs: fortiosapi
+    "foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam
+    "foursquare" = ps: with ps; [ aiohttp-cors];
+    "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms
+    "freebox" = ps: with ps; [ ]; # missing inputs: aiofreepybox
+    "freedns" = ps: with ps; [ ];
+    "fritz" = ps: with ps; [ fritzconnection];
+    "fritzbox" = ps: with ps; [ ]; # missing inputs: pyfritzhome
+    "fritzbox_callmonitor" = ps: with ps; [ fritzconnection];
+    "fritzbox_netmonitor" = ps: with ps; [ fritzconnection];
+    "fronius" = ps: with ps; [ ]; # missing inputs: pyfronius
+    "frontend" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend
+    "frontier_silicon" = ps: with ps; [ ]; # missing inputs: afsapi
+    "futurenow" = ps: with ps; [ ]; # missing inputs: pyfnip
+    "garadget" = ps: with ps; [ ];
+    "garmin_connect" = ps: with ps; [ ]; # missing inputs: garminconnect
+    "gc100" = ps: with ps; [ ]; # missing inputs: python-gc100
+    "gdacs" = ps: with ps; [ ]; # missing inputs: aio_georss_gdacs
+    "gearbest" = ps: with ps; [ ]; # missing inputs: gearbest_parser
+    "geizhals" = ps: with ps; [ ]; # missing inputs: geizhals
+    "generic" = ps: with ps; [ ];
+    "generic_thermostat" = ps: with ps; [ ];
+    "geniushub" = ps: with ps; [ ]; # missing inputs: geniushub-client
+    "geo_json_events" = ps: with ps; [ ]; # missing inputs: geojson_client
+    "geo_location" = ps: with ps; [ ];
+    "geo_rss_events" = ps: with ps; [ ]; # missing inputs: georss_generic_client
+    "geofency" = ps: with ps; [ aiohttp-cors];
+    "geonetnz_quakes" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_quakes
+    "geonetnz_volcano" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_volcano
+    "gios" = ps: with ps; [ ]; # missing inputs: gios
+    "github" = ps: with ps; [ PyGithub];
+    "gitlab_ci" = ps: with ps; [ python-gitlab];
+    "gitter" = ps: with ps; [ ]; # missing inputs: gitterpy
+    "glances" = ps: with ps; [ ]; # missing inputs: glances_api
+    "gntp" = ps: with ps; [ ]; # missing inputs: gntp
+    "goalfeed" = ps: with ps; [ ]; # missing inputs: pysher
+    "gogogate2" = ps: with ps; [ ]; # missing inputs: pygogogate2
+    "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client];
+    "google_assistant" = ps: with ps; [ aiohttp-cors];
+    "google_cloud" = ps: with ps; [ google_cloud_texttospeech];
+    "google_domains" = ps: with ps; [ ];
+    "google_maps" = ps: with ps; [ ]; # missing inputs: locationsharinglib
+    "google_pubsub" = ps: with ps; [ google_cloud_pubsub];
+    "google_translate" = ps: with ps; [ gtts-token];
+    "google_travel_time" = ps: with ps; [ ]; # missing inputs: googlemaps
+    "google_wifi" = ps: with ps; [ ];
+    "gpmdp" = ps: with ps; [ websocket_client];
+    "gpsd" = ps: with ps; [ ]; # missing inputs: gps3
+    "gpslogger" = ps: with ps; [ aiohttp-cors];
+    "graphite" = ps: with ps; [ ];
+    "greeneye_monitor" = ps: with ps; [ ]; # missing inputs: greeneye_monitor
+    "greenwave" = ps: with ps; [ ]; # missing inputs: greenwavereality
+    "group" = ps: with ps; [ ];
+    "growatt_server" = ps: with ps; [ ]; # missing inputs: growattServer
+    "gstreamer" = ps: with ps; [ ]; # missing inputs: gstreamer-player
+    "gtfs" = ps: with ps; [ ]; # missing inputs: pygtfs
+    "habitica" = ps: with ps; [ ]; # missing inputs: habitipy
+    "hangouts" = ps: with ps; [ ]; # missing inputs: hangups
+    "harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr
+    "harmony" = ps: with ps; [ ]; # missing inputs: aioharmony
+    "hassio" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend
+    "haveibeenpwned" = ps: with ps; [ ];
+    "hddtemp" = ps: with ps; [ ];
+    "hdmi_cec" = ps: with ps; [ ]; # missing inputs: pyCEC
+    "heatmiser" = ps: with ps; [ ]; # missing inputs: heatmiserV3
+    "heos" = ps: with ps; [ ]; # missing inputs: pyheos
+    "here_travel_time" = ps: with ps; [ ]; # missing inputs: herepy
+    "hikvision" = ps: with ps; [ ]; # missing inputs: pyhik
+    "hikvisioncam" = ps: with ps; [ ]; # missing inputs: hikvision
+    "hisense_aehw4a1" = ps: with ps; [ ]; # missing inputs: pyaehw4a1
+    "history" = ps: with ps; [ aiohttp-cors sqlalchemy];
+    "history_graph" = ps: with ps; [ aiohttp-cors sqlalchemy];
+    "history_stats" = ps: with ps; [ aiohttp-cors sqlalchemy];
+    "hitron_coda" = ps: with ps; [ ];
+    "hive" = ps: with ps; [ ]; # missing inputs: pyhiveapi
+    "hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16
+    "homeassistant" = ps: with ps; [ ];
+    "homekit" = ps: with ps; [ ]; # missing inputs: HAP-python
+    "homekit_controller" = ps: with ps; [ ]; # missing inputs: homekit[IP]
+    "homematic" = ps: with ps; [ pyhomematic];
+    "homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip
+    "homeworks" = ps: with ps; [ ]; # missing inputs: pyhomeworks
+    "honeywell" = ps: with ps; [ ]; # missing inputs: somecomfort
+    "horizon" = ps: with ps; [ ]; # missing inputs: horimote
+    "hp_ilo" = ps: with ps; [ ]; # missing inputs: python-hpilo
+    "html5" = ps: with ps; [ aiohttp-cors pywebpush];
+    "http" = ps: with ps; [ aiohttp-cors];
+    "htu21d" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi
+    "huawei_lte" = ps: with ps; [ getmac stringcase]; # missing inputs: huawei-lte-api url-normalize
+    "huawei_router" = ps: with ps; [ ];
+    "hue" = ps: with ps; [ aiohue];
+    "hunterdouglas_powerview" = ps: with ps; [ ]; # missing inputs: aiopvapi
+    "hydrawise" = ps: with ps; [ ]; # missing inputs: hydrawiser
+    "hyperion" = ps: with ps; [ ];
+    "ialarm" = ps: with ps; [ ]; # missing inputs: pyialarm
+    "iaqualink" = ps: with ps; [ ]; # missing inputs: iaqualink
+    "icloud" = ps: with ps; [ pyicloud];
+    "idteck_prox" = ps: with ps; [ ]; # missing inputs: rfk101py
+    "ifttt" = ps: with ps; [ aiohttp-cors pyfttt];
+    "iglo" = ps: with ps; [ ]; # missing inputs: iglo
+    "ign_sismologia" = ps: with ps; [ ]; # missing inputs: georss_ign_sismologia_client
+    "ihc" = ps: with ps; [ defusedxml]; # missing inputs: ihcsdk
+    "image_processing" = ps: with ps; [ aiohttp-cors];
+    "imap" = ps: with ps; [ ]; # missing inputs: aioimaplib
+    "imap_email_content" = ps: with ps; [ ];
+    "incomfort" = ps: with ps; [ ]; # missing inputs: incomfort-client
+    "influxdb" = ps: with ps; [ influxdb];
+    "input_boolean" = ps: with ps; [ ];
+    "input_datetime" = ps: with ps; [ ];
+    "input_number" = ps: with ps; [ ];
+    "input_select" = ps: with ps; [ ];
+    "input_text" = ps: with ps; [ ];
+    "insteon" = ps: with ps; [ ]; # missing inputs: insteonplm
+    "integration" = ps: with ps; [ ];
+    "intent" = ps: with ps; [ aiohttp-cors];
+    "intent_script" = ps: with ps; [ ];
+    "intesishome" = ps: with ps; [ ]; # missing inputs: pyintesishome
+    "ios" = ps: with ps; [ aiohttp-cors zeroconf];
+    "iota" = ps: with ps; [ ]; # missing inputs: pyota
+    "iperf3" = ps: with ps; [ ]; # missing inputs: iperf3
+    "ipma" = ps: with ps; [ ]; # missing inputs: pyipma
+    "iqvia" = ps: with ps; [ numpy]; # missing inputs: pyiqvia
+    "irish_rail_transport" = ps: with ps; [ ]; # missing inputs: pyirishrail
+    "islamic_prayer_times" = ps: with ps; [ ]; # missing inputs: prayer_times_calculator
+    "iss" = ps: with ps; [ ]; # missing inputs: pyiss
+    "isy994" = ps: with ps; [ ]; # missing inputs: PyISY
+    "itach" = ps: with ps; [ ]; # missing inputs: pyitachip2ir
+    "itunes" = ps: with ps; [ ];
+    "izone" = ps: with ps; [ ]; # missing inputs: python-izone
+    "jewish_calendar" = ps: with ps; [ ]; # missing inputs: hdate
+    "joaoapps_join" = ps: with ps; [ ]; # missing inputs: python-join-api
+    "juicenet" = ps: with ps; [ ]; # missing inputs: python-juicenet
+    "kaiterra" = ps: with ps; [ ]; # missing inputs: kaiterra-async-client
+    "kankun" = ps: with ps; [ ];
+    "keba" = ps: with ps; [ ]; # missing inputs: keba-kecontact
+    "keenetic_ndms2" = ps: with ps; [ ]; # missing inputs: ndms2_client
+    "kef" = ps: with ps; [ getmac]; # missing inputs: aiokef
+    "keyboard" = ps: with ps; [ ]; # missing inputs: pyuserinput
+    "keyboard_remote" = ps: with ps; [ evdev]; # missing inputs: aionotify
+    "kira" = ps: with ps; [ ]; # missing inputs: pykira
+    "kiwi" = ps: with ps; [ ]; # missing inputs: kiwiki-client
+    "knx" = ps: with ps; [ ]; # missing inputs: xknx
+    "kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket];
+    "konnected" = ps: with ps; [ aiohttp-cors]; # missing inputs: konnected
+    "kwb" = ps: with ps; [ ]; # missing inputs: pykwb
+    "lacrosse" = ps: with ps; [ ]; # missing inputs: pylacrosse
+    "lametric" = ps: with ps; [ ]; # missing inputs: lmnotify
+    "lannouncer" = ps: with ps; [ ];
+    "lastfm" = ps: with ps; [ pylast];
+    "launch_library" = ps: with ps; [ ]; # missing inputs: pylaunches
+    "lcn" = ps: with ps; [ ]; # missing inputs: pypck
+    "lg_netcast" = ps: with ps; [ ]; # missing inputs: pylgnetcast-homeassistant
+    "lg_soundbar" = ps: with ps; [ ]; # missing inputs: temescal
+    "life360" = ps: with ps; [ ]; # missing inputs: life360
+    "lifx" = ps: with ps; [ aiolifx aiolifx-effects];
+    "lifx_cloud" = ps: with ps; [ ];
+    "lifx_legacy" = ps: with ps; [ ]; # missing inputs: liffylights
+    "light" = ps: with ps; [ ];
+    "lightwave" = ps: with ps; [ ]; # missing inputs: lightwave
+    "limitlessled" = ps: with ps; [ limitlessled];
+    "linksys_smart" = ps: with ps; [ ];
+    "linky" = ps: with ps; [ ]; # missing inputs: pylinky
+    "linode" = ps: with ps; [ linode-api];
+    "linux_battery" = ps: with ps; [ batinfo];
+    "lirc" = ps: with ps; [ ]; # missing inputs: python-lirc
+    "litejet" = ps: with ps; [ ]; # missing inputs: pylitejet
+    "llamalab_automate" = ps: with ps; [ ];
+    "local_file" = ps: with ps; [ ];
+    "local_ip" = ps: with ps; [ ];
+    "locative" = ps: with ps; [ aiohttp-cors];
+    "lock" = ps: with ps; [ ];
+    "lockitron" = ps: with ps; [ ];
+    "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend
+    "logentries" = ps: with ps; [ ];
+    "logger" = ps: with ps; [ ];
+    "logi_circle" = ps: with ps; [ aiohttp-cors ha-ffmpeg]; # missing inputs: logi_circle
+    "london_air" = ps: with ps; [ ];
+    "london_underground" = ps: with ps; [ ]; # missing inputs: london-tube-status
+    "loopenergy" = ps: with ps; [ ]; # missing inputs: pyloopenergy
+    "lovelace" = ps: with ps; [ ];
+    "luci" = ps: with ps; [ ]; # missing inputs: openwrt-luci-rpc
+    "luftdaten" = ps: with ps; [ luftdaten];
+    "lupusec" = ps: with ps; [ ]; # missing inputs: lupupy
+    "lutron" = ps: with ps; [ ]; # missing inputs: pylutron
+    "lutron_caseta" = ps: with ps; [ ]; # missing inputs: pylutron-caseta
+    "lw12wifi" = ps: with ps; [ ]; # missing inputs: lw12
+    "lyft" = ps: with ps; [ ]; # missing inputs: lyft_rides
+    "magicseaweed" = ps: with ps; [ ]; # missing inputs: magicseaweed
+    "mailbox" = ps: with ps; [ aiohttp-cors];
+    "mailgun" = ps: with ps; [ aiohttp-cors]; # missing inputs: pymailgunner
+    "manual" = ps: with ps; [ ];
+    "manual_mqtt" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt];
+    "map" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend
+    "marytts" = ps: with ps; [ ]; # missing inputs: speak2mary
+    "mastodon" = ps: with ps; [ ]; # missing inputs: Mastodon.py
+    "matrix" = ps: with ps; [ matrix-client];
+    "maxcube" = ps: with ps; [ ]; # missing inputs: maxcube-api
+    "mcp23017" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-blinka adafruit-circuitpython-mcp230xx
+    "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light];
+    "media_player" = ps: with ps; [ aiohttp-cors];
+    "mediaroom" = ps: with ps; [ ]; # missing inputs: pymediaroom
+    "melcloud" = ps: with ps; [ ]; # missing inputs: pymelcloud
+    "melissa" = ps: with ps; [ ]; # missing inputs: py-melissa-climate
+    "meraki" = ps: with ps; [ aiohttp-cors];
+    "message_bird" = ps: with ps; [ ]; # missing inputs: messagebird
+    "met" = ps: with ps; [ ]; # missing inputs: pyMetno
+    "meteo_france" = ps: with ps; [ ]; # missing inputs: meteofrance vigilancemeteo
+    "meteoalarm" = ps: with ps; [ ]; # missing inputs: meteoalertapi
+    "metoffice" = ps: with ps; [ ]; # missing inputs: datapoint
+    "mfi" = ps: with ps; [ ]; # missing inputs: mficlient
+    "mhz19" = ps: with ps; [ ]; # missing inputs: pmsensor
+    "microsoft" = ps: with ps; [ ]; # missing inputs: pycsspeechtts
+    "microsoft_face" = ps: with ps; [ aiohttp-cors];
+    "microsoft_face_detect" = ps: with ps; [ aiohttp-cors];
+    "microsoft_face_identify" = ps: with ps; [ aiohttp-cors];
+    "miflora" = ps: with ps; [ ]; # missing inputs: bluepy miflora
+    "mikrotik" = ps: with ps; [ ]; # missing inputs: librouteros
+    "mill" = ps: with ps; [ ]; # missing inputs: millheater
+    "min_max" = ps: with ps; [ ];
+    "minecraft_server" = ps: with ps; [ getmac]; # missing inputs: mcstatus
+    "minio" = ps: with ps; [ minio];
+    "mitemp_bt" = ps: with ps; [ ]; # missing inputs: mitemp_bt
+    "mjpeg" = ps: with ps; [ ];
+    "mobile_app" = ps: with ps; [ pynacl aiohttp-cors];
+    "mochad" = ps: with ps; [ ]; # missing inputs: pymochad
+    "modbus" = ps: with ps; [ ]; # missing inputs: pymodbus
+    "modem_callerid" = ps: with ps; [ ]; # missing inputs: basicmodem
+    "mold_indicator" = ps: with ps; [ ];
+    "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice
+    "moon" = ps: with ps; [ ];
+    "mopar" = ps: with ps; [ ]; # missing inputs: motorparts
+    "mpchc" = ps: with ps; [ ];
+    "mpd" = ps: with ps; [ mpd2];
+    "mqtt" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt];
+    "mqtt_eventstream" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt];
+    "mqtt_json" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt];
+    "mqtt_room" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt];
+    "mqtt_statestream" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt];
+    "msteams" = ps: with ps; [ ]; # missing inputs: pymsteams
+    "mvglive" = ps: with ps; [ PyMVGLive];
+    "mychevy" = ps: with ps; [ ]; # missing inputs: mychevy
+    "mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi
+    "myq" = ps: with ps; [ ]; # missing inputs: pymyq
+    "mysensors" = ps: with ps; [ ]; # missing inputs: pymysensors
+    "mystrom" = ps: with ps; [ aiohttp-cors]; # missing inputs: python-mystrom
+    "mythicbeastsdns" = ps: with ps; [ ]; # missing inputs: mbddns
+    "n26" = ps: with ps; [ ]; # missing inputs: n26
+    "nad" = ps: with ps; [ ]; # missing inputs: nad_receiver
+    "namecheapdns" = ps: with ps; [ defusedxml];
+    "nanoleaf" = ps: with ps; [ ]; # missing inputs: pynanoleaf
+    "neato" = ps: with ps; [ pybotvac];
+    "nederlandse_spoorwegen" = ps: with ps; [ ]; # missing inputs: nsapi
+    "nello" = ps: with ps; [ ]; # missing inputs: pynello
+    "ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient
+    "nest" = ps: with ps; [ ]; # missing inputs: python-nest
+    "netatmo" = ps: with ps; [ aiohttp-cors pyatmo];
+    "netdata" = ps: with ps; [ ]; # missing inputs: netdata
+    "netgear" = ps: with ps; [ ]; # missing inputs: pynetgear
+    "netgear_lte" = ps: with ps; [ ]; # missing inputs: eternalegypt
+    "netio" = ps: with ps; [ aiohttp-cors]; # missing inputs: pynetio
+    "neurio_energy" = ps: with ps; [ ]; # missing inputs: neurio
+    "nextbus" = ps: with ps; [ ]; # missing inputs: py_nextbusnext
+    "nfandroidtv" = ps: with ps; [ ];
+    "niko_home_control" = ps: with ps; [ ]; # missing inputs: niko-home-control
+    "nilu" = ps: with ps; [ ]; # missing inputs: niluclient
+    "nissan_leaf" = ps: with ps; [ ]; # missing inputs: pycarwings2
+    "nmap_tracker" = ps: with ps; [ getmac]; # missing inputs: python-nmap
+    "nmbs" = ps: with ps; [ ]; # missing inputs: pyrail
+    "no_ip" = ps: with ps; [ ];
+    "noaa_tides" = ps: with ps; [ ]; # missing inputs: py_noaa
+    "norway_air" = ps: with ps; [ ]; # missing inputs: pyMetno
+    "notify" = ps: with ps; [ ];
+    "notion" = ps: with ps; [ ]; # missing inputs: aionotion
+    "nsw_fuel_station" = ps: with ps; [ ]; # missing inputs: nsw-fuel-api-client
+    "nsw_rural_fire_service_feed" = ps: with ps; [ ]; # missing inputs: aio_geojson_nsw_rfs_incidents
+    "nuheat" = ps: with ps; [ ]; # missing inputs: nuheat
+    "nuimo_controller" = ps: with ps; [ ]; # missing inputs: --only-binary=all nuimo
+    "nuki" = ps: with ps; [ ]; # missing inputs: pynuki
+    "nut" = ps: with ps; [ ]; # missing inputs: pynut2
+    "nws" = ps: with ps; [ ]; # missing inputs: pynws
+    "nx584" = ps: with ps; [ ]; # missing inputs: pynx584
+    "nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi
+    "oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics
+    "obihai" = ps: with ps; [ ]; # missing inputs: pyobihai
+    "octoprint" = ps: with ps; [ ];
+    "oem" = ps: with ps; [ ]; # missing inputs: oemthermostat
+    "ohmconnect" = ps: with ps; [ defusedxml];
+    "ombi" = ps: with ps; [ ]; # missing inputs: pyombi
+    "onboarding" = ps: with ps; [ aiohttp-cors];
+    "onewire" = ps: with ps; [ ]; # missing inputs: pyownet
+    "onkyo" = ps: with ps; [ onkyo-eiscp];
+    "onvif" = ps: with ps; [ ha-ffmpeg]; # missing inputs: onvif-zeep-async
+    "openalpr_cloud" = ps: with ps; [ ];
+    "openalpr_local" = ps: with ps; [ ];
+    "opencv" = ps: with ps; [ numpy]; # missing inputs: opencv-python-headless
+    "openevse" = ps: with ps; [ ]; # missing inputs: openevsewifi
+    "openexchangerates" = ps: with ps; [ ];
+    "opengarage" = ps: with ps; [ ];
+    "openhardwaremonitor" = ps: with ps; [ ];
+    "openhome" = ps: with ps; [ ]; # missing inputs: openhomedevice
+    "opensensemap" = ps: with ps; [ ]; # missing inputs: opensensemap-api
+    "opensky" = ps: with ps; [ ];
+    "opentherm_gw" = ps: with ps; [ ]; # missing inputs: pyotgw
+    "openuv" = ps: with ps; [ ]; # missing inputs: pyopenuv
+    "openweathermap" = ps: with ps; [ pyowm];
+    "opnsense" = ps: with ps; [ ]; # missing inputs: pyopnsense
+    "opple" = ps: with ps; [ ]; # missing inputs: pyoppleio
+    "orangepi_gpio" = ps: with ps; [ ]; # missing inputs: OPi.GPIO
+    "oru" = ps: with ps; [ ]; # missing inputs: oru
+    "orvibo" = ps: with ps; [ ]; # missing inputs: orvibo
+    "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify
+    "otp" = ps: with ps; [ pyotp];
+    "owntracks" = ps: with ps; [ pynacl aiohttp-cors];
+    "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta
+    "panasonic_viera" = ps: with ps; [ wakeonlan]; # missing inputs: panasonic_viera
+    "pandora" = ps: with ps; [ pexpect];
+    "panel_custom" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend
+    "panel_iframe" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend
+    "pcal9535a" = ps: with ps; [ ]; # missing inputs: pcal9535a
+    "pencom" = ps: with ps; [ ]; # missing inputs: pencompy
+    "persistent_notification" = ps: with ps; [ ];
+    "person" = ps: with ps; [ ];
+    "philips_js" = ps: with ps; [ ]; # missing inputs: ha-philipsjs
+    "pi_hole" = ps: with ps; [ ]; # missing inputs: hole
+    "picotts" = ps: with ps; [ ];
+    "piglow" = ps: with ps; [ ]; # missing inputs: piglow
+    "pilight" = ps: with ps; [ ]; # missing inputs: pilight
+    "ping" = ps: with ps; [ ];
+    "pioneer" = ps: with ps; [ ];
+    "pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2
+    "plaato" = ps: with ps; [ aiohttp-cors];
+    "plant" = ps: with ps; [ ];
+    "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket];
+    "plugwise" = ps: with ps; [ ]; # missing inputs: haanna
+    "plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad
+    "pocketcasts" = ps: with ps; [ ]; # missing inputs: pocketcasts
+    "point" = ps: with ps; [ aiohttp-cors]; # missing inputs: pypoint
+    "prezzibenzina" = ps: with ps; [ ]; # missing inputs: prezzibenzina-py
+    "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix
+    "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client];
+    "prowl" = ps: with ps; [ ];
+    "proximity" = ps: with ps; [ ];
+    "proxmoxve" = ps: with ps; [ ]; # missing inputs: proxmoxer
+    "proxy" = ps: with ps; [ pillow];
+    "ps4" = ps: with ps; [ ]; # missing inputs: pyps4-2ndscreen
+    "ptvsd" = ps: with ps; [ ]; # missing inputs: ptvsd
+    "pulseaudio_loopback" = ps: with ps; [ ];
+    "push" = ps: with ps; [ aiohttp-cors];
+    "pushbullet" = ps: with ps; [ pushbullet];
+    "pushetta" = ps: with ps; [ ]; # missing inputs: pushetta
+    "pushover" = ps: with ps; [ pushover-complete];
+    "pushsafer" = ps: with ps; [ ];
+    "pvoutput" = ps: with ps; [ ];
+    "pyload" = ps: with ps; [ ];
+    "python_script" = ps: with ps; [ restrictedpython];
+    "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent
+    "qld_bushfire" = ps: with ps; [ ]; # missing inputs: georss_qld_bushfire_alert_client
+    "qnap" = ps: with ps; [ ]; # missing inputs: qnapstats
+    "qrcode" = ps: with ps; [ pillow]; # missing inputs: pyzbar
+    "quantum_gateway" = ps: with ps; [ ]; # missing inputs: quantum-gateway
+    "qwikswitch" = ps: with ps; [ ]; # missing inputs: pyqwikswitch
+    "rachio" = ps: with ps; [ aiohttp-cors]; # missing inputs: rachiopy
+    "radarr" = ps: with ps; [ ];
+    "radiotherm" = ps: with ps; [ ]; # missing inputs: radiotherm
+    "rainbird" = ps: with ps; [ ]; # missing inputs: pyrainbird
+    "raincloud" = ps: with ps; [ ]; # missing inputs: raincloudy
+    "rainforest_eagle" = ps: with ps; [ ]; # missing inputs: eagle200_reader uEagle
+    "rainmachine" = ps: with ps; [ ]; # missing inputs: regenmaschine
+    "random" = ps: with ps; [ ];
+    "raspihats" = ps: with ps; [ ]; # missing inputs: raspihats smbus-cffi
+    "raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client
+    "recollect_waste" = ps: with ps; [ ]; # missing inputs: recollect-waste
+    "recorder" = ps: with ps; [ sqlalchemy];
+    "recswitch" = ps: with ps; [ ]; # missing inputs: pyrecswitch
+    "reddit" = ps: with ps; [ praw];
+    "rejseplanen" = ps: with ps; [ ]; # missing inputs: rjpl
+    "remember_the_milk" = ps: with ps; [ httplib2]; # missing inputs: RtmAPI
+    "remote" = ps: with ps; [ ];
+    "remote_rpi_gpio" = ps: with ps; [ ]; # missing inputs: gpiozero
+    "repetier" = ps: with ps; [ ]; # missing inputs: pyrepetier
+    "rest" = ps: with ps; [ jsonpath xmltodict];
+    "rest_command" = ps: with ps; [ ];
+    "rflink" = ps: with ps; [ ]; # missing inputs: rflink
+    "rfxtrx" = ps: with ps; [ ]; # missing inputs: pyRFXtrx
+    "ring" = ps: with ps; [ ha-ffmpeg]; # missing inputs: ring_doorbell
+    "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api
+    "rmvtransport" = ps: with ps; [ ]; # missing inputs: PyRMVtransport
+    "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API
+    "roku" = ps: with ps; [ ]; # missing inputs: roku
+    "roomba" = ps: with ps; [ ]; # missing inputs: roombapy
+    "route53" = ps: with ps; [ boto3]; # missing inputs: ipify
+    "rova" = ps: with ps; [ ]; # missing inputs: rova
+    "rpi_camera" = ps: with ps; [ ];
+    "rpi_gpio" = ps: with ps; [ ]; # missing inputs: RPi.GPIO
+    "rpi_gpio_pwm" = ps: with ps; [ ]; # missing inputs: pwmled
+    "rpi_pfio" = ps: with ps; [ ]; # missing inputs: pifacecommon pifacedigitalio
+    "rpi_rf" = ps: with ps; [ ]; # missing inputs: rpi-rf
+    "rss_feed_template" = ps: with ps; [ aiohttp-cors];
+    "rtorrent" = ps: with ps; [ ];
+    "russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio
+    "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound
+    "sabnzbd" = ps: with ps; [ ]; # missing inputs: pysabnzbd
+    "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: home-assistant-frontend
+    "saj" = ps: with ps; [ ]; # missing inputs: pysaj
+    "salt" = ps: with ps; [ ]; # missing inputs: saltbox
+    "samsungtv" = ps: with ps; [ ]; # missing inputs: samsungctl[websocket]
+    "satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra
+    "scene" = ps: with ps; [ ];
+    "scrape" = ps: with ps; [ beautifulsoup4];
+    "script" = ps: with ps; [ ];
+    "scsgate" = ps: with ps; [ ]; # missing inputs: scsgate
+    "search" = ps: with ps; [ aiohttp-cors];
+    "season" = ps: with ps; [ ephem];
+    "sendgrid" = ps: with ps; [ ]; # missing inputs: sendgrid
+    "sense" = ps: with ps; [ ]; # missing inputs: sense_energy
+    "sensehat" = ps: with ps; [ ]; # missing inputs: sense-hat
+    "sensibo" = ps: with ps; [ ]; # missing inputs: pysensibo
+    "sensor" = ps: with ps; [ ];
+    "sentry" = ps: with ps; [ sentry-sdk];
+    "serial" = ps: with ps; [ pyserial-asyncio];
+    "serial_pm" = ps: with ps; [ ]; # missing inputs: pmsensor
+    "sesame" = ps: with ps; [ ]; # missing inputs: pysesame2
+    "seven_segments" = ps: with ps; [ pillow];
+    "seventeentrack" = ps: with ps; [ ]; # missing inputs: py17track
+    "shell_command" = ps: with ps; [ ];
+    "shiftr" = ps: with ps; [ paho-mqtt];
+    "shodan" = ps: with ps; [ shodan];
+    "shopping_list" = ps: with ps; [ aiohttp-cors];
+    "sht31" = ps: with ps; [ ]; # missing inputs: Adafruit-GPIO Adafruit-SHT31
+    "sigfox" = ps: with ps; [ ];
+    "sighthound" = ps: with ps; [ ]; # missing inputs: simplehound
+    "signal_messenger" = ps: with ps; [ ]; # missing inputs: pysignalclirestapi
+    "simplepush" = ps: with ps; [ ]; # missing inputs: simplepush
+    "simplisafe" = ps: with ps; [ ]; # missing inputs: simplisafe-python
+    "simulated" = ps: with ps; [ ];
+    "sinch" = ps: with ps; [ ]; # missing inputs: clx-sdk-xms
+    "sisyphus" = ps: with ps; [ ]; # missing inputs: sisyphus-control
+    "sky_hub" = ps: with ps; [ ];
+    "skybeacon" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL]
+    "skybell" = ps: with ps; [ ]; # missing inputs: skybellpy
+    "slack" = ps: with ps; [ ]; # missing inputs: slacker
+    "sleepiq" = ps: with ps; [ ]; # missing inputs: sleepyq
+    "slide" = ps: with ps; [ ]; # missing inputs: goslide-api
+    "sma" = ps: with ps; [ ]; # missing inputs: pysma
+    "smappee" = ps: with ps; [ ]; # missing inputs: smappy
+    "smarthab" = ps: with ps; [ ]; # missing inputs: smarthab
+    "smartthings" = ps: with ps; [ aiohttp-cors]; # missing inputs: pysmartapp pysmartthings
+    "smarty" = ps: with ps; [ ]; # missing inputs: pysmarty
+    "smhi" = ps: with ps; [ ]; # missing inputs: smhi-pkg
+    "sms" = ps: with ps; [ ]; # missing inputs: python-gammu
+    "smtp" = ps: with ps; [ ];
+    "snapcast" = ps: with ps; [ snapcast];
+    "snips" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt];
+    "snmp" = ps: with ps; [ pysnmp];
+    "sochain" = ps: with ps; [ ]; # missing inputs: python-sochain-api
+    "socialblade" = ps: with ps; [ ]; # missing inputs: socialbladeclient
+    "solaredge" = ps: with ps; [ stringcase]; # missing inputs: solaredge
+    "solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local
+    "solarlog" = ps: with ps; [ ]; # missing inputs: sunwatcher
+    "solax" = ps: with ps; [ ]; # missing inputs: solax
+    "soma" = ps: with ps; [ ]; # missing inputs: pysoma
+    "somfy" = ps: with ps; [ aiohttp-cors]; # missing inputs: pymfy
+    "somfy_mylink" = ps: with ps; [ ]; # missing inputs: somfy-mylink-synergy
+    "sonarr" = ps: with ps; [ ];
+    "songpal" = ps: with ps; [ ]; # missing inputs: python-songpal
+    "sonos" = ps: with ps; [ pysonos];
+    "sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp
+    "soundtouch" = ps: with ps; [ libsoundtouch];
+    "spaceapi" = ps: with ps; [ aiohttp-cors];
+    "spc" = ps: with ps; [ ]; # missing inputs: pyspcwebgw
+    "speedtestdotnet" = ps: with ps; [ speedtest-cli];
+    "spider" = ps: with ps; [ ]; # missing inputs: spiderpy
+    "splunk" = ps: with ps; [ ];
+    "spotcrime" = ps: with ps; [ ]; # missing inputs: spotcrime
+    "spotify" = ps: with ps; [ aiohttp-cors spotipy];
+    "sql" = ps: with ps; [ sqlalchemy];
+    "squeezebox" = ps: with ps; [ ];
+    "ssdp" = ps: with ps; [ defusedxml netdisco];
+    "starline" = ps: with ps; [ ]; # missing inputs: starline
+    "starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank
+    "startca" = ps: with ps; [ xmltodict];
+    "statistics" = ps: with ps; [ ];
+    "statsd" = ps: with ps; [ statsd];
+    "steam_online" = ps: with ps; [ ]; # missing inputs: steamodd
+    "stiebel_eltron" = ps: with ps; [ ]; # missing inputs: pymodbus pystiebeleltron
+    "stookalert" = ps: with ps; [ ]; # missing inputs: stookalert
+    "stream" = ps: with ps; [ aiohttp-cors av];
+    "streamlabswater" = ps: with ps; [ ]; # missing inputs: streamlabswater
+    "stt" = ps: with ps; [ aiohttp-cors];
+    "suez_water" = ps: with ps; [ ]; # missing inputs: pysuez
+    "sun" = ps: with ps; [ ];
+    "supervisord" = ps: with ps; [ ];
+    "supla" = ps: with ps; [ ]; # missing inputs: pysupla
+    "surepetcare" = ps: with ps; [ ]; # missing inputs: surepy
+    "swiss_hydrological_data" = ps: with ps; [ ]; # missing inputs: swisshydrodata
+    "swiss_public_transport" = ps: with ps; [ ]; # missing inputs: python_opendata_transport
+    "swisscom" = ps: with ps; [ ];
+    "switch" = ps: with ps; [ ];
+    "switchbot" = ps: with ps; [ ]; # missing inputs: PySwitchbot
+    "switcher_kis" = ps: with ps; [ ]; # missing inputs: aioswitcher
+    "switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate
+    "syncthru" = ps: with ps; [ ]; # missing inputs: pysyncthru
+    "synology" = ps: with ps; [ ]; # missing inputs: py-synology
+    "synology_chat" = ps: with ps; [ ];
+    "synology_srm" = ps: with ps; [ ]; # missing inputs: synology-srm
+    "synologydsm" = ps: with ps; [ ]; # missing inputs: python-synology
+    "syslog" = ps: with ps; [ ];
+    "system_health" = ps: with ps; [ aiohttp-cors];
+    "system_log" = ps: with ps; [ aiohttp-cors];
+    "systemmonitor" = ps: with ps; [ psutil];
+    "tado" = ps: with ps; [ ]; # missing inputs: python-tado
+    "tahoma" = ps: with ps; [ ]; # missing inputs: tahoma-api
+    "tank_utility" = ps: with ps; [ ]; # missing inputs: tank_utility
+    "tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff
+    "tautulli" = ps: with ps; [ ]; # missing inputs: pytautulli
+    "tcp" = ps: with ps; [ ];
+    "ted5000" = ps: with ps; [ xmltodict];
+    "teksavvy" = ps: with ps; [ ];
+    "telegram" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot];
+    "telegram_bot" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot];
+    "tellduslive" = ps: with ps; [ ]; # missing inputs: tellduslive
+    "tellstick" = ps: with ps; [ ]; # missing inputs: tellcore-net tellcore-py
+    "telnet" = ps: with ps; [ ];
+    "temper" = ps: with ps; [ ]; # missing inputs: temperusb
+    "template" = ps: with ps; [ ];
+    "tensorflow" = ps: with ps; [ numpy pillow protobuf tensorflow];
+    "tesla" = ps: with ps; [ ]; # missing inputs: teslajsonpy
+    "tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac
+    "thermoworks_smoke" = ps: with ps; [ stringcase]; # missing inputs: thermoworks_smoke
+    "thethingsnetwork" = ps: with ps; [ ];
+    "thingspeak" = ps: with ps; [ ]; # missing inputs: thingspeak
+    "thinkingcleaner" = ps: with ps; [ ]; # missing inputs: pythinkingcleaner
+    "thomson" = ps: with ps; [ ];
+    "threshold" = ps: with ps; [ ];
+    "tibber" = ps: with ps; [ ]; # missing inputs: pyTibber
+    "tikteck" = ps: with ps; [ ]; # missing inputs: tikteck
+    "tile" = ps: with ps; [ ]; # missing inputs: pytile
+    "time_date" = ps: with ps; [ ];
+    "timer" = ps: with ps; [ ];
+    "tmb" = ps: with ps; [ ]; # missing inputs: tmb
+    "tod" = ps: with ps; [ ];
+    "todoist" = ps: with ps; [ todoist];
+    "tof" = ps: with ps; [ ]; # missing inputs: RPi.GPIO VL53L1X2
+    "tomato" = ps: with ps; [ ];
+    "toon" = ps: with ps; [ ]; # missing inputs: toonapilib
+    "torque" = ps: with ps; [ aiohttp-cors];
+    "totalconnect" = ps: with ps; [ ]; # missing inputs: total_connect_client
+    "touchline" = ps: with ps; [ ]; # missing inputs: pytouchline
+    "tplink" = ps: with ps; [ ]; # missing inputs: pyHS100
+    "tplink_lte" = ps: with ps; [ ]; # missing inputs: tp-connected
+    "traccar" = ps: with ps; [ aiohttp-cors stringcase]; # missing inputs: pytraccar
+    "trackr" = ps: with ps; [ ]; # missing inputs: pytrackr
+    "tradfri" = ps: with ps; [ ]; # missing inputs: pytradfri[async]
+    "trafikverket_train" = ps: with ps; [ ]; # missing inputs: pytrafikverket
+    "trafikverket_weatherstation" = ps: with ps; [ ]; # missing inputs: pytrafikverket
+    "transmission" = ps: with ps; [ transmissionrpc];
+    "transport_nsw" = ps: with ps; [ ]; # missing inputs: PyTransportNSW
+    "travisci" = ps: with ps; [ ]; # missing inputs: TravisPy
+    "trend" = ps: with ps; [ numpy];
+    "tts" = ps: with ps; [ aiohttp-cors mutagen];
+    "tuya" = ps: with ps; [ ]; # missing inputs: tuyaha
+    "twentemilieu" = ps: with ps; [ ]; # missing inputs: twentemilieu
+    "twilio" = ps: with ps; [ aiohttp-cors twilio];
+    "twilio_call" = ps: with ps; [ aiohttp-cors twilio];
+    "twilio_sms" = ps: with ps; [ aiohttp-cors twilio];
+    "twitch" = ps: with ps; [ ]; # missing inputs: python-twitch-client
+    "twitter" = ps: with ps; [ ]; # missing inputs: TwitterAPI
+    "ubee" = ps: with ps; [ ]; # missing inputs: pyubee
+    "ubus" = ps: with ps; [ ];
+    "ue_smart_radio" = ps: with ps; [ ];
+    "uk_transport" = ps: with ps; [ ];
+    "unifi" = ps: with ps; [ aiounifi];
+    "unifi_direct" = ps: with ps; [ pexpect];
+    "unifiled" = ps: with ps; [ ]; # missing inputs: unifiled
+    "universal" = ps: with ps; [ ];
+    "upc_connect" = ps: with ps; [ ]; # missing inputs: connect-box
+    "upcloud" = ps: with ps; [ ]; # missing inputs: upcloud-api
+    "updater" = ps: with ps; [ distro];
+    "upnp" = ps: with ps; [ ]; # missing inputs: async-upnp-client
+    "uptime" = ps: with ps; [ ];
+    "uptimerobot" = ps: with ps; [ ]; # missing inputs: pyuptimerobot
+    "uscis" = ps: with ps; [ ]; # missing inputs: uscisstatus
+    "usgs_earthquakes_feed" = ps: with ps; [ ]; # missing inputs: geojson_client
+    "utility_meter" = ps: with ps; [ ];
+    "uvc" = ps: with ps; [ ]; # missing inputs: uvcclient
+    "vacuum" = ps: with ps; [ ];
+    "vallox" = ps: with ps; [ ]; # missing inputs: vallox-websocket-api
+    "vasttrafik" = ps: with ps; [ ]; # missing inputs: vtjp
+    "velbus" = ps: with ps; [ ]; # missing inputs: python-velbus
+    "velux" = ps: with ps; [ ]; # missing inputs: pyvlx
+    "venstar" = ps: with ps; [ ]; # missing inputs: venstarcolortouch
+    "vera" = ps: with ps; [ ]; # missing inputs: pyvera
+    "verisure" = ps: with ps; [ jsonpath]; # missing inputs: vsure
+    "versasense" = ps: with ps; [ ]; # missing inputs: pyversasense
+    "version" = ps: with ps; [ pyhaversion];
+    "vesync" = ps: with ps; [ ]; # missing inputs: pyvesync
+    "viaggiatreno" = ps: with ps; [ ];
+    "vicare" = ps: with ps; [ ]; # missing inputs: PyViCare
+    "vilfo" = ps: with ps; [ ]; # missing inputs: vilfo-api-client
+    "vivotek" = ps: with ps; [ ]; # missing inputs: libpyvivotek
+    "vizio" = ps: with ps; [ ]; # missing inputs: pyvizio
+    "vlc" = ps: with ps; [ python-vlc];
+    "vlc_telnet" = ps: with ps; [ ]; # missing inputs: python-telnet-vlc
+    "voicerss" = ps: with ps; [ ];
+    "volkszaehler" = ps: with ps; [ ]; # missing inputs: volkszaehler
+    "volumio" = ps: with ps; [ ];
+    "volvooncall" = ps: with ps; [ ]; # missing inputs: volvooncall
+    "vultr" = ps: with ps; [ vultr];
+    "w800rf32" = ps: with ps; [ ]; # missing inputs: pyW800rf32
+    "wake_on_lan" = ps: with ps; [ wakeonlan];
+    "waqi" = ps: with ps; [ ]; # missing inputs: waqiasync
+    "water_heater" = ps: with ps; [ ];
+    "waterfurnace" = ps: with ps; [ ]; # missing inputs: waterfurnace
+    "watson_iot" = ps: with ps; [ ]; # missing inputs: ibmiotf
+    "watson_tts" = ps: with ps; [ ]; # missing inputs: ibm-watson
+    "waze_travel_time" = ps: with ps; [ WazeRouteCalculator];
+    "weather" = ps: with ps; [ ];
+    "webhook" = ps: with ps; [ aiohttp-cors];
+    "weblink" = ps: with ps; [ ];
+    "webostv" = ps: with ps; [ ]; # missing inputs: aiopylgtv
+    "websocket_api" = ps: with ps; [ aiohttp-cors];
+    "wemo" = ps: with ps; [ ]; # missing inputs: pywemo
+    "whois" = ps: with ps; [ ]; # missing inputs: python-whois
+    "wink" = ps: with ps; [ aiohttp-cors]; # missing inputs: pubnubsub-handler python-wink
+    "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy
+    "withings" = ps: with ps; [ aiohttp-cors]; # missing inputs: withings-api
+    "wled" = ps: with ps; [ ]; # missing inputs: wled
+    "workday" = ps: with ps; [ holidays];
+    "worldclock" = ps: with ps; [ ];
+    "worldtidesinfo" = ps: with ps; [ ];
+    "worxlandroid" = ps: with ps; [ ];
+    "wsdot" = ps: with ps; [ ];
+    "wunderground" = ps: with ps; [ ];
+    "wunderlist" = ps: with ps; [ ]; # missing inputs: wunderpy2
+    "wwlln" = ps: with ps; [ ]; # missing inputs: aiowwlln
+    "x10" = ps: with ps; [ ];
+    "xbox_live" = ps: with ps; [ ]; # missing inputs: xboxapi
+    "xeoma" = ps: with ps; [ ]; # missing inputs: pyxeoma
+    "xfinity" = ps: with ps; [ ]; # missing inputs: xfinity-gateway
+    "xiaomi" = ps: with ps; [ ha-ffmpeg];
+    "xiaomi_aqara" = ps: with ps; [ ]; # missing inputs: PyXiaomiGateway
+    "xiaomi_miio" = ps: with ps; [ construct python-miio];
+    "xiaomi_tv" = ps: with ps; [ ]; # missing inputs: pymitv
+    "xmpp" = ps: with ps; [ slixmpp];
+    "xs1" = ps: with ps; [ ]; # missing inputs: xs1-api-client
+    "yale_smart_alarm" = ps: with ps; [ ]; # missing inputs: yalesmartalarmclient
+    "yamaha" = ps: with ps; [ rxv];
+    "yamaha_musiccast" = ps: with ps; [ ]; # missing inputs: pymusiccast
+    "yandex_transport" = ps: with ps; [ ]; # missing inputs: ya_ma
+    "yandextts" = ps: with ps; [ ];
+    "yeelight" = ps: with ps; [ ]; # missing inputs: yeelight
+    "yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower
+    "yessssms" = ps: with ps; [ ]; # missing inputs: YesssSMS
+    "yi" = ps: with ps; [ aioftp ha-ffmpeg];
+    "yr" = ps: with ps; [ xmltodict];
+    "yweather" = ps: with ps; [ yahooweather];
+    "zabbix" = ps: with ps; [ ]; # missing inputs: pyzabbix
+    "zamg" = ps: with ps; [ ];
+    "zengge" = ps: with ps; [ ]; # missing inputs: zengge
+    "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf];
+    "zestimate" = ps: with ps; [ xmltodict];
+    "zha" = ps: with ps; [ zha-quirks zigpy-deconz zigpy]; # missing inputs: bellows-homeassistant zigpy-cc zigpy-xbee-homeassistant zigpy-zigate
+    "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac
+    "zigbee" = ps: with ps; [ ]; # missing inputs: xbee-helper
+    "ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl
+    "zone" = ps: with ps; [ ];
+    "zoneminder" = ps: with ps; [ zm-py];
+    "zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher];
   };
 }
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 7d32bf9a0584..9f7b3fed4a56 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -67,7 +67,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.104.3";
+  hassVersion = "0.106.1";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -75,6 +75,8 @@ in with py.pkgs; buildPythonApplication rec {
 
   disabled = pythonOlder "3.5";
 
+  patches = [ ./relax-importlib-metadata-pyaml.patch ];
+
   inherit availableComponents;
 
   # PyPI tarball is missing tests/ directory
@@ -82,7 +84,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "06bh9qrpa1d370pvw6in0isg3yw4p7gh9rpy4hm96p0mf53vxfdp";
+    sha256 = "0i261hzjfhqnq7j8dwsnj2h2vmr4vnxkvk2ff910am1knzni3a2z";
   };
 
   propagatedBuildInputs = [
@@ -95,7 +97,8 @@ in with py.pkgs; buildPythonApplication rec {
   ] ++ componentBuildInputs ++ extraBuildInputs;
 
   checkInputs = [
-    asynctest pytest pytest-aiohttp requests-mock pydispatcher aiohue netdisco hass-nabucasa
+    asynctest pytest pytest-aiohttp requests-mock pydispatcher aiohue netdisco
+    hass-nabucasa defusedxml
   ];
 
   postPatch = ''
diff --git a/pkgs/servers/home-assistant/relax-importlib-metadata-pyaml.patch b/pkgs/servers/home-assistant/relax-importlib-metadata-pyaml.patch
new file mode 100644
index 000000000000..d35e05c6cd78
--- /dev/null
+++ b/pkgs/servers/home-assistant/relax-importlib-metadata-pyaml.patch
@@ -0,0 +1,22 @@
+diff --git a/setup.py b/setup.py
+index 7f9155d9a..f90a0d965 100755
+--- a/setup.py
++++ b/setup.py
+@@ -38,7 +38,7 @@ REQUIRES = [
+     "attrs==19.3.0",
+     "bcrypt==3.1.7",
+     "certifi>=2019.11.28",
+-    "importlib-metadata==1.5.0",
++    "importlib-metadata>=1.3.0",
+     "jinja2>=2.10.3",
+     "PyJWT==1.7.1",
+     # PyJWT has loose dependency. We want the latest one.
+@@ -46,7 +46,7 @@ REQUIRES = [
+     "pip>=8.0.3",
+     "python-slugify==4.0.0",
+     "pytz>=2019.03",
+-    "pyyaml==5.3",
++    "pyyaml>=5.2",
+     "requests==2.22.0",
+     "ruamel.yaml==0.15.100",
+     "voluptuous==0.11.7",

From 9218a58964c6a68f895d81d43573ff1e44a4484f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 28 Feb 2020 15:06:49 +0000
Subject: [PATCH 1773/4636] nixos/sslh: don't run as nogroup

See #55370
---
 nixos/modules/services/networking/sslh.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/networking/sslh.nix b/nixos/modules/services/networking/sslh.nix
index 0222e8ce8b58..c4fa370a5fef 100644
--- a/nixos/modules/services/networking/sslh.nix
+++ b/nixos/modules/services/networking/sslh.nix
@@ -77,19 +77,14 @@ in
 
   config = mkMerge [
     (mkIf cfg.enable {
-      users.users.${user} = {
-        description = "sslh daemon user";
-        isSystemUser = true;
-      };
-
       systemd.services.sslh = {
         description = "Applicative Protocol Multiplexer (e.g. share SSH and HTTPS on the same port)";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
 
         serviceConfig = {
-          User                 = user;
-          Group                = "nogroup";
+          DynamicUser          = true;
+          User                 = "sslh";
           PermissionsStartOnly = true;
           Restart              = "always";
           RestartSec           = "1s";

From 5c3d7b6b305d6143702594298d502a619be79b55 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Feb 2020 15:39:17 +0000
Subject: [PATCH 1774/4636] forkstat: 0.02.12 -> 0.02.13

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

diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix
index f68be3e8d2f0..78ecded20cf7 100644
--- a/pkgs/os-specific/linux/forkstat/default.nix
+++ b/pkgs/os-specific/linux/forkstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "forkstat";
-  version = "0.02.12";
+  version = "0.02.13";
   src = fetchurl {
     url = "https://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.xz";
-    sha256 = "0na6didnqcjn0am65qyf32a01zilk736hqlnpfyqmv4jg31r02i5";
+    sha256 = "01ih89yw9gi6j3l40q5m26la1y0p1jidkxs3yffbdiqm6gwz0xbx";
   };
   installFlags = [ "DESTDIR=$(out)" ];
   postInstall = ''
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   '';
   meta = with lib; {
     description = "Process fork/exec/exit monitoring tool";
-    homepage = https://kernel.ubuntu.com/~cking/forkstat/;
+    homepage = "https://kernel.ubuntu.com/~cking/forkstat/";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ womfoo ];

From 05ab8c6d4c2d18ee81dd53284fc3c083cbb22954 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2020 16:42:29 +0100
Subject: [PATCH 1775/4636] mlt: update from version 6.18.0 to 6.20.0

---
 pkgs/development/libraries/mlt/default.nix | 4 ++--
 pkgs/development/libraries/mlt/qt-5.nix    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix
index b56e33e40241..07c248fa58ac 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mlt";
-  version = "6.18.0";
+  version = "6.20.0";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "mlt";
     rev = "v${version}";
-    sha256 = "0iiqym15n8kbnjzj0asmm86gs23yykz0va5b475cc4v2vv5admgx";
+    sha256 = "14kayzas2wisyw0z27qkcm4qnxbdb7bqa0hg7gaj5kbm3nvsnafk";
   };
 
   buildInputs = [
diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix
index 4d7ecd92e618..cb8ee0ce8491 100644
--- a/pkgs/development/libraries/mlt/qt-5.nix
+++ b/pkgs/development/libraries/mlt/qt-5.nix
@@ -7,13 +7,13 @@ let inherit (stdenv.lib) getDev; in
 
 stdenv.mkDerivation rec {
   pname = "mlt";
-  version = "6.18.0";
+  version = "6.20.0";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "mlt";
     rev = "v${version}";
-    sha256 = "0iiqym15n8kbnjzj0asmm86gs23yykz0va5b475cc4v2vv5admgx";
+    sha256 = "14kayzas2wisyw0z27qkcm4qnxbdb7bqa0hg7gaj5kbm3nvsnafk";
   };
 
   buildInputs = [

From 9f5fa9043537ec9ad8020e2d06de47da17055bbd Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 28 Feb 2020 11:03:33 -0500
Subject: [PATCH 1776/4636] linux: 4.14.171 -> 4.14.172

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 472f02574dd0..dc961e116d76 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.171";
+  version = "4.14.172";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "181jadiwfix23xmqfvg7hpacjd0523v7vy0frzn8g8dlwj4j9q2g";
+    sha256 = "0yi13cky6jdswca7nrjgcrdxk8rnqdbhblhy6mws103mjfms2613";
   };
 } // (args.argsOverride or {}))

From 28fee3fea5727ec904e6314fe5e2531f490e7f4c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 28 Feb 2020 11:04:31 -0500
Subject: [PATCH 1777/4636] linux: 4.19.106 -> 4.19.107

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index fd2bf0b8f155..6fc004a57aef 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.106";
+  version = "4.19.107";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1nlwgs15mc3hlfhqw95pz7wisg8yshzrxzzq2a0y30mjm5vbvj33";
+    sha256 = "0h02pxzzwc5w2kfqw686bpxc13a93yq449lyzxxkxq1qilcsqjv5";
   };
 } // (args.argsOverride or {}))

From 44523d0bda41063c49fa785cbb5d685b709b0a55 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 28 Feb 2020 11:05:20 -0500
Subject: [PATCH 1778/4636] linux: 4.4.214 -> 4.4.215

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index fbd9fad0d40b..a76f2fc7562b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.214";
+  version = "4.4.215";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0v575wl85fg9c3ksdj570hxjcl9p1dxwzag3fm0qcrq75kp6bamn";
+    sha256 = "00zy6cxwb16pqziiqs25pz5llryx2v2nbk9vvzpzxa8x43ad7g18";
   };
 } // (args.argsOverride or {}))

From 6d3fc3562069f42a4b28f792599b69f11b6119eb Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 28 Feb 2020 16:02:12 +0000
Subject: [PATCH 1779/4636] pypy{,3}: use openssl_1_1

"We now support building PyPy with OpenSSL 1.1 in our built-in _ssl
module, as well as maintaining support for previous versions."
-- https://pypy.readthedocs.io/en/latest/release-pypy2.7-v5.6.0.html
---
 pkgs/development/interpreters/python/pypy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix
index 0c4f3eda7b1e..54400ae3e0a4 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -1,6 +1,6 @@
 { stdenv, substituteAll, fetchurl
 , zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi, libunwind, Security
-, sqlite, openssl_1_0_2, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11
+, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11
 , self, gdbm, db, lzma
 , python-setup-hook
 # For the Python package set
@@ -40,7 +40,7 @@ in with passthru; stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    bzip2 openssl_1_0_2 pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db
+    bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db
   ]  ++ optionals isPy3k [
     lzma
   ] ++ optionals (stdenv ? cc && stdenv.cc.libc != null) [

From 24720dd250cb26025d6dd5dbaf089d48f2493cb5 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 28 Feb 2020 11:06:35 -0500
Subject: [PATCH 1780/4636] linux: 4.9.214 -> 4.9.215

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 6f0c75a5c9af..e065257af824 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.214";
+  version = "4.9.215";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "10z4n792g88p46csla2g9b0m7vz40ln0901ffb2cfd3hmhyhjzxl";
+    sha256 = "0j4z2al318654z40w4f8zhh73zwpgn8igjr5k4mz401phm3jyvr3";
   };
 } // (args.argsOverride or {}))

From f9a682c0cc4c6e91f0a4f08326b53033d7a2c11b Mon Sep 17 00:00:00 2001
From: arcnmx <arcnmx@users.noreply.github.com>
Date: Fri, 28 Feb 2020 08:29:24 -0800
Subject: [PATCH 1781/4636] elinks: build with openssl 1.1

---
 .../networking/browsers/elinks/default.nix    |  5 +-
 .../browsers/elinks/openssl-1.1.patch         | 51 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/elinks/openssl-1.1.patch

diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix
index da6a7bc47155..8d62bd7d5cc1 100644
--- a/pkgs/applications/networking/browsers/elinks/default.nix
+++ b/pkgs/applications/networking/browsers/elinks/default.nix
@@ -18,7 +18,10 @@ stdenv.mkDerivation {
     sha256 = "1nnakbi01g7yd3zqwprchh5yp45br8086b0kbbpmnclabcvlcdiq";
   };
 
-  patches = [ ./gc-init.patch ];
+  patches = [
+    ./gc-init.patch
+    ./openssl-1.1.patch
+  ];
 
   buildInputs = [ ncurses xlibsWrapper bzip2 zlib openssl spidermonkey gpm ]
     ++ stdenv.lib.optional enableGuile guile
diff --git a/pkgs/applications/networking/browsers/elinks/openssl-1.1.patch b/pkgs/applications/networking/browsers/elinks/openssl-1.1.patch
new file mode 100644
index 000000000000..22792b6c0790
--- /dev/null
+++ b/pkgs/applications/networking/browsers/elinks/openssl-1.1.patch
@@ -0,0 +1,51 @@
+diff --git a/src/network/ssl/socket.c b/src/network/ssl/socket.c
+index 45b4b4a8..0385a431 100644
+--- a/src/network/ssl/socket.c
++++ b/src/network/ssl/socket.c
+@@ -67,7 +67,9 @@ static void
+ ssl_set_no_tls(struct socket *socket)
+ {
+ #ifdef CONFIG_OPENSSL
+-	((ssl_t *) socket->ssl)->options |= SSL_OP_NO_TLSv1;
++#ifdef SSL_OP_NO_TLSv1
++	SSL_set_options((ssl_t *)socket->ssl, SSL_OP_NO_TLSv1);
++#endif
+ #elif defined(CONFIG_GNUTLS)
+ 	{
+ 		/* GnuTLS does not support SSLv2 because it is "insecure".
+@@ -145,9 +147,11 @@ ssl_connect(struct socket *socket)
+ 		}
+ 
+ 		if (client_cert) {
+-			SSL_CTX *ctx = ((SSL *) socket->ssl)->ctx;
++			SSL_CTX *ctx = SSL_get_SSL_CTX((SSL *) socket->ssl);
+ 
+-			SSL_CTX_use_certificate_chain_file(ctx, client_cert);
++			SSL_CTX_use_certificate_chain_file(
++					(SSL *) socket->ssl,
++					client_cert);
+ 			SSL_CTX_use_PrivateKey_file(ctx, client_cert,
+ 						    SSL_FILETYPE_PEM);
+ 		}
+diff --git a/src/network/ssl/ssl.c b/src/network/ssl/ssl.c
+index c008121d..c06a80a7 100644
+--- a/src/network/ssl/ssl.c
++++ b/src/network/ssl/ssl.c
+@@ -50,11 +50,16 @@ init_openssl(struct module *module)
+ 	 * cannot initialize the PRNG and so every attempt to use SSL fails.
+ 	 * It's actually an OpenSSL FAQ, and according to them, it's up to the
+ 	 * application coders to seed the RNG. -- William Yodlowsky */
+-	if (RAND_egd(RAND_file_name(f_randfile, sizeof(f_randfile))) < 0) {
++	RAND_file_name(f_randfile, sizeof(f_randfile));
++#ifdef HAVE_RAND_EGD
++	if (RAND_egd(f_randfile) < 0) {
+ 		/* Not an EGD, so read and write to it */
++#endif
+ 		if (RAND_load_file(f_randfile, -1))
+ 			RAND_write_file(f_randfile);
++#ifdef HAVE_RAND_EGD
+ 	}
++#endif
+ 
+ 	SSLeay_add_ssl_algorithms();
+ 	context = SSL_CTX_new(SSLv23_client_method());
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d8b08c97b03..6f741426e07e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18859,9 +18859,7 @@ in
 
   elementary-planner = callPackage ../applications/office/elementary-planner { };
 
-  elinks = callPackage ../applications/networking/browsers/elinks {
-    openssl = openssl_1_0_2;
-  };
+  elinks = callPackage ../applications/networking/browsers/elinks { };
 
   elvis = callPackage ../applications/editors/elvis { };
 

From acc4854dace903eade8ffe651fb82000e89785f3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Feb 2020 16:31:55 +0000
Subject: [PATCH 1782/4636] gnome3.glade: 3.22.1 -> 3.22.2

---
 pkgs/desktops/gnome-3/apps/glade/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix
index 84d1a8a76ba3..367bcdef4723 100644
--- a/pkgs/desktops/gnome-3/apps/glade/default.nix
+++ b/pkgs/desktops/gnome-3/apps/glade/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "glade";
-  version = "3.22.1";
+  version = "3.22.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "16p38xavpid51qfy0s26n0n21f9ws1w9k5s65bzh1w7ay8p9my6z";
+    sha256 = "08bayb1rrpblxf6jhhbw2n3c425w170is4l94pampldl4kmsdvzd";
   };
 
   passthru = {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Glade;
+    homepage = "https://wiki.gnome.org/Apps/Glade";
     description = "User interface designer for GTK applications";
     maintainers = gnome3.maintainers;
     license = licenses.lgpl2;

From 14a1aa4a3dbfbde733cbc133828cfca951e8bdf6 Mon Sep 17 00:00:00 2001
From: Sean Buckley <buckley310@users.noreply.github.com>
Date: Fri, 28 Feb 2020 12:03:41 -0500
Subject: [PATCH 1783/4636] NixOS/auto-upgrade: fix wording

Co-Authored-By: Pascal Hertleif <killercup@gmail.com>
---
 nixos/modules/tasks/auto-upgrade.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/auto-upgrade.nix b/nixos/modules/tasks/auto-upgrade.nix
index 57ca7cd94194..6eaa40613d17 100644
--- a/nixos/modules/tasks/auto-upgrade.nix
+++ b/nixos/modules/tasks/auto-upgrade.nix
@@ -70,7 +70,7 @@ let cfg = config.system.autoUpgrade; in
         description = ''
           Add a randomized delay to wait before automatically upgrading.
           The delay will be between zero and this value.
-          This value must be a valid systemd timestamp.
+          This value must be a valid systemd timespan.
         '';
       };
 

From fa58182b17f1bb5245a03d90074e33518f000dca Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 27 Feb 2020 10:48:04 -0800
Subject: [PATCH 1784/4636] edid-generator: init at unstable-2018-03-15

---
 pkgs/tools/misc/edid-generator/default.nix | 41 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/tools/misc/edid-generator/default.nix

diff --git a/pkgs/tools/misc/edid-generator/default.nix b/pkgs/tools/misc/edid-generator/default.nix
new file mode 100644
index 000000000000..49b6277faef5
--- /dev/null
+++ b/pkgs/tools/misc/edid-generator/default.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, fetchFromGitHub
+, dos2unix
+, edid-decode
+, hexdump
+, zsh
+, modelines ? [] # Modeline "1280x800"   83.50  1280 1352 1480 1680  800 803 809 831 -hsync +vsync
+}:
+let
+  version = "unstable-2018-03-15";
+in stdenv.mkDerivation {
+  pname = "edid-generator";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "akatrevorjay";
+    repo = "edid-generator";
+    rev = "31a6f80784d289d2faa8c4ca4788409c83b3ea14";
+    sha256 = "0j6wqzx5frca8b5i6812vvr5iwk7440fka70bmqn00k0vfhsc2x3";
+  };
+
+  nativeBuildInputs = [ dos2unix edid-decode hexdump zsh ];
+
+  postPatch = ''
+    patchShebangs modeline2edid
+  '';
+
+  configurePhase = (stdenv.lib.concatMapStringsSep "\n" (m: "echo \"${m}\" | ./modeline2edid -") modelines);
+
+  installPhase = ''
+    install -Dm 444 *.bin -t "$out/lib/firmware/edid"
+  '';
+
+  meta = {
+    description = "Hackerswork to generate an EDID blob from given Xorg Modelines";
+    homepage = "https://github.com/akatrevorjay/edid-generator";
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.flokli ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4fff36312704..b86488757804 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2984,6 +2984,8 @@ in
 
   edid-decode = callPackage ../tools/misc/edid-decode { };
 
+  edid-generator = callPackage ../tools/misc/edid-generator { };
+
   editres = callPackage ../tools/graphics/editres { };
 
   edit = callPackage ../applications/editors/edit { };

From f150d16ab4bb3d20a72e905562c7b890ab1c425a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Feb 2020 17:47:30 +0000
Subject: [PATCH 1785/4636] geoclue2: 2.5.5 -> 2.5.6

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

diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix
index 8d94dacbb61b..da76c6dfedcf 100644
--- a/pkgs/development/libraries/geoclue/default.nix
+++ b/pkgs/development/libraries/geoclue/default.nix
@@ -7,14 +7,14 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "geoclue";
-  version = "2.5.5";
+  version = "2.5.6";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "0a8wmf5v3x4035ixz9jypj7c6qknvs6gjv2zawa3msq1j75rf2r5";
+    sha256 = "13fk6n4j74lvcsrg3kwbw1mkxgcr3iy9dnysmy0pclfsym8z5m5m";
   };
 
   patches = [
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Geolocation framework and some data providers";
-    homepage = https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home;
+    homepage = "https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home";
     maintainers = with maintainers; [ raskin ];
     platforms = with platforms; linux ++ darwin;
     license = licenses.lgpl2;

From fb285f215301e7856ad5cfc4e4370932cf5c4cd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Pla=CC=81s=CC=8Cil?= <me@rplasil.name>
Date: Tue, 22 Oct 2019 15:48:02 +0800
Subject: [PATCH 1786/4636] minetest: update to 5.1.0 and build on Darwin

---
 .../libraries/irrlicht/default.nix            |  2 +-
 pkgs/development/libraries/irrlicht/mac.nix   | 50 +++++++++++++++++++
 .../libraries/irrlicht/mac_device.patch       | 20 ++++++++
 pkgs/games/minetest/default.nix               |  8 ++-
 pkgs/games/minetest/disable_fixup.patch       | 10 ++++
 .../minetest/fix_wordsize_confusion.patch     | 10 ++++
 pkgs/top-level/all-packages.nix               | 11 +++-
 7 files changed, 106 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/libraries/irrlicht/mac.nix
 create mode 100644 pkgs/development/libraries/irrlicht/mac_device.patch
 create mode 100644 pkgs/games/minetest/disable_fixup.patch
 create mode 100644 pkgs/games/minetest/fix_wordsize_confusion.patch

diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix
index 788772888c6d..65b3ce028afe 100644
--- a/pkgs/development/libraries/irrlicht/default.nix
+++ b/pkgs/development/libraries/irrlicht/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     homepage = http://irrlicht.sourceforge.net/;
     license = stdenv.lib.licenses.zlib;
     description = "Open source high performance realtime 3D engine written in C++";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/libraries/irrlicht/mac.nix b/pkgs/development/libraries/irrlicht/mac.nix
new file mode 100644
index 000000000000..00300d87582d
--- /dev/null
+++ b/pkgs/development/libraries/irrlicht/mac.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchzip, libGLU, libGL, unzip, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }:
+
+let
+  version = "1.8.4";
+
+  irrlichtZip = fetchzip {
+    name = "irrlichtZip";
+    url = "mirror://sourceforge/irrlicht/irrlicht-${version}.zip";
+    sha256 = "02sq067fn4xpf0lcyb4vqxmm43qg2nxx770bgrl799yymqbvih5f";
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  pname = "irrlicht-mac";
+  inherit version;
+
+  src = fetchFromGitHub {
+		owner = "quiark";
+		repo = "IrrlichtCMake";
+		rev = "523a5e6ef84be67c3014f7b822b97acfced536ce";
+		sha256 = "10ahnry2zl64wphs233gxhvs6c0345pyf5nwa29mc6yn49x7bidi";
+  };
+
+  postUnpack = ''
+    cp -r ${irrlichtZip}/* $sourceRoot/
+    chmod -R 777 $sourceRoot
+	'';
+
+  patches = [ ./mac_device.patch ];
+  dontFixCmake = true;
+
+  cmakeFlags = [
+    "-DIRRLICHT_STATIC_LIBRARY=ON"
+    "-DIRRLICHT_BUILD_EXAMPLES=OFF"
+    "-DIRRLICHT_INSTALL_MEDIA_FILES=OFF"
+    "-DIRRLICHT_ENABLE_X11_SUPPORT=OFF"
+    "-DIRRLICHT_BUILD_TOOLS=OFF"
+  ];
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ unzip OpenGL Cocoa IOKit ];
+
+  meta = {
+    homepage = http://irrlicht.sourceforge.net/;
+    license = stdenv.lib.licenses.zlib;
+    description = "Open source high performance realtime 3D engine written in C++";
+    platforms = stdenv.lib.platforms.darwin;
+  };
+}
diff --git a/pkgs/development/libraries/irrlicht/mac_device.patch b/pkgs/development/libraries/irrlicht/mac_device.patch
new file mode 100644
index 000000000000..dc68c509975c
--- /dev/null
+++ b/pkgs/development/libraries/irrlicht/mac_device.patch
@@ -0,0 +1,20 @@
+--- a/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm
++++ b/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm
+@@ -39,7 +39,7 @@
+ #include <IOKit/hidsystem/IOHIDUsageTables.h>
+ #else
+ /* The header was moved here in Mac OS X 10.1 */
+-#include <Kernel/IOKit/hidsystem/IOHIDUsageTables.h>
++#include <IOKit/hid/IOHIDUsageTables.h>
+ #endif
+ #include <IOKit/hid/IOHIDLib.h>
+ #include <IOKit/hid/IOHIDKeys.h>
+@@ -496,7 +496,7 @@
+ 		{
+ 			[[NSAutoreleasePool alloc] init];
+ 			[NSApplication sharedApplication];
+-			[NSApp setDelegate:(id<NSFileManagerDelegate>)[[[AppDelegate alloc] initWithDevice:this] autorelease]];
++			[NSApp setDelegate:(id<NSApplicationDelegate>)[[[AppDelegate alloc] initWithDevice:this] autorelease]];
+ 			[NSBundle loadNibNamed:@"MainMenu" owner:[NSApp delegate]];
+ 			[NSApp finishLaunching];
+ 		}
diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix
index 02a53d065067..77a88a2319f2 100644
--- a/pkgs/games/minetest/default.nix
+++ b/pkgs/games/minetest/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp
 , libjpeg, libXxf86vm, libGLU, libGL, openal, libvorbis, sqlite, luajit
 , freetype, gettext, doxygen, ncurses, graphviz, xorg, gmp, libspatialindex
-, leveldb, postgresql, hiredis
+, leveldb, postgresql, hiredis, libiconv, OpenGL, OpenAL ? openal, Carbon, Cocoa
 }:
 
 with stdenv.lib;
@@ -39,6 +39,8 @@ let
     ] ++ optionals buildClient [
       "-DOpenGL_GL_PREFERENCE=GLVND"
     ];
+    
+    patches = [ ./fix_wordsize_confusion.patch ];
 
     NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3
 
@@ -47,6 +49,8 @@ let
     buildInputs = [
       irrlicht luajit jsoncpp gettext freetype sqlite curl bzip2 ncurses
       gmp libspatialindex
+    ] ++ optionals stdenv.isDarwin [ 
+      libiconv OpenGL OpenAL Carbon Cocoa
     ] ++ optionals buildClient [
       libpng libjpeg libGLU libGL openal libogg libvorbis xorg.libX11 libXxf86vm
     ] ++ optionals buildServer [
@@ -62,7 +66,7 @@ let
       homepage = http://minetest.net/;
       description = "Infinite-world block sandbox game";
       license = licenses.lgpl21Plus;
-      platforms = platforms.linux;
+      platforms = platforms.linux ++ platforms.darwin;
       maintainers = with maintainers; [ pyrolagus fpletz ];
     };
   };
diff --git a/pkgs/games/minetest/disable_fixup.patch b/pkgs/games/minetest/disable_fixup.patch
new file mode 100644
index 000000000000..1c378d7f83fc
--- /dev/null
+++ b/pkgs/games/minetest/disable_fixup.patch
@@ -0,0 +1,10 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -802,7 +802,6 @@
+ 		install(CODE "
+ 			set(BU_CHMOD_BUNDLE_ITEMS ON)
+ 			include(BundleUtilities)
+-			fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/${BUNDLE_PATH}\" \"\" \"\${CMAKE_INSTALL_PREFIX}/${BINDIR}\")
+ 		" COMPONENT Runtime)
+ 	endif()
+ 
diff --git a/pkgs/games/minetest/fix_wordsize_confusion.patch b/pkgs/games/minetest/fix_wordsize_confusion.patch
new file mode 100644
index 000000000000..9540a434dafe
--- /dev/null
+++ b/pkgs/games/minetest/fix_wordsize_confusion.patch
@@ -0,0 +1,10 @@
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -17,6 +17,7 @@
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+ 
++#include <cstdint>
+ #include "irrlicht.h" // createDevice
+ #include "irrlichttypes_extrabloated.h"
+ #include "chat_interface.h"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d8b08c97b03..e94c64551407 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12075,7 +12075,11 @@ in
 
   ip2location-c = callPackage ../development/libraries/ip2location-c { };
 
-  irrlicht = callPackage ../development/libraries/irrlicht { };
+  irrlicht = if !stdenv.isDarwin then
+    callPackage ../development/libraries/irrlicht { }
+  else callPackage ../development/libraries/irrlicht/mac.nix {
+    inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL IOKit;
+  };
 
   isocodes = callPackage ../development/libraries/iso-codes { };
 
@@ -23266,7 +23270,10 @@ in
 
   multimc = libsForQt5.callPackage ../games/multimc { };
 
-  inherit (callPackages ../games/minetest { })
+  inherit (callPackages ../games/minetest {
+	inherit (darwin) libiconv;
+    inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa;
+  })
     minetestclient_4 minetestserver_4
     minetestclient_5 minetestserver_5;
 

From f47e6ff4ed8ead394bb0ff76a140b0a4465734cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Pla=CC=81s=CC=8Cil?= <me@rplasil.name>
Date: Mon, 11 Nov 2019 23:20:44 +0800
Subject: [PATCH 1787/4636] leveldb: fix rpath setting on Darwin

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

diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix
index 17a754a027ab..49487fc1e5f8 100644
--- a/pkgs/development/libraries/leveldb/default.nix
+++ b/pkgs/development/libraries/leveldb/default.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = (stdenv.lib.optionalString stdenv.isDarwin ''
-    for file in out-shared/*.dylib*; do
-      install_name_tool -id $out/lib/$file $file
+    for file in out-shared/*.dylib.*.*; do
+      install_name_tool -id $out/lib/$(basename $file) $file
     done
   '') + # XXX consider removing above after transition to cmake in the next release
   "

From 3a3ccb106e0b96c568e0cc41edb90095de767c80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Pla=CC=81s=CC=8Cil?= <me@rplasil.name>
Date: Wed, 26 Feb 2020 20:44:13 +0800
Subject: [PATCH 1788/4636] Address PR comments

---
 pkgs/development/libraries/irrlicht/common.nix  | 11 +++++++++++
 pkgs/development/libraries/irrlicht/default.nix | 12 ++++++------
 pkgs/development/libraries/irrlicht/mac.nix     | 13 +++----------
 pkgs/development/libraries/leveldb/default.nix  | 12 +++++-------
 pkgs/games/minetest/default.nix                 |  2 --
 5 files changed, 25 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/development/libraries/irrlicht/common.nix

diff --git a/pkgs/development/libraries/irrlicht/common.nix b/pkgs/development/libraries/irrlicht/common.nix
new file mode 100644
index 000000000000..f330c30fda11
--- /dev/null
+++ b/pkgs/development/libraries/irrlicht/common.nix
@@ -0,0 +1,11 @@
+{ fetchzip }:
+
+rec {
+  pname = "irrlicht";
+  version = "1.8.4";
+
+  src = fetchzip {
+    url = "mirror://sourceforge/irrlicht/${pname}-${version}.zip";
+    sha256 = "02sq067fn4xpf0lcyb4vqxmm43qg2nxx770bgrl799yymqbvih5f";
+  };
+}
diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix
index 65b3ce028afe..f411ecdeea65 100644
--- a/pkgs/development/libraries/irrlicht/default.nix
+++ b/pkgs/development/libraries/irrlicht/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchzip, libGLU, libGL, unzip, libXrandr, libX11, libXxf86vm }:
 
+let
+  common = import ./common.nix { inherit fetchzip; };
+in
 
 stdenv.mkDerivation rec {
-  pname = "irrlicht";
-  version = "1.8.4";
+  pname = common.pname;
+  version = common.version;
 
-  src = fetchzip {
-    url = "mirror://sourceforge/irrlicht/${pname}-${version}.zip";
-    sha256 = "02sq067fn4xpf0lcyb4vqxmm43qg2nxx770bgrl799yymqbvih5f";
-  };
+  src = common.src;
 
   preConfigure = ''
     cd source/Irrlicht
diff --git a/pkgs/development/libraries/irrlicht/mac.nix b/pkgs/development/libraries/irrlicht/mac.nix
index 00300d87582d..beead1f9b857 100644
--- a/pkgs/development/libraries/irrlicht/mac.nix
+++ b/pkgs/development/libraries/irrlicht/mac.nix
@@ -1,19 +1,12 @@
 { stdenv, fetchzip, libGLU, libGL, unzip, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }:
 
 let
-  version = "1.8.4";
-
-  irrlichtZip = fetchzip {
-    name = "irrlichtZip";
-    url = "mirror://sourceforge/irrlicht/irrlicht-${version}.zip";
-    sha256 = "02sq067fn4xpf0lcyb4vqxmm43qg2nxx770bgrl799yymqbvih5f";
-  };
-
+  common = import ./common.nix { inherit fetchzip; };
 in
 
 stdenv.mkDerivation rec {
   pname = "irrlicht-mac";
-  inherit version;
+  version = common.version;
 
   src = fetchFromGitHub {
 		owner = "quiark";
@@ -23,7 +16,7 @@ stdenv.mkDerivation rec {
   };
 
   postUnpack = ''
-    cp -r ${irrlichtZip}/* $sourceRoot/
+    cp -r ${common.src}/* $sourceRoot/
     chmod -R 777 $sourceRoot
 	'';
 
diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix
index 49487fc1e5f8..62abc1bd68ca 100644
--- a/pkgs/development/libraries/leveldb/default.nix
+++ b/pkgs/development/libraries/leveldb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
   pname = "leveldb";
@@ -11,16 +11,14 @@ stdenv.mkDerivation rec {
     sha256 = "01kxga1hv4wp94agx5vl3ybxfw5klqrdsrb6p6ywvnjmjxm8322y";
   };
 
+  nativeBuildInputs = []
+    ++ stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ];
+
   buildPhase = ''
     make all
   '';
 
-  installPhase = (stdenv.lib.optionalString stdenv.isDarwin ''
-    for file in out-shared/*.dylib.*.*; do
-      install_name_tool -id $out/lib/$(basename $file) $file
-    done
-  '') + # XXX consider removing above after transition to cmake in the next release
-  "
+  installPhase = "
     mkdir -p $out/{bin,lib,include}
 
     cp -r include $out
diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix
index 77a88a2319f2..03c1cb5cc4ab 100644
--- a/pkgs/games/minetest/default.nix
+++ b/pkgs/games/minetest/default.nix
@@ -40,8 +40,6 @@ let
       "-DOpenGL_GL_PREFERENCE=GLVND"
     ];
     
-    patches = [ ./fix_wordsize_confusion.patch ];
-
     NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3
 
     nativeBuildInputs = [ cmake doxygen graphviz ];

From 8710544c5e8ba398d735e2dfbf1c19862f633139 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 27 Feb 2020 20:00:35 +0100
Subject: [PATCH 1789/4636] mma: 19.08 -> 20.02

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

diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix
index 42f8af99e6f4..4304fe59bdfe 100644
--- a/pkgs/applications/audio/MMA/default.nix
+++ b/pkgs/applications/audio/MMA/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, python3, alsaUtils, timidity }:
 
   stdenv.mkDerivation rec {
-  version = "19.08";
+  version = "20.02";
   pname = "mma";
 
   src = fetchurl {
     url = "https://www.mellowood.ca/mma/mma-bin-${version}.tar.gz";
-    sha256 = "02g2q9f1hbrj1v4mbf7zx2571vqpfla5803hcjpkdkvn8g0dwci0";
+    sha256 = "0i9c3f14j7wy2c86ky83f2vgmg5bihnnwsmpkq13fgqjsaf0qwnv";
   };
 
   buildInputs = [ makeWrapper python3 alsaUtils timidity ];
@@ -19,6 +19,7 @@
     sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' mma-splitrec
     sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' util/mma-splitrec.py
     find . -type f | xargs sed -i 's@/usr/bin/env python@${python3.interpreter}@g'
+    find . -type f | xargs sed -i 's@/usr/bin/python@${python3.interpreter}@g'
   '';
 
   installPhase = ''

From 9a5ecf1212e42f03e26d41d7b6d53853f4016af3 Mon Sep 17 00:00:00 2001
From: Adam Sandberg Ericsson <adam@sandbergericsson.se>
Date: Tue, 18 Feb 2020 19:02:25 +0000
Subject: [PATCH 1790/4636] ghc: really use ld.gold

---
 pkgs/development/compilers/ghc/8.10.1.nix |  6 ++++--
 pkgs/development/compilers/ghc/8.4.4.nix  |  6 ++++--
 pkgs/development/compilers/ghc/8.6.5.nix  |  6 ++++--
 pkgs/development/compilers/ghc/8.8.1.nix  |  6 ++++--
 pkgs/development/compilers/ghc/8.8.2.nix  | 18 +++++++++++++-----
 pkgs/development/compilers/ghc/head.nix   |  6 ++++--
 6 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix
index 314b2fea9c75..bd67fae158af 100644
--- a/pkgs/development/compilers/ghc/8.10.1.nix
+++ b/pkgs/development/compilers/ghc/8.10.1.nix
@@ -84,6 +84,8 @@ let
 
   targetCC = builtins.head toolsForTarget;
 
+  useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
+
 in
 stdenv.mkDerivation (rec {
   version = "8.10.0.20200123";
@@ -110,7 +112,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString (targetPlatform.isLinux && !(targetPlatform.useLLVM or false)) ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -158,7 +160,7 @@ stdenv.mkDerivation (rec {
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
+  ] ++ stdenv.lib.optionals useLdGold [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix
index 075947a02a4b..d1665574de35 100644
--- a/pkgs/development/compilers/ghc/8.4.4.nix
+++ b/pkgs/development/compilers/ghc/8.4.4.nix
@@ -79,6 +79,8 @@ let
 
   targetCC = builtins.head toolsForTarget;
 
+  useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
+
 in
 stdenv.mkDerivation (rec {
   version = "8.4.4";
@@ -126,7 +128,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString (targetPlatform.isLinux && !(targetPlatform.useLLVM or false)) ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -173,7 +175,7 @@ stdenv.mkDerivation (rec {
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
+  ] ++ stdenv.lib.optionals useLdGold [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix
index b31b3db7eb2e..ead28a3076a8 100644
--- a/pkgs/development/compilers/ghc/8.6.5.nix
+++ b/pkgs/development/compilers/ghc/8.6.5.nix
@@ -84,6 +84,8 @@ let
 
   targetCC = builtins.head toolsForTarget;
 
+  useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
+
 in
 stdenv.mkDerivation (rec {
   version = "8.6.5";
@@ -125,7 +127,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString (targetPlatform.isLinux && !(targetPlatform.useLLVM or false)) ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -173,7 +175,7 @@ stdenv.mkDerivation (rec {
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
+  ] ++ stdenv.lib.optionals useLdGold [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix
index 2b859de97997..cc9dab51df73 100644
--- a/pkgs/development/compilers/ghc/8.8.1.nix
+++ b/pkgs/development/compilers/ghc/8.8.1.nix
@@ -84,6 +84,8 @@ let
 
   targetCC = builtins.head toolsForTarget;
 
+  useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
+
 in
 stdenv.mkDerivation (rec {
   version = "8.8.1";
@@ -110,7 +112,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString (targetPlatform.isLinux && !(targetPlatform.useLLVM or false)) ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -158,7 +160,7 @@ stdenv.mkDerivation (rec {
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
+  ] ++ stdenv.lib.optionals useLdGold [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/pkgs/development/compilers/ghc/8.8.2.nix
index b0eef9ef924d..0f9fd7731d32 100644
--- a/pkgs/development/compilers/ghc/8.8.2.nix
+++ b/pkgs/development/compilers/ghc/8.8.2.nix
@@ -84,6 +84,8 @@ let
 
   targetCC = builtins.head toolsForTarget;
 
+  useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
+
 in
 stdenv.mkDerivation (rec {
   version = "8.8.2";
@@ -110,7 +112,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString (targetPlatform.isLinux && !(targetPlatform.useLLVM or false)) ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -147,18 +149,24 @@ stdenv.mkDerivation (rec {
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms = [ "build" "host" ]
     ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
   # `--with` flags for libraries needed for RTS linker
   configureFlags = [
     "--datadir=$doc/share/doc/ghc"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
+  ] ++ stdenv.lib.optionals (libffi != null) [
+    "--with-system-libffi"
+    "--with-ffi-includes=${targetPackages.libffi.dev}/include"
+    "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
   ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
-    "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
+    "--with-gmp-includes=${targetPackages.gmp.dev}/include"
+    "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
   ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
-    "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
+    "--with-iconv-includes=${libiconv}/include"
+    "--with-iconv-libraries=${libiconv}/lib"
   ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
+  ] ++ stdenv.lib.optionals useLdGold [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index d6ba6dd0fad3..2dd7d5f30c4d 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -85,6 +85,8 @@ let
 
   targetCC = builtins.head toolsForTarget;
 
+  useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
+
 in
 stdenv.mkDerivation (rec {
   inherit version;
@@ -117,7 +119,7 @@ stdenv.mkDerivation (rec {
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
     # and more generally have a faster linker.
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString (targetPlatform.isLinux && !(targetPlatform.useLLVM or false)) ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -167,7 +169,7 @@ stdenv.mkDerivation (rec {
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
+  ] ++ stdenv.lib.optionals useLdGold [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"

From 9bc4a358cff77d65b7cb1a0379a310665382a013 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 11 Feb 2020 12:30:20 +0100
Subject: [PATCH 1791/4636] LTS Haskell 15.1

---
 .../configuration-hackage2nix.yaml            | 1326 ++++++++---------
 1 file changed, 586 insertions(+), 740 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index db3201eaf97c..76bbd6dd6cdb 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -69,38 +69,43 @@ core-packages:
 default-package-overrides:
   # pandoc-2.9 does not accept the 0.3 version yet
   - doclayout < 0.3
-  # LTS Haskell 14.23
+  # gi-gdkx11-4.x requires gtk-4.x, which is still under development and
+  # not yet available in Nixpkgs
+  - gi-gdkx11 < 4
+  # LTS Haskell 15.1
   - abstract-deque ==0.3
-  - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
+  - AC-Angle ==1.0
   - accuerr ==0.2.0.2
   - ace ==0.6
   - action-permutations ==0.0.0.1
   - active ==0.2.0.14
-  - ad ==4.3.6
+  - ad ==4.4
   - adjunctions ==4.4
   - adler32 ==0.1.2.0
-  - advent-of-code-api ==0.1.2.3
+  - advent-of-code-api ==0.2.7.0
   - aeson ==1.4.6.0
   - aeson-attoparsec ==0.0.0
   - aeson-better-errors ==0.9.1.0
   - aeson-casing ==0.2.0.0
   - aeson-compat ==0.3.9
+  - aeson-default ==0.9.1.0
   - aeson-diff ==1.1.0.8
-  - aeson-extra ==0.4.1.3
   - aeson-generic-compat ==0.0.1.3
-  - aeson-iproute ==0.2
+  - aeson-lens ==0.5.0.0
+  - aeson-optics ==1.1.0.1
   - aeson-picker ==0.1.0.5
   - aeson-pretty ==0.8.8
   - aeson-qq ==0.8.3
+  - aeson-schemas ==1.0.3
   - aeson-utils ==0.3.0.2
   - aeson-yak ==0.1.1.3
+  - aeson-yaml ==1.0.5.0
   - al ==0.1.4.2
-  - alarmclock ==0.7.0.2
   - alerts ==0.1.2.0
   - alex ==3.2.5
   - alg ==0.2.13.1
-  - algebraic-graphs ==0.4
+  - algebraic-graphs ==0.5
   - Allure ==0.9.5.0
   - almost-fix ==0.0.2
   - alsa-core ==0.5.0.1
@@ -108,30 +113,125 @@ default-package-overrides:
   - alsa-pcm ==0.6.1.1
   - alsa-seq ==0.6.0.7
   - alternative-vector ==0.0.0
-  - alternators ==1.0.0.0
   - ALUT ==2.4.0.3
-  - amqp ==0.18.3
+  - amazonka ==1.6.1
+  - amazonka-apigateway ==1.6.1
+  - amazonka-application-autoscaling ==1.6.1
+  - amazonka-appstream ==1.6.1
+  - amazonka-athena ==1.6.1
+  - amazonka-autoscaling ==1.6.1
+  - amazonka-budgets ==1.6.1
+  - amazonka-certificatemanager ==1.6.1
+  - amazonka-cloudformation ==1.6.1
+  - amazonka-cloudfront ==1.6.1
+  - amazonka-cloudhsm ==1.6.1
+  - amazonka-cloudsearch ==1.6.1
+  - amazonka-cloudsearch-domains ==1.6.1
+  - amazonka-cloudtrail ==1.6.1
+  - amazonka-cloudwatch ==1.6.1
+  - amazonka-cloudwatch-events ==1.6.1
+  - amazonka-cloudwatch-logs ==1.6.1
+  - amazonka-codebuild ==1.6.1
+  - amazonka-codecommit ==1.6.1
+  - amazonka-codedeploy ==1.6.1
+  - amazonka-codepipeline ==1.6.1
+  - amazonka-cognito-identity ==1.6.1
+  - amazonka-cognito-idp ==1.6.1
+  - amazonka-cognito-sync ==1.6.1
+  - amazonka-config ==1.6.1
+  - amazonka-core ==1.6.1
+  - amazonka-datapipeline ==1.6.1
+  - amazonka-devicefarm ==1.6.1
+  - amazonka-directconnect ==1.6.1
+  - amazonka-discovery ==1.6.1
+  - amazonka-dms ==1.6.1
+  - amazonka-ds ==1.6.1
+  - amazonka-dynamodb ==1.6.1
+  - amazonka-dynamodb-streams ==1.6.1
+  - amazonka-ecr ==1.6.1
+  - amazonka-ecs ==1.6.1
+  - amazonka-efs ==1.6.1
+  - amazonka-elasticache ==1.6.1
+  - amazonka-elasticbeanstalk ==1.6.1
+  - amazonka-elasticsearch ==1.6.1
+  - amazonka-elastictranscoder ==1.6.1
+  - amazonka-elb ==1.6.1
+  - amazonka-elbv2 ==1.6.1
+  - amazonka-emr ==1.6.1
+  - amazonka-gamelift ==1.6.1
+  - amazonka-glacier ==1.6.1
+  - amazonka-glue ==1.6.1
+  - amazonka-health ==1.6.1
+  - amazonka-iam ==1.6.1
+  - amazonka-importexport ==1.6.1
+  - amazonka-inspector ==1.6.1
+  - amazonka-iot ==1.6.1
+  - amazonka-iot-dataplane ==1.6.1
+  - amazonka-kinesis ==1.6.1
+  - amazonka-kinesis-analytics ==1.6.1
+  - amazonka-kinesis-firehose ==1.6.1
+  - amazonka-kms ==1.6.1
+  - amazonka-lambda ==1.6.1
+  - amazonka-lightsail ==1.6.1
+  - amazonka-marketplace-analytics ==1.6.1
+  - amazonka-marketplace-metering ==1.6.1
+  - amazonka-ml ==1.6.1
+  - amazonka-opsworks ==1.6.1
+  - amazonka-opsworks-cm ==1.6.1
+  - amazonka-pinpoint ==1.6.1
+  - amazonka-polly ==1.6.1
+  - amazonka-rds ==1.6.1
+  - amazonka-redshift ==1.6.1
+  - amazonka-rekognition ==1.6.1
+  - amazonka-route53 ==1.6.1
+  - amazonka-route53-domains ==1.6.1
+  - amazonka-s3 ==1.6.1
+  - amazonka-sdb ==1.6.1
+  - amazonka-servicecatalog ==1.6.1
+  - amazonka-ses ==1.6.1
+  - amazonka-shield ==1.6.1
+  - amazonka-sms ==1.6.1
+  - amazonka-snowball ==1.6.1
+  - amazonka-sns ==1.6.1
+  - amazonka-sqs ==1.6.1
+  - amazonka-ssm ==1.6.1
+  - amazonka-stepfunctions ==1.6.1
+  - amazonka-storagegateway ==1.6.1
+  - amazonka-sts ==1.6.1
+  - amazonka-support ==1.6.1
+  - amazonka-swf ==1.6.1
+  - amazonka-test ==1.6.1
+  - amazonka-waf ==1.6.1
+  - amazonka-workspaces ==1.6.1
+  - amazonka-xray ==1.6.1
+  - amqp ==0.19.1
   - annotated-wl-pprint ==0.7.0
-  - ansi-terminal ==0.9.1
+  - ansi-terminal ==0.10.3
   - ansi-wl-pprint ==0.6.9
+  - antiope-core ==7.4.5
+  - antiope-dynamodb ==7.4.5
+  - antiope-messages ==7.4.5
+  - antiope-s3 ==7.4.5
+  - antiope-sns ==7.4.5
+  - antiope-sqs ==7.4.5
   - ANum ==0.2.0.2
-  - aos-signature ==0.1.1
-  - apecs ==0.8.3
-  - apecs-gloss ==0.2.3
-  - apecs-physics ==0.4.2
+  - apecs ==0.9.1
+  - apecs-gloss ==0.2.4
+  - apecs-physics ==0.4.4
   - api-field-json-th ==0.1.0.2
   - appar ==0.1.8
   - appendmap ==0.1.5
-  - apply-refact ==0.6.0.0
   - apportionment ==0.0.0.3
   - approximate ==0.3.2
   - app-settings ==0.2.0.12
   - arbor-lru-cache ==0.1.1.1
-  - arithmoi ==0.9.0.0
+  - arbor-postgres ==0.0.5
+  - arithmoi ==0.10.0.0
   - array-memoize ==0.6.0
   - arrow-extras ==0.1.0.1
   - asciidiagram ==1.3.3.3
   - ascii-progress ==0.3.3.0
+  - asif ==6.0.4
   - asn1-encoding ==0.9.6
   - asn1-parse ==0.9.5
   - asn1-types ==0.3.3
@@ -162,49 +262,35 @@ default-package-overrides:
   - autoexporter ==1.1.15
   - auto-update ==0.1.6
   - avers ==0.0.17.1
-  - avers-api ==0.1.0
-  - avers-server ==0.1.0.1
   - avro ==0.4.6.0
-  - avwx ==0.3.0.2
   - aws-cloudfront-signed-cookies ==0.2.0.1
-  - aws-lambda-haskell-runtime ==2.0.3
-  - backprop ==0.2.6.3
-  - bank-holidays-england ==0.2.0.2
-  - barbies ==1.1.3.0
-  - barrier ==0.1.1
   - base16-bytestring ==0.1.1.6
   - base32string ==0.9.1
   - base58string ==0.10.0
+  - base64 ==0.4.1
   - base64-bytestring ==1.0.0.3
   - base64-bytestring-type ==1.0.1
+  - base64-lens ==0.2.0
   - base64-string ==0.2
-  - base-compat ==0.10.5
-  - base-compat-batteries ==0.10.5
+  - base-compat ==0.11.1
+  - base-compat-batteries ==0.11.1
   - basement ==0.0.11
-  - base-noprelude ==4.12.0.0
   - base-orphans ==0.8.2
   - base-prelude ==1.3
-  - base-unicode-symbols ==0.2.3
+  - base-unicode-symbols ==0.2.4.2
   - basic-prelude ==0.7.0
   - bazel-runfiles ==0.7.0.1
   - bbdb ==0.8
   - bcrypt ==0.0.11
-  - beam-core ==0.8.0.0
-  - beam-migrate ==0.4.0.1
-  - beam-mysql ==0.2.0.0
-  - beam-postgres ==0.4.0.0
-  - beam-sqlite ==0.4.0.0
+  - bech32 ==1.0.2
   - bench ==1.0.12
-  - benchpress ==0.2.2.12
-  - bench-show ==0.3.1
-  - bencode ==0.6.0.0
-  - bencoding ==0.4.5.2
   - between ==0.11.0.0
   - bibtex ==0.1.0.6
   - bifunctors ==5.5.7
   - bimap ==0.4.0
+  - bimaps ==0.1.0.2
   - bimap-server ==0.1.0.1
-  - binary-bits ==0.5
+  - bin ==0.1
   - binary-conduit ==1.3.1
   - binary-ext ==2.0.4
   - binary-ieee754 ==0.1.0.0
@@ -216,42 +302,35 @@ default-package-overrides:
   - binary-shared ==0.8.3
   - binary-tagged ==0.2
   - bindings-DSL ==1.0.25
-  - bindings-GLFW ==3.2.1.1
+  - bindings-GLFW ==3.3.2.0
   - bindings-libzip ==1.0.1
   - bindings-uname ==0.1
   - bins ==0.1.2.0
   - bitarray ==0.0.1.1
-  - bitcoin-block ==0.13.1
-  - bitcoin-script ==0.11.1
-  - bitcoin-tx ==0.13.1
-  - bitcoin-types ==0.9.2
   - bits ==0.5.2
   - bitset-word8 ==0.1.1.1
   - bits-extra ==0.0.1.5
   - bitvec ==1.0.2.0
-  - bitx-bitcoin ==0.12.0.0
   - blake2 ==0.3.0
+  - blanks ==0.3.0
   - blas-carray ==0.1.0.1
   - blas-comfort-array ==0.0.0.2
   - blas-ffi ==0.1
-  - blas-hs ==0.1.1.0
   - blaze-bootstrap ==0.1.0.1
   - blaze-builder ==0.4.1.0
-  - blaze-colonnade ==1.2.2.1
   - blaze-html ==0.9.1.2
   - blaze-markup ==0.8.2.3
   - blaze-svg ==0.3.6.1
   - blaze-textual ==0.2.1.0
   - bmp ==1.2.6.3
-  - board-games ==0.3
   - boltzmann-samplers ==0.1.1.0
   - Boolean ==0.2.4
   - boolean-like ==0.1.1.0
   - boolean-normal-forms ==0.0.1.1
   - boolsimplifier ==0.1.8
-  - boots ==0.0.100
+  - boots ==0.2.0.1
   - bordacount ==0.1.0.0
-  - boring ==0.1.2
+  - boring ==0.1.3
   - both ==0.1.1.0
   - bound ==2.0.1
   - BoundedChan ==1.0.3.0
@@ -259,65 +338,62 @@ default-package-overrides:
   - boundingboxes ==0.2.3
   - bower-json ==1.0.0.1
   - boxes ==0.1.5
-  - brick ==0.47.1
+  - brick ==0.52
   - brittany ==0.12.1.1
   - bsb-http-chunked ==0.0.0.4
-  - bson ==0.3.2.8
-  - bson-lens ==0.1.1
+  - bson ==0.4.0.0
   - btrfs ==0.2.0.0
   - buffer-builder ==0.2.4.7
   - buffer-pipe ==0.0
-  - bugsnag-haskell ==0.0.3.0
-  - bulletproofs ==0.4.0
+  - bugsnag-hs ==0.1.0.0
   - butcher ==1.3.2.3
-  - butter ==0.1.0.6
   - bv ==0.5
   - bv-little ==1.1.1
   - byteable ==0.1.1
   - bytedump ==1.0
+  - byte-order ==0.1.2.0
   - byteorder ==1.0.4
-  - bytes ==0.15.5
+  - bytes ==0.17
   - byteset ==0.1.1.0
+  - byteslice ==0.2.1.0
+  - bytesmith ==0.3.5.0
   - bytestring-builder ==0.10.8.2.0
   - bytestring-conversion ==0.3.1
   - bytestring-lexing ==0.5.0.2
   - bytestring-strict-builder ==0.4.5.3
   - bytestring-to-vector ==0.3.0.1
   - bytestring-tree-builder ==0.2.7.3
-  - bzlib ==0.5.0.5
+  - bz2 ==1.0.0.1
   - bzlib-conduit ==0.3.0.2
   - c2hs ==0.28.6
-  - Cabal ==2.4.1.0
   - cabal-doctest ==1.0.8
-  - cabal-file-th ==0.2.6
-  - cabal-rpm ==1.0.3
+  - cabal-flatpak ==0.1
+  - cabal-plan ==0.6.2.0
+  - cabal-rpm ==2.0.2
   - cache ==0.1.3.0
   - cacophony ==0.10.1
   - calendar-recycling ==0.0.0.1
-  - call-stack ==0.1.0
+  - call-stack ==0.2.0
+  - can-i-haz ==0.3.1.0
   - ca-province-codes ==1.0.0.0
   - carray ==0.1.6.8
   - cased ==0.1.0.0
-  - case-insensitive ==1.2.0.11
+  - case-insensitive ==1.2.1.0
   - cases ==0.1.3.2
   - casing ==0.1.4.1
   - cassava ==0.5.2.0
   - cassava-conduit ==0.5.1
   - cassava-megaparsec ==2.0.1
-  - cassava-records ==0.1.0.4
   - cast ==0.1.0.2
-  - caster ==0.0.3.0
   - category ==0.2.5.0
-  - cayley-client ==0.4.9
+  - cayley-client ==0.4.11
   - cborg ==0.2.2.1
   - cborg-json ==0.2.2.0
   - cereal ==0.5.8.1
   - cereal-conduit ==0.8.0
   - cereal-text ==0.1.0.2
-  - cereal-time ==0.1.0.0
   - cereal-vector ==0.2.0.1
   - cfenv ==0.1.0.0
-  - cgi ==3001.4.0.0
   - chan ==0.0.4.1
   - ChannelT ==0.0.0.7
   - charset ==0.3.7.1
@@ -325,127 +401,111 @@ default-package-overrides:
   - Chart ==1.9.3
   - Chart-diagrams ==1.9.3
   - chaselev-deque ==0.5.0.5
-  - cheapskate ==0.1.1.2
-  - cheapskate-highlight ==0.1.0.0
-  - cheapskate-lucid ==0.1.0.0
-  - check-email ==1.0.2
+  - ChasingBottoms ==1.3.1.7
   - checkers ==0.5.2
   - checksum ==0.0
-  - chimera ==0.2.0.0
-  - chiphunk ==0.1.2.1
+  - chimera ==0.3.0.0
   - choice ==0.2.2
   - chronologique ==0.3.1.1
-  - chronos ==1.0.9
+  - chronos ==1.1
   - chronos-bench ==0.2.0.2
   - chunked-data ==0.3.1
   - cipher-aes ==0.2.11
-  - cipher-aes128 ==0.7.0.5
-  - cipher-blowfish ==0.0.3
   - cipher-camellia ==0.0.2
   - cipher-des ==0.0.6
   - cipher-rc4 ==0.1.4
   - circle-packing ==0.1.0.6
-  - cisco-spark-api ==0.1.0.4
-  - classyplate ==0.3.2.0
   - classy-prelude ==1.5.0
   - classy-prelude-conduit ==1.5.0
   - classy-prelude-yesod ==1.5.0
   - clay ==0.13.3
   - clientsession ==0.9.1.2
+  - climb ==0.3.1
   - Clipboard ==2.3.2.0
   - clock ==0.8
   - clock-extras ==0.1.0.2
-  - closed ==0.2.0.1
   - clr-host ==0.2.1.0
   - clr-marshal ==0.2.0.0
   - clumpiness ==0.17.0.2
+  - ClustalParser ==1.3.0
   - cmark ==0.6
   - cmark-gfm ==0.2.1
+  - cmark-lucid ==0.1.0.0
   - cmdargs ==0.10.20
-  - codec ==0.2.1
   - codec-beam ==0.2.0
   - codec-rpm ==0.2.2
   - code-page ==0.2
-  - codo-notation ==0.5.2
-  - coercible-utils ==0.0.0
-  - co-log ==0.3.0.0
+  - coercible-utils ==0.1.0
+  - co-log ==0.4.0.0
   - co-log-core ==0.2.1.0
-  - colonnade ==1.2.0.2
+  - co-log-polysemy ==0.0.1.1
+  - Color ==0.1.3.1
   - colorful-monoids ==0.2.1.2
   - colorize-haskell ==1.0.1
   - colour ==2.3.5
-  - columnar ==1.0.0.0
   - combinatorial ==0.1.0.1
   - comfort-array ==0.4
   - comfort-graph ==0.0.3.1
   - commutative ==0.0.2
   - comonad ==5.0.6
-  - compact ==0.1.0.1
   - compactmap ==0.1.4.2.1
-  - compensated ==0.7.3
+  - compensated ==0.8.1
   - compiler-warnings ==0.1.0
   - composable-associations ==0.1.0.0
   - composable-associations-aeson ==0.1.0.0
   - composition ==1.0.2.1
   - composition-extra ==2.0.0
   - concise ==0.1.0.1
-  - concurrency ==1.7.0.0
+  - concurrency ==1.8.1.0
   - concurrent-extra ==0.7.0.12
   - concurrent-output ==1.10.11
   - concurrent-split ==0.0.1.1
-  - concurrent-supply ==0.1.8
   - cond ==0.4.1.1
   - conduit ==1.3.1.2
   - conduit-algorithms ==0.0.11.0
   - conduit-combinators ==1.3.0
   - conduit-concurrent-map ==0.1.1
   - conduit-extra ==1.3.4
-  - conduit-iconv ==0.1.1.3
   - conduit-parse ==0.2.1.0
-  - conduit-throttle ==0.3.1.0
   - conduit-zstd ==0.0.1.1
+  - conferer ==0.2.0.0
+  - conferer-hspec ==0.2.0.0
+  - conferer-provider-json ==0.2.0.0
+  - conferer-warp ==0.2.0.0
   - config-ini ==0.2.4.0
-  - configuration-tools ==0.4.2
   - configurator ==0.3.0.0
   - configurator-export ==0.1.0.1
-  - configurator-pg ==0.1.0.3
   - connection ==0.3.1
   - connection-pool ==0.2.2
   - console-style ==0.0.2.1
   - constraint ==0.1.4.0
-  - constraints ==0.10.1
+  - constraints ==0.11.2
+  - constraint-tuples ==0.1.2
+  - contiguous ==0.5
   - contravariant ==1.5.2
-  - contravariant-extras ==0.3.5
+  - contravariant-extras ==0.3.5.1
   - control-bool ==0.2.1
-  - control-dsl ==0.2.1.3
   - control-monad-free ==0.6.2
   - control-monad-omega ==0.3.2
   - convertible ==1.1.1.0
   - cookie ==0.4.5
   - core-data ==0.2.1.5
+  - core-program ==0.2.4.2
   - core-text ==0.2.3.3
   - countable ==1.0
-  - country ==0.1.6
-  - courier ==0.1.1.5
   - cpio-conduit ==0.7.0
   - cpphs ==1.20.8
   - cprng-aes ==0.6.1
   - cpu ==0.1.2
   - cpuinfo ==0.1.0.1
-  - cql ==4.0.2
-  - cql-io ==1.1.1
   - crackNum ==2.3
   - crc32c ==0.0.0
   - credential-store ==0.1.2
-  - criterion ==1.5.6.1
+  - criterion ==1.5.6.2
   - criterion-measurement ==0.1.2.0
   - cron ==0.6.2
   - crypto-api ==0.13.3
-  - crypto-api-tests ==0.3
-  - cryptocipher ==0.6.2
-  - crypto-cipher-tests ==0.0.11
   - crypto-cipher-types ==0.0.9
-  - cryptocompare ==0.1.1
   - crypto-enigma ==0.1.1.6
   - cryptohash ==0.11.9
   - cryptohash-cryptoapi ==0.1.4
@@ -453,38 +513,36 @@ default-package-overrides:
   - cryptohash-sha1 ==0.11.100.1
   - cryptohash-sha256 ==0.11.101.0
   - cryptohash-sha512 ==0.11.100.1
-  - cryptonite ==0.25
+  - cryptonite ==0.26
   - cryptonite-conduit ==0.2.2
   - cryptonite-openssl ==0.7
   - crypto-numbers ==0.2.7
   - crypto-pubkey ==0.2.8
-  - crypto-pubkey-openssh ==0.2.7
   - crypto-pubkey-types ==0.4.3
   - crypto-random ==0.0.9
   - crypto-random-api ==0.2.0
   - crypt-sha512 ==0
   - csp ==1.4.0
-  - css-syntax ==0.1.0.0
   - css-text ==0.1.3.0
   - csv ==0.1.2
+  - csv-conduit ==0.7.1.0
   - ctrie ==0.2
   - cubicbezier ==0.6.0.6
   - cubicspline ==0.1.2
-  - cublas ==0.5.0.0
   - cuckoo-filter ==0.2.0.2
-  - cuda ==0.10.1.0
   - cue-sheet ==2.0.1
-  - cufft ==0.9.0.1
   - curl ==1.3.8
   - currencies ==0.2.0.0
   - currency ==0.2.0.0
-  - cusparse ==0.2.0.0
+  - cursor ==0.3.0.0
+  - cursor-brick ==0.1.0.0
+  - cursor-fuzzy-time ==0.0.0.0
+  - cursor-gen ==0.3.0.0
   - cutter ==0.0
   - cyclotomic ==1.0.1
   - czipwith ==1.0.1.2
-  - data-accessor ==0.2.2.8
+  - data-accessor ==0.2.3
   - data-accessor-mtl ==0.2.0.4
-  - data-accessor-template ==0.2.1.16
   - data-accessor-transformers ==0.2.1.7
   - data-binary-ieee754 ==0.4.4
   - data-bword ==0.1.0.1
@@ -495,102 +553,89 @@ default-package-overrides:
   - data-default-instances-containers ==0.0.1
   - data-default-instances-dlist ==0.0.1
   - data-default-instances-old-locale ==0.0.1
-  - data-diverse ==4.6.0.0
-  - data-diverse-lens ==4.3.0.0
+  - data-diverse ==4.7.0.0
   - datadog ==0.2.4.0
   - data-dword ==0.3.1.3
   - data-endian ==0.1.1
   - data-fix ==0.2.0
   - data-has ==0.3.0.0
+  - data-interval ==2.0.1
   - data-inttrie ==0.1.4
   - data-lens-light ==0.1.2.2
   - data-memocombinators ==0.5.1
-  - data-msgpack ==0.0.12
-  - data-msgpack-types ==0.0.2
   - data-or ==1.0.0.5
   - data-ordlist ==0.4.7.0
   - data-ref ==0.0.2
   - data-reify ==0.6.1
   - data-serializer ==0.3.4.1
-  - datasets ==0.4.0
   - data-textual ==0.3.0.3
   - data-tree-print ==0.1.0.2
   - dataurl ==0.1.0.0
   - DAV ==1.3.4
-  - dbcleaner ==0.1.3
-  - DBFunctor ==0.1.1.1
-  - dbus ==1.2.7
+  - dbus ==1.2.11
   - debian-build ==0.10.2.0
-  - debug ==0.1.1
   - debug-trace-var ==0.2.0
   - dec ==0.0.3
-  - decidable ==0.1.5.0
   - Decimal ==0.5.1
   - declarative ==0.5.2
   - deepseq-generics ==0.2.0.0
   - deferred-folds ==0.9.10.1
   - dejafu ==2.1.0.1
   - dense-linear-algebra ==0.1.0.0
-  - dependent-map ==0.2.4.0
-  - dependent-sum ==0.4
-  - dependent-sum-template ==0.0.0.6
   - deque ==0.4.3
   - deriveJsonNoPrefix ==0.1.0.1
   - deriving-compat ==0.5.8
   - derulo ==1.0.7
   - detour-via-sci ==1.0.0
-  - dhall ==1.24.0
-  - dhall-bash ==1.0.21
-  - dhall-json ==1.3.0
+  - dhall ==1.30.0
+  - dhall-bash ==1.0.28
+  - dhall-json ==1.6.2
+  - dhall-yaml ==1.0.2
   - diagrams ==1.4
   - diagrams-contrib ==1.4.4
   - diagrams-core ==1.4.2
   - diagrams-lib ==1.4.3
-  - diagrams-postscript ==1.4.1
+  - diagrams-postscript ==1.5
   - diagrams-rasterific ==1.4.2
   - diagrams-solve ==0.1.1
   - diagrams-svg ==1.4.3
   - di-core ==1.0.4
   - dictionary-sharing ==0.1.0.0
-  - Diff ==0.3.4
+  - Diff ==0.4.0
   - digest ==0.0.1.2
   - digits ==0.3.1
   - dimensional ==1.3
   - di-monad ==1.3.1
   - directory-tree ==0.12.1
-  - direct-sqlite ==2.3.24
   - discount ==0.1.1
   - disk-free-space ==0.1.0.1
   - distributed-closure ==0.4.2.0
   - distribution-opensuse ==1.1.1
   - distributive ==0.6.1
-  - dl-fedora ==0.5
+  - dl-fedora ==0.7.3
   - dlist ==0.8.0.7
   - dlist-instances ==0.1.1.1
   - dlist-nonempty ==0.1.1
   - dns ==4.0.1
   - dockerfile ==0.2.0
-  - docopt ==0.7.0.5
-  - doctemplates ==0.2.2.1
+  - doclayout ==0.2.0.1
+  - doctemplates ==0.8
   - doctest ==0.16.2
   - doctest-discover ==0.2.0.0
   - doctest-driver-gen ==0.3.0.2
   - doldol ==0.4.1.2
   - do-list ==1.0.1
-  - dom-parser ==3.1.0
   - do-notation ==0.1.0.2
   - dotenv ==0.8.0.4
   - dotgen ==0.4.2
   - dotnet-timespan ==0.0.1.0
   - double-conversion ==2.0.2.0
-  - download ==0.3.2.7
   - drinkery ==0.4
   - dsp ==0.2.5
   - dual ==0.1.1.1
   - dual-tree ==0.2.2.1
   - dublincore-xml-conduit ==0.1.0.2
-  - dunai ==0.5.1
-  - dunai-core ==0.5.1.0
+  - dunai ==0.6.0
   - duration ==0.1.0.0
   - dvorak ==0.1.0.0
   - dynamic-state ==0.3.1
@@ -598,7 +643,6 @@ default-package-overrides:
   - eap ==0.9.0.2
   - Earley ==0.13.0.1
   - easy-file ==0.2.2
-  - easytest ==0.2.1
   - Ebnf2ps ==1.0.15
   - echo ==0.1.3
   - ecstasy ==0.2.1.0
@@ -606,99 +650,88 @@ default-package-overrides:
   - edit-distance ==0.2.2.1
   - edit-distance-vector ==1.0.0.4
   - editor-open ==0.6.0.0
+  - egison ==3.10.3
   - either ==5.0.1.1
   - either-both ==0.1.1.1
-  - ekg ==0.4.0.15
-  - ekg-core ==0.1.1.6
-  - ekg-json ==0.1.0.6
-  - ekg-statsd ==0.2.4.0
+  - either-unwrap ==1.1
   - elerea ==2.9.0
   - elf ==0.30
-  - eliminators ==0.5.1
-  - elm2nix ==0.1.2
+  - eliminators ==0.6
   - elm-bridge ==0.5.2
   - elm-core-sources ==1.0.0
   - elm-export ==0.6.0.1
   - emacs-module ==0.1.1
   - email-validate ==2.3.2.12
-  - emd ==0.1.5.1
+  - emojis ==0.1
   - enclosed-exceptions ==1.0.3
   - ENIG ==0.0.1.0
   - entropy ==0.4.1.5
   - enummapset ==0.6.0.2
   - enumset ==0.0.5
   - enum-subset-generate ==0.1.0.0
-  - enum-text ==0.5.1.0
-  - enum-text-rio ==1.2.0.0
   - envelope ==0.2.2.0
-  - envy ==2.0.0.0
+  - envy ==2.1.0.0
   - epub-metadata ==4.5
   - eq ==4.2
   - equal-files ==0.0.5.3
+  - equational-reasoning ==0.6.0.1
   - erf ==2.0.0.0
   - errors ==2.3.0
   - errors-ext ==0.4.2
-  - error-util ==0.0.1.2
   - ersatz ==0.4.8
-  - esqueleto ==3.0.0
+  - esqueleto ==3.3.1.1
   - etc ==0.4.1.0
   - eventful-core ==0.2.0
-  - eventful-memory ==0.2.0
-  - eventful-sql-common ==0.2.0
-  - eventful-sqlite ==0.2.0
   - eventful-test-helpers ==0.2.0
   - event-list ==0.1.2
-  - eventstore ==1.3.3
   - every ==0.0.1
   - exact-combinatorics ==0.2.0.9
   - exact-pi ==0.5.0.1
-  - exceptional ==0.3.0.0
+  - exception-hierarchy ==0.1.0.3
   - exception-mtl ==0.4.0.1
   - exceptions ==0.10.4
   - exception-transformers ==0.4.0.8
-  - executable-hash ==0.2.0.4
   - executable-path ==0.0.3.1
   - exit-codes ==1.0.0
   - exomizer ==1.0.0
   - expiring-cache-map ==0.0.6.1
   - explicit-exception ==0.1.10
   - exp-pairs ==0.2.0.0
+  - express ==0.1.2
+  - extended-reals ==0.2.3.0
+  - extensible-effects ==5.0.0.1
   - extensible-exceptions ==0.1.1.4
-  - extra ==1.6.18
+  - extra ==1.6.20
   - extractable-singleton ==0.0.1
-  - extrapolate ==0.3.3
+  - extrapolate ==0.4.1
   - fail ==4.9.0.0
   - failable ==1.2.4.0
-  - fakedata ==0.2.2
+  - fakedata ==0.5.0
   - farmhash ==0.1.0.5
-  - fast-builder ==0.1.2.0
-  - fast-digits ==0.2.1.0
-  - fast-logger ==2.4.17
+  - fast-digits ==0.3.0.0
+  - fast-logger ==3.0.1
   - fast-math ==1.0.2
   - fb ==2.0.0
-  - fclabels ==2.0.4
   - feature-flags ==0.1.0.1
-  - fedora-dists ==1.0.1
-  - feed ==1.2.0.1
+  - fedora-dists ==1.1.2
+  - fedora-haskell-tools ==0.9
+  - feed ==1.3.0.0
   - FenwickTree ==0.1.2.1
   - fft ==0.1.8.6
   - fgl ==5.7.0.2
-  - fib ==0.1
   - filecache ==0.4.1
   - file-embed ==0.0.11.1
   - file-embed-lzma ==0
   - filelock ==0.1.1.4
   - filemanip ==0.3.6.3
-  - file-modules ==0.1.2.4
   - filepattern ==0.1.1
   - fileplow ==0.1.0.0
-  - filter-logger ==0.6.0.0
   - filtrable ==0.1.3.0
   - fin ==0.1.1
   - FindBin ==0.0.5
   - fingertree ==0.1.4.2
   - finite-typelits ==0.1.4.2
-  - first-class-families ==0.5.0.0
+  - first-class-families ==0.7.0.0
   - first-class-patterns ==0.3.2.5
   - fitspec ==0.4.7
   - fixed ==0.3
@@ -709,14 +742,11 @@ default-package-overrides:
   - flac-picture ==0.1.2
   - flags-applicative ==0.1.0.2
   - flat-mcmc ==1.5.1
-  - flay ==0.4
-  - flexible-defaults ==0.0.3
   - FloatingHex ==0.4
   - floatshow ==0.2.4
   - flow ==1.0.19
+  - flush-queue ==1.0.0
   - fmlist ==0.9.3
-  - fmt ==0.6.1.2
-  - fmt-for-rio ==1.0.0.0
   - fn ==0.3.0.2
   - focus ==1.0.1.3
   - focuslist ==0.1.0.2
@@ -729,18 +759,19 @@ default-package-overrides:
   - FontyFruity ==0.5.3.5
   - force-layout ==0.4.0.6
   - foreign-store ==0.2
+  - ForestStructures ==0.0.1.0
   - forkable-monad ==0.2.0.3
   - forma ==1.1.3
-  - format-numbers ==0.1.0.0
+  - format-numbers ==0.1.0.1
   - formatting ==6.3.7
   - foundation ==0.0.25
   - free ==5.1.3
+  - free-categories ==0.1.0.0
   - freenect ==1.2.1
   - freer-simple ==1.2.1.1
   - freetype2 ==0.1.2
   - free-vl ==0.1.4
   - friendly-time ==0.4.1
-  - frisby ==0.2.2
   - from-sum ==0.2.3.0
   - frontmatter ==0.1.0.2
   - fsnotify ==0.3.0.1
@@ -748,101 +779,106 @@ default-package-overrides:
   - funcmp ==1.9
   - function-builder ==0.3.0.1
   - functor-classes-compat ==1
-  - functor-combinators ==0.1.1.1
-  - fused-effects ==0.5.0.1
+  - fused-effects ==1.0.0.1
+  - fusion-plugin ==0.1.1
+  - fusion-plugin-types ==0.1.0
   - fuzzcheck ==0.1.1
+  - fuzzy ==0.1.0.0
   - fuzzy-dates ==0.1.1.1
-  - fuzzyset ==0.1.1
-  - galois-field ==0.3.0
+  - fuzzyset ==0.2.0
+  - fuzzy-time ==0.1.0.0
   - gauge ==0.2.5
-  - gc ==0.0.3
   - gd ==3000.7.3
   - gdp ==0.0.3.0
   - general-games ==1.1.1
   - generic-arbitrary ==0.1.0
+  - generic-constraints ==1.1.1.1
   - generic-data ==0.7.0.0
-  - generic-data-surgery ==0.2.0.0
-  - generic-deriving ==1.12.4
-  - generic-lens ==1.1.0.0
+  - generic-deriving ==1.13.1
+  - generic-lens ==1.2.0.1
+  - generic-monoid ==0.1.0.0
   - GenericPretty ==1.2.2
-  - generic-random ==1.2.0.0
-  - generics-eot ==0.4.0.1
-  - generics-mrsop ==2.1.0
-  - generics-sop ==0.4.0.1
+  - generic-random ==1.3.0.0
+  - generics-sop ==0.5.0.0
   - generics-sop-lens ==0.2
-  - genvalidity ==0.8.0.0
+  - genvalidity ==0.10.0.1
   - genvalidity-aeson ==0.3.0.0
-  - genvalidity-bytestring ==0.5.0.0
-  - genvalidity-containers ==0.6.0.0
-  - genvalidity-hspec ==0.7.0.0
-  - genvalidity-hspec-aeson ==0.3.1.0
-  - genvalidity-hspec-binary ==0.2.0.3
-  - genvalidity-hspec-cereal ==0.2.0.3
-  - genvalidity-hspec-hashable ==0.2.0.4
-  - genvalidity-hspec-optics ==0.1.1.1
-  - genvalidity-path ==0.3.0.3
-  - genvalidity-property ==0.4.0.0
-  - genvalidity-scientific ==0.2.1.0
-  - genvalidity-text ==0.6.0.0
-  - genvalidity-time ==0.2.1.1
-  - genvalidity-unordered-containers ==0.3.0.0
-  - genvalidity-uuid ==0.1.0.2
-  - genvalidity-vector ==0.3.0.0
+  - genvalidity-bytestring ==0.5.0.1
+  - genvalidity-containers ==0.8.0.2
+  - genvalidity-criterion ==0.0.0.0
+  - genvalidity-hspec ==0.7.0.4
+  - genvalidity-hspec-aeson ==0.3.1.1
+  - genvalidity-hspec-binary ==0.2.0.4
+  - genvalidity-hspec-cereal ==0.2.0.4
+  - genvalidity-hspec-hashable ==0.2.0.5
+  - genvalidity-hspec-optics ==0.1.1.2
+  - genvalidity-hspec-persistent ==0.0.0.1
+  - genvalidity-mergeful ==0.1.0.0
+  - genvalidity-mergeless ==0.1.0.0
+  - genvalidity-path ==0.3.0.4
+  - genvalidity-property ==0.5.0.1
+  - genvalidity-scientific ==0.2.1.1
+  - genvalidity-text ==0.7.0.2
+  - genvalidity-time ==0.3.0.0
+  - genvalidity-typed-uuid ==0.0.0.1
+  - genvalidity-unordered-containers ==0.3.0.1
+  - genvalidity-uuid ==0.1.0.3
+  - genvalidity-vector ==0.3.0.1
   - geojson ==4.0.1
   - getopt-generics ==0.13.0.4
   - ghc-compact ==0.1.0.0
   - ghc-core ==0.5.6
-  - ghc-exactprint ==0.6.1
-  - ghcid ==0.7.7
+  - ghc-exactprint ==0.6.2
+  - ghcid ==0.8.1
   - ghci-hexcalc ==0.1.1.0
   - ghcjs-codemirror ==0.0.0.2
-  - ghc-lib ==8.8.0.20190424
-  - ghc-lib-parser ==8.8.0.20190424
-  - ghc-parser ==0.2.1.0
+  - ghc-lib ==8.8.2.20200205
+  - ghc-lib-parser ==8.8.2.20200205
+  - ghc-lib-parser-ex ==8.8.5.2
   - ghc-paths ==0.1.0.12
   - ghc-prof ==1.4.1.6
-  - ghc-syntax-highlighter ==0.0.4.1
-  - ghc-tcplugins-extra ==0.3.2
-  - ghc-typelits-extra ==0.3.2
-  - ghc-typelits-knownnat ==0.6
-  - ghc-typelits-natnormalise ==0.6.2
+  - ghc-source-gen ==0.3.0.0
+  - ghc-syntax-highlighter ==0.0.5.0
+  - ghc-tcplugins-extra ==0.4
+  - ghc-typelits-extra ==0.3.3
+  - ghc-typelits-knownnat ==0.7.2
+  - ghc-typelits-natnormalise ==0.7.1
+  - ghc-typelits-presburger ==0.3.0.0
   - ghost-buster ==0.1.1.0
   - gi-atk ==2.0.21
   - gi-cairo ==1.0.23
+  - gi-dbusmenu ==0.4.7
+  - gi-dbusmenugtk3 ==0.4.8
   - gi-gdk ==3.0.22
   - gi-gdkpixbuf ==2.0.23
-  - gi-gio ==2.0.25
+  - gi-gdkx11 ==3.0.9
+  - gi-gio ==2.0.26
   - gi-glib ==2.0.23
   - gi-gobject ==2.0.22
+  - gi-graphene ==1.0.1
   - gi-gtk ==3.0.32
-  - gi-gtk-hs ==0.3.8.0
-  - gi-gtksource ==3.0.22
-  - gi-javascriptcore ==4.0.21
-  - ginger ==0.9.1.0
+  - gi-gtk-hs ==0.3.8.1
   - gingersnap ==0.3.1.0
   - gi-pango ==1.0.22
+  - giphy-api ==0.7.0.0
   - githash ==0.1.3.3
-  - github-release ==1.2.5
+  - github-rest ==1.0.1
   - github-types ==0.2.1
-  - github-webhooks ==0.10.1
+  - gitlab-haskell ==0.1.5
   - gitrev ==1.3.1
-  - gi-vte ==2.91.25
+  - gi-xlib ==2.0.8
   - gl ==0.9
   - glabrous ==2.0.1
-  - glaze ==0.3.0.1
-  - glazier ==1.0.0.0
-  - GLFW-b ==3.2.1.1
+  - GLFW-b ==3.3.0.0
   - Glob ==0.10.0
   - gloss ==1.13.1.1
-  - gloss-algorithms ==1.13.0.1
-  - gloss-examples ==1.13.0.2
-  - gloss-raster ==1.13.1.1
   - gloss-rendering ==1.13.1.1
   - GLURaw ==2.0.0.4
   - GLUT ==2.7.0.15
+  - gluturtle ==0.0.58.1
   - gnuplot ==0.5.6.1
   - google-isbn ==1.0.3
-  - google-oauth2-jwt ==0.3.2
+  - gothic ==0.1.3
   - gpolyline ==0.1.0.1
   - graph-core ==0.3.0.0
   - graphite ==0.10.0.1
@@ -850,35 +886,20 @@ default-package-overrides:
   - graphviz ==2999.20.0.4
   - graph-wrapper ==0.2.6.0
   - gravatar ==0.8.0
-  - graylog ==0.1.0.1
-  - greskell ==0.2.3.1
+  - greskell ==1.0.0.1
   - greskell-core ==0.1.3.1
   - greskell-websocket ==0.1.2.1
   - groom ==0.1.2.1
-  - groundhog ==0.10.0
-  - groundhog-inspector ==0.10.0
-  - groundhog-mysql ==0.10
-  - groundhog-postgresql ==0.10
-  - groundhog-sqlite ==0.10.0
-  - groundhog-th ==0.10.2
   - group-by-date ==0.1.0.3
-  - grouped-list ==0.2.2.1
   - groups ==0.4.1.0
   - guarded-allocation ==0.0.1
-  - gym-http-api ==0.1.0.1
-  - H ==0.9.0.1
-  - hackage-db ==2.0.1
-  - hackage-security ==0.5.3.0
-  - haddock-library ==1.7.0
-  - hadolint ==1.17.3
+  - hackage-db ==2.1.0
+  - haddock-library ==1.8.0
   - half ==0.3
-  - hamilton ==0.1.0.3
   - hamtsolo ==1.0.3
   - HandsomeSoup ==0.4.2
-  - hapistrano ==0.3.10.0
   - happy ==1.19.12
-  - hasbolt ==0.1.4.1
-  - hashable ==1.2.7.0
+  - hashable ==1.3.0.0
   - hashable-time ==0.2.0.2
   - hashids ==1.0.2.4
   - hashmap ==1.3.3
@@ -887,43 +908,38 @@ default-package-overrides:
   - haskell-gi ==0.23.0
   - haskell-gi-base ==0.23.0
   - haskell-gi-overloading ==1.0
-  - haskell-lexer ==1.0.2
-  - haskell-lsp ==0.15.0.0
-  - haskell-lsp-types ==0.15.0.0
+  - haskell-import-graph ==1.0.4
+  - haskell-lexer ==1.1
+  - haskell-lsp ==0.20.0.1
+  - haskell-lsp-types ==0.20.0.0
   - haskell-names ==0.9.7
-  - haskell-spacegoo ==0.2.0.1
-  - haskell-src ==1.0.3.0
-  - haskell-src-exts ==1.21.1
+  - haskell-src ==1.0.3.1
+  - haskell-src-exts ==1.22.0
   - haskell-src-exts-util ==0.2.5
-  - haskell-src-meta ==0.8.3
+  - haskell-src-meta ==0.8.5
   - haskey-btree ==0.3.0.1
-  - haskintex ==0.8.0.0
-  - haskoin-core ==0.9.8
+  - haskoin-core ==0.10.1
+  - haskoin-node ==0.9.16
   - hasql ==1.4.1
   - hasql-optparse-applicative ==0.3.0.5
   - hasql-pool ==0.5.1
-  - hasql-transaction ==0.7.2
+  - hasql-transaction ==1.0.0.1
   - hasty-hamiltonian ==1.3.2
-  - HaTeX ==3.21.0.0
-  - haxl ==2.1.2.0
-  - hbeanstalk ==0.2.4
-  - HCodecs ==0.5.1
+  - HaXml ==1.25.5
+  - haxr ==3000.11.4
   - hdaemonize ==0.5.6
-  - HDBC ==2.4.0.3
-  - HDBC-mysql ==0.7.1.0
-  - HDBC-session ==0.1.2.0
   - heap ==1.0.4
   - heaps ==0.3.6.1
+  - heart-core ==0.1.1
   - hebrew-time ==0.1.2
   - hedgehog ==1.0.2
-  - hedgehog-corpus ==0.1.0
+  - hedgehog-corpus ==0.2.0
   - hedgehog-fn ==1.0
+  - hedgehog-quickcheck ==0.1.1
   - hedis ==0.12.11
-  - hedn ==0.2.0.1
   - here ==1.2.13
   - heredoc ==0.2.0.0
   - heterocephalus ==1.0.5.3
-  - hex ==0.1.2
   - hexml ==0.3.4
   - hexml-lens ==0.2.1
   - hexpat ==0.20.13
@@ -931,7 +947,7 @@ default-package-overrides:
   - hformat ==0.3.3.1
   - hfsevents ==0.1.6
   - hidapi ==0.1.5
-  - hidden-char ==0.1.0.2
+  - hie-bios ==0.4.0
   - hi-file-parser ==0.1.0.0
   - higher-leveldb ==0.5.0.2
   - highlighting-kate ==0.6.4
@@ -939,21 +955,17 @@ default-package-overrides:
   - hinotify ==0.4
   - hint ==0.9.0.2
   - hjsmin ==0.2.0.4
-  - hkgr ==0.2.4
+  - hkgr ==0.2.4.1
+  - hlibcpuid ==0.2.0
   - hlibgit2 ==0.18.0.16
-  - hlibsass ==0.1.8.0
   - hmatrix ==0.20.0.0
-  - hmatrix-backprop ==0.1.3.0
   - hmatrix-gsl ==0.19.0.1
   - hmatrix-gsl-stats ==0.4.1.8
   - hmatrix-morpheus ==0.1.1.2
-  - hmatrix-vector-sized ==0.1.2.0
-  - hmm-lapack ==0.4
+  - hmatrix-vector-sized ==0.1.3.0
   - hmpfr ==0.4.4
-  - hoauth2 ==1.8.9
-  - Hoed ==0.5.1
-  - hOpenPGP ==2.8.5
-  - hopenpgp-tools ==0.21.3
+  - hnock ==0.4.0
+  - hoauth2 ==1.11.0
   - hopfli ==0.2.2.1
   - hosc ==0.17
   - hostname ==1.0
@@ -961,39 +973,28 @@ default-package-overrides:
   - hourglass ==0.2.12
   - hourglass-orphans ==0.1.0.0
   - hp2pretty ==0.9
-  - hpack ==0.31.2
-  - hpack-dhall ==0.5.2
-  - hquantlib-time ==0.0.4.1
+  - hpc-codecov ==0.1.0.0
   - hreader ==1.1.0
   - hreader-lens ==0.1.3.0
   - hruby ==0.3.8
-  - hsass ==0.8.0
-  - hs-bibutils ==6.7.0.0
+  - hs-bibutils ==6.8.0.0
   - hsc2hs ==0.68.6
-  - hschema ==0.0.1.1
-  - hschema-aeson ==0.0.1.1
-  - hschema-prettyprinter ==0.0.1.1
-  - hschema-quickcheck ==0.0.1.1
   - hscolour ==1.24.4
-  - hsdev ==0.3.2.3
   - hsdns ==1.8
   - hsebaysdk ==0.4.0.0
   - hsemail ==2.2.0
-  - HSet ==0.0.1
   - hset ==2.2.0
-  - hsexif ==0.6.1.6
   - hs-functors ==0.1.6.0
   - hs-GeoIP ==0.3
   - hsini ==0.5.1.2
-  - hsinstall ==2.2
+  - hsinstall ==2.6
   - HSlippyMap ==3.0.1
-  - hslogger ==1.2.12
+  - hslogger ==1.3.1.0
   - hslua ==1.0.3.2
   - hslua-aeson ==1.0.0
   - hslua-module-system ==0.2.1
   - hslua-module-text ==0.2.1
   - HsOpenSSL ==0.11.4.17
-  - HsOpenSSL-x509-system ==0.1.0.3
   - hsp ==0.10.0
   - hspec ==2.7.1
   - hspec-attoparsec ==0.1.0.2
@@ -1004,27 +1005,26 @@ default-package-overrides:
   - hspec-expectations ==0.8.2
   - hspec-expectations-lifted ==0.10.0
   - hspec-expectations-pretty-diff ==0.7.2.5
+  - hspec-golden ==0.1.0.1
   - hspec-golden-aeson ==0.7.0.0
   - hspec-leancheck ==0.0.3
-  - hspec-megaparsec ==2.0.1
+  - hspec-megaparsec ==2.1.0
   - hspec-meta ==2.6.0
   - hspec-need-env ==0.1.0.4
-  - hspec-pg-transact ==0.1.0.2
+  - hspec-parsec ==0
   - hspec-smallcheck ==0.5.2
-  - hspec-wai ==0.9.2
-  - hspec-wai-json ==0.9.2
+  - hspec-wai ==0.10.1
   - hs-php-session ==0.0.9.3
   - hsshellscript ==3.4.5
-  - hstatsd ==0.1
   - HStringTemplate ==0.8.7
   - HSvm ==0.1.1.3.22
-  - HsYAML ==0.1.2.0
+  - HsYAML ==0.2.1.0
+  - HsYAML-aeson ==0.2.0.0
   - hsyslog ==5.0.2
   - htaglib ==1.2.0
-  - HTF ==0.13.2.5
+  - HTF ==0.14.0.3
   - html ==1.0.1.2
   - html-conduit ==1.3.2.1
-  - html-email-validate ==0.2.0.0
   - html-entities ==1.1.4.3
   - html-entity-map ==0.1.0.0
   - htoml ==1.0.0.3
@@ -1032,6 +1032,8 @@ default-package-overrides:
   - HTTP ==4000.3.14
   - http-api-data ==0.4.1.1
   - http-client ==0.6.4
+  - http-client-openssl ==0.3.0.0
+  - http-client-overrides ==0.1.1.0
   - http-client-tls ==0.3.5.3
   - http-common ==0.8.2.0
   - http-conduit ==2.3.7.3
@@ -1049,34 +1051,37 @@ default-package-overrides:
   - HUnit-approx ==1.1.1.1
   - hunit-dejafu ==2.0.0.1
   - hvect ==0.4.0.0
-  - hvega ==0.3.0.1
-  - hw-balancedparens ==0.2.0.4
+  - hvega ==0.5.0.0
+  - hw-balancedparens ==0.3.0.4
   - hw-bits ==0.7.1.0
   - hw-conduit ==0.2.0.6
   - hw-conduit-merges ==0.2.0.0
   - hw-diagnostics ==0.0.0.7
-  - hw-dsv ==0.3.5
+  - hw-dsv ==0.4.0
   - hweblib ==0.6.3
-  - hw-eliasfano ==0.1.1.0
+  - hw-eliasfano ==0.1.1.1
   - hw-excess ==0.2.2.3
   - hw-fingertree ==0.1.1.1
   - hw-fingertree-strict ==0.1.1.3
   - hw-hedgehog ==0.1.0.5
   - hw-hspec-hedgehog ==0.1.0.9
   - hw-int ==0.0.0.4
-  - hw-ip ==2.3.4.2
-  - hw-json ==1.0.0.2
+  - hw-ip ==2.4.1.0
+  - hw-json ==1.3.1.1
   - hw-json-simd ==0.1.0.4
+  - hw-json-simple-cursor ==0.1.0.2
+  - hw-json-standard-cursor ==0.2.1.2
   - hw-mquery ==0.2.0.2
-  - hw-packed-vector ==0.0.0.3
+  - hw-packed-vector ==0.2.0.1
   - hw-parser ==0.1.0.2
   - hw-prim ==0.6.2.39
-  - hw-rankselect ==0.13.0.0
+  - hw-rankselect ==0.13.3.2
   - hw-rankselect-base ==0.3.3.0
   - hw-simd ==0.1.1.5
   - hw-streams ==0.0.0.12
   - hw-string-parse ==0.0.0.4
   - hw-succinct ==0.1.0.1
+  - hw-xml ==0.5.0.0
   - hxt ==9.3.1.18
   - hxt-charproperties ==9.4.0.0
   - hxt-css ==0.1.0.3
@@ -1087,57 +1092,48 @@ default-package-overrides:
   - hxt-tagsoup ==9.1.4
   - hxt-unicode ==9.0.2.4
   - hybrid-vectors ==0.2.2
-  - hyper ==0.1.0.3
   - hyperloglog ==0.4.3
   - hyphenation ==0.8
-  - hyraxAbif ==0.2.3.15
+  - hyraxAbif ==0.2.3.21
   - iconv ==0.4.1.3
   - identicon ==0.2.2
   - ieee754 ==0.8.0
   - if ==0.1.0.0
   - iff ==0.0.6
-  - ihaskell ==0.10.0.2
   - ihs ==0.1.0.3
-  - ilist ==0.3.1.0
+  - ilist ==0.4.0.0
   - imagesize-conduit ==1.1
   - Imlib ==0.1.2
   - immortal ==0.3
   - include-file ==0.1.0.4
-  - incremental-parser ==0.3.3
-  - indentation-core ==0.0.0.2
-  - indentation-parsec ==0.0.0.2
+  - incremental-parser ==0.4
   - indents ==0.5.0.1
   - indexed ==0.1.3
   - indexed-list-literals ==0.2.1.2
+  - indexed-profunctors ==0.1
   - infer-license ==0.2.0
   - inflections ==0.4.0.5
-  - influxdb ==1.7.1.1
+  - influxdb ==1.7.1.2
   - ini ==0.4.1
   - inj ==1.0
-  - inline-c ==0.7.0.1
-  - inline-c-cpp ==0.3.0.3
-  - inline-r ==0.10.2
-  - inliterate ==0.1.0
-  - insert-ordered-containers ==0.2.2
+  - inline-c ==0.9.0.0
+  - insert-ordered-containers ==0.2.3
   - inspection-testing ==0.4.2.2
   - instance-control ==0.1.2.0
   - int-cast ==0.2.0.0
   - integer-logarithms ==1.0.3
+  - integer-roots ==1.0
   - integration ==0.2.1
   - intern ==0.9.2
   - interpolate ==0.2.0
-  - interpolatedstring-perl6 ==1.0.2
-  - interpolatedstring-qq2 ==0.1.0.0
   - interpolation ==0.1.1.1
   - interpolator ==1.0.0
   - IntervalMap ==0.6.1.1
-  - intervals ==0.8.1
-  - intro ==0.5.2.1
+  - intervals ==0.9.1
+  - intro ==0.6.0.1
   - intset-imperative ==0.1.0.0
   - invariant ==0.5.3
   - invertible ==0.2.0.5
-  - invertible-grammar ==0.1.2
-  - io-choice ==0.0.7
   - io-machine ==0.2.0.0
   - io-manager ==0.1.0.2
   - io-memoize ==1.1.1.0
@@ -1145,7 +1141,7 @@ default-package-overrides:
   - io-storage ==0.3
   - io-streams ==1.5.1.0
   - io-streams-haproxy ==1.0.1.0
-  - ip ==1.5.1
+  - ip ==1.7.1
   - ip6addr ==1.0.1
   - iproute ==1.7.8
   - IPv6Addr ==1.1.3
@@ -1160,25 +1156,22 @@ default-package-overrides:
   - iso639 ==0.1.0.3
   - iso8601-time ==0.1.5
   - iterable ==3.0
-  - ixset-typed ==0.4.0.1
   - ix-shapable ==0.1.0
   - jack ==0.7.1.4
-  - jose ==0.8.2.0
+  - jira-wiki-markup ==1.0.0
   - jose-jwt ==0.8.0
   - js-dgtable ==0.5.2
   - js-flot ==0.8.3
   - js-jquery ==3.3.1
-  - json ==0.9.3
   - json-alt ==1.0.0
   - json-feed ==1.0.8
-  - jsonpath ==0.1.0.2
+  - jsonpath ==0.2.0.0
   - json-rpc ==1.0.1
-  - json-rpc-client ==0.2.5.0
   - json-rpc-generic ==0.2.1.5
-  - json-rpc-server ==0.2.6.0
   - JuicyPixels ==3.3.4
   - JuicyPixels-extra ==0.4.1
   - JuicyPixels-scale-dct ==0.1.2
+  - junit-xml ==0.1.0.0
   - justified-containers ==0.3.0.0
   - jwt ==0.10.0
   - kan-extensions ==5.2
@@ -1190,35 +1183,31 @@ default-package-overrides:
   - keycode ==0.2.2
   - keys ==3.12.3
   - kind-apply ==0.3.2.0
-  - kind-generics ==0.3.0.0
-  - kind-generics-th ==0.1.1.0
-  - kleene ==0.1
+  - kind-generics ==0.4.0.0
+  - kind-generics-th ==0.2.1.0
   - kmeans ==0.1.3
   - koofr-client ==1.0.0.3
-  - kraken ==0.1.0
+  - kubernetes-webhook-haskell ==0.2.0.0
   - l10n ==0.1.0.1
   - labels ==0.3.3
   - lackey ==1.0.11
-  - lambdabot-core ==5.2
-  - lambdabot-irc-plugins ==5.2
   - LambdaHack ==0.9.5.0
   - lame ==0.2.0
+  - language-avro ==0.1.0.0
   - language-c ==0.8.3
   - language-c-quote ==0.12.2.1
-  - language-docker ==8.0.2
-  - language-ecmascript ==0.19
   - language-haskell-extract ==0.2.4
   - language-java ==0.2.9
-  - language-javascript ==0.6.0.14
+  - language-javascript ==0.7.0.0
+  - language-protobuf ==1.0.1
   - language-puppet ==1.4.6.2
-  - lapack ==0.3.1
   - lapack-carray ==0.0.3
   - lapack-comfort-array ==0.0.0.1
   - lapack-ffi ==0.0.2
   - lapack-ffi-tools ==0.1.2.1
   - largeword ==1.2.5
   - latex ==0.1.0.4
-  - lattices ==2.0.1
+  - lattices ==2.0.2
   - lawful ==0.1.0.0
   - lazy-csv ==0.5.1
   - lazyio ==0.1.0.4
@@ -1227,56 +1216,46 @@ default-package-overrides:
   - leancheck-instances ==0.0.3
   - leapseconds-announced ==2017.1.0.1
   - learn-physics ==0.6.5
-  - lens ==4.17.1
+  - lens ==4.18.1
   - lens-action ==0.2.4
-  - lens-aeson ==1.0.2
+  - lens-aeson ==1.1
   - lens-datetime ==0.3
-  - lens-family ==1.2.3
-  - lens-family-core ==1.2.3
+  - lens-family ==2.0.0
+  - lens-family-core ==2.0.0
   - lens-family-th ==0.5.0.2
   - lens-misc ==0.0.2.0
-  - lens-process ==0.3.0.1
   - lens-properties ==4.11.1
   - lens-regex ==0.1.1
-  - lens-regex-pcre ==0.3.1.0
-  - lens-simple ==0.1.0.9
-  - lens-typelevel ==0.1.1.0
-  - lenz ==0.3.1.0
+  - lenz ==0.4.2.0
   - leveldb-haskell ==0.6.5
   - libffi ==0.1
   - libgit ==0.3.1
   - libgraph ==1.14
   - libmpd ==0.9.1.0
-  - liboath-hs ==0.0.1.1
-  - libraft ==0.5.0.0
   - libyaml ==0.1.2
   - LibZip ==1.0.1
-  - lifted-async ==0.10.0.4
+  - lifted-async ==0.10.0.5
   - lifted-base ==0.2.3.12
   - lift-generics ==0.1.3
-  - line ==4.0.1
   - linear ==1.20.9
-  - linear-circuit ==0.1.0.2
+  - linenoise ==0.3.1
   - linux-file-extents ==0.2.0.0
   - linux-namespaces ==0.1.3.0
   - List ==0.6.2
   - ListLike ==4.6.3
   - listsafe ==0.1.0.1
+  - list-singleton ==1.0.0.2
   - list-t ==1.0.4
   - ListTree ==0.2.3
-  - list-witnesses ==0.1.1.1
-  - llvm-hs ==8.0.0
-  - llvm-hs-pure ==8.0.0
+  - llvm-hs ==9.0.1
+  - llvm-hs-pure ==9.0.0
   - lmdb ==0.2.5
   - load-env ==0.2.1.0
-  - loc ==0.1.3.4
-  - locators ==0.2.4.4
   - loch-th ==0.2.2
   - lockfree-queue ==0.2.3.1
   - log-base ==0.8.0.0
-  - log-domain ==0.12
+  - log-domain ==0.13
   - logfloat ==0.13.3.3
-  - logger-thread ==0.1.0.2
   - logging-effect ==1.3.9
   - logging-facade ==0.3.0
   - logging-facade-syslog ==1
@@ -1285,17 +1264,12 @@ default-package-overrides:
   - loopbreaker ==0.1.1.1
   - lrucache ==1.2.0.1
   - lrucaching ==0.3.3
-  - lsp-test ==0.6.1.0
+  - lsp-test ==0.10.1.0
   - lucid ==2.9.12
   - lucid-extras ==0.2.2
-  - lxd-client-config ==0.1.0.1
   - lzma ==0.0.0.3
   - lzma-conduit ==1.2.1
-  - machines ==0.6.4
-  - machines-binary ==0.3.0.3
-  - machines-directory ==0.2.1.0
-  - machines-io ==0.2.0.13
-  - magico ==0.0.2.1
+  - machines ==0.7
   - mainland-pretty ==0.7.0.1
   - main-tester ==0.2.0.1
   - makefile ==1.1.0.0
@@ -1304,7 +1278,7 @@ default-package-overrides:
   - markdown-unlit ==0.5.0
   - markov-chain ==0.0.3.4
   - massiv ==0.4.5.0
-  - massiv-io ==0.1.9.0
+  - massiv-io ==0.2.0.0
   - massiv-test ==0.1.2
   - mathexpr ==0.3.0.0
   - math-functions ==0.3.3.0
@@ -1315,56 +1289,55 @@ default-package-overrides:
   - matrix-static ==0.2.1
   - maximal-cliques ==0.1.1
   - mbox ==0.3.4
-  - mbtiles ==0.6.0.0
+  - mbox-utility ==0.0.3.1
   - mcmc-types ==1.0.3
   - median-stream ==0.7.0.0
-  - megaparsec ==7.0.5
-  - megaparsec-tests ==7.0.5
-  - mega-sdist ==0.4.0.1
-  - memory ==0.14.18
+  - megaparsec ==8.0.0
+  - megaparsec-tests ==8.0.0
+  - membrain ==0.0.0.1
+  - memory ==0.15.0
   - MemoTrie ==0.6.10
-  - menshen ==0.0.3
   - mercury-api ==0.1.0.2
-  - merkle-tree ==0.1.1
+  - mergeful ==0.1.0.0
+  - mergeless ==0.2.0.2
   - mersenne-random-pure64 ==0.2.2.0
   - messagepack ==0.5.4
   - metrics ==0.4.1.1
   - mfsolve ==0.3.2.0
-  - microformats2-parser ==1.0.1.9
-  - microlens ==0.4.10
+  - microlens ==0.4.11.2
   - microlens-aeson ==2.3.0.4
   - microlens-contra ==0.1.0.2
-  - microlens-ghc ==0.4.10
-  - microlens-mtl ==0.1.11.1
-  - microlens-platform ==0.3.11
+  - microlens-ghc ==0.4.12
+  - microlens-mtl ==0.2.0.1
+  - microlens-platform ==0.4.1
   - microlens-process ==0.2.0.1
-  - microlens-th ==0.4.2.3
+  - microlens-th ==0.4.3.4
   - microspec ==0.2.1.3
   - microstache ==1.0.1.1
   - midair ==0.2.0.1
   - midi ==0.2.2.2
-  - midi-music-box ==0.0.1.1
   - mighty-metropolis ==1.2.0
   - mime-mail ==0.5.0
   - mime-mail-ses ==0.4.1
   - mime-types ==0.1.0.9
+  - mini-egison ==0.1.6
+  - minimal-configuration ==0.1.4
   - minimorph ==0.2.1.0
   - minio-hs ==1.5.2
   - miniutter ==0.5.0.0
   - mintty ==0.1.2
-  - miso ==1.2.0.0
+  - miso ==1.4.0.0
   - missing-foreign ==0.1.1
-  - MissingH ==1.4.1.0
   - mixed-types-num ==0.4.0.1
   - mltool ==0.2.0.1
   - mmap ==0.5.9
-  - mmark ==0.0.7.1
+  - mmark ==0.0.7.2
   - mmark-cli ==0.0.5.0
   - mmark-ext ==0.2.1.2
   - mmorph ==1.1.3
-  - mmtf ==0.1.3.1
   - mnist-idx ==0.1.2.8
   - mockery ==0.3.5
+  - mod ==0.1.1.0
   - modern-uri ==0.3.1.0
   - modular ==0.1.0.8
   - monad-control ==1.0.2.3
@@ -1376,10 +1349,8 @@ default-package-overrides:
   - monad-logger ==0.3.31
   - monad-logger-json ==0.1.0.0
   - monad-logger-prefix ==0.1.11
-  - monad-logger-syslog ==0.1.6.0
   - monad-loops ==0.4.3
   - monad-memo ==0.5.1
-  - monad-metrics ==0.2.1.4
   - monad-par ==0.3.5
   - monad-parallel ==0.7.2.3
   - monad-par-extras ==0.3.3
@@ -1387,30 +1358,27 @@ default-package-overrides:
   - monad-products ==4.0.1
   - MonadPrompt ==1.0.0.5
   - MonadRandom ==0.5.1.2
+  - monad-resumption ==0.1.4.0
   - monad-skeleton ==0.1.5
   - monad-st ==0.2.4.1
   - monads-tf ==0.1.0.3
   - monad-time ==0.3.1.0
   - monad-unlift ==0.2.0
   - monad-unlift-ref ==0.2.1
-  - mongoDB ==2.5.0.0
-  - monoidal-containers ==0.4.0.0
+  - mongoDB ==2.7.0.0
   - monoid-extras ==0.5.1
-  - monoid-subclasses ==0.4.6.1
+  - monoid-subclasses ==1.0.1
   - monoid-transformer ==0.0.4
   - mono-traversable ==1.0.15.1
   - mono-traversable-instances ==0.1.0.0
   - mono-traversable-keys ==0.1.0
   - more-containers ==0.2.2.0
+  - morpheus-graphql ==0.10.0
   - mountpoints ==1.0.2
-  - msgpack ==1.0.1.0
-  - msgpack-aeson ==0.1.0.0
-  - mtl ==2.2.2
   - mtl-compat ==0.2.2
   - mtl-prelude ==2.0.3.1
   - multiarg ==0.30.0.10
   - multimap ==1.2.1
-  - multipart ==0.1.3
   - multiset ==0.3.4.3
   - multistate ==0.8.0.2
   - murmur3 ==1.0.3
@@ -1418,20 +1386,18 @@ default-package-overrides:
   - MusicBrainz ==0.4.1
   - mustache ==2.3.1
   - mutable-containers ==0.3.4
-  - mwc-probability ==2.1.0
-  - mwc-probability-transition ==0.4
+  - mwc-probability ==2.2.0
   - mwc-random ==0.14.0.0
+  - mx-state-codes ==1.0.0.0
   - mysql ==0.1.7
-  - mysql-haskell ==0.8.4.2
-  - mysql-haskell-nem ==0.1.0.0
   - mysql-simple ==0.4.5
   - n2o ==0.11.1
   - nagios-check ==0.3.2
-  - named ==0.3.0.1
   - names-th ==0.3.0.0
   - nano-erl ==0.1.0.1
   - nanospec ==0.2.2
   - nats ==1.1.2
+  - natural-arithmetic ==0.1.2.0
   - natural-induction ==0.2.0.0
   - natural-sort ==0.1.2
   - natural-transformation ==0.4
@@ -1446,22 +1412,17 @@ default-package-overrides:
   - netwire ==5.0.3
   - netwire-input ==0.0.7
   - netwire-input-glfw ==0.0.10
-  - network ==2.8.0.1
-  - network-anonymous-i2p ==0.10.0
-  - network-attoparsec ==0.12.2
-  - network-bsd ==2.8.0.0
-  - network-byte-order ==0.1.3.0
+  - network ==3.1.1.1
+  - network-bsd ==2.8.1.0
+  - network-byte-order ==0.1.4.0
   - network-conduit-tls ==1.3.2
-  - network-house ==0.1.0.2
   - network-info ==0.2.0.10
   - network-ip ==0.3.0.3
-  - network-messagepack-rpc ==0.1.2.0
-  - network-multicast ==0.3.2
   - network-simple ==0.4.5
-  - network-simple-tls ==0.3.2
+  - network-simple-tls ==0.4
   - network-transport ==0.5.4
   - network-transport-composed ==0.2.1
-  - network-uri ==2.6.2.0
+  - network-uri ==2.6.3.0
   - newtype ==0.2.2.0
   - newtype-generics ==0.5.4
   - nicify-lib ==1.0.1
@@ -1471,9 +1432,10 @@ default-package-overrides:
   - nonce ==1.0.7
   - nondeterminism ==1.4
   - non-empty ==0.3.2
-  - nonempty-containers ==0.3.1.0
+  - nonempty-containers ==0.3.3.0
   - nonemptymap ==0.0.6.0
   - non-empty-sequence ==0.2.0.4
+  - nonempty-vector ==0.2.0.1
   - non-negative ==0.1.2
   - not-gloss ==0.7.7.0
   - no-value ==1.0.0.0
@@ -1483,18 +1445,14 @@ default-package-overrides:
   - numbers ==3000.2.0.2
   - numeric-extras ==0.1
   - numeric-prelude ==0.4.3.1
-  - numhask ==0.3.1
+  - numhask ==0.4.0
   - NumInstances ==1.4
   - numtype-dk ==0.5.0.2
   - nuxeo ==0.3.2
-  - nvim-hs ==2.1.0.2
-  - nvim-hs-contrib ==2.0.0.0
-  - nvvm ==0.9.0.0
   - oauthenticated ==0.2.1.0
   - ObjectName ==1.1.0.1
-  - oblivious-transfer ==0.1.0
+  - o-clock ==1.1.0
   - odbc ==0.2.2
-  - oeis ==0.3.10
   - oeis2 ==1.0.3
   - ofx ==0.4.4.0
   - old-locale ==1.0.0.7
@@ -1514,106 +1472,95 @@ default-package-overrides:
   - openpgp-asciiarmor ==0.1.2
   - opensource ==0.1.1.0
   - openssl-streams ==1.2.2.0
-  - open-witness ==0.4.0.1
+  - opentelemetry ==0.0.0.2
   - operational ==0.2.3.5
   - operational-class ==0.3.0.0
+  - optics ==0.2
+  - optics-core ==0.2
+  - optics-extra ==0.2
+  - optics-th ==0.2
+  - optics-vl ==0.2
   - optional-args ==1.0.2
   - options ==1.2.1.1
-  - optparse-applicative ==0.14.3.0
-  - optparse-enum ==1.0.0.0
+  - optparse-applicative ==0.15.1.0
   - optparse-generic ==1.3.1
   - optparse-simple ==0.1.1.2
   - optparse-text ==0.1.1.0
   - ordered-containers ==0.2.2
-  - oset ==0.4.0.1
+  - ormolu ==0.0.3.1
   - overhang ==1.0.0
   - packcheck ==0.4.2
   - pager ==0.1.1.0
   - pagination ==0.2.1
-  - pairing ==0.4.1
-  - palette ==0.3.0.2
-  - pandoc ==2.7.3
-  - pandoc-citeproc ==0.16.2
+  - pandoc ==2.9.1.1
+  - pandoc-citeproc ==0.16.4.1
   - pandoc-csv2table ==1.0.8
-  - pandoc-markdown-ghci-filter ==0.1.0.0
-  - pandoc-pyplot ==2.1.5.1
-  - pandoc-types ==1.17.6.1
-  - pantry ==0.1.1.2
+  - pandoc-plot ==0.2.1.0
+  - pandoc-pyplot ==2.3.0.1
+  - pandoc-types ==1.20
+  - papillon ==0.1.1.1
   - parallel ==3.2.2.0
   - parallel-io ==0.3.3
   - paripari ==0.6.0.1
   - parseargs ==0.2.0.9
-  - parsec ==3.1.14.0
   - parsec-class ==1.0.0.0
   - parsec-numbers ==0.1.0
   - parsec-numeric ==0.1.0.0
   - ParsecTools ==0.0.2.0
-  - parser-combinators ==1.1.0
-  - parser-combinators-tests ==1.1.0
+  - parser-combinators ==1.2.1
+  - parser-combinators-tests ==1.2.1
   - parsers ==0.12.10
   - partial-handler ==1.0.3
   - partial-isomorphisms ==0.2.2.1
-  - partial-semigroup ==0.5.1.1
-  - password ==0.1.0.1
-  - password-instances ==0.3.0.1
-  - path ==0.6.1
+  - password ==1.0.0.0
+  - password-instances ==1.0.0.0
+  - path ==0.7.0
   - path-extra ==0.2.0
-  - path-io ==1.4.2
+  - path-io ==1.6.0
   - path-pieces ==0.2.1
-  - path-text-utf8 ==0.0.1.2
   - pathtype ==0.8.1
   - pathwalk ==0.3.1.2
   - pattern-arrows ==0.0.2
-  - pcf-font ==0.2.2.0
-  - pcf-font-embed ==0.1.2.0
   - pcg-random ==0.1.3.6
   - pcre-heavy ==1.0.0.2
   - pcre-light ==0.4.1.0
   - pcre-utils ==0.1.8.1.1
   - pdfinfo ==1.5.4
   - peano ==0.1.0.1
-  - pedersen-commitment ==0.2.0
   - pem ==0.2.4
-  - pencil ==1.0.1
   - percent-format ==0.0.1
-  - peregrin ==0.3.0
   - perfect-hash-generator ==0.2.0.6
+  - perfect-vector-shuffle ==0.1.1.1
   - persist ==0.1.1.4
   - persistable-record ==0.6.0.4
-  - persistable-types-HDBC-pg ==0.0.3.5
-  - persistent ==2.9.2
-  - persistent-iproute ==0.2.4
-  - persistent-mysql ==2.9.0
-  - persistent-mysql-haskell ==0.5.2
+  - persistent ==2.10.5.2
+  - persistent-mysql ==2.10.2.3
   - persistent-pagination ==0.1.1.1
-  - persistent-postgresql ==2.9.1
-  - persistent-qq ==2.9.1
-  - persistent-sqlite ==2.9.3
-  - persistent-template ==2.6.0
-  - persistent-typed-db ==0.0.1.1
+  - persistent-postgresql ==2.10.1.2
+  - persistent-qq ==2.9.1.1
+  - persistent-sqlite ==2.10.6.2
+  - persistent-template ==2.8.2.3
+  - persistent-test ==2.0.3.1
+  - persistent-typed-db ==0.1.0.0
   - pg-harness-client ==0.6.0
-  - pg-harness-server ==0.6.2
   - pgp-wordlist ==0.1.0.3
-  - pg-transact ==0.1.2.0
+  - pg-transact ==0.3.1.1
   - phantom-state ==0.2.1.2
   - pid1 ==0.1.2.0
-  - pinboard ==0.10.1.4
   - pipes ==4.3.13
   - pipes-aeson ==0.4.1.8
   - pipes-attoparsec ==0.5.1.5
   - pipes-binary ==0.4.2
   - pipes-bytestring ==2.1.6
-  - pipes-category ==0.3.0.0
   - pipes-concurrency ==2.0.12
   - pipes-csv ==1.4.3
   - pipes-extras ==1.0.15
   - pipes-fastx ==0.3.0.0
-  - pipes-fluid ==0.6.0.1
   - pipes-group ==1.0.12
   - pipes-http ==1.0.6
-  - pipes-misc ==0.5.0.0
   - pipes-network ==0.6.5
-  - pipes-network-tls ==0.3
+  - pipes-network-tls ==0.4
+  - pipes-ordered-zip ==1.1.0
   - pipes-parse ==3.0.8
   - pipes-random ==1.0.0.5
   - pipes-safe ==2.3.2
@@ -1626,117 +1573,108 @@ default-package-overrides:
   - pointedlist ==0.6.1
   - pointless-fun ==1.1.0.6
   - poll ==0.0.0.1
-  - poly ==0.3.1.0
+  - poly ==0.3.3.0
   - poly-arity ==0.1.0
   - polynomials-bernstein ==1.1.2
-  - polyparse ==1.12.1
-  - polysemy ==1.0.0.0
-  - polysemy-plugin ==0.2.4.0
-  - polysemy-zoo ==0.5.0.1
+  - polyparse ==1.13
+  - polysemy ==1.2.3.0
   - pooled-io ==0.0.2.2
   - port-utils ==0.2.1.0
   - posix-paths ==0.2.1.6
   - possibly ==1.0.0.0
+  - postgres-options ==0.2.0.0
   - postgresql-binary ==0.12.2
   - postgresql-libpq ==0.9.4.2
   - postgresql-orm ==0.5.1
-  - postgresql-schema ==0.1.14
   - postgresql-simple ==0.6.2
-  - postgresql-simple-migration ==0.1.15.0
-  - postgresql-simple-queue ==1.0.1
-  - postgresql-simple-url ==0.2.1.0
-  - postgresql-transactional ==1.1.1
-  - postgresql-typed ==0.6.1.0
   - post-mess-age ==0.2.1.0
   - pptable ==0.3.0.0
   - pqueue ==1.4.1.2
   - prefix-units ==0.2.0
   - prelude-compat ==0.0.0.2
   - prelude-safeenum ==0.1.1.2
-  - present ==4.1.0
   - prettyclass ==1.0.0.0
   - pretty-class ==1.0.1.1
-  - pretty-hex ==1.0
-  - prettyprinter ==1.2.1.1
+  - pretty-hex ==1.1
+  - prettyprinter ==1.6.1
   - prettyprinter-ansi-terminal ==1.1.1.2
   - prettyprinter-compat-annotated-wl-pprint ==1
   - prettyprinter-compat-ansi-wl-pprint ==1.0.1
   - prettyprinter-compat-wl-pprint ==1.0.0.1
   - prettyprinter-convert-ansi-wl-pprint ==1.1
-  - pretty-show ==1.9.5
-  - pretty-simple ==2.2.0.1
+  - pretty-relative-time ==0.2.0.0
+  - pretty-show ==1.10
+  - pretty-simple ==3.2.2.0
   - pretty-sop ==0.2.0.3
   - pretty-types ==0.3.0.1
   - primes ==0.2.1.0
-  - primitive ==0.6.4.0
-  - primitive-extras ==0.7.1.1
-  - prim-uniq ==0.1.0.1
-  - probability ==0.2.6
+  - primitive ==0.7.0.0
+  - primitive-addr ==0.1.0.2
+  - primitive-extras ==0.8
+  - primitive-offset ==0.2.0.0
+  - primitive-unaligned ==0.1.1.1
+  - primitive-unlifted ==0.1.3.0
+  - print-console-colors ==0.1.0.0
   - process-extras ==0.7.4
   - product-isomorphic ==0.0.3.3
   - product-profunctors ==0.10.0.0
   - profiterole ==0.1
-  - profunctors ==5.3
+  - profunctors ==5.5.2
   - projectroot ==0.2.0.1
   - project-template ==0.2.0.1
   - prometheus-client ==1.0.0
   - promises ==0.3
   - prompt ==0.1.1.2
   - prospect ==0.1.0.0
-  - protobuf ==0.2.1.2
   - protobuf-simple ==0.1.1.0
-  - protocol-buffers ==2.4.13
-  - protocol-buffers-descriptor ==2.4.13
   - protocol-radius ==0.0.1.1
   - protocol-radius-test ==0.1.0.1
-  - proto-lens ==0.5.1.0
+  - proto-lens ==0.6.0.0
   - proto-lens-arbitrary ==0.1.2.8
   - proto-lens-optparse ==0.1.1.6
-  - proto-lens-protobuf-types ==0.5.0.0
-  - proto-lens-protoc ==0.5.0.0
-  - proto-lens-runtime ==0.5.0.0
-  - proto-lens-setup ==0.4.0.2
-  - protolude ==0.2.3
+  - proto-lens-protobuf-types ==0.6.0.0
+  - proto-lens-protoc ==0.6.0.0
+  - proto-lens-runtime ==0.6.0.0
+  - proto-lens-setup ==0.4.0.3
+  - protolude ==0.2.4
   - proxied ==0.3.1
-  - psql-helpers ==0.1.0.0
   - psqueues ==0.2.7.2
+  - publicsuffix ==0.20191003
+  - pulse-simple ==0.1.14
   - pureMD5 ==2.1.3
   - purescript-bridge ==0.13.0.0
-  - pure-zlib ==0.6.7
   - pushbullet-types ==0.4.1.0
   - pusher-http-haskell ==1.5.1.11
+  - PyF ==0.9.0.0
   - qchas ==1.1.0.1
   - qm-interpolated-string ==0.3.0.0
-  - qnap-decrypt ==0.3.5
   - qrcode-core ==0.9.2
   - qrcode-juicypixels ==0.8.0
   - quadratic-irrational ==0.1.0
   - QuasiText ==0.1.2.6
-  - quickbench ==1.0
   - QuickCheck ==2.13.2
   - quickcheck-arbitrary-adt ==0.3.1.0
   - quickcheck-assertions ==0.3.0
-  - quickcheck-classes ==0.6.1.0
+  - quickcheck-classes ==0.6.4.0
+  - quickcheck-classes-base ==0.6.0.0
   - quickcheck-instances ==0.3.22
   - quickcheck-io ==0.2.0
   - quickcheck-simple ==0.1.1.1
   - quickcheck-special ==0.1.0.6
-  - quickcheck-state-machine ==0.6.0
   - quickcheck-text ==0.1.2.1
   - quickcheck-transformer ==0.3.1
   - quickcheck-unicode ==1.0.1.0
   - radius ==0.6.1.0
-  - rainbow ==0.30.0.2
-  - rainbox ==0.20.0.0
+  - rainbow ==0.34.2.2
+  - rainbox ==0.24.4.0
+  - ral ==0.1
   - ramus ==0.1.2
   - rando ==0.0.0.4
   - random ==1.1
   - random-bytestring ==0.1.3.2
-  - random-fu ==0.2.7.3
   - random-shuffle ==0.0.4
-  - random-source ==0.3.0.6
   - random-tree ==0.6.0.5
-  - range ==0.2.1.1
+  - range ==0.3.0.2
   - Ranged-sets ==0.4.0
   - range-set-list ==0.1.3.1
   - rank1dynamic ==0.4.0
@@ -1746,61 +1684,50 @@ default-package-overrides:
   - ratel ==1.0.9
   - ratel-wai ==1.1.1
   - rattle ==0.1
-  - rattletrap ==9.0.7
   - rawfilepath ==0.2.4
   - rawstring-qm ==0.2.3.0
   - raw-strings-qq ==1.1
   - rcu ==0.2.4
   - rdf ==0.1.0.3
+  - rdtsc ==1.3.0.1
   - re2 ==0.3
   - readable ==0.3.1
   - read-editor ==0.1.0.2
   - read-env-var ==1.0.0.0
-  - reanimate ==0.1.8.0
-  - reanimate-svg ==0.9.3.1
-  - rebase ==1.3.1.1
+  - reanimate-svg ==0.9.8.0
+  - rebase ==1.4.1
   - record-dot-preprocessor ==0.2.2
   - record-hasfield ==1.0
   - records-sop ==0.1.0.3
   - recursion-schemes ==5.1.3
   - reducers ==3.12.3
   - refact ==0.3.0.2
-  - references ==0.3.3.1
+  - ref-fd ==0.4.0.2
   - reflection ==2.1.5
   - RefSerialize ==0.4.0
-  - regex ==1.0.2.0
+  - regex ==1.1.0.0
   - regex-applicative ==0.3.3.1
-  - regex-applicative-text ==0.1.0.1
-  - regex-base ==0.93.2
-  - regex-compat ==0.95.1
+  - regex-base ==0.94.0.0
+  - regex-compat ==0.95.2.0
   - regex-compat-tdfa ==0.95.1.4
-  - regex-pcre ==0.94.4
-  - regex-pcre-builtin ==0.94.5.8.8.35
-  - regex-pcre-text ==0.94.0.1
-  - regex-posix ==0.95.2
-  - regex-tdfa ==1.2.3.2
-  - regex-tdfa-text ==1.0.0.3
-  - regex-with-pcre ==1.0.2.0
-  - registry ==0.1.7.0
+  - regex-pcre ==0.95.0.0
+  - regex-pcre-builtin ==0.95.1.1.8.43
+  - regex-posix ==0.96.0.0
+  - regex-tdfa ==1.3.1.0
+  - regex-with-pcre ==1.1.0.0
   - reinterpret-cast ==0.1.0
   - relapse ==1.0.0.0
   - relational-query ==0.12.2.2
-  - relational-query-HDBC ==0.7.2.0
-  - relational-record ==0.2.2.0
   - relational-schemas ==0.1.7.0
-  - relude ==0.5.0
+  - relude ==0.6.0.0
   - renderable ==0.2.0.1
-  - repa ==3.4.1.4
-  - repa-algorithms ==3.4.1.3
-  - repa-io ==3.4.1.1
-  - replace-attoparsec ==1.0.3.0
-  - replace-megaparsec ==1.1.5.0
-  - repline ==0.2.1.0
-  - req ==2.1.0
+  - replace-attoparsec ==1.2.0.0
+  - replace-megaparsec ==1.2.1.0
+  - repline ==0.2.2.0
+  - req ==3.1.0
   - req-conduit ==1.0.0
-  - require ==0.4.3
-  - rerebase ==1.3.1.1
-  - resistor-cube ==0.0.1.2
+  - rerebase ==1.4.1
+  - resolv ==0.1.1.3
   - resource-pool ==0.2.3.2
   - resourcet ==1.2.2
   - result ==0.2.6.0
@@ -1809,51 +1736,45 @@ default-package-overrides:
   - rev-state ==0.1.2
   - rfc1751 ==0.1.2
   - rfc5051 ==0.1.0.4
-  - rg ==1.4.0.0
-  - rhine ==0.5.1.0
-  - rhine-gloss ==0.5.1.0
   - rigel-viz ==0.2.0.0
-  - rio ==0.1.13.0
+  - rio ==0.1.14.0
   - rio-orphans ==0.1.1.0
   - rio-prettyprint ==0.1.0.0
   - roc-id ==0.1.0.0
   - rocksdb-haskell ==1.0.1
-  - rocksdb-query ==0.2.0
+  - rocksdb-query ==0.3.1
   - roles ==0.2.0.0
   - rope-utf16-splay ==0.3.1.0
   - rosezipper ==0.2
   - rot13 ==0.2.0.1
-  - rpmbuild-order ==0.2.1
-  - RSA ==2.3.1
+  - rpmbuild-order ==0.3
+  - RSA ==2.4.1
   - runmemo ==1.0.0.1
-  - rvar ==0.2.0.3
-  - s3-signer ==0.5.0.0
+  - run-st ==0.1.1.0
   - safe ==0.3.18
-  - safecopy ==0.9.4.3
+  - safecopy ==0.10.2
+  - safe-decimal ==0.2.0.0
   - safe-exceptions ==0.1.7.0
   - safe-exceptions-checked ==0.1.0
   - safe-foldable ==0.1.0.0
   - safeio ==0.0.5.0
-  - safe-json ==0.1.0
+  - safe-json ==1.1.0
   - safe-money ==0.9
   - SafeSemaphore ==0.10.1
   - salak ==0.3.5.3
-  - salak-toml ==0.3.5.3
   - salak-yaml ==0.3.5.3
   - saltine ==0.1.0.2
   - salve ==1.0.8
   - sample-frame ==0.0.3
   - sample-frame-np ==0.0.4.1
   - sampling ==0.3.3
-  - sandman ==0.2.0.1
   - say ==0.1.0.1
   - sbp ==2.6.3
-  - sbv ==8.3
   - scalpel ==0.6.1
   - scalpel-core ==0.6.1
   - scanf ==0.1.0.0
   - scanner ==0.3.1
-  - scheduler ==1.4.2.1
+  - scheduler ==1.4.2.2
   - scientific ==0.3.6.2
   - scotty ==0.11.5
   - scrypt ==0.5.0
@@ -1862,114 +1783,102 @@ default-package-overrides:
   - sdl2-image ==2.0.0
   - sdl2-mixer ==1.1.0
   - sdl2-ttf ==2.1.0
+  - search-algorithms ==0.3.1
   - secp256k1-haskell ==0.1.8
   - securemem ==0.1.10
-  - selda ==0.4.0.0
+  - selda ==0.5.1.0
   - selda-json ==0.1.1.0
-  - selda-postgresql ==0.1.8.0
-  - selda-sqlite ==0.1.7.0
   - selective ==0.3
-  - semialign ==1
+  - semialign ==1.1
+  - semialign-indexed ==1.1
+  - semialign-optics ==1.1
   - semigroupoid-extras ==5
   - semigroupoids ==5.3.4
-  - semigroups ==0.18.5
-  - semirings ==0.4.2
+  - semigroups ==0.19.1
+  - semirings ==0.5.3
   - semiring-simple ==1.0.0.1
   - semver ==0.3.4
   - sendfile ==0.7.11.1
   - seqalign ==0.2.0.4
+  - sequence-formats ==1.4.1
+  - sequenceTools ==1.4.0.5
   - serf ==0.1.1.0
   - serialise ==0.2.2.0
   - servant ==0.16.2
-  - servant-auth ==0.3.2.0
-  - servant-auth-docs ==0.2.10.0
-  - servant-auth-server ==0.4.5.0
-  - servant-auth-swagger ==0.2.10.0
-  - servant-auth-wordpress ==1.0.0.1
   - servant-blaze ==0.9
   - servant-cassava ==0.10
   - servant-checked-exceptions ==2.2.0.0
   - servant-checked-exceptions-core ==2.2.0.0
-  - servant-cli ==0.1.0.1
   - servant-client ==0.16.0.1
   - servant-client-core ==0.16
   - servant-conduit ==0.15
   - servant-docs ==0.11.4
-  - servant-elm ==0.6.1
+  - servant-elm ==0.7.1
   - servant-foreign ==0.15
-  - servant-http-streams ==0.16.0.1
   - servant-js ==0.9.4.1
   - servant-JuicyPixels ==0.3.0.5
-  - servant-kotlin ==0.1.1.9
   - servant-lucid ==0.9
   - servant-machines ==0.15
   - servant-mock ==0.8.5
-  - servant-multipart ==0.11.5
   - servant-pipes ==0.15.1
+  - servant-purescript ==0.9.0.4
   - servant-rawm ==0.3.2.0
-  - servant-ruby ==0.9.0.0
   - servant-server ==0.16.2
   - servant-static-th ==0.2.2.1
+  - servant-subscriber ==0.6.0.3
   - servant-swagger ==1.1.7.1
   - servant-swagger-ui ==0.3.4.3.23.11
   - servant-swagger-ui-core ==0.3.3
   - servant-swagger-ui-redoc ==0.3.3.1.22.3
-  - servant-tracing ==0.1.0.2
-  - servant-xml ==1.0.1.4
+  - servant-websockets ==2.0.0
   - servant-yaml ==0.1.0.1
   - serversession ==1.0.1
   - serversession-frontend-wai ==1.0
-  - servius ==1.2.3.0
   - ses-html ==0.4.0.0
-  - set-cover ==0.0.9
+  - set-cover ==0.1
   - setenv ==0.1.1.3
   - setlocale ==1.0.0.9
-  - sexp-grammar ==2.0.2
-  - sexpr-parser ==0.1.1.2
   - SHA ==1.6.4.4
-  - shake-language-c ==0.12.0
   - shakespeare ==2.0.24
   - shared-memory ==0.2.0.0
   - shell-conduit ==4.7.0
   - shell-escape ==0.2.0
   - shellmet ==0.0.3.0
   - shelltestrunner ==1.9
-  - shelly ==1.8.1
-  - shikensu ==0.3.11
-  - shortcut-links ==0.4.2.1
+  - shell-utility ==0.0
+  - shelly ==1.9.0
   - should-not-typecheck ==2.1.0
   - show-combinators ==0.1.1.0
-  - shower ==0.2.0.2
-  - show-prettyprint ==0.3.0.1
   - siggy-chardust ==1.0.0
   - signal ==0.1.0.4
   - silently ==1.2.5.1
-  - simple ==0.11.3
+  - simple-affine-space ==0.1
   - simple-cabal ==0.1.1
   - simple-cmd ==0.2.1
-  - simple-cmd-args ==0.1.4
+  - simple-cmd-args ==0.1.5
   - simple-log ==0.9.12
   - simple-reflect ==0.3.3
   - simple-sendfile ==0.2.30
-  - simple-session ==0.10.1.1
+  - simplest-sqlite ==0.1.0.2
   - simple-templates ==0.9.0.0
   - simple-vec3 ==0.6
   - simplistic-generics ==0.1.0.0
   - since ==0.0.0
   - singleton-bool ==0.1.5
   - singleton-nats ==0.4.3
-  - singletons ==2.5.1
+  - singletons ==2.6
+  - singletons-presburger ==0.3.0.0
   - siphash ==1.0.3
+  - sitemap-gen ==0.1.0.0
   - size-based ==0.1.2.0
-  - sized-grid ==0.1.1.6
+  - sized ==0.4.0.0
   - skein ==1.0.9.4
-  - skews ==0.1.0.2
   - skip-var ==0.1.1.0
-  - skylighting ==0.8.2.1
-  - skylighting-core ==0.8.2.1
-  - slack-web ==0.2.0.11
+  - skylighting ==0.8.3.2
+  - skylighting-core ==0.8.3.2
+  - slist ==0.1.0.0
+  - small-bytearray-builder ==0.3.3.0
   - smallcheck ==1.1.5
-  - smallcheck-series ==0.6.1
   - smoothie ==0.4.2.10
   - snap-blaze ==0.2.1.5
   - snap-core ==1.0.4.1
@@ -1977,61 +1886,54 @@ default-package-overrides:
   - snowflake ==0.1.1.1
   - soap ==0.2.3.6
   - soap-tls ==0.1.1.4
-  - socket-activation ==0.1.0.2
   - socks ==0.6.1
-  - sop-core ==0.4.0.0
+  - some ==1.0.1
+  - sop-core ==0.5.0.0
   - sort ==1.0.0.0
   - sorted-list ==0.2.1.0
   - sourcemap ==0.1.6
   - sox ==0.2.3.1
   - soxlib ==0.0.3.1
   - sparse-linear-algebra ==0.3.1
+  - sparse-tensor ==0.2.1.3
   - spatial-math ==0.5.0.1
   - special-values ==0.1.0.0
-  - speculate ==0.3.5
+  - speculate ==0.4.1
   - speedy-slice ==0.3.0
-  - sphinx ==0.6.0.2
   - Spintax ==0.3.3
   - splice ==0.6.1.1
-  - split ==0.2.3.3
+  - split ==0.2.3.4
   - splitmix ==0.0.3
   - spoon ==0.3.1
   - spreadsheet ==0.1.3.8
-  - sqlite-simple ==0.4.16.0
-  - sqlite-simple-errors ==0.6.1.0
   - sql-words ==0.1.6.3
   - srcloc ==0.5.1.2
-  - stache ==2.0.1
+  - stache ==2.1.0
+  - stack-templatizer ==0.1.0.2
   - starter ==0.3.0
-  - state-codes ==0.1.3
   - stateref ==0.3
-  - statestack ==0.2.0.5
+  - statestack ==0.3
   - StateVar ==1.2
-  - static-text ==0.2.0.4
   - statistics ==0.15.2.0
   - stb-image-redux ==0.2.1.3
   - step-function ==0.2
   - stm-chans ==3.0.0.4
   - stm-conduit ==4.0.1
+  - stm-containers ==1.1.0.4
   - stm-delay ==0.1.1.1
   - stm-extras ==0.1.0.3
+  - stm-hamt ==1.2.0.4
   - stm-split ==0.0.2.1
   - stopwatch ==0.1.0.6
   - storable-complex ==0.2.3.0
   - storable-record ==0.0.4.1
   - storable-tuple ==0.0.3.3
   - storablevector ==0.2.13
-  - store-core ==0.4.4.2
-  - Strafunski-StrategyLib ==5.0.1.0
-  - stratosphere ==0.40.0
+  - stratosphere ==0.49.0
   - streaming ==0.2.3.0
-  - streaming-attoparsec ==1.0.0.1
   - streaming-bytestring ==0.1.6
-  - streaming-cassava ==0.1.0.1
   - streaming-commons ==0.2.1.2
-  - streaming-wai ==0.1.1
-  - streamly ==0.6.1
-  - streamproc ==1.6.2
+  - streamly ==0.7.1
   - streams ==3.3
   - strict ==0.3.2
   - strict-base-types ==0.6.1
@@ -2042,38 +1944,31 @@ default-package-overrides:
   - string-combinators ==0.6.0.5
   - string-conv ==0.1.2
   - string-conversions ==0.4.0.1
-  - string-interpolate ==0.1.0.1
   - string-qq ==0.0.4
   - stringsearch ==0.3.6.6
   - string-transform ==1.1.1
   - stripe-concepts ==1.0.2.0
-  - stripe-scotty ==1.0.0.0
   - stripe-signature ==1.0.0.1
-  - stripe-wreq ==1.0.1.0
   - strive ==5.0.9
   - structs ==0.1.3
   - structured-cli ==2.5.2.0
-  - summoner ==1.3.0.1
+  - stylish-haskell ==0.10.0.0
   - sum-type-boilerplate ==0.1.1
   - sundown ==0.6
   - superbuffer ==0.3.1.1
-  - sv ==1.3.1
-  - sv-cassava ==0.3
-  - sv-core ==0.4.1
   - svg-builder ==0.1.1
   - SVGFonts ==1.7.0.1
   - svg-tree ==0.6.2.4
   - swagger ==0.3.0
-  - swagger2 ==2.4
-  - swish ==0.10.0.2
+  - swagger2 ==2.5
   - syb ==0.7.1
   - symbol ==0.2.4
   - symengine ==0.1.2.0
   - sysinfo ==0.1.1
   - system-argv0 ==0.1.1
-  - systemd ==1.2.0
   - system-fileio ==0.3.16.4
   - system-filepath ==0.4.14
+  - system-info ==0.5.1
   - tabular ==0.2.2.7
   - tagchup ==0.4.1.1
   - tagged ==0.8.6
@@ -2082,7 +1977,6 @@ default-package-overrides:
   - tagged-transformer ==0.8.1
   - tagshare ==0.0
   - tagsoup ==0.14.8
-  - tagstream-conduit ==0.5.5.3
   - tao ==1.0.0
   - tao-example ==1.0.0
   - tar ==0.5.1.1
@@ -2093,7 +1987,7 @@ default-package-overrides:
   - tasty-dejafu ==2.0.0.1
   - tasty-discover ==4.2.1
   - tasty-expected-failure ==0.11.1.2
-  - tasty-golden ==2.3.2
+  - tasty-golden ==2.3.3
   - tasty-hedgehog ==1.0.0.2
   - tasty-hspec ==1.1.5.1
   - tasty-hunit ==0.10.0.2
@@ -2102,21 +1996,21 @@ default-package-overrides:
   - tasty-lua ==0.2.2
   - tasty-program ==1.0.5
   - tasty-quickcheck ==0.10.1.1
+  - tasty-rerun ==1.1.17
   - tasty-silver ==3.1.13
   - tasty-smallcheck ==0.8.1
   - tasty-th ==0.1.7
+  - tasty-wai ==0.1.1.0
+  - Taxonomy ==2.1.0
   - TCache ==0.12.1
   - tce-conf ==1.3
-  - tcp-streams ==1.0.1.1
-  - tcp-streams-openssl ==1.0.1.0
   - tdigest ==0.2.1
-  - template-toolkit ==0.1.1.0
+  - template-haskell-compat-v0208 ==0.1.2.1
   - temporary ==1.3
   - temporary-rc ==1.2.0.3
   - temporary-resourcet ==0.1.0.1
   - tensorflow-test ==0.1.0.0
   - tensors ==0.1.4
-  - termbox ==0.2.0
   - terminal-progress-bar ==0.4.1
   - terminal-size ==0.3.2.1
   - test-framework ==0.8.2.0
@@ -2127,11 +2021,10 @@ default-package-overrides:
   - test-framework-th ==0.2.4
   - testing-feat ==1.1.0.0
   - testing-type-modifiers ==0.1.0.1
-  - texmath ==0.11.3
+  - texmath ==0.12.0.1
   - text-binary ==0.2.1.1
   - text-builder ==0.6.6.1
   - text-conversions ==0.3.0
-  - text-format ==0.3.2
   - text-icu ==0.7.0.1
   - text-latin1 ==0.3.1
   - text-ldap ==0.1.1.13
@@ -2142,25 +2035,27 @@ default-package-overrides:
   - text-printer ==0.5.0.1
   - text-region ==0.3.1.0
   - text-short ==0.1.3
-  - text-show ==3.8.2
+  - text-show ==3.8.4
   - text-show-instances ==3.8.3
   - text-zipper ==0.10.1
   - tfp ==1.0.1.1
   - tf-random ==0.5
-  - th-abstraction ==0.3.1.0
-  - th-data-compat ==0.0.2.7
-  - th-desugar ==1.9
+  - th-abstraction ==0.3.2.0
+  - th-data-compat ==0.1.0.0
+  - th-desugar ==1.10
   - these ==1.0.1
+  - these-lens ==1
+  - these-optics ==1
   - th-expand-syns ==0.4.5.0
   - th-extras ==0.0.0.4
   - th-lift ==0.8.1
   - th-lift-instances ==0.1.14
-  - th-nowq ==0.1.0.3
   - th-orphans ==0.13.9
-  - th-printf ==0.6.0
+  - th-printf ==0.7
   - thread-hierarchy ==0.3.0.1
   - thread-local-storage ==0.2
   - threads ==0.5.1.6
+  - thread-supervisor ==0.1.0.0
   - threepenny-gui ==0.8.3.1
   - th-reify-compat ==0.0.1.5
   - th-reify-many ==0.1.9
@@ -2168,8 +2063,8 @@ default-package-overrides:
   - throwable-exceptions ==0.1.0.9
   - th-strict-compat ==0.1.0.1
   - th-test-utils ==1.0.1
-  - th-utilities ==0.2.3.1
   - thyme ==0.3.5.5
+  - tidal ==1.4.8
   - tile ==0.3.0.0
   - time-compat ==1.9.2.2
   - timeit ==2.0
@@ -2179,33 +2074,23 @@ default-package-overrides:
   - time-locale-vietnamese ==1.0.0.0
   - time-manager ==0.0.0
   - time-parsers ==0.1.2.1
-  - time-qq ==0.0.1.0
   - timerep ==2.0.0.2
-  - timer-wheel ==0.2.0.1
   - timezone-olson ==0.1.9
   - timezone-series ==0.1.9
-  - tintin ==1.10.1
   - tinylog ==0.15.0
   - titlecase ==1.0.1
-  - tldr ==0.4.0.2
-  - tls ==1.4.1
-  - tls-debug ==0.4.5
+  - tldr ==0.6.2
+  - tls ==1.5.4
+  - tls-debug ==0.4.8
   - tls-session-manager ==0.0.4
   - tmapchan ==0.0.3
   - tmapmvar ==0.0.4
-  - tmp-postgres ==0.2.0.0
-  - token-bucket ==0.1.0.1
-  - tomland ==1.1.0.1
+  - tmp-postgres ==1.34.1.0
+  - tomland ==1.2.1.0
   - tonalude ==0.1.1.0
-  - tonaparser ==0.1.0.0
-  - tonatona ==0.1.1.0
-  - tonatona-logger ==0.2.0.0
-  - tonatona-persistent-postgresql ==0.1.0.1
-  - tonatona-persistent-sqlite ==0.1.0.1
-  - tonatona-servant ==0.1.0.3
+  - topograph ==1
   - torsor ==0.1
   - tostring ==0.2.1.1
-  - TotalMap ==0.1.1.1
   - tracing ==0.0.4.0
   - transaction ==0.1.1.3
   - transformers-base ==0.4.5.2
@@ -2215,12 +2100,12 @@ default-package-overrides:
   - traverse-with-class ==1.0.1.0
   - tree-diff ==0.1
   - tree-fun ==0.8.1.0
-  - trifecta ==2
+  - trifecta ==2.1
   - triplesec ==0.2.2.1
   - trivial-constraint ==0.6.0.0
-  - true-name ==0.1.0.3
   - tsv2csv ==0.1.0.2
-  - ttl-hashtables ==1.3.1.1
+  - ttc ==0.2.0.0
+  - ttl-hashtables ==1.4.1.0
   - ttrie ==0.1.2.1
   - tuple ==0.3.0.2
   - tuples-homogenous-h98 ==0.1.1.0
@@ -2229,6 +2114,8 @@ default-package-overrides:
   - turtle ==1.5.16
   - TypeCompose ==0.9.14
   - typed-process ==0.2.6.0
+  - typed-uuid ==0.0.0.2
+  - type-equality ==1
   - type-errors ==0.2.0.0
   - type-errors-pretty ==0.0.1.0
   - type-fun ==0.1.1
@@ -2236,23 +2123,19 @@ default-package-overrides:
   - type-level-integers ==0.0.1
   - type-level-kv-list ==1.1.0
   - type-level-numbers ==0.1.1.1
-  - typelits-witnesses ==0.4.0.0
   - type-map ==0.1.6.0
+  - type-natural ==0.8.3.1
   - typenums ==0.1.2.1
   - type-of-html ==1.5.1.0
   - type-of-html-static ==0.1.0.2
   - type-operators ==0.2.0.0
   - typerep-map ==0.3.2
   - type-spec ==0.4.0.0
-  - tz ==0.1.3.3
   - tzdata ==0.1.20190911.0
   - ua-parser ==0.7.5.1
-  - ucam-webauth ==0.1.0.0
-  - ucam-webauth-types ==0.1.0.0
   - uglymemo ==0.1.0.1
   - unagi-chan ==0.4.1.3
   - unbounded-delays ==0.1.1.0
-  - unbound-generics ==0.4.0
   - unboxed-ref ==0.4.0.0
   - unboxing-vector ==0.1.1.0
   - uncertain ==0.3.1.0
@@ -2261,43 +2144,39 @@ default-package-overrides:
   - unicode-show ==0.1.0.4
   - unicode-transforms ==0.3.6
   - unification-fd ==0.10.0.1
-  - union ==0.1.2
   - union-find ==0.2
   - uniplate ==1.6.12
   - uniprot-kb ==0.1.2.0
-  - uniq-deep ==1.1.1
+  - uniq-deep ==1.2.0
   - unique ==0
   - unique-logic ==0.4
   - unique-logic-tf ==0.5.1
   - unit-constraint ==0.0.0
-  - universe ==1.1.1
+  - universe ==1.2
   - universe-base ==1.1.1
-  - universe-dependent-sum ==1.1.0.1
   - universe-instances-base ==1.1
   - universe-instances-extended ==1.1.1
   - universe-instances-trans ==1.1
   - universe-reverse-instances ==1.1
-  - universum ==1.5.0
+  - universe-some ==1.2
+  - universum ==1.6.1
   - unix-bytestring ==0.3.7.3
   - unix-compat ==0.5.2
   - unix-time ==0.4.7
   - unliftio ==0.2.12
   - unliftio-core ==0.1.2.0
   - unliftio-pool ==0.2.1.0
-  - unliftio-streams ==0.1.1.0
   - unlit ==0.4.0.0
   - unordered-containers ==0.2.10.0
   - unordered-intmap ==0.1.1
   - unsafe ==0.0
+  - urbit-hob ==0.3.1
   - uri-bytestring ==0.3.2.2
   - uri-bytestring-aeson ==0.1.0.7
   - uri-encode ==1.5.0.5
-  - uri-templater ==0.3.1.0
   - url ==2.1.3
   - urlpath ==9.0.1
   - users ==0.5.0.0
-  - users-postgresql-simple ==0.5.0.2
-  - users-test ==0.5.0.1
   - utf8-light ==0.4.2
   - utf8-string ==1.0.1.1
   - util ==0.1.17.1
@@ -2305,20 +2184,21 @@ default-package-overrides:
   - uuid ==1.3.13
   - uuid-types ==1.0.3
   - validation ==1.1
-  - validity ==0.9.0.2
-  - validity-aeson ==0.2.0.2
-  - validity-bytestring ==0.4.1.0
-  - validity-containers ==0.3.1.0
-  - validity-path ==0.3.0.2
-  - validity-scientific ==0.2.0.2
-  - validity-text ==0.3.1.0
-  - validity-time ==0.2.0.2
-  - validity-unordered-containers ==0.2.0.2
-  - validity-uuid ==0.1.0.2
-  - validity-vector ==0.2.0.2
+  - validity ==0.9.0.3
+  - validity-aeson ==0.2.0.3
+  - validity-bytestring ==0.4.1.1
+  - validity-containers ==0.5.0.1
+  - validity-path ==0.4.0.1
+  - validity-primitive ==0.0.0.1
+  - validity-scientific ==0.2.0.3
+  - validity-text ==0.3.1.1
+  - validity-time ==0.3.0.0
+  - validity-unordered-containers ==0.2.0.3
+  - validity-uuid ==0.1.0.3
+  - validity-vector ==0.2.0.3
   - valor ==0.1.0.0
   - vault ==0.3.1.3
-  - vec ==0.1.1.1
+  - vec ==0.3
   - vector ==0.12.1.2
   - vector-algorithms ==0.8.0.3
   - vector-binary-instances ==0.2.5.1
@@ -2327,55 +2207,42 @@ default-package-overrides:
   - vector-bytes-instances ==0.1.1
   - vector-instances ==3.4
   - vector-mmap ==0.0.3
-  - vector-sized ==1.2.0.1
+  - vector-rotcev ==0.1.0.0
+  - vector-sized ==1.4.0.0
   - vector-space ==0.16
   - vector-split ==1.0.0.2
   - vector-th-unbox ==0.2.1.7
   - verbosity ==0.3.0.0
   - versions ==3.5.3
+  - vformat ==0.14.1.0
+  - vformat-aeson ==0.1.0.1
+  - vformat-time ==0.1.0.0
   - ViennaRNAParser ==1.3.3
-  - viewprof ==0.0.0.32
-  - vinyl ==0.11.0
-  - vivid ==0.4.2.3
-  - vivid-osc ==0.5.0.0
-  - vivid-supercollider ==0.4.1.2
   - void ==0.7.3
-  - vty ==5.25.1
+  - vty ==5.26
   - wai ==3.2.2.1
   - wai-app-static ==3.1.7.1
-  - wai-cli ==0.2.1
   - wai-conduit ==3.0.0.4
   - wai-cors ==0.2.7
   - wai-enforce-https ==0.0.1
   - wai-eventsource ==3.0.0
-  - wai-extra ==3.0.29
+  - wai-extra ==3.0.29.1
   - wai-handler-launch ==3.0.3.1
-  - wai-logger ==2.3.5
-  - wai-middleware-auth ==0.1.2.1
+  - wai-logger ==2.3.6
   - wai-middleware-caching ==0.1.0.2
-  - wai-middleware-crowd ==0.1.4.2
-  - wai-middleware-static ==0.8.2
-  - wai-middleware-throttle ==0.3.0.1
-  - wai-middleware-travisci ==0.1.0
-  - wai-predicates ==0.10.0
+  - wai-middleware-static ==0.8.3
   - wai-session ==0.3.3
-  - wai-session-postgresql ==0.2.1.2
   - wai-slack-middleware ==0.2.0
-  - wai-transformers ==0.1.0
   - wai-websockets ==3.0.1.2
-  - warp ==3.3.5
-  - warp-tls ==3.2.9
+  - warp ==3.3.9
+  - warp-tls ==3.2.11
   - warp-tls-uid ==0.2.0.6
   - wave ==0.2.0
   - wcwidth ==0.0.2
-  - web3 ==0.8.3.2
   - webdriver ==0.9.0.1
   - webex-teams-api ==0.2.0.0
   - webex-teams-conduit ==0.2.0.0
   - webex-teams-pipes ==0.2.0.0
-  - web-routes ==0.27.14.3
-  - web-routes-hsp ==0.24.6.1
-  - web-routes-wai ==0.24.3.1
   - webrtc-vad ==0.1.0.3
   - websockets ==0.12.7.0
   - websockets-snap ==0.10.3.1
@@ -2387,8 +2254,6 @@ default-package-overrides:
   - Win32 ==2.6.1.0
   - Win32-notify ==0.3.0.3
   - windns ==0.1.0.1
-  - winery ==1.1.3
-  - wire-streams ==0.1.1.0
   - with-location ==0.1.0
   - witness ==0.4
   - wizards ==1.0.3
@@ -2397,7 +2262,6 @@ default-package-overrides:
   - wl-pprint-text ==1.2.0.1
   - word24 ==2.0.1
   - word8 ==0.1.3
-  - wordpress-auth ==1.0.0.0
   - word-trie ==0.3.0
   - word-wrap ==0.4.1
   - world-peace ==1.0.1.0
@@ -2406,7 +2270,6 @@ default-package-overrides:
   - writer-cps-exceptions ==0.1.0.1
   - writer-cps-mtl ==0.1.1.6
   - writer-cps-transformers ==0.5.6.1
-  - ws ==0.0.5
   - wuss ==1.1.15
   - X11 ==1.9.1
   - X11-xft ==0.3.1
@@ -2419,70 +2282,54 @@ default-package-overrides:
   - xdg-basedir ==0.2.2
   - xdg-userdirs ==0.1.0.2
   - xeno ==0.3.5.2
-  - xenstore ==0.1.1
   - xls ==0.1.2
-  - xlsx ==0.7.2
+  - xlsx ==0.8.0
   - xlsx-tabular ==0.2.2.1
   - xml ==1.3.14
   - xml-basic ==0.1.3.1
-  - xmlbf ==0.6
-  - xmlbf-xeno ==0.2
-  - xml-conduit ==1.8.0.1
-  - xml-conduit-parse ==0.3.1.2
+  - xml-conduit ==1.9.0.0
   - xml-conduit-writer ==0.1.1.2
   - xmlgen ==0.6.2.2
   - xml-hamlet ==0.5.0.1
   - xml-html-qq ==0.1.0.1
   - xml-indexed-cursor ==0.1.1.0
-  - xml-isogen ==0.3.0
-  - xml-lens ==0.1.6.3
+  - xml-lens ==0.2
   - xml-picklers ==0.3.6
   - xml-to-json ==2.0.1
   - xml-to-json-fast ==2.0.0
   - xml-types ==0.3.6
   - xmonad ==0.15
-  - xmonad-contrib ==0.15
+  - xmonad-contrib ==0.16
   - xmonad-extras ==0.15.2
   - xss-sanitize ==0.3.6
+  - xturtle ==0.2.0.0
   - xxhash-ffi ==0.2.0.0
   - yaml ==0.11.2.0
-  - yeshql ==4.1.0.1
-  - yeshql-core ==4.1.0.2
-  - yeshql-hdbc ==4.1.0.2
   - yesod ==1.6.0.1
-  - yesod-alerts ==0.1.3.0
-  - yesod-auth ==1.6.8.1
+  - yesod-auth ==1.6.9
   - yesod-auth-hashdb ==1.7.1.2
-  - yesod-auth-oauth2 ==0.6.1.2
   - yesod-bin ==1.6.0.4
   - yesod-core ==1.6.17.2
-  - yesod-csp ==0.2.5.0
-  - yesod-eventsource ==1.6.0
-  - yesod-fb ==0.5.0
   - yesod-form ==1.6.7
-  - yesod-form-bootstrap4 ==2.1.2
-  - yesod-gitrepo ==0.3.0
   - yesod-gitrev ==0.2.1
-  - yesod-newsfeed ==1.6.1.0
-  - yesod-paginator ==1.1.0.2
+  - yesod-newsfeed ==1.7.0.0
   - yesod-persistent ==1.6.0.4
-  - yesod-recaptcha2 ==0.3.0
   - yesod-sitemap ==1.6.0
   - yesod-static ==1.6.0.1
   - yesod-test ==1.6.9
-  - yesod-text-markdown ==0.1.10
   - yesod-websockets ==0.3.0.2
   - yes-precure5-command ==5.5.3
-  - yi-language ==0.18.0
   - yi-rope ==0.11
+  - yjsvg ==0.2.0.1
   - yjtools ==0.9.18
   - yoga ==0.0.0.5
   - youtube ==0.2.1.1
+  - zasni-gerna ==0.0.7.1
   - zero ==0.1.5
   - zeromq4-haskell ==0.8.0
   - zeromq4-patterns ==0.3.1.0
   - zim-parser ==0.2.1.0
-  - zip ==1.2.0
+  - zip ==1.3.0
   - zip-archive ==0.4.1
   - zippers ==0.3
   - zip-stream ==0.2.0.1
@@ -2491,7 +2338,6 @@ default-package-overrides:
   - zlib-lens ==0.1.2.1
   - zot ==0.0.3
   - zstd ==0.1.1.2
-  - ztail ==1.2.0.2
 
 extra-packages:
   - aeson < 0.8                         # newer versions don't work with GHC 7.6.x or earlier

From dbc7989d3f879695b9510e80e4059833324c4ea3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Feb 2020 11:15:53 +0100
Subject: [PATCH 1792/4636] hackage2nix: update to ghc-8.8.2 for lts-15.x

---
 .../configuration-hackage2nix.yaml            | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 76bbd6dd6cdb..5494dad4bd86 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -1,38 +1,38 @@
 # pkgs/development/haskell-modules/configuration-hackage2nix.yaml
 
-compiler: ghc-8.6.5
+compiler: ghc-8.8.2
 
 core-packages:
-  - array-0.5.3.0
-  - base-4.12.0.0
-  - binary-0.8.6.0
-  - bytestring-0.10.8.2
-  - Cabal-2.4.0.1
-  - containers-0.6.0.1
+  - array-0.5.4.0
+  - base-4.13.0.0
+  - binary-0.8.7.0
+  - bytestring-0.10.10.0
+  - Cabal-3.0.1.0
+  - containers-0.6.2.1
   - deepseq-1.4.4.0
-  - directory-1.3.3.0
+  - directory-1.3.4.0
   - filepath-1.4.2.1
-  - ghc-8.6.5
-  - ghc-boot-8.6.5
-  - ghc-boot-th-8.6.5
+  - ghc-8.8.2
+  - ghc-boot-8.8.2
+  - ghc-boot-th-8.8.2
   - ghc-compact-0.1.0.0
-  - ghc-heap-8.6.5
+  - ghc-heap-8.8.2
   - ghc-prim-0.5.3
-  - ghci-8.6.5
-  - haskeline-0.7.4.3
+  - ghci-8.8.2
+  - haskeline-0.7.5.0
   - hpc-0.6.0.3
   - integer-gmp-1.0.2.0
-  - libiserv-8.6.3
+  - libiserv-8.8.2
   - mtl-2.2.2
-  - parsec-3.1.13.0
+  - parsec-3.1.14.0
   - pretty-1.1.3.6
-  - process-1.6.5.0
+  - process-1.6.7.0
   - rts-1.0
   - stm-2.5.0.0
-  - template-haskell-2.14.0.0
-  - terminfo-0.4.1.2
-  - text-1.2.3.1
-  - time-1.8.0.2
+  - template-haskell-2.15.0.0
+  - terminfo-0.4.1.4
+  - text-1.2.4.0
+  - time-1.9.3
   - transformers-0.5.6.2
   - unix-2.7.2.2
   - xhtml-3000.2.2.1

From 494124603a4e06a3a9154269a70dd78f11c012d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCtke-Stetzkamp?= <christian@lkamp.de>
Date: Sat, 8 Feb 2020 20:27:16 +0100
Subject: [PATCH 1793/4636] hackage2nix: mark http-streams not broken

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 5494dad4bd86..0b61d13000c0 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -6092,7 +6092,6 @@ broken-packages:
   - http-querystring
   - http-response-decoder
   - http-shed
-  - http-streams
   - http-wget
   - http2-client
   - http2-client-exe

From cf8e796dd1f3d058c7c69a4b771d703478dc3365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCtke-Stetzkamp?= <christian@lkamp.de>
Date: Mon, 10 Feb 2020 15:05:13 +0100
Subject: [PATCH 1794/4636] hackage2nix: mark taffybar as unbroken

...it builds because gi-gdkx11 is no longer broken

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 0b61d13000c0..f4552499f3a1 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -9337,7 +9337,6 @@ broken-packages:
   - Tablify
   - tabloid
   - tabs
-  - taffybar
   - tag-bits
   - tag-stream
   - tagged-exception-core

From 15d71ed75bffc04157416c4d9fa5be24b5a532b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCtke-Stetzkamp?= <christian@lkamp.de>
Date: Sat, 8 Feb 2020 11:14:39 +0100
Subject: [PATCH 1795/4636] hackage2nix: restrict gi-gdkx11 to versions below 4

... because gi-gdkx11-4.x requires gtk-4.x, which is still under
development and not yet available in Nixpkgs

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index f4552499f3a1..4958a8bddc7e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -4914,7 +4914,6 @@ broken-packages:
   - ghcprofview
   - ght
   - gi-cairo-again
-  - gi-gdkx11
   - gi-graphene
   - gi-gsk
   - gi-gstpbutils

From ea1aae15ae62c59641cfb84f1138a8a0d3b365e2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Feb 2020 02:30:51 +0100
Subject: [PATCH 1796/4636] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.0-19-g1b9b3ef from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/2054fb03f4f811f458988ff85675cfbf9daeed71.
---
 .../haskell-modules/hackage-packages.nix      | 25988 ++--------------
 1 file changed, 2688 insertions(+), 23300 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d58f51a37ee7..f82db1d5aa99 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -28,8 +28,6 @@ self: {
        ];
        description = "3D model parsers";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "4Blocks" = callPackage
@@ -45,8 +43,6 @@ self: {
        ];
        description = "A tetris-like game (works with GHC 6.8.3 and Gtk2hs 0.9.13)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AAI" = callPackage
@@ -58,8 +54,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Abstract Application Interface";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ABList" = callPackage
@@ -110,8 +104,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Detect which OS you're running on";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AC-Colour" = callPackage
@@ -134,8 +126,6 @@ self: {
        libraryHaskellDepends = [ array base gtk ];
        description = "GTK+ pixel plotting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AC-HalfInteger" = callPackage
@@ -149,8 +139,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Efficient half-integer type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AC-MiniTest" = callPackage
@@ -164,8 +152,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "A simple test framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AC-PPM" = callPackage
@@ -201,8 +187,6 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base ];
        description = "Trivial wrapper over ansi-terminal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AC-VanillaArray" = callPackage
@@ -214,8 +198,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Immutable arrays with plain integer indicies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AC-Vector" = callPackage
@@ -229,8 +211,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Efficient geometric vectors and transformations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AC-Vector-Fancy" = callPackage
@@ -242,8 +222,6 @@ self: {
        libraryHaskellDepends = [ AC-Angle AC-Vector base ];
        description = "Fancy type-system stuff for AC-Vector";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ACME" = callPackage
@@ -259,8 +237,6 @@ self: {
        ];
        description = "Essential features";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ADPfusion" = callPackage
@@ -288,8 +264,6 @@ self: {
        ];
        description = "Efficient, high-level dynamic programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ADPfusionForest" = callPackage
@@ -316,8 +290,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ForestStructures ];
        description = "Dynamic programming on tree and forest structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ADPfusionSet" = callPackage
@@ -342,8 +314,6 @@ self: {
        ];
        description = "Dynamic programming for Set data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AERN-Basics" = callPackage
@@ -363,8 +333,6 @@ self: {
        executableHaskellDepends = [ base containers directory ];
        description = "foundational type classes for approximating exact real numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AERN-Net" = callPackage
@@ -380,8 +348,6 @@ self: {
        ];
        description = "Compositional lazy dataflow networks for exact real number computation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AERN-Real" = callPackage
@@ -398,8 +364,6 @@ self: {
        ];
        description = "arbitrary precision real interval arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AERN-Real-Double" = callPackage
@@ -423,8 +387,6 @@ self: {
        ];
        description = "arbitrary precision real interval arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AERN-Real-Interval" = callPackage
@@ -441,8 +403,6 @@ self: {
        ];
        description = "arbitrary precision real interval arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AERN-RnToRm" = callPackage
@@ -459,8 +419,6 @@ self: {
        ];
        description = "polynomial function enclosures (PFEs) approximating exact real functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AERN-RnToRm-Plot" = callPackage
@@ -478,8 +436,6 @@ self: {
        ];
        description = "GL plotting of polynomial function enclosures (PFEs)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AES" = callPackage
@@ -521,8 +477,6 @@ self: {
        ];
        description = "A library for writing AGI scripts for Asterisk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ALUT" = callPackage
@@ -552,8 +506,6 @@ self: {
        ];
        description = "Low-level bindings for Asterisk Manager Interface (AMI)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ANum" = callPackage
@@ -615,8 +567,6 @@ self: {
        libraryHaskellDepends = [ AbortT-transformers base monads-tf ];
        description = "Monads-tf instances for the AbortT monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AbortT-mtl" = callPackage
@@ -628,8 +578,6 @@ self: {
        libraryHaskellDepends = [ AbortT-transformers base mtl ];
        description = "mtl instances for the AbortT monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AbortT-transformers" = callPackage
@@ -647,8 +595,6 @@ self: {
        ];
        description = "A monad and monadic transformer providing \"abort\" functionality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ActionKid" = callPackage
@@ -672,8 +618,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "An easy-to-use video game framework for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Adaptive" = callPackage
@@ -689,8 +633,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Adaptive-Blaisorblade" = callPackage
@@ -705,8 +647,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Advgame" = callPackage
@@ -720,8 +660,6 @@ self: {
        executableHaskellDepends = [ base haskell98 mtl ];
        description = "Lisperati's adventure game in Lisp translated to Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Advise-me" = callPackage
@@ -751,8 +689,6 @@ self: {
        ];
        description = "Assessment services for the Advise-Me project";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AesonBson" = callPackage
@@ -789,8 +725,6 @@ self: {
        ];
        description = "Generator-generator for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Agda" = callPackage
@@ -800,7 +734,7 @@ self: {
      , exceptions, filepath, geniplate-mirror, gitrev, happy, hashable
      , hashtables, haskeline, ieee754, mtl, murmur-hash, pretty, process
      , regex-tdfa, split, stm, strict, template-haskell, text, time
-     , transformers, unordered-containers, uri-encode, zlib
+     , unordered-containers, uri-encode, zlib
      }:
      mkDerivation {
        pname = "Agda";
@@ -815,7 +749,7 @@ self: {
          containers data-hash deepseq directory EdisonCore edit-distance
          equivalence exceptions filepath geniplate-mirror gitrev hashable
          hashtables haskeline ieee754 mtl murmur-hash pretty process
-         regex-tdfa split stm strict template-haskell text time transformers
+         regex-tdfa split stm strict template-haskell text time
          unordered-containers uri-encode zlib
        ];
        libraryToolDepends = [ alex happy ];
@@ -863,8 +797,6 @@ self: {
        ];
        description = "Aho-Corasick string matching algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AlanDeniseEricLauren" = callPackage
@@ -886,8 +818,6 @@ self: {
        benchmarkHaskellDepends = [ base containers criterion ];
        description = "Find the minimal subset/submap satisfying some property";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AlgoRhythm" = callPackage
@@ -916,8 +846,6 @@ self: {
        ];
        description = "Algorithmic music composition";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AlgorithmW" = callPackage
@@ -931,8 +859,6 @@ self: {
        executableHaskellDepends = [ base containers mtl pretty ];
        description = "Example implementation of Algorithm W for Hindley-Milner type inference";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AlignmentAlgorithms" = callPackage
@@ -949,8 +875,6 @@ self: {
        ];
        description = "Collection of alignment algorithms";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Allure" = callPackage
@@ -978,8 +902,6 @@ self: {
        ];
        description = "Near-future Sci-Fi roguelike and tactical squad combat game";
        license = stdenv.lib.licenses.agpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AndroidViewHierarchyImporter" = callPackage
@@ -999,8 +921,6 @@ self: {
        ];
        description = "Android view hierarchy importer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Animas" = callPackage
@@ -1012,8 +932,6 @@ self: {
        libraryHaskellDepends = [ base random ];
        description = "Updated version of Yampa: a library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Annotations" = callPackage
@@ -1026,8 +944,6 @@ self: {
        testHaskellDepends = [ base mtl multirec parsec ];
        description = "Constructing, analyzing and destructing annotated trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Ansi2Html" = callPackage
@@ -1059,8 +975,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Library for Apple Push Notification Service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AppleScript" = callPackage
@@ -1072,8 +986,6 @@ self: {
        doHaddock = false;
        description = "Call AppleScript from Haskell, and then call back into Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ApproxFun-hs" = callPackage
@@ -1085,8 +997,6 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "Function approximation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ArrayRef" = callPackage
@@ -1098,8 +1008,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Unboxed references, dynamic arrays and more";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ArrowVHDL" = callPackage
@@ -1111,8 +1019,6 @@ self: {
        libraryHaskellDepends = [ base process ];
        description = "A library to generate Netlist code from Arrow descriptions";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AspectAG" = callPackage
@@ -1151,8 +1057,6 @@ self: {
        ];
        description = "Fast Bencode encoding and parsing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AttoJson" = callPackage
@@ -1169,8 +1073,6 @@ self: {
        ];
        description = "Simple lightweight JSON parser, generator & manipulator based on ByteString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Attrac" = callPackage
@@ -1186,8 +1088,6 @@ self: {
        ];
        description = "Visualisation of Strange Attractors in 3-Dimensions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Aurochs" = callPackage
@@ -1201,8 +1101,6 @@ self: {
        executableHaskellDepends = [ base containers parsec pretty ];
        description = "Yet another parser generator for C/C++";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AutoForms" = callPackage
@@ -1218,8 +1116,6 @@ self: {
        ];
        description = "GUI library based upon generic programming (SYB3)";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "AvlTree" = callPackage
@@ -1231,8 +1127,6 @@ self: {
        libraryHaskellDepends = [ base COrdering ];
        description = "Balanced binary trees using the AVL algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BASIC" = callPackage
@@ -1244,8 +1138,6 @@ self: {
        libraryHaskellDepends = [ base containers llvm random timeit ];
        description = "Embedded BASIC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BCMtools" = callPackage
@@ -1272,8 +1164,6 @@ self: {
        ];
        description = "Big Contact Map Tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BNFC" = callPackage
@@ -1302,21 +1192,19 @@ self: {
      }) {};
 
   "BNFC-meta" = callPackage
-    ({ mkDerivation, alex-meta, array, base, happy-meta
+    ({ mkDerivation, alex-meta, array, base, fail, happy-meta
      , haskell-src-meta, syb, template-haskell
      }:
      mkDerivation {
        pname = "BNFC-meta";
-       version = "0.6";
-       sha256 = "1vw3h7b4n6im9kr2abr3m1d1y7xr5m19f53b0pqh1w1izmi5m6mz";
+       version = "0.6.1";
+       sha256 = "0snackflcjxza4iqbd85fdsmylwr3bj71nsfrs2s2idc3nlxc7ia";
        libraryHaskellDepends = [
-         alex-meta array base happy-meta haskell-src-meta syb
+         alex-meta array base fail happy-meta haskell-src-meta syb
          template-haskell
        ];
        description = "Deriving Parsers and Quasi-Quoters from BNF Grammars";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Baggins" = callPackage
@@ -1330,8 +1218,6 @@ self: {
        libraryHaskellDepends = [ base cairo containers mtl ];
        description = "Tools for self-assembly";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Bang" = callPackage
@@ -1347,8 +1233,6 @@ self: {
        ];
        description = "A Drum Machine DSL for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Barracuda" = callPackage
@@ -1377,8 +1261,6 @@ self: {
        ];
        description = "An ad-hoc P2P chat program";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Befunge93" = callPackage
@@ -1392,8 +1274,6 @@ self: {
        executableHaskellDepends = [ array base mtl random ];
        description = "An interpreter for the Befunge-93 Programming Language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BenchmarkHistory" = callPackage
@@ -1411,8 +1291,6 @@ self: {
        ];
        description = "Benchmark functions with history";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BerkeleyDB" = callPackage
@@ -1439,8 +1317,6 @@ self: {
        librarySystemDepends = [ db dbxml xercesc xqilla ];
        description = "Berkeley DB XML binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) db; inherit (pkgs) dbxml; 
          inherit (pkgs) xercesc; inherit (pkgs) xqilla;};
 
@@ -1453,8 +1329,6 @@ self: {
        libraryHaskellDepends = [ base besout ];
        description = "Factorization of polynomials over finite field";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiGUL" = callPackage
@@ -1469,8 +1343,6 @@ self: {
        ];
        description = "The Bidirectional Generic Update Language";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BigPixel" = callPackage
@@ -1512,8 +1384,6 @@ self: {
        ];
        description = "Libary for Hidden Markov Models in HMMER3 format";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Biobase" = callPackage
@@ -1535,8 +1405,6 @@ self: {
        ];
        description = "Base library for bioinformatics";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseBlast" = callPackage
@@ -1563,8 +1431,6 @@ self: {
        ];
        description = "BLAST-related tools";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseDotP" = callPackage
@@ -1576,8 +1442,6 @@ self: {
        libraryHaskellDepends = [ base bytestring iteratee ];
        description = "Vienna / DotBracket / ExtSS parsers";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseENA" = callPackage
@@ -1600,8 +1464,6 @@ self: {
        ];
        description = "European Nucleotide Archive data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseEnsembl" = callPackage
@@ -1619,8 +1481,6 @@ self: {
        ];
        description = "Ensembl related datastructures and functions";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseFR3D" = callPackage
@@ -1636,8 +1496,6 @@ self: {
        ];
        description = "Importer for FR3D resources";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseFasta" = callPackage
@@ -1662,8 +1520,6 @@ self: {
        ];
        description = "streaming FASTA parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseHTTP" = callPackage
@@ -1681,8 +1537,6 @@ self: {
        ];
        description = "Libary to interface with the Bioinformatics HTTP services - Entrez Ensembl";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseHTTPTools" = callPackage
@@ -1703,8 +1557,6 @@ self: {
        ];
        description = "Tools to query Bioinformatics HTTP services e.g. Entrez, Ensembl.";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseInfernal" = callPackage
@@ -1743,8 +1595,6 @@ self: {
        ];
        description = "Infernal data structures and tools";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseMAF" = callPackage
@@ -1756,8 +1606,6 @@ self: {
        libraryHaskellDepends = [ base bytestring containers iteratee ];
        description = "Multiple Alignment Format";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseNewick" = callPackage
@@ -1785,8 +1633,6 @@ self: {
        ];
        description = "Newick file format parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseTrainingData" = callPackage
@@ -1806,8 +1652,6 @@ self: {
        executableHaskellDepends = [ cmdargs ];
        description = "RNA folding training data";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseTurner" = callPackage
@@ -1825,8 +1669,6 @@ self: {
        ];
        description = "Import Turner RNA parameters";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseTypes" = callPackage
@@ -1859,8 +1701,6 @@ self: {
        ];
        description = "Collection of types for bioinformatics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseVienna" = callPackage
@@ -1876,8 +1716,6 @@ self: {
        ];
        description = "Import Vienna energy parameters";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BiobaseXNA" = callPackage
@@ -1919,8 +1757,6 @@ self: {
        ];
        description = "Efficient RNA/DNA/Protein Primary/Secondary Structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BirdPP" = callPackage
@@ -1934,8 +1770,6 @@ self: {
        executableHaskellDepends = [ base haskell98 ];
        description = "A preprocessor for Bird-style Literate Haskell comments with Haddock markup";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BitStringRandomMonad" = callPackage
@@ -1955,8 +1789,6 @@ self: {
          transformers vector
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BitSyntax" = callPackage
@@ -1981,8 +1813,6 @@ self: {
        libraryHaskellDepends = [ base HTTP json2 ];
        description = "A library to access bit.ly URL shortener.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BlastHTTP" = callPackage
@@ -2000,8 +1830,6 @@ self: {
        ];
        description = "Libary to interface with the NCBI blast REST interface";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Blobs" = callPackage
@@ -2023,8 +1851,6 @@ self: {
        ];
        description = "Diagram editor";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BlogLiterately" = callPackage
@@ -2051,8 +1877,6 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        description = "A tool for posting Haskelly articles to blogs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BlogLiterately-diagrams" = callPackage
@@ -2074,8 +1898,6 @@ self: {
        executableHaskellDepends = [ base BlogLiterately ];
        description = "Include images in blog posts with inline diagrams code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Blogdown" = callPackage
@@ -2104,8 +1926,6 @@ self: {
        ];
        description = "A markdown-like markup language designed for blog posts";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BluePrintCSS" = callPackage
@@ -2128,8 +1948,6 @@ self: {
        doHaddock = false;
        description = "Preview of a new build system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Bookshelf" = callPackage
@@ -2150,8 +1968,6 @@ self: {
        testHaskellDepends = [ base process ];
        description = "A simple document organizer with some wiki functionality";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Boolean" = callPackage
@@ -2190,8 +2006,6 @@ self: {
        ];
        description = "Static text template generation library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "BufferedSocket" = callPackage
@@ -2203,8 +2017,6 @@ self: {
        libraryHaskellDepends = [ base bytestring network text ];
        description = "A socker wrapper that makes the IO of sockets much cleaner";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Buster" = callPackage
@@ -2229,8 +2041,6 @@ self: {
        ];
        description = "Hits a set of urls periodically to bust caches";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CBOR" = callPackage
@@ -2251,8 +2061,6 @@ self: {
        ];
        description = "Encode/Decode values to/from CBOR";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CC-delcont" = callPackage
@@ -2282,8 +2090,6 @@ self: {
        doHaddock = false;
        description = "Three new monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CC-delcont-cxe" = callPackage
@@ -2295,8 +2101,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CC-delcont-exc" = callPackage
@@ -2308,8 +2112,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CC-delcont-ref" = callPackage
@@ -2321,8 +2123,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control using refercence cells";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CC-delcont-ref-tf" = callPackage
@@ -2334,8 +2134,6 @@ self: {
        libraryHaskellDepends = [ base ref-tf transformers ];
        description = "A monad transformers for multi-prompt delimited control using refercence cells";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CCA" = callPackage
@@ -2353,8 +2151,6 @@ self: {
        executableToolDepends = [ happy ];
        description = "preprocessor and library for Causal Commutative Arrows (CCA)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CHXHtml" = callPackage
@@ -2384,8 +2180,6 @@ self: {
        ];
        description = "Cursor Library for A Structured Editor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CLI" = callPackage
@@ -2398,8 +2192,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "CLI tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CMCompare" = callPackage
@@ -2418,8 +2210,6 @@ self: {
        executableHaskellDepends = [ cmdargs ];
        description = "Infernal covariance model comparison";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CMQ" = callPackage
@@ -2447,8 +2237,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An algebraic data type similar to Prelude Ordering";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CPBrainfuck" = callPackage
@@ -2463,8 +2251,6 @@ self: {
        executableHaskellDepends = [ base haskell98 ];
        description = "A simple Brainfuck interpretter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CPL" = callPackage
@@ -2507,8 +2293,6 @@ self: {
        ];
        description = "Firing rules semantic of CSPM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CSPM-Frontend" = callPackage
@@ -2526,8 +2310,6 @@ self: {
        libraryToolDepends = [ alex ];
        description = "A CSP-M parser compatible with FDR-2.91";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CSPM-Interpreter" = callPackage
@@ -2544,8 +2326,6 @@ self: {
        ];
        description = "An interpreter for CSPM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CSPM-ToProlog" = callPackage
@@ -2559,8 +2339,6 @@ self: {
        ];
        description = "some modules specific for the ProB tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CSPM-cspm" = callPackage
@@ -2586,8 +2364,6 @@ self: {
        ];
        description = "cspm command line tool for analyzing CSPM specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CTRex" = callPackage
@@ -2632,8 +2408,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "OpenCV based machine vision library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {opencv_calib3d = null; opencv_contrib = null; 
          opencv_core = null; opencv_features2d = null; opencv_flann = null; 
          opencv_gpu = null; opencv_highgui = null; opencv_imgproc = null; 
@@ -2751,8 +2525,6 @@ self: {
        ];
        description = "A framework for packaging Haskell software";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CabalSearch" = callPackage
@@ -2770,8 +2542,6 @@ self: {
        ];
        description = "Search cabal packages by name";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Capabilities" = callPackage
@@ -2783,8 +2553,6 @@ self: {
        libraryHaskellDepends = [ base compdata directory free unix ];
        description = "Separate and contain effects of IO monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Cardinality" = callPackage
@@ -2807,8 +2575,6 @@ self: {
        libraryHaskellDepends = [ base containers fgl parsec ];
        description = "An implementation and DSL for the Carneades argumentation model";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CarneadesIntoDung" = callPackage
@@ -2825,8 +2591,6 @@ self: {
        ];
        description = "A translation from the Carneades argumentation model into Dung's AFs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Cartesian" = callPackage
@@ -2838,8 +2602,6 @@ self: {
        libraryHaskellDepends = [ base lens linear template-haskell ];
        description = "Coordinate systems";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Cascade" = callPackage
@@ -2851,8 +2613,6 @@ self: {
        libraryHaskellDepends = [ base comonad ghc-prim mtl void ];
        description = "Playing with reified categorical composition";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Cassava" = callPackage
@@ -2879,8 +2639,6 @@ self: {
        ];
        description = "A CSV parsing and encoding library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Catana" = callPackage
@@ -2892,8 +2650,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad for complex manipulation of a stream";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ChannelT" = callPackage
@@ -2915,6 +2671,8 @@ self: {
        pname = "Chart";
        version = "1.9.3";
        sha256 = "0p69kq5kh40gd4y8wqabypmw67pqh42vaaw64zv9sf8j075g85ry";
+       revision = "1";
+       editedCabalFile = "1is2xvhwyf5j4nls6k162glazd28jj84r2h0bf868q93qdppzgxj";
        libraryHaskellDepends = [
          array base colour data-default-class lens mtl old-locale
          operational time vector
@@ -2931,6 +2689,8 @@ self: {
        pname = "Chart-cairo";
        version = "1.9.3";
        sha256 = "0clm68alzsakkn5m4h49dgx33crajacsykb4hry2fh9zxp9j743f";
+       revision = "1";
+       editedCabalFile = "1jhw93vmhafnrvim03afc989n6jdiwpnwqma09zxd3m09hcsg17l";
        libraryHaskellDepends = [
          array base cairo Chart colour data-default-class lens mtl
          old-locale operational time
@@ -2949,6 +2709,8 @@ self: {
        pname = "Chart-diagrams";
        version = "1.9.3";
        sha256 = "075yzq50jpakgq6lb3anr660jydm68ry0di33icdacbdymq8avwn";
+       revision = "1";
+       editedCabalFile = "1hm4z73k60ndb5jvy6wxviiyv9i0qd6diz8kf36yfbayzacqianw";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base blaze-markup bytestring Chart colour containers
@@ -2966,8 +2728,8 @@ self: {
      }:
      mkDerivation {
        pname = "Chart-fltkhs";
-       version = "0.1.0.4";
-       sha256 = "0g7ghbs480ab484s3ad1hkkfjd30cl6h98a1cshbfhk4djinpl82";
+       version = "0.1.0.5";
+       sha256 = "1fyi7h3n7n3r0y71j938h4gppr7ywdgj5s2qjjpykh144xqixmdf";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -3024,8 +2786,6 @@ self: {
        ];
        description = "A wrapper for the chart library to assist with basic plots (Deprecated - use the Easy module instead)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Chart-tests" = callPackage
@@ -3039,6 +2799,8 @@ self: {
        pname = "Chart-tests";
        version = "1.9.3";
        sha256 = "1xhjd400xf235m345mhn98hjrvvv5qdr90paq4kixh2g0aswnhrd";
+       revision = "1";
+       editedCabalFile = "1kpqix1wp8qy3ca9fbh3kpbqp48nchvqqjp4n8h4x2bhl80lgvvh";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -3093,8 +2855,6 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Inbuilt checking for ultra reliable computing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Chitra" = callPackage
@@ -3108,8 +2868,6 @@ self: {
        executableHaskellDepends = [ base binary bytestring mtl network ];
        description = "A platform independent mechanism to render graphics using vnc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ChristmasTree" = callPackage
@@ -3125,8 +2883,6 @@ self: {
        ];
        description = "Alternative approach of 'read' that composes grammars instead of parsers";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CirruParser" = callPackage
@@ -3160,8 +2916,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ClassLaws" = callPackage
@@ -3173,8 +2927,6 @@ self: {
        libraryHaskellDepends = [ base ChasingBottoms mtl QuickCheck ];
        description = "Stating and checking laws for type class methods";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ClassyPrelude" = callPackage
@@ -3186,8 +2938,6 @@ self: {
        libraryHaskellDepends = [ base strict ];
        description = "Prelude replacement using classes instead of concrete types where reasonable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Clean" = callPackage
@@ -3199,8 +2949,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A light, clean and powerful utility library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Clipboard" = callPackage
@@ -3232,8 +2980,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Libary for parsing Clustal tools output";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Coadjute" = callPackage
@@ -3251,8 +2997,6 @@ self: {
        ];
        description = "A generic build tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Codec-Compression-LZF" = callPackage
@@ -3281,17 +3025,17 @@ self: {
   "Color" = callPackage
     ({ mkDerivation, base, Cabal, cabal-doctest, colour, criterion
      , data-default-class, deepseq, doctest, hspec, HUnit, JuicyPixels
-     , QuickCheck, random, template-haskell, vector
+     , massiv, massiv-test, QuickCheck, random, template-haskell, vector
      }:
      mkDerivation {
        pname = "Color";
-       version = "0.1.2";
-       sha256 = "078qc0fjzhn4v1zq37hql3b84cnv39kc48hxxk9f3ngl7yn3d8va";
+       version = "0.1.3.1";
+       sha256 = "0a4ljaqb1a8v622v99n37abas7xhzlmykbz5lm1q9xjs596qx357";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base data-default-class deepseq vector ];
        testHaskellDepends = [
-         base colour doctest hspec HUnit JuicyPixels QuickCheck random
-         template-haskell vector
+         base colour doctest hspec HUnit JuicyPixels massiv massiv-test
+         QuickCheck random template-haskell vector
        ];
        benchmarkHaskellDepends = [ base colour criterion deepseq random ];
        description = "Color spaces and conversions between them";
@@ -3321,8 +3065,6 @@ self: {
        ];
        description = "A concurrent bittorrent client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Command" = callPackage
@@ -3334,8 +3076,6 @@ self: {
        libraryHaskellDepends = [ base directory process ];
        description = "A replacement for System.Exit and System.Process";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Commando" = callPackage
@@ -3358,8 +3098,6 @@ self: {
        ];
        description = "Watch some files; Rerun a command";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ComonadSheet" = callPackage
@@ -3377,8 +3115,6 @@ self: {
        ];
        description = "A library for expressing spreadsheet-like computations as the fixed-points of comonads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Compactable" = callPackage
@@ -3390,8 +3126,6 @@ self: {
        libraryHaskellDepends = [ base containers transformers vector ];
        description = "A generalization for containers that can be stripped of Nothing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Concurrent-Cache" = callPackage
@@ -3403,8 +3137,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A Cached variable for IO functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ConcurrentUtils" = callPackage
@@ -3422,8 +3154,6 @@ self: {
        ];
        description = "Concurrent utilities";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Concurrential" = callPackage
@@ -3435,8 +3165,6 @@ self: {
        libraryHaskellDepends = [ async base ];
        description = "Mix concurrent and sequential computation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Condor" = callPackage
@@ -3458,8 +3186,6 @@ self: {
        ];
        description = "Information retrieval library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ConfigFile" = callPackage
@@ -3486,8 +3212,6 @@ self: {
        ];
        description = "Template haskell for reading ConfigFiles";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Configger" = callPackage
@@ -3499,8 +3223,6 @@ self: {
        libraryHaskellDepends = [ base Dangerous MissingH mtl parsec ];
        description = "Parse config files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Configurable" = callPackage
@@ -3512,8 +3234,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Declare types as Configurable then specialize them all in one place";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ConsStream" = callPackage
@@ -3538,8 +3258,6 @@ self: {
        executableHaskellDepends = [ base process ];
        description = "Restart a command on STDIN activity";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ConstraintKinds" = callPackage
@@ -3551,8 +3269,6 @@ self: {
        libraryHaskellDepends = [ base dlist ghc-prim vector ];
        description = "Repackages standard type classes with the ConstraintKinds extension";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Consumer" = callPackage
@@ -3564,8 +3280,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad and monad transformer for consuming streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ContArrow" = callPackage
@@ -3577,8 +3291,6 @@ self: {
        libraryHaskellDepends = [ arrows base ];
        description = "Control.Arrow.Transformer.Cont";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ContextAlgebra" = callPackage
@@ -3596,8 +3308,6 @@ self: {
        ];
        description = "Implementation of the context algebra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Contract" = callPackage
@@ -3609,8 +3319,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Practical typed lazy contracts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Control-Engine" = callPackage
@@ -3642,8 +3350,6 @@ self: {
        ];
        description = "A Library for Writing Multi-Pass Algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Control-Monad-ST2" = callPackage
@@ -3661,8 +3367,6 @@ self: {
        ];
        description = "A variation on the ST monad with two type parameters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CoreDump" = callPackage
@@ -3674,8 +3378,6 @@ self: {
        libraryHaskellDepends = [ base ghc pretty pretty-show ];
        description = "A GHC plugin for printing GHC's internal Core data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CoreErlang" = callPackage
@@ -3687,8 +3389,6 @@ self: {
        libraryHaskellDepends = [ base parsec pretty ];
        description = "Manipulating Core Erlang source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CoreFoundation" = callPackage
@@ -3707,8 +3407,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to Mac OSX's CoreFoundation framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Coroutine" = callPackage
@@ -3720,8 +3418,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Type-safe coroutines using lightweight session types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "CouchDB" = callPackage
@@ -3742,8 +3438,6 @@ self: {
        ];
        description = "CouchDB interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Craft3e" = callPackage
@@ -3760,8 +3454,6 @@ self: {
        doHaddock = false;
        description = "Code for Haskell: the Craft of Functional Programming, 3rd ed";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Crypto" = callPackage
@@ -3816,8 +3508,6 @@ self: {
        ];
        description = "CurryDB: In-memory Key/Value Database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DAG-Tournament" = callPackage
@@ -3835,8 +3525,6 @@ self: {
        ];
        description = "Real-Time Game Tournament Evaluator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DAV" = callPackage
@@ -3893,8 +3581,6 @@ self: {
        ];
        description = "DBFunctor - Functional Data Management => ETL/ELT Data Processing in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DBlimited" = callPackage
@@ -3908,8 +3594,6 @@ self: {
        executableHaskellDepends = [ base containers parsec ];
        description = "A command-line SQL interface for flat files (tdf,csv,etc.)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DBus" = callPackage
@@ -3921,8 +3605,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "D-Bus bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DCFL" = callPackage
@@ -3947,8 +3629,6 @@ self: {
        executableHaskellDepends = [ base MuCheck ];
        description = "Distributed Mutation Analysis framework for MuCheck";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DOH" = callPackage
@@ -3985,8 +3665,6 @@ self: {
        libraryHaskellDepends = [ base mtl WebBits ];
        description = "DOM Level 2 bindings for the WebBits package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DP" = callPackage
@@ -4002,8 +3680,6 @@ self: {
        ];
        description = "Pragmatic framework for dynamic programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DPM" = callPackage
@@ -4027,8 +3703,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Darcs Patch Manager";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DPutils" = callPackage
@@ -4113,8 +3787,6 @@ self: {
        ];
        description = "Implementation of DSA, based on the description of FIPS 186-4";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DSH" = callPackage
@@ -4143,8 +3815,6 @@ self: {
        ];
        description = "Database Supported Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DSTM" = callPackage
@@ -4166,8 +3836,6 @@ self: {
        ];
        description = "A framework for using STM within distributed systems";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DTC" = callPackage
@@ -4179,8 +3847,6 @@ self: {
        libraryHaskellDepends = [ base haskell-src-exts ];
        description = "Data To Class transformation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Dangerous" = callPackage
@@ -4192,8 +3858,6 @@ self: {
        libraryHaskellDepends = [ base MaybeT mtl ];
        description = "Monads for operations that can exit early and produce warnings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Dao" = callPackage
@@ -4224,8 +3888,6 @@ self: {
        ];
        description = "Dao is meta programming language with its own built-in interpreted language, designed with artificial intelligence applications in mind";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DarcsHelpers" = callPackage
@@ -4237,8 +3899,6 @@ self: {
        libraryHaskellDepends = [ base HaXml mtl parsec safe xml-parsec ];
        description = "Code used by Patch-Shack that seemed sensible to open for reusability";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Data-Angle" = callPackage
@@ -4276,8 +3936,6 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "Ropes, an alternative to (Byte)Strings";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DataIndex" = callPackage
@@ -4294,8 +3952,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "A package for adding index column to data files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DataTreeView" = callPackage
@@ -4313,8 +3969,6 @@ self: {
        ];
        description = "A GTK widget for displaying arbitrary Data.Data.Data instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DataVersion" = callPackage
@@ -4356,8 +4010,6 @@ self: {
        testHaskellDepends = [ base doctest filemanip QuickCheck ];
        description = "Write clients for Meteor's DDP Protocol";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DebugTraceHelpers" = callPackage
@@ -4397,8 +4049,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A very simple implementation of decision trees for discrete attributes";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DeepArrow" = callPackage
@@ -4446,8 +4096,6 @@ self: {
        ];
        description = "A simple RTS game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Delta-Lambda" = callPackage
@@ -4470,8 +4118,6 @@ self: {
        ];
        description = "A demonstration interpreter for type system delta-lambda (of N.G. De-bruijn)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DescriptiveKeys" = callPackage
@@ -4500,28 +4146,9 @@ self: {
        ];
        description = "Processing Real-time event streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Diff" = callPackage
-    ({ mkDerivation, array, base, directory, pretty, process
-     , QuickCheck, test-framework, test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "Diff";
-       version = "0.3.4";
-       sha256 = "0bqcdvhxx8dmqc3793m6axg813wv9ldz2j37f1wygbbrbbndmdvp";
-       libraryHaskellDepends = [ array base pretty ];
-       testHaskellDepends = [
-         array base directory pretty process QuickCheck test-framework
-         test-framework-quickcheck2
-       ];
-       description = "O(ND) diff algorithm in haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Diff_0_4_0" = callPackage
     ({ mkDerivation, array, base, directory, pretty, process
      , QuickCheck, test-framework, test-framework-quickcheck2
      }:
@@ -4536,7 +4163,6 @@ self: {
        ];
        description = "O(ND) diff algorithm in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DifferenceLogic" = callPackage
@@ -4550,8 +4176,6 @@ self: {
        ];
        description = "A theory solver for conjunctions of literals in difference logic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DifferentialEvolution" = callPackage
@@ -4567,8 +4191,6 @@ self: {
        ];
        description = "Global optimization using Differential Evolution";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Digit" = callPackage
@@ -4603,8 +4225,6 @@ self: {
        testHaskellDepends = [ base hspec lens mtl text ];
        description = "A client library for the DigitalOcean API";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DimensionalHash" = callPackage
@@ -4616,8 +4236,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An n-dimensional hash using Morton numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DirectSound" = callPackage
@@ -4651,8 +4269,6 @@ self: {
        ];
        description = "Distributed Bug Tracking System";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DiscussionSupportSystem" = callPackage
@@ -4669,8 +4285,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Discussion support system";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Dish" = callPackage
@@ -4685,8 +4299,6 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Hash modules (currently Murmur3)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Dist" = callPackage
@@ -4752,8 +4364,6 @@ self: {
        ];
        description = "Frameshift-aware alignment of protein sequences with DNA sequences";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DocTest" = callPackage
@@ -4771,8 +4381,6 @@ self: {
        ];
        description = "Test interactive Haskell examples";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Docs" = callPackage
@@ -4802,8 +4410,6 @@ self: {
        executableHaskellDepends = [ array base containers pretty ];
        description = "A tool for deriving hylomorphisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DrIFT" = callPackage
@@ -4821,8 +4427,6 @@ self: {
        ];
        description = "Program to derive type class instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DrIFT-cabalized" = callPackage
@@ -4837,8 +4441,6 @@ self: {
        executableHaskellDepends = [ base old-time process random ];
        description = "Program to derive type class instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Dung" = callPackage
@@ -4852,8 +4454,6 @@ self: {
        libraryHaskellDepends = [ base cmdargs containers parsec ];
        description = "An implementation of the Dung argumentation frameworks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Dust" = callPackage
@@ -4879,8 +4479,6 @@ self: {
        ];
        description = "Polymorphic protocol engine";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Dust-crypto" = callPackage
@@ -4907,8 +4505,6 @@ self: {
        ];
        description = "Cryptographic operations";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "Dust-tools" = callPackage
@@ -4933,8 +4529,6 @@ self: {
        ];
        description = "Network filtering exploration tools";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Dust-tools-pcap" = callPackage
@@ -4956,8 +4550,6 @@ self: {
        ];
        description = "Network filtering exploration tools that rely on pcap";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DynamicTimeWarp" = callPackage
@@ -4975,8 +4567,6 @@ self: {
        ];
        description = "Dynamic time warping of sequences";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DysFRP" = callPackage
@@ -4990,8 +4580,6 @@ self: {
        ];
        description = "dysFunctional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DysFRP-Cairo" = callPackage
@@ -5003,8 +4591,6 @@ self: {
        libraryHaskellDepends = [ base cairo DysFRP gtk mtl ];
        description = "dysFunctional Reactive Programming on Cairo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "DysFRP-Craftwerk" = callPackage
@@ -5021,8 +4607,6 @@ self: {
        ];
        description = "dysFunctional Reactive Programming on Craftwerk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "EEConfig" = callPackage
@@ -5136,8 +4720,6 @@ self: {
        ];
        description = "Query language and report generator for edit logs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Eight-Ball-Pool-Hack-Cheats" = callPackage
@@ -5160,8 +4742,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "EitherT" = callPackage
@@ -5179,8 +4759,6 @@ self: {
        ];
        description = "EitherT monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Elm" = callPackage
@@ -5236,8 +4814,6 @@ self: {
        ];
        description = "derives heuristic rules from nominal data";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Empty" = callPackage
@@ -5249,8 +4825,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A type class for empty containers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Encode" = callPackage
@@ -5281,8 +4855,6 @@ self: {
        ];
        description = "Libary to interface with the NCBI Entrez REST service";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Enum" = callPackage
@@ -5306,8 +4878,6 @@ self: {
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Simple Enum-class-based int containers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "EnumMap" = callPackage
@@ -5319,8 +4889,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "More general IntMap replacement";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Eq" = callPackage
@@ -5339,8 +4907,6 @@ self: {
        ];
        description = "Render math formula in ASCII, and perform some simplifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "EqualitySolver" = callPackage
@@ -5354,8 +4920,6 @@ self: {
        ];
        description = "A theory solver for conjunctions of literals in the theory of uninterpreted functions with equality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "EsounD" = callPackage
@@ -5375,8 +4939,6 @@ self: {
        ];
        description = "Type-safe bindings to EsounD (ESD; Enlightened Sound Daemon)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "EstProgress" = callPackage
@@ -5388,8 +4950,6 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base mtl ];
        description = "Methods for estimating the progress of functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "EtaMOO" = callPackage
@@ -5414,8 +4974,6 @@ self: {
        executablePkgconfigDepends = [ pcre ];
        description = "A new implementation of the LambdaMOO server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) pcre;};
 
   "Etage" = callPackage
@@ -5431,8 +4989,6 @@ self: {
        ];
        description = "A general data-flow framework";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Etage-Graph" = callPackage
@@ -5451,8 +5007,6 @@ self: {
        ];
        description = "Data-flow based graph algorithms";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Eternal10Seconds" = callPackage
@@ -5467,8 +5021,6 @@ self: {
        executableHaskellDepends = [ base haskell98 SDL SDL-mixer ];
        description = "A 2-D shooting game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Etherbunny" = callPackage
@@ -5490,8 +5042,6 @@ self: {
        executableSystemDepends = [ libpcap ];
        description = "A network analysis toolkit for Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libpcap;};
 
   "EuroIT" = callPackage
@@ -5534,8 +5084,6 @@ self: {
        ];
        description = "Interfaces with FreeSwitch Event Socket";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Extra" = callPackage
@@ -5555,8 +5103,6 @@ self: {
        ];
        description = "A grab bag of modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FAI" = callPackage
@@ -5594,8 +5140,6 @@ self: {
        ];
        description = "Compose music";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FM-SBLEX" = callPackage
@@ -5609,8 +5153,6 @@ self: {
        executableHaskellDepends = [ array base containers haskell98 ];
        description = "A set of computational morphology tools for Swedish diachronic lexicons";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FModExRaw" = callPackage
@@ -5623,8 +5165,6 @@ self: {
        librarySystemDepends = [ fmodex64 ];
        description = "The Haskell FModEx raw API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {fmodex64 = null;};
 
   "FPretty" = callPackage
@@ -5638,8 +5178,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Efficient simple pretty printing combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FTGL" = callPackage
@@ -5669,8 +5207,6 @@ self: {
        librarySystemDepends = [ ftgl ];
        description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) ftgl;};
 
   "FTPLine" = callPackage
@@ -5689,8 +5225,6 @@ self: {
        ];
        description = "A command-line FTP client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Facebook-Password-Hacker-Online-Latest-Version" = callPackage
@@ -5715,8 +5249,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Facts" = callPackage
@@ -5732,8 +5264,6 @@ self: {
        ];
        description = "A collection of facts about the real world";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FailureT" = callPackage
@@ -5745,8 +5275,6 @@ self: {
        libraryHaskellDepends = [ base base-unicode-symbols mmtl ];
        description = "Failure Monad Transformer";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FastPush" = callPackage
@@ -5758,8 +5286,6 @@ self: {
        libraryHaskellDepends = [ base STMonadTrans vector ];
        description = "A monad and monad transformer for pushing things onto a stack very fast";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FastxPipe" = callPackage
@@ -5776,8 +5302,6 @@ self: {
        ];
        description = "Fasta and Fastq streaming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FenwickTree" = callPackage
@@ -5810,8 +5334,6 @@ self: {
        ];
        description = "Annotate ps and pdf documents";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FerryCore" = callPackage
@@ -5828,8 +5350,6 @@ self: {
        ];
        description = "Ferry Core Components";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Feval" = callPackage
@@ -5843,8 +5363,6 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec ];
        description = "Evaluation using F-Algebras";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FieldTrip" = callPackage
@@ -5861,8 +5379,6 @@ self: {
        ];
        description = "Functional 3D";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FileManip" = callPackage
@@ -5878,8 +5394,6 @@ self: {
        ];
        description = "Expressive file and directory manipulation for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FileManipCompat" = callPackage
@@ -5895,8 +5409,6 @@ self: {
        ];
        description = "Expressive file and directory manipulation for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FilePather" = callPackage
@@ -5913,8 +5425,6 @@ self: {
        ];
        description = "Functions on System.FilePath";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FileSystem" = callPackage
@@ -5930,8 +5440,6 @@ self: {
        ];
        description = "File system data structure and monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Files" = callPackage
@@ -5948,8 +5456,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "File content extraction/rearrangement";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Fin" = callPackage
@@ -5960,13 +5466,13 @@ self: {
        pname = "Fin";
        version = "0.2.9.0";
        sha256 = "1wkbdjrpb7ydc659h76yrrhyv7akwx64k7cxv5fmjrwn4vgd0r8a";
+       revision = "2";
+       editedCabalFile = "0d8zdfkndkyb3ygv4sfy57k4h875b639p3s5jn60krlvd1vx81ql";
        libraryHaskellDepends = [
          alg base foldable1 natural-induction peano universe-base
        ];
        description = "Finite totally-ordered sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Finance-Quote-Yahoo" = callPackage
@@ -5982,8 +5488,6 @@ self: {
        ];
        description = "Obtain quote data from finance.yahoo.com";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Finance-Treasury" = callPackage
@@ -6000,8 +5504,6 @@ self: {
        ];
        description = "Obtain Treasury yield curve data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FindBin" = callPackage
@@ -6024,8 +5526,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "A finite map implementation, derived from the paper: Efficient sets: a balancing act, S. Adams, Journal of functional programming 3(4) Oct 1993, pp553-562";
        license = stdenv.lib.licenses.bsdOriginal;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FirstOrderTheory" = callPackage
@@ -6037,8 +5537,6 @@ self: {
        libraryHaskellDepends = [ base containers Proper ];
        description = "Grammar and typeclass for first order theories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FixedPoint-simple" = callPackage
@@ -6068,8 +5566,6 @@ self: {
        ];
        description = "Wiki";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FloatingHex" = callPackage
@@ -6143,8 +5639,6 @@ self: {
        ];
        description = "ForSyDe's Haskell-embedded Domain Specific Language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ForestStructures" = callPackage
@@ -6192,8 +5686,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Comparison of trees and forests";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ForkableT" = callPackage
@@ -6205,8 +5697,6 @@ self: {
        libraryHaskellDepends = [ base monad-control mtl resourcet ];
        description = "Forkable monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FormalGrammars" = callPackage
@@ -6231,8 +5721,6 @@ self: {
        ];
        description = "(Context-free) grammars in formal language theory";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Fortnite-Hack-Cheats-Free-V-Bucks-Generator" = callPackage
@@ -6255,8 +5743,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Foster" = callPackage
@@ -6277,8 +5763,6 @@ self: {
        ];
        description = "Utilities to generate and solve puzzles";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FpMLv53" = callPackage
@@ -6325,8 +5809,6 @@ self: {
          base FTGL GLFW-b OpenGLRaw parallel random time
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Frames" = callPackage
@@ -6358,8 +5840,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion pipes transformers ];
        description = "Data frames For working with tabular data files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Frames-beam" = callPackage
@@ -6383,8 +5863,6 @@ self: {
        ];
        description = "A library for accessing Postgres tables as in-memory data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Frames-dsv" = callPackage
@@ -6402,8 +5880,6 @@ self: {
        testHaskellDepends = [ base Frames hspec pipes ];
        description = "Alternative CSV parser for the Frames package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Frames-map-reduce" = callPackage
@@ -6424,8 +5900,6 @@ self: {
        ];
        description = "Frames wrapper for map-reduce-folds and some extra folds helpers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Frank" = callPackage
@@ -6439,8 +5913,6 @@ self: {
        executableHaskellDepends = [ base mtl newtype she void ];
        description = "An experimental programming language with typed algebraic effects";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FreeTypeGL" = callPackage
@@ -6455,8 +5927,6 @@ self: {
        libraryHaskellDepends = [ base freetype2 OpenGL ];
        description = "Loadable texture fonts for OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "FunGEn" = callPackage
@@ -6472,8 +5942,6 @@ self: {
        executableHaskellDepends = [ base GLUT OpenGL random ];
        description = "A lightweight, cross-platform, OpenGL/GLUT-based game engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Fungi" = callPackage
@@ -6493,8 +5961,6 @@ self: {
        ];
        description = "Funge-98 interpreter written in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GA" = callPackage
@@ -6519,8 +5985,6 @@ self: {
        executableHaskellDepends = [ base bimap ];
        description = "GGg cipher";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GHood" = callPackage
@@ -6559,28 +6023,9 @@ self: {
        librarySystemDepends = [ libX11 libXrandr ];
        description = "A binding for GLFW (OGL)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;};
 
   "GLFW-b" = callPackage
-    ({ mkDerivation, base, bindings-GLFW, deepseq, HUnit
-     , test-framework, test-framework-hunit
-     }:
-     mkDerivation {
-       pname = "GLFW-b";
-       version = "3.2.1.1";
-       sha256 = "1rjfdbx4pv7knlm4g8rh90jndc2a8zjmrdmfm2wvwna08h385g5g";
-       libraryHaskellDepends = [ base bindings-GLFW deepseq ];
-       testHaskellDepends = [
-         base bindings-GLFW deepseq HUnit test-framework
-         test-framework-hunit
-       ];
-       description = "Bindings to GLFW OpenGL library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "GLFW-b_3_3_0_0" = callPackage
     ({ mkDerivation, array, base, bindings-GLFW, deepseq, HUnit
      , test-framework, test-framework-hunit
      }:
@@ -6595,7 +6040,6 @@ self: {
        ];
        description = "Bindings to GLFW OpenGL library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GLFW-b-demo" = callPackage
@@ -6613,8 +6057,6 @@ self: {
        ];
        description = "GLFW-b demo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GLFW-task" = callPackage
@@ -6679,8 +6121,6 @@ self: {
        libraryHaskellDepends = [ base OpenGLRaw ];
        description = "Utilities for working with OpenGL matrices";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GLURaw" = callPackage
@@ -6744,8 +6184,6 @@ self: {
        ];
        description = "Parse GPX files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GPipe" = callPackage
@@ -6763,8 +6201,6 @@ self: {
        ];
        description = "Typesafe functional GPU graphics programming";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GPipe-Collada" = callPackage
@@ -6778,8 +6214,6 @@ self: {
        ];
        description = "Load GPipe meshes from Collada files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GPipe-Examples" = callPackage
@@ -6797,8 +6231,6 @@ self: {
        ];
        description = "Examples for the GPipes package";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GPipe-GLFW" = callPackage
@@ -6811,8 +6243,6 @@ self: {
        libraryHaskellDepends = [ async base containers GLFW-b GPipe stm ];
        description = "GLFW OpenGL context creation for GPipe";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GPipe-TextureLoad" = callPackage
@@ -6824,8 +6254,6 @@ self: {
        libraryHaskellDepends = [ base bitmap GPipe stb-image ];
        description = "Load GPipe textures from filesystem";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GTALib" = callPackage
@@ -6844,8 +6272,6 @@ self: {
        ];
        description = "A library for GTA programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Gamgine" = callPackage
@@ -6869,8 +6295,6 @@ self: {
        libraryToolDepends = [ cpphs ];
        description = "Some kind of game library or set of utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Ganymede" = callPackage
@@ -6888,8 +6312,6 @@ self: {
        ];
        description = "An Io interpreter in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GaussQuadIntegration" = callPackage
@@ -6917,8 +6339,6 @@ self: {
        ];
        description = "Several games";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GenI" = callPackage
@@ -6952,8 +6372,6 @@ self: {
        ];
        description = "A natural language generator (specifically, an FB-LTAG surface realiser)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GenSmsPdu" = callPackage
@@ -6967,8 +6385,6 @@ self: {
        executableHaskellDepends = [ base haskell98 QuickCheck random ];
        description = "Automatic SMS message generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Genbank" = callPackage
@@ -6987,8 +6403,6 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        description = "Libary for processing the NCBI genbank format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Gene-CluEDO" = callPackage
@@ -7014,8 +6428,6 @@ self: {
        ];
        description = "Hox gene clustering";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GeneralTicTacToe" = callPackage
@@ -7029,8 +6441,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A general TicTacToe game implementation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GenericPretty" = callPackage
@@ -7069,8 +6479,6 @@ self: {
        ];
        description = "MCFGs for Genus-1 RNA Pseudoknots";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GeoIp" = callPackage
@@ -7095,8 +6503,6 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring HTTP text ];
        description = "Geocoder and Reverse Geocoding Service Wrapper";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Geodetic" = callPackage
@@ -7130,8 +6536,6 @@ self: {
        libraryHaskellDepends = [ base GeomPredicates ];
        description = "Geometric predicates (Intel SSE)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Get" = callPackage
@@ -7144,8 +6548,6 @@ self: {
        testHaskellDepends = [ base constraints singletons ];
        description = "get stuff out of stuff";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GiST" = callPackage
@@ -7157,8 +6559,6 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "A Haskell implementation of a Generalized Search Tree (GiST)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Gifcurry" = callPackage
@@ -7184,8 +6584,6 @@ self: {
        ];
        description = "GIF creation utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GiveYouAHead" = callPackage
@@ -7232,8 +6630,6 @@ self: {
        libraryHaskellDepends = [ array base GlomeVec ];
        description = "Ray Tracing Library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GlomeVec" = callPackage
@@ -7263,8 +6659,6 @@ self: {
        ];
        description = "SDL Frontend for Glome ray tracer";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GoogleChart" = callPackage
@@ -7291,8 +6685,6 @@ self: {
        ];
        description = "A monad for flexible parsing of Google Code Jam input files with automatic parallelization";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GoogleDirections" = callPackage
@@ -7308,8 +6700,6 @@ self: {
        ];
        description = "Haskell Interface to Google Directions API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GoogleSB" = callPackage
@@ -7325,8 +6715,6 @@ self: {
        ];
        description = "Interface to Google Safe Browsing API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GoogleSuggest" = callPackage
@@ -7354,8 +6742,6 @@ self: {
        ];
        description = "Interface to Google Translate API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GotoT-transformers" = callPackage
@@ -7367,8 +6753,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "A monad and monadic transformer providing \"goto\" functionality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Grafos" = callPackage
@@ -7380,8 +6764,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Grafos Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GrammarProducts" = callPackage
@@ -7404,8 +6786,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Grammar products and higher-dimensional grammars";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Graph500" = callPackage
@@ -7424,8 +6804,6 @@ self: {
        executableHaskellDepends = [ array base mtl ];
        description = "Graph500 benchmark-related definitions and data set generator";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GraphHammer" = callPackage
@@ -7440,8 +6818,6 @@ self: {
        ];
        description = "GraphHammer Haskell graph analyses framework inspired by STINGER";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GraphHammer-examples" = callPackage
@@ -7459,8 +6835,6 @@ self: {
        ];
        description = "Test harness for TriangleCount analysis";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GraphSCC" = callPackage
@@ -7504,8 +6878,6 @@ self: {
        ];
        description = "Embedded grammar DSL and LALR parser generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GroteTrap" = callPackage
@@ -7523,8 +6895,6 @@ self: {
        ];
        description = "Parser and selection library for expression languages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Grow" = callPackage
@@ -7567,8 +6937,6 @@ self: {
        ];
        description = "Notification utility for Growl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Gtk2hsGenerics" = callPackage
@@ -7584,8 +6952,6 @@ self: {
        ];
        description = "Convenience functions to extend Gtk2hs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GtkGLTV" = callPackage
@@ -7601,8 +6967,6 @@ self: {
        ];
        description = "OpenGL support for Gtk-based GUIs for Tangible Values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GtkTV" = callPackage
@@ -7634,8 +6998,6 @@ self: {
        ];
        description = "A graphical REPL and development environment for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "GuiTV" = callPackage
@@ -7647,8 +7009,6 @@ self: {
        libraryHaskellDepends = [ base DeepArrow phooey TV TypeCompose ];
        description = "GUIs for Tangible Values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "H" = callPackage
@@ -7693,8 +7053,6 @@ self: {
        ];
        description = "Hierarchical adaptive Bayesian quantum tomography for quantum bits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HARM" = callPackage
@@ -7726,8 +7084,6 @@ self: {
        ];
        description = "HAppS data manipulation libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HAppS-IxSet" = callPackage
@@ -7743,8 +7099,6 @@ self: {
          syb-with-class template-haskell
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HAppS-Server" = callPackage
@@ -7765,8 +7119,6 @@ self: {
        ];
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HAppS-State" = callPackage
@@ -7786,8 +7138,6 @@ self: {
        ];
        description = "Event-based distributed state";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HAppS-Util" = callPackage
@@ -7804,8 +7154,6 @@ self: {
        ];
        description = "Web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HAppSHelpers" = callPackage
@@ -7853,23 +7201,21 @@ self: {
        ];
        description = "A library for implementing a Deck of Cards";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HCodecs" = callPackage
-    ({ mkDerivation, array, base, bytestring, QuickCheck, random
+    ({ mkDerivation, array, base, bytestring, fail, QuickCheck, random
      , semigroups
      }:
      mkDerivation {
        pname = "HCodecs";
-       version = "0.5.1";
-       sha256 = "0hrib81nw4g7qgka3brypb8k1mg7l37m8gywc7bc44mcg5mn2957";
+       version = "0.5.2";
+       sha256 = "0gbspig721viwncsfg9m4qc9jbl9rz93ra74d5b1zw9pw7rhy5ji";
        libraryHaskellDepends = [
-         array base bytestring QuickCheck random semigroups
+         array base bytestring fail QuickCheck random semigroups
        ];
        testHaskellDepends = [
-         array base bytestring QuickCheck random semigroups
+         array base bytestring fail QuickCheck random semigroups
        ];
        description = "A library to read, write and manipulate MIDI, WAVE, and SoundFont2 files";
        license = stdenv.lib.licenses.bsd3;
@@ -7906,8 +7252,6 @@ self: {
        librarySystemDepends = [ mysqlclient openssl zlib ];
        description = "MySQL driver for HDBC";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {mysqlclient = null; inherit (pkgs) openssl; 
          inherit (pkgs) zlib;};
 
@@ -7958,8 +7302,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base containers HDBC text ];
        description = "Manipulate data in PostgreSQL \"hstore\" columns";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HDBC-session" = callPackage
@@ -8000,8 +7342,6 @@ self: {
        librarySystemDepends = [ pfstools ];
        description = "Utilities for reading, manipulating, and writing HDR images";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) pfstools;};
 
   "HERA" = callPackage
@@ -8013,8 +7353,6 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ mpfr ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) mpfr;};
 
   "HExcel" = callPackage
@@ -8031,8 +7369,6 @@ self: {
        librarySystemDepends = [ xlsxwriter zlib ];
        description = "Create Excel files with Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {xlsxwriter = null; inherit (pkgs) zlib;};
 
   "HFitUI" = callPackage
@@ -8054,8 +7390,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "The library for generating a graphical interface on the web";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HFrequencyQueue" = callPackage
@@ -8067,8 +7401,6 @@ self: {
        libraryHaskellDepends = [ base c-storable-deriving ];
        description = "A Queue with a random (weighted) pick function";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HFuse" = callPackage
@@ -8103,8 +7435,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "2D game engine written in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HGL" = callPackage
@@ -8116,8 +7446,6 @@ self: {
        libraryHaskellDepends = [ array base stm X11 ];
        description = "A simple graphics library based on X11 or Win32";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HGamer3D" = callPackage
@@ -8465,8 +7793,6 @@ self: {
        ];
        description = "Graph database stored on disk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HHDL" = callPackage
@@ -8478,8 +7804,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        description = "Hardware Description Language embedded in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HJScript" = callPackage
@@ -8491,8 +7815,6 @@ self: {
        libraryHaskellDepends = [ base HJavaScript hsp mtl text ];
        description = "HJScript is a Haskell EDSL for writing JavaScript programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HJVM" = callPackage
@@ -8515,8 +7837,6 @@ self: {
        ];
        description = "A library to create a Java Virtual Machine and manipulate Java objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) jdk;};
 
   "HJavaScript" = callPackage
@@ -8530,8 +7850,6 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        description = "HJavaScript is an abstract syntax for a typed subset of JavaScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HLearn-algebra" = callPackage
@@ -8551,8 +7869,6 @@ self: {
        ];
        description = "Algebraic foundation for homomorphic learning";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HLearn-approximation" = callPackage
@@ -8571,8 +7887,6 @@ self: {
          HLearn-datastructures HLearn-distributions list-extras vector
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HLearn-classification" = callPackage
@@ -8595,8 +7909,6 @@ self: {
          QuickCheck statistics vector vector-th-unbox
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HLearn-datastructures" = callPackage
@@ -8612,8 +7924,6 @@ self: {
          MonadRandom QuickCheck vector
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HLearn-distributions" = callPackage
@@ -8637,8 +7947,6 @@ self: {
        ];
        description = "Distributions for use with the HLearn library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HList" = callPackage
@@ -8664,8 +7972,6 @@ self: {
        ];
        description = "Heterogeneous lists";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HListPP" = callPackage
@@ -8681,8 +7987,6 @@ self: {
        ];
        description = "A preprocessor for HList labelable labels";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HLogger" = callPackage
@@ -8697,8 +8001,6 @@ self: {
        executableHaskellDepends = [ base old-locale time ];
        description = "Simple, concurrent and easy-to-use logging library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HMM" = callPackage
@@ -8709,8 +8011,6 @@ self: {
        sha256 = "01y8l76c56gysynbilp32yq0wfc129hl24siw8s9fmpn98qa71s6";
        description = "A hidden markov model library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HMap" = callPackage
@@ -8766,8 +8066,6 @@ self: {
        ];
        description = "Happy Network Manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HNumeric" = callPackage
@@ -8798,8 +8096,6 @@ self: {
        librarySystemDepends = [ ode ];
        description = "Binding to libODE";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) ode;};
 
   "HOpenCV" = callPackage
@@ -8835,8 +8131,6 @@ self: {
        testHaskellDepends = [ base HTF ];
        description = "Generation of PDF documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HPath" = callPackage
@@ -8859,8 +8153,6 @@ self: {
        ];
        description = "Extract Haskell declarations by name";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HPhone" = callPackage
@@ -8890,8 +8182,6 @@ self: {
        librarySystemDepends = [ bcm2835 ];
        description = "GPIO, I2C and SPI functions for the Raspberry Pi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {bcm2835 = null;};
 
   "HPlot" = callPackage
@@ -8909,8 +8199,6 @@ self: {
        executablePkgconfigDepends = [ plplotd-gnome2 ];
        description = "A minimal monadic PLplot interface for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {plplotd-gnome2 = null;};
 
   "HPong" = callPackage
@@ -8929,8 +8217,6 @@ self: {
        ];
        description = "A simple OpenGL Pong game based on GLFW";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HROOT" = callPackage
@@ -8948,8 +8234,6 @@ self: {
        ];
        description = "Haskell binding to the ROOT data analysis framework";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HROOT-core" = callPackage
@@ -8963,8 +8247,6 @@ self: {
        ];
        description = "Haskell binding to ROOT Core modules";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HROOT-graf" = callPackage
@@ -8980,8 +8262,6 @@ self: {
        ];
        description = "Haskell binding to ROOT Graf modules";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HROOT-hist" = callPackage
@@ -8997,8 +8277,6 @@ self: {
        ];
        description = "Haskell binding to ROOT Hist modules";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HROOT-io" = callPackage
@@ -9014,8 +8292,6 @@ self: {
        ];
        description = "Haskell binding to ROOT IO modules";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HROOT-math" = callPackage
@@ -9031,8 +8307,6 @@ self: {
        ];
        description = "Haskell binding to ROOT Math modules";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HROOT-tree" = callPackage
@@ -9048,8 +8322,6 @@ self: {
        ];
        description = "Haskell binding to ROOT Tree modules";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HRay" = callPackage
@@ -9064,8 +8336,6 @@ self: {
        executableHaskellDepends = [ array base directory haskell98 ];
        description = "Haskell raytracer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HSFFIG" = callPackage
@@ -9086,8 +8356,6 @@ self: {
        ];
        description = "Generate FFI import declarations from C include files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HSGEP" = callPackage
@@ -9106,8 +8374,6 @@ self: {
        executableHaskellDepends = [ csv ];
        description = "Gene Expression Programming evolutionary algorithm in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HSH" = callPackage
@@ -9144,8 +8410,6 @@ self: {
        ];
        description = "Convenience functions that use HSH, instances for HSH";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HSet" = callPackage
@@ -9186,8 +8450,6 @@ self: {
        testHaskellDepends = [ aeson attoparsec base HTF text ];
        description = "Small template engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HSoM" = callPackage
@@ -9204,8 +8466,6 @@ self: {
        ];
        description = "Library for computer music education";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HSoundFile" = callPackage
@@ -9221,8 +8481,6 @@ self: {
        ];
        description = "Audio file reading/writing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HStringTemplate" = callPackage
@@ -9259,8 +8517,6 @@ self: {
        ];
        description = "Convenience functions and instances for HStringTemplate";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HSvm" = callPackage
@@ -9275,42 +8531,6 @@ self: {
      }) {};
 
   "HTF" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, array, base
-     , base64-bytestring, bytestring, containers, cpphs, Diff, directory
-     , filepath, haskell-src, HUnit, lifted-base, monad-control, mtl
-     , old-time, pretty, process, QuickCheck, random, regex-compat
-     , template-haskell, temporary, text, time, unix
-     , unordered-containers, vector, xmlgen
-     }:
-     mkDerivation {
-       pname = "HTF";
-       version = "0.13.2.5";
-       sha256 = "1kmf95y4vijdiih27xa35acl02dsxqnd9qa56z1waki5qqiz6nin";
-       revision = "1";
-       editedCabalFile = "0l18mp06jjwpjbnvj548naas1xhnc46c8l0pbgzi3bm6siq5hhv6";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson array base base64-bytestring bytestring containers cpphs Diff
-         directory haskell-src HUnit lifted-base monad-control mtl old-time
-         pretty process QuickCheck random regex-compat text time unix vector
-         xmlgen
-       ];
-       libraryToolDepends = [ cpphs ];
-       executableHaskellDepends = [
-         array base cpphs directory HUnit mtl old-time random text
-       ];
-       executableToolDepends = [ cpphs ];
-       testHaskellDepends = [
-         aeson aeson-pretty base bytestring directory filepath HUnit mtl
-         process random regex-compat template-haskell temporary text
-         unordered-containers
-       ];
-       description = "The Haskell Test Framework";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {};
-
-  "HTF_0_14_0_3" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, base
      , base64-bytestring, bytestring, Cabal, containers, cpphs, Diff
      , directory, filepath, haskell-src, HUnit, lifted-base
@@ -9343,7 +8563,6 @@ self: {
        ];
        description = "The Haskell Test Framework";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HTTP" = callPackage
@@ -9394,8 +8613,6 @@ self: {
        ];
        description = "Tableau based theorem prover for hybrid logics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HTicTacToe" = callPackage
@@ -9413,8 +8630,6 @@ self: {
        ];
        description = "An SDL tic-tac-toe game";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HUnit" = callPackage
@@ -9438,8 +8653,6 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base Diff groom HUnit ];
        description = "Assertions for HUnit with difference reporting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HUnit-Plus" = callPackage
@@ -9499,8 +8712,6 @@ self: {
        ];
        description = "A (prototyped) easy to use XMPP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HXQ" = callPackage
@@ -9518,8 +8729,6 @@ self: {
        ];
        description = "A Compiler from XQuery to Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaLeX" = callPackage
@@ -9545,8 +8754,6 @@ self: {
        libraryHaskellDepends = [ base bytestring serialport stm ];
        description = "An Haskell library to drive the french Minitel through a serial port";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaPy" = callPackage
@@ -9558,8 +8765,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell th-lift ];
        description = "Haskell bindings for Python";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaRe" = callPackage
@@ -9594,31 +8799,9 @@ self: {
        ];
        description = "the Haskell Refactorer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaTeX" = callPackage
-    ({ mkDerivation, base, bytestring, containers, hashable, matrix
-     , parsec, prettyprinter, QuickCheck, tasty, tasty-quickcheck, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "HaTeX";
-       version = "3.21.0.0";
-       sha256 = "0vavvs83r63sgzz4vyb617xady51ncli4ra9zwjhks8avzw3l1z1";
-       libraryHaskellDepends = [
-         base bytestring containers hashable matrix parsec prettyprinter
-         QuickCheck text transformers
-       ];
-       testHaskellDepends = [
-         base parsec QuickCheck tasty tasty-quickcheck text
-       ];
-       description = "The Haskell LaTeX library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HaTeX_3_22_0_0" = callPackage
     ({ mkDerivation, base, bibtex, bytestring, containers, hashable
      , matrix, parsec, prettyprinter, QuickCheck, tasty
      , tasty-quickcheck, text, transformers
@@ -9636,7 +8819,6 @@ self: {
        ];
        description = "The Haskell LaTeX library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaTeX-meta" = callPackage
@@ -9655,8 +8837,6 @@ self: {
        ];
        description = "This package is deprecated. From version 3, HaTeX does not need this anymore.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaTeX-qq" = callPackage
@@ -9672,8 +8852,6 @@ self: {
        ];
        description = "Quasiquoters for HaTeX";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaVSA" = callPackage
@@ -9693,8 +8871,6 @@ self: {
        ];
        description = "An implementation of the Version Space Algebra learning framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaXml" = callPackage
@@ -9731,8 +8907,6 @@ self: {
        executableHaskellDepends = [ text time vty vty-ui ];
        description = "Simple chat";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HackMail" = callPackage
@@ -9753,8 +8927,6 @@ self: {
        ];
        description = "A Procmail Replacement as Haskell EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Haggressive" = callPackage
@@ -9772,8 +8944,6 @@ self: {
        testHaskellDepends = [ base Cabal containers HUnit tuple vector ];
        description = "Aggression analysis for Tweets on Twitter";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HandlerSocketClient" = callPackage
@@ -9819,8 +8989,6 @@ self: {
        testHaskellDepends = [ base hspec transformers ];
        description = "The classic game of Hangman";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HappyTree" = callPackage
@@ -9838,8 +9006,6 @@ self: {
        ];
        description = "Type Safe and End to End Decision Tree";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HarmTrace" = callPackage
@@ -9863,8 +9029,6 @@ self: {
        ];
        description = "Harmony Analysis and Retrieval of Music";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HarmTrace-Base" = callPackage
@@ -9914,8 +9078,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Haskell bindings for CacBDD";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {CacBDD = null;};
 
   "HasGP" = callPackage
@@ -9932,8 +9094,6 @@ self: {
        ];
        description = "A Haskell library for inference using Gaussian processes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Haschoo" = callPackage
@@ -9952,8 +9112,6 @@ self: {
        ];
        description = "Minimalist R5RS Scheme interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Hashell" = callPackage
@@ -9972,8 +9130,6 @@ self: {
        ];
        description = "Simple shell written in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaskRel" = callPackage
@@ -9990,8 +9146,6 @@ self: {
        ];
        description = "HaskRel, Haskell as a DBMS with support for the relational algebra";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaskellForMaths" = callPackage
@@ -10014,8 +9168,6 @@ self: {
        libraryHaskellDepends = [ base hmatrix ];
        description = "Pure Haskell implementation of the Levenberg-Marquardt algorithm";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaskellNN" = callPackage
@@ -10027,8 +9179,6 @@ self: {
        libraryHaskellDepends = [ base hmatrix random ];
        description = "High Performance Neural Network in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaskellNet" = callPackage
@@ -10047,8 +9197,6 @@ self: {
        ];
        description = "Client support for POP3, SMTP, and IMAP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaskellNet-SSL" = callPackage
@@ -10065,8 +9213,6 @@ self: {
        ];
        description = "Helpers to connect to SSL/TLS mail servers with HaskellNet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaskellTorrent" = callPackage
@@ -10090,8 +9236,6 @@ self: {
        ];
        description = "A concurrent bittorrent client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HaskellTutorials" = callPackage
@@ -10105,8 +9249,6 @@ self: {
        executableHaskellDepends = [ base cmdargs text ];
        description = "Haskell Tutorials by Evgeny Ukhanov";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Haskelloids" = callPackage
@@ -10124,8 +9266,6 @@ self: {
        ];
        description = "A reproduction of the Atari 1979 classic \"Asteroids\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Hastodon" = callPackage
@@ -10167,8 +9307,6 @@ self: {
        ];
        description = "A small 2D game framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Hawk" = callPackage
@@ -10190,8 +9328,6 @@ self: {
        ];
        description = "Haskell Web Application Kit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Hayoo" = callPackage
@@ -10218,8 +9354,6 @@ self: {
        ];
        description = "The Hayoo! search engine for Haskell API search on hackage";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Hclip" = callPackage
@@ -10252,8 +9386,6 @@ self: {
        ];
        description = "Line oriented editor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HerbiePlugin" = callPackage
@@ -10272,8 +9404,6 @@ self: {
        testHaskellDepends = [ base linear subhask ];
        description = "automatically improve your code's numeric stability";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Hermes" = callPackage
@@ -10292,8 +9422,6 @@ self: {
        ];
        description = "Message-based middleware layer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Hieroglyph" = callPackage
@@ -10311,8 +9439,6 @@ self: {
        ];
        description = "Purely functional 2D graphics for visualization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HiggsSet" = callPackage
@@ -10329,8 +9455,6 @@ self: {
        ];
        description = "A multi-index set with advanced query capabilites";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Hipmunk" = callPackage
@@ -10394,8 +9518,6 @@ self: {
          base directory MissingH process regex-tdfa time
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Histogram" = callPackage
@@ -10423,8 +9545,6 @@ self: {
        ];
        description = "An MPD client designed for a Home Theatre PC";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Hoed" = callPackage
@@ -10449,8 +9569,6 @@ self: {
        testHaskellDepends = [ base process QuickCheck ];
        description = "Lightweight algorithmic debugging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HoleyMonoid" = callPackage
@@ -10524,8 +9642,6 @@ self: {
        ];
        description = "A search and indexing engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Holumbus-Storage" = callPackage
@@ -10576,8 +9692,6 @@ self: {
        testHaskellDepends = [ base process random ];
        description = "A Simple Key Value Store";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HostAndPort" = callPackage
@@ -10604,8 +9718,6 @@ self: {
        executableHaskellDepends = [ base containers ];
        description = "A Cricket scoring application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Hs2lib" = callPackage
@@ -10633,8 +9745,6 @@ self: {
        testHaskellDepends = [ base directory filepath process ];
        description = "A Library and Preprocessor that makes it easier to create shared libs from Haskell programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HsASA" = callPackage
@@ -10666,8 +9776,6 @@ self: {
        ];
        description = "Bindings to htslib";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "HsHaruPDF" = callPackage
@@ -10679,8 +9787,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell binding to libharu (http://libharu.sourceforge.net/)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HsHyperEstraier" = callPackage
@@ -10697,8 +9803,6 @@ self: {
        libraryPkgconfigDepends = [ hyperestraier qdbm ];
        description = "HyperEstraier binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {hyperestraier = null; qdbm = null;};
 
   "HsJudy" = callPackage
@@ -10712,8 +9816,6 @@ self: {
        librarySystemDepends = [ Judy ];
        description = "Judy bindings, and some nice APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {Judy = null;};
 
   "HsOpenSSL" = callPackage
@@ -10753,8 +9855,6 @@ self: {
        ];
        description = "Haskell integration with Parrot virtual machine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HsPerl5" = callPackage
@@ -10766,8 +9866,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell interface to embedded Perl 5 interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HsSVN" = callPackage
@@ -10779,8 +9877,6 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl stm ];
        description = "Partial Subversion (SVN) binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HsSyck" = callPackage
@@ -10808,24 +9904,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "HsYAML" = callPackage
-    ({ mkDerivation, base, bytestring, containers, mtl, parsec, text }:
+  "HsWebots" = callPackage
+    ({ mkDerivation, base, bytestring, Controller, driver, hspec
+     , hspec-discover, inline-c, inline-c-cpp, JuicyPixels, process
+     , safe-exceptions, template-haskell, vector, VRML
+     }:
      mkDerivation {
-       pname = "HsYAML";
-       version = "0.1.2.0";
-       sha256 = "1pajfhj16559v64ixm8j7bvxdqmxg6c3c0z3wz7in8ckswgzfp54";
-       revision = "1";
-       editedCabalFile = "0j6qmmcz5yqh89hs2cq453maix50q61vl2h0ahj5lg02bygn42cf";
-       isLibrary = true;
-       isExecutable = true;
+       pname = "HsWebots";
+       version = "0.1.1.2";
+       sha256 = "02nm89dwm43yg5a99n9x72jf2y61rshqk6ka52s13qsg6d0bvhzv";
        libraryHaskellDepends = [
-         base bytestring containers mtl parsec text
+         base bytestring inline-c inline-c-cpp JuicyPixels safe-exceptions
+         template-haskell vector
        ];
-       description = "Pure Haskell YAML 1.2 parser";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
+       librarySystemDepends = [ Controller driver ];
+       testHaskellDepends = [
+         base bytestring hspec hspec-discover inline-c inline-c-cpp
+         JuicyPixels process safe-exceptions template-haskell vector VRML
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Webots bindings for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {Controller = null; driver = null;};
 
-  "HsYAML_0_2_1_0" = callPackage
+  "HsYAML" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, mtl, parsec
      , QuickCheck, tasty, tasty-quickcheck, text
      }:
@@ -10844,7 +9946,6 @@ self: {
        ];
        description = "Pure Haskell YAML 1.2 processor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HsYAML-aeson" = callPackage
@@ -10861,8 +9962,6 @@ self: {
        ];
        description = "JSON to YAML Adapter";
        license = stdenv.lib.licenses.gpl2Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Hsed" = callPackage
@@ -10886,8 +9985,6 @@ self: {
        ];
        description = "Stream Editor in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Hsmtlib" = callPackage
@@ -10905,8 +10002,6 @@ self: {
        ];
        description = "Haskell library for easy interaction with SMT-LIB 2 compliant solvers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HueAPI" = callPackage
@@ -10922,8 +10017,6 @@ self: {
        ];
        description = "API for controlling Philips Hue lights";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "HulkImport" = callPackage
@@ -10941,8 +10034,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-golden ];
        description = "Easily bulk import CSV data to SQL Server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Hungarian-Munkres" = callPackage
@@ -10980,8 +10071,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "The library for generating a WebGL scene for the web";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "I1M" = callPackage
@@ -10996,8 +10085,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "Code for the Haskell course taught at the University of Seville";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "IDynamic" = callPackage
@@ -11009,8 +10096,6 @@ self: {
        libraryHaskellDepends = [ base containers directory ];
        description = "Indexable, serializable form of Data.Dynamic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "IFS" = callPackage
@@ -11026,8 +10111,6 @@ self: {
        ];
        description = "Iterated Function System generation for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "INblobs" = callPackage
@@ -11047,8 +10130,6 @@ self: {
        ];
        description = "Editor and interpreter for Interaction Nets";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "IOR" = callPackage
@@ -11061,8 +10142,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Region based resource management for the IO monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "IORefCAS" = callPackage
@@ -11081,8 +10160,6 @@ self: {
        ];
        description = "Atomic compare and swap for IORefs and STRefs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "IOSpec" = callPackage
@@ -11140,8 +10217,6 @@ self: {
        ];
        description = "A RESTful microService for IPv6-related data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "IcoGrid" = callPackage
@@ -11153,8 +10228,6 @@ self: {
        libraryHaskellDepends = [ array base GlomeVec ];
        description = "Library for generating grids of hexagons and pentagons mapped to a sphere";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "IfElse" = callPackage
@@ -11188,8 +10261,6 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "A library for writing Imperative style haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "IndentParser" = callPackage
@@ -11212,8 +10283,6 @@ self: {
        libraryHaskellDepends = [ base PeanoWitnesses ];
        description = "Length- and element-indexed lists sitting somewhere between homogeneous and fully heterogeneous";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "InfixApplicative" = callPackage
@@ -11225,8 +10294,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "liftA2 for infix operators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "IntFormats" = callPackage
@@ -11239,8 +10306,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Convert integers in various bases to and from strings";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "IntGraph" = callPackage
@@ -11339,8 +10404,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "DSL for IRC bots";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "IrrHaskell" = callPackage
@@ -11372,8 +10435,6 @@ self: {
        ];
        description = "A typeclass to determine if a given value is null";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JSON-Combinator" = callPackage
@@ -11391,8 +10452,6 @@ self: {
        ];
        description = "A combinator library on top of a generalised JSON type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JSON-Combinator-Examples" = callPackage
@@ -11406,8 +10465,6 @@ self: {
        ];
        description = "Example uses of the JSON-Combinator library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JSONParser" = callPackage
@@ -11439,8 +10496,6 @@ self: {
        ];
        description = "JSON parser that uses byte strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JYU-Utils" = callPackage
@@ -11460,8 +10515,6 @@ self: {
        ];
        description = "Some utility functions for JYU projects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JackMiniMix" = callPackage
@@ -11473,8 +10526,6 @@ self: {
        libraryHaskellDepends = [ base hosc ];
        description = "control JackMiniMix";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Javasf" = callPackage
@@ -11491,8 +10542,6 @@ self: {
        ];
        description = "A utility to print the SourceFile attribute of one or more Java class files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Javav" = callPackage
@@ -11506,8 +10555,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A utility to print the target version of Java class files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Jazzkell" = callPackage
@@ -11531,8 +10578,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A Json implementation for Haskell, with JavaScript Values and Encoding/Decoding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JsContracts" = callPackage
@@ -11555,8 +10600,6 @@ self: {
        ];
        description = "Design-by-contract for JavaScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JsonGrammar" = callPackage
@@ -11578,8 +10621,6 @@ self: {
        ];
        description = "Combinators for bidirectional JSON parsing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JuPyTer-notebook" = callPackage
@@ -11596,8 +10637,6 @@ self: {
        ];
        description = "JuPyTer notebook parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JuicyPixels" = callPackage
@@ -11637,8 +10676,6 @@ self: {
        ];
        description = "BLP format decoder/encoder over JuicyPixels library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JuicyPixels-canvas" = callPackage
@@ -11650,8 +10687,6 @@ self: {
        libraryHaskellDepends = [ base containers JuicyPixels ];
        description = "Functions for drawing lines, squares and so on pixel by pixel";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JuicyPixels-extra" = callPackage
@@ -11743,8 +10778,6 @@ self: {
          filepath mtl network resourcet
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JunkDB-driver-gdbm" = callPackage
@@ -11759,8 +10792,6 @@ self: {
          base bytestring conduit directory filepath JunkDB mtl resourcet
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JunkDB-driver-hashtables" = callPackage
@@ -11775,8 +10806,6 @@ self: {
          base bytestring conduit hashable hashtables JunkDB mtl resourcet
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "JustParse" = callPackage
@@ -11788,8 +10817,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A simple and comprehensive Haskell parsing library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "KMP" = callPackage
@@ -11813,8 +10840,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A library with the kerbal space program universe and demo code";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Kalman" = callPackage
@@ -11826,8 +10851,6 @@ self: {
        libraryHaskellDepends = [ base hmatrix ];
        description = "A slightly extended Kalman filter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "KdTree" = callPackage
@@ -11855,8 +10878,6 @@ self: {
        ];
        description = "A super small web framework for those who don't like big and fancy codebases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "KiCS" = callPackage
@@ -11955,8 +10976,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Category for Continuation Passing Style";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Kulitta" = callPackage
@@ -11987,8 +11006,6 @@ self: {
        librarySystemDepends = [ kyotocabinet ];
        description = "Kyoto Cabinet DB bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) kyotocabinet;};
 
   "L-seed" = callPackage
@@ -12006,8 +11023,6 @@ self: {
        ];
        description = "Plant growing programming game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LATS" = callPackage
@@ -12024,8 +11039,6 @@ self: {
        librarySystemDepends = [ openblasCompat ];
        description = "Linear Algebra on Typed Spaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) openblasCompat;};
 
   "LC3" = callPackage
@@ -12163,8 +11176,6 @@ self: {
        ];
        description = "A type-safe EDSL for TouchDesigner written in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LambdaHack" = callPackage
@@ -12195,8 +11206,6 @@ self: {
        testHaskellDepends = [ async base filepath optparse-applicative ];
        description = "A game engine library for tactical squad ASCII roguelike dungeon crawlers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LambdaINet" = callPackage
@@ -12216,8 +11225,6 @@ self: {
        ];
        description = "Graphical Interaction Net Evaluator for Optimal Evaluation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LambdaNet" = callPackage
@@ -12233,8 +11240,6 @@ self: {
        ];
        description = "A configurable and extensible neural network library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LambdaPrettyQuote" = callPackage
@@ -12259,8 +11264,6 @@ self: {
        ];
        description = "Quasiquoter, and Arbitrary helpers for the lambda calculus";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LambdaShell" = callPackage
@@ -12278,8 +11281,6 @@ self: {
        ];
        description = "Simple shell for evaluating lambda expressions";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Lambdajudge" = callPackage
@@ -12292,8 +11293,6 @@ self: {
        testHaskellDepends = [ base filepath hspec mtl process text ];
        description = "A library to easily host Haskell based programming competitions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Lambdaya" = callPackage
@@ -12338,8 +11337,6 @@ self: {
        ];
        description = "A library for compiling programs in a variety of languages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Lattices" = callPackage
@@ -12389,8 +11386,6 @@ self: {
        executableHaskellDepends = [ base directory filepath unix ];
        description = "A simple sandboxing tool for Haskell packages";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Learning" = callPackage
@@ -12406,8 +11401,6 @@ self: {
        testHaskellDepends = [ base containers hmatrix vector ];
        description = "The most frequently used machine learning tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Level0" = callPackage
@@ -12421,8 +11414,6 @@ self: {
        executableHaskellDepends = [ base directory random SDL SDL-ttf ];
        description = "A Snake II clone written using SDL";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LibClang" = callPackage
@@ -12443,8 +11434,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Haskell bindings for libclang (a C++ parsing library)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (self.llvmPackages) clang; inherit (pkgs) ncurses;};
 
   "LibZip" = callPackage
@@ -12475,8 +11464,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Wrapper for data that can be unbounded";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LinearSplit" = callPackage
@@ -12491,8 +11478,6 @@ self: {
        ];
        description = "Partition the sequence of items to the subsequences in the order given";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LinguisticsTypes" = callPackage
@@ -12537,8 +11522,6 @@ self: {
        ];
        description = "Check a bunch of local html files for broken links";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "List" = callPackage
@@ -12585,14 +11568,14 @@ self: {
        pname = "ListT";
        version = "0.1.2.0";
        sha256 = "0ygj695w1xrv0kkpnm55gfjnks7xdbw6vrlqx1a5as4s36hq11zr";
+       revision = "1";
+       editedCabalFile = "1bc361psymmj12akdb3vdl4qsm5fp37dwbsqapj9sglnmv3w7bhg";
        libraryHaskellDepends = [ base transformers util ];
        testHaskellDepends = [
          base smallcheck tasty tasty-smallcheck transformers util
        ];
        description = "List transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ListTree" = callPackage
@@ -12640,8 +11623,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Logic";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LogicGrowsOnTrees" = callPackage
@@ -12678,8 +11659,6 @@ self: {
        benchmarkHaskellDepends = [ base cereal criterion deepseq ];
        description = "a parallel implementation of logic programming using distributed tree exploration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LogicGrowsOnTrees-MPI" = callPackage
@@ -12701,8 +11680,6 @@ self: {
        librarySystemDepends = [ openmpi ];
        description = "an adapter for LogicGrowsOnTrees that uses MPI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) openmpi;};
 
   "LogicGrowsOnTrees-network" = callPackage
@@ -12728,8 +11705,6 @@ self: {
        ];
        description = "an adapter for LogicGrowsOnTrees that uses multiple processes running in a network";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LogicGrowsOnTrees-processes" = callPackage
@@ -12756,8 +11731,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion LogicGrowsOnTrees ];
        description = "an adapter for LogicGrowsOnTrees that uses multiple processes for parallelism";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "LslPlus" = callPackage
@@ -12778,8 +11751,6 @@ self: {
        ];
        description = "An execution and testing framework for the Linden Scripting Language (LSL)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Lucu" = callPackage
@@ -12800,8 +11771,6 @@ self: {
        ];
        description = "HTTP Daemonic Library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Lykah" = callPackage
@@ -12830,8 +11799,6 @@ self: {
        ];
        description = "A static website and blog generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MASMGen" = callPackage
@@ -12844,8 +11811,6 @@ self: {
        testHaskellDepends = [ base containers mtl ];
        description = "Generate MASM code from haskell";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MBot" = callPackage
@@ -12857,8 +11822,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hidapi mtl ];
        description = "Haskell interface for controlling the mBot educational robot";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MC-Fold-DP" = callPackage
@@ -12877,8 +11840,6 @@ self: {
        executableHaskellDepends = [ cmdargs split ];
        description = "Folding algorithm based on nucleotide cyclic motifs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MFlow" = callPackage
@@ -12904,8 +11865,6 @@ self: {
        libraryToolDepends = [ cpphs ];
        description = "stateful, RESTful web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MHask" = callPackage
@@ -12917,8 +11876,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "The category of monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MSQueue" = callPackage
@@ -12930,8 +11887,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim monad-loops ref-mtl stm ];
        description = "Michael-Scott queue";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MTGBuilder" = callPackage
@@ -12945,8 +11900,6 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec ];
        description = "Builds decks out of a meta";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MagicHaskeller" = callPackage
@@ -12976,8 +11929,6 @@ self: {
        ];
        description = "Automatic inductive functional programmer by systematic search";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MailchimpSimple" = callPackage
@@ -12996,8 +11947,6 @@ self: {
        ];
        description = "Haskell library to interact with Mailchimp JSON API Version 3.0";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Map" = callPackage
@@ -13014,8 +11963,6 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Class of key-value maps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Mapping" = callPackage
@@ -13027,8 +11974,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Mapping";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MaybeT" = callPackage
@@ -13042,8 +11987,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "MaybeT monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MaybeT-monads-tf" = callPackage
@@ -13055,8 +11998,6 @@ self: {
        libraryHaskellDepends = [ base monads-tf transformers ];
        description = "MaybeT monad transformer compatible with monads-tf (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MaybeT-transformers" = callPackage
@@ -13068,8 +12009,6 @@ self: {
        libraryHaskellDepends = [ base monads-fd transformers ];
        description = "MaybeT monad transformer using transformers instead of mtl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MazesOfMonad" = callPackage
@@ -13089,8 +12028,6 @@ self: {
        ];
        description = "Console-based Role Playing Game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MeanShift" = callPackage
@@ -13102,8 +12039,6 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "Mean shift algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Measure" = callPackage
@@ -13115,8 +12050,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A library for units of measurement";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Mecha" = callPackage
@@ -13128,8 +12061,6 @@ self: {
        libraryHaskellDepends = [ base machines ];
        description = "mecha are the most complex composite machines known to humanity, lets build them well!";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Mechs" = callPackage
@@ -13141,8 +12072,6 @@ self: {
        libraryHaskellDepends = [ base machines ];
        description = "mecha are the most complex composite machines known to humanity, lets build them well!";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MemoTrie" = callPackage
@@ -13171,8 +12100,6 @@ self: {
        ];
        description = "Statically checked database access";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MetaObject" = callPackage
@@ -13184,8 +12111,6 @@ self: {
        libraryHaskellDepends = [ base containers stringtable-atom ];
        description = "A meta-object system for Haskell based on Perl 6";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Metrics" = callPackage
@@ -13197,8 +12122,6 @@ self: {
        libraryHaskellDepends = [ base hstats ];
        description = "Evaluation metrics commonly used in supervised machine learning";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Mhailist" = callPackage
@@ -13217,8 +12140,6 @@ self: {
        ];
        description = "Haskell mailing list manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Michelangelo" = callPackage
@@ -13235,8 +12156,6 @@ self: {
        ];
        description = "OpenGL for dummies";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MicrosoftTranslator" = callPackage
@@ -13253,8 +12172,6 @@ self: {
        ];
        description = "Interface for Microsoft Translator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MiniAgda" = callPackage
@@ -13278,31 +12195,6 @@ self: {
      }) {};
 
   "MissingH" = callPackage
-    ({ mkDerivation, array, base, containers, directory
-     , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network
-     , old-locale, old-time, parsec, process, QuickCheck, random
-     , regex-compat, testpack, time, unix
-     }:
-     mkDerivation {
-       pname = "MissingH";
-       version = "1.4.1.0";
-       sha256 = "1jp0vk6w9a7fzrbxfhx773105jp2s1n50klq9ak6spfl7bgx5v29";
-       revision = "2";
-       editedCabalFile = "1k7d8cgvpmln4imcrfpj4c02n3c5l1gkd5hs4hnar9ln0qh61cfx";
-       libraryHaskellDepends = [
-         array base containers directory filepath hslogger HUnit mtl network
-         old-locale old-time parsec process random regex-compat time unix
-       ];
-       testHaskellDepends = [
-         array base containers directory errorcall-eq-instance filepath
-         hslogger HUnit mtl network old-locale old-time parsec process
-         QuickCheck random regex-compat testpack time unix
-       ];
-       description = "Large utility library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "MissingH_1_4_2_1" = callPackage
     ({ mkDerivation, array, base, containers, directory
      , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network
      , old-locale, old-time, parsec, process, random, regex-compat, time
@@ -13322,7 +12214,6 @@ self: {
        ];
        description = "Large utility library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MissingK" = callPackage
@@ -13362,8 +12253,6 @@ self: {
        libraryHaskellDepends = [ anydbm base MissingH ];
        description = "Haskell interface to Python";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Mobile-Legends-Hack-Cheats" = callPackage
@@ -13386,8 +12275,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Modulo" = callPackage
@@ -13413,8 +12300,6 @@ self: {
        executableHaskellDepends = [ base GLUT random ];
        description = "A FRP library based on signal functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MoeDict" = callPackage
@@ -13430,8 +12315,6 @@ self: {
        ];
        description = "Utilities working with MoeDict.tw JSON dataset";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MonadCatchIO-mtl" = callPackage
@@ -13447,8 +12330,6 @@ self: {
        ];
        description = "Monad-transformer version of the Control.Exception module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MonadCatchIO-mtl-foreign" = callPackage
@@ -13460,8 +12341,6 @@ self: {
        libraryHaskellDepends = [ base MonadCatchIO-mtl mtl primitive ];
        description = "Polymorphic combinators for working with foreign functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MonadCatchIO-transformers" = callPackage
@@ -13477,8 +12356,6 @@ self: {
        ];
        description = "Monad-transformer compatible version of the Control.Exception module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MonadCatchIO-transformers-foreign" = callPackage
@@ -13494,8 +12371,6 @@ self: {
        ];
        description = "Polymorphic combinators for working with foreign functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MonadCompose" = callPackage
@@ -13507,8 +12382,6 @@ self: {
        libraryHaskellDepends = [ base free mmorph mtl transformers ];
        description = "Methods for composing monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MonadLab" = callPackage
@@ -13525,8 +12398,6 @@ self: {
        executableHaskellDepends = [ base haskell98 process ];
        description = "Automatically generate layered monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MonadPrompt" = callPackage
@@ -13575,8 +12446,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Generalizing lift to monad stacks";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Monadius" = callPackage
@@ -13591,8 +12460,6 @@ self: {
        executableHaskellDepends = [ array base directory GLUT OpenGL ];
        description = "2-D arcade scroller";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Monadoro" = callPackage
@@ -13608,8 +12475,6 @@ self: {
        testHaskellDepends = [ ansi-terminal base doctest process time ];
        description = "A minimalistic CLI Pomodoro timer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Monaris" = callPackage
@@ -13628,8 +12493,6 @@ self: {
        ];
        description = "A simple tetris clone";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Monatron" = callPackage
@@ -13641,8 +12504,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Monad transformer library with uniform liftings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Monatron-IO" = callPackage
@@ -13654,8 +12515,6 @@ self: {
        libraryHaskellDepends = [ base Monatron transformers ];
        description = "MonadIO instances for the Monatron transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Monocle" = callPackage
@@ -13667,8 +12526,6 @@ self: {
        libraryHaskellDepends = [ base containers haskell98 mtl ];
        description = "Symbolic computations in strict monoidal categories with LaTeX output";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MorseCode" = callPackage
@@ -13700,8 +12557,6 @@ self: {
        ];
        description = "Automated Mutation Testing";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MuCheck-HUnit" = callPackage
@@ -13716,8 +12571,6 @@ self: {
        executableHaskellDepends = [ base HUnit MuCheck ];
        description = "Automated Mutation Testing for HUnit tests";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MuCheck-Hspec" = callPackage
@@ -13732,8 +12585,6 @@ self: {
        executableHaskellDepends = [ base hspec hspec-core MuCheck ];
        description = "Automated Mutation Testing for Hspec tests";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MuCheck-QuickCheck" = callPackage
@@ -13748,8 +12599,6 @@ self: {
        executableHaskellDepends = [ base MuCheck QuickCheck ];
        description = "Automated Mutation Testing for QuickCheck tests";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MuCheck-SmallCheck" = callPackage
@@ -13764,8 +12613,6 @@ self: {
        executableHaskellDepends = [ base MuCheck smallcheck ];
        description = "Automated Mutation Testing for SmallCheck tests";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Munkres" = callPackage
@@ -13788,8 +12635,6 @@ self: {
        libraryHaskellDepends = [ array base bimap containers Munkres ];
        description = "Simple and typesafe layer over the Munkres package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MusicBrainz" = callPackage
@@ -13856,8 +12701,6 @@ self: {
        ];
        description = "Most likely order of mutation events in RNA";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "MyPrimes" = callPackage
@@ -13873,8 +12716,6 @@ self: {
        benchmarkHaskellDepends = [ base time ];
        description = "Generate all primes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NGrams" = callPackage
@@ -13888,8 +12729,6 @@ self: {
        executableHaskellDepends = [ base HCL HTTP network regex-compat ];
        description = "Simple application for calculating n-grams using Google";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NMap" = callPackage
@@ -13901,8 +12740,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A transparent nested Map structure";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NTRU" = callPackage
@@ -13919,8 +12756,6 @@ self: {
        ];
        description = "NTRU Cryptography";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NXT" = callPackage
@@ -13945,8 +12780,6 @@ self: {
        ];
        description = "A Haskell interface to Lego Mindstorms NXT";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {bluetooth = null;};
 
   "NXTDSL" = callPackage
@@ -13965,8 +12798,6 @@ self: {
        ];
        description = "Generate NXC Code from DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NameGenerator" = callPackage
@@ -13994,8 +12825,6 @@ self: {
        executableHaskellDepends = [ base uu-parsinglib ];
        description = "Very small interpreter for a Prolog-like language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Naperian" = callPackage
@@ -14022,8 +12851,6 @@ self: {
        executableHaskellDepends = [ base hnetcdf Naperian split ];
        description = "Instances of NcStore for hypercuboids";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NaturalLanguageAlphabets" = callPackage
@@ -14083,8 +12910,6 @@ self: {
        ];
        description = "Context Algebra of near";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Neks" = callPackage
@@ -14107,8 +12932,6 @@ self: {
        ];
        description = "Simple networked key/value store";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NestedFunctor" = callPackage
@@ -14120,8 +12943,6 @@ self: {
        libraryHaskellDepends = [ base comonad distributive ];
        description = "Nested composition of functors with a type index tracking nesting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NestedSampling" = callPackage
@@ -14146,8 +12967,6 @@ self: {
        testHaskellDepends = [ base bytestring HUnit process ];
        description = "Bindings for net-snmp's C API for clients";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {net_snmp = null;};
 
   "Network-NineP" = callPackage
@@ -14212,8 +13031,6 @@ self: {
        ];
        description = "Ninja game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NoHoed" = callPackage
@@ -14244,8 +13061,6 @@ self: {
        ];
        description = "Microbenchmarks for various array libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NoTrace" = callPackage
@@ -14288,8 +13103,6 @@ self: {
        ];
        description = "A Nomic game in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Nomyx-Core" = callPackage
@@ -14316,8 +13129,6 @@ self: {
        ];
        description = "A Nomic game in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Nomyx-Language" = callPackage
@@ -14337,8 +13148,6 @@ self: {
        ];
        description = "Language to express rules for Nomic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Nomyx-Rules" = callPackage
@@ -14356,8 +13165,6 @@ self: {
        ];
        description = "Language to express rules for Nomic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Nomyx-Web" = callPackage
@@ -14382,8 +13189,6 @@ self: {
        ];
        description = "Web gui for Nomyx";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NonEmpty" = callPackage
@@ -14395,8 +13200,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Library providing a non-empty list datatype, and total functions operating on it";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NonEmptyList" = callPackage
@@ -14413,8 +13216,6 @@ self: {
        ];
        description = "A list with a length of at least one";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NumInstances" = callPackage
@@ -14448,8 +13249,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Number Theoretic Sieves: primes, factorization, and Euler's Totient";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "NumberTheory" = callPackage
@@ -14462,8 +13261,6 @@ self: {
        testHaskellDepends = [ base containers HUnit primes ];
        description = "A library for number theoretic computations, written in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Numbers" = callPackage
@@ -14492,8 +13289,6 @@ self: {
        ];
        description = "Nussinov78 using the ADPfusion library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Nutri" = callPackage
@@ -14505,8 +13300,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A little library to calculate nutrition values of food items";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OGL" = callPackage
@@ -14518,8 +13311,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A context aware binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ONC-RPC" = callPackage
@@ -14559,8 +13350,6 @@ self: {
        ];
        description = "Parse OpenStreetMap files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OTP" = callPackage
@@ -14580,8 +13369,6 @@ self: {
        testHaskellDepends = [ base bytestring tasty tasty-hunit time ];
        description = "HMAC-Based and Time-Based One-Time Passwords (HOTP & TOTP)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Object" = callPackage
@@ -14593,8 +13380,6 @@ self: {
        libraryHaskellDepends = [ base containers ghc template-haskell ];
        description = "Object oriented programming for haskell using multiparameter typeclasses";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ObjectIO" = callPackage
@@ -14610,8 +13395,6 @@ self: {
          winspool
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {comctl32 = null; comdlg32 = null; gdi32 = null; 
          kernel32 = null; ole32 = null; shell32 = null; user32 = null; 
          winmm = null; winspool = null;};
@@ -14660,8 +13443,6 @@ self: {
        ];
        description = "Simple unbalanced Octree for storing data about 3D points";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OddWord" = callPackage
@@ -14675,8 +13456,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Provides a wrapper for deriving word types with fewer bits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Omega" = callPackage
@@ -14689,8 +13468,6 @@ self: {
        testHaskellDepends = [ base containers HUnit ];
        description = "Integer sets and relations using Presburger arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OnRmt" = callPackage
@@ -14727,8 +13504,6 @@ self: {
        ];
        description = "Text UI library for performing parallel remote SSH operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OneTuple" = callPackage
@@ -14771,8 +13546,6 @@ self: {
        ];
        description = "IBM AFP document format parser and generator";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OpenAFP-Utils" = callPackage
@@ -14793,8 +13566,6 @@ self: {
        ];
        description = "Assorted utilities to work with AFP data streams";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OpenAL" = callPackage
@@ -14827,8 +13598,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Haskell high-level wrapper for OpenCL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {OpenCL = null;};
 
   "OpenCLRaw" = callPackage
@@ -14840,8 +13609,6 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "The OpenCL Standard for heterogenous data-parallel computing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OpenCLWrappers" = callPackage
@@ -14853,8 +13620,6 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "The OpenCL Standard for heterogenous data-parallel computing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OpenGL" = callPackage
@@ -14886,8 +13651,6 @@ self: {
        ];
        description = "Quickcheck instances for various data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OpenGLRaw" = callPackage
@@ -14935,8 +13698,6 @@ self: {
        ];
        description = "ADT wrapper and renderer for OpenSCAD models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OpenVG" = callPackage
@@ -14948,8 +13709,6 @@ self: {
        libraryHaskellDepends = [ base GLUT OpenGL OpenGLRaw OpenVGRaw ];
        description = "OpenVG (ShivaVG-0.2.1) binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OpenVGRaw" = callPackage
@@ -14961,8 +13720,6 @@ self: {
        libraryHaskellDepends = [ base OpenGLRaw ];
        description = "Raw binding to OpenVG (ShivaVG-0.2.1 implementation).";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Operads" = callPackage
@@ -14974,8 +13731,6 @@ self: {
        libraryHaskellDepends = [ array base containers mtl ];
        description = "Groebner basis computation for Operads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OptDir" = callPackage
@@ -15003,8 +13758,6 @@ self: {
        ];
        description = "A quasiquoter for or-patterns";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OrchestrateDB" = callPackage
@@ -15024,8 +13777,6 @@ self: {
        ];
        description = "Unofficial Haskell Client Library for the Orchestrate.io API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "OrderedBits" = callPackage
@@ -15071,8 +13822,6 @@ self: {
        testHaskellDepends = [ base safe threepenny-gui ];
        description = "A Programming Language in Construction";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Oslo-Vectize" = callPackage
@@ -15088,8 +13837,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PArrows" = callPackage
@@ -15114,8 +13861,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring Crypto random ];
        description = "Make password-based security schemes more secure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PCLT" = callPackage
@@ -15129,8 +13874,6 @@ self: {
        ];
        description = "Extension to Show: templating, catalogizing, languages, parameters, etc";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PCLT-DB" = callPackage
@@ -15147,8 +13890,6 @@ self: {
        ];
        description = "An addon to PCLT package: enchance PCLT catalog with PostgreSQL powers";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PDBtools" = callPackage
@@ -15173,8 +13914,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A generic derivable Haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PSQueue" = callPackage
@@ -15205,8 +13944,6 @@ self: {
        ];
        description = "An implementation of Montague's PTQ";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PUH-Project" = callPackage
@@ -15226,8 +13963,6 @@ self: {
        ];
        description = "This is a package which includes Assignments, Email, User and Reviews modules for Programming in Haskell course";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PageIO" = callPackage
@@ -15254,8 +13989,6 @@ self: {
        ];
        description = "Page-oriented extraction and composition library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Paillier" = callPackage
@@ -15274,8 +14007,6 @@ self: {
        ];
        description = "a simple Paillier cryptosystem";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PandocAgda" = callPackage
@@ -15296,8 +14027,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Pandoc support for literate Agda";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Paraiso" = callPackage
@@ -15322,8 +14051,6 @@ self: {
        ];
        description = "a code generator for partial differential equations solvers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Parallel-Arrows-BaseSpec" = callPackage
@@ -15373,8 +14100,6 @@ self: {
        ];
        description = "Eden based backend for @Parallel-Arrows-Definition@";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Parallel-Arrows-Multicore" = callPackage
@@ -15430,8 +14155,6 @@ self: {
        ];
        description = "A proven synchronization server for high performance computing";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ParsecTools" = callPackage
@@ -15476,8 +14199,6 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Simple library for generating passwords";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PastePipe" = callPackage
@@ -15508,8 +14229,6 @@ self: {
        ];
        description = "A tree used to merge and maintain paths";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Pathfinder" = callPackage
@@ -15522,8 +14241,6 @@ self: {
        librarySystemDepends = [ libxml2 ];
        description = "Relational optimiser and code generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libxml2;};
 
   "Peano" = callPackage
@@ -15546,8 +14263,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "GADT type witnesses for Peano-style natural numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PerfectHash" = callPackage
@@ -15564,8 +14279,6 @@ self: {
        librarySystemDepends = [ cmph ];
        description = "A perfect hashing library for mapping bytestrings to values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {cmph = null;};
 
   "PermuteEffects" = callPackage
@@ -15577,8 +14290,6 @@ self: {
        libraryHaskellDepends = [ base ReplicateEffects ];
        description = "Permutations of effectful computations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Persistence" = callPackage
@@ -15597,8 +14308,6 @@ self: {
        ];
        description = "A versatile library for topological data analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Phsu" = callPackage
@@ -15623,8 +14332,6 @@ self: {
        ];
        description = "Personal Happstack Server Utils";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Pipe" = callPackage
@@ -15636,8 +14343,6 @@ self: {
        libraryHaskellDepends = [ base filepath process unix ];
        description = "Process piping library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Piso" = callPackage
@@ -15649,8 +14354,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Partial isomorphisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PlayHangmanGame" = callPackage
@@ -15684,8 +14387,6 @@ self: {
        ];
        description = "Playing cards api";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Plot-ho-matic" = callPackage
@@ -15707,8 +14408,6 @@ self: {
        ];
        description = "Real-time line plotter for generic data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PlslTools" = callPackage
@@ -15728,8 +14427,6 @@ self: {
        ];
        description = "So far just a lint like program for PL/SQL. Diff and refactoring tools are planned";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Plural" = callPackage
@@ -15754,8 +14451,6 @@ self: {
        executableHaskellDepends = [ array base clock GLUT random ];
        description = "An imaginary world";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PortFusion" = callPackage
@@ -15769,8 +14464,6 @@ self: {
        executableHaskellDepends = [ base bytestring network splice ];
        description = "high-performance distributed reverse / forward proxy & tunneling for TCP";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PortMidi" = callPackage
@@ -15876,8 +14569,6 @@ self: {
        sha256 = "0n1gva510p69vy25zvjkzwqqz2gilbns1wnrzz2p22rjkkbrinvx";
        libraryHaskellDepends = [ base haskell98 pretty template-haskell ];
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PriorityChansConverger" = callPackage
@@ -15889,8 +14580,6 @@ self: {
        libraryHaskellDepends = [ base containers stm ];
        description = "Read single output from an array of inputs - channels with priorities";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ProbabilityMonads" = callPackage
@@ -15902,8 +14591,6 @@ self: {
        libraryHaskellDepends = [ base MaybeT MonadRandom mtl ];
        description = "Probability distribution monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "PropLogic" = callPackage
@@ -15932,8 +14619,6 @@ self: {
        executableHaskellDepends = [ base containers HUnit parsec syb ];
        description = "An implementation of propositional logic in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ProxN" = callPackage
@@ -15969,8 +14654,6 @@ self: {
        ];
        description = "A Perl 6 Implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Pup-Events" = callPackage
@@ -16023,8 +14706,6 @@ self: {
        ];
        description = "A networked event handling framework for hooking into other programs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Pup-Events-PQueue" = callPackage
@@ -16085,8 +14766,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl old-time random ];
        description = "The Quantum IO Monad is a library for defining quantum computations in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "QLearn" = callPackage
@@ -16098,8 +14777,6 @@ self: {
        libraryHaskellDepends = [ base random vector ];
        description = "A library for fast, easy-to-use Q-learning";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "QuadEdge" = callPackage
@@ -16111,8 +14788,6 @@ self: {
        libraryHaskellDepends = [ base random vector ];
        description = "QuadEdge structure for representing triangulations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "QuadTree" = callPackage
@@ -16125,8 +14800,6 @@ self: {
        testHaskellDepends = [ base composition lens QuickCheck ];
        description = "QuadTree library for Haskell, with lens support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "QuasiText" = callPackage
@@ -16162,8 +14835,6 @@ self: {
        ];
        description = "Programming with Eventual Consistency over Cassandra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "QuickAnnotate" = callPackage
@@ -16178,8 +14849,6 @@ self: {
        executableHaskellDepends = [ base haskell-src-exts ];
        description = "Annotation Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "QuickCheck_1_2_0_1" = callPackage
@@ -16245,8 +14914,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Generator of \"valid\" and \"invalid\" data in a type class";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "QuickPlot" = callPackage
@@ -16270,8 +14937,6 @@ self: {
        ];
        description = "Quick and easy data visualization with Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Quickson" = callPackage
@@ -16286,8 +14951,6 @@ self: {
        ];
        description = "Quick JSON extractions with Aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "R-pandoc" = callPackage
@@ -16305,8 +14968,6 @@ self: {
        ];
        executableHaskellDepends = [ base pandoc-types ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RANSAC" = callPackage
@@ -16382,8 +15043,6 @@ self: {
        ];
        description = "A reflective JSON serializer/parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RLP" = callPackage
@@ -16396,8 +15055,6 @@ self: {
        testHaskellDepends = [ base binary bytestring hspec ];
        description = "RLP serialization as defined in Ethereum Yellow Paper";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RMP" = callPackage
@@ -16418,8 +15075,6 @@ self: {
        executableSystemDepends = [ canlib ftd2xx ];
        description = "Binding to code that controls a Segway RMP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {canlib = null; ftd2xx = null;};
 
   "RNAFold" = callPackage
@@ -16442,8 +15097,6 @@ self: {
        ];
        description = "RNA secondary structure prediction";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RNAFoldProgs" = callPackage
@@ -16463,8 +15116,6 @@ self: {
        ];
        description = "RNA secondary structure folding";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RNAdesign" = callPackage
@@ -16490,8 +15141,6 @@ self: {
        executableHaskellDepends = [ bytestring cmdargs file-embed ];
        description = "Multi-target RNA sequence design";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RNAdraw" = callPackage
@@ -16511,8 +15160,6 @@ self: {
        executableHaskellDepends = [ cmdargs ];
        description = "Draw RNA secondary structures";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RNAlien" = callPackage
@@ -16545,8 +15192,6 @@ self: {
        ];
        description = "Unsupervized construction of RNA family models";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RNAwolf" = callPackage
@@ -16567,31 +15212,9 @@ self: {
        executableHaskellDepends = [ cmdargs split ];
        description = "RNA folding with non-canonical basepairs and base-triplets";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RSA" = callPackage
-    ({ mkDerivation, base, binary, bytestring, crypto-api
-     , crypto-pubkey-types, DRBG, QuickCheck, SHA, tagged
-     , test-framework, test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "RSA";
-       version = "2.3.1";
-       sha256 = "06k7nd7b1rdfb7891gw9bihrd9ripffbgqa14q1ryyj6vqa9r4jw";
-       libraryHaskellDepends = [
-         base binary bytestring crypto-api crypto-pubkey-types SHA
-       ];
-       testHaskellDepends = [
-         base binary bytestring crypto-api crypto-pubkey-types DRBG
-         QuickCheck SHA tagged test-framework test-framework-quickcheck2
-       ];
-       description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "RSA_2_4_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, crypto-api
      , crypto-pubkey-types, QuickCheck, SHA, tagged, test-framework
      , test-framework-quickcheck2
@@ -16609,7 +15232,6 @@ self: {
        ];
        description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RSolve" = callPackage
@@ -16694,8 +15316,6 @@ self: {
        libraryHaskellDepends = [ base HTTP-Simple network ];
        description = "Interface to random.org";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Randometer" = callPackage
@@ -16720,8 +15340,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Data structure for managing ranges";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Ranged-sets" = callPackage
@@ -16752,8 +15370,6 @@ self: {
        ];
        description = "HTTP to XMPP omegle chats gate";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Rasenschach" = callPackage
@@ -16774,8 +15390,6 @@ self: {
        ];
        description = "Soccer simulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Rasterific" = callPackage
@@ -16831,8 +15445,6 @@ self: {
        ];
        description = "Library to access Redmine's REST services";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Ref" = callPackage
@@ -16844,8 +15456,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Generic Mutable Ref Abstraction Layer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RefSerialize" = callPackage
@@ -16881,8 +15491,6 @@ self: {
        ];
        description = "A utility for computing distributions of material to review among reviewers";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RepLib" = callPackage
@@ -16898,8 +15506,6 @@ self: {
        ];
        description = "Generic programming library with representation types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ReplicateEffects" = callPackage
@@ -16911,8 +15517,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Composable replication schemes of applicative functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ReviewBoard" = callPackage
@@ -16931,8 +15535,6 @@ self: {
        ];
        description = "Haskell bindings to ReviewBoard";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RichConditional" = callPackage
@@ -16944,8 +15546,34 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Tiny library to replace classic if/else";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+     }) {};
+
+  "Ritt-Wu" = callPackage
+    ({ mkDerivation, algebra, base, criterion, deepseq, massiv
+     , scheduler, sscript, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "Ritt-Wu";
+       version = "0.1.0.0";
+       sha256 = "1jk9a2hgnm82b4b9cbfsw8aib1q4jrdb9zal858vbprsvx6ig36f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         algebra base criterion deepseq massiv scheduler sscript
+       ];
+       executableHaskellDepends = [
+         algebra base criterion deepseq massiv scheduler sscript
+       ];
+       testHaskellDepends = [
+         base deepseq scheduler tasty tasty-hunit tasty-quickcheck
+         tasty-smallcheck
+       ];
+       benchmarkHaskellDepends = [
+         algebra base criterion deepseq massiv scheduler sscript
+       ];
+       description = "Parallel implementation of Ritt-Wu's algorithm";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "Rlang-QQ" = callPackage
@@ -16969,8 +15597,6 @@ self: {
        testHaskellDepends = [ base directory doctest hspec lens vector ];
        description = "quasiquoter for inline-R code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RollingDirectory" = callPackage
@@ -16995,8 +15621,6 @@ self: {
        ];
        description = "Limits the size of a directory's contents";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "RoyalMonad" = callPackage
@@ -17029,8 +15653,6 @@ self: {
        libraryHaskellDepends = [ base containers stm transformers ];
        description = "Reactive Extensions for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "S3" = callPackage
@@ -17051,8 +15673,6 @@ self: {
        ];
        description = "Library for accessing S3 compatible storage services";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SBench" = callPackage
@@ -17070,8 +15690,6 @@ self: {
        ];
        description = "A benchmark suite for runtime and heap measurements over a series of inputs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SCRIPTWriter" = callPackage
@@ -17091,8 +15709,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "ESCRIPT: a human friendly language for programming Bitcoin scripts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SCalendar" = callPackage
@@ -17109,8 +15725,6 @@ self: {
        ];
        description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SDL" = callPackage
@@ -17226,8 +15840,6 @@ self: {
        ];
        description = "SFML bindings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {csfml-audio = null; csfml-graphics = null; 
          csfml-network = null; csfml-system = null; csfml-window = null; 
          sfml-audio = null; sfml-graphics = null; sfml-network = null; 
@@ -17242,8 +15854,6 @@ self: {
        libraryHaskellDepends = [ base mtl SFML template-haskell ];
        description = "Higher level library on top of SFML";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SFont" = callPackage
@@ -17255,8 +15865,6 @@ self: {
        libraryHaskellDepends = [ array base SDL Sprig ];
        description = "SFont SDL Bitmap Fonts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SG" = callPackage
@@ -17268,8 +15876,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Small geometry library for dealing with vectors and collision detection";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SGdemo" = callPackage
@@ -17283,8 +15889,6 @@ self: {
        executableHaskellDepends = [ base GLUT OpenGL SG ];
        description = "An example of using the SG and OpenGL libraries";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SGplus" = callPackage
@@ -17296,8 +15900,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "(updated) Small geometry library for dealing with vectors and collision detection";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SHA" = callPackage
@@ -17346,8 +15948,6 @@ self: {
        ];
        description = "A simple SMTP client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SNet" = callPackage
@@ -17364,8 +15964,6 @@ self: {
        libraryToolDepends = [ c2hsc ];
        description = "Declarative coördination language for streaming networks";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SQLDeps" = callPackage
@@ -17396,8 +15994,6 @@ self: {
        testHaskellDepends = [ base containers ];
        description = "STG Symbolic Execution";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "STL" = callPackage
@@ -17482,8 +16078,6 @@ self: {
        ];
        description = "translate a SVD of a Microcontroller to Haskell tables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SVG2Q" = callPackage
@@ -17501,8 +16095,6 @@ self: {
        ];
        description = "Code generation tool for Quartz code from a SVG";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SVGFonts" = callPackage
@@ -17569,8 +16161,6 @@ self: {
        ];
        description = "Generate a parser (in Haskell) with the SableCC parser generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Safe" = callPackage
@@ -17608,8 +16198,6 @@ self: {
        librarySystemDepends = [ glib mono ];
        description = "A .NET Bridge for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) glib; inherit (pkgs) mono;};
 
   "Saturnin" = callPackage
@@ -17685,8 +16273,6 @@ self: {
        ];
        description = "Scientific workflow management system";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SciFlow-drmaa" = callPackage
@@ -17703,8 +16289,6 @@ self: {
        ];
        description = "Scientific workflow management system";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ScratchFs" = callPackage
@@ -17723,8 +16307,6 @@ self: {
        ];
        description = "Size limited temp filesystem based on fuse";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Scurry" = callPackage
@@ -17743,8 +16325,6 @@ self: {
        ];
        description = "A cross platform P2P VPN application built using Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SecureHash-SHA3" = callPackage
@@ -17795,8 +16375,6 @@ self: {
        ];
        description = "Selects a representative subset of sequences from multiple sequence alignment";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Semantique" = callPackage
@@ -17815,8 +16393,6 @@ self: {
        ];
        description = "Command-line tool for maintaining the Semantique database";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Semigroup" = callPackage
@@ -17828,8 +16404,6 @@ self: {
        libraryHaskellDepends = [ base bytestring containers mtl ];
        description = "A semigroup";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SeqAlign" = callPackage
@@ -17841,8 +16415,6 @@ self: {
        libraryHaskellDepends = [ base bytestring vector ];
        description = "Sequence Alignment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SessionLogger" = callPackage
@@ -17858,8 +16430,6 @@ self: {
        ];
        description = "Easy Loggingframework";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Set" = callPackage
@@ -17914,8 +16484,6 @@ self: {
        libraryHaskellDepends = [ base directory mtl unix ];
        description = "A framework for creating shell envinronments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Shellac-compatline" = callPackage
@@ -17929,8 +16497,6 @@ self: {
        libraryHaskellDepends = [ base Shellac Shellac-readline ];
        description = "\"compatline\" backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Shellac-editline" = callPackage
@@ -17944,8 +16510,6 @@ self: {
        libraryHaskellDepends = [ base editline Shellac ];
        description = "Editline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Shellac-haskeline" = callPackage
@@ -17957,8 +16521,6 @@ self: {
        libraryHaskellDepends = [ base haskeline mtl Shellac ];
        description = "Haskeline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Shellac-readline" = callPackage
@@ -17972,8 +16534,6 @@ self: {
        libraryHaskellDepends = [ base readline Shellac ];
        description = "Readline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ShortestPathProblems" = callPackage
@@ -17994,8 +16554,6 @@ self: {
        ];
        description = "grammars for TSP and SHP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ShowF" = callPackage
@@ -18069,8 +16627,6 @@ self: {
        ];
        description = "A Simple Graphics Library from the SimpleH framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SimpleH" = callPackage
@@ -18107,8 +16663,6 @@ self: {
        ];
        description = "Simple, configurable logging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SimpleServer" = callPackage
@@ -18129,8 +16683,6 @@ self: {
        ];
        description = "A simple static file server, for when apache is overkill";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SimpleTableGenerator" = callPackage
@@ -18192,8 +16744,6 @@ self: {
        testHaskellDepends = [ base file-embed ];
        description = "Generate slides from Haskell code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Smooth" = callPackage
@@ -18209,8 +16759,6 @@ self: {
        ];
        description = "A tiny, lazy SMT solver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SmtLib" = callPackage
@@ -18222,8 +16770,6 @@ self: {
        libraryHaskellDepends = [ base parsec transformers ];
        description = "Library for parsing SMTLIB2";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Snusmumrik" = callPackage
@@ -18246,8 +16792,6 @@ self: {
        executableToolDepends = [ cpphs ];
        description = "E-library directory based on FUSE virtual file system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) zip;};
 
   "SoOSiM" = callPackage
@@ -18264,8 +16808,6 @@ self: {
        ];
        description = "Abstract full system simulator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SoccerFun" = callPackage
@@ -18285,8 +16827,6 @@ self: {
        ];
        description = "Football simulation framework for teaching functional programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SoccerFunGL" = callPackage
@@ -18306,8 +16846,6 @@ self: {
        ];
        description = "OpenGL UI for the SoccerFun framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Sonnex" = callPackage
@@ -18320,8 +16858,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Sonnex is an alternative to Soundex for french language";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SourceGraph" = callPackage
@@ -18340,8 +16876,6 @@ self: {
        ];
        description = "Static code analysis using graph-theoretic techniques";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Southpaw" = callPackage
@@ -18374,8 +16908,6 @@ self: {
        executableHaskellDepends = [ array base HGL random Yampa ];
        description = "Video game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SpacePrivateers" = callPackage
@@ -18397,8 +16929,6 @@ self: {
        ];
        description = "Simple space pirate roguelike";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SpinCounter" = callPackage
@@ -18410,8 +16940,6 @@ self: {
        libraryHaskellDepends = [ base monad-loops ref-mtl stm ];
        description = "Lock free Spin Counter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Spintax" = callPackage
@@ -18452,8 +16980,6 @@ self: {
        ];
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Spock-api" = callPackage
@@ -18480,8 +17006,6 @@ self: {
        ];
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Spock-api-server" = callPackage
@@ -18493,8 +17017,6 @@ self: {
        libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ];
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Spock-auth" = callPackage
@@ -18506,8 +17028,6 @@ self: {
        libraryHaskellDepends = [ base http-types Spock text time ];
        description = "Provides authentification helpers for Spock";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Spock-core" = callPackage
@@ -18536,8 +17056,6 @@ self: {
        ];
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Spock-digestive" = callPackage
@@ -18554,8 +17072,6 @@ self: {
        ];
        description = "Digestive functors support for Spock";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Spock-lucid" = callPackage
@@ -18567,8 +17083,6 @@ self: {
        libraryHaskellDepends = [ base lucid Spock transformers ];
        description = "Lucid support for Spock";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Spock-worker" = callPackage
@@ -18586,8 +17100,6 @@ self: {
        testHaskellDepends = [ base containers HTF stm vector ];
        description = "Background workers for Spock";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SpreadsheetML" = callPackage
@@ -18610,8 +17122,6 @@ self: {
        libraryHaskellDepends = [ base SDL ];
        description = "Binding to Sprig";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Stack" = callPackage
@@ -18639,8 +17149,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A simple MVCC like library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "StateVar" = callPackage
@@ -18705,8 +17213,6 @@ self: {
        ];
        description = "Client library for Stomp brokers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Strafunski-ATermLib" = callPackage
@@ -18718,8 +17224,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "An abstract data type designed for the exchange of tree-like data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Strafunski-Sdf2Haskell" = callPackage
@@ -18739,8 +17243,6 @@ self: {
        ];
        description = "Converts SDF to Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Strafunski-StrategyLib" = callPackage
@@ -18771,8 +17273,6 @@ self: {
        testHaskellDepends = [ base blaze-builder bytestring hspec text ];
        description = "General purpose templates in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "StrategyLib" = callPackage
@@ -18807,8 +17307,6 @@ self: {
        libraryHaskellDepends = [ base benchpress parallel ];
        description = "Benchmarking code through strict evaluation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "StrictCheck" = callPackage
@@ -18827,8 +17325,6 @@ self: {
        ];
        description = "StrictCheck: Keep Your Laziness In Check";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "StringUtils" = callPackage
@@ -18866,8 +17362,6 @@ self: {
        ];
        description = "Suffix array construction";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SybWidget" = callPackage
@@ -18883,8 +17377,6 @@ self: {
        ];
        description = "Library which aids constructing generic (SYB3-based) widgets";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "SyntaxMacros" = callPackage
@@ -18901,8 +17393,6 @@ self: {
        ];
        description = "Syntax Macros in the form of an EDSL";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Sysmon" = callPackage
@@ -18923,8 +17413,6 @@ self: {
        ];
        description = "Sybase 15 sysmon reports processor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TBC" = callPackage
@@ -18945,8 +17433,6 @@ self: {
        ];
        description = "Testing By Convention";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TBit" = callPackage
@@ -18963,8 +17449,6 @@ self: {
        ];
        description = "Utilities for condensed matter physics tight binding calculations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TCache" = callPackage
@@ -19013,8 +17497,6 @@ self: {
        executableHaskellDepends = [ base bytestring Yampa ];
        description = "Bindings to the TORCS vehicle simulator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TTTAS" = callPackage
@@ -19052,8 +17534,6 @@ self: {
        ];
        description = "Template Your Boilerplate - a Template Haskell version of SYB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TableAlgebra" = callPackage
@@ -19082,8 +17562,6 @@ self: {
        executableHaskellDepends = [ base cookbook ];
        description = "A client for Quill databases";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Tablify" = callPackage
@@ -19097,8 +17575,6 @@ self: {
        executableHaskellDepends = [ base parsec xhtml ];
        description = "Tool to render CSV into tables of various formats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Tahin" = callPackage
@@ -19142,8 +17618,6 @@ self: {
        libraryHaskellDepends = [ base mtl old-time time ];
        description = "Database library with left-fold interface, for PostgreSQL, Oracle, SQLite, ODBC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Tape" = callPackage
@@ -19155,8 +17629,6 @@ self: {
        libraryHaskellDepends = [ base comonad distributive Stream ];
        description = "Bidirectionally infinite streams, akin to the tape of a Turing machine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TaskMonad" = callPackage
@@ -19190,8 +17662,6 @@ self: {
        ];
        description = "Libary for parsing, processing and vizualization of taxonomy data";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TaxonomyTools" = callPackage
@@ -19211,8 +17681,6 @@ self: {
        ];
        description = "Tool for parsing, processing, comparing and visualizing taxonomy data";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TeX-my-math" = callPackage
@@ -19239,8 +17707,6 @@ self: {
        ];
        description = "Render general Haskell math to LaTeX. Or: math typesetting with high signal-to-noise–ratio.";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TeaHS" = callPackage
@@ -19256,8 +17722,6 @@ self: {
        ];
        description = "TeaHS Game Creation Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Tensor" = callPackage
@@ -19301,8 +17765,6 @@ self: {
        ];
        description = "Generates testcases from program-snippets";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Theora" = callPackage
@@ -19314,8 +17776,6 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ ogg theora ];
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {ogg = null; theora = null;};
 
   "Thingie" = callPackage
@@ -19327,8 +17787,6 @@ self: {
        libraryHaskellDepends = [ base cairo gtk mtl ];
        description = "Purely functional 2D drawing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ThreadObjects" = callPackage
@@ -19386,8 +17844,6 @@ self: {
        ];
        description = "A sub-project (exercise) for a functional programming course";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TigerHash" = callPackage
@@ -19422,8 +17878,6 @@ self: {
        ];
        description = "A simple tile-based digital clock screen saver";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TinyLaunchbury" = callPackage
@@ -19435,8 +17889,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Simple implementation of call-by-need using Launchbury's semantics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TinyURL" = callPackage
@@ -19448,8 +17900,6 @@ self: {
        libraryHaskellDepends = [ base HTTP network ];
        description = "Use TinyURL to compress URLs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Titim" = callPackage
@@ -19463,8 +17913,6 @@ self: {
        executableHaskellDepends = [ base containers matrix random ];
        description = "Game for Lounge Marmelade";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Top" = callPackage
@@ -19479,8 +17927,6 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec ];
        description = "Constraint solving framework employed by the Helium Compiler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TotalMap" = callPackage
@@ -19517,8 +17963,6 @@ self: {
        ];
        description = "Tournament related algorithms";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TraceUtils" = callPackage
@@ -19547,8 +17991,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "eDSL in R for Safe Variable Transformarion";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TransformersStepByStep" = callPackage
@@ -19562,8 +18004,6 @@ self: {
        executableHaskellDepends = [ base containers mtl ];
        description = "Tutorial on monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Transhare" = callPackage
@@ -19586,8 +18026,6 @@ self: {
        libraryHaskellDepends = [ base ref-mtl stm ];
        description = "Wait-free Tree Counter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TreeStructures" = callPackage
@@ -19599,8 +18037,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A collection of heaps and search trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TreeT" = callPackage
@@ -19623,8 +18059,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim monad-loops ref-mtl stm ];
        description = "Lock free Treiber stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TrendGraph" = callPackage
@@ -19641,8 +18075,6 @@ self: {
        ];
        description = "A simple trend Graph script";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TrieMap" = callPackage
@@ -19660,8 +18092,6 @@ self: {
        ];
        description = "Automatic type inference of generalized tries with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Twofish" = callPackage
@@ -19700,8 +18130,6 @@ self: {
        ];
        description = "Typing speed game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TypeCompose" = callPackage
@@ -19728,8 +18156,6 @@ self: {
        executableHaskellDepends = [ base haskell98 ];
        description = "TypeIlluminator is a prototype tool exploring debugging of type errors/";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TypeNat" = callPackage
@@ -19741,8 +18167,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Some Nat-indexed types for GHC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "TypingTester" = callPackage
@@ -19788,8 +18212,6 @@ self: {
        ];
        description = "A small command-line accounting tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "URLT" = callPackage
@@ -19807,8 +18229,6 @@ self: {
        ];
        description = "Library for maintaining correctness of URLs within an application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "URLb" = callPackage
@@ -19820,8 +18240,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring containers ];
        description = "DEPRECATED A simple, liberal URL parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "UTFTConverter" = callPackage
@@ -19845,8 +18263,6 @@ self: {
        ];
        description = "Processing popular picture formats into .c or .raw format in RGB565";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Unique" = callPackage
@@ -19906,8 +18322,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Monadic FRP library based on stm";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "UrlDisp" = callPackage
@@ -19919,8 +18333,6 @@ self: {
        libraryHaskellDepends = [ base cgi MaybeT mtl ];
        description = "Url dispatcher. Helps to retain friendly URLs in web applications.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Useful" = callPackage
@@ -19973,8 +18385,29 @@ self: {
        ];
        description = "Provides access to Vkontakte social network via public API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+     }) {};
+
+  "VRML" = callPackage
+    ({ mkDerivation, aeson, base, doctest, megaparsec, pretty-simple
+     , prettyprinter, text
+     }:
+     mkDerivation {
+       pname = "VRML";
+       version = "0.1.0.0";
+       sha256 = "17dnxkr8y2g65anas5vg76cqyxbcp2zzxayf8lc2d5iigxnrvsgq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base megaparsec prettyprinter text
+       ];
+       executableHaskellDepends = [
+         aeson base megaparsec pretty-simple prettyprinter text
+       ];
+       testHaskellDepends = [
+         aeson base doctest megaparsec prettyprinter text
+       ];
+       description = "VRML parser and generator for Haskell";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "Validation" = callPackage
@@ -19988,8 +18421,6 @@ self: {
        ];
        description = "A data-type like Either but with an accumulating Applicative";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Vec" = callPackage
@@ -20012,8 +18443,6 @@ self: {
        libraryHaskellDepends = [ base Boolean Vec ];
        description = "Provides Boolean instances for the Vec package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Vec-OpenGLRaw" = callPackage
@@ -20025,8 +18454,6 @@ self: {
        libraryHaskellDepends = [ base OpenGLRaw Vec ];
        description = "Instances and functions to interoperate Vec and OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Vec-Transform" = callPackage
@@ -20038,8 +18465,6 @@ self: {
        doHaddock = false;
        description = "This package is obsolete";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "VecN" = callPackage
@@ -20065,8 +18490,6 @@ self: {
        executableHaskellDepends = [ base containers matrix ];
        description = "A solver for the WordBrain game";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ViennaRNA-bindings" = callPackage
@@ -20110,8 +18533,6 @@ self: {
        ];
        description = "ViennaRNA v2 extensions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ViennaRNAParser" = callPackage
@@ -20158,8 +18579,6 @@ self: {
        ];
        description = "Villefort is a task manager and time tracker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Vulkan" = callPackage
@@ -20187,8 +18606,6 @@ self: {
        ];
        description = "WAVE audio file IO library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WL500gPControl" = callPackage
@@ -20205,8 +18622,6 @@ self: {
        ];
        description = "A simple command line tools to control the Asus WL500gP router";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WL500gPLib" = callPackage
@@ -20221,8 +18636,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A simple library to access to the WL 500gP router from the Haskell code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WMSigner" = callPackage
@@ -20242,8 +18655,6 @@ self: {
        ];
        description = "WebMoney authentication module";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WURFL" = callPackage
@@ -20255,8 +18666,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 parsec ];
        description = "Convert the WURFL file into a Parsec parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WXDiffCtrl" = callPackage
@@ -20269,8 +18678,6 @@ self: {
        libraryHaskellDepends = [ base containers wx wxcore ];
        description = "WXDiffCtrl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WashNGo" = callPackage
@@ -20289,8 +18696,6 @@ self: {
        executableHaskellDepends = [ directory ghc-paths process ];
        description = "WASH is a family of EDSLs for programming Web applications in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WaveFront" = callPackage
@@ -20307,8 +18712,6 @@ self: {
        ];
        description = "Parsers and utilities for the OBJ WaveFront 3D model format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Weather" = callPackage
@@ -20335,8 +18738,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl parsec pretty syb ];
        description = "JavaScript analysis tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WebBits-Html" = callPackage
@@ -20352,8 +18753,6 @@ self: {
        ];
        description = "JavaScript analysis tools";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WebBits-multiplate" = callPackage
@@ -20370,8 +18769,6 @@ self: {
        ];
        description = "A Multiplate instance for JavaScript";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WebCont" = callPackage
@@ -20390,8 +18787,6 @@ self: {
        ];
        description = "Continuation based web programming for Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WeberLogic" = callPackage
@@ -20406,8 +18801,6 @@ self: {
        executableHaskellDepends = [ base parsec ];
        description = "Logic interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Webrexp" = callPackage
@@ -20434,8 +18827,6 @@ self: {
        ];
        description = "Regexp-like engine to scrap web data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Wheb" = callPackage
@@ -20460,8 +18851,6 @@ self: {
        ];
        description = "The frictionless WAI Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WikimediaParser" = callPackage
@@ -20473,8 +18862,6 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "A parser for wikimedia style article markup";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Win32" = callPackage
@@ -20653,8 +19040,6 @@ self: {
        ];
        description = "Wire-aware hardware description";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WordAlignment" = callPackage
@@ -20694,8 +19079,6 @@ self: {
        ];
        description = "Bigram word pair alignments";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WordNet" = callPackage
@@ -20709,8 +19092,6 @@ self: {
        libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WordNet-ghc74" = callPackage
@@ -20724,8 +19105,6 @@ self: {
        libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Wordlint" = callPackage
@@ -20760,8 +19139,6 @@ self: {
        ];
        description = "Workflow patterns over a monad for thread state logging & recovery";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "WxGeneric" = callPackage
@@ -20776,8 +19153,6 @@ self: {
        ];
        description = "Generic (SYB3) construction of wxHaskell widgets";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "X" = callPackage
@@ -20823,8 +19198,6 @@ self: {
        librarySystemDepends = [ libX11 ];
        description = "Missing bindings to the X11 graphics library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs.xorg) libX11;};
 
   "X11-rm" = callPackage
@@ -20836,8 +19209,6 @@ self: {
        libraryHaskellDepends = [ base X11 ];
        description = "A binding to the resource management functions missing from X11";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "X11-xdamage" = callPackage
@@ -20850,8 +19221,6 @@ self: {
        librarySystemDepends = [ Xdamage ];
        description = "A binding to the Xdamage X11 extension library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {Xdamage = null;};
 
   "X11-xfixes" = callPackage
@@ -20864,8 +19233,6 @@ self: {
        librarySystemDepends = [ Xfixes ];
        description = "A binding to the Xfixes X11 extension library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {Xfixes = null;};
 
   "X11-xft" = callPackage
@@ -20924,6 +19291,8 @@ self: {
        pname = "XML";
        version = "0.0.1.0";
        sha256 = "1cix816q5q45gyw48634ar4x50wmmqqn4cwz94czvlb7v03qc8rv";
+       revision = "1";
+       editedCabalFile = "01hxvcp2g9vwpafr7nv4dcl1iny2w973ikhdlj59i0zcrd9k92aw";
        libraryHaskellDepends = [
          base base-unicode-symbols hs-functors multivector txt util vector
        ];
@@ -20955,8 +19324,6 @@ self: {
        librarySystemDepends = [ xmmsclient xmmsclient-glib ];
        description = "XMMS2 client library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {xmmsclient = null; xmmsclient-glib = null;};
 
   "XMPP" = callPackage
@@ -20973,8 +19340,6 @@ self: {
        ];
        description = "XMPP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "XSaiga" = callPackage
@@ -20997,8 +19362,6 @@ self: {
        ];
        description = "An implementation of a polynomial-time top-down parser suitable for NLP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Xauth" = callPackage
@@ -21029,8 +19392,6 @@ self: {
        ];
        description = "Gtk command launcher with identicon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "XmlHtmlWriter" = callPackage
@@ -21042,8 +19403,6 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A library for writing XML and HTML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Xorshift128Plus" = callPackage
@@ -21055,8 +19414,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Pure haskell implementation of xorshift128plus random number generator";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "YACPong" = callPackage
@@ -21077,8 +19434,6 @@ self: {
        ];
        description = "Yet Another Pong Clone using SDL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "YFrob" = callPackage
@@ -21090,8 +19445,6 @@ self: {
        libraryHaskellDepends = [ array base HGL Yampa ];
        description = "Yampa-based library for programming robots";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Yablog" = callPackage
@@ -21126,8 +19479,6 @@ self: {
        ];
        description = "A simple blog engine powered by Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "YamlReference" = callPackage
@@ -21171,8 +19522,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Elegant Functional Reactive Programming Language for Hybrid Systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Yampa-core" = callPackage
@@ -21204,8 +19553,6 @@ self: {
        ];
        description = "Software synthesizer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Yocto" = callPackage
@@ -21233,8 +19580,6 @@ self: {
        ];
        description = "A MUD client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Yogurt-Standalone" = callPackage
@@ -21254,8 +19599,6 @@ self: {
        executableSystemDepends = [ readline ];
        description = "A functional MUD client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) readline;};
 
   "ZEBEDDE" = callPackage
@@ -21269,8 +19612,6 @@ self: {
        libraryHaskellDepends = [ base vect ];
        description = "Polymer growth simulation method";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ZFS" = callPackage
@@ -21286,8 +19627,6 @@ self: {
        ];
        description = "Oleg's Zipper FS";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ZMachine" = callPackage
@@ -21302,8 +19641,6 @@ self: {
        executableHaskellDepends = [ array base gtk mtl random ];
        description = "A Z-machine interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ZipFold" = callPackage
@@ -21343,8 +19680,6 @@ self: {
        testHaskellDepends = [ base containers random tasty tasty-hunit ];
        description = "Graphing library wrapper + assorted useful functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Zwaluw" = callPackage
@@ -21356,8 +19691,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Combinators for bidirectional URL routing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "a50" = callPackage
@@ -21376,8 +19709,6 @@ self: {
        ];
        description = "Compare genome assemblies";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "abacate" = callPackage
@@ -21431,8 +19762,6 @@ self: {
        ];
        description = "Bindings for ABC, A System for Sequential Synthesis and Verification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {abc = null;};
 
   "abcnotation" = callPackage
@@ -21446,8 +19775,6 @@ self: {
        ];
        description = "Haskell representation and parser for ABC notation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "abeson" = callPackage
@@ -21467,8 +19794,6 @@ self: {
        ];
        description = "interconversion between aeson and bson";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "abides" = callPackage
@@ -21481,8 +19806,6 @@ self: {
        testHaskellDepends = [ base comonad tasty tasty-quickcheck ];
        description = "Simple boolean tests to see if a value abides by certain properties";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "abnf" = callPackage
@@ -21502,8 +19825,6 @@ self: {
        ];
        description = "Parse ABNF and generate parsers for the specified document";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "abstract-deque" = callPackage
@@ -21559,8 +19880,6 @@ self: {
        ];
        description = "Provides the class ParAccelerate, nothing more";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "abt" = callPackage
@@ -21576,8 +19895,6 @@ self: {
        ];
        description = "Abstract binding trees for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ac-machine" = callPackage
@@ -21591,8 +19908,6 @@ self: {
        ];
        description = "Aho-Corasick string matching algorithm in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ac-machine-conduit" = callPackage
@@ -21604,8 +19919,6 @@ self: {
        libraryHaskellDepends = [ ac-machine base conduit text ];
        description = "Drive Aho-Corasick machines in Conduit pipelines";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "accelerate" = callPackage
@@ -21650,8 +19963,6 @@ self: {
        ];
        description = "Linear algebra and interpolation using the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "accelerate-bignum" = callPackage
@@ -21864,8 +20175,6 @@ self: {
        ];
        description = "Accelerate frontend to the FFTW library (Fourier transform)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "accelerate-fourier" = callPackage
@@ -21891,8 +20200,6 @@ self: {
        ];
        description = "Fast Fourier transform and convolution using the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "accelerate-fourier-benchmark" = callPackage
@@ -21941,8 +20248,8 @@ self: {
      }:
      mkDerivation {
        pname = "accelerate-kullback-liebler";
-       version = "0.1.1.0";
-       sha256 = "1dkhbv6nmay7mh52y4d5mw5pvxznz802hhx33bcjxgn2ws8nwzhy";
+       version = "0.1.2.0";
+       sha256 = "16psmn0wakrrym8m98ing4nrh8r7qvbn04b28sicl5jdbfhg1fdn";
        libraryHaskellDepends = [ accelerate base mwc-random-accelerate ];
        testHaskellDepends = [
          accelerate accelerate-llvm-native accelerate-llvm-ptx base
@@ -21956,8 +20263,6 @@ self: {
        doHaddock = false;
        description = "Kullback-Liebler divergence";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "accelerate-llvm" = callPackage
@@ -21979,8 +20284,6 @@ self: {
        ];
        description = "Accelerate backend component generating LLVM IR";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "accelerate-llvm-native" = callPackage
@@ -22003,8 +20306,6 @@ self: {
        testHaskellDepends = [ accelerate base ];
        description = "Accelerate backend for multicore CPUs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "accelerate-llvm-ptx" = callPackage
@@ -22037,8 +20338,6 @@ self: {
        libraryHaskellDepends = [ accelerate base mwc-random ];
        description = "Generate Accelerate arrays filled with high quality pseudorandom numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "accelerate-typelits" = callPackage
@@ -22061,8 +20360,6 @@ self: {
        ];
        description = "a typesafe way encode accelerate matrices and vectors";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "accelerate-utility" = callPackage
@@ -22074,8 +20371,6 @@ self: {
        libraryHaskellDepends = [ accelerate base utility-ht ];
        description = "Utility functions for the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "accentuateus" = callPackage
@@ -22087,8 +20382,6 @@ self: {
        libraryHaskellDepends = [ base bytestring HTTP json network text ];
        description = "A Haskell implementation of the Accentuate.us API.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "access-time" = callPackage
@@ -22100,8 +20393,6 @@ self: {
        libraryHaskellDepends = [ base filepath old-time time unix ];
        description = "Cross-platform support for retrieving file access times";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "access-token-provider" = callPackage
@@ -22128,8 +20419,6 @@ self: {
        ];
        description = "Provides Access Token for Services";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "accuerr" = callPackage
@@ -22215,8 +20504,6 @@ self: {
        ];
        description = "A replication backend for acid-state";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acid-state-tls" = callPackage
@@ -22232,8 +20519,6 @@ self: {
        ];
        description = "Add TLS support for Data.Acid.Remote";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acl2" = callPackage
@@ -22256,8 +20541,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "A monad which is powerful enough to interpret any action";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-box" = callPackage
@@ -22333,8 +20616,6 @@ self: {
        libraryHaskellDepends = [ base comonad ];
        description = "A more efficient dualization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-cuteboy" = callPackage
@@ -22396,8 +20677,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Stop execution with rage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-functors" = callPackage
@@ -22431,8 +20710,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An embedded DSL for the HQ9+ programming language";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-http" = callPackage
@@ -22450,8 +20727,6 @@ self: {
        ];
        description = "fastest Haskell PONG server in the world";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-inator" = callPackage
@@ -22466,8 +20741,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Evil inventions in the Tri-State area";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-io" = callPackage
@@ -22502,8 +20775,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A place for dumping that does-not-feel-right code while you improve it";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-left-pad" = callPackage
@@ -22515,8 +20786,6 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "free your haskell from the tyranny of npm!";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-lolcat" = callPackage
@@ -22572,8 +20841,6 @@ self: {
        libraryHaskellDepends = [ base random ];
        description = "Miscellaneous newtypes for orderings of discutable use";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-missiles" = callPackage
@@ -22599,8 +20866,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A mutable package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-now" = callPackage
@@ -22612,8 +20877,6 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "An interface to the philosophical and metaphysical \"now\"";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-numbersystem" = callPackage
@@ -22625,8 +20888,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Define the less than and add and subtract for nats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-omitted" = callPackage
@@ -22661,8 +20922,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Operators of base, all in one place!";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-php" = callPackage
@@ -22674,8 +20933,6 @@ self: {
        libraryHaskellDepends = [ acme-left-pad base ];
        description = "The flexibility of Haskell and the safety of PHP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-pointful-numbers" = callPackage
@@ -22727,8 +20984,6 @@ self: {
        ];
        description = "Proper names for curry and uncurry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-smuggler" = callPackage
@@ -22752,8 +21007,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "A binding to the glibc strfry function";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-stringly-typed" = callPackage
@@ -22767,8 +21020,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Stringly Typed Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-strtok" = callPackage
@@ -22830,8 +21081,6 @@ self: {
        libraryHaskellDepends = [ array base random ];
        description = "A somewhat flexible Zalgo̐ te̳͜x̥̖̉̓͞t̍̌̔ ̀̃t̴̢̞̜͓̝r̶̬̆̂̒͟á̧̡͎͔̯̰̕n̹̾̓ͬͦ̍͘ṡ̢͓͉ͮ͆l̠̖̹̗̳̖̽̌ͤ͞a͚̭͙̹̲ͭͩt͈͐o̢̭͇͍̟͐ͬ̾ͪ͜r͇.̸̅ͭ̐̀̊ͨ͛";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acme-zero" = callPackage
@@ -22843,8 +21092,6 @@ self: {
        doHaddock = false;
        description = "The absorbing element of package dependencies";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "acousticbrainz-client" = callPackage
@@ -22900,6 +21147,8 @@ self: {
        pname = "active";
        version = "0.2.0.14";
        sha256 = "0x3b4ln6csa554qls28wbxvclkbdz3yi60i1m0q5ing0cs16fifz";
+       revision = "1";
+       editedCabalFile = "01j431dkl3ax98g974v6mgxv9xha4c0hlpjqq5fvh7l8lyjan676";
        libraryHaskellDepends = [
          base lens linear semigroupoids semigroups vector
        ];
@@ -22936,8 +21185,6 @@ self: {
        ];
        description = "Haskell code presentation tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "activehs-base" = callPackage
@@ -22951,8 +21198,6 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Basic definitions for activehs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "activitypub" = callPackage
@@ -22964,8 +21209,6 @@ self: {
        libraryHaskellDepends = [ aeson base network-uri text time ];
        description = "ActivityPub Haskell Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "activitystreams-aeson" = callPackage
@@ -22979,8 +21222,6 @@ self: {
        ];
        description = "An interface to the ActivityStreams specification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "actor" = callPackage
@@ -22993,31 +21234,26 @@ self: {
        libraryHaskellDepends = [ base haskell98 stm time ];
        description = "Actors with multi-headed receive clauses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
-  "ad" = callPackage
-    ({ mkDerivation, array, base, Cabal, cabal-doctest, comonad
-     , containers, criterion, data-reify, directory, doctest, erf
-     , filepath, free, nats, reflection, semigroups, transformers
+  "acts" = callPackage
+    ({ mkDerivation, base, deepseq, finitary, finite-typelits, groups
      }:
      mkDerivation {
-       pname = "ad";
-       version = "4.3.6";
-       sha256 = "0fgpv3lm20k1vwlychs7a76hn96cvpbczkdcbg9mr9f1nivg7035";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       pname = "acts";
+       version = "0.3.0.0";
+       sha256 = "1jsx3hv7krsd22ygaxln4sc7wjcs4dp5qwpr515l2gd9drmpz6ip";
+       revision = "1";
+       editedCabalFile = "0lh6clbc8ba3v3mxr34rlapwqkzgf4ny0g8gr1j4ndpk8wc70pn5";
        libraryHaskellDepends = [
-         array base comonad containers data-reify erf free nats reflection
-         semigroups transformers
+         base deepseq finitary finite-typelits groups
        ];
-       testHaskellDepends = [ base directory doctest filepath ];
-       benchmarkHaskellDepends = [ base criterion erf ];
-       description = "Automatic Differentiation";
+       doHaddock = false;
+       description = "Semigroup actions and torsors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ad_4_4" = callPackage
+  "ad" = callPackage
     ({ mkDerivation, array, base, Cabal, cabal-doctest, comonad
      , containers, criterion, data-reify, directory, doctest, erf
      , filepath, free, nats, reflection, semigroups, transformers
@@ -23035,7 +21271,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion erf ];
        description = "Automatic Differentiation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "adaptive-containers" = callPackage
@@ -23047,8 +21282,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Self optimizing container types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "adaptive-tuple" = callPackage
@@ -23060,8 +21293,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell type-level ];
        description = "Self-optimizing tuple types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "adb" = callPackage
@@ -23076,8 +21307,6 @@ self: {
        ];
        description = "Android Debug Bridge (ADB) protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "adblock2privoxy" = callPackage
@@ -23129,8 +21358,6 @@ self: {
        ];
        description = "Ad-hoc P2P network protocol";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "adict" = callPackage
@@ -23152,8 +21379,6 @@ self: {
        ];
        description = "Approximate dictionary searching";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "adjunction" = callPackage
@@ -23223,8 +21448,6 @@ self: {
        ];
        description = "parse Adobe Swatch Exchange files and (optionally) output .css files with the colors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "adp-multi" = callPackage
@@ -23245,8 +21468,6 @@ self: {
        ];
        description = "ADP for multiple context-free languages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "adp-multi-monadiccp" = callPackage
@@ -23266,8 +21487,6 @@ self: {
        ];
        description = "Subword construction in adp-multi using monadiccp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "adtrees" = callPackage
@@ -23279,29 +21498,9 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Modelling, rendering and quantitative analysis on attack defense trees";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "advent-of-code-api" = callPackage
-    ({ mkDerivation, attoparsec, base, containers, curl, deepseq
-     , directory, filepath, finite-typelits, HUnit, mtl, tagsoup, text
-     , time, uri-encode
-     }:
-     mkDerivation {
-       pname = "advent-of-code-api";
-       version = "0.1.2.3";
-       sha256 = "1ma9x8dxvhrgxg55bcf6l1d5w1mnmplav2yisnyrgs5034jqpm7l";
-       libraryHaskellDepends = [
-         attoparsec base containers curl deepseq directory filepath
-         finite-typelits mtl tagsoup text time uri-encode
-       ];
-       testHaskellDepends = [ base directory filepath HUnit text ];
-       description = "Advent of Code REST API bindings";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "advent-of-code-api_0_2_7_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , directory, filepath, finite-typelits, http-api-data, http-client
      , http-client-tls, http-media, HUnit, megaparsec, mtl, profunctors
@@ -23321,7 +21520,6 @@ self: {
        testHaskellDepends = [ base directory filepath HUnit text ];
        description = "Advent of Code REST API bindings and servant API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aern2-mp" = callPackage
@@ -23340,8 +21538,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Multi-precision ball (interval) arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aern2-real" = callPackage
@@ -23365,8 +21561,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Exact real numbers via Cauchy sequences and MPFR";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson_0_7_0_6" = callPackage
@@ -23438,8 +21632,6 @@ self: {
        libraryHaskellDepends = [ aeson base text unordered-containers ];
        description = "make To/From JSOn instances from an applicative description";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-attoparsec" = callPackage
@@ -23559,8 +21751,6 @@ self: {
        ];
        description = "Easy functions for converting from Aeson.Value";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-default" = callPackage
@@ -23619,8 +21809,6 @@ self: {
        ];
        description = "Apply a json-patch to any haskell datatype";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-extra" = callPackage
@@ -23714,8 +21902,6 @@ self: {
        ];
        description = "Create Flow type definitions from Haskell data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-gadt-th" = callPackage
@@ -23741,8 +21927,6 @@ self: {
        ];
        description = "Derivation of Aeson instances for GADTs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-generic-compat" = callPackage
@@ -23776,8 +21960,6 @@ self: {
        ];
        description = "Injecting fields into aeson values";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-iproute" = callPackage
@@ -23861,8 +22043,6 @@ self: {
        ];
        description = "Fast JSON parsing and encoding (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-optics" = callPackage
@@ -23938,8 +22118,6 @@ self: {
        testHaskellDepends = [ aeson base bytestring hspec mtl text ];
        description = "Hiearchical prefixing for aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-pretty_0_7_2" = callPackage
@@ -24052,8 +22230,6 @@ self: {
        ];
        description = "Haskell JSON schema validator and parser generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-schemas" = callPackage
@@ -24106,8 +22282,6 @@ self: {
        ];
        description = "Smart derivation of Aeson instances";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-streams" = callPackage
@@ -24123,8 +22297,6 @@ self: {
        ];
        description = "An HTTP client library for JSON-based APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-t" = callPackage
@@ -24144,8 +22316,6 @@ self: {
        ];
        description = "Transform JSON";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-tiled" = callPackage
@@ -24165,8 +22335,6 @@ self: {
        testHaskellDepends = [ aeson base hspec ];
        description = "Aeson instances for the Tiled map editor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-toolkit" = callPackage
@@ -24201,8 +22369,6 @@ self: {
        ];
        description = "Generate TypeScript definition files from your ADTs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aeson-utils" = callPackage
@@ -24289,8 +22455,6 @@ self: {
        ];
        description = "A simple Game Engine using SDL";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "affine" = callPackage
@@ -24302,8 +22466,6 @@ self: {
        libraryHaskellDepends = [ alg base ];
        description = "Affine spaces (generalized)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "affine-invariant-ensemble-mcmc" = callPackage
@@ -24319,8 +22481,6 @@ self: {
        ];
        description = "General-purpose sampling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "affinely-extended" = callPackage
@@ -24370,8 +22530,6 @@ self: {
        ];
        description = "Infinite state model checking of iterative C programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ag-pictgen" = callPackage
@@ -24385,8 +22543,6 @@ self: {
        executableHaskellDepends = [ base containers uuagc uulib ];
        description = "Attribute Grammar picture generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "agda-server" = callPackage
@@ -24407,8 +22563,6 @@ self: {
        ];
        description = "Http server for Agda (prototype)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "agda-snippets" = callPackage
@@ -24429,8 +22583,6 @@ self: {
        executableHaskellDepends = [ Agda base network-uri transformers ];
        description = "Render just the Agda snippets of a literate Agda file to HTML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "agda-snippets-hakyll" = callPackage
@@ -24447,8 +22599,6 @@ self: {
        ];
        description = "Literate Agda support using agda-snippets, for Hakyll pages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "agentx" = callPackage
@@ -24470,8 +22620,6 @@ self: {
        ];
        description = "AgentX protocol for write SNMP subagents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "agum" = callPackage
@@ -24486,8 +22634,6 @@ self: {
        executableHaskellDepends = [ base containers ];
        description = "Unification and Matching in an Abelian Group";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aig" = callPackage
@@ -24506,8 +22652,6 @@ self: {
        ];
        description = "And-inverter graphs in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aip" = callPackage
@@ -24536,8 +22680,6 @@ self: {
        ];
        description = "Aeronautical Information Package (AIP)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "air" = callPackage
@@ -24592,8 +22734,6 @@ self: {
        libraryHaskellDepends = [ air base template-haskell ];
        description = "air";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "airbrake" = callPackage
@@ -24613,8 +22753,6 @@ self: {
        ];
        description = "An Airbrake notifier for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "airship" = callPackage
@@ -24644,8 +22782,6 @@ self: {
        ];
        description = "A Webmachine-inspired HTTP library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "airtable-api" = callPackage
@@ -24663,8 +22799,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Requesting and introspecting Tables within an Airtable project";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aivika" = callPackage
@@ -24713,8 +22847,6 @@ self: {
        ];
        description = "Parallel distributed discrete event simulation module for the Aivika library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aivika-experiment" = callPackage
@@ -24871,8 +23003,6 @@ self: {
        ];
        description = "Haskell compiler that produce binary through C language";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "al" = callPackage
@@ -24938,8 +23068,6 @@ self: {
        ];
        description = "Bindings to the alerta REST API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "alerts" = callPackage
@@ -24984,8 +23112,6 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Quasi-quoter for Alex lexers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "alex-prelude" = callPackage
@@ -24997,8 +23123,6 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "Collection of useful functions for writing console applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "alex-tools" = callPackage
@@ -25015,8 +23139,6 @@ self: {
        ];
        description = "A set of functions for a common use case of Alex";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "alfred" = callPackage
@@ -25035,8 +23157,6 @@ self: {
        ];
        description = "utility library for Alfred version 2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "alg" = callPackage
@@ -25045,11 +23165,11 @@ self: {
        pname = "alg";
        version = "0.2.13.1";
        sha256 = "0764j2njb86qdskck3nvbrh61v99hqdhf8aj9irblm6smdlrv4l3";
+       revision = "1";
+       editedCabalFile = "0rm66k502d8la140ffawd38yaf0hr92h8x7xrq6krn6ypljwql0v";
        libraryHaskellDepends = [ base dual util ];
        description = "Algebraic structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "alga" = callPackage
@@ -25082,8 +23202,6 @@ self: {
        ];
        description = "Algorithmic automation for various DAWs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "algebra" = callPackage
@@ -25102,8 +23220,6 @@ self: {
        ];
        description = "Constructive abstract algebra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "algebra-dag" = callPackage
@@ -25145,8 +23261,6 @@ self: {
        ];
        description = "Relational Algebra and SQL Code Generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "algebraic" = callPackage
@@ -25158,8 +23272,6 @@ self: {
        libraryHaskellDepends = [ accelerate base ];
        description = "General linear algebra structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "algebraic-classes" = callPackage
@@ -25171,32 +23283,9 @@ self: {
        libraryHaskellDepends = [ base syb template-haskell ];
        description = "Conversions between algebraic classes and F-algebras";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "algebraic-graphs" = callPackage
-    ({ mkDerivation, array, base, base-compat, base-orphans, containers
-     , deepseq, extra, inspection-testing, mtl, QuickCheck
-     }:
-     mkDerivation {
-       pname = "algebraic-graphs";
-       version = "0.4";
-       sha256 = "1dyk8qgaahrvcp4gsl9c6s3hwmwys4xvznwnh0y1x8bqc4md61f9";
-       libraryHaskellDepends = [
-         array base base-compat containers deepseq mtl
-       ];
-       testHaskellDepends = [
-         array base base-compat base-orphans containers extra
-         inspection-testing QuickCheck
-       ];
-       description = "A library for algebraic graph construction and transformation";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "algebraic-graphs_0_5" = callPackage
     ({ mkDerivation, array, base, containers, deepseq, extra
      , inspection-testing, mtl, QuickCheck, transformers
      }:
@@ -25213,8 +23302,6 @@ self: {
        ];
        description = "A library for algebraic graph construction and transformation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "algebraic-prelude" = callPackage
@@ -25230,8 +23317,6 @@ self: {
        ];
        description = "Algebraically structured Prelude";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "algo-s" = callPackage
@@ -25257,8 +23342,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "An implementation of Knuth's algorithm S";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "algolia" = callPackage
@@ -25308,8 +23391,6 @@ self: {
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "A simple unix filter to align text on specified substrings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aligned-foreignptr" = callPackage
@@ -25398,8 +23479,6 @@ self: {
        ];
        description = "a practical affine language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "alpha" = callPackage
@@ -25420,8 +23499,6 @@ self: {
        ];
        description = "A compiler for the Alpha language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "alphachar" = callPackage
@@ -25442,8 +23519,6 @@ self: {
        ];
        description = "A character between a-z";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "alpino-tools" = callPackage
@@ -25483,8 +23558,6 @@ self: {
        librarySystemDepends = [ alsaLib ];
        description = "Binding to the ALSA Library API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-core" = callPackage
@@ -25515,8 +23588,6 @@ self: {
        ];
        description = "Some simple interactive programs for sending MIDI control messages via ALSA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "alsa-midi" = callPackage
@@ -25537,8 +23608,6 @@ self: {
        executableSystemDepends = [ alsaLib ];
        description = "Bindings for the ALSA sequencer API (MIDI stuff)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-mixer" = callPackage
@@ -25586,8 +23655,6 @@ self: {
        executableHaskellDepends = [ alsa base ];
        description = "Tests for the ALSA audio signal library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "alsa-seq" = callPackage
@@ -25622,8 +23689,6 @@ self: {
        executableHaskellDepends = [ alsa base ];
        description = "Tests for the ALSA sequencer library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "altcomposition" = callPackage
@@ -25635,8 +23700,6 @@ self: {
        libraryHaskellDepends = [ base composition ];
        description = "Alternative combinators for unorthodox function composition";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "alternative-extra" = callPackage
@@ -25648,8 +23711,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Extra utilities for alternatives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "alternative-io" = callPackage
@@ -25667,8 +23728,6 @@ self: {
        ];
        description = "IO as Alternative instance (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "alternative-vector" = callPackage
@@ -25731,8 +23790,6 @@ self: {
        executableHaskellDepends = [ base warp ];
        description = "Implement a menu experience fit for web users";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "altsvc" = callPackage
@@ -25761,8 +23818,6 @@ self: {
        librarySystemDepends = [ alure ];
        description = "A Haskell binding for ALURE";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) alure;};
 
   "amazon-emailer" = callPackage
@@ -25782,8 +23837,6 @@ self: {
        ];
        description = "A queue daemon for Amazon's SES with a PostgreSQL table as a queue";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazon-emailer-client-snap" = callPackage
@@ -25798,8 +23851,6 @@ self: {
        ];
        description = "Client library for amazon-emailer daemon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazon-products" = callPackage
@@ -25825,8 +23876,6 @@ self: {
        ];
        description = "Connector for Amazon Products API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amazonka" = callPackage
@@ -28281,8 +26330,6 @@ self: {
        benchmarkHaskellDepends = [ base statistics ];
        description = "Statistical data visualization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ampersand" = callPackage
@@ -28313,38 +26360,9 @@ self: {
        ];
        description = "Toolsuite for automated design of business processes";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amqp" = callPackage
-    ({ mkDerivation, base, binary, bytestring, clock, connection
-     , containers, data-binary-ieee754, hspec, hspec-expectations
-     , monad-control, network, network-uri, split, stm, text, vector
-     , xml
-     }:
-     mkDerivation {
-       pname = "amqp";
-       version = "0.18.3";
-       sha256 = "1cyzazl3hz5yd2i220b4g8xs0fm47xqlwyvgarxbnn5gnrm8ys21";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base binary bytestring clock connection containers
-         data-binary-ieee754 monad-control network network-uri split stm
-         text vector
-       ];
-       executableHaskellDepends = [ base containers xml ];
-       testHaskellDepends = [
-         base binary bytestring clock connection containers
-         data-binary-ieee754 hspec hspec-expectations network network-uri
-         split stm text vector
-       ];
-       description = "Client library for AMQP servers (currently only RabbitMQ)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "amqp_0_19_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, clock, connection
      , containers, data-binary-ieee754, hspec, hspec-expectations
      , monad-control, network, network-uri, split, stm, text, vector
@@ -28369,7 +26387,6 @@ self: {
        ];
        description = "Client library for AMQP servers (currently only RabbitMQ)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amqp-conduit" = callPackage
@@ -28390,8 +26407,6 @@ self: {
        ];
        description = "Conduit bindings for AMQP (see amqp package)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amqp-utils" = callPackage
@@ -28401,8 +26416,8 @@ self: {
      }:
      mkDerivation {
        pname = "amqp-utils";
-       version = "0.4.2.0";
-       sha256 = "1fycix8q5mbx975jwv659d0ag4h6yk7a6saxn4jy1xi8z8qsvdjr";
+       version = "0.4.4.0";
+       sha256 = "07zpmq9sx6lmnma4dxxph0jficghrlfbb568frh3d6fbdiqgmfgl";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -28412,8 +26427,6 @@ self: {
        ];
        description = "Generic Haskell AMQP tools";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "amqp-worker" = callPackage
@@ -28477,8 +26490,6 @@ self: {
        ];
        description = "making data science easy and safe with data frames";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "analyze-client" = callPackage
@@ -28495,8 +26506,6 @@ self: {
        ];
        description = "Client for analyze service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "anansi" = callPackage
@@ -28549,8 +26558,6 @@ self: {
        ];
        description = "Looms which use Pandoc to parse and produce a variety of formats";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "anatomy" = callPackage
@@ -28577,8 +26584,6 @@ self: {
        ];
        description = "Anatomy: Atomo documentation system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "android" = callPackage
@@ -28590,8 +26595,6 @@ self: {
        libraryHaskellDepends = [ base process ];
        description = "Android methods exposed to Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "android-activity" = callPackage
@@ -28603,8 +26606,6 @@ self: {
        libraryHaskellDepends = [ base data-default ];
        description = "Turn regular Haskell programs into Android Activities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "android-lint-summary" = callPackage
@@ -28631,8 +26632,6 @@ self: {
        ];
        description = "A pretty printer for Android Lint errors";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "angel" = callPackage
@@ -28660,8 +26659,6 @@ self: {
        ];
        description = "Process management and supervision daemon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "angle" = callPackage
@@ -28690,8 +26687,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "A small, general-purpose programming language";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "animalcase" = callPackage
@@ -28724,8 +26719,6 @@ self: {
        testHaskellDepends = [ ansi-terminal-game base hspec parsec ];
        description = "text-file based ASCII animator";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "animate" = callPackage
@@ -28742,8 +26735,6 @@ self: {
        testHaskellDepends = [ aeson base containers hspec vector ];
        description = "Animation for sprites";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "animate-example" = callPackage
@@ -28762,8 +26753,6 @@ self: {
        ];
        description = "Animation for sprites";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "animate-frames" = callPackage
@@ -28785,8 +26774,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hspec ];
        description = "Convert sprite frames to animate files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "animate-preview" = callPackage
@@ -28812,8 +26799,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Preview tool for sprite animation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "animate-sdl2" = callPackage
@@ -28825,8 +26810,6 @@ self: {
        libraryHaskellDepends = [ aeson animate base sdl2 sdl2-image ];
        description = "sdl2 + animate auxiliary library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "anki-tools" = callPackage
@@ -28870,8 +26853,6 @@ self: {
        ];
        description = "Medium-level language that desugars to Morte";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "annihilator" = callPackage
@@ -28918,8 +26899,6 @@ self: {
        libraryHaskellDepends = [ base lens template-haskell ];
        description = "Anonymous sum types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "anonymous-sums-tests" = callPackage
@@ -28931,8 +26910,6 @@ self: {
        libraryHaskellDepends = [ anonymous-sums base QuickCheck ];
        description = "QuickCheck functions to accompany the anonymous-sums package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ansi-escape-codes" = callPackage
@@ -28968,8 +26945,8 @@ self: {
     ({ mkDerivation, base, colour }:
      mkDerivation {
        pname = "ansi-terminal";
-       version = "0.9.1";
-       sha256 = "1yr0ld0kqns3w3j9gl62bdwshvyazidx4dv1qkvq19ivnf08w23l";
+       version = "0.10.3";
+       sha256 = "0z5m6ljmdyjyzq0s08rjjdzdj1ry4fz2ni7xlxd86addvwr2wbps";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base colour ];
@@ -28977,20 +26954,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ansi-terminal_0_10_2" = callPackage
-    ({ mkDerivation, base, colour }:
-     mkDerivation {
-       pname = "ansi-terminal";
-       version = "0.10.2";
-       sha256 = "0h09lia7gqchp023hbgwq4w8bmg33a02chaixdsx8nqbj8jf5558";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base colour ];
-       description = "Simple ANSI terminal support, with Windows compatibility";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "ansi-terminal-game" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal
      , clock, exceptions, hspec, linebreak, mintty, mtl, QuickCheck
@@ -29015,8 +26978,6 @@ self: {
        ];
        description = "sdl-like functions for terminal applications, based on ansi-terminal";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ansi-wl-pprint" = callPackage
@@ -29046,8 +27007,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Terminal-based graphing via ANSI and Unicode";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "antagonist" = callPackage
@@ -29073,8 +27032,6 @@ self: {
        ];
        description = "A web interface to Antisplice dungeons";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "antfarm" = callPackage
@@ -29097,8 +27054,6 @@ self: {
        ];
        description = "Referring expressions for definitions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "anticiv" = callPackage
@@ -29124,8 +27079,6 @@ self: {
        ];
        description = "This is an IRC bot for Mafia and Resistance";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "antigate" = callPackage
@@ -29143,8 +27096,6 @@ self: {
        ];
        description = "Interface for antigate.com captcha recognition API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "antimirov" = callPackage
@@ -29159,8 +27110,6 @@ self: {
        executableHaskellDepends = [ base containers QuickCheck ];
        description = "Define the language containment (=subtyping) relation on regulare expressions";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "antiope-athena" = callPackage
@@ -29182,8 +27131,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "antiope-contract" = callPackage
@@ -29197,8 +27144,6 @@ self: {
        ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "antiope-core" = callPackage
@@ -29225,8 +27170,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "antiope-dynamodb" = callPackage
@@ -29249,8 +27192,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "antiope-es" = callPackage
@@ -29294,8 +27235,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "antiope-optparse-applicative" = callPackage
@@ -29317,8 +27256,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "antiope-s3" = callPackage
@@ -29347,8 +27284,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "antiope-shell" = callPackage
@@ -29378,8 +27313,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "antiope-sns" = callPackage
@@ -29403,8 +27336,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "antiope-sqs" = callPackage
@@ -29431,8 +27362,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "antiope-swf" = callPackage
@@ -29448,8 +27377,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "antiprimes" = callPackage
@@ -29489,8 +27416,6 @@ self: {
        ];
        description = "An engine for text-based dungeons";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "antlr-haskell" = callPackage
@@ -29515,8 +27440,6 @@ self: {
        ];
        description = "A Haskell implementation of the ANTLR top-down parser generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "antlrc" = callPackage
@@ -29537,8 +27460,6 @@ self: {
        ];
        description = "Haskell binding to the ANTLR parser generator C runtime library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {antlr3c = null;};
 
   "anydbm" = callPackage
@@ -29554,8 +27475,6 @@ self: {
        libraryHaskellDepends = [ base containers MissingH mtl ];
        description = "Interface for DBM-like database systems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aos-signature" = callPackage
@@ -29596,8 +27515,6 @@ self: {
        ];
        description = "Bindings to libaosd, a library for Cairo-based on-screen displays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libaosd;};
 
   "ap-reflect" = callPackage
@@ -29658,8 +27575,6 @@ self: {
        ];
        description = "Get all your structure and rip it apart";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apecs" = callPackage
@@ -29668,8 +27583,8 @@ self: {
      }:
      mkDerivation {
        pname = "apecs";
-       version = "0.8.3";
-       sha256 = "1g9fvyhsbriz0c5l3xyaba7yds2iqwkrrrlfvihdr8mr1cx5mw3n";
+       version = "0.9.0";
+       sha256 = "01l53q5495kd7wv9a1ipmrgfczkmajqplzqwh9fzclqg97hbn7n0";
        libraryHaskellDepends = [
          array base containers mtl template-haskell vector
        ];
@@ -29679,14 +27594,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "apecs_0_9_1" = callPackage
+    ({ mkDerivation, array, base, containers, criterion, linear, mtl
+     , QuickCheck, template-haskell, vector
+     }:
+     mkDerivation {
+       pname = "apecs";
+       version = "0.9.1";
+       sha256 = "1hf4ksv5s5z7842wz2zdmfix3s4xd34j6lcx94qja2h2vvh4c46a";
+       libraryHaskellDepends = [
+         array base containers mtl template-haskell vector
+       ];
+       testHaskellDepends = [ base containers linear QuickCheck vector ];
+       benchmarkHaskellDepends = [ base criterion linear ];
+       description = "Fast Entity-Component-System library for game programming";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "apecs-gloss" = callPackage
     ({ mkDerivation, apecs, apecs-physics, base, containers, gloss
      , linear
      }:
      mkDerivation {
        pname = "apecs-gloss";
-       version = "0.2.3";
-       sha256 = "0f2cvjlsf00w69a6m52pwcp9srk441qfzbpdvdwh8pm2vl6nax69";
+       version = "0.2.4";
+       sha256 = "0dwaynabg26vlzbaa59q5ri6sczda667ni900fn567zn8hq9c837";
        libraryHaskellDepends = [
          apecs apecs-physics base containers gloss linear
        ];
@@ -29700,8 +27633,8 @@ self: {
      }:
      mkDerivation {
        pname = "apecs-physics";
-       version = "0.4.2";
-       sha256 = "0jqylv937c4y4jygqyb127n9lvvmss52pz7rcwq7x3qc3k5mwgnh";
+       version = "0.4.4";
+       sha256 = "01kdp31zyz95i912qk57avmzr4596xjj8m8lw7r2yszg0il0mndf";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          apecs base containers inline-c linear template-haskell vector
@@ -29710,23 +27643,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "apecs-physics_0_4_3" = callPackage
-    ({ mkDerivation, apecs, base, Cabal, containers, inline-c, linear
-     , template-haskell, vector
-     }:
-     mkDerivation {
-       pname = "apecs-physics";
-       version = "0.4.3";
-       sha256 = "1d1dq50r5hqq3551abn82i35qaq62gsk04h6vzwhi01jrfkjxyxr";
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [
-         apecs base containers inline-c linear template-haskell vector
-       ];
-       description = "2D physics for apecs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "apecs-physics-gloss" = callPackage
     ({ mkDerivation, apecs, apecs-physics, base, gloss }:
      mkDerivation {
@@ -29744,16 +27660,14 @@ self: {
      }:
      mkDerivation {
        pname = "apecs-stm";
-       version = "0.1.2";
-       sha256 = "0wq20ibki20xccp7gvajzfmp90m9vr0sdx55m3ni91j76bsswqg8";
+       version = "0.1.3";
+       sha256 = "0wp5mydn1cmf4p70jsnfxqzy48p6d3x01xxpvdbnvkkqrpyrwgxg";
        libraryHaskellDepends = [
          apecs base containers list-t stm stm-containers template-haskell
          vector
        ];
        description = "STM stores for apecs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apelsin" = callPackage
@@ -29775,8 +27689,6 @@ self: {
        ];
        description = "Server and community browser for the game Tremulous";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "api-builder" = callPackage
@@ -29798,8 +27710,6 @@ self: {
        ];
        description = "Library for easily building REST API wrappers in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "api-field-json-th" = callPackage
@@ -29880,8 +27790,6 @@ self: {
        testHaskellDepends = [ base bytestring ];
        description = "RPC API client for Factom";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "api-rpc-pegnet" = callPackage
@@ -29905,8 +27813,6 @@ self: {
        ];
        description = "simple json-rpc client for PegNet";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "api-tools" = callPackage
@@ -29941,8 +27847,6 @@ self: {
        ];
        description = "DSL for generating API boilerplate and docs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "api-yoti" = callPackage
@@ -29963,8 +27867,6 @@ self: {
        testHaskellDepends = [ base bytestring text ];
        description = "Api bindings for Yoti services";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary" = callPackage
@@ -29997,8 +27899,6 @@ self: {
        ];
        description = "Simple and type safe web framework that generate web API documentation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-authenticate" = callPackage
@@ -30018,8 +27918,6 @@ self: {
        ];
        description = "authenticate support for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-clientsession" = callPackage
@@ -30037,8 +27935,6 @@ self: {
        ];
        description = "clientsession support for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-cookie" = callPackage
@@ -30054,8 +27950,6 @@ self: {
        ];
        description = "Cookie support for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-eventsource" = callPackage
@@ -30067,8 +27961,6 @@ self: {
        libraryHaskellDepends = [ apiary base blaze-builder wai-extra ];
        description = "eventsource support for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-helics" = callPackage
@@ -30088,8 +27980,6 @@ self: {
        ];
        description = "helics support for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-http-client" = callPackage
@@ -30106,8 +27996,6 @@ self: {
        ];
        description = "A http client for Apiary";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-logger" = callPackage
@@ -30125,8 +28013,6 @@ self: {
        ];
        description = "fast-logger support for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-memcached" = callPackage
@@ -30145,8 +28031,6 @@ self: {
        ];
        description = "memcached client for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-mongoDB" = callPackage
@@ -30164,8 +28048,6 @@ self: {
        ];
        description = "mongoDB support for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-persistent" = callPackage
@@ -30183,8 +28065,6 @@ self: {
        ];
        description = "persistent support for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-purescript" = callPackage
@@ -30204,8 +28084,6 @@ self: {
        ];
        description = "purescript compiler for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-redis" = callPackage
@@ -30217,8 +28095,6 @@ self: {
        libraryHaskellDepends = [ apiary base hedis transformers ];
        description = "redis support for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-session" = callPackage
@@ -30230,8 +28106,6 @@ self: {
        libraryHaskellDepends = [ apiary base wai ];
        description = "session support for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apiary-websockets" = callPackage
@@ -30243,8 +28117,6 @@ self: {
        libraryHaskellDepends = [ apiary base wai-websockets websockets ];
        description = "websockets support for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apioiaf-client" = callPackage
@@ -30277,8 +28149,6 @@ self: {
        ];
        description = "A Template Haskell library for generating type safe API calls";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apns-http2" = callPackage
@@ -30307,8 +28177,6 @@ self: {
        ];
        description = "Apple Push Notification service HTTP/2 integration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apotiki" = callPackage
@@ -30338,8 +28206,6 @@ self: {
        ];
        description = "a faster debian repository";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "app-lens" = callPackage
@@ -30354,8 +28220,6 @@ self: {
        ];
        description = "applicative (functional) bidirectional programming beyond composition chains";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "app-settings" = callPackage
@@ -30410,8 +28274,6 @@ self: {
        ];
        description = "app container types and tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "appendmap" = callPackage
@@ -30453,8 +28315,6 @@ self: {
        ];
        description = "Applicative functor and monad which collects all your fails";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "applicative-numbers" = callPackage
@@ -30482,8 +28342,6 @@ self: {
        ];
        description = "An applicative parser combinator library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "applicative-quoters" = callPackage
@@ -30497,8 +28355,6 @@ self: {
        libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
        description = "Quasiquoters for idiom brackets and an applicative do-notation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "applicative-splice" = callPackage
@@ -30514,8 +28370,6 @@ self: {
        ];
        description = "Write applicative programs in direct style (generalizes idiom brackets)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "apply-refact_0_3_0_1" = callPackage
@@ -30551,37 +28405,6 @@ self: {
      }) {};
 
   "apply-refact" = callPackage
-    ({ mkDerivation, base, containers, directory, filemanip, filepath
-     , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact
-     , silently, syb, tasty, tasty-expected-failure, tasty-golden
-     , temporary, transformers, unix-compat
-     }:
-     mkDerivation {
-       pname = "apply-refact";
-       version = "0.6.0.0";
-       sha256 = "0p2mqgjcqr1zcmk8zgr0yq7g8z1agsa6l493lkj6g3ya9lyhxgig";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers directory filemanip ghc ghc-exactprint mtl process
-         refact syb temporary transformers unix-compat
-       ];
-       executableHaskellDepends = [
-         base containers directory filemanip filepath ghc ghc-exactprint mtl
-         optparse-applicative process refact syb temporary transformers
-         unix-compat
-       ];
-       testHaskellDepends = [
-         base containers directory filemanip filepath ghc ghc-exactprint mtl
-         optparse-applicative process refact silently syb tasty
-         tasty-expected-failure tasty-golden temporary transformers
-         unix-compat
-       ];
-       description = "Perform refactorings specified by the refact library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "apply-refact_0_7_0_0" = callPackage
     ({ mkDerivation, base, containers, directory, filemanip, filepath
      , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact
      , silently, syb, tasty, tasty-expected-failure, tasty-golden
@@ -30610,7 +28433,6 @@ self: {
        ];
        description = "Perform refactorings specified by the refact library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "apportionment" = callPackage
@@ -30649,8 +28471,6 @@ self: {
        ];
        description = "ApproveAPI Haskell Client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "approx-rand-test" = callPackage
@@ -30752,8 +28572,6 @@ self: {
        ];
        description = "Pure Haskell arbitrary length FFT library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arbb-vm" = callPackage
@@ -30770,8 +28588,6 @@ self: {
        librarySystemDepends = [ arbb_dev ];
        description = "FFI binding to the Intel Array Building Blocks (ArBB) virtual machine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {arbb_dev = null;};
 
   "arbor-datadog" = callPackage
@@ -30834,8 +28650,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Counter library for submitting metrics to a backend such as datadog";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arbor-monad-logger" = callPackage
@@ -30859,8 +28673,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Simple logging library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arbor-monad-metric" = callPackage
@@ -30884,8 +28696,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Core metric library for publishing metrics";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arbor-monad-metric-datadog" = callPackage
@@ -30911,8 +28721,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Metric library backend for datadog";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arbor-postgres" = callPackage
@@ -30929,8 +28737,6 @@ self: {
        ];
        description = "Convenience types and functions for postgresql-simple";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arbtt" = callPackage
@@ -31028,8 +28834,6 @@ self: {
        libraryToolDepends = [ cpphs ];
        description = "Common interface using libarchive";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "archive-sig" = callPackage
@@ -31078,8 +28882,6 @@ self: {
        ];
        description = "Archive supplied URLs in WebCite & Internet Archive";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "archlinux" = callPackage
@@ -31095,8 +28897,6 @@ self: {
        ];
        description = "Support for working with Arch Linux packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "archlinux-web" = callPackage
@@ -31122,8 +28922,6 @@ self: {
        ];
        description = "Website maintenance for Arch Linux packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "archnews" = callPackage
@@ -31139,8 +28937,6 @@ self: {
        ];
        description = "Convert Arch Linux package updates in RSS to pretty markdown";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arduino-copilot" = callPackage
@@ -31150,16 +28946,14 @@ self: {
      }:
      mkDerivation {
        pname = "arduino-copilot";
-       version = "1.4.0";
-       sha256 = "031vi24iz25qrzjw3xha1sajzrgjrkypypy0ngfpffzl5zlarpsb";
+       version = "1.5.0";
+       sha256 = "0g2mhav0v9q9f3wbb7i42zdkx6wfl3mp6ikmvg4sglv5356z4xw6";
        libraryHaskellDepends = [
          base containers copilot copilot-c99 copilot-language directory
          filepath mtl optparse-applicative unix
        ];
        description = "Arduino programming in haskell using the Copilot stream DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arena" = callPackage
@@ -31185,8 +28979,6 @@ self: {
        ];
        description = "A journaled data store";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arff" = callPackage
@@ -31203,8 +28995,6 @@ self: {
        ];
        description = "Generate Attribute-Relation File Format (ARFF) files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arghwxhaskell" = callPackage
@@ -31218,8 +29008,6 @@ self: {
        executableHaskellDepends = [ base directory wx ];
        description = "An interpreter for the Argh! programming language in wxHaskell";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "argon" = callPackage
@@ -31246,8 +29034,6 @@ self: {
        ];
        description = "Measure your code's complexity";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "argon2" = callPackage
@@ -31266,8 +29052,6 @@ self: {
        ];
        description = "Memory-hard password hash and proof-of-work function";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "argparser" = callPackage
@@ -31280,8 +29064,6 @@ self: {
        testHaskellDepends = [ base containers HTF HUnit ];
        description = "Command line parsing framework for console applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arguedit" = callPackage
@@ -31299,8 +29081,6 @@ self: {
        ];
        description = "A computer assisted argumentation transcription and editing software";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ariadne" = callPackage
@@ -31328,8 +29108,6 @@ self: {
        ];
        description = "Go-to-definition for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arion" = callPackage
@@ -31353,8 +29131,6 @@ self: {
        ];
        description = "Watcher and runner for Hspec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arion-compose" = callPackage
@@ -31387,24 +29163,23 @@ self: {
      }) {};
 
   "arith-encode" = callPackage
-    ({ mkDerivation, arithmoi, array, base, binary, containers
-     , hashable, HUnit-Plus, integer-logarithms, unordered-containers
+    ({ mkDerivation, array, base, binary, containers, hashable
+     , HUnit-Plus, integer-logarithms, integer-roots
+     , unordered-containers
      }:
      mkDerivation {
        pname = "arith-encode";
-       version = "1.0.1";
-       sha256 = "0dpfhn2xwjjf318f431s8xgnr827ayjak8s8cs6672la8rqgfpb5";
+       version = "1.0.2";
+       sha256 = "0nfrjfm6c37bsvqcqsgnxk6pal8hc7p85nhmab9pc2ha5jrcwhj0";
        libraryHaskellDepends = [
-         arithmoi array base binary containers hashable integer-logarithms
-         unordered-containers
+         array base binary containers hashable integer-logarithms
+         integer-roots unordered-containers
        ];
        testHaskellDepends = [
          base binary containers hashable HUnit-Plus unordered-containers
        ];
        description = "A practical arithmetic encoding (aka Godel numbering) library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arithmatic" = callPackage
@@ -31477,41 +29252,9 @@ self: {
        ];
        description = "Arithmetic circuits for zkSNARKs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arithmoi" = callPackage
-    ({ mkDerivation, array, base, containers, deepseq, exact-pi, gauge
-     , ghc-prim, integer-gmp, integer-logarithms, QuickCheck, random
-     , semirings, smallcheck, tasty, tasty-hunit, tasty-quickcheck
-     , tasty-smallcheck, transformers, vector
-     }:
-     mkDerivation {
-       pname = "arithmoi";
-       version = "0.9.0.0";
-       sha256 = "0c1s93kf44ghhnvzhmnld4visx59pwvadfiww9smqisgjl6mpsa3";
-       configureFlags = [ "-f-llvm" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base containers deepseq exact-pi ghc-prim integer-gmp
-         integer-logarithms random semirings transformers vector
-       ];
-       testHaskellDepends = [
-         base containers exact-pi integer-gmp QuickCheck semirings
-         smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck
-         transformers vector
-       ];
-       benchmarkHaskellDepends = [
-         array base containers deepseq gauge integer-logarithms random
-         vector
-       ];
-       description = "Efficient basic number-theoretic functions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "arithmoi_0_10_0_0" = callPackage
     ({ mkDerivation, array, base, constraints, containers, deepseq
      , exact-pi, gauge, ghc-prim, integer-gmp, integer-logarithms
      , QuickCheck, random, semirings, smallcheck, tasty, tasty-hunit
@@ -31539,7 +29282,6 @@ self: {
        ];
        description = "Efficient basic number-theoretic functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arity-generic-liftA" = callPackage
@@ -31567,8 +29309,6 @@ self: {
        executableHaskellDepends = [ base GLUT mtl OpenGL stm ];
        description = "Space-based real time strategy game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "armor" = callPackage
@@ -31589,8 +29329,6 @@ self: {
        ];
        description = "Prevent serialization backwards compatibility problems using golden tests";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arpa" = callPackage
@@ -31605,8 +29343,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Library for reading ARPA n-gram models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arpack" = callPackage
@@ -31630,8 +29366,6 @@ self: {
        ];
        description = "Solve large scale eigenvalue problems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) arpack;};
 
   "array_0_5_4_0" = callPackage
@@ -31658,8 +29392,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Builders for arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "array-chunks" = callPackage
@@ -31677,8 +29409,6 @@ self: {
        ];
        description = "Lists of chunks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "array-forth" = callPackage
@@ -31704,8 +29434,6 @@ self: {
        ];
        description = "A simple interpreter for arrayForth, the language used on GreenArrays chips";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "array-memoize" = callPackage
@@ -31734,8 +29462,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ghc-prim ];
        description = "Extra foreign primops for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "array-utils" = callPackage
@@ -31771,8 +29497,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Haskell bindings to the ArrayFire general-purpose GPU library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {af = null;};
 
   "arraylist" = callPackage
@@ -31790,8 +29514,6 @@ self: {
        ];
        description = "Memory-efficient ArrayList implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arrow-extras" = callPackage
@@ -31817,8 +29539,6 @@ self: {
        ];
        description = "Improved arrows";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arrow-list" = callPackage
@@ -31830,8 +29550,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "List arrows for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arrowapply-utils" = callPackage
@@ -31843,8 +29561,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Utilities for working with ArrowApply instances more naturally";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arrowp" = callPackage
@@ -31858,8 +29574,6 @@ self: {
        executableHaskellDepends = [ array base containers haskell-src ];
        description = "preprocessor translating arrow notation into Haskell 98";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arrowp-qq" = callPackage
@@ -31880,8 +29594,6 @@ self: {
        executableHaskellDepends = [ base haskell-src-exts NoHoed ];
        description = "A preprocessor and quasiquoter for translating arrow notation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arrows" = callPackage
@@ -31906,8 +29618,6 @@ self: {
        ];
        description = "A simple, arrow-based reactive programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "artifact" = callPackage
@@ -31921,8 +29631,6 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring containers text ];
        description = "Basic types and instances for Valve's Artifact Card-set API";
        license = stdenv.lib.licenses.agpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "arx" = callPackage
@@ -31975,8 +29683,6 @@ self: {
        testHaskellDepends = [ base hedgehog jwt mtl text time ];
        description = "Atlassian Service Authentication Protocol";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ascetic" = callPackage
@@ -32046,8 +29752,6 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "Flattens European non-ASCII characaters into ASCII";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ascii-holidays" = callPackage
@@ -32105,8 +29809,6 @@ self: {
        ];
        description = "Compact representation of ASCII strings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ascii-table" = callPackage
@@ -32145,8 +29847,6 @@ self: {
        ];
        description = "Process Ascii Vectors for Advantest 93k";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ascii85-conduit" = callPackage
@@ -32159,8 +29859,6 @@ self: {
        testHaskellDepends = [ base bytestring conduit hspec ];
        description = "Conduit for encoding ByteString into Ascii85";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "asciichart" = callPackage
@@ -32211,8 +29909,6 @@ self: {
        executableHaskellDepends = [ asil base bytestring utf8-string ];
        description = "Action Script Instrumentation Compiler";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "asif" = callPackage
@@ -32255,8 +29951,6 @@ self: {
        testToolDepends = [ doctest-discover hspec-discover ];
        description = "Library for creating and querying segmented feeds";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "asil" = callPackage
@@ -32275,8 +29969,6 @@ self: {
        ];
        description = "Action Script Instrumentation Library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "asn" = callPackage
@@ -32291,8 +29983,6 @@ self: {
        ];
        description = "asn type and encoding/decoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "asn1-codec" = callPackage
@@ -32317,8 +30007,6 @@ self: {
        ];
        description = "Encode and decode ASN.1";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "asn1-data" = callPackage
@@ -32437,8 +30125,6 @@ self: {
        ];
        description = "Helpers for Control.Exception.assert";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "assert-failure" = callPackage
@@ -32466,8 +30152,6 @@ self: {
        testHaskellDepends = [ base interpolate process ];
        description = "A simple testing framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "asset-bundle" = callPackage
@@ -32496,8 +30180,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Asset map support for the JavaScript broccoli-asset-rev library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "assimp" = callPackage
@@ -32511,8 +30193,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "The Assimp asset import library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) assimp;};
 
   "assoc" = callPackage
@@ -32602,8 +30282,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A library for constructing AST by using do-notation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ast-monad-json" = callPackage
@@ -32618,8 +30296,6 @@ self: {
        testHaskellDepends = [ ast-monad base hspec text ];
        description = "A library for writing JSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ast-path" = callPackage
@@ -32675,8 +30351,6 @@ self: {
        ];
        description = "an incomplete 2d space game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "astro" = callPackage
@@ -32714,8 +30388,6 @@ self: {
        ];
        description = "A GTK-based abstract syntax tree viewer for custom languages and parsers";
        license = stdenv.lib.licenses.bsdOriginal;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "astview-utils" = callPackage
@@ -32777,8 +30449,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Async combinators";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "async-dejafu" = callPackage
@@ -32795,8 +30465,6 @@ self: {
        ];
        description = "Run MonadConc operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "async-extra" = callPackage
@@ -32849,8 +30517,6 @@ self: {
        executableHaskellDepends = [ async base stm unordered-containers ];
        description = "A thread manager for async";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "async-pool" = callPackage
@@ -32933,8 +30599,6 @@ self: {
        ];
        description = "Provides API for timer based execution of IO actions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "asynchronous-exceptions" = callPackage
@@ -32946,8 +30610,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Distinguish between synchronous and asynchronous exceptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aterm" = callPackage
@@ -32959,8 +30621,6 @@ self: {
        libraryHaskellDepends = [ array base containers ghc-prim ];
        description = "serialisation for Haskell values with sharing support";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aterm-utils" = callPackage
@@ -32975,8 +30635,6 @@ self: {
        executableHaskellDepends = [ aterm base transformers wl-pprint ];
        description = "Utility functions for working with aterms as generated by Minitermite";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "atl" = callPackage
@@ -33013,8 +30671,6 @@ self: {
        libraryPkgconfigDepends = [ zlib ];
        description = "Atlassian Connect snaplet for the Snap Framework and helper code";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "atlassian-connect-descriptor" = callPackage
@@ -33074,8 +30730,6 @@ self: {
        libraryHaskellDepends = [ atmos base dimensional-tf ];
        description = "dimensional-tf wrapper on atmos package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "atndapi" = callPackage
@@ -33100,8 +30754,6 @@ self: {
        ];
        description = "An interface of ATND API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "atom" = callPackage
@@ -33155,8 +30807,6 @@ self: {
        ];
        description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287).";
        license = stdenv.lib.licenses.cc0;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "atom-msp430" = callPackage
@@ -33168,8 +30818,6 @@ self: {
        libraryHaskellDepends = [ atom base mtl ];
        description = "Convenience functions for using Atom with the MSP430 microcontroller family";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "atomic-file-ops" = callPackage
@@ -33196,8 +30844,6 @@ self: {
        libraryHaskellDepends = [ base stm ];
        description = "A typeclass for mutable references that have an atomic modify operation";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "atomic-primops" = callPackage
@@ -33227,8 +30873,6 @@ self: {
        ];
        description = "An atomic counter implemented using the FFI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "atomic-primops-vector" = callPackage
@@ -33241,8 +30885,6 @@ self: {
        testHaskellDepends = [ base vector ];
        description = "Atomic operations on Data.Vector types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "atomic-write" = callPackage
@@ -33286,8 +30928,6 @@ self: {
        ];
        description = "A highly dynamic, extremely simple, very fun programming language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "atp-haskell" = callPackage
@@ -33336,32 +30976,30 @@ self: {
        ];
        description = "A source-code formatter for ATS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ats-pkg" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, Cabal
      , cli-setup, composition-prelude, containers, cpphs, dependency
-     , dhall, directory, file-embed, filemanip, filepath, http-client
-     , http-client-tls, language-ats, lzma, microlens, mtl
+     , dhall, directory, file-embed, filepath, http-client
+     , http-client-tls, language-ats, libarchive, lzma, microlens, mtl
      , optparse-applicative, parallel-io, process, shake, shake-ats
-     , shake-c, shake-ext, tar, temporary, text, unix, unix-compat
+     , shake-c, shake-ext, temporary, text, unix, unix-compat
      , zip-archive, zlib
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "3.4.0.8";
-       sha256 = "1mm3zvy85lmfw5zkix1ymjgfn9wywnvlf5r0ln5cqr63h3x620b7";
+       version = "3.5.0.0";
+       sha256 = "0ky17b8s4rg42gr2wwarvlgf0r0zgllrxqcdramsiyh8w9zgmc71";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint base binary bytestring Cabal composition-prelude
-         containers dependency dhall directory file-embed filemanip filepath
-         http-client http-client-tls lzma microlens mtl parallel-io process
-         shake shake-ats shake-c shake-ext tar text unix unix-compat
-         zip-archive zlib
+         containers dependency dhall directory file-embed filepath
+         http-client http-client-tls libarchive lzma microlens mtl
+         parallel-io process shake shake-ats shake-c shake-ext text unix
+         unix-compat zip-archive zlib
        ];
        libraryToolDepends = [ cpphs ];
        executableHaskellDepends = [
@@ -33372,8 +31010,6 @@ self: {
        doHaddock = false;
        description = "A build tool for ATS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ats-setup" = callPackage
@@ -33392,8 +31028,6 @@ self: {
        ];
        description = "ATS scripts for Cabal builds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ats-storable" = callPackage
@@ -33411,8 +31045,6 @@ self: {
        testSystemDepends = [ storable ];
        description = "Marshal ATS types into Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {storable = null;};
 
   "attempt" = callPackage
@@ -33443,8 +31075,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "A script I use to run \"attic\" for my backups";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "atto-lisp" = callPackage
@@ -33593,8 +31223,6 @@ self: {
        ];
        description = "Parsers for the standard Haskell data types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "attoparsec-enumerator" = callPackage
@@ -33608,8 +31236,6 @@ self: {
        ];
        description = "Pass input from an enumerator to an Attoparsec parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "attoparsec-expr" = callPackage
@@ -33637,8 +31263,6 @@ self: {
        ];
        description = "Parse IP data types with attoparsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "attoparsec-iso8601" = callPackage
@@ -33667,8 +31291,6 @@ self: {
        ];
        description = "An adapter to convert attoparsec Parsers into blazing-fast Iteratees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "attoparsec-parsec" = callPackage
@@ -33713,8 +31335,6 @@ self: {
        libraryHaskellDepends = [ array attoparsec base containers text ];
        description = "(deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "attoparsec-text-enumerator" = callPackage
@@ -33726,8 +31346,6 @@ self: {
        libraryHaskellDepends = [ attoparsec-text base enumerator text ];
        description = "(deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "attoparsec-time" = callPackage
@@ -33743,8 +31361,6 @@ self: {
        ];
        description = "Attoparsec parsers of time";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "attoparsec-trans" = callPackage
@@ -33756,8 +31372,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base transformers ];
        description = "Interleaved effects for attoparsec parsers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "attoparsec-uri" = callPackage
@@ -33779,8 +31393,6 @@ self: {
        ];
        description = "URI parser / printer using attoparsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "attoparsec-varword" = callPackage
@@ -33809,8 +31421,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "Split a lazy bytestring at boundaries defined by an attoparsec parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "atuin" = callPackage
@@ -33827,8 +31437,6 @@ self: {
        ];
        description = "Embedded Turtle language compiler in Haskell, with Epic output";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "audacity" = callPackage
@@ -33870,8 +31478,6 @@ self: {
        ];
        description = "A battery-included audiovisual framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "augeas" = callPackage
@@ -33891,8 +31497,6 @@ self: {
        executablePkgconfigDepends = [ augeas ];
        description = "A Haskell FFI wrapper for the Augeas API";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) augeas;};
 
   "augur" = callPackage
@@ -33911,8 +31515,6 @@ self: {
        ];
        description = "Renaming media collections in a breeze";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aur" = callPackage
@@ -33931,8 +31533,6 @@ self: {
        ];
        description = "Access metadata from the Arch Linux User Repository";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aur_6_3_1" = callPackage
@@ -33952,7 +31552,6 @@ self: {
        description = "Access metadata from the Arch Linux User Repository";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aur-api" = callPackage
@@ -33969,51 +31568,44 @@ self: {
        ];
        description = "ArchLinux AUR json v5 API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aura" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, algebraic-graphs, aur, base
-     , base-prelude, bytestring, compactable, containers, directory
-     , errors, filepath, fused-effects, generic-lens, http-client
-     , http-client-tls, http-types, language-bash, megaparsec, microlens
-     , microlens-ghc, mwc-random, network-uri, nonempty-containers
-     , optparse-applicative, paths, pretty-simple, prettyprinter
-     , prettyprinter-ansi-terminal, scheduler, semigroupoids, stm, tasty
-     , tasty-hunit, text, these, time, transformers, typed-process
-     , unliftio, versions
+     , bytestring, containers, errors, filepath, generic-lens
+     , http-client, http-client-tls, http-types, language-bash
+     , megaparsec, microlens, microlens-ghc, mwc-random, network-uri
+     , nonempty-containers, optparse-applicative, paths, pretty-simple
+     , prettyprinter, prettyprinter-ansi-terminal, rio, scheduler
+     , semigroupoids, stm, tasty, tasty-hunit, text, these, time
+     , transformers, typed-process, unliftio, versions
      }:
      mkDerivation {
        pname = "aura";
-       version = "2.0.3";
-       sha256 = "1i4ayl6vw9ffcx97j092nh8wls603k7agj8apabhacxnbxx7vl6a";
+       version = "2.1.0";
+       sha256 = "18wj1yjzs3icp3mmm35dpq5c29r5hv4sp1q9aixhziky38r0cq6a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson aeson-pretty algebraic-graphs aur base base-prelude
-         bytestring compactable containers directory errors filepath
-         fused-effects generic-lens http-client http-types language-bash
+         aeson aeson-pretty algebraic-graphs aur base bytestring containers
+         errors filepath generic-lens http-client http-types language-bash
          megaparsec microlens microlens-ghc mwc-random network-uri
          nonempty-containers paths prettyprinter prettyprinter-ansi-terminal
-         scheduler semigroupoids stm text these time transformers
+         rio scheduler semigroupoids stm text these time transformers
          typed-process unliftio versions
        ];
        executableHaskellDepends = [
-         base base-prelude bytestring containers errors fused-effects
-         http-client http-client-tls microlens nonempty-containers
-         optparse-applicative paths pretty-simple prettyprinter
-         prettyprinter-ansi-terminal text transformers typed-process
-         versions
+         base bytestring containers errors http-client http-client-tls
+         microlens nonempty-containers optparse-applicative paths
+         pretty-simple prettyprinter prettyprinter-ansi-terminal rio text
+         transformers typed-process versions
        ];
        testHaskellDepends = [
-         base base-prelude bytestring containers megaparsec microlens paths
-         tasty tasty-hunit text versions
+         base bytestring containers megaparsec microlens paths rio tasty
+         tasty-hunit text versions
        ];
        description = "A secure package manager for Arch Linux and the AUR, written in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "authenticate" = callPackage
@@ -34055,8 +31647,6 @@ self: {
        libraryHaskellDepends = [ base LDAP text transformers ];
        description = "LDAP authentication for Haskell web applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "authenticate-oauth" = callPackage
@@ -34104,8 +31694,6 @@ self: {
        ];
        description = "A library for writing papers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "auto" = callPackage
@@ -34164,8 +31752,6 @@ self: {
        ];
        description = "Generates and displays patterns from next nearest neighbors cellular automata";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "automata" = callPackage
@@ -34190,8 +31776,6 @@ self: {
        ];
        description = "automata";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "automitive-cse" = callPackage
@@ -34250,8 +31834,6 @@ self: {
        ];
        description = "Library for Nix expression dependency generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "autonix-deps-kf5" = callPackage
@@ -34275,8 +31857,6 @@ self: {
        ];
        description = "Generate dependencies for KDE 5 Nix expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "autoproc" = callPackage
@@ -34318,8 +31898,6 @@ self: {
        executableHaskellDepends = [ base JuicyPixels random ];
        description = "A simple random avatar icon generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "average" = callPackage
@@ -34366,8 +31944,6 @@ self: {
        ];
        description = "Server-side implementation of the Avers storage model";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "avers-api" = callPackage
@@ -34384,8 +31960,6 @@ self: {
        ];
        description = "Types describing the core and extended Avers APIs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "avers-api-docs" = callPackage
@@ -34404,8 +31978,6 @@ self: {
        ];
        description = "Swagger documentation for the Avers API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "avers-server" = callPackage
@@ -34426,8 +31998,6 @@ self: {
        ];
        description = "Server implementation of the Avers API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aviation-cessna172-diagrams" = callPackage
@@ -34471,8 +32041,6 @@ self: {
        ];
        description = "A compile-time balanced AVL tree";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "avr-shake" = callPackage
@@ -34484,8 +32052,6 @@ self: {
        libraryHaskellDepends = [ base dependent-sum mtl process shake ];
        description = "AVR Crosspack actions for shake build systems";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "avro" = callPackage
@@ -34554,8 +32120,6 @@ self: {
        ];
        description = "Tool for decoding avro";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "avwx" = callPackage
@@ -34586,8 +32150,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A prelude which I can be happy with. Based on base-prelude.";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "awesomium" = callPackage
@@ -34603,8 +32165,6 @@ self: {
        ];
        description = "High-level Awesomium bindings";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "awesomium-glut" = callPackage
@@ -34616,8 +32176,6 @@ self: {
        libraryHaskellDepends = [ awesomium awesomium-raw base GLUT ];
        description = "Utilities for using Awesomium with GLUT";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "awesomium-raw" = callPackage
@@ -34631,8 +32189,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Low-level Awesomium bindings";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {awesomium = null;};
 
   "aws_0_18" = callPackage
@@ -34767,8 +32323,6 @@ self: {
        ];
        description = "Configuration types, parsers & renderers for AWS services";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-dynamodb-conduit" = callPackage
@@ -34786,8 +32340,6 @@ self: {
        ];
        description = "Conduit-based interface for AWS DynamoDB";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-dynamodb-streams" = callPackage
@@ -34810,8 +32362,6 @@ self: {
        ];
        description = "Haskell bindings for Amazon DynamoDB Streams";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-easy" = callPackage
@@ -34864,8 +32414,6 @@ self: {
        ];
        description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-ec2-knownhosts" = callPackage
@@ -34888,8 +32436,6 @@ self: {
        ];
        description = "Capture and manage AWS EC2 known_host pubkeys";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-elastic-transcoder" = callPackage
@@ -34912,8 +32458,6 @@ self: {
        ];
        description = "Haskell suite for the Elastic Transcoder service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-general" = callPackage
@@ -34939,8 +32483,6 @@ self: {
        ];
        description = "Bindings for Amazon Web Services (AWS) General Reference";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-kinesis" = callPackage
@@ -34966,8 +32508,6 @@ self: {
        ];
        description = "Bindings for Amazon Kinesis";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-kinesis-client" = callPackage
@@ -35002,8 +32542,6 @@ self: {
        ];
        description = "A producer & consumer client library for AWS Kinesis";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-kinesis-reshard" = callPackage
@@ -35032,8 +32570,6 @@ self: {
        ];
        description = "Reshard AWS Kinesis streams in response to Cloud Watch metrics";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-lambda" = callPackage
@@ -35053,8 +32589,6 @@ self: {
        ];
        description = "Haskell bindings for AWS Lambda";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-lambda-haskell-runtime" = callPackage
@@ -35095,8 +32629,6 @@ self: {
        executableHaskellDepends = [ aeson base lens lens-aeson text ];
        description = "Haskell on AWS Lambda Runtime API";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-mfa-credentials" = callPackage
@@ -35118,8 +32650,6 @@ self: {
        ];
        description = "Keep your AWS credentials file up to date with MFA-carrying credentials";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-performance-tests" = callPackage
@@ -35145,8 +32675,6 @@ self: {
        ];
        description = "Performance Tests for the Haskell bindings for Amazon Web Services (AWS)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-route53" = callPackage
@@ -35164,8 +32692,6 @@ self: {
        ];
        description = "Amazon Route53 DNS service plugin for the aws package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-sdk" = callPackage
@@ -35194,8 +32720,6 @@ self: {
        ];
        description = "AWS SDK for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-sdk-text-converter" = callPackage
@@ -35217,8 +32741,6 @@ self: {
        ];
        description = "The text converter for aws-sdk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-sdk-xml-unordered" = callPackage
@@ -35239,8 +32761,6 @@ self: {
        ];
        description = "The xml parser for aws-sdk package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-ses-easy" = callPackage
@@ -35283,8 +32803,6 @@ self: {
        ];
        description = "Amazon Web Services (AWS) Signature v4 HTTP request signer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-simple" = callPackage
@@ -35302,8 +32820,6 @@ self: {
        ];
        description = "Dead simple bindings to commonly used AWS Services";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-sns" = callPackage
@@ -35327,8 +32843,6 @@ self: {
        ];
        description = "Bindings for AWS SNS Version 2013-03-31";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "axel" = callPackage
@@ -35396,8 +32910,6 @@ self: {
        ];
        description = "Web EDSL for running in browsers and server nodes using transient";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "axiomatic-classes" = callPackage
@@ -35437,8 +32949,6 @@ self: {
        ];
        description = "A simple DevOps tool which will never \"reach\" enterprice level";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "azure-acs" = callPackage
@@ -35492,8 +33002,6 @@ self: {
        ];
        description = "Haskell bindings for the Microsoft Azure Service Management API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "azure-servicebus" = callPackage
@@ -35511,8 +33019,6 @@ self: {
        ];
        description = "Haskell wrapper over Microsoft Azure ServiceBus REST API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "azurify" = callPackage
@@ -35542,8 +33048,6 @@ self: {
        ];
        description = "A simple library for accessing Azure blob storage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "b-tree" = callPackage
@@ -35582,21 +33086,21 @@ self: {
      }:
      mkDerivation {
        pname = "b9";
-       version = "0.5.68.4";
-       sha256 = "1j73gi31aqbxfdd32p7l4kmrvpzm0n4plji83i4pw0zrjwigs0jz";
+       version = "0.5.69.0";
+       sha256 = "0r2iwv3ykh04d7qq9nskrj4m3xwlhhlyxzh38vij65gx8jiy2nwa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson async base base64-bytestring bifunctors binary boxes
          bytestring conduit conduit-extra ConfigFile directory exceptions
-         extensible-effects filepath free hashable lens monad-control mtl
-         parallel parsec pretty pretty-show process QuickCheck random shake
-         syb tagged template text time transformers unordered-containers
-         vector yaml
+         extensible-effects filepath free hashable hspec hspec-expectations
+         lens monad-control mtl parallel parsec pretty pretty-show process
+         QuickCheck random shake syb tagged template text time transformers
+         unordered-containers vector yaml
        ];
        executableHaskellDepends = [
-         base bytestring directory extensible-effects lens
-         optparse-applicative text
+         base bytestring directory extensible-effects hspec
+         hspec-expectations lens optparse-applicative text
        ];
        testHaskellDepends = [
          aeson base binary bytestring directory extensible-effects hspec
@@ -35605,8 +33109,6 @@ self: {
        ];
        description = "A tool and library for building virtual machine images";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "babl" = callPackage
@@ -35636,8 +33138,6 @@ self: {
        ];
        description = "An implementation of a simple 2-player board game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "backblaze-b2-hs" = callPackage
@@ -35670,8 +33170,6 @@ self: {
        ];
        description = "A client library to access Backblaze B2 cloud storage in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "backdropper" = callPackage
@@ -35689,8 +33187,6 @@ self: {
        ];
        description = "Rotates backdrops for X11 displays using Imagemagic";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "backprop" = callPackage
@@ -35712,8 +33208,6 @@ self: {
        ];
        description = "Heterogeneous automatic differentation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "backstop" = callPackage
@@ -35737,8 +33231,6 @@ self: {
        ];
        description = "Backstop a target directory by source directories";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "backtracking-exceptions" = callPackage
@@ -35755,8 +33247,6 @@ self: {
        ];
        description = "A monad transformer for backtracking exceptions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "backward-state" = callPackage
@@ -35768,8 +33258,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "A state monad that runs the state in reverse through the computation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bacteria" = callPackage
@@ -35795,8 +33283,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A simple stable bag";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bake" = callPackage
@@ -35830,8 +33316,6 @@ self: {
        ];
        description = "Continuous integration system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ballast" = callPackage
@@ -35855,8 +33339,6 @@ self: {
        ];
        description = "Shipwire API client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bamboo" = callPackage
@@ -35877,8 +33359,6 @@ self: {
        ];
        description = "A blog engine on Hack";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bamboo-launcher" = callPackage
@@ -35899,8 +33379,6 @@ self: {
        ];
        description = "bamboo-launcher";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bamboo-plugin-highlight" = callPackage
@@ -35918,8 +33396,6 @@ self: {
        ];
        description = "A highlight middleware";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bamboo-plugin-photo" = callPackage
@@ -35938,8 +33414,6 @@ self: {
        ];
        description = "A photo album middleware";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bamboo-theme-blueprint" = callPackage
@@ -35958,8 +33432,6 @@ self: {
        ];
        description = "bamboo blueprint theme";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bamboo-theme-mini-html5" = callPackage
@@ -35982,8 +33454,6 @@ self: {
        ];
        description = "bamboo mini html5 theme";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bamse" = callPackage
@@ -36001,8 +33471,6 @@ self: {
        ];
        description = "A Windows Installer (MSI) generator framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bamstats" = callPackage
@@ -36016,8 +33484,6 @@ self: {
        executableHaskellDepends = [ base cmdargs samtools ];
        description = "A program to extract various information from BAM alignmnet files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ban-instance" = callPackage
@@ -36044,8 +33510,6 @@ self: {
        testHaskellDepends = [ base hspec HUnit QuickCheck time ];
        description = "A library for determining US bank holidays";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bank-holidays-england" = callPackage
@@ -36077,27 +33541,9 @@ self: {
        ];
        description = "Generalized word blacklister";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "barbies" = callPackage
-    ({ mkDerivation, base, bifunctors, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "barbies";
-       version = "1.1.3.0";
-       sha256 = "0fb7d0fr46zm8y00nipq8vvq5fvhsx41jj52zvz27f690azpj961";
-       libraryHaskellDepends = [ base bifunctors ];
-       testHaskellDepends = [
-         base QuickCheck tasty tasty-hunit tasty-quickcheck
-       ];
-       description = "Classes for working with types that can change clothes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "barbies_2_0_0_0" = callPackage
     ({ mkDerivation, base, QuickCheck, tasty, tasty-hunit
      , tasty-quickcheck, transformers
      }:
@@ -36111,15 +33557,14 @@ self: {
        ];
        description = "Classes for working with types that can change clothes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "barbies-th" = callPackage
     ({ mkDerivation, barbies, base, template-haskell }:
      mkDerivation {
        pname = "barbies-th";
-       version = "0";
-       sha256 = "12h6yzl1rqi24ybif5bciljazjxnbvhq5wi9iyjg8zhjmklb6sgr";
+       version = "0.1";
+       sha256 = "1rabviwnyp4c9r6ym958nxgrjz18gdajrj1crdniyyd586giadh4";
        libraryHaskellDepends = [ barbies base template-haskell ];
        testHaskellDepends = [ barbies base ];
        description = "Create strippable HKD via TH";
@@ -36157,8 +33602,6 @@ self: {
        executableHaskellDepends = [ base cmdargs csv diagrams filepath ];
        description = "Creating Bar Charts in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "barcodes-code128" = callPackage
@@ -36170,8 +33613,6 @@ self: {
        libraryHaskellDepends = [ base bytestring HPDF ];
        description = "Generate Code 128 barcodes as PDFs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "barecheck" = callPackage
@@ -36183,8 +33624,6 @@ self: {
        libraryHaskellDepends = [ base containers QuickCheck text time ];
        description = "QuickCheck implementations for common types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "barley" = callPackage
@@ -36217,8 +33656,6 @@ self: {
        libraryHaskellDepends = [ base containers filepath glib gtk ];
        description = "Declarative Gtk GUI library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "barrier" = callPackage
@@ -36243,8 +33680,6 @@ self: {
        ];
        description = "Shields.io style badge generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "barrier-monad" = callPackage
@@ -36256,8 +33691,6 @@ self: {
        libraryHaskellDepends = [ base comonad mtl transformers ];
        description = "Implementation of barrier monad, can use custom front/back type";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "base_4_12_0_0" = callPackage
@@ -36276,17 +33709,6 @@ self: {
      }) {invalid-cabal-flag-settings = null;};
 
   "base-compat" = callPackage
-    ({ mkDerivation, base, unix }:
-     mkDerivation {
-       pname = "base-compat";
-       version = "0.10.5";
-       sha256 = "0hgvlqcr852hfp52jp99snhbj550mvxxpi8qn15d8ml9aqhyl2lr";
-       libraryHaskellDepends = [ base unix ];
-       description = "A compatibility layer for base";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "base-compat_0_11_1" = callPackage
     ({ mkDerivation, base, unix }:
      mkDerivation {
        pname = "base-compat";
@@ -36295,27 +33717,9 @@ self: {
        libraryHaskellDepends = [ base unix ];
        description = "A compatibility layer for base";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-compat-batteries" = callPackage
-    ({ mkDerivation, base, base-compat, hspec, hspec-discover
-     , QuickCheck
-     }:
-     mkDerivation {
-       pname = "base-compat-batteries";
-       version = "0.10.5";
-       sha256 = "1vkhc639vqiv5p39jn1v312z32i7yk5q2lf0ap4jxl1v8p8wyp8p";
-       revision = "1";
-       editedCabalFile = "15sn2qc8k0hxbb2nai341kkrci98hlhzcj2ci087m0zxcg5jcdbp";
-       libraryHaskellDepends = [ base base-compat ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       testToolDepends = [ hspec-discover ];
-       description = "base-compat with extra batteries";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "base-compat-batteries_0_11_1" = callPackage
     ({ mkDerivation, base, base-compat, hspec, hspec-discover
      , QuickCheck
      }:
@@ -36328,7 +33732,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "base-compat with extra batteries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-compat-migrate" = callPackage
@@ -36343,8 +33746,6 @@ self: {
        doHaddock = false;
        description = "Helps migrating projects to base-compat(-batteries)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "base-encoding" = callPackage
@@ -36374,8 +33775,6 @@ self: {
        doHaddock = false;
        description = "Semantic CPP feature macros for base";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "base-generics" = callPackage
@@ -36387,8 +33786,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "This library provides some instances for extra GHC.Generic typeclass such as Int8, Word16 and some unboxed types as well.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "base-io-access" = callPackage
@@ -36400,23 +33797,9 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "The IO functions included in base delimited into small, composable classes";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "base-noprelude" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "base-noprelude";
-       version = "4.12.0.0";
-       sha256 = "1hb25nj49k4lcxi4w33qvcy8izkgsvls5kasmva6hjlvg8b35ymb";
-       libraryHaskellDepends = [ base ];
-       doHaddock = false;
-       description = "\"base\" package sans \"Prelude\" module";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "base-noprelude_4_13_0_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "base-noprelude";
@@ -36426,7 +33809,6 @@ self: {
        doHaddock = false;
        description = "\"base\" package sans \"Prelude\" module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-orphans" = callPackage
@@ -36455,17 +33837,6 @@ self: {
      }) {};
 
   "base-unicode-symbols" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "base-unicode-symbols";
-       version = "0.2.3";
-       sha256 = "1ia6li7qjg1zkak4gf6mnbshw45mq9bfjr0jch58ds0lscmvwyzf";
-       libraryHaskellDepends = [ base ];
-       description = "Unicode alternatives for common functions and operators";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "base-unicode-symbols_0_2_4_2" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "base-unicode-symbols";
@@ -36474,7 +33845,27 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Unicode alternatives for common functions and operators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "base16" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring, criterion
+     , deepseq, memory, random-bytestring, tasty, tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "base16";
+       version = "0.1.2.1";
+       sha256 = "1dqkqyyqdym48fh59zz3jyvhbbc70q37fvx2zv80cmysa929d1fr";
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [
+         base base16-bytestring bytestring memory random-bytestring tasty
+         tasty-hunit text
+       ];
+       benchmarkHaskellDepends = [
+         base base16-bytestring bytestring criterion deepseq memory
+         random-bytestring text
+       ];
+       description = "RFC 4648-compliant Base16 encodings/decodings";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "base16-bytestring" = callPackage
@@ -36488,6 +33879,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "base16-lens" = callPackage
+    ({ mkDerivation, base, base16, bytestring, Cabal, cabal-doctest
+     , doctest, lens, text
+     }:
+     mkDerivation {
+       pname = "base16-lens";
+       version = "0.1.0.0";
+       sha256 = "17cckwpl3c7bf6jj8l1jbwpb0hlsqp7iv3mllb59gp38nfdn51rd";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [ base base16 bytestring lens text ];
+       testHaskellDepends = [ base doctest lens ];
+       description = "Optics for the Base16 library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "base32" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, deepseq, memory
+     , random-bytestring, tasty, tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "base32";
+       version = "0.1.1.1";
+       sha256 = "1j00nznckw6q09kwbqg4dx4s869bi2vdwlmkddanli74f8fc7l7m";
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [
+         base bytestring memory random-bytestring tasty tasty-hunit text
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq memory random-bytestring text
+       ];
+       description = "RFC 4648-compliant Base32 encodings/decodings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "base32-bytestring" = callPackage
     ({ mkDerivation, base, bits-extras, bytestring, cpu, criterion
      , hspec, QuickCheck
@@ -36503,6 +33928,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "base32-lens" = callPackage
+    ({ mkDerivation, base, base32, bytestring, Cabal, cabal-doctest
+     , doctest, lens, text
+     }:
+     mkDerivation {
+       pname = "base32-lens";
+       version = "0.1.0.0";
+       sha256 = "0yhaaz5y8cwyjcclmjw0hk31388z233041ycfpwm2a3f0vgpilvn";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [ base base32 bytestring lens text ];
+       testHaskellDepends = [ base doctest lens ];
+       description = "Optics for the Base32 library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "base32-z-bytestring" = callPackage
     ({ mkDerivation, base, bytestring, cpu, criterion, hedgehog, tasty
      , tasty-fail-fast, tasty-hedgehog, tasty-hspec, z-base32-bytestring
@@ -36610,8 +34050,6 @@ self: {
        ];
        description = "Base62 encoding and decoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "base64" = callPackage
@@ -36698,8 +34136,6 @@ self: {
        ];
        description = "Base64-encode and decode streams of bytes. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "base64-lens" = callPackage
@@ -36719,6 +34155,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "base64-lens_0_3_0" = callPackage
+    ({ mkDerivation, base, base64, bytestring, Cabal, cabal-doctest
+     , doctest, lens, text
+     }:
+     mkDerivation {
+       pname = "base64-lens";
+       version = "0.3.0";
+       sha256 = "0gs3cxmglz0hshi4m94zrlc6fix90cvbdmcv2v4j01zwsdg8gv81";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [ base base64 bytestring lens text ];
+       testHaskellDepends = [ base doctest lens ];
+       description = "Optics for the Base64 library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "base64-string" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -36819,8 +34271,6 @@ self: {
        ];
        description = "Baserock Definitions Schema";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "basex-client" = callPackage
@@ -36930,8 +34380,6 @@ self: {
        ];
        description = "An interpreter for a small functional language";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "batch" = callPackage
@@ -36949,8 +34397,6 @@ self: {
        testHaskellDepends = [ base hspec stm timespan ];
        description = "Simplify queuing up data and processing it in batch";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "batch-rename" = callPackage
@@ -36995,8 +34441,6 @@ self: {
        ];
        description = "Batch processing toolset for Linux / Unix";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "battlenet" = callPackage
@@ -37010,8 +34454,6 @@ self: {
        ];
        description = "API client for Battle.Net";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "battlenet-yesod" = callPackage
@@ -37025,8 +34467,6 @@ self: {
        ];
        description = "Yesod integration for the battlenet package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "battleplace" = callPackage
@@ -37079,8 +34519,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Compute number of possible arrangements in the battleship game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "battleships" = callPackage
@@ -37113,8 +34551,6 @@ self: {
        ];
        description = "A web-based implementation of battleships including an AI opponent";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bayes-stack" = callPackage
@@ -37134,8 +34570,6 @@ self: {
        ];
        description = "Framework for inferring generative probabilistic models with Gibbs sampling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bazel-coverage-report-renderer" = callPackage
@@ -37199,8 +34633,6 @@ self: {
        ];
        description = "Tools for reading Big Binary Indexed files, e.g., bigBed, bigWig";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bcp47" = callPackage
@@ -37278,8 +34710,6 @@ self: {
        ];
        description = "Tools for managing a content store of software packages";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) ostree;};
 
   "bdcs-api" = callPackage
@@ -37316,8 +34746,6 @@ self: {
        ];
        description = "BDCS API Server";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libgit2-glib;};
 
   "bdd" = callPackage
@@ -37380,8 +34808,6 @@ self: {
        ];
        description = "A type-safe SQL mapper for Haskell that doesn't use Template Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "beam-core" = callPackage
@@ -37455,8 +34881,6 @@ self: {
        ];
        description = "A newtype for wrapping newtypes into beam schemas";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "beam-postgres" = callPackage
@@ -37483,8 +34907,6 @@ self: {
        ];
        description = "Connection layer between beam and postgres";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "beam-sqlite" = callPackage
@@ -37523,8 +34945,6 @@ self: {
        ];
        description = "Template Haskell utilities for beam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "beamable" = callPackage
@@ -37549,8 +34969,6 @@ self: {
        ];
        description = "Generic serializer/deserializer with compact representation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bearriver" = callPackage
@@ -37566,8 +34984,6 @@ self: {
        ];
        description = "A replacement of Yampa based on Monadic Stream Functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "beautifHOL" = callPackage
@@ -37581,8 +34997,6 @@ self: {
        executableHaskellDepends = [ array base haskell98 mtl ];
        description = "A pretty-printer for higher-order logic";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bech32" = callPackage
@@ -37591,10 +35005,8 @@ self: {
      }:
      mkDerivation {
        pname = "bech32";
-       version = "1.0.0";
-       sha256 = "1pq0izcjsnyrwjik7p6xw1y8b5g3x4rxi95jh08x81lfp53pr9bn";
-       revision = "1";
-       editedCabalFile = "0xkdidn53amg5ihbiwjw44yc87rnw6wivcgx84nimmhi9az3mlkb";
+       version = "1.0.1";
+       sha256 = "0v40cyg4qjz9pw0lrxkb5m8m87qbllfbwl8wq2v9f48hd4lpkz59";
        libraryHaskellDepends = [
          array base bytestring containers extra text
        ];
@@ -37607,6 +35019,42 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "bech32_1_0_2" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, deepseq
+     , extra, hspec, hspec-discover, QuickCheck, text, vector
+     }:
+     mkDerivation {
+       pname = "bech32";
+       version = "1.0.2";
+       sha256 = "0km1jy3fhpnzqhi4pd5yn6y7214ij7rg47xwnp915c0x6j72ykym";
+       libraryHaskellDepends = [
+         array base bytestring containers extra text
+       ];
+       testHaskellDepends = [
+         base bytestring containers deepseq extra hspec QuickCheck text
+         vector
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "bech32-th" = callPackage
+    ({ mkDerivation, base, bech32, hspec, hspec-discover
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "bech32-th";
+       version = "1.0.2";
+       sha256 = "0ypn8y4b0iw7jb167biy0zjs4hp9k9nlf8y4nsczfv5n4p4cadnq";
+       libraryHaskellDepends = [ base bech32 template-haskell text ];
+       testHaskellDepends = [ base bech32 hspec template-haskell ];
+       testToolDepends = [ hspec-discover ];
+       description = "Template Haskell extensions to the Bech32 library";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "bed-and-breakfast" = callPackage
     ({ mkDerivation, array, base, binary, cpphs, deepseq, QuickCheck
      , template-haskell
@@ -37644,8 +35092,6 @@ self: {
        ];
        description = "Bindings to the beeminder.com JSON API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bein" = callPackage
@@ -37669,8 +35115,6 @@ self: {
        ];
        description = "Bein is a provenance and workflow management system for bioinformatics";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "belka" = callPackage
@@ -37699,8 +35143,6 @@ self: {
        ];
        description = "HTTP client DSL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bench" = callPackage
@@ -37825,8 +35267,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bencodex reader/writer for Haskell";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bencoding" = callPackage
@@ -37873,8 +35313,6 @@ self: {
        librarySystemDepends = [ db ];
        description = "Pretty BerkeleyDB v4 binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) db;};
 
   "berp" = callPackage
@@ -37900,8 +35338,6 @@ self: {
        ];
        description = "An implementation of Python 3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bert" = callPackage
@@ -37935,8 +35371,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Extended GCD of polynomials over F_p[x]";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bet" = callPackage
@@ -37963,8 +35397,6 @@ self: {
        ];
        description = "Betfair API bindings. Bet on sports on betting exchanges.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "betacode" = callPackage
@@ -37981,8 +35413,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck smallcheck ];
        description = "A codec for beta code (http://en.wikipedia.org/wiki/Beta_Code).";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "betris" = callPackage
@@ -38044,8 +35474,6 @@ self: {
        ];
        description = "Bidirectionalization for Free! (POPL'09)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bff-mono" = callPackage
@@ -38103,8 +35531,6 @@ self: {
        ];
        description = "Blocked GZip";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bhoogle" = callPackage
@@ -38126,8 +35552,6 @@ self: {
        ];
        description = "Simple terminal GUI for local hoogle";
        license = "(BSD-3-Clause OR Apache-2.0)";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bibdb" = callPackage
@@ -38150,8 +35574,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "A database based bibliography manager for BibTeX";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bibtex" = callPackage
@@ -38184,8 +35606,6 @@ self: {
        ];
        description = "Prototype Implementation of Combining Syntactic and Semantic Bidirectionalization (ICFP'10)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bidispec" = callPackage
@@ -38197,8 +35617,6 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "Specification of generators and parsers";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bidispec-extras" = callPackage
@@ -38210,8 +35628,6 @@ self: {
        libraryHaskellDepends = [ base bytestring dataenc mtl ];
        description = "Extra helper functions for bidirectional specifications";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bifunctor" = callPackage
@@ -38223,8 +35639,6 @@ self: {
        libraryHaskellDepends = [ base category ];
        description = "Bifunctors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bifunctors" = callPackage
@@ -38280,8 +35694,6 @@ self: {
        ];
        description = "A parser for the Billboard chord dataset";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "billeksah-forms" = callPackage
@@ -38299,8 +35711,6 @@ self: {
        ];
        description = "Leksah library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "billeksah-main" = callPackage
@@ -38319,8 +35729,6 @@ self: {
        ];
        description = "Leksah plugin base";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "billeksah-main-static" = callPackage
@@ -38361,8 +35769,6 @@ self: {
        ];
        description = "Leksah library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "billeksah-services" = callPackage
@@ -38378,8 +35784,6 @@ self: {
        ];
        description = "Leksah library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bimap" = callPackage
@@ -38533,8 +35937,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring mtl ];
        description = "Flexible way to ease transmission of binary data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binary-conduit" = callPackage
@@ -38565,8 +35967,6 @@ self: {
        libraryHaskellDepends = [ base binary ghc-prim ];
        description = "Automatic deriving of Binary using GHC.Generics";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binary-enum" = callPackage
@@ -38603,8 +36003,6 @@ self: {
        ];
        description = "An alternate with strong-typed errors for `Data.Binary.Get` monad from `binary` package.";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binary-file" = callPackage
@@ -38620,8 +36018,6 @@ self: {
        ];
        description = "read/write binary file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binary-generic" = callPackage
@@ -38659,8 +36055,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Binary Indexed Trees (a.k.a. Fenwick Trees).";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binary-instances" = callPackage
@@ -38797,8 +36191,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring mtl ];
        description = "Monad to ease implementing a binary network protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binary-protocol-zmq" = callPackage
@@ -38814,8 +36206,6 @@ self: {
        ];
        description = "Monad to ease implementing a binary network protocol over ZeroMQ";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binary-search" = callPackage
@@ -38904,21 +36294,18 @@ self: {
        ];
        description = "data serialization/deserialization io-streams library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binary-strict" = callPackage
     ({ mkDerivation, array, base, bytestring, mtl }:
      mkDerivation {
        pname = "binary-strict";
-       version = "0.4.8.4";
-       sha256 = "07b62k4vqdxwaa8fp3zy2xgzc8j1wgzjh04jij2dabk0329flham";
+       version = "0.4.8.5";
+       sha256 = "1m1r6dnvnj5ghvhb2wsh5sczvqx500xyh2f8qs1j1ddzn70bb6wp";
        libraryHaskellDepends = [ array base bytestring mtl ];
+       testHaskellDepends = [ base bytestring ];
        description = "Binary deserialisation using strict ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binary-tagged" = callPackage
@@ -38993,8 +36380,6 @@ self: {
        ];
        description = "Type-safe binary serialization";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binary-varint" = callPackage
@@ -39034,8 +36419,6 @@ self: {
        ];
        description = "Data marshaling library that uses type level equations to optimize buffering";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binding-core" = callPackage
@@ -39064,8 +36447,6 @@ self: {
        testHaskellDepends = [ base binding-core directory gtk ];
        description = "Data Binding in Gtk2Hs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binding-wx" = callPackage
@@ -39080,8 +36461,6 @@ self: {
        testHaskellDepends = [ base binding-core directory wx ];
        description = "Data Binding in WxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bindings" = callPackage
@@ -39116,8 +36495,6 @@ self: {
        libraryPkgconfigDepends = [ esound ];
        description = "Low level bindings to EsounD (ESD; Enlightened Sound Daemon)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {esound = null;};
 
   "bindings-GLFW" = callPackage
@@ -39127,8 +36504,8 @@ self: {
      }:
      mkDerivation {
        pname = "bindings-GLFW";
-       version = "3.2.1.1";
-       sha256 = "03hn12bdqypwd6x9hxa7685bm6w86nsf6cmcwkr8zzgb41mwc93b";
+       version = "3.3.1.0";
+       sha256 = "14np6l61q9nglyailixsajngd6d799xa1xd6nzw0kjiqiqznn43a";
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [
          libGL libX11 libXcursor libXext libXfixes libXi libXinerama
@@ -39145,15 +36522,15 @@ self: {
          inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; 
          inherit (pkgs.xorg) libXxf86vm;};
 
-  "bindings-GLFW_3_3_1_0" = callPackage
+  "bindings-GLFW_3_3_2_0" = callPackage
     ({ mkDerivation, base, bindings-DSL, HUnit, libGL, libX11
      , libXcursor, libXext, libXfixes, libXi, libXinerama, libXrandr
      , libXxf86vm, test-framework, test-framework-hunit
      }:
      mkDerivation {
        pname = "bindings-GLFW";
-       version = "3.3.1.0";
-       sha256 = "14np6l61q9nglyailixsajngd6d799xa1xd6nzw0kjiqiqznn43a";
+       version = "3.3.2.0";
+       sha256 = "0frvqybvy6bk79drhdmv4m754g4db3ys63ib8kw6aw5d3bmhjdbw";
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [
          libGL libX11 libXcursor libXext libXfixes libXi libXinerama
@@ -39182,8 +36559,6 @@ self: {
        librarySystemDepends = [ K8055D ];
        description = "Bindings to Velleman K8055 dll";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {K8055D = null;};
 
   "bindings-apr" = callPackage
@@ -39196,8 +36571,6 @@ self: {
        libraryPkgconfigDepends = [ apr ];
        description = "Low level bindings to Apache Portable Runtime (APR)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) apr;};
 
   "bindings-apr-util" = callPackage
@@ -39210,8 +36583,6 @@ self: {
        libraryPkgconfigDepends = [ apr-util ];
        description = "Low level bindings to Apache Portable Runtime Utility (APR Utility)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {apr-util = null;};
 
   "bindings-audiofile" = callPackage
@@ -39239,8 +36610,6 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Bindings for libbfd, a library of the GNU `binutils'";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {bfd = null; opcodes = null;};
 
   "bindings-cctools" = callPackage
@@ -39253,8 +36622,6 @@ self: {
        librarySystemDepends = [ dttools ];
        description = "Bindings to the CCTools WorkQueue C library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {dttools = null;};
 
   "bindings-codec2" = callPackage
@@ -39285,8 +36652,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "This package is obsolete. Look for bindings-DSL instead.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bindings-dc1394" = callPackage
@@ -39300,8 +36665,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Library for using firewire (iidc-1394) cameras";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {dc1394 = null;};
 
   "bindings-directfb" = callPackage
@@ -39328,8 +36691,6 @@ self: {
        libraryPkgconfigDepends = [ eskit ];
        description = "Bindings to ESKit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {eskit = null;};
 
   "bindings-fann" = callPackage
@@ -39342,8 +36703,6 @@ self: {
        libraryPkgconfigDepends = [ fann ];
        description = "Low level bindings to FANN neural network library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {fann = null;};
 
   "bindings-fluidsynth" = callPackage
@@ -39356,8 +36715,6 @@ self: {
        libraryPkgconfigDepends = [ fluidsynth ];
        description = "Haskell FFI bindings for fluidsynth software synthesizer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) fluidsynth;};
 
   "bindings-friso" = callPackage
@@ -39370,8 +36727,6 @@ self: {
        librarySystemDepends = [ friso ];
        description = "Low level bindings for friso";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {friso = null;};
 
   "bindings-glib" = callPackage
@@ -39420,8 +36775,6 @@ self: {
        libraryPkgconfigDepends = [ gsl ];
        description = "Low level bindings to GNU GSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gsl;};
 
   "bindings-gts" = callPackage
@@ -39434,8 +36787,6 @@ self: {
        libraryPkgconfigDepends = [ gts ];
        description = "Low level bindings supporting GTS, the GNU Triangulated Surface Library";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gts;};
 
   "bindings-hamlib" = callPackage
@@ -39453,8 +36804,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Hamlib bindings for Haskell";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) hamlib;};
 
   "bindings-hdf5" = callPackage
@@ -39466,8 +36815,6 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Project bindings-* raw interface to HDF5 library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bindings-levmar" = callPackage
@@ -39517,8 +36864,6 @@ self: {
        libraryPkgconfigDepends = [ libftdi libusb ];
        description = "Low level bindings to libftdi";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libftdi; inherit (pkgs) libusb;};
 
   "bindings-libg15" = callPackage
@@ -39531,8 +36876,6 @@ self: {
        librarySystemDepends = [ g15 ];
        description = "Bindings to libg15";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {g15 = null;};
 
   "bindings-librrd" = callPackage
@@ -39545,8 +36888,6 @@ self: {
        libraryPkgconfigDepends = [ librrd ];
        description = "Low level bindings to RRDtool";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {librrd = null;};
 
   "bindings-libstemmer" = callPackage
@@ -39563,8 +36904,6 @@ self: {
        librarySystemDepends = [ stemmer ];
        description = "Binding for libstemmer with low level binding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {stemmer = null;};
 
   "bindings-libusb" = callPackage
@@ -39589,8 +36928,6 @@ self: {
        librarySystemDepends = [ v4l2 ];
        description = "bindings to libv4l2 for Linux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {v4l2 = null;};
 
   "bindings-libzip" = callPackage
@@ -39650,8 +36987,6 @@ self: {
        libraryPkgconfigDepends = [ monetdb-mapi ];
        description = "Low-level bindings for the MonetDB API (mapi)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {monetdb-mapi = null;};
 
   "bindings-mpdecimal" = callPackage
@@ -39663,8 +36998,6 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "bindings to mpdecimal library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bindings-nettle" = callPackage
@@ -39705,8 +37038,6 @@ self: {
        libraryPkgconfigDepends = [ portaudio ];
        description = "Low-level bindings to portaudio library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) portaudio;};
 
   "bindings-posix" = callPackage
@@ -39786,8 +37117,6 @@ self: {
        librarySystemDepends = [ scsynth ];
        description = "Low-level bindings to the SuperCollider synthesis engine library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {scsynth = null;};
 
   "bindings-sipc" = callPackage
@@ -39803,8 +37132,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Low level bindings to SIPC";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {sipc = null;};
 
   "bindings-sophia" = callPackage
@@ -39863,8 +37190,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Bindings against the wlc library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {wlc = null;};
 
   "bindings-yices" = callPackage
@@ -39891,8 +37216,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring rank1dynamic ];
        description = "A variation of Data.Dynamic.Dynamic with a Binary instance";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binembed" = callPackage
@@ -39911,8 +37234,6 @@ self: {
        ];
        description = "Embed data into object files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binembed-example" = callPackage
@@ -39929,8 +37250,6 @@ self: {
        ];
        description = "Example project using binembed to embed data in object files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bini" = callPackage
@@ -40000,8 +37319,6 @@ self: {
        executableHaskellDepends = [ base bytestring random ];
        description = "A bioinformatics library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bio-sequence" = callPackage
@@ -40018,8 +37335,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bioace" = callPackage
@@ -40033,8 +37348,6 @@ self: {
        ];
        description = "Library for reading ace assembly files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bioalign" = callPackage
@@ -40046,8 +37359,6 @@ self: {
        libraryHaskellDepends = [ base biocore bytestring ];
        description = "Data structures and helper functions for calculating alignments";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "biocore" = callPackage
@@ -40061,8 +37372,6 @@ self: {
        libraryHaskellDepends = [ base bytestring stringable ];
        description = "A bioinformatics library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "biofasta" = callPackage
@@ -40074,8 +37383,6 @@ self: {
        libraryHaskellDepends = [ base biocore bytestring ];
        description = "Library for reading fasta sequence files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "biofastq" = callPackage
@@ -40087,8 +37394,6 @@ self: {
        libraryHaskellDepends = [ base biocore bytestring ];
        description = "A library for reading FASTQ files";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "biohazard" = callPackage
@@ -40111,8 +37416,6 @@ self: {
        ];
        description = "bioinformatics support library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bioinformatics-toolkit" = callPackage
@@ -40149,8 +37452,6 @@ self: {
        ];
        description = "A collection of bioinformatics tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "biophd" = callPackage
@@ -40166,8 +37467,6 @@ self: {
        ];
        description = "Library for reading phd sequence files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "biopsl" = callPackage
@@ -40184,8 +37483,6 @@ self: {
        executableHaskellDepends = [ cmdargs unordered-containers ];
        description = "Library and executables for working with PSL files";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "biosff" = callPackage
@@ -40202,8 +37499,6 @@ self: {
        executableHaskellDepends = [ array base cmdargs mtl ];
        description = "Library and executables for working with SFF files";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "biostockholm" = callPackage
@@ -40226,30 +37521,28 @@ self: {
        ];
        description = "Parsing and rendering of Stockholm files (used by Pfam, Rfam and Infernal)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "birch-beer" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cassava, colour
      , containers, deepseq, diagrams, diagrams-cairo, diagrams-graphviz
-     , diagrams-gtk, diagrams-lib, diversity, fgl, foldl, graphviz, gtk
-     , hierarchical-clustering, hierarchical-spectral-clustering, lens
-     , matrix-market-attoparsec, mtl, optparse-generic, palette, plots
-     , safe, scientific, sparse-linear-algebra, spectral-clustering
-     , split, statistics, SVGFonts, temporary, text, text-show
-     , typed-spreadsheet, vector
+     , diagrams-gtk, diagrams-lib, diversity, elbow, fgl, foldl
+     , graphviz, gtk, hierarchical-clustering
+     , hierarchical-spectral-clustering, lens, matrix-market-attoparsec
+     , mtl, optparse-generic, palette, plots, safe, scientific
+     , sparse-linear-algebra, spectral-clustering, split, statistics
+     , SVGFonts, temporary, text, text-show, typed-spreadsheet, vector
      }:
      mkDerivation {
        pname = "birch-beer";
-       version = "0.2.2.0";
-       sha256 = "1175gxj08pn1h58cgppwx3h79wplmycfrpzn46cyw2fpjqakc5gi";
+       version = "0.2.3.0";
+       sha256 = "1lq5mxq2pci3jh3a0pv7k6a3ncz39g45hvj9r78xwmqxn5s5hffw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring cassava colour containers deepseq diagrams
          diagrams-cairo diagrams-graphviz diagrams-gtk diagrams-lib
-         diversity fgl foldl graphviz gtk hierarchical-clustering
+         diversity elbow fgl foldl graphviz gtk hierarchical-clustering
          hierarchical-spectral-clustering lens matrix-market-attoparsec mtl
          optparse-generic palette plots safe scientific
          sparse-linear-algebra spectral-clustering split statistics SVGFonts
@@ -40257,13 +37550,11 @@ self: {
        ];
        executableHaskellDepends = [
          aeson base bytestring cassava colour containers diagrams
-         diagrams-cairo diagrams-lib hierarchical-spectral-clustering lens
-         optparse-generic sparse-linear-algebra text text-show vector
+         diagrams-cairo diagrams-lib elbow hierarchical-spectral-clustering
+         lens optparse-generic sparse-linear-algebra text text-show vector
        ];
        description = "Plot a colorful tree";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bird" = callPackage
@@ -40284,8 +37575,6 @@ self: {
        ];
        description = "A simple, sinatra-inspired web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bisc" = callPackage
@@ -40323,8 +37612,6 @@ self: {
        ];
        description = "Determine relevant parts of binary data";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bishbosh" = callPackage
@@ -40355,8 +37642,6 @@ self: {
        ];
        description = "Plays chess";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bit-array" = callPackage
@@ -40369,8 +37654,6 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "A bit array (aka bitset, bitmap, bit vector) API for numeric types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bit-protocol" = callPackage
@@ -40410,8 +37693,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Lazy, infinite, compact stream of Bool with O(1) indexing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bit-vector" = callPackage
@@ -40530,8 +37811,6 @@ self: {
        ];
        description = "Partial implementation of the Bitcoin protocol (as of 2013)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bitcoin-payment-channel" = callPackage
@@ -40597,8 +37876,6 @@ self: {
        ];
        description = "Library to communicate with the Satoshi Bitcoin daemon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bitcoin-script" = callPackage
@@ -40670,8 +37947,6 @@ self: {
        ];
        description = "A command line tool to access bit.ly URL shortener.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bitmap" = callPackage
@@ -40710,8 +37985,6 @@ self: {
        ];
        description = "Bitmap library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bits" = callPackage
@@ -40789,8 +38062,6 @@ self: {
        ];
        description = "Bitstream support for Conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bits-extra" = callPackage
@@ -40847,8 +38118,6 @@ self: {
        benchmarkSystemDepends = [ gmp ];
        description = "A space-efficient set data structure";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gmp;};
 
   "bitset-word8" = callPackage
@@ -40889,8 +38158,6 @@ self: {
        executablePkgconfigDepends = [ gtk2 pango ];
        description = "Proof-of-concept tool for writing using binary choices";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtk2; inherit (pkgs) pango;};
 
   "bitstream" = callPackage
@@ -40909,8 +38176,6 @@ self: {
        ];
        description = "Fast, packed, strict and lazy bit streams with stream fusion";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bitstring" = callPackage
@@ -40954,8 +38219,6 @@ self: {
        ];
        description = "Bittorrent protocol implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bittrex" = callPackage
@@ -41015,8 +38278,6 @@ self: {
        benchmarkHaskellDepends = [ array base bytestring criterion ];
        description = "fast multi-dimensional unboxed bit packed Bool arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bitwise-enum" = callPackage
@@ -41078,8 +38339,6 @@ self: {
        ];
        description = "A lousy Prelude replacement by a lousy dude";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bizzlelude-js" = callPackage
@@ -41091,8 +38350,6 @@ self: {
        libraryHaskellDepends = [ base containers text ];
        description = "A lousy Prelude replacement by a lousy dude";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bk-tree" = callPackage
@@ -41127,8 +38384,6 @@ self: {
        ];
        description = "Backup utility for backing up to cloud storage services (S3 only right now)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bktrees" = callPackage
@@ -41154,8 +38409,6 @@ self: {
        executableHaskellDepends = [ base haskell98 unix ];
        description = "a stupid cron";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "black-jewel" = callPackage
@@ -41197,8 +38450,6 @@ self: {
        ];
        description = "Decentralized, k-ordered unique ID generator";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blake2" = callPackage
@@ -41217,8 +38468,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "A library providing BLAKE2";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blakesum" = callPackage
@@ -41230,8 +38479,6 @@ self: {
        libraryHaskellDepends = [ base bytestring text vector ];
        description = "The BLAKE SHA-3 candidate hashes, in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blakesum-demo" = callPackage
@@ -41249,8 +38496,6 @@ self: {
        ];
        description = "The BLAKE SHA-3 candidate hashes, in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blank-canvas_0_6_2" = callPackage
@@ -41337,8 +38582,6 @@ self: {
        libraryHaskellDepends = [ base ieee QuickCheck storable-complex ];
        description = "Bindings to the BLAS library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blas-carray" = callPackage
@@ -41355,8 +38598,6 @@ self: {
        ];
        description = "Auto-generated interface to Fortran BLAS via CArrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blas-comfort-array" = callPackage
@@ -41373,8 +38614,6 @@ self: {
        ];
        description = "Auto-generated interface to Fortran BLAS via comfort-array";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blas-ffi" = callPackage
@@ -41389,8 +38628,6 @@ self: {
        libraryPkgconfigDepends = [ blas ];
        description = "Auto-generated interface to Fortran BLAS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) blas;};
 
   "blas-hs" = callPackage
@@ -41404,8 +38641,6 @@ self: {
        testHaskellDepends = [ base vector ];
        description = "Low-level Haskell bindings to Blas";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) blas;};
 
   "blastxml" = callPackage
@@ -41419,8 +38654,6 @@ self: {
        ];
        description = "Library for reading Blast XML output";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blatex" = callPackage
@@ -41438,8 +38671,6 @@ self: {
        ];
        description = "Blog in LaTeX";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blaze" = callPackage
@@ -41510,8 +38741,6 @@ self: {
        ];
        description = "Enumeratees for the incremental conversion of builders to bytestrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blaze-colonnade" = callPackage
@@ -41579,8 +38808,6 @@ self: {
        ];
        description = "Some contributions to add handy things to blaze html";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blaze-html-hexpat" = callPackage
@@ -41592,8 +38819,6 @@ self: {
        libraryHaskellDepends = [ base blaze-html bytestring hexpat text ];
        description = "A hexpat backend for blaze-html";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blaze-html-truncate" = callPackage
@@ -41609,8 +38834,6 @@ self: {
        ];
        description = "A truncator for blaze-html";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blaze-json" = callPackage
@@ -41632,8 +38855,6 @@ self: {
        ];
        description = "tiny library for encoding json";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blaze-markup" = callPackage
@@ -41712,8 +38933,6 @@ self: {
        ];
        description = "Fast rendering of common datatypes (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blazeMarker" = callPackage
@@ -41742,8 +38961,6 @@ self: {
        ];
        description = "A true monad (transformer) version of the blaze-markup and blaze-html libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ble" = callPackage
@@ -41775,8 +38992,6 @@ self: {
        ];
        description = "Bluetooth Low Energy (BLE) peripherals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blink1" = callPackage
@@ -41795,8 +39010,6 @@ self: {
        ];
        description = "Control library for blink(1) LED from ThingM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blip" = callPackage
@@ -41815,8 +39028,6 @@ self: {
        ];
        description = "Python to bytecode compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bliplib" = callPackage
@@ -41832,8 +39043,6 @@ self: {
        ];
        description = "Support code for Blip";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blockchain" = callPackage
@@ -41857,8 +39066,6 @@ self: {
        ];
        description = "Generic blockchain implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blockhash" = callPackage
@@ -41880,8 +39087,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Blockhash perceptual image hash algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blocking-transactions" = callPackage
@@ -41914,8 +39119,6 @@ self: {
        executableHaskellDepends = [ base ConfigFile haskell98 old-time ];
        description = "Very simple static blog software";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bloodhound" = callPackage
@@ -41944,8 +39147,6 @@ self: {
        ];
        description = "Elasticsearch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bloodhound-amazonka-auth" = callPackage
@@ -41968,8 +39169,6 @@ self: {
        ];
        description = "Adds convenient Amazon ElasticSearch Service authentication to Bloodhound";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bloomfilter" = callPackage
@@ -42008,8 +39207,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion random ];
        description = "Distributed bloom filters on Redis (using the Hedis client)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blosum" = callPackage
@@ -42031,8 +39228,6 @@ self: {
        ];
        description = "BLOSUM generator";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bloxorz" = callPackage
@@ -42064,8 +39259,6 @@ self: {
        ];
        description = "The blubber client; connects to the blubber server";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blubber-server" = callPackage
@@ -42087,8 +39280,6 @@ self: {
        ];
        description = "The blubber server, serves blubber clients";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bluemix-sdk" = callPackage
@@ -42126,8 +39317,6 @@ self: {
        executablePkgconfigDepends = [ gtk2 ];
        description = "full-featured tiling for the GNOME desktop environment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtk2;};
 
   "bluetileutils" = callPackage
@@ -42141,8 +39330,6 @@ self: {
        executableHaskellDepends = [ base gtk ];
        description = "Utilities for Bluetile";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blunk-hask-tests" = callPackage
@@ -42158,8 +39345,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "blunt" = callPackage
@@ -42181,8 +39366,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Convert between pointfree and pointful expressions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bmp" = callPackage
@@ -42207,8 +39390,6 @@ self: {
        ];
        description = "Library for communication with the Bosch BNO055 orientation sensor";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "board-games" = callPackage
@@ -42277,8 +39458,6 @@ self: {
        ];
        executableHaskellDepends = [ base hogre hois random ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bolt" = callPackage
@@ -42302,8 +39481,6 @@ self: {
        ];
        description = "Bolt driver for Neo4j";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "boltzmann-brain" = callPackage
@@ -42329,8 +39506,6 @@ self: {
        ];
        description = "Analytic sampler compiler for combinatorial systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "boltzmann-samplers" = callPackage
@@ -42381,8 +39556,6 @@ self: {
        ];
        description = "Bond schema compiler and code generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bond-haskell" = callPackage
@@ -42411,8 +39584,6 @@ self: {
        ];
        description = "Runtime support for BOND serialization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bond-haskell-compiler" = callPackage
@@ -42434,8 +39605,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Bond code generator for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bookkeeper" = callPackage
@@ -42463,8 +39632,6 @@ self: {
        ];
        description = "Anonymous records and overloaded labels";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bookkeeper-permissions" = callPackage
@@ -42476,8 +39643,6 @@ self: {
        libraryHaskellDepends = [ base bookkeeper type-level-sets ];
        description = "Permissions for bookkeeper records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bookkeeping" = callPackage
@@ -42574,8 +39739,6 @@ self: {
        ];
        description = "Boolean normal form: NNF, DNF & CNF";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "boolector" = callPackage
@@ -42584,8 +39747,8 @@ self: {
      }:
      mkDerivation {
        pname = "boolector";
-       version = "0.0.0.10";
-       sha256 = "0lssarfp05v6mnwn1qkgj8gjzszb43dhbs3025b60cmwsbnhfx2w";
+       version = "0.0.0.11";
+       sha256 = "1mj6pjh4vg7dziil68p8k60sn6s721jxdgpsq9kk1h05v67lh5fz";
        libraryHaskellDepends = [
          base containers directory mtl temporary time
        ];
@@ -42607,8 +39770,6 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "Boolean expressions with various representations and search queries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bools" = callPackage
@@ -42666,8 +39827,6 @@ self: {
        ];
        description = "Chronokinetic stream sources and incremental consumers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "boomerang" = callPackage
@@ -42700,8 +39859,6 @@ self: {
        ];
        description = "Boomshine clone";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "boop" = callPackage
@@ -42737,23 +39894,9 @@ self: {
        ];
        description = "Mathematically sound sound synthesis";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "boots" = callPackage
-    ({ mkDerivation, base, exceptions, hspec, mtl }:
-     mkDerivation {
-       pname = "boots";
-       version = "0.0.100";
-       sha256 = "0q685h5z561lgjg2kqnkls35wpys9kx4zhghqqq3dyvl2i4dwmcz";
-       libraryHaskellDepends = [ base exceptions mtl ];
-       testHaskellDepends = [ base exceptions hspec mtl ];
-       description = "IoC Monad in Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "boots_0_2_0_1" = callPackage
     ({ mkDerivation, base, exceptions, hspec, mtl }:
      mkDerivation {
        pname = "boots";
@@ -42763,7 +39906,6 @@ self: {
        testHaskellDepends = [ base exceptions hspec mtl ];
        description = "IoC Monad in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "boots-app" = callPackage
@@ -42788,8 +39930,6 @@ self: {
        executableHaskellDepends = [ base time ];
        description = "Factory for quickly building an application";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "boots-cloud" = callPackage
@@ -42807,8 +39947,6 @@ self: {
        ];
        description = "Factory for quickly building a microservice";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "boots-web" = callPackage
@@ -42828,8 +39966,6 @@ self: {
        ];
        description = "Factory for quickly building a web application";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bootstrap-types" = callPackage
@@ -42884,30 +40020,9 @@ self: {
        ];
        description = "Metering System for OpenStack metrics provided by Vaultaire";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "boring" = callPackage
-    ({ mkDerivation, adjunctions, base, base-compat, constraints, dec
-     , fin, generics-sop, singleton-bool, streams, tagged, transformers
-     , transformers-compat, vec
-     }:
-     mkDerivation {
-       pname = "boring";
-       version = "0.1.2";
-       sha256 = "0978dq53rpb7clz1ydjm6x38nrx0vkp3safqcbjp2kq6jlaz29jr";
-       revision = "3";
-       editedCabalFile = "1d7xl2dxm4v33j1bd5450x1mh86x8kb24qjvad8nk98dmgf63ah2";
-       libraryHaskellDepends = [
-         adjunctions base base-compat constraints dec fin generics-sop
-         singleton-bool streams tagged transformers transformers-compat vec
-       ];
-       description = "Boring and Absurd types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "boring_0_1_3" = callPackage
     ({ mkDerivation, adjunctions, base, base-compat, bin, constraints
      , dec, fin, generics-sop, ral, singleton-bool, streams, tagged
      , transformers, transformers-compat, vec
@@ -42923,7 +40038,6 @@ self: {
        ];
        description = "Boring and Absurd types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "boring-game" = callPackage
@@ -42953,8 +40067,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A boring window switcher";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bot" = callPackage
@@ -42966,8 +40078,6 @@ self: {
        libraryHaskellDepends = [ arrows base Stream ];
        description = "bots for functional reactive programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "both" = callPackage
@@ -43063,8 +40173,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Arrays with a value for every index";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bounded-queue" = callPackage
@@ -43134,8 +40242,6 @@ self: {
        ];
        description = "audio-visual pseudo-physical simulation of colliding circles";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "box" = callPackage
@@ -43162,8 +40268,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "boxes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "box-tuples" = callPackage
@@ -43220,8 +40324,6 @@ self: {
        ];
        description = "Types and functions to work with braids and Khovanov homology";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "brain-bleep" = callPackage
@@ -43235,8 +40337,6 @@ self: {
        executableHaskellDepends = [ array base containers parsec ];
        description = "primitive imperative language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "brainfuck" = callPackage
@@ -43319,8 +40419,6 @@ self: {
        executableHaskellDepends = [ base haskgame mtl SDL ];
        description = "A simple Breakout game implementation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "breve" = callPackage
@@ -43344,8 +40442,6 @@ self: {
        ];
        description = "a url shortener";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "brians-brain" = callPackage
@@ -43359,51 +40455,24 @@ self: {
        executableHaskellDepends = [ array base parallel random SDL ];
        description = "A Haskell implementation of the Brian's Brain cellular automaton";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "brick" = callPackage
-    ({ mkDerivation, base, config-ini, containers, contravariant
-     , data-clist, deepseq, directory, dlist, filepath, microlens
-     , microlens-mtl, microlens-th, QuickCheck, stm, template-haskell
-     , text, text-zipper, transformers, unix, vector, vty, word-wrap
-     }:
-     mkDerivation {
-       pname = "brick";
-       version = "0.47.1";
-       sha256 = "0s0frxr6spgxzzvnym8rf40wj261clv7yfy2fxgm8iyjrr0ki49h";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base config-ini containers contravariant data-clist deepseq
-         directory dlist filepath microlens microlens-mtl microlens-th stm
-         template-haskell text text-zipper transformers unix vector vty
-         word-wrap
-       ];
-       testHaskellDepends = [
-         base containers microlens QuickCheck vector
-       ];
-       description = "A declarative terminal user interface library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "brick_0_51" = callPackage
     ({ mkDerivation, base, bytestring, config-ini, containers
-     , contravariant, data-clist, deepseq, directory, dlist, filepath
-     , microlens, microlens-mtl, microlens-th, QuickCheck, stm
+     , contravariant, data-clist, deepseq, directory, dlist, exceptions
+     , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm
      , template-haskell, text, text-zipper, transformers, unix, vector
      , vty, word-wrap
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.51";
-       sha256 = "05phqqq4sb7b11maava7y9by1lz6drzzhggvb2nsxsbajlka41h8";
+       version = "0.52";
+       sha256 = "10734nqmmix3ddab30a02dn9sma2aywg358q156b392g0nxzv39n";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring config-ini containers contravariant data-clist
-         deepseq directory dlist filepath microlens microlens-mtl
+         deepseq directory dlist exceptions filepath microlens microlens-mtl
          microlens-th stm template-haskell text text-zipper transformers
          unix vector vty word-wrap
        ];
@@ -43412,7 +40481,6 @@ self: {
        ];
        description = "A declarative terminal user interface library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "brick-dropdownmenu" = callPackage
@@ -43431,8 +40499,6 @@ self: {
        ];
        description = "A drop-down menu widget for brick";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "brick-filetree" = callPackage
@@ -43492,8 +40558,6 @@ self: {
        ];
        description = "Bricks is a lazy functional language based on Nix";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bricks-internal" = callPackage
@@ -43512,8 +40576,6 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bricks-internal-test" = callPackage
@@ -43529,8 +40591,6 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bricks-parsec" = callPackage
@@ -43551,8 +40611,6 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bricks-rendering" = callPackage
@@ -43573,8 +40631,6 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bricks-syntax" = callPackage
@@ -43595,8 +40651,6 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "brillig" = callPackage
@@ -43617,8 +40671,6 @@ self: {
        ];
        description = "Simple part of speech tagger";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "brittany" = callPackage
@@ -43692,8 +40744,6 @@ self: {
        ];
        description = "Conduit-based parallel streaming code for broadcast-chan";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "broadcast-chan-pipes" = callPackage
@@ -43710,8 +40760,6 @@ self: {
        ];
        description = "Pipes-based parallel streaming code for broadcast-chan";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "broadcast-chan-tests" = callPackage
@@ -43734,8 +40782,6 @@ self: {
        ];
        description = "Helpers for generating tests for broadcast-chan";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "broccoli" = callPackage
@@ -43747,8 +40793,6 @@ self: {
        libraryHaskellDepends = [ base containers stm time ];
        description = "Small library for interactive functional programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "brok" = callPackage
@@ -43774,8 +40818,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Finds broken links in text files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "broker-haskell" = callPackage
@@ -43789,8 +40831,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec ];
        description = "Haskell bindings to Broker, Bro's messaging library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {broker = null;};
 
   "bronyradiogermany-common" = callPackage
@@ -43828,8 +40868,6 @@ self: {
        ];
        description = "Streaming interface for the BronyRadioGermany API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "brotli" = callPackage
@@ -43850,8 +40888,6 @@ self: {
        ];
        description = "Brotli (RFC7932) compression and decompression";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {libbrotlidec = null; libbrotlienc = null;};
 
   "brotli-conduit" = callPackage
@@ -43872,8 +40908,6 @@ self: {
        ];
        description = "Conduit interface for Brotli (RFC7932) compression";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "brotli-streams" = callPackage
@@ -43894,8 +40928,6 @@ self: {
        ];
        description = "IO-Streams interface for Brotli (RFC7932) compression";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "browscap" = callPackage
@@ -43912,8 +40944,6 @@ self: {
        ];
        description = "A reader and interface for the Browser Capabilities Project data files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bsb-http-chunked" = callPackage
@@ -43957,8 +40987,8 @@ self: {
      }:
      mkDerivation {
        pname = "bson";
-       version = "0.3.2.8";
-       sha256 = "1xqxjs0vhlrvnclkxn8y5dr4liaja4flqizphk1000km2kvvw748";
+       version = "0.4.0.0";
+       sha256 = "0fcwqxzh678j48b04rbk7jwbnpp4859w389fb0fl7d5hvvw9kj19";
        libraryHaskellDepends = [
          base binary bytestring cryptohash-md5 data-binary-ieee754 mtl
          network text time
@@ -43980,8 +41010,6 @@ self: {
        libraryHaskellDepends = [ base bson ghc-prim text ];
        description = "Generic functionality for BSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bson-generics" = callPackage
@@ -43993,8 +41021,6 @@ self: {
        libraryHaskellDepends = [ base bson ghc-prim ];
        description = "Generics functionality for BSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bson-lens" = callPackage
@@ -44094,8 +41120,6 @@ self: {
        ];
        description = "A backend agnostic, concurrent BTree";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "btrfs" = callPackage
@@ -44147,8 +41171,6 @@ self: {
        ];
        description = "Automates most of your plain text accounting data entry in ledger format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "buffer" = callPackage
@@ -44170,8 +41192,6 @@ self: {
        benchmarkHaskellDepends = [ bug criterion rerebase ];
        description = "Simple mutable low-level buffer for IO";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "buffer-builder" = callPackage
@@ -44224,8 +41244,6 @@ self: {
        ];
        description = "Serialize Aeson values with Data.BufferBuilder";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "buffer-pipe" = callPackage
@@ -44266,8 +41284,6 @@ self: {
        doHaddock = false;
        description = "Assembles many Dockerfiles in one";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "buffon" = callPackage
@@ -44284,8 +41300,6 @@ self: {
        ];
        description = "An implementation of Buffon machines";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "buffon-machines" = callPackage
@@ -44321,8 +41335,8 @@ self: {
      }:
      mkDerivation {
        pname = "bugsnag-haskell";
-       version = "0.0.3.0";
-       sha256 = "1g1wqs3vlgdyk8f0xwvrzb1hc77xmjm8ygaw1skrh64darj8y9cq";
+       version = "0.0.3.1";
+       sha256 = "0ka4sj415pn2r2f037hyxw3fwsjzad9g67llm4yx1d3b15zzdxx9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44373,8 +41387,6 @@ self: {
        ];
        description = "A Haskell interface to the Bugzilla native REST API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "build" = callPackage
@@ -44392,8 +41404,6 @@ self: {
        testHaskellDepends = [ base containers extra mtl transformers ];
        description = "Build systems a la carte";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "buildable" = callPackage
@@ -44405,8 +41415,6 @@ self: {
        libraryHaskellDepends = [ base bytestring containers dlist text ];
        description = "Typeclass for builders of linear data structures";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "buildbox" = callPackage
@@ -44436,8 +41444,6 @@ self: {
        executableHaskellDepends = [ base buildbox parseargs ];
        description = "Tools for working with buildbox benchmark result files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "builder" = callPackage
@@ -44489,8 +41495,6 @@ self: {
        ];
        description = "A library and an executable that provide an easy API for a Haskell IDE";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bullet" = callPackage
@@ -44504,40 +41508,9 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A wrapper for the Bullet physics engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) bullet;};
 
   "bulletproofs" = callPackage
-    ({ mkDerivation, arithmoi, base, containers, criterion, cryptonite
-     , memory, MonadRandom, protolude, QuickCheck, random-shuffle, tasty
-     , tasty-discover, tasty-hunit, tasty-quickcheck, text
-     }:
-     mkDerivation {
-       pname = "bulletproofs";
-       version = "0.4.0";
-       sha256 = "0aw485g11mpx74wx3pb831z64jq085pvrp150fy0fbnjyi0ahvkc";
-       libraryHaskellDepends = [
-         arithmoi base containers cryptonite memory MonadRandom protolude
-         random-shuffle text
-       ];
-       testHaskellDepends = [
-         arithmoi base containers cryptonite memory MonadRandom protolude
-         QuickCheck random-shuffle tasty tasty-discover tasty-hunit
-         tasty-quickcheck text
-       ];
-       testToolDepends = [ tasty-discover ];
-       benchmarkHaskellDepends = [
-         arithmoi base containers criterion cryptonite memory MonadRandom
-         protolude QuickCheck random-shuffle tasty tasty-hunit
-         tasty-quickcheck text
-       ];
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "bulletproofs_1_1_0" = callPackage
     ({ mkDerivation, arithmoi, base, bytestring, containers, criterion
      , cryptonite, elliptic-curve, galois-field, memory, MonadRandom
      , protolude, QuickCheck, SHA, tasty, tasty-discover, tasty-hunit
@@ -44572,8 +41545,6 @@ self: {
        ];
        description = "Bulletproofs are short zero-knowledge proofs without a trusted setup";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bulmex" = callPackage
@@ -44598,8 +41569,6 @@ self: {
        ];
        description = "Reflex infused with bulma (css)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bumper" = callPackage
@@ -44619,8 +41588,6 @@ self: {
        ];
        description = "Automatically bump package versions, also transitively";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bunz" = callPackage
@@ -44636,8 +41603,6 @@ self: {
        testHaskellDepends = [ base doctest hspec ];
        description = "CLI tool to beautify JSON string";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "burnt-explorer" = callPackage
@@ -44655,8 +41620,6 @@ self: {
        ];
        description = "List OP_RETURN cryptocurrency transaction outputs";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "burst-detection" = callPackage
@@ -44670,8 +41633,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Burst detection algorithms";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bus-pirate" = callPackage
@@ -44688,8 +41649,6 @@ self: {
        ];
        description = "Haskell interface to the Bus Pirate binary interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "buster" = callPackage
@@ -44706,8 +41665,6 @@ self: {
        ];
        description = "Almost but not quite entirely unlike FRP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "buster-gtk" = callPackage
@@ -44724,8 +41681,6 @@ self: {
        ];
        description = "Almost but not quite entirely unlike FRP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "buster-network" = callPackage
@@ -44742,8 +41697,6 @@ self: {
        ];
        description = "Almost but not quite entirely unlike FRP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bustle" = callPackage
@@ -44816,8 +41769,6 @@ self: {
        ];
        description = "Monad Transformer for Asyncronous Message Passing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "butterflies" = callPackage
@@ -44839,8 +41790,6 @@ self: {
        ];
        description = "butterfly tilings";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bv" = callPackage
@@ -44911,8 +41860,6 @@ self: {
        ];
        description = "a BitVector datatype that is parameterized by the vector width";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "byline" = callPackage
@@ -44944,8 +41891,6 @@ self: {
        libraryHaskellDepends = [ base bytestring word24 ];
        description = "data from/to ByteString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "byte-order" = callPackage
@@ -45009,29 +41954,6 @@ self: {
      }) {};
 
   "bytes" = callPackage
-    ({ mkDerivation, base, binary, bytestring, Cabal, cabal-doctest
-     , cereal, containers, directory, doctest, filepath, hashable, mtl
-     , scientific, text, time, transformers, transformers-compat
-     , unordered-containers, void
-     }:
-     mkDerivation {
-       pname = "bytes";
-       version = "0.15.5";
-       sha256 = "063il2vrn0p88r9gzndh4ijs0mxj37khkc9ym9bqdsv7ngk3b683";
-       revision = "1";
-       editedCabalFile = "0k05cszpxmdwgnbxhmlmmvsxkwlanvz8dn0p3f6bzs8qlv3kbhm7";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base binary bytestring cereal containers hashable mtl scientific
-         text time transformers transformers-compat unordered-containers
-         void
-       ];
-       testHaskellDepends = [ base directory doctest filepath ];
-       description = "Sharing code for serialization between binary and cereal";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bytes_0_17" = callPackage
     ({ mkDerivation, base, binary, binary-orphans, bytestring, Cabal
      , cabal-doctest, cereal, containers, directory, doctest, filepath
      , hashable, mtl, scientific, text, time, transformers
@@ -45050,7 +41972,6 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Sharing code for serialization between binary and cereal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "byteset" = callPackage
@@ -45084,8 +42005,6 @@ self: {
        ];
        description = "Slicing managed and unmanaged memory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytesmith" = callPackage
@@ -45095,8 +42014,8 @@ self: {
      }:
      mkDerivation {
        pname = "bytesmith";
-       version = "0.3.4.0";
-       sha256 = "0xl7iigb260z66na22zvwif18a2rng7damvrz53r818kdqmllg4v";
+       version = "0.3.5.0";
+       sha256 = "1axjb1p819cfpwrmilc8qakw7acipx47hdrilwj6ib0nn5agya8f";
        libraryHaskellDepends = [
          base byteslice bytestring contiguous primitive run-st text-short
          wide-word
@@ -45110,8 +42029,6 @@ self: {
        ];
        description = "Nonresumable byte parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestring_0_10_10_0" = callPackage
@@ -45177,8 +42094,6 @@ self: {
        ];
        description = "Variable-length integer encoding";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestring-class" = callPackage
@@ -45192,8 +42107,6 @@ self: {
        libraryHaskellDepends = [ base bytestring utf8-string ];
        description = "Classes for automatic conversion to and from strict and lazy bytestrings. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestring-conversion" = callPackage
@@ -45229,8 +42142,6 @@ self: {
        libraryHaskellDepends = [ array base bytestring dlist ];
        description = "Parse CSV formatted data efficiently";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestring-delta" = callPackage
@@ -45311,8 +42222,6 @@ self: {
        ];
        description = "ByteString-backed Handles";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestring-lexing" = callPackage
@@ -45363,8 +42272,6 @@ self: {
        ];
        description = "Plain byte strings ('ForeignPtr'-less 'ByteString's)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestring-progress" = callPackage
@@ -45404,8 +42311,6 @@ self: {
        ];
        description = "fast ByteString to number converting library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestring-rematch" = callPackage
@@ -45419,8 +42324,6 @@ self: {
        doHaddock = false;
        description = "Rematch support for ByteString";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestring-short" = callPackage
@@ -45450,8 +42353,6 @@ self: {
        ];
        description = "Efficient conversion of values into readable byte strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestring-strict-builder" = callPackage
@@ -45502,8 +42403,6 @@ self: {
        ];
        description = "Library for Time parsing from ByteString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestring-to-vector" = callPackage
@@ -45572,8 +42471,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion QuickCheck ];
        description = "Bytestrings with typenat lengths";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestringparser" = callPackage
@@ -45585,8 +42482,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Combinator parsing with Data.ByteString.Lazy";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "bytestringparser-temporary" = callPackage
@@ -45609,8 +42504,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "A ReadP style parser library for ByteString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "byteunits" = callPackage
@@ -45626,31 +42519,67 @@ self: {
      }) {};
 
   "bz2" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, criterion, filepath, tasty
-     , tasty-golden, tasty-hunit
+    ({ mkDerivation, base, bytestring, c2hs, criterion, deepseq
+     , directory, filepath, tasty, tasty-golden, tasty-hunit, temporary
      }:
      mkDerivation {
        pname = "bz2";
-       version = "0.1.1.1";
-       sha256 = "17ckzljzl62bfmhbahxafq5v8xhwpalhxl5x2s83lp2jwc5gal52";
+       version = "1.0.0.1";
+       sha256 = "055sfi658z8sxznzdnj40hwzj89nfa0dk4x59b5z43lah9m3hpa2";
+       revision = "2";
+       editedCabalFile = "1kf9phb27cy7yk06sdd3bgh39ym0gb988h6zx315gcmlxncj71jb";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [
-         base bytestring filepath tasty tasty-golden tasty-hunit
+         base bytestring deepseq directory filepath tasty tasty-golden
+         tasty-hunit
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion filepath temporary
        ];
-       benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Bindings to libbz2";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bz2_1_0_0_2" = callPackage
+    ({ mkDerivation, base, bytestring, bzlib, bzlib-conduit, c2hs
+     , conduit, cpphs, criterion, deepseq, directory, filepath, pipes
+     , pipes-bytestring, pipes-bzip, pipes-safe, tasty, tasty-golden
+     , tasty-hunit, temporary
+     }:
+     mkDerivation {
+       pname = "bz2";
+       version = "1.0.0.2";
+       sha256 = "12w3rz137g45cw3s5n0ajk9pvilfvh3fszjrnn07fsjck0r5mnyx";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base bytestring ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [
+         base bytestring deepseq directory filepath tasty tasty-golden
+         tasty-hunit
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring bzlib bzlib-conduit conduit criterion filepath
+         pipes pipes-bytestring pipes-bzip pipes-safe temporary
+       ];
+       benchmarkToolDepends = [ cpphs ];
+       description = "Bindings to libbz2";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bzip-signature" = callPackage
-    ({ mkDerivation, base, bytestring, composition-prelude }:
+    ({ mkDerivation, base, bytestring, composition-prelude, lens }:
      mkDerivation {
        pname = "bzip-signature";
-       version = "0.1.1.1";
-       sha256 = "10xd38zgfkp1jngw45hkbi3am04zy3dciwly1pralbf8drf2sn8b";
-       libraryHaskellDepends = [ base bytestring composition-prelude ];
+       version = "0.1.2.0";
+       sha256 = "077bwh3rwig9rml5pz49m4rxbn0j9q6cv7zlc5xlhkmw6plwg4ps";
+       revision = "1";
+       editedCabalFile = "003197s08saac5azpwc4vqvs65244pvp019j9lhr76my6a98iz0f";
+       libraryHaskellDepends = [
+         base bytestring composition-prelude lens
+       ];
        description = "Backpack signature for BZip compression";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -45704,8 +42633,6 @@ self: {
        libraryHaskellDepends = [ base language-c ];
        description = "A higher level DSL on top of language-c";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "c-io" = callPackage
@@ -45717,8 +42644,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "C IO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "c-mosquitto" = callPackage
@@ -45775,8 +42700,6 @@ self: {
        executableHaskellDepends = [ base c0parser ];
        description = "Simple C0 Syntax Check";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "c0parser" = callPackage
@@ -45788,8 +42711,6 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "Simple C0 Parser";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "c10k" = callPackage
@@ -45823,8 +42744,6 @@ self: {
        ];
        description = "Translate C code into ATS";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "c2hs" = callPackage
@@ -45886,8 +42805,6 @@ self: {
        testHaskellDepends = [ base here hspec logging monad-logger text ];
        description = "Convert C API header files to .hsc and .hsc.helper.c files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ca" = callPackage
@@ -45896,11 +42813,11 @@ self: {
        pname = "ca";
        version = "0.0.0.1";
        sha256 = "0fkqbpgbbp1g6q5vjmgnfddrilyqwqsvd6w7w3vmgg6q7zdh6fy2";
+       revision = "1";
+       editedCabalFile = "1s7qxji4a44qrsmfajrpzjfg06aksxxf41b5y8bgrc93m2iyn4xw";
        libraryHaskellDepends = [ alg base ];
        description = "Cellular Automata";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ca-province-codes" = callPackage
@@ -45969,8 +42886,6 @@ self: {
        ];
        description = "Check how up-to-date your .cabal dependencies are.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-bounds" = callPackage
@@ -46022,8 +42937,6 @@ self: {
        ];
        description = "Bundling C/C++ projects in Cabal package made easy";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-cache" = callPackage
@@ -46059,8 +42972,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "CI Assistant for Haskell projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-cargs" = callPackage
@@ -46083,8 +42994,6 @@ self: {
        testHaskellDepends = [ base filepath tasty tasty-golden ];
        description = "A command line program for extracting compiler arguments from a cabal file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-constraints" = callPackage
@@ -46098,8 +43007,6 @@ self: {
        executableHaskellDepends = [ base Cabal optparse-applicative ];
        description = "Repeatable builds for cabalized Haskell projects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-db" = callPackage
@@ -46119,8 +43026,6 @@ self: {
        ];
        description = "query tools for the local cabal database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-debian" = callPackage
@@ -46145,8 +43050,6 @@ self: {
        executableHaskellDepends = [ base Cabal debian lens mtl pretty ];
        description = "Create a Debianization for a Cabal package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-dependency-licenses" = callPackage
@@ -46162,8 +43065,6 @@ self: {
        ];
        description = "Compose a list of a project's transitive dependencies with their licenses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-dev" = callPackage
@@ -46186,8 +43087,6 @@ self: {
        executableToolDepends = [ cabal-install ];
        description = "Manage sandboxed Haskell build environments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-dir" = callPackage
@@ -46201,8 +43100,6 @@ self: {
        executableHaskellDepends = [ base Cabal directory filepath ];
        description = "show dist dir of 'cabal copy/install'";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-doctest" = callPackage
@@ -46255,8 +43152,6 @@ self: {
        ];
        description = "Generate a FlatPak manifest from a Cabal package description";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-fmt" = callPackage
@@ -46283,8 +43178,6 @@ self: {
        doHaddock = false;
        description = "Format .cabal files";
        license = "GPL-3.0-or-later AND BSD-3-Clause";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-ghc-dynflags" = callPackage
@@ -46296,8 +43189,6 @@ self: {
        libraryHaskellDepends = [ base Cabal ghc transformers ];
        description = "Conveniently configure GHC's dynamic flags for use with Cabal projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-ghci" = callPackage
@@ -46314,8 +43205,6 @@ self: {
        ];
        description = "Set up ghci with options taken from a .cabal file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-graphdeps" = callPackage
@@ -46333,8 +43222,6 @@ self: {
        ];
        description = "Generate graphs of install-time Cabal dependencies";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-helper" = callPackage
@@ -46367,8 +43254,6 @@ self: {
        doCheck = false;
        description = "Give Haskell development tools access to Cabal project environment";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-info" = callPackage
@@ -46389,8 +43274,6 @@ self: {
        ];
        description = "Read information from cabal files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-install" = callPackage
@@ -46440,8 +43323,6 @@ self: {
        executableSystemDepends = [ zlib ];
        description = "The (bundled) command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "cabal-install-ghc72" = callPackage
@@ -46461,8 +43342,6 @@ self: {
        ];
        description = "Temporary version of cabal-install for ghc-7.2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-install-ghc74" = callPackage
@@ -46482,8 +43361,6 @@ self: {
        ];
        description = "Temporary version of cabal-install for ghc-7.4";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-install-parsers" = callPackage
@@ -46508,8 +43385,6 @@ self: {
        ];
        description = "Utilities to work with cabal-install files";
        license = "GPL-2.0-or-later AND BSD-3-Clause";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-lenses" = callPackage
@@ -46575,8 +43450,6 @@ self: {
        ];
        description = "build multiple packages at once";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-mon" = callPackage
@@ -46594,8 +43467,6 @@ self: {
        ];
        description = "A monitor for cabal builds";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-nirvana" = callPackage
@@ -46613,8 +43484,6 @@ self: {
        ];
        description = "Avoid Cabal dependency hell by constraining to known good versions. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-plan" = callPackage
@@ -46655,8 +43524,6 @@ self: {
        executableHaskellDepends = [ base Cabal directory filepath ];
        description = "Show dependencies of program being built in current directory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-query" = callPackage
@@ -46673,33 +43540,9 @@ self: {
        ];
        description = "Helpers for quering .cabal files or hackageDB's 00-index.tar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-rpm" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, directory, filepath
-     , http-client, http-client-tls, http-conduit, optparse-applicative
-     , process, simple-cabal, simple-cmd, simple-cmd-args, time, unix
-     }:
-     mkDerivation {
-       pname = "cabal-rpm";
-       version = "1.0.3";
-       sha256 = "1j0m5x3bgr5krjqfdmllsplhw4vh1vbmiq89v1x87zi1mgn3yf6m";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base bytestring Cabal directory filepath http-client
-         http-client-tls http-conduit optparse-applicative process
-         simple-cabal simple-cmd simple-cmd-args time unix
-       ];
-       description = "RPM packaging tool for Haskell Cabal-based packages";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "cabal-rpm_2_0_1" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath
      , http-client, http-client-tls, http-conduit, optparse-applicative
      , process, simple-cabal, simple-cmd, simple-cmd-args, time, unix
@@ -46717,8 +43560,27 @@ self: {
        ];
        description = "RPM packaging tool for Haskell Cabal-based packages";
        license = stdenv.lib.licenses.gpl3;
+     }) {};
+
+  "cabal-rpm_2_0_2" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, directory, filepath
+     , http-client, http-client-tls, http-conduit, optparse-applicative
+     , process, simple-cabal, simple-cmd, simple-cmd-args, time, unix
+     }:
+     mkDerivation {
+       pname = "cabal-rpm";
+       version = "2.0.2";
+       sha256 = "1cnnibn10sv39ilsy222rr9q5pl56jshnpjp80pih4fzvq8myjbw";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring Cabal directory filepath http-client
+         http-client-tls http-conduit optparse-applicative process
+         simple-cabal simple-cmd simple-cmd-args time unix
+       ];
+       description = "RPM packaging tool for Haskell Cabal-based packages";
+       license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-scripts" = callPackage
@@ -46745,8 +43607,6 @@ self: {
        executableHaskellDepends = [ base Cabal ];
        description = "The user interface for building and installing Cabal packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-sign" = callPackage
@@ -46783,8 +43643,6 @@ self: {
        ];
        description = "Topologically sort cabal packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-src" = callPackage
@@ -46806,8 +43664,6 @@ self: {
        ];
        description = "Alternative install procedure to avoid the diamond dependency issue";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-test" = callPackage
@@ -46823,8 +43679,6 @@ self: {
        ];
        description = "Automated test tool for cabal projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-test-bin" = callPackage
@@ -46866,8 +43720,6 @@ self: {
        libraryHaskellDepends = [ base Cabal QuickCheck ];
        description = "QuickCheck for Cabal";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-toolkit" = callPackage
@@ -46883,8 +43735,6 @@ self: {
        ];
        description = "Helper functions for writing custom Setup.hs scripts.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-uninstall" = callPackage
@@ -46911,8 +43761,6 @@ self: {
        executableHaskellDepends = [ base filepath HTTP network ];
        description = "Command-line tool for uploading packages to Hackage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal2arch" = callPackage
@@ -46932,8 +43780,6 @@ self: {
        ];
        description = "Create Arch Linux packages from Cabal packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal2doap" = callPackage
@@ -46949,8 +43795,6 @@ self: {
        ];
        description = "Cabal to Description-of-a-Project (DOAP)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal2ebuild" = callPackage
@@ -46965,8 +43809,6 @@ self: {
        executableHaskellDepends = [ base curl directory ];
        description = "make gentoo's .ebuild file from .cabal file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal2ghci" = callPackage
@@ -46985,8 +43827,6 @@ self: {
        ];
        description = "A tool to generate .ghci file from .cabal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal2nix" = callPackage
@@ -47062,8 +43902,6 @@ self: {
        ];
        description = "A simple tool to query cabal files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabalg" = callPackage
@@ -47098,8 +43936,6 @@ self: {
        ];
        description = "Generate pretty graphs of module trees from cabal files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabalish" = callPackage
@@ -47118,8 +43954,6 @@ self: {
        ];
        description = "Provides access to the cabal file data for shell scripts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabalmdvrpm" = callPackage
@@ -47134,8 +43968,6 @@ self: {
        executableHaskellDepends = [ base Cabal cabalrpmdeps haskell98 ];
        description = "Create mandriva rpm from cabal package";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabalrpmdeps" = callPackage
@@ -47150,8 +43982,6 @@ self: {
        executableHaskellDepends = [ base Cabal filepath haskell98 ];
        description = "Autogenerate rpm dependencies from cabal files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabalvchk" = callPackage
@@ -47165,8 +43995,6 @@ self: {
        executableHaskellDepends = [ base Cabal ];
        description = "Verify installed package version against user-specified constraints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabin" = callPackage
@@ -47185,8 +44013,6 @@ self: {
        ];
        description = "Cabal binary sandboxes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabocha" = callPackage
@@ -47199,8 +44025,6 @@ self: {
        librarySystemDepends = [ cabocha ];
        testHaskellDepends = [ base text-format ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {cabocha = null;};
 
   "cache" = callPackage
@@ -47234,8 +44058,6 @@ self: {
        ];
        description = "Cache values to disk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cached-io" = callPackage
@@ -47366,8 +44188,6 @@ self: {
        ];
        description = "A library implementing the Noise protocol";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "caf" = callPackage
@@ -47408,8 +44228,6 @@ self: {
          protocol-buffers-descriptor template-haskell temporary text
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cairo" = callPackage
@@ -47475,8 +44293,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Cairo Haskell binding (partial)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) cairo;};
 
   "cake" = callPackage
@@ -47499,8 +44315,6 @@ self: {
        ];
        description = "A build-system library and driver";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cake3" = callPackage
@@ -47530,8 +44344,6 @@ self: {
        ];
        description = "Third cake the Makefile EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cakyrespa" = callPackage
@@ -47549,8 +44361,6 @@ self: {
        ];
        description = "run turtle like LOGO with lojban";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cal-layout" = callPackage
@@ -47565,8 +44375,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Calendar Layout Algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cal3d" = callPackage
@@ -47579,8 +44387,6 @@ self: {
        librarySystemDepends = [ cal3d ];
        description = "Haskell binding to the Cal3D animation library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {cal3d = null;};
 
   "cal3d-examples" = callPackage
@@ -47595,8 +44401,6 @@ self: {
        executableHaskellDepends = [ base cal3d cal3d-opengl OpenGL SDL ];
        description = "Examples for the Cal3d animation library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cal3d-opengl" = callPackage
@@ -47608,8 +44412,6 @@ self: {
        libraryHaskellDepends = [ base cal3d OpenGL ];
        description = "OpenGL rendering for the Cal3D animation library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "calc" = callPackage
@@ -47623,8 +44425,6 @@ self: {
        executableHaskellDepends = [ array base harpy haskell98 mtl ];
        description = "A small compiler for arithmetic expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "calculator" = callPackage
@@ -47646,8 +44446,6 @@ self: {
        ];
        description = "A calculator repl, with variables, functions & Mathematica like dynamic plots";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "caldims" = callPackage
@@ -47668,8 +44466,6 @@ self: {
        ];
        description = "Calculation tool and library supporting units";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "caledon" = callPackage
@@ -47687,8 +44483,6 @@ self: {
        ];
        description = "a logic programming language based on the calculus of constructions";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "calendar-recycling" = callPackage
@@ -47719,8 +44513,6 @@ self: {
        ];
        description = "Commandline tool to get week of the year";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "call" = callPackage
@@ -47746,8 +44538,6 @@ self: {
        ];
        description = "The call game engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "call-alloy" = callPackage
@@ -47769,8 +44559,6 @@ self: {
        ];
        description = "A simple library to call Alloy given a specification";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "call-haskell-from-anything" = callPackage
@@ -47789,23 +44577,9 @@ self: {
        executableHaskellDepends = [ base bytestring data-msgpack mtl ];
        description = "Call Haskell functions from other languages via serialization and dynamic libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "call-stack" = callPackage
-    ({ mkDerivation, base, nanospec }:
-     mkDerivation {
-       pname = "call-stack";
-       version = "0.1.0";
-       sha256 = "1qmihf5jafmc79sk52l6gpx75f5bnla2lp62kh3p34x3j84mwpzj";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base nanospec ];
-       description = "Use GHC call-stacks in a backward compatible way";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "call-stack_0_2_0" = callPackage
     ({ mkDerivation, base, nanospec }:
      mkDerivation {
        pname = "call-stack";
@@ -47815,7 +44589,6 @@ self: {
        testHaskellDepends = [ base nanospec ];
        description = "Use GHC call-stacks in a backward compatible way";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "camfort" = callPackage
@@ -47853,8 +44626,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "CamFort - Cambridge Fortran infrastructure";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) flint;};
 
   "camh" = callPackage
@@ -47887,8 +44658,6 @@ self: {
        ];
        description = "Haskell implementation of the Campfire API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "can-i-haz" = callPackage
@@ -47923,8 +44692,6 @@ self: {
        libraryHaskellDepends = [ base deepseq directory filepath ];
        description = "Abstract data type for canonical file paths";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "canonical-json" = callPackage
@@ -47948,8 +44715,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring containers criterion ];
        description = "Canonical JSON for signing and hashing JSON values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "canteven-config" = callPackage
@@ -47980,8 +44745,6 @@ self: {
        ];
        description = "Utilities for HTTP programming";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "canteven-listen-http" = callPackage
@@ -47993,8 +44756,6 @@ self: {
        libraryHaskellDepends = [ aeson base ];
        description = "data types to describe HTTP services";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "canteven-log" = callPackage
@@ -48012,8 +44773,6 @@ self: {
        ];
        description = "A canteven way of setting up logging for your program";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "canteven-parsedate" = callPackage
@@ -48029,8 +44788,6 @@ self: {
        ];
        description = "Date / time parsing utilities that try to guess the date / time format";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "canteven-template" = callPackage
@@ -48069,27 +44826,23 @@ self: {
        ];
        description = "Application for analysis of java source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cantor-pairing" = callPackage
-    ({ mkDerivation, arithmoi, base, containers, hspec, hspec-discover
-     , integer-gmp, integer-logarithms, mtl
+    ({ mkDerivation, base, containers, hspec, hspec-discover
+     , integer-gmp, integer-logarithms, integer-roots, mtl
      }:
      mkDerivation {
        pname = "cantor-pairing";
-       version = "0.2.0.0";
-       sha256 = "0szdmfwaaqnipxjvlzblk1lwyw573d3p659njwi18w0iydsf56js";
+       version = "0.2.0.1";
+       sha256 = "12wfm27gwhar7djd459yc86bv29818xdyc8glkhgn4q1kx7nda90";
        libraryHaskellDepends = [
-         arithmoi base containers integer-gmp integer-logarithms
+         base containers integer-gmp integer-logarithms integer-roots
        ];
        testHaskellDepends = [ base containers hspec mtl ];
        testToolDepends = [ hspec-discover ];
        description = "Convert data to and from a natural number representation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cao" = callPackage
@@ -48111,8 +44864,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "CAO Compiler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cap" = callPackage
@@ -48127,8 +44878,6 @@ self: {
        executableHaskellDepends = [ array base containers haskell98 ];
        description = "Interprets and debug the cap language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "capability" = callPackage
@@ -48213,8 +44962,6 @@ self: {
        ];
        description = "Cap'n Proto for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "capped-list" = callPackage
@@ -48226,8 +44973,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A list-like type for lazy sequences, with a user-defined termination value";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "capri" = callPackage
@@ -48243,8 +44988,6 @@ self: {
        ];
        description = "A simple wrapper over cabal-install to operate in project-private mode";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "car-pool" = callPackage
@@ -48267,8 +45010,6 @@ self: {
        ];
        description = "Simple web-server for organizing car-pooling for an event";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "caramia" = callPackage
@@ -48307,8 +45048,6 @@ self: {
        ];
        description = "some spaghetti code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "carboncopy" = callPackage
@@ -48326,8 +45065,6 @@ self: {
        ];
        description = "Drop emails from threads being watched into special CC folder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "carettah" = callPackage
@@ -48348,8 +45085,6 @@ self: {
        ];
        description = "A presentation tool written with Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "carray" = callPackage
@@ -48385,8 +45120,6 @@ self: {
        ];
        description = "Carte: A commandline pastebin server";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cartel" = callPackage
@@ -48415,8 +45148,6 @@ self: {
        ];
        description = "Specify Cabal files in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "casa-abbreviations-and-acronyms" = callPackage
@@ -48438,8 +45169,6 @@ self: {
        ];
        description = "CASA Abbreviations and Acronyms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "casadi-bindings" = callPackage
@@ -48464,8 +45193,6 @@ self: {
        ];
        description = "mid-level bindings to CasADi";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {casadi = null;};
 
   "casadi-bindings-control" = callPackage
@@ -48482,8 +45209,6 @@ self: {
        libraryPkgconfigDepends = [ casadi_control ];
        description = "low level bindings to casadi-control";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {casadi_control = null;};
 
   "casadi-bindings-core" = callPackage
@@ -48500,8 +45225,6 @@ self: {
        librarySystemDepends = [ casadi ];
        description = "autogenerated low level bindings to casadi";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {casadi = null;};
 
   "casadi-bindings-internal" = callPackage
@@ -48514,8 +45237,6 @@ self: {
        librarySystemDepends = [ casadi ];
        description = "low level bindings to CasADi";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {casadi = null;};
 
   "casadi-bindings-ipopt-interface" = callPackage
@@ -48532,8 +45253,6 @@ self: {
        libraryPkgconfigDepends = [ casadi_ipopt_interface ];
        description = "low level bindings to casadi-ipopt_interface";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {casadi_ipopt_interface = null;};
 
   "casadi-bindings-snopt-interface" = callPackage
@@ -48550,8 +45269,6 @@ self: {
        libraryPkgconfigDepends = [ casadi_snopt_interface ];
        description = "low level bindings to casadi-snopt_interface";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {casadi_snopt_interface = null;};
 
   "cascading" = callPackage
@@ -48568,8 +45285,6 @@ self: {
        ];
        description = "DSL for HTML CSS (Cascading Style Sheets)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "case-conversion" = callPackage
@@ -48588,23 +45303,6 @@ self: {
      }) {};
 
   "case-insensitive" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, deepseq, hashable
-     , HUnit, test-framework, test-framework-hunit, text
-     }:
-     mkDerivation {
-       pname = "case-insensitive";
-       version = "1.2.0.11";
-       sha256 = "1qrpxfirsxckg7jv28f5ah2qc8lh95hp7rnqkbqs1ahcwlbnvkm7";
-       libraryHaskellDepends = [ base bytestring deepseq hashable text ];
-       testHaskellDepends = [
-         base bytestring HUnit test-framework test-framework-hunit text
-       ];
-       benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
-       description = "Case insensitive string comparison";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "case-insensitive_1_2_1_0" = callPackage
     ({ mkDerivation, base, bytestring, criterion, deepseq, hashable
      , HUnit, test-framework, test-framework-hunit, text
      }:
@@ -48619,7 +45317,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        description = "Case insensitive string comparison";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "case-insensitive-match" = callPackage
@@ -48698,8 +45395,6 @@ self: {
        ];
        description = "the Computer Algebra SHell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "casing" = callPackage
@@ -48906,8 +45601,6 @@ self: {
        ];
        description = "Haskell client for Cassandra's CQL protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cassandra-thrift" = callPackage
@@ -48965,8 +45658,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Conduit interface for cassava package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cassava-embed" = callPackage
@@ -49057,8 +45748,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A combinator library for simultaneously defining parsers and pretty printers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cassy" = callPackage
@@ -49086,8 +45775,6 @@ self: {
        ];
        description = "A high level driver for the Cassandra datastore";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cast" = callPackage
@@ -49141,8 +45828,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Multicast, thread-safe, and fast logger";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "castle" = callPackage
@@ -49161,8 +45846,6 @@ self: {
        ];
        description = "A tool to manage shared cabal-install sandboxes";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "casui" = callPackage
@@ -49177,8 +45860,6 @@ self: {
        executableHaskellDepends = [ base gtk haskell98 mtl parsec ];
        description = "Equation Manipulator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "catamorphism" = callPackage
@@ -49191,8 +45872,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Exposes a Template Haskell function for generating catamorphisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "catch-fd" = callPackage
@@ -49204,8 +45883,6 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "MonadThrow and MonadCatch, using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "categorical-algebra" = callPackage
@@ -49217,8 +45894,6 @@ self: {
        libraryHaskellDepends = [ base newtype pointless-haskell void ];
        description = "Categorical Monoids and Semirings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "categories" = callPackage
@@ -49241,8 +45916,6 @@ self: {
        libraryHaskellDepends = [ alg base dual transformers ];
        description = "Categorical types and classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "category-extras" = callPackage
@@ -49270,8 +45943,6 @@ self: {
        doHaddock = false;
        description = "A meta-package documenting various packages inspired by category theory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "category-printf" = callPackage
@@ -49291,11 +45962,11 @@ self: {
        pname = "category-traced";
        version = "0.1.0.1";
        sha256 = "00c70xvjprq0laipa47ypd3dq8a2818b4k3sgamisgy40a7vgp10";
+       revision = "1";
+       editedCabalFile = "0b76pssnh3l4jwasyy02rqnkvy2pask90yvp9by30yk1mfz07mhg";
        libraryHaskellDepends = [ base categories ];
        description = "Traced monoidal categories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "catnplus" = callPackage
@@ -49315,8 +45986,6 @@ self: {
        ];
        description = "Simple tool to display text files with line numbers and paging";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cautious" = callPackage
@@ -49362,8 +46031,6 @@ self: {
          hspec QuickCheck
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cayene-lpp" = callPackage
@@ -49383,27 +46050,6 @@ self: {
      }) {};
 
   "cayley-client" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
-     , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
-     , mtl, text, transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "cayley-client";
-       version = "0.4.9";
-       sha256 = "05i032xqi4hplchf9dklxqi0fh5byw2ibyf1ba2wnxql2j7y177z";
-       libraryHaskellDepends = [
-         aeson attoparsec base binary bytestring exceptions http-client
-         http-conduit lens lens-aeson mtl text transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [ aeson base hspec unordered-containers ];
-       description = "A Haskell client for the Cayley graph database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "cayley-client_0_4_11" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
      , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
      , mtl, text, transformers, unordered-containers, vector
@@ -49420,8 +46066,6 @@ self: {
        testHaskellDepends = [ aeson base hspec unordered-containers ];
        description = "A Haskell client for the Cayley graph database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cayley-dickson" = callPackage
@@ -49554,8 +46198,6 @@ self: {
        ];
        description = "Bindings for the CCI networking library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {cci = null;};
 
   "ccnx" = callPackage
@@ -49567,8 +46209,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "A Haskell implementation of the CCNx network protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cctools-workqueue" = callPackage
@@ -49585,8 +46225,6 @@ self: {
        librarySystemDepends = [ dttools ];
        description = "High-level interface to CCTools' WorkQueue library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {dttools = null;};
 
   "cdeps" = callPackage
@@ -49625,8 +46263,6 @@ self: {
        ];
        description = "Convenient Chinese phrase & character lookup";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cef" = callPackage
@@ -49641,8 +46277,6 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "CEF log format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cef3-raw" = callPackage
@@ -49656,8 +46290,6 @@ self: {
        libraryPkgconfigDepends = [ gtk2 ];
        description = "Raw CEF3 bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {cef = null; inherit (pkgs) gtk2;};
 
   "cef3-simple" = callPackage
@@ -49669,8 +46301,6 @@ self: {
        libraryHaskellDepends = [ base cef3-raw ];
        description = "Simple wrapper around cef3-raw";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ceilometer-common" = callPackage
@@ -49694,8 +46324,6 @@ self: {
        ];
        description = "Common Haskell types and encoding for OpenStack Ceilometer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cellrenderer-cairo" = callPackage
@@ -49709,8 +46337,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Cairo-based CellRenderer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtk2;};
 
   "celtchar" = callPackage
@@ -49735,8 +46361,6 @@ self: {
        testHaskellDepends = [ base hspec raw-strings-qq ];
        description = "A tool to build a novel";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cerberus" = callPackage
@@ -49764,8 +46388,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Protect and control API access with cerberus";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cereal" = callPackage
@@ -49827,8 +46449,6 @@ self: {
        libraryHaskellDepends = [ base cereal ghc-prim ];
        description = "Automatic deriving of Serialize using GHC.Generics";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cereal-enumerator" = callPackage
@@ -49840,8 +46460,6 @@ self: {
        libraryHaskellDepends = [ base bytestring cereal enumerator ];
        description = "Deserialize things with cereal and enumerator";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cereal-ieee754" = callPackage
@@ -49853,8 +46471,6 @@ self: {
        libraryHaskellDepends = [ array base cereal ];
        description = "Floating point support for the 'cereal' serialization library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cereal-io-streams" = callPackage
@@ -49877,8 +46493,6 @@ self: {
        ];
        description = "io-streams support for the cereal binary serialization library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cereal-plus" = callPackage
@@ -49902,8 +46516,6 @@ self: {
        ];
        description = "An extended serialization library on top of \"cereal\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cereal-streams" = callPackage
@@ -49926,8 +46538,6 @@ self: {
        ];
        description = "Use cereal to encode/decode io-streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cereal-text" = callPackage
@@ -50008,8 +46618,6 @@ self: {
        ];
        description = "Certificates and Key Reader/Writer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cf" = callPackage
@@ -50027,8 +46635,6 @@ self: {
        ];
        description = "Exact real arithmetic using continued fractions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cfenv" = callPackage
@@ -50062,8 +46668,6 @@ self: {
        ];
        description = "cfipu processor for toy brainfuck-like language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cflp" = callPackage
@@ -50082,8 +46686,6 @@ self: {
        ];
        description = "Constraint Functional-Logic Programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cfopu" = callPackage
@@ -50101,8 +46703,6 @@ self: {
        ];
        description = "cfopu processor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cg" = callPackage
@@ -50123,8 +46723,6 @@ self: {
        ];
        description = "Parser for categorial grammars";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cgen" = callPackage
@@ -50144,31 +46742,9 @@ self: {
        doHaddock = false;
        description = "generates Haskell bindings and C wrappers for C++ libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cgi" = callPackage
-    ({ mkDerivation, base, bytestring, containers, exceptions, mtl
-     , multipart, network-uri, parsec, time, xhtml
-     }:
-     mkDerivation {
-       pname = "cgi";
-       version = "3001.4.0.0";
-       sha256 = "1d0nh5ymkqskkp4yn0gfz4mff8i0cxyw1wws8xxp6k1mg1ywa25k";
-       revision = "2";
-       editedCabalFile = "1y0gh51qzdkmvla5r02vab8i9r90m4qqglb0iyy888yc4lw2v6jj";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring containers exceptions mtl multipart network-uri
-         parsec time xhtml
-       ];
-       description = "A library for writing CGI programs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cgi_3001_5_0_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions, mtl
      , multipart, network-uri, parsec, time, xhtml
      }:
@@ -50184,7 +46760,6 @@ self: {
        ];
        description = "A library for writing CGI programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cgi-undecidable" = callPackage
@@ -50209,8 +46784,6 @@ self: {
        libraryHaskellDepends = [ base cgi containers mtl random ];
        description = "Simple modular utilities for CGI/FastCGI (sessions, etc.)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cgrep" = callPackage
@@ -50236,8 +46809,6 @@ self: {
        ];
        description = "Command line tool";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chain-codes" = callPackage
@@ -50279,8 +46850,6 @@ self: {
        ];
        description = "Combinators for building and processing 2D images";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chalkboard-viewer" = callPackage
@@ -50292,8 +46861,6 @@ self: {
        libraryHaskellDepends = [ array base chalkboard GLUT OpenGL time ];
        description = "OpenGL based viewer for chalkboard rendered images";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chalmers-lava2000" = callPackage
@@ -50420,8 +46987,6 @@ self: {
        ];
        description = "Rapid prototyping websites with Snap and Heist";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "charset" = callPackage
@@ -50491,8 +47056,6 @@ self: {
        libraryHaskellDepends = [ base Chart ];
        description = "Easily render histograms with Chart";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chart-unit" = callPackage
@@ -50517,8 +47080,6 @@ self: {
        ];
        description = "Native haskell charts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chaselev-deque" = callPackage
@@ -50575,8 +47136,6 @@ self: {
        ];
        description = "A library of simple NLP algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chatty" = callPackage
@@ -50609,8 +47168,6 @@ self: {
        libraryHaskellDepends = [ base chatty transformers ];
        description = "Provides some classes and types for dealing with text, using the fundaments of Chatty";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chatty-utils" = callPackage
@@ -50652,8 +47209,6 @@ self: {
        ];
        description = "The ChatWork API in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cheapskate" = callPackage
@@ -50729,8 +47284,6 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "check-email" = callPackage
@@ -50762,8 +47315,6 @@ self: {
        ];
        description = "Check whether module and package imports conform to the PVP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "checked" = callPackage
@@ -50777,8 +47328,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Bounds-checking integer types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "checkers" = callPackage
@@ -50822,8 +47371,6 @@ self: {
        ];
        description = "Generate checklists relevant to a given patch";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "checksum" = callPackage
@@ -50875,8 +47422,6 @@ self: {
        libraryHaskellDepends = [ base chell QuickCheck random ];
        description = "QuickCheck support for the Chell testing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chessIO" = callPackage
@@ -50911,8 +47456,6 @@ self: {
        ];
        description = "Basic chess library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chesshs" = callPackage
@@ -50943,8 +47486,6 @@ self: {
        ];
        description = "Query interface for Chevalier";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chiasma" = callPackage
@@ -50969,33 +47510,9 @@ self: {
        ];
        description = "tmux api";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chimera" = callPackage
-    ({ mkDerivation, base, gauge, ghc-prim, QuickCheck, tasty
-     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, vector
-     }:
-     mkDerivation {
-       pname = "chimera";
-       version = "0.2.0.0";
-       sha256 = "1hrnvyp8d7qc1c3xl4mzfsycb554yn3b49yy8jjyvaqazmvrb4zi";
-       revision = "1";
-       editedCabalFile = "029hpcs3x1sv3jsq10bygm4246b4gy83yxg3s4r98f37055dyzyd";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base ghc-prim vector ];
-       testHaskellDepends = [
-         base QuickCheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck
-         vector
-       ];
-       benchmarkHaskellDepends = [ base gauge ];
-       description = "Lazy, infinite streams with O(1) indexing";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "chimera_0_3_0_0" = callPackage
     ({ mkDerivation, base, QuickCheck, tasty, tasty-hunit
      , tasty-quickcheck, tasty-smallcheck, vector
      }:
@@ -51010,7 +47527,6 @@ self: {
        ];
        description = "Lazy infinite streams with O(1) indexing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chiphunk" = callPackage
@@ -51027,8 +47543,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Haskell bindings for Chipmunk2D physics engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chitauri" = callPackage
@@ -51048,8 +47562,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Helper for the Major System";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "choice" = callPackage
@@ -51072,8 +47584,6 @@ self: {
        libraryHaskellDepends = [ base MonadRandom ];
        description = "Choose random elements from a stream";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "choose-exe" = callPackage
@@ -51090,8 +47600,6 @@ self: {
        ];
        description = "Command-line program to choose random element from a stream";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chorale" = callPackage
@@ -51109,8 +47617,6 @@ self: {
        ];
        description = "A module containing basic functions that the prelude does not offer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chorale-geo" = callPackage
@@ -51128,8 +47634,6 @@ self: {
        ];
        description = "A module containing basic geo functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chp" = callPackage
@@ -51145,8 +47649,6 @@ self: {
        ];
        description = "An implementation of concurrency ideas from Communicating Sequential Processes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chp-mtl" = callPackage
@@ -51158,8 +47660,6 @@ self: {
        libraryHaskellDepends = [ base chp chp-plus mtl ];
        description = "MTL class instances for the CHP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chp-plus" = callPackage
@@ -51176,8 +47676,6 @@ self: {
        ];
        description = "A set of high-level concurrency utilities built on Communicating Haskell Processes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chp-spec" = callPackage
@@ -51193,8 +47691,6 @@ self: {
        ];
        description = "A mirror implementation of chp that generates a specification of the program";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chp-transformers" = callPackage
@@ -51206,8 +47702,6 @@ self: {
        libraryHaskellDepends = [ base chp chp-plus transformers ];
        description = "Transformers instances for the CHP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chr-core" = callPackage
@@ -51224,8 +47718,6 @@ self: {
        ];
        description = "Constraint Handling Rules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chr-data" = callPackage
@@ -51263,8 +47755,6 @@ self: {
        executableHaskellDepends = [ base chr-data ];
        description = "AST + surface language around chr";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chr-parse" = callPackage
@@ -51278,8 +47768,6 @@ self: {
        libraryHaskellDepends = [ base containers uulib ];
        description = "Parsing for chr library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chr-pretty" = callPackage
@@ -51328,8 +47816,6 @@ self: {
        ];
        description = "neovim package manager";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chronograph" = callPackage
@@ -51343,8 +47829,6 @@ self: {
        ];
        description = "measure timings of data evaluation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chronologique" = callPackage
@@ -51364,33 +47848,6 @@ self: {
      }) {};
 
   "chronos" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, clock
-     , criterion, deepseq, doctest, hashable, HUnit, old-locale
-     , primitive, QuickCheck, semigroups, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text, thyme
-     , time, torsor, vector
-     }:
-     mkDerivation {
-       pname = "chronos";
-       version = "1.0.9";
-       sha256 = "103vwpdjqk1csw8famc62ba5ck9s6yd8w5hfa6a0qj3bx9vmf9qv";
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring clock hashable primitive
-         semigroups text torsor vector
-       ];
-       testHaskellDepends = [
-         attoparsec base bytestring doctest HUnit QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2 text torsor
-       ];
-       benchmarkHaskellDepends = [
-         attoparsec base bytestring criterion deepseq old-locale QuickCheck
-         text thyme time vector
-       ];
-       description = "A performant time library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "chronos_1_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
      , deepseq, doctest, hashable, HUnit, old-locale, primitive
      , QuickCheck, semigroups, test-framework, test-framework-hunit
@@ -51414,7 +47871,6 @@ self: {
        ];
        description = "A performant time library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chronos-bench" = callPackage
@@ -51446,8 +47902,6 @@ self: {
        libraryHaskellDepends = [ base Cabal chs-deps ];
        description = "Cabal with c2hs dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chs-deps" = callPackage
@@ -51482,8 +47936,6 @@ self: {
        ];
        description = "FFI for Chu2 Agda Web Server Interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chuchu" = callPackage
@@ -51528,8 +47980,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 parsec template-haskell ];
        description = "Simple template library with static safety";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "chunky" = callPackage
@@ -51545,8 +47995,6 @@ self: {
        testHaskellDepends = [ base binary bytestring HUnit text ];
        description = "Human-readable storage of text/binary objects";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "church" = callPackage
@@ -51616,8 +48064,6 @@ self: {
        ];
        description = "Cielo API v3 Bindings for Haskell";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cil" = callPackage
@@ -51629,8 +48075,6 @@ self: {
        libraryHaskellDepends = [ base bytestring language-c ];
        description = "An interface to CIL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cinvoke" = callPackage
@@ -51643,8 +48087,6 @@ self: {
        librarySystemDepends = [ cinvoke ];
        description = "A binding to cinvoke";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {cinvoke = null;};
 
   "cio" = callPackage
@@ -51656,8 +48098,6 @@ self: {
        libraryHaskellDepends = [ base monad-stm mtl parallel-io stm ];
        description = "A monad for concurrent IO on a thread pool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cipher-aes" = callPackage
@@ -51829,8 +48269,6 @@ self: {
        executableHaskellDepends = [ array base bytestring parseargs ];
        description = "Implementation of CipherSaber2 RC4 cryptography";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "circ" = callPackage
@@ -51872,8 +48310,6 @@ self: {
        ];
        description = "The CircleCI REST API for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "circuit-breaker" = callPackage
@@ -51964,8 +48400,6 @@ self: {
        ];
        description = "convert document IDs such as DOI, ISBN, arXiv ID to bibliographic reference";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "citeproc-hs" = callPackage
@@ -51985,8 +48419,6 @@ self: {
        ];
        description = "A Citation Style Language implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "citeproc-hs-pandoc-filter" = callPackage
@@ -52006,8 +48438,6 @@ self: {
        ];
        description = "A Pandoc filter for processing bibliographic references with citeproc-hs";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cityhash" = callPackage
@@ -52047,8 +48477,6 @@ self: {
        ];
        description = "A new Haskeleton package";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cjk" = callPackage
@@ -52066,8 +48494,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Data about Chinese, Japanese and Korean characters and languages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cl3" = callPackage
@@ -52121,8 +48547,6 @@ self: {
        ];
        description = "Simple CLI RPN calculator";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clafer" = callPackage
@@ -52157,8 +48581,6 @@ self: {
        ];
        description = "Compiles Clafer models to other formats: Alloy, JavaScript, JSON, HTML, Dot";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "claferIG" = callPackage
@@ -52191,8 +48613,6 @@ self: {
        ];
        description = "claferIG is an interactive tool that generates instances of Clafer models";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "claferwiki" = callPackage
@@ -52212,8 +48632,6 @@ self: {
        ];
        description = "A wiki-based IDE for literate modeling with Clafer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clang-compilation-database" = callPackage
@@ -52226,8 +48644,6 @@ self: {
        testHaskellDepends = [ aeson base bytestring ];
        description = "JSON Compilation Database Format encoding and decoding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clang-pure" = callPackage
@@ -52250,8 +48666,6 @@ self: {
        testHaskellDepends = [ base bytestring lens ];
        description = "Pure C++ code analysis with libclang";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (self.llvmPackages) clang;};
 
   "clanki" = callPackage
@@ -52267,8 +48681,6 @@ self: {
        ];
        description = "Command-line spaced-repetition software";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clarifai" = callPackage
@@ -52286,8 +48698,6 @@ self: {
        ];
        description = "API Client for the Clarifai API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clash" = callPackage
@@ -52307,8 +48717,6 @@ self: {
        ];
        description = "CAES Language for Synchronous Hardware (CLaSH)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clash-ghc" = callPackage
@@ -52382,8 +48790,6 @@ self: {
          base clash-prelude deepseq ghc-typelits-knownnat QuickCheck
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clash-prelude" = callPackage
@@ -52446,8 +48852,6 @@ self: {
        ];
        description = "CAES Language for Synchronous Hardware - SystemVerilog backend";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clash-verilog" = callPackage
@@ -52465,8 +48869,6 @@ self: {
        ];
        description = "CAES Language for Synchronous Hardware - Verilog backend";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clash-vhdl" = callPackage
@@ -52484,8 +48886,6 @@ self: {
        ];
        description = "CAES Language for Synchronous Hardware - VHDL backend";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "classify" = callPackage
@@ -52528,8 +48928,6 @@ self: {
        ];
        description = "Classify sounds produced by Xenopus laevis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "classy-influxdb-simple" = callPackage
@@ -52566,8 +48964,6 @@ self: {
        testHaskellDepends = [ base miso rfc ];
        description = "Typeclass based support for Miso, the Tasty Web Framework for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "classy-parallel" = callPackage
@@ -52583,8 +48979,6 @@ self: {
        ];
        description = "Fork of the monad-parallel package using monad-control";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "classy-prelude" = callPackage
@@ -52710,8 +49104,6 @@ self: {
        libraryToolDepends = [ hsx2hs ];
        description = "A secure, reliable content management system (CMS) and blogging platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "clckwrks-cli" = callPackage
@@ -52734,8 +49126,6 @@ self: {
        ];
        description = "a command-line interface for adminstrating some aspects of clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clckwrks-dot-com" = callPackage
@@ -52757,8 +49147,6 @@ self: {
        executableToolDepends = [ hsx2hs ];
        description = "clckwrks.com";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clckwrks-plugin-bugs" = callPackage
@@ -52784,8 +49172,6 @@ self: {
        libraryToolDepends = [ hsx2hs ];
        description = "bug tracking plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clckwrks-plugin-ircbot" = callPackage
@@ -52809,8 +49195,6 @@ self: {
        libraryToolDepends = [ hsx2hs ];
        description = "ircbot plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clckwrks-plugin-mailinglist" = callPackage
@@ -52835,8 +49219,6 @@ self: {
        ];
        description = "mailing list plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clckwrks-plugin-media" = callPackage
@@ -52860,8 +49242,6 @@ self: {
        libraryToolDepends = [ hsx2hs ];
        description = "media plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clckwrks-plugin-page" = callPackage
@@ -52889,8 +49269,6 @@ self: {
        libraryToolDepends = [ hsx2hs ];
        description = "support for CMS/Blogging in clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clckwrks-theme-bootstrap" = callPackage
@@ -52908,8 +49286,6 @@ self: {
        ];
        description = "simple bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clckwrks-theme-clckwrks" = callPackage
@@ -52927,8 +49303,6 @@ self: {
        ];
        description = "simple bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clckwrks-theme-geo-bootstrap" = callPackage
@@ -52941,8 +49315,6 @@ self: {
        libraryHaskellDepends = [ base clckwrks hsp text ];
        description = "geo bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cld2" = callPackage
@@ -52982,8 +49354,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Open unions without need for Typeable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cless" = callPackage
@@ -53002,8 +49372,6 @@ self: {
        ];
        description = "Colorized LESS";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clevercss" = callPackage
@@ -53018,8 +49386,6 @@ self: {
        executableHaskellDepends = [ parsec ];
        description = "A CSS preprocessor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clexer" = callPackage
@@ -53031,8 +49397,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl parsec ];
        description = "Lexes C++ code into simple tokens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cli" = callPackage
@@ -53065,8 +49429,6 @@ self: {
        testHaskellDepends = [ base doctest filemanip hspec QuickCheck ];
        description = "Simple project template from stack";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cli-setup" = callPackage
@@ -53139,8 +49501,6 @@ self: {
        benchmarkHaskellDepends = [ base time ];
        description = "A Clifford algebra number type for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clifford" = callPackage
@@ -53173,8 +49533,6 @@ self: {
        ];
        description = "A Clifford algebra library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clifm" = callPackage
@@ -53194,8 +49552,6 @@ self: {
        ];
        description = "Command Line Interface File Manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "climb" = callPackage
@@ -53237,8 +49593,6 @@ self: {
        librarySystemDepends = [ clingo ];
        description = "Haskell bindings to the Clingo ASP solver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) clingo;};
 
   "clippard" = callPackage
@@ -53250,8 +49604,6 @@ self: {
        libraryHaskellDepends = [ base process ];
        description = "A simple Haskell library for copying text to the clipboard in a cross-platform way";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clipper" = callPackage
@@ -53263,8 +49615,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell API to clipper (2d polygon union/intersection/xor/clipping API)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clippings" = callPackage
@@ -53290,8 +49640,6 @@ self: {
        ];
        description = "A parser/generator for Kindle-format clipping files (`My Clippings.txt`),";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clisparkline" = callPackage
@@ -53310,8 +49658,8 @@ self: {
     ({ mkDerivation, base, natural-induction, peano }:
      mkDerivation {
        pname = "clist";
-       version = "0.3.0.0";
-       sha256 = "1wicpkc1rxyjnmnlsdh975d58fwfmfqwhkd50v044g4763i36bdr";
+       version = "0.3.0.1";
+       sha256 = "1k6i4gjfqv19cgnnmycy4dyjg5wh9wlykvi62qwzxl1vswd8mzgy";
        libraryHaskellDepends = [ base natural-induction peano ];
        description = "Counted list";
        license = "unknown";
@@ -53338,8 +49686,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Post tweets from stdin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cloben" = callPackage
@@ -53398,8 +49744,6 @@ self: {
        libraryPkgconfigDepends = [ QtCore ];
        description = "timer functionality to clock IO commands";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {QtCore = null;};
 
   "clogparse" = callPackage
@@ -53416,8 +49760,6 @@ self: {
        ];
        description = "Parse IRC logs such as the #haskell logs on tunes.org";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clone-all" = callPackage
@@ -53437,8 +49779,6 @@ self: {
        ];
        description = "Clone all github repositories from a given user";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "closed" = callPackage
@@ -53469,8 +49809,6 @@ self: {
        libraryHaskellDepends = [ base hashable unordered-containers ];
        description = "Depth- and breadth-first set closures";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cloud-haskell" = callPackage
@@ -53494,8 +49832,6 @@ self: {
        doHaddock = false;
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cloud-seeder" = callPackage
@@ -53524,8 +49860,6 @@ self: {
        ];
        description = "A tool for interacting with AWS CloudFormation";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cloudfront-signer" = callPackage
@@ -53542,8 +49876,6 @@ self: {
        ];
        description = "CloudFront URL signer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cloudi" = callPackage
@@ -53559,8 +49891,6 @@ self: {
        ];
        description = "Haskell CloudI API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cloudyfs" = callPackage
@@ -53646,8 +49976,6 @@ self: {
        ];
        description = "Quasiquoters for inline C# and F#";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clr-marshal" = callPackage
@@ -53716,8 +50044,6 @@ self: {
        ];
        description = "C to Lua data wrapper generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clumpiness" = callPackage
@@ -53740,8 +50066,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "simple alternative to type classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clustering" = callPackage
@@ -53767,8 +50091,6 @@ self: {
        ];
        description = "High performance clustering algorithms";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clustertools" = callPackage
@@ -53787,8 +50109,6 @@ self: {
        ];
        description = "Tools for manipulating sequence clusters";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "clutterhs" = callPackage
@@ -53806,8 +50126,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to the Clutter animation library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) clutter; inherit (pkgs) pango;};
 
   "cmaes" = callPackage
@@ -53893,8 +50211,6 @@ self: {
        ];
        description = "Code highlighting for cmark";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cmark-lucid" = callPackage
@@ -53919,8 +50235,6 @@ self: {
        libraryHaskellDepends = [ base cmark ];
        description = "Pattern synonyms for cmark";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cmark-sections" = callPackage
@@ -53939,8 +50253,6 @@ self: {
        ];
        description = "Represent cmark-parsed Markdown as a tree of sections";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cmath" = callPackage
@@ -53952,8 +50264,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A binding to the standard C math library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cmathml3" = callPackage
@@ -53973,8 +50283,6 @@ self: {
        executableHaskellDepends = [ base Cabal filepath ];
        description = "Data model, parser, serialiser and transformations for Content MathML 3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cmd-item" = callPackage
@@ -53991,8 +50299,6 @@ self: {
        ];
        description = "Library to compose and reuse command line fragments";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cmdargs" = callPackage
@@ -54029,8 +50335,6 @@ self: {
        ];
        description = "Helper to enter cmdargs command lines using a web browser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cmdlib" = callPackage
@@ -54044,8 +50348,6 @@ self: {
        libraryHaskellDepends = [ base mtl split syb transformers ];
        description = "a library for command line parsing & online help";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cmdtheline" = callPackage
@@ -54067,8 +50369,6 @@ self: {
        ];
        description = "Declarative command-line option parsing and documentation library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cmf" = callPackage
@@ -54103,8 +50403,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "A library for C-like programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cmph" = callPackage
@@ -54123,8 +50421,6 @@ self: {
        testSystemDepends = [ cmph ];
        description = "low level interface to CMPH";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {cmph = null;};
 
   "cmptype" = callPackage
@@ -54165,8 +50461,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Write consistent git commit messages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cmu" = callPackage
@@ -54181,8 +50475,6 @@ self: {
        executableHaskellDepends = [ array base containers ];
        description = "Unification in a Commutative Monoid";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cmv" = callPackage
@@ -54211,8 +50503,6 @@ self: {
        ];
        description = "Detailed visualization of CMs, HMMs and their comparisions";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cnc-spec-compiler" = callPackage
@@ -54234,8 +50524,6 @@ self: {
        ];
        description = "Compiler/Translator for CnC Specification Files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cndict" = callPackage
@@ -54250,36 +50538,6 @@ self: {
      }) {};
 
   "co-log" = callPackage
-    ({ mkDerivation, ansi-terminal, base, bytestring, chronos
-     , co-log-core, containers, contravariant, directory, filepath
-     , hedgehog, markdown-unlit, mtl, stm, text, transformers
-     , typerep-map
-     }:
-     mkDerivation {
-       pname = "co-log";
-       version = "0.3.0.0";
-       sha256 = "0rrxgc3qs10lj94d0v42fd6979znvmzxd7dmffp2lxpzmnymnsha";
-       revision = "3";
-       editedCabalFile = "0z2456b49k0qfd4fzvbwndvdvnwfvsmhyxd5gmbiz7l7b458dq3s";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-terminal base bytestring chronos co-log-core containers
-         contravariant directory filepath mtl stm text transformers
-         typerep-map
-       ];
-       executableHaskellDepends = [
-         base co-log-core mtl text typerep-map
-       ];
-       executableToolDepends = [ markdown-unlit ];
-       testHaskellDepends = [ base co-log-core hedgehog ];
-       description = "Composable Contravariant Comonadic Logging Library";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "co-log_0_4_0_0" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, chronos
      , co-log-core, containers, contravariant, directory, filepath
      , hedgehog, markdown-unlit, mtl, stm, text, transformers
@@ -54303,8 +50561,6 @@ self: {
        testHaskellDepends = [ base co-log-core hedgehog ];
        description = "Composable Contravariant Comonadic Logging Library";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "co-log-core" = callPackage
@@ -54331,8 +50587,21 @@ self: {
        executableHaskellDepends = [ base co-log-core polysemy ];
        description = "Composable Contravariant Comonadic Logging Library";
        license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "co-log-polysemy_0_0_1_1" = callPackage
+    ({ mkDerivation, base, co-log-core, polysemy }:
+     mkDerivation {
+       pname = "co-log-polysemy";
+       version = "0.0.1.1";
+       sha256 = "0wm5zcn3df4hc5rbbj1mlm9y1fs5pkpvvm1c98r5dnvs7lfmnzpd";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base co-log-core polysemy ];
+       executableHaskellDepends = [ base co-log-core polysemy ];
+       description = "Composable Contravariant Comonadic Logging Library";
+       license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "co-log-sys" = callPackage
@@ -54353,8 +50622,6 @@ self: {
        ];
        description = "Syslog implementation on top of 'co-log-core'";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "coalpit" = callPackage
@@ -54373,8 +50640,6 @@ self: {
        ];
        description = "Command-line options and DSV parsing and printing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cobot" = callPackage
@@ -54410,8 +50675,8 @@ self: {
      }:
      mkDerivation {
        pname = "cobot-io";
-       version = "0.1.2.6";
-       sha256 = "1p76m7qgvcl01zyvb8zmbp5064dp2qjd3rr3mjcai55pk5xcm35r";
+       version = "0.1.2.7";
+       sha256 = "0gf0amdlkzrar154vmqx952c5p7hbqm6qay47w7m0xb6p2qgvrv7";
        libraryHaskellDepends = [
          array attoparsec base binary bytestring containers data-msgpack
          deepseq http-conduit hyraxAbif lens linear mtl split text vector
@@ -54423,8 +50688,6 @@ self: {
        ];
        description = "Biological data file formats and IO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cobot-tools" = callPackage
@@ -54448,8 +50711,6 @@ self: {
        ];
        description = "Biological data file formats and IO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {RNA = null;};
 
   "code-builder" = callPackage
@@ -54461,8 +50722,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Simple system for generating code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "code-page" = callPackage
@@ -54511,8 +50770,6 @@ self: {
        testHaskellDepends = [ base bytestring filepath process text ];
        description = "Erlang VM byte code assembler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "codec-libevent" = callPackage
@@ -54535,8 +50792,6 @@ self: {
        ];
        description = "Cross-platform structure serialisation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "codec-mbox" = callPackage
@@ -54571,8 +50826,6 @@ self: {
        ];
        description = "A library for manipulating RPM files";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "codecov-haskell" = callPackage
@@ -54596,8 +50849,6 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Codecov.io support for Haskell.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "codemonitor" = callPackage
@@ -54616,8 +50867,6 @@ self: {
        ];
        description = "Tool that automatically runs arbitrary commands when files change on disk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "codepad" = callPackage
@@ -54631,8 +50880,6 @@ self: {
        libraryHaskellDepends = [ base curl mtl network tagsoup ];
        description = "Submit and retrieve paste output from CodePad.org.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "codeworld-api" = callPackage
@@ -54659,8 +50906,6 @@ self: {
        ];
        description = "Graphics library for CodeWorld";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "codex" = callPackage
@@ -54688,8 +50933,6 @@ self: {
        ];
        description = "A ctags file generator for cabal project dependencies";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "codo-notation" = callPackage
@@ -54731,21 +50974,6 @@ self: {
      }) {};
 
   "coercible-utils" = callPackage
-    ({ mkDerivation, base, gauge }:
-     mkDerivation {
-       pname = "coercible-utils";
-       version = "0.0.0";
-       sha256 = "164cn0cs7fjfm599v2z8wsgsz599f97wky4h7vycf460rn34jqia";
-       revision = "1";
-       editedCabalFile = "1xbnkv6fqf4mizqkha8b073p0r84l1rx1kzdsd6nh8b0adrp6i4d";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base ];
-       benchmarkHaskellDepends = [ base gauge ];
-       description = "Utility functions for Coercible types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "coercible-utils_0_1_0" = callPackage
     ({ mkDerivation, base, gauge }:
      mkDerivation {
        pname = "coercible-utils";
@@ -54756,7 +50984,6 @@ self: {
        benchmarkHaskellDepends = [ base gauge ];
        description = "Utility functions for Coercible types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "coercion-extras" = callPackage
@@ -54868,8 +51095,6 @@ self: {
        ];
        description = "Simple account manager";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "coinbase-exchange" = callPackage
@@ -54908,8 +51133,6 @@ self: {
        ];
        description = "Connector library for the coinbase exchange";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "coinbase-pro" = callPackage
@@ -54942,8 +51165,6 @@ self: {
        ];
        description = "Client for Coinbase Pro";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "coincident-root-loci" = callPackage
@@ -54962,8 +51183,6 @@ self: {
        ];
        description = "Equivariant CSM classes of coincident root loci";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "colada" = callPackage
@@ -54987,8 +51206,6 @@ self: {
        ];
        description = "Colada implements incremental word class class induction using online LDA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "colchis" = callPackage
@@ -55006,8 +51223,6 @@ self: {
        ];
        description = "Rudimentary JSON-RPC 2.0 client over raw TCP.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cold-widow" = callPackage
@@ -55040,8 +51255,6 @@ self: {
        ];
        description = "Generate animated 3d objects in COLLADA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "collada-types" = callPackage
@@ -55053,8 +51266,6 @@ self: {
        libraryHaskellDepends = [ base containers OpenGL tuple vector ];
        description = "Data exchange between graphics applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "collapse-duplication" = callPackage
@@ -55077,8 +51288,6 @@ self: {
        ];
        description = "Collapse the duplication output into clones and return their frequencies";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "collapse-util" = callPackage
@@ -55092,8 +51301,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "utility for collapsing adjacent writes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "collection-json" = callPackage
@@ -55116,8 +51323,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Collection+JSON—Hypermedia Type Tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "collections" = callPackage
@@ -55131,8 +51336,6 @@ self: {
        ];
        description = "Useful standard collections types and related functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "collections-api" = callPackage
@@ -55146,8 +51349,6 @@ self: {
        libraryHaskellDepends = [ array base QuickCheck ];
        description = "API for collection data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "collections-base-instances" = callPackage
@@ -55163,8 +51364,6 @@ self: {
        ];
        description = "Useful standard collections types and related functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "colock" = callPackage
@@ -55221,8 +51420,6 @@ self: {
        ];
        description = "Count colors in images";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "colorful-monoids" = callPackage
@@ -55271,8 +51468,6 @@ self: {
        ];
        description = "Colorless | The Programmatic IDL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "colorless-http-client" = callPackage
@@ -55289,8 +51484,6 @@ self: {
        ];
        description = "Http Client addon for Colorless";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "colorless-scotty" = callPackage
@@ -55304,8 +51497,6 @@ self: {
        ];
        description = "Scotty server add-on for Colorless";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "colors" = callPackage
@@ -55381,8 +51572,17 @@ self: {
        ];
        description = "Instances of the manifold-classes for colour types";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+     }) {};
+
+  "colourista" = callPackage
+    ({ mkDerivation, ansi-terminal, base, bytestring, text }:
+     mkDerivation {
+       pname = "colourista";
+       version = "0.0.0.0";
+       sha256 = "15nzcy3q8iivghprzsvy5l6c98ir085v6nhyymwy2ar0fnhx4hdi";
+       libraryHaskellDepends = [ ansi-terminal base bytestring text ];
+       description = "Convenient interface for printing colourful messages";
+       license = stdenv.lib.licenses.mpl20;
      }) {};
 
   "coltrane" = callPackage
@@ -55399,8 +51599,6 @@ self: {
        ];
        description = "A jazzy, minimal web framework for Haskell, inspired by Sinatra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "columbia" = callPackage
@@ -55421,8 +51619,6 @@ self: {
        doHaddock = false;
        description = "Enhanced serialization using seeking";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "columnar" = callPackage
@@ -55451,8 +51647,6 @@ self: {
        doHaddock = false;
        description = "Haskell COM support library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "comark" = callPackage
@@ -55531,8 +51725,6 @@ self: {
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Definitions of AST that represents a Commonmark (markdown) document";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "combinat" = callPackage
@@ -55556,8 +51748,6 @@ self: {
        ];
        description = "Generate and manipulate various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "combinat-compat" = callPackage
@@ -55593,8 +51783,6 @@ self: {
        ];
        description = "Graphical representations for various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "combinator-interactive" = callPackage
@@ -55616,8 +51804,6 @@ self: {
        ];
        description = "SKI Combinator interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "combinatorial" = callPackage
@@ -55651,8 +51837,6 @@ self: {
        ];
        description = "A number of data structures to represent and allow the manipulation of standard combinatorial problems, used as test problems in computer science";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "combinatorics" = callPackage
@@ -55679,8 +51863,6 @@ self: {
        ];
        description = "Various buffer implementations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "comfort-array" = callPackage
@@ -55792,8 +51974,20 @@ self: {
        testHaskellDepends = [ base ];
        description = "pattern matching against string based commands";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+     }) {};
+
+  "commander-cli" = callPackage
+    ({ mkDerivation, base, mtl, text, unordered-containers }:
+     mkDerivation {
+       pname = "commander-cli";
+       version = "0.1.0.0";
+       sha256 = "1ix0pjcq7khpc9b7f9j44akgfdlcssqhqmflsgvqyw5m8bg4qkrd";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base mtl text unordered-containers ];
+       executableHaskellDepends = [ base mtl text ];
+       description = "A command line argument/option parser library built around a monadic metaphor";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "commodities" = callPackage
@@ -55817,8 +52011,6 @@ self: {
        ];
        description = "Library for working with commoditized amounts and price histories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "commsec" = callPackage
@@ -55834,8 +52026,6 @@ self: {
        ];
        description = "Provide communications security using symmetric ephemeral keys";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "commsec-keyexchange" = callPackage
@@ -55854,8 +52044,6 @@ self: {
        ];
        description = "Key agreement for commsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "commutative" = callPackage
@@ -55909,8 +52097,6 @@ self: {
        ];
        description = "Exotic comonad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "comonad-random" = callPackage
@@ -55987,8 +52173,6 @@ self: {
        ];
        description = "Compact Data.Map implementation using Data.Binary";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compact-mutable" = callPackage
@@ -56008,8 +52192,6 @@ self: {
        ];
        description = "Mutable arrays living on the compact heap";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compact-mutable-vector" = callPackage
@@ -56039,8 +52221,6 @@ self: {
        ];
        description = "Socket functions for compact normal form";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compact-string" = callPackage
@@ -56054,8 +52234,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Fast, packed and strict strings with Unicode support, based on bytestrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compact-string-fix" = callPackage
@@ -56069,8 +52247,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Same as compact-string except with a small fix so it builds on ghc-6.12";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compact-word-vectors" = callPackage
@@ -56087,8 +52263,6 @@ self: {
        ];
        description = "Small vectors of small integers stored very compactly";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compactable" = callPackage
@@ -56186,8 +52360,6 @@ self: {
        ];
        description = "Compositional Data Types on DAGs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compdata-fixplate" = callPackage
@@ -56242,30 +52414,6 @@ self: {
      }) {};
 
   "compensated" = callPackage
-    ({ mkDerivation, base, bifunctors, binary, bytes, Cabal
-     , cabal-doctest, cereal, comonad, deepseq, distributive, doctest
-     , generic-deriving, hashable, lens, log-domain, safecopy
-     , semigroupoids, semigroups, simple-reflect, vector
-     }:
-     mkDerivation {
-       pname = "compensated";
-       version = "0.7.3";
-       sha256 = "089xj9j3gznxz66ywapjd9kasjcnv197ipj4azgjfbpl2y11l8dg";
-       revision = "1";
-       editedCabalFile = "1ax4jq2hp5737yvi3lxvyj3c4bzkg10h4c7w3nw0hgfcn1ng49kc";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base bifunctors binary bytes cereal comonad deepseq distributive
-         hashable lens log-domain safecopy semigroupoids semigroups vector
-       ];
-       testHaskellDepends = [
-         base doctest generic-deriving semigroups simple-reflect
-       ];
-       description = "Compensated floating-point arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "compensated_0_8_1" = callPackage
     ({ mkDerivation, base, bifunctors, binary, bytes, Cabal
      , cabal-doctest, cereal, comonad, criterion, deepseq, distributive
      , doctest, generic-deriving, hashable, lens, log-domain, safecopy
@@ -56286,7 +52434,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Compensated floating-point arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "competition" = callPackage
@@ -56298,8 +52445,6 @@ self: {
        libraryHaskellDepends = [ base filepath parsec ];
        description = "Helpers and runners for code competitions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compilation" = callPackage
@@ -56311,8 +52456,6 @@ self: {
        libraryHaskellDepends = [ base MissingH ];
        description = "Haskell functionality for quickly assembling simple compilers";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compiler-warnings" = callPackage
@@ -56369,8 +52512,6 @@ self: {
        ];
        description = "Empirical algorithmic complexity";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "componentm" = callPackage
@@ -56458,8 +52599,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Composable monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "composite-aeson" = callPackage
@@ -56471,8 +52610,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-aeson";
-       version = "0.6.1.0";
-       sha256 = "1a5h03h46ahighdqqxfa22mnhbik9bqzm0cxnpgxyjksbagj3x5x";
+       version = "0.6.2.0";
+       sha256 = "10pz27ky65zm4qa8h3c79m4ly55dhw3np5x5zqza7133dk96hyyj";
        libraryHaskellDepends = [
          aeson aeson-better-errors base composite-base containers
          contravariant generic-deriving hashable lens mmorph mtl profunctors
@@ -56487,8 +52626,6 @@ self: {
        ];
        description = "JSON for Vinyl/Frames records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "composite-aeson-refined" = callPackage
@@ -56497,15 +52634,13 @@ self: {
      }:
      mkDerivation {
        pname = "composite-aeson-refined";
-       version = "0.6.1.0";
-       sha256 = "1z03ncjabcph9vwwhzmqp7wmhznr7jz188xpnl2lsdw0fzxlir3q";
+       version = "0.6.2.0";
+       sha256 = "1m86gb9p1rbn4r385xrin0qn6wp26qqd1hhl7557i01226v48w5w";
        libraryHaskellDepends = [
          aeson-better-errors base composite-aeson mtl refined
        ];
        description = "composite-aeson support for Refined from the refined package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "composite-base" = callPackage
@@ -56515,8 +52650,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-base";
-       version = "0.6.1.0";
-       sha256 = "0qnxchx5dr2bgi8wdi4a1x2z20lw61zfxlmjkr1m7ggzz3f7py3k";
+       version = "0.6.2.0";
+       sha256 = "0svp3n9652qq4np7mwcws099jsiz56kwa26r0zqa3r64kl4kc3v2";
        libraryHaskellDepends = [
          base exceptions lens monad-control mtl profunctors template-haskell
          text transformers transformers-base unliftio-core vinyl
@@ -56528,8 +52663,6 @@ self: {
        ];
        description = "Shared utilities for composite-* packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "composite-ekg" = callPackage
@@ -56537,15 +52670,13 @@ self: {
      }:
      mkDerivation {
        pname = "composite-ekg";
-       version = "0.6.1.0";
-       sha256 = "14pa5bcr0ip43vn6wpxd4pf7lcc83f2xscri05kdf4h4d1nnwscj";
+       version = "0.6.2.0";
+       sha256 = "1wkgnzd4k46vsyxd0gwdsklv92ggprzi0l522sj98qdm6gxfy8if";
        libraryHaskellDepends = [
          base composite-base ekg-core lens text vinyl
        ];
        description = "EKG Metrics for Vinyl/Frames records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "composite-opaleye" = callPackage
@@ -56555,8 +52686,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-opaleye";
-       version = "0.6.1.0";
-       sha256 = "1vqj7pwb0wkz7c4clqj7kmc0asg74i7xb92g0g0qmwavwwc9flq1";
+       version = "0.6.2.0";
+       sha256 = "1gnnzn6h15m79my02i0s397y0pdhifq4cq71j3lpc7g7nza0cwc6";
        libraryHaskellDepends = [
          base bytestring composite-base lens opaleye postgresql-simple
          product-profunctors profunctors template-haskell text vinyl
@@ -56568,8 +52699,6 @@ self: {
        ];
        description = "Opaleye SQL for Frames records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "composite-swagger" = callPackage
@@ -56579,8 +52708,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-swagger";
-       version = "0.6.1.0";
-       sha256 = "1ysp297b2nrwq6dx3bv9q44f69hlym4yvbimzj1hqc3mz63qjpaz";
+       version = "0.6.2.0";
+       sha256 = "0b5kqdqq4hnzjcfclw25ql2fjvr4z0zh88l9n8pv7pw3qdgh0qd1";
        libraryHaskellDepends = [
          base composite-base insert-ordered-containers lens swagger2
          template-haskell text vinyl
@@ -56591,8 +52720,6 @@ self: {
        ];
        description = "Swagger for Vinyl/Frames records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "composition" = callPackage
@@ -56637,8 +52764,6 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Composition trees for arbitrary monoids";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compositional-data" = callPackage
@@ -56649,6 +52774,8 @@ self: {
        pname = "compositional-data";
        version = "0.1.0.1";
        sha256 = "1pw7xqzin7v9xxjkm7xixf5d6r5jmgdgyvyhpsmn8bdqp8rrwgzj";
+       revision = "1";
+       editedCabalFile = "167j8vjxv8lf4h92dqag8wdz7k8sp2678s72afs0wig2sy4hm720";
        libraryHaskellDepends = [
          base bifunctor category transformers util
        ];
@@ -56670,8 +52797,6 @@ self: {
        benchmarkHaskellDepends = [ base-prelude ];
        description = "Sum and Product types and such";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "comprehensions-ghc" = callPackage
@@ -56680,6 +52805,8 @@ self: {
        pname = "comprehensions-ghc";
        version = "0.1.0.1";
        sha256 = "04s83q9mvsdnxy9glc15n1nbqk6imbdzi40skvvhasjppgb9ysbm";
+       revision = "1";
+       editedCabalFile = "0in3a8v2si3r92ak85gbq873b5k8fg88153wypzn6razg1c66rx0";
        libraryHaskellDepends = [ base base-unicode-symbols ghc syb util ];
        testHaskellDepends = [ base ];
        description = "Plugin to generalize comprehensions";
@@ -56703,8 +52830,6 @@ self: {
        ];
        description = "Compressed containers and reducers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "compression" = callPackage
@@ -56732,8 +52857,6 @@ self: {
        ];
        description = "Strategy combinators for compositional data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "comptrans" = callPackage
@@ -56751,8 +52874,6 @@ self: {
        ];
        description = "Automatically converting ASTs into compositional data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "computational-algebra" = callPackage
@@ -56804,8 +52925,6 @@ self: {
        ];
        description = "Well-kinded computational algebra library, currently supporting Groebner basis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "computational-geometry" = callPackage
@@ -56833,8 +52952,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Advanced notions of computation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "concatenative" = callPackage
@@ -56912,8 +53029,6 @@ self: {
        ];
        description = "Morphological disambiguation based on constrained CRFs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "concraft-hr" = callPackage
@@ -56935,8 +53050,6 @@ self: {
        executableHaskellDepends = [ cmdargs ];
        description = "Part-of-speech tagger for Croatian";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "concraft-pl" = callPackage
@@ -56965,8 +53078,6 @@ self: {
        ];
        description = "Morphological tagger for Polish";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "concrete-haskell" = callPackage
@@ -57010,8 +53121,6 @@ self: {
        ];
        description = "Library for the Concrete data format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "concrete-haskell-autogen" = callPackage
@@ -57028,8 +53137,6 @@ self: {
        ];
        description = "Automatically generated Thrift definitions for the Concrete data format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "concrete-relaxng-parser" = callPackage
@@ -57049,8 +53156,6 @@ self: {
        ];
        description = "A parser driven by a standard RELAX NG schema with concrete syntax extensions";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "concrete-typerep" = callPackage
@@ -57070,8 +53175,6 @@ self: {
        ];
        description = "Binary and Hashable instances for TypeRep";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "concur-core" = callPackage
@@ -57090,22 +53193,6 @@ self: {
      }) {};
 
   "concurrency" = callPackage
-    ({ mkDerivation, array, atomic-primops, base, exceptions
-     , monad-control, mtl, stm, transformers
-     }:
-     mkDerivation {
-       pname = "concurrency";
-       version = "1.7.0.0";
-       sha256 = "16zg4c2x2ym7crvrimzp8jr3mw6qlbdzkfmv1h6smjp3bn8qxf06";
-       libraryHaskellDepends = [
-         array atomic-primops base exceptions monad-control mtl stm
-         transformers
-       ];
-       description = "Typeclasses, functions, and data types for concurrency and STM";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "concurrency_1_8_1_0" = callPackage
     ({ mkDerivation, array, atomic-primops, base, exceptions
      , monad-control, mtl, stm, transformers
      }:
@@ -57119,7 +53206,6 @@ self: {
        ];
        description = "Typeclasses, functions, and data types for concurrency and STM";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrency-benchmarks" = callPackage
@@ -57183,8 +53269,6 @@ self: {
        benchmarkHaskellDepends = [ bug criterion rerebase ];
        description = "Concurrent expanding buffer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "concurrent-dns-cache" = callPackage
@@ -57209,8 +53293,6 @@ self: {
        testHaskellDepends = [ async base dns hspec ];
        description = "Concurrent DNS cache";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "concurrent-extra" = callPackage
@@ -57275,8 +53357,6 @@ self: {
        benchmarkHaskellDepends = [ base machines time ];
        description = "Concurrent networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "concurrent-output" = callPackage
@@ -57350,8 +53430,6 @@ self: {
        libraryHaskellDepends = [ base exceptions mtl stm transformers ];
        description = "MTL-like library using TVars";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "concurrent-supply" = callPackage
@@ -57422,8 +53500,6 @@ self: {
        ];
        description = "Information retrieval library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "condorcet" = callPackage
@@ -57435,8 +53511,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Library for Condorcet voting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conductive-base" = callPackage
@@ -57448,8 +53522,6 @@ self: {
        libraryHaskellDepends = [ array base containers random stm time ];
        description = "a library for live coding and real-time musical applications";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conductive-clock" = callPackage
@@ -57477,8 +53549,6 @@ self: {
        ];
        description = "a library with examples of using Conductive with hsc3";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conductive-song" = callPackage
@@ -57490,8 +53560,6 @@ self: {
        libraryHaskellDepends = [ base conductive-base random ];
        description = "a library of functions which are useful for composing music";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conduino" = callPackage
@@ -57630,8 +53698,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "conduit-audio interface to the LAME MP3 library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {mp3lame = null;};
 
   "conduit-audio-samplerate" = callPackage
@@ -57651,8 +53717,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "conduit-audio interface to the libsamplerate resampling library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {samplerate = null;};
 
   "conduit-audio-sndfile" = callPackage
@@ -57812,8 +53876,6 @@ self: {
        ];
        description = "A file-finding conduit that allows user control over traversals";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conduit-iconv" = callPackage
@@ -57860,8 +53922,6 @@ self: {
        ];
        description = "A base layer for network protocols using Conduits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conduit-parse" = callPackage
@@ -57900,8 +53960,6 @@ self: {
        ];
        description = "Allows conduit to resume sinks to feed multiple sources into it";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conduit-throttle" = callPackage
@@ -57925,8 +53983,6 @@ self: {
        ];
        description = "Throttle Conduit Producers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conduit-tokenize-attoparsec" = callPackage
@@ -57946,8 +54002,6 @@ self: {
        testHaskellDepends = [ attoparsec base conduit hspec resourcet ];
        description = "Conduits for tokenizing streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conduit-vfs" = callPackage
@@ -58032,8 +54086,6 @@ self: {
        ];
        description = "Parser for Haskell-based configuration files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conf-json" = callPackage
@@ -58256,8 +54308,6 @@ self: {
        ];
        description = "A .conf file formatter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "confide" = callPackage
@@ -58272,8 +54322,6 @@ self: {
        testHaskellDepends = [ base deiko-config tasty tasty-hunit text ];
        description = "derive typeclass instances for decoding types from HOCON conf";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "config-ini" = callPackage
@@ -58327,8 +54375,6 @@ self: {
        testHaskellDepends = [ base extra hspec lens parsec text ];
        description = "Parse config files using parsec and generate parse errors on unhandled keys";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "config-schema" = callPackage
@@ -58361,8 +54407,6 @@ self: {
        ];
        description = "A small program for swapping out dot files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "config-value" = callPackage
@@ -58389,8 +54433,6 @@ self: {
        libraryHaskellDepends = [ base config-value text ];
        description = "Interface between config-value and System.GetOpt";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "configifier" = callPackage
@@ -58419,8 +54461,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "parser for config files, shell variables, command line args";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "configuration" = callPackage
@@ -58432,8 +54472,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Simple data type for application configuration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "configuration-tools" = callPackage
@@ -58450,6 +54488,8 @@ self: {
        pname = "configuration-tools";
        version = "0.4.2";
        sha256 = "08wzgd38adlrgp9s8330hsp3h1jmhnlaj3fyvkxgljlmyyzlw70q";
+       revision = "1";
+       editedCabalFile = "1x30k0jbx62689rnjwg74v9mwcf81rpjvbkm0gj94slzsx66adpp";
        setupHaskellDepends = [
          base bytestring Cabal directory filepath process
        ];
@@ -58531,8 +54571,6 @@ self: {
        ];
        description = "The next generation of configuration management";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "configurator-pg" = callPackage
@@ -58582,8 +54620,6 @@ self: {
        libraryHaskellDepends = [ array base containers ];
        description = "Decidable congruence relations for Haskell: up to you whether this is a joke";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conjugateGradient" = callPackage
@@ -58615,8 +54651,6 @@ self: {
        ];
        description = "A BitTorrent client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conkin" = callPackage
@@ -58634,8 +54668,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Tools for functors from Hask^k to Hask";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "conlogger" = callPackage
@@ -58650,8 +54682,6 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "A logger for a concurrent program";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "connection" = callPackage
@@ -58704,24 +54734,22 @@ self: {
        testHaskellDepends = [ base doctest text ];
        description = "A library for parsing connection strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "connections" = callPackage
-    ({ mkDerivation, base, containers, hedgehog, lawz, property
+    ({ mkDerivation, base, containers, hedgehog, lawz, rings
      , semigroupoids
      }:
      mkDerivation {
        pname = "connections";
-       version = "0.0.2.2";
-       sha256 = "1ykfxixlkpw490dxjy5bbj2ykypvp8031x98001vzsklm1avkhvw";
-       libraryHaskellDepends = [ base containers lawz semigroupoids ];
-       testHaskellDepends = [ base hedgehog property ];
-       description = "Partial orders, lattices, & Galois connections";
+       version = "0.0.3";
+       sha256 = "112m18l4apg9djgi9m9pg4222dy7wfkl0z9l98yf92yzw9pq08zv";
+       libraryHaskellDepends = [
+         base containers lawz rings semigroupoids
+       ];
+       testHaskellDepends = [ base hedgehog lawz rings ];
+       description = "Partial orders, Galois connections, and lattices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "consistent" = callPackage
@@ -58739,8 +54767,6 @@ self: {
        testHaskellDepends = [ base lifted-async transformers ];
        description = "Eventually consistent STM transactions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "console-program" = callPackage
@@ -58792,8 +54818,6 @@ self: {
        testHaskellDepends = [ base directory process ];
        description = "Compiler plugin for constant math elimination";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "constaparser" = callPackage
@@ -58816,8 +54840,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Equality by only Constructor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "constrained" = callPackage
@@ -58846,8 +54868,6 @@ self: {
        ];
        description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "constrained-category" = callPackage
@@ -58858,6 +54878,8 @@ self: {
        pname = "constrained-category";
        version = "0.1.0.0";
        sha256 = "01r5jyydixfh82zynjpacsv5dc0mz28bcm8xaz2pgf2pc4gcfl9h";
+       revision = "1";
+       editedCabalFile = "1kgkrzzvdjbdhkr53dlrm4qyxa8sxva9vkjyl7kd3lha5sdpids3";
        libraryHaskellDepends = [
          alg base category constraint unconstrained
        ];
@@ -58865,8 +54887,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Constrained Categories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "constrained-dynamic" = callPackage
@@ -58879,8 +54899,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Dynamic typing with retained constraints";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "constrained-monads" = callPackage
@@ -58904,8 +54922,6 @@ self: {
        ];
        description = "Typeclasses and instances for monads with constraints";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "constrained-normal" = callPackage
@@ -58940,11 +54956,11 @@ self: {
        pname = "constraint";
        version = "0.1.4.0";
        sha256 = "0cdncdzpgyr9a0v213g9f6fqfd4311j5rg84gh85xynp8hhh0rr4";
+       revision = "1";
+       editedCabalFile = "0ivca43m1lqi75462z4hacvzs27whqzjnby7y7jjji8kqaw8wlda";
        libraryHaskellDepends = [ base category unconstrained ];
        description = "Reified constraints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "constraint-classes" = callPackage
@@ -58967,8 +54983,6 @@ self: {
        libraryHaskellDepends = [ base indextype ];
        description = "Some conviencience type functions for manipulating constraints";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "constraint-reflection" = callPackage
@@ -58980,8 +54994,6 @@ self: {
        libraryHaskellDepends = [ base category constraint reflection ];
        description = "Constraint reflection";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "constraint-tuples" = callPackage
@@ -58998,17 +55010,15 @@ self: {
   "constraints" = callPackage
     ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec
      , hspec-discover, mtl, semigroups, transformers
-     , transformers-compat
+     , transformers-compat, type-equality
      }:
      mkDerivation {
        pname = "constraints";
-       version = "0.10.1";
-       sha256 = "1xy3vv78jxc17hm0z7qqspxjwv7l2jbcbj670yrl2f053qkfr02q";
-       revision = "1";
-       editedCabalFile = "1i2rd805mjz5q7s98ryy1m91zd4b9hx92gw1rwr6kpibqqw9smcb";
+       version = "0.11.2";
+       sha256 = "10mnhg7p5gk4i3bzldl07qkrihnvmfkgsp32w7p9i7x8cmj5akjq";
        libraryHaskellDepends = [
          base binary deepseq ghc-prim hashable mtl semigroups transformers
-         transformers-compat
+         transformers-compat type-equality
        ];
        testHaskellDepends = [ base hspec ];
        testToolDepends = [ hspec-discover ];
@@ -59069,8 +55079,6 @@ self: {
        testHaskellDepends = [ base constraints hspec transformers ];
        description = "Defer instance lookups until runtime";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "constraints-extras" = callPackage
@@ -59125,13 +55133,15 @@ self: {
      }) {};
 
   "constructible" = callPackage
-    ({ mkDerivation, arithmoi, base, binary-search, complex-generic }:
+    ({ mkDerivation, base, binary-search, complex-generic
+     , integer-roots
+     }:
      mkDerivation {
        pname = "constructible";
-       version = "0.1.0.1";
-       sha256 = "0d3x92h194y6q8qn11prj05gcnv01vmbvlcsvb1zxgp51qmv1aih";
+       version = "0.1.1";
+       sha256 = "19g62i3cv39fww55xcayrzh1v7flghg43ygj41g9cq6qsbq345wr";
        libraryHaskellDepends = [
-         arithmoi base binary-search complex-generic
+         base binary-search complex-generic integer-roots
        ];
        description = "Exact computation with constructible real numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -59146,8 +55156,6 @@ self: {
        libraryHaskellDepends = [ base QuickCheck type-level ];
        description = "A library of constructive algebra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "consul-haskell" = callPackage
@@ -59172,8 +55180,6 @@ self: {
        ];
        description = "A consul client for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "consumers" = callPackage
@@ -59200,8 +55206,6 @@ self: {
        ];
        description = "Concurrent PostgreSQL data consumers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "container" = callPackage
@@ -59280,8 +55284,6 @@ self: {
        ];
        description = "Extensive benchmark suite for containers package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "containers-deepseq" = callPackage
@@ -59304,8 +55306,6 @@ self: {
        libraryHaskellDepends = [ base base-unicode-symbols containers ];
        description = "Unicode alternatives for common functions and operators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "containers-verified" = callPackage
@@ -59341,8 +55341,6 @@ self: {
        ];
        description = "Store and retrieve data from an on-disk store";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "context-free-art" = callPackage
@@ -59389,8 +55387,6 @@ self: {
        ];
        description = "Basic algorithms on context-free grammars";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "context-stack" = callPackage
@@ -59404,8 +55400,6 @@ self: {
        ];
        description = "An abstraction of a stack and stack-based monadic context";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "contiguous" = callPackage
@@ -59429,8 +55423,6 @@ self: {
        ];
        description = "Unified interface for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "contiguous-checked" = callPackage
@@ -59442,8 +55434,6 @@ self: {
        libraryHaskellDepends = [ base contiguous primitive ];
        description = "contiguous with bounds checks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "contiguous-fft" = callPackage
@@ -59455,8 +55445,6 @@ self: {
        libraryHaskellDepends = [ base contiguous primitive semirings ];
        description = "dft of contiguous memory structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "continue" = callPackage
@@ -59473,8 +55461,6 @@ self: {
        ];
        description = "Monads with suspension and arbitrary-spot reentry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "continued-fraction" = callPackage
@@ -59521,8 +55507,6 @@ self: {
          base bytestring cereal containers mtl nanomsg-haskell time
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "continuum-client" = callPackage
@@ -59537,8 +55521,6 @@ self: {
          base bytestring cereal containers mtl nanomsg-haskell time
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "contravariant" = callPackage
@@ -59553,22 +55535,6 @@ self: {
      }) {};
 
   "contravariant-extras" = callPackage
-    ({ mkDerivation, base, base-prelude, contravariant, semigroups
-     , template-haskell, tuple-th
-     }:
-     mkDerivation {
-       pname = "contravariant-extras";
-       version = "0.3.5";
-       sha256 = "18hzip2i3r9hlw69pdvlkf9g7yg6bpm4b794m2ck84kpb4ajpm6p";
-       libraryHaskellDepends = [
-         base base-prelude contravariant semigroups template-haskell
-         tuple-th
-       ];
-       description = "Extras for the \"contravariant\" package";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "contravariant-extras_0_3_5_1" = callPackage
     ({ mkDerivation, base, contravariant, template-haskell
      , template-haskell-compat-v0208
      }:
@@ -59581,7 +55547,6 @@ self: {
        ];
        description = "Extras for the \"contravariant\" package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "control" = callPackage
@@ -59674,8 +55639,6 @@ self: {
        libraryHaskellDepends = [ attempt base transformers ];
        description = "Monad transformer for attempt. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "control-monad-exception" = callPackage
@@ -59692,8 +55655,6 @@ self: {
        ];
        description = "Explicitly typed, checked exceptions with stack traces";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "control-monad-exception-monadsfd" = callPackage
@@ -59709,8 +55670,6 @@ self: {
        ];
        description = "Monads-fd instances for the EMT exceptions monad transformer";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "control-monad-exception-monadstf" = callPackage
@@ -59726,8 +55685,6 @@ self: {
        ];
        description = "Monads-tf instances for the EMT exceptions monad transformer";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "control-monad-exception-mtl" = callPackage
@@ -59740,8 +55697,6 @@ self: {
        doHaddock = false;
        description = "MTL instances for the EMT exceptions monad transformer";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "control-monad-failure" = callPackage
@@ -59753,8 +55708,6 @@ self: {
        libraryHaskellDepends = [ base failure transformers ];
        description = "A class for monads which can fail with an error. (deprecated)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "control-monad-failure-mtl" = callPackage
@@ -59766,8 +55719,6 @@ self: {
        libraryHaskellDepends = [ base failure mtl ];
        description = "A class for monads which can fail with an error for mtl 1 (deprecated)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "control-monad-free_0_5_3" = callPackage
@@ -59857,8 +55808,6 @@ self: {
        libraryHaskellDepends = [ base contstuff monads-tf ];
        description = "ContStuff instances for monads-tf transformers (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "contstuff-transformers" = callPackage
@@ -59870,8 +55819,6 @@ self: {
        libraryHaskellDepends = [ base contstuff transformers ];
        description = "Deprecated interface between contstuff 0.7.0 and the transformers package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "converge" = callPackage
@@ -59973,8 +55920,6 @@ self: {
        ];
        description = "Convert the annotation of a gene to another in a delimited file using a variety of different databases";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "convertible" = callPackage
@@ -60008,8 +55953,6 @@ self: {
        ];
        description = "convertible instances for ascii";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "convertible-text" = callPackage
@@ -60030,8 +55973,6 @@ self: {
        ];
        description = "Typeclasses and instances for converting between types (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cookbook" = callPackage
@@ -60108,8 +56049,6 @@ self: {
        executableHaskellDepends = [ base copilot-c99 copilot-libraries ];
        description = "A stream DSL for writing embedded C programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "copilot-c99" = callPackage
@@ -60143,8 +56082,6 @@ self: {
        ];
        description = "Copilot interface to a C model-checker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "copilot-core" = callPackage
@@ -60172,8 +56109,6 @@ self: {
        ];
        description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "copilot-libraries" = callPackage
@@ -60189,8 +56124,6 @@ self: {
        ];
        description = "Libraries for the Copilot language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "copilot-sbv" = callPackage
@@ -60206,8 +56139,6 @@ self: {
        ];
        description = "A compiler for CoPilot targeting SBV";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "copilot-theorem" = callPackage
@@ -60225,8 +56156,6 @@ self: {
        ];
        description = "k-induction for Copilot";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "copr" = callPackage
@@ -60246,8 +56175,6 @@ self: {
        testHaskellDepends = [ base hlint ];
        description = "Haskell interface to the Fedora Copr system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "core" = callPackage
@@ -60259,8 +56186,6 @@ self: {
        libraryHaskellDepends = [ base bytestring parsec pretty ];
        description = "External core parser and pretty printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "core-compiler" = callPackage
@@ -60313,8 +56238,6 @@ self: {
        ];
        description = "A subset of Haskell using in UCC for teaching purpose";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "core-program" = callPackage
@@ -60336,8 +56259,6 @@ self: {
        ];
        description = "Opinionated Haskell Interoperability";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "core-text" = callPackage
@@ -60381,8 +56302,6 @@ self: {
        ];
        description = "A bliki written using yesod. Uses pandoc to process files stored in git.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "corecursive-main" = callPackage
@@ -60450,8 +56369,6 @@ self: {
        libraryHaskellDepends = [ base enumerator monad-coroutine ];
        description = "Bridge between the monad-coroutine and enumerator packages";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "coroutine-iteratee" = callPackage
@@ -60463,8 +56380,6 @@ self: {
        libraryHaskellDepends = [ base iteratee monad-coroutine ];
        description = "Bridge between the monad-coroutine and iteratee packages";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "coroutine-object" = callPackage
@@ -60476,8 +56391,6 @@ self: {
        libraryHaskellDepends = [ base either free mtl transformers ];
        description = "Object-oriented programming realization using coroutine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "couch-hs" = callPackage
@@ -60496,8 +56409,6 @@ self: {
        ];
        description = "A CouchDB view server for Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "couch-simple" = callPackage
@@ -60524,8 +56435,6 @@ self: {
        testToolDepends = [ couchdb ];
        description = "A modern, lightweight, complete client for CouchDB";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) couchdb;};
 
   "couchdb-conduit" = callPackage
@@ -60555,8 +56464,6 @@ self: {
        ];
        description = "Couch DB client library using http-conduit and aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "couchdb-enumerator" = callPackage
@@ -60584,8 +56491,6 @@ self: {
        ];
        description = "Couch DB client library using http-enumerator and aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "count" = callPackage
@@ -60629,8 +56534,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck text ];
        description = "Countable Text Inflections";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "counter" = callPackage
@@ -60642,31 +56545,9 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "An object frequency counter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "country" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq
-     , ghc-prim, hashable, primitive, scientific, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "country";
-       version = "0.1.6";
-       sha256 = "0a4r2jnp15xy18s6xpd4p10cgq3hd8qqzhy5lakmzymivwq6xcq9";
-       revision = "3";
-       editedCabalFile = "034cd94hiwgci0qhkdkkqmx2igmf1wxmd4b70g6sdlk1kklcn7x1";
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring deepseq ghc-prim hashable
-         primitive scientific text unordered-containers
-       ];
-       testHaskellDepends = [ base ];
-       description = "Country data type and functions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "country_0_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq
      , ghc-prim, hashable, primitive, QuickCheck, quickcheck-classes
      , scientific, tasty, tasty-quickcheck, text, unordered-containers
@@ -60684,7 +56565,6 @@ self: {
        ];
        description = "Country data type and functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "country-codes" = callPackage
@@ -60725,8 +56605,6 @@ self: {
        ];
        description = "A message-passing library for simplifying network applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "court" = callPackage
@@ -60746,8 +56624,6 @@ self: {
        ];
        description = "Simple and flexible CI system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "coverage" = callPackage
@@ -60760,8 +56636,6 @@ self: {
        testHaskellDepends = [ base hspec HUnit QuickCheck ];
        description = "Exhaustivity Checking Library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "coya" = callPackage
@@ -60775,8 +56649,6 @@ self: {
        ];
        description = "Coya monoids";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cparsing" = callPackage
@@ -60793,8 +56665,6 @@ self: {
        ];
        description = "A simple C++ parser with preprocessor features. C++ refactorings included.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cpio-conduit" = callPackage
@@ -60814,8 +56684,6 @@ self: {
        ];
        description = "Conduit-based CPIO";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cpkg" = callPackage
@@ -60828,8 +56696,8 @@ self: {
      }:
      mkDerivation {
        pname = "cpkg";
-       version = "0.2.4.3";
-       sha256 = "03gvw5z4g49j7aq8dqzmam69xxn18gmnpnvgg56p6gh9vck1nwhr";
+       version = "0.2.4.5";
+       sha256 = "1f6l98nhl4y8az1vpacjqpqk8ngmir5kfq5wijdy4gl5dl4ik7il";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -60846,8 +56714,6 @@ self: {
        testHaskellDepends = [ base hspec hspec-megaparsec megaparsec ];
        description = "Build tool for C";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cplex-hs" = callPackage
@@ -60882,8 +56748,6 @@ self: {
        testHaskellDepends = [ base process QuickCheck ];
        description = "C++ Foreign Import Generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cppfilt" = callPackage
@@ -60953,8 +56817,6 @@ self: {
        ];
        description = "Run random effect using cprng-aes, a crypto pseudo number generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cpsa" = callPackage
@@ -61020,8 +56882,6 @@ self: {
        executableHaskellDepends = [ base mtl process ];
        description = "Modify the cpu frequency on OpenBSD systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cpython" = callPackage
@@ -61035,8 +56895,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings for libpython";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {python34 = null;};
 
   "cql" = callPackage
@@ -61086,8 +56944,6 @@ self: {
        doHaddock = false;
        description = "Cassandra CQL client";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cql-io-tinylog" = callPackage
@@ -61099,8 +56955,6 @@ self: {
        libraryHaskellDepends = [ base bytestring cql-io tinylog ];
        description = "Tinylog integration for cql-io";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cqrs" = callPackage
@@ -61129,8 +56983,6 @@ self: {
        ];
        description = "Command-Query Responsibility Segregation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cqrs-example" = callPackage
@@ -61152,8 +57004,6 @@ self: {
        ];
        description = "Example for cqrs package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cqrs-memory" = callPackage
@@ -61170,8 +57020,6 @@ self: {
        testHaskellDepends = [ base cqrs-core cqrs-testkit hspec random ];
        description = "Memory backend for the cqrs package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cqrs-postgresql" = callPackage
@@ -61195,8 +57043,6 @@ self: {
        ];
        description = "PostgreSQL backend for the cqrs package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cqrs-sqlite3" = callPackage
@@ -61217,8 +57063,6 @@ self: {
        ];
        description = "SQLite3 backend for the cqrs package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cqrs-test" = callPackage
@@ -61235,8 +57079,6 @@ self: {
        ];
        description = "Command-Query Responsibility Segregation Test Support";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cqrs-testkit" = callPackage
@@ -61254,8 +57096,6 @@ self: {
        ];
        description = "Command-Query Responsibility Segregation Test Support";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cqrs-types" = callPackage
@@ -61286,8 +57126,6 @@ self: {
        ];
        description = "Code review tool";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crack" = callPackage
@@ -61300,8 +57138,6 @@ self: {
        librarySystemDepends = [ crack ];
        description = "A haskell binding to cracklib";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {crack = null;};
 
   "crackNum" = callPackage
@@ -61347,8 +57183,6 @@ self: {
        ];
        description = "A UNIX configuration management library in Haskell";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "craftwerk" = callPackage
@@ -61362,8 +57196,6 @@ self: {
        libraryHaskellDepends = [ base colour mtl vector-space ];
        description = "2D graphics library with integrated TikZ output";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "craftwerk-cairo" = callPackage
@@ -61375,8 +57207,6 @@ self: {
        libraryHaskellDepends = [ base cairo craftwerk mtl ];
        description = "Cairo backend for Craftwerk";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "craftwerk-gtk" = callPackage
@@ -61394,8 +57224,6 @@ self: {
        ];
        description = "Gtk UI for Craftwerk";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crawlchain" = callPackage
@@ -61416,8 +57244,6 @@ self: {
        ];
        description = "Simulation user crawl paths";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "craze" = callPackage
@@ -61450,8 +57276,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "HTTP Racing Library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crc" = callPackage
@@ -61469,8 +57293,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Implements various Cyclic Redundancy Checks (CRC)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crc16" = callPackage
@@ -61482,8 +57304,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Calculate the crc16-ccitt";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crc16-table" = callPackage
@@ -61553,8 +57373,6 @@ self: {
        ];
        description = "Framework for artificial life experiments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "credential-store" = callPackage
@@ -61574,8 +57392,6 @@ self: {
        testHaskellDepends = [ base bytestring tasty tasty-hunit ];
        description = "Library to access secure credential storage providers";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "credentials" = callPackage
@@ -61639,8 +57455,6 @@ self: {
        ];
        description = "First-order, linear-chain conditional random fields";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crf-chain1-constrained" = callPackage
@@ -61660,8 +57474,6 @@ self: {
        ];
        description = "First-order, constrained, linear-chain conditional random fields";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crf-chain2-generic" = callPackage
@@ -61679,8 +57491,6 @@ self: {
        ];
        description = "Second-order, generic, constrained, linear conditional random fields";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crf-chain2-tiers" = callPackage
@@ -61699,8 +57509,6 @@ self: {
        ];
        description = "Second-order, tiered, constrained, linear conditional random fields";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "critbit" = callPackage
@@ -61729,8 +57537,6 @@ self: {
        ];
        description = "Crit-bit maps and sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "criterion" = callPackage
@@ -61770,6 +57576,44 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "criterion_1_5_6_2" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat
+     , base-compat-batteries, binary, binary-orphans, bytestring
+     , cassava, code-page, containers, criterion-measurement, deepseq
+     , directory, exceptions, filepath, Glob, HUnit, js-flot, js-jquery
+     , microstache, mtl, mwc-random, optparse-applicative, parsec
+     , QuickCheck, statistics, tasty, tasty-hunit, tasty-quickcheck
+     , text, time, transformers, transformers-compat, vector
+     , vector-algorithms
+     }:
+     mkDerivation {
+       pname = "criterion";
+       version = "1.5.6.2";
+       sha256 = "0jv8457b7pxav3h8bpf5p4fj5rp05nbs1r5jz7ysxf78q8f17j9p";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson ansi-wl-pprint base base-compat-batteries binary
+         binary-orphans bytestring cassava code-page containers
+         criterion-measurement deepseq directory exceptions filepath Glob
+         js-flot js-jquery microstache mtl mwc-random optparse-applicative
+         parsec statistics text time transformers transformers-compat vector
+         vector-algorithms
+       ];
+       executableHaskellDepends = [
+         base base-compat-batteries optparse-applicative
+       ];
+       testHaskellDepends = [
+         aeson base base-compat base-compat-batteries bytestring deepseq
+         directory HUnit QuickCheck statistics tasty tasty-hunit
+         tasty-quickcheck vector
+       ];
+       description = "Robust, reliable performance measurement and analysis";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "criterion-compare" = callPackage
     ({ mkDerivation, base, bytestring, cassava, Chart, Chart-diagrams
      , clay, colour, containers, data-default, filepath, lens, lucid
@@ -61787,8 +57631,6 @@ self: {
        ];
        description = "A simple tool for visualising differences in Criterion benchmark results";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "criterion-measurement" = callPackage
@@ -61831,8 +57673,6 @@ self: {
        ];
        description = "Enhancement of the \"criterion\" benchmarking library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "criterion-to-html" = callPackage
@@ -61851,8 +57691,6 @@ self: {
        ];
        description = "Convert criterion output to HTML reports";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "criu-rpc" = callPackage
@@ -61869,8 +57707,6 @@ self: {
        ];
        description = "CRIU RPC client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "criu-rpc-types" = callPackage
@@ -61884,8 +57720,6 @@ self: {
        libraryPkgconfigDepends = [ protobuf ];
        description = "Criu RPC protocol buffer types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) protobuf;};
 
   "crjdt-haskell" = callPackage
@@ -61901,8 +57735,6 @@ self: {
        testHaskellDepends = [ base containers hedgehog hspec mtl ];
        description = "A Conflict-Free Replicated JSON Datatype for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crockford" = callPackage
@@ -61932,8 +57764,6 @@ self: {
        ];
        description = "An offline renderer supporting ray tracing and photon mapping";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cron" = callPackage
@@ -61956,8 +57786,6 @@ self: {
        benchmarkHaskellDepends = [ attoparsec base criterion text time ];
        description = "Cron datatypes and Attoparsec parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cron-compat" = callPackage
@@ -61979,8 +57807,6 @@ self: {
        ];
        description = "Cron datatypes and Attoparsec parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cruncher-types" = callPackage
@@ -61993,8 +57819,6 @@ self: {
        testHaskellDepends = [ base hlint ];
        description = "Request and Response types for Eval.so's API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crunghc" = callPackage
@@ -62013,8 +57837,6 @@ self: {
        ];
        description = "A runghc replacement with transparent caching";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crypt-sha512" = callPackage
@@ -62088,8 +57910,6 @@ self: {
        ];
        description = "Generic cryptography cipher benchmarks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crypto-cipher-tests" = callPackage
@@ -62142,8 +57962,6 @@ self: {
        testHaskellDepends = [ base bytestring microlens QuickCheck ];
        description = "An educational tool for studying classical cryptography schemes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crypto-conduit" = callPackage
@@ -62165,8 +57983,6 @@ self: {
        ];
        description = "Conduit interface for cryptographic operations (from crypto-api)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crypto-enigma" = callPackage
@@ -62219,8 +58035,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        description = "Multihash library on top of cryptonite crypto library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crypto-numbers" = callPackage
@@ -62346,8 +58160,6 @@ self: {
        ];
        description = "A random effect using crypto-random";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crypto-rng" = callPackage
@@ -62378,8 +58190,6 @@ self: {
        ];
        description = "A simple high level encryption interface based on cryptonite";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crypto-totp" = callPackage
@@ -62429,8 +58239,6 @@ self: {
        testHaskellDepends = [ base hspec hspec-expectations MissingH ];
        description = "Haskell wrapper for the cryptocompare API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cryptoconditions" = callPackage
@@ -62454,8 +58262,6 @@ self: {
        ];
        description = "Interledger Crypto-Conditions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cryptohash" = callPackage
@@ -62673,33 +58479,9 @@ self: {
        ];
        description = "Cryptol: The Language of Cryptography";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cryptonite" = callPackage
-    ({ mkDerivation, base, basement, bytestring, deepseq, gauge
-     , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit
-     , tasty-kat, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "cryptonite";
-       version = "0.25";
-       sha256 = "131wbbdr5yavs5k1ah9sz6fqx1ffyvaxf66pwjzsfc47mwc1mgl9";
-       libraryHaskellDepends = [
-         base basement bytestring deepseq ghc-prim integer-gmp memory
-       ];
-       testHaskellDepends = [
-         base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring deepseq gauge memory random
-       ];
-       description = "Cryptography Primitives sink";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cryptonite_0_26" = callPackage
     ({ mkDerivation, base, basement, bytestring, deepseq, gauge
      , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit
      , tasty-kat, tasty-quickcheck
@@ -62719,7 +58501,6 @@ self: {
        ];
        description = "Cryptography Primitives sink";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cryptonite-conduit" = callPackage
@@ -62784,8 +58565,6 @@ self: {
        ];
        description = "Serialization of cryptographic data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cryptsy-api" = callPackage
@@ -62805,8 +58584,6 @@ self: {
        ];
        description = "Bindings for Cryptsy cryptocurrency exchange API";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "crystalfontz" = callPackage
@@ -62818,8 +58595,6 @@ self: {
        libraryHaskellDepends = [ base crc16-table MaybeT serialport ];
        description = "Control Crystalfontz LCD displays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "csa" = callPackage
@@ -62836,8 +58611,6 @@ self: {
        ];
        description = "Connection-set algebra (CSA) library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cse-ghc-plugin" = callPackage
@@ -62849,8 +58622,6 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        description = "Compiler plugin for common subexpression elimination";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "csg" = callPackage
@@ -62882,8 +58653,6 @@ self: {
        ];
        description = "Analytical CSG (Constructive Solid Geometry) library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "csound-catalog" = callPackage
@@ -63010,8 +58779,6 @@ self: {
        ];
        description = "A command line type checker for CSPM files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cspretty" = callPackage
@@ -63023,8 +58790,6 @@ self: {
        libraryHaskellDepends = [ base containers pretty ];
        description = "AST and pretty printer for CSPm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "css" = callPackage
@@ -63036,8 +58801,6 @@ self: {
        libraryHaskellDepends = [ base mtl text ];
        description = "Minimal monadic CSS DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "css-syntax" = callPackage
@@ -63125,8 +58888,6 @@ self: {
        ];
        description = "A flexible, fast, enumerator-based CSV parser library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "csv-nptools" = callPackage
@@ -63144,8 +58905,6 @@ self: {
        ];
        description = "A collection of CSV tools";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "csv-table" = callPackage
@@ -63190,8 +58949,6 @@ self: {
        librarySystemDepends = [ ctemplate ];
        description = "Binding to the Google ctemplate library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {ctemplate = null;};
 
   "ctkl" = callPackage
@@ -63203,8 +58960,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "packaging of Manuel Chakravarty's CTK Light for Hackage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ctpl" = callPackage
@@ -63221,8 +58976,6 @@ self: {
        executableHaskellDepends = [ array base chatty-text chatty-utils ];
        description = "A programming language for text modification";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ctrie" = callPackage
@@ -63263,8 +59016,6 @@ self: {
        ];
        description = "Cubic DSL for 3D printing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cubical" = callPackage
@@ -63343,8 +59094,6 @@ self: {
        executableHaskellDepends = [ base GLUT Yampa ];
        description = "3D Yampa/GLUT Puzzle Game";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cuckoo" = callPackage
@@ -63366,8 +59115,6 @@ self: {
        doHaddock = false;
        description = "Haskell Implementation of Cuckoo Filters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cuckoo-filter" = callPackage
@@ -63429,8 +59176,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to the CUDD binary decision diagrams library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {cudd = null;};
 
   "cue-sheet" = callPackage
@@ -63517,26 +59262,31 @@ self: {
      }) {};
 
   "curl-runnings" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive, cmdargs
-     , connection, directory, hspec, hspec-expectations, http-client-tls
-     , http-conduit, megaparsec, pretty-simple, regex-posix, tar, text
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive, clock
+     , cmdargs, connection, directory, hspec, hspec-expectations
+     , http-client-tls, http-conduit, http-types, megaparsec
+     , pretty-simple, raw-strings-qq, regex-posix, tar, text, time
      , unordered-containers, vector, yaml, zlib
      }:
      mkDerivation {
        pname = "curl-runnings";
-       version = "0.11.1";
-       sha256 = "12adrp4y4g5lpkgrvc7fd5v7vndg9y3cfgdyw3pk67aic8p10w2h";
+       version = "0.12.0";
+       sha256 = "091csiklwxhc8qjzqh3jmq7qvrr5z5z1mgndbli03wd33jhq5rw8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring case-insensitive connection directory hspec
-         hspec-expectations http-client-tls http-conduit megaparsec
-         pretty-simple regex-posix text unordered-containers vector yaml
+         aeson base bytestring case-insensitive clock connection directory
+         hspec hspec-expectations http-client-tls http-conduit http-types
+         megaparsec pretty-simple regex-posix text time unordered-containers
+         vector yaml
        ];
        executableHaskellDepends = [
          aeson base bytestring cmdargs directory http-conduit tar text zlib
        ];
-       testHaskellDepends = [ base directory hspec hspec-expectations ];
+       testHaskellDepends = [
+         aeson base bytestring directory hspec hspec-expectations
+         raw-strings-qq text
+       ];
        description = "A framework for declaratively writing curl based API tests";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -63612,8 +59362,6 @@ self: {
        ];
        description = "Typesafe currency conversion";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "current-locale" = callPackage
@@ -63633,6 +59381,8 @@ self: {
        pname = "curry";
        version = "0.0.0.0";
        sha256 = "09kwv72pww29xhp4sp7czp3pgjdggzs5ggj8cmzng8xzzgsgd1dv";
+       revision = "1";
+       editedCabalFile = "1mb2472j8ypxayd5sgbzl27xrhjwbsjd43dqflqjhllwk1ysm7lb";
        libraryHaskellDepends = [ base ];
        description = "Curry types";
        license = stdenv.lib.licenses.bsd3;
@@ -63680,8 +59430,6 @@ self: {
        testHaskellDepends = [ base Cabal curry-base filepath ];
        description = "Compile the functional logic language Curry to several intermediate formats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "curryer" = callPackage
@@ -63732,20 +59480,18 @@ self: {
        ];
        description = "Terminal tool for viewing tabular data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cursor" = callPackage
-    ({ mkDerivation, base, containers, microlens, text, validity
-     , validity-containers, validity-text
+    ({ mkDerivation, base, containers, deepseq, microlens, text
+     , validity, validity-containers, validity-text
      }:
      mkDerivation {
        pname = "cursor";
-       version = "0.2.0.0";
-       sha256 = "1haikdgyj7m6c7ihwvl4wy0za0nvrhh2bvqm1afa5465mcm5ynnw";
+       version = "0.3.0.0";
+       sha256 = "1k9x1pv8l8f1sfilwn3i4hrc643n6svjahl4gpd47jhjw8akval7";
        libraryHaskellDepends = [
-         base containers microlens text validity validity-containers
+         base containers deepseq microlens text validity validity-containers
          validity-text
        ];
        description = "Purely Functional Cursors";
@@ -63762,16 +59508,57 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "cursor-fuzzy-time" = callPackage
+    ({ mkDerivation, base, containers, cursor, deepseq, fuzzy-time
+     , megaparsec, microlens, text, time, validity, validity-time
+     }:
+     mkDerivation {
+       pname = "cursor-fuzzy-time";
+       version = "0.0.0.0";
+       sha256 = "1xx0npvjjr574f7ksswwzi8yrqsrhlg3arhpvahm8z2zz6a995gs";
+       libraryHaskellDepends = [
+         base containers cursor deepseq fuzzy-time megaparsec microlens text
+         time validity validity-time
+       ];
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "cursor-fuzzy-time-gen" = callPackage
+    ({ mkDerivation, base, containers, criterion, cursor-fuzzy-time
+     , cursor-gen, deepseq, fuzzy-time, fuzzy-time-gen, genvalidity
+     , genvalidity-criterion, genvalidity-hspec
+     , genvalidity-hspec-optics, genvalidity-time, hspec, megaparsec
+     , QuickCheck, text, time
+     }:
+     mkDerivation {
+       pname = "cursor-fuzzy-time-gen";
+       version = "0.0.0.0";
+       sha256 = "1m18d7098vivbqj079axmhrwzwk7mr89m159apnx2ff9200br31z";
+       libraryHaskellDepends = [
+         base containers cursor-fuzzy-time cursor-gen deepseq fuzzy-time
+         fuzzy-time-gen genvalidity genvalidity-time megaparsec time
+       ];
+       testHaskellDepends = [
+         base cursor-fuzzy-time fuzzy-time genvalidity genvalidity-hspec
+         genvalidity-hspec-optics genvalidity-time hspec megaparsec
+         QuickCheck text time
+       ];
+       benchmarkHaskellDepends = [
+         base criterion cursor-fuzzy-time genvalidity-criterion QuickCheck
+       ];
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "cursor-gen" = callPackage
-    ({ mkDerivation, base, containers, cursor, genvalidity
-     , genvalidity-containers, genvalidity-hspec
+    ({ mkDerivation, base, containers, criterion, cursor, genvalidity
+     , genvalidity-containers, genvalidity-criterion, genvalidity-hspec
      , genvalidity-hspec-optics, genvalidity-text, hspec, microlens
      , pretty-show, QuickCheck, text
      }:
      mkDerivation {
        pname = "cursor-gen";
-       version = "0.2.0.0";
-       sha256 = "1i9ad6gmd4sqs3nbgij4jm509m6gx4v0pghsf4d3qn71hbxbxipc";
+       version = "0.3.0.0";
+       sha256 = "0sy7ypz4x9xhirfj9i2dk8r854gzr238qgaijgi221k7681jdcqb";
        libraryHaskellDepends = [
          base containers cursor genvalidity genvalidity-containers
          genvalidity-text QuickCheck text
@@ -63780,6 +59567,9 @@ self: {
          base containers cursor genvalidity-hspec genvalidity-hspec-optics
          hspec microlens pretty-show QuickCheck text
        ];
+       benchmarkHaskellDepends = [
+         base criterion cursor genvalidity-criterion
+       ];
        description = "Generators for Purely Functional Cursors";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -63800,8 +59590,6 @@ self: {
        ];
        description = "Fast implementations of the curve25519 elliptic curve primitives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "curves" = callPackage
@@ -63818,8 +59606,6 @@ self: {
        ];
        description = "Library for drawing curve based images";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cusolver" = callPackage
@@ -63865,8 +59651,6 @@ self: {
        libraryHaskellDepends = [ base basic-prelude monad-loops ];
        description = "An enhanced prelude, serving as a foundation for my projects";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cut-the-crap" = callPackage
@@ -63981,8 +59765,6 @@ self: {
        ];
        description = "Haskell bindings for the neo4j \"cypher\" query language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "czipwith" = callPackage
@@ -64025,8 +59807,6 @@ self: {
        ];
        description = "Permissively licensed D-Bus client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "d10" = callPackage
@@ -64071,8 +59851,6 @@ self: {
        libraryHaskellDepends = [ base mtl random text ];
        description = "Declarative visualization on a web browser with DSL approach";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "daemonize-doublefork" = callPackage
@@ -64129,8 +59907,6 @@ self: {
        ];
        description = "Compile-time, type-safe directed acyclic graphs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "damnpacket" = callPackage
@@ -64201,8 +59977,6 @@ self: {
        ];
        description = "Dao is meta programming language with its own built-in interpreted language, designed with artificial intelligence applications in mind";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dapi" = callPackage
@@ -64221,8 +59995,6 @@ self: {
        ];
        description = "Prints a series of dates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "darcs" = callPackage
@@ -64290,8 +60062,6 @@ self: {
        ];
        description = "Comparative benchmark suite for darcs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "darcs-beta" = callPackage
@@ -64323,8 +60093,6 @@ self: {
        executableSystemDepends = [ curl ];
        description = "a distributed, interactive, smart revision control system";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) curl;};
 
   "darcs-buildpackage" = callPackage
@@ -64343,8 +60111,6 @@ self: {
        ];
        description = "Tools to help manage Debian packages with Darcs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "darcs-cabalized" = callPackage
@@ -64366,8 +60132,6 @@ self: {
        executableSystemDepends = [ curl ncurses zlib ];
        description = "David's Advanced Version Control System";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) curl; inherit (pkgs) ncurses; 
          inherit (pkgs) zlib;};
 
@@ -64388,8 +60152,6 @@ self: {
        ];
        description = "Import/export git fast-import streams to/from darcs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "darcs-graph" = callPackage
@@ -64408,8 +60170,6 @@ self: {
        ];
        description = "Generate graphs of darcs repository activity";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "darcs-monitor" = callPackage
@@ -64427,8 +60187,6 @@ self: {
        ];
        description = "Darcs repository monitor (sends email)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "darcs-scripts" = callPackage
@@ -64459,8 +60217,6 @@ self: {
        ];
        description = "Outputs dependencies of darcs patches in dot format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "darcsden" = callPackage
@@ -64488,8 +60244,6 @@ self: {
        ];
        description = "Darcs repository UI and hosting/collaboration app (hub.darcs.net branch).";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "darcswatch" = callPackage
@@ -64512,8 +60266,6 @@ self: {
        ];
        description = "Track application of Darcs patches";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "darkplaces-demo" = callPackage
@@ -64541,8 +60293,6 @@ self: {
        ];
        description = "Utility and parser for DarkPlaces demo files";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "darkplaces-rcon" = callPackage
@@ -64559,8 +60309,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec hspec-core ];
        description = "Darkplaces rcon client library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "darkplaces-rcon-util" = callPackage
@@ -64590,8 +60338,6 @@ self: {
        ];
        description = "Darplaces rcon utility";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "darkplaces-text" = callPackage
@@ -64609,8 +60355,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        description = "Parser for darkplaces colorful text";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dash-haskell" = callPackage
@@ -64631,22 +60375,9 @@ self: {
        ];
        description = "Convert package Haddock to Dash docsets (IDE docs)";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-accessor" = callPackage
-    ({ mkDerivation, array, base, containers, transformers }:
-     mkDerivation {
-       pname = "data-accessor";
-       version = "0.2.2.8";
-       sha256 = "1fq4gygxbz0bd0mzgvc1sl3m4gjnsv8nbgpnmdpa29zj5lb9agxc";
-       libraryHaskellDepends = [ array base containers transformers ];
-       description = "Utilities for accessing and manipulating fields of records";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "data-accessor_0_2_3" = callPackage
     ({ mkDerivation, array, base, containers, transformers }:
      mkDerivation {
        pname = "data-accessor";
@@ -64655,7 +60386,6 @@ self: {
        libraryHaskellDepends = [ array base containers transformers ];
        description = "Utilities for accessing and manipulating fields of records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-accessor-monadLib" = callPackage
@@ -64681,8 +60411,6 @@ self: {
        ];
        description = "Use Accessor to access state in monads-fd State monad class";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-accessor-monads-tf" = callPackage
@@ -64696,8 +60424,6 @@ self: {
        ];
        description = "Use Accessor to access state in monads-tf State monad type family";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-accessor-mtl" = callPackage
@@ -64756,8 +60482,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Utilities for accessing and comparing types based on so called bases - representations with limited polymorphism";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-basic" = callPackage
@@ -64781,8 +60505,6 @@ self: {
        ];
        description = "A database library with a focus on ease of use, type safety and useful error messages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-binary-ieee754" = callPackage
@@ -64829,8 +60551,6 @@ self: {
        sha256 = "000x29a8x2ca7m85z0h7snm0297jf9ndr46dh3arv43fjlvfy3ag";
        description = "Category theory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-cell" = callPackage
@@ -64854,8 +60574,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Library for checking and normalization of data (e.g. from web forms)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-checked" = callPackage
@@ -64911,8 +60629,6 @@ self: {
        libraryHaskellDepends = [ base stm ];
        description = "A Library for directional queues";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-construction" = callPackage
@@ -64924,8 +60640,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Data construction abstractions including Constructor, Destructor, Maker, Destroyer, Producer and Consumer";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-constructors" = callPackage
@@ -64955,8 +60669,6 @@ self: {
        ];
        description = "a cyclic doubly linked list";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-default" = callPackage
@@ -65175,28 +60887,9 @@ self: {
        ];
        description = "Space-efficient and privacy-preserving data dispersal algorithms";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-diverse" = callPackage
-    ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim
-     , hspec, tagged
-     }:
-     mkDerivation {
-       pname = "data-diverse";
-       version = "4.6.0.0";
-       sha256 = "1m6bxi37c7qkn96296lxfc0x3ab33w7yyjkvf3avla94dd248k89";
-       libraryHaskellDepends = [
-         base containers deepseq ghc-prim tagged
-       ];
-       testHaskellDepends = [ base hspec tagged ];
-       benchmarkHaskellDepends = [ base criterion ];
-       description = "Extensible records and polymorphic variants";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "data-diverse_4_7_0_0" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim
      , hspec, tagged
      }:
@@ -65211,7 +60904,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Extensible records and polymorphic variants";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-diverse-lens" = callPackage
@@ -65262,8 +60954,6 @@ self: {
        ];
        description = "Consistent set of utility functions for Maybe, Either, List and Monoids";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-elf" = callPackage
@@ -65312,8 +61002,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Combinator emoticons: data-aviary in the flavor of emoticons";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-endian" = callPackage
@@ -65365,8 +61053,6 @@ self: {
        ];
        description = "A type safe file path data structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-files-gen" = callPackage
@@ -65413,8 +61099,6 @@ self: {
        ];
        description = "Finite totally ordered sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-fin-simple" = callPackage
@@ -65427,8 +61111,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Simple integral finite set";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-fix" = callPackage
@@ -65473,8 +61155,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An efficient data type for sets of flags";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-foldapp" = callPackage
@@ -65593,8 +61273,6 @@ self: {
        ];
        description = "Interval datatype, interval arithmetic and interval-based containers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-inttrie" = callPackage
@@ -65617,8 +61295,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Write-once variables with concurrency support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-json-token" = callPackage
@@ -65649,8 +61325,6 @@ self: {
        ];
        description = "Sculpt mutable recursive data with reference equality; bake it using a data kiln into an immutable lazy structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-layer" = callPackage
@@ -65662,8 +61336,6 @@ self: {
        libraryHaskellDepends = [ base convert data-construction lens ];
        description = "Data layering utilities. Layer is a data-type which wrapps other one, but keeping additional information. If you want to access content of simple newtype object, use Lens.Wrapper instead.";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-layout" = callPackage
@@ -65690,8 +61362,6 @@ self: {
        ];
        description = "Used to be Haskell 98 Lenses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-lens-fd" = callPackage
@@ -65705,8 +61375,6 @@ self: {
        ];
        description = "Lenses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-lens-ixset" = callPackage
@@ -65719,8 +61387,6 @@ self: {
        testHaskellDepends = [ QuickCheck ];
        description = "A Lens for IxSet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-lens-light" = callPackage
@@ -65743,8 +61409,6 @@ self: {
        libraryHaskellDepends = [ base data-lens template-haskell ];
        description = "Utilities for Data.Lens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-list-sequences" = callPackage
@@ -65778,8 +61442,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Data.Map with multiple, unique keys";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-memocombinators" = callPackage
@@ -65845,8 +61507,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base binary containers text ];
        description = "Data types for named entities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-nat" = callPackage
@@ -65858,8 +61518,6 @@ self: {
        libraryHaskellDepends = [ base semigroups ];
        description = "data Nat = Zero | Succ Nat";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-object" = callPackage
@@ -65871,8 +61529,6 @@ self: {
        libraryHaskellDepends = [ base bytestring failure text time ];
        description = "Represent hierachichal structures, called objects in JSON. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-object-json" = callPackage
@@ -65889,8 +61545,6 @@ self: {
        ];
        description = "Serialize JSON data to/from Haskell using the data-object library. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-object-yaml" = callPackage
@@ -65909,8 +61563,6 @@ self: {
        ];
        description = "Serialize data to and from Yaml files (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-or" = callPackage
@@ -65957,8 +61609,6 @@ self: {
        libraryHaskellDepends = [ base deepseq mtl parallel pretty time ];
        description = "Prettyprint and compare Data values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-quotientref" = callPackage
@@ -65970,8 +61620,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Reference cells that need two independent indices to be accessed";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-r-tree" = callPackage
@@ -65990,8 +61638,6 @@ self: {
        ];
        description = "R-Tree is a spatial data structure similar to Quadtrees or B-Trees";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-ref" = callPackage
@@ -66029,8 +61675,6 @@ self: {
        libraryHaskellDepends = [ base containers data-reify ];
        description = "Common Sub-Expression Elimination for graphs generated by Data.Reify.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-repr" = callPackage
@@ -66042,8 +61686,6 @@ self: {
        libraryHaskellDepends = [ base generic-deriving lens ];
        description = "Alternative to Show data printing utility";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-result" = callPackage
@@ -66055,8 +61697,6 @@ self: {
        libraryHaskellDepends = [ base poly-control prologue ];
        description = "Data types for returning results distinguishable by types";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-rev" = callPackage
@@ -66068,8 +61708,6 @@ self: {
        libraryHaskellDepends = [ base bytestring containers text vector ];
        description = "A typeclass for reversing order of contents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-rope" = callPackage
@@ -66081,8 +61719,6 @@ self: {
        libraryHaskellDepends = [ base bytestring bytestring-mmap unix ];
        description = "Ropes, an alternative to (Byte)Strings";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-rtuple" = callPackage
@@ -66094,8 +61730,6 @@ self: {
        libraryHaskellDepends = [ base lens typelevel ];
        description = "Recursive tuple data structure. It is very usefull when implementing some lo-level operations, allowing to traverse different elements using Haskell's type classes.";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-serializer" = callPackage
@@ -66127,8 +61761,6 @@ self: {
        ];
        description = "Profiling of data structures";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-spacepart" = callPackage
@@ -66140,8 +61772,6 @@ self: {
        libraryHaskellDepends = [ base vector-space ];
        description = "Deprecated. Now called \"spacepart\". Space partitioning data structures.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-standards" = callPackage
@@ -66153,8 +61783,6 @@ self: {
        libraryHaskellDepends = [ base hashable unordered-containers ];
        description = "A collection of standards representable by simple data types";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-stm32" = callPackage
@@ -66207,8 +61835,6 @@ self: {
        ];
        description = "Type safe, in-memory dictionary with multidimensional keys";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-stringmap" = callPackage
@@ -66247,8 +61873,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Program that infers the fastest data structure available for your program";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-sword" = callPackage
@@ -66357,8 +61981,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Basic type wrangling types and classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-util" = callPackage
@@ -66370,8 +61992,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "utilities for handle data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "data-variant" = callPackage
@@ -66383,8 +62003,6 @@ self: {
        libraryHaskellDepends = [ base safe ];
        description = "A variant data type, useful for modeling dynamically-typed programming languages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "database-id-class" = callPackage
@@ -66411,8 +62029,6 @@ self: {
        ];
        description = "HasId/Groundhog interop";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "database-migrate" = callPackage
@@ -66441,8 +62057,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Demonstrate how a database can be implemented the functional way";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "datadog" = callPackage
@@ -66470,8 +62084,6 @@ self: {
        ];
        description = "Datadog client for Haskell. Supports both the HTTP API and StatsD.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "datadog-tracing" = callPackage
@@ -66507,8 +62119,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Datadog tracing client and mock agent";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dataenc" = callPackage
@@ -66549,8 +62159,6 @@ self: {
        ];
        description = "Fixing data-flow problems";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dataflow" = callPackage
@@ -66574,8 +62182,6 @@ self: {
        ];
        description = "Generate Graphviz documents from a Haskell representation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "datalog" = callPackage
@@ -66603,8 +62209,6 @@ self: {
        ];
        description = "An implementation of datalog in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "datapacker" = callPackage
@@ -66673,8 +62277,6 @@ self: {
        ];
        description = "Classical data sets for statistics and machine learning";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dataurl" = callPackage
@@ -66750,8 +62352,6 @@ self: {
        ];
        description = "Utilities to make Data.Time.* easier to use";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "datetime-sb" = callPackage
@@ -66770,8 +62370,6 @@ self: {
        ];
        description = "Utilities to make Data.Time.* easier to use.";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dawdle" = callPackage
@@ -66786,8 +62384,6 @@ self: {
        executableHaskellDepends = [ base filepath parsec pretty text ];
        description = "Generates DDL suggestions based on a CSV file";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dawg" = callPackage
@@ -66803,8 +62399,6 @@ self: {
        ];
        description = "Directed acyclic word graphs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dawg-ord" = callPackage
@@ -66825,8 +62419,6 @@ self: {
        ];
        description = "Directed acyclic word graphs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dbcleaner" = callPackage
@@ -66839,8 +62431,6 @@ self: {
        testHaskellDepends = [ base hspec postgresql-simple text ];
        description = "Clean database tables automatically around hspec tests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dbf" = callPackage
@@ -66874,8 +62464,6 @@ self: {
        ];
        description = "Decompiler Bytecode Java";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dbm" = callPackage
@@ -66894,8 +62482,6 @@ self: {
        ];
        description = "A *simple* database migration tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dbmigrations" = callPackage
@@ -66943,8 +62529,6 @@ self: {
        ];
        description = "The dbmigrations tool built for MySQL databases";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dbmigrations-postgresql" = callPackage
@@ -66963,8 +62547,6 @@ self: {
        ];
        description = "The dbmigrations tool built for PostgreSQL databases";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dbmigrations-sqlite" = callPackage
@@ -66979,8 +62561,6 @@ self: {
        testHaskellDepends = [ base dbmigrations HDBC HDBC-sqlite3 HUnit ];
        description = "The dbmigrations tool built for SQLite databases";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dbus_0_10_15" = callPackage
@@ -67013,33 +62593,6 @@ self: {
      }) {};
 
   "dbus" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, conduit, containers
-     , criterion, deepseq, directory, exceptions, extra, filepath, lens
-     , network, parsec, process, QuickCheck, random, resourcet, split
-     , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text
-     , th-lift, transformers, unix, vector, xml-conduit, xml-types
-     }:
-     mkDerivation {
-       pname = "dbus";
-       version = "1.2.7";
-       sha256 = "0ypkjlw9fn65g7p28kb3p82glk7qs7p7vyffccw7qxa3z57s12w5";
-       libraryHaskellDepends = [
-         base bytestring cereal conduit containers deepseq exceptions
-         filepath lens network parsec random split template-haskell text
-         th-lift transformers unix vector xml-conduit xml-types
-       ];
-       testHaskellDepends = [
-         base bytestring cereal containers directory extra filepath network
-         parsec process QuickCheck random resourcet tasty tasty-hunit
-         tasty-quickcheck text transformers unix vector
-       ];
-       benchmarkHaskellDepends = [ base criterion ];
-       doCheck = false;
-       description = "A client library for the D-Bus IPC system";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "dbus_1_2_11" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, containers
      , criterion, deepseq, directory, exceptions, extra, filepath, lens
      , network, parsec, process, QuickCheck, random, resourcet, split
@@ -67064,7 +62617,6 @@ self: {
        doCheck = false;
        description = "A client library for the D-Bus IPC system";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dbus-client" = callPackage
@@ -67080,8 +62632,6 @@ self: {
        ];
        description = "Monadic and object-oriented interfaces to DBus";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dbus-core" = callPackage
@@ -67099,8 +62649,6 @@ self: {
        ];
        description = "Low-level D-Bus protocol implementation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dbus-hslogger" = callPackage
@@ -67133,8 +62681,6 @@ self: {
        testHaskellDepends = [ base containers dbus QuickCheck ];
        description = "Quasi-quoter for DBus functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dbus-th" = callPackage
@@ -67192,8 +62738,6 @@ self: {
        ];
        description = "This packge is deprecated. See the the \"LIO.DCLabel\" in the \"lio\" package.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dclabel-eci11" = callPackage
@@ -67205,8 +62749,6 @@ self: {
        libraryHaskellDepends = [ base pretty QuickCheck ];
        description = "The Disjunction Category Label Format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dcpu16" = callPackage
@@ -67226,8 +62768,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "DCPU-16 Emulator & Assembler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddate" = callPackage
@@ -67239,8 +62779,6 @@ self: {
        libraryHaskellDepends = [ base dates time ];
        description = "Discordian Date Types for Haskell";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-base" = callPackage
@@ -67256,8 +62794,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler common utilities";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-build" = callPackage
@@ -67277,8 +62813,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler build framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-code" = callPackage
@@ -67291,8 +62825,6 @@ self: {
        libraryHaskellDepends = [ base filepath ];
        description = "Disciplined Disciple Compiler base libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-core" = callPackage
@@ -67309,8 +62841,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler core language and type checker";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-core-babel" = callPackage
@@ -67324,8 +62854,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler PHP code generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-core-eval" = callPackage
@@ -67341,8 +62869,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler semantic evaluator for the core language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-core-flow" = callPackage
@@ -67360,8 +62886,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler data flow compiler";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-core-llvm" = callPackage
@@ -67378,8 +62902,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler LLVM code generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-core-salt" = callPackage
@@ -67395,8 +62917,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler C code generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-core-simpl" = callPackage
@@ -67412,8 +62932,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler code transformations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-core-tetra" = callPackage
@@ -67430,8 +62948,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler intermediate language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-driver" = callPackage
@@ -67451,8 +62967,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler top-level driver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-interface" = callPackage
@@ -67464,8 +62978,6 @@ self: {
        libraryHaskellDepends = [ base containers ddc-base directory ];
        description = "Disciplined Disciple Compiler user interface support";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-source-tetra" = callPackage
@@ -67482,8 +62994,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler source language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-tools" = callPackage
@@ -67506,8 +63016,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler command line tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddc-war" = callPackage
@@ -67525,8 +63033,6 @@ self: {
        ];
        description = "Disciplined Disciple Compiler test driver and buildbot";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ddci-core" = callPackage
@@ -67545,8 +63051,6 @@ self: {
        ];
        description = "Disciple Core language interactive interpreter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dde" = callPackage
@@ -67573,8 +63077,6 @@ self: {
        ];
        description = "Delay differential equations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dead-code-detection" = callPackage
@@ -67600,8 +63102,6 @@ self: {
        ];
        description = "detect dead code in haskell projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dead-simple-json" = callPackage
@@ -67617,12 +63117,10 @@ self: {
        ];
        description = "Dead simple JSON parser, with some Template Haskell sugar";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "debian" = callPackage
-    ({ mkDerivation, base, bytestring, bzlib, Cabal, containers
+    ({ mkDerivation, base, bytestring, bz2, Cabal, containers
      , directory, either, exceptions, filepath, hostname, HUnit, lens
      , ListLike, mtl, network-uri, old-locale, parsec, pretty, process
      , process-extras, pureMD5, QuickCheck, regex-compat, regex-tdfa
@@ -67631,14 +63129,12 @@ self: {
      }:
      mkDerivation {
        pname = "debian";
-       version = "4.0.0";
-       sha256 = "1gshvsgbgghskl4csngffdpnf49z27yhap86bwqnkp4asbh553h6";
-       revision = "1";
-       editedCabalFile = "1p338790mb39j77rf9r82sbwlkv7ax2ipfl5232aa8ygzn2py6nk";
+       version = "4.0.2";
+       sha256 = "1sp8vkg65fllvxk85sp34isc0zvmj0s72i138wz5vhj9hfmn2c71";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring bzlib Cabal containers directory either exceptions
+         base bytestring bz2 Cabal containers directory either exceptions
          filepath hostname HUnit lens ListLike mtl network-uri old-locale
          parsec pretty process process-extras pureMD5 QuickCheck
          regex-compat regex-tdfa SHA syb template-haskell temporary text
@@ -67650,8 +63146,6 @@ self: {
        ];
        description = "Modules for working with the Debian package system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "debian-binary" = callPackage
@@ -67712,8 +63206,6 @@ self: {
        ];
        description = "Simple trace-based debugger";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "debug-diff" = callPackage
@@ -67764,8 +63256,6 @@ self: {
        ];
        description = "secure remote debugging";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "debug-pp" = callPackage
@@ -67807,8 +63297,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell unicode-show ];
        description = "You do not have to write variable names twice in Debug.Trace";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "debug-tracy" = callPackage
@@ -67859,22 +63347,9 @@ self: {
        libraryHaskellDepends = [ base comonad-transformers ];
        description = "The categorical dual of transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "decidable" = callPackage
-    ({ mkDerivation, base, singletons }:
-     mkDerivation {
-       pname = "decidable";
-       version = "0.1.5.0";
-       sha256 = "1rsgwmvbx4mip26pihhmv6rssn23q8la22qxqj73i60863fkkwbj";
-       libraryHaskellDepends = [ base singletons ];
-       description = "Combinators for manipulating dependently-typed predicates";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "decidable_0_3_0_0" = callPackage
     ({ mkDerivation, base, functor-products, microlens, singletons
      , vinyl
      }:
@@ -67887,7 +63362,6 @@ self: {
        ];
        description = "Combinators for manipulating dependently-typed predicates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "decimal-arithmetic" = callPackage
@@ -67902,8 +63376,6 @@ self: {
        testHaskellDepends = [ base binary doctest hspec QuickCheck ];
        description = "An implementation of the General Decimal Arithmetic Specification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "decimal-literals" = callPackage
@@ -67937,8 +63409,6 @@ self: {
        testHaskellDepends = [ base mwc-probability ];
        description = "DIY Markov Chains";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "decode-utf8" = callPackage
@@ -67966,8 +63436,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring conduit ];
        description = "Conduit for decoding ByteStrings using Data.Binary.Get";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dedukti" = callPackage
@@ -67990,8 +63458,6 @@ self: {
        ];
        description = "A type-checker for the λΠ-modulo calculus";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "deepcontrol" = callPackage
@@ -68008,8 +63474,6 @@ self: {
        ];
        description = "A library that provides deep-level programming style and(or) notation on Applicative and Monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "deeplearning-hs" = callPackage
@@ -68037,8 +63501,6 @@ self: {
        ];
        description = "Deep Learning in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "deepseq_1_3_0_1" = callPackage
@@ -68093,8 +63555,6 @@ self: {
        ];
        description = "Bounded deepseq, including support for generic deriving";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "deepseq-generics" = callPackage
@@ -68124,8 +63584,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Deep evaluation of data structures without NFData";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "deepseq-th" = callPackage
@@ -68138,8 +63596,6 @@ self: {
        testHaskellDepends = [ base deepseq template-haskell ];
        description = "Template Haskell based deriver for optimised NFData instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "deepzoom" = callPackage
@@ -68151,8 +63607,6 @@ self: {
        libraryHaskellDepends = [ base directory filepath hsmagick ];
        description = "A DeepZoom image slicer. Only known to work on 32bit Linux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "defargs" = callPackage
@@ -68164,8 +63618,6 @@ self: {
        libraryHaskellDepends = [ base cluss ];
        description = "default arguments in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "deferred-folds" = callPackage
@@ -68349,8 +63801,6 @@ self: {
        librarySystemDepends = [ mpdec ];
        description = "Decimal floating point arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {mpdec = null;};
 
   "deka-tests" = callPackage
@@ -68371,8 +63821,6 @@ self: {
        testHaskellDepends = [ base bytestring deka QuickCheck quickpull ];
        description = "Tests for deka, decimal floating point arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "delaunay" = callPackage
@@ -68389,8 +63837,6 @@ self: {
        testHaskellDepends = [ AC-Vector base HUnit QuickCheck ];
        description = "Build a Delaunay triangulation of a set of points";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "delay" = callPackage
@@ -68421,8 +63867,6 @@ self: {
        ];
        description = "Accessing the del.icio.us APIs from Haskell (v2)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "delimited-text" = callPackage
@@ -68438,8 +63882,6 @@ self: {
        ];
        description = "Parse character delimited textual data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "delimiter-separated" = callPackage
@@ -68452,8 +63894,6 @@ self: {
        libraryHaskellDepends = [ base uhc-util uulib ];
        description = "Library for dealing with tab and/or comma (or other) separated files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "delta" = callPackage
@@ -68477,8 +63917,6 @@ self: {
        testHaskellDepends = [ base directory filepath hspec ];
        description = "A library for detecting file changes";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "delta-h" = callPackage
@@ -68500,8 +63938,6 @@ self: {
        ];
        description = "Online entropy-based model of lexical category acquisition";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "delude" = callPackage
@@ -68513,8 +63949,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Generalized the Prelude more functionally";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "demarcate" = callPackage
@@ -68527,8 +63961,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Demarcating transformed monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "denominate" = callPackage
@@ -68543,8 +63975,6 @@ self: {
        executableHaskellDepends = [ base directory filepath ];
        description = "Functions supporting bulk file and directory name normalization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dense" = callPackage
@@ -68590,8 +64020,6 @@ self: {
        ];
        description = "Dense int-set";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dense-linear-algebra" = callPackage
@@ -68630,20 +64058,6 @@ self: {
      }) {};
 
   "dependent-map" = callPackage
-    ({ mkDerivation, base, containers, dependent-sum }:
-     mkDerivation {
-       pname = "dependent-map";
-       version = "0.2.4.0";
-       sha256 = "0il2naf6gdkvkhscvqd8kg9v911vdhqp9h10z5546mninnyrdcsx";
-       revision = "1";
-       editedCabalFile = "0a5f35d1sgfq1cl1r5bgb5pwfjniiycxiif4ycxglaizp8g5rlr1";
-       libraryHaskellDepends = [ base containers dependent-sum ];
-       description = "Dependent finite maps (partial dependent products)";
-       license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "dependent-map_0_3" = callPackage
     ({ mkDerivation, base, constraints-extras, containers
      , dependent-sum
      }:
@@ -68673,8 +64087,6 @@ self: {
        ];
        description = "Dependent map that uses semigroup mappend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dependent-state" = callPackage
@@ -68686,22 +64098,9 @@ self: {
        libraryHaskellDepends = [ base lens mtl prologue ];
        description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types.";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dependent-sum" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "dependent-sum";
-       version = "0.4";
-       sha256 = "07hs9s78wiybwjwkal2yq65hdavq0gg1h2ld7wbph61s2nsfrpm8";
-       libraryHaskellDepends = [ base ];
-       description = "Dependent sum type";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "dependent-sum_0_6_2_0" = callPackage
     ({ mkDerivation, base, constraints-extras }:
      mkDerivation {
        pname = "dependent-sum";
@@ -68710,7 +64109,6 @@ self: {
        libraryHaskellDepends = [ base constraints-extras ];
        description = "Dependent sum type";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dependent-sum-aeson-orphans" = callPackage
@@ -68727,26 +64125,9 @@ self: {
        ];
        description = "JSON instances for DSum, DMap, and Some";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dependent-sum-template" = callPackage
-    ({ mkDerivation, base, dependent-sum, template-haskell, th-extras
-     }:
-     mkDerivation {
-       pname = "dependent-sum-template";
-       version = "0.0.0.6";
-       sha256 = "1bcipqkkgj1afi2ax726gbvp9haqghvm5016rawx3jj9364v8k4r";
-       libraryHaskellDepends = [
-         base dependent-sum template-haskell th-extras
-       ];
-       testHaskellDepends = [ base dependent-sum ];
-       description = "Template Haskell code to generate instances of classes in dependent-sum package";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "dependent-sum-template_0_1_0_0" = callPackage
     ({ mkDerivation, base, constraints-extras, dependent-sum
      , template-haskell, th-extras
      }:
@@ -68760,7 +64141,6 @@ self: {
        testHaskellDepends = [ base constraints-extras dependent-sum ];
        description = "Template Haskell code to generate instances of classes in dependent-sum package";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "depends" = callPackage
@@ -68782,8 +64162,6 @@ self: {
        ];
        description = "A simple configuration management tool for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dephd" = callPackage
@@ -68802,8 +64180,6 @@ self: {
        ];
        description = "Analyze quality of nucleotide sequences";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "deptrack-core" = callPackage
@@ -68815,8 +64191,6 @@ self: {
        libraryHaskellDepends = [ base containers dlist mtl parsec ];
        description = "DepTrack Core types and model";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "deptrack-devops" = callPackage
@@ -68835,8 +64209,6 @@ self: {
        ];
        description = "DepTrack applied to DevOps";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "deptrack-dot" = callPackage
@@ -68849,8 +64221,6 @@ self: {
        testHaskellDepends = [ base containers deptrack-core dotgen ];
        description = "Facilitate Graphviz representations of DepTrack dependencies";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "deque" = callPackage
@@ -68883,8 +64253,6 @@ self: {
        testHaskellDepends = [ base Cabal cabal-test-quickcheck ];
        description = "A typeclass and an implementation for double-ended queues";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "derangement" = callPackage
@@ -68896,8 +64264,6 @@ self: {
        libraryHaskellDepends = [ base fgl ];
        description = "Find derangements of lists";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "derivation-trees" = callPackage
@@ -68911,8 +64277,6 @@ self: {
        ];
        description = "Typeset Derivation Trees via MetaPost";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "derive" = callPackage
@@ -68933,8 +64297,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A program and library to derive instances for data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "derive-IG" = callPackage
@@ -68946,8 +64308,6 @@ self: {
        libraryHaskellDepends = [ base instant-generics template-haskell ];
        description = "Macro to derive instances for Instant-Generics using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "derive-enumerable" = callPackage
@@ -68959,8 +64319,6 @@ self: {
        libraryHaskellDepends = [ base data-default ];
        description = "Generic instances for enumerating complex data types";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "derive-gadt" = callPackage
@@ -68982,8 +64340,6 @@ self: {
        ];
        description = "Instance deriving for (a subset of) GADTs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "derive-monoid" = callPackage
@@ -68999,8 +64355,6 @@ self: {
        testHaskellDepends = [ base semigroups ];
        description = "derive Semigroup/Monoid/IsList";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "derive-storable" = callPackage
@@ -69054,8 +64408,6 @@ self: {
        ];
        description = "Help Haskellers derive class instances for composited data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "derive-trie" = callPackage
@@ -69067,8 +64419,6 @@ self: {
        libraryHaskellDepends = [ array base containers template-haskell ];
        description = "Automatic derivation of Trie implementations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "deriveJsonNoPrefix" = callPackage
@@ -69130,8 +64480,6 @@ self: {
        libraryHaskellDepends = [ base derp ];
        description = "combinators based on parsing with derivatives (derp) package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "derulo" = callPackage
@@ -69151,25 +64499,23 @@ self: {
 
   "describe" = callPackage
     ({ mkDerivation, base, bytestring, cereal, fixed-vector, lens
-     , mmorph, monad-control, mtl, profunctors, QuickCheck, text
-     , transformers
+     , mmorph, monad-control, mtl, profunctors, QuickCheck
+     , template-haskell, text, transformers
      }:
      mkDerivation {
        pname = "describe";
-       version = "0.4.0.1";
-       sha256 = "13lnp0yaz18s161d7d2a4cnv2q2kqfm44xqr0jlxcvrmhvr65qdc";
+       version = "0.4.0.5";
+       sha256 = "0hy4p78hp6zgilfj9jn9mj6x5w32jm9kdb9w4vkchlncid5r9bzl";
        libraryHaskellDepends = [
          base bytestring cereal fixed-vector lens mmorph monad-control mtl
-         profunctors text transformers
+         profunctors template-haskell text transformers
        ];
        testHaskellDepends = [
          base bytestring cereal fixed-vector lens mmorph monad-control mtl
-         profunctors QuickCheck text transformers
+         profunctors QuickCheck template-haskell text transformers
        ];
        description = "Combinators for describing binary data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "descrilo" = callPackage
@@ -69215,8 +64561,6 @@ self: {
        ];
        description = "Library, interpreter, and CLI for Descript programming language";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "descriptive" = callPackage
@@ -69279,8 +64623,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Simple deterministic game engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "detour-via-sci" = callPackage
@@ -69303,8 +64645,6 @@ self: {
        ];
        description = "JSON and CSV encoding for rationals as decimal point numbers";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "detour-via-uom" = callPackage
@@ -69326,8 +64666,6 @@ self: {
        ];
        description = "JSON and CSV encoding for quantities";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "detrospector" = callPackage
@@ -69359,8 +64697,6 @@ self: {
        executableHaskellDepends = [ base bytestring utf8-string ];
        description = "Get rid of unicode (utf-8) symbols in Haskell sources";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "devil" = callPackage
@@ -69379,8 +64715,6 @@ self: {
        ];
        description = "A small tool to make it easier to update program managed by Angel";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dewdrop" = callPackage
@@ -69394,8 +64728,6 @@ self: {
        ];
        description = "Find gadgets for return-oriented programming on x86";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "df1" = callPackage
@@ -69450,8 +64782,6 @@ self: {
        ];
        description = "A generic data integrity layer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) leveldb;};
 
   "dfrac" = callPackage
@@ -69482,8 +64812,6 @@ self: {
        ];
        description = "Build Debian From Scratch CD/DVD images";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dgim" = callPackage
@@ -69496,8 +64824,6 @@ self: {
        testHaskellDepends = [ base Cabal QuickCheck ];
        description = "Implementation of DGIM algorithm";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dgs" = callPackage
@@ -69509,102 +64835,6 @@ self: {
        libraryHaskellDepends = [ base HTTP mtl network split ];
        description = "Haskell front-end for DGS' bot interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "dhall" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
-     , bytestring, case-insensitive, cborg, cborg-json, containers
-     , contravariant, criterion, cryptonite, deepseq, Diff, directory
-     , doctest, dotgen, exceptions, filepath, foldl, haskeline
-     , http-client, http-client-tls, http-types, lens-family-core
-     , megaparsec, memory, mockery, mtl, optparse-applicative, parsers
-     , prettyprinter, prettyprinter-ansi-terminal, profunctors
-     , QuickCheck, quickcheck-instances, repline, scientific, serialise
-     , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text
-     , transformers, transformers-compat, turtle, unordered-containers
-     , uri-encode, vector
-     }:
-     mkDerivation {
-       pname = "dhall";
-       version = "1.24.0";
-       sha256 = "1n04jk45qjl00wx7gxzp36j7d1m1ca7h7y4qlp8gxhykpkr6zzv7";
-       revision = "2";
-       editedCabalFile = "10ki70113z1kgq35xaib7qwrpzjl93hq4qxm0qb62d3pvaf4wp15";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty ansi-terminal base bytestring case-insensitive
-         cborg cborg-json containers contravariant cryptonite Diff directory
-         dotgen exceptions filepath haskeline http-client http-client-tls
-         http-types lens-family-core megaparsec memory mtl
-         optparse-applicative parsers prettyprinter
-         prettyprinter-ansi-terminal profunctors repline scientific
-         serialise template-haskell text transformers transformers-compat
-         unordered-containers uri-encode vector
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base bytestring cborg containers deepseq directory doctest filepath
-         foldl megaparsec mockery prettyprinter QuickCheck
-         quickcheck-instances serialise tasty tasty-hunit tasty-quickcheck
-         text transformers turtle vector
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring containers criterion directory serialise text
-       ];
-       description = "A configuration language guaranteed to terminate";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dhall_1_27_0" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
-     , bytestring, case-insensitive, cborg, cborg-json, containers
-     , contravariant, cryptonite, data-fix, deepseq, Diff, directory
-     , doctest, dotgen, either, exceptions, filepath, foldl, gauge
-     , generic-random, hashable, haskeline, http-client, http-client-tls
-     , http-types, lens-family-core, megaparsec, memory, mockery, mtl
-     , network-uri, optparse-applicative, parsers, prettyprinter
-     , prettyprinter-ansi-terminal, profunctors, QuickCheck
-     , quickcheck-instances, repline, scientific, semigroups, serialise
-     , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, th-lift-instances
-     , transformers, transformers-compat, turtle, unordered-containers
-     , uri-encode, vector
-     }:
-     mkDerivation {
-       pname = "dhall";
-       version = "1.27.0";
-       sha256 = "04hpf0g8anhynrc3gd96cg1z4qadrk2xg9094qjm68d2kv6zx2g1";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty ansi-terminal base bytestring case-insensitive
-         cborg cborg-json containers contravariant cryptonite data-fix
-         deepseq Diff directory dotgen either exceptions filepath hashable
-         haskeline http-client http-client-tls http-types lens-family-core
-         megaparsec memory mtl network-uri optparse-applicative parsers
-         prettyprinter prettyprinter-ansi-terminal profunctors repline
-         scientific serialise template-haskell text th-lift-instances
-         transformers transformers-compat unordered-containers uri-encode
-         vector
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base bytestring cborg containers data-fix deepseq directory doctest
-         either filepath foldl generic-random lens-family-core megaparsec
-         mockery prettyprinter QuickCheck quickcheck-instances scientific
-         semigroups serialise special-values spoon tasty
-         tasty-expected-failure tasty-hunit tasty-quickcheck text
-         transformers turtle unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring containers directory gauge serialise text
-       ];
-       description = "A configuration language guaranteed to terminate";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall_1_29_0" = callPackage
@@ -69658,14 +64888,66 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "dhall" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write
+     , base, bytestring, case-insensitive, cborg, cborg-json, containers
+     , contravariant, cryptonite, data-fix, deepseq, Diff, directory
+     , doctest, dotgen, either, exceptions, filepath, foldl, gauge
+     , generic-random, hashable, haskeline, http-client, http-client-tls
+     , http-types, lens-family-core, megaparsec, memory, mockery, mtl
+     , network-uri, optparse-applicative, parser-combinators, parsers
+     , pretty-simple, prettyprinter, prettyprinter-ansi-terminal
+     , profunctors, QuickCheck, quickcheck-instances, repline
+     , scientific, semigroups, serialise, special-values, spoon, tasty
+     , tasty-expected-failure, tasty-hunit, tasty-quickcheck
+     , template-haskell, text, th-lift-instances, transformers
+     , transformers-compat, turtle, unordered-containers, uri-encode
+     , vector
+     }:
+     mkDerivation {
+       pname = "dhall";
+       version = "1.30.0";
+       sha256 = "10aagimwa5ycrq15240ff2g7r0n995waa33vaz0h51nqvncrbgpj";
+       revision = "1";
+       editedCabalFile = "1pazhb3h1rabb80wxh29k5yfp915zqp1gmhcv4mx7ibzv9zw7miq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty ansi-terminal atomic-write base bytestring
+         case-insensitive cborg cborg-json containers contravariant
+         cryptonite data-fix deepseq Diff directory dotgen either exceptions
+         filepath hashable haskeline http-client http-client-tls http-types
+         lens-family-core megaparsec memory mtl network-uri
+         optparse-applicative parser-combinators parsers pretty-simple
+         prettyprinter prettyprinter-ansi-terminal profunctors repline
+         scientific serialise template-haskell text th-lift-instances
+         transformers transformers-compat unordered-containers uri-encode
+         vector
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base bytestring cborg containers data-fix deepseq directory doctest
+         either filepath foldl generic-random lens-family-core megaparsec
+         mockery prettyprinter QuickCheck quickcheck-instances scientific
+         semigroups serialise special-values spoon tasty
+         tasty-expected-failure tasty-hunit tasty-quickcheck text
+         transformers turtle unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring containers directory gauge serialise text
+       ];
+       description = "A configuration language guaranteed to terminate";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dhall-bash" = callPackage
     ({ mkDerivation, base, bytestring, containers, dhall
      , neat-interpolation, optparse-generic, shell-escape, text
      }:
      mkDerivation {
        pname = "dhall-bash";
-       version = "1.0.21";
-       sha256 = "06rv0wrs1ym6szy78wg3nyfwaqm279vy6m7zny9s90lnpa6dc098";
+       version = "1.0.28";
+       sha256 = "0bvq4x9swnbc37vw08dw2vaj2phm9kyb94jv3vbfmwl1s6yw83zj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69679,30 +64961,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall-bash_1_0_27" = callPackage
-    ({ mkDerivation, base, bytestring, containers, dhall
-     , neat-interpolation, optparse-generic, shell-escape, text
-     }:
-     mkDerivation {
-       pname = "dhall-bash";
-       version = "1.0.27";
-       sha256 = "0mmf53fqgf8g6s80g6wss86lcfkrpjc51w5givy7kg9js00d48px";
-       revision = "1";
-       editedCabalFile = "1w4hbk6xx04q0f1sxgwmp3h5s3cwc3w22vbvdxz052nhdcj3sigw";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring containers dhall neat-interpolation shell-escape
-         text
-       ];
-       executableHaskellDepends = [
-         base bytestring dhall optparse-generic text
-       ];
-       description = "Compile Dhall to Bash";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "dhall-check" = callPackage
     ({ mkDerivation, base, containers, dhall, directory, filepath
      , fsnotify, text, trifecta
@@ -69718,8 +64976,6 @@ self: {
        ];
        description = "Check all dhall files in a project";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dhall-fly" = callPackage
@@ -69752,41 +65008,9 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Translate concourse config from Dhall to YAML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dhall-json" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
-     , dhall, exceptions, lens, libyaml, optparse-applicative
-     , scientific, tasty, tasty-hunit, text, unordered-containers
-     , vector, yaml
-     }:
-     mkDerivation {
-       pname = "dhall-json";
-       version = "1.3.0";
-       sha256 = "176i30shaklranbhmb4m4zqn13cn9hd6lqiqdjv9qmckkapbkjpi";
-       revision = "1";
-       editedCabalFile = "101xfp3zg9i7qyibknjpcdhha8sc024xmylphiwb509h3fjy3yks";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring containers dhall exceptions lens
-         libyaml optparse-applicative scientific text unordered-containers
-         vector yaml
-       ];
-       executableHaskellDepends = [
-         aeson aeson-pretty base bytestring dhall exceptions
-         optparse-applicative text
-       ];
-       testHaskellDepends = [
-         aeson base bytestring dhall tasty tasty-hunit text
-       ];
-       description = "Convert between Dhall and JSON or YAML";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dhall-json_1_6_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal
      , base, bytestring, containers, dhall, exceptions, filepath
      , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
@@ -69795,10 +65019,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-json";
-       version = "1.6.1";
-       sha256 = "1j89a75rqr90y6yya17iym6c9d6f4sa5hhmv46qbwim9sflv1s9w";
-       revision = "1";
-       editedCabalFile = "07h7vldqd623y7jf15j87mhs3nnbwl3a0121ajqc56qc0vvpgywp";
+       version = "1.6.2";
+       sha256 = "044hq25h872rjlcp24fzf0nslxg4a6hmq8ylcljzk003lmq0c2xz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69815,7 +65037,6 @@ self: {
        ];
        description = "Convert between Dhall and JSON or YAML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-lex" = callPackage
@@ -69847,8 +65068,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-lsp-server";
-       version = "1.0.4";
-       sha256 = "0w8xql6hxchgs77ik2fgnhb2llp6138jyiynwvhsfkjijmqj5qrl";
+       version = "1.0.5";
+       sha256 = "1lrx0grpgzi8iv9pskn3dk0ill3x542afmz9v1h96fvb20nmknp8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69864,8 +65085,6 @@ self: {
        ];
        description = "Language Server Protocol (LSP) server for Dhall";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dhall-nix" = callPackage
@@ -69874,8 +65093,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-nix";
-       version = "1.1.11";
-       sha256 = "0af8nbakaznw8wvrdgslrqk7fnmv2425f67xv3cx1jlf51drphpk";
+       version = "1.1.12";
+       sha256 = "1hpy3nwn1as92v6r1qh4dp6gn9x404a8ynz1gkldcp6izyiri82h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69886,8 +65105,6 @@ self: {
        ];
        description = "Dhall to Nix compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dhall-text" = callPackage
@@ -69933,8 +65150,6 @@ self: {
        ];
        description = "Compile Dhall expressions to Cabal files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dhall-yaml" = callPackage
@@ -69945,8 +65160,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-yaml";
-       version = "1.0.1";
-       sha256 = "1pm36mwq6llnys9ac3b5nisw7d9xjxgh6nh2xl3kcdjh30f3bm2f";
+       version = "1.0.2";
+       sha256 = "1fdid65wpxngbfdyisxij8m60x9i6mlq6ll6blf5jq4362ahhf3r";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69963,8 +65178,6 @@ self: {
        ];
        description = "Convert between Dhall and YAML";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dhcp-lease-parser" = callPackage
@@ -69983,8 +65196,6 @@ self: {
        ];
        description = "Parse a DHCP lease file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dhrun" = callPackage
@@ -70018,8 +65229,6 @@ self: {
        doHaddock = false;
        description = "Dhall/YAML configurable concurrent integration test executor";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "di" = callPackage
@@ -70114,8 +65323,6 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        description = "An EDSL for teaching Haskell with diagrams - data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dia-functions" = callPackage
@@ -70133,8 +65340,6 @@ self: {
        ];
        description = "An EDSL for teaching Haskell with diagrams - functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams" = callPackage
@@ -70164,8 +65369,6 @@ self: {
        libraryHaskellDepends = [ base cubicbezier diagrams-lib ];
        description = "deprecated, part of diagrams-contrib since 1.4";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-braille" = callPackage
@@ -70219,8 +65422,6 @@ self: {
        ];
        description = "hint-based build service for the diagrams graphics EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-cairo" = callPackage
@@ -70233,6 +65434,8 @@ self: {
        pname = "diagrams-cairo";
        version = "1.4.1.1";
        sha256 = "0vyd2yr55n7x71194i18lnbcshdjpnqw4qyq7vj5zx377rsz711k";
+       revision = "1";
+       editedCabalFile = "1jw499gd9kni1mk3h1hyaz5gz92ly5mi7sk8b9wabxcq5hdm9p94";
        libraryHaskellDepends = [
          array base bytestring cairo colour containers data-default-class
          diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl
@@ -70259,8 +65462,6 @@ self: {
        ];
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-contrib" = callPackage
@@ -70275,6 +65476,8 @@ self: {
        pname = "diagrams-contrib";
        version = "1.4.4";
        sha256 = "043jpr7lqg708lzmv6cqys7312lfdwnf8ijcnpl4jkbvcwl87c1m";
+       revision = "1";
+       editedCabalFile = "01m59vs4lagsyqcs3p4472i5b28n2jsr7naj30azrm8s197frbsl";
        libraryHaskellDepends = [
          base circle-packing colour containers cubicbezier data-default
          data-default-class diagrams-core diagrams-lib diagrams-solve
@@ -70298,6 +65501,8 @@ self: {
        pname = "diagrams-core";
        version = "1.4.2";
        sha256 = "0qgb43vy23g4fxh3nmxfq6jyp34imqvkhgflaa6rz0iq6d60gl43";
+       revision = "1";
+       editedCabalFile = "0w8mpy0z8kmx4l7cg8sgc1hyixysjfqffdgmnxy5p04airjlbpj7";
        libraryHaskellDepends = [
          adjunctions base containers distributive dual-tree lens linear
          monoid-extras mtl profunctors semigroups unordered-containers
@@ -70312,15 +65517,13 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-graphviz";
-       version = "1.4.1";
-       sha256 = "05mddk0ii8afhiv4ysig6ngns7s2zg328k7xswz37vvg1f2j2gvy";
+       version = "1.4.1.1";
+       sha256 = "0lscrxd682jvyrl5bj4dxp7593qwyis01sl0p4jm2jfn335wdq40";
        libraryHaskellDepends = [
          base containers diagrams-lib fgl graphviz split
        ];
-       description = "Graph layout and drawing with GrahpViz and diagrams";
+       description = "Graph layout and drawing with GraphViz and diagrams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-gtk" = callPackage
@@ -70336,8 +65539,6 @@ self: {
        ];
        description = "Backend for rendering diagrams directly to GTK windows";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-haddock" = callPackage
@@ -70368,8 +65569,6 @@ self: {
        ];
        description = "Preprocessor for embedding diagrams in Haddock documentation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-hsqml" = callPackage
@@ -70386,8 +65585,6 @@ self: {
        ];
        description = "HsQML (Qt5) backend for Diagrams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-html5" = callPackage
@@ -70406,8 +65603,6 @@ self: {
        ];
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-lib" = callPackage
@@ -70424,6 +65619,8 @@ self: {
        pname = "diagrams-lib";
        version = "1.4.3";
        sha256 = "0gqrcyjyp3p78vmfxvhfjbkkl2xvwcv3qyyinbdcmalb5zb8vyy6";
+       revision = "1";
+       editedCabalFile = "0cqhqm2nz2ls00pfhx8hz6z6g17qhl380h24wp4d6l5msiw7gxq4";
        libraryHaskellDepends = [
          active adjunctions array base bytestring cereal colour containers
          data-default-class diagrams-core diagrams-solve directory
@@ -70462,8 +65659,6 @@ self: {
        ];
        description = "A Pandoc filter to express diagrams inline using the Haskell EDSL _Diagrams_";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-pdf" = callPackage
@@ -70481,8 +65676,6 @@ self: {
        ];
        description = "PDF backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-pgf" = callPackage
@@ -70505,25 +65698,6 @@ self: {
      }) {};
 
   "diagrams-postscript" = callPackage
-    ({ mkDerivation, base, containers, data-default-class
-     , diagrams-core, diagrams-lib, dlist, hashable, lens, monoid-extras
-     , mtl, semigroups, split, statestack
-     }:
-     mkDerivation {
-       pname = "diagrams-postscript";
-       version = "1.4.1";
-       sha256 = "171c53msr2x8da87fghl7jikbmrwy7gdxwhdviixc2y3k4fijn57";
-       revision = "2";
-       editedCabalFile = "0s6z3kaj1dm5kifaydnd2nx97g5qbc6jjqy3wn4dwa9rm7w49753";
-       libraryHaskellDepends = [
-         base containers data-default-class diagrams-core diagrams-lib dlist
-         hashable lens monoid-extras mtl semigroups split statestack
-       ];
-       description = "Postscript backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diagrams-postscript_1_5" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default-class
      , diagrams-core, diagrams-lib, hashable, lens, monoid-extras, mtl
      , semigroups, split, statestack
@@ -70532,6 +65706,8 @@ self: {
        pname = "diagrams-postscript";
        version = "1.5";
        sha256 = "00j58mc84srjvrf21v6zjxxlbw6b8ahhn1jmbq697w8kw3cvygpa";
+       revision = "1";
+       editedCabalFile = "1cl7fmqiq9bng7va8kwlcxjmh76p1pm71c3p8242r552s10wqvb6";
        libraryHaskellDepends = [
          base bytestring containers data-default-class diagrams-core
          diagrams-lib hashable lens monoid-extras mtl semigroups split
@@ -70539,7 +65715,6 @@ self: {
        ];
        description = "Postscript backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-qrcode" = callPackage
@@ -70554,8 +65729,6 @@ self: {
        ];
        description = "Draw QR codes to SVG, PNG, PDF or PS files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-rasterific" = callPackage
@@ -70568,6 +65741,8 @@ self: {
        pname = "diagrams-rasterific";
        version = "1.4.2";
        sha256 = "161rsy3g59n3sfrbfyvd4i4hszl0zm59w21b7pk6w88n0bk8gf2l";
+       revision = "1";
+       editedCabalFile = "0q2nzcdv7j654bk8c5fjz3whiz1l6cdy21n6ah53f1s7rlsbiz0g";
        libraryHaskellDepends = [
          base bytestring containers data-default-class diagrams-core
          diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels
@@ -70639,6 +65814,8 @@ self: {
        pname = "diagrams-svg";
        version = "1.4.3";
        sha256 = "1ysv6cz0fngrndl4wjmw4hrdj2rik5fxa1dkxzwnlgf1xwpvxgk8";
+       revision = "1";
+       editedCabalFile = "092kl3hnqlji71nxychw9v1sddxaim6ha00g1afi1ph2zm4f6s7c";
        libraryHaskellDepends = [
          base base64-bytestring bytestring colour containers diagrams-core
          diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl
@@ -70659,8 +65836,6 @@ self: {
        ];
        description = "TikZ backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diagrams-wx" = callPackage
@@ -70678,8 +65853,6 @@ self: {
        ];
        description = "Backend for rendering diagrams in wxWidgets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dialog" = callPackage
@@ -70739,8 +65912,6 @@ self: {
        ];
        description = "A simple, forward build system";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dice" = callPackage
@@ -70772,8 +65943,6 @@ self: {
        ];
        description = "Cryptographically secure n-sided dice via rejection sampling";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dice2tex" = callPackage
@@ -70787,8 +65956,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Convert a Diceware wordlist into a printer-ready LaTeX file";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dicom" = callPackage
@@ -70802,8 +65969,6 @@ self: {
        ];
        description = "A library for reading and writing DICOM files in the Explicit VR Little Endian transfer syntax";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dictionaries" = callPackage
@@ -70832,8 +65997,6 @@ self: {
        ];
        description = "Tools to handle StarDict dictionaries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dictionary-sharing" = callPackage
@@ -70862,8 +66025,6 @@ self: {
        testHaskellDepends = [ base hspec parsec ];
        description = "Parsec parsers for the DICT format produced by dictfmt -t";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diet" = callPackage
@@ -70881,8 +66042,6 @@ self: {
        ];
        description = "Discrete Interval Encoding Trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diff" = callPackage
@@ -70894,8 +66053,6 @@ self: {
        libraryHaskellDepends = [ base Enum util ];
        description = "Diff and patch";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diff-gestalt" = callPackage
@@ -70968,8 +66125,6 @@ self: {
        ];
        description = "Diff two .cabal files syntactically";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diffdump" = callPackage
@@ -71008,8 +66163,6 @@ self: {
          groups hedgehog hedgehog-checkers QuickCheck semigroupoids
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "differential" = callPackage
@@ -71035,8 +66188,6 @@ self: {
        ];
        description = "Finds out whether an entity comes from different distributions (statuses)";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diffmap" = callPackage
@@ -71075,8 +66226,6 @@ self: {
        ];
        description = "Generate todo lists from source code";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "digamma" = callPackage
@@ -71129,8 +66278,6 @@ self: {
        ];
        description = "Speed up form designing using digestive functors and bootstrap";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "digestive-foundation-lucid" = callPackage
@@ -71147,8 +66294,6 @@ self: {
        ];
        description = "Speed up form designing using digestive functors and foundation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "digestive-functors" = callPackage
@@ -71223,8 +66368,6 @@ self: {
        ];
        description = "Happstack backend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "digestive-functors-heist" = callPackage
@@ -71241,8 +66384,6 @@ self: {
        ];
        description = "Heist frontend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "digestive-functors-hsp" = callPackage
@@ -71255,8 +66396,6 @@ self: {
        libraryToolDepends = [ trhsx ];
        description = "HSP support for digestive-functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "digestive-functors-lucid" = callPackage
@@ -71323,8 +66462,6 @@ self: {
        ];
        description = "A data-type representing digits 0-9 and other combinations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "digitalocean-kzs" = callPackage
@@ -71342,8 +66479,6 @@ self: {
        testHaskellDepends = [ base doctest hspec ];
        description = "digitalocean api for haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "digits" = callPackage
@@ -71374,8 +66509,6 @@ self: {
        testHaskellDepends = [ base fgl hashable massiv QuickCheck ];
        description = "Directed Graphs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dihaa" = callPackage
@@ -71438,8 +66571,6 @@ self: {
        libraryHaskellDepends = [ base numtype-tf time ];
        description = "Statically checked physical dimensions, implemented using type families";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dimensions" = callPackage
@@ -71478,8 +66609,6 @@ self: {
        ];
        description = "Dingo is a Rich Internet Application platform based on the Warp web server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dingo-example" = callPackage
@@ -71499,8 +66628,6 @@ self: {
        ];
        description = "Dingo Example";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dingo-widgets" = callPackage
@@ -71519,8 +66646,6 @@ self: {
        ];
        description = "Dingo Widgets";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dino" = callPackage
@@ -71553,8 +66678,6 @@ self: {
        libraryToolDepends = [ happy ];
        description = "A quadratic diophantine equation solving library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diplomacy" = callPackage
@@ -71570,8 +66693,6 @@ self: {
        ];
        description = "Diplomacy board game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "diplomacy-server" = callPackage
@@ -71595,8 +66716,6 @@ self: {
        ];
        description = "Play Diplomacy over HTTP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dir-traverse" = callPackage
@@ -71624,8 +66743,6 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "Serialization and deserialization monads for streams and ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "direct-daemonize" = callPackage
@@ -71652,8 +66769,6 @@ self: {
        ];
        description = "Native implementation of the FastCGI protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "direct-http" = callPackage
@@ -71672,8 +66787,6 @@ self: {
        ];
        description = "Native webserver that acts as a library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "direct-murmur-hash" = callPackage
@@ -71696,8 +66809,6 @@ self: {
        libraryHaskellDepends = [ base ghc ghc-paths ];
        description = "Lightweight replacement for Plugins, specific to GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "direct-rocksdb" = callPackage
@@ -71717,8 +66828,6 @@ self: {
        ];
        description = "Bindings to RocksDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "direct-sqlite" = callPackage
@@ -71753,8 +66862,6 @@ self: {
        ];
        description = "Finite directed cubical complexes and associated algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "directory_1_3_6_0" = callPackage
@@ -71846,8 +66953,6 @@ self: {
          unordered-containers
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dirstream" = callPackage
@@ -71887,8 +66992,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A small library for working with directories";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "disassembler" = callPackage
@@ -71923,8 +67026,6 @@ self: {
        ];
        description = "Client for Discogs REST API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "discokitty" = callPackage
@@ -71953,8 +67054,6 @@ self: {
        ];
        description = "An API wrapper for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "discord-haskell" = callPackage
@@ -71978,8 +67077,6 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "Write bots for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "discord-hs" = callPackage
@@ -71996,8 +67093,6 @@ self: {
        ];
        description = "An API wrapper for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "discord-rest" = callPackage
@@ -72017,8 +67112,6 @@ self: {
        ];
        description = "An API wrapper for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "discord-types" = callPackage
@@ -72037,8 +67130,6 @@ self: {
        ];
        description = "Type information for discord-hs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "discordian-calendar" = callPackage
@@ -72050,8 +67141,6 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "library for handling Discordian calendar dates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "discount" = callPackage
@@ -72115,6 +67204,8 @@ self: {
        pname = "discrimination";
        version = "0.4";
        sha256 = "085lhsvyp4d135p9yhgyl2s92f4cjdsghk1nsp8mjjddh6hxl20a";
+       revision = "1";
+       editedCabalFile = "0xi8c19cz3gm208g0dl6f2pks3skqmif2zml8j40r77ajxnf6anl";
        libraryHaskellDepends = [
          array base containers contravariant deepseq ghc-prim hashable
          integer-gmp primitive profunctors promises semigroups transformers
@@ -72145,8 +67236,6 @@ self: {
        ];
        description = "Disjoint containers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "disjoint-set" = callPackage
@@ -72163,8 +67252,6 @@ self: {
        ];
        description = "Persistent disjoint-sets, a.k.a union-find.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "disjoint-set-stateful" = callPackage
@@ -72177,8 +67264,6 @@ self: {
        testHaskellDepends = [ base hspec primitive ref-tf vector ];
        description = "Monadic disjoint set";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "disjoint-sets-st" = callPackage
@@ -72221,8 +67306,6 @@ self: {
        ];
        description = "Disk-based hash table";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "display" = callPackage
@@ -72256,8 +67339,6 @@ self: {
        libraryHaskellDepends = [ base ghcjs-base-stub stm ];
        description = "Allows storing different resource-releasing actions together";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dist-upload" = callPackage
@@ -72272,8 +67353,6 @@ self: {
        doHaddock = false;
        description = "Generate/Upload cabal package to Hackage";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distance" = callPackage
@@ -72287,8 +67366,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Useful distance datatype and functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distance-of-time" = callPackage
@@ -72364,8 +67441,6 @@ self: {
        ];
        description = "AWS Lambda backend for distributed-fork";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process" = callPackage
@@ -72390,8 +67465,6 @@ self: {
        ];
        description = "Cloud Haskell: Erlang-style concurrency in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-async" = callPackage
@@ -72419,8 +67492,6 @@ self: {
        ];
        description = "Cloud Haskell Async API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-azure" = callPackage
@@ -72443,8 +67514,6 @@ self: {
        ];
        description = "Microsoft Azure backend for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-client-server" = callPackage
@@ -72474,8 +67543,6 @@ self: {
        ];
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-ekg" = callPackage
@@ -72491,8 +67558,6 @@ self: {
        ];
        description = "Collect node stats for EKG";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-execution" = callPackage
@@ -72528,8 +67593,6 @@ self: {
        ];
        description = "Execution Framework for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-extras" = callPackage
@@ -72560,8 +67623,6 @@ self: {
        ];
        description = "Cloud Haskell Extras";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-fsm" = callPackage
@@ -72594,8 +67655,6 @@ self: {
        ];
        description = "The Cloud Haskell implementation of Erlang/OTP gen_statem";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-lifted" = callPackage
@@ -72621,8 +67680,6 @@ self: {
        ];
        description = "monad-control style typeclass and transformer instances for Process monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-monad-control" = callPackage
@@ -72639,8 +67696,6 @@ self: {
        ];
        description = "Orphan instances for MonadBase and MonadBaseControl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-p2p" = callPackage
@@ -72661,8 +67716,6 @@ self: {
        executableHaskellDepends = [ base distributed-process mtl ];
        description = "Peer-to-peer node discovery for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-platform" = callPackage
@@ -72693,8 +67746,6 @@ self: {
        ];
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-registry" = callPackage
@@ -72727,8 +67778,6 @@ self: {
        ];
        description = "Cloud Haskell Extended Process Registry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-simplelocalnet" = callPackage
@@ -72751,8 +67800,6 @@ self: {
        ];
        description = "Simple zero-configuration backend for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-supervisor" = callPackage
@@ -72784,8 +67831,6 @@ self: {
        ];
        description = "Supervisors for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-systest" = callPackage
@@ -72805,8 +67850,6 @@ self: {
        ];
        description = "Cloud Haskell Test Support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-task" = callPackage
@@ -72843,8 +67886,6 @@ self: {
        ];
        description = "Task Framework for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-tests" = callPackage
@@ -72868,8 +67909,6 @@ self: {
        ];
        description = "Tests and test support tools for distributed-process";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-process-zookeeper" = callPackage
@@ -72898,8 +67937,6 @@ self: {
        ];
        description = "A Zookeeper back-end for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributed-static" = callPackage
@@ -72915,8 +67952,6 @@ self: {
        ];
        description = "Compositional, type-safe, polymorphic static values and closures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distribution" = callPackage
@@ -72930,8 +67965,6 @@ self: {
        ];
        description = "Finite discrete probability distributions";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distribution-nixpkgs" = callPackage
@@ -72987,8 +68020,6 @@ self: {
        ];
        description = "Easily plot distributions from the distribution package..";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "distributive" = callPackage
@@ -73051,8 +68082,6 @@ self: {
        ];
        description = "Quantify the diversity of a population";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dixi" = callPackage
@@ -73090,8 +68119,6 @@ self: {
        ];
        description = "A wiki implemented with a firm theoretical foundation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "djembe" = callPackage
@@ -73107,8 +68134,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Hit drums with haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "djinn" = callPackage
@@ -73165,41 +68190,17 @@ self: {
        ];
        description = "Generate executable Haskell code from a type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dl-fedora" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath
-     , http-directory, http-types, optparse-applicative, regex-posix
-     , simple-cmd, simple-cmd-args, text, unix, xdg-userdirs
-     }:
-     mkDerivation {
-       pname = "dl-fedora";
-       version = "0.5";
-       sha256 = "1zfdf2s8cq171ik3iwq0zcha60i3czpjiy9bqa5wxczbwp0jpaxa";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base bytestring directory filepath http-directory http-types
-         optparse-applicative regex-posix simple-cmd simple-cmd-args text
-         unix xdg-userdirs
-       ];
-       description = "Fedora image download tool";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "dl-fedora_0_7_2" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath
      , http-directory, http-types, optparse-applicative, regex-posix
      , simple-cmd, simple-cmd-args, text, time, unix, xdg-userdirs
      }:
      mkDerivation {
        pname = "dl-fedora";
-       version = "0.7.2";
-       sha256 = "0a22bbmppafq6pncvpk8qnf4mvjznnl02rw93s58r2v23779m37p";
+       version = "0.7.3";
+       sha256 = "095wmsflwm4wqlvk2h7s64nqacha8did10av9n52pj3kcwczqx2i";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -73209,8 +68210,6 @@ self: {
        ];
        description = "Fedora image download tool";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dlist" = callPackage
@@ -73264,13 +68263,11 @@ self: {
     ({ mkDerivation, base, hspec, process, QuickCheck }:
      mkDerivation {
        pname = "dmc";
-       version = "1.1";
-       sha256 = "1bn214qb20xr43lraibm75gnb5friykq8bn4cyp6abjbrrspjikn";
-       revision = "2";
-       editedCabalFile = "1rpxbbk5mqk39xajn8f73v0z0kignl60rf3ippwr526n4hssxs56";
+       version = "1.2";
+       sha256 = "1n9l11bqn3sgdvrmcq278rcdgbnsy59bymvnwxv1npgp8i5fgw27";
        libraryHaskellDepends = [ base process ];
        testHaskellDepends = [ base hspec process QuickCheck ];
-       description = "cmd: run shell commands from code";
+       description = "cmd for common cases";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
@@ -73300,8 +68297,6 @@ self: {
        ];
        description = "AVAYA DMCC API bindings and WebSockets server for AVAYA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dmenu" = callPackage
@@ -73317,8 +68312,6 @@ self: {
        ];
        description = "Complete bindings to the dmenu and dmenu2 command line tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dmenu-pkill" = callPackage
@@ -73336,8 +68329,6 @@ self: {
        ];
        description = "dmenu script for killing applications. Sortable by process id or CPU/MEM usage.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dmenu-pmount" = callPackage
@@ -73355,8 +68346,6 @@ self: {
        ];
        description = "Mounting and unmounting linux devices as user with dmenu and pmount";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dmenu-search" = callPackage
@@ -73374,8 +68363,6 @@ self: {
        ];
        description = "dmenu script for searching the web with customizable search engines";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dns" = callPackage
@@ -73418,8 +68405,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Caching DNS resolver library and mass DNS resolver utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dnsrbl" = callPackage
@@ -73432,8 +68417,6 @@ self: {
        libraryHaskellDepends = [ base containers hsdns HUnit network ];
        description = "Asynchronous DNS RBL lookup";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dnssd" = callPackage
@@ -73446,8 +68429,6 @@ self: {
        librarySystemDepends = [ dns_sd ];
        description = "DNS service discovery bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {dns_sd = null;};
 
   "do-list" = callPackage
@@ -73491,6 +68472,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dobutok" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "dobutok";
+       version = "0.1.0.2";
+       sha256 = "06wi9p4gyxqiwaih1hg5p4wypi77si5y8c1akqsvh3ssr0sds74r";
+       libraryHaskellDepends = [ base ];
+       description = "Creates the time intervals for CLI changing messages on the screen";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "dobutokO" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "dobutokO";
+       version = "0.3.1.0";
+       sha256 = "0vsh9ygxaqy9qv193hbvk4fx4bj34m95qnqfippv76l0f4lpa8bz";
+       libraryHaskellDepends = [ base ];
+       description = "The library is intended to print updated messages on the terminal screen";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "doc-review" = callPackage
     ({ mkDerivation, base, base64-bytestring, binary, bytestring
      , containers, directory, feed, filepath, haskell98, heist, hexpat
@@ -73514,8 +68517,6 @@ self: {
        ];
        description = "Document review Web application, like http://book.realworldhaskell.org/";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "doccheck" = callPackage
@@ -73534,8 +68535,6 @@ self: {
        ];
        description = "Checks Haddock comments for pitfalls and version changes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "docidx" = callPackage
@@ -73554,8 +68553,6 @@ self: {
        ];
        description = "Generate an HTML index of installed Haskell packages and their documentation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "docker" = callPackage
@@ -73571,8 +68568,8 @@ self: {
      }:
      mkDerivation {
        pname = "docker";
-       version = "0.6.0.2";
-       sha256 = "00xs5khq74rlc4yqlln7fdhxagzbl526mnd762ivkyikn5ip3p9r";
+       version = "0.6.0.3";
+       sha256 = "0vvvw7ijzsra1kknv196fla1vc9jigp4dafycvh2djaxmj73d1vi";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring conduit conduit-combinators
          conduit-extra containers data-default-class directory exceptions
@@ -73589,8 +68586,6 @@ self: {
        ];
        description = "An API client for docker written in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "docker-build-cacher" = callPackage
@@ -73613,8 +68608,6 @@ self: {
        ];
        description = "Builds a docker image and caches all of its intermediate stages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dockercook" = callPackage
@@ -73648,8 +68641,6 @@ self: {
        testHaskellDepends = [ base HTF text vector ];
        description = "A build tool for multiple docker image layers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dockerfile" = callPackage
@@ -73739,8 +68730,6 @@ self: {
        ];
        description = "Vinyl-based records with hierarchical field names, default values and documentation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "docstrings" = callPackage
@@ -73757,25 +68746,6 @@ self: {
      }) {};
 
   "doctemplates" = callPackage
-    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
-     , containers, hspec, parsec, scientific, text, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "doctemplates";
-       version = "0.2.2.1";
-       sha256 = "1gyckfg3kgvzhxw14i7iwrw0crygvsp86sy53bbr1yn7bxbgn33b";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base blaze-html blaze-markup bytestring containers parsec
-         scientific text unordered-containers vector
-       ];
-       testHaskellDepends = [ aeson base hspec text ];
-       description = "Pandoc-style document templates";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "doctemplates_0_8" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , doclayout, filepath, Glob, HsYAML, mtl, parsec, safe, scientific
      , tasty, tasty-golden, tasty-hunit, temporary, text
@@ -73799,7 +68769,6 @@ self: {
        ];
        description = "Pandoc-style document templates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "doctemplates_0_8_1" = callPackage
@@ -73901,8 +68870,6 @@ self: {
        doHaddock = false;
        description = "Easy way to run doctests via cabal (no aeson dependency, uses configurator instead)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "doctest-driver-gen" = callPackage
@@ -73918,8 +68885,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Generate driver file for doctest's cabal integration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "doctest-prop" = callPackage
@@ -73932,8 +68897,6 @@ self: {
        testHaskellDepends = [ base doctest HUnit QuickCheck ];
        description = "Allow QuickCheck-style property testing within doctest";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "docusign-base" = callPackage
@@ -74003,8 +68966,6 @@ self: {
        ];
        description = "DocuSign examples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "docvim" = callPackage
@@ -74031,8 +68992,6 @@ self: {
        ];
        description = "Documentation generator for Vim plug-ins";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "doi" = callPackage
@@ -74061,8 +69020,6 @@ self: {
        ];
        description = "Automatic Bibtex and fulltext of scientific articles";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "doldol" = callPackage
@@ -74109,8 +69066,6 @@ self: {
        benchmarkHaskellDepends = [ base containers criterion deepseq ];
        description = "The Lengauer-Tarjan graph dominators algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dom-parser" = callPackage
@@ -74170,8 +69125,6 @@ self: {
        testHaskellDepends = [ base doctest pretty-simple ];
        description = "Domain authentication library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dominion" = callPackage
@@ -74203,8 +69156,6 @@ self: {
        ];
        description = "A simple templating library using HTML5 as its template language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dot" = callPackage
@@ -74244,8 +69195,6 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dot2graphml" = callPackage
@@ -74259,8 +69208,6 @@ self: {
        executableHaskellDepends = [ base containers graphviz hxt text ];
        description = "Converter from GraphViz .dot format to yEd GraphML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dotenv" = callPackage
@@ -74320,8 +69267,6 @@ self: {
        doHaddock = false;
        description = "Filesystem to manage and parse dotfiles";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dotgen" = callPackage
@@ -74401,8 +69346,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Doublify API toolkit for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dove" = callPackage
@@ -74441,8 +69384,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A proof assistant for Magic: The Gathering puzzles";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dow" = callPackage
@@ -74503,8 +69444,6 @@ self: {
        ];
        description = "Simple tool to download images from RSS feeds (e.g. Flickr, Picasa)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "downloader" = callPackage
@@ -74532,8 +69471,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A Haskell library for using Dozenal (Duodecimal - Base 12) numbers";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dozens" = callPackage
@@ -74553,8 +69490,6 @@ self: {
        ];
        description = "dozens api library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dph-base" = callPackage
@@ -74568,8 +69503,6 @@ self: {
        ];
        description = "Data Parallel Haskell common config and debugging functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dph-examples" = callPackage
@@ -74588,8 +69521,6 @@ self: {
        ];
        description = "Data Parallel Haskell example programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dph-lifted-base" = callPackage
@@ -74606,8 +69537,6 @@ self: {
        ];
        description = "Data Parallel Haskell common definitions used by other dph-lifted packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dph-lifted-copy" = callPackage
@@ -74623,8 +69552,6 @@ self: {
        ];
        description = "Data Parallel Haskell lifted array combinators. (deprecated version)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dph-lifted-vseg" = callPackage
@@ -74641,8 +69568,6 @@ self: {
        ];
        description = "Data Parallel Haskell lifted array combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dph-par" = callPackage
@@ -74665,8 +69590,6 @@ self: {
        libraryHaskellDepends = [ base dph-base random vector ];
        description = "Data Parallel Haskell segmented arrays. (abstract interface)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dph-prim-par" = callPackage
@@ -74683,8 +69606,6 @@ self: {
        ];
        description = "Data Parallel Haskell segmented arrays. (production version)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dph-prim-seq" = callPackage
@@ -74700,8 +69621,6 @@ self: {
        ];
        description = "Data Parallel Haskell segmented arrays. (sequential implementation)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dph-seq" = callPackage
@@ -74733,8 +69652,6 @@ self: {
        testPkgconfigDepends = [ libdpkg ];
        description = "libdpkg bindings";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) dpkg; libdpkg = null;};
 
   "dpor" = callPackage
@@ -74748,8 +69665,6 @@ self: {
        ];
        description = "A generic implementation of dynamic partial-order reduction (DPOR) for testing arbitrary models of concurrency";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dprox" = callPackage
@@ -74784,8 +69699,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Monadic FRP";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dragen" = callPackage
@@ -74806,8 +69719,6 @@ self: {
        ];
        description = "Automatic derivation of optimized QuickCheck random generators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "draw-poker" = callPackage
@@ -74839,8 +69750,6 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "A port of asciimoo's drawille to haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dresdner-verkehrsbetriebe" = callPackage
@@ -74863,8 +69772,6 @@ self: {
        ];
        description = "Library and program for querying DVB (Dresdner Verkehrsbetriebe AG)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "drifter" = callPackage
@@ -74901,8 +69808,6 @@ self: {
        ];
        description = "PostgreSQL support for the drifter schema migration tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "drifter-sqlite" = callPackage
@@ -74946,8 +69851,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A Haskell bindings to the DRMAA C library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {drmaa = null;};
 
   "drone" = callPackage
@@ -74966,8 +69869,6 @@ self: {
          microlens req servant-server text warp
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dropbox-sdk" = callPackage
@@ -74989,8 +69890,6 @@ self: {
        ];
        description = "A library to access the Dropbox HTTP API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dropsolve" = callPackage
@@ -75009,8 +69908,6 @@ self: {
        ];
        description = "A command line tool for resolving dropbox conflicts. Deprecated! Please use confsolve.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ds-kanren" = callPackage
@@ -75025,8 +69922,6 @@ self: {
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "A subset of the miniKanren language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dsc" = callPackage
@@ -75073,8 +69968,6 @@ self: {
        ];
        description = "SQL backend for Database Supported Haskell (DSH)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dsmc" = callPackage
@@ -75092,8 +69985,6 @@ self: {
        ];
        description = "DSMC library for rarefied gas dynamics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dsmc-tools" = callPackage
@@ -75113,8 +70004,6 @@ self: {
        ];
        description = "DSMC toolkit for rarefied gas dynamics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dson" = callPackage
@@ -75137,8 +70026,6 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "DSON parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dsp" = callPackage
@@ -75164,8 +70051,6 @@ self: {
        libraryHaskellDepends = [ base base-unicode-symbols dlist ];
        description = "Difference strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dtab" = callPackage
@@ -75186,8 +70071,6 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Harmonix (Guitar Hero, Rock Band) DTA/DTB metadata library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dtd" = callPackage
@@ -75207,8 +70090,6 @@ self: {
        ];
        description = "Parse and render DTD files (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dtd-text" = callPackage
@@ -75224,8 +70105,6 @@ self: {
        ];
        description = "Parse and render XML DTDs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dtd-types" = callPackage
@@ -75267,8 +70146,6 @@ self: {
        ];
        description = "(Fast) Dynamic Time Warping";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dual" = callPackage
@@ -75277,11 +70154,11 @@ self: {
        pname = "dual";
        version = "0.1.1.1";
        sha256 = "0rf7vywr342llc0p7rmd4l0r8gsaxza0mh6cdb5mg13m9jfb4125";
+       revision = "1";
+       editedCabalFile = "1cm80lc3p8bpzj0crxccx2fp33p171gz4j56r9fc5g5kza390nrb";
        libraryHaskellDepends = [ base ];
        description = "Dual category";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dual-game" = callPackage
@@ -75418,8 +70295,6 @@ self: {
        ];
        description = "A tiny language, a subset of Haskell (with type classes) aimed at aiding teachers to teach Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dumb-cas" = callPackage
@@ -75479,20 +70354,6 @@ self: {
      }) {};
 
   "dunai" = callPackage
-    ({ mkDerivation, base, MonadRandom, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "dunai";
-       version = "0.5.1";
-       sha256 = "07bkjp7z5lbm6466nc99p4ngiqkh5mgbczwl7rflxzis4w1vm997";
-       libraryHaskellDepends = [
-         base MonadRandom transformers transformers-base
-       ];
-       description = "Generalised reactive framework supporting classic, arrowized and monadic FRP";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dunai_0_6_0" = callPackage
     ({ mkDerivation, base, MonadRandom, simple-affine-space
      , transformers, transformers-base
      }:
@@ -75505,7 +70366,6 @@ self: {
        ];
        description = "Generalised reactive framework supporting classic, arrowized and monadic FRP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dunai-core" = callPackage
@@ -75569,8 +70429,6 @@ self: {
        ];
        description = "Frontend development build tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dura" = callPackage
@@ -75640,8 +70498,6 @@ self: {
        ];
        description = "Dead simple password manager";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dvda" = callPackage
@@ -75664,8 +70520,6 @@ self: {
        ];
        description = "Efficient automatic differentiation and code generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dvdread" = callPackage
@@ -75679,8 +70533,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A monadic interface to libdvdread";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {dvdread = null;};
 
   "dvi-processing" = callPackage
@@ -75692,8 +70544,6 @@ self: {
        libraryHaskellDepends = [ base bytestring filepath transformers ];
        description = "Read/write DVI and TFM file";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dvorak" = callPackage
@@ -75752,8 +70602,6 @@ self: {
        executableHaskellDepends = [ base containers dwarf-el ];
        description = "High-level wrapper around the dwarf library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dwergaz" = callPackage
@@ -75820,8 +70668,6 @@ self: {
        testHaskellDepends = [ ansi-terminal base hspec text ];
        description = "A library for working with binary Dyck words";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dyepack" = callPackage
@@ -75872,8 +70718,6 @@ self: {
        ];
        description = "Access the functions from the Cabal library without depending on it";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dynamic-graph" = callPackage
@@ -75973,8 +70817,6 @@ self: {
        ];
        description = "Object-oriented programming with duck typing and singleton classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dynamic-plot" = callPackage
@@ -75999,8 +70841,6 @@ self: {
        ];
        description = "Interactive diagram windows";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dynamic-pp" = callPackage
@@ -76021,8 +70861,6 @@ self: {
        ];
        description = "A pretty-print library that employs a dynamic programming algorithm for optimal rendering";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dynamic-state" = callPackage
@@ -76065,8 +70903,6 @@ self: {
        ];
        description = "Typesafe library for working with DynamoDB database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dynloader" = callPackage
@@ -76110,8 +70946,6 @@ self: {
        ];
        description = "your dynamic optimization buddy";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dyre" = callPackage
@@ -76139,8 +70973,6 @@ self: {
        libraryHaskellDepends = [ base bytestring transformers ];
        description = "Bindings to the dywapitchtrack pitch tracking library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dzen-dhall" = callPackage
@@ -76155,8 +70987,8 @@ self: {
      }:
      mkDerivation {
        pname = "dzen-dhall";
-       version = "1.0.1";
-       sha256 = "16rkmiczdgknlq1f8m5n3ila8727z1db77g141sq5qqlgn7x37ww";
+       version = "1.0.2";
+       sha256 = "1pa399smd588jm06sammacsqmvxs0wywyzpczc6jdnc10qccb3rl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -76176,8 +71008,6 @@ self: {
        ];
        description = "Configure dzen2 bars in Dhall language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "dzen-utils" = callPackage
@@ -76189,8 +71019,6 @@ self: {
        libraryHaskellDepends = [ base colour process ];
        description = "Utilities for creating inputs for dzen";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "each" = callPackage
@@ -76250,8 +71078,6 @@ self: {
        testHaskellDepends = [ base filepath hspec ];
        description = "Ear Clipping Triangulation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ease" = callPackage
@@ -76263,8 +71089,6 @@ self: {
        libraryHaskellDepends = [ base data-default ];
        description = "Robert Penner's easing equations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "easy-api" = callPackage
@@ -76280,8 +71104,6 @@ self: {
        ];
        description = "Utility code for building HTTP API bindings more quickly";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "easy-bitcoin" = callPackage
@@ -76325,8 +71147,6 @@ self: {
        ];
        description = "Haskell JSON library with an emphasis on simplicity, minimal dependencies, and ease of use";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "easyplot" = callPackage
@@ -76338,8 +71158,6 @@ self: {
        libraryHaskellDepends = [ base process ];
        description = "A tiny plotting library, utilizes gnuplot for plotting";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "easyrender" = callPackage
@@ -76386,22 +71204,6 @@ self: {
      }) {};
 
   "easytest" = callPackage
-    ({ mkDerivation, async, base, call-stack, containers, mtl, random
-     , stm, text, transformers
-     }:
-     mkDerivation {
-       pname = "easytest";
-       version = "0.2.1";
-       sha256 = "0gdyawzlw6d15yz7ji599xjgfr0g7l1iq11ffr4aw3j6g3dc6m8i";
-       libraryHaskellDepends = [
-         async base call-stack containers mtl random stm text transformers
-       ];
-       testHaskellDepends = [ base ];
-       description = "Simple, expressive testing library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "easytest_0_3" = callPackage
     ({ mkDerivation, base, call-stack, directory, hedgehog, mtl
      , profunctors, split, stm, tagged, transformers, unix
      }:
@@ -76418,7 +71220,6 @@ self: {
        ];
        description = "Simple, expressive testing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ebeats" = callPackage
@@ -76430,8 +71231,6 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "Time in ebeats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ebnf-bff" = callPackage
@@ -76450,8 +71249,6 @@ self: {
        ];
        description = "Parser combinators & EBNF, BFFs!";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ec2-signature" = callPackage
@@ -76568,8 +71365,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A ECMA-262 interpreter library";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ecstasy" = callPackage
@@ -76603,8 +71398,6 @@ self: {
        executableSystemDepends = [ canlib ];
        description = "Tools for automotive ECU development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {canlib = null;};
 
   "ed25519" = callPackage
@@ -76652,8 +71445,6 @@ self: {
        ];
        description = "Command line file filtering with haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ede" = callPackage
@@ -76691,8 +71482,6 @@ self: {
        libraryHaskellDepends = [ base containers deepseq parallel ];
        description = "Semi-explicit parallel programming library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "edenskel" = callPackage
@@ -76704,8 +71493,6 @@ self: {
        libraryHaskellDepends = [ base edenmodules parallel ];
        description = "Semi-explicit parallel programming skeleton library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "edentv" = callPackage
@@ -76726,8 +71513,6 @@ self: {
        ];
        description = "A Tool to Visualize Parallel Functional Program Executions";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "edf" = callPackage
@@ -76757,8 +71542,6 @@ self: {
        ];
        description = "Top view space combat arcade game";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "edges" = callPackage
@@ -76786,8 +71569,6 @@ self: {
        ];
        description = "Tools for efficient immutable graphs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "edis" = callPackage
@@ -76819,8 +71600,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A monad for rewriting things";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "edit-distance" = callPackage
@@ -76892,8 +71671,6 @@ self: {
        ];
        description = "Symmetric, stateful edit lenses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "edit-lenses-demo" = callPackage
@@ -76918,8 +71695,6 @@ self: {
        libraryHaskellDepends = [ base text vty vty-ui ];
        description = "Interactive editors for Generics";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "editline" = callPackage
@@ -76931,8 +71706,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Bindings to the editline library (libedit)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "editor-open" = callPackage
@@ -76990,8 +71763,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "effect-monad" = callPackage
@@ -77014,8 +71785,6 @@ self: {
        libraryHaskellDepends = [ base constraints mtl transformers ];
        description = "Reducing the pain of transformer stacks with duplicated effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "effective-aspects" = callPackage
@@ -77091,8 +71860,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A Typeable-free implementation of extensible effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "egison" = callPackage
@@ -77130,8 +71897,44 @@ self: {
        ];
        description = "Programming language with non-linear pattern-matching against non-free data";
        license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "egison_3_10_3" = callPackage
+    ({ mkDerivation, array, base, containers, criterion, deepseq
+     , directory, filepath, ghc, ghc-paths, Glob, hashable, haskeline
+     , HUnit, megaparsec, mtl, optparse-applicative, parsec
+     , parser-combinators, prettyprinter, process, random, regex-tdfa
+     , split, test-framework, test-framework-hunit, text, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "egison";
+       version = "3.10.3";
+       sha256 = "01j0jgdaq002g8jb8i2chf571zksmjvd6z17jrf7fvn4981lcgqi";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array base containers directory ghc ghc-paths hashable haskeline
+         megaparsec mtl optparse-applicative parsec parser-combinators
+         prettyprinter process random regex-tdfa split text transformers
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         array base containers directory filepath ghc ghc-paths haskeline
+         mtl optparse-applicative parsec prettyprinter process split text
+         transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base filepath Glob HUnit mtl test-framework test-framework-hunit
+         transformers
+       ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq mtl transformers
+       ];
+       description = "Programming language with non-linear pattern-matching against non-free data";
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "egison-quote" = callPackage
@@ -77145,8 +71948,6 @@ self: {
        ];
        description = "A quasi quotes for using Egison expression in Haskell code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "egison-tutorial" = callPackage
@@ -77167,8 +71968,6 @@ self: {
        ];
        description = "A tutorial program for the Egison programming language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "egyptian-fractions" = callPackage
@@ -77198,8 +71997,6 @@ self: {
        ];
        description = "like eruby, ehaskell is embedded haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ehs" = callPackage
@@ -77220,8 +72017,6 @@ self: {
        ];
        description = "Embedded haskell template using quasiquotes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eibd-client-simple" = callPackage
@@ -77240,8 +72035,6 @@ self: {
        librarySystemDepends = [ eibclient ];
        description = "EIBd Client";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {eibclient = null;};
 
   "eigen" = callPackage
@@ -77261,8 +72054,6 @@ self: {
        ];
        description = "Eigen C++ library (linear algebra: matrices, sparse matrices, vectors, numerical solvers)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "either" = callPackage
@@ -77305,8 +72096,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Functions involving lists of Either";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "either-unwrap" = callPackage
@@ -77431,8 +72220,6 @@ self: {
        ];
        description = "Push metrics to elastic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ekg-elasticsearch" = callPackage
@@ -77450,8 +72237,6 @@ self: {
        ];
        description = "Push metrics to elasticsearch";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ekg-influxdb" = callPackage
@@ -77468,8 +72253,6 @@ self: {
        ];
        description = "An EKG backend to send statistics to influxdb";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ekg-json" = callPackage
@@ -77502,8 +72285,6 @@ self: {
        ];
        description = "Push metrics to a log file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ekg-prometheus-adapter" = callPackage
@@ -77540,8 +72321,6 @@ self: {
        ];
        description = "Small framework to push metric deltas to a broadcast channel using the ekg-core library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ekg-rrd" = callPackage
@@ -77562,8 +72341,6 @@ self: {
        ];
        description = "Passes ekg statistics to rrdtool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ekg-statsd" = callPackage
@@ -77603,6 +72380,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "elbow" = callPackage
+    ({ mkDerivation, base, hmatrix, safe }:
+     mkDerivation {
+       pname = "elbow";
+       version = "0.2.0.0";
+       sha256 = "1am1j05z79prlybq3hg8vr4gwhl354af4dg9y1qr57vpp6gcpfwv";
+       libraryHaskellDepends = [ base hmatrix safe ];
+       description = "Find the elbow point";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "electrum-mnemonic" = callPackage
     ({ mkDerivation, base, tasty, tasty-quickcheck }:
      mkDerivation {
@@ -77675,8 +72463,6 @@ self: {
        libraryHaskellDepends = [ base extensible transformers ];
        description = "Immediately lifts to a desired level";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "elf" = callPackage
@@ -77692,24 +72478,6 @@ self: {
      }) {};
 
   "eliminators" = callPackage
-    ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats
-     , singletons, template-haskell, th-abstraction, th-desugar
-     }:
-     mkDerivation {
-       pname = "eliminators";
-       version = "0.5.1";
-       sha256 = "0kqgfsa736sahcsgsjgyh7h1lwxzyn4z85klybmj7gffg9lz4rl1";
-       libraryHaskellDepends = [
-         base extra singleton-nats singletons template-haskell
-         th-abstraction th-desugar
-       ];
-       testHaskellDepends = [ base hspec singleton-nats singletons ];
-       testToolDepends = [ hspec-discover ];
-       description = "Dependently typed elimination functions using singletons";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "eliminators_0_6" = callPackage
     ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats
      , singletons, template-haskell, th-abstraction, th-desugar
      }:
@@ -77725,7 +72493,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Dependently typed elimination functions using singletons";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elision" = callPackage
@@ -77740,8 +72507,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Arrows with holes";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "elliptic-curve" = callPackage
@@ -77767,8 +72532,6 @@ self: {
        ];
        description = "Elliptic curve library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "elm-bridge" = callPackage
@@ -78092,8 +72855,6 @@ self: {
        doHaddock = false;
        description = "Crossing the road between Haskell and Elm";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "elm-syntax" = callPackage
@@ -78143,8 +72904,6 @@ self: {
        ];
        description = "Generate ELM code from a Wai websocket application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "elm-yesod" = callPackage
@@ -78163,31 +72922,6 @@ self: {
      }) {};
 
   "elm2nix" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, async, base, binary
-     , bytestring, containers, data-default, directory, filepath, here
-     , mtl, optparse-applicative, process, req, text, transformers
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "elm2nix";
-       version = "0.1.2";
-       sha256 = "1fbxr1k6iarmzx7xam3bvgayhxmgq1yn47crckgka4s667dgsnjd";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson async base binary bytestring containers data-default
-         directory filepath here mtl process req text transformers
-         unordered-containers
-       ];
-       executableHaskellDepends = [
-         ansi-wl-pprint base directory here optparse-applicative
-       ];
-       testHaskellDepends = [ base ];
-       description = "Turn your Elm project into buildable Nix project";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "elm2nix_0_2" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, async, base, binary
      , bytestring, containers, data-default, directory, filepath, here
      , mtl, optparse-applicative, process, req, text, transformers
@@ -78210,7 +72944,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Turn your Elm project into buildable Nix project";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elminator" = callPackage
@@ -78285,8 +73018,6 @@ self: {
        testHaskellDepends = [ base directory filepath tasty tasty-hunit ];
        description = "A tiny language for understanding the lambda-calculus";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "elynx-seq" = callPackage
@@ -78315,8 +73046,6 @@ self: {
        ];
        description = "Handle molecular sequences";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "elynx-tools" = callPackage
@@ -78371,8 +73100,6 @@ self: {
        ];
        description = "Handle phylogenetic trees";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "emacs-keys" = callPackage
@@ -78391,8 +73118,6 @@ self: {
        ];
        description = "library to parse emacs style keybinding into the modifiers and the chars";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "emacs-module" = callPackage
@@ -78428,8 +73153,6 @@ self: {
        ];
        description = "Sending eMail in Haskell made easy";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "email-header" = callPackage
@@ -78451,8 +73174,6 @@ self: {
        ];
        description = "Parsing and rendering of email and MIME headers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "email-postmark" = callPackage
@@ -78468,8 +73189,6 @@ self: {
        ];
        description = "A simple wrapper to send emails via the api of the service postmark (http://postmarkapp.com/)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "email-validate" = callPackage
@@ -78522,8 +73241,6 @@ self: {
        ];
        description = "Perform basic syntax and deliverability checks on email addresses";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "emailaddress" = callPackage
@@ -78566,8 +73283,6 @@ self: {
        ];
        description = "An email parser that will parse everything";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "embeddock" = callPackage
@@ -78584,8 +73299,6 @@ self: {
        ];
        description = "Embed the values in scope in the haddock documentation of the module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "embeddock-example" = callPackage
@@ -78597,8 +73310,6 @@ self: {
        libraryHaskellDepends = [ base embeddock time ];
        description = "Example of using embeddock";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "embla" = callPackage
@@ -78628,36 +73339,9 @@ self: {
        executableHaskellDepends = [ base ];
        description = "support for embroidery formats in haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "emd" = callPackage
-    ({ mkDerivation, base, binary, containers, criterion
-     , data-default-class, deepseq, finite-typelits
-     , ghc-typelits-knownnat, ghc-typelits-natnormalise, HUnit
-     , mwc-random, statistics, transformers, typelits-witnesses, vector
-     , vector-sized
-     }:
-     mkDerivation {
-       pname = "emd";
-       version = "0.1.5.1";
-       sha256 = "06ii6yw9612dq3ryfv2n7yk5wic3lc3kyvmvbj19wwicwc7315bf";
-       libraryHaskellDepends = [
-         base binary containers data-default-class deepseq finite-typelits
-         ghc-typelits-knownnat ghc-typelits-natnormalise transformers
-         typelits-witnesses vector vector-sized
-       ];
-       testHaskellDepends = [ base containers HUnit ];
-       benchmarkHaskellDepends = [
-         base criterion deepseq ghc-typelits-knownnat mwc-random statistics
-         vector vector-sized
-       ];
-       description = "Empirical Mode Decomposition and Hilbert-Huang Transform";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "emd_0_2_0_0" = callPackage
     ({ mkDerivation, array, base, binary, carray, conduino, containers
      , criterion, data-default-class, deepseq, fft, finite-typelits
      , free, ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog
@@ -78685,7 +73369,6 @@ self: {
        ];
        description = "Empirical Mode Decomposition and Hilbert-Huang Transform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "emgm" = callPackage
@@ -78698,8 +73381,6 @@ self: {
        testHaskellDepends = [ base HUnit QuickCheck syb ];
        description = "Extensible and Modular Generics for the Masses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "emoji" = callPackage
@@ -78752,8 +73433,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A container that always has no values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "enchant" = callPackage
@@ -78770,8 +73449,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Binding to the Enchant library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) enchant;};
 
   "enclosed-exceptions" = callPackage
@@ -78842,8 +73519,6 @@ self: {
        ];
        description = "Encoding-aware file I/O";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "endo" = callPackage
@@ -78918,8 +73593,6 @@ self: {
          unordered-containers wai wai-websockets websockets
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "engine-io-snap" = callPackage
@@ -78936,8 +73609,6 @@ self: {
          snap-core unordered-containers websockets websockets-snap
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "engine-io-wai" = callPackage
@@ -78972,8 +73643,6 @@ self: {
          unordered-containers wai wai-websockets websockets yesod-core
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "engineering-units" = callPackage
@@ -79001,8 +73670,6 @@ self: {
        executableHaskellDepends = [ base matrix quipper-core ];
        description = "An application (and library) to convert quipper circuits into Qpmc models";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "entropy" = callPackage
@@ -79046,8 +73713,6 @@ self: {
        ];
        description = "entwine - Concurrency tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "enum-subset-generate" = callPackage
@@ -79153,8 +73818,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "enumerate all the values in a finite type (automatically)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "enumerate-function" = callPackage
@@ -79175,8 +73838,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "simple package for inverting functions and testing totality, via brute enumeration of the domain";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "enumeration" = callPackage
@@ -79193,8 +73854,6 @@ self: {
        testHaskellDepends = [ arith-encode base binary HUnit-Plus ];
        description = "A practical API for building recursive enumeration procedures and enumerating datatypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "enumerator" = callPackage
@@ -79211,8 +73870,6 @@ self: {
        ];
        description = "Reliable, high-performance processing with left-fold enumerators";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "enumerator-fd" = callPackage
@@ -79224,8 +73881,6 @@ self: {
        libraryHaskellDepends = [ base enumerator mtl ];
        description = "Enumerator instances for monads-fd classes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "enumerator-tf" = callPackage
@@ -79237,8 +73892,6 @@ self: {
        libraryHaskellDepends = [ base enumerator monads-tf ];
        description = "Enumerator instances for monads-tf classes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "enumfun" = callPackage
@@ -79250,8 +73903,6 @@ self: {
        libraryHaskellDepends = [ base enummapset-th ];
        description = "Finitely represented /total/ EnumMaps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "enummapmap" = callPackage
@@ -79276,8 +73927,6 @@ self: {
        ];
        description = "Map of maps using Enum types as keys";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "enummapset" = callPackage
@@ -79311,8 +73960,6 @@ self: {
        ];
        description = "TH-generated EnumSet/EnumMap wrappers around IntSet/IntMap";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "enumset" = callPackage
@@ -79345,8 +73992,6 @@ self: {
        ];
        description = "Safe helpers for accessing and modifying environment variables";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "env-locale" = callPackage
@@ -79376,8 +74021,6 @@ self: {
        ];
        description = "Pull configuration information from the ENV";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "envelope" = callPackage
@@ -79425,30 +74068,9 @@ self: {
        ];
        description = "Display efficiently the state of the local environment";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "envy" = callPackage
-    ({ mkDerivation, base, bytestring, containers, hspec, mtl
-     , QuickCheck, quickcheck-instances, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "envy";
-       version = "2.0.0.0";
-       sha256 = "0l3rg9kvx5pp8ly1wl86g0nfp4161vdbf1cavpm2s84hahq9wg0z";
-       libraryHaskellDepends = [
-         base bytestring containers mtl text time transformers
-       ];
-       testHaskellDepends = [
-         base bytestring hspec mtl QuickCheck quickcheck-instances text time
-         transformers
-       ];
-       description = "An environmentally friendly way to deal with environment variables";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "envy_2_1_0_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, hspec, mtl
      , QuickCheck, quickcheck-instances, text, time, transformers
      }:
@@ -79465,7 +74087,6 @@ self: {
        ];
        description = "An environmentally friendly way to deal with environment variables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "envy-extensible" = callPackage
@@ -79494,8 +74115,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell binding for EPANET";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "epass" = callPackage
@@ -79507,8 +74126,6 @@ self: {
        libraryHaskellDepends = [ base stm time ];
        description = "Baisc, Erlang-like message passing supporting sockets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "epic" = callPackage
@@ -79526,8 +74143,6 @@ self: {
        ];
        description = "Compiler for a simple functional language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "epoll" = callPackage
@@ -79541,8 +74156,6 @@ self: {
        libraryHaskellDepends = [ base unix ];
        description = "epoll bindings";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eprocess" = callPackage
@@ -79555,8 +74168,6 @@ self: {
        libraryHaskellDepends = [ base exceptions mtl ];
        description = "Basic Erlang-like process support for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "epub" = callPackage
@@ -79634,8 +74245,6 @@ self: {
        ];
        description = "Rename epub ebook files based on meta information";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eq" = callPackage
@@ -79757,8 +74366,6 @@ self: {
        ];
        description = "An entity-relationship diagram generator from a plain text description";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "erf" = callPackage
@@ -79781,8 +74388,6 @@ self: {
        libraryHaskellDepends = [ base polynomial ];
        description = "Native Haskell implementation of the interface from the erf package";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "erlang" = callPackage
@@ -79810,8 +74415,6 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring containers text ];
        description = "A text censorship library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eros-client" = callPackage
@@ -79830,8 +74433,6 @@ self: {
        ];
        description = "DEPRECATED in favor of eros-http";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eros-http" = callPackage
@@ -79851,8 +74452,6 @@ self: {
        ];
        description = "JSON HTTP interface to Eros";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "errno" = callPackage
@@ -79888,8 +74487,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Error code functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "error-context" = callPackage
@@ -79912,8 +74509,6 @@ self: {
        ];
        description = "Provides API for enriching errors with contexts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "error-continuations" = callPackage
@@ -79925,8 +74520,6 @@ self: {
        libraryHaskellDepends = [ base either mtl transformers ];
        description = "Error Continuations";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "error-list" = callPackage
@@ -79938,8 +74531,6 @@ self: {
        libraryHaskellDepends = [ base mtl text text-render ];
        description = "A useful type for collecting error messages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "error-loc" = callPackage
@@ -79951,8 +74542,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "An error replacement with call-site metadata";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "error-location" = callPackage
@@ -79979,8 +74568,6 @@ self: {
        ];
        description = "Composable error messages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "error-util" = callPackage
@@ -80038,8 +74625,6 @@ self: {
        ];
        description = "`bracket`-like functions for `ExceptT` over `IO` monad";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ersaconcat" = callPackage
@@ -80063,8 +74648,6 @@ self: {
        ];
        description = "A script to concatenate AIP ERSA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ersatz" = callPackage
@@ -80091,8 +74674,6 @@ self: {
        testHaskellDepends = [ array base directory doctest filepath ];
        description = "A monad for expressing SAT or QSAT problems using observable sharing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ersatz-toysat" = callPackage
@@ -80110,8 +74691,6 @@ self: {
        ];
        description = "toysat driver as backend for ersatz";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ert" = callPackage
@@ -80134,8 +74713,6 @@ self: {
        ];
        description = "Easy Runtime Templates";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "escape-artist" = callPackage
@@ -80152,8 +74729,6 @@ self: {
        ];
        description = "ANSI Escape Sequence Text Decoration Made Easy";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "escaped" = callPackage
@@ -80201,8 +74776,6 @@ self: {
        doHaddock = false;
        description = "Terminal fuzzy selector";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "esotericbot" = callPackage
@@ -80226,8 +74799,6 @@ self: {
        doHaddock = false;
        description = "Esotericbot is a sophisticated, lightweight IRC bot";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "espial" = callPackage
@@ -80292,39 +74863,9 @@ self: {
        ];
        description = "Espial is an open-source, web-based bookmarking server";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "esqueleto" = callPackage
-    ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
-     , hspec, monad-logger, mysql, mysql-simple, persistent
-     , persistent-mysql, persistent-postgresql, persistent-sqlite
-     , persistent-template, postgresql-libpq, postgresql-simple
-     , resourcet, tagged, text, time, transformers, unliftio
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "esqueleto";
-       version = "3.0.0";
-       sha256 = "187c098h2xyf2nhifkdy2bqfl6iap7a93mzwd2kirl5yyicpc9zy";
-       libraryHaskellDepends = [
-         base blaze-html bytestring conduit monad-logger persistent
-         resourcet tagged text time transformers unliftio
-         unordered-containers
-       ];
-       testHaskellDepends = [
-         base blaze-html bytestring conduit containers hspec monad-logger
-         mysql mysql-simple persistent persistent-mysql
-         persistent-postgresql persistent-sqlite persistent-template
-         postgresql-libpq postgresql-simple resourcet tagged text time
-         transformers unliftio unordered-containers
-       ];
-       description = "Type-safe EDSL for SQL queries on persistent backends";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "esqueleto_3_3_1_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring
      , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql
      , mysql-simple, persistent, persistent-mysql, persistent-postgresql
@@ -80350,7 +74891,6 @@ self: {
        ];
        description = "Type-safe EDSL for SQL queries on persistent backends";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ess" = callPackage
@@ -80362,8 +74902,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "The type-level S combinator in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "essence-of-live-coding" = callPackage
@@ -80386,8 +74924,6 @@ self: {
        ];
        description = "General purpose live coding framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "essence-of-live-coding-gloss" = callPackage
@@ -80403,8 +74939,6 @@ self: {
        ];
        description = "General purpose live coding framework - Gloss backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "essence-of-live-coding-pulse" = callPackage
@@ -80420,8 +74954,6 @@ self: {
        ];
        description = "General purpose live coding framework - pulse backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "essence-of-live-coding-quickcheck" = callPackage
@@ -80438,8 +74970,6 @@ self: {
        ];
        description = "General purpose live coding framework - QuickCheck integration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "estimator" = callPackage
@@ -80470,8 +75000,6 @@ self: {
        ];
        description = "Tool for managing probability estimation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "estreps" = callPackage
@@ -80488,8 +75016,6 @@ self: {
        ];
        description = "Repeats from ESTs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "etc" = callPackage
@@ -80542,8 +75068,6 @@ self: {
        ];
        description = "everything breaking the Fairbairn threshold";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eternity" = callPackage
@@ -80564,8 +75088,6 @@ self: {
        ];
        description = "Native event-sourcing database";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eternity-timestamped" = callPackage
@@ -80583,8 +75105,6 @@ self: {
        ];
        description = "Automatic timestamping for Eternity";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ether" = callPackage
@@ -80613,8 +75133,6 @@ self: {
        ];
        description = "Monad transformers and classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ethereum-analyzer" = callPackage
@@ -80638,8 +75156,6 @@ self: {
        ];
        description = "A Ethereum contract analyzer";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ethereum-analyzer-cli" = callPackage
@@ -80667,8 +75183,6 @@ self: {
        ];
        description = "A CLI frontend for ethereum-analyzer";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ethereum-analyzer-deps" = callPackage
@@ -80714,8 +75228,6 @@ self: {
        ];
        description = "A web frontend for ethereum-analyzer";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ethereum-client-haskell" = callPackage
@@ -80744,8 +75256,6 @@ self: {
        ];
        description = "A Haskell version of an Ethereum client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ethereum-merkle-patricia-db" = callPackage
@@ -80770,8 +75280,6 @@ self: {
        ];
        description = "A modified Merkle Patricia DB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ethereum-rlp" = callPackage
@@ -80806,8 +75314,6 @@ self: {
        ];
        description = "Ethereum Recursive Length Prefix Encoding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ety" = callPackage
@@ -80869,8 +75375,6 @@ self: {
        ];
        description = "Euler tour trees";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "euphoria" = callPackage
@@ -80895,8 +75399,6 @@ self: {
        ];
        description = "Dynamic network FRP with events and continuous values";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eurofxref" = callPackage
@@ -80914,8 +75416,6 @@ self: {
        ];
        description = "Free foreign exchange/currency feed from the European Central Bank";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "evdev" = callPackage
@@ -80926,8 +75426,8 @@ self: {
      }:
      mkDerivation {
        pname = "evdev";
-       version = "1.2.0.0";
-       sha256 = "1sjpqnf6gb8mb4n4sf8d60byx5s0vjpwhp7n0lkf2ikckwlc7y73";
+       version = "1.2.0.1";
+       sha256 = "05l1vvjyc77gjzyswlwnqkicldbdl7wj05z6wz8w8najys16z7s7";
        libraryHaskellDepends = [
          base bytestring containers either extra hinotify monad-loops paths
          posix-paths process rawfilepath safe streamly streamly-fsnotify
@@ -80938,8 +75438,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to libevdev";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {evdev = null; inherit (pkgs) libevdev;};
 
   "eve" = callPackage
@@ -80958,8 +75456,6 @@ self: {
        ];
        description = "An extensible event framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eve-cli" = callPackage
@@ -80976,8 +75472,6 @@ self: {
        ];
        testHaskellDepends = [ base bytestring eve lens mtl text vty ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "event" = callPackage
@@ -80991,8 +75485,6 @@ self: {
        ];
        description = "Monoidal, monadic and first-class events";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "event-driven" = callPackage
@@ -81004,8 +75496,6 @@ self: {
        libraryHaskellDepends = [ base monads-tf yjtools ];
        description = "library for event driven programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "event-handlers" = callPackage
@@ -81052,8 +75542,6 @@ self: {
        ];
        description = "Event-graph simulation monad transformer";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "event-transformer" = callPackage
@@ -81114,8 +75602,6 @@ self: {
        ];
        description = "Library for eventful DynamoDB event stores";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eventful-memory" = callPackage
@@ -81157,8 +75643,6 @@ self: {
        ];
        description = "Postgres implementations for eventful";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eventful-sql-common" = callPackage
@@ -81236,8 +75720,6 @@ self: {
        executableHaskellDepends = [ aeson base filepath text ];
        description = "Visualise an eventlog";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eventloop" = callPackage
@@ -81297,8 +75779,6 @@ self: {
        ];
        description = "GetEventStore store implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eventsource-store-specs" = callPackage
@@ -81315,8 +75795,6 @@ self: {
        ];
        description = "Provides common test specification for Store implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eventsource-stub-store" = callPackage
@@ -81338,8 +75816,6 @@ self: {
        ];
        description = "An in-memory stub store implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "eventsourced" = callPackage
@@ -81396,8 +75872,6 @@ self: {
        description = "EventStore TCP Client";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "every" = callPackage
@@ -81420,8 +75894,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "A functional pearl on encoding and decoding using question-and-answer strategies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ewe" = callPackage
@@ -81481,8 +75953,6 @@ self: {
        testHaskellDepends = [ base containers tasty tasty-hunit ];
        description = "Efficient exact cover solver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exact-pi" = callPackage
@@ -81520,8 +75990,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Exact real arithmetic";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exact-real-positional" = callPackage
@@ -81533,8 +76001,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Framework for Exact Real Arithmetic in the Positional Number System";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "except-exceptions" = callPackage
@@ -81548,8 +76014,6 @@ self: {
        libraryHaskellDepends = [ base exceptions transformers ];
        description = "Safely deal with exceptions in ExceptT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exception-hierarchy" = callPackage
@@ -81561,8 +76025,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Exception type hierarchy with TemplateHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exception-mailer" = callPackage
@@ -81589,8 +76051,6 @@ self: {
        ];
        description = "Exception monad transformer instances for monads-fd classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exception-monads-tf" = callPackage
@@ -81712,8 +76172,6 @@ self: {
        ];
        description = "A Haskell client for https://exchangeratesapi.io/";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "execs" = callPackage
@@ -81728,8 +76186,6 @@ self: {
        executableHaskellDepends = [ base directory process text ];
        description = "Tool to run stack exec prj-exe more easy";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "executable-hash" = callPackage
@@ -81777,8 +76233,6 @@ self: {
        testHaskellDepends = [ async base doctest hspec process ];
        description = "Shell helpers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exference" = callPackage
@@ -81809,8 +76263,6 @@ self: {
        ];
        description = "Tool to search/generate (haskell) expressions with a given type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exhaustive" = callPackage
@@ -81849,8 +76301,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Exheres generator for cabal packages";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exif" = callPackage
@@ -81863,8 +76313,6 @@ self: {
        librarySystemDepends = [ exif ];
        description = "A Haskell binding to a subset of libexif";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) exif;};
 
   "exinst" = callPackage
@@ -81954,8 +76402,6 @@ self: {
        libraryHaskellDepends = [ base constraints deepseq exinst ];
        description = "Derive instances for the `deepseq` library for your existential types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exinst-hashable" = callPackage
@@ -81969,8 +76415,6 @@ self: {
        ];
        description = "Derive instances for the `hashable` library for your existential types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exinst-serialise" = callPackage
@@ -82015,8 +76459,6 @@ self: {
        ];
        description = "Instances for \"exist\" package (requires more language extensions and dependencies)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "existential" = callPackage
@@ -82050,8 +76492,6 @@ self: {
        libraryHaskellDepends = [ base contravariant ];
        description = "Existential datatypes holding evidence of constraints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exit-codes" = callPackage
@@ -82083,8 +76523,6 @@ self: {
        ];
        description = "Monad transformer for exit codes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exomizer" = callPackage
@@ -82167,8 +76605,6 @@ self: {
        ];
        description = "Extensible Pandoc";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "expat-enumerator" = callPackage
@@ -82184,8 +76620,6 @@ self: {
        ];
        description = "Enumerator-based API for Expat";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "expiring-cache-map" = callPackage
@@ -82227,8 +76661,6 @@ self: {
        ];
        description = "Expiring containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "expiring-mvar" = callPackage
@@ -82255,8 +76687,6 @@ self: {
        ];
        description = "Show how expressions are parsed";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "explicit-constraint-lens" = callPackage
@@ -82271,8 +76701,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Fully-flexible polymorphic lenses, without any bizarre profunctors";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "explicit-determinant" = callPackage
@@ -82284,8 +76712,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "explicit computation of determinant of small matrices";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "explicit-exception" = callPackage
@@ -82310,8 +76736,6 @@ self: {
        libraryHaskellDepends = [ base base-unicode-symbols tagged ];
        description = "File handles with explicit IOModes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "explicit-iomodes-bytestring" = callPackage
@@ -82323,8 +76747,6 @@ self: {
        libraryHaskellDepends = [ base bytestring explicit-iomodes ];
        description = "Extends explicit-iomodes with ByteString operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "explicit-iomodes-text" = callPackage
@@ -82336,8 +76758,6 @@ self: {
        libraryHaskellDepends = [ base explicit-iomodes text ];
        description = "Extends explicit-iomodes with Text operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "explicit-sharing" = callPackage
@@ -82351,8 +76771,6 @@ self: {
        ];
        description = "Explicit Sharing of Monadic Effects";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "explore" = callPackage
@@ -82366,8 +76784,6 @@ self: {
        executableHaskellDepends = [ array base directory pngload ];
        description = "Experimental Plot data Reconstructor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "exposed-containers" = callPackage
@@ -82388,8 +76804,6 @@ self: {
        ];
        description = "A distribution of the 'containers' package, with all modules exposed";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "express" = callPackage
@@ -82449,8 +76863,6 @@ self: {
        ];
        description = "Encode and Decode expressions from Z3 ASTs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "expresso" = callPackage
@@ -82496,8 +76908,6 @@ self: {
        ];
        description = "Libraries for processing GHC Core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "extemp" = callPackage
@@ -82520,8 +76930,6 @@ self: {
        ];
        description = "automated printing for extemp speakers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "extend-record-data-th" = callPackage
@@ -82545,8 +76953,6 @@ self: {
        libraryHaskellDepends = [ base constraints ghc-prim tagged ];
        description = "Extended Categories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "extended-reals" = callPackage
@@ -82577,8 +76983,8 @@ self: {
      }:
      mkDerivation {
        pname = "extensible";
-       version = "0.7";
-       sha256 = "1nil9qvgrbd42hv198msm7apma67m9dqi5cqgfvjgfcgdms46dk2";
+       version = "0.7.1";
+       sha256 = "1vmn2ziv8qnw22pkfy1c80hym7cprv70xz0mqi5076glwdjkx3gr";
        libraryHaskellDepends = [
          aeson base bytestring cassava comonad constraints deepseq ghc-prim
          hashable membership monad-skeleton prettyprinter primitive
@@ -82603,8 +77009,6 @@ self: {
        ];
        description = "Sums/products/lists/trees which can be extended in other modules";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "extensible-effects" = callPackage
@@ -82662,8 +77066,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Message passing concurrency as extensible-effect";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "extensible-exceptions" = callPackage
@@ -82693,8 +77095,6 @@ self: {
        testHaskellDepends = [ base extensible ];
        description = "Operational-based extensible effect library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "extensible-sp" = callPackage
@@ -82727,8 +77127,8 @@ self: {
      }:
      mkDerivation {
        pname = "extra";
-       version = "1.6.18";
-       sha256 = "0jvd4l0hi8pf5899pxc32yc638y0mrc357w0rph99k3hm277i0cy";
+       version = "1.6.19";
+       sha256 = "009k43i24aa9zs3hvzs6lr0knkgqv19fil4r15mwxyaca8kg52xv";
        libraryHaskellDepends = [
          base clock directory filepath process semigroups time unix
        ];
@@ -82737,6 +77137,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "extra_1_6_20" = callPackage
+    ({ mkDerivation, base, clock, directory, filepath, process
+     , QuickCheck, semigroups, time, unix
+     }:
+     mkDerivation {
+       pname = "extra";
+       version = "1.6.20";
+       sha256 = "0bx0km3sc3irgpvz1ky334pr1fr88y2mkkniadzpn2pcrb9lxshr";
+       libraryHaskellDepends = [
+         base clock directory filepath process semigroups time unix
+       ];
+       testHaskellDepends = [ base directory filepath QuickCheck unix ];
+       description = "Extra functions I use";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "extract-dependencies" = callPackage
     ({ mkDerivation, async, base, Cabal, containers
      , package-description-remote
@@ -82755,8 +77172,6 @@ self: {
        ];
        description = "Given a hackage package outputs the list of its dependencies";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "extractable-singleton" = callPackage
@@ -82786,8 +77201,6 @@ self: {
        ];
        description = "Extract an ELF's metadata and sections into files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "extralife" = callPackage
@@ -82803,25 +77216,9 @@ self: {
        ];
        description = "API Client for ExtraLife team and user data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "extrapolate" = callPackage
-    ({ mkDerivation, base, leancheck, speculate, template-haskell }:
-     mkDerivation {
-       pname = "extrapolate";
-       version = "0.3.3";
-       sha256 = "1mc14d9wcrvrd2fkzjxc5gvy7s33p875qj97bdaacdjv5hmg5zr2";
-       libraryHaskellDepends = [
-         base leancheck speculate template-haskell
-       ];
-       testHaskellDepends = [ base leancheck speculate ];
-       description = "generalize counter-examples of test properties";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "extrapolate_0_4_1" = callPackage
     ({ mkDerivation, base, express, leancheck, speculate
      , template-haskell
      }:
@@ -82835,7 +77232,6 @@ self: {
        testHaskellDepends = [ base express leancheck speculate ];
        description = "generalize counter-examples of test properties";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ez-couch" = callPackage
@@ -82859,8 +77255,6 @@ self: {
        ];
        description = "A high level static library for working with CouchDB";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ez3" = callPackage
@@ -82874,8 +77268,6 @@ self: {
        libraryHaskellDepends = [ base transformers z3 ];
        description = "Z3 bonds with pure interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "f-algebra-gen" = callPackage
@@ -82902,8 +77294,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Spam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "faceted" = callPackage
@@ -82915,8 +77305,6 @@ self: {
        libraryHaskellDepends = [ base free ];
        description = "Faceted computation for dynamic information flow security";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "factory" = callPackage
@@ -82942,8 +77330,6 @@ self: {
        ];
        description = "Rational arithmetic in an irrational world";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "facts" = callPackage
@@ -82974,8 +77360,6 @@ self: {
        ];
        description = "A driver for the Factual API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fad" = callPackage
@@ -83009,8 +77393,6 @@ self: {
        ];
        description = "Minimal library for music generation and notation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fadno-braids" = callPackage
@@ -83027,8 +77409,6 @@ self: {
        ];
        description = "Braid representations in Haskell";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fadno-xml" = callPackage
@@ -83043,8 +77423,6 @@ self: {
        ];
        description = "XML/XSD combinators/schemas/codegen";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fail" = callPackage
@@ -83078,8 +77456,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A list-like type for lazy streams, which might terminate with an error";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "failure" = callPackage
@@ -83107,8 +77483,6 @@ self: {
        ];
        description = "Failure Detectors implimented in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fair" = callPackage
@@ -83164,34 +77538,9 @@ self: {
        librarySystemDepends = [ libXtst ];
        description = "A crossplatform library to simulate keyboard input";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs.xorg) libXtst;};
 
   "fakedata" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory
-     , exceptions, filepath, hspec, hspec-discover, random
-     , template-haskell, text, time, vector, yaml
-     }:
-     mkDerivation {
-       pname = "fakedata";
-       version = "0.2.2";
-       sha256 = "11gsshxd23inh6lb3rbs0fkmh83ivffxdlcqrxsfi0ymdmzha3rr";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring containers directory exceptions filepath random
-         template-haskell text time vector yaml
-       ];
-       testHaskellDepends = [
-         base bytestring containers directory exceptions filepath hspec
-         hspec-discover random template-haskell text time vector yaml
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Library for producing fake data";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fakedata_0_5_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, directory
      , exceptions, filepath, gauge, hashable, hspec, hspec-discover
      , random, template-haskell, text, time, unordered-containers
@@ -83219,6 +77568,36 @@ self: {
        ];
        description = "Library for producing fake data";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "fakedata_0_6_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, directory
+     , exceptions, filepath, gauge, hashable, hspec, hspec-discover
+     , random, template-haskell, text, time, unordered-containers
+     , vector, yaml
+     }:
+     mkDerivation {
+       pname = "fakedata";
+       version = "0.6.0";
+       sha256 = "0rwj9l2m2w688cp505y77g7q67l57gs8fh429mgnygwzvp7s7z0r";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring containers directory exceptions filepath hashable
+         random template-haskell text time unordered-containers vector yaml
+       ];
+       testHaskellDepends = [
+         base bytestring containers directory exceptions filepath hashable
+         hspec hspec-discover random template-haskell text time
+         unordered-containers vector yaml
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         base bytestring containers deepseq directory exceptions filepath
+         gauge hashable random template-haskell text time
+         unordered-containers vector yaml
+       ];
+       description = "Library for producing fake data";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -83266,8 +77645,17 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Faktory Worker for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+     }) {};
+
+  "fallible" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "fallible";
+       version = "0.1.0";
+       sha256 = "0jj806klxagv65ddxb85gdy89m46p4yqxr9y5s5gc4arb5xzlwjq";
+       libraryHaskellDepends = [ base transformers ];
+       testHaskellDepends = [ base transformers ];
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "falling-turnip" = callPackage
@@ -83287,8 +77675,6 @@ self: {
        ];
        description = "Falling sand game/cellular automata simulation using regular parallel arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fallingblocks" = callPackage
@@ -83307,8 +77693,6 @@ self: {
        ];
        description = "A fun falling blocks game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "familiar-reflection" = callPackage
@@ -83336,8 +77720,6 @@ self: {
        ];
        description = "A family tree library for the Haskell programming language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "farmhash" = callPackage
@@ -83367,8 +77749,6 @@ self: {
        doHaddock = false;
        description = "Fast functions on integers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fast-builder" = callPackage
@@ -83407,29 +77787,9 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Fast combinatorics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fast-digits" = callPackage
-    ({ mkDerivation, base, criterion, digits, integer-gmp, QuickCheck
-     , smallcheck, tasty, tasty-quickcheck, tasty-smallcheck
-     }:
-     mkDerivation {
-       pname = "fast-digits";
-       version = "0.2.1.0";
-       sha256 = "0fyqdlb5wmsbsxsk8s7p8j2g3g4idsv9ki67ay1dw0lj8xp5g17c";
-       libraryHaskellDepends = [ base integer-gmp ];
-       testHaskellDepends = [
-         base digits QuickCheck smallcheck tasty tasty-quickcheck
-         tasty-smallcheck
-       ];
-       benchmarkHaskellDepends = [ base criterion digits ];
-       description = "The fast library for integer-to-digits conversion";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "fast-digits_0_3_0_0" = callPackage
     ({ mkDerivation, base, digits, gauge, integer-gmp, QuickCheck
      , smallcheck, tasty, tasty-quickcheck, tasty-smallcheck
      }:
@@ -83446,7 +77806,6 @@ self: {
        doHaddock = false;
        description = "Integer-to-digits conversion";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fast-downward" = callPackage
@@ -83471,10 +77830,8 @@ self: {
      }:
      mkDerivation {
        pname = "fast-logger";
-       version = "2.4.17";
-       sha256 = "02mxb1ckvx1s2r2m11l5i2l5rdl7232p0f61af6773haykjp0qxk";
-       revision = "1";
-       editedCabalFile = "1yv4f6pbrgqqhc0z3chhjrzz1gs7idrmcbvmbl8pfyn547ci6brb";
+       version = "3.0.1";
+       sha256 = "0fx5viyc0j4286nbnzfk9x7mqs93s1bcnawcywifsqiq9ajhq225";
        libraryHaskellDepends = [
          array auto-update base bytestring directory easy-file filepath text
          unix-compat unix-time
@@ -83485,26 +77842,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "fast-logger_3_0_0" = callPackage
-    ({ mkDerivation, array, auto-update, base, bytestring, directory
-     , easy-file, filepath, hspec, hspec-discover, text, unix-compat
-     , unix-time
-     }:
-     mkDerivation {
-       pname = "fast-logger";
-       version = "3.0.0";
-       sha256 = "0jgzl4gsxb2xf51k2n8m19db3mk4l9pppir2h7cckdr596zy3x83";
-       libraryHaskellDepends = [
-         array auto-update base bytestring directory easy-file filepath text
-         unix-compat unix-time
-       ];
-       testHaskellDepends = [ base bytestring directory hspec ];
-       testToolDepends = [ hspec-discover ];
-       description = "A fast logging system";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "fast-math" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -83536,8 +77873,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Natural Numbers with no overhead";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fast-tags" = callPackage
@@ -83607,8 +77942,6 @@ self: {
        ];
        description = "A simple, mindless parser for fasta files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fastbayes" = callPackage
@@ -83620,8 +77953,6 @@ self: {
        libraryHaskellDepends = [ base hmatrix vector ];
        description = "Bayesian modeling algorithms accelerated for particular model structures";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fastcgi" = callPackage
@@ -83655,8 +77986,6 @@ self: {
        ];
        description = "find nearest neighbours by edit-distance";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fastirc" = callPackage
@@ -83673,8 +78002,6 @@ self: {
        ];
        description = "Fast Internet Relay Chat (IRC) library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fastly" = callPackage
@@ -83694,8 +78021,6 @@ self: {
        testHaskellDepends = [ base hspec text ];
        description = "A highly experimental Fastly API client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fastparser" = callPackage
@@ -83765,8 +78090,6 @@ self: {
        ];
        description = "Utilities for working with DuckDuckHack's FatHead Instant Answers";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fault-tree" = callPackage
@@ -83778,8 +78101,6 @@ self: {
        libraryHaskellDepends = [ base yices ];
        description = "A fault tree analysis library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay" = callPackage
@@ -83810,8 +78131,6 @@ self: {
        executableHaskellDepends = [ base mtl optparse-applicative split ];
        description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-base" = callPackage
@@ -83824,8 +78143,6 @@ self: {
        libraryHaskellDepends = [ base fay ];
        description = "The base package for Fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-builder" = callPackage
@@ -83843,8 +78160,6 @@ self: {
        ];
        description = "Compile Fay code on cabal install, and ad-hoc recompile during development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-dom" = callPackage
@@ -83859,8 +78174,6 @@ self: {
        libraryHaskellDepends = [ fay-base ];
        description = "DOM FFI wrapper library for Fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-geoposition" = callPackage
@@ -83873,8 +78186,6 @@ self: {
        libraryHaskellDepends = [ fay-base fay-text ];
        description = "W3C compliant implementation of GeoPosition API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-hsx" = callPackage
@@ -83887,8 +78198,6 @@ self: {
        libraryHaskellDepends = [ fay-base fay-jquery ];
        description = "Clientside HTML generation for fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-jquery" = callPackage
@@ -83901,8 +78210,6 @@ self: {
        libraryHaskellDepends = [ fay-base fay-text ];
        description = "jQuery bindings for Fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-ref" = callPackage
@@ -83915,8 +78222,6 @@ self: {
        libraryHaskellDepends = [ fay-base ];
        description = "Like IORef but for Fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-simplejson" = callPackage
@@ -83929,8 +78234,6 @@ self: {
        libraryHaskellDepends = [ fay-base ];
        description = "SimpleJSON library for Fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-text" = callPackage
@@ -83945,8 +78248,6 @@ self: {
        libraryHaskellDepends = [ fay fay-base text ];
        description = "Fay Text type represented as JavaScript strings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-uri" = callPackage
@@ -83959,8 +78260,6 @@ self: {
        libraryHaskellDepends = [ fay-base ];
        description = "Persistent FFI bindings for using jsUri in Fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fay-websockets" = callPackage
@@ -83973,8 +78272,6 @@ self: {
        libraryHaskellDepends = [ fay-base ];
        description = "Websockets FFI library for Fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fb" = callPackage
@@ -84012,8 +78309,6 @@ self: {
        libraryHaskellDepends = [ base cereal fb persistent text time ];
        description = "Provides Persistent instances to Facebook types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fbmessenger-api" = callPackage
@@ -84042,8 +78337,6 @@ self: {
        testHaskellDepends = [ aeson base bytestring filepath hspec text ];
        description = "High-level bindings to Facebook Messenger Platform API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fca" = callPackage
@@ -84060,8 +78353,6 @@ self: {
        ];
        description = "Algo for Formal Concept Analysis";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fcache" = callPackage
@@ -84078,8 +78369,6 @@ self: {
        testHaskellDepends = [ base hspec mtl ];
        description = "Cache a function (a -> b)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fcd" = callPackage
@@ -84099,16 +78388,14 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "A faster way to navigate directories using the command line";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fcf-containers" = callPackage
     ({ mkDerivation, base, doctest, first-class-families, Glob }:
      mkDerivation {
        pname = "fcf-containers";
-       version = "0.2.0";
-       sha256 = "02ymhc7ms6k7ms966px8a4zhgsd71ncyb4c08b0x51n6v442cwmh";
+       version = "0.4.0";
+       sha256 = "1qdcp2mympq8w49j9dfrl5sdkyhiyg3p8nr8568x12ham0jpar9l";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base first-class-families ];
@@ -84128,8 +78415,6 @@ self: {
        isExecutable = true;
        description = "TBA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fckeditor" = callPackage
@@ -84141,8 +78426,6 @@ self: {
        libraryHaskellDepends = [ base cgi HaXml xhtml ];
        description = "Server-Side Integration for FCKeditor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fclabels" = callPackage
@@ -84173,8 +78456,6 @@ self: {
        libraryHaskellDepends = [ base fclabels monadLib ];
        description = "MonadLib monadic interface for the \"fclabels\" package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fcm-client" = callPackage
@@ -84237,8 +78518,6 @@ self: {
        ];
        description = "Utilities related to freedesktop Trash standard";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "feather" = callPackage
@@ -84279,8 +78558,6 @@ self: {
        ];
        description = "A minimally obtrusive feature flag library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "feature-flipper-postgres" = callPackage
@@ -84302,8 +78579,6 @@ self: {
        ];
        description = "A minimally obtrusive feature flag library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fec" = callPackage
@@ -84318,17 +78593,6 @@ self: {
      }) {};
 
   "fedora-dists" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "fedora-dists";
-       version = "1.0.1";
-       sha256 = "107ykp3f1f35ghlxfv53mxl0wmj1jyr7xnil16gyg6gcyi0shbll";
-       libraryHaskellDepends = [ base ];
-       description = "Library for Fedora distribution versions";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "fedora-dists_1_1_2" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "fedora-dists";
@@ -84337,7 +78601,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Library for Fedora distribution versions";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fedora-haskell-tools" = callPackage
@@ -84357,8 +78620,6 @@ self: {
        ];
        description = "Building and maintenance tools for Fedora Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fedora-img-dl" = callPackage
@@ -84379,8 +78640,6 @@ self: {
        ];
        description = "Fedora image download tool";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fedora-packages" = callPackage
@@ -84403,8 +78662,6 @@ self: {
        ];
        description = "Haskell interface to the Fedora Packages webapp API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fee-estimate" = callPackage
@@ -84423,30 +78680,6 @@ self: {
      }) {};
 
   "feed" = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, HUnit
-     , markdown-unlit, old-locale, old-time, safe, test-framework
-     , test-framework-hunit, text, time, time-locale-compat, utf8-string
-     , xml-conduit, xml-types
-     }:
-     mkDerivation {
-       pname = "feed";
-       version = "1.2.0.1";
-       sha256 = "004lwdng4slj6yl8mgscr3cgj0zzc8hzkf4450dby2l6cardg4w0";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base base-compat bytestring old-locale old-time safe text time
-         time-locale-compat utf8-string xml-conduit xml-types
-       ];
-       testHaskellDepends = [
-         base base-compat HUnit old-time test-framework test-framework-hunit
-         text time xml-conduit xml-types
-       ];
-       testToolDepends = [ markdown-unlit ];
-       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "feed_1_3_0_0" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, HUnit
      , markdown-unlit, old-locale, old-time, safe, syb, test-framework
      , test-framework-hunit, text, time, time-locale-compat, utf8-string
@@ -84468,7 +78701,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feed-cli" = callPackage
@@ -84487,8 +78719,6 @@ self: {
        ];
        description = "A simple command line interface for creating and updating feeds like RSS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "feed-collect" = callPackage
@@ -84506,8 +78736,6 @@ self: {
        ];
        description = "Watch RSS/Atom feeds (and do with them whatever you like)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "feed-crawl" = callPackage
@@ -84524,8 +78752,6 @@ self: {
        ];
        description = "Utility for fetching feeds with redirect info and HTML link detection";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "feed-gipeda" = callPackage
@@ -84564,8 +78790,6 @@ self: {
        ];
        description = "CI service around gipeda";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "feed-translator" = callPackage
@@ -84587,8 +78811,6 @@ self: {
        ];
        description = "Translate syndication feeds";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "feed2lj" = callPackage
@@ -84607,8 +78829,6 @@ self: {
        ];
        description = "(unsupported)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "feed2twitter" = callPackage
@@ -84625,8 +78845,6 @@ self: {
        ];
        description = "Send posts from a feed to Twitter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fei-base" = callPackage
@@ -84652,8 +78870,6 @@ self: {
        executableSystemDepends = [ mxnet ];
        description = "FFI to MXNet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) mxnet;};
 
   "fei-cocoapi" = callPackage
@@ -84682,8 +78898,6 @@ self: {
        ];
        description = "Cocodataset with cocoapi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fei-dataiter" = callPackage
@@ -84710,8 +78924,6 @@ self: {
        testHaskellDepends = [ base fei-base hspec streaming ];
        description = "mxnet dataiters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) mxnet;};
 
   "fei-examples" = callPackage
@@ -84733,8 +78945,6 @@ self: {
        ];
        description = "fei examples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fei-nn" = callPackage
@@ -84760,8 +78970,6 @@ self: {
        ];
        description = "Train a neural network with MXNet in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "feldspar-compiler" = callPackage
@@ -84790,8 +78998,6 @@ self: {
        ];
        description = "Compiler for the Feldspar language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gcc_s = null;};
 
   "feldspar-language" = callPackage
@@ -84815,8 +79021,6 @@ self: {
        ];
        description = "A functional embedded language for DSP and parallelism";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "feldspar-signal" = callPackage
@@ -84889,8 +79093,6 @@ self: {
        executableSystemDepends = [ raptor ];
        description = "Graph-based notetaking system";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {raptor = null;};
 
   "fernet" = callPackage
@@ -84916,8 +79118,6 @@ self: {
        ];
        description = "Generate and verify HMAC-based authentication tokens";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "festung" = callPackage
@@ -84948,8 +79148,6 @@ self: {
        ];
        description = "Remote multi-db SQLCipher server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fez-conf" = callPackage
@@ -84975,8 +79173,6 @@ self: {
        executableHaskellDepends = [ base pretty ];
        description = "Haskell binding to the FriendFeed API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fficxx" = callPackage
@@ -85033,8 +79229,6 @@ self: {
        ];
        description = "Minimal bindings to the FFmpeg library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) ffmpeg; libavcodec = null; libavdevice = null; 
          libavformat = null; libswscale = null;};
 
@@ -85052,8 +79246,6 @@ self: {
        ];
        description = "Tutorials on ffmpeg usage to play video/audio";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fft" = callPackage
@@ -85102,8 +79294,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "FFunctor typeclass";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fgl" = callPackage
@@ -85144,8 +79334,6 @@ self: {
        libraryHaskellDepends = [ base containers fgl ];
        description = "Graph decomposition algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fgl-visualize" = callPackage
@@ -85191,8 +79379,6 @@ self: {
        ];
        description = "Tools for running and analyzing Haskell benchmarks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fibonacci" = callPackage
@@ -85224,8 +79410,6 @@ self: {
        ];
        description = "update statically hosted file in a push stule through socketed";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fields" = callPackage
@@ -85241,8 +79425,6 @@ self: {
        ];
        description = "First-class record field combinators with infix record field syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fields-json" = callPackage
@@ -85270,8 +79452,6 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Provides Fieldwise typeclass for operations of fields of records treated as independent components";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fig" = callPackage
@@ -85283,8 +79463,6 @@ self: {
        libraryHaskellDepends = [ base containers parsec pretty ];
        description = "Manipulation of FIG files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "file-collection" = callPackage
@@ -85298,8 +79476,6 @@ self: {
        ];
        description = "Provide a uniform interface over file archives and directories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "file-command-qq" = callPackage
@@ -85315,8 +79491,6 @@ self: {
        ];
        description = "Quasiquoter for system commands involving filepaths";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "file-embed" = callPackage
@@ -85387,8 +79561,6 @@ self: {
        testHaskellDepends = [ base lifted-base process ];
        description = "common functions that show file location information";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "file-modules" = callPackage
@@ -85469,8 +79641,6 @@ self: {
        ];
        description = "Diffing and patching module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "filelock" = callPackage
@@ -85509,8 +79679,6 @@ self: {
        libraryHaskellDepends = [ base hinotify stm ];
        description = "Block thread until a file stops being modified";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "filepath_1_4_2_1" = callPackage
@@ -85568,8 +79736,6 @@ self: {
        libraryHaskellDepends = [ base base-io-access filepath ];
        description = "IO Access for filepath";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "filepather" = callPackage
@@ -85586,8 +79752,6 @@ self: {
        ];
        description = "Functions on System.FilePath";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "filepattern" = callPackage
@@ -85637,8 +79801,6 @@ self: {
        ];
        description = "Interface for versioning file stores";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "filesystem-abstractions" = callPackage
@@ -85677,8 +79839,6 @@ self: {
        ];
        description = "Use system-filepath data types with conduits. (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "filesystem-enumerator" = callPackage
@@ -85694,8 +79854,6 @@ self: {
        ];
        description = "Enumerator-based API for manipulating the filesystem";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "filesystem-trees" = callPackage
@@ -85712,8 +79870,6 @@ self: {
        ];
        description = "Recursively manipulate and traverse filesystems as lazy rose trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fillit" = callPackage
@@ -85730,8 +79886,6 @@ self: {
        testHaskellDepends = [ base doctest hspec unordered-containers ];
        description = "Flexible string substitution";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "filter-logger" = callPackage
@@ -85804,8 +79958,6 @@ self: {
        ];
        description = "Extensible pretty printing with semantic annotations and proportional fonts";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "find-clumpiness" = callPackage
@@ -85831,8 +79983,6 @@ self: {
        ];
        description = "Find the clumpiness of labels in a tree";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "find-conduit" = callPackage
@@ -85867,8 +80017,6 @@ self: {
        ];
        description = "A file-finding conduit that allows user control over traversals";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "find-source-files" = callPackage
@@ -85880,8 +80028,6 @@ self: {
        libraryHaskellDepends = [ base Cabal directory filepath mtl ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "findhttp" = callPackage
@@ -85900,8 +80046,6 @@ self: {
        ];
        description = "List http/html files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fingertree" = callPackage
@@ -85930,8 +80074,6 @@ self: {
        libraryHaskellDepends = [ base fingertree ];
        description = "Implementation of priority search queues as finger trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fingertree-tf" = callPackage
@@ -85943,8 +80085,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Generic finger-tree structure using type families";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "finitary" = callPackage
@@ -85967,8 +80107,6 @@ self: {
        ];
        description = "A better, more type-safe Enum";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "finitary-derive" = callPackage
@@ -85992,8 +80130,6 @@ self: {
        ];
        description = "Flexible and easy deriving of type classes for finitary types";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "finite-field" = callPackage
@@ -86029,6 +80165,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "finito" = callPackage
+    ({ mkDerivation, base, numeric-domains, propeller, split
+     , transformers
+     }:
+     mkDerivation {
+       pname = "finito";
+       version = "0.1.0.0";
+       sha256 = "1z1s5jxkyr1yw0iaijx415ql4i2bp1jdqjs9irwbd28c4myq4byf";
+       libraryHaskellDepends = [
+         base numeric-domains propeller transformers
+       ];
+       testHaskellDepends = [
+         base numeric-domains propeller split transformers
+       ];
+       description = "Constraint Solver for Finite Domains";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "firebase-database" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
      , generic-random, HsOpenSSL, hspec, http-client, http-client-tls
@@ -86088,8 +80242,6 @@ self: {
        ];
        description = "A simple example using Firefly";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "first-and-last" = callPackage
@@ -86102,23 +80254,9 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "First and Last generalized to return up to n values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "first-class-families" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "first-class-families";
-       version = "0.5.0.0";
-       sha256 = "03skw4axj6zk593zi8fwynzjyiq6s7apjqmjqv6rxpxhj17vqwpj";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base ];
-       description = "First class type families";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "first-class-families_0_7_0_0" = callPackage
     ({ mkDerivation, base, doctest, Glob }:
      mkDerivation {
        pname = "first-class-families";
@@ -86128,7 +80266,6 @@ self: {
        testHaskellDepends = [ base doctest Glob ];
        description = "First class type families";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "first-class-instances" = callPackage
@@ -86174,8 +80311,6 @@ self: {
        ];
        description = "Defunctionalisation for Yhc Core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fishfood" = callPackage
@@ -86199,8 +80334,6 @@ self: {
        ];
        description = "Calculates file-size frequency-distribution";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fit" = callPackage
@@ -86220,8 +80353,6 @@ self: {
        ];
        description = "FIT file decoder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fits-parse" = callPackage
@@ -86245,8 +80376,6 @@ self: {
        ];
        description = "Parse FITS files";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fitsio" = callPackage
@@ -86259,8 +80388,6 @@ self: {
        librarySystemDepends = [ cfitsio ];
        description = "A library for reading and writing data files in the FITS data format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) cfitsio;};
 
   "fitspec" = callPackage
@@ -86308,11 +80435,11 @@ self: {
        pname = "fix-parser-simple";
        version = "15320.3";
        sha256 = "0ls5fxwq2lnb0rjqih4isfwiv0603ga12gxnf7w3rpqp5qhrhas8";
+       revision = "1";
+       editedCabalFile = "0lvbym1xdwzkhvxa2qnjfqr159zysnmg8zmkz410hh6cmrb5qgr9";
        libraryHaskellDepends = [ base mmtl ];
        description = "Simple fix-expression parser";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fix-symbols-gitit" = callPackage
@@ -86324,8 +80451,6 @@ self: {
        libraryHaskellDepends = [ base containers gitit ];
        description = "Gitit plugin: Turn some Haskell symbols into pretty math symbols";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixed" = callPackage
@@ -86373,8 +80498,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Binary fixed-point arithmetic";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixed-point-vector" = callPackage
@@ -86386,8 +80509,6 @@ self: {
        libraryHaskellDepends = [ base fixed-point vector ];
        description = "Unbox instances for the fixed-point package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixed-point-vector-space" = callPackage
@@ -86399,8 +80520,6 @@ self: {
        libraryHaskellDepends = [ base fixed-point vector-space ];
        description = "vector-space instances for the fixed-point package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixed-precision" = callPackage
@@ -86416,8 +80535,6 @@ self: {
        ];
        description = "Fixed Precision Arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixed-storable-array" = callPackage
@@ -86429,8 +80546,6 @@ self: {
        libraryHaskellDepends = [ array base tagged ];
        description = "Fixed-size wrapper for StorableArray, providing a Storable instance. Deprecated - use storable-static-array instead.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixed-timestep" = callPackage
@@ -86442,8 +80557,6 @@ self: {
        libraryHaskellDepends = [ async base clock time ];
        description = "Pure Haskell library to repeat an action at a specific frequency";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixed-vector" = callPackage
@@ -86472,8 +80585,6 @@ self: {
        ];
        description = "Binary instances for fixed-vector";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixed-vector-cborg" = callPackage
@@ -86490,8 +80601,6 @@ self: {
        ];
        description = "Binary instances for fixed-vector";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixed-vector-cereal" = callPackage
@@ -86508,8 +80617,6 @@ self: {
        ];
        description = "Cereal instances for fixed-vector";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixed-vector-hetero" = callPackage
@@ -86532,8 +80639,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Fixed width subsets of an Int64/Word64";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixedprec" = callPackage
@@ -86589,8 +80694,6 @@ self: {
        ];
        description = "A Haskell client for http://fixer.io/";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixfile" = callPackage
@@ -86612,8 +80715,6 @@ self: {
        ];
        description = "File-backed recursive data structures";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixhs" = callPackage
@@ -86638,8 +80739,6 @@ self: {
        ];
        description = "FIX (co)parser";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixie" = callPackage
@@ -86661,8 +80760,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Opininated testing framework for mtl style (spies, stubs, and mocks)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fixplate" = callPackage
@@ -86723,8 +80820,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "test";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fizzbuzz-as-a-service" = callPackage
@@ -86742,8 +80837,6 @@ self: {
        ];
        description = "FizzBuzz as a service";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flac" = callPackage
@@ -86770,8 +80863,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Complete high-level binding to libFLAC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {FLAC = null;};
 
   "flac-picture" = callPackage
@@ -86790,8 +80881,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Support for writing picture to FLAC metadata blocks with JuicyPixels";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flaccuraterip" = callPackage
@@ -86836,8 +80925,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell text ];
        description = "A template engine for HTML";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flamingra" = callPackage
@@ -86854,8 +80941,6 @@ self: {
        ];
        description = "FlameGraphs of profiling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flat" = callPackage
@@ -86888,8 +80973,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Strict Maybe without space and indirection overhead";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flat-mcmc" = callPackage
@@ -86956,8 +81039,6 @@ self: {
        ];
        description = "Haskell implementation of the FlatBuffers protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flay" = callPackage
@@ -86998,8 +81079,6 @@ self: {
        libraryHaskellDepends = [ base bytestring unix-time ];
        description = "simple extension of Data.UnixTime.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flexible-unlit" = callPackage
@@ -87025,8 +81104,6 @@ self: {
        libraryHaskellDepends = [ base data-type mtl QuickCheck ];
        description = "Flexible wrappers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flexiwrap-smallcheck" = callPackage
@@ -87040,8 +81117,6 @@ self: {
        ];
        description = "SmallCheck (Serial) instances for flexiwrap";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flick-duration" = callPackage
@@ -87072,8 +81147,6 @@ self: {
        executableHaskellDepends = [ xhtml ];
        description = "Haskell binding to the Flickr API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flight-igc" = callPackage
@@ -87108,8 +81181,6 @@ self: {
        ];
        description = "Parsing of pilot tracklogs dumped as KML";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flip-cmd" = callPackage
@@ -87152,8 +81223,6 @@ self: {
        ];
        description = "f-lite compiler, interpreter and libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flo" = callPackage
@@ -87190,8 +81259,6 @@ self: {
        ];
        description = "C99 printf \"%a\" style formatting and parsing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "floating-bits" = callPackage
@@ -87205,8 +81272,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Conversions between floating and integral values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "floatshow" = callPackage
@@ -87271,8 +81336,6 @@ self: {
        ];
        description = "A flexible Haskell source code pretty printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flow" = callPackage
@@ -87297,8 +81360,6 @@ self: {
        testHaskellDepends = [ base doctest flow QuickCheck ];
        description = "More directional operators";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flow2dot" = callPackage
@@ -87316,8 +81377,6 @@ self: {
        ];
        description = "Library and binary to generate sequence/flow diagrams from plain text source";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flowdock" = callPackage
@@ -87337,8 +81396,6 @@ self: {
        ];
        description = "Flowdock client library for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flowdock-api" = callPackage
@@ -87375,8 +81432,6 @@ self: {
        ];
        description = "API integration with Flowdock";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flowdock-rest" = callPackage
@@ -87404,8 +81459,6 @@ self: {
        ];
        description = "Flowdock REST API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flower" = callPackage
@@ -87423,8 +81476,6 @@ self: {
        ];
        description = "Analyze 454 flowgrams (.SFF files)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flowlocks-framework" = callPackage
@@ -87437,8 +81488,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Generalized Flow Locks Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flowsim" = callPackage
@@ -87457,8 +81506,6 @@ self: {
        ];
        description = "Simulate 454 pyrosequencing";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "flp" = callPackage
@@ -87560,8 +81607,6 @@ self: {
        executableHaskellDepends = [ base bytestring fltkhs ];
        description = "Fltkhs Fluid Examples";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fltkhs-hello-world" = callPackage
@@ -87619,8 +81664,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "A structured logger for Fluentd (Haskell)";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fluent-logger-conduit" = callPackage
@@ -87737,8 +81780,6 @@ self: {
        librarySystemDepends = [ fluidsynth ];
        description = "Haskell bindings to FluidSynth";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) fluidsynth;};
 
   "flush-queue" = callPackage
@@ -87765,8 +81806,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A monoid for tracking changes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fmark" = callPackage
@@ -87784,8 +81823,6 @@ self: {
        ];
        description = "A Friendly Markup language without syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fmlist" = callPackage
@@ -87887,8 +81924,6 @@ self: {
        ];
        description = "Extras for Fn, a functional web framework";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "focus" = callPackage
@@ -88032,8 +82067,6 @@ self: {
        benchmarkHaskellDepends = [ base containers criterion foldl ];
        description = "incremental folds";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "foldl-statistics" = callPackage
@@ -88058,8 +82091,6 @@ self: {
        ];
        description = "Statistical functions from the statistics package implemented as Folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "foldl-transduce" = callPackage
@@ -88145,8 +82176,6 @@ self: {
        testHaskellDepends = [ base containers tasty tasty-quickcheck ];
        description = "A playground of common folds for folds";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "folgerhs" = callPackage
@@ -88193,8 +82222,6 @@ self: {
        ];
        description = "Haskell library to follow content published on any subject";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "follow-file" = callPackage
@@ -88237,8 +82264,6 @@ self: {
        ];
        description = "Follow Tweets anonymously";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "foma" = callPackage
@@ -88251,8 +82276,6 @@ self: {
        librarySystemDepends = [ foma ];
        description = "Simple Haskell bindings for Foma";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {foma = null;};
 
   "font-awesome-type" = callPackage
@@ -88278,8 +82301,6 @@ self: {
        executableHaskellDepends = [ base GLFW-b OpenGL ];
        description = "Basic4x6 font for OpenGL";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "foo" = callPackage
@@ -88295,8 +82316,6 @@ self: {
        ];
        description = "Paper soccer, an OpenGL game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "foobar" = callPackage
@@ -88328,8 +82347,6 @@ self: {
        ];
        description = "Functor, Monad, MonadPlus, etc for free";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "forbidden-fruit" = callPackage
@@ -88350,8 +82367,6 @@ self: {
        ];
        description = "A library accelerates imperative style programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "force-layout" = callPackage
@@ -88361,8 +82376,8 @@ self: {
        pname = "force-layout";
        version = "0.4.0.6";
        sha256 = "17956k3mab2xhrmfy7fj5gh08h43yjlsryi5acjhnkmin5arhwpp";
-       revision = "5";
-       editedCabalFile = "14d494pa7hcxmq9cvy039y5x7da6j4p5jp8kw0kmrlb9q8h6rh18";
+       revision = "6";
+       editedCabalFile = "0vhb3ysfi483zfp351ywjc6cg1ihz44wq137zbrkrkigxa3qhg8f";
        libraryHaskellDepends = [
          base containers data-default-class lens linear
        ];
@@ -88381,8 +82396,6 @@ self: {
        executableHaskellDepends = [ base process transformers ];
        description = "Run a command on files with magic substituion support (sequencing and regexp)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "forecast-io" = callPackage
@@ -88394,8 +82407,6 @@ self: {
        libraryHaskellDepends = [ aeson base text ];
        description = "A Haskell library for working with forecast.io data.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "foreign-storable-asymmetric" = callPackage
@@ -88431,8 +82442,6 @@ self: {
        libraryHaskellDepends = [ base stm transformers ];
        description = "Encapsulating mutatable state in external libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "forest" = callPackage
@@ -88469,8 +82478,6 @@ self: {
        ];
        description = "Recursively delete CloudFormation stacks and their dependants";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "forger" = callPackage
@@ -88485,8 +82492,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Library for generating fake placeholder data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "forkable-monad" = callPackage
@@ -88514,8 +82519,6 @@ self: {
        testHaskellDepends = [ aeson base containers hspec mtl text ];
        description = "Parse and validate forms in JSON format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "formal" = callPackage
@@ -88538,8 +82541,6 @@ self: {
        ];
        description = "A statically typed, functional programming language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "format" = callPackage
@@ -88552,16 +82553,14 @@ self: {
        testHaskellDepends = [ haskell2010 parsec QuickCheck ];
        description = "Rendering from and scanning to format strings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "format-numbers" = callPackage
     ({ mkDerivation, base, hspec, text }:
      mkDerivation {
        pname = "format-numbers";
-       version = "0.1.0.0";
-       sha256 = "19ii2b804i6rmz21qpjy1p5yvb32gglniszhgcpmb268aldmd90c";
+       version = "0.1.0.1";
+       sha256 = "193nvj3bf7w0rb1igwl6q27jjijw71v82ik3l7maamfry15hwiaw";
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base hspec text ];
        description = "Various number formatting functions";
@@ -88583,8 +82582,6 @@ self: {
        ];
        description = "A utility for writing the date to dzen2";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "formattable" = callPackage
@@ -88605,8 +82602,6 @@ self: {
        ];
        description = "Business-quality formatting of numbers, dates, and other things";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "formatting" = callPackage
@@ -88649,8 +82644,6 @@ self: {
        ];
        description = "A statically typed, functional programming language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "formlets" = callPackage
@@ -88667,8 +82660,6 @@ self: {
        ];
        description = "Formlets implemented in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "formlets-hsp" = callPackage
@@ -88685,8 +82676,6 @@ self: {
        libraryToolDepends = [ trhsx ];
        description = "HSP support for Formlets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "formura" = callPackage
@@ -88708,8 +82697,6 @@ self: {
        ];
        description = "Formura is a simple language to describe stencil computation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "forsyde-deep" = callPackage
@@ -88737,8 +82724,6 @@ self: {
        ];
        description = "ForSyDe's Haskell-embedded Domain Specific Language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "forsyde-shallow" = callPackage
@@ -88766,8 +82751,6 @@ self: {
        libraryHaskellDepends = [ array-forth base free mtl ];
        description = "A simple eDSL for generating arrayForth code";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fortran-src" = callPackage
@@ -88796,8 +82779,6 @@ self: {
        ];
        description = "Parser and anlyses for Fortran standards 66, 77, 90 and 95";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fortytwo" = callPackage
@@ -88812,8 +82793,6 @@ self: {
        testHaskellDepends = [ base doctest hspec ];
        description = "Interactive terminal prompt";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "forward-chan" = callPackage
@@ -88844,8 +82823,6 @@ self: {
        ];
        description = "Foscam File format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "foscam-filename" = callPackage
@@ -88865,8 +82842,6 @@ self: {
        ];
        description = "Foscam File format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "foscam-sort" = callPackage
@@ -88893,8 +82868,6 @@ self: {
        ];
        description = "Foscam File format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "foundation" = callPackage
@@ -88968,8 +82941,6 @@ self: {
        ];
        description = "Simple interface to the FP Complete IDE API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fpe" = callPackage
@@ -89015,8 +82986,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Haskell bindings to <https://fplll.github.io/fplll/ fplll>";
        license = stdenv.lib.licenses.lgpl21Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) fplll;};
 
   "fpnla" = callPackage
@@ -89052,8 +83021,6 @@ self: {
        ];
        description = "Example implementations for FPNLA library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fptest" = callPackage
@@ -89079,8 +83046,6 @@ self: {
        ];
        description = "IEEE754r floating point conformance tests";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fquery" = callPackage
@@ -89124,8 +83089,6 @@ self: {
        testHaskellDepends = [ base integer-gmp QuickCheck ];
        description = "A collection of useful fractal curve encoders";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fraction" = callPackage
@@ -89151,8 +83114,6 @@ self: {
        executableHaskellDepends = [ array base GLUT OpenGL random ];
        description = "A 3-D First Person Shooter Game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "frame" = callPackage
@@ -89200,8 +83161,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A package for configuring and building Haskell software";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "franz" = callPackage
@@ -89262,8 +83221,6 @@ self: {
        ];
        description = "RabbitMQ Messaging API supporting request-response";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free" = callPackage
@@ -89329,8 +83286,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "efficient data types for free categories and arrows";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free-concurrent" = callPackage
@@ -89342,8 +83297,6 @@ self: {
        libraryHaskellDepends = [ base type-aligned ];
        description = "Free monads suitable for concurrent computation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free-er" = callPackage
@@ -89374,8 +83327,6 @@ self: {
        ];
        description = "Free functors, adjoint to functors that forget class constraints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free-game" = callPackage
@@ -89397,8 +83348,6 @@ self: {
        ];
        description = "Create games for free";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free-http" = callPackage
@@ -89415,8 +83364,6 @@ self: {
        ];
        description = "An HTTP Client based on Free Monads";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free-operational" = callPackage
@@ -89432,8 +83379,6 @@ self: {
        ];
        description = "Operational Applicative, Alternative, Monad and MonadPlus from free types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free-theorems" = callPackage
@@ -89449,8 +83394,6 @@ self: {
        ];
        description = "Automatic generation of free theorems";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free-theorems-counterexamples" = callPackage
@@ -89469,8 +83412,6 @@ self: {
        executableHaskellDepends = [ cgi free-theorems utf8-string xhtml ];
        description = "Automatically Generating Counterexamples to Naive Free Theorems";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free-theorems-seq" = callPackage
@@ -89488,8 +83429,6 @@ self: {
        ];
        description = "Taming Selective Strictness";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free-theorems-seq-webui" = callPackage
@@ -89508,8 +83447,6 @@ self: {
        ];
        description = "Taming Selective Strictness";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free-theorems-webui" = callPackage
@@ -89529,8 +83466,6 @@ self: {
        ];
        description = "CGI-based web interface for the free-theorems package";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free-v-bucks-generator-no-survey" = callPackage
@@ -89546,8 +83481,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Spam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free-v-bucks-generator-ps4-no-survey" = callPackage
@@ -89563,8 +83496,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Spam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free-vector-spaces" = callPackage
@@ -89582,8 +83513,6 @@ self: {
        ];
        description = "Instantiate the classes from the vector-space package with types from linear";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "free-vl" = callPackage
@@ -89622,8 +83551,6 @@ self: {
        ];
        description = "A soccer game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "freelude" = callPackage
@@ -89643,8 +83570,6 @@ self: {
        ];
        description = "A generalisation of the Category->Functor->Applicative->Monad hierarchy and more";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "freenect" = callPackage
@@ -89697,8 +83622,6 @@ self: {
        ];
        description = "Handle effects conversely using monadic conversation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "freer-effects" = callPackage
@@ -89719,8 +83642,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion free mtl ];
        description = "Implementation of effect system for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "freer-simple" = callPackage
@@ -89758,8 +83679,6 @@ self: {
        testHaskellDepends = [ base freer-simple hspec ];
        description = "Checked runtime exceptions with freer-simple";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "freer-simple-http" = callPackage
@@ -89780,8 +83699,6 @@ self: {
        ];
        description = "Make HTTP requests with freer-simple!";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "freer-simple-profiling" = callPackage
@@ -89794,8 +83711,6 @@ self: {
        testHaskellDepends = [ base containers freer-simple hspec time ];
        description = "Automatic profling of freer-simple programs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "freer-simple-random" = callPackage
@@ -89808,8 +83723,6 @@ self: {
        testHaskellDepends = [ base containers freer-simple hspec random ];
        description = "Random number generators using freer-simple";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "freer-simple-time" = callPackage
@@ -89822,8 +83735,6 @@ self: {
        testHaskellDepends = [ base freer-simple hspec time ];
        description = "freer-simple interface to IO based time functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "freesect" = callPackage
@@ -89841,8 +83752,6 @@ self: {
        ];
        description = "A Haskell syntax extension for generalised sections";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "freesound" = callPackage
@@ -89864,8 +83773,6 @@ self: {
        ];
        description = "Access the Freesound Project database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "freetype-simple" = callPackage
@@ -89880,8 +83787,6 @@ self: {
        ];
        description = "Single line text rendering for OpenGL ES";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "freetype2" = callPackage
@@ -89924,8 +83829,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring containers gauge ];
        description = "Are you ready to get freaky?";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fresco-binding" = callPackage
@@ -89953,8 +83856,6 @@ self: {
        libraryHaskellDepends = [ base containers haskell-src-exts syb ];
        description = "Introduce fresh variables into Haskell source code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "friday" = callPackage
@@ -89993,8 +83894,6 @@ self: {
        librarySystemDepends = [ libdevil ];
        description = "Uses the DevIL C library to read and write images from and to files and memory buffers";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libdevil;};
 
   "friday-juicypixels" = callPackage
@@ -90026,8 +83925,6 @@ self: {
        ];
        description = "Scale Friday images with DCT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "friendly" = callPackage
@@ -90062,12 +83959,14 @@ self: {
      }) {};
 
   "frisby" = callPackage
-    ({ mkDerivation, array, base, containers, mtl, semigroups }:
+    ({ mkDerivation, array, base, containers, fail, mtl, semigroups }:
      mkDerivation {
        pname = "frisby";
-       version = "0.2.2";
-       sha256 = "1mdncc38qwakadr8q4ncz9vzvx9scfhlgk2m540y2mjdypdiicy1";
-       libraryHaskellDepends = [ array base containers mtl semigroups ];
+       version = "0.2.3";
+       sha256 = "1bcdrjvd6cpq1361m8ipf1z6yp3gqiaixkl8gxgmg6ky1lsiljhn";
+       libraryHaskellDepends = [
+         array base containers fail mtl semigroups
+       ];
        description = "Linear time composable parser for PEG grammars";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90115,8 +84014,6 @@ self: {
        ];
        description = "A reactive frontend web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "frontmatter" = callPackage
@@ -90160,8 +84057,6 @@ self: {
        executableHaskellDepends = [ base directory ];
        description = "LALR(k) parser generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "frp-arduino" = callPackage
@@ -90173,8 +84068,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "Arduino programming without the hassle of C";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "frpnow" = callPackage
@@ -90189,8 +84082,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl transformers ];
        description = "Principled practical FRP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "frpnow-gloss" = callPackage
@@ -90206,8 +84097,6 @@ self: {
        ];
        description = "Program awesome stuff with Gloss and frpnow!";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "frpnow-gtk" = callPackage
@@ -90224,8 +84113,6 @@ self: {
        ];
        description = "Program GUIs with GTK and frpnow!";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "frpnow-gtk3" = callPackage
@@ -90239,8 +84126,6 @@ self: {
        ];
        description = "Program GUIs with GTK3 and frpnow!";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "frpnow-vty" = callPackage
@@ -90255,8 +84140,6 @@ self: {
        executableHaskellDepends = [ base containers frpnow vty ];
        description = "Program terminal applications with vty and frpnow!";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "frquotes" = callPackage
@@ -90282,8 +84165,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A haskell binding to the FSEvents API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fsh-csv" = callPackage
@@ -90295,8 +84176,6 @@ self: {
        libraryHaskellDepends = [ base hint ];
        description = "csv parser for fsh";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fsharp" = callPackage
@@ -90323,8 +84202,6 @@ self: {
        ];
        description = "Finite state machines and FSM actions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fsnotify" = callPackage
@@ -90397,8 +84274,6 @@ self: {
        libraryHaskellDepends = [ base directory filepath ];
        description = "File system utilities for Haskell that are missing from built in libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fswait" = callPackage
@@ -90418,8 +84293,6 @@ self: {
        ];
        description = "Wait and observe events on the filesystem for a path, with a timeout";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fswatch" = callPackage
@@ -90471,8 +84344,6 @@ self: {
        executableHaskellDepends = [ base mtl parsec ];
        description = "implementation accompanying a WFLP'19 paper";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ftdi" = callPackage
@@ -90490,8 +84361,6 @@ self: {
        ];
        description = "A thin layer over USB to communicate with FTDI chips";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ftp-client" = callPackage
@@ -90509,8 +84378,6 @@ self: {
        testHaskellDepends = [ base bytestring tasty tasty-hspec ];
        description = "Transfer files with FTP and FTPS";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ftp-client-conduit" = callPackage
@@ -90527,8 +84394,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Transfer file with FTP and FTPS with Conduit";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ftp-conduit" = callPackage
@@ -90545,8 +84410,6 @@ self: {
        ];
        description = "FTP client package with conduit interface based off http-conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ftphs" = callPackage
@@ -90593,8 +84456,6 @@ self: {
        ];
        description = "Shell interface to the FreeTheorems library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fugue" = callPackage
@@ -90617,8 +84478,6 @@ self: {
        libraryHaskellDepends = [ base ghc network ];
        description = "a monad for protocol-typed network programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "full-text-search" = callPackage
@@ -90658,8 +84517,6 @@ self: {
        ];
        description = "Simple sentence segmenter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "funbot" = callPackage
@@ -90688,8 +84545,6 @@ self: {
        ];
        description = "IRC bot for fun, learning, creativity and collaboration";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "funbot-client" = callPackage
@@ -90708,8 +84563,6 @@ self: {
        ];
        description = "Report events to FunBot over a JSON/HTTP API";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "funbot-ext-events" = callPackage
@@ -90740,8 +84593,6 @@ self: {
        ];
        description = "Git hook which sends events to FunBot";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "funcmp" = callPackage
@@ -90793,8 +84644,6 @@ self: {
        ];
        description = "call-by-value lambda-calculus with meta-programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "funcons-simple" = callPackage
@@ -90873,8 +84722,6 @@ self: {
        libraryHaskellDepends = [ base data-type ];
        description = "Combining functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "function-instances-algebra" = callPackage
@@ -90886,8 +84733,6 @@ self: {
        libraryHaskellDepends = [ base numeric-prelude ];
        description = "Instances of the Algebra.* classes for functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "functional-arrow" = callPackage
@@ -90899,8 +84744,6 @@ self: {
        libraryHaskellDepends = [ base HList ];
        description = "Combinators that allow for a more functional/monadic style of Arrow programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "functional-kmp" = callPackage
@@ -90920,13 +84763,11 @@ self: {
        pname = "functor";
        version = "0.1.0.0";
        sha256 = "03s0gpxg1k5f26lxyq617ly57c56w0k6nm59h6dwdkc3w2ainqiv";
-       revision = "1";
-       editedCabalFile = "0yl3pxzggr05rjizmpy7fli7ribc157vci46z084dn6jqlnlbh3a";
+       revision = "2";
+       editedCabalFile = "1cjr0x65q1hmls7jszmngbibbif1l9jipjgkndpr33d84ry10hnj";
        libraryHaskellDepends = [ base category ];
        description = "Functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "functor-apply" = callPackage
@@ -90958,33 +84799,6 @@ self: {
      }) {};
 
   "functor-combinators" = callPackage
-    ({ mkDerivation, base, bifunctors, comonad, constraints, containers
-     , dependent-sum, deriving-compat, free, hedgehog, kan-extensions
-     , mmorph, mtl, natural-transformation, nonempty-containers, pointed
-     , profunctors, semigroupoids, tagged, tasty, tasty-hedgehog, these
-     , transformers, trivial-constraint, vinyl
-     }:
-     mkDerivation {
-       pname = "functor-combinators";
-       version = "0.1.1.1";
-       sha256 = "1bs1xqlndbzi91z9048clmgmgkjyyrkgcmz6s864villy0s9h90c";
-       libraryHaskellDepends = [
-         base bifunctors comonad constraints containers deriving-compat free
-         kan-extensions mmorph mtl natural-transformation
-         nonempty-containers pointed profunctors semigroupoids tagged these
-         transformers trivial-constraint vinyl
-       ];
-       testHaskellDepends = [
-         base bifunctors dependent-sum free hedgehog nonempty-containers
-         semigroupoids tasty tasty-hedgehog transformers
-       ];
-       description = "Tools for functor combinator-based program design";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "functor-combinators_0_2_0_0" = callPackage
     ({ mkDerivation, base, bifunctors, comonad, constraints, containers
      , dependent-sum, deriving-compat, free, hedgehog, kan-extensions
      , mmorph, mtl, natural-transformation, nonempty-containers, pointed
@@ -91007,8 +84821,6 @@ self: {
        ];
        description = "Tools for functor combinator-based program design";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "functor-combo" = callPackage
@@ -91071,8 +84883,6 @@ self: {
        libraryHaskellDepends = [ base microlens singletons text vinyl ];
        description = "General functor products for various Foldable instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "functor-utils" = callPackage
@@ -91095,8 +84905,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Data.FunctorM (compatibility package)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "functors" = callPackage
@@ -91147,8 +84955,6 @@ self: {
        ];
        description = "Workflows with arrows";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "funflow-nix" = callPackage
@@ -91170,8 +84976,6 @@ self: {
        ];
        description = "Utility functions for using funflow with nix";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fungll-combinators" = callPackage
@@ -91205,8 +85009,6 @@ self: {
        ];
        description = "A unioning file-system using HFuse";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "funnyprint" = callPackage
@@ -91222,8 +85024,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion hscolour ipprint ];
        description = "funnyPrint function to colorize GHCi output";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "funpat" = callPackage
@@ -91235,8 +85035,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A generalization of pattern matching";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "funsat" = callPackage
@@ -91258,8 +85056,6 @@ self: {
        ];
        description = "A modern DPLL-style SAT solver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "funspection" = callPackage
@@ -91274,26 +85070,6 @@ self: {
      }) {};
 
   "fused-effects" = callPackage
-    ({ mkDerivation, base, deepseq, doctest, gauge, hspec
-     , inspection-testing, MonadRandom, QuickCheck, random, transformers
-     , unliftio-core
-     }:
-     mkDerivation {
-       pname = "fused-effects";
-       version = "0.5.0.1";
-       sha256 = "0s6y34x29w31lzqlj7xf9sld9dmh3q1f0rl3zfmzd4kpp2ybc965";
-       libraryHaskellDepends = [
-         base deepseq MonadRandom random transformers unliftio-core
-       ];
-       testHaskellDepends = [
-         base doctest hspec inspection-testing QuickCheck transformers
-       ];
-       benchmarkHaskellDepends = [ base gauge ];
-       description = "A fast, flexible, fused effect system";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fused-effects_1_0_0_1" = callPackage
     ({ mkDerivation, base, containers, gauge, hedgehog, hedgehog-fn
      , inspection-testing, markdown-unlit, mtl, tasty, tasty-hedgehog
      , tasty-hunit, transformers
@@ -91311,7 +85087,6 @@ self: {
        benchmarkHaskellDepends = [ base gauge ];
        description = "A fast, flexible, fused effect system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fused-effects-exceptions" = callPackage
@@ -91329,8 +85104,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Handle exceptions thrown in IO with fused-effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fused-effects-lens" = callPackage
@@ -91343,8 +85116,6 @@ self: {
        testHaskellDepends = [ base fused-effects hspec microlens ];
        description = "Monadic lens combinators for fused-effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fused-effects-random" = callPackage
@@ -91360,8 +85131,6 @@ self: {
        ];
        description = "Random number generation for fused-effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fused-effects-resumable" = callPackage
@@ -91375,8 +85144,6 @@ self: {
        ];
        description = "Resumable exceptions for the fused-effects ecosystem";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fused-effects-squeal" = callPackage
@@ -91393,8 +85160,6 @@ self: {
        ];
        description = "A fused-effects adapter for squeal-postgresql";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fusion" = callPackage
@@ -91409,21 +85174,42 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Effectful streaming library based on shortcut fusion techniques";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fusion-plugin" = callPackage
     ({ mkDerivation, base, ghc, syb }:
      mkDerivation {
        pname = "fusion-plugin";
-       version = "0.1.0";
-       sha256 = "0qns66bakz2vlvglglz3qjg8f7483sldlm25v5lph8fdkj2psrfx";
+       version = "0.1.1";
+       sha256 = "15bjjsxck6682nva7mahss87rxlzw8j66hzkhji122swyvgd89a1";
        libraryHaskellDepends = [ base ghc syb ];
        description = "GHC plugin to make stream fusion more predictable";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fusion-plugin_0_2_0" = callPackage
+    ({ mkDerivation, base, fusion-plugin-types, ghc, syb }:
+     mkDerivation {
+       pname = "fusion-plugin";
+       version = "0.2.0";
+       sha256 = "0fbsmlkvxxfiwajl3ihidp2xmsds4y47sbqigng9pp78lhln35am";
+       libraryHaskellDepends = [ base fusion-plugin-types ghc syb ];
+       description = "GHC plugin to make stream fusion more predictable";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "fusion-plugin-types" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "fusion-plugin-types";
+       version = "0.1.0";
+       sha256 = "14lzymjna6faiwj7bdm1jrz42jfj3w1wi2hv66mldjhadf45613d";
+       libraryHaskellDepends = [ base ];
+       description = "Types for the fusion-plugin package";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "futhark" = callPackage
     ({ mkDerivation, aeson, alex, ansi-terminal, array, base, binary
      , blaze-html, bytestring, containers, data-binary-ieee754
@@ -91464,8 +85250,6 @@ self: {
        ];
        description = "An optimising compiler for a functional, array-oriented language";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "futun" = callPackage
@@ -91479,8 +85263,6 @@ self: {
        executableHaskellDepends = [ base bytestring network unix ];
        description = "Simple IP-over-UDP tunnel using TUNTAP";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "future" = callPackage
@@ -91492,8 +85274,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Supposed to mimics and enhance proposed C++ \"future\" features";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "future-resource" = callPackage
@@ -91579,6 +85359,44 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "fuzzy-time" = callPackage
+    ({ mkDerivation, base, containers, deepseq, megaparsec, text, time
+     , validity, validity-time
+     }:
+     mkDerivation {
+       pname = "fuzzy-time";
+       version = "0.1.0.0";
+       sha256 = "1l9gpirnnr8lzdcnqz1sdi998v7gka9x6sld2pz4d8y906mdhclj";
+       libraryHaskellDepends = [
+         base containers deepseq megaparsec text time validity validity-time
+       ];
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "fuzzy-time-gen" = callPackage
+    ({ mkDerivation, base, containers, criterion, fuzzy-time
+     , genvalidity, genvalidity-criterion, genvalidity-hspec
+     , genvalidity-text, genvalidity-time, hspec, megaparsec, QuickCheck
+     , text, time
+     }:
+     mkDerivation {
+       pname = "fuzzy-time-gen";
+       version = "0.1.0.0";
+       sha256 = "01hvzb6x25qbsbcfacjba1niwfswkxmarspniiaa7agzcfds45z3";
+       libraryHaskellDepends = [
+         base containers fuzzy-time genvalidity genvalidity-time megaparsec
+         QuickCheck time
+       ];
+       testHaskellDepends = [
+         base fuzzy-time genvalidity genvalidity-hspec genvalidity-text
+         genvalidity-time hspec megaparsec QuickCheck text time
+       ];
+       benchmarkHaskellDepends = [
+         base criterion fuzzy-time genvalidity-criterion
+       ];
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "fuzzy-timings" = callPackage
     ({ mkDerivation, base, containers, glpk-hs, HUnit, mtl, QuickCheck
      , random, test-framework, test-framework-hunit
@@ -91597,31 +85415,9 @@ self: {
        ];
        description = "Translates high-level definitions of \"fuzzily\" scheduled objects (e.g. play this commercial 10 times per hour between 9:00-13:00) to a list of accurately scheduled objects using glpk-hs.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fuzzyset" = callPackage
-    ({ mkDerivation, base, base-unicode-symbols, data-default, hspec
-     , ieee754, lens, text, text-metrics, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "fuzzyset";
-       version = "0.1.1";
-       sha256 = "1r23xp3c4f1y0kx0kcg4z83rfxl6swciysb3cy7z6yv35fs8bs4q";
-       libraryHaskellDepends = [
-         base base-unicode-symbols data-default lens text text-metrics
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base base-unicode-symbols hspec ieee754 lens text
-         unordered-containers
-       ];
-       description = "Fuzzy set for approximate string matching";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fuzzyset_0_2_0" = callPackage
     ({ mkDerivation, base, data-default, hspec, ieee754, text
      , text-metrics, unordered-containers, vector
      }:
@@ -91638,7 +85434,6 @@ self: {
        ];
        description = "Fuzzy set for approximate string matching";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fuzzytime" = callPackage
@@ -91686,8 +85481,6 @@ self: {
        ];
        description = "Game engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fwgl-glfw" = callPackage
@@ -91704,8 +85497,6 @@ self: {
        ];
        description = "FWGL GLFW backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fwgl-javascript" = callPackage
@@ -91721,8 +85512,6 @@ self: {
        ];
        description = "FWGL GHCJS backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "fx" = callPackage
@@ -91747,8 +85536,6 @@ self: {
        executableHaskellDepends = [ base HTTP json ];
        description = "Generate Gentoo ebuilds from NodeJS/npm packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "g2" = callPackage
@@ -91781,8 +85568,6 @@ self: {
        ];
        description = "Haskell symbolic execution engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "g2q" = callPackage
@@ -91794,8 +85579,6 @@ self: {
        libraryHaskellDepends = [ base g2 ];
        description = "G2Q allows constraint programming, via writing Haskell predicates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "g4ip" = callPackage
@@ -91808,8 +85591,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A theorem prover for propositional logic that uses G4ip";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "g4ip-prover" = callPackage
@@ -91844,8 +85625,6 @@ self: {
        ];
        description = "General Alignment Clustering Tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "galois-fft" = callPackage
@@ -91872,35 +85651,9 @@ self: {
        ];
        description = "FFTs over finite fields";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "galois-field" = callPackage
-    ({ mkDerivation, base, criterion, integer-gmp, MonadRandom
-     , protolude, tasty, tasty-quickcheck, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "galois-field";
-       version = "0.3.0";
-       sha256 = "0c4n37rf6kfpyxdmqk4hdgmjc8fvxwynq0izgrhrqinv4z4l97v7";
-       libraryHaskellDepends = [
-         base integer-gmp MonadRandom protolude tasty-quickcheck
-         wl-pprint-text
-       ];
-       testHaskellDepends = [
-         base integer-gmp MonadRandom protolude tasty tasty-quickcheck
-         wl-pprint-text
-       ];
-       benchmarkHaskellDepends = [
-         base criterion integer-gmp MonadRandom protolude tasty-quickcheck
-         wl-pprint-text
-       ];
-       description = "Galois field library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "galois-field_1_0_1" = callPackage
     ({ mkDerivation, base, bitvec, criterion, groups, integer-gmp
      , MonadRandom, poly, protolude, semirings, tasty, tasty-quickcheck
      , vector, wl-pprint-text
@@ -91923,7 +85676,6 @@ self: {
        ];
        description = "Galois field library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "game-of-life" = callPackage
@@ -91949,8 +85701,6 @@ self: {
        libraryHaskellDepends = [ base containers probability random ];
        description = "Simple probability library for dice rolls, card games and similar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "game-tree" = callPackage
@@ -91975,8 +85725,6 @@ self: {
        executableHaskellDepends = [ base cairo containers glib gtk time ];
        description = "Game clock that shows two analog clock faces";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gamgee" = callPackage
@@ -92007,8 +85755,6 @@ self: {
        ];
        description = "Tool for generating TOTP MFA tokens";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gamma" = callPackage
@@ -92029,8 +85775,6 @@ self: {
        ];
        description = "Gamma function and related functions";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gang-of-threads" = callPackage
@@ -92056,8 +85800,6 @@ self: {
        executableHaskellDepends = [ base haskeline transformers ];
        description = "reverse prefix notation calculator and calculation library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "garfield" = callPackage
@@ -92084,8 +85826,6 @@ self: {
        ];
        description = "Automatically spin up and spin down local daemons";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gargoyle-postgresql" = callPackage
@@ -92106,8 +85846,6 @@ self: {
        ];
        description = "Manage PostgreSQL servers with gargoyle";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "garlic-bread" = callPackage
@@ -92142,8 +85880,6 @@ self: {
        libraryHaskellDepends = [ base free transformers ];
        description = "Limit how many steps a program may take";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gasp" = callPackage
@@ -92189,8 +85925,6 @@ self: {
        ];
        description = "planar graph embedding into a plane";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gc" = callPackage
@@ -92218,8 +85952,6 @@ self: {
        ];
        description = "a wai application to show GHC.GCStats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gcodehs" = callPackage
@@ -92246,8 +85978,6 @@ self: {
        ];
        description = "GCode processor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gconf" = callPackage
@@ -92264,8 +85994,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GNOME configuration database system";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs.gnome2) GConf;};
 
   "gd" = callPackage
@@ -92319,8 +86047,6 @@ self: {
        ];
        description = "API Wrapping for Coinbase's GDAX exchange";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gdiff" = callPackage
@@ -92347,8 +86073,6 @@ self: {
        ];
        description = "Generic diff for the instant-generics library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gdiff-th" = callPackage
@@ -92367,8 +86091,6 @@ self: {
        ];
        description = "Generate gdiff GADTs and Instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gdo" = callPackage
@@ -92431,8 +86153,6 @@ self: {
        testHaskellDepends = [ base hspec megaparsec text-all ];
        description = "Parser for the GEDCOM genealogy file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "geek" = callPackage
@@ -92453,8 +86173,6 @@ self: {
        ];
        description = "Geek blog engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "geek-server" = callPackage
@@ -92478,8 +86196,6 @@ self: {
        ];
        description = "Geek blog engine server";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gegl" = callPackage
@@ -92500,8 +86216,6 @@ self: {
        libraryPkgconfigDepends = [ gegl ];
        description = "Haskell bindings to GEGL library";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gegl;};
 
   "gelatin" = callPackage
@@ -92520,8 +86234,6 @@ self: {
        executableHaskellDepends = [ base linear mtl vector ];
        description = "A graphics description language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gelatin-freetype2" = callPackage
@@ -92539,8 +86251,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "FreeType2 based text rendering for the gelatin realtime rendering system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gelatin-fruity" = callPackage
@@ -92552,8 +86262,6 @@ self: {
        libraryHaskellDepends = [ base FontyFruity gelatin linear vector ];
        description = "Gelatin's support for rendering TTF outlines, using FontyFruity";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gelatin-gl" = callPackage
@@ -92575,8 +86283,6 @@ self: {
        executableHaskellDepends = [ base gelatin lens linear mtl vector ];
        description = "OpenGL rendering routines for the gelatin-picture graphics EDSL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gelatin-sdl2" = callPackage
@@ -92594,8 +86300,6 @@ self: {
        executableHaskellDepends = [ base either filepath sdl2 ];
        description = "An SDL2 backend for the gelatin renderer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gelatin-shaders" = callPackage
@@ -92608,8 +86312,6 @@ self: {
        libraryHaskellDepends = [ base bytestring filepath gelatin ];
        description = "Gelatin's OpenGL shaders";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gemstone" = callPackage
@@ -92627,8 +86329,6 @@ self: {
        ];
        description = "A simple library of helpers for SDL+GL games";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gen-imports" = callPackage
@@ -92644,8 +86344,6 @@ self: {
        ];
        description = "Code to generate instances for the package \"ghc-instances\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gen-passwd" = callPackage
@@ -92663,8 +86361,6 @@ self: {
        ];
        description = "Create wordlist-based passwords easily";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gencheck" = callPackage
@@ -92681,8 +86377,6 @@ self: {
        ];
        description = "A testing framework inspired by QuickCheck and SmallCheck";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gender" = callPackage
@@ -92698,8 +86392,6 @@ self: {
        executableHaskellDepends = [ attoparsec base text ];
        description = "Identify a persons gender by their first name";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "genders" = callPackage
@@ -92715,8 +86407,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec network vector ];
        description = "Bindings to libgenders";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {genders = null;};
 
   "gendocs" = callPackage
@@ -92762,8 +86452,6 @@ self: {
        ];
        description = "Prelude replacement using generalized type classes where possible";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generator" = callPackage
@@ -92786,8 +86474,6 @@ self: {
        libraryHaskellDepends = [ base mtl random ];
        description = "Actually useful monadic random value generators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-accessors" = callPackage
@@ -92807,8 +86493,6 @@ self: {
        ];
        description = "stringly-named getters for generic data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-aeson" = callPackage
@@ -92847,8 +86531,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring ghc-prim ];
        description = "Generic Data.Binary derivation using GHC generics.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-church" = callPackage
@@ -92864,8 +86546,6 @@ self: {
        ];
        description = "Automatically convert Generic instances to and from church representations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-constraints" = callPackage
@@ -92900,6 +86580,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "generic-data_0_8_0_0" = callPackage
+    ({ mkDerivation, base, base-orphans, contravariant, criterion
+     , deepseq, doctest, generic-lens, Glob, one-liner, QuickCheck
+     , show-combinators, tasty, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "generic-data";
+       version = "0.8.0.0";
+       sha256 = "096n5hc98kqyc4v2vz3g4zmhiw7xf1ax0a7qs9kvh2vk3f3sf190";
+       libraryHaskellDepends = [
+         base base-orphans contravariant show-combinators
+       ];
+       testHaskellDepends = [
+         base doctest generic-lens Glob one-liner QuickCheck tasty
+         tasty-hunit
+       ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
+       description = "Deriving instances with GHC.Generics and related utilities";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "generic-data-surgery" = callPackage
     ({ mkDerivation, base, first-class-families, generic-data, tasty
      , tasty-hunit
@@ -92942,25 +86644,6 @@ self: {
      }) {};
 
   "generic-deriving" = callPackage
-    ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover
-     , template-haskell, th-abstraction
-     }:
-     mkDerivation {
-       pname = "generic-deriving";
-       version = "1.12.4";
-       sha256 = "0vdg9qdq35jl3m11a87wk8cq1y71qm4i1g1b2pxki0wk70yw20a4";
-       revision = "1";
-       editedCabalFile = "16z0748pw4j28ib6vg5yzjm8wrarqkclr7l597q5zjxabjdn1ygj";
-       libraryHaskellDepends = [
-         base containers ghc-prim template-haskell th-abstraction
-       ];
-       testHaskellDepends = [ base hspec template-haskell ];
-       testToolDepends = [ hspec-discover ];
-       description = "Generic programming library for generalised deriving";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "generic-deriving_1_13_1" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover
      , template-haskell, th-abstraction
      }:
@@ -92975,7 +86658,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Generic programming library for generalised deriving";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-enum" = callPackage
@@ -92988,8 +86670,6 @@ self: {
        testHaskellDepends = [ array base bytestring hspec ];
        description = "An Enum class that fixes some deficiences with Prelude's Enum";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-env" = callPackage
@@ -93004,25 +86684,6 @@ self: {
      }) {};
 
   "generic-lens" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, doctest, HUnit
-     , inspection-testing, lens, profunctors, QuickCheck, tagged
-     }:
-     mkDerivation {
-       pname = "generic-lens";
-       version = "1.1.0.0";
-       sha256 = "1frng5vgk4pkaw8wqqj6ch9p5fk88rbw1mmxzs0cp13wpxnr9wpc";
-       libraryHaskellDepends = [ base profunctors tagged ];
-       testHaskellDepends = [
-         base doctest HUnit inspection-testing lens profunctors
-       ];
-       benchmarkHaskellDepends = [
-         base criterion deepseq lens QuickCheck
-       ];
-       description = "Generically derive traversals, lenses and prisms";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "generic-lens_1_2_0_1" = callPackage
     ({ mkDerivation, base, criterion, deepseq, doctest, HUnit
      , inspection-testing, lens, profunctors, QuickCheck, tagged, text
      }:
@@ -93039,9 +86700,38 @@ self: {
        ];
        description = "Generically derive traversals, lenses and prisms";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "generic-lens_2_0_0_0" = callPackage
+    ({ mkDerivation, base, doctest, generic-lens-core, HUnit
+     , inspection-testing, lens, profunctors, text
+     }:
+     mkDerivation {
+       pname = "generic-lens";
+       version = "2.0.0.0";
+       sha256 = "0fh9095qiqlym0s6w0zkmybn7hyywgy964fhg95x0vprpmfya5mq";
+       libraryHaskellDepends = [
+         base generic-lens-core profunctors text
+       ];
+       testHaskellDepends = [
+         base doctest HUnit inspection-testing lens profunctors
+       ];
+       description = "Generically derive traversals, lenses and prisms";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "generic-lens-core" = callPackage
+    ({ mkDerivation, base, indexed-profunctors, text }:
+     mkDerivation {
+       pname = "generic-lens-core";
+       version = "2.0.0.0";
+       sha256 = "0h7fjh3zk8lkkmdj3w3wg72gbmnr8wz9wfm58ryvx0036l284qji";
+       libraryHaskellDepends = [ base indexed-profunctors text ];
+       description = "Generically derive traversals, lenses and prisms";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "generic-lens-labels" = callPackage
     ({ mkDerivation, base, generic-lens }:
      mkDerivation {
@@ -93051,8 +86741,6 @@ self: {
        libraryHaskellDepends = [ base generic-lens ];
        description = "GHC.OverloadedLabels.IsLabel instance for lenses from ghc-generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-lens-lite" = callPackage
@@ -93076,8 +86764,6 @@ self: {
        libraryHaskellDepends = [ base lucid text ];
        description = "General-purpose web page scaffold for Lucid";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-maybe" = callPackage
@@ -93099,8 +86785,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "A generic version of Data.Maybe";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-monoid" = callPackage
@@ -93116,6 +86800,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "generic-optics" = callPackage
+    ({ mkDerivation, base, doctest, generic-lens-core, HUnit
+     , inspection-testing, optics-core, text
+     }:
+     mkDerivation {
+       pname = "generic-optics";
+       version = "2.0.0.0";
+       sha256 = "17m72q0cjvagq1khiq8m495jhkpn2rqd6y1h9bxngp6l0k355nmw";
+       libraryHaskellDepends = [
+         base generic-lens-core optics-core text
+       ];
+       testHaskellDepends = [
+         base doctest HUnit inspection-testing optics-core
+       ];
+       description = "Generically derive traversals, lenses and prisms";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "generic-optics-lite" = callPackage
     ({ mkDerivation, base, generic-lens-lite, optics-core }:
      mkDerivation {
@@ -93144,25 +86846,9 @@ self: {
        ];
        description = "Pretty printing for Generic value";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-random" = callPackage
-    ({ mkDerivation, base, deepseq, QuickCheck }:
-     mkDerivation {
-       pname = "generic-random";
-       version = "1.2.0.0";
-       sha256 = "130lmblycxnpqbsl7vf6a90zccibnvcb5zaclfajcn3by39007lv";
-       revision = "1";
-       editedCabalFile = "1d0hx41r7yq2a86ydnfh2fv540ah8cz05l071s2z4wxcjw0ymyn4";
-       libraryHaskellDepends = [ base QuickCheck ];
-       testHaskellDepends = [ base deepseq QuickCheck ];
-       description = "Generic random generators";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "generic-random_1_3_0_0" = callPackage
     ({ mkDerivation, base, deepseq, QuickCheck }:
      mkDerivation {
        pname = "generic-random";
@@ -93172,7 +86858,6 @@ self: {
        testHaskellDepends = [ base deepseq QuickCheck ];
        description = "Generic random generators";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-records" = callPackage
@@ -93207,8 +86892,6 @@ self: {
        testHaskellDepends = [ base ghc-prim hspec QuickCheck ];
        description = "Generic implementation of Storable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-tree" = callPackage
@@ -93220,8 +86903,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Generic Tree data type";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-trie" = callPackage
@@ -93249,8 +86930,6 @@ self: {
        ];
        description = "Marshalling Haskell values to/from XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generic-xmlpickler" = callPackage
@@ -93265,8 +86944,6 @@ self: {
        testHaskellDepends = [ base hxt tasty tasty-hunit tasty-th ];
        description = "Generic generation of HXT XmlPickler instances using GHC Generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generics-eot" = callPackage
@@ -93288,17 +86965,6 @@ self: {
      }) {};
 
   "generics-mrsop" = callPackage
-    ({ mkDerivation, base, containers, mtl, template-haskell }:
-     mkDerivation {
-       pname = "generics-mrsop";
-       version = "2.1.0";
-       sha256 = "1ynzwpwry6fqzjmz3n0iwdp5ra3c402jg1g8sdf7vbpaw9ilyrng";
-       libraryHaskellDepends = [ base containers mtl template-haskell ];
-       description = "Generic Programming with Mutually Recursive Sums of Products";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "generics-mrsop_2_3_0" = callPackage
     ({ mkDerivation, base, containers, mtl, sop-core, template-haskell
      }:
      mkDerivation {
@@ -93310,7 +86976,6 @@ self: {
        ];
        description = "Generic Programming with Mutually Recursive Sums of Products";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generics-mrsop-gdiff" = callPackage
@@ -93322,30 +86987,9 @@ self: {
        libraryHaskellDepends = [ base generics-mrsop ];
        description = "Reimplementation of the gdiff algorithm for generics-mrsop";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "generics-sop" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "generics-sop";
-       version = "0.4.0.1";
-       sha256 = "160knr2phnzh2gldfv954lz029jzc7y8kz5xpmbf4z3vb5ngm6fw";
-       libraryHaskellDepends = [
-         base ghc-prim sop-core template-haskell
-       ];
-       testHaskellDepends = [ base ];
-       benchmarkHaskellDepends = [
-         base criterion deepseq template-haskell
-       ];
-       description = "Generic Programming using True Sums of Products";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "generics-sop_0_5_0_0" = callPackage
     ({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core
      , template-haskell
      }:
@@ -93364,7 +87008,6 @@ self: {
        ];
        description = "Generic Programming using True Sums of Products";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generics-sop-lens" = callPackage
@@ -93390,8 +87033,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Serialization library using Data.Generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "genesis" = callPackage
@@ -93419,8 +87060,6 @@ self: {
        ];
        description = "Opinionated bootstrapping for Haskell web services";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "genesis-test" = callPackage
@@ -93444,8 +87083,6 @@ self: {
        ];
        description = "Opinionated bootstrapping for Haskell web services";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "genetics" = callPackage
@@ -93459,8 +87096,6 @@ self: {
        executableHaskellDepends = [ base random-fu ];
        description = "A Genetic Algorithm library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "geni-gui" = callPackage
@@ -93484,8 +87119,6 @@ self: {
        executableHaskellDepends = [ base GenI ];
        description = "GenI graphical user interface";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "geni-util" = callPackage
@@ -93509,8 +87142,6 @@ self: {
        ];
        description = "Companion tools for use with the GenI surface realiser";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "geniconvert" = callPackage
@@ -93530,8 +87161,6 @@ self: {
        ];
        description = "Conversion utility for the GenI generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "genifunctors" = callPackage
@@ -93555,8 +87184,6 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Use Template Haskell to generate Uniplate-like functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "geniplate-mirror" = callPackage
@@ -93591,8 +87218,6 @@ self: {
        ];
        description = "Simple HTTP server for GenI results";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "genprog" = callPackage
@@ -93604,8 +87229,6 @@ self: {
        libraryHaskellDepends = [ base MonadRandom syb syz ];
        description = "Genetic programming library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gentlemark" = callPackage
@@ -93618,29 +87241,31 @@ self: {
        testHaskellDepends = [ base HUnit parsec transformers ];
        description = "Gentle markup language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "genvalidity" = callPackage
-    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }:
+    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random
+     , validity
+     }:
      mkDerivation {
        pname = "genvalidity";
-       version = "0.8.0.0";
-       sha256 = "0w38aq9hfyymidncgkrs6yvja7j573d9sap5qfg5rz910fhsij9a";
-       libraryHaskellDepends = [ base QuickCheck validity ];
+       version = "0.10.0.0";
+       sha256 = "0rb2nm8hqhdgn979rp4pwywha5rdxlny5d7ndj2253d1ggmvrh4k";
+       libraryHaskellDepends = [ base QuickCheck random validity ];
        testHaskellDepends = [ base hspec hspec-core QuickCheck ];
        description = "Testing utilities for the validity library";
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "genvalidity_0_9_1_0" = callPackage
-    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }:
+  "genvalidity_0_10_0_1" = callPackage
+    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random
+     , validity
+     }:
      mkDerivation {
        pname = "genvalidity";
-       version = "0.9.1.0";
-       sha256 = "0pkc0ys8g6g0d22s83xwk1vkx476qhassdqn4d7m6z0zcsq0shkg";
-       libraryHaskellDepends = [ base QuickCheck validity ];
+       version = "0.10.0.1";
+       sha256 = "0zyg3a0gqcdhdqy8w8ydqpcq7k6vbsb77v2dw31j2yfss1av4q2x";
+       libraryHaskellDepends = [ base QuickCheck random validity ];
        testHaskellDepends = [ base hspec hspec-core QuickCheck ];
        description = "Testing utilities for the validity library";
        license = stdenv.lib.licenses.mit;
@@ -93676,8 +87301,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-bytestring";
-       version = "0.5.0.0";
-       sha256 = "0lcgkq9dlf0k687ccg07jan9f1ba1iag6l8yc9xbnf7vignqz0ma";
+       version = "0.5.0.1";
+       sha256 = "00ps3aq4dz1id3k50kwqbkng7ygs8yb8fmz7yv9s4byrf5gh7kpq";
        libraryHaskellDepends = [
          base bytestring genvalidity QuickCheck validity validity-bytestring
        ];
@@ -93690,32 +87315,14 @@ self: {
      }) {};
 
   "genvalidity-containers" = callPackage
-    ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec
+    ({ mkDerivation, base, containers, criterion, genvalidity
+     , genvalidity-criterion, genvalidity-hspec, genvalidity-property
      , hspec, QuickCheck, validity, validity-containers
      }:
      mkDerivation {
        pname = "genvalidity-containers";
-       version = "0.6.0.0";
-       sha256 = "1ql8fmy6vpp0w52kkihfc3xzqsm4gdfm1j7mshirdw8vwa7y441q";
-       libraryHaskellDepends = [
-         base containers genvalidity QuickCheck validity validity-containers
-       ];
-       testHaskellDepends = [
-         base containers genvalidity genvalidity-hspec hspec validity
-       ];
-       description = "GenValidity support for containers";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "genvalidity-containers_0_8_0_1" = callPackage
-    ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec
-     , genvalidity-property, hspec, QuickCheck, validity
-     , validity-containers
-     }:
-     mkDerivation {
-       pname = "genvalidity-containers";
-       version = "0.8.0.1";
-       sha256 = "1iamvqrrvqa07hkpfcsmmrg3zppm2gk5gn97qpgmwn0h1pq9fmjp";
+       version = "0.8.0.2";
+       sha256 = "0nqxjs9nb080zlf2qys07dq1kfwwg1sg7jh0lnzl1zm9f228q701";
        libraryHaskellDepends = [
          base containers genvalidity QuickCheck validity validity-containers
        ];
@@ -93723,39 +87330,38 @@ self: {
          base containers genvalidity genvalidity-hspec genvalidity-property
          hspec validity
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion genvalidity-criterion QuickCheck
+       ];
        description = "GenValidity support for containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "genvalidity-criterion" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, genvalidity, QuickCheck
+     }:
+     mkDerivation {
+       pname = "genvalidity-criterion";
+       version = "0.0.0.0";
+       sha256 = "0fd2079vh0pz3qkii9x7vwslix2mkx5h41ci0bblqxdhvsvbfp9r";
+       libraryHaskellDepends = [
+         base criterion deepseq genvalidity QuickCheck
+       ];
+       benchmarkHaskellDepends = [
+         base criterion genvalidity QuickCheck
+       ];
+       description = "Criterion benchmarks for generators";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "genvalidity-hspec" = callPackage
-    ({ mkDerivation, base, doctest, genvalidity, genvalidity-property
-     , hspec, hspec-core, QuickCheck, transformers, validity
-     }:
-     mkDerivation {
-       pname = "genvalidity-hspec";
-       version = "0.7.0.0";
-       sha256 = "0cp0scxrkqmpscndxa68a1ij26i86qvblvb5fipwwyky76xhjsgg";
-       libraryHaskellDepends = [
-         base genvalidity genvalidity-property hspec hspec-core QuickCheck
-         transformers validity
-       ];
-       testHaskellDepends = [
-         base doctest genvalidity genvalidity-property hspec hspec-core
-         QuickCheck validity
-       ];
-       description = "Standard spec's for GenValidity instances";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "genvalidity-hspec_0_7_0_3" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-property, hspec
      , hspec-core, QuickCheck, transformers, validity
      }:
      mkDerivation {
        pname = "genvalidity-hspec";
-       version = "0.7.0.3";
-       sha256 = "0mxi1d005xdys4gznm0swqiryw5rmxvy8hll5mjka56vvlb2w6dw";
+       version = "0.7.0.4";
+       sha256 = "0aajx07n2rznyqxb0c4pn9j2cvkzw5brz9ki4grhhigbcri3jzmv";
        libraryHaskellDepends = [
          base genvalidity genvalidity-property hspec hspec-core QuickCheck
          transformers validity
@@ -93765,106 +87371,126 @@ self: {
        ];
        description = "Standard spec's for GenValidity instances";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-hspec-aeson" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, deepseq, doctest
-     , genvalidity, genvalidity-aeson, genvalidity-hspec
-     , genvalidity-property, genvalidity-text, hspec, QuickCheck, text
-     , validity
+    ({ mkDerivation, aeson, base, bytestring, deepseq, genvalidity
+     , genvalidity-aeson, genvalidity-hspec, genvalidity-property
+     , genvalidity-text, hspec, QuickCheck, text, validity
      }:
      mkDerivation {
        pname = "genvalidity-hspec-aeson";
-       version = "0.3.1.0";
-       sha256 = "0ainmqs2i2q1bgcy8k3h2j4gm3730ll3b56p5pkydrgxhkdkxk9b";
+       version = "0.3.1.1";
+       sha256 = "1vqbvkjhq35jm3sr7g5jmwnalzcf8yy76fvd33x6gwayv78rp0ab";
        libraryHaskellDepends = [
          aeson base bytestring deepseq genvalidity genvalidity-hspec hspec
          QuickCheck
        ];
        testHaskellDepends = [
-         aeson base doctest genvalidity genvalidity-aeson genvalidity-hspec
-         genvalidity-property genvalidity-text hspec text validity
+         aeson base genvalidity genvalidity-aeson genvalidity-hspec
+         genvalidity-property genvalidity-text hspec QuickCheck text
+         validity
        ];
        description = "Standard spec's for aeson-related instances";
        license = stdenv.lib.licenses.mit;
      }) {};
 
   "genvalidity-hspec-binary" = callPackage
-    ({ mkDerivation, base, binary, deepseq, doctest, genvalidity
+    ({ mkDerivation, base, binary, deepseq, genvalidity
      , genvalidity-hspec, genvalidity-property, hspec, QuickCheck
      , validity
      }:
      mkDerivation {
        pname = "genvalidity-hspec-binary";
-       version = "0.2.0.3";
-       sha256 = "1am9brcf3wh2fdrfwlkcqiamwc2zlcw3lihpcqgz0sm3jhka56xr";
+       version = "0.2.0.4";
+       sha256 = "144gcr9hm89aqwr0fglnazc5biksdd7sv7qh0ivh56x7v80wd3r9";
        libraryHaskellDepends = [
          base binary deepseq genvalidity genvalidity-hspec hspec QuickCheck
        ];
        testHaskellDepends = [
-         base doctest genvalidity genvalidity-property hspec validity
+         base binary genvalidity genvalidity-property hspec validity
        ];
        description = "Standard spec's for binary-related Instances";
        license = stdenv.lib.licenses.mit;
      }) {};
 
   "genvalidity-hspec-cereal" = callPackage
-    ({ mkDerivation, base, cereal, deepseq, doctest, genvalidity
+    ({ mkDerivation, base, cereal, deepseq, genvalidity
      , genvalidity-hspec, genvalidity-property, hspec, QuickCheck
      , validity
      }:
      mkDerivation {
        pname = "genvalidity-hspec-cereal";
-       version = "0.2.0.3";
-       sha256 = "11bii2nf52jfarfb5jzgj6pmsz59mcvivb8nxc90z97gdd5w6zll";
+       version = "0.2.0.4";
+       sha256 = "0dyfx56cjila3l1nv199p12pi90hi9x27a97h5kqrkaxx5ca3czb";
        libraryHaskellDepends = [
          base cereal deepseq genvalidity genvalidity-hspec hspec QuickCheck
        ];
        testHaskellDepends = [
-         base doctest genvalidity genvalidity-property hspec validity
+         base cereal genvalidity genvalidity-property hspec QuickCheck
+         validity
        ];
        description = "Standard spec's for cereal-related instances";
        license = stdenv.lib.licenses.mit;
      }) {};
 
   "genvalidity-hspec-hashable" = callPackage
-    ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec
+    ({ mkDerivation, base, genvalidity, genvalidity-hspec
      , genvalidity-property, hashable, hspec, hspec-core, QuickCheck
      , validity
      }:
      mkDerivation {
        pname = "genvalidity-hspec-hashable";
-       version = "0.2.0.4";
-       sha256 = "1vyd14cmsj54kbfbidgsy8r695zza635bxwg2i95gl1i314dzy1n";
+       version = "0.2.0.5";
+       sha256 = "1ia1kvr4by2yfzdrk89da028aqpqx4sp3lllra147q7bpjys0kry";
        libraryHaskellDepends = [
          base genvalidity genvalidity-hspec genvalidity-property hashable
          hspec QuickCheck validity
        ];
        testHaskellDepends = [
-         base doctest genvalidity genvalidity-hspec genvalidity-property
-         hashable hspec hspec-core QuickCheck validity
+         base genvalidity genvalidity-hspec genvalidity-property hashable
+         hspec hspec-core QuickCheck validity
        ];
        description = "Standard spec's for Hashable instances";
        license = stdenv.lib.licenses.mit;
      }) {};
 
   "genvalidity-hspec-optics" = callPackage
-    ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec
+    ({ mkDerivation, base, genvalidity, genvalidity-hspec
      , genvalidity-property, hspec, microlens, QuickCheck, validity
      }:
      mkDerivation {
        pname = "genvalidity-hspec-optics";
-       version = "0.1.1.1";
-       sha256 = "121pjin5g1mgdqjydvj68639d5f17i3ibxrl8iiigp4q3xywp4ha";
+       version = "0.1.1.2";
+       sha256 = "1mh9s6q3zii6dpkli4zbmz89wly6bjfalvgs7jh5fvg36wv0c0a8";
        libraryHaskellDepends = [
          base genvalidity genvalidity-hspec hspec microlens QuickCheck
        ];
        testHaskellDepends = [
-         base doctest genvalidity genvalidity-hspec genvalidity-property
-         hspec microlens validity
+         base genvalidity genvalidity-hspec genvalidity-property hspec
+         microlens validity
        ];
-       description = "Standard spec's for optics";
+       description = "Standard spec's for lens";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "genvalidity-hspec-persistent" = callPackage
+    ({ mkDerivation, base, genvalidity, genvalidity-hspec
+     , genvalidity-property, genvalidity-text, hspec, persistent
+     , QuickCheck, text, validity
+     }:
+     mkDerivation {
+       pname = "genvalidity-hspec-persistent";
+       version = "0.0.0.1";
+       sha256 = "11wzwnhij2xbgka9sjdsh7yf9xk6vlm9g6j6amb0863sxs1vpjm0";
+       libraryHaskellDepends = [
+         base genvalidity genvalidity-hspec hspec persistent QuickCheck text
+       ];
+       testHaskellDepends = [
+         base genvalidity genvalidity-hspec genvalidity-property
+         genvalidity-text hspec persistent QuickCheck text validity
+       ];
+       description = "Standard spec's for persistent-related instances";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -93891,27 +87517,29 @@ self: {
      }) {};
 
   "genvalidity-mergeless" = callPackage
-    ({ mkDerivation, base, containers, genvalidity
-     , genvalidity-containers, genvalidity-hspec
-     , genvalidity-hspec-aeson, genvalidity-time, genvalidity-typed-uuid
-     , hspec, mergeless, mtl, QuickCheck, random, time, typed-uuid, uuid
+    ({ mkDerivation, base, containers, criterion, genvalidity
+     , genvalidity-containers, genvalidity-criterion, genvalidity-hspec
+     , genvalidity-hspec-aeson, genvalidity-time, genvalidity-uuid
+     , hspec, mergeless, mtl, pretty-show, QuickCheck, random, time
+     , uuid
      }:
      mkDerivation {
        pname = "genvalidity-mergeless";
-       version = "0.0.0.0";
-       sha256 = "08lic96xmyqxi773zynn361yzqkx13w57hd7jl21hbkpjjx1g9ka";
+       version = "0.1.0.0";
+       sha256 = "0bhpbfydh78ia759y9c8hbf6j656g4b6v8j9pjg8chnbx9dzgn1m";
        libraryHaskellDepends = [
-         base genvalidity genvalidity-containers genvalidity-time mergeless
-         QuickCheck
+         base containers genvalidity genvalidity-containers genvalidity-time
+         mergeless QuickCheck
        ];
        testHaskellDepends = [
          base containers genvalidity-hspec genvalidity-hspec-aeson
-         genvalidity-typed-uuid hspec mergeless mtl QuickCheck random time
-         typed-uuid uuid
+         genvalidity-uuid hspec mergeless mtl pretty-show QuickCheck random
+         time uuid
+       ];
+       benchmarkHaskellDepends = [
+         base criterion genvalidity-criterion mergeless
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "genvalidity-path" = callPackage
@@ -93921,8 +87549,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-path";
-       version = "0.3.0.3";
-       sha256 = "10vlhkr75xjdvz9s6b6m3dwi0b7h3vnwvyqwdzp96njl5l6i3944";
+       version = "0.3.0.4";
+       sha256 = "0sv059xwz0qrw5718qszh3h7n923xxq3klvzmfrr7k4k5q48513l";
        libraryHaskellDepends = [
          base genvalidity path QuickCheck validity-path
        ];
@@ -93932,27 +87560,9 @@ self: {
        ];
        description = "GenValidity support for Path";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {genvalidity-criterion = null;};
-
-  "genvalidity-property" = callPackage
-    ({ mkDerivation, base, directory, doctest, filepath, genvalidity
-     , hspec, QuickCheck, validity
-     }:
-     mkDerivation {
-       pname = "genvalidity-property";
-       version = "0.4.0.0";
-       sha256 = "0zayycx62226w54rvkxwhvqhznsr33dk3ds55yyqrfqbnhvph1s9";
-       libraryHaskellDepends = [
-         base genvalidity hspec QuickCheck validity
-       ];
-       testHaskellDepends = [ base directory doctest filepath ];
-       description = "Standard properties for functions on `Validity` types";
-       license = stdenv.lib.licenses.mit;
      }) {};
 
-  "genvalidity-property_0_5_0_1" = callPackage
+  "genvalidity-property" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, genvalidity
      , hspec, pretty-show, QuickCheck, validity
      }:
@@ -93966,7 +87576,6 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Standard properties for functions on `Validity` types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-scientific" = callPackage
@@ -93975,8 +87584,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-scientific";
-       version = "0.2.1.0";
-       sha256 = "0gchsn5pvmbk57y7jn33zcbdr78mx3vb8v4cwr8b4pj5af6d84dg";
+       version = "0.2.1.1";
+       sha256 = "1slcalgm79y7m5albya4n8bwv4721crr19iwvqkdy806rwr67dx9";
        libraryHaskellDepends = [
          base genvalidity QuickCheck scientific validity validity-scientific
        ];
@@ -93988,32 +87597,14 @@ self: {
      }) {};
 
   "genvalidity-text" = callPackage
-    ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec
-     , QuickCheck, text, validity, validity-text
-     }:
-     mkDerivation {
-       pname = "genvalidity-text";
-       version = "0.6.0.0";
-       sha256 = "01684mmf2vk4kvk4nanrlsa237jlx1713cqrsgrnwvb1n8x0z2ja";
-       libraryHaskellDepends = [
-         array base genvalidity QuickCheck text validity validity-text
-       ];
-       testHaskellDepends = [
-         base genvalidity genvalidity-hspec hspec QuickCheck text
-       ];
-       description = "GenValidity support for Text";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "genvalidity-text_0_7_0_1" = callPackage
     ({ mkDerivation, array, base, criterion, genvalidity
      , genvalidity-criterion, genvalidity-hspec, hspec, QuickCheck
      , random, text, validity, validity-text
      }:
      mkDerivation {
        pname = "genvalidity-text";
-       version = "0.7.0.1";
-       sha256 = "13lpvjid379acapk8if3355zrgaaw2dg8fw52vzby9hqj4ki4gxs";
+       version = "0.7.0.2";
+       sha256 = "0p2g8qffg3ajzvjs5vxz558ch94aqqxjvqddwgy1apcxaa933j9c";
        libraryHaskellDepends = [
          array base genvalidity QuickCheck random text validity
          validity-text
@@ -94026,22 +87617,24 @@ self: {
        ];
        description = "GenValidity support for Text";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {genvalidity-criterion = null;};
+     }) {};
 
   "genvalidity-time" = callPackage
-    ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
-     , QuickCheck, time, validity-time
+    ({ mkDerivation, base, criterion, genvalidity
+     , genvalidity-criterion, genvalidity-hspec, hspec, QuickCheck, time
+     , validity-time
      }:
      mkDerivation {
        pname = "genvalidity-time";
-       version = "0.2.1.1";
-       sha256 = "0x3qddniy2a0qfyaxi1mfw9kqijky2gwyp19bcsp1gfxxl3c4mf5";
+       version = "0.3.0.0";
+       sha256 = "1za9sgwjm1vlp1q12dj0fmrvph6xcgnalvvjsxqvg9p7p6s9avnw";
        libraryHaskellDepends = [
          base genvalidity QuickCheck time validity-time
        ];
        testHaskellDepends = [ base genvalidity-hspec hspec time ];
+       benchmarkHaskellDepends = [
+         base criterion genvalidity-criterion time
+       ];
        description = "GenValidity support for time";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -94053,8 +87646,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-typed-uuid";
-       version = "0.0.0.0";
-       sha256 = "17lxwdb94lqprbymqsrm8xkgmgxaff6a3cczb1mzid9c91s1ym88";
+       version = "0.0.0.1";
+       sha256 = "12b9pqly41kwvyqzlqs2nv882m0vvkf06bshngvhjl4ykn7almqk";
        libraryHaskellDepends = [
          base genvalidity genvalidity-uuid QuickCheck typed-uuid
        ];
@@ -94073,8 +87666,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-unordered-containers";
-       version = "0.3.0.0";
-       sha256 = "0dln4mba85vi8dlw0l7qqvcayazs12jy4a8ri3brf3kz9vhvi9rh";
+       version = "0.3.0.1";
+       sha256 = "11f8j256944c96h1p5av9c2y4czmh7wkdmi70m3y2gd6cz24jgn2";
        libraryHaskellDepends = [
          base genvalidity hashable QuickCheck unordered-containers validity
          validity-unordered-containers
@@ -94093,8 +87686,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-uuid";
-       version = "0.1.0.2";
-       sha256 = "04pladdynmjdcd553cp44nli7k5hxp82rlpyihi1ynm7q3glndfi";
+       version = "0.1.0.3";
+       sha256 = "1kjvl1i4nih5yyydilwsq1mssw1ljiipi20k5pxjh5rgb4f1p520";
        libraryHaskellDepends = [
          base genvalidity QuickCheck uuid validity validity-uuid
        ];
@@ -94111,8 +87704,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-vector";
-       version = "0.3.0.0";
-       sha256 = "11qvacfhf60rdya2v5c7j94jgvyinz7ydhl5f8l0h1xrlw2n7w3h";
+       version = "0.3.0.1";
+       sha256 = "0y3msx28w15zy35x7w4p88xp5s1jy6p4gm3msviciy2swnm79vr0";
        libraryHaskellDepends = [
          base genvalidity QuickCheck validity validity-vector vector
        ];
@@ -94143,8 +87736,6 @@ self: {
        ];
        description = "Performs geo location lookups and parses the results";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "geo-uk" = callPackage
@@ -94203,8 +87794,6 @@ self: {
        ];
        description = "Geodetic calculations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "geodetic-types" = callPackage
@@ -94216,8 +87805,6 @@ self: {
        libraryHaskellDepends = [ base dimensional lens semigroups ];
        description = "Types for geodetic operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "geodetics" = callPackage
@@ -94227,8 +87814,8 @@ self: {
      }:
      mkDerivation {
        pname = "geodetics";
-       version = "0.1.0";
-       sha256 = "1yq5d5k4p1vzql37q9a5c37riz87mh94rk0xv67xiaa4f8vpchqm";
+       version = "0.1.2";
+       sha256 = "18jjq4z16v6mkmm4as67srrwzk75cl32jlph3qbm106gms54vska";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base dimensional semigroups ];
        testHaskellDepends = [
@@ -94285,8 +87872,6 @@ self: {
        ];
        description = "A thin GeoJSON Layer above the aeson library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "geojson-types" = callPackage
@@ -94298,8 +87883,6 @@ self: {
        libraryHaskellDepends = [ aeson base bson bytestring lens text ];
        description = "GeoJSON data types including JSON/BSON conversion";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "geolite-csv" = callPackage
@@ -94318,8 +87901,6 @@ self: {
        ];
        description = "Geolite CSV Parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "geom2d" = callPackage
@@ -94332,8 +87913,6 @@ self: {
        testHaskellDepends = [ base ieee754 linear QuickCheck ];
        description = "package for geometry in euklidean 2d space";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "geos" = callPackage
@@ -94354,8 +87933,6 @@ self: {
        testSystemDepends = [ geos_c ];
        description = "Bindings for GEOS";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {geos_c = null;};
 
   "getemx" = callPackage
@@ -94374,8 +87951,6 @@ self: {
        ];
        description = "Fetch from emusic using .emx files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "getflag" = callPackage
@@ -94387,8 +87962,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Command-line parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "getopt-generics" = callPackage
@@ -94468,8 +88041,6 @@ self: {
        executableHaskellDepends = [ base containers parsec ];
        description = "A type checker and runtime system of rCOS/g (impl. of ggts-FCS).";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gh-labeler" = callPackage
@@ -94487,8 +88058,6 @@ self: {
        ];
        description = "Github Standard Labeler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gh-pocket-knife" = callPackage
@@ -94628,8 +88197,6 @@ self: {
        testHaskellDepends = [ base ghc ghc-paths ];
        description = "A small-step semantics for Core";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-datasize" = callPackage
@@ -94641,8 +88208,6 @@ self: {
        libraryHaskellDepends = [ base deepseq ghc-heap ghc-prim ];
        description = "Determine the size of data structures in GHC's memory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-dump-core" = callPackage
@@ -94682,8 +88247,6 @@ self: {
        ];
        description = "Dump GHC's parsed, renamed, and type checked ASTs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-dump-util" = callPackage
@@ -94718,8 +88281,6 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        description = "Explicitly prevent sharing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-events" = callPackage
@@ -94762,8 +88323,6 @@ self: {
        ];
        description = "Analyze and visualize event logs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-events-parallel" = callPackage
@@ -94787,34 +88346,9 @@ self: {
        ];
        description = "Library and tool for parsing .eventlog files from parallel GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-exactprint" = callPackage
-    ({ mkDerivation, base, bytestring, containers, Diff, directory
-     , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
-     , silently, syb
-     }:
-     mkDerivation {
-       pname = "ghc-exactprint";
-       version = "0.6.1";
-       sha256 = "12nqpqmi9c57a3hgpfy8q073zryz66ylmcvf29hyffpj7vmmnvhl";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring containers directory filepath free ghc ghc-boot
-         ghc-paths mtl syb
-       ];
-       testHaskellDepends = [
-         base bytestring containers Diff directory filemanip filepath ghc
-         ghc-boot ghc-paths HUnit mtl silently syb
-       ];
-       description = "ExactPrint for GHC";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-exactprint_0_6_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, Diff, directory
      , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
      , silently, syb
@@ -94835,7 +88369,6 @@ self: {
        ];
        description = "ExactPrint for GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-gc-tune" = callPackage
@@ -94860,8 +88393,6 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        description = "Derived instances of GHC.Generic of the GHC AST";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-heap-view" = callPackage
@@ -94929,8 +88460,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Find the Haddock documentation for a symbol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-instances" = callPackage
@@ -94952,8 +88481,6 @@ self: {
        ];
        description = "Easily import all instances contained in GHC distributed libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-justdoit" = callPackage
@@ -94969,31 +88496,6 @@ self: {
      }) {};
 
   "ghc-lib" = callPackage
-    ({ mkDerivation, alex, array, base, binary, bytestring, containers
-     , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy
-     , haskeline, hpc, pretty, process, time, transformers, unix
-     }:
-     mkDerivation {
-       pname = "ghc-lib";
-       version = "8.8.0.20190424";
-       sha256 = "03f1racabmixc4jk3mn6k6cnhapaplswa8fbb9yajrzj56ag16wm";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array base binary bytestring containers deepseq directory filepath
-         ghc-lib-parser ghc-prim hpc pretty process time transformers unix
-       ];
-       libraryToolDepends = [ alex happy ];
-       executableHaskellDepends = [
-         array base bytestring containers deepseq directory filepath
-         ghc-prim haskeline process time transformers unix
-       ];
-       description = "The GHC API, decoupled from GHC versions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-lib_8_8_2_20200205" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
      , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy
      , hpc, pretty, process, time, transformers, unix
@@ -95010,29 +88512,9 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "The GHC API, decoupled from GHC versions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-lib-parser" = callPackage
-    ({ mkDerivation, alex, array, base, binary, bytestring, containers
-     , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty
-     , process, time, transformers, unix
-     }:
-     mkDerivation {
-       pname = "ghc-lib-parser";
-       version = "8.8.0.20190424";
-       sha256 = "12gsh994pr13bsybwlravmi21la66dyw74pk74yfw2pnz682wv10";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array base binary bytestring containers deepseq directory filepath
-         ghc-prim hpc pretty process time transformers unix
-       ];
-       libraryToolDepends = [ alex happy ];
-       description = "The GHC API, decoupled from GHC versions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-lib-parser_8_8_2_20200205" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
      , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty
      , process, time, transformers, unix
@@ -95049,27 +88531,48 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "The GHC API, decoupled from GHC versions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-lib-parser-ex" = callPackage
-    ({ mkDerivation, base, bytestring, directory, extra, filepath
-     , ghc-lib-parser, tasty, tasty-hunit, uniplate
+    ({ mkDerivation, base, bytestring, directory, extra, filepath, ghc
+     , ghc-boot, ghc-boot-th, tasty, tasty-hunit, uniplate
      }:
      mkDerivation {
        pname = "ghc-lib-parser-ex";
-       version = "8.8.4.0";
-       sha256 = "17vvqk2kkh8rd7shpdzassijfrdljbgbgm955l75569chsbf5xma";
+       version = "8.8.5.1";
+       sha256 = "0bwlahldxgac9vi79qbz88vjd5hq2cijfjhfb8ahdgdksl2m7k39";
        libraryHaskellDepends = [
-         base bytestring ghc-lib-parser uniplate
+         base bytestring ghc ghc-boot ghc-boot-th uniplate
        ];
        testHaskellDepends = [
-         base directory extra filepath ghc-lib-parser tasty tasty-hunit
+         base directory extra filepath ghc ghc-boot-th tasty tasty-hunit
        ];
        description = "Algorithms on GHC parse trees";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-lib-parser-ex_8_8_5_2" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, extra
+     , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit
+     , uniplate
+     }:
+     mkDerivation {
+       pname = "ghc-lib-parser-ex";
+       version = "8.8.5.2";
+       sha256 = "0jydlqb2nymrqvyn798vb8k4ak49m0qnnv725mzwlnn77krvnlka";
+       revision = "1";
+       editedCabalFile = "010wpn9ivczixfg2cj4n4f8924jaw6y4j6fd9z8bih7f53wyldnr";
+       libraryHaskellDepends = [
+         base bytestring containers ghc ghc-boot ghc-boot-th uniplate
+       ];
+       testHaskellDepends = [
+         base directory extra filepath ghc ghc-boot-th tasty tasty-hunit
+       ];
+       description = "Algorithms on GHC parse trees";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-make" = callPackage
     ({ mkDerivation, base, process, shake, unordered-containers }:
      mkDerivation {
@@ -95096,8 +88599,6 @@ self: {
        executableHaskellDepends = [ base parsec process ];
        description = "Generate a bash completion from the GHC manpage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-mod" = callPackage
@@ -95144,8 +88645,6 @@ self: {
        ];
        description = "Happy Haskell Hacking";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-mtl" = callPackage
@@ -95209,8 +88708,6 @@ self: {
        ];
        description = "A parallel wrapper for 'ghc --make'";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-parser" = callPackage
@@ -95254,8 +88751,6 @@ self: {
        ];
        description = "Simple utility to fix BROKEN package dependencies for cabal-install";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-pkg-lib" = callPackage
@@ -95270,8 +88765,6 @@ self: {
        ];
        description = "Provide library support for ghc-pkg information";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-prim_0_5_3" = callPackage
@@ -95363,8 +88856,6 @@ self: {
        testHaskellDepends = [ base transformers ];
        description = "GHC plugin to prove program equations by simplification";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-server" = callPackage
@@ -95395,8 +88886,6 @@ self: {
        executableHaskellDepends = [ base transformers ];
        description = "Simplified GHC API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-simple" = callPackage
@@ -95412,8 +88901,6 @@ self: {
        ];
        description = "Simplified interface to the GHC API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-source-gen" = callPackage
@@ -95441,8 +88928,6 @@ self: {
        libraryHaskellDepends = [ array base containers ghc hpc ];
        description = "Generic GHC Plugin for annotating Haskell code with source location data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-syb" = callPackage
@@ -95454,8 +88939,6 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        description = "Data and Typeable instances for the GHC API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-syb-utils" = callPackage
@@ -95467,26 +88950,9 @@ self: {
        libraryHaskellDepends = [ base bytestring ghc syb ];
        description = "Scrap Your Boilerplate utilities for the GHC API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-syntax-highlighter" = callPackage
-    ({ mkDerivation, base, ghc, ghc-boot, hspec, hspec-discover, text
-     }:
-     mkDerivation {
-       pname = "ghc-syntax-highlighter";
-       version = "0.0.4.1";
-       sha256 = "0glsfz2sn6a161m3sy08nf739ndgslqd8s7fawyas9ziqg06lvjg";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ base ghc ghc-boot text ];
-       testHaskellDepends = [ base hspec text ];
-       testToolDepends = [ hspec-discover ];
-       description = "Syntax highlighter for Haskell using lexer of GHC itself";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-syntax-highlighter_0_0_5_0" = callPackage
     ({ mkDerivation, base, ghc-lib-parser, hspec, hspec-discover, text
      }:
      mkDerivation {
@@ -95501,21 +88967,9 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Syntax highlighter for Haskell using lexer of GHC itself";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-tcplugins-extra" = callPackage
-    ({ mkDerivation, base, ghc }:
-     mkDerivation {
-       pname = "ghc-tcplugins-extra";
-       version = "0.3.2";
-       sha256 = "13qhwjbhyi3nrjdvc0fdgxf4kz55my541mz2j3sndpxsmbymqs3m";
-       libraryHaskellDepends = [ base ghc ];
-       description = "Utilities for writing GHC type-checker plugins";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-tcplugins-extra_0_4" = callPackage
     ({ mkDerivation, base, ghc }:
      mkDerivation {
        pname = "ghc-tcplugins-extra";
@@ -95524,7 +88978,6 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        description = "Utilities for writing GHC type-checker plugins";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-time-alloc-prof" = callPackage
@@ -95544,8 +88997,6 @@ self: {
        ];
        description = "Library for parsing GHC time and allocation profiling reports";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-timers" = callPackage
@@ -95569,34 +89020,9 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Faster traceEvent and traceMarker, and binary object logging for eventlog";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-typelits-extra" = callPackage
-    ({ mkDerivation, base, containers, ghc, ghc-prim
-     , ghc-tcplugins-extra, ghc-typelits-knownnat
-     , ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit
-     , transformers
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-extra";
-       version = "0.3.2";
-       sha256 = "0swb3gil4760dlwyj8vrsrbwsr3jkxxyam7yy4xcih37zbk91qhv";
-       libraryHaskellDepends = [
-         base containers ghc ghc-prim ghc-tcplugins-extra
-         ghc-typelits-knownnat ghc-typelits-natnormalise integer-gmp
-         transformers
-       ];
-       testHaskellDepends = [
-         base ghc-typelits-knownnat ghc-typelits-natnormalise tasty
-         tasty-hunit
-       ];
-       description = "Additional type-level operations on GHC.TypeLits.Nat";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-typelits-extra_0_3_3" = callPackage
     ({ mkDerivation, base, containers, ghc, ghc-prim
      , ghc-tcplugins-extra, ghc-typelits-knownnat
      , ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit
@@ -95617,30 +89043,9 @@ self: {
        ];
        description = "Additional type-level operations on GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-typelits-knownnat" = callPackage
-    ({ mkDerivation, base, ghc, ghc-tcplugins-extra
-     , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-knownnat";
-       version = "0.6";
-       sha256 = "0dzjqzfh1mywx2dzki6yhrac5l2y2h58zjwmgps3vk16n8krnljb";
-       libraryHaskellDepends = [
-         base ghc ghc-tcplugins-extra ghc-typelits-natnormalise
-         template-haskell transformers
-       ];
-       testHaskellDepends = [
-         base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck
-       ];
-       description = "Derive KnownNat constraints from other KnownNat constraints";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-typelits-knownnat_0_7_2" = callPackage
     ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra
      , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
      , template-haskell, transformers
@@ -95658,26 +89063,9 @@ self: {
        ];
        description = "Derive KnownNat constraints from other KnownNat constraints";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-typelits-natnormalise" = callPackage
-    ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
-     , tasty-hunit, template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-natnormalise";
-       version = "0.6.2";
-       sha256 = "04a338yfcl6jm1daax08zsy03myii4llzih4mlprkyid8i0yn740";
-       libraryHaskellDepends = [
-         base ghc ghc-tcplugins-extra integer-gmp transformers
-       ];
-       testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
-       description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-typelits-natnormalise_0_7_1" = callPackage
     ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra
      , integer-gmp, syb, tasty, tasty-hunit, template-haskell
      , transformers
@@ -95693,7 +89081,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
        description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-typelits-presburger" = callPackage
@@ -95704,6 +89091,8 @@ self: {
        pname = "ghc-typelits-presburger";
        version = "0.3.0.0";
        sha256 = "1jahwmy2cywnnlvrjizak1wqih7pki9r35qazcz7mih68pd9gnhz";
+       revision = "1";
+       editedCabalFile = "0kh04p9n9q74n84vrzrybkd45alwzhll8m6xwn8nzi1bxpilrhm4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95712,8 +89101,6 @@ self: {
        ];
        description = "Presburger Arithmetic Solver for GHC Type-level natural numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-usage" = callPackage
@@ -95728,8 +89115,6 @@ self: {
        executableHaskellDepends = [ base ghc-paths unix ];
        description = "Print minimal export lists";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghc-vis" = callPackage
@@ -95748,8 +89133,6 @@ self: {
        ];
        description = "Live visualization of data structures in GHCi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghcflags" = callPackage
@@ -95788,8 +89171,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghci-dap";
-       version = "0.0.13.0";
-       sha256 = "1zmj5hqc1iqmpi6993snbpbdw9zyg9k2v1kpr31766pnkbynbqp4";
+       version = "0.0.14.0";
+       sha256 = "0gnawjk1bzrcinazygwal4kfnqq780v7q4lm0xrvjb50cvixkjpf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95815,8 +89198,6 @@ self: {
        libraryHaskellDepends = [ base cairo colour diagrams gtk ];
        description = "Display simple diagrams from ghci";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghci-haskeline" = callPackage
@@ -95835,8 +89216,6 @@ self: {
        ];
        description = "An implementation of ghci using the Haskeline line-input library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghci-hexcalc" = callPackage
@@ -95861,8 +89240,6 @@ self: {
        testHaskellDepends = [ base doctest hspec parsec ];
        description = "parse output of ghci \":history\" command";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghci-lib" = callPackage
@@ -95874,8 +89251,6 @@ self: {
        libraryHaskellDepends = [ base ghc MissingH ];
        description = "A library for interactively evaluating Haskell code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghci-ng" = callPackage
@@ -95897,8 +89272,6 @@ self: {
        ];
        description = "Next generation GHCi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghci-pretty" = callPackage
@@ -95910,8 +89283,6 @@ self: {
        libraryHaskellDepends = [ base hscolour ipprint ];
        description = "colored pretty-printing within ghci";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghci-websockets" = callPackage
@@ -95931,32 +89302,6 @@ self: {
      }) {};
 
   "ghcid" = callPackage
-    ({ mkDerivation, ansi-terminal, base, cmdargs, containers
-     , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit
-     , terminal-size, time, unix
-     }:
-     mkDerivation {
-       pname = "ghcid";
-       version = "0.7.7";
-       sha256 = "1qrj6is1f6jnx9m2g7cp2009dik7inzf5yqlvqv4pwzzxp0nhl3a";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-terminal base cmdargs directory extra filepath process time
-       ];
-       executableHaskellDepends = [
-         ansi-terminal base cmdargs containers directory extra filepath
-         fsnotify process terminal-size time unix
-       ];
-       testHaskellDepends = [
-         ansi-terminal base cmdargs containers directory extra filepath
-         fsnotify process tasty tasty-hunit terminal-size time unix
-       ];
-       description = "GHCi based bare bones IDE";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghcid_0_8_1" = callPackage
     ({ mkDerivation, ansi-terminal, base, cmdargs, containers
      , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit
      , terminal-size, time, unix
@@ -95980,7 +89325,6 @@ self: {
        ];
        description = "GHCi based bare bones IDE";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghcide" = callPackage
@@ -96024,8 +89368,6 @@ self: {
        ];
        description = "The core of an IDE";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghcjs-ajax" = callPackage
@@ -96082,8 +89424,6 @@ self: {
        ];
        description = "Allow GHCJS projects to compile under GHC and develop using intero";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghcjs-codemirror" = callPackage
@@ -96155,8 +89495,6 @@ self: {
        sha256 = "02m0qszdl3kxyhjrzj1ph9gwbr9jkzak2v1b47v6ywsm7hmjgn7w";
        description = "DOM library using JSFFI and GHCJS";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghcjs-dom-webkit" = callPackage
@@ -96189,8 +89527,6 @@ self: {
        ];
        description = "GHCJS bindings for the JavaScript Fetch API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghcjs-hplay" = callPackage
@@ -96207,8 +89543,6 @@ self: {
        ];
        description = "Client-side web EDSL for transient nodes running in the web browser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghcjs-perch" = callPackage
@@ -96231,8 +89565,6 @@ self: {
        libraryHaskellDepends = [ base ghcjs-base protolude ];
        description = "Bidirectional bidings to javascript's promise";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghcjs-vdom" = callPackage
@@ -96281,8 +89613,6 @@ self: {
        libraryHaskellDepends = [ base ghcjs-base text ];
        description = "XmlHttpRequest (\"AJAX\") bindings for GHCJS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghclive" = callPackage
@@ -96309,8 +89639,6 @@ self: {
        ];
        description = "Interactive Haskell interpreter in a browser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghcprofview" = callPackage
@@ -96329,8 +89657,6 @@ self: {
        ];
        description = "GHC .prof files viewer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ghczdecode" = callPackage
@@ -96379,8 +89705,6 @@ self: {
        ];
        description = "Trivial routines for inspecting git repositories";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gi-atk" = callPackage
@@ -96438,8 +89762,6 @@ self: {
        ];
        description = "Bridge between packages gi-* and cairo-core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gi-cairo-connector" = callPackage
@@ -96590,6 +89912,28 @@ self: {
      }) {inherit (pkgs) gdk-pixbuf;};
 
   "gi-gdkx11" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
+     , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk3, haskell-gi
+     , haskell-gi-base, haskell-gi-overloading, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-gdkx11";
+       version = "3.0.9";
+       sha256 = "0z3vwwpv8a85nvg2bc4cdaa8w4jmdl5mm5bxfpwmssyxcnm1xdnc";
+       setupHaskellDepends = [
+         base Cabal gi-cairo gi-gdk gi-gio gi-gobject gi-xlib haskell-gi
+       ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-cairo gi-gdk gi-gio gi-gobject
+         gi-xlib haskell-gi haskell-gi-base haskell-gi-overloading text
+         transformers
+       ];
+       libraryPkgconfigDepends = [ gtk3 ];
+       description = "GdkX11 bindings";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {inherit (pkgs) gtk3;};
+
+  "gi-gdkx11_4_0_1" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
      , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk4-x11, haskell-gi
      , haskell-gi-base, haskell-gi-overloading, text, transformers
@@ -96610,7 +89954,6 @@ self: {
        description = "GdkX11 bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gtk4-x11 = null;};
 
   "gi-ggit" = callPackage
@@ -96653,6 +89996,26 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
+  "gi-gio_2_0_26" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
+     , gi-gobject, glib, haskell-gi, haskell-gi-base
+     , haskell-gi-overloading, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-gio";
+       version = "2.0.26";
+       sha256 = "0a75azw25aww3pbhmjpvqn2w3qr430c4s8kk70xf87af0nlv21sp";
+       setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-glib gi-gobject haskell-gi
+         haskell-gi-base haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ glib ];
+       description = "Gio bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) glib;};
+
   "gi-girepository" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, gobject-introspection, haskell-gi, haskell-gi-base
@@ -96727,8 +90090,6 @@ self: {
        libraryPkgconfigDepends = [ graphene-gobject ];
        description = "Graphene bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {graphene-gobject = null;};
 
   "gi-gsk" = callPackage
@@ -96753,8 +90114,6 @@ self: {
        libraryPkgconfigDepends = [ gtk4 ];
        description = "Gsk bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gtk4 = null;};
 
   "gi-gst" = callPackage
@@ -96840,8 +90199,6 @@ self: {
        libraryPkgconfigDepends = [ gstreamer-pbutils ];
        description = "GStreamer Plugins Base Utils bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gstreamer-pbutils = null;};
 
   "gi-gsttag" = callPackage
@@ -96863,8 +90220,6 @@ self: {
        libraryPkgconfigDepends = [ gstreamer-tag ];
        description = "GStreamer Tag bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gstreamer-tag = null;};
 
   "gi-gstvideo" = callPackage
@@ -96959,8 +90314,6 @@ self: {
        ];
        description = "Declarative GTK+ programming in Haskell";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gi-gtk-declarative-app-simple" = callPackage
@@ -96979,8 +90332,6 @@ self: {
        ];
        description = "Declarative GTK+ programming in Haskell in the style of Pux";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gi-gtk-hs" = callPackage
@@ -96990,8 +90341,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtk-hs";
-       version = "0.3.8.0";
-       sha256 = "0cpykq24fjpidxb1hh6qi74xv5lh6nrz8q1l4iqy8jx26qlzri5l";
+       version = "0.3.8.1";
+       sha256 = "05j26w01izxwjq2jg2nds20p6vgd5b974b07cr0m7w6hhm4v51hk";
        libraryHaskellDepends = [
          base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject
          gi-gtk haskell-gi-base mtl text transformers
@@ -97019,8 +90370,6 @@ self: {
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
        description = "GtkosxApplication bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gtk-mac-integration-gtk3 = null;};
 
   "gi-gtksource" = callPackage
@@ -97069,8 +90418,6 @@ self: {
        libraryPkgconfigDepends = [ libhandy ];
        description = "libhandy bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libhandy;};
 
   "gi-javascriptcore" = callPackage
@@ -97112,8 +90459,6 @@ self: {
        libraryPkgconfigDepends = [ libnotify ];
        description = "Libnotify bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libnotify;};
 
   "gi-ostree" = callPackage
@@ -97206,8 +90551,6 @@ self: {
        libraryPkgconfigDepends = [ poppler ];
        description = "Poppler bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) poppler;};
 
   "gi-secret" = callPackage
@@ -97229,8 +90572,6 @@ self: {
        libraryPkgconfigDepends = [ libsecret ];
        description = "Libsecret bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libsecret;};
 
   "gi-soup" = callPackage
@@ -97372,8 +90713,6 @@ self: {
        libraryPkgconfigDepends = [ libwnck ];
        description = "Wnck bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libwnck;};
 
   "gi-xlib" = callPackage
@@ -97412,8 +90751,6 @@ self: {
        ];
        description = "Fuzzy finder for cabal executables";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gimlh" = callPackage
@@ -97501,8 +90838,6 @@ self: {
        executableSystemDepends = [ openssl ];
        description = "Ginsu Gale Client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "gio" = callPackage
@@ -97543,8 +90878,6 @@ self: {
        ];
        description = "Git Performance Dashboard";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "giphy-api" = callPackage
@@ -97570,8 +90903,6 @@ self: {
        ];
        description = "Giphy HTTP API wrapper and CLI search tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gist" = callPackage
@@ -97589,8 +90920,6 @@ self: {
        ];
        description = "A reliable command-line client for gist.github.com";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git" = callPackage
@@ -97658,8 +90987,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "7.20200204";
-       sha256 = "09jf3hbi8gvv0zwyhyyidc3mqjz9p4ji3wg9kh4f0hgx5vcwzsms";
+       version = "7.20200219";
+       sha256 = "0pzwjh98jpirgssbd7pqfk7mzraibrk277dn34s2mrah8zy75b58";
        configureFlags = [
          "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
          "-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser"
@@ -97744,8 +91073,6 @@ self: {
        ];
        description = "Maintain per-branch checklists in Git";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-config" = callPackage
@@ -97767,8 +91094,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A simple parser for Git configuration files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-date" = callPackage
@@ -97789,8 +91114,6 @@ self: {
        ];
        description = "Bindings to the date parsing from Git";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-embed" = callPackage
@@ -97828,8 +91151,6 @@ self: {
        ];
        description = "Custom git command for formatting code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-freq" = callPackage
@@ -97872,8 +91193,6 @@ self: {
        ];
        description = "More intelligent push-to-GitHub utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-jump" = callPackage
@@ -97887,8 +91206,6 @@ self: {
        executableHaskellDepends = [ base base-compat process ];
        description = "Move a git branch";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-lfs" = callPackage
@@ -97923,8 +91240,6 @@ self: {
        ];
        description = "Tool to help resolving git conflicts";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-monitor" = callPackage
@@ -97964,8 +91279,6 @@ self: {
        ];
        description = "Git object and its parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-remote-ipfs" = callPackage
@@ -97997,8 +91310,6 @@ self: {
        ];
        description = "Git remote helper to store git objects on IPFS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-repair" = callPackage
@@ -98026,8 +91337,6 @@ self: {
        ];
        description = "repairs a damanged git repisitory";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-sanity" = callPackage
@@ -98047,8 +91356,6 @@ self: {
        executableHaskellDepends = [ base Cabal ];
        description = "A sanity checker for your git history";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "git-vogue" = callPackage
@@ -98078,8 +91385,6 @@ self: {
        testToolDepends = [ git ];
        description = "A framework for pre-commit checks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gitHUD" = callPackage
@@ -98135,8 +91440,6 @@ self: {
        ];
        description = "Create Github issues out of TODO comments in code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "githash" = callPackage
@@ -98164,18 +91467,18 @@ self: {
      , deepseq, deepseq-generics, exceptions, file-embed, hashable
      , hspec, hspec-discover, http-client, http-client-tls
      , http-link-header, http-types, iso8601-time, mtl, network-uri
-     , tagged, text, time, tls, transformers, transformers-compat
+     , tagged, text, time-compat, tls, transformers, transformers-compat
      , unordered-containers, vector, vector-instances
      }:
      mkDerivation {
        pname = "github";
-       version = "0.24";
-       sha256 = "0jbk34aibm5bqbax8f2sif840f31g81yipnkav96lr4pfdv5b4mr";
+       version = "0.25";
+       sha256 = "18avfzs7q16aagaqam0wblmq0wynl723gncwdcman4wbj4fayz3m";
        libraryHaskellDepends = [
          aeson base base-compat base16-bytestring binary binary-instances
          bytestring containers cryptohash-sha1 deepseq deepseq-generics
          exceptions hashable http-client http-client-tls http-link-header
-         http-types iso8601-time mtl network-uri tagged text time tls
+         http-types iso8601-time mtl network-uri tagged text time-compat tls
          transformers transformers-compat unordered-containers vector
          vector-instances
        ];
@@ -98213,8 +91516,6 @@ self: {
        executableToolDepends = [ git ];
        description = "backs up everything github knows about a repository, to the repository";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) git;};
 
   "github-data" = callPackage
@@ -98229,6 +91530,8 @@ self: {
        pname = "github-data";
        version = "0.18";
        sha256 = "1rqnjw8cz4xby1gbc9w8wpk1z0vg8wsm8jq7qz0ncjrm8manii5p";
+       revision = "1";
+       editedCabalFile = "1qgd6xblmsjgzys6zix9xs9sd6p3q5vw9l88gchv90wsh0kbssbg";
        libraryHaskellDepends = [
          aeson aeson-compat base base-compat base16-bytestring binary
          binary-orphans bytestring containers deepseq deepseq-generics
@@ -98238,8 +91541,6 @@ self: {
        ];
        description = "Access to the GitHub API, v3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "github-post-receive" = callPackage
@@ -98321,8 +91622,6 @@ self: {
        ];
        description = "Various Github helper utilities";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "github-types" = callPackage
@@ -98353,8 +91652,6 @@ self: {
        libraryHaskellDepends = [ base basic-prelude github text ];
        description = "Useful functions that use the GitHub API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "github-webhook-handler" = callPackage
@@ -98373,8 +91670,6 @@ self: {
        ];
        description = "GitHub WebHook Handler";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "github-webhook-handler-snap" = callPackage
@@ -98393,29 +91688,9 @@ self: {
        ];
        description = "GitHub WebHook Handler implementation for Snap";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "github-webhooks" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
-     , cryptonite, deepseq, deepseq-generics, hspec, memory, text, time
-     , vector
-     }:
-     mkDerivation {
-       pname = "github-webhooks";
-       version = "0.10.1";
-       sha256 = "1hjl5ygvxhh70l951zc4n4qmdf3vf2x983jyimsinyv03bl11i6x";
-       libraryHaskellDepends = [
-         aeson base base16-bytestring bytestring cryptonite deepseq
-         deepseq-generics memory text time vector
-       ];
-       testHaskellDepends = [ aeson base bytestring hspec text vector ];
-       description = "Aeson instances for GitHub Webhook payloads";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "github-webhooks_0_11_0" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
      , cryptonite, deepseq, deepseq-generics, hspec, memory, text, time
      , vector
@@ -98431,7 +91706,6 @@ self: {
        testHaskellDepends = [ aeson base bytestring hspec text vector ];
        description = "Aeson instances for GitHub Webhook payloads";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "githud" = callPackage
@@ -98442,8 +91716,8 @@ self: {
      }:
      mkDerivation {
        pname = "githud";
-       version = "3.2.0";
-       sha256 = "12q21ha2v85ss6df0wx6h1300l93msqv0zwcgn3g2bir66blyd8a";
+       version = "3.2.1";
+       sha256 = "1vvqn7wvalywnimv5kxz44pv4szm5csmvk54jbmsls2x0qginmqb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -98475,8 +91749,6 @@ self: {
        ];
        description = "Apply GitHub .gitignore templates to already existing repositories.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gitit" = callPackage
@@ -98512,8 +91784,6 @@ self: {
        ];
        description = "Wiki using happstack, git or darcs, and pandoc";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gitlab-api" = callPackage
@@ -98530,8 +91800,6 @@ self: {
        testHaskellDepends = [ base hspec rio ];
        description = "Gitlab Web API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gitlab-haskell" = callPackage
@@ -98614,8 +91882,6 @@ self: {
        ];
        description = "Run tests between repositories";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gitlib-libgit2" = callPackage
@@ -98671,8 +91937,6 @@ self: {
        ];
        description = "Gitlib repository backend for storing Git objects in Amazon S3";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gitlib-sample" = callPackage
@@ -98722,8 +91986,6 @@ self: {
        ];
        description = "Generic utility functions for working with Git repositories";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gitrev" = callPackage
@@ -98764,8 +92026,6 @@ self: {
        ];
        description = "A document store library for Git + JSON";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gitter" = callPackage
@@ -98808,8 +92068,6 @@ self: {
        ];
        description = "CLI Giphy search tool with previews in iTerm 2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gjk" = callPackage
@@ -98897,8 +92155,6 @@ self: {
        libraryPkgconfigDepends = [ libglade ];
        description = "Binding to the glade library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs.gnome2) libglade;};
 
   "gladexml-accessor" = callPackage
@@ -98910,8 +92166,6 @@ self: {
        libraryHaskellDepends = [ base glade HaXml template-haskell ];
        description = "Automagically declares getters for widget handles in specified interface file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glambda" = callPackage
@@ -98952,8 +92206,6 @@ self: {
        ];
        description = "An OpenGL micro framework";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glasso" = callPackage
@@ -99014,8 +92266,6 @@ self: {
        ];
        description = "A threaded rendering framework using glaizer and pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glazier-react" = callPackage
@@ -99035,8 +92285,6 @@ self: {
        ];
        description = "ReactJS binding using Glazier.Command.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glazier-react-examples" = callPackage
@@ -99061,8 +92309,6 @@ self: {
        ];
        description = "Examples of using glazier-react";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glazier-react-widget" = callPackage
@@ -99082,8 +92328,6 @@ self: {
        ];
        description = "Generic widget library using glazier-react";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gli" = callPackage
@@ -99108,8 +92352,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Tiny cli to fetch PR info from gitlab";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glib" = callPackage
@@ -99143,8 +92385,6 @@ self: {
        testHaskellDepends = [ base data-default hspec lens QuickCheck ];
        description = "Glicko-2 implementation in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glider-nlp" = callPackage
@@ -99157,8 +92397,6 @@ self: {
        testHaskellDepends = [ base Cabal containers hspec text ];
        description = "Natural Language Processing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glintcollider" = callPackage
@@ -99238,8 +92476,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion Glob MissingH ];
        description = "Haskell bindings for POSIX glob library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "global" = callPackage
@@ -99257,8 +92493,6 @@ self: {
        ];
        description = "Library enabling unique top-level declarations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "global-config" = callPackage
@@ -99279,8 +92513,6 @@ self: {
        ];
        description = "Global mutable configuration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "global-lock" = callPackage
@@ -99303,8 +92535,6 @@ self: {
        libraryHaskellDepends = [ base containers stm ];
        description = "Namespaced, global, and top-level mutable variables without unsafePerformIO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glome-hs" = callPackage
@@ -99328,8 +92558,6 @@ self: {
        doHaddock = false;
        description = "ray tracer";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gloss_1_9_2_1" = callPackage
@@ -99402,8 +92630,6 @@ self: {
        libraryHaskellDepends = [ base gloss reactive-banana ];
        description = "An Interface for gloss in terms of a reactive-banana Behavior";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gloss-devil" = callPackage
@@ -99415,8 +92641,6 @@ self: {
        libraryHaskellDepends = [ base bytestring gloss repa repa-devil ];
        description = "Display images in Gloss using libdevil for decoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gloss-examples" = callPackage
@@ -99455,8 +92679,6 @@ self: {
        testHaskellDepends = [ base directory filepath gloss JuicyPixels ];
        description = "Export Gloss pictures to png, bmp, tga, tiff, gif and juicy-pixels-image";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gloss-game" = callPackage
@@ -99468,8 +92690,6 @@ self: {
        libraryHaskellDepends = [ base gloss gloss-juicy ];
        description = "Gloss wrapper that simplifies writing games";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gloss-juicy" = callPackage
@@ -99550,8 +92770,6 @@ self: {
        libraryHaskellDepends = [ base gloss sodium ];
        description = "A Sodium interface to the Gloss drawing package";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glpk-hs" = callPackage
@@ -99570,8 +92788,6 @@ self: {
        ];
        description = "Comprehensive GLPK linear programming bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) glpk;};
 
   "glue" = callPackage
@@ -99601,8 +92817,6 @@ self: {
        ];
        description = "Make better services";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "glue-common" = callPackage
@@ -99723,8 +92937,6 @@ self: {
        ];
        description = "Composable maps and generic tries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gmndl" = callPackage
@@ -99743,8 +92955,6 @@ self: {
        ];
        description = "Mandelbrot Set explorer using GTK";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gmpint" = callPackage
@@ -99772,8 +92982,6 @@ self: {
        ];
        description = "Randomly set a picture as the GNOME desktop background";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gnome-keyring" = callPackage
@@ -99808,8 +93016,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GNOME Virtual File System library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gnome-vfs = null; gnome-vfs_module = null;};
 
   "gnss-converters" = callPackage
@@ -99837,8 +93043,6 @@ self: {
        ];
        description = "GNSS Converters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gnuidn" = callPackage
@@ -99861,8 +93065,6 @@ self: {
        testToolDepends = [ c2hs ];
        description = "Bindings for GNU IDN";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libidn;};
 
   "gnuplot" = callPackage
@@ -99931,8 +93133,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Core imports for Geometric Optimization Libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "goal-geometry" = callPackage
@@ -99947,8 +93147,6 @@ self: {
        executableHaskellDepends = [ base goal-core ];
        description = "Scientific computing on geometric objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "goal-probability" = callPackage
@@ -99968,8 +93166,6 @@ self: {
        executableHaskellDepends = [ base goal-core goal-geometry vector ];
        description = "Manifolds of probability distributions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "goal-simulation" = callPackage
@@ -99993,8 +93189,6 @@ self: {
        ];
        description = "Mealy based simulation tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "goat" = callPackage
@@ -100029,8 +93223,6 @@ self: {
        testHaskellDepends = [ base containers HUnit mtl parsec ];
        description = "A monadic take on a 2,500-year-old board game - library";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "goatee-gtk" = callPackage
@@ -100051,8 +93243,6 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "A monadic take on a 2,500-year-old board game - GTK+ UI";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gochan" = callPackage
@@ -100074,8 +93264,6 @@ self: {
        testHaskellDepends = [ base hspec hspec-core ];
        description = "Go-style channels";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "godot-haskell" = callPackage
@@ -100109,8 +93297,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "The Gofer 2.30 standard prelude";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "goggles" = callPackage
@@ -102379,8 +95565,6 @@ self: {
        libraryHaskellDepends = [ base renderable transformers varying ];
        description = "Graphical user interfaces that are renderable, change over time and eventually produce a value";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "google-cloud" = callPackage
@@ -102400,8 +95584,6 @@ self: {
        ];
        description = "Client for the Google Cloud APIs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "google-dictionary" = callPackage
@@ -102436,8 +95618,6 @@ self: {
        ];
        description = "Google Drive API access";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "google-html5-slide" = callPackage
@@ -102456,8 +95636,6 @@ self: {
        ];
        description = "Google HTML5 Slide generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "google-isbn" = callPackage
@@ -102488,8 +95666,6 @@ self: {
        testHaskellDepends = [ base google-search text time xml-conduit ];
        description = "Write GMail filters and output to importable XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "google-maps-geocoding" = callPackage
@@ -102506,8 +95682,6 @@ self: {
        ];
        description = "Bindings to the Google Geocoding API (formerly Maps Geocoding API)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "google-oauth2" = callPackage
@@ -102528,8 +95702,6 @@ self: {
        ];
        description = "Google OAuth2 token negotiation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "google-oauth2-easy" = callPackage
@@ -102549,8 +95721,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Opininated use of Google Authentication for ease";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "google-oauth2-for-cli" = callPackage
@@ -102594,8 +95764,6 @@ self: {
        libraryHaskellDepends = [ base free nats text time ];
        description = "EDSL for Google and GMail search expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "google-server-api" = callPackage
@@ -102637,8 +95805,6 @@ self: {
        ];
        description = "Bindings to the Google Maps Static API (formerly Static Maps API)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "google-translate" = callPackage
@@ -102655,8 +95821,6 @@ self: {
        ];
        description = "Google Translate API bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "googleplus" = callPackage
@@ -102674,8 +95838,6 @@ self: {
        ];
        description = "Haskell implementation of the Google+ API v1";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "googlepolyline" = callPackage
@@ -102694,8 +95856,6 @@ self: {
        ];
        description = "Google Polyline Encoder/Decoder";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gopher-proxy" = callPackage
@@ -102733,8 +95893,6 @@ self: {
        ];
        description = "Spidering robot to download files from Gopherspace";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gore-and-ash" = callPackage
@@ -102753,8 +95911,6 @@ self: {
        ];
        description = "Core of FRP game engine called Gore&Ash";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gore-and-ash-actor" = callPackage
@@ -102772,8 +95928,6 @@ self: {
        ];
        description = "Gore&Ash engine extension that implements actor style of programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gore-and-ash-async" = callPackage
@@ -102796,8 +95950,6 @@ self: {
        ];
        description = "Core module for Gore&Ash engine that embeds async IO actions into game loop";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gore-and-ash-demo" = callPackage
@@ -102823,8 +95975,6 @@ self: {
        ];
        description = "Demonstration game for Gore&Ash game engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gore-and-ash-glfw" = callPackage
@@ -102841,8 +95991,6 @@ self: {
        ];
        description = "Core module for Gore&Ash engine for GLFW input events";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gore-and-ash-lambdacube" = callPackage
@@ -102862,8 +96010,6 @@ self: {
        ];
        description = "Core module for Gore&Ash engine that do something";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gore-and-ash-logging" = callPackage
@@ -102882,8 +96028,6 @@ self: {
        ];
        description = "Core module for gore-and-ash with logging utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gore-and-ash-network" = callPackage
@@ -102905,8 +96049,6 @@ self: {
        ];
        description = "Core module for Gore&Ash engine with low level network API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gore-and-ash-sdl" = callPackage
@@ -102925,8 +96067,6 @@ self: {
        ];
        description = "Gore&Ash core module for integration with SDL library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gore-and-ash-sync" = callPackage
@@ -102946,8 +96086,6 @@ self: {
        ];
        description = "Gore&Ash module for high level network synchronization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gothic" = callPackage
@@ -102984,8 +96122,6 @@ self: {
        ];
        description = "A command line utility for practicing typing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gpah" = callPackage
@@ -103006,8 +96142,6 @@ self: {
        ];
        description = "Generic Programming Use in Hackage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gpcsets" = callPackage
@@ -103072,8 +96206,6 @@ self: {
        ];
        description = "For manipulating GPS coordinates and trails";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gps2htmlReport" = callPackage
@@ -103094,8 +96226,6 @@ self: {
        ];
        description = "GPS to HTML Summary Report";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gpx-conduit" = callPackage
@@ -103112,8 +96242,6 @@ self: {
        ];
        description = "Read GPX files using conduits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grab" = callPackage
@@ -103127,8 +96255,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Applicative non-linear consumption";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grab-form" = callPackage
@@ -103141,8 +96267,6 @@ self: {
        testHaskellDepends = [ base containers hedgehog text ];
        description = "Applicative parsers for form parameter lists";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graceful" = callPackage
@@ -103159,8 +96283,6 @@ self: {
        ];
        description = "Library to write graceful shutdown / upgrade service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grafana" = callPackage
@@ -103197,8 +96319,6 @@ self: {
        ];
        description = "Monadic correlated log events";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grakn" = callPackage
@@ -103222,8 +96342,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "A Haskell client for Grakn";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grammar-combinators" = callPackage
@@ -103241,8 +96359,6 @@ self: {
        ];
        description = "A parsing library of context-free grammar combinators";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grammatical-parsers" = callPackage
@@ -103292,8 +96408,6 @@ self: {
        ];
        description = "Examples using the Grapefruit library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grapefruit-frp" = callPackage
@@ -103311,8 +96425,6 @@ self: {
        ];
        description = "Functional Reactive Programming core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grapefruit-records" = callPackage
@@ -103324,8 +96436,6 @@ self: {
        libraryHaskellDepends = [ arrows base grapefruit-frp ];
        description = "A record system for Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grapefruit-ui" = callPackage
@@ -103344,8 +96454,6 @@ self: {
        ];
        description = "Declarative user interface programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grapefruit-ui-gtk" = callPackage
@@ -103365,8 +96473,6 @@ self: {
        ];
        description = "GTK+-based backend for declarative user interface programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph" = callPackage
@@ -103434,8 +96540,6 @@ self: {
        libraryHaskellDepends = [ base containers fgl ];
        description = "An implementation of algorithms for matchings in graphs";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph-rewriting" = callPackage
@@ -103449,8 +96553,6 @@ self: {
        ];
        description = "Monadic graph rewriting of hypergraphs with ports and multiedges";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph-rewriting-cl" = callPackage
@@ -103470,8 +96572,6 @@ self: {
        ];
        description = "Interactive graph rewriting system implementing various well-known combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph-rewriting-gl" = callPackage
@@ -103488,8 +96588,6 @@ self: {
        ];
        description = "OpenGL interface for interactive port graph rewriting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph-rewriting-lambdascope" = callPackage
@@ -103511,8 +96609,6 @@ self: {
        ];
        description = "Lambdascope, an optimal evaluator of the lambda calculus, as an interactive graph-rewriting system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph-rewriting-layout" = callPackage
@@ -103528,8 +96624,6 @@ self: {
        ];
        description = "Force-directed node placement intended for incremental graph drawing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph-rewriting-ski" = callPackage
@@ -103549,8 +96643,6 @@ self: {
        ];
        description = "Two evalutors of the SKI combinator calculus as interactive graph rewrite systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph-rewriting-strategies" = callPackage
@@ -103566,8 +96658,6 @@ self: {
        ];
        description = "Evaluation strategies for port-graph rewriting systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph-rewriting-trs" = callPackage
@@ -103589,8 +96679,6 @@ self: {
        ];
        description = "Evaluate first-order applicative term rewrite systems interactively using graph reduction";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph-rewriting-ww" = callPackage
@@ -103611,8 +96699,6 @@ self: {
        ];
        description = "Evaluator of the lambda-calculus in an interactive graph rewriting system with explicit sharing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph-serialize" = callPackage
@@ -103624,8 +96710,6 @@ self: {
        libraryHaskellDepends = [ array base bytestring containers ];
        description = "Serialization of data structures with references";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph-utils" = callPackage
@@ -103641,8 +96725,6 @@ self: {
        ];
        description = "A simple wrapper & quasi quoter for fgl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph-visit" = callPackage
@@ -103658,8 +96740,6 @@ self: {
        ];
        description = "Graph walk abstraction";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graph-wrapper" = callPackage
@@ -103693,8 +96773,6 @@ self: {
        ];
        description = "A declarative, monadic graph construction language for small graphs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graphene" = callPackage
@@ -103711,8 +96789,6 @@ self: {
        ];
        description = "A minimal Graph Theory library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graphics-drawingcombinators" = callPackage
@@ -103730,8 +96806,6 @@ self: {
        ];
        description = "A functional interface to 2D drawing in OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graphics-formats-collada" = callPackage
@@ -103747,8 +96821,6 @@ self: {
        ];
        description = "Load 3D geometry in the COLLADA format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graphicsFormats" = callPackage
@@ -103760,8 +96832,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 OpenGL QuickCheck ];
        description = "Classes for renderable objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graphicstools" = callPackage
@@ -103780,8 +96850,6 @@ self: {
        executableHaskellDepends = [ base CV wx wxcore ];
        description = "Tools for creating graphical UIs, based on wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graphite" = callPackage
@@ -103802,8 +96870,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Graphs and networks library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graphmod" = callPackage
@@ -103862,8 +96928,6 @@ self: {
        ];
        description = "Haskell GraphQL implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graphql-api" = callPackage
@@ -103893,8 +96957,6 @@ self: {
        ];
        description = "GraphQL API";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graphql-w-persistent" = callPackage
@@ -103951,8 +97013,6 @@ self: {
        ];
        description = "A simple tool to illustrate dependencies between Haskell types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "graphviz" = callPackage
@@ -103996,8 +97056,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Execute Graql queries on a Grakn graph";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grasp" = callPackage
@@ -104022,8 +97080,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "GRASP implementation for the AMMM project";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gravatar" = callPackage
@@ -104052,8 +97108,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Gray code encoder/decoder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gray-extended" = callPackage
@@ -104106,8 +97160,6 @@ self: {
        executableHaskellDepends = [ array base containers pretty ];
        description = "GreenCard, a foreign function pre-processor for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "greencard-lib" = callPackage
@@ -104120,8 +97172,6 @@ self: {
        libraryHaskellDepends = [ array base containers greencard pretty ];
        description = "A foreign function interface pre-processor library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "greenclip" = callPackage
@@ -104158,8 +97208,6 @@ self: {
        ];
        description = "A scalable distributed logger with a high-precision global time axis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gremlin-haskell" = callPackage
@@ -104183,8 +97231,6 @@ self: {
        testHaskellDepends = [ aeson-qq base hspec lens lens-aeson mtl ];
        description = "Graph database client for TinkerPop3 Gremlin Server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grenade" = callPackage
@@ -104208,8 +97254,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion hmatrix ];
        description = "Practical Deep Learning in Haskell";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "greplicate" = callPackage
@@ -104230,27 +97274,6 @@ self: {
      }) {};
 
   "greskell" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover
-     , exceptions, greskell-core, hint, hspec, semigroups, text
-     , transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "greskell";
-       version = "0.2.3.1";
-       sha256 = "0byg8f4m5n2l81y1l6lnd6zyskk1y7wj1983ziw29jkpyckjbpgl";
-       libraryHaskellDepends = [
-         aeson base exceptions greskell-core semigroups text transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring doctest doctest-discover greskell-core hint
-         hspec text unordered-containers
-       ];
-       description = "Haskell binding for Gremlin graph query language";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "greskell_1_0_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover
      , exceptions, greskell-core, hashable, hint, hspec, semigroups
      , text, transformers, unordered-containers, vector
@@ -104269,7 +97292,6 @@ self: {
        ];
        description = "Haskell binding for Gremlin graph query language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "greskell-core" = callPackage
@@ -104351,8 +97373,6 @@ self: {
        ];
        description = "Grid-based prototyping framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gridbounds" = callPackage
@@ -104365,8 +97385,6 @@ self: {
        testHaskellDepends = [ base earclipper gjk gridbox hspec ];
        description = "Collision detection for GridBox";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gridbox" = callPackage
@@ -104415,8 +97433,6 @@ self: {
        ];
        description = "Grid-based multimedia engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grids" = callPackage
@@ -104460,8 +97476,6 @@ self: {
        executableToolDepends = [ happy ];
        description = "grm grammar converter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "groom" = callPackage
@@ -104525,8 +97539,6 @@ self: {
        ];
        description = "Command line utility to manage AWS ECS resources";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gross" = callPackage
@@ -104541,30 +97553,9 @@ self: {
        executableHaskellDepends = [ base lens mtl ncurses ];
        description = "A spoof on gloss for terminal animation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "groundhog" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
-     , blaze-builder, bytestring, containers, monad-control, mtl
-     , resourcet, safe-exceptions, scientific, text, time, transformers
-     , transformers-base, transformers-compat
-     }:
-     mkDerivation {
-       pname = "groundhog";
-       version = "0.10.0";
-       sha256 = "1wckm2qrgmv1ccavwvq8ji3pfb4y197s1n1adv8hz9bqk246byrq";
-       libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring blaze-builder bytestring
-         containers monad-control mtl resourcet safe-exceptions scientific
-         text time transformers transformers-base transformers-compat
-       ];
-       description = "Type-safe datatype-database mapping library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "groundhog_0_11_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , bytestring, containers, monad-control, mtl, resourcet
      , safe-exceptions, scientific, text, time, transformers
@@ -104581,7 +97572,6 @@ self: {
        ];
        description = "Type-safe datatype-database mapping library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groundhog-converters" = callPackage
@@ -104600,34 +97590,9 @@ self: {
        ];
        description = "Extended Converter Library for groundhog embedded types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "groundhog-inspector" = callPackage
-    ({ mkDerivation, aeson-pretty, base, bytestring, cmdargs
-     , containers, groundhog, groundhog-sqlite, groundhog-th, mtl
-     , regex-compat, syb, template-haskell, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "groundhog-inspector";
-       version = "0.10.0";
-       sha256 = "1l4smiydqqgpfqcyq77d2g0cvglanqfhlhx3y1k9n3kx94yss5a2";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson-pretty base bytestring containers groundhog groundhog-th
-         regex-compat syb template-haskell text time transformers
-       ];
-       executableHaskellDepends = [
-         base bytestring cmdargs containers groundhog groundhog-sqlite
-         groundhog-th mtl
-       ];
-       description = "Type-safe datatype-database mapping library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "groundhog-inspector_0_11_0" = callPackage
     ({ mkDerivation, aeson-pretty, base, bytestring, cmdargs
      , containers, groundhog, groundhog-sqlite, groundhog-th, mtl
      , regex-compat, syb, template-haskell, text, time, transformers
@@ -104648,27 +97613,9 @@ self: {
        ];
        description = "Type-safe datatype-database mapping library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groundhog-mysql" = callPackage
-    ({ mkDerivation, base, bytestring, containers, groundhog
-     , monad-control, monad-logger, mysql, mysql-simple, resource-pool
-     , resourcet, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "groundhog-mysql";
-       version = "0.10";
-       sha256 = "1idyisl0dbij4ffd0bn1bm681az87wc30qnkn1vmr0cd0xb6mwnx";
-       libraryHaskellDepends = [
-         base bytestring containers groundhog monad-control monad-logger
-         mysql mysql-simple resource-pool resourcet text time transformers
-       ];
-       description = "MySQL backend for the groundhog library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "groundhog-mysql_0_11" = callPackage
     ({ mkDerivation, base, bytestring, containers, groundhog
      , monad-control, monad-logger, mysql, mysql-simple, resource-pool
      , resourcet, text, time, transformers
@@ -104683,29 +97630,9 @@ self: {
        ];
        description = "MySQL backend for the groundhog library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groundhog-postgresql" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
-     , containers, groundhog, monad-control, postgresql-libpq
-     , postgresql-simple, resource-pool, resourcet, text, time
-     , transformers, vector
-     }:
-     mkDerivation {
-       pname = "groundhog-postgresql";
-       version = "0.10";
-       sha256 = "1digvi8ra58r122i030h0b089sbyzaclir1cg4iqaflbzrnz45l9";
-       libraryHaskellDepends = [
-         aeson attoparsec base blaze-builder bytestring containers groundhog
-         monad-control postgresql-libpq postgresql-simple resource-pool
-         resourcet text time transformers vector
-       ];
-       description = "PostgreSQL backend for the groundhog library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "groundhog-postgresql_0_11" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , groundhog, monad-control, postgresql-libpq, postgresql-simple
      , resource-pool, resourcet, text, time, transformers, vector
@@ -104721,27 +97648,9 @@ self: {
        ];
        description = "PostgreSQL backend for the groundhog library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groundhog-sqlite" = callPackage
-    ({ mkDerivation, base, bytestring, containers, direct-sqlite
-     , groundhog, monad-control, resource-pool, resourcet, text
-     , transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "groundhog-sqlite";
-       version = "0.10.0";
-       sha256 = "1z6yss15aw0a14i0nj0flb0h2641sjr70mhasp718qmc4iwkgw7x";
-       libraryHaskellDepends = [
-         base bytestring containers direct-sqlite groundhog monad-control
-         resource-pool resourcet text transformers unordered-containers
-       ];
-       description = "Sqlite3 backend for the groundhog library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "groundhog-sqlite_0_11_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, direct-sqlite
      , groundhog, monad-control, resource-pool, resourcet, text
      , transformers, unordered-containers
@@ -104756,26 +97665,9 @@ self: {
        ];
        description = "Sqlite3 backend for the groundhog library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groundhog-th" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, groundhog
-     , libyaml, template-haskell, text, time, unordered-containers, yaml
-     }:
-     mkDerivation {
-       pname = "groundhog-th";
-       version = "0.10.2";
-       sha256 = "1bpxvprsxd66k951yjlvpbpzni2f0s94ypkad698a2iyccb2slzk";
-       libraryHaskellDepends = [
-         aeson base bytestring containers groundhog libyaml template-haskell
-         text time unordered-containers yaml
-       ];
-       description = "Type-safe datatype-database mapping library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "groundhog-th_0_11" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, groundhog
      , libyaml, template-haskell, text, time, unordered-containers, yaml
      }:
@@ -104789,7 +97681,6 @@ self: {
        ];
        description = "Type-safe datatype-database mapping library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "group-by-date" = callPackage
@@ -104824,8 +97715,6 @@ self: {
        ];
        description = "Classify objects by key-generating function, like SQL GROUP BY";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "groupBy" = callPackage
@@ -104894,6 +97783,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "groups-generic" = callPackage
+    ({ mkDerivation, base, generic-data, groups }:
+     mkDerivation {
+       pname = "groups-generic";
+       version = "0.1.0.0";
+       sha256 = "1rnil9qashpvrjxmziymf447pnqpqpnga0lxlk7413y4dprn2rad";
+       libraryHaskellDepends = [ base generic-data groups ];
+       description = "Generically derive Group instances";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "growler" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring
      , case-insensitive, either, http-types, lens, monad-control, mtl
@@ -104913,8 +97813,6 @@ self: {
        ];
        description = "A revised version of the scotty library that attempts to be simpler and more performant";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grpc-api-etcd" = callPackage
@@ -104926,8 +97824,6 @@ self: {
        libraryHaskellDepends = [ base proto-lens proto-lens-runtime ];
        description = "Generated messages and instances for etcd gRPC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grpc-etcd-client" = callPackage
@@ -104944,8 +97840,6 @@ self: {
        ];
        description = "gRPC client for etcd";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grpc-haskell" = callPackage
@@ -104974,8 +97868,6 @@ self: {
        ];
        description = "Haskell implementation of gRPC layered on shared C library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "grpc-haskell-core" = callPackage
@@ -105001,8 +97893,6 @@ self: {
        ];
        description = "Haskell implementation of gRPC layered on shared C library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gpr = null; inherit (pkgs) grpc;};
 
   "gruff" = callPackage
@@ -105024,8 +97914,6 @@ self: {
        ];
        description = "fractal explorer GUI using the ruff library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gruff-examples" = callPackage
@@ -105044,17 +97932,20 @@ self: {
        ];
        description = "Mandelbrot Set examples using ruff and gruff";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gsasl" = callPackage
-    ({ mkDerivation, base, bytestring, gsasl, transformers }:
+    ({ mkDerivation, base, bytestring, gsasl, monad-loops, transformers
+     }:
      mkDerivation {
        pname = "gsasl";
-       version = "0.3.6";
-       sha256 = "0cgrw5ypkwp4mzj8m12q783jqng1jp1j7ny15704jmjxbq13cq3q";
-       libraryHaskellDepends = [ base bytestring transformers ];
+       version = "0.3.7";
+       sha256 = "11i12r9s30jrq8hkgqagf2fd129r6ya607s9ibw549ablsxgr507";
+       revision = "1";
+       editedCabalFile = "1c806a82qd1hkxxfh1mwk0i062bz6fkaap5ys3n4x9n6wjv7ilin";
+       libraryHaskellDepends = [
+         base bytestring monad-loops transformers
+       ];
        libraryPkgconfigDepends = [ gsasl ];
        description = "Bindings for GNU libgsasl";
        license = stdenv.lib.licenses.gpl3;
@@ -105069,8 +97960,6 @@ self: {
        libraryHaskellDepends = [ base hierarchical-clustering ];
        description = "Generic implementation of Gerstein/Sonnhammer/Chothia weighting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gscholar-rss" = callPackage
@@ -105087,8 +97976,6 @@ self: {
        ];
        description = "scrapes google scholar, provides RSS feed";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gsl-random" = callPackage
@@ -105101,8 +97988,6 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "Bindings the the GSL random number generation facilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gsl-random-fu" = callPackage
@@ -105114,8 +97999,6 @@ self: {
        libraryHaskellDepends = [ base gsl-random random-fu ];
        description = "Instances for using gsl-random with random-fu";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gsmenu" = callPackage
@@ -105180,8 +98063,6 @@ self: {
        ];
        description = "Generic implementation of Storable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gstreamer" = callPackage
@@ -105201,8 +98082,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GStreamer open source multimedia framework";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;};
 
   "gt-tools" = callPackage
@@ -105236,8 +98115,6 @@ self: {
        ];
        description = "The General Transit Feed Specification format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gtfs-realtime" = callPackage
@@ -105253,8 +98130,6 @@ self: {
        ];
        description = "GTFS RealTime protobafs library (autogenerated from .proto file)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gtk" = callPackage
@@ -105349,8 +98224,6 @@ self: {
        libraryPkgconfigDepends = [ gtk2 ];
        description = "GTK+ Serialized event";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtk2;};
 
   "gtk-simple-list-view" = callPackage
@@ -105425,8 +98298,6 @@ self: {
        libraryHaskellDepends = [ base containers gtk ];
        description = "Convenient Gtk canvas with mouse and keyboard input";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gtk-traymanager" = callPackage
@@ -105578,8 +98449,6 @@ self: {
        executableHaskellDepends = [ base glib gtk3 transformers ];
        description = "Gtk2Hs Hello World, an example package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gtk2hs-rpn" = callPackage
@@ -105591,8 +98460,6 @@ self: {
        libraryHaskellDepends = [ base cairo glib gtk mtl ];
        description = "Adds a module to gtk2hs allowing layouts to be defined using reverse polish notation";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gtk3" = callPackage
@@ -105629,8 +98496,6 @@ self: {
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gtk-mac-integration-gtk3 = null;};
 
   "gtkglext" = callPackage
@@ -105649,8 +98514,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GTK+ OpenGL Extension";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtk2; inherit (pkgs.gnome2) gtkglext; 
          inherit (pkgs) libGLU; inherit (pkgs.xorg) libICE; 
          inherit (pkgs.xorg) libSM; inherit (pkgs.xorg) libXmu; 
@@ -105672,8 +98535,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GtkImageView library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtkimageview;};
 
   "gtkrsync" = callPackage
@@ -105692,8 +98553,6 @@ self: {
        ];
        description = "Gnome rsync progress display";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gtksourceview2" = callPackage
@@ -105713,8 +98572,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtksourceview;};
 
   "gtksourceview3" = callPackage
@@ -105734,8 +98591,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtksourceview3;};
 
   "guarded-allocation" = callPackage
@@ -105758,8 +98613,6 @@ self: {
        libraryHaskellDepends = [ base instant-generics ];
        description = "Datatype-generic rewriting with preconditions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "guess-combinator" = callPackage
@@ -105771,8 +98624,6 @@ self: {
        libraryHaskellDepends = [ base HList ];
        description = "Generate simple combinators given their type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "guid" = callPackage
@@ -105785,8 +98636,6 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "A simple wrapper around uuid";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gulcii" = callPackage
@@ -105801,8 +98650,6 @@ self: {
        executableHaskellDepends = [ base cairo containers filepath gtk ];
        description = "graphical untyped lambda calculus interactive interpreter";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gutenberg-fibonaccis" = callPackage
@@ -105840,8 +98687,6 @@ self: {
        executableHaskellDepends = [ base extra GiveYouAHead ];
        description = "A binary version of GiveYouAHead";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "gym-http-api" = callPackage
@@ -105886,8 +98731,6 @@ self: {
        ];
        description = "Haskell library for retrieving data from various booru image sites";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "h-gpgme" = callPackage
@@ -105911,8 +98754,6 @@ self: {
        ];
        description = "High Level Binding for GnuPG Made Easy (gpgme)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "h-reversi" = callPackage
@@ -105936,8 +98777,6 @@ self: {
        ];
        description = "Reversi game in haskell/blank-canvas";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "h2048" = callPackage
@@ -105964,8 +98803,6 @@ self: {
        ];
        description = "An Implementation of Game 2048";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "h2c" = callPackage
@@ -105977,8 +98814,6 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl resourcet ];
        description = "Bindings to Linux I2C with support for repeated-start transactions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hArduino" = callPackage
@@ -105994,8 +98829,6 @@ self: {
        ];
        description = "Control your Arduino board from Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hBDD" = callPackage
@@ -106022,8 +98855,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An FFI binding to CMU/Long's BDD library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {bdd = null; mem = null;};
 
   "hBDD-CUDD" = callPackage
@@ -106039,8 +98870,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An FFI binding to the CUDD library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {cudd = null; epd = null; inherit (pkgs) mtr; 
          inherit (pkgs) st; util = null;};
 
@@ -106072,8 +98901,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "interface to CSound API";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {csound64 = null; inherit (pkgs) libsndfile;};
 
   "hDFA" = callPackage
@@ -106085,8 +98912,6 @@ self: {
        libraryHaskellDepends = [ base containers directory process ];
        description = "A simple library for representing and minimising DFAs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hF2" = callPackage
@@ -106099,8 +98924,6 @@ self: {
        libraryHaskellDepends = [ base cereal vector ];
        description = "F(2^e) math for cryptography";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hGelf" = callPackage
@@ -106159,8 +98982,6 @@ self: {
        ];
        description = "Library to interact with the @Mollom anti-spam service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hOff-display" = callPackage
@@ -106191,7 +99012,7 @@ self: {
   "hOpenPGP" = callPackage
     ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
      , base16-bytestring, bifunctors, binary, binary-conduit, bytestring
-     , bzlib, conduit, conduit-extra, containers, criterion
+     , bz2, conduit, conduit-extra, containers, criterion
      , crypto-cipher-types, cryptonite, errors, hashable
      , incremental-parser, ixset-typed, lens, memory, monad-loops
      , nettle, network, network-uri, newtype, openpgp-asciiarmor
@@ -106202,11 +99023,11 @@ self: {
      }:
      mkDerivation {
        pname = "hOpenPGP";
-       version = "2.8.5";
-       sha256 = "1d5cmgj3rg8snc2b5jn9h7hb83j2hhf0c9shiiyrpr8rrl4hx2mj";
+       version = "2.9.3";
+       sha256 = "17ys0s8mgm32s882l11hj0vbxva28aawf0m64wj1fvd7h2vicq77";
        libraryHaskellDepends = [
          aeson asn1-encoding attoparsec base base16-bytestring bifunctors
-         binary binary-conduit bytestring bzlib conduit conduit-extra
+         binary binary-conduit bytestring bz2 conduit conduit-extra
          containers crypto-cipher-types cryptonite errors hashable
          incremental-parser ixset-typed lens memory monad-loops nettle
          network-uri newtype openpgp-asciiarmor prettyprinter resourcet
@@ -106215,7 +99036,7 @@ self: {
        ];
        testHaskellDepends = [
          aeson asn1-encoding attoparsec base base16-bytestring bifunctors
-         binary binary-conduit bytestring bzlib conduit conduit-extra
+         binary binary-conduit bytestring bz2 conduit conduit-extra
          containers crypto-cipher-types cryptonite errors hashable
          incremental-parser ixset-typed lens memory monad-loops nettle
          network network-uri newtype prettyprinter QuickCheck
@@ -106225,7 +99046,7 @@ self: {
        ];
        benchmarkHaskellDepends = [
          aeson base base16-bytestring bifunctors binary binary-conduit
-         bytestring bzlib conduit conduit-extra containers criterion
+         bytestring bz2 conduit conduit-extra containers criterion
          crypto-cipher-types cryptonite errors hashable incremental-parser
          ixset-typed lens memory monad-loops nettle network network-uri
          newtype openpgp-asciiarmor prettyprinter resourcet semigroups split
@@ -106234,58 +99055,6 @@ self: {
        ];
        description = "native Haskell implementation of OpenPGP (RFC4880)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "hOpenPGP_2_9_2" = callPackage
-    ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
-     , base16-bytestring, bifunctors, binary, binary-conduit, bytestring
-     , bzlib, conduit, conduit-extra, containers, criterion
-     , crypto-cipher-types, cryptonite, errors, hashable
-     , incremental-parser, ixset-typed, lens, memory, monad-loops
-     , nettle, network, network-uri, newtype, openpgp-asciiarmor
-     , prettyprinter, QuickCheck, quickcheck-instances, resourcet
-     , semigroups, split, tasty, tasty-hunit, tasty-quickcheck, text
-     , time, time-locale-compat, transformers, unliftio-core
-     , unordered-containers, zlib
-     }:
-     mkDerivation {
-       pname = "hOpenPGP";
-       version = "2.9.2";
-       sha256 = "0bwsy00n1hpa2q2002bgy712x6jl468jyibxk0dc1k8718yndirr";
-       libraryHaskellDepends = [
-         aeson asn1-encoding attoparsec base base16-bytestring bifunctors
-         binary binary-conduit bytestring bzlib conduit conduit-extra
-         containers crypto-cipher-types cryptonite errors hashable
-         incremental-parser ixset-typed lens memory monad-loops nettle
-         network-uri newtype openpgp-asciiarmor prettyprinter resourcet
-         semigroups split text time time-locale-compat transformers
-         unliftio-core unordered-containers zlib
-       ];
-       testHaskellDepends = [
-         aeson asn1-encoding attoparsec base base16-bytestring bifunctors
-         binary binary-conduit bytestring bzlib conduit conduit-extra
-         containers crypto-cipher-types cryptonite errors hashable
-         incremental-parser ixset-typed lens memory monad-loops nettle
-         network network-uri newtype prettyprinter QuickCheck
-         quickcheck-instances resourcet semigroups split tasty tasty-hunit
-         tasty-quickcheck text time time-locale-compat transformers
-         unliftio-core unordered-containers zlib
-       ];
-       benchmarkHaskellDepends = [
-         aeson base base16-bytestring bifunctors binary binary-conduit
-         bytestring bzlib conduit conduit-extra containers criterion
-         crypto-cipher-types cryptonite errors hashable incremental-parser
-         ixset-typed lens memory monad-loops nettle network network-uri
-         newtype openpgp-asciiarmor prettyprinter resourcet semigroups split
-         text time time-locale-compat transformers unliftio-core
-         unordered-containers zlib
-       ];
-       description = "native Haskell implementation of OpenPGP (RFC4880)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hPDB" = callPackage
@@ -106305,8 +99074,6 @@ self: {
        ];
        description = "Protein Databank file format library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hPDB-examples" = callPackage
@@ -106333,8 +99100,6 @@ self: {
        ];
        description = "Examples for hPDB library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hPushover" = callPackage
@@ -106350,8 +99115,6 @@ self: {
        ];
        description = "Pushover.net API functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hR" = callPackage
@@ -106363,8 +99126,6 @@ self: {
        libraryHaskellDepends = [ array base containers unix ];
        description = "R bindings and interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hRESP" = callPackage
@@ -106411,8 +99172,6 @@ self: {
        ];
        description = "A Haskell library to scrape and crawl web-pages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hSimpleDB" = callPackage
@@ -106429,8 +99188,6 @@ self: {
        ];
        description = "Interface to Amazon's SimpleDB service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hTalos" = callPackage
@@ -106444,8 +99201,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Parser, print and manipulate structures in PDB file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hTensor" = callPackage
@@ -106457,8 +99212,6 @@ self: {
        libraryHaskellDepends = [ base containers hmatrix random ];
        description = "Multidimensional arrays and simple tensor computations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hVOIDP" = callPackage
@@ -106474,8 +99227,6 @@ self: {
        executableSystemDepends = [ blas liblapack ];
        description = "Optimal variable selection in chain graphical model";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) blas; inherit (pkgs) liblapack;};
 
   "hXmixer" = callPackage
@@ -106509,8 +99260,6 @@ self: {
        ];
        description = "Haar wavelet transforms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "habit" = callPackage
@@ -106535,8 +99284,6 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "Haskell message bot framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hable" = callPackage
@@ -106632,8 +99379,6 @@ self: {
        ];
        description = "Hack contrib";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack-contrib-press" = callPackage
@@ -106650,8 +99395,6 @@ self: {
        ];
        description = "Hack helper that renders Press templates";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack-frontend-happstack" = callPackage
@@ -106669,8 +99412,6 @@ self: {
        ];
        description = "hack-frontend-happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack-frontend-monadcgi" = callPackage
@@ -106693,8 +99434,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hack ];
        description = "Hack handler using CGI protocol. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack-handler-epoll" = callPackage
@@ -106713,8 +99452,6 @@ self: {
        ];
        description = "hack handler implementation using epoll";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack-handler-evhttp" = callPackage
@@ -106733,8 +99470,6 @@ self: {
        librarySystemDepends = [ event ];
        description = "Hack EvHTTP (libevent) Handler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {event = null;};
 
   "hack-handler-fastcgi" = callPackage
@@ -106747,8 +99482,6 @@ self: {
        librarySystemDepends = [ fcgi ];
        description = "Hack handler direct to fastcgi (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) fcgi;};
 
   "hack-handler-happstack" = callPackage
@@ -106766,8 +99499,6 @@ self: {
        ];
        description = "Hack Happstack server handler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack-handler-hyena" = callPackage
@@ -106784,8 +99515,6 @@ self: {
        ];
        description = "Hyena hack handler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack-handler-kibro" = callPackage
@@ -106800,8 +99529,6 @@ self: {
        ];
        description = "Hack Kibro handler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack-handler-simpleserver" = callPackage
@@ -106817,8 +99544,6 @@ self: {
        ];
        description = "A simplistic HTTP server handler for Hack. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack-middleware-cleanpath" = callPackage
@@ -106832,8 +99557,6 @@ self: {
        ];
        description = "Applies some basic redirect rules to get cleaner paths. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack-middleware-clientsession" = callPackage
@@ -106849,8 +99572,6 @@ self: {
        ];
        description = "Middleware for easily keeping session data in client cookies. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack-middleware-gzip" = callPackage
@@ -106877,8 +99598,6 @@ self: {
        ];
        description = "Automatic wrapping of JSON responses to convert into JSONP. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack2" = callPackage
@@ -106941,8 +99660,6 @@ self: {
        ];
        description = "Hack2 Happstack server handler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack2-handler-mongrel2-http" = callPackage
@@ -106963,8 +99680,6 @@ self: {
        ];
        description = "Hack2 Mongrel2 HTTP handler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack2-handler-snap-server" = callPackage
@@ -106983,8 +99698,6 @@ self: {
        ];
        description = "Hack2 Snap server handler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack2-handler-warp" = callPackage
@@ -107001,8 +99714,6 @@ self: {
        ];
        description = "Hack2 warp handler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hack2-interface-wai" = callPackage
@@ -107022,27 +99733,6 @@ self: {
      }) {};
 
   "hackage-db" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
-     , directory, filepath, tar, time, utf8-string
-     }:
-     mkDerivation {
-       pname = "hackage-db";
-       version = "2.0.1";
-       sha256 = "13ggj72i8dxwh3qwznnqxbr00nvsbapyyhzx5zybfacddnpw3aph";
-       revision = "2";
-       editedCabalFile = "0qscq4d3xwvjhqi1fiky7g12iwbkwn9qrypwzg9lx4p3c5xlwlvn";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring Cabal containers directory filepath tar time
-         utf8-string
-       ];
-       description = "Access Hackage's package database via Data.Map";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {};
-
-  "hackage-db_2_1_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, containers
      , directory, exceptions, filepath, tar, time, utf8-string
      }:
@@ -107060,7 +99750,6 @@ self: {
        ];
        description = "Access cabal-install's Hackage database via Data.Map";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
@@ -107081,8 +99770,6 @@ self: {
        ];
        description = "Compare the public API of different versions of a Hackage library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hackage-mirror" = callPackage
@@ -107112,8 +99799,6 @@ self: {
        ];
        description = "Simple mirroring utility for Hackage";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hackage-plot" = callPackage
@@ -107145,8 +99830,6 @@ self: {
        executableHaskellDepends = [ base Cabal containers hackage-db ];
        description = "Process 00-index.tar.gz from Hackage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hackage-proxy" = callPackage
@@ -107170,8 +99853,6 @@ self: {
        ];
        description = "Provide a proxy for Hackage which modifies responses in some way. (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hackage-repo-tool" = callPackage
@@ -107194,38 +99875,9 @@ self: {
        ];
        description = "Manage secure file-based package repositories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hackage-security" = callPackage
-    ({ mkDerivation, base, base16-bytestring, base64-bytestring
-     , bytestring, Cabal, containers, cryptohash-sha256, directory
-     , ed25519, filepath, ghc-prim, mtl, network, network-uri, parsec
-     , pretty, QuickCheck, tar, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, temporary, time, transformers, zlib
-     }:
-     mkDerivation {
-       pname = "hackage-security";
-       version = "0.5.3.0";
-       sha256 = "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v";
-       revision = "6";
-       editedCabalFile = "1xs2nkzlvkdz8g27yzfxbjdbdadfmgiydnlpn5dm77cg18r495ay";
-       libraryHaskellDepends = [
-         base base16-bytestring base64-bytestring bytestring Cabal
-         containers cryptohash-sha256 directory ed25519 filepath ghc-prim
-         mtl network network-uri parsec pretty tar template-haskell time
-         transformers zlib
-       ];
-       testHaskellDepends = [
-         base bytestring Cabal containers network-uri QuickCheck tar tasty
-         tasty-hunit tasty-quickcheck temporary time zlib
-       ];
-       description = "Hackage security library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hackage-security_0_6_0_0" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring
      , bytestring, Cabal, containers, cryptohash-sha256, directory
      , ed25519, filepath, ghc-prim, lukko, mtl, network, network-uri
@@ -107252,7 +99904,6 @@ self: {
        ];
        description = "Hackage security library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-security-HTTP" = callPackage
@@ -107270,8 +99921,6 @@ self: {
        ];
        description = "Hackage security bindings against the HTTP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hackage-server" = callPackage
@@ -107310,8 +99959,6 @@ self: {
        ];
        description = "The Hackage web server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hackage-sparks" = callPackage
@@ -107361,8 +100008,6 @@ self: {
        executableHaskellDepends = [ base download feed tagsoup ];
        description = "Convert Hackage RSS feeds to wiki format for publishing on Haskell.org";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hackage2twitter" = callPackage
@@ -107376,8 +100021,6 @@ self: {
        executableHaskellDepends = [ base feed feed2twitter ];
        description = "Send new Hackage releases to Twitter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hackager" = callPackage
@@ -107395,8 +100038,6 @@ self: {
        ];
        description = "Hackage testing tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hackernews" = callPackage
@@ -107421,8 +100062,6 @@ self: {
        ];
        description = "API for Hacker News";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hackertyper" = callPackage
@@ -107459,8 +100098,6 @@ self: {
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "Generate useful files for Haskell projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hackport" = callPackage
@@ -107509,8 +100146,6 @@ self: {
        ];
        description = "Lightweight Erlang-style actors for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hactors" = callPackage
@@ -107522,8 +100157,6 @@ self: {
        libraryHaskellDepends = [ base stm ];
        description = "Practical actors for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haddock_2_22_0" = callPackage
@@ -107636,31 +100269,9 @@ self: {
        ];
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haddock-library" = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, containers, deepseq
-     , hspec, hspec-discover, parsec, QuickCheck, text, transformers
-     }:
-     mkDerivation {
-       pname = "haddock-library";
-       version = "1.7.0";
-       sha256 = "04fhcjk0pvsaqvsgp2w06cv2qvshq1xs1bwc157q4lmkgr57khp7";
-       libraryHaskellDepends = [
-         base bytestring containers parsec text transformers
-       ];
-       testHaskellDepends = [
-         base base-compat bytestring containers deepseq hspec parsec
-         QuickCheck text transformers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Library exposing some functionality of Haddock";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haddock-library_1_8_0" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, containers, deepseq
      , directory, filepath, hspec, hspec-discover, optparse-applicative
      , parsec, QuickCheck, text, transformers, tree-diff
@@ -107682,7 +100293,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Library exposing some functionality of Haddock";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haddock-test" = callPackage
@@ -107698,8 +100308,6 @@ self: {
        ];
        description = "Test utilities for Haddock";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haddocset" = callPackage
@@ -107721,8 +100329,6 @@ self: {
        ];
        description = "Generate docset of Dash by Haddock haskell documentation tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hadolint" = callPackage
@@ -107768,8 +100374,6 @@ self: {
        testHaskellDepends = [ base bytestring filepath text vector ];
        description = "Read/write file formats commonly used by Hadoop";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) snappy;};
 
   "hadoop-rpc" = callPackage
@@ -107790,8 +100394,6 @@ self: {
        testHaskellDepends = [ base protobuf tasty tasty-hunit vector ];
        description = "Use the Hadoop RPC interface from Haskell";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hadoop-tools" = callPackage
@@ -107818,8 +100420,6 @@ self: {
        ];
        description = "Fast command line tools for working with Hadoop";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haeredes" = callPackage
@@ -107840,6 +100440,18 @@ self: {
        license = stdenv.lib.licenses.agpl3;
      }) {};
 
+  "hafar" = callPackage
+    ({ mkDerivation, base, intervals, mtl, QuickCheck }:
+     mkDerivation {
+       pname = "hafar";
+       version = "0.1.0.0";
+       sha256 = "0qyly669y8nav9g3y8y74pxmvq47r1l541l5ncq7fn50kvhpmnrj";
+       libraryHaskellDepends = [ base intervals mtl ];
+       testHaskellDepends = [ base intervals mtl QuickCheck ];
+       description = "Affine arithmetic library for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haggis" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-html, bytestring
      , containers, convertible, directory, filemanip, filepath, HDBC
@@ -107864,8 +100476,6 @@ self: {
        ];
        description = "A static site generator with blogging/comments support";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haggle" = callPackage
@@ -107918,8 +100528,6 @@ self: {
        executableHaskellDepends = [ base time ];
        description = "Analytic Hierarchy Process";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haiji" = callPackage
@@ -107942,8 +100550,6 @@ self: {
        ];
        description = "A typed template engine, subset of jinja2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hail" = callPackage
@@ -107982,8 +100588,6 @@ self: {
        ];
        description = "Mailgun REST api interface for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hailgun-send" = callPackage
@@ -107999,8 +100603,6 @@ self: {
        ];
        description = "A program to send emails throught the Mailgun api";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hailgun-simple" = callPackage
@@ -108016,8 +100618,6 @@ self: {
        ];
        description = "Easy-to-use wrapper for the hailgun package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hails" = callPackage
@@ -108107,8 +100707,6 @@ self: {
        ];
        description = "A JSON REST API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakaru" = callPackage
@@ -108138,8 +100736,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ghc-prim ];
        description = "A probabilistic programming embedded DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hake" = callPackage
@@ -108167,8 +100763,6 @@ self: {
        libraryHaskellDepends = [ base HTTP network ];
        description = "Akismet spam protection library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakka" = callPackage
@@ -108183,8 +100777,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Minimal akka-inspired actor library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hako" = callPackage
@@ -108201,8 +100793,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "A mako-like quasi-quoter template library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll" = callPackage
@@ -108254,8 +100844,6 @@ self: {
        ];
        description = "A package allowing to write Hakyll blog posts in Rmd";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-agda" = callPackage
@@ -108272,8 +100860,6 @@ self: {
        ];
        description = "Wrapper to integrate literate Agda files with Hakyll";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-blaze-templates" = callPackage
@@ -108285,8 +100871,6 @@ self: {
        libraryHaskellDepends = [ base blaze-html blaze-markup hakyll ];
        description = "Blaze templates for Hakyll";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-contrib" = callPackage
@@ -108302,8 +100886,6 @@ self: {
        executableHaskellDepends = [ base directory filepath hakyll ];
        description = "Extra modules for the hakyll website compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-contrib-csv" = callPackage
@@ -108320,8 +100902,6 @@ self: {
        testHaskellDepends = [ base blaze-html bytestring cassava hspec ];
        description = "Generate Html tables from Csv files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-contrib-elm" = callPackage
@@ -108340,8 +100920,6 @@ self: {
        executableHaskellDepends = [ base hakyll ];
        description = "Compile Elm code for inclusion in Hakyll static site";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-contrib-hyphenation" = callPackage
@@ -108353,8 +100931,6 @@ self: {
        libraryHaskellDepends = [ base hakyll hyphenation split tagsoup ];
        description = "automatic hyphenation for Hakyll";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-contrib-links" = callPackage
@@ -108374,8 +100950,6 @@ self: {
        ];
        description = "A hakyll library that helps maintain a separate links database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-convert" = callPackage
@@ -108397,8 +100971,6 @@ self: {
        ];
        description = "Convert from other blog engines to Hakyll";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-dhall" = callPackage
@@ -108419,8 +100991,6 @@ self: {
        executableHaskellDepends = [ base dhall hakyll ];
        description = "Dhall compiler for Hakyll";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-dir-list" = callPackage
@@ -108435,8 +101005,6 @@ self: {
        ];
        description = "Allow Hakyll to create hierarchical menues from directories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-elm" = callPackage
@@ -108465,8 +101033,6 @@ self: {
        executableHaskellDepends = [ base hakyll ];
        testHaskellDepends = [ base ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-filestore" = callPackage
@@ -108481,8 +101047,6 @@ self: {
        ];
        description = "FileStore utilities for Hakyll";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-images" = callPackage
@@ -108515,8 +101079,6 @@ self: {
        libraryHaskellDepends = [ base hakyll ogmarkup ];
        description = "Integrate ogmarkup document with Hakyll";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-sass" = callPackage
@@ -108543,8 +101105,6 @@ self: {
        libraryHaskellDepends = [ base containers hakyll ];
        description = "Adds series functionality to hakyll";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-shakespeare" = callPackage
@@ -108562,8 +101122,6 @@ self: {
        ];
        description = "Hakyll Hamlet compiler";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-shortcode" = callPackage
@@ -108585,8 +101143,6 @@ self: {
        ];
        description = "A shortcode extension module for Hakyll";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-shortcut-links" = callPackage
@@ -108605,8 +101161,6 @@ self: {
        testHaskellDepends = [ base hspec mtl pandoc text ];
        description = "Use shortcut-links in markdown file for Hakyll";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hakyll-typescript" = callPackage
@@ -108623,8 +101177,6 @@ self: {
        testHaskellDepends = [ base directory hakyll tasty tasty-hunit ];
        description = "Typescript and javascript hakyll compilers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hal" = callPackage
@@ -108671,8 +101223,6 @@ self: {
        ];
        description = "A tool to generate missing import statements for Haskell modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "half" = callPackage
@@ -108709,8 +101259,6 @@ self: {
        ];
        description = "The HAskelL File System (\"halfs\" -- intended for use on the HaLVM)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "halipeto" = callPackage
@@ -108724,8 +101272,6 @@ self: {
        libraryHaskellDepends = [ base directory HaXml pandoc ];
        description = "Haskell Static Web Page Generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "halive" = callPackage
@@ -108755,8 +101301,6 @@ self: {
        ];
        description = "A live recompiler";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hall-symbols" = callPackage
@@ -108773,8 +101317,6 @@ self: {
        ];
        description = "Symmetry operations generater of Hall Symbols";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "halma" = callPackage
@@ -108813,8 +101355,6 @@ self: {
        ];
        description = "GTK application for playing Halma";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "halma-telegram-bot" = callPackage
@@ -108839,8 +101379,6 @@ self: {
        ];
        description = "Telegram bot for playing Halma";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haltavista" = callPackage
@@ -108866,8 +101404,6 @@ self: {
        testHaskellDepends = [ base hedgehog lens ];
        description = "Split or combine data structures to and from halves, quarters, eighths";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "halvm-web" = callPackage
@@ -108955,8 +101491,6 @@ self: {
        ];
        description = "Haskell macro preprocessor";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hamsql" = callPackage
@@ -108980,8 +101514,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Interpreter for SQL-structure definitions in YAML (YamSql)";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hamtmap" = callPackage
@@ -108995,8 +101527,6 @@ self: {
        libraryHaskellDepends = [ array base deepseq hashable ];
        description = "A purely functional and persistent hash map";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hamtsolo" = callPackage
@@ -109037,8 +101567,6 @@ self: {
        executableHaskellDepends = [ filepath ];
        description = "Library to handle abstract music";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "han2zen" = callPackage
@@ -109057,8 +101585,8 @@ self: {
     ({ mkDerivation, base, containers, random }:
      mkDerivation {
        pname = "hanabi-dealer";
-       version = "0.5.0.0";
-       sha256 = "01dhx6il56pvl9iwaxylyy4sg2gs67w2sr6svahx32lbrnyxnkp8";
+       version = "0.6.0.0";
+       sha256 = "0xdj24prx2ndr1xz5g38p9v9vf5wfv9h5rhnfs0xfsdq3nmjvbkx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers random ];
@@ -109104,8 +101632,6 @@ self: {
        ];
        description = "Library and command-line utility for accessing Google services and APIs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "handa-geodata" = callPackage
@@ -109152,8 +101678,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "HandleLike class";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "handsy" = callPackage
@@ -109174,8 +101698,6 @@ self: {
        ];
        description = "A DSL to describe common shell operations and interpeters for running them locally and remotely";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "handwriting" = callPackage
@@ -109234,8 +101756,6 @@ self: {
        ];
        description = "Simple Continuous Integration/Deployment System";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hans" = callPackage
@@ -109259,8 +101779,6 @@ self: {
        ];
        description = "Network Stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hans-pcap" = callPackage
@@ -109272,8 +101790,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hans pcap ];
        description = "Driver for real ethernet devices for HaNS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hans-pfq" = callPackage
@@ -109305,8 +101821,6 @@ self: {
        ];
        description = "Graphviz code generation with Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hapistrano" = callPackage
@@ -109355,8 +101869,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the appindicator library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libappindicator-gtk2;};
 
   "happindicator3" = callPackage
@@ -109371,8 +101883,6 @@ self: {
        libraryPkgconfigDepends = [ libappindicator-gtk3 ];
        description = "Binding to the appindicator library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libappindicator-gtk3;};
 
   "happlets" = callPackage
@@ -109390,8 +101900,6 @@ self: {
        ];
        description = "\"Haskell Applets\" provides an event handler and a canvas for building simple GUI apps";
        license = "AGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happlets-lib-gtk" = callPackage
@@ -109413,8 +101921,6 @@ self: {
        ];
        description = "The \"Haskell Applets\" Gtk+ ver. 2 back-end for \"happlets\".";
        license = "AGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happraise" = callPackage
@@ -109428,8 +101934,6 @@ self: {
        executableHaskellDepends = [ base directory filepath ];
        description = "A small program for counting the comments in haskell source";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happs-hsp" = callPackage
@@ -109443,8 +101947,6 @@ self: {
          base bytestring HAppS-Server hsp mtl plugins
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happs-hsp-template" = callPackage
@@ -109461,8 +101963,6 @@ self: {
        ];
        description = "Utilities for using HSP templates in HAppS applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happs-tutorial" = callPackage
@@ -109487,8 +101987,6 @@ self: {
        ];
        description = "A Happstack Tutorial that is its own web 2.0-type demo.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack" = callPackage
@@ -109503,8 +102001,6 @@ self: {
        doHaddock = false;
        description = "The haskell application server stack + code generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-auth" = callPackage
@@ -109523,8 +102019,6 @@ self: {
        ];
        description = "A Happstack Authentication Suite";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-authenticate" = callPackage
@@ -109554,8 +102048,6 @@ self: {
        ];
        description = "Happstack Authentication Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-clientsession" = callPackage
@@ -109572,8 +102064,6 @@ self: {
        ];
        description = "client-side session data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-contrib" = callPackage
@@ -109594,8 +102084,6 @@ self: {
        ];
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-data" = callPackage
@@ -109617,8 +102105,6 @@ self: {
        ];
        description = "Happstack data manipulation libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-dlg" = callPackage
@@ -109636,8 +102122,6 @@ self: {
        ];
        description = "Cross-request user interactions for Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-facebook" = callPackage
@@ -109663,8 +102147,6 @@ self: {
        ];
        description = "A package for building Facebook applications using Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-fastcgi" = callPackage
@@ -109681,8 +102163,6 @@ self: {
        ];
        description = "Happstack extension for use with FastCGI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-fay" = callPackage
@@ -109698,8 +102178,6 @@ self: {
        ];
        description = "Support for using Fay with Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-fay-ajax" = callPackage
@@ -109712,8 +102190,6 @@ self: {
        libraryHaskellDepends = [ fay-base fay-jquery ];
        description = "Support for using Fay with Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-foundation" = callPackage
@@ -109734,8 +102210,6 @@ self: {
        ];
        description = "Glue code for using Happstack with acid-state, web-routes, reform, and HSP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-hamlet" = callPackage
@@ -109747,8 +102221,6 @@ self: {
        libraryHaskellDepends = [ base happstack-server shakespeare text ];
        description = "Support for Hamlet HTML templates in Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-heist" = callPackage
@@ -109765,8 +102237,6 @@ self: {
        ];
        description = "Support for using Heist templates in Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-helpers" = callPackage
@@ -109790,8 +102260,6 @@ self: {
        ];
        description = "Convenience functions for Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-hsp" = callPackage
@@ -109808,8 +102276,6 @@ self: {
        ];
        description = "Support for using HSP templates in Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-hstringtemplate" = callPackage
@@ -109825,8 +102291,6 @@ self: {
        ];
        description = "Support for using HStringTemplate in Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-ixset" = callPackage
@@ -109845,8 +102309,6 @@ self: {
        ];
        description = "Efficient relational queries on Haskell sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-jmacro" = callPackage
@@ -109864,8 +102326,6 @@ self: {
        ];
        description = "Support for using JMacro with Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-lite" = callPackage
@@ -109879,8 +102339,6 @@ self: {
        ];
        description = "Happstack minus the useless stuff";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-monad-peel" = callPackage
@@ -109896,8 +102354,6 @@ self: {
        ];
        description = "monad-peel instances for Happstack types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-plugins" = callPackage
@@ -109913,8 +102369,6 @@ self: {
        ];
        description = "The haskell application server stack + reload";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-server" = callPackage
@@ -109943,8 +102397,6 @@ self: {
        ];
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-server-tls" = callPackage
@@ -109963,8 +102415,6 @@ self: {
        librarySystemDepends = [ openssl ];
        description = "extend happstack-server with https:// support (TLS/SSL)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "happstack-server-tls-cryptonite" = callPackage
@@ -109982,8 +102432,6 @@ self: {
        ];
        description = "Extend happstack-server with native HTTPS support (TLS/SSL)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-state" = callPackage
@@ -110004,8 +102452,6 @@ self: {
        ];
        description = "Event-based distributed state";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-static-routing" = callPackage
@@ -110021,8 +102467,6 @@ self: {
        ];
        description = "Support for static URL routing with overlap detection for Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-util" = callPackage
@@ -110046,8 +102490,6 @@ self: {
        ];
        description = "Web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happstack-yui" = callPackage
@@ -110069,8 +102511,6 @@ self: {
        ];
        description = "Utilities for using YUI3 with Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happy_1_19_5" = callPackage
@@ -110173,8 +102613,6 @@ self: {
        libraryToolDepends = [ happy ];
        description = "Quasi-quoter for Happy parsers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happybara" = callPackage
@@ -110191,8 +102629,6 @@ self: {
        ];
        description = "Acceptance test framework for web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happybara-webkit" = callPackage
@@ -110212,8 +102648,6 @@ self: {
        ];
        description = "WebKit Happybara driver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "happybara-webkit-server" = callPackage
@@ -110225,8 +102659,6 @@ self: {
        libraryHaskellDepends = [ base directory filepath process ];
        description = "WebKit Server binary for Happybara (taken from capybara-webkit)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hapstone" = callPackage
@@ -110245,8 +102677,6 @@ self: {
        ];
        description = "Capstone bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) capstone;};
 
   "haquery" = callPackage
@@ -110262,8 +102692,6 @@ self: {
        ];
        description = "jQuery for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haquil" = callPackage
@@ -110285,8 +102713,6 @@ self: {
        ];
        description = "A Haskell implementation of the Quil instruction set for quantum computing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "har" = callPackage
@@ -110319,8 +102745,6 @@ self: {
        executableSystemDepends = [ openssl sqlite ];
        description = "Networked content addressed backup and restore software";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) openssl; inherit (pkgs) sqlite;};
 
   "hardware-edsl" = callPackage
@@ -110338,8 +102762,6 @@ self: {
        ];
        description = "Deep embedding of hardware descriptions with code generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "harg" = callPackage
@@ -110360,8 +102782,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Haskell program configuration using higher kinded data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hark" = callPackage
@@ -110380,8 +102800,6 @@ self: {
        ];
        description = "A Gentoo package query tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "harmony" = callPackage
@@ -110407,8 +102825,6 @@ self: {
        ];
        description = "A web service specification compiler that generates implementation and tests";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haroonga" = callPackage
@@ -110425,8 +102841,6 @@ self: {
        libraryPkgconfigDepends = [ groonga ];
        description = "Low level bindings for Groonga";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) groonga;};
 
   "haroonga-httpd" = callPackage
@@ -110445,8 +102859,6 @@ self: {
        ];
        description = "Yet another Groonga http server";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "harp" = callPackage
@@ -110474,8 +102886,6 @@ self: {
        ];
        description = "Runtime code generation for x86 machine code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "harvest-api" = callPackage
@@ -110496,8 +102906,6 @@ self: {
        ];
        description = "Bindings for Harvest API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "has" = callPackage
@@ -110522,8 +102930,6 @@ self: {
        libraryHaskellDepends = [ base has template-haskell ];
        description = "Template Haskell function for Has records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasbolt" = callPackage
@@ -110631,8 +103037,6 @@ self: {
        ];
        description = "Cassandra driver for haskell";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hascat" = callPackage
@@ -110727,8 +103131,6 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Hashing tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hash-store" = callPackage
@@ -110744,8 +103146,6 @@ self: {
        ];
        description = "Hash as cache";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hash-tree" = callPackage
@@ -110768,33 +103168,6 @@ self: {
      }) {};
 
   "hashable" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim
-     , HUnit, integer-gmp, QuickCheck, random, siphash, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text, unix
-     }:
-     mkDerivation {
-       pname = "hashable";
-       version = "1.2.7.0";
-       sha256 = "1gra8gq3kb7b2sd845h55yxlrfqx3ii004c6vjhga8v0b30fzdgc";
-       revision = "1";
-       editedCabalFile = "197063dpl0wn67dp7a06yc2hxp81n24ykk7klbjx0fndm5n87dh3";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring deepseq ghc-prim integer-gmp text
-       ];
-       testHaskellDepends = [
-         base bytestring ghc-prim HUnit QuickCheck random test-framework
-         test-framework-hunit test-framework-quickcheck2 text unix
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion ghc-prim integer-gmp siphash text
-       ];
-       description = "A class for types that can be converted to a hash value";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hashable_1_3_0_0" = callPackage
     ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim
      , HUnit, integer-gmp, QuickCheck, random, siphash, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text, unix
@@ -110817,7 +103190,6 @@ self: {
        ];
        description = "A class for types that can be converted to a hash value";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashable-extras" = callPackage
@@ -110837,8 +103209,6 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Higher-rank Hashable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hashable-generics" = callPackage
@@ -110857,8 +103227,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ghc-prim hashable ];
        description = "Automatically generates Hashable instances with GHC.Generics.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hashable-orphans" = callPackage
@@ -110903,8 +103271,6 @@ self: {
        ];
        description = "Principled, portable & extensible hashing of data and types, including an implementation of the FNV-1a and SipHash algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hashed-storage" = callPackage
@@ -110923,8 +103289,6 @@ self: {
        ];
        description = "Hashed file storage support code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hashflare" = callPackage
@@ -110938,8 +103302,6 @@ self: {
        libraryHaskellDepends = [ base containers simple-money ];
        description = "A library for working with HashFlare.io contracts and hashrates";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hashids" = callPackage
@@ -111018,8 +103380,6 @@ self: {
        ];
        description = "Efficient consistent hashing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hashtable-benchmark" = callPackage
@@ -111072,8 +103432,6 @@ self: {
        ];
        description = "Extensions for a \"hashtables\" library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasim" = callPackage
@@ -111085,8 +103443,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "Process-Based Discrete Event Simulation library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hask" = callPackage
@@ -111104,8 +103460,6 @@ self: {
        ];
        description = "Categories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hask-home" = callPackage
@@ -111124,8 +103478,6 @@ self: {
        ];
        description = "Generate homepages for cabal packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskades" = callPackage
@@ -111205,8 +103557,6 @@ self: {
        ];
        description = "A dialect of haskell with order of execution based on dependency resolution";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskbot-core" = callPackage
@@ -111227,8 +103577,6 @@ self: {
        ];
        description = "Easily-extensible chatbot for Slack messaging service";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskdeep" = callPackage
@@ -111253,8 +103601,6 @@ self: {
        ];
        description = "Computes and audits file hashes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskdogs" = callPackage
@@ -111291,8 +103637,6 @@ self: {
        ];
        description = "A small scheme interpreter";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskeline_0_8_0_0" = callPackage
@@ -111329,8 +103673,6 @@ self: {
        libraryHaskellDepends = [ base haskeline mtl ];
        description = "Class interface for working with Haskeline";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskeline-repl" = callPackage
@@ -111354,8 +103696,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl protolude text ];
        description = "Write Emacs module in Haskell, using Emacs 25's Dynamic Module feature";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-abci" = callPackage
@@ -111381,8 +103721,6 @@ self: {
        ];
        description = "Haskell Application BlockChain Interface (ABCI) Server Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-aliyun" = callPackage
@@ -111405,8 +103743,6 @@ self: {
        ];
        description = "haskell client of aliyun service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-awk" = callPackage
@@ -111439,8 +103775,6 @@ self: {
        ];
        description = "Transform text from the command-line using Haskell expressions";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-bcrypt" = callPackage
@@ -111479,8 +103813,6 @@ self: {
        ];
        description = "Complete BitMEX Client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-bitmex-rest" = callPackage
@@ -111508,8 +103840,6 @@ self: {
        ];
        description = "Auto-generated bitmex API Client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-brainfuck" = callPackage
@@ -111529,8 +103859,6 @@ self: {
        ];
        description = "BrainFuck interpreter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-ci" = callPackage
@@ -111538,8 +103866,8 @@ self: {
      , bytestring, Cabal, cabal-install-parsers, containers, deepseq
      , Diff, directory, exceptions, filepath, generic-lens, HsYAML
      , lattices, microlens, mtl, network-uri, optparse-applicative
-     , parsec, pretty, process, ShellCheck, tasty, tasty-golden
-     , temporary, text, transformers, unordered-containers
+     , parsec, pretty, process, tasty, tasty-golden, temporary, text
+     , transformers, unordered-containers
      }:
      mkDerivation {
        pname = "haskell-ci";
@@ -111551,7 +103879,7 @@ self: {
          aeson base base-compat bytestring Cabal cabal-install-parsers
          containers deepseq directory exceptions filepath generic-lens
          HsYAML lattices microlens mtl network-uri optparse-applicative
-         parsec pretty process ShellCheck temporary text transformers
+         parsec pretty process temporary text transformers
          unordered-containers
        ];
        executableHaskellDepends = [ base ];
@@ -111562,8 +103890,6 @@ self: {
        doHaddock = false;
        description = "Cabal package script generator for Travis-CI";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-cnc" = callPackage
@@ -111584,8 +103910,6 @@ self: {
        executableHaskellDepends = [ base directory process ];
        description = "Library for parallel programming in the Intel Concurrent Collections paradigm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-coffee" = callPackage
@@ -111597,8 +103921,6 @@ self: {
        libraryHaskellDepends = [ base process ];
        description = "Simple CoffeeScript API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-compression" = callPackage
@@ -111618,8 +103940,6 @@ self: {
        ];
        description = "compress files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-conll" = callPackage
@@ -111646,15 +103966,10 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        description = "Small modules for a Haskell course in which Haskell is taught by implementing Prelude functionality";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-dap" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, deepseq
-     , directory, filepath, ghc, ghc-boot, ghc-paths, ghci, haskeline
-     , process, text, time, transformers, unix
-     }:
+    ({ mkDerivation, base, containers, unix }:
      mkDerivation {
        pname = "haskell-dap";
        version = "0.0.14.0";
@@ -111662,45 +103977,41 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
-       executableHaskellDepends = [
-         array base bytestring containers deepseq directory filepath ghc
-         ghc-boot ghc-paths ghci haskeline process text time transformers
-         unix
-       ];
+       executableHaskellDepends = [ base unix ];
        description = "Haskell implementation of the DAP interface data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "haskell-debug-adapter" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, Cabal, clock
-     , cmdargs, conduit, conduit-extra, containers, data-default
-     , directory, filepath, fsnotify, ghci-dap, haskell-dap, hslogger
-     , hspec, lens, mtl, parsec, process, resourcet, safe-exceptions
-     , text
+     , conduit, conduit-extra, containers, data-default, directory
+     , filepath, fsnotify, ghci-dap, haskell-dap, hslogger, hspec, lens
+     , mtl, optparse-applicative, parsec, process, resourcet
+     , safe-exceptions, text
      }:
      mkDerivation {
        pname = "haskell-debug-adapter";
-       version = "0.0.32.0";
-       sha256 = "1pxq0aazjdlda8hwsmbsqlg509s44v1c4ql06vf6i6jhwflbxp9r";
+       version = "0.0.33.0";
+       sha256 = "1v4dzjv1w0jdp5dyq3qrbdw34433b5xg6wk5hg87agzc3mllbkqa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson async base bytestring Cabal clock cmdargs conduit
-         conduit-extra containers data-default directory filepath fsnotify
-         ghci-dap haskell-dap hslogger lens mtl parsec process resourcet
-         safe-exceptions text
+         aeson async base bytestring Cabal clock conduit conduit-extra
+         containers data-default directory filepath fsnotify ghci-dap
+         haskell-dap hslogger lens mtl optparse-applicative parsec process
+         resourcet safe-exceptions text
        ];
        executableHaskellDepends = [
-         aeson async base bytestring Cabal clock cmdargs conduit
-         conduit-extra containers data-default directory filepath fsnotify
-         ghci-dap haskell-dap hslogger lens mtl parsec process resourcet
-         safe-exceptions text
+         aeson async base bytestring Cabal clock conduit conduit-extra
+         containers data-default directory filepath fsnotify ghci-dap
+         haskell-dap hslogger lens mtl optparse-applicative parsec process
+         resourcet safe-exceptions text
        ];
        testHaskellDepends = [
-         aeson async base bytestring Cabal clock cmdargs conduit
-         conduit-extra containers data-default directory filepath fsnotify
-         ghci-dap haskell-dap hslogger hspec lens mtl parsec process
-         resourcet safe-exceptions text
+         aeson async base bytestring Cabal clock conduit conduit-extra
+         containers data-default directory filepath fsnotify ghci-dap
+         haskell-dap hslogger hspec lens mtl optparse-applicative parsec
+         process resourcet safe-exceptions text
        ];
        description = "Haskell Debug Adapter";
        license = stdenv.lib.licenses.bsd3;
@@ -111720,15 +104031,12 @@ self: {
        testHaskellDepends = [ base ];
        description = "Client library for the Disque datastore";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-docs" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Cabal
      , containers, cryptohash, directory, filepath, ghc, ghc-paths
-     , haddock-api, haddock-library, monad-loops, process, text
-     , unordered-containers
+     , haddock-api, monad-loops, process, text, unordered-containers
      }:
      mkDerivation {
        pname = "haskell-docs";
@@ -111738,8 +104046,8 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring Cabal containers cryptohash
-         directory filepath ghc ghc-paths haddock-api haddock-library
-         monad-loops process text unordered-containers
+         directory filepath ghc ghc-paths haddock-api monad-loops process
+         text unordered-containers
        ];
        executableHaskellDepends = [ base ghc text ];
        testHaskellDepends = [ base ];
@@ -111757,8 +104065,6 @@ self: {
        testHaskellDepends = [ base eigen vector ];
        description = "Some utility functions for haskell-eigen library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-exp-parser" = callPackage
@@ -111811,8 +104117,6 @@ self: {
        ];
        description = "Haskell source code formatter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-ftp" = callPackage
@@ -111839,8 +104143,6 @@ self: {
        ];
        description = "A Haskell ftp server with configurable backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-generate" = callPackage
@@ -111857,8 +104159,6 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Typesafe generation of haskell source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-gettext" = callPackage
@@ -111949,8 +104249,6 @@ self: {
        executableHaskellDepends = [ base containers gloss ];
        description = "Go and Checkers game in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-google-trends" = callPackage
@@ -111981,8 +104279,6 @@ self: {
        testHaskellDepends = [ base template-haskell transformers ];
        description = "Infer haskell code by given type";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-igraph" = callPackage
@@ -112024,8 +104320,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "create haskell import graph for graphviz";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-in-space" = callPackage
@@ -112039,8 +104333,6 @@ self: {
        executableHaskellDepends = [ base HGL random ];
        description = "'Asteroids' arcade games";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-kubernetes" = callPackage
@@ -112060,22 +104352,9 @@ self: {
        ];
        description = "Haskell bindings to the Kubernetes API (via swagger-codegen)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-lexer" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "haskell-lexer";
-       version = "1.0.2";
-       sha256 = "1wyxd8x33x4v5vxyzkhm610pl86gbkc8y439092fr1735q9g7kfq";
-       libraryHaskellDepends = [ base ];
-       description = "A fully compliant Haskell 98 lexer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-lexer_1_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "haskell-lexer";
@@ -112084,39 +104363,9 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A fully compliant Haskell 98 lexer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-lsp" = callPackage
-    ({ mkDerivation, aeson, async, attoparsec, base, bytestring
-     , containers, data-default, directory, filepath, hashable
-     , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl
-     , network-uri, QuickCheck, quickcheck-instances, rope-utf16-splay
-     , sorted-list, stm, temporary, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "haskell-lsp";
-       version = "0.15.0.0";
-       sha256 = "111c0hdlpnj979p3avlhswziyc6vh6apij5b2nhhi8wlfhqwrpcg";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson async attoparsec base bytestring containers data-default
-         directory filepath hashable haskell-lsp-types hslogger lens mtl
-         network-uri rope-utf16-splay sorted-list stm temporary text time
-         unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers data-default directory filepath
-         hashable hspec lens network-uri QuickCheck quickcheck-instances
-         rope-utf16-splay sorted-list stm text
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Haskell library for the Microsoft Language Server Protocol";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "haskell-lsp_0_20_0_1" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, bytestring
      , containers, data-default, directory, filepath, hashable
      , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl
@@ -112143,7 +104392,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Haskell library for the Microsoft Language Server Protocol";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-lsp-client" = callPackage
@@ -112164,28 +104412,9 @@ self: {
        ];
        description = "A haskell package to build your own Language Server client";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-lsp-types" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, data-default, deepseq
-     , filepath, hashable, lens, network-uri, scientific, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "haskell-lsp-types";
-       version = "0.15.0.0";
-       sha256 = "1ky20lpgbdiijh3z6ilf7jn7cyxl2kshqnm2p4dgabfh97gbf8bb";
-       libraryHaskellDepends = [
-         aeson base bytestring data-default deepseq filepath hashable lens
-         network-uri scientific text unordered-containers
-       ];
-       description = "Haskell library for the Microsoft Language Server Protocol, data types";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "haskell-lsp-types_0_20_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, deepseq
      , filepath, hashable, lens, network-uri, scientific, text
      , unordered-containers
@@ -112200,7 +104429,6 @@ self: {
        ];
        description = "Haskell library for the Microsoft Language Server Protocol, data types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-menu" = callPackage
@@ -112231,8 +104459,6 @@ self: {
        testHaskellDepends = [ base MonadRandom ];
        description = "Machine learning in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-modbus" = callPackage
@@ -112256,8 +104482,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        description = "Correctly-rounded arbitrary-precision floating-point arithmetic";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-mpi" = callPackage
@@ -112331,8 +104555,6 @@ self: {
        ];
        description = "A Haskell neo4j client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-openflow" = callPackage
@@ -112347,8 +104569,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "OpenFlow protocol in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-overridez" = callPackage
@@ -112370,8 +104590,6 @@ self: {
        ];
        description = "Manage nix overrides for haskell packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-packages" = callPackage
@@ -112390,8 +104608,6 @@ self: {
        ];
        description = "Haskell suite library for package management and integration with Cabal";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-pdf-presenter" = callPackage
@@ -112411,8 +104627,6 @@ self: {
        ];
        description = "Tool for presenting PDF-based presentations";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-platform-test" = callPackage
@@ -112441,8 +104655,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "A test system for the Haskell Platform environment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-player" = callPackage
@@ -112464,8 +104676,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A terminal music player based on afplay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-plot" = callPackage
@@ -112482,8 +104692,6 @@ self: {
        ];
        description = "A library for generating 2D plots painlessly";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-postal" = callPackage
@@ -112499,8 +104707,6 @@ self: {
        testPkgconfigDepends = [ libpostal ];
        description = "Haskell binding for the libpostal library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {libpostal = null;};
 
   "haskell-postgis" = callPackage
@@ -112566,8 +104772,6 @@ self: {
        testHaskellDepends = [ base directory hspec process ];
        description = "Opens a temporary file on the system's EDITOR and returns the resulting edits";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-reflect" = callPackage
@@ -112584,8 +104788,6 @@ self: {
        ];
        description = "Reflect Haskell types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-rules" = callPackage
@@ -112597,8 +104799,6 @@ self: {
        libraryHaskellDepends = [ base syb ];
        description = "A DSL for expressing natural deduction rules in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-snake" = callPackage
@@ -112638,20 +104838,6 @@ self: {
      }) {};
 
   "haskell-src" = callPackage
-    ({ mkDerivation, array, base, happy, pretty, syb }:
-     mkDerivation {
-       pname = "haskell-src";
-       version = "1.0.3.0";
-       sha256 = "1g4dj1f0j68bhn4ixfac63wjzy6gsp6kwgxryb1k5nl3i0g99d5l";
-       revision = "1";
-       editedCabalFile = "1pnrvh9wzdkhvkkky4rlq1imycl9k76x9rvgq7cmfp8rf1iwqi5q";
-       libraryHaskellDepends = [ array base pretty syb ];
-       libraryToolDepends = [ happy ];
-       description = "Support for manipulating Haskell source code";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-src_1_0_3_1" = callPackage
     ({ mkDerivation, array, base, happy, pretty, syb }:
      mkDerivation {
        pname = "haskell-src";
@@ -112661,7 +104847,6 @@ self: {
        libraryToolDepends = [ happy ];
        description = "Support for manipulating Haskell source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-src-exts_1_19_1" = callPackage
@@ -112694,8 +104879,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-src-exts";
-       version = "1.21.1";
-       sha256 = "0q1y8n3d82gid9bcx8wxsqqmj9mq11fg3gp5yzpfbw958dhi3j9f";
+       version = "1.22.0";
+       sha256 = "1wc3w1kkrlagbbbgqflqx4xwqk36wsng7r3wyjflvlas4sf3xmg0";
        libraryHaskellDepends = [ array base ghc-prim pretty ];
        libraryToolDepends = [ happy ];
        testHaskellDepends = [
@@ -112739,8 +104924,6 @@ self: {
        libraryHaskellDepends = [ base haskell-src-exts Hoed ];
        description = "Observable orphan instances for haskell-src-exts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-src-exts-prisms" = callPackage
@@ -112754,8 +104937,6 @@ self: {
        ];
        description = "Prisms with newtype wrappers for haskell-src-exts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-src-exts-qq" = callPackage
@@ -112772,8 +104953,6 @@ self: {
        testHaskellDepends = [ base haskell-src-exts hspec ];
        description = "A quasiquoter for haskell-src-exts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-src-exts-sc" = callPackage
@@ -112787,8 +104966,6 @@ self: {
        libraryHaskellDepends = [ base haskell-src-exts ];
        description = "Pretty print haskell code with comments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-src-exts-simple" = callPackage
@@ -112800,8 +104977,6 @@ self: {
        libraryHaskellDepends = [ base haskell-src-exts ];
        description = "A simplified view on the haskell-src-exts AST";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-src-exts-util" = callPackage
@@ -112821,25 +104996,6 @@ self: {
      }) {};
 
   "haskell-src-meta" = callPackage
-    ({ mkDerivation, base, containers, haskell-src-exts, HUnit, pretty
-     , syb, tasty, tasty-hunit, template-haskell, th-orphans
-     }:
-     mkDerivation {
-       pname = "haskell-src-meta";
-       version = "0.8.3";
-       sha256 = "17znnaqj2hnnfyc9p9xjzbs97h2jh1h4f4qbw648y3xa14wx5ra9";
-       libraryHaskellDepends = [
-         base haskell-src-exts pretty syb template-haskell th-orphans
-       ];
-       testHaskellDepends = [
-         base containers haskell-src-exts HUnit pretty syb tasty tasty-hunit
-         template-haskell
-       ];
-       description = "Parse source to template-haskell abstract syntax";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-src-meta_0_8_5" = callPackage
     ({ mkDerivation, base, containers, haskell-src-exts, HUnit, pretty
      , syb, tasty, tasty-hunit, template-haskell, th-orphans
      }:
@@ -112858,7 +105014,6 @@ self: {
        ];
        description = "Parse source to template-haskell abstract syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-src-meta-mwotton" = callPackage
@@ -112875,8 +105030,6 @@ self: {
        ];
        description = "Parse source to template-haskell abstract syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-stack-trace-plugin" = callPackage
@@ -112895,8 +105048,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "haskell-stack-trace-plugin";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-time-range" = callPackage
@@ -112954,8 +105105,6 @@ self: {
        ];
        description = "Utilities to tie up tokens to an AST";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tools-ast" = callPackage
@@ -112989,8 +105138,6 @@ self: {
        ];
        description = "Creating the Haskell-Tools AST from GHC's representations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tools-ast-gen" = callPackage
@@ -113007,8 +105154,6 @@ self: {
        ];
        description = "Facilities for generating new parts of the Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tools-ast-trf" = callPackage
@@ -113024,8 +105169,6 @@ self: {
        ];
        description = "Conversions on Haskell-Tools AST to prepare for refactorings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tools-backend-ghc" = callPackage
@@ -113074,8 +105217,6 @@ self: {
        ];
        description = "Refactoring Tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tools-cli" = callPackage
@@ -113111,8 +105252,6 @@ self: {
        ];
        description = "Command-line frontend for Haskell-tools Refact";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tools-daemon" = callPackage
@@ -113146,8 +105285,6 @@ self: {
        ];
        description = "Background process for Haskell-tools that editors can connect to";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tools-debug" = callPackage
@@ -113172,8 +105309,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Debugging Tools for Haskell-tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tools-demo" = callPackage
@@ -113204,8 +105339,6 @@ self: {
        ];
        description = "A web-based demo for Haskell-tools Refactor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tools-experimental-refactorings" = callPackage
@@ -113236,8 +105369,6 @@ self: {
        ];
        description = "Refactoring Tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tools-prettyprint" = callPackage
@@ -113283,8 +105414,6 @@ self: {
        ];
        description = "Refactoring Tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tools-rewrite" = callPackage
@@ -113306,8 +105435,6 @@ self: {
        ];
        description = "Facilities for generating new parts of the Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tor" = callPackage
@@ -113341,8 +105468,6 @@ self: {
        ];
        description = "A Haskell Tor Node";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-type-exts" = callPackage
@@ -113356,8 +105481,6 @@ self: {
        ];
        description = "A type checker for Haskell/haskell-src-exts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-typescript" = callPackage
@@ -113369,8 +105492,6 @@ self: {
        libraryHaskellDepends = [ base process ];
        description = "Simple TypeScript API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-tyrant" = callPackage
@@ -113382,8 +105503,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring network ];
        description = "Haskell implementation of the Tokyo Tyrant binary protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-updater" = callPackage
@@ -113419,8 +105538,6 @@ self: {
        ];
        description = "Haskell XMPP (eXtensible Message Passing Protocol, a.k.a. Jabber) library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell2010" = callPackage
@@ -113432,8 +105549,6 @@ self: {
        libraryHaskellDepends = [ array base ghc-prim ];
        description = "Compatibility with Haskell 2010";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell2020" = callPackage
@@ -113460,8 +105575,6 @@ self: {
        ];
        description = "Compatibility with Haskell 98";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell98libraries" = callPackage
@@ -113477,8 +105590,6 @@ self: {
        ];
        description = "Compatibility with Haskell 98";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb" = callPackage
@@ -113494,8 +105605,6 @@ self: {
        ];
        description = "A library of combinators for generating and executing SQL statements";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-connect-hdbc" = callPackage
@@ -113507,8 +105616,6 @@ self: {
        libraryHaskellDepends = [ base containers haskelldb HDBC ];
        description = "Bracketed HDBC session for HaskellDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-connect-hdbc-catchio-mtl" = callPackage
@@ -113524,8 +105631,6 @@ self: {
        ];
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-mtl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-connect-hdbc-catchio-tf" = callPackage
@@ -113542,8 +105647,6 @@ self: {
        ];
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-connect-hdbc-catchio-transformers" = callPackage
@@ -113560,8 +105663,6 @@ self: {
        ];
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-connect-hdbc-lifted" = callPackage
@@ -113578,8 +105679,6 @@ self: {
        ];
        description = "Bracketed HaskellDB HDBC session using lifted-base";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-dynamic" = callPackage
@@ -113594,8 +105693,6 @@ self: {
        executableHaskellDepends = [ haskelldb ];
        description = "HaskellDB support for the dynamically loaded drivers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-flat" = callPackage
@@ -113613,8 +105710,6 @@ self: {
        ];
        description = "An experimental HaskellDB back-end in pure Haskell (no SQL)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-hdbc" = callPackage
@@ -113630,8 +105725,6 @@ self: {
        ];
        description = "HaskellDB support for HDBC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-hdbc-mysql" = callPackage
@@ -113649,8 +105742,6 @@ self: {
        ];
        description = "HaskellDB support for the HDBC MySQL driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-hdbc-odbc" = callPackage
@@ -113668,8 +105759,6 @@ self: {
        ];
        description = "HaskellDB support for the HDBC ODBC driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-hdbc-postgresql" = callPackage
@@ -113688,8 +105777,6 @@ self: {
        executableSystemDepends = [ postgresql ];
        description = "HaskellDB support for the HDBC PostgreSQL driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) postgresql;};
 
   "haskelldb-hdbc-sqlite3" = callPackage
@@ -113707,8 +105794,6 @@ self: {
        ];
        description = "HaskellDB support for the HDBC SQLite driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-hsql" = callPackage
@@ -113720,8 +105805,6 @@ self: {
        libraryHaskellDepends = [ base haskelldb hsql mtl old-time ];
        description = "HaskellDB support for HSQL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-hsql-mysql" = callPackage
@@ -113739,8 +105822,6 @@ self: {
        ];
        description = "HaskellDB support for the HSQL MySQL driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-hsql-odbc" = callPackage
@@ -113758,8 +105839,6 @@ self: {
        ];
        description = "HaskellDB support for the HSQL ODBC driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-hsql-oracle" = callPackage
@@ -113796,8 +105875,6 @@ self: {
        ];
        description = "HaskellDB support for the HSQL PostgreSQL driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-hsql-sqlite" = callPackage
@@ -113834,8 +105911,6 @@ self: {
        ];
        description = "HaskellDB support for the HSQL SQLite3 driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-th" = callPackage
@@ -113847,8 +105922,6 @@ self: {
        libraryHaskellDepends = [ base haskelldb mtl template-haskell ];
        description = "Template Haskell utilities for HaskellDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelldb-wx" = callPackage
@@ -113859,8 +105932,6 @@ self: {
        sha256 = "01652m0bym80400navqlpdv5n0gfgnfzd1d0857f3kd13ksqk2hy";
        description = "HaskellDB support for WXHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskellish" = callPackage
@@ -113895,8 +105966,6 @@ self: {
        ];
        description = "A scrabble library capturing the core game logic of scrabble";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskellscript" = callPackage
@@ -113914,8 +105983,6 @@ self: {
        ];
        description = "Command line tool for running Haskell scripts with a hashbang";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskelm" = callPackage
@@ -113964,8 +106031,6 @@ self: {
        ];
        description = "CP in Haskell through MiniZinc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskeme" = callPackage
@@ -114007,8 +106072,6 @@ self: {
        ];
        description = "A transactional, ACID compliant, embeddable key-value store";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskey-btree" = callPackage
@@ -114052,8 +106115,6 @@ self: {
        ];
        description = "A monad transformer supporting Haskey transactions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskgame" = callPackage
@@ -114065,8 +106126,6 @@ self: {
        libraryHaskellDepends = [ base containers haskell98 SDL SDL-ttf ];
        description = "Haskell game library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskheap" = callPackage
@@ -114083,8 +106142,6 @@ self: {
        ];
        description = "Haskell bindings to refheap";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskhol-core" = callPackage
@@ -114104,8 +106161,6 @@ self: {
        ];
        description = "The core logical system of HaskHOL, an EDSL for HOL theorem proving";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskintex" = callPackage
@@ -114142,8 +106197,6 @@ self: {
        ];
        description = "A haskell wrapper for PokeAPI.co (www.pokeapi.co)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoin" = callPackage
@@ -114167,8 +106220,6 @@ self: {
        ];
        description = "Implementation of the Bitcoin protocol";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoin-bitcoind" = callPackage
@@ -114186,40 +106237,9 @@ self: {
        ];
        description = "An adapter for haskoin to network-bitcoin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoin-core" = callPackage
-    ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring
-     , cereal, conduit, containers, cryptonite, entropy, hashable, hspec
-     , hspec-discover, HUnit, memory, mtl, murmur3, network, QuickCheck
-     , safe, scientific, secp256k1-haskell, split, string-conversions
-     , text, time, transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "haskoin-core";
-       version = "0.9.8";
-       sha256 = "1x5ylla9910gvrydhfvzvj7x5w7xjy9bf3rakcqskcn0v4chx9pr";
-       libraryHaskellDepends = [
-         aeson array base base16-bytestring bytestring cereal conduit
-         containers cryptonite entropy hashable hspec HUnit memory mtl
-         murmur3 network QuickCheck safe scientific secp256k1-haskell split
-         string-conversions text time transformers unordered-containers
-         vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring cereal containers hspec HUnit mtl QuickCheck
-         safe split string-conversions text unordered-containers vector
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Bitcoin & Bitcoin Cash library for Haskell";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "haskoin-core_0_10_0" = callPackage
     ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring
      , cereal, conduit, containers, cryptonite, deepseq, entropy
      , hashable, hspec, hspec-discover, HUnit, memory, mtl, murmur3
@@ -114229,8 +106249,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-core";
-       version = "0.10.0";
-       sha256 = "0gb9z0ncy7ff93k41yvbj0i33akpk5vcm477ydpn7sandq3m40nv";
+       version = "0.10.1";
+       sha256 = "0gfszpi453736lv7amfmknf9sfpxh071lvxfgaxyi3bshr2kibhz";
        libraryHaskellDepends = [
          aeson array base base16-bytestring bytestring cereal conduit
          containers cryptonite deepseq entropy hashable hspec HUnit memory
@@ -114246,8 +106266,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bitcoin & Bitcoin Cash library for Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoin-crypto" = callPackage
@@ -114270,8 +106288,6 @@ self: {
        ];
        description = "Implementation of Bitcoin cryptographic primitives";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoin-node" = callPackage
@@ -114284,8 +106300,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskoin-node";
-       version = "0.9.15";
-       sha256 = "0bdyqqhxjbz3lqj5q7cg9w9i40xvp9p9185g3dlhqn598s65mppx";
+       version = "0.9.16";
+       sha256 = "0k84jxlahk5axixn2y4hg63qbj6383hmidrrx2nll86vjifanv4f";
        libraryHaskellDepends = [
          base bytestring cereal conduit conduit-extra containers
          data-default hashable haskoin-core monad-logger mtl network nqe
@@ -114302,8 +106318,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Haskoin Node P2P library for Bitcoin and Bitcoin Cash";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoin-protocol" = callPackage
@@ -114324,8 +106338,6 @@ self: {
        ];
        description = "Implementation of the Bitcoin network protocol messages";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoin-script" = callPackage
@@ -114348,8 +106360,6 @@ self: {
        ];
        description = "Implementation of Bitcoin script parsing and evaluation";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoin-store" = callPackage
@@ -114390,8 +106400,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Storage and index for Bitcoin and Bitcoin Cash";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoin-util" = callPackage
@@ -114412,8 +106420,6 @@ self: {
        ];
        description = "Utility functions for the Network.Haskoin project";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoin-wallet" = callPackage
@@ -114456,8 +106462,6 @@ self: {
        ];
        description = "Implementation of a Bitcoin SPV Wallet with BIP32 and multisig support";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoon" = callPackage
@@ -114475,8 +106479,6 @@ self: {
        ];
        description = "Web Application Abstraction";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoon-httpspec" = callPackage
@@ -114492,8 +106494,6 @@ self: {
        ];
        description = "Integrating HttpSpec with Haskoon";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoon-salvia" = callPackage
@@ -114511,8 +106511,6 @@ self: {
        ];
        description = "Integrating HttpSpec with Haskoon";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskore" = callPackage
@@ -114537,8 +106535,6 @@ self: {
        ];
        description = "The Haskore Computer Music System";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskore-realtime" = callPackage
@@ -114556,8 +106552,6 @@ self: {
        ];
        description = "Routines for realtime playback of Haskore songs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskore-supercollider" = callPackage
@@ -114579,8 +106573,6 @@ self: {
        ];
        description = "Haskore back-end for SuperCollider";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskore-synthesizer" = callPackage
@@ -114600,8 +106592,6 @@ self: {
        ];
        description = "Music rendering coded in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskore-vintage" = callPackage
@@ -114695,8 +106685,6 @@ self: {
        doHaddock = false;
        description = "Torch for tensors and neural networks in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasktorch-codegen" = callPackage
@@ -114760,8 +106748,6 @@ self: {
        ];
        description = "Bindings to Torch";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {ATen = null;};
 
   "hasktorch-ffi-thc" = callPackage
@@ -114784,8 +106770,6 @@ self: {
        ];
        description = "Bindings to Cutorch";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {ATen = null;};
 
   "hasktorch-indef" = callPackage
@@ -114814,8 +106798,6 @@ self: {
        doHaddock = false;
        description = "Core Hasktorch abstractions wrapping FFI bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasktorch-signatures" = callPackage
@@ -114841,8 +106823,6 @@ self: {
        doHaddock = false;
        description = "Backpack signatures for Tensor operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasktorch-signatures-partial" = callPackage
@@ -114858,8 +106838,6 @@ self: {
        ];
        description = "Functions to partially satisfy tensor signatures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasktorch-signatures-support" = callPackage
@@ -114876,8 +106854,6 @@ self: {
        doHaddock = false;
        description = "Signatures for support tensors in hasktorch";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasktorch-signatures-types" = callPackage
@@ -114938,8 +106914,6 @@ self: {
        ];
        description = "Neural architectures in hasktorch";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskus-binary" = callPackage
@@ -114966,8 +106940,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Haskus binary format manipulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskus-system-build" = callPackage
@@ -114987,30 +106959,28 @@ self: {
        ];
        description = "Haskus system build tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskus-utils" = callPackage
-    ({ mkDerivation, base, containers, extra, file-embed, hashable
+    ({ mkDerivation, base, containers, doctest, free, hashable
      , haskus-utils-data, haskus-utils-types, haskus-utils-variant
      , list-t, mtl, stm, stm-containers, tasty, tasty-quickcheck
      , template-haskell, transformers, vector
      }:
      mkDerivation {
        pname = "haskus-utils";
-       version = "1.4";
-       sha256 = "1d18q6yd4gy80qa6w1s9c4z7fyn9fqdvnvxdm4mhzi2bwx51yzfg";
+       version = "1.5";
+       sha256 = "0rdlbjk6n2mzhzhsklnc61555kac6hv2243mgcg2bakypphl48na";
        libraryHaskellDepends = [
-         base containers extra file-embed hashable haskus-utils-data
-         haskus-utils-types haskus-utils-variant list-t mtl stm
-         stm-containers template-haskell transformers vector
+         base containers free hashable haskus-utils-data haskus-utils-types
+         haskus-utils-variant list-t mtl stm stm-containers template-haskell
+         transformers vector
+       ];
+       testHaskellDepends = [
+         base containers doctest tasty tasty-quickcheck
        ];
-       testHaskellDepends = [ base tasty tasty-quickcheck ];
        description = "Haskus utility modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskus-utils-compat" = callPackage
@@ -115027,8 +106997,6 @@ self: {
        ];
        description = "Compatibility modules with other external packages (ByteString, etc.)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskus-utils-data" = callPackage
@@ -115039,6 +107007,8 @@ self: {
        pname = "haskus-utils-data";
        version = "1.2";
        sha256 = "0dn07zj9v5yl0mpcnblk2y17x30wg8fag4hv9mfp3kn003217f89";
+       revision = "1";
+       editedCabalFile = "0pgaf358jjkpi928rgxs5ly4v8vl7lxrsdrq0gflxfc47ni2mxj8";
        libraryHaskellDepends = [
          base containers extra ghc-prim haskus-utils-types mtl
          recursion-schemes transformers
@@ -115054,6 +107024,8 @@ self: {
        pname = "haskus-utils-types";
        version = "1.5";
        sha256 = "1mbgnx4i82g9bq1qpvjjs9yb683gfja5bws8y26mzjl4igk6izsy";
+       revision = "1";
+       editedCabalFile = "1mjwmk5prbrb91dbhxg9pp47zf5cfnnm07h3f2m902af3l0yjiih";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        description = "Haskus types utility modules";
@@ -115080,8 +107052,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq QuickCheck ];
        description = "Variant and EADT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskus-web" = callPackage
@@ -115098,8 +107068,6 @@ self: {
        ];
        description = "Haskus web";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskyapi" = callPackage
@@ -115145,8 +107113,6 @@ self: {
        executableHaskellDepends = [ mtl old-time QuickCheck time wtk ];
        description = "Loan calculator engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasloGUI" = callPackage
@@ -115165,8 +107131,6 @@ self: {
        ];
        description = "Loan calculator Gtk GUI. Based on haslo (Haskell Loan) library.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasmin" = callPackage
@@ -115208,8 +107172,6 @@ self: {
        libraryHaskellDepends = [ base HTTP monads-fd network xml ];
        description = "This package enables to write SPARQL queries to remote endpoints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haspell" = callPackage
@@ -115266,8 +107228,6 @@ self: {
        ];
        description = "API for backends of \"hasql\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasql-class" = callPackage
@@ -115290,8 +107250,6 @@ self: {
        ];
        description = "Encodable and Decodable classes for hasql";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasql-cursor-query" = callPackage
@@ -115314,8 +107272,6 @@ self: {
        ];
        description = "A declarative abstraction over PostgreSQL Cursor";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasql-cursor-transaction" = callPackage
@@ -115353,8 +107309,6 @@ self: {
        ];
        description = "Toolkit for constructing Hasql statements dynamically";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasql-generic" = callPackage
@@ -115373,8 +107327,6 @@ self: {
        ];
        description = "Generic encoder and decoder deriving for Hasql";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasql-implicits" = callPackage
@@ -115391,8 +107343,6 @@ self: {
        ];
        description = "Implicit definitions for Hasql, such as default codecs for standard types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasql-migration" = callPackage
@@ -115413,8 +107363,6 @@ self: {
        ];
        description = "PostgreSQL Schema Migrations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasql-optparse-applicative" = callPackage
@@ -115430,8 +107378,6 @@ self: {
        ];
        description = "\"optparse-applicative\" parsers for \"hasql\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasql-pool" = callPackage
@@ -115444,8 +107390,6 @@ self: {
        testHaskellDepends = [ base-prelude hasql hspec ];
        description = "A pool of connections for Hasql";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasql-postgres" = callPackage
@@ -115481,8 +107425,6 @@ self: {
        ];
        description = "A \"PostgreSQL\" backend for the \"hasql\" library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasql-postgres-options" = callPackage
@@ -115497,8 +107439,6 @@ self: {
        ];
        description = "An \"optparse-applicative\" parser for \"hasql-postgres\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasql-simple" = callPackage
@@ -115515,8 +107455,6 @@ self: {
        ];
        description = "A somewhat opinionated \"simpler\" API to hasql";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hasql-th" = callPackage
@@ -115548,24 +107486,6 @@ self: {
      }) {};
 
   "hasql-transaction" = callPackage
-    ({ mkDerivation, async, base, bytestring, bytestring-tree-builder
-     , contravariant, contravariant-extras, hasql, mtl, rebase
-     , transformers
-     }:
-     mkDerivation {
-       pname = "hasql-transaction";
-       version = "0.7.2";
-       sha256 = "13d5zisr34bdbiypvpcb114d4c9yi6pyb9wnhigqpwd90vzpzsb5";
-       libraryHaskellDepends = [
-         base bytestring bytestring-tree-builder contravariant
-         contravariant-extras hasql mtl transformers
-       ];
-       testHaskellDepends = [ async hasql rebase ];
-       description = "A composable abstraction over the retryable transactions for Hasql";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hasql-transaction_1_0_0_1" = callPackage
     ({ mkDerivation, async, base, bytestring, bytestring-tree-builder
      , contravariant, contravariant-extras, hasql, mtl, rebase
      , transformers
@@ -115581,7 +107501,6 @@ self: {
        testHaskellDepends = [ async hasql rebase ];
        description = "Composable abstraction over retryable transactions for Hasql";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hastache" = callPackage
@@ -115610,8 +107529,6 @@ self: {
        ];
        description = "Haskell implementation of Mustache templates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hastache-aeson" = callPackage
@@ -115628,8 +107545,6 @@ self: {
        ];
        description = "render hastache templates using aeson values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haste" = callPackage
@@ -115643,8 +107558,6 @@ self: {
        executableHaskellDepends = [ base curl filepath mtl ];
        description = "A universal pastebin tool, written in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haste-app" = callPackage
@@ -115664,8 +107577,6 @@ self: {
        ];
        description = "Framework for type-safe, distributed web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haste-compiler" = callPackage
@@ -115728,8 +107639,6 @@ self: {
        ];
        description = "Base libraries for haste-compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haste-markup" = callPackage
@@ -115744,8 +107653,6 @@ self: {
        ];
        description = "A port of blaze-markup and blaze-html to Haste";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haste-perch" = callPackage
@@ -115769,8 +107676,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        description = "Low level primitives for the Haste compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hastily" = callPackage
@@ -115855,8 +107760,6 @@ self: {
        ];
        description = "HaTeX User's Guide";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hath" = callPackage
@@ -115907,8 +107810,6 @@ self: {
        ];
        description = "Haskell client for the NATS messaging system";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hatt" = callPackage
@@ -115931,8 +107832,6 @@ self: {
        ];
        description = "A truth table generator for classical propositional logic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haven" = callPackage
@@ -115976,8 +107875,6 @@ self: {
        ];
        description = "Implementation of the rules of Love Letter";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hawitter" = callPackage
@@ -115999,8 +107896,6 @@ self: {
        ];
        description = "A twitter client for GTK+. Beta version.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hax" = callPackage
@@ -116026,8 +107921,6 @@ self: {
        ];
        description = "Haskell cash-flow and tax simulation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haxl" = callPackage
@@ -116070,8 +107963,6 @@ self: {
        ];
        description = "Haxl data source for accessing AWS services through amazonka";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haxl-facebook" = callPackage
@@ -116094,8 +107985,6 @@ self: {
        ];
        description = "An example Haxl data source for accessing the Facebook Graph API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haxparse" = callPackage
@@ -116120,8 +108009,6 @@ self: {
        ];
        description = "Readable HaxBall replays";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haxr" = callPackage
@@ -116142,8 +108029,6 @@ self: {
        ];
        description = "XML-RPC client and server library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haxr-th" = callPackage
@@ -116155,8 +108040,6 @@ self: {
        libraryHaskellDepends = [ base haxr template-haskell ];
        description = "Automatic deriving of XML-RPC structs for Haskell records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haxy" = callPackage
@@ -116173,8 +108056,6 @@ self: {
        ];
        description = "A simple HTTP proxy server library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hayland" = callPackage
@@ -116195,8 +108076,6 @@ self: {
        testHaskellDepends = [ base process xml ];
        description = "Haskell bindings for the C Wayland library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libGL; inherit (pkgs) wayland;};
 
   "hayoo-cli" = callPackage
@@ -116215,8 +108094,6 @@ self: {
        ];
        description = "Hayoo CLI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hback" = callPackage
@@ -116235,8 +108112,6 @@ self: {
        ];
        description = "N-back memory game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hbayes" = callPackage
@@ -116266,8 +108141,6 @@ self: {
        ];
        description = "Bayesian Networks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hbb" = callPackage
@@ -116284,8 +108157,6 @@ self: {
        ];
        description = "Haskell Busy Bee, a backend for text editors";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hbcd" = callPackage
@@ -116330,8 +108201,6 @@ self: {
        executableSystemDepends = [ SDL_mixer ];
        description = "A simple step sequencer GUI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) SDL_mixer;};
 
   "hbf" = callPackage
@@ -116368,8 +108237,6 @@ self: {
        ];
        description = "An optimizing Brainfuck compiler and evaluator";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hblas" = callPackage
@@ -116387,8 +108254,6 @@ self: {
        testHaskellDepends = [ base hspec primitive vector ];
        description = "Human friendly BLAS and Lapack bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) blas; inherit (pkgs) liblapack;};
 
   "hblock" = callPackage
@@ -116408,8 +108273,6 @@ self: {
        ];
        description = "A mutable vector that provides indexation on the datatype fields it stores";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hbro" = callPackage
@@ -116497,8 +108360,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Haskell Bottom Up Rewrite Generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hcad" = callPackage
@@ -116523,8 +108384,6 @@ self: {
        executableHaskellDepends = [ base bytestring language-c ];
        description = "A toy C compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hcg-minus" = callPackage
@@ -116537,8 +108396,6 @@ self: {
        libraryHaskellDepends = [ base colour random ];
        description = "haskell cg (minus)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hcg-minus-cairo" = callPackage
@@ -116554,8 +108411,6 @@ self: {
        ];
        description = "haskell cg (minus) (cairo rendering)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hcheat" = callPackage
@@ -116568,8 +108423,6 @@ self: {
        libraryHaskellDepends = [ base mps ];
        description = "A collection of code cheatsheet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hcheckers" = callPackage
@@ -116602,8 +108455,6 @@ self: {
        ];
        description = "Implementation of checkers (\"draughts\") board game - server application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hchesslib" = callPackage
@@ -116620,8 +108471,6 @@ self: {
        ];
        description = "Chess library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hcltest" = callPackage
@@ -116642,8 +108491,6 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "A testing library for command line applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hcoap" = callPackage
@@ -116666,8 +108513,6 @@ self: {
        ];
        description = "CoAP implementation for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hcobs" = callPackage
@@ -116702,8 +108547,6 @@ self: {
        doHaddock = false;
        description = "Haskell COM support library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hcoord" = callPackage
@@ -116721,8 +108564,6 @@ self: {
        testHaskellDepends = [ base data-default HUnit ieee754 mtl ];
        description = "Easily convert between latitude/longitude, UTM and OSGB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hcron" = callPackage
@@ -116739,8 +108580,6 @@ self: {
        ];
        description = "A simple job scheduler, which just runs some IO action at a given time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hcube" = callPackage
@@ -116761,8 +108600,6 @@ self: {
        ];
        description = "Virtual Rubik's cube of arbitrary size";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hcwiid" = callPackage
@@ -116806,8 +108643,6 @@ self: {
        ];
        description = "Library to handle the details of writing daemons for UNIX";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdbc-aeson" = callPackage
@@ -116824,8 +108659,6 @@ self: {
        ];
        description = "Deserialize from HDBC rows to FromJSON instances";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdbc-postgresql-hstore" = callPackage
@@ -116837,8 +108670,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base containers HDBC text ];
        description = "Manipulate data in PostgreSQL \"hstore\" columns";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdbc-tuple" = callPackage
@@ -116877,8 +108708,6 @@ self: {
        ];
        description = "Haskell Database Independent interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdbi-conduit" = callPackage
@@ -116899,8 +108728,6 @@ self: {
        ];
        description = "Conduit glue for HDBI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdbi-postgresql" = callPackage
@@ -116928,8 +108755,6 @@ self: {
        ];
        description = "PostgreSQL driver for hdbi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdbi-sqlite" = callPackage
@@ -116949,8 +108774,6 @@ self: {
        ];
        description = "SQlite driver for HDBI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdbi-tests" = callPackage
@@ -116970,8 +108793,6 @@ self: {
        ];
        description = "test suite for testing HDBI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdevtools" = callPackage
@@ -117008,8 +108829,6 @@ self: {
        ];
        description = "HDF: Uniform Rate Audio Signal Processing in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdf5-lite" = callPackage
@@ -117062,8 +108881,6 @@ self: {
        ];
        description = "Pattern-Expression-based differencing of arbitrary types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdigest" = callPackage
@@ -117078,8 +108895,6 @@ self: {
        ];
        description = "Server-side HTTP Digest (RFC2617) in the CGI monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdirect" = callPackage
@@ -117098,8 +108913,6 @@ self: {
        executableToolDepends = [ happy ];
        description = "An IDL compiler for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdis86" = callPackage
@@ -117111,8 +108924,6 @@ self: {
        libraryHaskellDepends = [ base bytestring containers QuickCheck ];
        description = "Interface to the udis86 disassembler for x86 and x86-64 / AMD64";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdiscount" = callPackage
@@ -117125,8 +108936,6 @@ self: {
        librarySystemDepends = [ markdown ];
        description = "Haskell bindings to the Discount markdown library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {markdown = null;};
 
   "hdm" = callPackage
@@ -117140,8 +108949,6 @@ self: {
        executableHaskellDepends = [ base directory process unix vty ];
        description = "a small display manager";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdo" = callPackage
@@ -117169,8 +108976,6 @@ self: {
        ];
        description = "A Digital Ocean client in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdocs" = callPackage
@@ -117221,8 +109026,6 @@ self: {
        ];
        description = "Haskell distributed parallel Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdph-closure" = callPackage
@@ -117238,8 +109041,6 @@ self: {
        ];
        description = "Explicit closures in Haskell distributed parallel Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hdr-histogram" = callPackage
@@ -117259,8 +109060,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq primitive ];
        description = "Haskell implementation of High Dynamic Range (HDR) Histograms";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "headed-megaparsec" = callPackage
@@ -117295,8 +109094,30 @@ self: {
        ];
        description = "Creates a header for a haskell source file";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+     }) {};
+
+  "headroom" = callPackage
+    ({ mkDerivation, aeson, base, doctest, either, file-embed, hspec
+     , lens, mustache, optparse-applicative, pcre-heavy, pcre-light, rio
+     , template-haskell, text, time, validation, yaml
+     }:
+     mkDerivation {
+       pname = "headroom";
+       version = "0.1.0.0";
+       sha256 = "10xfyd2gqsaaa0hqai1n8a98k6mwhn5mrqqibqs3cgsl4pw8rhdr";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base either file-embed lens mustache optparse-applicative
+         pcre-heavy pcre-light rio template-haskell text time validation
+         yaml
+       ];
+       executableHaskellDepends = [ base optparse-applicative rio ];
+       testHaskellDepends = [
+         aeson base doctest hspec optparse-applicative rio
+       ];
+       description = "License Header Manager";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "heap" = callPackage
@@ -117348,8 +109169,6 @@ self: {
        ];
        description = "An opinionated app prelude and framework in the UnliftIO style";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heart-core" = callPackage
@@ -117370,6 +109189,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "heart-core_0_3_2" = callPackage
+    ({ mkDerivation, aeson, aeson-casing, base, containers, deepseq
+     , exceptions, filepath, hashable, lens, list-t, mtl
+     , newtype-generics, text, unliftio, unliftio-core
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "heart-core";
+       version = "0.3.2";
+       sha256 = "0fwhv0k5yykc72bk67d6rr6946w245hlg6cwjfbbgzq32b1cw7s3";
+       libraryHaskellDepends = [
+         aeson aeson-casing base containers deepseq exceptions filepath
+         hashable lens list-t mtl newtype-generics text unliftio
+         unliftio-core unordered-containers
+       ];
+       description = "An opinionated library prelude in the UnliftIO style";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "heartbeat-streams" = callPackage
     ({ mkDerivation, async, base, io-streams, time }:
      mkDerivation {
@@ -117379,8 +109218,6 @@ self: {
        libraryHaskellDepends = [ async base io-streams time ];
        description = "Heartbeats for io-streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heatitup" = callPackage
@@ -117410,8 +109247,6 @@ self: {
        ];
        description = "Find and annotate ITDs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heatitup-complete" = callPackage
@@ -117421,8 +109256,8 @@ self: {
      }:
      mkDerivation {
        pname = "heatitup-complete";
-       version = "0.5.4.0";
-       sha256 = "0zxyxwvpj0mkz10y4rf793cpxmd0bmlz3d4p8c0icgainacs6dsg";
+       version = "0.5.5.0";
+       sha256 = "14izlkkhm1zgdni4j95f9nv919bgq766qhwhc2z8phr4aymvjsnx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117435,8 +109270,6 @@ self: {
        ];
        description = "Find and annotate ITDs with assembly or read pair joining";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heatshrink" = callPackage
@@ -117550,8 +109383,6 @@ self: {
        libraryHaskellDepends = [ base cereal crypto-api hF2 ];
        description = "Elliptic Curve Cryptography for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heckin" = callPackage
@@ -117583,8 +109414,6 @@ self: {
        executableHaskellDepends = [ base directory process split ];
        description = "Jekyll in Haskell (feat. LaTeX)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hedgehog" = callPackage
@@ -117627,8 +109456,6 @@ self: {
        ];
        testHaskellDepends = [ base either hedgehog ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hedgehog-checkers-lens" = callPackage
@@ -117640,8 +109467,6 @@ self: {
        libraryHaskellDepends = [ base hedgehog hedgehog-checkers lens ];
        testHaskellDepends = [ base hedgehog hedgehog-checkers lens ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hedgehog-classes" = callPackage
@@ -117662,22 +109487,9 @@ self: {
        ];
        description = "Hedgehog will eat your typeclass bugs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hedgehog-corpus" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "hedgehog-corpus";
-       version = "0.1.0";
-       sha256 = "1whrszkd03d9a86vqnp38sq8gs2hfdc39wxcf5c12w3767c9qmn3";
-       libraryHaskellDepends = [ base ];
-       description = "hedgehog-corpus";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hedgehog-corpus_0_2_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "hedgehog-corpus";
@@ -117686,7 +109498,20 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "hedgehog-corpus";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hedgehog-fakedata" = callPackage
+    ({ mkDerivation, base, containers, fakedata, hedgehog, random }:
+     mkDerivation {
+       pname = "hedgehog-fakedata";
+       version = "0.0.1.0";
+       sha256 = "0qpgdl0r90y1qwzi7iqjxfngpd3scqc7a5p283yknw85zh0bx2bz";
+       revision = "1";
+       editedCabalFile = "003zbj8wmmdq203wa9dn2hy77my4bq0mfpvvi2mk2423q51p0q99";
+       libraryHaskellDepends = [ base fakedata hedgehog random ];
+       testHaskellDepends = [ base containers fakedata hedgehog ];
+       description = "Use 'fakedata' with 'hedgehog'";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hedgehog-fn" = callPackage
@@ -117726,8 +109551,6 @@ self: {
        ];
        description = "JSON generators for Hedgehog";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hedgehog-generic" = callPackage
@@ -117739,8 +109562,6 @@ self: {
        libraryHaskellDepends = [ base hedgehog ];
        description = "GHC Generics automatically derived hedgehog generators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hedgehog-golden" = callPackage
@@ -117758,8 +109579,6 @@ self: {
        testHaskellDepends = [ base hedgehog ];
        description = "Golden testing capabilities for hedgehog using Aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hedgehog-quickcheck" = callPackage
@@ -117833,8 +109652,6 @@ self: {
        ];
        description = "Easy trivial configuration for Redis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hedis-envy" = callPackage
@@ -117897,8 +109714,6 @@ self: {
        ];
        description = "Caching mandatory data with Redis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hedis-simple" = callPackage
@@ -117910,8 +109725,6 @@ self: {
        libraryHaskellDepends = [ base bytestring either hedis mtl ];
        description = "A simplified API for hedis";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hedis-tags" = callPackage
@@ -117929,34 +109742,9 @@ self: {
        ];
        description = "Tags for hedis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hedn" = callPackage
-    ({ mkDerivation, base, containers, deepseq, deriving-compat
-     , hedgehog, megaparsec, parser-combinators, prettyprinter
-     , scientific, template-haskell, text, time, uuid-types, vector
-     }:
-     mkDerivation {
-       pname = "hedn";
-       version = "0.2.0.1";
-       sha256 = "16yi4x6g27zabgqwd4xckp5zibxq882919mmyyr95g56r7pm8v1j";
-       revision = "1";
-       editedCabalFile = "1wr3zv0bj1714y1ip40va34zysmypicd6qp0l50bg9wj2db0misz";
-       libraryHaskellDepends = [
-         base containers deepseq deriving-compat megaparsec
-         parser-combinators prettyprinter scientific template-haskell text
-         time uuid-types vector
-       ];
-       testHaskellDepends = [
-         base containers hedgehog megaparsec text time uuid-types vector
-       ];
-       description = "EDN parsing and encoding";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hedn_0_3_0_0" = callPackage
     ({ mkDerivation, base, containers, deepseq, deriving-compat
      , hedgehog, megaparsec, parser-combinators, prettyprinter
      , scientific, template-haskell, text, time, uuid-types, vector
@@ -117975,7 +109763,6 @@ self: {
        ];
        description = "EDN parsing and encoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedn-functor" = callPackage
@@ -118024,8 +109811,6 @@ self: {
        ];
        description = "An extensible build helper for haskell, in the vein of leiningen";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heist" = callPackage
@@ -118068,8 +109853,6 @@ self: {
        ];
        description = "An Haskell template system supporting both HTML5 and XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heist-aeson" = callPackage
@@ -118086,8 +109869,6 @@ self: {
        ];
        description = "Use JSON directly from Heist templates";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heist-async" = callPackage
@@ -118101,8 +109882,6 @@ self: {
        ];
        description = "Adding support for asynchronous updates (\"AJAX\") with heist";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "helf" = callPackage
@@ -118148,8 +109927,6 @@ self: {
        ];
        description = "New Relic® agent SDK wrapper for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {newrelic-collector-client = null; newrelic-common = null; 
          newrelic-transaction = null;};
 
@@ -118168,8 +109945,6 @@ self: {
        ];
        description = "New Relic® agent SDK wrapper for wai";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "helisp" = callPackage
@@ -118183,8 +109958,6 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec process ];
        description = "An incomplete Elisp compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "helium" = callPackage
@@ -118208,8 +109981,6 @@ self: {
        ];
        description = "The Helium Compiler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "helium-overture" = callPackage
@@ -118249,8 +110020,6 @@ self: {
        ];
        description = "Web development micro framework for haskell with typesafe URLs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hell" = callPackage
@@ -118275,8 +110044,6 @@ self: {
        executableHaskellDepends = [ base transformers utf8-string ];
        description = "A Haskell shell based on shell-conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hellage" = callPackage
@@ -118296,8 +110063,6 @@ self: {
        ];
        description = "Distributed hackage mirror";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hellnet" = callPackage
@@ -118322,8 +110087,6 @@ self: {
        ];
        description = "Simple, distributed, anonymous data sharing network";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hello" = callPackage
@@ -118375,8 +110138,6 @@ self: {
        ];
        description = "A Haskell client for the Help.com team's ESB.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hemkay" = callPackage
@@ -118394,8 +110155,6 @@ self: {
        ];
        description = "A module music mixer and player";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hemkay-core" = callPackage
@@ -118436,8 +110195,6 @@ self: {
        benchmarkHaskellDepends = [ base conduit criterion mtl ];
        description = "Haskell port of the Emokit EEG project";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hen" = callPackage
@@ -118458,8 +110215,6 @@ self: {
        ];
        description = "Haskell bindings to Xen hypervisor interface";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {xenctrl = null;};
 
   "henet" = callPackage
@@ -118474,8 +110229,6 @@ self: {
        ];
        description = "Bindings and high level interface for to ENet v1.3.9";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hepevt" = callPackage
@@ -118487,8 +110240,6 @@ self: {
        libraryHaskellDepends = [ bytestring haskell2010 lha ];
        description = "HEPEVT parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "her-lexer" = callPackage
@@ -118500,8 +110251,6 @@ self: {
        libraryHaskellDepends = [ base mtl split ];
        description = "A lexer for Haskell source code";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "her-lexer-parsec" = callPackage
@@ -118513,8 +110262,6 @@ self: {
        libraryHaskellDepends = [ base her-lexer parsec transformers ];
        description = "Parsec frontend to \"her-lexer\" for Haskell source code";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "herbalizer" = callPackage
@@ -118532,8 +110279,6 @@ self: {
        ];
        description = "HAML to ERB translator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "here" = callPackage
@@ -118576,8 +110321,6 @@ self: {
        testHaskellDepends = [ base bytestring doctest text ];
        description = "heredocument";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "herf-time" = callPackage
@@ -118619,8 +110362,6 @@ self: {
        ];
        description = "Haskell Equational Reasoning Model-to-Implementation Tunnel";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hermit-syb" = callPackage
@@ -118636,8 +110377,6 @@ self: {
        ];
        description = "HERMIT plugin for optimizing Scrap-Your-Boilerplate traversals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "herms" = callPackage
@@ -118658,8 +110397,6 @@ self: {
        ];
        description = "A command-line manager for delicious kitchen recipes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hero-club-five-tenets" = callPackage
@@ -118721,8 +110458,6 @@ self: {
        ];
        description = "A library for compiling and serving static web assets";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "herringbone-embed" = callPackage
@@ -118739,8 +110474,6 @@ self: {
        ];
        description = "Embed preprocessed web assets in your executable with Template Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "herringbone-wai" = callPackage
@@ -118757,8 +110490,6 @@ self: {
        ];
        description = "Wai adapter for the Herringbone web asset preprocessor";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hesh" = callPackage
@@ -118785,8 +110516,6 @@ self: {
        ];
        description = "the Haskell Extensible Shell: Haskell for Bash-style scripts";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hesql" = callPackage
@@ -118804,8 +110533,6 @@ self: {
        ];
        description = "Haskell's embedded SQL";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hetero-dict" = callPackage
@@ -118826,8 +110553,6 @@ self: {
        ];
        description = "Fast heterogeneous data structures";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hetero-map" = callPackage
@@ -118869,8 +110594,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Allows the use of tuples as literals for Heterogeneous collections";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heterolist" = callPackage
@@ -118888,8 +110611,6 @@ self: {
        ];
        description = "A heterogeneous list type";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hetris" = callPackage
@@ -118906,8 +110627,6 @@ self: {
        executableSystemDepends = [ ncurses ];
        description = "Text Tetris";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) ncurses;};
 
   "heukarya" = callPackage
@@ -118922,8 +110641,6 @@ self: {
        ];
        description = "A genetic programming based on tree structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hevm" = callPackage
@@ -118971,8 +110688,6 @@ self: {
        testSystemDepends = [ secp256k1 ];
        description = "Ethereum virtual machine evaluator";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) secp256k1;};
 
   "hevolisa" = callPackage
@@ -118989,8 +110704,6 @@ self: {
        ];
        description = "Genetic Mona Lisa problem in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hevolisa-dph" = callPackage
@@ -119009,8 +110722,6 @@ self: {
        ];
        description = "Genetic Mona Lisa problem in Haskell - using Data Parallel Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hex" = callPackage
@@ -119048,8 +110759,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Haskell scripting interface for HexChat";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hexdump" = callPackage
@@ -119073,8 +110782,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring filepath ];
        description = "Reading Exif data form a JPEG file with Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hexmino" = callPackage
@@ -119093,8 +110800,6 @@ self: {
        ];
        description = "A small game based on domino-like hexagonal tiles";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hexml" = callPackage
@@ -119127,8 +110832,6 @@ self: {
        ];
        description = "Lenses for the hexml package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hexpat" = callPackage
@@ -119163,8 +110866,6 @@ self: {
        ];
        description = "Chunked XML parsing using iteratees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hexpat-lens" = callPackage
@@ -119215,8 +110916,6 @@ self: {
        ];
        description = "Picklers for de/serialising Generic data types to and from XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hexpat-tagsoup" = callPackage
@@ -119242,8 +110941,6 @@ self: {
        ];
        description = "A framework for symbolic, homoiconic languages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hexpress" = callPackage
@@ -119261,8 +110958,6 @@ self: {
        ];
        description = "An express-like http framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hexquote" = callPackage
@@ -119278,8 +110973,6 @@ self: {
        ];
        description = "Hexadecimal ByteString literals, with placeholders that bind variables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hexstring" = callPackage
@@ -119313,8 +111006,6 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "a text classification library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heyefi" = callPackage
@@ -119346,8 +111037,6 @@ self: {
        ];
        description = "A server for Eye-Fi SD cards";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "heyting-algebras" = callPackage
@@ -119369,8 +111058,6 @@ self: {
        ];
        description = "Heyting and Boolean algebras";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hfann" = callPackage
@@ -119386,8 +111073,6 @@ self: {
        libraryPkgconfigDepends = [ fann ];
        description = "Haskell binding to the FANN library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {doublefann = null; fann = null;};
 
   "hfd" = callPackage
@@ -119406,8 +111091,6 @@ self: {
        ];
        description = "Flash debugger";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hfiar" = callPackage
@@ -119423,8 +111106,6 @@ self: {
        executableHaskellDepends = [ wx wxcore ];
        description = "Four in a Row in Haskell!!";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hflags" = callPackage
@@ -119465,8 +111146,6 @@ self: {
        ];
        description = "Haskell source code formatter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hfoil" = callPackage
@@ -119486,8 +111165,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Hess-Smith panel code for inviscid 2-d airfoil analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hformat" = callPackage
@@ -119515,8 +111192,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Field-of-view calculation for low-resolution 2D raster grids";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hfractal" = callPackage
@@ -119535,8 +111210,6 @@ self: {
        ];
        description = "OpenGL fractal renderer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hfsevents" = callPackage
@@ -119567,8 +111240,6 @@ self: {
        ];
        description = "A library for fusing a subset of Haskell programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hg-buildpackage" = callPackage
@@ -119587,8 +111258,6 @@ self: {
        ];
        description = "Tools to help manage Debian packages with Mercurial";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgal" = callPackage
@@ -119611,8 +111280,6 @@ self: {
        libraryHaskellDepends = [ array base haskell98 mtl ];
        description = "Haskell Genetic Algorithm Library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgdbmi" = callPackage
@@ -119631,8 +111298,6 @@ self: {
        ];
        description = "GDB Machine Interface: program-driven control of GDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgearman" = callPackage
@@ -119650,8 +111315,6 @@ self: {
        ];
        description = "A Gearman client for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgen" = callPackage
@@ -119667,8 +111330,6 @@ self: {
        ];
        description = "Random generation of modal and hybrid logic formulas";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgeometric" = callPackage
@@ -119680,8 +111341,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A geometric library with bindings to GPC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgeometry" = callPackage
@@ -119707,8 +111366,6 @@ self: {
        testHaskellDepends = [ base doctest doctest-discover QuickCheck ];
        description = "Geometric Algorithms, Data structures, and Data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgeometry-combinatorial" = callPackage
@@ -119739,8 +111396,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Data structures, and Data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgeometry-ipe" = callPackage
@@ -119773,8 +111428,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Reading and Writing ipe7 files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgeometry-svg" = callPackage
@@ -119795,8 +111448,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Writing geometric primitives from HGeometry as SVG Files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgeos" = callPackage
@@ -119811,8 +111462,6 @@ self: {
        testHaskellDepends = [ base MissingH ];
        description = "Simple Haskell bindings to GEOS C API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {geos_c = null;};
 
   "hgettext" = callPackage
@@ -119835,8 +111484,6 @@ self: {
        ];
        description = "Bindings to libintl.h (gettext, bindtextdomain)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgis" = callPackage
@@ -119860,8 +111507,6 @@ self: {
        doHaddock = false;
        description = "Library and for GIS with Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgithub" = callPackage
@@ -119882,8 +111527,6 @@ self: {
        executableHaskellDepends = [ base cmdargs directory ];
        description = "Haskell bindings to the GitHub API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgl-example" = callPackage
@@ -119915,8 +111558,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Haskell interface to GMP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgom" = callPackage
@@ -119935,8 +111576,6 @@ self: {
        ];
        description = "An haskell port of the java version of gom";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgopher" = callPackage
@@ -119948,8 +111587,6 @@ self: {
        libraryHaskellDepends = [ base bytestring network ];
        description = "Gopher server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgrep" = callPackage
@@ -119972,8 +111609,6 @@ self: {
        ];
        description = "Search Haskell source code from the command line";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgrev" = callPackage
@@ -119989,8 +111624,6 @@ self: {
        ];
        description = "Compile Mercurial (hg) version info into Haskell code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hgrib" = callPackage
@@ -120009,8 +111642,6 @@ self: {
        testHaskellDepends = [ base directory hspec ];
        description = "Unofficial bindings for GRIB API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {grib_api = null;};
 
   "hharp" = callPackage
@@ -120023,8 +111654,6 @@ self: {
        librarySystemDepends = [ harp ];
        description = "Binding to libharp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {harp = null;};
 
   "hhp" = callPackage
@@ -120128,8 +111757,6 @@ self: {
        executableHaskellDepends = [ base dbus process ];
        description = "Status line for i3bar";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hiccup" = callPackage
@@ -120149,8 +111776,6 @@ self: {
        ];
        description = "Relatively efficient Tcl interpreter with support for basic operations";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hichi" = callPackage
@@ -120164,8 +111789,6 @@ self: {
        executableHaskellDepends = [ array base bytestring mtl network ];
        description = "haskell robot for IChat protocol";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hid" = callPackage
@@ -120212,8 +111835,6 @@ self: {
        doHaddock = false;
        description = "Examples to accompany the book \"Haskell in Depth\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hidapi" = callPackage
@@ -120272,8 +111893,6 @@ self: {
        ];
        description = "Set up a GHC API session";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hie-core" = callPackage
@@ -120310,8 +111929,6 @@ self: {
        ];
        description = "The core of an IDE";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hieraclus" = callPackage
@@ -120323,8 +111940,6 @@ self: {
        libraryHaskellDepends = [ base containers HUnit mtl multiset ];
        description = "Automated clustering of arbitrary elements in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hierarchical-clustering" = callPackage
@@ -120338,8 +111953,6 @@ self: {
        testHaskellDepends = [ base hspec HUnit QuickCheck ];
        description = "Fast algorithms for single, average/UPGMA and complete linkage clustering";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hierarchical-clustering-diagrams" = callPackage
@@ -120359,8 +111972,6 @@ self: {
        ];
        description = "Draw diagrams of dendrograms made by hierarchical-clustering";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hierarchical-exceptions" = callPackage
@@ -120372,8 +111983,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Template Haskell functions to easily create exception hierarchies";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hierarchical-spectral-clustering" = callPackage
@@ -120404,8 +112013,6 @@ self: {
        ];
        description = "Hierarchical spectral clustering of a graph";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hierarchy" = callPackage
@@ -120428,8 +112035,6 @@ self: {
        ];
        description = "Predicated traversal of generated trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hiernotify" = callPackage
@@ -120445,8 +112050,6 @@ self: {
        ];
        description = "Notification library for a filesystem hierarchy";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hifi" = callPackage
@@ -120486,8 +112089,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Partial types as a type constructor";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "highWaterMark" = callPackage
@@ -120502,8 +112103,6 @@ self: {
        executableHaskellDepends = [ base ghc ];
        description = "Memory usage statistics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "higher-leveldb" = callPackage
@@ -120538,8 +112137,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Some higher order functions for Bool and []";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "highjson" = callPackage
@@ -120557,8 +112154,6 @@ self: {
        ];
        description = "Spec based JSON parsing/serialisation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "highjson-swagger" = callPackage
@@ -120577,8 +112172,6 @@ self: {
        ];
        description = "Derive swagger instances from highjson specs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "highjson-th" = callPackage
@@ -120599,8 +112192,6 @@ self: {
        ];
        description = "Template Haskell helpers for highjson specs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "highlight" = callPackage
@@ -120648,8 +112239,6 @@ self: {
        ];
        description = "Highlight package versions which differ from the latest version on Hackage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "highlighter" = callPackage
@@ -120767,8 +112356,6 @@ self: {
        ];
        description = "Simple gtk2hs image viewer. Point it at an image and fire away.";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "himpy" = callPackage
@@ -120790,8 +112377,6 @@ self: {
        ];
        description = "multithreaded snmp poller for riemann";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hindent" = callPackage
@@ -120842,8 +112427,6 @@ self: {
        testHaskellDepends = [ base containers hspec ];
        description = "Template for Hindley-Milner based languages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hinduce-associations-apriori" = callPackage
@@ -120870,8 +112453,6 @@ self: {
        libraryHaskellDepends = [ base hinduce-missingh layout ];
        description = "Interface and utilities for classifiers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hinduce-classifier-decisiontree" = callPackage
@@ -120889,8 +112470,6 @@ self: {
        ];
        description = "Decision Tree Classifiers for hInduce";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hinduce-examples" = callPackage
@@ -120910,8 +112489,6 @@ self: {
        ];
        description = "Example data for hInduce";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hinduce-missingh" = callPackage
@@ -121009,8 +112586,6 @@ self: {
        ];
        description = "Generate armet style query strings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hinstaller" = callPackage
@@ -121026,8 +112601,6 @@ self: {
        ];
        description = "Installer wrapper for Haskell applications";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hint" = callPackage
@@ -121064,8 +112637,6 @@ self: {
        ];
        description = "A server process that runs hint";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hinter" = callPackage
@@ -121076,6 +112647,8 @@ self: {
        pname = "hinter";
        version = "0.1.0.0";
        sha256 = "0r790y7j64y79rqg7ip4dk5a8pbpryisp008lcmswzc0si35jfgl";
+       revision = "2";
+       editedCabalFile = "0jzaaiwviyw5as3pzjrsl19mrw0qsm4w08pywvl64ld3x2ldfj2y";
        libraryHaskellDepends = [
          base directory exceptions filepath ghc ghc-boot ghc-paths mtl
          random unix
@@ -121085,8 +112658,6 @@ self: {
        ];
        description = "Runtime Haskell interpreter (GHC API wrapper)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hinterface" = callPackage
@@ -121112,8 +112683,6 @@ self: {
        ];
        description = "Haskell / Erlang interoperability library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hinvaders" = callPackage
@@ -121128,8 +112697,6 @@ self: {
        executableHaskellDepends = [ base haskell98 random ];
        description = "Space Invaders";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hinze-streams" = callPackage
@@ -121141,8 +112708,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 Stream ];
        description = "Streams and Unique Fixed Points";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hip" = callPackage
@@ -121191,8 +112756,6 @@ self: {
        ];
        description = "A library for building HipChat Bots";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hipchat-hs" = callPackage
@@ -121211,8 +112774,6 @@ self: {
        ];
        description = "Hipchat API bindings in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hipe" = callPackage
@@ -121228,8 +112789,6 @@ self: {
        ];
        description = "Support for reading and writing ipe7 files (http://ipe7.sourceforge.net)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hips" = callPackage
@@ -121263,8 +112822,6 @@ self: {
        ];
        description = "IRC client";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hirt" = callPackage
@@ -121285,8 +112842,6 @@ self: {
        ];
        description = "Calculates IRT 2PL and 3PL models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hissmetrics" = callPackage
@@ -121302,8 +112857,6 @@ self: {
        ];
        description = "Unofficial API bindings to KISSmetrics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hist-pl" = callPackage
@@ -121327,8 +112880,6 @@ self: {
        ];
        description = "Umbrella package for the historical dictionary of Polish";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hist-pl-dawg" = callPackage
@@ -121343,8 +112894,6 @@ self: {
        ];
        description = "A generic, DAWG-based dictionary";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hist-pl-fusion" = callPackage
@@ -121361,8 +112910,6 @@ self: {
        ];
        description = "Merging historical dictionary with PoliMorf";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hist-pl-lexicon" = callPackage
@@ -121379,8 +112926,6 @@ self: {
        ];
        description = "A binary representation of the historical dictionary of Polish";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hist-pl-lmf" = callPackage
@@ -121392,8 +112937,6 @@ self: {
        libraryHaskellDepends = [ base hist-pl-types polysoup text ];
        description = "LMF parsing for the historical dictionary of Polish";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hist-pl-transliter" = callPackage
@@ -121416,8 +112959,6 @@ self: {
        libraryHaskellDepends = [ base binary text text-binary ];
        description = "Types in the historical dictionary of Polish";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "histogram-fill" = callPackage
@@ -121471,8 +113012,6 @@ self: {
        ];
        description = "Extract the interesting bits from shell history";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hit" = callPackage
@@ -121506,8 +113045,6 @@ self: {
        ];
        description = "Use graph algorithms to access and manipulate Git repos";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hit-on" = callPackage
@@ -121529,8 +113066,6 @@ self: {
        testHaskellDepends = [ base github hspec text ];
        description = "Haskell Git Helper Tool";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hjcase" = callPackage
@@ -121547,8 +113082,6 @@ self: {
        ];
        description = "Jcase library for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hjpath" = callPackage
@@ -121578,8 +113111,6 @@ self: {
        ];
        description = "JavaScript Parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hjsmin" = callPackage
@@ -121625,8 +113156,6 @@ self: {
        libraryHaskellDepends = [ base containers hjson ];
        description = "library for querying from JSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hjsonpointer" = callPackage
@@ -121648,8 +113177,6 @@ self: {
        ];
        description = "JSON Pointer library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hjsonschema" = callPackage
@@ -121678,8 +113205,6 @@ self: {
        ];
        description = "JSON Schema library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hjugement" = callPackage
@@ -121729,8 +113254,6 @@ self: {
        ];
        description = "Majority Judgment and Helios-C command line tool";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hjugement-protocol" = callPackage
@@ -121812,8 +113335,8 @@ self: {
      }:
      mkDerivation {
        pname = "hkgr";
-       version = "0.2.4";
-       sha256 = "09mvprpywxxfx2x0fm895k27qhsrhk8n00a5lgc4vglrvr0hyfdq";
+       version = "0.2.4.1";
+       sha256 = "0r6w5n4y5h23ry8cxxl97ibrxn6jr0f2a7iginqbpyd5dzbn9qyn";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -121855,8 +113378,6 @@ self: {
        ];
        description = "A library to build valid LaTeX files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hlbfgsb" = callPackage
@@ -121875,8 +113396,6 @@ self: {
        ];
        description = "Haskell binding to L-BFGS-B version 3.0";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gfortran;};
 
   "hlcm" = callPackage
@@ -121898,8 +113417,6 @@ self: {
        ];
        description = "Fast algorithm for mining closed frequent itemsets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hleap" = callPackage
@@ -121991,8 +113508,6 @@ self: {
        ];
        description = "Web API server for the hledger accounting tool";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hledger-chart" = callPackage
@@ -122011,8 +113526,6 @@ self: {
        ];
        description = "A pie chart image generator for the hledger accounting tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hledger-diff" = callPackage
@@ -122049,8 +113562,6 @@ self: {
        ];
        description = "An hledger workflow focusing on automated statement import and classification";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hledger-iadd" = callPackage
@@ -122121,8 +113632,6 @@ self: {
        ];
        description = "computes the internal rate of return of an investment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hledger-lib" = callPackage
@@ -122222,8 +113731,6 @@ self: {
        ];
        description = "A curses-style console interface for the hledger accounting tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hledger-web" = callPackage
@@ -122269,8 +113776,6 @@ self: {
        testHaskellDepends = [ base hlint ];
        description = "Haskell binding to libBladeRF SDR library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libbladeRF;};
 
   "hlibcpuid" = callPackage
@@ -122298,8 +113803,6 @@ self: {
        librarySystemDepends = [ ev ];
        description = "FFI interface to libev";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {ev = null;};
 
   "hlibfam" = callPackage
@@ -122312,8 +113815,6 @@ self: {
        librarySystemDepends = [ fam ];
        description = "FFI interface to libFAM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) fam;};
 
   "hlibgit2" = callPackage
@@ -122348,22 +113849,22 @@ self: {
   "hlint" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs
      , containers, cpphs, data-default, directory, extra, file-embed
-     , filepath, filepattern, ghc-lib-parser, ghc-lib-parser-ex
-     , haskell-src-exts, haskell-src-exts-util, hscolour, process
-     , refact, text, transformers, uniplate, unordered-containers
-     , utf8-string, vector, yaml
+     , filepath, filepattern, ghc, ghc-boot, ghc-boot-th
+     , ghc-lib-parser-ex, haskell-src-exts, haskell-src-exts-util
+     , hscolour, process, refact, text, transformers, uniplate
+     , unordered-containers, utf8-string, vector, yaml
      }:
      mkDerivation {
        pname = "hlint";
-       version = "2.2.10";
-       sha256 = "1zna80g34zzxz0cazg0w3cqx2cmlvzd82ajyhypwp9anbc10l7h4";
+       version = "2.2.11";
+       sha256 = "1xyavrrxm1ihvga2j1k3h96wjpnjb30lk6mgiyrvx3rj7m7yq5bw";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-terminal base bytestring cmdargs containers cpphs
-         data-default directory extra file-embed filepath filepattern
-         ghc-lib-parser ghc-lib-parser-ex haskell-src-exts
+         data-default directory extra file-embed filepath filepattern ghc
+         ghc-boot ghc-boot-th ghc-lib-parser-ex haskell-src-exts
          haskell-src-exts-util hscolour process refact text transformers
          uniplate unordered-containers utf8-string vector yaml
        ];
@@ -122392,6 +113893,8 @@ self: {
        pname = "hlist";
        version = "0.0.0.0";
        sha256 = "128y1l4bjyrsvx188mx58x8a98j7jk931h0nv5bprpxjkc71c32k";
+       revision = "1";
+       editedCabalFile = "0lrapxdl62xnhfbjw9i60zlq0360rrxxg4zapqxhdc1igb6259mn";
        libraryHaskellDepends = [ base ];
        description = "Heterogeneous list";
        license = stdenv.lib.licenses.bsd3;
@@ -122412,8 +113915,6 @@ self: {
        ];
        description = "Client library for the Apache Livy REST API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hlogger" = callPackage
@@ -122425,8 +113926,6 @@ self: {
        libraryHaskellDepends = [ base old-locale time ];
        description = "Simple, concurrent, extendable and easy-to-use logging library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hlongurl" = callPackage
@@ -122445,8 +113944,6 @@ self: {
        ];
        description = "Library and utility interfacing to longurl.org";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hlrdb" = callPackage
@@ -122494,8 +113991,6 @@ self: {
        libraryHaskellDepends = [ base containers hcg-minus hps ];
        description = "Haskell Lindenmayer Systems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hlwm" = callPackage
@@ -122511,8 +114006,6 @@ self: {
        libraryHaskellDepends = [ base stm transformers unix X11 ];
        description = "Bindings to the herbstluftwm window manager";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hly" = callPackage
@@ -122527,8 +114020,6 @@ self: {
        ];
        description = "Haskell LilyPond";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmark" = callPackage
@@ -122547,8 +114038,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A tool and library for Markov chains based text generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmarkup" = callPackage
@@ -122562,8 +114051,6 @@ self: {
        ];
        description = "Simple wikitext-like markup format implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmatrix" = callPackage
@@ -122605,8 +114092,6 @@ self: {
        ];
        description = "hmatrix operations lifted for backprop";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmatrix-banded" = callPackage
@@ -122621,8 +114106,6 @@ self: {
        librarySystemDepends = [ liblapack ];
        description = "HMatrix interface to LAPACK functions for banded matrices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) liblapack;};
 
   "hmatrix-csv" = callPackage
@@ -122688,8 +114171,6 @@ self: {
        libraryHaskellDepends = [ base hmatrix mmap ];
        description = "Memory map Vector from disk into memory efficiently";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmatrix-morpheus" = callPackage
@@ -122710,8 +114191,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion hmatrix ];
        description = "Low-level machine learning auxiliary functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) blas; inherit (pkgs) liblapack;};
 
   "hmatrix-nipals" = callPackage
@@ -122725,8 +114204,6 @@ self: {
        libraryHaskellDepends = [ base hmatrix ];
        description = "NIPALS method for Principal Components Analysis on large data-sets";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmatrix-nlopt" = callPackage
@@ -122775,8 +114252,6 @@ self: {
        librarySystemDepends = [ mkl_core mkl_intel mkl_sequential ];
        description = "Sparse linear solver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {mkl_core = null; mkl_intel = null; mkl_sequential = null;};
 
   "hmatrix-special" = callPackage
@@ -122803,8 +114278,6 @@ self: {
        ];
        description = "hmatrix with vector and matrix sizes encoded in types";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmatrix-sundials" = callPackage
@@ -122832,8 +114305,6 @@ self: {
        ];
        description = "hmatrix interface to sundials";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {sundials_arkode = null; sundials_cvode = null;};
 
   "hmatrix-svdlibc" = callPackage
@@ -122849,8 +114320,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion hmatrix vector ];
        description = "SVDLIBC bindings for HMatrix";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmatrix-syntax" = callPackage
@@ -122866,8 +114335,6 @@ self: {
        ];
        description = "MATLAB-like syntax for hmatrix vectors and matrices";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmatrix-tests" = callPackage
@@ -122885,8 +114352,6 @@ self: {
        benchmarkHaskellDepends = [ base HUnit QuickCheck random ];
        description = "Tests for hmatrix";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmatrix-vector-sized" = callPackage
@@ -122895,8 +114360,8 @@ self: {
      }:
      mkDerivation {
        pname = "hmatrix-vector-sized";
-       version = "0.1.2.0";
-       sha256 = "0n9pylrxz0pkdlha1rqi2xabfjxpiya9kcyx6qlcqal1q57wh2bc";
+       version = "0.1.3.0";
+       sha256 = "15crzx0cmhmrv2y2gg53x6rzmvawzwgck82c6v6xf49lp02svmj8";
        libraryHaskellDepends = [ base hmatrix vector vector-sized ];
        testHaskellDepends = [
          base ghc-typelits-knownnat hedgehog hmatrix vector vector-sized
@@ -122918,8 +114383,6 @@ self: {
        ];
        description = "Haskell Meapsoft Parser";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmeap-utils" = callPackage
@@ -122939,8 +114402,6 @@ self: {
        ];
        description = "Haskell Meapsoft Parser Utilities";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmemdb" = callPackage
@@ -122969,8 +114430,6 @@ self: {
        executableHaskellDepends = [ base MissingH process ];
        description = "CLI fuzzy finder and launcher";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmep" = callPackage
@@ -122990,8 +114449,6 @@ self: {
        testHaskellDepends = [ base HUnit vector ];
        description = "HMEP Multi Expression Programming – a genetic programming variant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmidi" = callPackage
@@ -123022,8 +114479,6 @@ self: {
        ];
        description = "A make alternative based on Plan9's mk";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmm" = callPackage
@@ -123039,8 +114494,6 @@ self: {
        ];
        description = "A hidden markov model library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmm-hmatrix" = callPackage
@@ -123059,8 +114512,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Hidden Markov Models using HMatrix primitives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmm-lapack" = callPackage
@@ -123081,8 +114532,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Hidden Markov Models using LAPACK primitives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmp3" = callPackage
@@ -123103,8 +114552,6 @@ self: {
        executableSystemDepends = [ ncurses ];
        description = "An ncurses mp3 player written in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) ncurses;};
 
   "hmp3-ng" = callPackage
@@ -123177,8 +114624,6 @@ self: {
        ];
        description = "Haskell Music Theory Diagrams";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hmumps" = callPackage
@@ -123197,8 +114642,6 @@ self: {
        ];
        description = "Interpreter for the MUMPS langugae";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hnetcdf" = callPackage
@@ -123228,8 +114671,6 @@ self: {
        testSystemDepends = [ netcdf ];
        description = "Haskell NetCDF library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) netcdf;};
 
   "hnix" = callPackage
@@ -123429,8 +114870,6 @@ self: {
        ];
        description = "Log message normalisation tool producing structured JSON messages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ho-rewriting" = callPackage
@@ -123446,8 +114885,6 @@ self: {
        testHaskellDepends = [ base compdata patch-combinators ];
        description = "Generic rewrite rules with safe treatment of variables and binders";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoauth" = callPackage
@@ -123465,30 +114902,9 @@ self: {
        ];
        description = "A Haskell implementation of OAuth 1.0a protocol.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoauth2" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit
-     , http-types, microlens, text, unordered-containers, uri-bytestring
-     , uri-bytestring-aeson
-     }:
-     mkDerivation {
-       pname = "hoauth2";
-       version = "1.8.9";
-       sha256 = "03yggs3if14saxiz5m02p17crl7askh8qjky6h1jqpxric49alv7";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring exceptions http-conduit http-types microlens
-         text unordered-containers uri-bytestring uri-bytestring-aeson
-       ];
-       description = "Haskell OAuth2 authentication client";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hoauth2_1_11_0" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, exceptions
      , http-conduit, http-types, microlens, text, unordered-containers
      , uri-bytestring, uri-bytestring-aeson
@@ -123506,7 +114922,6 @@ self: {
        ];
        description = "Haskell OAuth2 authentication client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hob" = callPackage
@@ -123534,8 +114949,6 @@ self: {
        ];
        description = "A source code editor aiming for the convenience of use";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hobbes" = callPackage
@@ -123553,8 +114966,6 @@ self: {
        ];
        description = "A small file watcher for OSX";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hobbits" = callPackage
@@ -123571,8 +114982,6 @@ self: {
        ];
        description = "A library for canonically representing terms with binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hocilib" = callPackage
@@ -123592,8 +115001,6 @@ self: {
        testSystemDepends = [ ocilib ];
        description = "FFI binding to OCILIB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {ocilib = null;};
 
   "hocker" = callPackage
@@ -123635,31 +115042,29 @@ self: {
        ];
        description = "Interact with the docker registry and generate nix build instructions";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hodatime" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, criterion
-     , directory, filepath, mtl, random, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, time
+     , directory, exceptions, filepath, fingertree, mtl, parsec
+     , QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck, time, unix
      }:
      mkDerivation {
        pname = "hodatime";
-       version = "0.1.1.1";
-       sha256 = "021zj3g4phvqdvckr7kzxicrb4dm2fvna3hkf8n0kw3d07qyvq4v";
+       version = "0.2.1.1";
+       sha256 = "1172y9x52vkr5965iqfpgdl7s02dgywpa5b87mhm8nkcy8819fkv";
        libraryHaskellDepends = [
-         base binary bytestring containers directory filepath mtl
+         base binary bytestring containers directory exceptions filepath
+         fingertree mtl parsec unix
        ];
        testHaskellDepends = [
-         base bytestring tasty tasty-hunit tasty-quickcheck tasty-smallcheck
-         time
+         base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
+         tasty-smallcheck time
        ];
        benchmarkHaskellDepends = [ base criterion random ];
        description = "A fully featured date/time library based on Nodatime";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoe" = callPackage
@@ -123707,8 +115112,6 @@ self: {
        ];
        description = "Simple IRC logger bot";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hogg" = callPackage
@@ -123726,8 +115129,6 @@ self: {
        ];
        description = "Library and tools to manipulate the Ogg container format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoggl" = callPackage
@@ -123753,8 +115154,6 @@ self: {
        ];
        description = "Bindings to the Toggl.com REST API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hogre" = callPackage
@@ -123770,8 +115169,6 @@ self: {
        doHaddock = false;
        description = "Haskell binding to a subset of OGRE";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {OGRE = null; OgreMain = null; cgen-hs = null; grgen = null;};
 
   "hogre-examples" = callPackage
@@ -123787,8 +115184,6 @@ self: {
        executableSystemDepends = [ OgreMain ];
        description = "Examples for using Hogre";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {OgreMain = null;};
 
   "hois" = callPackage
@@ -123804,8 +115199,6 @@ self: {
        executableHaskellDepends = [ base X11 ];
        description = "OIS bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {OIS = null;};
 
   "hoist-error" = callPackage
@@ -123849,8 +115242,6 @@ self: {
        ];
        description = "Higher order logic";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hold-em" = callPackage
@@ -123862,8 +115253,6 @@ self: {
        libraryHaskellDepends = [ base random safe ];
        description = "An engine for Texas hold'em Poker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hole" = callPackage
@@ -123875,8 +115264,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Higher kinded type removal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "holey-format" = callPackage
@@ -123922,8 +115309,6 @@ self: {
        doCheck = false;
        description = "Start your Haskell project with cabal, git and tests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "homeomorphic" = callPackage
@@ -123935,8 +115320,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl QuickCheck ];
        description = "Homeomorphic Embedding Test";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hommage" = callPackage
@@ -123950,8 +115333,6 @@ self: {
        ];
        description = "Haskell Offline Music Manipulation And Generation EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hommage-ds" = callPackage
@@ -123978,8 +115359,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Constructs FAlgebras from typeclasses, making Haskell functions homoiconic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "homotuple" = callPackage
@@ -124021,8 +115400,6 @@ self: {
        ];
        description = "Haskell code quality tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "honi" = callPackage
@@ -124039,8 +115416,6 @@ self: {
        testSystemDepends = [ freenect OpenNI2 ];
        description = "OpenNI 2 binding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {OpenNI2 = null; inherit (pkgs) freenect;};
 
   "honk" = callPackage
@@ -124070,8 +115445,6 @@ self: {
        ];
        description = "Simple tool for fetching and merging hoogle data";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hood" = callPackage
@@ -124084,8 +115457,6 @@ self: {
        testHaskellDepends = [ base ghc-prim ];
        description = "Debugging by observing in place";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hood-off" = callPackage
@@ -124097,8 +115468,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Dummy package to disable Hood without having to remove all the calls to observe";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hood2" = callPackage
@@ -124110,8 +115479,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Debugging by observing in place";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoodie" = callPackage
@@ -124129,8 +115496,6 @@ self: {
        ];
        description = "A small, toy roguelike";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoodle" = callPackage
@@ -124151,8 +115516,6 @@ self: {
        executableHaskellDepends = [ base cmdargs hoodle-core ];
        description = "Executable for hoodle";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoodle-builder" = callPackage
@@ -124169,8 +115532,6 @@ self: {
        ];
        description = "text builder for hoodle file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoodle-core" = callPackage
@@ -124203,8 +115564,6 @@ self: {
        librarySystemDepends = [ libX11 libXi ];
        description = "Core library for hoodle";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXi;};
 
   "hoodle-extra" = callPackage
@@ -124230,8 +115589,6 @@ self: {
        ];
        description = "extra hoodle tools";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoodle-parser" = callPackage
@@ -124249,8 +115606,6 @@ self: {
        ];
        description = "Hoodle file parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoodle-publish" = callPackage
@@ -124277,8 +115632,6 @@ self: {
        ];
        description = "publish hoodle files as a static web site";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoodle-render" = callPackage
@@ -124299,8 +115652,6 @@ self: {
        ];
        description = "Hoodle file renderer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoodle-types" = callPackage
@@ -124317,8 +115668,6 @@ self: {
        ];
        description = "Data types for programs for hoodle file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoogle_5_0_14" = callPackage
@@ -124367,8 +115716,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoogle";
-       version = "5.0.17.14";
-       sha256 = "094h9dqlnjhpdv166g6zx7sy7rr53iv3svicjzi5pxfdbl2an67x";
+       version = "5.0.17.15";
+       sha256 = "0yl2izlxb863a3vxj4dhqn65qnwmmja799bgm004kcmk646r24jx";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -124404,8 +115753,6 @@ self: {
        ];
        description = "Easily generate Hoogle indices for installed packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hooks-dir" = callPackage
@@ -124417,8 +115764,6 @@ self: {
        libraryHaskellDepends = [ base directory process text ];
        description = "run executables in a directory as hooks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hookup" = callPackage
@@ -124453,8 +115798,6 @@ self: {
        ];
        description = "A library to support dataflow analysis and optimization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoovie" = callPackage
@@ -124478,8 +115821,6 @@ self: {
        ];
        description = "Haskell Media Server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hopencc" = callPackage
@@ -124496,8 +115837,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Haskell binding to libopencc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) opencc;};
 
   "hopencl" = callPackage
@@ -124517,45 +115856,9 @@ self: {
        ];
        description = "Haskell bindings for OpenCL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {OpenCL = null;};
 
   "hopenpgp-tools" = callPackage
-    ({ mkDerivation, aeson, alex, array, attoparsec, base
-     , base16-bytestring, binary, binary-conduit, bytestring, conduit
-     , conduit-extra, containers, crypto-pubkey, cryptohash, directory
-     , errors, fgl, graphviz, happy, hOpenPGP, http-client
-     , http-client-tls, http-types, ixset-typed, lens, monad-loops
-     , openpgp-asciiarmor, optparse-applicative, prettyprinter
-     , prettyprinter-ansi-terminal, prettyprinter-convert-ansi-wl-pprint
-     , resourcet, text, time, time-locale-compat, transformers
-     , unordered-containers, yaml
-     }:
-     mkDerivation {
-       pname = "hopenpgp-tools";
-       version = "0.21.3";
-       sha256 = "18y6qxb53v9dbjz4mhxvzc0b8jyk909w140y22hxcbwn41vqh48l";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson array attoparsec base base16-bytestring binary binary-conduit
-         bytestring conduit conduit-extra containers crypto-pubkey
-         cryptohash directory errors fgl graphviz hOpenPGP http-client
-         http-client-tls http-types ixset-typed lens monad-loops
-         openpgp-asciiarmor optparse-applicative prettyprinter
-         prettyprinter-ansi-terminal prettyprinter-convert-ansi-wl-pprint
-         resourcet text time time-locale-compat transformers
-         unordered-containers yaml
-       ];
-       executableToolDepends = [ alex happy ];
-       description = "hOpenPGP-based command-line tools";
-       license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "hopenpgp-tools_0_23" = callPackage
     ({ mkDerivation, aeson, alex, array, attoparsec, base
      , base16-bytestring, binary, binary-conduit, bytestring, conduit
      , conduit-extra, containers, crypto-pubkey, cryptohash, cryptonite
@@ -124585,8 +115888,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "hOpenPGP-based command-line tools";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hopenssl" = callPackage
@@ -124634,8 +115935,6 @@ self: {
        ];
        description = "Hopfield Networks, Boltzmann Machines and Clusters";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {MagickCore = null; inherit (pkgs) imagemagick;};
 
   "hopfield-networks" = callPackage
@@ -124686,8 +115985,6 @@ self: {
        ];
        description = "C++ FFI generator - Documentation";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoppy-generator" = callPackage
@@ -124704,8 +116001,6 @@ self: {
        ];
        description = "C++ FFI generator - Code generator";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoppy-runtime" = callPackage
@@ -124719,8 +116014,6 @@ self: {
        ];
        description = "C++ FFI generator - Runtime support";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoppy-std" = callPackage
@@ -124735,8 +116028,6 @@ self: {
        ];
        description = "C++ FFI generator - Standard library bindings";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hops" = callPackage
@@ -124769,8 +116060,6 @@ self: {
        ];
        description = "Handy Operations on Power Series";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hoq" = callPackage
@@ -124790,8 +116079,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "A language based on homotopy type theory with an interval type";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hora" = callPackage
@@ -124820,8 +116107,6 @@ self: {
        libraryHaskellDepends = [ AC-Angle base time ];
        description = "Sunrise and sunset UTC approximations from latitude and longitude coordinates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "horname" = callPackage
@@ -124840,8 +116125,6 @@ self: {
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "Rename function definitions returned by SMT solvers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hosc" = callPackage
@@ -124877,8 +116160,6 @@ self: {
        ];
        description = "Haskell Open Sound Control JSON Serialisation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hosc-utils" = callPackage
@@ -124903,6 +116184,24 @@ self: {
        broken = true;
      }) {www-minus = null;};
 
+  "hostaddress" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, case-insensitive
+     , deepseq, exceptions, hashable, iproute, microlens-th, text
+     }:
+     mkDerivation {
+       pname = "hostaddress";
+       version = "0.1.0.0";
+       sha256 = "0g2bh1iz7cc8l035z4l1937v4sw1s1j383fg87acdgzgswzvl666";
+       revision = "1";
+       editedCabalFile = "1mx35sn61p12qv0c6f7bjdm13m5983yi7qcm76cy8xybgx1cyl8k";
+       libraryHaskellDepends = [
+         attoparsec base bytestring case-insensitive deepseq exceptions
+         hashable iproute microlens-th text
+       ];
+       description = "Network Host Addresses";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hostname" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -124940,8 +116239,6 @@ self: {
        ];
        description = "An dns server which is extremely easy to config";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hothasktags" = callPackage
@@ -124960,8 +116257,6 @@ self: {
        ];
        description = "Generates ctags for Haskell, incorporating import lists and qualified imports";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hotswap" = callPackage
@@ -124973,8 +116268,6 @@ self: {
        libraryHaskellDepends = [ base plugins ];
        description = "Simple code hotswapping";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hourglass" = callPackage
@@ -125005,8 +116298,6 @@ self: {
        libraryHaskellDepends = [ base hourglass parsec ];
        description = "A small library for parsing more human friendly date/time formats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hourglass-orphans" = callPackage
@@ -125052,8 +116343,6 @@ self: {
        ];
        description = "A Haskell implementation of Foreman";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hp2any-core" = callPackage
@@ -125070,8 +116359,6 @@ self: {
        ];
        description = "Heap profiling helper library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hp2any-graph" = callPackage
@@ -125093,8 +116380,6 @@ self: {
        executableSystemDepends = [ freeglut libGL libGLU ];
        description = "Real-time heap graphing utility and profile stream server with a reusable graphing module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) freeglut; inherit (pkgs) libGL; 
          inherit (pkgs) libGLU;};
 
@@ -125116,8 +116401,6 @@ self: {
        ];
        description = "A utility to visualise and compare heap profiles";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hp2html" = callPackage
@@ -125153,44 +116436,6 @@ self: {
      }) {};
 
   "hpack" = callPackage
-    ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
-     , containers, cryptonite, deepseq, directory, filepath, Glob, hspec
-     , hspec-discover, http-client, http-client-tls, http-types, HUnit
-     , infer-license, interpolate, mockery, pretty, QuickCheck
-     , scientific, template-haskell, temporary, text, transformers
-     , unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "hpack";
-       version = "0.31.2";
-       sha256 = "1l2d6185lawwhsj70swxkvcacm0hvcn9qsrlx4ph4gs6k578603g";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bifunctors bytestring Cabal containers cryptonite
-         deepseq directory filepath Glob http-client http-client-tls
-         http-types infer-license pretty scientific text transformers
-         unordered-containers vector yaml
-       ];
-       executableHaskellDepends = [
-         aeson base bifunctors bytestring Cabal containers cryptonite
-         deepseq directory filepath Glob http-client http-client-tls
-         http-types infer-license pretty scientific text transformers
-         unordered-containers vector yaml
-       ];
-       testHaskellDepends = [
-         aeson base bifunctors bytestring Cabal containers cryptonite
-         deepseq directory filepath Glob hspec http-client http-client-tls
-         http-types HUnit infer-license interpolate mockery pretty
-         QuickCheck scientific template-haskell temporary text transformers
-         unordered-containers vector yaml
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "A modern format for Haskell packages";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hpack_0_33_0" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
      , containers, cryptonite, deepseq, directory, filepath, Glob, hspec
      , hspec-discover, http-client, http-client-tls, http-types, HUnit
@@ -125226,7 +116471,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A modern format for Haskell packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpack-convert" = callPackage
@@ -125258,8 +116502,6 @@ self: {
        ];
        description = "Convert Cabal manifests into hpack's package.yamls";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpack-dhall" = callPackage
@@ -125290,8 +116532,6 @@ self: {
        ];
        description = "hpack's dhalling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpaco" = callPackage
@@ -125309,8 +116549,6 @@ self: {
        ];
        description = "Modular template compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpaco-lib" = callPackage
@@ -125328,8 +116566,6 @@ self: {
        ];
        description = "Modular template compiler library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpage" = callPackage
@@ -125351,8 +116587,6 @@ self: {
        ];
        description = "A scrapbook for Haskell developers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpapi" = callPackage
@@ -125365,8 +116599,6 @@ self: {
        librarySystemDepends = [ papi ];
        description = "Binding for the PAPI library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) papi;};
 
   "hpaste" = callPackage
@@ -125394,8 +116626,6 @@ self: {
        ];
        description = "Haskell paste web site";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpasteit" = callPackage
@@ -125415,8 +116645,6 @@ self: {
        ];
        description = "A command-line client for hpaste.org";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpath" = callPackage
@@ -125443,8 +116671,10 @@ self: {
      }:
      mkDerivation {
        pname = "hpath-directory";
-       version = "0.13.1";
-       sha256 = "0vb60w275zljkscj0gi84c82xzyvvqixlw79jw4bcasxcygb70cf";
+       version = "0.13.2";
+       sha256 = "1nxn1wz63h4wgspwnd1y4krf5k6adjbp1c3y0wr5kjhcnj4z20kl";
+       revision = "1";
+       editedCabalFile = "1zhrq3qcp4cx0djpx5bcw2f71kn16czqnb38k3cw78048q6mn7fg";
        libraryHaskellDepends = [
          base bytestring exceptions hpath-filepath hpath-posix IfElse
          safe-exceptions streamly streamly-bytestring time unix
@@ -125484,23 +116714,15 @@ self: {
        ];
        description = "High-level IO operations on files/directories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpath-posix" = callPackage
-    ({ mkDerivation, base, bytestring, exceptions, hpath-filepath
-     , IfElse, safe-exceptions, streamly, streamly-bytestring, time
-     , unix, unix-bytestring, utf8-string
-     }:
+    ({ mkDerivation, base, bytestring, hpath-filepath, unix }:
      mkDerivation {
        pname = "hpath-posix";
-       version = "0.13.0";
-       sha256 = "1008rwl379wfnynbbi7jym46hl3zalz3bla0zc0wndzid42sf4wl";
-       libraryHaskellDepends = [
-         base bytestring exceptions hpath-filepath IfElse safe-exceptions
-         streamly streamly-bytestring time unix unix-bytestring utf8-string
-       ];
+       version = "0.13.1";
+       sha256 = "0axpzi2vl8cs3y5xsp1pa1fsgq13ry77rw8h8z5aivrzfvrj26d0";
+       libraryHaskellDepends = [ base bytestring hpath-filepath unix ];
        description = "Some low-level POSIX glue code, that is not in 'unix'";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -125567,6 +116789,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hpc-lcov" = callPackage
+    ({ mkDerivation, aeson, base, containers, hpc, optparse-applicative
+     , path, path-io, process, tasty, tasty-discover, tasty-golden
+     , tasty-hunit, text, unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "hpc-lcov";
+       version = "1.0.0";
+       sha256 = "0j2v2dpqj8xrs7z8mn1f71pin1m2arynp8nmai9cd1bqxyrv56a6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers hpc ];
+       executableHaskellDepends = [
+         aeson base containers hpc optparse-applicative path path-io process
+         text unordered-containers yaml
+       ];
+       testHaskellDepends = [
+         base containers hpc tasty tasty-discover tasty-golden tasty-hunit
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "Convert HPC output into LCOV format";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hpc-strobe" = callPackage
     ({ mkDerivation, base, filepath, hpc }:
      mkDerivation {
@@ -125611,8 +116857,6 @@ self: {
        ];
        description = "Tracer with AJAX interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpdft" = callPackage
@@ -125633,8 +116877,6 @@ self: {
        executableHaskellDepends = [ base bytestring utf8-string ];
        description = "A tool for looking through PDF file using Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpg" = callPackage
@@ -125648,8 +116890,6 @@ self: {
        executableHaskellDepends = [ base random ];
        description = "a simple password generator";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpio" = callPackage
@@ -125679,8 +116919,6 @@ self: {
        ];
        description = "Monads for GPIO in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hplayground" = callPackage
@@ -125712,8 +116950,6 @@ self: {
        executableHaskellDepends = [ base directory filepath process ];
        description = "Application for managing playlist files on a music player";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpodder" = callPackage
@@ -125733,8 +116969,6 @@ self: {
        ];
        description = "Podcast Aggregator (downloader)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpp" = callPackage
@@ -125784,8 +117018,6 @@ self: {
        ];
        description = "Haskell bindings to libpqtypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) postgresql;};
 
   "hpqtypes-extras" = callPackage
@@ -125809,8 +117041,6 @@ self: {
        ];
        description = "Extra utilities for hpqtypes library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hprotoc" = callPackage
@@ -125838,8 +117068,6 @@ self: {
        executableToolDepends = [ alex ];
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hprotoc-fork" = callPackage
@@ -125868,8 +117096,6 @@ self: {
        executableToolDepends = [ alex ];
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hprox" = callPackage
@@ -125892,8 +117118,6 @@ self: {
        ];
        description = "a lightweight HTTP proxy server, and more";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hps" = callPackage
@@ -125906,8 +117130,6 @@ self: {
        libraryHaskellDepends = [ base filepath hcg-minus process ];
        description = "Haskell Postscript";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hps-cairo" = callPackage
@@ -125923,8 +117145,6 @@ self: {
        executableHaskellDepends = [ base cairo gtk hps random ];
        description = "Cairo rendering for the haskell postscript library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hps-kmeans" = callPackage
@@ -125936,8 +117156,6 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "A nice implementation of the k-Means algorithm";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpuz" = callPackage
@@ -125966,8 +117184,6 @@ self: {
        ];
        description = "Highlight source code using Pygments";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpylos" = callPackage
@@ -125983,8 +117199,6 @@ self: {
        ];
        description = "AI of Pylos game with GLUT interface";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpyrg" = callPackage
@@ -126000,8 +117214,6 @@ self: {
        ];
        description = "pyrg utility done right";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hpython" = callPackage
@@ -126031,8 +117243,6 @@ self: {
        ];
        description = "Python language tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hquantlib" = callPackage
@@ -126062,8 +117272,6 @@ self: {
        ];
        description = "HQuantLib is a port of essencial parts of QuantLib to Haskell";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hquantlib-time" = callPackage
@@ -126105,8 +117313,6 @@ self: {
        executableHaskellDepends = [ base HCL NonEmpty ];
        description = "Basic utility for ranking a list of items";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hreader" = callPackage
@@ -126169,8 +117375,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A Type dependent Highlevel HTTP client library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hreq-conduit" = callPackage
@@ -126195,8 +117399,6 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Conduit streaming support for Hreq";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hreq-core" = callPackage
@@ -126217,8 +117419,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Core functionality for Hreq Http client library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hrfsize" = callPackage
@@ -126244,8 +117444,6 @@ self: {
        executableHaskellDepends = [ base containers ];
        description = "A Cricket scoring application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hriemann" = callPackage
@@ -126271,8 +117469,6 @@ self: {
        ];
        description = "A Riemann Client for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hruby" = callPackage
@@ -126310,17 +117506,6 @@ self: {
      }) {GeoIP = null;};
 
   "hs-bibutils" = callPackage
-    ({ mkDerivation, base, syb }:
-     mkDerivation {
-       pname = "hs-bibutils";
-       version = "6.7.0.0";
-       sha256 = "1qfyssl76lm4g09yxr3y10kmf8cnzls46g5h0ijk0wpk9wlhbln5";
-       libraryHaskellDepends = [ base syb ];
-       description = "Haskell bindings to bibutils, the bibliography conversion utilities";
-       license = "GPL";
-     }) {};
-
-  "hs-bibutils_6_8_0_0" = callPackage
     ({ mkDerivation, base, syb }:
      mkDerivation {
        pname = "hs-bibutils";
@@ -126329,7 +117514,6 @@ self: {
        libraryHaskellDepends = [ base syb ];
        description = "Haskell bindings to bibutils, the bibliography conversion utilities";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-blake2" = callPackage
@@ -126351,8 +117535,6 @@ self: {
        benchmarkSystemDepends = [ libb2 ];
        description = "A cryptohash-inspired library for blake2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libb2;};
 
   "hs-brotli" = callPackage
@@ -126373,8 +117555,6 @@ self: {
        ];
        description = "Compression and decompression in the brotli format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {brotlidec = null; brotlienc = null; libbrotlidec = null; 
          libbrotlienc = null;};
 
@@ -126416,8 +117596,6 @@ self: {
        ];
        description = "Example Monte Carlo simulations implemented with Carbon";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-cdb" = callPackage
@@ -126433,8 +117611,6 @@ self: {
        ];
        description = "A library for reading CDB (Constant Database) files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-conllu" = callPackage
@@ -126455,8 +117631,6 @@ self: {
        ];
        description = "Conllu validating parser and utils";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-di" = callPackage
@@ -126486,8 +117660,6 @@ self: {
        ];
        description = "Dependency Injection library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-dotnet" = callPackage
@@ -126500,8 +117672,6 @@ self: {
        librarySystemDepends = [ ole32 oleaut32 ];
        description = "Pragmatic .NET interop for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {ole32 = null; oleaut32 = null;};
 
   "hs-duktape" = callPackage
@@ -126539,8 +117709,6 @@ self: {
        ];
        description = "HS-Excelx provides basic read-only access to Excel 2007 and 2010 documents in XLSX format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-ffmpeg" = callPackage
@@ -126552,8 +117720,6 @@ self: {
        libraryHaskellDepends = [ base bytestring haskell98 ];
        description = "Bindings to FFMPEG library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-fltk" = callPackage
@@ -126567,8 +117733,6 @@ self: {
        librarySystemDepends = [ fltk fltk_images ];
        description = "Binding to GUI library FLTK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) fltk; fltk_images = null;};
 
   "hs-functors" = callPackage
@@ -126577,6 +117741,8 @@ self: {
        pname = "hs-functors";
        version = "0.1.6.0";
        sha256 = "197vyl98ddvc55dxwwjd46sdjvh1a9s5qcx2m16smn9gwmx9gq0l";
+       revision = "1";
+       editedCabalFile = "1z4p93nibk1r0cyff4bfpb1rfklq43p75k35fyrk5kcvfa0ds296";
        libraryHaskellDepends = [ base tagged transformers ];
        description = "Functors from products of Haskell and its dual to Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -126592,8 +117758,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Haskell wrapper for the Google Chart API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-gen-iface" = callPackage
@@ -126612,8 +117776,6 @@ self: {
        ];
        description = "Utility to generate haskell-names interface files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-gizapp" = callPackage
@@ -126629,8 +117791,6 @@ self: {
        ];
        description = "Haskell wrapper around the GIZA++ toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-inspector" = callPackage
@@ -126679,8 +117839,6 @@ self: {
        ];
        description = "Java .class files assembler/disassembler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-json-rpc" = callPackage
@@ -126694,8 +117852,6 @@ self: {
        ];
        description = "JSON-RPC client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-logo" = callPackage
@@ -126722,8 +117878,6 @@ self: {
        ];
        description = "Logo interpreter written in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-mesos" = callPackage
@@ -126748,8 +117902,6 @@ self: {
          tasty-quickcheck
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) mesos; inherit (pkgs) protobuf;};
 
   "hs-multiaddr" = callPackage
@@ -126783,8 +117935,31 @@ self: {
        executableHaskellDepends = [ base HandsomeSoup hxt random ];
        description = "Name generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+     }) {};
+
+  "hs-pattrans" = callPackage
+    ({ mkDerivation, async, base, bytestring, cassava, Chart
+     , Chart-cairo, colour, containers, contravariant, directory
+     , Euterpea, HCodecs, hspec, hspec-discover, optparse-applicative
+     , parallel, parsec, QuickCheck
+     }:
+     mkDerivation {
+       pname = "hs-pattrans";
+       version = "0.1.0.2";
+       sha256 = "0w1z0f1awh8xk3qyri79mlk44isss2s0j5qxhbrd52nvl8bjdzi1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring cassava Chart Chart-cairo colour containers
+         contravariant directory Euterpea HCodecs parallel parsec
+       ];
+       executableHaskellDepends = [
+         base bytestring optparse-applicative
+       ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       testToolDepends = [ hspec-discover ];
+       description = "DSL for musical patterns and transformation, based on contravariant functors";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hs-pgms" = callPackage
@@ -126804,8 +117979,6 @@ self: {
        ];
        description = "Programmer's Mine Sweeper in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-php-session" = callPackage
@@ -126830,8 +118003,6 @@ self: {
        libraryHaskellDepends = [ base data-default-class text ];
        description = "Create pkg-config configuration files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-pkpass" = callPackage
@@ -126852,8 +118023,6 @@ self: {
        ];
        description = "A library for Passbook pass creation & signing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-popen" = callPackage
@@ -126890,8 +118059,6 @@ self: {
        libraryHaskellDepends = [ array base regex-base regex-posix ];
        description = "Easy to use Regex";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-rqlite" = callPackage
@@ -126928,8 +118095,6 @@ self: {
        testHaskellDepends = [ base protolude ];
        description = "Experimental! Wraps this awesome rust library so you can use it in haskell. https://docs.rs/crate/notify";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {notifier = null;};
 
   "hs-scrape" = callPackage
@@ -126950,8 +118115,6 @@ self: {
        ];
        description = "Simple and easy web scraping and automation in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-server-starter" = callPackage
@@ -126983,8 +118146,6 @@ self: {
        ];
        description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-speedscope" = callPackage
@@ -127018,8 +118179,6 @@ self: {
        ];
        description = "Haskell binding to the Twitter API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-twitterarchiver" = callPackage
@@ -127034,8 +118193,6 @@ self: {
        executableHaskellDepends = [ base HTTP json mtl network pretty ];
        description = "Commandline Twitter feed archiver";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-vcard" = callPackage
@@ -127047,8 +118204,6 @@ self: {
        libraryHaskellDepends = [ base old-locale time ];
        description = "Implements the RFC 2426 vCard 3.0 spec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-watchman" = callPackage
@@ -127068,8 +118223,6 @@ self: {
        ];
        description = "Client library for Facebook's Watchman tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-zstd" = callPackage
@@ -127138,8 +118291,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Create ATS types from Haskell types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs2bf" = callPackage
@@ -127158,8 +118309,6 @@ self: {
        ];
        description = "Haskell to Brainfuck compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs2dot" = callPackage
@@ -127180,6 +118329,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hs2ps" = callPackage
+    ({ mkDerivation, base, hspec, template-haskell }:
+     mkDerivation {
+       pname = "hs2ps";
+       version = "0.1.4.0";
+       sha256 = "1syfvhydxjnmdq9q0yxmn2m4whya91iviv6fyvggilyn80a8g82j";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base hspec template-haskell ];
+       description = "Translate Haskell types to PureScript";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hsConfigure" = callPackage
     ({ mkDerivation, base, directory, filepath, process, unix }:
      mkDerivation {
@@ -127202,8 +118363,6 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "I2C access for Haskell and Linux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsPID" = callPackage
@@ -127232,8 +118391,6 @@ self: {
        ];
        description = "Sqlite3 bindings";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsXenCtrl" = callPackage
@@ -127246,8 +118403,6 @@ self: {
        librarySystemDepends = [ xenctrl ];
        description = "FFI bindings to the Xen Control library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {xenctrl = null;};
 
   "hsakamai" = callPackage
@@ -127307,8 +118462,6 @@ self: {
        ];
        description = "OASIS Security Assertion Markup Language (SAML) V2.0";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libxml2;};
 
   "hsass" = callPackage
@@ -127345,8 +118498,6 @@ self: {
        executableHaskellDepends = [ base Hclip HTTP process unix ];
        description = "(ab)Use Google Translate as a speech synthesiser";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsb2hs" = callPackage
@@ -127382,8 +118533,6 @@ self: {
        ];
        description = "simple utility for rolling filesystem backups";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsbc" = callPackage
@@ -127397,8 +118546,6 @@ self: {
        executableHaskellDepends = [ attoparsec base text vector ];
        description = "A command line calculator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsbencher" = callPackage
@@ -127421,8 +118568,6 @@ self: {
        ];
        description = "Launch and gather data from Haskell and non-Haskell benchmarks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsbencher-codespeed" = callPackage
@@ -127441,8 +118586,6 @@ self: {
        ];
        description = "Backend for uploading benchmark data to CodeSpeed";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsbencher-fusion" = callPackage
@@ -127466,8 +118609,6 @@ self: {
        ];
        description = "Backend for uploading benchmark data to Google Fusion Tables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc2hs" = callPackage
@@ -127487,8 +118628,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hspec ];
        description = "A preprocessor that helps with writing Haskell bindings to C code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3" = callPackage
@@ -127523,8 +118662,6 @@ self: {
        ];
        description = "Haskell SuperCollider Auditor";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-cairo" = callPackage
@@ -127537,8 +118674,6 @@ self: {
        libraryHaskellDepends = [ base cairo gtk hosc hsc3 split ];
        description = "haskell supercollider cairo drawing";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-data" = callPackage
@@ -127556,8 +118691,6 @@ self: {
        ];
        description = "haskell supercollider data";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-db" = callPackage
@@ -127570,8 +118703,6 @@ self: {
        libraryHaskellDepends = [ base hsc3 safe ];
        description = "Haskell SuperCollider Unit Generator Database";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-dot" = callPackage
@@ -127584,8 +118715,6 @@ self: {
        libraryHaskellDepends = [ base directory filepath hsc3 process ];
        description = "haskell supercollider graph drawing";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-forth" = callPackage
@@ -127605,8 +118734,6 @@ self: {
        ];
        description = "FORTH SUPERCOLLIDER";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-graphs" = callPackage
@@ -127631,8 +118758,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Haskell SuperCollider Graphs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-lang" = callPackage
@@ -127653,8 +118778,6 @@ self: {
        ];
        description = "Haskell SuperCollider Language";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-lisp" = callPackage
@@ -127674,8 +118797,6 @@ self: {
        ];
        description = "LISP SUPERCOLLIDER";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-plot" = callPackage
@@ -127693,8 +118814,6 @@ self: {
        ];
        description = "Haskell SuperCollider Plotting";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-process" = callPackage
@@ -127714,8 +118833,6 @@ self: {
        ];
        description = "Create and control scsynth processes";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-rec" = callPackage
@@ -127728,8 +118845,6 @@ self: {
        libraryHaskellDepends = [ base hsc3 ];
        description = "Haskell SuperCollider Record Variants";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-rw" = callPackage
@@ -127747,8 +118862,6 @@ self: {
        ];
        description = "hsc3 re-writing";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-server" = callPackage
@@ -127775,8 +118888,6 @@ self: {
        ];
        description = "SuperCollider server resource management and synchronization";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-sf" = callPackage
@@ -127789,8 +118900,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hosc ];
        description = "Haskell SuperCollider SoundFile";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-sf-hsndfile" = callPackage
@@ -127807,8 +118916,6 @@ self: {
        ];
        description = "Haskell SuperCollider SoundFile";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-unsafe" = callPackage
@@ -127821,8 +118928,6 @@ self: {
        libraryHaskellDepends = [ base hsc3 ];
        description = "Unsafe Haskell SuperCollider";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsc3-utils" = callPackage
@@ -127844,8 +118949,6 @@ self: {
        ];
        description = "Haskell SuperCollider Utilities";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hscaffold" = callPackage
@@ -127872,8 +118975,6 @@ self: {
        ];
        description = "Very simple file/directory structure scaffolding writer monad EDSL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hscamwire" = callPackage
@@ -127888,8 +118989,6 @@ self: {
        librarySystemDepends = [ camwire_1394 dc1394_control raw1394 ];
        description = "Haskell bindings to IIDC1394 cameras, via Camwire";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {camwire_1394 = null; dc1394_control = null; raw1394 = null;};
 
   "hscassandra" = callPackage
@@ -127906,8 +119005,6 @@ self: {
        ];
        description = "cassandra database interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hscd" = callPackage
@@ -127922,8 +119019,6 @@ self: {
        executableHaskellDepends = [ aeson base bytestring ghc-prim HTTP ];
        description = "Command line client and library for SoundCloud.com";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hscharm" = callPackage
@@ -128032,8 +119127,6 @@ self: {
        executableHaskellDepends = [ base cairo glib gtk old-time ];
        description = "An elegant analog clock using Haskell, GTK and Cairo";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hscolour" = callPackage
@@ -128071,8 +119164,6 @@ self: {
        ];
        description = "cscope like browser for Haskell code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hscrtmpl" = callPackage
@@ -128107,8 +119198,6 @@ self: {
        testHaskellDepends = [ base containers text ];
        description = "Collision-resistant IDs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hscurses" = callPackage
@@ -128142,50 +119231,6 @@ self: {
      }) {};
 
   "hsdev" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, array, async, attoparsec
-     , base, bytestring, Cabal, containers, cpphs, data-default, deepseq
-     , direct-sqlite, directory, exceptions, filepath, fsnotify, ghc
-     , ghc-boot, ghc-paths, haddock-api, haddock-library, haskell-names
-     , haskell-src-exts, hdocs, hformat, hlint, hspec, HTTP, lens
-     , lens-aeson, lifted-base, mmorph, monad-control, monad-loops, mtl
-     , network, optparse-applicative, process, regex-pcre-builtin
-     , scientific, simple-log, sqlite-simple, stm, syb, template-haskell
-     , text, text-region, time, transformers, transformers-base
-     , traverse-with-class, uniplate, unix, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hsdev";
-       version = "0.3.2.3";
-       sha256 = "03v1lls7dv134675x10rgp4nla5a9dgczf4g78vrx488zf50rf1v";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty array async attoparsec base bytestring Cabal
-         containers cpphs data-default deepseq direct-sqlite directory
-         exceptions filepath fsnotify ghc ghc-boot ghc-paths haddock-api
-         haddock-library haskell-names haskell-src-exts hdocs hformat hlint
-         HTTP lens lifted-base mmorph monad-control monad-loops mtl network
-         optparse-applicative process regex-pcre-builtin scientific
-         simple-log sqlite-simple stm syb template-haskell text text-region
-         time transformers transformers-base traverse-with-class uniplate
-         unix unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         aeson aeson-pretty base bytestring containers deepseq directory
-         exceptions filepath monad-loops mtl network optparse-applicative
-         process text transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson async base containers data-default deepseq directory filepath
-         hformat hspec lens lens-aeson mtl text
-       ];
-       description = "Haskell development library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "hsdev_0_3_3_6" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, async, attoparsec
      , base, bytestring, Cabal, containers, cpphs, data-default, deepseq
      , direct-sqlite, directory, exceptions, filepath, fsnotify, ghc
@@ -128225,8 +119270,6 @@ self: {
        ];
        description = "Haskell development library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsdif" = callPackage
@@ -128239,8 +119282,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hosc ];
        description = "Haskell SDIF";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsdip" = callPackage
@@ -128255,8 +119296,6 @@ self: {
        libraryHaskellDepends = [ base cairo containers HUnit parsec ];
        description = "hsdip - a Diplomacy parser/renderer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsdns" = callPackage
@@ -128289,8 +119328,6 @@ self: {
        ];
        description = "Caching asynchronous DNS resolver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hse-cpp" = callPackage
@@ -128363,8 +119400,6 @@ self: {
        ];
        description = "Virtual Haskell Environment builder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hserv" = callPackage
@@ -128421,8 +119456,6 @@ self: {
        libraryHaskellDepends = [ base containers language-puppet text ];
        description = "A small and ugly library that emulates the output of the puppet facter program";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsfcsh" = callPackage
@@ -128438,8 +119471,6 @@ self: {
        ];
        description = "Incremental builder for flash";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsfilt" = callPackage
@@ -128453,8 +119484,6 @@ self: {
        executableHaskellDepends = [ base ghc ];
        description = "Z-decoder";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsforce" = callPackage
@@ -128490,8 +119519,6 @@ self: {
        librarySystemDepends = [ gcrypt gnutls ];
        description = "Library wrapping the GnuTLS API";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gcrypt = null; inherit (pkgs) gnutls;};
 
   "hsgnutls-yj" = callPackage
@@ -128504,8 +119531,6 @@ self: {
        librarySystemDepends = [ gcrypt gnutls ];
        description = "Library wrapping the GnuTLS API";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gcrypt = null; inherit (pkgs) gnutls;};
 
   "hsgsom" = callPackage
@@ -128518,8 +119543,6 @@ self: {
        libraryHaskellDepends = [ base containers random stm time ];
        description = "An implementation of the GSOM clustering algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsgtd" = callPackage
@@ -128567,8 +119590,6 @@ self: {
        libraryPkgconfigDepends = [ gsl ];
        description = "Signal processing and EEG data analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) blas; inherit (pkgs) gsl; 
          inherit (pkgs) liblapack;};
 
@@ -128611,8 +119632,6 @@ self: {
        doHaddock = false;
        description = "Extend the import list of a Haskell source file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsini" = callPackage
@@ -128654,24 +119673,6 @@ self: {
      }) {};
 
   "hsinstall" = callPackage
-    ({ mkDerivation, base, Cabal, directory, filepath, heredoc, process
-     , safe-exceptions
-     }:
-     mkDerivation {
-       pname = "hsinstall";
-       version = "2.2";
-       sha256 = "14c98wysvsq4k581s3f5zw44grm6f0wvbmgdda8sshhg7v2059r3";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base directory filepath ];
-       executableHaskellDepends = [
-         base Cabal directory filepath heredoc process safe-exceptions
-       ];
-       description = "Install Haskell software";
-       license = stdenv.lib.licenses.isc;
-     }) {};
-
-  "hsinstall_2_6" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, Cabal, directory, filepath
      , heredoc, optparse-applicative, process, safe-exceptions
      , transformers
@@ -128689,7 +119690,6 @@ self: {
        ];
        description = "Install Haskell software";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hskeleton" = callPackage
@@ -128701,8 +119701,6 @@ self: {
        libraryHaskellDepends = [ base Cabal ];
        description = "Skeleton for new Haskell programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hslackbuilder" = callPackage
@@ -128718,8 +119716,6 @@ self: {
        ];
        description = "HSlackBuilder automatically generates slackBuild scripts from a cabal package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hslibsvm" = callPackage
@@ -128733,8 +119729,6 @@ self: {
        librarySystemDepends = [ svm ];
        description = "A FFI binding to libsvm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {svm = null;};
 
   "hslinks" = callPackage
@@ -128751,28 +119745,9 @@ self: {
        ];
        description = "Resolves links to Haskell identifiers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hslogger" = callPackage
-    ({ mkDerivation, base, containers, directory, mtl, network
-     , old-locale, process, time, unix
-     }:
-     mkDerivation {
-       pname = "hslogger";
-       version = "1.2.12";
-       sha256 = "0ykcsk7wqygvrg60r5kpl6xfinr706al8pfyk5wj67wjs24lqypr";
-       revision = "1";
-       editedCabalFile = "1rk2lrg3959nbgbyd1aacvwbv865lsrnczqdmj4ivkfn0c8nkidh";
-       libraryHaskellDepends = [
-         base containers directory mtl network old-locale process time unix
-       ];
-       description = "Versatile logging framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hslogger_1_3_1_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, HUnit
      , network, network-bsd, old-locale, time, unix
      }:
@@ -128787,7 +119762,6 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Versatile logging framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hslogger-reader" = callPackage
@@ -128806,8 +119780,6 @@ self: {
        ];
        description = "Parsing hslogger-produced logs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hslogger-template" = callPackage
@@ -128857,8 +119829,6 @@ self: {
        ];
        description = "A library to work with, or as, a logstash server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hslua" = callPackage
@@ -128946,8 +119916,6 @@ self: {
        testHaskellDepends = [ aeson base bytestring colour containers ];
        description = "HSLuv conversion utility";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsmagick" = callPackage
@@ -128971,8 +119939,6 @@ self: {
        ];
        description = "FFI bindings for the GraphicsMagick library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {GraphicsMagick = null; inherit (pkgs) bzip2; freetype2 = null; 
          inherit (pkgs) jasper; inherit (pkgs) lcms; 
          inherit (pkgs) libjpeg; inherit (pkgs) libpng; 
@@ -129010,8 +119976,6 @@ self: {
        ];
        description = "Tool for generating .dir-locals.el for intero";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsmtpclient" = callPackage
@@ -129023,8 +119987,6 @@ self: {
        libraryHaskellDepends = [ array base directory network old-time ];
        description = "Simple SMTP Client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsndfile" = callPackage
@@ -129081,8 +120043,6 @@ self: {
        ];
        description = "Nock 5K interpreter";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsnoise" = callPackage
@@ -129107,8 +120067,6 @@ self: {
        executableHaskellDepends = [ base network pcap ];
        description = "a miniature network sniffer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsnsq" = callPackage
@@ -129127,8 +120085,6 @@ self: {
        ];
        description = "Haskell NSQ client";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsntp" = callPackage
@@ -129145,8 +120101,6 @@ self: {
        executableHaskellDepends = [ unix ];
        description = "Libraries to use SNTP protocol and small client/server implementations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsoptions" = callPackage
@@ -129171,8 +120125,6 @@ self: {
        ];
        description = "Haskell library that supports command-line flag processing";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsoz" = callPackage
@@ -129211,8 +120163,6 @@ self: {
        ];
        description = "Iron, Hawk, Oz: Web auth protocols";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsp" = callPackage
@@ -129235,8 +120185,6 @@ self: {
        libraryHaskellDepends = [ base containers harp hsp network ];
        description = "Facilitates running Haskell Server Pages web pages as CGI programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsparklines" = callPackage
@@ -129269,8 +120217,6 @@ self: {
        ];
        description = "A SPARQL query generator and DSL, and a client to query a SPARQL server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspear" = callPackage
@@ -129286,8 +120232,6 @@ self: {
        ];
        description = "Haskell Spear Parser";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspec" = callPackage
@@ -129479,8 +120423,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "An hspec expectation that asserts a value matches a pattern";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspec-expectations-pretty" = callPackage
@@ -129496,8 +120438,6 @@ self: {
        ];
        description = "hspec-expectations with pretty printing on failure";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspec-expectations-pretty-diff" = callPackage
@@ -129526,8 +120466,6 @@ self: {
        testHaskellDepends = [ base hspec-meta ];
        description = "An experimental DSL for testing on top of Hspec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspec-golden" = callPackage
@@ -129594,8 +120532,6 @@ self: {
        testHaskellDepends = [ base hedgehog hspec hspec-core ];
        description = "Hedgehog support for the Hspec testing framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspec-jenkins" = callPackage
@@ -129607,8 +120543,6 @@ self: {
        libraryHaskellDepends = [ base blaze-markup hspec ];
        description = "Jenkins-friendly XML formatter for Hspec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspec-laws" = callPackage
@@ -129637,22 +120571,6 @@ self: {
      }) {};
 
   "hspec-megaparsec" = callPackage
-    ({ mkDerivation, base, containers, hspec, hspec-expectations
-     , megaparsec
-     }:
-     mkDerivation {
-       pname = "hspec-megaparsec";
-       version = "2.0.1";
-       sha256 = "0w8nn2rh01lkiwsiyqh3gviklhfmy0245rakj94dmliyljw8skfg";
-       libraryHaskellDepends = [
-         base containers hspec-expectations megaparsec
-       ];
-       testHaskellDepends = [ base hspec hspec-expectations megaparsec ];
-       description = "Utility functions for testing Megaparsec parsers with Hspec";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hspec-megaparsec_2_1_0" = callPackage
     ({ mkDerivation, base, containers, hspec, hspec-expectations
      , megaparsec
      }:
@@ -129666,7 +120584,6 @@ self: {
        testHaskellDepends = [ base hspec hspec-expectations megaparsec ];
        description = "Utility functions for testing Megaparsec parsers with Hspec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-meta" = callPackage
@@ -129710,8 +120627,6 @@ self: {
        ];
        description = "Orphan instances of MonadBase and MonadBaseControl for SpecM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspec-multicheck" = callPackage
@@ -129772,8 +120687,6 @@ self: {
        ];
        description = "Helpers for creating database tests with hspec and pg-transact";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspec-server" = callPackage
@@ -129821,8 +120734,6 @@ self: {
        ];
        description = "Add an hspec test-suite in one command";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspec-shouldbe" = callPackage
@@ -129834,8 +120745,6 @@ self: {
        libraryHaskellDepends = [ hspec test-shouldbe ];
        description = "Convenience wrapper and utilities for hspec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspec-slow" = callPackage
@@ -129890,8 +120799,6 @@ self: {
        ];
        description = "A library for testing with Hspec and the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspec-stack-rerun" = callPackage
@@ -129913,8 +120820,6 @@ self: {
        sha256 = "008gm0qvhvp6z6a9sq5vpljqb90258apd83rkzy47k3bczy1sgmj";
        libraryHaskellDepends = [ base hspec ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspec-test-framework" = callPackage
@@ -129961,29 +120866,6 @@ self: {
      }) {};
 
   "hspec-wai" = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, case-insensitive
-     , hspec, hspec-core, hspec-expectations, http-types, QuickCheck
-     , text, transformers, wai, wai-extra
-     }:
-     mkDerivation {
-       pname = "hspec-wai";
-       version = "0.9.2";
-       sha256 = "0gr8j8x8vvzygxyqc0likam63f3427x4p73g95a387aksr5l2ph5";
-       libraryHaskellDepends = [
-         base base-compat bytestring case-insensitive hspec-core
-         hspec-expectations http-types QuickCheck text transformers wai
-         wai-extra
-       ];
-       testHaskellDepends = [
-         base base-compat bytestring case-insensitive hspec hspec-core
-         hspec-expectations http-types QuickCheck text transformers wai
-         wai-extra
-       ];
-       description = "Experimental Hspec support for testing WAI applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-wai_0_10_1" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, case-insensitive
      , hspec, hspec-core, hspec-expectations, http-types, QuickCheck
      , text, transformers, wai, wai-extra
@@ -130004,27 +120886,9 @@ self: {
        ];
        description = "Experimental Hspec support for testing WAI applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-wai-json" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, bytestring
-     , case-insensitive, hspec, hspec-wai, template-haskell
-     }:
-     mkDerivation {
-       pname = "hspec-wai-json";
-       version = "0.9.2";
-       sha256 = "1p6adknahl357cjkfg32aha6v79mwwr55isgl4hj2rh45r429qw2";
-       libraryHaskellDepends = [
-         aeson aeson-qq base bytestring case-insensitive hspec-wai
-         template-haskell
-       ];
-       testHaskellDepends = [ base hspec hspec-wai ];
-       description = "Testing JSON APIs with hspec-wai";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-wai-json_0_10_1" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, bytestring
      , case-insensitive, hspec, hspec-wai, template-haskell
      }:
@@ -130039,7 +120903,6 @@ self: {
        testHaskellDepends = [ base hspec hspec-wai ];
        description = "Testing JSON APIs with hspec-wai";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-webdriver" = callPackage
@@ -130057,8 +120920,6 @@ self: {
        ];
        description = "Write end2end web application tests using webdriver and hspec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspec2" = callPackage
@@ -130072,8 +120933,6 @@ self: {
        libraryHaskellDepends = [ base hspec hspec-discover ];
        description = "Alpha version of Hspec 2.0";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspecVariant" = callPackage
@@ -130085,8 +120944,6 @@ self: {
        libraryHaskellDepends = [ base hspec QuickCheckVariant ];
        description = "Spec for testing properties for variant types";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspkcs11" = callPackage
@@ -130105,8 +120962,6 @@ self: {
        ];
        description = "Wrapper for PKCS #11 interface";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspr-sh" = callPackage
@@ -130133,8 +120988,6 @@ self: {
        ];
        description = "A client library for the spread toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hspresent" = callPackage
@@ -130149,8 +121002,6 @@ self: {
        doHaddock = false;
        description = "A terminal presentation tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsprocess" = callPackage
@@ -130176,8 +121027,6 @@ self: {
        ];
        description = "The Haskell Stream Processor command line utility";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsql" = callPackage
@@ -130189,8 +121038,6 @@ self: {
        libraryHaskellDepends = [ base old-time ];
        description = "Database access from Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsql-mysql" = callPackage
@@ -130205,8 +121052,6 @@ self: {
        librarySystemDepends = [ mysqlclient ];
        description = "MySQL driver for HSQL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {mysqlclient = null;};
 
   "hsql-odbc" = callPackage
@@ -130219,8 +121064,6 @@ self: {
        librarySystemDepends = [ unixODBC ];
        description = "A Haskell Interface to ODBC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) unixODBC;};
 
   "hsql-postgresql" = callPackage
@@ -130233,8 +121076,6 @@ self: {
        librarySystemDepends = [ postgresql ];
        description = "A Haskell Interface to PostgreSQL via the PQ library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) postgresql;};
 
   "hsql-sqlite3" = callPackage
@@ -130247,8 +121088,6 @@ self: {
        librarySystemDepends = [ sqlite ];
        description = "SQLite3 driver for HSQL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) sqlite;};
 
   "hsqml" = callPackage
@@ -130270,8 +121109,6 @@ self: {
        ];
        description = "Haskell binding for Qt Quick";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {qt5 = null;};
 
   "hsqml-datamodel" = callPackage
@@ -130284,8 +121121,6 @@ self: {
        libraryPkgconfigDepends = [ qt5 ];
        description = "HsQML (Qt5) data model";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {qt5 = null;};
 
   "hsqml-datamodel-vinyl" = callPackage
@@ -130301,8 +121136,6 @@ self: {
        ];
        description = "HsQML DataModel instances for Vinyl Rec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsqml-demo-manic" = callPackage
@@ -130319,8 +121152,6 @@ self: {
        ];
        description = "HsQML-based clone of Pipe Mania";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsqml-demo-morris" = callPackage
@@ -130339,8 +121170,6 @@ self: {
        ];
        description = "HsQML-based implementation of Nine Men's Morris";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsqml-demo-notes" = callPackage
@@ -130359,8 +121188,6 @@ self: {
        ];
        description = "Sticky notes example program implemented in HsQML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsqml-demo-samples" = callPackage
@@ -130375,8 +121202,6 @@ self: {
        executableHaskellDepends = [ base hsqml OpenGL OpenGLRaw text ];
        description = "HsQML sample programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsqml-morris" = callPackage
@@ -130395,8 +121220,6 @@ self: {
        ];
        description = "HsQML-based implementation of Nine Men's Morris";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsreadability" = callPackage
@@ -130420,8 +121243,6 @@ self: {
        ];
        description = "Access to the Readability API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsrelp" = callPackage
@@ -130449,8 +121270,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit unix ];
        description = "Haskell bindings to libseccomp";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {seccomp = null;};
 
   "hssh" = callPackage
@@ -130557,8 +121376,6 @@ self: {
        ];
        description = "Statistics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hstats" = callPackage
@@ -130570,8 +121387,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Statistical Computing in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hstatsd" = callPackage
@@ -130600,8 +121415,6 @@ self: {
        ];
        description = "Runs tests via QuickCheck1 and HUnit; like quickCheck-script but uses GHC api";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hstidy" = callPackage
@@ -130615,8 +121428,6 @@ self: {
        executableHaskellDepends = [ base haskell-src-exts ];
        description = "Takes haskell source on stdin, parses it, then prettyprints it to stdout";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hstorchat" = callPackage
@@ -130645,8 +121456,6 @@ self: {
        ];
        description = "Distributed instant messaging over Tor";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hstox" = callPackage
@@ -130674,8 +121483,6 @@ self: {
        testHaskellDepends = [ async base ];
        description = "A Tox protocol implementation in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hstradeking" = callPackage
@@ -130700,8 +121507,6 @@ self: {
        ];
        description = "Tradeking API bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hstyle" = callPackage
@@ -130719,8 +121524,6 @@ self: {
        ];
        description = "Checks Haskell source code for style compliance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hstzaar" = callPackage
@@ -130741,8 +121544,6 @@ self: {
        ];
        description = "A two player abstract strategy game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsubconvert" = callPackage
@@ -130764,8 +121565,6 @@ self: {
        ];
        description = "One-time, faithful conversion of Subversion repositories to Git";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsudoku" = callPackage
@@ -130794,8 +121593,6 @@ self: {
        ];
        description = "Sudoku game with a GTK3 interface";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsverilog" = callPackage
@@ -130827,8 +121624,6 @@ self: {
        librarySystemDepends = [ ncurses readline swipl ];
        description = "embedding prolog in haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) ncurses; inherit (pkgs) readline; 
          swipl = null;};
 
@@ -130845,8 +121640,6 @@ self: {
        libraryHaskellDepends = [ base haskell-src-exts mtl utf8-string ];
        description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsx-jmacro" = callPackage
@@ -130860,8 +121653,6 @@ self: {
        ];
        description = "hsp+jmacro support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsx-xhtml" = callPackage
@@ -130873,8 +121664,6 @@ self: {
        libraryHaskellDepends = [ base hsx mtl ];
        description = "XHTML utilities to use together with HSX";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsx2hs" = callPackage
@@ -130893,8 +121682,6 @@ self: {
        ];
        description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsyscall" = callPackage
@@ -130906,8 +121693,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "FFI to syscalls";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsyslog" = callPackage
@@ -130939,8 +121724,6 @@ self: {
        ];
        description = "syslog over TCP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hsyslog-udp" = callPackage
@@ -130957,8 +121740,6 @@ self: {
        testHaskellDepends = [ base hspec time ];
        description = "Log to syslog over a network via UDP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hszephyr" = callPackage
@@ -130971,8 +121752,6 @@ self: {
        librarySystemDepends = [ com_err zephyr ];
        description = "Simple libzephyr bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {com_err = null; zephyr = null;};
 
   "htaglib" = callPackage
@@ -131022,8 +121801,6 @@ self: {
        ];
        description = "Command-line tar archive utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "htaut" = callPackage
@@ -131066,8 +121843,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A library for testing correctness of pseudo random number generators in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gcc;};
 
   "htiled" = callPackage
@@ -131084,8 +121859,6 @@ self: {
        ];
        description = "Import from the Tiled map editor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "htime" = callPackage
@@ -131126,8 +121899,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Heterogenous Set";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "html" = callPackage
@@ -131163,8 +121934,6 @@ self: {
        ];
        description = "Determine character encoding of HTML documents/fragments";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "html-conduit_1_2_1_2" = callPackage
@@ -131285,8 +122054,6 @@ self: {
        libraryHaskellDepends = [ base hxt kure ];
        description = "HTML rewrite engine, using KURE";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "html-minimalist" = callPackage
@@ -131334,8 +122101,6 @@ self: {
        libraryHaskellDepends = [ base lens mtl tagsoup transformers ];
        description = "Perform traversals of HTML structures using sets of rules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "html-tokenizer" = callPackage
@@ -131358,8 +122123,6 @@ self: {
        ];
        description = "An \"attoparsec\"-based HTML tokenizer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "html-truncate" = callPackage
@@ -131481,8 +122244,6 @@ self: {
        ];
        description = "Parser for TOML files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "htoml-megaparsec" = callPackage
@@ -131509,8 +122270,6 @@ self: {
        doHaddock = false;
        description = "Parser for TOML files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "htrace" = callPackage
@@ -131534,8 +122293,6 @@ self: {
        libraryHaskellDepends = [ base hmt xml ];
        description = "Haskell Music Typesetting";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "htsn" = callPackage
@@ -131559,8 +122316,6 @@ self: {
        ];
        description = "Parse XML files from The Sports Network feed";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "htsn-common" = callPackage
@@ -131603,8 +122358,6 @@ self: {
        ];
        description = "Import XML files from The Sports Network into an RDBMS";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "htssets" = callPackage
@@ -131664,8 +122417,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring http-types ];
        description = "Attoparsec parsers for http-types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-client" = callPackage
@@ -131711,8 +122462,6 @@ self: {
        ];
        description = "HTTP authorization (both basic and digest) done right";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-client-conduit" = callPackage
@@ -131759,8 +122508,6 @@ self: {
        ];
        description = "Optics for http-client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-client-multipart" = callPackage
@@ -131832,8 +122579,6 @@ self: {
        ];
        description = "Convenient monadic HTTP request modifiers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-client-restricted" = callPackage
@@ -131850,8 +122595,6 @@ self: {
        ];
        description = "restricting the servers that http-client will use";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-client-session" = callPackage
@@ -131867,8 +122610,6 @@ self: {
        ];
        description = "A simple abstraction over the \"http-client\" connection manager";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-client-streams" = callPackage
@@ -131885,8 +122626,6 @@ self: {
        ];
        description = "http-client for io-streams supporting openssl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-client-tls" = callPackage
@@ -132014,8 +122753,6 @@ self: {
        ];
        description = "Browser interface to the http-conduit package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-conduit-downloader" = callPackage
@@ -132068,8 +122805,6 @@ self: {
        testHaskellDepends = [ base hspec text ];
        description = "http directory listing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-dispatch" = callPackage
@@ -132087,8 +122822,6 @@ self: {
        testHaskellDepends = [ aeson base hspec ];
        description = "High level HTTP client for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-download" = callPackage
@@ -132156,8 +122889,6 @@ self: {
        ];
        description = "HTTP client package with enumerator interface and HTTPS support. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-grammar" = callPackage
@@ -132169,8 +122900,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "Attoparsec-based parsers for the RFC-2616 HTTP grammar rules";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-io-streams" = callPackage
@@ -132191,8 +122920,6 @@ self: {
        ];
        description = "HTTP client based on io-streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-kinder" = callPackage
@@ -132215,8 +122942,6 @@ self: {
        ];
        description = "Generic kinds and types for working with HTTP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-kit" = callPackage
@@ -132333,8 +123058,6 @@ self: {
        ];
        description = "Monad abstraction for HTTP allowing lazy transfer and non-I/O simulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-pony" = callPackage
@@ -132370,8 +123093,6 @@ self: {
        ];
        description = "Serve a WAI application with http-pony";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-pony-transformer-case-insensitive" = callPackage
@@ -132438,8 +123159,6 @@ self: {
        ];
        description = "A library for writing HTTP and HTTPS proxies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-querystring" = callPackage
@@ -132456,8 +123175,6 @@ self: {
        ];
        description = "The HTTP query builder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-response-decoder" = callPackage
@@ -132477,8 +123194,6 @@ self: {
        ];
        description = "Declarative DSL for parsing an HTTP response";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-reverse-proxy" = callPackage
@@ -132531,8 +123246,6 @@ self: {
        libraryHaskellDepends = [ base network ];
        description = "A simple websever with an interact style API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-streams" = callPackage
@@ -132564,8 +123277,6 @@ self: {
        ];
        description = "An HTTP client using io-streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http-test" = callPackage
@@ -132633,8 +123344,6 @@ self: {
        libraryHaskellDepends = [ base failure process transformers ];
        description = "Provide a simple HTTP client interface by wrapping the wget command line tool. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http2" = callPackage
@@ -132686,8 +123395,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A native HTTP2 client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http2-client-exe" = callPackage
@@ -132707,8 +123414,6 @@ self: {
        ];
        description = "A command-line http2 client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http2-client-grpc" = callPackage
@@ -132728,8 +123433,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Implement gRPC-over-HTTP2 clients";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http2-grpc-proto-lens" = callPackage
@@ -132762,8 +123465,6 @@ self: {
        ];
        description = "Encoders based on `proto3-wire` for gRPC over HTTP2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "http2-grpc-types" = callPackage
@@ -132814,8 +123515,6 @@ self: {
        ];
        description = "High-level access to HTTPS Everywhere rulesets";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "https-everywhere-rules-raw" = callPackage
@@ -132830,8 +123529,6 @@ self: {
        ];
        description = "Low-level (i.e. XML) access to HTTPS Everywhere rulesets.";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "httpspec" = callPackage
@@ -132849,8 +123546,6 @@ self: {
        ];
        description = "Specification of HTTP request/response generators and parsers";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "htune" = callPackage
@@ -132864,8 +123559,6 @@ self: {
        executableHaskellDepends = [ alsa-pcm base carray fft gloss ];
        description = "harmonic analyser and tuner for musical instruments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "htvm" = callPackage
@@ -132893,8 +123586,6 @@ self: {
        testSystemDepends = [ tvm_runtime ];
        description = "Bindings for TVM machine learning framework";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {tvm_runtime = null;};
 
   "htzaar" = callPackage
@@ -132908,8 +123599,6 @@ self: {
        executableHaskellDepends = [ base OpenGL random SDL ];
        description = "A two player abstract strategy game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hub" = callPackage
@@ -132940,8 +123629,6 @@ self: {
        libraryHaskellDepends = [ base containers haxr mtl ];
        description = "A haskell wrap for Ubigraph";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hubris" = callPackage
@@ -132987,8 +123674,6 @@ self: {
        ];
        description = "huck";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "huckleberry" = callPackage
@@ -133020,8 +123705,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A fast-foward-based planner";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "huffman" = callPackage
@@ -133033,8 +123716,6 @@ self: {
        libraryHaskellDepends = [ base containers fingertree ];
        description = "Pure Haskell implementation of the Huffman encoding algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hugs2yc" = callPackage
@@ -133051,8 +123732,6 @@ self: {
        ];
        description = "Hugs Front-end to Yhc Core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hulk" = callPackage
@@ -133079,8 +123758,6 @@ self: {
        ];
        description = "IRC server written in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "human-parse" = callPackage
@@ -133092,8 +123769,6 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "A lawless typeclass for parsing text entered by humans";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "human-readable-duration" = callPackage
@@ -133118,8 +123793,6 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "A lawless typeclass for converting values to human-friendly text";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "humble-prelude" = callPackage
@@ -133155,8 +123828,6 @@ self: {
        ];
        description = "Haskell UPnP Media Server";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hunch" = callPackage
@@ -133205,8 +123876,6 @@ self: {
        executableHaskellDepends = [ base cairo gtk haskell98 HUnit ];
        description = "A GUI testrunner for HUnit";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hunit-parsec" = callPackage
@@ -133230,8 +123899,6 @@ self: {
        testHaskellDepends = [ base hspec HUnit rematch ];
        description = "HUnit support for rematch";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hunp" = callPackage
@@ -133250,8 +123917,6 @@ self: {
        ];
        description = "Unpacker tool with DWIM";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hunspell-hs" = callPackage
@@ -133268,8 +123933,6 @@ self: {
        benchmarkPkgconfigDepends = [ hunspell ];
        description = "Hunspell thread-safe FFI bindings for spell checking";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) hunspell;};
 
   "hunt-searchengine" = callPackage
@@ -133301,8 +123964,6 @@ self: {
        ];
        description = "A search and indexing engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hunt-server" = callPackage
@@ -133326,8 +123987,6 @@ self: {
        ];
        description = "A search and indexing engine server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hunt-server-cli" = callPackage
@@ -133398,8 +124057,6 @@ self: {
        ];
        description = "Extract function names from Windows DLLs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hurl" = callPackage
@@ -133417,8 +124074,6 @@ self: {
        ];
        description = "Haskell URL resolver";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hurriyet" = callPackage
@@ -133437,8 +124092,6 @@ self: {
        ];
        description = "Haskell bindings for Hurriyet API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "husk-scheme" = callPackage
@@ -133463,8 +124116,6 @@ self: {
        ];
        description = "R5RS Scheme interpreter, compiler, and library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "husk-scheme-libs" = callPackage
@@ -133480,8 +124131,6 @@ self: {
        ];
        description = "Extra libraries for the husk Scheme platform";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "husky" = callPackage
@@ -133499,8 +124148,6 @@ self: {
        ];
        description = "A simple command line calculator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hutton" = callPackage
@@ -133521,8 +124168,6 @@ self: {
        ];
        description = "A program for the button on Reddit";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "huttons-razor" = callPackage
@@ -133536,8 +124181,6 @@ self: {
        executableHaskellDepends = [ base parsec parsec-numbers ];
        description = "Quick implemention of Hutton's Razor";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "huzzy" = callPackage
@@ -133549,8 +124192,6 @@ self: {
        libraryHaskellDepends = [ base easyplot ];
        description = "Fuzzy logic library with support for T1, IT2, GT2";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hvect" = callPackage
@@ -133566,36 +124207,22 @@ self: {
      }) {};
 
   "hvega" = callPackage
-    ({ mkDerivation, aeson, base, text, vector }:
-     mkDerivation {
-       pname = "hvega";
-       version = "0.3.0.1";
-       sha256 = "04qrlqzi065r9b83wyw1zymnyjvpy5jhlzxxqd2j6m9zsngh7hl1";
-       libraryHaskellDepends = [ aeson base text vector ];
-       description = "Create Vega-Lite visualizations (version 3) in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hvega_0_4_1_2" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
-     , filepath, tasty, tasty-golden, text, unordered-containers, vector
+     , filepath, tasty, tasty-golden, text, unordered-containers
      }:
      mkDerivation {
        pname = "hvega";
-       version = "0.4.1.2";
-       sha256 = "0vf7hwhq8s8w3zjgag80gm54bxk5bm9q0mmriqy1790vrxb51276";
+       version = "0.5.0.0";
+       sha256 = "0h587i2wxwdmp24yxw7ggg1ak68mppbjwgjrdfhzzqlwdr69y9k0";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base text unordered-containers vector
-       ];
+       libraryHaskellDepends = [ aeson base text unordered-containers ];
        testHaskellDepends = [
          aeson aeson-pretty base bytestring containers filepath tasty
          tasty-golden text
        ];
-       description = "Create Vega-Lite visualizations (version 3) in Haskell";
+       description = "Create Vega-Lite visualizations (version 4) in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hvega-theme" = callPackage
@@ -133646,36 +124273,9 @@ self: {
        ];
        description = "Demo library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-balancedparens" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, hspec, hspec-discover
-     , hw-bits, hw-excess, hw-prim, hw-rankselect-base, QuickCheck
-     , vector
-     }:
-     mkDerivation {
-       pname = "hw-balancedparens";
-       version = "0.2.0.4";
-       sha256 = "166vb5armxah2r1qwa9yzzd5abd3dnssybgwl6kjzl8q43r0n84h";
-       libraryHaskellDepends = [
-         base deepseq hw-bits hw-excess hw-prim hw-rankselect-base vector
-       ];
-       testHaskellDepends = [
-         base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         base criterion hw-bits hw-prim vector
-       ];
-       description = "Balanced parentheses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "hw-balancedparens_0_3_0_4" = callPackage
     ({ mkDerivation, base, criterion, deepseq, doctest
      , doctest-discover, hedgehog, hspec, hspec-discover, hw-bits
      , hw-excess, hw-fingertree, hw-hspec-hedgehog, hw-prim
@@ -133700,8 +124300,6 @@ self: {
        doHaddock = false;
        description = "Balanced parentheses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-bits" = callPackage
@@ -133725,8 +124323,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "Bit manipulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-ci-assist" = callPackage
@@ -133748,8 +124344,6 @@ self: {
        doHaddock = false;
        description = "CI Assistant for Haskell projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-conduit" = callPackage
@@ -133804,47 +124398,6 @@ self: {
      }) {};
 
   "hw-dsv" = callPackage
-    ({ mkDerivation, base, bits-extra, bytestring, cassava, criterion
-     , deepseq, directory, generic-lens, ghc-prim, hedgehog, hspec
-     , hspec-discover, hw-bits, hw-hspec-hedgehog, hw-prim
-     , hw-rankselect, hw-rankselect-base, hw-simd, lens, mmap
-     , optparse-applicative, resourcet, text, vector, weigh
-     }:
-     mkDerivation {
-       pname = "hw-dsv";
-       version = "0.3.5";
-       sha256 = "15dy96ah7frs79g102vvsrihzlk2qc5c773y7bqdcm66mjhin3x2";
-       revision = "2";
-       editedCabalFile = "0flmxhc1w38si89wdr9i6x70mc3sl07hrw2b77xabva8dgx7ph3q";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bits-extra bytestring deepseq ghc-prim hw-bits hw-prim
-         hw-rankselect hw-rankselect-base hw-simd vector
-       ];
-       executableHaskellDepends = [
-         base bits-extra bytestring deepseq generic-lens ghc-prim hedgehog
-         hw-bits hw-prim hw-rankselect hw-rankselect-base hw-simd lens
-         optparse-applicative resourcet vector
-       ];
-       testHaskellDepends = [
-         base bits-extra bytestring cassava deepseq directory ghc-prim
-         hedgehog hspec hw-bits hw-hspec-hedgehog hw-prim hw-rankselect
-         hw-rankselect-base hw-simd text vector weigh
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         base bits-extra bytestring cassava criterion deepseq directory
-         ghc-prim hw-bits hw-prim hw-rankselect hw-rankselect-base hw-simd
-         mmap vector
-       ];
-       description = "Unbelievably fast streaming DSV file parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "hw-dsv_0_4_0" = callPackage
     ({ mkDerivation, appar, base, bits-extra, bytestring, cassava
      , criterion, deepseq, directory, doctest, doctest-discover
      , generic-lens, ghc-prim, hedgehog, hspec, hspec-discover, hw-bits
@@ -133882,8 +124435,6 @@ self: {
        ];
        description = "Unbelievably fast streaming DSV file parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-dump" = callPackage
@@ -133915,49 +124466,9 @@ self: {
        ];
        description = "File Dump";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-eliasfano" = callPackage
-    ({ mkDerivation, base, binary, bytestring, criterion, deepseq
-     , generic-lens, hedgehog, hspec, hspec-discover, hw-bits
-     , hw-hedgehog, hw-hspec-hedgehog, hw-int, hw-packed-vector, hw-prim
-     , hw-rankselect, hw-rankselect-base, lens, mmap
-     , optparse-applicative, vector
-     }:
-     mkDerivation {
-       pname = "hw-eliasfano";
-       version = "0.1.1.0";
-       sha256 = "0q3lrpw72krsbfbykjkkm55aca43ravyl4b1d3k0wgh5wv340a3v";
-       revision = "1";
-       editedCabalFile = "100fwgcby3nfmx2ailf8zggq0sbh5fm65x4dxyaayfzs8ngfi5is";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base deepseq hw-bits hw-int hw-packed-vector hw-prim hw-rankselect
-         hw-rankselect-base vector
-       ];
-       executableHaskellDepends = [
-         base binary bytestring generic-lens hw-packed-vector lens
-         optparse-applicative vector
-       ];
-       testHaskellDepends = [
-         base hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog hw-int
-         hw-packed-vector hw-prim vector
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion hedgehog hspec hw-bits hw-hedgehog
-         hw-hspec-hedgehog hw-int hw-packed-vector hw-prim mmap vector
-       ];
-       description = "Elias-Fano";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "hw-eliasfano_0_1_1_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, criterion, deepseq
      , generic-lens, hedgehog, hspec, hspec-discover, hw-bits
      , hw-hedgehog, hw-hspec-hedgehog, hw-int, hw-packed-vector, hw-prim
@@ -133992,8 +124503,6 @@ self: {
        ];
        description = "Elias-Fano";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-excess" = callPackage
@@ -134019,8 +124528,6 @@ self: {
        ];
        description = "Excess";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-fingertree" = callPackage
@@ -134106,35 +124613,6 @@ self: {
      }) {};
 
   "hw-ip" = callPackage
-    ({ mkDerivation, appar, base, binary, bytestring, containers
-     , generic-lens, hedgehog, hspec, hspec-discover, hw-bits
-     , hw-hspec-hedgehog, iproute, lens, optparse-applicative, text
-     }:
-     mkDerivation {
-       pname = "hw-ip";
-       version = "2.3.4.2";
-       sha256 = "020pwy89hx4jcmq5vwd0gs4vbb2llkvvzaqk72s06w51hqrfpxb9";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         appar base containers generic-lens hw-bits iproute text
-       ];
-       executableHaskellDepends = [
-         appar base binary bytestring generic-lens lens optparse-applicative
-         text
-       ];
-       testHaskellDepends = [
-         appar base generic-lens hedgehog hspec hw-bits hw-hspec-hedgehog
-         text
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Library for manipulating IP addresses and CIDR blocks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "hw-ip_2_4_1_0" = callPackage
     ({ mkDerivation, appar, base, binary, bytestring, containers
      , doctest, doctest-discover, generic-lens, hedgehog, hspec
      , hspec-discover, hw-bits, hw-hspec-hedgehog, iproute, lens
@@ -134161,52 +124639,9 @@ self: {
        doHaddock = false;
        description = "Library for manipulating IP addresses and CIDR blocks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-json" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base
-     , bits-extra, bytestring, criterion, directory, dlist, generic-lens
-     , hedgehog, hspec, hspec-discover, hw-balancedparens, hw-bits
-     , hw-hspec-hedgehog, hw-json-simd, hw-mquery, hw-parser, hw-prim
-     , hw-rankselect, hw-rankselect-base, hw-simd, lens, mmap
-     , optparse-applicative, text, transformers, vector, word8
-     }:
-     mkDerivation {
-       pname = "hw-json";
-       version = "1.0.0.2";
-       sha256 = "0lb38kfxhamvdhp6z3aw4as57nc6jxf6wj7nr3lmiry6h2gx15js";
-       revision = "1";
-       editedCabalFile = "1laxwrcjdjrpym4gghnqa39xvdvbxsp2sbpzcc703ac3kj7v2b6h";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-wl-pprint array attoparsec base bits-extra bytestring dlist
-         hw-balancedparens hw-bits hw-mquery hw-parser hw-prim hw-rankselect
-         hw-rankselect-base hw-simd mmap text vector word8
-       ];
-       executableHaskellDepends = [
-         base bytestring dlist generic-lens hw-balancedparens hw-json-simd
-         hw-mquery hw-prim hw-rankselect hw-rankselect-base lens mmap
-         optparse-applicative vector
-       ];
-       testHaskellDepends = [
-         attoparsec base bytestring hedgehog hspec hw-balancedparens hw-bits
-         hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base
-         transformers vector
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion directory mmap
-       ];
-       description = "Memory efficient JSON parser";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "hw-json_1_3_1_1" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
      , bits-extra, bytestring, criterion, directory, dlist, generic-lens
      , hedgehog, hspec, hspec-discover, hw-balancedparens, hw-bits
@@ -134246,8 +124681,6 @@ self: {
        ];
        description = "Memory efficient JSON parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-json-lens" = callPackage
@@ -134274,8 +124707,6 @@ self: {
        ];
        description = "Lens for hw-json";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-json-simd" = callPackage
@@ -134330,8 +124761,6 @@ self: {
        ];
        description = "Memory efficient JSON parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-json-standard-cursor" = callPackage
@@ -134367,8 +124796,6 @@ self: {
        ];
        description = "Memory efficient JSON parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-kafka-avro" = callPackage
@@ -134467,32 +124894,6 @@ self: {
      }) {};
 
   "hw-packed-vector" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, deepseq, directory
-     , hedgehog, hspec, hspec-discover, hw-bits, hw-hedgehog
-     , hw-hspec-hedgehog, hw-prim, vector
-     }:
-     mkDerivation {
-       pname = "hw-packed-vector";
-       version = "0.0.0.3";
-       sha256 = "1l021x4sya6fmdhz6nsqh4nvvc3bbb29y30ari0qvn5789nwxzv3";
-       libraryHaskellDepends = [
-         base bytestring deepseq hw-bits hw-prim vector
-       ];
-       testHaskellDepends = [
-         base bytestring hedgehog hspec hw-bits hw-hedgehog
-         hw-hspec-hedgehog hw-prim vector
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         base criterion directory hedgehog hspec hw-prim vector
-       ];
-       description = "Packed Vector";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "hw-packed-vector_0_2_0_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, criterion, deepseq
      , directory, generic-lens, hedgehog, hspec, hspec-discover, hw-bits
      , hw-hedgehog, hw-hspec-hedgehog, hw-prim, lens
@@ -134521,8 +124922,6 @@ self: {
        ];
        description = "Packed Vector";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-parser" = callPackage
@@ -134586,49 +124985,9 @@ self: {
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "Primitive support for bit manipulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-rankselect" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, criterion, deepseq
-     , directory, generic-lens, hedgehog, hspec, hspec-discover
-     , hw-balancedparens, hw-bits, hw-hedgehog, hw-hspec-hedgehog
-     , hw-prim, hw-rankselect-base, lens, mmap, mtl
-     , optparse-applicative, QuickCheck, resourcet, transformers, vector
-     }:
-     mkDerivation {
-       pname = "hw-rankselect";
-       version = "0.13.0.0";
-       sha256 = "13cdsrg7akizf5gcjvpwr8mwhl6ds9n3y7ql559w52xy5s8viqzv";
-       revision = "1";
-       editedCabalFile = "17f9zdy7620d36mrrcakpr9rhzzr7rkv8hd5n47cqllmhzvns5mg";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base deepseq hw-balancedparens hw-bits hw-prim hw-rankselect-base
-         vector
-       ];
-       executableHaskellDepends = [
-         base directory generic-lens hw-bits hw-prim hw-rankselect-base lens
-         mmap mtl optparse-applicative vector
-       ];
-       testHaskellDepends = [
-         base directory hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog
-         hw-prim hw-rankselect-base mmap QuickCheck transformers vector
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         base bytestring conduit criterion directory hw-bits hw-prim
-         hw-rankselect-base mmap resourcet vector
-       ];
-       description = "Rank-select";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "hw-rankselect_0_13_3_2" = callPackage
     ({ mkDerivation, base, bytestring, conduit, criterion, deepseq
      , directory, doctest, doctest-discover, generic-lens, hedgehog
      , hspec, hspec-discover, hw-balancedparens, hw-bits, hw-fingertree
@@ -134663,8 +125022,6 @@ self: {
        doHaddock = false;
        description = "Rank-select";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-rankselect-base" = callPackage
@@ -134690,8 +125047,6 @@ self: {
        ];
        description = "Rank-select base";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-simd" = callPackage
@@ -134722,8 +125077,6 @@ self: {
        ];
        description = "SIMD library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-streams" = callPackage
@@ -134752,8 +125105,6 @@ self: {
        ];
        description = "Primitive functions and data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-string-parse" = callPackage
@@ -134784,8 +125135,6 @@ self: {
        ];
        description = "Succint datastructures";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-uri" = callPackage
@@ -134819,8 +125168,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Supports IO on URIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hw-vector" = callPackage
@@ -134875,8 +125222,6 @@ self: {
        ];
        description = "XML parser based on succinct data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hwall-auth-iitk" = callPackage
@@ -134895,8 +125240,6 @@ self: {
        ];
        description = "Initial version of firewall Authentication for IITK network";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hweblib" = callPackage
@@ -134919,8 +125262,6 @@ self: {
        ];
        description = "Haskell Web Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hwhile" = callPackage
@@ -134941,8 +125282,6 @@ self: {
        testHaskellDepends = [ array base Cabal containers mtl ];
        description = "An implementation of Neil D. Jones' While language";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hworker" = callPackage
@@ -134964,8 +125303,6 @@ self: {
        ];
        description = "A reliable at-least-once job queue built on top of redis";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hworker-ses" = callPackage
@@ -134982,8 +125319,6 @@ self: {
        ];
        description = "Library for sending email with Amazon's SES and hworker";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hwormhole" = callPackage
@@ -135016,8 +125351,6 @@ self: {
        ];
        description = "magic-wormhole client";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hws" = callPackage
@@ -135036,8 +125369,6 @@ self: {
        ];
        description = "Simple Haskell Web Server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hwsl2" = callPackage
@@ -135057,8 +125388,6 @@ self: {
        ];
        description = "Hashing with SL2";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hwsl2-bytevector" = callPackage
@@ -135070,8 +125399,6 @@ self: {
        libraryHaskellDepends = [ base bytestring fingertree hwsl2 ];
        description = "A hashed byte-vector based on algebraic hashes and finger trees";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hwsl2-reducers" = callPackage
@@ -135085,8 +125412,6 @@ self: {
        ];
        description = "Semigroup and Reducer instances for Data.Hash.SL2";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hx" = callPackage
@@ -135116,8 +125441,6 @@ self: {
        ];
        description = "Haskell XMPP (Jabber Client) Command Line Interface (CLI)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hxournal" = callPackage
@@ -135144,8 +125467,6 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        description = "A pen notetaking program written in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hxt" = callPackage
@@ -135301,8 +125622,6 @@ self: {
        libraryHaskellDepends = [ base hxt mtl ];
        description = "Utility functions for using HXT picklers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hxt-regex-xmlschema" = callPackage
@@ -135409,8 +125728,6 @@ self: {
        libraryHaskellDepends = [ base bytestring encoding hxt mtl ];
        description = "Helper functions for HXT";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hxweb" = callPackage
@@ -135422,8 +125739,6 @@ self: {
        libraryHaskellDepends = [ base cgi fastcgi libxml mtl xslt ];
        description = "Minimal webframework using fastcgi, libxml2 and libxslt";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyahtzee" = callPackage
@@ -135437,8 +125752,6 @@ self: {
        executableHaskellDepends = [ base containers HUnit random ];
        description = "A Yahtzee game implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyakko" = callPackage
@@ -135460,8 +125773,6 @@ self: {
        ];
        description = "Literate-style Documentation Generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hybrid" = callPackage
@@ -135478,8 +125789,6 @@ self: {
        ];
        description = "A implementation of a type-checker for Lambda-H";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hybrid-vectors" = callPackage
@@ -135508,8 +125817,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Haskell binding to the Sixense SDK for the Razer Hydra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {sixense_x64 = null;};
 
   "hydra-print" = callPackage
@@ -135541,8 +125848,6 @@ self: {
        ];
        description = "NCurses interface to view multiple ByteString streams in parallel";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hydrogen" = callPackage
@@ -135559,8 +125864,6 @@ self: {
        testHaskellDepends = [ base Cabal containers mtl QuickCheck ];
        description = "An alternate Prelude";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hydrogen-cli" = callPackage
@@ -135581,8 +125884,6 @@ self: {
        ];
        description = "Hydrogen Data";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hydrogen-cli-args" = callPackage
@@ -135598,8 +125899,6 @@ self: {
        ];
        description = "Hydrogen Command Line Arguments Parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hydrogen-data" = callPackage
@@ -135611,8 +125910,6 @@ self: {
        libraryHaskellDepends = [ base hydrogen-parsing hydrogen-prelude ];
        description = "Hydrogen Data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hydrogen-multimap" = callPackage
@@ -135624,8 +125921,6 @@ self: {
        libraryHaskellDepends = [ base containers ghc-prim ];
        description = "Hydrogen Multimap";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hydrogen-parsing" = callPackage
@@ -135639,8 +125934,6 @@ self: {
        ];
        description = "Hydrogen Parsing Utilities";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hydrogen-prelude" = callPackage
@@ -135660,8 +125953,6 @@ self: {
        ];
        description = "Hydrogen Prelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hydrogen-prelude-parsec" = callPackage
@@ -135673,8 +125964,6 @@ self: {
        libraryHaskellDepends = [ base hydrogen-prelude parsec ];
        description = "Hydrogen Prelude /w Parsec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hydrogen-syntax" = callPackage
@@ -135691,8 +125980,6 @@ self: {
        ];
        description = "Hydrogen Syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hydrogen-util" = callPackage
@@ -135707,8 +125994,6 @@ self: {
        ];
        description = "Hydrogen Tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hydrogen-version" = callPackage
@@ -135737,8 +126022,6 @@ self: {
        ];
        description = "Simple web application server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hylide" = callPackage
@@ -135760,8 +126043,6 @@ self: {
        ];
        description = "WebGL live-coding environment for writing shaders with Hylogen";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hylogen" = callPackage
@@ -135788,8 +126069,6 @@ self: {
        ];
        description = "Tools for hybrid logics related programs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hylotab" = callPackage
@@ -135804,8 +126083,6 @@ self: {
        executableHaskellDepends = [ base hylolib mtl ];
        description = "Tableau based theorem prover for hybrid logics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyloutils" = callPackage
@@ -135821,8 +126098,6 @@ self: {
        ];
        description = "Very small programs for hybrid logics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyper" = callPackage
@@ -135867,8 +126142,6 @@ self: {
        ];
        description = "Server back-end for the HyperHaskell graphical Haskell interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyperdrive" = callPackage
@@ -135887,8 +126160,6 @@ self: {
        ];
        description = "a fast, trustworthy HTTP(s) server built";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyperfunctions" = callPackage
@@ -135904,8 +126175,6 @@ self: {
        ];
        description = "Hyperfunctions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyperion" = callPackage
@@ -135933,8 +126202,6 @@ self: {
        ];
        description = "Reliable performance measurement with robust data export";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyperloglog" = callPackage
@@ -135976,8 +126243,6 @@ self: {
        testHaskellDepends = [ base HUnit semigroups tasty tasty-hunit ];
        description = "Approximate cardinality estimation using constant space";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyperpublic" = callPackage
@@ -135993,8 +126258,6 @@ self: {
        ];
        description = "A thin wrapper for the Hyperpublic API";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyphenate" = callPackage
@@ -136055,8 +126318,6 @@ self: {
        ];
        description = "A Haskell neo4j client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "hyraxAbif" = callPackage
@@ -136065,10 +126326,8 @@ self: {
      }:
      mkDerivation {
        pname = "hyraxAbif";
-       version = "0.2.3.15";
-       sha256 = "1wfmlqgk751ij30x0dkyc9fyc6j1a96l0s7fjj1sywdvawd8cfh1";
-       revision = "1";
-       editedCabalFile = "07i4ippga6cnwr9yl6nkrhakl9sim73fprf29lnmsvdc8ynbifcd";
+       version = "0.2.3.21";
+       sha256 = "0ghhfv8gzs9sg13nj3mhqd24zbrkjj1dgsjz3sql6276kpa1p2kc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -136092,6 +126351,8 @@ self: {
        pname = "hz3";
        version = "96.0.0.0";
        sha256 = "080bhbnhswic7m35rzbqi9i7lb57szag6khprrjccpa80vq7lj6n";
+       revision = "2";
+       editedCabalFile = "02q1pcy6z4vl1qm4klw17aqx577v7c4jsl4b5r5iw6293arym8fz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers transformers ];
@@ -136185,8 +126446,6 @@ self: {
        ];
        description = "A haskell wrapper for the Zulip API";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "i18n" = callPackage
@@ -136207,8 +126466,6 @@ self: {
        ];
        description = "Internationalization for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "i3blocks-hs-contrib" = callPackage
@@ -136228,8 +126485,6 @@ self: {
        ];
        description = "Base i3blocks written in haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "i3ipc" = callPackage
@@ -136247,8 +126502,6 @@ self: {
        testHaskellDepends = [ aeson base bytestring hspec ];
        description = "A type-safe wrapper around i3's IPC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iCalendar" = callPackage
@@ -136267,8 +126520,6 @@ self: {
        ];
        description = "iCalendar data types, parser, and printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iException" = callPackage
@@ -136297,8 +126548,6 @@ self: {
        ];
        description = "A simple wrapper of In-App-Purchase receipt validate APIs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ib-api" = callPackage
@@ -136315,8 +126564,6 @@ self: {
        ];
        description = "An API for the Interactive Brokers Trading Workstation written in pure Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iban" = callPackage
@@ -136335,8 +126582,6 @@ self: {
        testHaskellDepends = [ base HUnit tasty tasty-hunit text ];
        description = "Validate and generate IBANs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ibus-hs" = callPackage
@@ -136369,8 +126614,51 @@ self: {
        testHaskellDepends = [ base ];
        description = "iCalendar format parser and org-mode converter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+     }) {};
+
+  "icepeak" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, containers
+     , directory, hashable, hspec, hspec-core, hspec-expectations
+     , hspec-wai, http-types, jwt, monad-logger, mtl, network
+     , optparse-applicative, prometheus-client, prometheus-metrics-ghc
+     , QuickCheck, quickcheck-instances, random, raven-haskell, scotty
+     , securemem, sqlite-simple, stm, text, time, unix
+     , unordered-containers, uuid, wai, wai-extra
+     , wai-middleware-prometheus, wai-websockets, warp, websockets
+     }:
+     mkDerivation {
+       pname = "icepeak";
+       version = "0.7.1.0";
+       sha256 = "1mw6ydcmp7q3qqqv0s86h3vahvsh9nzfi8d0yfwf8ywp6lzwhxfv";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base bytestring containers directory hashable
+         http-types jwt monad-logger mtl network optparse-applicative
+         prometheus-client prometheus-metrics-ghc random raven-haskell
+         scotty securemem sqlite-simple stm text time unix
+         unordered-containers uuid wai wai-extra wai-middleware-prometheus
+         wai-websockets warp websockets
+       ];
+       executableHaskellDepends = [
+         aeson async base bytestring containers directory hashable
+         http-types jwt monad-logger mtl network optparse-applicative
+         prometheus-client prometheus-metrics-ghc random raven-haskell
+         scotty securemem sqlite-simple stm text time unix
+         unordered-containers uuid wai wai-extra wai-middleware-prometheus
+         wai-websockets warp websockets
+       ];
+       testHaskellDepends = [
+         aeson async base bytestring containers directory hashable hspec
+         hspec-core hspec-expectations hspec-wai http-types jwt monad-logger
+         mtl network optparse-applicative prometheus-client
+         prometheus-metrics-ghc QuickCheck quickcheck-instances random
+         raven-haskell scotty securemem sqlite-simple stm text time unix
+         unordered-containers uuid wai wai-extra wai-middleware-prometheus
+         wai-websockets warp websockets
+       ];
+       description = "A fast JSON document store with push notification support";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "icon-fonts" = callPackage
@@ -136409,8 +126697,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Type safe iconv wrapper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ide-backend" = callPackage
@@ -136457,8 +126743,6 @@ self: {
        ];
        description = "An IDE backend library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ide-backend-common" = callPackage
@@ -136483,8 +126767,6 @@ self: {
        ];
        description = "Shared library used be ide-backend and ide-backend-server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ide-backend-rts" = callPackage
@@ -136519,8 +126801,6 @@ self: {
        ];
        description = "An IDE backend server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ideas" = callPackage
@@ -136540,8 +126820,6 @@ self: {
        ];
        description = "Feedback services for intelligent tutoring systems";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ideas-math" = callPackage
@@ -136559,8 +126837,6 @@ self: {
        ];
        description = "Interactive domain reasoner for logic and mathematics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ideas-math-types" = callPackage
@@ -136574,8 +126850,6 @@ self: {
        ];
        description = "Common types for mathematical domain reasoners";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "idempotent" = callPackage
@@ -136588,8 +126862,6 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "Idempotent monoids";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "identicon" = callPackage
@@ -136656,8 +126928,6 @@ self: {
        ];
        description = "Numeric identifiers for values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "idiii" = callPackage
@@ -136683,8 +126953,6 @@ self: {
        ];
        description = "ID3v2 (tagging standard for MP3 files) library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "idna" = callPackage
@@ -136707,8 +126975,6 @@ self: {
        libraryHaskellDepends = [ base punycode split ];
        description = "Converts Unicode hostnames into ASCII";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "idringen" = callPackage
@@ -136795,8 +127061,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "ieee-utils";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ieee-utils-tempfix" = callPackage
@@ -136846,8 +127110,6 @@ self: {
        testHaskellDepends = [ base bytestring HUnit stocks ];
        description = "Library for the IEX Trading API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "if" = callPackage
@@ -136873,8 +127135,6 @@ self: {
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "put if statements within type constraints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iff" = callPackage
@@ -136923,8 +127183,6 @@ self: {
        ];
        description = "Bindings to Instagram's API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ige" = callPackage
@@ -136947,8 +127205,6 @@ self: {
        ];
        description = "An keyboard-driven interactive graph editor";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ige-mac-integration" = callPackage
@@ -136967,8 +127223,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {ige-mac-integration = null;};
 
   "ignore" = callPackage
@@ -136988,8 +127242,6 @@ self: {
        testHaskellDepends = [ base HTF text ];
        description = "Handle ignore files of different VCSes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "igraph" = callPackage
@@ -137007,8 +127259,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to the igraph C library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) igraph;};
 
   "igrf" = callPackage
@@ -137022,8 +127272,6 @@ self: {
        libraryHaskellDepends = [ ad base polynomial ];
        description = "International Geomagnetic Reference Field";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell" = callPackage
@@ -137061,8 +127309,6 @@ self: {
        ];
        description = "A Haskell backend kernel for the IPython project";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-aeson" = callPackage
@@ -137078,8 +127324,6 @@ self: {
        ];
        description = "IHaskell display instances for Aeson";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-basic" = callPackage
@@ -137091,8 +127335,6 @@ self: {
        libraryHaskellDepends = [ base ihaskell ];
        description = "IHaskell display instances for basic types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-blaze" = callPackage
@@ -137104,8 +127346,6 @@ self: {
        libraryHaskellDepends = [ base blaze-html blaze-markup ihaskell ];
        description = "IHaskell display instances for blaze-html types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-charts" = callPackage
@@ -137122,8 +127362,6 @@ self: {
        ];
        description = "IHaskell display instances for charts types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-diagrams" = callPackage
@@ -137140,8 +127378,6 @@ self: {
        ];
        description = "IHaskell display instances for diagram types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-display" = callPackage
@@ -137153,8 +127389,6 @@ self: {
        libraryHaskellDepends = [ base classy-prelude ihaskell ];
        description = "IHaskell display instances for basic types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-gnuplot" = callPackage
@@ -137166,8 +127400,6 @@ self: {
        libraryHaskellDepends = [ base bytestring gnuplot ihaskell ];
        description = "IHaskell display instance for Gnuplot (from gnuplot package)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-graphviz" = callPackage
@@ -137179,8 +127411,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ihaskell process ];
        description = "IHaskell display instance for GraphViz (external binary)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-hatex" = callPackage
@@ -137192,21 +127422,17 @@ self: {
        libraryHaskellDepends = [ base HaTeX ihaskell text ];
        description = "IHaskell display instances for hatex";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-hvega" = callPackage
     ({ mkDerivation, aeson, base, hvega, ihaskell, text }:
      mkDerivation {
        pname = "ihaskell-hvega";
-       version = "0.2.1.0";
-       sha256 = "1zpr00zn3nap5w1baih975r8hvaqqyp7y4acy10p688imicg5wgy";
+       version = "0.2.2.0";
+       sha256 = "1az5jwd3gwv7pmzdd2mgpip4qkxisjq1fgwp1czb7lmmsqwk1jgc";
        libraryHaskellDepends = [ aeson base hvega ihaskell text ];
        description = "IHaskell display instance for hvega types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-inline-r" = callPackage
@@ -137224,8 +127450,6 @@ self: {
        ];
        description = "Embed R quasiquotes and plots in IHaskell notebooks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-juicypixels" = callPackage
@@ -137240,8 +127464,6 @@ self: {
        ];
        description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-magic" = callPackage
@@ -137258,8 +127480,6 @@ self: {
        ];
        description = "IHaskell display instances for bytestrings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-parsec" = callPackage
@@ -137275,8 +127495,6 @@ self: {
        ];
        description = "IHaskell display instances for Parsec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-plot" = callPackage
@@ -137288,8 +127506,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hmatrix ihaskell plot ];
        description = "IHaskell display instance for Plot (from plot package)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-rlangqq" = callPackage
@@ -137307,8 +127523,6 @@ self: {
        ];
        description = "a rDisp quasiquote to show plots from Rlang-QQ in IHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihaskell-widgets" = callPackage
@@ -137326,8 +127540,6 @@ self: {
        ];
        description = "IPython standard widgets for IHaskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ihs" = callPackage
@@ -137359,28 +127571,9 @@ self: {
        executableHaskellDepends = [ base network ];
        description = "Incremental HTTP iteratee";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ilist" = callPackage
-    ({ mkDerivation, base, criterion, hspec, lens, loop, transformers
-     , vector
-     }:
-     mkDerivation {
-       pname = "ilist";
-       version = "0.3.1.0";
-       sha256 = "15zy584mjk85kr69acs1r7dfsr7g2mgy2bbfyrla5rbp23fy3678";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base hspec transformers ];
-       benchmarkHaskellDepends = [
-         base criterion lens loop transformers vector
-       ];
-       description = "Optimised list functions for doing index-related things";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ilist_0_4_0_0" = callPackage
     ({ mkDerivation, base, criterion, hspec, lens, loop, transformers
      , vector
      }:
@@ -137395,7 +127588,6 @@ self: {
        ];
        description = "Optimised list functions for doing index-related things";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "illuminate" = callPackage
@@ -137416,8 +127608,6 @@ self: {
        executableToolDepends = [ alex ];
        description = "A fast syntax highlighting library built with alex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "image-type" = callPackage
@@ -137486,8 +127676,6 @@ self: {
        ];
        description = "Command-line image paste utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imagesize-conduit" = callPackage
@@ -137534,8 +127722,6 @@ self: {
        ];
        description = "An efficient IMAP client library, with SSL and streaming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imapget" = callPackage
@@ -137553,8 +127739,6 @@ self: {
        ];
        description = "Downloads email from imap SSL servers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imbib" = callPackage
@@ -137576,8 +127760,6 @@ self: {
        ];
        description = "Minimalistic reference manager";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imgur" = callPackage
@@ -137613,8 +127795,6 @@ self: {
        ];
        description = "Uploader for Imgur";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imj-animation" = callPackage
@@ -137627,8 +127807,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Animation Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imj-base" = callPackage
@@ -137653,8 +127831,6 @@ self: {
        ];
        description = "Game engine with geometry, easing, animated text, delta rendering";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imj-game-hamazed" = callPackage
@@ -137675,8 +127851,6 @@ self: {
        testHaskellDepends = [ base imj-base mtl text ];
        description = "A game with flying numbers and 8-bit color animations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imj-measure-stdout" = callPackage
@@ -137692,8 +127866,6 @@ self: {
        ];
        description = "An application to determine the maximum capacity of stdout buffer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imj-prelude" = callPackage
@@ -137705,8 +127877,6 @@ self: {
        libraryHaskellDepends = [ base mtl text ];
        description = "Prelude library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imm" = callPackage
@@ -137749,8 +127919,6 @@ self: {
        ];
        description = "Execute arbitrary callbacks for each element of RSS/Atom feeds";
        license = stdenv.lib.licenses.cc0;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "immortal" = callPackage
@@ -137788,8 +127956,6 @@ self: {
        ];
        description = "Multi-platform parser analyzer and generator";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imperative-edsl" = callPackage
@@ -137815,8 +127981,6 @@ self: {
        ];
        description = "Deep embedding of imperative programs with code generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imperative-edsl-vhdl" = callPackage
@@ -137833,8 +127997,6 @@ self: {
        ];
        description = "Deep embedding of VHDL programs with code generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "impl" = callPackage
@@ -137847,8 +128009,6 @@ self: {
        doHaddock = false;
        description = "Framework for defaulting superclasses";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "implicit" = callPackage
@@ -137892,8 +128052,6 @@ self: {
        libraryHaskellDepends = [ base mtl time transformers ];
        description = "A logging framework built around implicit parameters";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "implicit-params" = callPackage
@@ -137905,8 +128063,6 @@ self: {
        libraryHaskellDepends = [ base data-default-class ];
        description = "Named and unnamed implicit parameters with defaults";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "importify" = callPackage
@@ -137939,8 +128095,6 @@ self: {
        ];
        description = "Tool for haskell imports refactoring";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "imports" = callPackage
@@ -137953,8 +128107,6 @@ self: {
        testHaskellDepends = [ base directory filepath mtl ];
        description = "Generate code for importing directories automatically";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "impossible" = callPackage
@@ -138034,8 +128186,6 @@ self: {
        libraryHaskellDepends = [ base mtl yices ];
        description = "An imperative, verifiable programming language for high assurance applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "impure-containers" = callPackage
@@ -138046,10 +128196,8 @@ self: {
      }:
      mkDerivation {
        pname = "impure-containers";
-       version = "0.5.0";
-       sha256 = "0rwk7wsymga61192mmjj42079v209dj9gdcjpwjmji1ivxwzy13p";
-       revision = "1";
-       editedCabalFile = "1lazk77rxrbmkyyrlwvbr25n47n5ncl5r32aiafkjfhv90nl4y2g";
+       version = "0.5.1";
+       sha256 = "15jxnkcmxwcb41zzw2yw00fg2w53iq1li6z432yvvj4hbdn9s90w";
        libraryHaskellDepends = [
          base containers ghc-prim hashable primitive vector
        ];
@@ -138060,8 +128208,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Mutable containers in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "inc-ref" = callPackage
@@ -138095,8 +128241,6 @@ self: {
        ];
        description = "A type-checker for Haskell with integer constraints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "inchworm" = callPackage
@@ -138108,8 +128252,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Simple parser combinators for lexical analysis";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "include-file" = callPackage
@@ -138164,8 +128306,6 @@ self: {
        benchmarkHaskellDepends = [ base containers deepseq QuickCheck ];
        description = "Incremental computing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "incremental-maps" = callPackage
@@ -138189,30 +128329,9 @@ self: {
        ];
        description = "Package for doing incremental computations on maps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "incremental-parser" = callPackage
-    ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
-     , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text
-     }:
-     mkDerivation {
-       pname = "incremental-parser";
-       version = "0.3.3";
-       sha256 = "1y5qzbn1627v893s6nlm5prc507pwybf2f9b7icpjgcj1q046p6i";
-       libraryHaskellDepends = [ base monoid-subclasses ];
-       testHaskellDepends = [
-         base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion deepseq monoid-subclasses text
-       ];
-       description = "Generic parser library capable of providing partial results from partial input";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "incremental-parser_0_4" = callPackage
     ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
      , monoid-subclasses, parsers, QuickCheck, rank2classes, tasty
      , tasty-quickcheck, text, transformers
@@ -138232,7 +128351,6 @@ self: {
        ];
        description = "Generic parser library capable of providing partial results from partial input";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "incremental-sat-solver" = callPackage
@@ -138263,8 +128381,6 @@ self: {
        ];
        description = "type classes for incremental updates to data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "indent" = callPackage
@@ -138393,8 +128509,6 @@ self: {
        ];
        description = "Tools for entity indexation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "indexed" = callPackage
@@ -138408,6 +128522,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "indexed-containers" = callPackage
+    ({ mkDerivation, base, hspec, hspec-discover }:
+     mkDerivation {
+       pname = "indexed-containers";
+       version = "0.1.0.1";
+       sha256 = "0karyvfp49jk5dp4cxvcramf295wjr3xsnh0l9qd0p11vn1h98qk";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       testToolDepends = [ hspec-discover ];
+       description = "Simple, no-frills indexed lists";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "indexed-do-notation" = callPackage
     ({ mkDerivation, base, haskell-src-meta, indexed, template-haskell
      }:
@@ -138481,8 +128608,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "A series of type families and constraints for \"indexable\" types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "indian-language-font-converter" = callPackage
@@ -138509,8 +128634,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Multi-dimensional statically bounded indices";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "indieweb-algorithms" = callPackage
@@ -138536,8 +128659,6 @@ self: {
        ];
        description = "A collection of implementations of IndieWeb algorithms";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "inf-interval" = callPackage
@@ -138550,8 +128671,6 @@ self: {
        testHaskellDepends = [ array base deepseq QuickCheck text vector ];
        description = "Non-contiguous interval data types with potentially infinite ranges";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "infer-license" = callPackage
@@ -138587,8 +128706,6 @@ self: {
        ];
        description = "Find the repository from where a given repo was forked";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "infernal" = callPackage
@@ -138607,8 +128724,6 @@ self: {
        ];
        description = "The Infernal Machine - An AWS Lambda Custom Runtime for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "infernu" = callPackage
@@ -138629,8 +128744,6 @@ self: {
        executableHaskellDepends = [ base optparse-applicative parsec ];
        description = "Type inference and checker for JavaScript (experimental)";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "infinite-search" = callPackage
@@ -138657,8 +128770,6 @@ self: {
          base binary Cabal filepath ghc irc plugins
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "infix" = callPackage
@@ -138670,8 +128781,6 @@ self: {
        libraryHaskellDepends = [ base containers haskell-src ];
        description = "Infix expression re-parsing (for HsParser library)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "inflections" = callPackage
@@ -138703,8 +128812,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "An infinite list type and operations thereon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "influxdb" = callPackage
@@ -138716,8 +128823,8 @@ self: {
      }:
      mkDerivation {
        pname = "influxdb";
-       version = "1.7.1.1";
-       sha256 = "15qzlbgnplxc53l5134igf6yplxg4fgblx0s8bl8hfjh0gbnn8x8";
+       version = "1.7.1.2";
+       sha256 = "01rjbavv9b4gay4bvmxxljvps591xvp7lrx68658xkjwfi2phzhs";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -138760,8 +128867,6 @@ self: {
        ];
        description = "A yesod subsite serving a wiki";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ini" = callPackage
@@ -138792,8 +128897,6 @@ self: {
        testHaskellDepends = [ base HUnit ini raw-strings-qq text ];
        description = "Quasiquoter for INI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "inilist" = callPackage
@@ -138813,8 +128916,6 @@ self: {
        ];
        description = "Processing for .ini files with duplicate sections and options";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "initialize" = callPackage
@@ -138877,8 +128978,29 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Monadic functions with injected parameters";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+     }) {};
+
+  "inline-asm" = callPackage
+    ({ mkDerivation, base, ghc-prim, hspec, QuickCheck
+     , template-haskell, uniplate
+     }:
+     mkDerivation {
+       pname = "inline-asm";
+       version = "0.1.1.0";
+       sha256 = "074kf9mjcm7rjcba2g25brxkvzy1psphbkwfiqc2mpznam0f2n27";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base ghc-prim template-haskell uniplate
+       ];
+       executableHaskellDepends = [
+         base ghc-prim template-haskell uniplate
+       ];
+       testHaskellDepends = [
+         base ghc-prim hspec QuickCheck template-haskell uniplate
+       ];
+       description = "Inline some Assembly in ur Haskell!";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "inline-c_0_5_6_1" = callPackage
@@ -138911,31 +129033,6 @@ self: {
      }) {};
 
   "inline-c" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
-     , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq
-     , regex-posix, template-haskell, transformers, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "inline-c";
-       version = "0.7.0.1";
-       sha256 = "19scbviwiv1fbsdcjji3dscjg7w0xa8r97xwkqqrwm7zhvrg5wns";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-wl-pprint base bytestring containers hashable mtl parsec
-         parsers template-haskell transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         ansi-wl-pprint base containers hashable hspec parsers QuickCheck
-         raw-strings-qq regex-posix template-haskell transformers
-         unordered-containers vector
-       ];
-       description = "Write Haskell source files including C code inline. No FFI required.";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "inline-c_0_9_0_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
      , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq
      , regex-posix, split, template-haskell, transformers
@@ -138958,7 +129055,6 @@ self: {
        ];
        description = "Write Haskell source files including C code inline. No FFI required.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inline-c-cpp_0_1_0_0" = callPackage
@@ -138975,22 +129071,6 @@ self: {
      }) {};
 
   "inline-c-cpp" = callPackage
-    ({ mkDerivation, base, hspec, inline-c, safe-exceptions
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "inline-c-cpp";
-       version = "0.3.0.3";
-       sha256 = "1sxwx9dh60qfpa72dymj015zwd6prhb70x5mkabqzi7nhg3aakln";
-       libraryHaskellDepends = [
-         base inline-c safe-exceptions template-haskell
-       ];
-       testHaskellDepends = [ base hspec inline-c safe-exceptions ];
-       description = "Lets you embed C++ code into Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "inline-c-cpp_0_4_0_2" = callPackage
     ({ mkDerivation, base, containers, hspec, inline-c, safe-exceptions
      , template-haskell
      }:
@@ -139006,7 +129086,6 @@ self: {
        ];
        description = "Lets you embed C++ code into Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inline-c-win32" = callPackage
@@ -139040,8 +129119,6 @@ self: {
        testHaskellDepends = [ base hspec jni jvm text ];
        description = "Java interop via inline Java code in Haskell modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "inline-r" = callPackage
@@ -139114,30 +129191,6 @@ self: {
      }) {aether = null;};
 
   "insert-ordered-containers" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, hashable, lens
-     , QuickCheck, semigroupoids, semigroups, tasty, tasty-quickcheck
-     , text, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "insert-ordered-containers";
-       version = "0.2.2";
-       sha256 = "1ikjhg0pdfpnx1d645r92k2dwlk7y935j1w5lcsk23nzpwhbkxja";
-       revision = "1";
-       editedCabalFile = "1hlinc8nnjlzc6ds3wf8jvkihpcbhz2dk0rqxq1ns0c5zbbhnylq";
-       libraryHaskellDepends = [
-         aeson base base-compat hashable lens semigroupoids semigroups text
-         transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base base-compat hashable lens QuickCheck semigroupoids
-         semigroups tasty tasty-quickcheck text transformers
-         unordered-containers
-       ];
-       description = "Associative containers retaining insertion order for traversals";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "insert-ordered-containers_0_2_3" = callPackage
     ({ mkDerivation, aeson, base, base-compat, hashable, lens
      , optics-core, optics-extra, QuickCheck, semigroupoids, semigroups
      , tasty, tasty-quickcheck, text, transformers, unordered-containers
@@ -139157,7 +129210,6 @@ self: {
        ];
        description = "Associative containers retaining insertion order for traversals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inserts" = callPackage
@@ -139169,8 +129221,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring dlist ];
        description = "Stupid simple bytestring templates";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "inspection-proxy" = callPackage
@@ -139226,8 +129276,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Create benchmarks from the HAR files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "instana-haskell-trace-sdk" = callPackage
@@ -139262,8 +129310,6 @@ self: {
        ];
        description = "SDK for adding custom Instana tracing support to Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "instance-control" = callPackage
@@ -139307,8 +129353,6 @@ self: {
        ];
        description = "Generic Aeson instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "instant-bytes" = callPackage
@@ -139325,8 +129369,6 @@ self: {
        ];
        description = "Generic Serial instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "instant-deepseq" = callPackage
@@ -139338,8 +129380,6 @@ self: {
        libraryHaskellDepends = [ base deepseq instant-generics ];
        description = "Generic NFData instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "instant-generics" = callPackage
@@ -139353,8 +129393,6 @@ self: {
        libraryHaskellDepends = [ base containers syb template-haskell ];
        description = "Generic programming library with a sum of products view";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "instant-hashable" = callPackage
@@ -139366,8 +129404,6 @@ self: {
        libraryHaskellDepends = [ base hashable instant-generics ];
        description = "Generic Hashable instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "instant-zipper" = callPackage
@@ -139381,8 +129417,6 @@ self: {
        libraryHaskellDepends = [ base instant-generics mtl ];
        description = "Heterogenous Zipper in Instant Generics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "instapaper-sender" = callPackage
@@ -139402,8 +129436,6 @@ self: {
        ];
        description = "Basic HTTP gateway to save articles to Instapaper";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "instinct" = callPackage
@@ -139415,8 +129447,6 @@ self: {
        libraryHaskellDepends = [ base containers mersenne-random vector ];
        description = "Fast artifical neural networks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "instrument-chord" = callPackage
@@ -139467,8 +129497,6 @@ self: {
        ];
        description = "A data structure that associates each Int key with a set of values";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "intcode" = callPackage
@@ -139481,8 +129509,6 @@ self: {
        testHaskellDepends = [ base containers doctest primitive ];
        description = "Advent of Code 2019 intcode interpreter";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "integer-gmp_1_0_2_0" = callPackage
@@ -139525,8 +129551,22 @@ self: {
        sha256 = "0lrhf6mw90bfph3hbyxv3n7g2n2xnjfq4qnhyhw4ml76k4yybmxa";
        description = "A pure-Haskell implementation of arbitrary-precision Integers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+     }) {};
+
+  "integer-roots" = callPackage
+    ({ mkDerivation, base, integer-gmp, smallcheck, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "integer-roots";
+       version = "1.0";
+       sha256 = "12570cr39jj5lk30ls5nnc0w6881l0kflzhmwpk35qc7m39pjgy1";
+       libraryHaskellDepends = [ base integer-gmp ];
+       testHaskellDepends = [
+         base smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck
+       ];
+       description = "Integer roots and perfect powers";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "integer-simple" = callPackage
@@ -139575,8 +129615,6 @@ self: {
        ];
        description = "Integrate different assays";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "intel-aes" = callPackage
@@ -139595,8 +129633,6 @@ self: {
        librarySystemDepends = [ intel_aes ];
        description = "Hardware accelerated AES encryption and Random Number Generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {intel_aes = null;};
 
   "interactive-plot" = callPackage
@@ -139728,8 +129764,6 @@ self: {
        ];
        description = "Shell command for constructing custom stamps for German Post";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "intero" = callPackage
@@ -139756,8 +129790,6 @@ self: {
        ];
        description = "Complete interactive development program for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "interp" = callPackage
@@ -139812,8 +129844,6 @@ self: {
        ];
        description = "GHC preprocessor and library to enable variable interpolation in strings";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "interpolate" = callPackage
@@ -139863,8 +129893,6 @@ self: {
        ];
        description = "QuasiQuoter for Ruby-style multi-line interpolated strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "interpolatedstring-qq-mwotton" = callPackage
@@ -139880,8 +129908,6 @@ self: {
        ];
        description = "DO NOT USE THIS. interpolatedstring-qq works now.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "interpolatedstring-qq2" = callPackage
@@ -139969,8 +129995,6 @@ self: {
        testHaskellDepends = [ base Cabal either transformers ];
        description = "Monad transformers that can be run and resumed later, conserving their context";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "interspersed" = callPackage
@@ -139996,31 +130020,9 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Intervals with adherences";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "intervals" = callPackage
-    ({ mkDerivation, array, base, Cabal, cabal-doctest, directory
-     , distributive, doctest, filepath, ghc-prim, QuickCheck
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "intervals";
-       version = "0.8.1";
-       sha256 = "00vyxf3ba9d7aas3npfapr53w71fslgh69fczjb25axr66fvzqww";
-       revision = "4";
-       editedCabalFile = "1qx3q0v13l1zaln9zdk8chxpxhshbz5x0vqm0qda7d1kpv7h6a7r";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [ array base distributive ghc-prim ];
-       testHaskellDepends = [
-         base directory doctest filepath QuickCheck template-haskell
-       ];
-       description = "Interval Arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "intervals_0_9_1" = callPackage
     ({ mkDerivation, array, base, Cabal, cabal-doctest, directory
      , distributive, doctest, filepath, ghc-prim, QuickCheck
      , template-haskell
@@ -140036,15 +130038,14 @@ self: {
        ];
        description = "Interval Arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "intmap-graph" = callPackage
     ({ mkDerivation, base, containers, text, vector, word8 }:
      mkDerivation {
        pname = "intmap-graph";
-       version = "1.0.0.1";
-       sha256 = "0mrwimi4r1y60l674w8vavv4c5fzqm6v1f71hkcvxkwa3fpl56m6";
+       version = "1.1.0.0";
+       sha256 = "0yg88vvq53kbzw2r8i1w1g4am4bkp8qzgy9qsc7wknb3zwlzs89w";
        libraryHaskellDepends = [ base containers text vector word8 ];
        description = "A graph library that allows to explore edges after their type";
        license = stdenv.lib.licenses.bsd3;
@@ -140089,30 +130090,6 @@ self: {
      }) {};
 
   "intro" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, dlist
-     , extra, hashable, lens, mtl, QuickCheck, safe, text, transformers
-     , unordered-containers, writer-cps-mtl
-     }:
-     mkDerivation {
-       pname = "intro";
-       version = "0.5.2.1";
-       sha256 = "0i5cpa5jx82nb1gi1wdhgnbmxlb7s4nbya46k6byajf7g50i5qp8";
-       revision = "1";
-       editedCabalFile = "19zndrl4rgzjrg97cbc2cyiqih15gaijgibz0vppphcbmn7v9fl8";
-       libraryHaskellDepends = [
-         base bytestring containers deepseq dlist extra hashable mtl safe
-         text transformers unordered-containers writer-cps-mtl
-       ];
-       testHaskellDepends = [
-         base bytestring containers deepseq dlist extra hashable lens mtl
-         QuickCheck safe text transformers unordered-containers
-         writer-cps-mtl
-       ];
-       description = "Safe and minimal prelude";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "intro_0_6_0_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, dlist
      , extra, hashable, lens, mtl, QuickCheck, safe, text, transformers
      , unordered-containers, writer-cps-mtl
@@ -140132,7 +130109,6 @@ self: {
        ];
        description = "Safe and minimal prelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "intro-prelude" = callPackage
@@ -140148,8 +130124,6 @@ self: {
        doHaddock = false;
        description = "Intro reexported as Prelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "introduction" = callPackage
@@ -140170,8 +130144,6 @@ self: {
        ];
        description = "A prelude for safe new projects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "introduction-test" = callPackage
@@ -140191,8 +130163,6 @@ self: {
        ];
        description = "A prelude for the tests of safe new projects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "intset" = callPackage
@@ -140204,8 +130174,6 @@ self: {
        libraryHaskellDepends = [ base bits-extras bytestring deepseq ];
        description = "Pure, mergeable, succinct Int sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "intset-imperative" = callPackage
@@ -140297,8 +130265,6 @@ self: {
        libraryHaskellDepends = [ base HList invertible ];
        description = "invertible functions and instances for HList";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "invertible-hxt" = callPackage
@@ -140341,8 +130307,6 @@ self: {
        ];
        description = "Capture IO actions' stdout and stderr";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "io-choice" = callPackage
@@ -140413,8 +130377,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "An API for generating TIMBER style reactive objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "io-region" = callPackage
@@ -140563,8 +130525,6 @@ self: {
        ];
        description = "EDSL for concurrent, realtime, embedded programming on top of Ivory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ioref-stable" = callPackage
@@ -140587,8 +130547,6 @@ self: {
        libraryHaskellDepends = [ base bytestring path text ];
        description = "A class of strings that can be involved in IO";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iothread" = callPackage
@@ -140600,8 +130558,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "run IOs in a single thread";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iotransaction" = callPackage
@@ -140613,41 +130569,9 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Supports the automatic undoing of IO operations when an exception is thrown";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ip" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
-     , deepseq, doctest, hashable, hspec, hspec-discover, HUnit
-     , primitive, QuickCheck, quickcheck-classes, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text, vector
-     , wide-word
-     }:
-     mkDerivation {
-       pname = "ip";
-       version = "1.5.1";
-       sha256 = "1crnn76vxhqq13556nc0537bh8xi5jzklyp24dqqfamxmfbwkzll";
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring deepseq hashable primitive text
-         vector wide-word
-       ];
-       testHaskellDepends = [
-         attoparsec base bytestring doctest hspec HUnit QuickCheck
-         quickcheck-classes test-framework test-framework-hunit
-         test-framework-quickcheck2 text wide-word
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         attoparsec base bytestring criterion text
-       ];
-       description = "Library for IP and MAC addresses";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "ip_1_7_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, byteslice, bytesmith
      , bytestring, criterion, deepseq, doctest, hashable, hspec
      , hspec-discover, HUnit, natural-arithmetic, primitive, QuickCheck
@@ -140676,8 +130600,6 @@ self: {
        ];
        description = "Library for IP and MAC addresses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ip-quoter" = callPackage
@@ -140703,8 +130625,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring iproute ];
        description = "IP2Location Haskell package for IP geolocation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ip2proxy" = callPackage
@@ -140716,8 +130636,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring iproute ];
        description = "IP2Proxy Haskell package for proxy detection";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ip6addr" = callPackage
@@ -140749,8 +130667,6 @@ self: {
        ];
        description = "interactive patch editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ipc" = callPackage
@@ -140766,8 +130682,6 @@ self: {
        ];
        description = "High level inter-process communication library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ipcvar" = callPackage
@@ -140810,8 +130724,6 @@ self: {
        ];
        description = "Access IPFS locally and remotely";
        license = stdenv.lib.licenses.agpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ipfs-api" = callPackage
@@ -140848,8 +130760,6 @@ self: {
        ];
        description = "IPLD Content-IDentifiers <https://github.com/ipld/cid>";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ipopt-hs" = callPackage
@@ -140871,8 +130781,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "haskell binding to ipopt and nlopt including automatic differentiation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) ipopt; inherit (pkgs) nlopt;};
 
   "ipprint" = callPackage
@@ -140884,8 +130792,6 @@ self: {
        libraryHaskellDepends = [ base haskell-src sr-extra ];
        description = "Tiny helper for pretty-printing values in ghci console";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iproute" = callPackage
@@ -140923,8 +130829,6 @@ self: {
        executableHaskellDepends = [ base QuickCheck syb ];
        description = "iptables rules parser/printer library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iptadmin" = callPackage
@@ -140949,8 +130853,6 @@ self: {
        ];
        description = "web-interface for iptables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ipynb" = callPackage
@@ -141125,8 +131027,6 @@ self: {
        ];
        description = "A DCC message parsing and helper library for IRC clients";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "irc-fun-bot" = callPackage
@@ -141147,8 +131047,6 @@ self: {
        ];
        description = "Library for writing fun IRC bots";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "irc-fun-client" = callPackage
@@ -141167,8 +131065,6 @@ self: {
        ];
        description = "Another library for writing IRC clients";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "irc-fun-color" = callPackage
@@ -141185,8 +131081,6 @@ self: {
        testHaskellDepends = [ base text ];
        description = "Add color and style decorations to IRC messages";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "irc-fun-messages" = callPackage
@@ -141200,8 +131094,6 @@ self: {
        ];
        description = "Types and functions for working with the IRC protocol";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "irc-fun-types" = callPackage
@@ -141213,8 +131105,6 @@ self: {
        libraryHaskellDepends = [ base hashable text ];
        description = "Common types for IRC related packages";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ircbot" = callPackage
@@ -141237,8 +131127,6 @@ self: {
        ];
        description = "A library for writing IRC bots";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ircbouncer" = callPackage
@@ -141287,8 +131175,6 @@ self: {
        ];
        description = "RFC-based resource identifier library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iridium" = callPackage
@@ -141316,8 +131202,6 @@ self: {
        ];
        description = "Automated Local Cabal Package Testing and Uploading";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iron-mq" = callPackage
@@ -141329,8 +131213,6 @@ self: {
        libraryHaskellDepends = [ aeson base http-client lens text wreq ];
        description = "Iron.IO message queueing client library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ironforge" = callPackage
@@ -141353,8 +131235,6 @@ self: {
        ];
        description = "A technical demo for Antisplice";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "irt" = callPackage
@@ -141366,8 +131246,6 @@ self: {
        libraryHaskellDepends = [ ad base data-default-class statistics ];
        description = "Item Response Theory functions for use in computerized adaptive testing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "is" = callPackage
@@ -141399,8 +131277,6 @@ self: {
        ];
        description = "An executable and library to determine if a file is a DICOM file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "isevaluated" = callPackage
@@ -141412,8 +131288,6 @@ self: {
        libraryHaskellDepends = [ base vacuum ];
        description = "Check whether a value has been evaluated";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "isiz" = callPackage
@@ -141454,8 +131328,6 @@ self: {
        ];
        description = "Advanced ESMTP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iso3166-country-codes" = callPackage
@@ -141515,8 +131387,6 @@ self: {
        ];
        description = "Types and parser for ISO8601 durations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iso8601-time" = callPackage
@@ -141578,8 +131448,6 @@ self: {
        ];
        description = "A (bytestring-) builder for the ISO-14496-12 base media file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "isohunt" = callPackage
@@ -141596,8 +131464,6 @@ self: {
        ];
        description = "Bindings to the isoHunt torrent search API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "isotope" = callPackage
@@ -141616,8 +131482,6 @@ self: {
        ];
        description = "Isotopic masses and relative abundances";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ispositive" = callPackage
@@ -141666,8 +131530,6 @@ self: {
        ];
        description = "Issue Tracker for the CLI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "itemfield" = callPackage
@@ -141695,8 +131557,6 @@ self: {
        ];
        description = "A brick Widget for selectable summary of many elements on a terminal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iter-stats" = callPackage
@@ -141715,8 +131575,6 @@ self: {
        ];
        description = "iteratees for statistical processing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iterIO" = callPackage
@@ -141735,8 +131593,6 @@ self: {
        librarySystemDepends = [ zlib ];
        description = "Iteratee-based IO with pipe operators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "iterable" = callPackage
@@ -141780,8 +131636,6 @@ self: {
        ];
        description = "Iteratee-based I/O";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iteratee-compress" = callPackage
@@ -141794,8 +131648,6 @@ self: {
        librarySystemDepends = [ bzip2 zlib ];
        description = "Enumeratees for compressing and decompressing streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) bzip2; inherit (pkgs) zlib;};
 
   "iteratee-mtl" = callPackage
@@ -141813,8 +131665,6 @@ self: {
        ];
        description = "Iteratee-based I/O";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iteratee-parsec" = callPackage
@@ -141830,8 +131680,6 @@ self: {
        ];
        description = "Package allowing parsec parser initeratee";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iteratee-stm" = callPackage
@@ -141845,8 +131693,6 @@ self: {
        ];
        description = "Concurrent iteratees using STM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iterio-server" = callPackage
@@ -141863,8 +131709,6 @@ self: {
        ];
        description = "Library for building servers with IterIO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iterm-show" = callPackage
@@ -141923,8 +131767,6 @@ self: {
        ];
        description = "Intervals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivar-simple" = callPackage
@@ -141954,8 +131796,6 @@ self: {
        ];
        description = "Theorem proving library based on dependent type theory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory" = callPackage
@@ -141974,8 +131814,6 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Safe embedded C programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory-artifact" = callPackage
@@ -142011,8 +131849,6 @@ self: {
        ];
        description = "Ivory C backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory-bitdata" = callPackage
@@ -142031,8 +131867,6 @@ self: {
        executableHaskellDepends = [ base ivory ivory-backend-c ];
        description = "Ivory bit-data support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory-eval" = callPackage
@@ -142051,8 +131885,6 @@ self: {
        ];
        description = "Simple concrete evaluator for Ivory programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory-examples" = callPackage
@@ -142075,8 +131907,6 @@ self: {
        ];
        description = "Ivory examples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory-hw" = callPackage
@@ -142089,8 +131919,6 @@ self: {
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        description = "Ivory hardware model (STM32F4)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory-opts" = callPackage
@@ -142107,8 +131935,6 @@ self: {
        ];
        description = "Ivory compiler optimizations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory-quickcheck" = callPackage
@@ -142130,8 +131956,6 @@ self: {
        ];
        description = "QuickCheck driver for Ivory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory-serialize" = callPackage
@@ -142148,8 +131972,6 @@ self: {
        ];
        description = "Serialization library for Ivory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivory-stdlib" = callPackage
@@ -142162,8 +131984,6 @@ self: {
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        description = "Ivory standard library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ivy-web" = callPackage
@@ -142179,8 +131999,6 @@ self: {
        ];
        description = "A lightweight web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iwlib" = callPackage
@@ -142196,17 +132014,18 @@ self: {
      }) {inherit (pkgs) wirelesstools;};
 
   "ix" = callPackage
-    ({ mkDerivation, base, base-unicode-symbols, criterion, smallcheck
-     , tasty, tasty-smallcheck, util
+    ({ mkDerivation, base, base-unicode-symbols, category, criterion
+     , smallcheck, tasty, tasty-smallcheck, transformers, util
      }:
      mkDerivation {
        pname = "ix";
-       version = "0.1.0.0";
-       sha256 = "135ksmyzk6d4sgw7na08cav56667hvlnpcvx14a5mf0ap89s63mg";
-       libraryHaskellDepends = [ base base-unicode-symbols util ];
+       version = "0.1.1.0";
+       sha256 = "0y3nvh2r4vpjn77innf8h0s6q89h1zk7yg8gbjnvz9482np44xam";
+       libraryHaskellDepends = [
+         base base-unicode-symbols category transformers util
+       ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        benchmarkHaskellDepends = [ base criterion ];
-       doHaddock = false;
        description = "Indexed monads";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -142233,8 +132052,6 @@ self: {
        executableHaskellDepends = [ base preprocessor-tools syb ];
        description = "A preprocessor for expanding \"ixdo\" notation for indexed monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ixmonad" = callPackage
@@ -142248,8 +132065,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Embeds effect systems into Haskell using parameteric effect monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ixset" = callPackage
@@ -142305,8 +132120,6 @@ self: {
        ];
        description = "A shallow embedding of the OpenGL Shading Language in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "iyql" = callPackage
@@ -142326,8 +132139,6 @@ self: {
        ];
        description = "CLI (command line interface) to YQL";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "j2hs" = callPackage
@@ -142348,8 +132159,6 @@ self: {
        ];
        description = "j2hs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ja-base-extra" = callPackage
@@ -142394,8 +132203,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "DEPRECATED Bindings to the JACK Audio Connection Kit";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libjack2;};
 
   "jackminimix" = callPackage
@@ -142407,8 +132214,6 @@ self: {
        libraryHaskellDepends = [ base hosc ];
        description = "control JackMiniMix";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jacobi-roots" = callPackage
@@ -142421,8 +132226,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Roots of two shifted Jacobi polynomials (Legendre and Radau) to double precision";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jaeger-flamegraph" = callPackage
@@ -142448,8 +132251,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Generate flamegraphs from Jaeger .json dumps.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jail" = callPackage
@@ -142465,8 +132266,6 @@ self: {
        ];
        description = "Jailed IO monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jailbreak-cabal" = callPackage
@@ -142494,8 +132293,6 @@ self: {
        benchmarkHaskellDepends = [ base deepseq time ];
        description = "Convert Jalaali and Gregorian calendar systems to each other";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jalla" = callPackage
@@ -142518,8 +132315,6 @@ self: {
        ];
        description = "Higher level functions for linear algebra. Wraps BLAS and LAPACKE.";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) blas; cblas = null; lapacke = null;};
 
   "jammittools" = callPackage
@@ -142585,8 +132380,6 @@ self: {
        ];
        description = "Tool for searching java classes, members and fields in classfiles and JAR archives";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jarify" = callPackage
@@ -142608,8 +132401,6 @@ self: {
        doHaddock = false;
        description = "Jarification of Haskell sources";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jason" = callPackage
@@ -142629,8 +132420,6 @@ self: {
        testHaskellDepends = [ aeson base bytestring text ];
        description = "A fast JASONETTE-iOS JSON combinator library for haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "java-adt" = callPackage
@@ -142670,8 +132459,6 @@ self: {
        ];
        description = "Bindings to the JNI and a high level interface generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "java-bridge-extras" = callPackage
@@ -142683,8 +132470,6 @@ self: {
        libraryHaskellDepends = [ base java-bridge transformers ];
        description = "Utilities for working with the java-bridge package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "java-character" = callPackage
@@ -142696,8 +132481,6 @@ self: {
        libraryHaskellDepends = [ base diet ];
        description = "Functions to simulate Java's Character class";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "java-poker" = callPackage
@@ -142723,8 +132506,6 @@ self: {
        libraryHaskellDepends = [ base containers hx java-bridge ];
        description = "Tools for reflecting on Java classes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "javaclass" = callPackage
@@ -142767,8 +132548,6 @@ self: {
        testHaskellDepends = [ aeson base scotty stm text time wai-extra ];
        description = "Remote Monad for JavaScript on the browser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "javascript-extras" = callPackage
@@ -142789,8 +132568,6 @@ self: {
        executableHaskellDepends = [ base ghcjs-base-stub ];
        description = "Extra javascript functions when using GHCJS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "javasf" = callPackage
@@ -142811,8 +132588,6 @@ self: {
        ];
        description = "A utility to print the SourceFile attribute of one or more Java class files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "javav" = callPackage
@@ -142829,8 +132604,6 @@ self: {
        ];
        description = "A utility to print the target version of Java class files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jbi" = callPackage
@@ -142852,8 +132625,6 @@ self: {
        ];
        description = "Just Build It - a \"do what I mean\" abstraction for Haskell build tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jcdecaux-vls" = callPackage
@@ -142869,8 +132640,6 @@ self: {
        ];
        description = "JCDecaux self-service bicycles API client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jdi" = callPackage
@@ -142889,8 +132658,6 @@ self: {
        executableHaskellDepends = [ base mtl network ];
        description = "Implementation of Java Debug Interface";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jenga" = callPackage
@@ -142912,8 +132679,6 @@ self: {
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "Generate a cabal freeze file from a stack.yaml";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jenkinsPlugins2nix" = callPackage
@@ -142937,8 +132702,6 @@ self: {
        testHaskellDepends = [ base containers tasty-hspec text ];
        description = "Generate nix for Jenkins plugins";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jespresso" = callPackage
@@ -142968,8 +132731,6 @@ self: {
        ];
        description = "Extract all JavaScript from an HTML page and consolidate it in one script";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jinquantities" = callPackage
@@ -142992,8 +132753,6 @@ self: {
        ];
        description = "Unit conversion and manipulation library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jira-wiki-markup" = callPackage
@@ -143035,8 +132794,6 @@ self: {
        ];
        description = "QuasiQuotation library for programmatic generation of Javascript code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jmacro-rpc" = callPackage
@@ -143055,8 +132812,6 @@ self: {
        ];
        description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jmacro-rpc-happstack" = callPackage
@@ -143073,8 +132828,6 @@ self: {
        ];
        description = "Happstack backend for jmacro-rpc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jmacro-rpc-snap" = callPackage
@@ -143090,8 +132843,6 @@ self: {
        ];
        description = "Snap backend for jmacro-rpc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jml-web-service" = callPackage
@@ -143112,8 +132863,6 @@ self: {
        testHaskellDepends = [ base protolude tasty ];
        description = "Common utilities for running a web service";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jmonkey" = callPackage
@@ -143126,8 +132875,6 @@ self: {
        testHaskellDepends = [ base casing free jmacro ];
        description = "Jmonkey is very restricted but handy EDSL for JavaScript";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jni" = callPackage
@@ -143146,8 +132893,6 @@ self: {
        libraryToolDepends = [ cpphs ];
        description = "Complete JNI raw bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) jdk;};
 
   "jobqueue" = callPackage
@@ -143173,8 +132918,6 @@ self: {
        ];
        description = "A job queue library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jobs-ui" = callPackage
@@ -143195,8 +132938,6 @@ self: {
        ];
        description = "A library for creating a jobs management website running custom jobs";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "join" = callPackage
@@ -143209,8 +132950,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 multisetrewrite stm ];
        description = "Parallel Join Patterns with Guards and Propagation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "join-api" = callPackage
@@ -143224,8 +132963,6 @@ self: {
        ];
        description = "Bindings for Join push notifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "joinlist" = callPackage
@@ -143237,16 +132974,14 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Join list - symmetric list type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "joint" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "joint";
-       version = "0.1.5";
-       sha256 = "065n7na9064l50xsh1lf4qkzpa7360can0axncl49d6gcxk1gh1i";
+       version = "0.1.6";
+       sha256 = "17vqr8r338ikvqsvrqqs7k93z54g60ibg9x4by34aqjahh5l5gby";
        libraryHaskellDepends = [ base ];
        description = "Trying to compose non-composable";
        license = stdenv.lib.licenses.bsd3;
@@ -143265,20 +133000,18 @@ self: {
        ];
        description = "An implementation of the Jonathan's Card API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jord" = callPackage
-    ({ mkDerivation, base, criterion, haskeline, hspec, HUnit }:
+    ({ mkDerivation, base, criterion, hspec, HUnit }:
      mkDerivation {
        pname = "jord";
-       version = "0.6.0.0";
-       sha256 = "17nac3r71fz0acna1229r5ga5jdi4khnfljf23jblay6rphba7i6";
+       version = "1.0.0.0";
+       sha256 = "0fqc74l2n6z79rdg22svk94k5a2yw8r8djdbd94afjqpyq05dbcq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
-       executableHaskellDepends = [ base criterion haskeline ];
+       executableHaskellDepends = [ base criterion ];
        testHaskellDepends = [ base hspec HUnit ];
        description = "Geographical Position Calculations";
        license = stdenv.lib.licenses.bsd3;
@@ -143379,8 +133112,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A library for decoding JPEG files written in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jps" = callPackage
@@ -143429,8 +133160,6 @@ self: {
        libraryHaskellDepends = [ base wl-pprint ];
        description = "Javascript: The Good Parts -- AST & Pretty Printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "js-jquery" = callPackage
@@ -143510,8 +133239,6 @@ self: {
        executableHaskellDepends = [ base jsaddle lens text ];
        description = "JSaddle Hello World, an example package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jsaddle-warp" = callPackage
@@ -143538,8 +133265,6 @@ self: {
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jsaddle-webkit2gtk" = callPackage
@@ -143595,8 +133320,6 @@ self: {
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jsc" = callPackage
@@ -143625,28 +133348,9 @@ self: {
        libraryHaskellDepends = [ base DOM mtl WebBits ];
        description = "Javascript Monadic Writer base package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, mtl, parsec
-     , pretty, syb, text
-     }:
-     mkDerivation {
-       pname = "json";
-       version = "0.9.3";
-       sha256 = "1z8s3mfg76p2flqqd2wqsi96l5bg8k8w8m58zlv81pw3k7h1vbwb";
-       revision = "2";
-       editedCabalFile = "0iqmwfq6s1fc8jj16yx2d7jpzf94scd1hc4yvz281zxj7kds2ms5";
-       libraryHaskellDepends = [
-         array base bytestring containers mtl parsec pretty syb text
-       ];
-       description = "Support for serialising Haskell to and from JSON";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "json_0_10" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, mtl, parsec
      , pretty, syb, text
      }:
@@ -143659,7 +133363,6 @@ self: {
        ];
        description = "Support for serialising Haskell to and from JSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-alt" = callPackage
@@ -143714,8 +133417,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Utilities for generating JSON-API payloads";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-assertions" = callPackage
@@ -143763,8 +133464,6 @@ self: {
        ];
        description = "Encoders of JSON AST";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-ast-quickcheck" = callPackage
@@ -143779,8 +133478,6 @@ self: {
        ];
        description = "Compatibility layer for \"json-ast\" and \"QuickCheck\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-autotype" = callPackage
@@ -143837,8 +133534,6 @@ self: {
        ];
        description = "JSON parser that uses byte strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-builder" = callPackage
@@ -143857,8 +133552,6 @@ self: {
        ];
        description = "Data structure agnostic JSON serialization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-bytes-builder" = callPackage
@@ -143876,8 +133569,6 @@ self: {
        benchmarkHaskellDepends = [ aeson criterion rebase ];
        description = "Direct-to-bytes JSON Builder";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-directory" = callPackage
@@ -143930,8 +133621,6 @@ self: {
        ];
        description = "Pure-Haskell utilities for dealing with JSON with the enumerator package. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-extra" = callPackage
@@ -143948,8 +133637,6 @@ self: {
        ];
        description = "Utility functions to extend Aeson";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-feed" = callPackage
@@ -143990,8 +133677,6 @@ self: {
        ];
        description = "Generic JSON serialization / deserialization";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-incremental-decoder" = callPackage
@@ -144016,8 +133701,6 @@ self: {
        ];
        description = "Incremental JSON parser with early termination and a declarative DSL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-litobj" = callPackage
@@ -144030,8 +133713,6 @@ self: {
        testHaskellDepends = [ base hspec json QuickCheck ];
        description = "Extends Text.JSON to handle literal JS objects.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-pointer" = callPackage
@@ -144076,8 +133757,6 @@ self: {
        ];
        description = "JSON Pointer extensions for Hasql";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-pointy" = callPackage
@@ -144118,8 +133797,6 @@ self: {
        libraryPkgconfigDepends = [ python ];
        description = "Call python inline from haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) python;};
 
   "json-qq" = callPackage
@@ -144264,8 +133941,6 @@ self: {
        ];
        description = "Types and type classes for defining JSON schemas";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-sop" = callPackage
@@ -144345,8 +134020,6 @@ self: {
        ];
        description = "High-performance JSON parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-togo" = callPackage
@@ -144364,8 +134037,6 @@ self: {
        ];
        description = "Effectful parsing of JSON documents";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-tokens" = callPackage
@@ -144393,8 +134064,6 @@ self: {
        ];
        description = "Tokenize JSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-tools" = callPackage
@@ -144414,8 +134083,6 @@ self: {
        ];
        description = "A collection of JSON tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-tracer" = callPackage
@@ -144439,8 +134106,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A polymorphic, type-safe, json-structured tracing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json-types" = callPackage
@@ -144468,8 +134133,6 @@ self: {
        ];
        description = "Library provides support for JSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json2-hdbc" = callPackage
@@ -144485,8 +134148,6 @@ self: {
        ];
        description = "Support JSON for SQL Database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "json2-types" = callPackage
@@ -144546,8 +134207,6 @@ self: {
        ];
        description = "Filter select values in JSON objects to unix programs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jsonpath" = callPackage
@@ -144557,8 +134216,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsonpath";
-       version = "0.1.0.2";
-       sha256 = "1b889p98z2sq93n996p0r892dsvy4is2c10xwpag1vbr8dlr614c";
+       version = "0.2.0.0";
+       sha256 = "1gabkpag3ivxnxmd519411qmly3bcdcsan7kfqclgd49bi1i5jvv";
        libraryHaskellDepends = [
          aeson attoparsec base text unordered-containers vector
        ];
@@ -144584,8 +134243,6 @@ self: {
        ];
        description = "Parser and datatypes for the JSON Resume format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jsonrpc-conduit" = callPackage
@@ -144606,8 +134263,6 @@ self: {
        ];
        description = "JSON-RPC 2.0 server over a Conduit.";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jsons-to-schema" = callPackage
@@ -144639,8 +134294,6 @@ self: {
        ];
        description = "JSON to JSON Schema";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jsonschema-gen" = callPackage
@@ -144662,8 +134315,6 @@ self: {
        ];
        description = "JSON Schema generator from Algebraic data type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jsonsql" = callPackage
@@ -144684,8 +134335,6 @@ self: {
        ];
        description = "Interpolate JSON object values into SQL strings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jsontsv" = callPackage
@@ -144706,8 +134355,6 @@ self: {
        ];
        description = "JSON to TSV transformer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jsonxlsx" = callPackage
@@ -144728,8 +134375,6 @@ self: {
        ];
        description = "json to xlsx converter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jspath" = callPackage
@@ -144745,8 +134390,6 @@ self: {
        ];
        description = "Extract substructures from JSON by following a path";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "juandelacosa" = callPackage
@@ -144797,8 +134440,6 @@ self: {
        ];
        description = "Tableau-based theorem prover for justification logic";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "judy" = callPackage
@@ -144814,8 +134455,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Fast, scalable, mutable dynamic arrays, maps and hashes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {Judy = null;};
 
   "juicy-draw" = callPackage
@@ -144850,8 +134489,6 @@ self: {
        ];
        description = "SVG to G-Code converter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jukebox" = callPackage
@@ -144861,8 +134498,8 @@ self: {
      }:
      mkDerivation {
        pname = "jukebox";
-       version = "0.4.2";
-       sha256 = "0vxy06dan6iq03p8p2frzvyab5zaahh4pd37rzqg2vh71m6rqka7";
+       version = "0.4.3";
+       sha256 = "1daqxkyh95b84z8ijb16syx6wbprnjkrzg14n6p8vf672nnfm20g";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -144901,6 +134538,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "junit-xml" = callPackage
+    ({ mkDerivation, base, tasty, tasty-golden, text, xml-conduit }:
+     mkDerivation {
+       pname = "junit-xml";
+       version = "0.1.0.0";
+       sha256 = "006w30x66pqzjxarhavp0lyy8cb16gmvyyirbx9scfnbki8ybchs";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base text xml-conduit ];
+       testHaskellDepends = [ base tasty tasty-golden ];
+       description = "Producing JUnit-style XML test reports";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "jupyter" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, cereal, containers
      , directory, exceptions, extra, filepath, monad-control, mtl
@@ -144926,8 +134576,6 @@ self: {
        ];
        description = "A library for creating and using Jupyter kernels";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "justified-containers" = callPackage
@@ -144965,8 +134613,6 @@ self: {
        ];
        description = "Call JVM methods from Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jvm-batching" = callPackage
@@ -144991,8 +134637,6 @@ self: {
        ];
        description = "Provides batched marshalling of values between Java and Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jvm-binary" = callPackage
@@ -145024,8 +134668,6 @@ self: {
        ];
        description = "A library for reading Java class-files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jvm-parser" = callPackage
@@ -145042,8 +134684,6 @@ self: {
        ];
        description = "A parser for JVM bytecode files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jvm-streaming" = callPackage
@@ -145066,8 +134706,6 @@ self: {
        ];
        description = "Expose Java iterators as streams from the streaming package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "jwt" = callPackage
@@ -145117,8 +134755,6 @@ self: {
        ];
        description = "An implementation of the Kademlia DHT Protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kafka" = callPackage
@@ -145149,8 +134785,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Low-level Haskell client library for Apache Kafka 0.7.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kafka-client-sync" = callPackage
@@ -145165,8 +134799,6 @@ self: {
        testHaskellDepends = [ base hw-kafka-client monad-parallel text ];
        description = "Synchronous Kafka Client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kafka-device" = callPackage
@@ -145295,8 +134927,6 @@ self: {
        doHaddock = false;
        description = "Haskell Kaleidoscope tutorial";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kalman" = callPackage
@@ -145316,8 +134946,6 @@ self: {
        ];
        description = "Kalman and particle filters and smoothers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kan-extensions" = callPackage
@@ -145347,8 +134975,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Binary parsing with random access";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kanji" = callPackage
@@ -145416,8 +135042,6 @@ self: {
        ];
        description = "Kansas Lava is a hardware simulator and VHDL generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kansas-lava-cores" = callPackage
@@ -145437,8 +135061,6 @@ self: {
        ];
        description = "FPGA Cores Written in Kansas Lava";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kansas-lava-papilio" = callPackage
@@ -145457,8 +135079,6 @@ self: {
        ];
        description = "Kansas Lava support files for the Papilio FPGA board";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kansas-lava-shake" = callPackage
@@ -145475,8 +135095,6 @@ self: {
        ];
        description = "Shake rules for building Kansas Lava projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "karakuri" = callPackage
@@ -145492,8 +135110,6 @@ self: {
        ];
        description = "Good stateful automata";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "karps" = callPackage
@@ -145521,8 +135137,6 @@ self: {
        ];
        description = "Haskell bindings for Spark Dataframes and Datasets";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "karver" = callPackage
@@ -145629,8 +135243,6 @@ self: {
        ];
        description = "ElasticSearch scribe for the Katip logging framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "katip-kafka" = callPackage
@@ -145644,8 +135256,6 @@ self: {
        ];
        description = "Katip scribe to send logs to Kafka";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "katip-logzio" = callPackage
@@ -145688,8 +135298,6 @@ self: {
        ];
        description = "Katip scribe that logs to Rollbar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "katip-scalyr-scribe" = callPackage
@@ -145708,8 +135316,6 @@ self: {
        ];
        description = "A katip scribe for logging to json";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "katip-syslog" = callPackage
@@ -145726,8 +135332,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Syslog Katip Scribe";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "katt" = callPackage
@@ -145749,8 +135353,6 @@ self: {
        testHaskellDepends = [ base bytestring directory mtl ];
        description = "Client for the Kattis judge system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "katydid" = callPackage
@@ -145784,8 +135386,6 @@ self: {
        ];
        description = "A haskell implementation of Katydid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kawa" = callPackage
@@ -145832,8 +135432,6 @@ self: {
        ];
        description = "Utilities for serving static sites and blogs with Wai/Warp";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kawhi" = callPackage
@@ -145856,8 +135454,6 @@ self: {
        ];
        description = "stats.NBA.com library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kazura-queue" = callPackage
@@ -145880,8 +135476,6 @@ self: {
        ];
        description = "Fast concurrent queues much inspired by unagi-chan";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kbq-gu" = callPackage
@@ -145929,8 +135523,6 @@ self: {
        ];
        description = "A simple k-d tree implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kdesrc-build-extra" = callPackage
@@ -145949,8 +135541,6 @@ self: {
        ];
        description = "Build profiles for kdesrc-build";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kdt" = callPackage
@@ -145995,8 +135585,6 @@ self: {
        ];
        description = "cryptographic functions based on the sponge construction";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keenser" = callPackage
@@ -146051,8 +135639,6 @@ self: {
        ];
        description = "Rapid Gtk Application Development - I18N";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-hails-mvc-controller" = callPackage
@@ -146080,8 +135666,6 @@ self: {
        ];
        description = "Haskell on Gtk rails - Gtk-based global environment for MVC applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-hails-mvc-model-lightmodel" = callPackage
@@ -146098,8 +135682,6 @@ self: {
        ];
        description = "Rapid Gtk Application Development - Reactive Protected Light Models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-hails-mvc-model-protectedmodel" = callPackage
@@ -146116,8 +135698,6 @@ self: {
        ];
        description = "Rapid Gtk Application Development - Protected Reactive Models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-hails-mvc-solutions-config" = callPackage
@@ -146150,8 +135730,6 @@ self: {
        ];
        description = "Haskell on Gtk rails - Common solutions to recurrent problems in Gtk applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-hails-mvc-view" = callPackage
@@ -146191,8 +135769,6 @@ self: {
        ];
        description = "Haskell on Rails - Files as Reactive Values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-hails-reactive-gtk" = callPackage
@@ -146209,8 +135785,6 @@ self: {
        ];
        description = "Haskell on Gtk rails - Reactive Fields for Gtk widgets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-hails-reactive-network" = callPackage
@@ -146226,8 +135800,6 @@ self: {
        ];
        description = "Haskell on Rails - Sockets as Reactive Values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-hails-reactive-polling" = callPackage
@@ -146242,8 +135814,6 @@ self: {
        ];
        description = "Haskell on Rails - Polling based Readable RVs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-hails-reactive-wx" = callPackage
@@ -146257,8 +135827,6 @@ self: {
        ];
        description = "Haskell on Rails - Reactive Fields for WX widgets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-hails-reactive-yampa" = callPackage
@@ -146274,8 +135842,6 @@ self: {
        ];
        description = "Haskell on Rails - FRP Yampa Signal Functions as RVs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-hails-reactivelenses" = callPackage
@@ -146287,8 +135853,6 @@ self: {
        libraryHaskellDepends = [ base keera-hails-reactivevalues lens ];
        description = "Reactive Haskell on Rails - Lenses applied to Reactive Values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-hails-reactivevalues" = callPackage
@@ -146307,8 +135871,6 @@ self: {
        ];
        description = "Haskell on Rails - Reactive Values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keera-posture" = callPackage
@@ -146388,8 +135950,6 @@ self: {
        ];
        description = "Manage and abstract your packer configurations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keter" = callPackage
@@ -146423,8 +135983,6 @@ self: {
        ];
        description = "Web application deployment manager, focusing on Haskell web frameworks";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kevin" = callPackage
@@ -146445,8 +136003,6 @@ self: {
        ];
        description = "a dAmn ↔ IRC proxy";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "key" = callPackage
@@ -146505,8 +136061,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keycode" = callPackage
@@ -146533,8 +136087,6 @@ self: {
        libraryHaskellDepends = [ base containers vector ];
        description = "Generic indexing for many data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keyring" = callPackage
@@ -146548,8 +136100,6 @@ self: {
        libraryHaskellDepends = [ base udbus ];
        description = "Keyring access";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keys" = callPackage
@@ -146582,8 +136132,8 @@ self: {
      }:
      mkDerivation {
        pname = "keysafe";
-       version = "0.20180326";
-       sha256 = "01kagnpliw0qmhhrx1lcaxdg41sq76km3c1gzk3b9siyqkszhq08";
+       version = "0.20200214";
+       sha256 = "0agsnkz8l8v33gibpqinfi0a9d8xzy3kfw9awns8y4rsp9s84vbv";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -146597,8 +136147,6 @@ self: {
        ];
        description = "back up a secret key securely to the cloud";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keystore" = callPackage
@@ -146630,8 +136178,6 @@ self: {
        ];
        description = "Managing stores of secret things";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keyvaluehash" = callPackage
@@ -146648,8 +136194,6 @@ self: {
        ];
        description = "Pure Haskell key/value store implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "keyword-args" = callPackage
@@ -146671,8 +136215,6 @@ self: {
        ];
        description = "Extract data from a keyword-args config file format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "khph" = callPackage
@@ -146692,8 +136234,6 @@ self: {
        ];
        description = "Command-line file tagging and organization tool";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kibro" = callPackage
@@ -146726,8 +136266,6 @@ self: {
        ];
        description = "Parser and writer for KiCad files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kickass-torrents-dump-parser" = callPackage
@@ -146745,8 +136283,6 @@ self: {
        ];
        description = "Parses kat.ph torrent dumps";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kickchan" = callPackage
@@ -146765,8 +136301,6 @@ self: {
        ];
        description = "Kick Channels: bounded channels with non-blocking writes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kif-parser" = callPackage
@@ -146785,8 +136319,6 @@ self: {
        ];
        description = "Process KIF iOS test logs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kind-apply" = callPackage
@@ -146801,17 +136333,6 @@ self: {
      }) {};
 
   "kind-generics" = callPackage
-    ({ mkDerivation, base, kind-apply }:
-     mkDerivation {
-       pname = "kind-generics";
-       version = "0.3.0.0";
-       sha256 = "0xkrijwhldgx742xj9nhr8268vdbbgk4pg9mj73c7j13laj27y8x";
-       libraryHaskellDepends = [ base kind-apply ];
-       description = "Generic programming in GHC style for arbitrary kinds and GADTs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "kind-generics_0_4_0_0" = callPackage
     ({ mkDerivation, base, kind-apply }:
      mkDerivation {
        pname = "kind-generics";
@@ -146820,26 +136341,9 @@ self: {
        libraryHaskellDepends = [ base kind-apply ];
        description = "Generic programming in GHC style for arbitrary kinds and GADTs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kind-generics-th" = callPackage
-    ({ mkDerivation, base, kind-generics, template-haskell
-     , th-abstraction
-     }:
-     mkDerivation {
-       pname = "kind-generics-th";
-       version = "0.1.1.0";
-       sha256 = "0pwhids2d9wfmycaxn5qm04jp1qjj8ji8casgk7d7k36fs15qgkl";
-       libraryHaskellDepends = [
-         base kind-generics template-haskell th-abstraction
-       ];
-       testHaskellDepends = [ base kind-generics ];
-       description = "Template Haskell support for generating `GenericK` instances";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "kind-generics-th_0_2_1_0" = callPackage
     ({ mkDerivation, base, ghc-prim, kind-generics, template-haskell
      , th-abstraction
      }:
@@ -146853,7 +136357,6 @@ self: {
        testHaskellDepends = [ base kind-generics template-haskell ];
        description = "Template Haskell support for generating `GenericK` instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kinds" = callPackage
@@ -146885,8 +136388,6 @@ self: {
        ];
        description = "A dependency manager for Xcode (Objective-C) projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kleene" = callPackage
@@ -146940,8 +136441,6 @@ self: {
        ];
        description = "Sequential and parallel implementations of Lloyd's algorithm";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kmeans-vector" = callPackage
@@ -146958,8 +136457,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion QuickCheck vector ];
        description = "An implementation of the kmeans clustering algorithm based on the vector package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kmp-dfa" = callPackage
@@ -146972,8 +136469,6 @@ self: {
        testHaskellDepends = [ array base QuickCheck ];
        description = "KMP algorithm implementation, based on Deterministic Finite State Automata";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "knead" = callPackage
@@ -146992,8 +136487,6 @@ self: {
        ];
        description = "Repa-like array processing using LLVM JIT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "knead-arithmetic" = callPackage
@@ -147007,8 +136500,6 @@ self: {
        ];
        description = "Linear algebra and interpolation using LLVM JIT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "knit-haskell" = callPackage
@@ -147069,8 +136560,6 @@ self: {
        executableHaskellDepends = [ base containers parallel ];
        description = "Khovanov homology computations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "koellner-phonetic" = callPackage
@@ -147084,8 +136573,6 @@ self: {
        doHaddock = false;
        description = "\"map German words to code representing pronunciation\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kontra-config" = callPackage
@@ -147102,8 +136589,6 @@ self: {
        ];
        description = "JSON config file parsing based on unjson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kontrakcja-templates" = callPackage
@@ -147181,8 +136666,6 @@ self: {
        ];
        description = "The Korfu ORF Utility";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kqueue" = callPackage
@@ -147198,8 +136681,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A binding to the kqueue event library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kraken" = callPackage
@@ -147265,8 +136746,6 @@ self: {
        ];
        description = "Haskell bindings for Spark Dataframes and Datasets";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "krpc" = callPackage
@@ -147292,8 +136771,6 @@ self: {
        ];
        description = "KRPC protocol implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ks-test" = callPackage
@@ -147305,8 +136782,6 @@ self: {
        libraryHaskellDepends = [ base gamma random-fu roots vector ];
        description = "Kolmogorov distribution and Kolmogorov-Smirnov test";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ksystools" = callPackage
@@ -147330,8 +136805,6 @@ self: {
        libraryPkgconfigDepends = [ egl glew ];
        description = "A binding for libktx from Khronos";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {egl = null; inherit (pkgs) glew;};
 
   "kubernetes-client" = callPackage
@@ -147359,8 +136832,6 @@ self: {
        ];
        description = "Client library for Kubernetes";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kubernetes-client-core" = callPackage
@@ -147390,8 +136861,6 @@ self: {
        ];
        description = "Auto-generated kubernetes-client-core API Client";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kubernetes-webhook-haskell" = callPackage
@@ -147432,8 +136901,6 @@ self: {
        libraryHaskellDepends = [ base dlist transformers ];
        description = "Combinators for Strategic Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kure-your-boilerplate" = callPackage
@@ -147445,8 +136912,6 @@ self: {
        libraryHaskellDepends = [ base kure template-haskell ];
        description = "Generator for Boilerplate KURE Combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kurita" = callPackage
@@ -147479,8 +136944,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Find the alpha emoji";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "kyotocabinet" = callPackage
@@ -147505,8 +136968,6 @@ self: {
        librarySystemDepends = [ lbfgsb ];
        description = "Bindings to L-BFGS-B, Fortran code for limited-memory quasi-Newton bound-constrained optimization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {lbfgsb = null;};
 
   "l10n" = callPackage
@@ -147529,8 +136990,6 @@ self: {
        libraryHaskellDepends = [ base labeled-tree ];
        description = "Labeled graph structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "labeled-tree" = callPackage
@@ -147576,8 +137035,6 @@ self: {
        ];
        description = "an experiment management framework";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "labsat" = callPackage
@@ -147601,8 +137058,6 @@ self: {
        ];
        description = "LabSat TCP Interface Wrapper";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "labyrinth" = callPackage
@@ -147624,8 +137079,6 @@ self: {
        ];
        description = "A complicated turn-based game";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "labyrinth-server" = callPackage
@@ -147659,8 +137112,6 @@ self: {
        ];
        description = "A complicated turn-based game - Web server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lackey" = callPackage
@@ -147704,8 +137155,6 @@ self: {
        ];
        description = "Solve Lagrange multiplier problems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "laika" = callPackage
@@ -147725,8 +137174,6 @@ self: {
        ];
        description = "Minimalistic type-checked compile-time template engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambda-ast" = callPackage
@@ -147752,8 +137199,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A bridge from Haskell (on a CPU) to VHDL on a FPGA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambda-calculator" = callPackage
@@ -147773,8 +137218,6 @@ self: {
        testHaskellDepends = [ base containers hlint hspec HUnit ];
        description = "A lambda calculus interpreter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambda-calculus-interpreter" = callPackage
@@ -147801,8 +137244,6 @@ self: {
        libraryHaskellDepends = [ base GLUT mtl OpenGL time ];
        description = "Educational drawing canvas for FP explorers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambda-devs" = callPackage
@@ -147829,8 +137270,6 @@ self: {
        ];
        description = "a Paralell-DEVS implementaion based on distributed-process";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambda-options" = callPackage
@@ -147845,8 +137284,6 @@ self: {
        ];
        description = "Declarative command-line parser with type-driven pattern matching";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambda-placeholders" = callPackage
@@ -147887,8 +137324,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "An application to work with the lambda calculus (for learning)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambda2js" = callPackage
@@ -147902,8 +137337,6 @@ self: {
        executableHaskellDepends = [ base parsec ];
        description = "Untyped Lambda calculus to JavaScript compiler";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdaBase" = callPackage
@@ -147915,8 +137348,6 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base parsec ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdaFeed" = callPackage
@@ -147930,8 +137361,6 @@ self: {
        executableHaskellDepends = [ base haskell98 html ];
        description = "RSS 2.0 feed generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdaLit" = callPackage
@@ -147949,8 +137378,6 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdabot" = callPackage
@@ -147973,8 +137400,6 @@ self: {
        ];
        description = "Lambdabot is a development tool and advanced IRC bot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdabot-core" = callPackage
@@ -148002,8 +137427,6 @@ self: {
        ];
        description = "Lambdabot core functionality";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdabot-haskell-plugins" = callPackage
@@ -148029,8 +137452,6 @@ self: {
        ];
        description = "Lambdabot Haskell plugins";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdabot-irc-plugins" = callPackage
@@ -148048,8 +137469,6 @@ self: {
        ];
        description = "IRC plugins for lambdabot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdabot-misc-plugins" = callPackage
@@ -148071,8 +137490,6 @@ self: {
        ];
        description = "Lambdabot miscellaneous plugins";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdabot-novelty-plugins" = callPackage
@@ -148090,8 +137507,6 @@ self: {
        ];
        description = "Novelty plugins for Lambdabot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdabot-reference-plugins" = callPackage
@@ -148109,8 +137524,6 @@ self: {
        ];
        description = "Lambdabot reference plugins";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdabot-social-plugins" = callPackage
@@ -148126,8 +137539,6 @@ self: {
        ];
        description = "Social plugins for Lambdabot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdabot-trusted" = callPackage
@@ -148159,8 +137570,6 @@ self: {
        ];
        description = "Utility libraries for the advanced IRC bot, Lambdabot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdabot-xmpp" = callPackage
@@ -148207,8 +137616,6 @@ self: {
        testHaskellDepends = [ base hspec HUnit text ];
        description = "Lambdabot for Zulip Chat";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdacat" = callPackage
@@ -148252,8 +137659,6 @@ self: {
        ];
        description = "LambdaCms 'core' subsite for Yesod apps";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdacms-media" = callPackage
@@ -148270,8 +137675,6 @@ self: {
        ];
        description = "LambdaCms \"media\" extension";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdacube" = callPackage
@@ -148285,8 +137688,6 @@ self: {
        executableHaskellDepends = [ base editline mtl pretty ];
        description = "A simple lambda cube type checker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdacube-bullet" = callPackage
@@ -148300,8 +137701,6 @@ self: {
        ];
        description = "Example for combining LambdaCube and Bullet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdacube-compiler" = callPackage
@@ -148326,8 +137725,6 @@ self: {
        ];
        description = "LambdaCube 3D is a DSL to program GPUs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdacube-core" = callPackage
@@ -148343,8 +137740,6 @@ self: {
        ];
        description = "LambdaCube 3D IR";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdacube-edsl" = callPackage
@@ -148361,8 +137756,6 @@ self: {
        ];
        description = "LambdaCube 3D EDSL definition";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdacube-engine" = callPackage
@@ -148382,8 +137775,6 @@ self: {
        ];
        description = "3D rendering engine written entirely in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdacube-examples" = callPackage
@@ -148400,8 +137791,6 @@ self: {
        ];
        description = "Examples for LambdaCube";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdacube-gl" = callPackage
@@ -148420,8 +137809,6 @@ self: {
        ];
        description = "OpenGL 3.3 Core Profile backend for LambdaCube 3D";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdacube-ir" = callPackage
@@ -148433,8 +137820,6 @@ self: {
        libraryHaskellDepends = [ aeson base containers mtl text vector ];
        description = "LambdaCube 3D intermediate representation of 3D graphics pipelines";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdacube-samples" = callPackage
@@ -148456,8 +137841,6 @@ self: {
        ];
        description = "Samples for LambdaCube 3D";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdatex" = callPackage
@@ -148478,8 +137861,6 @@ self: {
        ];
        description = "Type-Safe LaTeX EDSL";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdatwit" = callPackage
@@ -148505,8 +137886,6 @@ self: {
        ];
        description = "Lambdabot running as a twitter bot. Similar to the @fsibot f# bot.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdaya-bus" = callPackage
@@ -148520,8 +137899,6 @@ self: {
        ];
        description = "Fpga bus core and serialization for RedPitaya";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lambdiff" = callPackage
@@ -148539,8 +137916,6 @@ self: {
        ];
        description = "Diff Viewer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lame" = callPackage
@@ -148564,8 +137939,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Fairly complete high-level binding to LAME encoder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {mp3lame = null;};
 
   "lame-tester" = callPackage
@@ -148582,8 +137955,6 @@ self: {
        testHaskellDepends = [ bizzlelude containers tasty tasty-hunit ];
        description = "A strange and unnecessary selective test-running library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lang" = callPackage
@@ -148595,8 +137966,6 @@ self: {
        libraryHaskellDepends = [ base bytestring http-streams Mapping ];
        description = "A Lisp";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-asn" = callPackage
@@ -148638,8 +138007,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-ats";
-       version = "1.7.7.1";
-       sha256 = "13d1hna3kgvyfihjn3639j8i1drpw65j3ksb5zh3dqi999ia6zs2";
+       version = "1.7.7.2";
+       sha256 = "0pqkywscx7xzmqm4yvp2c0mfyx5dj9bahqq0y48dvicc3c2pdzkp";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array base composition-prelude containers deepseq
@@ -148652,8 +138021,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Parser and pretty-printer for ATS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-avro" = callPackage
@@ -148688,8 +138055,6 @@ self: {
        ];
        description = "Parsing and pretty-printing Bash shell scripts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-boogie" = callPackage
@@ -148712,8 +138077,6 @@ self: {
        ];
        description = "Interpreter and language infrastructure for Boogie";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-c" = callPackage
@@ -148745,8 +138108,6 @@ self: {
        libraryToolDepends = [ alex ];
        description = "Extracting comments from C code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-c-inline" = callPackage
@@ -148763,8 +138124,6 @@ self: {
        ];
        description = "Inline C & Objective-C code in Haskell for language interoperability";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-c-quote" = callPackage
@@ -148858,8 +138217,6 @@ self: {
        ];
        description = "Conf parsers and pretty-printers for the Haskell programming language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-csharp" = callPackage
@@ -148874,8 +138231,6 @@ self: {
        libraryToolDepends = [ alex ];
        description = "C# source code manipulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-css" = callPackage
@@ -148887,8 +138242,6 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        description = "CSS 2.1 syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-dart" = callPackage
@@ -148901,8 +138254,6 @@ self: {
        testHaskellDepends = [ base hspec raw-strings-qq ];
        description = "Manipulating Dart source: abstract syntax and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-docker" = callPackage
@@ -148953,8 +138304,6 @@ self: {
        ];
        description = "Dockerfile linter, parser, pretty-printer and embedded DSL";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-dot" = callPackage
@@ -148970,8 +138319,6 @@ self: {
        testHaskellDepends = [ base parsec ];
        description = "A library for the analysis and creation of Graphviz DOT files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-ecmascript" = callPackage
@@ -148983,10 +138330,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-ecmascript";
-       version = "0.19";
-       sha256 = "13v5ghw8qc4paacn34skgwmvwisjaykszwjrq3lk4idzvrxln2jp";
-       revision = "2";
-       editedCabalFile = "1xj5h5ajybq4pwlw8zsn1lb920km1pcdv20apbpa7pgi39zcpzfd";
+       version = "0.19.0.1";
+       sha256 = "1jh5ksx5hh2q9b134rfmcpz4i1j6fsfyqzk4yh8yn635kwa86jhr";
        libraryHaskellDepends = [
          ansi-wl-pprint base charset containers data-default-class Diff mtl
          parsec QuickCheck template-haskell uniplate
@@ -149014,8 +138359,6 @@ self: {
        ];
        description = "JavaScript static analysis library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-eiffel" = callPackage
@@ -149034,8 +138377,6 @@ self: {
        libraryToolDepends = [ alex ];
        description = "Parser and pretty printer for the Eiffel language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-elm" = callPackage
@@ -149053,8 +138394,6 @@ self: {
        testToolDepends = [ doctest ];
        description = "Generate elm code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-fortran" = callPackage
@@ -149079,8 +138418,6 @@ self: {
        libraryHaskellDepends = [ base bifunctors parsers ];
        description = "Something similar to Dijkstra's guarded command language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-glsl" = callPackage
@@ -149113,8 +138450,6 @@ self: {
        libraryHaskellDepends = [ array base parsec utf8-string ];
        description = "A library for analysis and synthesis of Go code";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-guess" = callPackage
@@ -149127,8 +138462,6 @@ self: {
        libraryHaskellDepends = [ base bytestring cereal containers ];
        description = "Guess at which language a text is written in using trigrams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-haskell-extract" = callPackage
@@ -149164,8 +138497,6 @@ self: {
        ];
        description = "HCL parsers and pretty-printers for the Haskell programming language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-java" = callPackage
@@ -149202,32 +138533,9 @@ self: {
        ];
        description = "Parser for Java .class files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-javascript" = callPackage
-    ({ mkDerivation, alex, array, base, blaze-builder, bytestring
-     , Cabal, containers, happy, hspec, mtl, QuickCheck, text
-     , utf8-light, utf8-string
-     }:
-     mkDerivation {
-       pname = "language-javascript";
-       version = "0.6.0.14";
-       sha256 = "1j4f9jg98kwr1jiwk9y7akdgpc63dpwzcp53888adayxn5h6mqf1";
-       libraryHaskellDepends = [
-         array base blaze-builder bytestring containers mtl text utf8-string
-       ];
-       libraryToolDepends = [ alex happy ];
-       testHaskellDepends = [
-         array base blaze-builder bytestring Cabal containers hspec mtl
-         QuickCheck utf8-light utf8-string
-       ];
-       description = "Parser for JavaScript";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "language-javascript_0_7_0_0" = callPackage
     ({ mkDerivation, alex, array, base, blaze-builder, bytestring
      , Cabal, containers, happy, hspec, mtl, QuickCheck, text
      , utf8-light, utf8-string
@@ -149246,7 +138554,6 @@ self: {
        ];
        description = "Parser for JavaScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-js" = callPackage
@@ -149282,8 +138589,6 @@ self: {
        ];
        description = "Parser and serializer for the Kort information language";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-lua" = callPackage
@@ -149308,8 +138613,6 @@ self: {
        ];
        description = "Lua parser and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-lua-qq" = callPackage
@@ -149326,8 +138629,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-lua2" = callPackage
@@ -149353,8 +138654,6 @@ self: {
        ];
        description = "Lua parser and pretty printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-mixal" = callPackage
@@ -149369,8 +138668,6 @@ self: {
        executableHaskellDepends = [ base pretty ];
        description = "Parser, pretty-printer, and AST types for the MIXAL assembly language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-ninja" = callPackage
@@ -149409,8 +138706,6 @@ self: {
        ];
        description = "A library for dealing with the Ninja build language";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-nix" = callPackage
@@ -149456,8 +138751,6 @@ self: {
        ];
        description = "Parser, pretty-printer, and type checker for the Oberon programming language";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-objc" = callPackage
@@ -149475,8 +138768,6 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Analysis and generation of Objective C code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-ocaml" = callPackage
@@ -149502,8 +138793,6 @@ self: {
        ];
        description = "Language tools for manipulating OCaml programs in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "language-openscad" = callPackage
@@ -149520,8 +138809,6 @@ self: {
        executableHaskellDepends = [ attoparsec base bytestring ];
        description = "A simple parser for OpenSCAD";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-pig" = callPackage
@@ -149542,8 +138829,6 @@ self: {
        ];
        description = "Pig parser in haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-protobuf" = callPackage
@@ -149616,8 +138901,6 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Parsing and pretty printing of Python code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-python-colour" = callPackage
@@ -149633,8 +138916,6 @@ self: {
        ];
        description = "Generate coloured XHTML for Python code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-python-test" = callPackage
@@ -149648,8 +138929,6 @@ self: {
        executableHaskellDepends = [ base language-python ];
        description = "testing code for the language-python library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-qux" = callPackage
@@ -149666,8 +138945,6 @@ self: {
        ];
        description = "Utilities for working with the Qux language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-rust" = callPackage
@@ -149725,8 +139002,6 @@ self: {
        ];
        description = "A package for parsing shell scripts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-slice" = callPackage
@@ -149765,8 +139040,6 @@ self: {
        ];
        description = "Various tools to detect/correct mistakes in words";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-sqlite" = callPackage
@@ -149782,22 +139055,20 @@ self: {
        ];
        description = "Full parser and generator for SQL as implemented by SQLite3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-sygus" = callPackage
-    ({ mkDerivation, array, base, deepseq, tasty, tasty-hunit, text }:
+    ({ mkDerivation, array, base, deepseq, hashable, tasty, tasty-hunit
+     , text
+     }:
      mkDerivation {
        pname = "language-sygus";
-       version = "0.1.1.1";
-       sha256 = "18cfqqhm233irgs2m94j5gw87g55zdf4xx52mb7dmn4ijk5gzpl5";
-       libraryHaskellDepends = [ array base text ];
+       version = "0.1.1.2";
+       sha256 = "1vgd45bd866mm2w80hg8q11iz8g9ifz5ccm0sh13xrnpvfvdv862";
+       libraryHaskellDepends = [ array base hashable text ];
        testHaskellDepends = [ base deepseq tasty tasty-hunit text ];
        description = "A parser and printer for the SyGuS 2.0 language.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-thrift" = callPackage
@@ -149820,8 +139091,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Parser and pretty printer for the Thrift IDL format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-typescript" = callPackage
@@ -149833,8 +139102,6 @@ self: {
        libraryHaskellDepends = [ base containers parsec pretty ];
        description = "A library for working with TypeScript Definition files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-vhdl" = callPackage
@@ -149846,8 +139113,6 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        description = "VHDL AST and pretty printer in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "language-webidl" = callPackage
@@ -149860,16 +139125,14 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Parser and Pretty Printer for WebIDL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "laop" = callPackage
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
        pname = "laop";
-       version = "0.1.0.3";
-       sha256 = "0fhn7gl2mfm14bmqvay8wrzqcszgnh94byxr065hsxy2zq6kmyc6";
+       version = "0.1.0.6";
+       sha256 = "1xwyzkn884dwifpi2945pzz830pqillbm6zvy9dwl6dwhgyvlk7y";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [ base deepseq ];
        license = stdenv.lib.licenses.bsd3;
@@ -149898,8 +139161,6 @@ self: {
        ];
        description = "Numerical Linear Algebra using LAPACK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lapack-carray" = callPackage
@@ -150030,8 +139291,6 @@ self: {
        ];
        description = "Tool to track security alerts on LWN";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "latest-npm-version" = callPackage
@@ -150062,8 +139321,6 @@ self: {
        ];
        description = "Find the latest version of a package on npm";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "latex" = callPackage
@@ -150093,8 +139350,6 @@ self: {
        ];
        description = "Use actual LaTeX to render formulae inside Hakyll pages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "latex-formulae-image" = callPackage
@@ -150113,8 +139368,6 @@ self: {
        ];
        description = "A library for rendering LaTeX formulae as images using an actual LaTeX installation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "latex-formulae-pandoc" = callPackage
@@ -150136,8 +139389,6 @@ self: {
        ];
        description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX installation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "latex-function-tables" = callPackage
@@ -150203,6 +139454,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lattices_2_0_2" = callPackage
+    ({ mkDerivation, base, base-compat, containers, deepseq, hashable
+     , integer-logarithms, QuickCheck, quickcheck-instances
+     , semigroupoids, tagged, tasty, tasty-quickcheck, transformers
+     , universe-base, universe-reverse-instances, unordered-containers
+     }:
+     mkDerivation {
+       pname = "lattices";
+       version = "2.0.2";
+       sha256 = "108rhpax72j6xdl0yqdmg7n32l1j805861f3q9wd3jh8nc67avix";
+       libraryHaskellDepends = [
+         base base-compat containers deepseq hashable integer-logarithms
+         QuickCheck semigroupoids tagged transformers universe-base
+         universe-reverse-instances unordered-containers
+       ];
+       testHaskellDepends = [
+         base base-compat containers QuickCheck quickcheck-instances tasty
+         tasty-quickcheck transformers universe-base
+         universe-reverse-instances unordered-containers
+       ];
+       description = "Fine-grained library for constructing and manipulating lattices";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "launchpad-control" = callPackage
     ({ mkDerivation, array, base, containers, hmidi, mtl, transformers
      }:
@@ -150218,8 +139494,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "High and low-level interface to the Novation Launchpad midi controller";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lawful" = callPackage
@@ -150252,16 +139526,14 @@ self: {
        benchmarkHaskellDepends = [ base machines time ];
        description = "Concurrent networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lawz" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "lawz";
-       version = "0.1";
-       sha256 = "0gnahwxkkx7nrvcbz0vcj8gzn000nhlijm7z5aiazhv08b8x4d9d";
+       version = "0.1.1";
+       sha256 = "0hmsqpm3jakp5q274q47c9gvb2i4asc25nrfypblkvnpvnh6q172";
        libraryHaskellDepends = [ base ];
        description = "Common mathematical laws";
        license = stdenv.lib.licenses.bsd3;
@@ -150309,8 +139581,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Modular type class machinery for monad transformer stacks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "layers-game" = callPackage
@@ -150330,8 +139600,6 @@ self: {
        ];
        description = "A prototypical 2d platform game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "layout" = callPackage
@@ -150343,8 +139611,6 @@ self: {
        libraryHaskellDepends = [ base convertible hinduce-missingh ];
        description = "Turn values into pretty text or markup";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "layout-bootstrap" = callPackage
@@ -150356,8 +139622,6 @@ self: {
        libraryHaskellDepends = [ base blaze-html containers text ];
        description = "Template and widgets for Bootstrap2 to use with Text.Blaze.Html5";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "layout-rules" = callPackage
@@ -150369,8 +139633,6 @@ self: {
        libraryHaskellDepends = [ alex-tools base text ];
        description = "A collection of different layout implementations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "layouting" = callPackage
@@ -150386,8 +139648,6 @@ self: {
        ];
        description = "General layouting library. Currently supports layouting 2D areas and can be used as a backend for text pretty printing or automatic windows layouting managers.";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lazy" = callPackage
@@ -150431,8 +139691,6 @@ self: {
        ];
        description = "Identifiers for not-yet-computed values";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lazy-hash-cache" = callPackage
@@ -150453,8 +139711,6 @@ self: {
        ];
        description = "Storing computed values for re-use when the same program runs again";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lazy-io" = callPackage
@@ -150479,8 +139735,6 @@ self: {
        libraryHaskellDepends = [ base bytestring io-streams ];
        description = "Get lazy with your io-streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lazy-priority-queue" = callPackage
@@ -150497,8 +139751,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Lazy-Spined Monadic Priority Queues";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lazy-search" = callPackage
@@ -150521,8 +139773,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Efficient implementation of lazy monolithic arrays (lazy in indexes)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lazyboy" = callPackage
@@ -150542,8 +139792,6 @@ self: {
        ];
        description = "An EDSL for programming the Game Boy";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lazyio" = callPackage
@@ -150574,8 +139822,6 @@ self: {
        ];
        description = "Set and Map from lazy/infinite lists";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lazysmallcheck" = callPackage
@@ -150646,8 +139892,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Data structures for representing arbitrary intervals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lda" = callPackage
@@ -150663,8 +139907,6 @@ self: {
        ];
        description = "Online Latent Dirichlet Allocation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ldap-client" = callPackage
@@ -150701,8 +139943,6 @@ self: {
        ];
        description = "LDIF idempotent apply tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ldif" = callPackage
@@ -150725,8 +139965,6 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "The LDAP Data Interchange Format (LDIF) tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "leaf" = callPackage
@@ -150745,8 +139983,6 @@ self: {
        ];
        description = "A simple portfolio generator";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "leaky" = callPackage
@@ -150765,8 +140001,6 @@ self: {
        ];
        description = "Robust space leak, and its strictification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lean" = callPackage
@@ -150782,8 +140016,6 @@ self: {
        ];
        description = "Bonds to Lean theorem prover";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "leancheck" = callPackage
@@ -150866,8 +140098,6 @@ self: {
        ];
        description = "Use the Leanpub API via Wreq";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "leapseconds" = callPackage
@@ -150881,8 +140111,6 @@ self: {
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base tasty tasty-hunit time ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "leapseconds-announced" = callPackage
@@ -150906,8 +140134,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Learning Algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "learn-physics" = callPackage
@@ -150945,8 +140171,6 @@ self: {
        ];
        description = "examples for learn-physics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "learning-hmm" = callPackage
@@ -150976,8 +140200,6 @@ self: {
        executableHaskellDepends = [ base containers ];
        description = "Leetify text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "left4deadrl" = callPackage
@@ -151012,8 +140234,6 @@ self: {
        ];
        description = "Distributed, stateful, homogeneous microservice framework";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "legion-discovery" = callPackage
@@ -151039,8 +140259,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A discovery service based on Legion";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "legion-discovery-client" = callPackage
@@ -151060,8 +140278,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Client library for communicating with legion-discovery";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "legion-extra" = callPackage
@@ -151083,8 +140299,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Extra non-essential utilities for building legion applications";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "leksah" = callPackage
@@ -151160,8 +140374,6 @@ self: {
        ];
        description = "Metadata collection for leksah";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lendingclub" = callPackage
@@ -151178,8 +140390,6 @@ self: {
        ];
        description = "Bindings for the LendingClub marketplace API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lens" = callPackage
@@ -151191,22 +140401,20 @@ self: {
      , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect
      , tagged, template-haskell, test-framework, test-framework-hunit
      , test-framework-quickcheck2, test-framework-th, text
-     , th-abstraction, transformers, transformers-compat
+     , th-abstraction, transformers, transformers-compat, type-equality
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "lens";
-       version = "4.17.1";
-       sha256 = "1gpkc53l2cggnfrgg5k4ih82rycjbdvpj9pnbi5cq8ms0dbvs4a7";
-       revision = "2";
-       editedCabalFile = "1bh868l69nisdhw8qw5y51nj2w0pbbq7mxqiwf42iq0vcb6h0ybv";
+       version = "4.18.1";
+       sha256 = "1lmxjaj32v06l12gy00rpjp2lk1cblh3k7kwklk655ss2vas61ri";
        setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
        libraryHaskellDepends = [
          array base base-orphans bifunctors bytestring call-stack comonad
          containers contravariant distributive exceptions filepath free
          ghc-prim hashable kan-extensions mtl parallel profunctors
          reflection semigroupoids tagged template-haskell text
-         th-abstraction transformers transformers-compat
+         th-abstraction transformers transformers-compat type-equality
          unordered-containers vector
        ];
        testHaskellDepends = [
@@ -151224,7 +140432,7 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "lens_4_19" = callPackage
+  "lens_4_19_1" = callPackage
     ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
      , bytestring, Cabal, cabal-doctest, call-stack, comonad, containers
      , contravariant, criterion, deepseq, directory, distributive
@@ -151238,8 +140446,8 @@ self: {
      }:
      mkDerivation {
        pname = "lens";
-       version = "4.19";
-       sha256 = "1696835nvzfgvkwrhka2lmjbq08dhkqpcp9iqj5ws7bws7ja3xaf";
+       version = "4.19.1";
+       sha256 = "0qbcwn7ll374630ijnw5jhwkqcaisvfwnh7cvz1957ayh84ipkq3";
        setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
        libraryHaskellDepends = [
          array base base-orphans bifunctors bytestring call-stack comonad
@@ -151298,29 +140506,6 @@ self: {
      }) {};
 
   "lens-aeson" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
-     , cabal-doctest, doctest, generic-deriving, lens, scientific
-     , semigroups, simple-reflect, text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "lens-aeson";
-       version = "1.0.2";
-       sha256 = "1k028ycmhz7mnjlrap88fqix4nmmpyy6b88m16kv77d3r8sz04a3";
-       revision = "6";
-       editedCabalFile = "1pg5v8fnlqw1krgi3d2a03a0zkjjdv5yp5f5z6q4mlb5jldz99a8";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring lens scientific text
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base doctest generic-deriving semigroups simple-reflect
-       ];
-       description = "Law-abiding lenses for aeson";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "lens-aeson_1_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
      , cabal-doctest, doctest, generic-deriving, lens, scientific
      , semigroups, simple-reflect, text, unordered-containers, vector
@@ -151339,7 +140524,6 @@ self: {
        ];
        description = "Law-abiding lenses for aeson";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-core" = callPackage
@@ -151356,6 +140540,8 @@ self: {
        pname = "lens-core";
        version = "0.1.0.3";
        sha256 = "0bnjnnfavgxy600yzmhqcj91awgk420ybr8wi4pghj2pi8z0581v";
+       revision = "1";
+       editedCabalFile = "0dalyxy1a0dkywm9mziiqhg4vcpkmw7g4lvahkw4mi371jkgvb4b";
        setupHaskellDepends = [ base Cabal cabal-doctest filepath ];
        libraryHaskellDepends = [
          array base base-orphans call-stack containers dual foldable1
@@ -151374,8 +140560,6 @@ self: {
        ];
        description = "Lenses, Folds and Traversals";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lens-csv" = callPackage
@@ -151418,8 +140602,8 @@ self: {
      }:
      mkDerivation {
        pname = "lens-family";
-       version = "1.2.3";
-       sha256 = "0a8fvvc3fsi5fzk5bnqvbgdz22xvvw55nyfac6411q0pm6vy4nc0";
+       version = "2.0.0";
+       sha256 = "1nq3dwkrjyqafbv4gvwwgz6ih8y4x9bks11jhljh43q3qnjz54v7";
        libraryHaskellDepends = [
          base containers lens-family-core mtl transformers
        ];
@@ -151427,14 +140611,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "lens-family_2_0_0" = callPackage
+  "lens-family_2_1_0" = callPackage
     ({ mkDerivation, base, containers, lens-family-core, mtl
      , transformers
      }:
      mkDerivation {
        pname = "lens-family";
-       version = "2.0.0";
-       sha256 = "1nq3dwkrjyqafbv4gvwwgz6ih8y4x9bks11jhljh43q3qnjz54v7";
+       version = "2.1.0";
+       sha256 = "06imgyd97zyvhd3ifq7wvfvfs10x6gsg4cw4a0y9wa0rm81960hl";
        libraryHaskellDepends = [
          base containers lens-family-core mtl transformers
        ];
@@ -151447,19 +140631,19 @@ self: {
     ({ mkDerivation, base, containers, transformers }:
      mkDerivation {
        pname = "lens-family-core";
-       version = "1.2.3";
-       sha256 = "009rf10pj1cb50v44cc1pq7qvfrmkkk9dikahs9qmvbvgl3mykwi";
+       version = "2.0.0";
+       sha256 = "0ni6s873hy2h3b316835ssmlyr05yinb3a8jq5b01p9ppp9zrd0r";
        libraryHaskellDepends = [ base containers transformers ];
-       description = "Haskell 98 Lens Families";
+       description = "Haskell 2022 Lens Families";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "lens-family-core_2_0_0" = callPackage
+  "lens-family-core_2_1_0" = callPackage
     ({ mkDerivation, base, containers, transformers }:
      mkDerivation {
        pname = "lens-family-core";
-       version = "2.0.0";
-       sha256 = "0ni6s873hy2h3b316835ssmlyr05yinb3a8jq5b01p9ppp9zrd0r";
+       version = "2.1.0";
+       sha256 = "1jjzm2f4ixjwysyk8gybzpb98rlf2mmzn0nfg8qvhkf5gl87jv3v";
        libraryHaskellDepends = [ base containers transformers ];
        description = "Haskell 2022 Lens Families";
        license = stdenv.lib.licenses.bsd3;
@@ -151495,8 +140679,6 @@ self: {
          base directory filepath hspec lens lens-action
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lens-labels_0_1_0_2" = callPackage
@@ -151559,8 +140741,6 @@ self: {
        ];
        description = "Alternate prelude that exports lens combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lens-process" = callPackage
@@ -151614,24 +140794,6 @@ self: {
      }) {};
 
   "lens-regex-pcre" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, lens, pcre-heavy
-     , pcre-light, template-haskell, text
-     }:
-     mkDerivation {
-       pname = "lens-regex-pcre";
-       version = "0.3.1.0";
-       sha256 = "1fbhwzs7mwz9c0l3p34zcgfvqxwxlhr3abz9gawlraiiypmz0iby";
-       libraryHaskellDepends = [
-         base bytestring lens pcre-heavy pcre-light template-haskell text
-       ];
-       testHaskellDepends = [
-         base hspec lens pcre-heavy pcre-light template-haskell text
-       ];
-       description = "A lensy interface to regular expressions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lens-regex-pcre_1_1_0_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, gauge, hspec, lens
      , pcre-heavy, pcre-light, template-haskell, text
      }:
@@ -151653,7 +140815,6 @@ self: {
        ];
        description = "A lensy interface to regular expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-simple" = callPackage
@@ -151693,8 +140854,6 @@ self: {
        libraryHaskellDepends = [ base bytestring lens text ];
        description = "Isomorphisms and prisms for text <=> bytestring conversions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lens-time" = callPackage
@@ -151706,8 +140865,6 @@ self: {
        libraryHaskellDepends = [ base lens time ];
        description = "lens for Data.Time";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lens-toml-parser" = callPackage
@@ -151724,8 +140881,6 @@ self: {
        ];
        description = "Lenses for toml-parser";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lens-tutorial" = callPackage
@@ -151738,8 +140893,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Tutorial for the lens library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lens-typelevel" = callPackage
@@ -151804,8 +140957,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "References which can be joined and on which lenses can be applied";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lentil" = callPackage
@@ -151835,21 +140986,6 @@ self: {
      }) {};
 
   "lenz" = callPackage
-    ({ mkDerivation, base, base-unicode-symbols, hs-functors
-     , transformers
-     }:
-     mkDerivation {
-       pname = "lenz";
-       version = "0.3.1.0";
-       sha256 = "1c87m35wvsk9dyfp9d8ar6qb4gz534xmg1rf8xahsjkryn9vjqfn";
-       libraryHaskellDepends = [
-         base base-unicode-symbols hs-functors transformers
-       ];
-       description = "Van Laarhoven lenses";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lenz_0_4_2_0" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, hs-functors
      , transformers
      }:
@@ -151857,12 +140993,13 @@ self: {
        pname = "lenz";
        version = "0.4.2.0";
        sha256 = "13yz9lxxll928knxjgvdxdbnv911pxkd9d5jly1hdnhyymahv6lf";
+       revision = "1";
+       editedCabalFile = "0mzvvddl7wwa4z3rxwdwlaazv0wbg7lfynsab7lya6dzkw4nl7m4";
        libraryHaskellDepends = [
          base base-unicode-symbols hs-functors transformers
        ];
        description = "Van Laarhoven lenses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lenz-mtl" = callPackage
@@ -151873,6 +141010,8 @@ self: {
        pname = "lenz-mtl";
        version = "0.1";
        sha256 = "0ysl87ym7n5pgdrj5ff7840rgjv8yvybnir2xbmzb4vigqs2kp74";
+       revision = "1";
+       editedCabalFile = "0jrr8b3awcn1ly1ny7lbwvxi205cm23zd6q4fd6bvbxi9danc0nr";
        libraryHaskellDepends = [
          base base-unicode-symbols lenz mtl transformers
        ];
@@ -151889,8 +141028,8 @@ self: {
        pname = "lenz-template";
        version = "0.2.0.0";
        sha256 = "0g073wfh8522hvmy80dp8an5jr6qjnkfj3119ms3sir7dkfzljqn";
-       revision = "5";
-       editedCabalFile = "0l75fkl778r9kgigyiijnkw2wn2kd4xkpjj7s3bkswg75dvnrbk0";
+       revision = "6";
+       editedCabalFile = "12n7y1b47rgi942d1hnsiib4smgxd84qp4mbsb1z4rfxlf4wd3lh";
        libraryHaskellDepends = [
          base base-unicode-symbols containers lenz template-haskell
        ];
@@ -151908,8 +141047,6 @@ self: {
        libraryHaskellDepends = [ base fmlist ];
        description = "Non-Determinism Monad for Level-Wise Search";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "leveldb-haskell" = callPackage
@@ -151968,8 +141105,6 @@ self: {
        libraryHaskellDepends = [ base bindings-levmar hmatrix vector ];
        description = "An implementation of the Levenberg-Marquardt algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "levmar-chart" = callPackage
@@ -151983,8 +141118,6 @@ self: {
        libraryHaskellDepends = [ base Chart colour data-accessor levmar ];
        description = "Plots the results of the Levenberg-Marquardt algorithm in a chart";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lex-applicative" = callPackage
@@ -152004,8 +141137,6 @@ self: {
        benchmarkHaskellDepends = [ base gauge util ];
        description = "See README for more info";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lexer-applicative" = callPackage
@@ -152034,8 +141165,6 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "L-Fuzzy Set Theory implementation in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lgtk" = callPackage
@@ -152063,8 +141192,6 @@ self: {
        ];
        description = "Lens GUI Toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lha" = callPackage
@@ -152076,8 +141203,6 @@ self: {
        libraryHaskellDepends = [ haskell2010 ];
        description = "Data structures for the Les Houches Accord";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lhae" = callPackage
@@ -152097,8 +141222,6 @@ self: {
        ];
        description = "Simple spreadsheet program";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lhc" = callPackage
@@ -152112,8 +141235,6 @@ self: {
        enableSeparateDataOutput = true;
        description = "LHC Haskell Compiler";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lhe" = callPackage
@@ -152125,8 +141246,6 @@ self: {
        libraryHaskellDepends = [ bytestring haskell2010 HaXml lha ];
        description = "Parser and writer for Les-Houches event files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lhs2TeX-hl" = callPackage
@@ -152145,8 +141264,6 @@ self: {
        ];
        description = "Literate highlighter preprocessor for lhs2tex";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lhs2html" = callPackage
@@ -152196,8 +141313,6 @@ self: {
        ];
        description = "Tool for using pdflatex with .lhs files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "libGenI" = callPackage
@@ -152214,20 +141329,18 @@ self: {
        ];
        description = "A natural language generator (specifically, an FB-LTAG surface realiser)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "libarchive" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, Cabal, chs-cabal
      , composition-prelude, criterion, deepseq, dir-traverse, directory
-     , dlist, filepath, hspec, libarchive, mtl, tar, tar-conduit
-     , temporary, unix-compat
+     , dlist, filepath, hspec, libarchive, mtl, pathological-bytestrings
+     , tar, tar-conduit, temporary, unix-compat
      }:
      mkDerivation {
        pname = "libarchive";
-       version = "2.2.0.2";
-       sha256 = "0dblwh4gq1s7wh9hjp6481026vfcpns8ixa0vy5lhhc4r9lgkw65";
+       version = "2.2.1.0";
+       sha256 = "08i3fm5rfqmdj4csaqdyyyhvnpdjjsgx5sbi0lyyzvk1sih5q968";
        setupHaskellDepends = [ base Cabal chs-cabal ];
        libraryHaskellDepends = [
          base bytestring composition-prelude deepseq dlist filepath mtl
@@ -152237,15 +141350,13 @@ self: {
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [
          base bytestring composition-prelude dir-traverse directory filepath
-         hspec mtl temporary
+         hspec mtl pathological-bytestrings temporary
        ];
        benchmarkHaskellDepends = [
          base bytestring criterion tar tar-conduit temporary
        ];
        description = "Haskell interface to libarchive";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libarchive;};
 
   "libarchive-conduit" = callPackage
@@ -152282,8 +141393,6 @@ self: {
        testHaskellDepends = [ base doctest doctest-prop lens ];
        description = "Haskell bindings to libconfig";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libconfig;};
 
   "libcspm" = callPackage
@@ -152304,8 +141413,6 @@ self: {
        ];
        description = "A library providing a parser, type checker and evaluator for CSPM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "libexpect" = callPackage
@@ -152318,8 +141425,6 @@ self: {
        librarySystemDepends = [ expect tcl ];
        description = "Library for interacting with console applications via pseudoterminals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) expect; inherit (pkgs) tcl;};
 
   "libffi" = callPackage
@@ -152396,8 +141501,6 @@ self: {
        ];
        description = "Backend for text editors to provide better Haskell editing support";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "libinfluxdb" = callPackage
@@ -152416,8 +141519,6 @@ self: {
        ];
        description = "libinfluxdb";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "libjenkins" = callPackage
@@ -152446,8 +141547,6 @@ self: {
        ];
        description = "Jenkins API interface";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "liblastfm" = callPackage
@@ -152474,8 +141573,6 @@ self: {
        ];
        description = "Lastfm API interface";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "liblawless" = callPackage
@@ -152511,8 +141608,6 @@ self: {
        ];
        description = "Prelude based on protolude for GHC 8 and beyond";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "liblinear-enumerator" = callPackage
@@ -152526,23 +141621,19 @@ self: {
        ];
        description = "liblinear iteratee";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "libltdl" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "libltdl";
-       version = "0.1.1.1";
-       sha256 = "0gqcg444dfsrnid7waxa14a20776ykyg6rnkg23xivs3lni7q341";
+       version = "0.1.1.2";
+       sha256 = "1csb0yd8miiqviaba6h67b8mlalj86kkrlm2yqicgwqwkmfd9jfv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "FFI interface to libltdl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "libmodbus" = callPackage
@@ -152555,8 +141646,6 @@ self: {
        librarySystemDepends = [ modbus ];
        description = "Haskell bindings to the C modbus library";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {modbus = null;};
 
   "libmolude" = callPackage
@@ -152589,8 +141678,6 @@ self: {
        ];
        description = "Prelude based on protolude for GHC 8 and beyond";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "libmpd" = callPackage
@@ -152683,8 +141770,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Bindings to liboath";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {liboath = null; oath = null;};
 
   "liboleg" = callPackage
@@ -152700,8 +141785,6 @@ self: {
        ];
        description = "An evolving collection of Oleg Kiselyov's Haskell modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "libpafe" = callPackage
@@ -152715,8 +141798,6 @@ self: {
        testHaskellDepends = [ base bytestring iconv transformers ];
        description = "Wrapper for libpafe";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {pafe = null;};
 
   "libpq" = callPackage
@@ -152729,8 +141810,6 @@ self: {
        librarySystemDepends = [ postgresql ];
        description = "libpq binding for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) postgresql;};
 
   "libraft" = callPackage
@@ -152782,8 +141861,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Raft consensus algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "librandomorg" = callPackage
@@ -152795,8 +141872,6 @@ self: {
        libraryHaskellDepends = [ base bytestring curl ];
        description = "Wrapper to Random.org API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "librato" = callPackage
@@ -152817,8 +141892,6 @@ self: {
        ];
        description = "Bindings to the Librato API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "libravatar" = callPackage
@@ -152951,8 +142024,6 @@ self: {
        ];
        description = "Haskell bindings for libsystemd-daemon";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {libsystemd-daemon = null; systemd-daemon = null;};
 
   "libsystemd-journal" = callPackage
@@ -152986,8 +142057,6 @@ self: {
        libraryPkgconfigDepends = [ taglib ];
        description = "Binding to TagLib C library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) taglib;};
 
   "libtelnet" = callPackage
@@ -153037,8 +142106,6 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Bindings to libxls";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "libxml" = callPackage
@@ -153069,8 +142136,6 @@ self: {
        ];
        description = "Enumerator-based API for libXML's SAX interface";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "libxml-sax" = callPackage
@@ -153096,8 +142161,6 @@ self: {
        librarySystemDepends = [ xslt ];
        description = "Binding to libxslt";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {xslt = null;};
 
   "libyaml" = callPackage
@@ -153130,25 +142193,23 @@ self: {
      }) {nvpair = null; inherit (pkgs) zfs;};
 
   "licensor" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, cmdargs, containers
-     , directory, http-conduit, process
+    ({ mkDerivation, base, Cabal, cmdargs, containers, directory
+     , process
      }:
      mkDerivation {
        pname = "licensor";
-       version = "0.3.0";
-       sha256 = "1flrn42jvvcv95s9k3qqgk9fw4ybqhazz6ga0hri052wd8nx97ka";
+       version = "0.4.0";
+       sha256 = "17pflw248h54xcsskki8wy9lxkcl1dh3cc5s87f0z49i6h6w8fjg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring Cabal containers directory http-conduit process
+         base Cabal containers directory process
        ];
        executableHaskellDepends = [
          base Cabal cmdargs containers directory
        ];
        description = "A license compatibility helper";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lie" = callPackage
@@ -153204,8 +142265,6 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lift-generics" = callPackage
@@ -153245,8 +142304,8 @@ self: {
      }:
      mkDerivation {
        pname = "lifted-async";
-       version = "0.10.0.4";
-       sha256 = "0cwl1d0wjpdk0v1l1qxiqiksmak950c8gx169c1q77cg0z18ijf9";
+       version = "0.10.0.5";
+       sha256 = "1x3dzw6bh50h0na3y7f49im786x49w1skwj6qbqjh3h6cmh2dd87";
        libraryHaskellDepends = [
          async base constraints lifted-base monad-control transformers-base
        ];
@@ -153289,6 +142348,8 @@ self: {
        pname = "lifted-base-tf";
        version = "0.1.0.0";
        sha256 = "1g3h86b6qrwq9sb5ppnpp4vygnfq4c77mhvzkk87yi56vvd6acix";
+       revision = "2";
+       editedCabalFile = "0n9216wfajawnbnk2bkga4v66bx12i4rknc69gzyrhm3waa86a1y";
        libraryHaskellDepends = [ base basic control ];
        testHaskellDepends = [
          base basic control HUnit lifted-base test-framework
@@ -153299,8 +142360,6 @@ self: {
        ];
        description = "lifted IO operations from the base library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lifted-protolude" = callPackage
@@ -153318,8 +142377,6 @@ self: {
        ];
        description = "A sensible set of defaults for writing lifted custom Preludes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lifted-stm" = callPackage
@@ -153369,8 +142426,6 @@ self: {
        ];
        description = "A boulderdash-like game and solution validator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ligature" = callPackage
@@ -153382,8 +142437,6 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Expand ligatures in unicode text";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ligd" = callPackage
@@ -153430,8 +142483,6 @@ self: {
        ];
        description = "Haskell client for lightning-viz REST API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lightstep-haskell" = callPackage
@@ -153463,8 +142514,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "LightStep OpenTracing client library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lighttpd-conf" = callPackage
@@ -153481,8 +142530,6 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Lighttpd configuration file tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lighttpd-conf-qq" = callPackage
@@ -153499,8 +142546,6 @@ self: {
        ];
        description = "A QuasiQuoter for lighttpd configuration files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lilypond" = callPackage
@@ -153517,8 +142562,6 @@ self: {
        ];
        description = "Bindings to Lilypond";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "limp" = callPackage
@@ -153552,8 +142595,6 @@ self: {
        ];
        description = "bindings for integer linear programming solver Coin/CBC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lin-alg" = callPackage
@@ -153576,8 +142617,6 @@ self: {
        libraryHaskellDepends = [ base hmatrix HUnit ];
        description = "LINear Discriminant Analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linden" = callPackage
@@ -153607,8 +142646,6 @@ self: {
        ];
        description = "Zen gardening, based on l-systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lindenmayer" = callPackage
@@ -153677,8 +142714,6 @@ self: {
        ];
        description = "Haskell SDK for LINE Messaging API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "line-break" = callPackage
@@ -153829,8 +142864,6 @@ self: {
        ];
        description = "A linear algebra library with bindings to BLAS and LAPACK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linear-circuit" = callPackage
@@ -153852,8 +142885,6 @@ self: {
        ];
        description = "Compute resistance of linear electrical circuits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linear-code" = callPackage
@@ -153879,8 +142910,6 @@ self: {
        ];
        description = "A simple library for linear codes (coding theory, error correction)";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linear-grammar" = callPackage
@@ -153907,8 +142936,6 @@ self: {
        libraryHaskellDepends = [ base containers HUnit ];
        description = "Finite maps for linear use";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linear-opengl" = callPackage
@@ -153924,8 +142951,6 @@ self: {
        ];
        description = "Isomorphisms between linear and OpenGL types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linear-socket" = callPackage
@@ -153938,8 +142963,6 @@ self: {
        testHaskellDepends = [ base hspec network tasty-hspec ];
        description = "Typed sockets";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linear-vect" = callPackage
@@ -153951,8 +142974,6 @@ self: {
        libraryHaskellDepends = [ base random ];
        description = "A low-dimensional linear algebra library, operating on the Num typeclass";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linearEqSolver" = callPackage
@@ -153964,8 +142985,6 @@ self: {
        libraryHaskellDepends = [ base sbv ];
        description = "Use SMT solvers to solve linear systems over integers and rationals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linearmap-category" = callPackage
@@ -153985,8 +143004,6 @@ self: {
        ];
        description = "Native, complete, matrix-free linear algebra";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linearscan" = callPackage
@@ -154000,8 +143017,6 @@ self: {
        ];
        description = "Linear scan register allocator, formally verified in Coq";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linearscan-hoopl" = callPackage
@@ -154022,8 +143037,6 @@ self: {
        ];
        description = "Makes it easy to use the linearscan register allocator with Hoopl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linebreak" = callPackage
@@ -154066,8 +143079,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl safe ];
        description = "Lines of Action, 2-player strategy board game";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lingo" = callPackage
@@ -154130,8 +143141,6 @@ self: {
        ];
        description = "linkchk is a network interface link ping monitor";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linkcore" = callPackage
@@ -154148,8 +143157,6 @@ self: {
        ];
        description = "Combines multiple GHC Core modules into a single module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linked-list-with-iterator" = callPackage
@@ -154162,8 +143169,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A pure linked list which is mutable through iterators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linkedhashmap" = callPackage
@@ -154186,8 +143191,6 @@ self: {
        ];
        description = "Persistent LinkedHashMap data structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linklater" = callPackage
@@ -154294,8 +143297,6 @@ self: {
        ];
        description = "Bindings to the Linode API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linode-v4" = callPackage
@@ -154312,8 +143313,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Haskell wrapper for the Linode v4 API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linux-blkid" = callPackage
@@ -154330,8 +143329,6 @@ self: {
        libraryPkgconfigDepends = [ blkid ];
        description = "Linux libblkid";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {blkid = null;};
 
   "linux-cgroup" = callPackage
@@ -154343,8 +143340,6 @@ self: {
        libraryHaskellDepends = [ base filepath ];
        description = "Very basic interface to the Linux CGroup Virtual Filesystem";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linux-evdev" = callPackage
@@ -154382,8 +143377,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hashable unix ];
        description = "Thinner binding to the Linux Kernel's inotify interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linux-kmod" = callPackage
@@ -154396,8 +143389,6 @@ self: {
        libraryPkgconfigDepends = [ libkmod ];
        description = "Linux kernel modules support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {libkmod = null;};
 
   "linux-mount" = callPackage
@@ -154442,8 +143433,6 @@ self: {
        ];
        description = "Read files generated by perf on Linux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linux-ptrace" = callPackage
@@ -154461,8 +143450,6 @@ self: {
        ];
        description = "Wrapping of Linux' ptrace(2)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "linux-xattr" = callPackage
@@ -154494,8 +143481,6 @@ self: {
        ];
        description = "Implementation of the Enea LINX gateway protocol";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lio" = callPackage
@@ -154507,8 +143492,6 @@ self: {
        libraryHaskellDepends = [ base bytestring containers hashable ];
        description = "Labeled IO Information Flow Control Library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lio-eci11" = callPackage
@@ -154525,8 +143508,6 @@ self: {
        ];
        description = "Labeled IO library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lio-fs" = callPackage
@@ -154543,8 +143524,6 @@ self: {
        description = "Labeled File System interface for LIO";
        license = "GPL";
        platforms = [ "i686-linux" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lio-simple" = callPackage
@@ -154569,8 +143548,6 @@ self: {
        ];
        description = "LIO support for the Simple web framework";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lipsum-gen" = callPackage
@@ -154582,8 +143559,6 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Generators for random sequences of English-like nonsense text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "liquid" = callPackage
@@ -154608,8 +143583,6 @@ self: {
        benchmarkHaskellDepends = [ aeson attoparsec base criterion text ];
        description = "Liquid template language library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "liquid-fixpoint" = callPackage
@@ -154748,8 +143721,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "testing list fusion for success";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "list-grouping" = callPackage
@@ -154772,8 +143743,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "List Multiplexing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "list-prompt" = callPackage
@@ -154794,8 +143763,6 @@ self: {
        ];
        description = "A simple list prompt UI for the terminal";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "list-remote-forwards" = callPackage
@@ -154822,8 +143789,6 @@ self: {
        ];
        description = "List all remote forwards for mail accounts stored in a SQL database";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "list-singleton" = callPackage
@@ -154869,8 +143834,6 @@ self: {
        ];
        description = "An \"attoparsec\" adapter for \"list-t\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "list-t-html-parser" = callPackage
@@ -154894,8 +143857,6 @@ self: {
        ];
        description = "Streaming HTML parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "list-t-http-client" = callPackage
@@ -154911,8 +143872,6 @@ self: {
        ];
        description = "A streaming HTTP client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "list-t-libcurl" = callPackage
@@ -154948,8 +143907,6 @@ self: {
        ];
        description = "A streaming text codec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "list-transformer" = callPackage
@@ -155002,23 +143959,6 @@ self: {
      }) {};
 
   "list-witnesses" = callPackage
-    ({ mkDerivation, base, decidable, microlens, profunctors
-     , singletons, vinyl
-     }:
-     mkDerivation {
-       pname = "list-witnesses";
-       version = "0.1.1.1";
-       sha256 = "13h5gckpysf4p5wjfnq7l5v66rmxi3i9cmykf18ld3hnilgd7wa7";
-       libraryHaskellDepends = [
-         base decidable microlens profunctors singletons vinyl
-       ];
-       description = "Witnesses for working with type-level lists";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "list-witnesses_0_1_3_2" = callPackage
     ({ mkDerivation, base, decidable, functor-products, microlens
      , profunctors, singletons, vinyl
      }:
@@ -155032,8 +143972,6 @@ self: {
        ];
        description = "Witnesses for working with type-level lists";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "list-zip-def" = callPackage
@@ -155067,8 +144005,6 @@ self: {
        ];
        description = "A list zipper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "listenbrainz-client" = callPackage
@@ -155086,8 +144022,6 @@ self: {
        ];
        description = "A client library to the ListenBrainz project";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "listlike-instances" = callPackage
@@ -155099,8 +144033,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ListLike text vector ];
        description = "Extra instances of the ListLike class";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lists" = callPackage
@@ -155158,8 +144090,6 @@ self: {
        ];
        description = "Append only key-list database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lit" = callPackage
@@ -155179,8 +144109,6 @@ self: {
        ];
        description = "A simple tool for literate programming";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "literals" = callPackage
@@ -155192,8 +144120,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Non-overloaded functions for concrete literals";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "live-sequencer" = callPackage
@@ -155221,8 +144147,6 @@ self: {
        ];
        description = "Live coding of MIDI music";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "liveplot" = callPackage
@@ -155258,8 +144182,6 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ picosat ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) picosat;};
 
   "llrbtree" = callPackage
@@ -155291,8 +144213,6 @@ self: {
        ];
        description = "An implementation of the LLSD data system";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm" = callPackage
@@ -155309,8 +144229,6 @@ self: {
        ];
        description = "Bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-analysis" = callPackage
@@ -155338,8 +144256,6 @@ self: {
        ];
        description = "A Haskell library for analyzing LLVM bitcode";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-base" = callPackage
@@ -155351,8 +144267,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "FFI bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-base-types" = callPackage
@@ -155373,8 +144287,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "The base types for a mostly pure Haskell LLVM analysis library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-base-util" = callPackage
@@ -155386,8 +144298,6 @@ self: {
        libraryHaskellDepends = [ base llvm-base ];
        description = "Utilities for bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-data-interop" = callPackage
@@ -155408,8 +144318,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A low-level data interoperability binding for LLVM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-extension" = callPackage
@@ -155428,8 +144336,6 @@ self: {
        ];
        description = "Processor specific intrinsics for the llvm interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-extra" = callPackage
@@ -155451,8 +144357,6 @@ self: {
        doHaddock = false;
        description = "Utility functions for the llvm interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-ffi" = callPackage
@@ -155467,8 +144371,6 @@ self: {
        librarySystemDepends = [ LLVM ];
        description = "FFI bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {LLVM = null;};
 
   "llvm-ffi-tools" = callPackage
@@ -155512,8 +144414,6 @@ self: {
        ];
        description = "General purpose LLVM bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {llvm-config = null;};
 
   "llvm-general-pure" = callPackage
@@ -155534,8 +144434,6 @@ self: {
        ];
        description = "Pure Haskell LLVM functionality (no FFI)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-general-quote" = callPackage
@@ -155559,41 +144457,9 @@ self: {
        ];
        description = "QuasiQuoting llvm code for llvm-general";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-hs" = callPackage
-    ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
-     , containers, exceptions, llvm-config, llvm-hs-pure, mtl
-     , pretty-show, process, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, temporary, transformers
-     , utf8-string
-     }:
-     mkDerivation {
-       pname = "llvm-hs";
-       version = "8.0.0";
-       sha256 = "15ykcxxdvrwyb9jqqr4z3wxhy9r1py1k1hvb9icphzjknpx9z66h";
-       revision = "1";
-       editedCabalFile = "1mq04vjz34c8a4291q7ln0wh4kw03hkf2l1659mdrnv7yyi72j0w";
-       setupHaskellDepends = [ base Cabal containers ];
-       libraryHaskellDepends = [
-         array attoparsec base bytestring containers exceptions llvm-hs-pure
-         mtl template-haskell transformers utf8-string
-       ];
-       libraryToolDepends = [ llvm-config ];
-       testHaskellDepends = [
-         base bytestring containers llvm-hs-pure mtl pretty-show process
-         QuickCheck tasty tasty-hunit tasty-quickcheck temporary
-         transformers
-       ];
-       description = "General purpose LLVM bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {llvm-config = null;};
-
-  "llvm-hs_9_0_1" = callPackage
     ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
      , containers, exceptions, llvm-config, llvm-hs-pure, mtl
      , pretty-show, process, QuickCheck, tasty, tasty-hunit
@@ -155617,8 +144483,6 @@ self: {
        ];
        description = "General purpose LLVM bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {llvm-config = null;};
 
   "llvm-hs-pretty" = callPackage
@@ -155639,31 +144503,9 @@ self: {
        ];
        description = "A pretty printer for LLVM IR";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-hs-pure" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, fail
-     , mtl, tasty, tasty-hunit, tasty-quickcheck, template-haskell
-     , transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "llvm-hs-pure";
-       version = "8.0.0";
-       sha256 = "1srlac1vdpxddvbf560npxhldkq27hkxwb2lg4qdwvks55l38nfc";
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers fail mtl template-haskell
-         transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         base containers mtl tasty tasty-hunit tasty-quickcheck transformers
-       ];
-       description = "Pure Haskell LLVM functionality (no FFI)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "llvm-hs-pure_9_0_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, fail
      , mtl, tasty, tasty-hunit, tasty-quickcheck, template-haskell
      , transformers, unordered-containers
@@ -155681,7 +144523,6 @@ self: {
        ];
        description = "Pure Haskell LLVM functionality (no FFI)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-ht" = callPackage
@@ -155697,8 +144538,6 @@ self: {
        ];
        description = "Bindings to the LLVM compiler toolkit with some custom extensions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-pkg-config" = callPackage
@@ -155717,8 +144556,6 @@ self: {
        ];
        description = "Generate Pkg-Config configuration file for LLVM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-pretty" = callPackage
@@ -155730,8 +144567,6 @@ self: {
        libraryHaskellDepends = [ base containers monadLib parsec pretty ];
        description = "A pretty printing library inspired by the llvm binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-pretty-bc-parser" = callPackage
@@ -155758,8 +144593,6 @@ self: {
        ];
        description = "LLVM bitcode parsing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-tf" = callPackage
@@ -155769,8 +144602,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-tf";
-       version = "9.1";
-       sha256 = "1vl7wflgyplw9w8xnryccp263lkzmydrylzvadrll9yzs0jg7p8r";
+       version = "9.1.1";
+       sha256 = "089pq0n3qj3df74g25jkn64byfb4g9f3di1h2fmps8n0yhr8qz3j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -155779,8 +144612,6 @@ self: {
        ];
        description = "Bindings to the LLVM compiler toolkit using type families";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "llvm-tools" = callPackage
@@ -155808,8 +144639,6 @@ self: {
        ];
        description = "Useful tools built on llvm-analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lmdb" = callPackage
@@ -155879,8 +144708,6 @@ self: {
        ];
        description = "LMonad is an Information Flow Control (IFC) framework for Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lmonad-yesod" = callPackage
@@ -155901,8 +144728,6 @@ self: {
        ];
        description = "LMonad for Yesod integrates LMonad's IFC with Yesod web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "load-balancing" = callPackage
@@ -155914,8 +144739,6 @@ self: {
        libraryHaskellDepends = [ base containers hslogger PSQueue stm ];
        description = "Client-side load balancing utilities";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "load-env" = callPackage
@@ -155948,8 +144771,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A cross platform library for loading bundled fonts into your application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "loadavg" = callPackage
@@ -156011,8 +144832,6 @@ self: {
        ];
        description = "Generalised local search within Haskell, for applications in combinatorial optimisation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "localization" = callPackage
@@ -156053,8 +144872,6 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Source location helpers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "located-base" = callPackage
@@ -156079,8 +144896,6 @@ self: {
        libraryHaskellDepends = [ base monad-logger text ];
        description = "Location-aware logging without Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "locators" = callPackage
@@ -156111,8 +144926,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Support for precise error locations in source files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "loch-th" = callPackage
@@ -156165,8 +144978,6 @@ self: {
        ];
        description = "Very simple poll lock";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lockfree-queue" = callPackage
@@ -156224,8 +145035,6 @@ self: {
        ];
        description = "Structured logging solution with multiple backends";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "log-base" = callPackage
@@ -156248,29 +145057,6 @@ self: {
      }) {};
 
   "log-domain" = callPackage
-    ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal
-     , comonad, deepseq, distributive, doctest, generic-deriving
-     , hashable, semigroupoids, semigroups, simple-reflect, vector
-     }:
-     mkDerivation {
-       pname = "log-domain";
-       version = "0.12";
-       sha256 = "0zin3zgxrx8v69blqzkd5gjk0nmpmg58caqz2xa8qd4v1fjcp4bi";
-       revision = "4";
-       editedCabalFile = "1z7p87dl1rj0v2gnfwfa7zmgaxccd093hvjkijc56whyg4b4az4y";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base binary bytes cereal comonad deepseq distributive hashable
-         semigroupoids semigroups vector
-       ];
-       testHaskellDepends = [
-         base doctest generic-deriving semigroups simple-reflect
-       ];
-       description = "Log-domain arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "log-domain_0_13" = callPackage
     ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal
      , comonad, deepseq, distributive, doctest, generic-deriving
      , hashable, semigroupoids, semigroups, simple-reflect, vector
@@ -156291,7 +145077,6 @@ self: {
        ];
        description = "Log-domain arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "log-effect" = callPackage
@@ -156349,8 +145134,6 @@ self: {
        ];
        description = "Structured logging solution (Elasticsearch back end)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "log-postgres" = callPackage
@@ -156372,8 +145155,6 @@ self: {
        ];
        description = "Structured logging solution (PostgreSQL back end)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "log-utils" = callPackage
@@ -156396,8 +145177,6 @@ self: {
        ];
        description = "Utils for working with logs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "log-warper" = callPackage
@@ -156433,8 +145212,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Flexible, configurable, monadic and pretty logging";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "log2json" = callPackage
@@ -156448,8 +145225,6 @@ self: {
        executableHaskellDepends = [ base containers json parsec ];
        description = "Turn log file records into JSON";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "log4hs" = callPackage
@@ -156499,8 +145274,6 @@ self: {
        ];
        description = "Request logger middleware for Logentries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "logfloat" = callPackage
@@ -156529,8 +145302,6 @@ self: {
        ];
        description = "Fast & extensible logging framework";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "logger-thread" = callPackage
@@ -156609,8 +145380,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Supplemental packages for `logging-effect`";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "logging-effect-extra-file" = callPackage
@@ -156629,8 +145398,6 @@ self: {
        executableHaskellDepends = [ base logging-effect prettyprinter ];
        description = "TH splices to augment log messages with file info";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "logging-effect-extra-handler" = callPackage
@@ -156649,8 +145416,6 @@ self: {
        executableHaskellDepends = [ base logging-effect prettyprinter ];
        description = "Handy logging handler combinators";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "logging-facade" = callPackage
@@ -156698,22 +145463,26 @@ self: {
 
   "logic-TPTP" = callPackage
     ({ mkDerivation, alex, ansi-wl-pprint, array, base, containers
-     , happy, mtl, pointed, QuickCheck, semigroups, syb, transformers
-     , transformers-compat
+     , happy, mtl, pcre-light, pointed, QuickCheck, semigroups, syb
+     , transformers, transformers-compat
      }:
      mkDerivation {
        pname = "logic-TPTP";
-       version = "0.4.6.0";
-       sha256 = "06c0c5cr330icp9q11l5mvdf3sd67y31bpc38rvvghqvm1v4zn22";
+       version = "0.4.7.0";
+       sha256 = "1xl9cq85myhfci40dzifd9dhn2mv234m4rbaxiyfbv2ldg81f5mk";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array base containers mtl pointed QuickCheck
          semigroups syb transformers transformers-compat
        ];
        libraryToolDepends = [ alex happy ];
+       testHaskellDepends = [
+         ansi-wl-pprint base pcre-light QuickCheck semigroups transformers
+         transformers-compat
+       ];
        description = "Import, export etc. for TPTP, a syntax for first-order logic";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "logic-classes" = callPackage
@@ -156735,8 +145504,6 @@ self: {
        ];
        description = "Framework for propositional and first order logic, theorem proving";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "logicst" = callPackage
@@ -156795,8 +145562,6 @@ self: {
        testHaskellDepends = [ base hspec time ];
        description = "Parse Heroku application/logplex documents";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "logsink" = callPackage
@@ -156831,8 +145596,6 @@ self: {
        executableHaskellDepends = [ haskell98 ];
        description = "Useful utilities for the Lojban language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lojbanParser" = callPackage
@@ -156847,8 +145610,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "lojban parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lojbanXiragan" = callPackage
@@ -156863,8 +145624,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "lojban to xiragan";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lojysamban" = callPackage
@@ -156878,69 +145637,54 @@ self: {
        executableHaskellDepends = [ base lojbanParser yjtools ];
        description = "Prolog with lojban";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lol" = callPackage
-    ({ mkDerivation, arithmoi, base, bytestring, constraints
-     , containers, crypto-api, data-default, deepseq, directory
-     , monadcryptorandom, MonadRandom, mtl, numeric-prelude
-     , protocol-buffers, protocol-buffers-descriptor, random, reflection
-     , singletons, tagged-transformer, template-haskell, vector
+    ({ mkDerivation, ansi-terminal, arithmoi, base, bytestring
+     , constraints, containers, criterion, criterion-measurement
+     , crypto-api, data-default, deepseq, directory, monadcryptorandom
+     , MonadRandom, mtl, numeric-prelude, protocol-buffers
+     , protocol-buffers-descriptor, QuickCheck, random, reflection
+     , singletons, statistics, tagged-transformer, template-haskell
+     , test-framework, test-framework-quickcheck2, vector
      , vector-th-unbox
      }:
      mkDerivation {
        pname = "lol";
-       version = "0.6.0.0";
-       sha256 = "03cmijcfrc3gqqyvgbxf03569ddhlf00x95p9gih3zcpcg6mwflp";
-       revision = "1";
-       editedCabalFile = "0wbrp9hsgld56cc56509i8fn50g3wrck564ava5n19ylgqrj95dw";
+       version = "0.7.0.0";
+       sha256 = "016l3qr8cvbfqv158l66fsfbbvy1sc9wh2378wbbg7is4v5zq757";
        libraryHaskellDepends = [
-         arithmoi base bytestring constraints containers crypto-api
-         data-default deepseq directory monadcryptorandom MonadRandom mtl
-         numeric-prelude protocol-buffers protocol-buffers-descriptor random
-         reflection singletons tagged-transformer template-haskell vector
+         ansi-terminal arithmoi base bytestring constraints containers
+         criterion criterion-measurement crypto-api data-default deepseq
+         directory monadcryptorandom MonadRandom mtl numeric-prelude
+         protocol-buffers protocol-buffers-descriptor QuickCheck random
+         reflection singletons statistics tagged-transformer
+         template-haskell test-framework test-framework-quickcheck2 vector
          vector-th-unbox
        ];
+       testHaskellDepends = [ base test-framework ];
        description = "A library for lattice cryptography";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       license = stdenv.lib.licenses.gpl3;
      }) {};
 
   "lol-apps" = callPackage
-    ({ mkDerivation, base, containers, deepseq, DRBG, filepath, lol
-     , lol-benches, lol-cpp, lol-repa, lol-tests, MonadRandom, mtl
-     , numeric-prelude, protocol-buffers, protocol-buffers-descriptor
+    ({ mkDerivation, base, constraints, containers, crypto-api, deepseq
+     , DRBG, filepath, lol, MonadRandom, mtl, numeric-prelude, options
+     , protocol-buffers, protocol-buffers-descriptor, QuickCheck
      , singletons, split, test-framework, time
      }:
      mkDerivation {
        pname = "lol-apps";
-       version = "0.2.0.2";
-       sha256 = "120w5qgkzc1pliaqzfibsv45s72bk66wxw7qlmw4i20j867sr0nh";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.3.0.0";
+       sha256 = "15yhr5z5i0p8kzic0g09n54k7hclzjhdywz2mqa9i5lisksq285g";
        libraryHaskellDepends = [
-         base containers deepseq lol MonadRandom mtl numeric-prelude
-         protocol-buffers protocol-buffers-descriptor singletons split
-       ];
-       executableHaskellDepends = [
-         base deepseq DRBG filepath lol lol-cpp MonadRandom mtl
-         numeric-prelude singletons time
-       ];
-       testHaskellDepends = [
-         base lol lol-cpp lol-repa lol-tests MonadRandom numeric-prelude
-         test-framework
-       ];
-       benchmarkHaskellDepends = [
-         base DRBG lol lol-benches lol-cpp lol-repa MonadRandom mtl
-         numeric-prelude
+         base constraints containers crypto-api deepseq DRBG filepath lol
+         MonadRandom mtl numeric-prelude options protocol-buffers
+         protocol-buffers-descriptor QuickCheck singletons split
+         test-framework time
        ];
        description = "Lattice-based cryptographic applications using <https://hackage.haskell.org/package/lol lol>.";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       license = stdenv.lib.licenses.gpl3;
      }) {};
 
   "lol-benches" = callPackage
@@ -156957,8 +145701,6 @@ self: {
        ];
        description = "A library for benchmarking <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lol-calculus" = callPackage
@@ -156980,28 +145722,25 @@ self: {
        ];
        description = "Calculus for LOL (λω language)";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lol-cpp" = callPackage
-    ({ mkDerivation, base, constraints, deepseq, DRBG, lol, lol-benches
-     , lol-tests, MonadRandom, mtl, numeric-prelude, reflection, vector
+    ({ mkDerivation, base, constraints, deepseq, DRBG, lol, lol-apps
+     , MonadRandom, mtl, numeric-prelude, reflection, test-framework
+     , vector
      }:
      mkDerivation {
        pname = "lol-cpp";
-       version = "0.0.0.3";
-       sha256 = "09ck3czb87bzysf7x2p1wk88hxj0p0fa8vv68ymxkawsz730rzj2";
+       version = "0.2.0.0";
+       sha256 = "05nx6lf9jcw3m29j733rs0blxkg75ciam29fybgz94r2f4i928f3";
        libraryHaskellDepends = [
          base constraints deepseq lol MonadRandom mtl numeric-prelude
          reflection vector
        ];
-       testHaskellDepends = [ base lol-tests ];
-       benchmarkHaskellDepends = [ base DRBG lol lol-benches ];
+       testHaskellDepends = [ base lol lol-apps test-framework ];
+       benchmarkHaskellDepends = [ base DRBG lol lol-apps MonadRandom ];
        description = "A fast C++ backend for <https://hackage.haskell.org/package/lol lol>.";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       license = stdenv.lib.licenses.gpl3;
      }) {};
 
   "lol-repa" = callPackage
@@ -157021,8 +145760,6 @@ self: {
        benchmarkHaskellDepends = [ base DRBG lol lol-benches ];
        description = "A repa backend for <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lol-tests" = callPackage
@@ -157042,8 +145779,6 @@ self: {
        testHaskellDepends = [ base lol test-framework ];
        description = "A library for testing <https://hackage.haskell.org/package/lol Λ ∘ λ>.";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lol-typing" = callPackage
@@ -157068,8 +145803,6 @@ self: {
        ];
        description = "Type inferencer for LOL (λω language)";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "loli" = callPackage
@@ -157087,8 +145820,6 @@ self: {
        ];
        description = "A minimum web dev DSL in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "long-double" = callPackage
@@ -157113,8 +145844,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Dependently-typed linked list implementation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lookup-tables" = callPackage
@@ -157129,8 +145858,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Statically generate lookup tables using Template Haskell";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "loop" = callPackage
@@ -157158,8 +145885,6 @@ self: {
        libraryHaskellDepends = [ base effin ];
        description = "control-monad-loop port for effin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "loop-while" = callPackage
@@ -157171,8 +145896,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformer supporting various styles of while loop";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "loopbreaker" = callPackage
@@ -157224,8 +145947,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion transformers vector ];
        description = "Fast imperative-style loops";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "loopy" = callPackage
@@ -157244,8 +145965,6 @@ self: {
        ];
        description = "Find all biological feedback loops within an ecosystem graph";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lord" = callPackage
@@ -157286,8 +146005,6 @@ self: {
        ];
        description = "A command line interface to online radios";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lorem" = callPackage
@@ -157302,8 +146019,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Library for generating filler text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "loris" = callPackage
@@ -157317,8 +146032,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "interface to Loris API";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {loris = null;};
 
   "loshadka" = callPackage
@@ -157337,8 +146050,6 @@ self: {
        ];
        description = "Minecraft 1.7 server proxy that answers to queries when the server is offline";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lostcities" = callPackage
@@ -157356,8 +146067,6 @@ self: {
        ];
        description = "An implementation of an adictive two-player card game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "louis" = callPackage
@@ -157391,8 +146100,6 @@ self: {
        executableHaskellDepends = [ base optparse-generic shakers ];
        description = "Amazon Simple Workflow Service Wrapper for Work Pools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lowgl" = callPackage
@@ -157404,8 +146111,6 @@ self: {
        libraryHaskellDepends = [ base gl linear vector ];
        description = "Basic gl wrapper and reference";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lp-diagrams" = callPackage
@@ -157424,8 +146129,6 @@ self: {
        ];
        description = "An EDSL for diagrams based based on linear constraints";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lp-diagrams-svg" = callPackage
@@ -157445,8 +146148,6 @@ self: {
        ];
        description = "SVG Backend for lp-diagrams";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lrucache" = callPackage
@@ -157496,8 +146197,6 @@ self: {
        ];
        description = "List USB devices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lscabal" = callPackage
@@ -157515,36 +146214,9 @@ self: {
        ];
        description = "List exported modules from a set of .cabal files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lsp-test" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base
-     , bytestring, conduit, conduit-parse, containers, data-default
-     , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl
-     , parser-combinators, process, rope-utf16-splay, text, transformers
-     , unix, unordered-containers
-     }:
-     mkDerivation {
-       pname = "lsp-test";
-       version = "0.6.1.0";
-       sha256 = "195p9m4992l01k8xsc8yxwsx3g74xfn6rdi00bwlzxw4ijy06lfi";
-       libraryHaskellDepends = [
-         aeson aeson-pretty ansi-terminal async base bytestring conduit
-         conduit-parse containers data-default Diff directory filepath
-         haskell-lsp lens mtl parser-combinators process rope-utf16-splay
-         text transformers unix unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base data-default haskell-lsp hspec lens text
-         unordered-containers
-       ];
-       description = "Functional test framework for LSP servers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lsp-test_0_10_1_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base
      , bytestring, conduit, conduit-parse, containers, data-default
      , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl
@@ -157567,7 +146239,6 @@ self: {
        ];
        description = "Functional test framework for LSP servers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lss" = callPackage
@@ -157605,8 +146276,6 @@ self: {
        ];
        description = "Paint an L-System Grammar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ltext" = callPackage
@@ -157638,8 +146307,6 @@ self: {
        ];
        description = "Parameterized file evaluator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ltiv1p1" = callPackage
@@ -157679,8 +146346,6 @@ self: {
        libraryPkgconfigDepends = [ gtk3 ];
        description = "Leksah tool kit";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtk3;};
 
   "ltl" = callPackage
@@ -157710,8 +146375,6 @@ self: {
        ];
        description = "Lua bytecode parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lua-bytecode" = callPackage
@@ -157744,8 +146407,6 @@ self: {
        ];
        description = "Library functions for reading and writing Lua chunks";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "luautils" = callPackage
@@ -157767,8 +146428,6 @@ self: {
        ];
        description = "Helpers for Haskell integration with Lua";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lub" = callPackage
@@ -157880,8 +146539,6 @@ self: {
        ];
        description = "Server side feed aggregator/reader";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "luhn" = callPackage
@@ -157908,8 +146565,6 @@ self: {
        ];
        description = "Purely FunctionaL User Interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "luis-client" = callPackage
@@ -157924,8 +146579,6 @@ self: {
        ];
        description = "An unofficial client for the LUIS NLP service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "luka" = callPackage
@@ -157939,8 +146592,6 @@ self: {
        librarySystemDepends = [ objc ];
        description = "Simple ObjectiveC runtime binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {objc = null;};
 
   "lukko" = callPackage
@@ -157960,6 +146611,27 @@ self: {
        license = "GPL-2.0-or-later AND BSD-3-Clause";
      }) {};
 
+  "lumberjack" = callPackage
+    ({ mkDerivation, base, contravariant, exceptions, mtl
+     , prettyprinter, prettyprinter-ansi-terminal, text, time
+     }:
+     mkDerivation {
+       pname = "lumberjack";
+       version = "0.1.0.1";
+       sha256 = "1fgdhzkykyvi8dfy8yrv2rnr801677831k12k22i59afdw076xqg";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base contravariant exceptions mtl prettyprinter
+         prettyprinter-ansi-terminal text time
+       ];
+       executableHaskellDepends = [
+         base exceptions mtl prettyprinter text
+       ];
+       description = "Trek through your code forest and make logs";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "luminance" = callPackage
     ({ mkDerivation, base, containers, contravariant, dlist, gl, linear
      , mtl, resourcet, semigroups, transformers, vector, void
@@ -157974,8 +146646,6 @@ self: {
        ];
        description = "Type-safe, type-level and stateless graphics framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "luminance-samples" = callPackage
@@ -157994,8 +146664,6 @@ self: {
        ];
        description = "Luminance samples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lushtags" = callPackage
@@ -158009,8 +146677,6 @@ self: {
        executableHaskellDepends = [ base haskell-src-exts text vector ];
        description = "Create ctags compatible tags files for Haskell programs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "luthor" = callPackage
@@ -158023,8 +146689,6 @@ self: {
        testHaskellDepends = [ base mtl parsec ];
        description = "Tools for lexing and utilizing lexemes that integrate with Parsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lvish" = callPackage
@@ -158052,8 +146716,6 @@ self: {
        ];
        description = "Parallel scheduler, LVar data structures, and infrastructure to build more";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lvmlib" = callPackage
@@ -158076,8 +146738,6 @@ self: {
        ];
        description = "The Lazy Virtual Machine (LVM)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lvmrun" = callPackage
@@ -158101,8 +146761,6 @@ self: {
        libraryHaskellDepends = [ base bindings-lxc mtl transformers ];
        description = "High level Haskell bindings to LXC (Linux containers)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lxd-client" = callPackage
@@ -158132,8 +146790,6 @@ self: {
        ];
        description = "LXD client written in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lxd-client-config" = callPackage
@@ -158171,8 +146827,6 @@ self: {
        ];
        description = "A Lilypond-compiling music box";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lz4" = callPackage
@@ -158206,8 +146860,6 @@ self: {
        ];
        description = "Bindings to LZ4";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lz4-conduit" = callPackage
@@ -158231,8 +146883,6 @@ self: {
        ];
        description = "LZ4 compression for conduits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lzip" = callPackage
@@ -158252,8 +146902,8 @@ self: {
      }:
      mkDerivation {
        pname = "lzlib";
-       version = "1.0.1.0";
-       sha256 = "0zajkhck36p4fgy40rsd2zsd3ja7i9fkizwix38xpwdi1ygrfjxf";
+       version = "1.0.2.1";
+       sha256 = "15vg3gcysssql7r53zmk08v886vp2dh4lg0hdg8rbdjhyv5sjnyc";
        libraryHaskellDepends = [ base bytestring ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [
@@ -158336,8 +146986,6 @@ self: {
        ];
        description = "Enumerator interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) lzma;};
 
   "lzma-streams" = callPackage
@@ -158358,8 +147006,6 @@ self: {
        ];
        description = "IO-Streams interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mDNSResponder-client" = callPackage
@@ -158376,8 +147022,6 @@ self: {
        testHaskellDepends = [ base bytestring Cabal ];
        description = "Library for talking to the mDNSResponder daemon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "maam" = callPackage
@@ -158394,8 +147038,6 @@ self: {
        ];
        description = "Monadic Abstracting Abstract Machines (MAAM) built on Galois Transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mac" = callPackage
@@ -158432,8 +147074,6 @@ self: {
        testHaskellDepends = [ attoparsec base bytestring hspec ];
        description = "Macbeth - A beautiful and minimalistic FICS client";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "maccatcher" = callPackage
@@ -158465,37 +147105,9 @@ self: {
        ];
        description = "Arrow based stream transducers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "machines" = callPackage
-    ({ mkDerivation, adjunctions, base, Cabal, cabal-doctest, comonad
-     , conduit, containers, criterion, distributive, doctest, mtl, pipes
-     , pointed, profunctors, semigroupoids, semigroups, streaming
-     , transformers, transformers-compat, void
-     }:
-     mkDerivation {
-       pname = "machines";
-       version = "0.6.4";
-       sha256 = "0s3pvdklanw6a41pyyqrplm3vid63dpy6vd6qhp86dnb4wp2ppkj";
-       revision = "2";
-       editedCabalFile = "1h0qq6kxv4kc0j0rmx7rhwhvfg1hc08r10q152km4p8kgshcwlig";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         adjunctions base comonad containers distributive mtl pointed
-         profunctors semigroupoids semigroups transformers
-         transformers-compat void
-       ];
-       testHaskellDepends = [ base doctest ];
-       benchmarkHaskellDepends = [
-         base conduit criterion mtl pipes streaming
-       ];
-       description = "Networked stream transducers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "machines_0_7" = callPackage
     ({ mkDerivation, adjunctions, base, Cabal, cabal-doctest, comonad
      , conduit, containers, criterion, distributive, doctest, mtl, pipes
      , pointed, profunctors, semigroupoids, semigroups, streaming
@@ -158517,7 +147129,6 @@ self: {
        ];
        description = "Networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "machines-amazonka" = callPackage
@@ -158539,8 +147150,6 @@ self: {
        ];
        description = "Machine transducers for Amazonka calls";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "machines-attoparsec" = callPackage
@@ -158638,8 +147247,6 @@ self: {
        ];
        description = "Process (system) utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "machines-zlib" = callPackage
@@ -158654,8 +147261,6 @@ self: {
        ];
        description = "Decompression support for machines";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "macho" = callPackage
@@ -158691,8 +147296,6 @@ self: {
        ];
        description = "An API client library for Mackerel";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "maclight" = callPackage
@@ -158717,8 +147320,6 @@ self: {
        ];
        description = "Control screen and keyboard backlights on MACs under Linux";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "macos-corelibs" = callPackage
@@ -158734,8 +147335,6 @@ self: {
        ];
        description = "Haskell bindings to C-based Mac OS SDK frameworks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "macosx-make-standalone" = callPackage
@@ -158755,8 +147354,6 @@ self: {
        ];
        description = "Make a macosx app standalone deployable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mad-props" = callPackage
@@ -158809,8 +147406,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion megaparsec text ];
        description = "Randomized templating language DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mage" = callPackage
@@ -158826,8 +147421,6 @@ self: {
        executableSystemDepends = [ ncurses ];
        description = "Rogue-like";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) ncurses;};
 
   "magic" = callPackage
@@ -158881,8 +147474,6 @@ self: {
        ];
        description = "Interact with Magic Wormhole";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "magicbane" = callPackage
@@ -158913,8 +147504,6 @@ self: {
        ];
        description = "A web framework that integrates Servant, RIO, EKG, fast-logger, wai-cli…";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "magico" = callPackage
@@ -158932,8 +147521,6 @@ self: {
        ];
        description = "Compute solutions for Magico puzzle";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "magma" = callPackage
@@ -158945,8 +147532,17 @@ self: {
        libraryHaskellDepends = [ base deepseq profunctors semigroups ];
        description = "magma is an algebraic structure consisting a set together with an binary operation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+     }) {};
+
+  "magmas" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "magmas";
+       version = "0.0.1";
+       sha256 = "006axj7hwdiq3gyxx9rpqz9ji1g7xpal7j8wrlgfa2as1s73076b";
+       libraryHaskellDepends = [ base ];
+       description = "Magma-like objects";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "mahoro" = callPackage
@@ -158967,8 +147563,6 @@ self: {
        ];
        description = "ImageBoards to XMPP gate";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "maid" = callPackage
@@ -158990,8 +147584,6 @@ self: {
        ];
        description = "A simple static web server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mail-pool" = callPackage
@@ -159014,8 +147606,6 @@ self: {
        ];
        description = "Preconfigured email connection pool on top of smtp";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mailbox-count" = callPackage
@@ -159040,8 +147630,6 @@ self: {
        ];
        description = "Count mailboxes in a SQL database";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mailchimp" = callPackage
@@ -159060,8 +147648,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Bindings for the MailChimp API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mailchimp-subscribe" = callPackage
@@ -159080,8 +147666,6 @@ self: {
        ];
        description = "MailChimp subscription request handler";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mailgun" = callPackage
@@ -159101,8 +147685,6 @@ self: {
        ];
        description = "API binding for Mailgun";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "main-tester" = callPackage
@@ -159166,8 +147748,6 @@ self: {
        ];
        description = "Majordomo protocol for ZeroMQ";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "majority" = callPackage
@@ -159179,8 +147759,6 @@ self: {
        libraryHaskellDepends = [ haskell2010 ];
        description = "Boyer-Moore Majority Vote Algorithm";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "make-hard-links" = callPackage
@@ -159198,8 +147776,6 @@ self: {
        ];
        description = "Change duplicated files into hard-links";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "make-monofoldable-foldable" = callPackage
@@ -159211,8 +147787,6 @@ self: {
        libraryHaskellDepends = [ base mono-traversable ];
        description = "Make a MonoFoldable type into an ordinary Foldable type";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "make-package" = callPackage
@@ -159233,8 +147807,6 @@ self: {
        ];
        description = "Make a cabalized package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "makedo" = callPackage
@@ -159246,8 +147818,6 @@ self: {
        libraryHaskellDepends = [ base directory filepath HSH process ];
        description = "Helper for writing redo scripts in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "makefile" = callPackage
@@ -159265,8 +147835,6 @@ self: {
        ];
        description = "Simple Makefile parser and generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mallard" = callPackage
@@ -159294,8 +147862,6 @@ self: {
        ];
        description = "Database migration and testing as a library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mameya" = callPackage
@@ -159342,8 +147908,6 @@ self: {
        ];
        description = "The Haskell/Gtk+ Integrated Live Environment";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manatee-all" = callPackage
@@ -159390,8 +147954,6 @@ self: {
        ];
        description = "Multithread interactive input/search framework for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manatee-browser" = callPackage
@@ -159435,8 +147997,6 @@ self: {
        ];
        description = "The core of Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manatee-curl" = callPackage
@@ -159459,8 +148019,6 @@ self: {
        ];
        description = "Download Manager extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manatee-editor" = callPackage
@@ -159481,8 +148039,6 @@ self: {
        ];
        description = "Editor extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manatee-filemanager" = callPackage
@@ -159503,8 +148059,6 @@ self: {
        ];
        description = "File manager extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manatee-imageviewer" = callPackage
@@ -159525,8 +148079,6 @@ self: {
        ];
        description = "Image viewer extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manatee-ircclient" = callPackage
@@ -159551,8 +148103,6 @@ self: {
        ];
        description = "IRC client extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manatee-mplayer" = callPackage
@@ -159574,8 +148124,6 @@ self: {
        ];
        description = "Mplayer client extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manatee-pdfviewer" = callPackage
@@ -159596,8 +148144,6 @@ self: {
        ];
        description = "PDF viewer extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manatee-processmanager" = callPackage
@@ -159617,8 +148163,6 @@ self: {
        ];
        description = "Process manager extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manatee-reader" = callPackage
@@ -159659,8 +148203,6 @@ self: {
        ];
        description = "Template code to create Manatee application";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manatee-terminal" = callPackage
@@ -159680,8 +148222,6 @@ self: {
        ];
        description = "Terminal Emulator extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manatee-welcome" = callPackage
@@ -159701,8 +148241,6 @@ self: {
        ];
        description = "Welcome module to help user play Manatee quickly";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mancala" = callPackage
@@ -159740,8 +148278,6 @@ self: {
        ];
        description = "Library for interfacing with the Mandrill JSON API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mandulia" = callPackage
@@ -159760,8 +148296,6 @@ self: {
        ];
        description = "A zooming visualisation of the Mandelbrot Set as many Julia Sets";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mangopay" = callPackage
@@ -159800,8 +148334,6 @@ self: {
        ];
        description = "Bindings to the MangoPay API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manifold-random" = callPackage
@@ -159818,8 +148350,6 @@ self: {
        ];
        description = "Sampling random points on general manifolds";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manifolds" = callPackage
@@ -159849,8 +148379,6 @@ self: {
        ];
        description = "Coordinate-free hypersurfaces";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "manifolds-core" = callPackage
@@ -159892,8 +148420,6 @@ self: {
        executableHaskellDepends = [ base bytestring cassava containers ];
        description = "Extensions to Data.Map";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "map-reduce-folds" = callPackage
@@ -159921,8 +148447,6 @@ self: {
        ];
        description = "foldl wrappers for map-reduce";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "map-syntax" = callPackage
@@ -159941,8 +148465,6 @@ self: {
        ];
        description = "Syntax sugar for defining maps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mapalgebra" = callPackage
@@ -159963,8 +148485,6 @@ self: {
        ];
        description = "Efficient, polymorphic Map Algebra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mappy" = callPackage
@@ -159987,8 +148507,6 @@ self: {
        testHaskellDepends = [ base containers hspec parsec QuickCheck ];
        description = "A functional programming language focused around maps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mapquest-api" = callPackage
@@ -160048,8 +148566,6 @@ self: {
        ];
        description = "A study of marionetta movements";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "markdown" = callPackage
@@ -160095,8 +148611,6 @@ self: {
        ];
        description = "Convert Markdown to HTML, with XSS protection";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "markdown-pap" = callPackage
@@ -160108,8 +148622,6 @@ self: {
        libraryHaskellDepends = [ base monads-tf papillon ];
        description = "markdown parser with papillon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "markdown-unlit" = callPackage
@@ -160148,8 +148660,6 @@ self: {
        ];
        description = "markdown to svg converter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "marked-pretty" = callPackage
@@ -160162,8 +148672,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Pretty-printing library, with scoping, based on pretty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "markov" = callPackage
@@ -160203,8 +148711,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Computations for Markov chain usage models";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "markov-processes" = callPackage
@@ -160221,8 +148727,6 @@ self: {
        testHaskellDepends = [ assertions base bifunctors memoize random ];
        description = "Hidden Markov processes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "markov-realization" = callPackage
@@ -160235,8 +148739,6 @@ self: {
        testHaskellDepends = [ base HTF ];
        description = "Realizations of Markov chains";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "markup" = callPackage
@@ -160255,8 +148757,6 @@ self: {
        ];
        description = "Abstraction for HTML-embedded content";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "markup-preview" = callPackage
@@ -160305,8 +148805,6 @@ self: {
        ];
        description = "Upload packages to Marmalade";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "marquise" = callPackage
@@ -160341,8 +148839,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec ];
        description = "Client library for Vaultaire";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mars" = callPackage
@@ -160358,8 +148854,6 @@ self: {
        ];
        description = "Generates mountainous terrain using a random walk algorithm";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "marshal-contt" = callPackage
@@ -160373,8 +148867,6 @@ self: {
        ];
        description = "A ContT-based wrapper for Haskell-to-C marshalling functions";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "marvin" = callPackage
@@ -160409,8 +148901,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "A framework for modular, portable chat bots";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "marvin-interpolate" = callPackage
@@ -160427,8 +148917,6 @@ self: {
        testHaskellDepends = [ base hspec text ];
        description = "Compile time string interpolation a la Scala and CoffeeScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "marxup" = callPackage
@@ -160452,8 +148940,6 @@ self: {
        ];
        description = "Markup language preprocessor for Haskell";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "masakazu-bot" = callPackage
@@ -160476,8 +148962,6 @@ self: {
        ];
        description = "@minamiyama1994_bot on haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mason" = callPackage
@@ -160493,8 +148977,6 @@ self: {
        ];
        description = "Fast and extensible bytestring builder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "massiv" = callPackage
@@ -160518,29 +149000,33 @@ self: {
        ];
        description = "Massiv (Массив) is an Array Library";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "massiv_0_5_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, cabal-doctest
+     , data-default-class, deepseq, doctest, exceptions
+     , mersenne-random-pure64, primitive, QuickCheck, random, scheduler
+     , splitmix, template-haskell, unliftio-core, vector
+     }:
+     mkDerivation {
+       pname = "massiv";
+       version = "0.5.0.0";
+       sha256 = "09hyrlhcvqrhsmyl7lsm9qmp8yshia1jmjh2bqlsnw8xvwg2z13a";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base bytestring data-default-class deepseq exceptions primitive
+         scheduler unliftio-core vector
+       ];
+       testHaskellDepends = [
+         base doctest mersenne-random-pure64 QuickCheck random splitmix
+         template-haskell
+       ];
+       description = "Massiv (Массив) is an Array Library";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "massiv-io" = callPackage
-    ({ mkDerivation, base, bytestring, data-default-class, deepseq
-     , directory, filepath, JuicyPixels, massiv, netpbm, process, vector
-     }:
-     mkDerivation {
-       pname = "massiv-io";
-       version = "0.1.9.0";
-       sha256 = "0splwbavahv3g0p1pyhym9hwncaw7zd5f12girwxlwhcdwrsgz3r";
-       libraryHaskellDepends = [
-         base bytestring data-default-class deepseq directory filepath
-         JuicyPixels massiv netpbm process vector
-       ];
-       description = "Import/export of Image files into massiv Arrays";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "massiv-io_0_2_0_0" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, Color
      , data-default-class, deepseq, doctest, exceptions, filepath, hspec
      , JuicyPixels, massiv, massiv-test, netpbm, QuickCheck, random
@@ -160550,6 +149036,8 @@ self: {
        pname = "massiv-io";
        version = "0.2.0.0";
        sha256 = "1gypn2srqsnzmx1jd28632w34n7z4x5wadi4m7srxdhwk14vqg2m";
+       revision = "1";
+       editedCabalFile = "0kg2k84r5sxbg5pjjva639l0h1c4nhahmy1iakwmczkxjnzh6f8a";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base bytestring Color data-default-class deepseq exceptions
@@ -160561,8 +149049,6 @@ self: {
        ];
        description = "Import/export of Image files into massiv Arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "massiv-scheduler" = callPackage
@@ -160604,8 +149090,29 @@ self: {
        ];
        description = "Library that contains generators, properties and tests for Massiv Array Library";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "massiv-test_0_1_3" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-default
+     , data-default-class, deepseq, exceptions, genvalidity-hspec, hspec
+     , massiv, mwc-random, primitive, QuickCheck, scheduler, unliftio
+     , vector
+     }:
+     mkDerivation {
+       pname = "massiv-test";
+       version = "0.1.3";
+       sha256 = "1pkqaw43vzsh19ycr6pp817wq2k06gpkxqn8i09dkfzddbgymkf6";
+       libraryHaskellDepends = [
+         base bytestring data-default-class deepseq exceptions hspec massiv
+         primitive QuickCheck scheduler unliftio vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers data-default deepseq genvalidity-hspec
+         hspec massiv mwc-random QuickCheck scheduler vector
+       ];
+       description = "Library that contains generators, properties and tests for Massiv Array Library";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "master-plan" = callPackage
@@ -160630,8 +149137,6 @@ self: {
        ];
        description = "The project management tool for hackers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mastermind" = callPackage
@@ -160679,8 +149184,6 @@ self: {
        testHaskellDepends = [ base containers matchable ];
        description = "Generates Matchable instances using TemplateHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "matcher" = callPackage
@@ -160708,8 +149211,6 @@ self: {
        librarySystemDepends = [ pcre ];
        description = "Text matchers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) pcre;};
 
   "math-functions" = callPackage
@@ -160747,8 +149248,6 @@ self: {
        testHaskellDepends = [ array base containers hspec random ];
        description = "Library containing graph data structures and graph algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "math-interpolate" = callPackage
@@ -160797,8 +149296,6 @@ self: {
        ];
        description = "A program for creating and managing a static weblog with LaTeX math and diagrams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mathexpr" = callPackage
@@ -160829,8 +149326,6 @@ self: {
        ];
        description = "Dependently typed tensorflow modeler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mathgenealogy" = callPackage
@@ -160850,8 +149345,6 @@ self: {
        ];
        description = "Discover your (academic) ancestors!";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mathista" = callPackage
@@ -160891,8 +149384,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Write Mathematica packages in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "matlab" = callPackage
@@ -160979,8 +149470,6 @@ self: {
        ];
        description = "Read and Display representation of matrix like \"x,y,z\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "matrix-market" = callPackage
@@ -161043,6 +149532,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "matrix-static_0_3" = callPackage
+    ({ mkDerivation, base, deepseq, ghc-typelits-natnormalise, matrix
+     , tasty, tasty-hunit, vector
+     }:
+     mkDerivation {
+       pname = "matrix-static";
+       version = "0.3";
+       sha256 = "0g7vijwj6l8l10276smhycp1h30diy8naykxf184lm87ykx2aamv";
+       libraryHaskellDepends = [
+         base deepseq ghc-typelits-natnormalise matrix vector
+       ];
+       testHaskellDepends = [
+         base deepseq ghc-typelits-natnormalise matrix tasty tasty-hunit
+         vector
+       ];
+       description = "Type-safe matrix operations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "matsuri" = callPackage
     ({ mkDerivation, base, ConfigFile, containers, directory, MissingH
      , mtl, network, old-locale, split, time, vty, vty-ui, XMPP
@@ -161060,8 +149569,6 @@ self: {
        ];
        description = "ncurses XMPP client";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "matterhorn" = callPackage
@@ -161162,8 +149669,6 @@ self: {
        ];
        description = "An interface to the Maude rewriting system";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "maxent" = callPackage
@@ -161185,8 +149690,6 @@ self: {
        ];
        description = "Compute Maximum Entropy Distributions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "maxent-learner-hw" = callPackage
@@ -161210,8 +149713,6 @@ self: {
        ];
        description = "Hayes and Wilson's maxent learning algorithm for phonotactic grammars";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "maxent-learner-hw-gui" = callPackage
@@ -161233,8 +149734,6 @@ self: {
        ];
        description = "GUI for maxent-learner-hw";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "maximal-cliques" = callPackage
@@ -161267,8 +149766,6 @@ self: {
        ];
        description = "Maximal sharing of terms in the lambda calculus with letrec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "maybe-justify" = callPackage
@@ -161299,8 +149796,6 @@ self: {
        ];
        description = "Automated benchmarking tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mbox" = callPackage
@@ -161332,8 +149827,6 @@ self: {
        ];
        description = "A collection of tools to process mbox files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mbox-utility" = callPackage
@@ -161395,8 +149888,6 @@ self: {
        ];
        description = "download bugs mailboxes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mcl" = callPackage
@@ -161423,8 +149914,6 @@ self: {
        ];
        description = "Bindings to mcl, a generic and fast pairing-based cryptography library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gmpxx; mcl = null; inherit (pkgs) openssl;};
 
   "mcm" = callPackage
@@ -161444,8 +149933,6 @@ self: {
        ];
        description = "Machine Configuration Manager";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mcmaster-gloss-examples" = callPackage
@@ -161458,8 +149945,6 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base gloss ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mcmc-samplers" = callPackage
@@ -161475,8 +149960,6 @@ self: {
        ];
        description = "Combinators for MCMC sampling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mcmc-synthesis" = callPackage
@@ -161488,8 +149971,6 @@ self: {
        libraryHaskellDepends = [ base MonadRandom ];
        description = "MCMC applied to probabilistic program synthesis";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mcmc-types" = callPackage
@@ -161517,8 +149998,6 @@ self: {
        executableHaskellDepends = [ base transformers ];
        description = "Connect to MineCraft running on a Raspberry PI";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mdapi" = callPackage
@@ -161537,8 +150016,6 @@ self: {
        ];
        description = "Haskell interface to Fedora's mdapi";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mdcat" = callPackage
@@ -161558,8 +150035,6 @@ self: {
        ];
        description = "Markdown viewer in your terminal";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mdo" = callPackage
@@ -161589,8 +150064,6 @@ self: {
        testHaskellDepends = [ base HTF HUnit QuickCheck vector ];
        description = "Tools for solving Markov Decision Processes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mealstrom" = callPackage
@@ -161612,8 +150085,6 @@ self: {
        ];
        description = "Manipulate FSMs and store them in PostgreSQL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "means" = callPackage
@@ -161637,8 +150108,6 @@ self: {
        librarySystemDepends = [ mecab ];
        description = "A Haskell binding to MeCab";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) mecab;};
 
   "mech" = callPackage
@@ -161650,8 +150119,6 @@ self: {
        libraryHaskellDepends = [ base machines ];
        description = "mecha are the most complex composite machines known to humanity, lets build them well!";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mecha" = callPackage
@@ -161676,8 +150143,6 @@ self: {
        libraryHaskellDepends = [ base machines ];
        description = "mecha are the most complex composite machines known to humanity, lets build them well!";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "med-module" = callPackage
@@ -161695,8 +150160,6 @@ self: {
        ];
        description = "Parse song module files from Amiga MED and OctaMED";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mediabus" = callPackage
@@ -161727,8 +150190,6 @@ self: {
        ];
        description = "Multimedia streaming on top of Conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mediabus-fdk-aac" = callPackage
@@ -161756,8 +150217,6 @@ self: {
        ];
        description = "Mediabus plugin for the Frauenhofer ISO-14496-3 AAC FDK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {fdk-aac = null;};
 
   "mediabus-rtp" = callPackage
@@ -161795,8 +150254,6 @@ self: {
        ];
        description = "Receive and Send RTP Packets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "median-stream" = callPackage
@@ -161827,8 +150284,6 @@ self: {
        ];
        description = "Interfacing with the MediaWiki API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mediawiki2latex" = callPackage
@@ -161856,8 +150311,6 @@ self: {
        ];
        description = "Convert MediaWiki text to LaTeX";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "medium-sdk-haskell" = callPackage
@@ -161874,8 +150327,6 @@ self: {
        ];
        description = "Haskell SDK for communicating with the Medium API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "meep" = callPackage
@@ -161914,31 +150365,9 @@ self: {
        ];
        description = "Handles uploading to Hackage from mega repos";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "megaparsec" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , criterion, deepseq, mtl, parser-combinators, scientific, text
-     , transformers, weigh
-     }:
-     mkDerivation {
-       pname = "megaparsec";
-       version = "7.0.5";
-       sha256 = "0bqx1icbmk8s7wmbcdzsgnlh607c7kzg8l80cp02dxr5valjxp7j";
-       libraryHaskellDepends = [
-         base bytestring case-insensitive containers deepseq mtl
-         parser-combinators scientific text transformers
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion deepseq text weigh
-       ];
-       description = "Monadic parser combinators";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "megaparsec_8_0_0" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , criterion, deepseq, mtl, parser-combinators, scientific, text
      , transformers, weigh
@@ -161956,36 +150385,9 @@ self: {
        ];
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "megaparsec-tests" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , hspec, hspec-discover, hspec-expectations, hspec-megaparsec
-     , megaparsec, mtl, parser-combinators, QuickCheck, scientific, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "megaparsec-tests";
-       version = "7.0.5";
-       sha256 = "11kwf122bq38qvkpvhb1pkqzbv7yk9wi7klmg9yvls29x66shiyq";
-       revision = "1";
-       editedCabalFile = "1mayv955ipg94hbsix3dvpp1c2aay860h9zpg38qjmfiaks4zpjj";
-       libraryHaskellDepends = [
-         base bytestring containers hspec hspec-expectations
-         hspec-megaparsec megaparsec mtl QuickCheck text transformers
-       ];
-       testHaskellDepends = [
-         base bytestring case-insensitive containers hspec
-         hspec-expectations hspec-megaparsec megaparsec mtl
-         parser-combinators QuickCheck scientific text transformers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Test utilities and the test suite of Megaparsec";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "megaparsec-tests_8_0_0" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , hspec, hspec-discover, hspec-expectations, hspec-megaparsec
      , megaparsec, mtl, parser-combinators, QuickCheck, scientific, text
@@ -162007,7 +150409,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Test utilities and the test suite of Megaparsec";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "meldable-heap" = callPackage
@@ -162041,8 +150442,6 @@ self: {
        ];
        description = "Control physical access devices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mellon-gpio" = callPackage
@@ -162054,8 +150453,6 @@ self: {
        libraryHaskellDepends = [ base hpio mellon-core protolude ];
        description = "GPIO support for mellon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mellon-web" = callPackage
@@ -162097,8 +150494,6 @@ self: {
        ];
        description = "A REST web service for Mellon controllers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "melody" = callPackage
@@ -162120,8 +150515,6 @@ self: {
        ];
        description = "A functional scripting language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "membership" = callPackage
@@ -162144,10 +150537,8 @@ self: {
     ({ mkDerivation, base, doctest, Glob, hedgehog, hspec, type-spec }:
      mkDerivation {
        pname = "membrain";
-       version = "0.0.0.0";
-       sha256 = "01wv5i3kgbpmwjnjk5xgkpm3j5wazlz1f05kmm523wf34xivp498";
-       revision = "1";
-       editedCabalFile = "1nkphzar8f1wyif3haz6i55jaapysz1xvf2w3ynmm49ibhsczvg3";
+       version = "0.0.0.1";
+       sha256 = "1rrvny4avcpib47r26vf3x05yxl3vxz9gb9vsdcj3ck18vfgynsm";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base doctest Glob hedgehog hspec type-spec
@@ -162194,8 +150585,6 @@ self: {
        ];
        description = "Conduit library for memcache procotol";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "memcache-haskell" = callPackage
@@ -162218,8 +150607,6 @@ self: {
        ];
        description = "Memcache procotol library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "memcached" = callPackage
@@ -162254,8 +150641,6 @@ self: {
        ];
        description = "memcached client using binary protocol";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "memdb" = callPackage
@@ -162296,8 +150681,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring containers ];
        description = "Library for reading `/proc/meminfo`";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "memis" = callPackage
@@ -162323,8 +150706,6 @@ self: {
        ];
        description = "Memis Efficient Manual Image Sorting";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "memo-ptr" = callPackage
@@ -162336,8 +150717,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Pointer equality memoization";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "memo-sqlite" = callPackage
@@ -162365,8 +150744,6 @@ self: {
        testHaskellDepends = [ base hspec time time-units ];
        description = "Utilities for memoizing functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "memoize" = callPackage
@@ -162410,24 +150787,6 @@ self: {
      }) {};
 
   "memory" = callPackage
-    ({ mkDerivation, base, basement, bytestring, deepseq, foundation
-     , ghc-prim
-     }:
-     mkDerivation {
-       pname = "memory";
-       version = "0.14.18";
-       sha256 = "01rmq3vagxzjmm96qnfxk4f0516cn12bp5m8inn8h5r918bqsigm";
-       revision = "2";
-       editedCabalFile = "1kwlgsjxh4ncvc6x9rps82bm55qyzn8lvzg49s4rbyc7vjjsbmx6";
-       libraryHaskellDepends = [
-         base basement bytestring deepseq ghc-prim
-       ];
-       testHaskellDepends = [ base basement bytestring foundation ];
-       description = "memory and related abstraction stuff";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "memory_0_15_0" = callPackage
     ({ mkDerivation, base, basement, bytestring, deepseq, foundation
      , ghc-prim
      }:
@@ -162443,7 +150802,6 @@ self: {
        testHaskellDepends = [ base basement bytestring foundation ];
        description = "memory and related abstraction stuff";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "memorypool" = callPackage
@@ -162459,8 +150817,6 @@ self: {
        ];
        description = "basic memory pool outside of haskell heap/GC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "memscript" = callPackage
@@ -162502,8 +150858,6 @@ self: {
        ];
        description = "Haskell binding for Menoh DNN inference library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {menoh = null;};
 
   "menshen" = callPackage
@@ -162585,16 +150939,15 @@ self: {
      }) {};
 
   "mergeless" = callPackage
-    ({ mkDerivation, aeson, base, containers, mtl, time, validity
-     , validity-containers, validity-time
+    ({ mkDerivation, aeson, base, containers, deepseq, mtl, validity
+     , validity-containers
      }:
      mkDerivation {
        pname = "mergeless";
-       version = "0.1.0.0";
-       sha256 = "1sdi5h88xfb2rcxb9f7nzvlm94spgilsrkp4bs41s4j7cnhglyy6";
+       version = "0.2.0.2";
+       sha256 = "0rrqligrrswmyy1gg6ji2q28rb30y1y97sa2bfxd9rgvbx8fgr2g";
        libraryHaskellDepends = [
-         aeson base containers mtl time validity validity-containers
-         validity-time
+         aeson base containers deepseq mtl validity validity-containers
        ];
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -162646,8 +150999,6 @@ self: {
        ];
        description = "A modified Merkle Patricia DB";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "merkle-tree" = callPackage
@@ -162730,8 +151081,6 @@ self: {
        ];
        description = "Message Pack RPC over TCP";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "messente" = callPackage
@@ -162745,8 +151094,6 @@ self: {
        ];
        description = "Messente SMS Gateway";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "meta-misc" = callPackage
@@ -162758,8 +151105,6 @@ self: {
        libraryHaskellDepends = [ base loch-th template-haskell ];
        description = "Utility library providing miscellaneous meta-programming utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "meta-par" = callPackage
@@ -162776,8 +151121,6 @@ self: {
        ];
        description = "Provides the monad-par interface, but based on modular scheduler \"mix-ins\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "meta-par-accelerate" = callPackage
@@ -162795,8 +151138,6 @@ self: {
        ];
        description = "Support for integrated Accelerate computations within Meta-par";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "metadata" = callPackage
@@ -162808,8 +151149,6 @@ self: {
        libraryHaskellDepends = [ base text time ];
        description = "metadata library for semantic web";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "metaheuristics" = callPackage
@@ -162821,8 +151160,6 @@ self: {
        libraryHaskellDepends = [ arrows base random Stream ];
        description = "Generalised local search within Haskell, for applications in combinatorial optimisation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "metamorphic" = callPackage
@@ -162846,8 +151183,6 @@ self: {
        libraryHaskellDepends = [ base Cabal filepath ghc haskell98 ];
        description = "a tiny ghc api wrapper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "metar" = callPackage
@@ -162873,8 +151208,6 @@ self: {
        ];
        description = "Australian METAR";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "metar-http" = callPackage
@@ -162899,8 +151232,6 @@ self: {
        ];
        description = "HTTP for METAR";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "metric" = callPackage
@@ -162919,8 +151250,6 @@ self: {
        ];
        description = "Metric spaces";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "metrics" = callPackage
@@ -162954,8 +151283,6 @@ self: {
        libraryHaskellDepends = [ base network ];
        description = "Client for the metrics aggregator Metricsd";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "metronome" = callPackage
@@ -162969,8 +151296,6 @@ self: {
        ];
        description = "Time Synchronized execution";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mezzo" = callPackage
@@ -162991,8 +151316,6 @@ self: {
        ];
        description = "Typesafe music composition";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mezzolens" = callPackage
@@ -163004,8 +151327,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl transformers ];
        description = "Pure Profunctor Functional Lenses";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mfsolve" = callPackage
@@ -163035,8 +151356,6 @@ self: {
        ];
        description = "Generics with multiple parameters";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mi" = callPackage
@@ -163052,8 +151371,6 @@ self: {
        ];
        description = "Multiple Instance for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "miconix-test" = callPackage
@@ -163069,8 +151386,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "micro-recursion-schemes" = callPackage
@@ -163088,8 +151403,6 @@ self: {
        testHaskellDepends = [ base HUnit template-haskell ];
        description = "Simple recursion schemes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "microaeson" = callPackage
@@ -163113,8 +151426,6 @@ self: {
        ];
        description = "A tiny JSON library with light dependency footprint";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "microbench" = callPackage
@@ -163192,8 +151503,6 @@ self: {
        ];
        description = "Microformats 2 types (with Aeson instances)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "microgroove" = callPackage
@@ -163205,24 +151514,9 @@ self: {
        libraryHaskellDepends = [ base primitive vector ];
        description = "Array-backed extensible records";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "microlens" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "microlens";
-       version = "0.4.10";
-       sha256 = "1v277yyy4p9q57xr2lfp6qs24agglfczmcabrapxrzci3jfshmcw";
-       revision = "1";
-       editedCabalFile = "1qh5ifbwh62v14ygg3fj22wqimylph17ykng70vqv5x2rkp630jq";
-       libraryHaskellDepends = [ base ];
-       description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this.";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "microlens_0_4_11_2" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microlens";
@@ -163231,7 +151525,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A tiny lens library with no dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microlens-aeson" = callPackage
@@ -163275,26 +151568,9 @@ self: {
        libraryHaskellDepends = [ base microlens ];
        description = "'each' for microlens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "microlens-ghc" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, microlens
-     , transformers
-     }:
-     mkDerivation {
-       pname = "microlens-ghc";
-       version = "0.4.10";
-       sha256 = "102dbrdsdadxbbhvx8avv1wbk84767a7lkb8ckp3zxk9g7qlly33";
-       libraryHaskellDepends = [
-         array base bytestring containers microlens transformers
-       ];
-       description = "microlens + array, bytestring, containers, transformers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "microlens-ghc_0_4_12" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, microlens
      , transformers
      }:
@@ -163307,25 +151583,9 @@ self: {
        ];
        description = "microlens + array, bytestring, containers, transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microlens-mtl" = callPackage
-    ({ mkDerivation, base, microlens, mtl, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "microlens-mtl";
-       version = "0.1.11.1";
-       sha256 = "0l6z1gkzwcpv89bxf5vgfrjb6gq2pj7sjjc53nvi5b9alx34zryk";
-       libraryHaskellDepends = [
-         base microlens mtl transformers transformers-compat
-       ];
-       description = "microlens support for Reader/Writer/State from mtl";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "microlens-mtl_0_2_0_1" = callPackage
     ({ mkDerivation, base, microlens, mtl, transformers
      , transformers-compat
      }:
@@ -163338,28 +151598,9 @@ self: {
        ];
        description = "microlens support for Reader/Writer/State from mtl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microlens-platform" = callPackage
-    ({ mkDerivation, base, hashable, microlens, microlens-ghc
-     , microlens-mtl, microlens-th, text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "microlens-platform";
-       version = "0.3.11";
-       sha256 = "18950lxgmsg5ksvyyi3zs1smjmb1qf1q73a3p3g44bh21miz0xwb";
-       revision = "1";
-       editedCabalFile = "14v7ffibzsa1fhf4pwvpw9ia67kgmk8wmxwibj7vr9rayrxy1ffv";
-       libraryHaskellDepends = [
-         base hashable microlens microlens-ghc microlens-mtl microlens-th
-         text unordered-containers vector
-       ];
-       description = "Feature-complete microlens";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "microlens-platform_0_4_1" = callPackage
     ({ mkDerivation, base, hashable, microlens, microlens-ghc
      , microlens-mtl, microlens-th, text, unordered-containers, vector
      }:
@@ -163373,7 +151614,6 @@ self: {
        ];
        description = "microlens + all batteries included (best for apps)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microlens-process" = callPackage
@@ -163394,25 +151634,6 @@ self: {
      }) {};
 
   "microlens-th" = callPackage
-    ({ mkDerivation, base, containers, microlens, template-haskell
-     , th-abstraction, transformers
-     }:
-     mkDerivation {
-       pname = "microlens-th";
-       version = "0.4.2.3";
-       sha256 = "13qw0pwcgd6f6i39rwgqwcwk1d4da5x7wv3gna7gdlxaq331h41j";
-       revision = "1";
-       editedCabalFile = "167in7b1qhgrspx81bdm2jyg9qji66sk7id282c0s99kmp0d01n6";
-       libraryHaskellDepends = [
-         base containers microlens template-haskell th-abstraction
-         transformers
-       ];
-       testHaskellDepends = [ base microlens ];
-       description = "Automatic generation of record lenses for microlens";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "microlens-th_0_4_3_4" = callPackage
     ({ mkDerivation, base, containers, microlens, template-haskell
      , th-abstraction, transformers
      }:
@@ -163427,7 +151648,6 @@ self: {
        testHaskellDepends = [ base microlens ];
        description = "Automatic generation of record lenses for microlens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "micrologger" = callPackage
@@ -163445,8 +151665,6 @@ self: {
        testHaskellDepends = [ aeson base hspec text ];
        description = "A super simple logging module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "microsoft-translator" = callPackage
@@ -163464,8 +151682,6 @@ self: {
        ];
        description = "Bindings to the Microsoft Translator API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "microspec" = callPackage
@@ -163541,8 +151757,6 @@ self: {
        ];
        description = "Language for algorithmic generation of MIDI files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "midair" = callPackage
@@ -163630,8 +151844,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "A simple and fast library for working with MIDI messages";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "midi-util" = callPackage
@@ -163662,8 +151874,6 @@ self: {
        ];
        description = "Utilities for working with MIDI data";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "midimory" = callPackage
@@ -163683,8 +151893,6 @@ self: {
        ];
        description = "A Memory-like (Concentration, Pairs, ...) game for tones";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "midisurface" = callPackage
@@ -163702,8 +151910,6 @@ self: {
        ];
        description = "A control midi surface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mighttpd" = callPackage
@@ -163724,8 +151930,6 @@ self: {
        ];
        description = "Simple Web Server in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mighttpd2" = callPackage
@@ -163758,8 +151962,6 @@ self: {
        testHaskellDepends = [ base hspec http-client ];
        description = "High performance web server on WAI/warp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mighty-metropolis" = callPackage
@@ -163777,8 +151979,6 @@ self: {
        testHaskellDepends = [ base containers mwc-probability ];
        description = "The Metropolis algorithm";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mikmod" = callPackage
@@ -163792,8 +151992,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "MikMod bindings";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mikrokosmos" = callPackage
@@ -163819,8 +152017,6 @@ self: {
        ];
        description = "Lambda calculus interpreter";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "miku" = callPackage
@@ -163837,8 +152033,6 @@ self: {
        ];
        description = "A minimum web dev DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "milena" = callPackage
@@ -163890,8 +152084,6 @@ self: {
        ];
        description = "A library for parsing/printing the text/directory mime type";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mime-mail" = callPackage
@@ -163973,8 +152165,6 @@ self: {
        ];
        description = "Double-ended priority queues";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "minecraft" = callPackage
@@ -164004,8 +152194,6 @@ self: {
        ];
        description = "a DSL for generating minecraft commands and levels";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mines" = callPackage
@@ -164040,8 +152228,6 @@ self: {
        ];
        description = "Minesweeper game which is always solvable without guessing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mini-egison" = callPackage
@@ -164094,8 +152280,6 @@ self: {
        ];
        description = "Miniature FORTH-like interpreter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "minilens" = callPackage
@@ -164111,8 +152295,6 @@ self: {
        ];
        description = "A minimalistic lens library, providing only the simplest, most basic lens functionality";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "minilight" = callPackage
@@ -164144,8 +152326,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A SDL2-based graphics library, batteries-included";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "minimal-configuration" = callPackage
@@ -164187,8 +152367,6 @@ self: {
        executableHaskellDepends = [ base GLUT haskell98 unix ];
        description = "Shows how to run grabber on Mac OS X";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "minio-hs" = callPackage
@@ -164226,8 +152404,6 @@ self: {
        ];
        description = "A MinIO Haskell Library for Amazon S3 compatible cloud storage";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "minions" = callPackage
@@ -164243,8 +152419,6 @@ self: {
        ];
        description = "A fast parallel ssh tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "minioperational" = callPackage
@@ -164261,8 +152435,6 @@ self: {
        ];
        description = "fast and simple operational monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "miniplex" = callPackage
@@ -164279,8 +152451,6 @@ self: {
        ];
        description = "simple 1-to-N interprocess communication";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "minirotate" = callPackage
@@ -164300,8 +152470,6 @@ self: {
        ];
        description = "Minimalistic file rotation utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "minisat" = callPackage
@@ -164343,8 +152511,6 @@ self: {
        ];
        description = "an interpreter for an operational semantics for the STG machine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "minitypeset-opengl" = callPackage
@@ -164403,8 +152569,6 @@ self: {
        testHaskellDepends = [ base binary directory hspec vector ];
        description = "Read and write IDX data that is used in e.g. the MINST database.";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mintty" = callPackage
@@ -164439,8 +152603,6 @@ self: {
        ];
        description = "A Minisat-based CDCL SAT solver in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mirror-tweet" = callPackage
@@ -164459,8 +152621,6 @@ self: {
        ];
        description = "Tweet mirror";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "misfortune" = callPackage
@@ -164590,25 +152750,6 @@ self: {
      }) {};
 
   "miso" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, http-api-data
-     , http-types, lucid, network-uri, servant, servant-lucid, text
-     , transformers, vector
-     }:
-     mkDerivation {
-       pname = "miso";
-       version = "1.2.0.0";
-       sha256 = "08yhr5hxrvgqdc32yz2j3mix7s8q5bzycld3kd4rfcy2h4h72962";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers http-api-data http-types lucid
-         network-uri servant servant-lucid text transformers vector
-       ];
-       description = "A tasty Haskell front-end framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "miso_1_4_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, http-api-data
      , http-types, lucid, network-uri, servant, servant-lucid, text
      , transformers, vector
@@ -164625,7 +152766,6 @@ self: {
        ];
        description = "A tasty Haskell front-end framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "miso-action-logger" = callPackage
@@ -164637,8 +152777,6 @@ self: {
        libraryHaskellDepends = [ aeson base ghcjs-base miso ];
        description = "Miso state transition logger";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "miso-examples" = callPackage
@@ -164651,8 +152789,6 @@ self: {
        isExecutable = true;
        description = "A tasty Haskell front-end framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "miss" = callPackage
@@ -164683,8 +152819,6 @@ self: {
        ];
        description = "A Haskell git implimentation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "miss-porcelain" = callPackage
@@ -164703,8 +152837,6 @@ self: {
        ];
        description = "Useability extras built on top of miss";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "missing-foreign" = callPackage
@@ -164730,8 +152862,6 @@ self: {
        ];
        description = "Haskell interface to Python";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "miv" = callPackage
@@ -164782,8 +152912,6 @@ self: {
        ];
        description = "Find optimal mixed strategies for two-player games";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mixed-types-num" = callPackage
@@ -164824,8 +152952,6 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Mixpanel client";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mkbndl" = callPackage
@@ -164840,8 +152966,6 @@ self: {
        executableHaskellDepends = [ base directory filepath haskell98 ];
        description = "Makes an OS X .app bundle from a binary.";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mkcabal" = callPackage
@@ -164860,8 +152984,6 @@ self: {
        ];
        description = "Generate cabal files for a Haskell project";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ml-w" = callPackage
@@ -164876,8 +152998,6 @@ self: {
        executableHaskellDepends = [ base mtl parsec pretty ];
        description = "Minimal ML language to to demonstrate the W type infererence algorithm";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mlist" = callPackage
@@ -164889,8 +153009,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "Monadic List alternative to lazy I/O";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mltool" = callPackage
@@ -164914,8 +153032,6 @@ self: {
        ];
        description = "Machine Learning Toolbox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mm2" = callPackage
@@ -164927,8 +153043,6 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "The library that can be used for optimization of multiple (Ord a) => a -> b transformations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mmap" = callPackage
@@ -164945,33 +153059,6 @@ self: {
      }) {};
 
   "mmark" = callPackage
-    ({ mkDerivation, aeson, base, case-insensitive, containers
-     , criterion, deepseq, dlist, email-validate, foldl, hashable, hspec
-     , hspec-megaparsec, html-entity-map, lucid, megaparsec, microlens
-     , microlens-th, modern-uri, mtl, parser-combinators, QuickCheck
-     , text, text-metrics, unordered-containers, weigh, yaml
-     }:
-     mkDerivation {
-       pname = "mmark";
-       version = "0.0.7.1";
-       sha256 = "0apc582ck0g5ih0rpcljsfvss646ng62bjm37nj5z6k48symh16n";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base case-insensitive containers deepseq dlist email-validate
-         foldl hashable html-entity-map lucid megaparsec microlens
-         microlens-th modern-uri mtl parser-combinators text text-metrics
-         unordered-containers yaml
-       ];
-       testHaskellDepends = [
-         aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri
-         QuickCheck text
-       ];
-       benchmarkHaskellDepends = [ base criterion text weigh ];
-       description = "Strict markdown processor for writers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "mmark_0_0_7_2" = callPackage
     ({ mkDerivation, aeson, base, case-insensitive, containers
      , criterion, deepseq, dlist, email-validate, foldl, hashable, hspec
      , hspec-megaparsec, html-entity-map, lucid, megaparsec, microlens
@@ -164996,7 +153083,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text weigh ];
        description = "Strict markdown processor for writers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mmark-cli" = callPackage
@@ -165066,8 +153152,6 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "The library that can be used for multiple (Ord a) => a -> b transformations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mmsyn3" = callPackage
@@ -165095,8 +153179,6 @@ self: {
        ];
        description = "The \"glue\" between electronic tables and GraphViz";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mmsyn5" = callPackage
@@ -165129,8 +153211,6 @@ self: {
        ];
        description = "A musical instrument synthesizer or a tool for Ukrainian language listening";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mmsyn7h" = callPackage
@@ -165153,8 +153233,6 @@ self: {
        ];
        description = "Produces a sound recording specified by the Ukrainian text";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mmsyn7l" = callPackage
@@ -165169,8 +153247,6 @@ self: {
        executableHaskellDepends = [ base mmsyn2 mmsyn7ukr vector ];
        description = "Modifies the amplitudes of the Ukrainian sounds representations created by mmsyn7ukr package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mmsyn7s" = callPackage
@@ -165185,8 +153261,6 @@ self: {
        executableHaskellDepends = [ base mmsyn6ukr vector ];
        description = "Shows a sorted list of the Ukrainian sounds representations that can be used by mmsyn7 series of programs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mmsyn7ukr" = callPackage
@@ -165195,10 +153269,11 @@ self: {
      }:
      mkDerivation {
        pname = "mmsyn7ukr";
-       version = "0.12.0.4";
-       sha256 = "0516d16g28wpyz52962zbvljmh59k1h8ncrav26a3hz1x6ifgg01";
+       version = "0.14.0.1";
+       sha256 = "0hm9b7s0b68mwp00rxbgsgnpd3nk6g992xk8n8dc77sandxk8j7g";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr process vector
        ];
@@ -165207,8 +153282,6 @@ self: {
        ];
        description = "A simple basic interface to some SoX functionality or to produce a voice that can be used by mmsyn7h";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mmtf" = callPackage
@@ -165229,8 +153302,6 @@ self: {
        ];
        description = "Macromolecular Transmission Format implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mmtl" = callPackage
@@ -165242,8 +153313,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Modular Monad transformer library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mmtl-base" = callPackage
@@ -165255,8 +153324,6 @@ self: {
        libraryHaskellDepends = [ base mmtl ];
        description = "MonadBase type-class for mmtl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mnist-idx" = callPackage
@@ -165286,8 +153353,6 @@ self: {
        ];
        description = "Language-agnostic analyzer for positional morphosyntactic tags";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mockazo" = callPackage
@@ -165392,8 +153457,6 @@ self: {
        ];
        description = "A parser for the modelica language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "modern-uri" = callPackage
@@ -165445,8 +153508,6 @@ self: {
        ];
        description = "Modify fasta (and CLIP) files in several optional ways";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "modsplit" = callPackage
@@ -165467,8 +153528,6 @@ self: {
        ];
        description = "Haskell source splitter driven by special comments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "modular" = callPackage
@@ -165509,8 +153568,6 @@ self: {
        ];
        description = "A new Prelude featuring first class modules";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "modular-prelude-classy" = callPackage
@@ -165522,8 +153579,6 @@ self: {
        libraryHaskellDepends = [ base classy-prelude modular-prelude ];
        description = "Reifying ClassyPrelude a la ModularPrelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "modularity" = callPackage
@@ -165539,8 +153594,6 @@ self: {
        ];
        description = "Find the modularity of a network";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "module-management" = callPackage
@@ -165571,8 +153624,6 @@ self: {
        ];
        description = "Clean up module imports, split and merge modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "modulespection" = callPackage
@@ -165589,8 +153640,6 @@ self: {
        ];
        description = "Template Haskell for introspecting a module's declarations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "modulo" = callPackage
@@ -165610,8 +153659,6 @@ self: {
        ];
        description = "Modular C code generator";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "moe" = callPackage
@@ -165627,8 +153674,6 @@ self: {
        ];
        description = "html with style";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "moesocks" = callPackage
@@ -165673,8 +153718,6 @@ self: {
        ];
        description = "Modular Haskell Web Server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mole" = callPackage
@@ -165705,8 +153748,6 @@ self: {
        ];
        description = "A glorified string replacement tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mollie-api-haskell" = callPackage
@@ -165732,8 +153773,6 @@ self: {
        ];
        description = "Mollie API client for Haskell http://www.mollie.com";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-abort-fd" = callPackage
@@ -165761,8 +153800,6 @@ self: {
        libraryHaskellDepends = [ base containers ghc-prim mtl ];
        description = "Monadically convert object to unique integers and back";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-atom-simple" = callPackage
@@ -165774,8 +153811,6 @@ self: {
        libraryHaskellDepends = [ base containers ghc-prim mtl ];
        description = "Monadically map objects to unique ints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-batcher" = callPackage
@@ -165789,6 +153824,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monad-bayes" = callPackage
+    ({ mkDerivation, abstract-par, base, containers, criterion, free
+     , hspec, ieee754, log-domain, math-functions, monad-coroutine, mtl
+     , mwc-random, optparse-applicative, process, QuickCheck, safe
+     , statistics, time, transformers, vector
+     }:
+     mkDerivation {
+       pname = "monad-bayes";
+       version = "0.1.0.0";
+       sha256 = "1ldzzk3k578z5n5yb9i2fv5rx8jamy8jjy33k40y698a07p8wzyz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers free ieee754 log-domain math-functions
+         monad-coroutine mtl mwc-random safe statistics transformers vector
+       ];
+       executableHaskellDepends = [
+         base containers log-domain mwc-random optparse-applicative time
+         vector
+       ];
+       testHaskellDepends = [
+         base hspec ieee754 log-domain math-functions mtl QuickCheck
+         transformers vector
+       ];
+       benchmarkHaskellDepends = [
+         abstract-par base containers criterion log-domain mwc-random
+         process vector
+       ];
+       description = "A library for probabilistic programming";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "monad-bool" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -165880,8 +153947,6 @@ self: {
        ];
        description = "Monadic conversion between complex data structures and unique integers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-connect" = callPackage
@@ -165960,8 +154025,6 @@ self: {
        testHaskellDepends = [ base hlint tasty tasty-hspec ];
        description = "A monad transformer for weighted graph searches";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-exception" = callPackage
@@ -165978,8 +154041,6 @@ self: {
        ];
        description = "Exstensible monadic exceptions";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-extras" = callPackage
@@ -166022,8 +154083,6 @@ self: {
        libraryHaskellDepends = [ base monad-control ];
        description = "Type class for monads which support a fork operation";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-gen" = callPackage
@@ -166072,8 +154131,6 @@ self: {
        ];
        description = "A class of monads which can do http requests";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-interleave" = callPackage
@@ -166085,8 +154142,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Monads with an unsaveInterleaveIO-like operation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-io-adapter" = callPackage
@@ -166134,8 +154189,6 @@ self: {
        ];
        description = "Specific levels of monad transformers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-lgbt" = callPackage
@@ -166154,8 +154207,6 @@ self: {
        ];
        description = "Monad transformers for combining local and global state";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-log" = callPackage
@@ -166286,8 +154337,6 @@ self: {
        ];
        description = "a monad to calculate linear recursive sequence";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-markov" = callPackage
@@ -166339,8 +154388,6 @@ self: {
        libraryHaskellDepends = [ base mersenne-random-pure64 ];
        description = "An efficient random generator monad, based on the Mersenne Twister";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-metrics" = callPackage
@@ -166396,8 +154443,6 @@ self: {
        testHaskellDepends = [ base hspec mtl ];
        description = "A monad transformer for mocking mtl-style typeclasses";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-open" = callPackage
@@ -166409,8 +154454,6 @@ self: {
        libraryHaskellDepends = [ base exceptions mtl transformers ];
        description = "Open recursion for when you need it";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-ox" = callPackage
@@ -166492,8 +154535,6 @@ self: {
        ];
        description = "Parallel execution of monadic computations with a progress bar";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-param" = callPackage
@@ -166578,8 +154619,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim mtl ];
        description = "Fast monads and monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-recorder" = callPackage
@@ -166596,8 +154635,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Record and replay the results of monadic actions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-resumption" = callPackage
@@ -166609,8 +154646,6 @@ self: {
        libraryHaskellDepends = [ base mmorph mtl transformers ];
        description = "Resumption and reactive resumption monads for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-skeleton" = callPackage
@@ -166648,8 +154683,6 @@ self: {
        ];
        description = "Utility library for monads, particularly those involving state";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-statevar" = callPackage
@@ -166662,8 +154695,6 @@ self: {
        testHaskellDepends = [ base stm ];
        description = "Concise, overloaded accessors for IORef, STRef, TVar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-ste" = callPackage
@@ -166680,8 +154711,6 @@ self: {
        testHaskellDepends = [ base hspec HUnit ];
        description = "ST monad with efficient explicit errors";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-stlike-io" = callPackage
@@ -166696,8 +154725,6 @@ self: {
        ];
        description = "ST-like monad capturing variables to regions and supporting IO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-stlike-stm" = callPackage
@@ -166709,8 +154736,6 @@ self: {
        libraryHaskellDepends = [ base monad-stlike-io stm ];
        description = "ST-like monad capturing variables to regions and supporting STM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-stm" = callPackage
@@ -166733,8 +154758,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Stateful supply monad";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-task" = callPackage
@@ -166775,8 +154798,6 @@ self: {
        testHaskellDepends = [ base containers hlint hspec transformers ];
        description = "Monad transformer for recording timing events";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-tx" = callPackage
@@ -166788,8 +154809,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A transactional state monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-unify" = callPackage
@@ -166803,8 +154822,6 @@ self: {
        libraryHaskellDepends = [ base mtl unordered-containers ];
        description = "Generic first-order unification";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-unlift" = callPackage
@@ -166868,8 +154885,6 @@ self: {
        libraryHaskellDepends = [ base base-compat stm ];
        description = "Generic operations over variables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monad-wrap" = callPackage
@@ -166881,8 +154896,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Wrap functions such as catch around different monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monadIO" = callPackage
@@ -166918,8 +154931,6 @@ self: {
        libraryHaskellDepends = [ base monadLib ];
        description = "Arrow-like monad composition for monadLib";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monadacme" = callPackage
@@ -167001,8 +155012,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Constraint Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monadiccp-gecode" = callPackage
@@ -167021,8 +155030,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Constraint Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gecodeint = null; gecodekernel = null; gecodesearch = null; 
          gecodeset = null; gecodesupport = null;};
 
@@ -167074,8 +155081,6 @@ self: {
        ];
        description = "A preprocessor for generating monadic call traces";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monadlog" = callPackage
@@ -167095,8 +155100,6 @@ self: {
        ];
        description = "A simple and fast logging monad";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monadoid" = callPackage
@@ -167123,8 +155126,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell98 partial maps and filters over MonadPlus";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monads-fd" = callPackage
@@ -167136,8 +155137,6 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Monad classes, using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monads-tf" = callPackage
@@ -167178,8 +155177,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Monadic interface for TokyoTyrant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mondo" = callPackage
@@ -167203,8 +155200,6 @@ self: {
        ];
        description = "Haskell bindings for the Mondo API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monetdb-mapi" = callPackage
@@ -167216,8 +155211,6 @@ self: {
        libraryHaskellDepends = [ base bindings-monetdb-mapi ];
        description = "Mid-level bindings for the MonetDB API (mapi)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "money" = callPackage
@@ -167230,41 +155223,9 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Money";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mongoDB" = callPackage
-    ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
-     , binary, bson, bytestring, conduit, conduit-extra, containers
-     , criterion, cryptohash, data-default-class, hashtables, hspec
-     , lifted-base, monad-control, mtl, network, nonce, old-locale
-     , parsec, pureMD5, random, random-shuffle, resourcet, stm, tagged
-     , text, time, tls, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "mongoDB";
-       version = "2.5.0.0";
-       sha256 = "15zlh2ws9vs2d5rp1g299b4lrpj6a4gcdm1zqiig452w7m1bsyzd";
-       libraryHaskellDepends = [
-         array base base16-bytestring base64-bytestring binary bson
-         bytestring conduit conduit-extra containers cryptohash
-         data-default-class hashtables lifted-base monad-control mtl network
-         nonce parsec pureMD5 random random-shuffle resourcet stm tagged
-         text time tls transformers transformers-base
-       ];
-       testHaskellDepends = [ base hspec mtl old-locale text time ];
-       benchmarkHaskellDepends = [
-         array base base16-bytestring base64-bytestring binary bson
-         bytestring containers criterion cryptohash data-default-class
-         hashtables lifted-base monad-control mtl network nonce parsec
-         random random-shuffle stm text transformers-base
-       ];
-       description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "mongoDB_2_6_0_1" = callPackage
     ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
      , binary, bson, bytestring, conduit, conduit-extra, containers
      , criterion, cryptohash, data-default-class, dns, fail, hashtables
@@ -167275,8 +155236,8 @@ self: {
      }:
      mkDerivation {
        pname = "mongoDB";
-       version = "2.6.0.1";
-       sha256 = "1kradm8baaqwp4zniy9ga3a3vwqc2gcz21z0559ffja7y4d757my";
+       version = "2.7.0.0";
+       sha256 = "1gj97hfznhmfdvwdgf6fkizla2d9cy31933qw5i8p7fmh7igzgvk";
        libraryHaskellDepends = [
          array base base16-bytestring base64-bytestring binary bson
          bytestring conduit conduit-extra containers cryptohash
@@ -167294,7 +155255,6 @@ self: {
        ];
        description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mongodb-queue" = callPackage
@@ -167315,8 +155275,6 @@ self: {
        ];
        description = "message queue using MongoDB";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mongrel2-handler" = callPackage
@@ -167334,8 +155292,6 @@ self: {
        ];
        description = "Mongrel2 Handler Library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monitor" = callPackage
@@ -167349,34 +155305,30 @@ self: {
        executableHaskellDepends = [ base filepath hinotify process ];
        description = "Do things when files change";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monky" = callPackage
     ({ mkDerivation, base, bytestring, cereal, composition, containers
      , directory, env-locale, formatting, mtl, netlink, network
-     , old-time, optparse-applicative, process, pulseaudio, statvfs, stm
-     , template-haskell, text, time, transformers, unix
+     , old-time, optparse-applicative, process, pulseaudio, scientific
+     , statvfs, stm, template-haskell, text, time, transformers, unix
      }:
      mkDerivation {
        pname = "monky";
-       version = "2.2.1.0";
-       sha256 = "1iw0q2ymddnjq2sbzan03abnj00fwaz8pjadbsn63053wai5axfx";
+       version = "2.2.1.1";
+       sha256 = "1w188ihy40rmz0xnrss5zc0lw5cmrj61pv3f5iq8y5q35zbimksm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cereal composition containers directory env-locale
-         formatting mtl netlink network old-time pulseaudio statvfs stm
-         template-haskell text time transformers unix
+         formatting mtl netlink network old-time pulseaudio scientific
+         statvfs stm template-haskell text time transformers unix
        ];
        executableHaskellDepends = [
          base containers directory mtl optparse-applicative process unix
        ];
        description = "A system state collecting library and application";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mono-foldable" = callPackage
@@ -167388,8 +155340,6 @@ self: {
        libraryHaskellDepends = [ base bytestring text vector ];
        description = "Folds for monomorphic containers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mono-traversable" = callPackage
@@ -167481,8 +155431,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A library for (left, right) zero monoids and backtracking with cut";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monoid-extras" = callPackage
@@ -167510,8 +155458,6 @@ self: {
        libraryHaskellDepends = [ base bytestring containers ];
        description = "a practical monoid implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monoid-record" = callPackage
@@ -167543,30 +155489,9 @@ self: {
        ];
        description = "Monoids for calculation of statistics of sample";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monoid-subclasses" = callPackage
-    ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
-     , quickcheck-instances, tasty, tasty-quickcheck, text, vector
-     }:
-     mkDerivation {
-       pname = "monoid-subclasses";
-       version = "0.4.6.1";
-       sha256 = "19mfklkdhyv94pfg5i92h0z90sc99rbgpi8z0w55bz3qhxnqg5yh";
-       libraryHaskellDepends = [
-         base bytestring containers primes text vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers primes QuickCheck quickcheck-instances
-         tasty tasty-quickcheck text vector
-       ];
-       description = "Subclasses of Monoid";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "monoid-subclasses_1_0_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
      , quickcheck-instances, tasty, tasty-quickcheck, text, vector
      }:
@@ -167583,7 +155508,6 @@ self: {
        ];
        description = "Subclasses of Monoid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoid-transformer" = callPackage
@@ -167598,24 +155522,6 @@ self: {
      }) {};
 
   "monoidal-containers" = callPackage
-    ({ mkDerivation, aeson, base, containers, deepseq, hashable, lens
-     , newtype, semigroups, unordered-containers
-     }:
-     mkDerivation {
-       pname = "monoidal-containers";
-       version = "0.4.0.0";
-       sha256 = "15mh2hx7a31gr5zb2g30h2fcnb3a2wvv2y8hvzzk5l9cr2nvhcm1";
-       revision = "1";
-       editedCabalFile = "18m2r5kfvkss8vh537vh2k4zbpncmwadg1g4pzsw0rdmkyn7lyjd";
-       libraryHaskellDepends = [
-         aeson base containers deepseq hashable lens newtype semigroups
-         unordered-containers
-       ];
-       description = "Containers with monoidal accumulation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "monoidal-containers_0_6_0_1" = callPackage
     ({ mkDerivation, aeson, base, containers, deepseq, hashable, lens
      , newtype, semialign, semigroups, these, unordered-containers
      }:
@@ -167629,7 +155535,6 @@ self: {
        ];
        description = "Containers with monoidal accumulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoidplus" = callPackage
@@ -167643,8 +155548,6 @@ self: {
        ];
        description = "Extra classes/functions about monoids";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monoids" = callPackage
@@ -167660,8 +155563,6 @@ self: {
        ];
        description = "Deprecated: Use 'reducers'";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monomorphic" = callPackage
@@ -167689,8 +155590,6 @@ self: {
        ];
        description = "Well-typed paths";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "montage" = callPackage
@@ -167756,8 +155655,6 @@ self: {
        ];
        description = "A monad and transformer for Monte Carlo calculations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "months" = callPackage
@@ -167778,8 +155675,6 @@ self: {
        ];
        description = "Month, YearMonth, Quarter, YearQuarter types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "monus" = callPackage
@@ -167819,8 +155714,6 @@ self: {
        ];
        description = "Haskell bindings for the Monzo API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "moo" = callPackage
@@ -167842,8 +155735,6 @@ self: {
        ];
        description = "Genetic algorithm library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "moonshine" = callPackage
@@ -167860,8 +155751,6 @@ self: {
        ];
        description = "A web service framework for Haskell, similar in purpose to dropwizard";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "more-containers" = callPackage
@@ -167905,8 +155794,6 @@ self: {
        ];
        description = "A tool for supervised learning of morphology";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "morfeusz" = callPackage
@@ -167924,59 +155811,55 @@ self: {
        librarySystemDepends = [ morfeusz ];
        description = "Bindings to the morphological analyser Morfeusz";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {morfeusz = null;};
 
   "morley" = callPackage
     ({ mkDerivation, aeson, aeson-options, aeson-pretty, base-noprelude
-     , base16-bytestring, base58-bytestring, bimap, binary, bytestring
+     , base16-bytestring, base58-bytestring, binary, bytestring
      , constraints, containers, cryptonite, data-default, directory
      , filepath, first-class-families, fmt, formatting, ghc-prim, gitrev
      , hex-text, hspec, hspec-expectations, HUnit, interpolate, lens
      , megaparsec, memory, morley-prelude, mtl, named
      , optparse-applicative, parser-combinators, pretty-simple
-     , pretty-terminal, QuickCheck, quickcheck-arbitrary-adt
-     , quickcheck-instances, show-type, singletons, spoon, syb, tasty
-     , tasty-ant-xml, tasty-discover, tasty-hspec, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, th-lift
-     , th-lift-instances, time, timerep, transformers-compat, type-spec
-     , unordered-containers, vector, vinyl, wl-pprint-text
+     , QuickCheck, quickcheck-arbitrary-adt, quickcheck-instances
+     , show-type, singletons, syb, tasty, tasty-ant-xml, tasty-discover
+     , tasty-hspec, tasty-hunit-compat, tasty-quickcheck
+     , template-haskell, text, th-lift, th-lift-instances, time, timerep
+     , transformers-compat, unordered-containers, vector, vinyl
+     , wl-pprint-text
      }:
      mkDerivation {
        pname = "morley";
-       version = "0.6.0";
-       sha256 = "0pp771h03k0xfcpddxg0s865cl8jqk2gv29mfng6c6hvbmbwy381";
+       version = "1.0.0";
+       sha256 = "0c7sbfib751066bzlqnmsj03livgar4i27pf0rag91apmlzgh057";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-options aeson-pretty base-noprelude base16-bytestring
-         base58-bytestring bimap binary bytestring constraints containers
+         base58-bytestring binary bytestring constraints containers
          cryptonite data-default first-class-families fmt formatting
          ghc-prim gitrev hex-text hspec HUnit interpolate lens megaparsec
-         memory morley-prelude mtl named parser-combinators pretty-terminal
-         QuickCheck quickcheck-arbitrary-adt quickcheck-instances show-type
-         singletons syb tasty tasty-ant-xml tasty-hunit template-haskell
-         text th-lift th-lift-instances time timerep transformers-compat
-         unordered-containers vector vinyl wl-pprint-text
+         memory morley-prelude mtl named parser-combinators QuickCheck
+         quickcheck-arbitrary-adt quickcheck-instances show-type singletons
+         syb tasty tasty-ant-xml tasty-hunit-compat tasty-quickcheck
+         template-haskell text th-lift th-lift-instances time timerep
+         transformers-compat unordered-containers vector vinyl
+         wl-pprint-text
        ];
        executableHaskellDepends = [
          base-noprelude fmt morley-prelude named optparse-applicative
          pretty-simple
        ];
        testHaskellDepends = [
-         aeson base-noprelude bimap bytestring constraints containers
-         data-default directory filepath first-class-families fmt formatting
-         hex-text hspec hspec-expectations HUnit lens megaparsec
-         morley-prelude QuickCheck quickcheck-arbitrary-adt
-         quickcheck-instances singletons spoon syb tasty tasty-hspec
-         tasty-quickcheck text type-spec unordered-containers vinyl
+         aeson base-noprelude bytestring containers data-default directory
+         filepath fmt formatting hex-text hspec hspec-expectations HUnit
+         lens megaparsec morley-prelude QuickCheck quickcheck-arbitrary-adt
+         quickcheck-instances singletons syb tasty tasty-hspec
+         tasty-hunit-compat tasty-quickcheck text unordered-containers
        ];
        testToolDepends = [ tasty-discover ];
        description = "Developer tools for the Michelson Language";
        license = stdenv.lib.licenses.agpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "morley-prelude" = callPackage
@@ -167988,8 +155871,6 @@ self: {
        libraryHaskellDepends = [ base-noprelude universum ];
        description = "A custom prelude used in Morley";
        license = stdenv.lib.licenses.agpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "morph" = callPackage
@@ -168009,8 +155890,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A simple database migrator for PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "morpheus-graphql" = callPackage
@@ -168056,8 +155935,6 @@ self: {
        ];
        description = "Morpheus GraphQL CLI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "morphisms" = callPackage
@@ -168079,8 +155956,6 @@ self: {
        libraryHaskellDepends = [ morphisms ];
        description = "Functors, theirs compositions and transformations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "morphisms-functors-inventory" = callPackage
@@ -168092,8 +155967,6 @@ self: {
        libraryHaskellDepends = [ morphisms morphisms-functors ];
        description = "Inventory is state and store";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "morphisms-objects" = callPackage
@@ -168105,8 +155978,6 @@ self: {
        libraryHaskellDepends = [ morphisms ];
        description = "Algebraic structures";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "morte" = callPackage
@@ -168140,8 +156011,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion system-filepath text ];
        description = "A bare-bones calculus of constructions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mosaico-lib" = callPackage
@@ -168160,8 +156029,6 @@ self: {
        ];
        description = "Generación interactiva de mosaicos";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mosquitto-hs" = callPackage
@@ -168214,8 +156081,6 @@ self: {
        ];
        description = "General purpose migrations library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "moto-postgresql" = callPackage
@@ -168231,8 +156096,6 @@ self: {
        ];
        description = "PostgreSQL-based migrations registry for moto";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "motor" = callPackage
@@ -168301,8 +156164,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Mounts and umounts filesystems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mountpoints" = callPackage
@@ -168337,8 +156198,6 @@ self: {
        ];
        description = "Plays videos using GStreamer and GTK+";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "moving-averages" = callPackage
@@ -168375,8 +156234,6 @@ self: {
        ];
        description = "Music player for linux";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mp3decoder" = callPackage
@@ -168408,8 +156265,6 @@ self: {
        ];
        description = "MPD/PowerMate executable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mpg123-bindings" = callPackage
@@ -168447,10 +156302,28 @@ self: {
        benchmarkSystemDepends = [ openmpi ];
        description = "MPI bindings for Haskell";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) openmpi;};
 
+  "mplayer-spot" = callPackage
+    ({ mkDerivation, async, attoparsec, base, bytestring, conduit
+     , conduit-extra, directory, filepath, process, semigroupoids
+     , streaming-commons, tagged, text
+     }:
+     mkDerivation {
+       pname = "mplayer-spot";
+       version = "0.1.0.0";
+       sha256 = "13fmz1p6mbzi8ax6wa5xpwb8jkbcw007r3lsjd14igdcif19cq3q";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async attoparsec base bytestring conduit conduit-extra directory
+         filepath process semigroupoids streaming-commons tagged text
+       ];
+       executableHaskellDepends = [ base ];
+       description = "Save your spot when watching movies with @mplayer@";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "mpppc" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, split, text }:
      mkDerivation {
@@ -168462,8 +156335,6 @@ self: {
        ];
        description = "Multi-dimensional parametric pretty-printer with color";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mpretty" = callPackage
@@ -168480,8 +156351,6 @@ self: {
        ];
        description = "a monadic, extensible pretty printing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mpris" = callPackage
@@ -168493,8 +156362,6 @@ self: {
        libraryHaskellDepends = [ base containers dbus mtl ];
        description = "Interface for MPRIS";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mprover" = callPackage
@@ -168512,8 +156379,6 @@ self: {
        ];
        description = "Simple equational reasoning for a Haskell-ish language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mps" = callPackage
@@ -168533,8 +156398,6 @@ self: {
        ];
        description = "simply oo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mptcp-pm" = callPackage
@@ -168559,8 +156422,6 @@ self: {
        executableToolDepends = [ c2hs ];
        description = "A work in progress Multipath TCP path manager";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mpvguihs" = callPackage
@@ -168579,8 +156440,6 @@ self: {
        ];
        description = "A minimalist mpv GUI written in I/O heavy Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mqtt" = callPackage
@@ -168609,8 +156468,6 @@ self: {
        ];
        description = "An MQTT protocol implementation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mqtt-hs" = callPackage
@@ -168627,8 +156484,6 @@ self: {
        ];
        description = "A MQTT client library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mrifk" = callPackage
@@ -168642,8 +156497,6 @@ self: {
        executableHaskellDepends = [ array base containers mtl ];
        description = "Decompiles Glulx files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mrm" = callPackage
@@ -168655,8 +156508,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Modular Refiable Matching, first-class matches";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ms" = callPackage
@@ -168677,8 +156528,6 @@ self: {
        ];
        description = "metric spaces";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ms-tds" = callPackage
@@ -168722,8 +156571,6 @@ self: {
        ];
        description = "A Haskell implementation of MessagePack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "msgpack-aeson" = callPackage
@@ -168742,8 +156589,6 @@ self: {
        testHaskellDepends = [ aeson base msgpack tasty tasty-hunit ];
        description = "Aeson adapter for MessagePack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "msgpack-idl" = callPackage
@@ -168765,8 +156610,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "An IDL Compiler for MessagePack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "msgpack-rpc" = callPackage
@@ -168787,8 +156630,6 @@ self: {
        testHaskellDepends = [ async base mtl network tasty tasty-hunit ];
        description = "A MessagePack-RPC Implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "msh" = callPackage
@@ -168805,8 +156646,6 @@ self: {
        ];
        description = "Object-Oriented Programming in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "msi-kb-backlit" = callPackage
@@ -168820,8 +156659,6 @@ self: {
        executableHaskellDepends = [ base bytestring hid split ];
        description = "A command line tool to change backlit colors of your MSI keyboards";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mssql-simple" = callPackage
@@ -168896,8 +156733,6 @@ self: {
        ];
        description = "Library to communicate with Mt.Gox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mtl_2_1_3_1" = callPackage
@@ -168960,8 +156795,6 @@ self: {
        ];
        description = "Instances for the mtl classes for all monad transformers";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mtl-extras" = callPackage
@@ -168973,8 +156806,6 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Higher order versions of MTL classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mtl-prelude_1_0_3" = callPackage
@@ -169009,8 +156840,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Monad Transformer Library with Type Families";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mtl-unleashed" = callPackage
@@ -169052,8 +156881,6 @@ self: {
        libraryHaskellDepends = [ base mtl QuickCheck ];
        description = "Monad transformer library with type indexes, providing 'free' copies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mtp" = callPackage
@@ -169066,8 +156893,6 @@ self: {
        librarySystemDepends = [ mtp ];
        description = "Bindings to libmtp";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {mtp = null;};
 
   "mtree" = callPackage
@@ -169119,8 +156944,6 @@ self: {
        ];
        description = "gRPC clients from Mu definitions";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mu-grpc-server" = callPackage
@@ -169149,8 +156972,6 @@ self: {
        ];
        description = "gRPC servers for Mu definitions";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mu-persistent" = callPackage
@@ -169191,8 +157012,6 @@ self: {
        ];
        description = "Protocol Buffers serialization and gRPC schema import for Mu microservices";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mu-rpc" = callPackage
@@ -169260,8 +157079,6 @@ self: {
        ];
        description = "Multi-version deployer for web applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mudbath" = callPackage
@@ -169352,8 +157169,6 @@ self: {
        testToolDepends = [ alex happy ];
        description = "An intermediate language designed to perform advanced code analysis";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multext-east-msd" = callPackage
@@ -169365,8 +157180,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "MULTEXT-East morphosyntactic descriptors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multi-cabal" = callPackage
@@ -169388,8 +157201,6 @@ self: {
        ];
        description = "A tool supporting multi cabal project builds";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multi-containers" = callPackage
@@ -169453,8 +157264,6 @@ self: {
        ];
        description = "A network address format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multiarg" = callPackage
@@ -169473,8 +157282,6 @@ self: {
        ];
        description = "Command lines for options that take multiple arguments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multibase" = callPackage
@@ -169497,8 +157304,6 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck template-haskell ];
        description = "Self-identifying base encodings, implementation of <https://github.com/multiformats/multihash>";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multifile" = callPackage
@@ -169542,8 +157347,6 @@ self: {
        ];
        description = "Bidirectional Two-level Transformation of XML Schemas";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multihash" = callPackage
@@ -169567,8 +157370,6 @@ self: {
        ];
        description = "Multihash library and CLI executable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multihash-cryptonite" = callPackage
@@ -169588,8 +157389,6 @@ self: {
        testHaskellDepends = [ base cryptonite doctest hedgehog ];
        description = "Self-identifying hashes, implementation of <https://github.com/multiformats/multihash>";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multihash-serialise" = callPackage
@@ -169607,8 +157406,6 @@ self: {
        testHaskellDepends = [ base cryptonite hedgehog serialise ];
        description = "CBOR encoding of multihashes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multihashmap" = callPackage
@@ -169641,8 +157438,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq weigh ];
        description = "Comprehensive and efficient (multi)linear algebra implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multilinear-io" = callPackage
@@ -169666,8 +157461,6 @@ self: {
        ];
        description = "Conduit-based input/output capability for multilinear package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multimap" = callPackage
@@ -169682,19 +157475,6 @@ self: {
      }) {};
 
   "multipart" = callPackage
-    ({ mkDerivation, base, bytestring, parsec, stringsearch }:
-     mkDerivation {
-       pname = "multipart";
-       version = "0.1.3";
-       sha256 = "1x4n4yyva22dhfr1pg5ki112qvvzb4hyd7bwpm189iq4gcp52q4z";
-       revision = "1";
-       editedCabalFile = "037ngpayaisc1jgcxyixy7lx42p2mz950k6wb0pl6dkc951hl88c";
-       libraryHaskellDepends = [ base bytestring parsec stringsearch ];
-       description = "HTTP multipart split out of the cgi package";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "multipart_0_2_0" = callPackage
     ({ mkDerivation, base, bytestring, parsec, stringsearch }:
      mkDerivation {
        pname = "multipart";
@@ -169703,7 +157483,6 @@ self: {
        libraryHaskellDepends = [ base bytestring parsec stringsearch ];
        description = "Parsers for the HTTP multipart format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multipart-names" = callPackage
@@ -169736,8 +157515,6 @@ self: {
        ];
        description = "Folding data with multiple named passes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multipath" = callPackage
@@ -169749,8 +157526,6 @@ self: {
        libraryHaskellDepends = [ base parsec utf8-string ];
        description = "Parser and builder for unix-path-like objects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multiplate" = callPackage
@@ -169777,8 +157552,6 @@ self: {
        libraryHaskellDepends = [ base multiplate transformers ];
        description = "Shorter, more generic functions for Multiplate";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multiplicity" = callPackage
@@ -169917,8 +157690,6 @@ self: {
        ];
        description = "Alternative multirec instances deriver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multirec-binary" = callPackage
@@ -169930,8 +157701,6 @@ self: {
        libraryHaskellDepends = [ base binary multirec ];
        description = "Generic Data.Binary instances using MultiRec.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multiset" = callPackage
@@ -169973,8 +157742,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 stm ];
        description = "Multi-set rewrite rules with guards and a parallel execution scheme";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multistate" = callPackage
@@ -170023,8 +157790,6 @@ self: {
        ];
        description = "Multivariant assignments generation language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "multivector" = callPackage
@@ -170035,6 +157800,8 @@ self: {
        pname = "multivector";
        version = "0.1.0.0";
        sha256 = "183i59ri20fci2f2w4algmr8crz6q2aj1yirhgwjilkj3f4h6h4d";
+       revision = "1";
+       editedCabalFile = "1gbdanlm661cmhjqc933585wrd9bdrz26mvmjph47hpk1kkgk1fr";
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [
          base smallcheck tasty tasty-smallcheck Vector
@@ -170063,8 +157830,6 @@ self: {
        ];
        description = "Static blog generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "murder" = callPackage
@@ -170081,8 +157846,6 @@ self: {
        ];
        description = "MUtually Recursive Definitions Explicitly Represented";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "murmur" = callPackage
@@ -170108,8 +157871,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Simple CUI Twitter Client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "murmur-hash" = callPackage
@@ -170150,8 +157911,6 @@ self: {
        libraryHaskellDepends = [ haskell2010 ];
        description = "32-bit non-cryptographic hashing";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mushu" = callPackage
@@ -170178,8 +157937,6 @@ self: {
        testHaskellDepends = [ base classy-prelude ];
        description = "Minimalist MPD client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "music-articulation" = callPackage
@@ -170244,8 +158001,6 @@ self: {
        ];
        description = "Diagrams-based visualization of musical data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "music-parts" = callPackage
@@ -170268,8 +158023,6 @@ self: {
        ];
        description = "Musical instruments, parts and playing techniques";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "music-pitch" = callPackage
@@ -170287,8 +158040,6 @@ self: {
        ];
        description = "Musical pitch representation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "music-pitch-literal" = callPackage
@@ -170329,8 +158080,6 @@ self: {
        testHaskellDepends = [ base process tasty tasty-golden ];
        description = "Some useful preludes for the Music Suite";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "music-score" = callPackage
@@ -170354,8 +158103,6 @@ self: {
        ];
        description = "Musical score and part representation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "music-sibelius" = callPackage
@@ -170375,8 +158122,6 @@ self: {
        ];
        description = "Interaction with Sibelius";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "music-suite" = callPackage
@@ -170396,8 +158141,6 @@ self: {
        doHaddock = false;
        description = "A set of libraries for composition, analysis and manipulation of music";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "music-util" = callPackage
@@ -170415,8 +158158,6 @@ self: {
        ];
        description = "Utility for developing the Music Suite";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "musicScroll" = callPackage
@@ -170471,8 +158212,6 @@ self: {
        ];
        description = "Send an email to all MusicBrainz editors";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "musicw" = callPackage
@@ -170508,8 +158247,6 @@ self: {
        ];
        description = "MusicXML format encoded as Haskell type and functions of reading and writting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "musicxml2" = callPackage
@@ -170527,8 +158264,6 @@ self: {
        ];
        description = "A representation of the MusicXML format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mustache" = callPackage
@@ -170582,8 +158317,6 @@ self: {
        ];
        description = "Straight implementation of mustache templates";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mustache2hs" = callPackage
@@ -170607,16 +158340,16 @@ self: {
 
   "mutable" = callPackage
     ({ mkDerivation, base, constraints, criterion, deepseq, directory
-     , generic-lens, microlens, microlens-th, primitive, reflection
-     , time, transformers, vector, vinyl
+     , generic-lens, generic-lens-core, microlens, microlens-th
+     , primitive, reflection, time, transformers, vector, vinyl
      }:
      mkDerivation {
        pname = "mutable";
-       version = "0.1.0.0";
-       sha256 = "1z231r8ngwhdr5znw2kxg6ldsasr8iyki0wwyg1s24d505xadnry";
+       version = "0.1.0.1";
+       sha256 = "1hcyijjq0s71jpa3bwxgk3dbnmyfq07cd8bwssj1aykpaaay3k9j";
        libraryHaskellDepends = [
-         base constraints generic-lens primitive reflection transformers
-         vector vinyl
+         base constraints generic-lens generic-lens-core primitive
+         reflection transformers vector vinyl
        ];
        benchmarkHaskellDepends = [
          base criterion deepseq directory microlens microlens-th time
@@ -170624,8 +158357,6 @@ self: {
        ];
        description = "Automatic piecewise-mutable references for your types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mutable-containers" = callPackage
@@ -170660,8 +158391,6 @@ self: {
        ];
        description = "iteratees based upon mutable buffers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mute-unmute" = callPackage
@@ -170680,8 +158409,6 @@ self: {
        ];
        description = "Watches your screensaver and (un)mutes music when you (un)lock the screen";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mvar-lock" = callPackage
@@ -170693,8 +158420,6 @@ self: {
        libraryHaskellDepends = [ base safe-exceptions ];
        description = "A trivial lock based on MVar";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mvc" = callPackage
@@ -170711,8 +158436,6 @@ self: {
        ];
        description = "Model-view-controller";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mvc-updates" = callPackage
@@ -170724,8 +158447,6 @@ self: {
        libraryHaskellDepends = [ async base foldl mvc ];
        description = "Concurrent and combinable updates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mvclient" = callPackage
@@ -170744,22 +158465,9 @@ self: {
        ];
        description = "Client library for metaverse systems like Second Life";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mwc-probability" = callPackage
-    ({ mkDerivation, base, mwc-random, primitive, transformers }:
-     mkDerivation {
-       pname = "mwc-probability";
-       version = "2.1.0";
-       sha256 = "0ac4pr2l0p48a0n6jym445c8h7n2nf1pqkhrz6cd1rjbmrk5mbm3";
-       libraryHaskellDepends = [ base mwc-random primitive transformers ];
-       description = "Sampling function-based probability distributions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mwc-probability_2_2_0" = callPackage
     ({ mkDerivation, base, containers, mwc-random, primitive
      , transformers
      }:
@@ -170772,7 +158480,6 @@ self: {
        ];
        description = "Sampling function-based probability distributions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mwc-probability-transition" = callPackage
@@ -170866,8 +158573,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit vector ];
        description = "MXNet interface in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) mxnet;};
 
   "mxnet-dataiter" = callPackage
@@ -170885,8 +158590,6 @@ self: {
        testHaskellDepends = [ base hspec mxnet streaming ];
        description = "mxnet dataiters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mxnet-examples" = callPackage
@@ -170900,8 +158603,6 @@ self: {
        executableHaskellDepends = [ base mxnet ];
        description = "Examples for MXNet in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mxnet-nn" = callPackage
@@ -170927,8 +158628,6 @@ self: {
        ];
        description = "Train a neural network with MXNet in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mxnet-nnvm" = callPackage
@@ -170942,8 +158641,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "NNVM interface in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) mxnet;};
 
   "my-package-testing" = callPackage
@@ -170968,8 +158665,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "my-test-docs" = callPackage
@@ -170994,8 +158689,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "myTestlll" = callPackage
@@ -171020,8 +158713,6 @@ self: {
        ];
        description = "None";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "myanimelist-export" = callPackage
@@ -171045,8 +158736,6 @@ self: {
        ];
        description = "Export from MyAnimeList";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mybitcoin-sci" = callPackage
@@ -171083,8 +158772,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Haskell binding to the Myo armband";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mysnapsession" = callPackage
@@ -171101,8 +158788,6 @@ self: {
        ];
        description = "Sessions and continuations for Snap web apps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mysnapsession-example" = callPackage
@@ -171122,8 +158807,6 @@ self: {
        ];
        description = "Example projects using mysnapsession";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mysql" = callPackage
@@ -171156,8 +158839,6 @@ self: {
        ];
        description = "An extensible mysql effect using extensible-effects and mysql-simple";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mysql-haskell" = callPackage
@@ -171212,8 +158893,6 @@ self: {
        ];
        description = "TLS support for mysql-haskell package using openssl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mysql-simple" = callPackage
@@ -171247,8 +158926,6 @@ self: {
        ];
        description = "Quasi-quoter for use with mysql-simple";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mysql-simple-typed" = callPackage
@@ -171264,8 +158941,6 @@ self: {
        ];
        description = "Typed extension to mysql simple";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mystem" = callPackage
@@ -171284,8 +158959,6 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "Bindings for Mystem morphological analyzer executabe";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "mywatch" = callPackage
@@ -171321,8 +158994,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Implementation of the \"Monads, Zippers and Views\" (Schrijvers and Oliveira, ICFP'11)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "n-ary-functor" = callPackage
@@ -171366,8 +159037,6 @@ self: {
        libraryHaskellDepends = [ base singletons vector ];
        description = "Homogeneous tuples of arbitrary length";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "n2o" = callPackage
@@ -171499,8 +159168,6 @@ self: {
        ];
        description = "Monitor ekg metrics via Nagios";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nakadi-client" = callPackage
@@ -171539,8 +159206,6 @@ self: {
        ];
        description = "Client library for the Nakadi Event Broker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "namecoin-update" = callPackage
@@ -171593,8 +159258,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A named lock that is created on demand";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "named-records" = callPackage
@@ -171612,8 +159275,8 @@ self: {
     ({ mkDerivation, base, singletons, tasty, tasty-hunit, text }:
      mkDerivation {
        pname = "named-sop";
-       version = "0.2.0.0";
-       sha256 = "1yz4cp19nf44cscfzhwsw7xigq07sxbvzfw5v5l3jgsjxi5xw9ad";
+       version = "0.3.0.0";
+       sha256 = "0fc55x0lx14fnynm42xp4z9n5k47wrwscq130rfffvf6w6xl6x7d";
        libraryHaskellDepends = [ base singletons text ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Dependently-typed sums and products, tagged by field name";
@@ -171636,8 +159299,6 @@ self: {
        ];
        description = "fortran90 namelist parser/pretty printer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "names" = callPackage
@@ -171712,8 +159373,6 @@ self: {
        librarySystemDepends = [ openssl ];
        description = "Bindings to OpenSSL HMAC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "nano-md5" = callPackage
@@ -171728,8 +159387,6 @@ self: {
        librarySystemDepends = [ openssl ];
        description = "Efficient, ByteString bindings to OpenSSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "nanoAgda" = callPackage
@@ -171760,8 +159417,6 @@ self: {
        librarySystemDepends = [ ncurses ];
        description = "Simple Curses binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) ncurses;};
 
   "nanomsg" = callPackage
@@ -171774,8 +159429,6 @@ self: {
        librarySystemDepends = [ nanomsg ];
        description = "nanomsg - scalability protocols library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) nanomsg;};
 
   "nanomsg-haskell" = callPackage
@@ -171800,8 +159453,6 @@ self: {
        ];
        description = "Bindings to the nanomsg library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) nanomsg;};
 
   "nanoparsec" = callPackage
@@ -171813,8 +159464,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ListLike ];
        description = "An implementation of attoparsec-like parser around list-like";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nanospec" = callPackage
@@ -171848,8 +159497,6 @@ self: {
        testHaskellDepends = [ base containers hspec inline-c QuickCheck ];
        description = "Haskell bindings for nanovg";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {GLEW = null; inherit (pkgs) glew; inherit (pkgs) libGL; 
          inherit (pkgs) libGLU;};
 
@@ -171868,8 +159515,6 @@ self: {
        ];
        description = "Simple interface to rendering with NanoVG";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nanq" = callPackage
@@ -171889,8 +159534,6 @@ self: {
        ];
        description = "Performs 漢字検定 (Japan Kanji Aptitude Test) level analysis on given Kanji";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "naperian" = callPackage
@@ -171937,8 +159580,6 @@ self: {
        libraryHaskellDepends = [ base HDBC HUnit mtl QuickCheck random ];
        description = "Query SQL databases using Nested Relational Calculus embedded in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nat" = callPackage
@@ -171962,8 +159603,6 @@ self: {
        testHaskellDepends = [ base doctest hedgehog QuickCheck ];
        description = "Variable-sized numbers from type-level nats";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nationstates" = callPackage
@@ -171980,8 +159619,6 @@ self: {
        ];
        description = "NationStates API client";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "native" = callPackage
@@ -172061,8 +159698,6 @@ self: {
        ];
        description = "Haskell API for NATS messaging system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "natural" = callPackage
@@ -172083,8 +159718,6 @@ self: {
        ];
        description = "Natural number";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "natural-arithmetic" = callPackage
@@ -172104,6 +159737,8 @@ self: {
        pname = "natural-induction";
        version = "0.2.0.0";
        sha256 = "1brkmvkwpgqsxra210h8fkb9bpvawmbdwwvvhsd58kzmkd599alr";
+       revision = "1";
+       editedCabalFile = "012kjygd54rxinmaplqnbw0hkfm4wp829j0afjxr6h40x22gwzn5";
        libraryHaskellDepends = [ base peano ];
        description = "Induction over natural numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -172123,8 +159758,6 @@ self: {
        ];
        description = "Natural numbers tagged with a type-level representation of the number";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "natural-numbers" = callPackage
@@ -172202,8 +159835,6 @@ self: {
        ];
        description = "Interface to Naver Translate";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nbt" = callPackage
@@ -172285,8 +159916,6 @@ self: {
        executableHaskellDepends = [ base filepath parsec ];
        description = "A Fast Retargetable Template Engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "neat-interpolation" = callPackage
@@ -172340,8 +159969,6 @@ self: {
        ];
        description = "ASCII-fied arrow notation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "neet" = callPackage
@@ -172358,8 +159985,6 @@ self: {
        ];
        description = "A NEAT library for Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nehe-tuts" = callPackage
@@ -172379,8 +160004,6 @@ self: {
        ];
        description = "Port of the NeHe OpenGL tutorials to Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "neil" = callPackage
@@ -172410,8 +160033,6 @@ self: {
        libraryHaskellDepends = [ base failure transformers ];
        description = "Provide versions of Either with good monad and applicative instances. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "neko-lib" = callPackage
@@ -172432,8 +160053,6 @@ self: {
        ];
        description = "Neko VM code generation and disassembly library";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "neko-obfs" = callPackage
@@ -172455,8 +160074,6 @@ self: {
        ];
        description = "a TCP tunnel with packet length obfuscation";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nemesis" = callPackage
@@ -172489,8 +160106,6 @@ self: {
        ];
        description = "A collection of Nemesis tasks to bootstrap a Haskell project with a focus on continuous integration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nerf" = callPackage
@@ -172517,8 +160132,6 @@ self: {
        ];
        description = "Nerf, a named entity recognition tool based on linear-chain CRFs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nero" = callPackage
@@ -172537,8 +160150,6 @@ self: {
        ];
        description = "Lens-based HTTP toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nero-wai" = callPackage
@@ -172554,8 +160165,6 @@ self: {
        ];
        description = "WAI adapter for Nero server applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nero-warp" = callPackage
@@ -172567,8 +160176,6 @@ self: {
        libraryHaskellDepends = [ base nero nero-wai warp ];
        description = "Run Nero server applications with Warp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nest" = callPackage
@@ -172584,8 +160191,6 @@ self: {
        ];
        testHaskellDepends = [ base bytestring containers hedgehog text ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nested-routes" = callPackage
@@ -172615,8 +160220,6 @@ self: {
        ];
        description = "Declarative, compositional Wai responses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nested-sequence" = callPackage
@@ -172633,8 +160236,6 @@ self: {
        ];
        description = "List-like data structures with O(log(n)) random access";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nested-sets" = callPackage
@@ -172663,8 +160264,6 @@ self: {
        ];
        description = "A library for nested maps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "net-concurrent" = callPackage
@@ -172693,8 +160292,8 @@ self: {
      }:
      mkDerivation {
        pname = "net-mqtt";
-       version = "0.6.2.2";
-       sha256 = "08svb0k43aqycbms2cabng49dgsiwsjw10lqmjsm18iasgr53gk0";
+       version = "0.6.2.3";
+       sha256 = "1z7lwlp8wjmy384ranzl2n8gv80ckgsg9h50qmr45l9zshcbdr8j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -172715,8 +160314,6 @@ self: {
        ];
        description = "An MQTT Protocol Implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "net-mqtt-rpc" = callPackage
@@ -172738,8 +160335,6 @@ self: {
        ];
        description = "Make RPC calls via an MQTT broker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "net-spider" = callPackage
@@ -172764,8 +160359,6 @@ self: {
        ];
        description = "A graph database middleware to maintain a time-varying graph";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "net-spider-cli" = callPackage
@@ -172786,8 +160379,6 @@ self: {
        ];
        description = "CLI option parsers for NetSpider objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "net-spider-pangraph" = callPackage
@@ -172806,8 +160397,6 @@ self: {
        ];
        description = "Conversion between net-spider and pangraph";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "net-spider-rpl" = callPackage
@@ -172829,8 +160418,6 @@ self: {
        ];
        description = "NetSpider data model and utility for RPL networks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "net-spider-rpl-cli" = callPackage
@@ -172855,8 +160442,6 @@ self: {
        ];
        description = "CLI executable of NetSpider.RPL.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "netclock" = callPackage
@@ -172870,8 +160455,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hosc network ];
        description = "Netclock protocol";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "netcore" = callPackage
@@ -172903,8 +160486,6 @@ self: {
        ];
        description = "The NetCore compiler and runtime system for OpenFlow networks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "netease-fm" = callPackage
@@ -172933,8 +160514,6 @@ self: {
        ];
        description = "NetEase Cloud Music FM client in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "netlib-carray" = callPackage
@@ -172994,8 +160573,6 @@ self: {
        executableHaskellDepends = [ base HTF random ];
        description = "Enumerator tools for text-based network protocols";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "netlink" = callPackage
@@ -173092,8 +160669,6 @@ self: {
        ];
        description = "Contract normaliser and simulator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "netspec" = callPackage
@@ -173110,8 +160685,6 @@ self: {
        ];
        description = "Simplify static Networking tasks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "netstring-enumerator" = callPackage
@@ -173125,8 +160698,6 @@ self: {
        ];
        description = "Enumerator-based netstring parsing";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nettle" = callPackage
@@ -173168,8 +160739,6 @@ self: {
        ];
        description = "FRP for controlling networks of OpenFlow switches";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nettle-netkit" = callPackage
@@ -173185,8 +160754,6 @@ self: {
        ];
        description = "DSL for describing OpenFlow networks, and a compiler generating NetKit labs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nettle-openflow" = callPackage
@@ -173203,8 +160770,6 @@ self: {
        ];
        description = "OpenFlow protocol messages, binary formats, and servers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "netwire" = callPackage
@@ -173264,8 +160829,6 @@ self: {
        ];
        description = "JavaScript instance of netwire-input";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "netwire-vinylglfw-examples" = callPackage
@@ -173288,8 +160851,6 @@ self: {
        ];
        description = "Netwire/GLFW/VinylGL input handling demo";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network_2_6_3_1" = callPackage
@@ -173309,23 +160870,6 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "network" = callPackage
-    ({ mkDerivation, base, bytestring, directory, doctest, hspec
-     , hspec-discover, HUnit, unix
-     }:
-     mkDerivation {
-       pname = "network";
-       version = "2.8.0.1";
-       sha256 = "0im8k51rw3ahmr23ny10pshwbz09jfg0fdpam0hzf2hgxnzmvxb1";
-       libraryHaskellDepends = [ base bytestring unix ];
-       testHaskellDepends = [
-         base bytestring directory doctest hspec HUnit
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Low-level networking interface";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
   "network_3_0_1_1" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, directory, hspec
      , hspec-discover, HUnit
@@ -173342,7 +160886,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "network_3_1_1_1" = callPackage
+  "network" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, directory, hspec
      , hspec-discover, HUnit
      }:
@@ -173355,7 +160899,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Low-level networking interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-address" = callPackage
@@ -173374,8 +160917,6 @@ self: {
        ];
        description = "IP data structures and textual representation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-anonymous-i2p" = callPackage
@@ -173398,8 +160939,6 @@ self: {
        ];
        description = "Haskell API for I2P anonymous networking";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-anonymous-tor" = callPackage
@@ -173429,8 +160968,6 @@ self: {
        ];
        description = "Haskell API for Tor anonymous networking";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-api-support" = callPackage
@@ -173448,8 +160985,6 @@ self: {
        ];
        description = "Toolkit for building http client libraries over Network.Http.Conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-arbitrary" = callPackage
@@ -173471,8 +161006,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Arbitrary Instances for Network Types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-attoparsec" = callPackage
@@ -173518,23 +161051,9 @@ self: {
        ];
        description = "An interface to bitcoind";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-bsd" = callPackage
-    ({ mkDerivation, base, network }:
-     mkDerivation {
-       pname = "network-bsd";
-       version = "2.8.0.0";
-       sha256 = "0dfbwgrr28y6ypw7p1ppqg7v746qf14569q4xazj4ahdjw2xkpi5";
-       libraryHaskellDepends = [ base network ];
-       doHaddock = false;
-       description = "Network.BSD";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "network-bsd_2_8_1_0" = callPackage
     ({ mkDerivation, base, deepseq, network }:
      mkDerivation {
        pname = "network-bsd";
@@ -173545,7 +161064,6 @@ self: {
        libraryHaskellDepends = [ base deepseq network ];
        description = "POSIX network database (<netdb.h>) API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-builder" = callPackage
@@ -173567,23 +161085,9 @@ self: {
        ];
        description = "Linux NetworkNameSpace Builder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-byte-order" = callPackage
-    ({ mkDerivation, base, bytestring, doctest }:
-     mkDerivation {
-       pname = "network-byte-order";
-       version = "0.1.3.0";
-       sha256 = "1kp4hgbq69b85m978ambmk8jil3maddfirivzr56zj01zh9m52z3";
-       libraryHaskellDepends = [ base bytestring ];
-       testHaskellDepends = [ base bytestring doctest ];
-       description = "Network byte order utilities";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "network-byte-order_0_1_4_0" = callPackage
     ({ mkDerivation, base, bytestring, doctest }:
      mkDerivation {
        pname = "network-byte-order";
@@ -173593,7 +161097,6 @@ self: {
        testHaskellDepends = [ base bytestring doctest ];
        description = "Network byte order utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-bytestring" = callPackage
@@ -173607,8 +161110,6 @@ self: {
        libraryHaskellDepends = [ base bytestring network unix ];
        description = "Fast, memory-efficient, low-level networking";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-carbon" = callPackage
@@ -173669,8 +161170,6 @@ self: {
        ];
        description = "A wrapper around a generic stream-like connection";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-data" = callPackage
@@ -173736,8 +161235,6 @@ self: {
        ];
        description = "Enumerators for network sockets";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-fancy" = callPackage
@@ -173760,8 +161257,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hans parsec ];
        description = "HaNS to Network shims for easier HaNS integration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-house" = callPackage
@@ -173797,8 +161292,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ioctl network ];
        description = "Haskell bindings for the ifreq structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-ip" = callPackage
@@ -173880,8 +161373,6 @@ self: {
        ];
        description = "WebSocket backend for MessagePack RPC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-metrics" = callPackage
@@ -173917,8 +161408,6 @@ self: {
        ];
        description = "A ByteString based library for writing HTTP(S) servers and clients";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-msg" = callPackage
@@ -173953,8 +161442,6 @@ self: {
        testHaskellDepends = [ async base bytestring hspec mtl network ];
        description = "A MessagePack-RPC Implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-multicast" = callPackage
@@ -173982,8 +161469,6 @@ self: {
        ];
        description = "Haskell bindings for low-level packet sockets (AF_PACKET)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-pgi" = callPackage
@@ -174008,16 +161493,14 @@ self: {
      }:
      mkDerivation {
        pname = "network-protocol-xmpp";
-       version = "0.4.8";
-       sha256 = "07hy8byhaakjwfidrvkjp07jn25aw21g8wcs93ni3njj0kh2jxza";
+       version = "0.4.9";
+       sha256 = "1qjm22qvsmfsf9kmg0ha117yidys0yp80mawvnzs8ym5a6j80x42";
        libraryHaskellDepends = [
          base bytestring gnuidn gnutls gsasl libxml-sax monads-tf network
          text transformers xml-types
        ];
        description = "Client library for the XMPP protocol";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-rpca" = callPackage
@@ -174035,8 +161518,6 @@ self: {
        ];
        description = "A cross-platform RPC library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-run" = callPackage
@@ -174048,8 +161529,6 @@ self: {
        libraryHaskellDepends = [ base bytestring network ];
        description = "Simple network runner library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-server" = callPackage
@@ -174064,8 +161543,6 @@ self: {
        executableHaskellDepends = [ base network unix ];
        description = "A light abstraction over sockets & co. for servers";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-service" = callPackage
@@ -174081,8 +161558,6 @@ self: {
        ];
        description = "Provide a service at the data type level";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-simple" = callPackage
@@ -174114,28 +161589,9 @@ self: {
        ];
        description = "network-simple for resolved addresses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-simple-tls" = callPackage
-    ({ mkDerivation, base, bytestring, data-default, network
-     , network-simple, safe-exceptions, tls, transformers, x509
-     , x509-store, x509-system, x509-validation
-     }:
-     mkDerivation {
-       pname = "network-simple-tls";
-       version = "0.3.2";
-       sha256 = "09fw7ynvry0wjc2nip6kwncl662f7glzq1akiwgh09bwnpbswxsh";
-       libraryHaskellDepends = [
-         base bytestring data-default network network-simple safe-exceptions
-         tls transformers x509 x509-store x509-system x509-validation
-       ];
-       description = "Simple interface to TLS secured network sockets";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "network-simple-tls_0_4" = callPackage
     ({ mkDerivation, base, bytestring, data-default, network
      , network-simple, safe-exceptions, tls, tls-session-manager
      , transformers, x509, x509-store, x509-system, x509-validation
@@ -174151,7 +161607,6 @@ self: {
        ];
        description = "Simple interface to TLS secured network sockets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-simple-ws" = callPackage
@@ -174211,8 +161666,6 @@ self: {
        ];
        description = "ByteString and Text streams for networking";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-topic-models" = callPackage
@@ -174234,8 +161687,6 @@ self: {
        ];
        description = "A few network topic model implementations for bayes-stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-transport" = callPackage
@@ -174276,8 +161727,6 @@ self: {
        ];
        description = "AMQP-based transport layer for distributed-process (aka Cloud Haskell)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-transport-composed" = callPackage
@@ -174309,8 +161758,6 @@ self: {
        ];
        description = "In-memory instantiation of Network.Transport";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-transport-tcp" = callPackage
@@ -174330,8 +161777,6 @@ self: {
        ];
        description = "TCP instantiation of Network.Transport";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-transport-tests" = callPackage
@@ -174348,8 +161793,6 @@ self: {
        ];
        description = "Unit tests for Network.Transport implementations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-transport-zeromq" = callPackage
@@ -174389,6 +161832,8 @@ self: {
        pname = "network-uri";
        version = "2.6.2.0";
        sha256 = "0fmjc4p6pnzjxyg32pp7xh4wdbpqzp0rya80mccixyracvs1q3nw";
+       revision = "1";
+       editedCabalFile = "14ab4k2biga40z7nyksy0ca56zwghmrlab2fxhnq1km3rj7qa4k6";
        libraryHaskellDepends = [ base deepseq parsec template-haskell ];
        testHaskellDepends = [
          base criterion deepseq HUnit test-framework test-framework-hunit
@@ -174398,6 +161843,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-uri_2_6_3_0" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, HUnit, parsec
+     , template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "network-uri";
+       version = "2.6.3.0";
+       sha256 = "08x7myvjasm326byi3jz1hgv2fqk0vvkfiwi8zlc4b2xy64i6750";
+       libraryHaskellDepends = [ base deepseq parsec template-haskell ];
+       testHaskellDepends = [
+         base criterion deepseq HUnit test-framework test-framework-hunit
+         test-framework-quickcheck2
+       ];
+       description = "URI manipulation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-uri-flag" = callPackage
     ({ mkDerivation, network, network-uri }:
      mkDerivation {
@@ -174427,8 +161891,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "FromJSON and ToJSON Instances for Network.URI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-uri-lenses" = callPackage
@@ -174468,8 +161930,6 @@ self: {
        ];
        description = "VoiceText Web API wrapper";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-wai-router" = callPackage
@@ -174481,8 +161941,6 @@ self: {
        libraryHaskellDepends = [ base wai ];
        description = "A routing library for wai";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "network-websocket" = callPackage
@@ -174496,8 +161954,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 network webserver ];
        description = "WebSocket library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "networked-game" = callPackage
@@ -174515,8 +161971,6 @@ self: {
        ];
        description = "Networked-game support library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "neural" = callPackage
@@ -174549,8 +162003,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Neural Networks in native Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "neural-network-base" = callPackage
@@ -174581,8 +162033,6 @@ self: {
        ];
        description = "Yet Another High Performance and Extendable Neural Network in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "neural-network-hmatrix" = callPackage
@@ -174600,8 +162050,6 @@ self: {
        librarySystemDepends = [ blas ];
        description = "Yet Another High Performance and Extendable Neural Network in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) blas;};
 
   "newhope" = callPackage
@@ -174633,8 +162081,6 @@ self: {
        ];
        description = "Library implementing the NewHope cryptographic key-exchange protocol";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "newports" = callPackage
@@ -174648,8 +162094,6 @@ self: {
        executableHaskellDepends = [ base directory old-time ];
        description = "List ports newer than N days on a FreeBSD system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "newsletter" = callPackage
@@ -174678,8 +162122,6 @@ self: {
        ];
        description = "A basic newsletter implimentation, using various backends";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "newsletter-mailgun" = callPackage
@@ -174695,8 +162137,6 @@ self: {
        ];
        description = "A mailgun backend for the newsletter package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "newsynth" = callPackage
@@ -174734,8 +162174,6 @@ self: {
        executableHaskellDepends = [ base cmdargs containers mtl ];
        description = "A trivially simple app to create things from simple templates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "newtype" = callPackage
@@ -174763,8 +162201,6 @@ self: {
        ];
        description = "Instance derivers for newtype wrappers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "newtype-generics" = callPackage
@@ -174799,8 +162235,6 @@ self: {
        ];
        description = "A template haskell deriver to create Control.Newtype instances.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "newtype-zoo" = callPackage
@@ -174840,8 +162274,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "A concurrency primitive for a slow consumer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nextstep-plist" = callPackage
@@ -174853,8 +162285,6 @@ self: {
        libraryHaskellDepends = [ base parsec pretty QuickCheck ];
        description = "NextStep style plist parser and printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nf" = callPackage
@@ -174881,8 +162311,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "libnfc bindings";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {nfc = null;};
 
   "ngram" = callPackage
@@ -174922,8 +162350,6 @@ self: {
        executableHaskellDepends = [ base parseargs ];
        description = "Ngrams loader based on http://www.ngrams.info format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ngx-export" = callPackage
@@ -174991,8 +162417,6 @@ self: {
        testHaskellDepends = [ base HUnit QuickCheck ];
        description = "High performance CSS EDSL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nibblestring" = callPackage
@@ -175013,8 +162437,6 @@ self: {
        ];
        description = "Packed, strict nibble arrays with a list interface (ByteString for nibbles)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nice-html" = callPackage
@@ -175038,8 +162460,6 @@ self: {
        ];
        description = "A fast and nice HTML templating library with distinct compilation/rendering phases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nicify" = callPackage
@@ -175086,8 +162506,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Nico Nico Douga (ニコニコ動画) Comment Translator";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nikepub" = callPackage
@@ -175108,8 +162526,6 @@ self: {
        ];
        description = "Command line utility publishes Nike+ runs on blogs and Twitter";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nimber" = callPackage
@@ -175159,8 +162575,6 @@ self: {
        ];
        description = "IDL compiler and RPC/distributed object framework for microservices";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nist-beacon" = callPackage
@@ -175185,8 +162599,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Haskell bindings for Nitro";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "niv" = callPackage
@@ -175394,8 +162806,8 @@ self: {
      }:
      mkDerivation {
        pname = "nixfmt";
-       version = "0.3.0";
-       sha256 = "0y9r7l2iwy6kqqli8bfcgrcr07pqvpaym895qn21d467ybcmgqih";
+       version = "0.4.0";
+       sha256 = "1ispgl8rc2scr6v8bb6sks7px856jf61x74zj2iyddrn5qamkb3n";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -175432,8 +162844,6 @@ self: {
        ];
        description = "Generate nix expressions from npm packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nixos-types" = callPackage
@@ -175469,8 +162879,6 @@ self: {
        ];
        description = "Tool for semi-automatic updating of nixpkgs repository";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nkjp" = callPackage
@@ -175489,8 +162897,6 @@ self: {
        ];
        description = "Manipulating the National Corpus of Polish (NKJP)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nlopt-haskell" = callPackage
@@ -175515,8 +162921,6 @@ self: {
        libraryHaskellDepends = [ base containers strict ];
        description = "Scoring functions commonly used for evaluation in NLP and IR";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nlp-scores-scripts" = callPackage
@@ -175532,8 +162936,6 @@ self: {
        ];
        description = "NLP scoring command-line programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nm" = callPackage
@@ -175550,8 +162952,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Network Manager, binding to libnm-glib";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {g = null; inherit (pkgs) glib; libnm-glib = null; 
          nm-glib = null;};
 
@@ -175593,8 +162993,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hspec tasty-quickcheck ];
        description = "A tiny neural network";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nntp" = callPackage
@@ -175610,8 +163008,6 @@ self: {
        ];
        description = "Library to connect to an NNTP Server";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "no-buffering-workaround" = callPackage
@@ -175635,8 +163031,6 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Role annotations without -XRoleAnnotations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "no-value" = callPackage
@@ -175670,8 +163064,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Math in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nofib-analyse" = callPackage
@@ -175685,8 +163077,6 @@ self: {
        executableHaskellDepends = [ array base containers regex-compat ];
        description = "Parse and compare nofib runs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nofib-analyze" = callPackage
@@ -175700,8 +163090,6 @@ self: {
        executableHaskellDepends = [ array base containers regex-compat ];
        description = "Parse and compare nofib runs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "noise" = callPackage
@@ -175725,8 +163113,6 @@ self: {
        ];
        description = "A friendly language for graphic design";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nominal" = callPackage
@@ -175936,8 +163322,6 @@ self: {
        testHaskellDepends = [ base checkers QuickCheck ];
        description = "The Zipper for NonEmpty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "non-negative" = callPackage
@@ -175992,25 +163376,6 @@ self: {
      }) {};
 
   "nonempty-containers" = callPackage
-    ({ mkDerivation, base, comonad, containers, deepseq, hedgehog
-     , hedgehog-fn, semigroupoids, tasty, tasty-hedgehog, text, these
-     }:
-     mkDerivation {
-       pname = "nonempty-containers";
-       version = "0.3.1.0";
-       sha256 = "15flyfv6w4078wk69d2nb2lx21b76xr6c34rxs0w8jz1mb497f6l";
-       libraryHaskellDepends = [
-         base comonad containers deepseq semigroupoids these
-       ];
-       testHaskellDepends = [
-         base comonad containers hedgehog hedgehog-fn semigroupoids tasty
-         tasty-hedgehog text these
-       ];
-       description = "Non-empty variants of containers data types, with full API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "nonempty-containers_0_3_3_0" = callPackage
     ({ mkDerivation, base, comonad, containers, deepseq, hedgehog
      , hedgehog-fn, nonempty-vector, semigroupoids, tasty
      , tasty-hedgehog, text, these, vector
@@ -176029,7 +163394,6 @@ self: {
        ];
        description = "Non-empty variants of containers data types, with full API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nonempty-lift" = callPackage
@@ -176044,8 +163408,6 @@ self: {
        testHaskellDepends = [ base hedgehog hedgehog-classes ];
        description = "nonempty structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nonempty-vector" = callPackage
@@ -176091,8 +163453,8 @@ self: {
     ({ mkDerivation, base, primitive, vector }:
      mkDerivation {
        pname = "nonlinear-optimization";
-       version = "0.3.11";
-       sha256 = "1hia8vpxafp8w3arsxwlb1inp81fs53i05r7x5zgvas56jywd2cf";
+       version = "0.3.12";
+       sha256 = "129wvjrxxzcjzp4k2jjyn186xknglbcqj5jiah48mcrg44iash3r";
        libraryHaskellDepends = [ base primitive vector ];
        description = "Various iterative algorithms for optimization of nonlinear functions";
        license = "GPL";
@@ -176104,10 +163466,8 @@ self: {
      }:
      mkDerivation {
        pname = "nonlinear-optimization-ad";
-       version = "0.2.2";
-       sha256 = "07a80ggl8wxjllam1cqlamwmh61lkxag1410gj8n53hdd55slqxj";
-       revision = "1";
-       editedCabalFile = "038242cdiddjck2m995622862wd8ykla1asl9c8njbr1k0iacgbf";
+       version = "0.2.3";
+       sha256 = "13a7j23ry8fkpvpc061ishcb4x2dnhnjbv3pcbywwri0w86g4g7d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -176164,8 +163524,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        description = "Normalization insensitive string comparison";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "normalize" = callPackage
@@ -176234,8 +163592,6 @@ self: {
        ];
        description = "examples for not-gloss";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "not-in-base" = callPackage
@@ -176260,8 +163616,6 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Avoiding the C preprocessor via cunning use of Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "notifications-tray-icon" = callPackage
@@ -176287,8 +163641,6 @@ self: {
          transformers tuple
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "notmuch" = callPackage
@@ -176326,8 +163678,6 @@ self: {
        executableSystemDepends = [ notmuch ];
        description = "Binding for notmuch MUA library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) notmuch;};
 
   "notmuch-web" = callPackage
@@ -176365,8 +163715,6 @@ self: {
        ];
        description = "A web interface to the notmuch email indexer";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "notzero" = callPackage
@@ -176420,8 +163768,6 @@ self: {
        ];
        description = "Zeit Now haskell-side integration and introspection tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nowdoc" = callPackage
@@ -176464,8 +163810,6 @@ self: {
        ];
        description = "Linear algebra for the numeric-prelude framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nptools" = callPackage
@@ -176484,8 +163828,6 @@ self: {
        ];
        description = "A collection of random tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nqe" = callPackage
@@ -176560,8 +163902,6 @@ self: {
        testHaskellDepends = [ base containers hspec pretty ];
        description = "A tiny statically typed functional programming language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nthable" = callPackage
@@ -176614,8 +163954,6 @@ self: {
        ];
        description = "NTRIP client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ntype" = callPackage
@@ -176644,8 +163982,6 @@ self: {
        ];
        description = "HTML5 Canvas Graphics Library - forked Blank Canvas";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nullary" = callPackage
@@ -176657,8 +163993,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A package for working with nullary type classes";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nullpipe" = callPackage
@@ -176671,8 +164005,6 @@ self: {
        testHaskellDepends = [ base hspec pipes ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "num-non-negative" = callPackage
@@ -176740,8 +164072,6 @@ self: {
        libraryHaskellDepends = [ base call-stack semigroups ];
        description = "A sequence of semigroups, for composing stuff in multiple spatial directions";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "numbering" = callPackage
@@ -176790,8 +164120,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Convert numbers to number words";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "numerals-base" = callPackage
@@ -176813,8 +164141,6 @@ self: {
        ];
        description = "Convert numbers to number words";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "numeric-domains" = callPackage
@@ -176876,8 +164202,6 @@ self: {
        ];
        description = "Ode solvers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "numeric-prelude" = callPackage
@@ -176914,8 +164238,6 @@ self: {
        doCheck = false;
        description = "Quasi-quoters for numbers of different bases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "numeric-quest" = callPackage
@@ -176942,8 +164264,6 @@ self: {
        testHaskellDepends = [ base hspec HUnit QuickCheck ];
        description = "A framework for numeric ranges";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "numeric-tools" = callPackage
@@ -176977,8 +164297,6 @@ self: {
        ];
        description = "core package for Numerical Haskell project";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "numericpeano" = callPackage
@@ -176993,17 +164311,6 @@ self: {
      }) {};
 
   "numhask" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "numhask";
-       version = "0.3.1";
-       sha256 = "0r7raa7sw9k6p5xb3kl7jfpfkg4dym2kb8hrdkq9xvj2yrajzg77";
-       libraryHaskellDepends = [ base ];
-       description = "numeric classes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "numhask_0_4_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "numhask";
@@ -177012,7 +164319,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "numeric classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "numhask-array" = callPackage
@@ -177033,8 +164339,6 @@ self: {
        ];
        description = "n-dimensional arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "numhask-hedgehog" = callPackage
@@ -177051,8 +164355,6 @@ self: {
        testHaskellDepends = [ base hedgehog numhask numhask-prelude ];
        description = "Laws and tests for numhask";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "numhask-histogram" = callPackage
@@ -177069,8 +164371,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "numhask-prelude" = callPackage
@@ -177083,8 +164383,6 @@ self: {
        testHaskellDepends = [ doctest ];
        description = "A numeric prelude";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "numhask-range" = callPackage
@@ -177105,8 +164403,6 @@ self: {
        ];
        description = "Numbers that are range representations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "numhask-space" = callPackage
@@ -177124,8 +164420,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "numerical spaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "numhask-test" = callPackage
@@ -177142,8 +164436,6 @@ self: {
        testHaskellDepends = [ base numhask-prelude QuickCheck tasty ];
        description = "Laws and tests for numhask";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nums" = callPackage
@@ -177359,8 +164651,6 @@ self: {
        ];
        description = "Client for the Nylas API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nymphaea" = callPackage
@@ -177379,8 +164669,6 @@ self: {
        ];
        description = "An interactive GUI for manipulating L-systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nyx-game" = callPackage
@@ -177428,8 +164716,6 @@ self: {
        testToolDepends = [ doctest markdown-unlit ];
        description = "Type-safe time library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "oanda-rest-api" = callPackage
@@ -177454,8 +164740,6 @@ self: {
        ];
        description = "Client to the OANDA REST API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "oasis-xrd" = callPackage
@@ -177478,8 +164762,6 @@ self: {
        ];
        description = "Extensible Resource Descriptor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "oauth10a" = callPackage
@@ -177524,8 +164806,6 @@ self: {
        ];
        description = "OAuth2 jwt-bearer client flow as per rfc7523";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "oauthenticated" = callPackage
@@ -177551,8 +164831,6 @@ self: {
        ];
        description = "Simple OAuth for http-client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "obd" = callPackage
@@ -177577,8 +164855,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Communicate to OBD interfaces over ELM327";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "obdd" = callPackage
@@ -177595,8 +164871,6 @@ self: {
        testHaskellDepends = [ array base containers text ];
        description = "Ordered Reduced Binary Decision Diagrams";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "oberon0" = callPackage
@@ -177616,8 +164890,6 @@ self: {
        doHaddock = false;
        description = "Oberon0 Compiler";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "obj" = callPackage
@@ -177637,8 +164909,6 @@ self: {
        ];
        description = "Reads and writes obj models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "objectid" = callPackage
@@ -177659,8 +164929,6 @@ self: {
        ];
        description = "Rather unique identifier for things that need to be stored";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "objective" = callPackage
@@ -177681,8 +164949,6 @@ self: {
        ];
        description = "Composable objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "oblivious-transfer" = callPackage
@@ -177706,8 +164972,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "An implementation of the Oblivious Transfer protocol in Haskell";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "observable" = callPackage
@@ -177757,8 +165021,6 @@ self: {
        ];
        description = "Convert Haskell types in OCaml types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ochintin-daicho" = callPackage
@@ -177799,8 +165061,6 @@ self: {
        ];
        description = "Parse Rocket League replays";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "octohat" = callPackage
@@ -177831,8 +165091,6 @@ self: {
        ];
        description = "A tested, minimal wrapper around GitHub's API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "octopus" = callPackage
@@ -177853,8 +165111,6 @@ self: {
        ];
        description = "Lisp with more dynamism, more power, more simplicity";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "oculus" = callPackage
@@ -177871,8 +165127,6 @@ self: {
        librarySystemDepends = [ libGL libX11 libXinerama ovr systemd ];
        description = "Oculus Rift ffi providing head tracking data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
          inherit (pkgs.xorg) libXinerama; ovr = null; 
          inherit (pkgs) systemd;};
@@ -177903,8 +165157,6 @@ self: {
        benchmarkHaskellDepends = [ async base text weigh ];
        description = "Haskell binding to the ODBC API, aimed at SQL Server driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) unixODBC;};
 
   "oden-go-packages" = callPackage
@@ -177920,8 +165172,6 @@ self: {
        ];
        description = "Provides Go package metadata";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "odpic-raw" = callPackage
@@ -177978,8 +165228,6 @@ self: {
        ];
        description = "Interface for Online Encyclopedia of Integer Sequences (OEIS)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "off-simple" = callPackage
@@ -177991,8 +165239,6 @@ self: {
        libraryHaskellDepends = [ base parsec3 vector ];
        description = "A parser for simplified-syntax OFF files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ofx" = callPackage
@@ -178023,8 +165269,6 @@ self: {
        ];
        description = "A lightweight markup language for story writers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ohloh-hs" = callPackage
@@ -178048,8 +165292,6 @@ self: {
        ];
        description = "Interface to the Ohloh API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "oi" = callPackage
@@ -178066,8 +165308,6 @@ self: {
        executableHaskellDepends = [ base directory filepath parallel ];
        description = "Library for purely functional lazy interactions with the outer world";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "oidc-client" = callPackage
@@ -178093,8 +165333,6 @@ self: {
        ];
        description = "OpenID Connect 1.0 library for RP";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ois-input-manager" = callPackage
@@ -178107,8 +165345,6 @@ self: {
        librarySystemDepends = [ OIS ];
        description = "wrapper for OIS input manager for use with hogre";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {OIS = null;};
 
   "old-locale" = callPackage
@@ -178172,8 +165408,6 @@ self: {
        ];
        description = "An OpenLayers JavaScript Wrapper and Webframework with snaplet-fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "om-elm" = callPackage
@@ -178208,8 +165442,6 @@ self: {
        ];
        description = "A simple tool to generate OMakefile for latex files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ombra" = callPackage
@@ -178229,8 +165461,6 @@ self: {
        ];
        description = "Render engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "omega" = callPackage
@@ -178249,8 +165479,6 @@ self: {
        ];
        description = "A purely functional programming language and a proof system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "omnicodec" = callPackage
@@ -178296,8 +165524,6 @@ self: {
        ];
        description = "A pretty-printer wrapper to faciliate ease of formatting during development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "on-a-horse" = callPackage
@@ -178316,8 +165542,6 @@ self: {
        ];
        description = "\"Haskell on a Horse\" - A combinatorial web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "on-demand-ssh-tunnel" = callPackage
@@ -178349,8 +165573,6 @@ self: {
        libraryHaskellDepends = [ base containers parsec tagsoup ];
        description = "HTML-parsing primitives for Parsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "once" = callPackage
@@ -178454,8 +165676,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A never-empty list type";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "online" = callPackage
@@ -178472,8 +165692,6 @@ self: {
        testHaskellDepends = [ base doctest tasty ];
        description = "online statistics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "only" = callPackage
@@ -178498,8 +165716,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "partition lenses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "onu-course" = callPackage
@@ -178511,8 +165727,6 @@ self: {
        libraryHaskellDepends = [ base smallcheck ];
        description = "Code for the Haskell course taught at the Odessa National University in 2012";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "oo-prototypes" = callPackage
@@ -178582,8 +165796,6 @@ self: {
        ];
        description = "Opaleye wrapped up in classy MTL attire";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "opaleye-sqlite" = callPackage
@@ -178608,8 +165820,6 @@ self: {
        ];
        description = "An SQL-generating DSL targeting SQLite";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "opaleye-trans" = callPackage
@@ -178631,8 +165841,6 @@ self: {
        ];
        description = "A monad transformer for Opaleye";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "open-adt" = callPackage
@@ -178694,8 +165902,6 @@ self: {
        executableHaskellDepends = [ base basic-prelude text turtle ];
        description = "Open haddock HTML documentation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "open-pandoc" = callPackage
@@ -178718,8 +165924,6 @@ self: {
        ];
        description = "Conversion between markup formats";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "open-signals" = callPackage
@@ -178732,8 +165936,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A mechanism similar to checked exceptions that integrates with MTL and transformer stacks";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "open-symbology" = callPackage
@@ -178761,8 +165963,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Open type representations and dynamic types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "open-union" = callPackage
@@ -178821,8 +166021,6 @@ self: {
        ];
        description = "Auto-generated openapi-petstore API Client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "opench-meteo" = callPackage
@@ -178914,8 +166112,6 @@ self: {
        libraryPkgconfigDepends = [ opencv ];
        description = "Raw Haskell bindings to OpenCV >= 2.0";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) opencv;};
 
   "opendatatable" = callPackage
@@ -178927,8 +166123,6 @@ self: {
        libraryHaskellDepends = [ base hxt template-haskell th-lift ];
        description = "A library for working with Open Data Tables";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "openexchangerates" = callPackage
@@ -179035,8 +166229,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Functional interface for OpenGL 4.1+ and OpenGL ES 2.0+";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {EGL = null; GLESv2 = null;};
 
   "openid" = callPackage
@@ -179162,8 +166354,6 @@ self: {
        ];
        description = "Haskell OpenSoundControl utilities";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "opensource" = callPackage
@@ -179205,8 +166395,6 @@ self: {
        ];
        description = "Fetch OpenSSH keys from a GitHub team";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "openssh-protocol" = callPackage
@@ -179223,8 +166411,6 @@ self: {
        testHaskellDepends = [ base cereal hedgehog time ];
        description = "Haskell implementation of openssh protocol primitives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "openssl-createkey" = callPackage
@@ -179298,8 +166484,6 @@ self: {
        ];
        testHaskellDepends = [ async base opentelemetry ];
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "opentheory" = callPackage
@@ -179366,8 +166550,6 @@ self: {
        ];
        description = "Unicode characters";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "opentheory-divides" = callPackage
@@ -179533,8 +166715,6 @@ self: {
        ];
        description = "An OpenTok SDK for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "opentype" = callPackage
@@ -179552,8 +166732,6 @@ self: {
        ];
        description = "Opentype loading and writing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "openweathermap" = callPackage
@@ -179574,8 +166752,6 @@ self: {
        ];
        description = "Access data at OpenWeatherMap";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "operate-do" = callPackage
@@ -179644,8 +166820,6 @@ self: {
        ];
        description = "Interpretation functions and simple instruction sets for operational";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "opml" = callPackage
@@ -179685,8 +166859,6 @@ self: {
        ];
        description = "Streaming parser/renderer for the OPML 2.0 format.";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "opn" = callPackage
@@ -179705,8 +166877,6 @@ self: {
        ];
        description = "Open files or URLs using associated programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "optics" = callPackage
@@ -179814,8 +166984,6 @@ self: {
        testHaskellDepends = [ attoparsec-data rerebase ];
        description = "Simple command line interface arguments parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "optima-for-hasql" = callPackage
@@ -179831,8 +166999,6 @@ self: {
        ];
        description = "Command-line arguments parsing for Hasql";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "optimal-blocks" = callPackage
@@ -179857,8 +167023,6 @@ self: {
        ];
        description = "Optimal Block boundary determination for rsync-like behaviours";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "optimization" = callPackage
@@ -179874,8 +167038,6 @@ self: {
        ];
        description = "Numerical optimization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "optimusprime" = callPackage
@@ -179894,8 +167056,6 @@ self: {
        ];
        description = "A supercompiler for f-lite";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "option" = callPackage
@@ -179921,8 +167081,6 @@ self: {
        ];
        description = "Using type-classes for optional function arguments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "optional-args" = callPackage
@@ -179964,29 +167122,9 @@ self: {
        testHaskellDepends = [ base chell options time ];
        description = "Command-line option types for dates and times";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "optparse-applicative" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, bytestring, process
-     , QuickCheck, transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "optparse-applicative";
-       version = "0.14.3.0";
-       sha256 = "0qvn1s7jwrabbpmqmh6d6iafln3v3h9ddmxj2y4m0njmzq166ivj";
-       revision = "2";
-       editedCabalFile = "1a08dqjly1xy730f6jf45frr8g8gap0n1vg9b0mpzpydv0kgzmrp";
-       libraryHaskellDepends = [
-         ansi-wl-pprint base process transformers transformers-compat
-       ];
-       testHaskellDepends = [ base bytestring QuickCheck ];
-       description = "Utilities and combinators for parsing command line options";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "optparse-applicative_0_15_1_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, process
      , QuickCheck, transformers, transformers-compat
      }:
@@ -180000,7 +167138,6 @@ self: {
        testHaskellDepends = [ base bytestring QuickCheck ];
        description = "Utilities and combinators for parsing command line options";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optparse-applicative-simple" = callPackage
@@ -180017,8 +167154,6 @@ self: {
        testHaskellDepends = [ attoparsec-data rerebase ];
        description = "Simple command line interface arguments parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "optparse-declarative" = callPackage
@@ -180130,8 +167265,6 @@ self: {
        ];
        description = "Orchestration-style co-ordination EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "orchestrate" = callPackage
@@ -180155,8 +167288,6 @@ self: {
        ];
        description = "An API client for http://orchestrate.io/.";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "orchid" = callPackage
@@ -180177,8 +167308,6 @@ self: {
        ];
        description = "Haskell Wiki Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "orchid-demo" = callPackage
@@ -180198,8 +167327,6 @@ self: {
        ];
        description = "Haskell Wiki Demo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ord-adhoc" = callPackage
@@ -180227,8 +167354,6 @@ self: {
        ];
        description = "Algorithms for the order maintenance problem with a safe interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "order-statistic-tree" = callPackage
@@ -180261,8 +167386,6 @@ self: {
        ];
        description = "L-Estimators for robust statistics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ordered" = callPackage
@@ -180308,8 +167431,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "basic orders";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ordrea" = callPackage
@@ -180324,8 +167445,6 @@ self: {
        testHaskellDepends = [ base directory process split ];
        description = "Push-pull implementation of discrete-time FRP";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "org2anki" = callPackage
@@ -180352,8 +167471,6 @@ self: {
        executableHaskellDepends = [ attoparsec base text ];
        description = "Organize scala imports";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "orgmode" = callPackage
@@ -180373,8 +167490,6 @@ self: {
        ];
        description = "Org Mode library for haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "orgmode-parse" = callPackage
@@ -180430,8 +167545,6 @@ self: {
        ];
        description = "Statistics visualizer for org-mode";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "origami" = callPackage
@@ -180450,8 +167563,6 @@ self: {
        ];
        description = "An un-SYB framework for transforming heterogenous data through folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "orion-hs" = callPackage
@@ -180492,8 +167603,6 @@ self: {
        testHaskellDepends = [ base hspec jwt mtl time ];
        description = "Token-based authentication and authorization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ormolu" = callPackage
@@ -180553,8 +167662,6 @@ self: {
        ];
        description = "A library to handle messages in the OSC protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "oscpacking" = callPackage
@@ -180566,8 +167673,6 @@ self: {
        libraryHaskellDepends = [ base colour gloss random ];
        description = "Implements an osculatory packing (kissing circles) algorithm and display";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "osdkeys" = callPackage
@@ -180622,8 +167727,6 @@ self: {
        ];
        description = "Parse and operate on OSM data in efficient way";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "osm-download" = callPackage
@@ -180645,8 +167748,6 @@ self: {
        ];
        description = "Download Open Street Map tiles";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "oso2pdf" = callPackage
@@ -180665,8 +167766,6 @@ self: {
        ];
        description = "Better conversion of Oxford Scholarship Online material to PDF";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "osx-ar" = callPackage
@@ -180699,8 +167798,6 @@ self: {
        ];
        description = "Real-time collaborative editing with Operational Transformation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "otp-authenticator" = callPackage
@@ -180726,8 +167823,6 @@ self: {
        ];
        description = "OTP Authenticator (a la google) command line client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ottparse-pretty" = callPackage
@@ -180819,8 +167914,6 @@ self: {
        doHaddock = false;
        description = "Overloaded pragmas as a plugin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "overloaded-records" = callPackage
@@ -180842,8 +167935,6 @@ self: {
        ];
        description = "Overloaded Records based on current GHC proposal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "overture" = callPackage
@@ -180857,8 +167948,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "An alternative to some of the Prelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pack" = callPackage
@@ -180874,8 +167963,6 @@ self: {
        ];
        description = "Bidirectional fast ByteString packer/unpacker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "package-description-remote" = callPackage
@@ -180890,8 +167977,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Fetches a 'GenericPackageDescription' from Hackage";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "package-o-tron" = callPackage
@@ -180910,8 +167995,6 @@ self: {
        ];
        description = "Utilities for working with cabal packages and your package database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "package-vt" = callPackage
@@ -180927,8 +168010,6 @@ self: {
        ];
        description = "Haskell Package Versioning Tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "packcheck" = callPackage
@@ -180964,8 +168045,6 @@ self: {
        ];
        description = "Check your cabal packages for lagging dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "packed" = callPackage
@@ -181009,8 +168088,6 @@ self: {
        ];
        description = "Generation and traversal of highly compressed directed acyclic word graphs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "packed-multikey-map" = callPackage
@@ -181029,8 +168106,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "Efficient “spreadsheet table” like maps with multiple marginals";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "packedstring" = callPackage
@@ -181044,8 +168119,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "(Deprecated) Packed Strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "packer" = callPackage
@@ -181080,8 +168153,6 @@ self: {
        ];
        description = "MessagePack Serialization an Deserialization for Packer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "packman" = callPackage
@@ -181101,8 +168172,6 @@ self: {
        ];
        description = "Serialization library for GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "packunused" = callPackage
@@ -181123,8 +168192,6 @@ self: {
        ];
        description = "Tool for detecting redundant Cabal package dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pacman-memcache" = callPackage
@@ -181138,8 +168205,6 @@ self: {
        executableHaskellDepends = [ base deepseq directory-tree ];
        description = "Read whole Pacman database which pushes it into the memory cache";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "padKONTROL" = callPackage
@@ -181155,8 +168220,6 @@ self: {
        ];
        description = "Controlling padKONTROL native mode";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pads-haskell" = callPackage
@@ -181184,8 +168247,6 @@ self: {
        ];
        description = "PADS data description language for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pagarme" = callPackage
@@ -181204,8 +168265,6 @@ self: {
        executableHaskellDepends = [ base text wreq ];
        description = "Pagarme API wrapper";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pager" = callPackage
@@ -181299,8 +168358,6 @@ self: {
        ];
        description = "Receive hooks from pagure and do things with them";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "paint" = callPackage
@@ -181316,41 +168373,6 @@ self: {
      }) {};
 
   "pairing" = callPackage
-    ({ mkDerivation, arithmoi, base, binary, bytestring, criterion
-     , errors, galois-field, hexstring, integer-logarithms, memory
-     , MonadRandom, protolude, QuickCheck, quickcheck-instances, random
-     , tasty, tasty-discover, tasty-hunit, tasty-quickcheck
-     , wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "pairing";
-       version = "0.4.1";
-       sha256 = "0phw8caxrxyr2wlk8gcmrr8k03d0vnc4rq5c88dh3bb9jz4fdpcw";
-       libraryHaskellDepends = [
-         arithmoi base binary bytestring errors galois-field
-         integer-logarithms memory MonadRandom protolude QuickCheck random
-         wl-pprint-text
-       ];
-       testHaskellDepends = [
-         arithmoi base binary bytestring errors galois-field hexstring
-         integer-logarithms memory MonadRandom protolude QuickCheck
-         quickcheck-instances random tasty tasty-discover tasty-hunit
-         tasty-quickcheck wl-pprint-text
-       ];
-       testToolDepends = [ tasty-discover ];
-       benchmarkHaskellDepends = [
-         arithmoi base binary bytestring criterion errors galois-field
-         integer-logarithms memory MonadRandom protolude QuickCheck
-         quickcheck-instances random tasty tasty-hunit tasty-quickcheck
-         wl-pprint-text
-       ];
-       description = "Bilinear pairings";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "pairing_1_0_0" = callPackage
     ({ mkDerivation, base, bytestring, criterion, elliptic-curve
      , errors, galois-field, groups, MonadRandom, protolude, QuickCheck
      , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck
@@ -181374,8 +168396,6 @@ self: {
        ];
        description = "Bilinear pairings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "palette" = callPackage
@@ -181418,8 +168438,6 @@ self: {
        description = "Haskell binding for C PAM API";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "i686-linux" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {pam = null;};
 
   "pan-os-syslog" = callPackage
@@ -181437,8 +168455,6 @@ self: {
        benchmarkHaskellDepends = [ base byteslice gauge primitive ];
        description = "Parse syslog traffic from PAN-OS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "panda" = callPackage
@@ -181459,63 +168475,9 @@ self: {
        ];
        description = "A simple static blog engine";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
-     , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
-     , case-insensitive, cmark-gfm, containers, criterion, data-default
-     , deepseq, Diff, directory, doctemplates, exceptions
-     , executable-path, filepath, Glob, haddock-library, hslua
-     , hslua-module-system, hslua-module-text, HsYAML, HTTP, http-client
-     , http-client-tls, http-types, ipynb, JuicyPixels, mtl, network
-     , network-uri, pandoc-types, parsec, process, QuickCheck, random
-     , safe, scientific, SHA, skylighting, split, syb, tagsoup, tasty
-     , tasty-golden, tasty-hunit, tasty-lua, tasty-quickcheck, temporary
-     , texmath, text, time, unicode-transforms, unix
-     , unordered-containers, vector, weigh, xml, zip-archive, zlib
-     }:
-     mkDerivation {
-       pname = "pandoc";
-       version = "2.7.3";
-       sha256 = "0dpjrr40h54cljzhvixyym07z792a9izg6b9dmqpjlgcg4rj0xx8";
-       configureFlags = [ "-fhttps" "-f-trypandoc" ];
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty attoparsec base base64-bytestring binary
-         blaze-html blaze-markup bytestring case-insensitive cmark-gfm
-         containers data-default deepseq directory doctemplates exceptions
-         filepath Glob haddock-library hslua hslua-module-system
-         hslua-module-text HsYAML HTTP http-client http-client-tls
-         http-types ipynb JuicyPixels mtl network network-uri pandoc-types
-         parsec process random safe scientific SHA skylighting split syb
-         tagsoup temporary texmath text time unicode-transforms unix
-         unordered-containers vector xml zip-archive zlib
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base base64-bytestring bytestring containers Diff directory
-         executable-path filepath Glob hslua pandoc-types process QuickCheck
-         tasty tasty-golden tasty-hunit tasty-lua tasty-quickcheck temporary
-         text time xml zip-archive
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring containers criterion mtl text time weigh
-       ];
-       postInstall = ''
-         mkdir -p $out/share/man/man1
-         mv "man/"*.1 $out/share/man/man1/
-       '';
-       description = "Conversion between markup formats";
-       license = stdenv.lib.licenses.gpl2;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {};
-
-  "pandoc_2_9_1_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , case-insensitive, cmark-gfm, containers, criterion, data-default
@@ -181566,6 +168528,60 @@ self: {
        '';
        description = "Conversion between markup formats";
        license = stdenv.lib.licenses.gpl2;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
+  "pandoc_2_9_2" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
+     , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
+     , case-insensitive, cmark-gfm, containers, criterion, data-default
+     , deepseq, Diff, directory, doclayout, doctemplates, emojis
+     , exceptions, executable-path, filepath, Glob, haddock-library
+     , hslua, hslua-module-system, hslua-module-text, HsYAML, HTTP
+     , http-client, http-client-tls, http-types, ipynb, jira-wiki-markup
+     , JuicyPixels, mtl, network, network-uri, pandoc-types, parsec
+     , process, QuickCheck, random, safe, scientific, SHA, skylighting
+     , skylighting-core, split, syb, tagsoup, tasty, tasty-golden
+     , tasty-hunit, tasty-lua, tasty-quickcheck, temporary, texmath
+     , text, text-conversions, time, unicode-transforms, unix
+     , unordered-containers, vector, weigh, xml, zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "pandoc";
+       version = "2.9.2";
+       sha256 = "1f9wbwzv6c3dlsn15iydh921icjqj7kjgrb726kqmj5gmaypc39j";
+       configureFlags = [ "-fhttps" "-f-trypandoc" ];
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty attoparsec base base64-bytestring binary
+         blaze-html blaze-markup bytestring case-insensitive cmark-gfm
+         containers data-default deepseq directory doclayout doctemplates
+         emojis exceptions filepath Glob haddock-library hslua
+         hslua-module-system hslua-module-text HsYAML HTTP http-client
+         http-client-tls http-types ipynb jira-wiki-markup JuicyPixels mtl
+         network network-uri pandoc-types parsec process random safe
+         scientific SHA skylighting skylighting-core split syb tagsoup
+         temporary texmath text text-conversions time unicode-transforms
+         unix unordered-containers vector xml zip-archive zlib
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base base64-bytestring bytestring containers Diff directory
+         doctemplates executable-path filepath Glob hslua mtl pandoc-types
+         process QuickCheck tasty tasty-golden tasty-hunit tasty-lua
+         tasty-quickcheck temporary text time xml zip-archive
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring containers criterion mtl text time weigh
+       ];
+       postInstall = ''
+         mkdir -p $out/share/man/man1
+         mv "man/"*.1 $out/share/man/man1/
+       '';
+       description = "Conversion between markup formats";
+       license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
@@ -181573,25 +168589,24 @@ self: {
   "pandoc-citeproc" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , Cabal, containers, data-default, directory, filepath, hs-bibutils
-     , libyaml, mtl, network, old-locale, pandoc, pandoc-types, parsec
-     , process, rfc5051, safe, setenv, split, syb, tagsoup, temporary
-     , text, time, unordered-containers, vector, xml-conduit, yaml
+     , HsYAML, HsYAML-aeson, libyaml, mtl, network, old-locale, pandoc
+     , pandoc-types, parsec, process, rfc5051, safe, setenv, split, syb
+     , tagsoup, temporary, text, time, unordered-containers, vector
+     , xml-conduit, yaml
      }:
      mkDerivation {
        pname = "pandoc-citeproc";
-       version = "0.16.2";
-       sha256 = "15mm17awgi1b5yazwhr5nh8b59qml1qk6pz6gpyijks70fq2arsv";
-       revision = "2";
-       editedCabalFile = "0z7ia0f89lamrvnr75j7r6jhklkly0qcyplws9ww9rpbj9j7shyk";
+       version = "0.16.4.1";
+       sha256 = "1jbd6g82sn3546kimm0p6n7spfqr3b4dssjkr5v679jwb5w6hwmx";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          aeson base bytestring containers data-default directory filepath
-         hs-bibutils mtl network old-locale pandoc pandoc-types parsec
-         rfc5051 setenv split syb tagsoup text time unordered-containers
-         vector xml-conduit yaml
+         hs-bibutils HsYAML HsYAML-aeson mtl network old-locale pandoc
+         pandoc-types parsec rfc5051 setenv split syb tagsoup text time
+         unordered-containers vector xml-conduit yaml
        ];
        executableHaskellDepends = [
          aeson aeson-pretty attoparsec base bytestring filepath libyaml
@@ -181606,7 +168621,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pandoc-citeproc_0_16_4_1" = callPackage
+  "pandoc-citeproc_0_17" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , Cabal, containers, data-default, directory, filepath, hs-bibutils
      , HsYAML, HsYAML-aeson, libyaml, mtl, network, old-locale, pandoc
@@ -181616,8 +168631,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-citeproc";
-       version = "0.16.4.1";
-       sha256 = "1jbd6g82sn3546kimm0p6n7spfqr3b4dssjkr5v679jwb5w6hwmx";
+       version = "0.17";
+       sha256 = "1cgmv8zdiqcbls7c6rqdd154z5r90p9wxrdy6nwmxma8qfmfgaa7";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -181657,8 +168672,6 @@ self: {
        ];
        description = "Insert a preamble before pandoc-citeproc's bibliography";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc-crossref" = callPackage
@@ -181695,8 +168708,6 @@ self: {
        ];
        description = "Pandoc filter for cross-references";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc-csv2table" = callPackage
@@ -181792,8 +168803,6 @@ self: {
        doHaddock = false;
        description = "Include other Markdown files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc-include-code" = callPackage
@@ -181818,8 +168827,6 @@ self: {
        ];
        description = "A Pandoc filter for including code from source files";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc-japanese-filters" = callPackage
@@ -181839,8 +168846,6 @@ self: {
        ];
        description = "Japanese-specific markup filters for pandoc";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc-lens" = callPackage
@@ -181852,8 +168857,6 @@ self: {
        libraryHaskellDepends = [ base containers lens pandoc-types ];
        description = "Lenses for Pandoc documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc-markdown-ghci-filter" = callPackage
@@ -181879,8 +168882,6 @@ self: {
        ];
        description = "Pandoc-filter to evaluate `code` section in markdown and auto-embed output";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc-placetable" = callPackage
@@ -181925,8 +168926,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Render and insert PlantUML diagrams with Pandoc";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc-plot" = callPackage
@@ -181961,38 +168960,6 @@ self: {
      }) {};
 
   "pandoc-pyplot" = callPackage
-    ({ mkDerivation, base, containers, data-default-class, deepseq
-     , directory, filepath, hashable, hspec, hspec-expectations
-     , open-browser, optparse-applicative, pandoc, pandoc-types, tasty
-     , tasty-hspec, tasty-hunit, template-haskell, temporary, text
-     , typed-process, yaml
-     }:
-     mkDerivation {
-       pname = "pandoc-pyplot";
-       version = "2.1.5.1";
-       sha256 = "100mn7q5nz7xvhbnhjsfmcf9n6x1gjl71akrnc5j8k2j57bk1kkf";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers data-default-class directory filepath hashable
-         pandoc pandoc-types temporary text typed-process yaml
-       ];
-       executableHaskellDepends = [
-         base data-default-class deepseq directory filepath open-browser
-         optparse-applicative pandoc pandoc-types template-haskell temporary
-         text
-       ];
-       testHaskellDepends = [
-         base data-default-class directory filepath hspec hspec-expectations
-         pandoc-types tasty tasty-hspec tasty-hunit temporary text
-       ];
-       description = "A Pandoc filter to include figures generated from Python code blocks";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "pandoc-pyplot_2_3_0_1" = callPackage
     ({ mkDerivation, base, containers, data-default-class, deepseq
      , directory, filepath, hashable, hspec, hspec-expectations, mtl
      , open-browser, optparse-applicative, pandoc, pandoc-types
@@ -182020,8 +168987,6 @@ self: {
        ];
        description = "A Pandoc filter to include figures generated from Python code blocks";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc-sidenote" = callPackage
@@ -182056,29 +169021,6 @@ self: {
      }) {};
 
   "pandoc-types" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, criterion
-     , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , transformers
-     }:
-     mkDerivation {
-       pname = "pandoc-types";
-       version = "1.17.6.1";
-       sha256 = "1d6ygq991ddria71l7hg9yd7lq94sjy4m71rdws1v8hq943c4d0q";
-       libraryHaskellDepends = [
-         aeson base bytestring containers deepseq ghc-prim QuickCheck syb
-         transformers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers HUnit QuickCheck string-qq syb
-         test-framework test-framework-hunit test-framework-quickcheck2
-       ];
-       benchmarkHaskellDepends = [ base criterion ];
-       description = "Types for representing a structured document";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pandoc-types_1_20" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -182099,7 +169041,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Types for representing a structured document";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-unlit" = callPackage
@@ -182113,8 +169054,6 @@ self: {
        executableHaskellDepends = [ base pandoc ];
        description = "Literate Haskell support for GitHub's Markdown flavor";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pandoc-vimhl" = callPackage
@@ -182162,8 +169101,6 @@ self: {
        ];
        description = "A super-pang clone";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pango" = callPackage
@@ -182200,8 +169137,6 @@ self: {
        testHaskellDepends = [ base bytestring containers HUnit ];
        description = "A set of parsers for graph languages and conversions to graph libaries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "panhandle" = callPackage
@@ -182257,8 +169192,6 @@ self: {
        ];
        description = "Pandoc filter to execute code blocks";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pansite" = callPackage
@@ -182290,58 +169223,6 @@ self: {
      }) {};
 
   "pantry" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans
-     , base64-bytestring, bytestring, Cabal, conduit, conduit-extra
-     , containers, contravariant, cryptonite, cryptonite-conduit
-     , deepseq, digest, directory, exceptions, filelock, filepath
-     , generic-deriving, ghc-prim, hackage-security, hashable, hedgehog
-     , hpack, hspec, http-client, http-client-tls, http-conduit
-     , http-download, http-types, integer-gmp, memory, mono-traversable
-     , mtl, network, network-uri, path, path-io, persistent
-     , persistent-sqlite, persistent-template, primitive, QuickCheck
-     , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint
-     , safe, syb, tar-conduit, template-haskell, text, text-metrics
-     , th-lift, th-lift-instances, th-orphans, th-reify-many
-     , th-utilities, time, transformers, unix-compat, unliftio
-     , unordered-containers, vector, yaml, zip-archive
-     }:
-     mkDerivation {
-       pname = "pantry";
-       version = "0.1.1.2";
-       sha256 = "1m1sps9kc7y8zpba486lv5z8an3z8493zxb1qhghql6pybsprsgi";
-       libraryHaskellDepends = [
-         aeson ansi-terminal array base base-orphans base64-bytestring
-         bytestring Cabal conduit conduit-extra containers contravariant
-         cryptonite cryptonite-conduit deepseq digest directory filelock
-         filepath generic-deriving ghc-prim hackage-security hashable hpack
-         http-client http-client-tls http-conduit http-download http-types
-         integer-gmp memory mono-traversable mtl network network-uri path
-         path-io persistent persistent-sqlite persistent-template primitive
-         resourcet rio rio-orphans rio-prettyprint safe syb tar-conduit
-         template-haskell text text-metrics th-lift th-lift-instances
-         th-orphans th-reify-many th-utilities time transformers unix-compat
-         unliftio unordered-containers vector yaml zip-archive
-       ];
-       testHaskellDepends = [
-         aeson ansi-terminal array base base-orphans base64-bytestring
-         bytestring Cabal conduit conduit-extra containers contravariant
-         cryptonite cryptonite-conduit deepseq digest directory exceptions
-         filelock filepath generic-deriving ghc-prim hackage-security
-         hashable hedgehog hpack hspec http-client http-client-tls
-         http-conduit http-download http-types integer-gmp memory
-         mono-traversable mtl network network-uri path path-io persistent
-         persistent-sqlite persistent-template primitive QuickCheck
-         raw-strings-qq resourcet rio rio-orphans rio-prettyprint safe syb
-         tar-conduit template-haskell text text-metrics th-lift
-         th-lift-instances th-orphans th-reify-many th-utilities time
-         transformers unix-compat unliftio unordered-containers vector yaml
-         zip-archive
-       ];
-       description = "Content addressable Haskell package management";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pantry_0_2_0_0" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans
      , base64-bytestring, bytestring, Cabal, conduit, conduit-extra
      , containers, contravariant, cryptonite, cryptonite-conduit
@@ -182391,7 +169272,6 @@ self: {
        ];
        description = "Content addressable Haskell package management";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pantry-tmp" = callPackage
@@ -182446,8 +169326,6 @@ self: {
        ];
        description = "Content addressable Haskell package management";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "papa" = callPackage
@@ -182565,8 +169443,6 @@ self: {
        ];
        description = "Reasonable default import";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "papa-implement" = callPackage
@@ -182588,8 +169464,6 @@ self: {
        ];
        description = "Reasonable default import";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "papa-include" = callPackage
@@ -182606,8 +169480,6 @@ self: {
        ];
        description = "Third party libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "papa-lens" = callPackage
@@ -182659,8 +169531,6 @@ self: {
        ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "papa-prelude-core" = callPackage
@@ -182677,8 +169547,6 @@ self: {
        ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "papa-prelude-lens" = callPackage
@@ -182695,8 +169563,6 @@ self: {
        ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "papa-prelude-semigroupoids" = callPackage
@@ -182713,8 +169579,6 @@ self: {
        ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "papa-prelude-semigroups" = callPackage
@@ -182731,8 +169595,6 @@ self: {
        ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "papa-semigroupoids" = callPackage
@@ -182816,8 +169678,6 @@ self: {
        executableHaskellDepends = [ base bytestring containers ];
        description = "A passphrase generator";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "papillon" = callPackage
@@ -182838,8 +169698,6 @@ self: {
        ];
        description = "packrat parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pappy" = callPackage
@@ -182853,8 +169711,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Packrat parsing; linear-time parsers for grammars in TDPL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "paprika" = callPackage
@@ -182877,8 +169733,6 @@ self: {
        ];
        description = "The Haskell library and examples for the kids programming robot paprika";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "par-traverse" = callPackage
@@ -182928,8 +169782,6 @@ self: {
        executableToolDepends = [ alex ];
        description = "Paragon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parallel_3_2_0_3" = callPackage
@@ -182987,8 +169839,6 @@ self: {
          transformers vector vector-algorithms
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parallel-tree-search" = callPackage
@@ -183012,8 +169862,6 @@ self: {
        testHaskellDepends = [ base data-diverse hspec transformers ];
        description = "Parameterized/indexed monoids and monads using only a single parameter type variable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parameterized-data" = callPackage
@@ -183028,18 +169876,18 @@ self: {
      }) {};
 
   "parameterized-utils" = callPackage
-    ({ mkDerivation, base, constraints, containers, deepseq, ghc-prim
-     , hashable, hashtables, hedgehog, lens, mtl, tasty, tasty-ant-xml
-     , tasty-hedgehog, tasty-hunit, template-haskell, text
-     , th-abstraction, vector
+    ({ mkDerivation, base, base-orphans, constraints, containers
+     , deepseq, ghc-prim, hashable, hashtables, hedgehog, lens, mtl
+     , tasty, tasty-ant-xml, tasty-hedgehog, tasty-hunit
+     , template-haskell, text, th-abstraction, vector
      }:
      mkDerivation {
        pname = "parameterized-utils";
-       version = "2.0.1.0";
-       sha256 = "1r7bxlb82np6xg7wkqhvja7zkp0l6adwwg0b0h3ji2mcmi47xd2z";
+       version = "2.0.2";
+       sha256 = "0xmml1jzxv7921dc5n3ppw8yf5vn58c19c95kcy8zaqn86vmj1iz";
        libraryHaskellDepends = [
-         base constraints containers deepseq ghc-prim hashable hashtables
-         lens mtl template-haskell text th-abstraction vector
+         base base-orphans constraints containers deepseq ghc-prim hashable
+         hashtables lens mtl template-haskell text th-abstraction vector
        ];
        testHaskellDepends = [
          base ghc-prim hashable hashtables hedgehog lens mtl tasty
@@ -183047,8 +169895,6 @@ self: {
        ];
        description = "Classes and data structures for working with data-kind indexed types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "paramtree" = callPackage
@@ -183092,8 +169938,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "http proxy server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parco" = callPackage
@@ -183105,8 +169949,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Generalised parser combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parco-attoparsec" = callPackage
@@ -183118,8 +169960,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base mtl parco ];
        description = "Generalised parser combinators - Attoparsec interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parco-parsec" = callPackage
@@ -183131,8 +169971,6 @@ self: {
        libraryHaskellDepends = [ base mtl parco parsec ];
        description = "Generalised parser combinators - Parsec interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parcom-lib" = callPackage
@@ -183176,8 +170014,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Examples to accompany the book \"Parallel and Concurrent Programming in Haskell\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pareto" = callPackage
@@ -183189,8 +170025,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A library for cause-effect relationships";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "paripari" = callPackage
@@ -183250,8 +170084,6 @@ self: {
        ];
        description = "Streaming Parquet reader";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parse-dimacs" = callPackage
@@ -183280,8 +170112,6 @@ self: {
        testHaskellDepends = [ cmdargs ];
        description = "generate command line arguments from a --help output";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parseargs" = callPackage
@@ -183297,8 +170127,6 @@ self: {
        testHaskellDepends = [ base process ];
        description = "Parse command-line arguments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parsec_3_1_14_0" = callPackage
@@ -183353,8 +170181,6 @@ self: {
        ];
        description = "Parsec API encoded as a deeply-embedded DSL, for debugging and analysis";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parsec-numbers" = callPackage
@@ -183398,8 +170224,6 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Parsing instances for Parsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parsec-permutation" = callPackage
@@ -183426,8 +170250,6 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec pretty ];
        description = "Pratt Parser combinator for Parsec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parsec-tagsoup" = callPackage
@@ -183469,6 +170291,8 @@ self: {
        pname = "parsec1";
        version = "1.0.0.6";
        sha256 = "0wwmghla8cqmmpwx9wwcmh39d9np9cgc1d0w3xf18k4adb1sg636";
+       revision = "1";
+       editedCabalFile = "0wnyg8blygix98w8gwqrm8z8r774zr9y2qvhkfb336zgdvdlif9x";
        libraryHaskellDepends = [ base ];
        description = "Portable monadic parser combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -183528,8 +170352,6 @@ self: {
        testHaskellDepends = [ base hspec parsec ];
        description = "Adds and Eq instance for Parsec's ParseError if needed";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parsek" = callPackage
@@ -183551,22 +170373,9 @@ self: {
        sha256 = "16sg32qs1kq184wk6d83z20b9firh1kjmysqwd2aqaiyq37zjyyb";
        libraryHaskellDepends = [ base mtl parsec ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parser-combinators" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "parser-combinators";
-       version = "1.1.0";
-       sha256 = "149yhbnrrl108h1jinrsxni3rwrldhphpk9bbmbpr90q5fbl4xmc";
-       libraryHaskellDepends = [ base ];
-       description = "Lightweight package providing commonly useful parser combinators";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "parser-combinators_1_2_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "parser-combinators";
@@ -183575,34 +170384,9 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Lightweight package providing commonly useful parser combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parser-combinators-tests" = callPackage
-    ({ mkDerivation, base, hspec, hspec-discover, hspec-expectations
-     , hspec-megaparsec, megaparsec, megaparsec-tests
-     , parser-combinators, QuickCheck
-     }:
-     mkDerivation {
-       pname = "parser-combinators-tests";
-       version = "1.1.0";
-       sha256 = "0m3xgdi1q3q638zfvgpdqyrhfq9abqwjripvbdx5z9rai4whzqmz";
-       revision = "1";
-       editedCabalFile = "0adgbzpylvk9p7ylxynsdrmqhhbh5pm8ww1s3nz3czl79y8lhh47";
-       isLibrary = false;
-       isExecutable = false;
-       testHaskellDepends = [
-         base hspec hspec-expectations hspec-megaparsec megaparsec
-         megaparsec-tests parser-combinators QuickCheck
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Test suite of parser-combinators";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "parser-combinators-tests_1_2_1" = callPackage
     ({ mkDerivation, base, hspec, hspec-discover, hspec-expectations
      , hspec-megaparsec, megaparsec, megaparsec-tests
      , parser-combinators, QuickCheck
@@ -183620,8 +170404,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Test suite of parser-combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parser-helper" = callPackage
@@ -183637,8 +170419,6 @@ self: {
        ];
        description = "Prints Haskell parse trees in JSON";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parser241" = callPackage
@@ -183653,8 +170433,6 @@ self: {
        testHaskellDepends = [ base containers hspec mtl ];
        description = "An interface to create production rules using augmented grammars";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parsergen" = callPackage
@@ -183676,8 +170454,6 @@ self: {
        ];
        description = "TH parser generator for splitting bytestring into fixed-width fields";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parsers" = callPackage
@@ -183737,8 +170513,6 @@ self: {
        ];
        description = "NMR-STAR file format parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "parsimony" = callPackage
@@ -183788,8 +170562,6 @@ self: {
        testHaskellDepends = [ base containers HUnit tasty tasty-hunit ];
        description = "Parsing factorized";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "partial" = callPackage
@@ -183838,8 +170610,6 @@ self: {
        ];
        description = "Haskell 98 Partial Lenses";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "partial-order" = callPackage
@@ -183857,8 +170627,6 @@ self: {
        ];
        description = "Provides typeclass suitable for types admitting a partial order";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "partial-records" = callPackage
@@ -183939,8 +170707,6 @@ self: {
        ];
        description = "Inspect, create, and alter MBRs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "passage" = callPackage
@@ -183959,8 +170725,6 @@ self: {
        ];
        description = "Parallel code generation for hierarchical Bayesian modeling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "passman" = callPackage
@@ -184036,22 +170800,6 @@ self: {
      }) {};
 
   "password" = callPackage
-    ({ mkDerivation, base, bytestring, doctest, QuickCheck
-     , quickcheck-instances, scrypt, text
-     }:
-     mkDerivation {
-       pname = "password";
-       version = "0.1.0.1";
-       sha256 = "0n96n9kiiij6pf587y21v39c2zh9r4n4yd6n2k8km770k3bg1skr";
-       libraryHaskellDepends = [ base scrypt text ];
-       testHaskellDepends = [
-         base bytestring doctest QuickCheck quickcheck-instances
-       ];
-       description = "plain-text password and hashed password datatypes and functions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "password_1_0_0_0" = callPackage
     ({ mkDerivation, base, bytestring, doctest, QuickCheck
      , quickcheck-instances, scrypt, tasty, tasty-quickcheck, text
      }:
@@ -184066,28 +170814,9 @@ self: {
        ];
        description = "plain-text password and hashed password datatypes and functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "password-instances" = callPackage
-    ({ mkDerivation, aeson, base, doctest, http-api-data, password
-     , persistent, QuickCheck, quickcheck-instances
-     }:
-     mkDerivation {
-       pname = "password-instances";
-       version = "0.3.0.1";
-       sha256 = "03x9ky018r1ihl4ajc1fcw78g8h1vk3dzr4gjqck78jsb8kj7l93";
-       libraryHaskellDepends = [
-         aeson base http-api-data password persistent
-       ];
-       testHaskellDepends = [
-         base doctest QuickCheck quickcheck-instances
-       ];
-       description = "typeclass instances for password package";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "password-instances_1_0_0_0" = callPackage
     ({ mkDerivation, aeson, base, doctest, http-api-data, password
      , persistent, QuickCheck, quickcheck-instances
      }:
@@ -184103,7 +170832,6 @@ self: {
        ];
        description = "typeclass instances for password package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "passwords" = callPackage
@@ -184115,8 +170843,6 @@ self: {
        libraryHaskellDepends = [ base containers MonadRandom random ];
        description = "Password generation/validation library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pasta" = callPackage
@@ -184133,8 +170859,6 @@ self: {
        testHaskellDepends = [ base hspec microlens protolude ];
        description = "PostgreSQL Abstract Syntax Tree Assember";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pastis" = callPackage
@@ -184146,8 +170870,6 @@ self: {
        libraryHaskellDepends = [ base HTTP network ];
        description = "Interface to the past.is URL shortening service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pasty" = callPackage
@@ -184161,8 +170883,6 @@ self: {
        executableHaskellDepends = [ base bytestring mtl ];
        description = "A simple command line pasting utility";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "patat" = callPackage
@@ -184191,8 +170911,6 @@ self: {
        ];
        description = "Terminal-based presentations using Pandoc";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "patch" = callPackage
@@ -184273,33 +170991,9 @@ self: {
        ];
        description = "Patches (diffs) on vectors: composable, mergeable, and invertible";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "path" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions
-     , filepath, genvalidity, genvalidity-property, hashable, hspec, mtl
-     , QuickCheck, template-haskell, validity
-     }:
-     mkDerivation {
-       pname = "path";
-       version = "0.6.1";
-       sha256 = "0nayla4k1gb821k8y5b9miflv1bi8f0czf9rqr044nrr2dddi2sb";
-       revision = "2";
-       editedCabalFile = "05pgmg0w1mfwcmx9ad4p09xqxld8njhgwmgq38v7pr58czvmd6ks";
-       libraryHaskellDepends = [
-         aeson base deepseq exceptions filepath hashable template-haskell
-       ];
-       testHaskellDepends = [
-         aeson base bytestring filepath genvalidity genvalidity-property
-         hspec mtl QuickCheck validity
-       ];
-       description = "Support for well-typed paths";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "path_0_7_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions
      , filepath, genvalidity, genvalidity-hspec, genvalidity-property
      , hashable, hspec, mtl, QuickCheck, template-haskell, text
@@ -184321,7 +171015,6 @@ self: {
        ];
        description = "Support for well-typed paths";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "path-extra" = callPackage
@@ -184342,27 +171035,6 @@ self: {
      }) {};
 
   "path-io" = callPackage
-    ({ mkDerivation, base, containers, directory, dlist, exceptions
-     , filepath, hspec, path, temporary, time, transformers, unix-compat
-     }:
-     mkDerivation {
-       pname = "path-io";
-       version = "1.4.2";
-       sha256 = "0jqx3mi4an4kb3kg78n1p3xrz832yrfrnvj795b0xhkv6h1z5ir3";
-       revision = "1";
-       editedCabalFile = "02irjcw5rdcx9wvsb7mcanylp2bwaiacpfjjbcvqq1lhvqcyw73i";
-       libraryHaskellDepends = [
-         base containers directory dlist exceptions filepath path temporary
-         time transformers unix-compat
-       ];
-       testHaskellDepends = [
-         base directory exceptions hspec path transformers unix-compat
-       ];
-       description = "Interface to ‘directory’ package for users of ‘path’";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "path-io_1_6_0" = callPackage
     ({ mkDerivation, base, containers, directory, dlist, exceptions
      , filepath, hspec, path, temporary, time, transformers, unix-compat
      }:
@@ -184382,7 +171054,6 @@ self: {
        ];
        description = "Interface to ‘directory’ package for users of ‘path’";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "path-pieces" = callPackage
@@ -184440,8 +171111,6 @@ self: {
        ];
        description = "A toy pathfinding library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pathological-bytestrings" = callPackage
@@ -184540,8 +171209,6 @@ self: {
        executableHaskellDepends = [ base HandsomeSoup hxt ];
        description = "A webpage scraper for Patreon which dumps a list of patrons to a text file";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pattern-arrows" = callPackage
@@ -184607,8 +171274,6 @@ self: {
        ];
        description = "Common patterns in message-oriented applications";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "paymill" = callPackage
@@ -184645,8 +171310,6 @@ self: {
        ];
        description = "Client for a limited part of PayPal's Adaptive Payments API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "paypal-api" = callPackage
@@ -184663,8 +171326,6 @@ self: {
        ];
        description = "PayPal API, currently supporting \"ButtonManager\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "paypal-rest-client" = callPackage
@@ -184681,8 +171342,6 @@ self: {
        ];
        description = "A client to connect to PayPal's REST API (v1)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pb" = callPackage
@@ -184698,8 +171357,6 @@ self: {
        ];
        description = "pastebin command line application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pb-next" = callPackage
@@ -184719,8 +171376,6 @@ self: {
        testHaskellDepends = [ base parsec tasty tasty-hunit ];
        description = "Utility CLI for working with protobuf files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pbc4hs" = callPackage
@@ -184732,8 +171387,6 @@ self: {
        libraryHaskellDepends = [ base hslua string-qq ];
        description = "pbc for HsLua";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pbkdf" = callPackage
@@ -184790,8 +171443,6 @@ self: {
        ];
        description = "Convert a pcap into an enumerator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pcd-loader" = callPackage
@@ -184816,8 +171467,6 @@ self: {
        ];
        description = "PCD file loader";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pcf" = callPackage
@@ -184835,8 +171484,6 @@ self: {
        ];
        description = "A one file compiler for PCF";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pcf-font" = callPackage
@@ -184952,8 +171599,6 @@ self: {
        libraryHaskellDepends = [ base bytestring pcre-light ];
        description = "pcre-light extra functionality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pcre-utils" = callPackage
@@ -184995,8 +171640,6 @@ self: {
        ];
        description = "Tool to generate PDF from haskintex templates and YAML input";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pdf-slave-server" = callPackage
@@ -185047,8 +171690,6 @@ self: {
        ];
        description = "Template format definition for pdf-slave tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pdf-toolbox-content" = callPackage
@@ -185065,8 +171706,6 @@ self: {
        ];
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pdf-toolbox-core" = callPackage
@@ -185083,8 +171722,6 @@ self: {
        ];
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pdf-toolbox-document" = callPackage
@@ -185103,8 +171740,6 @@ self: {
        ];
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pdf-toolbox-viewer" = callPackage
@@ -185125,8 +171760,6 @@ self: {
        ];
        description = "Simple pdf viewer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pdf2line" = callPackage
@@ -185176,8 +171809,6 @@ self: {
        ];
        description = "Name a PDF file using information from the pdfinfo command";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pdfsplit" = callPackage
@@ -185193,8 +171824,6 @@ self: {
        ];
        description = "split two-column PDFs, so there is one column per page";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pdynload" = callPackage
@@ -185211,8 +171840,6 @@ self: {
        ];
        description = "pdynload is polymorphic dynamic linking library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "peakachu" = callPackage
@@ -185228,8 +171855,6 @@ self: {
        ];
        description = "Experiemental library for composable interactive programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "peano" = callPackage
@@ -185238,8 +171863,8 @@ self: {
        pname = "peano";
        version = "0.1.0.1";
        sha256 = "0yzcxrl41dacvx2wkyxjj7hgvz56l4qb59r4h9rmaqd7jcwx5z9i";
-       revision = "2";
-       editedCabalFile = "10b0vjc7lnfkscg2c8hhqbvf1xdvgbr3njrs9b4ick91n44vjbhk";
+       revision = "3";
+       editedCabalFile = "0wl22dnz6ld300cg6id3lw991bp8kdfi8h0nbv37vn79i1zdcj5n";
        libraryHaskellDepends = [ base ];
        description = "Peano numbers";
        license = "unknown";
@@ -185279,8 +171904,6 @@ self: {
        ];
        description = "pec embedded compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pecoff" = callPackage
@@ -185326,8 +171949,6 @@ self: {
        libraryHaskellDepends = [ array base binary containers ];
        description = "A pedestrian implementation of directed acyclic graphs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "peg" = callPackage
@@ -185345,8 +171966,6 @@ self: {
        ];
        description = "a lazy non-deterministic concatenative programming language";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "peggy" = callPackage
@@ -185365,8 +171984,6 @@ self: {
        ];
        description = "The Parser Generator for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pell" = callPackage
@@ -185384,8 +172001,6 @@ self: {
        ];
        description = "Package to solve the Generalized Pell Equation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pem" = callPackage
@@ -185466,8 +172081,6 @@ self: {
        ];
        description = "Extensible double-entry accounting system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "penny-bin" = callPackage
@@ -185486,8 +172099,6 @@ self: {
        ];
        description = "Deprecated - use penny package instead";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "penny-lib" = callPackage
@@ -185509,8 +172120,6 @@ self: {
        ];
        description = "Deprecated - use penny package instead";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "penrose" = callPackage
@@ -185546,8 +172155,6 @@ self: {
        ];
        description = "Create beautiful diagrams just by typing mathematical notation in plain text";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "peparser" = callPackage
@@ -185559,8 +172166,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring haskell98 ];
        description = "A parser for PE object files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "percent-format" = callPackage
@@ -185584,8 +172189,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "The perceptron learning algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "perceptual-hash" = callPackage
@@ -185657,8 +172260,6 @@ self: {
        ];
        description = "Database migration support for use in other libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "perf" = callPackage
@@ -185675,8 +172276,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Low-level run time measurement";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "perf-analysis" = callPackage
@@ -185699,8 +172298,6 @@ self: {
        ];
        description = "analysis example using perf";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "perfect-hash-generator" = callPackage
@@ -185756,8 +172353,6 @@ self: {
        ];
        description = "Library for performing vector shuffles";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "perfecthash" = callPackage
@@ -185781,8 +172376,6 @@ self: {
        ];
        description = "A perfect hashing library for mapping bytestrings to values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "perhaps" = callPackage
@@ -185836,8 +172429,6 @@ self: {
        testHaskellDepends = [ base cereal hedis hspec text time ];
        description = "A reliable at-least-once periodic job scheduler backed by redis";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "perm" = callPackage
@@ -185854,8 +172445,6 @@ self: {
        ];
        description = "permutation Applicative and Monad with many mtl instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "permutation" = callPackage
@@ -185891,8 +172480,6 @@ self: {
        ];
        description = "Permutations of finite sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "permute" = callPackage
@@ -185904,8 +172491,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Generalised permutation parser combinator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persist" = callPackage
@@ -185938,8 +172523,6 @@ self: {
        ];
        description = "Transforms persist's quasi-quoted syntax into ER format";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistable-record" = callPackage
@@ -186017,39 +172600,6 @@ self: {
      }) {};
 
   "persistent" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
-     , blaze-html, blaze-markup, bytestring, conduit, containers
-     , fast-logger, hspec, http-api-data, monad-control, monad-logger
-     , mtl, old-locale, path-pieces, resource-pool, resourcet
-     , scientific, silently, tagged, template-haskell, text, time
-     , transformers, unliftio-core, unordered-containers, vector, void
-     }:
-     mkDerivation {
-       pname = "persistent";
-       version = "2.9.2";
-       sha256 = "1wsa3kn427v88a6r0vwr6mz23snik2krbsgc8zqp18xajqn5szj9";
-       revision = "1";
-       editedCabalFile = "1v6ll8aggz6gvz53mzfrnb4jsc25dspk39x3vcxpzqkdp8rgz1am";
-       libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring blaze-html blaze-markup
-         bytestring conduit containers fast-logger http-api-data
-         monad-logger mtl old-locale path-pieces resource-pool resourcet
-         scientific silently tagged template-haskell text time transformers
-         unliftio-core unordered-containers vector void
-       ];
-       testHaskellDepends = [
-         aeson attoparsec base base64-bytestring blaze-html bytestring
-         conduit containers fast-logger hspec http-api-data monad-control
-         monad-logger mtl old-locale path-pieces resource-pool resourcet
-         scientific tagged template-haskell text time transformers
-         unordered-containers vector
-       ];
-       description = "Type-safe, multi-backend data serialization";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {};
-
-  "persistent_2_10_5_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , blaze-html, bytestring, conduit, containers, fast-logger, hspec
      , http-api-data, monad-logger, mtl, path-pieces, resource-pool
@@ -186059,8 +172609,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent";
-       version = "2.10.5.1";
-       sha256 = "0q95ik7agbld7dhzbr79nqh0v5vg8hk9sl61306y7kknyyy4inbw";
+       version = "2.10.5.2";
+       sha256 = "1jlkgqr11bprfajadr9z7n0j1w741n8ns6w4fmm3x7prislgnqh1";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-html bytestring
          conduit containers fast-logger http-api-data monad-logger mtl
@@ -186075,7 +172625,6 @@ self: {
        ];
        description = "Type-safe, multi-backend data serialization";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -186106,8 +172655,6 @@ self: {
        ];
        description = "Parses a Persist Model file and produces Audit Models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-cereal" = callPackage
@@ -186119,8 +172666,6 @@ self: {
        libraryHaskellDepends = [ base cereal persistent text ];
        description = "Helper functions for writing Persistent instances";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-database-url" = callPackage
@@ -186140,8 +172685,6 @@ self: {
        ];
        description = "Parse DATABASE_URL into configuration types for Persistent";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-documentation" = callPackage
@@ -186162,8 +172705,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Documentation DSL for persistent entities";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-equivalence" = callPackage
@@ -186175,8 +172716,6 @@ self: {
        libraryHaskellDepends = [ array base diffarray ];
        description = "Persistent equivalence relations (aka union-find)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-hssqlppp" = callPackage
@@ -186193,8 +172732,6 @@ self: {
        ];
        description = "Declare Persistent entities using SQL SELECT query syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-instances-iproute" = callPackage
@@ -186238,8 +172775,6 @@ self: {
        ];
        description = "A thread-safe (STM) persistency interface for finite map types";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-migration" = callPackage
@@ -186264,8 +172799,6 @@ self: {
        ];
        description = "Manual migrations for the persistent library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-mongoDB" = callPackage
@@ -186293,31 +172826,9 @@ self: {
        ];
        description = "Backend for the persistent library using mongoDB";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-mysql" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
-     , containers, monad-logger, mysql, mysql-simple, persistent
-     , resource-pool, resourcet, text, transformers, unliftio-core
-     }:
-     mkDerivation {
-       pname = "persistent-mysql";
-       version = "2.9.0";
-       sha256 = "0aa1ia4r49vy5hfg59rbrfmfwdyaix0l32drdjnj9xxqbayifjzf";
-       revision = "1";
-       editedCabalFile = "0xvis08x4ajayp73f6j0czpksn309f3anv5kklxa9r6j8j5qkhvz";
-       libraryHaskellDepends = [
-         aeson base blaze-builder bytestring conduit containers monad-logger
-         mysql mysql-simple persistent resource-pool resourcet text
-         transformers unliftio-core
-       ];
-       description = "Backend for the persistent library using MySQL database server";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "persistent-mysql_2_10_2_3" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
      , containers, fast-logger, hspec, HUnit, monad-logger, mysql
      , mysql-simple, persistent, persistent-qq, persistent-template
@@ -186341,34 +172852,9 @@ self: {
        ];
        description = "Backend for the persistent library using MySQL database server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-mysql-haskell" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, conduit, containers
-     , io-streams, monad-logger, mysql-haskell, network, persistent
-     , persistent-template, resource-pool, resourcet, text, time, tls
-     , transformers, unliftio-core
-     }:
-     mkDerivation {
-       pname = "persistent-mysql-haskell";
-       version = "0.5.2";
-       sha256 = "1kc2q9cbgij5b5kz70jcy694v2frgzzb7mvld8dypsz11dlpmhjn";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring conduit containers io-streams monad-logger
-         mysql-haskell network persistent resource-pool resourcet text time
-         tls transformers unliftio-core
-       ];
-       executableHaskellDepends = [
-         base monad-logger persistent persistent-template transformers
-       ];
-       description = "A pure haskell backend for the persistent library using MySQL database server";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "persistent-mysql-haskell_0_6_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , fast-logger, hspec, HUnit, io-streams, monad-logger
      , mysql-haskell, network, persistent, persistent-qq
@@ -186398,7 +172884,6 @@ self: {
        ];
        description = "A pure haskell backend for the persistent library using MySQL database server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-odbc" = callPackage
@@ -186419,8 +172904,6 @@ self: {
        ];
        description = "Backend for the persistent library using ODBC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-pagination" = callPackage
@@ -186457,28 +172940,6 @@ self: {
      }) {};
 
   "persistent-postgresql" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
-     , containers, monad-logger, persistent, postgresql-libpq
-     , postgresql-simple, resource-pool, resourcet, text, time
-     , transformers, unliftio-core
-     }:
-     mkDerivation {
-       pname = "persistent-postgresql";
-       version = "2.9.1";
-       sha256 = "02i5lq6j79cv1y6n7c3lzipngkwaqfa96i4nvnkrs535x9xbxlpq";
-       revision = "1";
-       editedCabalFile = "186fbykla4hpsl14l1ccjr3rfdabl47c9x28m290477ilaygk685";
-       libraryHaskellDepends = [
-         aeson base blaze-builder bytestring conduit containers monad-logger
-         persistent postgresql-libpq postgresql-simple resource-pool
-         resourcet text time transformers unliftio-core
-       ];
-       description = "Backend for the persistent library using postgresql";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {};
-
-  "persistent-postgresql_2_10_1_2" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
      , containers, fast-logger, hspec, hspec-expectations, HUnit
      , monad-logger, persistent, persistent-qq, persistent-template
@@ -186504,7 +172965,6 @@ self: {
        ];
        description = "Backend for the persistent library using postgresql";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -186522,26 +172982,9 @@ self: {
        ];
        description = "Template-Haskell helpers for integrating protobufs with persistent";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-qq" = callPackage
-    ({ mkDerivation, base, haskell-src-meta, mtl, persistent
-     , template-haskell, text
-     }:
-     mkDerivation {
-       pname = "persistent-qq";
-       version = "2.9.1";
-       sha256 = "1zwvdm94sl4wlycyz5xm41p8g4b10qra53g9pxcfq6b7gl15cggd";
-       libraryHaskellDepends = [
-         base haskell-src-meta mtl persistent template-haskell text
-       ];
-       description = "Provides a quasi-quoter for raw SQL for persistent";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "persistent-qq_2_9_1_1" = callPackage
     ({ mkDerivation, aeson, base, fast-logger, haskell-src-meta, hspec
      , HUnit, monad-logger, mtl, persistent, persistent-sqlite
      , persistent-template, resourcet, template-haskell, text, unliftio
@@ -186560,7 +173003,6 @@ self: {
        ];
        description = "Provides a quasi-quoter for raw SQL for persistent";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-ratelimit" = callPackage
@@ -186572,8 +173014,6 @@ self: {
        libraryHaskellDepends = [ base time yesod ];
        description = "A library for rate limiting activities with a persistent backend";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-redis" = callPackage
@@ -186611,8 +173051,6 @@ self: {
        ];
        description = "Haskell references backed by an IntMap for persistence and reversibility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-relational-record" = callPackage
@@ -186690,34 +173128,6 @@ self: {
      }) {inherit (pkgs) sqlite;};
 
   "persistent-sqlite" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, conduit, containers
-     , hspec, microlens-th, monad-logger, old-locale, persistent
-     , persistent-template, resource-pool, resourcet, sqlite, temporary
-     , text, time, transformers, unliftio-core, unordered-containers
-     }:
-     mkDerivation {
-       pname = "persistent-sqlite";
-       version = "2.9.3";
-       sha256 = "13wbn88ixv4d4dfjl1gabm1q60fbcnygbmixz57pi3z84drrynwq";
-       configureFlags = [ "-fsystemlib" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring conduit containers microlens-th monad-logger
-         old-locale persistent resource-pool resourcet text time
-         transformers unliftio-core unordered-containers
-       ];
-       librarySystemDepends = [ sqlite ];
-       testHaskellDepends = [
-         base hspec persistent persistent-template temporary text time
-         transformers
-       ];
-       description = "Backend for the persistent library using sqlite3";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {inherit (pkgs) sqlite;};
-
-  "persistent-sqlite_2_10_6_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , exceptions, fast-logger, hspec, HUnit, microlens-th, monad-logger
      , persistent, persistent-template, persistent-test, QuickCheck
@@ -186727,8 +173137,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-sqlite";
-       version = "2.10.6.1";
-       sha256 = "0s6zfqs7s8kpswicsbf8bwn1c5wg3jh2nl8nd7z9lk7h46ba0387";
+       version = "2.10.6.2";
+       sha256 = "0l6287ni2ksi8l8kv6gbsyjxhjpcqn6a1gw577ii7fixbyvbpbnf";
        configureFlags = [ "-fsystemlib" ];
        isLibrary = true;
        isExecutable = true;
@@ -186746,36 +173156,10 @@ self: {
        ];
        description = "Backend for the persistent library using sqlite3";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {inherit (pkgs) sqlite;};
 
   "persistent-template" = callPackage
-    ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers
-     , ghc-prim, hspec, http-api-data, monad-control, monad-logger
-     , path-pieces, persistent, QuickCheck, tagged, template-haskell
-     , text, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "persistent-template";
-       version = "2.6.0";
-       sha256 = "0wr1z2nfrl6jv1lprxb0d2jw4izqfcbcwvkdrhryzg95gjz8ryjv";
-       revision = "1";
-       editedCabalFile = "1p7j3lz0jrczrl25bw7cg0vskhxki065x8r6913sh8l1kvrdbkk8";
-       libraryHaskellDepends = [
-         aeson aeson-compat base bytestring containers ghc-prim
-         http-api-data monad-control monad-logger path-pieces persistent
-         tagged template-haskell text transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring hspec persistent QuickCheck text transformers
-       ];
-       description = "Type-safe, non-relational, multi-backend persistence";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {};
-
-  "persistent-template_2_8_2_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , deepseq, deepseq-generics, file-embed, hspec, http-api-data
      , monad-control, monad-logger, path-pieces, persistent, QuickCheck
@@ -186784,8 +173168,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-template";
-       version = "2.8.2.2";
-       sha256 = "1ka5s373q50q4nqn1w5jqgcvh21m89gmq7i0jcdhidkz5ynvx51k";
+       version = "2.8.2.3";
+       sha256 = "1y96aj5i3c1j2ls6980l8lfjj9b3vfmp3766xk5af1870vj1s1lf";
        libraryHaskellDepends = [
          aeson base bytestring containers http-api-data monad-control
          monad-logger path-pieces persistent template-haskell text
@@ -186800,7 +173184,6 @@ self: {
        ];
        description = "Type-safe, non-relational, multi-backend persistence";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -186822,8 +173205,6 @@ self: {
        ];
        description = "Generate classy lens field accessors for persistent models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-test" = callPackage
@@ -186847,37 +173228,9 @@ self: {
        ];
        description = "Tests for Persistent";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-typed-db" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec
-     , http-api-data, monad-logger, path-pieces, persistent
-     , persistent-template, resource-pool, resourcet, template-haskell
-     , text, transformers
-     }:
-     mkDerivation {
-       pname = "persistent-typed-db";
-       version = "0.0.1.1";
-       sha256 = "0cn9dyv5gzkjn9jbv2srw94akz1rpgxsvn1hv1ik90a8sl3drh9n";
-       revision = "1";
-       editedCabalFile = "106dkixvzg2zia8hzxsw5fb458v7bka69szlnfxnffa5sdbm8him";
-       libraryHaskellDepends = [
-         aeson base bytestring conduit http-api-data monad-logger
-         path-pieces persistent persistent-template resource-pool resourcet
-         template-haskell text transformers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring conduit esqueleto hspec http-api-data
-         monad-logger path-pieces persistent persistent-template
-         resource-pool resourcet template-haskell text transformers
-       ];
-       description = "Type safe access to multiple database schemata";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "persistent-typed-db_0_1_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec
      , http-api-data, monad-logger, path-pieces, persistent
      , persistent-template, resource-pool, resourcet, template-haskell
@@ -186899,7 +173252,6 @@ self: {
        ];
        description = "Type safe access to multiple database schemata";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-vector" = callPackage
@@ -186917,8 +173269,6 @@ self: {
        benchmarkHaskellDepends = [ base containers criterion deepseq ];
        description = "A persistent sequence based on array mapped tries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-zookeeper" = callPackage
@@ -186948,8 +173298,6 @@ self: {
        ];
        description = "Backend for persistent library using Zookeeper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persona" = callPackage
@@ -186966,8 +173314,6 @@ self: {
        ];
        description = "Persona (BrowserID) library";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persona-idp" = callPackage
@@ -186989,8 +173335,6 @@ self: {
        ];
        description = "Persona (BrowserID) Identity Provider";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pesca" = callPackage
@@ -187005,8 +173349,6 @@ self: {
        executableHaskellDepends = [ base process ];
        description = "Proof Editor for Sequent Calculus";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "peyotls" = callPackage
@@ -187033,8 +173375,6 @@ self: {
        ];
        description = "Pretty Easy YOshikuni-made TLS library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "peyotls-codec" = callPackage
@@ -187052,8 +173392,6 @@ self: {
        ];
        description = "Codec parts of Pretty Easy YOshikuni-made TLS library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pez" = callPackage
@@ -187070,8 +173408,6 @@ self: {
        ];
        description = "A Pretty Extraordinary Zipper library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pg-harness" = callPackage
@@ -187091,8 +173427,6 @@ self: {
        ];
        description = "REST service and library for creating/consuming temporary PostgreSQL databases";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pg-harness-client" = callPackage
@@ -187148,8 +173482,6 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pg-store" = callPackage
@@ -187173,35 +173505,9 @@ self: {
        ];
        description = "Simple storage interface to PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pg-transact" = callPackage
-    ({ mkDerivation, base, bytestring, exceptions, hspec
-     , hspec-discover, monad-control, postgresql-simple, tmp-postgres
-     , transformers
-     }:
-     mkDerivation {
-       pname = "pg-transact";
-       version = "0.1.2.0";
-       sha256 = "1xgma50c4pvvb9h2wksx8wl4sf0625ngbsb2c828xd0aqj171qmj";
-       libraryHaskellDepends = [
-         base bytestring exceptions monad-control postgresql-simple
-         transformers
-       ];
-       testHaskellDepends = [
-         base bytestring exceptions hspec hspec-discover postgresql-simple
-         tmp-postgres
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Another postgresql-simple transaction monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "pg-transact_0_3_1_1" = callPackage
     ({ mkDerivation, async, base, bytestring, exceptions, hspec
      , hspec-expectations-lifted, monad-control, postgresql-libpq
      , postgresql-simple, tmp-postgres, transformers
@@ -187220,8 +173526,6 @@ self: {
        ];
        description = "A postgresql-simple transaction monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pgdl" = callPackage
@@ -187247,8 +173551,6 @@ self: {
        ];
        description = "browse directory listing webpages and download files from them";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pgm" = callPackage
@@ -187296,8 +173598,6 @@ self: {
        ];
        description = "A mid-level PostgreSQL client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pgstream" = callPackage
@@ -187322,8 +173622,6 @@ self: {
        ];
        description = "Streaming Postgres bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "phantom-state" = callPackage
@@ -187350,8 +173648,6 @@ self: {
        ];
        description = "Freezing, thawing, and copy elision";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "phaser" = callPackage
@@ -187423,8 +173719,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Deprecated - ghci debug viewer with simple editor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "phoityne-vscode" = callPackage
@@ -187475,8 +173769,6 @@ self: {
        testHaskellDepends = [ base bytestring ];
        description = "Haskell bindings to the libphonenumber library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {phonenumber = null; inherit (pkgs) protobuf;};
 
   "phone-push" = callPackage
@@ -187494,8 +173786,6 @@ self: {
        ];
        description = "Push notifications for Android and iOS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "phonetic-code" = callPackage
@@ -187522,8 +173812,6 @@ self: {
        ];
        description = "Functional user interfaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "photoname" = callPackage
@@ -187545,8 +173833,6 @@ self: {
        ];
        description = "Rename photo image files based on EXIF shoot date";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "phraskell" = callPackage
@@ -187560,8 +173846,6 @@ self: {
        executableHaskellDepends = [ base mtl SDL transformers ];
        description = "A fractal viewer";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "phybin" = callPackage
@@ -187594,8 +173878,6 @@ self: {
        ];
        description = "Utility for clustering phylogenetic trees in Newick format based on Robinson-Foulds distance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "physics" = callPackage
@@ -187627,8 +173909,6 @@ self: {
        ];
        description = "Applied pi-calculus interpreter";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pi-forall" = callPackage
@@ -187652,8 +173932,6 @@ self: {
        ];
        description = "Demo implementation of typechecker for dependently-typed language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pi-hoole" = callPackage
@@ -187679,8 +173957,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Lightweight access control solution for the pijul vcs";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pi-lcd" = callPackage
@@ -187722,8 +173998,6 @@ self: {
        ];
        description = "Set up port forwarding with the Private Internet Access VPN service";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pianola" = callPackage
@@ -187746,8 +174020,6 @@ self: {
        ];
        description = "Remotely controlling Java Swing applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "picedit" = callPackage
@@ -187762,8 +174034,6 @@ self: {
        executableHaskellDepends = [ base cli hmatrix ];
        description = "simple image manipulation functions";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pickle" = callPackage
@@ -187799,8 +174069,6 @@ self: {
        ];
        description = "Utilities for symbolic predicate logic expressions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "picoparsec" = callPackage
@@ -187833,8 +174101,6 @@ self: {
        ];
        description = "Fast combinator parsing for bytestrings and text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "picosat" = callPackage
@@ -187847,8 +174113,6 @@ self: {
        testHaskellDepends = [ base containers random rdtsc transformers ];
        description = "Bindings to the PicoSAT solver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pictikz" = callPackage
@@ -187862,8 +174126,6 @@ self: {
        executableHaskellDepends = [ base matrix transformers xml ];
        description = "Converts a svg image to tikz code";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pid1" = callPackage
@@ -187911,8 +174173,6 @@ self: {
        ];
        description = "Yet another Haskell build system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pier-core" = callPackage
@@ -187932,8 +174192,6 @@ self: {
        ];
        description = "A library for writing forwards-declared build systems in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "piet" = callPackage
@@ -187947,8 +174205,6 @@ self: {
        libraryHaskellDepends = [ array base containers Imlib mtl ];
        description = "A Piet interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pig" = callPackage
@@ -187965,8 +174221,6 @@ self: {
        ];
        description = "dice game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "piki" = callPackage
@@ -188066,8 +174320,6 @@ self: {
        ];
        description = "Write grammars, not parsers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pine" = callPackage
@@ -188087,8 +174339,6 @@ self: {
        testHaskellDepends = [ base containers sdl2 sdl2-image stm text ];
        description = "Functional 2D Game Framework";
        license = stdenv.lib.licenses.zlib;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ping" = callPackage
@@ -188107,8 +174357,6 @@ self: {
        ];
        description = "icmp echo requests";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ping-parser-attoparsec" = callPackage
@@ -188187,8 +174435,6 @@ self: {
        testHaskellDepends = [ base doctest protolude ];
        description = "A gateway for various cloud notification services";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipe-enumerator" = callPackage
@@ -188200,8 +174446,6 @@ self: {
        libraryHaskellDepends = [ base enumerator pipes transformers ];
        description = "A bidirectional bridge between pipes and iteratees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipeclip" = callPackage
@@ -188239,8 +174483,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Conduit with a smaller core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipeline" = callPackage
@@ -188311,8 +174553,6 @@ self: {
        ];
        description = "A higher-level interface to using concurrency with pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-attoparsec" = callPackage
@@ -188352,8 +174592,6 @@ self: {
        ];
        description = "Streaming parsing in the pipes-core framework with Attoparsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-bgzf" = callPackage
@@ -188369,8 +174607,6 @@ self: {
        ];
        description = "Blocked GZip";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-binary" = callPackage
@@ -188424,8 +174660,6 @@ self: {
        ];
        description = "Brotli (RFC7932) compressors and decompressors for the Pipes package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-bytestring" = callPackage
@@ -188481,8 +174715,6 @@ self: {
        testHaskellDepends = [ base hlint ];
        description = "Pipes for Noise-secured network connections";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-category" = callPackage
@@ -188558,8 +174790,6 @@ self: {
        ];
        description = "Encode and decode binary streams using the pipes and cereal libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-cereal-plus" = callPackage
@@ -188575,8 +174805,6 @@ self: {
        ];
        description = "A streaming serialization library on top of \"pipes\" and \"cereal-plus\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-cliff" = callPackage
@@ -188623,8 +174851,6 @@ self: {
        libraryHaskellDepends = [ base conduit mtl pipes-core ];
        description = "Conduit adapters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-core" = callPackage
@@ -188640,8 +174866,6 @@ self: {
        ];
        description = "Compositional pipelines";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-courier" = callPackage
@@ -188653,8 +174877,6 @@ self: {
        libraryHaskellDepends = [ base courier pipes ];
        description = "Pipes utilities for interfacing with the courier message-passing framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-csv" = callPackage
@@ -188687,8 +174909,6 @@ self: {
        libraryHaskellDepends = [ base errors pipes ];
        description = "Integration between pipes and errors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-extra" = callPackage
@@ -188716,8 +174936,6 @@ self: {
        ];
        description = "Various basic utilities for Pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-extras" = callPackage
@@ -188778,8 +174996,6 @@ self: {
        ];
        description = "Fast traversal of directory trees using pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-fluid" = callPackage
@@ -188812,8 +175028,8 @@ self: {
        pname = "pipes-group";
        version = "1.0.12";
        sha256 = "1issfj3syi6lfbcdn3bhlbnlh86s92ldsb04c4ac69xipsgyhwqk";
-       revision = "1";
-       editedCabalFile = "0ws99n692c9km68n9y3x0b5bqdg3b47sva04nx9a4xdqr8p5akps";
+       revision = "2";
+       editedCabalFile = "1y7fh0vc6iknyxizp5hrgkkjzp2hl3ygjyxgsq6b9kh74h2hbbrp";
        libraryHaskellDepends = [
          base free pipes pipes-parse transformers
        ];
@@ -188850,8 +175066,6 @@ self: {
        ];
        description = "Illumina NGS data processing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-interleave" = callPackage
@@ -188877,8 +175091,6 @@ self: {
        testHaskellDepends = [ base hspec pipes ];
        description = "Stateful IO streams based on pipes";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-kafka" = callPackage
@@ -188919,8 +175131,6 @@ self: {
        ];
        description = "Streaming processing of CSV files preceded by key-value pairs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-lines" = callPackage
@@ -189010,23 +175220,6 @@ self: {
      }) {};
 
   "pipes-network-tls" = callPackage
-    ({ mkDerivation, base, bytestring, network, network-simple
-     , network-simple-tls, pipes, pipes-network, pipes-safe, tls
-     , transformers
-     }:
-     mkDerivation {
-       pname = "pipes-network-tls";
-       version = "0.3";
-       sha256 = "1cmsnvgr3ffjxqn7bwj0ghqsxqd4hnhfdn4di6p8q6np2mmllsd2";
-       libraryHaskellDepends = [
-         base bytestring network network-simple network-simple-tls pipes
-         pipes-network pipes-safe tls transformers
-       ];
-       description = "TLS-secured network connections support for pipes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-network-tls_0_4" = callPackage
     ({ mkDerivation, base, bytestring, network, network-simple
      , network-simple-tls, pipes, pipes-network, pipes-safe, tls
      , transformers
@@ -189041,7 +175234,6 @@ self: {
        ];
        description = "TLS-secured network connections support for pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-network-ws" = callPackage
@@ -189084,8 +175276,6 @@ self: {
        ];
        description = "P2P network nodes with pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-p2p-examples" = callPackage
@@ -189104,8 +175294,6 @@ self: {
        ];
        description = "Examples using pipes-p2p";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-parse" = callPackage
@@ -189156,8 +175344,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Alternate Prelude for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-random" = callPackage
@@ -189183,8 +175369,6 @@ self: {
        executableHaskellDepends = [ base pipes time ];
        description = "A few pipes to control the timing of yields";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-s3" = callPackage
@@ -189207,8 +175391,6 @@ self: {
        ];
        description = "A simple interface for streaming data to and from Amazon S3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-safe" = callPackage
@@ -189245,8 +175427,6 @@ self: {
        ];
        description = "Create proper Pipes from System.Process";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-sqlite-simple" = callPackage
@@ -189260,8 +175440,6 @@ self: {
        ];
        description = "Functions that smash Pipes and sqlite-simple together";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-text" = callPackage
@@ -189279,8 +175457,6 @@ self: {
        ];
        description = "properly streaming text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-transduce" = callPackage
@@ -189304,8 +175480,6 @@ self: {
        ];
        description = "Interfacing pipes with foldl folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-vector" = callPackage
@@ -189371,8 +175545,6 @@ self: {
        ];
        description = "Pipes integration for ZeroMQ messaging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pipes-zlib" = callPackage
@@ -189412,8 +175584,6 @@ self: {
        ];
        description = "A dependently typed core language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pit" = callPackage
@@ -189436,8 +175606,6 @@ self: {
        ];
        description = "Account management tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pitchtrack" = callPackage
@@ -189458,8 +175626,6 @@ self: {
        ];
        description = "Pitch tracking library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pivotal-tracker" = callPackage
@@ -189483,8 +175649,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "A library and a CLI tool for accessing Pivotal Tracker API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pixela" = callPackage
@@ -189529,8 +175693,6 @@ self: {
        ];
        description = "A library and application for generating pixelated avatars";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "piyo" = callPackage
@@ -189587,8 +175749,6 @@ self: {
        ];
        description = "PKCS#10 library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pkcs7" = callPackage
@@ -189601,8 +175761,6 @@ self: {
        testHaskellDepends = [ base bytestring Cabal HUnit QuickCheck ];
        description = "PKCS #7 padding in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pkggraph" = callPackage
@@ -189616,8 +175774,6 @@ self: {
        executableHaskellDepends = [ base Cabal split ];
        description = "Package dependency graph for installed packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pkgtreediff" = callPackage
@@ -189636,8 +175792,6 @@ self: {
        ];
        description = "Package tree diff tool";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pktree" = callPackage
@@ -189672,8 +175826,6 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl time unix ];
        description = "plaimi's prelude";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plan-applicative" = callPackage
@@ -189694,8 +175846,6 @@ self: {
        ];
        description = "Applicative/Arrow for resource estimation and progress tracking";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plan-b" = callPackage
@@ -189714,8 +175864,6 @@ self: {
        testHaskellDepends = [ base hspec path path-io ];
        description = "Failure-tolerant file and directory editing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "planar-graph" = callPackage
@@ -189732,8 +175880,6 @@ self: {
        ];
        description = "A representation of planar graphs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "planb-token-introspection" = callPackage
@@ -189811,8 +175957,6 @@ self: {
        ];
        description = "Planet Mitchell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "planet-mitchell-test" = callPackage
@@ -189829,8 +175973,6 @@ self: {
        ];
        description = "Planet Mitchell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plankton" = callPackage
@@ -189842,8 +175984,6 @@ self: {
        libraryHaskellDepends = [ adjunctions base protolude ];
        description = "The core of a numeric prelude, taken from numhask";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plat" = callPackage
@@ -189857,8 +175997,6 @@ self: {
        ];
        description = "Simple templating library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "platinum-parsing" = callPackage
@@ -189882,8 +176020,6 @@ self: {
        testHaskellDepends = [ base containers fgl hspec vector ];
        description = "General Framework for compiler development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "playlists" = callPackage
@@ -189945,8 +176081,6 @@ self: {
        ];
        description = "run a subprocess, combining stdout and stderr";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plist" = callPackage
@@ -189982,8 +176116,6 @@ self: {
        ];
        description = "Remote monad for editing plists";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plivo" = callPackage
@@ -190017,8 +176149,6 @@ self: {
        executableHaskellDepends = [ base optparse-applicative socketed ];
        description = "plot data from stdin through socketed";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plot" = callPackage
@@ -190034,8 +176164,6 @@ self: {
        ];
        description = "A plotting library, exportable as eps/pdf/svg/png or renderable with gtk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plot-gtk" = callPackage
@@ -190047,8 +176175,6 @@ self: {
        libraryHaskellDepends = [ base glib gtk hmatrix mtl plot process ];
        description = "GTK plots and interaction with GHCi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plot-gtk-ui" = callPackage
@@ -190065,8 +176191,6 @@ self: {
        ];
        description = "A quick way to use Mathematica like Manipulation abilities";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plot-gtk3" = callPackage
@@ -190080,8 +176204,6 @@ self: {
        ];
        description = "GTK3 plots and interaction with GHCi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plot-lab" = callPackage
@@ -190098,8 +176220,6 @@ self: {
        ];
        description = "A plotting tool with Mathematica like Manipulation abilities";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plot-light" = callPackage
@@ -190138,8 +176258,6 @@ self: {
        ];
        description = "Example binaries for plot-light";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plotfont" = callPackage
@@ -190250,8 +176368,6 @@ self: {
        ];
        description = "Dynamic linking for Haskell and C objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plugins-auto" = callPackage
@@ -190268,8 +176384,6 @@ self: {
        testHaskellDepends = [ base directory process ];
        description = "Automatic recompilation and reloading of haskell modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plugins-multistage" = callPackage
@@ -190288,8 +176402,6 @@ self: {
        ];
        description = "Dynamic linking for embedded DSLs with staged compilation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plumbers" = callPackage
@@ -190313,8 +176425,6 @@ self: {
        testHaskellDepends = [ base hedgehog hedgehog-classes ];
        description = "Plurality monad: Zero, one, or at least two";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "plural" = callPackage
@@ -190327,8 +176437,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Pluralize";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ply-loader" = callPackage
@@ -190363,8 +176471,6 @@ self: {
        ];
        description = "read/write png file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pngload" = callPackage
@@ -190381,8 +176487,6 @@ self: {
        ];
        description = "Pure Haskell loader for PNG images";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pngload-fixed" = callPackage
@@ -190395,8 +176499,6 @@ self: {
        libraryHaskellDepends = [ array base bytestring mtl parsec zlib ];
        description = "Pure Haskell loader for PNG images";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pnm" = callPackage
@@ -190424,8 +176526,6 @@ self: {
        ];
        description = "Bindings for the Pocket API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pocket-dns" = callPackage
@@ -190460,8 +176560,6 @@ self: {
        ];
        description = "Multi-backend (zookeeper and sqlite) DNS Server using persistent-library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "point-octree" = callPackage
@@ -190480,8 +176578,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Point octree, with bounding boxes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pointed" = callPackage
@@ -190571,8 +176667,6 @@ self: {
        doHaddock = false;
        description = "Tool for refactoring expressions into pointfree form";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pointful" = callPackage
@@ -190591,8 +176685,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Pointful refactoring tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pointless-fun" = callPackage
@@ -190630,8 +176722,6 @@ self: {
        ];
        description = "Pointless Lenses library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pointless-rewrite" = callPackage
@@ -190647,8 +176737,6 @@ self: {
        ];
        description = "Pointless Rewrite library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pokemon-go-protobuf-types" = callPackage
@@ -190665,8 +176753,6 @@ self: {
        ];
        description = "Haskell types for the Pokemon Go protobuf protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "poker-eval" = callPackage
@@ -190679,8 +176765,6 @@ self: {
        librarySystemDepends = [ poker-eval ];
        description = "Binding to libpoker-eval";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {poker-eval = null;};
 
   "pokitdok" = callPackage
@@ -190698,8 +176782,6 @@ self: {
        ];
        description = "PokitDok Platform API Client for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polar" = callPackage
@@ -190723,8 +176805,6 @@ self: {
        testHaskellDepends = [ base containers HUnit MissingH mtl parsec ];
        description = "Fork of ConfigFile for Polar Game Engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polar-shader" = callPackage
@@ -190737,8 +176817,6 @@ self: {
        testHaskellDepends = [ base containers hspec ];
        description = "High-level shader compiler framework";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polh-lexicon" = callPackage
@@ -190757,8 +176835,6 @@ self: {
        ];
        description = "A library for manipulating the historical dictionary of Polish (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "policeman" = callPackage
@@ -190795,8 +176871,6 @@ self: {
        libraryHaskellDepends = [ base binary containers text ];
        description = "Handling the PoliMorf dictionary";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "poll" = callPackage
@@ -190811,31 +176885,6 @@ self: {
      }) {};
 
   "poly" = callPackage
-    ({ mkDerivation, base, gauge, primitive, QuickCheck
-     , quickcheck-classes, semirings, tasty, tasty-quickcheck, vector
-     , vector-algorithms
-     }:
-     mkDerivation {
-       pname = "poly";
-       version = "0.3.1.0";
-       sha256 = "1c8xnkqxwzbpx01clz9spz9zwa18qhsbvscrc381r0f46cjax2ph";
-       revision = "1";
-       editedCabalFile = "10lcg7x6vzrzgj5libfwnmxj2y3f1j5gpz9l8mgzivapknvhhpfx";
-       libraryHaskellDepends = [
-         base primitive semirings vector vector-algorithms
-       ];
-       testHaskellDepends = [
-         base QuickCheck quickcheck-classes semirings tasty tasty-quickcheck
-         vector
-       ];
-       benchmarkHaskellDepends = [ base gauge semirings vector ];
-       description = "Polynomials";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "poly_0_3_3_0" = callPackage
     ({ mkDerivation, base, deepseq, gauge, primitive, QuickCheck
      , quickcheck-classes, semirings, tasty, tasty-quickcheck, vector
      , vector-algorithms
@@ -190856,8 +176905,6 @@ self: {
        benchmarkHaskellDepends = [ base deepseq gauge semirings vector ];
        description = "Polynomials";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "poly-arity" = callPackage
@@ -190891,8 +176938,6 @@ self: {
        libraryHaskellDepends = [ base lens ];
        description = "This package provides abstraction for polymorphic controls, like PolyMonads or PolyApplicatives";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polyToMonoid" = callPackage
@@ -190922,8 +176967,6 @@ self: {
        ];
        description = "Wrap together data and it's constraints";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polydata-core" = callPackage
@@ -190935,8 +176978,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Core data definitions for the \"polydata\" package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polymap" = callPackage
@@ -190992,8 +177033,6 @@ self: {
        ];
        description = "Polynomials";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polynomials-bernstein" = callPackage
@@ -191008,17 +177047,6 @@ self: {
      }) {};
 
   "polyparse" = callPackage
-    ({ mkDerivation, base, bytestring, text }:
-     mkDerivation {
-       pname = "polyparse";
-       version = "1.12.1";
-       sha256 = "19fs18g7fvfdkm9zy28cgighjcxfa6mcpqgyp6whmsjkb3h393fx";
-       libraryHaskellDepends = [ base bytestring text ];
-       description = "A variety of alternative parser combinator libraries";
-       license = "LGPL";
-     }) {};
-
-  "polyparse_1_13" = callPackage
     ({ mkDerivation, base, bytestring, text }:
      mkDerivation {
        pname = "polyparse";
@@ -191027,44 +177055,13 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        description = "A variety of alternative parser combinator libraries";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "polysemy" = callPackage
-    ({ mkDerivation, async, base, containers, criterion, doctest
-     , first-class-families, free, freer-simple, hspec, hspec-discover
-     , inspection-testing, mtl, syb, template-haskell, th-abstraction
-     , transformers, type-errors, type-errors-pretty, unagi-chan
-     }:
-     mkDerivation {
-       pname = "polysemy";
-       version = "1.0.0.0";
-       sha256 = "1y63vwrmmany62ci2sdd8kfmkrigk0vds2kjpxmyh9nsvw5fv576";
-       libraryHaskellDepends = [
-         async base containers first-class-families mtl syb template-haskell
-         th-abstraction transformers type-errors type-errors-pretty
-         unagi-chan
-       ];
-       testHaskellDepends = [
-         async base containers doctest first-class-families hspec
-         inspection-testing mtl syb template-haskell th-abstraction
-         transformers type-errors type-errors-pretty unagi-chan
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         async base containers criterion first-class-families free
-         freer-simple mtl syb template-haskell th-abstraction transformers
-         type-errors type-errors-pretty unagi-chan
-       ];
-       description = "Higher-order, low-boilerplate, zero-cost free monads";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "polysemy_1_2_3_0" = callPackage
     ({ mkDerivation, async, base, Cabal, cabal-doctest, containers
      , criterion, doctest, first-class-families, free, freer-simple
-     , hspec, hspec-discover, inspection-testing, mtl, stm, syb
-     , template-haskell, th-abstraction, transformers, type-errors
+     , hspec, hspec-discover, inspection-testing, loopbreaker, mtl, stm
+     , syb, template-haskell, th-abstraction, transformers, type-errors
      , type-errors-pretty, unagi-chan
      }:
      mkDerivation {
@@ -191075,19 +177072,54 @@ self: {
        editedCabalFile = "0dzmkna6jb2im9kdslp90z6ynk2qzzg2j495i3y933ywdavvci93";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
-         async base containers first-class-families mtl stm syb
+         async base containers first-class-families loopbreaker mtl stm syb
          template-haskell th-abstraction transformers type-errors
          type-errors-pretty unagi-chan
        ];
        testHaskellDepends = [
          async base containers doctest first-class-families hspec
-         inspection-testing mtl stm syb template-haskell th-abstraction
-         transformers type-errors type-errors-pretty unagi-chan
+         inspection-testing loopbreaker mtl stm syb template-haskell
+         th-abstraction transformers type-errors type-errors-pretty
+         unagi-chan
        ];
        testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [
          async base containers criterion first-class-families free
-         freer-simple mtl stm syb template-haskell th-abstraction
+         freer-simple loopbreaker mtl stm syb template-haskell
+         th-abstraction transformers type-errors type-errors-pretty
+         unagi-chan
+       ];
+       description = "Higher-order, low-boilerplate, zero-cost free monads";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "polysemy_1_3_0_0" = callPackage
+    ({ mkDerivation, async, base, Cabal, cabal-doctest, containers
+     , criterion, doctest, first-class-families, free, freer-simple
+     , hspec, hspec-discover, inspection-testing, mtl, QuickCheck, stm
+     , syb, template-haskell, th-abstraction, transformers, type-errors
+     , type-errors-pretty, unagi-chan
+     }:
+     mkDerivation {
+       pname = "polysemy";
+       version = "1.3.0.0";
+       sha256 = "0p5g1n5b0dfkadqpqf2ka25dblimwqhxwx5ax0mxwixb0jwd0pvb";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         async base containers first-class-families mtl QuickCheck stm syb
+         template-haskell th-abstraction transformers type-errors
+         type-errors-pretty unagi-chan
+       ];
+       testHaskellDepends = [
+         async base containers doctest first-class-families hspec
+         inspection-testing mtl QuickCheck stm syb template-haskell
+         th-abstraction transformers type-errors type-errors-pretty
+         unagi-chan
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         async base containers criterion first-class-families free
+         freer-simple mtl QuickCheck stm syb template-haskell th-abstraction
          transformers type-errors type-errors-pretty unagi-chan
        ];
        description = "Higher-order, low-boilerplate, zero-cost free monads";
@@ -191102,8 +177134,8 @@ self: {
      }:
      mkDerivation {
        pname = "polysemy-RandomFu";
-       version = "0.4.0.0";
-       sha256 = "0l4jimvd3shvxwl0zrfxqp3hlkiqwzihljd07jdppchc41xq3aiz";
+       version = "0.4.1.0";
+       sha256 = "1gr7nyzz1wwl7c22q21c8y8r94b8sp0r5kma20w3avg6p0l53bm3";
        libraryHaskellDepends = [
          base polysemy polysemy-plugin polysemy-zoo random-fu random-source
        ];
@@ -191124,8 +177156,8 @@ self: {
      }:
      mkDerivation {
        pname = "polysemy-plugin";
-       version = "0.2.4.0";
-       sha256 = "0ppnp3b6sa835jrr31la2b9z0mlil8hm60dqvz2pvyfkic88y9mg";
+       version = "0.2.5.0";
+       sha256 = "1ymry3ppc5cl9agvkbxks155xnxr9cv39p77j05ychnhv9r4vjsh";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base containers ghc ghc-tcplugins-extra polysemy syb transformers
@@ -191140,52 +177172,30 @@ self: {
      }) {};
 
   "polysemy-zoo" = callPackage
-    ({ mkDerivation, async, base, binary, bytestring, constraints
-     , containers, ghc-prim, hedis, hspec, hspec-discover, mtl, polysemy
-     , polysemy-plugin, random, reflection
+    ({ mkDerivation, async, base, compact, constraints, containers
+     , contravariant, exceptions, ghc-prim, hspec, hspec-discover, mtl
+     , polysemy, polysemy-plugin, random, reflection, streaming, text
+     , transformers
      }:
      mkDerivation {
        pname = "polysemy-zoo";
-       version = "0.5.0.1";
-       sha256 = "06ggm3qinabwp5bha858anwdvw726wzl738wpgf1kd9mgivbv53w";
+       version = "0.7.0.0";
+       sha256 = "1kc6lgq5x64pd49qbk078xiyni6fwxwk3897bvwvfwcyb8np39ww";
        libraryHaskellDepends = [
-         async base binary bytestring constraints containers ghc-prim hedis
-         mtl polysemy polysemy-plugin random reflection
+         async base compact constraints containers contravariant exceptions
+         ghc-prim mtl polysemy polysemy-plugin random reflection streaming
+         text transformers
        ];
        testHaskellDepends = [
-         async base binary bytestring constraints containers ghc-prim hedis
-         hspec mtl polysemy polysemy-plugin random reflection
+         async base compact constraints containers contravariant exceptions
+         ghc-prim hspec mtl polysemy polysemy-plugin random reflection
+         streaming text transformers
        ];
        testToolDepends = [ hspec-discover ];
        description = "Experimental, user-contributed effects and interpreters for polysemy";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "polysemy-zoo_0_6_0_1" = callPackage
-    ({ mkDerivation, async, base, binary, bytestring, constraints
-     , containers, contravariant, ghc-prim, hedis, hspec, hspec-discover
-     , mtl, polysemy, polysemy-plugin, random, reflection, transformers
-     }:
-     mkDerivation {
-       pname = "polysemy-zoo";
-       version = "0.6.0.1";
-       sha256 = "1va72282ng2h15fpzi3az1cdl1717hyfsa1qfz9xl4lnaa4x8nwa";
-       libraryHaskellDepends = [
-         async base binary bytestring constraints containers contravariant
-         ghc-prim hedis mtl polysemy polysemy-plugin random reflection
-         transformers
-       ];
-       testHaskellDepends = [
-         async base binary bytestring constraints containers contravariant
-         ghc-prim hedis hspec mtl polysemy polysemy-plugin random reflection
-         transformers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Experimental, user-contributed effects and interpreters for polysemy";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "polyseq" = callPackage
     ({ mkDerivation, array, base, bytestring, cgi, containers
      , free-theorems, haskell-src, mtl, network, old-locale, old-time
@@ -191204,8 +177214,6 @@ self: {
        executableHaskellDepends = [ cgi free-theorems utf8-string xhtml ];
        description = "Taming Selective Strictness";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polysoup" = callPackage
@@ -191219,8 +177227,6 @@ self: {
        ];
        description = "Online XML parsing with polyparse and tagsoup";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polytypeable" = callPackage
@@ -191232,8 +177238,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Typeable for polymorphic types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polytypeable-utils" = callPackage
@@ -191245,8 +177249,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 polytypeable ];
        description = "Utilities for polytypeable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "polyvariadic" = callPackage
@@ -191282,8 +177284,6 @@ self: {
        ];
        description = "Maps and sets of partial orders";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pomodoro" = callPackage
@@ -191302,8 +177302,6 @@ self: {
        ];
        description = "pomodoro timer";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pomohoro" = callPackage
@@ -191327,8 +177325,6 @@ self: {
        testHaskellDepends = [ base hspec protolude ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ponder" = callPackage
@@ -191340,8 +177336,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "PEG parser combinator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pong-server" = callPackage
@@ -191359,8 +177353,6 @@ self: {
        testHaskellDepends = [ base hspec network QuickCheck ];
        description = "A simple embedded pingable server that runs in the background";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pontarius-mediaserver" = callPackage
@@ -191462,8 +177454,6 @@ self: {
        libraryHaskellDepends = [ base monad-control transformers ];
        description = "Thread-safe resource pools. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pool-conduit" = callPackage
@@ -191481,8 +177471,6 @@ self: {
        ];
        description = "Resource pool allocations via ResourceT. (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pooled-io" = callPackage
@@ -191525,8 +177513,6 @@ self: {
        libraryHaskellDepends = [ base directory haskell98 unix ];
        description = "popenhs is a popen-like library for Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "poppler" = callPackage
@@ -191547,8 +177533,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the Poppler";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gdk-pixbuf; inherit (pkgs) gtk2; 
          inherit (pkgs) pango; inherit (pkgs) poppler;};
 
@@ -191603,8 +177587,6 @@ self: {
        ];
        description = "Express portable, composable and reusable data tasks and pipelines";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "porcupine-http" = callPackage
@@ -191633,8 +177615,6 @@ self: {
        ];
        description = "A location accessor for porcupine to connect to HTTP sources/sinks";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "porcupine-s3" = callPackage
@@ -191665,8 +177645,6 @@ self: {
        ];
        description = "A location accessor for porcupine to connect to AWS S3 sources/sinks";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "port-utils" = callPackage
@@ -191720,8 +177698,6 @@ self: {
        testHaskellDepends = [ base containers hspec mtl QuickCheck text ];
        description = "DSL for configuring Gentoo portage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "portaudio" = callPackage
@@ -191752,8 +177728,6 @@ self: {
        ];
        description = "FreeBSD ports index search and analysis tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "porter" = callPackage
@@ -191776,8 +177750,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 unix ];
        description = "The Haskell Ports Library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ports-tools" = callPackage
@@ -191812,8 +177784,6 @@ self: {
        ];
        description = "Simple extensible library to run SQL file against PostgreSQL database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "poseidon-postgis" = callPackage
@@ -191834,8 +177804,6 @@ self: {
        ];
        description = "Extension of Poseidon library for Postgis (Spatial and Geographic objects for PostgreSQL)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "positive" = callPackage
@@ -191881,8 +177849,6 @@ self: {
        librarySystemDepends = [ acl ];
        description = "Support for Posix ACL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) acl;};
 
   "posix-api" = callPackage
@@ -191903,8 +177869,6 @@ self: {
        ];
        description = "posix bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) systemd;};
 
   "posix-error-codes" = callPackage
@@ -191984,8 +177948,6 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "POSIX Realtime functionality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "posix-socket" = callPackage
@@ -192026,8 +177988,6 @@ self: {
        libraryHaskellDepends = [ base unix ];
        description = "Low-level wrapping of POSIX waitpid(2)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "posplyu" = callPackage
@@ -192089,8 +178049,6 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring HTTP ];
        description = "A library that gets postcode information from the uk-postcodes.com";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgres-embedded" = callPackage
@@ -192109,8 +178067,6 @@ self: {
        ];
        description = "Library for easily running embedded PostgreSQL server for tests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgres-options" = callPackage
@@ -192138,8 +178094,6 @@ self: {
        libraryHaskellDepends = [ base bytestring postgresql-simple text ];
        description = "Create a temporary database that is deleted after performing some operation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgres-websockets" = callPackage
@@ -192174,8 +178128,6 @@ self: {
        ];
        description = "Middleware to map LISTEN/NOTIFY messages to Websockets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgresql-binary" = callPackage
@@ -192283,8 +178235,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Format data to feed to a PostgreSQL COPY FROM statement";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgresql-cube" = callPackage
@@ -192356,8 +178306,6 @@ self: {
        testHaskellDepends = [ base generics-sop hspec postgresql-simple ];
        description = "Generic deserialization of PostgreSQL rows based on column names";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgresql-orm" = callPackage
@@ -192461,8 +178409,6 @@ self: {
        ];
        description = "Sql interpolating quasiquote plus some kind of primitive ORM using it";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgresql-schema" = callPackage
@@ -192534,8 +178480,6 @@ self: {
        ];
        description = "FFI-like bindings for PostgreSQL stored functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgresql-simple-interpolate" = callPackage
@@ -192593,8 +178537,6 @@ self: {
        ];
        description = "Implementation of named parameters for `postgresql-simple` library";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgresql-simple-opts" = callPackage
@@ -192618,8 +178560,6 @@ self: {
        ];
        description = "An optparse-applicative and envy parser for postgres options";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgresql-simple-queue" = callPackage
@@ -192645,8 +178585,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A PostgreSQL backed queue";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgresql-simple-sop" = callPackage
@@ -192658,8 +178596,6 @@ self: {
        libraryHaskellDepends = [ base generics-sop postgresql-simple ];
        description = "Generic functions for postgresql-simple";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgresql-simple-typed" = callPackage
@@ -192676,8 +178612,6 @@ self: {
        ];
        description = "Typed extension for PostgreSQL simple";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgresql-simple-url" = callPackage
@@ -192770,8 +178704,6 @@ self: {
        ];
        description = "postgresql-typed operations lifted to any instance of MonadBase or MonadBaseControl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgrest" = callPackage
@@ -192818,8 +178750,6 @@ self: {
        ];
        description = "REST API for any Postgres database";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postgrest-ws" = callPackage
@@ -192855,8 +178785,6 @@ self: {
        ];
        description = "PostgREST extension to map LISTEN/NOTIFY messages to Websockets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postie" = callPackage
@@ -192876,8 +178804,6 @@ self: {
        ];
        description = "SMTP server library to receive emails from within Haskell programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postmark" = callPackage
@@ -192896,8 +178822,6 @@ self: {
        ];
        description = "Library for postmarkapp.com HTTP Api";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postmark-streams" = callPackage
@@ -192914,8 +178838,6 @@ self: {
        ];
        description = "Send email via Postmark using io-streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "postmaster" = callPackage
@@ -192936,8 +178858,6 @@ self: {
        ];
        description = "Postmaster ESMTP Server";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "potato-tool" = callPackage
@@ -192951,8 +178871,6 @@ self: {
        executableHaskellDepends = [ base binary bytestring split ];
        description = "Command line Dreamcast VMU filesystem toolset";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "potoki" = callPackage
@@ -192964,8 +178882,6 @@ self: {
        libraryHaskellDepends = [ potoki-core ];
        description = "Simple streaming in IO";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "potoki-cereal" = callPackage
@@ -192988,8 +178904,6 @@ self: {
        ];
        description = "Streaming serialization";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "potoki-conduit" = callPackage
@@ -193012,8 +178926,6 @@ self: {
        ];
        description = "Integration of \"potoki\" and \"conduit\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "potoki-core" = callPackage
@@ -193041,8 +178953,6 @@ self: {
        benchmarkHaskellDepends = [ criterion rerebase ];
        description = "Low-level components of \"potoki\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "potoki-hasql" = callPackage
@@ -193058,8 +178968,6 @@ self: {
        ];
        description = "Integration of \"potoki\" and \"hasql\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "potoki-zlib" = callPackage
@@ -193073,8 +178981,6 @@ self: {
        ];
        description = "Streaming ZLib decompression";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "potrace" = callPackage
@@ -193129,8 +179035,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Tools for PowerPC programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "powerqueue" = callPackage
@@ -193144,8 +179048,6 @@ self: {
        testHaskellDepends = [ async base hspec stm ];
        description = "A flexible job queue with exchangeable backends";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "powerqueue-distributed" = callPackage
@@ -193164,8 +179066,6 @@ self: {
        testHaskellDepends = [ async base hspec powerqueue stm timespan ];
        description = "A distributed worker backend for powerqueu";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "powerqueue-levelmem" = callPackage
@@ -193192,8 +179092,6 @@ self: {
        benchmarkSystemDepends = [ leveldb snappy ];
        description = "A high performance in memory and LevelDB backend for powerqueue";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) leveldb; inherit (pkgs) snappy;};
 
   "powerqueue-sqs" = callPackage
@@ -193207,8 +179105,6 @@ self: {
        ];
        description = "A Amazon SQS backend for powerqueue";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ppm" = callPackage
@@ -193265,8 +179161,6 @@ self: {
        libraryHaskellDepends = [ base QuickCheck random stm ];
        description = "Parallel batch driver for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pqueue" = callPackage
@@ -193296,8 +179190,6 @@ self: {
        ];
        description = "Fully encapsulated monad transformers with queuelike functionality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "practice-room" = callPackage
@@ -193316,8 +179208,6 @@ self: {
        ];
        description = "Practice Room";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "praglude" = callPackage
@@ -193338,8 +179228,6 @@ self: {
        ];
        description = "A pragmatic Prelude";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pragmatic-show" = callPackage
@@ -193356,8 +179244,6 @@ self: {
        ];
        description = "Alternative Show class that gives shorter view if possible";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "preamble" = callPackage
@@ -193414,8 +179300,6 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Prelude replacement";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pred-set" = callPackage
@@ -193455,8 +179339,6 @@ self: {
        ];
        description = "Predicative tries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "predicate-class" = callPackage
@@ -193468,8 +179350,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Helper class for passing context along a predicate value";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "predicate-transformers" = callPackage
@@ -193510,8 +179390,6 @@ self: {
        ];
        description = "Predicates, Refinement types and Dsl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "predicates" = callPackage
@@ -193555,8 +179433,6 @@ self: {
        ];
        description = "Evaluate and display trees of predicates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prednote-test" = callPackage
@@ -193579,8 +179455,6 @@ self: {
        ];
        description = "Tests and QuickCheck generators to accompany prednote";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prefetch" = callPackage
@@ -193644,8 +179518,6 @@ self: {
        ];
        description = "A library for building a prefork-style server quickly";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pregame" = callPackage
@@ -193686,8 +179558,6 @@ self: {
        ];
        description = "A larger alternative to the Prelude";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prelude-compat" = callPackage
@@ -193732,8 +179602,6 @@ self: {
        libraryHaskellDepends = [ base comonad logict transformers ];
        description = "Another kind of alternate Prelude file";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prelude-plus" = callPackage
@@ -193747,8 +179615,6 @@ self: {
        libraryHaskellDepends = [ base utf8-string ];
        description = "Prelude for rest of us";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prelude-prime" = callPackage
@@ -193812,8 +179678,6 @@ self: {
        ];
        description = "Preprocess Haskell Repositories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "preprocessor" = callPackage
@@ -193834,8 +179698,6 @@ self: {
        ];
        description = "Remove cpp annotations to get the source ready for static analysis";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "preprocessor-tools" = callPackage
@@ -193861,8 +179723,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "A decision procedure for quantifier-free linear arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "present" = callPackage
@@ -193885,8 +179745,6 @@ self: {
        libraryHaskellDepends = [ base containers json mtl parsec ];
        description = "Text template library targeted at the web / HTML generation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "presto-hdbc" = callPackage
@@ -193906,8 +179764,6 @@ self: {
        ];
        description = "An HDBC connector for Presto";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prettify" = callPackage
@@ -193965,6 +179821,22 @@ self: {
        license = "GPL";
      }) {};
 
+  "pretty-diff" = callPackage
+    ({ mkDerivation, base, data-default, Diff, tasty, tasty-hunit
+     , tasty-test-reporter, text
+     }:
+     mkDerivation {
+       pname = "pretty-diff";
+       version = "0.2.0.0";
+       sha256 = "06jbgfy7skz8l5hjp82sqjr08dkx6pw89wsc4b2z7anxwq9nzab4";
+       libraryHaskellDepends = [ base data-default Diff text ];
+       testHaskellDepends = [
+         base data-default Diff tasty tasty-hunit tasty-test-reporter text
+       ];
+       description = "Pretty printing a diff of two values";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pretty-display" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, pretty-show, text }:
      mkDerivation {
@@ -194018,17 +179890,6 @@ self: {
      }) {};
 
   "pretty-hex" = callPackage
-    ({ mkDerivation, base, bytestring }:
-     mkDerivation {
-       pname = "pretty-hex";
-       version = "1.0";
-       sha256 = "0ylwkvvjvmpprha9nx83xb8gkhyanhk5fffc0r7lb96n4ch5z6pz";
-       libraryHaskellDepends = [ base bytestring ];
-       description = "A library for hex dumps of ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pretty-hex_1_1" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "pretty-hex";
@@ -194037,7 +179898,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "A library for hex dumps of ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pretty-loc" = callPackage
@@ -194060,8 +179920,6 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        description = "A implementation of multi-column layout w/ Text.PrettyPrint";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pretty-relative-time" = callPackage
@@ -194070,8 +179928,8 @@ self: {
      }:
      mkDerivation {
        pname = "pretty-relative-time";
-       version = "0.1.0.0";
-       sha256 = "01ijsjilsx79xdkchmxplcm2g6qh81fgxd36r6kwgrk446s0bq9c";
+       version = "0.2.0.0";
+       sha256 = "17w7bs0xj2bbjqc9qzcq40xsq5virdaqw57r0wfgfs6akj2i9r5d";
        libraryHaskellDepends = [ base time validity validity-time ];
        testHaskellDepends = [
          base genvalidity-hspec genvalidity-time hspec QuickCheck time
@@ -194079,31 +179937,9 @@ self: {
        ];
        description = "Pretty relative time";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pretty-show" = callPackage
-    ({ mkDerivation, array, base, filepath, ghc-prim, happy
-     , haskell-lexer, pretty, text
-     }:
-     mkDerivation {
-       pname = "pretty-show";
-       version = "1.9.5";
-       sha256 = "0gs2pabi4qa4b0r5vffpf9b1cf5n9y2939a3lljjw7cmg6xvx5dh";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array base filepath ghc-prim haskell-lexer pretty text
-       ];
-       libraryToolDepends = [ happy ];
-       executableHaskellDepends = [ base ];
-       description = "Tools for working with derived `Show` instances and generic inspection of values";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "pretty-show_1_10" = callPackage
     ({ mkDerivation, array, base, filepath, ghc-prim, happy
      , haskell-lexer, pretty, text
      }:
@@ -194121,7 +179957,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Tools for working with derived `Show` instances and generic inspection of values";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pretty-show-ansi-wl" = callPackage
@@ -194141,26 +179976,6 @@ self: {
      }) {};
 
   "pretty-simple" = callPackage
-    ({ mkDerivation, ansi-terminal, base, criterion, doctest, Glob, mtl
-     , text, transformers
-     }:
-     mkDerivation {
-       pname = "pretty-simple";
-       version = "2.2.0.1";
-       sha256 = "0wsi9235ihm15s145lxi7325vv2k4bhighc5m88kn1lk0pl81aqq";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-terminal base mtl text transformers
-       ];
-       testHaskellDepends = [ base doctest Glob ];
-       benchmarkHaskellDepends = [ base criterion text ];
-       description = "pretty printer for data types with a 'Show' instance";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ cdepillabout ];
-     }) {};
-
-  "pretty-simple_3_2_1_0" = callPackage
     ({ mkDerivation, ansi-terminal, base, Cabal, cabal-doctest
      , containers, criterion, doctest, Glob, mtl, QuickCheck
      , template-haskell, text, transformers
@@ -194181,7 +179996,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "pretty printer for data types with a 'Show' instance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ cdepillabout ];
      }) {};
 
@@ -194262,32 +180076,6 @@ self: {
      }) {};
 
   "prettyprinter" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
-     , criterion, deepseq, doctest, mtl, pgp-wordlist, QuickCheck
-     , random, tasty, tasty-hunit, tasty-quickcheck, text, transformers
-     }:
-     mkDerivation {
-       pname = "prettyprinter";
-       version = "1.2.1.1";
-       sha256 = "1p9c3q55hba4c0zyxc624g5df7wgsclpsmd8wqpdnmib882q9d1v";
-       revision = "1";
-       editedCabalFile = "0p3qvc1fr2ayxq5s7ysm80nl6107xfkv27p3mcripffq1lqvmlma";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base text ];
-       testHaskellDepends = [
-         base bytestring doctest pgp-wordlist QuickCheck tasty tasty-hunit
-         tasty-quickcheck text
-       ];
-       benchmarkHaskellDepends = [
-         ansi-wl-pprint base containers criterion deepseq mtl QuickCheck
-         random text transformers
-       ];
-       description = "A modern, easy to use, well-documented, extensible pretty-printer";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "prettyprinter_1_6_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, base-compat, bytestring
      , containers, deepseq, doctest, gauge, mtl, pgp-wordlist
      , QuickCheck, quickcheck-instances, random, tasty, tasty-hunit
@@ -194295,8 +180083,8 @@ self: {
      }:
      mkDerivation {
        pname = "prettyprinter";
-       version = "1.6.0";
-       sha256 = "1xgjymlv5kfiqk6i2p8qc406xn8xphis7hhsdzcw6lpqmyp8bapx";
+       version = "1.6.1";
+       sha256 = "10fphxh8lvdaw7i8jyllwmj87w02db92mf99zfw5vddp9mv6b5rz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base text ];
@@ -194310,7 +180098,6 @@ self: {
        ];
        description = "A modern, easy to use, well-documented, extensible pretty-printer";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prettyprinter-ansi-terminal" = callPackage
@@ -194397,8 +180184,6 @@ self: {
        libraryHaskellDepends = [ base graphviz prettyprinter text ];
        description = "a prettyprinter backend for graphviz";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prettyprinter-vty" = callPackage
@@ -194412,8 +180197,6 @@ self: {
        libraryHaskellDepends = [ base prettyprinter vty ];
        description = "prettyprinter backend for vty";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "preview" = callPackage
@@ -194429,8 +180212,6 @@ self: {
        ];
        description = "The method of previewing data (instead of wholly show-ing it)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prim-array" = callPackage
@@ -194444,8 +180225,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim primitive semigroups ];
        description = "Primitive byte array with type variable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prim-instances" = callPackage
@@ -194519,8 +180298,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion primes ];
        description = "Type-safe prime numbers";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "primesieve" = callPackage
@@ -194553,19 +180330,6 @@ self: {
      }) {};
 
   "primitive" = callPackage
-    ({ mkDerivation, base, ghc-prim, transformers }:
-     mkDerivation {
-       pname = "primitive";
-       version = "0.6.4.0";
-       sha256 = "0r0cda7acvplgwaxy69kviv4jp7kkfi038by68gj4yfx4iwszgjc";
-       revision = "1";
-       editedCabalFile = "18a14k1yiam1m4l29rin9a0y53yp3nxvkz358nysld8aqwy2qsjv";
-       libraryHaskellDepends = [ base ghc-prim transformers ];
-       description = "Primitive memory-related operations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "primitive_0_7_0_0" = callPackage
     ({ mkDerivation, base, base-orphans, ghc-prim, QuickCheck
      , semigroups, tagged, tasty, tasty-quickcheck, transformers
      , transformers-compat
@@ -194583,7 +180347,6 @@ self: {
        ];
        description = "Primitive memory-related operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "primitive-addr" = callPackage
@@ -194607,8 +180370,6 @@ self: {
        testHaskellDepends = [ base primitive primitive-unlifted ];
        description = "Wrappers for primops around atomic operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "primitive-checked" = callPackage
@@ -194620,8 +180381,6 @@ self: {
        libraryHaskellDepends = [ base primitive ];
        description = "primitive functions with bounds-checking";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "primitive-containers" = callPackage
@@ -194647,8 +180406,6 @@ self: {
        ];
        description = "containers backed by arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "primitive-convenience" = callPackage
@@ -194663,30 +180420,6 @@ self: {
      }) {};
 
   "primitive-extras" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus
-     , foldl, list-t, primitive, profunctors, QuickCheck
-     , quickcheck-instances, rerebase, tasty, tasty-hunit
-     , tasty-quickcheck, vector
-     }:
-     mkDerivation {
-       pname = "primitive-extras";
-       version = "0.7.1.1";
-       sha256 = "1hffgvqdrsxml2z834jb1mpywkflcnlymmxp9dmapwg8pcadjzdm";
-       revision = "1";
-       editedCabalFile = "10z7fnz907s7ar15lk3kq62p11bbsksdb0nmg5y7ii0n97mqni96";
-       libraryHaskellDepends = [
-         base bytestring cereal deferred-folds focus foldl list-t primitive
-         profunctors vector
-       ];
-       testHaskellDepends = [
-         cereal deferred-folds focus primitive QuickCheck
-         quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
-       ];
-       description = "Extras for the \"primitive\" library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "primitive-extras_0_8" = callPackage
     ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus
      , foldl, list-t, primitive, primitive-unlifted, profunctors
      , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit
@@ -194706,7 +180439,6 @@ self: {
        ];
        description = "Extras for the \"primitive\" library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "primitive-foreign" = callPackage
@@ -194730,8 +180462,6 @@ self: {
        libraryHaskellDepends = [ base primitive ];
        testHaskellDepends = [ base doctest QuickCheck ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "primitive-maybe" = callPackage
@@ -194774,8 +180504,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq random vector ];
        description = "SIMD data types and functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "primitive-sort" = callPackage
@@ -194797,8 +180525,6 @@ self: {
        benchmarkHaskellDepends = [ base gauge ghc-prim primitive random ];
        description = "Sort primitive arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "primitive-stablename" = callPackage
@@ -194834,8 +180560,6 @@ self: {
        testHaskellDepends = [ base primitive stm ];
        description = "Primitive GHC types with unlifted types inside";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "primula-board" = callPackage
@@ -194858,8 +180582,6 @@ self: {
        ];
        description = "ImageBoard on Happstack and HSP";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "primula-bot" = callPackage
@@ -194878,8 +180600,6 @@ self: {
        ];
        description = "Jabber-bot for primula-board ImageBoard";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pringletons" = callPackage
@@ -194896,8 +180616,6 @@ self: {
        ];
        description = "Classes and data structures complementing the singletons library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "print-console-colors" = callPackage
@@ -194923,8 +180641,6 @@ self: {
        libraryHaskellDepends = [ base split ];
        description = "Debug print formatting library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "printcess" = callPackage
@@ -194941,8 +180657,6 @@ self: {
        ];
        description = "Pretty printing with indentation, mixfix operators, and automatic line breaks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "printf-mauke" = callPackage
@@ -195008,8 +180722,6 @@ self: {
        libraryHaskellDepends = [ base containers queue reord stateref ];
        description = "Simple implementation of a priority queue";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "priority-sync" = callPackage
@@ -195113,8 +180825,6 @@ self: {
        ];
        description = "Easy and reasonably efficient probabilistic programming and random generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proc" = callPackage
@@ -195133,8 +180843,6 @@ self: {
        ];
        description = "Parse process information for Linux";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proc-net" = callPackage
@@ -195152,14 +180860,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "process_1_6_7_0" = callPackage
+  "process_1_6_8_0" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, directory, filepath
      , unix
      }:
      mkDerivation {
        pname = "process";
-       version = "1.6.7.0";
-       sha256 = "1qplrcdzdv8dhzh859f709facw7xc6kmfwhwmm26qks4arkih7j5";
+       version = "1.6.8.0";
+       sha256 = "07vl1j66xya4wqm3h42lpkhshpmz90b68r93i2766zhsnx0ryr5r";
        libraryHaskellDepends = [ base deepseq directory filepath unix ];
        testHaskellDepends = [ base bytestring directory ];
        description = "Process libraries";
@@ -195185,8 +180893,6 @@ self: {
        ];
        description = "Conduits for processes (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "process-extras" = callPackage
@@ -195222,8 +180928,6 @@ self: {
        ];
        description = "IterIO Process Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "process-leksah" = callPackage
@@ -195235,8 +180939,6 @@ self: {
        libraryHaskellDepends = [ base directory filepath unix ];
        description = "Process libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "process-listlike" = callPackage
@@ -195253,8 +180955,6 @@ self: {
        ];
        description = "Process extras";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "process-progress" = callPackage
@@ -195271,8 +180971,6 @@ self: {
        ];
        description = "Run a process and do reportsing on its progress";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "process-qq" = callPackage
@@ -195289,8 +180987,6 @@ self: {
        ];
        description = "Quasi-Quoters for exec process";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "process-streaming" = callPackage
@@ -195322,8 +181018,6 @@ self: {
        ];
        description = "Streaming interface to system processes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "processing" = callPackage
@@ -195342,8 +181036,6 @@ self: {
        ];
        description = "Web graphic applications with processing.js.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "processing-for-haskell" = callPackage
@@ -195398,8 +181090,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell values that cannot be evaluated immediately";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "procstat" = callPackage
@@ -195411,8 +181101,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "get information on processes in Linux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proctest" = callPackage
@@ -195448,8 +181136,6 @@ self: {
        ];
        description = "Simple streaming datatype";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "product" = callPackage
@@ -195458,11 +181144,11 @@ self: {
        pname = "product";
        version = "0.1.0.0";
        sha256 = "1dh1bf5mc2q6jb4srajn448fww5s8ixcwiswqp7pk9638sdh6dgk";
+       revision = "1";
+       editedCabalFile = "1464s441018jq75351jk9q16cjfmd4ifsjigd5rn0z0788l72sxh";
        libraryHaskellDepends = [ base category ];
        description = "Product category";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "product-isomorphic" = callPackage
@@ -195522,8 +181208,6 @@ self: {
        ];
        description = "Convert GHC profiles into GraphViz's dot format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prof2pretty" = callPackage
@@ -195542,8 +181226,6 @@ self: {
        ];
        description = "generate pretty source from time/allocation profiles";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "profiterole" = callPackage
@@ -195585,12 +181267,12 @@ self: {
      }) {};
 
   "profunctor-arrows" = callPackage
-    ({ mkDerivation, base, comonad, profunctors }:
+    ({ mkDerivation, base, comonad, lawz, profunctors }:
      mkDerivation {
        pname = "profunctor-arrows";
-       version = "0.0.0.2";
-       sha256 = "01ia949b45izrq6p8qvizz05kvy45qydwj5crdac9spad2asr1s3";
-       libraryHaskellDepends = [ base comonad profunctors ];
+       version = "0.0.0.3";
+       sha256 = "09hn8llfbwgj56mvwyiyk4n3myy0s4lixrzgi3sm4q1ypg4w0dz2";
+       libraryHaskellDepends = [ base comonad lawz profunctors ];
        description = "Profunctor arrows";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -195636,64 +181318,43 @@ self: {
 
   "profunctor-optics" = callPackage
     ({ mkDerivation, adjunctions, base, connections, containers
-     , distributive, doctest, hedgehog, ilist, keys, mtl
+     , distributive, doctest, hedgehog, ilist, keys, magmas, mtl
      , newtype-generics, profunctor-arrows, profunctors, rings
      , semigroupoids, tagged, transformers, unliftio-core
      }:
      mkDerivation {
        pname = "profunctor-optics";
-       version = "0.0.0.5";
-       sha256 = "0k6xvgk0w9hsdv4smj7915gqlqkabsswfcpnq1iid9bar1q8v8nh";
+       version = "0.0.1";
+       sha256 = "12f8v0bv6ra8smpjbcj8qlzm1fq4hzn1f2807f2jkcjz5s9a6wf5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         adjunctions base connections distributive keys mtl newtype-generics
-         profunctor-arrows profunctors rings semigroupoids tagged
-         transformers unliftio-core
+         adjunctions base connections distributive keys magmas mtl
+         newtype-generics profunctor-arrows profunctors rings semigroupoids
+         tagged transformers unliftio-core
        ];
        executableHaskellDepends = [
-         adjunctions base containers doctest ilist mtl
+         adjunctions base connections containers doctest ilist mtl
        ];
        testHaskellDepends = [ base connections hedgehog ];
        description = "An optics library compatible with the typeclasses in 'profunctors'";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "profunctors" = callPackage
-    ({ mkDerivation, base, base-orphans, bifunctors, comonad
-     , contravariant, distributive, semigroups, tagged, transformers
-     }:
-     mkDerivation {
-       pname = "profunctors";
-       version = "5.3";
-       sha256 = "1dx3nkc27yxsrbrhh3iwhq7dl1xn6bj7n62yx6nh8vmpbg62lqvl";
-       revision = "1";
-       editedCabalFile = "1ynskm55fynsli6lpz6v5py344yhf1mq5xz2b1p7arvf2xqrx4kv";
-       libraryHaskellDepends = [
-         base base-orphans bifunctors comonad contravariant distributive
-         semigroups tagged transformers
-       ];
-       description = "Profunctors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "profunctors_5_5_1" = callPackage
     ({ mkDerivation, base, base-orphans, bifunctors, comonad
      , contravariant, distributive, tagged, transformers
      }:
      mkDerivation {
        pname = "profunctors";
-       version = "5.5.1";
-       sha256 = "0nmiv7hhmimiwj4jnh5vd5n96bihpairq2rf6hrw11rignal2dqx";
+       version = "5.5.2";
+       sha256 = "0z5gk2ip4x2z0jad9lnsnq1q1i8bbgchw3bwgiy3gbmgp2m7j5az";
        libraryHaskellDepends = [
          base base-orphans bifunctors comonad contravariant distributive
          tagged transformers
        ];
        description = "Profunctors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "progress" = callPackage
@@ -195705,8 +181366,6 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "Simple progress tracking & projection library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "progress-meter" = callPackage
@@ -195718,8 +181377,6 @@ self: {
        libraryHaskellDepends = [ ansi-terminal async base stm ];
        description = "Live diagnostics for concurrent activity";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "progress-reporting" = callPackage
@@ -195746,8 +181403,6 @@ self: {
        libraryHaskellDepends = [ base io-reactive ];
        description = "Progressbar API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "progression" = callPackage
@@ -195764,8 +181419,6 @@ self: {
        ];
        description = "Automates the recording and graphing of criterion benchmarks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "progressive" = callPackage
@@ -195784,8 +181437,6 @@ self: {
        ];
        description = "Multilabel classification model which learns sequentially (online)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proj4-hs-bindings" = callPackage
@@ -195798,8 +181449,6 @@ self: {
        librarySystemDepends = [ proj ];
        description = "Haskell bindings for the Proj4 C dynamic library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) proj;};
 
   "project-m36" = callPackage
@@ -195871,8 +181520,6 @@ self: {
        ];
        description = "Relational Algebra Engine";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "project-template" = callPackage
@@ -195915,8 +181562,6 @@ self: {
        ];
        description = "Go to README.md";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "projection" = callPackage
@@ -195975,8 +181620,6 @@ self: {
        ];
        description = "A command line tool to visualize query resolution in Prolog";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prolog-graph-lib" = callPackage
@@ -195988,8 +181631,6 @@ self: {
        libraryHaskellDepends = [ base fgl graphviz mtl prolog text ];
        description = "Generating images of resolution trees for Prolog queries";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prologue" = callPackage
@@ -196085,8 +181726,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Instrument applications with metrics and publish/push to Prometheus";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prometheus-metrics-ghc" = callPackage
@@ -196130,8 +181769,6 @@ self: {
        libraryHaskellDepends = [ async base ];
        description = "A monadic interface for async";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "promises" = callPackage
@@ -196174,8 +181811,6 @@ self: {
        ];
        description = "A library for interfacing with the CMU Pronouncing Dictionary";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proof-combinators" = callPackage
@@ -196187,8 +181822,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Proof Combinators used in Liquid Haskell for Theorem Proving";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "propane" = callPackage
@@ -196204,8 +181837,17 @@ self: {
        ];
        description = "Functional synthesis of images and animations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+     }) {};
+
+  "propeller" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "propeller";
+       version = "0.1.0.0";
+       sha256 = "00v1j1mv5dl6vivkfqv9w9jvw1jh3085mpkax5x0cyndhqcw027x";
+       libraryHaskellDepends = [ base ];
+       description = "A Simple Propagator Library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "propellor" = callPackage
@@ -196239,8 +181881,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "check quickCheck properties in real time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "property" = callPackage
@@ -196271,8 +181911,6 @@ self: {
        ];
        description = "Apple property list parser";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proplang" = callPackage
@@ -196284,8 +181922,6 @@ self: {
        libraryHaskellDepends = [ base glade glib gtk ];
        description = "A library for functional GUI development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "props" = callPackage
@@ -196333,8 +181969,6 @@ self: {
        ];
        description = "Bindings to the Prosper marketplace API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proteaaudio" = callPackage
@@ -196389,8 +182023,6 @@ self: {
        ];
        description = "neovim project manager";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proto-lens_0_2_2_0" = callPackage
@@ -196412,29 +182044,6 @@ self: {
      }) {};
 
   "proto-lens" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim
-     , lens-family, parsec, pretty, primitive, profunctors, QuickCheck
-     , tagged, test-framework, test-framework-quickcheck2, text
-     , transformers, vector, void
-     }:
-     mkDerivation {
-       pname = "proto-lens";
-       version = "0.5.1.0";
-       sha256 = "1jv88j9spv3q679syq0fbpbq8xjggaww5644as31gmvihjfaxby1";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring containers deepseq ghc-prim lens-family parsec
-         pretty primitive profunctors tagged text transformers vector void
-       ];
-       testHaskellDepends = [
-         base bytestring QuickCheck test-framework
-         test-framework-quickcheck2 vector
-       ];
-       description = "A lens-based implementation of protocol buffers in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "proto-lens_0_6_0_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim
      , lens-family, parsec, pretty, primitive, profunctors, QuickCheck
      , tagged, tasty, tasty-quickcheck, text, transformers, vector
@@ -196453,7 +182062,6 @@ self: {
        ];
        description = "A lens-based implementation of protocol buffers in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proto-lens-arbitrary" = callPackage
@@ -196490,8 +182098,6 @@ self: {
        ];
        description = "Utilities functions to proto-lens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proto-lens-descriptors" = callPackage
@@ -196508,8 +182114,6 @@ self: {
        ];
        description = "Protocol buffers for describing the definitions of messages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proto-lens-jsonpb" = callPackage
@@ -196526,8 +182130,6 @@ self: {
        ];
        description = "JSON protobuf encoding for proto-lens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proto-lens-optparse" = callPackage
@@ -196562,23 +182164,6 @@ self: {
      }) {inherit (pkgs) protobuf;};
 
   "proto-lens-protobuf-types" = callPackage
-    ({ mkDerivation, base, Cabal, lens-family, proto-lens
-     , proto-lens-runtime, proto-lens-setup, protobuf, text
-     }:
-     mkDerivation {
-       pname = "proto-lens-protobuf-types";
-       version = "0.5.0.0";
-       sha256 = "1j37g1w6b7hph61x7hrvvs7sp5kzl24slmbnlyn8a7z04kbhgr90";
-       setupHaskellDepends = [ base Cabal proto-lens-setup ];
-       libraryHaskellDepends = [
-         base lens-family proto-lens proto-lens-runtime text
-       ];
-       libraryToolDepends = [ protobuf ];
-       description = "Basic protocol buffer message types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) protobuf;};
-
-  "proto-lens-protobuf-types_0_6_0_0" = callPackage
     ({ mkDerivation, base, Cabal, lens-family, proto-lens
      , proto-lens-protoc, proto-lens-runtime, proto-lens-setup, protobuf
      , text
@@ -196594,7 +182179,6 @@ self: {
        libraryToolDepends = [ proto-lens-protoc protobuf ];
        description = "Basic protocol buffer message types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) protobuf;};
 
   "proto-lens-protoc_0_2_2_3" = callPackage
@@ -196625,28 +182209,6 @@ self: {
      }) {inherit (pkgs) protobuf;};
 
   "proto-lens-protoc" = callPackage
-    ({ mkDerivation, base, bytestring, containers, filepath
-     , haskell-src-exts, lens-family, pretty, proto-lens, protobuf, text
-     }:
-     mkDerivation {
-       pname = "proto-lens-protoc";
-       version = "0.5.0.0";
-       sha256 = "0r6il4gvvcggxxbz2hq1kkw1qwk1rspqcb2j04ngd06pmvicw78n";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers filepath haskell-src-exts lens-family pretty
-         proto-lens text
-       ];
-       libraryToolDepends = [ protobuf ];
-       executableHaskellDepends = [
-         base bytestring containers lens-family proto-lens text
-       ];
-       description = "Protocol buffer compiler for the proto-lens library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) protobuf;};
-
-  "proto-lens-protoc_0_6_0_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, filepath, ghc
      , ghc-paths, ghc-source-gen, lens-family, pretty, proto-lens
      , proto-lens-runtime, protobuf, text
@@ -196665,26 +182227,9 @@ self: {
        ];
        description = "Protocol buffer compiler for the proto-lens library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) protobuf;};
 
   "proto-lens-runtime" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, filepath
-     , lens-family, proto-lens, text, vector
-     }:
-     mkDerivation {
-       pname = "proto-lens-runtime";
-       version = "0.5.0.0";
-       sha256 = "0hd1hcrirnj92nkd15l1m081wvxas62az3zijg1cr4lf93rg9hgc";
-       libraryHaskellDepends = [
-         base bytestring containers deepseq filepath lens-family proto-lens
-         text vector
-       ];
-       doHaddock = false;
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "proto-lens-runtime_0_6_0_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, filepath
      , lens-family, proto-lens, text, vector
      }:
@@ -196698,26 +182243,9 @@ self: {
        ];
        doHaddock = false;
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proto-lens-setup" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, deepseq
-     , directory, filepath, process, proto-lens-protoc, temporary, text
-     }:
-     mkDerivation {
-       pname = "proto-lens-setup";
-       version = "0.4.0.2";
-       sha256 = "1zqlkkzdg9myfy2myv0y19zmsjsvcd5rcimf6f48gnijl3001i8v";
-       libraryHaskellDepends = [
-         base bytestring Cabal containers deepseq directory filepath process
-         proto-lens-protoc temporary text
-       ];
-       description = "Cabal support for codegen with proto-lens";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "proto-lens-setup_0_4_0_3" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, deepseq
      , directory, filepath, process, proto-lens-protoc, temporary, text
      }:
@@ -196731,7 +182259,6 @@ self: {
        ];
        description = "Cabal support for codegen with proto-lens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proto3-suite" = callPackage
@@ -196773,8 +182300,6 @@ self: {
        ];
        description = "A low level library for writing out data in the Protocol Buffers wire format";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proto3-wire" = callPackage
@@ -196807,8 +182332,8 @@ self: {
      }:
      mkDerivation {
        pname = "protobuf";
-       version = "0.2.1.2";
-       sha256 = "1php9pydbh2jyr5x6h1i218w8kqwys5aniz2zm1hapv6ia8p3j5k";
+       version = "0.2.1.3";
+       sha256 = "1x99rf8hl5kcldj9fj6z22fxffv3wic5k6wmipnrayp9jj6zzyx9";
        libraryHaskellDepends = [
          base base-orphans bytestring cereal data-binary-ieee754 deepseq mtl
          text unordered-containers
@@ -196842,8 +182367,6 @@ self: {
        ];
        description = "Protocol Buffers via C++";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "protobuf-simple" = callPackage
@@ -196916,8 +182439,6 @@ self: {
        ];
        description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "protocol-buffers-fork" = callPackage
@@ -196934,8 +182455,6 @@ self: {
        ];
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "protocol-radius" = callPackage
@@ -196972,23 +182491,6 @@ self: {
      }) {};
 
   "protolude" = callPackage
-    ({ mkDerivation, array, async, base, bytestring, containers
-     , deepseq, ghc-prim, hashable, mtl, mtl-compat, stm, text
-     , transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "protolude";
-       version = "0.2.3";
-       sha256 = "0zzkyxz0vmcbncpid7gp72fpjj0fla3gqhlfkij5c5lg12skjgfj";
-       libraryHaskellDepends = [
-         array async base bytestring containers deepseq ghc-prim hashable
-         mtl mtl-compat stm text transformers transformers-compat
-       ];
-       description = "A small prelude";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "protolude_0_2_4" = callPackage
     ({ mkDerivation, array, async, base, bytestring, containers
      , deepseq, ghc-prim, hashable, mtl, mtl-compat, stm, text
      , transformers, transformers-compat
@@ -197003,7 +182505,6 @@ self: {
        ];
        description = "A small prelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protolude-lifted" = callPackage
@@ -197018,8 +182519,6 @@ self: {
        ];
        description = "Protolude with lifted-base and lifted-async";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proton-haskell" = callPackage
@@ -197038,8 +182537,6 @@ self: {
        ];
        description = "Simple XML templating library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prototype" = callPackage
@@ -197051,8 +182548,6 @@ self: {
        libraryHaskellDepends = [ base monads-tf ];
        description = "prototype-based programming on Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "prove-everywhere-server" = callPackage
@@ -197073,8 +182568,6 @@ self: {
        ];
        description = "The server for ProveEverywhere";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "provenience" = callPackage
@@ -197126,8 +182619,6 @@ self: {
        libraryHaskellDepends = [ base tagged ];
        description = "A library for kind-polymorphic manipulation and inspection of Proxy values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "proxy-mapping" = callPackage
@@ -197139,8 +182630,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Mapping of Proxy Types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "psc-ide" = callPackage
@@ -197170,8 +182659,6 @@ self: {
        ];
        description = "Language support for the PureScript programming language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pseudo-boolean" = callPackage
@@ -197207,8 +182694,6 @@ self: {
        libraryHaskellDepends = [ base semigroups ];
        description = "A tagged rose-tree with short circuited unique leaves";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pseudomacros" = callPackage
@@ -197299,18 +182784,16 @@ self: {
      }) {};
 
   "ptr" = callPackage
-    ({ mkDerivation, base, base-prelude, bug, bytestring, contravariant
-     , mtl, profunctors, QuickCheck, quickcheck-instances, rerebase
-     , semigroups, tasty, tasty-hunit, tasty-quickcheck, text, time
-     , transformers, vector
+    ({ mkDerivation, base, bytestring, contravariant, profunctors
+     , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit
+     , tasty-quickcheck, text, time, vector
      }:
      mkDerivation {
        pname = "ptr";
-       version = "0.16.6.1";
-       sha256 = "0d0ghvg2wx4z5bha33wb868wja28iafh3z5g5vsyy729nj7fp69k";
+       version = "0.16.7";
+       sha256 = "1mnwx657mcg0c0hg71z6kglxckjxc7xsypy00m7lsj37l6bpfnjr";
        libraryHaskellDepends = [
-         base base-prelude bug bytestring contravariant mtl profunctors
-         semigroups text time transformers vector
+         base bytestring contravariant profunctors text time vector
        ];
        testHaskellDepends = [
          QuickCheck quickcheck-instances rerebase tasty tasty-hunit
@@ -197318,8 +182801,6 @@ self: {
        ];
        description = "Abstractions for operations on pointers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pub" = callPackage
@@ -197389,8 +182870,6 @@ self: {
        testHaskellDepends = [ base cereal HUnit publicsuffixlist ];
        description = "Create the publicsuffixlist package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "publish" = callPackage
@@ -197417,8 +182896,6 @@ self: {
        ];
        description = "Publishing tools for papers, books, and presentations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pubnub" = callPackage
@@ -197451,8 +182928,6 @@ self: {
        ];
        description = "PubNub Haskell SDK";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pubsub" = callPackage
@@ -197471,8 +182946,6 @@ self: {
        executableHaskellDepends = [ fastcgi ];
        description = "A library for Google/SixApart pubsub hub interaction";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "puffytools" = callPackage
@@ -197502,8 +182975,6 @@ self: {
        ];
        description = "A CLI assistant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pugixml" = callPackage
@@ -197520,8 +182991,6 @@ self: {
        testHaskellDepends = [ base bytestring tasty tasty-hunit ];
        description = "pugixml binding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pugs-DrIFT" = callPackage
@@ -197545,8 +183014,6 @@ self: {
        ];
        description = "DrIFT with pugs-specific rules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pugs-HsSyck" = callPackage
@@ -197579,8 +183046,6 @@ self: {
        ];
        description = "Portable Haskell/POSIX layer for Pugs";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pugs-hsregex" = callPackage
@@ -197592,8 +183057,6 @@ self: {
        libraryHaskellDepends = [ array base haskell98 ];
        description = "Haskell PCRE binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pulse" = callPackage
@@ -197649,8 +183112,6 @@ self: {
        ];
        description = "Multilingual unsupervised sentence tokenization with Punkt";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "punycode" = callPackage
@@ -197685,8 +183146,6 @@ self: {
        ];
        description = "A program that displays the puppet resources associated to a node given .pp files.";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pure-cdb" = callPackage
@@ -197705,8 +183164,6 @@ self: {
        ];
        description = "Another pure-haskell CDB (Constant Database) implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pure-fft" = callPackage
@@ -197731,8 +183188,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl safe ];
        description = "Pure IO monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pure-priority-queue" = callPackage
@@ -197744,8 +183199,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A pure priority queue";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pure-priority-queue-tests" = callPackage
@@ -197764,8 +183217,6 @@ self: {
        ];
        description = "Tests for the pure-priority-queue package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pure-shuffle" = callPackage
@@ -197852,8 +183303,6 @@ self: {
        ];
        description = "types and parser for email messages (including MIME)";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "purescheme-wai-routing-core" = callPackage
@@ -198010,8 +183459,6 @@ self: {
        ];
        description = "Isomorphic trivial data type definitions over JSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "purescript-tsd-gen" = callPackage
@@ -198034,8 +183481,6 @@ self: {
        ];
        description = "TypeScript Declaration File (.d.ts) generator for PureScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pursuit-client" = callPackage
@@ -198094,8 +183539,6 @@ self: {
        ];
        description = "A server-side library for sending push notifications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "push-notify-apn" = callPackage
@@ -198121,8 +183564,6 @@ self: {
        testHaskellDepends = [ aeson base hspec ];
        description = "Send push notifications to mobile iOS devices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "push-notify-ccs" = callPackage
@@ -198142,8 +183583,6 @@ self: {
        ];
        description = "A server-side library for sending/receiving push notifications through CCS (Google Cloud Messaging)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "push-notify-general" = callPackage
@@ -198162,8 +183601,6 @@ self: {
        ];
        description = "A general library for sending/receiving push notif. through dif. services.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pushbullet" = callPackage
@@ -198212,8 +183649,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "A Pusher.com client written in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pusher-http-haskell" = callPackage
@@ -198257,8 +183692,6 @@ self: {
        ];
        description = "Implementation of the Pusher WebSocket protocol";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pushme" = callPackage
@@ -198284,8 +183717,6 @@ self: {
        ];
        description = "Tool to synchronize directories with rsync, zfs or git-annex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pushover" = callPackage
@@ -198322,8 +183753,6 @@ self: {
        ];
        description = "Put-based lens library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "puzzle-draw" = callPackage
@@ -198355,8 +183784,6 @@ self: {
        ];
        description = "Creating graphics for pencil puzzles";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "puzzle-draw-cmdline" = callPackage
@@ -198375,8 +183802,6 @@ self: {
        ];
        description = "Creating graphics for pencil puzzles, command line tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pvd" = callPackage
@@ -198396,8 +183821,6 @@ self: {
        executableSystemDepends = [ libdevil ];
        description = "A photo viewer daemon application with remote controlling abilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libdevil;};
 
   "pvss" = callPackage
@@ -198502,8 +183925,6 @@ self: {
        libraryPkgconfigDepends = [ python ];
        description = "Call python inline from haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) python;};
 
   "pyfi" = callPackage
@@ -198520,8 +183941,6 @@ self: {
        libraryPkgconfigDepends = [ python ];
        description = "Call python inline from haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) python;};
 
   "python-pickle" = callPackage
@@ -198545,8 +183964,6 @@ self: {
        ];
        description = "Serialization/deserialization using Python Pickle format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "q4c12-twofinger" = callPackage
@@ -198565,8 +183982,6 @@ self: {
        ];
        description = "Efficient alternating finger trees";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "qc-oi-testgenerator" = callPackage
@@ -198580,8 +183995,6 @@ self: {
        ];
        description = "Compile time generation of operation invariance tests for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "qchas" = callPackage
@@ -198610,8 +184023,6 @@ self: {
        librarySystemDepends = [ qd ];
        description = "double-double and quad-double number type via libqd";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {qd = null;};
 
   "qd-vec" = callPackage
@@ -198623,8 +184034,6 @@ self: {
        libraryHaskellDepends = [ base qd Vec ];
        description = "'Vec' instances for 'qd' types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "qed" = callPackage
@@ -198643,8 +184052,6 @@ self: {
        testHaskellDepends = [ base transformers ];
        description = "Simple prover";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "qhull-simple" = callPackage
@@ -198657,8 +184064,6 @@ self: {
        librarySystemDepends = [ qhull ];
        description = "Simple bindings to Qhull, a library for computing convex hulls";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) qhull;};
 
   "qif" = callPackage
@@ -198678,8 +184083,6 @@ self: {
        ];
        description = "A simple QIF file format parser / printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "qm-interpolated-string" = callPackage
@@ -198760,8 +184163,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Library to generate images";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) qrencode;};
 
   "qr-repa" = callPackage
@@ -198781,8 +184182,6 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Library to generate QR codes from bytestrings and objects and scale image files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "qrcode" = callPackage
@@ -198871,8 +184270,6 @@ self: {
        librarySystemDepends = [ qtbase ];
        description = "Qt bindings for Haskell - C++ library";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs.qt5) qtbase;};
 
   "qtah-examples" = callPackage
@@ -198890,8 +184287,6 @@ self: {
        ];
        description = "Example programs for Qtah Qt bindings";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "qtah-generator" = callPackage
@@ -198914,8 +184309,6 @@ self: {
        doHaddock = false;
        description = "Generator for Qtah Qt bindings";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "qtah-qt5" = callPackage
@@ -198935,8 +184328,6 @@ self: {
        testHaskellDepends = [ base hoppy-runtime HUnit ];
        description = "Qt bindings for Haskell";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs.qt5) qtbase;};
 
   "quack" = callPackage
@@ -199004,8 +184395,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Quant finance library in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quantification" = callPackage
@@ -199053,8 +184442,6 @@ self: {
        libraryHaskellDepends = [ base MonadRandom mtl QuickCheck random ];
        description = "An embedding of quantum computation as a Haskell arrow";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quantum-random" = callPackage
@@ -199077,8 +184464,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Retrieve, store and manage real quantum random data";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "qudb" = callPackage
@@ -199097,8 +184482,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Quite Useless DB";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quenya-verb" = callPackage
@@ -199121,8 +184504,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Quenya verb conjugator";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "queryparser" = callPackage
@@ -199142,8 +184523,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Analysis and parsing library for SQL queries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "queryparser-demo" = callPackage
@@ -199160,8 +184539,6 @@ self: {
        ];
        description = "Demo package containing queryparser examples";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "queryparser-hive" = callPackage
@@ -199181,8 +184558,6 @@ self: {
        ];
        description = "Parsing for Hive SQL queries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "queryparser-presto" = callPackage
@@ -199202,8 +184577,6 @@ self: {
        ];
        description = "Parsing for Presto SQL queries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "queryparser-vertica" = callPackage
@@ -199223,8 +184596,6 @@ self: {
        ];
        description = "Parsing for Vertica SQL queries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "querystring-pickle" = callPackage
@@ -199258,8 +184629,6 @@ self: {
        ];
        description = "A package for prompting values from the command-line";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "queue" = callPackage
@@ -199282,8 +184651,6 @@ self: {
        libraryHaskellDepends = [ array base containers mtl stateful-mtl ];
        description = "A library of queuelike data structures, both functional and stateful";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quick-generator" = callPackage
@@ -199314,8 +184681,6 @@ self: {
        ];
        description = "Slimmed down json schema language and validator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickbench" = callPackage
@@ -199354,8 +184719,6 @@ self: {
        ];
        description = "QuickBooks API binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-arbitrary-adt" = callPackage
@@ -199404,30 +184767,6 @@ self: {
      }) {};
 
   "quickcheck-classes" = callPackage
-    ({ mkDerivation, aeson, base, base-orphans, bifunctors, containers
-     , fail, primitive, QuickCheck, semigroupoids, semigroups, semirings
-     , tagged, tasty, tasty-quickcheck, transformers, vector
-     }:
-     mkDerivation {
-       pname = "quickcheck-classes";
-       version = "0.6.1.0";
-       sha256 = "01mqsffks1d0wf3vwrlmalqxqha2gfqa389gqq0zr5b9y7ka5a8h";
-       revision = "2";
-       editedCabalFile = "0jfi8vjnyybby8mcg4qqmb1cjijmfcvaybf0lqwzs0bazjf0rqq9";
-       libraryHaskellDepends = [
-         aeson base base-orphans bifunctors containers fail primitive
-         QuickCheck semigroupoids semigroups semirings tagged transformers
-         vector
-       ];
-       testHaskellDepends = [
-         aeson base base-orphans containers primitive QuickCheck
-         semigroupoids tagged tasty tasty-quickcheck transformers vector
-       ];
-       description = "QuickCheck common typeclasses";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "quickcheck-classes_0_6_4_0" = callPackage
     ({ mkDerivation, aeson, base, base-orphans, bifunctors, containers
      , contravariant, fail, primitive, primitive-addr, QuickCheck
      , quickcheck-classes-base, semigroupoids, semigroups, semirings
@@ -199448,7 +184787,6 @@ self: {
        ];
        description = "QuickCheck common typeclasses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-classes-base" = callPackage
@@ -199475,8 +184813,6 @@ self: {
        sha256 = "0qdjls949kmcv8wj3a27p4dz8nb1dq4i99zizkw7qyqn47r9ccxd";
        libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-enum-instances" = callPackage
@@ -199542,8 +184878,6 @@ self: {
        ];
        description = "Automating QuickCheck for polymorphic and overlaoded properties";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-properties" = callPackage
@@ -199566,8 +184900,6 @@ self: {
        libraryHaskellDepends = [ base mtl QuickCheck ];
        description = "Combinators for Quickcheck Property construction and diagnostics";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-property-monad" = callPackage
@@ -199579,8 +184911,6 @@ self: {
        libraryHaskellDepends = [ base either QuickCheck transformers ];
        description = "A monad for generating QuickCheck properties without Arbitrary instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-regex" = callPackage
@@ -199596,8 +184926,6 @@ self: {
        ];
        description = "Generate regex-constrained strings for QuickCheck";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-relaxng" = callPackage
@@ -199613,8 +184941,6 @@ self: {
        ];
        description = "Generate RelaxNG-constrained XML documents for QuickCheck";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-rematch" = callPackage
@@ -199627,8 +184953,6 @@ self: {
        testHaskellDepends = [ base hspec HUnit QuickCheck rematch ];
        description = "QuickCheck support for rematch";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-report" = callPackage
@@ -199644,8 +184968,6 @@ self: {
        ];
        description = "Customizable reports for quickcheck properties";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-script" = callPackage
@@ -199714,8 +185036,6 @@ self: {
        ];
        description = "Test monadic programs using state machine based models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-state-machine-distributed" = callPackage
@@ -199739,8 +185059,6 @@ self: {
        ];
        description = "Test monadic programs using state machine based models";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-string-random" = callPackage
@@ -199757,8 +185075,6 @@ self: {
        ];
        description = "Helper to build generators with Text.StringRandom";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-text" = callPackage
@@ -199804,8 +185120,6 @@ self: {
        libraryHaskellDepends = [ base QuickCheck transformers webdriver ];
        description = "Utilities for using WebDriver with QuickCheck";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickcheck-with-counterexamples" = callPackage
@@ -199849,8 +185163,6 @@ self: {
        testHaskellDepends = [ base directory filepath QuickCheck ];
        description = "Generate Main module with QuickCheck tests";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickselect" = callPackage
@@ -199876,8 +185188,6 @@ self: {
        libraryHaskellDepends = [ base vector vector-algorithms ];
        description = "Very fast and memory-compact query-only set and map structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickson" = callPackage
@@ -199900,6 +185210,8 @@ self: {
        pname = "quickspec";
        version = "2.1.2";
        sha256 = "0igqwa195qgps5vla2a4f83rq4vdq739i94kbzzmbnniylx9wgdw";
+       revision = "1";
+       editedCabalFile = "0r1jmxcm08mhfxz6gggnnpgcwm4zd3zm76p5lj37h04cvq6kyaa5";
        libraryHaskellDepends = [
          base constraints containers data-lens-light dlist QuickCheck
          quickcheck-instances random spoon template-haskell transformers
@@ -199940,8 +185252,6 @@ self: {
        ];
        description = "A reflective batch tester for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quickwebapp" = callPackage
@@ -199960,8 +185270,6 @@ self: {
        ];
        description = "A quick webapp generator for any file processing tool";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quiet" = callPackage
@@ -199990,8 +185298,6 @@ self: {
        doHaddock = false;
        description = "Meta-package for Quipper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quipper-algorithms" = callPackage
@@ -200030,8 +185336,6 @@ self: {
        doHaddock = false;
        description = "Meta-package for Quipper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quipper-cabal" = callPackage
@@ -200058,8 +185362,6 @@ self: {
        ];
        description = "An embedded, scalable functional programming language for quantum computing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quipper-demos" = callPackage
@@ -200138,8 +185440,6 @@ self: {
        ];
        description = "An embedded, scalable functional programming language for quantum computing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quipper-tools" = callPackage
@@ -200204,8 +185504,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck quiver transformers ];
        description = "Binary serialisation support for Quivers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quiver-bytestring" = callPackage
@@ -200254,8 +185552,6 @@ self: {
        libraryHaskellDepends = [ base enumerator quiver ];
        description = "Bridge between Quiver and Iteratee paradigms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quiver-groups" = callPackage
@@ -200268,8 +185564,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck quiver ];
        description = "Group and chunk values within a Quiver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quiver-http" = callPackage
@@ -200287,8 +185581,6 @@ self: {
        ];
        description = "Adapter to stream over HTTP(s) with quiver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quiver-instances" = callPackage
@@ -200304,8 +185596,6 @@ self: {
        ];
        description = "Extra instances for Quiver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quiver-interleave" = callPackage
@@ -200318,8 +185608,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck quiver ];
        description = "Interleave values from multiple Quivers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quiver-sort" = callPackage
@@ -200343,8 +185631,6 @@ self: {
        ];
        description = "Sort the values in a quiver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quokka" = callPackage
@@ -200363,8 +185649,6 @@ self: {
        ];
        description = "Test helpers which help generate data for projects that use postgresql";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "quoridor-hs" = callPackage
@@ -200389,8 +185673,6 @@ self: {
        testHaskellDepends = [ base HUnit mtl ];
        description = "A Quoridor implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "qux" = callPackage
@@ -200409,8 +185691,6 @@ self: {
        ];
        description = "Command line binary for working with the Qux language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "r3x-haskell-sdk" = callPackage
@@ -200491,8 +185771,6 @@ self: {
        libraryHaskellDepends = [ array base containers data-reify ];
        description = "Reverse Automatic Differentiation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "radian" = callPackage
@@ -200523,8 +185801,6 @@ self: {
        ];
        description = "Chemistry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "radium-formula-parser" = callPackage
@@ -200540,8 +185816,6 @@ self: {
        ];
        description = "Chemistry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "radius" = callPackage
@@ -200570,8 +185844,6 @@ self: {
        executableHaskellDepends = [ base filepath ];
        description = "Command-line tool for emitting numbers in various bases";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "radix-tree" = callPackage
@@ -200617,8 +185889,6 @@ self: {
          attoparsec base criterion deepseq QuasiText text vector
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rados-haskell" = callPackage
@@ -200642,8 +185912,6 @@ self: {
        ];
        description = "librados haskell bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {rados = null;};
 
   "raft" = callPackage
@@ -200662,8 +185930,6 @@ self: {
        ];
        description = "Miscellaneous Haskell utilities for data structures and data manipulation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rail-compiler-editor" = callPackage
@@ -200686,8 +185952,6 @@ self: {
        testHaskellDepends = [ base containers HUnit process ];
        description = "Compiler and editor for the esolang rail";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rails-session" = callPackage
@@ -200711,29 +185975,9 @@ self: {
        ];
        description = "Decrypt Ruby on Rails sessions in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rainbow" = callPackage
-    ({ mkDerivation, base, bytestring, lens-simple, process, QuickCheck
-     , text
-     }:
-     mkDerivation {
-       pname = "rainbow";
-       version = "0.30.0.2";
-       sha256 = "1isy1xfgsp25x0254gmqkakc185g87wil3n19w5s1rn3bfq1w0my";
-       libraryHaskellDepends = [
-         base bytestring lens-simple process text
-       ];
-       testHaskellDepends = [
-         base bytestring lens-simple process QuickCheck text
-       ];
-       description = "Print text to terminal with colors and effects";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rainbow_0_34_2_2" = callPackage
     ({ mkDerivation, base, bytestring, lens, QuickCheck, terminfo, text
      }:
      mkDerivation {
@@ -200746,7 +185990,6 @@ self: {
        ];
        description = "Print text to terminal with colors and effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rainbow-tests" = callPackage
@@ -200762,30 +186005,9 @@ self: {
        ];
        description = "Tests and QuickCheck generators to accompany rainbow";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rainbox" = callPackage
-    ({ mkDerivation, base, bytestring, containers, lens-simple
-     , QuickCheck, rainbow, tasty, tasty-quickcheck, text
-     }:
-     mkDerivation {
-       pname = "rainbox";
-       version = "0.20.0.0";
-       sha256 = "07xn8n2wyy7gfc7x725pa9p38m0bapbbk6zcbh31zd67zg962zwk";
-       libraryHaskellDepends = [
-         base bytestring containers lens-simple rainbow text
-       ];
-       testHaskellDepends = [
-         base bytestring containers lens-simple QuickCheck rainbow tasty
-         tasty-quickcheck text
-       ];
-       description = "Two-dimensional box pretty printing, with colors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rainbox_0_24_4_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, lens, QuickCheck
      , rainbow, tasty, tasty-quickcheck, text
      }:
@@ -200802,7 +186024,6 @@ self: {
        ];
        description = "Two-dimensional box pretty printing, with colors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rake" = callPackage
@@ -200844,8 +186065,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "distributed-process node";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rakhana" = callPackage
@@ -200862,8 +186081,6 @@ self: {
        ];
        description = "Stream based PDF library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rakuten" = callPackage
@@ -200888,8 +186105,6 @@ self: {
        ];
        description = "The Rakuten API in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ral" = callPackage
@@ -200944,8 +186159,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Random access list with a list compatible interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rallod" = callPackage
@@ -200958,8 +186171,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "'$' in reverse";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "raml" = callPackage
@@ -200975,8 +186186,6 @@ self: {
        ];
        description = "RESTful API Modeling Language (RAML) library for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ramus" = callPackage
@@ -201002,8 +186211,6 @@ self: {
        libraryHaskellDepends = [ array base IntervalMap mtl random ];
        description = "Random variable library, with Functor, Applicative and Monad instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "randfile" = callPackage
@@ -201022,8 +186229,6 @@ self: {
        ];
        description = "Program for picking a random file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rando" = callPackage
@@ -201038,8 +186243,6 @@ self: {
        ];
        description = "Easy-to-use randomness for livecoding";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "random" = callPackage
@@ -201087,8 +186290,6 @@ self: {
        libraryHaskellDepends = [ array base containers ];
        description = "Random-access lists in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "random-bytestring" = callPackage
@@ -201114,6 +186315,8 @@ self: {
        pname = "random-class";
        version = "0.2.0.2";
        sha256 = "11nda6dgi0f3b3bzy2wahdsadf382c06xrz1dx2gnq89ym7k7qbp";
+       revision = "1";
+       editedCabalFile = "125p09srh4kxj5bnjsl3i2jn4q09ci3kbyb96pb9kmzz1jn4i0rz";
        libraryHaskellDepends = [ base primitive transformers util ];
        description = "Class of random value generation";
        license = stdenv.lib.licenses.bsd3;
@@ -201128,8 +186331,6 @@ self: {
        libraryHaskellDepends = [ base random template-haskell ];
        description = "A Template Haskell helper for deriving Random instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "random-eff" = callPackage
@@ -201141,8 +186342,6 @@ self: {
        libraryHaskellDepends = [ base extensible-effects random ];
        description = "A simple random generator library for extensible-effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "random-effin" = callPackage
@@ -201154,8 +186353,6 @@ self: {
        libraryHaskellDepends = [ base effin random ];
        description = "A simple random generator library for effin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "random-extras" = callPackage
@@ -201216,8 +186413,6 @@ self: {
        ];
        description = "Random variate generation from hypergeometric distributions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "random-names" = callPackage
@@ -201268,8 +186463,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring random ];
        description = "An infinite stream of random data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "random-string" = callPackage
@@ -201382,23 +186575,6 @@ self: {
      }) {};
 
   "range" = callPackage
-    ({ mkDerivation, base, Cabal, free, parsec, QuickCheck, random
-     , test-framework, test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "range";
-       version = "0.2.1.1";
-       sha256 = "13gfhzplk2ji1d8x4944lv4dy4qg69wjvdwkica407nm10j0lxmc";
-       libraryHaskellDepends = [ base free parsec ];
-       testHaskellDepends = [
-         base Cabal free QuickCheck random test-framework
-         test-framework-quickcheck2
-       ];
-       description = "An efficient and versatile range library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "range_0_3_0_2" = callPackage
     ({ mkDerivation, base, Cabal, free, parsec, QuickCheck, random
      , test-framework, test-framework-quickcheck2
      }:
@@ -201413,7 +186589,6 @@ self: {
        ];
        description = "An efficient and versatile range library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "range-set-list" = callPackage
@@ -201450,8 +186625,6 @@ self: {
        ];
        description = "A Range type with vector-space instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rangemin" = callPackage
@@ -201463,8 +186636,6 @@ self: {
        libraryHaskellDepends = [ base containers primitive vector ];
        description = "Linear range-min algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ranges" = callPackage
@@ -201512,8 +186683,6 @@ self: {
        ];
        description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rank2classes" = callPackage
@@ -201565,8 +186734,6 @@ self: {
        ];
        description = "External terminal support for rapid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rasa" = callPackage
@@ -201591,8 +186758,6 @@ self: {
        ];
        description = "A modular text editor";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rasa-example-config" = callPackage
@@ -201612,8 +186777,6 @@ self: {
        ];
        description = "Example user config for Rasa";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rasa-ext-bufs" = callPackage
@@ -201628,8 +186791,6 @@ self: {
        ];
        description = "Rasa Ext for useful buffer utilities";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rasa-ext-cmd" = callPackage
@@ -201644,8 +186805,6 @@ self: {
        ];
        description = "Rasa Ext for running commands";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rasa-ext-cursors" = callPackage
@@ -201661,8 +186820,6 @@ self: {
        ];
        description = "Rasa Ext adding cursor(s)";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rasa-ext-files" = callPackage
@@ -201679,8 +186836,6 @@ self: {
        ];
        description = "Rasa Ext for filesystem actions";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rasa-ext-logger" = callPackage
@@ -201692,8 +186847,6 @@ self: {
        libraryHaskellDepends = [ base lens mtl rasa ];
        description = "Rasa Ext for logging state/actions";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rasa-ext-slate" = callPackage
@@ -201710,8 +186863,6 @@ self: {
        ];
        description = "Rasa extension for rendering to terminal with vty";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rasa-ext-status-bar" = callPackage
@@ -201723,8 +186874,6 @@ self: {
        libraryHaskellDepends = [ base data-default lens rasa yi-rope ];
        description = "Rasa Ext for populating status-bar";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rasa-ext-style" = callPackage
@@ -201736,8 +186885,6 @@ self: {
        libraryHaskellDepends = [ base data-default lens rasa ];
        description = "Rasa Ext managing rendering styles";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rasa-ext-views" = callPackage
@@ -201754,8 +186901,6 @@ self: {
        ];
        description = "Rasa Ext managing rendering views";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rasa-ext-vim" = callPackage
@@ -201774,8 +186919,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Rasa Ext for vim bindings";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rascal" = callPackage
@@ -201804,8 +186947,6 @@ self: {
        ];
        description = "A command-line client for Reddit";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rasterific-svg" = callPackage
@@ -201946,8 +187087,6 @@ self: {
        ];
        description = "finite or repeating lists";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rattle" = callPackage
@@ -201968,8 +187107,6 @@ self: {
        testHaskellDepends = [ base directory extra filepattern shake ];
        description = "Forward build system, with caching and speculation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rattletrap" = callPackage
@@ -202001,8 +187138,6 @@ self: {
        ];
        description = "Parse and generate Rocket League replays";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "raven-haskell" = callPackage
@@ -202038,8 +187173,6 @@ self: {
        ];
        description = "Sentry http interface for Scotty web server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "raw-feldspar" = callPackage
@@ -202063,8 +187196,6 @@ self: {
        ];
        description = "Resource-Aware Feldspar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "raw-strings-qq" = callPackage
@@ -202106,8 +187237,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Anonymous extensible records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rawstring-qm" = callPackage
@@ -202136,8 +187265,6 @@ self: {
        ];
        description = "Random Access Zippers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "razom-text-util" = callPackage
@@ -202156,8 +187283,6 @@ self: {
        testHaskellDepends = [ base QuickCheck regex-applicative smaoin ];
        description = "Common text/parsing tools for Razom language packages";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rbpcp-api" = callPackage
@@ -202193,8 +187318,6 @@ self: {
        executableHaskellDepends = [ base bio bytestring containers ];
        description = "Mask nucleotide (EST) sequences in Fasta format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rc" = callPackage
@@ -202218,8 +187341,6 @@ self: {
        ];
        description = "Reservoir Computing, fast RNNs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rclient" = callPackage
@@ -202311,8 +187432,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq text ];
        description = "A library for RDF processing in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rdioh" = callPackage
@@ -202335,8 +187454,6 @@ self: {
        ];
        description = "A Haskell wrapper for Rdio's API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rdtsc" = callPackage
@@ -202390,8 +187507,6 @@ self: {
        ];
        description = "A binding to React based on the Flux application architecture for GHCJS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "react-flux-servant" = callPackage
@@ -202403,8 +187518,6 @@ self: {
        libraryHaskellDepends = [ aeson base react-flux servant text ];
        description = "Allow react-flux stores to send requests to a servant server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "react-haskell" = callPackage
@@ -202422,8 +187535,6 @@ self: {
        ];
        description = "Haskell React bindings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "react-tutorial-haskell-server" = callPackage
@@ -202441,8 +187552,6 @@ self: {
        ];
        description = "react-tutorial web server";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reaction-logic" = callPackage
@@ -202457,8 +187566,6 @@ self: {
        executableHaskellDepends = [ base mtl QuickCheck ];
        description = "pluggable pure logic serializable reactor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactive" = callPackage
@@ -202488,8 +187595,6 @@ self: {
        testHaskellDepends = [ base containers HUnit old-time stm ];
        description = "FRP (functional reactive programming) framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactive-balsa" = callPackage
@@ -202549,8 +187654,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "home (etc) automation using reactive-banana";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactive-banana-bunch" = callPackage
@@ -202582,8 +187685,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Simple reactive programming with GTK GObject Introspection";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactive-banana-sdl" = callPackage
@@ -202600,8 +187701,6 @@ self: {
        ];
        description = "Reactive Banana bindings for SDL";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactive-banana-sdl2" = callPackage
@@ -202614,8 +187713,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Reactive Banana integration with SDL2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactive-banana-threepenny" = callPackage
@@ -202630,8 +187727,6 @@ self: {
        libraryHaskellDepends = [ base reactive-banana threepenny-gui ];
        description = "Examples for the reactive-banana library, using threepenny-gui";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactive-banana-wx" = callPackage
@@ -202649,8 +187744,6 @@ self: {
        ];
        description = "Examples for the reactive-banana library, using wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactive-fieldtrip" = callPackage
@@ -202667,8 +187760,6 @@ self: {
        ];
        description = "Connect Reactive and FieldTrip";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactive-glut" = callPackage
@@ -202684,8 +187775,6 @@ self: {
        ];
        description = "Connects Reactive and GLUT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactive-haskell" = callPackage
@@ -202763,8 +187852,6 @@ self: {
        ];
        description = "Reactive programming via imperative threads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reactivity" = callPackage
@@ -202799,8 +187886,6 @@ self: {
        ];
        description = "Reactor - task parallel reactive programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "read-bounded" = callPackage
@@ -202834,8 +187919,6 @@ self: {
          base bytestring containers directory hspec text
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "read-editor" = callPackage
@@ -202873,8 +187956,6 @@ self: {
        testHaskellDepends = [ base containers directory filepath hspec ];
        description = "Read IO library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "readable" = callPackage
@@ -202916,8 +187997,6 @@ self: {
        ];
        description = "Vinyl-based reader-like monad composition";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "readline" = callPackage
@@ -202941,8 +188020,6 @@ self: {
        libraryHaskellDepends = [ base readline StateVar ];
        description = "Readline with variables (setX/getY) wrapped in state vars";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "readme-lhs" = callPackage
@@ -202962,8 +188039,6 @@ self: {
        testHaskellDepends = [ base doctest protolude ];
        description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "readpyc" = callPackage
@@ -202977,8 +188052,6 @@ self: {
        executableHaskellDepends = [ base bliplib parseargs ];
        description = "Read and pretty print Python bytecode (.pyc) files.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "readshp" = callPackage
@@ -202996,8 +188069,6 @@ self: {
        ];
        description = "Code for reading ESRI Shapefiles";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "real-day-end" = callPackage
@@ -203025,45 +188096,9 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "A really simple XML parser";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reanimate" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, attoparsec, base
-     , base64-bytestring, bytestring, cassava, chiphunk, colour
-     , containers, cubicbezier, diagrams, diagrams-contrib
-     , diagrams-core, diagrams-lib, diagrams-svg, directory, filepath
-     , fsnotify, hashable, here, JuicyPixels, lens, linear, matrix, mtl
-     , open-browser, optparse-applicative, palette, parallel, process
-     , QuickCheck, random-shuffle, reanimate-svg, svg-builder, tasty
-     , tasty-golden, tasty-hunit, temporary, text, time, vector
-     , websockets, xml
-     }:
-     mkDerivation {
-       pname = "reanimate";
-       version = "0.1.8.0";
-       sha256 = "1vr0cqn47gl7810clqvn1wgkz3glzd216jmyvxfp6q1i5jhbizvw";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         ansi-wl-pprint attoparsec base base64-bytestring bytestring cassava
-         chiphunk colour containers cubicbezier diagrams diagrams-contrib
-         diagrams-core diagrams-lib diagrams-svg directory filepath fsnotify
-         hashable here JuicyPixels lens linear matrix mtl open-browser
-         optparse-applicative palette parallel process random-shuffle
-         reanimate-svg svg-builder temporary text time vector websockets xml
-       ];
-       testHaskellDepends = [
-         ansi-wl-pprint base bytestring directory filepath process
-         QuickCheck tasty tasty-golden tasty-hunit
-       ];
-       description = "Animation library based on SVGs";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "reanimate_0_1_9_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, attoparsec, base
      , base64-bytestring, bytestring, cassava, chiphunk, colour
      , containers, cubicbezier, diagrams, diagrams-contrib
@@ -203093,31 +188128,9 @@ self: {
        ];
        description = "Animation library based on SVGs";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reanimate-svg" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, hspec
-     , JuicyPixels, lens, linear, mtl, scientific, svg-tree, text
-     , transformers, vector, xml
-     }:
-     mkDerivation {
-       pname = "reanimate-svg";
-       version = "0.9.3.1";
-       sha256 = "1bxfhfdr7p98aj12krxrzcmvxbl8b20flbvqydja8pcwh6jgd744";
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers JuicyPixels lens linear mtl
-         scientific text transformers vector xml
-       ];
-       testHaskellDepends = [
-         attoparsec base hspec linear scientific svg-tree
-       ];
-       description = "SVG file loader and serializer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "reanimate-svg_0_9_4_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, hspec
      , JuicyPixels, lens, linear, mtl, scientific, svg-tree, text
      , transformers, vector, xml
@@ -203135,6 +188148,26 @@ self: {
        ];
        description = "SVG file loader and serializer";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "reanimate-svg_0_9_8_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , double-conversion, hspec, JuicyPixels, lens, linear, mtl
+     , scientific, svg-tree, text, transformers, vector, xml
+     }:
+     mkDerivation {
+       pname = "reanimate-svg";
+       version = "0.9.8.0";
+       sha256 = "1q7ij7w7zyjmmhhvfpjcx60jvs1p0w4jq9fbcah4ywn4azvr7gjv";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers double-conversion JuicyPixels
+         lens linear mtl scientific text transformers vector xml
+       ];
+       testHaskellDepends = [
+         attoparsec base hspec linear scientific svg-tree
+       ];
+       description = "SVG file loader and serializer";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -203168,8 +188201,6 @@ self: {
        libraryHaskellDepends = [ base mtl split template-haskell ];
        description = "Lens implementation. It is more small but adequately.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reasonable-operational" = callPackage
@@ -203186,27 +188217,6 @@ self: {
      }) {};
 
   "rebase" = callPackage
-    ({ mkDerivation, base, base-prelude, bifunctors, bytestring
-     , containers, contravariant, contravariant-extras, deepseq, dlist
-     , either, fail, hashable, mtl, profunctors, scientific
-     , semigroupoids, semigroups, stm, text, time, transformers
-     , unordered-containers, uuid, vector, void
-     }:
-     mkDerivation {
-       pname = "rebase";
-       version = "1.3.1.1";
-       sha256 = "0q4m2fa7wkgxs0grir8rlqwibasmi3s1x7c107ynndwfm62nzv0a";
-       libraryHaskellDepends = [
-         base base-prelude bifunctors bytestring containers contravariant
-         contravariant-extras deepseq dlist either fail hashable mtl
-         profunctors scientific semigroupoids semigroups stm text time
-         transformers unordered-containers uuid vector void
-       ];
-       description = "A more progressive alternative to the \"base\" package";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "rebase_1_4_1" = callPackage
     ({ mkDerivation, base, base-prelude, bifunctors, bytestring
      , comonad, containers, contravariant, contravariant-extras, deepseq
      , dlist, either, fail, hashable, mtl, profunctors, scientific
@@ -203226,7 +188236,6 @@ self: {
        ];
        description = "A more progressive alternative to the \"base\" package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rebindable" = callPackage
@@ -203264,8 +188273,6 @@ self: {
        ];
        description = "Anonymous records";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "record-aeson" = callPackage
@@ -203282,8 +188289,6 @@ self: {
        testHaskellDepends = [ aeson base-prelude hspec record ];
        description = "Instances of \"aeson\" classes for the \"record\" types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "record-dot-preprocessor" = callPackage
@@ -203317,8 +188322,6 @@ self: {
        ];
        description = "Generic encoding of records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "record-gl" = callPackage
@@ -203342,8 +188345,6 @@ self: {
        ];
        description = "Utilities for working with OpenGL's GLSL shading language and Nikita Volkov's \"Record\"s";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "record-hasfield" = callPackage
@@ -203375,8 +188376,6 @@ self: {
        doHaddock = false;
        description = "Compiler preprocessor introducing a syntactic extension for anonymous records";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "record-syntax" = callPackage
@@ -203400,8 +188399,6 @@ self: {
        ];
        description = "A library for parsing and processing the Haskell syntax sprinkled with anonymous records";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "record-wrangler" = callPackage
@@ -203427,8 +188424,6 @@ self: {
        libraryHaskellDepends = [ base kinds type-functions ];
        description = "A flexible record system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "records-sop" = callPackage
@@ -203461,8 +188456,6 @@ self: {
        ];
        description = "Template Haskell declarations for the records package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "recursion" = callPackage
@@ -203541,8 +188534,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck template-haskell ];
        description = "Auto-generate final encodings and their isomorphisms using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "red-black-record" = callPackage
@@ -203614,8 +188605,6 @@ self: {
        ];
        description = "Library for interfacing with Reddit's API";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "redis" = callPackage
@@ -203632,8 +188621,6 @@ self: {
        ];
        description = "A driver for Redis key-value database";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "redis-hs" = callPackage
@@ -203712,8 +188699,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring redis ];
        description = "Simple redis bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "redland" = callPackage
@@ -203726,8 +188711,6 @@ self: {
        libraryPkgconfigDepends = [ raptor2 redland ];
        description = "Redland RDF library bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {raptor2 = null; redland = null;};
 
   "redo" = callPackage
@@ -203770,8 +188753,6 @@ self: {
        ];
        description = "Simplify a set of equations by removing redundancies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reducers" = callPackage
@@ -203818,8 +188799,6 @@ self: {
        ];
        description = "Reed-Solomon Erasure Coding in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reenact" = callPackage
@@ -203833,8 +188812,6 @@ self: {
        ];
        description = "A reimplementation of the Reactive library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reexport-crypto-random" = callPackage
@@ -203856,8 +188833,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Generic Mutable Ref Abstraction Layer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ref-fd" = callPackage
@@ -203869,8 +188844,6 @@ self: {
        libraryHaskellDepends = [ base stm transformers ];
        description = "A type class for monads with references using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ref-mtl" = callPackage
@@ -203882,8 +188855,6 @@ self: {
        libraryHaskellDepends = [ base mtl stm transformers ];
        description = "A type class for monads with references compatible with the mtl2 library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ref-tf" = callPackage
@@ -203927,8 +188898,6 @@ self: {
        ];
        description = "Container with element counts";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reference" = callPackage
@@ -203979,8 +188948,6 @@ self: {
        ];
        description = "A command-line tool for pasting to https://www.refheap.com";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "refined" = callPackage
@@ -203998,8 +188965,6 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Refinement types with static and runtime checking";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "refined-http-api-data" = callPackage
@@ -204011,8 +188976,6 @@ self: {
        libraryHaskellDepends = [ base http-api-data refined text ];
        description = "http-api-data instances for refined types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "refinery" = callPackage
@@ -204060,8 +189023,6 @@ self: {
        ];
        description = "Utilities for the reflection package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflection-without-remorse" = callPackage
@@ -204111,8 +189072,6 @@ self: {
        ];
        description = "Higher-order Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-animation" = callPackage
@@ -204129,8 +189088,6 @@ self: {
        ];
        description = "Continuous animations support for reflex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-backend-socket" = callPackage
@@ -204156,8 +189113,6 @@ self: {
        ];
        description = "Reflex bindings for TCP sockets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-backend-wai" = callPackage
@@ -204178,8 +189133,6 @@ self: {
        executableHaskellDepends = [ base http-types reflex wai ];
        description = "Reflex interface to `wai`";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-basic-host" = callPackage
@@ -204198,8 +189151,6 @@ self: {
        executableHaskellDepends = [ base lens reflex witherable ];
        description = "A basic Reflex host for backend work";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-dom" = callPackage
@@ -204346,8 +189297,6 @@ self: {
        ];
        description = "Routing and retractable back button for reflex-dom";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-dom-svg" = callPackage
@@ -204363,8 +189312,6 @@ self: {
        ];
        description = "Reflex functions for SVG elements";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-fsnotify" = callPackage
@@ -204380,8 +189327,6 @@ self: {
        ];
        description = "reflex-frp interface for watching files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-ghci" = callPackage
@@ -204410,8 +189355,6 @@ self: {
        ];
        description = "A GHCi widget library for use in reflex applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-gloss" = callPackage
@@ -204427,8 +189370,6 @@ self: {
        ];
        description = "An reflex interface for gloss";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-gloss-scene" = callPackage
@@ -204456,8 +189397,6 @@ self: {
        ];
        description = "A simple scene-graph using reflex and gloss";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-jsx" = callPackage
@@ -204491,8 +189430,6 @@ self: {
        ];
        description = "Reflex bindings for libtelnet";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-orphans" = callPackage
@@ -204509,8 +189446,6 @@ self: {
        ];
        description = "Useful missing instances for Reflex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-process" = callPackage
@@ -204531,8 +189466,6 @@ self: {
        ];
        description = "reflex-frp interface for running shell commands";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-sdl2" = callPackage
@@ -204552,8 +189485,6 @@ self: {
        executableHaskellDepends = [ base mtl reflex ];
        description = "SDL2 and reflex FRP";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-transformers" = callPackage
@@ -204569,8 +189500,6 @@ self: {
        ];
        description = "Collections and switchable Monad transformers for Reflex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reflex-vty" = callPackage
@@ -204595,8 +189524,6 @@ self: {
        ];
        description = "Reflex FRP host and widgets for vty applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reform" = callPackage
@@ -204649,8 +189576,6 @@ self: {
        ];
        description = "Happstack support for reform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reform-hsp" = callPackage
@@ -204662,8 +189587,6 @@ self: {
        libraryHaskellDepends = [ base hsp hsx2hs reform text ];
        description = "Add support for using HSP with Reform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reform-lucid" = callPackage
@@ -204686,19 +189609,25 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "The parser and render to parsec and render the string";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "refractor" = callPackage
-    ({ mkDerivation, base, gauge }:
+    ({ mkDerivation, base, base-unicode-symbols, category, gauge
+     , hs-functors, transformers
+     }:
      mkDerivation {
        pname = "refractor";
-       version = "0.0.0.0";
-       sha256 = "145airjpxr3x137180vds5vxlmxs7dh4vjn9grkwyjx8cmx3r842";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base ];
-       benchmarkHaskellDepends = [ base gauge ];
+       version = "0.0.1.0";
+       sha256 = "1isc9d2dsfz7dkf45c8z7syypi8c6cvjmgx5xh732li23wx9qlnf";
+       libraryHaskellDepends = [
+         base base-unicode-symbols category hs-functors transformers
+       ];
+       testHaskellDepends = [
+         base base-unicode-symbols category hs-functors transformers
+       ];
+       benchmarkHaskellDepends = [
+         base base-unicode-symbols category gauge hs-functors transformers
+       ];
        description = "See README for more info";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -204716,8 +189645,6 @@ self: {
        libraryHaskellDepends = [ base data-default exceptions lens mtl ];
        description = "Environment Monad with automatic resource refreshment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "refty" = callPackage
@@ -204760,8 +189687,6 @@ self: {
        ];
        description = "Tools for maintaining a database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reg-alloc" = callPackage
@@ -204773,8 +189698,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Register allocation API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reg-alloc-graph-color" = callPackage
@@ -204798,8 +189721,6 @@ self: {
        doHaddock = false;
        description = "Register allocation by graph colorization";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reg-alloc-types" = callPackage
@@ -204814,28 +189735,6 @@ self: {
      }) {};
 
   "regex" = callPackage
-    ({ mkDerivation, array, base, base-compat, bytestring, containers
-     , hashable, regex-base, regex-pcre-builtin, regex-tdfa
-     , regex-tdfa-text, template-haskell, text, time, time-locale-compat
-     , transformers, unordered-containers, utf8-string
-     }:
-     mkDerivation {
-       pname = "regex";
-       version = "1.0.2.0";
-       sha256 = "1f2z025hif1fr24b5khq3qxxyvpxrnhyx8xmbms332arw28rpkda";
-       revision = "1";
-       editedCabalFile = "1476dxzj482j6zkvbvyszsjw1bm7jn2nwk40rq99ylvzm2sj0asn";
-       libraryHaskellDepends = [
-         array base base-compat bytestring containers hashable regex-base
-         regex-pcre-builtin regex-tdfa regex-tdfa-text template-haskell text
-         time time-locale-compat transformers unordered-containers
-         utf8-string
-       ];
-       description = "Toolkit for regex-base";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "regex_1_1_0_0" = callPackage
     ({ mkDerivation, array, base, base-compat, bytestring, containers
      , hashable, regex-base, regex-pcre-builtin, regex-tdfa
      , template-haskell, text, time, time-locale-compat, transformers
@@ -204852,7 +189751,6 @@ self: {
        ];
        description = "Toolkit for regex-base";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-applicative" = callPackage
@@ -204887,19 +189785,6 @@ self: {
      }) {};
 
   "regex-base" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, mtl }:
-     mkDerivation {
-       pname = "regex-base";
-       version = "0.93.2";
-       sha256 = "0y1j4h2pg12c853nzmczs263di7xkkmlnsq5dlp5wgbgl49mgp10";
-       revision = "2";
-       editedCabalFile = "0dks3m5xwcjqqlyyg7abh12ci3ap5qn6wz3bz80kr6rcfgk0fhvd";
-       libraryHaskellDepends = [ array base bytestring containers mtl ];
-       description = "Replaces/Enhances Text.Regex";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "regex-base_0_94_0_0" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, mtl, text }:
      mkDerivation {
        pname = "regex-base";
@@ -204910,23 +189795,9 @@ self: {
        ];
        description = "Common \"Text.Regex.*\" API for Regex matching";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-compat" = callPackage
-    ({ mkDerivation, array, base, regex-base, regex-posix }:
-     mkDerivation {
-       pname = "regex-compat";
-       version = "0.95.1";
-       sha256 = "0fwmima3f04p9y4h3c23493n1xj629ia2dxaisqm6rynljjv2z6m";
-       revision = "1";
-       editedCabalFile = "0yg34p0rkql07y6rs6l70zlk8x51lra9vabkin921l581k6br498";
-       libraryHaskellDepends = [ array base regex-base regex-posix ];
-       description = "Replaces/Enhances Text.Regex";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "regex-compat_0_95_2_0" = callPackage
     ({ mkDerivation, array, base, regex-base, regex-posix }:
      mkDerivation {
        pname = "regex-compat";
@@ -204935,7 +189806,6 @@ self: {
        libraryHaskellDepends = [ array base regex-base regex-posix ];
        description = "Replaces/Enhances \"Text.Regex\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-compat-tdfa" = callPackage
@@ -204964,8 +189834,6 @@ self: {
        ];
        description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Brzozowski's Deriviatives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regex-dfa" = callPackage
@@ -204979,8 +189847,6 @@ self: {
        libraryHaskellDepends = [ base mtl parsec regex-base ];
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regex-do" = callPackage
@@ -204989,8 +189855,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex-do";
-       version = "3.2.1";
-       sha256 = "1jng0vmdvgwysfw71klgfzx6hs18v64q17had9j2kkg82w6fivqw";
+       version = "3.2.2";
+       sha256 = "1rd9lscki5hrwh68bl6cypmfx9qh95938a51xjip9pxshlmc46b7";
        libraryHaskellDepends = [
          array base bytestring regex-base regex-pcre stringsearch tagged
          text
@@ -205001,8 +189867,6 @@ self: {
        ];
        description = "PCRE wrapper";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regex-easy" = callPackage
@@ -205071,8 +189935,6 @@ self: {
        ];
        description = "Generate a random string from a PCRE";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regex-genex" = callPackage
@@ -205105,29 +189967,9 @@ self: {
        libraryHaskellDepends = [ base parsec regex-base ];
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regex-pcre" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, pcre
-     , regex-base
-     }:
-     mkDerivation {
-       pname = "regex-pcre";
-       version = "0.94.4";
-       sha256 = "1h16w994g9s62iwkdqa7bar2n9cfixmkzz2rm8svm960qr57valf";
-       revision = "1";
-       editedCabalFile = "0jk29n0may65ghixlx1wwfmfcabsm730y8ppry1qy4naywhi1vs7";
-       libraryHaskellDepends = [
-         array base bytestring containers regex-base
-       ];
-       librarySystemDepends = [ pcre ];
-       description = "Replaces/Enhances Text.Regex";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) pcre;};
-
-  "regex-pcre_0_95_0_0" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, pcre
      , regex-base
      }:
@@ -205141,23 +189983,9 @@ self: {
        libraryPkgconfigDepends = [ pcre ];
        description = "PCRE Backend for \"Text.Regex\" (regex-base)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) pcre;};
 
   "regex-pcre-builtin" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, regex-base }:
-     mkDerivation {
-       pname = "regex-pcre-builtin";
-       version = "0.94.5.8.8.35";
-       sha256 = "1s755qdg1mxrf125sh83bsc5kjkrj8fkq8wf6dg1jan86c7p7gl4";
-       libraryHaskellDepends = [
-         array base bytestring containers regex-base
-       ];
-       description = "Replaces/Enhances Text.Regex";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "regex-pcre-builtin_0_95_1_1_8_43" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, regex-base
      , text
      }:
@@ -205170,7 +189998,6 @@ self: {
        ];
        description = "PCRE Backend for \"Text.Regex\" (regex-base)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-pcre-text" = callPackage
@@ -205203,26 +190030,9 @@ self: {
        ];
        description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Antimirov's partial derivatives.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regex-posix" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, regex-base }:
-     mkDerivation {
-       pname = "regex-posix";
-       version = "0.95.2";
-       sha256 = "0gkhzhj8nvfn1ija31c7xnl6p0gadwii9ihyp219ck2arlhrj0an";
-       revision = "2";
-       editedCabalFile = "1zrlwmmrb3x3r3af1r42xwhwspzfgnzh4dw1158523sndsg8qn08";
-       libraryHaskellDepends = [
-         array base bytestring containers regex-base
-       ];
-       description = "Replaces/Enhances Text.Regex";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "regex-posix_0_96_0_0" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, regex-base }:
      mkDerivation {
        pname = "regex-posix";
@@ -205233,7 +190043,6 @@ self: {
        ];
        description = "POSIX Backend for \"Text.Regex\" (regex-base)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-posix-clib" = callPackage
@@ -205266,23 +190075,6 @@ self: {
      }) {};
 
   "regex-tdfa" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, ghc-prim, mtl
-     , parsec, regex-base
-     }:
-     mkDerivation {
-       pname = "regex-tdfa";
-       version = "1.2.3.2";
-       sha256 = "03yhpqrqz977nwlnhnyz9dacnbzw8xb6j18h365rkgmbc05sb3hf";
-       revision = "1";
-       editedCabalFile = "03z5jmpkgyd6ydwmnxcmhysjfwb0m5ngfgvxzf4f1vx2qgifqm5i";
-       libraryHaskellDepends = [
-         array base bytestring containers ghc-prim mtl parsec regex-base
-       ];
-       description = "Replaces/Enhances Text.Regex";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "regex-tdfa_1_3_1_0" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
      , filepath, mtl, parsec, regex-base, text, utf8-string
      }:
@@ -205299,7 +190091,6 @@ self: {
        ];
        description = "Pure Haskell Tagged DFA Backend for \"Text.Regex\" (regex-base)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-tdfa-pipes" = callPackage
@@ -205315,8 +190106,6 @@ self: {
        ];
        description = "Parse with regular expressions on Producers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regex-tdfa-quasiquoter" = callPackage
@@ -205328,8 +190117,6 @@ self: {
        libraryHaskellDepends = [ base regex-tdfa template-haskell ];
        description = "Quasi-quoter for TDFA (extended POSIX) regular expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regex-tdfa-rc" = callPackage
@@ -205345,8 +190132,6 @@ self: {
        ];
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regex-tdfa-text" = callPackage
@@ -205395,8 +190180,6 @@ self: {
        ];
        description = "This combines regex-tdfa with utf8-string to allow searching over UTF8 encoded lazy bytestrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regex-tre" = callPackage
@@ -205411,8 +190194,6 @@ self: {
        librarySystemDepends = [ tre ];
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) tre;};
 
   "regex-type" = callPackage
@@ -205424,29 +190205,9 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Type-level regular expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regex-with-pcre" = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, containers, regex
-     , regex-base, regex-pcre-builtin, regex-pcre-text, regex-tdfa
-     , template-haskell, text, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "regex-with-pcre";
-       version = "1.0.2.0";
-       sha256 = "19vn5w4vhgxv9s6nhlmj4xl8pa16d1a2ygxxyd5b0qg3q27vvisk";
-       libraryHaskellDepends = [
-         base base-compat bytestring containers regex regex-base
-         regex-pcre-builtin regex-pcre-text regex-tdfa template-haskell text
-         transformers unordered-containers
-       ];
-       description = "Toolkit for regex-base";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "regex-with-pcre_1_1_0_0" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, containers, regex
      , regex-base, regex-pcre-builtin, regex-tdfa, template-haskell
      , text, transformers, unordered-containers
@@ -205462,7 +190223,6 @@ self: {
        ];
        description = "Toolkit for regex-base";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-wrapper" = callPackage
@@ -205490,8 +190250,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 parsec ];
        description = "A regular expression library for W3C XML Schema regular expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regexchar" = callPackage
@@ -205547,8 +190305,6 @@ self: {
        ];
        description = "Regular Expressions on Tries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regexpr" = callPackage
@@ -205572,8 +190328,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Regular expressions via symbolic manipulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regexqq" = callPackage
@@ -205587,8 +190341,6 @@ self: {
        ];
        description = "A quasiquoter for PCRE regexes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regional-pointers" = callPackage
@@ -205603,8 +190355,6 @@ self: {
        ];
        description = "Regional memory pointers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regions" = callPackage
@@ -205620,8 +190370,6 @@ self: {
        ];
        description = "Provides the region monad for safely opening and working with scarce resources";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regions-monadsfd" = callPackage
@@ -205637,8 +190385,6 @@ self: {
        ];
        description = "Monads-fd instances for the RegionT monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regions-monadstf" = callPackage
@@ -205654,8 +190400,6 @@ self: {
        ];
        description = "Monads-tf instances for the RegionT monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regions-mtl" = callPackage
@@ -205667,8 +190411,6 @@ self: {
        libraryHaskellDepends = [ base-unicode-symbols mtl regions ];
        description = "mtl instances for the RegionT monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "register-machine-typelevel" = callPackage
@@ -205680,8 +190422,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A computationally universal register machine implementation at the type-level";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "registry" = callPackage
@@ -205709,8 +190449,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "data structure for assembling components";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "registry-hedgehog" = callPackage
@@ -205736,8 +190474,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "utilities to work with Hedgehog generators and `registry`";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regress" = callPackage
@@ -205749,8 +190485,6 @@ self: {
        libraryHaskellDepends = [ ad base vector ];
        description = "Linear and logistic regression through automatic differentiation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regression-simple" = callPackage
@@ -205775,8 +190509,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Generic programming library for regular datatypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regular-extras" = callPackage
@@ -205788,8 +190520,6 @@ self: {
        libraryHaskellDepends = [ base binary deepseq QuickCheck regular ];
        description = "Additional functions for regular: arbitrary, coarbitrary, and binary get/put";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regular-web" = callPackage
@@ -205805,8 +190535,6 @@ self: {
        ];
        description = "Generic programming for the web";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "regular-xmlpickler" = callPackage
@@ -205818,8 +190546,6 @@ self: {
        libraryHaskellDepends = [ base hxt regular text ];
        description = "Generic generation of HXT XmlPickler instances using Regular";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reheat" = callPackage
@@ -205834,8 +190560,6 @@ self: {
        testHaskellDepends = [ base directory QuickCheck text vty vty-ui ];
        description = "to make notes and reduce impact on idle time on writing other programms";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rehoo" = callPackage
@@ -205870,8 +190594,6 @@ self: {
        ];
        description = "Process lists easily";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reified-records" = callPackage
@@ -205883,8 +190605,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "Reify records to Maps and back again";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reify" = callPackage
@@ -205900,8 +190620,6 @@ self: {
        executableHaskellDepends = [ base ghc ];
        description = "Serialize data";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reinterpret-cast" = callPackage
@@ -205928,8 +190646,6 @@ self: {
        libraryHaskellDepends = [ array base containers ];
        description = "A relation data structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "relapse" = callPackage
@@ -205948,8 +190664,6 @@ self: {
        ];
        description = "Sensible RLP encoding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "relation" = callPackage
@@ -205967,8 +190681,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A data structure representing Relations on Sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "relational-postgresql8" = callPackage
@@ -205986,8 +190698,6 @@ self: {
        ];
        description = "PostgreSQL v8.x driver for haskell-relational-record";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "relational-query" = callPackage
@@ -206103,8 +190813,6 @@ self: {
        ];
        description = "Durations and generalized time parsing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "releaser" = callPackage
@@ -206180,37 +190888,9 @@ self: {
        ];
        description = "A web based Haskell IDE";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "relude" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, doctest
-     , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, QuickCheck, stm
-     , tasty, tasty-hedgehog, text, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "relude";
-       version = "0.5.0";
-       sha256 = "108xd4ybfj7v0cc0h71cym0z31fzsi17aad2l3s17j11h6ainhbm";
-       revision = "1";
-       editedCabalFile = "0qw27rmf14dn44lics58mqdf4wfcnx5z5zrwi13bsbf8qicmd7cb";
-       libraryHaskellDepends = [
-         base bytestring containers deepseq ghc-prim hashable mtl stm text
-         transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         base bytestring doctest Glob hedgehog QuickCheck tasty
-         tasty-hedgehog text
-       ];
-       benchmarkHaskellDepends = [
-         base containers gauge unordered-containers
-       ];
-       description = "Custom prelude from Kowainik";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "relude_0_6_0_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, doctest
      , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, QuickCheck, stm
      , text, transformers, unordered-containers
@@ -206231,7 +190911,6 @@ self: {
        ];
        description = "Custom prelude from Kowainik";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "remark" = callPackage
@@ -206251,8 +190930,6 @@ self: {
        ];
        description = "A DSL for marking student work";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "remarks" = callPackage
@@ -206274,8 +190951,6 @@ self: {
        ];
        description = "A DSL for marking student work";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rematch" = callPackage
@@ -206317,8 +190992,6 @@ self: {
        ];
        description = "Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "remote-debugger" = callPackage
@@ -206334,8 +191007,6 @@ self: {
        ];
        description = "Interface to ghci debugger";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "remote-json" = callPackage
@@ -206360,8 +191031,6 @@ self: {
        ];
        description = "Remote Monad implementation of the JSON RPC protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "remote-json-client" = callPackage
@@ -206379,8 +191048,6 @@ self: {
        ];
        description = "Web client wrapper for remote-json";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "remote-json-server" = callPackage
@@ -206398,8 +191065,6 @@ self: {
        ];
        description = "Web server wrapper for remote-json";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "remote-monad" = callPackage
@@ -206422,8 +191087,6 @@ self: {
        ];
        description = "An parametrizable Remote Monad, and parametrizable Applicative Functor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "remotion" = callPackage
@@ -206456,8 +191119,6 @@ self: {
        ];
        description = "A library for client-server applications based on custom protocols";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "render-utf8" = callPackage
@@ -206558,8 +191219,6 @@ self: {
        ];
        description = "Bulk array representations and operators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repa-bytestring" = callPackage
@@ -206572,8 +191231,6 @@ self: {
        doHaddock = false;
        description = "(deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repa-convert" = callPackage
@@ -206589,8 +191246,6 @@ self: {
        ];
        description = "Packing and unpacking flat tables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repa-devil" = callPackage
@@ -206603,8 +191258,6 @@ self: {
        librarySystemDepends = [ libdevil ];
        description = "Support for image reading and writing of Repa arrays using in-place FFI calls";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libdevil;};
 
   "repa-eval" = callPackage
@@ -206616,8 +191269,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Low-level parallel operators on bulk random-accessble arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repa-examples" = callPackage
@@ -206676,8 +191327,6 @@ self: {
        ];
        description = "Data-parallel data flows";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repa-io" = callPackage
@@ -206706,8 +191355,6 @@ self: {
        libraryHaskellDepends = [ base hmatrix repa vector ];
        description = "HMatrix operations for Repa";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repa-plugin" = callPackage
@@ -206724,8 +191371,6 @@ self: {
        ];
        description = "Data Flow Fusion GHC Plugin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repa-scalar" = callPackage
@@ -206754,8 +191399,6 @@ self: {
        libraryHaskellDepends = [ base ghc ghc-prim vector ];
        description = "Series Expressionss API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repa-sndfile" = callPackage
@@ -206785,8 +191428,6 @@ self: {
        libraryHaskellDepends = [ base mtl primitive repa-scalar vector ];
        description = "Stream functions not present in the vector library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repa-v4l2" = callPackage
@@ -206806,8 +191447,6 @@ self: {
        executableHaskellDepends = [ base gloss repa ];
        description = "Provides high-level access to webcams";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repl" = callPackage
@@ -206821,8 +191460,6 @@ self: {
        ];
        description = "IRC friendly REPL library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repl-toolkit" = callPackage
@@ -206844,25 +191481,6 @@ self: {
      }) {};
 
   "replace-attoparsec" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, Cabal, criterion
-     , parsers, text
-     }:
-     mkDerivation {
-       pname = "replace-attoparsec";
-       version = "1.0.3.0";
-       sha256 = "0vksppf0x9wp9hs6h9i2jbaz5vmrv8r78dv3dr4g3d8bnkh2vmwz";
-       libraryHaskellDepends = [ attoparsec base bytestring text ];
-       testHaskellDepends = [
-         attoparsec base bytestring Cabal parsers text
-       ];
-       benchmarkHaskellDepends = [
-         attoparsec base bytestring criterion text
-       ];
-       description = "Find, replace, and edit text patterns with Attoparsec parsers";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "replace-attoparsec_1_2_0_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, Cabal, parsers, text
      }:
      mkDerivation {
@@ -206875,22 +191493,9 @@ self: {
        ];
        description = "Find, replace, and edit text patterns with Attoparsec parsers";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "replace-megaparsec" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, megaparsec, text }:
-     mkDerivation {
-       pname = "replace-megaparsec";
-       version = "1.1.5.0";
-       sha256 = "07y21p6a65gm3zgi3g9rfgr8ali548jcq8qcg5fyzl2bl1bj8pyd";
-       libraryHaskellDepends = [ base megaparsec ];
-       testHaskellDepends = [ base bytestring Cabal megaparsec text ];
-       description = "Find, replace, and edit text patterns with Megaparsec parsers";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "replace-megaparsec_1_2_1_0" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, megaparsec, text }:
      mkDerivation {
        pname = "replace-megaparsec";
@@ -206900,7 +191505,6 @@ self: {
        testHaskellDepends = [ base bytestring Cabal megaparsec text ];
        description = "Find, replace, and edit text patterns with Megaparsec parsers";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "replica" = callPackage
@@ -206922,8 +191526,6 @@ self: {
          wai-websockets websockets
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "replicant" = callPackage
@@ -206950,24 +191552,9 @@ self: {
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repline" = callPackage
-    ({ mkDerivation, base, containers, fail, haskeline, mtl, process }:
-     mkDerivation {
-       pname = "repline";
-       version = "0.2.1.0";
-       sha256 = "0yxfn6p4gprnv8hzpzh7872fs3l661d587v4kkp51mjyydpiihs5";
-       libraryHaskellDepends = [
-         base containers fail haskeline mtl process
-       ];
-       description = "Haskeline wrapper for GHCi-like REPL interfaces";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "repline_0_2_2_0" = callPackage
     ({ mkDerivation, base, containers, exceptions, haskeline, mtl
      , process
      }:
@@ -206982,7 +191569,6 @@ self: {
        ];
        description = "Haskeline wrapper for GHCi-like REPL interfaces";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repo-based-blog" = callPackage
@@ -207011,8 +191597,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Blogging module using blaze html for markup";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repr" = callPackage
@@ -207028,8 +191612,6 @@ self: {
        ];
        description = "Render overloaded expressions to their textual representation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "repr-tree-syb" = callPackage
@@ -207059,8 +191641,6 @@ self: {
        ];
        description = "Representable functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "representable-profunctors" = callPackage
@@ -207091,8 +191671,6 @@ self: {
        ];
        description = "Tries from representations of polynomial functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reprinter" = callPackage
@@ -207107,8 +191685,6 @@ self: {
        ];
        description = "Scrap Your Reprinter";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reproject" = callPackage
@@ -207121,42 +191697,9 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Define and combine \"materialized\" projections";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "req" = callPackage
-    ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder
-     , bytestring, case-insensitive, connection, hspec, hspec-core
-     , hspec-discover, http-api-data, http-client, http-client-tls
-     , http-types, monad-control, mtl, QuickCheck, retry, text, time
-     , transformers, transformers-base, unordered-containers
-     }:
-     mkDerivation {
-       pname = "req";
-       version = "2.1.0";
-       sha256 = "07sm483bkwqq7fvhwqysl4ac0nw1mvhkywawwpgq0c1gw2wnv56n";
-       revision = "1";
-       editedCabalFile = "0dgd4wgijd0k96khy56b6gnzmqzmz44a4qsj0v5mwslvnvkq598a";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson authenticate-oauth base blaze-builder bytestring
-         case-insensitive connection http-api-data http-client
-         http-client-tls http-types monad-control mtl retry text time
-         transformers transformers-base
-       ];
-       testHaskellDepends = [
-         aeson base blaze-builder bytestring case-insensitive hspec
-         hspec-core http-client http-types monad-control mtl QuickCheck
-         retry text time unordered-containers
-       ];
-       testToolDepends = [ hspec-discover ];
-       doCheck = false;
-       description = "Easy-to-use, type-safe, expandable, high-level HTTP client library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "req_3_0_0" = callPackage
     ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder
      , bytestring, case-insensitive, connection, hspec, hspec-core
      , hspec-discover, http-api-data, http-client, http-client-tls
@@ -207165,8 +191708,8 @@ self: {
      }:
      mkDerivation {
        pname = "req";
-       version = "3.0.0";
-       sha256 = "0zcali98wlw2r4rl405268n4fsia1gvvnq7ckkinb3adp4aksk18";
+       version = "3.1.0";
+       sha256 = "0j53bbhyhjy2q91lnvpwldjsck57p72y5l815c9mi0gzihchyksb";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson authenticate-oauth base blaze-builder bytestring
@@ -207183,7 +191726,6 @@ self: {
        doCheck = false;
        description = "Easy-to-use, type-safe, expandable, high-level HTTP client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "req-conduit" = callPackage
@@ -207208,8 +191750,6 @@ self: {
        ];
        description = "Conduit helpers for the req HTTP client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "req-oauth2" = callPackage
@@ -207232,8 +191772,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Provides OAuth2 authentication for use with Req";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "req-url-extra" = callPackage
@@ -207249,8 +191787,6 @@ self: {
        testHaskellDepends = [ base hspec modern-uri req ];
        description = "Provides URI/URL helper functions for use with Req";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reqcatcher" = callPackage
@@ -207267,8 +191803,6 @@ self: {
        ];
        description = "A local http server to catch the HTTP redirect";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "request-monad" = callPackage
@@ -207280,8 +191814,6 @@ self: {
        libraryHaskellDepends = [ base free mtl transformers ];
        description = "A transformer for generic requests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "require" = callPackage
@@ -207312,22 +191844,9 @@ self: {
        ];
        description = "Scrap your qualified import clutter";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rerebase" = callPackage
-    ({ mkDerivation, rebase }:
-     mkDerivation {
-       pname = "rerebase";
-       version = "1.3.1.1";
-       sha256 = "1jbqif6k249rkknm2zwk8v8jil3kgi9ar53358v8l4ffx346rm82";
-       libraryHaskellDepends = [ rebase ];
-       description = "Reexports from \"base\" with a bunch of other standard libraries";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "rerebase_1_4_1" = callPackage
     ({ mkDerivation, rebase }:
      mkDerivation {
        pname = "rerebase";
@@ -207336,7 +191855,6 @@ self: {
        libraryHaskellDepends = [ rebase ];
        description = "Reexports from \"base\" with a bunch of other standard libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reroute" = callPackage
@@ -207386,8 +191904,6 @@ self: {
        ];
        description = "Reserve reloads web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reservoir" = callPackage
@@ -207399,8 +191915,6 @@ self: {
        libraryHaskellDepends = [ base containers random ];
        description = "Unweighted reservoir sampling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "resin" = callPackage
@@ -207412,8 +191926,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ralist semigroupoids ];
        description = "High performance variable binders";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "resistor-cube" = callPackage
@@ -207427,8 +191939,6 @@ self: {
        executableHaskellDepends = [ base comfort-array lapack ];
        description = "Compute total resistance of a cube of resistors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "resolv_0_1_1_2" = callPackage
@@ -207483,8 +191993,6 @@ self: {
        ];
        description = "A name resolusion library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "resolve-trivial-conflicts" = callPackage
@@ -207503,8 +192011,6 @@ self: {
        ];
        description = "Remove trivial conflict markers in a git repository";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "resource-effect" = callPackage
@@ -207523,8 +192029,6 @@ self: {
        ];
        description = "A port of the package 'resourcet' for extensible effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "resource-embed" = callPackage
@@ -207538,8 +192042,6 @@ self: {
        executableHaskellDepends = [ base bytestring directory ];
        description = "Embed data files via C and FFI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "resource-pool" = callPackage
@@ -207572,8 +192074,6 @@ self: {
        ];
        description = "Fork of resource-pool, with a MonadCatchIO constraint";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "resource-pool-monad" = callPackage
@@ -207605,8 +192105,6 @@ self: {
        ];
        description = "Allocate resources which are guaranteed to be released";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "resourcet_1_1_11" = callPackage
@@ -207672,8 +192170,6 @@ self: {
        ];
        description = "process and route HTTP requests and generate responses on top of WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rest-client" = callPackage
@@ -207695,8 +192191,6 @@ self: {
        ];
        description = "Utility library for use in generated API client libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rest-core" = callPackage
@@ -207724,8 +192218,6 @@ self: {
        ];
        description = "Rest API library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rest-example" = callPackage
@@ -207748,8 +192240,6 @@ self: {
        executableHaskellDepends = [ base base-compat rest-gen ];
        description = "Example project for rest";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rest-gen" = callPackage
@@ -207777,8 +192267,6 @@ self: {
        ];
        description = "Documentation and client generation from rest definition";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rest-happstack" = callPackage
@@ -207796,8 +192284,6 @@ self: {
        ];
        description = "Rest driver for Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rest-snap" = callPackage
@@ -207815,8 +192301,6 @@ self: {
        ];
        description = "Rest driver for Snap";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rest-stringmap" = callPackage
@@ -207833,8 +192317,6 @@ self: {
        ];
        description = "Maps with stringy keys that can be transcoded to JSON and XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rest-types" = callPackage
@@ -207854,8 +192336,6 @@ self: {
        ];
        description = "Silk Rest Framework Types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rest-wai" = callPackage
@@ -207875,8 +192355,6 @@ self: {
        ];
        description = "Rest driver for WAI applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "restful-snap" = callPackage
@@ -207896,8 +192374,6 @@ self: {
          time-locale-compat xmlhtml
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "restless-git" = callPackage
@@ -207934,8 +192410,6 @@ self: {
        ];
        description = "Running worker processes under system resource restrictions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "restyle" = callPackage
@@ -207950,8 +192424,6 @@ self: {
        executableHaskellDepends = [ base directory filepath utf8-string ];
        description = "Convert between camel case and separated words style";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "result" = callPackage
@@ -207999,8 +192471,6 @@ self: {
        benchmarkHaskellDepends = [ aeson async base criterion text ];
        description = "A driver for RethinkDB 2.2";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rethinkdb-client-driver" = callPackage
@@ -208029,8 +192499,6 @@ self: {
        ];
        description = "Client driver for RethinkDB";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rethinkdb-model" = callPackage
@@ -208046,8 +192514,6 @@ self: {
        ];
        description = "Useful tools for modeling data with rethinkdb";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rethinkdb-wereHamster" = callPackage
@@ -208067,8 +192533,6 @@ self: {
        ];
        description = "RethinkDB driver for Haskell";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "retry" = callPackage
@@ -208102,8 +192566,6 @@ self: {
        executableHaskellDepends = [ base optparse-applicative process ];
        description = "Retry failed commands";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rev-state" = callPackage
@@ -208168,8 +192630,6 @@ self: {
        ];
        description = "Simple reverse geocoding using OpenStreeMap";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "reversi" = callPackage
@@ -208183,8 +192643,6 @@ self: {
        executableHaskellDepends = [ array base process ];
        description = "Text-only reversi (aka othelo) game";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rewrite" = callPackage
@@ -208200,8 +192658,6 @@ self: {
        ];
        description = "open file and rewrite it with new contents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rewrite-inspector" = callPackage
@@ -208221,8 +192677,6 @@ self: {
        executableHaskellDepends = [ base prettyprinter ];
        description = "Inspection of rewriting steps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rewriting" = callPackage
@@ -208234,8 +192688,6 @@ self: {
        libraryHaskellDepends = [ base containers regular ];
        description = "Generic rewriting library for regular datatypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rex" = callPackage
@@ -208271,8 +192723,6 @@ self: {
        ];
        description = "Github resume generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rfc" = callPackage
@@ -208306,8 +192756,6 @@ self: {
        ];
        description = "Robert Fischer's Common library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rfc-env" = callPackage
@@ -208319,8 +192767,6 @@ self: {
        libraryHaskellDepends = [ base envy network rfc-prelude time ];
        description = "Environment variable support from the Robert Fischer Commons";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rfc-http-client" = callPackage
@@ -208338,8 +192784,6 @@ self: {
        ];
        description = "The HTTP client extensions from the Robert Fischer Commons";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rfc-prelude" = callPackage
@@ -208363,8 +192807,6 @@ self: {
        ];
        description = "The Prelude from the Robert Fischer Commons";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rfc-psql" = callPackage
@@ -208381,8 +192823,6 @@ self: {
        ];
        description = "The PostgreSQL extensions from the Robert Fischer Commons";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rfc-redis" = callPackage
@@ -208394,8 +192834,6 @@ self: {
        libraryHaskellDepends = [ base hedis rfc-env rfc-prelude time ];
        description = "The Redis extensions from the Robert Fischer Commons";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rfc-servant" = callPackage
@@ -208417,8 +192855,6 @@ self: {
        ];
        description = "The Servant extensions from the Robert Fischer Commons";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rfc1413-server" = callPackage
@@ -208503,8 +192939,6 @@ self: {
        ];
        description = "A dynamic/unbounded alternative to Bounded Enum";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rgb-color-model" = callPackage
@@ -208519,22 +192953,6 @@ self: {
      }) {};
 
   "rhine" = callPackage
-    ({ mkDerivation, base, containers, deepseq, dunai, free
-     , MonadRandom, random, time, transformers, vector-sized
-     }:
-     mkDerivation {
-       pname = "rhine";
-       version = "0.5.1.0";
-       sha256 = "026hnakysi7xqhc630c5mbxs0y4j3wkyk71771mlrf7q2l94vh79";
-       libraryHaskellDepends = [
-         base containers deepseq dunai free MonadRandom random time
-         transformers vector-sized
-       ];
-       description = "Functional Reactive Programming with type-level clocks";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rhine_0_5_1_1" = callPackage
     ({ mkDerivation, base, containers, deepseq, dunai, free
      , MonadRandom, random, time, transformers, vector-sized
      }:
@@ -208548,7 +192966,6 @@ self: {
        ];
        description = "Functional Reactive Programming with type-level clocks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rhine-gloss" = callPackage
@@ -208581,8 +192998,6 @@ self: {
        ];
        description = "Haskell rhythm game tutorial";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "riak" = callPackage
@@ -208675,8 +193090,6 @@ self: {
        ];
        description = "Static site generator using Shake";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ribbit" = callPackage
@@ -208815,8 +193228,6 @@ self: {
        ];
        description = "Quick metrics to grow your app strong";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ridley-extras" = callPackage
@@ -208834,8 +193245,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Handy metrics that don't belong to ridley";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "riemann" = callPackage
@@ -208865,8 +193274,6 @@ self: {
        ];
        description = "A Riemann client for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "riff" = callPackage
@@ -208885,8 +193292,6 @@ self: {
        executableHaskellDepends = [ base bytestring filepath ];
        description = "RIFF parser for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rigel-viz" = callPackage
@@ -208917,8 +193322,6 @@ self: {
        testHaskellDepends = [ base HUnit QuickCheck vector ];
        description = "A concurrent, mutable ring-buffer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ring-buffers" = callPackage
@@ -208930,27 +193333,24 @@ self: {
        libraryHaskellDepends = [ base contiguous primitive semirings ];
        description = "mutable ring buffers with atomic updates in GHC Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rings" = callPackage
     ({ mkDerivation, adjunctions, base, connections, containers
-     , distributive, hedgehog, lawz, property, semigroupoids
+     , distributive, hedgehog, lawz, magmas, profunctors, property
+     , semigroupoids
      }:
      mkDerivation {
        pname = "rings";
-       version = "0.0.2.4";
-       sha256 = "0h9yxi9pwcazwzpwmn6acz21yxm3mz0h3wr2cwv4cg2p6bxk0ysn";
+       version = "0.1";
+       sha256 = "0x1qbxl3f732hf1chhvg91x6yiym48dsxshzq3rs95bqjcm4mqxc";
        libraryHaskellDepends = [
-         adjunctions base connections containers distributive lawz
+         adjunctions base containers distributive lawz magmas profunctors
          semigroupoids
        ];
        testHaskellDepends = [ base connections hedgehog property ];
-       description = "Groups, rings, semirings, and dioids";
+       description = "Ring-like objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rio" = callPackage
@@ -208961,8 +193361,8 @@ self: {
      }:
      mkDerivation {
        pname = "rio";
-       version = "0.1.13.0";
-       sha256 = "1jsrblk451ayf5smplngxmch73pf4r0qanafyyfn0g5wyh6hsxcm";
+       version = "0.1.14.0";
+       sha256 = "1ss0lbdrmiblxza8lv51kpdw51s7m5qaihxlvf1jp4qg4amdayxw";
        libraryHaskellDepends = [
          base bytestring containers deepseq directory exceptions filepath
          hashable microlens mtl primitive process text time typed-process
@@ -209033,8 +193433,6 @@ self: {
        executableSystemDepends = [ ncurses ];
        description = "Riot is an Information Organisation Tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) ncurses;};
 
   "ripple" = callPackage
@@ -209076,17 +193474,18 @@ self: {
      }) {};
 
   "risc-v" = callPackage
-    ({ mkDerivation, base, base-unicode-symbols, criterion, smallcheck
-     , tasty, tasty-smallcheck, util
+    ({ mkDerivation, base, base-unicode-symbols, clash-prelude
+     , criterion, smallcheck, tasty, tasty-smallcheck, util
      }:
      mkDerivation {
        pname = "risc-v";
-       version = "0.0.0.0";
-       sha256 = "0d1pb2h34ngr6pxmbizvka0ihaidhd7hkkmk74h51hh5mzp4zm04";
-       libraryHaskellDepends = [ base base-unicode-symbols util ];
+       version = "0.0.2.0";
+       sha256 = "1g6j9illgqraskcp4rjzk3xvdwf4avn1x732sd6jbm99d7vy9c1f";
+       libraryHaskellDepends = [
+         base base-unicode-symbols clash-prelude util
+       ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        benchmarkHaskellDepends = [ base criterion ];
-       doHaddock = false;
        description = "RISC-V";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -209104,8 +193503,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Reduced instruction set i386 simulator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "riscv-isa" = callPackage
@@ -209120,8 +193517,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Haskell representation of the RISC-V instruction set architecture";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rison" = callPackage
@@ -209153,8 +193548,6 @@ self: {
        libraryHaskellDepends = [ base lazysmallcheck oeis QuickCheck ];
        description = "Rivers are like Streams, but different";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rivet" = callPackage
@@ -209168,8 +193561,6 @@ self: {
        executableHaskellDepends = [ base rivet-core rivet-simple-deploy ];
        description = "A project management tool for Haskell applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rivet-adaptor-postgresql" = callPackage
@@ -209217,8 +193608,6 @@ self: {
        libraryHaskellDepends = [ base postgresql-simple text ];
        description = "Postgresql migration support for project management tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rivet-simple-deploy" = callPackage
@@ -209230,8 +193619,6 @@ self: {
        libraryHaskellDepends = [ base configurator mtl rivet-core text ];
        description = "Basic deployment support for project management tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rl-satton" = callPackage
@@ -209257,8 +193644,6 @@ self: {
        ];
        description = "Collection of Reinforcement Learning algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rlglue" = callPackage
@@ -209281,8 +193666,6 @@ self: {
        ];
        description = "A Haskell codec for RL-Glue";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rlist" = callPackage
@@ -209318,8 +193701,6 @@ self: {
        executableHaskellDepends = [ ansi-terminal base options time ];
        description = "Ring-LWE/LWR challenges using Lol";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rmonad" = callPackage
@@ -209336,8 +193717,6 @@ self: {
        ];
        description = "Restricted monad library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rncryptor" = callPackage
@@ -209383,8 +193762,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "RNG within an IORef for convenient concurrent use";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rob" = callPackage
@@ -209406,8 +193783,6 @@ self: {
        testHaskellDepends = [ base directory ];
        description = "Simple projects generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "robin" = callPackage
@@ -209427,8 +193802,6 @@ self: {
        ];
        description = "A build daemon for Haskell development";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "robot" = callPackage
@@ -209462,8 +193835,6 @@ self: {
        ];
        description = "Parser for robots.txt";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "roc-cluster" = callPackage
@@ -209478,8 +193849,6 @@ self: {
        testHaskellDepends = [ base hspec HUnit ];
        description = "ROC online clustering algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "roc-cluster-demo" = callPackage
@@ -209497,8 +193866,6 @@ self: {
        ];
        description = "Gloss interactive demo for roc-cluster package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "roc-id" = callPackage
@@ -209561,24 +193928,6 @@ self: {
      }) {inherit (pkgs) rocksdb;};
 
   "rocksdb-query" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, conduit, data-default
-     , hspec, resourcet, rocksdb-haskell, unliftio
-     }:
-     mkDerivation {
-       pname = "rocksdb-query";
-       version = "0.2.0";
-       sha256 = "01n2zlbpldhx8rxvq89i9hsp99dvlhm6s4rwlygxd3y989an8bcf";
-       libraryHaskellDepends = [
-         base bytestring cereal conduit resourcet rocksdb-haskell unliftio
-       ];
-       testHaskellDepends = [
-         base cereal data-default hspec rocksdb-haskell unliftio
-       ];
-       description = "RocksDB database querying library for Haskell";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "rocksdb-query_0_3_1" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, data-default
      , hspec, resourcet, rocksdb-haskell, unliftio
      }:
@@ -209594,7 +193943,6 @@ self: {
        ];
        description = "RocksDB database querying library for Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roguestar" = callPackage
@@ -209681,8 +194029,6 @@ self: {
        ];
        description = "Bindings to Roku's External Control API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "roles" = callPackage
@@ -209732,8 +194078,6 @@ self: {
        ];
        description = "Core Rollbar data types and APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "roller" = callPackage
@@ -209754,8 +194098,6 @@ self: {
        ];
        description = "Playing with applicatives and dice!";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rolling-queue" = callPackage
@@ -209890,8 +194232,6 @@ self: {
        ];
        description = "Tools for manipulating fingertrees of bytestrings with optional annotations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rope-utf16-splay" = callPackage
@@ -209956,8 +194296,6 @@ self: {
        ];
        description = "A collection of rose tree structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rose-trie" = callPackage
@@ -209973,8 +194311,6 @@ self: {
        ];
        description = "Trees with polymorphic paths to nodes, combining properties of Rose Trees and Tries";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rosezipper" = callPackage
@@ -210018,8 +194354,6 @@ self: {
        ];
        description = "Haskell support for the ROS robotics framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rosmsg" = callPackage
@@ -210037,8 +194371,6 @@ self: {
        ];
        description = "ROS message parser, render, TH";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rosmsg-bin" = callPackage
@@ -210056,8 +194388,6 @@ self: {
        ];
        description = "ROS message management tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rospkg" = callPackage
@@ -210089,8 +194419,6 @@ self: {
        libraryHaskellDepends = [ base containers deepseq ];
        description = "General purpose utility library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rot13" = callPackage
@@ -210156,8 +194484,6 @@ self: {
        testHaskellDepends = [ base long-double ];
        description = "Correctly-rounded arbitrary-precision floating-point arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gmp; inherit (pkgs) mpfr;};
 
   "rounding" = callPackage
@@ -210169,8 +194495,6 @@ self: {
        libraryHaskellDepends = [ array base numeric-extras ];
        description = "Explicit floating point rounding mode wrappers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "roundtrip" = callPackage
@@ -210188,8 +194512,6 @@ self: {
        ];
        description = "Bidirectional (de-)serialization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "roundtrip-aeson" = callPackage
@@ -210210,8 +194532,6 @@ self: {
        ];
        description = "Un-/parse JSON with roundtrip invertible syntax definitions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "roundtrip-string" = callPackage
@@ -210223,8 +194543,6 @@ self: {
        libraryHaskellDepends = [ base mtl parsec roundtrip ];
        description = "Bidirectional (de-)serialization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "roundtrip-xml" = callPackage
@@ -210246,8 +194564,6 @@ self: {
        ];
        description = "Bidirectional (de-)serialization for XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "route-generator" = callPackage
@@ -210282,8 +194598,6 @@ self: {
        ];
        description = "A library and utilities for creating a route";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "row" = callPackage
@@ -210353,8 +194667,6 @@ self: {
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Build records from lists of strings, as from CSV files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rpc" = callPackage
@@ -210371,8 +194683,6 @@ self: {
        ];
        description = "type safe rpcs provided as basic IO actions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rpc-framework" = callPackage
@@ -210391,8 +194701,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "a remote procedure call framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rpf" = callPackage
@@ -210412,8 +194720,6 @@ self: {
        ];
        description = "Receiver Policy Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rpm" = callPackage
@@ -210427,29 +194733,9 @@ self: {
        libraryHaskellDepends = [ base directory filepath HaXml process ];
        description = "Cozy little project to question unruly rpm packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rpmbuild-order" = callPackage
-    ({ mkDerivation, base, Cabal, containers, directory
-     , explicit-exception, fgl, filepath, process, transformers
-     }:
-     mkDerivation {
-       pname = "rpmbuild-order";
-       version = "0.2.1";
-       sha256 = "10m0lqakkdmhqcnl959d0nhair8p1zxq400yryzc59idx1w60vdn";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base Cabal containers directory explicit-exception fgl filepath
-         process transformers
-       ];
-       description = "Order RPM packages by dependencies";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rpmbuild-order_0_3" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , fgl, filepath, optparse-applicative, process, simple-cmd-args
      }:
@@ -210465,7 +194751,6 @@ self: {
        ];
        description = "Order RPM packages by dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rsagl" = callPackage
@@ -210485,8 +194770,6 @@ self: {
        ];
        description = "The RogueStar Animation and Graphics Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rsagl-frp" = callPackage
@@ -210502,8 +194785,6 @@ self: {
        ];
        description = "The RogueStar Animation and Graphics Library: Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rsagl-math" = callPackage
@@ -210520,8 +194801,6 @@ self: {
        ];
        description = "The RogueStar Animation and Graphics Library: Mathematics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rset" = callPackage
@@ -210546,8 +194825,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A Rational Street Performer Protocol solver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rss" = callPackage
@@ -210591,8 +194868,6 @@ self: {
        ];
        description = "Streaming parser/renderer for the RSS standard";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rss2irc" = callPackage
@@ -210616,8 +194891,6 @@ self: {
        ];
        description = "watches an RSS/Atom feed and writes it to an IRC channel";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rstream" = callPackage
@@ -210721,8 +194994,6 @@ self: {
        ];
        description = "A library for communicating with RTorrent over its XML-RPC interface";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rtorrent-state" = callPackage
@@ -210762,8 +195033,6 @@ self: {
        executableHaskellDepends = [ base Cabal process ];
        description = "Dynamically load Haskell libraries";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rubberband" = callPackage
@@ -210800,8 +195069,6 @@ self: {
        ];
        description = "Parse a subset of Ruby objects serialised with Marshal.dump.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ruby-qq" = callPackage
@@ -210818,8 +195085,6 @@ self: {
        ];
        description = "rubyish quasiquoters";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ruff" = callPackage
@@ -210852,8 +195117,6 @@ self: {
        ];
        description = "Pliable records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ruler" = callPackage
@@ -210872,8 +195135,6 @@ self: {
        ];
        description = "Ruler tool for UHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ruler-core" = callPackage
@@ -210891,8 +195152,6 @@ self: {
          uulib
        ];
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "run-st" = callPackage
@@ -210904,8 +195163,6 @@ self: {
        libraryHaskellDepends = [ base primitive primitive-unlifted ];
        description = "runST without boxing penalty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rungekutta" = callPackage
@@ -210917,8 +195174,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A collection of explicit Runge-Kutta methods of various orders";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "runghc" = callPackage
@@ -210953,8 +195208,6 @@ self: {
        ];
        description = "Run multiple commands, interleaving output and errors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "runmemo" = callPackage
@@ -210977,22 +195230,21 @@ self: {
        libraryHaskellDepends = [ base ifcxt QuickCheck template-haskell ];
        description = "Runtime generation of Arbitrary values";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "rv" = callPackage
-    ({ mkDerivation, base, base-unicode-symbols, criterion, smallcheck
-     , tasty, tasty-smallcheck, util
+    ({ mkDerivation, base, base-unicode-symbols, criterion, Fin, peano
+     , smallcheck, tasty, tasty-smallcheck, util, word
      }:
      mkDerivation {
        pname = "rv";
-       version = "0.0.0.0";
-       sha256 = "17f9l2nixbnzmvhj9hb4lpc1aa80v4y5dlahahb370728a18jxjn";
-       libraryHaskellDepends = [ base base-unicode-symbols util ];
+       version = "0.0.1.0";
+       sha256 = "0xsrd9djlns840h4i7pgh4g793hdrjw8xhf6bnw8yxaf56j1znci";
+       libraryHaskellDepends = [
+         base base-unicode-symbols Fin peano util word
+       ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        benchmarkHaskellDepends = [ base criterion ];
-       doHaddock = false;
        description = "RISC-V";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -211043,8 +195295,6 @@ self: {
        ];
        description = "Packet Generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "s-cargot" = callPackage
@@ -211086,8 +195336,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "simple general-purpose s-expressions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "s3-signer" = callPackage
@@ -211129,13 +195377,11 @@ self: {
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
        pname = "safe-access";
-       version = "0.3.3.0";
-       sha256 = "0j3k6nlp3qch9kxv2zh5lfx1cfqy4w0xc7pbivqkn38drdjd920z";
+       version = "0.3.3.1";
+       sha256 = "13fw3b4sgrqymkq27n0727y5m8d3h6h44lfb9faip98bakr5d8v5";
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A simple environment to control access to data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-buffer-monad" = callPackage
@@ -211151,8 +195397,6 @@ self: {
        ];
        description = "A monadic buffer resilient to exceptions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-coerce" = callPackage
@@ -211241,8 +195485,6 @@ self: {
        ];
        description = "control-monad-exception Instances for safe-failure";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-foldable" = callPackage
@@ -211265,8 +195507,6 @@ self: {
        libraryHaskellDepends = [ base indexed mtl vector ];
        description = "Support for safely freezing multiple arrays in the ST monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-globals" = callPackage
@@ -211278,37 +195518,9 @@ self: {
        libraryHaskellDepends = [ base stm template-haskell ];
        description = "Safe top-level mutable variables which scope like ordinary values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-json" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, dlist
-     , generic-arbitrary, hashable, quickcheck-instances, scientific
-     , tasty, tasty-hunit, tasty-quickcheck, temporary, text, time
-     , unordered-containers, uuid, uuid-types, vector
-     }:
-     mkDerivation {
-       pname = "safe-json";
-       version = "0.1.0";
-       sha256 = "17h5z20fcqp6gsmml1zqhckxgvc7jrx4mzdcqbsjlmpy52hb0lxq";
-       libraryHaskellDepends = [
-         aeson base bytestring containers dlist hashable scientific tasty
-         tasty-hunit tasty-quickcheck text time unordered-containers
-         uuid-types vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers dlist generic-arbitrary hashable
-         quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
-         temporary text time unordered-containers uuid uuid-types vector
-       ];
-       description = "Automatic JSON format versioning";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "safe-json_1_1_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, dlist
      , generic-arbitrary, hashable, quickcheck-instances, scientific
      , tasty, tasty-hunit, tasty-quickcheck, temporary, text, time
@@ -211330,8 +195542,6 @@ self: {
        ];
        description = "Automatic JSON format versioning";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-lazy-io" = callPackage
@@ -211346,8 +195556,6 @@ self: {
        ];
        description = "A library providing safe lazy IO features";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-length" = callPackage
@@ -211365,8 +195573,6 @@ self: {
        ];
        description = "Tired of accidentally calling length on tuples? Relief at last!";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-money" = callPackage
@@ -211456,8 +195662,6 @@ self: {
        ];
        description = "Instances from the store library for the safe-money library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-money-xmlbf" = callPackage
@@ -211490,8 +195694,6 @@ self: {
        ];
        description = "A small wrapper over hs-plugins to allow loading safe plugins";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safe-printf" = callPackage
@@ -211511,35 +195713,9 @@ self: {
        ];
        description = "Well-typed, flexible and variadic printf for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safecopy" = callPackage
-    ({ mkDerivation, array, base, bytestring, cereal, containers, lens
-     , lens-action, old-time, QuickCheck, quickcheck-instances, tasty
-     , tasty-quickcheck, template-haskell, text, time, vector
-     }:
-     mkDerivation {
-       pname = "safecopy";
-       version = "0.9.4.3";
-       sha256 = "020z2cdarpy8crz6b871lprgacwi6zsmmwml35ban93hdfjv2zbq";
-       revision = "1";
-       editedCabalFile = "060yxbk2fy5gddnpf6kxppc9fwkhiyldm39bj7873wggnpdc2xds";
-       libraryHaskellDepends = [
-         array base bytestring cereal containers old-time template-haskell
-         text time vector
-       ];
-       testHaskellDepends = [
-         array base cereal containers lens lens-action QuickCheck
-         quickcheck-instances tasty tasty-quickcheck template-haskell time
-         vector
-       ];
-       description = "Binary serialization with version control";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "safecopy_0_10_2" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, containers
      , generic-data, HUnit, lens, lens-action, old-time, QuickCheck
      , quickcheck-instances, tasty, tasty-quickcheck, template-haskell
@@ -211560,7 +195736,6 @@ self: {
        ];
        description = "Binary serialization with version control";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safecopy-migrate" = callPackage
@@ -211601,8 +195776,6 @@ self: {
        ];
        description = "Binary serialization with version control";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safeint" = callPackage
@@ -211620,8 +195793,6 @@ self: {
        ];
        description = "overflow-checked Int type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safeio" = callPackage
@@ -211656,8 +195827,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Safe Paths in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safer-file-handles" = callPackage
@@ -211674,8 +195843,6 @@ self: {
        ];
        description = "Type-safe file handling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safer-file-handles-bytestring" = callPackage
@@ -211692,8 +195859,6 @@ self: {
        ];
        description = "Extends safer-file-handles with ByteString operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "safer-file-handles-text" = callPackage
@@ -211709,8 +195874,6 @@ self: {
        ];
        description = "Extends safer-file-handles with Text operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "saferoute" = callPackage
@@ -211722,8 +195885,6 @@ self: {
        libraryHaskellDepends = [ base blaze-html containers text ];
        description = "A simple type-safe routing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sai-shape-syb" = callPackage
@@ -211739,8 +195900,6 @@ self: {
        ];
        description = "Obtain homogeneous values from arbitrary values, transforming or culling data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sajson" = callPackage
@@ -211763,8 +195922,6 @@ self: {
        ];
        description = "Fast JSON parsing powered by Chad Austin's sajson library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sakuraio-platform" = callPackage
@@ -211836,8 +195993,6 @@ self: {
        ];
        description = "Configuration Loader for toml";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "salak-yaml" = callPackage
@@ -211895,8 +196050,6 @@ self: {
        ];
        description = "Quickcheck implementations for some NaCl data";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libsodium;};
 
   "salve" = callPackage
@@ -211929,8 +196082,6 @@ self: {
        ];
        description = "Modular web application framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "salvia-demo" = callPackage
@@ -211953,8 +196104,6 @@ self: {
        doHaddock = false;
        description = "Demo Salvia servers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "salvia-extras" = callPackage
@@ -211975,8 +196124,6 @@ self: {
        ];
        description = "Collection of non-fundamental handlers for the Salvia web server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "salvia-protocol" = callPackage
@@ -211993,8 +196140,6 @@ self: {
        ];
        description = "Salvia webserver protocol suite supporting URI, HTTP, Cookie and MIME";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "salvia-sessions" = callPackage
@@ -212012,8 +196157,6 @@ self: {
        ];
        description = "Session support for the Salvia webserver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "salvia-websocket" = callPackage
@@ -212030,8 +196173,6 @@ self: {
        ];
        description = "Websocket implementation for the Salvia Webserver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sample-frame" = callPackage
@@ -212090,8 +196231,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Binding to the C samtools library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "samtools-conduit" = callPackage
@@ -212112,8 +196251,6 @@ self: {
        ];
        description = "Conduit interface to SAM/BAM format files through samtools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "samtools-enumerator" = callPackage
@@ -212129,8 +196266,6 @@ self: {
        ];
        description = "Enumerator interface to SamTools library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "samtools-iteratee" = callPackage
@@ -212147,8 +196282,6 @@ self: {
        ];
        description = "Iteratee interface to SamTools library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sandi" = callPackage
@@ -212179,8 +196312,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "SAND data serialization and manipulation library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sandman" = callPackage
@@ -212210,8 +196341,6 @@ self: {
        libraryHaskellDepends = [ base deepseq portaudio ];
        description = "audio library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sarsi" = callPackage
@@ -212239,8 +196368,6 @@ self: {
        ];
        description = "A universal quickfix toolkit and his protocol";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sasl" = callPackage
@@ -212257,8 +196384,6 @@ self: {
        ];
        description = "SASL implementation using simple-pipe";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sat" = callPackage
@@ -212272,8 +196397,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "CNF SATisfier";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sat-micro-hs" = callPackage
@@ -212291,8 +196414,6 @@ self: {
        ];
        description = "A minimal SAT solver";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "satchmo" = callPackage
@@ -212311,8 +196432,6 @@ self: {
        testHaskellDepends = [ array base ];
        description = "SAT encoding monad";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "satchmo-backends" = callPackage
@@ -212328,8 +196447,6 @@ self: {
        ];
        description = "driver for external satchmo backends";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "satchmo-examples" = callPackage
@@ -212347,8 +196464,6 @@ self: {
        ];
        description = "examples that show how to use satchmo";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "satchmo-funsat" = callPackage
@@ -212364,8 +196479,6 @@ self: {
        ];
        description = "funsat driver as backend for satchmo";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "satchmo-minisat" = callPackage
@@ -212377,8 +196490,6 @@ self: {
        libraryHaskellDepends = [ base containers process satchmo ];
        description = "minisat driver as backend for satchmo";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "satchmo-toysat" = callPackage
@@ -212394,8 +196505,6 @@ self: {
        ];
        description = "toysat driver as backend for satchmo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "savage" = callPackage
@@ -212414,8 +196523,6 @@ self: {
        ];
        description = "re-export of the random generators from Hedgehog";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sax" = callPackage
@@ -212434,8 +196541,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec ];
        description = "Monadic streaming XML parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "say" = callPackage
@@ -212505,33 +196610,6 @@ self: {
      }) {};
 
   "sbv" = callPackage
-    ({ mkDerivation, array, async, base, bytestring, containers
-     , crackNum, deepseq, directory, doctest, filepath, generic-deriving
-     , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random, syb
-     , tasty, tasty-golden, tasty-hunit, tasty-quickcheck
-     , template-haskell, time, transformers, z3
-     }:
-     mkDerivation {
-       pname = "sbv";
-       version = "8.3";
-       sha256 = "0d2ph3wr6qga3x43w7xlrvdr63zzsx4x3xn8p7l994b6i7d6rdzd";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array async base containers crackNum deepseq directory filepath
-         generic-deriving ghc mtl pretty process QuickCheck random syb
-         template-haskell time transformers
-       ];
-       testHaskellDepends = [
-         base bytestring containers crackNum directory doctest filepath Glob
-         hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit
-         tasty-quickcheck template-haskell
-       ];
-       testSystemDepends = [ z3 ];
-       description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) z3;};
-
-  "sbv_8_5" = callPackage
     ({ mkDerivation, array, async, base, bytestring, containers
      , crackNum, criterion, deepseq, directory, doctest, filepath
      , generic-deriving, ghc, Glob, hlint, mtl, pretty, process
@@ -212540,8 +196618,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbv";
-       version = "8.5";
-       sha256 = "108j9b10sf7cv838g07lip17qx49d9lh9ajd3q2r0848szg0kf1p";
+       version = "8.6";
+       sha256 = "01y3dg8gprddn2477cw8k5a9a2gn0330qbpqyc3l2zbnwf3a2yga";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base containers crackNum deepseq directory filepath
@@ -212560,7 +196638,6 @@ self: {
        ];
        description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) z3;};
 
   "sbvPlugin" = callPackage
@@ -212580,8 +196657,6 @@ self: {
        ];
        description = "Formally prove properties of Haskell programs using SBV/SMT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sc2-lowlevel" = callPackage
@@ -212601,8 +196676,6 @@ self: {
        ];
        description = "Low-level Starcraft II API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sc2-proto" = callPackage
@@ -212622,8 +196695,6 @@ self: {
        libraryToolDepends = [ proto-lens-protoc protoc ];
        description = "A protocol buffer model for the Starcraft II bot API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {protoc = null;};
 
   "sc2-support" = callPackage
@@ -212680,8 +196751,6 @@ self: {
        libraryHaskellDepends = [ base hsc3 hsc3-db ];
        description = "Haskell bindings to sc3-rdu (sc3 rd ugens)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scalable-server" = callPackage
@@ -212699,8 +196768,6 @@ self: {
        ];
        description = "Library for writing fast/scalable TCP-based services";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scaleimage" = callPackage
@@ -212714,8 +196781,6 @@ self: {
        executableHaskellDepends = [ base filepath gd ];
        description = "Scale an image to a new geometry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scalendar" = callPackage
@@ -212732,8 +196797,6 @@ self: {
        ];
        description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scalp-webhooks" = callPackage
@@ -212760,8 +196823,6 @@ self: {
        ];
        description = "Test webhooks locally";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scalpel" = callPackage
@@ -212827,8 +196888,6 @@ self: {
        ];
        description = "Metadata types for Albedo Scanners";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scan-vector-machine" = callPackage
@@ -212841,8 +196900,6 @@ self: {
        testHaskellDepends = [ array base HUnit ];
        description = "An implementation of the Scan Vector Machine instruction set in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scanf" = callPackage
@@ -212939,8 +196996,6 @@ self: {
        ];
        description = "Streaming component combinators";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scenegraph" = callPackage
@@ -212957,8 +197012,6 @@ self: {
        ];
        description = "Scene Graph";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scgi" = callPackage
@@ -212991,8 +197044,6 @@ self: {
        ];
        description = "Marge schedules and show EVR";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "schedule" = callPackage
@@ -213033,40 +197084,9 @@ self: {
        ];
        description = "Find the ideal lesson layout";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scheduler" = callPackage
-    ({ mkDerivation, async, atomic-primops, base, Cabal, cabal-doctest
-     , criterion, deepseq, doctest, exceptions, genvalidity-hspec, hspec
-     , monad-par, mwc-random, parallel, primitive, QuickCheck, streamly
-     , template-haskell, unliftio, unliftio-core, vector
-     }:
-     mkDerivation {
-       pname = "scheduler";
-       version = "1.4.2.1";
-       sha256 = "074m037ksjl7kgpgfldimaadhc4f6mmv40y6cq54m9shhg7rxw1c";
-       revision = "1";
-       editedCabalFile = "0gz7mkd0nj2bxcjnn50jgyiaks5dbvpm6wy8ygp2c61nnddbv4xx";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         atomic-primops base deepseq exceptions primitive unliftio-core
-       ];
-       testHaskellDepends = [
-         base deepseq doctest genvalidity-hspec hspec mwc-random QuickCheck
-         template-haskell unliftio vector
-       ];
-       benchmarkHaskellDepends = [
-         async base criterion deepseq monad-par parallel streamly unliftio
-       ];
-       description = "Work stealing scheduler";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "scheduler_1_4_2_2" = callPackage
     ({ mkDerivation, async, atomic-primops, base, Cabal, cabal-doctest
      , criterion, deepseq, doctest, exceptions, genvalidity-hspec, hspec
      , monad-par, mwc-random, parallel, primitive, QuickCheck, streamly
@@ -213091,8 +197111,6 @@ self: {
        ];
        description = "Work stealing scheduler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "schedyield" = callPackage
@@ -213104,8 +197122,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Exposes standard POSIX function sched_yield";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "schema" = callPackage
@@ -213142,8 +197158,6 @@ self: {
        ];
        description = "schema guided serialization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "schematic" = callPackage
@@ -213172,8 +197186,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "JSON-biased spec and validation tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scholdoc" = callPackage
@@ -213218,8 +197230,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Converts ScholarlyMarkdown documents to HTML5/LaTeX/Docx format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scholdoc-citeproc" = callPackage
@@ -213253,8 +197263,6 @@ self: {
        ];
        description = "Scholdoc fork of pandoc-citeproc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scholdoc-texmath" = callPackage
@@ -213277,8 +197285,6 @@ self: {
        ];
        description = "Scholdoc fork of texmath";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scholdoc-types" = callPackage
@@ -213294,8 +197300,6 @@ self: {
        ];
        description = "Scholdoc fork of pandoc-types";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "schonfinkeling" = callPackage
@@ -213352,8 +197356,6 @@ self: {
        ];
        description = "Haskell query for SciDB via shim";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "science-constants" = callPackage
@@ -213379,8 +197381,6 @@ self: {
        ];
        description = "Mathematical/physical/chemical constants";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scientific" = callPackage
@@ -213426,8 +197426,6 @@ self: {
        ];
        description = "Scientific notation intended for tokenization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scion" = callPackage
@@ -213453,8 +197451,6 @@ self: {
        ];
        description = "Haskell IDE library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scion-browser" = callPackage
@@ -213489,8 +197485,6 @@ self: {
        ];
        description = "Command-line interface for browsing and searching packages documentation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scons2dot" = callPackage
@@ -213504,8 +197498,6 @@ self: {
        executableHaskellDepends = [ base bytestring containers process ];
        description = "Generates graphviz file of scons dependency information";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scope" = callPackage
@@ -213523,8 +197515,6 @@ self: {
        ];
        description = "An interactive renderer for plotting time-series data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scope-cairo" = callPackage
@@ -213548,8 +197538,6 @@ self: {
        ];
        description = "An interactive renderer for plotting time-series data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scottish" = callPackage
@@ -213567,8 +197555,6 @@ self: {
        ];
        description = "scotty with batteries included";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scotty" = callPackage
@@ -213614,8 +197600,6 @@ self: {
        ];
        description = "The Play Framework style data binding in Scotty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scotty-blaze" = callPackage
@@ -213630,8 +197614,6 @@ self: {
        ];
        description = "blaze-html integration for Scotty";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scotty-cookie" = callPackage
@@ -213672,8 +197654,6 @@ self: {
        ];
        description = "Fay integration for Scotty";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scotty-form" = callPackage
@@ -213687,8 +197667,6 @@ self: {
        ];
        description = "Html form validation using `ditto`";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scotty-format" = callPackage
@@ -213705,8 +197683,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Response format helper for the Scotty web framework";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scotty-hastache" = callPackage
@@ -213723,8 +197699,6 @@ self: {
        ];
        description = "Easy Mustache templating support for Scotty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scotty-params-parser" = callPackage
@@ -213768,8 +197742,6 @@ self: {
        ];
        description = "A Better way of modeling web resources";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scotty-rest" = callPackage
@@ -213795,8 +197767,6 @@ self: {
        ];
        description = "Webmachine-style REST library for scotty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scotty-session" = callPackage
@@ -213815,8 +197785,6 @@ self: {
        ];
        description = "Adding session functionality to scotty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scotty-tls" = callPackage
@@ -213846,8 +197814,6 @@ self: {
        libraryHaskellDepends = [ base scotty text transformers ];
        executableHaskellDepends = [ base scotty text transformers ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scp-streams" = callPackage
@@ -213869,8 +197835,6 @@ self: {
        testHaskellDepends = [ base bytestring io-streams ];
        description = "An SCP protocol implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scrabble-bot" = callPackage
@@ -213890,8 +197854,6 @@ self: {
        ];
        description = "Scrabble play generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scrapbook" = callPackage
@@ -213919,8 +197881,6 @@ self: {
        ];
        description = "Automatically derive Kotlin class to query servant webservices";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scrape-changes" = callPackage
@@ -213947,8 +197907,6 @@ self: {
        ];
        description = "Scrape websites for changes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "script-monad" = callPackage
@@ -213975,8 +197933,6 @@ self: {
        ];
        description = "Stack of error, reader, writer, state, and prompt monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scrobble" = callPackage
@@ -213999,8 +197955,6 @@ self: {
        ];
        description = "Scrobbling server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scroll" = callPackage
@@ -214097,8 +198051,6 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Fast CSV lexing on ByteString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "scyther-proof" = callPackage
@@ -214120,8 +198072,6 @@ self: {
        executableToolDepends = [ alex ];
        description = "Automatic generation of Isabelle/HOL correctness proofs for security protocols";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sde-solver" = callPackage
@@ -214140,8 +198090,6 @@ self: {
        ];
        description = "Distributed SDE solver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sdf2p1-parser" = callPackage
@@ -214219,8 +198167,6 @@ self: {
        ];
        description = "An image loading and rendering library for sdl2 / sdl2-cairo";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sdl2-compositor" = callPackage
@@ -214244,8 +198190,6 @@ self: {
        ];
        description = "image compositing with sdl2 - declarative style";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sdl2-fps" = callPackage
@@ -214259,8 +198203,6 @@ self: {
        libraryHaskellDepends = [ base sdl2 ];
        description = "Run of the mill, frames per second timer implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sdl2-gfx" = callPackage
@@ -214410,8 +198352,6 @@ self: {
        description = "A software defined radio library";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "seacat" = callPackage
@@ -214447,8 +198387,6 @@ self: {
        libraryHaskellDepends = [ base bytestring free mtl text ];
        description = "Pure SQL layer on top of other libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "seakale-postgresql" = callPackage
@@ -214464,8 +198402,6 @@ self: {
        ];
        description = "PostgreSQL backend for Seakale";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "seakale-tests" = callPackage
@@ -214481,8 +198417,6 @@ self: {
        ];
        description = "Helpers to test code using Seakale";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "seal-module" = callPackage
@@ -214524,8 +198458,6 @@ self: {
        testHaskellDepends = [ base containers doctest hspec ];
        description = "Common graph search algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sec" = callPackage
@@ -214537,8 +198469,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Semantic Editor Combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "secd" = callPackage
@@ -214569,8 +198499,6 @@ self: {
        executableHaskellDepends = [ base containers ];
        description = "SECDH Machine Simulator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "seclib" = callPackage
@@ -214582,8 +198510,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A simple library for static information-flow security in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "second-transfer" = callPackage
@@ -214611,8 +198537,6 @@ self: {
        testToolDepends = [ cpphs ];
        description = "Second Transfer HTTP/2 web server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "secp256k1" = callPackage
@@ -214636,8 +198560,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bindings for secp256k1 library from Bitcoin Core";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) secp256k1;};
 
   "secp256k1-haskell" = callPackage
@@ -214661,8 +198583,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bindings for secp256k1 library from Bitcoin Core";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {libsecp256k1 = null;};
 
   "secp256k1-legacy" = callPackage
@@ -214686,8 +198606,6 @@ self: {
        ];
        description = "fork of secp256k1";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "secret-santa" = callPackage
@@ -214705,8 +198623,6 @@ self: {
        ];
        description = "Secret Santa game assigner using QR-Codes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "secret-sharing" = callPackage
@@ -214727,8 +198643,6 @@ self: {
        ];
        description = "Information-theoretic secure secret sharing";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "secrm" = callPackage
@@ -214742,8 +198656,6 @@ self: {
        executableHaskellDepends = [ base haskell98 ];
        description = "Example of writing \"secure\" file removal in Haskell rather than C";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "secure-sockets" = callPackage
@@ -214799,27 +198711,9 @@ self: {
        librarySystemDepends = [ sedna ];
        description = "Sedna C API XML Binding";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {sedna = null;};
 
   "selda" = callPackage
-    ({ mkDerivation, base, bytestring, containers, exceptions, mtl
-     , random, text, time, uuid-types
-     }:
-     mkDerivation {
-       pname = "selda";
-       version = "0.4.0.0";
-       sha256 = "1dqxwhipfran95gknbgab3a2nxxyg7x7m69mxs4jnn2ly97gpvbi";
-       libraryHaskellDepends = [
-         base bytestring containers exceptions mtl random text time
-         uuid-types
-       ];
-       description = "Multi-backend, high-level EDSL for interacting with SQL databases";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "selda_0_5_1_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions, mtl
      , random, text, time, uuid-types
      }:
@@ -214833,7 +198727,6 @@ self: {
        ];
        description = "Multi-backend, high-level EDSL for interacting with SQL databases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "selda-json" = callPackage
@@ -214848,24 +198741,6 @@ self: {
      }) {};
 
   "selda-postgresql" = callPackage
-    ({ mkDerivation, base, bytestring, exceptions, postgresql-binary
-     , postgresql-libpq, selda, selda-json, text, time, uuid-types
-     }:
-     mkDerivation {
-       pname = "selda-postgresql";
-       version = "0.1.8.0";
-       sha256 = "0x7ncc8593lialllgsjdy759cinvgwh4spq2aarfd0j3zv78yvdi";
-       revision = "1";
-       editedCabalFile = "0zbx50lw8d5x7lsx9gpy2ql1n2nryhyd6x7w98lbnb3nzn3szzqr";
-       libraryHaskellDepends = [
-         base bytestring exceptions postgresql-binary postgresql-libpq selda
-         selda-json text time uuid-types
-       ];
-       description = "PostgreSQL backend for the Selda database EDSL";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "selda-postgresql_0_1_8_1" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, postgresql-binary
      , postgresql-libpq, selda, selda-json, text, time, uuid-types
      }:
@@ -214879,28 +198754,9 @@ self: {
        ];
        description = "PostgreSQL backend for the Selda database EDSL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "selda-sqlite" = callPackage
-    ({ mkDerivation, base, bytestring, direct-sqlite, directory
-     , exceptions, selda, text, time, uuid-types
-     }:
-     mkDerivation {
-       pname = "selda-sqlite";
-       version = "0.1.7.0";
-       sha256 = "0qiagfsd45v3vk1npdm8g28mlbdbnrp3drvb6hdnxyp3b5cmyzik";
-       revision = "1";
-       editedCabalFile = "0m9zps90idp41h3fggd30xjqyjy2yyyb572231w5m2ygl4kv8hvh";
-       libraryHaskellDepends = [
-         base bytestring direct-sqlite directory exceptions selda text time
-         uuid-types
-       ];
-       description = "SQLite backend for the Selda database EDSL";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "selda-sqlite_0_1_7_1" = callPackage
     ({ mkDerivation, base, bytestring, direct-sqlite, directory
      , exceptions, selda, text, time, uuid-types
      }:
@@ -214914,7 +198770,6 @@ self: {
        ];
        description = "SQLite backend for the Selda database EDSL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "select" = callPackage
@@ -214970,8 +198825,6 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "CSS Selectors for DOM traversal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "selenium" = callPackage
@@ -214983,8 +198836,6 @@ self: {
        libraryHaskellDepends = [ base HTTP HUnit mtl network pretty ];
        description = "Test web applications through a browser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "selenium-server" = callPackage
@@ -215004,8 +198855,6 @@ self: {
        testHaskellDepends = [ base hspec text webdriver ];
        description = "Run the selenium standalone server for usage with webdriver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "self-extract" = callPackage
@@ -215048,8 +198897,6 @@ self: {
        librarySystemDepends = [ selinux ];
        description = "SELinux bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {selinux = null;};
 
   "semantic" = callPackage
@@ -215083,8 +198930,6 @@ self: {
        ];
        description = "Types and functionality for working with source code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "semaphore-plus" = callPackage
@@ -215116,8 +198961,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Evaluate code snippets in Literate Haskell";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "semi-iso" = callPackage
@@ -215133,30 +198976,9 @@ self: {
        ];
        description = "Weakened partial isomorphisms, reversible computations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "semialign" = callPackage
-    ({ mkDerivation, base, base-compat, containers, hashable
-     , semigroupoids, tagged, these, transformers, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "semialign";
-       version = "1";
-       sha256 = "004x0a80sqqdgvsyk4z0nasxpi6z3g1d8kgwj804bj9ka8dlc75m";
-       revision = "1";
-       editedCabalFile = "0qnqnyfng4kwy2h2anrcy5id2ijnawava3zcc5h5b8ri1y6ks6zi";
-       libraryHaskellDepends = [
-         base base-compat containers hashable semigroupoids tagged these
-         transformers unordered-containers vector
-       ];
-       description = "Align and Zip type-classes from the common Semialign ancestor";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "semialign_1_1" = callPackage
     ({ mkDerivation, base, base-compat, containers, hashable
      , semigroupoids, tagged, these, transformers, unordered-containers
      , vector
@@ -215171,7 +198993,6 @@ self: {
        ];
        description = "Align and Zip type-classes from the common Semialign ancestor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semialign-extras" = callPackage
@@ -215190,8 +199011,6 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Extra functions for working with Semialigns";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "semialign-indexed" = callPackage
@@ -215208,8 +199027,6 @@ self: {
        ];
        description = "SemialignWithIndex, i.e. izipWith and ialignWith";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "semialign-optics" = callPackage
@@ -215226,8 +199043,6 @@ self: {
        ];
        description = "SemialignWithIndex, i.e. izipWith and ialignWith";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "semibounded-lattices" = callPackage
@@ -215240,8 +199055,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A Haskell implementation of semibounded lattices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "semigroupoid-extras" = callPackage
@@ -215294,24 +199107,9 @@ self: {
        ];
        description = "RebindableSyntax using the semigroupoids package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "semigroups" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "semigroups";
-       version = "0.18.5";
-       sha256 = "17g29h62g1k51ghhvzkw72zksjgi6vs6bfipkj81pqw1dsprcamb";
-       revision = "1";
-       editedCabalFile = "1inqcxrzzs8xz60pvbmznyi6g6xwzpxv7p6dqlcwariz31grzvs1";
-       libraryHaskellDepends = [ base ];
-       description = "Anything that associates";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "semigroups_0_19_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "semigroups";
@@ -215320,7 +199118,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Anything that associates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semigroups-actions" = callPackage
@@ -215332,8 +199129,6 @@ self: {
        libraryHaskellDepends = [ base containers semigroups ];
        description = "Semigroups actions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "semilattices" = callPackage
@@ -215352,8 +199147,6 @@ self: {
        ];
        description = "Semilattices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "semiring" = callPackage
@@ -215367,8 +199160,6 @@ self: {
        libraryHaskellDepends = [ base Boolean containers monoids ];
        description = "Semirings, ring-like structures used for dynamic programming applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "semiring-num" = callPackage
@@ -215394,8 +199185,6 @@ self: {
        ];
        description = "Basic semiring class and instances";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "semiring-simple" = callPackage
@@ -215415,10 +199204,8 @@ self: {
      }:
      mkDerivation {
        pname = "semirings";
-       version = "0.4.2";
-       sha256 = "0bfcbi9hs9mv06ahkvq3bpf4vw6jprlssc9s8yjfb05p151qnx5j";
-       revision = "1";
-       editedCabalFile = "1wrkcfblq3j2688xg8f1ial05sijkssmdm2rv9sw6jfxiays60vq";
+       version = "0.5.2";
+       sha256 = "1r7zh3gif49rhy9kwq56r3lryjkkdnxzj1md1p9nh0ld3blagdsz";
        libraryHaskellDepends = [
          base containers hashable integer-gmp unordered-containers
        ];
@@ -215426,14 +199213,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "semirings_0_5_2" = callPackage
+  "semirings_0_5_3" = callPackage
     ({ mkDerivation, base, containers, hashable, integer-gmp
      , unordered-containers
      }:
      mkDerivation {
        pname = "semirings";
-       version = "0.5.2";
-       sha256 = "1r7zh3gif49rhy9kwq56r3lryjkkdnxzj1md1p9nh0ld3blagdsz";
+       version = "0.5.3";
+       sha256 = "16qdh0d5mazxkzpa0xsiv635771zspzbiqmy5qy2rcsxb79p36lc";
        libraryHaskellDepends = [
          base containers hashable integer-gmp unordered-containers
        ];
@@ -215502,8 +199289,6 @@ self: {
        ];
        description = "Sengrid API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sendgrid-v3" = callPackage
@@ -215518,8 +199303,6 @@ self: {
        testHaskellDepends = [ base semigroups tasty tasty-hunit text ];
        description = "Sendgrid v3 API library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sensei" = callPackage
@@ -215547,8 +199330,6 @@ self: {
        ];
        description = "Automatically run Hspec tests on file modifications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sensenet" = callPackage
@@ -215566,8 +199347,6 @@ self: {
        ];
        description = "Distributed sensor network for the raspberry pi";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sensu-run" = callPackage
@@ -215578,8 +199357,8 @@ self: {
      }:
      mkDerivation {
        pname = "sensu-run";
-       version = "0.7.0.4";
-       sha256 = "15grlz2rklpnkhfb8xshkh8d7nxdjlzrfnlhk3ds478nqlqnnmll";
+       version = "0.7.0.5";
+       sha256 = "06bzlhrw11sazqv7jdi3rdhapcfp7ascg9fd83svs8zm9wba60xx";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -215602,8 +199381,6 @@ self: {
        ];
        description = "Easily generating message of japanese natural language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sentiwordnet-parser" = callPackage
@@ -215640,8 +199417,6 @@ self: {
        executableHaskellDepends = [ base directory filepath unix ];
        description = "Process monitoring tool written and configured in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "senza" = callPackage
@@ -215689,8 +199464,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "SmartyPants for Korean language";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "separated" = callPackage
@@ -215737,8 +199510,6 @@ self: {
        ];
        description = "Dynamic strictness control, including space leak repair";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "seqalign" = callPackage
@@ -215762,7 +199533,6 @@ self: {
        description = "Sequence ID production and consumption";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "seqid" = callPackage
@@ -215774,8 +199544,6 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Sequence ID production and consumption";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "seqid-streams_0_1_0" = callPackage
@@ -215788,7 +199556,6 @@ self: {
        description = "Sequence ID IO-Streams";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "seqid-streams" = callPackage
@@ -215800,8 +199567,6 @@ self: {
        libraryHaskellDepends = [ base io-streams seqid ];
        description = "Sequence ID IO-Streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "seqloc" = callPackage
@@ -215822,8 +199587,6 @@ self: {
        ];
        description = "Handle sequence locations for bioinformatics";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "seqloc-datafiles" = callPackage
@@ -215857,8 +199620,6 @@ self: {
        ];
        description = "Read and write BED and GTF format genome annotations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sequence" = callPackage
@@ -215894,8 +199655,6 @@ self: {
        ];
        description = "A package with basic parsing utilities for several Bioinformatic data formats";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sequenceTools" = callPackage
@@ -215924,8 +199683,6 @@ self: {
        ];
        description = "A package with tools for processing DNA sequencing data";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sequent-core" = callPackage
@@ -215941,8 +199698,6 @@ self: {
        ];
        description = "Alternative Core language for GHC plugins";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sequential-index" = callPackage
@@ -215977,8 +199732,6 @@ self: {
        ];
        description = "A sequence labeler based on Collins's sequence perceptron";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "serf" = callPackage
@@ -216072,8 +199825,6 @@ self: {
        ];
        description = "Instances for Serialize of cereal";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "serialport" = callPackage
@@ -216116,8 +199867,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "General-purpose functions by Serokell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "serpentine" = callPackage
@@ -216136,8 +199885,6 @@ self: {
        executableHaskellDepends = [ base singletons text ];
        description = "Simple project template from stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "serv" = callPackage
@@ -216151,8 +199898,6 @@ self: {
        ];
        description = "Dependently typed API framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "serv-wai" = callPackage
@@ -216177,8 +199922,6 @@ self: {
        ];
        description = "Dependently typed API servers with Serv";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant" = callPackage
@@ -216282,8 +200025,6 @@ self: {
        ];
        description = "generic tests for aeson serialization in servant";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth" = callPackage
@@ -216353,8 +200094,6 @@ self: {
        ];
        description = "Authentication via encrypted cookies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-docs" = callPackage
@@ -216414,39 +200153,9 @@ self: {
        ];
        description = "Authentication via HMAC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-server" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
-     , bytestring, case-insensitive, cookie, data-default-class, entropy
-     , hspec, hspec-discover, http-client, http-types, jose, lens
-     , lens-aeson, markdown-unlit, memory, monad-time, mtl, QuickCheck
-     , servant, servant-auth, servant-server, tagged, text, time
-     , transformers, unordered-containers, wai, warp, wreq
-     }:
-     mkDerivation {
-       pname = "servant-auth-server";
-       version = "0.4.5.0";
-       sha256 = "0jvx3lj48r0awnyv87qcbf64xmqzp48bdx98xwcnrh2hk8agr56y";
-       libraryHaskellDepends = [
-         aeson base base64-bytestring blaze-builder bytestring
-         case-insensitive cookie data-default-class entropy http-types jose
-         lens memory monad-time mtl servant servant-auth servant-server
-         tagged text time unordered-containers wai
-       ];
-       testHaskellDepends = [
-         aeson base bytestring case-insensitive hspec http-client http-types
-         jose lens lens-aeson mtl QuickCheck servant servant-auth
-         servant-server time transformers wai warp wreq
-       ];
-       testToolDepends = [ hspec-discover markdown-unlit ];
-       description = "servant-server/servant-auth compatibility";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-auth-server_0_4_5_1" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
      , bytestring, case-insensitive, cookie, data-default-class, entropy
      , hspec, hspec-discover, http-client, http-types, jose, lens
@@ -216472,7 +200181,6 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "servant-server/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-swagger" = callPackage
@@ -216514,8 +200222,6 @@ self: {
        ];
        description = "Servant based API and server for token based authorisation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-token-acid" = callPackage
@@ -216537,8 +200243,6 @@ self: {
        ];
        description = "Acid-state backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-token-api" = callPackage
@@ -216555,8 +200259,6 @@ self: {
        ];
        description = "Servant based API for token based authorisation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-token-leveldb" = callPackage
@@ -216578,8 +200280,6 @@ self: {
        ];
        description = "Leveldb backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-token-persistent" = callPackage
@@ -216599,8 +200299,6 @@ self: {
        ];
        description = "Persistent backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-token-rocksdb" = callPackage
@@ -216623,8 +200321,6 @@ self: {
        ];
        description = "RocksDB backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-auth-wordpress" = callPackage
@@ -216742,37 +200438,6 @@ self: {
      }) {};
 
   "servant-cli" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive
-     , containers, filepath, free, functor-combinators, http-client
-     , http-types, optparse-applicative, profunctors, random
-     , recursion-schemes, servant, servant-client, servant-client-core
-     , servant-docs, servant-server, text, transformers, vinyl, warp
-     }:
-     mkDerivation {
-       pname = "servant-cli";
-       version = "0.1.0.1";
-       sha256 = "12d18ca90b7mijaav3glx60b9c9qd1f2g4p5m4m7hzz2m22dyimn";
-       revision = "1";
-       editedCabalFile = "1h29x87kqyylwigz86bwrgjdykk1119alsy65a7jkkcrj7a3syqa";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring case-insensitive containers filepath free
-         functor-combinators http-types optparse-applicative profunctors
-         recursion-schemes servant servant-client-core servant-docs text
-         transformers vinyl
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring containers http-client optparse-applicative
-         random servant servant-client servant-server text vinyl warp
-       ];
-       description = "Command line interface for Servant API clients";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "servant-cli_0_1_0_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
      , containers, filepath, free, functor-combinators, http-client
      , http-types, optparse-applicative, profunctors, random
@@ -216797,8 +200462,6 @@ self: {
        ];
        description = "Command line interface for Servant API clients";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-client" = callPackage
@@ -216926,8 +200589,6 @@ self: {
        ];
        description = "Automatically derive API client functions with named and optional parameters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-conduit" = callPackage
@@ -216969,8 +200630,6 @@ self: {
        ];
        description = "Generate servant client library for C#";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-db" = callPackage
@@ -216982,8 +200641,6 @@ self: {
        libraryHaskellDepends = [ base servant ];
        description = "Servant types for defining API with relational DBs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-db-postgresql" = callPackage
@@ -217009,8 +200666,6 @@ self: {
        ];
        description = "Derive a postgres client to database API specified by servant-db";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-dhall" = callPackage
@@ -217032,8 +200687,6 @@ self: {
        ];
        description = "Servant Dhall content-type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-docs" = callPackage
@@ -217143,28 +200796,6 @@ self: {
      }) {};
 
   "servant-elm" = callPackage
-    ({ mkDerivation, aeson, base, Diff, directory, elm-bridge, hspec
-     , HUnit, lens, servant, servant-client, servant-foreign, text
-     , wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "servant-elm";
-       version = "0.6.1";
-       sha256 = "0ajgb2srx2wlxn388wcijn7pb6lk48r84qvbbri7b77rbiav3ih2";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base directory elm-bridge lens servant servant-foreign text
-         wl-pprint-text
-       ];
-       testHaskellDepends = [
-         aeson base Diff elm-bridge hspec HUnit servant servant-client text
-       ];
-       description = "Automatically derive Elm functions to query servant webservices";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-elm_0_7_1" = callPackage
     ({ mkDerivation, aeson, base, Diff, directory, elm-bridge, hspec
      , HUnit, lens, servant, servant-client, servant-foreign, text
      , wl-pprint-text
@@ -217184,7 +200815,6 @@ self: {
        ];
        description = "Automatically derive Elm functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-errors" = callPackage
@@ -217226,8 +200856,6 @@ self: {
        ];
        description = "Example programs for servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-exceptions" = callPackage
@@ -217248,8 +200876,6 @@ self: {
          aeson base exceptions http-types servant-server text warp
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-fiat-content" = callPackage
@@ -217324,8 +200950,6 @@ self: {
        libraryHaskellDepends = [ base servant servant-server ];
        description = "Utilities for generating mock server implementations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-generic" = callPackage
@@ -217342,8 +200966,6 @@ self: {
        ];
        description = "Specify Servant APIs with records";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-github" = callPackage
@@ -217367,8 +200989,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Bindings to GitHub API using servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-github-webhook" = callPackage
@@ -217418,8 +201038,6 @@ self: {
        ];
        description = "automatical derivation of querying functions for servant webservices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-hmac-auth" = callPackage
@@ -217446,46 +201064,9 @@ self: {
        testHaskellDepends = [ base ];
        description = "Servant authentication with HMAC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-http-streams" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, bytestring
-     , case-insensitive, containers, deepseq, entropy, exceptions, hspec
-     , hspec-discover, http-api-data, http-common, http-media
-     , http-streams, http-types, HUnit, io-streams, kan-extensions
-     , markdown-unlit, monad-control, mtl, network, QuickCheck
-     , semigroupoids, servant, servant-client-core, servant-server, stm
-     , tdigest, text, time, transformers, transformers-base
-     , transformers-compat, wai, warp
-     }:
-     mkDerivation {
-       pname = "servant-http-streams";
-       version = "0.16.0.1";
-       sha256 = "0nfwi8bnafv78lzxxi56i9pyk2rj0vkl5x193fixirw4fjvia3zg";
-       libraryHaskellDepends = [
-         base base-compat bytestring case-insensitive containers deepseq
-         exceptions http-common http-media http-streams http-types
-         io-streams kan-extensions monad-control mtl semigroupoids servant
-         servant-client-core text time transformers transformers-base
-         transformers-compat
-       ];
-       testHaskellDepends = [
-         aeson base base-compat bytestring deepseq entropy hspec
-         http-api-data http-streams http-types HUnit kan-extensions
-         markdown-unlit mtl network QuickCheck servant servant-client-core
-         servant-server stm tdigest text transformers transformers-compat
-         wai warp
-       ];
-       testToolDepends = [ hspec-discover markdown-unlit ];
-       description = "Automatic derivation of querying functions for servant";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "servant-http-streams_0_17" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring
      , case-insensitive, containers, deepseq, entropy, exceptions, hspec
      , hspec-discover, http-api-data, http-common, http-media
@@ -217516,8 +201097,6 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Automatic derivation of querying functions for servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-http2-client" = callPackage
@@ -217542,8 +201121,6 @@ self: {
        ];
        description = "Generate HTTP2 clients from Servant API descriptions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-iCalendar" = callPackage
@@ -217560,8 +201137,6 @@ self: {
        ];
        description = "Servant support for iCalendar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-jquery" = callPackage
@@ -217580,8 +201155,6 @@ self: {
        ];
        description = "Automatically derive (jquery) javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-js" = callPackage
@@ -217758,8 +201331,6 @@ self: {
        ];
        description = "Matrix parameter combinator for servant";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-mock" = callPackage
@@ -217873,8 +201444,6 @@ self: {
        testHaskellDepends = [ base hspec named QuickCheck servant ];
        description = "Combinators for servant providing named parameters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-nix" = callPackage
@@ -217896,8 +201465,6 @@ self: {
        ];
        description = "Servant Nix content-type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-options" = callPackage
@@ -217948,8 +201515,6 @@ self: {
        ];
        description = "Use Pandoc to render servant API documentation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-pipes" = callPackage
@@ -217986,8 +201551,6 @@ self: {
        libraryHaskellDepends = [ base resource-pool servant time ];
        description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-postgresql" = callPackage
@@ -218004,8 +201567,6 @@ self: {
        ];
        description = "Useful functions and instances for using servant with a PostgreSQL context";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-proto-lens" = callPackage
@@ -218028,8 +201589,6 @@ self: {
        ];
        description = "Servant Content-Type for proto-lens protobuf modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-purescript" = callPackage
@@ -218053,8 +201612,6 @@ self: {
        ];
        description = "Generate PureScript accessor functions for you servant API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-pushbullet-client" = callPackage
@@ -218074,8 +201631,6 @@ self: {
        ];
        description = "Bindings to the Pushbullet API using servant-client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-py" = callPackage
@@ -218097,8 +201652,6 @@ self: {
        ];
        description = "Automatically derive python functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-quickcheck" = callPackage
@@ -218127,8 +201680,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "QuickCheck entire APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-rawm" = callPackage
@@ -218177,8 +201728,6 @@ self: {
        ];
        description = "Derive Reason types to interact with a Haskell backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-reflex" = callPackage
@@ -218201,8 +201750,6 @@ self: {
        ];
        description = "servant API generator for reflex apps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-response" = callPackage
@@ -218235,8 +201782,6 @@ self: {
        ];
        description = "Servant router for non-server applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-ruby" = callPackage
@@ -218269,8 +201814,6 @@ self: {
        ];
        description = "Generate a web service for servant 'Resource's using scotty and JSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-server" = callPackage
@@ -218365,8 +201908,6 @@ self: {
        ];
        description = "Automatically derive API server functions with named and optional parameters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-smsc-ru" = callPackage
@@ -218389,8 +201930,6 @@ self: {
        ];
        description = "Servant client for smsc.ru service for sending SMS to cell phones";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-snap" = callPackage
@@ -218428,8 +201967,6 @@ self: {
        ];
        description = "A family of combinators for defining webservices APIs and serving them";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-stache" = callPackage
@@ -218478,8 +202015,6 @@ self: {
        ];
        description = "Embed a directory of static files in your Servant server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-streaming" = callPackage
@@ -218494,8 +202029,6 @@ self: {
        testHaskellDepends = [ base hspec http-types QuickCheck servant ];
        description = "Servant combinators for the 'streaming' package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-streaming-client" = callPackage
@@ -218521,8 +202054,6 @@ self: {
        ];
        description = "Client instances for the 'servant-streaming' package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-streaming-docs" = callPackage
@@ -218540,8 +202071,6 @@ self: {
        ];
        description = "Client instances for the 'servant-docs' package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-streaming-server" = callPackage
@@ -218568,8 +202097,6 @@ self: {
        ];
        description = "Server instances for the 'servant-streaming' package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-subscriber" = callPackage
@@ -218596,8 +202123,6 @@ self: {
        executableHaskellDepends = [ base purescript-bridge ];
        description = "When REST is not enough ...";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-swagger" = callPackage
@@ -218673,8 +202198,6 @@ self: {
        ];
        description = "Swagger Tags for Servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-swagger-ui" = callPackage
@@ -218825,8 +202348,6 @@ self: {
        ];
        description = "Servant Integration for Waargonaut JSON Package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-websockets" = callPackage
@@ -218849,8 +202370,6 @@ self: {
        ];
        description = "Small library providing WebSocket endpoints for servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-xml" = callPackage
@@ -218866,8 +202385,6 @@ self: {
        ];
        description = "Servant support for the XML Content-Type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-yaml" = callPackage
@@ -218900,8 +202417,6 @@ self: {
        libraryHaskellDepends = [ base singletons ];
        description = "Types and definitions of servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-zeppelin-client" = callPackage
@@ -218925,8 +202440,6 @@ self: {
        ];
        description = "Client library for servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-zeppelin-server" = callPackage
@@ -218950,8 +202463,6 @@ self: {
        ];
        description = "Server library for servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "servant-zeppelin-swagger" = callPackage
@@ -218973,8 +202484,6 @@ self: {
        ];
        description = "Swagger instances for servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "server-generic" = callPackage
@@ -218990,12 +202499,10 @@ self: {
        ];
        description = "Auto-generate a server for your datatype";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "serverless-haskell" = callPackage
-    ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core
+    ({ mkDerivation, aeson, aeson-casing, amazonka-core
      , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive
      , hspec, hspec-discover, http-types, iproute, lens, network
      , network-simple, raw-strings-qq, text, time, unix
@@ -219003,18 +202510,18 @@ self: {
      }:
      mkDerivation {
        pname = "serverless-haskell";
-       version = "0.10.0";
-       sha256 = "0ja15985r9jywlkc85r3qchi6i9mbkyjh3b0fkn6vwc8gh644nrk";
+       version = "0.10.1";
+       sha256 = "18iqj3c60sx6v1d8lnlv0gcd1xrpvjwqwnshsi2n823dp1j975gp";
        libraryHaskellDepends = [
-         aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
-         amazonka-s3 base bytestring case-insensitive http-types iproute
-         lens network network-simple text time unix unordered-containers
+         aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base
+         bytestring case-insensitive http-types iproute lens network
+         network-simple text time unix unordered-containers
        ];
        testHaskellDepends = [
-         aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
-         amazonka-s3 base bytestring case-insensitive hspec hspec-discover
-         http-types iproute lens network network-simple raw-strings-qq text
-         time unix unordered-containers
+         aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base
+         bytestring case-insensitive hspec hspec-discover http-types iproute
+         lens network network-simple raw-strings-qq text time unix
+         unordered-containers
        ];
        testToolDepends = [ hspec-discover ];
        description = "Deploying Haskell code onto AWS Lambda using Serverless";
@@ -219061,8 +202568,6 @@ self: {
        ];
        description = "Storage backend for serversession using acid-state";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "serversession-backend-persistent" = callPackage
@@ -219110,8 +202615,6 @@ self: {
        ];
        description = "Storage backend for serversession using Redis";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "serversession-frontend-snap" = callPackage
@@ -219129,8 +202632,6 @@ self: {
        ];
        description = "Snap bindings for serversession";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "serversession-frontend-wai" = callPackage
@@ -219166,8 +202667,6 @@ self: {
        ];
        description = "Yesod bindings for serversession";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "services" = callPackage
@@ -219185,8 +202684,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Tools for building services";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "serviette" = callPackage
@@ -219236,8 +202733,6 @@ self: {
        ];
        description = "Send HTML formatted emails using Amazon's SES REST API with blaze";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ses-html-snaplet" = callPackage
@@ -219254,8 +202749,6 @@ self: {
        ];
        description = "Snaplet for the ses-html package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sessions" = callPackage
@@ -219270,8 +202763,6 @@ self: {
        ];
        description = "Session Types for Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sessiontypes" = callPackage
@@ -219293,8 +202784,6 @@ self: {
        testHaskellDepends = [ base directory exceptions hspec ];
        description = "Session types library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sessiontypes-distributed" = callPackage
@@ -219317,30 +202806,9 @@ self: {
        ];
        description = "Session types distributed";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "set-cover" = callPackage
-    ({ mkDerivation, base, containers, enummapset, psqueues, semigroups
-     , utility-ht
-     }:
-     mkDerivation {
-       pname = "set-cover";
-       version = "0.0.9";
-       sha256 = "1qbk5y2pg6jlclszd2nras5240r0ahapsibykkcqrxhgq0hgvsxg";
-       revision = "2";
-       editedCabalFile = "1jpg9iyq0mymdbq392nfmicwfmcmq5mg688ndmhvjx08ljdl54ha";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers enummapset psqueues semigroups utility-ht
-       ];
-       description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "set-cover_0_1" = callPackage
     ({ mkDerivation, array, base, containers, enummapset, non-empty
      , prelude-compat, psqueues, QuickCheck, random, semigroups, timeit
      , transformers, utility-ht
@@ -219364,7 +202832,6 @@ self: {
        ];
        description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "set-extra" = callPackage
@@ -219415,8 +202882,6 @@ self: {
        ];
        description = "Set of elements sorted by a different data type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "setdown" = callPackage
@@ -219436,8 +202901,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Treating files as sets to perform rapid set manipulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "setenv" = callPackage
@@ -219467,8 +202930,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A console interface to the game of Set";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "setlocale" = callPackage
@@ -219500,8 +202961,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A Haskell implementation of setoid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "setop" = callPackage
@@ -219566,8 +203025,6 @@ self: {
        ];
        description = "Ducktyped set interface for Haskell containers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "setters" = callPackage
@@ -219581,8 +203038,6 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Small (TH) library to declare setters for typical `record' data type fields";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "settings" = callPackage
@@ -219618,39 +203073,9 @@ self: {
        ];
        description = "S-Expression parsing/printing made fun and easy";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sexp-grammar" = callPackage
-    ({ mkDerivation, alex, array, base, bytestring, containers
-     , criterion, deepseq, happy, invertible-grammar, prettyprinter
-     , QuickCheck, recursion-schemes, scientific, semigroups, tasty
-     , tasty-hunit, tasty-quickcheck, text, utf8-string
-     }:
-     mkDerivation {
-       pname = "sexp-grammar";
-       version = "2.0.2";
-       sha256 = "1cmn5y72wp9dlzqzrv4rmfb1zm3zw517la0kf0vgyv3nhsn58397";
-       libraryHaskellDepends = [
-         array base bytestring containers deepseq invertible-grammar
-         prettyprinter recursion-schemes scientific semigroups text
-         utf8-string
-       ];
-       libraryToolDepends = [ alex happy ];
-       testHaskellDepends = [
-         base containers invertible-grammar prettyprinter QuickCheck
-         scientific semigroups tasty tasty-hunit tasty-quickcheck text
-         utf8-string
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion deepseq text
-       ];
-       description = "Invertible grammar combinators for S-expressions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "sexp-grammar_2_1_0" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, containers
      , criterion, deepseq, happy, invertible-grammar, prettyprinter
      , QuickCheck, recursion-schemes, scientific, semigroups, tasty
@@ -219676,7 +203101,6 @@ self: {
        ];
        description = "Invertible grammar combinators for S-expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sexp-show" = callPackage
@@ -219710,23 +203134,6 @@ self: {
      }) {};
 
   "sexpr-parser" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, megaparsec, process }:
-     mkDerivation {
-       pname = "sexpr-parser";
-       version = "0.1.1.2";
-       sha256 = "183l1d8kjzv2is7kdaa83jbr46w61fn2g7yrvc3wjmwsnrylfj29";
-       revision = "3";
-       editedCabalFile = "0sv07n6s023z2dl6n89kx26nnc3nrkpmbbfj4sqcrj6i3q4k06g4";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base megaparsec ];
-       executableHaskellDepends = [ base bytestring megaparsec process ];
-       testHaskellDepends = [ base hspec megaparsec ];
-       description = "Simple s-expression parser";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "sexpr-parser_0_2_0_0" = callPackage
     ({ mkDerivation, base, bytestring, data-default, hspec, megaparsec
      , process
      }:
@@ -219741,7 +203148,6 @@ self: {
        testHaskellDepends = [ base data-default hspec megaparsec ];
        description = "Simple s-expression parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sexpresso" = callPackage
@@ -219778,8 +203184,6 @@ self: {
        ];
        description = "Lists, Texts, ByteStrings and Vectors with type-encoded length";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sfml-audio" = callPackage
@@ -219804,8 +203208,6 @@ self: {
        libraryHaskellDepends = [ base bytestring entropy primitive ];
        description = "SIMD-oriented Fast Mersenne Twister(SFMT) binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sfnt2woff" = callPackage
@@ -219826,8 +203228,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A command line tool to convert TrueType/OpenType fonts to WOFF format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "sgd" = callPackage
@@ -219852,8 +203252,6 @@ self: {
        ];
        description = "Stochastic gradient descent library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sgf" = callPackage
@@ -219870,8 +203268,6 @@ self: {
        ];
        description = "SGF (Smart Game Format) parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sgrep" = callPackage
@@ -219885,8 +203281,6 @@ self: {
        executableHaskellDepends = [ base bio regex-compat ];
        description = "Sgrep - grep Fasta files for sequences matching a regular expression";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sh2md" = callPackage
@@ -219913,8 +203307,6 @@ self: {
        ];
        description = "Record your shell session and print in the markdown format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sha-streams" = callPackage
@@ -219929,8 +203321,6 @@ self: {
        executableHaskellDepends = [ base io-streams SHA ];
        description = "SHA hashes for io-streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shade" = callPackage
@@ -219944,8 +203334,6 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A control structure used to combine heterogenous types with delayed effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shadower" = callPackage
@@ -219968,8 +203356,6 @@ self: {
        ];
        description = "An automated way to run doctests in files that are changing";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shadowsocks" = callPackage
@@ -220087,8 +203473,6 @@ self: {
        ];
        description = "Utilities for building ATS projects with shake";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shake-c" = callPackage
@@ -220131,8 +203515,6 @@ self: {
        ];
        description = "Utility for building Shake build systems using Cabal sandboxes";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shake-ccjs" = callPackage
@@ -220181,8 +203563,6 @@ self: {
        ];
        description = "Extra utilities for shake build systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shake-google-closure-compiler" = callPackage
@@ -220236,8 +203616,6 @@ self: {
        ];
        description = "Shake Minify Rules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shake-minify-css" = callPackage
@@ -220262,8 +203640,6 @@ self: {
        libraryHaskellDepends = [ base bytestring bzlib shake tar ];
        description = "Shake File Pack Rule";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shake-path" = callPackage
@@ -220275,8 +203651,6 @@ self: {
        libraryHaskellDepends = [ base path path-io shake ];
        description = "path alternatives to shake functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shake-persist" = callPackage
@@ -220294,8 +203668,6 @@ self: {
        executableHaskellDepends = [ base shake ];
        description = "Shake build system on-disk caching";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shaker" = callPackage
@@ -220324,8 +203696,6 @@ self: {
        ];
        description = "simple and interactive command-line build tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shakers" = callPackage
@@ -220381,8 +203751,6 @@ self: {
        ];
        description = "compile es2015";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shakespeare-css" = callPackage
@@ -220434,8 +203802,6 @@ self: {
        ];
        description = "SASS support for Shakespeare and Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shakespeare-text" = callPackage
@@ -220507,8 +203873,6 @@ self: {
        ];
        description = "Generics using @(,)@ and @Either@, with algebraic operations and typed conversions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shapes" = callPackage
@@ -220606,8 +203970,6 @@ self: {
        ];
        description = "A circular buffer built on shared memory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shared-fields" = callPackage
@@ -220621,8 +203983,6 @@ self: {
        testHaskellDepends = [ base Cabal hspec lens text ];
        description = "a tiny library for using shared lens fields";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shared-memory" = callPackage
@@ -220662,8 +204022,6 @@ self: {
        executableHaskellDepends = [ base filepath mtl ];
        description = "A Haskell preprocessor adding miscellaneous features";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shelduck" = callPackage
@@ -220694,8 +204052,6 @@ self: {
        ];
        description = "Test webhooks locally";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shell-conduit" = callPackage
@@ -220758,8 +204114,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Pipe streams through external shell commands";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shell-utility" = callPackage
@@ -220787,8 +204141,6 @@ self: {
        ];
        description = "shell-/perl- like (systems) programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shellmate" = callPackage
@@ -220805,8 +204157,6 @@ self: {
        ];
        description = "Simple interface for shell scripting in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shellmate-extras" = callPackage
@@ -220823,8 +204173,6 @@ self: {
        ];
        description = "Extra functionality for shellmate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shellmet" = callPackage
@@ -220891,37 +204239,6 @@ self: {
      }) {};
 
   "shelly" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, directory
-     , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib
-     , HUnit, lifted-async, lifted-base, monad-control, mtl, process
-     , system-fileio, system-filepath, text, time, transformers
-     , transformers-base, unix, unix-compat
-     }:
-     mkDerivation {
-       pname = "shelly";
-       version = "1.8.1";
-       sha256 = "023fbvbqs5gdwm30j5517gbdcc7fvz0md70dgwgpypkskj3i926y";
-       revision = "1";
-       editedCabalFile = "0crf0m077wky76f5nav2p9q4fa5q4yhv5l4bq9hd073dzdaywhz0";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         async base bytestring containers directory enclosed-exceptions
-         exceptions lifted-async lifted-base monad-control mtl process
-         system-fileio system-filepath text time transformers
-         transformers-base unix unix-compat
-       ];
-       testHaskellDepends = [
-         async base bytestring containers directory enclosed-exceptions
-         exceptions filepath hspec hspec-contrib HUnit lifted-async
-         lifted-base monad-control mtl process system-fileio system-filepath
-         text time transformers transformers-base unix unix-compat
-       ];
-       description = "shell-like (systems) programming in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "shelly_1_9_0" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, directory
      , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib
      , HUnit, lifted-async, lifted-base, monad-control, mtl, process
@@ -220948,7 +204265,6 @@ self: {
        ];
        description = "shell-like (systems) programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shelly-extra" = callPackage
@@ -221011,8 +204327,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Simple shell scripting from Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shh-extras" = callPackage
@@ -221025,8 +204339,6 @@ self: {
        testHaskellDepends = [ base tasty ];
        description = "Utility functions for using shh";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shift" = callPackage
@@ -221114,8 +204426,6 @@ self: {
        isExecutable = true;
        description = "Examples for the shine package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shine-varying" = callPackage
@@ -221146,8 +204456,6 @@ self: {
        ];
        description = "Implementation of Shivers' Control-Flow Analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shoap" = callPackage
@@ -221159,8 +204467,6 @@ self: {
        libraryHaskellDepends = [ base curl ];
        description = "A very basic SOAP package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shopify" = callPackage
@@ -221181,8 +204487,6 @@ self: {
        ];
        description = "A haskell API binding for shopify.com";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shortcircuit" = callPackage
@@ -221209,17 +204513,6 @@ self: {
      }) {};
 
   "shortcut-links" = callPackage
-    ({ mkDerivation, base, text }:
-     mkDerivation {
-       pname = "shortcut-links";
-       version = "0.4.2.1";
-       sha256 = "1zyy4jma61vg684sa66mpdlq9ylfrfv23d8m0163lbcfpkxfqdhd";
-       libraryHaskellDepends = [ base text ];
-       description = "Link shortcuts for use in text markup";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "shortcut-links_0_5_0_0" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
        pname = "shortcut-links";
@@ -221228,7 +204521,6 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Link shortcuts for use in text markup";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shorten-strings" = callPackage
@@ -221240,8 +204532,6 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Shorten a variety of string-like types adding ellipsis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "should-not-typecheck" = callPackage
@@ -221339,8 +204629,6 @@ self: {
        executableHaskellDepends = [ base glade gtk random ];
        description = "A simple gtk based Russian Roulette game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shower" = callPackage
@@ -221380,8 +204668,6 @@ self: {
        ];
        description = "Web automation library in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shplit" = callPackage
@@ -221431,8 +204717,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Shuffle tool for UHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "shunya-library" = callPackage
@@ -221486,8 +204770,6 @@ self: {
        ];
        description = "An interface to the Silicon Labs Si5351 clock chip";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sibe" = callPackage
@@ -221513,8 +204795,6 @@ self: {
        ];
        description = "Machine Learning algorithms";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sieve" = callPackage
@@ -221549,8 +204829,6 @@ self: {
        ];
        description = "Simple, visual, functional language for learning about recursion";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sifflet-lib" = callPackage
@@ -221569,8 +204847,6 @@ self: {
        librarySystemDepends = [ gdk_x11 gtk_x11 ];
        description = "Library of modules shared by sifflet and its tests and its exporters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gdk_x11 = null; gtk_x11 = null;};
 
   "siggy-chardust" = callPackage
@@ -221590,8 +204866,6 @@ self: {
        ];
        description = "Rounding rationals to significant digits and decimal places";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sigma-ij" = callPackage
@@ -221613,8 +204887,6 @@ self: {
        ];
        description = "Thom polynomials of second order Thom-Boardman singularities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sign" = callPackage
@@ -221637,8 +204909,6 @@ self: {
        ];
        description = "Arithmetic over signs and sets of signs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "signal" = callPackage
@@ -221669,8 +204939,6 @@ self: {
        ];
        description = "Synchronous signal processing for DSLs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "signed-multiset" = callPackage
@@ -221682,8 +204950,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Multisets with negative membership";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "silently" = callPackage
@@ -221713,8 +204979,6 @@ self: {
        testHaskellDepends = [ base quantification savage text ];
        description = "A generator for different kinds of data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simd" = callPackage
@@ -221726,8 +204990,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim primitive vector ];
        description = "simple interface to GHC's SIMD instructions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simgi" = callPackage
@@ -221745,8 +205007,6 @@ self: {
        ];
        description = "stochastic simulation engine";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple" = callPackage
@@ -221795,8 +205055,6 @@ self: {
        ];
        description = "A library for more structured concurrent programming, based on the Actor Model";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-affine-space" = callPackage
@@ -221813,8 +205071,6 @@ self: {
        ];
        description = "A simple library for affine and vector spaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-atom" = callPackage
@@ -221826,8 +205082,6 @@ self: {
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Atom (or symbol) datatype for fast comparision and sorting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-bluetooth" = callPackage
@@ -221840,8 +205094,6 @@ self: {
        librarySystemDepends = [ bluetooth ];
        description = "Simple Bluetooth API for Windows and Linux (bluez)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {bluetooth = null;};
 
   "simple-c-value" = callPackage
@@ -221864,8 +205116,6 @@ self: {
        ];
        description = "A simple C value type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-cabal" = callPackage
@@ -221891,17 +205141,6 @@ self: {
      }) {};
 
   "simple-cmd-args" = callPackage
-    ({ mkDerivation, base, optparse-applicative }:
-     mkDerivation {
-       pname = "simple-cmd-args";
-       version = "0.1.4";
-       sha256 = "02vbdala0q9hnrsr5gpwqjzas69kql0fv3c95f7xwf4gqhd7ygwi";
-       libraryHaskellDepends = [ base optparse-applicative ];
-       description = "Simple command args parsing and execution";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "simple-cmd-args_0_1_5" = callPackage
     ({ mkDerivation, base, optparse-applicative }:
      mkDerivation {
        pname = "simple-cmd-args";
@@ -221910,7 +205149,6 @@ self: {
        libraryHaskellDepends = [ base optparse-applicative ];
        description = "Simple command args parsing and execution";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-conduit" = callPackage
@@ -221942,8 +205180,6 @@ self: {
        ];
        description = "A simple streaming I/O library based on monadic folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-config" = callPackage
@@ -221961,8 +205197,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Simple config file parser generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-css" = callPackage
@@ -221978,8 +205212,6 @@ self: {
        ];
        description = "simple binding of css and html";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-download" = callPackage
@@ -221995,8 +205227,6 @@ self: {
        ];
        description = "A simple wrapper of http-conduit for file download";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-effects" = callPackage
@@ -222044,8 +205274,6 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "Evaluate a Text to an Integer: \"1 + 1\" -> 2";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-firewire" = callPackage
@@ -222057,8 +205285,6 @@ self: {
        libraryHaskellDepends = [ base bindings-dc1394 CV ];
        description = "Simplified interface for firewire cameras";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-form" = callPackage
@@ -222090,8 +205316,6 @@ self: {
        executableHaskellDepends = [ base deepseq parallel random ];
        description = "Simple parallel genetic algorithm implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-genetic-algorithm-mr" = callPackage
@@ -222138,8 +205362,6 @@ self: {
        ];
        description = "Allows simple indexation on any data type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-log" = callPackage
@@ -222171,8 +205393,6 @@ self: {
        libraryHaskellDepends = [ base hsyslog simple-log text ];
        description = "Syslog backend for simple-log";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-logger" = callPackage
@@ -222206,8 +205426,6 @@ self: {
        ];
        description = "Logging effect to plug into the simple-effects framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-ltl" = callPackage
@@ -222232,8 +205450,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Simple library to handle and interexchange money";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-neural-networks" = callPackage
@@ -222253,8 +205469,6 @@ self: {
        ];
        description = "Simple parallel neural networks implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-nix" = callPackage
@@ -222276,8 +205490,6 @@ self: {
        ];
        description = "Simple parsing/pretty printing for Nix expressions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-observer" = callPackage
@@ -222306,8 +205518,6 @@ self: {
        ];
        description = "Simplified Pascal language to SSVM compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-pipe" = callPackage
@@ -222326,8 +205536,6 @@ self: {
        ];
        description = "simple pipeline library like conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-postgresql-orm" = callPackage
@@ -222367,8 +205575,6 @@ self: {
        libraryHaskellDepends = [ base bytestring QuickCheck ];
        description = "Memory-efficient strings with concatenation and splitting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-sendfile" = callPackage
@@ -222472,8 +205678,6 @@ self: {
        testHaskellDepends = [ base extra tasty tasty-hunit text ];
        description = "source code editing utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-stacked-vm" = callPackage
@@ -222502,8 +205706,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Simple tabular-text formatter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-tar" = callPackage
@@ -222519,8 +205721,6 @@ self: {
        ];
        description = "Simple, pure, file-system-free reading of tar files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-templates" = callPackage
@@ -222600,8 +205800,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "Three-dimensional vectors of doubles with basic operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simple-zipper" = callPackage
@@ -222614,8 +205812,6 @@ self: {
        testHaskellDepends = [ base hspec lens ];
        description = "Zippers made slightly easier";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simpleargs" = callPackage
@@ -222628,8 +205824,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Provides a more flexible getArgs function with better error reporting";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simpleconfig" = callPackage
@@ -222646,8 +205840,6 @@ self: {
        ];
        description = "Short description of your package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simpleirc" = callPackage
@@ -222664,8 +205856,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec HUnit knob ];
        description = "Simple IRC Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simpleirc-lens" = callPackage
@@ -222677,8 +205867,6 @@ self: {
        libraryHaskellDepends = [ base bytestring simpleirc ];
        description = "Lenses for simpleirc types";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simplelru" = callPackage
@@ -222720,8 +205908,6 @@ self: {
        ];
        description = "Haskell interface for the simplenote API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simpleprelude" = callPackage
@@ -222740,8 +205926,6 @@ self: {
        ];
        description = "A simplified Haskell prelude for teaching";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simplesmtpclient" = callPackage
@@ -222783,8 +205967,6 @@ self: {
        librarySystemDepends = [ sqlite ];
        description = "Simplest SQLite3 binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) sqlite;};
 
   "simplex" = callPackage
@@ -222848,8 +206030,6 @@ self: {
        executableHaskellDepends = [ base bio bytestring random ];
        description = "Simulate sequencing with different models for priming and errors";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "simtreelo" = callPackage
@@ -222937,8 +206117,6 @@ self: {
        libraryHaskellDepends = [ base singletons ];
        description = "Typelevel balanced search trees via a singletonized Data.Map";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "singleton-nats" = callPackage
@@ -222961,30 +206139,9 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Singletons and induction over GHC TypeLits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "singletons" = callPackage
-    ({ mkDerivation, base, Cabal, containers, directory, filepath
-     , ghc-boot-th, mtl, pretty, process, syb, tasty, tasty-golden
-     , template-haskell, text, th-desugar, transformers
-     }:
-     mkDerivation {
-       pname = "singletons";
-       version = "2.5.1";
-       sha256 = "0izi487dpn5dx5yzm0bqrrjj2fcy6y6jyk81848yq4i8fcx0mc10";
-       setupHaskellDepends = [ base Cabal directory filepath ];
-       libraryHaskellDepends = [
-         base containers ghc-boot-th mtl pretty syb template-haskell text
-         th-desugar transformers
-       ];
-       testHaskellDepends = [ base filepath process tasty tasty-golden ];
-       description = "A framework for generating singleton types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "singletons_2_6" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath
      , ghc-boot-th, mtl, pretty, process, syb, tasty, tasty-golden
      , template-haskell, text, th-desugar, transformers, turtle
@@ -223003,7 +206160,6 @@ self: {
        ];
        description = "A framework for generating singleton types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "singletons-presburger" = callPackage
@@ -223021,8 +206177,6 @@ self: {
        ];
        description = "Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "singnal" = callPackage
@@ -223034,8 +206188,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Singnal";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "singular-factory" = callPackage
@@ -223056,8 +206208,6 @@ self: {
        ];
        description = "Multivariate polynomial factorization via bindings to Singular-factory";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {singular-factory = null;};
 
   "sink" = callPackage
@@ -223069,8 +206219,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An alternative to lazy I/O that doesn't conflate execution with evaluation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "siphash" = callPackage
@@ -223117,8 +206265,6 @@ self: {
        ];
        description = "Encode and decode CSV files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "siren-json" = callPackage
@@ -223143,8 +206289,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Siren Tools for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sirkel" = callPackage
@@ -223161,8 +206305,6 @@ self: {
        ];
        description = "Sirkel, a Chord DHT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sitemap" = callPackage
@@ -223210,8 +206352,6 @@ self: {
        ];
        description = "A simple to understand static site generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sixfiguregroup" = callPackage
@@ -223228,8 +206368,6 @@ self: {
        ];
        description = "A six figure group of time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sixty-five-oh-two" = callPackage
@@ -223268,8 +206406,8 @@ self: {
      }:
      mkDerivation {
        pname = "sized";
-       version = "0.3.0.1";
-       sha256 = "1f31sfimji95bip88y9vn8mdlgbrikh0xc4w6vy2ydh1902rdiks";
+       version = "0.4.0.0";
+       sha256 = "1s1j9riv0kms1hgyhv69nwvh44xa831jk20xlnwq1byw6mbalna9";
        libraryHaskellDepends = [
          base constraints containers deepseq equational-reasoning
          ghc-typelits-presburger hashable lens ListLike mono-traversable
@@ -223277,37 +206415,9 @@ self: {
        ];
        description = "Sized sequence data-types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sized-grid" = callPackage
-    ({ mkDerivation, adjunctions, aeson, ansi-terminal, base, comonad
-     , constraints, distributive, generics-sop, HUnit, lens
-     , markdown-unlit, mtl, QuickCheck, random, tasty, tasty-hunit
-     , tasty-quickcheck, vector, vector-space
-     }:
-     mkDerivation {
-       pname = "sized-grid";
-       version = "0.1.1.6";
-       sha256 = "06qbbih3gn92b85aqk7qx8q4yg56jqh9ncczb66q6sn599xay1s9";
-       libraryHaskellDepends = [
-         adjunctions aeson base comonad constraints distributive
-         generics-sop lens mtl random vector vector-space
-       ];
-       testHaskellDepends = [
-         adjunctions aeson ansi-terminal base comonad distributive
-         generics-sop HUnit lens markdown-unlit QuickCheck tasty tasty-hunit
-         tasty-quickcheck vector vector-space
-       ];
-       testToolDepends = [ markdown-unlit ];
-       description = "Multidimensional grids with sized specified at compile time";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "sized-grid_0_2_0_1" = callPackage
     ({ mkDerivation, adjunctions, aeson, ansi-terminal, base, comonad
      , constraints, distributive, generics-sop, HUnit, lens
      , markdown-unlit, mtl, QuickCheck, random, tasty, tasty-hunit
@@ -223329,8 +206439,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Multidimensional grids with sized specified at compile time";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sized-types" = callPackage
@@ -223349,8 +206457,6 @@ self: {
        ];
        description = "Sized types in Haskell using the GHC Nat kind";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sized-vector" = callPackage
@@ -223367,8 +206473,6 @@ self: {
        ];
        description = "Size-parameterized vector types and functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sizes" = callPackage
@@ -223388,8 +206492,6 @@ self: {
        ];
        description = "Recursively show space (size and i-nodes) used in subdirectories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sjsp" = callPackage
@@ -223411,8 +206513,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Simple JavaScript Profiler";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "skein" = callPackage
@@ -223449,8 +206549,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Skeletal set - a set with equivalence relation different from equality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "skeleton" = callPackage
@@ -223469,8 +206567,6 @@ self: {
        ];
        description = "a tool to access the OSX keychain";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "skeletons" = callPackage
@@ -223489,8 +206585,6 @@ self: {
        ];
        description = "Manage project skeletons";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "skell" = callPackage
@@ -223506,8 +206600,6 @@ self: {
        ];
        description = "An overly complex Haskell web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "skemmtun" = callPackage
@@ -223526,8 +206618,6 @@ self: {
        ];
        description = "A MyAnimeList.net client.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "skews" = callPackage
@@ -223544,8 +206634,6 @@ self: {
        ];
        description = "A very quick-and-dirty WebSocket server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "skip-list" = callPackage
@@ -223584,8 +206672,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Eclectic collection of utility functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "skylark-client" = callPackage
@@ -223608,28 +206694,9 @@ self: {
        ];
        description = "Skylark client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "skylighting" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers
-     , skylighting-core
-     }:
-     mkDerivation {
-       pname = "skylighting";
-       version = "0.8.2.1";
-       sha256 = "1xls8ycad77m55ax4hp55k60h3pi5sm3m32hycbc8baixbgfx5xz";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base binary bytestring containers skylighting-core
-       ];
-       description = "syntax highlighting library";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "skylighting_0_8_3_2" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers
      , skylighting-core
      }:
@@ -223644,42 +206711,9 @@ self: {
        ];
        description = "syntax highlighting library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "skylighting-core" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
-     , base64-bytestring, binary, blaze-html, bytestring
-     , case-insensitive, colour, containers, criterion, Diff, directory
-     , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random
-     , regex-base, regex-pcre-builtin, safe, tasty, tasty-golden
-     , tasty-hunit, tasty-quickcheck, text, transformers, utf8-string
-     }:
-     mkDerivation {
-       pname = "skylighting-core";
-       version = "0.8.2.1";
-       sha256 = "0hdchivb4af9w7v5v7lrwfwawd3kcwmpzk69m1vkkm3pis8lcr1s";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal attoparsec base base64-bytestring binary
-         blaze-html bytestring case-insensitive colour containers directory
-         filepath hxt mtl regex-base regex-pcre-builtin safe text
-         transformers utf8-string
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers Diff directory filepath HUnit
-         pretty-show QuickCheck random tasty tasty-golden tasty-hunit
-         tasty-quickcheck text
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion directory filepath text
-       ];
-       description = "syntax highlighting library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "skylighting-core_0_8_3_2" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
      , base64-bytestring, binary, blaze-html, bytestring
      , case-insensitive, colour, containers, criterion, Diff, directory
@@ -223709,7 +206743,6 @@ self: {
        ];
        description = "syntax highlighting library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "skylighting-extensions" = callPackage
@@ -223753,8 +206786,6 @@ self: {
        ];
        description = "Skype Desktop API binding for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "skypelogexport" = callPackage
@@ -223792,8 +206823,6 @@ self: {
        ];
        description = "Haskell API for interacting with Slack";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "slack-api" = callPackage
@@ -223904,8 +206933,6 @@ self: {
        ];
        description = "A note taking CLI tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "slave-thread" = callPackage
@@ -223926,8 +206953,6 @@ self: {
        ];
        description = "A fundamental solution to ghost threads and silent exceptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sleep" = callPackage
@@ -224018,8 +207043,6 @@ self: {
        ];
        description = "ws convert markdown to reveal-js";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "slim" = callPackage
@@ -224035,8 +207058,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Functional reactive user interface programming";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "slist" = callPackage
@@ -224070,8 +207091,6 @@ self: {
        ];
        description = "A command line interface to Sloane's OEIS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "slope-field" = callPackage
@@ -224106,8 +207125,6 @@ self: {
        ];
        description = "Write lambdas without naming the parameters";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sloth" = callPackage
@@ -224119,8 +207136,6 @@ self: {
        libraryHaskellDepends = [ base mtl process ];
        description = "Testing for minimal strictness";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "slotmap" = callPackage
@@ -224154,8 +207169,6 @@ self: {
        ];
        description = "Type-safe slugs for Yesod ecosystem";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "slynx" = callPackage
@@ -224185,8 +207198,6 @@ self: {
        ];
        description = "Handle molecular sequences";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "small-bytearray-builder" = callPackage
@@ -224198,8 +207209,8 @@ self: {
      }:
      mkDerivation {
        pname = "small-bytearray-builder";
-       version = "0.3.2.0";
-       sha256 = "1nskigvkimz4bddjyz8m3y1ir29lz5iq8d698w6khaxvrvprhwxb";
+       version = "0.3.3.0";
+       sha256 = "0qd875rvh59kg1vb0q6sz6fw3dr847c09hgz7jzavhj9z3vhkm51";
        libraryHaskellDepends = [
          base byteslice bytestring natural-arithmetic primitive
          primitive-offset primitive-unlifted run-st text-short wide-word
@@ -224214,8 +207225,6 @@ self: {
        ];
        description = "Serialize to a small byte arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smallarray" = callPackage
@@ -224227,8 +207236,6 @@ self: {
        libraryHaskellDepends = [ base bytestring deepseq hashable ];
        description = "low-level unboxed arrays, with minimal features";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smallcaps" = callPackage
@@ -224290,8 +207297,6 @@ self: {
        libraryHaskellDepends = [ base smallcheck smallcheck-series ];
        description = "SmallCheck properties for common laws";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smallcheck-lens" = callPackage
@@ -224307,8 +207312,6 @@ self: {
        ];
        description = "SmallCheck properties for lens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smallcheck-series" = callPackage
@@ -224340,8 +207343,6 @@ self: {
        executableHaskellDepends = [ base vector ];
        description = "A Haskell port of the smallpt path tracer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smallstring" = callPackage
@@ -224357,8 +207358,6 @@ self: {
        ];
        description = "A Unicode text type, optimized for low memory overhead";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smaoin" = callPackage
@@ -224418,8 +207417,6 @@ self: {
        ];
        description = "group strings or bytestrings by words in common";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smartcheck" = callPackage
@@ -224440,8 +207437,6 @@ self: {
        ];
        description = "A smarter QuickCheck";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smartconstructor" = callPackage
@@ -224453,8 +207448,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "A package exposing a helper function for generating smart constructors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smartword" = callPackage
@@ -224471,8 +207464,6 @@ self: {
        ];
        description = "Web based flash card for Word Smart I and II vocabularies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smcdel" = callPackage
@@ -224499,8 +207490,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion time ];
        description = "Symbolic Model Checking for Dynamic Epistemic Logic";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sme" = callPackage
@@ -224512,8 +207501,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A library for Secure Multi-Execution in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smerdyakov" = callPackage
@@ -224532,8 +207519,6 @@ self: {
          transformers yaml
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smiles" = callPackage
@@ -224545,8 +207530,6 @@ self: {
        libraryHaskellDepends = [ base megaparsec text ];
        testHaskellDepends = [ base hspec megaparsec QuickCheck text ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smith" = callPackage
@@ -224558,8 +207541,6 @@ self: {
        libraryHaskellDepends = [ base bytesmith primitive ];
        description = "Parse arrays of tokens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smith-cli" = callPackage
@@ -224583,8 +207564,6 @@ self: {
        ];
        description = "Command line tool for <https://smith.st/ Smith>.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smith-client" = callPackage
@@ -224608,8 +207587,6 @@ self: {
        ];
        description = "API client for <https://smith.st/ Smith>.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smoothie" = callPackage
@@ -224638,8 +207615,6 @@ self: {
        ];
        description = "SMSAero API and HTTP client based on servant library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smt" = callPackage
@@ -224666,8 +207641,6 @@ self: {
        libraryHaskellDepends = [ array base directory polyparse ];
        description = "Parsing and printing SMT-LIB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smtLib" = callPackage
@@ -224711,8 +207684,6 @@ self: {
        ];
        description = "Dump the communication with an SMT solver for debugging purposes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smtlib2-pipe" = callPackage
@@ -224734,8 +207705,6 @@ self: {
        ];
        description = "A type-safe interface to communicate with an SMT solver";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smtlib2-quickcheck" = callPackage
@@ -224751,8 +207720,6 @@ self: {
        ];
        description = "Helper functions to create SMTLib expressions in QuickCheck";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smtlib2-timing" = callPackage
@@ -224803,8 +207770,6 @@ self: {
        ];
        description = "An SMTP client EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smtp2mta" = callPackage
@@ -224837,8 +207802,6 @@ self: {
        ];
        description = "Gmail SMTP Client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "smuggler" = callPackage
@@ -224861,8 +207824,6 @@ self: {
        testHaskellDepends = [ base directory filepath ];
        description = "GHC Source Plugin that helps to manage imports";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snake" = callPackage
@@ -224876,8 +207837,6 @@ self: {
        executableHaskellDepends = [ base random split terminal-size ];
        description = "A basic console snake game";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snake-game" = callPackage
@@ -224889,8 +207848,6 @@ self: {
        libraryHaskellDepends = [ base GLUT OpenGL random ];
        description = "Snake Game Using OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap" = callPackage
@@ -224928,8 +207885,6 @@ self: {
        ];
        description = "Top-level package for the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap-accept" = callPackage
@@ -224945,8 +207900,6 @@ self: {
        ];
        description = "Accept header branching for the Snap web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap-app" = callPackage
@@ -224978,8 +207931,6 @@ self: {
        ];
        description = "Command-line tool to manage Snap AuthManager database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap-blaze" = callPackage
@@ -225002,8 +207953,6 @@ self: {
        libraryHaskellDepends = [ base blaze-html clay snap-core ];
        description = "blaze-html-clay integration for Snap";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap-configuration-utilities" = callPackage
@@ -225017,8 +207966,6 @@ self: {
        ];
        description = "Methods to manipulate Configurator objects for Snap & Snaplets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap-core" = callPackage
@@ -225097,8 +208044,6 @@ self: {
        ];
        description = "Collect errors in batches and dispatch them";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap-extras" = callPackage
@@ -225130,8 +208075,6 @@ self: {
        ];
        description = "A collection of useful helpers and utilities for Snap web applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap-language" = callPackage
@@ -225219,8 +208162,6 @@ self: {
        ];
        description = "Typesafe URLs for Snap applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap-server" = callPackage
@@ -225278,8 +208219,6 @@ self: {
        ];
        description = "Streaming Snap handlers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap-templates" = callPackage
@@ -225324,8 +208263,6 @@ self: {
        ];
        description = "A library for BDD-style testing with the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap-utils" = callPackage
@@ -225343,8 +208280,6 @@ self: {
        ];
        description = "Snap Framework utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap-web-routes" = callPackage
@@ -225360,8 +208295,6 @@ self: {
        ];
        description = "Type safe URLs for Snap";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-acid-state" = callPackage
@@ -225375,8 +208308,6 @@ self: {
        ];
        description = "acid-state snaplet for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-actionlog" = callPackage
@@ -225401,8 +208332,6 @@ self: {
        ];
        description = "Generic action log snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-amqp" = callPackage
@@ -225420,8 +208349,6 @@ self: {
        ];
        description = "Snap framework snaplet for the AMQP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-auth-acid" = callPackage
@@ -225442,8 +208369,6 @@ self: {
        ];
        description = "Provides an Acid-State backend for the Auth Snaplet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-coffee" = callPackage
@@ -225461,8 +208386,6 @@ self: {
        ];
        description = "CoffeeScript for Snap, auto-compilation and pre-compilation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-css-min" = callPackage
@@ -225479,8 +208402,6 @@ self: {
        ];
        description = "A Snaplet for CSS minification";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-customauth" = callPackage
@@ -225504,8 +208425,6 @@ self: {
        ];
        description = "Alternate authentication snaplet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-environments" = callPackage
@@ -225522,8 +208441,6 @@ self: {
        ];
        description = "DEPRECATED! You should use standard Snap >= 0.9 \"environments\" functionality. It provided ability to easly read configuration based on given app environment given at command line, envs are defined in app configuration file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-fay" = callPackage
@@ -225543,8 +208460,6 @@ self: {
        ];
        description = "Fay integration for Snap with request- and pre-compilation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-ghcjs" = callPackage
@@ -225561,8 +208476,6 @@ self: {
        ];
        description = "Serve javascript files compiled with GHCJS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-hasql" = callPackage
@@ -225580,8 +208493,6 @@ self: {
        ];
        description = "A Hasql snaplet";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-haxl" = callPackage
@@ -225597,8 +208508,6 @@ self: {
        ];
        description = "Snaplet for Facebook's Haxl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-hdbc" = callPackage
@@ -225619,8 +208528,6 @@ self: {
        ];
        description = "HDBC snaplet for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-hslogger" = callPackage
@@ -225637,8 +208544,6 @@ self: {
        ];
        description = "Snap framework snaplet for the Logger API library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-i18n" = callPackage
@@ -225662,8 +208567,6 @@ self: {
        ];
        description = "snaplet-i18n";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-influxdb" = callPackage
@@ -225682,8 +208585,6 @@ self: {
        ];
        description = "Snap framework snaplet for the InfluxDB library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-lss" = callPackage
@@ -225716,8 +208617,6 @@ self: {
        ];
        description = "Snap framework snaplet for the Mandrill API library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-mongoDB" = callPackage
@@ -225737,8 +208636,6 @@ self: {
        ];
        description = "Snap Framework MongoDB support as Snaplet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-mongodb-minimalistic" = callPackage
@@ -225753,8 +208650,6 @@ self: {
        ];
        description = "Minimalistic MongoDB Snaplet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-mysql-simple" = callPackage
@@ -225775,8 +208670,6 @@ self: {
        ];
        description = "mysql-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-oauth" = callPackage
@@ -225802,8 +208695,6 @@ self: {
        ];
        description = "snaplet-oauth";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-persistent" = callPackage
@@ -225826,8 +208717,6 @@ self: {
        ];
        description = "persistent snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-postgresql-simple" = callPackage
@@ -225850,8 +208739,6 @@ self: {
        ];
        description = "postgresql-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-postmark" = callPackage
@@ -225868,8 +208755,6 @@ self: {
        ];
        description = "Postmark snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-purescript" = callPackage
@@ -225886,8 +208771,6 @@ self: {
        ];
        description = "Automatic (re)compilation of purescript projects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-recaptcha" = callPackage
@@ -225905,8 +208788,6 @@ self: {
        ];
        description = "A ReCAPTCHA verification snaplet with Heist integration and connection sharing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-redis" = callPackage
@@ -225926,8 +208807,6 @@ self: {
        ];
        description = "Redis support for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-redson" = callPackage
@@ -225947,8 +208826,6 @@ self: {
        ];
        description = "CRUD for JSON data with Redis storage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-rest" = callPackage
@@ -225966,8 +208843,6 @@ self: {
        ];
        description = "REST resources for the Snap web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-riak" = callPackage
@@ -225985,8 +208860,6 @@ self: {
        ];
        description = "A Snaplet for the Riak database";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-sass" = callPackage
@@ -226004,8 +208877,6 @@ self: {
        ];
        description = "Sass integration for Snap with request- and pre-compilation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-scoped-session" = callPackage
@@ -226022,8 +208893,6 @@ self: {
        ];
        description = "Modularised session state for Snaplets, in a Snaplet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-sedna" = callPackage
@@ -226040,8 +208909,6 @@ self: {
        ];
        description = "Snaplet for Sedna Bindings. Essentailly a rip of snaplet-hdbc.";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-ses-html" = callPackage
@@ -226058,8 +208925,6 @@ self: {
        ];
        description = "Snaplet for the ses-html package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-sqlite-simple" = callPackage
@@ -226090,8 +208955,6 @@ self: {
        ];
        description = "sqlite-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-sqlite-simple-jwt-auth" = callPackage
@@ -226111,8 +208974,6 @@ self: {
        ];
        description = "Snaplet for JWT authentication with snaplet-sqlite-simple";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-stripe" = callPackage
@@ -226131,8 +208992,6 @@ self: {
        ];
        description = "Stripe snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-tasks" = callPackage
@@ -226149,8 +209008,6 @@ self: {
        ];
        description = "Snaplet for Snap Framework enabling developers to administrative tasks akin to Rake tasks from Ruby On Rails framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-typed-sessions" = callPackage
@@ -226168,8 +209025,6 @@ self: {
        ];
        description = "Typed session snaplets and continuation-based programming for the Snap web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snaplet-wordpress" = callPackage
@@ -226196,8 +209051,6 @@ self: {
        ];
        description = "A snaplet that communicates with wordpress over its api";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snappy" = callPackage
@@ -226227,8 +209080,6 @@ self: {
        libraryHaskellDepends = [ base bytestring conduit snappy ];
        description = "Conduit bindings for Snappy (see snappy package)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snappy-framing" = callPackage
@@ -226251,8 +209102,6 @@ self: {
        libraryHaskellDepends = [ base bytestring iteratee snappy ];
        description = "An enumeratee that uses Google's snappy compression library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sndfile-enumerators" = callPackage
@@ -226271,8 +209120,6 @@ self: {
        ];
        description = "Audio file reading/writing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sneakyterm" = callPackage
@@ -226288,8 +209135,6 @@ self: {
        ];
        description = "Tiny, declarative wrapper around ncurses";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sneathlane-haste" = callPackage
@@ -226347,8 +209192,6 @@ self: {
        ];
        description = "The Simple Nice-Looking Manual Generator";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snmp" = callPackage
@@ -226367,8 +209210,6 @@ self: {
        ];
        description = "SNMP protocol library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snorkels" = callPackage
@@ -226391,8 +209232,6 @@ self: {
        ];
        description = "Strategic board game of medium complexity";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snow-white" = callPackage
@@ -226405,8 +209244,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring mps ];
        description = "encode any binary instance to white space";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snowball" = callPackage
@@ -226454,8 +209291,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "twitter's snowflake";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snowflake-server" = callPackage
@@ -226474,8 +209309,6 @@ self: {
        ];
        description = "snowflake http server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snowglobe" = callPackage
@@ -226509,8 +209342,6 @@ self: {
        ];
        description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "soap" = callPackage
@@ -226552,8 +209383,6 @@ self: {
        ];
        description = "TLS-enabled SOAP transport (using openssl bindings)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "soap-tls" = callPackage
@@ -226670,8 +209499,6 @@ self: {
        testHaskellDepends = [ base bytestring socket ];
        description = "STCP socket extensions library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) lksctp-tools;};
 
   "socket-unix" = callPackage
@@ -226688,8 +209515,6 @@ self: {
        ];
        description = "Unix domain sockets";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "socketed" = callPackage
@@ -226716,8 +209541,6 @@ self: {
        ];
        description = "simpe tool to serve piped data over http and websocket";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "socketio" = callPackage
@@ -226746,8 +209569,6 @@ self: {
        ];
        description = "Socket.IO server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sockets" = callPackage
@@ -226778,8 +209599,6 @@ self: {
        doHaddock = false;
        description = "High-level network sockets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "socketson" = callPackage
@@ -226805,8 +209624,6 @@ self: {
        ];
        description = "A small websocket backend provider";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "socks" = callPackage
@@ -226831,8 +209648,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "Sodium Reactive Programming (FRP) System";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "soegtk" = callPackage
@@ -226845,8 +209660,6 @@ self: {
        libraryHaskellDepends = [ base cairo gtk old-time stm ];
        description = "GUI functions as used in the book \"The Haskell School of Expression\"";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "softfloat-hs" = callPackage
@@ -226859,8 +209672,6 @@ self: {
        librarySystemDepends = [ softfloat ];
        description = "Haskell bindings for SoftFloat";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {softfloat = null;};
 
   "solar" = callPackage
@@ -226897,8 +209708,6 @@ self: {
        ];
        description = "Simple typesafe web routing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "solga-swagger" = callPackage
@@ -226916,8 +209725,6 @@ self: {
        ];
        description = "Swagger generation for Solga";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "solr" = callPackage
@@ -226942,8 +209749,6 @@ self: {
        ];
        description = "A minimal Solr client library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "solve" = callPackage
@@ -226991,22 +209796,9 @@ self: {
        ];
        description = "Sonic Visualiser";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sop-core" = callPackage
-    ({ mkDerivation, base, deepseq }:
-     mkDerivation {
-       pname = "sop-core";
-       version = "0.4.0.0";
-       sha256 = "07ci2mh8cbjvipb576rxsj3iyhkj5c5dnsns4xkdppp2p3pv10d3";
-       libraryHaskellDepends = [ base deepseq ];
-       description = "True Sums of Products";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "sop-core_0_5_0_0" = callPackage
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
        pname = "sop-core";
@@ -227015,7 +209807,6 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        description = "True Sums of Products";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sophia" = callPackage
@@ -227073,8 +209864,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Efficient, type-safe sorted sequences";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sorted-list" = callPackage
@@ -227110,8 +209899,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Utils for sorting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sorty" = callPackage
@@ -227125,8 +209912,6 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Sort lines per file size";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "souffle-haskell" = callPackage
@@ -227147,8 +209932,6 @@ self: {
        testToolDepends = [ souffle ];
        description = "Souffle Datalog bindings for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) souffle;};
 
   "sound-collage" = callPackage
@@ -227171,8 +209954,6 @@ self: {
        ];
        description = "Approximate a song from other pieces of sound";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sounddelay" = callPackage
@@ -227186,8 +209967,6 @@ self: {
        executableHaskellDepends = [ base containers parseargs WAVE ];
        description = "Audio delay line";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "soundgen" = callPackage
@@ -227201,8 +209980,6 @@ self: {
        executableHaskellDepends = [ base split WAVE ];
        description = "sound generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "source-code-server" = callPackage
@@ -227226,8 +210003,6 @@ self: {
        ];
        description = "The server backend for the source code iPhone app";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sourcemap" = callPackage
@@ -227269,8 +210044,6 @@ self: {
        ];
        description = "Source/Sink/Transform: An alternative to lazy IO and iteratees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sox" = callPackage
@@ -227326,8 +210099,6 @@ self: {
        ];
        description = "DCPU-16 architecture utilities for Notch's 0x10c game";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "space" = callPackage
@@ -227393,8 +210164,6 @@ self: {
        libraryHaskellDepends = [ base vector-space ];
        description = "Space partition data structures. Currently only a QuadTree.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spaceprobe" = callPackage
@@ -227439,8 +210208,6 @@ self: {
        ];
        description = "Implementation of the SPAKE2 Password-Authenticated Key Exchange algorithm";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spanout" = callPackage
@@ -227458,8 +210225,6 @@ self: {
        ];
        description = "A breakout clone written in netwire and gloss";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sparkle" = callPackage
@@ -227485,8 +210250,6 @@ self: {
        ];
        description = "Distributed Apache Spark applications in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sparql-protocol" = callPackage
@@ -227532,8 +210295,6 @@ self: {
        ];
        description = "Unified streaming data-dependency framework for web apps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sparse" = callPackage
@@ -227561,8 +210322,6 @@ self: {
        benchmarkHaskellDepends = [ array base criterion deepseq vector ];
        description = "A playground of sparse linear algebra primitives using Morton ordering";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sparse-lin-alg" = callPackage
@@ -227580,8 +210339,6 @@ self: {
        ];
        description = "Effective linear algebra on sparse matrices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sparse-linear-algebra" = callPackage
@@ -227626,8 +210383,6 @@ self: {
        ];
        description = "typesafe tensor algebra library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sparsebit" = callPackage
@@ -227639,8 +210394,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "Sparse bitmaps for pattern match coverage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sparsecheck" = callPackage
@@ -227652,8 +210405,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A Logic Programming Library for Test-Data Generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sparser" = callPackage
@@ -227669,8 +210420,6 @@ self: {
        ];
        description = "Lightweight parsing library based on partial functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spata" = callPackage
@@ -227683,8 +210432,6 @@ self: {
        libraryHaskellDepends = [ base dlist mps mtl ];
        description = "brainless form validation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spatial-math" = callPackage
@@ -227779,8 +210526,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Control.Applicative, Data.Foldable, Data.Traversable (compatibility package)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "special-keys" = callPackage
@@ -227798,8 +210543,6 @@ self: {
        ];
        description = "Simple data types that help me here and there";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "special-values" = callPackage
@@ -227839,8 +210582,6 @@ self: {
        ];
        description = "Create specialized types from polymorphic ones using TH";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "species" = callPackage
@@ -227876,24 +210617,9 @@ self: {
        ];
        description = "Library for spectral clustering";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "speculate" = callPackage
-    ({ mkDerivation, base, cmdargs, containers, leancheck }:
-     mkDerivation {
-       pname = "speculate";
-       version = "0.3.5";
-       sha256 = "0i7a6mq0f46iihq7kd3a1780pqqhmmdi706c42y4dmmj32nb4v3h";
-       libraryHaskellDepends = [ base cmdargs containers leancheck ];
-       testHaskellDepends = [ base leancheck ];
-       benchmarkHaskellDepends = [ base leancheck ];
-       description = "discovery of properties about Haskell functions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "speculate_0_4_1" = callPackage
     ({ mkDerivation, base, cmdargs, containers, express, leancheck }:
      mkDerivation {
        pname = "speculate";
@@ -227906,7 +210632,6 @@ self: {
        benchmarkHaskellDepends = [ base express leancheck ];
        description = "discovery of properties about Haskell functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "speculation" = callPackage
@@ -227918,8 +210643,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim stm transformers ];
        description = "A framework for safe, programmable, speculative parallelism";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "speculation-transformers" = callPackage
@@ -227932,8 +210655,6 @@ self: {
        doHaddock = false;
        description = "Merged into 'speculation'. Use that instead.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "speechmatics" = callPackage
@@ -227964,8 +210685,6 @@ self: {
        ];
        description = "Speechmatics api client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "speedy-slice" = callPackage
@@ -227983,8 +210702,6 @@ self: {
        testHaskellDepends = [ base containers mwc-probability ];
        description = "Speedy slice sampling";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spelling-suggest" = callPackage
@@ -228006,8 +210723,6 @@ self: {
        ];
        description = "Spelling suggestion tool with library and command-line interfaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spherical" = callPackage
@@ -228034,8 +210749,6 @@ self: {
        ];
        description = "Orbotix Sphero client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sphinx" = callPackage
@@ -228065,8 +210778,6 @@ self: {
        executableHaskellDepends = [ base sphinx ];
        description = "Sphinx CLI and demo of Haskell Sphinx library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sphinxesc" = callPackage
@@ -228085,8 +210796,6 @@ self: {
        executableHaskellDepends = [ base optparse-applicative ];
        description = "Transform queries for sphinx input";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spice" = callPackage
@@ -228103,8 +210812,6 @@ self: {
        ];
        description = "An FRP-based game engine written in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spike" = callPackage
@@ -228148,8 +210855,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Some utilities for reading and writing SPIR-V files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spiros" = callPackage
@@ -228176,8 +210881,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Spiros Boosalis's Custom Prelude";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "splay" = callPackage
@@ -228189,8 +210892,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Generic splay-based sequence representation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "splaytree" = callPackage
@@ -228208,8 +210909,6 @@ self: {
        ];
        description = "Provides an annotated splay tree";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "splice" = callPackage
@@ -228265,8 +210964,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion polynomial vector ];
        description = "B-Splines, other splines, and NURBS";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "split_0_1_4_3" = callPackage
@@ -228316,8 +211013,6 @@ self: {
        testHaskellDepends = [ base invariant lens QuickCheck ];
        description = "Split Epimorphisms and Monomorphisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "split-record" = callPackage
@@ -228385,8 +211080,6 @@ self: {
        ];
        description = "Use numerical ranges to split out certain lines from a file";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "splot" = callPackage
@@ -228406,8 +211099,6 @@ self: {
        ];
        description = "A tool for visualizing the lifecycle of many concurrent multi-staged processes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spool" = callPackage
@@ -228449,8 +211140,6 @@ self: {
        ];
        description = "Spoon's utilities. Simple testing and nice looking error reporting.";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spoty" = callPackage
@@ -228467,8 +211156,6 @@ self: {
        ];
        description = "Spotify web API wrapper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spreadsheet" = callPackage
@@ -228528,8 +211215,6 @@ self: {
        ];
        description = "JSON API to HTML website wrapper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spritz" = callPackage
@@ -228541,8 +211226,6 @@ self: {
        libraryHaskellDepends = [ base lens mtl vector ];
        description = "An implementation of the Spritz RC4-like stream cipher in Haskell";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sproxy" = callPackage
@@ -228636,8 +211319,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion hmatrix random ];
        description = "Simultaneous Perturbation Stochastic Approximation Optimization Algorithm";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "spy" = callPackage
@@ -228663,8 +211344,6 @@ self: {
        ];
        description = "A compact file system watcher for Mac OS X, Linux and Windows";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sql-simple" = callPackage
@@ -228681,8 +211360,6 @@ self: {
        ];
        description = "common middle-level sql client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sql-simple-mysql" = callPackage
@@ -228698,8 +211375,6 @@ self: {
        ];
        description = "mysql backend for sql-simple";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sql-simple-pool" = callPackage
@@ -228716,8 +211391,6 @@ self: {
        ];
        description = "conection pool for sql-simple";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sql-simple-postgresql" = callPackage
@@ -228733,8 +211406,6 @@ self: {
        ];
        description = "postgresql backend for sql-simple";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sql-simple-sqlite" = callPackage
@@ -228746,8 +211417,6 @@ self: {
        libraryHaskellDepends = [ base sql-simple sqlite-simple ];
        description = "sqlite backend for sql-simple";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sql-words" = callPackage
@@ -228778,8 +211447,6 @@ self: {
        testHaskellDepends = [ base filepath hspec temporary ];
        description = "Haskell binding to sqlcipher";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "sqlcli" = callPackage
@@ -228820,8 +211487,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Haskell binding to sqlite3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) sqlite;};
 
   "sqlite-simple" = callPackage
@@ -228873,8 +211538,6 @@ self: {
        ];
        description = "Typed extension to sqlite simple";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sqlvalue-list" = callPackage
@@ -228886,8 +211549,6 @@ self: {
        libraryHaskellDepends = [ base convertible HDBC template-haskell ];
        description = "Class and instances for conversion to list of SqlValue";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sqsd-local" = callPackage
@@ -228909,8 +211570,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "squeal-postgresql" = callPackage
@@ -228941,8 +211600,17 @@ self: {
        ];
        description = "Squeal PostgreSQL Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+     }) {};
+
+  "squeather" = callPackage
+    ({ mkDerivation, base, bytestring, text }:
+     mkDerivation {
+       pname = "squeather";
+       version = "0.2.0.0";
+       sha256 = "0hrbj2z0rbvcpw925mws3ar34qfmpnm3l2fnc3rjshyp20hl5h78";
+       libraryHaskellDepends = [ base bytestring text ];
+       description = "Use databases with the version 3 series of the SQLite C library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "squeeze" = callPackage
@@ -228966,8 +211634,6 @@ self: {
        ];
        description = "A file-packing application";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sr-extra" = callPackage
@@ -228994,8 +211660,6 @@ self: {
        ];
        description = "Module limbo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "srcinst" = callPackage
@@ -229014,8 +211678,6 @@ self: {
        ];
        description = "Build and install Debian packages completely from source";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "srcloc" = callPackage
@@ -229056,8 +211718,6 @@ self: {
        ];
        description = "text UI for scanning with SANE";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sscgi" = callPackage
@@ -229075,8 +211735,6 @@ self: {
        ];
        description = "Simple SCGI Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sscript" = callPackage
@@ -229118,8 +211776,6 @@ self: {
        doCheck = false;
        description = "A pure-Haskell SSH server library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ssh-known-hosts" = callPackage
@@ -229157,8 +211813,6 @@ self: {
        ];
        description = "Proxy http-client via ssh tunnel";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sshd-lint" = callPackage
@@ -229179,8 +211833,6 @@ self: {
        ];
        description = "Check sshd configuration for adherence to best practices";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sshtun" = callPackage
@@ -229228,8 +211880,6 @@ self: {
        ];
        description = "HTTP proxy for S3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sstable" = callPackage
@@ -229248,8 +211898,6 @@ self: {
        executableHaskellDepends = [ cmdargs ];
        description = "SSTables in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ssv" = callPackage
@@ -229275,8 +211923,6 @@ self: {
        libraryHaskellDepends = [ base gdp ghc-prim primitive ];
        description = "shared heap regions between local mutable state threads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stable-heap" = callPackage
@@ -229293,8 +211939,6 @@ self: {
        ];
        description = "Purely functional stable heaps (fair priority queues)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stable-maps" = callPackage
@@ -229306,8 +211950,6 @@ self: {
        libraryHaskellDepends = [ base containers ghc-prim ];
        description = "Heterogeneous maps keyed by StableNames";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stable-marriage" = callPackage
@@ -229319,8 +211961,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "algorithms around stable marriage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stable-memo" = callPackage
@@ -229334,8 +211974,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim hashtables ];
        description = "Memoization based on argument identity";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stable-tree" = callPackage
@@ -229360,40 +211998,9 @@ self: {
        ];
        description = "Trees whose branches are resistant to change";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stache" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, criterion
-     , deepseq, directory, file-embed, filepath, hspec, hspec-discover
-     , hspec-megaparsec, megaparsec, mtl, template-haskell, text
-     , unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "stache";
-       version = "2.0.1";
-       sha256 = "0awyh8zjvly18s4gnqy4970fj1hr4zpb38lisfy6px42m38g17vk";
-       revision = "3";
-       editedCabalFile = "1y1wff5mdcin3wc9pbj3agsircrf1pxjjm8j90n8g40l7acnf63c";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers deepseq directory filepath
-         megaparsec mtl template-haskell text unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers file-embed hspec hspec-megaparsec
-         megaparsec template-haskell text yaml
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         aeson base criterion deepseq megaparsec text
-       ];
-       description = "Mustache templates for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "stache_2_1_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , deepseq, directory, file-embed, filepath, hspec, hspec-discover
      , hspec-megaparsec, megaparsec, mtl, template-haskell, text
@@ -229420,7 +212027,6 @@ self: {
        ];
        description = "Mustache templates for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack" = callPackage
@@ -229542,8 +212148,6 @@ self: {
        ];
        description = "Dead simple version bumping for hpack packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-fix" = callPackage
@@ -229557,8 +212161,6 @@ self: {
        executableHaskellDepends = [ base options text turtle ];
        description = "Console program used to fix Stack build errors automatically";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-hpc-coveralls" = callPackage
@@ -229585,8 +212187,6 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-lib" = callPackage
@@ -229602,8 +212202,6 @@ self: {
        ];
        description = "Wrapper to use stack as a library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-network" = callPackage
@@ -229645,8 +212243,6 @@ self: {
        ];
        description = "A program for extending Stack to add distributed capabilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-prism" = callPackage
@@ -229665,8 +212261,6 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Stack prisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-run" = callPackage
@@ -229686,8 +212280,6 @@ self: {
        ];
        description = "An equivalent to cabal run for stack";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-run-auto" = callPackage
@@ -229715,8 +212307,6 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-tag" = callPackage
@@ -229740,6 +212330,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stack-templatizer" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath }:
+     mkDerivation {
+       pname = "stack-templatizer";
+       version = "0.1.0.1";
+       sha256 = "1wcs1hpz096k60d33bs1xn65adry8869b6yg8gvy46lv3f64q4x3";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base bytestring directory filepath ];
+       description = "Generate a stack template from a folder";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "stack-type" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -229749,8 +212352,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "The basic stack type";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-wrapper" = callPackage
@@ -229767,8 +212368,6 @@ self: {
        executableHaskellDepends = [ base filepath process ];
        description = "Call ghc within stack by calling ghc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-yaml" = callPackage
@@ -229836,8 +212435,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Convert stack.yaml files into Nix build instructions.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage" = callPackage
@@ -229856,8 +212453,6 @@ self: {
        ];
        description = "Dummy package forcing installation of other Stackage packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-build-plan" = callPackage
@@ -229882,8 +212477,6 @@ self: {
        ];
        description = "Calculate and print (in different formats) Stackage build plans";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-cabal" = callPackage
@@ -229904,8 +212497,6 @@ self: {
        ];
        description = "A CLI executable for cabal-based stackage commands";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-cli" = callPackage
@@ -229927,8 +212518,6 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "A CLI library for stackage commands";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-curator" = callPackage
@@ -229973,8 +212562,6 @@ self: {
        ];
        description = "Tools for curating Stackage bundles";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-install" = callPackage
@@ -230023,8 +212610,6 @@ self: {
        ];
        description = "DEPRECATED Grab current metadata for all packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-query" = callPackage
@@ -230048,8 +212633,6 @@ self: {
        ];
        description = "Tool for querying Stackage";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-sandbox" = callPackage
@@ -230070,8 +212653,6 @@ self: {
        ];
        description = "Work with shared stackage sandboxes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-setup" = callPackage
@@ -230095,8 +212676,6 @@ self: {
        ];
        description = "An executable for downloading a Haskell setup";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-to-hackage" = callPackage
@@ -230122,8 +212701,6 @@ self: {
        ];
        description = "Convert stack.yaml to cabal.project + cabal.project.freeze";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-types" = callPackage
@@ -230143,8 +212720,6 @@ self: {
        ];
        description = "Shared data types between various Stackage packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage-update" = callPackage
@@ -230181,8 +212756,6 @@ self: {
        ];
        description = "A more secure version of cabal upload which uses HTTPS";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stackage2nix" = callPackage
@@ -230213,8 +212786,6 @@ self: {
        ];
        description = "Convert Stack files into Nix build instructions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stacked-dag" = callPackage
@@ -230234,8 +212805,6 @@ self: {
        testHaskellDepends = [ base containers doctest graphviz text ];
        description = "Ascii DAG(Directed acyclic graph) for visualization of dataflow";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "staf" = callPackage
@@ -230277,13 +212846,11 @@ self: {
     ({ mkDerivation, base, mtl, template-haskell }:
      mkDerivation {
        pname = "standalone-derive-topdown";
-       version = "0.0.0.1";
-       sha256 = "0rfpx73v28xa3spwb24crq7li2ia54yaz7sjc6ag9zagxn3wsyv5";
+       version = "0.0.0.2";
+       sha256 = "179pm3wixdqg7786l8ys2nwpx7anpnvsl63bj25cgs8082g587v0";
        libraryHaskellDepends = [ base mtl template-haskell ];
-       description = "This package will derive class instance along the data type declaration tree";
+       description = "This package will derive class instance along the data type declaration tree. (Deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "standalone-haddock" = callPackage
@@ -230349,8 +212916,6 @@ self: {
        ];
        description = "A memcached client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "starrover2" = callPackage
@@ -230397,8 +212962,6 @@ self: {
        ];
        description = "To be written";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "state" = callPackage
@@ -230410,8 +212973,6 @@ self: {
        libraryHaskellDepends = [ arrows base mtl ];
        description = "Data.State";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "state-bag" = callPackage
@@ -230428,8 +212989,6 @@ self: {
        testHaskellDepends = [ base hspec transformers ];
        description = "Monad transformers for holding bags of state";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "state-codes" = callPackage
@@ -230455,8 +213014,6 @@ self: {
        testHaskellDepends = [ base checkers mtl QuickCheck ];
        description = "MonadPlus for StateT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "state-record" = callPackage
@@ -230468,8 +213025,6 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Better records for State monad states";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stateWriter" = callPackage
@@ -230490,8 +213045,6 @@ self: {
        ];
        description = "A faster variant of the RWS monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "statechart" = callPackage
@@ -230516,8 +213069,6 @@ self: {
        libraryHaskellDepends = [ base MaybeT mtl ];
        description = "Typeclass instances for monad transformer stacks with an ST thread at the bottom";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stateref" = callPackage
@@ -230532,21 +213083,6 @@ self: {
      }) {};
 
   "statestack" = callPackage
-    ({ mkDerivation, base, mtl, transformers, transformers-compat }:
-     mkDerivation {
-       pname = "statestack";
-       version = "0.2.0.5";
-       sha256 = "0rjzx9iy5mx5igir6gvslznnx3gpxlb1xy1n8h4cn54cn3wxrspl";
-       revision = "3";
-       editedCabalFile = "0s9v88gcc5wnfj4c6xq86asadmh4y8z8ycv2wz5nwfwfazfgzcy3";
-       libraryHaskellDepends = [
-         base mtl transformers transformers-compat
-       ];
-       description = "Simple State-like monad transformer with saveable and restorable state";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "statestack_0_3" = callPackage
     ({ mkDerivation, base, mtl, transformers, transformers-compat }:
      mkDerivation {
        pname = "statestack";
@@ -230557,7 +213093,6 @@ self: {
        ];
        description = "Simple State-like monad transformer with saveable and restorable state";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "statethread" = callPackage
@@ -230601,8 +213136,6 @@ self: {
        libraryHaskellDepends = [ base double-conversion free mtl text ];
        description = "DSL to generate HTML5 Canvas javascript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "static-closure" = callPackage
@@ -230619,8 +213152,6 @@ self: {
        ];
        description = "Serialisable static pointers to functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "static-hash" = callPackage
@@ -230676,8 +213207,6 @@ self: {
        ];
        description = "Tensors of statically known size";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "static-text" = callPackage
@@ -230699,8 +213228,6 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Lists, Texts, ByteStrings and Vectors of statically known length";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "staticanalysis" = callPackage
@@ -230753,8 +213280,6 @@ self: {
        ];
        description = "Functions for working with Dirichlet densities and mixtures on vectors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "statistics-fusion" = callPackage
@@ -230766,8 +213291,6 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "An implementation of high performance, minimal statistics functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "statistics-hypergeometric-genvar" = callPackage
@@ -230783,8 +213306,6 @@ self: {
        ];
        description = "Random variate generation from hypergeometric distributions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "statistics-linreg" = callPackage
@@ -230813,8 +213334,6 @@ self: {
        executableHaskellDepends = [ base statistics text vector ];
        description = "command line statistics";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "statsd" = callPackage
@@ -230830,8 +213349,6 @@ self: {
        ];
        description = "StatsD API";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "statsd-client" = callPackage
@@ -230849,8 +213366,6 @@ self: {
        ];
        description = "Statsd UDP client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "statsd-datadog" = callPackage
@@ -230889,8 +213404,6 @@ self: {
        ];
        description = "A lovely [Dog]StatsD implementation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "status-notifier-item" = callPackage
@@ -230977,7 +213490,6 @@ self: {
        description = "Image loading and writing microlibrary";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stb-image-redux" = callPackage
@@ -230990,8 +213502,6 @@ self: {
        testHaskellDepends = [ base hspec vector ];
        description = "Image loading and writing microlibrary";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stb-truetype" = callPackage
@@ -231036,8 +213546,6 @@ self: {
        ];
        description = "A library for implicit, monadic dataflow parallelism";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "std" = callPackage
@@ -231060,8 +213568,6 @@ self: {
        libraryHaskellDepends = [ base parsec syb template-haskell ];
        description = "Structure Data Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stdf" = callPackage
@@ -231084,8 +213590,6 @@ self: {
        ];
        description = "Parse Structured Test Data Format (STDF)";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stdio" = callPackage
@@ -231111,8 +213615,6 @@ self: {
        ];
        description = "A simple and high performance IO toolkit for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libuv;};
 
   "steambrowser" = callPackage
@@ -231126,8 +213628,6 @@ self: {
        executableHaskellDepends = [ base directory parsec transformers ];
        description = "List and launch steam games from the cli";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "steeloverseer" = callPackage
@@ -231171,8 +213671,6 @@ self: {
        testHaskellDepends = [ base random uuid ];
        description = "Generator and verifier for steganographic numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stemmer" = callPackage
@@ -231184,8 +213682,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell bindings to the Snowball stemming library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stemmer-german" = callPackage
@@ -231199,8 +213695,6 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Extract the stem of a German inflected word form";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "step-function" = callPackage
@@ -231229,8 +213723,6 @@ self: {
        sha256 = "059k8g3wb4hkxk42vm83vv6kh3igrpf7fc97xvn3qai5rx3jmgqf";
        libraryHaskellDepends = [ base containers mtl ];
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stern-brocot" = callPackage
@@ -231248,8 +213740,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Positive rational numbers represented as paths in the Stern-Brocot tree";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stgi" = callPackage
@@ -231278,8 +213768,6 @@ self: {
        ];
        description = "Educational implementation of the STG (Spineless Tagless G-machine)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stickyKeysHotKey" = callPackage
@@ -231359,8 +213847,6 @@ self: {
        testHaskellDepends = [ async base HUnit stm tasty tasty-hunit ];
        description = "Chunked Communication Queues";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stm-conduit" = callPackage
@@ -231406,8 +213892,6 @@ self: {
        ];
        description = "Containers for STM";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stm-delay" = callPackage
@@ -231449,8 +213933,6 @@ self: {
        testHaskellDepends = [ base hspec HUnit stm ];
        description = "Conduits and STM operations for fire hoses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stm-hamt" = callPackage
@@ -231477,8 +213959,6 @@ self: {
        ];
        description = "STM-specialised Hash Array Mapped Trie";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stm-io-hooks" = callPackage
@@ -231490,8 +213970,6 @@ self: {
        libraryHaskellDepends = [ array base mtl stm ];
        description = "Launch your IO-actions from within the STM monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stm-lifted" = callPackage
@@ -231537,8 +214015,6 @@ self: {
        testHaskellDepends = [ base QuickCheck stm ];
        description = "Simple STM Promises for IO computations and external processes";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stm-queue-extras" = callPackage
@@ -231585,8 +214061,6 @@ self: {
        ];
        description = "retry statistics for STM transactions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stm-supply" = callPackage
@@ -231601,8 +214075,6 @@ self: {
        testHaskellDepends = [ async base QuickCheck random Unique ];
        description = "STM wrapper around Control.Concurrent.Supply.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stm-tlist" = callPackage
@@ -231626,8 +214098,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 mtl stm ];
        description = "Control communication among retrying transactions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stochastic" = callPackage
@@ -231643,8 +214113,6 @@ self: {
        ];
        description = "Monadic composition of probabilistic functions and sampling";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stocks" = callPackage
@@ -231747,8 +214215,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Storable type class for variable-sized data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "storable-complex" = callPackage
@@ -231810,8 +214276,6 @@ self: {
        libraryHaskellDepends = [ array base tagged vector ];
        description = "Statically-sized array wrappers with Storable instances for FFI marshaling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "storable-tuple" = callPackage
@@ -231874,8 +214338,6 @@ self: {
        ];
        description = "Conversion between storablevector and stream-fusion lists with fusion";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "store" = callPackage
@@ -231892,8 +214354,8 @@ self: {
      }:
      mkDerivation {
        pname = "store";
-       version = "0.7.1";
-       sha256 = "0mxvyy7l0vg545f3v1y5kh7q58ajhwz02fhfk0km2198bhsdfrij";
+       version = "0.7.2";
+       sha256 = "1vavjbwys2l97ncb2d761rn7kk14f0gqmhvday8lqyxv91skq124";
        libraryHaskellDepends = [
          array async base base-orphans base64-bytestring bifunctors
          bytestring containers contravariant cryptohash deepseq directory
@@ -231978,8 +214440,6 @@ self: {
        executableHaskellDepends = [ base regex-compat ];
        description = "Simple Theorem Prover";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "str" = callPackage
@@ -231996,35 +214456,9 @@ self: {
        ];
        description = "A type class to abstract between many different string types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stratosphere" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
-     , hashable, hspec, hspec-discover, lens, template-haskell, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "stratosphere";
-       version = "0.40.0";
-       sha256 = "0xj8bclyfvhdw12jfndg6pivzrbhqjf2qky383n0w6if11cfli1z";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring containers hashable lens
-         template-haskell text unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty base bytestring containers hashable hspec
-         hspec-discover lens template-haskell text unordered-containers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "EDSL for AWS CloudFormation";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "stratosphere_0_49_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
@@ -232046,7 +214480,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "EDSL for AWS CloudFormation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stratum-tool" = callPackage
@@ -232067,8 +214500,6 @@ self: {
        ];
        description = "Client for Stratum protocol";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stratux" = callPackage
@@ -232084,8 +214515,6 @@ self: {
        ];
        description = "A library for stratux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stratux-demo" = callPackage
@@ -232108,8 +214537,6 @@ self: {
        ];
        description = "A demonstration of the stratux library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stratux-http" = callPackage
@@ -232156,8 +214583,6 @@ self: {
        ];
        description = "A library for using websockets with stratux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stream" = callPackage
@@ -232177,8 +214602,6 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stream-fusion" = callPackage
@@ -232192,8 +214615,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Faster Haskell lists using stream fusion";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stream-monad" = callPackage
@@ -232207,8 +214628,6 @@ self: {
        libraryHaskellDepends = [ base logict ];
        description = "Simple, Fair and Terminating Backtracking Monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "streamdeck" = callPackage
@@ -232220,8 +214639,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hidapi mtl split ];
        description = "Control library for the Elgato Stream Deck";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "streamed" = callPackage
@@ -232240,8 +214657,6 @@ self: {
        ];
        description = "Programmatically edit MIDI event streams via ALSA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "streaming" = callPackage
@@ -232377,8 +214792,6 @@ self: {
        ];
        description = "Streaming interface for Brotli (RFC7932) compression";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "streaming-bytestring" = callPackage
@@ -232421,8 +214834,6 @@ self: {
        ];
        description = "Cassava support for the streaming ecosystem";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "streaming-commons" = callPackage
@@ -232485,8 +214896,6 @@ self: {
        testHaskellDepends = [ base conduit hspec streaming ];
        description = "Bidirectional support between the streaming and conduit libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "streaming-events" = callPackage
@@ -232538,8 +214947,6 @@ self: {
        ];
        description = "online streaming fft";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "streaming-histogram" = callPackage
@@ -232639,8 +215046,6 @@ self: {
        ];
        description = "Perfectly streaming PNG image decoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "streaming-postgresql-simple" = callPackage
@@ -232658,8 +215063,6 @@ self: {
        ];
        description = "Stream postgresql-query results using the streaming library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "streaming-process" = callPackage
@@ -232684,8 +215087,6 @@ self: {
        ];
        description = "Streaming support for running system process";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "streaming-sort" = callPackage
@@ -232707,8 +215108,6 @@ self: {
        ];
        description = "Sorting streams";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "streaming-utils" = callPackage
@@ -232764,30 +215163,6 @@ self: {
      }) {};
 
   "streamly" = callPackage
-    ({ mkDerivation, atomic-primops, base, containers, deepseq
-     , exceptions, gauge, ghc-prim, heaps, hspec, lockfree-queue
-     , monad-control, mtl, QuickCheck, random, transformers
-     , transformers-base
-     }:
-     mkDerivation {
-       pname = "streamly";
-       version = "0.6.1";
-       sha256 = "141xc4c4ng0cxwlmjcw7v9a7wpi6kdidzwr4wify571ghql75gf2";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         atomic-primops base containers deepseq exceptions ghc-prim heaps
-         lockfree-queue monad-control mtl transformers transformers-base
-       ];
-       testHaskellDepends = [
-         base containers exceptions hspec mtl QuickCheck random transformers
-       ];
-       benchmarkHaskellDepends = [ base deepseq gauge random ];
-       description = "Beautiful Streaming, Concurrent and Reactive Composition";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "streamly_0_7_0" = callPackage
     ({ mkDerivation, atomic-primops, base, containers, deepseq
      , directory, exceptions, gauge, ghc-prim, heaps, hspec
      , lockfree-queue, monad-control, mtl, network, QuickCheck, random
@@ -232810,6 +215185,35 @@ self: {
        benchmarkHaskellDepends = [ base deepseq gauge random ];
        description = "Beautiful Streaming, Concurrent and Reactive Composition";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "streamly_0_7_1" = callPackage
+    ({ mkDerivation, atomic-primops, base, containers, deepseq
+     , directory, exceptions, fusion-plugin-types, gauge, ghc, ghc-prim
+     , heaps, hspec, lockfree-queue, monad-control, mtl, network
+     , primitive, QuickCheck, random, transformers, transformers-base
+     , typed-process
+     }:
+     mkDerivation {
+       pname = "streamly";
+       version = "0.7.1";
+       sha256 = "0jzs2jaznjqrnzwqnjyg0zxggsrid3q8r5v4cnlzvkcn053yam3m";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         atomic-primops base containers deepseq directory exceptions
+         fusion-plugin-types ghc-prim heaps lockfree-queue monad-control mtl
+         network primitive transformers transformers-base
+       ];
+       testHaskellDepends = [
+         base containers exceptions ghc hspec mtl QuickCheck random
+         transformers
+       ];
+       benchmarkHaskellDepends = [
+         base deepseq gauge mtl random typed-process
+       ];
+       description = "Beautiful Streaming, Concurrent and Reactive Composition";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -232820,8 +215224,8 @@ self: {
      }:
      mkDerivation {
        pname = "streamly-bytestring";
-       version = "0.1.0.1";
-       sha256 = "1z6cf88sbcadv6fpf6pnp6inl1p2sz48jfwc9ya9ava5rnrwy08i";
+       version = "0.1.2";
+       sha256 = "1j9lpggz23idlkj8rvb8bqg29xfzb7cmzf3lhyc43i5w73jslkv3";
        libraryHaskellDepends = [ base bytestring streamly ];
        testHaskellDepends = [
          base bytestring directory filepath hspec hspec-discover
@@ -232874,8 +215278,27 @@ self: {
        ];
        description = "Folder watching as a Streamly stream";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+     }) {};
+
+  "streamly-posix" = callPackage
+    ({ mkDerivation, base, bytestring, filepath, hpath-posix, hspec
+     , hspec-discover, safe-exceptions, streamly, streamly-bytestring
+     , temporary, unix, word8
+     }:
+     mkDerivation {
+       pname = "streamly-posix";
+       version = "0.1.0.0";
+       sha256 = "0pjrmpsm0925jhxnhqka3rlwllcww9xinyh1dg0k2g6b4pxr9gbx";
+       libraryHaskellDepends = [
+         base bytestring hpath-posix safe-exceptions streamly
+         streamly-bytestring unix word8
+       ];
+       testHaskellDepends = [
+         base filepath hpath-posix hspec hspec-discover temporary unix
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Posix related streaming APIs";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "streamproc" = callPackage
@@ -232926,8 +215349,6 @@ self: {
        ];
        description = "A simple, flexible and composable web-router";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "strelka-core" = callPackage
@@ -233035,8 +215456,6 @@ self: {
        ];
        description = "A collection of commonly used strict data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "strict-ghc-plugin" = callPackage
@@ -233155,8 +215574,6 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        description = "Combinators for strictifying functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "string" = callPackage
@@ -233248,32 +215665,6 @@ self: {
      }) {};
 
   "string-interpolate" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, formatting
-     , haskell-src-meta, hspec, interpolate, interpolatedstring-perl6
-     , QuickCheck, quickcheck-instances, quickcheck-text
-     , template-haskell, text, text-conversions, utf8-string
-     }:
-     mkDerivation {
-       pname = "string-interpolate";
-       version = "0.1.0.1";
-       sha256 = "0gk5driazck1h1hnpp17kw0ylgp15s9jnnmz53wxz4rjqy6g3z4c";
-       libraryHaskellDepends = [
-         base bytestring haskell-src-meta template-haskell text
-         text-conversions utf8-string
-       ];
-       testHaskellDepends = [
-         base bytestring hspec QuickCheck quickcheck-instances
-         quickcheck-text text
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion formatting interpolate
-         interpolatedstring-perl6 QuickCheck text
-       ];
-       description = "Haskell string/text/bytestring interpolation that just works";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "string-interpolate_0_2_0_0" = callPackage
     ({ mkDerivation, base, bytestring, criterion, formatting
      , haskell-src-meta, hspec, interpolate, interpolatedstring-perl6
      , neat-interpolation, QuickCheck, quickcheck-instances
@@ -233300,7 +215691,6 @@ self: {
        ];
        description = "Haskell string/text/bytestring interpolation that just works";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "string-isos" = callPackage
@@ -233316,8 +215706,6 @@ self: {
        ];
        description = "Tools for working with isomorphisms of strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "string-qq" = callPackage
@@ -233411,8 +215799,6 @@ self: {
        ];
        description = "Type-level Chars and Strings, with decidable equality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stringable" = callPackage
@@ -233453,8 +215839,6 @@ self: {
        ];
        description = "Transformations to several string-like types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stringprep" = callPackage
@@ -233507,8 +215891,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring containers syb ];
        description = "Memoize Strings as Atoms for fast comparison and sorting, with maps and sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "strio" = callPackage
@@ -233554,8 +215936,6 @@ self: {
        ];
        description = "A Haskell implementation of the Stripe API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stripe-concepts" = callPackage
@@ -233594,8 +215974,6 @@ self: {
        libraryHaskellDepends = [ base stripe-core stripe-http-client ];
        description = "Stripe API for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stripe-http-client" = callPackage
@@ -233615,8 +215993,6 @@ self: {
        ];
        description = "Stripe API for Haskell - http-client backend";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stripe-http-streams" = callPackage
@@ -233637,8 +216013,6 @@ self: {
        doCheck = false;
        description = "Stripe API for Haskell - http-streams backend";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stripe-scotty" = callPackage
@@ -233691,8 +216065,6 @@ self: {
        ];
        description = "Tests for Stripe API bindings for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stripe-wreq" = callPackage
@@ -233829,8 +216201,6 @@ self: {
        ];
        description = "Instantiate structural induction schemas for algebraic data types";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "structural-traversal" = callPackage
@@ -233843,8 +216213,6 @@ self: {
        testHaskellDepends = [ base HUnit mtl ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "structured-cli" = callPackage
@@ -233923,8 +216291,6 @@ self: {
        ];
        description = "Structured MongoDB interface";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "structures" = callPackage
@@ -233955,8 +216321,6 @@ self: {
        ];
        description = "\"Advanced\" Data Structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stt" = callPackage
@@ -233973,8 +216337,6 @@ self: {
        ];
        description = "A monad transformer version of the ST monad";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stunclient" = callPackage
@@ -234018,8 +216380,6 @@ self: {
        ];
        description = "A revival of the classic game Stunts (LambdaCube tech demo)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stutter" = callPackage
@@ -234104,8 +216464,6 @@ self: {
        ];
        description = "Haskell code prettifier";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stylist" = callPackage
@@ -234125,8 +216483,6 @@ self: {
        ];
        description = "Apply CSS styles to a document tree";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stylized" = callPackage
@@ -234138,8 +216494,6 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base ];
        description = "Ways to output stylized text on ANSI consoles";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "styx" = callPackage
@@ -234179,8 +216533,6 @@ self: {
        ];
        description = "An applicative functor that seamlessly talks to HTML inputs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sub-state" = callPackage
@@ -234198,8 +216550,6 @@ self: {
        ];
        description = "Get the total, put a single element";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "subhask" = callPackage
@@ -234226,8 +216576,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion MonadRandom ];
        description = "Type safe interface for programming in subcategories of Hask";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "subleq-toolchain" = callPackage
@@ -234249,8 +216597,6 @@ self: {
        ];
        description = "Toolchain of subleq computer";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "submark" = callPackage
@@ -234272,8 +216618,6 @@ self: {
        ];
        description = "Extract a part from CommonMark/Markdown docs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "subnet" = callPackage
@@ -234303,8 +216647,6 @@ self: {
        ];
        description = "Subsample data";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "substring-parser" = callPackage
@@ -234359,8 +216701,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Subword graph implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "subzero" = callPackage
@@ -234399,8 +216739,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An applicative functor to manage successors";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "suffix-array" = callPackage
@@ -234421,8 +216759,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion random ];
        description = "Simple and moderately efficient suffix array implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "suffixarray" = callPackage
@@ -234437,8 +216773,6 @@ self: {
        executableHaskellDepends = [ base HUnit ];
        description = "n log n implementation of suffix array";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "suffixtree" = callPackage
@@ -234474,8 +216808,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Abstract over the constraints on the parameters to type constructors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sum-type-boilerplate" = callPackage
@@ -234491,36 +216823,6 @@ self: {
      }) {};
 
   "summoner" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, base, base-noprelude
-     , bytestring, directory, filepath, generic-deriving, gitrev
-     , hedgehog, hspec, neat-interpolation, optparse-applicative
-     , process, relude, shellmet, text, time, tomland, tree-diff
-     }:
-     mkDerivation {
-       pname = "summoner";
-       version = "1.3.0.1";
-       sha256 = "1m08n2ip9rjx06mcwcv636ncicmpxcmhx82i3p4yc5vylibxr57s";
-       revision = "5";
-       editedCabalFile = "1fy1d12rq8cqafyr0yvwsnslmmvdhpjigjv2ppvhs4ihgghrrij3";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal base-noprelude bytestring directory filepath
-         generic-deriving gitrev neat-interpolation optparse-applicative
-         process relude shellmet text time tomland
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base-noprelude directory filepath hedgehog hspec neat-interpolation
-         relude tomland tree-diff
-       ];
-       description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects";
-       license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "summoner_1_4_0_0" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers
      , directory, filepath, generic-deriving, gitrev, hedgehog, hspec
      , neat-interpolation, optparse-applicative, process, relude
@@ -234544,8 +216846,6 @@ self: {
        ];
        description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "summoner-tui" = callPackage
@@ -234565,8 +216865,6 @@ self: {
        executableHaskellDepends = [ base relude ];
        description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects using TUI";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sump" = callPackage
@@ -234584,8 +216882,6 @@ self: {
        ];
        description = "A Haskell interface to SUMP-compatible logic analyzers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sundown" = callPackage
@@ -234613,8 +216909,6 @@ self: {
        ];
        description = "Test Cabalized package against multiple dependency versions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sunroof-compiler" = callPackage
@@ -234632,8 +216926,6 @@ self: {
        ];
        description = "Monadic Javascript Compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sunroof-examples" = callPackage
@@ -234655,8 +216947,6 @@ self: {
        ];
        description = "Tests for Sunroof";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sunroof-server" = callPackage
@@ -234678,8 +216968,6 @@ self: {
        ];
        description = "Monadic Javascript Compiler - Server Utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "super-user-spark" = callPackage
@@ -234709,8 +216997,6 @@ self: {
        ];
        description = "Configure your dotfile deployment with a DSL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "superbubbles" = callPackage
@@ -234725,8 +217011,6 @@ self: {
        testHaskellDepends = [ base containers hspec ];
        description = "Find \"superbubbles\", as described in https://arxiv.org/abs/1307.7925";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "superbuffer" = callPackage
@@ -234744,8 +217028,6 @@ self: {
        ];
        description = "Efficiently build a bytestring from smaller chunks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "supercollider-ht" = callPackage
@@ -234763,8 +217045,6 @@ self: {
        ];
        description = "Haskell SuperCollider utilities";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "supercollider-midi" = callPackage
@@ -234787,8 +217067,6 @@ self: {
        ];
        description = "Demonstrate how to control SuperCollider via ALSA-MIDI";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "superconstraints" = callPackage
@@ -234805,8 +217083,6 @@ self: {
        ];
        description = "Access an instance's constraints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "superdoc" = callPackage
@@ -234846,8 +217122,6 @@ self: {
        ];
        description = "A simple opinionated event store implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "supermonad" = callPackage
@@ -234864,8 +217138,6 @@ self: {
        testHaskellDepends = [ base containers ghc QuickCheck ];
        description = "Plugin and base library to support supermonads in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "supero" = callPackage
@@ -234884,8 +217156,6 @@ self: {
        ];
        description = "A Supercompiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "superrecord" = callPackage
@@ -234918,8 +217188,6 @@ self: {
        ];
        description = "Control an internal monad execution for trace generation, backtrakcking, testing and other purposes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "supervisors" = callPackage
@@ -234936,8 +217204,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Monitor groups of threads with non-hierarchical lifetimes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "supplemented" = callPackage
@@ -234956,8 +217222,6 @@ self: {
        ];
        description = "Early termination for monads";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "surjective" = callPackage
@@ -234969,8 +217233,6 @@ self: {
        libraryHaskellDepends = [ base lens mtl template-haskell ];
        description = "An output coverage checker";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "suspend" = callPackage
@@ -234985,38 +217247,6 @@ self: {
      }) {};
 
   "sv" = callPackage
-    ({ mkDerivation, attoparsec, base, bifunctors, bytestring, cassava
-     , contravariant, criterion, deepseq, hedgehog, hw-dsv, lens, Only
-     , parsers, semigroupoids, semigroups, sv-core, tasty
-     , tasty-hedgehog, tasty-hunit, text, transformers, trifecta
-     , utf8-string, validation, vector
-     }:
-     mkDerivation {
-       pname = "sv";
-       version = "1.3.1";
-       sha256 = "0j92jgma41ggfjvd8a1la1wi2vms8ia1y6aqf6l7casavcn5vf2k";
-       revision = "2";
-       editedCabalFile = "1c0q010bpzdmjlncjn58fvz50l5z2wqp4hjpj0isvdr5iq96pgza";
-       libraryHaskellDepends = [
-         attoparsec base bifunctors bytestring contravariant hw-dsv
-         semigroupoids sv-core transformers utf8-string validation
-       ];
-       testHaskellDepends = [
-         base bytestring cassava contravariant hedgehog lens Only parsers
-         semigroupoids semigroups tasty tasty-hedgehog tasty-hunit text
-         trifecta utf8-string validation vector
-       ];
-       benchmarkHaskellDepends = [
-         attoparsec base bytestring criterion deepseq hw-dsv lens text
-         vector
-       ];
-       description = "Encode and decode separated values (CSV, PSV, ...)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "sv_1_4" = callPackage
     ({ mkDerivation, attoparsec, base, bifunctors, bytestring, cassava
      , contravariant, criterion, deepseq, hedgehog, hw-dsv, lens, Only
      , parsers, semigroupoids, semigroups, sv-core, tasty
@@ -235044,8 +217274,6 @@ self: {
        ];
        description = "Encode and decode separated values (CSV, PSV, ...)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sv-cassava" = callPackage
@@ -235070,33 +217298,6 @@ self: {
      }) {};
 
   "sv-core" = callPackage
-    ({ mkDerivation, attoparsec, base, bifunctors, bytestring
-     , containers, contravariant, deepseq, double-conversion, lens, mtl
-     , parsec, profunctors, QuickCheck, readable, semigroupoids
-     , semigroups, tasty, tasty-quickcheck, text, transformers, trifecta
-     , utf8-string, validation, vector, void
-     }:
-     mkDerivation {
-       pname = "sv-core";
-       version = "0.4.1";
-       sha256 = "1brjdh22sarg9v0qak8xgzyhpcilwn0czab9mh65l2izp3nzkfn7";
-       revision = "2";
-       editedCabalFile = "05h0lsj434qv81b2fvnm80wyb7272wcwly3jfk4l1qp5hjyq6917";
-       libraryHaskellDepends = [
-         attoparsec base bifunctors bytestring containers contravariant
-         deepseq double-conversion lens mtl parsec profunctors readable
-         semigroupoids semigroups text transformers trifecta utf8-string
-         validation vector void
-       ];
-       testHaskellDepends = [
-         base bytestring profunctors QuickCheck semigroupoids semigroups
-         tasty tasty-quickcheck text validation vector
-       ];
-       description = "Encode and decode separated values (CSV, PSV, ...)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "sv-core_0_5" = callPackage
     ({ mkDerivation, attoparsec, base, bifunctors, bytestring
      , containers, contravariant, deepseq, double-conversion, lens, mtl
      , parsec, profunctors, QuickCheck, readable, semigroupoids
@@ -235121,7 +217322,6 @@ self: {
        ];
        description = "Encode and decode separated values (CSV, PSV, ...)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sv-svfactor" = callPackage
@@ -235139,8 +217339,6 @@ self: {
        ];
        description = "sv-core + svfactor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "svfactor" = callPackage
@@ -235166,8 +217364,6 @@ self: {
        ];
        description = "Syntax-preserving CSV manipulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "svg-builder" = callPackage
@@ -235200,8 +217396,6 @@ self: {
        ];
        description = "DSL for building SVG";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "svg-tree" = callPackage
@@ -235236,8 +217430,6 @@ self: {
        ];
        description = "Code generation tool for Quartz code from a SVG";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "svgcairo" = callPackage
@@ -235268,8 +217460,6 @@ self: {
        executableHaskellDepends = [ base filepath xml ];
        description = "Helper functions for dealing with SVG files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "svm" = callPackage
@@ -235310,8 +217500,6 @@ self: {
        ];
        description = "Medium level, simplified, bindings to libsvm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "svndump" = callPackage
@@ -235330,8 +217518,6 @@ self: {
        ];
        description = "Library for reading Subversion dump files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "swagger" = callPackage
@@ -235376,8 +217562,6 @@ self: {
        ];
        description = "Auto-generated openapi-petstore API Client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "swagger-test" = callPackage
@@ -235407,45 +217591,9 @@ self: {
        ];
        description = "Testing of Swagger APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "swagger2" = callPackage
-    ({ mkDerivation, aeson, base, base-compat-batteries, bytestring
-     , Cabal, cabal-doctest, containers, cookie, doctest, generics-sop
-     , Glob, hashable, hspec, hspec-discover, http-media, HUnit
-     , insert-ordered-containers, lens, mtl, network, QuickCheck
-     , quickcheck-instances, scientific, template-haskell, text, time
-     , transformers, transformers-compat, unordered-containers
-     , utf8-string, uuid-types, vector
-     }:
-     mkDerivation {
-       pname = "swagger2";
-       version = "2.4";
-       sha256 = "0m08l7nz53h6ix6xgzynnh3cf6l61437da9swdbsz8avx0rq2wci";
-       revision = "1";
-       editedCabalFile = "02qlfsgqc5jmc616xn30hn213dwhsqlkrrk2pa6774f0dcn8rpiz";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         aeson base base-compat-batteries bytestring containers cookie
-         generics-sop hashable http-media insert-ordered-containers lens mtl
-         network QuickCheck scientific template-haskell text time
-         transformers transformers-compat unordered-containers uuid-types
-         vector
-       ];
-       testHaskellDepends = [
-         aeson base base-compat-batteries bytestring containers doctest Glob
-         hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck
-         quickcheck-instances template-haskell text time
-         unordered-containers utf8-string vector
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Swagger 2.0 data model";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "swagger2_2_5" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries
      , bytestring, Cabal, cabal-doctest, containers, cookie, doctest
      , generics-sop, Glob, hashable, hspec, hspec-discover, http-media
@@ -235475,7 +217623,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Swagger 2.0 data model";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swapper" = callPackage
@@ -235493,8 +217640,6 @@ self: {
        librarySystemDepends = [ tokyocabinet ];
        description = "Transparently swapping data from in-memory structures to disk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) tokyocabinet;};
 
   "swearjure" = callPackage
@@ -235514,8 +217659,6 @@ self: {
        ];
        description = "Clojure without alphanumerics";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "swf" = callPackage
@@ -235527,8 +217670,6 @@ self: {
        libraryHaskellDepends = [ base mtl pretty ];
        description = "A library for creating Shockwave Flash (SWF) files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "swift-lda" = callPackage
@@ -235544,8 +217685,6 @@ self: {
        ];
        description = "Online sampler for Latent Dirichlet Allocation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "swish" = callPackage
@@ -235594,8 +217733,6 @@ self: {
        ];
        description = "A simple web server for serving directories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sxml" = callPackage
@@ -235634,8 +217771,6 @@ self: {
        libraryHaskellDepends = [ base eq prelude-extras ];
        description = "Higher order versions of the Scrap Your Boilerplate classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "syb-with-class" = callPackage
@@ -235663,8 +217798,6 @@ self: {
        libraryHaskellDepends = [ base syb-with-class text ];
        description = "Scrap Your Boilerplate With Class Text instance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "syfco" = callPackage
@@ -235685,8 +217818,6 @@ self: {
        ];
        description = "Synthesis Format Conversion Tool / Library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sylvia" = callPackage
@@ -235712,8 +217843,6 @@ self: {
        ];
        description = "Lambda calculus visualization";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sym" = callPackage
@@ -235726,8 +217855,6 @@ self: {
        testHaskellDepends = [ base hashable QuickCheck ];
        description = "Permutations, patterns, and statistics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sym-plot" = callPackage
@@ -235739,8 +217866,6 @@ self: {
        libraryHaskellDepends = [ base diagrams-cairo diagrams-lib sym ];
        description = "Plot permutations; an addition to the sym package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "symantic" = callPackage
@@ -235931,8 +218056,6 @@ self: {
        ];
        description = "Test symantic-http and its companion libraries";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "symantic-lib" = callPackage
@@ -235978,8 +218101,6 @@ self: {
        ];
        description = "Library for reading, validating and writing a subset of the XML format";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "symbiote" = callPackage
@@ -235989,18 +218110,17 @@ self: {
      , quickcheck-instances, stm, tasty, tasty-hunit, tasty-quickcheck
      , text, threaded, uuid, wai, wai-extra, wai-transformers
      , wai-websockets, warp, websockets, websockets-simple
-     , websockets-simple-extra, zeromq4-haskell, zeromq4-simple
+     , websockets-simple-extra
      }:
      mkDerivation {
        pname = "symbiote";
-       version = "0.0.4";
-       sha256 = "1qvlwjghd8gg6g9vl2lx94byp0j4fnbgbv7pnzna3grfs7gk1768";
+       version = "0.0.5";
+       sha256 = "1igdig2w7j7l3valixsiw9jwj9na2n2k1rn7x7ay904jh11a8400";
        libraryHaskellDepends = [
          abides aeson async base bytestring cereal chan containers
          exceptions extractable-singleton hashable monad-control-aligned mtl
          QuickCheck quickcheck-instances stm text threaded uuid
          wai-transformers websockets-simple websockets-simple-extra
-         zeromq4-haskell zeromq4-simple
        ];
        testHaskellDepends = [
          abides aeson async base bytestring cereal chan containers
@@ -236008,12 +218128,10 @@ self: {
          monad-control-aligned mtl QuickCheck quickcheck-instances stm tasty
          tasty-hunit tasty-quickcheck text threaded uuid wai wai-extra
          wai-transformers wai-websockets warp websockets websockets-simple
-         websockets-simple-extra zeromq4-haskell zeromq4-simple
+         websockets-simple-extra
        ];
        description = "Data serialization, communication, and operation verification implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "symbol" = callPackage
@@ -236065,8 +218183,6 @@ self: {
        testSystemDepends = [ gmp gmpxx symengine ];
        description = "SymEngine symbolic mathematics engine for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; 
          inherit (pkgs) symengine;};
 
@@ -236085,8 +218201,6 @@ self: {
        testSystemDepends = [ gmp gmpxx symengine ];
        description = "SymEngine symbolic mathematics engine for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; 
          inherit (pkgs) symengine;};
 
@@ -236126,8 +218240,6 @@ self: {
        libraryHaskellDepends = [ base stm ];
        description = "A fast implementation of synchronous channels with a CML-like API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sync-mht" = callPackage
@@ -236165,8 +218277,6 @@ self: {
        ];
        description = "Fast incremental file transfer using Merkle-Hash-Trees";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "synchronous-channels" = callPackage
@@ -236205,8 +218315,6 @@ self: {
        ];
        description = "Haskell bindings for the Syncthing REST API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "synt" = callPackage
@@ -236255,8 +218363,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Generic representation and manipulation of abstract syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "syntactical" = callPackage
@@ -236285,8 +218391,6 @@ self: {
        ];
        description = "Reversible parsing and pretty-printing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "syntax-attoparsec" = callPackage
@@ -236302,8 +218406,6 @@ self: {
        ];
        description = "Syntax instances for Attoparsec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "syntax-example" = callPackage
@@ -236322,8 +218424,6 @@ self: {
        ];
        description = "Example application using syntax, a library for abstract syntax descriptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "syntax-example-json" = callPackage
@@ -236342,8 +218442,6 @@ self: {
        ];
        description = "Example JSON parser/pretty-printer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "syntax-pretty" = callPackage
@@ -236358,8 +218456,6 @@ self: {
        ];
        description = "Syntax instance for pretty, the pretty printing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "syntax-printer" = callPackage
@@ -236376,8 +218472,6 @@ self: {
        ];
        description = "Text and ByteString printers for 'syntax'";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "syntax-trees" = callPackage
@@ -236393,8 +218487,6 @@ self: {
        ];
        description = "Convert between different Haskell syntax trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "syntax-trees-fork-bairyn" = callPackage
@@ -236410,8 +218502,6 @@ self: {
        ];
        description = "Convert between different Haskell syntax trees. Bairyn's fork.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "syntaxnet-haskell" = callPackage
@@ -236430,8 +218520,6 @@ self: {
        testHaskellDepends = [ aeson base cassava haskell-conll hspec ];
        description = "Working with Google's SyntaxNet output files - CoNLL, Tree";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "synthesizer" = callPackage
@@ -236453,8 +218541,6 @@ self: {
        ];
        description = "Audio signal processing coded in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "synthesizer-alsa" = callPackage
@@ -236593,8 +218679,6 @@ self: {
        doHaddock = false;
        description = "Efficient signal processing using runtime compilation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "synthesizer-midi" = callPackage
@@ -236654,8 +218738,6 @@ self: {
        ];
        description = "A replacement for System.Exit and System.Process.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sysinfo" = callPackage
@@ -236695,8 +218777,6 @@ self: {
        testHaskellDepends = [ base basic-prelude chell system-filepath ];
        description = "Abstract data type for canonical paths with some utilities";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "system-command" = callPackage
@@ -236715,8 +218795,6 @@ self: {
        ];
        description = "A replacement for System.Exit and System.Process";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "system-error" = callPackage
@@ -236742,8 +218820,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A bunch of system utilities used by other projects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "system-fileio" = callPackage
@@ -236837,8 +218913,6 @@ self: {
        ];
        description = "Lifted versions of System functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "system-linux-proc" = callPackage
@@ -236855,8 +218929,6 @@ self: {
        testHaskellDepends = [ base hedgehog ];
        description = "A library for accessing the /proc filesystem in Linux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "system-locale" = callPackage
@@ -236910,8 +218982,6 @@ self: {
        ];
        description = "Random number generation for extensible effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "system-test" = callPackage
@@ -236987,20 +219057,6 @@ self: {
      }) {inherit (pkgs) libossp_uuid;};
 
   "systemd" = callPackage
-    ({ mkDerivation, base, bytestring, network, transformers, unix }:
-     mkDerivation {
-       pname = "systemd";
-       version = "1.2.0";
-       sha256 = "04jzgixwy267bx75byi1pavfgic2h3znn42psb70i6l6xvwn875g";
-       libraryHaskellDepends = [
-         base bytestring network transformers unix
-       ];
-       testHaskellDepends = [ base network unix ];
-       description = "Systemd facilities (Socket activation, Notify)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "systemd_2_2_0" = callPackage
     ({ mkDerivation, base, bytestring, network, transformers, unix }:
      mkDerivation {
        pname = "systemd";
@@ -237012,7 +219068,6 @@ self: {
        testHaskellDepends = [ base network unix ];
        description = "Systemd facilities (Socket activation, Notify)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "systemstats" = callPackage
@@ -237031,8 +219086,6 @@ self: {
        ];
        description = "An application that regularly logs system stats for later analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "syz" = callPackage
@@ -237061,8 +219114,6 @@ self: {
        ];
        description = "Matchers and grammars using tree regular expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "t3-client" = callPackage
@@ -237074,8 +219125,6 @@ self: {
        libraryHaskellDepends = [ base t3-game t3-server ];
        description = "tic-tac-toe Rexports for client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "t3-game" = callPackage
@@ -237111,8 +219160,6 @@ self: {
        ];
        description = "tic-tac-toe server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ta" = callPackage
@@ -237128,8 +219175,6 @@ self: {
        ];
        description = "Transito Abierto: convenience library when using Takusen and Oracle";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tabl" = callPackage
@@ -237159,8 +219204,6 @@ self: {
        ];
        description = "Simple tool to generate tables from DSV input";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "table-layout" = callPackage
@@ -237185,8 +219228,6 @@ self: {
        ];
        description = "Layout text as grid or table";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "table-tennis" = callPackage
@@ -237198,8 +219239,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A table tennis game tracking engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tableaux" = callPackage
@@ -237217,8 +219256,6 @@ self: {
        ];
        description = "An interactive theorem prover based on semantic tableaux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tables" = callPackage
@@ -237242,8 +219279,6 @@ self: {
        ];
        description = "In-memory storage with multiple keys using lenses and traversals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tablestorage" = callPackage
@@ -237264,8 +219299,6 @@ self: {
        ];
        description = "Azure Table Storage REST API Wrapper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tablize" = callPackage
@@ -237302,8 +219335,6 @@ self: {
        ];
        description = "View the output of shell commands in a table";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tabs" = callPackage
@@ -237318,8 +219349,6 @@ self: {
        executableHaskellDepends = [ base filepath monadlist mtl tagged ];
        description = "Indents source files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tabular" = callPackage
@@ -237375,8 +219404,6 @@ self: {
        executablePkgconfigDepends = [ gtk3 ];
        description = "A desktop bar similar to xmobar, but with more GUI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtk3;};
 
   "tag-bits" = callPackage
@@ -237388,8 +219415,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Provides access to the dynamic pointer tagging bits used by GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tag-stream" = callPackage
@@ -237405,8 +219430,6 @@ self: {
        ];
        description = "streamlined html tag parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tagchup" = callPackage
@@ -237473,8 +219496,6 @@ self: {
        ];
        description = "Reflect exceptions using phantom types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tagged-identity" = callPackage
@@ -237505,8 +219526,6 @@ self: {
        ];
        description = "Lists tagged with a type-level natural number representing their length";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tagged-th" = callPackage
@@ -237520,8 +219539,6 @@ self: {
        ];
        description = "QuasiQuoter and Template Haskell splices for creating proxies at higher-kinds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tagged-timers" = callPackage
@@ -237535,8 +219552,6 @@ self: {
        ];
        description = "Simple wrappers for timing IO actions (single-threaded)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tagged-transformer" = callPackage
@@ -237639,8 +219654,6 @@ self: {
        libraryPkgconfigDepends = [ taglib ];
        description = "An FFI layer over TagLib's C bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) taglib;};
 
   "tagset-positional" = callPackage
@@ -237706,8 +219719,6 @@ self: {
        ];
        description = "alternative parser for the tagsoup package";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tagsoup-megaparsec" = callPackage
@@ -237724,8 +219735,6 @@ self: {
        ];
        description = "A Tag token parser and Tag specific parsing combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tagsoup-navigate" = callPackage
@@ -237743,8 +219752,6 @@ self: {
        ];
        description = "Tagsoup Navigate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tagsoup-parsec" = callPackage
@@ -237756,8 +219763,6 @@ self: {
        libraryHaskellDepends = [ base parsec tagsoup ];
        description = "Tokenizes Tag, so [ Tag ] can be used as parser input";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tagsoup-selection" = callPackage
@@ -237769,8 +219774,6 @@ self: {
        libraryHaskellDepends = [ base containers parsec tagsoup ];
        description = "Selecting subtrees from TagSoup's TagTrees using CSS selectors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tagstream-conduit" = callPackage
@@ -237826,8 +219829,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Tai64 Labels for Haskell";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tailfile-hinotify" = callPackage
@@ -237900,8 +219901,6 @@ self: {
        libraryHaskellDepends = [ base lens monad-skeleton mtl ];
        description = "create slide for presentation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "takusen-oracle" = callPackage
@@ -237916,8 +219915,6 @@ self: {
        librarySystemDepends = [ clntsh ];
        description = "Database library with left-fold interface for Oracle";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {clntsh = null;};
 
   "tal" = callPackage
@@ -237933,8 +219930,6 @@ self: {
        ];
        description = "An implementation of Typed Assembly Language (Morrisett, Walker, Crary, Glew)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tamarin-prover" = callPackage
@@ -237964,8 +219959,6 @@ self: {
        ];
        description = "The Tamarin prover for security protocol analysis";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tamarin-prover-term" = callPackage
@@ -237984,8 +219977,6 @@ self: {
        ];
        description = "Term manipulation library for the tamarin prover";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tamarin-prover-theory" = callPackage
@@ -238007,8 +219998,6 @@ self: {
        ];
        description = "Term manipulation library for the tamarin prover";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tamarin-prover-utils" = callPackage
@@ -238026,8 +220015,6 @@ self: {
        ];
        description = "Utility library for the tamarin prover";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tamper" = callPackage
@@ -238039,8 +220026,17 @@ self: {
        libraryHaskellDepends = [ base containers mtl safe text ];
        description = "Blaze-style HTML templates as a Monad Transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+     }) {};
+
+  "tangle" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "tangle";
+       version = "0";
+       sha256 = "1ylv73v6ydf39zfks9762dsz27sxr7sbmmk7k628yqc9czj3nj60";
+       libraryHaskellDepends = [ base transformers ];
+       description = "HKD record builder";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "tao" = callPackage
@@ -238127,30 +220123,28 @@ self: {
   "tar-bytestring" = callPackage
     ({ mkDerivation, array, base, bytestring, bytestring-handle
      , containers, criterion, deepseq, hpath-directory, hpath-filepath
-     , QuickCheck, safe-exceptions, tasty, tasty-quickcheck, time, unix
-     , word8
+     , hpath-posix, QuickCheck, safe-exceptions, tasty, tasty-quickcheck
+     , time, unix, word8
      }:
      mkDerivation {
        pname = "tar-bytestring";
-       version = "0.6.1.1";
-       sha256 = "0spg2hqlpz0j2bx42vhv5q9fghr0k773w0kr96k8fvg4ff7cs5wa";
+       version = "0.6.2.0";
+       sha256 = "17ha3c9fiqw2zabnzrz4rlafvg2dynga8cc6j4hhzppc25v5blwj";
        libraryHaskellDepends = [
          array base bytestring containers deepseq hpath-directory
-         hpath-filepath safe-exceptions time unix word8
+         hpath-filepath hpath-posix safe-exceptions time unix word8
        ];
        testHaskellDepends = [
          array base bytestring bytestring-handle containers deepseq
-         hpath-directory hpath-filepath QuickCheck safe-exceptions tasty
-         tasty-quickcheck time unix word8
+         hpath-directory hpath-filepath hpath-posix QuickCheck
+         safe-exceptions tasty tasty-quickcheck time unix word8
        ];
        benchmarkHaskellDepends = [
          array base bytestring containers criterion deepseq hpath-directory
-         hpath-filepath safe-exceptions time unix word8
+         hpath-filepath hpath-posix safe-exceptions time unix word8
        ];
        description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tar-conduit" = callPackage
@@ -238227,8 +220221,6 @@ self: {
        ];
        description = "Generate test-suites from refinement types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) z3;};
 
   "tart" = callPackage
@@ -238253,8 +220245,6 @@ self: {
        ];
        description = "Terminal Art";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "task" = callPackage
@@ -238274,8 +220264,6 @@ self: {
        ];
        description = "A command line tool for keeping track of tasks you worked on";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "task-distribution" = callPackage
@@ -238312,8 +220300,6 @@ self: {
        ];
        description = "Distributed processing of changing tasks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "taskell" = callPackage
@@ -238325,8 +220311,8 @@ self: {
      }:
      mkDerivation {
        pname = "taskell";
-       version = "1.9.2.0";
-       sha256 = "1nm150ffvwmxid9jzg2r0yj995s39lsfd85rhpsbpbhprpx6wf4s";
+       version = "1.9.3.0";
+       sha256 = "06pdfi5bw2ga0pizq01x35gp8f90c8gr4ivbm5k4a7xv6pwr8mf0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -238343,8 +220329,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A command-line kanban board/task manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "taskpool" = callPackage
@@ -238439,8 +220423,6 @@ self: {
        ];
        description = "Auto discovery for Tasty with support for ingredients and test tree generation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tasty-dejafu" = callPackage
@@ -238505,8 +220487,6 @@ self: {
        ];
        description = "Adds the ability to fail a tasty test suite on first test failure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tasty-golden" = callPackage
@@ -238529,6 +220509,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-golden_2_3_2_1" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, deepseq
+     , directory, filepath, mtl, optparse-applicative, process, tagged
+     , tasty, tasty-hunit, temporary, temporary-rc
+     }:
+     mkDerivation {
+       pname = "tasty-golden";
+       version = "2.3.2.1";
+       sha256 = "175qrnjz2szn0bclxcq3lsa0rxlrm3jwxsbii65qjgknzn0g5shp";
+       revision = "1";
+       editedCabalFile = "0jjma01ypvgvf851la5m2rlavi588ihjl4n9lmdmx1khlz8q8jz1";
+       libraryHaskellDepends = [
+         async base bytestring containers deepseq directory filepath mtl
+         optparse-applicative process tagged tasty temporary
+       ];
+       testHaskellDepends = [
+         base directory filepath process tasty tasty-hunit temporary-rc
+       ];
+       description = "Golden tests support for tasty";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-groundhog-converters" = callPackage
     ({ mkDerivation, aeson, base, bimap, bytestring, containers
      , groundhog, groundhog-converters, groundhog-sqlite, groundhog-th
@@ -238545,8 +220548,6 @@ self: {
        ];
        description = "Tasty Tests for groundhog converters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tasty-hedgehog" = callPackage
@@ -238585,8 +220586,6 @@ self: {
        ];
        description = "Coverage tracking for Hedgehog Property-Based Testing via Tasty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tasty-hspec" = callPackage
@@ -238686,8 +220685,6 @@ self: {
        ];
        description = "automated integration of QuickCheck properties into tasty suites";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tasty-jenkins-xml" = callPackage
@@ -238707,8 +220704,6 @@ self: {
        ];
        description = "Render tasty output to both console and XML for Jenkins";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tasty-kat" = callPackage
@@ -238742,8 +220737,6 @@ self: {
        testHaskellDepends = [ base smallcheck smallcheck-laws tasty ];
        description = "Test common laws";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tasty-leancheck" = callPackage
@@ -238772,8 +220765,6 @@ self: {
        testHaskellDepends = [ base lens tasty ];
        description = "Tasty TestTrees for Lens validation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tasty-lua" = callPackage
@@ -238902,8 +220893,6 @@ self: {
        ];
        description = "Collect statistics of your Tasty testsuite";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tasty-tap" = callPackage
@@ -238920,8 +220909,24 @@ self: {
        ];
        description = "TAP (Test Anything Protocol) Version 13 formatter for tasty";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+     }) {};
+
+  "tasty-test-reporter" = callPackage
+    ({ mkDerivation, ansi-terminal, base, concurrent-output, containers
+     , directory, filepath, junit-xml, mtl, safe-exceptions, stm, tagged
+     , tasty, tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "tasty-test-reporter";
+       version = "0.1.1.1";
+       sha256 = "005sfxxgx4dkxw0bs6b5japx0qvzs95mzz3nvpa2ycy3v25qqaad";
+       libraryHaskellDepends = [
+         ansi-terminal base concurrent-output containers directory filepath
+         junit-xml mtl safe-exceptions stm tagged tasty text
+       ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       description = "Producing JUnit-style XML test reports";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "tasty-test-vector" = callPackage
@@ -239055,8 +221060,6 @@ self: {
        ];
        description = "Transactional variables and data structures with IO hooks";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tcache-AWS" = callPackage
@@ -239072,8 +221075,6 @@ self: {
        ];
        description = "tcache using Amazon Web Services as default persistence mechanism";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tccli" = callPackage
@@ -239091,8 +221092,6 @@ self: {
        ];
        description = "TokyoCabinet CLI interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tce-conf" = callPackage
@@ -239126,8 +221125,6 @@ self: {
        libraryPkgconfigDepends = [ libtcod ];
        description = "Bindings to libtcod roguelike engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libtcod;};
 
   "tconfig" = callPackage
@@ -239150,8 +221147,6 @@ self: {
        libraryHaskellDepends = [ base containers old-time ];
        description = "A purely functional TCP implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tcp-streams" = callPackage
@@ -239195,8 +221190,6 @@ self: {
        ];
        description = "Tcp streams using openssl for tls support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tdd-util" = callPackage
@@ -239224,8 +221217,6 @@ self: {
        ];
        description = "Test framework wrapper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tdigest" = callPackage
@@ -239307,8 +221298,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Pure Haskell TDS protocol implementation. Mainly for beam-mssql and beam-sybase";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "teams" = callPackage
@@ -239320,8 +221309,6 @@ self: {
        libraryHaskellDepends = [ base containers fgl graphviz ];
        description = "Graphical modeling tools for sequential teams";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "teardown" = callPackage
@@ -239354,8 +221341,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Dental data types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "telegram" = callPackage
@@ -239371,8 +221356,6 @@ self: {
        ];
        description = "Telegram API client";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "telegram-api" = callPackage
@@ -239400,8 +221383,6 @@ self: {
        ];
        description = "Telegram Bot API bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "telegram-bot" = callPackage
@@ -239422,8 +221403,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Telegram Bot microframework for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "telegram-bot-simple" = callPackage
@@ -239455,8 +221434,6 @@ self: {
        ];
        description = "Easy to use library for building Telegram bots";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "teleport" = callPackage
@@ -239477,8 +221454,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A tool to quickly switch between directories";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "teleshell" = callPackage
@@ -239501,8 +221476,6 @@ self: {
        ];
        description = "Telnet client and other things";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tellbot" = callPackage
@@ -239522,8 +221495,6 @@ self: {
        ];
        description = "IRC tellbot";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tempered" = callPackage
@@ -239567,8 +221538,6 @@ self: {
        libraryHaskellDepends = [ base data-default template-haskell ];
        description = "declaring Default instances just got even easier";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "template-haskell_2_15_0_0" = callPackage
@@ -239605,8 +221574,6 @@ self: {
        ];
        description = "Some utilities for template Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "template-hsml" = callPackage
@@ -239627,8 +221594,6 @@ self: {
        ];
        description = "Haskell's Simple Markup Language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "template-toolkit" = callPackage
@@ -239659,8 +221624,6 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        description = "Process template file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "templateify" = callPackage
@@ -239674,8 +221637,6 @@ self: {
        executableHaskellDepends = [ base mtl tagsoup uniplate ];
        description = "Make template from website";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "templatepg" = callPackage
@@ -239693,8 +221654,6 @@ self: {
        ];
        description = "A PostgreSQL access library with compile-time SQL type inference";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "templater" = callPackage
@@ -239749,8 +221708,6 @@ self: {
        ];
        description = "A small Haskell wrapper around the TempoDB api";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "temporal-csound" = callPackage
@@ -239768,8 +221725,6 @@ self: {
        ];
        description = "library to make electronic music, brings together temporal-music-notation and csound-expression packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "temporal-media" = callPackage
@@ -239891,8 +221846,6 @@ self: {
        executableToolDepends = [ happy ];
        description = "Interpreter for the FRP language Tempus";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tempus-fugit" = callPackage
@@ -239920,8 +221873,6 @@ self: {
        testHaskellDepends = [ base QuickCheck random ];
        description = "A completely type-safe library for linear algebra";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tensor-safe" = callPackage
@@ -239973,8 +221924,6 @@ self: {
        ];
        description = "TensorFlow bindings";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libtensorflow;};
 
   "tensorflow-core-ops" = callPackage
@@ -239995,8 +221944,6 @@ self: {
        ];
        description = "Haskell wrappers for Core Tensorflow Ops";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tensorflow-logging" = callPackage
@@ -240025,8 +221972,6 @@ self: {
        ];
        description = "TensorBoard related functionality";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tensorflow-mnist" = callPackage
@@ -240079,8 +222024,6 @@ self: {
        ];
        description = "Code generation for TensorFlow operations";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tensorflow-ops" = callPackage
@@ -240110,8 +222053,6 @@ self: {
        ];
        description = "Friendly layer around TensorFlow bindings";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tensorflow-proto" = callPackage
@@ -240129,8 +222070,6 @@ self: {
        libraryToolDepends = [ protobuf ];
        description = "TensorFlow protocol buffers";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) protobuf;};
 
   "tensorflow-records" = callPackage
@@ -240253,8 +222192,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Bindings to the Termbox library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "termcolor" = callPackage
@@ -240324,8 +222261,6 @@ self: {
        testHaskellDepends = [ base QuickCheck time ];
        description = "Simple terminal-based time tracker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "terminal-size" = callPackage
@@ -240352,8 +222287,6 @@ self: {
        ];
        description = "Text data type for styled terminal output, including all standard ANSI effects (bold, italic, blinking) and ANSI / 256 / truecolor colors support for Unix and Windows (whenever possible)";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "termination-combinators" = callPackage
@@ -240365,8 +222298,6 @@ self: {
        libraryHaskellDepends = [ base containers contravariant ];
        description = "Termination combinators for forcing non-terminating algorithms to terminate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "terminfo_0_4_1_4" = callPackage
@@ -240453,8 +222384,6 @@ self: {
        ];
        description = "Plot time series in your terminal using commands stdout";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "terntup" = callPackage
@@ -240472,8 +222401,6 @@ self: {
        ];
        description = "a ternary library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "terrahs" = callPackage
@@ -240486,8 +222413,6 @@ self: {
        librarySystemDepends = [ terralib4c translib ];
        description = "A Haskell GIS Programming Environment";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {terralib4c = null; translib = null;};
 
   "tersmu" = callPackage
@@ -240508,8 +222433,6 @@ self: {
        ];
        description = "A semantic parser for lojban";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tesla" = callPackage
@@ -240554,8 +222477,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Test monadic side-effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "test-framework" = callPackage
@@ -240596,8 +222517,6 @@ self: {
        testHaskellDepends = [ base test-framework ];
        description = "Test.Framework wrapper for DocTest";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "test-framework-golden" = callPackage
@@ -240667,8 +222586,6 @@ self: {
        ];
        description = "QuickCheck support for the test-framework package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "test-framework-quickcheck2" = callPackage
@@ -240706,8 +222623,6 @@ self: {
        ];
        description = "test-sandbox support for the test-framework package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "test-framework-skip" = callPackage
@@ -240727,8 +222642,6 @@ self: {
        ];
        description = "Functions for conveniently marking some of the tests in a suite as being skipped";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "test-framework-smallcheck" = callPackage
@@ -240754,8 +222667,6 @@ self: {
        testHaskellDepends = [ base test-framework testing-feat ];
        description = "A test framework provider for testing-feat";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "test-framework-th" = callPackage
@@ -240845,8 +222756,6 @@ self: {
        executableHaskellDepends = [ base simple-get-opt ];
        description = "A library to make a quick test-runner script";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "test-pkg" = callPackage
@@ -240858,8 +222767,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Just tests Hackage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "test-sandbox" = callPackage
@@ -240918,8 +222825,6 @@ self: {
        ];
        description = "Lightweight development enviroments using test-sandbox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "test-sandbox-hunit" = callPackage
@@ -240931,8 +222836,6 @@ self: {
        libraryHaskellDepends = [ base HUnit lifted-base test-sandbox ];
        description = "HUnit convenience functions for use with test-sandbox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "test-sandbox-quickcheck" = callPackage
@@ -240961,8 +222864,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Catchy combinators for HUnit";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "test-simple" = callPackage
@@ -240981,8 +222882,6 @@ self: {
        ];
        description = "Simple Perl inspired testing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "testCom" = callPackage
@@ -241000,8 +222899,6 @@ self: {
        ];
        description = "Write your tests in comments";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "testPkg" = callPackage
@@ -241037,8 +222934,6 @@ self: {
        ];
        description = "Create tests and benchmarks together";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "testing-feat" = callPackage
@@ -241083,8 +222978,6 @@ self: {
        ];
        description = "Quick feedback loop for test suites";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "testpack" = callPackage
@@ -241101,8 +222994,6 @@ self: {
        ];
        description = "Test Utililty Pack for HUnit and QuickCheck (unmaintained)";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "testpattern" = callPackage
@@ -241117,8 +223008,6 @@ self: {
        executableHaskellDepends = [ base filepath gtk ];
        description = "Display a monitor test pattern";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "testrunner" = callPackage
@@ -241133,8 +223022,6 @@ self: {
        ];
        description = "Easy unit test driver framework";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tetris" = callPackage
@@ -241163,8 +223050,6 @@ self: {
        executableHaskellDepends = [ base containers deepseq parsec ];
        description = "LaTeX to plain-text conversion";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "texbuilder" = callPackage
@@ -241185,41 +223070,17 @@ self: {
        ];
        description = "View your latex output while editing";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "texmath" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
-     , utf8-string, xml
-     }:
-     mkDerivation {
-       pname = "texmath";
-       version = "0.11.3";
-       sha256 = "03rpxbp43bjs62mmw4hv4785n6f6nbf8kj2y9mma5nzk6i2xs09f";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers mtl pandoc-types parsec syb xml
-       ];
-       testHaskellDepends = [
-         base bytestring directory filepath process split temporary text
-         utf8-string xml
-       ];
-       description = "Conversion between formats used to represent mathematics";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "texmath_0_12" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , mtl, pandoc-types, parsec, process, syb, temporary, text
      , utf8-string, xml
      }:
      mkDerivation {
        pname = "texmath";
-       version = "0.12";
-       sha256 = "09c1ga3nw0r0wcw84lf862mp02h5ykhprm2wawrqfhklfyl1a6ay";
+       version = "0.12.0.1";
+       sha256 = "1halp1vn2334ym3j3fxfbrpkr15nc201c7vfwmzimya6vnyknsxs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -241231,7 +223092,6 @@ self: {
        ];
        description = "Conversion between formats used to represent mathematics";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "texrunner" = callPackage
@@ -241293,8 +223153,6 @@ self: {
        ];
        description = "Everything Data.Text related in one package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-and-plots" = callPackage
@@ -241311,8 +223169,6 @@ self: {
        ];
        description = "EDSL to create HTML documents with plots based on the C3.js library.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-ansi" = callPackage
@@ -241378,8 +223234,6 @@ self: {
        ];
        description = "Memory-efficient string-indexed container types";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-conversions" = callPackage
@@ -241484,8 +223338,6 @@ self: {
        ];
        description = "A generic, derivable, haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-icu" = callPackage
@@ -241529,8 +223381,6 @@ self: {
        ];
        description = "Dealing with Strict Text in NFC normalization";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-icu-translit" = callPackage
@@ -241614,8 +223464,6 @@ self: {
        testHaskellDepends = [ base hspec lens ];
        description = "Lenses for operating over text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-lips" = callPackage
@@ -241653,8 +223501,6 @@ self: {
        libraryHaskellDepends = [ base bytestring bytestring-handle text ];
        description = "Encode and decode Text to/from ByteString using TextEncoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-manipulate" = callPackage
@@ -241686,8 +223532,6 @@ self: {
        ];
        description = "A data structure for mapping metadata to text subsequences";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-metrics" = callPackage
@@ -241721,8 +223565,6 @@ self: {
        ];
        description = "Unicode-normalized text";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-offset" = callPackage
@@ -241757,8 +223599,6 @@ self: {
        testHaskellDepends = [ base doctest HTF text ];
        description = "Utils for text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-position" = callPackage
@@ -241773,8 +223613,6 @@ self: {
        testHaskellDepends = [ base QuickCheck regex-applicative ];
        description = "Handling positions in text and position-tagging it";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-postgresql" = callPackage
@@ -241854,8 +223692,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl vector ];
        description = "A Haskell implementation of the 1# Text Register Machine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-render" = callPackage
@@ -241884,8 +223720,6 @@ self: {
        testHaskellDepends = [ base hedgehog neat-interpolation text ];
        description = "Simple text replacements from a list of search/replace pairs";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-short" = callPackage
@@ -241911,40 +223745,6 @@ self: {
      }) {};
 
   "text-show" = callPackage
-    ({ mkDerivation, array, base, base-compat-batteries, base-orphans
-     , bifunctors, bytestring, bytestring-builder, containers
-     , contravariant, criterion, deepseq, deriving-compat
-     , generic-deriving, ghc-boot-th, ghc-prim, hspec, hspec-discover
-     , integer-gmp, nats, QuickCheck, quickcheck-instances, semigroups
-     , tagged, template-haskell, text, th-abstraction, th-lift
-     , transformers, transformers-compat, void
-     }:
-     mkDerivation {
-       pname = "text-show";
-       version = "3.8.2";
-       sha256 = "0n46q5gjlxz3g4flj5mn8s78dpdfd65fjl7b5174pykanwqsqqwz";
-       revision = "1";
-       editedCabalFile = "0fdlba9rmjk7irf376rglyyi9rbz49mhm5zyx112ah8nqgh50myi";
-       libraryHaskellDepends = [
-         array base base-compat-batteries bifunctors bytestring
-         bytestring-builder containers contravariant generic-deriving
-         ghc-boot-th ghc-prim integer-gmp nats semigroups tagged
-         template-haskell text th-abstraction th-lift transformers
-         transformers-compat void
-       ];
-       testHaskellDepends = [
-         array base base-compat-batteries base-orphans bytestring
-         bytestring-builder deriving-compat generic-deriving ghc-prim hspec
-         nats QuickCheck quickcheck-instances semigroups tagged
-         template-haskell text transformers transformers-compat
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ];
-       description = "Efficient conversion of values into Text";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "text-show_3_8_4" = callPackage
     ({ mkDerivation, array, base, base-compat-batteries, base-orphans
      , bifunctors, bytestring, bytestring-builder, containers, criterion
      , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim
@@ -241972,7 +223772,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ];
        description = "Efficient conversion of values into Text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-show-instances" = callPackage
@@ -242040,8 +223839,6 @@ self: {
        ];
        description = "Library for Time parsing from Text into UTCTime";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-trie" = callPackage
@@ -242100,8 +223897,6 @@ self: {
        ];
        description = "An efficient packed UTF-8 backed Unicode text type";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-utils" = callPackage
@@ -242142,8 +223937,6 @@ self: {
        libraryHaskellDepends = [ base parsec template-haskell xml ];
        description = "Quasiquoter for xml. XML DSL in Haskell.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text-zipper" = callPackage
@@ -242169,8 +223962,6 @@ self: {
        testHaskellDepends = [ base hspec text-zipper ];
        description = "Monadic interface to the text-zipper package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "text1" = callPackage
@@ -242187,8 +223978,6 @@ self: {
        ];
        description = "Non-empty values of `Data.Text`.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "textPlot" = callPackage
@@ -242229,8 +224018,6 @@ self: {
        executableHaskellDepends = [ base haskell98 process ];
        description = "A simple Haskell program to provide tags for Haskell code completion in TextMate";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "textocat-api" = callPackage
@@ -242251,8 +224038,6 @@ self: {
        ];
        description = "Unofficial Haskell SDK for Textocat API -- http://textocat.com";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "texts" = callPackage
@@ -242275,8 +224060,6 @@ self: {
        libraryHaskellDepends = [ base bytestring text utf8-string ];
        description = "Textual type class for data that represent text";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tf-random" = callPackage
@@ -242311,8 +224094,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell tfp ];
        description = "Template-Haskell code for tfp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tftp" = callPackage
@@ -242337,8 +224118,6 @@ self: {
        ];
        description = "A library for building tftp servers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tga" = callPackage
@@ -242350,27 +224129,9 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Reading and writing of tga image files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-abstraction" = callPackage
-    ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
-     mkDerivation {
-       pname = "th-abstraction";
-       version = "0.3.1.0";
-       sha256 = "1f81w0gshvc816cf9qz0f19jsrzh6wpzmmy317xrgn63dv61p7jb";
-       revision = "1";
-       editedCabalFile = "1c0sy614vfcdvshn0z09nzfiq89v5if31yvvpxzrivrdy9gf912s";
-       libraryHaskellDepends = [
-         base containers ghc-prim template-haskell
-       ];
-       testHaskellDepends = [ base containers template-haskell ];
-       description = "Nicer interface for reified information about data types";
-       license = stdenv.lib.licenses.isc;
-     }) {};
-
-  "th-abstraction_0_3_2_0" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "th-abstraction";
@@ -242382,7 +224143,6 @@ self: {
        testHaskellDepends = [ base containers template-haskell ];
        description = "Nicer interface for reified information about data types";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-alpha" = callPackage
@@ -242402,8 +224162,6 @@ self: {
        ];
        description = "Alpha equivalence for TH Exp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-bang-compat" = callPackage
@@ -242426,8 +224184,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "More convenient construction of TH ASTs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-cas" = callPackage
@@ -242474,22 +224230,9 @@ self: {
        ];
        description = "Test instance context";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-data-compat" = callPackage
-    ({ mkDerivation, base, template-haskell }:
-     mkDerivation {
-       pname = "th-data-compat";
-       version = "0.0.2.7";
-       sha256 = "0yjfz9iwz0n2wx2c7wjazhwh23ny43fmnjp7dn7m37p320jgzahk";
-       libraryHaskellDepends = [ base template-haskell ];
-       description = "Compatibility for data definition template of TH";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "th-data-compat_0_1_0_0" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "th-data-compat";
@@ -242498,30 +224241,9 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Compatibility for data definition template of TH";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-desugar" = callPackage
-    ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb
-     , template-haskell, th-expand-syns, th-lift, th-orphans
-     }:
-     mkDerivation {
-       pname = "th-desugar";
-       version = "1.9";
-       sha256 = "1vxg0jvc239ngmv53yx564b7wkgd0b10xvx5phxvnnpm9n2pljpi";
-       libraryHaskellDepends = [
-         base containers mtl syb template-haskell th-expand-syns th-lift
-         th-orphans
-       ];
-       testHaskellDepends = [
-         base containers hspec HUnit mtl syb template-haskell th-expand-syns
-         th-lift th-orphans
-       ];
-       description = "Functions to desugar Template Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "th-desugar_1_10" = callPackage
     ({ mkDerivation, base, containers, fail, ghc-prim, hspec, HUnit
      , mtl, ordered-containers, semigroups, syb, template-haskell
      , th-abstraction, th-expand-syns, th-lift, th-orphans
@@ -242542,7 +224264,6 @@ self: {
        ];
        description = "Functions to desugar Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-dict-discovery" = callPackage
@@ -242554,8 +224275,6 @@ self: {
        libraryHaskellDepends = [ base constraints template-haskell ];
        description = "Automatically discover available dictionaries at compile time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-env" = callPackage
@@ -242603,8 +224322,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "TH fold generator";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-format" = callPackage
@@ -242621,8 +224338,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit text ];
        description = "Template Haskell based support for format strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-inline-io-action" = callPackage
@@ -242654,8 +224369,6 @@ self: {
        ];
        description = "Fixed versions of instances reification functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-instances" = callPackage
@@ -242679,8 +224392,6 @@ self: {
        ];
        description = "A place to collect orphan instances for Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-kinds" = callPackage
@@ -242711,8 +224422,6 @@ self: {
        ];
        description = "Automated kind inference in Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-lift" = callPackage
@@ -242795,26 +224504,6 @@ self: {
      }) {};
 
   "th-printf" = callPackage
-    ({ mkDerivation, base, charset, containers, hspec, HUnit
-     , microlens-platform, mtl, parsec, QuickCheck, semigroups
-     , template-haskell, th-lift, transformers
-     }:
-     mkDerivation {
-       pname = "th-printf";
-       version = "0.6.0";
-       sha256 = "1mqfbzx85c49q24yppkxgcd0h4s557b468qlnz2adbyba9wfsn62";
-       libraryHaskellDepends = [
-         base charset containers microlens-platform mtl parsec semigroups
-         template-haskell th-lift transformers
-       ];
-       testHaskellDepends = [
-         base hspec HUnit QuickCheck template-haskell
-       ];
-       description = "Quasiquoters for printf";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "th-printf_0_7" = callPackage
     ({ mkDerivation, base, charset, containers, dlist, hspec, HUnit
      , integer-logarithms, microlens-platform, mtl, parsec, QuickCheck
      , semigroups, template-haskell, text, th-lift, transformers
@@ -242832,7 +224521,6 @@ self: {
        ];
        description = "Quasiquoters for printf";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-reify-compat" = callPackage
@@ -242871,8 +224559,6 @@ self: {
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Binding group analysis in Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-strict-compat" = callPackage
@@ -242927,8 +224613,6 @@ self: {
        testHaskellDepends = [ base hspec template-haskell ];
        description = "Provides a way to persist data from compile-time to runtime";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-traced" = callPackage
@@ -242940,8 +224624,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        description = "Tracing Q monad computation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-typegraph" = callPackage
@@ -242969,8 +224651,6 @@ self: {
        ];
        description = "Graph of the subtype relation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "th-utilities" = callPackage
@@ -243013,8 +224693,6 @@ self: {
        ];
        description = "Give your dependencies stars on GitHub!";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "theatre" = callPackage
@@ -243030,8 +224708,6 @@ self: {
        ];
        description = "Minimalistic actor library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "themoviedb" = callPackage
@@ -243103,8 +224779,6 @@ self: {
        ];
        description = "All-in-one session handling for servant-based frontends";
        license = "AGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "theoremquest" = callPackage
@@ -243116,8 +224790,6 @@ self: {
        libraryHaskellDepends = [ base HTTP json utf8-string ];
        description = "A common library for TheoremQuest, a theorem proving game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "theoremquest-client" = callPackage
@@ -243131,8 +224803,6 @@ self: {
        executableHaskellDepends = [ base HTTP network theoremquest ];
        description = "A simple client for the TheoremQuest theorem proving game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "these_0_7_6" = callPackage
@@ -243217,8 +224887,6 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        description = "A fork of the 'these' package without the dependency bloat";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "thespian" = callPackage
@@ -243255,8 +224923,6 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        description = "Typing Haskell In Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "thimk" = callPackage
@@ -243275,8 +224941,6 @@ self: {
        ];
        description = "Command-line spelling word suggestion tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "thorn" = callPackage
@@ -243295,8 +224959,6 @@ self: {
        ];
        description = "Datatype Manipulation with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "thread-hierarchy" = callPackage
@@ -243324,6 +224986,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "thread-supervisor" = callPackage
+    ({ mkDerivation, base, clock, containers, data-default, hspec
+     , QuickCheck, unliftio
+     }:
+     mkDerivation {
+       pname = "thread-supervisor";
+       version = "0.1.0.0";
+       sha256 = "1gn2h4c84fdhppwjzkj9sr2rggc5q7193lf1n8c6ggzz6k2cj2rs";
+       libraryHaskellDepends = [
+         base clock containers data-default unliftio
+       ];
+       testHaskellDepends = [
+         base clock data-default hspec QuickCheck unliftio
+       ];
+       description = "A simplified implementation of Erlang/OTP like supervisor over thread";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "threadPool" = callPackage
     ({ mkDerivation, base, process }:
      mkDerivation {
@@ -243366,8 +225046,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "(deprecated in favor of 'threads') Simple thread management";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "threads" = callPackage
@@ -243452,8 +225130,6 @@ self: {
        ];
        description = "A graphical tool for profiling parallel Haskell programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "threefish" = callPackage
@@ -243526,8 +225202,6 @@ self: {
        executableHaskellDepends = [ base threepenny-gui ];
        description = "Write simple nested context menus for threepenny-gui";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "threepenny-gui-flexbox" = callPackage
@@ -243542,8 +225216,6 @@ self: {
        executableHaskellDepends = [ base threepenny-gui ];
        description = "Flexbox layouts for Threepenny-gui";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "thrift" = callPackage
@@ -243566,8 +225238,6 @@ self: {
        ];
        description = "Haskell bindings for the Apache Thrift RPC system";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "thrist" = callPackage
@@ -243630,8 +225300,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Loop over an action but throttle it to a certain rate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "through-text" = callPackage
@@ -243645,8 +225313,6 @@ self: {
        libraryHaskellDepends = [ base bytestring case-insensitive text ];
        description = "Convert textual types through Text without needing O(n^2) instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "throwable-exceptions" = callPackage
@@ -243665,8 +225331,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "throwable-exceptions gives the easy way to throw exceptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "thumbnail" = callPackage
@@ -243701,8 +225365,6 @@ self: {
        ];
        description = "Generate thumbnails easily and safely";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "thumbnail-polish" = callPackage
@@ -243719,8 +225381,6 @@ self: {
        ];
        description = "Image thumbnail creation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "thyme" = callPackage
@@ -243821,8 +225481,6 @@ self: {
        executableHaskellDepends = [ base glade gtk haskell98 ];
        description = "Useful if reading \"Why FP matters\" by John Hughes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ticker" = callPackage
@@ -243839,8 +225497,6 @@ self: {
        testHaskellDepends = [ async base deepseq doctest Glob hspec ];
        description = "A concurrent utility inspired by Ticker in golang";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tickle" = callPackage
@@ -243861,8 +225517,6 @@ self: {
        ];
        description = "A port of @Data.Binary@";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tictactoe3d" = callPackage
@@ -243874,8 +225528,6 @@ self: {
        libraryHaskellDepends = [ base tuples-homogenous-h98 vector ];
        description = "3D Tic-Tac-Toe game";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tidal" = callPackage
@@ -243914,8 +225566,6 @@ self: {
        ];
        description = "MIDI support for tidal";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tidal-serial" = callPackage
@@ -243929,8 +225579,6 @@ self: {
        ];
        description = "Serial support for tidal";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tidal-vis" = callPackage
@@ -243951,8 +225599,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Visual rendering for Tidal patterns and osc messages";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tie-knot" = callPackage
@@ -243964,8 +225610,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl recursion-schemes ];
        description = "\"Ties the knot\" on a given set of structures that reference each other by keys";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tiempo" = callPackage
@@ -243977,8 +225621,6 @@ self: {
        libraryHaskellDepends = [ base deepseq time ];
        description = "Specify time intervals in different units (secs, mins, hours, etc.)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tiger" = callPackage
@@ -243995,8 +225637,6 @@ self: {
        ];
        description = "Tiger Compiler of Universiteit Utrecht";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tight-apply" = callPackage
@@ -244024,8 +225664,6 @@ self: {
        ];
        description = "Nice API for a Slackbot";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tighttp" = callPackage
@@ -244044,8 +225682,6 @@ self: {
        ];
        description = "Tiny and Incrementally-Growing HTTP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tile" = callPackage
@@ -244088,8 +225724,6 @@ self: {
        executableToolDepends = [ happy ];
        description = "The Timber Compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "time_1_9_3" = callPackage
@@ -244153,8 +225787,6 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "Data instances for the time package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "time-exts" = callPackage
@@ -244199,8 +225831,6 @@ self: {
        ];
        description = "Parse and format HTTP/1.1 Date and Time strings";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "time-interval" = callPackage
@@ -244223,8 +225853,6 @@ self: {
        libraryHaskellDepends = [ base base-io-access time ];
        description = "IO Access for time";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "time-lens" = callPackage
@@ -244270,8 +225898,6 @@ self: {
        testHaskellDepends = [ base hspec HUnit mtl time tz ];
        description = "A library to mock the current time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "time-manager" = callPackage
@@ -244362,8 +225988,6 @@ self: {
        ];
        description = "Quasi-quoters for dates and times";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "time-recurrence" = callPackage
@@ -244381,8 +226005,6 @@ self: {
        ];
        description = "Generate recurring dates";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "time-series" = callPackage
@@ -244397,8 +226019,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Time series analysis";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "time-series-lib" = callPackage
@@ -244412,8 +226032,6 @@ self: {
        doHaddock = false;
        description = "Library for Time Series processing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "time-units" = callPackage
@@ -244438,8 +226056,6 @@ self: {
        libraryHaskellDepends = [ base convertible parsec time ];
        description = "Parse, format and convert W3C Date and Time";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "time-warp" = callPackage
@@ -244477,8 +226093,6 @@ self: {
        ];
        description = "Distributed systems execution emulation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timecalc" = callPackage
@@ -244491,8 +226105,6 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base haskeline uu-parsinglib ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timeconsole" = callPackage
@@ -244615,8 +226227,6 @@ self: {
          time unordered-containers
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timeout" = callPackage
@@ -244633,8 +226243,6 @@ self: {
        ];
        description = "Generalized sleep and timeout functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timeout-control" = callPackage
@@ -244661,8 +226269,6 @@ self: {
        libraryHaskellDepends = [ base deepseq mtl parallel ];
        description = "Runs a time-limited computation alowing it to return intermediate results";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timeparsers" = callPackage
@@ -244678,8 +226284,6 @@ self: {
        ];
        description = "Attoparsec parsers for various Date/Time formats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timeplot" = callPackage
@@ -244700,8 +226304,6 @@ self: {
        ];
        description = "A tool for visualizing time series from log files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timeprint" = callPackage
@@ -244713,8 +226315,6 @@ self: {
        libraryHaskellDepends = [ base datetime ];
        description = "Prints timestamps after each line evaluated";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timer-wheel" = callPackage
@@ -244772,8 +226372,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "tick based timers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timers-updatable" = callPackage
@@ -244804,8 +226402,6 @@ self: {
        ];
        description = "Library for Time Series processing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timespan" = callPackage
@@ -244817,8 +226413,6 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "Useful timespan datatype and functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timestamp" = callPackage
@@ -244879,8 +226473,6 @@ self: {
        testHaskellDepends = [ base hspec microlens time ];
        description = "Time utilities";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timezone-olson" = callPackage
@@ -244942,8 +226534,6 @@ self: {
          timezone-series
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "timing-convenience" = callPackage
@@ -244980,8 +226570,6 @@ self: {
        testHaskellDepends = [ base require ];
        description = "A softer alternative to Haddock";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tiny-scheduler" = callPackage
@@ -244993,8 +226581,6 @@ self: {
        libraryHaskellDepends = [ async base time ];
        description = "tiny no-brainer job scheduler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tinyMesh" = callPackage
@@ -245010,8 +226596,6 @@ self: {
        ];
        description = "TinyMesh - communicating with auto-meshing sensor network";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tinyXml" = callPackage
@@ -245036,8 +226620,6 @@ self: {
        ];
        description = "A fast DOM parser for a subset of XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tinyfiledialogs" = callPackage
@@ -245079,8 +226661,6 @@ self: {
        testHaskellDepends = [ base QuickCheck text ];
        description = "A tiny text templating library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tip-haskell-frontend" = callPackage
@@ -245105,8 +226685,6 @@ self: {
        ];
        description = "Convert from Haskell to Tip";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tip-lib" = callPackage
@@ -245130,8 +226708,6 @@ self: {
        ];
        description = "tons of inductive problems - support library and tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tiphys" = callPackage
@@ -245176,8 +226752,6 @@ self: {
        ];
        description = "Testing Infrastructure for Temporal AbstractioNs - GUI to debug temporal programs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "titan-debug-yampa" = callPackage
@@ -245195,8 +226769,6 @@ self: {
        ];
        description = "Testing Infrastructure for Temporal AbstractioNs - Interactive Yampa debugging layer";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "titan-record-yampa" = callPackage
@@ -245208,8 +226780,6 @@ self: {
        libraryHaskellDepends = [ base Yampa ];
        description = "Testing Infrastructure for Temporal AbstractioNs - Yampa record-and-replay layer";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "titlecase" = callPackage
@@ -245244,8 +226814,6 @@ self: {
        testHaskellDepends = [ HUnit test-framework test-framework-hunit ];
        description = "Simple Presentation Utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tkyprof" = callPackage
@@ -245272,8 +226840,6 @@ self: {
        ];
        description = "A web-based visualizer for GHC Profiling Reports";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tld" = callPackage
@@ -245289,29 +226855,6 @@ self: {
      }) {};
 
   "tldr" = callPackage
-    ({ mkDerivation, ansi-terminal, base, bytestring, cmark, directory
-     , filepath, optparse-applicative, semigroups, tasty, tasty-golden
-     , text, typed-process
-     }:
-     mkDerivation {
-       pname = "tldr";
-       version = "0.4.0.2";
-       sha256 = "1zy9yyg7bxiyz1prkvrscggsb9p0f8y0nqxxxzlgzvnh2nmqf8f2";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-terminal base bytestring cmark text
-       ];
-       executableHaskellDepends = [
-         base directory filepath optparse-applicative semigroups
-         typed-process
-       ];
-       testHaskellDepends = [ base tasty tasty-golden ];
-       description = "Haskell tldr client";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tldr_0_6_2" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, cmark, containers
      , directory, filepath, optparse-applicative, semigroups, tasty
      , tasty-golden, text, typed-process
@@ -245332,40 +226875,9 @@ self: {
        testHaskellDepends = [ base tasty tasty-golden ];
        description = "Haskell tldr client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tls" = callPackage
-    ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring
-     , cereal, criterion, cryptonite, data-default-class, hourglass
-     , memory, mtl, network, QuickCheck, tasty, tasty-quickcheck
-     , transformers, x509, x509-store, x509-validation
-     }:
-     mkDerivation {
-       pname = "tls";
-       version = "1.4.1";
-       sha256 = "1y083724mym28n6xfaz7pcc7zqxdhjpaxpbvzxfbs25qq2px3smv";
-       revision = "1";
-       editedCabalFile = "0qk07miindqvynhgsqj8jjk1d6i95lbgwipanwnn4vh1707z8xhv";
-       libraryHaskellDepends = [
-         asn1-encoding asn1-types async base bytestring cereal cryptonite
-         data-default-class memory mtl network transformers x509 x509-store
-         x509-validation
-       ];
-       testHaskellDepends = [
-         asn1-types base bytestring cereal cryptonite data-default-class
-         hourglass mtl QuickCheck tasty tasty-quickcheck x509
-         x509-validation
-       ];
-       benchmarkHaskellDepends = [
-         asn1-types base bytestring criterion cryptonite data-default-class
-         hourglass mtl QuickCheck tasty-quickcheck x509 x509-validation
-       ];
-       description = "TLS/SSL protocol native implementation (Server and Client)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tls_1_5_3" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring
      , cereal, cryptonite, data-default-class, gauge, hourglass, memory
      , mtl, network, QuickCheck, tasty, tasty-quickcheck, transformers
@@ -245390,29 +226902,37 @@ self: {
        ];
        description = "TLS/SSL protocol native implementation (Server and Client)";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "tls_1_5_4" = callPackage
+    ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring
+     , cereal, cryptonite, data-default-class, gauge, hourglass, memory
+     , mtl, network, QuickCheck, tasty, tasty-quickcheck, transformers
+     , x509, x509-store, x509-validation
+     }:
+     mkDerivation {
+       pname = "tls";
+       version = "1.5.4";
+       sha256 = "0dx436m7rb52s1dgkckcpi8imfwf8234pnl1cmvn43x5h6jvyhnf";
+       libraryHaskellDepends = [
+         asn1-encoding asn1-types async base bytestring cereal cryptonite
+         data-default-class hourglass memory mtl network transformers x509
+         x509-store x509-validation
+       ];
+       testHaskellDepends = [
+         asn1-types async base bytestring cryptonite data-default-class
+         hourglass QuickCheck tasty tasty-quickcheck x509 x509-validation
+       ];
+       benchmarkHaskellDepends = [
+         asn1-types async base bytestring cryptonite data-default-class
+         gauge hourglass QuickCheck tasty-quickcheck x509 x509-validation
+       ];
+       description = "TLS/SSL protocol native implementation (Server and Client)";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tls-debug" = callPackage
-    ({ mkDerivation, base, bytestring, cryptonite, data-default-class
-     , network, pem, time, tls, x509, x509-store, x509-system
-     , x509-validation
-     }:
-     mkDerivation {
-       pname = "tls-debug";
-       version = "0.4.5";
-       sha256 = "16zb4dray3l6sdckixyd2a5hbf6s0svy5f5bfffq48zr7f3c8id3";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base bytestring cryptonite data-default-class network pem time tls
-         x509 x509-store x509-system x509-validation
-       ];
-       description = "Set of programs for TLS testing and debugging";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tls-debug_0_4_8" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, data-default-class
      , network, pem, tls, tls-session-manager, x509, x509-store
      , x509-system, x509-validation
@@ -245429,7 +226949,6 @@ self: {
        ];
        description = "Set of programs for TLS testing and debugging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tls-extra" = callPackage
@@ -245449,8 +226968,6 @@ self: {
        ];
        description = "TLS extra default values and helpers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tls-session-manager" = callPackage
@@ -245495,8 +227012,6 @@ self: {
        ];
        description = "Handle phylogenetic trees";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tmapchan" = callPackage
@@ -245535,30 +227050,6 @@ self: {
      }) {};
 
   "tmp-postgres" = callPackage
-    ({ mkDerivation, async, base, bytestring, directory, hspec
-     , hspec-discover, network, port-utils, postgresql-simple, process
-     , temporary, unix
-     }:
-     mkDerivation {
-       pname = "tmp-postgres";
-       version = "0.2.0.0";
-       sha256 = "08w88rh8yap7dmh2jn3x8rd918jxscw46jzljfbdyda9rzfz7kq4";
-       libraryHaskellDepends = [
-         async base bytestring directory network port-utils
-         postgresql-simple process temporary unix
-       ];
-       testHaskellDepends = [
-         base bytestring directory hspec hspec-discover postgresql-simple
-         process temporary
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Start and stop a temporary postgres for testing";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "tmp-postgres_1_34_1_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, async, base, base64-bytestring
      , bytestring, containers, criterion, cryptohash-sha1, deepseq
      , directory, generic-monoid, hspec, mtl, network, port-utils
@@ -245591,8 +227082,6 @@ self: {
        ];
        description = "Start and stop a temporary postgres";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tmpl" = callPackage
@@ -245630,8 +227119,6 @@ self: {
        ];
        description = "A simple daily journal program";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tnet" = callPackage
@@ -245677,8 +227164,6 @@ self: {
        ];
        description = "A type class and some utilities for generating Haskell code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "to-string-class" = callPackage
@@ -245692,8 +227177,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Converting string-like types to Strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "to-string-instances" = callPackage
@@ -245705,8 +227188,6 @@ self: {
        libraryHaskellDepends = [ bytestring pretty text to-string-class ];
        description = "Instances for the ToString class";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "toboggan" = callPackage
@@ -245725,8 +227206,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Twitter bot generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "todo" = callPackage
@@ -245763,8 +227242,6 @@ self: {
        ];
        description = "Easy-to-use TODOs manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tofromxml" = callPackage
@@ -245783,8 +227260,6 @@ self: {
        ];
        description = "Reading and writing Haskell data from and to XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "toilet" = callPackage
@@ -245802,8 +227277,6 @@ self: {
        ];
        description = "Manage the toilet queue at the IMO";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "token-bucket" = callPackage
@@ -245864,8 +227337,6 @@ self: {
          text unordered-containers
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tokenify" = callPackage
@@ -245877,8 +227348,6 @@ self: {
        libraryHaskellDepends = [ base containers text ];
        description = "A regex lexer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tokenize" = callPackage
@@ -245936,8 +227405,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "TokTok C code style checker";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "toktok" = callPackage
@@ -245952,8 +227419,6 @@ self: {
        libraryHaskellDepends = [ base containers haskell98 ];
        executableHaskellDepends = [ base bytestring gf iconv ];
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tokyocabinet-haskell" = callPackage
@@ -245966,8 +227431,6 @@ self: {
        librarySystemDepends = [ tokyocabinet ];
        description = "Haskell binding of Tokyo Cabinet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) tokyocabinet;};
 
   "tokyotyrant-haskell" = callPackage
@@ -245982,8 +227445,6 @@ self: {
        description = "FFI bindings to libtokyotyrant";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "i686-linux" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;};
 
   "tomato-rubato-openal" = callPackage
@@ -245995,8 +227456,6 @@ self: {
        libraryHaskellDepends = [ base OpenAL stm vector ];
        description = "Easy to use library for audio programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "toml" = callPackage
@@ -246013,8 +227472,6 @@ self: {
          attoparsec base bytestring containers old-locale time
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "toml-parser" = callPackage
@@ -246032,42 +227489,6 @@ self: {
      }) {};
 
   "tomland" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, deepseq
-     , directory, gauge, hashable, hedgehog, hspec-megaparsec, htoml
-     , htoml-megaparsec, markdown-unlit, megaparsec, mtl, parsec
-     , parser-combinators, tasty, tasty-discover, tasty-hedgehog
-     , tasty-hspec, tasty-silver, text, time, toml-parser, transformers
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "tomland";
-       version = "1.1.0.1";
-       sha256 = "0ihz8pvcnr33mydz4n7gsayikh50pn1bg3km2h3nlv054lff7kai";
-       revision = "1";
-       editedCabalFile = "16382q0q77bv9zlahmgbmc90hvl1b23g9fxk4dl2f1lhlfqjkxnw";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring containers deepseq hashable megaparsec mtl
-         parser-combinators text time transformers unordered-containers
-       ];
-       executableHaskellDepends = [ base text time unordered-containers ];
-       executableToolDepends = [ markdown-unlit ];
-       testHaskellDepends = [
-         base bytestring containers directory hashable hedgehog
-         hspec-megaparsec megaparsec tasty tasty-hedgehog tasty-hspec
-         tasty-silver text time unordered-containers
-       ];
-       testToolDepends = [ tasty-discover ];
-       benchmarkHaskellDepends = [
-         aeson base deepseq gauge htoml htoml-megaparsec parsec text time
-         toml-parser
-       ];
-       description = "Bidirectional TOML serialization";
-       license = stdenv.lib.licenses.mpl20;
-     }) {};
-
-  "tomland_1_2_1_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, directory
      , hashable, hedgehog, hspec-megaparsec, markdown-unlit, megaparsec
      , mtl, parser-combinators, tasty, tasty-discover, tasty-hedgehog
@@ -246098,7 +227519,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Bidirectional TOML serialization";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tomlcheck" = callPackage
@@ -246116,8 +227536,6 @@ self: {
        ];
        description = "Command-line tool to check syntax of TOML files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tonalude" = callPackage
@@ -246297,8 +227715,6 @@ self: {
        ];
        description = "Cluster single cells and analyze cell clade relationships";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "toodles" = callPackage
@@ -246334,8 +227750,6 @@ self: {
        ];
        description = "Manage the TODO entries in your code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "toolshed" = callPackage
@@ -246377,8 +227791,6 @@ self: {
        ];
        description = "Top (typed oriented protocol) API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "topkata" = callPackage
@@ -246397,8 +227809,6 @@ self: {
        ];
        description = "OpenGL Arcade Game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "topograph" = callPackage
@@ -246427,8 +227837,6 @@ self: {
        libraryHaskellDepends = [ base mtl parallel QuickCheck ];
        description = "Simple unit test library (or framework)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "torrent" = callPackage
@@ -246499,8 +227907,6 @@ self: {
        libraryHaskellDepends = [ base containers semiring-num ];
        description = "Finitely represented total maps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "total-maps" = callPackage
@@ -246531,8 +227937,6 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        description = "Library (and cli) to execute a procedure on file change";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tower" = callPackage
@@ -246575,8 +227979,6 @@ self: {
        ];
        description = "Haskell bindings to the C reference implementation of Tox";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {toxcore = null;};
 
   "toxiproxy-haskell" = callPackage
@@ -246596,8 +227998,6 @@ self: {
        ];
        description = "Client library for Toxiproxy: a TCP failure testing proxy";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "toysolver" = callPackage
@@ -246654,8 +228054,6 @@ self: {
        ];
        description = "Assorted decision procedures for SAT, SMT, Max-SAT, PB, MIP, etc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tpar" = callPackage
@@ -246692,8 +228090,6 @@ self: {
        ];
        description = "simple, parallel job scheduling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tpb" = callPackage
@@ -246719,8 +228115,6 @@ self: {
        ];
        description = "Applications for interacting with the Pushbullet API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tpdb" = callPackage
@@ -246777,8 +228171,6 @@ self: {
        ];
        description = "A monad transformer for tracing provenience of errors";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trace-call" = callPackage
@@ -246790,8 +228182,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "functions for logging the arguments and results of function calls";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trace-function-call" = callPackage
@@ -246803,8 +228193,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Easy lightweight tracing of function arguments and results for ad hoc debugging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "traced" = callPackage
@@ -246816,8 +228204,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl pretty ];
        description = "Simple evaluation trace";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tracer" = callPackage
@@ -246847,8 +228233,6 @@ self: {
        ];
        description = "Visualize Haskell data structures as edge-labeled trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tracing" = callPackage
@@ -246870,8 +228254,6 @@ self: {
        ];
        description = "Distributed tracing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tracker" = callPackage
@@ -246883,8 +228265,6 @@ self: {
        libraryHaskellDepends = [ base containers glib ];
        description = "Client library for Tracker metadata database, indexer and search tool";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trackit" = callPackage
@@ -246924,8 +228304,6 @@ self: {
        ];
        description = "Tools for postgresql-simple";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tracy" = callPackage
@@ -246937,8 +228315,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Convenience wrappers for non-intrusive debug tracing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "traildb" = callPackage
@@ -246962,8 +228338,6 @@ self: {
        ];
        description = "TrailDB bindings for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {Judy = null; traildb = null;};
 
   "trajectory" = callPackage
@@ -246986,8 +228360,6 @@ self: {
        ];
        description = "Tools and a library for working with Trajectory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trans-fx-core" = callPackage
@@ -247051,8 +228423,6 @@ self: {
        libraryHaskellDepends = [ base ListZipper MonadPrompt stm ];
        description = "Transactional events, based on Concurrent ML semantics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "transf" = callPackage
@@ -247071,8 +228441,6 @@ self: {
        ];
        description = "Text transformer and interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "transfer-db" = callPackage
@@ -247101,8 +228469,6 @@ self: {
        ];
        description = "ODBC database transfer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "transformations" = callPackage
@@ -247123,8 +228489,6 @@ self: {
        ];
        description = "Generic representation of tree transformations";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "transformers_0_4_3_0" = callPackage
@@ -247217,8 +228581,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Arrow-like / category-like composition for transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "transformers-continue" = callPackage
@@ -247248,8 +228610,6 @@ self: {
        ];
        description = "Sensible conversions between some of the monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "transformers-eff" = callPackage
@@ -247331,8 +228691,6 @@ self: {
        ];
        description = "Ad-hoc type classes for lifting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "transformers-runnable" = callPackage
@@ -247344,8 +228702,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "A unified interface for the run operation of monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "transformers-supply" = callPackage
@@ -247377,8 +228733,6 @@ self: {
        ];
        description = "composing programs with multithreading, events and distributed computing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "transient-universe" = callPackage
@@ -247411,8 +228765,6 @@ self: {
        ];
        description = "Remote execution and map-reduce: distributed computing for Transient";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "transient-universe-tls" = callPackage
@@ -247429,8 +228781,6 @@ self: {
        ];
        description = "transient with secure communications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "translatable-intset" = callPackage
@@ -247444,8 +228794,6 @@ self: {
        libraryHaskellDepends = [ base fingertree ];
        description = "Integer sets with a constant time translate operation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "translate" = callPackage
@@ -247458,8 +228806,6 @@ self: {
        libraryHaskellDepends = [ base curl json network utf8-string ];
        description = "Haskell binding to Google's AJAX Language API for Translation and Detection";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "translate-cli" = callPackage
@@ -247477,8 +228823,6 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Translation cli tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trasa" = callPackage
@@ -247497,8 +228841,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Type Safe Web Routing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trasa-client" = callPackage
@@ -247515,8 +228857,6 @@ self: {
        ];
        description = "Type safe http requests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trasa-extra" = callPackage
@@ -247534,8 +228874,6 @@ self: {
        ];
        description = "Extra functions for trasa";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trasa-form" = callPackage
@@ -247554,8 +228892,6 @@ self: {
        ];
        description = "generate forms using lucid, ditto and trasa";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trasa-reflex" = callPackage
@@ -247589,8 +228925,6 @@ self: {
        ];
        description = "Type safe web server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trasa-th" = callPackage
@@ -247607,8 +228941,6 @@ self: {
        testHaskellDepends = [ base trasa ];
        description = "Template Haskell to generate trasa routes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "traversal-template" = callPackage
@@ -247653,8 +228985,6 @@ self: {
        ];
        description = "A simple client implementation using Travis CI API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "travis-meta-yaml" = callPackage
@@ -247684,8 +229014,6 @@ self: {
        ];
        description = ".travis.yml preprocessor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "travis-pogodi" = callPackage
@@ -247718,8 +229046,6 @@ self: {
        ];
        description = "A tool for finding haddocks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "traypoweroff" = callPackage
@@ -247734,8 +229060,6 @@ self: {
        executableHaskellDepends = [ base gtk process ];
        description = "Tray Icon application to PowerOff / Reboot computer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "treap" = callPackage
@@ -247819,8 +229143,8 @@ self: {
      }:
      mkDerivation {
        pname = "tree-sitter";
-       version = "0.8.0.2";
-       sha256 = "1wjhcr3lha3fbjp6nv6ln5mplj9y856x7qckxkirisckdjrryffy";
+       version = "0.9.0.0";
+       sha256 = "12mjscpibhh15jiqcplnj2m4gxd4ym4xbbji96l5zwpzmd2x4bjb";
        libraryHaskellDepends = [
          aeson base bytestring containers directory filepath fused-effects
          semantic-source split template-haskell text unordered-containers
@@ -247828,215 +229152,116 @@ self: {
        testHaskellDepends = [ base hedgehog ];
        description = "Unstable bindings for the tree-sitter parsing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tree-sitter-go" = callPackage
-    ({ mkDerivation, base, bytestring, hedgehog, pathtype
-     , semantic-source, tasty, tasty-hedgehog, tasty-hunit
-     , template-haskell, text, tree-sitter, tree-sitter-test-helpers
-     }:
+    ({ mkDerivation, base, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-go";
-       version = "0.4.1.1";
-       sha256 = "16wbb715vn2ka3sgz1fwxa8bad0vzg16i1380kbqfr2xnfmc5hz8";
+       version = "0.5.0.1";
+       sha256 = "0v6vk0nqalk01xl0nmjmy4m14wmdij1cd1gs93is3gc3wvj0ljin";
        enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base semantic-source template-haskell tree-sitter
-       ];
-       testHaskellDepends = [
-         base bytestring hedgehog pathtype tasty tasty-hedgehog tasty-hunit
-         text tree-sitter tree-sitter-test-helpers
-       ];
-       doHaddock = false;
+       libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for Go";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {tree-sitter-test-helpers = null;};
+     }) {};
 
   "tree-sitter-haskell" = callPackage
-    ({ mkDerivation, base, template-haskell, tree-sitter }:
+    ({ mkDerivation, base, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-haskell";
-       version = "0.2.0.1";
-       sha256 = "0c02sv4hzlyfdpk7s8ykgm9cr6xwmjw8npy356v2vgbr0l238bgw";
+       version = "0.3.0.0";
+       sha256 = "1hkxlhx3bm78p133cvimqjr8gl0arxdch0j33pz4dfg6fs8wbx1z";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base template-haskell tree-sitter ];
-       doHaddock = false;
+       libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for Haskell (with GHC extensions)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tree-sitter-java" = callPackage
-    ({ mkDerivation, base, bytestring, pathtype, semantic-source, tasty
-     , tasty-hunit, template-haskell, text, tree-sitter
-     , tree-sitter-test-helpers
-     }:
+    ({ mkDerivation, base, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-java";
-       version = "0.6.1.0";
-       sha256 = "07zyj3diaq2nrlvxbhbrad1wha2705v5d9kf51vmhxknybdxp5sf";
+       version = "0.7.0.1";
+       sha256 = "1z2x6nyl57xrnyf2jbkypg5zf8cw3rv9788piil6c30cyimbay4r";
        enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base semantic-source template-haskell tree-sitter
-       ];
-       testHaskellDepends = [
-         base bytestring pathtype tasty tasty-hunit text tree-sitter
-         tree-sitter-test-helpers
-       ];
-       doHaddock = false;
+       libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for Java";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {tree-sitter-test-helpers = null;};
+     }) {};
 
   "tree-sitter-json" = callPackage
-    ({ mkDerivation, base, bytestring, hedgehog, pathtype, tasty
-     , tasty-hedgehog, tasty-hunit, template-haskell, text, tree-sitter
-     , tree-sitter-test-helpers
-     }:
+    ({ mkDerivation, base, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-json";
-       version = "0.6.0.0";
-       sha256 = "0n7rq5a8kjrgr7d7fbhjxybrbgwxr2c8d2wyr80yp27vilvf4lh6";
+       version = "0.7.0.1";
+       sha256 = "1rb5g43z318pkwj4g4zqknxad3gwjpadr20vr3x6pif8zn5fc5ib";
        enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ base template-haskell text tree-sitter ];
-       testHaskellDepends = [
-         base bytestring hedgehog pathtype tasty tasty-hedgehog tasty-hunit
-         text tree-sitter tree-sitter-test-helpers
-       ];
-       doHaddock = false;
+       libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for JSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {tree-sitter-test-helpers = null;};
+     }) {};
 
   "tree-sitter-php" = callPackage
-    ({ mkDerivation, base, template-haskell, tree-sitter }:
+    ({ mkDerivation, base, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-php";
-       version = "0.2.0.1";
-       sha256 = "0dxszds10fr3zp1vjcj18b44mv6hmbzskmai14x03zgimxgwwaqm";
-       revision = "1";
-       editedCabalFile = "0k5qq7m0m3imgyhwyakrfjzxf5pjw6p7p3iwm01bj96ya8iy71ia";
-       libraryHaskellDepends = [ base template-haskell tree-sitter ];
-       doHaddock = false;
+       version = "0.4.0.0";
+       sha256 = "14qylmzcpn3zn35lbyimyy1sk5v34lqpdn2yn2ly3kg1cphkh50g";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for PHP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tree-sitter-python" = callPackage
-    ({ mkDerivation, base, bytestring, gauge, hedgehog, pathtype
-     , semantic-source, tasty, tasty-hedgehog, tasty-hunit
-     , template-haskell, text, tree-sitter, tree-sitter-test-helpers
-     }:
+    ({ mkDerivation, base, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-python";
-       version = "0.8.1.0";
-       sha256 = "0sjrml57dc9fsjmh555hjsckb05x9pz3lzk970hmm2cfwgnifvyi";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.9.0.2";
+       sha256 = "08k54r62hgdb2gpn8gv4nnr8sflcrkpfd1hmmzb552wzkaca9b1n";
        enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base semantic-source template-haskell tree-sitter
-       ];
-       executableHaskellDepends = [ base bytestring gauge tree-sitter ];
-       testHaskellDepends = [
-         base bytestring hedgehog pathtype tasty tasty-hedgehog tasty-hunit
-         text tree-sitter tree-sitter-test-helpers
-       ];
-       doHaddock = false;
+       libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for Python";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {tree-sitter-test-helpers = null;};
+     }) {};
 
   "tree-sitter-ruby" = callPackage
-    ({ mkDerivation, base, bytestring, gauge, Glob, hedgehog, lens
-     , pathtype, semantic-source, tasty, tasty-hedgehog, tasty-hunit
-     , template-haskell, text, tree-sitter, tree-sitter-test-helpers
-     }:
+    ({ mkDerivation, base, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-ruby";
-       version = "0.4.1.0";
-       sha256 = "1kb87c1z9jghidygk632lihlqkqbanx48dvpdqxn7ypnni4dzw0k";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.5.0.2";
+       sha256 = "143nh0c34gdhs9jz9vwmh6alds5n1771jzqaa2zf6pkvsc3cpsfp";
        enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base semantic-source template-haskell tree-sitter
-       ];
-       executableHaskellDepends = [
-         base bytestring gauge Glob lens pathtype tree-sitter
-       ];
-       testHaskellDepends = [
-         base bytestring hedgehog pathtype tasty tasty-hedgehog tasty-hunit
-         text tree-sitter tree-sitter-test-helpers
-       ];
-       doHaddock = false;
+       libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for Ruby";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {tree-sitter-test-helpers = null;};
+     }) {};
 
   "tree-sitter-tsx" = callPackage
-    ({ mkDerivation, base, bytestring, hedgehog, pathtype
-     , semantic-source, tasty, tasty-hedgehog, tasty-hunit
-     , template-haskell, text, tree-sitter, tree-sitter-test-helpers
-     }:
+    ({ mkDerivation, base, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-tsx";
-       version = "0.4.2.0";
-       sha256 = "1qr84fkid3ci0r51884bj01yp11fr5v7dy8ac4j90mv9xc54rjw6";
+       version = "0.5.0.1";
+       sha256 = "1pihhq3m8fhkrbqv8fl6l09hlzmwp10w119irhc05nmc2a6hq1jn";
        enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base semantic-source template-haskell tree-sitter
-       ];
-       testHaskellDepends = [
-         base bytestring hedgehog pathtype tasty tasty-hedgehog tasty-hunit
-         text tree-sitter tree-sitter-test-helpers
-       ];
-       doHaddock = false;
+       libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for TSX";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {tree-sitter-test-helpers = null;};
+     }) {};
 
   "tree-sitter-typescript" = callPackage
-    ({ mkDerivation, base, bytestring, hedgehog, pathtype
-     , semantic-source, tasty, tasty-hedgehog, tasty-hunit
-     , template-haskell, text, tree-sitter, tree-sitter-test-helpers
-     }:
+    ({ mkDerivation, base, tree-sitter }:
      mkDerivation {
        pname = "tree-sitter-typescript";
-       version = "0.4.2.0";
-       sha256 = "1g4m7rfvhwgjiwhk3s4dmsz7is03xakqfbmdrn9vq3c97bc5fb5n";
+       version = "0.5.0.1";
+       sha256 = "069xal3kgbsw8swsw0q697c7h0n32fj2cf7wx1nsd79w87nkd80r";
        enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base semantic-source template-haskell tree-sitter
-       ];
-       testHaskellDepends = [
-         base bytestring hedgehog pathtype tasty tasty-hedgehog tasty-hunit
-         text tree-sitter tree-sitter-test-helpers
-       ];
-       doHaddock = false;
+       libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for TypeScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {tree-sitter-test-helpers = null;};
+     }) {};
 
   "tree-traversals" = callPackage
     ({ mkDerivation, base, containers, doctest, mtl }:
@@ -248048,8 +229273,6 @@ self: {
        testHaskellDepends = [ base containers doctest mtl ];
        description = "Functions and newtype wrappers for traversing Trees";
        license = stdenv.lib.licenses.cc0;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tree-view" = callPackage
@@ -248113,8 +229336,6 @@ self: {
        ];
        description = "Generates HTML for Data.Tree as TreeMap";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "treemap-html-tools" = callPackage
@@ -248134,8 +229355,6 @@ self: {
        doHaddock = false;
        description = "Treemap related commands for producing foldable TreeMap HTML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "treersec" = callPackage
@@ -248187,8 +229406,6 @@ self: {
        ];
        description = "Library for polling Tremulous servers";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trhsx" = callPackage
@@ -248199,8 +229416,6 @@ self: {
        sha256 = "11jx2jf6vi7368ys39mz0ziy6xknbi0z87926n2y16am6k2h25k3";
        description = "Deprecated";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "triangulation" = callPackage
@@ -248216,8 +229431,6 @@ self: {
        ];
        description = "triangulation of polygons";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trie-simple" = callPackage
@@ -248237,8 +229450,6 @@ self: {
        ];
        description = "Simple Map-based Trie";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tries" = callPackage
@@ -248268,37 +229479,9 @@ self: {
        ];
        description = "Various trie implementations in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trifecta" = callPackage
-    ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base
-     , blaze-builder, blaze-html, blaze-markup, bytestring, Cabal
-     , cabal-doctest, charset, comonad, containers, deepseq, doctest
-     , fingertree, ghc-prim, hashable, lens, mtl, parsers, profunctors
-     , QuickCheck, reducers, semigroups, transformers
-     , unordered-containers, utf8-string
-     }:
-     mkDerivation {
-       pname = "trifecta";
-       version = "2";
-       sha256 = "0hznd8i65s81xy13i2qc7cvipw3lfb2yhkv53apbdsh6sbljz5sk";
-       revision = "4";
-       editedCabalFile = "0xbwyvwl6f2zylk60f2akwgq03qv49113xil7b1z1s3vlwbn5aj1";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html
-         blaze-markup bytestring charset comonad containers deepseq
-         fingertree ghc-prim hashable lens mtl parsers profunctors reducers
-         semigroups transformers unordered-containers utf8-string
-       ];
-       testHaskellDepends = [ base doctest parsers QuickCheck ];
-       description = "A modern parser combinator library with convenient diagnostics";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "trifecta_2_1" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, blaze-builder
      , blaze-html, blaze-markup, bytestring, Cabal, cabal-doctest
      , charset, comonad, containers, deepseq, doctest, fingertree
@@ -248321,7 +229504,6 @@ self: {
        testHaskellDepends = [ base doctest parsers QuickCheck ];
        description = "A modern parser combinator library with convenient diagnostics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "trigger" = callPackage
@@ -248343,8 +229525,6 @@ self: {
        testHaskellDepends = [ base hspec protolude ];
        description = "Trigger is a cross platform file system watcher for super fast build-and-restart workflows";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trim" = callPackage
@@ -248360,8 +229540,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "A command-line tool for trimming whitespace";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trimpolya" = callPackage
@@ -248375,8 +229553,6 @@ self: {
        executableHaskellDepends = [ base bio bytestring simpleargs ];
        description = "Search for, annotate and trim poly-A tail";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tripLL" = callPackage
@@ -248392,8 +229568,6 @@ self: {
        ];
        description = "A very simple triple store";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "triplesec" = callPackage
@@ -248424,8 +229598,6 @@ self: {
        libraryHaskellDepends = [ base comonad distributive ];
        description = "The trivial monad and comonad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trivial-constraint" = callPackage
@@ -248448,8 +229620,6 @@ self: {
        libraryHaskellDepends = [ base semiring-simple ];
        description = "A library for tropical mathematics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tropical-geometry" = callPackage
@@ -248474,8 +229644,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "A Tropical Geometry package for Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "true-name" = callPackage
@@ -248503,8 +229671,6 @@ self: {
        executableHaskellDepends = [ base containers parseargs WAVE ];
        description = "Audio file compressor-limiter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "trurl" = callPackage
@@ -248527,8 +229693,6 @@ self: {
        testHaskellDepends = [ base hastache tasty tasty-hunit ];
        description = "Haskell template code generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "truthful" = callPackage
@@ -248553,8 +229717,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl time transformers ];
        description = "A Transaction Framework for Web Applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tsession-happstack" = callPackage
@@ -248568,8 +229730,6 @@ self: {
        ];
        description = "A Transaction Framework for Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tsetchan" = callPackage
@@ -248593,8 +229753,6 @@ self: {
        libraryHaskellDepends = [ array base containers random stm ];
        description = "A Skip List Implementation in Software Transactional Memory (STM)";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tslib" = callPackage
@@ -248662,8 +229820,6 @@ self: {
        executableHaskellDepends = [ base gloss stm vector ];
        description = "Real time TSP tour visualization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tsparse" = callPackage
@@ -248681,8 +229837,6 @@ self: {
        ];
        description = "Parses U.S. federal Thrift Savings Plan PDF quarterly statements";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tst" = callPackage
@@ -248714,8 +229868,6 @@ self: {
        ];
        description = "Interacts with tesseract to ease reading of RAW Japanese manga";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tsv2csv" = callPackage
@@ -248748,8 +229900,6 @@ self: {
        ];
        description = "Template tsv into SQL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tsweb" = callPackage
@@ -248778,8 +229928,6 @@ self: {
        ];
        description = "An API binding Web.Spock to Database.Beam";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ttask" = callPackage
@@ -248802,8 +229950,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "This is task management tool for yourself, that inspired by scrum";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ttc" = callPackage
@@ -248823,28 +229969,6 @@ self: {
      }) {};
 
   "ttl-hashtables" = callPackage
-    ({ mkDerivation, base, clock, containers, data-default, failable
-     , hashable, hashtables, hspec, mtl, transformers
-     }:
-     mkDerivation {
-       pname = "ttl-hashtables";
-       version = "1.3.1.1";
-       sha256 = "14ammgggkfmc4divr1zykjadad5fzgspjnzpjfdzj3vwm1rf5gwv";
-       revision = "1";
-       editedCabalFile = "17pkzci2nqi0d4zcpyxcv5l1hn7m04h2kwqjgqm7kc2c3p620qv3";
-       libraryHaskellDepends = [
-         base clock containers data-default failable hashable hashtables mtl
-         transformers
-       ];
-       testHaskellDepends = [
-         base clock containers data-default failable hashable hashtables
-         hspec mtl transformers
-       ];
-       description = "Extends hashtables so that entries added can be expired after a TTL";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ttl-hashtables_1_4_1_0" = callPackage
     ({ mkDerivation, base, clock, containers, data-default, failable
      , hashable, hashtables, hspec, mtl, transformers
      }:
@@ -248864,7 +229988,6 @@ self: {
        ];
        description = "Extends hashtables so that entries added can be expired after a TTL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ttn" = callPackage
@@ -248906,8 +230029,6 @@ self: {
        ];
        description = "TheThingsNetwork client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ttrie" = callPackage
@@ -248960,8 +230081,6 @@ self: {
        ];
        description = "Working with files for the Tiptoi® pen";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tubes" = callPackage
@@ -248989,8 +230108,6 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "Interface to TUN/TAP drivers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tuntap-simple" = callPackage
@@ -249018,8 +230135,6 @@ self: {
        executableHaskellDepends = [ base haskell-src-exts parsec2 ];
        description = "Homogeneous tuples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tuple" = callPackage
@@ -249042,8 +230157,6 @@ self: {
        libraryHaskellDepends = [ base combinat ];
        description = "Enum instances for tuples where the digits increase with the same speed";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tuple-generic" = callPackage
@@ -249078,8 +230191,6 @@ self: {
        libraryHaskellDepends = [ base lens template-haskell ];
        description = "Stock FieldN combos and generators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tuple-morph" = callPackage
@@ -249093,8 +230204,6 @@ self: {
        libraryHaskellDepends = [ base HList template-haskell ];
        description = "Morph between tuples, or convert them from and to HLists";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tuple-ops" = callPackage
@@ -249106,8 +230215,6 @@ self: {
        libraryHaskellDepends = [ base type-combinators ];
        description = "various operations on n-ary tuples via GHC.Generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tuple-sop" = callPackage
@@ -249142,8 +230249,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Functor, Applicative and Monad for n-ary tuples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tuples" = callPackage
@@ -249194,8 +230299,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A simple simulator for Turing machines";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "turing-music" = callPackage
@@ -249225,8 +230328,6 @@ self: {
        ];
        description = "An implementation of Turing Machine and Automaton";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "turkish-deasciifier" = callPackage
@@ -249309,8 +230410,6 @@ self: {
        testHaskellDepends = [ base HUnit parsec ];
        description = "Collection of command line options and parsers for these options";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tw" = callPackage
@@ -249335,8 +230434,6 @@ self: {
        libraryHaskellDepends = [ base containers lens stm transformers ];
        description = "A library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twee" = callPackage
@@ -249344,10 +230441,8 @@ self: {
      }:
      mkDerivation {
        pname = "twee";
-       version = "2.1.5";
-       sha256 = "1v94hf1fd7n01drd6hx37zrplpzlskfmd3l8lmkb5kzy618x0cnb";
-       revision = "1";
-       editedCabalFile = "00dkqm778qn9zg562vbcydr0xqglcg9l3i1irvcwshj4q0larwv4";
+       version = "2.2";
+       sha256 = "0wmjmgkf5piwqzrk08ij7mc3s82gpg7j5x4bk96njj06gm4lc38v";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -249355,8 +230450,6 @@ self: {
        ];
        description = "An equational theorem prover";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twee-lib" = callPackage
@@ -249365,8 +230458,8 @@ self: {
      }:
      mkDerivation {
        pname = "twee-lib";
-       version = "2.1.5";
-       sha256 = "09q2dxab3s9d32ayr9a08q6lbkszrxi0hw00sar3jx31p9q3pkc2";
+       version = "2.2";
+       sha256 = "0v99hhnxpzi5581s4bfxhbpnmvlbqnrrr3pdkfvicz2b146mhhgr";
        libraryHaskellDepends = [
          base containers dlist ghc-prim pretty primitive transformers vector
        ];
@@ -249399,8 +230492,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion megaparsec ];
        description = "Command-line tool for twitter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twentefp" = callPackage
@@ -249429,8 +230520,6 @@ self: {
        ];
        description = "Used as Lab Assignments Environment at the University of Twente";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twentefp-eventloop-trees" = callPackage
@@ -249453,8 +230542,6 @@ self: {
        libraryHaskellDepends = [ base twentefp-eventloop-graphics ];
        description = "Lab Assignments Environment at Univeriteit Twente";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twentefp-number" = callPackage
@@ -249480,8 +230567,6 @@ self: {
        ];
        description = "RoseTree type and show functions for lab assignment of University of Twente";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twentefp-trees" = callPackage
@@ -249493,8 +230578,6 @@ self: {
        libraryHaskellDepends = [ base twentefp-eventloop-graphics ];
        description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and ParseTree";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twentefp-websockets" = callPackage
@@ -249513,8 +230596,6 @@ self: {
        ];
        description = "A fork of the popular websockets package. It is used for the practical assignments of the University of Twente. A sensible and clean way to write WebSocket-capable servers in Haskell.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twentyseven" = callPackage
@@ -249544,8 +230625,6 @@ self: {
        ];
        description = "Rubik's cube solver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twfy-api-client" = callPackage
@@ -249571,8 +230650,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "They Work For You API Client Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twhs" = callPackage
@@ -249603,8 +230680,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "CLI twitter client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twidge" = callPackage
@@ -249625,8 +230700,6 @@ self: {
        ];
        description = "Unix Command-Line Twitter and Identica Client";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twilight-stm" = callPackage
@@ -249638,8 +230711,6 @@ self: {
        libraryHaskellDepends = [ base containers haskell98 mtl ];
        description = "STM library with safe irrevocable I/O and inconsistency repair";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twilio" = callPackage
@@ -249666,8 +230737,6 @@ self: {
        doCheck = false;
        description = "Twilio REST API library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twill" = callPackage
@@ -249686,8 +230755,6 @@ self: {
        ];
        description = "Twilio API interaction";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twiml" = callPackage
@@ -249720,8 +230787,6 @@ self: {
        ];
        description = "very simple template language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twirp" = callPackage
@@ -249743,8 +230808,6 @@ self: {
        ];
        description = "Haskell twirp foundations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twisty" = callPackage
@@ -249798,8 +230861,6 @@ self: {
        ];
        description = "A Haskell-based CLI Twitter client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twitter-conduit" = callPackage
@@ -249833,8 +230894,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Twitter API package with conduit interface and Streaming API support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twitter-enumerator" = callPackage
@@ -249853,8 +230912,6 @@ self: {
        ];
        description = "Twitter API package with enumerator interface and Streaming API support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twitter-feed" = callPackage
@@ -249876,8 +230933,6 @@ self: {
        ];
        description = "Client for fetching Twitter timeline via Oauth";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twitter-types" = callPackage
@@ -249899,8 +230954,6 @@ self: {
        ];
        description = "Twitter JSON parser and types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "twitter-types-lens" = callPackage
@@ -249916,8 +230969,6 @@ self: {
        ];
        description = "Twitter JSON types (lens powered)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tx" = callPackage
@@ -249933,8 +230984,6 @@ self: {
        ];
        description = "Persistent transactions on top of STM";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "txt" = callPackage
@@ -249945,14 +230994,14 @@ self: {
        pname = "txt";
        version = "0.0.3.0";
        sha256 = "0fi16fpzcskcffri7adpnbf6qj2ksv7vnxwyl8nw1qg55rlj3c5y";
+       revision = "1";
+       editedCabalFile = "1c0d1b230hqni7hvww9f0iy8fk5rl4gi7xgs1v1lkc3h0dgaap4m";
        libraryHaskellDepends = [
          base bytestring deepseq utf8-string util
        ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "txt-sushi" = callPackage
@@ -249994,8 +231043,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Deprecated in favor of eros";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ty" = callPackage
@@ -250020,8 +231067,6 @@ self: {
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Provide proof witnesses for closed type family evaluation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typalyze" = callPackage
@@ -250040,8 +231085,6 @@ self: {
        ];
        description = "Analyzes Haskell source files for easy reference";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-aligned" = callPackage
@@ -250066,8 +231109,6 @@ self: {
        testHaskellDepends = [ base hspec test-fixture ];
        description = "Runtime type assertions for testing";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-booleans" = callPackage
@@ -250094,8 +231135,6 @@ self: {
        ];
        description = "Utilities for caching type families results. Sometimes complex type families take long time to compile, so it is proficient to cache them and use the final result without the need of re-computation.";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-cereal" = callPackage
@@ -250112,8 +231151,6 @@ self: {
        ];
        description = "Type-level serialization of type constructors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-combinators" = callPackage
@@ -250127,8 +231164,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A collection of data types for type-level programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-combinators-quote" = callPackage
@@ -250144,8 +231179,6 @@ self: {
        ];
        description = "Quasiquoters for the 'type-combinators' package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-combinators-singletons" = callPackage
@@ -250157,8 +231190,6 @@ self: {
        libraryHaskellDepends = [ base singletons type-combinators ];
        description = "Interop between /type-combinators/ and /singletons/";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-digits" = callPackage
@@ -250170,8 +231201,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell type-spine ];
        description = "Arbitrary-base type-level digits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-eq" = callPackage
@@ -250186,8 +231215,6 @@ self: {
        libraryToolDepends = [ cpphs ];
        description = "Type equality evidence you can carry around";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-equality" = callPackage
@@ -250299,8 +231326,6 @@ self: {
        ];
        description = "Queues with verified and unverified versions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-int" = callPackage
@@ -250312,8 +231337,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Type Level 2s- and 16s- Complement Integers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-interpreter" = callPackage
@@ -250326,8 +231349,6 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Interpreter for Template Haskell types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-iso" = callPackage
@@ -250366,8 +231387,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "type-level binary search trees in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-level-integers" = callPackage
@@ -250416,8 +231435,6 @@ self: {
        ];
        description = "High-level combinators for performing inductive operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-level-natural-number-operations" = callPackage
@@ -250429,8 +231446,6 @@ self: {
        libraryHaskellDepends = [ base type-level-natural-number ];
        description = "Basic operations on type-level natural numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-level-numbers" = callPackage
@@ -250478,8 +231493,6 @@ self: {
        libraryHaskellDepends = [ base singletons ];
        description = "Operations on type-level lists and tuples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-map" = callPackage
@@ -250501,7 +231514,7 @@ self: {
   "type-natural" = callPackage
     ({ mkDerivation, base, constraints, equational-reasoning
      , ghc-typelits-natnormalise, ghc-typelits-presburger, singletons
-     , template-haskell
+     , singletons-presburger, template-haskell
      }:
      mkDerivation {
        pname = "type-natural";
@@ -250511,12 +231524,11 @@ self: {
        editedCabalFile = "1nhv7wh3cgy5hhkgs3bgg3659qf3lpy8rm89ikbb0p69bbxdpmfa";
        libraryHaskellDepends = [
          base constraints equational-reasoning ghc-typelits-natnormalise
-         ghc-typelits-presburger singletons template-haskell
+         ghc-typelits-presburger singletons singletons-presburger
+         template-haskell
        ];
        description = "Type-level natural and proofs of their properties";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-of-html" = callPackage
@@ -250574,8 +231586,6 @@ self: {
        ];
        description = "Type-level comparison operator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-ord-spine-cereal" = callPackage
@@ -250591,8 +231601,6 @@ self: {
        ];
        description = "Generic type-level comparison of types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-prelude" = callPackage
@@ -250604,8 +231612,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Partial port of prelude to the type level. Requires GHC 7.6.1.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-sets" = callPackage
@@ -250633,8 +231639,6 @@ self: {
        ];
        description = "Sets and functions-as-relations in the type system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-spec" = callPackage
@@ -250658,8 +231662,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "A spine-view on types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-structure" = callPackage
@@ -250686,8 +231688,6 @@ self: {
        ];
        description = "Type structure analysis";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-sub-th" = callPackage
@@ -250712,8 +231712,6 @@ self: {
        ];
        description = "Substitute types for other types with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "type-tree" = callPackage
@@ -250762,8 +231760,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Automatic deriving of TypeableN instances with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typed-admin" = callPackage
@@ -250861,8 +231857,6 @@ self: {
        executableHaskellDepends = [ base diagrams-lib text ];
        description = "Typed and composable spreadsheets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typed-streams" = callPackage
@@ -250884,8 +231878,6 @@ self: {
        ];
        description = "A stream based replacement for lists";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typed-uuid" = callPackage
@@ -250894,8 +231886,8 @@ self: {
      }:
      mkDerivation {
        pname = "typed-uuid";
-       version = "0.0.0.0";
-       sha256 = "1v862wfmd03ssch7p5hr5cmzc38gzmxvw22swdfs2blfxv13cdc8";
+       version = "0.0.0.2";
+       sha256 = "01gh95cxymimjyvhpba0w5bzw6vnx9jzgc6a5jj7vqxi421cc7ss";
        libraryHaskellDepends = [
          aeson base binary bytestring deepseq hashable http-api-data random
          text uuid validity validity-uuid
@@ -250926,8 +231918,6 @@ self: {
        ];
        description = "Language-independent type-safe communication";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typed-wire-utils" = callPackage
@@ -250957,8 +231947,6 @@ self: {
        ];
        description = "Typed frontend to TensorFlow and higher-order deep learning";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typedquery" = callPackage
@@ -250975,8 +231963,6 @@ self: {
        ];
        description = "Parser for SQL augmented with types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typehash" = callPackage
@@ -250988,8 +231974,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring mtl pureMD5 syb ];
        description = "Create a unique hash value for a type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typelevel" = callPackage
@@ -251022,8 +232006,6 @@ self: {
        testHaskellDepends = [ base ghc-prim vinyl ];
        description = "Solve type equalities using custom type-level rewrite rules";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typelevel-tensor" = callPackage
@@ -251041,8 +232023,6 @@ self: {
        ];
        description = "Tensors whose ranks and dimensions type-inferred and type-checked";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typelits-witnesses" = callPackage
@@ -251095,8 +232075,6 @@ self: {
        ];
        description = "Lens-like interface for type level parameters; allows unboxed unboxed vectors and supercompilation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typerep-map" = callPackage
@@ -251126,8 +232104,6 @@ self: {
        doHaddock = false;
        description = "Efficient implementation of a dependent map with types as keys";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "types-compat" = callPackage
@@ -251141,8 +232117,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "ghc-7.6/7.8 compatible GHC.TypeLits, Data.Typeable and Data.Proxy.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typesafe-endian" = callPackage
@@ -251173,8 +232147,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Type-safe transformations and purifications of PreCures (Japanese Battle Heroine)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typescript-docs" = callPackage
@@ -251194,8 +232166,6 @@ self: {
        ];
        description = "A documentation generator for TypeScript Definition files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typical" = callPackage
@@ -251233,8 +232203,6 @@ self: {
        ];
        description = "Just let me draw nice text already";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "typography-geometry" = callPackage
@@ -251250,8 +232218,6 @@ self: {
        ];
        description = "Drawings for printed text documents";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tyro" = callPackage
@@ -251272,8 +232238,6 @@ self: {
        ];
        description = "Type derived JSON parsing using Aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tz" = callPackage
@@ -251340,8 +232304,6 @@ self: {
        testHaskellDepends = [ base bytestring either-unwrap hspec text ];
        description = "Haskell Universal Two Factor helper toolbox library thing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uAgda" = callPackage
@@ -251419,8 +232381,6 @@ self: {
        testHaskellDepends = [ base hspec text ];
        description = "Uber client for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uberlast" = callPackage
@@ -251432,8 +232392,6 @@ self: {
        libraryHaskellDepends = [ base lens tagged template-haskell ];
        description = "Generate overloaded lenses from plain data declaration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ucam-webauth" = callPackage
@@ -251514,8 +232472,6 @@ self: {
        librarySystemDepends = [ icu ];
        description = "String encoding conversion with ICU";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) icu;};
 
   "udbus" = callPackage
@@ -251576,8 +232532,6 @@ self: {
        description = "libudev bindings";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "i686-linux" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) systemd;};
 
   "udp-conduit" = callPackage
@@ -251593,8 +232547,6 @@ self: {
        ];
        description = "Simple fire-and-forget conduit UDP wrappers";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "udp-streaming" = callPackage
@@ -251646,8 +232598,6 @@ self: {
        ];
        description = "Part of UHC packaged as cabal/hackage installable library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uhc-util" = callPackage
@@ -251667,8 +232617,6 @@ self: {
        ];
        description = "UHC utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uhexdump" = callPackage
@@ -251682,8 +232630,6 @@ self: {
        executableHaskellDepends = [ base bytestring split ];
        description = "hex dumper for UTF-8 text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uhttpc" = callPackage
@@ -251719,8 +232665,6 @@ self: {
        libraryHaskellDepends = [ base data-default mtl old-locale time ];
        description = "A framework for friendly commandline programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uid" = callPackage
@@ -251795,8 +232739,6 @@ self: {
        ];
        description = "A fast, cache-efficient, concurrent bloom filter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unagi-chan" = callPackage
@@ -251825,8 +232767,6 @@ self: {
        libraryHaskellDepends = [ base io-streams unagi-chan ];
        description = "Unagi Chan IO-Streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unamb" = callPackage
@@ -251853,8 +232793,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "Functional concurrency with unamb using a custom scheduler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unbeliever" = callPackage
@@ -251885,8 +232823,6 @@ self: {
        doHaddock = false;
        description = "Opinionated Haskell Interoperability";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unbound" = callPackage
@@ -251906,8 +232842,6 @@ self: {
        ];
        description = "Generic support for programming with names and binders";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unbound-generics" = callPackage
@@ -251945,8 +232879,6 @@ self: {
        ];
        description = "Support for programming with names and binders using kind-generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unbounded-delays" = callPackage
@@ -251969,8 +232901,6 @@ self: {
        libraryHaskellDepends = [ base unbounded-delays units units-defs ];
        description = "Thread delays and timeouts using proper time units";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unboxed" = callPackage
@@ -251993,8 +232923,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Self-optimizing unboxed sets using view patterns and data families";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unboxed-ref" = callPackage
@@ -252063,8 +232991,6 @@ self: {
        executableHaskellDepends = [ base bytestring cmdargs ];
        description = "Secure and resilient remote file storage utility";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uncertain" = callPackage
@@ -252089,6 +233015,8 @@ self: {
        pname = "unconstrained";
        version = "0.1.0.2";
        sha256 = "03811shhcfkcrsai3a1vw99g0pmg8m3cfi8gfiaf8b13l1k7lwfj";
+       revision = "1";
+       editedCabalFile = "13fj2jlh44774www49fwp7h7z6gr23scfbvg745rpywys49c0559";
        description = "Null constraint";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -252099,8 +233027,8 @@ self: {
        pname = "unescaping-print";
        version = "0.1";
        sha256 = "0a1ryvnpgsk668wagwwapksi7i9kbhhjfpqlvmg2z9kv1anr6mp5";
-       revision = "1";
-       editedCabalFile = "0w8fw1nymnj34lnm2q8nj1ymcbzw6q6jpp4c1h2w5b0q4rdw41jv";
+       revision = "2";
+       editedCabalFile = "113p28z74lvsc7c6v93ilvbyp2fn5h1qsymksn3mi2ndxwq3vz3f";
        libraryHaskellDepends = [ base ];
        description = "Tiny package providing unescaping versions of show and print";
        license = stdenv.lib.licenses.bsd3;
@@ -252126,8 +233054,8 @@ self: {
     ({ mkDerivation, base, transformers, unexceptionalio }:
      mkDerivation {
        pname = "unexceptionalio-trans";
-       version = "0.5.0";
-       sha256 = "1sd5q97zjk1qkffbhj4rzdrvwwz4q7b6vwrmb6mpkbg7ra4ks49p";
+       version = "0.5.1";
+       sha256 = "100sfbrpaldz37a176qpfkk1nx5acyh8pchjmb8g5vhzbhyrqniz";
        libraryHaskellDepends = [ base transformers unexceptionalio ];
        description = "A wrapper around UnexceptionalIO using monad transformers";
        license = "unknown";
@@ -252160,8 +233088,6 @@ self: {
        ];
        description = "Class of data structures that can be unfolded";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unfoldable-restricted" = callPackage
@@ -252178,8 +233104,6 @@ self: {
        ];
        description = "An alternative to the Unfoldable typeclass";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ungadtagger" = callPackage
@@ -252217,8 +233141,6 @@ self: {
        ];
        description = "Graphs";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uni-htk" = callPackage
@@ -252280,8 +233202,6 @@ self: {
        ];
        description = "Graphs binding";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uni-util" = callPackage
@@ -252337,8 +233257,6 @@ self: {
        librarySystemDepends = [ icu ];
        description = "Unicode normalization using the ICU library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) icu;};
 
   "unicode-prelude" = callPackage
@@ -252373,8 +233291,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "print and show in unicode";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unicode-symbols" = callPackage
@@ -252386,8 +233302,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Unicode alternatives for common functions and operators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unicode-transforms" = callPackage
@@ -252474,8 +233388,6 @@ self: {
        testHaskellDepends = [ attoparsec base bytestring Cabal ];
        description = "Uniform IO over files, network, anything";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "uniform-pair" = callPackage
@@ -252510,8 +233422,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq lens ];
        description = "Extensible type-safe unions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "union-find" = callPackage
@@ -252547,8 +233457,6 @@ self: {
        libraryHaskellDepends = [ base containers extensible ];
        description = "Heterogeneous map by open unions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unipatterns" = callPackage
@@ -252598,19 +233506,6 @@ self: {
      }) {};
 
   "uniq-deep" = callPackage
-    ({ mkDerivation, base, bytestring, containers }:
-     mkDerivation {
-       pname = "uniq-deep";
-       version = "1.1.1";
-       sha256 = "1krkvyvsqsm2l34zsd0ggsvrmrvwrhskqfmcb71hyw1ryixd2hn6";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [ base bytestring containers ];
-       description = "uniq-deep";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "uniq-deep_1_2_0" = callPackage
     ({ mkDerivation, base, bytestring, unordered-containers }:
      mkDerivation {
        pname = "uniq-deep";
@@ -252623,7 +233518,6 @@ self: {
        ];
        description = "uniq-deep";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unique" = callPackage
@@ -252684,8 +233578,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Splittable Unique Identifier Supply";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uniquely-represented-sets" = callPackage
@@ -252702,8 +233594,6 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion random ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unit" = callPackage
@@ -252764,8 +233654,6 @@ self: {
        ];
        description = "Attoparsec parsers for the units package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "units-defs" = callPackage
@@ -252806,8 +233694,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "An extendable library for type-safe computations including units";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unity-testresult-parser" = callPackage
@@ -252830,8 +233716,6 @@ self: {
          text
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unitym" = callPackage
@@ -252869,22 +233753,21 @@ self: {
        libraryHaskellDepends = [ base unitym yesod ];
        description = "Implementation of the unity monad for the Yesod framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "universal" = callPackage
-    ({ mkDerivation, base, base-unicode-symbols, criterion, smallcheck
-     , tasty, tasty-smallcheck, util
+    ({ mkDerivation, base, base-unicode-symbols, category, criterion
+     , smallcheck, tasty, tasty-smallcheck, util
      }:
      mkDerivation {
        pname = "universal";
-       version = "0.0.0.0";
-       sha256 = "0qcv0xi65l782yvn25an0qiavn942szs16j8p328i2pc6ggfymb2";
-       libraryHaskellDepends = [ base base-unicode-symbols util ];
+       version = "0.0.1.0";
+       sha256 = "1lpwzy4l711rw7a6k0fbbsaqfbzldi242vqkjrmhxnrkmddjxgy9";
+       libraryHaskellDepends = [
+         base base-unicode-symbols category util
+       ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        benchmarkHaskellDepends = [ base criterion ];
-       doHaddock = false;
        description = "Universal";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -252902,22 +233785,6 @@ self: {
      }) {};
 
   "universe" = callPackage
-    ({ mkDerivation, universe-base, universe-dependent-sum
-     , universe-instances-extended, universe-reverse-instances
-     }:
-     mkDerivation {
-       pname = "universe";
-       version = "1.1.1";
-       sha256 = "0jm5wi5blc21jn5hfgmx13ra006dc08dvl1sx7ciq8id87kwvxzg";
-       libraryHaskellDepends = [
-         universe-base universe-dependent-sum universe-instances-extended
-         universe-reverse-instances
-       ];
-       description = "A class for finite and recursively enumerable types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "universe_1_2" = callPackage
     ({ mkDerivation, universe-base, universe-instances-extended
      , universe-reverse-instances, universe-some
      }:
@@ -252931,7 +233798,6 @@ self: {
        ];
        description = "A class for finite and recursively enumerable types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "universe-base" = callPackage
@@ -252950,27 +233816,6 @@ self: {
      }) {};
 
   "universe-dependent-sum" = callPackage
-    ({ mkDerivation, base, dependent-sum, template-haskell
-     , th-abstraction, transformers, universe-base
-     }:
-     mkDerivation {
-       pname = "universe-dependent-sum";
-       version = "1.1.0.1";
-       sha256 = "1mfvfh7rnk8lnd5lgxbhi40y31sar11dmgh5s7g2kgsprzmg1qpi";
-       revision = "2";
-       editedCabalFile = "1vh93f1nq72fwnrhl9r8qwwiwr26l9pgcmdic56j2b2iz3imnfhc";
-       libraryHaskellDepends = [
-         base dependent-sum template-haskell th-abstraction transformers
-         universe-base
-       ];
-       testHaskellDepends = [
-         base dependent-sum template-haskell universe-base
-       ];
-       description = "Universe instances for types from dependent-sum";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "universe-dependent-sum_1_2" = callPackage
     ({ mkDerivation, base, dependent-sum, some, universe-base
      , universe-some
      }:
@@ -252983,7 +233828,6 @@ self: {
        ];
        description = "Universe instances for types from dependent-sum";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "universe-instances-base" = callPackage
@@ -253077,37 +233921,9 @@ self: {
        ];
        description = "Construct a Dec's ancestor list";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "universum" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, doctest
-     , gauge, ghc-prim, Glob, hashable, hedgehog, microlens
-     , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog
-     , text, transformers, unordered-containers, utf8-string, vector
-     }:
-     mkDerivation {
-       pname = "universum";
-       version = "1.5.0";
-       sha256 = "17rzi17k2wj3p6dzd0dggzgyhh0c2mma4znkci1hqcihwr6rrljk";
-       libraryHaskellDepends = [
-         base bytestring containers deepseq ghc-prim hashable microlens
-         microlens-mtl mtl safe-exceptions stm text transformers
-         unordered-containers utf8-string vector
-       ];
-       testHaskellDepends = [
-         base bytestring doctest Glob hedgehog tasty tasty-hedgehog text
-         utf8-string
-       ];
-       benchmarkHaskellDepends = [
-         base containers gauge unordered-containers
-       ];
-       description = "Custom prelude used in Serokell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "universum_1_6_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, doctest
      , gauge, ghc-prim, Glob, hashable, hedgehog, microlens
      , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog
@@ -253131,7 +233947,6 @@ self: {
        ];
        description = "Custom prelude used in Serokell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unix_2_7_2_2" = callPackage
@@ -253183,8 +233998,6 @@ self: {
        libraryHaskellDepends = [ base foreign-var ];
        description = "Comprehensive bindings to fcntl(2)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unix-handle" = callPackage
@@ -253196,8 +234009,6 @@ self: {
        libraryHaskellDepends = [ base unix ];
        description = "POSIX operations on Handles";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unix-io-extra" = callPackage
@@ -253247,8 +234058,6 @@ self: {
        ];
        description = "Run processes on Unix systems, with a conduit interface (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unix-pty-light" = callPackage
@@ -253300,8 +234109,6 @@ self: {
        ];
        description = "Bidirectional JSON parsing and generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unlambda" = callPackage
@@ -253423,8 +234230,6 @@ self: {
        ];
        description = "A Library for the manipulation of images";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unmed2" = callPackage
@@ -253481,8 +234286,6 @@ self: {
        ];
        description = "Rematch support for unordered containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unordered-graphs" = callPackage
@@ -253498,8 +234301,6 @@ self: {
        ];
        description = "Graph library using unordered-containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unordered-intmap" = callPackage
@@ -253516,8 +234317,6 @@ self: {
        ];
        description = "A specialization of `HashMap Int v`";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unpack-funcs" = callPackage
@@ -253533,8 +234332,6 @@ self: {
        ];
        description = "Monad transformers that mirror worker-wrapper transformations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unpacked-containers" = callPackage
@@ -253564,8 +234361,6 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked either data type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unpacked-maybe" = callPackage
@@ -253578,8 +234373,6 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked maybe data type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unpacked-maybe-numeric" = callPackage
@@ -253594,8 +234387,6 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "maybes of numeric values with fewer indirections";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unpacked-maybe-text" = callPackage
@@ -253623,8 +234414,6 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked these data type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unpacked-validation" = callPackage
@@ -253641,8 +234430,6 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked validation data type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unparse-attoparsec" = callPackage
@@ -253674,8 +234461,6 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        description = "Compiler plugin for loop unrolling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unsafe" = callPackage
@@ -253712,8 +234497,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Flexible access control for unsafe operations and instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unsafeperformst" = callPackage
@@ -253744,8 +234527,6 @@ self: {
        ];
        description = "Solve Boggle-like word games";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unsequential" = callPackage
@@ -253764,8 +234545,6 @@ self: {
        ];
        description = "An extension removing the sequentiality from monads";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unusable-pkg" = callPackage
@@ -253807,8 +234586,6 @@ self: {
        testHaskellDepends = [ base containers hspec text ];
        description = "A command line tool to identify unused code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "unwrapped-functors" = callPackage
@@ -253838,8 +234615,6 @@ self: {
        testHaskellDepends = [ base hlint tasty tasty-hunit ];
        description = "Units of measure as a GHC typechecker plugin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "up" = callPackage
@@ -253857,8 +234632,6 @@ self: {
        ];
        description = "Command-line tool to generate paths for moving upward in a file system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "up-grade" = callPackage
@@ -253903,8 +234676,6 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "A program to update fetchgit values in Nix expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "update-repos" = callPackage
@@ -253943,8 +234714,6 @@ self: {
        ];
        description = "Haskell client for Uploadcare";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uploadtest" = callPackage
@@ -253967,8 +234736,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Binding to upskirt";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "urbit-hob" = callPackage
@@ -254007,8 +234774,6 @@ self: {
        ];
        description = "Minimalistic CLI RSS reader";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "urembed" = callPackage
@@ -254029,8 +234794,6 @@ self: {
        ];
        description = "Ur/Web static content generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uri" = callPackage
@@ -254042,8 +234805,6 @@ self: {
        libraryHaskellDepends = [ base parsec safe utf8-string ];
        description = "Library for working with URIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uri-bytestring" = callPackage
@@ -254102,8 +234863,6 @@ self: {
        ];
        description = "Read and write URIs (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uri-encode" = callPackage
@@ -254136,8 +234895,6 @@ self: {
        ];
        description = "Read and write URIs (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uri-enumerator-file" = callPackage
@@ -254156,8 +234913,6 @@ self: {
        ];
        description = "uri-enumerator backend for the file scheme (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uri-parse" = callPackage
@@ -254174,8 +234929,6 @@ self: {
        testHaskellDepends = [ base data-default hspec lens ];
        description = "A simple library for parsing and generating URIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uri-template" = callPackage
@@ -254190,8 +234943,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "URI template library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uri-templater" = callPackage
@@ -254248,8 +234999,6 @@ self: {
        benchmarkHaskellDepends = [ criterion http-types rerebase ];
        description = "Decoders for URL-encoding (aka Percent-encoding)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "url-generic" = callPackage
@@ -254263,8 +235012,6 @@ self: {
        libraryHaskellDepends = [ base mtl syb ];
        description = "Parse/format generic key/value URLs from record data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "urlcheck" = callPackage
@@ -254282,8 +235029,6 @@ self: {
        ];
        description = "Parallel link checker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "urldecode" = callPackage
@@ -254297,8 +235042,6 @@ self: {
        executableHaskellDepends = [ base network ];
        description = "Decode percent-encoded strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "urldisp-happstack" = callPackage
@@ -254310,8 +235053,6 @@ self: {
        libraryHaskellDepends = [ base bytestring happstack-server mtl ];
        description = "Simple, declarative, expressive URL routing -- on happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "urlencoded" = callPackage
@@ -254346,8 +235087,6 @@ self: {
        ];
        description = "Painfully simple URL deployment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "urn" = callPackage
@@ -254360,8 +235099,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Universal Resource Names";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "urn-random" = callPackage
@@ -254378,8 +235115,6 @@ self: {
        ];
        description = "A package for updatable discrete distributions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "urxml" = callPackage
@@ -254397,8 +235132,6 @@ self: {
        ];
        description = "XML parser-printer supporting Ur/Web syntax extensions";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "usa-holidays" = callPackage
@@ -254441,8 +235174,6 @@ self: {
        ];
        description = "Iteratee enumerators for the usb package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "usb-hid" = callPackage
@@ -254456,8 +235187,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring usb ];
        description = "Parser and request Library for USB HIDs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "usb-id-database" = callPackage
@@ -254477,8 +235206,6 @@ self: {
        ];
        description = "A database of USB identifiers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "usb-iteratee" = callPackage
@@ -254495,8 +235222,6 @@ self: {
        ];
        description = "Iteratee enumerators for the usb package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "usb-safe" = callPackage
@@ -254513,8 +235238,6 @@ self: {
        ];
        description = "Type-safe communication with USB devices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "useragents" = callPackage
@@ -254578,8 +235301,6 @@ self: {
        ];
        description = "A mysql-haskell backend for the users library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "users-persistent" = callPackage
@@ -254600,8 +235321,6 @@ self: {
        ];
        description = "A persistent backend for the users package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "users-postgresql-simple" = callPackage
@@ -254649,8 +235368,6 @@ self: {
        ];
        description = "A pragmatic time and date library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "utf" = callPackage
@@ -254700,8 +235417,6 @@ self: {
        libraryHaskellDepends = [ base utf8-string ];
        description = "Variants of Prelude and System.IO with UTF8 text I/O operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "utf8-string" = callPackage
@@ -254732,8 +235447,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Constant-space UTF8 validator for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "util" = callPackage
@@ -254742,6 +235455,8 @@ self: {
        pname = "util";
        version = "0.1.17.1";
        sha256 = "1qhx4r27sny25sykacf5xi5br4msq4335ghp5zc3fq0lii3866s7";
+       revision = "1";
+       editedCabalFile = "16hbcmcq2674j37gl808n5i02kv0vn3nwq5l2a6v5lj0dn34nicb";
        libraryHaskellDepends = [ base transformers ];
        description = "Utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -254753,11 +235468,24 @@ self: {
        pname = "util-exception";
        version = "0.2.0.0";
        sha256 = "0dx617saxbz8ij78kspm4j9zibf77d2hpjbci1c3ag7dhxagvjbx";
+       revision = "1";
+       editedCabalFile = "0fdwzjjr7izfn9r6lgp3lajvd9giid8v0c68l729hc25cz344nqk";
        libraryHaskellDepends = [ base basic control lifted-base-tf util ];
        description = "Exceptional utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+     }) {};
+
+  "util-logict" = callPackage
+    ({ mkDerivation, base, gauge, logict }:
+     mkDerivation {
+       pname = "util-logict";
+       version = "0.0.0.0";
+       sha256 = "1d8jl1dcbyvivhr46m0qw3j1khir8k52pchjczb0v52jhy8lihwr";
+       libraryHaskellDepends = [ base logict ];
+       testHaskellDepends = [ base logict ];
+       benchmarkHaskellDepends = [ base gauge logict ];
+       description = "See README for more info";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "util-plus" = callPackage
@@ -254785,8 +235513,6 @@ self: {
        libraryHaskellDepends = [ base primitive ];
        description = "Primitive memory-related utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "util-primitive-control" = callPackage
@@ -254795,15 +235521,12 @@ self: {
      }:
      mkDerivation {
        pname = "util-primitive-control";
-       version = "0.1.0.0";
-       sha256 = "104p69sw8jyc2dvarv7573cks3p6fvk5d61qhp9y47nylp4q8iqx";
+       version = "0.1.1.0";
+       sha256 = "1sld7sh38smqmwi4nn2klbsh67419j77wbswblbv00rvh20xpl1h";
        libraryHaskellDepends = [ base control primitive util ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
-       doHaddock = false;
        description = "Utilities for stateful primitive types and types based on them";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "util-universe" = callPackage
@@ -254820,8 +235543,6 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Utilities for universal types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "utility-ht" = callPackage
@@ -254845,8 +235566,6 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base ];
        description = "Utilities for compiler construction: core functionality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uu-cco-examples" = callPackage
@@ -254860,8 +235579,6 @@ self: {
        executableHaskellDepends = [ base uu-cco uuagc uuagc-cabal ];
        description = "Utilities for compiler construction: example programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uu-cco-hut-parsing" = callPackage
@@ -254873,8 +235590,6 @@ self: {
        libraryHaskellDepends = [ base uu-cco uulib ];
        description = "Utilities for compiler construction: Feedback wrapper around parser in uulib";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uu-cco-uu-parsinglib" = callPackage
@@ -254886,8 +235601,6 @@ self: {
        libraryHaskellDepends = [ base ListLike uu-cco uu-parsinglib ];
        description = "Utilities for compiler construction: Feedback wrapper around parser in uu-parsinglib";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uu-interleaved" = callPackage
@@ -254980,8 +235693,6 @@ self: {
        ];
        description = "Attribute Grammar System of Universiteit Utrecht";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uuagc-cabal" = callPackage
@@ -255008,8 +235719,6 @@ self: {
        libraryHaskellDepends = [ base diagrams-lib SVGFonts ];
        description = "Utility for drawing attribute grammar pictures with the diagrams package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uuagd" = callPackage
@@ -255066,8 +235775,6 @@ self: {
        libraryHaskellDepends = [ aeson base text uuid ];
        description = "Aeson types for UUID instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uuid-bytes" = callPackage
@@ -255077,8 +235784,8 @@ self: {
      }:
      mkDerivation {
        pname = "uuid-bytes";
-       version = "0.1.0.1";
-       sha256 = "0gzw6dn84xg0ndkhsnqpr1qn858cr0627hkdq0rijv932b0z4yvs";
+       version = "0.1.1.0";
+       sha256 = "13kskg9j847w3f01pf0r24kf1nnfz5srfp268ip5n55ji26h5cmr";
        libraryHaskellDepends = [
          base byteslice bytesmith natural-arithmetic primitive
          small-bytearray-builder wide-word
@@ -255089,8 +235796,6 @@ self: {
        ];
        description = "UUID parsing using byteverse packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uuid-crypto" = callPackage
@@ -255135,8 +235840,6 @@ self: {
        ];
        description = "Orphan instances for the UUID datatype";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uuid-quasi" = callPackage
@@ -255196,8 +235899,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Fast unboxed arrays with a flexible interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uvector-algorithms" = callPackage
@@ -255209,8 +235910,6 @@ self: {
        libraryHaskellDepends = [ base uvector ];
        description = "Efficient algorithms for uvector unboxed arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uxadt" = callPackage
@@ -255222,8 +235921,6 @@ self: {
        libraryHaskellDepends = [ base json MissingH mtl ];
        description = "Cross-language extensible representation for algebraic data type instances";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "uzbl-with-source" = callPackage
@@ -255251,8 +235948,6 @@ self: {
        ];
        description = "interface to Video For Linux Two (V4L2)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "v4l2-examples" = callPackage
@@ -255266,8 +235961,6 @@ self: {
        executableHaskellDepends = [ base GLUT v4l2 ];
        description = "video for linux two examples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vabal" = callPackage
@@ -255289,8 +235982,6 @@ self: {
        testHaskellDepends = [ base process ];
        description = "the cabal companion";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vabal-lib" = callPackage
@@ -255319,8 +236010,6 @@ self: {
        libraryHaskellDepends = [ array base containers ghc-prim ];
        description = "Graph representation of the GHC heap";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vacuum-cairo" = callPackage
@@ -255337,8 +236026,6 @@ self: {
        ];
        description = "Visualize live Haskell data structures using vacuum, graphviz and cairo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vacuum-graphviz" = callPackage
@@ -255350,8 +236037,6 @@ self: {
        libraryHaskellDepends = [ base filepath graphviz vacuum ];
        description = "A library for transforming vacuum graphs into GraphViz output";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vacuum-opengl" = callPackage
@@ -255371,8 +236056,6 @@ self: {
        ];
        description = "Visualize live Haskell data structures using vacuum, graphviz and OpenGL";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vacuum-ubigraph" = callPackage
@@ -255384,8 +236067,6 @@ self: {
        libraryHaskellDepends = [ base containers hubigraph vacuum ];
        description = "Visualize Haskell data structures using vacuum and Ubigraph";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vado" = callPackage
@@ -255431,8 +236112,6 @@ self: {
        libraryHaskellDepends = [ base containers MonadRandom ];
        description = "Valid operator/module characters";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "validate" = callPackage
@@ -255463,8 +236142,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Input validation combinator library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "validated-literals" = callPackage
@@ -255496,8 +236173,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Type-level constraints on strings and other input";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "validation" = callPackage
@@ -255537,8 +236212,6 @@ self: {
        ];
        description = "A nice way to define field validations in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "validationt" = callPackage
@@ -255556,8 +236229,6 @@ self: {
        ];
        description = "Straightforward validation monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "validators" = callPackage
@@ -255576,8 +236247,8 @@ self: {
     ({ mkDerivation, base, hspec }:
      mkDerivation {
        pname = "validity";
-       version = "0.9.0.2";
-       sha256 = "1aa93lp1pqwv7vhx19nazlig8qhbp3psblbz360s5lii3s5rli2v";
+       version = "0.9.0.3";
+       sha256 = "1iqn07n1fv54waln0jj9hf3pivxiz138hzm38z0cdl8yj76qgx7x";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Validity typeclass";
@@ -255590,8 +236261,8 @@ self: {
      }:
      mkDerivation {
        pname = "validity-aeson";
-       version = "0.2.0.2";
-       sha256 = "010x1sprssj282gv85n63955fmn6ngz6h6qii3174vrxrwlkvh7s";
+       version = "0.2.0.3";
+       sha256 = "0rvhlbnm27yfywavp46iyhvkbwxzcnwl8p82k8xpncy4gc2493b7";
        libraryHaskellDepends = [
          aeson base validity validity-scientific validity-text
          validity-unordered-containers validity-vector
@@ -255604,8 +236275,8 @@ self: {
     ({ mkDerivation, base, bytestring, validity }:
      mkDerivation {
        pname = "validity-bytestring";
-       version = "0.4.1.0";
-       sha256 = "0jyqsvi12673pz2dz88v9j1i1vh0fxv77n0xyjh30lhl8s9y3vvd";
+       version = "0.4.1.1";
+       sha256 = "0ck7pn8c8srwdwpcx6x4ihixff07kigq8q9sjkc3zzyf54n93f3x";
        libraryHaskellDepends = [ base bytestring validity ];
        description = "Validity instances for bytestring";
        license = stdenv.lib.licenses.mit;
@@ -255615,33 +236286,21 @@ self: {
     ({ mkDerivation, base, containers, validity }:
      mkDerivation {
        pname = "validity-containers";
-       version = "0.3.1.0";
-       sha256 = "1ci07x5k9hjpn23pbp4bc0zvml5xbpppsmcxr1qfcg0g4036q29r";
+       version = "0.5.0.1";
+       sha256 = "1rhr3ibxj94gipdqq2ar1qkklpavs2yj53n3qrnfawhs2sih9kpd";
        libraryHaskellDepends = [ base containers validity ];
        description = "Validity instances for containers";
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-containers_0_5_0_0" = callPackage
-    ({ mkDerivation, base, containers, validity }:
-     mkDerivation {
-       pname = "validity-containers";
-       version = "0.5.0.0";
-       sha256 = "0b1kwzgynq00mx563w9yfm6jmy268m5ylsdsibn3ymxf3h19px91";
-       libraryHaskellDepends = [ base containers validity ];
-       description = "Validity instances for containers";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "validity-path" = callPackage
     ({ mkDerivation, base, filepath, genvalidity-hspec, hspec, path
      , validity
      }:
      mkDerivation {
        pname = "validity-path";
-       version = "0.3.0.2";
-       sha256 = "0ip1qm6sip1yxbrcx9zn2saipd6bfs88cgn5jd3pw9ffkydxm74p";
+       version = "0.4.0.1";
+       sha256 = "00p02jgqp5x34yjshylbalsbi44ksdywwjf5c8fwbqjkykwx98px";
        libraryHaskellDepends = [ base filepath path validity ];
        testHaskellDepends = [
          base filepath genvalidity-hspec hspec path validity
@@ -255650,29 +236309,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-path_0_4_0_0" = callPackage
-    ({ mkDerivation, base, filepath, genvalidity-hspec, hspec, path
-     , validity
-     }:
-     mkDerivation {
-       pname = "validity-path";
-       version = "0.4.0.0";
-       sha256 = "1clma6ll0n5biaci0bsi0zzf8xr2xnc1ff5vmbxyr98pz1wy6yn4";
-       libraryHaskellDepends = [ base filepath path validity ];
-       testHaskellDepends = [
-         base filepath genvalidity-hspec hspec path validity
-       ];
-       description = "Validity instances for Path";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "validity-primitive" = callPackage
     ({ mkDerivation, base, primitive, validity }:
      mkDerivation {
        pname = "validity-primitive";
-       version = "0.0.0.0";
-       sha256 = "05y5zbirqyqjpdvvxhkaai60hzzwmvshzvkk7j376yjsg8sas4x0";
+       version = "0.0.0.1";
+       sha256 = "0r9wy91qr2c8lf6llv9qyirb1vjkq4nb41zqph5ip9gjjj7fzk9y";
        libraryHaskellDepends = [ base primitive validity ];
        description = "Validity instances for primitive";
        license = stdenv.lib.licenses.mit;
@@ -255682,8 +236324,8 @@ self: {
     ({ mkDerivation, base, scientific, validity }:
      mkDerivation {
        pname = "validity-scientific";
-       version = "0.2.0.2";
-       sha256 = "1hcdv8s7qfcrgc8hn335dzxx3q5qqbviwp4bf4lwnzbw611slcl1";
+       version = "0.2.0.3";
+       sha256 = "0vqqwlhamykz1vb5gc6krkcq3ixdmkld17c5vsxd0drnjcsllfkp";
        libraryHaskellDepends = [ base scientific validity ];
        description = "Validity instances for scientific";
        license = stdenv.lib.licenses.mit;
@@ -255693,8 +236335,8 @@ self: {
     ({ mkDerivation, base, bytestring, text, validity }:
      mkDerivation {
        pname = "validity-text";
-       version = "0.3.1.0";
-       sha256 = "0r22pipimzlznkv164n3pw3063v7yxz2l04m74y5j1zajxpg5lzd";
+       version = "0.3.1.1";
+       sha256 = "1sdcivm7mbvi71zkm36g95wrb0y8fzhrnryp01m2wpmhffk1z5cf";
        libraryHaskellDepends = [ base bytestring text validity ];
        description = "Validity instances for text";
        license = stdenv.lib.licenses.mit;
@@ -255704,8 +236346,8 @@ self: {
     ({ mkDerivation, base, time, validity }:
      mkDerivation {
        pname = "validity-time";
-       version = "0.2.0.2";
-       sha256 = "0rg28pgicn8ycdswszbc070587pblbxdzl6mc082l9rgz3g4mcji";
+       version = "0.3.0.0";
+       sha256 = "1g8lp7sv8hs9jwsqphq30q2wr20kmmd430mqc1rm82i4cwsk8azx";
        libraryHaskellDepends = [ base time validity ];
        description = "Validity instances for time";
        license = stdenv.lib.licenses.mit;
@@ -255715,8 +236357,8 @@ self: {
     ({ mkDerivation, base, hashable, unordered-containers, validity }:
      mkDerivation {
        pname = "validity-unordered-containers";
-       version = "0.2.0.2";
-       sha256 = "06qq6rdzcb0l145653fdrbyf18fci49v85mq8c0sjhhfr22pwm2h";
+       version = "0.2.0.3";
+       sha256 = "11ra6d7a711bcl6fndj3xwk3g34nq3bpqdcb8zrpjlv9p4h6n3gj";
        libraryHaskellDepends = [
          base hashable unordered-containers validity
        ];
@@ -255728,8 +236370,8 @@ self: {
     ({ mkDerivation, base, uuid, validity }:
      mkDerivation {
        pname = "validity-uuid";
-       version = "0.1.0.2";
-       sha256 = "0k2nkkc69m2j4aj3fjfd1i0cg4nli1g44nxdf5liv59hhvk33p4m";
+       version = "0.1.0.3";
+       sha256 = "1m4z9q8m07ssrg6a4lj7501kjnbp9hazg3gyfwrbdbrw7p7jjd9l";
        libraryHaskellDepends = [ base uuid validity ];
        description = "Validity instances for uuid";
        license = stdenv.lib.licenses.mit;
@@ -255739,8 +236381,8 @@ self: {
     ({ mkDerivation, base, hashable, validity, vector }:
      mkDerivation {
        pname = "validity-vector";
-       version = "0.2.0.2";
-       sha256 = "0y6fhcdyd42nynf2lavdx9pnhy8ylqfkq1yickx2ap4w5hc61k57";
+       version = "0.2.0.3";
+       sha256 = "0jbfd3h9k0b4ifaaqqar54r86hm1jiixyxrgs2ln7ni00b0ncv1y";
        libraryHaskellDepends = [ base hashable validity vector ];
        description = "Validity instances for vector";
        license = stdenv.lib.licenses.mit;
@@ -255789,8 +236431,6 @@ self: {
        ];
        description = "Analyze and visualize expression trees";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "var" = callPackage
@@ -255808,8 +236448,6 @@ self: {
        benchmarkHaskellDepends = [ array base criterion deepseq ];
        description = "Mutable variables and tuples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "var-monad" = callPackage
@@ -255839,8 +236477,6 @@ self: {
        ];
        description = "Process mpileup output to identify significant differences";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "variable-precision" = callPackage
@@ -255857,8 +236493,6 @@ self: {
        ];
        description = "variable-precision floating point";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "variables" = callPackage
@@ -255871,8 +236505,6 @@ self: {
        testHaskellDepends = [ base hspec mtl QuickCheck stm ];
        description = "Monads with variables, without deep magic";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "variation" = callPackage
@@ -255887,8 +236519,6 @@ self: {
        ];
        description = "nominal value with possible variations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "varying" = callPackage
@@ -255963,8 +236593,6 @@ self: {
        ];
        description = "Utility library for spawning a HashiCorp Vault process";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vault-trans" = callPackage
@@ -255981,8 +236609,6 @@ self: {
        ];
        description = "A monad transformer for vault-tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vaultaire-common" = callPackage
@@ -256006,8 +236632,6 @@ self: {
        ];
        description = "Common types and instances for Vaultaire";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vcache" = callPackage
@@ -256052,8 +236676,6 @@ self: {
        ];
        description = "A library for parsing/printing vCards from/to various formats";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vcatt" = callPackage
@@ -256068,8 +236690,6 @@ self: {
        executableHaskellDepends = [ base shelly text ];
        description = "Recursively check that a directory is under version control";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vcd" = callPackage
@@ -256097,8 +236717,6 @@ self: {
        ];
        description = "A package to parse VCF files inspired in similar python libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vcs-revision" = callPackage
@@ -256144,8 +236762,6 @@ self: {
        ];
        description = "GUI library for source code management systems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vcswrapper" = callPackage
@@ -256169,32 +236785,9 @@ self: {
        ];
        description = "Wrapper for source code management systems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vec" = callPackage
-    ({ mkDerivation, adjunctions, base, base-compat, criterion, deepseq
-     , distributive, fin, hashable, inspection-testing, lens
-     , semigroupoids, tagged, transformers, vector
-     }:
-     mkDerivation {
-       pname = "vec";
-       version = "0.1.1.1";
-       sha256 = "0gzypyi4vv5ajysbmnpicm8r2qh95nmmrj9l6hp30b95i36cb5as";
-       revision = "1";
-       editedCabalFile = "137f3zjj0fwn3dmynvjg7k4v7k9h24a1gzqfma36hd2svksg8c3d";
-       libraryHaskellDepends = [
-         adjunctions base base-compat deepseq distributive fin hashable lens
-         semigroupoids transformers
-       ];
-       testHaskellDepends = [ base fin inspection-testing tagged ];
-       benchmarkHaskellDepends = [ base criterion fin vector ];
-       description = "Vec: length-indexed (sized) list";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vec_0_3" = callPackage
     ({ mkDerivation, adjunctions, base, base-compat, criterion, deepseq
      , distributive, fin, hashable, inspection-testing, QuickCheck
      , semigroupoids, tagged, transformers, vector
@@ -256213,7 +236806,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion fin vector ];
        description = "Vec: length-indexed (sized) list";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vec-lens" = callPackage
@@ -256225,8 +236817,6 @@ self: {
        libraryHaskellDepends = [ base fin lens vec ];
        description = "Vec: length-indexed (sized) list: lens support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vec-optics" = callPackage
@@ -256238,8 +236828,6 @@ self: {
        libraryHaskellDepends = [ base fin optics-core vec ];
        description = "Vec: length-indexed (sized) list: optics support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vect" = callPackage
@@ -256262,8 +236850,6 @@ self: {
        libraryHaskellDepends = [ base random ];
        description = "A low-dimensional linear algebra library, operating on the Floating typeclass";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vect-floating-accelerate" = callPackage
@@ -256277,8 +236863,6 @@ self: {
        libraryHaskellDepends = [ accelerate base vect-floating ];
        description = "Accelerate instances for vect-floating types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vect-opengl" = callPackage
@@ -256290,8 +236874,6 @@ self: {
        libraryHaskellDepends = [ base OpenGL vect ];
        description = "OpenGL support for the `vect' low-dimensional linear algebra library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector_0_10_9_3" = callPackage
@@ -256428,8 +237010,6 @@ self: {
        testHaskellDepends = [ base directory QuickCheck random ];
        description = "ByteStrings as type synonyms of Storable Vectors of Word8s";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-clock" = callPackage
@@ -256449,8 +237029,6 @@ self: {
        ];
        description = "Vector clocks for versioning message flows";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-conduit" = callPackage
@@ -256469,8 +237047,6 @@ self: {
        ];
        description = "Conduit utilities for vectors";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-endian" = callPackage
@@ -256485,8 +237061,6 @@ self: {
        doHaddock = false;
        description = "Storable vectors with cpu-independent representation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-extras" = callPackage
@@ -256531,8 +237105,6 @@ self: {
        ];
        description = "vectors that perform the fmap operation in constant time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-heterogenous" = callPackage
@@ -256544,8 +237116,6 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "A type-safe library for vectors whose elements can be of any type, or any type satisfying some constraints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-instances" = callPackage
@@ -256574,8 +237144,6 @@ self: {
        ];
        description = "Instances of the Data.Collections classes for Data.Vector.*";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-mmap" = callPackage
@@ -256603,8 +237171,6 @@ self: {
        libraryHaskellDepends = [ base mersenne-random-pure64 vector ];
        description = "Generate vectors filled with high quality pseudorandom numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-read-instances" = callPackage
@@ -256616,8 +237182,6 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "(deprecated) Read instances for 'Data.Vector'";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-rotcev" = callPackage
@@ -256644,23 +237208,6 @@ self: {
      }) {};
 
   "vector-sized" = callPackage
-    ({ mkDerivation, adjunctions, base, comonad, deepseq, distributive
-     , finite-typelits, hashable, indexed-list-literals, primitive
-     , vector
-     }:
-     mkDerivation {
-       pname = "vector-sized";
-       version = "1.2.0.1";
-       sha256 = "1l7d9nzazxh372pc7fwvbxib7hfmgkjg8c5iv7m5d240n1qk13pj";
-       libraryHaskellDepends = [
-         adjunctions base comonad deepseq distributive finite-typelits
-         hashable indexed-list-literals primitive vector
-       ];
-       description = "Size tagged vectors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vector-sized_1_4_0_0" = callPackage
     ({ mkDerivation, adjunctions, base, binary, comonad, deepseq
      , distributive, finite-typelits, hashable, indexed-list-literals
      , primitive, vector
@@ -256675,7 +237222,6 @@ self: {
        ];
        description = "Size tagged vectors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-space" = callPackage
@@ -256699,8 +237245,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "vector-space operations for finite maps using Data.Map";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-space-opengl" = callPackage
@@ -256718,8 +237262,6 @@ self: {
        ];
        description = "Instances of vector-space classes for OpenGL types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-space-points" = callPackage
@@ -256760,8 +237302,6 @@ self: {
        libraryHaskellDepends = [ base primitive vector ];
        description = "Statically checked sizes on Data.Vector";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vector-strategies" = callPackage
@@ -256827,8 +237367,6 @@ self: {
        ];
        description = "GIS Vector Tiles, as defined by Mapbox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vega-view" = callPackage
@@ -256874,8 +237412,6 @@ self: {
        ];
        description = "ASCII platform-adventure game";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "verbalexpressions" = callPackage
@@ -256887,8 +237423,6 @@ self: {
        libraryHaskellDepends = [ base regex-pcre ];
        description = "Regular expressions made easy";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "verbosity" = callPackage
@@ -256899,6 +237433,8 @@ self: {
        pname = "verbosity";
        version = "0.3.0.0";
        sha256 = "0wzhkzgd6yxzdkmd2n8hwhrfyh5n88xs0hkil9l98wjh3mnn1qja";
+       revision = "1";
+       editedCabalFile = "11nw7xwvfc4aqnl9wibgfx0adzpnfbz58cjhcanf04j8pjk609lf";
        libraryHaskellDepends = [
          base binary data-default-class deepseq dhall generic-lens serialise
        ];
@@ -256906,6 +237442,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "verbosity_0_4_0_0" = callPackage
+    ({ mkDerivation, base, binary, deepseq, dhall, generic-lens
+     , serialise
+     }:
+     mkDerivation {
+       pname = "verbosity";
+       version = "0.4.0.0";
+       sha256 = "1h2vgy3ai3rxh76zi68yi5n5qmj0kyjm0sjg2m1gf9nr4z47afjx";
+       libraryHaskellDepends = [
+         base binary deepseq dhall generic-lens serialise
+       ];
+       description = "Simple enum that encodes application verbosity";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "verdict" = callPackage
     ({ mkDerivation, base, hspec, markdown-unlit, mtl, text
      , transformers
@@ -256921,8 +237473,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Validation framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "verdict-json" = callPackage
@@ -256943,8 +237493,6 @@ self: {
        ];
        description = "JSON instances and JSON Schema for verdict";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "verifiable-expressions" = callPackage
@@ -256960,8 +237508,6 @@ self: {
        ];
        description = "An intermediate language for Hoare logic style verification";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "verify" = callPackage
@@ -256984,8 +237530,6 @@ self: {
        ];
        description = "A new Haskeleton package";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "verilog" = callPackage
@@ -256998,8 +237542,6 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Verilog preprocessor, parser, and AST";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "verismith" = callPackage
@@ -257049,8 +237591,6 @@ self: {
        testHaskellDepends = [ aeson base bytestring hspec ];
        description = "Type-safe data versioning";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "versioning-servant" = callPackage
@@ -257071,8 +237611,6 @@ self: {
        ];
        description = "Servant combinators for the versioning library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "versions" = callPackage
@@ -257111,8 +237649,6 @@ self: {
        ];
        description = "types for ingesting vflow data with aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vformat" = callPackage
@@ -257190,8 +237726,6 @@ self: {
        ];
        description = "VFR waypoints, as published in the AIP (ERSA)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vgrep" = callPackage
@@ -257221,8 +237755,6 @@ self: {
        ];
        description = "A pager for grep";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vhd" = callPackage
@@ -257248,8 +237780,6 @@ self: {
        ];
        description = "Provides functions to inspect and manipulate virtual hard disk (VHD) files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vhdl" = callPackage
@@ -257261,8 +237791,6 @@ self: {
        libraryHaskellDepends = [ base mtl pretty regex-posix ];
        description = "VHDL AST and pretty printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vicinity" = callPackage
@@ -257278,8 +237806,6 @@ self: {
          base containers doctest QuickCheck quickcheck-classes
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "viewprof" = callPackage
@@ -257309,8 +237835,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Views allow you to run a State monad on part of a state";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vigilance" = callPackage
@@ -257351,8 +237875,6 @@ self: {
        ];
        description = "An extensible dead-man's switch system";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vimeta" = callPackage
@@ -257408,8 +237930,6 @@ self: {
        ];
        description = "An MPD client with vim-like key bindings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) ncurses;};
 
   "vintage-basic" = callPackage
@@ -257430,37 +237950,9 @@ self: {
        testHaskellDepends = [ base ];
        description = "Interpreter for microcomputer-era BASIC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vinyl" = callPackage
-    ({ mkDerivation, aeson, array, base, criterion, doctest, ghc-prim
-     , hspec, lens, lens-aeson, linear, microlens, mtl, mwc-random
-     , primitive, should-not-typecheck, singletons, tagged, text
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "vinyl";
-       version = "0.11.0";
-       sha256 = "0sqa4x8cwg6hdx3lrnq9pbggsh5vv6rhng2az4grl60c4kw6zr08";
-       revision = "1";
-       editedCabalFile = "05i1sjkgn9vf488sa063fnp0p56ic39a5vyni9b2llm4vbpl4kwz";
-       libraryHaskellDepends = [ array base ghc-prim ];
-       testHaskellDepends = [
-         aeson base doctest hspec lens lens-aeson microlens mtl
-         should-not-typecheck singletons text unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [
-         base criterion linear microlens mwc-random primitive tagged vector
-       ];
-       description = "Extensible Records";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "vinyl_0_12_0" = callPackage
     ({ mkDerivation, aeson, array, base, criterion, doctest, ghc-prim
      , hspec, lens, lens-aeson, linear, microlens, mtl, mwc-random
      , primitive, should-not-typecheck, singletons, tagged, text
@@ -257480,8 +237972,6 @@ self: {
        ];
        description = "Extensible Records";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vinyl-generics" = callPackage
@@ -257499,8 +237989,6 @@ self: {
        ];
        description = "Convert plain records to vinyl (and vice versa), generically";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vinyl-gl" = callPackage
@@ -257522,8 +238010,6 @@ self: {
        ];
        description = "Utilities for working with OpenGL's GLSL shading language and vinyl records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vinyl-json" = callPackage
@@ -257540,8 +238026,6 @@ self: {
        testHaskellDepends = [ base hlint ];
        description = "Provide json instances automagically to vinyl types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vinyl-named-sugar" = callPackage
@@ -257553,8 +238037,6 @@ self: {
        libraryHaskellDepends = [ base vinyl ];
        description = "Syntax sugar for vinyl records using overloaded labels";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vinyl-operational" = callPackage
@@ -257569,8 +238051,6 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vinyl-plus" = callPackage
@@ -257590,8 +238070,6 @@ self: {
        testHaskellDepends = [ base doctest vinyl ];
        description = "Vinyl records utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vinyl-utils" = callPackage
@@ -257603,8 +238081,6 @@ self: {
        libraryHaskellDepends = [ base contravariant transformers vinyl ];
        description = "Utilities for vinyl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vinyl-vectors" = callPackage
@@ -257623,8 +238099,6 @@ self: {
        ];
        description = "Vectors for vinyl vectors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "virthualenv" = callPackage
@@ -257644,8 +238118,6 @@ self: {
        ];
        description = "Virtual Haskell Environment builder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "visibility" = callPackage
@@ -257657,8 +238129,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Simple computation of visibility polygons";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vision" = callPackage
@@ -257680,8 +238150,6 @@ self: {
        ];
        description = "An XMMS2 client";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "visual-graphrewrite" = callPackage
@@ -257709,8 +238177,6 @@ self: {
        ];
        description = "Visualize the graph-rewrite steps of a Haskell program";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "visual-prof" = callPackage
@@ -257729,8 +238195,6 @@ self: {
        ];
        description = "Create a visual profile of a program's source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "visualize-cbn" = callPackage
@@ -257750,8 +238214,6 @@ self: {
        ];
        description = "Visualize CBN reduction";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vivid" = callPackage
@@ -257771,8 +238233,6 @@ self: {
        ];
        description = "Sound synthesis with SuperCollider";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vivid-osc" = callPackage
@@ -257804,8 +238264,6 @@ self: {
        ];
        description = "Implementation of SuperCollider server specifications";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vk-aws-route53" = callPackage
@@ -257823,8 +238281,6 @@ self: {
        ];
        description = "Amazon Route53 DNS service plugin for the aws package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vk-posix-pty" = callPackage
@@ -257876,8 +238332,6 @@ self: {
        testHaskellDepends = [ aeson base hspec roundtrip-aeson ];
        description = "Upload audio files to voicebase to get a transcription";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "void" = callPackage
@@ -257903,8 +238357,6 @@ self: {
        ];
        description = "Reading of Vorbis comments from Ogg Vorbis files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vowpal-utils" = callPackage
@@ -257916,8 +238368,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Vowpal Wabbit utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "voyeur" = callPackage
@@ -257929,8 +238379,6 @@ self: {
        libraryHaskellDepends = [ base bytestring process utf8-string ];
        description = "Haskell bindings for libvoyeur";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vpq" = callPackage
@@ -257941,14 +238389,12 @@ self: {
        pname = "vpq";
        version = "0.1.0.0";
        sha256 = "1qa3l71ch96slan8s2zx9wc4ljsl4jgl83m7h0rfb9nd9cawflf7";
-       revision = "1";
-       editedCabalFile = "16wnqvfblg8gimixc9pjdii4anbqjlkn12xrb6aw3sqk26pq7khb";
+       revision = "2";
+       editedCabalFile = "10rhbl1hpxsaf5xyfjady2jargw1ws2k1kqn6wwgb9m6fhya6cfk";
        libraryHaskellDepends = [ base primitive util vector ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Priority queue based on vector";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vrpn" = callPackage
@@ -258006,8 +238452,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) vte;};
 
   "vtegtk3" = callPackage
@@ -258025,45 +238469,9 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) vte;};
 
   "vty" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
-     , deepseq, directory, filepath, hashable, HUnit, microlens
-     , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
-     , quickcheck-assertions, random, smallcheck, stm, string-qq
-     , terminfo, test-framework, test-framework-hunit
-     , test-framework-smallcheck, text, transformers, unix, utf8-string
-     , vector
-     }:
-     mkDerivation {
-       pname = "vty";
-       version = "5.25.1";
-       sha256 = "1x15jlf9x6c8nhdbp6alr17vigclkaf5qy5jpp14g5n568p7karw";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base blaze-builder bytestring containers deepseq directory filepath
-         hashable microlens microlens-mtl microlens-th mtl parallel parsec
-         stm terminfo text transformers unix utf8-string vector
-       ];
-       executableHaskellDepends = [
-         base containers microlens microlens-mtl mtl
-       ];
-       testHaskellDepends = [
-         base blaze-builder bytestring Cabal containers deepseq HUnit
-         microlens microlens-mtl mtl QuickCheck quickcheck-assertions random
-         smallcheck stm string-qq terminfo test-framework
-         test-framework-hunit test-framework-smallcheck text unix
-         utf8-string vector
-       ];
-       description = "A simple terminal UI library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vty_5_26" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
      , deepseq, directory, filepath, hashable, HUnit, microlens
      , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
@@ -258095,7 +238503,6 @@ self: {
        ];
        description = "A simple terminal UI library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vty-examples" = callPackage
@@ -258116,8 +238523,6 @@ self: {
        ];
        description = "Examples programs using the vty library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vty-menu" = callPackage
@@ -258131,8 +238536,6 @@ self: {
        libraryHaskellDepends = [ base vty ];
        description = "A lib for displaying a menu and getting a selection using VTY";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vty-ui" = callPackage
@@ -258154,8 +238557,6 @@ self: {
        executableHaskellDepends = [ base QuickCheck random text vty ];
        description = "An interactive terminal user interface library for Vty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vty-ui-extras" = callPackage
@@ -258167,8 +238568,6 @@ self: {
        libraryHaskellDepends = [ base regex-base regex-pcre vty vty-ui ];
        description = "Extra vty-ui functionality not included in the core library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "vulkan" = callPackage
@@ -258181,8 +238580,6 @@ self: {
        librarySystemDepends = [ vulkan ];
        description = "Bindings to the Vulkan graphics API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {vulkan = null;};
 
   "vulkan-api" = callPackage
@@ -258232,8 +238629,6 @@ self: {
        ];
        description = "JSON wrangling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wacom-daemon" = callPackage
@@ -258257,8 +238652,6 @@ self: {
        ];
        description = "Manage Wacom tablet settings profiles, including Intuos Pro ring modes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "waddle" = callPackage
@@ -258281,8 +238674,6 @@ self: {
        ];
        description = "DOOM WAD file utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wahsp" = callPackage
@@ -258303,8 +238694,6 @@ self: {
        ];
        description = "A haskell binding of the Web Audio API ala blank-canvas";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai" = callPackage
@@ -258369,8 +238758,6 @@ self: {
        ];
        description = "File/CGI/Rev Proxy App of WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-app-static" = callPackage
@@ -258493,8 +238880,6 @@ self: {
        testHaskellDepends = [ base hspec stm ];
        description = "A web server for the development of WAI compliant web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-digestive-functors" = callPackage
@@ -258588,6 +238973,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-extra_3_0_29_1" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
+     , bytestring, case-insensitive, containers, cookie
+     , data-default-class, deepseq, directory, fast-logger, hspec
+     , http-types, http2, HUnit, iproute, network, old-locale, resourcet
+     , streaming-commons, text, time, transformers, unix, unix-compat
+     , vault, void, wai, wai-logger, word8, zlib
+     }:
+     mkDerivation {
+       pname = "wai-extra";
+       version = "3.0.29.1";
+       sha256 = "1c5am6rnk4dwrvdv3cs01kcddbddg02hrw7h9114jwzcmglx84i7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal base base64-bytestring bytestring
+         case-insensitive containers cookie data-default-class deepseq
+         directory fast-logger http-types http2 iproute network old-locale
+         resourcet streaming-commons text time transformers unix unix-compat
+         vault void wai wai-logger word8 zlib
+       ];
+       testHaskellDepends = [
+         base bytestring case-insensitive cookie fast-logger hspec
+         http-types http2 HUnit resourcet text time transformers wai zlib
+       ];
+       description = "Provides some basic WAI handlers and middleware";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-frontend-monadcgi" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, cgi
      , containers, http-types, transformers, wai
@@ -258625,8 +239040,6 @@ self: {
        ];
        description = "Git http-backend CGI App of WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-graceful" = callPackage
@@ -258638,8 +239051,6 @@ self: {
        libraryHaskellDepends = [ base http-types mtl resourcet unix wai ];
        description = "Graceful shutdown for WAI applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-handler-devel" = callPackage
@@ -258660,8 +239071,6 @@ self: {
        executableHaskellDepends = [ cmdargs ];
        description = "WAI server that automatically reloads code after modification. (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-handler-fastcgi" = callPackage
@@ -258701,8 +239110,6 @@ self: {
        libraryHaskellDepends = [ base bytestring wai wai-extra ];
        description = "Wai handler to SCGI (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-handler-snap" = callPackage
@@ -258719,8 +239126,6 @@ self: {
        ];
        description = "Web Application Interface handler using snap-server. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-handler-webkit" = callPackage
@@ -258733,8 +239138,6 @@ self: {
        libraryPkgconfigDepends = [ QtWebKit ];
        description = "Turn WAI applications into standalone GUIs using QtWebkit";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {QtWebKit = null;};
 
   "wai-hastache" = callPackage
@@ -258773,8 +239176,6 @@ self: {
        ];
        description = "hmac authentication tools for WAI apps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-http2-extra" = callPackage
@@ -258831,8 +239232,6 @@ self: {
        ];
        description = "Lenses for WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-lite" = callPackage
@@ -258848,8 +239247,6 @@ self: {
        ];
        description = "DEPCRECATED (use package \"simple\" instead) A minimalist web framework for WAI web applications";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-log" = callPackage
@@ -258868,23 +239265,6 @@ self: {
      }) {};
 
   "wai-logger" = callPackage
-    ({ mkDerivation, base, byteorder, bytestring, Cabal, cabal-doctest
-     , doctest, fast-logger, http-types, network, wai
-     }:
-     mkDerivation {
-       pname = "wai-logger";
-       version = "2.3.5";
-       sha256 = "05gbipyw0672irynsc3wqvvgzqixhmq69ay2mxh2phb734r8bcmm";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base byteorder bytestring fast-logger http-types network wai
-       ];
-       testHaskellDepends = [ base doctest ];
-       description = "A logging system for WAI";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wai-logger_2_3_6" = callPackage
     ({ mkDerivation, base, byteorder, bytestring, Cabal, cabal-doctest
      , doctest, fast-logger, http-types, network, wai
      }:
@@ -258899,7 +239279,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "A logging system for WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-logger-buffered" = callPackage
@@ -258923,8 +239302,6 @@ self: {
        ];
        description = "Buffer requets before logging them";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-logger-prefork" = callPackage
@@ -258941,8 +239318,6 @@ self: {
        ];
        description = "A logging system for preforked WAI apps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-make-assets" = callPackage
@@ -258972,43 +239347,9 @@ self: {
        ];
        description = "Compiling and serving assets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-auth" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, binary
-     , blaze-builder, blaze-html, bytestring, case-insensitive, cereal
-     , clientsession, cookie, exceptions, hoauth2, http-client
-     , http-client-tls, http-conduit, http-reverse-proxy, http-types
-     , optparse-simple, regex-posix, safe-exceptions, shakespeare, text
-     , unix-compat, unordered-containers, uri-bytestring, vault, wai
-     , wai-app-static, wai-extra, warp, yaml
-     }:
-     mkDerivation {
-       pname = "wai-middleware-auth";
-       version = "0.1.2.1";
-       sha256 = "0x3x3vc2l7glvfv6xcmqq0bw4mm8w2l577zx6qhx4399b03j56a1";
-       revision = "1";
-       editedCabalFile = "06pd7qk160m17nn3v61hmcnkfwm5qy6bjr1yhx4s2vsqyqvxgbaw";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base base64-bytestring binary blaze-builder blaze-html
-         bytestring case-insensitive cereal clientsession cookie exceptions
-         hoauth2 http-client http-client-tls http-conduit http-reverse-proxy
-         http-types regex-posix safe-exceptions shakespeare text unix-compat
-         unordered-containers uri-bytestring vault wai wai-app-static
-         wai-extra yaml
-       ];
-       executableHaskellDepends = [
-         base bytestring cereal clientsession optparse-simple warp
-       ];
-       description = "Authentication middleware that secures WAI application";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wai-middleware-auth_0_2_1_0" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, binary
      , blaze-builder, blaze-html, bytestring, case-insensitive, cereal
      , clientsession, cookie, exceptions, hedgehog, hoauth2, http-client
@@ -259041,7 +239382,6 @@ self: {
        ];
        description = "Authentication middleware that secures WAI application";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-brotli" = callPackage
@@ -259090,8 +239430,6 @@ self: {
        ];
        description = "Caching middleware for WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-cache-redis" = callPackage
@@ -259110,8 +239448,6 @@ self: {
        ];
        description = "Redis backend for wai-middleware-cache";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-caching" = callPackage
@@ -259174,8 +239510,6 @@ self: {
        ];
        description = "Wai error catching middleware";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-consul" = callPackage
@@ -259198,8 +239532,6 @@ self: {
        ];
        description = "Wai Middleware for Consul";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-content-type" = callPackage
@@ -259232,8 +239564,6 @@ self: {
        ];
        description = "Route to different middlewares based on the incoming Accept header";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-crowd" = callPackage
@@ -259291,8 +239621,6 @@ self: {
        ];
        description = "WAI middleware that delegates handling of requests";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-etag" = callPackage
@@ -259310,8 +239638,6 @@ self: {
        ];
        description = "WAI ETag middleware for static files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-gunzip" = callPackage
@@ -259338,8 +239664,6 @@ self: {
        libraryHaskellDepends = [ base bytestring http-types wai ];
        description = "cors and addHeaders for WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-hmac" = callPackage
@@ -259382,8 +239706,6 @@ self: {
        ];
        description = "WAI HMAC Authentication Middleware Client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-json-errors" = callPackage
@@ -259442,8 +239764,6 @@ self: {
        ];
        description = "WAI middleware for preprocessing static files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-prometheus" = callPackage
@@ -259477,8 +239797,6 @@ self: {
        ];
        description = "Middleware that communicates to Rollbar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-route" = callPackage
@@ -259499,8 +239817,6 @@ self: {
        ];
        description = "Wai dispatch middleware";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-slack-verify" = callPackage
@@ -259525,26 +239841,6 @@ self: {
      }) {};
 
   "wai-middleware-static" = callPackage
-    ({ mkDerivation, base, bytestring, containers, cryptonite
-     , directory, expiring-cache-map, filepath, http-types, memory
-     , mime-types, mtl, old-locale, semigroups, text, time, wai
-     }:
-     mkDerivation {
-       pname = "wai-middleware-static";
-       version = "0.8.2";
-       sha256 = "1z5yapcf8j9w71f2na30snmalsajlyi8an2f9qrjdmajabyykr0b";
-       revision = "2";
-       editedCabalFile = "17vq38dh7x1kqzfwla1s0rldd5hzm5mcrx49sjlzy8b66gd2n3ac";
-       libraryHaskellDepends = [
-         base bytestring containers cryptonite directory expiring-cache-map
-         filepath http-types memory mime-types mtl old-locale semigroups
-         text time wai
-       ];
-       description = "WAI middleware that serves requests to static files";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wai-middleware-static_0_8_3" = callPackage
     ({ mkDerivation, base, bytestring, containers, cryptonite
      , directory, expiring-cache-map, filepath, http-types, memory
      , mime-types, mtl, old-locale, semigroups, text, time, wai
@@ -259560,7 +239856,6 @@ self: {
        ];
        description = "WAI middleware that serves requests to static files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-static-caching" = callPackage
@@ -259579,8 +239874,6 @@ self: {
        ];
        description = "WAI middleware that serves requests to static files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-middleware-static-embedded" = callPackage
@@ -259700,8 +239993,6 @@ self: {
        ];
        description = "Declarative request parsing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-responsible" = callPackage
@@ -259713,8 +240004,6 @@ self: {
        libraryHaskellDepends = [ base bytestring http-types wai ];
        description = "Response interface for WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-route" = callPackage
@@ -259748,8 +240037,6 @@ self: {
        libraryHaskellDepends = [ base text wai ];
        description = "Provides basic routing on URL paths for WAI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-routes" = callPackage
@@ -259774,8 +240061,6 @@ self: {
        ];
        description = "Typesafe URLs for Wai applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-routing" = callPackage
@@ -259802,8 +240087,6 @@ self: {
        ];
        description = "Declarative routing for WAI";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-secure-cookies" = callPackage
@@ -259827,8 +240110,6 @@ self: {
          wai-extra
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-session" = callPackage
@@ -259863,8 +240144,6 @@ self: {
        ];
        description = "An alternative session middleware for WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-session-clientsession" = callPackage
@@ -259902,8 +240181,6 @@ self: {
        ];
        description = "MySQL backed Wai session store";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-session-postgresql" = callPackage
@@ -259925,8 +240202,6 @@ self: {
        ];
        description = "PostgreSQL backed Wai session store";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-session-tokyocabinet" = callPackage
@@ -259975,8 +240250,6 @@ self: {
        ];
        description = "A simple cache for serving static files in a WAI middleware";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-static-pages" = callPackage
@@ -260020,8 +240293,6 @@ self: {
        ];
        description = "Thrift transport layer for Wai";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-throttler" = callPackage
@@ -260037,8 +240308,6 @@ self: {
        ];
        description = "Wai middleware for request throttling";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wai-transformers" = callPackage
@@ -260118,8 +240387,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A wrapping library for waitfree computation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "waitra" = callPackage
@@ -260144,8 +240411,6 @@ self: {
        ];
        description = "A very simple Wai router";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "waldo" = callPackage
@@ -260178,8 +240443,6 @@ self: {
        ];
        description = "A generator of comics based on some ascertainable data about the requester";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wallpaper" = callPackage
@@ -260201,8 +240464,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "A library and executable for creating wallpaper, frieze, and rosette patterns";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "warc" = callPackage
@@ -260215,8 +240476,8 @@ self: {
        pname = "warc";
        version = "1.0.4";
        sha256 = "1mxfm8kdvm0l1lnzma4n9mriz94ypckxqcz1f34fa3n1j3ckc45b";
-       revision = "2";
-       editedCabalFile = "0vlh1wivzs2ikmp3jbx4m0zxyvkjy1rn6xhbgaz1n5vi37hid74n";
+       revision = "3";
+       editedCabalFile = "1j51wz7l7vq3mdccn4gp40vlqri9g8fqsmlndgbd70drhq5a6mpw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -260234,39 +240495,6 @@ self: {
      }) {};
 
   "warp" = callPackage
-    ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
-     , bytestring, case-insensitive, containers, directory, gauge
-     , ghc-prim, hashable, hspec, http-client, http-date, http-types
-     , http2, HUnit, iproute, lifted-base, network, process, QuickCheck
-     , simple-sendfile, stm, streaming-commons, text, time, time-manager
-     , unix, unix-compat, vault, wai, word8
-     }:
-     mkDerivation {
-       pname = "warp";
-       version = "3.3.5";
-       sha256 = "09kd8p61xxwi3jnx7y6idjr03cblfzysssvzcvvv7mfcqr5sf165";
-       libraryHaskellDepends = [
-         array async auto-update base bsb-http-chunked bytestring
-         case-insensitive containers ghc-prim hashable http-date http-types
-         http2 iproute network simple-sendfile stm streaming-commons text
-         time-manager unix unix-compat vault wai word8
-       ];
-       testHaskellDepends = [
-         array async auto-update base bsb-http-chunked bytestring
-         case-insensitive containers directory ghc-prim hashable hspec
-         http-client http-date http-types http2 HUnit iproute lifted-base
-         network process QuickCheck simple-sendfile stm streaming-commons
-         text time time-manager unix unix-compat vault wai word8
-       ];
-       benchmarkHaskellDepends = [
-         auto-update base bytestring containers gauge hashable http-date
-         http-types network time-manager unix unix-compat
-       ];
-       description = "A fast, light-weight web server for WAI applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "warp_3_3_9" = callPackage
     ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
      , bytestring, case-insensitive, containers, directory, gauge
      , ghc-prim, hashable, hspec, http-client, http-date, http-types
@@ -260297,7 +240525,6 @@ self: {
        ];
        description = "A fast, light-weight web server for WAI applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp-dynamic" = callPackage
@@ -260314,8 +240541,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Dynamic configurable warp HTTP server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "warp-grpc" = callPackage
@@ -260332,8 +240557,6 @@ self: {
        ];
        description = "A minimal gRPC server on top of Warp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "warp-static" = callPackage
@@ -260354,8 +240577,6 @@ self: {
        ];
        description = "Static file server based on Warp and wai-app-static (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "warp-systemd" = callPackage
@@ -260367,27 +240588,9 @@ self: {
        libraryHaskellDepends = [ base network systemd unix wai warp ];
        description = "Socket activation and other systemd integration for the Warp web server (WAI)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "warp-tls" = callPackage
-    ({ mkDerivation, base, bytestring, cryptonite, data-default-class
-     , network, streaming-commons, tls, tls-session-manager, wai, warp
-     }:
-     mkDerivation {
-       pname = "warp-tls";
-       version = "3.2.9";
-       sha256 = "1bwd6fi0pfcszz7f7r41bjxmx1vq0594088l3hbj0s23m4lxzhs1";
-       libraryHaskellDepends = [
-         base bytestring cryptonite data-default-class network
-         streaming-commons tls tls-session-manager wai warp
-       ];
-       description = "HTTP over TLS support for Warp via the TLS package";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "warp-tls_3_2_11" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, data-default-class
      , network, streaming-commons, tls, tls-session-manager, wai, warp
      }:
@@ -260401,7 +240604,6 @@ self: {
        ];
        description = "HTTP over TLS support for Warp via the TLS package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp-tls-uid" = callPackage
@@ -260467,8 +240669,6 @@ self: {
        testToolDepends = [ alex happy ];
        description = "WebAssembly Language Toolkit and Interpreter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "watchdog" = callPackage
@@ -260498,8 +240698,6 @@ self: {
        ];
        description = "Opinionated filesystem watcher";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "watchit" = callPackage
@@ -260528,8 +240726,6 @@ self: {
        ];
        description = "File change watching utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wavconvert" = callPackage
@@ -260571,8 +240767,8 @@ self: {
      }:
      mkDerivation {
        pname = "wavefront";
-       version = "0.7.1.3";
-       sha256 = "1sly9gxq06n4x262fav0zvfzhgnxca1xwh4q7b4lq6g3gpwld9s5";
+       version = "0.7.1.4";
+       sha256 = "1qmzvlmqxph57nx8h7zkwa9qbmin908w0w91vqwv5n7qgyqwk31n";
        libraryHaskellDepends = [
          attoparsec base dlist filepath mtl text transformers vector
        ];
@@ -260596,8 +240792,6 @@ self: {
        testHaskellDepends = [ base hspec linear ];
        description = "Wavefront .obj file loader";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wavesurfer" = callPackage
@@ -260614,8 +240808,6 @@ self: {
        ];
        description = "Parse WaveSurfer files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wavy" = callPackage
@@ -260636,8 +240828,6 @@ self: {
        ];
        description = "Process WAVE files in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wcwidth" = callPackage
@@ -260662,8 +240852,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Mutable bag backed by weak pointers to each item";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "weather-api" = callPackage
@@ -260680,8 +240868,6 @@ self: {
        ];
        description = "Weather API implemented in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web-browser-in-haskell" = callPackage
@@ -260705,8 +240891,6 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Simple functions for CSS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web-encodings" = callPackage
@@ -260724,8 +240908,6 @@ self: {
        ];
        description = "Encapsulate multiple web encoding in a single package. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web-fpco" = callPackage
@@ -260741,8 +240923,6 @@ self: {
        ];
        description = "Wrappers for web frameworks to ease usage with the FP Complete environment";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web-inv-route" = callPackage
@@ -260763,8 +240943,6 @@ self: {
        testHaskellDepends = [ base bytestring HUnit network-uri text ];
        description = "Composable, reversible, efficient web routing using invertible invariants and bijections";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web-mongrel2" = callPackage
@@ -260783,8 +240961,6 @@ self: {
        ];
        description = "Bindings for the Mongrel2 web server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web-output" = callPackage
@@ -260803,8 +240979,6 @@ self: {
        ];
        description = "Library to present content to an user via their browser";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web-page" = callPackage
@@ -260824,8 +240998,6 @@ self: {
        ];
        description = "Monoidally construct web pages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web-plugins" = callPackage
@@ -260859,8 +241031,6 @@ self: {
        ];
        description = "Send messages using Web Push protocol";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web-rep" = callPackage
@@ -260893,8 +241063,6 @@ self: {
        ];
        description = "representations of a web page";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web-routes" = callPackage
@@ -260952,8 +241120,6 @@ self: {
        ];
        description = "Adds support for using web-routes with Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web-routes-hsp" = callPackage
@@ -260989,8 +241155,6 @@ self: {
        libraryHaskellDepends = [ base path-pieces template-haskell text ];
        description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web-routes-regular" = callPackage
@@ -261002,8 +241166,6 @@ self: {
        libraryHaskellDepends = [ base parsec regular text web-routes ];
        description = "portable, type-safe URL routing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web-routes-th" = callPackage
@@ -261031,8 +241193,6 @@ self: {
        libraryHaskellDepends = [ base transformers web-routes ];
        description = "Extends web-routes with some transformers instances for RouteT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web-routes-wai" = callPackage
@@ -261067,8 +241227,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "simple routing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "web3" = callPackage
@@ -261102,8 +241260,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Ethereum API for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webapi" = callPackage
@@ -261130,8 +241286,6 @@ self: {
        ];
        description = "WAI based library for web api";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webapp" = callPackage
@@ -261154,8 +241308,6 @@ self: {
        ];
        description = "Haskell web app framework based on WAI & Warp";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webby" = callPackage
@@ -261195,8 +241347,6 @@ self: {
        executableHaskellDepends = [ base optparse-applicative ];
        description = "Turn an optparse-applicative program into a CGI program!";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webcrank" = callPackage
@@ -261224,8 +241374,6 @@ self: {
        ];
        description = "Webmachine inspired toolkit for building http applications and services";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webcrank-dispatch" = callPackage
@@ -261241,8 +241389,6 @@ self: {
        ];
        description = "A simple request dispatcher";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webcrank-wai" = callPackage
@@ -261260,8 +241406,6 @@ self: {
        ];
        description = "Build a WAI Application from Webcrank Resources";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webdriver" = callPackage
@@ -261306,8 +241450,6 @@ self: {
        ];
        description = "Webdriver actions to assist with testing a webpage which uses Angular.Js";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webdriver-snoy" = callPackage
@@ -261334,8 +241476,6 @@ self: {
        testHaskellDepends = [ base parallel text ];
        description = "a Haskell client for the Selenium WebDriver protocol (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webdriver-w3c" = callPackage
@@ -261371,8 +241511,6 @@ self: {
        ];
        description = "Bindings to the WebDriver API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webex-teams-api" = callPackage
@@ -261469,8 +241607,6 @@ self: {
        ];
        description = "WebFinger client library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webidl" = callPackage
@@ -261512,8 +241648,6 @@ self: {
        ];
        description = "webfont generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webkit" = callPackage
@@ -261547,8 +241681,6 @@ self: {
        libraryPkgconfigDepends = [ webkit ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {webkit = null;};
 
   "webkit2gtk3-javascriptcore" = callPackage
@@ -261639,8 +241771,6 @@ self: {
        ];
        description = "HTTP server library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "webshow" = callPackage
@@ -261660,8 +241790,6 @@ self: {
        ];
        description = "Show programming language printed values in a web UI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "websnap" = callPackage
@@ -261737,8 +241865,6 @@ self: {
        ];
        description = "Simple streaming RPC mechanism using WebSockets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "websockets-simple" = callPackage
@@ -261763,8 +241889,6 @@ self: {
        ];
        description = "Composable websockets clients";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "websockets-simple-extra" = callPackage
@@ -261775,8 +241899,6 @@ self: {
        sha256 = "1ckni1imxh4k1nxivvj9p1mffzvdmyjc20nas8b90dkkxblgnk1j";
        libraryHaskellDepends = [ base mtl websockets-simple ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "websockets-snap" = callPackage
@@ -261813,8 +241935,6 @@ self: {
        ];
        description = "Functional reactive web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wedding-announcement" = callPackage
@@ -261896,8 +242016,6 @@ self: {
        ];
        description = "A school-timetable problem-solver";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "weigh" = callPackage
@@ -261924,8 +242042,6 @@ self: {
        libraryHaskellDepends = [ base mtl semiring-num transformers ];
        description = "Writer monad which uses semiring constraint";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "weighted-regexp" = callPackage
@@ -261940,8 +242056,6 @@ self: {
        libraryToolDepends = [ happy ];
        description = "Weighted Regular Expression Matcher";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "weighted-search" = callPackage
@@ -261972,8 +242086,6 @@ self: {
        ];
        description = "Haskell web framework (because Scotty had trouble yodeling)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wembley" = callPackage
@@ -262015,8 +242127,6 @@ self: {
        ];
        description = "A game engine for playing werewolf within an arbitrary chat client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "werewolf-slack" = callPackage
@@ -262036,8 +242146,6 @@ self: {
        ];
        description = "A chat interface for playing werewolf in Slack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wheb-mongo" = callPackage
@@ -262049,8 +242157,6 @@ self: {
        libraryHaskellDepends = [ base bson mongoDB mtl text Wheb ];
        description = "MongoDB plugin for Wheb";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wheb-redis" = callPackage
@@ -262062,8 +242168,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hedis mtl text Wheb ];
        description = "Redis connection for Wheb";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wheb-strapped" = callPackage
@@ -262075,8 +242179,6 @@ self: {
        libraryHaskellDepends = [ base mtl StrappedTemplates text Wheb ];
        description = "Strapped templates for Wheb";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "which" = callPackage
@@ -262099,8 +242201,6 @@ self: {
        libraryHaskellDepends = [ base indents parsec ];
        description = "Parser for the While language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "whim" = callPackage
@@ -262119,8 +242219,6 @@ self: {
        ];
        description = "A Haskell window manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "whiskers" = callPackage
@@ -262132,8 +242230,6 @@ self: {
        libraryHaskellDepends = [ base parsec template-haskell ];
        description = "Mustache templates with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "whitespace" = callPackage
@@ -262148,8 +242244,6 @@ self: {
        executableHaskellDepends = [ haskell98 random ];
        description = "Whitespace, an esoteric programming language";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "whois" = callPackage
@@ -262197,8 +242291,6 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Haskell support for the Why3 input format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wide-word" = callPackage
@@ -262216,8 +242308,6 @@ self: {
        ];
        description = "Data types for large but fixed width signed and unsigned integers";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wigner-symbols" = callPackage
@@ -262284,8 +242374,6 @@ self: {
        ];
        description = "Wikipedia EPUB E-Book construction from Firefox history";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wild-bind" = callPackage
@@ -262320,8 +242408,6 @@ self: {
        ];
        description = "Graphical indicator for WildBind";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wild-bind-task-x11" = callPackage
@@ -262338,8 +242424,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Task to install and export everything you need to use WildBind in X11";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wild-bind-x11" = callPackage
@@ -262398,8 +242482,6 @@ self: {
        librarySystemDepends = [ dnsapi ];
        description = "Domain Name Service (DNS) lookup via the <windns.h>/dnsapi.dll standard library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {dnsapi = null;};
 
   "windowslive" = callPackage
@@ -262417,8 +242499,6 @@ self: {
        ];
        description = "Implements Windows Live Web Authentication and Delegated Authentication";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "winerror" = callPackage
@@ -262430,8 +242510,6 @@ self: {
        doHaddock = false;
        description = "Error handling for foreign calls to the Windows API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "winery" = callPackage
@@ -262485,8 +242563,6 @@ self: {
        librarySystemDepends = [ kernel32 ws2_32 ];
        description = "I/O library for Windows";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {kernel32 = null; ws2_32 = null;};
 
   "wire-streams" = callPackage
@@ -262529,8 +242605,6 @@ self: {
        ];
        description = "Functional reactive programming library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wiring" = callPackage
@@ -262547,8 +242621,6 @@ self: {
        ];
        description = "Wiring, promotion and demotion of types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wiringPi" = callPackage
@@ -262706,8 +242778,6 @@ self: {
        ];
        description = "Parsec parsers and types for geographic data in well-known text (WKT) format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wkt-geom" = callPackage
@@ -262731,8 +242801,6 @@ self: {
        ];
        description = "A parser of WKT, WKB and eWKB";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wl-pprint" = callPackage
@@ -262776,8 +242844,6 @@ self: {
        ];
        description = "ANSI Terminal support with wl-pprint-extras";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wl-pprint-console" = callPackage
@@ -262829,8 +242895,6 @@ self: {
        ];
        description = "A color pretty printer with terminfo support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wl-pprint-text" = callPackage
@@ -262860,8 +242924,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Haskell bindings for the wlc library";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {wlc = null;};
 
   "wobsurv" = callPackage
@@ -262897,8 +242959,6 @@ self: {
        ];
        description = "A simple and highly performant HTTP file server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "woe" = callPackage
@@ -262925,8 +242985,6 @@ self: {
        ];
        description = "Web Open Font Format (WOFF) unpacker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wol" = callPackage
@@ -262963,8 +243021,6 @@ self: {
        executableHaskellDepends = [ base optparse-generic ];
        description = "Amazon Simple Workflow Service Wrapper";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "woot" = callPackage
@@ -262993,8 +243049,6 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Words of arbitrary size";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "word-trie" = callPackage
@@ -263079,8 +243133,6 @@ self: {
        ];
        description = "Reading word2vec binary models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "word8" = callPackage
@@ -263172,8 +243224,6 @@ self: {
          unordered-containers
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wordlist" = callPackage
@@ -263214,8 +243264,6 @@ self: {
        ];
        description = "Dictionary-based password generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wordpress-auth" = callPackage
@@ -263260,8 +243308,6 @@ self: {
        executableHaskellDepends = [ base containers fclabels ];
        description = "A word search solver library and executable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wordsetdiff" = callPackage
@@ -263294,8 +243340,6 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "A library for parsing a chat-based work hour reporting scheme";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "workdays" = callPackage
@@ -263308,8 +243352,6 @@ self: {
        testHaskellDepends = [ base containers doctest hspec ];
        description = "Workday calculations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "workflow-extra" = callPackage
@@ -263332,8 +243374,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Utilities (e.g. Googling the clipboard contents) for the `workflow` pacakge";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "workflow-osx" = callPackage
@@ -263353,8 +243393,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "a \"Desktop Workflow\" monad with Objective-C bindings";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "workflow-pure" = callPackage
@@ -263377,8 +243415,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "manipulate `workflow-types:Workflow`'s";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "workflow-types" = callPackage
@@ -263397,8 +243433,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Automate keyboard\\/mouse\\/clipboard\\/application interaction";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "workflow-windows" = callPackage
@@ -263413,8 +243447,6 @@ self: {
        testHaskellDepends = [ base doctest hspec QuickCheck ];
        description = "Automate keyboard/mouse/clipboard/application interaction";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "world-peace" = callPackage
@@ -263446,8 +243478,6 @@ self: {
        ];
        description = "Subscribe to a wiki's RSS feed and archive external links";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wrap" = callPackage
@@ -263490,8 +243520,6 @@ self: {
        ];
        description = "Lazy wrapper to HaXML, HXT, TagSoup via custom XML tree structure";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wrecker" = callPackage
@@ -263532,8 +243560,6 @@ self: {
        ];
        description = "An HTTP Performance Benchmarker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wrecker-ui" = callPackage
@@ -263566,8 +243592,6 @@ self: {
        ];
        description = "A web interface for Wrecker, the HTTP Performance Benchmarker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wreq" = callPackage
@@ -263645,8 +243669,6 @@ self: {
        ];
        description = "An easy-to-use HTTP client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wreq-stringless" = callPackage
@@ -263675,8 +243697,6 @@ self: {
        ];
        description = "Colour space transformations and metrics";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "write-buffer-core" = callPackage
@@ -263737,8 +243757,6 @@ self: {
        ];
        description = "WriteT and RWST monad transformers (Reexport with all dependencies)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "writer-cps-lens" = callPackage
@@ -263755,8 +243773,6 @@ self: {
        ];
        description = "Lens instances for the stricter CPS WriterT and RWST";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "writer-cps-monads-tf" = callPackage
@@ -263772,8 +243788,6 @@ self: {
        ];
        description = "MonadWriter orphan instances for writer-cps-transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "writer-cps-morph" = callPackage
@@ -263787,8 +243801,6 @@ self: {
        libraryHaskellDepends = [ base mmorph writer-cps-transformers ];
        description = "MFunctor instance for CPS style WriterT and RWST";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "writer-cps-mtl" = callPackage
@@ -263851,8 +243863,6 @@ self: {
        ];
        description = "A simple CLI utility for interacting with a websocket";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ws-chans" = callPackage
@@ -263894,8 +243904,6 @@ self: {
        ];
        description = "WSDL parsing in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wsedit" = callPackage
@@ -263913,8 +243921,6 @@ self: {
        ];
        description = "A small tool to list, add and remove webseeds from a torrent file";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wshterm" = callPackage
@@ -263970,8 +243976,6 @@ self: {
        testHaskellDepends = [ base bytestring envy hspec skews text ];
        description = "A-little-higher-level WebSocket client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wtk" = callPackage
@@ -263983,8 +243987,6 @@ self: {
        libraryHaskellDepends = [ base old-locale time transformers ];
        description = "Wojcik Tool Kit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wtk-gtk" = callPackage
@@ -264000,8 +244002,6 @@ self: {
        ];
        description = "GTK tools within Wojcik Tool Kit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wu-wei" = callPackage
@@ -264032,8 +244032,6 @@ self: {
        ];
        description = "Basic objects and system code built on Wumpus-Core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wumpus-core" = callPackage
@@ -264047,8 +244045,6 @@ self: {
        libraryHaskellDepends = [ base containers time vector-space ];
        description = "Pure Haskell PostScript and SVG generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wumpus-drawing" = callPackage
@@ -264064,8 +244060,6 @@ self: {
        ];
        description = "High-level drawing objects built on Wumpus-Basic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wumpus-microprint" = callPackage
@@ -264081,8 +244075,6 @@ self: {
        ];
        description = "Microprints - \"greek-text\" pictures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wumpus-tree" = callPackage
@@ -264099,8 +244091,6 @@ self: {
        ];
        description = "Drawing trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wuss" = callPackage
@@ -264142,8 +244132,6 @@ self: {
        executableHaskellDepends = [ base directory random wx wxcore ];
        description = "Try to avoid the asteroids with your space ship";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wxFruit" = callPackage
@@ -264158,8 +244146,6 @@ self: {
        executableHaskellDepends = [ base wx wxcore Yampa ];
        description = "An implementation of Fruit using wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wxSimpleCanvas" = callPackage
@@ -264171,8 +244157,6 @@ self: {
        libraryHaskellDepends = [ base cubicbezier wx wxcore ];
        description = "Simple zoomable canvas for wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wxc" = callPackage
@@ -264235,8 +244219,6 @@ self: {
        ];
        description = "helper tool for building wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wxhnotepad" = callPackage
@@ -264251,8 +244233,6 @@ self: {
        executableHaskellDepends = [ base wx wxcore ];
        description = "An example of how to implement a basic notepad with wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wxturtle" = callPackage
@@ -264268,8 +244248,6 @@ self: {
        ];
        description = "turtle like LOGO with wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "wybor" = callPackage
@@ -264309,8 +244287,6 @@ self: {
        ];
        description = "An autoresponder for Dragon Go Server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "x-dsp" = callPackage
@@ -264327,8 +244303,6 @@ self: {
        ];
        description = "A embedded DSL for manipulating DSP languages in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "x11-xim" = callPackage
@@ -264473,8 +244447,6 @@ self: {
        ];
        description = "Runtime code generation for x86 64 bit machine code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xattr" = callPackage
@@ -264565,8 +244537,6 @@ self: {
        ];
        description = "XChat";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xcp" = callPackage
@@ -264582,8 +244552,6 @@ self: {
        ];
        description = "Partial implementation of the XCP protocol with ethernet as transport layer";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xdcc" = callPackage
@@ -264609,8 +244577,6 @@ self: {
        ];
        description = "A wget-like utility for retrieving files from XDCC bots on IRC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xdg-basedir" = callPackage
@@ -264672,8 +244638,6 @@ self: {
        ];
        description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xeno" = callPackage
@@ -264727,8 +244691,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "FFI bindings to xfconf";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {libxfconf = null;};
 
   "xformat" = callPackage
@@ -264741,8 +244703,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Extensible, type-safe formatting with scanf- and printf-like functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xgboost-haskell" = callPackage
@@ -264773,8 +244733,6 @@ self: {
        ];
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xhb" = callPackage
@@ -264791,8 +244749,6 @@ self: {
        ];
        description = "X Haskell Bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xhb-atom-cache" = callPackage
@@ -264808,8 +244764,6 @@ self: {
        ];
        description = "Atom cache for XHB";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xhb-ewmh" = callPackage
@@ -264826,8 +244780,6 @@ self: {
        ];
        description = "EWMH utilities for XHB";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xhtml_3000_2_2_1" = callPackage
@@ -264870,8 +244822,6 @@ self: {
        executableHaskellDepends = [ base directory process ];
        description = "The Lava system for Xilinx FPGA design with layout combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xine" = callPackage
@@ -264886,8 +244836,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to xine-lib";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {libxine = null; xine = null;};
 
   "xing-api" = callPackage
@@ -264911,8 +244859,6 @@ self: {
        ];
        description = "Wrapper for the XING API, v1";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xinput-conduit" = callPackage
@@ -264952,8 +244898,6 @@ self: {
        benchmarkHaskellDepends = [ base random time vector ];
        description = "Haskell bindings for libxkbcommon";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libxkbcommon;};
 
   "xkcd" = callPackage
@@ -264973,8 +244917,6 @@ self: {
        ];
        description = "Downloads the most recent xkcd comic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xleb" = callPackage
@@ -264990,8 +244932,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl xml ];
        description = "A simple monadic language for parsing XML structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xls" = callPackage
@@ -265036,39 +244976,9 @@ self: {
        ];
        description = "Streaming Excel file generation and parsing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xlsx" = callPackage
-    ({ mkDerivation, attoparsec, base, base64-bytestring, binary-search
-     , bytestring, conduit, containers, criterion, data-default, deepseq
-     , Diff, errors, extra, filepath, groom, lens, mtl, network-uri
-     , old-locale, raw-strings-qq, safe, smallcheck, tasty, tasty-hunit
-     , tasty-smallcheck, text, time, transformers, vector, xeno
-     , xml-conduit, zip-archive, zlib
-     }:
-     mkDerivation {
-       pname = "xlsx";
-       version = "0.7.2";
-       sha256 = "00qigyz4nc23abawapxhw0sgmj9c5qplkkvyv6xxffanx9kh8mmj";
-       libraryHaskellDepends = [
-         attoparsec base base64-bytestring binary-search bytestring conduit
-         containers data-default deepseq errors extra filepath lens mtl
-         network-uri old-locale safe text time transformers vector xeno
-         xml-conduit zip-archive zlib
-       ];
-       testHaskellDepends = [
-         base bytestring containers Diff groom lens mtl raw-strings-qq
-         smallcheck tasty tasty-hunit tasty-smallcheck text time vector
-         xml-conduit
-       ];
-       benchmarkHaskellDepends = [ base bytestring criterion ];
-       description = "Simple and incomplete Excel file parser/writer";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "xlsx_0_8_0" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, binary-search
      , bytestring, conduit, containers, criterion, data-default, deepseq
      , Diff, errors, extra, filepath, groom, lens, mtl, network-uri
@@ -265094,7 +245004,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Simple and incomplete Excel file parser/writer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xlsx-tabular" = callPackage
@@ -265111,8 +245020,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Xlsx table cell value extraction utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xlsx-templater" = callPackage
@@ -265131,8 +245038,6 @@ self: {
        ];
        description = "Simple and incomplete Excel file templater";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml" = callPackage
@@ -265178,8 +245083,6 @@ self: {
        ];
        description = "Parse XML catalog files (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-conduit_1_7_1_2" = callPackage
@@ -265206,7 +245109,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "xml-conduit" = callPackage
+  "xml-conduit_1_8_0_1" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
      , bytestring, conduit, conduit-extra, containers
      , data-default-class, deepseq, doctest, hspec, HUnit, resourcet
@@ -265227,6 +245130,30 @@ self: {
        ];
        description = "Pure-Haskell utilities for dealing with XML with the conduit package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "xml-conduit" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
+     , bytestring, conduit, conduit-extra, containers
+     , data-default-class, deepseq, doctest, hspec, HUnit, resourcet
+     , text, transformers, xml-types
+     }:
+     mkDerivation {
+       pname = "xml-conduit";
+       version = "1.9.0.0";
+       sha256 = "1p57v127882rxvvmwjmvnqdmk3x2wg1z4d8y03849h0xaz1vid0w";
+       libraryHaskellDepends = [
+         attoparsec base blaze-html blaze-markup bytestring conduit
+         conduit-extra containers data-default-class deepseq resourcet text
+         transformers xml-types
+       ];
+       testHaskellDepends = [
+         base blaze-markup bytestring conduit containers doctest hspec HUnit
+         resourcet text transformers xml-types
+       ];
+       description = "Pure-Haskell utilities for dealing with XML with the conduit package";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "xml-conduit-decode" = callPackage
@@ -265246,8 +245173,6 @@ self: {
        ];
        description = "Historical cursors & decoding on top of xml-conduit";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-conduit-parse" = callPackage
@@ -265288,8 +245213,6 @@ self: {
        ];
        description = "Bridge between xml-conduit/html-conduit and stylist";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-conduit-writer" = callPackage
@@ -265329,8 +245252,6 @@ self: {
        ];
        description = "Pure-Haskell utilities for dealing with XML with the enumerator package. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-enumerator-combinators" = callPackage
@@ -265348,8 +245269,6 @@ self: {
        ];
        description = "Parser combinators for xml-enumerator and compatible XML parsers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-extractors" = callPackage
@@ -265410,8 +245329,6 @@ self: {
        ];
        description = "Optics for xml-conduit and html-conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-html-qq" = callPackage
@@ -265479,23 +245396,6 @@ self: {
      }) {};
 
   "xml-lens" = callPackage
-    ({ mkDerivation, base, case-insensitive, containers, lens, text
-     , xml-conduit
-     }:
-     mkDerivation {
-       pname = "xml-lens";
-       version = "0.1.6.3";
-       sha256 = "1s5ivi3caz56g5yyg3pharshs3wcygcssjx1sm9aw4mv3ylz3msd";
-       revision = "2";
-       editedCabalFile = "1phba1j6ggxfsq4ivhd5wibzw1b9hwppqmgichyj3xg9z3widmnl";
-       libraryHaskellDepends = [
-         base case-insensitive containers lens text xml-conduit
-       ];
-       description = "Lenses, traversals, and prisms for xml-conduit";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "xml-lens_0_2" = callPackage
     ({ mkDerivation, base, case-insensitive, containers, lens, text
      , xml-conduit
      }:
@@ -265510,7 +245410,6 @@ self: {
        ];
        description = "Lenses, traversals, and prisms for xml-conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-monad" = callPackage
@@ -265525,8 +245424,6 @@ self: {
        ];
        description = "Monadic extensions to the xml package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-parsec" = callPackage
@@ -265538,8 +245435,6 @@ self: {
        libraryHaskellDepends = [ base HaXml parsec ];
        description = "Parsing XML with Parsec";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-picklers" = callPackage
@@ -265568,8 +245463,6 @@ self: {
        libraryHaskellDepends = [ base bytestring papillon simple-pipe ];
        description = "XML parser which uses simple-pipe";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-prettify" = callPackage
@@ -265584,8 +245477,6 @@ self: {
        executableHaskellDepends = [ base cmdargs unix ];
        description = "Pretty print XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-push" = callPackage
@@ -265606,8 +245497,6 @@ self: {
        ];
        description = "Push XML from/to client to/from server over XMPP or HTTP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-query" = callPackage
@@ -265619,8 +245508,6 @@ self: {
        libraryHaskellDepends = [ base-prelude free text ];
        description = "A parser-agnostic declarative API for querying XML-documents";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-query-xml-conduit" = callPackage
@@ -265637,8 +245524,6 @@ self: {
        ];
        description = "A binding for the \"xml-query\" and \"xml-conduit\" libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-query-xml-types" = callPackage
@@ -265662,8 +245547,6 @@ self: {
        ];
        description = "An interpreter of \"xml-query\" queries for the \"xml-types\" documents";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-to-json" = callPackage
@@ -265720,8 +245603,6 @@ self: {
        ];
        description = "Typed XML encoding for an xml-conduit backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-tydom-core" = callPackage
@@ -265733,8 +245614,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl QuickCheck text ];
        description = "Typed XML encoding (core library)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml-types" = callPackage
@@ -265786,8 +245665,6 @@ self: {
        ];
        description = "translate xml to json";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xml2x" = callPackage
@@ -265806,8 +245683,6 @@ self: {
        ];
        description = "Convert BLAST output in XML format to CSV or HTML";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xmlbf" = callPackage
@@ -265849,8 +245724,6 @@ self: {
        ];
        description = "xeno backend support for the xmlbf library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xmlbf-xmlhtml" = callPackage
@@ -265941,8 +245814,6 @@ self: {
        ];
        description = "Show tv channels in the terminal";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xmms2-client" = callPackage
@@ -265959,8 +245830,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An XMMS2 client library";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xmms2-client-glib" = callPackage
@@ -265973,8 +245842,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An XMMS2 client library — GLib integration";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xmobar" = callPackage
@@ -266067,33 +245934,9 @@ self: {
        ];
        description = "A tiling window manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xmonad-contrib" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory
-     , extensible-exceptions, filepath, mtl, old-locale, old-time
-     , process, random, semigroups, unix, utf8-string, X11, X11-xft
-     , xmonad
-     }:
-     mkDerivation {
-       pname = "xmonad-contrib";
-       version = "0.15";
-       sha256 = "0r9yzgy67j4mi3dyxx714f0ssk5qzca5kh4zw0fhiz1pf008cxms";
-       revision = "1";
-       editedCabalFile = "15r1mlqs1axh1dp4fqqb54xj3zns47nrvlf2xp5jg5jq51z03xpf";
-       libraryHaskellDepends = [
-         base bytestring containers directory extensible-exceptions filepath
-         mtl old-locale old-time process random semigroups unix utf8-string
-         X11 X11-xft xmonad
-       ];
-       description = "Third party extensions for xmonad";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {};
-
-  "xmonad-contrib_0_16" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory
      , extensible-exceptions, filepath, mtl, old-locale, old-time
      , process, random, semigroups, unix, utf8-string, X11, X11-xft
@@ -266110,7 +245953,6 @@ self: {
        ];
        description = "Third party extensions for xmonad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
@@ -266130,8 +245972,6 @@ self: {
        ];
        description = "Third party extensions for xmonad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xmonad-contrib-gpl" = callPackage
@@ -266143,8 +245983,6 @@ self: {
        libraryHaskellDepends = [ base mtl xmonad xmonad-contrib ];
        description = "Third party extensions for xmonad";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xmonad-entryhelper" = callPackage
@@ -266177,8 +246015,6 @@ self: {
        ];
        description = "Module for evaluation Haskell expressions in the running xmonad instance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xmonad-extras" = callPackage
@@ -266256,8 +246092,6 @@ self: {
        testHaskellDepends = [ base hspec xmonad ];
        description = "Custom xmonad, which builds with stack or cabal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xmonad-volume" = callPackage
@@ -266303,8 +246137,6 @@ self: {
        ];
        description = "A library to automatically put named windows into the DynamicLog";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xmpipe" = callPackage
@@ -266321,8 +246153,6 @@ self: {
        ];
        description = "XMPP implementation using simple-PIPE";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xorshift" = callPackage
@@ -266381,8 +246211,6 @@ self: {
        ];
        description = "text builder for xournal file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xournal-convert" = callPackage
@@ -266404,8 +246232,6 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        description = "convert utility for xoj files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xournal-parser" = callPackage
@@ -266425,8 +246251,6 @@ self: {
        ];
        description = "Xournal file parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xournal-render" = callPackage
@@ -266444,8 +246268,6 @@ self: {
        ];
        description = "Xournal file renderer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xournal-types" = callPackage
@@ -266463,8 +246285,6 @@ self: {
        ];
        description = "Data types for programs for xournal file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xpathdsv" = callPackage
@@ -266545,8 +246365,6 @@ self: {
        ];
        description = "Cluster EST sequences";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xsd" = callPackage
@@ -266563,8 +246381,6 @@ self: {
        ];
        description = "XML Schema data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xsha1" = callPackage
@@ -266588,8 +246404,6 @@ self: {
        librarySystemDepends = [ xslt ];
        description = "Binding to libxslt";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {xslt = null;};
 
   "xss-sanitize" = callPackage
@@ -266622,8 +246436,6 @@ self: {
        libraryHaskellDepends = [ base wx wxcore ];
        description = "eXtended & Typed Controls for wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xtest" = callPackage
@@ -266668,8 +246480,6 @@ self: {
        ];
        description = "A Haskell implementation of the xxHash algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xxhash-ffi" = callPackage
@@ -266706,8 +246516,6 @@ self: {
        ];
        description = "#plaimi's all-encompassing bot";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yabi" = callPackage
@@ -266741,8 +246549,6 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec ];
        description = "Yet Another Brainfuck Interpreter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yackage" = callPackage
@@ -266766,8 +246572,6 @@ self: {
        ];
        description = "Personal Hackage replacement for testing new packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yahoo-finance-api" = callPackage
@@ -266789,8 +246593,6 @@ self: {
        ];
        description = "Read quotes from Yahoo Finance API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yahoo-finance-conduit" = callPackage
@@ -266806,8 +246608,6 @@ self: {
        ];
        description = "Streaming aproach to the yahoo finance api";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yahoo-web-search" = callPackage
@@ -266819,8 +246619,6 @@ self: {
        libraryHaskellDepends = [ base HTTP network xml ];
        description = "Yahoo Web Search Services";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yajl" = callPackage
@@ -266834,8 +246632,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings for YAJL, an event-based JSON implementation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) yajl;};
 
   "yajl-enumerator" = callPackage
@@ -266851,8 +246647,6 @@ self: {
        ];
        description = "Enumerator-based interface to YAJL, an event-based JSON implementation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yak" = callPackage
@@ -266913,8 +246707,6 @@ self: {
        ];
        description = "A wrapper of servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yam-app" = callPackage
@@ -266971,8 +246763,6 @@ self: {
        ];
        description = "Yam DataSource Middleware";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yam-job" = callPackage
@@ -266983,8 +246773,6 @@ self: {
        sha256 = "0c6frqjf3xhd5bksaz6rvd6qbqbj15y441476dgj2asm2yd64895";
        libraryHaskellDepends = [ base cron yam-app ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yam-logger" = callPackage
@@ -267016,8 +246804,6 @@ self: {
        ];
        description = "Yam Redis Middleware";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yam-servant" = callPackage
@@ -267034,8 +246820,6 @@ self: {
          servant-swagger-ui swagger2 text wai wai-extra warp yam-app yam-job
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yam-transaction" = callPackage
@@ -267068,8 +246852,6 @@ self: {
          base containers persistent-odbc yam-app
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yam-transaction-postgresql" = callPackage
@@ -267113,8 +246895,6 @@ self: {
        ];
        description = "Yam Web";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yamemo" = callPackage
@@ -267176,8 +246956,6 @@ self: {
        ];
        description = "YAML parsing combinators for improved validation and error reporting";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yaml-config" = callPackage
@@ -267236,8 +247014,6 @@ self: {
        testHaskellDepends = [ base hspec microlens-platform rio ];
        description = "Extra functionality for pretty printing Yaml documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yaml-rpc" = callPackage
@@ -267256,8 +247032,6 @@ self: {
        ];
        description = "Simple library for network (HTTP REST-like) YAML RPC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yaml-rpc-scotty" = callPackage
@@ -267274,8 +247048,6 @@ self: {
        ];
        description = "Scotty server backend for yaml-rpc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yaml-rpc-snap" = callPackage
@@ -267292,8 +247064,6 @@ self: {
        ];
        description = "Snap server backend for yaml-rpc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yaml-union" = callPackage
@@ -267339,8 +247109,6 @@ self: {
        ];
        description = "Generate OWL schema from YAML syntax, and an RDFa template";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yamlkeysdiff" = callPackage
@@ -267374,8 +247142,6 @@ self: {
        libraryHaskellDepends = [ base blank-canvas stm time Yampa ];
        description = "blank-canvas frontend for Yampa";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yampa-glfw" = callPackage
@@ -267393,8 +247159,6 @@ self: {
        ];
        description = "Connects GLFW-b (GLFW 3+) with the Yampa FRP library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yampa-gloss" = callPackage
@@ -267408,8 +247172,6 @@ self: {
        libraryHaskellDepends = [ base gloss Yampa ];
        description = "A GLOSS backend for Yampa";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yampa-glut" = callPackage
@@ -267427,8 +247189,6 @@ self: {
        ];
        description = "Connects Yampa and GLUT";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yampa-sdl2" = callPackage
@@ -267447,8 +247207,6 @@ self: {
        ];
        description = "Yampa and SDL2 made easy";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yampa-test" = callPackage
@@ -267467,8 +247225,6 @@ self: {
        ];
        description = "Testing library for Yampa";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yampa2048" = callPackage
@@ -267482,8 +247238,6 @@ self: {
        executableHaskellDepends = [ base gloss random Yampa ];
        description = "2048 game clone using Yampa/Gloss";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yandex-translate" = callPackage
@@ -267501,8 +247255,6 @@ self: {
        ];
        description = "Bindings to Yandex translate API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yaop" = callPackage
@@ -267516,8 +247268,6 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Yet another option parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yap" = callPackage
@@ -267529,8 +247279,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "yet another prelude - a simplistic refactoring with algebraic classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yarn-lock" = callPackage
@@ -267552,8 +247300,6 @@ self: {
        ];
        description = "Represent and parse yarn.lock files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yarn2nix" = callPackage
@@ -267607,8 +247353,6 @@ self: {
        ];
        description = "Yet another array library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yarr-image-io" = callPackage
@@ -267621,8 +247365,6 @@ self: {
        librarySystemDepends = [ libdevil ];
        description = "Image IO for Yarr library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libdevil;};
 
   "yate" = callPackage
@@ -267642,8 +247384,6 @@ self: {
        ];
        description = "Yet Another Template Engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yavie" = callPackage
@@ -267663,8 +247403,6 @@ self: {
        executableHaskellDepends = [ base Cabal directory process ];
        description = "yet another visual editor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yaya" = callPackage
@@ -267683,8 +247421,6 @@ self: {
        ];
        description = "Total recursion schemes";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yaya-hedgehog" = callPackage
@@ -267696,8 +247432,6 @@ self: {
        libraryHaskellDepends = [ base deriving-compat hedgehog yaya ];
        description = "Hedgehog testing support for the Yaya recursion scheme library";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yaya-unsafe" = callPackage
@@ -267713,8 +247447,6 @@ self: {
        ];
        description = "Non-total extensions to the Yaya recursion scheme library";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ycextra" = callPackage
@@ -267729,8 +247461,6 @@ self: {
        ];
        description = "Additional utilities to work with Yhc Core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yeamer" = callPackage
@@ -267766,8 +247496,6 @@ self: {
        ];
        description = "Yesod-based server for interactive presentation slides";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yeganesh" = callPackage
@@ -267811,8 +247539,6 @@ self: {
        ];
        description = "A Yeller Client For Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yes-precure5-command" = callPackage
@@ -267904,8 +247630,6 @@ self: {
        ];
        description = "YesQL-style SQL database abstraction (postgresql-simple backend)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod_1_4_5" = callPackage
@@ -267982,8 +247706,6 @@ self: {
        ];
        description = "Angular JS integratoin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-angular-ui" = callPackage
@@ -268003,8 +247725,6 @@ self: {
        ];
        description = "Angular Helpers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-articles" = callPackage
@@ -268027,8 +247747,6 @@ self: {
        ];
        description = "Automatically generate article previews for a yesod site";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth" = callPackage
@@ -268044,8 +247762,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth";
-       version = "1.6.8.1";
-       sha256 = "1zpmcywc8qkx93y05r8zgzds8wj5sg6b5jhzi17g6fwnaha2i1qj";
+       version = "1.6.9";
+       sha256 = "0x843l5z03a563i8nc2x9c6afw213chblm7ldd7yxn5g110h5ybx";
        libraryHaskellDepends = [
          aeson authenticate base base16-bytestring base64-bytestring binary
          blaze-builder blaze-html blaze-markup bytestring conduit
@@ -268079,8 +247797,6 @@ self: {
        ];
        description = "An account authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-account-fork" = callPackage
@@ -268105,8 +247821,6 @@ self: {
        ];
        description = "An account authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-basic" = callPackage
@@ -268123,8 +247837,6 @@ self: {
        testHaskellDepends = [ base hlint hspec text yesod yesod-test ];
        description = "Yesod Middleware for HTTP Basic Authentication";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-bcrypt" = callPackage
@@ -268141,8 +247853,6 @@ self: {
        ];
        description = "BCrypt salted and hashed passwords in a database as auth for yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-bcryptdb" = callPackage
@@ -268159,8 +247869,6 @@ self: {
        ];
        description = "Authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-deskcom" = callPackage
@@ -268182,8 +247890,6 @@ self: {
        ];
        description = "Desk.com remote authentication support for Yesod apps.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-fb" = callPackage
@@ -268201,8 +247907,6 @@ self: {
        ];
        description = "Authentication backend for Yesod using Facebook";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-hashdb" = callPackage
@@ -268246,8 +247950,6 @@ self: {
        ];
        description = "An account authentication plugin for yesod with encrypted token transfer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-kerberos" = callPackage
@@ -268265,8 +247967,6 @@ self: {
        ];
        description = "Kerberos Authentication for Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-ldap" = callPackage
@@ -268283,8 +247983,6 @@ self: {
        ];
        description = "LDAP Authentication for Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-ldap-mediocre" = callPackage
@@ -268300,8 +247998,6 @@ self: {
        ];
        description = "Very simlple LDAP auth for yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-ldap-native" = callPackage
@@ -268319,8 +248015,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Yesod LDAP authentication plugin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-nopassword" = callPackage
@@ -268337,8 +248031,6 @@ self: {
        ];
        description = "A plugin for Yesod to provide email-only authentication";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-oauth" = callPackage
@@ -268391,8 +248083,6 @@ self: {
        ];
        description = "Provides PAM authentication module";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-smbclient" = callPackage
@@ -268409,8 +248099,6 @@ self: {
        ];
        description = "Authentication plugin for Yesod using smbclient";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-auth-zendesk" = callPackage
@@ -268429,8 +248117,6 @@ self: {
        ];
        description = "Zendesk remote authentication support for Yesod apps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-bin" = callPackage
@@ -268474,8 +248160,6 @@ self: {
        ];
        description = "Bootstrap widgets for yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-colonnade" = callPackage
@@ -268512,8 +248196,6 @@ self: {
        ];
        description = "A generic comments interface for a Yesod application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-content-pdf" = callPackage
@@ -268535,8 +248217,6 @@ self: {
        ];
        description = "PDF Content Type for Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-continuations" = callPackage
@@ -268555,8 +248235,6 @@ self: {
        ];
        description = "Continuations for Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-core_1_4_37_3" = callPackage
@@ -268656,8 +248334,6 @@ self: {
        ];
        description = "Generic administrative CRUD operations as a Yesod subsite";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-crud-persist" = callPackage
@@ -268676,8 +248352,6 @@ self: {
        ];
        description = "Flexible CRUD subsite usable with Yesod and Persistent";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-csp" = callPackage
@@ -268725,8 +248399,6 @@ self: {
        ];
        description = "Yesod plugin for DataTables (jQuery grid plugin)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-default" = callPackage
@@ -268764,8 +248436,6 @@ self: {
        ];
        description = "DSL for generating Yesod subsite to manage an RDBMS;";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-elements" = callPackage
@@ -268818,8 +248488,6 @@ self: {
        executableSystemDepends = [ sqlite ];
        description = "Example programs using the Yesod Web Framework. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) sqlite;};
 
   "yesod-fast-devel" = callPackage
@@ -268841,8 +248509,6 @@ self: {
        ];
        description = "Fast live-reloading for yesod applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-fay" = callPackage
@@ -268862,8 +248528,6 @@ self: {
        ];
        description = "Utilities for using the Fay Haskell-to-JS compiler with Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-fb" = callPackage
@@ -269012,8 +248676,6 @@ self: {
        ];
        description = "Various rich-text WYSIWYG editors for Yesod forms";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-gitrepo" = callPackage
@@ -269045,8 +248707,6 @@ self: {
        testHaskellDepends = [ base yesod-core ];
        description = "A subsite for displaying git information";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-goodies" = callPackage
@@ -269063,8 +248723,6 @@ self: {
        ];
        description = "A collection of various small helpers useful in any yesod application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-ip" = callPackage
@@ -269083,8 +248741,6 @@ self: {
        ];
        description = "Code for using the ip package with yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-job-queue" = callPackage
@@ -269106,8 +248762,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Background jobs library for Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-json" = callPackage
@@ -269130,8 +248784,6 @@ self: {
        libraryHaskellDepends = [ base text yesod-core ];
        description = "A typeclass which simplifies creating link widgets throughout your site";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-lucid" = callPackage
@@ -269143,8 +248795,6 @@ self: {
        libraryHaskellDepends = [ base lucid monads-tf text yesod-core ];
        description = "Lucid support for Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-mangopay" = callPackage
@@ -269164,8 +248814,6 @@ self: {
        ];
        description = "Yesod library for MangoPay API access";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-markdown" = callPackage
@@ -269203,22 +248851,6 @@ self: {
      }) {};
 
   "yesod-newsfeed" = callPackage
-    ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
-     , containers, shakespeare, text, time, xml-conduit, yesod-core
-     }:
-     mkDerivation {
-       pname = "yesod-newsfeed";
-       version = "1.6.1.0";
-       sha256 = "05cnyz9g76hnfmhqfav16mghr0x42fqnz1zi0ki4bjkl5mcrf2vd";
-       libraryHaskellDepends = [
-         base blaze-html blaze-markup bytestring containers shakespeare text
-         time xml-conduit yesod-core
-       ];
-       description = "Helper functions and data types for producing News feeds";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-newsfeed_1_7_0_0" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
      , containers, shakespeare, text, time, xml-conduit, yesod-core
      }:
@@ -269232,7 +248864,6 @@ self: {
        ];
        description = "Helper functions and data types for producing News feeds";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-paginate" = callPackage
@@ -269244,8 +248875,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell yesod ];
        description = "Pagination for Yesod sites";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-pagination" = callPackage
@@ -269264,8 +248893,6 @@ self: {
        ];
        description = "Pagination in Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-paginator" = callPackage
@@ -269302,8 +248929,6 @@ self: {
        ];
        description = "Yesod plugin to use PayPal with the paypal-rest-client library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-persistent_1_4_3" = callPackage
@@ -269416,8 +249041,6 @@ self: {
        ];
        description = "Meta package for Yesod (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-pnotify" = callPackage
@@ -269438,8 +249061,6 @@ self: {
        ];
        description = "Yet another getMessage/setMessage using pnotify jquery plugins";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-pure" = callPackage
@@ -269451,8 +249072,6 @@ self: {
        libraryHaskellDepends = [ base fast-logger text yesod yesod-core ];
        description = "Yesod in pure Haskell: no Template Haskell or QuasiQuotes (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-purescript" = callPackage
@@ -269472,8 +249091,6 @@ self: {
        ];
        description = "PureScript integration for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-raml" = callPackage
@@ -269497,8 +249114,6 @@ self: {
        ];
        description = "RAML style route definitions for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-raml-bin" = callPackage
@@ -269521,8 +249136,6 @@ self: {
        ];
        description = "The raml helper executable";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-raml-docs" = callPackage
@@ -269539,8 +249152,6 @@ self: {
        ];
        description = "A html documentation generator library for RAML";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-raml-mock" = callPackage
@@ -269564,8 +249175,6 @@ self: {
        ];
        description = "A mock-handler generator library from RAML";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-recaptcha" = callPackage
@@ -269584,8 +249193,6 @@ self: {
        ];
        description = "Dead simple support for reCAPTCHA on Yesod applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-recaptcha2" = callPackage
@@ -269623,8 +249230,6 @@ self: {
        ];
        description = "Efficient routing for Yesod. (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-routes-flow" = callPackage
@@ -269641,8 +249246,6 @@ self: {
        ];
        description = "Generate Flow routes for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-routes-typescript" = callPackage
@@ -269659,8 +249262,6 @@ self: {
        ];
        description = "generate TypeScript routes for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-rst" = callPackage
@@ -269677,8 +249278,6 @@ self: {
        ];
        description = "Tools for using reStructuredText (RST) in a yesod application";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-s3" = callPackage
@@ -269695,8 +249294,6 @@ self: {
        ];
        description = "Simple Helper Library for using Amazon's Simple Storage Service (S3) with Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-sass" = callPackage
@@ -269713,8 +249310,6 @@ self: {
        ];
        description = "A simple quasiquoter to include sass code in yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-session-redis" = callPackage
@@ -269732,8 +249327,6 @@ self: {
        ];
        description = "Redis-Powered Sessions for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-sitemap" = callPackage
@@ -269842,8 +249435,6 @@ self: {
        ];
        description = "Yesod generators for embedding AngularJs code into yesod-static at compile time";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-static-remote" = callPackage
@@ -269860,8 +249451,6 @@ self: {
        ];
        testHaskellDepends = [ base yesod-static ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-table" = callPackage
@@ -269961,8 +249550,6 @@ self: {
        ];
        description = "Utility functions for testing JSON web services written in Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-text-markdown" = callPackage
@@ -269995,8 +249582,6 @@ self: {
        ];
        description = "Provides main functions using warp-tls for yesod projects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-transloadit" = callPackage
@@ -270041,8 +249626,6 @@ self: {
        ];
        description = "Simple CRUD classes for easy view creation for Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yesod-websockets" = callPackage
@@ -270090,8 +249673,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yet-another-logger" = callPackage
@@ -270123,8 +249704,6 @@ self: {
        ];
        description = "Yet Another Logger";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yggdrasil" = callPackage
@@ -270141,8 +249720,6 @@ self: {
        testHaskellDepends = [ base cryptonite hspec QuickCheck ];
        description = "Executable specifications of composable cryptographic protocols";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yhccore" = callPackage
@@ -270154,8 +249731,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl pretty uniplate ];
        description = "Yhc's Internal Core language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yhseq" = callPackage
@@ -270191,8 +249766,6 @@ self: {
        ];
        description = "Yi editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-contrib" = callPackage
@@ -270211,8 +249784,6 @@ self: {
        ];
        description = "Add-ons to Yi, the Haskell-Scriptable Editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-core" = callPackage
@@ -270243,8 +249814,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq yi-rope ];
        description = "Yi editor core library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-dynamic-configuration" = callPackage
@@ -270261,8 +249830,6 @@ self: {
        ];
        description = "Dynamic configuration support for Yi";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-emacs-colours" = callPackage
@@ -270274,8 +249841,6 @@ self: {
        libraryHaskellDepends = [ base containers split yi-language ];
        description = "Simple mapping from colour names used in emacs to Color";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-frontend-pango" = callPackage
@@ -270295,8 +249860,6 @@ self: {
        ];
        description = "Pango frontend for Yi editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-frontend-vty" = callPackage
@@ -270314,8 +249877,6 @@ self: {
        ];
        description = "Vty frontend for Yi editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-fuzzy-open" = callPackage
@@ -270334,8 +249895,6 @@ self: {
        ];
        description = "Fuzzy open plugin for yi";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-gtk" = callPackage
@@ -270363,8 +249922,6 @@ self: {
        ];
        description = "Yi editor incremental reader";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-keymap-cua" = callPackage
@@ -270380,8 +249937,6 @@ self: {
        ];
        description = "Cua keymap for Yi editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-keymap-emacs" = callPackage
@@ -270399,8 +249954,6 @@ self: {
        ];
        description = "Emacs keymap for Yi editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-keymap-vim" = callPackage
@@ -270427,8 +249980,6 @@ self: {
        ];
        description = "Vim keymap for Yi editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-language" = callPackage
@@ -270456,8 +250007,6 @@ self: {
        ];
        description = "Collection of language-related Yi libraries";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-misc-modes" = callPackage
@@ -270475,8 +250024,6 @@ self: {
        libraryToolDepends = [ alex ];
        description = "Yi editor miscellaneous modes";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-mode-haskell" = callPackage
@@ -270494,8 +250041,6 @@ self: {
        libraryToolDepends = [ alex ];
        description = "Yi editor haskell mode";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-mode-javascript" = callPackage
@@ -270514,8 +250059,6 @@ self: {
        libraryToolDepends = [ alex ];
        description = "Yi editor javascript mode";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-monokai" = callPackage
@@ -270527,8 +250070,6 @@ self: {
        libraryHaskellDepends = [ base yi ];
        description = "Monokai colour theme for the Yi text editor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-rope" = callPackage
@@ -270568,8 +250109,6 @@ self: {
        ];
        description = "Snippet support for yi";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-solarized" = callPackage
@@ -270581,8 +250120,6 @@ self: {
        libraryHaskellDepends = [ base yi ];
        description = "Solarized colour theme for the Yi text editor";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-spolsky" = callPackage
@@ -270594,8 +250131,6 @@ self: {
        libraryHaskellDepends = [ base yi ];
        description = "Spolsky colour theme for the Yi text editor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yi-vty" = callPackage
@@ -270619,8 +250154,6 @@ self: {
        libraryHaskellDepends = [ base parsec process ];
        description = "Haskell programming interface to Yices SMT solver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yices-easy" = callPackage
@@ -270693,8 +250226,6 @@ self: {
        executableHaskellDepends = [ hsConfigure ];
        description = "CUI FTP client like 'ftp', 'ncftp'";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yjftp-libs" = callPackage
@@ -270708,8 +250239,6 @@ self: {
        libraryHaskellDepends = [ base directory ftphs mtl process unix ];
        description = "CUI FTP client like 'ftp', 'ncftp'";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yjsvg" = callPackage
@@ -270772,8 +250301,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Parser combinators for young padawans";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yoga" = callPackage
@@ -270806,8 +250333,6 @@ self: {
        ];
        description = "Generic Programming with Disbanded Data Types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "york-lava" = callPackage
@@ -270819,8 +250344,6 @@ self: {
        libraryHaskellDepends = [ base containers haskell98 ];
        description = "A library for digital circuit description";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "youtube" = callPackage
@@ -270861,8 +250384,6 @@ self: {
        ];
        description = "A YQL engine to execute Open Data Tables";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yst" = callPackage
@@ -270885,8 +250406,6 @@ self: {
        ];
        description = "Builds a static website from templates and data in YAML or CSV files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yu-auth" = callPackage
@@ -270913,8 +250432,6 @@ self: {
        testHaskellDepends = [ base blaze-markup hspec yu-utils ];
        description = "The core of Yu";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yu-launch" = callPackage
@@ -270930,8 +250447,6 @@ self: {
        ];
        description = "The launcher for Yu";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yu-tool" = callPackage
@@ -270949,8 +250464,6 @@ self: {
        ];
        description = "Tool for Yu";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yu-utils" = callPackage
@@ -271009,8 +250522,6 @@ self: {
        ];
        description = "A transcendental HTML parser gently wrapping the HXT library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yx" = callPackage
@@ -271023,8 +250534,6 @@ self: {
        testHaskellDepends = [ array base bytestring hspec mtl ];
        description = "Row-major coordinates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "yxdb-utils" = callPackage
@@ -271063,8 +250572,6 @@ self: {
        ];
        description = "Utilities for reading and writing Alteryx .yxdb files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "z3" = callPackage
@@ -271082,8 +250589,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Bindings for the Z3 Theorem Prover";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {gomp = null; inherit (pkgs) z3;};
 
   "z3-encoding" = callPackage
@@ -271096,8 +250601,6 @@ self: {
        testHaskellDepends = [ base containers hspec z3 ];
        description = "High-level assertion encoding to Z3 solver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "z85" = callPackage
@@ -271121,8 +250624,6 @@ self: {
        ];
        description = "Implementation of the z85 binary codec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zabt" = callPackage
@@ -271135,8 +250636,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hspec ];
        description = "Simple-minded abstract binding trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zalgo" = callPackage
@@ -271166,8 +250665,6 @@ self: {
        ];
        description = "A tool for checking how much work is done on group projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zasni-gerna" = callPackage
@@ -271179,8 +250676,6 @@ self: {
        libraryHaskellDepends = [ base papillon ];
        description = "lojban parser (zasni gerna)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zbar" = callPackage
@@ -271239,8 +250734,6 @@ self: {
        ];
        description = "Zendesk API for Haskell programming language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zenhack-prelude" = callPackage
@@ -271252,8 +250745,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "@zenhack's personal custom prelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zeno" = callPackage
@@ -271273,8 +250764,6 @@ self: {
        ];
        description = "An automated proof system for Haskell programs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zephyr" = callPackage
@@ -271311,8 +250800,6 @@ self: {
        ];
        description = "Zephyr tree shaking for PureScript Language";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zero" = callPackage
@@ -271363,8 +250850,6 @@ self: {
        ];
        description = "Bindings to ZeroMQ 2.1.x";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) zeromq;};
 
   "zeromq3-conduit" = callPackage
@@ -271381,8 +250866,6 @@ self: {
        ];
        description = "Conduit bindings for zeromq3-haskell";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zeromq3-haskell" = callPackage
@@ -271405,8 +250888,6 @@ self: {
        ];
        description = "Bindings to ZeroMQ 3.x";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) zeromq;};
 
   "zeromq4-clone-pattern" = callPackage
@@ -271433,8 +250914,6 @@ self: {
        ];
        description = "Haskell implementation of the ZeroMQ clone pattern";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zeromq4-conduit" = callPackage
@@ -271453,8 +250932,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Conduit wrapper around zeromq4-haskell";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zeromq4-haskell" = callPackage
@@ -271499,8 +250976,6 @@ self: {
        ];
        description = "Haskell implementation of several ZeroMQ patterns";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zeromq4-simple" = callPackage
@@ -271539,8 +251014,6 @@ self: {
        ];
        description = "ZeroTH - remove unnecessary TH dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zifter" = callPackage
@@ -271564,8 +251037,6 @@ self: {
        ];
        description = "zifter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zifter-cabal" = callPackage
@@ -271581,8 +251052,6 @@ self: {
        ];
        description = "zifter-cabal";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zifter-git" = callPackage
@@ -271594,8 +251063,6 @@ self: {
        libraryHaskellDepends = [ base path process zifter ];
        description = "zifter-git";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zifter-google-java-format" = callPackage
@@ -271611,8 +251078,6 @@ self: {
        ];
        description = "zifter-google-java-format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zifter-hindent" = callPackage
@@ -271628,8 +251093,6 @@ self: {
        ];
        description = "zifter-hindent";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zifter-hlint" = callPackage
@@ -271644,8 +251107,6 @@ self: {
        ];
        description = "zifter-hlint";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zifter-stack" = callPackage
@@ -271665,8 +251126,6 @@ self: {
        ];
        description = "zifter-stack";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zigbee-znet25" = callPackage
@@ -271683,8 +251142,6 @@ self: {
        testHaskellDepends = [ base bytestring mtl QuickCheck random ];
        description = "XBee ZNet 2.5 (ZigBee) wireless modem communications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zim-parser" = callPackage
@@ -271728,36 +251185,6 @@ self: {
      }) {};
 
   "zip" = callPackage
-    ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
-     , cereal, conduit, conduit-extra, containers, digest, directory
-     , dlist, exceptions, filepath, hspec, monad-control, mtl
-     , QuickCheck, resourcet, temporary, text, time, transformers
-     , transformers-base
-     }:
-     mkDerivation {
-       pname = "zip";
-       version = "1.2.0";
-       sha256 = "1jbxnbiizdklv0pw8f22h38xbmk6d4wggy27w8injdsfi18f27dn";
-       revision = "2";
-       editedCabalFile = "09ak8h11hm1jnpkvljradbj3a741s31k8cvyvwypr927khi5y9mp";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring bzlib-conduit case-insensitive cereal conduit
-         conduit-extra containers digest directory dlist exceptions filepath
-         monad-control mtl resourcet text time transformers
-         transformers-base
-       ];
-       executableHaskellDepends = [ base filepath ];
-       testHaskellDepends = [
-         base bytestring conduit containers directory dlist exceptions
-         filepath hspec QuickCheck temporary text time transformers
-       ];
-       description = "Operations on zip archives";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "zip_1_3_0" = callPackage
     ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
      , cereal, conduit, conduit-extra, containers, digest, directory
      , dlist, exceptions, filepath, hspec, monad-control, mtl
@@ -271783,7 +251210,6 @@ self: {
        ];
        description = "Operations on zip archives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zip-archive" = callPackage
@@ -271839,8 +251265,6 @@ self: {
        ];
        description = "Working with zip archives via conduits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zip-stream" = callPackage
@@ -271877,8 +251301,6 @@ self: {
        libraryHaskellDepends = [ base directory mtl process ];
        description = "Create simple list editor interfaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zipkin" = callPackage
@@ -271894,8 +251316,6 @@ self: {
        ];
        description = "Zipkin-style request tracing monad";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zipper" = callPackage
@@ -271957,8 +251377,6 @@ self: {
        ];
        description = "A type-safe client for the Ziptastic API for doing forward and reverse geocoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ziptastic-core" = callPackage
@@ -271978,8 +251396,6 @@ self: {
        ];
        description = "Core Servant specification for the Ziptastic API for doing forward and reverse geocoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zlib" = callPackage
@@ -272040,8 +251456,6 @@ self: {
        ];
        description = "Enumerator interface for zlib compression";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zlib-lens" = callPackage
@@ -272075,8 +251489,6 @@ self: {
        ];
        description = "Language independent, reproducible, absolute types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zmcat" = callPackage
@@ -272091,8 +251503,6 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Command-line tool for ZeroMQ";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zmidi-core" = callPackage
@@ -272121,8 +251531,6 @@ self: {
        ];
        description = "Representing MIDI a simple score";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zmqat" = callPackage
@@ -272152,8 +251560,6 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "ZoneInfo library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zoom" = callPackage
@@ -272172,8 +251578,6 @@ self: {
        ];
        description = "A rake/thor-like task runner written in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zoom-cache" = callPackage
@@ -272205,8 +251609,6 @@ self: {
        ];
        description = "A streamable, seekable, zoomable cache file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zoom-cache-pcm" = callPackage
@@ -272223,8 +251625,6 @@ self: {
        ];
        description = "Library for zoom-cache PCM audio codecs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zoom-cache-sndfile" = callPackage
@@ -272244,8 +251644,6 @@ self: {
        ];
        description = "Tools for generating zoom-cache-pcm files";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zoom-refs" = callPackage
@@ -272257,8 +251655,6 @@ self: {
        libraryHaskellDepends = [ base lens stm ];
        description = "Zoom (~ Functor) and pairing (~ Applicative) for mutable references";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zot" = callPackage
@@ -272303,8 +251699,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "ZRE protocol implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zsh-battery" = callPackage
@@ -272318,8 +251712,6 @@ self: {
        executableHaskellDepends = [ base directory filepath mtl ];
        description = "Ascii bars representing battery status";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zstd" = callPackage
@@ -272354,8 +251746,6 @@ self: {
        testHaskellDepends = [ base containers mtl multiset ];
        description = "Automated theorem prover for the Zsyntax biochemical calculus";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ztail" = callPackage
@@ -272435,8 +251825,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A lisp processor, An inline-lisp, in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zxcvbn-c" = callPackage

From 671db18e2221371e856e659d47842d96191fbbd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCtke-Stetzkamp?= <christian@lkamp.de>
Date: Sat, 8 Feb 2020 20:52:00 +0100
Subject: [PATCH 1797/4636] haskellPackages.hledger-flow: do not build static

Fixes #68840
---
 pkgs/development/haskell-modules/configuration-common.nix  | 7 +++++++
 .../haskell-modules/configuration-hackage2nix.yaml         | 1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index dcf858e61550..91e61abf1bc1 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1393,4 +1393,11 @@ self: super: {
   # See https://github.com/ekmett/perhaps/pull/5
   perhaps = doJailbreak super.perhaps;
 
+  # it wants to build a statically linked binary by default
+  hledger-flow = overrideCabal super.hledger-flow ( drv: {
+    postPatch = (drv.postPatch or "") + ''
+      substituteInPlace hledger-flow.cabal --replace "-static" ""
+    '';
+  });
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 4958a8bddc7e..95dbcea342e3 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -5719,7 +5719,6 @@ broken-packages:
   - HLearn-distributions
   - hledger-api
   - hledger-chart
-  - hledger-flow
   - hledger-irr
   - hledger-vty
   - hlibBladeRF

From b68c9dda98a2d108464e1e142b0e53ae97df79b5 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Mon, 10 Feb 2020 12:54:23 +0900
Subject: [PATCH 1798/4636] spago: 0.13.1 -> 0.14.0

---
 .../haskell-modules/configuration-common.nix  |  3 --
 .../configuration-hackage2nix.yaml            |  2 +-
 .../haskell-modules/configuration-nix.nix     | 16 +++---
 .../tools/purescript/spago/default.nix        | 53 ++++++++++++++++---
 .../tools/purescript/spago/spago.nix          | 10 ++--
 .../tools/purescript/spago/update.sh          |  7 ++-
 6 files changed, 67 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 91e61abf1bc1..723db5ab2794 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1068,9 +1068,6 @@ self: super: {
       };
   };
 
-  # Tests for dhall access the network.
-  dhall_1_27_0 = dontCheck super.dhall_1_27_0;
-
   # Missing test files in source distribution, fixed once 1.4.0 is bumped
   # https://github.com/dhall-lang/dhall-haskell/pull/997
   dhall-json =
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 95dbcea342e3..18db76ca3cf4 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2356,7 +2356,7 @@ extra-packages:
   - control-monad-free < 0.6            # newer versions don't compile with anything but GHC 7.8.x
   - dbus <1                             # for xmonad-0.26
   - deepseq == 1.3.0.1                  # required to build Cabal with GHC 6.12.3
-  - dhall == 1.27.0                     # required for spago 0.13.0.  Probably can be removed when next version of spago is available.
+  - dhall == 1.29.0                     # required for spago 0.14.0.
   - doctemplates == 0.8                 # required by pandoc-2.9.x
   - generic-deriving == 1.10.5.*        # new versions don't compile with GHC 7.10.x
   - gloss < 1.9.3                       # new versions don't compile with GHC 7.8.x
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index bc78409b3ec0..1c8775d6ca40 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -640,18 +640,22 @@ self: super: builtins.intersectAttrs super {
       # we can safely jailbreak spago and use the older directory package from
       # LTS-14.
       spagoWithOverrides = doJailbreak (super.spago.override {
-        # spago requires dhall_1_27_0.
-        dhall = self.dhall_1_27_0;
+        # spago requires dhall-1.29.0.
+        dhall = self.dhall_1_29_0;
       });
 
+      # This defines the version of the purescript-docs-search release we are using.
+      # This is defined in the src/Spago/Prelude.hs file in the spago source.
+      docsSearchVersion = "v0.0.8";
+
       docsSearchAppJsFile = pkgs.fetchurl {
-        url = "https://github.com/spacchetti/purescript-docs-search/releases/download/v0.0.5/docs-search-app.js";
-        sha256 = "11721x455qzh40vzfmralaynn9v8b5wix86r107hhs08vhryjib2";
+        url = "https://github.com/spacchetti/purescript-docs-search/releases/download/${docsSearchVersion}/docs-search-app.js";
+        sha256 = "00pzi7pgjicpa0mg0al80gh2q1q2lqiyb3kjarpydlmn8dfjny7v";
       };
 
       purescriptDocsSearchFile = pkgs.fetchurl {
-        url = "https://github.com/spacchetti/purescript-docs-search/releases/download/v0.0.5/purescript-docs-search";
-        sha256 = "16p1fmdvpwz1yswav8qjsd26c9airb22xncqw1rjnbd8lcpqx0p5";
+        url = "https://github.com/spacchetti/purescript-docs-search/releases/download/${docsSearchVersion}/purescript-docs-search";
+        sha256 = "1hsi1hc4p1z2xbw82w2jxmmczw6mravli1r89vrkivb72sqdjya7";
       };
 
       spagoFixHpack = overrideCabal spagoWithOverrides (drv: {
diff --git a/pkgs/development/tools/purescript/spago/default.nix b/pkgs/development/tools/purescript/spago/default.nix
index 2fc5efedb20b..f5720837d79e 100644
--- a/pkgs/development/tools/purescript/spago/default.nix
+++ b/pkgs/development/tools/purescript/spago/default.nix
@@ -1,14 +1,53 @@
-{ haskellPackages
-, haskell
+{ haskell
+, haskellPackages
 , lib
+, nodejs
+, purescript
+, runCommand
 }:
 
-haskell.lib.justStaticExecutables (haskell.lib.overrideCabal haskellPackages.spago (oldAttrs: {
-  maintainers = (oldAttrs.maintainers or []) ++ [
-    lib.maintainers.cdepillabout
-  ];
+let
+  spago =
+    haskell.lib.justStaticExecutables
+      (haskell.lib.overrideCabal haskellPackages.spago (oldAttrs: {
+        maintainers = (oldAttrs.maintainers or []) ++ [
+          lib.maintainers.cdepillabout
+        ];
+      }));
+in
 
+spago.overrideAttrs (oldAttrs: {
   passthru = (oldAttrs.passthru or {}) // {
     updateScript = ./update.sh;
+
+    # These tests can be run with the following command.  The tests access the
+    # network, so they cannot be run in the nix sandbox.  sudo is needed in
+    # order to change the sandbox option.
+    #
+    # $ sudo nix-build -A spago.passthru.tests --option sandbox relaxed
+    #
+    tests =
+      runCommand
+        "spago-tests"
+        {
+          __noChroot = true;
+          nativeBuildInputs = [
+            nodejs
+            purescript
+            spago
+          ];
+        }
+        ''
+          # spago expects HOME to be set because it creates a cache file under
+          # home.
+          HOME=$(pwd)
+
+          spago --verbose init
+          spago --verbose build
+          spago --verbose test
+
+          touch $out
+        '';
   };
-}))
+})
+
diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix
index 1a7ec35748ba..adf019eef572 100644
--- a/pkgs/development/tools/purescript/spago/spago.nix
+++ b/pkgs/development/tools/purescript/spago/spago.nix
@@ -11,11 +11,11 @@
 }:
 mkDerivation {
   pname = "spago";
-  version = "0.13.1";
+  version = "0.14.0";
   src = fetchgit {
-    url = "https://github.com/spacchetti/spago.git";
-    sha256 = "0l6sy1hz5dbnrjkvb2f44afhd48nwqx5kx1h29ns93xbbd57hci8";
-    rev = "b87858609c671d8f3dc78f858ce1d8c492bd1062";
+    url = "https://github.com/purescript/spago.git";
+    sha256 = "12i1430prqspy73nwfxc17zf51yprhrxxcnhw4rks6jhkgwxf4a4";
+    rev = "7a99343e4876a465600eaa64b0697a9f0b2a49a9";
     fetchSubmodules = true;
   };
   isLibrary = true;
@@ -42,6 +42,6 @@ mkDerivation {
   ];
   testToolDepends = [ hspec-discover ];
   prePatch = "hpack";
-  homepage = "https://github.com/spacchetti/spago#readme";
+  homepage = "https://github.com/purescript/spago#readme";
   license = stdenv.lib.licenses.bsd3;
 }
diff --git a/pkgs/development/tools/purescript/spago/update.sh b/pkgs/development/tools/purescript/spago/update.sh
index 00c9c6d85f1d..74bc01050662 100755
--- a/pkgs/development/tools/purescript/spago/update.sh
+++ b/pkgs/development/tools/purescript/spago/update.sh
@@ -20,11 +20,14 @@ spago_derivation_file="${script_dir}/spago.nix"
 old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$spago_derivation_file")"
 
 # This is the latest release version of spago on GitHub.
-new_version=$(curl --silent "https://api.github.com/repos/spacchetti/spago/releases" | jq '.[0].tag_name' --raw-output)
+new_version=$(curl --silent "https://api.github.com/repos/purescript/spago/releases" | jq '.[0].tag_name' --raw-output)
 
 echo "Updating spago from old version $old_version to new version $new_version."
 echo "Running cabal2nix and outputting to ${spago_derivation_file}..."
 
-cabal2nix --revision "$new_version" "https://github.com/spacchetti/spago.git" > "$spago_derivation_file"
+cabal2nix --revision "$new_version" "https://github.com/purescript/spago.git" > "$spago_derivation_file"
+
+# TODO: This should ideally also automatically update the docsSearchVersion
+# from pkgs/development/haskell/configuration-nix.nix.
 
 echo "Finished."

From b6f45d056a8dbce4303f93dd158c6b0b6416ca3c Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Tue, 11 Feb 2020 10:52:47 +0900
Subject: [PATCH 1799/4636] haskellPackages.cabal-plan: fix up ansi-terminal
 dep

---
 pkgs/development/haskell-modules/configuration-common.nix | 8 +++++++-
 .../haskell-modules/configuration-hackage2nix.yaml        | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 723db5ab2794..d21ebe11fea5 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1254,7 +1254,13 @@ self: super: {
   });
 
   # The LTS-14.x version of their dependencies are too old.
-  cabal-plan = super.cabal-plan.overrideScope (self: super: { optparse-applicative = self.optparse-applicative_0_15_1_0; ansi-terminal = self.ansi-terminal_0_10_2; base-compat = self.base-compat_0_11_1; semialign = self.semialign_1_1; time-compat = doJailbreak super.time-compat; });
+  cabal-plan = super.cabal-plan.overrideScope (self: super: {
+    optparse-applicative = self.optparse-applicative_0_15_1_0;
+    ansi-terminal = self.ansi-terminal_0_10_3;
+    base-compat = self.base-compat_0_11_1;
+    semialign = self.semialign_1_1;
+    time-compat = doJailbreak super.time-compat;
+  });
   hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_23_0; };
 
   # Version bounds for http-client are too strict:
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 18db76ca3cf4..31c7d2b8a76a 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2341,6 +2341,7 @@ default-package-overrides:
 
 extra-packages:
   - aeson < 0.8                         # newer versions don't work with GHC 7.6.x or earlier
+  - ansi-terminal == 0.10.3             # required by cabal-plan, and policeman in ghc-8.8.x
   - aeson-pretty < 0.8                  # required by elm compiler
   - apply-refact < 0.4                  # newer versions don't work with GHC 8.0.x
   - aws ^>= 0.18                        # pre-lts-11.x versions neeed by git-annex 6.20180227

From 025faad9a9d35b15e00dc0d0f1a5b5282378c87e Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Tue, 11 Feb 2020 11:54:50 +0900
Subject: [PATCH 1800/4636] haskell.packages.ghc882.policeman: fix up
 ansi-terminal dep

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index d492c69db4dc..89b2e0b69c85 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -145,7 +145,10 @@ self: super: {
   haskell-src = markBrokenVersion "1.0.3.0" super.haskell-src;
 
   # The LTS-14.x version of the dependencies are too old.
-  policeman = super.policeman.overrideScope (self: super: { ansi-terminal = self.ansi-terminal_0_10_2; relude = self.relude_0_6_0_0; });
+  policeman = super.policeman.overrideScope (self: super: {
+    ansi-terminal = self.ansi-terminal_0_10_3;
+    relude = self.relude_0_6_0_0;
+  });
 
   # https://github.com/kowainik/relude/issues/241
   relude_0_6_0_0 = dontCheck super.relude_0_6_0_0;

From a0171c64394b279dd2971eec11d0f46f30cc8aa4 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Tue, 11 Feb 2020 12:51:43 +0900
Subject: [PATCH 1801/4636] haskellPackages.prettyprinter: make sure everything
 depends on this correctly

---
 .../haskell-modules/configuration-common.nix           | 10 +++++-----
 .../haskell-modules/configuration-ghc-8.8.x.nix        |  2 +-
 .../haskell-modules/configuration-hackage2nix.yaml     |  1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d21ebe11fea5..7e91964b481b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1052,19 +1052,19 @@ self: super: {
   # This will probably be able to be removed when we update to LTS-15.
   dhall_1_29_0 =
     dontCheck (super.dhall_1_29_0.override {
-      prettyprinter = self.prettyprinter_1_6_0;
+      prettyprinter = self.prettyprinter_1_6_1;
       prettyprinter-ansi-terminal =
         self.prettyprinter-ansi-terminal.override {
-          prettyprinter = self.prettyprinter_1_6_0;
+          prettyprinter = self.prettyprinter_1_6_1;
         };
     });
   dhall-bash_1_0_27 = super.dhall-bash_1_0_27.override { dhall = self.dhall_1_29_0; };
   dhall-json_1_6_1 = super.dhall-json_1_6_1.override {
     dhall = self.dhall_1_29_0;
-    prettyprinter = self.prettyprinter_1_6_0;
+    prettyprinter = self.prettyprinter_1_6_1;
     prettyprinter-ansi-terminal =
       self.prettyprinter-ansi-terminal.override {
-        prettyprinter = self.prettyprinter_1_6_0;
+        prettyprinter = self.prettyprinter_1_6_1;
       };
   };
 
@@ -1390,7 +1390,7 @@ self: super: {
   krank = doJailbreak super.krank;
 
   # prettyprinter-1.6.0 fails its doctest suite.
-  prettyprinter_1_6_0 = dontCheck super.prettyprinter_1_6_0;
+  prettyprinter_1_6_1 = dontCheck super.prettyprinter_1_6_1;
 
   # the test suite has an overly tight restriction on doctest
   # See https://github.com/ekmett/perhaps/pull/5
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 89b2e0b69c85..613c76192731 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -93,7 +93,7 @@ self: super: {
   optparse-applicative = self.optparse-applicative_0_15_1_0;
   pandoc = dontCheck super.pandoc_2_9_1_1;        # https://github.com/jgm/pandoc/issues/6086
   pandoc-types = self.pandoc-types_1_20;
-  prettyprinter = self.prettyprinter_1_6_0;
+  prettyprinter = self.prettyprinter_1_6_1;
   primitive = dontCheck super.primitive_0_7_0_0;  # evaluating the test suite gives an infinite recursion
   regex-base = self.regex-base_0_94_0_0;
   regex-compat = self.regex-compat_0_95_2_0;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 31c7d2b8a76a..7654463c911c 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2383,6 +2383,7 @@ extra-packages:
   - patience ^>= 0.1                    # required by chell-0.4.x
   - persistent >=2.5 && <2.8            # pre-lts-11.x versions neeed by git-annex 6.20180227
   - persistent-sqlite < 2.7             # pre-lts-11.x versions neeed by git-annex 6.20180227
+  - prettyprinter == 1.6.1              # required by ghc 8.8.x, and dhall-1.29.0
   - primitive == 0.5.1.*                # required to build alex with GHC 6.12.3
   - proto-lens == 0.2.*                 # required for tensorflow-proto-0.1.x on GHC 8.2.x
   - proto-lens-protobuf-types == 0.2.*  # required for tensorflow-proto-0.1.x on GHC 8.2.x

From c44ded75fe48faa227083cfb9d7477b2bf73007e Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Thu, 13 Feb 2020 10:23:23 +0900
Subject: [PATCH 1802/4636] haskellPackages.mplayer-spot: add runtime
 dependency on mplayer

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 1c8775d6ca40..c1b1c22d5543 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -692,4 +692,13 @@ self: super: builtins.intersectAttrs super {
   # checks SQL statements at compile time, and so requires a running PostgreSQL
   # database to run it's test suite
   postgresql-typed = dontCheck super.postgresql-typed;
+
+  # mplayer-spot uses mplayer at runtime.
+  mplayer-spot =
+    let path = pkgs.stdenv.lib.makeBinPath [ pkgs.mplayer ];
+    in overrideCabal (addBuildTool super.mplayer-spot pkgs.makeWrapper) (oldAttrs: {
+      postInstall = ''
+        wrapProgram $out/bin/mplayer-spot --prefix PATH : "${path}"
+      '';
+    });
 }

From aba43b8c3ec5526d3df86a0e48f7eea493bed52e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 14 Feb 2020 09:17:57 +0100
Subject: [PATCH 1803/4636] ghc-8.8.x: update override for lens to the latest
 version

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 613c76192731..f2f7b0cd2914 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -82,7 +82,7 @@ self: super: {
   HaTeX = self.HaTeX_3_22_0_0;
   HsYAML = self.HsYAML_0_2_1_0;
   json-autotype = doJailbreak super.json-autotype;
-  lens = self.lens_4_19;
+  lens = self.lens_4_19_1;
   memory = self.memory_0_15_0;
   microlens = self.microlens_0_4_11_2;
   microlens-ghc = self.microlens-ghc_0_4_12;

From 79e53ba252284bc20896b0a3ac208cb1411d9fc2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 14 Feb 2020 09:23:13 +0100
Subject: [PATCH 1804/4636] hackage2nix: update list of broken packages

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 7654463c911c..f69e068d6370 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3628,6 +3628,7 @@ broken-packages:
   - collections
   - collections-api
   - collections-base-instances
+  - Color
   - color-counter
   - colorless
   - colorless-http-client
@@ -6390,6 +6391,7 @@ broken-packages:
   - ivory-serialize
   - ivory-stdlib
   - ivy-web
+  - ix
   - ixdopp
   - ixmonad
   - ixshader
@@ -8333,6 +8335,7 @@ broken-packages:
   - reform-happstack
   - reform-hsp
   - reformat
+  - refractor
   - refresht
   - refurb
   - reg-alloc
@@ -8469,6 +8472,7 @@ broken-packages:
   - riot
   - risc386
   - riscv-isa
+  - Ritt-Wu
   - rivers
   - rivet
   - rivet-migration
@@ -8533,6 +8537,7 @@ broken-packages:
   - rungekutta
   - runmany
   - runtime-arbitrary
+  - rv
   - rws
   - RxHaskell
   - s-expression
@@ -9787,6 +9792,7 @@ broken-packages:
   - unittyped
   - unity-testresult-parser
   - unitym-yesod
+  - universal
   - universe-th
   - unix-fcntl
   - unix-handle

From ee52b6ac6835479363b26dd6c03ff1b4a7a4652e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 14 Feb 2020 09:37:22 +0100
Subject: [PATCH 1805/4636] haskell-brick: update overrides to the latest
 version

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7e91964b481b..47b030d77cf8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1353,7 +1353,7 @@ self: super: {
   # There are more complicated ways of doing this but I was able to make it fairly simple -- kiwi
   matterhorn = doJailbreak (super.matterhorn.override {
     brick-skylighting = self.brick-skylighting.override {
-      brick = self.brick_0_51;
+      brick = self.brick_0_52;
     };
   });
 
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index f2f7b0cd2914..2a9e6babd6d3 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -70,7 +70,7 @@ self: super: {
   xmobar = doJailbreak super.xmobar;
 
   # use latest version to fix the build
-  brick = self.brick_0_51;
+  brick = self.brick_0_52;
   dbus = self.dbus_1_2_11;
   doctemplates = self.doctemplates_0_8;
   exact-pi = doJailbreak super.exact-pi;

From 3d7b19344d8e3c81ac5f23af776f09ec88962099 Mon Sep 17 00:00:00 2001
From: Simon Chatterjee <code@chatts.net>
Date: Mon, 17 Feb 2020 17:45:05 +0000
Subject: [PATCH 1806/4636] haskell-cabal-fmt: override Cabal to version 3.0.x

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 47b030d77cf8..13ce36eff06d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1403,4 +1403,7 @@ self: super: {
     '';
   });
 
+  # cabal-fmt requires Cabal3
+  cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_0_0_0; };
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index f69e068d6370..a25977eff3b6 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3328,7 +3328,6 @@ broken-packages:
   - cabal-dev
   - cabal-dir
   - cabal-flatpak
-  - cabal-fmt
   - cabal-ghc-dynflags
   - cabal-ghci
   - cabal-graphdeps

From 4f3959790301dea00a3a84086c2875051c63b5e1 Mon Sep 17 00:00:00 2001
From: Simon Chatterjee <code@chatts.net>
Date: Tue, 18 Feb 2020 11:08:00 +0000
Subject: [PATCH 1807/4636] spago: fix Darwin build

This change gets round a weird permissions error on darwin
---
 pkgs/development/haskell-modules/configuration-nix.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index c1b1c22d5543..813ab160a2cf 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -680,6 +680,11 @@ self: super: builtins.intersectAttrs super {
           # https://github.com/spacchetti/spago/issues/510
           cp ${docsSearchAppJsFile} "$sourceRoot/templates/docs-search-app.js"
           cp ${purescriptDocsSearchFile} "$sourceRoot/templates/purescript-docs-search"
+
+          # For some weird reason, on Darwin, the open(2) call to embed these files
+          # requires write permissions. The easiest resolution is just to permit that
+          # (doesn't cause any harm on other systems).
+          chmod u+w "$sourceRoot/templates/docs-search-app.js" "$sourceRoot/templates/purescript-docs-search"
         '';
       });
 

From 524535f18532203c9835ce20eaf7b9839a8be7f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 20 Feb 2020 06:47:38 +0100
Subject: [PATCH 1808/4636] configuration-ghc-8.8.x: fix eval

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 2a9e6babd6d3..9c951b71e1ea 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -107,7 +107,7 @@ self: super: {
   sop-core = self.sop-core_0_5_0_0;
   texmath = self.texmath_0_12;
   th-desugar = self.th-desugar_1_10;
-  tls = self.tls_1_5_3;
+  tls = self.tls_1_5_4;
   trifecta = self.trifecta_2_1;
   vty = self.vty_5_26;
   xml-conduit = overrideCabal super.xml-conduit (drv: { version = "1.9.0.0"; sha256 = "1p57v127882rxvvmwjmvnqdmk3x2wg1z4d8y03849h0xaz1vid0w"; });

From fdb4ed35edc8fbdd952fb7ec91b9eafddd40f55e Mon Sep 17 00:00:00 2001
From: Simon Chatterjee <code@chatts.net>
Date: Mon, 17 Feb 2020 20:29:19 +0000
Subject: [PATCH 1809/4636] haskell-gtk2hs packges: fixes for building on
 Darwin

This includes two layered changes so the gtk2hs packages build on Darwin:

 - For `glib`, `gio`, `gtk`, `gtk3`, and `pango`: the fix for version 0.13.8.0
   from https://github.com/gtk2hs/gtk2hs/pull/293 . I expect at some point the
   referenced fix (or one like it) will be released and and brought into
   nixpkgs, at which point the override and patch files here can (in fact must)
   be removed.

 - For `gtk` and `gtk3`: also apply the required cabal flag cited in
   https://github.com/gtk2hs/gtk2hs/issues/249 to specify the Quartz rather than
   X11 backend (Quartz is the one that both nixpkgs and macOS support
   out-the-box). This override is likely to be wanted indefinitely.

Both modifications are required for a successful build of `gtk` or `gtk3` on
Darwin right now.
---
 .../haskell-modules/configuration-common.nix  | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 13ce36eff06d..086c8c8df64c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1406,4 +1406,58 @@ self: super: {
   # cabal-fmt requires Cabal3
   cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_0_0_0; };
 
+  # Several gtk2hs-provided packages at v0.13.8.0 fail to build on Darwin
+  # until we pick up https://github.com/gtk2hs/gtk2hs/pull/293 so apply that
+  # patch here. That single patch is for the gtk2hs super-repo, out of which
+  # we extract the patch for each indvidiual project (glib/gio/pango/gtk/gtk3).
+  glib = appendPatch super.glib (pkgs.fetchpatch {
+    url = "https://github.com/gtk2hs/gtk2hs/commit/1cf2f9bff2427d39986e32880d1383cfff49ab0e.patch";
+    includes = [ "glib.cabal" ];
+    stripLen = 1;
+    sha256 = "1zdss1xgsbijs3kx8dp5a81qryrfc1zm1xrd20whna3dqakf8b7g";
+  });
+  gio = appendPatch super.gio (pkgs.fetchpatch {
+    url = "https://github.com/gtk2hs/gtk2hs/commit/1cf2f9bff2427d39986e32880d1383cfff49ab0e.patch";
+    includes = [ "gio.cabal" ];
+    stripLen = 1;
+    sha256 = "0d72k6gqvgax9jcqi3gz1gqnar7jg8p5065z3mw2fcwvdw46s2zv";
+  });
+  pango = appendPatch super.pango (pkgs.fetchpatch {
+    url = "https://github.com/gtk2hs/gtk2hs/commit/1cf2f9bff2427d39986e32880d1383cfff49ab0e.patch";
+    includes = [ "pango.cabal" ];
+    stripLen = 1;
+    sha256 = "0dc221wlmyhc24h6ybfhbkxmcx4i6bvkbr1zgqidbnj3yp6w0l5w";
+  });
+  # gtk/gtk3 have an additional complication: independent of the above
+  # 0.13.8.0-specific fix, they need to be told on Darwin to use the Quartz
+  # rather than X11 backend (see eg https://github.com/gtk2hs/gtk2hs/issues/249).
+  gtk3 =
+    let
+      patchedGtk3 = appendPatch super.gtk3 (pkgs.fetchpatch {
+        url = "https://github.com/gtk2hs/gtk2hs/commit/1cf2f9bff2427d39986e32880d1383cfff49ab0e.patch";
+        includes = [ "gtk3.cabal" ];
+        stripLen = 1;
+        sha256 = "0zvj0dzfwf9bksfhi0m4v0h5aij236gd0qhyr1adpdcjrkd8zbkd";
+      });
+    in
+      # The appendConfigureFlags should remain even after we can drop patchedGtk3.
+      appendConfigureFlags patchedGtk3 (pkgs.lib.optional pkgs.stdenv.isDarwin "-f have-quartz-gtk");
+  gtk =
+    let
+      patchedGtk = appendPatch super.gtk (pkgs.fetchpatch {
+        url = "https://github.com/gtk2hs/gtk2hs/commit/1cf2f9bff2427d39986e32880d1383cfff49ab0e.patch";
+        includes = [ "gtk.cabal-renamed" ];
+        stripLen = 1;
+        sha256 = "0wb0scvmhg8b42hxpns9m6zak3r8b25a2z7wg6vl56n17nb635l7";
+        # One final complication: the gtk cabal file in the source repo (as seen
+        # by the patch) is `gtk.cabal-renamed`, but this gets changed to the usual
+        # `gtk.cabal` before uploading to Hackage by a script.
+        postFetch = ''
+          substituteInPlace $out --replace "-renamed" ""
+        '';
+      });
+    in
+      # The appendConfigureFlags should remain even after we can drop patchedGtk.
+      appendConfigureFlags patchedGtk (pkgs.lib.optional pkgs.stdenv.isDarwin "-f have-quartz-gtk");
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From df0392dc3c0f83c0a17ada119c1cc3b35be3f489 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Fri, 21 Feb 2020 04:33:29 +0100
Subject: [PATCH 1810/4636] haskellPackages.Chart-tests: Fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 086c8c8df64c..9771b4518c0e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1460,4 +1460,11 @@ self: super: {
       # The appendConfigureFlags should remain even after we can drop patchedGtk.
       appendConfigureFlags patchedGtk (pkgs.lib.optional pkgs.stdenv.isDarwin "-f have-quartz-gtk");
 
+  # Chart-tests needs and compiles some modules from Chart itself
+  Chart-tests = (addExtraLibrary super.Chart-tests self.QuickCheck).overrideAttrs (old: {
+    preCheck = old.postPatch or "" + ''
+      tar --one-top-level=../chart --strip-components=1 -xf ${self.Chart.src}
+    '';
+  });
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 87fc484219eb157dcfb6df08a7aec668d31b13fe Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Fri, 21 Feb 2020 04:42:16 +0100
Subject: [PATCH 1811/4636] haskellPackages.bitwise-enum: Fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9771b4518c0e..35aba7e8fa6b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1467,4 +1467,7 @@ self: super: {
     '';
   });
 
+  # Unnecessary upper bound on vector <0.12.1
+  bitwise-enum = doJailbreak super.bitwise-enum;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From b35908068848009062b2b1abca7cc3752b7271d5 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Fri, 21 Feb 2020 04:53:40 +0100
Subject: [PATCH 1812/4636] haskellPackages.construct: Fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 35aba7e8fa6b..83555d252f4b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1470,4 +1470,10 @@ self: super: {
   # Unnecessary upper bound on vector <0.12.1
   bitwise-enum = doJailbreak super.bitwise-enum;
 
+  # Needs more recent versions of those libraries
+  construct = super.construct.overrideScope (self: super: {
+    incremental-parser = self.incremental-parser_0_4;
+    monoid-subclasses = self.monoid-subclasses_1_0_1;
+  });
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From ef30908eef916f6430a0b290c47703c238576cc2 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Fri, 21 Feb 2020 05:13:34 +0100
Subject: [PATCH 1813/4636] haskellPackages.streamly-bytestring: Fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 83555d252f4b..7248a820de77 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1476,4 +1476,9 @@ self: super: {
     monoid-subclasses = self.monoid-subclasses_1_0_1;
   });
 
+  # Needs more recent streamly version
+  streamly-bytestring = super.streamly-bytestring.override {
+    streamly = self.streamly_0_7_1;
+  };
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 5bcd07a07dae5706f3fabadb5a4954b262222826 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Feb 2020 11:19:10 +0100
Subject: [PATCH 1814/4636] haskellPackages: update default compiler from
 ghc-8.6.5 to 8.8.2 (LTS-15.x)

---
 doc/languages-frameworks/haskell.section.md | 8 ++++----
 pkgs/top-level/all-packages.nix             | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md
index b485ec583ec3..8cab6208910d 100644
--- a/doc/languages-frameworks/haskell.section.md
+++ b/doc/languages-frameworks/haskell.section.md
@@ -84,18 +84,18 @@ nix-env -qaP -A nixos.haskellPackages
 nix-env -iA nixos.haskellPackages.cabal-install
 ```
 
-Our current default compiler is GHC 8.6.x and the `haskellPackages` set
+Our current default compiler is GHC 8.8.x and the `haskellPackages` set
 contains packages built with that particular version. Nixpkgs contains the last
 three major releases of GHC and there is a whole family of package sets
 available that defines Hackage packages built with each of those compilers,
 too:
 ```shell
-nix-env -f "<nixpkgs>" -qaP -A haskell.packages.ghc844
-nix-env -f "<nixpkgs>" -qaP -A haskell.packages.ghc882
+nix-env -f "<nixpkgs>" -qaP -A haskell.packages.ghc865
+nix-env -f "<nixpkgs>" -qaP -A haskell.packages.ghc8101
 ```
 
 The name `haskellPackages` is really just a synonym for
-`haskell.packages.ghc865`, because we prefer that package set internally and
+`haskell.packages.ghc882`, because we prefer that package set internally and
 recommend it to our users as their default choice, but ultimately you are free
 to compile your Haskell packages with any GHC version you please. The following
 command displays the complete list of available compilers:
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e94c64551407..99633c168f2f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8284,7 +8284,7 @@ in
 
   # Please update doc/languages-frameworks/haskell.section.md, “Our
   # current default compiler is”, if you bump this:
-  haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc865;
+  haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc882;
 
   inherit (haskellPackages) ghc;
 

From 93b4f52f2c59a8c03bd6d12a5cfa77d82b1d4a35 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Feb 2020 11:58:27 +0100
Subject: [PATCH 1815/4636] haskellPackages: drop obsolete overrides that break
 evaluation

---
 .../haskell-modules/configuration-common.nix  | 73 +------------------
 .../configuration-ghc-8.8.x.nix               | 58 ---------------
 2 files changed, 1 insertion(+), 130 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7248a820de77..f154fbdf3b84 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -394,11 +394,6 @@ self: super: {
   Random123 = dontCheck super.Random123;
   systemd = dontCheck super.systemd;
 
-  # use the correct version of network
-  systemd_2_2_0 = dontCheck (super.systemd_2_2_0.override {
-    network = self.network_3_1_1_1;
-  });
-
   # https://github.com/eli-frey/cmdtheline/issues/28
   cmdtheline = dontCheck super.cmdtheline;
 
@@ -1042,31 +1037,7 @@ self: super: {
   vector-algorithms = dontCheck super.vector-algorithms;
 
   # The test suite attempts to use the network.
-  dhall =
-    generateOptparseApplicativeCompletion "dhall" (
-      dontCheck super.dhall
-  );
-  # https://github.com/dhall-lang/dhall-haskell/commit/dedd5e0ea6fd12f87d887af3d2220eebc61ee8af
-  # This raises the lower bound on prettyprinter to 1.5.1 since
-  # `removeTrailingWhitespace` is buggy in earlier versions.
-  # This will probably be able to be removed when we update to LTS-15.
-  dhall_1_29_0 =
-    dontCheck (super.dhall_1_29_0.override {
-      prettyprinter = self.prettyprinter_1_6_1;
-      prettyprinter-ansi-terminal =
-        self.prettyprinter-ansi-terminal.override {
-          prettyprinter = self.prettyprinter_1_6_1;
-        };
-    });
-  dhall-bash_1_0_27 = super.dhall-bash_1_0_27.override { dhall = self.dhall_1_29_0; };
-  dhall-json_1_6_1 = super.dhall-json_1_6_1.override {
-    dhall = self.dhall_1_29_0;
-    prettyprinter = self.prettyprinter_1_6_1;
-    prettyprinter-ansi-terminal =
-      self.prettyprinter-ansi-terminal.override {
-        prettyprinter = self.prettyprinter_1_6_1;
-      };
-  };
+  dhall = generateOptparseApplicativeCompletion "dhall" (dontCheck super.dhall);
 
   # Missing test files in source distribution, fixed once 1.4.0 is bumped
   # https://github.com/dhall-lang/dhall-haskell/pull/997
@@ -1093,7 +1064,6 @@ self: super: {
 
   # The test suite is broken. Break out of "base-compat >=0.9.3 && <0.10, hspec >=2.4.4 && <2.5".
   haddock-library = doJailbreak (dontCheck super.haddock-library);
-  haddock-library_1_8_0 = doJailbreak super.haddock-library_1_8_0;
 
   # Generate shell completion.
   cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
@@ -1202,12 +1172,6 @@ self: super: {
   # Fix build with attr-2.4.48 (see #53716)
   xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch;
 
-  # These packages needs network 3.x, which is not in LTS-13.x.
-  network-bsd_2_8_1_0 = super.network-bsd_2_8_1_0.override { network = self.network_3_0_1_1; };
-  lambdabot-core = super.lambdabot-core.overrideScope (self: super: { network = self.network_3_0_1_1; hslogger = self.hslogger_1_3_0_0; });
-  lambdabot-reference-plugins = super.lambdabot-reference-plugins.overrideScope (self: super: { network = self.network_3_0_1_1; hslogger = self.hslogger_1_3_0_0; });
-  lambdabot-haskell-plugins = super.lambdabot-haskell-plugins.overrideScope (self: super: { network = self.network_3_0_1_1; });
-
   # Some tests depend on a postgresql instance
   # Haddock failure: https://github.com/haskell/haddock/issues/979
   esqueleto = dontHaddock (dontCheck super.esqueleto);
@@ -1232,12 +1196,6 @@ self: super: {
   # Test suite won't link for no apparent reason.
   constraints-deriving = dontCheck super.constraints-deriving;
 
-  # Use a matching version of ghc-lib-parser.
-  ghc-lib-parser-ex = super.ghc-lib-parser-ex.override { ghc-lib-parser = self.ghc-lib-parser_8_8_2_20200205; };
-
-  # https://github.com/sol/hpack/issues/366
-  hpack = self.hpack_0_33_0;
-
   # QuickCheck >=2.3 && <2.13, hspec >=2.1 && <2.7
   graphviz = dontCheck super.graphviz;
 
@@ -1253,16 +1211,6 @@ self: super: {
     '';
   });
 
-  # The LTS-14.x version of their dependencies are too old.
-  cabal-plan = super.cabal-plan.overrideScope (self: super: {
-    optparse-applicative = self.optparse-applicative_0_15_1_0;
-    ansi-terminal = self.ansi-terminal_0_10_3;
-    base-compat = self.base-compat_0_11_1;
-    semialign = self.semialign_1_1;
-    time-compat = doJailbreak super.time-compat;
-  });
-  hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_23_0; };
-
   # Version bounds for http-client are too strict:
   # https://github.com/bitnomial/prometheus/issues/34
   prometheus = doJailbreak super.prometheus;
@@ -1299,10 +1247,6 @@ self: super: {
   # upstream issue: https://github.com/vmchale/atspkg/issues/12
   language-ats = dontCheck super.language-ats;
 
-  # polysemy-plugin requires polysemy >= 1.2.0.0
-  polysemy = self.polysemy_1_2_3_0;
-  polysemy-zoo = self.polysemy-zoo_0_6_0_1;
-
   # https://github.com/Happstack/web-routes-th/pull/3
   web-routes-th = doJailbreak super.web-routes-th;
 
@@ -1336,18 +1280,6 @@ self: super: {
   # needs newer version of the systemd package
   spacecookie = super.spacecookie.override { systemd = self.systemd_2_2_0; };
 
-  # 2019-12-19 - glirc wants regex-tdfa >=1.3 which results in errors with regex-base which errors more
-  # hoping to make a proper derivation with plugins enabled and more reliable building -- kiwi
-  # 2020-01-17 - as of recently the basic doJailbreak is not enough and have to override regex-tdfa which needs an override for regex-base
-
-  glirc = doJailbreak (super.glirc.override {
-    regex-tdfa = self.regex-tdfa_1_3_1_0;
-  });
-
-  regex-tdfa_1_3_1_0 = doJailbreak (super.regex-tdfa_1_3_1_0.override {
-    regex-base = self.regex-base_0_94_0_0;
-  });
-
   # 2020-01-19 - there were conflicting versions of brick, vty, and brick-skylighting;
   # multiple versions of them were being pulled in by the others which is not allowed.
   # There are more complicated ways of doing this but I was able to make it fairly simple -- kiwi
@@ -1389,9 +1321,6 @@ self: super: {
   # krank-0.1.0 does not accept PyF-0.9.0.0.
   krank = doJailbreak super.krank;
 
-  # prettyprinter-1.6.0 fails its doctest suite.
-  prettyprinter_1_6_1 = dontCheck super.prettyprinter_1_6_1;
-
   # the test suite has an overly tight restriction on doctest
   # See https://github.com/ekmett/perhaps/pull/5
   perhaps = doJailbreak super.perhaps;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 9c951b71e1ea..9ddad80f6eb1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -68,50 +68,7 @@ self: super: {
   io-streams-haproxy = doJailbreak super.io-streams-haproxy; # base >=4.5 && <4.13
   snap-server = doJailbreak super.snap-server;
   xmobar = doJailbreak super.xmobar;
-
-  # use latest version to fix the build
-  brick = self.brick_0_52;
-  dbus = self.dbus_1_2_11;
-  doctemplates = self.doctemplates_0_8;
   exact-pi = doJailbreak super.exact-pi;
-  generics-sop = self.generics-sop_0_5_0_0;
-  hackage-db = self.hackage-db_2_1_0;
-  haddock-library = self.haddock-library_1_8_0;
-  haskell-src-meta = self.haskell-src-meta_0_8_5;
-  haskell-src-meta_0_8_5 = dontCheck super.haskell-src-meta_0_8_5;
-  HaTeX = self.HaTeX_3_22_0_0;
-  HsYAML = self.HsYAML_0_2_1_0;
-  json-autotype = doJailbreak super.json-autotype;
-  lens = self.lens_4_19_1;
-  memory = self.memory_0_15_0;
-  microlens = self.microlens_0_4_11_2;
-  microlens-ghc = self.microlens-ghc_0_4_12;
-  microlens-mtl = self.microlens-mtl_0_2_0_1;
-  microlens-platform = self.microlens-platform_0_4_1;
-  microlens-th = self.microlens-th_0_4_3_4;
-  network = self.network_3_1_1_1;
-  optparse-applicative = self.optparse-applicative_0_15_1_0;
-  pandoc = dontCheck super.pandoc_2_9_1_1;        # https://github.com/jgm/pandoc/issues/6086
-  pandoc-types = self.pandoc-types_1_20;
-  prettyprinter = self.prettyprinter_1_6_1;
-  primitive = dontCheck super.primitive_0_7_0_0;  # evaluating the test suite gives an infinite recursion
-  regex-base = self.regex-base_0_94_0_0;
-  regex-compat = self.regex-compat_0_95_2_0;
-  regex-pcre-builtin = self.regex-pcre-builtin_0_95_1_1_8_43;
-  regex-posix = self.regex-posix_0_96_0_0;
-  regex-tdfa = self.regex-tdfa_1_3_1_0;
-  shelly = self.shelly_1_9_0;
-  singletons = self.singletons_2_6;
-  skylighting = self.skylighting_0_8_3_2;
-  skylighting-core = self.skylighting-core_0_8_3_2;
-  sop-core = self.sop-core_0_5_0_0;
-  texmath = self.texmath_0_12;
-  th-desugar = self.th-desugar_1_10;
-  tls = self.tls_1_5_4;
-  trifecta = self.trifecta_2_1;
-  vty = self.vty_5_26;
-  xml-conduit = overrideCabal super.xml-conduit (drv: { version = "1.9.0.0"; sha256 = "1p57v127882rxvvmwjmvnqdmk3x2wg1z4d8y03849h0xaz1vid0w"; });
-  xmonad-contrib = self.xmonad-contrib_0_16;
 
   # These packages don't work and need patching and/or an update.
   hackage-security = appendPatch (doJailbreak super.hackage-security) (pkgs.fetchpatch {
@@ -138,19 +95,4 @@ self: super: {
   # Upstream ships a broken Setup.hs file.
   csv = overrideCabal super.csv (drv: { prePatch = "rm Setup.hs"; });
 
-  # mark broken packages
-  bencode = markBrokenVersion "0.6.0.0" super.bencode;
-  easytest = markBroken super.easytest;
-  easytest_0_3 = markBroken super.easytest_0_3;
-  haskell-src = markBrokenVersion "1.0.3.0" super.haskell-src;
-
-  # The LTS-14.x version of the dependencies are too old.
-  policeman = super.policeman.overrideScope (self: super: {
-    ansi-terminal = self.ansi-terminal_0_10_3;
-    relude = self.relude_0_6_0_0;
-  });
-
-  # https://github.com/kowainik/relude/issues/241
-  relude_0_6_0_0 = dontCheck super.relude_0_6_0_0;
-
 }

From f95d327f4e00792b8e6806b03ec6d294f181c2f4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Feb 2020 12:02:00 +0100
Subject: [PATCH 1816/4636] haskell-primitive: avoid infinite recursion during
 evaluation

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 813ab160a2cf..da63ec0c22a0 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -706,4 +706,8 @@ self: super: builtins.intersectAttrs super {
         wrapProgram $out/bin/mplayer-spot --prefix PATH : "${path}"
       '';
     });
+
+  # break infinite recursion with base-orphans
+  primitive = dontCheck super.primitive;
+
 }

From 49640dda72db34f31d17701a9be6401c5f387923 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Feb 2020 12:08:30 +0100
Subject: [PATCH 1817/4636] hackage2nix: let's try to compile everything to see
 what works

---
 .../configuration-hackage2nix.yaml            | 7822 -----------------
 1 file changed, 7822 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index a25977eff3b6..ca78e7910f21 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2600,7825 +2600,3 @@ dont-distribute-packages:
 
 broken-packages:
   # These packages don't compile or depend on packages that don't compile.
-  - 3dmodels
-  - 4Blocks
-  - a50
-  - AAI
-  - abcBridge
-  - abcnotation
-  - abeson
-  - abides
-  - abnf
-  - AbortT-monadstf
-  - AbortT-mtl
-  - AbortT-transformers
-  - abstract-par-accelerate
-  - abt
-  - AC-BuildPlatform
-  - AC-EasyRaster-GTK
-  - AC-HalfInteger
-  - ac-machine
-  - ac-machine-conduit
-  - AC-MiniTest
-  - AC-Terminal
-  - AC-VanillaArray
-  - AC-Vector
-  - AC-Vector-Fancy
-  - accelerate-arithmetic
-  - accelerate-fftw
-  - accelerate-fourier
-  - accelerate-kullback-liebler
-  - accelerate-llvm
-  - accelerate-llvm-native
-  - accelerate-random
-  - accelerate-typelits
-  - accelerate-utility
-  - accentuateus
-  - access-time
-  - access-token-provider
-  - acid-state-dist
-  - acid-state-tls
-  - ACME
-  - acme-all-monad
-  - acme-comonad
-  - acme-flipping-tables
-  - acme-hq9plus
-  - acme-http
-  - acme-inator
-  - acme-kitchen-sink
-  - acme-left-pad
-  - acme-miscorder
-  - acme-mutable-package
-  - acme-now
-  - acme-numbersystem
-  - acme-operators
-  - acme-php
-  - acme-schoenfinkel
-  - acme-strfry
-  - acme-stringly-typed
-  - acme-zalgo
-  - acme-zero
-  - ActionKid
-  - activehs
-  - activehs-base
-  - activitypub
-  - activitystreams-aeson
-  - actor
-  - Adaptive
-  - Adaptive-Blaisorblade
-  - adaptive-containers
-  - adaptive-tuple
-  - adb
-  - adhoc-network
-  - adict
-  - adobe-swatch-exchange
-  - adp-multi
-  - adp-multi-monadiccp
-  - ADPfusion
-  - ADPfusionForest
-  - ADPfusionSet
-  - adtrees
-  - Advgame
-  - Advise-me
-  - AERN-Basics
-  - AERN-Net
-  - AERN-Real
-  - AERN-Real-Double
-  - AERN-Real-Interval
-  - AERN-RnToRm
-  - AERN-RnToRm-Plot
-  - aern2-mp
-  - aern2-real
-  - aeson-applicative
-  - aeson-decode
-  - aeson-diff-generic
-  - aeson-flowtyped
-  - aeson-gadt-th
-  - aeson-injector
-  - aeson-native
-  - aeson-prefix
-  - aeson-schema
-  - aeson-smart
-  - aeson-streams
-  - aeson-t
-  - aeson-tiled
-  - aeson-typescript
-  - affection
-  - affine
-  - affine-invariant-ensemble-mcmc
-  - afv
-  - ag-pictgen
-  - Agata
-  - agda-server
-  - agda-snippets
-  - agda-snippets-hakyll
-  - agentx
-  - AGI
-  - agum
-  - AhoCorasick
-  - aig
-  - aip
-  - air-th
-  - airbrake
-  - airship
-  - airtable-api
-  - aivika-distributed
-  - ajhc
-  - AlanDeniseEricLauren
-  - alerta
-  - alex-meta
-  - alex-prelude
-  - alex-tools
-  - alfred
-  - alg
-  - alga
-  - algebra
-  - algebra-sql
-  - algebraic
-  - algebraic-classes
-  - algebraic-graphs
-  - algebraic-prelude
-  - algo-s
-  - AlgoRhythm
-  - AlgorithmW
-  - align-text
-  - AlignmentAlgorithms
-  - Allure
-  - alms
-  - alpha
-  - alphachar
-  - alsa
-  - alsa-gui
-  - alsa-midi
-  - alsa-pcm-tests
-  - alsa-seq-tests
-  - altcomposition
-  - alternative-extra
-  - alternative-io
-  - alto
-  - alure
-  - amazon-emailer
-  - amazon-emailer-client-snap
-  - amazon-products
-  - amby
-  - AMI
-  - ampersand
-  - amqp-conduit
-  - amqp-utils
-  - analyze
-  - analyze-client
-  - anansi-pandoc
-  - anatomy
-  - android
-  - android-activity
-  - android-lint-summary
-  - AndroidViewHierarchyImporter
-  - angel
-  - angle
-  - Animas
-  - animascii
-  - animate
-  - animate-example
-  - animate-frames
-  - animate-preview
-  - animate-sdl2
-  - annah
-  - Annotations
-  - anonymous-sums
-  - anonymous-sums-tests
-  - ansi-terminal-game
-  - ansigraph
-  - antagonist
-  - antfarm
-  - anticiv
-  - antigate
-  - antimirov
-  - antiope-athena
-  - antiope-contract
-  - antiope-core
-  - antiope-dynamodb
-  - antiope-messages
-  - antiope-optparse-applicative
-  - antiope-s3
-  - antiope-shell
-  - antiope-sns
-  - antiope-sqs
-  - antiope-swf
-  - antisplice
-  - antlr-haskell
-  - antlrc
-  - anydbm
-  - aosd
-  - apart
-  - apecs-stm
-  - apelsin
-  - api-builder
-  - api-rpc-factom
-  - api-rpc-pegnet
-  - api-tools
-  - api-yoti
-  - apiary
-  - apiary-authenticate
-  - apiary-clientsession
-  - apiary-cookie
-  - apiary-eventsource
-  - apiary-helics
-  - apiary-http-client
-  - apiary-logger
-  - apiary-memcached
-  - apiary-mongoDB
-  - apiary-persistent
-  - apiary-purescript
-  - apiary-redis
-  - apiary-session
-  - apiary-websockets
-  - apis
-  - apns-http2
-  - apotiki
-  - app-lens
-  - appc
-  - ApplePush
-  - AppleScript
-  - applicative-fail
-  - applicative-parsec
-  - applicative-quoters
-  - applicative-splice
-  - approveapi
-  - ApproxFun-hs
-  - arb-fft
-  - arbb-vm
-  - arbor-monad-counter
-  - arbor-monad-logger
-  - arbor-monad-metric
-  - arbor-monad-metric-datadog
-  - arbor-postgres
-  - archive-libarchive
-  - archiver
-  - archlinux
-  - archlinux-web
-  - archnews
-  - arduino-copilot
-  - arena
-  - arff
-  - arghwxhaskell
-  - argon
-  - argon2
-  - argparser
-  - arguedit
-  - ariadne
-  - arion
-  - arith-encode
-  - arithmetic-circuits
-  - armada
-  - armor
-  - arpa
-  - arpack
-  - array-builder
-  - array-chunks
-  - array-forth
-  - array-primops
-  - arrayfire
-  - arraylist
-  - ArrayRef
-  - arrow-improve
-  - arrow-list
-  - arrowapply-utils
-  - arrowp
-  - arrowp-qq
-  - ArrowVHDL
-  - artery
-  - artifact
-  - asap
-  - ascii-flatten
-  - ascii-string
-  - ascii-vector-avc
-  - ascii85-conduit
-  - asic
-  - asif
-  - asil
-  - asn
-  - asn1-codec
-  - assert
-  - assertions
-  - asset-map
-  - assimp
-  - ast-monad
-  - ast-monad-json
-  - astrds
-  - astview
-  - async-combinators
-  - async-dejafu
-  - async-manager
-  - async-timer
-  - asynchronous-exceptions
-  - aterm
-  - aterm-utils
-  - atlassian-connect-core
-  - atmos-dimensional-tf
-  - atndapi
-  - atom-conduit
-  - atom-msp430
-  - atomic-modify
-  - atomic-primops-foreign
-  - atomic-primops-vector
-  - atomo
-  - ats-format
-  - ats-pkg
-  - ats-setup
-  - ats-storable
-  - attic-schedule
-  - AttoBencode
-  - AttoJson
-  - attoparsec-data
-  - attoparsec-enumerator
-  - attoparsec-ip
-  - attoparsec-iteratee
-  - attoparsec-text
-  - attoparsec-text-enumerator
-  - attoparsec-time
-  - attoparsec-trans
-  - attoparsec-uri
-  - attosplit
-  - Attrac
-  - atuin
-  - audiovisual
-  - augeas
-  - augur
-  - aur
-  - aur-api
-  - aura
-  - Aurochs
-  - authenticate-ldap
-  - authoring
-  - AutoForms
-  - autom
-  - automata
-  - autonix-deps
-  - autonix-deps-kf5
-  - avatar-generator
-  - avers
-  - avers-api
-  - avers-api-docs
-  - avers-server
-  - avl-static
-  - AvlTree
-  - avr-shake
-  - avro-piper
-  - awesome-prelude
-  - awesomium
-  - awesomium-glut
-  - awesomium-raw
-  - aws-configuration-tools
-  - aws-dynamodb-conduit
-  - aws-dynamodb-streams
-  - aws-ec2
-  - aws-ec2-knownhosts
-  - aws-elastic-transcoder
-  - aws-general
-  - aws-kinesis
-  - aws-kinesis-client
-  - aws-kinesis-reshard
-  - aws-lambda
-  - aws-lambda-runtime
-  - aws-mfa-credentials
-  - aws-performance-tests
-  - aws-route53
-  - aws-sdk
-  - aws-sdk-text-converter
-  - aws-sdk-xml-unordered
-  - aws-sign4
-  - aws-simple
-  - aws-sns
-  - axiom
-  - azubi
-  - azure-service-api
-  - azure-servicebus
-  - azurify
-  - b9
-  - babylon
-  - backblaze-b2-hs
-  - backdropper
-  - backprop
-  - backstop
-  - backtracking-exceptions
-  - backward-state
-  - bag
-  - Baggins
-  - bake
-  - ballast
-  - bamboo
-  - bamboo-launcher
-  - bamboo-plugin-highlight
-  - bamboo-plugin-photo
-  - bamboo-theme-blueprint
-  - bamboo-theme-mini-html5
-  - bamse
-  - bamstats
-  - Bang
-  - bank-holiday-usa
-  - banwords
-  - barchart
-  - barcodes-code128
-  - barecheck
-  - Barracuda
-  - barrie
-  - barrier
-  - barrier-monad
-  - base-compat-migrate
-  - base-feature-macros
-  - base-generics
-  - base-io-access
-  - base62
-  - base64-conduit
-  - baserock-schema
-  - BASIC
-  - baskell
-  - batch
-  - batchd
-  - battlenet
-  - battlenet-yesod
-  - battleship-combinatorics
-  - battleships
-  - bayes-stack
-  - bbi
-  - BCMtools
-  - bdcs
-  - bdcs-api
-  - beam
-  - beam-newtype-field
-  - beam-postgres
-  - beam-th
-  - beamable
-  - bearriver
-  - beautifHOL
-  - beeminder-api
-  - Befunge93
-  - bein
-  - belka
-  - BenchmarkHistory
-  - bencodex
-  - berkeleydb
-  - BerkeleyDBXML
-  - BerlekampAlgorithm
-  - berp
-  - besout
-  - bet
-  - betacode
-  - bff
-  - bgzf
-  - bhoogle
-  - bibdb
-  - bidirectionalization-combined
-  - bidispec
-  - bidispec-extras
-  - bifunctor
-  - BiGUL
-  - billboard-parser
-  - billeksah-forms
-  - billeksah-main
-  - billeksah-pane
-  - billeksah-services
-  - binary-communicator
-  - binary-derive
-  - binary-ext
-  - binary-file
-  - binary-indexed-tree
-  - binary-protocol
-  - binary-protocol-zmq
-  - binary-streams
-  - binary-strict
-  - binary-typed
-  - bind-marshal
-  - binding-gtk
-  - binding-wx
-  - bindings-apr
-  - bindings-apr-util
-  - bindings-bfd
-  - bindings-cctools
-  - bindings-common
-  - bindings-dc1394
-  - bindings-eskit
-  - bindings-EsounD
-  - bindings-fann
-  - bindings-fluidsynth
-  - bindings-friso
-  - bindings-gsl
-  - bindings-gts
-  - bindings-hamlib
-  - bindings-hdf5
-  - bindings-K8055
-  - bindings-libftdi
-  - bindings-libg15
-  - bindings-librrd
-  - bindings-libstemmer
-  - bindings-libv4l2
-  - bindings-monetdb-mapi
-  - bindings-mpdecimal
-  - bindings-portaudio
-  - bindings-sc3
-  - bindings-sipc
-  - bindings-wlc
-  - bindynamic
-  - binembed
-  - binembed-example
-  - bio
-  - bio-sequence
-  - bioace
-  - bioalign
-  - Biobase
-  - BiobaseBlast
-  - BiobaseDotP
-  - BiobaseENA
-  - BiobaseEnsembl
-  - BiobaseFasta
-  - BiobaseFR3D
-  - BiobaseHTTP
-  - BiobaseHTTPTools
-  - BiobaseInfernal
-  - BiobaseMAF
-  - BiobaseNewick
-  - BiobaseTrainingData
-  - BiobaseTurner
-  - BiobaseTypes
-  - BiobaseVienna
-  - BiobaseXNA
-  - biocore
-  - biofasta
-  - biofastq
-  - biohazard
-  - BioHMM
-  - bioinformatics-toolkit
-  - biophd
-  - biopsl
-  - biosff
-  - biostockholm
-  - birch-beer
-  - bird
-  - BirdPP
-  - bisect-binary
-  - bishbosh
-  - bit-array
-  - bit-stream
-  - bitcoin-hs
-  - bitcoin-rpc
-  - Bitly
-  - bitly-cli
-  - bitmaps
-  - bits-conduit
-  - bitset
-  - bitspeak
-  - bitstream
-  - BitStringRandomMonad
-  - bittorrent
-  - bitwise
-  - bizzlelude
-  - bizzlelude-js
-  - bkr
-  - bla
-  - blacktip
-  - blake2
-  - blakesum
-  - blakesum-demo
-  - blas
-  - blas-carray
-  - blas-comfort-array
-  - blas-ffi
-  - blas-hs
-  - BlastHTTP
-  - blastxml
-  - blatex
-  - blaze-builder-enumerator
-  - blaze-html-contrib
-  - blaze-html-hexpat
-  - blaze-html-truncate
-  - blaze-json
-  - blaze-textual-native
-  - blazeT
-  - ble
-  - blink1
-  - blip
-  - bliplib
-  - Blobs
-  - blockchain
-  - blockhash
-  - Blogdown
-  - blogination
-  - BlogLiterately
-  - BlogLiterately-diagrams
-  - bloodhound
-  - bloodhound-amazonka-auth
-  - bloomfilter-redis
-  - blosum
-  - blubber
-  - blubber-server
-  - Blueprint
-  - bluetile
-  - bluetileutils
-  - blunk-hask-tests
-  - blunt
-  - BNFC-meta
-  - bno055-haskell
-  - bogre-banana
-  - bolt
-  - boltzmann-brain
-  - bond
-  - bond-haskell
-  - bond-haskell-compiler
-  - bookkeeper
-  - bookkeeper-permissions
-  - Bookshelf
-  - boolean-normal-forms
-  - boolexpr
-  - boombox
-  - boomslang
-  - boopadoop
-  - boots-app
-  - boots-cloud
-  - boots-web
-  - borel
-  - boring-window-switcher
-  - bot
-  - bounded-array
-  - bowntz
-  - box
-  - braid
-  - brain-bleep
-  - Bravo
-  - breakout
-  - breve
-  - brians-brain
-  - brick-dropdownmenu
-  - bricks
-  - bricks-internal
-  - bricks-internal-test
-  - bricks-parsec
-  - bricks-rendering
-  - bricks-syntax
-  - brillig
-  - broadcast-chan-conduit
-  - broadcast-chan-pipes
-  - broadcast-chan-tests
-  - broccoli
-  - brok
-  - broker-haskell
-  - bronyradiogermany-streaming
-  - brotli
-  - brotli-conduit
-  - brotli-streams
-  - browscap
-  - bson-generic
-  - bson-generics
-  - btree-concurrent
-  - buchhaltung
-  - buffer
-  - buffer-builder-aeson
-  - BufferedSocket
-  - buffet
-  - buffon
-  - bugzilla
-  - build
-  - buildable
-  - buildbox-tools
-  - buildwrapper
-  - bullet
-  - bulletproofs
-  - bulmex
-  - bumper
-  - bunz
-  - burnt-explorer
-  - burst-detection
-  - bus-pirate
-  - Buster
-  - buster
-  - buster-gtk
-  - buster-network
-  - butter
-  - butterflies
-  - bv-sized
-  - bytable
-  - byteslice
-  - bytesmith
-  - bytestring-builder-varword
-  - bytestring-class
-  - bytestring-csv
-  - bytestring-handle
-  - bytestring-plain
-  - bytestring-read
-  - bytestring-rematch
-  - bytestring-show
-  - bytestring-time
-  - bytestring-typenats
-  - bytestringparser
-  - bytestringreadp
-  - c-dsl
-  - c-io
-  - c0check
-  - c0parser
-  - c2ats
-  - c2hsc
-  - ca
-  - cabal-audit
-  - cabal-bundle-clib
-  - cabal-cache
-  - cabal-cargs
-  - cabal-constraints
-  - cabal-db
-  - cabal-debian
-  - cabal-dependency-licenses
-  - cabal-dev
-  - cabal-dir
-  - cabal-flatpak
-  - cabal-ghc-dynflags
-  - cabal-ghci
-  - cabal-graphdeps
-  - cabal-helper
-  - Cabal-ide-backend
-  - cabal-info
-  - cabal-install-bundle
-  - cabal-install-ghc72
-  - cabal-install-ghc74
-  - cabal-install-parsers
-  - cabal-meta
-  - cabal-mon
-  - cabal-nirvana
-  - cabal-progdeps
-  - cabal-query
-  - cabal-rpm
-  - cabal-setup
-  - cabal-sort
-  - cabal-src
-  - cabal-test
-  - cabal-test-quickcheck
-  - cabal-toolkit
-  - cabal-upload
-  - cabal2arch
-  - cabal2doap
-  - cabal2ebuild
-  - cabal2ghci
-  - cabalgraph
-  - cabalish
-  - cabalmdvrpm
-  - cabalQuery
-  - cabalrpmdeps
-  - CabalSearch
-  - cabalvchk
-  - cabin
-  - cabocha
-  - cached
-  - cacophony
-  - caffegraph
-  - cairo-core
-  - cake
-  - cake3
-  - cakyrespa
-  - cal-layout
-  - cal3d
-  - cal3d-examples
-  - cal3d-opengl
-  - calc
-  - calculator
-  - caldims
-  - caledon
-  - calenderweek
-  - call
-  - call-alloy
-  - call-haskell-from-anything
-  - camfort
-  - campfire
-  - canonical-filepath
-  - canonical-json
-  - canteven-http
-  - canteven-listen-http
-  - canteven-log
-  - canteven-parsedate
-  - cantor
-  - cantor-pairing
-  - cao
-  - cap
-  - Capabilities
-  - capnp
-  - capped-list
-  - capri
-  - car-pool
-  - carbonara
-  - carboncopy
-  - carettah
-  - CarneadesDSL
-  - CarneadesIntoDung
-  - carte
-  - cartel
-  - Cartesian
-  - casa-abbreviations-and-acronyms
-  - casadi-bindings
-  - casadi-bindings-control
-  - casadi-bindings-core
-  - casadi-bindings-internal
-  - casadi-bindings-ipopt-interface
-  - casadi-bindings-snopt-interface
-  - Cascade
-  - cascading
-  - cash
-  - cassandra-cql
-  - Cassava
-  - cassava-conduit
-  - cassette
-  - cassy
-  - caster
-  - castle
-  - casui
-  - catamorphism
-  - Catana
-  - catch-fd
-  - categorical-algebra
-  - category
-  - category-extras
-  - category-traced
-  - catnplus
-  - cautious-gen
-  - cayley-client
-  - CBOR
-  - CC-delcont-alt
-  - CC-delcont-cxe
-  - CC-delcont-exc
-  - CC-delcont-ref
-  - CC-delcont-ref-tf
-  - CCA
-  - cci
-  - ccnx
-  - cctools-workqueue
-  - cedict
-  - cef
-  - cef3-raw
-  - cef3-simple
-  - ceilometer-common
-  - cellrenderer-cairo
-  - celtchar
-  - cerberus
-  - cereal-derive
-  - cereal-enumerator
-  - cereal-ieee754
-  - cereal-io-streams
-  - cereal-plus
-  - cereal-streams
-  - certificate
-  - cf
-  - cfipu
-  - cflp
-  - cfopu
-  - cg
-  - cgen
-  - cgi-utils
-  - cgrep
-  - chalkboard
-  - chalkboard-viewer
-  - charade
-  - chart-histogram
-  - Chart-simple
-  - chart-unit
-  - chatter
-  - chatty-text
-  - chatwork
-  - cheapskate-terminal
-  - check-pvp
-  - Checked
-  - checked
-  - checkmate
-  - chell-quickcheck
-  - chessIO
-  - chevalier-common
-  - chiasma
-  - chiphunk
-  - chitauri
-  - Chitra
-  - choose
-  - choose-exe
-  - chorale
-  - chorale-geo
-  - chp
-  - chp-mtl
-  - chp-plus
-  - chp-spec
-  - chp-transformers
-  - chr-core
-  - chr-lang
-  - chr-parse
-  - ChristmasTree
-  - chromatin
-  - chronograph
-  - chs-cabal
-  - chu2
-  - chunks
-  - chunky
-  - cielo
-  - cil
-  - cinvoke
-  - cio
-  - ciphersaber2
-  - circlehs
-  - citation-resolve
-  - citeproc-hs
-  - citeproc-hs-pandoc-filter
-  - cj-token
-  - cjk
-  - clac
-  - clafer
-  - claferIG
-  - claferwiki
-  - clang-compilation-database
-  - clang-pure
-  - clanki
-  - clarifai
-  - CLASE
-  - clash
-  - clash-multisignal
-  - Clash-Royale-Hack-Cheats
-  - clash-systemverilog
-  - clash-verilog
-  - clash-vhdl
-  - classify-frog
-  - ClassLaws
-  - classy-miso
-  - classy-parallel
-  - ClassyPrelude
-  - clckwrks
-  - clckwrks-cli
-  - clckwrks-dot-com
-  - clckwrks-plugin-bugs
-  - clckwrks-plugin-ircbot
-  - clckwrks-plugin-mailinglist
-  - clckwrks-plugin-media
-  - clckwrks-plugin-page
-  - clckwrks-theme-bootstrap
-  - clckwrks-theme-clckwrks
-  - clckwrks-theme-geo-bootstrap
-  - Clean
-  - clean-unions
-  - cless
-  - clevercss
-  - clexer
-  - CLI
-  - cli-builder
-  - clif
-  - clifford
-  - clifm
-  - clingo
-  - clippard
-  - clipper
-  - clippings
-  - clit
-  - clocked
-  - clogparse
-  - clone-all
-  - closure
-  - cloud-haskell
-  - cloud-seeder
-  - cloudfront-signer
-  - cloudi
-  - clr-inline
-  - clua
-  - cluss
-  - ClustalParser
-  - clustering
-  - clustertools
-  - clutterhs
-  - cmark-highlight
-  - cmark-patterns
-  - cmark-sections
-  - cmath
-  - cmathml3
-  - CMCompare
-  - cmd-item
-  - cmdargs-browser
-  - cmdlib
-  - cmdtheline
-  - cmonad
-  - cmph
-  - cmt
-  - cmu
-  - cmv
-  - cnc-spec-compiler
-  - co-log
-  - co-log-polysemy
-  - co-log-sys
-  - Coadjute
-  - coalpit
-  - cobot-io
-  - cobot-tools
-  - code-builder
-  - codec-beam
-  - codec-libevent
-  - codec-rpm
-  - codecov-haskell
-  - codemonitor
-  - codepad
-  - codeworld-api
-  - codex
-  - coin
-  - coinbase-exchange
-  - coinbase-pro
-  - coincident-root-loci
-  - colada
-  - colchis
-  - collada-output
-  - collada-types
-  - collapse-duplication
-  - collapse-util
-  - collection-json
-  - collections
-  - collections-api
-  - collections-base-instances
-  - Color
-  - color-counter
-  - colorless
-  - colorless-http-client
-  - colorless-scotty
-  - colour-space
-  - coltrane
-  - columbia
-  - com
-  - comark-syntax
-  - combinat
-  - combinat-diagrams
-  - combinator-interactive
-  - combinatorial-problems
-  - Combinatorrent
-  - combobuffer
-  - Command
-  - commander
-  - Commando
-  - commodities
-  - commsec
-  - commsec-keyexchange
-  - comonad-extras
-  - ComonadSheet
-  - compact-map
-  - compact-mutable
-  - compact-socket
-  - compact-string
-  - compact-string-fix
-  - compact-word-vectors
-  - Compactable
-  - compdata-dags
-  - competition
-  - compilation
-  - complexity
-  - compose-trans
-  - composite-aeson
-  - composite-aeson-refined
-  - composite-base
-  - composite-ekg
-  - composite-opaleye
-  - composite-swagger
-  - composition-tree
-  - compound-types
-  - compressed
-  - compstrat
-  - comptrans
-  - computational-algebra
-  - computations
-  - concraft
-  - concraft-hr
-  - concraft-pl
-  - concrete-haskell
-  - concrete-haskell-autogen
-  - concrete-relaxng-parser
-  - concrete-typerep
-  - concurrent-buffer
-  - Concurrent-Cache
-  - concurrent-dns-cache
-  - concurrent-machines
-  - concurrent-state
-  - Concurrential
-  - ConcurrentUtils
-  - Condor
-  - condor
-  - condorcet
-  - conductive-base
-  - conductive-hsc3
-  - conductive-song
-  - conduit-audio-lame
-  - conduit-audio-samplerate
-  - conduit-find
-  - conduit-network-stream
-  - conduit-resumablesink
-  - conduit-throttle
-  - conduit-tokenize-attoparsec
-  - conf
-  - conffmt
-  - confide
-  - config-parser
-  - config-select
-  - config-value-getopt
-  - ConfigFileTH
-  - Configger
-  - configifier
-  - Configurable
-  - configuration
-  - configurator-ng
-  - congruence-relation
-  - conjure
-  - conkin
-  - conlogger
-  - connection-string
-  - connections
-  - Conscript
-  - consistent
-  - const-math-ghc-plugin
-  - constr-eq
-  - constrained-categories
-  - constrained-category
-  - constrained-dynamic
-  - constrained-monads
-  - constraint
-  - constraint-manip
-  - constraint-reflection
-  - ConstraintKinds
-  - constraints-emerge
-  - constructive-algebra
-  - consul-haskell
-  - Consumer
-  - consumers
-  - containers-benchmark
-  - containers-unicode-symbols
-  - ContArrow
-  - content-store
-  - context-free-grammar
-  - context-stack
-  - ContextAlgebra
-  - contiguous
-  - contiguous-checked
-  - contiguous-fft
-  - continue
-  - continuum
-  - continuum-client
-  - Contract
-  - control-monad-attempt
-  - control-monad-exception
-  - control-monad-exception-monadsfd
-  - control-monad-exception-monadstf
-  - control-monad-exception-mtl
-  - control-monad-failure
-  - control-monad-failure-mtl
-  - Control-Monad-MultiPass
-  - Control-Monad-ST2
-  - contstuff-monads-tf
-  - contstuff-transformers
-  - convert-annotation
-  - convertible-ascii
-  - convertible-text
-  - copilot
-  - copilot-cbmc
-  - copilot-language
-  - copilot-libraries
-  - copilot-sbv
-  - copilot-theorem
-  - copr
-  - COrdering
-  - core
-  - core-haskell
-  - core-program
-  - corebot-bliki
-  - CoreDump
-  - CoreErlang
-  - CoreFoundation
-  - Coroutine
-  - coroutine-enumerator
-  - coroutine-iteratee
-  - coroutine-object
-  - couch-hs
-  - couch-simple
-  - CouchDB
-  - couchdb-conduit
-  - couchdb-enumerator
-  - countable-inflections
-  - counter
-  - courier
-  - court
-  - coverage
-  - coya
-  - cparsing
-  - CPBrainfuck
-  - cpio-conduit
-  - cpkg
-  - cplusplus-th
-  - cprng-aes-effect
-  - cpuperf
-  - cpython
-  - cql-io
-  - cql-io-tinylog
-  - cqrs-core
-  - cqrs-example
-  - cqrs-memory
-  - cqrs-postgresql
-  - cqrs-sqlite3
-  - cqrs-test
-  - cqrs-testkit
-  - cr
-  - crack
-  - craft
-  - Craft3e
-  - craftwerk
-  - craftwerk-cairo
-  - craftwerk-gtk
-  - crawlchain
-  - craze
-  - crc
-  - crc16
-  - creatur
-  - credential-store
-  - crf-chain1
-  - crf-chain1-constrained
-  - crf-chain2-generic
-  - crf-chain2-tiers
-  - critbit
-  - criterion-compare
-  - criterion-plus
-  - criterion-to-html
-  - criu-rpc
-  - criu-rpc-types
-  - crjdt-haskell
-  - crocodile
-  - cron
-  - cron-compat
-  - cruncher-types
-  - crunghc
-  - crypto-cipher-benchmarks
-  - crypto-classical
-  - crypto-conduit
-  - crypto-multihash
-  - crypto-random-effect
-  - crypto-simple
-  - cryptocompare
-  - cryptoconditions
-  - cryptol
-  - cryptostore
-  - cryptsy-api
-  - crystalfontz
-  - csa
-  - cse-ghc-plugin
-  - csg
-  - CSPM-cspm
-  - CSPM-FiringRules
-  - CSPM-Frontend
-  - CSPM-Interpreter
-  - CSPM-ToProlog
-  - cspmchecker
-  - cspretty
-  - css
-  - csv-enumerator
-  - csv-nptools
-  - ctemplate
-  - ctkl
-  - ctpl
-  - cube
-  - cuboid
-  - cuckoo
-  - cudd
-  - currency-convert
-  - curry-frontend
-  - CurryDB
-  - cursedcsv
-  - curve25519
-  - curves
-  - custom-prelude
-  - CV
-  - cypher
-  - d-bus
-  - d3js
-  - dag
-  - DAG-Tournament
-  - Dangerous
-  - Dao
-  - dao
-  - dapi
-  - darcs-benchmark
-  - darcs-beta
-  - darcs-buildpackage
-  - darcs-cabalized
-  - darcs-fastconvert
-  - darcs-graph
-  - darcs-monitor
-  - darcs2dot
-  - darcsden
-  - DarcsHelpers
-  - darcswatch
-  - darkplaces-demo
-  - darkplaces-rcon
-  - darkplaces-rcon-util
-  - darkplaces-text
-  - dash-haskell
-  - data-accessor-monads-fd
-  - data-accessor-monads-tf
-  - data-base
-  - data-basic
-  - data-category
-  - data-check
-  - data-concurrent-queue
-  - data-construction
-  - data-cycle
-  - data-dispersal
-  - data-easy
-  - data-emoticons
-  - data-filepath
-  - data-fin
-  - data-fin-simple
-  - data-flagset
-  - data-interval
-  - data-ivar
-  - data-kiln
-  - data-layer
-  - data-lens
-  - data-lens-fd
-  - data-lens-ixset
-  - data-lens-template
-  - data-map-multikey
-  - data-named
-  - data-nat
-  - data-object
-  - data-object-json
-  - data-object-yaml
-  - data-pprint
-  - data-quotientref
-  - data-r-tree
-  - data-reify-cse
-  - data-repr
-  - data-result
-  - data-rev
-  - Data-Rope
-  - data-rope
-  - data-rtuple
-  - data-size
-  - data-spacepart
-  - data-standards
-  - data-store
-  - data-structure-inferrer
-  - data-type
-  - data-util
-  - data-variant
-  - database-id-groundhog
-  - database-study
-  - datadog
-  - datadog-tracing
-  - datafix
-  - dataflow
-  - DataIndex
-  - datalog
-  - datasets
-  - DataTreeView
-  - datetime
-  - datetime-sb
-  - dawdle
-  - dawg
-  - dawg-ord
-  - dbcleaner
-  - DBFunctor
-  - dbjava
-  - DBlimited
-  - dbm
-  - dbmigrations-mysql
-  - dbmigrations-postgresql
-  - dbmigrations-sqlite
-  - DBus
-  - dbus-client
-  - dbus-core
-  - dbus-qq
-  - dclabel
-  - dclabel-eci11
-  - dcpu16
-  - ddate
-  - ddc-base
-  - ddc-build
-  - ddc-code
-  - ddc-core
-  - ddc-core-babel
-  - ddc-core-eval
-  - ddc-core-flow
-  - ddc-core-llvm
-  - ddc-core-salt
-  - ddc-core-simpl
-  - ddc-core-tetra
-  - ddc-driver
-  - ddc-interface
-  - ddc-source-tetra
-  - ddc-tools
-  - ddc-war
-  - ddci-core
-  - dde
-  - dead-code-detection
-  - dead-simple-json
-  - Deadpan-DDP
-  - debian
-  - debug
-  - debug-me
-  - debug-trace-var
-  - decepticons
-  - decimal-arithmetic
-  - DecisionTree
-  - declarative
-  - decoder-conduit
-  - dedukti
-  - deepcontrol
-  - deeplearning-hs
-  - deepseq-bounded
-  - deepseq-magic
-  - deepseq-th
-  - deepzoom
-  - defargs
-  - DefendTheKing
-  - deka
-  - deka-tests
-  - delaunay
-  - delicious
-  - delimited-text
-  - delimiter-separated
-  - delta
-  - delta-h
-  - Delta-Lambda
-  - delude
-  - demarcate
-  - denominate
-  - dense-int-set
-  - dependent-monoidal-map
-  - dependent-state
-  - dependent-sum-aeson-orphans
-  - depends
-  - dephd
-  - deptrack-core
-  - deptrack-devops
-  - deptrack-dot
-  - dequeue
-  - derangement
-  - derivation-trees
-  - derive
-  - derive-enumerable
-  - derive-gadt
-  - derive-IG
-  - derive-monoid
-  - derive-topdown
-  - derive-trie
-  - derp-lib
-  - describe
-  - descript-lang
-  - deterministic-game-engine
-  - detour-via-sci
-  - detour-via-uom
-  - deunicode
-  - devil
-  - dewdrop
-  - dfinity-radix-tree
-  - Dflow
-  - dfsbuild
-  - dgim
-  - dgs
-  - dhall-check
-  - dhall-fly
-  - dhall-lsp-server
-  - dhall-nix
-  - dhall-to-cabal
-  - dhall-yaml
-  - dhcp-lease-parser
-  - dhrun
-  - dia-base
-  - dia-functions
-  - diagrams-boolean
-  - diagrams-builder
-  - diagrams-canvas
-  - diagrams-graphviz
-  - diagrams-gtk
-  - diagrams-haddock
-  - diagrams-hsqml
-  - diagrams-html5
-  - diagrams-pandoc
-  - diagrams-pdf
-  - diagrams-qrcode
-  - diagrams-tikz
-  - diagrams-wx
-  - dib
-  - dice-entropy-conduit
-  - dice2tex
-  - dicom
-  - dictionaries
-  - dictparser
-  - diet
-  - diff
-  - diffcabal
-  - difference-monoid
-  - DifferenceLogic
-  - differential
-  - DifferentialEvolution
-  - difftodo
-  - digestive-bootstrap
-  - digestive-foundation-lucid
-  - digestive-functors-happstack
-  - digestive-functors-heist
-  - digestive-functors-hsp
-  - digit
-  - DigitalOcean
-  - digitalocean-kzs
-  - digraph
-  - dimensional-tf
-  - DimensionalHash
-  - dingo-core
-  - dingo-example
-  - dingo-widgets
-  - diophantine
-  - diplomacy
-  - diplomacy-server
-  - direct-binary-files
-  - direct-fastcgi
-  - direct-http
-  - direct-plugins
-  - direct-rocksdb
-  - directed-cubical
-  - dirfiles
-  - dirtree
-  - discogs-haskell
-  - discord-gateway
-  - discord-haskell
-  - discord-hs
-  - discord-rest
-  - discord-types
-  - discordian-calendar
-  - DiscussionSupportSystem
-  - Dish
-  - disjoint-containers
-  - disjoint-set
-  - disjoint-set-stateful
-  - diskhash
-  - disposable
-  - dist-upload
-  - distance
-  - DisTract
-  - distributed-fork-aws-lambda
-  - distributed-process
-  - distributed-process-async
-  - distributed-process-azure
-  - distributed-process-client-server
-  - distributed-process-ekg
-  - distributed-process-execution
-  - distributed-process-extras
-  - distributed-process-fsm
-  - distributed-process-lifted
-  - distributed-process-monad-control
-  - distributed-process-p2p
-  - distributed-process-platform
-  - distributed-process-registry
-  - distributed-process-simplelocalnet
-  - distributed-process-supervisor
-  - distributed-process-systest
-  - distributed-process-task
-  - distributed-process-tests
-  - distributed-process-zookeeper
-  - distributed-static
-  - distribution
-  - distribution-plot
-  - diversity
-  - dixi
-  - djembe
-  - djinn-th
-  - dl-fedora
-  - dmcc
-  - dmenu
-  - dmenu-pkill
-  - dmenu-pmount
-  - dmenu-search
-  - DMuCheck
-  - DnaProteinAlignment
-  - dnscache
-  - dnsrbl
-  - dnssd
-  - doc-review
-  - doccheck
-  - docidx
-  - docker
-  - docker-build-cacher
-  - dockercook
-  - docrecords
-  - DocTest
-  - doctest-discover-configurator
-  - doctest-driver-gen
-  - doctest-prop
-  - docusign-example
-  - docvim
-  - doi
-  - DOM
-  - dom-lt
-  - domain-auth
-  - domplate
-  - dot-linker
-  - dot2graphml
-  - dotfs
-  - doublify-toolkit
-  - dovin
-  - download-media-content
-  - dozenal
-  - dozens
-  - DP
-  - dph-base
-  - dph-examples
-  - dph-lifted-base
-  - dph-lifted-copy
-  - dph-lifted-vseg
-  - dph-prim-interface
-  - dph-prim-par
-  - dph-prim-seq
-  - dpkg
-  - DPM
-  - dpor
-  - dragen
-  - drawille
-  - drClickOn
-  - dresdner-verkehrsbetriebe
-  - DrHylo
-  - DrIFT
-  - DrIFT-cabalized
-  - drifter-postgresql
-  - drmaa
-  - drone
-  - dropbox-sdk
-  - dropsolve
-  - ds-kanren
-  - DSA
-  - DSH
-  - dsh-sql
-  - dsmc
-  - dsmc-tools
-  - dson-parsec
-  - DSTM
-  - dstring
-  - dtab
-  - DTC
-  - dtd
-  - dtd-text
-  - dtw
-  - dual
-  - duet
-  - Dung
-  - duplo
-  - Dust
-  - Dust-crypto
-  - Dust-tools
-  - Dust-tools-pcap
-  - dvault
-  - dvda
-  - dvdread
-  - dvi-processing
-  - dwarfadt
-  - dyckword
-  - dynamic-cabal
-  - dynamic-object
-  - dynamic-plot
-  - dynamic-pp
-  - DynamicTimeWarp
-  - dynamodb-simple
-  - dynobud
-  - DysFRP
-  - DysFRP-Cairo
-  - DysFRP-Craftwerk
-  - dywapitchtrack
-  - dzen-dhall
-  - dzen-utils
-  - earclipper
-  - ease
-  - easy-api
-  - easyjson
-  - easyplot
-  - ebeats
-  - ebnf-bff
-  - ecma262
-  - ecu
-  - eddie
-  - edenmodules
-  - edenskel
-  - edentv
-  - edge
-  - edges
-  - edit
-  - edit-lenses
-  - editable
-  - editline
-  - EditTimeReport
-  - effect-handlers
-  - effect-stack
-  - effin
-  - egison
-  - egison-quote
-  - egison-tutorial
-  - ehaskell
-  - ehs
-  - eibd-client-simple
-  - eigen
-  - Eight-Ball-Pool-Hack-Cheats
-  - either-list-functions
-  - EitherT
-  - ekg-elastic
-  - ekg-elasticsearch
-  - ekg-influxdb
-  - ekg-log
-  - ekg-push
-  - ekg-rrd
-  - elevator
-  - elision
-  - elliptic-curve
-  - elm-street
-  - elm-websocket
-  - elsa
-  - elynx-seq
-  - elynx-tree
-  - emacs-keys
-  - email
-  - email-header
-  - email-postmark
-  - email-validator
-  - emailparse
-  - embeddock
-  - embeddock-example
-  - embroidery
-  - emgm
-  - Emping
-  - Empty
-  - empty-monad
-  - enchant
-  - encoding-io
-  - engine-io-growler
-  - engine-io-snap
-  - engine-io-yesod
-  - entangle
-  - EntrezHTTP
-  - entwine
-  - EnumContainers
-  - enumerate
-  - enumerate-function
-  - enumeration
-  - enumerator
-  - enumerator-fd
-  - enumerator-tf
-  - enumfun
-  - EnumMap
-  - enummapmap
-  - enummapset-th
-  - env-extra
-  - env-parser
-  - envstatus
-  - epanet-haskell
-  - epass
-  - epic
-  - epoll
-  - eprocess
-  - epubname
-  - Eq
-  - EqualitySolver
-  - erd
-  - erf-native
-  - eros
-  - eros-client
-  - eros-http
-  - error-codes
-  - error-context
-  - error-continuations
-  - error-list
-  - error-loc
-  - error-message
-  - errors-ext
-  - ersaconcat
-  - ersatz
-  - ersatz-toysat
-  - ert
-  - escape-artist
-  - escoger
-  - esotericbot
-  - EsounD
-  - espial
-  - ess
-  - essence-of-live-coding
-  - essence-of-live-coding-gloss
-  - essence-of-live-coding-pulse
-  - essence-of-live-coding-quickcheck
-  - estimators
-  - EstProgress
-  - estreps
-  - Etage
-  - Etage-Graph
-  - EtaMOO
-  - eternal
-  - Eternal10Seconds
-  - eternity
-  - eternity-timestamped
-  - ether
-  - Etherbunny
-  - ethereum-analyzer
-  - ethereum-analyzer-cli
-  - ethereum-analyzer-webui
-  - ethereum-client-haskell
-  - ethereum-merkle-patricia-db
-  - eths-rlp
-  - euler-tour-tree
-  - euphoria
-  - eurofxref
-  - evdev
-  - eve
-  - eve-cli
-  - event
-  - event-driven
-  - event-monad
-  - eventful-dynamodb
-  - eventful-postgresql
-  - eventlog2html
-  - EventSocket
-  - eventsource-geteventstore-store
-  - eventsource-store-specs
-  - eventsource-stub-store
-  - eventstore
-  - every-bit-counts
-  - exact-cover
-  - exact-real
-  - exact-real-positional
-  - except-exceptions
-  - exception-hierarchy
-  - exception-monads-fd
-  - exchangerates
-  - execs
-  - executor
-  - exference
-  - exherbo-cabal
-  - exif
-  - exinst-deepseq
-  - exinst-hashable
-  - exist-instances
-  - exists
-  - exitcode
-  - expand
-  - expat-enumerator
-  - expiring-containers
-  - explain
-  - explicit-constraint-lens
-  - explicit-determinant
-  - explicit-iomodes
-  - explicit-iomodes-bytestring
-  - explicit-iomodes-text
-  - explicit-sharing
-  - explore
-  - exposed-containers
-  - expressions-z3
-  - extcore
-  - extemp
-  - extended-categories
-  - extensible-data
-  - extensible-effects-concurrent
-  - extensible-skeleton
-  - Extra
-  - extract-dependencies
-  - extractelf
-  - extralife
-  - ez-couch
-  - ez3
-  - f-ree-hack-cheats-free-v-bucks-generator
-  - Facebook-Password-Hacker-Online-Latest-Version
-  - faceted
-  - factory
-  - Facts
-  - factual-api
-  - fadno
-  - fadno-braids
-  - fadno-xml
-  - failable-list
-  - failure-detector
-  - FailureT
-  - fake-type
-  - faktory
-  - falling-turnip
-  - fallingblocks
-  - family-tree
-  - fast-arithmetic
-  - fast-combinatorics
-  - fast-nats
-  - fasta
-  - fastbayes
-  - fastedit
-  - fastirc
-  - fastly
-  - FastPush
-  - FastxPipe
-  - fathead-util
-  - fault-tree
-  - fay
-  - fay-base
-  - fay-builder
-  - fay-dom
-  - fay-geoposition
-  - fay-hsx
-  - fay-jquery
-  - fay-ref
-  - fay-simplejson
-  - fay-text
-  - fay-uri
-  - fay-websockets
-  - fb-persistent
-  - fbmessenger-api
-  - fca
-  - fcache
-  - fcd
-  - fcg
-  - fckeditor
-  - fclabels-monadlib
-  - FComp
-  - fdo-trash
-  - feature-flipper
-  - feature-flipper-postgres
-  - fedora-haskell-tools
-  - fedora-img-dl
-  - fedora-packages
-  - feed-cli
-  - feed-collect
-  - feed-crawl
-  - feed-gipeda
-  - feed-translator
-  - feed2lj
-  - feed2twitter
-  - fei-base
-  - fei-cocoapi
-  - fei-dataiter
-  - fei-examples
-  - fei-nn
-  - feldspar-compiler
-  - feldspar-language
-  - fenfire
-  - FermatsLastMargin
-  - fernet
-  - FerryCore
-  - festung
-  - Feval
-  - ffeed
-  - ffmpeg-light
-  - ffmpeg-tutorials
-  - ffunctor
-  - fgl-extras-decompositions
-  - fibon
-  - ficketed
-  - fields
-  - FieldTrip
-  - fieldwise
-  - fig
-  - file-collection
-  - file-command-qq
-  - file-location
-  - filediff
-  - FileManip
-  - FileManipCompat
-  - fileneglect
-  - filepath-io-access
-  - FilePather
-  - filepather
-  - Files
-  - filestore
-  - FileSystem
-  - filesystem-conduit
-  - filesystem-enumerator
-  - filesystem-trees
-  - fillit
-  - Fin
-  - final-pretty-printer
-  - Finance-Quote-Yahoo
-  - Finance-Treasury
-  - find-clumpiness
-  - find-conduit
-  - find-source-files
-  - findhttp
-  - fingertree-psqueue
-  - fingertree-tf
-  - finitary
-  - finitary-derive
-  - FiniteMap
-  - firefly-example
-  - first-and-last
-  - firstify
-  - FirstOrderTheory
-  - fishfood
-  - fit
-  - fits-parse
-  - fitsio
-  - fix-parser-simple
-  - fix-symbols-gitit
-  - fixed-point
-  - fixed-point-vector
-  - fixed-point-vector-space
-  - fixed-precision
-  - fixed-storable-array
-  - fixed-timestep
-  - fixed-vector-binary
-  - fixed-vector-cborg
-  - fixed-vector-cereal
-  - fixed-width
-  - fixer
-  - fixfile
-  - fixhs
-  - fixie
-  - fizzbuzz
-  - fizzbuzz-as-a-service
-  - flac
-  - flac-picture
-  - flamethrower
-  - flamingra
-  - flat-maybe
-  - flatbuffers
-  - flexible-time
-  - flexiwrap
-  - flexiwrap-smallcheck
-  - flickr
-  - flight-kml
-  - Flippi
-  - flite
-  - float-binstring
-  - floating-bits
-  - floskell
-  - flow-er
-  - flow2dot
-  - flowdock
-  - flowdock-api
-  - flowdock-rest
-  - flower
-  - flowlocks-framework
-  - flowsim
-  - fltkhs-fluid-examples
-  - fluent-logger
-  - fluidsynth
-  - flux-monoid
-  - FM-SBLEX
-  - fmark
-  - FModExRaw
-  - fn-extra
-  - foldl-incremental
-  - foldl-statistics
-  - folds-common
-  - follow
-  - follower
-  - foma
-  - font-opengl-basic4x6
-  - foo
-  - for-free
-  - forbidden-fruit
-  - fordo
-  - forecast-io
-  - foreign-var
-  - forest-fire
-  - Forestry
-  - forger
-  - ForkableT
-  - forma
-  - formal
-  - FormalGrammars
-  - format
-  - format-status
-  - formattable
-  - forml
-  - formlets
-  - formlets-hsp
-  - formura
-  - ForSyDe
-  - forsyde-deep
-  - forth-hll
-  - Fortnite-Hack-Cheats-Free-V-Bucks-Generator
-  - fortran-src
-  - fortytwo
-  - foscam-directory
-  - foscam-filename
-  - foscam-sort
-  - Foster
-  - fpco-api
-  - fplll
-  - fpnla-examples
-  - FPretty
-  - fptest
-  - Fractaler
-  - fractals
-  - frag
-  - Frames
-  - Frames-beam
-  - Frames-dsv
-  - Frames-map-reduce
-  - franchise
-  - Frank
-  - freddy
-  - free-category
-  - free-concurrent
-  - free-functors
-  - free-game
-  - free-http
-  - free-operational
-  - free-theorems
-  - free-theorems-counterexamples
-  - free-theorems-seq
-  - free-theorems-seq-webui
-  - free-theorems-webui
-  - free-v-bucks-generator-no-survey
-  - free-v-bucks-generator-ps4-no-survey
-  - free-vector-spaces
-  - freekick2
-  - freelude
-  - freer-converse
-  - freer-effects
-  - freer-simple-catching
-  - freer-simple-http
-  - freer-simple-profiling
-  - freer-simple-random
-  - freer-simple-time
-  - freesect
-  - freesound
-  - freetype-simple
-  - FreeTypeGL
-  - freq
-  - fresh
-  - friday-devil
-  - friday-scale-dct
-  - front
-  - frown
-  - frp-arduino
-  - frpnow
-  - frpnow-gloss
-  - frpnow-gtk
-  - frpnow-gtk3
-  - frpnow-vty
-  - fs-events
-  - fsh-csv
-  - fsmActions
-  - fsutils
-  - fswait
-  - ft-generator
-  - ftdi
-  - FTGL-bytestring
-  - ftp-client
-  - ftp-client-conduit
-  - ftp-conduit
-  - FTPLine
-  - ftshell
-  - full-sessions
-  - fullstop
-  - funbot
-  - funbot-client
-  - funbot-git-hook
-  - funcons-lambda-cbv-mp
-  - function-combine
-  - function-instances-algebra
-  - functional-arrow
-  - functor
-  - functor-combinators
-  - functor-products
-  - functorm
-  - funflow
-  - funflow-nix
-  - FunGEn
-  - Fungi
-  - funion
-  - funnyprint
-  - funpat
-  - funsat
-  - fused-effects-exceptions
-  - fused-effects-lens
-  - fused-effects-random
-  - fused-effects-resumable
-  - fused-effects-squeal
-  - fusion
-  - futhark
-  - futun
-  - future
-  - fuzzy-timings
-  - fwgl
-  - fwgl-glfw
-  - fwgl-javascript
-  - g-npm
-  - g2
-  - g2q
-  - g4ip
-  - gact
-  - galois-fft
-  - game-probability
-  - gameclock
-  - gamgee
-  - Gamgine
-  - gamma
-  - Ganymede
-  - garepinoh
-  - gargoyle
-  - gargoyle-postgresql
-  - gas
-  - gbu
-  - gc-monitoring-wai
-  - gcodehs
-  - gconf
-  - gdax
-  - gdiff-ig
-  - gdiff-th
-  - GeBoP
-  - gedcom
-  - geek
-  - geek-server
-  - gegl
-  - gelatin
-  - gelatin-freetype2
-  - gelatin-fruity
-  - gelatin-gl
-  - gelatin-sdl2
-  - gelatin-shaders
-  - gemstone
-  - gen-imports
-  - gen-passwd
-  - Genbank
-  - gencheck
-  - gender
-  - genders
-  - Gene-CluEDO
-  - general-prelude
-  - GeneralTicTacToe
-  - generators
-  - generic-accessors
-  - generic-binary
-  - generic-church
-  - generic-enum
-  - generic-lens-labels
-  - generic-lucid-scaffold
-  - generic-maybe
-  - generic-pretty
-  - generic-storable
-  - generic-tree
-  - generic-xml
-  - generic-xmlpickler
-  - generics-mrsop-gdiff
-  - genericserialize
-  - genesis
-  - genesis-test
-  - genetics
-  - GenI
-  - geni-gui
-  - geni-util
-  - geniconvert
-  - geniplate
-  - geniserver
-  - genprog
-  - GenSmsPdu
-  - gentlemark
-  - GenussFold
-  - genvalidity-mergeless
-  - geo-resolver
-  - GeocoderOpenCage
-  - geodetic
-  - geodetic-types
-  - geojson
-  - geojson-types
-  - geolite-csv
-  - geom2d
-  - GeomPredicates-SSE
-  - geos
-  - Get
-  - getemx
-  - getflag
-  - GGg
-  - ggtsTC
-  - gh-labeler
-  - ghc-core-smallstep
-  - ghc-datasize
-  - ghc-dump-tree
-  - ghc-dup
-  - ghc-events-analyze
-  - ghc-events-parallel
-  - ghc-generic-instances
-  - ghc-imported-from
-  - ghc-instances
-  - ghc-man-completion
-  - ghc-mod
-  - ghc-parmake
-  - ghc-pkg-autofix
-  - ghc-pkg-lib
-  - ghc-proofs
-  - ghc-session
-  - ghc-simple
-  - ghc-srcspan-plugin
-  - ghc-syb
-  - ghc-syb-utils
-  - ghc-time-alloc-prof
-  - ghc-trace-events
-  - ghc-typelits-presburger
-  - ghc-usage
-  - ghc-vis
-  - ghci-diagrams
-  - ghci-haskeline
-  - ghci-history-parser
-  - ghci-lib
-  - ghci-ng
-  - ghci-pretty
-  - ghcide
-  - ghcjs-base-stub
-  - ghcjs-dom-jsffi
-  - ghcjs-fetch
-  - ghcjs-hplay
-  - ghcjs-promise
-  - ghcjs-xhr
-  - ghclive
-  - ghcprofview
-  - ght
-  - gi-cairo-again
-  - gi-graphene
-  - gi-gsk
-  - gi-gstpbutils
-  - gi-gsttag
-  - gi-gtk-declarative
-  - gi-gtk-declarative-app-simple
-  - gi-gtkosxapplication
-  - gi-handy
-  - gi-notify
-  - gi-poppler
-  - gi-secret
-  - gi-wnck
-  - giak
-  - Gifcurry
-  - ginsu
-  - gipeda
-  - giphy-api
-  - GiST
-  - gist
-  - git-checklist
-  - git-config
-  - git-date
-  - git-fmt
-  - git-gpush
-  - git-jump
-  - git-mediate
-  - git-object
-  - git-remote-ipfs
-  - git-repair
-  - git-sanity
-  - git-vogue
-  - gitdo
-  - github-backup
-  - github-data
-  - github-tools
-  - github-utils
-  - github-webhook-handler
-  - github-webhook-handler-snap
-  - gitignore
-  - gitit
-  - gitlab-api
-  - gitlib-cross
-  - gitlib-s3
-  - gitlib-utils
-  - gitson
-  - givegif
-  - glade
-  - gladexml-accessor
-  - glapp
-  - glazier-pipes
-  - glazier-react
-  - glazier-react-examples
-  - glazier-react-widget
-  - GLFW-b-demo
-  - GLFW-OGL
-  - gli
-  - glicko
-  - glider-nlp
-  - GLMatrix
-  - glob-posix
-  - global
-  - global-config
-  - global-variables
-  - glome-hs
-  - GlomeTrace
-  - GlomeView
-  - gloss-banana
-  - gloss-devil
-  - gloss-export
-  - gloss-game
-  - gloss-sodium
-  - glpk-hs
-  - glue
-  - gmap
-  - gmndl
-  - gnome-desktop
-  - gnomevfs
-  - gnss-converters
-  - gnuidn
-  - goal-core
-  - goal-geometry
-  - goal-probability
-  - goal-simulation
-  - goatee
-  - goatee-gtk
-  - gochan
-  - gofer-prelude
-  - gooey
-  - google-cloud
-  - google-drive
-  - google-html5-slide
-  - google-mail-filters
-  - google-maps-geocoding
-  - google-oauth2
-  - google-oauth2-easy
-  - google-search
-  - google-static-maps
-  - google-translate
-  - GoogleCodeJam
-  - GoogleDirections
-  - googleplus
-  - googlepolyline
-  - GoogleSB
-  - GoogleTranslate
-  - gopherbot
-  - gore-and-ash
-  - gore-and-ash-actor
-  - gore-and-ash-async
-  - gore-and-ash-demo
-  - gore-and-ash-glfw
-  - gore-and-ash-lambdacube
-  - gore-and-ash-logging
-  - gore-and-ash-network
-  - gore-and-ash-sdl
-  - gore-and-ash-sync
-  - GotoT-transformers
-  - gotta-go-fast
-  - gpah
-  - GPipe
-  - GPipe-Collada
-  - GPipe-Examples
-  - GPipe-GLFW
-  - GPipe-TextureLoad
-  - gps
-  - gps2htmlReport
-  - GPX
-  - gpx-conduit
-  - grab
-  - grab-form
-  - graceful
-  - graflog
-  - Grafos
-  - grakn
-  - grammar-combinators
-  - GrammarProducts
-  - grapefruit-examples
-  - grapefruit-frp
-  - grapefruit-records
-  - grapefruit-ui
-  - grapefruit-ui-gtk
-  - graph-matchings
-  - graph-rewriting
-  - graph-rewriting-cl
-  - graph-rewriting-gl
-  - graph-rewriting-lambdascope
-  - graph-rewriting-layout
-  - graph-rewriting-ski
-  - graph-rewriting-strategies
-  - graph-rewriting-trs
-  - graph-rewriting-ww
-  - graph-serialize
-  - graph-utils
-  - graph-visit
-  - Graph500
-  - graphbuilder
-  - graphene
-  - GraphHammer
-  - GraphHammer-examples
-  - graphics-drawingcombinators
-  - graphics-formats-collada
-  - graphicsFormats
-  - graphicstools
-  - graphite
-  - graphql
-  - graphql-api
-  - graphtype
-  - graql
-  - grasp
-  - gray-code
-  - greencard
-  - greencard-lib
-  - greg-client
-  - gremlin-haskell
-  - Grempa
-  - grenade
-  - grid-proto
-  - gridbounds
-  - gridland
-  - grm
-  - groot
-  - gross
-  - GroteTrap
-  - groundhog-converters
-  - group-with
-  - growler
-  - GrowlNotify
-  - grpc-api-etcd
-  - grpc-etcd-client
-  - grpc-haskell
-  - grpc-haskell-core
-  - gruff
-  - gruff-examples
-  - gsc-weighting
-  - gscholar-rss
-  - gsl-random
-  - gsl-random-fu
-  - gstorable
-  - gstreamer
-  - GTALib
-  - gtfs
-  - gtfs-realtime
-  - gtk-serialized-event
-  - gtk-toy
-  - gtk2hs-hello
-  - gtk2hs-rpn
-  - Gtk2hsGenerics
-  - gtk3-mac-integration
-  - gtkglext
-  - GtkGLTV
-  - gtkimageview
-  - gtkrsync
-  - gtksourceview2
-  - gtksourceview3
-  - guarded-rewriting
-  - guess-combinator
-  - guid
-  - GuiHaskell
-  - GuiTV
-  - gulcii
-  - gyah-bin
-  - h-booru
-  - h-gpgme
-  - h-reversi
-  - h2048
-  - h2c
-  - haar
-  - habit
-  - HABQT
-  - Hach
-  - hack-contrib
-  - hack-contrib-press
-  - hack-frontend-happstack
-  - hack-handler-cgi
-  - hack-handler-epoll
-  - hack-handler-evhttp
-  - hack-handler-fastcgi
-  - hack-handler-happstack
-  - hack-handler-hyena
-  - hack-handler-kibro
-  - hack-handler-simpleserver
-  - hack-middleware-cleanpath
-  - hack-middleware-clientsession
-  - hack-middleware-jsonp
-  - hack2-handler-happstack-server
-  - hack2-handler-mongrel2-http
-  - hack2-handler-snap-server
-  - hack2-handler-warp
-  - hackage-diff
-  - hackage-mirror
-  - hackage-processing
-  - hackage-proxy
-  - hackage-repo-tool
-  - hackage-security-HTTP
-  - hackage-server
-  - hackage2hwn
-  - hackage2twitter
-  - hackager
-  - hackernews
-  - HackMail
-  - hackmanager
-  - hactor
-  - hactors
-  - haddock-leksah
-  - haddock-test
-  - haddocset
-  - hadoop-formats
-  - hadoop-rpc
-  - hadoop-tools
-  - haggis
-  - Haggressive
-  - hahp
-  - haiji
-  - hailgun
-  - hailgun-send
-  - hailgun-simple
-  - hairy
-  - hakaru
-  - hakismet
-  - hakka
-  - hako
-  - hakyll-agda
-  - hakyll-blaze-templates
-  - hakyll-contrib
-  - hakyll-contrib-csv
-  - hakyll-contrib-elm
-  - hakyll-contrib-hyphenation
-  - hakyll-contrib-links
-  - hakyll-convert
-  - hakyll-dhall
-  - hakyll-dir-list
-  - hakyll-favicon
-  - hakyll-filestore
-  - hakyll-ogmarkup
-  - hakyll-R
-  - hakyll-series
-  - hakyll-shakespeare
-  - hakyll-shortcode
-  - hakyll-shortcut-links
-  - hakyll-typescript
-  - halberd
-  - halfs
-  - halipeto
-  - halive
-  - hall-symbols
-  - halma-gui
-  - halma-telegram-bot
-  - halves
-  - HaMinitel
-  - hampp
-  - hamsql
-  - hamtmap
-  - hamusic
-  - handa-gdata
-  - handle-like
-  - handsy
-  - Hangman
-  - hannahci
-  - hans
-  - hans-pcap
-  - haphviz
-  - happindicator
-  - happindicator3
-  - happlets
-  - happlets-lib-gtk
-  - happraise
-  - HAppS-Data
-  - happs-hsp
-  - happs-hsp-template
-  - HAppS-IxSet
-  - HAppS-Server
-  - HAppS-State
-  - happs-tutorial
-  - HAppS-Util
-  - happstack
-  - happstack-auth
-  - happstack-authenticate
-  - happstack-clientsession
-  - happstack-contrib
-  - happstack-data
-  - happstack-dlg
-  - happstack-facebook
-  - happstack-fastcgi
-  - happstack-fay
-  - happstack-fay-ajax
-  - happstack-foundation
-  - happstack-hamlet
-  - happstack-heist
-  - happstack-helpers
-  - happstack-hsp
-  - happstack-hstringtemplate
-  - happstack-ixset
-  - happstack-jmacro
-  - happstack-lite
-  - happstack-monad-peel
-  - happstack-plugins
-  - happstack-server
-  - happstack-server-tls
-  - happstack-server-tls-cryptonite
-  - happstack-state
-  - happstack-static-routing
-  - happstack-util
-  - happstack-yui
-  - happy-meta
-  - happybara
-  - happybara-webkit
-  - happybara-webkit-server
-  - HappyTree
-  - hapstone
-  - HaPy
-  - haquery
-  - haquil
-  - harchive
-  - hArduino
-  - hardware-edsl
-  - HaRe
-  - harg
-  - hark
-  - harmony
-  - HarmTrace
-  - haroonga
-  - haroonga-httpd
-  - harpy
-  - harvest-api
-  - has-th
-  - HasCacBDD
-  - hascas
-  - Haschoo
-  - HasGP
-  - hash
-  - hash-store
-  - hashable-extras
-  - hashable-generics
-  - hashabler
-  - hashed-storage
-  - Hashell
-  - hashflare
-  - hashring
-  - hashtables-plus
-  - hasim
-  - hask
-  - hask-home
-  - haskarrow
-  - haskbot-core
-  - haskdeep
-  - haskeem
-  - haskeline-class
-  - haskelisp
-  - haskell-abci
-  - haskell-aliyun
-  - haskell-awk
-  - haskell-bitmex-client
-  - haskell-bitmex-rest
-  - haskell-brainfuck
-  - haskell-ci
-  - haskell-cnc
-  - haskell-coffee
-  - haskell-compression
-  - haskell-course-preludes
-  - haskell-disque
-  - haskell-eigen-util
-  - haskell-formatter
-  - haskell-ftp
-  - haskell-generate
-  - haskell-go-checkers
-  - haskell-holes-th
-  - haskell-import-graph
-  - haskell-in-space
-  - haskell-kubernetes
-  - haskell-lsp-client
-  - haskell-ml
-  - haskell-mpfr
-  - haskell-neo4j-client
-  - haskell-openflow
-  - haskell-overridez
-  - haskell-packages
-  - haskell-pdf-presenter
-  - haskell-platform-test
-  - haskell-player
-  - haskell-plot
-  - haskell-postal
-  - haskell-read-editor
-  - haskell-reflect
-  - haskell-rules
-  - haskell-src-exts-observe
-  - haskell-src-exts-prisms
-  - haskell-src-exts-qq
-  - haskell-src-exts-sc
-  - haskell-src-exts-simple
-  - haskell-src-meta-mwotton
-  - haskell-stack-trace-plugin
-  - haskell-token-utils
-  - haskell-tools-ast-fromghc
-  - haskell-tools-ast-gen
-  - haskell-tools-ast-trf
-  - haskell-tools-builtin-refactorings
-  - haskell-tools-cli
-  - haskell-tools-daemon
-  - haskell-tools-debug
-  - haskell-tools-demo
-  - haskell-tools-experimental-refactorings
-  - haskell-tools-refactor
-  - haskell-tools-rewrite
-  - haskell-tor
-  - haskell-type-exts
-  - haskell-typescript
-  - haskell-tyrant
-  - haskell-xmpp
-  - haskell2010
-  - haskell98
-  - haskell98libraries
-  - haskelldb
-  - haskelldb-connect-hdbc
-  - haskelldb-connect-hdbc-catchio-mtl
-  - haskelldb-connect-hdbc-catchio-tf
-  - haskelldb-connect-hdbc-catchio-transformers
-  - haskelldb-connect-hdbc-lifted
-  - haskelldb-dynamic
-  - haskelldb-flat
-  - haskelldb-hdbc
-  - haskelldb-hdbc-mysql
-  - haskelldb-hdbc-odbc
-  - haskelldb-hdbc-postgresql
-  - haskelldb-hdbc-sqlite3
-  - haskelldb-hsql
-  - haskelldb-hsql-mysql
-  - haskelldb-hsql-odbc
-  - haskelldb-hsql-postgresql
-  - haskelldb-hsql-sqlite3
-  - haskelldb-th
-  - haskelldb-wx
-  - HaskellLM
-  - HaskellNet
-  - HaskellNet-SSL
-  - HaskellNN
-  - Haskelloids
-  - haskellscrabble
-  - haskellscript
-  - HaskellTorrent
-  - HaskellTutorials
-  - haskelzinc
-  - haskey
-  - haskey-mtl
-  - haskgame
-  - haskheap
-  - haskhol-core
-  - haskmon
-  - haskoin
-  - haskoin-bitcoind
-  - haskoin-core
-  - haskoin-crypto
-  - haskoin-node
-  - haskoin-protocol
-  - haskoin-script
-  - haskoin-store
-  - haskoin-util
-  - haskoin-wallet
-  - haskoon
-  - haskoon-httpspec
-  - haskoon-salvia
-  - haskore
-  - haskore-realtime
-  - haskore-supercollider
-  - haskore-synthesizer
-  - HaskRel
-  - hasktorch
-  - hasktorch-ffi-th
-  - hasktorch-ffi-thc
-  - hasktorch-indef
-  - hasktorch-signatures
-  - hasktorch-signatures-partial
-  - hasktorch-signatures-support
-  - hasktorch-zoo
-  - haskus-binary
-  - haskus-system-build
-  - haskus-utils
-  - haskus-utils-compat
-  - haskus-utils-variant
-  - haskus-web
-  - haslo
-  - hasloGUI
-  - hasparql-client
-  - hasql-backend
-  - hasql-class
-  - hasql-cursor-query
-  - hasql-dynamic-statements
-  - hasql-generic
-  - hasql-implicits
-  - hasql-migration
-  - hasql-optparse-applicative
-  - hasql-pool
-  - hasql-postgres
-  - hasql-postgres-options
-  - hasql-simple
-  - hastache
-  - hastache-aeson
-  - haste
-  - haste-app
-  - haste-lib
-  - haste-markup
-  - haste-prim
-  - Hate
-  - hatex-guide
-  - HaTeX-meta
-  - HaTeX-qq
-  - hats
-  - hatt
-  - haverer
-  - HaVSA
-  - hawitter
-  - Hawk
-  - hax
-  - haxl-amazonka
-  - haxl-facebook
-  - haxparse
-  - haxr
-  - haxr-th
-  - haxy
-  - hayland
-  - Hayoo
-  - hayoo-cli
-  - hback
-  - hbayes
-  - hbb
-  - hBDD-CMUBDD
-  - hBDD-CUDD
-  - hbeat
-  - hbf
-  - hblas
-  - hblock
-  - hburg
-  - HCard
-  - hcc
-  - hcg-minus
-  - hcg-minus-cairo
-  - hcheat
-  - hcheckers
-  - hchesslib
-  - hcltest
-  - hcoap
-  - hcom
-  - hcoord
-  - hcron
-  - hCsound
-  - hcube
-  - hdaemonize-buildfix
-  - hdbc-aeson
-  - HDBC-mysql
-  - HDBC-postgresql-hstore
-  - hdbc-postgresql-hstore
-  - hdbi
-  - hdbi-conduit
-  - hdbi-postgresql
-  - hdbi-sqlite
-  - hdbi-tests
-  - hdf
-  - hDFA
-  - hdiff
-  - hdigest
-  - hdirect
-  - hdis86
-  - hdiscount
-  - hdm
-  - hdo
-  - hdph
-  - hdph-closure
-  - hdr-histogram
-  - HDRUtils
-  - headergen
-  - heart-app
-  - heartbeat-streams
-  - heatitup
-  - heatitup-complete
-  - hecc
-  - heckle
-  - hedgehog-checkers
-  - hedgehog-checkers-lens
-  - hedgehog-classes
-  - hedgehog-gen-json
-  - hedgehog-generic
-  - hedgehog-golden
-  - Hedi
-  - hedis-config
-  - hedis-pile
-  - hedis-simple
-  - hedis-tags
-  - hein
-  - heist
-  - heist-aeson
-  - heist-async
-  - helics
-  - helics-wai
-  - helisp
-  - helium
-  - helix
-  - hell
-  - hellage
-  - hellnet
-  - help-esb
-  - hemkay
-  - hemokit
-  - hen
-  - henet
-  - hepevt
-  - her-lexer
-  - her-lexer-parsec
-  - HERA
-  - herbalizer
-  - HerbiePlugin
-  - heredocs
-  - Hermes
-  - hermit
-  - hermit-syb
-  - herms
-  - herringbone
-  - herringbone-embed
-  - herringbone-wai
-  - hesh
-  - hesql
-  - hetero-dict
-  - heterogeneous-list-literals
-  - heterolist
-  - hetris
-  - heukarya
-  - hevm
-  - hevolisa
-  - hevolisa-dph
-  - HExcel
-  - hexchat
-  - hexif
-  - hexmino
-  - hexml-lens
-  - hexpat-iteratee
-  - hexpat-pickle-generic
-  - hexpr
-  - hexpress
-  - hexquote
-  - hext
-  - heyefi
-  - heyting-algebras
-  - hF2
-  - hfann
-  - hfd
-  - hfiar
-  - HFitUI
-  - hfmt
-  - hfoil
-  - hfov
-  - hfractal
-  - HFrequencyQueue
-  - hfusion
-  - hg-buildpackage
-  - hgalib
-  - hgdbmi
-  - HGE2D
-  - hgearman
-  - hgen
-  - hgeometric
-  - hgeometry
-  - hgeometry-combinatorial
-  - hgeometry-ipe
-  - hgeometry-svg
-  - hgeos
-  - hgettext
-  - hgis
-  - hgithub
-  - HGL
-  - hgmp
-  - hgom
-  - hgopher
-  - HGraphStorage
-  - hgrep
-  - hgrev
-  - hgrib
-  - hharp
-  - HHDL
-  - hi3status
-  - hiccup
-  - hichi
-  - hid-examples
-  - hie-bios
-  - hie-core
-  - hieraclus
-  - hierarchical-clustering
-  - hierarchical-clustering-diagrams
-  - hierarchical-exceptions
-  - hierarchical-spectral-clustering
-  - hierarchy
-  - hiernotify
-  - Hieroglyph
-  - higgledy
-  - HiggsSet
-  - higherorder
-  - highjson
-  - highjson-swagger
-  - highjson-th
-  - highlight-versions
-  - highWaterMark
-  - himg
-  - himpy
-  - hindley-milner
-  - hinduce-classifier
-  - hinduce-classifier-decisiontree
-  - hinduce-examples
-  - hinquire
-  - hinstaller
-  - hint-server
-  - hinter
-  - hinterface
-  - hinvaders
-  - hinze-streams
-  - hipbot
-  - hipchat-hs
-  - hipe
-  - hircules
-  - hirt
-  - Hish
-  - hissmetrics
-  - hist-pl
-  - hist-pl-dawg
-  - hist-pl-fusion
-  - hist-pl-lexicon
-  - hist-pl-lmf
-  - hist-pl-types
-  - historian
-  - hit-graph
-  - hit-on
-  - HJavaScript
-  - hjcase
-  - hjs
-  - HJScript
-  - hjson-query
-  - hjsonpointer
-  - hjsonschema
-  - hjugement-cli
-  - HJVM
-  - hlatex
-  - hlbfgsb
-  - hlcm
-  - HLearn-algebra
-  - HLearn-approximation
-  - HLearn-classification
-  - HLearn-datastructures
-  - HLearn-distributions
-  - hledger-api
-  - hledger-chart
-  - hledger-irr
-  - hledger-vty
-  - hlibBladeRF
-  - hlibev
-  - hlibfam
-  - HList
-  - HListPP
-  - hlivy
-  - HLogger
-  - hlogger
-  - hlongurl
-  - hls
-  - hlwm
-  - hly
-  - hmark
-  - hmarkup
-  - hmatrix-backprop
-  - hmatrix-banded
-  - hmatrix-mmap
-  - hmatrix-morpheus
-  - hmatrix-nipals
-  - hmatrix-sparse
-  - hmatrix-static
-  - hmatrix-sundials
-  - hmatrix-svdlibc
-  - hmatrix-syntax
-  - hmatrix-tests
-  - hmeap
-  - hmeap-utils
-  - hmenu
-  - hmep
-  - hmk
-  - HMM
-  - hmm
-  - hmm-hmatrix
-  - hmm-lapack
-  - hMollom
-  - hmp3
-  - Hmpf
-  - hmt-diagrams
-  - hmumps
-  - hnetcdf
-  - HNM
-  - hnormalise
-  - ho-rewriting
-  - hoauth
-  - hob
-  - hobbes
-  - hobbits
-  - hocilib
-  - hocker
-  - hodatime
-  - HODE
-  - Hoed
-  - hog
-  - hogg
-  - hoggl
-  - hogre
-  - hogre-examples
-  - hois
-  - hol
-  - hold-em
-  - hole
-  - Holumbus-Searchengine
-  - holy-project
-  - homeomorphic
-  - hommage
-  - homoiconic
-  - homplexity
-  - HongoDB
-  - honi
-  - hoobuddy
-  - hood
-  - hood-off
-  - hood2
-  - hoodie
-  - hoodle
-  - hoodle-builder
-  - hoodle-core
-  - hoodle-extra
-  - hoodle-parser
-  - hoodle-publish
-  - hoodle-render
-  - hoodle-types
-  - hoogle-index
-  - hooks-dir
-  - hoopl
-  - hoovie
-  - hopencc
-  - hopencl
-  - hOpenPGP
-  - hopenpgp-tools
-  - hopfield
-  - hoppy-docs
-  - hoppy-generator
-  - hoppy-runtime
-  - hoppy-std
-  - hops
-  - hoq
-  - horizon
-  - horname
-  - hosc-json
-  - hosts-server
-  - hothasktags
-  - hotswap
-  - hourglass-fuzzy-parsing
-  - houseman
-  - hp2any-core
-  - hp2any-graph
-  - hp2any-manager
-  - hpack-convert
-  - hpack-dhall
-  - hpaco
-  - hpaco-lib
-  - hpage
-  - hpapi
-  - hpaste
-  - hpasteit
-  - HPath
-  - hpath-io
-  - hpc-tracer
-  - hPDB
-  - hPDB-examples
-  - HPDF
-  - hpdft
-  - hpg
-  - HPi
-  - hpio
-  - hplaylist
-  - HPlot
-  - hpodder
-  - HPong
-  - hpqtypes
-  - hpqtypes-extras
-  - hprotoc
-  - hprotoc-fork
-  - hprox
-  - hps
-  - hps-cairo
-  - hps-kmeans
-  - hPushover
-  - hpygments
-  - hpylos
-  - hpyrg
-  - hpython
-  - hquantlib
-  - hR
-  - hranker
-  - HRay
-  - hreq-client
-  - hreq-conduit
-  - hreq-core
-  - Hricket
-  - hricket
-  - hriemann
-  - HROOT
-  - HROOT-core
-  - HROOT-graf
-  - HROOT-hist
-  - HROOT-io
-  - HROOT-math
-  - HROOT-tree
-  - hs-blake2
-  - hs-brotli
-  - hs-carbon-examples
-  - hs-cdb
-  - hs-conllu
-  - hs-di
-  - hs-dotnet
-  - hs-excelx
-  - hs-ffmpeg
-  - hs-fltk
-  - hs-gchart
-  - hs-gen-iface
-  - hs-gizapp
-  - hs-java
-  - hs-json-rpc
-  - hs-logo
-  - hs-mesos
-  - hs-nombre-generator
-  - hs-pgms
-  - hs-pkg-config
-  - hs-pkpass
-  - hs-re
-  - hs-rs-notify
-  - hs-scrape
-  - hs-snowtify
-  - hs-twitter
-  - hs-twitterarchiver
-  - hs-vcard
-  - hs-watchman
-  - hs2ats
-  - hs2bf
-  - Hs2lib
-  - hsaml2
-  - hsay
-  - hsbackup
-  - hsbc
-  - hsbencher
-  - hsbencher-codespeed
-  - hsbencher-fusion
-  - hsc2hs
-  - hsc3-auditor
-  - hsc3-cairo
-  - hsc3-data
-  - hsc3-db
-  - hsc3-dot
-  - hsc3-forth
-  - hsc3-graphs
-  - hsc3-lang
-  - hsc3-lisp
-  - hsc3-plot
-  - hsc3-process
-  - hsc3-rec
-  - hsc3-rw
-  - hsc3-server
-  - hsc3-sf
-  - hsc3-sf-hsndfile
-  - hsc3-unsafe
-  - hsc3-utils
-  - hscaffold
-  - hscamwire
-  - hscassandra
-  - hscd
-  - hsclock
-  - hscope
-  - hScraper
-  - hscuid
-  - hsdev
-  - hsdif
-  - hsdip
-  - hsdns-cache
-  - Hsed
-  - hsenv
-  - hsfacter
-  - hsfcsh
-  - HSFFIG
-  - hsfilt
-  - HSGEP
-  - hsgnutls
-  - hsgnutls-yj
-  - hsgsom
-  - HsHaruPDF
-  - HSHHelpers
-  - HsHTSLib
-  - HsHyperEstraier
-  - hsI2C
-  - hsignal
-  - hSimpleDB
-  - hsimport
-  - HsJudy
-  - hskeleton
-  - hslackbuilder
-  - hslibsvm
-  - hslinks
-  - hslogger-reader
-  - hslogstash
-  - hsluv-haskell
-  - hsmagick
-  - HSmarty
-  - hsmodetweaks
-  - Hsmtlib
-  - hsmtpclient
-  - hsnock
-  - hsns
-  - hsnsq
-  - hsntp
-  - HSoM
-  - hsoptions
-  - HSoundFile
-  - hsoz
-  - hsp-cgi
-  - hsparql
-  - HsParrot
-  - hspear
-  - hspec-expectations-match
-  - hspec-expectations-pretty
-  - hspec-experimental
-  - hspec-hedgehog
-  - hspec-jenkins
-  - hspec-monad-control
-  - hspec-pg-transact
-  - hspec-setup
-  - hspec-shouldbe
-  - hspec-snap
-  - hspec-structured-formatter
-  - hspec-webdriver
-  - hspec2
-  - hspecVariant
-  - HsPerl5
-  - hspkcs11
-  - hspread
-  - hspresent
-  - hsprocess
-  - hsql
-  - hsql-mysql
-  - hsql-odbc
-  - hsql-postgresql
-  - hsql-sqlite3
-  - hsqml
-  - hsqml-datamodel
-  - hsqml-datamodel-vinyl
-  - hsqml-demo-manic
-  - hsqml-demo-morris
-  - hsqml-demo-notes
-  - hsqml-demo-samples
-  - hsqml-morris
-  - hsreadability
-  - hsseccomp
-  - hsSqlite3
-  - HsSVN
-  - hstatistics
-  - hstats
-  - hstest
-  - hstidy
-  - hstorchat
-  - hstox
-  - hstradeking
-  - HStringTemplateHelpers
-  - hstyle
-  - hstzaar
-  - hsubconvert
-  - hsudoku
-  - hswip
-  - hsx
-  - hsx-jmacro
-  - hsx-xhtml
-  - hsx2hs
-  - hsXenCtrl
-  - HsYAML-aeson
-  - hsyscall
-  - hsyslog-tcp
-  - hsyslog-udp
-  - hszephyr
-  - HTab
-  - hTalos
-  - htar
-  - hTensor
-  - htestu
-  - HTicTacToe
-  - htiled
-  - htlset
-  - html-charset
-  - html-kure
-  - html-rules
-  - html-tokenizer
-  - htoml
-  - htoml-megaparsec
-  - hts
-  - htsn
-  - htsn-import
-  - http-attoparsec
-  - http-client-auth
-  - http-client-lens
-  - http-client-request-modifiers
-  - http-client-restricted
-  - http-client-session
-  - http-client-streams
-  - http-conduit-browser
-  - http-directory
-  - http-dispatch
-  - http-enumerator
-  - http-grammar
-  - http-io-streams
-  - http-kinder
-  - http-monad
-  - http-pony-serve-wai
-  - http-proxy
-  - http-querystring
-  - http-response-decoder
-  - http-shed
-  - http-wget
-  - http2-client
-  - http2-client-exe
-  - http2-client-grpc
-  - http2-grpc-proto3-wire
-  - https-everywhere-rules
-  - https-everywhere-rules-raw
-  - httpspec
-  - htune
-  - htvm
-  - htzaar
-  - hubigraph
-  - huck
-  - HueAPI
-  - huff
-  - huffman
-  - hugs2yc
-  - hulk
-  - HulkImport
-  - human-parse
-  - human-text
-  - hums
-  - HUnit-Diff
-  - hunit-gui
-  - hunit-rematch
-  - hunp
-  - hunspell-hs
-  - hunt-searchengine
-  - hunt-server
-  - hurdle
-  - hurl
-  - hurriyet
-  - husk-scheme
-  - husk-scheme-libs
-  - husky
-  - hutton
-  - huttons-razor
-  - huzzy
-  - hVOIDP
-  - hw-all
-  - hw-balancedparens
-  - hw-bits
-  - hw-ci-assist
-  - hw-dsv
-  - hw-dump
-  - hw-eliasfano
-  - hw-excess
-  - hw-ip
-  - hw-json
-  - hw-json-lens
-  - hw-json-simple-cursor
-  - hw-json-standard-cursor
-  - hw-packed-vector
-  - hw-prim-bits
-  - hw-rankselect
-  - hw-rankselect-base
-  - hw-simd
-  - hw-streams
-  - hw-succinct
-  - hw-uri
-  - hw-xml
-  - hwall-auth-iitk
-  - hweblib
-  - hwhile
-  - hworker
-  - hworker-ses
-  - hwormhole
-  - hws
-  - hwsl2
-  - hwsl2-bytevector
-  - hwsl2-reducers
-  - HXMPP
-  - hxmppc
-  - hxournal
-  - HXQ
-  - hxt-pickle-utils
-  - hxthelper
-  - hxweb
-  - hyahtzee
-  - hyakko
-  - hybrid
-  - hydra-hs
-  - hydra-print
-  - Hydrogen
-  - hydrogen
-  - hydrogen-cli
-  - hydrogen-cli-args
-  - hydrogen-data
-  - hydrogen-multimap
-  - hydrogen-parsing
-  - hydrogen-prelude
-  - hydrogen-prelude-parsec
-  - hydrogen-syntax
-  - hydrogen-util
-  - hyena
-  - hylide
-  - hylolib
-  - hylotab
-  - hyloutils
-  - hyper-haskell-server
-  - hyperdrive
-  - hyperfunctions
-  - hyperion
-  - hyperloglogplus
-  - hyperpublic
-  - hypher
-  - hzulip
-  - i18n
-  - I1M
-  - i3blocks-hs-contrib
-  - i3ipc
-  - iap-verifier
-  - ib-api
-  - iban
-  - ical
-  - iCalendar
-  - IcoGrid
-  - iconv-typed
-  - ide-backend
-  - ide-backend-common
-  - ide-backend-server
-  - ideas
-  - ideas-math
-  - ideas-math-types
-  - idempotent
-  - identifiers
-  - idiii
-  - idna2008
-  - IDynamic
-  - ieee-utils
-  - iexcloud
-  - ifcxt
-  - IFS
-  - ig
-  - ige
-  - ige-mac-integration
-  - ignore
-  - igraph
-  - igrf
-  - ihaskell
-  - ihaskell-aeson
-  - ihaskell-basic
-  - ihaskell-blaze
-  - ihaskell-charts
-  - ihaskell-diagrams
-  - ihaskell-display
-  - ihaskell-gnuplot
-  - ihaskell-graphviz
-  - ihaskell-hatex
-  - ihaskell-hvega
-  - ihaskell-inline-r
-  - ihaskell-juicypixels
-  - ihaskell-magic
-  - ihaskell-parsec
-  - ihaskell-plot
-  - ihaskell-rlangqq
-  - ihaskell-widgets
-  - ihttp
-  - illuminate
-  - imagepaste
-  - imap
-  - imapget
-  - imbib
-  - imgurder
-  - imj-animation
-  - imj-base
-  - imj-game-hamazed
-  - imj-measure-stdout
-  - imj-prelude
-  - imm
-  - imparse
-  - imperative-edsl
-  - imperative-edsl-vhdl
-  - ImperativeHaskell
-  - impl
-  - implicit-logging
-  - implicit-params
-  - importify
-  - imports
-  - improve
-  - impure-containers
-  - INblobs
-  - inch
-  - inchworm
-  - incremental-computing
-  - incremental-maps
-  - increments
-  - indexation
-  - IndexedList
-  - indextype
-  - indices
-  - indieweb-algorithms
-  - inf-interval
-  - infer-upstream
-  - infernal
-  - infernu
-  - infinity
-  - infix
-  - InfixApplicative
-  - inflist
-  - informative
-  - ini-qq
-  - inilist
-  - inject-function
-  - inline-java
-  - inserts
-  - inspector-wrecker
-  - instana-haskell-trace-sdk
-  - instant-aeson
-  - instant-bytes
-  - instant-deepseq
-  - instant-generics
-  - instant-hashable
-  - instant-zipper
-  - instapaper-sender
-  - instinct
-  - int-multimap
-  - intcode
-  - integer-pure
-  - integreat
-  - intel-aes
-  - internetmarke
-  - intero
-  - interpol
-  - interpolatedstring-qq
-  - interpolatedstring-qq-mwotton
-  - interruptible
-  - interval
-  - IntFormats
-  - intro-prelude
-  - introduction
-  - introduction-test
-  - intset
-  - invertible-hlist
-  - io-capture
-  - io-reactive
-  - ion
-  - IOR
-  - IORefCAS
-  - iostring
-  - iothread
-  - iotransaction
-  - ip
-  - ip2location
-  - ip2proxy
-  - ipatch
-  - ipc
-  - ipfs
-  - ipld-cid
-  - ipopt-hs
-  - ipprint
-  - iptables-helpers
-  - iptadmin
-  - IPv6DB
-  - Irc
-  - irc-dcc
-  - irc-fun-bot
-  - irc-fun-client
-  - irc-fun-color
-  - irc-fun-messages
-  - irc-fun-types
-  - ircbot
-  - iri
-  - iridium
-  - iron-mq
-  - ironforge
-  - irt
-  - isdicom
-  - isevaluated
-  - ismtp
-  - IsNull
-  - iso8601-duration
-  - isobmff-builder
-  - isohunt
-  - isotope
-  - itcli
-  - itemfield
-  - iter-stats
-  - iteratee
-  - iteratee-compress
-  - iteratee-mtl
-  - iteratee-parsec
-  - iteratee-stm
-  - iterIO
-  - iterio-server
-  - ival
-  - ivor
-  - ivory
-  - ivory-backend-c
-  - ivory-bitdata
-  - ivory-eval
-  - ivory-examples
-  - ivory-hw
-  - ivory-opts
-  - ivory-quickcheck
-  - ivory-serialize
-  - ivory-stdlib
-  - ivy-web
-  - ix
-  - ixdopp
-  - ixmonad
-  - ixshader
-  - iyql
-  - j2hs
-  - jack-bindings
-  - JackMiniMix
-  - jackminimix
-  - jacobi-roots
-  - jaeger-flamegraph
-  - jail
-  - jalaali
-  - jalla
-  - jarfind
-  - jarify
-  - jason
-  - java-bridge
-  - java-bridge-extras
-  - java-character
-  - java-reflect
-  - javascript-bridge
-  - javascript-extras
-  - Javasf
-  - javasf
-  - Javav
-  - javav
-  - jbi
-  - jcdecaux-vls
-  - Jdh
-  - jdi
-  - jenga
-  - jenkinsPlugins2nix
-  - jespresso
-  - jinquantities
-  - jmacro
-  - jmacro-rpc
-  - jmacro-rpc-happstack
-  - jmacro-rpc-snap
-  - jml-web-service
-  - jmonkey
-  - jni
-  - jobqueue
-  - jobs-ui
-  - join
-  - join-api
-  - joinlist
-  - jonathanscard
-  - jpeg
-  - js-good-parts
-  - jsaddle-hello
-  - jsaddle-warp
-  - jsaddle-wkwebview
-  - JsContracts
-  - jsmw
-  - json-api-lib
-  - json-ast-json-encoder
-  - json-ast-quickcheck
-  - json-b
-  - json-builder
-  - json-bytes-builder
-  - JSON-Combinator
-  - JSON-Combinator-Examples
-  - json-enumerator
-  - json-extra
-  - json-fu
-  - json-incremental-decoder
-  - json-litobj
-  - json-pointer-hasql
-  - json-python
-  - json-schema
-  - json-syntax
-  - json-togo
-  - json-tokens
-  - json-tools
-  - json-tracer
-  - json2
-  - json2-hdbc
-  - JSONb
-  - jsonextfilter
-  - JsonGrammar
-  - jsonresume
-  - jsonrpc-conduit
-  - jsons-to-schema
-  - jsonschema-gen
-  - jsonsql
-  - jsontsv
-  - jsonxlsx
-  - jspath
-  - judge
-  - judy
-  - juicy-gcode
-  - JuicyPixels-blp
-  - JuicyPixels-canvas
-  - JunkDB
-  - JunkDB-driver-gdbm
-  - JunkDB-driver-hashtables
-  - jupyter
-  - JuPyTer-notebook
-  - JustParse
-  - jvm
-  - jvm-batching
-  - jvm-binary
-  - jvm-parser
-  - jvm-streaming
-  - JYU-Utils
-  - kademlia
-  - kafka-client
-  - kafka-client-sync
-  - kaleidoscope
-  - Kalman
-  - kalman
-  - kangaroo
-  - kansas-lava
-  - kansas-lava-cores
-  - kansas-lava-papilio
-  - kansas-lava-shake
-  - karakuri
-  - karps
-  - katip-elasticsearch
-  - katip-kafka
-  - katip-rollbar
-  - katip-scalyr-scribe
-  - katip-syslog
-  - katt
-  - katydid
-  - kawaii
-  - kawhi
-  - kazura-queue
-  - kd-tree
-  - kdesrc-build-extra
-  - keccak
-  - keera-hails-i18n
-  - keera-hails-mvc-environment-gtk
-  - keera-hails-mvc-model-lightmodel
-  - keera-hails-mvc-model-protectedmodel
-  - keera-hails-mvc-solutions-gtk
-  - keera-hails-reactive-fs
-  - keera-hails-reactive-gtk
-  - keera-hails-reactive-network
-  - keera-hails-reactive-polling
-  - keera-hails-reactive-wx
-  - keera-hails-reactive-yampa
-  - keera-hails-reactivelenses
-  - keera-hails-reactivevalues
-  - kerry
-  - Ketchup
-  - keter
-  - kevin
-  - keycloak-hs
-  - keyed
-  - keyring
-  - keysafe
-  - keystore
-  - keyvaluehash
-  - keyword-args
-  - khph
-  - kicad-data
-  - kickass-torrents-dump-parser
-  - kickchan
-  - kif-parser
-  - kit
-  - kmeans-par
-  - kmeans-vector
-  - kmp-dfa
-  - knead
-  - knead-arithmetic
-  - knots
-  - koellner-phonetic
-  - kontra-config
-  - korfu
-  - kqueue
-  - krapsh
-  - Kriens
-  - krpc
-  - ks-test
-  - KSP
-  - ktx
-  - kubernetes-client
-  - kubernetes-client-core
-  - kure
-  - kure-your-boilerplate
-  - kurita
-  - KyotoCabinet
-  - l-bfgs-b
-  - L-seed
-  - labeled-graph
-  - laborantin-hs
-  - labsat
-  - labyrinth
-  - labyrinth-server
-  - lagrangian
-  - laika
-  - lambda-bridge
-  - lambda-calculator
-  - lambda-canvas
-  - lambda-devs
-  - lambda-options
-  - lambda-toolbox
-  - lambda2js
-  - lambdaBase
-  - lambdabot
-  - lambdabot-core
-  - lambdabot-haskell-plugins
-  - lambdabot-irc-plugins
-  - lambdabot-misc-plugins
-  - lambdabot-novelty-plugins
-  - lambdabot-reference-plugins
-  - lambdabot-social-plugins
-  - lambdabot-utils
-  - lambdabot-zulip
-  - lambdacms-core
-  - lambdacms-media
-  - lambdacube
-  - lambdacube-bullet
-  - lambdacube-compiler
-  - lambdacube-core
-  - lambdacube-edsl
-  - lambdacube-engine
-  - lambdacube-examples
-  - lambdacube-gl
-  - lambdacube-ir
-  - lambdacube-samples
-  - LambdaDesigner
-  - lambdaFeed
-  - LambdaHack
-  - LambdaINet
-  - Lambdajudge
-  - lambdaLit
-  - LambdaNet
-  - LambdaPrettyQuote
-  - LambdaShell
-  - lambdatex
-  - lambdatwit
-  - lambdaya-bus
-  - lambdiff
-  - lame
-  - lame-tester
-  - lang
-  - language-ats
-  - language-bash
-  - language-boogie
-  - language-c-comments
-  - language-c-inline
-  - language-conf
-  - language-csharp
-  - language-css
-  - language-dart
-  - language-dockerfile
-  - language-dot
-  - language-ecmascript-analysis
-  - language-eiffel
-  - language-elm
-  - language-gcl
-  - language-go
-  - language-guess
-  - language-hcl
-  - language-java-classfile
-  - language-kort
-  - language-lua
-  - language-lua-qq
-  - language-lua2
-  - language-mixal
-  - language-ninja
-  - language-oberon
-  - language-objc
-  - language-ocaml
-  - language-openscad
-  - language-pig
-  - language-python
-  - language-python-colour
-  - language-python-test
-  - language-qux
-  - language-sh
-  - language-spelling
-  - language-sqlite
-  - language-sygus
-  - language-thrift
-  - language-typescript
-  - language-vhdl
-  - language-webidl
-  - lapack
-  - Lastik
-  - lat
-  - latest-npm-version
-  - latex-formulae-hakyll
-  - latex-formulae-image
-  - latex-formulae-pandoc
-  - LATS
-  - launchpad-control
-  - lawless-concurrent-machines
-  - layers
-  - layers-game
-  - layout
-  - layout-bootstrap
-  - layout-rules
-  - layouting
-  - lazy-hash
-  - lazy-hash-cache
-  - lazy-io-streams
-  - lazy-priority-queue
-  - lazyarray
-  - lazyboy
-  - lazyset
-  - LazyVault
-  - ld-intervals
-  - lda
-  - ldapply
-  - ldif
-  - leaf
-  - leaky
-  - lean
-  - leanpub-wreq
-  - leapseconds
-  - learn
-  - learn-physics-examples
-  - Learning
-  - leetify
-  - legion
-  - legion-discovery
-  - legion-discovery-client
-  - legion-extra
-  - leksah-server
-  - lendingclub
-  - lens-core
-  - lens-filesystem
-  - lens-prelude
-  - lens-text-encoding
-  - lens-time
-  - lens-toml-parser
-  - lens-tutorial
-  - lensref
-  - level-monad
-  - Level0
-  - levmar
-  - levmar-chart
-  - lex-applicative
-  - lfst
-  - lgtk
-  - lha
-  - lhae
-  - lhc
-  - lhe
-  - lhs2TeX-hl
-  - lhslatex
-  - libarchive
-  - LibClang
-  - libconfig
-  - libcspm
-  - libexpect
-  - libGenI
-  - libhbb
-  - libinfluxdb
-  - libjenkins
-  - liblastfm
-  - liblawless
-  - liblinear-enumerator
-  - libltdl
-  - libmodbus
-  - libmolude
-  - liboath-hs
-  - liboleg
-  - libpafe
-  - libpq
-  - libraft
-  - librandomorg
-  - librato
-  - libsystemd-daemon
-  - libtagc
-  - libxls
-  - libxml-enumerator
-  - libxslt
-  - licensor
-  - life-sync
-  - lifted-base-tf
-  - lifted-protolude
-  - lifter
-  - ligature
-  - lightning-haskell
-  - lightstep-haskell
-  - lighttpd-conf
-  - lighttpd-conf-qq
-  - lilypond
-  - Limit
-  - limp-cbc
-  - linda
-  - linden
-  - line-bot-sdk
-  - linear-algebra-cblas
-  - linear-circuit
-  - linear-code
-  - linear-maps
-  - linear-opengl
-  - linear-socket
-  - linear-vect
-  - linearEqSolver
-  - linearmap-category
-  - linearscan
-  - linearscan-hoopl
-  - LinearSplit
-  - lines-of-action
-  - LinkChecker
-  - linkchk
-  - linkcore
-  - linked-list-with-iterator
-  - linkedhashmap
-  - linode
-  - linode-v4
-  - linux-blkid
-  - linux-cgroup
-  - linux-inotify
-  - linux-kmod
-  - linux-perf
-  - linux-ptrace
-  - linx-gateway
-  - lio
-  - lio-eci11
-  - lio-fs
-  - lio-simple
-  - lipsum-gen
-  - liquid
-  - list-fusion-probe
-  - list-mux
-  - list-prompt
-  - list-remote-forwards
-  - list-t-attoparsec
-  - list-t-html-parser
-  - list-t-http-client
-  - list-t-text
-  - list-witnesses
-  - list-zipper
-  - listenbrainz-client
-  - listlike-instances
-  - ListT
-  - liszt
-  - lit
-  - literals
-  - live-sequencer
-  - ll-picosat
-  - llsd
-  - llvm
-  - llvm-analysis
-  - llvm-base
-  - llvm-base-types
-  - llvm-base-util
-  - llvm-data-interop
-  - llvm-extension
-  - llvm-extra
-  - llvm-ffi
-  - llvm-general
-  - llvm-general-pure
-  - llvm-general-quote
-  - llvm-hs
-  - llvm-hs-pretty
-  - llvm-ht
-  - llvm-pkg-config
-  - llvm-pretty
-  - llvm-pretty-bc-parser
-  - llvm-tf
-  - llvm-tools
-  - lmonad
-  - lmonad-yesod
-  - load-balancing
-  - load-font
-  - local-search
-  - located
-  - located-monad-logger
-  - loch
-  - locked-poll
-  - log
-  - log-elasticsearch
-  - log-postgres
-  - log-utils
-  - log-warper
-  - log2json
-  - logentries
-  - logger
-  - logging-effect-extra
-  - logging-effect-extra-file
-  - logging-effect-extra-handler
-  - Logic
-  - logic-classes
-  - logic-TPTP
-  - LogicGrowsOnTrees
-  - LogicGrowsOnTrees-MPI
-  - LogicGrowsOnTrees-network
-  - LogicGrowsOnTrees-processes
-  - logplex-parse
-  - lojban
-  - lojbanParser
-  - lojbanXiragan
-  - lojysamban
-  - lol
-  - lol-apps
-  - lol-benches
-  - lol-calculus
-  - lol-cpp
-  - lol-repa
-  - lol-tests
-  - lol-typing
-  - loli
-  - longboi
-  - lookup-tables
-  - loop-effin
-  - loop-while
-  - loops
-  - loopy
-  - lord
-  - lorem
-  - loris
-  - loshadka
-  - lostcities
-  - loup
-  - lowgl
-  - lp-diagrams
-  - lp-diagrams-svg
-  - ls-usb
-  - lscabal
-  - LslPlus
-  - lsystem
-  - ltext
-  - ltk
-  - lua-bc
-  - luachunk
-  - luautils
-  - lucienne
-  - Lucu
-  - lui
-  - luis-client
-  - luka
-  - luminance
-  - luminance-samples
-  - lushtags
-  - luthor
-  - lvish
-  - lvmlib
-  - lxc
-  - lxd-client
-  - lye
-  - Lykah
-  - lz4-bytes
-  - lz4-conduit
-  - lzma-enumerator
-  - lzma-streams
-  - maam
-  - macbeth-lib
-  - machinecell
-  - machines-amazonka
-  - machines-process
-  - machines-zlib
-  - mackerel-client
-  - maclight
-  - macos-corelibs
-  - macosx-make-standalone
-  - madlang
-  - mage
-  - magic-wormhole
-  - magicbane
-  - MagicHaskeller
-  - magico
-  - magma
-  - mahoro
-  - maid
-  - mail-pool
-  - mailbox-count
-  - mailchimp
-  - mailchimp-subscribe
-  - MailchimpSimple
-  - mailgun
-  - majordomo
-  - majority
-  - make-hard-links
-  - make-monofoldable-foldable
-  - make-package
-  - makedo
-  - makefile
-  - mallard
-  - manatee
-  - manatee-anything
-  - manatee-core
-  - manatee-curl
-  - manatee-editor
-  - manatee-filemanager
-  - manatee-imageviewer
-  - manatee-ircclient
-  - manatee-mplayer
-  - manatee-pdfviewer
-  - manatee-processmanager
-  - manatee-template
-  - manatee-terminal
-  - manatee-welcome
-  - mandrill
-  - mandulia
-  - mangopay
-  - manifold-random
-  - manifolds
-  - Map
-  - map-exts
-  - map-reduce-folds
-  - map-syntax
-  - mapalgebra
-  - Mapping
-  - mappy
-  - marionetta
-  - markdown-kate
-  - markdown-pap
-  - markdown2svg
-  - marked-pretty
-  - markov-chain-usage-model
-  - markov-processes
-  - markov-realization
-  - markup
-  - marmalade-upload
-  - marquise
-  - mars
-  - marshal-contt
-  - marvin
-  - marvin-interpolate
-  - marxup
-  - masakazu-bot
-  - MASMGen
-  - mason
-  - massiv
-  - massiv-io
-  - massiv-test
-  - master-plan
-  - matchable-th
-  - matchers
-  - math-grads
-  - mathblog
-  - mathflow
-  - mathgenealogy
-  - mathlink
-  - matrix-as-xyz
-  - matsuri
-  - maude
-  - maxent
-  - maxent-learner-hw
-  - maxent-learner-hw-gui
-  - maxsharing
-  - maybench
-  - MaybeT
-  - MaybeT-monads-tf
-  - MaybeT-transformers
-  - MazesOfMonad
-  - MBot
-  - mbox-tools
-  - mbug
-  - MC-Fold-DP
-  - mcl
-  - mcm
-  - mcmaster-gloss-examples
-  - mcmc-samplers
-  - mcmc-synthesis
-  - mcpi
-  - mdapi
-  - mdcat
-  - mDNSResponder-client
-  - mdp
-  - mealstrom
-  - MeanShift
-  - Measure
-  - mecab
-  - mech
-  - Mecha
-  - Mechs
-  - mechs
-  - med-module
-  - mediabus
-  - mediabus-fdk-aac
-  - mediabus-rtp
-  - mediawiki
-  - mediawiki2latex
-  - medium-sdk-haskell
-  - mega-sdist
-  - mellon-core
-  - mellon-gpio
-  - mellon-web
-  - melody
-  - memcache-conduit
-  - memcache-haskell
-  - memcached-binary
-  - meminfo
-  - memis
-  - memo-ptr
-  - memoization-utils
-  - memorypool
-  - menoh
-  - merkle-patricia-db
-  - messagepack-rpc
-  - messente
-  - meta-misc
-  - meta-par
-  - meta-par-accelerate
-  - metadata
-  - MetaHDBC
-  - metaheuristics
-  - MetaObject
-  - metaplug
-  - metar
-  - metar-http
-  - metric
-  - Metrics
-  - metricsd-client
-  - metronome
-  - mezzo
-  - mezzolens
-  - MFlow
-  - mgeneric
-  - Mhailist
-  - MHask
-  - mi
-  - Michelangelo
-  - miconix-test
-  - micro-recursion-schemes
-  - microaeson
-  - microformats2-types
-  - microgroove
-  - microlens-each
-  - micrologger
-  - microsoft-translator
-  - MicrosoftTranslator
-  - mida
-  - midi-simple
-  - midi-utils
-  - midimory
-  - midisurface
-  - mighttpd
-  - mighttpd2
-  - mighty-metropolis
-  - mikmod
-  - mikrokosmos
-  - miku
-  - mime-directory
-  - min-max-pqueue
-  - minecraft-data
-  - minesweeper
-  - miniforth
-  - minilens
-  - minilight
-  - minimung
-  - minio-hs
-  - minions
-  - minioperational
-  - miniplex
-  - minirotate
-  - ministg
-  - minst-idx
-  - mios
-  - mirror-tweet
-  - miso-action-logger
-  - miso-examples
-  - miss
-  - miss-porcelain
-  - missing-py2
-  - MissingPy
-  - mixed-strategies
-  - mixpanel-client
-  - mkbndl
-  - mkcabal
-  - ml-w
-  - mlist
-  - mltool
-  - mm2
-  - mmsyn2
-  - mmsyn4
-  - mmsyn6ukr
-  - mmsyn7h
-  - mmsyn7l
-  - mmsyn7s
-  - mmsyn7ukr
-  - mmtf
-  - mmtl
-  - mmtl-base
-  - moan
-  - Mobile-Legends-Hack-Cheats
-  - modelicaparser
-  - modify-fasta
-  - modsplit
-  - modular-prelude
-  - modular-prelude-classy
-  - modularity
-  - module-management
-  - modulespection
-  - modulo
-  - Moe
-  - moe
-  - MoeDict
-  - mohws
-  - mole
-  - mollie-api-haskell
-  - monad-atom
-  - monad-atom-simple
-  - monad-codec
-  - monad-dijkstra
-  - monad-exception
-  - monad-fork
-  - monad-http
-  - monad-interleave
-  - monad-levels
-  - monad-lgbt
-  - monad-lrs
-  - monad-mersenne-random
-  - monad-mock
-  - monad-open
-  - monad-parallel-progressbar
-  - monad-ran
-  - monad-recorder
-  - monad-resumption
-  - monad-state
-  - monad-statevar
-  - monad-ste
-  - monad-stlike-io
-  - monad-stlike-stm
-  - monad-supply
-  - monad-timing
-  - monad-tx
-  - monad-unify
-  - monad-var
-  - monad-wrap
-  - MonadCatchIO-mtl
-  - MonadCatchIO-mtl-foreign
-  - MonadCatchIO-transformers
-  - MonadCatchIO-transformers-foreign
-  - MonadCompose
-  - monadiccp
-  - monadiccp-gecode
-  - Monadius
-  - MonadLab
-  - monadLib-compose
-  - monadloc-pp
-  - monadlog
-  - Monadoro
-  - monadplus
-  - monads-fd
-  - MonadStack
-  - monarch
-  - Monaris
-  - Monatron
-  - Monatron-IO
-  - mondo
-  - monetdb-mapi
-  - money
-  - mongodb-queue
-  - mongrel2-handler
-  - monitor
-  - monky
-  - mono-foldable
-  - Monocle
-  - monoid-absorbing
-  - monoid-owns
-  - monoid-statistics
-  - monoidplus
-  - monoids
-  - monopati
-  - monte-carlo
-  - months
-  - monzo
-  - moo
-  - moonshine
-  - morfette
-  - morfeusz
-  - morley
-  - morley-prelude
-  - morph
-  - morpheus-graphql-cli
-  - morphisms-functors
-  - morphisms-functors-inventory
-  - morphisms-objects
-  - morte
-  - mosaico-lib
-  - moto
-  - moto-postgresql
-  - mount
-  - movie-monad
-  - mp
-  - mpdmate
-  - mpi-hs
-  - mpppc
-  - mpretty
-  - mpris
-  - mprover
-  - mps
-  - mptcp-pm
-  - mpvguihs
-  - mqtt
-  - mqtt-hs
-  - mrifk
-  - mrm
-  - ms
-  - msgpack
-  - msgpack-aeson
-  - msgpack-idl
-  - msgpack-rpc
-  - msh
-  - msi-kb-backlit
-  - MSQueue
-  - MTGBuilder
-  - mtgoxapi
-  - mtl-evil-instances
-  - mtl-extras
-  - mtl-tf
-  - mtlx
-  - mtp
-  - mu-grpc-client
-  - mu-grpc-server
-  - mu-protobuf
-  - MuCheck
-  - MuCheck-Hspec
-  - MuCheck-HUnit
-  - MuCheck-QuickCheck
-  - MuCheck-SmallCheck
-  - mud
-  - mulang
-  - multext-east-msd
-  - multi-cabal
-  - multiaddr
-  - multiarg
-  - multibase
-  - multifocal
-  - multihash
-  - multihash-cryptonite
-  - multihash-serialise
-  - multilinear
-  - multilinear-io
-  - multipass
-  - multipath
-  - multiplate-simplified
-  - multirec-alt-deriver
-  - multirec-binary
-  - multisetrewrite
-  - multivariant
-  - Munkres-simple
-  - muon
-  - murder
-  - murmur
-  - murmurhash3
-  - mushu
-  - music-graphics
-  - music-parts
-  - music-pitch
-  - music-preludes
-  - music-score
-  - music-sibelius
-  - music-suite
-  - music-util
-  - musicbrainz-email
-  - musicxml
-  - musicxml2
-  - mustache-haskell
-  - mutable
-  - mutable-iter
-  - MutationOrder
-  - mute-unmute
-  - mvar-lock
-  - mvc
-  - mvc-updates
-  - mvclient
-  - mxnet
-  - mxnet-dataiter
-  - mxnet-examples
-  - mxnet-nn
-  - mxnet-nnvm
-  - my-package-testing
-  - my-test-docs
-  - myanimelist-export
-  - myo
-  - MyPrimes
-  - mysnapsession
-  - mysnapsession-example
-  - mysql-effect
-  - mysql-haskell-openssl
-  - mysql-simple-quasi
-  - mysql-simple-typed
-  - mystem
-  - myTestlll
-  - mzv
-  - n-tuple
-  - nagios-plugin-ekg
-  - nakadi-client
-  - named-lock
-  - namelist
-  - nano-hmac
-  - nano-md5
-  - nanocurses
-  - nanomsg
-  - nanomsg-haskell
-  - nanoparsec
-  - NanoProlog
-  - nanovg
-  - nanovg-simple
-  - nanq
-  - NaperianNetCDF
-  - narc
-  - nat-sized-numbers
-  - nationstates
-  - nats-queue
-  - natural
-  - natural-number
-  - naver-translate
-  - NearContextAlgebra
-  - neat
-  - needle
-  - neet
-  - nehe-tuts
-  - neither
-  - neko-lib
-  - neko-obfs
-  - Neks
-  - nemesis-titan
-  - nerf
-  - nero
-  - nero-wai
-  - nero-warp
-  - nest
-  - nested-routes
-  - nested-sequence
-  - NestedFunctor
-  - nestedmap
-  - net-mqtt
-  - net-mqtt-rpc
-  - net-spider
-  - net-spider-cli
-  - net-spider-pangraph
-  - net-spider-rpl
-  - net-spider-rpl-cli
-  - netclock
-  - netcore
-  - netease-fm
-  - netlines
-  - netrium
-  - NetSNMP
-  - netspec
-  - netstring-enumerator
-  - nettle-frp
-  - nettle-netkit
-  - nettle-openflow
-  - netwire-input-javascript
-  - netwire-vinylglfw-examples
-  - network-address
-  - network-anonymous-i2p
-  - network-anonymous-tor
-  - network-api-support
-  - network-arbitrary
-  - network-bitcoin
-  - network-builder
-  - network-bytestring
-  - network-connection
-  - network-enumerator
-  - network-hans
-  - network-interfacerequest
-  - network-messagepack-rpc-websocket
-  - network-minihttp
-  - network-msgpack-rpc
-  - network-netpacket
-  - network-protocol-xmpp
-  - network-rpca
-  - network-run
-  - network-server
-  - network-service
-  - network-simple-sockaddr
-  - network-stream
-  - network-topic-models
-  - network-transport-amqp
-  - network-transport-inmemory
-  - network-transport-tcp
-  - network-transport-tests
-  - network-uri-json
-  - network-voicetext
-  - network-wai-router
-  - network-websocket
-  - networked-game
-  - neural
-  - neural-network-blashs
-  - neural-network-hmatrix
-  - newhope
-  - newports
-  - newsletter
-  - newsletter-mailgun
-  - newt
-  - newtype-deriving
-  - newtype-th
-  - next-ref
-  - nextstep-plist
-  - nfc
-  - NGrams
-  - ngrams-loader
-  - niagra
-  - nibblestring
-  - nice-html
-  - nicovideo-translator
-  - nikepub
-  - Ninjas
-  - nirum
-  - nitro
-  - nixfromnpm
-  - nixpkgs-update
-  - nkjp
-  - nlp-scores
-  - nlp-scores-scripts
-  - nm
-  - NMap
-  - nn
-  - nntp
-  - no-role-annots
-  - noether
-  - nofib-analyse
-  - nofib-analyze
-  - noise
-  - Nomyx
-  - Nomyx-Core
-  - Nomyx-Language
-  - Nomyx-Rules
-  - Nomyx-Web
-  - non-empty-zipper
-  - NonEmpty
-  - nonempty-lift
-  - NonEmptyList
-  - normalization-insensitive
-  - NoSlow
-  - not-gloss-examples
-  - notcpp
-  - notifications-tray-icon
-  - notmuch-haskell
-  - notmuch-web
-  - now-haskell
-  - np-linear
-  - nptools
-  - ntha
-  - ntrip-client
-  - NTRU
-  - null-canvas
-  - nullary
-  - nullpipe
-  - numbered-semigroups
-  - NumberSieves
-  - NumberTheory
-  - numerals
-  - numerals-base
-  - numeric-ode
-  - numeric-qq
-  - numeric-ranges
-  - numerical
-  - numhask-array
-  - numhask-hedgehog
-  - numhask-histogram
-  - numhask-prelude
-  - numhask-range
-  - numhask-space
-  - numhask-test
-  - Nussinov78
-  - Nutri
-  - NXT
-  - NXTDSL
-  - nylas
-  - nymphaea
-  - o-clock
-  - oanda-rest-api
-  - oasis-xrd
-  - oauth2-jwt-bearer
-  - oauthenticated
-  - obd
-  - obdd
-  - oberon0
-  - obj
-  - Object
-  - objectid
-  - ObjectIO
-  - objective
-  - oblivious-transfer
-  - ocaml-export
-  - octane
-  - octohat
-  - octopus
-  - Octree
-  - oculus
-  - odbc
-  - OddWord
-  - oden-go-packages
-  - oeis2
-  - off-simple
-  - OGL
-  - ogmarkup
-  - ohloh-hs
-  - oi
-  - oidc-client
-  - ois-input-manager
-  - olwrapper
-  - omaketex
-  - ombra
-  - Omega
-  - omega
-  - omnifmt
-  - on-a-horse
-  - onama
-  - oneormore
-  - online
-  - onpartitions
-  - OnRmt
-  - onu-course
-  - opaleye-classy
-  - opaleye-sqlite
-  - opaleye-trans
-  - open-haddock
-  - open-pandoc
-  - open-signals
-  - open-typerep
-  - OpenAFP
-  - OpenAFP-Utils
-  - openapi-petstore
-  - OpenCL
-  - OpenCLRaw
-  - OpenCLWrappers
-  - opencv-raw
-  - opendatatable
-  - OpenGLCheck
-  - opengles
-  - OpenSCAD
-  - opensoundcontrol-ht
-  - openssh-github-keys
-  - openssh-protocol
-  - opentelemetry-lightstep
-  - opentheory-char
-  - opentok
-  - opentype
-  - OpenVG
-  - OpenVGRaw
-  - openweathermap
-  - Operads
-  - operational-extra
-  - opml-conduit
-  - opn
-  - optima
-  - optima-for-hasql
-  - optimal-blocks
-  - optimization
-  - optimusprime
-  - optional
-  - options-time
-  - optparse-applicative-simple
-  - orc
-  - orchestrate
-  - OrchestrateDB
-  - orchid
-  - orchid-demo
-  - order-maintenance
-  - order-statistics
-  - orders
-  - Ordinary
-  - ordrea
-  - organize-imports
-  - orgmode
-  - orgstat
-  - origami
-  - orizentic
-  - OrPatterns
-  - osc
-  - oscpacking
-  - Oslo-Vectize
-  - OSM
-  - osm-conduit
-  - osm-download
-  - oso2pdf
-  - ot
-  - OTP
-  - otp-authenticator
-  - overloaded
-  - overloaded-records
-  - overture
-  - pack
-  - package-description-remote
-  - package-o-tron
-  - package-vt
-  - packdeps
-  - packed-dawg
-  - packed-multikey-map
-  - packedstring
-  - packer-messagepack
-  - packman
-  - packunused
-  - pacman-memcache
-  - padKONTROL
-  - pads-haskell
-  - pagarme
-  - PageIO
-  - pagure-hook-receiver
-  - Paillier
-  - pairing
-  - pam
-  - pan-os-syslog
-  - panda
-  - pandoc-citeproc-preamble
-  - pandoc-crossref
-  - pandoc-include
-  - pandoc-include-code
-  - pandoc-japanese-filters
-  - pandoc-lens
-  - pandoc-markdown-ghci-filter
-  - pandoc-plantuml-diagrams
-  - pandoc-pyplot
-  - pandoc-unlit
-  - PandocAgda
-  - pang-a-lambda
-  - pangraph
-  - panpipe
-  - pantry-tmp
-  - papa-export
-  - papa-implement
-  - papa-include
-  - papa-prelude
-  - papa-prelude-core
-  - papa-prelude-lens
-  - papa-prelude-semigroupoids
-  - papa-prelude-semigroups
-  - paphragen
-  - papillon
-  - pappy
-  - paprika
-  - paragon
-  - Paraiso
-  - Parallel-Arrows-Eden
-  - parallel-tasks
-  - parameterized
-  - parameterized-utils
-  - paranoia
-  - parco
-  - parco-attoparsec
-  - parco-parsec
-  - parconc-examples
-  - pareto
-  - parquet-hs
-  - Parry
-  - parse-help
-  - parseargs
-  - parsec-free
-  - parsec-parsers
-  - parsec-pratt
-  - parseerror-eq
-  - parsely
-  - parser-combinators-tests
-  - parser-helper
-  - parser241
-  - parsergen
-  - parsestar
-  - partage
-  - partial-lens
-  - partial-order
-  - partly
-  - passage
-  - PasswordGenerator
-  - passwords
-  - pasta
-  - pastis
-  - pasty
-  - patat
-  - patches-vector
-  - Pathfinder
-  - pathfindingcore
-  - PathTree
-  - patronscraper
-  - patterns
-  - paypal-adaptive-hoops
-  - paypal-api
-  - paypal-rest-client
-  - pb
-  - pb-next
-  - pbc4hs
-  - PBKDF2
-  - pcap-enumerator
-  - pcd-loader
-  - pcf
-  - PCLT
-  - PCLT-DB
-  - pcre-light-extra
-  - pdf-slave
-  - pdf-slave-template
-  - pdf-toolbox-content
-  - pdf-toolbox-core
-  - pdf-toolbox-document
-  - pdf-toolbox-viewer
-  - pdfname
-  - pdfsplit
-  - pdynload
-  - peakachu
-  - PeanoWitnesses
-  - pec
-  - pedestrian-dag
-  - peg
-  - peggy
-  - pell
-  - penny
-  - penny-bin
-  - penny-lib
-  - penrose
-  - peparser
-  - perceptron
-  - peregrin
-  - perf
-  - perf-analysis
-  - perfect-vector-shuffle
-  - PerfectHash
-  - perfecthash
-  - periodic
-  - perm
-  - permutations
-  - permute
-  - PermuteEffects
-  - persist2er
-  - Persistence
-  - persistent-audit
-  - persistent-cereal
-  - persistent-database-url
-  - persistent-documentation
-  - persistent-equivalence
-  - persistent-hssqlppp
-  - persistent-map
-  - persistent-migration
-  - persistent-mongoDB
-  - persistent-odbc
-  - persistent-protobuf
-  - persistent-ratelimit
-  - persistent-refs
-  - persistent-template-classy
-  - persistent-test
-  - persistent-vector
-  - persistent-zookeeper
-  - persona
-  - persona-idp
-  - pesca
-  - peyotls
-  - peyotls-codec
-  - pez
-  - pg-harness
-  - pg-recorder
-  - pg-store
-  - pg-transact
-  - pgdl
-  - pgsql-simple
-  - pgstream
-  - phasechange
-  - phoityne
-  - phone-numbers
-  - phone-push
-  - phooey
-  - photoname
-  - phraskell
-  - Phsu
-  - phybin
-  - pi-calculus
-  - pi-forall
-  - pi-hoole
-  - pia-forward
-  - pianola
-  - picedit
-  - picologic
-  - picoparsec
-  - picosat
-  - pictikz
-  - pier
-  - pier-core
-  - piet
-  - pig
-  - pinchot
-  - pine
-  - ping
-  - pinpon
-  - Pipe
-  - pipe-enumerator
-  - piped
-  - pipes-async
-  - pipes-attoparsec-streaming
-  - pipes-bgzf
-  - pipes-brotli
-  - pipes-cacophony
-  - pipes-cereal
-  - pipes-cereal-plus
-  - pipes-conduit
-  - pipes-core
-  - pipes-courier
-  - pipes-errors
-  - pipes-extra
-  - pipes-files
-  - pipes-illumina
-  - pipes-io
-  - pipes-key-value-csv
-  - pipes-p2p
-  - pipes-p2p-examples
-  - pipes-protolude
-  - pipes-rt
-  - pipes-s3
-  - pipes-shell
-  - pipes-sqlite-simple
-  - pipes-text
-  - pipes-transduce
-  - pipes-zeromq4
-  - pisigma
-  - Piso
-  - pit
-  - pitchtrack
-  - pivotal-tracker
-  - pixelated-avatar-generator
-  - pkcs10
-  - pkcs7
-  - pkggraph
-  - pkgtreediff
-  - plailude
-  - plan-applicative
-  - plan-b
-  - planar-graph
-  - planet-mitchell
-  - planet-mitchell-test
-  - plankton
-  - plat
-  - platinum-parsing
-  - PlayingCards
-  - plex
-  - plist-buddy
-  - plocketed
-  - plot
-  - plot-gtk
-  - plot-gtk-ui
-  - plot-gtk3
-  - Plot-ho-matic
-  - plot-lab
-  - plot-light-examples
-  - PlslTools
-  - plugins
-  - plugins-auto
-  - plugins-multistage
-  - plur
-  - plural
-  - png-file
-  - pngload
-  - pngload-fixed
-  - pocket
-  - pocket-dns
-  - point-octree
-  - pointfree-fancy
-  - pointful
-  - pointless-lenses
-  - pointless-rewrite
-  - pokemon-go-protobuf-types
-  - poker-eval
-  - pokitdok
-  - polar-configfile
-  - polar-shader
-  - polh-lexicon
-  - polimorf
-  - Pollutocracy
-  - poly
-  - poly-control
-  - polydata
-  - polydata-core
-  - polynomial
-  - polyseq
-  - polysoup
-  - polytypeable
-  - polytypeable-utils
-  - pomaps
-  - pomodoro
-  - pomohoro
-  - ponder
-  - pong-server
-  - pool
-  - pool-conduit
-  - popenhs
-  - poppler
-  - porcupine-core
-  - porcupine-http
-  - porcupine-s3
-  - portager
-  - porte
-  - PortFusion
-  - ports
-  - poseidon
-  - poseidon-postgis
-  - posix-acl
-  - posix-api
-  - posix-realtime
-  - posix-waitpid
-  - postcodes
-  - postgres-embedded
-  - postgres-tmp
-  - postgres-websockets
-  - postgresql-copy-escape
-  - postgresql-named
-  - postgresql-query
-  - postgresql-simple-bind
-  - postgresql-simple-named
-  - postgresql-simple-opts
-  - postgresql-simple-queue
-  - postgresql-simple-sop
-  - postgresql-simple-typed
-  - postgresql-typed-lifted
-  - postgrest
-  - postgrest-ws
-  - postie
-  - postmark
-  - postmark-streams
-  - postmaster
-  - potato-tool
-  - potoki
-  - potoki-cereal
-  - potoki-conduit
-  - potoki-core
-  - potoki-hasql
-  - potoki-zlib
-  - powerpc
-  - powerqueue
-  - powerqueue-distributed
-  - powerqueue-levelmem
-  - powerqueue-sqs
-  - PPrinter
-  - pqc
-  - pqueue-mtl
-  - practice-room
-  - praglude
-  - pragmatic-show
-  - precursor
-  - pred-trie
-  - predicate-class
-  - predicate-typed
-  - prednote
-  - prednote-test
-  - prefork
-  - preliminaries
-  - prelude-generalize
-  - prelude-plus
-  - preprocess-haskell
-  - preprocessor
-  - presburger
-  - press
-  - presto-hdbc
-  - pretty-ncols
-  - pretty-relative-time
-  - prettyprinter-graphviz
-  - prettyprinter-vty
-  - preview
-  - prim-array
-  - primes-type
-  - primitive-atomic
-  - primitive-checked
-  - primitive-containers
-  - primitive-indexed
-  - primitive-simd
-  - primitive-sort
-  - primitive-unlifted
-  - primula-board
-  - primula-bot
-  - pringletons
-  - print-debugger
-  - printcess
-  - Printf-TH
-  - priority-queue
-  - PriorityChansConverger
-  - ProbabilityMonads
-  - probable
-  - proc
-  - process-conduit
-  - process-iterio
-  - process-leksah
-  - process-listlike
-  - process-progress
-  - process-qq
-  - process-streaming
-  - processing
-  - procrastinating-variable
-  - procstat
-  - producer
-  - product
-  - prof2dot
-  - prof2pretty
-  - profunctor-optics
-  - progress
-  - progress-meter
-  - progressbar
-  - progression
-  - progressive
-  - proj4-hs-bindings
-  - project-m36
-  - projectile
-  - prolog-graph
-  - prolog-graph-lib
-  - prometheus-effect
-  - promise
-  - pronounce
-  - proof-combinators
-  - propane
-  - Proper
-  - properties
-  - property-list
-  - proplang
-  - prosper
-  - proteome
-  - proto-lens-combinators
-  - proto-lens-descriptors
-  - proto-lens-jsonpb
-  - proto3-suite
-  - protobuf-native
-  - protocol-buffers-descriptor-fork
-  - protocol-buffers-fork
-  - protolude-lifted
-  - proton-haskell
-  - prototype
-  - prove-everywhere-server
-  - proxy-kindness
-  - proxy-mapping
-  - psc-ide
-  - pseudo-trie
-  - PTQ
-  - ptr
-  - publicsuffixlistcreate
-  - publish
-  - pubnub
-  - pubsub
-  - puffytools
-  - pugixml
-  - Pugs
-  - pugs-compat
-  - pugs-DrIFT
-  - pugs-hsregex
-  - PUH-Project
-  - punkt
-  - Pup-Events-Demo
-  - puppetresources
-  - pure-cdb
-  - pure-io
-  - pure-priority-queue
-  - pure-priority-queue-tests
-  - purebred-email
-  - purescript-iso
-  - purescript-tsd-gen
-  - push-notify
-  - push-notify-apn
-  - push-notify-ccs
-  - push-notify-general
-  - pusher-haskell
-  - pusher-ws
-  - pushme
-  - putlenses
-  - puzzle-draw
-  - puzzle-draw-cmdline
-  - pvd
-  - pyffi
-  - pyfi
-  - python-pickle
-  - q4c12-twofinger
-  - qc-oi-testgenerator
-  - qd
-  - qd-vec
-  - qed
-  - qhull-simple
-  - qif
-  - QIO
-  - QLearn
-  - qr-imager
-  - qr-repa
-  - qtah-cpp-qt5
-  - qtah-examples
-  - qtah-generator
-  - qtah-qt5
-  - QuadEdge
-  - QuadTree
-  - quantfin
-  - quantum-arrow
-  - quantum-random
-  - qudb
-  - Quelea
-  - quenya-verb
-  - queryparser
-  - queryparser-demo
-  - queryparser-hive
-  - queryparser-presto
-  - queryparser-vertica
-  - questioner
-  - queuelike
-  - quick-schema
-  - QuickAnnotate
-  - quickbooks
-  - quickcheck-combinators
-  - quickcheck-poly
-  - quickcheck-property-comb
-  - quickcheck-property-monad
-  - quickcheck-regex
-  - quickcheck-relaxng
-  - quickcheck-rematch
-  - quickcheck-report
-  - quickcheck-state-machine
-  - quickcheck-state-machine-distributed
-  - quickcheck-string-random
-  - quickcheck-webdriver
-  - QuickCheckVariant
-  - QuickPlot
-  - quickpull
-  - quickset
-  - Quickson
-  - quicktest
-  - quickwebapp
-  - quipper
-  - quipper-all
-  - quipper-core
-  - quipper-rendering
-  - quiver-binary
-  - quiver-enumerator
-  - quiver-groups
-  - quiver-http
-  - quiver-instances
-  - quiver-interleave
-  - quiver-sort
-  - quokka
-  - quoridor-hs
-  - qux
-  - R-pandoc
-  - rad
-  - radium
-  - radium-formula-parser
-  - radix
-  - radixtree
-  - rados-haskell
-  - raft
-  - rail-compiler-editor
-  - rails-session
-  - rainbow-tests
-  - raketka
-  - rakhana
-  - rakuten
-  - ralist
-  - rallod
-  - raml
-  - rand-vars
-  - randfile
-  - rando
-  - random-access-list
-  - random-derive
-  - random-eff
-  - random-effin
-  - random-hypergeometric
-  - random-stream
-  - RandomDotOrg
-  - Range
-  - range-space
-  - rangemin
-  - rank1dynamic
-  - Ranka
-  - rapid-term
-  - rasa
-  - rasa-example-config
-  - rasa-ext-bufs
-  - rasa-ext-cmd
-  - rasa-ext-cursors
-  - rasa-ext-files
-  - rasa-ext-logger
-  - rasa-ext-slate
-  - rasa-ext-status-bar
-  - rasa-ext-style
-  - rasa-ext-views
-  - rasa-ext-vim
-  - rascal
-  - Rasenschach
-  - rational-list
-  - rattle
-  - rattletrap
-  - raven-haskell-scotty
-  - raw-feldspar
-  - rawr
-  - raz
-  - razom-text-util
-  - rbr
-  - rc
-  - rdf4h
-  - rdioh
-  - react-flux
-  - react-flux-servant
-  - react-haskell
-  - react-tutorial-haskell-server
-  - reaction-logic
-  - reactive-bacon
-  - reactive-banana-automation
-  - reactive-banana-gi-gtk
-  - reactive-banana-sdl
-  - reactive-banana-sdl2
-  - reactive-banana-threepenny
-  - reactive-banana-wx
-  - reactive-fieldtrip
-  - reactive-glut
-  - reactive-thread
-  - reactor
-  - read-ctags
-  - read-io
-  - reader-soup
-  - readline-statevar
-  - readme-lhs
-  - readpyc
-  - readshp
-  - really-simple-xml-parser
-  - reanimate
-  - reasonable-lens
-  - record
-  - record-aeson
-  - record-encode
-  - record-gl
-  - record-preprocessor
-  - record-syntax
-  - records
-  - records-th
-  - recursors
-  - reddit
-  - redis
-  - redis-simple
-  - redland
-  - Redmine
-  - reduce-equations
-  - reedsolomon
-  - reenact
-  - Ref
-  - ref
-  - ref-fd
-  - ref-mtl
-  - refcount
-  - Referees
-  - refh
-  - refined
-  - refined-http-api-data
-  - reflection-extras
-  - reflex
-  - reflex-animation
-  - reflex-backend-socket
-  - reflex-backend-wai
-  - reflex-basic-host
-  - reflex-dom-retractable
-  - reflex-dom-svg
-  - reflex-fsnotify
-  - reflex-ghci
-  - reflex-gloss
-  - reflex-gloss-scene
-  - reflex-libtelnet
-  - reflex-orphans
-  - reflex-process
-  - reflex-sdl2
-  - reflex-transformers
-  - reflex-vty
-  - reform-happstack
-  - reform-hsp
-  - reformat
-  - refractor
-  - refresht
-  - refurb
-  - reg-alloc
-  - reg-alloc-graph-color
-  - regex-deriv
-  - regex-dfa
-  - regex-do
-  - regex-generator
-  - regex-parsec
-  - regex-pderiv
-  - regex-tdfa-pipes
-  - regex-tdfa-quasiquoter
-  - regex-tdfa-rc
-  - regex-tdfa-utf8
-  - regex-tre
-  - regex-type
-  - regex-xmlschema
-  - regexp-tries
-  - regexpr-symbolic
-  - regexqq
-  - regional-pointers
-  - regions
-  - regions-monadsfd
-  - regions-monadstf
-  - regions-mtl
-  - register-machine-typelevel
-  - registry
-  - registry-hedgehog
-  - regress
-  - regular
-  - regular-extras
-  - regular-web
-  - regular-xmlpickler
-  - reheat
-  - rei
-  - reified-records
-  - reify
-  - relacion
-  - relapse
-  - relation
-  - relational-postgresql8
-  - relative-date
-  - reload
-  - remark
-  - remarks
-  - remote
-  - remote-debugger
-  - remote-json
-  - remote-json-client
-  - remote-json-server
-  - remote-monad
-  - remotion
-  - repa-array
-  - repa-bytestring
-  - repa-convert
-  - repa-devil
-  - repa-eval
-  - repa-flow
-  - repa-linear-algebra
-  - repa-plugin
-  - repa-series
-  - repa-stream
-  - repa-v4l2
-  - repl
-  - RepLib
-  - replica
-  - replicant
-  - ReplicateEffects
-  - repo-based-blog
-  - repr
-  - representable-functors
-  - representable-tries
-  - reprinter
-  - reproject
-  - req-conduit
-  - req-oauth2
-  - req-url-extra
-  - reqcatcher
-  - request-monad
-  - require
-  - reserve
-  - reservoir
-  - resin
-  - resistor-cube
-  - resolve
-  - resolve-trivial-conflicts
-  - resource-effect
-  - resource-embed
-  - resource-pool-catchio
-  - resource-simple
-  - respond
-  - rest-client
-  - rest-core
-  - rest-example
-  - rest-gen
-  - rest-happstack
-  - rest-snap
-  - rest-stringmap
-  - rest-types
-  - rest-wai
-  - restful-snap
-  - restricted-workers
-  - restyle
-  - rethinkdb
-  - rethinkdb-client-driver
-  - rethinkdb-model
-  - rethinkdb-wereHamster
-  - retryer
-  - reverse-geocoding
-  - reversi
-  - ReviewBoard
-  - rewrite
-  - rewrite-inspector
-  - rewriting
-  - rezoom
-  - rfc
-  - rfc-env
-  - rfc-http-client
-  - rfc-prelude
-  - rfc-psql
-  - rfc-redis
-  - rfc-servant
-  - rg
-  - rhythm-game-tutorial
-  - rib
-  - RichConditional
-  - ridley
-  - ridley-extras
-  - riemann
-  - riff
-  - ring-buffer
-  - ring-buffers
-  - rings
-  - riot
-  - risc386
-  - riscv-isa
-  - Ritt-Wu
-  - rivers
-  - rivet
-  - rivet-migration
-  - rivet-simple-deploy
-  - RJson
-  - rl-satton
-  - Rlang-QQ
-  - rlglue
-  - RLP
-  - rlwe-challenges
-  - rmonad
-  - RMP
-  - RNAdesign
-  - RNAdraw
-  - RNAFold
-  - RNAFoldProgs
-  - RNAlien
-  - RNAwolf
-  - rng-utils
-  - rob
-  - robin
-  - robots-txt
-  - roc-cluster
-  - roc-cluster-demo
-  - roku-api
-  - rollbar-hs
-  - roller
-  - RollingDirectory
-  - rope
-  - rose-trees
-  - rose-trie
-  - roshask
-  - rosmsg
-  - rosmsg-bin
-  - rosso
-  - rounded
-  - rounding
-  - roundtrip
-  - roundtrip-aeson
-  - roundtrip-string
-  - roundtrip-xml
-  - route-planning
-  - rowrecord
-  - rpc
-  - rpc-framework
-  - rpf
-  - rpm
-  - rsagl
-  - rsagl-frp
-  - rsagl-math
-  - rspp
-  - rss-conduit
-  - rss2irc
-  - rtorrent-rpc
-  - rts-loader
-  - ruby-marshal
-  - ruby-qq
-  - ruin
-  - ruler
-  - ruler-core
-  - run-st
-  - rungekutta
-  - runmany
-  - runtime-arbitrary
-  - rv
-  - rws
-  - RxHaskell
-  - s-expression
-  - S3
-  - SableCC2Hs
-  - safe-access
-  - safe-buffer-monad
-  - safe-failure-cme
-  - safe-freeze
-  - safe-globals
-  - safe-json
-  - safe-lazy-io
-  - safe-length
-  - safe-money-store
-  - safe-plugins
-  - safe-printf
-  - safecopy-store
-  - safeint
-  - safepath
-  - safer-file-handles
-  - safer-file-handles-bytestring
-  - safer-file-handles-text
-  - saferoute
-  - sai-shape-syb
-  - sajson
-  - salak-toml
-  - Salsa
-  - saltine-quickcheck
-  - salvia
-  - salvia-demo
-  - salvia-extras
-  - salvia-protocol
-  - salvia-sessions
-  - salvia-websocket
-  - samtools
-  - samtools-conduit
-  - samtools-enumerator
-  - samtools-iteratee
-  - sandlib
-  - sarasvati
-  - sarsi
-  - sasl
-  - sat
-  - sat-micro-hs
-  - satchmo
-  - satchmo-backends
-  - satchmo-examples
-  - satchmo-funsat
-  - satchmo-minisat
-  - satchmo-toysat
-  - savage
-  - sax
-  - SBench
-  - sbvPlugin
-  - sc2-lowlevel
-  - sc2-proto
-  - sc3-rdu
-  - scalable-server
-  - scaleimage
-  - SCalendar
-  - scalendar
-  - scalp-webhooks
-  - scan-metadata
-  - scan-vector-machine
-  - scc
-  - scenegraph
-  - schedevr
-  - schedule-planner
-  - scheduler
-  - schedyield
-  - schemas
-  - schematic
-  - scholdoc
-  - scholdoc-citeproc
-  - scholdoc-texmath
-  - scholdoc-types
-  - scidb-hquery
-  - science-constants-dimensional
-  - scientific-notation
-  - SciFlow
-  - SciFlow-drmaa
-  - scion
-  - scion-browser
-  - scons2dot
-  - scope
-  - scope-cairo
-  - scottish
-  - scotty-binding-play
-  - scotty-blaze
-  - scotty-fay
-  - scotty-form
-  - scotty-format
-  - scotty-hastache
-  - scotty-resource
-  - scotty-rest
-  - scotty-session
-  - scotty-view
-  - scp-streams
-  - scrabble-bot
-  - scrapbook
-  - scrape-changes
-  - ScratchFs
-  - script-monad
-  - SCRIPTWriter
-  - scrobble
-  - Scurry
-  - scythe
-  - scyther-proof
-  - sde-solver
-  - sdl2-cairo-image
-  - sdl2-compositor
-  - sdl2-fps
-  - sdr
-  - seakale
-  - seakale-postgresql
-  - seakale-tests
-  - search-algorithms
-  - sec
-  - secdh
-  - seclib
-  - second-transfer
-  - secp256k1
-  - secp256k1-haskell
-  - secp256k1-legacy
-  - secret-santa
-  - secret-sharing
-  - secrm
-  - sednaDBXML
-  - selectors
-  - SelectSequencesFromMSA
-  - selenium
-  - selenium-server
-  - selinux
-  - semantic-source
-  - Semantique
-  - semdoc
-  - semi-iso
-  - semialign-extras
-  - semialign-indexed
-  - semialign-optics
-  - semibounded-lattices
-  - Semigroup
-  - semigroupoids-syntax
-  - semigroups-actions
-  - semilattices
-  - semiring
-  - semiring-num
-  - sendgrid-haskell
-  - sendgrid-v3
-  - sensei
-  - sensenet
-  - sentence-jp
-  - sentry
-  - seonbi
-  - seqaid
-  - SeqAlign
-  - seqid
-  - seqid-streams
-  - seqloc
-  - seqloc-datafiles
-  - sequence-formats
-  - sequenceTools
-  - sequent-core
-  - sequor
-  - serialize-instances
-  - serokell-util
-  - serpentine
-  - serv
-  - serv-wai
-  - servant-aeson-specs
-  - servant-auth-cookie
-  - servant-auth-hmac
-  - servant-auth-token
-  - servant-auth-token-acid
-  - servant-auth-token-api
-  - servant-auth-token-leveldb
-  - servant-auth-token-persistent
-  - servant-auth-token-rocksdb
-  - servant-cli
-  - servant-client-namedargs
-  - servant-csharp
-  - servant-db
-  - servant-db-postgresql
-  - servant-dhall
-  - servant-examples
-  - servant-exceptions
-  - servant-generate
-  - servant-generic
-  - servant-github
-  - servant-haxl-client
-  - servant-hmac-auth
-  - servant-http-streams
-  - servant-http2-client
-  - servant-iCalendar
-  - servant-jquery
-  - servant-matrix-param
-  - servant-namedargs
-  - servant-nix
-  - servant-pandoc
-  - servant-pool
-  - servant-postgresql
-  - servant-proto-lens
-  - servant-purescript
-  - servant-pushbullet-client
-  - servant-py
-  - servant-quickcheck
-  - servant-reason
-  - servant-reflex
-  - servant-router
-  - servant-scotty
-  - servant-server-namedargs
-  - servant-smsc-ru
-  - servant-snap
-  - servant-static-th
-  - servant-streaming
-  - servant-streaming-client
-  - servant-streaming-docs
-  - servant-streaming-server
-  - servant-subscriber
-  - servant-swagger-tags
-  - servant-waargonaut
-  - servant-websockets
-  - servant-xml
-  - servant-zeppelin
-  - servant-zeppelin-client
-  - servant-zeppelin-server
-  - servant-zeppelin-swagger
-  - server-generic
-  - serversession-backend-acid-state
-  - serversession-backend-redis
-  - serversession-frontend-snap
-  - serversession-frontend-yesod
-  - services
-  - ses-html
-  - ses-html-snaplet
-  - SessionLogger
-  - sessions
-  - sessiontypes
-  - sessiontypes-distributed
-  - set-with
-  - setdown
-  - setgame
-  - setoid
-  - sets
-  - setters
-  - sexp
-  - sext
-  - SFML
-  - SFML-control
-  - sfmt
-  - sfnt2woff
-  - SFont
-  - SG
-  - sgd
-  - SGdemo
-  - sgf
-  - SGplus
-  - sgrep
-  - sh2md
-  - sha-streams
-  - shade
-  - shadower
-  - shake-ats
-  - shake-cabal-build
-  - shake-extras
-  - shake-minify
-  - shake-pack
-  - shake-path
-  - shake-persist
-  - shaker
-  - shakespeare-babel
-  - shakespeare-sass
-  - shapely-data
-  - shared-buffer
-  - shared-fields
-  - she
-  - shelduck
-  - shell-pipe
-  - Shellac
-  - Shellac-compatline
-  - Shellac-editline
-  - Shellac-haskeline
-  - Shellac-readline
-  - shellish
-  - shellmate
-  - shellmate-extras
-  - shh
-  - shh-extras
-  - shine-examples
-  - shivers-cfg
-  - shoap
-  - shopify
-  - shorten-strings
-  - ShortestPathProblems
-  - showdown
-  - shpider
-  - shuffle
-  - si-clock
-  - sibe
-  - sifflet
-  - sifflet-lib
-  - siggy-chardust
-  - sigma-ij
-  - sign
-  - signals
-  - signed-multiset
-  - silvi
-  - simd
-  - simgi
-  - simple-actors
-  - simple-affine-space
-  - simple-atom
-  - simple-bluetooth
-  - simple-c-value
-  - simple-conduit
-  - simple-config
-  - simple-css
-  - simple-download
-  - simple-eval
-  - simple-firewire
-  - simple-genetic-algorithm
-  - simple-index
-  - simple-log-syslog
-  - simple-logging
-  - simple-money
-  - simple-neural-networks
-  - simple-nix
-  - simple-pascal
-  - simple-pipe
-  - simple-rope
-  - simple-src-utils
-  - simple-tabular
-  - simple-tar
-  - simple-vec3
-  - simple-zipper
-  - simpleargs
-  - simpleconfig
-  - SimpleGL
-  - simpleirc
-  - simpleirc-lens
-  - SimpleLog
-  - simplenote
-  - simpleprelude
-  - SimpleServer
-  - simplest-sqlite
-  - simseq
-  - singleton-dict
-  - singleton-typelits
-  - singletons-presburger
-  - singnal
-  - singular-factory
-  - sink
-  - siphon
-  - siren-json
-  - sirkel
-  - sitepipe
-  - sixfiguregroup
-  - sized
-  - sized-grid
-  - sized-types
-  - sized-vector
-  - sizes
-  - sjsp
-  - skeletal-set
-  - skeleton
-  - skeletons
-  - skell
-  - skemmtun
-  - skews
-  - skulk
-  - skylark-client
-  - skype4hs
-  - slack
-  - slate
-  - slave-thread
-  - slidemews
-  - Slides
-  - slim
-  - sloane
-  - slot-lambda
-  - sloth
-  - slug
-  - slynx
-  - small-bytearray-builder
-  - smallarray
-  - smallcheck-laws
-  - smallcheck-lens
-  - smallpt-hs
-  - smallstring
-  - smartcheck
-  - smartconstructor
-  - smartGroup
-  - smartword
-  - smcdel
-  - sme
-  - smerdyakov
-  - smiles
-  - smith
-  - smith-cli
-  - smith-client
-  - Smooth
-  - smsaero
-  - smt-lib
-  - SmtLib
-  - smtlib2-debug
-  - smtlib2-pipe
-  - smtlib2-quickcheck
-  - smtp-mail-ng
-  - SMTPClient
-  - smtps-gmail
-  - smuggler
-  - snake
-  - snake-game
-  - snap
-  - snap-accept
-  - snap-auth-cli
-  - snap-blaze-clay
-  - snap-configuration-utilities
-  - snap-error-collector
-  - snap-extras
-  - snap-routes
-  - snap-stream
-  - snap-testing
-  - snap-utils
-  - snap-web-routes
-  - snaplet-acid-state
-  - snaplet-actionlog
-  - snaplet-amqp
-  - snaplet-auth-acid
-  - snaplet-coffee
-  - snaplet-css-min
-  - snaplet-customauth
-  - snaplet-environments
-  - snaplet-fay
-  - snaplet-ghcjs
-  - snaplet-hasql
-  - snaplet-haxl
-  - snaplet-hdbc
-  - snaplet-hslogger
-  - snaplet-i18n
-  - snaplet-influxdb
-  - snaplet-mandrill
-  - snaplet-mongoDB
-  - snaplet-mongodb-minimalistic
-  - snaplet-mysql-simple
-  - snaplet-oauth
-  - snaplet-persistent
-  - snaplet-postgresql-simple
-  - snaplet-postmark
-  - snaplet-purescript
-  - snaplet-recaptcha
-  - snaplet-redis
-  - snaplet-redson
-  - snaplet-rest
-  - snaplet-riak
-  - snaplet-sass
-  - snaplet-scoped-session
-  - snaplet-sedna
-  - snaplet-ses-html
-  - snaplet-sqlite-simple
-  - snaplet-sqlite-simple-jwt-auth
-  - snaplet-stripe
-  - snaplet-tasks
-  - snaplet-typed-sessions
-  - snaplet-wordpress
-  - snappy-conduit
-  - snappy-iteratee
-  - sndfile-enumerators
-  - sneakyterm
-  - SNet
-  - snm
-  - snmp
-  - snorkels
-  - snow-white
-  - snowflake-core
-  - snowflake-server
-  - snowtify
-  - Snusmumrik
-  - soap-openssl
-  - SoccerFun
-  - SoccerFunGL
-  - socket-sctp
-  - socket-unix
-  - socketed
-  - socketio
-  - sockets
-  - socketson
-  - sodium
-  - soegtk
-  - softfloat-hs
-  - solga
-  - solga-swagger
-  - solr
-  - sonic-visualiser
-  - Sonnex
-  - SoOSiM
-  - sorted
-  - sorting
-  - sorty
-  - souffle-haskell
-  - sound-collage
-  - sounddelay
-  - soundgen
-  - source-code-server
-  - SourceGraph
-  - sousit
-  - soyuz
-  - SpaceInvaders
-  - spacepart
-  - SpacePrivateers
-  - spake2
-  - spanout
-  - sparkle
-  - sparrow
-  - sparse
-  - sparse-lin-alg
-  - sparse-tensor
-  - sparsebit
-  - sparsecheck
-  - sparser
-  - spata
-  - special-functors
-  - special-keys
-  - specialize-th
-  - spectral-clustering
-  - speculation
-  - speculation-transformers
-  - speechmatics
-  - speedy-slice
-  - spelling-suggest
-  - sphero
-  - sphinx-cli
-  - sphinxesc
-  - spice
-  - SpinCounter
-  - spir-v
-  - spiros
-  - splay
-  - splaytree
-  - splines
-  - split-morphism
-  - splitter
-  - splot
-  - Spock
-  - Spock-api-ghcjs
-  - Spock-api-server
-  - Spock-auth
-  - Spock-core
-  - Spock-digestive
-  - Spock-lucid
-  - Spock-worker
-  - spoonutil
-  - spoty
-  - Sprig
-  - sprinkles
-  - spritz
-  - spsa
-  - spy
-  - sql-simple
-  - sql-simple-mysql
-  - sql-simple-pool
-  - sql-simple-postgresql
-  - sql-simple-sqlite
-  - sqlcipher
-  - sqlite
-  - sqlite-simple-typed
-  - sqlvalue-list
-  - sqsd-local
-  - squeal-postgresql
-  - squeeze
-  - sr-extra
-  - srcinst
-  - sscan
-  - sscgi
-  - ssh
-  - ssh-tunnel
-  - sshd-lint
-  - sssp
-  - sstable
-  - SSTG
-  - st2
-  - stable-heap
-  - stable-maps
-  - stable-marriage
-  - stable-memo
-  - stable-tree
-  - stack-bump
-  - stack-fix
-  - stack-hpc-coveralls
-  - stack-lib
-  - stack-network
-  - stack-prism
-  - stack-run
-  - stack-run-auto
-  - stack-type
-  - stack-wrapper
-  - stack2nix
-  - stackage
-  - stackage-build-plan
-  - stackage-cabal
-  - stackage-cli
-  - stackage-curator
-  - stackage-metadata
-  - stackage-query
-  - stackage-sandbox
-  - stackage-setup
-  - stackage-to-hackage
-  - stackage-types
-  - stackage-upload
-  - stackage2nix
-  - stacked-dag
-  - standalone-derive-topdown
-  - starling
-  - stash
-  - Stasis
-  - state
-  - state-bag
-  - state-plus
-  - state-record
-  - stateful-mtl
-  - stateWriter
-  - static-canvas
-  - static-closure
-  - static-tensor
-  - static-text
-  - statistics-dirichlet
-  - statistics-fusion
-  - statistics-hypergeometric-genvar
-  - stats
-  - statsd
-  - statsd-client
-  - statsdi
-  - stb-image-redux
-  - stc-lang
-  - stdata
-  - stdf
-  - stdio
-  - steambrowser
-  - stego-uuid
-  - stemmer
-  - stemmer-german
-  - stepwise
-  - stern-brocot
-  - stgi
-  - stm-chunked-queues
-  - stm-containers
-  - stm-firehose
-  - stm-hamt
-  - stm-io-hooks
-  - stm-promise
-  - stm-stats
-  - stm-supply
-  - stmcontrol
-  - stochastic
-  - Stomp
-  - storable
-  - storable-static-array
-  - storablevector-streamfusion
-  - stp
-  - str
-  - Strafunski-ATermLib
-  - Strafunski-Sdf2Haskell
-  - StrappedTemplates
-  - stratum-tool
-  - stratux
-  - stratux-demo
-  - stratux-websockets
-  - stream
-  - stream-fusion
-  - stream-monad
-  - streamdeck
-  - streamed
-  - streaming-brotli
-  - streaming-cassava
-  - streaming-conduit
-  - streaming-fft
-  - streaming-png
-  - streaming-postgresql-simple
-  - streaming-process
-  - streaming-sort
-  - streamly-fsnotify
-  - strelka
-  - strict-data
-  - StrictBench
-  - StrictCheck
-  - strictly
-  - string-isos
-  - string-typelits
-  - stringlike
-  - stringtable-atom
-  - stripe
-  - stripe-haskell
-  - stripe-http-client
-  - stripe-http-streams
-  - stripe-tests
-  - structural-induction
-  - structural-traversal
-  - structured-mongoDB
-  - structures
-  - stt
-  - stunts
-  - stylish-haskell
-  - stylist
-  - stylized
-  - suavemente
-  - sub-state
-  - subhask
-  - subleq-toolchain
-  - submark
-  - subsample
-  - subwordgraph
-  - successors
-  - suffix-array
-  - suffixarray
-  - SuffixStructures
-  - suitable
-  - summoner
-  - summoner-tui
-  - sump
-  - sunlight
-  - sunroof-compiler
-  - sunroof-examples
-  - sunroof-server
-  - super-user-spark
-  - superbubbles
-  - superbuffer
-  - supercollider-ht
-  - supercollider-midi
-  - superconstraints
-  - superevent
-  - supermonad
-  - supero
-  - supervisor
-  - supervisors
-  - supplemented
-  - surjective
-  - sv
-  - sv-svfactor
-  - SVD2HS
-  - svfactor
-  - svg-builder-fork
-  - SVG2Q
-  - svg2q
-  - svgutils
-  - svm-simple
-  - svndump
-  - swagger-petstore
-  - swagger-test
-  - swapper
-  - swearjure
-  - swf
-  - swift-lda
-  - sws
-  - syb-extras
-  - syb-with-class-instances-text
-  - SybWidget
-  - syfco
-  - sylvia
-  - sym
-  - sym-plot
-  - symantic-http-test
-  - symantic-xml
-  - symbiote
-  - symengine
-  - symengine-hs
-  - sync
-  - sync-mht
-  - syncthing-hs
-  - syntactic
-  - syntax
-  - syntax-attoparsec
-  - syntax-example
-  - syntax-example-json
-  - syntax-pretty
-  - syntax-printer
-  - syntax-trees
-  - syntax-trees-fork-bairyn
-  - SyntaxMacros
-  - syntaxnet-haskell
-  - synthesizer
-  - synthesizer-llvm
-  - sys-process
-  - Sysmon
-  - system-canonicalpath
-  - system-command
-  - system-extra
-  - system-lifted
-  - system-linux-proc
-  - system-random-effect
-  - systemstats
-  - t-regex
-  - t3-client
-  - t3-server
-  - ta
-  - table
-  - table-layout
-  - table-tennis
-  - tableaux
-  - Tables
-  - tables
-  - tablestorage
-  - Tablify
-  - tabloid
-  - tabs
-  - tag-bits
-  - tag-stream
-  - tagged-exception-core
-  - tagged-list
-  - tagged-th
-  - tagged-timers
-  - taglib-api
-  - tagsoup-ht
-  - tagsoup-megaparsec
-  - tagsoup-navigate
-  - tagsoup-parsec
-  - tagsoup-selection
-  - tai64
-  - takahashi
-  - Takusen
-  - takusen-oracle
-  - tal
-  - tamarin-prover
-  - tamarin-prover-term
-  - tamarin-prover-theory
-  - tamarin-prover-utils
-  - tamper
-  - Tape
-  - tar-bytestring
-  - target
-  - tart
-  - task
-  - task-distribution
-  - taskell
-  - tasty-auto
-  - tasty-fail-fast
-  - tasty-groundhog-converters
-  - tasty-hedgehog-coverage
-  - tasty-integrate
-  - tasty-jenkins-xml
-  - tasty-laws
-  - tasty-lens
-  - tasty-stats
-  - tasty-tap
-  - Taxonomy
-  - TaxonomyTools
-  - TBC
-  - TBit
-  - tbox
-  - tcache-AWS
-  - tccli
-  - tcod-haskell
-  - tcp
-  - tcp-streams-openssl
-  - tdd-util
-  - tds
-  - TeaHS
-  - teams
-  - teeth
-  - telegram
-  - telegram-api
-  - telegram-bot
-  - telegram-bot-simple
-  - teleport
-  - teleshell
-  - tellbot
-  - template-default
-  - template-haskell-util
-  - template-hsml
-  - template-yj
-  - templateify
-  - templatepg
-  - tempodb
-  - temporal-csound
-  - tempus
-  - tensor
-  - tensorflow
-  - tensorflow-core-ops
-  - tensorflow-logging
-  - tensorflow-opgen
-  - tensorflow-ops
-  - tensorflow-proto
-  - termbox-bindings
-  - terminal-punch
-  - terminal-text
-  - termination-combinators
-  - termplot
-  - terntup
-  - terrahs
-  - tersmu
-  - test-fixture
-  - test-framework-doctest
-  - test-framework-quickcheck
-  - test-framework-sandbox
-  - test-framework-skip
-  - test-framework-testing-feat
-  - test-lib
-  - test-pkg
-  - test-sandbox-compose
-  - test-sandbox-hunit
-  - test-shouldbe
-  - test-simple
-  - testbench
-  - testCom
-  - TestExplode
-  - testloop
-  - testpack
-  - testpattern
-  - testrunner
-  - TeX-my-math
-  - tex2txt
-  - texbuilder
-  - text-all
-  - text-and-plots
-  - text-containers
-  - text-generic-pretty
-  - text-icu-normalized
-  - text-lens
-  - text-locale-encoding
-  - text-markup
-  - text-normal
-  - text-plus
-  - text-position
-  - text-register-machine
-  - text-replace
-  - text-time
-  - text-utf8
-  - text-xml-qq
-  - text-zipper-monad
-  - text1
-  - textmatetags
-  - textocat-api
-  - textual
-  - tfp-th
-  - tftp
-  - tga
-  - th-alpha
-  - th-build
-  - th-context
-  - th-dict-discovery
-  - th-fold
-  - th-format
-  - th-instance-reification
-  - th-instances
-  - th-kinds-fork
-  - th-sccs
-  - th-to-exp
-  - th-traced
-  - th-typegraph
-  - thank-you-stars
-  - theatre
-  - thentos-cookie-session
-  - Theora
-  - theoremquest
-  - theoremquest-client
-  - these-skinny
-  - thih
-  - thimk
-  - Thingie
-  - thorn
-  - threadmanager
-  - threadscope
-  - threepenny-gui-contextmenu
-  - threepenny-gui-flexbox
-  - thrift
-  - throttled-io-loop
-  - through-text
-  - throwable-exceptions
-  - thumbnail-plus
-  - thumbnail-polish
-  - tic-tac-toe
-  - ticker
-  - tickle
-  - TicTacToe
-  - tictactoe3d
-  - tidal-midi
-  - tidal-serial
-  - tidal-vis
-  - tie-knot
-  - tiempo
-  - tiger
-  - tightrope
-  - tighttp
-  - timberc
-  - time-extras
-  - time-http
-  - time-io-access
-  - time-machine
-  - time-quote
-  - time-recurrence
-  - time-series
-  - time-series-lib
-  - time-w3c
-  - time-warp
-  - timecalc
-  - timemap
-  - timeout
-  - timeout-with-results
-  - timeparsers
-  - TimePiece
-  - timeplot
-  - timeprint
-  - timers-tick
-  - timeseries
-  - timespan
-  - timeutils
-  - timezone-unix
-  - tintin
-  - tiny-scheduler
-  - TinyLaunchbury
-  - tinyMesh
-  - tinytemplate
-  - TinyURL
-  - tinyXml
-  - tip-haskell-frontend
-  - tip-lib
-  - titan
-  - titan-debug-yampa
-  - titan-record-yampa
-  - Titim
-  - tkhs
-  - tkyprof
-  - tls-extra
-  - tlynx
-  - tmp-postgres
-  - tn
-  - to-haskell
-  - to-string-class
-  - to-string-instances
-  - toboggan
-  - todos
-  - tofromxml
-  - toilet
-  - token-search
-  - tokenify
-  - tokstyle
-  - toktok
-  - tokyocabinet-haskell
-  - tokyotyrant-haskell
-  - tomato-rubato-openal
-  - toml
-  - tomlcheck
-  - too-many-cells
-  - toodles
-  - Top
-  - top
-  - topkata
-  - torch
-  - TORCS
-  - total-map
-  - touched
-  - Tournament
-  - toxcore
-  - toxiproxy-haskell
-  - toysolver
-  - tpar
-  - tpb
-  - trace
-  - trace-call
-  - trace-function-call
-  - traced
-  - tracetree
-  - tracing
-  - tracker
-  - traction
-  - tracy
-  - traildb
-  - trajectory
-  - transactional-events
-  - transf
-  - transfer-db
-  - transformations
-  - TransformeR
-  - transformers-compose
-  - transformers-convert
-  - transformers-lift
-  - transformers-runnable
-  - TransformersStepByStep
-  - transient
-  - transient-universe
-  - transient-universe-tls
-  - translatable-intset
-  - translate
-  - translate-cli
-  - trasa
-  - trasa-client
-  - trasa-extra
-  - trasa-form
-  - trasa-server
-  - trasa-th
-  - travis
-  - travis-meta-yaml
-  - trawl
-  - traypoweroff
-  - tree-sitter
-  - tree-sitter-go
-  - tree-sitter-haskell
-  - tree-sitter-java
-  - tree-sitter-json
-  - tree-sitter-php
-  - tree-sitter-python
-  - tree-sitter-ruby
-  - tree-sitter-tsx
-  - tree-sitter-typescript
-  - tree-traversals
-  - TreeCounter
-  - treemap-html
-  - treemap-html-tools
-  - TreeStructures
-  - Treiber
-  - tremulous-query
-  - TrendGraph
-  - trhsx
-  - triangulation
-  - trie-simple
-  - TrieMap
-  - tries
-  - trigger
-  - trim
-  - trimpolya
-  - tripLL
-  - trivia
-  - tropical
-  - tropical-geometry
-  - truelevel
-  - trurl
-  - tsession
-  - tsession-happstack
-  - tskiplist
-  - tsp-viz
-  - tsparse
-  - tsuntsun
-  - tsvsql
-  - tsweb
-  - ttask
-  - ttn-client
-  - tttool
-  - tuntap
-  - tup-functor
-  - tuple-gen
-  - tuple-lenses
-  - tuple-morph
-  - tuple-ops
-  - tupleinstances
-  - turing-machines
-  - turingMachine
-  - turtle-options
-  - tweak
-  - twee
-  - tweet-hs
-  - twentefp-eventloop-graphics
-  - twentefp-graphs
-  - twentefp-rosetree
-  - twentefp-trees
-  - twentefp-websockets
-  - twentyseven
-  - twfy-api-client
-  - twhs
-  - twidge
-  - twilight-stm
-  - twilio
-  - twill
-  - twine
-  - twirp
-  - twitter
-  - twitter-conduit
-  - twitter-enumerator
-  - twitter-feed
-  - twitter-types
-  - twitter-types-lens
-  - tx
-  - txt
-  - txtblk
-  - TYB
-  - tyfam-witnesses
-  - typalyze
-  - type-assertions
-  - type-cache
-  - type-cereal
-  - type-combinators
-  - type-combinators-quote
-  - type-combinators-singletons
-  - type-digits
-  - type-eq
-  - type-indexed-queues
-  - type-int
-  - type-interpreter
-  - type-level-bst
-  - type-level-natural-number-induction
-  - type-level-natural-number-operations
-  - type-list
-  - type-natural
-  - type-ord
-  - type-ord-spine-cereal
-  - type-prelude
-  - type-settheory
-  - type-spine
-  - type-structure
-  - type-sub-th
-  - typeable-th
-  - TypeClass
-  - typed-spreadsheet
-  - typed-streams
-  - typed-wire
-  - typedflow
-  - typedquery
-  - typehash
-  - TypeIlluminator
-  - typelevel-rewrite-rules
-  - typelevel-tensor
-  - TypeNat
-  - typeparams
-  - typerep-map
-  - types-compat
-  - typesafe-precure
-  - typescript-docs
-  - typograffiti
-  - typography-geometry
-  - tyro
-  - u2f
-  - uber
-  - uberlast
-  - uconv
-  - udev
-  - udp-conduit
-  - uhc-light
-  - uhc-util
-  - uhexdump
-  - ui-command
-  - UMM
-  - unagi-bloomfilter
-  - unagi-streams
-  - unamb-custom
-  - unbeliever
-  - unbound
-  - unbound-kind-generics
-  - unbounded-delays-units
-  - unboxed-containers
-  - unbreak
-  - unfoldable
-  - unfoldable-restricted
-  - uni-graphs
-  - uni-uDrawGraph
-  - unicode-normalization
-  - unicode-show
-  - unicode-symbols
-  - uniform-io
-  - union
-  - union-map
-  - uniqueid
-  - uniquely-represented-sets
-  - units-attoparsec
-  - unittyped
-  - unity-testresult-parser
-  - unitym-yesod
-  - universal
-  - universe-th
-  - unix-fcntl
-  - unix-handle
-  - unix-process-conduit
-  - unjson
-  - unm-hip
-  - unordered-containers-rematch
-  - unordered-graphs
-  - unordered-intmap
-  - unpack-funcs
-  - unpacked-either
-  - unpacked-maybe
-  - unpacked-maybe-numeric
-  - unpacked-these
-  - unpacked-validation
-  - unroll-ghc-plugin
-  - unsafely
-  - unscramble
-  - unsequential
-  - unused
-  - uom-plugin
-  - up
-  - update-nix-fetchgit
-  - Updater
-  - uploadcare
-  - upskirt
-  - ureader
-  - urembed
-  - uri
-  - uri-conduit
-  - uri-enumerator
-  - uri-enumerator-file
-  - uri-parse
-  - uri-template
-  - url-decoders
-  - url-generic
-  - URLb
-  - urlcheck
-  - urldecode
-  - UrlDisp
-  - urldisp-happstack
-  - urlpath
-  - URLT
-  - urn
-  - urn-random
-  - urxml
-  - usb-enumerator
-  - usb-hid
-  - usb-id-database
-  - usb-iteratee
-  - usb-safe
-  - users-mysql-haskell
-  - users-persistent
-  - utc
-  - utf8-prelude
-  - utf8-validator
-  - UTFTConverter
-  - util-exception
-  - util-primitive
-  - util-primitive-control
-  - util-universe
-  - uu-cco
-  - uu-cco-examples
-  - uu-cco-hut-parsing
-  - uu-cco-uu-parsinglib
-  - uuagc-bootstrap
-  - uuagc-diagrams
-  - uuid-aeson
-  - uuid-bytes
-  - uuid-orphans
-  - uvector
-  - uvector-algorithms
-  - uxadt
-  - v4l2
-  - v4l2-examples
-  - vabal
-  - vacuum
-  - vacuum-cairo
-  - vacuum-graphviz
-  - vacuum-opengl
-  - vacuum-ubigraph
-  - valid-names
-  - validate-input
-  - validated-types
-  - Validation
-  - validations
-  - validationt
-  - vampire
-  - var
-  - varan
-  - variable-precision
-  - variables
-  - variation
-  - vault-tool-server
-  - vault-trans
-  - vaultaire-common
-  - vcard
-  - vcatt
-  - vcf
-  - vcsgui
-  - vcswrapper
-  - Vec-Boolean
-  - vec-lens
-  - Vec-OpenGLRaw
-  - vec-optics
-  - Vec-Transform
-  - vect-floating
-  - vect-floating-accelerate
-  - vect-opengl
-  - vector-bytestring
-  - vector-clock
-  - vector-conduit
-  - vector-endian
-  - vector-functorlazy
-  - vector-heterogenous
-  - vector-instances-collections
-  - vector-random
-  - vector-read-instances
-  - vector-space-map
-  - vector-space-opengl
-  - vector-static
-  - vectortiles
-  - venzone
-  - Verba
-  - verbalexpressions
-  - verdict
-  - verdict-json
-  - verifiable-expressions
-  - verify
-  - verilog
-  - versioning
-  - versioning-servant
-  - vflow-types
-  - vfr-waypoints
-  - vgrep
-  - vhd
-  - vhdl
-  - vicinity
-  - ViennaRNA-extras
-  - views
-  - vigilance
-  - Villefort
-  - vimus
-  - vintage-basic
-  - vinyl
-  - vinyl-generics
-  - vinyl-gl
-  - vinyl-json
-  - vinyl-named-sugar
-  - vinyl-operational
-  - vinyl-plus
-  - vinyl-utils
-  - vinyl-vectors
-  - virthualenv
-  - visibility
-  - vision
-  - visual-graphrewrite
-  - visual-prof
-  - visualize-cbn
-  - vivid
-  - vivid-supercollider
-  - vk-aws-route53
-  - VKHS
-  - voicebase
-  - vorbiscomment
-  - vowpal-utils
-  - voyeur
-  - vpq
-  - vte
-  - vtegtk3
-  - vty-examples
-  - vty-menu
-  - vty-ui
-  - vty-ui-extras
-  - vulkan
-  - waargonaut
-  - wacom-daemon
-  - waddle
-  - wahsp
-  - wai-app-file-cgi
-  - wai-devel
-  - wai-git-http
-  - wai-graceful
-  - wai-handler-devel
-  - wai-handler-scgi
-  - wai-handler-snap
-  - wai-handler-webkit
-  - wai-hmac-auth
-  - wai-lens
-  - wai-lite
-  - wai-logger-buffered
-  - wai-logger-prefork
-  - wai-make-assets
-  - wai-middleware-cache
-  - wai-middleware-cache-redis
-  - wai-middleware-catch
-  - wai-middleware-consul
-  - wai-middleware-content-type
-  - wai-middleware-delegate
-  - wai-middleware-etag
-  - wai-middleware-headers
-  - wai-middleware-hmac-client
-  - wai-middleware-preprocessor
-  - wai-middleware-rollbar
-  - wai-middleware-route
-  - wai-middleware-static-caching
-  - wai-request-spec
-  - wai-responsible
-  - wai-router
-  - wai-routes
-  - wai-routing
-  - wai-secure-cookies
-  - wai-session-alt
-  - wai-session-mysql
-  - wai-session-postgresql
-  - wai-static-cache
-  - wai-thrift
-  - wai-throttler
-  - waitfree
-  - waitra
-  - waldo
-  - wallpaper
-  - warp-dynamic
-  - warp-grpc
-  - warp-static
-  - warp-systemd
-  - WashNGo
-  - wasm
-  - watcher
-  - watchit
-  - WAVE
-  - WaveFront
-  - wavefront-obj
-  - wavesurfer
-  - wavy
-  - weak-bag
-  - weather-api
-  - web-css
-  - web-encodings
-  - web-fpco
-  - web-inv-route
-  - web-mongrel2
-  - web-output
-  - web-page
-  - web-push
-  - web-rep
-  - web-routes-happstack
-  - web-routes-quasi
-  - web-routes-regular
-  - web-routes-transformers
-  - web-routing
-  - web3
-  - webapi
-  - webapp
-  - WebBits
-  - WebBits-Html
-  - WebBits-multiplate
-  - webcloud
-  - WebCont
-  - webcrank
-  - webcrank-dispatch
-  - webcrank-wai
-  - webdriver-angular
-  - webdriver-snoy
-  - webdriver-w3c
-  - WeberLogic
-  - webfinger-client
-  - webify
-  - webkit-javascriptcore
-  - Webrexp
-  - webserver
-  - webshow
-  - websockets-rpc
-  - websockets-simple
-  - websockets-simple-extra
-  - webwire
-  - weekdaze
-  - weighted
-  - weighted-regexp
-  - welshy
-  - werewolf
-  - werewolf-slack
-  - Wheb
-  - wheb-mongo
-  - wheb-redis
-  - wheb-strapped
-  - while-lang-parser
-  - whim
-  - whiskers
-  - whitespace
-  - why3
-  - wide-word
-  - WikimediaParser
-  - wikipedia4epub
-  - wild-bind-indicator
-  - wild-bind-task-x11
-  - windns
-  - windowslive
-  - winerror
-  - winio
-  - Wired
-  - wires
-  - wiring
-  - wkt
-  - wkt-geom
-  - wl-pprint-ansiterm
-  - wl-pprint-terminfo
-  - WL500gPControl
-  - WL500gPLib
-  - wlc-hs
-  - WMSigner
-  - wobsurv
-  - woffex
-  - wolf
-  - word
-  - word2vec-model
-  - WordAlignment
-  - wordify
-  - WordNet
-  - WordNet-ghc74
-  - wordpass
-  - wordsearch
-  - work-time
-  - workdays
-  - Workflow
-  - workflow-extra
-  - workflow-osx
-  - workflow-pure
-  - workflow-types
-  - workflow-windows
-  - wp-archivebot
-  - wraxml
-  - wrecker
-  - wrecker-ui
-  - wreq-sb
-  - wright
-  - writer-cps-full
-  - writer-cps-lens
-  - writer-cps-monads-tf
-  - writer-cps-morph
-  - ws
-  - wsdl
-  - wsedit
-  - wss-client
-  - wtk
-  - wtk-gtk
-  - wumpus-basic
-  - wumpus-core
-  - wumpus-drawing
-  - wumpus-microprint
-  - wumpus-tree
-  - WURFL
-  - wxAsteroids
-  - WXDiffCtrl
-  - wxdirect
-  - wxFruit
-  - WxGeneric
-  - wxhnotepad
-  - wxSimpleCanvas
-  - wxturtle
-  - wyvern
-  - x-dsp
-  - X11-extras
-  - X11-rm
-  - X11-xdamage
-  - X11-xfixes
-  - x86-64bit
-  - xchat-plugin
-  - xcp
-  - xdcc
-  - xdot
-  - Xec
-  - xfconf
-  - xformat
-  - xhaskell-library
-  - xhb
-  - xhb-atom-cache
-  - xhb-ewmh
-  - xilinx-lava
-  - xine
-  - xing-api
-  - xkbcommon
-  - xkcd
-  - xleb
-  - xlsior
-  - xlsx-tabular
-  - xlsx-templater
-  - xml-catalog
-  - xml-conduit-decode
-  - xml-conduit-stylist
-  - xml-enumerator
-  - xml-enumerator-combinators
-  - xml-html-conduit-lens
-  - xml-monad
-  - xml-parsec
-  - xml-pipe
-  - xml-prettify
-  - xml-push
-  - xml-query
-  - xml-query-xml-conduit
-  - xml-query-xml-types
-  - xml-tydom-conduit
-  - xml-tydom-core
-  - xml2json
-  - xml2x
-  - xmlbf-xeno
-  - XmlHtmlWriter
-  - xmltv
-  - XMMS
-  - xmms2-client
-  - xmms2-client-glib
-  - xmonad-bluetilebranch
-  - xmonad-contrib-bluetilebranch
-  - xmonad-contrib-gpl
-  - xmonad-eval
-  - xmonad-vanessa
-  - xmonad-windownames
-  - xmpipe
-  - XMPP
-  - Xorshift128Plus
-  - xournal-builder
-  - xournal-convert
-  - xournal-parser
-  - xournal-render
-  - xournal-types
-  - xsact
-  - XSaiga
-  - xsd
-  - xslt
-  - xtc
-  - xxhash
-  - y0l0bot
-  - yabi-muno
-  - Yablog
-  - yackage
-  - YACPong
-  - yahoo-finance-api
-  - yahoo-finance-conduit
-  - yahoo-web-search
-  - yajl
-  - yajl-enumerator
-  - yam
-  - yam-datasource
-  - yam-job
-  - yam-redis
-  - yam-servant
-  - yam-transaction-odbc
-  - yam-web
-  - yaml-combinators
-  - yaml-pretty-extras
-  - yaml-rpc
-  - yaml-rpc-scotty
-  - yaml-rpc-snap
-  - yaml2owl
-  - Yampa
-  - yampa-canvas
-  - yampa-glfw
-  - yampa-gloss
-  - yampa-glut
-  - yampa-sdl2
-  - yampa-test
-  - yampa2048
-  - YampaSynth
-  - yandex-translate
-  - yaop
-  - yap
-  - yarn-lock
-  - yarr
-  - yarr-image-io
-  - yate
-  - yavie
-  - yaya
-  - yaya-hedgehog
-  - yaya-unsafe
-  - ycextra
-  - yeamer
-  - yeller
-  - yeshql-postgresql-simple
-  - yesod-angular
-  - yesod-angular-ui
-  - yesod-articles
-  - yesod-auth-account
-  - yesod-auth-account-fork
-  - yesod-auth-basic
-  - yesod-auth-bcrypt
-  - yesod-auth-bcryptdb
-  - yesod-auth-deskcom
-  - yesod-auth-fb
-  - yesod-auth-hmac-keccak
-  - yesod-auth-kerberos
-  - yesod-auth-ldap
-  - yesod-auth-ldap-mediocre
-  - yesod-auth-ldap-native
-  - yesod-auth-nopassword
-  - yesod-auth-pam
-  - yesod-auth-smbclient
-  - yesod-auth-zendesk
-  - yesod-bootstrap
-  - yesod-comments
-  - yesod-content-pdf
-  - yesod-continuations
-  - yesod-crud
-  - yesod-crud-persist
-  - yesod-datatables
-  - yesod-dsl
-  - yesod-examples
-  - yesod-fast-devel
-  - yesod-fay
-  - yesod-form-richtext
-  - yesod-gitrev
-  - yesod-goodies
-  - yesod-ip
-  - yesod-job-queue
-  - yesod-links
-  - yesod-lucid
-  - yesod-mangopay
-  - yesod-paginate
-  - yesod-pagination
-  - yesod-paypal-rest
-  - yesod-platform
-  - yesod-pnotify
-  - yesod-pure
-  - yesod-purescript
-  - yesod-raml
-  - yesod-raml-bin
-  - yesod-raml-docs
-  - yesod-raml-mock
-  - yesod-recaptcha
-  - yesod-routes
-  - yesod-routes-flow
-  - yesod-routes-typescript
-  - yesod-rst
-  - yesod-s3
-  - yesod-sass
-  - yesod-session-redis
-  - yesod-static-angular
-  - yesod-static-remote
-  - yesod-test-json
-  - yesod-tls
-  - yesod-vend
-  - yesod-worker
-  - yet-another-logger
-  - YFrob
-  - yggdrasil
-  - yhccore
-  - yi
-  - yi-contrib
-  - yi-core
-  - yi-dynamic-configuration
-  - yi-emacs-colours
-  - yi-frontend-pango
-  - yi-frontend-vty
-  - yi-fuzzy-open
-  - yi-ireader
-  - yi-keymap-cua
-  - yi-keymap-emacs
-  - yi-keymap-vim
-  - yi-language
-  - yi-misc-modes
-  - yi-mode-haskell
-  - yi-mode-javascript
-  - yi-monokai
-  - yi-snippet
-  - yi-solarized
-  - yi-spolsky
-  - yices
-  - yjftp
-  - yjftp-libs
-  - yoda
-  - Yogurt
-  - Yogurt-Standalone
-  - yoko
-  - york-lava
-  - yql
-  - yst
-  - yu-core
-  - yu-launch
-  - yu-tool
-  - yuuko
-  - yx
-  - yxdb-utils
-  - z3
-  - z3-encoding
-  - z85
-  - zabt
-  - zampolit
-  - zasni-gerna
-  - ZEBEDDE
-  - zendesk-api
-  - zenhack-prelude
-  - zeno
-  - zephyr
-  - zeromq-haskell
-  - zeromq3-conduit
-  - zeromq3-haskell
-  - zeromq4-clone-pattern
-  - zeromq4-conduit
-  - zeromq4-patterns
-  - zeroth
-  - ZFS
-  - zifter
-  - zifter-cabal
-  - zifter-git
-  - zifter-google-java-format
-  - zifter-hindent
-  - zifter-hlint
-  - zifter-stack
-  - zigbee-znet25
-  - zip-conduit
-  - zipedit
-  - zipkin
-  - ziptastic-client
-  - ziptastic-core
-  - zlib-enum
-  - zm
-  - ZMachine
-  - zmcat
-  - zmidi-score
-  - zoneinfo
-  - zoom
-  - zoom-cache
-  - zoom-cache-pcm
-  - zoom-cache-sndfile
-  - zoom-refs
-  - Zora
-  - zre
-  - zsh-battery
-  - zsyntax
-  - zuramaru
-  - Zwaluw

From cd02408f254b9f65cc02ef3622b8ae67cbf70ee9 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 29 Feb 2020 05:32:15 +1000
Subject: [PATCH 1818/4636] buildah: 1.14.0 -> 1.14.1

https://github.com/containers/buildah/releases/tag/v1.14.1
---
 pkgs/development/tools/buildah/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index c9287b7b96ec..3e758af0a7b5 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -1,16 +1,16 @@
 { stdenv, buildGoPackage, fetchFromGitHub
-, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, libselinux, libseccomp
+, gpgme, libgpgerror, lvm2, btrfs-progs, pkg-config, libselinux, libseccomp
 }:
 
 buildGoPackage rec {
   pname = "buildah";
-  version = "1.14.0";
+  version = "1.14.1";
 
   src = fetchFromGitHub {
     owner  = "containers";
     repo   = "buildah";
     rev    = "v${version}";
-    sha256 = "0nbcrhfd0c14d0m9a4mkd01jxk5i503z38kv2qfz5cvfghx517qq";
+    sha256 = "12x80g83xjcjiafcxyqrhg952nq5w91df35d7lnvc2vz8vvpkyx1";
   };
 
   outputs = [ "bin" "man" "out" ];
@@ -18,7 +18,7 @@ buildGoPackage rec {
   goPackagePath = "github.com/containers/buildah";
   excludedPackages = [ "tests" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs libselinux libseccomp ];
 
   patches = [ ./disable-go-module-mode.patch ];
@@ -36,7 +36,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "A tool which facilitates building OCI images";
-    homepage = "https://github.com/containers/buildah";
+    homepage = "https://buildah.io/";
     changelog = "https://github.com/containers/buildah/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ Profpatsch vdemeester saschagrunert ];

From 7e5690c088a542d979afab26a5f0f60f37fe2a98 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 21 Feb 2020 12:40:06 +0100
Subject: [PATCH 1819/4636] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.0-19-g1b9b3ef from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/f2eea06cf20bd7bb190d789e5585d5a9fe905535.
---
 .../haskell-modules/hackage-packages.nix      | 1291 ++++++++++++++---
 1 file changed, 1053 insertions(+), 238 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f82db1d5aa99..6dca75ad526b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5822,8 +5822,8 @@ self: {
      }:
      mkDerivation {
        pname = "Frames";
-       version = "0.6.1";
-       sha256 = "07pqy9ljf0ag5yxd62fi3c41pcvysfqccjizfiwz8ycfdj2b6a6l";
+       version = "0.6.2";
+       sha256 = "1pbwrjcd8fm56hnxw6q42adn9n7maj96j3a2qyb6a668pc8q8jyx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -21241,10 +21241,8 @@ self: {
      }:
      mkDerivation {
        pname = "acts";
-       version = "0.3.0.0";
-       sha256 = "1jsx3hv7krsd22ygaxln4sc7wjcs4dp5qwpr515l2gd9drmpz6ip";
-       revision = "1";
-       editedCabalFile = "0lh6clbc8ba3v3mxr34rlapwqkzgf4ny0g8gr1j4ndpk8wc70pn5";
+       version = "0.3.1.0";
+       sha256 = "06bpayfa8vwj8dqlqp71nw2s9iwbffdknkk4hpazd4r1wvhnrg37";
        libraryHaskellDepends = [
          base deepseq finitary finite-typelits groups
        ];
@@ -27118,8 +27116,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-athena";
-       version = "7.4.5";
-       sha256 = "1d2mphqa9jhlrbv6zyc9xpmv4i32r9c05dbdzms9rn22lx456qsl";
+       version = "7.5.0";
+       sha256 = "0gn01dlvx42b7c9gs6vphn4bhzjh2r37gqvngqq56hbxpd3ddnrh";
        libraryHaskellDepends = [
          amazonka amazonka-athena amazonka-core base lens resourcet text
          unliftio-core
@@ -27137,8 +27135,8 @@ self: {
     ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }:
      mkDerivation {
        pname = "antiope-contract";
-       version = "7.4.5";
-       sha256 = "1j1kxy8vbrrggp3vac15h1lnd2jqr9h3f4i5pyfid10y2pkxzmqc";
+       version = "7.5.0";
+       sha256 = "07ykln4i6yhl44r1n9318xk15ci2kfbl3gx81jar1sw1lsig8wah";
        libraryHaskellDepends = [
          aeson antiope-s3 avro base bytestring text
        ];
@@ -27172,6 +27170,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "antiope-core_7_5_0" = callPackage
+    ({ mkDerivation, aeson, aeson-lens, amazonka, amazonka-core, base
+     , bytestring, exceptions, generic-lens, hedgehog, hspec
+     , hspec-discover, http-client, http-types, hw-hspec-hedgehog, lens
+     , mtl, resourcet, scientific, text, transformers, unliftio-core
+     }:
+     mkDerivation {
+       pname = "antiope-core";
+       version = "7.5.0";
+       sha256 = "0hsya7n46ga4s6016jpv26hcxkbchz8zcihbkdriv6zjin4y4ms6";
+       libraryHaskellDepends = [
+         aeson amazonka amazonka-core base bytestring exceptions
+         generic-lens http-client http-types lens mtl resourcet text
+         transformers unliftio-core
+       ];
+       testHaskellDepends = [
+         aeson aeson-lens amazonka amazonka-core base bytestring exceptions
+         generic-lens hedgehog hspec http-client http-types
+         hw-hspec-hedgehog lens mtl resourcet scientific text transformers
+         unliftio-core
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "antiope-dynamodb" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb
      , antiope-core, base, generic-lens, hspec-discover, lens, text
@@ -27194,6 +27219,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "antiope-dynamodb_7_5_0" = callPackage
+    ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb
+     , antiope-core, base, generic-lens, hspec-discover, lens, text
+     , unliftio-core, unordered-containers
+     }:
+     mkDerivation {
+       pname = "antiope-dynamodb";
+       version = "7.5.0";
+       sha256 = "19rfxh92x7j3mpg23vfwvg90k6iz7l4lyzsijii4dhaf41w750ix";
+       libraryHaskellDepends = [
+         aeson amazonka amazonka-core amazonka-dynamodb antiope-core base
+         generic-lens lens text unliftio-core unordered-containers
+       ];
+       testHaskellDepends = [
+         amazonka amazonka-core amazonka-dynamodb antiope-core base
+         generic-lens lens text unliftio-core unordered-containers
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "antiope-es" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core
      , amazonka-elasticsearch, base, bytestring, hspec, hspec-discover
@@ -27201,8 +27249,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-es";
-       version = "7.4.5";
-       sha256 = "1hdcsfgy504831r8816vck422qr087w5479wxy3rrf3rm91d6s2l";
+       version = "7.5.0";
+       sha256 = "0wa5wjzawlkbvd98a9wmzh9x7r133hyz340ppz2xq50j85sj3rfn";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-elasticsearch base bytestring
          json-stream lens thyme unordered-containers vector
@@ -27237,6 +27285,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "antiope-messages_7_5_0" = callPackage
+    ({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring
+     , generic-lens, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog
+     , lens, lens-aeson, monad-loops, network-uri, scientific, text
+     , unliftio-core
+     }:
+     mkDerivation {
+       pname = "antiope-messages";
+       version = "7.5.0";
+       sha256 = "1hj20y832q1fqkvca1zzyhvg8iy87r6jwpa6f42mpbwv2kgar0n7";
+       libraryHaskellDepends = [
+         aeson amazonka amazonka-core base bytestring generic-lens lens
+         lens-aeson monad-loops network-uri text unliftio-core
+       ];
+       testHaskellDepends = [
+         aeson amazonka amazonka-core base bytestring generic-lens hedgehog
+         hspec hw-hspec-hedgehog lens lens-aeson monad-loops network-uri
+         scientific text unliftio-core
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "antiope-optparse-applicative" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, base
      , hedgehog, hspec, hspec-discover, hw-hspec-hedgehog
@@ -27244,8 +27317,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-optparse-applicative";
-       version = "7.4.5";
-       sha256 = "1nx6hirkjf6gpqbkjczld6zbml9f5xnvafb6d9lgglwrpcjm67br";
+       version = "7.5.0";
+       sha256 = "0b2bzq1lpy6yypmi14civb1gsizgby7xh3a881scwbhqh0dr2bkq";
        libraryHaskellDepends = [
          amazonka amazonka-core amazonka-s3 base optparse-applicative text
        ];
@@ -27286,6 +27359,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "antiope-s3_7_5_0" = callPackage
+    ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
+     , antiope-core, antiope-messages, attoparsec, base, bytestring
+     , conduit, conduit-extra, deepseq, dlist, exceptions, generic-lens
+     , hedgehog, hspec, hspec-discover, http-types, hw-hspec-hedgehog
+     , lens, mtl, network-uri, resourcet, text, time, unliftio-core
+     }:
+     mkDerivation {
+       pname = "antiope-s3";
+       version = "7.5.0";
+       sha256 = "174swlnmjai5awaiwn47788giv75rggc1y13zz1iwjgzxi9iy4kb";
+       libraryHaskellDepends = [
+         aeson amazonka amazonka-core amazonka-s3 antiope-core
+         antiope-messages attoparsec base bytestring conduit conduit-extra
+         deepseq dlist exceptions generic-lens http-types lens mtl
+         network-uri resourcet text time unliftio-core
+       ];
+       testHaskellDepends = [
+         aeson amazonka amazonka-core amazonka-s3 antiope-core attoparsec
+         base bytestring conduit conduit-extra exceptions generic-lens
+         hedgehog hspec http-types hw-hspec-hedgehog lens mtl network-uri
+         resourcet text time unliftio-core
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "antiope-shell" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
      , antiope-core, antiope-messages, antiope-s3, attoparsec, base
@@ -27296,8 +27398,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-shell";
-       version = "7.4.5";
-       sha256 = "1c69crnrqg8jij5z9y9008341ki42r6mjkklm8qpj8xh6c5k50zm";
+       version = "7.5.0";
+       sha256 = "1fw3wgvs5yky4xvz1mffqvwmvw6r1s9qmjwf9cz4hj24ghqp0w76";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 antiope-core
          antiope-messages antiope-s3 attoparsec base bytestring exceptions
@@ -27338,6 +27440,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "antiope-sns_7_5_0" = callPackage
+    ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base
+     , bytestring, generic-lens, hedgehog, hspec, hspec-discover
+     , hw-hspec-hedgehog, lens, text, time, unliftio-core
+     }:
+     mkDerivation {
+       pname = "antiope-sns";
+       version = "7.5.0";
+       sha256 = "1qqfl9yagc99yvvclqw5cllw3b59lq57l3rfg9rqxf9zmdxqq8nq";
+       libraryHaskellDepends = [
+         aeson amazonka amazonka-core amazonka-sns base bytestring
+         generic-lens lens text time unliftio-core
+       ];
+       testHaskellDepends = [
+         aeson amazonka amazonka-core amazonka-sns base bytestring
+         generic-lens hedgehog hspec hw-hspec-hedgehog lens text time
+         unliftio-core
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "antiope-sqs" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base
      , bytestring, conduit, generic-lens, hedgehog, hspec
@@ -27364,6 +27490,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "antiope-sqs_7_5_0" = callPackage
+    ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base
+     , bytestring, conduit, generic-lens, hedgehog, hspec
+     , hspec-discover, hw-hspec-hedgehog, lens, lens-aeson, monad-loops
+     , mtl, network-uri, split, text, time, unliftio-core
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "antiope-sqs";
+       version = "7.5.0";
+       sha256 = "0v75x2n902xvn4qwv9qk1fhayzsw5wz5yg7p1i6pwxxzf8bmy46l";
+       libraryHaskellDepends = [
+         aeson amazonka amazonka-core amazonka-sqs base bytestring conduit
+         generic-lens lens lens-aeson monad-loops mtl network-uri split text
+         unliftio-core unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson amazonka amazonka-core amazonka-sqs base bytestring conduit
+         generic-lens hedgehog hspec hw-hspec-hedgehog lens lens-aeson
+         monad-loops mtl network-uri text time unliftio-core
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "antiope-swf" = callPackage
     ({ mkDerivation, amazonka-swf, base, hedgehog, hspec
      , hspec-discover, hw-hspec-hedgehog, lens, text
@@ -30643,6 +30796,8 @@ self: {
        pname = "atl";
        version = "17072";
        sha256 = "0ym06hm0w443r8akw59663p651m0p14zp288f7dv1ng9vy6nmvis";
+       revision = "1";
+       editedCabalFile = "0h3y24p4296qxwcmynsrqwnxpk024p9c835yh8s366skcjwmhk4x";
        libraryHaskellDepends = [ base ];
        description = "Arrow Transformer Library";
        license = stdenv.lib.licenses.bsd3;
@@ -31577,13 +31732,14 @@ self: {
      , megaparsec, microlens, microlens-ghc, mwc-random, network-uri
      , nonempty-containers, optparse-applicative, paths, pretty-simple
      , prettyprinter, prettyprinter-ansi-terminal, rio, scheduler
-     , semigroupoids, stm, tasty, tasty-hunit, text, these, time
-     , transformers, typed-process, unliftio, versions
+     , semigroupoids, servant-client-core, stm, tasty, tasty-hunit, text
+     , these, time, transformers, typed-process, unliftio, versions
+     , witherable-class
      }:
      mkDerivation {
        pname = "aura";
-       version = "2.1.0";
-       sha256 = "18wj1yjzs3icp3mmm35dpq5c29r5hv4sp1q9aixhziky38r0cq6a";
+       version = "2.2.0";
+       sha256 = "0cgba7f5nnbapxyb180kd5v69jj47zb2j43r5xf233dxw6ac7a8w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -31591,8 +31747,8 @@ self: {
          errors filepath generic-lens http-client http-types language-bash
          megaparsec microlens microlens-ghc mwc-random network-uri
          nonempty-containers paths prettyprinter prettyprinter-ansi-terminal
-         rio scheduler semigroupoids stm text these time transformers
-         typed-process unliftio versions
+         rio scheduler semigroupoids servant-client-core stm text these time
+         transformers typed-process unliftio versions witherable-class
        ];
        executableHaskellDepends = [
          base bytestring containers errors http-client http-client-tls
@@ -31604,7 +31760,7 @@ self: {
          base bytestring containers megaparsec microlens paths rio tasty
          tasty-hunit text versions
        ];
-       description = "A secure package manager for Arch Linux and the AUR, written in Haskell";
+       description = "A secure package manager for Arch Linux and the AUR";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
@@ -32090,6 +32246,43 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "avro_0_4_7_0" = callPackage
+    ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
+     , binary, bytestring, containers, data-binary-ieee754, deepseq
+     , directory, doctest, doctest-discover, extra, fail, gauge
+     , HasBigDecimal, hashable, hspec, hspec-discover, lens, lens-aeson
+     , mtl, QuickCheck, random, raw-strings-qq, scientific, semigroups
+     , tagged, template-haskell, text, tf-random, time, transformers
+     , unordered-containers, uuid, vector, zlib
+     }:
+     mkDerivation {
+       pname = "avro";
+       version = "0.4.7.0";
+       sha256 = "14s2d2slnk5d1mjava003a61gn5cczx5m7wg4h48nzh8w70y1a9q";
+       libraryHaskellDepends = [
+         aeson array base base16-bytestring bifunctors binary bytestring
+         containers data-binary-ieee754 deepseq fail HasBigDecimal hashable
+         mtl scientific semigroups tagged template-haskell text tf-random
+         time unordered-containers uuid vector zlib
+       ];
+       testHaskellDepends = [
+         aeson array base base16-bytestring bifunctors binary bytestring
+         containers directory doctest doctest-discover extra fail
+         HasBigDecimal hashable hspec lens lens-aeson mtl QuickCheck
+         raw-strings-qq scientific semigroups tagged template-haskell text
+         tf-random time transformers unordered-containers uuid vector zlib
+       ];
+       testToolDepends = [ doctest-discover hspec-discover ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring containers gauge hashable mtl random
+         raw-strings-qq template-haskell text transformers
+         unordered-containers vector
+       ];
+       description = "Avro serialization support for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "avro-piper" = callPackage
     ({ mkDerivation, aeson, avro, base, bytestring, conduit
      , conduit-combinators, conduit-extra, hedgehog, hspec
@@ -40357,8 +40550,8 @@ self: {
     ({ mkDerivation, base, directory, process }:
      mkDerivation {
        pname = "brainfuck-monad";
-       version = "0.5.1";
-       sha256 = "1y0dz80q2rniz23b0m2dircyl244id9888pblaqj8d4zcapsnsww";
+       version = "0.5.2";
+       sha256 = "1c1xg56dh0qbiy7jga436pmp8x8rhkkpf3gb54kqg8asajswdh0s";
        libraryHaskellDepends = [ base directory process ];
        description = "BrainFuck monad";
        license = stdenv.lib.licenses.bsd3;
@@ -43037,8 +43230,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-debian";
-       version = "5.0";
-       sha256 = "1brbn45zg8ki54xl429qlzhzn30mgy7i1sidq1imd54c0rnai46v";
+       version = "5.0.2";
+       sha256 = "0586sjda7ar8p243m92csz3d35smpzlxvyh09rl4fllgzhazxn5f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -43562,15 +43755,15 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "cabal-rpm_2_0_2" = callPackage
+  "cabal-rpm_2_0_3" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath
      , http-client, http-client-tls, http-conduit, optparse-applicative
      , process, simple-cabal, simple-cmd, simple-cmd-args, time, unix
      }:
      mkDerivation {
        pname = "cabal-rpm";
-       version = "2.0.2";
-       sha256 = "1cnnibn10sv39ilsy222rr9q5pl56jshnpjp80pih4fzvq8myjbw";
+       version = "2.0.3";
+       sha256 = "1a9j5gsqp6w89yi7m0djzx3xzvr39sawlx06bq3wljs0r6g99bzb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -44093,29 +44286,29 @@ self: {
     ({ mkDerivation, async, base, base64-bytestring, boost, bytestring
      , cachix-api, conduit, conduit-extra, containers, cookie
      , cryptonite, dhall, directory, ed25519, filepath, fsnotify, here
-     , hnix-store-core, hspec, hspec-discover, http-client
-     , http-client-tls, http-conduit, http-types, inline-c, inline-c-cpp
-     , lzma-conduit, megaparsec, memory, mmorph, netrc, nix
-     , optparse-applicative, process, protolude, resourcet, retry
-     , safe-exceptions, servant, servant-auth, servant-auth-client
-     , servant-client, servant-client-core, servant-conduit, temporary
-     , text, unix, uri-bytestring, versions
+     , hspec, hspec-discover, http-client, http-client-tls, http-conduit
+     , http-types, inline-c, inline-c-cpp, lzma-conduit, megaparsec
+     , memory, mmorph, netrc, nix, optparse-applicative, process
+     , protolude, resourcet, retry, safe-exceptions, servant
+     , servant-auth, servant-auth-client, servant-client
+     , servant-client-core, servant-conduit, temporary, text, unix
+     , uri-bytestring, vector, versions
      }:
      mkDerivation {
        pname = "cachix";
-       version = "0.3.5";
-       sha256 = "1f67bchd5cnb777iz13xc6r7r9aw4r6pz6fdi5nnwjpsia3k42mc";
+       version = "0.3.6";
+       sha256 = "14iz8ihzrcq075zk6cz8dmp2c9ygsfvi0ksa0969k8746hgwwxf9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          async base base64-bytestring bytestring cachix-api conduit
          conduit-extra containers cookie cryptonite dhall directory ed25519
-         filepath fsnotify here hnix-store-core http-client http-client-tls
-         http-conduit http-types inline-c inline-c-cpp lzma-conduit
-         megaparsec memory mmorph netrc optparse-applicative process
-         protolude resourcet retry safe-exceptions servant servant-auth
-         servant-auth-client servant-client servant-client-core
-         servant-conduit text unix uri-bytestring versions
+         filepath fsnotify here http-client http-client-tls http-conduit
+         http-types inline-c inline-c-cpp lzma-conduit megaparsec memory
+         mmorph netrc optparse-applicative process protolude resourcet retry
+         safe-exceptions servant servant-auth servant-auth-client
+         servant-client servant-client-core servant-conduit text unix
+         uri-bytestring vector versions
        ];
        librarySystemDepends = [ boost ];
        libraryPkgconfigDepends = [ nix ];
@@ -45962,8 +46155,8 @@ self: {
        pname = "category-traced";
        version = "0.1.0.1";
        sha256 = "00c70xvjprq0laipa47ypd3dq8a2818b4k3sgamisgy40a7vgp10";
-       revision = "1";
-       editedCabalFile = "0b76pssnh3l4jwasyy02rqnkvy2pask90yvp9by30yk1mfz07mhg";
+       revision = "2";
+       editedCabalFile = "0c4bb2wa3yd1blnji9i1bpx883y2q7aklqckyr5n8c5bzwwyb9ql";
        libraryHaskellDepends = [ base categories ];
        description = "Traced monoidal categories";
        license = stdenv.lib.licenses.bsd3;
@@ -46068,6 +46261,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cayley-client_0_4_12" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
+     , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
+     , mtl, text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "cayley-client";
+       version = "0.4.12";
+       sha256 = "1syx1qlgp7jw1f2334jc5y2bxph5xqpnsamd3dp1qa9zvxk9bxzd";
+       libraryHaskellDepends = [
+         aeson attoparsec base binary bytestring exceptions http-client
+         http-conduit lens lens-aeson mtl text transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [ aeson base hspec unordered-containers ];
+       description = "A Haskell client for the Cayley graph database";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cayley-dickson" = callPackage
     ({ mkDerivation, base, random }:
      mkDerivation {
@@ -52087,10 +52300,8 @@ self: {
      }:
      mkDerivation {
        pname = "comonad-extras";
-       version = "4.0";
-       sha256 = "0irlx6rbp0cq5njxssm5a21mv7v5yccchfpn7h9hzr9fgyaxsr62";
-       revision = "1";
-       editedCabalFile = "1bmhdmncfbv80qgmykn67f4jkwbgags4ypaqibnzz849hpmibfj1";
+       version = "4.0.1";
+       sha256 = "1vsxxgqsiizprm2xxjks1n77mlx5rb9ybx36ag49fkzyb01rbb34";
        libraryHaskellDepends = [
          array base comonad containers distributive semigroupoids
          transformers
@@ -53208,6 +53419,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "concurrency_1_9_0_0" = callPackage
+    ({ mkDerivation, array, atomic-primops, base, exceptions
+     , monad-control, mtl, stm, transformers
+     }:
+     mkDerivation {
+       pname = "concurrency";
+       version = "1.9.0.0";
+       sha256 = "1bmj1g9dnjj6390ky1xkddb1azff1ibphaiyyy2dix351m9dhc3s";
+       libraryHaskellDepends = [
+         array atomic-primops base exceptions monad-control mtl stm
+         transformers
+       ];
+       description = "Typeclasses, functions, and data types for concurrency and STM";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "concurrency-benchmarks" = callPackage
     ({ mkDerivation, async, base, bench-graph, bytestring, Chart
      , Chart-diagrams, csv, deepseq, directory, gauge, getopt-generics
@@ -56782,6 +57010,21 @@ self: {
        license = "LGPL";
      }) {};
 
+  "cpphs_1_20_9" = callPackage
+    ({ mkDerivation, base, directory, polyparse, time }:
+     mkDerivation {
+       pname = "cpphs";
+       version = "1.20.9";
+       sha256 = "07qb1k9iq76a3l0506s08mw3a16i7qvp0hrmn7wxvwj3f6pg53cp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory polyparse time ];
+       executableHaskellDepends = [ base directory polyparse time ];
+       description = "A liberalised re-implementation of cpp, the C pre-processor";
+       license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cprng-aes" = callPackage
     ({ mkDerivation, base, byteable, bytestring, cipher-aes, criterion
      , crypto-random, mtl
@@ -63791,6 +64034,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "dejafu_2_1_0_2" = callPackage
+    ({ mkDerivation, base, concurrency, containers, contravariant
+     , deepseq, exceptions, leancheck, profunctors, random, transformers
+     }:
+     mkDerivation {
+       pname = "dejafu";
+       version = "2.1.0.2";
+       sha256 = "06i0rxnx3106r8i8i0m399chn2n5k59c55k85b21p223dyh5zbai";
+       libraryHaskellDepends = [
+         base concurrency containers contravariant deepseq exceptions
+         leancheck profunctors random transformers
+       ];
+       description = "A library for unit-testing concurrent programs";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "deka" = callPackage
     ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }:
      mkDerivation {
@@ -64437,6 +64697,18 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "deriving-aeson" = callPackage
+    ({ mkDerivation, aeson, base, bytestring }:
+     mkDerivation {
+       pname = "deriving-aeson";
+       version = "0.1.1";
+       sha256 = "1l1j76wfv2cc0drnbw254plya97n6yvnz6vzcllgip2i64yqyx21";
+       libraryHaskellDepends = [ aeson base ];
+       testHaskellDepends = [ aeson base bytestring ];
+       description = "Type driven generic aeson instance customisation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "deriving-compat" = callPackage
     ({ mkDerivation, base, base-compat, base-orphans, containers
      , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged
@@ -64986,8 +65258,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-fly";
-       version = "0.2.2";
-       sha256 = "1pp5lzg8nv1j0y9mrjb4zd9immd7i14ri0x2rgp7zjs86ygcmlf7";
+       version = "0.2.4";
+       sha256 = "0bx8il9cq4ma2n2wl5xxzngl26621zgpj54lk884nqwk6glg124m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -66836,10 +67108,8 @@ self: {
      }:
      mkDerivation {
        pname = "direct-sqlite";
-       version = "2.3.24";
-       sha256 = "0xd6wcmshzadwqjgd9ddcfi76p0v2c18h49spl076h285kp3plj1";
-       revision = "1";
-       editedCabalFile = "0cfl7h43q2qib1qq8sipgcxcm3i9d6cp1diwmxv8n7ygx7awz6w6";
+       version = "2.3.26";
+       sha256 = "1z7rwaqhxl9hagbcndg3dkqysr5n2bcz2jrrvdl9pdi905x2663y";
        libraryHaskellDepends = [ base bytestring semigroups text ];
        testHaskellDepends = [
          base base16-bytestring bytestring directory HUnit temporary text
@@ -71937,6 +72207,69 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "egison-pattern-src" = callPackage
+    ({ mkDerivation, base, containers, free, megaparsec, mtl
+     , parser-combinators, prettyprinter, recursion-schemes, tasty
+     , tasty-discover, tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "egison-pattern-src";
+       version = "0.1.1.0";
+       sha256 = "15w0vnph6ba2b1mvlr53qymmdxs6063k77508frybsgb44pq9ns1";
+       libraryHaskellDepends = [
+         base containers free megaparsec mtl parser-combinators
+         prettyprinter recursion-schemes text
+       ];
+       testHaskellDepends = [
+         base megaparsec mtl tasty tasty-hunit text
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "Manipulating Egison patterns: abstract syntax, parser, and pretty-printer";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "egison-pattern-src-haskell-mode" = callPackage
+    ({ mkDerivation, base, egison-pattern-src, haskell-src-exts, mtl
+     , tasty, tasty-discover, tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "egison-pattern-src-haskell-mode";
+       version = "0.1.1.0";
+       sha256 = "0zrrr1qbcqz4gypx75q3s4w6i4ifbx82agsli3s2rd2z05lqc4l6";
+       libraryHaskellDepends = [
+         base egison-pattern-src haskell-src-exts mtl text
+       ];
+       testHaskellDepends = [
+         base egison-pattern-src haskell-src-exts mtl tasty tasty-hunit text
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "Parser and pretty printer for Egison pattern expressions in Haskell source code";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "egison-pattern-src-th-mode" = callPackage
+    ({ mkDerivation, base, egison-pattern-src
+     , egison-pattern-src-haskell-mode, haskell-src-exts
+     , haskell-src-meta, mtl, pretty, tasty, tasty-discover, tasty-hunit
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "egison-pattern-src-th-mode";
+       version = "0.1.1.0";
+       sha256 = "1xdl9r04nmq46chhcqcbz549431zklkzx81agds765j1s7qqpp24";
+       libraryHaskellDepends = [
+         base egison-pattern-src egison-pattern-src-haskell-mode
+         haskell-src-exts haskell-src-meta mtl pretty template-haskell text
+       ];
+       testHaskellDepends = [
+         base egison-pattern-src haskell-src-exts mtl tasty tasty-hunit
+         template-haskell text
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "Parser and pretty printer for Egison pattern expressions to use with TH";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "egison-quote" = callPackage
     ({ mkDerivation, base, egison, mtl, parsec, template-haskell }:
      mkDerivation {
@@ -79766,6 +80099,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "filepattern_0_1_2" = callPackage
+    ({ mkDerivation, base, directory, extra, filepath, QuickCheck }:
+     mkDerivation {
+       pname = "filepattern";
+       version = "0.1.2";
+       sha256 = "0nznzji5haxl4ninm2a79dqf4c7fj6pc3z9gdc6wbf5h1pp14afr";
+       libraryHaskellDepends = [ base directory extra filepath ];
+       testHaskellDepends = [ base directory extra filepath QuickCheck ];
+       description = "File path glob-like matching";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fileplow" = callPackage
     ({ mkDerivation, base, binary-search, bytestring, hspec, mtl
      , QuickCheck, temporary, vector
@@ -80435,8 +80781,8 @@ self: {
        pname = "fix-parser-simple";
        version = "15320.3";
        sha256 = "0ls5fxwq2lnb0rjqih4isfwiv0603ga12gxnf7w3rpqp5qhrhas8";
-       revision = "1";
-       editedCabalFile = "0lvbym1xdwzkhvxa2qnjfqr159zysnmg8zmkz410hh6cmrb5qgr9";
+       revision = "2";
+       editedCabalFile = "0sbjc3v2qvi8hwf743xdzclgymcrnvyigm0rpvxi1ha46ip9fzkb";
        libraryHaskellDepends = [ base mmtl ];
        description = "Simple fix-expression parser";
        license = "LGPL";
@@ -81547,8 +81893,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.8.0.2";
-       sha256 = "07q7xb7h48by6gj284fczszay4gg1r0j2nr7fmffj72nkjgzzyhx";
+       version = "0.8.0.3";
+       sha256 = "19y9ill3zgcip8ys3i6mppaj6qzi7pgzd1q7n5r58l0wljnq8vv6";
        configureFlags = [ "-fopengl" ];
        isLibrary = true;
        isExecutable = true;
@@ -81629,8 +81975,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs-themes";
-       version = "0.2.0.2";
-       sha256 = "07f21cr07kfzzrsk6j63livwjbi0ci43i5czbplj3wsy58sq8pn7";
+       version = "0.2.0.3";
+       sha256 = "0kxc03lbms0chhm33wxdqjxdabhdn0crfc1raa5pr07gkm60skb1";
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
@@ -86580,15 +86926,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "generic-data_0_8_0_0" = callPackage
+  "generic-data_0_8_1_0" = callPackage
     ({ mkDerivation, base, base-orphans, contravariant, criterion
      , deepseq, doctest, generic-lens, Glob, one-liner, QuickCheck
      , show-combinators, tasty, tasty-hunit
      }:
      mkDerivation {
        pname = "generic-data";
-       version = "0.8.0.0";
-       sha256 = "096n5hc98kqyc4v2vz3g4zmhiw7xf1ax0a7qs9kvh2vk3f3sf190";
+       version = "0.8.1.0";
+       sha256 = "0hrrqxvax365yg3y7pv6k6v9x86a7hj3b85kmzky2q6f7vvqfkfb";
        libraryHaskellDepends = [
          base base-orphans contravariant show-combinators
        ];
@@ -88099,6 +88445,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ghc-api-compat" = callPackage
+    ({ mkDerivation, ghc }:
+     mkDerivation {
+       pname = "ghc-api-compat";
+       version = "8.6";
+       sha256 = "1pxnb5qrf9fz7ghy68xvpdc44fh2kz3f9i5cn66ch7k0ah8j2w3s";
+       libraryHaskellDepends = [ ghc ];
+       doHaddock = false;
+       description = "GHC-API compatibility helpers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ghc-boot_8_8_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, directory, filepath
      , ghc-boot-th
@@ -88514,6 +88872,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-lib_8_8_3_20200224" = callPackage
+    ({ mkDerivation, alex, array, base, binary, bytestring, containers
+     , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy
+     , hpc, pretty, process, time, transformers, unix
+     }:
+     mkDerivation {
+       pname = "ghc-lib";
+       version = "8.8.3.20200224";
+       sha256 = "0qwv8i4x4ylixrbipxkii0zxz3j33cpahlckbn6chpp9b59bfdpa";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array base binary bytestring containers deepseq directory filepath
+         ghc-lib-parser ghc-prim hpc pretty process time transformers unix
+       ];
+       libraryToolDepends = [ alex happy ];
+       description = "The GHC API, decoupled from GHC versions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-lib-parser" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
      , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty
@@ -88533,6 +88911,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-lib-parser_8_8_3_20200224" = callPackage
+    ({ mkDerivation, alex, array, base, binary, bytestring, containers
+     , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty
+     , process, time, transformers, unix
+     }:
+     mkDerivation {
+       pname = "ghc-lib-parser";
+       version = "8.8.3.20200224";
+       sha256 = "0hdn3sd4l1ph26f715i6mlqw6l6w8nnfp9jmlcwrjph14rpn1y15";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array base binary bytestring containers deepseq directory filepath
+         ghc-prim hpc pretty process time transformers unix
+       ];
+       libraryToolDepends = [ alex happy ];
+       description = "The GHC API, decoupled from GHC versions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-lib-parser-ex" = callPackage
     ({ mkDerivation, base, bytestring, directory, extra, filepath, ghc
      , ghc-boot, ghc-boot-th, tasty, tasty-hunit, uniplate
@@ -88551,19 +88949,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ghc-lib-parser-ex_8_8_5_2" = callPackage
+  "ghc-lib-parser-ex_8_8_5_3" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, extra
      , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit
      , uniplate
      }:
      mkDerivation {
        pname = "ghc-lib-parser-ex";
-       version = "8.8.5.2";
-       sha256 = "0jydlqb2nymrqvyn798vb8k4ak49m0qnnv725mzwlnn77krvnlka";
-       revision = "1";
-       editedCabalFile = "010wpn9ivczixfg2cj4n4f8924jaw6y4j6fd9z8bih7f53wyldnr";
+       version = "8.8.5.3";
+       sha256 = "0svjfrsq7r1hvpjp0bk4jqq9z6gm441hsv5zb1yljw9p9b20kbk6";
        libraryHaskellDepends = [
-         base bytestring containers ghc ghc-boot ghc-boot-th uniplate
+         base bytestring containers extra ghc ghc-boot ghc-boot-th uniplate
        ];
        testHaskellDepends = [
          base directory extra filepath ghc ghc-boot-th tasty tasty-hunit
@@ -88959,8 +89355,8 @@ self: {
        pname = "ghc-syntax-highlighter";
        version = "0.0.5.0";
        sha256 = "09h911wqja56b9j9dwjqv7dlim9rm50vra1bkp8zhnlw9fa2s127";
-       revision = "2";
-       editedCabalFile = "1l95cyk6cb2bwpy4whm3kgrm7jv3kbygsssip8jj9f683lrm5gf1";
+       revision = "3";
+       editedCabalFile = "0m41chf24mn78wxp1is38yg6nhkggwjw4r1avzfr2cvmcl0xz0xb";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ghc-lib-parser text ];
        testHaskellDepends = [ base hspec text ];
@@ -90987,8 +91383,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "7.20200219";
-       sha256 = "0pzwjh98jpirgssbd7pqfk7mzraibrk277dn34s2mrah8zy75b58";
+       version = "8.20200226";
+       sha256 = "09v80ni1w9z1im79lzrnpz7xlivwna44zqpwq4axwyd17cffqi9m";
        configureFlags = [
          "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
          "-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser"
@@ -91697,8 +92093,8 @@ self: {
      }:
      mkDerivation {
        pname = "github-webhooks";
-       version = "0.11.0";
-       sha256 = "1x9vwx7k8xyblfxqny7almqlzzncnm315x6dq6y2bzsl9sxwvnkg";
+       version = "0.12.0";
+       sha256 = "0p029a2pl77arldqllr84gnizhi3fib2mxf4cfggvykhdcrc856h";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring cryptonite deepseq
          deepseq-generics memory text time vector
@@ -96107,6 +96503,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "gothic_0_1_4" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, connection
+     , exceptions, hashable, http-client, http-client-tls, http-conduit
+     , http-types, lens, lens-aeson, scientific, text, unix
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "gothic";
+       version = "0.1.4";
+       sha256 = "0j574gqxx1n7980pn8644al6pci1gkgwdgwwa98m3r94xlawlsv4";
+       libraryHaskellDepends = [
+         aeson base binary bytestring connection exceptions hashable
+         http-client http-client-tls http-conduit http-types lens lens-aeson
+         scientific text unix unordered-containers vector
+       ];
+       description = "A Haskell Vault KVv2 secret engine client";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gotta-go-fast" = callPackage
     ({ mkDerivation, base, brick, cmdargs, directory, random, text
      , time, vty, word-wrap
@@ -99023,8 +99439,8 @@ self: {
      }:
      mkDerivation {
        pname = "hOpenPGP";
-       version = "2.9.3";
-       sha256 = "17ys0s8mgm32s882l11hj0vbxva28aawf0m64wj1fvd7h2vicq77";
+       version = "2.9.4";
+       sha256 = "15895a6vqaz69za63hxkbn01sji91hlsqiyg3lbzwi1qfvl3b98b";
        libraryHaskellDepends = [
          aeson asn1-encoding attoparsec base base16-bytestring bifunctors
          binary binary-conduit bytestring bz2 conduit conduit-extra
@@ -100797,9 +101213,9 @@ self: {
 
   "hakyll" = callPackage
     ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
-     , containers, cryptohash, data-default, deepseq, directory
+     , containers, cryptonite, data-default, deepseq, directory
      , file-embed, filepath, fsnotify, http-conduit, http-types
-     , lrucache, mtl, network-uri, optparse-applicative, pandoc
+     , lrucache, memory, mtl, network-uri, optparse-applicative, pandoc
      , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa
      , resourcet, scientific, tagsoup, tasty, tasty-hunit
      , tasty-quickcheck, template-haskell, text, time
@@ -100808,15 +101224,15 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll";
-       version = "4.13.0.1";
-       sha256 = "0728947np74z8dn1p55bqsv1bgx0ipaiajankwnnmp5mk0lkixd6";
+       version = "4.13.1.0";
+       sha256 = "14l85n69zsczyw2fs8kjnnmkl4gk85xj3f4alfa7604nnmic9mvn";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary blaze-html blaze-markup bytestring containers
-         cryptohash data-default deepseq directory file-embed filepath
-         fsnotify http-conduit http-types lrucache mtl network-uri
+         cryptonite data-default deepseq directory file-embed filepath
+         fsnotify http-conduit http-types lrucache memory mtl network-uri
          optparse-applicative pandoc pandoc-citeproc parsec process random
          regex-tdfa resourcet scientific tagsoup template-haskell text time
          time-locale-compat unordered-containers vector wai wai-app-static
@@ -104282,27 +104698,26 @@ self: {
      }) {};
 
   "haskell-igraph" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, cereal, colour, conduit
-     , containers, data-ordlist, hxt, igraph, matrices, primitive
-     , random, singletons, split, tasty, tasty-golden, tasty-hunit
+    ({ mkDerivation, base, bytestring, c2hs, cereal, conduit
+     , containers, data-ordlist, matrices, primitive, random, singletons
+     , tasty, tasty-golden, tasty-hunit
      }:
      mkDerivation {
        pname = "haskell-igraph";
-       version = "0.7.1";
-       sha256 = "16sx8sx3dky6zlwhnf3fyrkcqzwrnf94hd1wfj087bgb36hxsavp";
+       version = "0.8.0";
+       sha256 = "0lwpliym0rldf4pqi17a9gm0dxlxd8jf4r12lcyp78mhdxfgdzcc";
        libraryHaskellDepends = [
-         base bytestring cereal colour conduit containers data-ordlist hxt
-         primitive singletons split
+         base bytestring cereal conduit containers data-ordlist primitive
+         singletons
        ];
-       librarySystemDepends = [ igraph ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [
          base cereal conduit data-ordlist matrices random tasty tasty-golden
          tasty-hunit
        ];
-       description = "Haskell interface of the igraph library";
+       description = "Bindings to the igraph C library (v0.8.0).";
        license = stdenv.lib.licenses.mit;
-     }) {inherit (pkgs) igraph;};
+     }) {};
 
   "haskell-import-graph" = callPackage
     ({ mkDerivation, base, classy-prelude, ghc, graphviz, process, text
@@ -106364,38 +106779,39 @@ self: {
 
   "haskoin-store" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cereal, conduit
-     , containers, data-default, filepath, hashable, haskoin-core
-     , haskoin-node, hspec, hspec-discover, http-types, monad-logger
-     , mtl, network, nqe, optparse-applicative, random, resourcet
-     , rocksdb-haskell, rocksdb-query, scotty, string-conversions, text
-     , time, transformers, unliftio, unordered-containers, wai, warp
+     , containers, data-default, deepseq, filepath, hashable
+     , haskoin-core, haskoin-node, hspec, hspec-discover, http-types
+     , monad-logger, mtl, network, nqe, optparse-applicative, QuickCheck
+     , random, resourcet, rocksdb-haskell, rocksdb-query, scotty
+     , string-conversions, text, time, transformers, unliftio
+     , unordered-containers, wai, warp
      }:
      mkDerivation {
        pname = "haskoin-store";
-       version = "0.19.5";
-       sha256 = "1pxplfipl4n6vq8s8al0acfrxnbpf8yhya6hpfymszfbvcyqkhl8";
+       version = "0.20.0";
+       sha256 = "1ljm662q0p3csq1f6xxyas6snv8bcr8vpl1m5n94nmjhb44qn44h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring cereal conduit containers data-default
-         hashable haskoin-core haskoin-node http-types monad-logger mtl
-         network nqe random resourcet rocksdb-haskell rocksdb-query scotty
-         string-conversions text time transformers unliftio
-         unordered-containers wai warp
+         deepseq hashable haskoin-core haskoin-node http-types monad-logger
+         mtl network nqe QuickCheck random resourcet rocksdb-haskell
+         rocksdb-query scotty string-conversions text time transformers
+         unliftio unordered-containers wai warp
        ];
        executableHaskellDepends = [
          aeson base bytestring cereal conduit containers data-default
-         filepath hashable haskoin-core haskoin-node http-types monad-logger
-         mtl network nqe optparse-applicative random resourcet
-         rocksdb-haskell rocksdb-query scotty string-conversions text time
-         transformers unliftio unordered-containers wai warp
+         deepseq filepath hashable haskoin-core haskoin-node http-types
+         monad-logger mtl network nqe optparse-applicative QuickCheck random
+         resourcet rocksdb-haskell rocksdb-query scotty string-conversions
+         text time transformers unliftio unordered-containers wai warp
        ];
        testHaskellDepends = [
          aeson base bytestring cereal conduit containers data-default
-         hashable haskoin-core haskoin-node hspec http-types monad-logger
-         mtl network nqe random resourcet rocksdb-haskell rocksdb-query
-         scotty string-conversions text time transformers unliftio
-         unordered-containers wai warp
+         deepseq hashable haskoin-core haskoin-node hspec http-types
+         monad-logger mtl network nqe QuickCheck random resourcet
+         rocksdb-haskell rocksdb-query scotty string-conversions text time
+         transformers unliftio unordered-containers wai warp
        ];
        testToolDepends = [ hspec-discover ];
        description = "Storage and index for Bitcoin and Bitcoin Cash";
@@ -109103,8 +109519,8 @@ self: {
      }:
      mkDerivation {
        pname = "headroom";
-       version = "0.1.0.0";
-       sha256 = "10xfyd2gqsaaa0hqai1n8a98k6mwhn5mrqqibqs3cgsl4pw8rhdr";
+       version = "0.1.1.0";
+       sha256 = "1ddxc5ldgkg7kw8qnj0m9gf9hx2gazidrx6ldac14yqlc4qfm2qb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109529,6 +109945,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hedgehog-gen" = callPackage
+    ({ mkDerivation, base, bytestring, hedgehog, text, typerep-map }:
+     mkDerivation {
+       pname = "hedgehog-gen";
+       version = "0.1.0.0";
+       sha256 = "07fq3ha96xgka35ag04vzmx7z2c59jnqr9y9bkrdzk5xm47mmlbf";
+       libraryHaskellDepends = [
+         base bytestring hedgehog text typerep-map
+       ];
+       description = "Customizable Gen for ADT using Generics";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hedgehog-gen-json" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, exceptions
      , hedgehog, lens, protolude, regex-genex, regex-pcre, scientific
@@ -113835,8 +114264,8 @@ self: {
     ({ mkDerivation, base, Cabal, directory, hspec, libsass }:
      mkDerivation {
        pname = "hlibsass";
-       version = "0.1.8.0";
-       sha256 = "1ssgvr0jvl79k1vckp5nq2zw6mx8l4xasydymzjwmhg0fl99mpi6";
+       version = "0.1.8.1";
+       sha256 = "050z6i29v410shjsskr26sna491ldg23if1nr0808xp94xgfif16";
        configureFlags = [ "-fexternallibsass" ];
        setupHaskellDepends = [ base Cabal directory ];
        libraryHaskellDepends = [ base ];
@@ -115207,8 +115636,8 @@ self: {
        pname = "hoist-error";
        version = "0.2.1.0";
        sha256 = "028lczd80nhj3yj5dq9qixzdzkyisl34qpi6bb28r8b9nj2i2nss";
-       revision = "2";
-       editedCabalFile = "1wk9a58ychqfabbrh8zdzzd7cfvwgf8xyfi6ynsckh1yb5xa4f7j";
+       revision = "3";
+       editedCabalFile = "1g80simnv15dqlch83mgn6yj8z93g0wpj0y1xz53p4dvafs18zlc";
        libraryHaskellDepends = [ base either mtl ];
        description = "Some convenience facilities for hoisting errors into a monad";
        license = stdenv.lib.licenses.mit;
@@ -115375,28 +115804,27 @@ self: {
      }) {};
 
   "homplexity" = callPackage
-    ({ mkDerivation, base, containers, cpphs, deepseq, directory
-     , filepath, happy, haskell-src-exts, hflags, pqueue
-     , template-haskell, uniplate
+    ({ mkDerivation, base, blaze-html, blaze-markup, bytestring, Cabal
+     , containers, cpphs, deepseq, directory, filepath, githash
+     , haskell-src-exts, hflags, hspec, template-haskell, uniplate
      }:
      mkDerivation {
        pname = "homplexity";
-       version = "0.4.4.4";
-       sha256 = "14kzfaldbycwz8hwrmb4ig2nba9pxh808qqvl2djmsxqpcjq593k";
+       version = "0.4.6.0";
+       sha256 = "1rdb842kzipb7fbkbpcyndi53933yni2s79lfr8br0b7q1ib33j0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers cpphs deepseq directory filepath haskell-src-exts
-         hflags pqueue template-haskell uniplate
+         base blaze-html blaze-markup bytestring Cabal containers cpphs
+         deepseq directory filepath haskell-src-exts hflags template-haskell
+         uniplate
        ];
-       libraryToolDepends = [ happy ];
        executableHaskellDepends = [
-         base containers cpphs deepseq directory filepath haskell-src-exts
-         hflags template-haskell uniplate
+         base blaze-html bytestring containers cpphs deepseq directory
+         filepath githash haskell-src-exts hflags template-haskell uniplate
        ];
        testHaskellDepends = [
-         base containers cpphs deepseq directory filepath haskell-src-exts
-         hflags pqueue template-haskell uniplate
+         base filepath haskell-src-exts hspec template-haskell
        ];
        description = "Haskell code quality tool";
        license = stdenv.lib.licenses.bsd3;
@@ -116977,8 +117405,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpp";
-       version = "0.6.1";
-       sha256 = "1gv2gndbyrppl8qan680kl9kmwv6b5a5j5yrwifzh8rj73s47a6i";
+       version = "0.6.2";
+       sha256 = "0k8rc2hnan346i3ykam8ps89n56vgcw91d9k1450klyi3l50b5xv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -122587,8 +123015,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client-restricted";
-       version = "0.0.1";
-       sha256 = "0n4rmi30hlppgfz1vfqmcnqxrk1qfg2f05chdvniiq7l94id0kcw";
+       version = "0.0.2";
+       sha256 = "0i9x74r2lnwfbggd3dyccsivlrprglr3i21hc6a9vh868fbhmahn";
        libraryHaskellDepends = [
          base connection data-default http-client http-client-tls network
          utf8-string
@@ -124967,6 +125395,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-prim_0_6_2_40" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, deepseq, directory
+     , doctest, doctest-discover, exceptions, ghc-prim, hedgehog, hspec
+     , hspec-discover, hw-hspec-hedgehog, mmap, QuickCheck, semigroups
+     , transformers, unliftio-core, vector
+     }:
+     mkDerivation {
+       pname = "hw-prim";
+       version = "0.6.2.40";
+       sha256 = "0vm5mcnlb5yas2z7rvzd1kzv39d3qw4bkrkfmv0i7vsdg33yb3fd";
+       libraryHaskellDepends = [
+         base bytestring deepseq ghc-prim mmap semigroups transformers
+         unliftio-core vector
+       ];
+       testHaskellDepends = [
+         base bytestring directory doctest doctest-discover exceptions
+         hedgehog hspec hw-hspec-hedgehog mmap QuickCheck semigroups
+         transformers vector
+       ];
+       testToolDepends = [ doctest-discover hspec-discover ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion mmap semigroups transformers vector
+       ];
+       description = "Primitive functions and data types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-prim-bits" = callPackage
     ({ mkDerivation, base, criterion, hedgehog, hspec, hw-hedgehog
      , hw-hspec-hedgehog, QuickCheck, vector
@@ -128981,23 +129437,26 @@ self: {
      }) {};
 
   "inline-asm" = callPackage
-    ({ mkDerivation, base, ghc-prim, hspec, QuickCheck
-     , template-haskell, uniplate
+    ({ mkDerivation, base, bytestring, containers, either, ghc-prim
+     , hspec, megaparsec, mtl, QuickCheck, template-haskell, uniplate
      }:
      mkDerivation {
        pname = "inline-asm";
-       version = "0.1.1.0";
-       sha256 = "074kf9mjcm7rjcba2g25brxkvzy1psphbkwfiqc2mpznam0f2n27";
+       version = "0.3.1.0";
+       sha256 = "1yd5sij6k61z4d6p51c2zsxfn9kn613fzlmqqmgxjvcw5il7mcdn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base ghc-prim template-haskell uniplate
+         base bytestring containers either ghc-prim megaparsec mtl
+         template-haskell uniplate
        ];
        executableHaskellDepends = [
-         base ghc-prim template-haskell uniplate
+         base bytestring containers either ghc-prim megaparsec mtl
+         template-haskell uniplate
        ];
        testHaskellDepends = [
-         base ghc-prim hspec QuickCheck template-haskell uniplate
+         base bytestring containers either ghc-prim hspec megaparsec mtl
+         QuickCheck template-haskell uniplate
        ];
        description = "Inline some Assembly in ur Haskell!";
        license = stdenv.lib.licenses.bsd3;
@@ -138039,6 +138498,25 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "language-avro_0_1_1_0" = callPackage
+    ({ mkDerivation, avro, base, containers, directory, filepath, hspec
+     , hspec-megaparsec, megaparsec, text, vector
+     }:
+     mkDerivation {
+       pname = "language-avro";
+       version = "0.1.1.0";
+       sha256 = "1q5qzas4j2swyripsjx9zf716kgwn3imricvz0jplwsgzm6cfy2k";
+       libraryHaskellDepends = [
+         avro base containers directory filepath megaparsec text vector
+       ];
+       testHaskellDepends = [
+         avro base hspec hspec-megaparsec megaparsec text vector
+       ];
+       description = "Language definition and parser for AVRO files";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-bash" = callPackage
     ({ mkDerivation, base, directory, filepath, parsec, prettyprinter
      , process, QuickCheck, tasty, tasty-expected-failure, tasty-golden
@@ -139479,6 +139957,38 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "launchdarkly-server-sdk" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
+     , bytestring, bytestring-conversion, clock, containers, cryptohash
+     , exceptions, extra, generic-lens, hashtables, hedis, http-client
+     , http-client-tls, http-types, HUnit, iso8601-time, lens, lrucache
+     , monad-logger, mtl, pcre-light, random, retry, scientific, semver
+     , text, time, unordered-containers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "launchdarkly-server-sdk";
+       version = "1.0.0";
+       sha256 = "1b9561g4pwprixdzs4k2j0776whxjm2w9cfhi45p5zkjb8hv2jhn";
+       libraryHaskellDepends = [
+         aeson attoparsec base base16-bytestring bytestring
+         bytestring-conversion clock containers cryptohash exceptions extra
+         generic-lens hashtables hedis http-client http-client-tls
+         http-types iso8601-time lens lrucache monad-logger mtl pcre-light
+         random retry scientific semver text time unordered-containers uuid
+         vector
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base base16-bytestring bytestring
+         bytestring-conversion clock containers cryptohash exceptions extra
+         generic-lens hashtables hedis http-client http-client-tls
+         http-types HUnit iso8601-time lens lrucache monad-logger mtl
+         pcre-light random retry scientific semver text time
+         unordered-containers uuid vector
+       ];
+       description = "Server-side SDK for integrating with LaunchDarkly";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "launchpad-control" = callPackage
     ({ mkDerivation, array, base, containers, hmidi, mtl, transformers
      }:
@@ -140018,6 +140528,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lean-peano" = callPackage
+    ({ mkDerivation, base, base-compat, Cabal, cabal-doctest, deepseq
+     , doctest, hedgehog, QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "lean-peano";
+       version = "0.1.1.0";
+       sha256 = "19b959z6amsr6jfc5fmbks67sqhribplnv7rzxyn0ipzswxgsppb";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [
+         base base-compat deepseq doctest hedgehog QuickCheck
+         template-haskell
+       ];
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "leancheck" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -141286,8 +141813,8 @@ self: {
      }:
      mkDerivation {
        pname = "lhs2tex";
-       version = "1.22";
-       sha256 = "1g9966m4pw5rp7a83839k46jmih64rn6w0xnmjlrl0df9ddkpsky";
+       version = "1.23";
+       sha256 = "1i55ssw6kzmc2ybqczpns3fpsd3043w6w42dni0kq7rkh87s1xc6";
        isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [
@@ -144761,8 +145288,8 @@ self: {
     ({ mkDerivation, base, c2hs, Cabal }:
      mkDerivation {
        pname = "load-font";
-       version = "0.1.0.2";
-       sha256 = "06vzgyi8r1fhlc1ykdfynll7y4a0wwvjq9x0xg08csr4ypfgj6m3";
+       version = "0.1.0.3";
+       sha256 = "1qndsbbm4fwzgkjp2y413blassyj0hxdbd99a4bpwxah95s951gw";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -146021,6 +146548,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lorentz" = callPackage
+    ({ mkDerivation, base-noprelude, bimap, bytestring, constraints
+     , containers, data-default, first-class-families, fmt, formatting
+     , ghc-prim, hspec, HUnit, interpolate, lens, morley, morley-prelude
+     , named, optparse-applicative, pretty-terminal, QuickCheck
+     , singletons, spoon, tasty, tasty-discover, tasty-hunit-compat
+     , tasty-quickcheck, template-haskell, text, type-spec
+     , unordered-containers, vinyl
+     }:
+     mkDerivation {
+       pname = "lorentz";
+       version = "0.1.0";
+       sha256 = "065y6sx7pafhk1b15hs5hcm3sd69ma2qwklxbhj0xdxdgx5g8z1v";
+       libraryHaskellDepends = [
+         base-noprelude bimap bytestring constraints containers data-default
+         first-class-families fmt formatting ghc-prim hspec HUnit
+         interpolate lens morley morley-prelude named optparse-applicative
+         pretty-terminal QuickCheck singletons tasty template-haskell text
+         unordered-containers vinyl
+       ];
+       testHaskellDepends = [
+         base-noprelude bimap bytestring constraints containers data-default
+         first-class-families fmt formatting HUnit morley morley-prelude
+         QuickCheck singletons spoon tasty tasty-hunit-compat
+         tasty-quickcheck text type-spec unordered-containers vinyl
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "EDSL for the Michelson Language";
+       license = stdenv.lib.licenses.agpl3Plus;
+     }) {};
+
   "loris" = callPackage
     ({ mkDerivation, base, c2hs, loris, vector }:
      mkDerivation {
@@ -146902,8 +147460,8 @@ self: {
      }:
      mkDerivation {
        pname = "lzlib";
-       version = "1.0.2.1";
-       sha256 = "15vg3gcysssql7r53zmk08v886vp2dh4lg0hdg8rbdjhyv5sjnyc";
+       version = "1.0.3.0";
+       sha256 = "06xdmrqc5p9nx8rqdx1i0hjlrlyanimvrk8rwb6bv04aprz22q8j";
        libraryHaskellDepends = [ base bytestring ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [
@@ -152791,6 +153349,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "miso-from-html" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , pretty-simple, text
+     }:
+     mkDerivation {
+       pname = "miso-from-html";
+       version = "0.1.0.0";
+       sha256 = "1bsa0xy1s9xnjam3arq2ngi6am5a4fzrrp8vlyh0ijniwm174x5k";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         attoparsec base bytestring containers pretty-simple text
+       ];
+       description = "Convert HTML to miso View syntax";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "miss" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring
      , ChasingBottoms, containers, cryptohash-sha1, deepseq, digest
@@ -153198,8 +153773,8 @@ self: {
      }:
      mkDerivation {
        pname = "mmsyn6ukr";
-       version = "0.6.3.0";
-       sha256 = "0q74chfvrqf963lib315mqrvf6s5vx2fpg6zqrjprmr8254qaabm";
+       version = "0.6.3.1";
+       sha256 = "0iyyw02w4mw2g66dqs2ihd5qs4qrs4dcaql7y8gd3gc26mhn7svq";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -153253,8 +153828,8 @@ self: {
     ({ mkDerivation, base, mmsyn6ukr, vector }:
      mkDerivation {
        pname = "mmsyn7s";
-       version = "0.1.1.0";
-       sha256 = "1lm1a9cvayqk6csjisrxqc0xxgzvdh8dvav9hcqvs4wbvvf9bn26";
+       version = "0.5.0.2";
+       sha256 = "1im1axprp3s8ii3gd15rz82az36k3lhyiplsm7pf86ysx9d2f5i0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mmsyn6ukr vector ];
@@ -153269,8 +153844,8 @@ self: {
      }:
      mkDerivation {
        pname = "mmsyn7ukr";
-       version = "0.14.0.1";
-       sha256 = "0hm9b7s0b68mwp00rxbgsgnpd3nk6g992xk8n8dc77sandxk8j7g";
+       version = "0.15.2.0";
+       sha256 = "1yrzlw1ai6w589ql7xnxcazb0yg2ixnk67fakndjn3gvk3h84gbx";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -153321,6 +153896,8 @@ self: {
        pname = "mmtl-base";
        version = "15321.1";
        sha256 = "13hdaxpb9zds3yc2l3pl60h26541yvswprdc43swn05hzf6p01nq";
+       revision = "1";
+       editedCabalFile = "1iby6x0pkqz4447nr5aqpzch2msqb76bdypcprpi5y8djr51x248";
        libraryHaskellDepends = [ base mmtl ];
        description = "MonadBase type-class for mmtl";
        license = stdenv.lib.licenses.bsd3;
@@ -157204,20 +157781,14 @@ self: {
      }) {};
 
   "multi-containers" = callPackage
-    ({ mkDerivation, base, containers, directory, extra, filepath
-     , hspec
-     }:
+    ({ mkDerivation, base, containers, hspec, hspec-discover }:
      mkDerivation {
        pname = "multi-containers";
-       version = "0.1.0.2";
-       sha256 = "1az9drnj6kd6x8r8gycfndqw9mhv0arvi4mkmqcazjg3lr7rxvpa";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.1.1";
+       sha256 = "0spqq8a9lzz7ajwdxsnnvs7q4n4y1g1yb0k16ykldvy3b21bckb6";
        libraryHaskellDepends = [ base containers ];
-       executableHaskellDepends = [
-         base containers directory extra filepath
-       ];
        testHaskellDepends = [ base containers hspec ];
+       testToolDepends = [ hspec-discover ];
        description = "A few multimap variants";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -158985,6 +159556,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "myxine-client" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, dependent-map
+     , dependent-sum, file-embed, hashable, http-client, http-types, req
+     , template-haskell, text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "myxine-client";
+       version = "0.0.0.2";
+       sha256 = "1pfvkdc7pa7x16skdcx355l20qk6574nhkjyzpk9jb7i0wqjqsf8";
+       libraryHaskellDepends = [
+         aeson base bytestring dependent-map dependent-sum file-embed
+         hashable http-client http-types req template-haskell text
+         transformers unordered-containers
+       ];
+       testHaskellDepends = [ bytestring text ];
+       description = "A Haskell client for the Myxine GUI server";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "mzv" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -167614,6 +168204,8 @@ self: {
        pname = "ormolu";
        version = "0.0.3.1";
        sha256 = "0pvnswbxi09fddnn012sha3fbmm30yzlzh2x1asw9ahjk3a3bdlg";
+       revision = "1";
+       editedCabalFile = "1prm2lip6w9fg8gaywdnxqcf2bcikcmnb2gi46nma3dfniipzbnq";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -168361,12 +168953,15 @@ self: {
      }) {};
 
   "paint" = callPackage
-    ({ mkDerivation, base, text }:
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "paint";
-       version = "1.0.0";
-       sha256 = "0ks2nrjy40lfkwzxf0b22qg2zzmjj1pcbrm6vx73i4af2ibr00m4";
-       libraryHaskellDepends = [ base text ];
+       version = "2.0.0";
+       sha256 = "09v6anjid4ph2ipgrblmm1pn4fmswz3g6hilfwbmxs5m1ypziwqh";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
        description = "Colorization of text for command-line output";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -168683,8 +169278,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.3.6.1";
-       sha256 = "1fk06lg9hx5gdmjf4qsgl4p34y676v33l8yc0hyrdx81v8yicp5m";
+       version = "0.3.6.2";
+       sha256 = "055dfbirs3n99crzg9bfnxs96bsfzz6hqjj743dkrvjqmq1qlqc5";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -169078,8 +169673,8 @@ self: {
     ({ mkDerivation }:
      mkDerivation {
        pname = "pandora";
-       version = "0.2.0";
-       sha256 = "0p46z3imh618v7i2734b5nlg9nx3hw4imjchqsx2l7nvkrpkgn64";
+       version = "0.2.1";
+       sha256 = "0v8jpaz5mwg4qx6a4y7i0d8pk70qd4bla07krlxbix9c56mma33l";
        description = "A box of patterns and paradigms";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -170533,8 +171128,8 @@ self: {
      }:
      mkDerivation {
        pname = "parsix";
-       version = "0.2.1.0";
-       sha256 = "1282mzlriyl4gi0l2ds4a3prjh6q0vl5cv14ms03999hmygpnr3l";
+       version = "0.2.2.0";
+       sha256 = "1l2xg0xca1ss4gpl5gmpvbck0f66r8mazai6x561ldqb3kqjx1as";
        libraryHaskellDepends = [
          base containers fingertree mtl parsers prettyprinter
          prettyprinter-ansi-terminal text transformers
@@ -172470,6 +173065,8 @@ self: {
        pname = "permutations";
        version = "0.1.0.0";
        sha256 = "0dx4xx4g35r2qq4al431l5s1664psf95pf0nf6y59c1i1km5qpq4";
+       revision = "1";
+       editedCabalFile = "1n52axjb7z0hv9fzs9c7n33dxhm5ljdv2s0xs17hh0ycy2106dq2";
        libraryHaskellDepends = [
          alg base base-unicode-symbols Fin natural-induction peano
          universe-base util
@@ -179999,6 +180596,31 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ cdepillabout ];
      }) {};
 
+  "pretty-simple_3_2_2_0" = callPackage
+    ({ mkDerivation, ansi-terminal, base, Cabal, cabal-doctest
+     , containers, criterion, doctest, Glob, mtl, QuickCheck
+     , template-haskell, text, transformers
+     }:
+     mkDerivation {
+       pname = "pretty-simple";
+       version = "3.2.2.0";
+       sha256 = "092vv0dvyab0vjchhw6cvc3x3wp7qb04q6n6ibjvpg472x3hnl3z";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         ansi-terminal base containers mtl text transformers
+       ];
+       testHaskellDepends = [
+         base doctest Glob QuickCheck template-haskell
+       ];
+       benchmarkHaskellDepends = [ base criterion text ];
+       description = "pretty printer for data types with a 'Show' instance";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ cdepillabout ];
+     }) {};
+
   "pretty-sop" = callPackage
     ({ mkDerivation, base, generics-sop, markdown-unlit, pretty-show }:
      mkDerivation {
@@ -180179,8 +180801,8 @@ self: {
     ({ mkDerivation, base, graphviz, prettyprinter, text }:
      mkDerivation {
        pname = "prettyprinter-graphviz";
-       version = "0.1.1.0";
-       sha256 = "1x69lgxkby1bvsl91j4a94f1ylsl1imll3lqqpjig7yrxn9wi9xq";
+       version = "0.1.1.1";
+       sha256 = "1cpzqvy9w8ims5hqhv5v18r0dgj3708gprdrjxbja13nfsb6bsg9";
        libraryHaskellDepends = [ base graphviz prettyprinter text ];
        description = "a prettyprinter backend for graphviz";
        license = stdenv.lib.licenses.bsd3;
@@ -181936,6 +182558,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "prosidy" = callPackage
+    ({ mkDerivation, aeson, aeson-diff, aeson-pretty, base, binary
+     , bytestring, containers, contravariant, deepseq, directory
+     , filepath, hashable, megaparsec, profunctors, tagged, tasty
+     , tasty-ant-xml, tasty-golden, tasty-hunit, tasty-quickcheck, text
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "prosidy";
+       version = "1.5.0.1";
+       sha256 = "1pbqa89khrm0kqcsdd8sj82km1sc9laiw155prplnnv7xp8xiigy";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base binary bytestring containers contravariant deepseq
+         hashable megaparsec profunctors tagged text transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson aeson-diff aeson-pretty base bytestring containers directory
+         filepath tasty tasty-ant-xml tasty-golden tasty-hunit
+         tasty-quickcheck text
+       ];
+       description = "A simple language for writing documents";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "prospect" = callPackage
     ({ mkDerivation, base, deepseq, free, hspec, inspection-testing
      , kan-extensions, mtl, transformers
@@ -184826,6 +185474,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "quickcheck-higherorder" = callPackage
+    ({ mkDerivation, base, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck, test-fun
+     }:
+     mkDerivation {
+       pname = "quickcheck-higherorder";
+       version = "0.1.0.0";
+       sha256 = "1gv7r1h9fjg6qi6gj8cg66d7z51kddishxp4hp6cnk55zx1wgy6w";
+       revision = "1";
+       editedCabalFile = "1xlfpnfbjlihl021b1l6mnl195fcpsjpmdnszf0bfh7q8mrdwr3j";
+       libraryHaskellDepends = [ base QuickCheck test-fun ];
+       testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
+       description = "QuickCheck extension for higher-order properties";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "quickcheck-instances" = callPackage
     ({ mkDerivation, array, base, base-compat, bytestring
      , case-insensitive, containers, hashable, old-time, QuickCheck
@@ -187646,8 +188310,8 @@ self: {
      }:
      mkDerivation {
        pname = "reactive-banana-automation";
-       version = "0.5.2";
-       sha256 = "1gd6d3r0dsawi6zkr4fnkyrszikg1xzgfavxsaaswl4rw09znr7x";
+       version = "0.5.3";
+       sha256 = "15jp5rawypxzbbyi9xi6jkds3mns7fpfkvzrzbqd7dvaj4mzzz0g";
        libraryHaskellDepends = [
          base reactive-banana stm time transformers
        ];
@@ -188099,32 +188763,25 @@ self: {
      }) {};
 
   "reanimate" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, attoparsec, base
+    ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
      , base64-bytestring, bytestring, cassava, chiphunk, colour
-     , containers, cubicbezier, diagrams, diagrams-contrib
-     , diagrams-core, diagrams-lib, diagrams-svg, directory, filepath
-     , fsnotify, hashable, here, JuicyPixels, lens, linear, matrix, mtl
-     , open-browser, optparse-applicative, palette, parallel, process
-     , QuickCheck, random-shuffle, reanimate-svg, svg-builder, tasty
-     , tasty-golden, tasty-hunit, temporary, text, time, vector
+     , containers, cubicbezier, directory, filepath, fsnotify, geojson
+     , hashable, here, JuicyPixels, lens, linear, matrix, mtl
+     , open-browser, optparse-applicative, parallel, process
+     , random-shuffle, reanimate-svg, temporary, text, time, vector
      , websockets, xml
      }:
      mkDerivation {
        pname = "reanimate";
-       version = "0.1.9.0";
-       sha256 = "0rmlyrk24n2267mm22mxiipcd7m5j9mgk5n69pscigqnyl1xm7y6";
+       version = "0.2.0.2";
+       sha256 = "14912rzn8bgrz92q7nv3yjxyfdjcznfgs2x1rnw1mc6q8imrfppy";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         ansi-wl-pprint attoparsec base base64-bytestring bytestring cassava
-         chiphunk colour containers cubicbezier diagrams diagrams-contrib
-         diagrams-core diagrams-lib diagrams-svg directory filepath fsnotify
-         hashable here JuicyPixels lens linear matrix mtl open-browser
-         optparse-applicative palette parallel process random-shuffle
-         reanimate-svg svg-builder temporary text time vector websockets xml
-       ];
-       testHaskellDepends = [
-         ansi-wl-pprint base bytestring directory filepath process
-         QuickCheck tasty tasty-golden tasty-hunit
+         aeson ansi-wl-pprint attoparsec base base64-bytestring bytestring
+         cassava chiphunk colour containers cubicbezier directory filepath
+         fsnotify geojson hashable here JuicyPixels lens linear matrix mtl
+         open-browser optparse-applicative parallel process random-shuffle
+         reanimate-svg temporary text time vector websockets xml
        ];
        description = "Animation library based on SVGs";
        license = stdenv.lib.licenses.publicDomain;
@@ -188238,6 +188895,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "rebase_1_6" = callPackage
+    ({ mkDerivation, base, bifunctors, bytestring, comonad, containers
+     , contravariant, contravariant-extras, deepseq, dlist, either
+     , hashable, mtl, profunctors, scientific, selective, semigroupoids
+     , semigroups, stm, text, time, transformers, unordered-containers
+     , uuid, vector, void
+     }:
+     mkDerivation {
+       pname = "rebase";
+       version = "1.6";
+       sha256 = "1hsfff3rsaigjcg8s7mvipi68xqx4ala1zdrghgyb76z1c23m6iw";
+       libraryHaskellDepends = [
+         base bifunctors bytestring comonad containers contravariant
+         contravariant-extras deepseq dlist either hashable mtl profunctors
+         scientific selective semigroupoids semigroups stm text time
+         transformers unordered-containers uuid vector void
+       ];
+       description = "A more progressive alternative to the \"base\" package";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rebindable" = callPackage
     ({ mkDerivation, base, data-default-class, indexed }:
      mkDerivation {
@@ -191857,6 +192536,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "rerebase_1_6" = callPackage
+    ({ mkDerivation, rebase }:
+     mkDerivation {
+       pname = "rerebase";
+       version = "1.6";
+       sha256 = "0g2bgh30ra006w4ypsrnyvfwys4ajg2b0k6c55snci12acs2igzd";
+       libraryHaskellDepends = [ rebase ];
+       description = "Reexports from \"base\" with a bunch of other standard libraries";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "reroute" = callPackage
     ({ mkDerivation, base, criterion, deepseq, graph-core, hashable
      , hspec, http-api-data, hvect, mtl, random, regex-compat, text
@@ -193336,19 +194027,16 @@ self: {
      }) {};
 
   "rings" = callPackage
-    ({ mkDerivation, adjunctions, base, connections, containers
-     , distributive, hedgehog, lawz, magmas, profunctors, property
-     , semigroupoids
+    ({ mkDerivation, adjunctions, base, containers, distributive, lawz
+     , magmas, semigroupoids
      }:
      mkDerivation {
        pname = "rings";
-       version = "0.1";
-       sha256 = "0x1qbxl3f732hf1chhvg91x6yiym48dsxshzq3rs95bqjcm4mqxc";
+       version = "0.1.2";
+       sha256 = "0rci487ycp44h3qqpnwz9z429xwhsj4andsvcdpisbns56mw6rqd";
        libraryHaskellDepends = [
-         adjunctions base containers distributive lawz magmas profunctors
-         semigroupoids
+         adjunctions base containers distributive lawz magmas semigroupoids
        ];
-       testHaskellDepends = [ base connections hedgehog property ];
        description = "Ring-like objects";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -198811,6 +199499,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "selective_0_4" = callPackage
+    ({ mkDerivation, base, containers, mtl, QuickCheck, tasty
+     , tasty-expected-failure, tasty-quickcheck, transformers
+     }:
+     mkDerivation {
+       pname = "selective";
+       version = "0.4";
+       sha256 = "0kwf6s21gc64nl04rvaydz838kjf7b7xgw1vvyvr44mf36ggcv2p";
+       libraryHaskellDepends = [ base containers transformers ];
+       testHaskellDepends = [
+         base containers mtl QuickCheck tasty tasty-expected-failure
+         tasty-quickcheck transformers
+       ];
+       description = "Selective applicative functors";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "selectors" = callPackage
     ({ mkDerivation, alex, array, base, containers, happy
      , template-haskell, text, xml-conduit
@@ -204094,8 +204800,8 @@ self: {
     ({ mkDerivation, base, containers, text, unix }:
      mkDerivation {
        pname = "shell-monad";
-       version = "0.6.8";
-       sha256 = "0xv28s1b8rd1zd2mr5g6km8gwsy5ynsyji8fd68clq1rx9jjfcsc";
+       version = "0.6.9";
+       sha256 = "1mms4k2y7gxzilax0hqhgqppckx0mm5nj7fjzqhmn211rsc2s1qn";
        libraryHaskellDepends = [ base containers text unix ];
        description = "shell monad";
        license = stdenv.lib.licenses.bsd3;
@@ -210992,6 +211698,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "split_0_2_3_4" = callPackage
+    ({ mkDerivation, base, QuickCheck }:
+     mkDerivation {
+       pname = "split";
+       version = "0.2.3.4";
+       sha256 = "0ahzdjcxw5wywr3w4msspia99k6fkckddam1m5506h4z9h8fa7r7";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base QuickCheck ];
+       description = "Combinator library for splitting lists";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "split-channel" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -211067,6 +211786,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "splitmix_0_0_4" = callPackage
+    ({ mkDerivation, async, base, base-compat-batteries, bytestring
+     , clock, containers, criterion, deepseq, HUnit, process, random
+     , tf-random, time, vector
+     }:
+     mkDerivation {
+       pname = "splitmix";
+       version = "0.0.4";
+       sha256 = "149hjjr8mh5cvbniyhx1aciczp5ciyx8bx57d5ynmz90acdb78da";
+       libraryHaskellDepends = [ base deepseq random time ];
+       testHaskellDepends = [
+         async base base-compat-batteries bytestring deepseq HUnit process
+         random tf-random vector
+       ];
+       benchmarkHaskellDepends = [
+         base clock containers criterion random tf-random
+       ];
+       description = "Fast Splittable PRNG";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "splitter" = callPackage
     ({ mkDerivation, base, directory, filepath, parsec, range }:
      mkDerivation {
@@ -211606,8 +212347,8 @@ self: {
     ({ mkDerivation, base, bytestring, text }:
      mkDerivation {
        pname = "squeather";
-       version = "0.2.0.0";
-       sha256 = "0hrbj2z0rbvcpw925mws3ar34qfmpnm3l2fnc3rjshyp20hl5h78";
+       version = "0.4.0.0";
+       sha256 = "1i7qjvayi71b5rqrcxhl2c5idpf1gdbcxx7h082l0rwpf0qlg4f4";
        libraryHaskellDepends = [ base bytestring text ];
        description = "Use databases with the version 3 series of the SQLite C library";
        license = stdenv.lib.licenses.bsd3;
@@ -212343,6 +213084,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stack-templatizer_0_1_0_2" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath }:
+     mkDerivation {
+       pname = "stack-templatizer";
+       version = "0.1.0.2";
+       sha256 = "0wz9xa3zs2c6706p3zydkz5rl8076hqak10mi4ianmfidp2v446w";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base bytestring directory filepath ];
+       description = "Generate a stack template from a folder";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stack-type" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -213216,8 +213971,8 @@ self: {
      }:
      mkDerivation {
        pname = "static-text";
-       version = "0.2.0.4";
-       sha256 = "19d43v2cp6wg861lc6rvimzqq20via6fvradysapmilq7svs5kq7";
+       version = "0.2.0.5";
+       sha256 = "1vxkavrfyjxjzmajxx8xfx8cyx0qwa8cxslkvv1hnkrw9brwhrrs";
        libraryHaskellDepends = [
          base bytestring template-haskell text vector
        ];
@@ -216466,6 +217221,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stylish-haskell_0_11_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
+     , directory, file-embed, filepath, haskell-src-exts, HsYAML
+     , HsYAML-aeson, HUnit, mtl, optparse-applicative, random
+     , semigroups, strict, syb, test-framework, test-framework-hunit
+     , text
+     }:
+     mkDerivation {
+       pname = "stylish-haskell";
+       version = "0.11.0.0";
+       sha256 = "124dn46ddxfcjyrmwjwijqan0dd55zzx9nwckg1df8b6al6k0x3j";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring Cabal containers directory file-embed
+         filepath haskell-src-exts HsYAML HsYAML-aeson mtl semigroups syb
+         text
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring Cabal containers directory file-embed
+         filepath haskell-src-exts HsYAML HsYAML-aeson mtl
+         optparse-applicative strict syb
+       ];
+       testHaskellDepends = [
+         aeson base bytestring Cabal containers directory file-embed
+         filepath haskell-src-exts HsYAML HsYAML-aeson HUnit mtl random syb
+         test-framework test-framework-hunit text
+       ];
+       description = "Haskell code prettifier";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stylist" = callPackage
     ({ mkDerivation, base, css-syntax, hashable, hspec, network-uri
      , QuickCheck, scientific, text, unordered-containers
@@ -217694,8 +218482,8 @@ self: {
      }:
      mkDerivation {
        pname = "swish";
-       version = "0.10.0.2";
-       sha256 = "1r6wfj8x5r3w2gvnhvdkjgn3rq4a4smna81gsxah2ibpwhinjjf1";
+       version = "0.10.0.3";
+       sha256 = "0cl34mqbda1k4spv86y8v5x0d89lv80b8dxymc7iw5hpjks1cdx3";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -220356,8 +221144,8 @@ self: {
      }:
      mkDerivation {
        pname = "taskwarrior";
-       version = "0.1.2.1";
-       sha256 = "0kz4p2bq8xnv3iygdm0lbihkkvfvizb5i0c2ynw481r7rl7dq7md";
+       version = "0.1.2.2";
+       sha256 = "0iy2fxgxhjdhi62zbd7iwbvblgr9shlqwg4a92k7b3cd9mqwskv6";
        libraryHaskellDepends = [
          aeson base bytestring process random text time unordered-containers
          uuid
@@ -220509,23 +221297,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tasty-golden_2_3_2_1" = callPackage
+  "tasty-golden_2_3_3" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, deepseq
      , directory, filepath, mtl, optparse-applicative, process, tagged
-     , tasty, tasty-hunit, temporary, temporary-rc
+     , tasty, tasty-hunit, temporary
      }:
      mkDerivation {
        pname = "tasty-golden";
-       version = "2.3.2.1";
-       sha256 = "175qrnjz2szn0bclxcq3lsa0rxlrm3jwxsbii65qjgknzn0g5shp";
-       revision = "1";
-       editedCabalFile = "0jjma01ypvgvf851la5m2rlavi588ihjl4n9lmdmx1khlz8q8jz1";
+       version = "2.3.3";
+       sha256 = "07sk9hw41am2xcpfkzy1jv43wlyxkdd4ajwk8rw2jabva91kv68x";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          async base bytestring containers deepseq directory filepath mtl
          optparse-applicative process tagged tasty temporary
        ];
        testHaskellDepends = [
-         base directory filepath process tasty tasty-hunit temporary-rc
+         base directory filepath process tasty tasty-hunit temporary
        ];
        description = "Golden tests support for tasty";
        license = stdenv.lib.licenses.mit;
@@ -220650,8 +221438,8 @@ self: {
     ({ mkDerivation, base, HUnit, tasty, tasty-hunit }:
      mkDerivation {
        pname = "tasty-hunit-compat";
-       version = "0.1.0";
-       sha256 = "0894pi60ncyfcgvnpm39mcklbqbabgln19qvf9mjcphcnxvpxlvx";
+       version = "0.2";
+       sha256 = "0ds1j1qra45n7d6frrf5zw5ps3haa1610d99ha09nhc9l8wm4ivp";
        libraryHaskellDepends = [ base HUnit tasty tasty-hunit ];
        description = "Tasty integration with the existing HUnit package";
        license = stdenv.lib.licenses.mpl20;
@@ -222700,6 +223488,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "test-fun" = callPackage
+    ({ mkDerivation, base, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "test-fun";
+       version = "0.1.0.0";
+       sha256 = "1sp19a2i4ahn9mfd1rx4icp6lcnhw5bz192859yj8f8ky4xszryb";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       description = "Testable functions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "test-invariant" = callPackage
     ({ mkDerivation, base, criterion, QuickCheck, tasty
      , tasty-quickcheck
@@ -224281,8 +225081,8 @@ self: {
     ({ mkDerivation, base, markdown-unlit, template-haskell }:
      mkDerivation {
        pname = "th-env";
-       version = "0.1.0.0";
-       sha256 = "19br06iq4cmnyk7s23s08yq6v2llzi9zq26yi2pigk6spwb4pyjn";
+       version = "0.1.0.1";
+       sha256 = "0h3x6lwdqp889dnqcnycawf6wqvklh55mgfck37y6mng8ck3rqav";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base markdown-unlit ];
        testToolDepends = [ markdown-unlit ];
@@ -224462,8 +225262,8 @@ self: {
     ({ mkDerivation, base, markdown-unlit, template-haskell, time }:
      mkDerivation {
        pname = "th-nowq";
-       version = "0.1.0.3";
-       sha256 = "08lcy7b9r3mrnl8scjrzcmh3m840rqwb6cr6lasc8sjngf0d55x9";
+       version = "0.1.0.4";
+       sha256 = "0s0xsw4zq4sqg37cqs27hcfb9948zkfhh4yma655ankr7q3g6nhv";
        libraryHaskellDepends = [ base template-haskell time ];
        testHaskellDepends = [ base markdown-unlit ];
        testToolDepends = [ markdown-unlit ];
@@ -228949,6 +229749,8 @@ self: {
        pname = "traversal-template";
        version = "0.0.0.1";
        sha256 = "0hal3vr9p49bx6c3zhfg7xa64hf81rmkl98vb14iibrmp940vbmp";
+       revision = "1";
+       editedCabalFile = "0ry5z8w1bz83v2iaavzwkfg93zxdpvwd6xgg1m9d915rb992bsmx";
        libraryHaskellDepends = [ base template-haskell util ];
        testHaskellDepends = [ base template-haskell util ];
        benchmarkHaskellDepends = [ base gauge template-haskell util ];
@@ -230994,8 +231796,8 @@ self: {
        pname = "txt";
        version = "0.0.3.0";
        sha256 = "0fi16fpzcskcffri7adpnbf6qj2ksv7vnxwyl8nw1qg55rlj3c5y";
-       revision = "1";
-       editedCabalFile = "1c0d1b230hqni7hvww9f0iy8fk5rl4gi7xgs1v1lkc3h0dgaap4m";
+       revision = "2";
+       editedCabalFile = "1h4djzkdm2y0i20rzm3y7511wwgpd392wsghal10031m9cqx81sh";
        libraryHaskellDepends = [
          base bytestring deepseq utf8-string util
        ];
@@ -232025,6 +232827,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "typelits-printf" = callPackage
+    ({ mkDerivation, base, symbols, text }:
+     mkDerivation {
+       pname = "typelits-printf";
+       version = "0.2.0.0";
+       sha256 = "1a2ahf8imbk8zff2i7cfag2irax8qdd4r6vb00hil34i67p980ij";
+       libraryHaskellDepends = [ base symbols text ];
+       description = "Type-safe printf from parsing GHC TypeLits Symbol";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "typelits-witnesses" = callPackage
     ({ mkDerivation, base, dependent-sum }:
      mkDerivation {
@@ -233763,6 +234576,8 @@ self: {
        pname = "universal";
        version = "0.0.1.0";
        sha256 = "1lpwzy4l711rw7a6k0fbbsaqfbzldi242vqkjrmhxnrkmddjxgy9";
+       revision = "1";
+       editedCabalFile = "17jv7v9wb0gvf3na883r0yhk71s4pi9337hxmj0kcqvyzbjqli1f";
        libraryHaskellDepends = [
          base base-unicode-symbols category util
        ];
@@ -237960,8 +238775,8 @@ self: {
      }:
      mkDerivation {
        pname = "vinyl";
-       version = "0.12.0";
-       sha256 = "04lzhlmm57yp1x0z4g0dl1q96wqsygsldxdksam0gisdidk133vi";
+       version = "0.12.1";
+       sha256 = "0bwy1814762vy2din5i73h4d6mmf4hw71ix5c1mnnzmbmjnmbqc0";
        libraryHaskellDepends = [ array base ghc-prim ];
        testHaskellDepends = [
          aeson base doctest hspec lens lens-aeson microlens mtl
@@ -245855,8 +246670,8 @@ self: {
      }:
      mkDerivation {
        pname = "xmobar";
-       version = "0.32";
-       sha256 = "0x2ki3v0pmhl4bva3qi1xx21axayc4sx1nkzhmk2ap4l0cj52jrd";
+       version = "0.33";
+       sha256 = "1hr3qqykc5givcpcwrr9f2y920jmiinmxm5mcy6qgpgymgwqb618";
        configureFlags = [
          "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus"
          "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris"
@@ -247373,8 +248188,8 @@ self: {
      }:
      mkDerivation {
        pname = "yate";
-       version = "0.1.0.2";
-       sha256 = "1wb9y69fgyqngfl8nddrsk22d532cba62av99qkd9xgjgsm61ki1";
+       version = "0.1.0.3";
+       sha256 = "0jghkn5ifq1yvnqy2a7k8k8sf0js3dk9zznmf79a6fl3npp6dim9";
        libraryHaskellDepends = [
          aeson attoparsec base mtl scientific template-haskell text
          unordered-containers vector

From 16b8ab5329143d36425b71ecc03617240bc4c709 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 21 Feb 2020 14:03:22 +0100
Subject: [PATCH 1820/4636] haskellPackages.crpytonite: fix build

---
 .../development/haskell-modules/configuration-common.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f154fbdf3b84..81804ce619c8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -683,15 +683,6 @@ self: super: {
   # https://github.com/goldfirere/singletons/issues/122
   singletons = dontCheck super.singletons;
 
-  # Fix an aarch64 issue with cryptonite-0.25:
-  # https://github.com/haskell-crypto/cryptonite/issues/234
-  # This has been committed upstream, but there is, as of yet, no new release.
-  # Also, disable the test suite to avoid https://github.com/haskell-crypto/cryptonite/issues/260.
-  cryptonite = appendPatch (dontCheck super.cryptonite) (pkgs.fetchpatch {
-    url = https://github.com/haskell-crypto/cryptonite/commit/4622e5fc8ece82f4cf31358e31cd02cf020e558e.patch;
-    sha256 = "1m2d47ni4jbrpvxry50imj91qahr3r7zkqm157clrzlmw6gzpgnq";
-  });
-
   # Djinn's last release was 2014, incompatible with Semigroup-Monoid Proposal
   # https://github.com/augustss/djinn/pull/8
   djinn = appendPatch super.djinn (pkgs.fetchpatch {

From 21ded2d66779ff8c5cb30bfcc28c6be419723062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 21 Feb 2020 18:37:28 +0100
Subject: [PATCH 1821/4636] servant-server: fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 9ddad80f6eb1..eb356ca1f30c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -69,6 +69,9 @@ self: super: {
   snap-server = doJailbreak super.snap-server;
   xmobar = doJailbreak super.xmobar;
   exact-pi = doJailbreak super.exact-pi;
+  time-compat = doJailbreak super.time-compat;
+  http-media = doJailbreak super.http-media;
+  servant-server = doJailbreak super.servant-server;
 
   # These packages don't work and need patching and/or an update.
   hackage-security = appendPatch (doJailbreak super.hackage-security) (pkgs.fetchpatch {

From c8554c0574ab7482ed451e7e978e77d05898ac06 Mon Sep 17 00:00:00 2001
From: Gabor Greif <ggreif@gmail.com>
Date: Mon, 24 Feb 2020 20:02:36 +0100
Subject: [PATCH 1822/4636] ghc: add 8.8.3

https://mail.haskell.org/pipermail/ghc-devs/2020-February/018643.html
---
 doc/languages-frameworks/haskell.section.md |   6 +-
 pkgs/development/compilers/ghc/8.8.3.nix    | 232 ++++++++++++++++++++
 pkgs/top-level/haskell-packages.nix         |  11 +
 3 files changed, 247 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/compilers/ghc/8.8.3.nix

diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md
index 8cab6208910d..944c17a137e7 100644
--- a/doc/languages-frameworks/haskell.section.md
+++ b/doc/languages-frameworks/haskell.section.md
@@ -112,8 +112,10 @@ haskell.compiler.ghc865                  ghc-8.6.5
 haskell.compiler.integer-simple.ghc865   ghc-8.6.5
 haskell.compiler.ghc881                  ghc-8.8.1
 haskell.compiler.integer-simple.ghc881   ghc-8.8.1
-haskell.compiler.ghc882                  ghc-8.8.1.20191211
-haskell.compiler.integer-simple.ghc882   ghc-8.8.1.20191211
+haskell.compiler.ghc882                  ghc-8.8.2
+haskell.compiler.integer-simple.ghc882   ghc-8.8.2
+haskell.compiler.ghc883                  ghc-8.8.3
+haskell.compiler.integer-simple.ghc883   ghc-8.8.3
 haskell.compiler.ghcjs                   ghcjs-8.6.0.1
 ```
 
diff --git a/pkgs/development/compilers/ghc/8.8.3.nix b/pkgs/development/compilers/ghc/8.8.3.nix
new file mode 100644
index 000000000000..43d4b84c5f80
--- /dev/null
+++ b/pkgs/development/compilers/ghc/8.8.3.nix
@@ -0,0 +1,232 @@
+{ stdenv, pkgsBuildTarget, targetPackages
+
+# build-tools
+, bootPkgs
+, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx
+, bash
+
+, libiconv ? null, ncurses
+
+, # GHC can be built with system libffi or a bundled one.
+  libffi ? null
+
+, useLLVM ? !stdenv.targetPlatform.isx86
+, # LLVM is conceptually a run-time-only depedendency, but for
+  # non-x86, we need LLVM to bootstrap later stages, so it becomes a
+  # build-time dependency too.
+  buildLlvmPackages, llvmPackages
+
+, # If enabled, GHC will be built with the GPL-free but slower integer-simple
+  # library instead of the faster but GPLed integer-gmp library.
+  enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
+
+, # If enabled, use -fPIC when compiling static libs.
+  enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
+
+, # Whether to build dynamic libs for the standard library (on the target
+  # platform). Static libs are always built.
+  enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
+
+, # Whetherto build terminfo.
+  enableTerminfo ? !stdenv.targetPlatform.isWindows
+
+, # What flavour to build. An empty string indicates no
+  # specific flavour and falls back to ghc default values.
+  ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
+    (if useLLVM then "perf-cross" else "perf-cross-ncg")
+
+, # Whether to disable the large address space allocator
+  # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
+  disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64
+}:
+
+assert !enableIntegerSimple -> gmp != null;
+
+let
+  inherit (stdenv) buildPlatform hostPlatform targetPlatform;
+
+  inherit (bootPkgs) ghc;
+
+  # TODO(@Ericson2314) Make unconditional
+  targetPrefix = stdenv.lib.optionalString
+    (targetPlatform != hostPlatform)
+    "${targetPlatform.config}-";
+
+  buildMK = ''
+    BuildFlavour = ${ghcFlavour}
+    ifneq \"\$(BuildFlavour)\" \"\"
+    include mk/flavours/\$(BuildFlavour).mk
+    endif
+    DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
+    INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
+  '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+    Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
+    CrossCompilePrefix = ${targetPrefix}
+    HADDOCK_DOCS = NO
+    BUILD_SPHINX_HTML = NO
+    BUILD_SPHINX_PDF = NO
+  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
+    GhcLibHcOpts += -fPIC
+    GhcRtsHcOpts += -fPIC
+  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+    EXTRA_CC_OPTS += -std=gnu99
+  '';
+
+  # Splicer will pull out correct variations
+  libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
+    ++ [libffi]
+    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
+    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+
+  toolsForTarget = [
+    pkgsBuildTarget.targetPackages.stdenv.cc
+  ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+
+  targetCC = builtins.head toolsForTarget;
+
+in
+stdenv.mkDerivation (rec {
+  version = "8.8.3";
+  name = "${targetPrefix}ghc-${version}";
+
+  src = fetchurl {
+    url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
+    sha256 = "128g932i3wix6ic03v04nh5755vyjiidzri9iybwad72yfmc1p70";
+  };
+
+  enableParallelBuilding = true;
+
+  outputs = [ "out" "doc" ];
+
+  postPatch = "patchShebangs .";
+
+  # GHC is a bit confused on its cross terminology.
+  preConfigure = ''
+    for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
+      export "''${env#TARGET_}=''${!env}"
+    done
+    # GHC is a bit confused on its cross terminology, as these would normally be
+    # the *host* tools.
+    export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
+    export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
+    # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString (targetPlatform.isLinux && !(targetPlatform.useLLVM or false)) ".gold"}"
+    export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
+    export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
+    export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
+    export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
+    export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
+    export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
+
+    echo -n "${buildMK}" > mk/build.mk
+    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+    export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    export NIX_LDFLAGS+=" -no_dtrace_dof"
+  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+    sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
+  '' + stdenv.lib.optionalString targetPlatform.isMusl ''
+      echo "patching llvm-targets for musl targets..."
+      echo "Cloning these existing '*-linux-gnu*' targets:"
+      grep linux-gnu llvm-targets | sed 's/^/  /'
+      echo "(go go gadget sed)"
+      sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
+      echo "llvm-targets now contains these '*-linux-musl*' targets:"
+      grep linux-musl llvm-targets | sed 's/^/  /'
+
+      echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
+      # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
+      for x in configure aclocal.m4; do
+        substituteInPlace $x \
+          --replace '*-android*|*-gnueabi*)' \
+                    '*-android*|*-gnueabi*|*-musleabi*)'
+      done
+  '';
+
+  # TODO(@Ericson2314): Always pass "--target" and always prefix.
+  configurePlatforms = [ "build" "host" ]
+    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  # `--with` flags for libraries needed for RTS linker
+  configureFlags = [
+    "--datadir=$doc/share/doc/ghc"
+    "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
+  ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
+  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
+    "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
+  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+    "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
+  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+    "--enable-bootstrap-with-devel-snapshot"
+  ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
+    "CFLAGS=-fuse-ld=gold"
+    "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
+    "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
+  ] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
+    "--disable-large-address-space"
+  ];
+
+  # Make sure we never relax`$PATH` and hooks support for compatability.
+  strictDeps = true;
+
+  # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
+	dontAddExtraLibs = true;
+
+  nativeBuildInputs = [
+    perl autoconf automake m4 python3 sphinx
+    ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
+  ];
+
+  # For building runtime libs
+  depsBuildTarget = toolsForTarget;
+
+  buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
+
+  propagatedBuildInputs = [ targetPackages.stdenv.cc ]
+    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+
+  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
+  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+
+  # required, because otherwise all symbols from HSffi.o are stripped, and
+  # that in turn causes GHCi to abort
+  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+
+  checkTarget = "test";
+
+  hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
+
+  postInstall = ''
+    # Install the bash completion file.
+    install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
+
+    # Patch scripts to include "readelf" and "cat" in $PATH.
+    for i in "$out/bin/"*; do
+      test ! -h $i || continue
+      egrep --quiet '^#!' <(head -n 1 $i) || continue
+      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+    done
+  '';
+
+  passthru = {
+    inherit bootPkgs targetPrefix;
+
+    inherit llvmPackages;
+    inherit enableShared;
+
+    # Our Cabal compiler name
+    haskellCompilerName = "ghc-${version}";
+  };
+
+  meta = {
+    homepage = http://haskell.org/ghc;
+    description = "The Glasgow Haskell Compiler";
+    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    inherit (ghc.meta) license platforms;
+  };
+
+} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
+  dontStrip = true;
+  dontPatchELF = true;
+  noAuditTmpdir = true;
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c4c18b264f1d..2d03b3ed8f44 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -68,6 +68,12 @@ in {
       buildLlvmPackages = buildPackages.llvmPackages_7;
       llvmPackages = pkgs.llvmPackages_7;
     };
+    ghc883 = callPackage ../development/compilers/ghc/8.8.3.nix {
+      bootPkgs = packages.ghc863Binary;
+      inherit (buildPackages.python3Packages) sphinx;
+      buildLlvmPackages = buildPackages.llvmPackages_7;
+      llvmPackages = pkgs.llvmPackages_7;
+    };
     ghc8101 = callPackage ../development/compilers/ghc/8.10.1.nix {
       bootPkgs = packages.ghc863Binary;
       inherit (buildPackages.python3Packages) sphinx;
@@ -137,6 +143,11 @@ in {
       ghc = bh.compiler.ghc882;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { };
     };
+    ghc883 = callPackage ../development/haskell-modules {
+      buildHaskellPackages = bh.packages.ghc883;
+      ghc = bh.compiler.ghc883;
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { };
+    };
     ghc8101 = callPackage ../development/haskell-modules {
       buildHaskellPackages = bh.packages.ghc8101;
       ghc = bh.compiler.ghc8101;

From 5fb67fc44833e60f8060a6c5b87a6922f226d65b Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Fri, 21 Feb 2020 22:21:30 +0100
Subject: [PATCH 1823/4636] haskellPackages.hakyll-contrib-hyphenation:
 jailbreak

Latest upstream commit is from 2015 [0], so I guess it's the easiest to
jailbreak it (as it builds that way).

[0] https://bitbucket.org/rvlm/hakyll-contrib-hyphenation/src/master/
---
 pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 81804ce619c8..91a7c7c89919 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1401,4 +1401,10 @@ self: super: {
     streamly = self.streamly_0_7_1;
   };
 
+  # This breaks because of version bounds, but compiles and runs fine.
+  # Last commit is 5 years ago, so we likely won't get upstream fixed soon.
+  # https://bitbucket.org/rvlm/hakyll-contrib-hyphenation/src/master/
+  # Therefore we jailbreak it.
+  hakyll-contrib-hyphenation = doJailbreak super.hakyll-contrib-hyphenation;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 95f15e7b3140904fe37d6503e5fdc01a21e25831 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Feb 2020 13:46:56 +0100
Subject: [PATCH 1824/4636] haskell-polyparse: the latest version works with
 ghc-8.8.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index eb356ca1f30c..3775f476454e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -78,10 +78,6 @@ self: super: {
     url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch";
     sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4";
   });
-  polyparse = appendPatch (doJailbreak super.polyparse) (pkgs.fetchpatch {
-    url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/polyparse-1.12.1.patch";
-    sha256 = "01b2gnsq0x4fd9na8zpk6pajym55mbz64hgzawlwxdw0y6681kr5";
-  });
   foundation = dontCheck super.foundation;
   vault = dontHaddock super.vault;
 

From ba190861e8789918a1f828b85759ad418c6aa76a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Feb 2020 13:55:11 +0100
Subject: [PATCH 1825/4636] haskell-relude: avoid test suite failure when
 building with ghc-8.8.x

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 3775f476454e..3160dfdd2d6e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -94,4 +94,7 @@ self: super: {
   # Upstream ships a broken Setup.hs file.
   csv = overrideCabal super.csv (drv: { prePatch = "rm Setup.hs"; });
 
+  # https://github.com/kowainik/relude/issues/241
+  relude = dontCheck super.relude;
+
 }

From 9347a3e5bebbb5104c2b32ed96ceaddb4850802d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Feb 2020 14:08:23 +0100
Subject: [PATCH 1826/4636] ghc-8.10.x: add overrides to fix regex-* packages

---
 .../configuration-ghc-8.10.x.nix              | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index 96c50aa43d30..734e6ac29774 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -45,26 +45,19 @@ self: super: {
   # Jailbreak to fix the build.
   async = doJailbreak super.async;
   hashable = doJailbreak super.hashable;
-  primitive_0_7_0_0 = doJailbreak (dontCheck super.primitive_0_7_0_0);  # evaluating the test suite gives an infinite recursion
-  regex-base_0_94_0_0 = doJailbreak super.regex-base_0_94_0_0;
-  regex-compat_0_95_2_0 = doJailbreak super.regex-compat_0_95_2_0;
-  regex-posix_0_96_0_0 = doJailbreak super.regex-posix_0_96_0_0;
+  parallel = doJailbreak super.parallel;
+  regex-base = doJailbreak super.regex-base;
+  regex-compat = doJailbreak super.regex-compat;
+  regex-pcre-builtin = doJailbreak super.regex-pcre-builtin;
+  regex-posix = doJailbreak super.regex-posix;
+  regex-tdfa = doJailbreak super.regex-tdfa;
+  split = doJailbreak super.split;
   tar = doJailbreak super.tar;
   tasty-expected-failure = doJailbreak super.tasty-expected-failure;
   unliftio-core = doJailbreak super.unliftio-core;
   vector = doJailbreak super.vector;
   zlib = doJailbreak super.zlib;
-  parallel = doJailbreak super.parallel;
-  split = doJailbreak super.split;
 
   # Use the latest version to fix the build.
-  generic-deriving = self.generic-deriving_1_13_1;
-  optparse-applicative = self.optparse-applicative_0_15_1_0;
-  primitive = self.primitive_0_7_0_0;
-  regex-base = self.regex-base_0_94_0_0;
-  regex-compat = self.regex-compat_0_95_2_0;
-  regex-pcre-builtin = self.regex-pcre-builtin_0_95_1_1_8_43;
-  regex-posix = self.regex-posix_0_96_0_0;
-  regex-tdfa = self.regex-tdfa_1_3_1_0;
 
 }

From 1299f72e8bc0d5d1ab668d17f24014e17d9ccbc2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Feb 2020 14:15:57 +0100
Subject: [PATCH 1827/4636] haskell-spacecookie & matterhorn: clean up
 overrides

---
 .../haskell-modules/configuration-common.nix     | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 91a7c7c89919..2b5793c11a1f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1268,20 +1268,8 @@ self: super: {
   # https://github.com/kazu-yamamoto/dns/issues/150
   dns = dontCheck super.dns;
 
-  # needs newer version of the systemd package
-  spacecookie = super.spacecookie.override { systemd = self.systemd_2_2_0; };
-
-  # 2020-01-19 - there were conflicting versions of brick, vty, and brick-skylighting;
-  # multiple versions of them were being pulled in by the others which is not allowed.
-  # There are more complicated ways of doing this but I was able to make it fairly simple -- kiwi
-  matterhorn = doJailbreak (super.matterhorn.override {
-    brick-skylighting = self.brick-skylighting.override {
-      brick = self.brick_0_52;
-    };
-  });
-
-  # 2020-01-19 - because of QuickCheck bounds | was broken anyway and is needed for matterhorn -- kiwi
-  Unique = doJailbreak super.Unique;
+  # Support recent versions of fast-logger.
+  spacecookie = doJailbreak super.spacecookie;
 
   # apply patches from https://github.com/snapframework/snap-server/pull/126
   # manually until they are accepted upstream

From 73af2522be0648a523cf9368358de722dcc58419 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Feb 2020 14:17:50 +0100
Subject: [PATCH 1828/4636] haskell-ChasingBottoms: jailbreak to fix build with
 ghc-8.10.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
index 734e6ac29774..f9e9e189a9a5 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
@@ -44,6 +44,7 @@ self: super: {
 
   # Jailbreak to fix the build.
   async = doJailbreak super.async;
+  ChasingBottoms = doJailbreak super.ChasingBottoms;
   hashable = doJailbreak super.hashable;
   parallel = doJailbreak super.parallel;
   regex-base = doJailbreak super.regex-base;

From 78a2350f2c60a7c392dabfe30aef384129368adc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Feb 2020 14:26:16 +0100
Subject: [PATCH 1829/4636] haskell-construct: drop obsolete overrides

---
 pkgs/development/haskell-modules/configuration-common.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2b5793c11a1f..df149847dc25 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1378,12 +1378,6 @@ self: super: {
   # Unnecessary upper bound on vector <0.12.1
   bitwise-enum = doJailbreak super.bitwise-enum;
 
-  # Needs more recent versions of those libraries
-  construct = super.construct.overrideScope (self: super: {
-    incremental-parser = self.incremental-parser_0_4;
-    monoid-subclasses = self.monoid-subclasses_1_0_1;
-  });
-
   # Needs more recent streamly version
   streamly-bytestring = super.streamly-bytestring.override {
     streamly = self.streamly_0_7_1;

From 111a1b868ef6505ab45080ba7c2ffc78ef9c7b08 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Feb 2020 14:31:13 +0100
Subject: [PATCH 1830/4636] haskell-ormolu: update override

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index df149847dc25..56f56c38fa29 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1294,7 +1294,7 @@ self: super: {
 
   # Needs ghc-lib-parser 8.8.1 (does not build with 8.8.0)
   ormolu = doJailbreak (super.ormolu.override {
-    ghc-lib-parser = self.ghc-lib-parser_8_8_2_20200205;
+    ghc-lib-parser = self.ghc-lib-parser_8_8_3_20200224;
   });
 
   # krank-0.1.0 does not accept PyF-0.9.0.0.

From 7ecd6958b996f2f4bc1e893285cec4ced3f3301c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Feb 2020 14:40:11 +0100
Subject: [PATCH 1831/4636] hackage2nix: update list of broken builds to fix
 evaluation

---
 .../configuration-hackage2nix.yaml            | 8394 ++++++++++++++++-
 1 file changed, 8386 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index ca78e7910f21..86f058a0e383 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2424,15 +2424,10 @@ package-maintainers:
     - hsemail
     - hsyslog
     - jailbreak-cabal
-    - json-autotype
     - language-nix
-    - liquid-fixpoint
-    - liquidhaskell
     - logging-facade-syslog
     - nix-paths
     - pandoc
-    - stack
-    - streamproc
     - structured-haskell-mode
     - stylish-cabal
     - titlecase
@@ -2441,13 +2436,13 @@ package-maintainers:
   gridaphobe:
     - located-base
   jb55:
-    - bson-lens
+    # - bson-lens
     - cased
     - elm-export-persistent
-    - pipes-mongodb
+    # - pipes-mongodb
     - streaming-wai
   kiwi:
-    - glirc
+    # - glirc
     - matterhorn
     - Unique
   psibi:
@@ -2600,3 +2595,8386 @@ dont-distribute-packages:
 
 broken-packages:
   # These packages don't compile or depend on packages that don't compile.
+  - 3dmodels
+  - 4Blocks
+  - a50
+  - AAI
+  - abcBridge
+  - abcnotation
+  - abeson
+  - abides
+  - abnf
+  - AbortT-monadstf
+  - AbortT-mtl
+  - AbortT-transformers
+  - abstract-par-accelerate
+  - abt
+  - AC-BuildPlatform
+  - AC-EasyRaster-GTK
+  - AC-HalfInteger
+  - ac-machine
+  - ac-machine-conduit
+  - AC-MiniTest
+  - AC-Terminal
+  - AC-VanillaArray
+  - AC-Vector
+  - AC-Vector-Fancy
+  - accelerate
+  - accelerate-arithmetic
+  - accelerate-fftw
+  - accelerate-fourier
+  - accelerate-io
+  - accelerate-kullback-liebler
+  - accelerate-llvm
+  - accelerate-llvm-native
+  - accelerate-random
+  - accelerate-typelits
+  - accelerate-utility
+  - accentuateus
+  - access-time
+  - access-token-provider
+  - acid-state-dist
+  - acid-state-tls
+  - ACME
+  - acme-all-monad
+  - acme-comonad
+  - acme-flipping-tables
+  - acme-hq9plus
+  - acme-http
+  - acme-inator
+  - acme-kitchen-sink
+  - acme-left-pad
+  - acme-miscorder
+  - acme-mutable-package
+  - acme-now
+  - acme-numbersystem
+  - acme-operators
+  - acme-php
+  - acme-schoenfinkel
+  - acme-strfry
+  - acme-stringly-typed
+  - acme-this
+  - acme-zero
+  - ActionKid
+  - activehs
+  - activehs-base
+  - activitypub
+  - activitystreams-aeson
+  - actor
+  - Adaptive
+  - Adaptive-Blaisorblade
+  - adaptive-containers
+  - adaptive-tuple
+  - adb
+  - adblock2privoxy
+  - adhoc-network
+  - adict
+  - adobe-swatch-exchange
+  - adp-multi
+  - adp-multi-monadiccp
+  - ADPfusionForest
+  - ADPfusionSet
+  - adtrees
+  - Advgame
+  - Advise-me
+  - AERN-Basics
+  - AERN-Net
+  - AERN-Real
+  - AERN-Real-Double
+  - AERN-Real-Interval
+  - AERN-RnToRm
+  - AERN-RnToRm-Plot
+  - aern2-mp
+  - aern2-real
+  - aeson-applicative
+  - aeson-decode
+  - aeson-diff-generic
+  - aeson-filthy
+  - aeson-flowtyped
+  - aeson-gadt-th
+  - aeson-injector
+  - aeson-iproute
+  - aeson-native
+  - aeson-prefix
+  - aeson-schema
+  - aeson-smart
+  - aeson-streams
+  - aeson-t
+  - aeson-tiled
+  - aeson-typescript
+  - affection
+  - affine-invariant-ensemble-mcmc
+  - afv
+  - ag-pictgen
+  - Agata
+  - agda-server
+  - agda-snippets
+  - agda-snippets-hakyll
+  - agentx
+  - AGI
+  - AhoCorasick
+  - aig
+  - aip
+  - air-th
+  - airbrake
+  - airship
+  - airtable-api
+  - aivika-distributed
+  - ajhc
+  - AlanDeniseEricLauren
+  - alarmclock
+  - alerta
+  - alex-prelude
+  - alfred
+  - alga
+  - algebra-dag
+  - algebra-sql
+  - algebraic
+  - algebraic-prelude
+  - algo-s
+  - algolia
+  - AlgoRhythm
+  - AlgorithmW
+  - align-text
+  - AlignmentAlgorithms
+  - Allure
+  - alms
+  - alpha
+  - alphachar
+  - alsa
+  - alsa-gui
+  - alsa-midi
+  - alsa-pcm-tests
+  - alsa-seq-tests
+  - altcomposition
+  - alternative-extra
+  - alternative-io
+  - alto
+  - alure
+  - amazon-emailer
+  - amazon-emailer-client-snap
+  - amazon-products
+  - amby
+  - AMI
+  - ampersand
+  - amqp-conduit
+  - analyze
+  - analyze-client
+  - anansi-pandoc
+  - anatomy
+  - android
+  - android-activity
+  - android-lint-summary
+  - AndroidViewHierarchyImporter
+  - angel
+  - angle
+  - Animas
+  - animascii
+  - animate
+  - animate-example
+  - animate-frames
+  - animate-preview
+  - animate-sdl2
+  - anki-tools
+  - annah
+  - Annotations
+  - anonymous-sums
+  - anonymous-sums-tests
+  - ansigraph
+  - antagonist
+  - antfarm
+  - anticiv
+  - antigate
+  - antimirov
+  - antisplice
+  - antlr-haskell
+  - antlrc
+  - anydbm
+  - aosd
+  - apart
+  - apecs-stm
+  - apelsin
+  - api-builder
+  - api-rpc-factom
+  - api-rpc-pegnet
+  - api-tools
+  - api-yoti
+  - apiary
+  - apiary-authenticate
+  - apiary-clientsession
+  - apiary-cookie
+  - apiary-eventsource
+  - apiary-helics
+  - apiary-http-client
+  - apiary-logger
+  - apiary-memcached
+  - apiary-mongoDB
+  - apiary-persistent
+  - apiary-purescript
+  - apiary-redis
+  - apiary-session
+  - apiary-websockets
+  - apis
+  - apotiki
+  - app-lens
+  - appc
+  - ApplePush
+  - AppleScript
+  - applicative-fail
+  - applicative-parsec
+  - applicative-quoters
+  - applicative-splice
+  - approveapi
+  - ApproxFun-hs
+  - arb-fft
+  - arbb-vm
+  - arbor-datadog
+  - arbor-monad-metric
+  - arbor-monad-metric-datadog
+  - arbtt
+  - archiver
+  - archlinux
+  - archlinux-web
+  - archnews
+  - arduino-copilot
+  - arena
+  - arff
+  - arghwxhaskell
+  - argon
+  - argon2
+  - argparser
+  - arguedit
+  - ariadne
+  - arion
+  - armada
+  - armor
+  - arpa
+  - arpack
+  - array-forth
+  - array-primops
+  - arrayfire
+  - arraylist
+  - ArrayRef
+  - arrow-improve
+  - arrow-list
+  - arrowapply-utils
+  - arrowp
+  - arrowp-qq
+  - ArrowVHDL
+  - artery
+  - artifact
+  - asap
+  - ascetic
+  - ascii
+  - ascii-cows
+  - ascii-flatten
+  - ascii-string
+  - ascii-table
+  - ascii-vector-avc
+  - ascii85-conduit
+  - asic
+  - asil
+  - asn
+  - asn1-codec
+  - asn1-data
+  - AspectAG
+  - assert
+  - assertions
+  - asset-map
+  - assimp
+  - assumpta
+  - ast-monad
+  - ast-monad-json
+  - astrds
+  - astview
+  - async-combinators
+  - async-dejafu
+  - async-manager
+  - async-timer
+  - asynchronous-exceptions
+  - aterm
+  - aterm-utils
+  - atlassian-connect-core
+  - atlassian-connect-descriptor
+  - atmos-dimensional-tf
+  - atndapi
+  - atom-conduit
+  - atom-msp430
+  - atomic-modify
+  - atomic-primops-foreign
+  - atomic-primops-vector
+  - atomo
+  - atp-haskell
+  - ats-format
+  - ats-pkg
+  - ats-setup
+  - ats-storable
+  - attempt
+  - attic-schedule
+  - atto-lisp
+  - AttoBencode
+  - AttoJson
+  - attomail
+  - attoparsec-enumerator
+  - attoparsec-ip
+  - attoparsec-iteratee
+  - attoparsec-text
+  - attoparsec-text-enumerator
+  - attoparsec-trans
+  - attoparsec-uri
+  - attosplit
+  - Attrac
+  - atuin
+  - audiovisual
+  - augeas
+  - augur
+  - aur
+  - aur-api
+  - aura
+  - Aurochs
+  - authenticate-ldap
+  - authinfo-hs
+  - authoring
+  - AutoForms
+  - autom
+  - automata
+  - autonix-deps
+  - autonix-deps-kf5
+  - avatar-generator
+  - avers
+  - avers-api
+  - avers-api-docs
+  - avers-server
+  - avl-static
+  - AvlTree
+  - avr-shake
+  - avwx
+  - awesome-prelude
+  - awesomium
+  - awesomium-glut
+  - awesomium-raw
+  - aws
+  - aws-configuration-tools
+  - aws-dynamodb-conduit
+  - aws-dynamodb-streams
+  - aws-easy
+  - aws-ec2
+  - aws-ec2-knownhosts
+  - aws-elastic-transcoder
+  - aws-general
+  - aws-kinesis
+  - aws-kinesis-client
+  - aws-kinesis-reshard
+  - aws-lambda
+  - aws-lambda-haskell-runtime
+  - aws-mfa-credentials
+  - aws-performance-tests
+  - aws-route53
+  - aws-sdk
+  - aws-sdk-text-converter
+  - aws-sdk-xml-unordered
+  - aws-sign4
+  - aws-simple
+  - aws-sns
+  - axel
+  - axiom
+  - azubi
+  - azure-acs
+  - azure-email
+  - azure-service-api
+  - azure-servicebus
+  - azurify
+  - b-tree
+  - b9
+  - babylon
+  - backblaze-b2-hs
+  - backdropper
+  - backstop
+  - backtracking-exceptions
+  - backward-state
+  - bag
+  - Baggins
+  - bake
+  - ballast
+  - bamboo
+  - bamboo-launcher
+  - bamboo-plugin-highlight
+  - bamboo-plugin-photo
+  - bamboo-theme-blueprint
+  - bamboo-theme-mini-html5
+  - bamse
+  - bamstats
+  - Bang
+  - bank-holiday-usa
+  - bank-holidays-england
+  - banwords
+  - barchart
+  - barcodes-code128
+  - barecheck
+  - Barracuda
+  - barrie
+  - barrier
+  - barrier-monad
+  - base-compat-migrate
+  - base-feature-macros
+  - base-generics
+  - base-io-access
+  - base32-bytestring
+  - base64-conduit
+  - baserock-schema
+  - basex-client
+  - BASIC
+  - basic
+  - baskell
+  - batch
+  - batchd
+  - battlenet
+  - battlenet-yesod
+  - battleplace
+  - battleplace-api
+  - battleship-combinatorics
+  - battleships
+  - bayes-stack
+  - bazel-coverage-report-renderer
+  - bbi
+  - BCMtools
+  - bcp47
+  - bdcs
+  - bdcs-api
+  - bdd
+  - bdo
+  - beam
+  - beam-core
+  - beam-migrate
+  - beam-mysql
+  - beam-newtype-field
+  - beam-postgres
+  - beam-sqlite
+  - beam-th
+  - beamable
+  - bearriver
+  - beautifHOL
+  - bed-and-breakfast
+  - beeminder-api
+  - Befunge93
+  - bein
+  - belka
+  - BenchmarkHistory
+  - benchpress
+  - bencodex
+  - berkeleydb
+  - BerkeleyDBXML
+  - BerlekampAlgorithm
+  - berp
+  - bert
+  - besout
+  - bet
+  - betacode
+  - betris
+  - bff
+  - bgmax
+  - bgzf
+  - bhoogle
+  - bibdb
+  - bidirectionalization-combined
+  - bidispec
+  - bidispec-extras
+  - BiGUL
+  - billboard-parser
+  - billeksah-forms
+  - billeksah-main
+  - billeksah-pane
+  - billeksah-services
+  - binary-bits
+  - binary-communicator
+  - binary-derive
+  - binary-ext
+  - binary-file
+  - binary-indexed-tree
+  - binary-instances
+  - binary-protocol
+  - binary-protocol-zmq
+  - binary-search
+  - binary-streams
+  - binary-strict
+  - binary-tagged
+  - binary-typed
+  - bind-marshal
+  - binding-core
+  - binding-gtk
+  - binding-wx
+  - bindings-apr
+  - bindings-apr-util
+  - bindings-bfd
+  - bindings-cctools
+  - bindings-common
+  - bindings-dc1394
+  - bindings-eskit
+  - bindings-EsounD
+  - bindings-fann
+  - bindings-fluidsynth
+  - bindings-friso
+  - bindings-gsl
+  - bindings-hamlib
+  - bindings-hdf5
+  - bindings-K8055
+  - bindings-libftdi
+  - bindings-libg15
+  - bindings-librrd
+  - bindings-libstemmer
+  - bindings-libv4l2
+  - bindings-linux-videodev2
+  - bindings-monetdb-mapi
+  - bindings-mpdecimal
+  - bindings-ppdev
+  - bindings-sc3
+  - bindings-sipc
+  - bindings-wlc
+  - bindynamic
+  - binembed
+  - binembed-example
+  - bio
+  - bio-sequence
+  - bioace
+  - bioalign
+  - Biobase
+  - BiobaseBlast
+  - BiobaseDotP
+  - BiobaseENA
+  - BiobaseEnsembl
+  - BiobaseFasta
+  - BiobaseFR3D
+  - BiobaseHTTP
+  - BiobaseHTTPTools
+  - BiobaseInfernal
+  - BiobaseMAF
+  - BiobaseNewick
+  - BiobaseTrainingData
+  - BiobaseTurner
+  - BiobaseTypes
+  - BiobaseVienna
+  - BiobaseXNA
+  - biocore
+  - biofasta
+  - biofastq
+  - biohazard
+  - BioHMM
+  - bioinformatics-toolkit
+  - biophd
+  - biopsl
+  - biosff
+  - biostockholm
+  - birch-beer
+  - bird
+  - BirdPP
+  - bisect-binary
+  - bit-array
+  - bit-stream
+  - bitcoin-api
+  - bitcoin-api-extra
+  - bitcoin-block
+  - bitcoin-hs
+  - bitcoin-rpc
+  - bitcoin-script
+  - bitcoin-tx
+  - Bitly
+  - bitly-cli
+  - bitmaps
+  - bits-atomic
+  - bits-conduit
+  - bits-extras
+  - bitset
+  - bitspeak
+  - bitstream
+  - BitStringRandomMonad
+  - bittorrent
+  - bitx-bitcoin
+  - bizzlelude
+  - bizzlelude-js
+  - bkr
+  - bla
+  - blakesum
+  - blakesum-demo
+  - blas
+  - blas-hs
+  - BlastHTTP
+  - blastxml
+  - blatex
+  - blaze-builder-enumerator
+  - blaze-colonnade
+  - blaze-html-contrib
+  - blaze-html-hexpat
+  - blaze-html-truncate
+  - blaze-json
+  - blaze-textual-native
+  - blazeT
+  - ble
+  - blink1
+  - blip
+  - bliplib
+  - Blobs
+  - blockchain
+  - blockhash
+  - Blogdown
+  - blogination
+  - BlogLiterately
+  - BlogLiterately-diagrams
+  - bloodhound
+  - bloodhound-amazonka-auth
+  - bloomfilter-redis
+  - blosum
+  - bloxorz
+  - blubber
+  - blubber-server
+  - Blueprint
+  - bluetile
+  - bluetileutils
+  - blunk-hask-tests
+  - blunt
+  - bno055-haskell
+  - bogre-banana
+  - bolt
+  - boltzmann-brain
+  - bond
+  - bond-haskell
+  - bond-haskell-compiler
+  - bookkeeper
+  - bookkeeper-permissions
+  - Bookshelf
+  - boolexpr
+  - boombox
+  - boomslang
+  - boopadoop
+  - boots-app
+  - boots-cloud
+  - boots-web
+  - borel
+  - boring-window-switcher
+  - bot
+  - botpp
+  - bounded-array
+  - box
+  - braid
+  - brain-bleep
+  - Bravo
+  - breakout
+  - brians-brain
+  - brick-dropdownmenu
+  - bricks
+  - bricks-internal
+  - bricks-internal-test
+  - bricks-parsec
+  - bricks-rendering
+  - bricks-syntax
+  - brillig
+  - broccoli
+  - brok
+  - broker-haskell
+  - bronyradiogermany-common
+  - bronyradiogermany-streaming
+  - brotli
+  - brotli-conduit
+  - brotli-streams
+  - browscap
+  - bson
+  - bson-generic
+  - bson-generics
+  - bson-lens
+  - bsparse
+  - btree
+  - btree-concurrent
+  - buchhaltung
+  - buffer
+  - buffer-builder
+  - buffer-builder-aeson
+  - BufferedSocket
+  - buffet
+  - buffon
+  - bugzilla
+  - build
+  - buildable
+  - buildbox
+  - buildbox-tools
+  - buildwrapper
+  - bullet
+  - bulmex
+  - bumper
+  - bunz
+  - burnt-explorer
+  - burst-detection
+  - bus-pirate
+  - Buster
+  - buster
+  - buster-gtk
+  - buster-network
+  - butter
+  - butterflies
+  - bv-sized
+  - bytable
+  - bytearray-parsing
+  - bytestring-arbitrary
+  - bytestring-builder-varword
+  - bytestring-class
+  - bytestring-csv
+  - bytestring-handle
+  - bytestring-plain
+  - bytestring-read
+  - bytestring-rematch
+  - bytestring-show
+  - bytestring-substring
+  - bytestring-time
+  - bytestring-typenats
+  - bytestringparser
+  - bytestringparser-temporary
+  - bytestringreadp
+  - bzlib
+  - c-dsl
+  - c-io
+  - c-mosquitto
+  - c0check
+  - c0parser
+  - c10k
+  - c2ats
+  - c2hsc
+  - cabal-audit
+  - cabal-bounds
+  - cabal-bundle-clib
+  - cabal-cache
+  - cabal-cargs
+  - cabal-constraints
+  - cabal-db
+  - cabal-dependency-licenses
+  - cabal-dev
+  - cabal-dir
+  - cabal-file-th
+  - cabal-ghc-dynflags
+  - cabal-ghci
+  - cabal-graphdeps
+  - Cabal-ide-backend
+  - cabal-info
+  - cabal-install-bundle
+  - cabal-install-ghc72
+  - cabal-install-ghc74
+  - cabal-install-parsers
+  - cabal-lenses
+  - cabal-meta
+  - cabal-mon
+  - cabal-nirvana
+  - cabal-progdeps
+  - cabal-query
+  - cabal-setup
+  - cabal-sort
+  - cabal-src
+  - cabal-test
+  - cabal-toolkit
+  - cabal-upload
+  - cabal2arch
+  - cabal2doap
+  - cabal2ebuild
+  - cabal2ghci
+  - cabalgraph
+  - cabalish
+  - cabalmdvrpm
+  - cabalQuery
+  - cabalrpmdeps
+  - CabalSearch
+  - cabalvchk
+  - cabin
+  - cabocha
+  - cached
+  - cafeteria-prelude
+  - caffegraph
+  - cairo-core
+  - cake
+  - cake3
+  - cakyrespa
+  - cal-layout
+  - cal3d
+  - cal3d-examples
+  - cal3d-opengl
+  - calc
+  - calculator
+  - caldims
+  - caledon
+  - call
+  - call-alloy
+  - call-haskell-from-anything
+  - camfort
+  - campfire
+  - canon
+  - canonical-filepath
+  - canonical-json
+  - canteven-http
+  - canteven-listen-http
+  - canteven-log
+  - canteven-parsedate
+  - cantor
+  - cao
+  - cap
+  - Capabilities
+  - capability
+  - capnp
+  - capped-list
+  - capri
+  - car-pool
+  - caramia
+  - carbonara
+  - carboncopy
+  - carettah
+  - CarneadesDSL
+  - CarneadesIntoDung
+  - carte
+  - cartel
+  - Cartesian
+  - casa-abbreviations-and-acronyms
+  - casadi-bindings
+  - casadi-bindings-control
+  - casadi-bindings-core
+  - casadi-bindings-internal
+  - casadi-bindings-ipopt-interface
+  - casadi-bindings-snopt-interface
+  - Cascade
+  - cascading
+  - cases
+  - cash
+  - cassandra-cql
+  - Cassava
+  - cassava-conduit
+  - cassava-records
+  - cassette
+  - cassy
+  - castle
+  - casui
+  - catamorphism
+  - Catana
+  - catch-fd
+  - categorical-algebra
+  - category-extras
+  - category-traced
+  - catnplus
+  - cautious-file
+  - cautious-gen
+  - cayley-client
+  - CBOR
+  - CC-delcont-alt
+  - CC-delcont-cxe
+  - CC-delcont-exc
+  - CC-delcont-ref
+  - CC-delcont-ref-tf
+  - CCA
+  - cci
+  - ccnx
+  - cctools-workqueue
+  - cedict
+  - cef
+  - cef3-raw
+  - cef3-simple
+  - ceilometer-common
+  - cellrenderer-cairo
+  - celtchar
+  - cerberus
+  - cereal-derive
+  - cereal-enumerator
+  - cereal-ieee754
+  - cereal-io-streams
+  - cereal-plus
+  - cereal-streams
+  - cereal-time
+  - certificate
+  - cf
+  - cfipu
+  - cflp
+  - cfopu
+  - cg
+  - cgen
+  - cgi-utils
+  - cgrep
+  - chalkboard
+  - chalkboard-viewer
+  - charade
+  - chart-cli
+  - Chart-fltkhs
+  - chart-histogram
+  - Chart-simple
+  - chart-unit
+  - chatter
+  - chatty-text
+  - chatwork
+  - cheapskate-terminal
+  - check-pvp
+  - Checked
+  - checked
+  - checkmate
+  - chell-quickcheck
+  - chessIO
+  - chevalier-common
+  - chiasma
+  - chitauri
+  - Chitra
+  - choose
+  - choose-exe
+  - chorale
+  - chorale-geo
+  - chp
+  - chp-mtl
+  - chp-plus
+  - chp-spec
+  - chp-transformers
+  - chr-core
+  - chr-lang
+  - chr-parse
+  - ChristmasTree
+  - chromatin
+  - chronograph
+  - chu2
+  - chunks
+  - chunky
+  - church
+  - church-maybe
+  - cielo
+  - cil
+  - cinvoke
+  - cio
+  - cipher-blowfish
+  - ciphersaber2
+  - circlehs
+  - citation-resolve
+  - citeproc-hs
+  - citeproc-hs-pandoc-filter
+  - cj-token
+  - cjk
+  - clac
+  - clafer
+  - claferIG
+  - claferwiki
+  - clang-compilation-database
+  - clang-pure
+  - clanki
+  - clarifai
+  - CLASE
+  - clash
+  - clash-ghc
+  - clash-lib
+  - clash-multisignal
+  - Clash-Royale-Hack-Cheats
+  - clash-systemverilog
+  - clash-verilog
+  - clash-vhdl
+  - classify-frog
+  - ClassLaws
+  - classy-influxdb-simple
+  - classy-miso
+  - classy-parallel
+  - classyplate
+  - ClassyPrelude
+  - clckwrks
+  - clckwrks-cli
+  - clckwrks-dot-com
+  - clckwrks-plugin-bugs
+  - clckwrks-plugin-ircbot
+  - clckwrks-plugin-mailinglist
+  - clckwrks-plugin-media
+  - clckwrks-plugin-page
+  - clckwrks-theme-bootstrap
+  - clckwrks-theme-clckwrks
+  - clckwrks-theme-geo-bootstrap
+  - Clean
+  - clean-home
+  - clean-unions
+  - cless
+  - clevercss
+  - clexer
+  - CLI
+  - cli-builder
+  - clif
+  - clifford
+  - clifm
+  - clingo
+  - clippard
+  - clipper
+  - clippings
+  - clisparkline
+  - clit
+  - clocked
+  - clogparse
+  - clone-all
+  - closure
+  - cloud-haskell
+  - cloud-seeder
+  - cloudfront-signer
+  - clr-inline
+  - clua
+  - cluss
+  - ClustalParser
+  - clustering
+  - clustertools
+  - clutterhs
+  - cmark-highlight
+  - cmark-patterns
+  - cmark-sections
+  - cmath
+  - cmathml3
+  - CMCompare
+  - cmd-item
+  - cmdargs-browser
+  - cmdlib
+  - cmdtheline
+  - cmonad
+  - cmph
+  - cmptype
+  - CMQ
+  - cmt
+  - cmv
+  - cnc-spec-compiler
+  - co-log
+  - co-log-sys
+  - Coadjute
+  - coalpit
+  - cobot-io
+  - cobot-tools
+  - code-builder
+  - codec
+  - codec-beam
+  - codec-libevent
+  - codec-rpm
+  - codecov-haskell
+  - codemonitor
+  - codepad
+  - codeworld-api
+  - codex
+  - codo-notation
+  - coin
+  - coinbase-exchange
+  - coinbase-pro
+  - coincident-root-loci
+  - colada
+  - colchis
+  - collada-output
+  - collapse-duplication
+  - collapse-util
+  - collection-json
+  - collections
+  - collections-api
+  - collections-base-instances
+  - colonnade
+  - color-counter
+  - colorless
+  - colorless-http-client
+  - colorless-scotty
+  - colour-accelerate
+  - colour-space
+  - coltrane
+  - columbia
+  - columnar
+  - com
+  - comark-syntax
+  - combinat
+  - combinat-diagrams
+  - combinator-interactive
+  - combinatorial-problems
+  - Combinatorrent
+  - combobuffer
+  - comic
+  - Command
+  - commander
+  - Commando
+  - commodities
+  - commsec
+  - commsec-keyexchange
+  - ComonadSheet
+  - compact
+  - compact-map
+  - compact-mutable
+  - compact-mutable-vector
+  - compact-socket
+  - compact-string
+  - compact-string-fix
+  - Compactable
+  - compactable
+  - compdata
+  - compdata-automata
+  - compdata-dags
+  - compdata-param
+  - competition
+  - compilation
+  - complexity
+  - compose-trans
+  - composite-aeson
+  - composite-aeson-refined
+  - composite-base
+  - composite-ekg
+  - composite-opaleye
+  - composite-swagger
+  - composition-tree
+  - compound-types
+  - comprehensions-ghc
+  - compressed
+  - compstrat
+  - comptrans
+  - computational-algebra
+  - computational-geometry
+  - computations
+  - concraft
+  - concraft-hr
+  - concraft-pl
+  - concrete-haskell
+  - concrete-haskell-autogen
+  - concrete-relaxng-parser
+  - concrete-typerep
+  - concurrent-buffer
+  - Concurrent-Cache
+  - concurrent-machines
+  - concurrent-state
+  - concurrent-utilities
+  - Concurrential
+  - ConcurrentUtils
+  - Condor
+  - condor
+  - condorcet
+  - conductive-base
+  - conductive-hsc3
+  - conductive-song
+  - conduit-audio-lame
+  - conduit-audio-samplerate
+  - conduit-find
+  - conduit-iconv
+  - conduit-network-stream
+  - conduit-resumablesink
+  - conduit-throttle
+  - conduit-tokenize-attoparsec
+  - conduit-vfs
+  - conduit-vfs-zip
+  - conf
+  - confcrypt
+  - confetti
+  - conffmt
+  - confide
+  - config-parser
+  - config-select
+  - ConfigFile
+  - ConfigFileTH
+  - Configger
+  - configifier
+  - Configurable
+  - configuration
+  - configuration-tools
+  - configurator-ng
+  - configurator-pg
+  - confsolve
+  - congruence-relation
+  - conjure
+  - conkin
+  - conlogger
+  - connection-string
+  - connections
+  - Conscript
+  - consistent
+  - console-program
+  - const-math-ghc-plugin
+  - constr-eq
+  - constrained-categories
+  - constrained-category
+  - constrained-dynamic
+  - constrained-monads
+  - constraint-manip
+  - ConstraintKinds
+  - constraints-emerge
+  - constructible
+  - constructive-algebra
+  - consul-haskell
+  - Consumer
+  - consumers
+  - container
+  - containers-benchmark
+  - containers-unicode-symbols
+  - containers-verified
+  - ContArrow
+  - content-store
+  - context-free-grammar
+  - context-stack
+  - ContextAlgebra
+  - contiguous-checked
+  - continue
+  - continuum
+  - continuum-client
+  - Contract
+  - control
+  - control-iso
+  - control-monad-attempt
+  - control-monad-exception
+  - control-monad-exception-monadsfd
+  - control-monad-exception-monadstf
+  - control-monad-exception-mtl
+  - control-monad-failure
+  - control-monad-failure-mtl
+  - Control-Monad-MultiPass
+  - Control-Monad-ST2
+  - contstuff-monads-tf
+  - contstuff-transformers
+  - convert
+  - convert-annotation
+  - convertible-ascii
+  - convertible-text
+  - coordinate
+  - copilot
+  - copilot-cbmc
+  - copilot-language
+  - copilot-libraries
+  - copilot-sbv
+  - copilot-theorem
+  - copr
+  - COrdering
+  - core
+  - core-haskell
+  - corebot-bliki
+  - CoreDump
+  - CoreErlang
+  - CoreFoundation
+  - Coroutine
+  - coroutine-enumerator
+  - coroutine-iteratee
+  - coroutine-object
+  - couch-hs
+  - couch-simple
+  - CouchDB
+  - couchdb-conduit
+  - couchdb-enumerator
+  - countable-inflections
+  - counter
+  - country-codes
+  - courier
+  - court
+  - coverage
+  - coya
+  - cparsing
+  - CPBrainfuck
+  - cpio-conduit
+  - CPL
+  - cplusplus-th
+  - cprng-aes-effect
+  - cpuperf
+  - cpython
+  - cql-io
+  - cql-io-tinylog
+  - cqrs-core
+  - cqrs-example
+  - cqrs-memory
+  - cqrs-postgresql
+  - cqrs-sqlite3
+  - cqrs-test
+  - cqrs-testkit
+  - cr
+  - crack
+  - craft
+  - Craft3e
+  - craftwerk
+  - craftwerk-cairo
+  - craftwerk-gtk
+  - crawlchain
+  - craze
+  - crc
+  - crc16
+  - crdt
+  - creatur
+  - credential-store
+  - crf-chain1
+  - crf-chain1-constrained
+  - crf-chain2-generic
+  - crf-chain2-tiers
+  - critbit
+  - criterion-compare
+  - criterion-plus
+  - criterion-to-html
+  - criu-rpc
+  - criu-rpc-types
+  - crjdt-haskell
+  - crockford
+  - crocodile
+  - cron-compat
+  - cruncher-types
+  - crunghc
+  - crypto-cipher-benchmarks
+  - crypto-conduit
+  - crypto-multihash
+  - crypto-pubkey-openssh
+  - crypto-random-effect
+  - crypto-rng
+  - crypto-simple
+  - cryptocipher
+  - cryptocompare
+  - cryptoconditions
+  - cryptol
+  - cryptsy-api
+  - crystalfontz
+  - cse-ghc-plugin
+  - csg
+  - CSPM-cspm
+  - CSPM-FiringRules
+  - CSPM-Frontend
+  - CSPM-Interpreter
+  - CSPM-ToProlog
+  - cspmchecker
+  - cspretty
+  - css
+  - css-syntax
+  - csv-enumerator
+  - csv-nptools
+  - ctemplate
+  - ctkl
+  - ctpl
+  - cube
+  - cuboid
+  - cuckoo
+  - cudd
+  - currency-codes
+  - currency-convert
+  - curry-frontend
+  - CurryDB
+  - cursedcsv
+  - cursor-fuzzy-time-gen
+  - curve25519
+  - curves
+  - custom-prelude
+  - CV
+  - cypher
+  - d-bus
+  - d10
+  - d3js
+  - dag
+  - DAG-Tournament
+  - damnpacket
+  - Dangerous
+  - danibot
+  - Dao
+  - dao
+  - dapi
+  - darcs
+  - darcs-benchmark
+  - darcs-beta
+  - darcs-buildpackage
+  - darcs-cabalized
+  - darcs-fastconvert
+  - darcs-graph
+  - darcs-monitor
+  - darcs2dot
+  - darcsden
+  - DarcsHelpers
+  - darcswatch
+  - darkplaces-demo
+  - darkplaces-rcon
+  - darkplaces-rcon-util
+  - darkplaces-text
+  - dash-haskell
+  - data-accessor-monads-fd
+  - data-accessor-monads-tf
+  - data-accessor-template
+  - data-aviary
+  - data-base
+  - data-basic
+  - data-category
+  - data-check
+  - data-combinator-gen
+  - data-compat
+  - data-concurrent-queue
+  - data-construction
+  - data-cycle
+  - data-dispersal
+  - data-diverse-lens
+  - data-easy
+  - data-elf
+  - data-embed
+  - data-emoticons
+  - data-filepath
+  - data-fin
+  - data-fin-simple
+  - data-flagset
+  - data-forest
+  - data-ivar
+  - data-kiln
+  - data-layer
+  - data-lens
+  - data-lens-fd
+  - data-lens-ixset
+  - data-lens-template
+  - data-map-multikey
+  - data-msgpack
+  - data-msgpack-types
+  - data-nat
+  - data-object
+  - data-object-json
+  - data-object-yaml
+  - data-pprint
+  - data-quotientref
+  - data-reify-cse
+  - data-repr
+  - data-result
+  - data-rev
+  - Data-Rope
+  - data-rope
+  - data-rtuple
+  - data-size
+  - data-spacepart
+  - data-standards
+  - data-store
+  - data-stringmap
+  - data-structure-inferrer
+  - data-sword
+  - data-transform
+  - data-type
+  - data-util
+  - data-variant
+  - database-id-groundhog
+  - database-study
+  - datadog
+  - datadog-tracing
+  - datafix
+  - dataflow
+  - datalog
+  - datapacker
+  - datasets
+  - DataTreeView
+  - dataurl
+  - date-conversions
+  - dates
+  - datetime
+  - datetime-sb
+  - dawdle
+  - dawg
+  - dawg-ord
+  - dbcleaner
+  - dbf
+  - DBFunctor
+  - dbjava
+  - DBlimited
+  - dbm
+  - dbmigrations-mysql
+  - dbmigrations-postgresql
+  - dbmigrations-sqlite
+  - DBus
+  - dbus-client
+  - dbus-core
+  - dbus-qq
+  - dclabel
+  - dclabel-eci11
+  - dcpu16
+  - ddate
+  - ddc-base
+  - ddc-build
+  - ddc-code
+  - ddc-core
+  - ddc-core-babel
+  - ddc-core-eval
+  - ddc-core-flow
+  - ddc-core-llvm
+  - ddc-core-salt
+  - ddc-core-simpl
+  - ddc-core-tetra
+  - ddc-driver
+  - ddc-interface
+  - ddc-source-tetra
+  - ddc-tools
+  - ddc-war
+  - ddci-core
+  - dead-code-detection
+  - dead-simple-json
+  - Deadpan-DDP
+  - debug
+  - debug-me
+  - debug-trace-var
+  - debug-tracy
+  - decepticons
+  - decimal-arithmetic
+  - DecisionTree
+  - declarative
+  - decoder-conduit
+  - dedukti
+  - deepcontrol
+  - deeplearning-hs
+  - deepseq-bounded
+  - deepseq-magic
+  - deepseq-th
+  - deepzoom
+  - defargs
+  - DefendTheKing
+  - deka
+  - deka-tests
+  - delaunay
+  - delicious
+  - delimited-text
+  - delimiter-separated
+  - delta
+  - delta-h
+  - Delta-Lambda
+  - delude
+  - demarcate
+  - denominate
+  - dense-int-set
+  - dependent-monoidal-map
+  - dependent-state
+  - dependent-sum-aeson-orphans
+  - dependent-sum-template
+  - depends
+  - dephd
+  - deptrack-core
+  - deptrack-devops
+  - deptrack-dot
+  - derangement
+  - derivation-trees
+  - derive
+  - derive-enumerable
+  - derive-gadt
+  - derive-IG
+  - derive-monoid
+  - derive-storable-plugin
+  - derive-topdown
+  - derive-trie
+  - derp-lib
+  - describe
+  - descript-lang
+  - desert
+  - deterministic-game-engine
+  - detour-via-uom
+  - deunicode
+  - devil
+  - dewdrop
+  - dfinity-radix-tree
+  - Dflow
+  - dfsbuild
+  - dgim
+  - dgs
+  - dhall-check
+  - dhall-fly
+  - dhall-lsp-server
+  - dhall-nix
+  - dhall-text
+  - dhall-to-cabal
+  - dhcp-lease-parser
+  - dhrun
+  - dia-base
+  - dia-functions
+  - diagrams-boolean
+  - diagrams-builder
+  - diagrams-canvas
+  - diagrams-haddock
+  - diagrams-hsqml
+  - diagrams-html5
+  - diagrams-pandoc
+  - diagrams-pdf
+  - diagrams-qrcode
+  - diagrams-tikz
+  - diagrams-wx
+  - dialogflow-fulfillment
+  - dib
+  - dice
+  - dice-entropy-conduit
+  - dice2tex
+  - dicom
+  - dictionaries
+  - dictparser
+  - diet
+  - diff
+  - diffcabal
+  - difference-monoid
+  - DifferenceLogic
+  - differential
+  - DifferentialEvolution
+  - diffmap
+  - difftodo
+  - digestive-bootstrap
+  - digestive-foundation-lucid
+  - digestive-functors-aeson
+  - digestive-functors-happstack
+  - digestive-functors-hsp
+  - DigitalOcean
+  - digitalocean-kzs
+  - digits
+  - dimensional-codata
+  - dimensional-tf
+  - DimensionalHash
+  - dingo-core
+  - dingo-example
+  - dingo-widgets
+  - diophantine
+  - diplomacy
+  - diplomacy-server
+  - direct-binary-files
+  - direct-fastcgi
+  - direct-http
+  - direct-plugins
+  - direct-rocksdb
+  - directed-cubical
+  - direm
+  - dirfiles
+  - dirtree
+  - discogs-haskell
+  - discord-gateway
+  - discord-haskell
+  - discord-hs
+  - discord-rest
+  - discord-types
+  - discordian-calendar
+  - discrete
+  - DiscussionSupportSystem
+  - Dish
+  - disjoint-containers
+  - disjoint-set
+  - disjoint-set-stateful
+  - Dist
+  - dist-upload
+  - distance
+  - DisTract
+  - distributed-fork-aws-lambda
+  - distributed-process
+  - distributed-process-async
+  - distributed-process-azure
+  - distributed-process-client-server
+  - distributed-process-ekg
+  - distributed-process-execution
+  - distributed-process-extras
+  - distributed-process-fsm
+  - distributed-process-lifted
+  - distributed-process-monad-control
+  - distributed-process-p2p
+  - distributed-process-platform
+  - distributed-process-registry
+  - distributed-process-simplelocalnet
+  - distributed-process-supervisor
+  - distributed-process-systest
+  - distributed-process-task
+  - distributed-process-tests
+  - distributed-process-zookeeper
+  - distributed-static
+  - distribution
+  - distribution-plot
+  - diversity
+  - dixi
+  - djembe
+  - djinn-th
+  - dl-fedora
+  - dmenu
+  - dmenu-pkill
+  - dmenu-pmount
+  - dmenu-search
+  - DMuCheck
+  - DnaProteinAlignment
+  - dnscache
+  - dnsrbl
+  - dnssd
+  - doc-review
+  - doccheck
+  - docidx
+  - docker-build-cacher
+  - dockercook
+  - docopt
+  - DocTest
+  - doctest-discover-configurator
+  - doctest-driver-gen
+  - doctest-prop
+  - docusign-example
+  - docvim
+  - doi
+  - DOM
+  - dom-lt
+  - domain-auth
+  - domplate
+  - dot-linker
+  - dotfs
+  - doublify-toolkit
+  - dow
+  - download-media-content
+  - dozenal
+  - dozens
+  - DP
+  - dph-base
+  - dph-examples
+  - dph-lifted-base
+  - dph-lifted-copy
+  - dph-lifted-vseg
+  - dph-prim-interface
+  - dph-prim-par
+  - dph-prim-seq
+  - dpkg
+  - DPM
+  - dpor
+  - dragen
+  - drawille
+  - drClickOn
+  - dresdner-verkehrsbetriebe
+  - DrHylo
+  - DrIFT
+  - DrIFT-cabalized
+  - drifter
+  - drifter-postgresql
+  - drifter-sqlite
+  - drmaa
+  - drone
+  - dropbox-sdk
+  - dropsolve
+  - ds-kanren
+  - DSA
+  - DSH
+  - dsh-sql
+  - dsmc
+  - dsmc-tools
+  - dson
+  - dson-parsec
+  - DSTM
+  - dstring
+  - DTC
+  - dtd
+  - dtd-text
+  - dtw
+  - dual-game
+  - dualizer
+  - duet
+  - dumb-cas
+  - dump-core
+  - dunai
+  - dunai-core
+  - dunai-test
+  - Dung
+  - duplo
+  - dura
+  - Dust
+  - Dust-crypto
+  - Dust-tools
+  - Dust-tools-pcap
+  - dvault
+  - dvda
+  - dvdread
+  - dvi-processing
+  - dwarf
+  - dwarfadt
+  - dwergaz
+  - dyckword
+  - dyepack
+  - dynamic-cabal
+  - dynamic-graph
+  - dynamic-graphs
+  - dynamic-mvector
+  - dynamic-object
+  - dynamic-plot
+  - dynamic-pp
+  - DynamicTimeWarp
+  - dynamodb-simple
+  - dynloader
+  - dynobud
+  - DysFRP
+  - DysFRP-Cairo
+  - DysFRP-Craftwerk
+  - dywapitchtrack
+  - dzen-dhall
+  - dzen-utils
+  - earclipper
+  - ease
+  - easy-api
+  - easy-bitcoin
+  - easyjson
+  - easyplot
+  - easytest
+  - ebeats
+  - ebnf-bff
+  - eccrypto-ed25519-bindings
+  - ecma262
+  - ecu
+  - eddie
+  - edenmodules
+  - edenskel
+  - edentv
+  - edge
+  - edges
+  - EdisonAPI
+  - EdisonCore
+  - edit
+  - edit-lenses
+  - editable
+  - editline
+  - EditTimeReport
+  - effect-handlers
+  - effect-monad
+  - effect-stack
+  - effin
+  - egison-pattern-src-th-mode
+  - egison-quote
+  - ehaskell
+  - ehs
+  - eibd-client-simple
+  - eigen
+  - Eight-Ball-Pool-Hack-Cheats
+  - either-list-functions
+  - either-unwrap
+  - EitherT
+  - ekg
+  - ekg-bosun
+  - ekg-carbon
+  - ekg-cloudwatch
+  - ekg-core
+  - ekg-elastic
+  - ekg-elasticsearch
+  - ekg-influxdb
+  - ekg-json
+  - ekg-log
+  - ekg-prometheus-adapter
+  - ekg-push
+  - ekg-rrd
+  - ekg-statsd
+  - ekg-wai
+  - elerea-examples
+  - elevator
+  - elision
+  - elm-street
+  - elm-websocket
+  - elsa
+  - elynx-seq
+  - elynx-tools
+  - elynx-tree
+  - emacs-keys
+  - email
+  - email-header
+  - email-postmark
+  - emailparse
+  - embeddock
+  - embeddock-example
+  - embla
+  - embroidery
+  - emgm
+  - Emping
+  - Empty
+  - empty-monad
+  - enchant
+  - encoding
+  - encoding-io
+  - engine-io
+  - engine-io-growler
+  - engine-io-snap
+  - engine-io-wai
+  - engine-io-yesod
+  - entangle
+  - EntrezHTTP
+  - entwine
+  - enum-text
+  - enum-text-rio
+  - enum-utf8
+  - EnumContainers
+  - enumerate
+  - enumerate-function
+  - enumerator
+  - enumerator-fd
+  - enumerator-tf
+  - enumfun
+  - EnumMap
+  - enummapmap
+  - enummapset-th
+  - env-parser
+  - envstatus
+  - epanet-haskell
+  - epass
+  - epic
+  - epoll
+  - eprocess
+  - epubname
+  - Eq
+  - EqualitySolver
+  - erf-native
+  - erlang
+  - eros
+  - eros-client
+  - eros-http
+  - error-context
+  - error-continuations
+  - error-list
+  - error-loc
+  - error-message
+  - error-util
+  - errors-ext
+  - ersaconcat
+  - ersatz
+  - ersatz-toysat
+  - ert
+  - escoger
+  - esotericbot
+  - EsounD
+  - espial
+  - ess
+  - essence-of-live-coding
+  - essence-of-live-coding-gloss
+  - essence-of-live-coding-pulse
+  - essence-of-live-coding-quickcheck
+  - estimators
+  - EstProgress
+  - estreps
+  - Etage
+  - Etage-Graph
+  - EtaMOO
+  - eternal
+  - Eternal10Seconds
+  - eternity
+  - eternity-timestamped
+  - ether
+  - Etherbunny
+  - ethereum-analyzer
+  - ethereum-analyzer-cli
+  - ethereum-analyzer-webui
+  - ethereum-client-haskell
+  - ethereum-merkle-patricia-db
+  - eths-rlp
+  - euphoria
+  - eurofxref
+  - Euterpea
+  - eve
+  - eve-cli
+  - event
+  - event-driven
+  - event-monad
+  - eventful-dynamodb
+  - eventful-postgresql
+  - eventful-sql-common
+  - eventful-sqlite
+  - eventlog2html
+  - eventloop
+  - EventSocket
+  - eventsource-geteventstore-store
+  - eventstore
+  - every-bit-counts
+  - ewe
+  - exact-cover
+  - exact-real
+  - exact-real-positional
+  - except-exceptions
+  - exception-monads-fd
+  - exceptional
+  - exceptionfree-readfile
+  - exchangerates
+  - execs
+  - executor
+  - exference
+  - exherbo-cabal
+  - exif
+  - exinst
+  - exinst-aeson
+  - exinst-bytes
+  - exinst-cereal
+  - exinst-deepseq
+  - exinst-hashable
+  - exinst-serialise
+  - exists
+  - exitcode
+  - expand
+  - expat-enumerator
+  - expiring-containers
+  - explain
+  - explicit-constraint-lens
+  - explicit-determinant
+  - explicit-iomodes
+  - explicit-iomodes-bytestring
+  - explicit-iomodes-text
+  - explicit-sharing
+  - explore
+  - exposed-containers
+  - expression-parser
+  - expressions
+  - expressions-z3
+  - expresso
+  - extcore
+  - extemp
+  - extended-categories
+  - extensible-data
+  - extensible-effects-concurrent
+  - extensible-skeleton
+  - external-sort
+  - Extra
+  - extract-dependencies
+  - extractelf
+  - extralife
+  - ez-couch
+  - ez3
+  - f-algebra-gen
+  - f-ree-hack-cheats-free-v-bucks-generator
+  - Facebook-Password-Hacker-Online-Latest-Version
+  - faceted
+  - Facts
+  - facts
+  - factual-api
+  - fadno
+  - fadno-braids
+  - fadno-xml
+  - failable-list
+  - failure-detector
+  - FailureT
+  - fake-type
+  - faktory
+  - falling-turnip
+  - fallingblocks
+  - family-tree
+  - fast-arithmetic
+  - fast-combinatorics
+  - fast-digits
+  - fast-nats
+  - fasta
+  - fastbayes
+  - fastedit
+  - fastirc
+  - fastly
+  - fastparser
+  - FastPush
+  - FastxPipe
+  - fathead-util
+  - fault-tree
+  - fay
+  - fay-base
+  - fay-builder
+  - fay-dom
+  - fay-geoposition
+  - fay-hsx
+  - fay-jquery
+  - fay-ref
+  - fay-simplejson
+  - fay-text
+  - fay-uri
+  - fay-websockets
+  - fb-persistent
+  - fbmessenger-api
+  - fca
+  - fcache
+  - fcd
+  - fcg
+  - fckeditor
+  - fclabels-monadlib
+  - fcm-client
+  - FComp
+  - fdo-trash
+  - feature-flipper
+  - feature-flipper-postgres
+  - fedora-img-dl
+  - fedora-packages
+  - feed-cli
+  - feed-collect
+  - feed-crawl
+  - feed-gipeda
+  - feed-translator
+  - feed2lj
+  - feed2twitter
+  - fei-base
+  - fei-cocoapi
+  - fei-dataiter
+  - fei-examples
+  - fei-nn
+  - feldspar-compiler
+  - feldspar-language
+  - fenfire
+  - FermatsLastMargin
+  - fernet
+  - FerryCore
+  - festung
+  - Feval
+  - fez-conf
+  - ffeed
+  - fficxx
+  - ffmpeg-light
+  - ffmpeg-tutorials
+  - ffunctor
+  - fgl-extras-decompositions
+  - fib
+  - fibon
+  - ficketed
+  - fields
+  - fields-json
+  - FieldTrip
+  - fieldwise
+  - fig
+  - file-collection
+  - file-command-qq
+  - file-location
+  - file-modules
+  - filediff
+  - FileManip
+  - FileManipCompat
+  - fileneglect
+  - filepath-io-access
+  - FilePather
+  - filepather
+  - fileplow
+  - Files
+  - FileSystem
+  - filesystem-abstractions
+  - filesystem-conduit
+  - filesystem-enumerator
+  - filesystem-trees
+  - fillit
+  - final-pretty-printer
+  - Finance-Quote-Yahoo
+  - Finance-Treasury
+  - find-clumpiness
+  - find-conduit
+  - find-source-files
+  - findhttp
+  - fingertree-psqueue
+  - fingertree-tf
+  - finitary-derive
+  - FiniteMap
+  - firefly-example
+  - first-and-last
+  - first-class-instances
+  - firstify
+  - FirstOrderTheory
+  - fit
+  - fits-parse
+  - fitsio
+  - fix-parser-simple
+  - fix-symbols-gitit
+  - fixed-point
+  - fixed-point-vector
+  - fixed-point-vector-space
+  - fixed-precision
+  - fixed-storable-array
+  - fixed-timestep
+  - fixed-vector-binary
+  - fixed-vector-cborg
+  - fixed-vector-cereal
+  - fixed-width
+  - fixer
+  - fixfile
+  - fixhs
+  - fixie
+  - fizzbuzz
+  - fizzbuzz-as-a-service
+  - flac
+  - flac-picture
+  - flaccuraterip
+  - flamethrower
+  - flamingra
+  - flat
+  - flat-maybe
+  - flatbuffers
+  - flay
+  - flexible-time
+  - flexiwrap
+  - flexiwrap-smallcheck
+  - flickr
+  - Flippi
+  - flite
+  - float-binstring
+  - floating-bits
+  - floskell
+  - flow-er
+  - flow2dot
+  - flowdock
+  - flowdock-api
+  - flowdock-rest
+  - flower
+  - flowlocks-framework
+  - flowsim
+  - flp
+  - fltkhs-fluid-examples
+  - fluent-logger
+  - fluffy-parser
+  - fluidsynth
+  - flux-monoid
+  - FM-SBLEX
+  - fmark
+  - FModExRaw
+  - fmt-for-rio
+  - fn-extra
+  - Focus
+  - foldl-incremental
+  - foldl-statistics
+  - foldl-transduce
+  - foldl-transduce-attoparsec
+  - folds-common
+  - follow
+  - follower
+  - foma
+  - font-opengl-basic4x6
+  - foo
+  - for-free
+  - forbidden-fruit
+  - fordo
+  - forecast-io
+  - foreign-var
+  - forest
+  - forest-fire
+  - Forestry
+  - forger
+  - ForkableT
+  - formal
+  - FormalGrammars
+  - format
+  - format-status
+  - formattable
+  - forml
+  - formlets
+  - formlets-hsp
+  - formura
+  - ForSyDe
+  - forsyde-deep
+  - forth-hll
+  - Fortnite-Hack-Cheats-Free-V-Bucks-Generator
+  - fortran-src
+  - fortytwo
+  - foscam-directory
+  - foscam-filename
+  - foscam-sort
+  - Foster
+  - fpco-api
+  - fplll
+  - fpnla-examples
+  - FPretty
+  - fptest
+  - Fractaler
+  - fractals
+  - fraction
+  - frag
+  - Frames-beam
+  - franchise
+  - Frank
+  - fraxl
+  - freddy
+  - free-concurrent
+  - free-functors
+  - free-game
+  - free-http
+  - free-operational
+  - free-theorems
+  - free-theorems-counterexamples
+  - free-theorems-seq
+  - free-theorems-seq-webui
+  - free-theorems-webui
+  - free-v-bucks-generator-no-survey
+  - free-v-bucks-generator-ps4-no-survey
+  - freekick2
+  - freelude
+  - freer-converse
+  - freer-effects
+  - freer-simple-catching
+  - freer-simple-http
+  - freer-simple-profiling
+  - freer-simple-random
+  - freer-simple-time
+  - freesect
+  - freesound
+  - freetype-simple
+  - FreeTypeGL
+  - freq
+  - fresh
+  - friday-devil
+  - friday-scale-dct
+  - friendly
+  - front
+  - frown
+  - frp-arduino
+  - frpnow
+  - frpnow-gloss
+  - frpnow-gtk
+  - frpnow-gtk3
+  - frpnow-vty
+  - fs-events
+  - fsh-csv
+  - fsmActions
+  - fst
+  - fsutils
+  - fswait
+  - fswatch
+  - ft-generator
+  - ftdi
+  - FTGL-bytestring
+  - ftp-client
+  - ftp-client-conduit
+  - ftp-conduit
+  - ftphs
+  - FTPLine
+  - ftshell
+  - full-sessions
+  - fullstop
+  - funbot
+  - funbot-client
+  - funbot-git-hook
+  - funcons-lambda-cbv-mp
+  - funcons-simple
+  - funcons-tools
+  - funcons-values
+  - function-combine
+  - function-instances-algebra
+  - functional-arrow
+  - functor
+  - functor-infix
+  - functor-utils
+  - functorm
+  - funflow
+  - funflow-nix
+  - FunGEn
+  - Fungi
+  - funion
+  - funnyprint
+  - funpat
+  - funsat
+  - funspection
+  - fused-effects-squeal
+  - fusion
+  - futun
+  - future
+  - fuzzy-time-gen
+  - fuzzy-timings
+  - fwgl
+  - fwgl-glfw
+  - fwgl-javascript
+  - g-npm
+  - g2
+  - g2q
+  - g4ip
+  - gact
+  - game-probability
+  - gameclock
+  - gamgee
+  - Gamgine
+  - gamma
+  - Ganymede
+  - garepinoh
+  - gargoyle
+  - gargoyle-postgresql
+  - gas
+  - gbu
+  - gc-monitoring-wai
+  - gcodehs
+  - gconf
+  - gdax
+  - gdiff-ig
+  - gdiff-th
+  - GeBoP
+  - gedcom
+  - geek
+  - geek-server
+  - gegl
+  - gelatin
+  - gelatin-freetype2
+  - gelatin-fruity
+  - gelatin-gl
+  - gelatin-sdl2
+  - gelatin-shaders
+  - gemstone
+  - gen-imports
+  - gen-passwd
+  - Genbank
+  - gencheck
+  - gender
+  - genders
+  - Gene-CluEDO
+  - general-prelude
+  - GeneralTicTacToe
+  - generator
+  - generators
+  - generic-accessors
+  - generic-aeson
+  - generic-binary
+  - generic-church
+  - generic-enum
+  - generic-lens-labels
+  - generic-lucid-scaffold
+  - generic-maybe
+  - generic-pretty
+  - generic-server
+  - generic-storable
+  - generic-tree
+  - generic-trie
+  - generic-xml
+  - generics-mrsop
+  - generics-mrsop-gdiff
+  - genericserialize
+  - genesis
+  - genesis-test
+  - genetics
+  - GenI
+  - geni-gui
+  - geni-util
+  - geniconvert
+  - geniplate
+  - geniserver
+  - genprog
+  - GenSmsPdu
+  - gentlemark
+  - GenussFold
+  - genvalidity-mergeful
+  - geo-resolver
+  - geo-uk
+  - GeocoderOpenCage
+  - geodetic
+  - geodetic-types
+  - geojson-types
+  - geolite-csv
+  - geom2d
+  - GeomPredicates-SSE
+  - geos
+  - Get
+  - getemx
+  - getflag
+  - GGg
+  - ggtsTC
+  - gh-labeler
+  - ghc-core-smallstep
+  - ghc-datasize
+  - ghc-dump-core
+  - ghc-dump-tree
+  - ghc-dump-util
+  - ghc-dup
+  - ghc-events-parallel
+  - ghc-generic-instances
+  - ghc-imported-from
+  - ghc-instances
+  - ghc-man-completion
+  - ghc-mod
+  - ghc-parmake
+  - ghc-pkg-autofix
+  - ghc-pkg-lib
+  - ghc-proofs
+  - ghc-session
+  - ghc-simple
+  - ghc-srcspan-plugin
+  - ghc-syb
+  - ghc-syb-utils
+  - ghc-time-alloc-prof
+  - ghc-usage
+  - ghc-vis
+  - ghci-diagrams
+  - ghci-haskeline
+  - ghci-history-parser
+  - ghci-lib
+  - ghci-ng
+  - ghci-pretty
+  - ghcide
+  - ghcjs-dom-jsffi
+  - ghcjs-fetch
+  - ghcjs-hplay
+  - ghcjs-promise
+  - ghcjs-xhr
+  - ghclive
+  - ghcprofview
+  - ght
+  - gi-cairo-again
+  - gi-graphene
+  - gi-gsk
+  - gi-gstpbutils
+  - gi-gsttag
+  - gi-gtk-declarative
+  - gi-gtk-declarative-app-simple
+  - gi-gtkosxapplication
+  - gi-handy
+  - gi-poppler
+  - gi-secret
+  - gi-wnck
+  - giak
+  - Gifcurry
+  - ginger
+  - ginsu
+  - gipeda
+  - GiST
+  - gist
+  - git
+  - git-all
+  - git-checklist
+  - git-config
+  - git-date
+  - git-fmt
+  - git-gpush
+  - git-jump
+  - git-mediate
+  - git-monitor
+  - git-object
+  - git-remote-ipfs
+  - git-repair
+  - git-sanity
+  - gitdo
+  - github
+  - github-backup
+  - github-data
+  - github-release
+  - github-tools
+  - github-utils
+  - github-webhook-handler
+  - github-webhook-handler-snap
+  - github-webhooks
+  - githud
+  - gitignore
+  - gitit
+  - gitlab-api
+  - gitlib
+  - gitlib-cmdline
+  - gitlib-cross
+  - gitlib-libgit2
+  - gitlib-s3
+  - gitlib-sample
+  - gitlib-test
+  - gitlib-utils
+  - gitson
+  - gitter
+  - glade
+  - gladexml-accessor
+  - glapp
+  - glazier
+  - glazier-pipes
+  - glazier-react
+  - glazier-react-examples
+  - glazier-react-widget
+  - GLFW
+  - GLFW-b-demo
+  - GLFW-OGL
+  - GLFW-task
+  - gli
+  - glicko
+  - glider-nlp
+  - glirc
+  - GLMatrix
+  - glob-posix
+  - global
+  - global-config
+  - global-variables
+  - glome-hs
+  - GlomeTrace
+  - GlomeView
+  - gloss-accelerate
+  - gloss-algorithms
+  - gloss-banana
+  - gloss-devil
+  - gloss-examples
+  - gloss-export
+  - gloss-game
+  - gloss-raster
+  - gloss-sodium
+  - glpk-hs
+  - glue
+  - glue-common
+  - glue-core
+  - glue-ekg
+  - glue-example
+  - GLUtil
+  - gmap
+  - gmndl
+  - gnome-desktop
+  - gnomevfs
+  - gnss-converters
+  - gnuidn
+  - goa
+  - goal-core
+  - goal-geometry
+  - goal-probability
+  - goal-simulation
+  - goatee
+  - goatee-gtk
+  - gochan
+  - godot-haskell
+  - gofer-prelude
+  - gooey
+  - google-cloud
+  - google-drive
+  - google-html5-slide
+  - google-mail-filters
+  - google-oauth2
+  - google-oauth2-easy
+  - google-search
+  - google-server-api
+  - google-translate
+  - GoogleCodeJam
+  - GoogleDirections
+  - googleplus
+  - googlepolyline
+  - GoogleSB
+  - GoogleTranslate
+  - gopherbot
+  - gore-and-ash
+  - gore-and-ash-actor
+  - gore-and-ash-async
+  - gore-and-ash-demo
+  - gore-and-ash-glfw
+  - gore-and-ash-lambdacube
+  - gore-and-ash-logging
+  - gore-and-ash-network
+  - gore-and-ash-sdl
+  - gore-and-ash-sync
+  - GotoT-transformers
+  - gotta-go-fast
+  - gpah
+  - GPipe
+  - GPipe-Collada
+  - GPipe-Examples
+  - GPipe-GLFW
+  - GPipe-TextureLoad
+  - gps
+  - gps2htmlReport
+  - GPX
+  - gpx-conduit
+  - grab
+  - grab-form
+  - graceful
+  - grafana
+  - graflog
+  - Grafos
+  - grakn
+  - grammar-combinators
+  - GrammarProducts
+  - grapefruit-examples
+  - grapefruit-frp
+  - grapefruit-records
+  - grapefruit-ui
+  - grapefruit-ui-gtk
+  - graph-core
+  - graph-matchings
+  - graph-rewriting
+  - graph-rewriting-cl
+  - graph-rewriting-gl
+  - graph-rewriting-lambdascope
+  - graph-rewriting-layout
+  - graph-rewriting-ski
+  - graph-rewriting-strategies
+  - graph-rewriting-trs
+  - graph-rewriting-ww
+  - graph-serialize
+  - graph-utils
+  - graph-visit
+  - Graph500
+  - graphbuilder
+  - graphene
+  - GraphHammer
+  - GraphHammer-examples
+  - graphics-drawingcombinators
+  - graphics-formats-collada
+  - graphicsFormats
+  - graphicstools
+  - graphmod-plugin
+  - graphql
+  - graphql-w-persistent
+  - graphted
+  - graphtype
+  - graql
+  - grasp
+  - gray-code
+  - greencard
+  - greencard-lib
+  - greg-client
+  - gremlin-haskell
+  - Grempa
+  - grenade
+  - grid-proto
+  - gridbounds
+  - gridland
+  - grm
+  - groot
+  - gross
+  - GroteTrap
+  - groundhog-converters
+  - group-with
+  - grouped-list
+  - groups-generic
+  - growler
+  - GrowlNotify
+  - grpc-api-etcd
+  - grpc-etcd-client
+  - grpc-haskell
+  - grpc-haskell-core
+  - gruff
+  - gruff-examples
+  - gscholar-rss
+  - gsl-random
+  - gsl-random-fu
+  - gstorable
+  - gstreamer
+  - gt-tools
+  - GTALib
+  - gtfs
+  - gtfs-realtime
+  - gtk-jsinput
+  - gtk-serialized-event
+  - gtk-sni-tray
+  - gtk-toy
+  - gtk2hs-hello
+  - gtk2hs-rpn
+  - Gtk2hsGenerics
+  - gtk3-mac-integration
+  - gtkglext
+  - GtkGLTV
+  - gtkimageview
+  - gtkrsync
+  - gtksourceview2
+  - gtksourceview3
+  - guarded-rewriting
+  - guess-combinator
+  - guid
+  - GuiHaskell
+  - GuiTV
+  - gulcii
+  - gw
+  - gyah-bin
+  - H
+  - h-booru
+  - h-gpgme
+  - h-reversi
+  - h2048
+  - h2c
+  - haar
+  - habit
+  - hablo
+  - HABQT
+  - Hach
+  - hack-contrib
+  - hack-contrib-press
+  - hack-frontend-happstack
+  - hack-handler-cgi
+  - hack-handler-epoll
+  - hack-handler-evhttp
+  - hack-handler-fastcgi
+  - hack-handler-happstack
+  - hack-handler-hyena
+  - hack-handler-kibro
+  - hack-handler-simpleserver
+  - hack-middleware-cleanpath
+  - hack-middleware-clientsession
+  - hack-middleware-jsonp
+  - hack2-handler-happstack-server
+  - hack2-handler-mongrel2-http
+  - hack2-handler-snap-server
+  - hack2-handler-warp
+  - hackage-diff
+  - hackage-mirror
+  - hackage-processing
+  - hackage-proxy
+  - hackage-repo-tool
+  - hackage-security-HTTP
+  - hackage-server
+  - hackage-whatsnew
+  - hackage2hwn
+  - hackage2twitter
+  - hackager
+  - hackernews
+  - HackMail
+  - hackmanager
+  - hackport
+  - hactor
+  - hactors
+  - haddock-cheatsheet
+  - haddock-leksah
+  - haddock-test
+  - haddocset
+  - hadolint
+  - hadoop-formats
+  - hadoop-rpc
+  - hadoop-tools
+  - hafar
+  - haggis
+  - Haggressive
+  - hahp
+  - haiji
+  - hail
+  - hailgun-send
+  - hairy
+  - hakaru
+  - hakismet
+  - hakka
+  - hako
+  - hakyll-agda
+  - hakyll-blaze-templates
+  - hakyll-contrib
+  - hakyll-contrib-csv
+  - hakyll-contrib-elm
+  - hakyll-contrib-links
+  - hakyll-convert
+  - hakyll-dir-list
+  - hakyll-filestore
+  - hakyll-ogmarkup
+  - hakyll-R
+  - hakyll-series
+  - hakyll-shortcode
+  - hakyll-shortcut-links
+  - hakyll-typescript
+  - hal
+  - halberd
+  - HaLeX
+  - halfs
+  - halipeto
+  - halive
+  - hall-symbols
+  - halma-gui
+  - halma-telegram-bot
+  - halves
+  - HaMinitel
+  - hampp
+  - hamsql
+  - hamtmap
+  - hamusic
+  - handa-gdata
+  - handle-like
+  - HandlerSocketClient
+  - handsy
+  - Hangman
+  - hannahci
+  - hans
+  - hans-pcap
+  - haphviz
+  - hapistrano
+  - happindicator
+  - happindicator3
+  - happlets
+  - happlets-lib-gtk
+  - happraise
+  - HAppS-Data
+  - happs-hsp
+  - happs-hsp-template
+  - HAppS-IxSet
+  - HAppS-Server
+  - HAppS-State
+  - happs-tutorial
+  - HAppS-Util
+  - happstack
+  - happstack-auth
+  - happstack-authenticate
+  - happstack-clientsession
+  - happstack-contrib
+  - happstack-data
+  - happstack-dlg
+  - happstack-facebook
+  - happstack-fay
+  - happstack-fay-ajax
+  - happstack-foundation
+  - happstack-hamlet
+  - happstack-heist
+  - happstack-helpers
+  - happstack-hstringtemplate
+  - happstack-ixset
+  - happstack-jmacro
+  - happstack-lite
+  - happstack-monad-peel
+  - happstack-plugins
+  - happstack-server-tls-cryptonite
+  - happstack-state
+  - happstack-static-routing
+  - happstack-util
+  - happstack-yui
+  - happy-hour
+  - happybara
+  - happybara-webkit
+  - happybara-webkit-server
+  - HappyTree
+  - hapstone
+  - HaPy
+  - haquery
+  - haquil
+  - harchive
+  - hArduino
+  - hardware-edsl
+  - HaRe
+  - harg
+  - hark
+  - harmony
+  - HarmTrace
+  - haroonga
+  - haroonga-httpd
+  - harpy
+  - harvest-api
+  - has
+  - has-th
+  - hasbolt
+  - hasbolt-extras
+  - HasCacBDD
+  - hascar
+  - hascas
+  - Haschoo
+  - HasGP
+  - hash
+  - hashable-extras
+  - hashable-generics
+  - hashable-orphans
+  - hashabler
+  - hashed-storage
+  - Hashell
+  - hashflare
+  - hashring
+  - hashtables-plus
+  - hasim
+  - hask
+  - hask-home
+  - haskarrow
+  - haskbot-core
+  - haskdeep
+  - haskdogs
+  - haskeem
+  - haskeline-class
+  - haskelisp
+  - haskell-abci
+  - haskell-aliyun
+  - haskell-awk
+  - haskell-bitmex-client
+  - haskell-bitmex-rest
+  - haskell-brainfuck
+  - haskell-ci
+  - haskell-cnc
+  - haskell-coffee
+  - haskell-compression
+  - haskell-course-preludes
+  - haskell-debug-adapter
+  - haskell-disque
+  - haskell-docs
+  - haskell-eigen-util
+  - haskell-exp-parser
+  - haskell-formatter
+  - haskell-ftp
+  - haskell-generate
+  - haskell-go-checkers
+  - haskell-in-space
+  - haskell-kubernetes
+  - haskell-lsp
+  - haskell-lsp-client
+  - haskell-lsp-types
+  - haskell-ml
+  - haskell-mpfr
+  - haskell-names
+  - haskell-neo4j-client
+  - haskell-openflow
+  - haskell-overridez
+  - haskell-packages
+  - haskell-pdf-presenter
+  - haskell-platform-test
+  - haskell-player
+  - haskell-plot
+  - haskell-postal
+  - haskell-read-editor
+  - haskell-reflect
+  - haskell-rules
+  - haskell-spacegoo
+  - haskell-src-exts-observe
+  - haskell-src-exts-prisms
+  - haskell-src-exts-qq
+  - haskell-src-exts-sc
+  - haskell-src-exts-simple
+  - haskell-src-meta-mwotton
+  - haskell-stack-trace-plugin
+  - haskell-to-elm
+  - haskell-token-utils
+  - haskell-tools-ast
+  - haskell-tools-ast-fromghc
+  - haskell-tools-ast-gen
+  - haskell-tools-ast-trf
+  - haskell-tools-backend-ghc
+  - haskell-tools-builtin-refactorings
+  - haskell-tools-cli
+  - haskell-tools-daemon
+  - haskell-tools-debug
+  - haskell-tools-demo
+  - haskell-tools-experimental-refactorings
+  - haskell-tools-prettyprint
+  - haskell-tools-refactor
+  - haskell-tools-rewrite
+  - haskell-tor
+  - haskell-type-exts
+  - haskell-typescript
+  - haskell-tyrant
+  - haskell-xmpp
+  - haskell2010
+  - haskell2020
+  - haskell98
+  - haskell98libraries
+  - haskelldb
+  - haskelldb-connect-hdbc
+  - haskelldb-connect-hdbc-catchio-mtl
+  - haskelldb-connect-hdbc-catchio-tf
+  - haskelldb-connect-hdbc-catchio-transformers
+  - haskelldb-connect-hdbc-lifted
+  - haskelldb-dynamic
+  - haskelldb-flat
+  - haskelldb-hdbc
+  - haskelldb-hdbc-mysql
+  - haskelldb-hdbc-odbc
+  - haskelldb-hdbc-postgresql
+  - haskelldb-hdbc-sqlite3
+  - haskelldb-hsql
+  - haskelldb-hsql-mysql
+  - haskelldb-hsql-odbc
+  - haskelldb-hsql-postgresql
+  - haskelldb-hsql-sqlite3
+  - haskelldb-th
+  - haskelldb-wx
+  - HaskellLM
+  - HaskellNet
+  - HaskellNet-SSL
+  - HaskellNN
+  - Haskelloids
+  - haskellscrabble
+  - haskellscript
+  - HaskellTorrent
+  - HaskellTutorials
+  - haskelzinc
+  - haskeme
+  - haskey
+  - haskey-mtl
+  - haskgame
+  - haskheap
+  - haskhol-core
+  - haskmon
+  - haskoin
+  - haskoin-bitcoind
+  - haskoin-core
+  - haskoin-crypto
+  - haskoin-node
+  - haskoin-protocol
+  - haskoin-script
+  - haskoin-store
+  - haskoin-util
+  - haskoin-wallet
+  - haskoon
+  - haskoon-httpspec
+  - haskoon-salvia
+  - haskore
+  - haskore-realtime
+  - haskore-supercollider
+  - haskore-synthesizer
+  - HaskRel
+  - hasktags
+  - hasktorch
+  - hasktorch-codegen
+  - hasktorch-ffi-th
+  - hasktorch-ffi-thc
+  - hasktorch-indef
+  - hasktorch-signatures
+  - hasktorch-signatures-partial
+  - hasktorch-signatures-support
+  - hasktorch-zoo
+  - haskus-binary
+  - haskus-system-build
+  - haskus-utils
+  - haskus-utils-compat
+  - haskus-web
+  - haskyapi
+  - haslo
+  - hasloGUI
+  - hasparql-client
+  - hasql-backend
+  - hasql-class
+  - hasql-cursor-query
+  - hasql-cursor-transaction
+  - hasql-dynamic-statements
+  - hasql-generic
+  - hasql-implicits
+  - hasql-migration
+  - hasql-optparse-applicative
+  - hasql-pool
+  - hasql-postgres
+  - hasql-postgres-options
+  - hasql-simple
+  - hastache
+  - hastache-aeson
+  - haste
+  - haste-app
+  - haste-lib
+  - haste-markup
+  - haste-prim
+  - Hastodon
+  - Hate
+  - hatex-guide
+  - HaTeX-meta
+  - HaTeX-qq
+  - hats
+  - hatt
+  - haven
+  - haverer
+  - HaVSA
+  - hawitter
+  - Hawk
+  - hax
+  - haxl
+  - haxl-amazonka
+  - haxl-facebook
+  - haxparse
+  - haxr-th
+  - haxy
+  - hayland
+  - Hayoo
+  - hayoo-cli
+  - hback
+  - hbayes
+  - hbb
+  - hbcd
+  - hBDD-CMUBDD
+  - hBDD-CUDD
+  - hbeanstalk
+  - hbeat
+  - hbf
+  - hblas
+  - hblock
+  - hburg
+  - hcad
+  - HCard
+  - hcc
+  - hcg-minus
+  - hcg-minus-cairo
+  - hcheat
+  - hcheckers
+  - hchesslib
+  - HCL
+  - hcltest
+  - hcoap
+  - hcom
+  - hcoord
+  - hcron
+  - hCsound
+  - hcube
+  - hdaemonize-buildfix
+  - hdbc-aeson
+  - HDBC-mysql
+  - HDBC-postgresql-hstore
+  - hdbc-postgresql-hstore
+  - hdbi
+  - hdbi-conduit
+  - hdbi-postgresql
+  - hdbi-sqlite
+  - hdbi-tests
+  - hdevtools
+  - hdf
+  - hDFA
+  - hdiff
+  - hdigest
+  - hdirect
+  - hdis86
+  - hdiscount
+  - hdm
+  - hdo
+  - hdocs
+  - hdph
+  - hdph-closure
+  - hdr-histogram
+  - HDRUtils
+  - headergen
+  - headroom
+  - heapsort
+  - heart-app
+  - heart-core
+  - heatitup
+  - heatitup-complete
+  - heavy-log-shortcuts
+  - heavy-logger
+  - heavy-logger-amazon
+  - heavy-logger-instances
+  - hebrew-time
+  - hecc
+  - heckle
+  - hedgehog-checkers
+  - hedgehog-checkers-lens
+  - hedgehog-classes
+  - hedgehog-gen
+  - hedgehog-gen-json
+  - hedgehog-generic
+  - hedgehog-golden
+  - Hedi
+  - hedis-config
+  - hedis-pile
+  - hedis-simple
+  - hedis-tags
+  - hedn
+  - hedn-functor
+  - hedra
+  - hein
+  - heist-aeson
+  - heist-async
+  - helics
+  - helics-wai
+  - helisp
+  - helium
+  - helix
+  - hell
+  - hellage
+  - hellnet
+  - help-esb
+  - hemkay
+  - hemokit
+  - hen
+  - henet
+  - hepevt
+  - her-lexer
+  - her-lexer-parsec
+  - HERA
+  - herbalizer
+  - HerbiePlugin
+  - heredocs
+  - herf-time
+  - Hermes
+  - hermit
+  - hermit-syb
+  - herms
+  - heroku-persistent
+  - herringbone
+  - herringbone-embed
+  - herringbone-wai
+  - hesh
+  - hesql
+  - hetero-dict
+  - heterogeneous-list-literals
+  - heterolist
+  - hetris
+  - heukarya
+  - hevm
+  - hevolisa
+  - hevolisa-dph
+  - hex
+  - HExcel
+  - hexchat
+  - hexif
+  - hexmino
+  - hexml-lens
+  - hexpat-iteratee
+  - hexpat-pickle-generic
+  - hexpr
+  - hexpress
+  - hexquote
+  - hext
+  - heyefi
+  - heyting-algebras
+  - hF2
+  - hfann
+  - hfd
+  - hfiar
+  - HFitUI
+  - hfmt
+  - hfoil
+  - hfov
+  - hfractal
+  - HFrequencyQueue
+  - hfusion
+  - hg-buildpackage
+  - hgalib
+  - hgdbmi
+  - HGE2D
+  - hgearman
+  - hGelf
+  - hgen
+  - hgeometric
+  - hgeometry-ipe
+  - hgeometry-svg
+  - hgeos
+  - hgettext
+  - hgis
+  - hgithub
+  - hgom
+  - hgopher
+  - HGraphStorage
+  - hgrep
+  - hgrib
+  - hharp
+  - HHDL
+  - hhp
+  - hhwloc
+  - hi3status
+  - hiccup
+  - hichi
+  - hid-examples
+  - hidden-char
+  - hie-bios
+  - hie-core
+  - hieraclus
+  - hierarchical-exceptions
+  - hierarchical-spectral-clustering
+  - hierarchy
+  - hiernotify
+  - Hieroglyph
+  - higgledy
+  - HiggsSet
+  - higherorder
+  - highjson
+  - highjson-swagger
+  - highjson-th
+  - highlight-versions
+  - highWaterMark
+  - hills
+  - himg
+  - himpy
+  - hindent
+  - hindley-milner
+  - hinduce-classifier
+  - hinduce-classifier-decisiontree
+  - hinduce-examples
+  - hinquire
+  - hinstaller
+  - hint-server
+  - hinter
+  - hinterface
+  - hinvaders
+  - hinze-streams
+  - hipbot
+  - hipchat-hs
+  - hipe
+  - Hipmunk-Utils
+  - hircules
+  - hirt
+  - Hish
+  - hissmetrics
+  - hist-pl
+  - hist-pl-dawg
+  - hist-pl-fusion
+  - hist-pl-lexicon
+  - hist-pl-lmf
+  - hist-pl-types
+  - historian
+  - hit
+  - hit-graph
+  - hit-on
+  - HJavaScript
+  - hjcase
+  - hjs
+  - HJScript
+  - hjson-query
+  - hjsonpointer
+  - hjsonschema
+  - hjugement-cli
+  - HJVM
+  - hkd-delta
+  - hkd-lens
+  - hkt
+  - hlatex
+  - hlbfgsb
+  - hlcm
+  - HLearn-algebra
+  - HLearn-approximation
+  - HLearn-classification
+  - HLearn-datastructures
+  - HLearn-distributions
+  - hledger-api
+  - hlibBladeRF
+  - hlibev
+  - hlibfam
+  - HList
+  - HListPP
+  - hlivy
+  - HLogger
+  - hlogger
+  - hlongurl
+  - hls
+  - hlwm
+  - hly
+  - hmark
+  - hmarkup
+  - hmatrix-banded
+  - hmatrix-mmap
+  - hmatrix-morpheus
+  - hmatrix-nipals
+  - hmatrix-sparse
+  - hmatrix-static
+  - hmatrix-sundials
+  - hmatrix-svdlibc
+  - hmatrix-syntax
+  - hmatrix-tests
+  - hmeap
+  - hmeap-utils
+  - hmenu
+  - hmep
+  - hmk
+  - HMM
+  - hmm
+  - hmm-hmatrix
+  - hmm-lapack
+  - hMollom
+  - hmp3
+  - Hmpf
+  - hmt
+  - hmt-diagrams
+  - hmumps
+  - hnetcdf
+  - hnix
+  - hnix-store-core
+  - hnix-store-remote
+  - HNM
+  - hnormalise
+  - ho-rewriting
+  - hoauth
+  - hob
+  - hobbes
+  - hobbits
+  - hocilib
+  - hocker
+  - hodatime
+  - HODE
+  - hoe
+  - Hoed
+  - hOff-display
+  - hog
+  - hogg
+  - hoggl
+  - hogre
+  - hogre-examples
+  - hois
+  - hol
+  - hold-em
+  - hole
+  - Holumbus-Searchengine
+  - holy-project
+  - homeomorphic
+  - hommage
+  - homoiconic
+  - homotuple
+  - homplexity
+  - HongoDB
+  - honi
+  - hoobuddy
+  - hood
+  - hood-off
+  - hood2
+  - hoodie
+  - hoodle
+  - hoodle-builder
+  - hoodle-core
+  - hoodle-extra
+  - hoodle-parser
+  - hoodle-publish
+  - hoodle-render
+  - hoodle-types
+  - hoogle-index
+  - hooks-dir
+  - hookup
+  - hoopl
+  - hoovie
+  - hopencc
+  - hopencl
+  - hOpenPGP
+  - hopenpgp-tools
+  - hopfield
+  - hoppy-docs
+  - hoppy-generator
+  - hoppy-std
+  - hops
+  - hoq
+  - horizon
+  - horname
+  - hosc-json
+  - hosts-server
+  - hothasktags
+  - hotswap
+  - hourglass-fuzzy-parsing
+  - houseman
+  - hp2any-core
+  - hp2any-graph
+  - hp2any-manager
+  - hpack-convert
+  - hpack-dhall
+  - hpaco
+  - hpaco-lib
+  - hpage
+  - hpapi
+  - hpaste
+  - hpasteit
+  - HPath
+  - hpc-coveralls
+  - hpc-tracer
+  - hPDB
+  - hPDB-examples
+  - HPDF
+  - hpdft
+  - hpg
+  - HPi
+  - hpio
+  - hplaylist
+  - HPlot
+  - hpodder
+  - HPong
+  - hpqtypes
+  - hpqtypes-extras
+  - hprotoc
+  - hprotoc-fork
+  - hps
+  - hps-cairo
+  - hps-kmeans
+  - hPushover
+  - hpygments
+  - hpylos
+  - hpyrg
+  - hpython
+  - hquantlib
+  - hquantlib-time
+  - hR
+  - hranker
+  - HRay
+  - hreq-client
+  - hreq-conduit
+  - Hricket
+  - hricket
+  - hriemann
+  - HROOT
+  - HROOT-core
+  - HROOT-graf
+  - HROOT-hist
+  - HROOT-io
+  - HROOT-math
+  - HROOT-tree
+  - hs-blake2
+  - hs-brotli
+  - hs-carbon-examples
+  - hs-cdb
+  - hs-conllu
+  - hs-di
+  - hs-dotnet
+  - hs-excelx
+  - hs-ffmpeg
+  - hs-fltk
+  - hs-gchart
+  - hs-gen-iface
+  - hs-gizapp
+  - hs-java
+  - hs-json-rpc
+  - hs-logo
+  - hs-mesos
+  - hs-nombre-generator
+  - hs-pattrans
+  - hs-pgms
+  - hs-pkg-config
+  - hs-pkpass
+  - hs-re
+  - hs-rs-notify
+  - hs-scrape
+  - hs-server-starter
+  - hs-snowtify
+  - hs-twitter
+  - hs-twitterarchiver
+  - hs-vcard
+  - hs-watchman
+  - hs2bf
+  - Hs2lib
+  - hs2ps
+  - hS3
+  - hsaml2
+  - hsay
+  - hsbackup
+  - hsbc
+  - hsbencher
+  - hsbencher-codespeed
+  - hsbencher-fusion
+  - hsc3-auditor
+  - hsc3-cairo
+  - hsc3-data
+  - hsc3-db
+  - hsc3-dot
+  - hsc3-forth
+  - hsc3-graphs
+  - hsc3-lang
+  - hsc3-lisp
+  - hsc3-plot
+  - hsc3-process
+  - hsc3-rec
+  - hsc3-rw
+  - hsc3-server
+  - hsc3-sf
+  - hsc3-sf-hsndfile
+  - hsc3-unsafe
+  - hsc3-utils
+  - hscaffold
+  - hscamwire
+  - hscassandra
+  - hscd
+  - hsclock
+  - hscope
+  - hScraper
+  - hscuid
+  - hsdev
+  - hsdif
+  - hsdip
+  - hsdns-cache
+  - Hsed
+  - hsenv
+  - HSet
+  - hsexif
+  - hsfacter
+  - hsfcsh
+  - HSFFIG
+  - hsfilt
+  - hsforce
+  - HSGEP
+  - hsgnutls
+  - hsgnutls-yj
+  - hsgsom
+  - HSH
+  - HsHaruPDF
+  - HSHHelpers
+  - HsHTSLib
+  - HsHyperEstraier
+  - hsI2C
+  - hsignal
+  - hSimpleDB
+  - hsimport
+  - HsJudy
+  - hskeleton
+  - hslackbuilder
+  - hslibsvm
+  - hslinks
+  - hslogger-reader
+  - hslogger-template
+  - hslogstash
+  - hsluv-haskell
+  - hsmagick
+  - HSmarty
+  - hsmodetweaks
+  - Hsmtlib
+  - hsmtpclient
+  - hsnock
+  - hsns
+  - hsnsq
+  - hsntp
+  - HSoM
+  - hsoptions
+  - HSoundFile
+  - hsoz
+  - hsp-cgi
+  - hsparql
+  - HsParrot
+  - hspear
+  - hspec-expectations-match
+  - hspec-expectations-pretty
+  - hspec-experimental
+  - hspec-hashable
+  - hspec-hedgehog
+  - hspec-jenkins
+  - hspec-monad-control
+  - hspec-pg-transact
+  - hspec-setup
+  - hspec-shouldbe
+  - hspec-snap
+  - hspec-structured-formatter
+  - hspec-test-sandbox
+  - hspec-webdriver
+  - hspec2
+  - hspecVariant
+  - HsPerl5
+  - hspkcs11
+  - hspread
+  - hspresent
+  - hsprocess
+  - hsql
+  - hsql-mysql
+  - hsql-odbc
+  - hsql-postgresql
+  - hsql-sqlite3
+  - hsqml
+  - hsqml-datamodel
+  - hsqml-datamodel-vinyl
+  - hsqml-demo-manic
+  - hsqml-demo-morris
+  - hsqml-demo-notes
+  - hsqml-demo-samples
+  - hsqml-morris
+  - hsreadability
+  - hsrelp
+  - hsseccomp
+  - hsSqlite3
+  - hssqlppp
+  - hssqlppp-th
+  - HsSVN
+  - hstatistics
+  - hstats
+  - hstatsd
+  - hstest
+  - hstidy
+  - hstorchat
+  - hstox
+  - hstradeking
+  - HStringTemplateHelpers
+  - hstyle
+  - hstzaar
+  - hsubconvert
+  - hsudoku
+  - HsWebots
+  - hswip
+  - hsx
+  - hsx-jmacro
+  - hsx-xhtml
+  - hsXenCtrl
+  - hsyscall
+  - hsyslog-tcp
+  - hsyslog-udp
+  - hszephyr
+  - HTab
+  - hTalos
+  - htar
+  - htdp-image
+  - hTensor
+  - htestu
+  - HTF
+  - HTicTacToe
+  - htiled
+  - htlset
+  - html-charset
+  - html-kure
+  - html-parse
+  - html-rules
+  - html-tokenizer
+  - hts
+  - htsn
+  - htsn-import
+  - htssets
+  - http-attoparsec
+  - http-client-auth
+  - http-client-lens
+  - http-client-request-modifiers
+  - http-client-restricted
+  - http-client-session
+  - http-client-streams
+  - http-conduit-browser
+  - http-directory
+  - http-dispatch
+  - http-enumerator
+  - http-grammar
+  - http-io-streams
+  - http-kinder
+  - http-listen
+  - http-monad
+  - http-pony
+  - http-pony-serve-wai
+  - http-proxy
+  - http-querystring
+  - http-response-decoder
+  - http-server
+  - http-shed
+  - http-trace
+  - http-wget
+  - http2-client
+  - http2-client-exe
+  - http2-client-grpc
+  - http2-grpc-proto3-wire
+  - https-everywhere-rules
+  - https-everywhere-rules-raw
+  - httpspec
+  - htune
+  - htvm
+  - htzaar
+  - huck
+  - HueAPI
+  - huff
+  - huffman
+  - hugs2yc
+  - hulk
+  - HulkImport
+  - human-parse
+  - human-text
+  - hums
+  - HUnit-Diff
+  - hunit-gui
+  - hunit-rematch
+  - hunp
+  - hunspell-hs
+  - hunt-searchengine
+  - hunt-server
+  - hup
+  - hurdle
+  - hurl
+  - hurriyet
+  - husk-scheme
+  - husk-scheme-libs
+  - husky
+  - hutton
+  - huttons-razor
+  - huzzy
+  - hvega-theme
+  - hVOIDP
+  - hw-ci-assist
+  - hwall-auth-iitk
+  - hweblib
+  - hwhile
+  - hworker
+  - hworker-ses
+  - hwormhole
+  - hws
+  - hwsl2
+  - hwsl2-bytevector
+  - hwsl2-reducers
+  - hx
+  - HXMPP
+  - hxmppc
+  - hxournal
+  - HXQ
+  - hxt-pickle-utils
+  - hxthelper
+  - hxweb
+  - hyahtzee
+  - hyakko
+  - hybrid
+  - hydra-hs
+  - hydra-print
+  - Hydrogen
+  - hydrogen
+  - hydrogen-cli
+  - hydrogen-cli-args
+  - hydrogen-data
+  - hydrogen-multimap
+  - hydrogen-parsing
+  - hydrogen-prelude
+  - hydrogen-prelude-parsec
+  - hydrogen-syntax
+  - hydrogen-util
+  - hyena
+  - hylide
+  - hylolib
+  - hylotab
+  - hyloutils
+  - hyper
+  - hyper-extra
+  - hyper-haskell-server
+  - hyperdrive
+  - hyperfunctions
+  - hyperion
+  - hyperloglogplus
+  - hyperpublic
+  - hypher
+  - hzulip
+  - i18n
+  - I1M
+  - i3blocks-hs-contrib
+  - i3ipc
+  - iap-verifier
+  - ib-api
+  - iban
+  - ical
+  - iCalendar
+  - icepeak
+  - IcoGrid
+  - iconv-typed
+  - ide-backend
+  - ide-backend-common
+  - ide-backend-server
+  - ideas
+  - ideas-math
+  - ideas-math-types
+  - idempotent
+  - identicon-style-squares
+  - identifiers
+  - idiii
+  - idna2008
+  - idringen
+  - idris
+  - IDynamic
+  - ieee-utils
+  - iexcloud
+  - ifcxt
+  - IFS
+  - ig
+  - ige
+  - ige-mac-integration
+  - ignore
+  - igraph
+  - igrf
+  - ihaskell-basic
+  - ihaskell-display
+  - ihaskell-inline-r
+  - ihaskell-parsec
+  - ihaskell-plot
+  - ihaskell-rlangqq
+  - ihaskell-widgets
+  - ihttp
+  - illuminate
+  - imagepaste
+  - imap
+  - imapget
+  - imbib
+  - imgur
+  - imgurder
+  - imj-animation
+  - imj-base
+  - imj-game-hamazed
+  - imj-measure-stdout
+  - imj-prelude
+  - imm
+  - imparse
+  - imperative-edsl
+  - imperative-edsl-vhdl
+  - ImperativeHaskell
+  - impl
+  - implicit-logging
+  - implicit-params
+  - importify
+  - imports
+  - impossible
+  - imprint
+  - improve
+  - INblobs
+  - inch
+  - inchworm
+  - incremental-computing
+  - incremental-maps
+  - increments
+  - indentation
+  - indentation-core
+  - indentation-parsec
+  - indentation-trifecta
+  - index-core
+  - indexation
+  - IndexedList
+  - indextype
+  - indices
+  - indieweb-algorithms
+  - inf-interval
+  - infer-upstream
+  - infernal
+  - infernu
+  - infinity
+  - infix
+  - InfixApplicative
+  - inflist
+  - informative
+  - ini-qq
+  - inilist
+  - initialize
+  - inject-function
+  - inline-java
+  - inline-r
+  - inserts
+  - inspector-wrecker
+  - instana-haskell-trace-sdk
+  - instance-map
+  - instant-aeson
+  - instant-bytes
+  - instant-deepseq
+  - instant-generics
+  - instant-hashable
+  - instant-zipper
+  - instapaper-sender
+  - instinct
+  - int-multimap
+  - integer-pure
+  - integreat
+  - intel-aes
+  - interlude-l
+  - InternedData
+  - internetmarke
+  - intero
+  - interp
+  - interpol
+  - interpolatedstring-qq
+  - interpolatedstring-qq-mwotton
+  - interpolatedstring-qq2
+  - interruptible
+  - interval
+  - IntFormats
+  - intro-prelude
+  - introduction
+  - introduction-test
+  - intset
+  - invertible-grammar
+  - invertible-hlist
+  - invertible-syntax
+  - io-capture
+  - io-choice
+  - io-reactive
+  - ioctl
+  - ion
+  - IOR
+  - IORefCAS
+  - iostring
+  - iothread
+  - iotransaction
+  - ip
+  - ip2location
+  - ip2proxy
+  - ipatch
+  - ipc
+  - ipfs
+  - ipld-cid
+  - ipopt-hs
+  - ipprint
+  - iptables-helpers
+  - iptadmin
+  - IPv6DB
+  - Irc
+  - irc-dcc
+  - irc-fun-bot
+  - irc-fun-client
+  - irc-fun-color
+  - irc-fun-messages
+  - irc-fun-types
+  - ircbot
+  - iri
+  - iridium
+  - iron-mq
+  - ironforge
+  - irt
+  - isdicom
+  - isevaluated
+  - ismtp
+  - IsNull
+  - iso8601-duration
+  - isobmff
+  - isobmff-builder
+  - isohunt
+  - isotope
+  - itcli
+  - itemfield
+  - iter-stats
+  - iteratee
+  - iteratee-compress
+  - iteratee-mtl
+  - iteratee-parsec
+  - iteratee-stm
+  - iterIO
+  - iterio-server
+  - iterm-show-diagrams
+  - iterm-show-JuicyPixels
+  - ivor
+  - ivory
+  - ivory-backend-c
+  - ivory-bitdata
+  - ivory-eval
+  - ivory-examples
+  - ivory-hw
+  - ivory-opts
+  - ivory-quickcheck
+  - ivory-serialize
+  - ivory-stdlib
+  - ivy-web
+  - ixdopp
+  - ixmonad
+  - ixset-typed
+  - ixshader
+  - iyql
+  - j2hs
+  - jack-bindings
+  - JackMiniMix
+  - jackminimix
+  - jacobi-roots
+  - jaeger-flamegraph
+  - jail
+  - jalaali
+  - jalla
+  - jarfind
+  - jarify
+  - jason
+  - java-bridge
+  - java-bridge-extras
+  - java-character
+  - java-reflect
+  - javascript-bridge
+  - Javasf
+  - javasf
+  - Javav
+  - javav
+  - jbi
+  - jcdecaux-vls
+  - Jdh
+  - jdi
+  - jenga
+  - jenkinsPlugins2nix
+  - jespresso
+  - jinquantities
+  - jmacro
+  - jmacro-rpc
+  - jmacro-rpc-happstack
+  - jmacro-rpc-snap
+  - jml-web-service
+  - jmonkey
+  - jni
+  - jobqueue
+  - jobs-ui
+  - join
+  - join-api
+  - joinlist
+  - jonathanscard
+  - jot
+  - jpeg
+  - js-good-parts
+  - jsaddle-hello
+  - jsaddle-warp
+  - jsaddle-wkwebview
+  - JsContracts
+  - jsmw
+  - json
+  - json-assertions
+  - json-ast-json-encoder
+  - json-ast-quickcheck
+  - json-autotype
+  - json-b
+  - json-builder
+  - json-bytes-builder
+  - JSON-Combinator
+  - JSON-Combinator-Examples
+  - json-directory
+  - json-encoder
+  - json-enumerator
+  - json-extra
+  - json-fu
+  - json-incremental-decoder
+  - json-litobj
+  - json-pointer-hasql
+  - json-python
+  - json-rpc-client
+  - json-schema
+  - json-sop
+  - json-togo
+  - json-tokens
+  - json-tracer
+  - json2
+  - json2-hdbc
+  - json5hs
+  - JSONb
+  - jsonextfilter
+  - JsonGrammar
+  - jsonresume
+  - jsonrpc-conduit
+  - jsons-to-schema
+  - jsonsql
+  - jsontsv
+  - jsonxlsx
+  - jspath
+  - juandelacosa
+  - judge
+  - judy
+  - juicy-gcode
+  - JuicyPixels-blp
+  - JuicyPixels-canvas
+  - JunkDB
+  - JunkDB-driver-gdbm
+  - JunkDB-driver-hashtables
+  - jupyter
+  - JuPyTer-notebook
+  - JustParse
+  - jvm
+  - jvm-batching
+  - jvm-binary
+  - jvm-parser
+  - jvm-streaming
+  - JYU-Utils
+  - kademlia
+  - kafka-client
+  - kafka-client-sync
+  - kafka-device
+  - kafka-device-glut
+  - kafka-device-joystick
+  - kafka-device-leap
+  - kafka-device-spacenav
+  - kafka-device-vrpn
+  - kaleidoscope
+  - Kalman
+  - kalman
+  - kangaroo
+  - kansas-lava
+  - kansas-lava-cores
+  - kansas-lava-papilio
+  - kansas-lava-shake
+  - karakuri
+  - karps
+  - katip-datadog
+  - katip-elasticsearch
+  - katip-kafka
+  - katip-rollbar
+  - katip-scalyr-scribe
+  - katip-syslog
+  - katt
+  - katydid
+  - kawaii
+  - kawhi
+  - kd-tree
+  - kdesrc-build-extra
+  - keccak
+  - keera-hails-i18n
+  - keera-hails-mvc-environment-gtk
+  - keera-hails-mvc-model-lightmodel
+  - keera-hails-mvc-model-protectedmodel
+  - keera-hails-mvc-solutions-gtk
+  - keera-hails-reactive-fs
+  - keera-hails-reactive-gtk
+  - keera-hails-reactive-network
+  - keera-hails-reactive-polling
+  - keera-hails-reactive-wx
+  - keera-hails-reactive-yampa
+  - keera-hails-reactivelenses
+  - keera-hails-reactivevalues
+  - kerry
+  - Ketchup
+  - keter
+  - kevin
+  - keyed
+  - keyring
+  - keysafe
+  - keystore
+  - keyvaluehash
+  - keyword-args
+  - khph
+  - kicad-data
+  - kickass-torrents-dump-parser
+  - kickchan
+  - kif-parser
+  - kit
+  - kmeans-par
+  - kmeans-vector
+  - kmp-dfa
+  - knead
+  - knead-arithmetic
+  - knit-haskell
+  - knots
+  - koellner-phonetic
+  - kontra-config
+  - korfu
+  - kqueue
+  - kraken
+  - krapsh
+  - Kriens
+  - krpc
+  - ks-test
+  - KSP
+  - ktx
+  - kubernetes-client
+  - kubernetes-client-core
+  - kuifje
+  - kure
+  - kure-your-boilerplate
+  - kurita
+  - KyotoCabinet
+  - l-bfgs-b
+  - L-seed
+  - labeled-graph
+  - laborantin-hs
+  - labsat
+  - labyrinth
+  - labyrinth-server
+  - lagrangian
+  - laika
+  - lambda-bridge
+  - lambda-calculator
+  - lambda-canvas
+  - lambda-devs
+  - lambda-options
+  - lambda-toolbox
+  - lambda2js
+  - lambdaBase
+  - lambdabot
+  - lambdabot-core
+  - lambdabot-haskell-plugins
+  - lambdabot-irc-plugins
+  - lambdabot-misc-plugins
+  - lambdabot-novelty-plugins
+  - lambdabot-reference-plugins
+  - lambdabot-social-plugins
+  - lambdabot-trusted
+  - lambdabot-utils
+  - lambdabot-zulip
+  - lambdacms-core
+  - lambdacms-media
+  - lambdacube
+  - lambdacube-bullet
+  - lambdacube-compiler
+  - lambdacube-core
+  - lambdacube-edsl
+  - lambdacube-engine
+  - lambdacube-examples
+  - lambdacube-gl
+  - lambdacube-ir
+  - lambdacube-samples
+  - LambdaDesigner
+  - lambdaFeed
+  - LambdaHack
+  - LambdaINet
+  - Lambdajudge
+  - lambdaLit
+  - LambdaNet
+  - LambdaPrettyQuote
+  - LambdaShell
+  - lambdatex
+  - lambdatwit
+  - Lambdaya
+  - lambdaya-bus
+  - lambdiff
+  - lame
+  - lame-tester
+  - lang
+  - language-bash
+  - language-boogie
+  - language-c-comments
+  - language-c-inline
+  - language-conf
+  - language-csharp
+  - language-css
+  - language-dart
+  - language-docker
+  - language-dockerfile
+  - language-ecmascript-analysis
+  - language-eiffel
+  - language-elm
+  - language-gcl
+  - language-go
+  - language-guess
+  - language-hcl
+  - language-java-classfile
+  - language-kort
+  - language-lua
+  - language-lua-qq
+  - language-lua2
+  - language-mixal
+  - language-ninja
+  - language-oberon
+  - language-objc
+  - language-ocaml
+  - language-openscad
+  - language-pig
+  - language-python
+  - language-python-colour
+  - language-python-test
+  - language-qux
+  - language-rust
+  - language-sh
+  - language-spelling
+  - language-sqlite
+  - language-sygus
+  - language-thrift
+  - language-typescript
+  - language-vhdl
+  - language-webidl
+  - lapack
+  - large-hashable
+  - Lastik
+  - lat
+  - latest-npm-version
+  - latex-formulae-hakyll
+  - latex-formulae-pandoc
+  - latex-live-snippets
+  - LATS
+  - launchdarkly-server-sdk
+  - launchpad-control
+  - lawless-concurrent-machines
+  - layered-state
+  - layers
+  - layers-game
+  - layout
+  - layout-bootstrap
+  - layouting
+  - lazy-hash
+  - lazy-hash-cache
+  - lazy-io-streams
+  - lazy-priority-queue
+  - lazyarray
+  - lazyboy
+  - lazyset
+  - LazyVault
+  - ld-intervals
+  - lda
+  - ldap-client
+  - ldapply
+  - ldif
+  - leaf
+  - leaky
+  - lean
+  - leanpub-wreq
+  - leapseconds
+  - learn
+  - learn-physics-examples
+  - Learning
+  - learning-hmm
+  - leetify
+  - legion
+  - legion-discovery
+  - legion-discovery-client
+  - legion-extra
+  - leksah-server
+  - lendingclub
+  - lens-accelerate
+  - lens-core
+  - lens-filesystem
+  - lens-labels
+  - lens-prelude
+  - lens-simple
+  - lens-text-encoding
+  - lens-time
+  - lens-toml-parser
+  - lens-tutorial
+  - lens-typelevel
+  - lens-utils
+  - lensref
+  - lentil
+  - level-monad
+  - Level0
+  - levmar
+  - levmar-chart
+  - lex-applicative
+  - lfst
+  - lgtk
+  - lha
+  - lhae
+  - lhc
+  - lhe
+  - lhs2TeX-hl
+  - lhslatex
+  - LibClang
+  - libconfig
+  - libcspm
+  - libexpect
+  - libGenI
+  - libhbb
+  - libinfluxdb
+  - libjenkins
+  - liblastfm
+  - liblawless
+  - liblinear-enumerator
+  - libltdl
+  - libmodbus
+  - libmolude
+  - liboath-hs
+  - liboleg
+  - libpafe
+  - libpq
+  - libraft
+  - librandomorg
+  - librato
+  - libssh2
+  - libssh2-conduit
+  - libsystemd-daemon
+  - libsystemd-journal
+  - libtagc
+  - libxls
+  - libxml-enumerator
+  - libxslt
+  - licensor
+  - lie
+  - life-sync
+  - lifted-base-tf
+  - lifted-protolude
+  - lifted-stm
+  - lifter
+  - ligature
+  - lightning-haskell
+  - lightstep-haskell
+  - lighttpd-conf
+  - lighttpd-conf-qq
+  - lilypond
+  - Limit
+  - limp-cbc
+  - linda
+  - linden
+  - line-bot-sdk
+  - linear-accelerate
+  - linear-algebra-cblas
+  - linear-circuit
+  - linear-code
+  - linear-maps
+  - linear-opengl
+  - linear-vect
+  - linearEqSolver
+  - linearmap-category
+  - linearscan
+  - linearscan-hoopl
+  - LinearSplit
+  - lines-of-action
+  - LinkChecker
+  - linkchk
+  - linkcore
+  - linked-list-with-iterator
+  - linkedhashmap
+  - linode
+  - linode-v4
+  - linux-blkid
+  - linux-cgroup
+  - linux-inotify
+  - linux-kmod
+  - linux-perf
+  - linux-ptrace
+  - linx-gateway
+  - lio
+  - lio-eci11
+  - lio-fs
+  - lio-simple
+  - lipsum-gen
+  - liquid
+  - liquid-fixpoint
+  - liquidhaskell
+  - liquidhaskell-cabal
+  - list-fusion-probe
+  - list-mux
+  - list-prompt
+  - list-remote-forwards
+  - list-t
+  - list-t-attoparsec
+  - list-t-html-parser
+  - list-t-http-client
+  - list-t-libcurl
+  - list-t-text
+  - list-tries
+  - list-tuple
+  - list-zip-def
+  - list-zipper
+  - listenbrainz-client
+  - listlike-instances
+  - ListT
+  - liszt
+  - lit
+  - literals
+  - live-sequencer
+  - ll-picosat
+  - llsd
+  - llvm
+  - llvm-analysis
+  - llvm-base
+  - llvm-base-types
+  - llvm-base-util
+  - llvm-data-interop
+  - llvm-extension
+  - llvm-extra
+  - llvm-ffi
+  - llvm-ffi-tools
+  - llvm-general
+  - llvm-general-pure
+  - llvm-general-quote
+  - llvm-hs
+  - llvm-hs-pretty
+  - llvm-ht
+  - llvm-pkg-config
+  - llvm-pretty
+  - llvm-pretty-bc-parser
+  - llvm-tf
+  - llvm-tools
+  - lmonad
+  - lmonad-yesod
+  - load-balancing
+  - load-font
+  - loc
+  - loc-test
+  - local-address
+  - local-search
+  - localize
+  - located
+  - located-monad-logger
+  - loch
+  - locked-poll
+  - log
+  - log-elasticsearch
+  - log-postgres
+  - log-utils
+  - log-warper
+  - log2json
+  - logentries
+  - logger
+  - logging-effect-extra
+  - logging-effect-extra-file
+  - logging-effect-extra-handler
+  - logging-facade-journald
+  - Logic
+  - logic-classes
+  - LogicGrowsOnTrees
+  - LogicGrowsOnTrees-MPI
+  - LogicGrowsOnTrees-network
+  - LogicGrowsOnTrees-processes
+  - logicst
+  - logict-state
+  - logplex-parse
+  - lojban
+  - lojbanParser
+  - lojbanXiragan
+  - lojysamban
+  - lol
+  - lol-apps
+  - lol-benches
+  - lol-calculus
+  - lol-cpp
+  - lol-repa
+  - lol-tests
+  - lol-typing
+  - loli
+  - longboi
+  - lookup-tables
+  - loop-effin
+  - loop-while
+  - looper
+  - loops
+  - loopy
+  - lord
+  - lorem
+  - lorentz
+  - loris
+  - loshadka
+  - lostcities
+  - loup
+  - lowgl
+  - lp-diagrams
+  - lp-diagrams-svg
+  - LRU
+  - ls-usb
+  - lscabal
+  - LslPlus
+  - lsp-test
+  - lsystem
+  - ltext
+  - ltk
+  - lua-bc
+  - luachunk
+  - luautils
+  - lucid-colonnade
+  - lucienne
+  - Lucu
+  - luhn
+  - lui
+  - luis-client
+  - luka
+  - luminance
+  - luminance-samples
+  - lushtags
+  - luthor
+  - lvish
+  - lvmlib
+  - lxc
+  - lxd-client
+  - lye
+  - Lykah
+  - lz4-bytes
+  - lz4-conduit
+  - lzma-enumerator
+  - lzma-streams
+  - maam
+  - mac
+  - macbeth-lib
+  - machinecell
+  - machines-amazonka
+  - machines-binary
+  - machines-bytestring
+  - machines-directory
+  - machines-encoding
+  - machines-io
+  - machines-process
+  - machines-zlib
+  - macho
+  - maclight
+  - macos-corelibs
+  - macosx-make-standalone
+  - madlang
+  - mage
+  - magic-tyfams
+  - magic-wormhole
+  - magicbane
+  - MagicHaskeller
+  - magico
+  - magma
+  - mahoro
+  - maid
+  - mail-pool
+  - mailbox-count
+  - mailchimp
+  - mailchimp-subscribe
+  - MailchimpSimple
+  - mailgun
+  - majordomo
+  - majority
+  - make-hard-links
+  - make-monofoldable-foldable
+  - make-package
+  - makedo
+  - makefile
+  - mallard
+  - manatee
+  - manatee-anything
+  - manatee-core
+  - manatee-curl
+  - manatee-editor
+  - manatee-filemanager
+  - manatee-imageviewer
+  - manatee-ircclient
+  - manatee-mplayer
+  - manatee-pdfviewer
+  - manatee-processmanager
+  - manatee-template
+  - manatee-terminal
+  - manatee-welcome
+  - mandulia
+  - mangopay
+  - manifold-random
+  - manifolds
+  - map-exts
+  - mapalgebra
+  - Mapping
+  - mappy
+  - marionetta
+  - markdown-kate
+  - markdown-pap
+  - markdown2svg
+  - marked-pretty
+  - markov-processes
+  - markov-realization
+  - markup
+  - marmalade-upload
+  - marquise
+  - mars
+  - marvin
+  - marvin-interpolate
+  - marxup
+  - masakazu-bot
+  - MASMGen
+  - master-plan
+  - matchable
+  - matchable-th
+  - matchers
+  - math-grads
+  - math-interpolate
+  - math-metric
+  - mathblog
+  - mathflow
+  - mathista
+  - mathlink
+  - matrix-as-xyz
+  - matrix-market
+  - matsuri
+  - maude
+  - maxent
+  - maxent-learner-hw
+  - maxent-learner-hw-gui
+  - maxsharing
+  - maybench
+  - MaybeT
+  - MaybeT-monads-tf
+  - MaybeT-transformers
+  - MazesOfMonad
+  - MBot
+  - mbox-tools
+  - mbtiles
+  - mbug
+  - MC-Fold-DP
+  - mcl
+  - mcm
+  - mcmaster-gloss-examples
+  - mcmc-samplers
+  - mcmc-synthesis
+  - mcpi
+  - mdapi
+  - mdcat
+  - mDNSResponder-client
+  - mdp
+  - mealstrom
+  - MeanShift
+  - Measure
+  - mecab
+  - mech
+  - Mecha
+  - Mechs
+  - mechs
+  - mediabus
+  - mediabus-fdk-aac
+  - mediabus-rtp
+  - mediawiki
+  - medium-sdk-haskell
+  - mega-sdist
+  - mellon-core
+  - mellon-gpio
+  - mellon-web
+  - melody
+  - memcache
+  - memcache-conduit
+  - memcache-haskell
+  - memcached-binary
+  - memis
+  - memo-ptr
+  - memoization-utils
+  - memorypool
+  - menoh
+  - menshen
+  - merkle-patricia-db
+  - messagepack-rpc
+  - messente
+  - meta-misc
+  - meta-par
+  - meta-par-accelerate
+  - metadata
+  - MetaHDBC
+  - metaheuristics
+  - MetaObject
+  - metaplug
+  - metar
+  - metar-http
+  - metric
+  - Metrics
+  - metricsd-client
+  - metronome
+  - mezzo
+  - mezzolens
+  - MFlow
+  - mgeneric
+  - Mhailist
+  - MHask
+  - mi
+  - Michelangelo
+  - miconix-test
+  - micro-recursion-schemes
+  - microaeson
+  - microformats2-parser
+  - microformats2-types
+  - microgroove
+  - microlens-each
+  - micrologger
+  - microsoft-translator
+  - MicrosoftTranslator
+  - mida
+  - midi-music-box
+  - midi-utils
+  - midimory
+  - midisurface
+  - mighttpd
+  - mighty-metropolis
+  - mikmod
+  - mikrokosmos
+  - miku
+  - milena
+  - mime-directory
+  - min-max-pqueue
+  - minecraft-data
+  - minesweeper
+  - miniforth
+  - minilens
+  - minilight
+  - minimung
+  - minions
+  - minioperational
+  - miniplex
+  - minirotate
+  - ministg
+  - minst-idx
+  - mios
+  - mirror-tweet
+  - misfortune
+  - miso-action-logger
+  - miso-examples
+  - miss
+  - miss-porcelain
+  - missing-py2
+  - MissingH
+  - MissingPy
+  - mix-arrows
+  - mixed-strategies
+  - mixpanel-client
+  - mkbndl
+  - mkcabal
+  - ml-w
+  - mlist
+  - mltool
+  - mm2
+  - mmtf
+  - mmtl
+  - mmtl-base
+  - moan
+  - Mobile-Legends-Hack-Cheats
+  - modelicaparser
+  - modify-fasta
+  - modsplit
+  - modular-prelude
+  - modular-prelude-classy
+  - modularity
+  - module-management
+  - modulespection
+  - modulo
+  - Moe
+  - moe
+  - MoeDict
+  - moesocks
+  - mohws
+  - mole
+  - mollie-api-haskell
+  - monad-abort-fd
+  - monad-atom
+  - monad-atom-simple
+  - monad-branch
+  - monad-dijkstra
+  - monad-exception
+  - monad-finally
+  - monad-fork
+  - monad-http
+  - monad-interleave
+  - monad-levels
+  - monad-lgbt
+  - monad-log
+  - monad-logger-syslog
+  - monad-lrs
+  - monad-mersenne-random
+  - monad-metrics
+  - monad-metrics-extensible
+  - monad-mock
+  - monad-open
+  - monad-parallel-progressbar
+  - monad-param
+  - monad-persist
+  - monad-ran
+  - monad-recorder
+  - monad-state
+  - monad-statevar
+  - monad-ste
+  - monad-stlike-io
+  - monad-stlike-stm
+  - monad-supply
+  - monad-task
+  - monad-timing
+  - monad-tx
+  - monad-unify
+  - monad-var
+  - monad-wrap
+  - monadacme
+  - MonadCatchIO-mtl
+  - MonadCatchIO-mtl-foreign
+  - MonadCatchIO-transformers
+  - MonadCatchIO-transformers-foreign
+  - MonadCompose
+  - monadiccp
+  - monadiccp-gecode
+  - Monadius
+  - MonadLab
+  - monadLib-compose
+  - monadloc-pp
+  - monadlog
+  - Monadoro
+  - monadplus
+  - monads-fd
+  - MonadStack
+  - monarch
+  - Monaris
+  - Monatron
+  - Monatron-IO
+  - mondo
+  - monetdb-mapi
+  - money
+  - mongoDB
+  - mongodb-queue
+  - mongrel2-handler
+  - monitor
+  - monky
+  - mono-foldable
+  - Monocle
+  - monoid
+  - monoid-absorbing
+  - monoid-owns
+  - monoidplus
+  - monoids
+  - monopati
+  - monte-carlo
+  - monus
+  - monzo
+  - moo
+  - moonshine
+  - morfette
+  - morfeusz
+  - morley
+  - morpheus-graphql-cli
+  - morphisms-functors
+  - morphisms-functors-inventory
+  - morphisms-objects
+  - morte
+  - mosaico-lib
+  - moto
+  - moto-postgresql
+  - motor-diagrams
+  - motor-reflection
+  - mount
+  - movie-monad
+  - mp
+  - mpdmate
+  - mpi-hs
+  - mpppc
+  - mpretty
+  - mpris
+  - mprover
+  - mps
+  - mptcp-pm
+  - mpvguihs
+  - mqtt
+  - mqtt-hs
+  - mrifk
+  - mrm
+  - ms
+  - msgpack
+  - msgpack-aeson
+  - msgpack-idl
+  - msgpack-rpc
+  - msh
+  - msi-kb-backlit
+  - MSQueue
+  - MTGBuilder
+  - mtgoxapi
+  - mtl-c
+  - mtl-evil-instances
+  - mtl-extras
+  - mtl-tf
+  - mtlx
+  - mtp
+  - mu-grpc-client
+  - mu-grpc-common
+  - mu-grpc-server
+  - mu-protobuf
+  - MuCheck
+  - MuCheck-Hspec
+  - MuCheck-HUnit
+  - MuCheck-QuickCheck
+  - MuCheck-SmallCheck
+  - mud
+  - muesli
+  - mulang
+  - multext-east-msd
+  - multi-cabal
+  - multi-instance
+  - multi-trie
+  - multiaddr
+  - multiarg
+  - multibase
+  - multifocal
+  - multihash
+  - multihash-cryptonite
+  - multihash-serialise
+  - multilinear
+  - multilinear-io
+  - multipass
+  - multipath
+  - multiplate-simplified
+  - multiplicity
+  - multipool-persistent-postgresql
+  - multirec
+  - multirec-alt-deriver
+  - multirec-binary
+  - multisetrewrite
+  - multivariant
+  - Munkres-simple
+  - muon
+  - murder
+  - murmur
+  - murmurhash3
+  - mushu
+  - music-graphics
+  - music-parts
+  - music-pitch
+  - music-preludes
+  - music-score
+  - music-sibelius
+  - music-suite
+  - music-util
+  - musicbrainz-email
+  - musicScroll
+  - musicxml
+  - musicxml2
+  - mustache-haskell
+  - mutable
+  - mutable-iter
+  - MutationOrder
+  - mute-unmute
+  - mvar-lock
+  - mvc
+  - mvc-updates
+  - mvclient
+  - mwc-random-accelerate
+  - mxnet
+  - mxnet-dataiter
+  - mxnet-examples
+  - mxnet-nn
+  - mxnet-nnvm
+  - my-package-testing
+  - my-test-docs
+  - myanimelist-export
+  - myo
+  - MyPrimes
+  - mysnapsession
+  - mysnapsession-example
+  - mysql-effect
+  - mysql-haskell
+  - mysql-haskell-nem
+  - mysql-haskell-openssl
+  - mysql-simple-quasi
+  - mysql-simple-typed
+  - mystem
+  - myTestlll
+  - mywatch
+  - myxine-client
+  - mzv
+  - n-tuple
+  - n2o-protocols
+  - n2o-web
+  - nagios-perfdata
+  - nagios-plugin-ekg
+  - nakadi-client
+  - named-lock
+  - namelist
+  - nano-hmac
+  - nano-md5
+  - nanocurses
+  - nanomsg
+  - nanomsg-haskell
+  - nanoparsec
+  - NanoProlog
+  - nanovg
+  - nanovg-simple
+  - nanq
+  - naperian
+  - NaperianNetCDF
+  - naqsha
+  - narc
+  - nat-sized-numbers
+  - nationstates
+  - nats-client
+  - nats-queue
+  - natural
+  - natural-number
+  - NaturalLanguageAlphabets
+  - naver-translate
+  - nbt
+  - NearContextAlgebra
+  - neat
+  - needle
+  - neet
+  - nehe-tuts
+  - neil
+  - neither
+  - neko-lib
+  - Neks
+  - nemesis-titan
+  - nerf
+  - nero
+  - nero-wai
+  - nero-warp
+  - nest
+  - nested-routes
+  - nested-sequence
+  - NestedFunctor
+  - nestedmap
+  - net-spider
+  - net-spider-cli
+  - net-spider-pangraph
+  - net-spider-rpl
+  - net-spider-rpl-cli
+  - netclock
+  - netcore
+  - netease-fm
+  - netlines
+  - netrium
+  - NetSNMP
+  - netspec
+  - netstring-enumerator
+  - nettle
+  - nettle-frp
+  - nettle-netkit
+  - nettle-openflow
+  - netwire-input-javascript
+  - netwire-vinylglfw-examples
+  - network-address
+  - network-anonymous-i2p
+  - network-anonymous-tor
+  - network-api-support
+  - network-arbitrary
+  - network-attoparsec
+  - network-bitcoin
+  - network-builder
+  - network-bytestring
+  - network-carbon
+  - network-connection
+  - network-dns
+  - network-enumerator
+  - network-hans
+  - network-house
+  - network-interfacerequest
+  - network-messagepack-rpc
+  - network-messagepack-rpc-websocket
+  - network-minihttp
+  - network-msgpack-rpc
+  - network-netpacket
+  - network-protocol-xmpp
+  - network-rpca
+  - network-server
+  - network-service
+  - network-simple-sockaddr
+  - network-simple-wss
+  - network-socket-options
+  - network-stream
+  - network-topic-models
+  - network-transport-amqp
+  - network-transport-inmemory
+  - network-transport-tcp
+  - network-uri-json
+  - network-uri-static
+  - network-voicetext
+  - network-wai-router
+  - network-websocket
+  - networked-game
+  - neural
+  - neural-network-blashs
+  - neural-network-hmatrix
+  - newhope
+  - newports
+  - newsletter
+  - newsletter-mailgun
+  - newt
+  - newtype-deriving
+  - newtype-th
+  - newtype-zoo
+  - next-ref
+  - nextstep-plist
+  - nfc
+  - NGrams
+  - ngrams-loader
+  - ngx-export-tools-extra
+  - niagra
+  - nibblestring
+  - nice-html
+  - nicovideo-translator
+  - nikepub
+  - Ninjas
+  - nirum
+  - nitro
+  - nix-delegate
+  - nix-deploy
+  - nix-diff
+  - nix-eval
+  - nix-freeze-tree
+  - nix-tools
+  - nixfmt
+  - nixfromnpm
+  - nixpkgs-update
+  - nkjp
+  - nlp-scores
+  - nlp-scores-scripts
+  - nm
+  - NMap
+  - nntp
+  - no-role-annots
+  - noether
+  - nofib-analyse
+  - nofib-analyze
+  - noise
+  - Nomyx
+  - Nomyx-Core
+  - Nomyx-Language
+  - Nomyx-Rules
+  - Nomyx-Web
+  - non-empty-zipper
+  - NonEmpty
+  - nonempty-lift
+  - NonEmptyList
+  - normalization-insensitive
+  - NoSlow
+  - not-gloss-examples
+  - notcpp
+  - notifications-tray-icon
+  - notmuch-haskell
+  - notmuch-web
+  - NoTrace
+  - now-haskell
+  - np-extras
+  - np-linear
+  - nptools
+  - ntp-control
+  - ntrip-client
+  - null-canvas
+  - nullary
+  - nullpipe
+  - NumberSieves
+  - NumberTheory
+  - numerals
+  - numerals-base
+  - numeric-ode
+  - numeric-qq
+  - numeric-ranges
+  - numerical
+  - numhask-array
+  - numhask-hedgehog
+  - numhask-histogram
+  - numhask-prelude
+  - numhask-range
+  - numhask-space
+  - numhask-test
+  - Nussinov78
+  - Nutri
+  - NXT
+  - NXTDSL
+  - nylas
+  - nymphaea
+  - oanda-rest-api
+  - oasis-xrd
+  - oauth2-jwt-bearer
+  - oauthenticated
+  - obd
+  - obdd
+  - oberon0
+  - obj
+  - Object
+  - objectid
+  - ObjectIO
+  - objective
+  - ocaml-export
+  - octane
+  - octohat
+  - octopus
+  - Octree
+  - oculus
+  - odbc
+  - OddWord
+  - oden-go-packages
+  - oeis2
+  - off-simple
+  - OGL
+  - ogmarkup
+  - ohloh-hs
+  - oi
+  - oidc-client
+  - ois-input-manager
+  - olwrapper
+  - om-elm
+  - omaketex
+  - ombra
+  - Omega
+  - omega
+  - omnifmt
+  - on-a-horse
+  - on-demand-ssh-tunnel
+  - onama
+  - ONC-RPC
+  - oneormore
+  - onpartitions
+  - OnRmt
+  - onu-course
+  - op
+  - opaleye-classy
+  - opaleye-sqlite
+  - open-haddock
+  - open-pandoc
+  - open-signals
+  - open-typerep
+  - open-witness
+  - OpenAFP
+  - OpenAFP-Utils
+  - openapi-petstore
+  - opench-meteo
+  - OpenCL
+  - OpenCLRaw
+  - OpenCLWrappers
+  - opencv-raw
+  - opendatatable
+  - OpenGLCheck
+  - opengles
+  - OpenSCAD
+  - opensoundcontrol-ht
+  - openssh-github-keys
+  - openssh-protocol
+  - opentelemetry-lightstep
+  - opentheory-char
+  - opentok
+  - opentype
+  - OpenVG
+  - OpenVGRaw
+  - openweathermap
+  - Operads
+  - operate-do
+  - operational-extra
+  - opml-conduit
+  - opn
+  - optima
+  - optima-for-hasql
+  - optimal-blocks
+  - optimization
+  - optimusprime
+  - optional
+  - options-time
+  - optparse-applicative-simple
+  - optparse-enum
+  - optparse-helper
+  - orc
+  - orchestrate
+  - OrchestrateDB
+  - orchid
+  - orchid-demo
+  - order-maintenance
+  - order-statistics
+  - orders
+  - Ordinary
+  - ordrea
+  - organize-imports
+  - orgmode
+  - orgstat
+  - origami
+  - orizentic
+  - OrPatterns
+  - osc
+  - oscpacking
+  - oset
+  - Oslo-Vectize
+  - OSM
+  - osm-conduit
+  - osm-download
+  - oso2pdf
+  - osx-ar
+  - ot
+  - OTP
+  - otp-authenticator
+  - ottparse-pretty
+  - outsort
+  - overload
+  - overloaded-records
+  - overture
+  - pack
+  - package-description-remote
+  - package-o-tron
+  - package-vt
+  - packdeps
+  - packed
+  - packed-dawg
+  - packed-multikey-map
+  - packedstring
+  - packer-messagepack
+  - packman
+  - packunused
+  - pacman-memcache
+  - padKONTROL
+  - pads-haskell
+  - pagarme
+  - PageIO
+  - pagure-hook-receiver
+  - Paillier
+  - pam
+  - pan-os-syslog
+  - panda
+  - pandoc-crossref
+  - pandoc-emphasize-code
+  - pandoc-filter-graphviz
+  - pandoc-include
+  - pandoc-japanese-filters
+  - pandoc-lens
+  - pandoc-markdown-ghci-filter
+  - pandoc-placetable
+  - pandoc-plantuml-diagrams
+  - pandoc-plot
+  - pandoc-pyplot
+  - pandoc-sidenote
+  - pandoc-unlit
+  - PandocAgda
+  - pang-a-lambda
+  - pangraph
+  - panpipe
+  - pansite
+  - pantry
+  - pantry-tmp
+  - papa
+  - papa-base
+  - papa-base-export
+  - papa-base-implement
+  - papa-export
+  - papa-implement
+  - papa-include
+  - papa-prelude
+  - papa-prelude-core
+  - papa-prelude-lens
+  - papa-prelude-semigroupoids
+  - papa-prelude-semigroups
+  - papa-semigroupoids
+  - papa-semigroupoids-implement
+  - paphragen
+  - pappy
+  - paprika
+  - paragon
+  - Paraiso
+  - Parallel-Arrows-Eden
+  - parallel-tasks
+  - parallel-tree-search
+  - parameterized
+  - paranoia
+  - parco
+  - parco-attoparsec
+  - parco-parsec
+  - parcom-lib
+  - parconc-examples
+  - pareto
+  - parquet-hs
+  - Parry
+  - parse-help
+  - parseargs
+  - parsec-free
+  - parsec-parsers
+  - parsec-pratt
+  - parsec1
+  - parsec2
+  - parsec3
+  - parseerror-eq
+  - parsek
+  - parsely
+  - parser-combinators-tests
+  - parser-helper
+  - parser241
+  - parsergen
+  - parsers-megaparsec
+  - parsestar
+  - parsimony
+  - parsix
+  - partage
+  - partial-lens
+  - partial-order
+  - partial-records
+  - partial-semigroup
+  - partial-semigroup-hedgehog
+  - partial-semigroup-test
+  - partly
+  - passage
+  - passman
+  - PasswordGenerator
+  - passwords
+  - pasta
+  - pastis
+  - pasty
+  - patat
+  - patch
+  - patches-vector
+  - path-text-utf8
+  - Pathfinder
+  - pathfindingcore
+  - PathTree
+  - patronscraper
+  - pattern-trie
+  - patterns
+  - paypal-adaptive-hoops
+  - paypal-api
+  - paypal-rest-client
+  - pb
+  - pb-next
+  - pbc4hs
+  - PBKDF2
+  - pcap-enumerator
+  - pcd-loader
+  - pcf
+  - pcf-font
+  - pcf-font-embed
+  - PCLT
+  - PCLT-DB
+  - pcre-light-extra
+  - pdf-slave
+  - pdf-slave-template
+  - pdf-toolbox-content
+  - pdf-toolbox-core
+  - pdf-toolbox-document
+  - pdf-toolbox-viewer
+  - pdfname
+  - pdfsplit
+  - pdynload
+  - peakachu
+  - PeanoWitnesses
+  - pec
+  - pecoff
+  - pedestrian-dag
+  - peg
+  - peggy
+  - pencil
+  - penny
+  - penny-bin
+  - penny-lib
+  - penrose
+  - peparser
+  - perceptron
+  - peregrin
+  - perf
+  - perf-analysis
+  - PerfectHash
+  - perfecthash
+  - perhaps
+  - periodic
+  - perm
+  - permutation
+  - permutations
+  - permute
+  - PermuteEffects
+  - persist2er
+  - Persistence
+  - persistent-audit
+  - persistent-cereal
+  - persistent-database-url
+  - persistent-documentation
+  - persistent-equivalence
+  - persistent-hssqlppp
+  - persistent-iproute
+  - persistent-map
+  - persistent-migration
+  - persistent-mongoDB
+  - persistent-mysql
+  - persistent-mysql-haskell
+  - persistent-protobuf
+  - persistent-ratelimit
+  - persistent-redis
+  - persistent-relational-record
+  - persistent-template-classy
+  - persistent-typed-db
+  - persistent-vector
+  - persistent-zookeeper
+  - persona
+  - persona-idp
+  - pesca
+  - peyotls
+  - peyotls-codec
+  - pez
+  - pg-harness
+  - pg-recorder
+  - pg-store
+  - pg-transact
+  - pgdl
+  - pgsql-simple
+  - pgstream
+  - phasechange
+  - phaser
+  - phoityne
+  - phoityne-vscode
+  - phone-numbers
+  - phone-push
+  - phooey
+  - photoname
+  - phraskell
+  - Phsu
+  - phybin
+  - pi-calculus
+  - pi-forall
+  - pi-hoole
+  - pia-forward
+  - pianola
+  - picedit
+  - pickle
+  - picologic
+  - picoparsec
+  - pictikz
+  - pier
+  - pier-core
+  - piet
+  - pig
+  - pinboard
+  - pinboard-notes-backup
+  - pinch
+  - pinchot
+  - pine
+  - ping
+  - pinpon
+  - Pipe
+  - pipe-enumerator
+  - pipes-async
+  - pipes-attoparsec-streaming
+  - pipes-bgzf
+  - pipes-brotli
+  - pipes-bzip
+  - pipes-cacophony
+  - pipes-cereal
+  - pipes-cereal-plus
+  - pipes-conduit
+  - pipes-core
+  - pipes-courier
+  - pipes-csv
+  - pipes-errors
+  - pipes-extra
+  - pipes-files
+  - pipes-illumina
+  - pipes-interleave
+  - pipes-io
+  - pipes-key-value-csv
+  - pipes-lzma
+  - pipes-mongodb
+  - pipes-p2p
+  - pipes-p2p-examples
+  - pipes-protolude
+  - pipes-rt
+  - pipes-s3
+  - pipes-shell
+  - pipes-sqlite-simple
+  - pipes-text
+  - pipes-transduce
+  - pipes-vector
+  - pipes-zeromq4
+  - pisigma
+  - Piso
+  - pit
+  - pitchtrack
+  - pivotal-tracker
+  - pixelated-avatar-generator
+  - pkcs10
+  - pkcs7
+  - pkggraph
+  - pkgtreediff
+  - plailude
+  - plan-applicative
+  - plan-b
+  - planar-graph
+  - planet-mitchell
+  - planet-mitchell-test
+  - plankton
+  - plat
+  - platinum-parsing
+  - PlayingCards
+  - plist
+  - plist-buddy
+  - plocketed
+  - plot
+  - plot-gtk
+  - plot-gtk-ui
+  - plot-gtk3
+  - Plot-ho-matic
+  - plot-lab
+  - plots
+  - PlslTools
+  - plugins
+  - plugins-auto
+  - plugins-multistage
+  - plur
+  - plural
+  - png-file
+  - pngload
+  - pngload-fixed
+  - pocket
+  - pocket-dns
+  - point-octree
+  - pointedalternative
+  - pointful
+  - pointless-haskell
+  - pointless-lenses
+  - pointless-rewrite
+  - pokemon-go-protobuf-types
+  - poker-eval
+  - pokitdok
+  - polar-configfile
+  - polar-shader
+  - polh-lexicon
+  - Pollutocracy
+  - poly-control
+  - polydata
+  - polydata-core
+  - polynomial
+  - polysemy-plugin
+  - polysemy-RandomFu
+  - polysemy-zoo
+  - polyseq
+  - polysoup
+  - polytypeable
+  - polytypeable-utils
+  - pomodoro
+  - pomohoro
+  - ponder
+  - pong-server
+  - pontarius-xmpp
+  - pool
+  - pool-conduit
+  - pop3-client
+  - popenhs
+  - poppler
+  - porcupine-core
+  - porcupine-http
+  - porcupine-s3
+  - portager
+  - porte
+  - PortFusion
+  - ports
+  - poseidon
+  - poseidon-postgis
+  - posix-acl
+  - posix-realtime
+  - posix-waitpid
+  - posplyu
+  - postcodes
+  - postgres-embedded
+  - postgres-tmp
+  - postgres-websockets
+  - postgresql-lo-stream
+  - postgresql-named
+  - postgresql-query
+  - postgresql-simple-bind
+  - postgresql-simple-named
+  - postgresql-simple-opts
+  - postgresql-simple-queue
+  - postgresql-simple-sop
+  - postgresql-simple-typed
+  - postgresql-typed
+  - postgresql-typed-lifted
+  - postgrest
+  - postgrest-ws
+  - postie
+  - postmark
+  - postmaster
+  - potato-tool
+  - potoki
+  - potoki-cereal
+  - potoki-conduit
+  - potoki-core
+  - potoki-hasql
+  - potoki-zlib
+  - powermate
+  - powerpc
+  - powerqueue
+  - powerqueue-distributed
+  - powerqueue-levelmem
+  - powerqueue-sqs
+  - PPrinter
+  - pqc
+  - pqueue-mtl
+  - practice-room
+  - praglude
+  - preamble
+  - precursor
+  - pred-set
+  - pred-trie
+  - predicate-class
+  - predicate-typed
+  - prednote
+  - prednote-test
+  - prefork
+  - pregame
+  - preliminaries
+  - prelude-generalize
+  - prelude-plus
+  - preprocess-haskell
+  - preprocessor
+  - presburger
+  - present
+  - press
+  - presto-hdbc
+  - pretty-compact
+  - pretty-diff
+  - pretty-ghci
+  - pretty-ncols
+  - prettyprinter-graphviz
+  - prettyprinter-vty
+  - preview
+  - prim-array
+  - prim-ref
+  - primes-type
+  - primitive-extras
+  - primitive-indexed
+  - primitive-maybe
+  - primitive-simd
+  - primitive-stablename
+  - PrimitiveArray-Pretty
+  - primula-board
+  - primula-bot
+  - pringletons
+  - print-debugger
+  - printcess
+  - Printf-TH
+  - prints
+  - priority-queue
+  - PriorityChansConverger
+  - ProbabilityMonads
+  - probable
+  - proc
+  - process-conduit
+  - process-iterio
+  - process-leksah
+  - process-listlike
+  - process-progress
+  - process-qq
+  - process-streaming
+  - processing
+  - procrastinating-variable
+  - procstat
+  - producer
+  - prof-flamegraph
+  - prof2dot
+  - prof2pretty
+  - profunctor-monad
+  - profunctor-optics
+  - progress
+  - progress-meter
+  - progress-reporting
+  - progressbar
+  - progression
+  - progressive
+  - proj4-hs-bindings
+  - project-m36
+  - projectile
+  - prolog
+  - prolog-graph
+  - prolog-graph-lib
+  - prologue
+  - prometheus-effect
+  - promise
+  - pronounce
+  - proof-combinators
+  - propane
+  - propellor
+  - Proper
+  - properties
+  - property-list
+  - proplang
+  - prosper
+  - proteome
+  - proto-lens-combinators
+  - proto-lens-descriptors
+  - proto3-suite
+  - protobuf-native
+  - protocol-buffers
+  - protocol-buffers-descriptor
+  - protocol-buffers-descriptor-fork
+  - protocol-buffers-fork
+  - protolude-lifted
+  - proton-haskell
+  - prototype
+  - prove-everywhere-server
+  - provenience
+  - proxy-kindness
+  - proxy-mapping
+  - psc-ide
+  - pseudo-boolean
+  - pseudo-trie
+  - PTQ
+  - ptr
+  - publicsuffixlistcreate
+  - publish
+  - pubnub
+  - pubsub
+  - puffytools
+  - pugixml
+  - Pugs
+  - pugs-compat
+  - pugs-DrIFT
+  - pugs-hsregex
+  - PUH-Project
+  - punkt
+  - Pup-Events
+  - Pup-Events-Demo
+  - Pup-Events-Server
+  - puppetresources
+  - pure-cdb
+  - pure-io
+  - pure-priority-queue
+  - pure-priority-queue-tests
+  - purebred-email
+  - purescript-iso
+  - purescript-tsd-gen
+  - push-notifications
+  - push-notify
+  - push-notify-apn
+  - push-notify-ccs
+  - push-notify-general
+  - pusher-haskell
+  - pusher-ws
+  - pushme
+  - putlenses
+  - puzzle-draw
+  - puzzle-draw-cmdline
+  - pvd
+  - pyffi
+  - pyfi
+  - python-pickle
+  - q4c12-twofinger
+  - qc-oi-testgenerator
+  - qd
+  - qd-vec
+  - qed
+  - qhull-simple
+  - qif
+  - QIO
+  - QLearn
+  - qr-imager
+  - qr-repa
+  - qsem
+  - qtah-cpp-qt5
+  - qtah-examples
+  - qtah-generator
+  - qtah-qt5
+  - QuadEdge
+  - QuadTree
+  - quantfin
+  - quantum-arrow
+  - quantum-random
+  - qudb
+  - Quelea
+  - quenya-verb
+  - queryparser
+  - queryparser-demo
+  - queryparser-hive
+  - queryparser-presto
+  - queryparser-vertica
+  - questioner
+  - queuelike
+  - quick-schema
+  - QuickAnnotate
+  - quickbench
+  - quickbooks
+  - quickcheck-arbitrary-template
+  - quickcheck-combinators
+  - quickcheck-poly
+  - quickcheck-property-comb
+  - quickcheck-property-monad
+  - quickcheck-regex
+  - quickcheck-relaxng
+  - quickcheck-rematch
+  - quickcheck-report
+  - quickcheck-state-machine
+  - quickcheck-state-machine-distributed
+  - quickcheck-webdriver
+  - QuickCheckVariant
+  - QuickPlot
+  - quickpull
+  - quickset
+  - Quickson
+  - quicktest
+  - quickwebapp
+  - quipper-core
+  - quipper-rendering
+  - quiver
+  - quiver-binary
+  - quiver-bytestring
+  - quiver-cell
+  - quiver-csv
+  - quiver-enumerator
+  - quiver-groups
+  - quiver-http
+  - quiver-instances
+  - quiver-interleave
+  - quiver-sort
+  - quokka
+  - quoridor-hs
+  - qux
+  - R-pandoc
+  - raaz
+  - rad
+  - radian
+  - radium
+  - radium-formula-parser
+  - radix
+  - rados-haskell
+  - raft
+  - rail-compiler-editor
+  - rails-session
+  - rainbow-tests
+  - raketka
+  - rakhana
+  - rakuten
+  - ralist
+  - rallod
+  - raml
+  - rand-vars
+  - randfile
+  - rando
+  - random-access-list
+  - random-derive
+  - random-eff
+  - random-effin
+  - random-extras
+  - random-fu
+  - random-fu-multivariate
+  - random-hypergeometric
+  - random-stream
+  - RandomDotOrg
+  - Randometer
+  - Range
+  - range-space
+  - rangemin
+  - rank-product
+  - rank1dynamic
+  - Ranka
+  - rapid
+  - rapid-term
+  - rasa
+  - rasa-example-config
+  - rasa-ext-bufs
+  - rasa-ext-cmd
+  - rasa-ext-cursors
+  - rasa-ext-files
+  - rasa-ext-logger
+  - rasa-ext-slate
+  - rasa-ext-status-bar
+  - rasa-ext-style
+  - rasa-ext-views
+  - rasa-ext-vim
+  - rascal
+  - Rasenschach
+  - rational-list
+  - rattle
+  - rattletrap
+  - raven-haskell-scotty
+  - raw-feldspar
+  - rawr
+  - raz
+  - razom-text-util
+  - rbr
+  - rc
+  - rclient
+  - rdf4h
+  - rdioh
+  - react-flux
+  - react-flux-servant
+  - react-haskell
+  - react-tutorial-haskell-server
+  - reaction-logic
+  - reactive-bacon
+  - reactive-balsa
+  - reactive-banana
+  - reactive-banana-automation
+  - reactive-banana-bunch
+  - reactive-banana-gi-gtk
+  - reactive-banana-sdl
+  - reactive-banana-sdl2
+  - reactive-banana-threepenny
+  - reactive-banana-wx
+  - reactive-fieldtrip
+  - reactive-glut
+  - reactive-jack
+  - reactive-midyim
+  - reactive-thread
+  - reactor
+  - read-bounded
+  - read-ctags
+  - read-io
+  - readline
+  - readline-statevar
+  - readme-lhs
+  - readpyc
+  - readshp
+  - really-simple-xml-parser
+  - reasonable-lens
+  - record
+  - record-aeson
+  - record-encode
+  - record-gl
+  - record-preprocessor
+  - record-syntax
+  - records
+  - records-th
+  - recursors
+  - reddit
+  - redis
+  - redis-hs
+  - redis-io
+  - redis-simple
+  - redland
+  - Redmine
+  - reduce-equations
+  - reedsolomon
+  - reenact
+  - Ref
+  - ref
+  - ref-mtl
+  - refcount
+  - Referees
+  - references
+  - refh
+  - refined
+  - refined-http-api-data
+  - reflection-extras
+  - reflex
+  - reflex-animation
+  - reflex-backend-socket
+  - reflex-backend-wai
+  - reflex-basic-host
+  - reflex-dom-retractable
+  - reflex-dom-svg
+  - reflex-fsnotify
+  - reflex-ghci
+  - reflex-gloss
+  - reflex-gloss-scene
+  - reflex-libtelnet
+  - reflex-orphans
+  - reflex-process
+  - reflex-sdl2
+  - reflex-transformers
+  - reflex-vty
+  - reformat
+  - refresht
+  - refurb
+  - reg-alloc
+  - reg-alloc-graph-color
+  - regex-deriv
+  - regex-dfa
+  - regex-generator
+  - regex-parsec
+  - regex-pcre-text
+  - regex-pderiv
+  - regex-posix-unittest
+  - regex-tdfa-pipes
+  - regex-tdfa-quasiquoter
+  - regex-tdfa-rc
+  - regex-tdfa-text
+  - regex-tdfa-unittest
+  - regex-tdfa-utf8
+  - regex-tre
+  - regex-type
+  - regex-wrapper
+  - regex-xmlschema
+  - regexp-tries
+  - regexpr-symbolic
+  - regexqq
+  - regional-pointers
+  - regions
+  - regions-monadsfd
+  - regions-monadstf
+  - regions-mtl
+  - register-machine-typelevel
+  - registry
+  - registry-hedgehog
+  - regress
+  - regular
+  - regular-extras
+  - regular-web
+  - regular-xmlpickler
+  - reheat
+  - rehoo
+  - rei
+  - reified-records
+  - reify
+  - relacion
+  - relation
+  - relational-postgresql8
+  - relative-date
+  - releaser
+  - relevant-time
+  - reload
+  - remark
+  - remarks
+  - remote
+  - remote-debugger
+  - remote-json
+  - remote-json-client
+  - remote-json-server
+  - remote-monad
+  - remotion
+  - repa-array
+  - repa-bytestring
+  - repa-convert
+  - repa-devil
+  - repa-eval
+  - repa-flow
+  - repa-linear-algebra
+  - repa-plugin
+  - repa-series
+  - repa-stream
+  - repa-v4l2
+  - repl
+  - RepLib
+  - replica
+  - replicant
+  - ReplicateEffects
+  - repo-based-blog
+  - repr
+  - representable-functors
+  - representable-tries
+  - reprinter
+  - reproject
+  - req-conduit
+  - req-oauth2
+  - req-url-extra
+  - reqcatcher
+  - request-monad
+  - require
+  - reserve
+  - reservoir
+  - resin
+  - resistor-cube
+  - resolve
+  - resolve-trivial-conflicts
+  - resource-effect
+  - resource-embed
+  - resource-pool-catchio
+  - resource-simple
+  - respond
+  - rest-client
+  - rest-core
+  - rest-example
+  - rest-gen
+  - rest-happstack
+  - rest-snap
+  - rest-stringmap
+  - rest-types
+  - rest-wai
+  - restful-snap
+  - restless-git
+  - restricted-workers
+  - restyle
+  - rethinkdb
+  - rethinkdb-client-driver
+  - rethinkdb-model
+  - rethinkdb-wereHamster
+  - retryer
+  - reverse-geocoding
+  - reversi
+  - ReviewBoard
+  - rewrite
+  - rewrite-inspector
+  - rewriting
+  - rezoom
+  - rfc
+  - rfc-env
+  - rfc-http-client
+  - rfc-prelude
+  - rfc-psql
+  - rfc-redis
+  - rfc-servant
+  - rhine
+  - rhine-gloss
+  - rhythm-game-tutorial
+  - rib
+  - ribbit
+  - RichConditional
+  - richreports
+  - ridley
+  - ridley-extras
+  - riemann
+  - riff
+  - ring-buffer
+  - ring-buffers
+  - riot
+  - risc386
+  - riscv-isa
+  - Ritt-Wu
+  - rivers
+  - rivet
+  - rivet-migration
+  - rivet-simple-deploy
+  - RJson
+  - rl-satton
+  - Rlang-QQ
+  - rlglue
+  - RLP
+  - rlwe-challenges
+  - rmonad
+  - RMP
+  - RNAdesign
+  - RNAdraw
+  - RNAFold
+  - RNAFoldProgs
+  - RNAlien
+  - RNAwolf
+  - rncryptor
+  - rng-utils
+  - rob
+  - robin
+  - robots-txt
+  - roc-cluster
+  - roc-cluster-demo
+  - roku-api
+  - rollbar
+  - rollbar-hs
+  - roller
+  - RollingDirectory
+  - ron
+  - ron-rdt
+  - ron-schema
+  - ron-storage
+  - rope
+  - rose-trees
+  - rose-trie
+  - roshask
+  - rosmsg
+  - rosmsg-bin
+  - rosso
+  - rotating-log
+  - rounding
+  - roundtrip
+  - roundtrip-aeson
+  - roundtrip-string
+  - roundtrip-xml
+  - route-planning
+  - rowrecord
+  - rpc
+  - rpc-framework
+  - rpf
+  - rpm
+  - rsagl
+  - rsagl-frp
+  - rsagl-math
+  - rspp
+  - rss-conduit
+  - rss2irc
+  - rstream
+  - rtcm
+  - RtMidi
+  - rtnetlink
+  - rtorrent-rpc
+  - rts-loader
+  - ruby-marshal
+  - ruby-qq
+  - ruin
+  - ruler
+  - ruler-core
+  - rungekutta
+  - runmany
+  - runtime-arbitrary
+  - rvar
+  - rws
+  - RxHaskell
+  - s-expression
+  - S3
+  - SableCC2Hs
+  - safe-buffer-monad
+  - safe-coerce
+  - safe-failure-cme
+  - safe-freeze
+  - safe-globals
+  - safe-lazy-io
+  - safe-length
+  - safe-money-xmlbf
+  - safe-plugins
+  - safe-printf
+  - safecopy-migrate
+  - safecopy-store
+  - safeint
+  - safepath
+  - safer-file-handles
+  - safer-file-handles-bytestring
+  - safer-file-handles-text
+  - saferoute
+  - sai-shape-syb
+  - sajson
+  - salak-toml
+  - Salsa
+  - saltine
+  - saltine-quickcheck
+  - salvia
+  - salvia-demo
+  - salvia-extras
+  - salvia-protocol
+  - salvia-sessions
+  - salvia-websocket
+  - samtools
+  - samtools-conduit
+  - samtools-enumerator
+  - samtools-iteratee
+  - sandlib
+  - sandman
+  - sarasvati
+  - sarsi
+  - sasl
+  - sat
+  - sat-micro-hs
+  - satchmo
+  - satchmo-backends
+  - satchmo-examples
+  - satchmo-funsat
+  - satchmo-minisat
+  - satchmo-toysat
+  - Saturnin
+  - savage
+  - sax
+  - SBench
+  - sbvPlugin
+  - sc2-lowlevel
+  - sc2-proto
+  - sc2-support
+  - sc3-rdu
+  - scalable-server
+  - scaleimage
+  - SCalendar
+  - scalendar
+  - scalp-webhooks
+  - scan-vector-machine
+  - scc
+  - scenegraph
+  - scgi
+  - schedevr
+  - schedule-planner
+  - schedyield
+  - schematic
+  - scholdoc
+  - scholdoc-citeproc
+  - scholdoc-texmath
+  - scholdoc-types
+  - sci-ratio
+  - SciBaseTypes
+  - scidb-hquery
+  - SciFlow
+  - SciFlow-drmaa
+  - scion
+  - scion-browser
+  - scons2dot
+  - scope
+  - scope-cairo
+  - scottish
+  - scotty-binding-play
+  - scotty-blaze
+  - scotty-fay
+  - scotty-format
+  - scotty-hastache
+  - scotty-resource
+  - scotty-rest
+  - scotty-session
+  - scotty-view
+  - scp-streams
+  - scrabble-bot
+  - scrapbook
+  - scrape-changes
+  - ScratchFs
+  - script-monad
+  - SCRIPTWriter
+  - scrobble
+  - Scurry
+  - scythe
+  - scyther-proof
+  - sde-solver
+  - sdl2-cairo-image
+  - sdl2-compositor
+  - sdl2-fps
+  - sdr
+  - seakale
+  - seakale-postgresql
+  - seakale-tests
+  - sec
+  - secdh
+  - seclib
+  - second-transfer
+  - secp256k1
+  - secp256k1-haskell
+  - secp256k1-legacy
+  - secret-santa
+  - secret-sharing
+  - secrm
+  - secure-sockets
+  - secureUDP
+  - sednaDBXML
+  - selectors
+  - SelectSequencesFromMSA
+  - selenium
+  - selenium-server
+  - self-extract
+  - selinux
+  - semantic-source
+  - Semantique
+  - semdoc
+  - semi-iso
+  - semibounded-lattices
+  - Semigroup
+  - semigroupoids-syntax
+  - semigroups-actions
+  - semiring
+  - semiring-num
+  - semver-range
+  - sendgrid-haskell
+  - sendgrid-v3
+  - sensei
+  - sensenet
+  - sentence-jp
+  - sentry
+  - seonbi
+  - seqaid
+  - SeqAlign
+  - seqloc
+  - seqloc-datafiles
+  - sequent-core
+  - sequor
+  - serialize-instances
+  - serokell-util
+  - serpentine
+  - serv
+  - serv-wai
+  - servant-aeson-specs
+  - servant-auth-cookie
+  - servant-auth-hmac
+  - servant-auth-token
+  - servant-auth-token-acid
+  - servant-auth-token-api
+  - servant-auth-token-leveldb
+  - servant-auth-token-persistent
+  - servant-auth-token-rocksdb
+  - servant-client-namedargs
+  - servant-csharp
+  - servant-db
+  - servant-db-postgresql
+  - servant-dhall
+  - servant-ede
+  - servant-ekg
+  - servant-errors
+  - servant-examples
+  - servant-exceptions
+  - servant-generate
+  - servant-generic
+  - servant-github
+  - servant-github-webhook
+  - servant-haxl-client
+  - servant-hmac-auth
+  - servant-http-streams
+  - servant-http2-client
+  - servant-iCalendar
+  - servant-jquery
+  - servant-jsonrpc
+  - servant-jsonrpc-client
+  - servant-jsonrpc-server
+  - servant-kotlin
+  - servant-matrix-param
+  - servant-namedargs
+  - servant-nix
+  - servant-pandoc
+  - servant-pool
+  - servant-postgresql
+  - servant-proto-lens
+  - servant-pushbullet-client
+  - servant-py
+  - servant-quickcheck
+  - servant-reason
+  - servant-reflex
+  - servant-router
+  - servant-scotty
+  - servant-server-namedargs
+  - servant-smsc-ru
+  - servant-snap
+  - servant-streaming
+  - servant-streaming-client
+  - servant-streaming-docs
+  - servant-streaming-server
+  - servant-swagger-tags
+  - servant-to-elm
+  - servant-waargonaut
+  - servant-xml
+  - servant-zeppelin
+  - servant-zeppelin-client
+  - servant-zeppelin-server
+  - servant-zeppelin-swagger
+  - server-generic
+  - serversession-backend-acid-state
+  - serversession-backend-persistent
+  - serversession-backend-redis
+  - serversession-frontend-snap
+  - serversession-frontend-yesod
+  - services
+  - ses-html-snaplet
+  - SessionLogger
+  - sessions
+  - sessiontypes
+  - sessiontypes-distributed
+  - set-of
+  - set-with
+  - setdown
+  - setgame
+  - setoid
+  - setters
+  - sexp
+  - sexp-grammar
+  - sexpr-parser
+  - sext
+  - SFML
+  - SFML-control
+  - sfmt
+  - sfnt2woff
+  - SFont
+  - SG
+  - sgd
+  - SGdemo
+  - sgf
+  - SGplus
+  - sgrep
+  - sh2md
+  - sha-streams
+  - shade
+  - shadower
+  - shake-cabal-build
+  - shake-extras
+  - shake-minify
+  - shake-pack
+  - shake-path
+  - shake-persist
+  - shaker
+  - shakespeare-babel
+  - shakespeare-sass
+  - shannon-fano
+  - shapefile
+  - shapely-data
+  - shared-buffer
+  - shared-fields
+  - she
+  - shelduck
+  - shell-pipe
+  - Shellac
+  - Shellac-compatline
+  - Shellac-editline
+  - Shellac-haskeline
+  - Shellac-readline
+  - ShellCheck
+  - shellish
+  - shellmate
+  - shellmate-extras
+  - shh
+  - shh-extras
+  - shimmer
+  - shine-examples
+  - shivers-cfg
+  - shoap
+  - shopify
+  - shorten-strings
+  - ShortestPathProblems
+  - show-prettyprint
+  - showdown
+  - shpider
+  - shuffle
+  - si-clock
+  - sibe
+  - sifflet
+  - sifflet-lib
+  - sigma-ij
+  - signals
+  - signed-multiset
+  - silvi
+  - simd
+  - simgi
+  - simple
+  - simple-actors
+  - simple-affine-space
+  - simple-atom
+  - simple-bluetooth
+  - simple-c-value
+  - simple-conduit
+  - simple-config
+  - simple-css
+  - simple-download
+  - simple-effects
+  - simple-eval
+  - simple-firewire
+  - simple-genetic-algorithm
+  - simple-index
+  - simple-log-syslog
+  - simple-logger
+  - simple-logging
+  - simple-money
+  - simple-neural-networks
+  - simple-nix
+  - simple-pascal
+  - simple-pipe
+  - simple-postgresql-orm
+  - simple-rope
+  - simple-server
+  - simple-session
+  - simple-stacked-vm
+  - simple-tabular
+  - simple-tar
+  - simple-ui
+  - simple-units
+  - simple-vec3
+  - simple-zipper
+  - simpleargs
+  - simpleconfig
+  - SimpleGL
+  - simpleirc
+  - simpleirc-lens
+  - SimpleLog
+  - simplenote
+  - simpleprelude
+  - SimpleServer
+  - simplesmtpclient
+  - simseq
+  - single-tuple
+  - singleton-dict
+  - singleton-typelits
+  - singnal
+  - singular-factory
+  - sink
+  - siphon
+  - siren-json
+  - sirkel
+  - sitepipe
+  - sixfiguregroup
+  - sized-grid
+  - sized-types
+  - sized-vector
+  - sizes
+  - sjsp
+  - skeletal-set
+  - skeleton
+  - skeletons
+  - skell
+  - skemmtun
+  - skews
+  - skulk
+  - skylark-client
+  - skype4hs
+  - slack
+  - slack-notify-haskell
+  - slack-web
+  - slave-thread
+  - slice-cpp-gen
+  - sliceofpy
+  - slidemews
+  - Slides
+  - slim
+  - sloane
+  - slot-lambda
+  - sloth
+  - slug
+  - slynx
+  - smallarray
+  - smallcheck-laws
+  - smallcheck-lens
+  - smallcheck-series
+  - smallpt-hs
+  - smallstring
+  - smap
+  - smartcheck
+  - smartconstructor
+  - smartGroup
+  - smartword
+  - smcdel
+  - sme
+  - smerdyakov
+  - smiles
+  - smith-cli
+  - smith-client
+  - Smooth
+  - smsaero
+  - smt-lib
+  - SmtLib
+  - smtlib2-debug
+  - smtlib2-pipe
+  - smtlib2-quickcheck
+  - smtp-mail-ng
+  - SMTPClient
+  - smtps-gmail
+  - smuggler
+  - snake
+  - snake-game
+  - snap
+  - snap-accept
+  - snap-auth-cli
+  - snap-blaze-clay
+  - snap-configuration-utilities
+  - snap-error-collector
+  - snap-extras
+  - snap-loader-dynamic
+  - snap-loader-static
+  - snap-routes
+  - snap-stream
+  - snap-templates
+  - snap-testing
+  - snap-utils
+  - snap-web-routes
+  - snaplet-acid-state
+  - snaplet-actionlog
+  - snaplet-amqp
+  - snaplet-auth-acid
+  - snaplet-coffee
+  - snaplet-css-min
+  - snaplet-customauth
+  - snaplet-environments
+  - snaplet-fay
+  - snaplet-ghcjs
+  - snaplet-hasql
+  - snaplet-haxl
+  - snaplet-hdbc
+  - snaplet-hslogger
+  - snaplet-i18n
+  - snaplet-influxdb
+  - snaplet-mandrill
+  - snaplet-mongoDB
+  - snaplet-mongodb-minimalistic
+  - snaplet-mysql-simple
+  - snaplet-oauth
+  - snaplet-persistent
+  - snaplet-postgresql-simple
+  - snaplet-postmark
+  - snaplet-purescript
+  - snaplet-recaptcha
+  - snaplet-redis
+  - snaplet-redson
+  - snaplet-rest
+  - snaplet-riak
+  - snaplet-sass
+  - snaplet-scoped-session
+  - snaplet-sedna
+  - snaplet-ses-html
+  - snaplet-sqlite-simple
+  - snaplet-sqlite-simple-jwt-auth
+  - snaplet-stripe
+  - snaplet-tasks
+  - snaplet-typed-sessions
+  - snaplet-wordpress
+  - snappy-conduit
+  - snappy-iteratee
+  - sndfile-enumerators
+  - sneakyterm
+  - SNet
+  - snipcheck
+  - snm
+  - snmp
+  - snorkels
+  - snow-white
+  - snowflake-core
+  - snowflake-server
+  - snowtify
+  - Snusmumrik
+  - soap-openssl
+  - SoccerFun
+  - SoccerFunGL
+  - socket-activation
+  - socket-io
+  - socket-sctp
+  - socket-unix
+  - socketed
+  - socketio
+  - sockets
+  - socketson
+  - sodium
+  - soegtk
+  - softfloat-hs
+  - solga
+  - solga-swagger
+  - solr
+  - sonic-visualiser
+  - Sonnex
+  - SoOSiM
+  - sorted
+  - sorting
+  - sorty
+  - souffle-haskell
+  - sound-collage
+  - sounddelay
+  - soundgen
+  - source-code-server
+  - SourceGraph
+  - sousit
+  - soyuz
+  - SpaceInvaders
+  - spacepart
+  - SpacePrivateers
+  - spake2
+  - spanout
+  - sparkle
+  - sparrow
+  - sparse
+  - sparse-lin-alg
+  - sparsebit
+  - sparsecheck
+  - sparser
+  - spata
+  - special-functors
+  - special-keys
+  - specialize-th
+  - species
+  - spectral-clustering
+  - speculation
+  - speculation-transformers
+  - speechmatics
+  - speedy-slice
+  - spelling-suggest
+  - sphero
+  - sphinx
+  - sphinx-cli
+  - sphinxesc
+  - spice
+  - SpinCounter
+  - spir-v
+  - spiros
+  - splay
+  - splaytree
+  - spline3
+  - splines
+  - split-morphism
+  - splitter
+  - splot
+  - Spock
+  - Spock-api-ghcjs
+  - Spock-api-server
+  - Spock-auth
+  - Spock-core
+  - Spock-digestive
+  - Spock-lucid
+  - Spock-worker
+  - spoonutil
+  - spoty
+  - Sprig
+  - sprinkles
+  - spritz
+  - sproxy
+  - sproxy-web
+  - sproxy2
+  - spsa
+  - spy
+  - sql-simple
+  - sql-simple-mysql
+  - sql-simple-pool
+  - sql-simple-postgresql
+  - sql-simple-sqlite
+  - sqlcipher
+  - sqlite
+  - sqlite-simple
+  - sqlite-simple-errors
+  - sqlite-simple-typed
+  - sqlvalue-list
+  - sqsd-local
+  - squeal-postgresql
+  - sr-extra
+  - srcinst
+  - sscan
+  - sscgi
+  - ssh
+  - ssh-tunnel
+  - sshd-lint
+  - sssp
+  - sstable
+  - SSTG
+  - st2
+  - stable-heap
+  - stable-maps
+  - stable-marriage
+  - stable-memo
+  - stable-tree
+  - stack
+  - stack-bump
+  - stack-fix
+  - stack-hpc-coveralls
+  - stack-lib
+  - stack-network
+  - stack-prism
+  - stack-run
+  - stack-run-auto
+  - stack-tag
+  - stack-type
+  - stack-wrapper
+  - stack2cabal
+  - stack2nix
+  - stackage
+  - stackage-build-plan
+  - stackage-cabal
+  - stackage-cli
+  - stackage-curator
+  - stackage-metadata
+  - stackage-query
+  - stackage-sandbox
+  - stackage-setup
+  - stackage-to-hackage
+  - stackage-types
+  - stackage-upload
+  - stackage2nix
+  - standalone-derive-topdown
+  - standalone-haddock
+  - starling
+  - stash
+  - Stasis
+  - state
+  - state-bag
+  - state-plus
+  - state-record
+  - stateful-mtl
+  - stateWriter
+  - static-canvas
+  - static-closure
+  - static-resources
+  - static-tensor
+  - static-text
+  - staticanalysis
+  - statistics-dirichlet
+  - statistics-fusion
+  - statistics-hypergeometric-genvar
+  - stats
+  - statsd
+  - statsd-client
+  - statsdi
+  - status-notifier-item
+  - statvfs
+  - stb-image-redux
+  - stc-lang
+  - stdata
+  - stdf
+  - stdio
+  - steambrowser
+  - stego-uuid
+  - stemmer
+  - stemmer-german
+  - stepwise
+  - stern-brocot
+  - stgi
+  - STL
+  - stm-chunked-queues
+  - stm-containers
+  - stm-firehose
+  - stm-hamt
+  - stm-promise
+  - stm-stats
+  - stmcontrol
+  - stochastic
+  - StockholmAlignment
+  - Stomp
+  - storable
+  - storable-static-array
+  - storablevector-streamfusion
+  - store-streaming
+  - stp
+  - str
+  - Strafunski-ATermLib
+  - Strafunski-Sdf2Haskell
+  - StrappedTemplates
+  - stratum-tool
+  - stratux
+  - stratux-demo
+  - stratux-websockets
+  - stream
+  - stream-fusion
+  - stream-monad
+  - streamdeck
+  - streamed
+  - streaming-brotli
+  - streaming-cassava
+  - streaming-conduit
+  - streaming-fft
+  - streaming-lzma
+  - streaming-png
+  - streaming-process
+  - streaming-sort
+  - streamproc
+  - strelka
+  - strict-data
+  - StrictBench
+  - StrictCheck
+  - strictly
+  - string-isos
+  - string-quote
+  - string-typelits
+  - stringlike
+  - stringtable-atom
+  - stripe
+  - stripe-core
+  - stripe-haskell
+  - stripe-http-client
+  - stripe-http-streams
+  - stripe-tests
+  - strongswan-sql
+  - structural-induction
+  - structural-traversal
+  - structured-mongoDB
+  - structures
+  - stt
+  - stunclient
+  - stunts
+  - stutter
+  - stylist
+  - stylized
+  - sub-state
+  - subhask
+  - subleq-toolchain
+  - submark
+  - subsample
+  - substring-parser
+  - subwordgraph
+  - successors
+  - suffix-array
+  - suffixarray
+  - SuffixStructures
+  - sugarhaskell
+  - suitable
+  - summoner
+  - summoner-tui
+  - sump
+  - sunlight
+  - sunroof-compiler
+  - sunroof-examples
+  - sunroof-server
+  - super-user-spark
+  - superbubbles
+  - superbuffer
+  - supercollider-ht
+  - supercollider-midi
+  - superconstraints
+  - superevent
+  - supermonad
+  - supero
+  - supervisor
+  - supervisors
+  - supplemented
+  - surjective
+  - sv
+  - sv-svfactor
+  - SVD2HS
+  - svfactor
+  - svg-builder-fork
+  - SVG2Q
+  - svg2q
+  - svgcairo
+  - svgutils
+  - svm-light-utils
+  - svm-simple
+  - svndump
+  - swagger-petstore
+  - swagger-test
+  - swapper
+  - swearjure
+  - swf
+  - swift-lda
+  - sws
+  - syb-extras
+  - syb-with-class-instances-text
+  - SybWidget
+  - syfco
+  - sylvia
+  - sym
+  - sym-plot
+  - symantic
+  - symantic-http-test
+  - symantic-lib
+  - symantic-xml
+  - symbiote
+  - symbolic-link
+  - symengine
+  - symengine-hs
+  - sync
+  - sync-mht
+  - syncthing-hs
+  - syntactic
+  - syntax
+  - syntax-attoparsec
+  - syntax-example
+  - syntax-example-json
+  - syntax-pretty
+  - syntax-printer
+  - syntax-trees
+  - syntax-trees-fork-bairyn
+  - SyntaxMacros
+  - syntaxnet-haskell
+  - synthesizer
+  - synthesizer-llvm
+  - sys-process
+  - Sysmon
+  - system-canonicalpath
+  - system-command
+  - system-extra
+  - system-inotify
+  - system-lifted
+  - system-linux-proc
+  - system-locale
+  - system-random-effect
+  - systemstats
+  - t-regex
+  - t3-client
+  - t3-server
+  - ta
+  - table
+  - table-layout
+  - table-tennis
+  - tableaux
+  - Tables
+  - tables
+  - tablestorage
+  - Tablify
+  - tabloid
+  - tabs
+  - taffybar
+  - tag-bits
+  - tag-stream
+  - tagged-exception-core
+  - tagged-list
+  - tagged-th
+  - tagged-timers
+  - taglib-api
+  - tagsoup-ht
+  - tagsoup-megaparsec
+  - tagsoup-navigate
+  - tagsoup-parsec
+  - tagsoup-selection
+  - tagstream-conduit
+  - tai
+  - tai64
+  - takahashi
+  - Takusen
+  - takusen-oracle
+  - tal
+  - tamarin-prover
+  - tamarin-prover-term
+  - tamarin-prover-theory
+  - tamarin-prover-utils
+  - Tape
+  - tapioca
+  - tar-bytestring
+  - target
+  - tart
+  - task
+  - task-distribution
+  - taskell
+  - TaskMonad
+  - tasty-auto
+  - tasty-fail-fast
+  - tasty-groundhog-converters
+  - tasty-hedgehog-coverage
+  - tasty-integrate
+  - tasty-jenkins-xml
+  - tasty-laws
+  - tasty-lens
+  - tasty-stats
+  - tasty-tap
+  - tateti-tateti
+  - Taxonomy
+  - TaxonomyTools
+  - TBC
+  - TBit
+  - tbox
+  - tcache-AWS
+  - tccli
+  - tcod-haskell
+  - tcp
+  - tcp-streams-openssl
+  - tdd-util
+  - tds
+  - TeaHS
+  - teams
+  - teeth
+  - telegram
+  - telegram-api
+  - telegram-bot
+  - telegram-bot-simple
+  - teleport
+  - teleshell
+  - tellbot
+  - template-default
+  - template-haskell-util
+  - template-hsml
+  - template-yj
+  - templateify
+  - templatepg
+  - tempo
+  - tempodb
+  - temporal-csound
+  - tempus
+  - tensor
+  - tensor-safe
+  - tensorflow
+  - tensorflow-core-ops
+  - tensorflow-logging
+  - tensorflow-opgen
+  - tensorflow-ops
+  - tensorflow-proto
+  - termbox
+  - termbox-banana
+  - termbox-bindings
+  - terminal-text
+  - termination-combinators
+  - termplot
+  - terntup
+  - terrahs
+  - tersmu
+  - test-fixture
+  - test-framework-doctest
+  - test-framework-quickcheck
+  - test-framework-sandbox
+  - test-framework-skip
+  - test-framework-testing-feat
+  - test-pkg
+  - test-sandbox
+  - test-sandbox-compose
+  - test-sandbox-hunit
+  - test-sandbox-quickcheck
+  - test-shouldbe
+  - test-simple
+  - testbench
+  - testCom
+  - TestExplode
+  - testloop
+  - testpack
+  - testpattern
+  - testrunner
+  - TeX-my-math
+  - tex2txt
+  - texbuilder
+  - text-all
+  - text-and-plots
+  - text-ansi
+  - text-containers
+  - text-format
+  - text-format-heavy
+  - text-format-simple
+  - text-generic-pretty
+  - text-icu-normalized
+  - text-lens
+  - text-lips
+  - text-locale-encoding
+  - text-markup
+  - text-normal
+  - text-offset
+  - text-plus
+  - text-position
+  - text-register-machine
+  - text-replace
+  - text-time
+  - text-trie
+  - text-utf8
+  - text-utils
+  - text-xml-qq
+  - text-zipper-monad
+  - text1
+  - textmatetags
+  - textocat-api
+  - textual
+  - tfp-th
+  - tftp
+  - tga
+  - th-alpha
+  - th-build
+  - th-context
+  - th-dict-discovery
+  - th-fold
+  - th-format
+  - th-instance-reification
+  - th-instances
+  - th-kinds
+  - th-kinds-fork
+  - th-pprint
+  - th-sccs
+  - th-tc
+  - th-to-exp
+  - th-traced
+  - th-typegraph
+  - thank-you-stars
+  - theatre
+  - thentos-cookie-session
+  - Theora
+  - theoremquest
+  - theoremquest-client
+  - thih
+  - thimk
+  - Thingie
+  - thorn
+  - threadmanager
+  - threadscope
+  - threepenny-editors
+  - threepenny-gui-contextmenu
+  - threepenny-gui-flexbox
+  - thrift
+  - throttled-io-loop
+  - through-text
+  - thumbnail-plus
+  - thumbnail-polish
+  - tic-tac-toe
+  - tickle
+  - TicTacToe
+  - tictactoe3d
+  - tidal-midi
+  - tidal-serial
+  - tidal-vis
+  - tie-knot
+  - tiempo
+  - tiger
+  - tightrope
+  - tighttp
+  - timberc
+  - time-extras
+  - time-exts
+  - time-http
+  - time-io-access
+  - time-machine
+  - time-qq
+  - time-quote
+  - time-recurrence
+  - time-series
+  - time-series-lib
+  - time-w3c
+  - time-warp
+  - timecalc
+  - timemap
+  - timeout
+  - timeout-with-results
+  - timeparsers
+  - TimePiece
+  - timeplot
+  - timeprint
+  - timer-wheel
+  - timeseries
+  - timespan
+  - timeutils
+  - timezone-olson-th
+  - timezone-unix
+  - tintin
+  - tiny-scheduler
+  - TinyLaunchbury
+  - tinyMesh
+  - tinytemplate
+  - TinyURL
+  - tinyXml
+  - tip-haskell-frontend
+  - tip-lib
+  - titan
+  - titan-debug-yampa
+  - titan-record-yampa
+  - Titim
+  - tkhs
+  - tkyprof
+  - tldr
+  - tls-extra
+  - tlynx
+  - tmp-postgres
+  - tn
+  - to-haskell
+  - to-string-class
+  - to-string-instances
+  - toboggan
+  - todo
+  - todos
+  - tofromxml
+  - toilet
+  - token-search
+  - tokenify
+  - tokenizer-streaming
+  - tokstyle
+  - toktok
+  - tokyocabinet-haskell
+  - tokyotyrant-haskell
+  - tomato-rubato-openal
+  - toml
+  - tonatona-google-server-api
+  - tonatona-persistent-postgresql
+  - too-many-cells
+  - toodles
+  - Top
+  - top
+  - topkata
+  - torch
+  - TORCS
+  - total-map
+  - TotalMap
+  - touched
+  - Tournament
+  - toxcore
+  - toxiproxy-haskell
+  - toysolver
+  - tpar
+  - tpb
+  - tptp
+  - trace
+  - trace-call
+  - trace-function-call
+  - traced
+  - tracetree
+  - tracing
+  - tracker
+  - trackit
+  - traction
+  - tracy
+  - traildb
+  - trajectory
+  - transactional-events
+  - transf
+  - transfer-db
+  - transformations
+  - TransformeR
+  - transformers-abort
+  - transformers-compose
+  - transformers-convert
+  - transformers-lift
+  - transformers-runnable
+  - TransformersStepByStep
+  - transient
+  - transient-universe
+  - transient-universe-tls
+  - translatable-intset
+  - translate
+  - translate-cli
+  - trasa
+  - trasa-client
+  - trasa-extra
+  - trasa-form
+  - trasa-server
+  - trasa-th
+  - travis
+  - travis-meta-yaml
+  - trawl
+  - traypoweroff
+  - treap
+  - tree-monad
+  - tree-render-text
+  - tree-sitter
+  - tree-sitter-go
+  - tree-sitter-haskell
+  - tree-sitter-java
+  - tree-sitter-json
+  - tree-sitter-php
+  - tree-sitter-python
+  - tree-sitter-ruby
+  - tree-sitter-tsx
+  - tree-sitter-typescript
+  - tree-traversals
+  - TreeCounter
+  - treemap-html
+  - treemap-html-tools
+  - TreeStructures
+  - Treiber
+  - tremulous-query
+  - TrendGraph
+  - trhsx
+  - triangulation
+  - TrieMap
+  - tries
+  - trigger
+  - trim
+  - trimpolya
+  - tripLL
+  - trivia
+  - tropical
+  - tropical-geometry
+  - true-name
+  - truelevel
+  - trurl
+  - tsession
+  - tsession-happstack
+  - tsp-viz
+  - tsparse
+  - tsuntsun
+  - tsvsql
+  - tsweb
+  - ttask
+  - ttn-client
+  - tttool
+  - tubes
+  - tuntap
+  - tuntap-simple
+  - tup-functor
+  - tuple-gen
+  - tuple-lenses
+  - tuple-morph
+  - tuple-ops
+  - tupleinstances
+  - turing-machines
+  - turing-music
+  - turingMachine
+  - turtle-options
+  - tweak
+  - twentefp-eventloop-graphics
+  - twentefp-eventloop-trees
+  - twentefp-graphs
+  - twentefp-rosetree
+  - twentefp-trees
+  - twentefp-websockets
+  - twentyseven
+  - twfy-api-client
+  - twhs
+  - twidge
+  - twilight-stm
+  - twilio
+  - twill
+  - twine
+  - twitter
+  - twitter-conduit
+  - twitter-enumerator
+  - twitter-feed
+  - twitter-types
+  - twitter-types-lens
+  - tx
+  - txt
+  - txtblk
+  - TYB
+  - tyfam-witnesses
+  - typalyze
+  - type-assertions
+  - type-cache
+  - type-cereal
+  - type-combinators
+  - type-combinators-quote
+  - type-combinators-singletons
+  - type-digits
+  - type-eq
+  - type-indexed-queues
+  - type-int
+  - type-interpreter
+  - type-level-bst
+  - type-level-natural-number-induction
+  - type-level-natural-number-operations
+  - type-list
+  - type-ord
+  - type-ord-spine-cereal
+  - type-prelude
+  - type-sets
+  - type-settheory
+  - type-spine
+  - type-structure
+  - type-sub-th
+  - type-tree
+  - typeable-th
+  - TypeClass
+  - typed-spreadsheet
+  - typed-streams
+  - typed-wire
+  - typedflow
+  - typedquery
+  - typehash
+  - TypeIlluminator
+  - typelevel
+  - typelevel-tensor
+  - TypeNat
+  - typeparams
+  - typerep-map
+  - types-compat
+  - typesafe-precure
+  - typescript-docs
+  - typograffiti
+  - tyro
+  - u2f
+  - uber
+  - uberlast
+  - ucam-webauth
+  - ucam-webauth-types
+  - uconv
+  - udp-conduit
+  - udp-streaming
+  - uhc-light
+  - uhc-util
+  - uhexdump
+  - uhttpc
+  - ui-command
+  - ulid
+  - UMM
+  - unagi-bloomfilter
+  - unamb-custom
+  - unbound
+  - unbound-generics
+  - unbound-kind-generics
+  - unbounded-delays-units
+  - unboxed-containers
+  - unbreak
+  - unfix-binders
+  - unfoldable
+  - unfoldable-restricted
+  - uni-events
+  - uni-graphs
+  - uni-htk
+  - uni-posixutil
+  - uni-reactor
+  - uni-uDrawGraph
+  - uni-util
+  - unicode-normalization
+  - unicode-prelude
+  - unicode-show
+  - unicode-symbols
+  - uniform-io
+  - union
+  - union-map
+  - uniqueid
+  - uniquely-represented-sets
+  - units-attoparsec
+  - unittyped
+  - unity-testresult-parser
+  - unitym-yesod
+  - universal-binary
+  - universe-th
+  - unix-fcntl
+  - unix-handle
+  - unix-process-conduit
+  - unjson
+  - unlifted-list
+  - unm-hip
+  - unordered-containers-rematch
+  - unordered-graphs
+  - unordered-intmap
+  - unpack-funcs
+  - unpacked-either
+  - unpacked-maybe
+  - unpacked-maybe-numeric
+  - unpacked-these
+  - unpacked-validation
+  - unparse-attoparsec
+  - unroll-ghc-plugin
+  - unsafely
+  - unscramble
+  - unsequential
+  - unused
+  - uom-plugin
+  - up
+  - update-nix-fetchgit
+  - Updater
+  - uploadcare
+  - upskirt
+  - ureader
+  - urembed
+  - uri
+  - uri-conduit
+  - uri-enumerator
+  - uri-enumerator-file
+  - uri-parse
+  - uri-template
+  - uri-templater
+  - url-decoders
+  - url-generic
+  - URLb
+  - urlcheck
+  - urldecode
+  - UrlDisp
+  - urldisp-happstack
+  - urlencoded
+  - urlpath
+  - URLT
+  - urn
+  - urn-random
+  - urxml
+  - usb-enumerator
+  - usb-hid
+  - usb-id-database
+  - usb-iteratee
+  - usb-safe
+  - useragents
+  - users-mysql-haskell
+  - users-persistent
+  - utc
+  - utf8-prelude
+  - utf8-validator
+  - UTFTConverter
+  - util-exception
+  - util-plus
+  - util-primitive
+  - util-primitive-control
+  - util-universe
+  - uu-cco
+  - uu-cco-examples
+  - uu-cco-hut-parsing
+  - uu-cco-uu-parsinglib
+  - uuagc
+  - uuagc-bootstrap
+  - uuagc-cabal
+  - uuagc-diagrams
+  - uuid-aeson
+  - uvector
+  - uvector-algorithms
+  - uxadt
+  - v4l2
+  - v4l2-examples
+  - vabal
+  - vabal-lib
+  - vacuum
+  - vacuum-cairo
+  - vacuum-graphviz
+  - vacuum-opengl
+  - vacuum-ubigraph
+  - valid-names
+  - validate-input
+  - validated-types
+  - Validation
+  - validations
+  - validationt
+  - value-supply
+  - vampire
+  - var
+  - varan
+  - variable-precision
+  - variables
+  - variation
+  - vault-tool-server
+  - vault-trans
+  - vaultaire-common
+  - vcache
+  - vcache-trie
+  - vcard
+  - vcatt
+  - vcf
+  - vcsgui
+  - vcswrapper
+  - Vec-Boolean
+  - Vec-OpenGLRaw
+  - Vec-Transform
+  - vect-floating
+  - vect-floating-accelerate
+  - vect-opengl
+  - vector-bytestring
+  - vector-clock
+  - vector-conduit
+  - vector-endian
+  - vector-fftw
+  - vector-functorlazy
+  - vector-heterogenous
+  - vector-instances-collections
+  - vector-random
+  - vector-read-instances
+  - vector-space-map
+  - vector-space-opengl
+  - vector-space-points
+  - vector-static
+  - vector-text
+  - vectortiles
+  - venzone
+  - Verba
+  - verbalexpressions
+  - verdict
+  - verdict-json
+  - verifiable-expressions
+  - verify
+  - verilog
+  - verismith
+  - versioning
+  - versioning-servant
+  - vflow-types
+  - vfr-waypoints
+  - vgrep
+  - vhd
+  - vhdl
+  - vicinity
+  - ViennaRNA-extras
+  - viewprof
+  - views
+  - vigilance
+  - Villefort
+  - vimus
+  - vintage-basic
+  - vinyl-gl
+  - vinyl-json
+  - vinyl-named-sugar
+  - vinyl-operational
+  - vinyl-plus
+  - vinyl-utils
+  - vinyl-vectors
+  - virthualenv
+  - visibility
+  - vision
+  - visual-graphrewrite
+  - visual-prof
+  - visualize-cbn
+  - vivid
+  - vivid-osc
+  - vivid-supercollider
+  - vk-aws-route53
+  - VKHS
+  - voicebase
+  - vorbiscomment
+  - vowpal-utils
+  - voyeur
+  - vpq
+  - VRML
+  - vte
+  - vtegtk3
+  - vty-examples
+  - vty-menu
+  - vty-ui
+  - vty-ui-extras
+  - vulkan
+  - waargonaut
+  - wacom-daemon
+  - waddle
+  - wahsp
+  - wai-cli
+  - wai-devel
+  - wai-git-http
+  - wai-graceful
+  - wai-handler-devel
+  - wai-handler-scgi
+  - wai-handler-snap
+  - wai-handler-webkit
+  - wai-hmac-auth
+  - wai-lens
+  - wai-lite
+  - wai-logger-buffered
+  - wai-logger-prefork
+  - wai-make-assets
+  - wai-middleware-auth
+  - wai-middleware-cache
+  - wai-middleware-cache-redis
+  - wai-middleware-catch
+  - wai-middleware-consul
+  - wai-middleware-content-type
+  - wai-middleware-crowd
+  - wai-middleware-delegate
+  - wai-middleware-etag
+  - wai-middleware-headers
+  - wai-middleware-hmac-client
+  - wai-middleware-metrics
+  - wai-middleware-preprocessor
+  - wai-middleware-rollbar
+  - wai-middleware-route
+  - wai-middleware-static-caching
+  - wai-middleware-travisci
+  - wai-request-spec
+  - wai-responsible
+  - wai-route
+  - wai-router
+  - wai-routes
+  - wai-routing
+  - wai-secure-cookies
+  - wai-session-alt
+  - wai-session-mysql
+  - wai-session-postgresql
+  - wai-static-cache
+  - wai-thrift
+  - wai-throttler
+  - waitfree
+  - waitra
+  - waldo
+  - wallpaper
+  - warc
+  - warp-dynamic
+  - warp-static
+  - warp-systemd
+  - warped
+  - WashNGo
+  - wasm
+  - watchdog
+  - watcher
+  - watchit
+  - WAVE
+  - WaveFront
+  - wavefront-obj
+  - wavesurfer
+  - wavy
+  - weak-bag
+  - weather-api
+  - web-css
+  - web-encodings
+  - web-fpco
+  - web-inv-route
+  - web-mongrel2
+  - web-output
+  - web-page
+  - web-push
+  - web-rep
+  - web-routes-quasi
+  - web-routes-regular
+  - web-routes-transformers
+  - web-routing
+  - web3
+  - webapi
+  - webapp
+  - WebBits
+  - WebBits-Html
+  - WebBits-multiplate
+  - webcloud
+  - WebCont
+  - webcrank
+  - webcrank-dispatch
+  - webcrank-wai
+  - webdriver-angular
+  - webdriver-snoy
+  - webdriver-w3c
+  - WeberLogic
+  - webfinger-client
+  - webify
+  - webkit-javascriptcore
+  - Webrexp
+  - webserver
+  - webshow
+  - websockets-rpc
+  - webwire
+  - weighted
+  - weighted-regexp
+  - welshy
+  - werewolf
+  - werewolf-slack
+  - Wheb
+  - wheb-mongo
+  - wheb-redis
+  - wheb-strapped
+  - which
+  - while-lang-parser
+  - whim
+  - whiskers
+  - whitespace
+  - whois
+  - wholepixels
+  - why3
+  - WikimediaParser
+  - wikipedia4epub
+  - wild-bind-indicator
+  - wild-bind-task-x11
+  - windns
+  - windowslive
+  - winerror
+  - winio
+  - Wired
+  - wires
+  - wiring
+  - witty
+  - wkt
+  - wkt-geom
+  - wl-pprint-ansiterm
+  - wl-pprint-extras
+  - wl-pprint-terminfo
+  - WL500gPControl
+  - WL500gPLib
+  - wlc-hs
+  - WMSigner
+  - wobsurv
+  - woe
+  - woffex
+  - wol
+  - wolf
+  - word2vec-model
+  - WordAlignment
+  - wordify
+  - wordlist
+  - WordNet
+  - WordNet-ghc74
+  - wordpass
+  - wordsearch
+  - work-time
+  - workdays
+  - Workflow
+  - workflow-extra
+  - workflow-osx
+  - workflow-pure
+  - workflow-types
+  - workflow-windows
+  - wp-archivebot
+  - wraxml
+  - wrecker
+  - wrecker-ui
+  - wreq-sb
+  - wright
+  - writer-cps-full
+  - writer-cps-lens
+  - writer-cps-monads-tf
+  - writer-cps-morph
+  - ws
+  - wsdl
+  - wsedit
+  - wshterm
+  - wss-client
+  - wtk
+  - wtk-gtk
+  - wu-wei
+  - wumpus-basic
+  - wumpus-core
+  - wumpus-drawing
+  - wumpus-microprint
+  - wumpus-tree
+  - WURFL
+  - wxAsteroids
+  - WXDiffCtrl
+  - wxdirect
+  - wxFruit
+  - WxGeneric
+  - wxhnotepad
+  - wxSimpleCanvas
+  - wxturtle
+  - wyvern
+  - x-dsp
+  - X11-extras
+  - X11-rm
+  - X11-xdamage
+  - X11-xfixes
+  - x86-64bit
+  - xchat-plugin
+  - xcp
+  - xdcc
+  - xdg-desktop-entry
+  - xdot
+  - Xec
+  - xenstore
+  - xfconf
+  - xformat
+  - xhaskell-library
+  - xhb
+  - xhb-atom-cache
+  - xhb-ewmh
+  - xilinx-lava
+  - xine
+  - xing-api
+  - xkbcommon
+  - xkcd
+  - xleb
+  - xls
+  - xlsior
+  - xlsx
+  - xlsx-tabular
+  - xlsx-templater
+  - xml-catalog
+  - xml-conduit-decode
+  - xml-conduit-stylist
+  - xml-enumerator
+  - xml-enumerator-combinators
+  - xml-extractors
+  - xml-html-conduit-lens
+  - xml-monad
+  - xml-parsec
+  - xml-pipe
+  - xml-prettify
+  - xml-push
+  - xml-query
+  - xml-query-xml-conduit
+  - xml-query-xml-types
+  - xml-tydom-conduit
+  - xml-tydom-core
+  - xml2json
+  - xml2x
+  - xmlbf
+  - xmlbf-xeno
+  - xmlbf-xmlhtml
+  - XmlHtmlWriter
+  - xmltv
+  - XMMS
+  - xmms2-client
+  - xmms2-client-glib
+  - xmonad-bluetilebranch
+  - xmonad-contrib-bluetilebranch
+  - xmonad-contrib-gpl
+  - xmonad-eval
+  - xmonad-vanessa
+  - xmonad-windownames
+  - xmpipe
+  - XMPP
+  - xorshift-plus
+  - Xorshift128Plus
+  - xournal-builder
+  - xournal-convert
+  - xournal-parser
+  - xournal-render
+  - xournal-types
+  - xsact
+  - XSaiga
+  - xsd
+  - xslt
+  - xtc
+  - xxhash
+  - y0l0bot
+  - yabi-muno
+  - Yablog
+  - yackage
+  - YACPong
+  - yahoo-finance-api
+  - yahoo-finance-conduit
+  - yahoo-web-search
+  - yajl
+  - yajl-enumerator
+  - yall
+  - yam
+  - yam-config
+  - yam-datasource
+  - yam-logger
+  - yam-redis
+  - yam-servant
+  - yam-transaction
+  - yam-transaction-odbc
+  - yam-transaction-postgresql
+  - yam-web
+  - yaml-pretty-extras
+  - yaml-rpc
+  - yaml-rpc-scotty
+  - yaml-rpc-snap
+  - YamlReference
+  - Yampa
+  - yampa-canvas
+  - yampa-glfw
+  - yampa-gloss
+  - yampa-glut
+  - yampa-sdl2
+  - yampa-test
+  - yampa2048
+  - YampaSynth
+  - yandex-translate
+  - yaop
+  - yap
+  - yarr
+  - yarr-image-io
+  - yavie
+  - ycextra
+  - yeamer
+  - yeller
+  - yeshql
+  - yeshql-core
+  - yeshql-hdbc
+  - yeshql-postgresql-simple
+  - yesod-angular
+  - yesod-angular-ui
+  - yesod-articles
+  - yesod-auth-account
+  - yesod-auth-account-fork
+  - yesod-auth-basic
+  - yesod-auth-bcrypt
+  - yesod-auth-bcryptdb
+  - yesod-auth-deskcom
+  - yesod-auth-fb
+  - yesod-auth-hmac-keccak
+  - yesod-auth-kerberos
+  - yesod-auth-ldap
+  - yesod-auth-ldap-mediocre
+  - yesod-auth-ldap-native
+  - yesod-auth-nopassword
+  - yesod-auth-oauth2
+  - yesod-auth-pam
+  - yesod-auth-smbclient
+  - yesod-auth-zendesk
+  - yesod-bootstrap
+  - yesod-colonnade
+  - yesod-comments
+  - yesod-content-pdf
+  - yesod-continuations
+  - yesod-crud
+  - yesod-crud-persist
+  - yesod-datatables
+  - yesod-dsl
+  - yesod-examples
+  - yesod-fast-devel
+  - yesod-fay
+  - yesod-fb
+  - yesod-form-richtext
+  - yesod-gitrev
+  - yesod-goodies
+  - yesod-ip
+  - yesod-job-queue
+  - yesod-links
+  - yesod-lucid
+  - yesod-mangopay
+  - yesod-markdown
+  - yesod-paginate
+  - yesod-pagination
+  - yesod-paypal-rest
+  - yesod-platform
+  - yesod-pnotify
+  - yesod-pure
+  - yesod-purescript
+  - yesod-raml
+  - yesod-raml-bin
+  - yesod-raml-docs
+  - yesod-raml-mock
+  - yesod-recaptcha
+  - yesod-routes
+  - yesod-routes-flow
+  - yesod-routes-typescript
+  - yesod-rst
+  - yesod-s3
+  - yesod-sass
+  - yesod-session-redis
+  - yesod-static-angular
+  - yesod-static-remote
+  - yesod-test-json
+  - yesod-tls
+  - yesod-vend
+  - yesod-worker
+  - yet-another-logger
+  - YFrob
+  - yggdrasil
+  - yhccore
+  - yi
+  - yi-contrib
+  - yi-core
+  - yi-dynamic-configuration
+  - yi-emacs-colours
+  - yi-frontend-pango
+  - yi-frontend-vty
+  - yi-fuzzy-open
+  - yi-ireader
+  - yi-keymap-cua
+  - yi-keymap-emacs
+  - yi-keymap-vim
+  - yi-language
+  - yi-misc-modes
+  - yi-mode-haskell
+  - yi-mode-javascript
+  - yi-monokai
+  - yi-snippet
+  - yi-solarized
+  - yi-spolsky
+  - yices
+  - yjftp
+  - yjftp-libs
+  - yoda
+  - Yogurt
+  - Yogurt-Standalone
+  - yoko
+  - york-lava
+  - yql
+  - yst
+  - yu-auth
+  - yu-core
+  - yu-launch
+  - yu-tool
+  - yu-utils
+  - yuuko
+  - yxdb-utils
+  - z3-encoding
+  - z85
+  - zabt
+  - zampolit
+  - zbar
+  - ZEBEDDE
+  - zendesk-api
+  - zenhack-prelude
+  - zeno
+  - zephyr
+  - zerobin
+  - zeromq-haskell
+  - zeromq3-conduit
+  - zeromq3-haskell
+  - zeromq4-clone-pattern
+  - zeromq4-conduit
+  - zeromq4-patterns
+  - zeroth
+  - ZFS
+  - zifter
+  - zifter-cabal
+  - zifter-git
+  - zifter-google-java-format
+  - zifter-hindent
+  - zifter-hlint
+  - zifter-stack
+  - zigbee-znet25
+  - zip-conduit
+  - zipedit
+  - zipkin
+  - zipper
+  - zippo
+  - ziptastic-client
+  - ziptastic-core
+  - zlib-enum
+  - zm
+  - ZMachine
+  - zmcat
+  - zmidi-score
+  - zoneinfo
+  - zoom
+  - zoom-cache
+  - zoom-cache-pcm
+  - zoom-cache-sndfile
+  - zoom-refs
+  - zre
+  - zsh-battery
+  - zsyntax
+  - ztail
+  - ztar
+  - zuramaru
+  - Zwaluw
+  - zxcvbn-dvorak
+  - zxcvbn-hs

From c9b2100e0ba7b55fdf9b4adb771efd14a23d9ad4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Feb 2020 15:04:13 +0100
Subject: [PATCH 1832/4636] hackage2nix: stick to older hackage-security
 version to make cabal-install happy

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 86f058a0e383..7a4f3a83c223 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -67,6 +67,8 @@ core-packages:
 # comment saying "# LTS Haskell x.y". Any changes after that commend will be
 # lost the next time `update-stackage.sh` runs.
 default-package-overrides:
+  # for cabal-install-3.0.0.0
+  - hackage-security >=0.5.2.2 && <0.6
   # pandoc-2.9 does not accept the 0.3 version yet
   - doclayout < 0.3
   # gi-gdkx11-4.x requires gtk-4.x, which is still under development and

From 482b910b72fb8e32c91b4b0f46d93bf869c68133 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Feb 2020 15:40:13 +0100
Subject: [PATCH 1833/4636] haskell-streamly-bytestring: drop obsolete override

---
 pkgs/development/haskell-modules/configuration-common.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 56f56c38fa29..6d59e9129555 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1378,11 +1378,6 @@ self: super: {
   # Unnecessary upper bound on vector <0.12.1
   bitwise-enum = doJailbreak super.bitwise-enum;
 
-  # Needs more recent streamly version
-  streamly-bytestring = super.streamly-bytestring.override {
-    streamly = self.streamly_0_7_1;
-  };
-
   # This breaks because of version bounds, but compiles and runs fine.
   # Last commit is 5 years ago, so we likely won't get upstream fixed soon.
   # https://bitbucket.org/rvlm/hakyll-contrib-hyphenation/src/master/

From 045f95d9b90545a7bb0cd7cecc8d3d1675558602 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Feb 2020 17:11:18 +0100
Subject: [PATCH 1834/4636] git-annex: update sha256 hash for version
 8.20200226

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6d59e9129555..2a55d8095a4f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -74,7 +74,7 @@ self: super: {
       name = "git-annex-${super.git-annex.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "1shb1jgm78bx88rbsr1nmimjzzfqw96qdr38mcrr1c2qz5ky820v";
+      sha256 = "0pl0yip7zp4i78cj9jqkmm33wqaaaxjq3ggnfmv95y79yijd6yh4";
     };
   }).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;

From 188587edf67bfd66eda3da200a4123a626c0eefc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2020 10:52:09 +0100
Subject: [PATCH 1835/4636] haskell-feed: disable test suite to fix the build

Upstream ships a messed up tarball that lacks the proper test files.
---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2a55d8095a4f..67afb5c0bc2d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1384,4 +1384,7 @@ self: super: {
   # Therefore we jailbreak it.
   hakyll-contrib-hyphenation = doJailbreak super.hakyll-contrib-hyphenation;
 
+  # https://github.com/bergmark/feed/issues/43
+  feed = dontCheck super.feed;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 219776992d8f1435d15d715ccdd58bff7df2874c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2020 12:05:38 +0100
Subject: [PATCH 1836/4636] git-annex: apply patch to fix the build with
 ghc-8.8.x

Unfortunately, we cannot compile git-annex with S3 support in an
LTS-15.x environment, because the 'aws' library hasn't updated to
version 3.x of the 'network' library [1]. I tried whether it's
possible to build git-annex with an older version of network, but
the amount of overrides we'd have to configure to accomplish that
got out of hand quickly. So I disabled aws support [2]. If you
need S3 support in git-annex, please help upstream to update
'aws' so that it builds with recent versions of 'network'.

[1] https://github.com/aristidb/aws/issues/264
[2] https://github.com/NixOS/cabal2nix/commit/1d0459f40e0fa7483fc5c482dcbca1e1db4c40db
---
 .../haskell-modules/configuration-common.nix  |   2 +-
 .../git-annex-fix-build-with-ghc-8.8.x.patch  | 125 ++++++++++++++++++
 2 files changed, 126 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/haskell-modules/patches/git-annex-fix-build-with-ghc-8.8.x.patch

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 67afb5c0bc2d..67bf8684bf72 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -69,7 +69,7 @@ self: super: {
 
   # The Hackage tarball is purposefully broken, because it's not intended to be, like, useful.
   # https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/
-  git-annex = (overrideSrc super.git-annex {
+  git-annex = (overrideSrc (appendPatch super.git-annex ./patches/git-annex-fix-build-with-ghc-8.8.x.patch) {
     src = pkgs.fetchgit {
       name = "git-annex-${super.git-annex.version}-src";
       url = "git://git-annex.branchable.com/";
diff --git a/pkgs/development/haskell-modules/patches/git-annex-fix-build-with-ghc-8.8.x.patch b/pkgs/development/haskell-modules/patches/git-annex-fix-build-with-ghc-8.8.x.patch
new file mode 100644
index 000000000000..e28a1f5949ee
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/git-annex-fix-build-with-ghc-8.8.x.patch
@@ -0,0 +1,125 @@
+From f8d8959e43abd88c5e977079f0948e45cf4c0b0c Mon Sep 17 00:00:00 2001
+From: Peter Simons <simons@cryp.to>
+Date: Fri, 28 Feb 2020 11:56:48 +0100
+Subject: [PATCH] Fix build with ghc-8.8.x.
+
+The 'fail' method has been moved to the 'MonadFail' class. I made the changes
+so that the code still compiles with previous versions of 'base' that don't
+have the new MonadFail class exported by Prelude yet.
+---
+ CmdLine/GitAnnex/Options.hs | 5 +++--
+ Command/Expire.hs           | 5 +++--
+ Command/Init.hs             | 7 ++++---
+ Utility/HumanTime.hs        | 5 +++--
+ 4 files changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/CmdLine/GitAnnex/Options.hs b/CmdLine/GitAnnex/Options.hs
+index 030c83dd5..a9a36d76f 100644
+--- a/CmdLine/GitAnnex/Options.hs
++++ b/CmdLine/GitAnnex/Options.hs
+@@ -9,6 +9,7 @@
+ 
+ module CmdLine.GitAnnex.Options where
+ 
++import Control.Monad.Fail as Fail ( MonadFail(..) )
+ import Options.Applicative
+ import qualified Data.Map as M
+ 
+@@ -215,8 +216,8 @@ parseAllOption = flag' WantAllKeys
+ 	<> help "operate on all versions of all files"
+ 	)
+ 
+-parseKey :: Monad m => String -> m Key
+-parseKey = maybe (fail "invalid key") return . deserializeKey
++parseKey :: MonadFail m => String -> m Key
++parseKey = maybe (Fail.fail "invalid key") return . deserializeKey
+ 
+ -- Options to match properties of annexed files.
+ annexedMatchingOptions :: [GlobalOption]
+diff --git a/Command/Expire.hs b/Command/Expire.hs
+index 83c38e569..37dc33883 100644
+--- a/Command/Expire.hs
++++ b/Command/Expire.hs
+@@ -17,6 +17,7 @@ import Annex.VectorClock
+ import qualified Remote
+ import Utility.HumanTime
+ 
++import Control.Monad.Fail as Fail ( MonadFail(..) )
+ import Data.Time.Clock.POSIX
+ import qualified Data.Map as M
+ 
+@@ -105,9 +106,9 @@ parseExpire ps = do
+ 		Nothing -> giveup $ "bad expire time: " ++ s
+ 		Just d -> Just (now - durationToPOSIXTime d)
+ 
+-parseActivity :: Monad m => String -> m Activity
++parseActivity :: MonadFail m => String -> m Activity
+ parseActivity s = case readish s of
+-	Nothing -> fail $ "Unknown activity. Choose from: " ++ 
++	Nothing -> Fail.fail $ "Unknown activity. Choose from: " ++ 
+ 		unwords (map show [minBound..maxBound :: Activity])
+ 	Just v -> return v
+ 
+diff --git a/Command/Init.hs b/Command/Init.hs
+index db6cb14fb..879a1110f 100644
+--- a/Command/Init.hs
++++ b/Command/Init.hs
+@@ -13,6 +13,7 @@ import Annex.Version
+ import Types.RepoVersion
+ import qualified Annex.SpecialRemote
+ 
++import Control.Monad.Fail as Fail ( MonadFail(..) )
+ import qualified Data.Map as M
+ 	
+ cmd :: Command
+@@ -33,14 +34,14 @@ optParser desc = InitOptions
+ 		<> help "Override default annex.version"
+ 		))
+ 
+-parseRepoVersion :: Monad m => String -> m RepoVersion
++parseRepoVersion :: MonadFail m => String -> m RepoVersion
+ parseRepoVersion s = case RepoVersion <$> readish s of
+-	Nothing -> fail $ "version parse error"
++	Nothing -> Fail.fail $ "version parse error"
+ 	Just v
+ 		| v `elem` supportedVersions -> return v
+ 		| otherwise -> case M.lookup v autoUpgradeableVersions of
+ 			Just v' -> return v'
+-			Nothing -> fail $ s ++ " is not a currently supported repository version"
++			Nothing -> Fail.fail $ s ++ " is not a currently supported repository version"
+ 
+ seek :: InitOptions -> CommandSeek
+ seek = commandAction . start
+diff --git a/Utility/HumanTime.hs b/Utility/HumanTime.hs
+index 01fbeacfb..d2e70f332 100644
+--- a/Utility/HumanTime.hs
++++ b/Utility/HumanTime.hs
+@@ -19,6 +19,7 @@ module Utility.HumanTime (
+ import Utility.PartialPrelude
+ import Utility.QuickCheck
+ 
++import Control.Monad.Fail as Fail ( MonadFail(..) )
+ import qualified Data.Map as M
+ import Data.Time.Clock
+ import Data.Time.Clock.POSIX (POSIXTime)
+@@ -44,7 +45,7 @@ daysToDuration :: Integer -> Duration
+ daysToDuration i = Duration $ i * dsecs
+ 
+ {- Parses a human-input time duration, of the form "5h", "1m", "5h1m", etc -}
+-parseDuration :: Monad m => String -> m Duration
++parseDuration :: MonadFail m => String -> m Duration
+ parseDuration = maybe parsefail (return . Duration) . go 0
+   where
+ 	go n [] = return n
+@@ -55,7 +56,7 @@ parseDuration = maybe parsefail (return . Duration) . go 0
+ 				u <- M.lookup c unitmap
+ 				go (n + num * u) rest
+ 			_ -> return $ n + num
+-	parsefail = fail "duration parse error; expected eg \"5m\" or \"1h5m\""
++	parsefail = Fail.fail "duration parse error; expected eg \"5m\" or \"1h5m\""
+ 
+ fromDuration :: Duration -> String
+ fromDuration Duration { durationSeconds = d }
+-- 
+2.25.1
+

From df8a0d64b5caeff0fdc6822d0d0899ff8654dc1d Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sat, 22 Feb 2020 19:27:06 -0500
Subject: [PATCH 1837/4636] json: remove obsolete patches that break the build

The patchs in question fail to apply against the current versoin, and
thus the package fails to build; `hasktags` is then collateral damage.

Remove reference to the patch and make sure neither package will be
marked broken going forward.
---
 .../haskell-modules/configuration-ghc-8.8.x.nix            | 7 -------
 .../haskell-modules/configuration-hackage2nix.yaml         | 2 --
 2 files changed, 9 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index 3160dfdd2d6e..d42c2c5f6cfd 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -83,13 +83,6 @@ self: super: {
 
   # https://github.com/snapframework/snap-core/issues/288
   snap-core = overrideCabal super.snap-core (drv: { prePatch = "substituteInPlace src/Snap/Internal/Core.hs --replace 'fail   = Fail.fail' ''"; });
-  # needs a release
-  json = overrideCabal super.json (drv: { prePatch = "substituteInPlace json.cabal --replace '4.13' '4.14'"; patches = [(
-    pkgs.fetchpatch {
-      url = "https://github.com/GaloisInc/json/commit/9d36ca5d865be7e4b2126b68a444b901941d2492.patch";
-      sha256 = "0vyi5nbivkqg6zngq7rb3wwcj9043m4hmyk155nrcddl8j2smfzv";
-    }
-  )]; });
 
   # Upstream ships a broken Setup.hs file.
   csv = overrideCabal super.csv (drv: { prePatch = "rm Setup.hs"; });
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 7a4f3a83c223..76b3dd98330f 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -5625,7 +5625,6 @@ broken-packages:
   - haskore-supercollider
   - haskore-synthesizer
   - HaskRel
-  - hasktags
   - hasktorch
   - hasktorch-codegen
   - hasktorch-ffi-th
@@ -6673,7 +6672,6 @@ broken-packages:
   - jsaddle-wkwebview
   - JsContracts
   - jsmw
-  - json
   - json-assertions
   - json-ast-json-encoder
   - json-ast-quickcheck

From ef891b8a4671641780e22b7fa1ada3ed718f7661 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Fri, 28 Feb 2020 08:57:04 -0500
Subject: [PATCH 1838/4636] MissingH: use a version appropriate to our compiler

If you actually look at the changelog for 1.4.2.1, you'll see that it
mentions that it was only intended for ghc-7.0.4, which is why it has
a dependency on an inconveniently old version of `unix`, which
is *also* hidden behind a flag, so that we can't jailbreak it (per
https://github.com/peti/jailbreak-cabal/issues/15).

So the right thing to do would appear to me to be to override our
default version to 1.4.2.0, until such time as the maintainer makes a
newer release.

`ConfigFile` was collateral damage, so unmark it broken, as well as
`MissingH` itself.
---
 .../haskell-modules/configuration-hackage2nix.yaml            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 76b3dd98330f..2b95625ad5e1 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -67,6 +67,8 @@ core-packages:
 # comment saying "# LTS Haskell x.y". Any changes after that commend will be
 # lost the next time `update-stackage.sh` runs.
 default-package-overrides:
+  # This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag
+  - MissingH ==1.4.2.0
   # for cabal-install-3.0.0.0
   - hackage-security >=0.5.2.2 && <0.6
   # pandoc-2.9 does not accept the 0.3 version yet
@@ -3753,7 +3755,6 @@ broken-packages:
   - confide
   - config-parser
   - config-select
-  - ConfigFile
   - ConfigFileTH
   - Configger
   - configifier
@@ -7422,7 +7423,6 @@ broken-packages:
   - miss
   - miss-porcelain
   - missing-py2
-  - MissingH
   - MissingPy
   - mix-arrows
   - mixed-strategies

From 0dbc457393c9c7840acbef7af1628f4142403d85 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2020 16:18:39 +0100
Subject: [PATCH 1839/4636] spago: build is broken in lts-15.x

Ping @cdepillabout.
---
 pkgs/development/tools/purescript/spago/spago.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix
index adf019eef572..433639ff330d 100644
--- a/pkgs/development/tools/purescript/spago/spago.nix
+++ b/pkgs/development/tools/purescript/spago/spago.nix
@@ -44,4 +44,5 @@ mkDerivation {
   prePatch = "hpack";
   homepage = "https://github.com/purescript/spago#readme";
   license = stdenv.lib.licenses.bsd3;
+  broken = true;   # Build is broken in lts-15.x.
 }

From dcf76c729a76ca30d0b130a7cb8aecb0e1c60714 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2020 16:21:55 +0100
Subject: [PATCH 1840/4636] all-cabal-hashes: update to Hackage at
 2020-02-28T12:23:03Z

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

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 2415e94b92dc..5c2f71bf2f77 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/10e6ea0c54a4aa41de51d1d7e2314115bb2e172a.tar.gz";
-  sha256 = "0kjy1dxa2kra4j02ni8lpg74jy7fl361yiha330c52spvd2v8i8h";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3ff0be5c9ee1ead33e07158b9a4a579fa2fb7a7f.tar.gz";
+  sha256 = "15jqdjxyzcmg50zvl7szv6s2zi4k82as5wi6mkiwwpbdricg50pl";
 }

From b5bf60e40c1ba40881a529c6d7ddb6c18591b432 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 28 Feb 2020 20:28:01 +0100
Subject: [PATCH 1841/4636] haskell-MissingH: add jailbreak to fix the build
 with ghc-8.8.x

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 67bf8684bf72..d0af64c59860 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -521,7 +521,9 @@ self: super: {
 
   # Won't compile with recent versions of QuickCheck.
   inilist = dontCheck super.inilist;
-  MissingH = dontCheck super.MissingH;
+
+  # Doesn't accept recent versions of 'base' or QuickCheck.
+  MissingH = dontCheck (doJailbreak super.MissingH);
 
   # https://github.com/yaccz/saturnin/issues/3
   Saturnin = dontCheck super.Saturnin;

From e81ec2fa826a99a7459a9fb2eb6c81f9c9c247f6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Feb 2020 14:43:56 +0100
Subject: [PATCH 1842/4636] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.0-20-g1d0459f from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/3ff0be5c9ee1ead33e07158b9a4a579fa2fb7a7f.
---
 .../haskell-modules/hackage-packages.nix      | 17780 +++++++++++++++-
 1 file changed, 17196 insertions(+), 584 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 6dca75ad526b..639e73e84a36 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -28,6 +28,8 @@ self: {
        ];
        description = "3D model parsers";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "4Blocks" = callPackage
@@ -43,6 +45,8 @@ self: {
        ];
        description = "A tetris-like game (works with GHC 6.8.3 and Gtk2hs 0.9.13)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AAI" = callPackage
@@ -54,6 +58,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Abstract Application Interface";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ABList" = callPackage
@@ -104,6 +110,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Detect which OS you're running on";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AC-Colour" = callPackage
@@ -126,6 +134,8 @@ self: {
        libraryHaskellDepends = [ array base gtk ];
        description = "GTK+ pixel plotting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AC-HalfInteger" = callPackage
@@ -139,6 +149,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Efficient half-integer type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AC-MiniTest" = callPackage
@@ -152,6 +164,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "A simple test framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AC-PPM" = callPackage
@@ -187,6 +201,8 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base ];
        description = "Trivial wrapper over ansi-terminal";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AC-VanillaArray" = callPackage
@@ -198,6 +214,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Immutable arrays with plain integer indicies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AC-Vector" = callPackage
@@ -211,6 +229,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Efficient geometric vectors and transformations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AC-Vector-Fancy" = callPackage
@@ -222,6 +242,8 @@ self: {
        libraryHaskellDepends = [ AC-Angle AC-Vector base ];
        description = "Fancy type-system stuff for AC-Vector";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ACME" = callPackage
@@ -237,6 +259,8 @@ self: {
        ];
        description = "Essential features";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ADPfusion" = callPackage
@@ -290,6 +314,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ForestStructures ];
        description = "Dynamic programming on tree and forest structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ADPfusionSet" = callPackage
@@ -314,6 +340,8 @@ self: {
        ];
        description = "Dynamic programming for Set data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AERN-Basics" = callPackage
@@ -333,6 +361,8 @@ self: {
        executableHaskellDepends = [ base containers directory ];
        description = "foundational type classes for approximating exact real numbers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AERN-Net" = callPackage
@@ -348,6 +378,8 @@ self: {
        ];
        description = "Compositional lazy dataflow networks for exact real number computation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AERN-Real" = callPackage
@@ -364,6 +396,8 @@ self: {
        ];
        description = "arbitrary precision real interval arithmetic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AERN-Real-Double" = callPackage
@@ -387,6 +421,8 @@ self: {
        ];
        description = "arbitrary precision real interval arithmetic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AERN-Real-Interval" = callPackage
@@ -403,6 +439,8 @@ self: {
        ];
        description = "arbitrary precision real interval arithmetic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AERN-RnToRm" = callPackage
@@ -419,6 +457,8 @@ self: {
        ];
        description = "polynomial function enclosures (PFEs) approximating exact real functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AERN-RnToRm-Plot" = callPackage
@@ -436,6 +476,8 @@ self: {
        ];
        description = "GL plotting of polynomial function enclosures (PFEs)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AES" = callPackage
@@ -477,6 +519,8 @@ self: {
        ];
        description = "A library for writing AGI scripts for Asterisk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ALUT" = callPackage
@@ -506,6 +550,8 @@ self: {
        ];
        description = "Low-level bindings for Asterisk Manager Interface (AMI)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ANum" = callPackage
@@ -567,6 +613,8 @@ self: {
        libraryHaskellDepends = [ AbortT-transformers base monads-tf ];
        description = "Monads-tf instances for the AbortT monad transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AbortT-mtl" = callPackage
@@ -578,6 +626,8 @@ self: {
        libraryHaskellDepends = [ AbortT-transformers base mtl ];
        description = "mtl instances for the AbortT monad transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AbortT-transformers" = callPackage
@@ -595,6 +645,8 @@ self: {
        ];
        description = "A monad and monadic transformer providing \"abort\" functionality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ActionKid" = callPackage
@@ -618,6 +670,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "An easy-to-use video game framework for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Adaptive" = callPackage
@@ -633,6 +687,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Adaptive-Blaisorblade" = callPackage
@@ -647,6 +703,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Advgame" = callPackage
@@ -660,6 +718,8 @@ self: {
        executableHaskellDepends = [ base haskell98 mtl ];
        description = "Lisperati's adventure game in Lisp translated to Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Advise-me" = callPackage
@@ -689,6 +749,8 @@ self: {
        ];
        description = "Assessment services for the Advise-Me project";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AesonBson" = callPackage
@@ -725,6 +787,8 @@ self: {
        ];
        description = "Generator-generator for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Agda" = callPackage
@@ -797,6 +861,8 @@ self: {
        ];
        description = "Aho-Corasick string matching algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AlanDeniseEricLauren" = callPackage
@@ -818,6 +884,8 @@ self: {
        benchmarkHaskellDepends = [ base containers criterion ];
        description = "Find the minimal subset/submap satisfying some property";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AlgoRhythm" = callPackage
@@ -846,6 +914,8 @@ self: {
        ];
        description = "Algorithmic music composition";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AlgorithmW" = callPackage
@@ -859,6 +929,8 @@ self: {
        executableHaskellDepends = [ base containers mtl pretty ];
        description = "Example implementation of Algorithm W for Hindley-Milner type inference";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AlignmentAlgorithms" = callPackage
@@ -875,6 +947,8 @@ self: {
        ];
        description = "Collection of alignment algorithms";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Allure" = callPackage
@@ -902,6 +976,8 @@ self: {
        ];
        description = "Near-future Sci-Fi roguelike and tactical squad combat game";
        license = stdenv.lib.licenses.agpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AndroidViewHierarchyImporter" = callPackage
@@ -921,6 +997,8 @@ self: {
        ];
        description = "Android view hierarchy importer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Animas" = callPackage
@@ -932,6 +1010,8 @@ self: {
        libraryHaskellDepends = [ base random ];
        description = "Updated version of Yampa: a library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Annotations" = callPackage
@@ -944,6 +1024,8 @@ self: {
        testHaskellDepends = [ base mtl multirec parsec ];
        description = "Constructing, analyzing and destructing annotated trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Ansi2Html" = callPackage
@@ -975,6 +1057,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Library for Apple Push Notification Service";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AppleScript" = callPackage
@@ -986,6 +1070,8 @@ self: {
        doHaddock = false;
        description = "Call AppleScript from Haskell, and then call back into Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ApproxFun-hs" = callPackage
@@ -997,6 +1083,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "Function approximation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ArrayRef" = callPackage
@@ -1008,6 +1096,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Unboxed references, dynamic arrays and more";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ArrowVHDL" = callPackage
@@ -1019,6 +1109,8 @@ self: {
        libraryHaskellDepends = [ base process ];
        description = "A library to generate Netlist code from Arrow descriptions";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AspectAG" = callPackage
@@ -1037,6 +1129,8 @@ self: {
        ];
        description = "Strongly typed Attribute Grammars implemented using type-level programming";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AttoBencode" = callPackage
@@ -1057,6 +1151,8 @@ self: {
        ];
        description = "Fast Bencode encoding and parsing library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AttoJson" = callPackage
@@ -1073,6 +1169,8 @@ self: {
        ];
        description = "Simple lightweight JSON parser, generator & manipulator based on ByteString";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Attrac" = callPackage
@@ -1088,6 +1186,8 @@ self: {
        ];
        description = "Visualisation of Strange Attractors in 3-Dimensions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Aurochs" = callPackage
@@ -1101,6 +1201,8 @@ self: {
        executableHaskellDepends = [ base containers parsec pretty ];
        description = "Yet another parser generator for C/C++";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AutoForms" = callPackage
@@ -1116,6 +1218,8 @@ self: {
        ];
        description = "GUI library based upon generic programming (SYB3)";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "AvlTree" = callPackage
@@ -1127,6 +1231,8 @@ self: {
        libraryHaskellDepends = [ base COrdering ];
        description = "Balanced binary trees using the AVL algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BASIC" = callPackage
@@ -1138,6 +1244,8 @@ self: {
        libraryHaskellDepends = [ base containers llvm random timeit ];
        description = "Embedded BASIC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BCMtools" = callPackage
@@ -1164,6 +1272,8 @@ self: {
        ];
        description = "Big Contact Map Tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BNFC" = callPackage
@@ -1218,6 +1328,8 @@ self: {
        libraryHaskellDepends = [ base cairo containers mtl ];
        description = "Tools for self-assembly";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Bang" = callPackage
@@ -1233,6 +1345,8 @@ self: {
        ];
        description = "A Drum Machine DSL for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Barracuda" = callPackage
@@ -1261,6 +1375,8 @@ self: {
        ];
        description = "An ad-hoc P2P chat program";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Befunge93" = callPackage
@@ -1274,6 +1390,8 @@ self: {
        executableHaskellDepends = [ array base mtl random ];
        description = "An interpreter for the Befunge-93 Programming Language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BenchmarkHistory" = callPackage
@@ -1291,6 +1409,8 @@ self: {
        ];
        description = "Benchmark functions with history";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BerkeleyDB" = callPackage
@@ -1317,6 +1437,8 @@ self: {
        librarySystemDepends = [ db dbxml xercesc xqilla ];
        description = "Berkeley DB XML binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) db; inherit (pkgs) dbxml; 
          inherit (pkgs) xercesc; inherit (pkgs) xqilla;};
 
@@ -1329,6 +1451,8 @@ self: {
        libraryHaskellDepends = [ base besout ];
        description = "Factorization of polynomials over finite field";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiGUL" = callPackage
@@ -1343,6 +1467,8 @@ self: {
        ];
        description = "The Bidirectional Generic Update Language";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BigPixel" = callPackage
@@ -1384,6 +1510,8 @@ self: {
        ];
        description = "Libary for Hidden Markov Models in HMMER3 format";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Biobase" = callPackage
@@ -1405,6 +1533,8 @@ self: {
        ];
        description = "Base library for bioinformatics";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseBlast" = callPackage
@@ -1431,6 +1561,8 @@ self: {
        ];
        description = "BLAST-related tools";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseDotP" = callPackage
@@ -1442,6 +1574,8 @@ self: {
        libraryHaskellDepends = [ base bytestring iteratee ];
        description = "Vienna / DotBracket / ExtSS parsers";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseENA" = callPackage
@@ -1464,6 +1598,8 @@ self: {
        ];
        description = "European Nucleotide Archive data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseEnsembl" = callPackage
@@ -1481,6 +1617,8 @@ self: {
        ];
        description = "Ensembl related datastructures and functions";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseFR3D" = callPackage
@@ -1496,6 +1634,8 @@ self: {
        ];
        description = "Importer for FR3D resources";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseFasta" = callPackage
@@ -1520,6 +1660,8 @@ self: {
        ];
        description = "streaming FASTA parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseHTTP" = callPackage
@@ -1537,6 +1679,8 @@ self: {
        ];
        description = "Libary to interface with the Bioinformatics HTTP services - Entrez Ensembl";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseHTTPTools" = callPackage
@@ -1557,6 +1701,8 @@ self: {
        ];
        description = "Tools to query Bioinformatics HTTP services e.g. Entrez, Ensembl.";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseInfernal" = callPackage
@@ -1595,6 +1741,8 @@ self: {
        ];
        description = "Infernal data structures and tools";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseMAF" = callPackage
@@ -1606,6 +1754,8 @@ self: {
        libraryHaskellDepends = [ base bytestring containers iteratee ];
        description = "Multiple Alignment Format";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseNewick" = callPackage
@@ -1633,6 +1783,8 @@ self: {
        ];
        description = "Newick file format parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseTrainingData" = callPackage
@@ -1652,6 +1804,8 @@ self: {
        executableHaskellDepends = [ cmdargs ];
        description = "RNA folding training data";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseTurner" = callPackage
@@ -1669,6 +1823,8 @@ self: {
        ];
        description = "Import Turner RNA parameters";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseTypes" = callPackage
@@ -1701,6 +1857,8 @@ self: {
        ];
        description = "Collection of types for bioinformatics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseVienna" = callPackage
@@ -1716,6 +1874,8 @@ self: {
        ];
        description = "Import Vienna energy parameters";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BiobaseXNA" = callPackage
@@ -1757,6 +1917,8 @@ self: {
        ];
        description = "Efficient RNA/DNA/Protein Primary/Secondary Structure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BirdPP" = callPackage
@@ -1770,6 +1932,8 @@ self: {
        executableHaskellDepends = [ base haskell98 ];
        description = "A preprocessor for Bird-style Literate Haskell comments with Haddock markup";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BitStringRandomMonad" = callPackage
@@ -1789,6 +1953,8 @@ self: {
          transformers vector
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BitSyntax" = callPackage
@@ -1813,6 +1979,8 @@ self: {
        libraryHaskellDepends = [ base HTTP json2 ];
        description = "A library to access bit.ly URL shortener.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BlastHTTP" = callPackage
@@ -1830,6 +1998,8 @@ self: {
        ];
        description = "Libary to interface with the NCBI blast REST interface";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Blobs" = callPackage
@@ -1851,6 +2021,8 @@ self: {
        ];
        description = "Diagram editor";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BlogLiterately" = callPackage
@@ -1877,6 +2049,8 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        description = "A tool for posting Haskelly articles to blogs";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BlogLiterately-diagrams" = callPackage
@@ -1898,6 +2072,8 @@ self: {
        executableHaskellDepends = [ base BlogLiterately ];
        description = "Include images in blog posts with inline diagrams code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Blogdown" = callPackage
@@ -1926,6 +2102,8 @@ self: {
        ];
        description = "A markdown-like markup language designed for blog posts";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BluePrintCSS" = callPackage
@@ -1948,6 +2126,8 @@ self: {
        doHaddock = false;
        description = "Preview of a new build system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Bookshelf" = callPackage
@@ -1968,6 +2148,8 @@ self: {
        testHaskellDepends = [ base process ];
        description = "A simple document organizer with some wiki functionality";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Boolean" = callPackage
@@ -2006,6 +2188,8 @@ self: {
        ];
        description = "Static text template generation library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "BufferedSocket" = callPackage
@@ -2017,6 +2201,8 @@ self: {
        libraryHaskellDepends = [ base bytestring network text ];
        description = "A socker wrapper that makes the IO of sockets much cleaner";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Buster" = callPackage
@@ -2041,6 +2227,8 @@ self: {
        ];
        description = "Hits a set of urls periodically to bust caches";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CBOR" = callPackage
@@ -2061,6 +2249,8 @@ self: {
        ];
        description = "Encode/Decode values to/from CBOR";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CC-delcont" = callPackage
@@ -2090,6 +2280,8 @@ self: {
        doHaddock = false;
        description = "Three new monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CC-delcont-cxe" = callPackage
@@ -2101,6 +2293,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CC-delcont-exc" = callPackage
@@ -2112,6 +2306,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CC-delcont-ref" = callPackage
@@ -2123,6 +2319,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control using refercence cells";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CC-delcont-ref-tf" = callPackage
@@ -2134,6 +2332,8 @@ self: {
        libraryHaskellDepends = [ base ref-tf transformers ];
        description = "A monad transformers for multi-prompt delimited control using refercence cells";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CCA" = callPackage
@@ -2151,6 +2351,8 @@ self: {
        executableToolDepends = [ happy ];
        description = "preprocessor and library for Causal Commutative Arrows (CCA)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CHXHtml" = callPackage
@@ -2180,6 +2382,8 @@ self: {
        ];
        description = "Cursor Library for A Structured Editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CLI" = callPackage
@@ -2192,6 +2396,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "CLI tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CMCompare" = callPackage
@@ -2210,6 +2416,8 @@ self: {
        executableHaskellDepends = [ cmdargs ];
        description = "Infernal covariance model comparison";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CMQ" = callPackage
@@ -2226,6 +2434,8 @@ self: {
        ];
        description = "cwmwl udp message queue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "COrdering" = callPackage
@@ -2237,6 +2447,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An algebraic data type similar to Prelude Ordering";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CPBrainfuck" = callPackage
@@ -2251,6 +2463,8 @@ self: {
        executableHaskellDepends = [ base haskell98 ];
        description = "A simple Brainfuck interpretter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CPL" = callPackage
@@ -2266,6 +2480,8 @@ self: {
        ];
        description = "An interpreter of Hagino's Categorical Programming Language (CPL)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CSPM-CoreLanguage" = callPackage
@@ -2293,6 +2509,8 @@ self: {
        ];
        description = "Firing rules semantic of CSPM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CSPM-Frontend" = callPackage
@@ -2310,6 +2528,8 @@ self: {
        libraryToolDepends = [ alex ];
        description = "A CSP-M parser compatible with FDR-2.91";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CSPM-Interpreter" = callPackage
@@ -2326,6 +2546,8 @@ self: {
        ];
        description = "An interpreter for CSPM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CSPM-ToProlog" = callPackage
@@ -2339,6 +2561,8 @@ self: {
        ];
        description = "some modules specific for the ProB tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CSPM-cspm" = callPackage
@@ -2364,6 +2588,8 @@ self: {
        ];
        description = "cspm command line tool for analyzing CSPM specifications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CTRex" = callPackage
@@ -2408,6 +2634,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "OpenCV based machine vision library";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {opencv_calib3d = null; opencv_contrib = null; 
          opencv_core = null; opencv_features2d = null; opencv_flann = null; 
          opencv_gpu = null; opencv_highgui = null; opencv_imgproc = null; 
@@ -2525,6 +2753,8 @@ self: {
        ];
        description = "A framework for packaging Haskell software";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CabalSearch" = callPackage
@@ -2542,6 +2772,8 @@ self: {
        ];
        description = "Search cabal packages by name";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Capabilities" = callPackage
@@ -2553,6 +2785,8 @@ self: {
        libraryHaskellDepends = [ base compdata directory free unix ];
        description = "Separate and contain effects of IO monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Cardinality" = callPackage
@@ -2575,6 +2809,8 @@ self: {
        libraryHaskellDepends = [ base containers fgl parsec ];
        description = "An implementation and DSL for the Carneades argumentation model";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CarneadesIntoDung" = callPackage
@@ -2591,6 +2827,8 @@ self: {
        ];
        description = "A translation from the Carneades argumentation model into Dung's AFs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Cartesian" = callPackage
@@ -2602,6 +2840,8 @@ self: {
        libraryHaskellDepends = [ base lens linear template-haskell ];
        description = "Coordinate systems";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Cascade" = callPackage
@@ -2613,6 +2853,8 @@ self: {
        libraryHaskellDepends = [ base comonad ghc-prim mtl void ];
        description = "Playing with reified categorical composition";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Cassava" = callPackage
@@ -2639,6 +2881,8 @@ self: {
        ];
        description = "A CSV parsing and encoding library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Catana" = callPackage
@@ -2650,6 +2894,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad for complex manipulation of a stream";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ChannelT" = callPackage
@@ -2738,6 +2984,8 @@ self: {
        ];
        description = "A backend for the Chart library for FLTKHS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Chart-gtk" = callPackage
@@ -2786,6 +3034,8 @@ self: {
        ];
        description = "A wrapper for the chart library to assist with basic plots (Deprecated - use the Easy module instead)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Chart-tests" = callPackage
@@ -2855,6 +3105,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Inbuilt checking for ultra reliable computing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Chitra" = callPackage
@@ -2868,6 +3120,8 @@ self: {
        executableHaskellDepends = [ base binary bytestring mtl network ];
        description = "A platform independent mechanism to render graphics using vnc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ChristmasTree" = callPackage
@@ -2883,6 +3137,8 @@ self: {
        ];
        description = "Alternative approach of 'read' that composes grammars instead of parsers";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CirruParser" = callPackage
@@ -2916,6 +3172,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ClassLaws" = callPackage
@@ -2927,6 +3185,8 @@ self: {
        libraryHaskellDepends = [ base ChasingBottoms mtl QuickCheck ];
        description = "Stating and checking laws for type class methods";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ClassyPrelude" = callPackage
@@ -2938,6 +3198,8 @@ self: {
        libraryHaskellDepends = [ base strict ];
        description = "Prelude replacement using classes instead of concrete types where reasonable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Clean" = callPackage
@@ -2949,6 +3211,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A light, clean and powerful utility library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Clipboard" = callPackage
@@ -2980,6 +3244,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Libary for parsing Clustal tools output";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Coadjute" = callPackage
@@ -2997,6 +3263,8 @@ self: {
        ];
        description = "A generic build tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Codec-Compression-LZF" = callPackage
@@ -3065,6 +3333,8 @@ self: {
        ];
        description = "A concurrent bittorrent client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Command" = callPackage
@@ -3076,6 +3346,8 @@ self: {
        libraryHaskellDepends = [ base directory process ];
        description = "A replacement for System.Exit and System.Process";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Commando" = callPackage
@@ -3098,6 +3370,8 @@ self: {
        ];
        description = "Watch some files; Rerun a command";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ComonadSheet" = callPackage
@@ -3115,6 +3389,8 @@ self: {
        ];
        description = "A library for expressing spreadsheet-like computations as the fixed-points of comonads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Compactable" = callPackage
@@ -3126,6 +3402,8 @@ self: {
        libraryHaskellDepends = [ base containers transformers vector ];
        description = "A generalization for containers that can be stripped of Nothing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Concurrent-Cache" = callPackage
@@ -3137,6 +3415,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A Cached variable for IO functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ConcurrentUtils" = callPackage
@@ -3154,6 +3434,8 @@ self: {
        ];
        description = "Concurrent utilities";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Concurrential" = callPackage
@@ -3165,6 +3447,8 @@ self: {
        libraryHaskellDepends = [ async base ];
        description = "Mix concurrent and sequential computation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Condor" = callPackage
@@ -3186,6 +3470,8 @@ self: {
        ];
        description = "Information retrieval library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ConfigFile" = callPackage
@@ -3212,6 +3498,8 @@ self: {
        ];
        description = "Template haskell for reading ConfigFiles";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Configger" = callPackage
@@ -3223,6 +3511,8 @@ self: {
        libraryHaskellDepends = [ base Dangerous MissingH mtl parsec ];
        description = "Parse config files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Configurable" = callPackage
@@ -3234,6 +3524,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Declare types as Configurable then specialize them all in one place";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ConsStream" = callPackage
@@ -3258,6 +3550,8 @@ self: {
        executableHaskellDepends = [ base process ];
        description = "Restart a command on STDIN activity";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ConstraintKinds" = callPackage
@@ -3269,6 +3563,8 @@ self: {
        libraryHaskellDepends = [ base dlist ghc-prim vector ];
        description = "Repackages standard type classes with the ConstraintKinds extension";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Consumer" = callPackage
@@ -3280,6 +3576,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad and monad transformer for consuming streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ContArrow" = callPackage
@@ -3291,6 +3589,8 @@ self: {
        libraryHaskellDepends = [ arrows base ];
        description = "Control.Arrow.Transformer.Cont";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ContextAlgebra" = callPackage
@@ -3308,6 +3608,8 @@ self: {
        ];
        description = "Implementation of the context algebra";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Contract" = callPackage
@@ -3319,6 +3621,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Practical typed lazy contracts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Control-Engine" = callPackage
@@ -3350,6 +3654,8 @@ self: {
        ];
        description = "A Library for Writing Multi-Pass Algorithms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Control-Monad-ST2" = callPackage
@@ -3367,6 +3673,8 @@ self: {
        ];
        description = "A variation on the ST monad with two type parameters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CoreDump" = callPackage
@@ -3378,6 +3686,8 @@ self: {
        libraryHaskellDepends = [ base ghc pretty pretty-show ];
        description = "A GHC plugin for printing GHC's internal Core data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CoreErlang" = callPackage
@@ -3389,6 +3699,8 @@ self: {
        libraryHaskellDepends = [ base parsec pretty ];
        description = "Manipulating Core Erlang source code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CoreFoundation" = callPackage
@@ -3407,6 +3719,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to Mac OSX's CoreFoundation framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Coroutine" = callPackage
@@ -3418,6 +3732,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Type-safe coroutines using lightweight session types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "CouchDB" = callPackage
@@ -3438,6 +3754,8 @@ self: {
        ];
        description = "CouchDB interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Craft3e" = callPackage
@@ -3454,6 +3772,8 @@ self: {
        doHaddock = false;
        description = "Code for Haskell: the Craft of Functional Programming, 3rd ed";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Crypto" = callPackage
@@ -3508,6 +3828,8 @@ self: {
        ];
        description = "CurryDB: In-memory Key/Value Database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DAG-Tournament" = callPackage
@@ -3525,6 +3847,8 @@ self: {
        ];
        description = "Real-Time Game Tournament Evaluator";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DAV" = callPackage
@@ -3581,6 +3905,8 @@ self: {
        ];
        description = "DBFunctor - Functional Data Management => ETL/ELT Data Processing in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DBlimited" = callPackage
@@ -3594,6 +3920,8 @@ self: {
        executableHaskellDepends = [ base containers parsec ];
        description = "A command-line SQL interface for flat files (tdf,csv,etc.)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DBus" = callPackage
@@ -3605,6 +3933,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "D-Bus bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DCFL" = callPackage
@@ -3629,6 +3959,8 @@ self: {
        executableHaskellDepends = [ base MuCheck ];
        description = "Distributed Mutation Analysis framework for MuCheck";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DOH" = callPackage
@@ -3665,6 +3997,8 @@ self: {
        libraryHaskellDepends = [ base mtl WebBits ];
        description = "DOM Level 2 bindings for the WebBits package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DP" = callPackage
@@ -3680,6 +4014,8 @@ self: {
        ];
        description = "Pragmatic framework for dynamic programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DPM" = callPackage
@@ -3703,6 +4039,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Darcs Patch Manager";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DPutils" = callPackage
@@ -3787,6 +4125,8 @@ self: {
        ];
        description = "Implementation of DSA, based on the description of FIPS 186-4";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DSH" = callPackage
@@ -3815,6 +4155,8 @@ self: {
        ];
        description = "Database Supported Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DSTM" = callPackage
@@ -3836,6 +4178,8 @@ self: {
        ];
        description = "A framework for using STM within distributed systems";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DTC" = callPackage
@@ -3847,6 +4191,8 @@ self: {
        libraryHaskellDepends = [ base haskell-src-exts ];
        description = "Data To Class transformation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Dangerous" = callPackage
@@ -3858,6 +4204,8 @@ self: {
        libraryHaskellDepends = [ base MaybeT mtl ];
        description = "Monads for operations that can exit early and produce warnings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Dao" = callPackage
@@ -3888,6 +4236,8 @@ self: {
        ];
        description = "Dao is meta programming language with its own built-in interpreted language, designed with artificial intelligence applications in mind";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DarcsHelpers" = callPackage
@@ -3899,6 +4249,8 @@ self: {
        libraryHaskellDepends = [ base HaXml mtl parsec safe xml-parsec ];
        description = "Code used by Patch-Shack that seemed sensible to open for reusability";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Data-Angle" = callPackage
@@ -3936,6 +4288,8 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "Ropes, an alternative to (Byte)Strings";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DataIndex" = callPackage
@@ -3969,6 +4323,8 @@ self: {
        ];
        description = "A GTK widget for displaying arbitrary Data.Data.Data instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DataVersion" = callPackage
@@ -4010,6 +4366,8 @@ self: {
        testHaskellDepends = [ base doctest filemanip QuickCheck ];
        description = "Write clients for Meteor's DDP Protocol";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DebugTraceHelpers" = callPackage
@@ -4049,6 +4407,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A very simple implementation of decision trees for discrete attributes";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DeepArrow" = callPackage
@@ -4096,6 +4456,8 @@ self: {
        ];
        description = "A simple RTS game";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Delta-Lambda" = callPackage
@@ -4118,6 +4480,8 @@ self: {
        ];
        description = "A demonstration interpreter for type system delta-lambda (of N.G. De-bruijn)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DescriptiveKeys" = callPackage
@@ -4146,6 +4510,8 @@ self: {
        ];
        description = "Processing Real-time event streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Diff" = callPackage
@@ -4176,6 +4542,8 @@ self: {
        ];
        description = "A theory solver for conjunctions of literals in difference logic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DifferentialEvolution" = callPackage
@@ -4191,6 +4559,8 @@ self: {
        ];
        description = "Global optimization using Differential Evolution";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Digit" = callPackage
@@ -4225,6 +4595,8 @@ self: {
        testHaskellDepends = [ base hspec lens mtl text ];
        description = "A client library for the DigitalOcean API";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DimensionalHash" = callPackage
@@ -4236,6 +4608,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An n-dimensional hash using Morton numbers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DirectSound" = callPackage
@@ -4269,6 +4643,8 @@ self: {
        ];
        description = "Distributed Bug Tracking System";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DiscussionSupportSystem" = callPackage
@@ -4285,6 +4661,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Discussion support system";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Dish" = callPackage
@@ -4299,6 +4677,8 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Hash modules (currently Murmur3)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Dist" = callPackage
@@ -4311,6 +4691,8 @@ self: {
        testHaskellDepends = [ base containers MonadRandom ];
        description = "A Haskell library for probability distributions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DistanceTransform" = callPackage
@@ -4364,6 +4746,8 @@ self: {
        ];
        description = "Frameshift-aware alignment of protein sequences with DNA sequences";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DocTest" = callPackage
@@ -4381,6 +4765,8 @@ self: {
        ];
        description = "Test interactive Haskell examples";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Docs" = callPackage
@@ -4410,6 +4796,8 @@ self: {
        executableHaskellDepends = [ array base containers pretty ];
        description = "A tool for deriving hylomorphisms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DrIFT" = callPackage
@@ -4427,6 +4815,8 @@ self: {
        ];
        description = "Program to derive type class instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DrIFT-cabalized" = callPackage
@@ -4441,6 +4831,8 @@ self: {
        executableHaskellDepends = [ base old-time process random ];
        description = "Program to derive type class instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Dung" = callPackage
@@ -4454,6 +4846,8 @@ self: {
        libraryHaskellDepends = [ base cmdargs containers parsec ];
        description = "An implementation of the Dung argumentation frameworks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Dust" = callPackage
@@ -4479,6 +4873,8 @@ self: {
        ];
        description = "Polymorphic protocol engine";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Dust-crypto" = callPackage
@@ -4505,6 +4901,8 @@ self: {
        ];
        description = "Cryptographic operations";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "Dust-tools" = callPackage
@@ -4529,6 +4927,8 @@ self: {
        ];
        description = "Network filtering exploration tools";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Dust-tools-pcap" = callPackage
@@ -4550,6 +4950,8 @@ self: {
        ];
        description = "Network filtering exploration tools that rely on pcap";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DynamicTimeWarp" = callPackage
@@ -4567,6 +4969,8 @@ self: {
        ];
        description = "Dynamic time warping of sequences";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DysFRP" = callPackage
@@ -4580,6 +4984,8 @@ self: {
        ];
        description = "dysFunctional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DysFRP-Cairo" = callPackage
@@ -4591,6 +4997,8 @@ self: {
        libraryHaskellDepends = [ base cairo DysFRP gtk mtl ];
        description = "dysFunctional Reactive Programming on Cairo";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "DysFRP-Craftwerk" = callPackage
@@ -4607,6 +5015,8 @@ self: {
        ];
        description = "dysFunctional Reactive Programming on Craftwerk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "EEConfig" = callPackage
@@ -4687,6 +5097,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A library of efficient, purely-functional data structures (API)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "EdisonCore" = callPackage
@@ -4702,6 +5114,8 @@ self: {
        ];
        description = "A library of efficient, purely-functional data structures (Core Implementations)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "EditTimeReport" = callPackage
@@ -4720,6 +5134,8 @@ self: {
        ];
        description = "Query language and report generator for edit logs";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Eight-Ball-Pool-Hack-Cheats" = callPackage
@@ -4742,6 +5158,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "EitherT" = callPackage
@@ -4759,6 +5177,8 @@ self: {
        ];
        description = "EitherT monad transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Elm" = callPackage
@@ -4814,6 +5234,8 @@ self: {
        ];
        description = "derives heuristic rules from nominal data";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Empty" = callPackage
@@ -4825,6 +5247,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A type class for empty containers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Encode" = callPackage
@@ -4855,6 +5279,8 @@ self: {
        ];
        description = "Libary to interface with the NCBI Entrez REST service";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Enum" = callPackage
@@ -4878,6 +5304,8 @@ self: {
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Simple Enum-class-based int containers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "EnumMap" = callPackage
@@ -4889,6 +5317,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "More general IntMap replacement";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Eq" = callPackage
@@ -4907,6 +5337,8 @@ self: {
        ];
        description = "Render math formula in ASCII, and perform some simplifications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "EqualitySolver" = callPackage
@@ -4920,6 +5352,8 @@ self: {
        ];
        description = "A theory solver for conjunctions of literals in the theory of uninterpreted functions with equality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "EsounD" = callPackage
@@ -4939,6 +5373,8 @@ self: {
        ];
        description = "Type-safe bindings to EsounD (ESD; Enlightened Sound Daemon)";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "EstProgress" = callPackage
@@ -4950,6 +5386,8 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base mtl ];
        description = "Methods for estimating the progress of functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "EtaMOO" = callPackage
@@ -4974,6 +5412,8 @@ self: {
        executablePkgconfigDepends = [ pcre ];
        description = "A new implementation of the LambdaMOO server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) pcre;};
 
   "Etage" = callPackage
@@ -4989,6 +5429,8 @@ self: {
        ];
        description = "A general data-flow framework";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Etage-Graph" = callPackage
@@ -5007,6 +5449,8 @@ self: {
        ];
        description = "Data-flow based graph algorithms";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Eternal10Seconds" = callPackage
@@ -5021,6 +5465,8 @@ self: {
        executableHaskellDepends = [ base haskell98 SDL SDL-mixer ];
        description = "A 2-D shooting game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Etherbunny" = callPackage
@@ -5042,6 +5488,8 @@ self: {
        executableSystemDepends = [ libpcap ];
        description = "A network analysis toolkit for Haskell";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libpcap;};
 
   "EuroIT" = callPackage
@@ -5069,6 +5517,8 @@ self: {
        ];
        description = "Library for computer music research and education";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "EventSocket" = callPackage
@@ -5084,6 +5534,8 @@ self: {
        ];
        description = "Interfaces with FreeSwitch Event Socket";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Extra" = callPackage
@@ -5103,6 +5555,8 @@ self: {
        ];
        description = "A grab bag of modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FAI" = callPackage
@@ -5140,6 +5594,8 @@ self: {
        ];
        description = "Compose music";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FM-SBLEX" = callPackage
@@ -5153,6 +5609,8 @@ self: {
        executableHaskellDepends = [ array base containers haskell98 ];
        description = "A set of computational morphology tools for Swedish diachronic lexicons";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FModExRaw" = callPackage
@@ -5165,6 +5623,8 @@ self: {
        librarySystemDepends = [ fmodex64 ];
        description = "The Haskell FModEx raw API";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {fmodex64 = null;};
 
   "FPretty" = callPackage
@@ -5178,6 +5638,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Efficient simple pretty printing combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FTGL" = callPackage
@@ -5207,6 +5669,8 @@ self: {
        librarySystemDepends = [ ftgl ];
        description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ftgl;};
 
   "FTPLine" = callPackage
@@ -5225,6 +5689,8 @@ self: {
        ];
        description = "A command-line FTP client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Facebook-Password-Hacker-Online-Latest-Version" = callPackage
@@ -5249,6 +5715,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Facts" = callPackage
@@ -5264,6 +5732,8 @@ self: {
        ];
        description = "A collection of facts about the real world";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FailureT" = callPackage
@@ -5275,6 +5745,8 @@ self: {
        libraryHaskellDepends = [ base base-unicode-symbols mmtl ];
        description = "Failure Monad Transformer";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FastPush" = callPackage
@@ -5286,6 +5758,8 @@ self: {
        libraryHaskellDepends = [ base STMonadTrans vector ];
        description = "A monad and monad transformer for pushing things onto a stack very fast";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FastxPipe" = callPackage
@@ -5302,6 +5776,8 @@ self: {
        ];
        description = "Fasta and Fastq streaming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FenwickTree" = callPackage
@@ -5334,6 +5810,8 @@ self: {
        ];
        description = "Annotate ps and pdf documents";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FerryCore" = callPackage
@@ -5350,6 +5828,8 @@ self: {
        ];
        description = "Ferry Core Components";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Feval" = callPackage
@@ -5363,6 +5843,8 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec ];
        description = "Evaluation using F-Algebras";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FieldTrip" = callPackage
@@ -5379,6 +5861,8 @@ self: {
        ];
        description = "Functional 3D";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FileManip" = callPackage
@@ -5394,6 +5878,8 @@ self: {
        ];
        description = "Expressive file and directory manipulation for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FileManipCompat" = callPackage
@@ -5409,6 +5895,8 @@ self: {
        ];
        description = "Expressive file and directory manipulation for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FilePather" = callPackage
@@ -5425,6 +5913,8 @@ self: {
        ];
        description = "Functions on System.FilePath";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FileSystem" = callPackage
@@ -5440,6 +5930,8 @@ self: {
        ];
        description = "File system data structure and monad transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Files" = callPackage
@@ -5456,6 +5948,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "File content extraction/rearrangement";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Fin" = callPackage
@@ -5488,6 +5982,8 @@ self: {
        ];
        description = "Obtain quote data from finance.yahoo.com";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Finance-Treasury" = callPackage
@@ -5504,6 +6000,8 @@ self: {
        ];
        description = "Obtain Treasury yield curve data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FindBin" = callPackage
@@ -5526,6 +6024,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "A finite map implementation, derived from the paper: Efficient sets: a balancing act, S. Adams, Journal of functional programming 3(4) Oct 1993, pp553-562";
        license = stdenv.lib.licenses.bsdOriginal;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FirstOrderTheory" = callPackage
@@ -5537,6 +6037,8 @@ self: {
        libraryHaskellDepends = [ base containers Proper ];
        description = "Grammar and typeclass for first order theories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FixedPoint-simple" = callPackage
@@ -5566,6 +6068,8 @@ self: {
        ];
        description = "Wiki";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FloatingHex" = callPackage
@@ -5588,6 +6092,8 @@ self: {
        libraryHaskellDepends = [ base MissingH split ];
        description = "Tools for focusing in on locations within numbers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Folly" = callPackage
@@ -5639,6 +6145,8 @@ self: {
        ];
        description = "ForSyDe's Haskell-embedded Domain Specific Language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ForestStructures" = callPackage
@@ -5686,6 +6194,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Comparison of trees and forests";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ForkableT" = callPackage
@@ -5697,6 +6207,8 @@ self: {
        libraryHaskellDepends = [ base monad-control mtl resourcet ];
        description = "Forkable monad transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FormalGrammars" = callPackage
@@ -5721,6 +6233,8 @@ self: {
        ];
        description = "(Context-free) grammars in formal language theory";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Fortnite-Hack-Cheats-Free-V-Bucks-Generator" = callPackage
@@ -5743,6 +6257,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Foster" = callPackage
@@ -5763,6 +6279,8 @@ self: {
        ];
        description = "Utilities to generate and solve puzzles";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FpMLv53" = callPackage
@@ -5809,6 +6327,8 @@ self: {
          base FTGL GLFW-b OpenGLRaw parallel random time
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Frames" = callPackage
@@ -5863,6 +6383,8 @@ self: {
        ];
        description = "A library for accessing Postgres tables as in-memory data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Frames-dsv" = callPackage
@@ -5913,6 +6435,8 @@ self: {
        executableHaskellDepends = [ base mtl newtype she void ];
        description = "An experimental programming language with typed algebraic effects";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FreeTypeGL" = callPackage
@@ -5927,6 +6451,8 @@ self: {
        libraryHaskellDepends = [ base freetype2 OpenGL ];
        description = "Loadable texture fonts for OpenGL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "FunGEn" = callPackage
@@ -5942,6 +6468,8 @@ self: {
        executableHaskellDepends = [ base GLUT OpenGL random ];
        description = "A lightweight, cross-platform, OpenGL/GLUT-based game engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Fungi" = callPackage
@@ -5961,6 +6489,8 @@ self: {
        ];
        description = "Funge-98 interpreter written in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GA" = callPackage
@@ -5985,6 +6515,8 @@ self: {
        executableHaskellDepends = [ base bimap ];
        description = "GGg cipher";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GHood" = callPackage
@@ -6009,6 +6541,8 @@ self: {
        librarySystemDepends = [ libGL libX11 libXext libXfixes ];
        description = "A Haskell binding for GLFW";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
          inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes;};
 
@@ -6023,6 +6557,8 @@ self: {
        librarySystemDepends = [ libX11 libXrandr ];
        description = "A binding for GLFW (OGL)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;};
 
   "GLFW-b" = callPackage
@@ -6057,6 +6593,8 @@ self: {
        ];
        description = "GLFW-b demo";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GLFW-task" = callPackage
@@ -6070,6 +6608,8 @@ self: {
        ];
        description = "GLFW utility functions to use together with monad-task";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GLHUI" = callPackage
@@ -6121,6 +6661,8 @@ self: {
        libraryHaskellDepends = [ base OpenGLRaw ];
        description = "Utilities for working with OpenGL matrices";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GLURaw" = callPackage
@@ -6168,6 +6710,8 @@ self: {
        libraryToolDepends = [ hpp ];
        description = "Miscellaneous OpenGL utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GPX" = callPackage
@@ -6184,6 +6728,8 @@ self: {
        ];
        description = "Parse GPX files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GPipe" = callPackage
@@ -6201,6 +6747,8 @@ self: {
        ];
        description = "Typesafe functional GPU graphics programming";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GPipe-Collada" = callPackage
@@ -6214,6 +6762,8 @@ self: {
        ];
        description = "Load GPipe meshes from Collada files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GPipe-Examples" = callPackage
@@ -6231,6 +6781,8 @@ self: {
        ];
        description = "Examples for the GPipes package";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GPipe-GLFW" = callPackage
@@ -6243,6 +6795,8 @@ self: {
        libraryHaskellDepends = [ async base containers GLFW-b GPipe stm ];
        description = "GLFW OpenGL context creation for GPipe";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GPipe-TextureLoad" = callPackage
@@ -6254,6 +6808,8 @@ self: {
        libraryHaskellDepends = [ base bitmap GPipe stb-image ];
        description = "Load GPipe textures from filesystem";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GTALib" = callPackage
@@ -6272,6 +6828,8 @@ self: {
        ];
        description = "A library for GTA programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Gamgine" = callPackage
@@ -6295,6 +6853,8 @@ self: {
        libraryToolDepends = [ cpphs ];
        description = "Some kind of game library or set of utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Ganymede" = callPackage
@@ -6312,6 +6872,8 @@ self: {
        ];
        description = "An Io interpreter in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GaussQuadIntegration" = callPackage
@@ -6339,6 +6901,8 @@ self: {
        ];
        description = "Several games";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GenI" = callPackage
@@ -6372,6 +6936,8 @@ self: {
        ];
        description = "A natural language generator (specifically, an FB-LTAG surface realiser)";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GenSmsPdu" = callPackage
@@ -6385,6 +6951,8 @@ self: {
        executableHaskellDepends = [ base haskell98 QuickCheck random ];
        description = "Automatic SMS message generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Genbank" = callPackage
@@ -6403,6 +6971,8 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        description = "Libary for processing the NCBI genbank format";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Gene-CluEDO" = callPackage
@@ -6428,6 +6998,8 @@ self: {
        ];
        description = "Hox gene clustering";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GeneralTicTacToe" = callPackage
@@ -6441,6 +7013,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A general TicTacToe game implementation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GenericPretty" = callPackage
@@ -6479,6 +7053,8 @@ self: {
        ];
        description = "MCFGs for Genus-1 RNA Pseudoknots";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GeoIp" = callPackage
@@ -6503,6 +7079,8 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring HTTP text ];
        description = "Geocoder and Reverse Geocoding Service Wrapper";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Geodetic" = callPackage
@@ -6536,6 +7114,8 @@ self: {
        libraryHaskellDepends = [ base GeomPredicates ];
        description = "Geometric predicates (Intel SSE)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Get" = callPackage
@@ -6548,6 +7128,8 @@ self: {
        testHaskellDepends = [ base constraints singletons ];
        description = "get stuff out of stuff";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GiST" = callPackage
@@ -6559,6 +7141,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "A Haskell implementation of a Generalized Search Tree (GiST)";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Gifcurry" = callPackage
@@ -6584,6 +7168,8 @@ self: {
        ];
        description = "GIF creation utility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GiveYouAHead" = callPackage
@@ -6630,6 +7216,8 @@ self: {
        libraryHaskellDepends = [ array base GlomeVec ];
        description = "Ray Tracing Library";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GlomeVec" = callPackage
@@ -6659,6 +7247,8 @@ self: {
        ];
        description = "SDL Frontend for Glome ray tracer";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GoogleChart" = callPackage
@@ -6685,6 +7275,8 @@ self: {
        ];
        description = "A monad for flexible parsing of Google Code Jam input files with automatic parallelization";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GoogleDirections" = callPackage
@@ -6700,6 +7292,8 @@ self: {
        ];
        description = "Haskell Interface to Google Directions API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GoogleSB" = callPackage
@@ -6715,6 +7309,8 @@ self: {
        ];
        description = "Interface to Google Safe Browsing API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GoogleSuggest" = callPackage
@@ -6742,6 +7338,8 @@ self: {
        ];
        description = "Interface to Google Translate API";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GotoT-transformers" = callPackage
@@ -6753,6 +7351,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "A monad and monadic transformer providing \"goto\" functionality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Grafos" = callPackage
@@ -6764,6 +7364,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Grafos Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GrammarProducts" = callPackage
@@ -6786,6 +7388,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Grammar products and higher-dimensional grammars";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Graph500" = callPackage
@@ -6804,6 +7408,8 @@ self: {
        executableHaskellDepends = [ array base mtl ];
        description = "Graph500 benchmark-related definitions and data set generator";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GraphHammer" = callPackage
@@ -6818,6 +7424,8 @@ self: {
        ];
        description = "GraphHammer Haskell graph analyses framework inspired by STINGER";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GraphHammer-examples" = callPackage
@@ -6835,6 +7443,8 @@ self: {
        ];
        description = "Test harness for TriangleCount analysis";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GraphSCC" = callPackage
@@ -6878,6 +7488,8 @@ self: {
        ];
        description = "Embedded grammar DSL and LALR parser generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GroteTrap" = callPackage
@@ -6895,6 +7507,8 @@ self: {
        ];
        description = "Parser and selection library for expression languages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Grow" = callPackage
@@ -6937,6 +7551,8 @@ self: {
        ];
        description = "Notification utility for Growl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Gtk2hsGenerics" = callPackage
@@ -6952,6 +7568,8 @@ self: {
        ];
        description = "Convenience functions to extend Gtk2hs";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GtkGLTV" = callPackage
@@ -6967,6 +7585,8 @@ self: {
        ];
        description = "OpenGL support for Gtk-based GUIs for Tangible Values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GtkTV" = callPackage
@@ -6998,6 +7618,8 @@ self: {
        ];
        description = "A graphical REPL and development environment for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "GuiTV" = callPackage
@@ -7009,6 +7631,8 @@ self: {
        libraryHaskellDepends = [ base DeepArrow phooey TV TypeCompose ];
        description = "GUIs for Tangible Values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "H" = callPackage
@@ -7029,6 +7653,8 @@ self: {
        ];
        description = "The Haskell/R mixed programming environment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HABQT" = callPackage
@@ -7053,6 +7679,8 @@ self: {
        ];
        description = "Hierarchical adaptive Bayesian quantum tomography for quantum bits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HARM" = callPackage
@@ -7084,6 +7712,8 @@ self: {
        ];
        description = "HAppS data manipulation libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HAppS-IxSet" = callPackage
@@ -7099,6 +7729,8 @@ self: {
          syb-with-class template-haskell
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HAppS-Server" = callPackage
@@ -7119,6 +7751,8 @@ self: {
        ];
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HAppS-State" = callPackage
@@ -7138,6 +7772,8 @@ self: {
        ];
        description = "Event-based distributed state";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HAppS-Util" = callPackage
@@ -7154,6 +7790,8 @@ self: {
        ];
        description = "Web framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HAppSHelpers" = callPackage
@@ -7188,6 +7826,8 @@ self: {
        ];
        description = "High-level library for building command line interfaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HCard" = callPackage
@@ -7201,6 +7841,8 @@ self: {
        ];
        description = "A library for implementing a Deck of Cards";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HCodecs" = callPackage
@@ -7252,6 +7894,8 @@ self: {
        librarySystemDepends = [ mysqlclient openssl zlib ];
        description = "MySQL driver for HDBC";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {mysqlclient = null; inherit (pkgs) openssl; 
          inherit (pkgs) zlib;};
 
@@ -7302,6 +7946,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base containers HDBC text ];
        description = "Manipulate data in PostgreSQL \"hstore\" columns";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HDBC-session" = callPackage
@@ -7342,6 +7988,8 @@ self: {
        librarySystemDepends = [ pfstools ];
        description = "Utilities for reading, manipulating, and writing HDR images";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) pfstools;};
 
   "HERA" = callPackage
@@ -7353,6 +8001,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ mpfr ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) mpfr;};
 
   "HExcel" = callPackage
@@ -7369,6 +8019,8 @@ self: {
        librarySystemDepends = [ xlsxwriter zlib ];
        description = "Create Excel files with Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {xlsxwriter = null; inherit (pkgs) zlib;};
 
   "HFitUI" = callPackage
@@ -7390,6 +8042,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "The library for generating a graphical interface on the web";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HFrequencyQueue" = callPackage
@@ -7401,6 +8055,8 @@ self: {
        libraryHaskellDepends = [ base c-storable-deriving ];
        description = "A Queue with a random (weighted) pick function";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HFuse" = callPackage
@@ -7435,6 +8091,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "2D game engine written in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HGL" = callPackage
@@ -7793,6 +8451,8 @@ self: {
        ];
        description = "Graph database stored on disk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HHDL" = callPackage
@@ -7804,6 +8464,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        description = "Hardware Description Language embedded in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HJScript" = callPackage
@@ -7815,6 +8477,8 @@ self: {
        libraryHaskellDepends = [ base HJavaScript hsp mtl text ];
        description = "HJScript is a Haskell EDSL for writing JavaScript programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HJVM" = callPackage
@@ -7837,6 +8501,8 @@ self: {
        ];
        description = "A library to create a Java Virtual Machine and manipulate Java objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) jdk;};
 
   "HJavaScript" = callPackage
@@ -7850,6 +8516,8 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        description = "HJavaScript is an abstract syntax for a typed subset of JavaScript";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HLearn-algebra" = callPackage
@@ -7869,6 +8537,8 @@ self: {
        ];
        description = "Algebraic foundation for homomorphic learning";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HLearn-approximation" = callPackage
@@ -7887,6 +8557,8 @@ self: {
          HLearn-datastructures HLearn-distributions list-extras vector
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HLearn-classification" = callPackage
@@ -7909,6 +8581,8 @@ self: {
          QuickCheck statistics vector vector-th-unbox
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HLearn-datastructures" = callPackage
@@ -7924,6 +8598,8 @@ self: {
          MonadRandom QuickCheck vector
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HLearn-distributions" = callPackage
@@ -7947,6 +8623,8 @@ self: {
        ];
        description = "Distributions for use with the HLearn library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HList" = callPackage
@@ -7972,6 +8650,8 @@ self: {
        ];
        description = "Heterogeneous lists";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HListPP" = callPackage
@@ -7987,6 +8667,8 @@ self: {
        ];
        description = "A preprocessor for HList labelable labels";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HLogger" = callPackage
@@ -8001,6 +8683,8 @@ self: {
        executableHaskellDepends = [ base old-locale time ];
        description = "Simple, concurrent and easy-to-use logging library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HMM" = callPackage
@@ -8011,6 +8695,8 @@ self: {
        sha256 = "01y8l76c56gysynbilp32yq0wfc129hl24siw8s9fmpn98qa71s6";
        description = "A hidden markov model library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HMap" = callPackage
@@ -8066,6 +8752,8 @@ self: {
        ];
        description = "Happy Network Manager";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HNumeric" = callPackage
@@ -8096,6 +8784,8 @@ self: {
        librarySystemDepends = [ ode ];
        description = "Binding to libODE";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ode;};
 
   "HOpenCV" = callPackage
@@ -8131,6 +8821,8 @@ self: {
        testHaskellDepends = [ base HTF ];
        description = "Generation of PDF documents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HPath" = callPackage
@@ -8153,6 +8845,8 @@ self: {
        ];
        description = "Extract Haskell declarations by name";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HPhone" = callPackage
@@ -8176,12 +8870,14 @@ self: {
     ({ mkDerivation, base, bcm2835, bytestring }:
      mkDerivation {
        pname = "HPi";
-       version = "0.5.1";
-       sha256 = "1hh5b5jknmfdz0fjh220fv1p5p3q7i176fphvdin30jk4r7xpin9";
+       version = "0.6.0";
+       sha256 = "1b0m6srghxbd3cjwffkajf1dnsw8nsgqyi4wiy7wsdsadqnv25z9";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ bcm2835 ];
        description = "GPIO, I2C and SPI functions for the Raspberry Pi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {bcm2835 = null;};
 
   "HPlot" = callPackage
@@ -8199,6 +8895,8 @@ self: {
        executablePkgconfigDepends = [ plplotd-gnome2 ];
        description = "A minimal monadic PLplot interface for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {plplotd-gnome2 = null;};
 
   "HPong" = callPackage
@@ -8217,6 +8915,8 @@ self: {
        ];
        description = "A simple OpenGL Pong game based on GLFW";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HROOT" = callPackage
@@ -8234,6 +8934,8 @@ self: {
        ];
        description = "Haskell binding to the ROOT data analysis framework";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HROOT-core" = callPackage
@@ -8247,6 +8949,8 @@ self: {
        ];
        description = "Haskell binding to ROOT Core modules";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HROOT-graf" = callPackage
@@ -8262,6 +8966,8 @@ self: {
        ];
        description = "Haskell binding to ROOT Graf modules";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HROOT-hist" = callPackage
@@ -8277,6 +8983,8 @@ self: {
        ];
        description = "Haskell binding to ROOT Hist modules";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HROOT-io" = callPackage
@@ -8292,6 +9000,8 @@ self: {
        ];
        description = "Haskell binding to ROOT IO modules";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HROOT-math" = callPackage
@@ -8307,6 +9017,8 @@ self: {
        ];
        description = "Haskell binding to ROOT Math modules";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HROOT-tree" = callPackage
@@ -8322,6 +9034,8 @@ self: {
        ];
        description = "Haskell binding to ROOT Tree modules";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HRay" = callPackage
@@ -8336,6 +9050,8 @@ self: {
        executableHaskellDepends = [ array base directory haskell98 ];
        description = "Haskell raytracer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HSFFIG" = callPackage
@@ -8356,6 +9072,8 @@ self: {
        ];
        description = "Generate FFI import declarations from C include files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HSGEP" = callPackage
@@ -8374,6 +9092,8 @@ self: {
        executableHaskellDepends = [ csv ];
        description = "Gene Expression Programming evolutionary algorithm in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HSH" = callPackage
@@ -8393,6 +9113,8 @@ self: {
        ];
        description = "Library to mix shell scripting with Haskell programs";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HSHHelpers" = callPackage
@@ -8410,6 +9132,8 @@ self: {
        ];
        description = "Convenience functions that use HSH, instances for HSH";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HSet" = callPackage
@@ -8421,6 +9145,8 @@ self: {
        libraryHaskellDepends = [ base containers hashable hashtables ];
        description = "Faux heterogeneous sets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HSlippyMap" = callPackage
@@ -8450,6 +9176,8 @@ self: {
        testHaskellDepends = [ aeson attoparsec base HTF text ];
        description = "Small template engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HSoM" = callPackage
@@ -8466,6 +9194,8 @@ self: {
        ];
        description = "Library for computer music education";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HSoundFile" = callPackage
@@ -8481,6 +9211,8 @@ self: {
        ];
        description = "Audio file reading/writing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HStringTemplate" = callPackage
@@ -8517,6 +9249,8 @@ self: {
        ];
        description = "Convenience functions and instances for HStringTemplate";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HSvm" = callPackage
@@ -8563,6 +9297,8 @@ self: {
        ];
        description = "The Haskell Test Framework";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HTTP" = callPackage
@@ -8613,6 +9349,8 @@ self: {
        ];
        description = "Tableau based theorem prover for hybrid logics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HTicTacToe" = callPackage
@@ -8630,6 +9368,8 @@ self: {
        ];
        description = "An SDL tic-tac-toe game";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HUnit" = callPackage
@@ -8653,6 +9393,8 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base Diff groom HUnit ];
        description = "Assertions for HUnit with difference reporting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HUnit-Plus" = callPackage
@@ -8712,6 +9454,8 @@ self: {
        ];
        description = "A (prototyped) easy to use XMPP library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HXQ" = callPackage
@@ -8729,6 +9473,8 @@ self: {
        ];
        description = "A Compiler from XQuery to Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaLeX" = callPackage
@@ -8743,6 +9489,8 @@ self: {
        libraryHaskellDepends = [ base HUnit mtl QuickCheck ];
        description = "HaLeX enables modelling, manipulation and visualization of regular languages";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaMinitel" = callPackage
@@ -8754,6 +9502,8 @@ self: {
        libraryHaskellDepends = [ base bytestring serialport stm ];
        description = "An Haskell library to drive the french Minitel through a serial port";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaPy" = callPackage
@@ -8765,6 +9515,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell th-lift ];
        description = "Haskell bindings for Python";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaRe" = callPackage
@@ -8799,6 +9551,8 @@ self: {
        ];
        description = "the Haskell Refactorer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaTeX" = callPackage
@@ -8837,6 +9591,8 @@ self: {
        ];
        description = "This package is deprecated. From version 3, HaTeX does not need this anymore.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaTeX-qq" = callPackage
@@ -8852,6 +9608,8 @@ self: {
        ];
        description = "Quasiquoters for HaTeX";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaVSA" = callPackage
@@ -8871,6 +9629,8 @@ self: {
        ];
        description = "An implementation of the Version Space Algebra learning framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaXml" = callPackage
@@ -8907,6 +9667,8 @@ self: {
        executableHaskellDepends = [ text time vty vty-ui ];
        description = "Simple chat";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HackMail" = callPackage
@@ -8927,6 +9689,8 @@ self: {
        ];
        description = "A Procmail Replacement as Haskell EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Haggressive" = callPackage
@@ -8944,6 +9708,8 @@ self: {
        testHaskellDepends = [ base Cabal containers HUnit tuple vector ];
        description = "Aggression analysis for Tweets on Twitter";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HandlerSocketClient" = callPackage
@@ -8955,6 +9721,8 @@ self: {
        libraryHaskellDepends = [ base bytestring network ];
        description = "Haskell implementation of a HandlerSocket client (API)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HandsomeSoup" = callPackage
@@ -8989,6 +9757,8 @@ self: {
        testHaskellDepends = [ base hspec transformers ];
        description = "The classic game of Hangman";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HappyTree" = callPackage
@@ -9006,6 +9776,8 @@ self: {
        ];
        description = "Type Safe and End to End Decision Tree";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HarmTrace" = callPackage
@@ -9029,6 +9801,8 @@ self: {
        ];
        description = "Harmony Analysis and Retrieval of Music";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HarmTrace-Base" = callPackage
@@ -9078,6 +9852,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Haskell bindings for CacBDD";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {CacBDD = null;};
 
   "HasGP" = callPackage
@@ -9094,6 +9870,8 @@ self: {
        ];
        description = "A Haskell library for inference using Gaussian processes";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Haschoo" = callPackage
@@ -9112,6 +9890,8 @@ self: {
        ];
        description = "Minimalist R5RS Scheme interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Hashell" = callPackage
@@ -9130,6 +9910,8 @@ self: {
        ];
        description = "Simple shell written in Haskell";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaskRel" = callPackage
@@ -9146,6 +9928,8 @@ self: {
        ];
        description = "HaskRel, Haskell as a DBMS with support for the relational algebra";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaskellForMaths" = callPackage
@@ -9168,6 +9952,8 @@ self: {
        libraryHaskellDepends = [ base hmatrix ];
        description = "Pure Haskell implementation of the Levenberg-Marquardt algorithm";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaskellNN" = callPackage
@@ -9179,6 +9965,8 @@ self: {
        libraryHaskellDepends = [ base hmatrix random ];
        description = "High Performance Neural Network in Haskell";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaskellNet" = callPackage
@@ -9197,6 +9985,8 @@ self: {
        ];
        description = "Client support for POP3, SMTP, and IMAP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaskellNet-SSL" = callPackage
@@ -9213,6 +10003,8 @@ self: {
        ];
        description = "Helpers to connect to SSL/TLS mail servers with HaskellNet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaskellTorrent" = callPackage
@@ -9236,6 +10028,8 @@ self: {
        ];
        description = "A concurrent bittorrent client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HaskellTutorials" = callPackage
@@ -9249,6 +10043,8 @@ self: {
        executableHaskellDepends = [ base cmdargs text ];
        description = "Haskell Tutorials by Evgeny Ukhanov";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Haskelloids" = callPackage
@@ -9266,6 +10062,8 @@ self: {
        ];
        description = "A reproduction of the Atari 1979 classic \"Asteroids\"";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Hastodon" = callPackage
@@ -9284,6 +10082,8 @@ self: {
        ];
        description = "mastodon client module for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Hate" = callPackage
@@ -9307,6 +10107,8 @@ self: {
        ];
        description = "A small 2D game framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Hawk" = callPackage
@@ -9328,6 +10130,8 @@ self: {
        ];
        description = "Haskell Web Application Kit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Hayoo" = callPackage
@@ -9354,6 +10158,8 @@ self: {
        ];
        description = "The Hayoo! search engine for Haskell API search on hackage";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Hclip" = callPackage
@@ -9386,6 +10192,8 @@ self: {
        ];
        description = "Line oriented editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HerbiePlugin" = callPackage
@@ -9404,6 +10212,8 @@ self: {
        testHaskellDepends = [ base linear subhask ];
        description = "automatically improve your code's numeric stability";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Hermes" = callPackage
@@ -9422,6 +10232,8 @@ self: {
        ];
        description = "Message-based middleware layer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Hieroglyph" = callPackage
@@ -9439,6 +10251,8 @@ self: {
        ];
        description = "Purely functional 2D graphics for visualization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HiggsSet" = callPackage
@@ -9455,6 +10269,8 @@ self: {
        ];
        description = "A multi-index set with advanced query capabilites";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Hipmunk" = callPackage
@@ -9481,6 +10297,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Useful functions for Hipmunk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HipmunkPlayground" = callPackage
@@ -9518,6 +10336,8 @@ self: {
          base directory MissingH process regex-tdfa time
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Histogram" = callPackage
@@ -9545,6 +10365,8 @@ self: {
        ];
        description = "An MPD client designed for a Home Theatre PC";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Hoed" = callPackage
@@ -9569,6 +10391,8 @@ self: {
        testHaskellDepends = [ base process QuickCheck ];
        description = "Lightweight algorithmic debugging";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HoleyMonoid" = callPackage
@@ -9642,6 +10466,8 @@ self: {
        ];
        description = "A search and indexing engine";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Holumbus-Storage" = callPackage
@@ -9692,6 +10518,8 @@ self: {
        testHaskellDepends = [ base process random ];
        description = "A Simple Key Value Store";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HostAndPort" = callPackage
@@ -9718,6 +10546,8 @@ self: {
        executableHaskellDepends = [ base containers ];
        description = "A Cricket scoring application";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Hs2lib" = callPackage
@@ -9745,6 +10575,8 @@ self: {
        testHaskellDepends = [ base directory filepath process ];
        description = "A Library and Preprocessor that makes it easier to create shared libs from Haskell programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HsASA" = callPackage
@@ -9776,6 +10608,8 @@ self: {
        ];
        description = "Bindings to htslib";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "HsHaruPDF" = callPackage
@@ -9787,6 +10621,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell binding to libharu (http://libharu.sourceforge.net/)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HsHyperEstraier" = callPackage
@@ -9803,6 +10639,8 @@ self: {
        libraryPkgconfigDepends = [ hyperestraier qdbm ];
        description = "HyperEstraier binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {hyperestraier = null; qdbm = null;};
 
   "HsJudy" = callPackage
@@ -9816,6 +10654,8 @@ self: {
        librarySystemDepends = [ Judy ];
        description = "Judy bindings, and some nice APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {Judy = null;};
 
   "HsOpenSSL" = callPackage
@@ -9855,6 +10695,8 @@ self: {
        ];
        description = "Haskell integration with Parrot virtual machine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HsPerl5" = callPackage
@@ -9866,6 +10708,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell interface to embedded Perl 5 interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HsSVN" = callPackage
@@ -9877,6 +10721,8 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl stm ];
        description = "Partial Subversion (SVN) binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HsSyck" = callPackage
@@ -9925,6 +10771,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Webots bindings for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {Controller = null; driver = null;};
 
   "HsYAML" = callPackage
@@ -9985,6 +10833,8 @@ self: {
        ];
        description = "Stream Editor in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Hsmtlib" = callPackage
@@ -10002,6 +10852,8 @@ self: {
        ];
        description = "Haskell library for easy interaction with SMT-LIB 2 compliant solvers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HueAPI" = callPackage
@@ -10017,6 +10869,8 @@ self: {
        ];
        description = "API for controlling Philips Hue lights";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "HulkImport" = callPackage
@@ -10034,6 +10888,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-golden ];
        description = "Easily bulk import CSV data to SQL Server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Hungarian-Munkres" = callPackage
@@ -10071,6 +10927,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "The library for generating a WebGL scene for the web";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "I1M" = callPackage
@@ -10085,6 +10943,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "Code for the Haskell course taught at the University of Seville";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "IDynamic" = callPackage
@@ -10096,6 +10956,8 @@ self: {
        libraryHaskellDepends = [ base containers directory ];
        description = "Indexable, serializable form of Data.Dynamic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "IFS" = callPackage
@@ -10111,6 +10973,8 @@ self: {
        ];
        description = "Iterated Function System generation for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "INblobs" = callPackage
@@ -10130,6 +10994,8 @@ self: {
        ];
        description = "Editor and interpreter for Interaction Nets";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "IOR" = callPackage
@@ -10142,6 +11008,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Region based resource management for the IO monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "IORefCAS" = callPackage
@@ -10160,6 +11028,8 @@ self: {
        ];
        description = "Atomic compare and swap for IORefs and STRefs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "IOSpec" = callPackage
@@ -10217,6 +11087,8 @@ self: {
        ];
        description = "A RESTful microService for IPv6-related data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "IcoGrid" = callPackage
@@ -10228,6 +11100,8 @@ self: {
        libraryHaskellDepends = [ array base GlomeVec ];
        description = "Library for generating grids of hexagons and pentagons mapped to a sphere";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "IfElse" = callPackage
@@ -10261,6 +11135,8 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "A library for writing Imperative style haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "IndentParser" = callPackage
@@ -10283,6 +11159,8 @@ self: {
        libraryHaskellDepends = [ base PeanoWitnesses ];
        description = "Length- and element-indexed lists sitting somewhere between homogeneous and fully heterogeneous";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "InfixApplicative" = callPackage
@@ -10294,6 +11172,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "liftA2 for infix operators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "IntFormats" = callPackage
@@ -10306,6 +11186,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Convert integers in various bases to and from strings";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "IntGraph" = callPackage
@@ -10344,6 +11226,8 @@ self: {
        ];
        description = "Data interning (with compact regions where possible)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Interpolation" = callPackage
@@ -10404,6 +11288,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "DSL for IRC bots";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "IrrHaskell" = callPackage
@@ -10435,6 +11321,8 @@ self: {
        ];
        description = "A typeclass to determine if a given value is null";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JSON-Combinator" = callPackage
@@ -10452,6 +11340,8 @@ self: {
        ];
        description = "A combinator library on top of a generalised JSON type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JSON-Combinator-Examples" = callPackage
@@ -10465,6 +11355,8 @@ self: {
        ];
        description = "Example uses of the JSON-Combinator library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JSONParser" = callPackage
@@ -10496,6 +11388,8 @@ self: {
        ];
        description = "JSON parser that uses byte strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JYU-Utils" = callPackage
@@ -10515,6 +11409,8 @@ self: {
        ];
        description = "Some utility functions for JYU projects";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JackMiniMix" = callPackage
@@ -10526,6 +11422,8 @@ self: {
        libraryHaskellDepends = [ base hosc ];
        description = "control JackMiniMix";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Javasf" = callPackage
@@ -10542,6 +11440,8 @@ self: {
        ];
        description = "A utility to print the SourceFile attribute of one or more Java class files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Javav" = callPackage
@@ -10555,6 +11455,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A utility to print the target version of Java class files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Jazzkell" = callPackage
@@ -10578,6 +11480,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A Json implementation for Haskell, with JavaScript Values and Encoding/Decoding";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JsContracts" = callPackage
@@ -10600,6 +11504,8 @@ self: {
        ];
        description = "Design-by-contract for JavaScript";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JsonGrammar" = callPackage
@@ -10621,6 +11527,8 @@ self: {
        ];
        description = "Combinators for bidirectional JSON parsing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JuPyTer-notebook" = callPackage
@@ -10637,6 +11545,8 @@ self: {
        ];
        description = "JuPyTer notebook parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JuicyPixels" = callPackage
@@ -10655,6 +11565,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "JuicyPixels_3_3_5" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
+     , primitive, transformers, vector, zlib
+     }:
+     mkDerivation {
+       pname = "JuicyPixels";
+       version = "3.3.5";
+       sha256 = "0yj4jyf56r3c1r3v1lkx8i8ll0jl8g8y2yv87sa4hwgck52199gc";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq mtl primitive
+         transformers vector zlib
+       ];
+       description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "JuicyPixels-blp" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring, directory
      , filepath, hashable, JuicyPixels, optparse-simple, text-show
@@ -10676,6 +11603,8 @@ self: {
        ];
        description = "BLP format decoder/encoder over JuicyPixels library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JuicyPixels-canvas" = callPackage
@@ -10687,6 +11616,8 @@ self: {
        libraryHaskellDepends = [ base containers JuicyPixels ];
        description = "Functions for drawing lines, squares and so on pixel by pixel";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JuicyPixels-extra" = callPackage
@@ -10778,6 +11709,8 @@ self: {
          filepath mtl network resourcet
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JunkDB-driver-gdbm" = callPackage
@@ -10792,6 +11725,8 @@ self: {
          base bytestring conduit directory filepath JunkDB mtl resourcet
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JunkDB-driver-hashtables" = callPackage
@@ -10806,6 +11741,8 @@ self: {
          base bytestring conduit hashable hashtables JunkDB mtl resourcet
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "JustParse" = callPackage
@@ -10817,6 +11754,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A simple and comprehensive Haskell parsing library";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "KMP" = callPackage
@@ -10840,6 +11779,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A library with the kerbal space program universe and demo code";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Kalman" = callPackage
@@ -10851,6 +11792,8 @@ self: {
        libraryHaskellDepends = [ base hmatrix ];
        description = "A slightly extended Kalman filter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "KdTree" = callPackage
@@ -10878,6 +11821,8 @@ self: {
        ];
        description = "A super small web framework for those who don't like big and fancy codebases";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "KiCS" = callPackage
@@ -10976,6 +11921,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Category for Continuation Passing Style";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Kulitta" = callPackage
@@ -11006,6 +11953,8 @@ self: {
        librarySystemDepends = [ kyotocabinet ];
        description = "Kyoto Cabinet DB bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) kyotocabinet;};
 
   "L-seed" = callPackage
@@ -11023,6 +11972,8 @@ self: {
        ];
        description = "Plant growing programming game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LATS" = callPackage
@@ -11039,6 +11990,8 @@ self: {
        librarySystemDepends = [ openblasCompat ];
        description = "Linear Algebra on Typed Spaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) openblasCompat;};
 
   "LC3" = callPackage
@@ -11116,6 +12069,8 @@ self: {
        libraryHaskellDepends = [ base containers QuickCheck ];
        description = "Implements an LRU data structure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LTree" = callPackage
@@ -11176,6 +12131,8 @@ self: {
        ];
        description = "A type-safe EDSL for TouchDesigner written in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LambdaHack" = callPackage
@@ -11206,6 +12163,8 @@ self: {
        testHaskellDepends = [ async base filepath optparse-applicative ];
        description = "A game engine library for tactical squad ASCII roguelike dungeon crawlers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LambdaINet" = callPackage
@@ -11225,6 +12184,8 @@ self: {
        ];
        description = "Graphical Interaction Net Evaluator for Optimal Evaluation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LambdaNet" = callPackage
@@ -11240,6 +12201,8 @@ self: {
        ];
        description = "A configurable and extensible neural network library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LambdaPrettyQuote" = callPackage
@@ -11264,6 +12227,8 @@ self: {
        ];
        description = "Quasiquoter, and Arbitrary helpers for the lambda calculus";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LambdaShell" = callPackage
@@ -11281,6 +12246,8 @@ self: {
        ];
        description = "Simple shell for evaluating lambda expressions";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Lambdajudge" = callPackage
@@ -11293,6 +12260,8 @@ self: {
        testHaskellDepends = [ base filepath hspec mtl process text ];
        description = "A library to easily host Haskell based programming competitions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Lambdaya" = callPackage
@@ -11309,6 +12278,8 @@ self: {
        ];
        description = "Library for RedPitaya";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LargeCardinalHierarchy" = callPackage
@@ -11337,6 +12308,8 @@ self: {
        ];
        description = "A library for compiling programs in a variety of languages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Lattices" = callPackage
@@ -11386,6 +12359,8 @@ self: {
        executableHaskellDepends = [ base directory filepath unix ];
        description = "A simple sandboxing tool for Haskell packages";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Learning" = callPackage
@@ -11401,6 +12376,8 @@ self: {
        testHaskellDepends = [ base containers hmatrix vector ];
        description = "The most frequently used machine learning tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Level0" = callPackage
@@ -11414,6 +12391,8 @@ self: {
        executableHaskellDepends = [ base directory random SDL SDL-ttf ];
        description = "A Snake II clone written using SDL";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LibClang" = callPackage
@@ -11434,6 +12413,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Haskell bindings for libclang (a C++ parsing library)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (self.llvmPackages) clang; inherit (pkgs) ncurses;};
 
   "LibZip" = callPackage
@@ -11464,6 +12445,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Wrapper for data that can be unbounded";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LinearSplit" = callPackage
@@ -11478,6 +12461,8 @@ self: {
        ];
        description = "Partition the sequence of items to the subsequences in the order given";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LinguisticsTypes" = callPackage
@@ -11522,6 +12507,8 @@ self: {
        ];
        description = "Check a bunch of local html files for broken links";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "List" = callPackage
@@ -11576,6 +12563,8 @@ self: {
        ];
        description = "List transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ListTree" = callPackage
@@ -11623,6 +12612,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Logic";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LogicGrowsOnTrees" = callPackage
@@ -11659,6 +12650,8 @@ self: {
        benchmarkHaskellDepends = [ base cereal criterion deepseq ];
        description = "a parallel implementation of logic programming using distributed tree exploration";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LogicGrowsOnTrees-MPI" = callPackage
@@ -11680,6 +12673,8 @@ self: {
        librarySystemDepends = [ openmpi ];
        description = "an adapter for LogicGrowsOnTrees that uses MPI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) openmpi;};
 
   "LogicGrowsOnTrees-network" = callPackage
@@ -11705,6 +12700,8 @@ self: {
        ];
        description = "an adapter for LogicGrowsOnTrees that uses multiple processes running in a network";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LogicGrowsOnTrees-processes" = callPackage
@@ -11731,6 +12728,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion LogicGrowsOnTrees ];
        description = "an adapter for LogicGrowsOnTrees that uses multiple processes for parallelism";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "LslPlus" = callPackage
@@ -11751,6 +12750,8 @@ self: {
        ];
        description = "An execution and testing framework for the Linden Scripting Language (LSL)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Lucu" = callPackage
@@ -11771,6 +12772,8 @@ self: {
        ];
        description = "HTTP Daemonic Library";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Lykah" = callPackage
@@ -11799,6 +12802,8 @@ self: {
        ];
        description = "A static website and blog generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MASMGen" = callPackage
@@ -11811,6 +12816,8 @@ self: {
        testHaskellDepends = [ base containers mtl ];
        description = "Generate MASM code from haskell";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MBot" = callPackage
@@ -11822,6 +12829,8 @@ self: {
        libraryHaskellDepends = [ base bytestring hidapi mtl ];
        description = "Haskell interface for controlling the mBot educational robot";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MC-Fold-DP" = callPackage
@@ -11840,6 +12849,8 @@ self: {
        executableHaskellDepends = [ cmdargs split ];
        description = "Folding algorithm based on nucleotide cyclic motifs";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MFlow" = callPackage
@@ -11865,6 +12876,8 @@ self: {
        libraryToolDepends = [ cpphs ];
        description = "stateful, RESTful web framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MHask" = callPackage
@@ -11876,6 +12889,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "The category of monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MSQueue" = callPackage
@@ -11887,6 +12902,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim monad-loops ref-mtl stm ];
        description = "Michael-Scott queue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MTGBuilder" = callPackage
@@ -11900,6 +12917,8 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec ];
        description = "Builds decks out of a meta";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MagicHaskeller" = callPackage
@@ -11929,6 +12948,8 @@ self: {
        ];
        description = "Automatic inductive functional programmer by systematic search";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MailchimpSimple" = callPackage
@@ -11947,6 +12968,8 @@ self: {
        ];
        description = "Haskell library to interact with Mailchimp JSON API Version 3.0";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Map" = callPackage
@@ -11974,6 +12997,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Mapping";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MaybeT" = callPackage
@@ -11987,6 +13012,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "MaybeT monad transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MaybeT-monads-tf" = callPackage
@@ -11998,6 +13025,8 @@ self: {
        libraryHaskellDepends = [ base monads-tf transformers ];
        description = "MaybeT monad transformer compatible with monads-tf (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MaybeT-transformers" = callPackage
@@ -12009,6 +13038,8 @@ self: {
        libraryHaskellDepends = [ base monads-fd transformers ];
        description = "MaybeT monad transformer using transformers instead of mtl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MazesOfMonad" = callPackage
@@ -12028,6 +13059,8 @@ self: {
        ];
        description = "Console-based Role Playing Game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MeanShift" = callPackage
@@ -12039,6 +13072,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "Mean shift algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Measure" = callPackage
@@ -12050,6 +13085,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A library for units of measurement";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Mecha" = callPackage
@@ -12061,6 +13098,8 @@ self: {
        libraryHaskellDepends = [ base machines ];
        description = "mecha are the most complex composite machines known to humanity, lets build them well!";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Mechs" = callPackage
@@ -12072,6 +13111,8 @@ self: {
        libraryHaskellDepends = [ base machines ];
        description = "mecha are the most complex composite machines known to humanity, lets build them well!";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MemoTrie" = callPackage
@@ -12100,6 +13141,8 @@ self: {
        ];
        description = "Statically checked database access";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MetaObject" = callPackage
@@ -12111,6 +13154,8 @@ self: {
        libraryHaskellDepends = [ base containers stringtable-atom ];
        description = "A meta-object system for Haskell based on Perl 6";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Metrics" = callPackage
@@ -12122,6 +13167,8 @@ self: {
        libraryHaskellDepends = [ base hstats ];
        description = "Evaluation metrics commonly used in supervised machine learning";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Mhailist" = callPackage
@@ -12140,6 +13187,8 @@ self: {
        ];
        description = "Haskell mailing list manager";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Michelangelo" = callPackage
@@ -12156,6 +13205,8 @@ self: {
        ];
        description = "OpenGL for dummies";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MicrosoftTranslator" = callPackage
@@ -12172,6 +13223,8 @@ self: {
        ];
        description = "Interface for Microsoft Translator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MiniAgda" = callPackage
@@ -12195,6 +13248,29 @@ self: {
      }) {};
 
   "MissingH" = callPackage
+    ({ mkDerivation, array, base, containers, directory
+     , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network
+     , network-bsd, old-locale, old-time, parsec, process, random
+     , regex-compat, time, unix
+     }:
+     mkDerivation {
+       pname = "MissingH";
+       version = "1.4.2.0";
+       sha256 = "1wfhpb351nrqjryf9si9j13nkvrqybhkkyc9643wqq8ywkdd59b9";
+       libraryHaskellDepends = [
+         array base containers directory filepath hslogger mtl network
+         network-bsd old-locale old-time parsec process random regex-compat
+         time unix
+       ];
+       testHaskellDepends = [
+         base containers directory errorcall-eq-instance filepath HUnit
+         old-time parsec regex-compat time unix
+       ];
+       description = "Large utility library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "MissingH_1_4_2_1" = callPackage
     ({ mkDerivation, array, base, containers, directory
      , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network
      , old-locale, old-time, parsec, process, random, regex-compat, time
@@ -12214,6 +13290,7 @@ self: {
        ];
        description = "Large utility library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MissingK" = callPackage
@@ -12253,6 +13330,8 @@ self: {
        libraryHaskellDepends = [ anydbm base MissingH ];
        description = "Haskell interface to Python";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Mobile-Legends-Hack-Cheats" = callPackage
@@ -12275,6 +13354,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Modulo" = callPackage
@@ -12300,6 +13381,8 @@ self: {
        executableHaskellDepends = [ base GLUT random ];
        description = "A FRP library based on signal functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MoeDict" = callPackage
@@ -12315,6 +13398,8 @@ self: {
        ];
        description = "Utilities working with MoeDict.tw JSON dataset";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MonadCatchIO-mtl" = callPackage
@@ -12330,6 +13415,8 @@ self: {
        ];
        description = "Monad-transformer version of the Control.Exception module";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MonadCatchIO-mtl-foreign" = callPackage
@@ -12341,6 +13428,8 @@ self: {
        libraryHaskellDepends = [ base MonadCatchIO-mtl mtl primitive ];
        description = "Polymorphic combinators for working with foreign functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MonadCatchIO-transformers" = callPackage
@@ -12356,6 +13445,8 @@ self: {
        ];
        description = "Monad-transformer compatible version of the Control.Exception module";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MonadCatchIO-transformers-foreign" = callPackage
@@ -12371,6 +13462,8 @@ self: {
        ];
        description = "Polymorphic combinators for working with foreign functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MonadCompose" = callPackage
@@ -12382,6 +13475,8 @@ self: {
        libraryHaskellDepends = [ base free mmorph mtl transformers ];
        description = "Methods for composing monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MonadLab" = callPackage
@@ -12398,6 +13493,8 @@ self: {
        executableHaskellDepends = [ base haskell98 process ];
        description = "Automatically generate layered monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MonadPrompt" = callPackage
@@ -12446,6 +13543,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Generalizing lift to monad stacks";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Monadius" = callPackage
@@ -12460,6 +13559,8 @@ self: {
        executableHaskellDepends = [ array base directory GLUT OpenGL ];
        description = "2-D arcade scroller";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Monadoro" = callPackage
@@ -12475,6 +13576,8 @@ self: {
        testHaskellDepends = [ ansi-terminal base doctest process time ];
        description = "A minimalistic CLI Pomodoro timer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Monaris" = callPackage
@@ -12493,6 +13596,8 @@ self: {
        ];
        description = "A simple tetris clone";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Monatron" = callPackage
@@ -12504,6 +13609,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Monad transformer library with uniform liftings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Monatron-IO" = callPackage
@@ -12515,6 +13622,8 @@ self: {
        libraryHaskellDepends = [ base Monatron transformers ];
        description = "MonadIO instances for the Monatron transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Monocle" = callPackage
@@ -12526,6 +13635,8 @@ self: {
        libraryHaskellDepends = [ base containers haskell98 mtl ];
        description = "Symbolic computations in strict monoidal categories with LaTeX output";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MorseCode" = callPackage
@@ -12557,6 +13668,8 @@ self: {
        ];
        description = "Automated Mutation Testing";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MuCheck-HUnit" = callPackage
@@ -12571,6 +13684,8 @@ self: {
        executableHaskellDepends = [ base HUnit MuCheck ];
        description = "Automated Mutation Testing for HUnit tests";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MuCheck-Hspec" = callPackage
@@ -12585,6 +13700,8 @@ self: {
        executableHaskellDepends = [ base hspec hspec-core MuCheck ];
        description = "Automated Mutation Testing for Hspec tests";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MuCheck-QuickCheck" = callPackage
@@ -12599,6 +13716,8 @@ self: {
        executableHaskellDepends = [ base MuCheck QuickCheck ];
        description = "Automated Mutation Testing for QuickCheck tests";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MuCheck-SmallCheck" = callPackage
@@ -12613,6 +13732,8 @@ self: {
        executableHaskellDepends = [ base MuCheck smallcheck ];
        description = "Automated Mutation Testing for SmallCheck tests";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Munkres" = callPackage
@@ -12635,6 +13756,8 @@ self: {
        libraryHaskellDepends = [ array base bimap containers Munkres ];
        description = "Simple and typesafe layer over the Munkres package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MusicBrainz" = callPackage
@@ -12701,6 +13824,8 @@ self: {
        ];
        description = "Most likely order of mutation events in RNA";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "MyPrimes" = callPackage
@@ -12716,6 +13841,8 @@ self: {
        benchmarkHaskellDepends = [ base time ];
        description = "Generate all primes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NGrams" = callPackage
@@ -12729,6 +13856,8 @@ self: {
        executableHaskellDepends = [ base HCL HTTP network regex-compat ];
        description = "Simple application for calculating n-grams using Google";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NMap" = callPackage
@@ -12740,6 +13869,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A transparent nested Map structure";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NTRU" = callPackage
@@ -12780,6 +13911,8 @@ self: {
        ];
        description = "A Haskell interface to Lego Mindstorms NXT";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {bluetooth = null;};
 
   "NXTDSL" = callPackage
@@ -12798,6 +13931,8 @@ self: {
        ];
        description = "Generate NXC Code from DSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NameGenerator" = callPackage
@@ -12825,6 +13960,8 @@ self: {
        executableHaskellDepends = [ base uu-parsinglib ];
        description = "Very small interpreter for a Prolog-like language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Naperian" = callPackage
@@ -12851,6 +13988,8 @@ self: {
        executableHaskellDepends = [ base hnetcdf Naperian split ];
        description = "Instances of NcStore for hypercuboids";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NaturalLanguageAlphabets" = callPackage
@@ -12880,6 +14019,8 @@ self: {
        ];
        description = "Simple scoring schemes for word alignments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NaturalSort" = callPackage
@@ -12910,6 +14051,8 @@ self: {
        ];
        description = "Context Algebra of near";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Neks" = callPackage
@@ -12932,6 +14075,8 @@ self: {
        ];
        description = "Simple networked key/value store";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NestedFunctor" = callPackage
@@ -12943,6 +14088,8 @@ self: {
        libraryHaskellDepends = [ base comonad distributive ];
        description = "Nested composition of functors with a type index tracking nesting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NestedSampling" = callPackage
@@ -12967,6 +14114,8 @@ self: {
        testHaskellDepends = [ base bytestring HUnit process ];
        description = "Bindings for net-snmp's C API for clients";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {net_snmp = null;};
 
   "Network-NineP" = callPackage
@@ -13031,6 +14180,8 @@ self: {
        ];
        description = "Ninja game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NoHoed" = callPackage
@@ -13061,6 +14212,8 @@ self: {
        ];
        description = "Microbenchmarks for various array libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NoTrace" = callPackage
@@ -13073,6 +14226,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Remove all the functions come from Debug.Trace after debugging";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Noise" = callPackage
@@ -13103,6 +14258,8 @@ self: {
        ];
        description = "A Nomic game in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Nomyx-Core" = callPackage
@@ -13129,6 +14286,8 @@ self: {
        ];
        description = "A Nomic game in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Nomyx-Language" = callPackage
@@ -13148,6 +14307,8 @@ self: {
        ];
        description = "Language to express rules for Nomic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Nomyx-Rules" = callPackage
@@ -13165,6 +14326,8 @@ self: {
        ];
        description = "Language to express rules for Nomic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Nomyx-Web" = callPackage
@@ -13189,6 +14352,8 @@ self: {
        ];
        description = "Web gui for Nomyx";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NonEmpty" = callPackage
@@ -13200,6 +14365,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Library providing a non-empty list datatype, and total functions operating on it";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NonEmptyList" = callPackage
@@ -13216,6 +14383,8 @@ self: {
        ];
        description = "A list with a length of at least one";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NumInstances" = callPackage
@@ -13249,6 +14418,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Number Theoretic Sieves: primes, factorization, and Euler's Totient";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "NumberTheory" = callPackage
@@ -13261,6 +14432,8 @@ self: {
        testHaskellDepends = [ base containers HUnit primes ];
        description = "A library for number theoretic computations, written in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Numbers" = callPackage
@@ -13289,6 +14462,8 @@ self: {
        ];
        description = "Nussinov78 using the ADPfusion library";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Nutri" = callPackage
@@ -13300,6 +14475,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A little library to calculate nutrition values of food items";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OGL" = callPackage
@@ -13311,6 +14488,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A context aware binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ONC-RPC" = callPackage
@@ -13335,6 +14514,8 @@ self: {
        executableHaskellDepends = [ base filepath ];
        description = "ONC RPC (aka Sun RPC) and XDR library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OSM" = callPackage
@@ -13350,6 +14531,8 @@ self: {
        ];
        description = "Parse OpenStreetMap files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OTP" = callPackage
@@ -13369,6 +14552,8 @@ self: {
        testHaskellDepends = [ base bytestring tasty tasty-hunit time ];
        description = "HMAC-Based and Time-Based One-Time Passwords (HOTP & TOTP)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Object" = callPackage
@@ -13380,6 +14565,8 @@ self: {
        libraryHaskellDepends = [ base containers ghc template-haskell ];
        description = "Object oriented programming for haskell using multiparameter typeclasses";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ObjectIO" = callPackage
@@ -13395,6 +14582,8 @@ self: {
          winspool
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {comctl32 = null; comdlg32 = null; gdi32 = null; 
          kernel32 = null; ole32 = null; shell32 = null; user32 = null; 
          winmm = null; winspool = null;};
@@ -13443,6 +14632,8 @@ self: {
        ];
        description = "Simple unbalanced Octree for storing data about 3D points";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OddWord" = callPackage
@@ -13456,6 +14647,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Provides a wrapper for deriving word types with fewer bits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Omega" = callPackage
@@ -13468,6 +14661,8 @@ self: {
        testHaskellDepends = [ base containers HUnit ];
        description = "Integer sets and relations using Presburger arithmetic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OnRmt" = callPackage
@@ -13504,6 +14699,8 @@ self: {
        ];
        description = "Text UI library for performing parallel remote SSH operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OneTuple" = callPackage
@@ -13546,6 +14743,8 @@ self: {
        ];
        description = "IBM AFP document format parser and generator";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OpenAFP-Utils" = callPackage
@@ -13566,6 +14765,8 @@ self: {
        ];
        description = "Assorted utilities to work with AFP data streams";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OpenAL" = callPackage
@@ -13598,6 +14799,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Haskell high-level wrapper for OpenCL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {OpenCL = null;};
 
   "OpenCLRaw" = callPackage
@@ -13609,6 +14812,8 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "The OpenCL Standard for heterogenous data-parallel computing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OpenCLWrappers" = callPackage
@@ -13620,6 +14825,8 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "The OpenCL Standard for heterogenous data-parallel computing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OpenGL" = callPackage
@@ -13651,6 +14858,8 @@ self: {
        ];
        description = "Quickcheck instances for various data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OpenGLRaw" = callPackage
@@ -13698,6 +14907,8 @@ self: {
        ];
        description = "ADT wrapper and renderer for OpenSCAD models";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OpenVG" = callPackage
@@ -13709,6 +14920,8 @@ self: {
        libraryHaskellDepends = [ base GLUT OpenGL OpenGLRaw OpenVGRaw ];
        description = "OpenVG (ShivaVG-0.2.1) binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OpenVGRaw" = callPackage
@@ -13720,6 +14933,8 @@ self: {
        libraryHaskellDepends = [ base OpenGLRaw ];
        description = "Raw binding to OpenVG (ShivaVG-0.2.1 implementation).";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Operads" = callPackage
@@ -13731,6 +14946,8 @@ self: {
        libraryHaskellDepends = [ array base containers mtl ];
        description = "Groebner basis computation for Operads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OptDir" = callPackage
@@ -13758,6 +14975,8 @@ self: {
        ];
        description = "A quasiquoter for or-patterns";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OrchestrateDB" = callPackage
@@ -13777,6 +14996,8 @@ self: {
        ];
        description = "Unofficial Haskell Client Library for the Orchestrate.io API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "OrderedBits" = callPackage
@@ -13822,6 +15043,8 @@ self: {
        testHaskellDepends = [ base safe threepenny-gui ];
        description = "A Programming Language in Construction";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Oslo-Vectize" = callPackage
@@ -13837,6 +15060,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PArrows" = callPackage
@@ -13861,6 +15086,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring Crypto random ];
        description = "Make password-based security schemes more secure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PCLT" = callPackage
@@ -13874,6 +15101,8 @@ self: {
        ];
        description = "Extension to Show: templating, catalogizing, languages, parameters, etc";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PCLT-DB" = callPackage
@@ -13890,6 +15119,8 @@ self: {
        ];
        description = "An addon to PCLT package: enchance PCLT catalog with PostgreSQL powers";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PDBtools" = callPackage
@@ -13914,6 +15145,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A generic derivable Haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PSQueue" = callPackage
@@ -13944,6 +15177,8 @@ self: {
        ];
        description = "An implementation of Montague's PTQ";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PUH-Project" = callPackage
@@ -13963,6 +15198,8 @@ self: {
        ];
        description = "This is a package which includes Assignments, Email, User and Reviews modules for Programming in Haskell course";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PageIO" = callPackage
@@ -13989,6 +15226,8 @@ self: {
        ];
        description = "Page-oriented extraction and composition library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Paillier" = callPackage
@@ -14007,6 +15246,8 @@ self: {
        ];
        description = "a simple Paillier cryptosystem";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PandocAgda" = callPackage
@@ -14027,6 +15268,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Pandoc support for literate Agda";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Paraiso" = callPackage
@@ -14051,6 +15294,8 @@ self: {
        ];
        description = "a code generator for partial differential equations solvers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Parallel-Arrows-BaseSpec" = callPackage
@@ -14100,6 +15345,8 @@ self: {
        ];
        description = "Eden based backend for @Parallel-Arrows-Definition@";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Parallel-Arrows-Multicore" = callPackage
@@ -14155,6 +15402,8 @@ self: {
        ];
        description = "A proven synchronization server for high performance computing";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ParsecTools" = callPackage
@@ -14199,6 +15448,8 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Simple library for generating passwords";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PastePipe" = callPackage
@@ -14229,6 +15480,8 @@ self: {
        ];
        description = "A tree used to merge and maintain paths";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Pathfinder" = callPackage
@@ -14241,6 +15494,8 @@ self: {
        librarySystemDepends = [ libxml2 ];
        description = "Relational optimiser and code generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libxml2;};
 
   "Peano" = callPackage
@@ -14263,6 +15518,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "GADT type witnesses for Peano-style natural numbers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PerfectHash" = callPackage
@@ -14279,6 +15536,8 @@ self: {
        librarySystemDepends = [ cmph ];
        description = "A perfect hashing library for mapping bytestrings to values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {cmph = null;};
 
   "PermuteEffects" = callPackage
@@ -14290,6 +15549,8 @@ self: {
        libraryHaskellDepends = [ base ReplicateEffects ];
        description = "Permutations of effectful computations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Persistence" = callPackage
@@ -14308,6 +15569,8 @@ self: {
        ];
        description = "A versatile library for topological data analysis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Phsu" = callPackage
@@ -14332,6 +15595,8 @@ self: {
        ];
        description = "Personal Happstack Server Utils";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Pipe" = callPackage
@@ -14343,6 +15608,8 @@ self: {
        libraryHaskellDepends = [ base filepath process unix ];
        description = "Process piping library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Piso" = callPackage
@@ -14354,6 +15621,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Partial isomorphisms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PlayHangmanGame" = callPackage
@@ -14387,6 +15656,8 @@ self: {
        ];
        description = "Playing cards api";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Plot-ho-matic" = callPackage
@@ -14408,6 +15679,8 @@ self: {
        ];
        description = "Real-time line plotter for generic data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PlslTools" = callPackage
@@ -14427,6 +15700,8 @@ self: {
        ];
        description = "So far just a lint like program for PL/SQL. Diff and refactoring tools are planned";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Plural" = callPackage
@@ -14451,6 +15726,8 @@ self: {
        executableHaskellDepends = [ array base clock GLUT random ];
        description = "An imaginary world";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PortFusion" = callPackage
@@ -14464,6 +15741,8 @@ self: {
        executableHaskellDepends = [ base bytestring network splice ];
        description = "high-performance distributed reverse / forward proxy & tunneling for TCP";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PortMidi" = callPackage
@@ -14559,6 +15838,8 @@ self: {
        ];
        description = "Pretty-printing for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Printf-TH" = callPackage
@@ -14569,6 +15850,8 @@ self: {
        sha256 = "0n1gva510p69vy25zvjkzwqqz2gilbns1wnrzz2p22rjkkbrinvx";
        libraryHaskellDepends = [ base haskell98 pretty template-haskell ];
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PriorityChansConverger" = callPackage
@@ -14580,6 +15863,8 @@ self: {
        libraryHaskellDepends = [ base containers stm ];
        description = "Read single output from an array of inputs - channels with priorities";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ProbabilityMonads" = callPackage
@@ -14591,6 +15876,8 @@ self: {
        libraryHaskellDepends = [ base MaybeT MonadRandom mtl ];
        description = "Probability distribution monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PropLogic" = callPackage
@@ -14619,6 +15906,8 @@ self: {
        executableHaskellDepends = [ base containers HUnit parsec syb ];
        description = "An implementation of propositional logic in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ProxN" = callPackage
@@ -14654,6 +15943,8 @@ self: {
        ];
        description = "A Perl 6 Implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Pup-Events" = callPackage
@@ -14673,6 +15964,8 @@ self: {
        doHaddock = false;
        description = "A networked event handling framework for hooking into other programs";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Pup-Events-Client" = callPackage
@@ -14706,6 +15999,8 @@ self: {
        ];
        description = "A networked event handling framework for hooking into other programs";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Pup-Events-PQueue" = callPackage
@@ -14732,6 +16027,8 @@ self: {
        ];
        description = "A networked event handling framework for hooking into other programs";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "PyF" = callPackage
@@ -14766,6 +16063,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl old-time random ];
        description = "The Quantum IO Monad is a library for defining quantum computations in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "QLearn" = callPackage
@@ -14777,6 +16076,8 @@ self: {
        libraryHaskellDepends = [ base random vector ];
        description = "A library for fast, easy-to-use Q-learning";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "QuadEdge" = callPackage
@@ -14788,6 +16089,8 @@ self: {
        libraryHaskellDepends = [ base random vector ];
        description = "QuadEdge structure for representing triangulations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "QuadTree" = callPackage
@@ -14800,6 +16103,8 @@ self: {
        testHaskellDepends = [ base composition lens QuickCheck ];
        description = "QuadTree library for Haskell, with lens support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "QuasiText" = callPackage
@@ -14835,6 +16140,8 @@ self: {
        ];
        description = "Programming with Eventual Consistency over Cassandra";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "QuickAnnotate" = callPackage
@@ -14849,6 +16156,8 @@ self: {
        executableHaskellDepends = [ base haskell-src-exts ];
        description = "Annotation Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "QuickCheck_1_2_0_1" = callPackage
@@ -14914,6 +16223,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Generator of \"valid\" and \"invalid\" data in a type class";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "QuickPlot" = callPackage
@@ -14937,6 +16248,8 @@ self: {
        ];
        description = "Quick and easy data visualization with Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Quickson" = callPackage
@@ -14951,6 +16264,8 @@ self: {
        ];
        description = "Quick JSON extractions with Aeson";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "R-pandoc" = callPackage
@@ -14968,6 +16283,8 @@ self: {
        ];
        executableHaskellDepends = [ base pandoc-types ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RANSAC" = callPackage
@@ -15043,6 +16360,8 @@ self: {
        ];
        description = "A reflective JSON serializer/parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RLP" = callPackage
@@ -15055,6 +16374,8 @@ self: {
        testHaskellDepends = [ base binary bytestring hspec ];
        description = "RLP serialization as defined in Ethereum Yellow Paper";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RMP" = callPackage
@@ -15075,6 +16396,8 @@ self: {
        executableSystemDepends = [ canlib ftd2xx ];
        description = "Binding to code that controls a Segway RMP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {canlib = null; ftd2xx = null;};
 
   "RNAFold" = callPackage
@@ -15097,6 +16420,8 @@ self: {
        ];
        description = "RNA secondary structure prediction";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RNAFoldProgs" = callPackage
@@ -15116,6 +16441,8 @@ self: {
        ];
        description = "RNA secondary structure folding";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RNAdesign" = callPackage
@@ -15141,6 +16468,8 @@ self: {
        executableHaskellDepends = [ bytestring cmdargs file-embed ];
        description = "Multi-target RNA sequence design";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RNAdraw" = callPackage
@@ -15160,6 +16489,8 @@ self: {
        executableHaskellDepends = [ cmdargs ];
        description = "Draw RNA secondary structures";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RNAlien" = callPackage
@@ -15192,6 +16523,8 @@ self: {
        ];
        description = "Unsupervized construction of RNA family models";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RNAwolf" = callPackage
@@ -15212,6 +16545,8 @@ self: {
        executableHaskellDepends = [ cmdargs split ];
        description = "RNA folding with non-canonical basepairs and base-triplets";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RSA" = callPackage
@@ -15316,6 +16651,8 @@ self: {
        libraryHaskellDepends = [ base HTTP-Simple network ];
        description = "Interface to random.org";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Randometer" = callPackage
@@ -15329,6 +16666,8 @@ self: {
        executableHaskellDepends = [ base random-fu ];
        description = "Randomness intuition trainer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Range" = callPackage
@@ -15340,6 +16679,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Data structure for managing ranges";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Ranged-sets" = callPackage
@@ -15370,6 +16711,8 @@ self: {
        ];
        description = "HTTP to XMPP omegle chats gate";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Rasenschach" = callPackage
@@ -15390,6 +16733,8 @@ self: {
        ];
        description = "Soccer simulation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Rasterific" = callPackage
@@ -15445,6 +16790,8 @@ self: {
        ];
        description = "Library to access Redmine's REST services";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Ref" = callPackage
@@ -15456,6 +16803,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Generic Mutable Ref Abstraction Layer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RefSerialize" = callPackage
@@ -15491,6 +16840,8 @@ self: {
        ];
        description = "A utility for computing distributions of material to review among reviewers";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RepLib" = callPackage
@@ -15506,6 +16857,8 @@ self: {
        ];
        description = "Generic programming library with representation types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ReplicateEffects" = callPackage
@@ -15517,6 +16870,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Composable replication schemes of applicative functors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ReviewBoard" = callPackage
@@ -15535,6 +16890,8 @@ self: {
        ];
        description = "Haskell bindings to ReviewBoard";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RichConditional" = callPackage
@@ -15546,6 +16903,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Tiny library to replace classic if/else";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Ritt-Wu" = callPackage
@@ -15574,6 +16933,8 @@ self: {
        ];
        description = "Parallel implementation of Ritt-Wu's algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Rlang-QQ" = callPackage
@@ -15597,6 +16958,8 @@ self: {
        testHaskellDepends = [ base directory doctest hspec lens vector ];
        description = "quasiquoter for inline-R code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RollingDirectory" = callPackage
@@ -15621,6 +16984,8 @@ self: {
        ];
        description = "Limits the size of a directory's contents";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RoyalMonad" = callPackage
@@ -15642,6 +17007,8 @@ self: {
        sha256 = "09vs2y6zry4xak0gc6pc6xqinr9sv9z53hdiydxpn6ixam9s0g5r";
        libraryHaskellDepends = [ base ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "RxHaskell" = callPackage
@@ -15653,6 +17020,8 @@ self: {
        libraryHaskellDepends = [ base containers stm transformers ];
        description = "Reactive Extensions for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "S3" = callPackage
@@ -15673,6 +17042,8 @@ self: {
        ];
        description = "Library for accessing S3 compatible storage services";
        license = stdenv.lib.licenses.gpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SBench" = callPackage
@@ -15690,6 +17061,8 @@ self: {
        ];
        description = "A benchmark suite for runtime and heap measurements over a series of inputs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SCRIPTWriter" = callPackage
@@ -15709,6 +17082,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "ESCRIPT: a human friendly language for programming Bitcoin scripts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SCalendar" = callPackage
@@ -15725,6 +17100,8 @@ self: {
        ];
        description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SDL" = callPackage
@@ -15840,6 +17217,8 @@ self: {
        ];
        description = "SFML bindings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {csfml-audio = null; csfml-graphics = null; 
          csfml-network = null; csfml-system = null; csfml-window = null; 
          sfml-audio = null; sfml-graphics = null; sfml-network = null; 
@@ -15854,6 +17233,8 @@ self: {
        libraryHaskellDepends = [ base mtl SFML template-haskell ];
        description = "Higher level library on top of SFML";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SFont" = callPackage
@@ -15865,6 +17246,8 @@ self: {
        libraryHaskellDepends = [ array base SDL Sprig ];
        description = "SFont SDL Bitmap Fonts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SG" = callPackage
@@ -15876,6 +17259,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Small geometry library for dealing with vectors and collision detection";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SGdemo" = callPackage
@@ -15889,6 +17274,8 @@ self: {
        executableHaskellDepends = [ base GLUT OpenGL SG ];
        description = "An example of using the SG and OpenGL libraries";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SGplus" = callPackage
@@ -15900,6 +17287,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "(updated) Small geometry library for dealing with vectors and collision detection";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SHA" = callPackage
@@ -15948,6 +17337,8 @@ self: {
        ];
        description = "A simple SMTP client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SNet" = callPackage
@@ -15964,6 +17355,8 @@ self: {
        libraryToolDepends = [ c2hsc ];
        description = "Declarative coördination language for streaming networks";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SQLDeps" = callPackage
@@ -15994,6 +17387,8 @@ self: {
        testHaskellDepends = [ base containers ];
        description = "STG Symbolic Execution";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "STL" = callPackage
@@ -16005,6 +17400,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring cereal text ];
        description = "STL 3D geometry format parsing and pretty-printing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "STLinkUSB" = callPackage
@@ -16078,6 +17475,8 @@ self: {
        ];
        description = "translate a SVD of a Microcontroller to Haskell tables";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SVG2Q" = callPackage
@@ -16095,6 +17494,8 @@ self: {
        ];
        description = "Code generation tool for Quartz code from a SVG";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SVGFonts" = callPackage
@@ -16161,6 +17562,8 @@ self: {
        ];
        description = "Generate a parser (in Haskell) with the SableCC parser generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Safe" = callPackage
@@ -16198,6 +17601,8 @@ self: {
        librarySystemDepends = [ glib mono ];
        description = "A .NET Bridge for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) glib; inherit (pkgs) mono;};
 
   "Saturnin" = callPackage
@@ -16221,6 +17626,8 @@ self: {
        testHaskellDepends = [ base data-default either hlint hspec mtl ];
        description = "Saturnin CI / Job System";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SciBaseTypes" = callPackage
@@ -16249,6 +17656,8 @@ self: {
        ];
        description = "Base types and classes for statistics, sciences and humanities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SciFlow" = callPackage
@@ -16273,6 +17682,8 @@ self: {
        ];
        description = "Scientific workflow management system";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SciFlow-drmaa" = callPackage
@@ -16289,6 +17700,8 @@ self: {
        ];
        description = "Scientific workflow management system";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ScratchFs" = callPackage
@@ -16307,6 +17720,8 @@ self: {
        ];
        description = "Size limited temp filesystem based on fuse";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Scurry" = callPackage
@@ -16325,6 +17740,8 @@ self: {
        ];
        description = "A cross platform P2P VPN application built using Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SecureHash-SHA3" = callPackage
@@ -16375,6 +17792,8 @@ self: {
        ];
        description = "Selects a representative subset of sequences from multiple sequence alignment";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Semantique" = callPackage
@@ -16393,6 +17812,8 @@ self: {
        ];
        description = "Command-line tool for maintaining the Semantique database";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Semigroup" = callPackage
@@ -16404,6 +17825,8 @@ self: {
        libraryHaskellDepends = [ base bytestring containers mtl ];
        description = "A semigroup";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SeqAlign" = callPackage
@@ -16415,6 +17838,8 @@ self: {
        libraryHaskellDepends = [ base bytestring vector ];
        description = "Sequence Alignment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SessionLogger" = callPackage
@@ -16430,6 +17855,8 @@ self: {
        ];
        description = "Easy Loggingframework";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Set" = callPackage
@@ -16471,6 +17898,8 @@ self: {
        ];
        description = "Shell script analysis tool";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Shellac" = callPackage
@@ -16484,6 +17913,8 @@ self: {
        libraryHaskellDepends = [ base directory mtl unix ];
        description = "A framework for creating shell envinronments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Shellac-compatline" = callPackage
@@ -16497,6 +17928,8 @@ self: {
        libraryHaskellDepends = [ base Shellac Shellac-readline ];
        description = "\"compatline\" backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Shellac-editline" = callPackage
@@ -16510,6 +17943,8 @@ self: {
        libraryHaskellDepends = [ base editline Shellac ];
        description = "Editline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Shellac-haskeline" = callPackage
@@ -16521,6 +17956,8 @@ self: {
        libraryHaskellDepends = [ base haskeline mtl Shellac ];
        description = "Haskeline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Shellac-readline" = callPackage
@@ -16534,6 +17971,8 @@ self: {
        libraryHaskellDepends = [ base readline Shellac ];
        description = "Readline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ShortestPathProblems" = callPackage
@@ -16554,6 +17993,8 @@ self: {
        ];
        description = "grammars for TSP and SHP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ShowF" = callPackage
@@ -16627,6 +18068,8 @@ self: {
        ];
        description = "A Simple Graphics Library from the SimpleH framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SimpleH" = callPackage
@@ -16663,6 +18106,8 @@ self: {
        ];
        description = "Simple, configurable logging";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SimpleServer" = callPackage
@@ -16683,6 +18128,8 @@ self: {
        ];
        description = "A simple static file server, for when apache is overkill";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SimpleTableGenerator" = callPackage
@@ -16744,6 +18191,8 @@ self: {
        testHaskellDepends = [ base file-embed ];
        description = "Generate slides from Haskell code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Smooth" = callPackage
@@ -16759,6 +18208,8 @@ self: {
        ];
        description = "A tiny, lazy SMT solver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SmtLib" = callPackage
@@ -16770,6 +18221,8 @@ self: {
        libraryHaskellDepends = [ base parsec transformers ];
        description = "Library for parsing SMTLIB2";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Snusmumrik" = callPackage
@@ -16792,6 +18245,8 @@ self: {
        executableToolDepends = [ cpphs ];
        description = "E-library directory based on FUSE virtual file system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) zip;};
 
   "SoOSiM" = callPackage
@@ -16808,6 +18263,8 @@ self: {
        ];
        description = "Abstract full system simulator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SoccerFun" = callPackage
@@ -16827,6 +18284,8 @@ self: {
        ];
        description = "Football simulation framework for teaching functional programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SoccerFunGL" = callPackage
@@ -16846,6 +18305,8 @@ self: {
        ];
        description = "OpenGL UI for the SoccerFun framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Sonnex" = callPackage
@@ -16858,6 +18319,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Sonnex is an alternative to Soundex for french language";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SourceGraph" = callPackage
@@ -16876,6 +18339,8 @@ self: {
        ];
        description = "Static code analysis using graph-theoretic techniques";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Southpaw" = callPackage
@@ -16908,6 +18373,8 @@ self: {
        executableHaskellDepends = [ array base HGL random Yampa ];
        description = "Video game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SpacePrivateers" = callPackage
@@ -16929,6 +18396,8 @@ self: {
        ];
        description = "Simple space pirate roguelike";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SpinCounter" = callPackage
@@ -16940,6 +18409,8 @@ self: {
        libraryHaskellDepends = [ base monad-loops ref-mtl stm ];
        description = "Lock free Spin Counter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Spintax" = callPackage
@@ -16980,6 +18451,8 @@ self: {
        ];
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Spock-api" = callPackage
@@ -17006,6 +18479,8 @@ self: {
        ];
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Spock-api-server" = callPackage
@@ -17017,6 +18492,8 @@ self: {
        libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ];
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Spock-auth" = callPackage
@@ -17028,6 +18505,8 @@ self: {
        libraryHaskellDepends = [ base http-types Spock text time ];
        description = "Provides authentification helpers for Spock";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Spock-core" = callPackage
@@ -17056,6 +18535,8 @@ self: {
        ];
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Spock-digestive" = callPackage
@@ -17072,6 +18553,8 @@ self: {
        ];
        description = "Digestive functors support for Spock";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Spock-lucid" = callPackage
@@ -17083,6 +18566,8 @@ self: {
        libraryHaskellDepends = [ base lucid Spock transformers ];
        description = "Lucid support for Spock";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Spock-worker" = callPackage
@@ -17100,6 +18585,8 @@ self: {
        testHaskellDepends = [ base containers HTF stm vector ];
        description = "Background workers for Spock";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SpreadsheetML" = callPackage
@@ -17122,6 +18609,8 @@ self: {
        libraryHaskellDepends = [ base SDL ];
        description = "Binding to Sprig";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Stack" = callPackage
@@ -17149,6 +18638,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A simple MVCC like library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "StateVar" = callPackage
@@ -17198,6 +18689,8 @@ self: {
        ];
        description = "Libary for Stockholm aligmnent format";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Stomp" = callPackage
@@ -17213,6 +18706,8 @@ self: {
        ];
        description = "Client library for Stomp brokers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Strafunski-ATermLib" = callPackage
@@ -17224,6 +18719,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "An abstract data type designed for the exchange of tree-like data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Strafunski-Sdf2Haskell" = callPackage
@@ -17243,6 +18740,8 @@ self: {
        ];
        description = "Converts SDF to Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Strafunski-StrategyLib" = callPackage
@@ -17273,6 +18772,8 @@ self: {
        testHaskellDepends = [ base blaze-builder bytestring hspec text ];
        description = "General purpose templates in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "StrategyLib" = callPackage
@@ -17307,6 +18808,8 @@ self: {
        libraryHaskellDepends = [ base benchpress parallel ];
        description = "Benchmarking code through strict evaluation";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "StrictCheck" = callPackage
@@ -17325,6 +18828,8 @@ self: {
        ];
        description = "StrictCheck: Keep Your Laziness In Check";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "StringUtils" = callPackage
@@ -17362,6 +18867,8 @@ self: {
        ];
        description = "Suffix array construction";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SybWidget" = callPackage
@@ -17377,6 +18884,8 @@ self: {
        ];
        description = "Library which aids constructing generic (SYB3-based) widgets";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "SyntaxMacros" = callPackage
@@ -17393,6 +18902,8 @@ self: {
        ];
        description = "Syntax Macros in the form of an EDSL";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Sysmon" = callPackage
@@ -17413,6 +18924,8 @@ self: {
        ];
        description = "Sybase 15 sysmon reports processor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TBC" = callPackage
@@ -17433,6 +18946,8 @@ self: {
        ];
        description = "Testing By Convention";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TBit" = callPackage
@@ -17449,6 +18964,8 @@ self: {
        ];
        description = "Utilities for condensed matter physics tight binding calculations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TCache" = callPackage
@@ -17497,6 +19014,8 @@ self: {
        executableHaskellDepends = [ base bytestring Yampa ];
        description = "Bindings to the TORCS vehicle simulator";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TTTAS" = callPackage
@@ -17534,6 +19053,8 @@ self: {
        ];
        description = "Template Your Boilerplate - a Template Haskell version of SYB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TableAlgebra" = callPackage
@@ -17562,6 +19083,8 @@ self: {
        executableHaskellDepends = [ base cookbook ];
        description = "A client for Quill databases";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Tablify" = callPackage
@@ -17575,6 +19098,8 @@ self: {
        executableHaskellDepends = [ base parsec xhtml ];
        description = "Tool to render CSV into tables of various formats";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Tahin" = callPackage
@@ -17618,6 +19143,8 @@ self: {
        libraryHaskellDepends = [ base mtl old-time time ];
        description = "Database library with left-fold interface, for PostgreSQL, Oracle, SQLite, ODBC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Tape" = callPackage
@@ -17629,6 +19156,8 @@ self: {
        libraryHaskellDepends = [ base comonad distributive Stream ];
        description = "Bidirectionally infinite streams, akin to the tape of a Turing machine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TaskMonad" = callPackage
@@ -17647,6 +19176,8 @@ self: {
        ];
        description = "A collection of tools which can be used to access taskwarrior from xmonad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Taxonomy" = callPackage
@@ -17662,6 +19193,8 @@ self: {
        ];
        description = "Libary for parsing, processing and vizualization of taxonomy data";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TaxonomyTools" = callPackage
@@ -17681,6 +19214,8 @@ self: {
        ];
        description = "Tool for parsing, processing, comparing and visualizing taxonomy data";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TeX-my-math" = callPackage
@@ -17707,6 +19242,8 @@ self: {
        ];
        description = "Render general Haskell math to LaTeX. Or: math typesetting with high signal-to-noise–ratio.";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TeaHS" = callPackage
@@ -17722,6 +19259,8 @@ self: {
        ];
        description = "TeaHS Game Creation Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Tensor" = callPackage
@@ -17765,6 +19304,8 @@ self: {
        ];
        description = "Generates testcases from program-snippets";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Theora" = callPackage
@@ -17776,6 +19317,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ ogg theora ];
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {ogg = null; theora = null;};
 
   "Thingie" = callPackage
@@ -17787,6 +19330,8 @@ self: {
        libraryHaskellDepends = [ base cairo gtk mtl ];
        description = "Purely functional 2D drawing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ThreadObjects" = callPackage
@@ -17844,6 +19389,8 @@ self: {
        ];
        description = "A sub-project (exercise) for a functional programming course";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TigerHash" = callPackage
@@ -17878,6 +19425,8 @@ self: {
        ];
        description = "A simple tile-based digital clock screen saver";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TinyLaunchbury" = callPackage
@@ -17889,6 +19438,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Simple implementation of call-by-need using Launchbury's semantics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TinyURL" = callPackage
@@ -17900,6 +19451,8 @@ self: {
        libraryHaskellDepends = [ base HTTP network ];
        description = "Use TinyURL to compress URLs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Titim" = callPackage
@@ -17913,6 +19466,8 @@ self: {
        executableHaskellDepends = [ base containers matrix random ];
        description = "Game for Lounge Marmelade";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Top" = callPackage
@@ -17927,6 +19482,8 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec ];
        description = "Constraint solving framework employed by the Helium Compiler";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TotalMap" = callPackage
@@ -17946,6 +19503,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "A total map datatype";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Tournament" = callPackage
@@ -17963,6 +19522,8 @@ self: {
        ];
        description = "Tournament related algorithms";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TraceUtils" = callPackage
@@ -17991,6 +19552,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "eDSL in R for Safe Variable Transformarion";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TransformersStepByStep" = callPackage
@@ -18004,6 +19567,8 @@ self: {
        executableHaskellDepends = [ base containers mtl ];
        description = "Tutorial on monad transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Transhare" = callPackage
@@ -18026,6 +19591,8 @@ self: {
        libraryHaskellDepends = [ base ref-mtl stm ];
        description = "Wait-free Tree Counter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TreeStructures" = callPackage
@@ -18037,6 +19604,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A collection of heaps and search trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TreeT" = callPackage
@@ -18059,6 +19628,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim monad-loops ref-mtl stm ];
        description = "Lock free Treiber stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TrendGraph" = callPackage
@@ -18075,6 +19646,8 @@ self: {
        ];
        description = "A simple trend Graph script";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TrieMap" = callPackage
@@ -18092,6 +19665,8 @@ self: {
        ];
        description = "Automatic type inference of generalized tries with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Twofish" = callPackage
@@ -18130,6 +19705,8 @@ self: {
        ];
        description = "Typing speed game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TypeCompose" = callPackage
@@ -18156,6 +19733,8 @@ self: {
        executableHaskellDepends = [ base haskell98 ];
        description = "TypeIlluminator is a prototype tool exploring debugging of type errors/";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TypeNat" = callPackage
@@ -18167,6 +19746,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Some Nat-indexed types for GHC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "TypingTester" = callPackage
@@ -18212,6 +19793,8 @@ self: {
        ];
        description = "A small command-line accounting tool";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "URLT" = callPackage
@@ -18229,6 +19812,8 @@ self: {
        ];
        description = "Library for maintaining correctness of URLs within an application";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "URLb" = callPackage
@@ -18240,6 +19825,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring containers ];
        description = "DEPRECATED A simple, liberal URL parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "UTFTConverter" = callPackage
@@ -18263,6 +19850,8 @@ self: {
        ];
        description = "Processing popular picture formats into .c or .raw format in RGB565";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Unique" = callPackage
@@ -18322,6 +19911,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Monadic FRP library based on stm";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "UrlDisp" = callPackage
@@ -18333,6 +19924,8 @@ self: {
        libraryHaskellDepends = [ base cgi MaybeT mtl ];
        description = "Url dispatcher. Helps to retain friendly URLs in web applications.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Useful" = callPackage
@@ -18385,6 +19978,8 @@ self: {
        ];
        description = "Provides access to Vkontakte social network via public API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "VRML" = callPackage
@@ -18408,6 +20003,8 @@ self: {
        ];
        description = "VRML parser and generator for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Validation" = callPackage
@@ -18421,6 +20018,8 @@ self: {
        ];
        description = "A data-type like Either but with an accumulating Applicative";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Vec" = callPackage
@@ -18443,6 +20042,8 @@ self: {
        libraryHaskellDepends = [ base Boolean Vec ];
        description = "Provides Boolean instances for the Vec package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Vec-OpenGLRaw" = callPackage
@@ -18454,6 +20055,8 @@ self: {
        libraryHaskellDepends = [ base OpenGLRaw Vec ];
        description = "Instances and functions to interoperate Vec and OpenGL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Vec-Transform" = callPackage
@@ -18465,6 +20068,8 @@ self: {
        doHaddock = false;
        description = "This package is obsolete";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "VecN" = callPackage
@@ -18490,6 +20095,8 @@ self: {
        executableHaskellDepends = [ base containers matrix ];
        description = "A solver for the WordBrain game";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ViennaRNA-bindings" = callPackage
@@ -18533,6 +20140,8 @@ self: {
        ];
        description = "ViennaRNA v2 extensions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ViennaRNAParser" = callPackage
@@ -18579,6 +20188,8 @@ self: {
        ];
        description = "Villefort is a task manager and time tracker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Vulkan" = callPackage
@@ -18606,6 +20217,8 @@ self: {
        ];
        description = "WAVE audio file IO library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WL500gPControl" = callPackage
@@ -18622,6 +20235,8 @@ self: {
        ];
        description = "A simple command line tools to control the Asus WL500gP router";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WL500gPLib" = callPackage
@@ -18636,6 +20251,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A simple library to access to the WL 500gP router from the Haskell code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WMSigner" = callPackage
@@ -18655,6 +20272,8 @@ self: {
        ];
        description = "WebMoney authentication module";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WURFL" = callPackage
@@ -18666,6 +20285,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 parsec ];
        description = "Convert the WURFL file into a Parsec parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WXDiffCtrl" = callPackage
@@ -18678,6 +20299,8 @@ self: {
        libraryHaskellDepends = [ base containers wx wxcore ];
        description = "WXDiffCtrl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WashNGo" = callPackage
@@ -18696,6 +20319,8 @@ self: {
        executableHaskellDepends = [ directory ghc-paths process ];
        description = "WASH is a family of EDSLs for programming Web applications in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WaveFront" = callPackage
@@ -18712,6 +20337,8 @@ self: {
        ];
        description = "Parsers and utilities for the OBJ WaveFront 3D model format";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Weather" = callPackage
@@ -18738,6 +20365,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl parsec pretty syb ];
        description = "JavaScript analysis tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WebBits-Html" = callPackage
@@ -18753,6 +20382,8 @@ self: {
        ];
        description = "JavaScript analysis tools";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WebBits-multiplate" = callPackage
@@ -18769,6 +20400,8 @@ self: {
        ];
        description = "A Multiplate instance for JavaScript";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WebCont" = callPackage
@@ -18787,6 +20420,8 @@ self: {
        ];
        description = "Continuation based web programming for Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WeberLogic" = callPackage
@@ -18801,6 +20436,8 @@ self: {
        executableHaskellDepends = [ base parsec ];
        description = "Logic interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Webrexp" = callPackage
@@ -18827,6 +20464,8 @@ self: {
        ];
        description = "Regexp-like engine to scrap web data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Wheb" = callPackage
@@ -18851,6 +20490,8 @@ self: {
        ];
        description = "The frictionless WAI Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WikimediaParser" = callPackage
@@ -18862,6 +20503,8 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "A parser for wikimedia style article markup";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Win32" = callPackage
@@ -19040,6 +20683,8 @@ self: {
        ];
        description = "Wire-aware hardware description";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WordAlignment" = callPackage
@@ -19079,6 +20724,8 @@ self: {
        ];
        description = "Bigram word pair alignments";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WordNet" = callPackage
@@ -19092,6 +20739,8 @@ self: {
        libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WordNet-ghc74" = callPackage
@@ -19105,6 +20754,8 @@ self: {
        libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Wordlint" = callPackage
@@ -19139,6 +20790,8 @@ self: {
        ];
        description = "Workflow patterns over a monad for thread state logging & recovery";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "WxGeneric" = callPackage
@@ -19153,6 +20806,8 @@ self: {
        ];
        description = "Generic (SYB3) construction of wxHaskell widgets";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "X" = callPackage
@@ -19198,6 +20853,8 @@ self: {
        librarySystemDepends = [ libX11 ];
        description = "Missing bindings to the X11 graphics library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs.xorg) libX11;};
 
   "X11-rm" = callPackage
@@ -19209,6 +20866,8 @@ self: {
        libraryHaskellDepends = [ base X11 ];
        description = "A binding to the resource management functions missing from X11";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "X11-xdamage" = callPackage
@@ -19221,6 +20880,8 @@ self: {
        librarySystemDepends = [ Xdamage ];
        description = "A binding to the Xdamage X11 extension library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {Xdamage = null;};
 
   "X11-xfixes" = callPackage
@@ -19233,6 +20894,8 @@ self: {
        librarySystemDepends = [ Xfixes ];
        description = "A binding to the Xfixes X11 extension library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {Xfixes = null;};
 
   "X11-xft" = callPackage
@@ -19324,6 +20987,8 @@ self: {
        librarySystemDepends = [ xmmsclient xmmsclient-glib ];
        description = "XMMS2 client library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {xmmsclient = null; xmmsclient-glib = null;};
 
   "XMPP" = callPackage
@@ -19340,6 +21005,8 @@ self: {
        ];
        description = "XMPP library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "XSaiga" = callPackage
@@ -19362,6 +21029,8 @@ self: {
        ];
        description = "An implementation of a polynomial-time top-down parser suitable for NLP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Xauth" = callPackage
@@ -19392,6 +21061,8 @@ self: {
        ];
        description = "Gtk command launcher with identicon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "XmlHtmlWriter" = callPackage
@@ -19403,6 +21074,8 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A library for writing XML and HTML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Xorshift128Plus" = callPackage
@@ -19414,6 +21087,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Pure haskell implementation of xorshift128plus random number generator";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "YACPong" = callPackage
@@ -19434,6 +21109,8 @@ self: {
        ];
        description = "Yet Another Pong Clone using SDL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "YFrob" = callPackage
@@ -19445,6 +21122,8 @@ self: {
        libraryHaskellDepends = [ array base HGL Yampa ];
        description = "Yampa-based library for programming robots";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Yablog" = callPackage
@@ -19479,6 +21158,8 @@ self: {
        ];
        description = "A simple blog engine powered by Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "YamlReference" = callPackage
@@ -19506,6 +21187,8 @@ self: {
        ];
        description = "YAML reference implementation";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Yampa" = callPackage
@@ -19522,6 +21205,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Elegant Functional Reactive Programming Language for Hybrid Systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Yampa-core" = callPackage
@@ -19553,6 +21238,8 @@ self: {
        ];
        description = "Software synthesizer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Yocto" = callPackage
@@ -19580,6 +21267,8 @@ self: {
        ];
        description = "A MUD client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "Yogurt-Standalone" = callPackage
@@ -19599,6 +21288,8 @@ self: {
        executableSystemDepends = [ readline ];
        description = "A functional MUD client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) readline;};
 
   "ZEBEDDE" = callPackage
@@ -19612,6 +21303,8 @@ self: {
        libraryHaskellDepends = [ base vect ];
        description = "Polymer growth simulation method";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ZFS" = callPackage
@@ -19627,6 +21320,8 @@ self: {
        ];
        description = "Oleg's Zipper FS";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ZMachine" = callPackage
@@ -19641,6 +21336,8 @@ self: {
        executableHaskellDepends = [ array base gtk mtl random ];
        description = "A Z-machine interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ZipFold" = callPackage
@@ -19691,6 +21388,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Combinators for bidirectional URL routing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "a50" = callPackage
@@ -19709,6 +21408,8 @@ self: {
        ];
        description = "Compare genome assemblies";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "abacate" = callPackage
@@ -19762,6 +21463,8 @@ self: {
        ];
        description = "Bindings for ABC, A System for Sequential Synthesis and Verification";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {abc = null;};
 
   "abcnotation" = callPackage
@@ -19775,6 +21478,8 @@ self: {
        ];
        description = "Haskell representation and parser for ABC notation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "abeson" = callPackage
@@ -19794,6 +21499,8 @@ self: {
        ];
        description = "interconversion between aeson and bson";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "abides" = callPackage
@@ -19806,6 +21513,8 @@ self: {
        testHaskellDepends = [ base comonad tasty tasty-quickcheck ];
        description = "Simple boolean tests to see if a value abides by certain properties";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "abnf" = callPackage
@@ -19825,6 +21534,8 @@ self: {
        ];
        description = "Parse ABNF and generate parsers for the specified document";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "abstract-deque" = callPackage
@@ -19880,6 +21591,8 @@ self: {
        ];
        description = "Provides the class ParAccelerate, nothing more";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "abt" = callPackage
@@ -19895,6 +21608,8 @@ self: {
        ];
        description = "Abstract binding trees for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ac-machine" = callPackage
@@ -19908,6 +21623,8 @@ self: {
        ];
        description = "Aho-Corasick string matching algorithm in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ac-machine-conduit" = callPackage
@@ -19919,6 +21636,8 @@ self: {
        libraryHaskellDepends = [ ac-machine base conduit text ];
        description = "Drive Aho-Corasick machines in Conduit pipelines";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "accelerate" = callPackage
@@ -19945,6 +21664,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "An embedded language for accelerated array processing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "accelerate-arithmetic" = callPackage
@@ -19963,6 +21684,8 @@ self: {
        ];
        description = "Linear algebra and interpolation using the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "accelerate-bignum" = callPackage
@@ -20175,6 +21898,8 @@ self: {
        ];
        description = "Accelerate frontend to the FFTW library (Fourier transform)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "accelerate-fourier" = callPackage
@@ -20200,6 +21925,8 @@ self: {
        ];
        description = "Fast Fourier transform and convolution using the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "accelerate-fourier-benchmark" = callPackage
@@ -20239,6 +21966,8 @@ self: {
        ];
        description = "Read and write Accelerate arrays in various formats";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "accelerate-kullback-liebler" = callPackage
@@ -20263,6 +21992,8 @@ self: {
        doHaddock = false;
        description = "Kullback-Liebler divergence";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "accelerate-llvm" = callPackage
@@ -20284,6 +22015,8 @@ self: {
        ];
        description = "Accelerate backend component generating LLVM IR";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "accelerate-llvm-native" = callPackage
@@ -20306,6 +22039,8 @@ self: {
        testHaskellDepends = [ accelerate base ];
        description = "Accelerate backend for multicore CPUs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "accelerate-llvm-ptx" = callPackage
@@ -20338,6 +22073,8 @@ self: {
        libraryHaskellDepends = [ accelerate base mwc-random ];
        description = "Generate Accelerate arrays filled with high quality pseudorandom numbers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "accelerate-typelits" = callPackage
@@ -20360,6 +22097,8 @@ self: {
        ];
        description = "a typesafe way encode accelerate matrices and vectors";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "accelerate-utility" = callPackage
@@ -20371,6 +22110,8 @@ self: {
        libraryHaskellDepends = [ accelerate base utility-ht ];
        description = "Utility functions for the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "accentuateus" = callPackage
@@ -20382,6 +22123,8 @@ self: {
        libraryHaskellDepends = [ base bytestring HTTP json network text ];
        description = "A Haskell implementation of the Accentuate.us API.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "access-time" = callPackage
@@ -20393,6 +22136,8 @@ self: {
        libraryHaskellDepends = [ base filepath old-time time unix ];
        description = "Cross-platform support for retrieving file access times";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "access-token-provider" = callPackage
@@ -20419,6 +22164,8 @@ self: {
        ];
        description = "Provides Access Token for Services";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "accuerr" = callPackage
@@ -20504,6 +22251,8 @@ self: {
        ];
        description = "A replication backend for acid-state";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acid-state-tls" = callPackage
@@ -20519,6 +22268,8 @@ self: {
        ];
        description = "Add TLS support for Data.Acid.Remote";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acl2" = callPackage
@@ -20541,6 +22292,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "A monad which is powerful enough to interpret any action";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-box" = callPackage
@@ -20616,6 +22369,8 @@ self: {
        libraryHaskellDepends = [ base comonad ];
        description = "A more efficient dualization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-cuteboy" = callPackage
@@ -20677,6 +22432,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Stop execution with rage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-functors" = callPackage
@@ -20710,6 +22467,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An embedded DSL for the HQ9+ programming language";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-http" = callPackage
@@ -20727,6 +22486,8 @@ self: {
        ];
        description = "fastest Haskell PONG server in the world";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-inator" = callPackage
@@ -20741,6 +22502,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Evil inventions in the Tri-State area";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-io" = callPackage
@@ -20775,6 +22538,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A place for dumping that does-not-feel-right code while you improve it";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-left-pad" = callPackage
@@ -20786,6 +22551,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "free your haskell from the tyranny of npm!";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-lolcat" = callPackage
@@ -20841,6 +22608,8 @@ self: {
        libraryHaskellDepends = [ base random ];
        description = "Miscellaneous newtypes for orderings of discutable use";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-missiles" = callPackage
@@ -20866,6 +22635,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A mutable package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-now" = callPackage
@@ -20877,6 +22648,8 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "An interface to the philosophical and metaphysical \"now\"";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-numbersystem" = callPackage
@@ -20888,6 +22661,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Define the less than and add and subtract for nats";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-omitted" = callPackage
@@ -20922,6 +22697,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Operators of base, all in one place!";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-php" = callPackage
@@ -20933,6 +22710,8 @@ self: {
        libraryHaskellDepends = [ acme-left-pad base ];
        description = "The flexibility of Haskell and the safety of PHP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-pointful-numbers" = callPackage
@@ -20984,6 +22763,8 @@ self: {
        ];
        description = "Proper names for curry and uncurry";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-smuggler" = callPackage
@@ -21007,6 +22788,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "A binding to the glibc strfry function";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-stringly-typed" = callPackage
@@ -21020,6 +22803,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Stringly Typed Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-strtok" = callPackage
@@ -21044,6 +22829,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "import This";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acme-timemachine" = callPackage
@@ -21092,6 +22879,8 @@ self: {
        doHaddock = false;
        description = "The absorbing element of package dependencies";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acousticbrainz-client" = callPackage
@@ -21185,6 +22974,8 @@ self: {
        ];
        description = "Haskell code presentation tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "activehs-base" = callPackage
@@ -21198,6 +22989,8 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Basic definitions for activehs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "activitypub" = callPackage
@@ -21209,6 +23002,8 @@ self: {
        libraryHaskellDepends = [ aeson base network-uri text time ];
        description = "ActivityPub Haskell Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "activitystreams-aeson" = callPackage
@@ -21222,6 +23017,8 @@ self: {
        ];
        description = "An interface to the ActivityStreams specification";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "actor" = callPackage
@@ -21234,6 +23031,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 stm time ];
        description = "Actors with multi-headed receive clauses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "acts" = callPackage
@@ -21280,6 +23079,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Self optimizing container types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "adaptive-tuple" = callPackage
@@ -21291,6 +23092,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell type-level ];
        description = "Self-optimizing tuple types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "adb" = callPackage
@@ -21305,6 +23108,8 @@ self: {
        ];
        description = "Android Debug Bridge (ADB) protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "adblock2privoxy" = callPackage
@@ -21326,6 +23131,8 @@ self: {
        ];
        description = "Convert adblock config files to privoxy format";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "addLicenseInfo" = callPackage
@@ -21356,6 +23163,8 @@ self: {
        ];
        description = "Ad-hoc P2P network protocol";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "adict" = callPackage
@@ -21377,6 +23186,8 @@ self: {
        ];
        description = "Approximate dictionary searching";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "adjunction" = callPackage
@@ -21446,6 +23257,8 @@ self: {
        ];
        description = "parse Adobe Swatch Exchange files and (optionally) output .css files with the colors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "adp-multi" = callPackage
@@ -21466,6 +23279,8 @@ self: {
        ];
        description = "ADP for multiple context-free languages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "adp-multi-monadiccp" = callPackage
@@ -21485,6 +23300,8 @@ self: {
        ];
        description = "Subword construction in adp-multi using monadiccp";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "adtrees" = callPackage
@@ -21496,6 +23313,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Modelling, rendering and quantitative analysis on attack defense trees";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "advent-of-code-api" = callPackage
@@ -21536,6 +23355,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Multi-precision ball (interval) arithmetic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aern2-real" = callPackage
@@ -21559,6 +23380,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Exact real numbers via Cauchy sequences and MPFR";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson_0_7_0_6" = callPackage
@@ -21630,6 +23453,8 @@ self: {
        libraryHaskellDepends = [ aeson base text unordered-containers ];
        description = "make To/From JSOn instances from an applicative description";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-attoparsec" = callPackage
@@ -21749,6 +23574,8 @@ self: {
        ];
        description = "Easy functions for converting from Aeson.Value";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-default" = callPackage
@@ -21807,6 +23634,8 @@ self: {
        ];
        description = "Apply a json-patch to any haskell datatype";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-extra" = callPackage
@@ -21851,6 +23680,8 @@ self: {
        ];
        description = "Several newtypes and combinators for dealing with less-than-cleanly JSON input";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-flat" = callPackage
@@ -21900,6 +23731,8 @@ self: {
        ];
        description = "Create Flow type definitions from Haskell data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-gadt-th" = callPackage
@@ -21925,6 +23758,8 @@ self: {
        ];
        description = "Derivation of Aeson instances for GADTs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-generic-compat" = callPackage
@@ -21958,6 +23793,8 @@ self: {
        ];
        description = "Injecting fields into aeson values";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-iproute" = callPackage
@@ -21974,6 +23811,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Aeson instances for iproute types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-json-ast" = callPackage
@@ -22041,6 +23880,8 @@ self: {
        ];
        description = "Fast JSON parsing and encoding (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-optics" = callPackage
@@ -22116,6 +23957,8 @@ self: {
        testHaskellDepends = [ aeson base bytestring hspec mtl text ];
        description = "Hiearchical prefixing for aeson";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-pretty_0_7_2" = callPackage
@@ -22228,6 +24071,8 @@ self: {
        ];
        description = "Haskell JSON schema validator and parser generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-schemas" = callPackage
@@ -22280,6 +24125,8 @@ self: {
        ];
        description = "Smart derivation of Aeson instances";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-streams" = callPackage
@@ -22295,6 +24142,8 @@ self: {
        ];
        description = "An HTTP client library for JSON-based APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-t" = callPackage
@@ -22314,6 +24163,8 @@ self: {
        ];
        description = "Transform JSON";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-tiled" = callPackage
@@ -22333,6 +24184,8 @@ self: {
        testHaskellDepends = [ aeson base hspec ];
        description = "Aeson instances for the Tiled map editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-toolkit" = callPackage
@@ -22367,6 +24220,8 @@ self: {
        ];
        description = "Generate TypeScript definition files from your ADTs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aeson-utils" = callPackage
@@ -22436,6 +24291,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aeson-yaml_1_0_6_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, string-qq, tasty
+     , tasty-discover, tasty-hunit, text, unordered-containers, vector
+     , yaml
+     }:
+     mkDerivation {
+       pname = "aeson-yaml";
+       version = "1.0.6.0";
+       sha256 = "16rm4jgl4wznsc4nna3vdx186qy3jl71r9y89dgcc7k00qvlxb7y";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring string-qq tasty tasty-discover tasty-hunit
+         unordered-containers yaml
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "Output any Aeson value as YAML (pure Haskell library)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "affection" = callPackage
     ({ mkDerivation, base, bytestring, clock, containers, glib, linear
      , monad-loops, monad-parallel, mtl, OpenGL, sdl2, stm, text, uuid
@@ -22453,6 +24332,8 @@ self: {
        ];
        description = "A simple Game Engine using SDL";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "affine" = callPackage
@@ -22479,6 +24360,8 @@ self: {
        ];
        description = "General-purpose sampling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "affinely-extended" = callPackage
@@ -22528,6 +24411,8 @@ self: {
        ];
        description = "Infinite state model checking of iterative C programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ag-pictgen" = callPackage
@@ -22541,6 +24426,8 @@ self: {
        executableHaskellDepends = [ base containers uuagc uulib ];
        description = "Attribute Grammar picture generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "agda-server" = callPackage
@@ -22561,6 +24448,8 @@ self: {
        ];
        description = "Http server for Agda (prototype)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "agda-snippets" = callPackage
@@ -22581,6 +24470,8 @@ self: {
        executableHaskellDepends = [ Agda base network-uri transformers ];
        description = "Render just the Agda snippets of a literate Agda file to HTML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "agda-snippets-hakyll" = callPackage
@@ -22597,6 +24488,8 @@ self: {
        ];
        description = "Literate Agda support using agda-snippets, for Hakyll pages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "agentx" = callPackage
@@ -22618,6 +24511,8 @@ self: {
        ];
        description = "AgentX protocol for write SNMP subagents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "agum" = callPackage
@@ -22650,6 +24545,8 @@ self: {
        ];
        description = "And-inverter graphs in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aip" = callPackage
@@ -22678,6 +24575,8 @@ self: {
        ];
        description = "Aeronautical Information Package (AIP)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "air" = callPackage
@@ -22732,6 +24631,8 @@ self: {
        libraryHaskellDepends = [ air base template-haskell ];
        description = "air";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "airbrake" = callPackage
@@ -22751,6 +24652,8 @@ self: {
        ];
        description = "An Airbrake notifier for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "airship" = callPackage
@@ -22780,6 +24683,8 @@ self: {
        ];
        description = "A Webmachine-inspired HTTP library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "airtable-api" = callPackage
@@ -22797,6 +24702,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Requesting and introspecting Tables within an Airtable project";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aivika" = callPackage
@@ -22845,6 +24752,8 @@ self: {
        ];
        description = "Parallel distributed discrete event simulation module for the Aivika library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aivika-experiment" = callPackage
@@ -23001,6 +24910,8 @@ self: {
        ];
        description = "Haskell compiler that produce binary through C language";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "al" = callPackage
@@ -23032,6 +24943,8 @@ self: {
        ];
        description = "Wake up and perform an action at a certain time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "alea" = callPackage
@@ -23066,6 +24979,8 @@ self: {
        ];
        description = "Bindings to the alerta REST API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "alerts" = callPackage
@@ -23121,6 +25036,8 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "Collection of useful functions for writing console applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "alex-tools" = callPackage
@@ -23155,6 +25072,8 @@ self: {
        ];
        description = "utility library for Alfred version 2";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "alg" = callPackage
@@ -23200,6 +25119,8 @@ self: {
        ];
        description = "Algorithmic automation for various DAWs";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "algebra" = callPackage
@@ -23233,6 +25154,8 @@ self: {
        ];
        description = "Infrastructure for DAG-shaped relational algebra plans";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "algebra-sql" = callPackage
@@ -23259,6 +25182,8 @@ self: {
        ];
        description = "Relational Algebra and SQL Code Generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "algebraic" = callPackage
@@ -23270,6 +25195,8 @@ self: {
        libraryHaskellDepends = [ accelerate base ];
        description = "General linear algebra structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "algebraic-classes" = callPackage
@@ -23315,6 +25242,8 @@ self: {
        ];
        description = "Algebraically structured Prelude";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "algo-s" = callPackage
@@ -23340,6 +25269,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "An implementation of Knuth's algorithm S";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "algolia" = callPackage
@@ -23365,6 +25296,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A client implementing the Algolia search API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "align" = callPackage
@@ -23389,6 +25322,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "A simple unix filter to align text on specified substrings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aligned-foreignptr" = callPackage
@@ -23477,6 +25412,8 @@ self: {
        ];
        description = "a practical affine language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "alpha" = callPackage
@@ -23497,6 +25434,8 @@ self: {
        ];
        description = "A compiler for the Alpha language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "alphachar" = callPackage
@@ -23517,6 +25456,8 @@ self: {
        ];
        description = "A character between a-z";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "alpino-tools" = callPackage
@@ -23556,6 +25497,8 @@ self: {
        librarySystemDepends = [ alsaLib ];
        description = "Binding to the ALSA Library API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-core" = callPackage
@@ -23586,6 +25529,8 @@ self: {
        ];
        description = "Some simple interactive programs for sending MIDI control messages via ALSA";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "alsa-midi" = callPackage
@@ -23606,6 +25551,8 @@ self: {
        executableSystemDepends = [ alsaLib ];
        description = "Bindings for the ALSA sequencer API (MIDI stuff)";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-mixer" = callPackage
@@ -23653,6 +25600,8 @@ self: {
        executableHaskellDepends = [ alsa base ];
        description = "Tests for the ALSA audio signal library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "alsa-seq" = callPackage
@@ -23687,6 +25636,8 @@ self: {
        executableHaskellDepends = [ alsa base ];
        description = "Tests for the ALSA sequencer library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "altcomposition" = callPackage
@@ -23698,6 +25649,8 @@ self: {
        libraryHaskellDepends = [ base composition ];
        description = "Alternative combinators for unorthodox function composition";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "alternative-extra" = callPackage
@@ -23709,6 +25662,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Extra utilities for alternatives";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "alternative-io" = callPackage
@@ -23726,6 +25681,8 @@ self: {
        ];
        description = "IO as Alternative instance (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "alternative-vector" = callPackage
@@ -23788,6 +25745,8 @@ self: {
        executableHaskellDepends = [ base warp ];
        description = "Implement a menu experience fit for web users";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "altsvc" = callPackage
@@ -23816,6 +25775,8 @@ self: {
        librarySystemDepends = [ alure ];
        description = "A Haskell binding for ALURE";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) alure;};
 
   "amazon-emailer" = callPackage
@@ -23835,6 +25796,8 @@ self: {
        ];
        description = "A queue daemon for Amazon's SES with a PostgreSQL table as a queue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "amazon-emailer-client-snap" = callPackage
@@ -23849,6 +25812,8 @@ self: {
        ];
        description = "Client library for amazon-emailer daemon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "amazon-products" = callPackage
@@ -23874,6 +25839,8 @@ self: {
        ];
        description = "Connector for Amazon Products API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "amazonka" = callPackage
@@ -26328,6 +28295,8 @@ self: {
        benchmarkHaskellDepends = [ base statistics ];
        description = "Statistical data visualization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ampersand" = callPackage
@@ -26358,6 +28327,8 @@ self: {
        ];
        description = "Toolsuite for automated design of business processes";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "amqp" = callPackage
@@ -26405,6 +28376,8 @@ self: {
        ];
        description = "Conduit bindings for AMQP (see amqp package)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "amqp-utils" = callPackage
@@ -26488,6 +28461,8 @@ self: {
        ];
        description = "making data science easy and safe with data frames";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "analyze-client" = callPackage
@@ -26504,6 +28479,8 @@ self: {
        ];
        description = "Client for analyze service";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "anansi" = callPackage
@@ -26556,6 +28533,8 @@ self: {
        ];
        description = "Looms which use Pandoc to parse and produce a variety of formats";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "anatomy" = callPackage
@@ -26582,6 +28561,8 @@ self: {
        ];
        description = "Anatomy: Atomo documentation system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "android" = callPackage
@@ -26593,6 +28574,8 @@ self: {
        libraryHaskellDepends = [ base process ];
        description = "Android methods exposed to Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "android-activity" = callPackage
@@ -26604,6 +28587,8 @@ self: {
        libraryHaskellDepends = [ base data-default ];
        description = "Turn regular Haskell programs into Android Activities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "android-lint-summary" = callPackage
@@ -26630,6 +28615,8 @@ self: {
        ];
        description = "A pretty printer for Android Lint errors";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "angel" = callPackage
@@ -26657,6 +28644,8 @@ self: {
        ];
        description = "Process management and supervision daemon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "angle" = callPackage
@@ -26685,6 +28674,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "A small, general-purpose programming language";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "animalcase" = callPackage
@@ -26717,6 +28708,8 @@ self: {
        testHaskellDepends = [ ansi-terminal-game base hspec parsec ];
        description = "text-file based ASCII animator";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "animate" = callPackage
@@ -26733,6 +28726,8 @@ self: {
        testHaskellDepends = [ aeson base containers hspec vector ];
        description = "Animation for sprites";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "animate-example" = callPackage
@@ -26751,6 +28746,8 @@ self: {
        ];
        description = "Animation for sprites";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "animate-frames" = callPackage
@@ -26772,6 +28769,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hspec ];
        description = "Convert sprite frames to animate files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "animate-preview" = callPackage
@@ -26797,6 +28796,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Preview tool for sprite animation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "animate-sdl2" = callPackage
@@ -26808,6 +28809,8 @@ self: {
        libraryHaskellDepends = [ aeson animate base sdl2 sdl2-image ];
        description = "sdl2 + animate auxiliary library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "anki-tools" = callPackage
@@ -26828,6 +28831,8 @@ self: {
        executableHaskellDepends = [ base data-default ];
        description = "Tools for interacting with Anki database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "annah" = callPackage
@@ -26851,6 +28856,8 @@ self: {
        ];
        description = "Medium-level language that desugars to Morte";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "annihilator" = callPackage
@@ -26897,6 +28904,8 @@ self: {
        libraryHaskellDepends = [ base lens template-haskell ];
        description = "Anonymous sum types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "anonymous-sums-tests" = callPackage
@@ -26908,6 +28917,8 @@ self: {
        libraryHaskellDepends = [ anonymous-sums base QuickCheck ];
        description = "QuickCheck functions to accompany the anonymous-sums package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ansi-escape-codes" = callPackage
@@ -27005,6 +29016,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Terminal-based graphing via ANSI and Unicode";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "antagonist" = callPackage
@@ -27030,6 +29043,8 @@ self: {
        ];
        description = "A web interface to Antisplice dungeons";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "antfarm" = callPackage
@@ -27052,6 +29067,8 @@ self: {
        ];
        description = "Referring expressions for definitions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "anticiv" = callPackage
@@ -27077,6 +29094,8 @@ self: {
        ];
        description = "This is an IRC bot for Mafia and Resistance";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "antigate" = callPackage
@@ -27094,6 +29113,8 @@ self: {
        ];
        description = "Interface for antigate.com captcha recognition API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "antimirov" = callPackage
@@ -27108,6 +29129,8 @@ self: {
        executableHaskellDepends = [ base containers QuickCheck ];
        description = "Define the language containment (=subtyping) relation on regulare expressions";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "antiope-athena" = callPackage
@@ -27116,8 +29139,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-athena";
-       version = "7.5.0";
-       sha256 = "0gn01dlvx42b7c9gs6vphn4bhzjh2r37gqvngqq56hbxpd3ddnrh";
+       version = "7.5.1";
+       sha256 = "03yy4l5czchq9djxh0yg40vlnynly2wsl5rcj91231n575ndqbij";
        libraryHaskellDepends = [
          amazonka amazonka-athena amazonka-core base lens resourcet text
          unliftio-core
@@ -27135,8 +29158,8 @@ self: {
     ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }:
      mkDerivation {
        pname = "antiope-contract";
-       version = "7.5.0";
-       sha256 = "07ykln4i6yhl44r1n9318xk15ci2kfbl3gx81jar1sw1lsig8wah";
+       version = "7.5.1";
+       sha256 = "006i6z7hzz6kkss18wyk2pwmib9ip2z2qwc1r0y3ni1j6kaghbh0";
        libraryHaskellDepends = [
          aeson antiope-s3 avro base bytestring text
        ];
@@ -27170,7 +29193,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "antiope-core_7_5_0" = callPackage
+  "antiope-core_7_5_1" = callPackage
     ({ mkDerivation, aeson, aeson-lens, amazonka, amazonka-core, base
      , bytestring, exceptions, generic-lens, hedgehog, hspec
      , hspec-discover, http-client, http-types, hw-hspec-hedgehog, lens
@@ -27178,8 +29201,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-core";
-       version = "7.5.0";
-       sha256 = "0hsya7n46ga4s6016jpv26hcxkbchz8zcihbkdriv6zjin4y4ms6";
+       version = "7.5.1";
+       sha256 = "068dsdag8bng2ddzr0vxipmzrfa5x3jq80pmrmc0l86bjvnlsdjr";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core base bytestring exceptions
          generic-lens http-client http-types lens mtl resourcet text
@@ -27219,15 +29242,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "antiope-dynamodb_7_5_0" = callPackage
+  "antiope-dynamodb_7_5_1" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb
      , antiope-core, base, generic-lens, hspec-discover, lens, text
      , unliftio-core, unordered-containers
      }:
      mkDerivation {
        pname = "antiope-dynamodb";
-       version = "7.5.0";
-       sha256 = "19rfxh92x7j3mpg23vfwvg90k6iz7l4lyzsijii4dhaf41w750ix";
+       version = "7.5.1";
+       sha256 = "19d7rbz4qqq3pd9nncydgvda798a5ziw21zkpa5d0smfna71zckp";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-dynamodb antiope-core base
          generic-lens lens text unliftio-core unordered-containers
@@ -27249,8 +29272,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-es";
-       version = "7.5.0";
-       sha256 = "0wa5wjzawlkbvd98a9wmzh9x7r133hyz340ppz2xq50j85sj3rfn";
+       version = "7.5.1";
+       sha256 = "1ww4bfwqbyrmzb84wy78yqzp3snbq3xlxvhs7vl3ik71bn99abyr";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-elasticsearch base bytestring
          json-stream lens thyme unordered-containers vector
@@ -27285,7 +29308,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "antiope-messages_7_5_0" = callPackage
+  "antiope-messages_7_5_1" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring
      , generic-lens, hedgehog, hspec, hspec-discover, hw-hspec-hedgehog
      , lens, lens-aeson, monad-loops, network-uri, scientific, text
@@ -27293,8 +29316,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-messages";
-       version = "7.5.0";
-       sha256 = "1hj20y832q1fqkvca1zzyhvg8iy87r6jwpa6f42mpbwv2kgar0n7";
+       version = "7.5.1";
+       sha256 = "01hkq4n5jpfnb9i8ysaj73zknvkhpxb3mnq7csv2dc29ral4vzdp";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core base bytestring generic-lens lens
          lens-aeson monad-loops network-uri text unliftio-core
@@ -27317,8 +29340,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-optparse-applicative";
-       version = "7.5.0";
-       sha256 = "0b2bzq1lpy6yypmi14civb1gsizgby7xh3a881scwbhqh0dr2bkq";
+       version = "7.5.1";
+       sha256 = "0zmsb9ng46p0plch2q8lh5awbkx7vhg9xl3na1czdk0mdh2hdhxz";
        libraryHaskellDepends = [
          amazonka amazonka-core amazonka-s3 base optparse-applicative text
        ];
@@ -27359,7 +29382,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "antiope-s3_7_5_0" = callPackage
+  "antiope-s3_7_5_1" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3
      , antiope-core, antiope-messages, attoparsec, base, bytestring
      , conduit, conduit-extra, deepseq, dlist, exceptions, generic-lens
@@ -27368,8 +29391,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-s3";
-       version = "7.5.0";
-       sha256 = "174swlnmjai5awaiwn47788giv75rggc1y13zz1iwjgzxi9iy4kb";
+       version = "7.5.1";
+       sha256 = "0nqs90pqk8dfjbrc55f4gdw4ybw2fslbx9z2x8k45mqpri3xwc0y";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 antiope-core
          antiope-messages attoparsec base bytestring conduit conduit-extra
@@ -27398,8 +29421,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-shell";
-       version = "7.5.0";
-       sha256 = "1fw3wgvs5yky4xvz1mffqvwmvw6r1s9qmjwf9cz4hj24ghqp0w76";
+       version = "7.5.1";
+       sha256 = "1c68d84ykdamzgybryr474xh826j9b5mh4gn6q3aiapzl5bhh7ym";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-s3 antiope-core
          antiope-messages antiope-s3 attoparsec base bytestring exceptions
@@ -27440,15 +29463,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "antiope-sns_7_5_0" = callPackage
+  "antiope-sns_7_5_1" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base
      , bytestring, generic-lens, hedgehog, hspec, hspec-discover
      , hw-hspec-hedgehog, lens, text, time, unliftio-core
      }:
      mkDerivation {
        pname = "antiope-sns";
-       version = "7.5.0";
-       sha256 = "1qqfl9yagc99yvvclqw5cllw3b59lq57l3rfg9rqxf9zmdxqq8nq";
+       version = "7.5.1";
+       sha256 = "13wzfjqihsi0xw7j869knj82a6k1fi74fywhlqc3bh1xc6wcir7q";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-sns base bytestring
          generic-lens lens text time unliftio-core
@@ -27490,7 +29513,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "antiope-sqs_7_5_0" = callPackage
+  "antiope-sqs_7_5_1" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base
      , bytestring, conduit, generic-lens, hedgehog, hspec
      , hspec-discover, hw-hspec-hedgehog, lens, lens-aeson, monad-loops
@@ -27499,8 +29522,8 @@ self: {
      }:
      mkDerivation {
        pname = "antiope-sqs";
-       version = "7.5.0";
-       sha256 = "0v75x2n902xvn4qwv9qk1fhayzsw5wz5yg7p1i6pwxxzf8bmy46l";
+       version = "7.5.1";
+       sha256 = "1y3fxqx5595agcnr157q3jap0dmcss8lyij187j9f29y0wkbkzv6";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-sqs base bytestring conduit
          generic-lens lens lens-aeson monad-loops mtl network-uri split text
@@ -27569,6 +29592,8 @@ self: {
        ];
        description = "An engine for text-based dungeons";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "antlr-haskell" = callPackage
@@ -27593,6 +29618,8 @@ self: {
        ];
        description = "A Haskell implementation of the ANTLR top-down parser generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "antlrc" = callPackage
@@ -27613,6 +29640,8 @@ self: {
        ];
        description = "Haskell binding to the ANTLR parser generator C runtime library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {antlr3c = null;};
 
   "anydbm" = callPackage
@@ -27628,6 +29657,8 @@ self: {
        libraryHaskellDepends = [ base containers MissingH mtl ];
        description = "Interface for DBM-like database systems";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aos-signature" = callPackage
@@ -27668,6 +29699,8 @@ self: {
        ];
        description = "Bindings to libaosd, a library for Cairo-based on-screen displays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libaosd;};
 
   "ap-reflect" = callPackage
@@ -27728,26 +29761,11 @@ self: {
        ];
        description = "Get all your structure and rip it apart";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apecs" = callPackage
-    ({ mkDerivation, array, base, containers, criterion, linear, mtl
-     , QuickCheck, template-haskell, vector
-     }:
-     mkDerivation {
-       pname = "apecs";
-       version = "0.9.0";
-       sha256 = "01l53q5495kd7wv9a1ipmrgfczkmajqplzqwh9fzclqg97hbn7n0";
-       libraryHaskellDepends = [
-         array base containers mtl template-haskell vector
-       ];
-       testHaskellDepends = [ base containers linear QuickCheck vector ];
-       benchmarkHaskellDepends = [ base criterion linear ];
-       description = "Fast Entity-Component-System library for game programming";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "apecs_0_9_1" = callPackage
     ({ mkDerivation, array, base, containers, criterion, linear, mtl
      , QuickCheck, template-haskell, vector
      }:
@@ -27762,7 +29780,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion linear ];
        description = "Fast Entity-Component-System library for game programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "apecs-gloss" = callPackage
@@ -27821,6 +29838,8 @@ self: {
        ];
        description = "STM stores for apecs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apelsin" = callPackage
@@ -27842,6 +29861,8 @@ self: {
        ];
        description = "Server and community browser for the game Tremulous";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "api-builder" = callPackage
@@ -27863,6 +29884,8 @@ self: {
        ];
        description = "Library for easily building REST API wrappers in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "api-field-json-th" = callPackage
@@ -27943,6 +29966,8 @@ self: {
        testHaskellDepends = [ base bytestring ];
        description = "RPC API client for Factom";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "api-rpc-pegnet" = callPackage
@@ -27966,6 +29991,8 @@ self: {
        ];
        description = "simple json-rpc client for PegNet";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "api-tools" = callPackage
@@ -28000,6 +30027,8 @@ self: {
        ];
        description = "DSL for generating API boilerplate and docs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "api-yoti" = callPackage
@@ -28020,6 +30049,8 @@ self: {
        testHaskellDepends = [ base bytestring text ];
        description = "Api bindings for Yoti services";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary" = callPackage
@@ -28052,6 +30083,8 @@ self: {
        ];
        description = "Simple and type safe web framework that generate web API documentation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-authenticate" = callPackage
@@ -28071,6 +30104,8 @@ self: {
        ];
        description = "authenticate support for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-clientsession" = callPackage
@@ -28088,6 +30123,8 @@ self: {
        ];
        description = "clientsession support for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-cookie" = callPackage
@@ -28103,6 +30140,8 @@ self: {
        ];
        description = "Cookie support for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-eventsource" = callPackage
@@ -28114,6 +30153,8 @@ self: {
        libraryHaskellDepends = [ apiary base blaze-builder wai-extra ];
        description = "eventsource support for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-helics" = callPackage
@@ -28133,6 +30174,8 @@ self: {
        ];
        description = "helics support for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-http-client" = callPackage
@@ -28149,6 +30192,8 @@ self: {
        ];
        description = "A http client for Apiary";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-logger" = callPackage
@@ -28166,6 +30211,8 @@ self: {
        ];
        description = "fast-logger support for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-memcached" = callPackage
@@ -28184,6 +30231,8 @@ self: {
        ];
        description = "memcached client for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-mongoDB" = callPackage
@@ -28201,6 +30250,8 @@ self: {
        ];
        description = "mongoDB support for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-persistent" = callPackage
@@ -28218,6 +30269,8 @@ self: {
        ];
        description = "persistent support for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-purescript" = callPackage
@@ -28237,6 +30290,8 @@ self: {
        ];
        description = "purescript compiler for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-redis" = callPackage
@@ -28248,6 +30303,8 @@ self: {
        libraryHaskellDepends = [ apiary base hedis transformers ];
        description = "redis support for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-session" = callPackage
@@ -28259,6 +30316,8 @@ self: {
        libraryHaskellDepends = [ apiary base wai ];
        description = "session support for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apiary-websockets" = callPackage
@@ -28270,6 +30329,8 @@ self: {
        libraryHaskellDepends = [ apiary base wai-websockets websockets ];
        description = "websockets support for apiary web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apioiaf-client" = callPackage
@@ -28302,6 +30363,8 @@ self: {
        ];
        description = "A Template Haskell library for generating type safe API calls";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apns-http2" = callPackage
@@ -28359,6 +30422,8 @@ self: {
        ];
        description = "a faster debian repository";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "app-lens" = callPackage
@@ -28373,6 +30438,8 @@ self: {
        ];
        description = "applicative (functional) bidirectional programming beyond composition chains";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "app-settings" = callPackage
@@ -28427,6 +30494,8 @@ self: {
        ];
        description = "app container types and tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "appendmap" = callPackage
@@ -28468,6 +30537,8 @@ self: {
        ];
        description = "Applicative functor and monad which collects all your fails";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "applicative-numbers" = callPackage
@@ -28495,6 +30566,8 @@ self: {
        ];
        description = "An applicative parser combinator library";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "applicative-quoters" = callPackage
@@ -28508,6 +30581,8 @@ self: {
        libraryHaskellDepends = [ base haskell-src-meta template-haskell ];
        description = "Quasiquoters for idiom brackets and an applicative do-notation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "applicative-splice" = callPackage
@@ -28523,6 +30598,8 @@ self: {
        ];
        description = "Write applicative programs in direct style (generalizes idiom brackets)";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "apply-refact_0_3_0_1" = callPackage
@@ -28624,6 +30701,8 @@ self: {
        ];
        description = "ApproveAPI Haskell Client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "approx-rand-test" = callPackage
@@ -28725,6 +30804,8 @@ self: {
        ];
        description = "Pure Haskell arbitrary length FFT library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arbb-vm" = callPackage
@@ -28741,6 +30822,8 @@ self: {
        librarySystemDepends = [ arbb_dev ];
        description = "FFI binding to the Intel Array Building Blocks (ArBB) virtual machine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {arbb_dev = null;};
 
   "arbor-datadog" = callPackage
@@ -28765,6 +30848,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Datadog client for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arbor-lru-cache" = callPackage
@@ -28849,6 +30934,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Core metric library for publishing metrics";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arbor-monad-metric-datadog" = callPackage
@@ -28874,6 +30961,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Metric library backend for datadog";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arbor-postgres" = callPackage
@@ -28919,6 +31008,8 @@ self: {
        ];
        description = "Automatic Rule-Based Time Tracker";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arcgrid" = callPackage
@@ -29035,6 +31126,8 @@ self: {
        ];
        description = "Archive supplied URLs in WebCite & Internet Archive";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "archlinux" = callPackage
@@ -29050,6 +31143,8 @@ self: {
        ];
        description = "Support for working with Arch Linux packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "archlinux-web" = callPackage
@@ -29075,6 +31170,8 @@ self: {
        ];
        description = "Website maintenance for Arch Linux packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "archnews" = callPackage
@@ -29090,6 +31187,8 @@ self: {
        ];
        description = "Convert Arch Linux package updates in RSS to pretty markdown";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arduino-copilot" = callPackage
@@ -29107,6 +31206,8 @@ self: {
        ];
        description = "Arduino programming in haskell using the Copilot stream DSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arena" = callPackage
@@ -29132,6 +31233,8 @@ self: {
        ];
        description = "A journaled data store";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arff" = callPackage
@@ -29148,6 +31251,8 @@ self: {
        ];
        description = "Generate Attribute-Relation File Format (ARFF) files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arghwxhaskell" = callPackage
@@ -29161,6 +31266,8 @@ self: {
        executableHaskellDepends = [ base directory wx ];
        description = "An interpreter for the Argh! programming language in wxHaskell";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "argon" = callPackage
@@ -29187,6 +31294,8 @@ self: {
        ];
        description = "Measure your code's complexity";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "argon2" = callPackage
@@ -29205,6 +31314,8 @@ self: {
        ];
        description = "Memory-hard password hash and proof-of-work function";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "argparser" = callPackage
@@ -29217,6 +31328,8 @@ self: {
        testHaskellDepends = [ base containers HTF HUnit ];
        description = "Command line parsing framework for console applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arguedit" = callPackage
@@ -29234,6 +31347,8 @@ self: {
        ];
        description = "A computer assisted argumentation transcription and editing software";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ariadne" = callPackage
@@ -29261,6 +31376,8 @@ self: {
        ];
        description = "Go-to-definition for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arion" = callPackage
@@ -29284,6 +31401,8 @@ self: {
        ];
        description = "Watcher and runner for Hspec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arion-compose" = callPackage
@@ -29462,6 +31581,8 @@ self: {
        executableHaskellDepends = [ base GLUT mtl OpenGL stm ];
        description = "Space-based real time strategy game";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "armor" = callPackage
@@ -29482,6 +31603,8 @@ self: {
        ];
        description = "Prevent serialization backwards compatibility problems using golden tests";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arpa" = callPackage
@@ -29496,6 +31619,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Library for reading ARPA n-gram models";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arpack" = callPackage
@@ -29519,6 +31644,8 @@ self: {
        ];
        description = "Solve large scale eigenvalue problems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) arpack;};
 
   "array_0_5_4_0" = callPackage
@@ -29587,6 +31714,8 @@ self: {
        ];
        description = "A simple interpreter for arrayForth, the language used on GreenArrays chips";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "array-memoize" = callPackage
@@ -29615,6 +31744,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ghc-prim ];
        description = "Extra foreign primops for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "array-utils" = callPackage
@@ -29650,6 +31781,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Haskell bindings to the ArrayFire general-purpose GPU library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {af = null;};
 
   "arraylist" = callPackage
@@ -29667,6 +31800,8 @@ self: {
        ];
        description = "Memory-efficient ArrayList implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arrow-extras" = callPackage
@@ -29692,6 +31827,8 @@ self: {
        ];
        description = "Improved arrows";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arrow-list" = callPackage
@@ -29703,6 +31840,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "List arrows for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arrowapply-utils" = callPackage
@@ -29714,6 +31853,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Utilities for working with ArrowApply instances more naturally";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arrowp" = callPackage
@@ -29727,6 +31868,8 @@ self: {
        executableHaskellDepends = [ array base containers haskell-src ];
        description = "preprocessor translating arrow notation into Haskell 98";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arrowp-qq" = callPackage
@@ -29747,6 +31890,8 @@ self: {
        executableHaskellDepends = [ base haskell-src-exts NoHoed ];
        description = "A preprocessor and quasiquoter for translating arrow notation";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arrows" = callPackage
@@ -29771,6 +31916,8 @@ self: {
        ];
        description = "A simple, arrow-based reactive programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "artifact" = callPackage
@@ -29784,6 +31931,8 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring containers text ];
        description = "Basic types and instances for Valve's Artifact Card-set API";
        license = stdenv.lib.licenses.agpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arx" = callPackage
@@ -29836,6 +31985,8 @@ self: {
        testHaskellDepends = [ base hedgehog jwt mtl text time ];
        description = "Atlassian Service Authentication Protocol";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ascetic" = callPackage
@@ -29847,6 +31998,8 @@ self: {
        libraryHaskellDepends = [ base MissingH ];
        description = "Generic markup builder";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ascii" = callPackage
@@ -29865,6 +32018,8 @@ self: {
        ];
        description = "Type-safe, bytestring-based ASCII values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ascii-art-to-unicode" = callPackage
@@ -29891,6 +32046,8 @@ self: {
        libraryHaskellDepends = [ base random-extras random-fu text ];
        description = "A collection of ASCII cows. Moo.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ascii-flatten" = callPackage
@@ -29905,6 +32062,8 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "Flattens European non-ASCII characaters into ASCII";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ascii-holidays" = callPackage
@@ -29962,6 +32121,8 @@ self: {
        ];
        description = "Compact representation of ASCII strings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ascii-table" = callPackage
@@ -29978,6 +32139,8 @@ self: {
        ];
        description = "ASCII table";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ascii-vector-avc" = callPackage
@@ -30000,6 +32163,8 @@ self: {
        ];
        description = "Process Ascii Vectors for Advantest 93k";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ascii85-conduit" = callPackage
@@ -30012,6 +32177,8 @@ self: {
        testHaskellDepends = [ base bytestring conduit hspec ];
        description = "Conduit for encoding ByteString into Ascii85";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "asciichart" = callPackage
@@ -30062,6 +32229,8 @@ self: {
        executableHaskellDepends = [ asil base bytestring utf8-string ];
        description = "Action Script Instrumentation Compiler";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "asif" = callPackage
@@ -30122,6 +32291,8 @@ self: {
        ];
        description = "Action Script Instrumentation Library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "asn" = callPackage
@@ -30136,6 +32307,8 @@ self: {
        ];
        description = "asn type and encoding/decoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "asn1-codec" = callPackage
@@ -30160,6 +32333,8 @@ self: {
        ];
        description = "Encode and decode ASN.1";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "asn1-data" = callPackage
@@ -30176,6 +32351,8 @@ self: {
        libraryHaskellDepends = [ base bytestring cereal mtl text ];
        description = "ASN1 data reader and writer in RAW, BER and DER forms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "asn1-encoding" = callPackage
@@ -30278,6 +32455,8 @@ self: {
        ];
        description = "Helpers for Control.Exception.assert";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "assert-failure" = callPackage
@@ -30305,6 +32484,8 @@ self: {
        testHaskellDepends = [ base interpolate process ];
        description = "A simple testing framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "asset-bundle" = callPackage
@@ -30333,6 +32514,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Asset map support for the JavaScript broccoli-asset-rev library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "assimp" = callPackage
@@ -30346,6 +32529,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "The Assimp asset import library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) assimp;};
 
   "assoc" = callPackage
@@ -30403,6 +32588,8 @@ self: {
        ];
        description = "An SMTP client library";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "assumpta-core" = callPackage
@@ -30435,6 +32622,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A library for constructing AST by using do-notation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ast-monad-json" = callPackage
@@ -30449,6 +32638,8 @@ self: {
        testHaskellDepends = [ ast-monad base hspec text ];
        description = "A library for writing JSON";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ast-path" = callPackage
@@ -30504,6 +32695,8 @@ self: {
        ];
        description = "an incomplete 2d space game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "astro" = callPackage
@@ -30541,6 +32734,8 @@ self: {
        ];
        description = "A GTK-based abstract syntax tree viewer for custom languages and parsers";
        license = stdenv.lib.licenses.bsdOriginal;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "astview-utils" = callPackage
@@ -30602,6 +32797,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Async combinators";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "async-dejafu" = callPackage
@@ -30618,6 +32815,8 @@ self: {
        ];
        description = "Run MonadConc operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "async-extra" = callPackage
@@ -30670,6 +32869,8 @@ self: {
        executableHaskellDepends = [ async base stm unordered-containers ];
        description = "A thread manager for async";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "async-pool" = callPackage
@@ -30752,6 +32953,8 @@ self: {
        ];
        description = "Provides API for timer based execution of IO actions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "asynchronous-exceptions" = callPackage
@@ -30763,6 +32966,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Distinguish between synchronous and asynchronous exceptions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aterm" = callPackage
@@ -30774,6 +32979,8 @@ self: {
        libraryHaskellDepends = [ array base containers ghc-prim ];
        description = "serialisation for Haskell values with sharing support";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aterm-utils" = callPackage
@@ -30788,6 +32995,8 @@ self: {
        executableHaskellDepends = [ aterm base transformers wl-pprint ];
        description = "Utility functions for working with aterms as generated by Minitermite";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "atl" = callPackage
@@ -30826,6 +33035,8 @@ self: {
        libraryPkgconfigDepends = [ zlib ];
        description = "Atlassian Connect snaplet for the Snap Framework and helper code";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "atlassian-connect-descriptor" = callPackage
@@ -30847,6 +33058,8 @@ self: {
        ];
        description = "Code that helps you create a valid Atlassian Connect Descriptor";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "atmos" = callPackage
@@ -30885,6 +33098,8 @@ self: {
        libraryHaskellDepends = [ atmos base dimensional-tf ];
        description = "dimensional-tf wrapper on atmos package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "atndapi" = callPackage
@@ -30909,6 +33124,8 @@ self: {
        ];
        description = "An interface of ATND API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "atom" = callPackage
@@ -30962,6 +33179,8 @@ self: {
        ];
        description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287).";
        license = stdenv.lib.licenses.cc0;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "atom-msp430" = callPackage
@@ -30973,6 +33192,8 @@ self: {
        libraryHaskellDepends = [ atom base mtl ];
        description = "Convenience functions for using Atom with the MSP430 microcontroller family";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "atomic-file-ops" = callPackage
@@ -30999,6 +33220,8 @@ self: {
        libraryHaskellDepends = [ base stm ];
        description = "A typeclass for mutable references that have an atomic modify operation";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "atomic-primops" = callPackage
@@ -31028,6 +33251,8 @@ self: {
        ];
        description = "An atomic counter implemented using the FFI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "atomic-primops-vector" = callPackage
@@ -31040,6 +33265,8 @@ self: {
        testHaskellDepends = [ base vector ];
        description = "Atomic operations on Data.Vector types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "atomic-write" = callPackage
@@ -31083,6 +33310,8 @@ self: {
        ];
        description = "A highly dynamic, extremely simple, very fun programming language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "atp-haskell" = callPackage
@@ -31100,6 +33329,8 @@ self: {
        testHaskellDepends = [ base containers HUnit time ];
        description = "Translation from Ocaml to Haskell of John Harrison's ATP code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "atrans" = callPackage
@@ -31131,6 +33362,8 @@ self: {
        ];
        description = "A source-code formatter for ATS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ats-pkg" = callPackage
@@ -31165,6 +33398,8 @@ self: {
        doHaddock = false;
        description = "A build tool for ATS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ats-setup" = callPackage
@@ -31183,6 +33418,8 @@ self: {
        ];
        description = "ATS scripts for Cabal builds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ats-storable" = callPackage
@@ -31200,6 +33437,8 @@ self: {
        testSystemDepends = [ storable ];
        description = "Marshal ATS types into Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {storable = null;};
 
   "attempt" = callPackage
@@ -31211,6 +33450,8 @@ self: {
        libraryHaskellDepends = [ base failure ];
        description = "Concrete data type for handling extensible exceptions as failures. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "attic-schedule" = callPackage
@@ -31230,6 +33471,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "A script I use to run \"attic\" for my backups";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "atto-lisp" = callPackage
@@ -31253,6 +33496,8 @@ self: {
        ];
        description = "Efficient parsing and serialisation of S-Expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "attomail" = callPackage
@@ -31275,6 +33520,8 @@ self: {
        testHaskellDepends = [ base doctest Glob QuickCheck ];
        description = "Minimal mail delivery agent (MDA) for local mail with maildir support";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "attoparsec" = callPackage
@@ -31391,6 +33638,8 @@ self: {
        ];
        description = "Pass input from an enumerator to an Attoparsec parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "attoparsec-expr" = callPackage
@@ -31418,6 +33667,8 @@ self: {
        ];
        description = "Parse IP data types with attoparsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "attoparsec-iso8601" = callPackage
@@ -31446,6 +33697,8 @@ self: {
        ];
        description = "An adapter to convert attoparsec Parsers into blazing-fast Iteratees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "attoparsec-parsec" = callPackage
@@ -31490,6 +33743,8 @@ self: {
        libraryHaskellDepends = [ array attoparsec base containers text ];
        description = "(deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "attoparsec-text-enumerator" = callPackage
@@ -31501,6 +33756,8 @@ self: {
        libraryHaskellDepends = [ attoparsec-text base enumerator text ];
        description = "(deprecated)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "attoparsec-time" = callPackage
@@ -31527,6 +33784,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base transformers ];
        description = "Interleaved effects for attoparsec parsers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "attoparsec-uri" = callPackage
@@ -31548,6 +33807,8 @@ self: {
        ];
        description = "URI parser / printer using attoparsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "attoparsec-varword" = callPackage
@@ -31576,6 +33837,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "Split a lazy bytestring at boundaries defined by an attoparsec parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "atuin" = callPackage
@@ -31592,6 +33855,8 @@ self: {
        ];
        description = "Embedded Turtle language compiler in Haskell, with Epic output";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "audacity" = callPackage
@@ -31633,6 +33898,8 @@ self: {
        ];
        description = "A battery-included audiovisual framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "augeas" = callPackage
@@ -31652,6 +33919,8 @@ self: {
        executablePkgconfigDepends = [ augeas ];
        description = "A Haskell FFI wrapper for the Augeas API";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) augeas;};
 
   "augur" = callPackage
@@ -31670,6 +33939,8 @@ self: {
        ];
        description = "Renaming media collections in a breeze";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aur" = callPackage
@@ -31688,6 +33959,8 @@ self: {
        ];
        description = "Access metadata from the Arch Linux User Repository";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aur_6_3_1" = callPackage
@@ -31707,6 +33980,7 @@ self: {
        description = "Access metadata from the Arch Linux User Repository";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aur-api" = callPackage
@@ -31723,6 +33997,8 @@ self: {
        ];
        description = "ArchLinux AUR json v5 API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aura" = callPackage
@@ -31762,6 +34038,8 @@ self: {
        ];
        description = "A secure package manager for Arch Linux and the AUR";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "authenticate" = callPackage
@@ -31803,6 +34081,8 @@ self: {
        libraryHaskellDepends = [ base LDAP text transformers ];
        description = "LDAP authentication for Haskell web applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "authenticate-oauth" = callPackage
@@ -31832,6 +34112,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base network text ];
        description = "Password querying for .authinfo";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "authoring" = callPackage
@@ -31850,6 +34132,8 @@ self: {
        ];
        description = "A library for writing papers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "auto" = callPackage
@@ -31908,6 +34192,8 @@ self: {
        ];
        description = "Generates and displays patterns from next nearest neighbors cellular automata";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "automata" = callPackage
@@ -31932,6 +34218,8 @@ self: {
        ];
        description = "automata";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "automitive-cse" = callPackage
@@ -31990,6 +34278,8 @@ self: {
        ];
        description = "Library for Nix expression dependency generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "autonix-deps-kf5" = callPackage
@@ -32013,6 +34303,8 @@ self: {
        ];
        description = "Generate dependencies for KDE 5 Nix expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "autoproc" = callPackage
@@ -32054,6 +34346,8 @@ self: {
        executableHaskellDepends = [ base JuicyPixels random ];
        description = "A simple random avatar icon generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "average" = callPackage
@@ -32100,6 +34394,8 @@ self: {
        ];
        description = "Server-side implementation of the Avers storage model";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "avers-api" = callPackage
@@ -32116,6 +34412,8 @@ self: {
        ];
        description = "Types describing the core and extended Avers APIs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "avers-api-docs" = callPackage
@@ -32134,6 +34432,8 @@ self: {
        ];
        description = "Swagger documentation for the Avers API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "avers-server" = callPackage
@@ -32154,6 +34454,8 @@ self: {
        ];
        description = "Server implementation of the Avers API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aviation-cessna172-diagrams" = callPackage
@@ -32197,6 +34499,8 @@ self: {
        ];
        description = "A compile-time balanced AVL tree";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "avr-shake" = callPackage
@@ -32208,6 +34512,8 @@ self: {
        libraryHaskellDepends = [ base dependent-sum mtl process shake ];
        description = "AVR Crosspack actions for shake build systems";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "avro" = callPackage
@@ -32332,6 +34638,8 @@ self: {
        testHaskellDepends = [ attoparsec base lens pretty-show text ];
        description = "Parse aviation weather reports";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "awesome-prelude" = callPackage
@@ -32343,6 +34651,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A prelude which I can be happy with. Based on base-prelude.";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "awesomium" = callPackage
@@ -32358,6 +34668,8 @@ self: {
        ];
        description = "High-level Awesomium bindings";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "awesomium-glut" = callPackage
@@ -32369,6 +34681,8 @@ self: {
        libraryHaskellDepends = [ awesomium awesomium-raw base GLUT ];
        description = "Utilities for using Awesomium with GLUT";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "awesomium-raw" = callPackage
@@ -32382,6 +34696,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Low-level Awesomium bindings";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {awesomium = null;};
 
   "aws_0_18" = callPackage
@@ -32421,6 +34737,7 @@ self: {
        description = "Amazon Web Services (AWS) for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws" = callPackage
@@ -32458,6 +34775,8 @@ self: {
        ];
        description = "Amazon Web Services (AWS) for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-cloudfront-signed-cookies" = callPackage
@@ -32516,6 +34835,8 @@ self: {
        ];
        description = "Configuration types, parsers & renderers for AWS services";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-dynamodb-conduit" = callPackage
@@ -32533,6 +34854,8 @@ self: {
        ];
        description = "Conduit-based interface for AWS DynamoDB";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-dynamodb-streams" = callPackage
@@ -32555,6 +34878,8 @@ self: {
        ];
        description = "Haskell bindings for Amazon DynamoDB Streams";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-easy" = callPackage
@@ -32578,6 +34903,8 @@ self: {
        ];
        description = "Helper function and types for working with amazonka";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-ec2" = callPackage
@@ -32607,6 +34934,8 @@ self: {
        ];
        description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-ec2-knownhosts" = callPackage
@@ -32629,6 +34958,8 @@ self: {
        ];
        description = "Capture and manage AWS EC2 known_host pubkeys";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-elastic-transcoder" = callPackage
@@ -32651,6 +34982,8 @@ self: {
        ];
        description = "Haskell suite for the Elastic Transcoder service";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-general" = callPackage
@@ -32676,6 +35009,8 @@ self: {
        ];
        description = "Bindings for Amazon Web Services (AWS) General Reference";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-kinesis" = callPackage
@@ -32701,6 +35036,8 @@ self: {
        ];
        description = "Bindings for Amazon Kinesis";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-kinesis-client" = callPackage
@@ -32735,6 +35072,8 @@ self: {
        ];
        description = "A producer & consumer client library for AWS Kinesis";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-kinesis-reshard" = callPackage
@@ -32763,6 +35102,8 @@ self: {
        ];
        description = "Reshard AWS Kinesis streams in response to Cloud Watch metrics";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-lambda" = callPackage
@@ -32782,6 +35123,8 @@ self: {
        ];
        description = "Haskell bindings for AWS Lambda";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-lambda-haskell-runtime" = callPackage
@@ -32800,6 +35143,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Haskell runtime for AWS Lambda";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-lambda-runtime" = callPackage
@@ -32843,6 +35188,8 @@ self: {
        ];
        description = "Keep your AWS credentials file up to date with MFA-carrying credentials";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-performance-tests" = callPackage
@@ -32868,6 +35215,8 @@ self: {
        ];
        description = "Performance Tests for the Haskell bindings for Amazon Web Services (AWS)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-route53" = callPackage
@@ -32885,6 +35234,8 @@ self: {
        ];
        description = "Amazon Route53 DNS service plugin for the aws package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-sdk" = callPackage
@@ -32913,6 +35264,8 @@ self: {
        ];
        description = "AWS SDK for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-sdk-text-converter" = callPackage
@@ -32934,6 +35287,8 @@ self: {
        ];
        description = "The text converter for aws-sdk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-sdk-xml-unordered" = callPackage
@@ -32954,6 +35309,8 @@ self: {
        ];
        description = "The xml parser for aws-sdk package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-ses-easy" = callPackage
@@ -32996,6 +35353,8 @@ self: {
        ];
        description = "Amazon Web Services (AWS) Signature v4 HTTP request signer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-simple" = callPackage
@@ -33013,6 +35372,8 @@ self: {
        ];
        description = "Dead simple bindings to commonly used AWS Services";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-sns" = callPackage
@@ -33036,6 +35397,8 @@ self: {
        ];
        description = "Bindings for AWS SNS Version 2013-03-31";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "axel" = callPackage
@@ -33087,6 +35450,8 @@ self: {
        testToolDepends = [ hpack tasty-discover ];
        description = "The Axel programming language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "axiom" = callPackage
@@ -33103,6 +35468,8 @@ self: {
        ];
        description = "Web EDSL for running in browsers and server nodes using transient";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "axiomatic-classes" = callPackage
@@ -33142,6 +35509,8 @@ self: {
        ];
        description = "A simple DevOps tool which will never \"reach\" enterprice level";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "azure-acs" = callPackage
@@ -33159,6 +35528,8 @@ self: {
        ];
        description = "Windows Azure ACS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "azure-email" = callPackage
@@ -33177,6 +35548,8 @@ self: {
        ];
        description = "send email with microsoft azure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "azure-service-api" = callPackage
@@ -33195,6 +35568,8 @@ self: {
        ];
        description = "Haskell bindings for the Microsoft Azure Service Management API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "azure-servicebus" = callPackage
@@ -33212,6 +35587,8 @@ self: {
        ];
        description = "Haskell wrapper over Microsoft Azure ServiceBus REST API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "azurify" = callPackage
@@ -33241,6 +35618,8 @@ self: {
        ];
        description = "A simple library for accessing Azure blob storage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "b-tree" = callPackage
@@ -33266,6 +35645,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion pipes ];
        description = "Immutable disk-based B* trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "b9" = callPackage
@@ -33302,6 +35683,8 @@ self: {
        ];
        description = "A tool and library for building virtual machine images";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "babl" = callPackage
@@ -33331,6 +35714,8 @@ self: {
        ];
        description = "An implementation of a simple 2-player board game";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "backblaze-b2-hs" = callPackage
@@ -33363,6 +35748,8 @@ self: {
        ];
        description = "A client library to access Backblaze B2 cloud storage in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "backdropper" = callPackage
@@ -33380,6 +35767,8 @@ self: {
        ];
        description = "Rotates backdrops for X11 displays using Imagemagic";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "backprop" = callPackage
@@ -33424,6 +35813,8 @@ self: {
        ];
        description = "Backstop a target directory by source directories";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "backtracking-exceptions" = callPackage
@@ -33440,6 +35831,8 @@ self: {
        ];
        description = "A monad transformer for backtracking exceptions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "backward-state" = callPackage
@@ -33451,6 +35844,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "A state monad that runs the state in reverse through the computation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bacteria" = callPackage
@@ -33476,6 +35871,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A simple stable bag";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bake" = callPackage
@@ -33509,6 +35906,8 @@ self: {
        ];
        description = "Continuous integration system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ballast" = callPackage
@@ -33532,6 +35931,8 @@ self: {
        ];
        description = "Shipwire API client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bamboo" = callPackage
@@ -33552,6 +35953,8 @@ self: {
        ];
        description = "A blog engine on Hack";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bamboo-launcher" = callPackage
@@ -33572,6 +35975,8 @@ self: {
        ];
        description = "bamboo-launcher";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bamboo-plugin-highlight" = callPackage
@@ -33589,6 +35994,8 @@ self: {
        ];
        description = "A highlight middleware";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bamboo-plugin-photo" = callPackage
@@ -33607,6 +36014,8 @@ self: {
        ];
        description = "A photo album middleware";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bamboo-theme-blueprint" = callPackage
@@ -33625,6 +36034,8 @@ self: {
        ];
        description = "bamboo blueprint theme";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bamboo-theme-mini-html5" = callPackage
@@ -33647,6 +36058,8 @@ self: {
        ];
        description = "bamboo mini html5 theme";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bamse" = callPackage
@@ -33664,6 +36077,8 @@ self: {
        ];
        description = "A Windows Installer (MSI) generator framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bamstats" = callPackage
@@ -33677,6 +36092,8 @@ self: {
        executableHaskellDepends = [ base cmdargs samtools ];
        description = "A program to extract various information from BAM alignmnet files";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ban-instance" = callPackage
@@ -33703,6 +36120,8 @@ self: {
        testHaskellDepends = [ base hspec HUnit QuickCheck time ];
        description = "A library for determining US bank holidays";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bank-holidays-england" = callPackage
@@ -33715,6 +36134,8 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck time ];
        description = "Calculation of bank holidays in England and Wales";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "banwords" = callPackage
@@ -33734,6 +36155,8 @@ self: {
        ];
        description = "Generalized word blacklister";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "barbies" = callPackage
@@ -33795,6 +36218,8 @@ self: {
        executableHaskellDepends = [ base cmdargs csv diagrams filepath ];
        description = "Creating Bar Charts in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "barcodes-code128" = callPackage
@@ -33806,6 +36231,8 @@ self: {
        libraryHaskellDepends = [ base bytestring HPDF ];
        description = "Generate Code 128 barcodes as PDFs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "barecheck" = callPackage
@@ -33817,6 +36244,8 @@ self: {
        libraryHaskellDepends = [ base containers QuickCheck text time ];
        description = "QuickCheck implementations for common types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "barley" = callPackage
@@ -33849,6 +36278,8 @@ self: {
        libraryHaskellDepends = [ base containers filepath glib gtk ];
        description = "Declarative Gtk GUI library";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "barrier" = callPackage
@@ -33873,6 +36304,8 @@ self: {
        ];
        description = "Shields.io style badge generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "barrier-monad" = callPackage
@@ -33884,6 +36317,8 @@ self: {
        libraryHaskellDepends = [ base comonad mtl transformers ];
        description = "Implementation of barrier monad, can use custom front/back type";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "base_4_12_0_0" = callPackage
@@ -33939,6 +36374,8 @@ self: {
        doHaddock = false;
        description = "Helps migrating projects to base-compat(-batteries)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "base-encoding" = callPackage
@@ -33968,6 +36405,8 @@ self: {
        doHaddock = false;
        description = "Semantic CPP feature macros for base";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "base-generics" = callPackage
@@ -33979,6 +36418,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "This library provides some instances for extra GHC.Generic typeclass such as Int8, Word16 and some unboxed types as well.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "base-io-access" = callPackage
@@ -33990,6 +36431,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "The IO functions included in base delimited into small, composable classes";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "base-noprelude" = callPackage
@@ -34119,6 +36562,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Fast base32 and base32hex codec for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "base32-lens" = callPackage
@@ -34329,6 +36774,8 @@ self: {
        ];
        description = "Base64-encode and decode streams of bytes. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "base64-lens" = callPackage
@@ -34464,6 +36911,8 @@ self: {
        ];
        description = "Baserock Definitions Schema";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "basex-client" = callPackage
@@ -34475,6 +36924,8 @@ self: {
        libraryHaskellDepends = [ base network pureMD5 utf8-string ];
        description = "A BaseX client for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bash" = callPackage
@@ -34506,6 +36957,8 @@ self: {
        ];
        description = "Lifting values from base types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "basic-cpuid" = callPackage
@@ -34573,6 +37026,8 @@ self: {
        ];
        description = "An interpreter for a small functional language";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "batch" = callPackage
@@ -34590,6 +37045,8 @@ self: {
        testHaskellDepends = [ base hspec stm timespan ];
        description = "Simplify queuing up data and processing it in batch";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "batch-rename" = callPackage
@@ -34634,6 +37091,8 @@ self: {
        ];
        description = "Batch processing toolset for Linux / Unix";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "battlenet" = callPackage
@@ -34647,6 +37106,8 @@ self: {
        ];
        description = "API client for Battle.Net";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "battlenet-yesod" = callPackage
@@ -34660,6 +37121,8 @@ self: {
        ];
        description = "Yesod integration for the battlenet package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "battleplace" = callPackage
@@ -34676,6 +37139,8 @@ self: {
        ];
        description = "Core definitions for BattlePlace.io service";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "battleplace-api" = callPackage
@@ -34689,6 +37154,8 @@ self: {
        ];
        description = "Public API definitions of BattlePlace.io service";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "battleship-combinatorics" = callPackage
@@ -34712,6 +37179,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Compute number of possible arrangements in the battleship game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "battleships" = callPackage
@@ -34744,6 +37213,8 @@ self: {
        ];
        description = "A web-based implementation of battleships including an AI opponent";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bayes-stack" = callPackage
@@ -34763,6 +37234,8 @@ self: {
        ];
        description = "Framework for inferring generative probabilistic models with Gibbs sampling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bazel-coverage-report-renderer" = callPackage
@@ -34780,6 +37253,8 @@ self: {
        ];
        description = "HTML Coverage Reports for Rules_Haskell";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bazel-runfiles" = callPackage
@@ -34826,6 +37301,8 @@ self: {
        ];
        description = "Tools for reading Big Binary Indexed files, e.g., bigBed, bigWig";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bcp47" = callPackage
@@ -34845,6 +37322,8 @@ self: {
        ];
        description = "Language tags as specified by BCP 47";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bcrypt" = callPackage
@@ -34903,6 +37382,8 @@ self: {
        ];
        description = "Tools for managing a content store of software packages";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ostree;};
 
   "bdcs-api" = callPackage
@@ -34939,6 +37420,8 @@ self: {
        ];
        description = "BDCS API Server";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libgit2-glib;};
 
   "bdd" = callPackage
@@ -34956,6 +37439,8 @@ self: {
        ];
        description = "Behavior-Driven Development DSL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bdelta" = callPackage
@@ -34982,6 +37467,8 @@ self: {
        executableHaskellDepends = [ aeson base network text url ];
        description = "Update CSS in the browser without reloading the page";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "beam" = callPackage
@@ -35001,6 +37488,8 @@ self: {
        ];
        description = "A type-safe SQL mapper for Haskell that doesn't use Template Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "beam-core" = callPackage
@@ -35022,6 +37511,8 @@ self: {
        ];
        description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "beam-migrate" = callPackage
@@ -35042,6 +37533,8 @@ self: {
        ];
        description = "SQL DDL support and migrations support library for Beam";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "beam-mysql" = callPackage
@@ -35059,6 +37552,8 @@ self: {
        ];
        description = "Connection layer between beam and MySQL/MariaDB";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "beam-newtype-field" = callPackage
@@ -35074,6 +37569,8 @@ self: {
        ];
        description = "A newtype for wrapping newtypes into beam schemas";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "beam-postgres" = callPackage
@@ -35100,6 +37597,8 @@ self: {
        ];
        description = "Connection layer between beam and postgres";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "beam-sqlite" = callPackage
@@ -35117,6 +37616,8 @@ self: {
        ];
        description = "Beam driver for SQLite";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "beam-th" = callPackage
@@ -35138,6 +37639,8 @@ self: {
        ];
        description = "Template Haskell utilities for beam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "beamable" = callPackage
@@ -35162,6 +37665,8 @@ self: {
        ];
        description = "Generic serializer/deserializer with compact representation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bearriver" = callPackage
@@ -35177,6 +37682,8 @@ self: {
        ];
        description = "A replacement of Yampa based on Monadic Stream Functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "beautifHOL" = callPackage
@@ -35190,29 +37697,11 @@ self: {
        executableHaskellDepends = [ array base haskell98 mtl ];
        description = "A pretty-printer for higher-order logic";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bech32" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, deepseq
-     , extra, hspec, hspec-discover, QuickCheck, text, vector
-     }:
-     mkDerivation {
-       pname = "bech32";
-       version = "1.0.1";
-       sha256 = "0v40cyg4qjz9pw0lrxkb5m8m87qbllfbwl8wq2v9f48hd4lpkz59";
-       libraryHaskellDepends = [
-         array base bytestring containers extra text
-       ];
-       testHaskellDepends = [
-         base bytestring containers deepseq extra hspec QuickCheck text
-         vector
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "bech32_1_0_2" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , extra, hspec, hspec-discover, QuickCheck, text, vector
      }:
@@ -35230,7 +37719,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bech32-th" = callPackage
@@ -35262,6 +37750,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Efficient Matrix and Vector operations in 100% Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "beeminder-api" = callPackage
@@ -35285,6 +37775,8 @@ self: {
        ];
        description = "Bindings to the beeminder.com JSON API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bein" = callPackage
@@ -35308,6 +37800,8 @@ self: {
        ];
        description = "Bein is a provenance and workflow management system for bioinformatics";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "belka" = callPackage
@@ -35336,6 +37830,8 @@ self: {
        ];
        description = "HTTP client DSL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bench" = callPackage
@@ -35422,20 +37918,26 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Micro-benchmarking with detailed statistics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bencode" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, parsec }:
+    ({ mkDerivation, base, binary, bytestring, containers, hspec
+     , parsec, QuickCheck, transformers, transformers-compat
+     }:
      mkDerivation {
        pname = "bencode";
-       version = "0.6.0.0";
-       sha256 = "12pnh598k30ggs54f0pic19j7ji8f4xn7fydkdnlig79rvzgv3iv";
-       revision = "1";
-       editedCabalFile = "0nvph7frmrra9k57v01saxgnhf1ma3m8qzwj1i53pswssfnj41mv";
+       version = "0.6.1.1";
+       sha256 = "0znv0y3b3zm5jvhlvj5f5s7y93db67j9yd59w1bnrw2pqv30gqaq";
        libraryHaskellDepends = [
-         base binary bytestring containers parsec
+         base binary bytestring containers parsec transformers
+         transformers-compat
        ];
-       description = "Parser and printer for bencoded data";
+       testHaskellDepends = [
+         base bytestring containers hspec QuickCheck
+       ];
+       description = "Parsers and printers for bencoded data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -35460,6 +37962,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bencodex reader/writer for Haskell";
        license = stdenv.lib.licenses.gpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bencoding" = callPackage
@@ -35506,6 +38010,8 @@ self: {
        librarySystemDepends = [ db ];
        description = "Pretty BerkeleyDB v4 binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) db;};
 
   "berp" = callPackage
@@ -35531,6 +38037,8 @@ self: {
        ];
        description = "An implementation of Python 3";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bert" = callPackage
@@ -35553,6 +38061,8 @@ self: {
        ];
        description = "BERT implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "besout" = callPackage
@@ -35564,6 +38074,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Extended GCD of polynomials over F_p[x]";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bet" = callPackage
@@ -35590,6 +38102,8 @@ self: {
        ];
        description = "Betfair API bindings. Bet on sports on betting exchanges.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "betacode" = callPackage
@@ -35606,6 +38120,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck smallcheck ];
        description = "A codec for beta code (http://en.wikipedia.org/wiki/Beta_Code).";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "betris" = callPackage
@@ -35628,6 +38144,8 @@ self: {
        ];
        description = "A horizontal version of tetris for braille users";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "between" = callPackage
@@ -35667,6 +38185,8 @@ self: {
        ];
        description = "Bidirectionalization for Free! (POPL'09)";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bff-mono" = callPackage
@@ -35709,6 +38229,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring time ];
        description = "Parse BgMax-files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bgzf" = callPackage
@@ -35724,6 +38246,8 @@ self: {
        ];
        description = "Blocked GZip";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bhoogle" = callPackage
@@ -35745,6 +38269,8 @@ self: {
        ];
        description = "Simple terminal GUI for local hoogle";
        license = "(BSD-3-Clause OR Apache-2.0)";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bibdb" = callPackage
@@ -35767,6 +38293,8 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "A database based bibliography manager for BibTeX";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bibtex" = callPackage
@@ -35799,6 +38327,8 @@ self: {
        ];
        description = "Prototype Implementation of Combining Syntactic and Semantic Bidirectionalization (ICFP'10)";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bidispec" = callPackage
@@ -35810,6 +38340,8 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "Specification of generators and parsers";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bidispec-extras" = callPackage
@@ -35821,6 +38353,8 @@ self: {
        libraryHaskellDepends = [ base bytestring dataenc mtl ];
        description = "Extra helper functions for bidirectional specifications";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bifunctor" = callPackage
@@ -35887,6 +38421,8 @@ self: {
        ];
        description = "A parser for the Billboard chord dataset";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "billeksah-forms" = callPackage
@@ -35904,6 +38440,8 @@ self: {
        ];
        description = "Leksah library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "billeksah-main" = callPackage
@@ -35922,6 +38460,8 @@ self: {
        ];
        description = "Leksah plugin base";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "billeksah-main-static" = callPackage
@@ -35962,6 +38502,8 @@ self: {
        ];
        description = "Leksah library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "billeksah-services" = callPackage
@@ -35977,6 +38519,8 @@ self: {
        ];
        description = "Leksah library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bimap" = callPackage
@@ -36119,6 +38663,8 @@ self: {
        ];
        description = "Bit parsing/writing on top of binary";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binary-communicator" = callPackage
@@ -36130,6 +38676,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring mtl ];
        description = "Flexible way to ease transmission of binary data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binary-conduit" = callPackage
@@ -36160,6 +38708,8 @@ self: {
        libraryHaskellDepends = [ base binary ghc-prim ];
        description = "Automatic deriving of Binary using GHC.Generics";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binary-enum" = callPackage
@@ -36196,6 +38746,8 @@ self: {
        ];
        description = "An alternate with strong-typed errors for `Data.Binary.Get` monad from `binary` package.";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binary-file" = callPackage
@@ -36211,6 +38763,8 @@ self: {
        ];
        description = "read/write binary file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binary-generic" = callPackage
@@ -36248,6 +38802,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Binary Indexed Trees (a.k.a. Fenwick Trees).";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binary-instances" = callPackage
@@ -36275,6 +38831,8 @@ self: {
        ];
        description = "Orphan instances for binary";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binary-list" = callPackage
@@ -36384,6 +38942,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring mtl ];
        description = "Monad to ease implementing a binary network protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binary-protocol-zmq" = callPackage
@@ -36399,6 +38959,8 @@ self: {
        ];
        description = "Monad to ease implementing a binary network protocol over ZeroMQ";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binary-search" = callPackage
@@ -36415,6 +38977,8 @@ self: {
        ];
        description = "Binary and exponential searches";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binary-serialise-cbor" = callPackage
@@ -36487,6 +39051,8 @@ self: {
        ];
        description = "data serialization/deserialization io-streams library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binary-strict" = callPackage
@@ -36499,6 +39065,8 @@ self: {
        testHaskellDepends = [ base bytestring ];
        description = "Binary deserialisation using strict ByteStrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binary-tagged" = callPackage
@@ -36534,6 +39102,8 @@ self: {
        ];
        description = "Tagged binary serialisation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binary-tree" = callPackage
@@ -36573,6 +39143,8 @@ self: {
        ];
        description = "Type-safe binary serialization";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binary-varint" = callPackage
@@ -36612,6 +39184,8 @@ self: {
        ];
        description = "Data marshaling library that uses type level equations to optimize buffering";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binding-core" = callPackage
@@ -36626,6 +39200,8 @@ self: {
        testHaskellDepends = [ base HTF HUnit QuickCheck random ];
        description = "Data Binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binding-gtk" = callPackage
@@ -36640,6 +39216,8 @@ self: {
        testHaskellDepends = [ base binding-core directory gtk ];
        description = "Data Binding in Gtk2Hs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binding-wx" = callPackage
@@ -36654,6 +39232,8 @@ self: {
        testHaskellDepends = [ base binding-core directory wx ];
        description = "Data Binding in WxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bindings" = callPackage
@@ -36688,34 +39268,11 @@ self: {
        libraryPkgconfigDepends = [ esound ];
        description = "Low level bindings to EsounD (ESD; Enlightened Sound Daemon)";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {esound = null;};
 
   "bindings-GLFW" = callPackage
-    ({ mkDerivation, base, bindings-DSL, HUnit, libGL, libX11
-     , libXcursor, libXext, libXfixes, libXi, libXinerama, libXrandr
-     , libXxf86vm, test-framework, test-framework-hunit
-     }:
-     mkDerivation {
-       pname = "bindings-GLFW";
-       version = "3.3.1.0";
-       sha256 = "14np6l61q9nglyailixsajngd6d799xa1xd6nzw0kjiqiqznn43a";
-       libraryHaskellDepends = [ base bindings-DSL ];
-       librarySystemDepends = [
-         libGL libX11 libXcursor libXext libXfixes libXi libXinerama
-         libXrandr libXxf86vm
-       ];
-       testHaskellDepends = [
-         base HUnit test-framework test-framework-hunit
-       ];
-       description = "Low-level bindings to GLFW OpenGL library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
-         inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; 
-         inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; 
-         inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; 
-         inherit (pkgs.xorg) libXxf86vm;};
-
-  "bindings-GLFW_3_3_2_0" = callPackage
     ({ mkDerivation, base, bindings-DSL, HUnit, libGL, libX11
      , libXcursor, libXext, libXfixes, libXi, libXinerama, libXrandr
      , libXxf86vm, test-framework, test-framework-hunit
@@ -36734,7 +39291,6 @@ self: {
        ];
        description = "Low-level bindings to GLFW OpenGL library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
          inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; 
          inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; 
@@ -36752,6 +39308,8 @@ self: {
        librarySystemDepends = [ K8055D ];
        description = "Bindings to Velleman K8055 dll";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {K8055D = null;};
 
   "bindings-apr" = callPackage
@@ -36764,6 +39322,8 @@ self: {
        libraryPkgconfigDepends = [ apr ];
        description = "Low level bindings to Apache Portable Runtime (APR)";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) apr;};
 
   "bindings-apr-util" = callPackage
@@ -36776,6 +39336,8 @@ self: {
        libraryPkgconfigDepends = [ apr-util ];
        description = "Low level bindings to Apache Portable Runtime Utility (APR Utility)";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {apr-util = null;};
 
   "bindings-audiofile" = callPackage
@@ -36803,6 +39365,8 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Bindings for libbfd, a library of the GNU `binutils'";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {bfd = null; opcodes = null;};
 
   "bindings-cctools" = callPackage
@@ -36815,6 +39379,8 @@ self: {
        librarySystemDepends = [ dttools ];
        description = "Bindings to the CCTools WorkQueue C library";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {dttools = null;};
 
   "bindings-codec2" = callPackage
@@ -36845,6 +39411,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "This package is obsolete. Look for bindings-DSL instead.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bindings-dc1394" = callPackage
@@ -36858,6 +39426,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Library for using firewire (iidc-1394) cameras";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {dc1394 = null;};
 
   "bindings-directfb" = callPackage
@@ -36884,6 +39454,8 @@ self: {
        libraryPkgconfigDepends = [ eskit ];
        description = "Bindings to ESKit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {eskit = null;};
 
   "bindings-fann" = callPackage
@@ -36896,6 +39468,8 @@ self: {
        libraryPkgconfigDepends = [ fann ];
        description = "Low level bindings to FANN neural network library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {fann = null;};
 
   "bindings-fluidsynth" = callPackage
@@ -36908,6 +39482,8 @@ self: {
        libraryPkgconfigDepends = [ fluidsynth ];
        description = "Haskell FFI bindings for fluidsynth software synthesizer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) fluidsynth;};
 
   "bindings-friso" = callPackage
@@ -36920,6 +39496,8 @@ self: {
        librarySystemDepends = [ friso ];
        description = "Low level bindings for friso";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {friso = null;};
 
   "bindings-glib" = callPackage
@@ -36968,6 +39546,8 @@ self: {
        libraryPkgconfigDepends = [ gsl ];
        description = "Low level bindings to GNU GSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gsl;};
 
   "bindings-gts" = callPackage
@@ -36997,6 +39577,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Hamlib bindings for Haskell";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) hamlib;};
 
   "bindings-hdf5" = callPackage
@@ -37008,6 +39590,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Project bindings-* raw interface to HDF5 library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bindings-levmar" = callPackage
@@ -37057,6 +39641,8 @@ self: {
        libraryPkgconfigDepends = [ libftdi libusb ];
        description = "Low level bindings to libftdi";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libftdi; inherit (pkgs) libusb;};
 
   "bindings-libg15" = callPackage
@@ -37069,6 +39655,8 @@ self: {
        librarySystemDepends = [ g15 ];
        description = "Bindings to libg15";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {g15 = null;};
 
   "bindings-librrd" = callPackage
@@ -37081,6 +39669,8 @@ self: {
        libraryPkgconfigDepends = [ librrd ];
        description = "Low level bindings to RRDtool";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {librrd = null;};
 
   "bindings-libstemmer" = callPackage
@@ -37097,6 +39687,8 @@ self: {
        librarySystemDepends = [ stemmer ];
        description = "Binding for libstemmer with low level binding";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {stemmer = null;};
 
   "bindings-libusb" = callPackage
@@ -37121,6 +39713,8 @@ self: {
        librarySystemDepends = [ v4l2 ];
        description = "bindings to libv4l2 for Linux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {v4l2 = null;};
 
   "bindings-libzip" = callPackage
@@ -37144,6 +39738,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ioctl ];
        description = "bindings to Video For Linux Two (v4l2) kernel interfaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bindings-lxc" = callPackage
@@ -37180,6 +39776,8 @@ self: {
        libraryPkgconfigDepends = [ monetdb-mapi ];
        description = "Low-level bindings for the MonetDB API (mapi)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {monetdb-mapi = null;};
 
   "bindings-mpdecimal" = callPackage
@@ -37191,6 +39789,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "bindings to mpdecimal library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bindings-nettle" = callPackage
@@ -37265,6 +39865,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ioctl ];
        description = "PPDev bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bindings-saga-cmd" = callPackage
@@ -37310,6 +39912,8 @@ self: {
        librarySystemDepends = [ scsynth ];
        description = "Low-level bindings to the SuperCollider synthesis engine library";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {scsynth = null;};
 
   "bindings-sipc" = callPackage
@@ -37325,6 +39929,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Low level bindings to SIPC";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {sipc = null;};
 
   "bindings-sophia" = callPackage
@@ -37383,6 +39989,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Bindings against the wlc library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {wlc = null;};
 
   "bindings-yices" = callPackage
@@ -37409,6 +40017,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring rank1dynamic ];
        description = "A variation of Data.Dynamic.Dynamic with a Binary instance";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binembed" = callPackage
@@ -37427,6 +40037,8 @@ self: {
        ];
        description = "Embed data into object files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "binembed-example" = callPackage
@@ -37443,6 +40055,8 @@ self: {
        ];
        description = "Example project using binembed to embed data in object files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bini" = callPackage
@@ -37512,6 +40126,8 @@ self: {
        executableHaskellDepends = [ base bytestring random ];
        description = "A bioinformatics library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bio-sequence" = callPackage
@@ -37528,6 +40144,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bioace" = callPackage
@@ -37541,6 +40159,8 @@ self: {
        ];
        description = "Library for reading ace assembly files";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bioalign" = callPackage
@@ -37552,6 +40172,8 @@ self: {
        libraryHaskellDepends = [ base biocore bytestring ];
        description = "Data structures and helper functions for calculating alignments";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "biocore" = callPackage
@@ -37565,6 +40187,8 @@ self: {
        libraryHaskellDepends = [ base bytestring stringable ];
        description = "A bioinformatics library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "biofasta" = callPackage
@@ -37576,6 +40200,8 @@ self: {
        libraryHaskellDepends = [ base biocore bytestring ];
        description = "Library for reading fasta sequence files";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "biofastq" = callPackage
@@ -37587,6 +40213,8 @@ self: {
        libraryHaskellDepends = [ base biocore bytestring ];
        description = "A library for reading FASTQ files";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "biohazard" = callPackage
@@ -37609,6 +40237,8 @@ self: {
        ];
        description = "bioinformatics support library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bioinformatics-toolkit" = callPackage
@@ -37645,6 +40275,8 @@ self: {
        ];
        description = "A collection of bioinformatics tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "biophd" = callPackage
@@ -37660,6 +40292,8 @@ self: {
        ];
        description = "Library for reading phd sequence files";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "biopsl" = callPackage
@@ -37676,6 +40310,8 @@ self: {
        executableHaskellDepends = [ cmdargs unordered-containers ];
        description = "Library and executables for working with PSL files";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "biosff" = callPackage
@@ -37692,6 +40328,8 @@ self: {
        executableHaskellDepends = [ array base cmdargs mtl ];
        description = "Library and executables for working with SFF files";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "biostockholm" = callPackage
@@ -37714,6 +40352,8 @@ self: {
        ];
        description = "Parsing and rendering of Stockholm files (used by Pfam, Rfam and Infernal)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "birch-beer" = callPackage
@@ -37748,6 +40388,8 @@ self: {
        ];
        description = "Plot a colorful tree";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bird" = callPackage
@@ -37768,6 +40410,8 @@ self: {
        ];
        description = "A simple, sinatra-inspired web framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bisc" = callPackage
@@ -37805,6 +40449,8 @@ self: {
        ];
        description = "Determine relevant parts of binary data";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bishbosh" = callPackage
@@ -37847,6 +40493,8 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "A bit array (aka bitset, bitmap, bit vector) API for numeric types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bit-protocol" = callPackage
@@ -37886,6 +40534,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Lazy, infinite, compact stream of Bool with O(1) indexing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bit-vector" = callPackage
@@ -37939,6 +40589,8 @@ self: {
        ];
        description = "Provides access to the RPC API of Bitcoin Core";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bitcoin-api-extra" = callPackage
@@ -37961,6 +40613,8 @@ self: {
        ];
        description = "Higher level constructs on top of the bitcoin-api package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bitcoin-block" = callPackage
@@ -37981,6 +40635,8 @@ self: {
        ];
        description = "Utility functions for manipulating bitcoin blocks";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bitcoin-hs" = callPackage
@@ -38004,6 +40660,8 @@ self: {
        ];
        description = "Partial implementation of the Bitcoin protocol (as of 2013)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bitcoin-payment-channel" = callPackage
@@ -38069,6 +40727,8 @@ self: {
        ];
        description = "Library to communicate with the Satoshi Bitcoin daemon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bitcoin-script" = callPackage
@@ -38086,6 +40746,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec ];
        description = "Compilation, manipulation and decompilation of Bitcoin scripts";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bitcoin-tx" = callPackage
@@ -38106,6 +40768,8 @@ self: {
        ];
        description = "Utility functions for manipulating bitcoin transactions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bitcoin-types" = callPackage
@@ -38140,6 +40804,8 @@ self: {
        ];
        description = "A command line tool to access bit.ly URL shortener.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bitmap" = callPackage
@@ -38178,6 +40844,8 @@ self: {
        ];
        description = "Bitmap library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bits" = callPackage
@@ -38206,6 +40874,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Atomic bit operations on memory locations for low-level synchronization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bits-bytestring" = callPackage
@@ -38255,6 +40925,8 @@ self: {
        ];
        description = "Bitstream support for Conduit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bits-extra" = callPackage
@@ -38289,6 +40961,8 @@ self: {
        librarySystemDepends = [ gcc_s ];
        description = "Efficient high-level bit operations not found in Data.Bits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gcc_s = null;};
 
   "bitset" = callPackage
@@ -38311,6 +40985,8 @@ self: {
        benchmarkSystemDepends = [ gmp ];
        description = "A space-efficient set data structure";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gmp;};
 
   "bitset-word8" = callPackage
@@ -38351,6 +41027,8 @@ self: {
        executablePkgconfigDepends = [ gtk2 pango ];
        description = "Proof-of-concept tool for writing using binary choices";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk2; inherit (pkgs) pango;};
 
   "bitstream" = callPackage
@@ -38369,6 +41047,8 @@ self: {
        ];
        description = "Fast, packed, strict and lazy bit streams with stream fusion";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bitstring" = callPackage
@@ -38412,6 +41092,8 @@ self: {
        ];
        description = "Bittorrent protocol implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bittrex" = callPackage
@@ -38517,6 +41199,8 @@ self: {
        ];
        description = "A Haskell library for working with the BitX bitcoin exchange";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bizzlelude" = callPackage
@@ -38532,6 +41216,8 @@ self: {
        ];
        description = "A lousy Prelude replacement by a lousy dude";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bizzlelude-js" = callPackage
@@ -38543,6 +41229,8 @@ self: {
        libraryHaskellDepends = [ base containers text ];
        description = "A lousy Prelude replacement by a lousy dude";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bk-tree" = callPackage
@@ -38577,6 +41265,8 @@ self: {
        ];
        description = "Backup utility for backing up to cloud storage services (S3 only right now)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bktrees" = callPackage
@@ -38602,6 +41292,8 @@ self: {
        executableHaskellDepends = [ base haskell98 unix ];
        description = "a stupid cron";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "black-jewel" = callPackage
@@ -38672,6 +41364,8 @@ self: {
        libraryHaskellDepends = [ base bytestring text vector ];
        description = "The BLAKE SHA-3 candidate hashes, in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blakesum-demo" = callPackage
@@ -38689,6 +41383,8 @@ self: {
        ];
        description = "The BLAKE SHA-3 candidate hashes, in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blank-canvas_0_6_2" = callPackage
@@ -38775,6 +41471,8 @@ self: {
        libraryHaskellDepends = [ base ieee QuickCheck storable-complex ];
        description = "Bindings to the BLAS library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blas-carray" = callPackage
@@ -38834,6 +41532,8 @@ self: {
        testHaskellDepends = [ base vector ];
        description = "Low-level Haskell bindings to Blas";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) blas;};
 
   "blastxml" = callPackage
@@ -38847,6 +41547,8 @@ self: {
        ];
        description = "Library for reading Blast XML output";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blatex" = callPackage
@@ -38864,6 +41566,8 @@ self: {
        ];
        description = "Blog in LaTeX";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blaze" = callPackage
@@ -38934,6 +41638,8 @@ self: {
        ];
        description = "Enumeratees for the incremental conversion of builders to bytestrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blaze-colonnade" = callPackage
@@ -38950,6 +41656,8 @@ self: {
        testHaskellDepends = [ base colonnade doctest ];
        description = "blaze-html backend for colonnade";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blaze-from-html" = callPackage
@@ -39001,6 +41709,8 @@ self: {
        ];
        description = "Some contributions to add handy things to blaze html";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blaze-html-hexpat" = callPackage
@@ -39012,6 +41722,8 @@ self: {
        libraryHaskellDepends = [ base blaze-html bytestring hexpat text ];
        description = "A hexpat backend for blaze-html";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blaze-html-truncate" = callPackage
@@ -39027,6 +41739,8 @@ self: {
        ];
        description = "A truncator for blaze-html";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blaze-json" = callPackage
@@ -39048,6 +41762,8 @@ self: {
        ];
        description = "tiny library for encoding json";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blaze-markup" = callPackage
@@ -39126,6 +41842,8 @@ self: {
        ];
        description = "Fast rendering of common datatypes (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blazeMarker" = callPackage
@@ -39154,6 +41872,8 @@ self: {
        ];
        description = "A true monad (transformer) version of the blaze-markup and blaze-html libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ble" = callPackage
@@ -39185,6 +41905,8 @@ self: {
        ];
        description = "Bluetooth Low Energy (BLE) peripherals";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blink1" = callPackage
@@ -39203,6 +41925,8 @@ self: {
        ];
        description = "Control library for blink(1) LED from ThingM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blip" = callPackage
@@ -39221,6 +41945,8 @@ self: {
        ];
        description = "Python to bytecode compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bliplib" = callPackage
@@ -39236,6 +41962,8 @@ self: {
        ];
        description = "Support code for Blip";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blockchain" = callPackage
@@ -39259,6 +41987,8 @@ self: {
        ];
        description = "Generic blockchain implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blockhash" = callPackage
@@ -39280,6 +42010,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Blockhash perceptual image hash algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blocking-transactions" = callPackage
@@ -39312,6 +42044,8 @@ self: {
        executableHaskellDepends = [ base ConfigFile haskell98 old-time ];
        description = "Very simple static blog software";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bloodhound" = callPackage
@@ -39340,6 +42074,8 @@ self: {
        ];
        description = "Elasticsearch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bloodhound-amazonka-auth" = callPackage
@@ -39362,6 +42098,8 @@ self: {
        ];
        description = "Adds convenient Amazon ElasticSearch Service authentication to Bloodhound";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bloomfilter" = callPackage
@@ -39400,6 +42138,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion random ];
        description = "Distributed bloom filters on Redis (using the Hedis client)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blosum" = callPackage
@@ -39421,6 +42161,8 @@ self: {
        ];
        description = "BLOSUM generator";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bloxorz" = callPackage
@@ -39435,6 +42177,8 @@ self: {
        executableHaskellDepends = [ base GLFW OpenGL ];
        description = "OpenGL Logic Game";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blubber" = callPackage
@@ -39452,6 +42196,8 @@ self: {
        ];
        description = "The blubber client; connects to the blubber server";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blubber-server" = callPackage
@@ -39473,6 +42219,8 @@ self: {
        ];
        description = "The blubber server, serves blubber clients";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bluemix-sdk" = callPackage
@@ -39510,6 +42258,8 @@ self: {
        executablePkgconfigDepends = [ gtk2 ];
        description = "full-featured tiling for the GNOME desktop environment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk2;};
 
   "bluetileutils" = callPackage
@@ -39523,6 +42273,8 @@ self: {
        executableHaskellDepends = [ base gtk ];
        description = "Utilities for Bluetile";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blunk-hask-tests" = callPackage
@@ -39538,6 +42290,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "blunt" = callPackage
@@ -39559,6 +42313,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Convert between pointfree and pointful expressions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bmp" = callPackage
@@ -39583,6 +42339,8 @@ self: {
        ];
        description = "Library for communication with the Bosch BNO055 orientation sensor";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "board-games" = callPackage
@@ -39651,6 +42409,8 @@ self: {
        ];
        executableHaskellDepends = [ base hogre hois random ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bolt" = callPackage
@@ -39674,6 +42434,8 @@ self: {
        ];
        description = "Bolt driver for Neo4j";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "boltzmann-brain" = callPackage
@@ -39699,6 +42461,8 @@ self: {
        ];
        description = "Analytic sampler compiler for combinatorial systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "boltzmann-samplers" = callPackage
@@ -39749,6 +42513,8 @@ self: {
        ];
        description = "Bond schema compiler and code generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bond-haskell" = callPackage
@@ -39777,6 +42543,8 @@ self: {
        ];
        description = "Runtime support for BOND serialization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bond-haskell-compiler" = callPackage
@@ -39798,6 +42566,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Bond code generator for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bookkeeper" = callPackage
@@ -39825,6 +42595,8 @@ self: {
        ];
        description = "Anonymous records and overloaded labels";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bookkeeper-permissions" = callPackage
@@ -39836,6 +42608,8 @@ self: {
        libraryHaskellDepends = [ base bookkeeper type-level-sets ];
        description = "Permissions for bookkeeper records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bookkeeping" = callPackage
@@ -39963,6 +42737,8 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "Boolean expressions with various representations and search queries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bools" = callPackage
@@ -40020,6 +42796,8 @@ self: {
        ];
        description = "Chronokinetic stream sources and incremental consumers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "boomerang" = callPackage
@@ -40052,6 +42830,8 @@ self: {
        ];
        description = "Boomshine clone";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "boop" = callPackage
@@ -40087,6 +42867,8 @@ self: {
        ];
        description = "Mathematically sound sound synthesis";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "boots" = callPackage
@@ -40123,6 +42905,8 @@ self: {
        executableHaskellDepends = [ base time ];
        description = "Factory for quickly building an application";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "boots-cloud" = callPackage
@@ -40140,6 +42924,8 @@ self: {
        ];
        description = "Factory for quickly building a microservice";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "boots-web" = callPackage
@@ -40159,6 +42945,8 @@ self: {
        ];
        description = "Factory for quickly building a web application";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bootstrap-types" = callPackage
@@ -40213,6 +43001,8 @@ self: {
        ];
        description = "Metering System for OpenStack metrics provided by Vaultaire";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "boring" = callPackage
@@ -40260,6 +43050,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A boring window switcher";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bot" = callPackage
@@ -40271,6 +43063,8 @@ self: {
        libraryHaskellDepends = [ arrows base Stream ];
        description = "bots for functional reactive programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "both" = callPackage
@@ -40297,6 +43091,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Build tool for Lambdabot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bound" = callPackage
@@ -40366,6 +43162,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Arrays with a value for every index";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bounded-queue" = callPackage
@@ -40461,6 +43259,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "boxes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "box-tuples" = callPackage
@@ -40517,6 +43317,8 @@ self: {
        ];
        description = "Types and functions to work with braids and Khovanov homology";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "brain-bleep" = callPackage
@@ -40530,6 +43332,8 @@ self: {
        executableHaskellDepends = [ array base containers parsec ];
        description = "primitive imperative language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "brainfuck" = callPackage
@@ -40612,6 +43416,8 @@ self: {
        executableHaskellDepends = [ base haskgame mtl SDL ];
        description = "A simple Breakout game implementation";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "breve" = callPackage
@@ -40648,6 +43454,8 @@ self: {
        executableHaskellDepends = [ array base parallel random SDL ];
        description = "A Haskell implementation of the Brian's Brain cellular automaton";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "brick" = callPackage
@@ -40692,6 +43500,8 @@ self: {
        ];
        description = "A drop-down menu widget for brick";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "brick-filetree" = callPackage
@@ -40751,6 +43561,8 @@ self: {
        ];
        description = "Bricks is a lazy functional language based on Nix";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bricks-internal" = callPackage
@@ -40769,6 +43581,8 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bricks-internal-test" = callPackage
@@ -40784,6 +43598,8 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bricks-parsec" = callPackage
@@ -40804,6 +43620,8 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bricks-rendering" = callPackage
@@ -40824,6 +43642,8 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bricks-syntax" = callPackage
@@ -40844,6 +43664,8 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "brillig" = callPackage
@@ -40864,6 +43686,8 @@ self: {
        ];
        description = "Simple part of speech tagger";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "brittany" = callPackage
@@ -40986,6 +43810,8 @@ self: {
        libraryHaskellDepends = [ base containers stm time ];
        description = "Small library for interactive functional programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "brok" = callPackage
@@ -41011,6 +43837,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Finds broken links in text files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "broker-haskell" = callPackage
@@ -41024,6 +43852,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec ];
        description = "Haskell bindings to Broker, Bro's messaging library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {broker = null;};
 
   "bronyradiogermany-common" = callPackage
@@ -41041,6 +43871,8 @@ self: {
        ];
        description = "Common types and URIs for the BronyRadioGermany API bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bronyradiogermany-streaming" = callPackage
@@ -41061,6 +43893,8 @@ self: {
        ];
        description = "Streaming interface for the BronyRadioGermany API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "brotli" = callPackage
@@ -41081,6 +43915,8 @@ self: {
        ];
        description = "Brotli (RFC7932) compression and decompression";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {libbrotlidec = null; libbrotlienc = null;};
 
   "brotli-conduit" = callPackage
@@ -41101,6 +43937,8 @@ self: {
        ];
        description = "Conduit interface for Brotli (RFC7932) compression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "brotli-streams" = callPackage
@@ -41121,6 +43959,8 @@ self: {
        ];
        description = "IO-Streams interface for Brotli (RFC7932) compression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "browscap" = callPackage
@@ -41137,6 +43977,8 @@ self: {
        ];
        description = "A reader and interface for the Browser Capabilities Project data files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bsb-http-chunked" = callPackage
@@ -41192,6 +44034,8 @@ self: {
        ];
        description = "BSON documents are JSON-like objects with a standard binary encoding";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bson-generic" = callPackage
@@ -41203,6 +44047,8 @@ self: {
        libraryHaskellDepends = [ base bson ghc-prim text ];
        description = "Generic functionality for BSON";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bson-generics" = callPackage
@@ -41214,6 +44060,8 @@ self: {
        libraryHaskellDepends = [ base bson ghc-prim ];
        description = "Generics functionality for BSON";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bson-lens" = callPackage
@@ -41225,7 +44073,8 @@ self: {
        libraryHaskellDepends = [ base bson lens text ];
        description = "BSON lenses";
        license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ jb55 ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bson-mapping" = callPackage
@@ -41272,6 +44121,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "A simple unassuming parser for bytestring";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "btree" = callPackage
@@ -41291,6 +44142,8 @@ self: {
        benchmarkHaskellDepends = [ base clock ghc-prim hashable ];
        description = "B-Tree on Unmanaged Heap";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "btree-concurrent" = callPackage
@@ -41313,6 +44166,8 @@ self: {
        ];
        description = "A backend agnostic, concurrent BTree";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "btrfs" = callPackage
@@ -41364,6 +44219,8 @@ self: {
        ];
        description = "Automates most of your plain text accounting data entry in ledger format";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "buffer" = callPackage
@@ -41385,6 +44242,8 @@ self: {
        benchmarkHaskellDepends = [ bug criterion rerebase ];
        description = "Simple mutable low-level buffer for IO";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "buffer-builder" = callPackage
@@ -41409,6 +44268,8 @@ self: {
        ];
        description = "Library for efficiently building up buffers, one piece at a time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "buffer-builder-aeson" = callPackage
@@ -41437,6 +44298,8 @@ self: {
        ];
        description = "Serialize Aeson values with Data.BufferBuilder";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "buffer-pipe" = callPackage
@@ -41477,6 +44340,8 @@ self: {
        doHaddock = false;
        description = "Assembles many Dockerfiles in one";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "buffon" = callPackage
@@ -41493,6 +44358,8 @@ self: {
        ];
        description = "An implementation of Buffon machines";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "buffon-machines" = callPackage
@@ -41580,6 +44447,8 @@ self: {
        ];
        description = "A Haskell interface to the Bugzilla native REST API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "build" = callPackage
@@ -41597,6 +44466,8 @@ self: {
        testHaskellDepends = [ base containers extra mtl transformers ];
        description = "Build systems a la carte";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "buildable" = callPackage
@@ -41608,6 +44479,8 @@ self: {
        libraryHaskellDepends = [ base bytestring containers dlist text ];
        description = "Typeclass for builders of linear data structures";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "buildbox" = callPackage
@@ -41624,6 +44497,8 @@ self: {
        ];
        description = "Rehackable components for writing buildbots and test harnesses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "buildbox-tools" = callPackage
@@ -41637,6 +44512,8 @@ self: {
        executableHaskellDepends = [ base buildbox parseargs ];
        description = "Tools for working with buildbox benchmark result files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "builder" = callPackage
@@ -41688,6 +44565,8 @@ self: {
        ];
        description = "A library and an executable that provide an easy API for a Haskell IDE";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bullet" = callPackage
@@ -41701,6 +44580,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A wrapper for the Bullet physics engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) bullet;};
 
   "bulletproofs" = callPackage
@@ -41762,6 +44643,8 @@ self: {
        ];
        description = "Reflex infused with bulma (css)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bumper" = callPackage
@@ -41781,6 +44664,8 @@ self: {
        ];
        description = "Automatically bump package versions, also transitively";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bunz" = callPackage
@@ -41796,6 +44681,8 @@ self: {
        testHaskellDepends = [ base doctest hspec ];
        description = "CLI tool to beautify JSON string";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "burnt-explorer" = callPackage
@@ -41813,6 +44700,8 @@ self: {
        ];
        description = "List OP_RETURN cryptocurrency transaction outputs";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "burst-detection" = callPackage
@@ -41826,6 +44715,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Burst detection algorithms";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bus-pirate" = callPackage
@@ -41842,6 +44733,8 @@ self: {
        ];
        description = "Haskell interface to the Bus Pirate binary interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "buster" = callPackage
@@ -41858,6 +44751,8 @@ self: {
        ];
        description = "Almost but not quite entirely unlike FRP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "buster-gtk" = callPackage
@@ -41874,6 +44769,8 @@ self: {
        ];
        description = "Almost but not quite entirely unlike FRP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "buster-network" = callPackage
@@ -41890,6 +44787,8 @@ self: {
        ];
        description = "Almost but not quite entirely unlike FRP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bustle" = callPackage
@@ -41962,6 +44861,8 @@ self: {
        ];
        description = "Monad Transformer for Asyncronous Message Passing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "butterflies" = callPackage
@@ -41983,6 +44884,8 @@ self: {
        ];
        description = "butterfly tilings";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bv" = callPackage
@@ -42053,6 +44956,8 @@ self: {
        ];
        description = "a BitVector datatype that is parameterized by the vector width";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "byline" = callPackage
@@ -42084,6 +44989,8 @@ self: {
        libraryHaskellDepends = [ base bytestring word24 ];
        description = "data from/to ByteString";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "byte-order" = callPackage
@@ -42119,6 +45026,35 @@ self: {
        libraryHaskellDepends = [ base bytestring primitive text ];
        description = "Parsing of bytearray-based data";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "bytebuild" = callPackage
+    ({ mkDerivation, base, byteslice, bytestring, gauge
+     , natural-arithmetic, primitive, primitive-offset
+     , primitive-unlifted, QuickCheck, quickcheck-classes, run-st, tasty
+     , tasty-hunit, tasty-quickcheck, text, text-short, vector
+     , wide-word
+     }:
+     mkDerivation {
+       pname = "bytebuild";
+       version = "0.3.4.0";
+       sha256 = "00kda7qz92vfqldq2ksxx8qf1v4kl0wm2w2fxg6m2nkpqfzlv026";
+       libraryHaskellDepends = [
+         base byteslice bytestring natural-arithmetic primitive
+         primitive-offset primitive-unlifted run-st text-short wide-word
+       ];
+       testHaskellDepends = [
+         base byteslice bytestring natural-arithmetic primitive
+         primitive-unlifted QuickCheck quickcheck-classes tasty tasty-hunit
+         tasty-quickcheck text vector wide-word
+       ];
+       benchmarkHaskellDepends = [
+         base byteslice gauge natural-arithmetic primitive text-short
+       ];
+       description = "Serialize to a small byte arrays";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "bytedump" = callPackage
@@ -42200,6 +45136,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "byteslice_0_2_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, gauge, primitive, primitive-addr
+     , primitive-unlifted, quickcheck-classes, run-st, tasty
+     , tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "byteslice";
+       version = "0.2.2.0";
+       sha256 = "0ml3igz9rgrbwvpb883f6sz2j73isxf58iskfpisjgsx8lmgdl4c";
+       libraryHaskellDepends = [
+         base primitive primitive-addr primitive-unlifted run-st
+       ];
+       testHaskellDepends = [
+         base bytestring primitive quickcheck-classes tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ base gauge primitive ];
+       description = "Slicing managed and unmanaged memory";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bytesmith" = callPackage
     ({ mkDerivation, base, byte-order, byteslice, bytestring
      , contiguous, gauge, primitive, run-st, tasty, tasty-hunit
@@ -42259,6 +45217,8 @@ self: {
        ];
        description = "Arbitrary instances for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestring-builder" = callPackage
@@ -42287,6 +45247,8 @@ self: {
        ];
        description = "Variable-length integer encoding";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestring-class" = callPackage
@@ -42300,6 +45262,8 @@ self: {
        libraryHaskellDepends = [ base bytestring utf8-string ];
        description = "Classes for automatic conversion to and from strict and lazy bytestrings. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestring-conversion" = callPackage
@@ -42335,6 +45299,8 @@ self: {
        libraryHaskellDepends = [ array base bytestring dlist ];
        description = "Parse CSV formatted data efficiently";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestring-delta" = callPackage
@@ -42415,6 +45381,8 @@ self: {
        ];
        description = "ByteString-backed Handles";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestring-lexing" = callPackage
@@ -42465,6 +45433,8 @@ self: {
        ];
        description = "Plain byte strings ('ForeignPtr'-less 'ByteString's)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestring-progress" = callPackage
@@ -42504,6 +45474,8 @@ self: {
        ];
        description = "fast ByteString to number converting library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestring-rematch" = callPackage
@@ -42517,6 +45489,8 @@ self: {
        doHaddock = false;
        description = "Rematch support for ByteString";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestring-short" = callPackage
@@ -42546,6 +45520,8 @@ self: {
        ];
        description = "Efficient conversion of values into readable byte strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestring-strict-builder" = callPackage
@@ -42580,6 +45556,8 @@ self: {
        libraryHaskellDepends = [ base bytestring pipes primitive ];
        description = "break bytestrings up into substrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestring-time" = callPackage
@@ -42596,6 +45574,8 @@ self: {
        ];
        description = "Library for Time parsing from ByteString";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestring-to-vector" = callPackage
@@ -42664,6 +45644,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion QuickCheck ];
        description = "Bytestrings with typenat lengths";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestringparser" = callPackage
@@ -42675,6 +45657,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Combinator parsing with Data.ByteString.Lazy";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestringparser-temporary" = callPackage
@@ -42686,6 +45670,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Combinator parsing with Data.ByteString.Lazy";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "bytestringreadp" = callPackage
@@ -42697,6 +45683,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "A ReadP style parser library for ByteString";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "byteunits" = callPackage
@@ -42789,6 +45777,8 @@ self: {
        librarySystemDepends = [ bzip2 ];
        description = "Compression and decompression in the bzip2 format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) bzip2;};
 
   "bzlib-conduit" = callPackage
@@ -42826,6 +45816,8 @@ self: {
        libraryHaskellDepends = [ base language-c ];
        description = "A higher level DSL on top of language-c";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "c-io" = callPackage
@@ -42837,6 +45829,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "C IO";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "c-mosquitto" = callPackage
@@ -42857,6 +45851,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Simpe mosquito MQTT binding able to work with the Amazons IoT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) mosquitto;};
 
   "c-storable" = callPackage
@@ -42893,6 +45889,8 @@ self: {
        executableHaskellDepends = [ base c0parser ];
        description = "Simple C0 Syntax Check";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "c0parser" = callPackage
@@ -42904,6 +45902,8 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "Simple C0 Parser";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "c10k" = callPackage
@@ -42915,6 +45915,8 @@ self: {
        libraryHaskellDepends = [ base network unix ];
        description = "C10k server library using prefork";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "c2ats" = callPackage
@@ -42937,6 +45939,8 @@ self: {
        ];
        description = "Translate C code into ATS";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "c2hs" = callPackage
@@ -42998,6 +46002,8 @@ self: {
        testHaskellDepends = [ base here hspec logging monad-logger text ];
        description = "Convert C API header files to .hsc and .hsc.helper.c files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ca" = callPackage
@@ -43079,6 +46085,8 @@ self: {
        ];
        description = "Check how up-to-date your .cabal dependencies are.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-bounds" = callPackage
@@ -43103,6 +46111,8 @@ self: {
        ];
        description = "A command line program for managing the bounds/versions of the dependencies in a cabal file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-build-programs" = callPackage
@@ -43130,6 +46140,8 @@ self: {
        ];
        description = "Bundling C/C++ projects in Cabal package made easy";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-cache" = callPackage
@@ -43165,6 +46177,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "CI Assistant for Haskell projects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-cargs" = callPackage
@@ -43187,6 +46201,8 @@ self: {
        testHaskellDepends = [ base filepath tasty tasty-golden ];
        description = "A command line program for extracting compiler arguments from a cabal file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-constraints" = callPackage
@@ -43200,6 +46216,8 @@ self: {
        executableHaskellDepends = [ base Cabal optparse-applicative ];
        description = "Repeatable builds for cabalized Haskell projects";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-db" = callPackage
@@ -43219,6 +46237,8 @@ self: {
        ];
        description = "query tools for the local cabal database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-debian" = callPackage
@@ -43258,6 +46278,8 @@ self: {
        ];
        description = "Compose a list of a project's transitive dependencies with their licenses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-dev" = callPackage
@@ -43280,6 +46302,8 @@ self: {
        executableToolDepends = [ cabal-install ];
        description = "Manage sandboxed Haskell build environments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-dir" = callPackage
@@ -43293,6 +46317,8 @@ self: {
        executableHaskellDepends = [ base Cabal directory filepath ];
        description = "show dist dir of 'cabal copy/install'";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-doctest" = callPackage
@@ -43321,6 +46347,8 @@ self: {
        testHaskellDepends = [ base Cabal ];
        description = "Template Haskell expressions for reading fields from a project's cabal file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-flatpak" = callPackage
@@ -43382,6 +46410,8 @@ self: {
        libraryHaskellDepends = [ base Cabal ghc transformers ];
        description = "Conveniently configure GHC's dynamic flags for use with Cabal projects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-ghci" = callPackage
@@ -43398,6 +46428,8 @@ self: {
        ];
        description = "Set up ghci with options taken from a .cabal file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-graphdeps" = callPackage
@@ -43415,6 +46447,8 @@ self: {
        ];
        description = "Generate graphs of install-time Cabal dependencies";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-helper" = callPackage
@@ -43467,6 +46501,8 @@ self: {
        ];
        description = "Read information from cabal files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-install" = callPackage
@@ -43516,6 +46552,8 @@ self: {
        executableSystemDepends = [ zlib ];
        description = "The (bundled) command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "cabal-install-ghc72" = callPackage
@@ -43535,6 +46573,8 @@ self: {
        ];
        description = "Temporary version of cabal-install for ghc-7.2";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-install-ghc74" = callPackage
@@ -43554,6 +46594,8 @@ self: {
        ];
        description = "Temporary version of cabal-install for ghc-7.4";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-install-parsers" = callPackage
@@ -43578,6 +46620,8 @@ self: {
        ];
        description = "Utilities to work with cabal-install files";
        license = "GPL-2.0-or-later AND BSD-3-Clause";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-lenses" = callPackage
@@ -43596,6 +46640,8 @@ self: {
        ];
        description = "Lenses and traversals for the Cabal library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-macosx" = callPackage
@@ -43643,6 +46689,8 @@ self: {
        ];
        description = "build multiple packages at once";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-mon" = callPackage
@@ -43660,6 +46708,8 @@ self: {
        ];
        description = "A monitor for cabal builds";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-nirvana" = callPackage
@@ -43677,6 +46727,8 @@ self: {
        ];
        description = "Avoid Cabal dependency hell by constraining to known good versions. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-plan" = callPackage
@@ -43717,6 +46769,8 @@ self: {
        executableHaskellDepends = [ base Cabal directory filepath ];
        description = "Show dependencies of program being built in current directory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-query" = callPackage
@@ -43733,6 +46787,8 @@ self: {
        ];
        description = "Helpers for quering .cabal files or hackageDB's 00-index.tar";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-rpm" = callPackage
@@ -43742,8 +46798,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-rpm";
-       version = "2.0.1";
-       sha256 = "0kspqf3lsaczwgidih9f7xlgpdx9asarb3s8s3n2bwq5g68gh2l7";
+       version = "2.0.2";
+       sha256 = "1cnnibn10sv39ilsy222rr9q5pl56jshnpjp80pih4fzvq8myjbw";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -43755,15 +46811,15 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "cabal-rpm_2_0_3" = callPackage
+  "cabal-rpm_2_0_4" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath
      , http-client, http-client-tls, http-conduit, optparse-applicative
      , process, simple-cabal, simple-cmd, simple-cmd-args, time, unix
      }:
      mkDerivation {
        pname = "cabal-rpm";
-       version = "2.0.3";
-       sha256 = "1a9j5gsqp6w89yi7m0djzx3xzvr39sawlx06bq3wljs0r6g99bzb";
+       version = "2.0.4";
+       sha256 = "0p2g0cci4ylbpkv3r1pfi6pc2iyxghqi8rjrmxz0jxs4x28hb23v";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -43800,6 +46856,8 @@ self: {
        executableHaskellDepends = [ base Cabal ];
        description = "The user interface for building and installing Cabal packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-sign" = callPackage
@@ -43836,6 +46894,8 @@ self: {
        ];
        description = "Topologically sort cabal packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-src" = callPackage
@@ -43857,6 +46917,8 @@ self: {
        ];
        description = "Alternative install procedure to avoid the diamond dependency issue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-test" = callPackage
@@ -43872,6 +46934,8 @@ self: {
        ];
        description = "Automated test tool for cabal projects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-test-bin" = callPackage
@@ -43928,6 +46992,8 @@ self: {
        ];
        description = "Helper functions for writing custom Setup.hs scripts.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal-uninstall" = callPackage
@@ -43954,6 +47020,8 @@ self: {
        executableHaskellDepends = [ base filepath HTTP network ];
        description = "Command-line tool for uploading packages to Hackage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal2arch" = callPackage
@@ -43973,6 +47041,8 @@ self: {
        ];
        description = "Create Arch Linux packages from Cabal packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal2doap" = callPackage
@@ -43988,6 +47058,8 @@ self: {
        ];
        description = "Cabal to Description-of-a-Project (DOAP)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal2ebuild" = callPackage
@@ -44002,6 +47074,8 @@ self: {
        executableHaskellDepends = [ base curl directory ];
        description = "make gentoo's .ebuild file from .cabal file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal2ghci" = callPackage
@@ -44020,6 +47094,8 @@ self: {
        ];
        description = "A tool to generate .ghci file from .cabal";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabal2nix" = callPackage
@@ -44095,6 +47171,8 @@ self: {
        ];
        description = "A simple tool to query cabal files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabalg" = callPackage
@@ -44129,6 +47207,8 @@ self: {
        ];
        description = "Generate pretty graphs of module trees from cabal files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabalish" = callPackage
@@ -44147,6 +47227,8 @@ self: {
        ];
        description = "Provides access to the cabal file data for shell scripts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabalmdvrpm" = callPackage
@@ -44161,6 +47243,8 @@ self: {
        executableHaskellDepends = [ base Cabal cabalrpmdeps haskell98 ];
        description = "Create mandriva rpm from cabal package";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabalrpmdeps" = callPackage
@@ -44175,6 +47259,8 @@ self: {
        executableHaskellDepends = [ base Cabal filepath haskell98 ];
        description = "Autogenerate rpm dependencies from cabal files";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabalvchk" = callPackage
@@ -44188,6 +47274,8 @@ self: {
        executableHaskellDepends = [ base Cabal ];
        description = "Verify installed package version against user-specified constraints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabin" = callPackage
@@ -44206,6 +47294,8 @@ self: {
        ];
        description = "Cabal binary sandboxes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cabocha" = callPackage
@@ -44218,6 +47308,8 @@ self: {
        librarySystemDepends = [ cabocha ];
        testHaskellDepends = [ base text-format ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {cabocha = null;};
 
   "cache" = callPackage
@@ -44251,6 +47343,8 @@ self: {
        ];
        description = "Cache values to disk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cached-io" = callPackage
@@ -44403,6 +47497,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Prelude subsets—take only what you want!";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "caffegraph" = callPackage
@@ -44421,6 +47517,8 @@ self: {
          protocol-buffers-descriptor template-haskell temporary text
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cairo" = callPackage
@@ -44486,6 +47584,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Cairo Haskell binding (partial)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) cairo;};
 
   "cake" = callPackage
@@ -44508,6 +47608,8 @@ self: {
        ];
        description = "A build-system library and driver";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cake3" = callPackage
@@ -44537,6 +47639,8 @@ self: {
        ];
        description = "Third cake the Makefile EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cakyrespa" = callPackage
@@ -44554,6 +47658,8 @@ self: {
        ];
        description = "run turtle like LOGO with lojban";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cal-layout" = callPackage
@@ -44568,6 +47674,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Calendar Layout Algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cal3d" = callPackage
@@ -44580,6 +47688,8 @@ self: {
        librarySystemDepends = [ cal3d ];
        description = "Haskell binding to the Cal3D animation library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {cal3d = null;};
 
   "cal3d-examples" = callPackage
@@ -44594,6 +47704,8 @@ self: {
        executableHaskellDepends = [ base cal3d cal3d-opengl OpenGL SDL ];
        description = "Examples for the Cal3d animation library";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cal3d-opengl" = callPackage
@@ -44605,6 +47717,8 @@ self: {
        libraryHaskellDepends = [ base cal3d OpenGL ];
        description = "OpenGL rendering for the Cal3D animation library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "calc" = callPackage
@@ -44618,6 +47732,8 @@ self: {
        executableHaskellDepends = [ array base harpy haskell98 mtl ];
        description = "A small compiler for arithmetic expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "calculator" = callPackage
@@ -44639,6 +47755,8 @@ self: {
        ];
        description = "A calculator repl, with variables, functions & Mathematica like dynamic plots";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "caldims" = callPackage
@@ -44659,6 +47777,8 @@ self: {
        ];
        description = "Calculation tool and library supporting units";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "caledon" = callPackage
@@ -44676,6 +47796,8 @@ self: {
        ];
        description = "a logic programming language based on the calculus of constructions";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "calendar-recycling" = callPackage
@@ -44731,6 +47853,8 @@ self: {
        ];
        description = "The call game engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "call-alloy" = callPackage
@@ -44752,6 +47876,8 @@ self: {
        ];
        description = "A simple library to call Alloy given a specification";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "call-haskell-from-anything" = callPackage
@@ -44770,6 +47896,8 @@ self: {
        executableHaskellDepends = [ base bytestring data-msgpack mtl ];
        description = "Call Haskell functions from other languages via serialization and dynamic libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "call-stack" = callPackage
@@ -44819,6 +47947,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "CamFort - Cambridge Fortran infrastructure";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) flint;};
 
   "camh" = callPackage
@@ -44851,6 +47981,8 @@ self: {
        ];
        description = "Haskell implementation of the Campfire API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "can-i-haz" = callPackage
@@ -44874,6 +48006,8 @@ self: {
        libraryHaskellDepends = [ arithmoi array base containers random ];
        description = "Arithmetic for Psychedelically Large Numbers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "canonical-filepath" = callPackage
@@ -44885,6 +48019,8 @@ self: {
        libraryHaskellDepends = [ base deepseq directory filepath ];
        description = "Abstract data type for canonical file paths";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "canonical-json" = callPackage
@@ -44908,6 +48044,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring containers criterion ];
        description = "Canonical JSON for signing and hashing JSON values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "canteven-config" = callPackage
@@ -44938,6 +48076,8 @@ self: {
        ];
        description = "Utilities for HTTP programming";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "canteven-listen-http" = callPackage
@@ -44949,6 +48089,8 @@ self: {
        libraryHaskellDepends = [ aeson base ];
        description = "data types to describe HTTP services";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "canteven-log" = callPackage
@@ -44966,6 +48108,8 @@ self: {
        ];
        description = "A canteven way of setting up logging for your program";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "canteven-parsedate" = callPackage
@@ -44981,6 +48125,8 @@ self: {
        ];
        description = "Date / time parsing utilities that try to guess the date / time format";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "canteven-template" = callPackage
@@ -45019,6 +48165,8 @@ self: {
        ];
        description = "Application for analysis of java source code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cantor-pairing" = callPackage
@@ -45057,6 +48205,8 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "CAO Compiler";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cap" = callPackage
@@ -45071,6 +48221,8 @@ self: {
        executableHaskellDepends = [ array base containers haskell98 ];
        description = "Interprets and debug the cap language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "capability" = callPackage
@@ -45094,6 +48246,8 @@ self: {
        ];
        description = "Extensional capabilities and deriving combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "capataz" = callPackage
@@ -45155,6 +48309,8 @@ self: {
        ];
        description = "Cap'n Proto for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "capped-list" = callPackage
@@ -45166,6 +48322,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A list-like type for lazy sequences, with a user-defined termination value";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "capri" = callPackage
@@ -45181,6 +48339,8 @@ self: {
        ];
        description = "A simple wrapper over cabal-install to operate in project-private mode";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "car-pool" = callPackage
@@ -45203,6 +48363,8 @@ self: {
        ];
        description = "Simple web-server for organizing car-pooling for an event";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "caramia" = callPackage
@@ -45227,6 +48389,8 @@ self: {
        ];
        description = "High-level OpenGL bindings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "carbonara" = callPackage
@@ -45241,6 +48405,8 @@ self: {
        ];
        description = "some spaghetti code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "carboncopy" = callPackage
@@ -45258,6 +48424,8 @@ self: {
        ];
        description = "Drop emails from threads being watched into special CC folder";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "carettah" = callPackage
@@ -45278,6 +48446,8 @@ self: {
        ];
        description = "A presentation tool written with Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "carray" = callPackage
@@ -45313,6 +48483,8 @@ self: {
        ];
        description = "Carte: A commandline pastebin server";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cartel" = callPackage
@@ -45341,6 +48513,8 @@ self: {
        ];
        description = "Specify Cabal files in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "casa-abbreviations-and-acronyms" = callPackage
@@ -45362,6 +48536,8 @@ self: {
        ];
        description = "CASA Abbreviations and Acronyms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "casadi-bindings" = callPackage
@@ -45386,6 +48562,8 @@ self: {
        ];
        description = "mid-level bindings to CasADi";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {casadi = null;};
 
   "casadi-bindings-control" = callPackage
@@ -45402,6 +48580,8 @@ self: {
        libraryPkgconfigDepends = [ casadi_control ];
        description = "low level bindings to casadi-control";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {casadi_control = null;};
 
   "casadi-bindings-core" = callPackage
@@ -45418,6 +48598,8 @@ self: {
        librarySystemDepends = [ casadi ];
        description = "autogenerated low level bindings to casadi";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {casadi = null;};
 
   "casadi-bindings-internal" = callPackage
@@ -45430,6 +48612,8 @@ self: {
        librarySystemDepends = [ casadi ];
        description = "low level bindings to CasADi";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {casadi = null;};
 
   "casadi-bindings-ipopt-interface" = callPackage
@@ -45446,6 +48630,8 @@ self: {
        libraryPkgconfigDepends = [ casadi_ipopt_interface ];
        description = "low level bindings to casadi-ipopt_interface";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {casadi_ipopt_interface = null;};
 
   "casadi-bindings-snopt-interface" = callPackage
@@ -45462,6 +48648,8 @@ self: {
        libraryPkgconfigDepends = [ casadi_snopt_interface ];
        description = "low level bindings to casadi-snopt_interface";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {casadi_snopt_interface = null;};
 
   "cascading" = callPackage
@@ -45478,6 +48666,8 @@ self: {
        ];
        description = "DSL for HTML CSS (Cascading Style Sheets)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "case-conversion" = callPackage
@@ -45572,6 +48762,8 @@ self: {
        benchmarkHaskellDepends = [ criterion mwc-random rerebase ];
        description = "A converter for spinal, snake and camel cases";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cash" = callPackage
@@ -45588,6 +48780,8 @@ self: {
        ];
        description = "the Computer Algebra SHell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "casing" = callPackage
@@ -45794,6 +48988,8 @@ self: {
        ];
        description = "Haskell client for Cassandra's CQL protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cassandra-thrift" = callPackage
@@ -45851,6 +49047,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Conduit interface for cassava package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cassava-embed" = callPackage
@@ -45909,6 +49107,8 @@ self: {
        ];
        description = "Auto-generation of records data type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cassava-streams" = callPackage
@@ -45941,6 +49141,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A combinator library for simultaneously defining parsers and pretty printers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cassy" = callPackage
@@ -45968,6 +49170,8 @@ self: {
        ];
        description = "A high level driver for the Cassandra datastore";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cast" = callPackage
@@ -46039,6 +49243,8 @@ self: {
        ];
        description = "A tool to manage shared cabal-install sandboxes";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "casui" = callPackage
@@ -46053,6 +49259,8 @@ self: {
        executableHaskellDepends = [ base gtk haskell98 mtl parsec ];
        description = "Equation Manipulator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "catamorphism" = callPackage
@@ -46065,6 +49273,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Exposes a Template Haskell function for generating catamorphisms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "catch-fd" = callPackage
@@ -46076,6 +49286,8 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "MonadThrow and MonadCatch, using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "categorical-algebra" = callPackage
@@ -46087,6 +49299,8 @@ self: {
        libraryHaskellDepends = [ base newtype pointless-haskell void ];
        description = "Categorical Monoids and Semirings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "categories" = callPackage
@@ -46136,6 +49350,8 @@ self: {
        doHaddock = false;
        description = "A meta-package documenting various packages inspired by category theory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "category-printf" = callPackage
@@ -46160,6 +49376,8 @@ self: {
        libraryHaskellDepends = [ base categories ];
        description = "Traced monoidal categories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "catnplus" = callPackage
@@ -46179,6 +49397,8 @@ self: {
        ];
        description = "Simple tool to display text files with line numbers and paging";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cautious" = callPackage
@@ -46208,6 +49428,8 @@ self: {
        ];
        description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cautious-gen" = callPackage
@@ -46224,6 +49446,8 @@ self: {
          hspec QuickCheck
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cayene-lpp" = callPackage
@@ -46259,6 +49483,8 @@ self: {
        testHaskellDepends = [ aeson base hspec unordered-containers ];
        description = "A Haskell client for the Cayley graph database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cayley-client_0_4_12" = callPackage
@@ -46279,6 +49505,7 @@ self: {
        description = "A Haskell client for the Cayley graph database";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cayley-dickson" = callPackage
@@ -46411,6 +49638,8 @@ self: {
        ];
        description = "Bindings for the CCI networking library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {cci = null;};
 
   "ccnx" = callPackage
@@ -46422,6 +49651,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "A Haskell implementation of the CCNx network protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cctools-workqueue" = callPackage
@@ -46438,6 +49669,8 @@ self: {
        librarySystemDepends = [ dttools ];
        description = "High-level interface to CCTools' WorkQueue library";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {dttools = null;};
 
   "cdeps" = callPackage
@@ -46476,6 +49709,8 @@ self: {
        ];
        description = "Convenient Chinese phrase & character lookup";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cef" = callPackage
@@ -46490,6 +49725,8 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "CEF log format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cef3-raw" = callPackage
@@ -46503,6 +49740,8 @@ self: {
        libraryPkgconfigDepends = [ gtk2 ];
        description = "Raw CEF3 bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {cef = null; inherit (pkgs) gtk2;};
 
   "cef3-simple" = callPackage
@@ -46514,6 +49753,8 @@ self: {
        libraryHaskellDepends = [ base cef3-raw ];
        description = "Simple wrapper around cef3-raw";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ceilometer-common" = callPackage
@@ -46537,6 +49778,8 @@ self: {
        ];
        description = "Common Haskell types and encoding for OpenStack Ceilometer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cellrenderer-cairo" = callPackage
@@ -46550,6 +49793,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Cairo-based CellRenderer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk2;};
 
   "celtchar" = callPackage
@@ -46574,6 +49819,8 @@ self: {
        testHaskellDepends = [ base hspec raw-strings-qq ];
        description = "A tool to build a novel";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cerberus" = callPackage
@@ -46601,6 +49848,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Protect and control API access with cerberus";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cereal" = callPackage
@@ -46662,6 +49911,8 @@ self: {
        libraryHaskellDepends = [ base cereal ghc-prim ];
        description = "Automatic deriving of Serialize using GHC.Generics";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cereal-enumerator" = callPackage
@@ -46673,6 +49924,8 @@ self: {
        libraryHaskellDepends = [ base bytestring cereal enumerator ];
        description = "Deserialize things with cereal and enumerator";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cereal-ieee754" = callPackage
@@ -46684,6 +49937,8 @@ self: {
        libraryHaskellDepends = [ array base cereal ];
        description = "Floating point support for the 'cereal' serialization library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cereal-io-streams" = callPackage
@@ -46706,6 +49961,8 @@ self: {
        ];
        description = "io-streams support for the cereal binary serialization library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cereal-plus" = callPackage
@@ -46729,6 +49986,8 @@ self: {
        ];
        description = "An extended serialization library on top of \"cereal\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cereal-streams" = callPackage
@@ -46751,6 +50010,8 @@ self: {
        ];
        description = "Use cereal to encode/decode io-streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cereal-text" = callPackage
@@ -46774,6 +50035,8 @@ self: {
        testHaskellDepends = [ base cereal hspec QuickCheck time ];
        description = "Serialize instances for types from `time` package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cereal-unordered-containers" = callPackage
@@ -46831,6 +50094,8 @@ self: {
        ];
        description = "Certificates and Key Reader/Writer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cf" = callPackage
@@ -46848,6 +50113,8 @@ self: {
        ];
        description = "Exact real arithmetic using continued fractions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cfenv" = callPackage
@@ -46881,6 +50148,8 @@ self: {
        ];
        description = "cfipu processor for toy brainfuck-like language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cflp" = callPackage
@@ -46899,6 +50168,8 @@ self: {
        ];
        description = "Constraint Functional-Logic Programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cfopu" = callPackage
@@ -46916,6 +50187,8 @@ self: {
        ];
        description = "cfopu processor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cg" = callPackage
@@ -46936,6 +50209,8 @@ self: {
        ];
        description = "Parser for categorial grammars";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cgen" = callPackage
@@ -46955,6 +50230,8 @@ self: {
        doHaddock = false;
        description = "generates Haskell bindings and C wrappers for C++ libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cgi" = callPackage
@@ -46997,6 +50274,8 @@ self: {
        libraryHaskellDepends = [ base cgi containers mtl random ];
        description = "Simple modular utilities for CGI/FastCGI (sessions, etc.)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cgrep" = callPackage
@@ -47022,6 +50301,8 @@ self: {
        ];
        description = "Command line tool";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chain-codes" = callPackage
@@ -47063,6 +50344,8 @@ self: {
        ];
        description = "Combinators for building and processing 2D images";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chalkboard-viewer" = callPackage
@@ -47074,6 +50357,8 @@ self: {
        libraryHaskellDepends = [ array base chalkboard GLUT OpenGL time ];
        description = "OpenGL based viewer for chalkboard rendered images";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chalmers-lava2000" = callPackage
@@ -47200,6 +50485,8 @@ self: {
        ];
        description = "Rapid prototyping websites with Snap and Heist";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "charset" = callPackage
@@ -47258,6 +50545,8 @@ self: {
        ];
        description = "Command-line utility to draw charts from input data easily";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chart-histogram" = callPackage
@@ -47269,6 +50558,8 @@ self: {
        libraryHaskellDepends = [ base Chart ];
        description = "Easily render histograms with Chart";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chart-unit" = callPackage
@@ -47293,6 +50584,8 @@ self: {
        ];
        description = "Native haskell charts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chaselev-deque" = callPackage
@@ -47349,6 +50642,8 @@ self: {
        ];
        description = "A library of simple NLP algorithms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chatty" = callPackage
@@ -47381,6 +50676,8 @@ self: {
        libraryHaskellDepends = [ base chatty transformers ];
        description = "Provides some classes and types for dealing with text, using the fundaments of Chatty";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chatty-utils" = callPackage
@@ -47422,6 +50719,8 @@ self: {
        ];
        description = "The ChatWork API in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cheapskate" = callPackage
@@ -47497,6 +50796,8 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "check-email" = callPackage
@@ -47528,6 +50829,8 @@ self: {
        ];
        description = "Check whether module and package imports conform to the PVP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "checked" = callPackage
@@ -47541,6 +50844,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Bounds-checking integer types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "checkers" = callPackage
@@ -47584,6 +50889,8 @@ self: {
        ];
        description = "Generate checklists relevant to a given patch";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "checksum" = callPackage
@@ -47635,6 +50942,8 @@ self: {
        libraryHaskellDepends = [ base chell QuickCheck random ];
        description = "QuickCheck support for the Chell testing library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chessIO" = callPackage
@@ -47669,6 +50978,8 @@ self: {
        ];
        description = "Basic chess library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chesshs" = callPackage
@@ -47699,6 +51010,8 @@ self: {
        ];
        description = "Query interface for Chevalier";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chiasma" = callPackage
@@ -47723,6 +51036,8 @@ self: {
        ];
        description = "tmux api";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chimera" = callPackage
@@ -47775,6 +51090,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Helper for the Major System";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "choice" = callPackage
@@ -47797,6 +51114,8 @@ self: {
        libraryHaskellDepends = [ base MonadRandom ];
        description = "Choose random elements from a stream";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "choose-exe" = callPackage
@@ -47813,6 +51132,8 @@ self: {
        ];
        description = "Command-line program to choose random element from a stream";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chorale" = callPackage
@@ -47830,6 +51151,8 @@ self: {
        ];
        description = "A module containing basic functions that the prelude does not offer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chorale-geo" = callPackage
@@ -47847,6 +51170,8 @@ self: {
        ];
        description = "A module containing basic geo functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chp" = callPackage
@@ -47862,6 +51187,8 @@ self: {
        ];
        description = "An implementation of concurrency ideas from Communicating Sequential Processes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chp-mtl" = callPackage
@@ -47873,6 +51200,8 @@ self: {
        libraryHaskellDepends = [ base chp chp-plus mtl ];
        description = "MTL class instances for the CHP library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chp-plus" = callPackage
@@ -47889,6 +51218,8 @@ self: {
        ];
        description = "A set of high-level concurrency utilities built on Communicating Haskell Processes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chp-spec" = callPackage
@@ -47904,6 +51235,8 @@ self: {
        ];
        description = "A mirror implementation of chp that generates a specification of the program";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chp-transformers" = callPackage
@@ -47915,6 +51248,8 @@ self: {
        libraryHaskellDepends = [ base chp chp-plus transformers ];
        description = "Transformers instances for the CHP library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chr-core" = callPackage
@@ -47931,6 +51266,8 @@ self: {
        ];
        description = "Constraint Handling Rules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chr-data" = callPackage
@@ -47968,6 +51305,8 @@ self: {
        executableHaskellDepends = [ base chr-data ];
        description = "AST + surface language around chr";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chr-parse" = callPackage
@@ -47981,6 +51320,8 @@ self: {
        libraryHaskellDepends = [ base containers uulib ];
        description = "Parsing for chr library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chr-pretty" = callPackage
@@ -48029,6 +51370,8 @@ self: {
        ];
        description = "neovim package manager";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chronograph" = callPackage
@@ -48042,6 +51385,8 @@ self: {
        ];
        description = "measure timings of data evaluation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chronologique" = callPackage
@@ -48149,6 +51494,8 @@ self: {
        ];
        description = "FFI for Chu2 Agda Web Server Interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chuchu" = callPackage
@@ -48193,6 +51540,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 parsec template-haskell ];
        description = "Simple template library with static safety";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "chunky" = callPackage
@@ -48208,6 +51557,8 @@ self: {
        testHaskellDepends = [ base binary bytestring HUnit text ];
        description = "Human-readable storage of text/binary objects";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "church" = callPackage
@@ -48219,6 +51570,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Automatically convert Generic instances to and from church representations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "church-list" = callPackage
@@ -48242,6 +51595,8 @@ self: {
        libraryHaskellDepends = [ base deepseq semigroupoids semigroups ];
        description = "Church encoded Maybe";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "church-pair" = callPackage
@@ -48277,6 +51632,8 @@ self: {
        ];
        description = "Cielo API v3 Bindings for Haskell";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cil" = callPackage
@@ -48288,6 +51645,8 @@ self: {
        libraryHaskellDepends = [ base bytestring language-c ];
        description = "An interface to CIL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cinvoke" = callPackage
@@ -48300,6 +51659,8 @@ self: {
        librarySystemDepends = [ cinvoke ];
        description = "A binding to cinvoke";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {cinvoke = null;};
 
   "cio" = callPackage
@@ -48311,6 +51672,8 @@ self: {
        libraryHaskellDepends = [ base monad-stm mtl parallel-io stm ];
        description = "A monad for concurrent IO on a thread pool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cipher-aes" = callPackage
@@ -48382,6 +51745,8 @@ self: {
        ];
        description = "Blowfish cipher";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cipher-camellia" = callPackage
@@ -48482,6 +51847,8 @@ self: {
        executableHaskellDepends = [ array base bytestring parseargs ];
        description = "Implementation of CipherSaber2 RC4 cryptography";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "circ" = callPackage
@@ -48523,6 +51890,8 @@ self: {
        ];
        description = "The CircleCI REST API for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "circuit-breaker" = callPackage
@@ -48613,6 +51982,8 @@ self: {
        ];
        description = "convert document IDs such as DOI, ISBN, arXiv ID to bibliographic reference";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "citeproc-hs" = callPackage
@@ -48632,6 +52003,8 @@ self: {
        ];
        description = "A Citation Style Language implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "citeproc-hs-pandoc-filter" = callPackage
@@ -48651,6 +52024,8 @@ self: {
        ];
        description = "A Pandoc filter for processing bibliographic references with citeproc-hs";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cityhash" = callPackage
@@ -48690,6 +52065,8 @@ self: {
        ];
        description = "A new Haskeleton package";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cjk" = callPackage
@@ -48707,6 +52084,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Data about Chinese, Japanese and Korean characters and languages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cl3" = callPackage
@@ -48760,6 +52139,8 @@ self: {
        ];
        description = "Simple CLI RPN calculator";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clafer" = callPackage
@@ -48794,6 +52175,8 @@ self: {
        ];
        description = "Compiles Clafer models to other formats: Alloy, JavaScript, JSON, HTML, Dot";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "claferIG" = callPackage
@@ -48826,6 +52209,8 @@ self: {
        ];
        description = "claferIG is an interactive tool that generates instances of Clafer models";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "claferwiki" = callPackage
@@ -48845,6 +52230,8 @@ self: {
        ];
        description = "A wiki-based IDE for literate modeling with Clafer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clang-compilation-database" = callPackage
@@ -48857,6 +52244,8 @@ self: {
        testHaskellDepends = [ aeson base bytestring ];
        description = "JSON Compilation Database Format encoding and decoding";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clang-pure" = callPackage
@@ -48879,6 +52268,8 @@ self: {
        testHaskellDepends = [ base bytestring lens ];
        description = "Pure C++ code analysis with libclang";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (self.llvmPackages) clang;};
 
   "clanki" = callPackage
@@ -48894,6 +52285,8 @@ self: {
        ];
        description = "Command-line spaced-repetition software";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clarifai" = callPackage
@@ -48911,6 +52304,8 @@ self: {
        ];
        description = "API Client for the Clarifai API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clash" = callPackage
@@ -48930,6 +52325,8 @@ self: {
        ];
        description = "CAES Language for Synchronous Hardware (CLaSH)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clash-ghc" = callPackage
@@ -48958,6 +52355,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "CAES Language for Synchronous Hardware";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clash-lib" = callPackage
@@ -48989,6 +52388,8 @@ self: {
        ];
        description = "CAES Language for Synchronous Hardware - As a Library";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clash-multisignal" = callPackage
@@ -49003,6 +52404,8 @@ self: {
          base clash-prelude deepseq ghc-typelits-knownnat QuickCheck
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clash-prelude" = callPackage
@@ -49065,6 +52468,8 @@ self: {
        ];
        description = "CAES Language for Synchronous Hardware - SystemVerilog backend";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clash-verilog" = callPackage
@@ -49082,6 +52487,8 @@ self: {
        ];
        description = "CAES Language for Synchronous Hardware - Verilog backend";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clash-vhdl" = callPackage
@@ -49099,6 +52506,8 @@ self: {
        ];
        description = "CAES Language for Synchronous Hardware - VHDL backend";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "classify" = callPackage
@@ -49141,6 +52550,8 @@ self: {
        ];
        description = "Classify sounds produced by Xenopus laevis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "classy-influxdb-simple" = callPackage
@@ -49157,6 +52568,8 @@ self: {
        ];
        description = "Super simple InfluxDB package in Classy-MTL style";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "classy-miso" = callPackage
@@ -49177,6 +52590,8 @@ self: {
        testHaskellDepends = [ base miso rfc ];
        description = "Typeclass based support for Miso, the Tasty Web Framework for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "classy-parallel" = callPackage
@@ -49192,6 +52607,8 @@ self: {
        ];
        description = "Fork of the monad-parallel package using monad-control";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "classy-prelude" = callPackage
@@ -49269,6 +52686,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion parallel uniplate ];
        description = "Fuseable type-class based generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clay" = callPackage
@@ -49317,6 +52736,8 @@ self: {
        libraryToolDepends = [ hsx2hs ];
        description = "A secure, reliable content management system (CMS) and blogging platform";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "clckwrks-cli" = callPackage
@@ -49339,6 +52760,8 @@ self: {
        ];
        description = "a command-line interface for adminstrating some aspects of clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clckwrks-dot-com" = callPackage
@@ -49360,6 +52783,8 @@ self: {
        executableToolDepends = [ hsx2hs ];
        description = "clckwrks.com";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clckwrks-plugin-bugs" = callPackage
@@ -49385,6 +52810,8 @@ self: {
        libraryToolDepends = [ hsx2hs ];
        description = "bug tracking plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clckwrks-plugin-ircbot" = callPackage
@@ -49408,6 +52835,8 @@ self: {
        libraryToolDepends = [ hsx2hs ];
        description = "ircbot plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clckwrks-plugin-mailinglist" = callPackage
@@ -49432,6 +52861,8 @@ self: {
        ];
        description = "mailing list plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clckwrks-plugin-media" = callPackage
@@ -49455,6 +52886,8 @@ self: {
        libraryToolDepends = [ hsx2hs ];
        description = "media plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clckwrks-plugin-page" = callPackage
@@ -49482,6 +52915,8 @@ self: {
        libraryToolDepends = [ hsx2hs ];
        description = "support for CMS/Blogging in clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clckwrks-theme-bootstrap" = callPackage
@@ -49499,6 +52934,8 @@ self: {
        ];
        description = "simple bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clckwrks-theme-clckwrks" = callPackage
@@ -49516,6 +52953,8 @@ self: {
        ];
        description = "simple bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clckwrks-theme-geo-bootstrap" = callPackage
@@ -49528,6 +52967,8 @@ self: {
        libraryHaskellDepends = [ base clckwrks hsp text ];
        description = "geo bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cld2" = callPackage
@@ -49556,6 +52997,8 @@ self: {
        ];
        description = "Keep your home dir clean by finding old conf files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clean-unions" = callPackage
@@ -49567,6 +53010,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Open unions without need for Typeable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cless" = callPackage
@@ -49585,6 +53030,8 @@ self: {
        ];
        description = "Colorized LESS";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clevercss" = callPackage
@@ -49599,6 +53046,8 @@ self: {
        executableHaskellDepends = [ parsec ];
        description = "A CSS preprocessor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clexer" = callPackage
@@ -49610,6 +53059,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl parsec ];
        description = "Lexes C++ code into simple tokens";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cli" = callPackage
@@ -49642,6 +53093,8 @@ self: {
        testHaskellDepends = [ base doctest filemanip hspec QuickCheck ];
        description = "Simple project template from stack";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cli-setup" = callPackage
@@ -49714,6 +53167,8 @@ self: {
        benchmarkHaskellDepends = [ base time ];
        description = "A Clifford algebra number type for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clifford" = callPackage
@@ -49746,6 +53201,8 @@ self: {
        ];
        description = "A Clifford algebra library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clifm" = callPackage
@@ -49765,6 +53222,8 @@ self: {
        ];
        description = "Command Line Interface File Manager";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "climb" = callPackage
@@ -49806,6 +53265,8 @@ self: {
        librarySystemDepends = [ clingo ];
        description = "Haskell bindings to the Clingo ASP solver";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) clingo;};
 
   "clippard" = callPackage
@@ -49817,6 +53278,8 @@ self: {
        libraryHaskellDepends = [ base process ];
        description = "A simple Haskell library for copying text to the clipboard in a cross-platform way";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clipper" = callPackage
@@ -49828,6 +53291,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell API to clipper (2d polygon union/intersection/xor/clipping API)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clippings" = callPackage
@@ -49853,6 +53318,8 @@ self: {
        ];
        description = "A parser/generator for Kindle-format clipping files (`My Clippings.txt`),";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clisparkline" = callPackage
@@ -49865,6 +53332,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Tiny library to pretty print sparklines onto the CLI";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clist" = callPackage
@@ -49899,6 +53368,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Post tweets from stdin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cloben" = callPackage
@@ -49957,6 +53428,8 @@ self: {
        libraryPkgconfigDepends = [ QtCore ];
        description = "timer functionality to clock IO commands";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {QtCore = null;};
 
   "clogparse" = callPackage
@@ -49973,6 +53446,8 @@ self: {
        ];
        description = "Parse IRC logs such as the #haskell logs on tunes.org";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clone-all" = callPackage
@@ -49992,6 +53467,8 @@ self: {
        ];
        description = "Clone all github repositories from a given user";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "closed" = callPackage
@@ -50022,6 +53499,8 @@ self: {
        libraryHaskellDepends = [ base hashable unordered-containers ];
        description = "Depth- and breadth-first set closures";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cloud-haskell" = callPackage
@@ -50045,6 +53524,8 @@ self: {
        doHaddock = false;
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cloud-seeder" = callPackage
@@ -50073,6 +53554,8 @@ self: {
        ];
        description = "A tool for interacting with AWS CloudFormation";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cloudfront-signer" = callPackage
@@ -50089,6 +53572,8 @@ self: {
        ];
        description = "CloudFront URL signer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cloudi" = callPackage
@@ -50189,6 +53674,8 @@ self: {
        ];
        description = "Quasiquoters for inline C# and F#";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clr-marshal" = callPackage
@@ -50257,6 +53744,8 @@ self: {
        ];
        description = "C to Lua data wrapper generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clumpiness" = callPackage
@@ -50279,6 +53768,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "simple alternative to type classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clustering" = callPackage
@@ -50304,6 +53795,8 @@ self: {
        ];
        description = "High performance clustering algorithms";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clustertools" = callPackage
@@ -50322,6 +53815,8 @@ self: {
        ];
        description = "Tools for manipulating sequence clusters";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "clutterhs" = callPackage
@@ -50339,6 +53834,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to the Clutter animation library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) clutter; inherit (pkgs) pango;};
 
   "cmaes" = callPackage
@@ -50424,6 +53921,8 @@ self: {
        ];
        description = "Code highlighting for cmark";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cmark-lucid" = callPackage
@@ -50448,6 +53947,8 @@ self: {
        libraryHaskellDepends = [ base cmark ];
        description = "Pattern synonyms for cmark";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cmark-sections" = callPackage
@@ -50466,6 +53967,8 @@ self: {
        ];
        description = "Represent cmark-parsed Markdown as a tree of sections";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cmath" = callPackage
@@ -50477,6 +53980,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A binding to the standard C math library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cmathml3" = callPackage
@@ -50496,6 +54001,8 @@ self: {
        executableHaskellDepends = [ base Cabal filepath ];
        description = "Data model, parser, serialiser and transformations for Content MathML 3";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cmd-item" = callPackage
@@ -50512,6 +54019,8 @@ self: {
        ];
        description = "Library to compose and reuse command line fragments";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cmdargs" = callPackage
@@ -50548,6 +54057,8 @@ self: {
        ];
        description = "Helper to enter cmdargs command lines using a web browser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cmdlib" = callPackage
@@ -50561,6 +54072,8 @@ self: {
        libraryHaskellDepends = [ base mtl split syb transformers ];
        description = "a library for command line parsing & online help";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cmdtheline" = callPackage
@@ -50582,6 +54095,8 @@ self: {
        ];
        description = "Declarative command-line option parsing and documentation library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cmf" = callPackage
@@ -50616,6 +54131,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "A library for C-like programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cmph" = callPackage
@@ -50634,6 +54151,8 @@ self: {
        testSystemDepends = [ cmph ];
        description = "low level interface to CMPH";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {cmph = null;};
 
   "cmptype" = callPackage
@@ -50648,6 +54167,8 @@ self: {
        ];
        description = "Compare types of any kinds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cmt" = callPackage
@@ -50674,6 +54195,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Write consistent git commit messages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cmu" = callPackage
@@ -50716,6 +54239,8 @@ self: {
        ];
        description = "Detailed visualization of CMs, HMMs and their comparisions";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cnc-spec-compiler" = callPackage
@@ -50737,6 +54262,8 @@ self: {
        ];
        description = "Compiler/Translator for CnC Specification Files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cndict" = callPackage
@@ -50774,6 +54301,8 @@ self: {
        testHaskellDepends = [ base co-log-core hedgehog ];
        description = "Composable Contravariant Comonadic Logging Library";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "co-log-core" = callPackage
@@ -50789,20 +54318,6 @@ self: {
      }) {};
 
   "co-log-polysemy" = callPackage
-    ({ mkDerivation, base, co-log-core, polysemy }:
-     mkDerivation {
-       pname = "co-log-polysemy";
-       version = "0.0.1.0";
-       sha256 = "1l2ihpi0h704abk1b9nqg1pwch447yhs8g6h29yd4igyy7c6gh9b";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base co-log-core polysemy ];
-       executableHaskellDepends = [ base co-log-core polysemy ];
-       description = "Composable Contravariant Comonadic Logging Library";
-       license = stdenv.lib.licenses.mpl20;
-     }) {};
-
-  "co-log-polysemy_0_0_1_1" = callPackage
     ({ mkDerivation, base, co-log-core, polysemy }:
      mkDerivation {
        pname = "co-log-polysemy";
@@ -50814,7 +54329,6 @@ self: {
        executableHaskellDepends = [ base co-log-core polysemy ];
        description = "Composable Contravariant Comonadic Logging Library";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "co-log-sys" = callPackage
@@ -50835,6 +54349,8 @@ self: {
        ];
        description = "Syslog implementation on top of 'co-log-core'";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "coalpit" = callPackage
@@ -50853,6 +54369,8 @@ self: {
        ];
        description = "Command-line options and DSV parsing and printing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cobot" = callPackage
@@ -50901,6 +54419,8 @@ self: {
        ];
        description = "Biological data file formats and IO";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cobot-tools" = callPackage
@@ -50924,6 +54444,8 @@ self: {
        ];
        description = "Biological data file formats and IO";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {RNA = null;};
 
   "code-builder" = callPackage
@@ -50935,6 +54457,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Simple system for generating code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "code-page" = callPackage
@@ -50969,6 +54493,8 @@ self: {
        ];
        description = "Simple bidirectional serialization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "codec-beam" = callPackage
@@ -50983,6 +54509,8 @@ self: {
        testHaskellDepends = [ base bytestring filepath process text ];
        description = "Erlang VM byte code assembler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "codec-libevent" = callPackage
@@ -51005,6 +54533,8 @@ self: {
        ];
        description = "Cross-platform structure serialisation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "codec-mbox" = callPackage
@@ -51039,6 +54569,8 @@ self: {
        ];
        description = "A library for manipulating RPM files";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "codecov-haskell" = callPackage
@@ -51062,6 +54594,8 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Codecov.io support for Haskell.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "codemonitor" = callPackage
@@ -51080,6 +54614,8 @@ self: {
        ];
        description = "Tool that automatically runs arbitrary commands when files change on disk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "codepad" = callPackage
@@ -51093,6 +54629,8 @@ self: {
        libraryHaskellDepends = [ base curl mtl network tagsoup ];
        description = "Submit and retrieve paste output from CodePad.org.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "codeworld-api" = callPackage
@@ -51119,6 +54657,8 @@ self: {
        ];
        description = "Graphics library for CodeWorld";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "codex" = callPackage
@@ -51146,6 +54686,8 @@ self: {
        ];
        description = "A ctags file generator for cabal project dependencies";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "codo-notation" = callPackage
@@ -51161,6 +54703,8 @@ self: {
        ];
        description = "A notation for comonads, analogous to the do-notation for monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "coerce-role" = callPackage
@@ -51308,6 +54852,8 @@ self: {
        ];
        description = "Simple account manager";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "coinbase-exchange" = callPackage
@@ -51346,6 +54892,8 @@ self: {
        ];
        description = "Connector library for the coinbase exchange";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "coinbase-pro" = callPackage
@@ -51378,6 +54926,8 @@ self: {
        ];
        description = "Client for Coinbase Pro";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "coincident-root-loci" = callPackage
@@ -51396,6 +54946,8 @@ self: {
        ];
        description = "Equivariant CSM classes of coincident root loci";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "colada" = callPackage
@@ -51419,6 +54971,8 @@ self: {
        ];
        description = "Colada implements incremental word class class induction using online LDA";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "colchis" = callPackage
@@ -51436,6 +54990,8 @@ self: {
        ];
        description = "Rudimentary JSON-RPC 2.0 client over raw TCP.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cold-widow" = callPackage
@@ -51468,6 +55024,8 @@ self: {
        ];
        description = "Generate animated 3d objects in COLLADA";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "collada-types" = callPackage
@@ -51501,6 +55059,8 @@ self: {
        ];
        description = "Collapse the duplication output into clones and return their frequencies";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "collapse-util" = callPackage
@@ -51514,6 +55074,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "utility for collapsing adjacent writes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "collection-json" = callPackage
@@ -51536,6 +55098,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Collection+JSON—Hypermedia Type Tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "collections" = callPackage
@@ -51549,6 +55113,8 @@ self: {
        ];
        description = "Useful standard collections types and related functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "collections-api" = callPackage
@@ -51562,6 +55128,8 @@ self: {
        libraryHaskellDepends = [ array base QuickCheck ];
        description = "API for collection data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "collections-base-instances" = callPackage
@@ -51577,6 +55145,8 @@ self: {
        ];
        description = "Useful standard collections types and related functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "colock" = callPackage
@@ -51609,6 +55179,8 @@ self: {
        ];
        description = "Generic types and functions for columnar encoding and decoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "color-counter" = callPackage
@@ -51633,6 +55205,8 @@ self: {
        ];
        description = "Count colors in images";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "colorful-monoids" = callPackage
@@ -51681,6 +55255,8 @@ self: {
        ];
        description = "Colorless | The Programmatic IDL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "colorless-http-client" = callPackage
@@ -51697,6 +55273,8 @@ self: {
        ];
        description = "Http Client addon for Colorless";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "colorless-scotty" = callPackage
@@ -51710,6 +55288,8 @@ self: {
        ];
        description = "Scotty server add-on for Colorless";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "colors" = callPackage
@@ -51768,6 +55348,8 @@ self: {
        libraryHaskellDepends = [ accelerate base ];
        description = "Working with colours in Accelerate";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "colour-space" = callPackage
@@ -51785,6 +55367,8 @@ self: {
        ];
        description = "Instances of the manifold-classes for colour types";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "colourista" = callPackage
@@ -51812,6 +55396,8 @@ self: {
        ];
        description = "A jazzy, minimal web framework for Haskell, inspired by Sinatra";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "columbia" = callPackage
@@ -51832,6 +55418,8 @@ self: {
        doHaddock = false;
        description = "Enhanced serialization using seeking";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "columnar" = callPackage
@@ -51849,6 +55437,8 @@ self: {
        ];
        description = "A CSV toolkit based on cassava and enum-text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "com" = callPackage
@@ -51860,6 +55450,8 @@ self: {
        doHaddock = false;
        description = "Haskell COM support library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "comark" = callPackage
@@ -51938,6 +55530,8 @@ self: {
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Definitions of AST that represents a Commonmark (markdown) document";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "combinat" = callPackage
@@ -51961,6 +55555,8 @@ self: {
        ];
        description = "Generate and manipulate various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "combinat-compat" = callPackage
@@ -51996,6 +55592,8 @@ self: {
        ];
        description = "Graphical representations for various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "combinator-interactive" = callPackage
@@ -52017,6 +55615,8 @@ self: {
        ];
        description = "SKI Combinator interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "combinatorial" = callPackage
@@ -52050,6 +55650,8 @@ self: {
        ];
        description = "A number of data structures to represent and allow the manipulation of standard combinatorial problems, used as test problems in computer science";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "combinatorics" = callPackage
@@ -52076,6 +55678,8 @@ self: {
        ];
        description = "Various buffer implementations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "comfort-array" = callPackage
@@ -52132,6 +55736,8 @@ self: {
        ];
        description = "A format for describing comics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "comma" = callPackage
@@ -52187,6 +55793,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "pattern matching against string based commands";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "commander-cli" = callPackage
@@ -52224,6 +55832,8 @@ self: {
        ];
        description = "Library for working with commoditized amounts and price histories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "commsec" = callPackage
@@ -52239,6 +55849,8 @@ self: {
        ];
        description = "Provide communications security using symmetric ephemeral keys";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "commsec-keyexchange" = callPackage
@@ -52257,6 +55869,8 @@ self: {
        ];
        description = "Key agreement for commsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "commutative" = callPackage
@@ -52359,6 +55973,8 @@ self: {
        testHaskellDepends = [ base directory ];
        description = "Non-GC'd, contiguous storage for immutable data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compact-list" = callPackage
@@ -52384,6 +56000,8 @@ self: {
        ];
        description = "Compact Data.Map implementation using Data.Binary";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compact-mutable" = callPackage
@@ -52403,6 +56021,8 @@ self: {
        ];
        description = "Mutable arrays living on the compact heap";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compact-mutable-vector" = callPackage
@@ -52416,6 +56036,8 @@ self: {
        testHaskellDepends = [ base compact hspec ];
        description = "Mutable vector with different GC characteristics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compact-socket" = callPackage
@@ -52432,6 +56054,8 @@ self: {
        ];
        description = "Socket functions for compact normal form";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compact-string" = callPackage
@@ -52445,6 +56069,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Fast, packed and strict strings with Unicode support, based on bytestrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compact-string-fix" = callPackage
@@ -52458,6 +56084,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Same as compact-string except with a small fix so it builds on ghc-6.12";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compact-word-vectors" = callPackage
@@ -52485,6 +56113,8 @@ self: {
        libraryHaskellDepends = [ base containers transformers vector ];
        description = "A typeclass for structures which can be catMaybed, filtered, and partitioned";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compactmap" = callPackage
@@ -52535,6 +56165,8 @@ self: {
        ];
        description = "Compositional Data Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compdata-automata" = callPackage
@@ -52550,6 +56182,8 @@ self: {
        ];
        description = "Tree automata on Compositional Data Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compdata-dags" = callPackage
@@ -52571,6 +56205,8 @@ self: {
        ];
        description = "Compositional Data Types on DAGs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compdata-fixplate" = callPackage
@@ -52606,6 +56242,8 @@ self: {
        ];
        description = "Parametric Compositional Data Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compendium-client" = callPackage
@@ -52614,8 +56252,8 @@ self: {
      }:
      mkDerivation {
        pname = "compendium-client";
-       version = "0.1.0.1";
-       sha256 = "09j71sjqpzhmzkmr1439qqwc8nizgc5ag7fmbd8z51wnkmw1wmky";
+       version = "0.2.0.0";
+       sha256 = "1jsl2li88wvw61r38gcwdn7y6gf7q6br50i4mfnh40mzq1qqgkm0";
        libraryHaskellDepends = [
          aeson base http-client language-protobuf megaparsec servant
          servant-client text
@@ -52656,6 +56294,8 @@ self: {
        libraryHaskellDepends = [ base filepath parsec ];
        description = "Helpers and runners for code competitions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compilation" = callPackage
@@ -52667,6 +56307,8 @@ self: {
        libraryHaskellDepends = [ base MissingH ];
        description = "Haskell functionality for quickly assembling simple compilers";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compiler-warnings" = callPackage
@@ -52723,6 +56365,8 @@ self: {
        ];
        description = "Empirical algorithmic complexity";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "componentm" = callPackage
@@ -52810,6 +56454,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Composable monad transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "composite-aeson" = callPackage
@@ -52837,6 +56483,8 @@ self: {
        ];
        description = "JSON for Vinyl/Frames records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "composite-aeson-refined" = callPackage
@@ -52852,6 +56500,8 @@ self: {
        ];
        description = "composite-aeson support for Refined from the refined package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "composite-base" = callPackage
@@ -52874,6 +56524,8 @@ self: {
        ];
        description = "Shared utilities for composite-* packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "composite-ekg" = callPackage
@@ -52888,6 +56540,8 @@ self: {
        ];
        description = "EKG Metrics for Vinyl/Frames records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "composite-opaleye" = callPackage
@@ -52910,6 +56564,8 @@ self: {
        ];
        description = "Opaleye SQL for Frames records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "composite-swagger" = callPackage
@@ -52931,6 +56587,8 @@ self: {
        ];
        description = "Swagger for Vinyl/Frames records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "composition" = callPackage
@@ -52975,6 +56633,8 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Composition trees for arbitrary monoids";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compositional-data" = callPackage
@@ -53008,6 +56668,8 @@ self: {
        benchmarkHaskellDepends = [ base-prelude ];
        description = "Sum and Product types and such";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "comprehensions-ghc" = callPackage
@@ -53022,6 +56684,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Plugin to generalize comprehensions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compressed" = callPackage
@@ -53041,6 +56705,8 @@ self: {
        ];
        description = "Compressed containers and reducers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "compression" = callPackage
@@ -53068,6 +56734,8 @@ self: {
        ];
        description = "Strategy combinators for compositional data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "comptrans" = callPackage
@@ -53085,6 +56753,8 @@ self: {
        ];
        description = "Automatically converting ASTs into compositional data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "computational-algebra" = callPackage
@@ -53136,6 +56806,8 @@ self: {
        ];
        description = "Well-kinded computational algebra library, currently supporting Groebner basis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "computational-geometry" = callPackage
@@ -53152,6 +56824,8 @@ self: {
        ];
        description = "Collection of algorithms in Computational Geometry";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "computations" = callPackage
@@ -53163,6 +56837,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Advanced notions of computation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "concatenative" = callPackage
@@ -53240,6 +56916,8 @@ self: {
        ];
        description = "Morphological disambiguation based on constrained CRFs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "concraft-hr" = callPackage
@@ -53261,6 +56939,8 @@ self: {
        executableHaskellDepends = [ cmdargs ];
        description = "Part-of-speech tagger for Croatian";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "concraft-pl" = callPackage
@@ -53289,6 +56969,8 @@ self: {
        ];
        description = "Morphological tagger for Polish";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "concrete-haskell" = callPackage
@@ -53332,6 +57014,8 @@ self: {
        ];
        description = "Library for the Concrete data format";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "concrete-haskell-autogen" = callPackage
@@ -53348,6 +57032,8 @@ self: {
        ];
        description = "Automatically generated Thrift definitions for the Concrete data format";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "concrete-relaxng-parser" = callPackage
@@ -53367,6 +57053,8 @@ self: {
        ];
        description = "A parser driven by a standard RELAX NG schema with concrete syntax extensions";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "concrete-typerep" = callPackage
@@ -53386,6 +57074,8 @@ self: {
        ];
        description = "Binary and Hashable instances for TypeRep";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "concur-core" = callPackage
@@ -53497,6 +57187,8 @@ self: {
        benchmarkHaskellDepends = [ bug criterion rerebase ];
        description = "Concurrent expanding buffer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "concurrent-dns-cache" = callPackage
@@ -53585,6 +57277,8 @@ self: {
        benchmarkHaskellDepends = [ base machines time ];
        description = "Concurrent networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "concurrent-output" = callPackage
@@ -53658,6 +57352,8 @@ self: {
        libraryHaskellDepends = [ base exceptions mtl stm transformers ];
        description = "MTL-like library using TVars";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "concurrent-supply" = callPackage
@@ -53685,6 +57381,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "More utilities and broad-used datastructures for concurrency";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "concurrentoutput" = callPackage
@@ -53728,6 +57426,8 @@ self: {
        ];
        description = "Information retrieval library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "condorcet" = callPackage
@@ -53739,6 +57439,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Library for Condorcet voting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conductive-base" = callPackage
@@ -53750,6 +57452,8 @@ self: {
        libraryHaskellDepends = [ array base containers random stm time ];
        description = "a library for live coding and real-time musical applications";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conductive-clock" = callPackage
@@ -53777,6 +57481,8 @@ self: {
        ];
        description = "a library with examples of using Conductive with hsc3";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conductive-song" = callPackage
@@ -53788,6 +57494,8 @@ self: {
        libraryHaskellDepends = [ base conductive-base random ];
        description = "a library of functions which are useful for composing music";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conduino" = callPackage
@@ -53926,6 +57634,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "conduit-audio interface to the LAME MP3 library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {mp3lame = null;};
 
   "conduit-audio-samplerate" = callPackage
@@ -53945,6 +57655,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "conduit-audio interface to the libsamplerate resampling library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {samplerate = null;};
 
   "conduit-audio-sndfile" = callPackage
@@ -54104,6 +57816,8 @@ self: {
        ];
        description = "A file-finding conduit that allows user control over traversals";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conduit-iconv" = callPackage
@@ -54124,6 +57838,8 @@ self: {
        ];
        description = "Conduit for character encoding conversion";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conduit-merge" = callPackage
@@ -54150,6 +57866,8 @@ self: {
        ];
        description = "A base layer for network protocols using Conduits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conduit-parse" = callPackage
@@ -54188,6 +57906,8 @@ self: {
        ];
        description = "Allows conduit to resume sinks to feed multiple sources into it";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conduit-throttle" = callPackage
@@ -54211,6 +57931,8 @@ self: {
        ];
        description = "Throttle Conduit Producers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conduit-tokenize-attoparsec" = callPackage
@@ -54230,6 +57952,8 @@ self: {
        testHaskellDepends = [ attoparsec base conduit hspec resourcet ];
        description = "Conduits for tokenizing streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conduit-vfs" = callPackage
@@ -54254,6 +57978,8 @@ self: {
        ];
        description = "Virtual file system for Conduit; disk, pure, and in-memory impls";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conduit-vfs-zip" = callPackage
@@ -54280,6 +58006,8 @@ self: {
        ];
        description = "Zip archive interface for the Conduit Virtual File System";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conduit-zstd" = callPackage
@@ -54314,6 +58042,8 @@ self: {
        ];
        description = "Parser for Haskell-based configuration files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conf-json" = callPackage
@@ -54365,6 +58095,8 @@ self: {
          text transformers
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conferer" = callPackage
@@ -54519,6 +58251,8 @@ self: {
        ];
        description = "A simple config file swapping tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conffmt" = callPackage
@@ -54536,6 +58270,8 @@ self: {
        ];
        description = "A .conf file formatter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "confide" = callPackage
@@ -54550,6 +58286,8 @@ self: {
        testHaskellDepends = [ base deiko-config tasty tasty-hunit text ];
        description = "derive typeclass instances for decoding types from HOCON conf";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "config-ini" = callPackage
@@ -54603,6 +58341,8 @@ self: {
        testHaskellDepends = [ base extra hspec lens parsec text ];
        description = "Parse config files using parsec and generate parse errors on unhandled keys";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "config-schema" = callPackage
@@ -54635,6 +58375,8 @@ self: {
        ];
        description = "A small program for swapping out dot files";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "config-value" = callPackage
@@ -54689,6 +58431,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "parser for config files, shell variables, command line args";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "configuration" = callPackage
@@ -54700,6 +58444,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Simple data type for application configuration";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "configuration-tools" = callPackage
@@ -54737,6 +58483,8 @@ self: {
        ];
        description = "Tools for specifying and parsing configurations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "configurator" = callPackage
@@ -54799,6 +58547,8 @@ self: {
        ];
        description = "The next generation of configuration management";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "configurator-pg" = callPackage
@@ -54819,6 +58569,8 @@ self: {
        ];
        description = "Reduced parser for configurator-ng config files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "confsolve" = callPackage
@@ -54837,6 +58589,8 @@ self: {
        ];
        description = "A command line tool for resolving conflicts of file synchronizers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "congruence-relation" = callPackage
@@ -54848,6 +58602,8 @@ self: {
        libraryHaskellDepends = [ array base containers ];
        description = "Decidable congruence relations for Haskell: up to you whether this is a joke";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conjugateGradient" = callPackage
@@ -54879,6 +58635,8 @@ self: {
        ];
        description = "A BitTorrent client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conkin" = callPackage
@@ -54896,6 +58654,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Tools for functors from Hask^k to Hask";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conlogger" = callPackage
@@ -54910,6 +58670,8 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "A logger for a concurrent program";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "connection" = callPackage
@@ -54962,6 +58724,8 @@ self: {
        testHaskellDepends = [ base doctest text ];
        description = "A library for parsing connection strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "connections" = callPackage
@@ -54978,6 +58742,8 @@ self: {
        testHaskellDepends = [ base hedgehog lawz rings ];
        description = "Partial orders, Galois connections, and lattices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "consistent" = callPackage
@@ -54995,6 +58761,8 @@ self: {
        testHaskellDepends = [ base lifted-async transformers ];
        description = "Eventually consistent STM transactions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "console-program" = callPackage
@@ -55012,6 +58780,8 @@ self: {
        ];
        description = "Interpret the command line and a config file as commands and options";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "console-prompt" = callPackage
@@ -55046,6 +58816,8 @@ self: {
        testHaskellDepends = [ base directory process ];
        description = "Compiler plugin for constant math elimination";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "constaparser" = callPackage
@@ -55068,6 +58840,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Equality by only Constructor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "constrained" = callPackage
@@ -55096,6 +58870,8 @@ self: {
        ];
        description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "constrained-category" = callPackage
@@ -55115,6 +58891,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Constrained Categories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "constrained-dynamic" = callPackage
@@ -55127,6 +58905,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Dynamic typing with retained constraints";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "constrained-monads" = callPackage
@@ -55150,6 +58930,8 @@ self: {
        ];
        description = "Typeclasses and instances for monads with constraints";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "constrained-normal" = callPackage
@@ -55211,6 +58993,8 @@ self: {
        libraryHaskellDepends = [ base indextype ];
        description = "Some conviencience type functions for manipulating constraints";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "constraint-reflection" = callPackage
@@ -55307,6 +59091,8 @@ self: {
        testHaskellDepends = [ base constraints hspec transformers ];
        description = "Defer instance lookups until runtime";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "constraints-extras" = callPackage
@@ -55373,6 +59159,8 @@ self: {
        ];
        description = "Exact computation with constructible real numbers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "constructive-algebra" = callPackage
@@ -55384,6 +59172,8 @@ self: {
        libraryHaskellDepends = [ base QuickCheck type-level ];
        description = "A library of constructive algebra";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "consul-haskell" = callPackage
@@ -55408,6 +59198,8 @@ self: {
        ];
        description = "A consul client for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "consumers" = callPackage
@@ -55434,6 +59226,8 @@ self: {
        ];
        description = "Concurrent PostgreSQL data consumers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "container" = callPackage
@@ -55447,6 +59241,8 @@ self: {
        ];
        description = "Containers abstraction and utilities";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "container-builder" = callPackage
@@ -55512,6 +59308,8 @@ self: {
        ];
        description = "Extensive benchmark suite for containers package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "containers-deepseq" = callPackage
@@ -55534,6 +59332,8 @@ self: {
        libraryHaskellDepends = [ base base-unicode-symbols containers ];
        description = "Unicode alternatives for common functions and operators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "containers-verified" = callPackage
@@ -55545,6 +59345,8 @@ self: {
        libraryHaskellDepends = [ containers ];
        description = "Formally verified drop-in replacement of containers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "content-store" = callPackage
@@ -55569,6 +59371,8 @@ self: {
        ];
        description = "Store and retrieve data from an on-disk store";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "context-free-art" = callPackage
@@ -55615,6 +59419,8 @@ self: {
        ];
        description = "Basic algorithms on context-free grammars";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "context-stack" = callPackage
@@ -55628,6 +59434,8 @@ self: {
        ];
        description = "An abstraction of a stack and stack-based monadic context";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "contiguous" = callPackage
@@ -55662,6 +59470,8 @@ self: {
        libraryHaskellDepends = [ base contiguous primitive ];
        description = "contiguous with bounds checks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "contiguous-fft" = callPackage
@@ -55689,6 +59499,8 @@ self: {
        ];
        description = "Monads with suspension and arbitrary-spot reentry";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "continued-fraction" = callPackage
@@ -55735,6 +59547,8 @@ self: {
          base bytestring cereal containers mtl nanomsg-haskell time
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "continuum-client" = callPackage
@@ -55749,6 +59563,8 @@ self: {
          base bytestring cereal containers mtl nanomsg-haskell time
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "contravariant" = callPackage
@@ -55789,6 +59605,8 @@ self: {
        ];
        description = "Class of monad transformers which control operations can be lifted thru";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "control-bool" = callPackage
@@ -55856,6 +59674,8 @@ self: {
        ];
        description = "A typeclass for type isomorphisms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "control-monad-attempt" = callPackage
@@ -55867,6 +59687,8 @@ self: {
        libraryHaskellDepends = [ attempt base transformers ];
        description = "Monad transformer for attempt. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "control-monad-exception" = callPackage
@@ -55883,6 +59705,8 @@ self: {
        ];
        description = "Explicitly typed, checked exceptions with stack traces";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "control-monad-exception-monadsfd" = callPackage
@@ -55898,6 +59722,8 @@ self: {
        ];
        description = "Monads-fd instances for the EMT exceptions monad transformer";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "control-monad-exception-monadstf" = callPackage
@@ -55913,6 +59739,8 @@ self: {
        ];
        description = "Monads-tf instances for the EMT exceptions monad transformer";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "control-monad-exception-mtl" = callPackage
@@ -55925,6 +59753,8 @@ self: {
        doHaddock = false;
        description = "MTL instances for the EMT exceptions monad transformer";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "control-monad-failure" = callPackage
@@ -55936,6 +59766,8 @@ self: {
        libraryHaskellDepends = [ base failure transformers ];
        description = "A class for monads which can fail with an error. (deprecated)";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "control-monad-failure-mtl" = callPackage
@@ -55947,6 +59779,8 @@ self: {
        libraryHaskellDepends = [ base failure mtl ];
        description = "A class for monads which can fail with an error for mtl 1 (deprecated)";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "control-monad-free_0_5_3" = callPackage
@@ -56036,6 +59870,8 @@ self: {
        libraryHaskellDepends = [ base contstuff monads-tf ];
        description = "ContStuff instances for monads-tf transformers (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "contstuff-transformers" = callPackage
@@ -56047,6 +59883,8 @@ self: {
        libraryHaskellDepends = [ base contstuff transformers ];
        description = "Deprecated interface between contstuff 0.7.0 and the transformers package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "converge" = callPackage
@@ -56125,6 +59963,8 @@ self: {
        ];
        description = "Safe and unsafe data conversion utilities with strong type-level operation. checking.";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "convert-annotation" = callPackage
@@ -56148,6 +59988,8 @@ self: {
        ];
        description = "Convert the annotation of a gene to another in a delimited file using a variety of different databases";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "convertible" = callPackage
@@ -56181,6 +60023,8 @@ self: {
        ];
        description = "convertible instances for ascii";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "convertible-text" = callPackage
@@ -56201,6 +60045,8 @@ self: {
        ];
        description = "Typeclasses and instances for converting between types (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cookbook" = callPackage
@@ -56257,6 +60103,8 @@ self: {
        testHaskellDepends = [ base HUnit lens ];
        description = "A representation of latitude and longitude";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "copilot" = callPackage
@@ -56277,6 +60125,8 @@ self: {
        executableHaskellDepends = [ base copilot-c99 copilot-libraries ];
        description = "A stream DSL for writing embedded C programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "copilot-c99" = callPackage
@@ -56310,6 +60160,8 @@ self: {
        ];
        description = "Copilot interface to a C model-checker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "copilot-core" = callPackage
@@ -56337,6 +60189,8 @@ self: {
        ];
        description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "copilot-libraries" = callPackage
@@ -56352,6 +60206,8 @@ self: {
        ];
        description = "Libraries for the Copilot language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "copilot-sbv" = callPackage
@@ -56367,6 +60223,8 @@ self: {
        ];
        description = "A compiler for CoPilot targeting SBV";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "copilot-theorem" = callPackage
@@ -56384,6 +60242,8 @@ self: {
        ];
        description = "k-induction for Copilot";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "copr" = callPackage
@@ -56403,6 +60263,8 @@ self: {
        testHaskellDepends = [ base hlint ];
        description = "Haskell interface to the Fedora Copr system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "core" = callPackage
@@ -56414,6 +60276,8 @@ self: {
        libraryHaskellDepends = [ base bytestring parsec pretty ];
        description = "External core parser and pretty printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "core-compiler" = callPackage
@@ -56466,6 +60330,8 @@ self: {
        ];
        description = "A subset of Haskell using in UCC for teaching purpose";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "core-program" = callPackage
@@ -56530,6 +60396,8 @@ self: {
        ];
        description = "A bliki written using yesod. Uses pandoc to process files stored in git.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "corecursive-main" = callPackage
@@ -56597,6 +60465,8 @@ self: {
        libraryHaskellDepends = [ base enumerator monad-coroutine ];
        description = "Bridge between the monad-coroutine and enumerator packages";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "coroutine-iteratee" = callPackage
@@ -56608,6 +60478,8 @@ self: {
        libraryHaskellDepends = [ base iteratee monad-coroutine ];
        description = "Bridge between the monad-coroutine and iteratee packages";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "coroutine-object" = callPackage
@@ -56619,6 +60491,8 @@ self: {
        libraryHaskellDepends = [ base either free mtl transformers ];
        description = "Object-oriented programming realization using coroutine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "couch-hs" = callPackage
@@ -56637,6 +60511,8 @@ self: {
        ];
        description = "A CouchDB view server for Haskell";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "couch-simple" = callPackage
@@ -56663,6 +60539,8 @@ self: {
        testToolDepends = [ couchdb ];
        description = "A modern, lightweight, complete client for CouchDB";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) couchdb;};
 
   "couchdb-conduit" = callPackage
@@ -56692,6 +60570,8 @@ self: {
        ];
        description = "Couch DB client library using http-conduit and aeson";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "couchdb-enumerator" = callPackage
@@ -56719,6 +60599,8 @@ self: {
        ];
        description = "Couch DB client library using http-enumerator and aeson";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "count" = callPackage
@@ -56762,6 +60644,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck text ];
        description = "Countable Text Inflections";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "counter" = callPackage
@@ -56773,6 +60657,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "An object frequency counter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "country" = callPackage
@@ -56809,6 +60695,8 @@ self: {
        testHaskellDepends = [ aeson base HTF HUnit ];
        description = "ISO 3166 country codes and i18n names";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "courier" = callPackage
@@ -56833,6 +60721,8 @@ self: {
        ];
        description = "A message-passing library for simplifying network applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "court" = callPackage
@@ -56852,6 +60742,8 @@ self: {
        ];
        description = "Simple and flexible CI system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "coverage" = callPackage
@@ -56864,6 +60756,8 @@ self: {
        testHaskellDepends = [ base hspec HUnit QuickCheck ];
        description = "Exhaustivity Checking Library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "coya" = callPackage
@@ -56877,6 +60771,8 @@ self: {
        ];
        description = "Coya monoids";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cparsing" = callPackage
@@ -56893,6 +60789,8 @@ self: {
        ];
        description = "A simple C++ parser with preprocessor features. C++ refactorings included.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cpio-conduit" = callPackage
@@ -56912,6 +60810,8 @@ self: {
        ];
        description = "Conduit-based CPIO";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cpkg" = callPackage
@@ -56976,6 +60876,8 @@ self: {
        testHaskellDepends = [ base process QuickCheck ];
        description = "C++ Foreign Import Generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cppfilt" = callPackage
@@ -57060,6 +60962,8 @@ self: {
        ];
        description = "Run random effect using cprng-aes, a crypto pseudo number generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cpsa" = callPackage
@@ -57125,6 +61029,8 @@ self: {
        executableHaskellDepends = [ base mtl process ];
        description = "Modify the cpu frequency on OpenBSD systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cpython" = callPackage
@@ -57138,6 +61044,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings for libpython";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {python34 = null;};
 
   "cql" = callPackage
@@ -57187,6 +61095,8 @@ self: {
        doHaddock = false;
        description = "Cassandra CQL client";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cql-io-tinylog" = callPackage
@@ -57198,6 +61108,8 @@ self: {
        libraryHaskellDepends = [ base bytestring cql-io tinylog ];
        description = "Tinylog integration for cql-io";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cqrs" = callPackage
@@ -57226,6 +61138,8 @@ self: {
        ];
        description = "Command-Query Responsibility Segregation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cqrs-example" = callPackage
@@ -57247,6 +61161,8 @@ self: {
        ];
        description = "Example for cqrs package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cqrs-memory" = callPackage
@@ -57263,6 +61179,8 @@ self: {
        testHaskellDepends = [ base cqrs-core cqrs-testkit hspec random ];
        description = "Memory backend for the cqrs package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cqrs-postgresql" = callPackage
@@ -57286,6 +61204,8 @@ self: {
        ];
        description = "PostgreSQL backend for the cqrs package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cqrs-sqlite3" = callPackage
@@ -57306,6 +61226,8 @@ self: {
        ];
        description = "SQLite3 backend for the cqrs package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cqrs-test" = callPackage
@@ -57322,6 +61244,8 @@ self: {
        ];
        description = "Command-Query Responsibility Segregation Test Support";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cqrs-testkit" = callPackage
@@ -57339,6 +61263,8 @@ self: {
        ];
        description = "Command-Query Responsibility Segregation Test Support";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cqrs-types" = callPackage
@@ -57369,6 +61295,8 @@ self: {
        ];
        description = "Code review tool";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crack" = callPackage
@@ -57381,6 +61309,8 @@ self: {
        librarySystemDepends = [ crack ];
        description = "A haskell binding to cracklib";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {crack = null;};
 
   "crackNum" = callPackage
@@ -57426,6 +61356,8 @@ self: {
        ];
        description = "A UNIX configuration management library in Haskell";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "craftwerk" = callPackage
@@ -57439,6 +61371,8 @@ self: {
        libraryHaskellDepends = [ base colour mtl vector-space ];
        description = "2D graphics library with integrated TikZ output";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "craftwerk-cairo" = callPackage
@@ -57450,6 +61384,8 @@ self: {
        libraryHaskellDepends = [ base cairo craftwerk mtl ];
        description = "Cairo backend for Craftwerk";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "craftwerk-gtk" = callPackage
@@ -57467,6 +61403,8 @@ self: {
        ];
        description = "Gtk UI for Craftwerk";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crawlchain" = callPackage
@@ -57487,6 +61425,8 @@ self: {
        ];
        description = "Simulation user crawl paths";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "craze" = callPackage
@@ -57519,6 +61459,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "HTTP Racing Library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crc" = callPackage
@@ -57536,6 +61478,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Implements various Cyclic Redundancy Checks (CRC)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crc16" = callPackage
@@ -57547,6 +61491,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Calculate the crc16-ccitt";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crc16-table" = callPackage
@@ -57591,6 +61537,8 @@ self: {
        ];
        description = "Conflict-free replicated data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "creatur" = callPackage
@@ -57616,6 +61564,8 @@ self: {
        ];
        description = "Framework for artificial life experiments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "credential-store" = callPackage
@@ -57635,6 +61585,8 @@ self: {
        testHaskellDepends = [ base bytestring tasty tasty-hunit ];
        description = "Library to access secure credential storage providers";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "credentials" = callPackage
@@ -57698,6 +61650,8 @@ self: {
        ];
        description = "First-order, linear-chain conditional random fields";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crf-chain1-constrained" = callPackage
@@ -57717,6 +61671,8 @@ self: {
        ];
        description = "First-order, constrained, linear-chain conditional random fields";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crf-chain2-generic" = callPackage
@@ -57734,6 +61690,8 @@ self: {
        ];
        description = "Second-order, generic, constrained, linear conditional random fields";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crf-chain2-tiers" = callPackage
@@ -57752,6 +61710,8 @@ self: {
        ];
        description = "Second-order, tiered, constrained, linear conditional random fields";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "critbit" = callPackage
@@ -57780,46 +61740,11 @@ self: {
        ];
        description = "Crit-bit maps and sets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "criterion" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat
-     , base-compat-batteries, binary, binary-orphans, bytestring
-     , cassava, code-page, containers, criterion-measurement, deepseq
-     , directory, exceptions, filepath, Glob, HUnit, js-flot, js-jquery
-     , microstache, mtl, mwc-random, optparse-applicative, parsec
-     , QuickCheck, statistics, tasty, tasty-hunit, tasty-quickcheck
-     , text, time, transformers, transformers-compat, vector
-     , vector-algorithms
-     }:
-     mkDerivation {
-       pname = "criterion";
-       version = "1.5.6.1";
-       sha256 = "0m2k323r00q3x5fk8gfcd2y39kmj35nzb8fwqmxjlg7kiz3nkyx5";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson ansi-wl-pprint base base-compat-batteries binary
-         binary-orphans bytestring cassava code-page containers
-         criterion-measurement deepseq directory exceptions filepath Glob
-         js-flot js-jquery microstache mtl mwc-random optparse-applicative
-         parsec statistics text time transformers transformers-compat vector
-         vector-algorithms
-       ];
-       executableHaskellDepends = [
-         base base-compat-batteries optparse-applicative
-       ];
-       testHaskellDepends = [
-         aeson base base-compat base-compat-batteries bytestring deepseq
-         directory HUnit QuickCheck statistics tasty tasty-hunit
-         tasty-quickcheck vector
-       ];
-       description = "Robust, reliable performance measurement and analysis";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "criterion_1_5_6_2" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat
      , base-compat-batteries, binary, binary-orphans, bytestring
      , cassava, code-page, containers, criterion-measurement, deepseq
@@ -57854,7 +61779,6 @@ self: {
        ];
        description = "Robust, reliable performance measurement and analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "criterion-compare" = callPackage
@@ -57874,6 +61798,8 @@ self: {
        ];
        description = "A simple tool for visualising differences in Criterion benchmark results";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "criterion-measurement" = callPackage
@@ -57916,6 +61842,8 @@ self: {
        ];
        description = "Enhancement of the \"criterion\" benchmarking library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "criterion-to-html" = callPackage
@@ -57934,6 +61862,8 @@ self: {
        ];
        description = "Convert criterion output to HTML reports";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "criu-rpc" = callPackage
@@ -57950,6 +61880,8 @@ self: {
        ];
        description = "CRIU RPC client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "criu-rpc-types" = callPackage
@@ -57963,6 +61895,8 @@ self: {
        libraryPkgconfigDepends = [ protobuf ];
        description = "Criu RPC protocol buffer types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) protobuf;};
 
   "crjdt-haskell" = callPackage
@@ -57978,6 +61912,8 @@ self: {
        testHaskellDepends = [ base containers hedgehog hspec mtl ];
        description = "A Conflict-Free Replicated JSON Datatype for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crockford" = callPackage
@@ -57989,6 +61925,8 @@ self: {
        libraryHaskellDepends = [ base digits QuickCheck safe ];
        description = "An implementation of Douglas Crockford's base32 encoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crocodile" = callPackage
@@ -58007,6 +61945,8 @@ self: {
        ];
        description = "An offline renderer supporting ray tracing and photon mapping";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cron" = callPackage
@@ -58050,6 +61990,8 @@ self: {
        ];
        description = "Cron datatypes and Attoparsec parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cruncher-types" = callPackage
@@ -58062,6 +62004,8 @@ self: {
        testHaskellDepends = [ base hlint ];
        description = "Request and Response types for Eval.so's API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crunghc" = callPackage
@@ -58080,6 +62024,8 @@ self: {
        ];
        description = "A runghc replacement with transparent caching";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crypt-sha512" = callPackage
@@ -58153,6 +62099,8 @@ self: {
        ];
        description = "Generic cryptography cipher benchmarks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crypto-cipher-tests" = callPackage
@@ -58226,6 +62174,8 @@ self: {
        ];
        description = "Conduit interface for cryptographic operations (from crypto-api)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crypto-enigma" = callPackage
@@ -58278,6 +62228,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        description = "Multihash library on top of cryptonite crypto library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crypto-numbers" = callPackage
@@ -58350,6 +62302,8 @@ self: {
        ];
        description = "OpenSSH keys decoder/encoder";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crypto-pubkey-types" = callPackage
@@ -58403,6 +62357,8 @@ self: {
        ];
        description = "A random effect using crypto-random";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crypto-rng" = callPackage
@@ -58419,6 +62375,8 @@ self: {
        ];
        description = "Cryptographic random number generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crypto-simple" = callPackage
@@ -58433,6 +62391,8 @@ self: {
        ];
        description = "A simple high level encryption interface based on cryptonite";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crypto-totp" = callPackage
@@ -58464,6 +62424,8 @@ self: {
        ];
        description = "Symmetrical block and stream ciphers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cryptocompare" = callPackage
@@ -58482,6 +62444,8 @@ self: {
        testHaskellDepends = [ base hspec hspec-expectations MissingH ];
        description = "Haskell wrapper for the cryptocompare API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cryptoconditions" = callPackage
@@ -58505,6 +62469,8 @@ self: {
        ];
        description = "Interledger Crypto-Conditions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cryptohash" = callPackage
@@ -58722,6 +62688,8 @@ self: {
        ];
        description = "Cryptol: The Language of Cryptography";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cryptonite" = callPackage
@@ -58827,6 +62795,8 @@ self: {
        ];
        description = "Bindings for Cryptsy cryptocurrency exchange API";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "crystalfontz" = callPackage
@@ -58838,6 +62808,8 @@ self: {
        libraryHaskellDepends = [ base crc16-table MaybeT serialport ];
        description = "Control Crystalfontz LCD displays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "csa" = callPackage
@@ -58865,6 +62837,8 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        description = "Compiler plugin for common subexpression elimination";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "csg" = callPackage
@@ -58896,6 +62870,8 @@ self: {
        ];
        description = "Analytical CSG (Constructive Solid Geometry) library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "csound-catalog" = callPackage
@@ -59022,6 +62998,8 @@ self: {
        ];
        description = "A command line type checker for CSPM files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cspretty" = callPackage
@@ -59033,6 +63011,8 @@ self: {
        libraryHaskellDepends = [ base containers pretty ];
        description = "AST and pretty printer for CSPm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "css" = callPackage
@@ -59044,6 +63024,8 @@ self: {
        libraryHaskellDepends = [ base mtl text ];
        description = "Minimal monadic CSS DSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "css-syntax" = callPackage
@@ -59065,6 +63047,8 @@ self: {
        ];
        description = "High-performance CSS tokenizer and serializer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "css-text" = callPackage
@@ -59131,6 +63115,8 @@ self: {
        ];
        description = "A flexible, fast, enumerator-based CSV parser library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "csv-nptools" = callPackage
@@ -59148,6 +63134,8 @@ self: {
        ];
        description = "A collection of CSV tools";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "csv-table" = callPackage
@@ -59192,6 +63180,8 @@ self: {
        librarySystemDepends = [ ctemplate ];
        description = "Binding to the Google ctemplate library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {ctemplate = null;};
 
   "ctkl" = callPackage
@@ -59203,6 +63193,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "packaging of Manuel Chakravarty's CTK Light for Hackage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ctpl" = callPackage
@@ -59219,6 +63211,8 @@ self: {
        executableHaskellDepends = [ array base chatty-text chatty-utils ];
        description = "A programming language for text modification";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ctrie" = callPackage
@@ -59259,6 +63253,8 @@ self: {
        ];
        description = "Cubic DSL for 3D printing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cubical" = callPackage
@@ -59337,6 +63333,8 @@ self: {
        executableHaskellDepends = [ base GLUT Yampa ];
        description = "3D Yampa/GLUT Puzzle Game";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cuckoo" = callPackage
@@ -59358,6 +63356,8 @@ self: {
        doHaddock = false;
        description = "Haskell Implementation of Cuckoo Filters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cuckoo-filter" = callPackage
@@ -59419,6 +63419,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to the CUDD binary decision diagrams library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {cudd = null;};
 
   "cue-sheet" = callPackage
@@ -59590,6 +63592,8 @@ self: {
        testHaskellDepends = [ aeson base bson hspec QuickCheck ];
        description = "ISO-4217 Currency Codes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "currency-convert" = callPackage
@@ -59605,6 +63609,8 @@ self: {
        ];
        description = "Typesafe currency conversion";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "current-locale" = callPackage
@@ -59673,6 +63679,8 @@ self: {
        testHaskellDepends = [ base Cabal curry-base filepath ];
        description = "Compile the functional logic language Curry to several intermediate formats";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "curryer" = callPackage
@@ -59723,6 +63731,8 @@ self: {
        ];
        description = "Terminal tool for viewing tabular data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cursor" = callPackage
@@ -59790,6 +63800,8 @@ self: {
          base criterion cursor-fuzzy-time genvalidity-criterion QuickCheck
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cursor-gen" = callPackage
@@ -59833,6 +63845,8 @@ self: {
        ];
        description = "Fast implementations of the curve25519 elliptic curve primitives";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "curves" = callPackage
@@ -59849,6 +63863,8 @@ self: {
        ];
        description = "Library for drawing curve based images";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cusolver" = callPackage
@@ -59894,6 +63910,8 @@ self: {
        libraryHaskellDepends = [ base basic-prelude monad-loops ];
        description = "An enhanced prelude, serving as a foundation for my projects";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cut-the-crap" = callPackage
@@ -60008,6 +64026,8 @@ self: {
        ];
        description = "Haskell bindings for the neo4j \"cypher\" query language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "czipwith" = callPackage
@@ -60050,6 +64070,8 @@ self: {
        ];
        description = "Permissively licensed D-Bus client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "d10" = callPackage
@@ -60062,6 +64084,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Digits 0-9";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "d3d11binding" = callPackage
@@ -60094,6 +64118,8 @@ self: {
        libraryHaskellDepends = [ base mtl random text ];
        description = "Declarative visualization on a web browser with DSL approach";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "daemonize-doublefork" = callPackage
@@ -60150,6 +64176,8 @@ self: {
        ];
        description = "Compile-time, type-safe directed acyclic graphs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "damnpacket" = callPackage
@@ -60168,6 +64196,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec HUnit QuickCheck ];
        description = "Parsing dAmn messages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "danibot" = callPackage
@@ -60190,6 +64220,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative ];
        description = "Basic Slack bot framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dao" = callPackage
@@ -60220,6 +64252,8 @@ self: {
        ];
        description = "Dao is meta programming language with its own built-in interpreted language, designed with artificial intelligence applications in mind";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dapi" = callPackage
@@ -60238,6 +64272,8 @@ self: {
        ];
        description = "Prints a series of dates";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "darcs" = callPackage
@@ -60283,6 +64319,8 @@ self: {
        '';
        description = "a distributed, interactive, smart revision control system";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) curl;};
 
   "darcs-benchmark" = callPackage
@@ -60305,6 +64343,8 @@ self: {
        ];
        description = "Comparative benchmark suite for darcs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "darcs-beta" = callPackage
@@ -60336,6 +64376,8 @@ self: {
        executableSystemDepends = [ curl ];
        description = "a distributed, interactive, smart revision control system";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) curl;};
 
   "darcs-buildpackage" = callPackage
@@ -60354,6 +64396,8 @@ self: {
        ];
        description = "Tools to help manage Debian packages with Darcs";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "darcs-cabalized" = callPackage
@@ -60375,6 +64419,8 @@ self: {
        executableSystemDepends = [ curl ncurses zlib ];
        description = "David's Advanced Version Control System";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) curl; inherit (pkgs) ncurses; 
          inherit (pkgs) zlib;};
 
@@ -60395,6 +64441,8 @@ self: {
        ];
        description = "Import/export git fast-import streams to/from darcs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "darcs-graph" = callPackage
@@ -60413,6 +64461,8 @@ self: {
        ];
        description = "Generate graphs of darcs repository activity";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "darcs-monitor" = callPackage
@@ -60430,6 +64480,8 @@ self: {
        ];
        description = "Darcs repository monitor (sends email)";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "darcs-scripts" = callPackage
@@ -60460,6 +64512,8 @@ self: {
        ];
        description = "Outputs dependencies of darcs patches in dot format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "darcsden" = callPackage
@@ -60487,6 +64541,8 @@ self: {
        ];
        description = "Darcs repository UI and hosting/collaboration app (hub.darcs.net branch).";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "darcswatch" = callPackage
@@ -60509,6 +64565,8 @@ self: {
        ];
        description = "Track application of Darcs patches";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "darkplaces-demo" = callPackage
@@ -60536,6 +64594,8 @@ self: {
        ];
        description = "Utility and parser for DarkPlaces demo files";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "darkplaces-rcon" = callPackage
@@ -60552,6 +64612,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec hspec-core ];
        description = "Darkplaces rcon client library";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "darkplaces-rcon-util" = callPackage
@@ -60581,6 +64643,8 @@ self: {
        ];
        description = "Darplaces rcon utility";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "darkplaces-text" = callPackage
@@ -60598,6 +64662,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        description = "Parser for darkplaces colorful text";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dash-haskell" = callPackage
@@ -60618,6 +64684,8 @@ self: {
        ];
        description = "Convert package Haddock to Dash docsets (IDE docs)";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-accessor" = callPackage
@@ -60654,6 +64722,8 @@ self: {
        ];
        description = "Use Accessor to access state in monads-fd State monad class";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-accessor-monads-tf" = callPackage
@@ -60667,6 +64737,8 @@ self: {
        ];
        description = "Use Accessor to access state in monads-tf State monad type family";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-accessor-mtl" = callPackage
@@ -60692,6 +64764,8 @@ self: {
        ];
        description = "Utilities for accessing and manipulating fields of records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-accessor-transformers" = callPackage
@@ -60714,6 +64788,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Combinator birds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-base" = callPackage
@@ -60725,6 +64801,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Utilities for accessing and comparing types based on so called bases - representations with limited polymorphism";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-basic" = callPackage
@@ -60748,6 +64826,8 @@ self: {
        ];
        description = "A database library with a focus on ease of use, type safety and useful error messages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-binary-ieee754" = callPackage
@@ -60794,6 +64874,8 @@ self: {
        sha256 = "000x29a8x2ca7m85z0h7snm0297jf9ndr46dh3arv43fjlvfy3ag";
        description = "Category theory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-cell" = callPackage
@@ -60817,6 +64899,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Library for checking and normalization of data (e.g. from web forms)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-checked" = callPackage
@@ -60850,6 +64934,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Generate a special combinator from any data type";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-compat" = callPackage
@@ -60861,6 +64947,8 @@ self: {
        libraryHaskellDepends = [ base constraints ];
        description = "Define Backwards Compatibility Schemes for Arbitrary Data";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-concurrent-queue" = callPackage
@@ -60872,6 +64960,8 @@ self: {
        libraryHaskellDepends = [ base stm ];
        description = "A Library for directional queues";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-construction" = callPackage
@@ -60883,6 +64973,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Data construction abstractions including Constructor, Destructor, Maker, Destroyer, Producer and Consumer";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-constructors" = callPackage
@@ -60912,6 +65004,8 @@ self: {
        ];
        description = "a cyclic doubly linked list";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-default" = callPackage
@@ -61130,6 +65224,8 @@ self: {
        ];
        description = "Space-efficient and privacy-preserving data dispersal algorithms";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-diverse" = callPackage
@@ -61163,6 +65259,8 @@ self: {
        testHaskellDepends = [ base data-diverse hspec lens tagged ];
        description = "Isos & Lens for Data.Diverse.Many and Prisms for Data.Diverse.Which";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-dword" = callPackage
@@ -61197,6 +65295,8 @@ self: {
        ];
        description = "Consistent set of utility functions for Maybe, Either, List and Monoids";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-elf" = callPackage
@@ -61210,6 +65310,8 @@ self: {
        ];
        description = "Executable and Linkable Format (ELF) data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-embed" = callPackage
@@ -61234,6 +65336,8 @@ self: {
        ];
        description = "Embed files and other binary blobs inside executables without Template Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-emoticons" = callPackage
@@ -61245,6 +65349,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Combinator emoticons: data-aviary in the flavor of emoticons";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-endian" = callPackage
@@ -61296,6 +65402,8 @@ self: {
        ];
        description = "A type safe file path data structure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-files-gen" = callPackage
@@ -61342,6 +65450,8 @@ self: {
        ];
        description = "Finite totally ordered sets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-fin-simple" = callPackage
@@ -61354,6 +65464,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Simple integral finite set";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-fix" = callPackage
@@ -61398,6 +65510,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An efficient data type for sets of flags";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-foldapp" = callPackage
@@ -61423,6 +65537,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "A simple multi-way tree data structure";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-fresh" = callPackage
@@ -61538,6 +65654,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Write-once variables with concurrency support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-json-token" = callPackage
@@ -61568,6 +65686,8 @@ self: {
        ];
        description = "Sculpt mutable recursive data with reference equality; bake it using a data kiln into an immutable lazy structure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-layer" = callPackage
@@ -61579,6 +65699,8 @@ self: {
        libraryHaskellDepends = [ base convert data-construction lens ];
        description = "Data layering utilities. Layer is a data-type which wrapps other one, but keeping additional information. If you want to access content of simple newtype object, use Lens.Wrapper instead.";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-layout" = callPackage
@@ -61605,6 +65727,8 @@ self: {
        ];
        description = "Used to be Haskell 98 Lenses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-lens-fd" = callPackage
@@ -61618,6 +65742,8 @@ self: {
        ];
        description = "Lenses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-lens-ixset" = callPackage
@@ -61630,6 +65756,8 @@ self: {
        testHaskellDepends = [ QuickCheck ];
        description = "A Lens for IxSet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-lens-light" = callPackage
@@ -61652,6 +65780,8 @@ self: {
        libraryHaskellDepends = [ base data-lens template-haskell ];
        description = "Utilities for Data.Lens";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-list-sequences" = callPackage
@@ -61685,6 +65815,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Data.Map with multiple, unique keys";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-memocombinators" = callPackage
@@ -61722,6 +65854,8 @@ self: {
        ];
        description = "A Haskell implementation of MessagePack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-msgpack-types" = callPackage
@@ -61739,6 +65873,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A Haskell implementation of MessagePack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-named" = callPackage
@@ -61761,6 +65897,8 @@ self: {
        libraryHaskellDepends = [ base semigroups ];
        description = "data Nat = Zero | Succ Nat";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-object" = callPackage
@@ -61772,6 +65910,8 @@ self: {
        libraryHaskellDepends = [ base bytestring failure text time ];
        description = "Represent hierachichal structures, called objects in JSON. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-object-json" = callPackage
@@ -61788,6 +65928,8 @@ self: {
        ];
        description = "Serialize JSON data to/from Haskell using the data-object library. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-object-yaml" = callPackage
@@ -61806,6 +65948,8 @@ self: {
        ];
        description = "Serialize data to and from Yaml files (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-or" = callPackage
@@ -61852,6 +65996,8 @@ self: {
        libraryHaskellDepends = [ base deepseq mtl parallel pretty time ];
        description = "Prettyprint and compare Data values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-quotientref" = callPackage
@@ -61863,6 +66009,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Reference cells that need two independent indices to be accessed";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-r-tree" = callPackage
@@ -61918,6 +66066,8 @@ self: {
        libraryHaskellDepends = [ base containers data-reify ];
        description = "Common Sub-Expression Elimination for graphs generated by Data.Reify.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-repr" = callPackage
@@ -61929,6 +66079,8 @@ self: {
        libraryHaskellDepends = [ base generic-deriving lens ];
        description = "Alternative to Show data printing utility";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-result" = callPackage
@@ -61940,6 +66092,8 @@ self: {
        libraryHaskellDepends = [ base poly-control prologue ];
        description = "Data types for returning results distinguishable by types";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-rev" = callPackage
@@ -61951,6 +66105,8 @@ self: {
        libraryHaskellDepends = [ base bytestring containers text vector ];
        description = "A typeclass for reversing order of contents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-rope" = callPackage
@@ -61962,6 +66118,8 @@ self: {
        libraryHaskellDepends = [ base bytestring bytestring-mmap unix ];
        description = "Ropes, an alternative to (Byte)Strings";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-rtuple" = callPackage
@@ -61973,6 +66131,8 @@ self: {
        libraryHaskellDepends = [ base lens typelevel ];
        description = "Recursive tuple data structure. It is very usefull when implementing some lo-level operations, allowing to traverse different elements using Haskell's type classes.";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-serializer" = callPackage
@@ -62004,6 +66164,8 @@ self: {
        ];
        description = "Profiling of data structures";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-spacepart" = callPackage
@@ -62015,6 +66177,8 @@ self: {
        libraryHaskellDepends = [ base vector-space ];
        description = "Deprecated. Now called \"spacepart\". Space partitioning data structures.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-standards" = callPackage
@@ -62026,6 +66190,8 @@ self: {
        libraryHaskellDepends = [ base hashable unordered-containers ];
        description = "A collection of standards representable by simple data types";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-stm32" = callPackage
@@ -62078,6 +66244,8 @@ self: {
        ];
        description = "Type safe, in-memory dictionary with multidimensional keys";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-stringmap" = callPackage
@@ -62096,6 +66264,8 @@ self: {
        ];
        description = "An efficient implementation of maps from strings to arbitrary values";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-structure-inferrer" = callPackage
@@ -62116,6 +66286,8 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Program that infers the fastest data structure available for your program";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-sword" = callPackage
@@ -62132,6 +66304,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        description = "Shorter binary words";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-tensor" = callPackage
@@ -62189,6 +66363,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "Functions to transform data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-tree-print" = callPackage
@@ -62224,6 +66400,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Basic type wrangling types and classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-util" = callPackage
@@ -62235,6 +66413,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "utilities for handle data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "data-variant" = callPackage
@@ -62246,6 +66426,8 @@ self: {
        libraryHaskellDepends = [ base safe ];
        description = "A variant data type, useful for modeling dynamically-typed programming languages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "database-id-class" = callPackage
@@ -62272,6 +66454,8 @@ self: {
        ];
        description = "HasId/Groundhog interop";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "database-migrate" = callPackage
@@ -62300,6 +66484,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Demonstrate how a database can be implemented the functional way";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "datadog" = callPackage
@@ -62327,6 +66513,8 @@ self: {
        ];
        description = "Datadog client for Haskell. Supports both the HTTP API and StatsD.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "datadog-tracing" = callPackage
@@ -62362,6 +66550,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Datadog tracing client and mock agent";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dataenc" = callPackage
@@ -62402,6 +66592,8 @@ self: {
        ];
        description = "Fixing data-flow problems";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dataflow" = callPackage
@@ -62425,6 +66617,8 @@ self: {
        ];
        description = "Generate Graphviz documents from a Haskell representation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "datalog" = callPackage
@@ -62452,6 +66646,8 @@ self: {
        ];
        description = "An implementation of datalog in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "datapacker" = callPackage
@@ -62469,6 +66665,8 @@ self: {
        ];
        description = "Tool to help pack files into the minimum number of CDs/DVDs/etc";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "datarobot" = callPackage
@@ -62520,6 +66718,8 @@ self: {
        ];
        description = "Classical data sets for statistics and machine learning";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dataurl" = callPackage
@@ -62538,6 +66738,8 @@ self: {
        ];
        description = "Handle data-urls";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "date-cache" = callPackage
@@ -62561,6 +66763,8 @@ self: {
        testHaskellDepends = [ base dates hspec QuickCheck time ];
        description = "Date conversions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dates" = callPackage
@@ -62577,6 +66781,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Small library for parsing different dates formats";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "datetime" = callPackage
@@ -62595,6 +66801,8 @@ self: {
        ];
        description = "Utilities to make Data.Time.* easier to use";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "datetime-sb" = callPackage
@@ -62613,6 +66821,8 @@ self: {
        ];
        description = "Utilities to make Data.Time.* easier to use.";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dawdle" = callPackage
@@ -62627,6 +66837,8 @@ self: {
        executableHaskellDepends = [ base filepath parsec pretty text ];
        description = "Generates DDL suggestions based on a CSV file";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dawg" = callPackage
@@ -62642,6 +66854,8 @@ self: {
        ];
        description = "Directed acyclic word graphs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dawg-ord" = callPackage
@@ -62662,6 +66876,8 @@ self: {
        ];
        description = "Directed acyclic word graphs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dbcleaner" = callPackage
@@ -62674,6 +66890,8 @@ self: {
        testHaskellDepends = [ base hspec postgresql-simple text ];
        description = "Clean database tables automatically around hspec tests";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dbf" = callPackage
@@ -62687,6 +66905,8 @@ self: {
        ];
        description = "Read and write XBase \".dbf\" files";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dbjava" = callPackage
@@ -62707,6 +66927,8 @@ self: {
        ];
        description = "Decompiler Bytecode Java";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dbm" = callPackage
@@ -62725,6 +66947,8 @@ self: {
        ];
        description = "A *simple* database migration tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dbmigrations" = callPackage
@@ -62772,6 +66996,8 @@ self: {
        ];
        description = "The dbmigrations tool built for MySQL databases";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dbmigrations-postgresql" = callPackage
@@ -62790,6 +67016,8 @@ self: {
        ];
        description = "The dbmigrations tool built for PostgreSQL databases";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dbmigrations-sqlite" = callPackage
@@ -62804,6 +67032,8 @@ self: {
        testHaskellDepends = [ base dbmigrations HDBC HDBC-sqlite3 HUnit ];
        description = "The dbmigrations tool built for SQLite databases";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dbus_0_10_15" = callPackage
@@ -62875,6 +67105,8 @@ self: {
        ];
        description = "Monadic and object-oriented interfaces to DBus";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dbus-core" = callPackage
@@ -62892,6 +67124,8 @@ self: {
        ];
        description = "Low-level D-Bus protocol implementation";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dbus-hslogger" = callPackage
@@ -62924,6 +67158,8 @@ self: {
        testHaskellDepends = [ base containers dbus QuickCheck ];
        description = "Quasi-quoter for DBus functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dbus-th" = callPackage
@@ -62981,6 +67217,8 @@ self: {
        ];
        description = "This packge is deprecated. See the the \"LIO.DCLabel\" in the \"lio\" package.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dclabel-eci11" = callPackage
@@ -62992,6 +67230,8 @@ self: {
        libraryHaskellDepends = [ base pretty QuickCheck ];
        description = "The Disjunction Category Label Format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dcpu16" = callPackage
@@ -63011,6 +67251,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "DCPU-16 Emulator & Assembler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddate" = callPackage
@@ -63022,6 +67264,8 @@ self: {
        libraryHaskellDepends = [ base dates time ];
        description = "Discordian Date Types for Haskell";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-base" = callPackage
@@ -63037,6 +67281,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler common utilities";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-build" = callPackage
@@ -63056,6 +67302,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler build framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-code" = callPackage
@@ -63068,6 +67316,8 @@ self: {
        libraryHaskellDepends = [ base filepath ];
        description = "Disciplined Disciple Compiler base libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-core" = callPackage
@@ -63084,6 +67334,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler core language and type checker";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-core-babel" = callPackage
@@ -63097,6 +67349,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler PHP code generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-core-eval" = callPackage
@@ -63112,6 +67366,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler semantic evaluator for the core language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-core-flow" = callPackage
@@ -63129,6 +67385,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler data flow compiler";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-core-llvm" = callPackage
@@ -63145,6 +67403,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler LLVM code generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-core-salt" = callPackage
@@ -63160,6 +67420,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler C code generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-core-simpl" = callPackage
@@ -63175,6 +67437,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler code transformations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-core-tetra" = callPackage
@@ -63191,6 +67455,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler intermediate language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-driver" = callPackage
@@ -63210,6 +67476,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler top-level driver";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-interface" = callPackage
@@ -63221,6 +67489,8 @@ self: {
        libraryHaskellDepends = [ base containers ddc-base directory ];
        description = "Disciplined Disciple Compiler user interface support";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-source-tetra" = callPackage
@@ -63237,6 +67507,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler source language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-tools" = callPackage
@@ -63259,6 +67531,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler command line tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddc-war" = callPackage
@@ -63276,6 +67550,8 @@ self: {
        ];
        description = "Disciplined Disciple Compiler test driver and buildbot";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ddci-core" = callPackage
@@ -63294,6 +67570,8 @@ self: {
        ];
        description = "Disciple Core language interactive interpreter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dde" = callPackage
@@ -63345,6 +67623,8 @@ self: {
        ];
        description = "detect dead code in haskell projects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dead-simple-json" = callPackage
@@ -63360,6 +67640,8 @@ self: {
        ];
        description = "Dead simple JSON parser, with some Template Haskell sugar";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "debian" = callPackage
@@ -63449,6 +67731,8 @@ self: {
        ];
        description = "Simple trace-based debugger";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "debug-diff" = callPackage
@@ -63499,6 +67783,8 @@ self: {
        ];
        description = "secure remote debugging";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "debug-pp" = callPackage
@@ -63540,6 +67826,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell unicode-show ];
        description = "You do not have to write variable names twice in Debug.Trace";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "debug-tracy" = callPackage
@@ -63554,6 +67842,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "More useful trace functions for investigating bugs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "deburr" = callPackage
@@ -63590,6 +67880,8 @@ self: {
        libraryHaskellDepends = [ base comonad-transformers ];
        description = "The categorical dual of transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "decidable" = callPackage
@@ -63619,6 +67911,8 @@ self: {
        testHaskellDepends = [ base binary doctest hspec QuickCheck ];
        description = "An implementation of the General Decimal Arithmetic Specification";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "decimal-literals" = callPackage
@@ -63652,6 +67946,8 @@ self: {
        testHaskellDepends = [ base mwc-probability ];
        description = "DIY Markov Chains";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "decode-utf8" = callPackage
@@ -63679,6 +67975,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring conduit ];
        description = "Conduit for decoding ByteStrings using Data.Binary.Get";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dedukti" = callPackage
@@ -63701,6 +67999,8 @@ self: {
        ];
        description = "A type-checker for the λΠ-modulo calculus";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "deepcontrol" = callPackage
@@ -63717,6 +68017,8 @@ self: {
        ];
        description = "A library that provides deep-level programming style and(or) notation on Applicative and Monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "deeplearning-hs" = callPackage
@@ -63744,6 +68046,8 @@ self: {
        ];
        description = "Deep Learning in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "deepseq_1_3_0_1" = callPackage
@@ -63798,6 +68102,8 @@ self: {
        ];
        description = "Bounded deepseq, including support for generic deriving";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "deepseq-generics" = callPackage
@@ -63818,6 +68124,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "deepseq-instances" = callPackage
+    ({ mkDerivation, array, base, deepseq, stm }:
+     mkDerivation {
+       pname = "deepseq-instances";
+       version = "0.1.0.0";
+       sha256 = "16b0j7k8jvbccl1jrsgqcbls5k4j3m847nlq1p78jq1qx7a6qlgn";
+       libraryHaskellDepends = [ array base deepseq stm ];
+       description = "Candidate NFData Instances for Types in base";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "deepseq-magic" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -63827,6 +68144,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Deep evaluation of data structures without NFData";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "deepseq-th" = callPackage
@@ -63839,6 +68158,8 @@ self: {
        testHaskellDepends = [ base deepseq template-haskell ];
        description = "Template Haskell based deriver for optimised NFData instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "deepzoom" = callPackage
@@ -63850,6 +68171,8 @@ self: {
        libraryHaskellDepends = [ base directory filepath hsmagick ];
        description = "A DeepZoom image slicer. Only known to work on 32bit Linux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "defargs" = callPackage
@@ -63861,6 +68184,8 @@ self: {
        libraryHaskellDepends = [ base cluss ];
        description = "default arguments in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "deferred-folds" = callPackage
@@ -64034,14 +68359,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "dejafu_2_1_0_2" = callPackage
+  "dejafu_2_1_0_3" = callPackage
     ({ mkDerivation, base, concurrency, containers, contravariant
      , deepseq, exceptions, leancheck, profunctors, random, transformers
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "2.1.0.2";
-       sha256 = "06i0rxnx3106r8i8i0m399chn2n5k59c55k85b21p223dyh5zbai";
+       version = "2.1.0.3";
+       sha256 = "0b1akgq9pqrgwyj3smna7d4j6wvi7rm98q2d6ag01p06lcflypkg";
        libraryHaskellDepends = [
          base concurrency containers contravariant deepseq exceptions
          leancheck profunctors random transformers
@@ -64061,6 +68386,8 @@ self: {
        librarySystemDepends = [ mpdec ];
        description = "Decimal floating point arithmetic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {mpdec = null;};
 
   "deka-tests" = callPackage
@@ -64081,6 +68408,8 @@ self: {
        testHaskellDepends = [ base bytestring deka QuickCheck quickpull ];
        description = "Tests for deka, decimal floating point arithmetic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "delaunay" = callPackage
@@ -64097,6 +68426,8 @@ self: {
        testHaskellDepends = [ AC-Vector base HUnit QuickCheck ];
        description = "Build a Delaunay triangulation of a set of points";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "delay" = callPackage
@@ -64127,6 +68458,8 @@ self: {
        ];
        description = "Accessing the del.icio.us APIs from Haskell (v2)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "delimited-text" = callPackage
@@ -64142,6 +68475,8 @@ self: {
        ];
        description = "Parse character delimited textual data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "delimiter-separated" = callPackage
@@ -64154,6 +68489,8 @@ self: {
        libraryHaskellDepends = [ base uhc-util uulib ];
        description = "Library for dealing with tab and/or comma (or other) separated files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "delta" = callPackage
@@ -64177,6 +68514,8 @@ self: {
        testHaskellDepends = [ base directory filepath hspec ];
        description = "A library for detecting file changes";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "delta-h" = callPackage
@@ -64198,6 +68537,8 @@ self: {
        ];
        description = "Online entropy-based model of lexical category acquisition";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "delude" = callPackage
@@ -64209,6 +68550,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Generalized the Prelude more functionally";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "demarcate" = callPackage
@@ -64221,6 +68564,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Demarcating transformed monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "denominate" = callPackage
@@ -64235,6 +68580,8 @@ self: {
        executableHaskellDepends = [ base directory filepath ];
        description = "Functions supporting bulk file and directory name normalization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dense" = callPackage
@@ -64280,6 +68627,8 @@ self: {
        ];
        description = "Dense int-set";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dense-linear-algebra" = callPackage
@@ -64347,6 +68696,8 @@ self: {
        ];
        description = "Dependent map that uses semigroup mappend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dependent-state" = callPackage
@@ -64358,6 +68709,8 @@ self: {
        libraryHaskellDepends = [ base lens mtl prologue ];
        description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types.";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dependent-sum" = callPackage
@@ -64385,6 +68738,8 @@ self: {
        ];
        description = "JSON instances for DSum, DMap, and Some";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dependent-sum-template" = callPackage
@@ -64401,6 +68756,8 @@ self: {
        testHaskellDepends = [ base constraints-extras dependent-sum ];
        description = "Template Haskell code to generate instances of classes in dependent-sum package";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "depends" = callPackage
@@ -64422,6 +68779,8 @@ self: {
        ];
        description = "A simple configuration management tool for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dephd" = callPackage
@@ -64440,6 +68799,8 @@ self: {
        ];
        description = "Analyze quality of nucleotide sequences";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "deptrack-core" = callPackage
@@ -64451,6 +68812,8 @@ self: {
        libraryHaskellDepends = [ base containers dlist mtl parsec ];
        description = "DepTrack Core types and model";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "deptrack-devops" = callPackage
@@ -64469,6 +68832,8 @@ self: {
        ];
        description = "DepTrack applied to DevOps";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "deptrack-dot" = callPackage
@@ -64481,6 +68846,8 @@ self: {
        testHaskellDepends = [ base containers deptrack-core dotgen ];
        description = "Facilitate Graphviz representations of DepTrack dependencies";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "deque" = callPackage
@@ -64524,6 +68891,8 @@ self: {
        libraryHaskellDepends = [ base fgl ];
        description = "Find derangements of lists";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "derivation-trees" = callPackage
@@ -64537,6 +68906,8 @@ self: {
        ];
        description = "Typeset Derivation Trees via MetaPost";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "derive" = callPackage
@@ -64557,6 +68928,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A program and library to derive instances for data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "derive-IG" = callPackage
@@ -64568,6 +68941,8 @@ self: {
        libraryHaskellDepends = [ base instant-generics template-haskell ];
        description = "Macro to derive instances for Instant-Generics using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "derive-enumerable" = callPackage
@@ -64579,6 +68954,8 @@ self: {
        libraryHaskellDepends = [ base data-default ];
        description = "Generic instances for enumerating complex data types";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "derive-gadt" = callPackage
@@ -64600,6 +68977,8 @@ self: {
        ];
        description = "Instance deriving for (a subset of) GADTs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "derive-monoid" = callPackage
@@ -64615,6 +68994,8 @@ self: {
        testHaskellDepends = [ base semigroups ];
        description = "derive Semigroup/Monoid/IsList";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "derive-storable" = callPackage
@@ -64647,6 +69028,8 @@ self: {
        ];
        description = "GHC core plugin supporting the derive-storable package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "derive-topdown" = callPackage
@@ -64668,6 +69051,8 @@ self: {
        ];
        description = "Help Haskellers derive class instances for composited data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "derive-trie" = callPackage
@@ -64679,6 +69064,8 @@ self: {
        libraryHaskellDepends = [ array base containers template-haskell ];
        description = "Automatic derivation of Trie implementations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "deriveJsonNoPrefix" = callPackage
@@ -64701,8 +69088,8 @@ self: {
     ({ mkDerivation, aeson, base, bytestring }:
      mkDerivation {
        pname = "deriving-aeson";
-       version = "0.1.1";
-       sha256 = "1l1j76wfv2cc0drnbw254plya97n6yvnz6vzcllgip2i64yqyx21";
+       version = "0.1.2";
+       sha256 = "0f26pnvarfarlb2jz1ing3997cd9ajhygkcafhl0yc7i7mi0ysm4";
        libraryHaskellDepends = [ aeson base ];
        testHaskellDepends = [ aeson base bytestring ];
        description = "Type driven generic aeson instance customisation";
@@ -64752,6 +69139,8 @@ self: {
        libraryHaskellDepends = [ base derp ];
        description = "combinators based on parsing with derivatives (derp) package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "derulo" = callPackage
@@ -64788,6 +69177,8 @@ self: {
        ];
        description = "Combinators for describing binary data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "descrilo" = callPackage
@@ -64833,6 +69224,8 @@ self: {
        ];
        description = "Library, interpreter, and CLI for Descript programming language";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "descriptive" = callPackage
@@ -64872,6 +69265,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "a simple build tool for OCaml projects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "despair" = callPackage
@@ -64895,6 +69290,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Simple deterministic game engine";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "detour-via-sci" = callPackage
@@ -64938,6 +69335,8 @@ self: {
        ];
        description = "JSON and CSV encoding for quantities";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "detrospector" = callPackage
@@ -64969,6 +69368,8 @@ self: {
        executableHaskellDepends = [ base bytestring utf8-string ];
        description = "Get rid of unicode (utf-8) symbols in Haskell sources";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "devil" = callPackage
@@ -64987,6 +69388,8 @@ self: {
        ];
        description = "A small tool to make it easier to update program managed by Angel";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dewdrop" = callPackage
@@ -65000,6 +69403,8 @@ self: {
        ];
        description = "Find gadgets for return-oriented programming on x86";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "df1" = callPackage
@@ -65054,6 +69459,8 @@ self: {
        ];
        description = "A generic data integrity layer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) leveldb;};
 
   "dfrac" = callPackage
@@ -65084,6 +69491,8 @@ self: {
        ];
        description = "Build Debian From Scratch CD/DVD images";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dgim" = callPackage
@@ -65096,6 +69505,8 @@ self: {
        testHaskellDepends = [ base Cabal QuickCheck ];
        description = "Implementation of DGIM algorithm";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dgs" = callPackage
@@ -65107,6 +69518,8 @@ self: {
        libraryHaskellDepends = [ base HTTP mtl network split ];
        description = "Haskell front-end for DGS' bot interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dhall_1_29_0" = callPackage
@@ -65248,6 +69661,8 @@ self: {
        ];
        description = "Check all dhall files in a project";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dhall-fly" = callPackage
@@ -65280,6 +69695,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Translate concourse config from Dhall to YAML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dhall-json" = callPackage
@@ -65357,6 +69774,8 @@ self: {
        ];
        description = "Language Server Protocol (LSP) server for Dhall";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dhall-nix" = callPackage
@@ -65377,6 +69796,8 @@ self: {
        ];
        description = "Dhall to Nix compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dhall-text" = callPackage
@@ -65394,6 +69815,8 @@ self: {
        ];
        description = "Template text using Dhall";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dhall-to-cabal" = callPackage
@@ -65422,6 +69845,8 @@ self: {
        ];
        description = "Compile Dhall expressions to Cabal files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dhall-yaml" = callPackage
@@ -65468,6 +69893,8 @@ self: {
        ];
        description = "Parse a DHCP lease file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dhrun" = callPackage
@@ -65501,6 +69928,8 @@ self: {
        doHaddock = false;
        description = "Dhall/YAML configurable concurrent integration test executor";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "di" = callPackage
@@ -65595,6 +70024,8 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        description = "An EDSL for teaching Haskell with diagrams - data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dia-functions" = callPackage
@@ -65612,6 +70043,8 @@ self: {
        ];
        description = "An EDSL for teaching Haskell with diagrams - functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams" = callPackage
@@ -65641,6 +70074,8 @@ self: {
        libraryHaskellDepends = [ base cubicbezier diagrams-lib ];
        description = "deprecated, part of diagrams-contrib since 1.4";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-braille" = callPackage
@@ -65694,6 +70129,8 @@ self: {
        ];
        description = "hint-based build service for the diagrams graphics EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-cairo" = callPackage
@@ -65734,6 +70171,8 @@ self: {
        ];
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-contrib" = callPackage
@@ -65841,6 +70280,8 @@ self: {
        ];
        description = "Preprocessor for embedding diagrams in Haddock documentation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-hsqml" = callPackage
@@ -65857,6 +70298,8 @@ self: {
        ];
        description = "HsQML (Qt5) backend for Diagrams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-html5" = callPackage
@@ -65875,6 +70318,8 @@ self: {
        ];
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-lib" = callPackage
@@ -65931,6 +70376,8 @@ self: {
        ];
        description = "A Pandoc filter to express diagrams inline using the Haskell EDSL _Diagrams_";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-pdf" = callPackage
@@ -65948,6 +70395,8 @@ self: {
        ];
        description = "PDF backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-pgf" = callPackage
@@ -66001,6 +70450,8 @@ self: {
        ];
        description = "Draw QR codes to SVG, PNG, PDF or PS files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-rasterific" = callPackage
@@ -66108,6 +70559,8 @@ self: {
        ];
        description = "TikZ backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diagrams-wx" = callPackage
@@ -66125,6 +70578,8 @@ self: {
        ];
        description = "Backend for rendering diagrams in wxWidgets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dialog" = callPackage
@@ -66163,6 +70618,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A Dialogflow Fulfillment library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dib" = callPackage
@@ -66184,6 +70641,8 @@ self: {
        ];
        description = "A simple, forward build system";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dice" = callPackage
@@ -66197,6 +70656,8 @@ self: {
        libraryHaskellDepends = [ base parsec random-fu transformers ];
        description = "Simplistic D&D style dice-rolling system";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dice-entropy-conduit" = callPackage
@@ -66215,6 +70676,8 @@ self: {
        ];
        description = "Cryptographically secure n-sided dice via rejection sampling";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dice2tex" = callPackage
@@ -66228,6 +70691,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Convert a Diceware wordlist into a printer-ready LaTeX file";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dicom" = callPackage
@@ -66241,6 +70706,8 @@ self: {
        ];
        description = "A library for reading and writing DICOM files in the Explicit VR Little Endian transfer syntax";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dictionaries" = callPackage
@@ -66269,6 +70736,8 @@ self: {
        ];
        description = "Tools to handle StarDict dictionaries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dictionary-sharing" = callPackage
@@ -66297,6 +70766,8 @@ self: {
        testHaskellDepends = [ base hspec parsec ];
        description = "Parsec parsers for the DICT format produced by dictfmt -t";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diet" = callPackage
@@ -66314,6 +70785,8 @@ self: {
        ];
        description = "Discrete Interval Encoding Trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diff" = callPackage
@@ -66325,6 +70798,8 @@ self: {
        libraryHaskellDepends = [ base Enum util ];
        description = "Diff and patch";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diff-gestalt" = callPackage
@@ -66397,6 +70872,8 @@ self: {
        ];
        description = "Diff two .cabal files syntactically";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diffdump" = callPackage
@@ -66435,6 +70912,8 @@ self: {
          groups hedgehog hedgehog-checkers QuickCheck semigroupoids
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "differential" = callPackage
@@ -66460,6 +70939,8 @@ self: {
        ];
        description = "Finds out whether an entity comes from different distributions (statuses)";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diffmap" = callPackage
@@ -66473,6 +70954,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "diff on maps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "difftodo" = callPackage
@@ -66498,6 +70981,8 @@ self: {
        ];
        description = "Generate todo lists from source code";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "digamma" = callPackage
@@ -66550,6 +71035,8 @@ self: {
        ];
        description = "Speed up form designing using digestive functors and bootstrap";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "digestive-foundation-lucid" = callPackage
@@ -66566,6 +71053,8 @@ self: {
        ];
        description = "Speed up form designing using digestive functors and foundation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "digestive-functors" = callPackage
@@ -66610,6 +71099,8 @@ self: {
        ];
        description = "Run digestive-functors forms against JSON";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "digestive-functors-blaze" = callPackage
@@ -66640,6 +71131,8 @@ self: {
        ];
        description = "Happstack backend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "digestive-functors-heist" = callPackage
@@ -66668,6 +71161,8 @@ self: {
        libraryToolDepends = [ trhsx ];
        description = "HSP support for digestive-functors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "digestive-functors-lucid" = callPackage
@@ -66751,6 +71246,8 @@ self: {
        testHaskellDepends = [ base doctest hspec ];
        description = "digitalocean api for haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "digits" = callPackage
@@ -66763,6 +71260,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Converts integers to lists of digits and back";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "digraph" = callPackage
@@ -66832,6 +71331,8 @@ self: {
        libraryHaskellDepends = [ base dimensional numtype-dk ];
        description = "CODATA Recommended Physical Constants with Dimensional Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dimensional-tf" = callPackage
@@ -66843,6 +71344,8 @@ self: {
        libraryHaskellDepends = [ base numtype-tf time ];
        description = "Statically checked physical dimensions, implemented using type families";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dimensions" = callPackage
@@ -66881,6 +71384,8 @@ self: {
        ];
        description = "Dingo is a Rich Internet Application platform based on the Warp web server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dingo-example" = callPackage
@@ -66900,6 +71405,8 @@ self: {
        ];
        description = "Dingo Example";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dingo-widgets" = callPackage
@@ -66918,6 +71425,8 @@ self: {
        ];
        description = "Dingo Widgets";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dino" = callPackage
@@ -66950,6 +71459,8 @@ self: {
        libraryToolDepends = [ happy ];
        description = "A quadratic diophantine equation solving library";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diplomacy" = callPackage
@@ -66965,6 +71476,8 @@ self: {
        ];
        description = "Diplomacy board game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "diplomacy-server" = callPackage
@@ -66988,6 +71501,8 @@ self: {
        ];
        description = "Play Diplomacy over HTTP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dir-traverse" = callPackage
@@ -67015,6 +71530,8 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "Serialization and deserialization monads for streams and ByteStrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "direct-daemonize" = callPackage
@@ -67041,6 +71558,8 @@ self: {
        ];
        description = "Native implementation of the FastCGI protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "direct-http" = callPackage
@@ -67059,6 +71578,8 @@ self: {
        ];
        description = "Native webserver that acts as a library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "direct-murmur-hash" = callPackage
@@ -67081,6 +71602,8 @@ self: {
        libraryHaskellDepends = [ base ghc ghc-paths ];
        description = "Lightweight replacement for Plugins, specific to GHC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "direct-rocksdb" = callPackage
@@ -67100,6 +71623,8 @@ self: {
        ];
        description = "Bindings to RocksDB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "direct-sqlite" = callPackage
@@ -67132,6 +71657,8 @@ self: {
        ];
        description = "Finite directed cubical complexes and associated algorithms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "directory_1_3_6_0" = callPackage
@@ -67208,6 +71735,8 @@ self: {
        executableHaskellDepends = [ base directory ];
        description = "Deletes a directory and retains its contents in the parent directory";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dirfiles" = callPackage
@@ -67223,6 +71752,8 @@ self: {
          unordered-containers
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dirstream" = callPackage
@@ -67262,6 +71793,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A small library for working with directories";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "disassembler" = callPackage
@@ -67296,6 +71829,8 @@ self: {
        ];
        description = "Client for Discogs REST API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "discokitty" = callPackage
@@ -67324,6 +71859,8 @@ self: {
        ];
        description = "An API wrapper for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "discord-haskell" = callPackage
@@ -67347,6 +71884,8 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "Write bots for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "discord-hs" = callPackage
@@ -67363,6 +71902,8 @@ self: {
        ];
        description = "An API wrapper for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "discord-rest" = callPackage
@@ -67382,6 +71923,8 @@ self: {
        ];
        description = "An API wrapper for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "discord-types" = callPackage
@@ -67400,6 +71943,8 @@ self: {
        ];
        description = "Type information for discord-hs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "discordian-calendar" = callPackage
@@ -67411,6 +71956,8 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "library for handling Discordian calendar dates";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "discount" = callPackage
@@ -67436,6 +71983,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "replacement for enum";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "discrete-intervals" = callPackage
@@ -67506,6 +72055,8 @@ self: {
        ];
        description = "Disjoint containers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "disjoint-set" = callPackage
@@ -67522,6 +72073,8 @@ self: {
        ];
        description = "Persistent disjoint-sets, a.k.a union-find.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "disjoint-set-stateful" = callPackage
@@ -67534,6 +72087,8 @@ self: {
        testHaskellDepends = [ base hspec primitive ref-tf vector ];
        description = "Monadic disjoint set";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "disjoint-sets-st" = callPackage
@@ -67623,6 +72178,8 @@ self: {
        doHaddock = false;
        description = "Generate/Upload cabal package to Hackage";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distance" = callPackage
@@ -67636,6 +72193,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Useful distance datatype and functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distance-of-time" = callPackage
@@ -67711,6 +72270,8 @@ self: {
        ];
        description = "AWS Lambda backend for distributed-fork";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process" = callPackage
@@ -67735,6 +72296,8 @@ self: {
        ];
        description = "Cloud Haskell: Erlang-style concurrency in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-async" = callPackage
@@ -67762,6 +72325,8 @@ self: {
        ];
        description = "Cloud Haskell Async API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-azure" = callPackage
@@ -67784,6 +72349,8 @@ self: {
        ];
        description = "Microsoft Azure backend for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-client-server" = callPackage
@@ -67813,6 +72380,8 @@ self: {
        ];
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-ekg" = callPackage
@@ -67828,6 +72397,8 @@ self: {
        ];
        description = "Collect node stats for EKG";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-execution" = callPackage
@@ -67863,6 +72434,8 @@ self: {
        ];
        description = "Execution Framework for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-extras" = callPackage
@@ -67893,6 +72466,8 @@ self: {
        ];
        description = "Cloud Haskell Extras";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-fsm" = callPackage
@@ -67925,6 +72500,8 @@ self: {
        ];
        description = "The Cloud Haskell implementation of Erlang/OTP gen_statem";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-lifted" = callPackage
@@ -67950,6 +72527,8 @@ self: {
        ];
        description = "monad-control style typeclass and transformer instances for Process monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-monad-control" = callPackage
@@ -67966,6 +72545,8 @@ self: {
        ];
        description = "Orphan instances for MonadBase and MonadBaseControl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-p2p" = callPackage
@@ -67986,6 +72567,8 @@ self: {
        executableHaskellDepends = [ base distributed-process mtl ];
        description = "Peer-to-peer node discovery for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-platform" = callPackage
@@ -68016,6 +72599,8 @@ self: {
        ];
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-registry" = callPackage
@@ -68048,6 +72633,8 @@ self: {
        ];
        description = "Cloud Haskell Extended Process Registry";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-simplelocalnet" = callPackage
@@ -68070,6 +72657,8 @@ self: {
        ];
        description = "Simple zero-configuration backend for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-supervisor" = callPackage
@@ -68101,6 +72690,8 @@ self: {
        ];
        description = "Supervisors for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-systest" = callPackage
@@ -68120,6 +72711,8 @@ self: {
        ];
        description = "Cloud Haskell Test Support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-task" = callPackage
@@ -68156,6 +72749,8 @@ self: {
        ];
        description = "Task Framework for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-tests" = callPackage
@@ -68179,6 +72774,8 @@ self: {
        ];
        description = "Tests and test support tools for distributed-process";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-process-zookeeper" = callPackage
@@ -68207,6 +72804,8 @@ self: {
        ];
        description = "A Zookeeper back-end for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributed-static" = callPackage
@@ -68222,6 +72821,8 @@ self: {
        ];
        description = "Compositional, type-safe, polymorphic static values and closures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distribution" = callPackage
@@ -68235,6 +72836,8 @@ self: {
        ];
        description = "Finite discrete probability distributions";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distribution-nixpkgs" = callPackage
@@ -68290,6 +72893,8 @@ self: {
        ];
        description = "Easily plot distributions from the distribution package..";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "distributive" = callPackage
@@ -68352,6 +72957,8 @@ self: {
        ];
        description = "Quantify the diversity of a population";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dixi" = callPackage
@@ -68389,6 +72996,8 @@ self: {
        ];
        description = "A wiki implemented with a firm theoretical foundation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "djembe" = callPackage
@@ -68404,6 +73013,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Hit drums with haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "djinn" = callPackage
@@ -68460,6 +73071,8 @@ self: {
        ];
        description = "Generate executable Haskell code from a type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dl-fedora" = callPackage
@@ -68480,6 +73093,8 @@ self: {
        ];
        description = "Fedora image download tool";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dlist" = callPackage
@@ -68582,6 +73197,8 @@ self: {
        ];
        description = "Complete bindings to the dmenu and dmenu2 command line tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dmenu-pkill" = callPackage
@@ -68599,6 +73216,8 @@ self: {
        ];
        description = "dmenu script for killing applications. Sortable by process id or CPU/MEM usage.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dmenu-pmount" = callPackage
@@ -68616,6 +73235,8 @@ self: {
        ];
        description = "Mounting and unmounting linux devices as user with dmenu and pmount";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dmenu-search" = callPackage
@@ -68633,6 +73254,8 @@ self: {
        ];
        description = "dmenu script for searching the web with customizable search engines";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dns" = callPackage
@@ -68675,6 +73298,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Caching DNS resolver library and mass DNS resolver utility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dnsrbl" = callPackage
@@ -68687,6 +73312,8 @@ self: {
        libraryHaskellDepends = [ base containers hsdns HUnit network ];
        description = "Asynchronous DNS RBL lookup";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dnssd" = callPackage
@@ -68699,6 +73326,8 @@ self: {
        librarySystemDepends = [ dns_sd ];
        description = "DNS service discovery bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {dns_sd = null;};
 
   "do-list" = callPackage
@@ -68787,6 +73416,8 @@ self: {
        ];
        description = "Document review Web application, like http://book.realworldhaskell.org/";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "doccheck" = callPackage
@@ -68805,6 +73436,8 @@ self: {
        ];
        description = "Checks Haddock comments for pitfalls and version changes";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "docidx" = callPackage
@@ -68823,6 +73456,8 @@ self: {
        ];
        description = "Generate an HTML index of installed Haskell packages and their documentation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "docker" = callPackage
@@ -68878,6 +73513,8 @@ self: {
        ];
        description = "Builds a docker image and caches all of its intermediate stages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dockercook" = callPackage
@@ -68911,6 +73548,8 @@ self: {
        testHaskellDepends = [ base HTF text vector ];
        description = "A build tool for multiple docker image layers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dockerfile" = callPackage
@@ -68980,6 +73619,8 @@ self: {
        ];
        description = "A command-line interface parser that will make you smile";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "docrecords" = callPackage
@@ -69140,6 +73781,8 @@ self: {
        doHaddock = false;
        description = "Easy way to run doctests via cabal (no aeson dependency, uses configurator instead)";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "doctest-driver-gen" = callPackage
@@ -69155,6 +73798,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Generate driver file for doctest's cabal integration";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "doctest-prop" = callPackage
@@ -69167,6 +73812,8 @@ self: {
        testHaskellDepends = [ base doctest HUnit QuickCheck ];
        description = "Allow QuickCheck-style property testing within doctest";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "docusign-base" = callPackage
@@ -69236,6 +73883,8 @@ self: {
        ];
        description = "DocuSign examples";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "docvim" = callPackage
@@ -69262,6 +73911,8 @@ self: {
        ];
        description = "Documentation generator for Vim plug-ins";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "doi" = callPackage
@@ -69290,6 +73941,8 @@ self: {
        ];
        description = "Automatic Bibtex and fulltext of scientific articles";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "doldol" = callPackage
@@ -69336,6 +73989,8 @@ self: {
        benchmarkHaskellDepends = [ base containers criterion deepseq ];
        description = "The Lengauer-Tarjan graph dominators algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dom-parser" = callPackage
@@ -69395,6 +74050,8 @@ self: {
        testHaskellDepends = [ base doctest pretty-simple ];
        description = "Domain authentication library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dominion" = callPackage
@@ -69426,6 +74083,8 @@ self: {
        ];
        description = "A simple templating library using HTML5 as its template language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dot" = callPackage
@@ -69465,6 +74124,8 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dot2graphml" = callPackage
@@ -69537,6 +74198,8 @@ self: {
        doHaddock = false;
        description = "Filesystem to manage and parse dotfiles";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dotgen" = callPackage
@@ -69616,6 +74279,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Doublify API toolkit for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dove" = callPackage
@@ -69672,6 +74337,8 @@ self: {
        ];
        description = "Dungeons of Wor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "download" = callPackage
@@ -69714,6 +74381,8 @@ self: {
        ];
        description = "Simple tool to download images from RSS feeds (e.g. Flickr, Picasa)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "downloader" = callPackage
@@ -69741,6 +74410,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A Haskell library for using Dozenal (Duodecimal - Base 12) numbers";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dozens" = callPackage
@@ -69760,6 +74431,8 @@ self: {
        ];
        description = "dozens api library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dph-base" = callPackage
@@ -69773,6 +74446,8 @@ self: {
        ];
        description = "Data Parallel Haskell common config and debugging functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dph-examples" = callPackage
@@ -69791,6 +74466,8 @@ self: {
        ];
        description = "Data Parallel Haskell example programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dph-lifted-base" = callPackage
@@ -69807,6 +74484,8 @@ self: {
        ];
        description = "Data Parallel Haskell common definitions used by other dph-lifted packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dph-lifted-copy" = callPackage
@@ -69822,6 +74501,8 @@ self: {
        ];
        description = "Data Parallel Haskell lifted array combinators. (deprecated version)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dph-lifted-vseg" = callPackage
@@ -69838,6 +74519,8 @@ self: {
        ];
        description = "Data Parallel Haskell lifted array combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dph-par" = callPackage
@@ -69860,6 +74543,8 @@ self: {
        libraryHaskellDepends = [ base dph-base random vector ];
        description = "Data Parallel Haskell segmented arrays. (abstract interface)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dph-prim-par" = callPackage
@@ -69876,6 +74561,8 @@ self: {
        ];
        description = "Data Parallel Haskell segmented arrays. (production version)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dph-prim-seq" = callPackage
@@ -69891,6 +74578,8 @@ self: {
        ];
        description = "Data Parallel Haskell segmented arrays. (sequential implementation)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dph-seq" = callPackage
@@ -69922,6 +74611,8 @@ self: {
        testPkgconfigDepends = [ libdpkg ];
        description = "libdpkg bindings";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) dpkg; libdpkg = null;};
 
   "dpor" = callPackage
@@ -69935,6 +74626,8 @@ self: {
        ];
        description = "A generic implementation of dynamic partial-order reduction (DPOR) for testing arbitrary models of concurrency";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dprox" = callPackage
@@ -69969,6 +74662,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Monadic FRP";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dragen" = callPackage
@@ -69989,6 +74684,8 @@ self: {
        ];
        description = "Automatic derivation of optimized QuickCheck random generators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "draw-poker" = callPackage
@@ -70020,6 +74717,8 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "A port of asciimoo's drawille to haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dresdner-verkehrsbetriebe" = callPackage
@@ -70042,6 +74741,8 @@ self: {
        ];
        description = "Library and program for querying DVB (Dresdner Verkehrsbetriebe AG)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "drifter" = callPackage
@@ -70058,6 +74759,8 @@ self: {
        ];
        description = "Simple schema management for arbitrary databases";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "drifter-postgresql" = callPackage
@@ -70078,6 +74781,8 @@ self: {
        ];
        description = "PostgreSQL support for the drifter schema migration tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "drifter-sqlite" = callPackage
@@ -70097,6 +74802,8 @@ self: {
        ];
        description = "SQLite support for the drifter schema migraiton tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "drinkery" = callPackage
@@ -70121,6 +74828,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A Haskell bindings to the DRMAA C library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {drmaa = null;};
 
   "drone" = callPackage
@@ -70139,6 +74848,8 @@ self: {
          microlens req servant-server text warp
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dropbox-sdk" = callPackage
@@ -70160,6 +74871,8 @@ self: {
        ];
        description = "A library to access the Dropbox HTTP API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dropsolve" = callPackage
@@ -70178,6 +74891,8 @@ self: {
        ];
        description = "A command line tool for resolving dropbox conflicts. Deprecated! Please use confsolve.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ds-kanren" = callPackage
@@ -70192,6 +74907,8 @@ self: {
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "A subset of the miniKanren language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dsc" = callPackage
@@ -70238,6 +74955,8 @@ self: {
        ];
        description = "SQL backend for Database Supported Haskell (DSH)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dsmc" = callPackage
@@ -70255,6 +74974,8 @@ self: {
        ];
        description = "DSMC library for rarefied gas dynamics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dsmc-tools" = callPackage
@@ -70274,6 +74995,8 @@ self: {
        ];
        description = "DSMC toolkit for rarefied gas dynamics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dson" = callPackage
@@ -70285,6 +75008,8 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "Haskell Doge Serialized Object Notation Parser";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dson-parsec" = callPackage
@@ -70296,6 +75021,8 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "DSON parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dsp" = callPackage
@@ -70321,6 +75048,8 @@ self: {
        libraryHaskellDepends = [ base base-unicode-symbols dlist ];
        description = "Difference strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dtab" = callPackage
@@ -70360,6 +75089,8 @@ self: {
        ];
        description = "Parse and render DTD files (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dtd-text" = callPackage
@@ -70375,6 +75106,8 @@ self: {
        ];
        description = "Parse and render XML DTDs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dtd-types" = callPackage
@@ -70416,6 +75149,8 @@ self: {
        ];
        description = "(Fast) Dynamic Time Warping";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dual" = callPackage
@@ -70448,6 +75183,8 @@ self: {
        ];
        description = "Network multiplayer 2D shooting game";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dual-tree" = callPackage
@@ -70482,6 +75219,8 @@ self: {
        ];
        description = "Automatically generate dual constructions";
        license = "AGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dublincore-xml-conduit" = callPackage
@@ -70565,6 +75304,8 @@ self: {
        ];
        description = "A tiny language, a subset of Haskell (with type classes) aimed at aiding teachers to teach Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dumb-cas" = callPackage
@@ -70584,6 +75325,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "A computer “algebra” system that knows nothing about algebra, at the core";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dump" = callPackage
@@ -70621,6 +75364,8 @@ self: {
        ];
        description = "A plug-in for rendering GHC core";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dunai" = callPackage
@@ -70636,6 +75381,8 @@ self: {
        ];
        description = "Generalised reactive framework supporting classic, arrowized and monadic FRP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dunai-core" = callPackage
@@ -70650,6 +75397,8 @@ self: {
        ];
        description = "Generalised reactive framework supporting classic, arrowized and monadic FRP. (Core library fork.)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dunai-test" = callPackage
@@ -70663,6 +75412,8 @@ self: {
        ];
        description = "Testing library for Dunai";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "duplo" = callPackage
@@ -70699,6 +75450,8 @@ self: {
        ];
        description = "Frontend development build tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dura" = callPackage
@@ -70712,6 +75465,8 @@ self: {
        libraryHaskellDepends = [ base bytestring directory filepath ];
        description = "durable/atomic file system writes (from rio package)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "duration" = callPackage
@@ -70768,6 +75523,8 @@ self: {
        ];
        description = "Dead simple password manager";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dvda" = callPackage
@@ -70790,6 +75547,8 @@ self: {
        ];
        description = "Efficient automatic differentiation and code generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dvdread" = callPackage
@@ -70803,6 +75562,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A monadic interface to libdvdread";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {dvdread = null;};
 
   "dvi-processing" = callPackage
@@ -70814,6 +75575,8 @@ self: {
        libraryHaskellDepends = [ base bytestring filepath transformers ];
        description = "Read/write DVI and TFM file";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dvorak" = callPackage
@@ -70838,6 +75601,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for DWARF debug format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dwarf-el" = callPackage
@@ -70872,6 +75637,8 @@ self: {
        executableHaskellDepends = [ base containers dwarf-el ];
        description = "High-level wrapper around the dwarf library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dwergaz" = callPackage
@@ -70884,6 +75651,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A minimal testing library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dx9base" = callPackage
@@ -70938,6 +75707,8 @@ self: {
        testHaskellDepends = [ ansi-terminal base hspec text ];
        description = "A library for working with binary Dyck words";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dyepack" = callPackage
@@ -70951,6 +75722,8 @@ self: {
        libraryHaskellDepends = [ base generics-sop ];
        description = "Programatically identify space leaks in your program";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dynamic" = callPackage
@@ -70988,6 +75761,8 @@ self: {
        ];
        description = "Access the functions from the Cabal library without depending on it";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dynamic-graph" = callPackage
@@ -71004,6 +75779,8 @@ self: {
        ];
        description = "Draw and update graphs in real time with OpenGL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dynamic-graphs" = callPackage
@@ -71031,6 +75808,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion primitive ];
        description = "Dynamic graph algorithms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dynamic-linker-template" = callPackage
@@ -71069,6 +75848,8 @@ self: {
        libraryHaskellDepends = [ base primitive vector ];
        description = "A wrapper around MVector that enables pushing, popping and extending";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dynamic-object" = callPackage
@@ -71087,6 +75868,8 @@ self: {
        ];
        description = "Object-oriented programming with duck typing and singleton classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dynamic-plot" = callPackage
@@ -71111,6 +75894,8 @@ self: {
        ];
        description = "Interactive diagram windows";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dynamic-pp" = callPackage
@@ -71131,6 +75916,8 @@ self: {
        ];
        description = "A pretty-print library that employs a dynamic programming algorithm for optimal rendering";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dynamic-state" = callPackage
@@ -71173,6 +75960,8 @@ self: {
        ];
        description = "Typesafe library for working with DynamoDB database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dynloader" = callPackage
@@ -71185,6 +75974,8 @@ self: {
        testHaskellDepends = [ base ghc ghc-paths hspec ];
        description = "Dynamically runtime loading packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dynobud" = callPackage
@@ -71216,6 +76007,8 @@ self: {
        ];
        description = "your dynamic optimization buddy";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dyre" = callPackage
@@ -71243,6 +76036,8 @@ self: {
        libraryHaskellDepends = [ base bytestring transformers ];
        description = "Bindings to the dywapitchtrack pitch tracking library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dzen-dhall" = callPackage
@@ -71278,6 +76073,8 @@ self: {
        ];
        description = "Configure dzen2 bars in Dhall language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dzen-utils" = callPackage
@@ -71289,6 +76086,8 @@ self: {
        libraryHaskellDepends = [ base colour process ];
        description = "Utilities for creating inputs for dzen";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "each" = callPackage
@@ -71348,6 +76147,8 @@ self: {
        testHaskellDepends = [ base filepath hspec ];
        description = "Ear Clipping Triangulation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ease" = callPackage
@@ -71359,6 +76160,8 @@ self: {
        libraryHaskellDepends = [ base data-default ];
        description = "Robert Penner's easing equations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "easy-api" = callPackage
@@ -71374,6 +76177,8 @@ self: {
        ];
        description = "Utility code for building HTTP API bindings more quickly";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "easy-bitcoin" = callPackage
@@ -71391,6 +76196,8 @@ self: {
        ];
        description = "types and functions for bitcoin applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "easy-file" = callPackage
@@ -71417,6 +76224,8 @@ self: {
        ];
        description = "Haskell JSON library with an emphasis on simplicity, minimal dependencies, and ease of use";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "easyplot" = callPackage
@@ -71428,6 +76237,8 @@ self: {
        libraryHaskellDepends = [ base process ];
        description = "A tiny plotting library, utilizes gnuplot for plotting";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "easyrender" = callPackage
@@ -71490,6 +76301,8 @@ self: {
        ];
        description = "Simple, expressive testing library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ebeats" = callPackage
@@ -71501,6 +76314,8 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "Time in ebeats";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ebnf-bff" = callPackage
@@ -71519,6 +76334,8 @@ self: {
        ];
        description = "Parser combinators & EBNF, BFFs!";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ec2-signature" = callPackage
@@ -71586,6 +76403,8 @@ self: {
        libraryHaskellDepends = [ base bytestring eccrypto ];
        description = "provides \"ed25519\" API using \"eccrypto\"";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ecdsa" = callPackage
@@ -71635,6 +76454,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A ECMA-262 interpreter library";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ecstasy" = callPackage
@@ -71668,6 +76489,8 @@ self: {
        executableSystemDepends = [ canlib ];
        description = "Tools for automotive ECU development";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {canlib = null;};
 
   "ed25519" = callPackage
@@ -71715,6 +76538,8 @@ self: {
        ];
        description = "Command line file filtering with haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ede" = callPackage
@@ -71752,6 +76577,8 @@ self: {
        libraryHaskellDepends = [ base containers deepseq parallel ];
        description = "Semi-explicit parallel programming library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "edenskel" = callPackage
@@ -71763,6 +76590,8 @@ self: {
        libraryHaskellDepends = [ base edenmodules parallel ];
        description = "Semi-explicit parallel programming skeleton library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "edentv" = callPackage
@@ -71783,6 +76612,8 @@ self: {
        ];
        description = "A Tool to Visualize Parallel Functional Program Executions";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "edf" = callPackage
@@ -71812,6 +76643,8 @@ self: {
        ];
        description = "Top view space combat arcade game";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "edges" = callPackage
@@ -71839,6 +76672,8 @@ self: {
        ];
        description = "Tools for efficient immutable graphs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "edis" = callPackage
@@ -71870,6 +76705,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A monad for rewriting things";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "edit-distance" = callPackage
@@ -71941,6 +76778,8 @@ self: {
        ];
        description = "Symmetric, stateful edit lenses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "edit-lenses-demo" = callPackage
@@ -71965,6 +76804,8 @@ self: {
        libraryHaskellDepends = [ base text vty vty-ui ];
        description = "Interactive editors for Generics";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "editline" = callPackage
@@ -71976,6 +76817,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Bindings to the editline library (libedit)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "editor-open" = callPackage
@@ -72033,6 +76876,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "effect-monad" = callPackage
@@ -72044,6 +76889,8 @@ self: {
        libraryHaskellDepends = [ base type-level-sets ];
        description = "Embeds effect systems and program logics into Haskell using graded monads and parameterised monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "effect-stack" = callPackage
@@ -72055,6 +76902,8 @@ self: {
        libraryHaskellDepends = [ base constraints mtl transformers ];
        description = "Reducing the pain of transformer stacks with duplicated effects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "effective-aspects" = callPackage
@@ -72130,46 +76979,11 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A Typeable-free implementation of extensible effects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "egison" = callPackage
-    ({ mkDerivation, array, base, containers, criterion, deepseq
-     , directory, filepath, ghc, ghc-paths, Glob, hashable, haskeline
-     , HUnit, megaparsec, mtl, optparse-applicative, parsec
-     , parser-combinators, prettyprinter, process, random, regex-tdfa
-     , split, test-framework, test-framework-hunit, text, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "egison";
-       version = "3.10.2";
-       sha256 = "04kk635qiv6y5g6y9gjhlh5x5ds7js127r8p2qdhq4da1yb39pqi";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array base containers directory ghc ghc-paths hashable haskeline
-         megaparsec mtl optparse-applicative parsec parser-combinators
-         prettyprinter process random regex-tdfa split text transformers
-         unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         array base containers directory filepath ghc ghc-paths haskeline
-         mtl optparse-applicative parsec prettyprinter process split text
-         transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base filepath Glob HUnit mtl test-framework test-framework-hunit
-         transformers
-       ];
-       benchmarkHaskellDepends = [
-         base criterion deepseq mtl transformers
-       ];
-       description = "Programming language with non-linear pattern-matching against non-free data";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "egison_3_10_3" = callPackage
     ({ mkDerivation, array, base, containers, criterion, deepseq
      , directory, filepath, ghc, ghc-paths, Glob, hashable, haskeline
      , HUnit, megaparsec, mtl, optparse-applicative, parsec
@@ -72204,7 +77018,6 @@ self: {
        ];
        description = "Programming language with non-linear pattern-matching against non-free data";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "egison-pattern-src" = callPackage
@@ -72268,6 +77081,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Parser and pretty printer for Egison pattern expressions to use with TH";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "egison-quote" = callPackage
@@ -72281,6 +77096,8 @@ self: {
        ];
        description = "A quasi quotes for using Egison expression in Haskell code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "egison-tutorial" = callPackage
@@ -72330,6 +77147,8 @@ self: {
        ];
        description = "like eruby, ehaskell is embedded haskell";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ehs" = callPackage
@@ -72350,6 +77169,8 @@ self: {
        ];
        description = "Embedded haskell template using quasiquotes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eibd-client-simple" = callPackage
@@ -72368,6 +77189,8 @@ self: {
        librarySystemDepends = [ eibclient ];
        description = "EIBd Client";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {eibclient = null;};
 
   "eigen" = callPackage
@@ -72387,6 +77210,8 @@ self: {
        ];
        description = "Eigen C++ library (linear algebra: matrices, sparse matrices, vectors, numerical solvers)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "either" = callPackage
@@ -72429,6 +77254,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Functions involving lists of Either";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "either-unwrap" = callPackage
@@ -72440,6 +77267,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Functions for probing and unwrapping values inside of Either";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eithers" = callPackage
@@ -72471,6 +77300,8 @@ self: {
        ];
        description = "Remote monitoring of processes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ekg-bosun" = callPackage
@@ -72488,6 +77319,8 @@ self: {
        ];
        description = "Send ekg metrics to a Bosun instance";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ekg-carbon" = callPackage
@@ -72504,6 +77337,8 @@ self: {
        ];
        description = "An EKG backend to send statistics to Carbon (part of Graphite monitoring tools)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ekg-cloudwatch" = callPackage
@@ -72521,6 +77356,8 @@ self: {
        ];
        description = "An ekg backend for Amazon Cloudwatch";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ekg-core" = callPackage
@@ -72537,6 +77374,8 @@ self: {
        benchmarkHaskellDepends = [ base ];
        description = "Tracking of system metrics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ekg-elastic" = callPackage
@@ -72553,6 +77392,8 @@ self: {
        ];
        description = "Push metrics to elastic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ekg-elasticsearch" = callPackage
@@ -72570,6 +77411,8 @@ self: {
        ];
        description = "Push metrics to elasticsearch";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ekg-influxdb" = callPackage
@@ -72586,6 +77429,8 @@ self: {
        ];
        description = "An EKG backend to send statistics to influxdb";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ekg-json" = callPackage
@@ -72602,6 +77447,8 @@ self: {
        ];
        description = "JSON encoding of ekg metrics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ekg-log" = callPackage
@@ -72618,6 +77465,8 @@ self: {
        ];
        description = "Push metrics to a log file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ekg-prometheus-adapter" = callPackage
@@ -72637,6 +77486,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Easily expose your EKG metrics to Prometheus";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ekg-push" = callPackage
@@ -72654,6 +77505,8 @@ self: {
        ];
        description = "Small framework to push metric deltas to a broadcast channel using the ekg-core library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ekg-rrd" = callPackage
@@ -72674,6 +77527,8 @@ self: {
        ];
        description = "Passes ekg statistics to rrdtool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ekg-statsd" = callPackage
@@ -72691,6 +77546,8 @@ self: {
        ];
        description = "Push metrics to statsd";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ekg-wai" = callPackage
@@ -72711,6 +77568,8 @@ self: {
        ];
        description = "Remote monitoring of processes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "elbow" = callPackage
@@ -72773,6 +77632,8 @@ self: {
        executableHaskellDepends = [ base elerea GLFW OpenGL ];
        description = "Example applications for Elerea";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "elerea-sdl" = callPackage
@@ -72796,6 +77657,8 @@ self: {
        libraryHaskellDepends = [ base extensible transformers ];
        description = "Immediately lifts to a desired level";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "elf" = callPackage
@@ -72840,6 +77703,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Arrows with holes";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "elliptic-curve" = callPackage
@@ -73188,6 +78053,8 @@ self: {
        doHaddock = false;
        description = "Crossing the road between Haskell and Elm";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "elm-syntax" = callPackage
@@ -73237,6 +78104,8 @@ self: {
        ];
        description = "Generate ELM code from a Wai websocket application";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "elm-yesod" = callPackage
@@ -73351,6 +78220,8 @@ self: {
        testHaskellDepends = [ base directory filepath tasty tasty-hunit ];
        description = "A tiny language for understanding the lambda-calculus";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "elynx-seq" = callPackage
@@ -73379,6 +78250,8 @@ self: {
        ];
        description = "Handle molecular sequences";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "elynx-tools" = callPackage
@@ -73401,6 +78274,8 @@ self: {
        ];
        description = "Tools for ELynx";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "elynx-tree" = callPackage
@@ -73433,6 +78308,8 @@ self: {
        ];
        description = "Handle phylogenetic trees";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "emacs-keys" = callPackage
@@ -73451,6 +78328,8 @@ self: {
        ];
        description = "library to parse emacs style keybinding into the modifiers and the chars";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "emacs-module" = callPackage
@@ -73486,6 +78365,8 @@ self: {
        ];
        description = "Sending eMail in Haskell made easy";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "email-header" = callPackage
@@ -73507,6 +78388,8 @@ self: {
        ];
        description = "Parsing and rendering of email and MIME headers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "email-postmark" = callPackage
@@ -73522,6 +78405,8 @@ self: {
        ];
        description = "A simple wrapper to send emails via the api of the service postmark (http://postmarkapp.com/)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "email-validate" = callPackage
@@ -73616,6 +78501,8 @@ self: {
        ];
        description = "An email parser that will parse everything";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "embeddock" = callPackage
@@ -73632,6 +78519,8 @@ self: {
        ];
        description = "Embed the values in scope in the haddock documentation of the module";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "embeddock-example" = callPackage
@@ -73643,6 +78532,8 @@ self: {
        libraryHaskellDepends = [ base embeddock time ];
        description = "Example of using embeddock";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "embla" = callPackage
@@ -73654,6 +78545,8 @@ self: {
        libraryHaskellDepends = [ base chronos ];
        description = "execute actions periodically while avoiding drift";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "embroidery" = callPackage
@@ -73672,6 +78565,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "support for embroidery formats in haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "emd" = callPackage
@@ -73714,6 +78609,8 @@ self: {
        testHaskellDepends = [ base HUnit QuickCheck syb ];
        description = "Extensible and Modular Generics for the Masses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "emoji" = callPackage
@@ -73766,6 +78663,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A container that always has no values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "enchant" = callPackage
@@ -73782,6 +78681,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Binding to the Enchant library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) enchant;};
 
   "enclosed-exceptions" = callPackage
@@ -73839,6 +78740,8 @@ self: {
        testHaskellDepends = [ base bytestring HUnit QuickCheck ];
        description = "A library for various character encodings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "encoding-io" = callPackage
@@ -73852,6 +78755,8 @@ self: {
        ];
        description = "Encoding-aware file I/O";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "endo" = callPackage
@@ -73908,6 +78813,8 @@ self: {
        ];
        description = "A Haskell implementation of Engine.IO";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "engine-io-growler" = callPackage
@@ -73926,6 +78833,8 @@ self: {
          unordered-containers wai wai-websockets websockets
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "engine-io-snap" = callPackage
@@ -73942,6 +78851,8 @@ self: {
          snap-core unordered-containers websockets websockets-snap
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "engine-io-wai" = callPackage
@@ -73960,6 +78871,8 @@ self: {
        ];
        description = "An @engine-io@ @ServerAPI@ that is compatible with @Wai@";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "engine-io-yesod" = callPackage
@@ -73976,6 +78889,8 @@ self: {
          unordered-containers wai wai-websockets websockets yesod-core
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "engineering-units" = callPackage
@@ -74003,6 +78918,8 @@ self: {
        executableHaskellDepends = [ base matrix quipper-core ];
        description = "An application (and library) to convert quipper circuits into Qpmc models";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "entropy" = callPackage
@@ -74046,6 +78963,8 @@ self: {
        ];
        description = "entwine - Concurrency tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "enum-subset-generate" = callPackage
@@ -74078,6 +78997,8 @@ self: {
        ];
        description = "A text rendering and parsing toolkit for enumerated types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "enum-text-rio" = callPackage
@@ -74094,6 +79015,8 @@ self: {
        ];
        description = "Making fmt available with rio";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "enum-types" = callPackage
@@ -74121,6 +79044,8 @@ self: {
        ];
        description = "An experimental Utf8 parsing toolkit for enumerated types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "enumerable" = callPackage
@@ -74151,6 +79076,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "enumerate all the values in a finite type (automatically)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "enumerate-function" = callPackage
@@ -74171,6 +79098,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "simple package for inverting functions and testing totality, via brute enumeration of the domain";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "enumeration" = callPackage
@@ -74203,6 +79132,8 @@ self: {
        ];
        description = "Reliable, high-performance processing with left-fold enumerators";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "enumerator-fd" = callPackage
@@ -74214,6 +79145,8 @@ self: {
        libraryHaskellDepends = [ base enumerator mtl ];
        description = "Enumerator instances for monads-fd classes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "enumerator-tf" = callPackage
@@ -74225,6 +79158,8 @@ self: {
        libraryHaskellDepends = [ base enumerator monads-tf ];
        description = "Enumerator instances for monads-tf classes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "enumfun" = callPackage
@@ -74236,6 +79171,8 @@ self: {
        libraryHaskellDepends = [ base enummapset-th ];
        description = "Finitely represented /total/ EnumMaps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "enummapmap" = callPackage
@@ -74260,6 +79197,8 @@ self: {
        ];
        description = "Map of maps using Enum types as keys";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "enummapset" = callPackage
@@ -74293,6 +79232,8 @@ self: {
        ];
        description = "TH-generated EnumSet/EnumMap wrappers around IntSet/IntMap";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "enumset" = callPackage
@@ -74354,6 +79295,8 @@ self: {
        ];
        description = "Pull configuration information from the ENV";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "envelope" = callPackage
@@ -74401,6 +79344,8 @@ self: {
        ];
        description = "Display efficiently the state of the local environment";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "envy" = callPackage
@@ -74448,6 +79393,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell binding for EPANET";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "epass" = callPackage
@@ -74459,6 +79406,8 @@ self: {
        libraryHaskellDepends = [ base stm time ];
        description = "Baisc, Erlang-like message passing supporting sockets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "epic" = callPackage
@@ -74476,6 +79425,8 @@ self: {
        ];
        description = "Compiler for a simple functional language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "epoll" = callPackage
@@ -74489,6 +79440,8 @@ self: {
        libraryHaskellDepends = [ base unix ];
        description = "epoll bindings";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eprocess" = callPackage
@@ -74501,6 +79454,8 @@ self: {
        libraryHaskellDepends = [ base exceptions mtl ];
        description = "Basic Erlang-like process support for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "epub" = callPackage
@@ -74578,6 +79533,8 @@ self: {
        ];
        description = "Rename epub ebook files based on meta information";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eq" = callPackage
@@ -74721,6 +79678,8 @@ self: {
        libraryHaskellDepends = [ base polynomial ];
        description = "Native Haskell implementation of the interface from the erf package";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "erlang" = callPackage
@@ -74736,6 +79695,8 @@ self: {
        ];
        description = "FFI interface to Erlang";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eros" = callPackage
@@ -74748,6 +79709,8 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring containers text ];
        description = "A text censorship library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eros-client" = callPackage
@@ -74766,6 +79729,8 @@ self: {
        ];
        description = "DEPRECATED in favor of eros-http";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eros-http" = callPackage
@@ -74785,6 +79750,8 @@ self: {
        ];
        description = "JSON HTTP interface to Eros";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "errno" = callPackage
@@ -74842,6 +79809,8 @@ self: {
        ];
        description = "Provides API for enriching errors with contexts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "error-continuations" = callPackage
@@ -74853,6 +79822,8 @@ self: {
        libraryHaskellDepends = [ base either mtl transformers ];
        description = "Error Continuations";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "error-list" = callPackage
@@ -74864,6 +79835,8 @@ self: {
        libraryHaskellDepends = [ base mtl text text-render ];
        description = "A useful type for collecting error messages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "error-loc" = callPackage
@@ -74875,6 +79848,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "An error replacement with call-site metadata";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "error-location" = callPackage
@@ -74901,6 +79876,8 @@ self: {
        ];
        description = "Composable error messages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "error-util" = callPackage
@@ -74912,6 +79889,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Set of utils and operators for error handling";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "errorcall-eq-instance" = callPackage
@@ -74958,6 +79937,8 @@ self: {
        ];
        description = "`bracket`-like functions for `ExceptT` over `IO` monad";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ersaconcat" = callPackage
@@ -74981,6 +79962,8 @@ self: {
        ];
        description = "A script to concatenate AIP ERSA";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ersatz" = callPackage
@@ -75007,6 +79990,8 @@ self: {
        testHaskellDepends = [ array base directory doctest filepath ];
        description = "A monad for expressing SAT or QSAT problems using observable sharing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ersatz-toysat" = callPackage
@@ -75024,6 +80009,8 @@ self: {
        ];
        description = "toysat driver as backend for ersatz";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ert" = callPackage
@@ -75046,6 +80033,8 @@ self: {
        ];
        description = "Easy Runtime Templates";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "escape-artist" = callPackage
@@ -75109,6 +80098,8 @@ self: {
        doHaddock = false;
        description = "Terminal fuzzy selector";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "esotericbot" = callPackage
@@ -75132,6 +80123,8 @@ self: {
        doHaddock = false;
        description = "Esotericbot is a sophisticated, lightweight IRC bot";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "espial" = callPackage
@@ -75196,6 +80189,8 @@ self: {
        ];
        description = "Espial is an open-source, web-based bookmarking server";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "esqueleto" = callPackage
@@ -75235,6 +80230,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "The type-level S combinator in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "essence-of-live-coding" = callPackage
@@ -75257,6 +80254,8 @@ self: {
        ];
        description = "General purpose live coding framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "essence-of-live-coding-gloss" = callPackage
@@ -75272,6 +80271,8 @@ self: {
        ];
        description = "General purpose live coding framework - Gloss backend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "essence-of-live-coding-pulse" = callPackage
@@ -75287,6 +80288,8 @@ self: {
        ];
        description = "General purpose live coding framework - pulse backend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "essence-of-live-coding-quickcheck" = callPackage
@@ -75303,6 +80306,8 @@ self: {
        ];
        description = "General purpose live coding framework - QuickCheck integration";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "estimator" = callPackage
@@ -75333,6 +80338,8 @@ self: {
        ];
        description = "Tool for managing probability estimation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "estreps" = callPackage
@@ -75349,6 +80356,8 @@ self: {
        ];
        description = "Repeats from ESTs";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "etc" = callPackage
@@ -75401,6 +80410,8 @@ self: {
        ];
        description = "everything breaking the Fairbairn threshold";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eternity" = callPackage
@@ -75421,6 +80432,8 @@ self: {
        ];
        description = "Native event-sourcing database";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eternity-timestamped" = callPackage
@@ -75438,6 +80451,8 @@ self: {
        ];
        description = "Automatic timestamping for Eternity";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ether" = callPackage
@@ -75466,6 +80481,8 @@ self: {
        ];
        description = "Monad transformers and classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ethereum-analyzer" = callPackage
@@ -75489,6 +80506,8 @@ self: {
        ];
        description = "A Ethereum contract analyzer";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ethereum-analyzer-cli" = callPackage
@@ -75516,6 +80535,8 @@ self: {
        ];
        description = "A CLI frontend for ethereum-analyzer";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ethereum-analyzer-deps" = callPackage
@@ -75561,6 +80582,8 @@ self: {
        ];
        description = "A web frontend for ethereum-analyzer";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ethereum-client-haskell" = callPackage
@@ -75589,6 +80612,8 @@ self: {
        ];
        description = "A Haskell version of an Ethereum client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ethereum-merkle-patricia-db" = callPackage
@@ -75613,6 +80638,8 @@ self: {
        ];
        description = "A modified Merkle Patricia DB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ethereum-rlp" = callPackage
@@ -75647,6 +80674,8 @@ self: {
        ];
        description = "Ethereum Recursive Length Prefix Encoding";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ety" = callPackage
@@ -75732,6 +80761,8 @@ self: {
        ];
        description = "Dynamic network FRP with events and continuous values";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eurofxref" = callPackage
@@ -75749,6 +80780,8 @@ self: {
        ];
        description = "Free foreign exchange/currency feed from the European Central Bank";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "evdev" = callPackage
@@ -75789,6 +80822,8 @@ self: {
        ];
        description = "An extensible event framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eve-cli" = callPackage
@@ -75805,6 +80840,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring eve lens mtl text vty ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "event" = callPackage
@@ -75818,6 +80855,8 @@ self: {
        ];
        description = "Monoidal, monadic and first-class events";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "event-driven" = callPackage
@@ -75829,6 +80868,8 @@ self: {
        libraryHaskellDepends = [ base monads-tf yjtools ];
        description = "library for event driven programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "event-handlers" = callPackage
@@ -75875,6 +80916,8 @@ self: {
        ];
        description = "Event-graph simulation monad transformer";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "event-transformer" = callPackage
@@ -75935,6 +80978,8 @@ self: {
        ];
        description = "Library for eventful DynamoDB event stores";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eventful-memory" = callPackage
@@ -75976,6 +81021,8 @@ self: {
        ];
        description = "Postgres implementations for eventful";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eventful-sql-common" = callPackage
@@ -75994,6 +81041,8 @@ self: {
        ];
        description = "Common library for SQL event stores";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eventful-sqlite" = callPackage
@@ -76016,6 +81065,8 @@ self: {
        ];
        description = "SQLite implementations for eventful";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eventful-test-helpers" = callPackage
@@ -76053,6 +81104,8 @@ self: {
        executableHaskellDepends = [ aeson base filepath text ];
        description = "Visualise an eventlog";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eventloop" = callPackage
@@ -76069,6 +81122,8 @@ self: {
        ];
        description = "A different take on an IO system. Based on Amanda's IO loop, this eventloop takes a function that maps input events to output events. It can easily be extended by modules that represent IO devices or join multiple modules together.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eventsource-api" = callPackage
@@ -76112,6 +81167,8 @@ self: {
        ];
        description = "GetEventStore store implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "eventsource-store-specs" = callPackage
@@ -76205,6 +81262,8 @@ self: {
        description = "EventStore TCP Client";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "every" = callPackage
@@ -76227,6 +81286,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "A functional pearl on encoding and decoding using question-and-answer strategies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ewe" = callPackage
@@ -76246,6 +81307,8 @@ self: {
        executableToolDepends = [ alex happy uuagc ];
        description = "An interpreter for EWE programming language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ex-pool" = callPackage
@@ -76286,6 +81349,8 @@ self: {
        testHaskellDepends = [ base containers tasty tasty-hunit ];
        description = "Efficient exact cover solver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exact-pi" = callPackage
@@ -76323,6 +81388,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Exact real arithmetic";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exact-real-positional" = callPackage
@@ -76334,6 +81401,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Framework for Exact Real Arithmetic in the Positional Number System";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "except-exceptions" = callPackage
@@ -76347,6 +81416,8 @@ self: {
        libraryHaskellDepends = [ base exceptions transformers ];
        description = "Safely deal with exceptions in ExceptT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exception-hierarchy" = callPackage
@@ -76384,6 +81455,8 @@ self: {
        ];
        description = "Exception monad transformer instances for monads-fd classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exception-monads-tf" = callPackage
@@ -76442,6 +81515,8 @@ self: {
        libraryHaskellDepends = [ base exceptions ];
        description = "Essentially the Maybe type with error messages";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exceptionfree-readfile" = callPackage
@@ -76457,6 +81532,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "An exception-free readFile for use with '+RTS -xc -RTS' projects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exceptions" = callPackage
@@ -76505,6 +81582,8 @@ self: {
        ];
        description = "A Haskell client for https://exchangeratesapi.io/";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "execs" = callPackage
@@ -76519,6 +81598,8 @@ self: {
        executableHaskellDepends = [ base directory process text ];
        description = "Tool to run stack exec prj-exe more easy";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "executable-hash" = callPackage
@@ -76566,6 +81647,8 @@ self: {
        testHaskellDepends = [ async base doctest hspec process ];
        description = "Shell helpers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exference" = callPackage
@@ -76596,6 +81679,8 @@ self: {
        ];
        description = "Tool to search/generate (haskell) expressions with a given type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exhaustive" = callPackage
@@ -76634,6 +81719,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Exheres generator for cabal packages";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exif" = callPackage
@@ -76646,6 +81733,8 @@ self: {
        librarySystemDepends = [ exif ];
        description = "A Haskell binding to a subset of libexif";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) exif;};
 
   "exinst" = callPackage
@@ -76667,6 +81756,8 @@ self: {
        ];
        description = "Dependent pairs and their instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exinst-aeson" = callPackage
@@ -76685,6 +81776,8 @@ self: {
        ];
        description = "Dependent pairs and their instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exinst-bytes" = callPackage
@@ -76705,6 +81798,8 @@ self: {
        ];
        description = "Dependent pairs and their instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exinst-cereal" = callPackage
@@ -76724,6 +81819,8 @@ self: {
        ];
        description = "Dependent pairs and their instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exinst-deepseq" = callPackage
@@ -76735,6 +81832,8 @@ self: {
        libraryHaskellDepends = [ base constraints deepseq exinst ];
        description = "Derive instances for the `deepseq` library for your existential types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exinst-hashable" = callPackage
@@ -76748,6 +81847,8 @@ self: {
        ];
        description = "Derive instances for the `hashable` library for your existential types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exinst-serialise" = callPackage
@@ -76766,6 +81867,8 @@ self: {
        ];
        description = "Dependent pairs and their instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exist" = callPackage
@@ -76825,6 +81928,8 @@ self: {
        libraryHaskellDepends = [ base contravariant ];
        description = "Existential datatypes holding evidence of constraints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exit-codes" = callPackage
@@ -76856,6 +81961,8 @@ self: {
        ];
        description = "Monad transformer for exit codes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exomizer" = callPackage
@@ -76938,6 +82045,8 @@ self: {
        ];
        description = "Extensible Pandoc";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "expat-enumerator" = callPackage
@@ -76953,6 +82062,8 @@ self: {
        ];
        description = "Enumerator-based API for Expat";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "expiring-cache-map" = callPackage
@@ -76994,6 +82105,8 @@ self: {
        ];
        description = "Expiring containers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "expiring-mvar" = callPackage
@@ -77020,6 +82133,8 @@ self: {
        ];
        description = "Show how expressions are parsed";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "explicit-constraint-lens" = callPackage
@@ -77034,6 +82149,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Fully-flexible polymorphic lenses, without any bizarre profunctors";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "explicit-determinant" = callPackage
@@ -77045,6 +82162,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "explicit computation of determinant of small matrices";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "explicit-exception" = callPackage
@@ -77069,6 +82188,8 @@ self: {
        libraryHaskellDepends = [ base base-unicode-symbols tagged ];
        description = "File handles with explicit IOModes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "explicit-iomodes-bytestring" = callPackage
@@ -77080,6 +82201,8 @@ self: {
        libraryHaskellDepends = [ base bytestring explicit-iomodes ];
        description = "Extends explicit-iomodes with ByteString operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "explicit-iomodes-text" = callPackage
@@ -77091,6 +82214,8 @@ self: {
        libraryHaskellDepends = [ base explicit-iomodes text ];
        description = "Extends explicit-iomodes with Text operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "explicit-sharing" = callPackage
@@ -77104,6 +82229,8 @@ self: {
        ];
        description = "Explicit Sharing of Monadic Effects";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "explore" = callPackage
@@ -77117,6 +82244,8 @@ self: {
        executableHaskellDepends = [ array base directory pngload ];
        description = "Experimental Plot data Reconstructor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "exposed-containers" = callPackage
@@ -77137,6 +82266,8 @@ self: {
        ];
        description = "A distribution of the 'containers' package, with all modules exposed";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "express" = callPackage
@@ -77161,6 +82292,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Generalization of parsec's expression parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "expressions" = callPackage
@@ -77178,6 +82311,8 @@ self: {
        testHaskellDepends = [ base singletons text ];
        description = "Expressions and Formulae a la carte";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "expressions-z3" = callPackage
@@ -77196,6 +82331,8 @@ self: {
        ];
        description = "Encode and Decode expressions from Z3 ASTs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "expresso" = callPackage
@@ -77224,6 +82361,8 @@ self: {
        ];
        description = "A simple expressions language based on row types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "extcore" = callPackage
@@ -77241,6 +82380,8 @@ self: {
        ];
        description = "Libraries for processing GHC Core";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "extemp" = callPackage
@@ -77263,6 +82404,8 @@ self: {
        ];
        description = "automated printing for extemp speakers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "extend-record-data-th" = callPackage
@@ -77286,6 +82429,8 @@ self: {
        libraryHaskellDepends = [ base constraints ghc-prim tagged ];
        description = "Extended Categories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "extended-reals" = callPackage
@@ -77342,6 +82487,8 @@ self: {
        ];
        description = "Sums/products/lists/trees which can be extended in other modules";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "extensible-effects" = callPackage
@@ -77399,6 +82546,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Message passing concurrency as extensible-effect";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "extensible-exceptions" = callPackage
@@ -77428,6 +82577,8 @@ self: {
        testHaskellDepends = [ base extensible ];
        description = "Operational-based extensible effect library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "extensible-sp" = callPackage
@@ -77452,25 +82603,11 @@ self: {
        ];
        description = "Sort large arrays on your hard drive. Kind of like the unix util sort.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "extra" = callPackage
-    ({ mkDerivation, base, clock, directory, filepath, process
-     , QuickCheck, semigroups, time, unix
-     }:
-     mkDerivation {
-       pname = "extra";
-       version = "1.6.19";
-       sha256 = "009k43i24aa9zs3hvzs6lr0knkgqv19fil4r15mwxyaca8kg52xv";
-       libraryHaskellDepends = [
-         base clock directory filepath process semigroups time unix
-       ];
-       testHaskellDepends = [ base directory filepath QuickCheck unix ];
-       description = "Extra functions I use";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "extra_1_6_20" = callPackage
     ({ mkDerivation, base, clock, directory, filepath, process
      , QuickCheck, semigroups, time, unix
      }:
@@ -77484,7 +82621,6 @@ self: {
        testHaskellDepends = [ base directory filepath QuickCheck unix ];
        description = "Extra functions I use";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extract-dependencies" = callPackage
@@ -77505,6 +82641,8 @@ self: {
        ];
        description = "Given a hackage package outputs the list of its dependencies";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "extractable-singleton" = callPackage
@@ -77534,6 +82672,8 @@ self: {
        ];
        description = "Extract an ELF's metadata and sections into files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "extralife" = callPackage
@@ -77549,6 +82689,8 @@ self: {
        ];
        description = "API Client for ExtraLife team and user data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "extrapolate" = callPackage
@@ -77588,6 +82730,8 @@ self: {
        ];
        description = "A high level static library for working with CouchDB";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ez3" = callPackage
@@ -77601,6 +82745,8 @@ self: {
        libraryHaskellDepends = [ base transformers z3 ];
        description = "Z3 bonds with pure interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "f-algebra-gen" = callPackage
@@ -77612,6 +82758,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Generate a special f-algebra combinator from any data type";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "f-ree-hack-cheats-free-v-bucks-generator" = callPackage
@@ -77627,6 +82775,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "faceted" = callPackage
@@ -77638,6 +82788,8 @@ self: {
        libraryHaskellDepends = [ base free ];
        description = "Faceted computation for dynamic information flow security";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "factory" = callPackage
@@ -77676,6 +82828,8 @@ self: {
        libraryHaskellDepends = [ base exceptions mtl template-haskell ];
        description = "Refined types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "factual-api" = callPackage
@@ -77693,6 +82847,8 @@ self: {
        ];
        description = "A driver for the Factual API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fad" = callPackage
@@ -77726,6 +82882,8 @@ self: {
        ];
        description = "Minimal library for music generation and notation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fadno-braids" = callPackage
@@ -77742,6 +82900,8 @@ self: {
        ];
        description = "Braid representations in Haskell";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fadno-xml" = callPackage
@@ -77756,6 +82916,8 @@ self: {
        ];
        description = "XML/XSD combinators/schemas/codegen";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fail" = callPackage
@@ -77789,6 +82951,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A list-like type for lazy streams, which might terminate with an error";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "failure" = callPackage
@@ -77816,6 +82980,8 @@ self: {
        ];
        description = "Failure Detectors implimented in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fair" = callPackage
@@ -77871,6 +83037,8 @@ self: {
        librarySystemDepends = [ libXtst ];
        description = "A crossplatform library to simulate keyboard input";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs.xorg) libXtst;};
 
   "fakedata" = callPackage
@@ -77978,6 +83146,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Faktory Worker for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fallible" = callPackage
@@ -78008,6 +83178,8 @@ self: {
        ];
        description = "Falling sand game/cellular automata simulation using regular parallel arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fallingblocks" = callPackage
@@ -78026,6 +83198,8 @@ self: {
        ];
        description = "A fun falling blocks game";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "familiar-reflection" = callPackage
@@ -78053,6 +83227,8 @@ self: {
        ];
        description = "A family tree library for the Haskell programming language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "farmhash" = callPackage
@@ -78082,6 +83258,8 @@ self: {
        doHaddock = false;
        description = "Fast functions on integers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fast-builder" = callPackage
@@ -78120,6 +83298,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Fast combinatorics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fast-digits" = callPackage
@@ -78139,6 +83319,8 @@ self: {
        doHaddock = false;
        description = "Integer-to-digits conversion";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fast-downward" = callPackage
@@ -78206,6 +83388,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Natural Numbers with no overhead";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fast-tags" = callPackage
@@ -78275,6 +83459,8 @@ self: {
        ];
        description = "A simple, mindless parser for fasta files";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fastbayes" = callPackage
@@ -78286,6 +83472,8 @@ self: {
        libraryHaskellDepends = [ base hmatrix vector ];
        description = "Bayesian modeling algorithms accelerated for particular model structures";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fastcgi" = callPackage
@@ -78319,6 +83507,8 @@ self: {
        ];
        description = "find nearest neighbours by edit-distance";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fastirc" = callPackage
@@ -78335,6 +83525,8 @@ self: {
        ];
        description = "Fast Internet Relay Chat (IRC) library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fastly" = callPackage
@@ -78354,6 +83546,8 @@ self: {
        testHaskellDepends = [ base hspec text ];
        description = "A highly experimental Fastly API client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fastparser" = callPackage
@@ -78372,6 +83566,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "A fast, but bare bones, bytestring parser combinators library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fastpbkdf2" = callPackage
@@ -78423,6 +83619,8 @@ self: {
        ];
        description = "Utilities for working with DuckDuckHack's FatHead Instant Answers";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fault-tree" = callPackage
@@ -78434,6 +83632,8 @@ self: {
        libraryHaskellDepends = [ base yices ];
        description = "A fault tree analysis library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fay" = callPackage
@@ -78464,6 +83664,8 @@ self: {
        executableHaskellDepends = [ base mtl optparse-applicative split ];
        description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fay-base" = callPackage
@@ -78476,6 +83678,8 @@ self: {
        libraryHaskellDepends = [ base fay ];
        description = "The base package for Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fay-builder" = callPackage
@@ -78493,6 +83697,8 @@ self: {
        ];
        description = "Compile Fay code on cabal install, and ad-hoc recompile during development";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fay-dom" = callPackage
@@ -78507,6 +83713,8 @@ self: {
        libraryHaskellDepends = [ fay-base ];
        description = "DOM FFI wrapper library for Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fay-geoposition" = callPackage
@@ -78519,6 +83727,8 @@ self: {
        libraryHaskellDepends = [ fay-base fay-text ];
        description = "W3C compliant implementation of GeoPosition API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fay-hsx" = callPackage
@@ -78531,6 +83741,8 @@ self: {
        libraryHaskellDepends = [ fay-base fay-jquery ];
        description = "Clientside HTML generation for fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fay-jquery" = callPackage
@@ -78543,6 +83755,8 @@ self: {
        libraryHaskellDepends = [ fay-base fay-text ];
        description = "jQuery bindings for Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fay-ref" = callPackage
@@ -78555,6 +83769,8 @@ self: {
        libraryHaskellDepends = [ fay-base ];
        description = "Like IORef but for Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fay-simplejson" = callPackage
@@ -78567,6 +83783,8 @@ self: {
        libraryHaskellDepends = [ fay-base ];
        description = "SimpleJSON library for Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fay-text" = callPackage
@@ -78581,6 +83799,8 @@ self: {
        libraryHaskellDepends = [ fay fay-base text ];
        description = "Fay Text type represented as JavaScript strings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fay-uri" = callPackage
@@ -78593,6 +83813,8 @@ self: {
        libraryHaskellDepends = [ fay-base ];
        description = "Persistent FFI bindings for using jsUri in Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fay-websockets" = callPackage
@@ -78605,6 +83827,8 @@ self: {
        libraryHaskellDepends = [ fay-base ];
        description = "Websockets FFI library for Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fb" = callPackage
@@ -78642,6 +83866,8 @@ self: {
        libraryHaskellDepends = [ base cereal fb persistent text time ];
        description = "Provides Persistent instances to Facebook types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fbmessenger-api" = callPackage
@@ -78670,6 +83896,8 @@ self: {
        testHaskellDepends = [ aeson base bytestring filepath hspec text ];
        description = "High-level bindings to Facebook Messenger Platform API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fca" = callPackage
@@ -78686,6 +83914,8 @@ self: {
        ];
        description = "Algo for Formal Concept Analysis";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fcache" = callPackage
@@ -78702,6 +83932,8 @@ self: {
        testHaskellDepends = [ base hspec mtl ];
        description = "Cache a function (a -> b)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fcd" = callPackage
@@ -78721,6 +83953,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "A faster way to navigate directories using the command line";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fcf-containers" = callPackage
@@ -78748,6 +83982,8 @@ self: {
        isExecutable = true;
        description = "TBA";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fckeditor" = callPackage
@@ -78759,6 +83995,8 @@ self: {
        libraryHaskellDepends = [ base cgi HaXml xhtml ];
        description = "Server-Side Integration for FCKeditor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fclabels" = callPackage
@@ -78789,6 +84027,8 @@ self: {
        libraryHaskellDepends = [ base fclabels monadLib ];
        description = "MonadLib monadic interface for the \"fclabels\" package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fcm-client" = callPackage
@@ -78820,6 +84060,8 @@ self: {
        ];
        description = "Admin API for Firebase Cloud Messaging";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fdo-notify" = callPackage
@@ -78851,6 +84093,8 @@ self: {
        ];
        description = "Utilities related to freedesktop Trash standard";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "feather" = callPackage
@@ -78891,6 +84135,8 @@ self: {
        ];
        description = "A minimally obtrusive feature flag library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "feature-flipper-postgres" = callPackage
@@ -78912,6 +84158,8 @@ self: {
        ];
        description = "A minimally obtrusive feature flag library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fec" = callPackage
@@ -78973,6 +84221,8 @@ self: {
        ];
        description = "Fedora image download tool";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fedora-packages" = callPackage
@@ -78995,6 +84245,8 @@ self: {
        ];
        description = "Haskell interface to the Fedora Packages webapp API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fee-estimate" = callPackage
@@ -79052,6 +84304,8 @@ self: {
        ];
        description = "A simple command line interface for creating and updating feeds like RSS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "feed-collect" = callPackage
@@ -79069,6 +84323,8 @@ self: {
        ];
        description = "Watch RSS/Atom feeds (and do with them whatever you like)";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "feed-crawl" = callPackage
@@ -79085,6 +84341,8 @@ self: {
        ];
        description = "Utility for fetching feeds with redirect info and HTML link detection";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "feed-gipeda" = callPackage
@@ -79123,6 +84381,8 @@ self: {
        ];
        description = "CI service around gipeda";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "feed-translator" = callPackage
@@ -79144,6 +84404,8 @@ self: {
        ];
        description = "Translate syndication feeds";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "feed2lj" = callPackage
@@ -79162,6 +84424,8 @@ self: {
        ];
        description = "(unsupported)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "feed2twitter" = callPackage
@@ -79178,6 +84442,8 @@ self: {
        ];
        description = "Send posts from a feed to Twitter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fei-base" = callPackage
@@ -79203,6 +84469,8 @@ self: {
        executableSystemDepends = [ mxnet ];
        description = "FFI to MXNet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) mxnet;};
 
   "fei-cocoapi" = callPackage
@@ -79231,6 +84499,8 @@ self: {
        ];
        description = "Cocodataset with cocoapi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fei-dataiter" = callPackage
@@ -79257,6 +84527,8 @@ self: {
        testHaskellDepends = [ base fei-base hspec streaming ];
        description = "mxnet dataiters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) mxnet;};
 
   "fei-examples" = callPackage
@@ -79278,6 +84550,8 @@ self: {
        ];
        description = "fei examples";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fei-nn" = callPackage
@@ -79303,6 +84577,8 @@ self: {
        ];
        description = "Train a neural network with MXNet in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "feldspar-compiler" = callPackage
@@ -79331,6 +84607,8 @@ self: {
        ];
        description = "Compiler for the Feldspar language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gcc_s = null;};
 
   "feldspar-language" = callPackage
@@ -79354,6 +84632,8 @@ self: {
        ];
        description = "A functional embedded language for DSP and parallelism";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "feldspar-signal" = callPackage
@@ -79426,6 +84706,8 @@ self: {
        executableSystemDepends = [ raptor ];
        description = "Graph-based notetaking system";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {raptor = null;};
 
   "fernet" = callPackage
@@ -79451,6 +84733,8 @@ self: {
        ];
        description = "Generate and verify HMAC-based authentication tokens";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "festung" = callPackage
@@ -79481,6 +84765,8 @@ self: {
        ];
        description = "Remote multi-db SQLCipher server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fez-conf" = callPackage
@@ -79492,6 +84778,8 @@ self: {
        libraryHaskellDepends = [ base containers regex-compat ];
        description = "Simple functions for loading config files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ffeed" = callPackage
@@ -79506,6 +84794,8 @@ self: {
        executableHaskellDepends = [ base pretty ];
        description = "Haskell binding to the FriendFeed API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fficxx" = callPackage
@@ -79527,6 +84817,8 @@ self: {
        ];
        description = "automatic C++ binding generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fficxx-runtime" = callPackage
@@ -79562,6 +84854,8 @@ self: {
        ];
        description = "Minimal bindings to the FFmpeg library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ffmpeg; libavcodec = null; libavdevice = null; 
          libavformat = null; libswscale = null;};
 
@@ -79579,6 +84873,8 @@ self: {
        ];
        description = "Tutorials on ffmpeg usage to play video/audio";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fft" = callPackage
@@ -79627,6 +84923,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "FFunctor typeclass";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fgl" = callPackage
@@ -79667,6 +84965,8 @@ self: {
        libraryHaskellDepends = [ base containers fgl ];
        description = "Graph decomposition algorithms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fgl-visualize" = callPackage
@@ -79691,6 +84991,8 @@ self: {
        libraryHaskellDepends = [ base-noprelude integer-gmp semirings ];
        description = "fibonacci algebra";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fibon" = callPackage
@@ -79712,6 +85014,8 @@ self: {
        ];
        description = "Tools for running and analyzing Haskell benchmarks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fibonacci" = callPackage
@@ -79743,6 +85047,8 @@ self: {
        ];
        description = "update statically hosted file in a push stule through socketed";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fields" = callPackage
@@ -79758,6 +85064,8 @@ self: {
        ];
        description = "First-class record field combinators with infix record field syntax";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fields-json" = callPackage
@@ -79773,6 +85081,8 @@ self: {
        ];
        description = "Abusing monadic syntax JSON objects generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fieldwise" = callPackage
@@ -79785,6 +85095,8 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Provides Fieldwise typeclass for operations of fields of records treated as independent components";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fig" = callPackage
@@ -79796,6 +85108,8 @@ self: {
        libraryHaskellDepends = [ base containers parsec pretty ];
        description = "Manipulation of FIG files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "file-collection" = callPackage
@@ -79809,6 +85123,8 @@ self: {
        ];
        description = "Provide a uniform interface over file archives and directories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "file-command-qq" = callPackage
@@ -79824,6 +85140,8 @@ self: {
        ];
        description = "Quasiquoter for system commands involving filepaths";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "file-embed" = callPackage
@@ -79842,6 +85160,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "file-embed_0_0_11_2" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "file-embed";
+       version = "0.0.11.2";
+       sha256 = "0bgysf6z13cmr5lsrhzrkv33sw9x1lkfnga3la2mcakh1aa3ijm4";
+       libraryHaskellDepends = [
+         base bytestring directory filepath template-haskell
+       ];
+       testHaskellDepends = [ base filepath ];
+       description = "Use Template Haskell to embed file contents directly";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "file-embed-lzma" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, directory, filepath
      , lzma, template-haskell, text, th-lift-instances, transformers
@@ -79894,6 +85229,8 @@ self: {
        testHaskellDepends = [ base lifted-base process ];
        description = "common functions that show file location information";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "file-modules" = callPackage
@@ -79916,6 +85253,8 @@ self: {
        ];
        description = "Takes a Haskell source-code file and outputs its modules";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "file-templates" = callPackage
@@ -79974,6 +85313,8 @@ self: {
        ];
        description = "Diffing and patching module";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "filelock" = callPackage
@@ -80012,6 +85353,8 @@ self: {
        libraryHaskellDepends = [ base hinotify stm ];
        description = "Block thread until a file stops being modified";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "filepath_1_4_2_1" = callPackage
@@ -80069,6 +85412,8 @@ self: {
        libraryHaskellDepends = [ base base-io-access filepath ];
        description = "IO Access for filepath";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "filepather" = callPackage
@@ -80085,6 +85430,8 @@ self: {
        ];
        description = "Functions on System.FilePath";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "filepattern" = callPackage
@@ -80126,6 +85473,8 @@ self: {
        ];
        description = "Library to process and search large files or a collection of files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "filestore" = callPackage
@@ -80164,6 +85513,8 @@ self: {
        ];
        description = "A shared set of abstractions and types for representing filessytem data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "filesystem-conduit" = callPackage
@@ -80185,6 +85536,8 @@ self: {
        ];
        description = "Use system-filepath data types with conduits. (deprecated)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "filesystem-enumerator" = callPackage
@@ -80200,6 +85553,8 @@ self: {
        ];
        description = "Enumerator-based API for manipulating the filesystem";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "filesystem-trees" = callPackage
@@ -80216,6 +85571,8 @@ self: {
        ];
        description = "Recursively manipulate and traverse filesystems as lazy rose trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fillit" = callPackage
@@ -80232,6 +85589,8 @@ self: {
        testHaskellDepends = [ base doctest hspec unordered-containers ];
        description = "Flexible string substitution";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "filter-logger" = callPackage
@@ -80304,6 +85663,8 @@ self: {
        ];
        description = "Extensible pretty printing with semantic annotations and proportional fonts";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "find-clumpiness" = callPackage
@@ -80329,6 +85690,8 @@ self: {
        ];
        description = "Find the clumpiness of labels in a tree";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "find-conduit" = callPackage
@@ -80363,6 +85726,8 @@ self: {
        ];
        description = "A file-finding conduit that allows user control over traversals";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "find-source-files" = callPackage
@@ -80374,6 +85739,8 @@ self: {
        libraryHaskellDepends = [ base Cabal directory filepath mtl ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "findhttp" = callPackage
@@ -80392,6 +85759,8 @@ self: {
        ];
        description = "List http/html files";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fingertree" = callPackage
@@ -80420,6 +85789,8 @@ self: {
        libraryHaskellDepends = [ base fingertree ];
        description = "Implementation of priority search queues as finger trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fingertree-tf" = callPackage
@@ -80431,6 +85802,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Generic finger-tree structure using type families";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "finitary" = callPackage
@@ -80476,6 +85849,8 @@ self: {
        ];
        description = "Flexible and easy deriving of type classes for finitary types";
        license = stdenv.lib.licenses.gpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "finite-field" = callPackage
@@ -80588,6 +85963,8 @@ self: {
        ];
        description = "A simple example using Firefly";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "first-and-last" = callPackage
@@ -80600,6 +85977,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "First and Last generalized to return up to n values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "first-class-families" = callPackage
@@ -80629,6 +86008,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "First class typeclass instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "first-class-patterns" = callPackage
@@ -80657,6 +86038,8 @@ self: {
        ];
        description = "Defunctionalisation for Yhc Core";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fishfood" = callPackage
@@ -80699,6 +86082,8 @@ self: {
        ];
        description = "FIT file decoder";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fits-parse" = callPackage
@@ -80722,6 +86107,8 @@ self: {
        ];
        description = "Parse FITS files";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fitsio" = callPackage
@@ -80734,6 +86121,8 @@ self: {
        librarySystemDepends = [ cfitsio ];
        description = "A library for reading and writing data files in the FITS data format";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) cfitsio;};
 
   "fitspec" = callPackage
@@ -80786,6 +86175,8 @@ self: {
        libraryHaskellDepends = [ base mmtl ];
        description = "Simple fix-expression parser";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fix-symbols-gitit" = callPackage
@@ -80797,6 +86188,8 @@ self: {
        libraryHaskellDepends = [ base containers gitit ];
        description = "Gitit plugin: Turn some Haskell symbols into pretty math symbols";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixed" = callPackage
@@ -80844,6 +86237,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Binary fixed-point arithmetic";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixed-point-vector" = callPackage
@@ -80855,6 +86250,8 @@ self: {
        libraryHaskellDepends = [ base fixed-point vector ];
        description = "Unbox instances for the fixed-point package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixed-point-vector-space" = callPackage
@@ -80866,6 +86263,8 @@ self: {
        libraryHaskellDepends = [ base fixed-point vector-space ];
        description = "vector-space instances for the fixed-point package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixed-precision" = callPackage
@@ -80881,6 +86280,8 @@ self: {
        ];
        description = "Fixed Precision Arithmetic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixed-storable-array" = callPackage
@@ -80892,6 +86293,8 @@ self: {
        libraryHaskellDepends = [ array base tagged ];
        description = "Fixed-size wrapper for StorableArray, providing a Storable instance. Deprecated - use storable-static-array instead.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixed-timestep" = callPackage
@@ -80903,6 +86306,8 @@ self: {
        libraryHaskellDepends = [ async base clock time ];
        description = "Pure Haskell library to repeat an action at a specific frequency";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixed-vector" = callPackage
@@ -80931,6 +86336,8 @@ self: {
        ];
        description = "Binary instances for fixed-vector";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixed-vector-cborg" = callPackage
@@ -80947,6 +86354,8 @@ self: {
        ];
        description = "Binary instances for fixed-vector";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixed-vector-cereal" = callPackage
@@ -80963,6 +86372,8 @@ self: {
        ];
        description = "Cereal instances for fixed-vector";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixed-vector-hetero" = callPackage
@@ -80985,6 +86396,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Fixed width subsets of an Int64/Word64";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixedprec" = callPackage
@@ -81040,6 +86453,8 @@ self: {
        ];
        description = "A Haskell client for http://fixer.io/";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixfile" = callPackage
@@ -81061,6 +86476,8 @@ self: {
        ];
        description = "File-backed recursive data structures";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixhs" = callPackage
@@ -81085,6 +86502,8 @@ self: {
        ];
        description = "FIX (co)parser";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixie" = callPackage
@@ -81106,6 +86525,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Opininated testing framework for mtl style (spies, stubs, and mocks)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fixplate" = callPackage
@@ -81166,6 +86587,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "test";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fizzbuzz-as-a-service" = callPackage
@@ -81183,6 +86606,8 @@ self: {
        ];
        description = "FizzBuzz as a service";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flac" = callPackage
@@ -81209,6 +86634,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Complete high-level binding to libFLAC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {FLAC = null;};
 
   "flac-picture" = callPackage
@@ -81227,6 +86654,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Support for writing picture to FLAC metadata blocks with JuicyPixels";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flaccuraterip" = callPackage
@@ -81244,6 +86673,8 @@ self: {
        ];
        description = "Verify FLAC files ripped form CD using AccurateRip™";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flags-applicative" = callPackage
@@ -81271,6 +86702,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell text ];
        description = "A template engine for HTML";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flamingra" = callPackage
@@ -81287,6 +86720,8 @@ self: {
        ];
        description = "FlameGraphs of profiling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flat" = callPackage
@@ -81308,6 +86743,8 @@ self: {
        ];
        description = "Principled and efficient bit-oriented binary serialization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flat-maybe" = callPackage
@@ -81319,6 +86756,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Strict Maybe without space and indirection overhead";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flat-mcmc" = callPackage
@@ -81385,6 +86824,8 @@ self: {
        ];
        description = "Haskell implementation of the FlatBuffers protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flay" = callPackage
@@ -81399,6 +86840,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-quickcheck transformers ];
        description = "Work generically on your datatype without knowing its shape nor its contents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flexible-defaults" = callPackage
@@ -81425,6 +86868,8 @@ self: {
        libraryHaskellDepends = [ base bytestring unix-time ];
        description = "simple extension of Data.UnixTime.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flexible-unlit" = callPackage
@@ -81450,6 +86895,8 @@ self: {
        libraryHaskellDepends = [ base data-type mtl QuickCheck ];
        description = "Flexible wrappers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flexiwrap-smallcheck" = callPackage
@@ -81463,6 +86910,8 @@ self: {
        ];
        description = "SmallCheck (Serial) instances for flexiwrap";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flick-duration" = callPackage
@@ -81493,6 +86942,8 @@ self: {
        executableHaskellDepends = [ xhtml ];
        description = "Haskell binding to the Flickr API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flight-igc" = callPackage
@@ -81569,6 +87020,8 @@ self: {
        ];
        description = "f-lite compiler, interpreter and libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flo" = callPackage
@@ -81605,6 +87058,8 @@ self: {
        ];
        description = "C99 printf \"%a\" style formatting and parsing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "floating-bits" = callPackage
@@ -81618,6 +87073,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Conversions between floating and integral values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "floatshow" = callPackage
@@ -81682,6 +87139,8 @@ self: {
        ];
        description = "A flexible Haskell source code pretty printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flow" = callPackage
@@ -81706,6 +87165,8 @@ self: {
        testHaskellDepends = [ base doctest flow QuickCheck ];
        description = "More directional operators";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flow2dot" = callPackage
@@ -81723,6 +87184,8 @@ self: {
        ];
        description = "Library and binary to generate sequence/flow diagrams from plain text source";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flowdock" = callPackage
@@ -81742,6 +87205,8 @@ self: {
        ];
        description = "Flowdock client library for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flowdock-api" = callPackage
@@ -81778,6 +87243,8 @@ self: {
        ];
        description = "API integration with Flowdock";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flowdock-rest" = callPackage
@@ -81805,6 +87272,8 @@ self: {
        ];
        description = "Flowdock REST API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flower" = callPackage
@@ -81822,6 +87291,8 @@ self: {
        ];
        description = "Analyze 454 flowgrams (.SFF files)";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flowlocks-framework" = callPackage
@@ -81834,6 +87305,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Generalized Flow Locks Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flowsim" = callPackage
@@ -81852,6 +87325,8 @@ self: {
        ];
        description = "Simulate 454 pyrosequencing";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "flp" = callPackage
@@ -81884,6 +87359,8 @@ self: {
        testToolDepends = [ alex happy ];
        description = "A layout spec language for memory managers implemented in Rust";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fltkhs" = callPackage
@@ -81953,6 +87430,8 @@ self: {
        executableHaskellDepends = [ base bytestring fltkhs ];
        description = "Fltkhs Fluid Examples";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fltkhs-hello-world" = callPackage
@@ -82010,6 +87489,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "A structured logger for Fluentd (Haskell)";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fluent-logger-conduit" = callPackage
@@ -82061,6 +87542,8 @@ self: {
        ];
        description = "The parser for fluffy to parsec the question bank in .docx type";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fluid-idl" = callPackage
@@ -82126,6 +87609,8 @@ self: {
        librarySystemDepends = [ fluidsynth ];
        description = "Haskell bindings to FluidSynth";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) fluidsynth;};
 
   "flush-queue" = callPackage
@@ -82152,6 +87637,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A monoid for tracking changes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fmark" = callPackage
@@ -82169,6 +87656,8 @@ self: {
        ];
        description = "A Friendly Markup language without syntax";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fmlist" = callPackage
@@ -82218,6 +87707,8 @@ self: {
        libraryHaskellDepends = [ base enum-text-rio ];
        description = "Adaptor for getting fmt to work with rio";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fmt-terminal-colors" = callPackage
@@ -82270,6 +87761,8 @@ self: {
        ];
        description = "Extras for Fn, a functional web framework";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "focus" = callPackage
@@ -82413,6 +87906,8 @@ self: {
        benchmarkHaskellDepends = [ base containers criterion foldl ];
        description = "incremental folds";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "foldl-statistics" = callPackage
@@ -82437,6 +87932,8 @@ self: {
        ];
        description = "Statistical functions from the statistics package implemented as Folds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "foldl-transduce" = callPackage
@@ -82463,6 +87960,8 @@ self: {
        ];
        description = "Transducers for foldl folds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "foldl-transduce-attoparsec" = callPackage
@@ -82484,6 +87983,8 @@ self: {
        ];
        description = "Attoparsec and foldl-transduce integration";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "folds" = callPackage
@@ -82522,6 +88023,8 @@ self: {
        testHaskellDepends = [ base containers tasty tasty-quickcheck ];
        description = "A playground of common folds for folds";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "folgerhs" = callPackage
@@ -82568,6 +88071,8 @@ self: {
        ];
        description = "Haskell library to follow content published on any subject";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "follow-file" = callPackage
@@ -82610,6 +88115,8 @@ self: {
        ];
        description = "Follow Tweets anonymously";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "foma" = callPackage
@@ -82622,6 +88129,8 @@ self: {
        librarySystemDepends = [ foma ];
        description = "Simple Haskell bindings for Foma";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {foma = null;};
 
   "font-awesome-type" = callPackage
@@ -82647,6 +88156,8 @@ self: {
        executableHaskellDepends = [ base GLFW-b OpenGL ];
        description = "Basic4x6 font for OpenGL";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "foo" = callPackage
@@ -82662,6 +88173,8 @@ self: {
        ];
        description = "Paper soccer, an OpenGL game";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "foobar" = callPackage
@@ -82693,6 +88206,8 @@ self: {
        ];
        description = "Functor, Monad, MonadPlus, etc for free";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "forbidden-fruit" = callPackage
@@ -82713,6 +88228,8 @@ self: {
        ];
        description = "A library accelerates imperative style programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "force-layout" = callPackage
@@ -82742,6 +88259,8 @@ self: {
        executableHaskellDepends = [ base process transformers ];
        description = "Run a command on files with magic substituion support (sequencing and regexp)";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "forecast-io" = callPackage
@@ -82753,6 +88272,8 @@ self: {
        libraryHaskellDepends = [ aeson base text ];
        description = "A Haskell library for working with forecast.io data.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "foreign-storable-asymmetric" = callPackage
@@ -82788,6 +88309,8 @@ self: {
        libraryHaskellDepends = [ base stm transformers ];
        description = "Encapsulating mutatable state in external libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "forest" = callPackage
@@ -82803,6 +88326,8 @@ self: {
        ];
        description = "Tree and Forest types";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "forest-fire" = callPackage
@@ -82824,6 +88349,8 @@ self: {
        ];
        description = "Recursively delete CloudFormation stacks and their dependants";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "forger" = callPackage
@@ -82838,6 +88365,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Library for generating fake placeholder data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "forkable-monad" = callPackage
@@ -82887,6 +88416,8 @@ self: {
        ];
        description = "A statically typed, functional programming language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "format" = callPackage
@@ -82899,6 +88430,8 @@ self: {
        testHaskellDepends = [ haskell2010 parsec QuickCheck ];
        description = "Rendering from and scanning to format strings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "format-numbers" = callPackage
@@ -82928,6 +88461,8 @@ self: {
        ];
        description = "A utility for writing the date to dzen2";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "formattable" = callPackage
@@ -82948,6 +88483,8 @@ self: {
        ];
        description = "Business-quality formatting of numbers, dates, and other things";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "formatting" = callPackage
@@ -82990,6 +88527,8 @@ self: {
        ];
        description = "A statically typed, functional programming language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "formlets" = callPackage
@@ -83006,6 +88545,8 @@ self: {
        ];
        description = "Formlets implemented in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "formlets-hsp" = callPackage
@@ -83022,6 +88563,8 @@ self: {
        libraryToolDepends = [ trhsx ];
        description = "HSP support for Formlets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "formura" = callPackage
@@ -83043,6 +88586,8 @@ self: {
        ];
        description = "Formura is a simple language to describe stencil computation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "forsyde-deep" = callPackage
@@ -83070,6 +88615,8 @@ self: {
        ];
        description = "ForSyDe's Haskell-embedded Domain Specific Language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "forsyde-shallow" = callPackage
@@ -83097,6 +88644,8 @@ self: {
        libraryHaskellDepends = [ array-forth base free mtl ];
        description = "A simple eDSL for generating arrayForth code";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fortran-src" = callPackage
@@ -83125,6 +88674,8 @@ self: {
        ];
        description = "Parser and anlyses for Fortran standards 66, 77, 90 and 95";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fortytwo" = callPackage
@@ -83139,6 +88690,8 @@ self: {
        testHaskellDepends = [ base doctest hspec ];
        description = "Interactive terminal prompt";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "forward-chan" = callPackage
@@ -83169,6 +88722,8 @@ self: {
        ];
        description = "Foscam File format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "foscam-filename" = callPackage
@@ -83188,6 +88743,8 @@ self: {
        ];
        description = "Foscam File format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "foscam-sort" = callPackage
@@ -83214,6 +88771,8 @@ self: {
        ];
        description = "Foscam File format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "foundation" = callPackage
@@ -83287,6 +88846,8 @@ self: {
        ];
        description = "Simple interface to the FP Complete IDE API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fpe" = callPackage
@@ -83332,6 +88893,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Haskell bindings to <https://fplll.github.io/fplll/ fplll>";
        license = stdenv.lib.licenses.lgpl21Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) fplll;};
 
   "fpnla" = callPackage
@@ -83367,6 +88930,8 @@ self: {
        ];
        description = "Example implementations for FPNLA library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fptest" = callPackage
@@ -83392,6 +88957,8 @@ self: {
        ];
        description = "IEEE754r floating point conformance tests";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fquery" = callPackage
@@ -83435,6 +89002,8 @@ self: {
        testHaskellDepends = [ base integer-gmp QuickCheck ];
        description = "A collection of useful fractal curve encoders";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fraction" = callPackage
@@ -83446,6 +89015,8 @@ self: {
        libraryHaskellDepends = [ base semigroups ];
        description = "Fractions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "frag" = callPackage
@@ -83460,6 +89031,8 @@ self: {
        executableHaskellDepends = [ array base GLUT OpenGL random ];
        description = "A 3-D First Person Shooter Game";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "frame" = callPackage
@@ -83507,6 +89080,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A package for configuring and building Haskell software";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "franz" = callPackage
@@ -83548,6 +89123,8 @@ self: {
        benchmarkHaskellDepends = [ base time ];
        description = "Cached and parallel data fetching";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "freddy" = callPackage
@@ -83567,6 +89144,8 @@ self: {
        ];
        description = "RabbitMQ Messaging API supporting request-response";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free" = callPackage
@@ -83643,6 +89222,8 @@ self: {
        libraryHaskellDepends = [ base type-aligned ];
        description = "Free monads suitable for concurrent computation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-er" = callPackage
@@ -83673,6 +89254,8 @@ self: {
        ];
        description = "Free functors, adjoint to functors that forget class constraints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-game" = callPackage
@@ -83694,6 +89277,8 @@ self: {
        ];
        description = "Create games for free";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-http" = callPackage
@@ -83710,6 +89295,8 @@ self: {
        ];
        description = "An HTTP Client based on Free Monads";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-operational" = callPackage
@@ -83725,6 +89312,8 @@ self: {
        ];
        description = "Operational Applicative, Alternative, Monad and MonadPlus from free types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-theorems" = callPackage
@@ -83740,6 +89329,8 @@ self: {
        ];
        description = "Automatic generation of free theorems";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-theorems-counterexamples" = callPackage
@@ -83758,6 +89349,8 @@ self: {
        executableHaskellDepends = [ cgi free-theorems utf8-string xhtml ];
        description = "Automatically Generating Counterexamples to Naive Free Theorems";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-theorems-seq" = callPackage
@@ -83775,6 +89368,8 @@ self: {
        ];
        description = "Taming Selective Strictness";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-theorems-seq-webui" = callPackage
@@ -83793,6 +89388,8 @@ self: {
        ];
        description = "Taming Selective Strictness";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-theorems-webui" = callPackage
@@ -83812,6 +89409,8 @@ self: {
        ];
        description = "CGI-based web interface for the free-theorems package";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-v-bucks-generator-no-survey" = callPackage
@@ -83827,6 +89426,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-v-bucks-generator-ps4-no-survey" = callPackage
@@ -83842,6 +89443,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "free-vector-spaces" = callPackage
@@ -83897,6 +89500,8 @@ self: {
        ];
        description = "A soccer game";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "freelude" = callPackage
@@ -83916,6 +89521,8 @@ self: {
        ];
        description = "A generalisation of the Category->Functor->Applicative->Monad hierarchy and more";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "freenect" = callPackage
@@ -83968,6 +89575,8 @@ self: {
        ];
        description = "Handle effects conversely using monadic conversation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "freer-effects" = callPackage
@@ -83988,6 +89597,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion free mtl ];
        description = "Implementation of effect system for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "freer-simple" = callPackage
@@ -84025,6 +89636,8 @@ self: {
        testHaskellDepends = [ base freer-simple hspec ];
        description = "Checked runtime exceptions with freer-simple";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "freer-simple-http" = callPackage
@@ -84045,6 +89658,8 @@ self: {
        ];
        description = "Make HTTP requests with freer-simple!";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "freer-simple-profiling" = callPackage
@@ -84057,6 +89672,8 @@ self: {
        testHaskellDepends = [ base containers freer-simple hspec time ];
        description = "Automatic profling of freer-simple programs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "freer-simple-random" = callPackage
@@ -84069,6 +89686,8 @@ self: {
        testHaskellDepends = [ base containers freer-simple hspec random ];
        description = "Random number generators using freer-simple";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "freer-simple-time" = callPackage
@@ -84081,6 +89700,8 @@ self: {
        testHaskellDepends = [ base freer-simple hspec time ];
        description = "freer-simple interface to IO based time functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "freesect" = callPackage
@@ -84098,6 +89719,8 @@ self: {
        ];
        description = "A Haskell syntax extension for generalised sections";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "freesound" = callPackage
@@ -84119,6 +89742,8 @@ self: {
        ];
        description = "Access the Freesound Project database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "freetype-simple" = callPackage
@@ -84133,6 +89758,8 @@ self: {
        ];
        description = "Single line text rendering for OpenGL ES";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "freetype2" = callPackage
@@ -84175,6 +89802,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring containers gauge ];
        description = "Are you ready to get freaky?";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fresco-binding" = callPackage
@@ -84202,6 +89831,8 @@ self: {
        libraryHaskellDepends = [ base containers haskell-src-exts syb ];
        description = "Introduce fresh variables into Haskell source code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "friday" = callPackage
@@ -84240,6 +89871,8 @@ self: {
        librarySystemDepends = [ libdevil ];
        description = "Uses the DevIL C library to read and write images from and to files and memory buffers";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libdevil;};
 
   "friday-juicypixels" = callPackage
@@ -84271,6 +89904,8 @@ self: {
        ];
        description = "Scale Friday images with DCT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "friendly" = callPackage
@@ -84288,6 +89923,8 @@ self: {
        ];
        description = "Attempt to pretty-print any input";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "friendly-time" = callPackage
@@ -84360,6 +89997,8 @@ self: {
        ];
        description = "A reactive frontend web framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "frontmatter" = callPackage
@@ -84403,6 +90042,8 @@ self: {
        executableHaskellDepends = [ base directory ];
        description = "LALR(k) parser generator";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "frp-arduino" = callPackage
@@ -84414,6 +90055,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "Arduino programming without the hassle of C";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "frpnow" = callPackage
@@ -84428,6 +90071,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl transformers ];
        description = "Principled practical FRP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "frpnow-gloss" = callPackage
@@ -84443,6 +90088,8 @@ self: {
        ];
        description = "Program awesome stuff with Gloss and frpnow!";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "frpnow-gtk" = callPackage
@@ -84459,6 +90106,8 @@ self: {
        ];
        description = "Program GUIs with GTK and frpnow!";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "frpnow-gtk3" = callPackage
@@ -84472,6 +90121,8 @@ self: {
        ];
        description = "Program GUIs with GTK3 and frpnow!";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "frpnow-vty" = callPackage
@@ -84486,6 +90137,8 @@ self: {
        executableHaskellDepends = [ base containers frpnow vty ];
        description = "Program terminal applications with vty and frpnow!";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "frquotes" = callPackage
@@ -84511,6 +90164,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A haskell binding to the FSEvents API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fsh-csv" = callPackage
@@ -84522,6 +90177,8 @@ self: {
        libraryHaskellDepends = [ base hint ];
        description = "csv parser for fsh";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fsharp" = callPackage
@@ -84548,6 +90205,8 @@ self: {
        ];
        description = "Finite state machines and FSM actions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fsnotify" = callPackage
@@ -84609,6 +90268,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Finite state transducers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fsutils" = callPackage
@@ -84620,6 +90281,8 @@ self: {
        libraryHaskellDepends = [ base directory filepath ];
        description = "File system utilities for Haskell that are missing from built in libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fswait" = callPackage
@@ -84639,6 +90302,8 @@ self: {
        ];
        description = "Wait and observe events on the filesystem for a path, with a timeout";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fswatch" = callPackage
@@ -84659,6 +90324,8 @@ self: {
        ];
        description = "File System watching tool with cli and slave functionalities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fswatcher" = callPackage
@@ -84690,6 +90357,8 @@ self: {
        executableHaskellDepends = [ base mtl parsec ];
        description = "implementation accompanying a WFLP'19 paper";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ftdi" = callPackage
@@ -84707,6 +90376,8 @@ self: {
        ];
        description = "A thin layer over USB to communicate with FTDI chips";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ftp-client" = callPackage
@@ -84724,6 +90395,8 @@ self: {
        testHaskellDepends = [ base bytestring tasty tasty-hspec ];
        description = "Transfer files with FTP and FTPS";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ftp-client-conduit" = callPackage
@@ -84740,6 +90413,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Transfer file with FTP and FTPS with Conduit";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ftp-conduit" = callPackage
@@ -84756,6 +90431,8 @@ self: {
        ];
        description = "FTP client package with conduit interface based off http-conduit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ftphs" = callPackage
@@ -84773,6 +90450,8 @@ self: {
        ];
        description = "FTP Client and Server Library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ftree" = callPackage
@@ -84802,6 +90481,8 @@ self: {
        ];
        description = "Shell interface to the FreeTheorems library";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fugue" = callPackage
@@ -84824,6 +90505,8 @@ self: {
        libraryHaskellDepends = [ base ghc network ];
        description = "a monad for protocol-typed network programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "full-text-search" = callPackage
@@ -84863,6 +90546,8 @@ self: {
        ];
        description = "Simple sentence segmenter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "funbot" = callPackage
@@ -84891,6 +90576,8 @@ self: {
        ];
        description = "IRC bot for fun, learning, creativity and collaboration";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "funbot-client" = callPackage
@@ -84909,6 +90596,8 @@ self: {
        ];
        description = "Report events to FunBot over a JSON/HTTP API";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "funbot-ext-events" = callPackage
@@ -84939,6 +90628,8 @@ self: {
        ];
        description = "Git hook which sends events to FunBot";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "funcmp" = callPackage
@@ -84990,6 +90681,8 @@ self: {
        ];
        description = "call-by-value lambda-calculus with meta-programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "funcons-simple" = callPackage
@@ -85005,6 +90698,8 @@ self: {
        executableHaskellDepends = [ base funcons-tools funcons-values ];
        description = "A modular interpreter for executing SIMPLE funcons";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "funcons-tools" = callPackage
@@ -85030,6 +90725,8 @@ self: {
        ];
        description = "A modular interpreter for executing funcons";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "funcons-values" = callPackage
@@ -85045,6 +90742,8 @@ self: {
        ];
        description = "Library providing values and operations on values in a fixed universe";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "function-builder" = callPackage
@@ -85068,6 +90767,8 @@ self: {
        libraryHaskellDepends = [ base data-type ];
        description = "Combining functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "function-instances-algebra" = callPackage
@@ -85079,6 +90780,8 @@ self: {
        libraryHaskellDepends = [ base numeric-prelude ];
        description = "Instances of the Algebra.* classes for functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "functional-arrow" = callPackage
@@ -85090,6 +90793,8 @@ self: {
        libraryHaskellDepends = [ base HList ];
        description = "Combinators that allow for a more functional/monadic style of Arrow programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "functional-kmp" = callPackage
@@ -85114,6 +90819,8 @@ self: {
        libraryHaskellDepends = [ base category ];
        description = "Functors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "functor-apply" = callPackage
@@ -85207,6 +90914,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Infix operators for mapping over compositions of functors. Lots of them.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "functor-monadic" = callPackage
@@ -85240,6 +90949,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim lens ];
        description = "Collection of functor utilities, providing handy operators, like generalization of (.).";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "functorm" = callPackage
@@ -85251,6 +90962,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Data.FunctorM (compatibility package)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "functors" = callPackage
@@ -85301,6 +91014,8 @@ self: {
        ];
        description = "Workflows with arrows";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "funflow-nix" = callPackage
@@ -85322,6 +91037,8 @@ self: {
        ];
        description = "Utility functions for using funflow with nix";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fungll-combinators" = callPackage
@@ -85355,6 +91072,8 @@ self: {
        ];
        description = "A unioning file-system using HFuse";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "funnyprint" = callPackage
@@ -85370,6 +91089,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion hscolour ipprint ];
        description = "funnyPrint function to colorize GHCi output";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "funpat" = callPackage
@@ -85381,6 +91102,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A generalization of pattern matching";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "funsat" = callPackage
@@ -85402,6 +91125,8 @@ self: {
        ];
        description = "A modern DPLL-style SAT solver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "funspection" = callPackage
@@ -85413,6 +91138,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Type-level function utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fused-effects" = callPackage
@@ -85506,6 +91233,8 @@ self: {
        ];
        description = "A fused-effects adapter for squeal-postgresql";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fusion" = callPackage
@@ -85520,6 +91249,8 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Effectful streaming library based on shortcut fusion techniques";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fusion-plugin" = callPackage
@@ -85609,6 +91340,8 @@ self: {
        executableHaskellDepends = [ base bytestring network unix ];
        description = "Simple IP-over-UDP tunnel using TUNTAP";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "future" = callPackage
@@ -85620,6 +91353,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Supposed to mimics and enhance proposed C++ \"future\" features";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "future-resource" = callPackage
@@ -85741,6 +91476,8 @@ self: {
          base criterion fuzzy-time genvalidity-criterion
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fuzzy-timings" = callPackage
@@ -85761,6 +91498,8 @@ self: {
        ];
        description = "Translates high-level definitions of \"fuzzily\" scheduled objects (e.g. play this commercial 10 times per hour between 9:00-13:00) to a list of accurately scheduled objects using glpk-hs.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fuzzyset" = callPackage
@@ -85827,6 +91566,8 @@ self: {
        ];
        description = "Game engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fwgl-glfw" = callPackage
@@ -85843,6 +91584,8 @@ self: {
        ];
        description = "FWGL GLFW backend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fwgl-javascript" = callPackage
@@ -85858,6 +91601,8 @@ self: {
        ];
        description = "FWGL GHCJS backend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fx" = callPackage
@@ -85882,6 +91627,8 @@ self: {
        executableHaskellDepends = [ base HTTP json ];
        description = "Generate Gentoo ebuilds from NodeJS/npm packages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "g2" = callPackage
@@ -85914,6 +91661,8 @@ self: {
        ];
        description = "Haskell symbolic execution engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "g2q" = callPackage
@@ -85925,6 +91674,8 @@ self: {
        libraryHaskellDepends = [ base g2 ];
        description = "G2Q allows constraint programming, via writing Haskell predicates";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "g4ip" = callPackage
@@ -85937,6 +91688,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A theorem prover for propositional logic that uses G4ip";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "g4ip-prover" = callPackage
@@ -85971,6 +91724,8 @@ self: {
        ];
        description = "General Alignment Clustering Tool";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "galois-fft" = callPackage
@@ -86047,6 +91802,8 @@ self: {
        libraryHaskellDepends = [ base containers probability random ];
        description = "Simple probability library for dice rolls, card games and similar";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "game-tree" = callPackage
@@ -86071,6 +91828,8 @@ self: {
        executableHaskellDepends = [ base cairo containers glib gtk time ];
        description = "Game clock that shows two analog clock faces";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gamgee" = callPackage
@@ -86101,6 +91860,8 @@ self: {
        ];
        description = "Tool for generating TOTP MFA tokens";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gamma" = callPackage
@@ -86121,6 +91882,8 @@ self: {
        ];
        description = "Gamma function and related functions";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gang-of-threads" = callPackage
@@ -86146,6 +91909,8 @@ self: {
        executableHaskellDepends = [ base haskeline transformers ];
        description = "reverse prefix notation calculator and calculation library";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "garfield" = callPackage
@@ -86172,6 +91937,8 @@ self: {
        ];
        description = "Automatically spin up and spin down local daemons";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gargoyle-postgresql" = callPackage
@@ -86192,6 +91959,8 @@ self: {
        ];
        description = "Manage PostgreSQL servers with gargoyle";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "garlic-bread" = callPackage
@@ -86226,6 +91995,8 @@ self: {
        libraryHaskellDepends = [ base free transformers ];
        description = "Limit how many steps a program may take";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gasp" = callPackage
@@ -86271,6 +92042,8 @@ self: {
        ];
        description = "planar graph embedding into a plane";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gc" = callPackage
@@ -86298,6 +92071,8 @@ self: {
        ];
        description = "a wai application to show GHC.GCStats";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gcodehs" = callPackage
@@ -86324,6 +92099,8 @@ self: {
        ];
        description = "GCode processor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gconf" = callPackage
@@ -86340,6 +92117,8 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GNOME configuration database system";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs.gnome2) GConf;};
 
   "gd" = callPackage
@@ -86393,6 +92172,8 @@ self: {
        ];
        description = "API Wrapping for Coinbase's GDAX exchange";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gdiff" = callPackage
@@ -86419,6 +92200,8 @@ self: {
        ];
        description = "Generic diff for the instant-generics library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gdiff-th" = callPackage
@@ -86437,6 +92220,8 @@ self: {
        ];
        description = "Generate gdiff GADTs and Instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gdo" = callPackage
@@ -86499,6 +92284,8 @@ self: {
        testHaskellDepends = [ base hspec megaparsec text-all ];
        description = "Parser for the GEDCOM genealogy file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "geek" = callPackage
@@ -86519,6 +92306,8 @@ self: {
        ];
        description = "Geek blog engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "geek-server" = callPackage
@@ -86542,6 +92331,8 @@ self: {
        ];
        description = "Geek blog engine server";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gegl" = callPackage
@@ -86562,6 +92353,8 @@ self: {
        libraryPkgconfigDepends = [ gegl ];
        description = "Haskell bindings to GEGL library";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gegl;};
 
   "gelatin" = callPackage
@@ -86580,6 +92373,8 @@ self: {
        executableHaskellDepends = [ base linear mtl vector ];
        description = "A graphics description language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gelatin-freetype2" = callPackage
@@ -86597,6 +92392,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "FreeType2 based text rendering for the gelatin realtime rendering system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gelatin-fruity" = callPackage
@@ -86608,6 +92405,8 @@ self: {
        libraryHaskellDepends = [ base FontyFruity gelatin linear vector ];
        description = "Gelatin's support for rendering TTF outlines, using FontyFruity";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gelatin-gl" = callPackage
@@ -86629,6 +92428,8 @@ self: {
        executableHaskellDepends = [ base gelatin lens linear mtl vector ];
        description = "OpenGL rendering routines for the gelatin-picture graphics EDSL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gelatin-sdl2" = callPackage
@@ -86646,6 +92447,8 @@ self: {
        executableHaskellDepends = [ base either filepath sdl2 ];
        description = "An SDL2 backend for the gelatin renderer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gelatin-shaders" = callPackage
@@ -86658,6 +92461,8 @@ self: {
        libraryHaskellDepends = [ base bytestring filepath gelatin ];
        description = "Gelatin's OpenGL shaders";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gemstone" = callPackage
@@ -86675,6 +92480,8 @@ self: {
        ];
        description = "A simple library of helpers for SDL+GL games";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gen-imports" = callPackage
@@ -86690,6 +92497,8 @@ self: {
        ];
        description = "Code to generate instances for the package \"ghc-instances\"";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gen-passwd" = callPackage
@@ -86707,6 +92516,8 @@ self: {
        ];
        description = "Create wordlist-based passwords easily";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gencheck" = callPackage
@@ -86723,6 +92534,8 @@ self: {
        ];
        description = "A testing framework inspired by QuickCheck and SmallCheck";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gender" = callPackage
@@ -86738,6 +92551,8 @@ self: {
        executableHaskellDepends = [ attoparsec base text ];
        description = "Identify a persons gender by their first name";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "genders" = callPackage
@@ -86753,6 +92568,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec network vector ];
        description = "Bindings to libgenders";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {genders = null;};
 
   "gendocs" = callPackage
@@ -86798,6 +92615,8 @@ self: {
        ];
        description = "Prelude replacement using generalized type classes where possible";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generator" = callPackage
@@ -86809,6 +92628,8 @@ self: {
        libraryHaskellDepends = [ base List transformers ];
        description = "Python-generators notation for creation of monadic lists";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generators" = callPackage
@@ -86820,6 +92641,8 @@ self: {
        libraryHaskellDepends = [ base mtl random ];
        description = "Actually useful monadic random value generators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-accessors" = callPackage
@@ -86839,6 +92662,8 @@ self: {
        ];
        description = "stringly-named getters for generic data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-aeson" = callPackage
@@ -86855,6 +92680,8 @@ self: {
        ];
        description = "Derivation of Aeson instances using GHC generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-arbitrary" = callPackage
@@ -86877,6 +92704,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring ghc-prim ];
        description = "Generic Data.Binary derivation using GHC generics.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-church" = callPackage
@@ -86892,6 +92721,8 @@ self: {
        ];
        description = "Automatically convert Generic instances to and from church representations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-constraints" = callPackage
@@ -87016,6 +92847,8 @@ self: {
        testHaskellDepends = [ array base bytestring hspec ];
        description = "An Enum class that fixes some deficiences with Prelude's Enum";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-env" = callPackage
@@ -87087,6 +92920,8 @@ self: {
        libraryHaskellDepends = [ base generic-lens ];
        description = "GHC.OverloadedLabels.IsLabel instance for lenses from ghc-generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-lens-lite" = callPackage
@@ -87110,6 +92945,8 @@ self: {
        libraryHaskellDepends = [ base lucid text ];
        description = "General-purpose web page scaffold for Lucid";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-maybe" = callPackage
@@ -87131,6 +92968,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "A generic version of Data.Maybe";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-monoid" = callPackage
@@ -87192,6 +93031,8 @@ self: {
        ];
        description = "Pretty printing for Generic value";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-random" = callPackage
@@ -87226,6 +93067,8 @@ self: {
        libraryHaskellDepends = [ base bytestring network ];
        description = "Simple generic TCP/IP server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-storable" = callPackage
@@ -87238,6 +93081,8 @@ self: {
        testHaskellDepends = [ base ghc-prim hspec QuickCheck ];
        description = "Generic implementation of Storable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-tree" = callPackage
@@ -87249,6 +93094,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Generic Tree data type";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-trie" = callPackage
@@ -87262,6 +93109,8 @@ self: {
        libraryHaskellDepends = [ base containers transformers ];
        description = "A map, where the keys may be complex structured data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-xml" = callPackage
@@ -87276,6 +93125,8 @@ self: {
        ];
        description = "Marshalling Haskell values to/from XML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generic-xmlpickler" = callPackage
@@ -87322,6 +93173,8 @@ self: {
        ];
        description = "Generic Programming with Mutually Recursive Sums of Products";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generics-mrsop-gdiff" = callPackage
@@ -87333,6 +93186,8 @@ self: {
        libraryHaskellDepends = [ base generics-mrsop ];
        description = "Reimplementation of the gdiff algorithm for generics-mrsop";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "generics-sop" = callPackage
@@ -87379,6 +93234,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Serialization library using Data.Generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "genesis" = callPackage
@@ -87406,6 +93263,8 @@ self: {
        ];
        description = "Opinionated bootstrapping for Haskell web services";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "genesis-test" = callPackage
@@ -87429,6 +93288,8 @@ self: {
        ];
        description = "Opinionated bootstrapping for Haskell web services";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "genetics" = callPackage
@@ -87442,6 +93303,8 @@ self: {
        executableHaskellDepends = [ base random-fu ];
        description = "A Genetic Algorithm library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "geni-gui" = callPackage
@@ -87465,6 +93328,8 @@ self: {
        executableHaskellDepends = [ base GenI ];
        description = "GenI graphical user interface";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "geni-util" = callPackage
@@ -87488,6 +93353,8 @@ self: {
        ];
        description = "Companion tools for use with the GenI surface realiser";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "geniconvert" = callPackage
@@ -87507,6 +93374,8 @@ self: {
        ];
        description = "Conversion utility for the GenI generator";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "genifunctors" = callPackage
@@ -87530,6 +93399,8 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Use Template Haskell to generate Uniplate-like functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "geniplate-mirror" = callPackage
@@ -87564,6 +93435,8 @@ self: {
        ];
        description = "Simple HTTP server for GenI results";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "genprog" = callPackage
@@ -87575,6 +93448,8 @@ self: {
        libraryHaskellDepends = [ base MonadRandom syb syz ];
        description = "Genetic programming library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gentlemark" = callPackage
@@ -87587,23 +93462,11 @@ self: {
        testHaskellDepends = [ base HUnit parsec transformers ];
        description = "Gentle markup language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "genvalidity" = callPackage
-    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random
-     , validity
-     }:
-     mkDerivation {
-       pname = "genvalidity";
-       version = "0.10.0.0";
-       sha256 = "0rb2nm8hqhdgn979rp4pwywha5rdxlny5d7ndj2253d1ggmvrh4k";
-       libraryHaskellDepends = [ base QuickCheck random validity ];
-       testHaskellDepends = [ base hspec hspec-core QuickCheck ];
-       description = "Testing utilities for the validity library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "genvalidity_0_10_0_1" = callPackage
     ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random
      , validity
      }:
@@ -87615,7 +93478,6 @@ self: {
        testHaskellDepends = [ base hspec hspec-core QuickCheck ];
        description = "Testing utilities for the validity library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-aeson" = callPackage
@@ -87860,6 +93722,8 @@ self: {
          time uuid
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "genvalidity-mergeless" = callPackage
@@ -88082,6 +93946,8 @@ self: {
        ];
        description = "Performs geo location lookups and parses the results";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "geo-uk" = callPackage
@@ -88098,6 +93964,8 @@ self: {
        ];
        description = "High precision conversion between GPS and UK Grid";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "geocalc" = callPackage
@@ -88140,6 +94008,8 @@ self: {
        ];
        description = "Geodetic calculations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "geodetic-types" = callPackage
@@ -88151,6 +94021,8 @@ self: {
        libraryHaskellDepends = [ base dimensional lens semigroups ];
        description = "Types for geodetic operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "geodetics" = callPackage
@@ -88229,6 +94101,8 @@ self: {
        libraryHaskellDepends = [ aeson base bson bytestring lens text ];
        description = "GeoJSON data types including JSON/BSON conversion";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "geolite-csv" = callPackage
@@ -88247,6 +94121,8 @@ self: {
        ];
        description = "Geolite CSV Parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "geom2d" = callPackage
@@ -88259,6 +94135,8 @@ self: {
        testHaskellDepends = [ base ieee754 linear QuickCheck ];
        description = "package for geometry in euklidean 2d space";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "geos" = callPackage
@@ -88279,6 +94157,8 @@ self: {
        testSystemDepends = [ geos_c ];
        description = "Bindings for GEOS";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {geos_c = null;};
 
   "getemx" = callPackage
@@ -88297,6 +94177,8 @@ self: {
        ];
        description = "Fetch from emusic using .emx files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "getflag" = callPackage
@@ -88308,6 +94190,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Command-line parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "getopt-generics" = callPackage
@@ -88387,6 +94271,8 @@ self: {
        executableHaskellDepends = [ base containers parsec ];
        description = "A type checker and runtime system of rCOS/g (impl. of ggts-FCS).";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gh-labeler" = callPackage
@@ -88404,6 +94290,8 @@ self: {
        ];
        description = "Github Standard Labeler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gh-pocket-knife" = callPackage
@@ -88555,6 +94443,8 @@ self: {
        testHaskellDepends = [ base ghc ghc-paths ];
        description = "A small-step semantics for Core";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-datasize" = callPackage
@@ -88566,6 +94456,8 @@ self: {
        libraryHaskellDepends = [ base deepseq ghc-heap ghc-prim ];
        description = "Determine the size of data structures in GHC's memory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-dump-core" = callPackage
@@ -88581,6 +94473,8 @@ self: {
        ];
        description = "An AST and compiler plugin for dumping GHC's Core representation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-dump-tree" = callPackage
@@ -88605,6 +94499,8 @@ self: {
        ];
        description = "Dump GHC's parsed, renamed, and type checked ASTs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-dump-util" = callPackage
@@ -88628,6 +94524,8 @@ self: {
        ];
        description = "Handy tools for working with @ghc-dump@ dumps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-dup" = callPackage
@@ -88639,6 +94537,8 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        description = "Explicitly prevent sharing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-events" = callPackage
@@ -88704,6 +94604,8 @@ self: {
        ];
        description = "Library and tool for parsing .eventlog files from parallel GHC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-exactprint" = callPackage
@@ -88751,6 +94653,8 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        description = "Derived instances of GHC.Generic of the GHC AST";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-heap-view" = callPackage
@@ -88818,6 +94722,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Find the Haddock documentation for a symbol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-instances" = callPackage
@@ -88839,6 +94745,8 @@ self: {
        ];
        description = "Easily import all instances contained in GHC distributed libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-justdoit" = callPackage
@@ -88932,15 +94840,18 @@ self: {
      }) {};
 
   "ghc-lib-parser-ex" = callPackage
-    ({ mkDerivation, base, bytestring, directory, extra, filepath, ghc
-     , ghc-boot, ghc-boot-th, tasty, tasty-hunit, uniplate
+    ({ mkDerivation, base, bytestring, containers, directory, extra
+     , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit
+     , uniplate
      }:
      mkDerivation {
        pname = "ghc-lib-parser-ex";
-       version = "8.8.5.1";
-       sha256 = "0bwlahldxgac9vi79qbz88vjd5hq2cijfjhfb8ahdgdksl2m7k39";
+       version = "8.8.5.2";
+       sha256 = "0jydlqb2nymrqvyn798vb8k4ak49m0qnnv725mzwlnn77krvnlka";
+       revision = "1";
+       editedCabalFile = "010wpn9ivczixfg2cj4n4f8924jaw6y4j6fd9z8bih7f53wyldnr";
        libraryHaskellDepends = [
-         base bytestring ghc ghc-boot ghc-boot-th uniplate
+         base bytestring containers ghc ghc-boot ghc-boot-th uniplate
        ];
        testHaskellDepends = [
          base directory extra filepath ghc ghc-boot-th tasty tasty-hunit
@@ -88995,6 +94906,8 @@ self: {
        executableHaskellDepends = [ base parsec process ];
        description = "Generate a bash completion from the GHC manpage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-mod" = callPackage
@@ -89041,6 +94954,8 @@ self: {
        ];
        description = "Happy Haskell Hacking";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-mtl" = callPackage
@@ -89104,6 +95019,8 @@ self: {
        ];
        description = "A parallel wrapper for 'ghc --make'";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-parser" = callPackage
@@ -89147,6 +95064,8 @@ self: {
        ];
        description = "Simple utility to fix BROKEN package dependencies for cabal-install";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-pkg-lib" = callPackage
@@ -89161,6 +95080,8 @@ self: {
        ];
        description = "Provide library support for ghc-pkg information";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-prim_0_5_3" = callPackage
@@ -89252,6 +95173,8 @@ self: {
        testHaskellDepends = [ base transformers ];
        description = "GHC plugin to prove program equations by simplification";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-server" = callPackage
@@ -89282,6 +95205,8 @@ self: {
        executableHaskellDepends = [ base transformers ];
        description = "Simplified GHC API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-simple" = callPackage
@@ -89297,6 +95222,8 @@ self: {
        ];
        description = "Simplified interface to the GHC API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-source-gen" = callPackage
@@ -89324,6 +95251,8 @@ self: {
        libraryHaskellDepends = [ array base containers ghc hpc ];
        description = "Generic GHC Plugin for annotating Haskell code with source location data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-syb" = callPackage
@@ -89335,6 +95264,8 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        description = "Data and Typeable instances for the GHC API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-syb-utils" = callPackage
@@ -89346,6 +95277,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ghc syb ];
        description = "Scrap Your Boilerplate utilities for the GHC API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-syntax-highlighter" = callPackage
@@ -89393,6 +95326,8 @@ self: {
        ];
        description = "Library for parsing GHC time and allocation profiling reports";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-timers" = callPackage
@@ -89511,6 +95446,8 @@ self: {
        executableHaskellDepends = [ base ghc-paths unix ];
        description = "Print minimal export lists";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-vis" = callPackage
@@ -89529,6 +95466,8 @@ self: {
        ];
        description = "Live visualization of data structures in GHCi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghcflags" = callPackage
@@ -89594,6 +95533,8 @@ self: {
        libraryHaskellDepends = [ base cairo colour diagrams gtk ];
        description = "Display simple diagrams from ghci";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghci-haskeline" = callPackage
@@ -89612,6 +95553,8 @@ self: {
        ];
        description = "An implementation of ghci using the Haskeline line-input library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghci-hexcalc" = callPackage
@@ -89636,6 +95579,8 @@ self: {
        testHaskellDepends = [ base doctest hspec parsec ];
        description = "parse output of ghci \":history\" command";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghci-lib" = callPackage
@@ -89647,6 +95592,8 @@ self: {
        libraryHaskellDepends = [ base ghc MissingH ];
        description = "A library for interactively evaluating Haskell code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghci-ng" = callPackage
@@ -89668,6 +95615,8 @@ self: {
        ];
        description = "Next generation GHCi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghci-pretty" = callPackage
@@ -89679,6 +95628,8 @@ self: {
        libraryHaskellDepends = [ base hscolour ipprint ];
        description = "colored pretty-printing within ghci";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghci-websockets" = callPackage
@@ -89764,6 +95715,8 @@ self: {
        ];
        description = "The core of an IDE";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghcjs-ajax" = callPackage
@@ -89891,6 +95844,8 @@ self: {
        sha256 = "02m0qszdl3kxyhjrzj1ph9gwbr9jkzak2v1b47v6ywsm7hmjgn7w";
        description = "DOM library using JSFFI and GHCJS";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghcjs-dom-webkit" = callPackage
@@ -89923,6 +95878,8 @@ self: {
        ];
        description = "GHCJS bindings for the JavaScript Fetch API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghcjs-hplay" = callPackage
@@ -89939,6 +95896,8 @@ self: {
        ];
        description = "Client-side web EDSL for transient nodes running in the web browser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghcjs-perch" = callPackage
@@ -89961,6 +95920,8 @@ self: {
        libraryHaskellDepends = [ base ghcjs-base protolude ];
        description = "Bidirectional bidings to javascript's promise";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghcjs-vdom" = callPackage
@@ -90009,6 +95970,8 @@ self: {
        libraryHaskellDepends = [ base ghcjs-base text ];
        description = "XmlHttpRequest (\"AJAX\") bindings for GHCJS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghclive" = callPackage
@@ -90035,6 +95998,8 @@ self: {
        ];
        description = "Interactive Haskell interpreter in a browser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghcprofview" = callPackage
@@ -90053,6 +96018,8 @@ self: {
        ];
        description = "GHC .prof files viewer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghczdecode" = callPackage
@@ -90101,6 +96068,8 @@ self: {
        ];
        description = "Trivial routines for inspecting git repositories";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gi-atk" = callPackage
@@ -90158,6 +96127,8 @@ self: {
        ];
        description = "Bridge between packages gi-* and cairo-core";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gi-cairo-connector" = callPackage
@@ -90374,25 +96345,6 @@ self: {
      }) {inherit (pkgs) libgit2-glib;};
 
   "gi-gio" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
-     , gi-gobject, glib, haskell-gi, haskell-gi-base
-     , haskell-gi-overloading, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-gio";
-       version = "2.0.25";
-       sha256 = "0w42ls035a69c2wyf050zvqxwyql3ln3ifwn9k4m187icj345qnz";
-       setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi
-         haskell-gi-base haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ glib ];
-       description = "Gio bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib;};
-
-  "gi-gio_2_0_26" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, glib, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
@@ -90409,7 +96361,6 @@ self: {
        libraryPkgconfigDepends = [ glib ];
        description = "Gio bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "gi-girepository" = callPackage
@@ -90486,6 +96437,8 @@ self: {
        libraryPkgconfigDepends = [ graphene-gobject ];
        description = "Graphene bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {graphene-gobject = null;};
 
   "gi-gsk" = callPackage
@@ -90510,6 +96463,8 @@ self: {
        libraryPkgconfigDepends = [ gtk4 ];
        description = "Gsk bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gtk4 = null;};
 
   "gi-gst" = callPackage
@@ -90595,6 +96550,8 @@ self: {
        libraryPkgconfigDepends = [ gstreamer-pbutils ];
        description = "GStreamer Plugins Base Utils bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gstreamer-pbutils = null;};
 
   "gi-gsttag" = callPackage
@@ -90616,6 +96573,8 @@ self: {
        libraryPkgconfigDepends = [ gstreamer-tag ];
        description = "GStreamer Tag bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gstreamer-tag = null;};
 
   "gi-gstvideo" = callPackage
@@ -90710,6 +96669,8 @@ self: {
        ];
        description = "Declarative GTK+ programming in Haskell";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gi-gtk-declarative-app-simple" = callPackage
@@ -90728,6 +96689,8 @@ self: {
        ];
        description = "Declarative GTK+ programming in Haskell in the style of Pux";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gi-gtk-hs" = callPackage
@@ -90766,6 +96729,8 @@ self: {
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
        description = "GtkosxApplication bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gtk-mac-integration-gtk3 = null;};
 
   "gi-gtksource" = callPackage
@@ -90814,6 +96779,8 @@ self: {
        libraryPkgconfigDepends = [ libhandy ];
        description = "libhandy bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libhandy;};
 
   "gi-javascriptcore" = callPackage
@@ -90947,6 +96914,8 @@ self: {
        libraryPkgconfigDepends = [ poppler ];
        description = "Poppler bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) poppler;};
 
   "gi-secret" = callPackage
@@ -90968,6 +96937,8 @@ self: {
        libraryPkgconfigDepends = [ libsecret ];
        description = "Libsecret bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libsecret;};
 
   "gi-soup" = callPackage
@@ -91109,6 +97080,8 @@ self: {
        libraryPkgconfigDepends = [ libwnck ];
        description = "Wnck bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libwnck;};
 
   "gi-xlib" = callPackage
@@ -91147,6 +97120,8 @@ self: {
        ];
        description = "Fuzzy finder for cabal executables";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gimlh" = callPackage
@@ -91190,6 +97165,8 @@ self: {
        ];
        description = "An implementation of the Jinja2 template language in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gingersnap" = callPackage
@@ -91234,6 +97211,8 @@ self: {
        executableSystemDepends = [ openssl ];
        description = "Ginsu Gale Client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "gio" = callPackage
@@ -91274,6 +97253,8 @@ self: {
        ];
        description = "Git Performance Dashboard";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "giphy-api" = callPackage
@@ -91316,6 +97297,8 @@ self: {
        ];
        description = "A reliable command-line client for gist.github.com";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git" = callPackage
@@ -91340,6 +97323,8 @@ self: {
        doCheck = false;
        description = "Git operations in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-all" = callPackage
@@ -91358,10 +97343,12 @@ self: {
        ];
        description = "Determine which Git repositories need actions to be taken";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-annex" = callPackage
-    ({ mkDerivation, aeson, async, attoparsec, aws, base, blaze-builder
+    ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder
      , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive
      , clientsession, concurrent-output, conduit, connection, containers
      , crypto-api, cryptonite, curl, data-default, DAV, dbus, deepseq
@@ -91369,8 +97356,8 @@ self: {
      , fdo-notify, feed, filepath, filepath-bytestring, free, git, gnupg
      , hinotify, hslogger, http-client, http-client-tls, http-conduit
      , http-types, IfElse, lsof, magic, memory, microlens, monad-control
-     , monad-logger, mountpoints, mtl, network, network-info
-     , network-multicast, network-uri, old-locale, openssh
+     , monad-logger, mountpoints, mtl, network, network-bsd
+     , network-info, network-multicast, network-uri, old-locale, openssh
      , optparse-applicative, path-pieces, perl, persistent
      , persistent-sqlite, persistent-template, process, QuickCheck
      , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi
@@ -91387,7 +97374,7 @@ self: {
        sha256 = "09v80ni1w9z1im79lzrnpz7xlivwna44zqpwq4axwyd17cffqi9m";
        configureFlags = [
          "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
-         "-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser"
+         "-fnetworkbsd" "-fpairing" "-fproduction" "-f-s3" "-ftorrentparser"
          "-fwebapp" "-fwebdav"
        ];
        isLibrary = false;
@@ -91398,14 +97385,14 @@ self: {
          unix-compat utf8-string
        ];
        executableHaskellDepends = [
-         aeson async attoparsec aws base blaze-builder bloomfilter byteable
+         aeson async attoparsec base blaze-builder bloomfilter byteable
          bytestring case-insensitive clientsession concurrent-output conduit
          connection containers crypto-api cryptonite data-default DAV dbus
          deepseq directory disk-free-space dlist edit-distance exceptions
          fdo-notify feed filepath filepath-bytestring free hinotify hslogger
          http-client http-client-tls http-conduit http-types IfElse magic
          memory microlens monad-control monad-logger mountpoints mtl network
-         network-info network-multicast network-uri old-locale
+         network-bsd network-info network-multicast network-uri old-locale
          optparse-applicative path-pieces persistent persistent-sqlite
          persistent-template process QuickCheck random regex-tdfa resourcet
          SafeSemaphore sandi securemem shakespeare socks split stm stm-chans
@@ -91469,6 +97456,8 @@ self: {
        ];
        description = "Maintain per-branch checklists in Git";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-config" = callPackage
@@ -91490,6 +97479,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A simple parser for Git configuration files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-date" = callPackage
@@ -91510,6 +97501,8 @@ self: {
        ];
        description = "Bindings to the date parsing from Git";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-embed" = callPackage
@@ -91547,6 +97540,8 @@ self: {
        ];
        description = "Custom git command for formatting code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-freq" = callPackage
@@ -91589,6 +97584,8 @@ self: {
        ];
        description = "More intelligent push-to-GitHub utility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-jump" = callPackage
@@ -91602,6 +97599,8 @@ self: {
        executableHaskellDepends = [ base base-compat process ];
        description = "Move a git branch";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-lfs" = callPackage
@@ -91636,6 +97635,8 @@ self: {
        ];
        description = "Tool to help resolving git conflicts";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-monitor" = callPackage
@@ -91659,6 +97660,8 @@ self: {
        ];
        description = "Passively snapshots working tree changes efficiently";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-object" = callPackage
@@ -91675,6 +97678,8 @@ self: {
        ];
        description = "Git object and its parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-remote-ipfs" = callPackage
@@ -91706,6 +97711,8 @@ self: {
        ];
        description = "Git remote helper to store git objects on IPFS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-repair" = callPackage
@@ -91733,6 +97740,8 @@ self: {
        ];
        description = "repairs a damanged git repisitory";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-sanity" = callPackage
@@ -91752,6 +97761,8 @@ self: {
        executableHaskellDepends = [ base Cabal ];
        description = "A sanity checker for your git history";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "git-vogue" = callPackage
@@ -91836,6 +97847,8 @@ self: {
        ];
        description = "Create Github issues out of TODO comments in code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "githash" = callPackage
@@ -91885,6 +97898,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Access to the GitHub API, v3";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "github-backup" = callPackage
@@ -91912,6 +97927,8 @@ self: {
        executableToolDepends = [ git ];
        description = "backs up everything github knows about a repository, to the repository";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) git;};
 
   "github-data" = callPackage
@@ -91937,6 +97954,8 @@ self: {
        ];
        description = "Access to the GitHub API, v3";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "github-post-receive" = callPackage
@@ -91976,6 +97995,8 @@ self: {
        ];
        description = "Upload files to GitHub releases";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "github-rest" = callPackage
@@ -92018,6 +98039,8 @@ self: {
        ];
        description = "Various Github helper utilities";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "github-types" = callPackage
@@ -92048,6 +98071,8 @@ self: {
        libraryHaskellDepends = [ base basic-prelude github text ];
        description = "Useful functions that use the GitHub API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "github-webhook-handler" = callPackage
@@ -92066,6 +98091,8 @@ self: {
        ];
        description = "GitHub WebHook Handler";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "github-webhook-handler-snap" = callPackage
@@ -92084,6 +98111,8 @@ self: {
        ];
        description = "GitHub WebHook Handler implementation for Snap";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "github-webhooks" = callPackage
@@ -92102,6 +98131,8 @@ self: {
        testHaskellDepends = [ aeson base bytestring hspec text vector ];
        description = "Aeson instances for GitHub Webhook payloads";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "githud" = callPackage
@@ -92127,6 +98158,8 @@ self: {
        ];
        description = "Heads up, and you see your GIT context";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitignore" = callPackage
@@ -92145,6 +98178,8 @@ self: {
        ];
        description = "Apply GitHub .gitignore templates to already existing repositories.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitit" = callPackage
@@ -92180,6 +98215,8 @@ self: {
        ];
        description = "Wiki using happstack, git or darcs, and pandoc";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitlab-api" = callPackage
@@ -92196,6 +98233,8 @@ self: {
        testHaskellDepends = [ base hspec rio ];
        description = "Gitlab Web API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitlab-haskell" = callPackage
@@ -92234,6 +98273,8 @@ self: {
        ];
        description = "API library for working with Git repositories";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitlib-cmdline" = callPackage
@@ -92261,6 +98302,8 @@ self: {
        ];
        description = "Gitlib repository backend that uses the git command-line tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitlib-cross" = callPackage
@@ -92278,6 +98321,8 @@ self: {
        ];
        description = "Run tests between repositories";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitlib-libgit2" = callPackage
@@ -92304,6 +98349,8 @@ self: {
        ];
        description = "Libgit2 backend for gitlib";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitlib-s3" = callPackage
@@ -92333,6 +98380,8 @@ self: {
        ];
        description = "Gitlib repository backend for storing Git objects in Amazon S3";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitlib-sample" = callPackage
@@ -92346,6 +98395,8 @@ self: {
        ];
        description = "Sample backend for gitlib showing the basic structure for any backend";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitlib-test" = callPackage
@@ -92364,6 +98415,8 @@ self: {
        ];
        description = "Test library for confirming gitlib backend compliance";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitlib-utils" = callPackage
@@ -92382,6 +98435,8 @@ self: {
        ];
        description = "Generic utility functions for working with Git repositories";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitrev" = callPackage
@@ -92422,6 +98477,8 @@ self: {
        ];
        description = "A document store library for Git + JSON";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gitter" = callPackage
@@ -92437,6 +98494,8 @@ self: {
        ];
        description = "Gitter.im API client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "givegif" = callPackage
@@ -92551,6 +98610,8 @@ self: {
        libraryPkgconfigDepends = [ libglade ];
        description = "Binding to the glade library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs.gnome2) libglade;};
 
   "gladexml-accessor" = callPackage
@@ -92562,6 +98623,8 @@ self: {
        libraryHaskellDepends = [ base glade HaXml template-haskell ];
        description = "Automagically declares getters for widget handles in specified interface file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glambda" = callPackage
@@ -92602,6 +98665,8 @@ self: {
        ];
        description = "An OpenGL micro framework";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glasso" = callPackage
@@ -92647,6 +98712,8 @@ self: {
        ];
        description = "Extensible effects using ContT, State and variants";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glazier-pipes" = callPackage
@@ -92662,6 +98729,8 @@ self: {
        ];
        description = "A threaded rendering framework using glaizer and pipes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glazier-react" = callPackage
@@ -92681,6 +98750,8 @@ self: {
        ];
        description = "ReactJS binding using Glazier.Command.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glazier-react-examples" = callPackage
@@ -92705,6 +98776,8 @@ self: {
        ];
        description = "Examples of using glazier-react";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glazier-react-widget" = callPackage
@@ -92724,6 +98797,8 @@ self: {
        ];
        description = "Generic widget library using glazier-react";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gli" = callPackage
@@ -92748,6 +98823,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Tiny cli to fetch PR info from gitlab";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glib" = callPackage
@@ -92781,6 +98858,8 @@ self: {
        testHaskellDepends = [ base data-default hspec lens QuickCheck ];
        description = "Glicko-2 implementation in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glider-nlp" = callPackage
@@ -92793,6 +98872,8 @@ self: {
        testHaskellDepends = [ base Cabal containers hspec text ];
        description = "Natural Language Processing library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glintcollider" = callPackage
@@ -92837,7 +98918,8 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Console IRC client";
        license = stdenv.lib.licenses.isc;
-       maintainers = with stdenv.lib.maintainers; [ kiwi ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gll" = callPackage
@@ -92872,6 +98954,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion Glob MissingH ];
        description = "Haskell bindings for POSIX glob library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "global" = callPackage
@@ -92889,6 +98973,8 @@ self: {
        ];
        description = "Library enabling unique top-level declarations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "global-config" = callPackage
@@ -92909,6 +98995,8 @@ self: {
        ];
        description = "Global mutable configuration";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "global-lock" = callPackage
@@ -92931,6 +99019,8 @@ self: {
        libraryHaskellDepends = [ base containers stm ];
        description = "Namespaced, global, and top-level mutable variables without unsafePerformIO";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glome-hs" = callPackage
@@ -92954,6 +99044,8 @@ self: {
        doHaddock = false;
        description = "ray tracer";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gloss_1_9_2_1" = callPackage
@@ -93000,6 +99092,8 @@ self: {
        libraryHaskellDepends = [ accelerate base gloss gloss-rendering ];
        description = "Extras to interface Gloss and Accelerate";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gloss-algorithms" = callPackage
@@ -93013,6 +99107,8 @@ self: {
        libraryHaskellDepends = [ base containers ghc-prim gloss ];
        description = "Data structures and algorithms for working with 2D graphics";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gloss-banana" = callPackage
@@ -93026,6 +99122,8 @@ self: {
        libraryHaskellDepends = [ base gloss reactive-banana ];
        description = "An Interface for gloss in terms of a reactive-banana Behavior";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gloss-devil" = callPackage
@@ -93037,6 +99135,8 @@ self: {
        libraryHaskellDepends = [ base bytestring gloss repa repa-devil ];
        description = "Display images in Gloss using libdevil for decoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gloss-examples" = callPackage
@@ -93056,6 +99156,8 @@ self: {
        ];
        description = "Examples using the gloss library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gloss-export" = callPackage
@@ -93075,6 +99177,8 @@ self: {
        testHaskellDepends = [ base directory filepath gloss JuicyPixels ];
        description = "Export Gloss pictures to png, bmp, tga, tiff, gif and juicy-pixels-image";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gloss-game" = callPackage
@@ -93086,6 +99190,8 @@ self: {
        libraryHaskellDepends = [ base gloss gloss-juicy ];
        description = "Gloss wrapper that simplifies writing games";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gloss-juicy" = callPackage
@@ -93122,6 +99228,8 @@ self: {
        ];
        description = "Parallel rendering of raster images";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gloss-raster-accelerate" = callPackage
@@ -93166,6 +99274,8 @@ self: {
        libraryHaskellDepends = [ base gloss sodium ];
        description = "A Sodium interface to the Gloss drawing package";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glpk-hs" = callPackage
@@ -93184,6 +99294,8 @@ self: {
        ];
        description = "Comprehensive GLPK linear programming bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) glpk;};
 
   "glue" = callPackage
@@ -93213,6 +99325,8 @@ self: {
        ];
        description = "Make better services";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glue-common" = callPackage
@@ -93237,6 +99351,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Make better services and clients";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glue-core" = callPackage
@@ -93261,6 +99377,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Make better services and clients";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glue-ekg" = callPackage
@@ -93285,6 +99403,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Make better services and clients";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "glue-example" = callPackage
@@ -93305,6 +99425,8 @@ self: {
        ];
        description = "Make better services and clients";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gluturtle" = callPackage
@@ -93333,6 +99455,8 @@ self: {
        ];
        description = "Composable maps and generic tries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gmndl" = callPackage
@@ -93351,6 +99475,8 @@ self: {
        ];
        description = "Mandelbrot Set explorer using GTK";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gmpint" = callPackage
@@ -93378,6 +99504,8 @@ self: {
        ];
        description = "Randomly set a picture as the GNOME desktop background";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gnome-keyring" = callPackage
@@ -93412,6 +99540,8 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GNOME Virtual File System library";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gnome-vfs = null; gnome-vfs_module = null;};
 
   "gnss-converters" = callPackage
@@ -93439,6 +99569,8 @@ self: {
        ];
        description = "GNSS Converters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gnuidn" = callPackage
@@ -93461,6 +99593,8 @@ self: {
        testToolDepends = [ c2hs ];
        description = "Bindings for GNU IDN";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libidn;};
 
   "gnuplot" = callPackage
@@ -93510,6 +99644,8 @@ self: {
        libraryHaskellDepends = [ base directory filepath process ];
        description = "GHCi bindings to lambdabot";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "goal-core" = callPackage
@@ -93529,6 +99665,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Core imports for Geometric Optimization Libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "goal-geometry" = callPackage
@@ -93543,6 +99681,8 @@ self: {
        executableHaskellDepends = [ base goal-core ];
        description = "Scientific computing on geometric objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "goal-probability" = callPackage
@@ -93562,6 +99702,8 @@ self: {
        executableHaskellDepends = [ base goal-core goal-geometry vector ];
        description = "Manifolds of probability distributions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "goal-simulation" = callPackage
@@ -93585,6 +99727,8 @@ self: {
        ];
        description = "Mealy based simulation tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "goat" = callPackage
@@ -93619,6 +99763,8 @@ self: {
        testHaskellDepends = [ base containers HUnit mtl parsec ];
        description = "A monadic take on a 2,500-year-old board game - library";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "goatee-gtk" = callPackage
@@ -93639,6 +99785,8 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "A monadic take on a 2,500-year-old board game - GTK+ UI";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gochan" = callPackage
@@ -93660,6 +99808,8 @@ self: {
        testHaskellDepends = [ base hspec hspec-core ];
        description = "Go-style channels";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "godot-haskell" = callPackage
@@ -93682,6 +99832,8 @@ self: {
        doHaddock = false;
        description = "Haskell bindings for the Godot game engine API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gofer-prelude" = callPackage
@@ -93693,6 +99845,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "The Gofer 2.30 standard prelude";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "goggles" = callPackage
@@ -95961,6 +102115,8 @@ self: {
        libraryHaskellDepends = [ base renderable transformers varying ];
        description = "Graphical user interfaces that are renderable, change over time and eventually produce a value";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "google-cloud" = callPackage
@@ -95980,6 +102136,8 @@ self: {
        ];
        description = "Client for the Google Cloud APIs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "google-dictionary" = callPackage
@@ -96014,6 +102172,8 @@ self: {
        ];
        description = "Google Drive API access";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "google-html5-slide" = callPackage
@@ -96032,6 +102192,8 @@ self: {
        ];
        description = "Google HTML5 Slide generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "google-isbn" = callPackage
@@ -96062,6 +102224,8 @@ self: {
        testHaskellDepends = [ base google-search text time xml-conduit ];
        description = "Write GMail filters and output to importable XML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "google-maps-geocoding" = callPackage
@@ -96098,6 +102262,8 @@ self: {
        ];
        description = "Google OAuth2 token negotiation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "google-oauth2-easy" = callPackage
@@ -96117,6 +102283,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Opininated use of Google Authentication for ease";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "google-oauth2-for-cli" = callPackage
@@ -96160,6 +102328,8 @@ self: {
        libraryHaskellDepends = [ base free nats text time ];
        description = "EDSL for Google and GMail search expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "google-server-api" = callPackage
@@ -96182,6 +102352,8 @@ self: {
        ];
        description = "Google APIs for server to server applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "google-static-maps" = callPackage
@@ -96217,6 +102389,8 @@ self: {
        ];
        description = "Google Translate API bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "googleplus" = callPackage
@@ -96234,6 +102408,8 @@ self: {
        ];
        description = "Haskell implementation of the Google+ API v1";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "googlepolyline" = callPackage
@@ -96252,6 +102428,8 @@ self: {
        ];
        description = "Google Polyline Encoder/Decoder";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gopher-proxy" = callPackage
@@ -96289,6 +102467,8 @@ self: {
        ];
        description = "Spidering robot to download files from Gopherspace";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gore-and-ash" = callPackage
@@ -96307,6 +102487,8 @@ self: {
        ];
        description = "Core of FRP game engine called Gore&Ash";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gore-and-ash-actor" = callPackage
@@ -96324,6 +102506,8 @@ self: {
        ];
        description = "Gore&Ash engine extension that implements actor style of programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gore-and-ash-async" = callPackage
@@ -96346,6 +102530,8 @@ self: {
        ];
        description = "Core module for Gore&Ash engine that embeds async IO actions into game loop";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gore-and-ash-demo" = callPackage
@@ -96371,6 +102557,8 @@ self: {
        ];
        description = "Demonstration game for Gore&Ash game engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gore-and-ash-glfw" = callPackage
@@ -96387,6 +102575,8 @@ self: {
        ];
        description = "Core module for Gore&Ash engine for GLFW input events";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gore-and-ash-lambdacube" = callPackage
@@ -96406,6 +102596,8 @@ self: {
        ];
        description = "Core module for Gore&Ash engine that do something";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gore-and-ash-logging" = callPackage
@@ -96424,6 +102616,8 @@ self: {
        ];
        description = "Core module for gore-and-ash with logging utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gore-and-ash-network" = callPackage
@@ -96445,6 +102639,8 @@ self: {
        ];
        description = "Core module for Gore&Ash engine with low level network API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gore-and-ash-sdl" = callPackage
@@ -96463,6 +102659,8 @@ self: {
        ];
        description = "Gore&Ash core module for integration with SDL library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gore-and-ash-sync" = callPackage
@@ -96482,6 +102680,8 @@ self: {
        ];
        description = "Gore&Ash module for high level network synchronization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gothic" = callPackage
@@ -96538,6 +102738,8 @@ self: {
        ];
        description = "A command line utility for practicing typing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gpah" = callPackage
@@ -96558,6 +102760,8 @@ self: {
        ];
        description = "Generic Programming Use in Hackage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gpcsets" = callPackage
@@ -96622,6 +102826,8 @@ self: {
        ];
        description = "For manipulating GPS coordinates and trails";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gps2htmlReport" = callPackage
@@ -96642,6 +102848,8 @@ self: {
        ];
        description = "GPS to HTML Summary Report";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gpx-conduit" = callPackage
@@ -96658,6 +102866,8 @@ self: {
        ];
        description = "Read GPX files using conduits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grab" = callPackage
@@ -96671,6 +102881,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Applicative non-linear consumption";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grab-form" = callPackage
@@ -96683,6 +102895,8 @@ self: {
        testHaskellDepends = [ base containers hedgehog text ];
        description = "Applicative parsers for form parameter lists";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graceful" = callPackage
@@ -96699,6 +102913,8 @@ self: {
        ];
        description = "Library to write graceful shutdown / upgrade service";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grafana" = callPackage
@@ -96717,6 +102933,8 @@ self: {
        ];
        description = "API for creating grafana dashboards represented as json";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graflog" = callPackage
@@ -96735,6 +102953,8 @@ self: {
        ];
        description = "Monadic correlated log events";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grakn" = callPackage
@@ -96758,6 +102978,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "A Haskell client for Grakn";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grammar-combinators" = callPackage
@@ -96775,6 +102997,8 @@ self: {
        ];
        description = "A parsing library of context-free grammar combinators";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grammatical-parsers" = callPackage
@@ -96824,6 +103048,8 @@ self: {
        ];
        description = "Examples using the Grapefruit library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grapefruit-frp" = callPackage
@@ -96841,6 +103067,8 @@ self: {
        ];
        description = "Functional Reactive Programming core";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grapefruit-records" = callPackage
@@ -96852,6 +103080,8 @@ self: {
        libraryHaskellDepends = [ arrows base grapefruit-frp ];
        description = "A record system for Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grapefruit-ui" = callPackage
@@ -96870,6 +103100,8 @@ self: {
        ];
        description = "Declarative user interface programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grapefruit-ui-gtk" = callPackage
@@ -96889,6 +103121,8 @@ self: {
        ];
        description = "GTK+-based backend for declarative user interface programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph" = callPackage
@@ -96921,6 +103155,8 @@ self: {
        ];
        description = "Fast, memory efficient and persistent graph implementation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph-generators" = callPackage
@@ -96956,6 +103192,8 @@ self: {
        libraryHaskellDepends = [ base containers fgl ];
        description = "An implementation of algorithms for matchings in graphs";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph-rewriting" = callPackage
@@ -96969,6 +103207,8 @@ self: {
        ];
        description = "Monadic graph rewriting of hypergraphs with ports and multiedges";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph-rewriting-cl" = callPackage
@@ -96988,6 +103228,8 @@ self: {
        ];
        description = "Interactive graph rewriting system implementing various well-known combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph-rewriting-gl" = callPackage
@@ -97004,6 +103246,8 @@ self: {
        ];
        description = "OpenGL interface for interactive port graph rewriting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph-rewriting-lambdascope" = callPackage
@@ -97025,6 +103269,8 @@ self: {
        ];
        description = "Lambdascope, an optimal evaluator of the lambda calculus, as an interactive graph-rewriting system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph-rewriting-layout" = callPackage
@@ -97040,6 +103286,8 @@ self: {
        ];
        description = "Force-directed node placement intended for incremental graph drawing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph-rewriting-ski" = callPackage
@@ -97059,6 +103307,8 @@ self: {
        ];
        description = "Two evalutors of the SKI combinator calculus as interactive graph rewrite systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph-rewriting-strategies" = callPackage
@@ -97074,6 +103324,8 @@ self: {
        ];
        description = "Evaluation strategies for port-graph rewriting systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph-rewriting-trs" = callPackage
@@ -97095,6 +103347,8 @@ self: {
        ];
        description = "Evaluate first-order applicative term rewrite systems interactively using graph reduction";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph-rewriting-ww" = callPackage
@@ -97115,6 +103369,8 @@ self: {
        ];
        description = "Evaluator of the lambda-calculus in an interactive graph rewriting system with explicit sharing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph-serialize" = callPackage
@@ -97126,6 +103382,8 @@ self: {
        libraryHaskellDepends = [ array base bytestring containers ];
        description = "Serialization of data structures with references";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph-utils" = callPackage
@@ -97141,6 +103399,8 @@ self: {
        ];
        description = "A simple wrapper & quasi quoter for fgl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph-visit" = callPackage
@@ -97156,6 +103416,8 @@ self: {
        ];
        description = "Graph walk abstraction";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graph-wrapper" = callPackage
@@ -97189,6 +103451,8 @@ self: {
        ];
        description = "A declarative, monadic graph construction language for small graphs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphene" = callPackage
@@ -97205,6 +103469,8 @@ self: {
        ];
        description = "A minimal Graph Theory library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphics-drawingcombinators" = callPackage
@@ -97222,6 +103488,8 @@ self: {
        ];
        description = "A functional interface to 2D drawing in OpenGL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphics-formats-collada" = callPackage
@@ -97237,6 +103505,8 @@ self: {
        ];
        description = "Load 3D geometry in the COLLADA format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphicsFormats" = callPackage
@@ -97248,6 +103518,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 OpenGL QuickCheck ];
        description = "Classes for renderable objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphicstools" = callPackage
@@ -97266,6 +103538,8 @@ self: {
        executableHaskellDepends = [ base CV wx wxcore ];
        description = "Tools for creating graphical UIs, based on wxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphite" = callPackage
@@ -97322,6 +103596,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A reimplementation of graphmod as a source plugin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphql" = callPackage
@@ -97344,6 +103620,8 @@ self: {
        ];
        description = "Haskell GraphQL implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphql-api" = callPackage
@@ -97384,6 +103662,8 @@ self: {
        libraryHaskellDepends = [ base containers json text ];
        description = "GraphQL interface middleware for (SQL) databases";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphs" = callPackage
@@ -97412,6 +103692,8 @@ self: {
        libraryHaskellDepends = [ base indexed ];
        description = "Graph indexed monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphtype" = callPackage
@@ -97429,6 +103711,8 @@ self: {
        ];
        description = "A simple tool to illustrate dependencies between Haskell types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "graphviz" = callPackage
@@ -97472,6 +103756,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Execute Graql queries on a Grakn graph";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grasp" = callPackage
@@ -97496,6 +103782,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "GRASP implementation for the AMMM project";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gravatar" = callPackage
@@ -97524,6 +103812,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Gray code encoder/decoder";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gray-extended" = callPackage
@@ -97576,6 +103866,8 @@ self: {
        executableHaskellDepends = [ array base containers pretty ];
        description = "GreenCard, a foreign function pre-processor for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "greencard-lib" = callPackage
@@ -97588,6 +103880,8 @@ self: {
        libraryHaskellDepends = [ array base containers greencard pretty ];
        description = "A foreign function interface pre-processor library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "greenclip" = callPackage
@@ -97624,6 +103918,8 @@ self: {
        ];
        description = "A scalable distributed logger with a high-precision global time axis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gremlin-haskell" = callPackage
@@ -97647,6 +103943,8 @@ self: {
        testHaskellDepends = [ aeson-qq base hspec lens lens-aeson mtl ];
        description = "Graph database client for TinkerPop3 Gremlin Server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grenade" = callPackage
@@ -97670,6 +103968,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion hmatrix ];
        description = "Practical Deep Learning in Haskell";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "greplicate" = callPackage
@@ -97789,6 +104089,8 @@ self: {
        ];
        description = "Grid-based prototyping framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gridbounds" = callPackage
@@ -97801,6 +104103,8 @@ self: {
        testHaskellDepends = [ base earclipper gjk gridbox hspec ];
        description = "Collision detection for GridBox";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gridbox" = callPackage
@@ -97849,6 +104153,8 @@ self: {
        ];
        description = "Grid-based multimedia engine";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grids" = callPackage
@@ -97892,6 +104198,8 @@ self: {
        executableToolDepends = [ happy ];
        description = "grm grammar converter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "groom" = callPackage
@@ -97955,6 +104263,8 @@ self: {
        ];
        description = "Command line utility to manage AWS ECS resources";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gross" = callPackage
@@ -97969,6 +104279,8 @@ self: {
        executableHaskellDepends = [ base lens mtl ncurses ];
        description = "A spoof on gloss for terminal animation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "groundhog" = callPackage
@@ -98006,6 +104318,8 @@ self: {
        ];
        description = "Extended Converter Library for groundhog embedded types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "groundhog-inspector" = callPackage
@@ -98131,6 +104445,8 @@ self: {
        ];
        description = "Classify objects by key-generating function, like SQL GROUP BY";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "groupBy" = callPackage
@@ -98163,6 +104479,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Grouped lists. Equal consecutive elements are grouped.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "groupoid" = callPackage
@@ -98208,6 +104526,8 @@ self: {
        libraryHaskellDepends = [ base generic-data groups ];
        description = "Generically derive Group instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "growler" = callPackage
@@ -98229,6 +104549,8 @@ self: {
        ];
        description = "A revised version of the scotty library that attempts to be simpler and more performant";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grpc-api-etcd" = callPackage
@@ -98240,6 +104562,8 @@ self: {
        libraryHaskellDepends = [ base proto-lens proto-lens-runtime ];
        description = "Generated messages and instances for etcd gRPC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grpc-etcd-client" = callPackage
@@ -98256,6 +104580,8 @@ self: {
        ];
        description = "gRPC client for etcd";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grpc-haskell" = callPackage
@@ -98284,6 +104610,8 @@ self: {
        ];
        description = "Haskell implementation of gRPC layered on shared C library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "grpc-haskell-core" = callPackage
@@ -98309,6 +104637,8 @@ self: {
        ];
        description = "Haskell implementation of gRPC layered on shared C library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gpr = null; inherit (pkgs) grpc;};
 
   "gruff" = callPackage
@@ -98330,6 +104660,8 @@ self: {
        ];
        description = "fractal explorer GUI using the ruff library";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gruff-examples" = callPackage
@@ -98348,6 +104680,8 @@ self: {
        ];
        description = "Mandelbrot Set examples using ruff and gruff";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gsasl" = callPackage
@@ -98392,6 +104726,8 @@ self: {
        ];
        description = "scrapes google scholar, provides RSS feed";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gsl-random" = callPackage
@@ -98404,6 +104740,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "Bindings the the GSL random number generation facilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gsl-random-fu" = callPackage
@@ -98415,6 +104753,8 @@ self: {
        libraryHaskellDepends = [ base gsl-random random-fu ];
        description = "Instances for using gsl-random with random-fu";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gsmenu" = callPackage
@@ -98479,6 +104819,8 @@ self: {
        ];
        description = "Generic implementation of Storable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gstreamer" = callPackage
@@ -98498,6 +104840,8 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GStreamer open source multimedia framework";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;};
 
   "gt-tools" = callPackage
@@ -98517,6 +104861,8 @@ self: {
        ];
        description = "Console and GUI interface for Google Translate service";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gtfs" = callPackage
@@ -98531,6 +104877,8 @@ self: {
        ];
        description = "The General Transit Feed Specification format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gtfs-realtime" = callPackage
@@ -98546,6 +104894,8 @@ self: {
        ];
        description = "GTFS RealTime protobafs library (autogenerated from .proto file)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gtk" = callPackage
@@ -98590,6 +104940,8 @@ self: {
        libraryHaskellDepends = [ base gtk json transformers ];
        description = "A simple custom form widget for gtk which allows inputing of JSON values";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gtk-largeTreeStore" = callPackage
@@ -98640,6 +104992,8 @@ self: {
        libraryPkgconfigDepends = [ gtk2 ];
        description = "GTK+ Serialized event";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk2;};
 
   "gtk-simple-list-view" = callPackage
@@ -98681,6 +105035,8 @@ self: {
        ];
        description = "A standalone StatusNotifierItem/AppIndicator tray";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk3;};
 
   "gtk-strut" = callPackage
@@ -98714,6 +105070,8 @@ self: {
        libraryHaskellDepends = [ base containers gtk ];
        description = "Convenient Gtk canvas with mouse and keyboard input";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gtk-traymanager" = callPackage
@@ -98865,6 +105223,8 @@ self: {
        executableHaskellDepends = [ base glib gtk3 transformers ];
        description = "Gtk2Hs Hello World, an example package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gtk2hs-rpn" = callPackage
@@ -98876,6 +105236,8 @@ self: {
        libraryHaskellDepends = [ base cairo glib gtk mtl ];
        description = "Adds a module to gtk2hs allowing layouts to be defined using reverse polish notation";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gtk3" = callPackage
@@ -98912,6 +105274,8 @@ self: {
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gtk-mac-integration-gtk3 = null;};
 
   "gtkglext" = callPackage
@@ -98930,6 +105294,8 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GTK+ OpenGL Extension";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk2; inherit (pkgs.gnome2) gtkglext; 
          inherit (pkgs) libGLU; inherit (pkgs.xorg) libICE; 
          inherit (pkgs.xorg) libSM; inherit (pkgs.xorg) libXmu; 
@@ -98951,6 +105317,8 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GtkImageView library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtkimageview;};
 
   "gtkrsync" = callPackage
@@ -98969,6 +105337,8 @@ self: {
        ];
        description = "Gnome rsync progress display";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gtksourceview2" = callPackage
@@ -98988,6 +105358,8 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtksourceview;};
 
   "gtksourceview3" = callPackage
@@ -99007,6 +105379,8 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtksourceview3;};
 
   "guarded-allocation" = callPackage
@@ -99029,6 +105403,8 @@ self: {
        libraryHaskellDepends = [ base instant-generics ];
        description = "Datatype-generic rewriting with preconditions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "guess-combinator" = callPackage
@@ -99040,6 +105416,8 @@ self: {
        libraryHaskellDepends = [ base HList ];
        description = "Generate simple combinators given their type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "guid" = callPackage
@@ -99052,6 +105430,8 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "A simple wrapper around uuid";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gulcii" = callPackage
@@ -99066,6 +105446,8 @@ self: {
        executableHaskellDepends = [ base cairo containers filepath gtk ];
        description = "graphical untyped lambda calculus interactive interpreter";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gutenberg-fibonaccis" = callPackage
@@ -99090,6 +105472,8 @@ self: {
        executableHaskellDepends = [ base unix ];
        description = "ghcWithPackages cmdline util";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gyah-bin" = callPackage
@@ -99103,6 +105487,8 @@ self: {
        executableHaskellDepends = [ base extra GiveYouAHead ];
        description = "A binary version of GiveYouAHead";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "gym-http-api" = callPackage
@@ -99147,6 +105533,8 @@ self: {
        ];
        description = "Haskell library for retrieving data from various booru image sites";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "h-gpgme" = callPackage
@@ -99170,6 +105558,8 @@ self: {
        ];
        description = "High Level Binding for GnuPG Made Easy (gpgme)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "h-reversi" = callPackage
@@ -99193,6 +105583,8 @@ self: {
        ];
        description = "Reversi game in haskell/blank-canvas";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "h2048" = callPackage
@@ -99219,6 +105611,8 @@ self: {
        ];
        description = "An Implementation of Game 2048";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "h2c" = callPackage
@@ -99230,6 +105624,8 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl resourcet ];
        description = "Bindings to Linux I2C with support for repeated-start transactions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hArduino" = callPackage
@@ -99245,6 +105641,8 @@ self: {
        ];
        description = "Control your Arduino board from Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hBDD" = callPackage
@@ -99271,6 +105669,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An FFI binding to CMU/Long's BDD library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {bdd = null; mem = null;};
 
   "hBDD-CUDD" = callPackage
@@ -99286,6 +105686,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An FFI binding to the CUDD library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {cudd = null; epd = null; inherit (pkgs) mtr; 
          inherit (pkgs) st; util = null;};
 
@@ -99317,6 +105719,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "interface to CSound API";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {csound64 = null; inherit (pkgs) libsndfile;};
 
   "hDFA" = callPackage
@@ -99328,6 +105732,8 @@ self: {
        libraryHaskellDepends = [ base containers directory process ];
        description = "A simple library for representing and minimising DFAs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hF2" = callPackage
@@ -99340,6 +105746,8 @@ self: {
        libraryHaskellDepends = [ base cereal vector ];
        description = "F(2^e) math for cryptography";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hGelf" = callPackage
@@ -99356,6 +105764,8 @@ self: {
        ];
        description = "Haskell GELF library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hLLVM" = callPackage
@@ -99398,6 +105808,8 @@ self: {
        ];
        description = "Library to interact with the @Mollom anti-spam service";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hOff-display" = callPackage
@@ -99412,6 +105824,8 @@ self: {
        executableHaskellDepends = [ base GLFW hOff-parser OpenGL parsec ];
        description = "The tool to transform the OFF to other image format";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hOff-parser" = callPackage
@@ -99471,6 +105885,8 @@ self: {
        ];
        description = "native Haskell implementation of OpenPGP (RFC4880)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hPDB" = callPackage
@@ -99490,6 +105906,8 @@ self: {
        ];
        description = "Protein Databank file format library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hPDB-examples" = callPackage
@@ -99516,6 +105934,8 @@ self: {
        ];
        description = "Examples for hPDB library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hPushover" = callPackage
@@ -99531,6 +105951,8 @@ self: {
        ];
        description = "Pushover.net API functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hR" = callPackage
@@ -99542,6 +105964,8 @@ self: {
        libraryHaskellDepends = [ array base containers unix ];
        description = "R bindings and interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hRESP" = callPackage
@@ -99572,6 +105996,8 @@ self: {
        ];
        description = "Interface to Amazon's Simple Storage Service (S3)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hScraper" = callPackage
@@ -99588,6 +106014,8 @@ self: {
        ];
        description = "A Haskell library to scrape and crawl web-pages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hSimpleDB" = callPackage
@@ -99604,6 +106032,8 @@ self: {
        ];
        description = "Interface to Amazon's SimpleDB service";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hTalos" = callPackage
@@ -99617,6 +106047,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Parser, print and manipulate structures in PDB file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hTensor" = callPackage
@@ -99628,6 +106060,8 @@ self: {
        libraryHaskellDepends = [ base containers hmatrix random ];
        description = "Multidimensional arrays and simple tensor computations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hVOIDP" = callPackage
@@ -99643,6 +106077,8 @@ self: {
        executableSystemDepends = [ blas liblapack ];
        description = "Optimal variable selection in chain graphical model";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) blas; inherit (pkgs) liblapack;};
 
   "hXmixer" = callPackage
@@ -99676,6 +106112,8 @@ self: {
        ];
        description = "Haar wavelet transforms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "habit" = callPackage
@@ -99700,6 +106138,8 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "Haskell message bot framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hable" = callPackage
@@ -99731,6 +106171,8 @@ self: {
        ];
        description = "A minimalist static blog generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hablog" = callPackage
@@ -99795,6 +106237,8 @@ self: {
        ];
        description = "Hack contrib";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack-contrib-press" = callPackage
@@ -99811,6 +106255,8 @@ self: {
        ];
        description = "Hack helper that renders Press templates";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack-frontend-happstack" = callPackage
@@ -99828,6 +106274,8 @@ self: {
        ];
        description = "hack-frontend-happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack-frontend-monadcgi" = callPackage
@@ -99850,6 +106298,8 @@ self: {
        libraryHaskellDepends = [ base bytestring hack ];
        description = "Hack handler using CGI protocol. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack-handler-epoll" = callPackage
@@ -99868,6 +106318,8 @@ self: {
        ];
        description = "hack handler implementation using epoll";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack-handler-evhttp" = callPackage
@@ -99886,6 +106338,8 @@ self: {
        librarySystemDepends = [ event ];
        description = "Hack EvHTTP (libevent) Handler";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {event = null;};
 
   "hack-handler-fastcgi" = callPackage
@@ -99898,6 +106352,8 @@ self: {
        librarySystemDepends = [ fcgi ];
        description = "Hack handler direct to fastcgi (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) fcgi;};
 
   "hack-handler-happstack" = callPackage
@@ -99915,6 +106371,8 @@ self: {
        ];
        description = "Hack Happstack server handler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack-handler-hyena" = callPackage
@@ -99931,6 +106389,8 @@ self: {
        ];
        description = "Hyena hack handler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack-handler-kibro" = callPackage
@@ -99945,6 +106405,8 @@ self: {
        ];
        description = "Hack Kibro handler";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack-handler-simpleserver" = callPackage
@@ -99960,6 +106422,8 @@ self: {
        ];
        description = "A simplistic HTTP server handler for Hack. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack-middleware-cleanpath" = callPackage
@@ -99973,6 +106437,8 @@ self: {
        ];
        description = "Applies some basic redirect rules to get cleaner paths. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack-middleware-clientsession" = callPackage
@@ -99988,6 +106454,8 @@ self: {
        ];
        description = "Middleware for easily keeping session data in client cookies. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack-middleware-gzip" = callPackage
@@ -100014,6 +106482,8 @@ self: {
        ];
        description = "Automatic wrapping of JSON responses to convert into JSONP. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack2" = callPackage
@@ -100076,6 +106546,8 @@ self: {
        ];
        description = "Hack2 Happstack server handler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack2-handler-mongrel2-http" = callPackage
@@ -100096,6 +106568,8 @@ self: {
        ];
        description = "Hack2 Mongrel2 HTTP handler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack2-handler-snap-server" = callPackage
@@ -100114,6 +106588,8 @@ self: {
        ];
        description = "Hack2 Snap server handler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack2-handler-warp" = callPackage
@@ -100130,6 +106606,8 @@ self: {
        ];
        description = "Hack2 warp handler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hack2-interface-wai" = callPackage
@@ -100186,6 +106664,8 @@ self: {
        ];
        description = "Compare the public API of different versions of a Hackage library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hackage-mirror" = callPackage
@@ -100215,6 +106695,8 @@ self: {
        ];
        description = "Simple mirroring utility for Hackage";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hackage-plot" = callPackage
@@ -100246,6 +106728,8 @@ self: {
        executableHaskellDepends = [ base Cabal containers hackage-db ];
        description = "Process 00-index.tar.gz from Hackage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hackage-proxy" = callPackage
@@ -100269,6 +106753,8 @@ self: {
        ];
        description = "Provide a proxy for Hackage which modifies responses in some way. (deprecated)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hackage-repo-tool" = callPackage
@@ -100291,9 +106777,38 @@ self: {
        ];
        description = "Manage secure file-based package repositories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hackage-security" = callPackage
+    ({ mkDerivation, base, base16-bytestring, base64-bytestring
+     , bytestring, Cabal, containers, cryptohash-sha256, directory
+     , ed25519, filepath, ghc-prim, mtl, network, network-uri, parsec
+     , pretty, QuickCheck, tar, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, temporary, time, transformers, zlib
+     }:
+     mkDerivation {
+       pname = "hackage-security";
+       version = "0.5.3.0";
+       sha256 = "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v";
+       revision = "6";
+       editedCabalFile = "1xs2nkzlvkdz8g27yzfxbjdbdadfmgiydnlpn5dm77cg18r495ay";
+       libraryHaskellDepends = [
+         base base16-bytestring base64-bytestring bytestring Cabal
+         containers cryptohash-sha256 directory ed25519 filepath ghc-prim
+         mtl network network-uri parsec pretty tar template-haskell time
+         transformers zlib
+       ];
+       testHaskellDepends = [
+         base bytestring Cabal containers network-uri QuickCheck tar tasty
+         tasty-hunit tasty-quickcheck temporary time zlib
+       ];
+       description = "Hackage security library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "hackage-security_0_6_0_0" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring
      , bytestring, Cabal, containers, cryptohash-sha256, directory
      , ed25519, filepath, ghc-prim, lukko, mtl, network, network-uri
@@ -100320,6 +106835,7 @@ self: {
        ];
        description = "Hackage security library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-security-HTTP" = callPackage
@@ -100337,6 +106853,8 @@ self: {
        ];
        description = "Hackage security bindings against the HTTP library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hackage-server" = callPackage
@@ -100375,6 +106893,8 @@ self: {
        ];
        description = "The Hackage web server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hackage-sparks" = callPackage
@@ -100411,6 +106931,8 @@ self: {
        ];
        description = "Check for differences between working directory and hackage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hackage2hwn" = callPackage
@@ -100424,6 +106946,8 @@ self: {
        executableHaskellDepends = [ base download feed tagsoup ];
        description = "Convert Hackage RSS feeds to wiki format for publishing on Haskell.org";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hackage2twitter" = callPackage
@@ -100437,6 +106961,8 @@ self: {
        executableHaskellDepends = [ base feed feed2twitter ];
        description = "Send new Hackage releases to Twitter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hackager" = callPackage
@@ -100454,6 +106980,8 @@ self: {
        ];
        description = "Hackage testing tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hackernews" = callPackage
@@ -100478,6 +107006,8 @@ self: {
        ];
        description = "API for Hacker News";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hackertyper" = callPackage
@@ -100514,6 +107044,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "Generate useful files for Haskell projects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hackport" = callPackage
@@ -100546,6 +107078,8 @@ self: {
        ];
        description = "Hackage and Portage integration tool";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hactor" = callPackage
@@ -100562,6 +107096,8 @@ self: {
        ];
        description = "Lightweight Erlang-style actors for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hactors" = callPackage
@@ -100573,6 +107109,8 @@ self: {
        libraryHaskellDepends = [ base stm ];
        description = "Practical actors for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haddock_2_22_0" = callPackage
@@ -100667,6 +107205,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A documentation-only package exemplifying haddock markup features";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haddock-leksah" = callPackage
@@ -100685,6 +107225,8 @@ self: {
        ];
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haddock-library" = callPackage
@@ -100724,6 +107266,8 @@ self: {
        ];
        description = "Test utilities for Haddock";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haddocset" = callPackage
@@ -100745,6 +107289,8 @@ self: {
        ];
        description = "Generate docset of Dash by Haddock haskell documentation tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hadolint" = callPackage
@@ -100773,6 +107319,8 @@ self: {
        ];
        description = "Dockerfile Linter JavaScript API";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hadoop-formats" = callPackage
@@ -100790,6 +107338,8 @@ self: {
        testHaskellDepends = [ base bytestring filepath text vector ];
        description = "Read/write file formats commonly used by Hadoop";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) snappy;};
 
   "hadoop-rpc" = callPackage
@@ -100810,6 +107360,8 @@ self: {
        testHaskellDepends = [ base protobuf tasty tasty-hunit vector ];
        description = "Use the Hadoop RPC interface from Haskell";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hadoop-tools" = callPackage
@@ -100836,6 +107388,8 @@ self: {
        ];
        description = "Fast command line tools for working with Hadoop";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haeredes" = callPackage
@@ -100866,6 +107420,8 @@ self: {
        testHaskellDepends = [ base intervals mtl QuickCheck ];
        description = "Affine arithmetic library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haggis" = callPackage
@@ -100892,6 +107448,8 @@ self: {
        ];
        description = "A static site generator with blogging/comments support";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haggle" = callPackage
@@ -100944,6 +107502,8 @@ self: {
        executableHaskellDepends = [ base time ];
        description = "Analytic Hierarchy Process";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haiji" = callPackage
@@ -100966,6 +107526,8 @@ self: {
        ];
        description = "A typed template engine, subset of jinja2";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hail" = callPackage
@@ -100986,19 +107548,21 @@ self: {
        ];
        description = "A service for pull-based continuous deployment based on hydra";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hailgun" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, email-validate
-     , exceptions, filepath, http-client, http-client-tls, http-types
-     , tagsoup, text, time, transformers
+    ({ mkDerivation, aeson, attoparsec, base, bytestring
+     , email-validate, exceptions, filepath, http-client
+     , http-client-tls, http-types, tagsoup, text, time, transformers
      }:
      mkDerivation {
        pname = "hailgun";
-       version = "0.4.2";
-       sha256 = "15sbg5dnpc6g3649zy4ndbama1535xpf7dnnqlv22rdvy40ch5kl";
+       version = "0.5.1";
+       sha256 = "0kkmylcjf8lhd0jdb8zn5lxgdbd57swxrsc87zkb8hg2sqw5adss";
        libraryHaskellDepends = [
-         aeson base bytestring email-validate exceptions filepath
+         aeson attoparsec base bytestring email-validate exceptions filepath
          http-client http-client-tls http-types tagsoup text time
          transformers
        ];
@@ -101019,6 +107583,8 @@ self: {
        ];
        description = "A program to send emails throught the Mailgun api";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hailgun-simple" = callPackage
@@ -101123,6 +107689,8 @@ self: {
        ];
        description = "A JSON REST API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakaru" = callPackage
@@ -101152,6 +107720,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ghc-prim ];
        description = "A probabilistic programming embedded DSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hake" = callPackage
@@ -101179,6 +107749,8 @@ self: {
        libraryHaskellDepends = [ base HTTP network ];
        description = "Akismet spam protection library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakka" = callPackage
@@ -101193,6 +107765,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Minimal akka-inspired actor library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hako" = callPackage
@@ -101209,6 +107783,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "A mako-like quasi-quoter template library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll" = callPackage
@@ -101260,6 +107836,8 @@ self: {
        ];
        description = "A package allowing to write Hakyll blog posts in Rmd";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-agda" = callPackage
@@ -101276,6 +107854,8 @@ self: {
        ];
        description = "Wrapper to integrate literate Agda files with Hakyll";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-blaze-templates" = callPackage
@@ -101287,6 +107867,8 @@ self: {
        libraryHaskellDepends = [ base blaze-html blaze-markup hakyll ];
        description = "Blaze templates for Hakyll";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-contrib" = callPackage
@@ -101302,6 +107884,8 @@ self: {
        executableHaskellDepends = [ base directory filepath hakyll ];
        description = "Extra modules for the hakyll website compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-contrib-csv" = callPackage
@@ -101318,6 +107902,8 @@ self: {
        testHaskellDepends = [ base blaze-html bytestring cassava hspec ];
        description = "Generate Html tables from Csv files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-contrib-elm" = callPackage
@@ -101336,6 +107922,8 @@ self: {
        executableHaskellDepends = [ base hakyll ];
        description = "Compile Elm code for inclusion in Hakyll static site";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-contrib-hyphenation" = callPackage
@@ -101366,6 +107954,8 @@ self: {
        ];
        description = "A hakyll library that helps maintain a separate links database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-convert" = callPackage
@@ -101387,6 +107977,8 @@ self: {
        ];
        description = "Convert from other blog engines to Hakyll";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-dhall" = callPackage
@@ -101421,6 +108013,8 @@ self: {
        ];
        description = "Allow Hakyll to create hierarchical menues from directories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-elm" = callPackage
@@ -101463,6 +108057,8 @@ self: {
        ];
        description = "FileStore utilities for Hakyll";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-images" = callPackage
@@ -101495,6 +108091,8 @@ self: {
        libraryHaskellDepends = [ base hakyll ogmarkup ];
        description = "Integrate ogmarkup document with Hakyll";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-sass" = callPackage
@@ -101521,6 +108119,8 @@ self: {
        libraryHaskellDepends = [ base containers hakyll ];
        description = "Adds series functionality to hakyll";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-shakespeare" = callPackage
@@ -101559,6 +108159,8 @@ self: {
        ];
        description = "A shortcode extension module for Hakyll";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-shortcut-links" = callPackage
@@ -101577,6 +108179,8 @@ self: {
        testHaskellDepends = [ base hspec mtl pandoc text ];
        description = "Use shortcut-links in markdown file for Hakyll";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hakyll-typescript" = callPackage
@@ -101593,6 +108197,8 @@ self: {
        testHaskellDepends = [ base directory hakyll tasty tasty-hunit ];
        description = "Typescript and javascript hakyll compilers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hal" = callPackage
@@ -101611,6 +108217,8 @@ self: {
        ];
        description = "A runtime environment for Haskell applications running on AWS Lambda";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "halberd" = callPackage
@@ -101639,6 +108247,8 @@ self: {
        ];
        description = "A tool to generate missing import statements for Haskell modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "half" = callPackage
@@ -101675,6 +108285,8 @@ self: {
        ];
        description = "The HAskelL File System (\"halfs\" -- intended for use on the HaLVM)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "halipeto" = callPackage
@@ -101688,6 +108300,8 @@ self: {
        libraryHaskellDepends = [ base directory HaXml pandoc ];
        description = "Haskell Static Web Page Generator";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "halive" = callPackage
@@ -101717,6 +108331,8 @@ self: {
        ];
        description = "A live recompiler";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hall-symbols" = callPackage
@@ -101733,6 +108349,8 @@ self: {
        ];
        description = "Symmetry operations generater of Hall Symbols";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "halma" = callPackage
@@ -101771,6 +108389,8 @@ self: {
        ];
        description = "GTK application for playing Halma";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "halma-telegram-bot" = callPackage
@@ -101795,6 +108415,8 @@ self: {
        ];
        description = "Telegram bot for playing Halma";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haltavista" = callPackage
@@ -101820,6 +108442,8 @@ self: {
        testHaskellDepends = [ base hedgehog lens ];
        description = "Split or combine data structures to and from halves, quarters, eighths";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "halvm-web" = callPackage
@@ -101907,6 +108531,8 @@ self: {
        ];
        description = "Haskell macro preprocessor";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hamsql" = callPackage
@@ -101930,6 +108556,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Interpreter for SQL-structure definitions in YAML (YamSql)";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hamtmap" = callPackage
@@ -101943,6 +108571,8 @@ self: {
        libraryHaskellDepends = [ array base deepseq hashable ];
        description = "A purely functional and persistent hash map";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hamtsolo" = callPackage
@@ -101983,6 +108613,8 @@ self: {
        executableHaskellDepends = [ filepath ];
        description = "Library to handle abstract music";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "han2zen" = callPackage
@@ -102001,8 +108633,8 @@ self: {
     ({ mkDerivation, base, containers, random }:
      mkDerivation {
        pname = "hanabi-dealer";
-       version = "0.6.0.0";
-       sha256 = "0xdj24prx2ndr1xz5g38p9v9vf5wfv9h5rhnfs0xfsdq3nmjvbkx";
+       version = "0.7.0.0";
+       sha256 = "0a62h0mblddp77binl73h8yq46r9szrqzdvx16zawb0y222d14mp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers random ];
@@ -102048,6 +108680,8 @@ self: {
        ];
        description = "Library and command-line utility for accessing Google services and APIs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "handa-geodata" = callPackage
@@ -102094,6 +108728,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "HandleLike class";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "handsy" = callPackage
@@ -102114,6 +108750,8 @@ self: {
        ];
        description = "A DSL to describe common shell operations and interpeters for running them locally and remotely";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "handwriting" = callPackage
@@ -102172,6 +108810,8 @@ self: {
        ];
        description = "Simple Continuous Integration/Deployment System";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hans" = callPackage
@@ -102195,6 +108835,8 @@ self: {
        ];
        description = "Network Stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hans-pcap" = callPackage
@@ -102206,6 +108848,8 @@ self: {
        libraryHaskellDepends = [ base bytestring hans pcap ];
        description = "Driver for real ethernet devices for HaNS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hans-pfq" = callPackage
@@ -102237,6 +108881,8 @@ self: {
        ];
        description = "Graphviz code generation with Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hapistrano" = callPackage
@@ -102267,6 +108913,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A deployment library for Haskell applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happindicator" = callPackage
@@ -102285,6 +108933,8 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the appindicator library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libappindicator-gtk2;};
 
   "happindicator3" = callPackage
@@ -102299,6 +108949,8 @@ self: {
        libraryPkgconfigDepends = [ libappindicator-gtk3 ];
        description = "Binding to the appindicator library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libappindicator-gtk3;};
 
   "happlets" = callPackage
@@ -102316,6 +108968,8 @@ self: {
        ];
        description = "\"Haskell Applets\" provides an event handler and a canvas for building simple GUI apps";
        license = "AGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happlets-lib-gtk" = callPackage
@@ -102337,6 +108991,8 @@ self: {
        ];
        description = "The \"Haskell Applets\" Gtk+ ver. 2 back-end for \"happlets\".";
        license = "AGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happraise" = callPackage
@@ -102350,6 +109006,8 @@ self: {
        executableHaskellDepends = [ base directory filepath ];
        description = "A small program for counting the comments in haskell source";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happs-hsp" = callPackage
@@ -102363,6 +109021,8 @@ self: {
          base bytestring HAppS-Server hsp mtl plugins
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happs-hsp-template" = callPackage
@@ -102379,6 +109039,8 @@ self: {
        ];
        description = "Utilities for using HSP templates in HAppS applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happs-tutorial" = callPackage
@@ -102403,6 +109065,8 @@ self: {
        ];
        description = "A Happstack Tutorial that is its own web 2.0-type demo.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack" = callPackage
@@ -102417,6 +109081,8 @@ self: {
        doHaddock = false;
        description = "The haskell application server stack + code generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-auth" = callPackage
@@ -102435,6 +109101,8 @@ self: {
        ];
        description = "A Happstack Authentication Suite";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-authenticate" = callPackage
@@ -102464,6 +109132,8 @@ self: {
        ];
        description = "Happstack Authentication Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-clientsession" = callPackage
@@ -102480,6 +109150,8 @@ self: {
        ];
        description = "client-side session data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-contrib" = callPackage
@@ -102500,6 +109172,8 @@ self: {
        ];
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-data" = callPackage
@@ -102521,6 +109195,8 @@ self: {
        ];
        description = "Happstack data manipulation libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-dlg" = callPackage
@@ -102538,6 +109214,8 @@ self: {
        ];
        description = "Cross-request user interactions for Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-facebook" = callPackage
@@ -102563,6 +109241,8 @@ self: {
        ];
        description = "A package for building Facebook applications using Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-fastcgi" = callPackage
@@ -102594,6 +109274,8 @@ self: {
        ];
        description = "Support for using Fay with Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-fay-ajax" = callPackage
@@ -102606,6 +109288,8 @@ self: {
        libraryHaskellDepends = [ fay-base fay-jquery ];
        description = "Support for using Fay with Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-foundation" = callPackage
@@ -102626,6 +109310,8 @@ self: {
        ];
        description = "Glue code for using Happstack with acid-state, web-routes, reform, and HSP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-hamlet" = callPackage
@@ -102637,6 +109323,8 @@ self: {
        libraryHaskellDepends = [ base happstack-server shakespeare text ];
        description = "Support for Hamlet HTML templates in Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-heist" = callPackage
@@ -102653,6 +109341,8 @@ self: {
        ];
        description = "Support for using Heist templates in Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-helpers" = callPackage
@@ -102676,6 +109366,8 @@ self: {
        ];
        description = "Convenience functions for Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-hsp" = callPackage
@@ -102707,6 +109399,8 @@ self: {
        ];
        description = "Support for using HStringTemplate in Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-ixset" = callPackage
@@ -102725,6 +109419,8 @@ self: {
        ];
        description = "Efficient relational queries on Haskell sets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-jmacro" = callPackage
@@ -102742,6 +109438,8 @@ self: {
        ];
        description = "Support for using JMacro with Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-lite" = callPackage
@@ -102755,6 +109453,8 @@ self: {
        ];
        description = "Happstack minus the useless stuff";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-monad-peel" = callPackage
@@ -102770,6 +109470,8 @@ self: {
        ];
        description = "monad-peel instances for Happstack types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-plugins" = callPackage
@@ -102785,6 +109487,8 @@ self: {
        ];
        description = "The haskell application server stack + reload";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-server" = callPackage
@@ -102848,6 +109552,8 @@ self: {
        ];
        description = "Extend happstack-server with native HTTPS support (TLS/SSL)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-state" = callPackage
@@ -102868,6 +109574,8 @@ self: {
        ];
        description = "Event-based distributed state";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-static-routing" = callPackage
@@ -102883,6 +109591,8 @@ self: {
        ];
        description = "Support for static URL routing with overlap detection for Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-util" = callPackage
@@ -102906,6 +109616,8 @@ self: {
        ];
        description = "Web framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happstack-yui" = callPackage
@@ -102927,6 +109639,8 @@ self: {
        ];
        description = "Utilities for using YUI3 with Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happy_1_19_5" = callPackage
@@ -103013,6 +109727,8 @@ self: {
        libraryHaskellDepends = [ base Chart Chart-diagrams ];
        description = "Generate simple okay-looking bar plots without much effort";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happy-meta" = callPackage
@@ -103045,6 +109761,8 @@ self: {
        ];
        description = "Acceptance test framework for web applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happybara-webkit" = callPackage
@@ -103064,6 +109782,8 @@ self: {
        ];
        description = "WebKit Happybara driver";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "happybara-webkit-server" = callPackage
@@ -103075,6 +109795,8 @@ self: {
        libraryHaskellDepends = [ base directory filepath process ];
        description = "WebKit Server binary for Happybara (taken from capybara-webkit)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hapstone" = callPackage
@@ -103093,6 +109815,8 @@ self: {
        ];
        description = "Capstone bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) capstone;};
 
   "haquery" = callPackage
@@ -103108,6 +109832,8 @@ self: {
        ];
        description = "jQuery for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haquil" = callPackage
@@ -103129,6 +109855,8 @@ self: {
        ];
        description = "A Haskell implementation of the Quil instruction set for quantum computing";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "har" = callPackage
@@ -103161,6 +109889,8 @@ self: {
        executableSystemDepends = [ openssl sqlite ];
        description = "Networked content addressed backup and restore software";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) openssl; inherit (pkgs) sqlite;};
 
   "hardware-edsl" = callPackage
@@ -103178,6 +109908,8 @@ self: {
        ];
        description = "Deep embedding of hardware descriptions with code generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "harg" = callPackage
@@ -103198,6 +109930,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Haskell program configuration using higher kinded data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hark" = callPackage
@@ -103216,6 +109950,8 @@ self: {
        ];
        description = "A Gentoo package query tool";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "harmony" = callPackage
@@ -103241,6 +109977,8 @@ self: {
        ];
        description = "A web service specification compiler that generates implementation and tests";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haroonga" = callPackage
@@ -103257,6 +109995,8 @@ self: {
        libraryPkgconfigDepends = [ groonga ];
        description = "Low level bindings for Groonga";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) groonga;};
 
   "haroonga-httpd" = callPackage
@@ -103275,6 +110015,8 @@ self: {
        ];
        description = "Yet another Groonga http server";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "harp" = callPackage
@@ -103302,6 +110044,8 @@ self: {
        ];
        description = "Runtime code generation for x86 machine code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "harvest-api" = callPackage
@@ -103322,6 +110066,8 @@ self: {
        ];
        description = "Bindings for Harvest API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "has" = callPackage
@@ -103335,6 +110081,8 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Entity based records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "has-th" = callPackage
@@ -103346,6 +110094,8 @@ self: {
        libraryHaskellDepends = [ base has template-haskell ];
        description = "Template Haskell function for Has records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasbolt" = callPackage
@@ -103366,6 +110116,8 @@ self: {
        ];
        description = "Haskell driver for Neo4j 3+ (BOLT protocol)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasbolt-extras" = callPackage
@@ -103391,6 +110143,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Extras for hasbolt library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hascal" = callPackage
@@ -103432,6 +110186,8 @@ self: {
        ];
        description = "Decompress SAPCAR archives";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hascas" = callPackage
@@ -103453,6 +110209,8 @@ self: {
        ];
        description = "Cassandra driver for haskell";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hascat" = callPackage
@@ -103547,6 +110305,8 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Hashing tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hash-store" = callPackage
@@ -103625,6 +110385,8 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Higher-rank Hashable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hashable-generics" = callPackage
@@ -103643,6 +110405,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ghc-prim hashable ];
        description = "Automatically generates Hashable instances with GHC.Generics.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hashable-orphans" = callPackage
@@ -103656,6 +110420,8 @@ self: {
        libraryHaskellDepends = [ base hashable sorted-list time ];
        description = "Provides instances missing from Hashable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hashable-time" = callPackage
@@ -103687,6 +110453,8 @@ self: {
        ];
        description = "Principled, portable & extensible hashing of data and types, including an implementation of the FNV-1a and SipHash algorithms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hashed-storage" = callPackage
@@ -103705,6 +110473,8 @@ self: {
        ];
        description = "Hashed file storage support code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hashflare" = callPackage
@@ -103718,6 +110488,8 @@ self: {
        libraryHaskellDepends = [ base containers simple-money ];
        description = "A library for working with HashFlare.io contracts and hashrates";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hashids" = callPackage
@@ -103796,6 +110568,8 @@ self: {
        ];
        description = "Efficient consistent hashing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hashtable-benchmark" = callPackage
@@ -103848,6 +110622,8 @@ self: {
        ];
        description = "Extensions for a \"hashtables\" library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasim" = callPackage
@@ -103859,6 +110635,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "Process-Based Discrete Event Simulation library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hask" = callPackage
@@ -103876,6 +110654,8 @@ self: {
        ];
        description = "Categories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hask-home" = callPackage
@@ -103894,6 +110674,8 @@ self: {
        ];
        description = "Generate homepages for cabal packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskades" = callPackage
@@ -103973,6 +110755,8 @@ self: {
        ];
        description = "A dialect of haskell with order of execution based on dependency resolution";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskbot-core" = callPackage
@@ -103993,6 +110777,8 @@ self: {
        ];
        description = "Easily-extensible chatbot for Slack messaging service";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskdeep" = callPackage
@@ -104017,6 +110803,8 @@ self: {
        ];
        description = "Computes and audits file hashes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskdogs" = callPackage
@@ -104035,6 +110823,8 @@ self: {
        ];
        description = "Generate tags file for Haskell project and its nearest deps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskeem" = callPackage
@@ -104053,6 +110843,8 @@ self: {
        ];
        description = "A small scheme interpreter";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskeline_0_8_0_0" = callPackage
@@ -104089,6 +110881,8 @@ self: {
        libraryHaskellDepends = [ base haskeline mtl ];
        description = "Class interface for working with Haskeline";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskeline-repl" = callPackage
@@ -104112,6 +110906,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl protolude text ];
        description = "Write Emacs module in Haskell, using Emacs 25's Dynamic Module feature";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-abci" = callPackage
@@ -104137,6 +110933,8 @@ self: {
        ];
        description = "Haskell Application BlockChain Interface (ABCI) Server Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-aliyun" = callPackage
@@ -104159,6 +110957,8 @@ self: {
        ];
        description = "haskell client of aliyun service";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-awk" = callPackage
@@ -104191,6 +110991,8 @@ self: {
        ];
        description = "Transform text from the command-line using Haskell expressions";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-bcrypt" = callPackage
@@ -104229,6 +111031,8 @@ self: {
        ];
        description = "Complete BitMEX Client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-bitmex-rest" = callPackage
@@ -104256,6 +111060,8 @@ self: {
        ];
        description = "Auto-generated bitmex API Client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-brainfuck" = callPackage
@@ -104275,6 +111081,8 @@ self: {
        ];
        description = "BrainFuck interpreter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-ci" = callPackage
@@ -104306,6 +111114,8 @@ self: {
        doHaddock = false;
        description = "Cabal package script generator for Travis-CI";
        license = stdenv.lib.licenses.gpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-cnc" = callPackage
@@ -104326,6 +111136,8 @@ self: {
        executableHaskellDepends = [ base directory process ];
        description = "Library for parallel programming in the Intel Concurrent Collections paradigm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-coffee" = callPackage
@@ -104337,6 +111149,8 @@ self: {
        libraryHaskellDepends = [ base process ];
        description = "Simple CoffeeScript API";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-compression" = callPackage
@@ -104356,6 +111170,8 @@ self: {
        ];
        description = "compress files";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-conll" = callPackage
@@ -104382,6 +111198,8 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        description = "Small modules for a Haskell course in which Haskell is taught by implementing Prelude functionality";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-dap" = callPackage
@@ -104431,6 +111249,8 @@ self: {
        ];
        description = "Haskell Debug Adapter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-disque" = callPackage
@@ -104447,6 +111267,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Client library for the Disque datastore";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-docs" = callPackage
@@ -104469,6 +111291,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A program to find and display the docs and type of a name";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-eigen-util" = callPackage
@@ -104481,6 +111305,8 @@ self: {
        testHaskellDepends = [ base eigen vector ];
        description = "Some utility functions for haskell-eigen library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-exp-parser" = callPackage
@@ -104493,6 +111319,8 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Simple parser parser from Haskell to TemplateHaskell expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-fake-user-agent" = callPackage
@@ -104533,6 +111361,8 @@ self: {
        ];
        description = "Haskell source code formatter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-ftp" = callPackage
@@ -104559,6 +111389,8 @@ self: {
        ];
        description = "A Haskell ftp server with configurable backend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-generate" = callPackage
@@ -104575,6 +111407,8 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Typesafe generation of haskell source code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-gettext" = callPackage
@@ -104665,6 +111499,8 @@ self: {
        executableHaskellDepends = [ base containers gloss ];
        description = "Go and Checkers game in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-google-trends" = callPackage
@@ -104748,6 +111584,8 @@ self: {
        executableHaskellDepends = [ base HGL random ];
        description = "'Asteroids' arcade games";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-kubernetes" = callPackage
@@ -104767,6 +111605,8 @@ self: {
        ];
        description = "Haskell bindings to the Kubernetes API (via swagger-codegen)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-lexer" = callPackage
@@ -104807,6 +111647,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Haskell library for the Microsoft Language Server Protocol";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-lsp-client" = callPackage
@@ -104827,6 +111669,8 @@ self: {
        ];
        description = "A haskell package to build your own Language Server client";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-lsp-types" = callPackage
@@ -104844,6 +111688,8 @@ self: {
        ];
        description = "Haskell library for the Microsoft Language Server Protocol, data types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-menu" = callPackage
@@ -104874,6 +111720,8 @@ self: {
        testHaskellDepends = [ base MonadRandom ];
        description = "Machine learning in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-modbus" = callPackage
@@ -104897,6 +111745,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        description = "Correctly-rounded arbitrary-precision floating-point arithmetic";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-mpi" = callPackage
@@ -104939,6 +111789,8 @@ self: {
        ];
        description = "Name resolution library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-neo4j-client" = callPackage
@@ -104970,6 +111822,8 @@ self: {
        ];
        description = "A Haskell neo4j client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-openflow" = callPackage
@@ -104984,6 +111838,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "OpenFlow protocol in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-overridez" = callPackage
@@ -105005,6 +111861,8 @@ self: {
        ];
        description = "Manage nix overrides for haskell packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-packages" = callPackage
@@ -105023,6 +111881,8 @@ self: {
        ];
        description = "Haskell suite library for package management and integration with Cabal";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-pdf-presenter" = callPackage
@@ -105042,6 +111902,8 @@ self: {
        ];
        description = "Tool for presenting PDF-based presentations";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-platform-test" = callPackage
@@ -105070,6 +111932,8 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "A test system for the Haskell Platform environment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-player" = callPackage
@@ -105091,6 +111955,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A terminal music player based on afplay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-plot" = callPackage
@@ -105107,6 +111973,8 @@ self: {
        ];
        description = "A library for generating 2D plots painlessly";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-postal" = callPackage
@@ -105122,6 +111990,8 @@ self: {
        testPkgconfigDepends = [ libpostal ];
        description = "Haskell binding for the libpostal library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {libpostal = null;};
 
   "haskell-postgis" = callPackage
@@ -105187,6 +112057,8 @@ self: {
        testHaskellDepends = [ base directory hspec process ];
        description = "Opens a temporary file on the system's EDITOR and returns the resulting edits";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-reflect" = callPackage
@@ -105203,6 +112075,8 @@ self: {
        ];
        description = "Reflect Haskell types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-rules" = callPackage
@@ -105214,6 +112088,8 @@ self: {
        libraryHaskellDepends = [ base syb ];
        description = "A DSL for expressing natural deduction rules in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-snake" = callPackage
@@ -105250,6 +112126,8 @@ self: {
        ];
        description = "Client API for Rocket Scissor Spacegoo";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-src" = callPackage
@@ -105339,6 +112217,8 @@ self: {
        libraryHaskellDepends = [ base haskell-src-exts Hoed ];
        description = "Observable orphan instances for haskell-src-exts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-src-exts-prisms" = callPackage
@@ -105352,6 +112232,8 @@ self: {
        ];
        description = "Prisms with newtype wrappers for haskell-src-exts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-src-exts-qq" = callPackage
@@ -105368,6 +112250,8 @@ self: {
        testHaskellDepends = [ base haskell-src-exts hspec ];
        description = "A quasiquoter for haskell-src-exts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-src-exts-sc" = callPackage
@@ -105381,6 +112265,8 @@ self: {
        libraryHaskellDepends = [ base haskell-src-exts ];
        description = "Pretty print haskell code with comments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-src-exts-simple" = callPackage
@@ -105392,6 +112278,8 @@ self: {
        libraryHaskellDepends = [ base haskell-src-exts ];
        description = "A simplified view on the haskell-src-exts AST";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-src-exts-util" = callPackage
@@ -105445,6 +112333,8 @@ self: {
        ];
        description = "Parse source to template-haskell abstract syntax";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-stack-trace-plugin" = callPackage
@@ -105463,6 +112353,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "haskell-stack-trace-plugin";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-time-range" = callPackage
@@ -105497,6 +112389,8 @@ self: {
        ];
        description = "Generate Elm types and JSON encoders and decoders from Haskell types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-token-utils" = callPackage
@@ -105520,6 +112414,8 @@ self: {
        ];
        description = "Utilities to tie up tokens to an AST";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-ast" = callPackage
@@ -105536,6 +112432,8 @@ self: {
        ];
        description = "Haskell AST for efficient tooling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-ast-fromghc" = callPackage
@@ -105553,6 +112451,8 @@ self: {
        ];
        description = "Creating the Haskell-Tools AST from GHC's representations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-ast-gen" = callPackage
@@ -105569,6 +112469,8 @@ self: {
        ];
        description = "Facilities for generating new parts of the Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-ast-trf" = callPackage
@@ -105584,6 +112486,8 @@ self: {
        ];
        description = "Conversions on Haskell-Tools AST to prepare for refactorings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-backend-ghc" = callPackage
@@ -105601,6 +112505,8 @@ self: {
        ];
        description = "Creating the Haskell-Tools AST from GHC's representations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-builtin-refactorings" = callPackage
@@ -105632,6 +112538,8 @@ self: {
        ];
        description = "Refactoring Tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-cli" = callPackage
@@ -105667,6 +112575,8 @@ self: {
        ];
        description = "Command-line frontend for Haskell-tools Refact";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-daemon" = callPackage
@@ -105700,6 +112610,8 @@ self: {
        ];
        description = "Background process for Haskell-tools that editors can connect to";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-debug" = callPackage
@@ -105724,6 +112636,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Debugging Tools for Haskell-tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-demo" = callPackage
@@ -105754,6 +112668,8 @@ self: {
        ];
        description = "A web-based demo for Haskell-tools Refactor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-experimental-refactorings" = callPackage
@@ -105784,6 +112700,8 @@ self: {
        ];
        description = "Refactoring Tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-prettyprint" = callPackage
@@ -105800,6 +112718,8 @@ self: {
        ];
        description = "Pretty printing of Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-refactor" = callPackage
@@ -105829,6 +112749,8 @@ self: {
        ];
        description = "Refactoring Tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tools-rewrite" = callPackage
@@ -105850,6 +112772,8 @@ self: {
        ];
        description = "Facilities for generating new parts of the Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tor" = callPackage
@@ -105883,6 +112807,8 @@ self: {
        ];
        description = "A Haskell Tor Node";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-type-exts" = callPackage
@@ -105896,6 +112822,8 @@ self: {
        ];
        description = "A type checker for Haskell/haskell-src-exts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-typescript" = callPackage
@@ -105907,6 +112835,8 @@ self: {
        libraryHaskellDepends = [ base process ];
        description = "Simple TypeScript API";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-tyrant" = callPackage
@@ -105918,6 +112848,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring network ];
        description = "Haskell implementation of the Tokyo Tyrant binary protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell-updater" = callPackage
@@ -105953,6 +112885,8 @@ self: {
        ];
        description = "Haskell XMPP (eXtensible Message Passing Protocol, a.k.a. Jabber) library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell2010" = callPackage
@@ -105964,6 +112898,8 @@ self: {
        libraryHaskellDepends = [ array base ghc-prim ];
        description = "Compatibility with Haskell 2010";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell2020" = callPackage
@@ -105975,6 +112911,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Haskell 2020[draft] Standard Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell98" = callPackage
@@ -105990,6 +112928,8 @@ self: {
        ];
        description = "Compatibility with Haskell 98";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskell98libraries" = callPackage
@@ -106005,6 +112945,8 @@ self: {
        ];
        description = "Compatibility with Haskell 98";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb" = callPackage
@@ -106020,6 +112962,8 @@ self: {
        ];
        description = "A library of combinators for generating and executing SQL statements";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-connect-hdbc" = callPackage
@@ -106031,6 +112975,8 @@ self: {
        libraryHaskellDepends = [ base containers haskelldb HDBC ];
        description = "Bracketed HDBC session for HaskellDB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-connect-hdbc-catchio-mtl" = callPackage
@@ -106046,6 +112992,8 @@ self: {
        ];
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-mtl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-connect-hdbc-catchio-tf" = callPackage
@@ -106062,6 +113010,8 @@ self: {
        ];
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-connect-hdbc-catchio-transformers" = callPackage
@@ -106078,6 +113028,8 @@ self: {
        ];
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-connect-hdbc-lifted" = callPackage
@@ -106094,6 +113046,8 @@ self: {
        ];
        description = "Bracketed HaskellDB HDBC session using lifted-base";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-dynamic" = callPackage
@@ -106108,6 +113062,8 @@ self: {
        executableHaskellDepends = [ haskelldb ];
        description = "HaskellDB support for the dynamically loaded drivers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-flat" = callPackage
@@ -106125,6 +113081,8 @@ self: {
        ];
        description = "An experimental HaskellDB back-end in pure Haskell (no SQL)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-hdbc" = callPackage
@@ -106140,6 +113098,8 @@ self: {
        ];
        description = "HaskellDB support for HDBC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-hdbc-mysql" = callPackage
@@ -106157,6 +113117,8 @@ self: {
        ];
        description = "HaskellDB support for the HDBC MySQL driver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-hdbc-odbc" = callPackage
@@ -106174,6 +113136,8 @@ self: {
        ];
        description = "HaskellDB support for the HDBC ODBC driver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-hdbc-postgresql" = callPackage
@@ -106192,6 +113156,8 @@ self: {
        executableSystemDepends = [ postgresql ];
        description = "HaskellDB support for the HDBC PostgreSQL driver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) postgresql;};
 
   "haskelldb-hdbc-sqlite3" = callPackage
@@ -106209,6 +113175,8 @@ self: {
        ];
        description = "HaskellDB support for the HDBC SQLite driver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-hsql" = callPackage
@@ -106220,6 +113188,8 @@ self: {
        libraryHaskellDepends = [ base haskelldb hsql mtl old-time ];
        description = "HaskellDB support for HSQL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-hsql-mysql" = callPackage
@@ -106237,6 +113207,8 @@ self: {
        ];
        description = "HaskellDB support for the HSQL MySQL driver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-hsql-odbc" = callPackage
@@ -106254,6 +113226,8 @@ self: {
        ];
        description = "HaskellDB support for the HSQL ODBC driver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-hsql-oracle" = callPackage
@@ -106290,6 +113264,8 @@ self: {
        ];
        description = "HaskellDB support for the HSQL PostgreSQL driver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-hsql-sqlite" = callPackage
@@ -106326,6 +113302,8 @@ self: {
        ];
        description = "HaskellDB support for the HSQL SQLite3 driver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-th" = callPackage
@@ -106337,6 +113315,8 @@ self: {
        libraryHaskellDepends = [ base haskelldb mtl template-haskell ];
        description = "Template Haskell utilities for HaskellDB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelldb-wx" = callPackage
@@ -106347,6 +113327,8 @@ self: {
        sha256 = "01652m0bym80400navqlpdv5n0gfgnfzd1d0857f3kd13ksqk2hy";
        description = "HaskellDB support for WXHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskellish" = callPackage
@@ -106381,6 +113363,8 @@ self: {
        ];
        description = "A scrabble library capturing the core game logic of scrabble";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskellscript" = callPackage
@@ -106398,6 +113382,8 @@ self: {
        ];
        description = "Command line tool for running Haskell scripts with a hashbang";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskelm" = callPackage
@@ -106446,6 +113432,8 @@ self: {
        ];
        description = "CP in Haskell through MiniZinc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskeme" = callPackage
@@ -106460,6 +113448,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Compiler from I- to S-Expressions for the Scheme Programming Language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskey" = callPackage
@@ -106487,6 +113477,8 @@ self: {
        ];
        description = "A transactional, ACID compliant, embeddable key-value store";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskey-btree" = callPackage
@@ -106530,6 +113522,8 @@ self: {
        ];
        description = "A monad transformer supporting Haskey transactions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskgame" = callPackage
@@ -106541,6 +113535,8 @@ self: {
        libraryHaskellDepends = [ base containers haskell98 SDL SDL-ttf ];
        description = "Haskell game library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskheap" = callPackage
@@ -106557,6 +113553,8 @@ self: {
        ];
        description = "Haskell bindings to refheap";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskhol-core" = callPackage
@@ -106576,6 +113574,8 @@ self: {
        ];
        description = "The core logical system of HaskHOL, an EDSL for HOL theorem proving";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskintex" = callPackage
@@ -106612,6 +113612,8 @@ self: {
        ];
        description = "A haskell wrapper for PokeAPI.co (www.pokeapi.co)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoin" = callPackage
@@ -106635,6 +113637,8 @@ self: {
        ];
        description = "Implementation of the Bitcoin protocol";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoin-bitcoind" = callPackage
@@ -106652,6 +113656,8 @@ self: {
        ];
        description = "An adapter for haskoin to network-bitcoin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoin-core" = callPackage
@@ -106681,6 +113687,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bitcoin & Bitcoin Cash library for Haskell";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoin-crypto" = callPackage
@@ -106703,6 +113711,8 @@ self: {
        ];
        description = "Implementation of Bitcoin cryptographic primitives";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoin-node" = callPackage
@@ -106733,6 +113743,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Haskoin Node P2P library for Bitcoin and Bitcoin Cash";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoin-protocol" = callPackage
@@ -106753,6 +113765,8 @@ self: {
        ];
        description = "Implementation of the Bitcoin network protocol messages";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoin-script" = callPackage
@@ -106775,6 +113789,8 @@ self: {
        ];
        description = "Implementation of Bitcoin script parsing and evaluation";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoin-store" = callPackage
@@ -106816,6 +113832,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Storage and index for Bitcoin and Bitcoin Cash";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoin-util" = callPackage
@@ -106836,6 +113854,8 @@ self: {
        ];
        description = "Utility functions for the Network.Haskoin project";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoin-wallet" = callPackage
@@ -106878,6 +113898,8 @@ self: {
        ];
        description = "Implementation of a Bitcoin SPV Wallet with BIP32 and multisig support";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoon" = callPackage
@@ -106895,6 +113917,8 @@ self: {
        ];
        description = "Web Application Abstraction";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoon-httpspec" = callPackage
@@ -106910,6 +113934,8 @@ self: {
        ];
        description = "Integrating HttpSpec with Haskoon";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskoon-salvia" = callPackage
@@ -106927,6 +113953,8 @@ self: {
        ];
        description = "Integrating HttpSpec with Haskoon";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskore" = callPackage
@@ -106951,6 +113979,8 @@ self: {
        ];
        description = "The Haskore Computer Music System";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskore-realtime" = callPackage
@@ -106968,6 +113998,8 @@ self: {
        ];
        description = "Routines for realtime playback of Haskore songs";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskore-supercollider" = callPackage
@@ -106989,6 +114021,8 @@ self: {
        ];
        description = "Haskore back-end for SuperCollider";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskore-synthesizer" = callPackage
@@ -107008,6 +114042,8 @@ self: {
        ];
        description = "Music rendering coded in Haskell";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskore-vintage" = callPackage
@@ -107101,6 +114137,8 @@ self: {
        doHaddock = false;
        description = "Torch for tensors and neural networks in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasktorch-codegen" = callPackage
@@ -107130,6 +114168,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Code generation tools for Hasktorch";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasktorch-ffi-tests" = callPackage
@@ -107164,6 +114204,8 @@ self: {
        ];
        description = "Bindings to Torch";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {ATen = null;};
 
   "hasktorch-ffi-thc" = callPackage
@@ -107186,6 +114228,8 @@ self: {
        ];
        description = "Bindings to Cutorch";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {ATen = null;};
 
   "hasktorch-indef" = callPackage
@@ -107214,6 +114258,8 @@ self: {
        doHaddock = false;
        description = "Core Hasktorch abstractions wrapping FFI bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasktorch-signatures" = callPackage
@@ -107239,6 +114285,8 @@ self: {
        doHaddock = false;
        description = "Backpack signatures for Tensor operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasktorch-signatures-partial" = callPackage
@@ -107254,6 +114302,8 @@ self: {
        ];
        description = "Functions to partially satisfy tensor signatures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasktorch-signatures-support" = callPackage
@@ -107270,6 +114320,8 @@ self: {
        doHaddock = false;
        description = "Signatures for support tensors in hasktorch";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasktorch-signatures-types" = callPackage
@@ -107330,6 +114382,8 @@ self: {
        ];
        description = "Neural architectures in hasktorch";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskus-binary" = callPackage
@@ -107356,6 +114410,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Haskus binary format manipulation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskus-system-build" = callPackage
@@ -107375,6 +114431,8 @@ self: {
        ];
        description = "Haskus system build tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskus-utils" = callPackage
@@ -107397,6 +114455,8 @@ self: {
        ];
        description = "Haskus utility modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskus-utils-compat" = callPackage
@@ -107413,6 +114473,8 @@ self: {
        ];
        description = "Compatibility modules with other external packages (ByteString, etc.)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskus-utils-data" = callPackage
@@ -107484,6 +114546,8 @@ self: {
        ];
        description = "Haskus web";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haskyapi" = callPackage
@@ -107515,6 +114579,8 @@ self: {
        ];
        description = "HTTP server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haslo" = callPackage
@@ -107529,6 +114595,8 @@ self: {
        executableHaskellDepends = [ mtl old-time QuickCheck time wtk ];
        description = "Loan calculator engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasloGUI" = callPackage
@@ -107547,6 +114615,8 @@ self: {
        ];
        description = "Loan calculator Gtk GUI. Based on haslo (Haskell Loan) library.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasmin" = callPackage
@@ -107588,6 +114658,8 @@ self: {
        libraryHaskellDepends = [ base HTTP monads-fd network xml ];
        description = "This package enables to write SPARQL queries to remote endpoints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haspell" = callPackage
@@ -107644,6 +114716,8 @@ self: {
        ];
        description = "API for backends of \"hasql\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-class" = callPackage
@@ -107666,6 +114740,8 @@ self: {
        ];
        description = "Encodable and Decodable classes for hasql";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-cursor-query" = callPackage
@@ -107688,6 +114764,8 @@ self: {
        ];
        description = "A declarative abstraction over PostgreSQL Cursor";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-cursor-transaction" = callPackage
@@ -107705,6 +114783,8 @@ self: {
        ];
        description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-dynamic-statements" = callPackage
@@ -107725,6 +114805,8 @@ self: {
        ];
        description = "Toolkit for constructing Hasql statements dynamically";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-generic" = callPackage
@@ -107743,6 +114825,8 @@ self: {
        ];
        description = "Generic encoder and decoder deriving for Hasql";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-implicits" = callPackage
@@ -107759,6 +114843,8 @@ self: {
        ];
        description = "Implicit definitions for Hasql, such as default codecs for standard types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-migration" = callPackage
@@ -107779,6 +114865,8 @@ self: {
        ];
        description = "PostgreSQL Schema Migrations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-optparse-applicative" = callPackage
@@ -107794,6 +114882,8 @@ self: {
        ];
        description = "\"optparse-applicative\" parsers for \"hasql\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-pool" = callPackage
@@ -107806,6 +114896,8 @@ self: {
        testHaskellDepends = [ base-prelude hasql hspec ];
        description = "A pool of connections for Hasql";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-postgres" = callPackage
@@ -107841,6 +114933,8 @@ self: {
        ];
        description = "A \"PostgreSQL\" backend for the \"hasql\" library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-postgres-options" = callPackage
@@ -107855,6 +114949,8 @@ self: {
        ];
        description = "An \"optparse-applicative\" parser for \"hasql-postgres\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-simple" = callPackage
@@ -107871,6 +114967,8 @@ self: {
        ];
        description = "A somewhat opinionated \"simpler\" API to hasql";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-th" = callPackage
@@ -107945,6 +115043,8 @@ self: {
        ];
        description = "Haskell implementation of Mustache templates";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hastache-aeson" = callPackage
@@ -107961,6 +115061,8 @@ self: {
        ];
        description = "render hastache templates using aeson values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haste" = callPackage
@@ -107974,6 +115076,8 @@ self: {
        executableHaskellDepends = [ base curl filepath mtl ];
        description = "A universal pastebin tool, written in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haste-app" = callPackage
@@ -107993,6 +115097,8 @@ self: {
        ];
        description = "Framework for type-safe, distributed web applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haste-compiler" = callPackage
@@ -108055,6 +115161,8 @@ self: {
        ];
        description = "Base libraries for haste-compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haste-markup" = callPackage
@@ -108069,6 +115177,8 @@ self: {
        ];
        description = "A port of blaze-markup and blaze-html to Haste";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haste-perch" = callPackage
@@ -108092,6 +115202,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        description = "Low level primitives for the Haste compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hastily" = callPackage
@@ -108176,6 +115288,8 @@ self: {
        ];
        description = "HaTeX User's Guide";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hath" = callPackage
@@ -108226,6 +115340,8 @@ self: {
        ];
        description = "Haskell client for the NATS messaging system";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hatt" = callPackage
@@ -108248,6 +115364,8 @@ self: {
        ];
        description = "A truth table generator for classical propositional logic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haven" = callPackage
@@ -108267,6 +115385,8 @@ self: {
        ];
        description = "Recursively retrieve maven dependencies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haverer" = callPackage
@@ -108291,6 +115411,8 @@ self: {
        ];
        description = "Implementation of the rules of Love Letter";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hawitter" = callPackage
@@ -108312,6 +115434,8 @@ self: {
        ];
        description = "A twitter client for GTK+. Beta version.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hax" = callPackage
@@ -108337,6 +115461,8 @@ self: {
        ];
        description = "Haskell cash-flow and tax simulation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haxl" = callPackage
@@ -108363,6 +115489,8 @@ self: {
        ];
        description = "A Haskell library for efficient, concurrent, and concise data access";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haxl-amazonka" = callPackage
@@ -108379,6 +115507,8 @@ self: {
        ];
        description = "Haxl data source for accessing AWS services through amazonka";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haxl-facebook" = callPackage
@@ -108401,6 +115531,8 @@ self: {
        ];
        description = "An example Haxl data source for accessing the Facebook Graph API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haxparse" = callPackage
@@ -108425,6 +115557,8 @@ self: {
        ];
        description = "Readable HaxBall replays";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haxr" = callPackage
@@ -108456,6 +115590,8 @@ self: {
        libraryHaskellDepends = [ base haxr template-haskell ];
        description = "Automatic deriving of XML-RPC structs for Haskell records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "haxy" = callPackage
@@ -108472,6 +115608,8 @@ self: {
        ];
        description = "A simple HTTP proxy server library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hayland" = callPackage
@@ -108492,6 +115630,8 @@ self: {
        testHaskellDepends = [ base process xml ];
        description = "Haskell bindings for the C Wayland library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libGL; inherit (pkgs) wayland;};
 
   "hayoo-cli" = callPackage
@@ -108510,6 +115650,8 @@ self: {
        ];
        description = "Hayoo CLI";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hback" = callPackage
@@ -108528,6 +115670,8 @@ self: {
        ];
        description = "N-back memory game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hbayes" = callPackage
@@ -108557,6 +115701,8 @@ self: {
        ];
        description = "Bayesian Networks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hbb" = callPackage
@@ -108573,6 +115719,8 @@ self: {
        ];
        description = "Haskell Busy Bee, a backend for text editors";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hbcd" = callPackage
@@ -108584,6 +115732,8 @@ self: {
        libraryHaskellDepends = [ base bytestring Decimal digits split ];
        description = "Packed binary-coded decimal (BCD) serialization";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hbeanstalk" = callPackage
@@ -108599,6 +115749,8 @@ self: {
        ];
        description = "Client for the beanstalkd workqueue service";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hbeat" = callPackage
@@ -108617,6 +115769,8 @@ self: {
        executableSystemDepends = [ SDL_mixer ];
        description = "A simple step sequencer GUI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) SDL_mixer;};
 
   "hbf" = callPackage
@@ -108653,6 +115807,8 @@ self: {
        ];
        description = "An optimizing Brainfuck compiler and evaluator";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hblas" = callPackage
@@ -108670,6 +115826,8 @@ self: {
        testHaskellDepends = [ base hspec primitive vector ];
        description = "Human friendly BLAS and Lapack bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) blas; inherit (pkgs) liblapack;};
 
   "hblock" = callPackage
@@ -108689,6 +115847,8 @@ self: {
        ];
        description = "A mutable vector that provides indexation on the datatype fields it stores";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hbro" = callPackage
@@ -108776,6 +115936,8 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Haskell Bottom Up Rewrite Generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hcad" = callPackage
@@ -108787,6 +115949,8 @@ self: {
        libraryHaskellDepends = [ base containers gasp mtl ];
        description = "Haskell CAD library";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hcc" = callPackage
@@ -108800,6 +115964,8 @@ self: {
        executableHaskellDepends = [ base bytestring language-c ];
        description = "A toy C compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hcg-minus" = callPackage
@@ -108812,6 +115978,8 @@ self: {
        libraryHaskellDepends = [ base colour random ];
        description = "haskell cg (minus)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hcg-minus-cairo" = callPackage
@@ -108827,6 +115995,8 @@ self: {
        ];
        description = "haskell cg (minus) (cairo rendering)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hcheat" = callPackage
@@ -108839,6 +116009,8 @@ self: {
        libraryHaskellDepends = [ base mps ];
        description = "A collection of code cheatsheet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hcheckers" = callPackage
@@ -108871,6 +116043,8 @@ self: {
        ];
        description = "Implementation of checkers (\"draughts\") board game - server application";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hchesslib" = callPackage
@@ -108887,6 +116061,8 @@ self: {
        ];
        description = "Chess library";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hcltest" = callPackage
@@ -108907,6 +116083,8 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "A testing library for command line applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hcoap" = callPackage
@@ -108929,6 +116107,8 @@ self: {
        ];
        description = "CoAP implementation for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hcobs" = callPackage
@@ -108963,6 +116143,8 @@ self: {
        doHaddock = false;
        description = "Haskell COM support library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hcoord" = callPackage
@@ -108980,6 +116162,8 @@ self: {
        testHaskellDepends = [ base data-default HUnit ieee754 mtl ];
        description = "Easily convert between latitude/longitude, UTM and OSGB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hcron" = callPackage
@@ -108996,6 +116180,8 @@ self: {
        ];
        description = "A simple job scheduler, which just runs some IO action at a given time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hcube" = callPackage
@@ -109016,6 +116202,8 @@ self: {
        ];
        description = "Virtual Rubik's cube of arbitrary size";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hcwiid" = callPackage
@@ -109059,6 +116247,8 @@ self: {
        ];
        description = "Library to handle the details of writing daemons for UNIX";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdbc-aeson" = callPackage
@@ -109075,6 +116265,8 @@ self: {
        ];
        description = "Deserialize from HDBC rows to FromJSON instances";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdbc-postgresql-hstore" = callPackage
@@ -109086,6 +116278,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base containers HDBC text ];
        description = "Manipulate data in PostgreSQL \"hstore\" columns";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdbc-tuple" = callPackage
@@ -109124,6 +116318,8 @@ self: {
        ];
        description = "Haskell Database Independent interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdbi-conduit" = callPackage
@@ -109144,6 +116340,8 @@ self: {
        ];
        description = "Conduit glue for HDBI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdbi-postgresql" = callPackage
@@ -109171,6 +116369,8 @@ self: {
        ];
        description = "PostgreSQL driver for hdbi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdbi-sqlite" = callPackage
@@ -109190,6 +116390,8 @@ self: {
        ];
        description = "SQlite driver for HDBI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdbi-tests" = callPackage
@@ -109209,6 +116411,8 @@ self: {
        ];
        description = "test suite for testing HDBI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdevtools" = callPackage
@@ -109228,6 +116432,8 @@ self: {
        ];
        description = "Persistent GHC powered background server for FAST haskell development tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdf" = callPackage
@@ -109245,6 +116451,8 @@ self: {
        ];
        description = "HDF: Uniform Rate Audio Signal Processing in Haskell";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdf5-lite" = callPackage
@@ -109297,6 +116505,8 @@ self: {
        ];
        description = "Pattern-Expression-based differencing of arbitrary types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdigest" = callPackage
@@ -109311,6 +116521,8 @@ self: {
        ];
        description = "Server-side HTTP Digest (RFC2617) in the CGI monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdirect" = callPackage
@@ -109329,6 +116541,8 @@ self: {
        executableToolDepends = [ happy ];
        description = "An IDL compiler for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdis86" = callPackage
@@ -109340,6 +116554,8 @@ self: {
        libraryHaskellDepends = [ base bytestring containers QuickCheck ];
        description = "Interface to the udis86 disassembler for x86 and x86-64 / AMD64";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdiscount" = callPackage
@@ -109352,6 +116568,8 @@ self: {
        librarySystemDepends = [ markdown ];
        description = "Haskell bindings to the Discount markdown library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {markdown = null;};
 
   "hdm" = callPackage
@@ -109365,6 +116583,8 @@ self: {
        executableHaskellDepends = [ base directory process unix vty ];
        description = "a small display manager";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdo" = callPackage
@@ -109392,6 +116612,8 @@ self: {
        ];
        description = "A Digital Ocean client in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdocs" = callPackage
@@ -109416,6 +116638,8 @@ self: {
        testHaskellDepends = [ base containers mtl ];
        description = "Haskell docs tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdph" = callPackage
@@ -109442,6 +116666,8 @@ self: {
        ];
        description = "Haskell distributed parallel Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdph-closure" = callPackage
@@ -109457,6 +116683,8 @@ self: {
        ];
        description = "Explicit closures in Haskell distributed parallel Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hdr-histogram" = callPackage
@@ -109476,6 +116704,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq primitive ];
        description = "Haskell implementation of High Dynamic Range (HDR) Histograms";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "headed-megaparsec" = callPackage
@@ -109510,6 +116740,8 @@ self: {
        ];
        description = "Creates a header for a haskell source file";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "headroom" = callPackage
@@ -109534,6 +116766,8 @@ self: {
        ];
        description = "License Header Manager";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heap" = callPackage
@@ -109570,6 +116804,8 @@ self: {
        executableHaskellDepends = [ array base ];
        description = "Heapsort of MArrays as a demo of imperative programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heart-app" = callPackage
@@ -109585,6 +116821,8 @@ self: {
        ];
        description = "An opinionated app prelude and framework in the UnliftIO style";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heart-core" = callPackage
@@ -109603,6 +116841,8 @@ self: {
        ];
        description = "An opinionated library prelude in the UnliftIO style";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heart-core_0_3_2" = callPackage
@@ -109623,6 +116863,7 @@ self: {
        description = "An opinionated library prelude in the UnliftIO style";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heartbeat-streams" = callPackage
@@ -109663,6 +116904,8 @@ self: {
        ];
        description = "Find and annotate ITDs";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heatitup-complete" = callPackage
@@ -109686,6 +116929,8 @@ self: {
        ];
        description = "Find and annotate ITDs with assembly or read pair joining";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heatshrink" = callPackage
@@ -109719,6 +116964,8 @@ self: {
        ];
        description = "Simle api for heavy logger";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heavy-logger" = callPackage
@@ -109740,6 +116987,8 @@ self: {
        ];
        description = "Full-weight logging based on fast-logger";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heavy-logger-amazon" = callPackage
@@ -109755,6 +117004,8 @@ self: {
        ];
        description = "heavy-logger compatibility with amazonka-core logging";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heavy-logger-instances" = callPackage
@@ -109775,6 +117026,8 @@ self: {
        ];
        description = "Orphan instances for data types in heavy-logger package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hebrew-time" = callPackage
@@ -109787,6 +117040,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck time ];
        description = "Hebrew dates and prayer times";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hecc" = callPackage
@@ -109799,6 +117054,8 @@ self: {
        libraryHaskellDepends = [ base cereal crypto-api hF2 ];
        description = "Elliptic Curve Cryptography for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heckin" = callPackage
@@ -109830,6 +117087,8 @@ self: {
        executableHaskellDepends = [ base directory process split ];
        description = "Jekyll in Haskell (feat. LaTeX)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedgehog" = callPackage
@@ -109872,6 +117131,8 @@ self: {
        ];
        testHaskellDepends = [ base either hedgehog ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedgehog-checkers-lens" = callPackage
@@ -109883,6 +117144,8 @@ self: {
        libraryHaskellDepends = [ base hedgehog hedgehog-checkers lens ];
        testHaskellDepends = [ base hedgehog hedgehog-checkers lens ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedgehog-classes" = callPackage
@@ -109903,6 +117166,8 @@ self: {
        ];
        description = "Hedgehog will eat your typeclass bugs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedgehog-corpus" = callPackage
@@ -109956,6 +117221,8 @@ self: {
        ];
        description = "Customizable Gen for ADT using Generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedgehog-gen-json" = callPackage
@@ -109980,6 +117247,8 @@ self: {
        ];
        description = "JSON generators for Hedgehog";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedgehog-generic" = callPackage
@@ -109991,6 +117260,8 @@ self: {
        libraryHaskellDepends = [ base hedgehog ];
        description = "GHC Generics automatically derived hedgehog generators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedgehog-golden" = callPackage
@@ -110008,6 +117279,8 @@ self: {
        testHaskellDepends = [ base hedgehog ];
        description = "Golden testing capabilities for hedgehog using Aeson";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedgehog-quickcheck" = callPackage
@@ -110081,6 +117354,8 @@ self: {
        ];
        description = "Easy trivial configuration for Redis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedis-envy" = callPackage
@@ -110143,6 +117418,8 @@ self: {
        ];
        description = "Caching mandatory data with Redis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedis-simple" = callPackage
@@ -110154,6 +117431,8 @@ self: {
        libraryHaskellDepends = [ base bytestring either hedis mtl ];
        description = "A simplified API for hedis";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedis-tags" = callPackage
@@ -110171,6 +117450,8 @@ self: {
        ];
        description = "Tags for hedis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedn" = callPackage
@@ -110192,6 +117473,8 @@ self: {
        ];
        description = "EDN parsing and encoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedn-functor" = callPackage
@@ -110207,6 +117490,8 @@ self: {
        ];
        description = "Base functor for EDN AST";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hedra" = callPackage
@@ -110222,6 +117507,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "A small library and executable for generating dice rolls";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hein" = callPackage
@@ -110240,6 +117527,8 @@ self: {
        ];
        description = "An extensible build helper for haskell, in the vein of leiningen";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heist" = callPackage
@@ -110298,6 +117587,8 @@ self: {
        ];
        description = "Use JSON directly from Heist templates";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heist-async" = callPackage
@@ -110311,6 +117602,8 @@ self: {
        ];
        description = "Adding support for asynchronous updates (\"AJAX\") with heist";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "helf" = callPackage
@@ -110356,6 +117649,8 @@ self: {
        ];
        description = "New Relic® agent SDK wrapper for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {newrelic-collector-client = null; newrelic-common = null; 
          newrelic-transaction = null;};
 
@@ -110374,6 +117669,8 @@ self: {
        ];
        description = "New Relic® agent SDK wrapper for wai";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "helisp" = callPackage
@@ -110387,6 +117684,8 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec process ];
        description = "An incomplete Elisp compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "helium" = callPackage
@@ -110410,6 +117709,8 @@ self: {
        ];
        description = "The Helium Compiler";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "helium-overture" = callPackage
@@ -110449,6 +117750,8 @@ self: {
        ];
        description = "Web development micro framework for haskell with typesafe URLs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hell" = callPackage
@@ -110473,6 +117776,8 @@ self: {
        executableHaskellDepends = [ base transformers utf8-string ];
        description = "A Haskell shell based on shell-conduit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hellage" = callPackage
@@ -110492,6 +117797,8 @@ self: {
        ];
        description = "Distributed hackage mirror";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hellnet" = callPackage
@@ -110516,6 +117823,8 @@ self: {
        ];
        description = "Simple, distributed, anonymous data sharing network";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hello" = callPackage
@@ -110567,6 +117876,8 @@ self: {
        ];
        description = "A Haskell client for the Help.com team's ESB.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hemkay" = callPackage
@@ -110584,6 +117895,8 @@ self: {
        ];
        description = "A module music mixer and player";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hemkay-core" = callPackage
@@ -110624,6 +117937,8 @@ self: {
        benchmarkHaskellDepends = [ base conduit criterion mtl ];
        description = "Haskell port of the Emokit EEG project";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hen" = callPackage
@@ -110644,6 +117959,8 @@ self: {
        ];
        description = "Haskell bindings to Xen hypervisor interface";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {xenctrl = null;};
 
   "henet" = callPackage
@@ -110658,6 +117975,8 @@ self: {
        ];
        description = "Bindings and high level interface for to ENet v1.3.9";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hepevt" = callPackage
@@ -110669,6 +117988,8 @@ self: {
        libraryHaskellDepends = [ bytestring haskell2010 lha ];
        description = "HEPEVT parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "her-lexer" = callPackage
@@ -110680,6 +118001,8 @@ self: {
        libraryHaskellDepends = [ base mtl split ];
        description = "A lexer for Haskell source code";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "her-lexer-parsec" = callPackage
@@ -110691,6 +118014,8 @@ self: {
        libraryHaskellDepends = [ base her-lexer parsec transformers ];
        description = "Parsec frontend to \"her-lexer\" for Haskell source code";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "herbalizer" = callPackage
@@ -110708,6 +118033,8 @@ self: {
        ];
        description = "HAML to ERB translator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "here" = callPackage
@@ -110750,6 +118077,8 @@ self: {
        testHaskellDepends = [ base bytestring doctest text ];
        description = "heredocument";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "herf-time" = callPackage
@@ -110762,6 +118091,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "haskell time manipulation in a 'kerf like' style";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hermit" = callPackage
@@ -110791,6 +118122,8 @@ self: {
        ];
        description = "Haskell Equational Reasoning Model-to-Implementation Tunnel";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hermit-syb" = callPackage
@@ -110806,6 +118139,8 @@ self: {
        ];
        description = "HERMIT plugin for optimizing Scrap-Your-Boilerplate traversals";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "herms" = callPackage
@@ -110826,6 +118161,8 @@ self: {
        ];
        description = "A command-line manager for delicious kitchen recipes";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hero-club-five-tenets" = callPackage
@@ -110868,6 +118205,8 @@ self: {
        testHaskellDepends = [ base hspec persistent-postgresql ];
        description = "Parse DATABASE_URL into configuration types for Persistent";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "herringbone" = callPackage
@@ -110887,6 +118226,8 @@ self: {
        ];
        description = "A library for compiling and serving static web assets";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "herringbone-embed" = callPackage
@@ -110903,6 +118244,8 @@ self: {
        ];
        description = "Embed preprocessed web assets in your executable with Template Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "herringbone-wai" = callPackage
@@ -110919,6 +118262,8 @@ self: {
        ];
        description = "Wai adapter for the Herringbone web asset preprocessor";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hesh" = callPackage
@@ -110945,6 +118290,8 @@ self: {
        ];
        description = "the Haskell Extensible Shell: Haskell for Bash-style scripts";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hesql" = callPackage
@@ -110962,6 +118309,8 @@ self: {
        ];
        description = "Haskell's embedded SQL";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hetero-dict" = callPackage
@@ -110982,6 +118331,8 @@ self: {
        ];
        description = "Fast heterogeneous data structures";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hetero-map" = callPackage
@@ -111023,6 +118374,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Allows the use of tuples as literals for Heterogeneous collections";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heterolist" = callPackage
@@ -111040,6 +118393,8 @@ self: {
        ];
        description = "A heterogeneous list type";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hetris" = callPackage
@@ -111056,6 +118411,8 @@ self: {
        executableSystemDepends = [ ncurses ];
        description = "Text Tetris";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ncurses;};
 
   "heukarya" = callPackage
@@ -111070,6 +118427,8 @@ self: {
        ];
        description = "A genetic programming based on tree structure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hevm" = callPackage
@@ -111117,6 +118476,8 @@ self: {
        testSystemDepends = [ secp256k1 ];
        description = "Ethereum virtual machine evaluator";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) secp256k1;};
 
   "hevolisa" = callPackage
@@ -111133,6 +118494,8 @@ self: {
        ];
        description = "Genetic Mona Lisa problem in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hevolisa-dph" = callPackage
@@ -111151,6 +118514,8 @@ self: {
        ];
        description = "Genetic Mona Lisa problem in Haskell - using Data Parallel Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hex" = callPackage
@@ -111164,6 +118529,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Convert strings into hexadecimal and back";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hex-text" = callPackage
@@ -111188,6 +118555,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Haskell scripting interface for HexChat";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hexdump" = callPackage
@@ -111211,6 +118580,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring filepath ];
        description = "Reading Exif data form a JPEG file with Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hexmino" = callPackage
@@ -111229,6 +118600,8 @@ self: {
        ];
        description = "A small game based on domino-like hexagonal tiles";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hexml" = callPackage
@@ -111261,6 +118634,8 @@ self: {
        ];
        description = "Lenses for the hexml package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hexpat" = callPackage
@@ -111295,6 +118670,8 @@ self: {
        ];
        description = "Chunked XML parsing using iteratees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hexpat-lens" = callPackage
@@ -111345,6 +118722,8 @@ self: {
        ];
        description = "Picklers for de/serialising Generic data types to and from XML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hexpat-tagsoup" = callPackage
@@ -111370,6 +118749,8 @@ self: {
        ];
        description = "A framework for symbolic, homoiconic languages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hexpress" = callPackage
@@ -111387,6 +118768,8 @@ self: {
        ];
        description = "An express-like http framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hexquote" = callPackage
@@ -111402,6 +118785,8 @@ self: {
        ];
        description = "Hexadecimal ByteString literals, with placeholders that bind variables";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hexstring" = callPackage
@@ -111435,6 +118820,8 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "a text classification library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heyefi" = callPackage
@@ -111466,6 +118853,8 @@ self: {
        ];
        description = "A server for Eye-Fi SD cards";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "heyting-algebras" = callPackage
@@ -111487,6 +118876,8 @@ self: {
        ];
        description = "Heyting and Boolean algebras";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hfann" = callPackage
@@ -111502,6 +118893,8 @@ self: {
        libraryPkgconfigDepends = [ fann ];
        description = "Haskell binding to the FANN library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {doublefann = null; fann = null;};
 
   "hfd" = callPackage
@@ -111520,6 +118913,8 @@ self: {
        ];
        description = "Flash debugger";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hfiar" = callPackage
@@ -111535,6 +118930,8 @@ self: {
        executableHaskellDepends = [ wx wxcore ];
        description = "Four in a Row in Haskell!!";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hflags" = callPackage
@@ -111575,6 +118972,8 @@ self: {
        ];
        description = "Haskell source code formatter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hfoil" = callPackage
@@ -111594,6 +118993,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Hess-Smith panel code for inviscid 2-d airfoil analysis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hformat" = callPackage
@@ -111621,6 +119022,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Field-of-view calculation for low-resolution 2D raster grids";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hfractal" = callPackage
@@ -111639,6 +119042,8 @@ self: {
        ];
        description = "OpenGL fractal renderer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hfsevents" = callPackage
@@ -111669,6 +119074,8 @@ self: {
        ];
        description = "A library for fusing a subset of Haskell programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hg-buildpackage" = callPackage
@@ -111687,6 +119094,8 @@ self: {
        ];
        description = "Tools to help manage Debian packages with Mercurial";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgal" = callPackage
@@ -111709,6 +119118,8 @@ self: {
        libraryHaskellDepends = [ array base haskell98 mtl ];
        description = "Haskell Genetic Algorithm Library";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgdbmi" = callPackage
@@ -111727,6 +119138,8 @@ self: {
        ];
        description = "GDB Machine Interface: program-driven control of GDB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgearman" = callPackage
@@ -111744,6 +119157,8 @@ self: {
        ];
        description = "A Gearman client for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgen" = callPackage
@@ -111759,6 +119174,8 @@ self: {
        ];
        description = "Random generation of modal and hybrid logic formulas";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgeometric" = callPackage
@@ -111770,6 +119187,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A geometric library with bindings to GPC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgeometry" = callPackage
@@ -111857,6 +119276,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Reading and Writing ipe7 files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgeometry-svg" = callPackage
@@ -111877,6 +119298,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Writing geometric primitives from HGeometry as SVG Files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgeos" = callPackage
@@ -111891,6 +119314,8 @@ self: {
        testHaskellDepends = [ base MissingH ];
        description = "Simple Haskell bindings to GEOS C API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {geos_c = null;};
 
   "hgettext" = callPackage
@@ -111913,6 +119338,8 @@ self: {
        ];
        description = "Bindings to libintl.h (gettext, bindtextdomain)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgis" = callPackage
@@ -111936,6 +119363,8 @@ self: {
        doHaddock = false;
        description = "Library and for GIS with Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgithub" = callPackage
@@ -111956,6 +119385,8 @@ self: {
        executableHaskellDepends = [ base cmdargs directory ];
        description = "Haskell bindings to the GitHub API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgl-example" = callPackage
@@ -112005,6 +119436,8 @@ self: {
        ];
        description = "An haskell port of the java version of gom";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgopher" = callPackage
@@ -112016,6 +119449,8 @@ self: {
        libraryHaskellDepends = [ base bytestring network ];
        description = "Gopher server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgrep" = callPackage
@@ -112038,6 +119473,8 @@ self: {
        ];
        description = "Search Haskell source code from the command line";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hgrev" = callPackage
@@ -112071,6 +119508,8 @@ self: {
        testHaskellDepends = [ base directory hspec ];
        description = "Unofficial bindings for GRIB API";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {grib_api = null;};
 
   "hharp" = callPackage
@@ -112083,6 +119522,8 @@ self: {
        librarySystemDepends = [ harp ];
        description = "Binding to libharp";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {harp = null;};
 
   "hhp" = callPackage
@@ -112109,6 +119550,8 @@ self: {
        ];
        description = "Happy Haskell Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hhwloc" = callPackage
@@ -112122,6 +119565,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Bindings to https://www.open-mpi.org/projects/hwloc";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hi" = callPackage
@@ -112186,6 +119631,8 @@ self: {
        executableHaskellDepends = [ base dbus process ];
        description = "Status line for i3bar";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hiccup" = callPackage
@@ -112205,6 +119652,8 @@ self: {
        ];
        description = "Relatively efficient Tcl interpreter with support for basic operations";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hichi" = callPackage
@@ -112218,6 +119667,8 @@ self: {
        executableHaskellDepends = [ array base bytestring mtl network ];
        description = "haskell robot for IChat protocol";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hid" = callPackage
@@ -112264,6 +119715,8 @@ self: {
        doHaddock = false;
        description = "Examples to accompany the book \"Haskell in Depth\"";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hidapi" = callPackage
@@ -112294,6 +119747,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Provides cross-platform getHiddenChar function";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hie-bios" = callPackage
@@ -112322,6 +119777,8 @@ self: {
        ];
        description = "Set up a GHC API session";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hie-core" = callPackage
@@ -112358,6 +119815,8 @@ self: {
        ];
        description = "The core of an IDE";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hieraclus" = callPackage
@@ -112369,6 +119828,8 @@ self: {
        libraryHaskellDepends = [ base containers HUnit mtl multiset ];
        description = "Automated clustering of arbitrary elements in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hierarchical-clustering" = callPackage
@@ -112412,6 +119873,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Template Haskell functions to easily create exception hierarchies";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hierarchical-spectral-clustering" = callPackage
@@ -112442,6 +119905,8 @@ self: {
        ];
        description = "Hierarchical spectral clustering of a graph";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hierarchy" = callPackage
@@ -112464,6 +119929,8 @@ self: {
        ];
        description = "Predicated traversal of generated trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hiernotify" = callPackage
@@ -112479,6 +119946,8 @@ self: {
        ];
        description = "Notification library for a filesystem hierarchy";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hifi" = callPackage
@@ -112518,6 +119987,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Partial types as a type constructor";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "highWaterMark" = callPackage
@@ -112532,6 +120003,8 @@ self: {
        executableHaskellDepends = [ base ghc ];
        description = "Memory usage statistics";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "higher-leveldb" = callPackage
@@ -112566,6 +120039,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Some higher order functions for Bool and []";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "highjson" = callPackage
@@ -112583,6 +120058,8 @@ self: {
        ];
        description = "Spec based JSON parsing/serialisation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "highjson-swagger" = callPackage
@@ -112601,6 +120078,8 @@ self: {
        ];
        description = "Derive swagger instances from highjson specs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "highjson-th" = callPackage
@@ -112621,6 +120100,8 @@ self: {
        ];
        description = "Template Haskell helpers for highjson specs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "highlight" = callPackage
@@ -112668,6 +120149,8 @@ self: {
        ];
        description = "Highlight package versions which differ from the latest version on Hackage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "highlighter" = callPackage
@@ -112745,6 +120228,8 @@ self: {
        ];
        description = "Generate STL models from SRTM elevation data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "himerge" = callPackage
@@ -112785,6 +120270,8 @@ self: {
        ];
        description = "Simple gtk2hs image viewer. Point it at an image and fire away.";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "himpy" = callPackage
@@ -112806,6 +120293,8 @@ self: {
        ];
        description = "multithreaded snmp poller for riemann";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hindent" = callPackage
@@ -112840,6 +120329,8 @@ self: {
        ];
        description = "Extensible Haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hindley-milner" = callPackage
@@ -112856,6 +120347,8 @@ self: {
        testHaskellDepends = [ base containers hspec ];
        description = "Template for Hindley-Milner based languages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hinduce-associations-apriori" = callPackage
@@ -112882,6 +120375,8 @@ self: {
        libraryHaskellDepends = [ base hinduce-missingh layout ];
        description = "Interface and utilities for classifiers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hinduce-classifier-decisiontree" = callPackage
@@ -112899,6 +120394,8 @@ self: {
        ];
        description = "Decision Tree Classifiers for hInduce";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hinduce-examples" = callPackage
@@ -112918,6 +120415,8 @@ self: {
        ];
        description = "Example data for hInduce";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hinduce-missingh" = callPackage
@@ -113015,6 +120514,8 @@ self: {
        ];
        description = "Generate armet style query strings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hinstaller" = callPackage
@@ -113030,6 +120531,8 @@ self: {
        ];
        description = "Installer wrapper for Haskell applications";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hint" = callPackage
@@ -113066,6 +120569,8 @@ self: {
        ];
        description = "A server process that runs hint";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hinter" = callPackage
@@ -113087,6 +120592,8 @@ self: {
        ];
        description = "Runtime Haskell interpreter (GHC API wrapper)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hinterface" = callPackage
@@ -113112,6 +120619,8 @@ self: {
        ];
        description = "Haskell / Erlang interoperability library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hinvaders" = callPackage
@@ -113126,6 +120635,8 @@ self: {
        executableHaskellDepends = [ base haskell98 random ];
        description = "Space Invaders";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hinze-streams" = callPackage
@@ -113137,6 +120648,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 Stream ];
        description = "Streams and Unique Fixed Points";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hip" = callPackage
@@ -113185,6 +120698,8 @@ self: {
        ];
        description = "A library for building HipChat Bots";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hipchat-hs" = callPackage
@@ -113203,6 +120718,8 @@ self: {
        ];
        description = "Hipchat API bindings in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hipe" = callPackage
@@ -113218,6 +120735,8 @@ self: {
        ];
        description = "Support for reading and writing ipe7 files (http://ipe7.sourceforge.net)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hips" = callPackage
@@ -113251,6 +120770,8 @@ self: {
        ];
        description = "IRC client";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hirt" = callPackage
@@ -113271,6 +120792,8 @@ self: {
        ];
        description = "Calculates IRT 2PL and 3PL models";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hissmetrics" = callPackage
@@ -113286,6 +120809,8 @@ self: {
        ];
        description = "Unofficial API bindings to KISSmetrics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hist-pl" = callPackage
@@ -113309,6 +120834,8 @@ self: {
        ];
        description = "Umbrella package for the historical dictionary of Polish";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hist-pl-dawg" = callPackage
@@ -113323,6 +120850,8 @@ self: {
        ];
        description = "A generic, DAWG-based dictionary";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hist-pl-fusion" = callPackage
@@ -113339,6 +120868,8 @@ self: {
        ];
        description = "Merging historical dictionary with PoliMorf";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hist-pl-lexicon" = callPackage
@@ -113355,6 +120886,8 @@ self: {
        ];
        description = "A binary representation of the historical dictionary of Polish";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hist-pl-lmf" = callPackage
@@ -113366,6 +120899,8 @@ self: {
        libraryHaskellDepends = [ base hist-pl-types polysoup text ];
        description = "LMF parsing for the historical dictionary of Polish";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hist-pl-transliter" = callPackage
@@ -113388,6 +120923,8 @@ self: {
        libraryHaskellDepends = [ base binary text text-binary ];
        description = "Types in the historical dictionary of Polish";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "histogram-fill" = callPackage
@@ -113441,6 +120978,8 @@ self: {
        ];
        description = "Extract the interesting bits from shell history";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hit" = callPackage
@@ -113459,6 +120998,8 @@ self: {
        ];
        description = "Git like program in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hit-graph" = callPackage
@@ -113474,6 +121015,8 @@ self: {
        ];
        description = "Use graph algorithms to access and manipulate Git repos";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hit-on" = callPackage
@@ -113495,6 +121038,8 @@ self: {
        testHaskellDepends = [ base github hspec text ];
        description = "Haskell Git Helper Tool";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hjcase" = callPackage
@@ -113511,6 +121056,8 @@ self: {
        ];
        description = "Jcase library for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hjpath" = callPackage
@@ -113540,6 +121087,8 @@ self: {
        ];
        description = "JavaScript Parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hjsmin" = callPackage
@@ -113585,6 +121134,8 @@ self: {
        libraryHaskellDepends = [ base containers hjson ];
        description = "library for querying from JSON";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hjsonpointer" = callPackage
@@ -113606,6 +121157,8 @@ self: {
        ];
        description = "JSON Pointer library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hjsonschema" = callPackage
@@ -113634,6 +121187,8 @@ self: {
        ];
        description = "JSON Schema library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hjugement" = callPackage
@@ -113683,6 +121238,8 @@ self: {
        ];
        description = "Majority Judgment and Helios-C command line tool";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hjugement-protocol" = callPackage
@@ -113733,6 +121290,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Definition of \"Delta structures\" for higher kinded data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hkd-lens" = callPackage
@@ -113744,6 +121303,8 @@ self: {
        libraryHaskellDepends = [ base profunctors ];
        description = "Generic lens/prism/traversal-kinded data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hkdf" = callPackage
@@ -113788,6 +121349,8 @@ self: {
        ];
        description = "A library for higher kinded types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hlatex" = callPackage
@@ -113807,6 +121370,8 @@ self: {
        ];
        description = "A library to build valid LaTeX files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hlbfgsb" = callPackage
@@ -113825,6 +121390,8 @@ self: {
        ];
        description = "Haskell binding to L-BFGS-B version 3.0";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gfortran;};
 
   "hlcm" = callPackage
@@ -113846,6 +121413,8 @@ self: {
        ];
        description = "Fast algorithm for mining closed frequent itemsets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hleap" = callPackage
@@ -113937,6 +121506,8 @@ self: {
        ];
        description = "Web API server for the hledger accounting tool";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hledger-chart" = callPackage
@@ -114205,6 +121776,8 @@ self: {
        testHaskellDepends = [ base hlint ];
        description = "Haskell binding to libBladeRF SDR library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libbladeRF;};
 
   "hlibcpuid" = callPackage
@@ -114232,6 +121805,8 @@ self: {
        librarySystemDepends = [ ev ];
        description = "FFI interface to libev";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {ev = null;};
 
   "hlibfam" = callPackage
@@ -114244,6 +121819,8 @@ self: {
        librarySystemDepends = [ fam ];
        description = "FFI interface to libFAM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) fam;};
 
   "hlibgit2" = callPackage
@@ -114344,6 +121921,8 @@ self: {
        ];
        description = "Client library for the Apache Livy REST API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hlogger" = callPackage
@@ -114355,6 +121934,8 @@ self: {
        libraryHaskellDepends = [ base old-locale time ];
        description = "Simple, concurrent, extendable and easy-to-use logging library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hlongurl" = callPackage
@@ -114373,6 +121954,8 @@ self: {
        ];
        description = "Library and utility interfacing to longurl.org";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hlrdb" = callPackage
@@ -114420,6 +122003,8 @@ self: {
        libraryHaskellDepends = [ base containers hcg-minus hps ];
        description = "Haskell Lindenmayer Systems";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hlwm" = callPackage
@@ -114435,6 +122020,8 @@ self: {
        libraryHaskellDepends = [ base stm transformers unix X11 ];
        description = "Bindings to the herbstluftwm window manager";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hly" = callPackage
@@ -114449,6 +122036,8 @@ self: {
        ];
        description = "Haskell LilyPond";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmark" = callPackage
@@ -114467,6 +122056,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A tool and library for Markov chains based text generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmarkup" = callPackage
@@ -114480,6 +122071,8 @@ self: {
        ];
        description = "Simple wikitext-like markup format implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmatrix" = callPackage
@@ -114535,6 +122128,8 @@ self: {
        librarySystemDepends = [ liblapack ];
        description = "HMatrix interface to LAPACK functions for banded matrices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) liblapack;};
 
   "hmatrix-csv" = callPackage
@@ -114600,6 +122195,8 @@ self: {
        libraryHaskellDepends = [ base hmatrix mmap ];
        description = "Memory map Vector from disk into memory efficiently";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmatrix-morpheus" = callPackage
@@ -114620,6 +122217,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion hmatrix ];
        description = "Low-level machine learning auxiliary functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) blas; inherit (pkgs) liblapack;};
 
   "hmatrix-nipals" = callPackage
@@ -114633,6 +122232,8 @@ self: {
        libraryHaskellDepends = [ base hmatrix ];
        description = "NIPALS method for Principal Components Analysis on large data-sets";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmatrix-nlopt" = callPackage
@@ -114681,6 +122282,8 @@ self: {
        librarySystemDepends = [ mkl_core mkl_intel mkl_sequential ];
        description = "Sparse linear solver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {mkl_core = null; mkl_intel = null; mkl_sequential = null;};
 
   "hmatrix-special" = callPackage
@@ -114707,6 +122310,8 @@ self: {
        ];
        description = "hmatrix with vector and matrix sizes encoded in types";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmatrix-sundials" = callPackage
@@ -114734,6 +122339,8 @@ self: {
        ];
        description = "hmatrix interface to sundials";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {sundials_arkode = null; sundials_cvode = null;};
 
   "hmatrix-svdlibc" = callPackage
@@ -114749,6 +122356,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion hmatrix vector ];
        description = "SVDLIBC bindings for HMatrix";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmatrix-syntax" = callPackage
@@ -114764,6 +122373,8 @@ self: {
        ];
        description = "MATLAB-like syntax for hmatrix vectors and matrices";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmatrix-tests" = callPackage
@@ -114781,6 +122392,8 @@ self: {
        benchmarkHaskellDepends = [ base HUnit QuickCheck random ];
        description = "Tests for hmatrix";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmatrix-vector-sized" = callPackage
@@ -114812,6 +122425,8 @@ self: {
        ];
        description = "Haskell Meapsoft Parser";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmeap-utils" = callPackage
@@ -114831,6 +122446,8 @@ self: {
        ];
        description = "Haskell Meapsoft Parser Utilities";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmemdb" = callPackage
@@ -114859,6 +122476,8 @@ self: {
        executableHaskellDepends = [ base MissingH process ];
        description = "CLI fuzzy finder and launcher";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmep" = callPackage
@@ -114878,6 +122497,8 @@ self: {
        testHaskellDepends = [ base HUnit vector ];
        description = "HMEP Multi Expression Programming – a genetic programming variant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmidi" = callPackage
@@ -114908,6 +122529,8 @@ self: {
        ];
        description = "A make alternative based on Plan9's mk";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmm" = callPackage
@@ -114923,6 +122546,8 @@ self: {
        ];
        description = "A hidden markov model library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmm-hmatrix" = callPackage
@@ -114941,6 +122566,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Hidden Markov Models using HMatrix primitives";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmm-lapack" = callPackage
@@ -114961,6 +122588,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Hidden Markov Models using LAPACK primitives";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmp3" = callPackage
@@ -114981,6 +122610,8 @@ self: {
        executableSystemDepends = [ ncurses ];
        description = "An ncurses mp3 player written in Haskell";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ncurses;};
 
   "hmp3-ng" = callPackage
@@ -115036,6 +122667,8 @@ self: {
        ];
        description = "Haskell Music Theory";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmt-diagrams" = callPackage
@@ -115053,6 +122686,8 @@ self: {
        ];
        description = "Haskell Music Theory Diagrams";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hmumps" = callPackage
@@ -115071,6 +122706,8 @@ self: {
        ];
        description = "Interpreter for the MUMPS langugae";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hnetcdf" = callPackage
@@ -115100,6 +122737,8 @@ self: {
        testSystemDepends = [ netcdf ];
        description = "Haskell NetCDF library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) netcdf;};
 
   "hnix" = callPackage
@@ -115164,6 +122803,8 @@ self: {
        ];
        description = "Haskell implementation of the Nix language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hnix-store-core" = callPackage
@@ -115191,6 +122832,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Core effects for interacting with the Nix store";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hnix-store-remote" = callPackage
@@ -115214,6 +122857,8 @@ self: {
        ];
        description = "Remote hnix store";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hnn" = callPackage
@@ -115299,6 +122944,8 @@ self: {
        ];
        description = "Log message normalisation tool producing structured JSON messages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ho-rewriting" = callPackage
@@ -115314,6 +122961,8 @@ self: {
        testHaskellDepends = [ base compdata patch-combinators ];
        description = "Generic rewrite rules with safe treatment of variables and binders";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoauth" = callPackage
@@ -115331,6 +122980,8 @@ self: {
        ];
        description = "A Haskell implementation of OAuth 1.0a protocol.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoauth2" = callPackage
@@ -115378,6 +123029,8 @@ self: {
        ];
        description = "A source code editor aiming for the convenience of use";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hobbes" = callPackage
@@ -115395,6 +123048,8 @@ self: {
        ];
        description = "A small file watcher for OSX";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hobbits" = callPackage
@@ -115411,6 +123066,8 @@ self: {
        ];
        description = "A library for canonically representing terms with binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hocilib" = callPackage
@@ -115430,6 +123087,8 @@ self: {
        testSystemDepends = [ ocilib ];
        description = "FFI binding to OCILIB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {ocilib = null;};
 
   "hocker" = callPackage
@@ -115471,6 +123130,8 @@ self: {
        ];
        description = "Interact with the docker registry and generate nix build instructions";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hodatime" = callPackage
@@ -115494,6 +123155,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion random ];
        description = "A fully featured date/time library based on Nodatime";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoe" = callPackage
@@ -115512,6 +123175,8 @@ self: {
        ];
        description = "hoe: Haskell One-liner Evaluator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hofix-mtl" = callPackage
@@ -115541,6 +123206,8 @@ self: {
        ];
        description = "Simple IRC logger bot";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hogg" = callPackage
@@ -115558,6 +123225,8 @@ self: {
        ];
        description = "Library and tools to manipulate the Ogg container format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoggl" = callPackage
@@ -115583,6 +123252,8 @@ self: {
        ];
        description = "Bindings to the Toggl.com REST API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hogre" = callPackage
@@ -115598,6 +123269,8 @@ self: {
        doHaddock = false;
        description = "Haskell binding to a subset of OGRE";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {OGRE = null; OgreMain = null; cgen-hs = null; grgen = null;};
 
   "hogre-examples" = callPackage
@@ -115613,6 +123286,8 @@ self: {
        executableSystemDepends = [ OgreMain ];
        description = "Examples for using Hogre";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {OgreMain = null;};
 
   "hois" = callPackage
@@ -115628,6 +123303,8 @@ self: {
        executableHaskellDepends = [ base X11 ];
        description = "OIS bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {OIS = null;};
 
   "hoist-error" = callPackage
@@ -115671,6 +123348,8 @@ self: {
        ];
        description = "Higher order logic";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hold-em" = callPackage
@@ -115682,6 +123361,8 @@ self: {
        libraryHaskellDepends = [ base random safe ];
        description = "An engine for Texas hold'em Poker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hole" = callPackage
@@ -115693,6 +123374,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Higher kinded type removal";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "holey-format" = callPackage
@@ -115738,6 +123421,8 @@ self: {
        doCheck = false;
        description = "Start your Haskell project with cabal, git and tests";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "homeomorphic" = callPackage
@@ -115749,6 +123434,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl QuickCheck ];
        description = "Homeomorphic Embedding Test";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hommage" = callPackage
@@ -115762,6 +123449,8 @@ self: {
        ];
        description = "Haskell Offline Music Manipulation And Generation EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hommage-ds" = callPackage
@@ -115788,6 +123477,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Constructs FAlgebras from typeclasses, making Haskell functions homoiconic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "homotuple" = callPackage
@@ -115801,6 +123492,8 @@ self: {
        libraryHaskellDepends = [ base OneTuple Only single-tuple ];
        description = "Homotuple, all whose elements are the same type";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "homplexity" = callPackage
@@ -115828,6 +123521,8 @@ self: {
        ];
        description = "Haskell code quality tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "honi" = callPackage
@@ -115844,6 +123539,8 @@ self: {
        testSystemDepends = [ freenect OpenNI2 ];
        description = "OpenNI 2 binding";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {OpenNI2 = null; inherit (pkgs) freenect;};
 
   "honk" = callPackage
@@ -115873,6 +123570,8 @@ self: {
        ];
        description = "Simple tool for fetching and merging hoogle data";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hood" = callPackage
@@ -115885,6 +123584,8 @@ self: {
        testHaskellDepends = [ base ghc-prim ];
        description = "Debugging by observing in place";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hood-off" = callPackage
@@ -115896,6 +123597,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Dummy package to disable Hood without having to remove all the calls to observe";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hood2" = callPackage
@@ -115907,6 +123610,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Debugging by observing in place";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoodie" = callPackage
@@ -115924,6 +123629,8 @@ self: {
        ];
        description = "A small, toy roguelike";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoodle" = callPackage
@@ -115944,6 +123651,8 @@ self: {
        executableHaskellDepends = [ base cmdargs hoodle-core ];
        description = "Executable for hoodle";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoodle-builder" = callPackage
@@ -115960,6 +123669,8 @@ self: {
        ];
        description = "text builder for hoodle file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoodle-core" = callPackage
@@ -115992,6 +123703,8 @@ self: {
        librarySystemDepends = [ libX11 libXi ];
        description = "Core library for hoodle";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXi;};
 
   "hoodle-extra" = callPackage
@@ -116017,6 +123730,8 @@ self: {
        ];
        description = "extra hoodle tools";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoodle-parser" = callPackage
@@ -116034,6 +123749,8 @@ self: {
        ];
        description = "Hoodle file parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoodle-publish" = callPackage
@@ -116060,6 +123777,8 @@ self: {
        ];
        description = "publish hoodle files as a static web site";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoodle-render" = callPackage
@@ -116080,6 +123799,8 @@ self: {
        ];
        description = "Hoodle file renderer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoodle-types" = callPackage
@@ -116096,6 +123817,8 @@ self: {
        ];
        description = "Data types for programs for hoodle file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoogle_5_0_14" = callPackage
@@ -116181,6 +123904,8 @@ self: {
        ];
        description = "Easily generate Hoogle indices for installed packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hooks-dir" = callPackage
@@ -116192,6 +123917,8 @@ self: {
        libraryHaskellDepends = [ base directory process text ];
        description = "run executables in a directory as hooks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hookup" = callPackage
@@ -116207,6 +123934,8 @@ self: {
        ];
        description = "Abstraction over creating network connections with SOCKS5 and TLS";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoopl" = callPackage
@@ -116226,6 +123955,8 @@ self: {
        ];
        description = "A library to support dataflow analysis and optimization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoovie" = callPackage
@@ -116249,6 +123980,8 @@ self: {
        ];
        description = "Haskell Media Server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hopencc" = callPackage
@@ -116265,6 +123998,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Haskell binding to libopencc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) opencc;};
 
   "hopencl" = callPackage
@@ -116284,6 +124019,8 @@ self: {
        ];
        description = "Haskell bindings for OpenCL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {OpenCL = null;};
 
   "hopenpgp-tools" = callPackage
@@ -116316,6 +124053,8 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "hOpenPGP-based command-line tools";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hopenssl" = callPackage
@@ -116363,6 +124102,8 @@ self: {
        ];
        description = "Hopfield Networks, Boltzmann Machines and Clusters";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {MagickCore = null; inherit (pkgs) imagemagick;};
 
   "hopfield-networks" = callPackage
@@ -116413,6 +124154,8 @@ self: {
        ];
        description = "C++ FFI generator - Documentation";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoppy-generator" = callPackage
@@ -116429,6 +124172,8 @@ self: {
        ];
        description = "C++ FFI generator - Code generator";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoppy-runtime" = callPackage
@@ -116456,6 +124201,8 @@ self: {
        ];
        description = "C++ FFI generator - Standard library bindings";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hops" = callPackage
@@ -116488,6 +124235,8 @@ self: {
        ];
        description = "Handy Operations on Power Series";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hoq" = callPackage
@@ -116507,6 +124256,8 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "A language based on homotopy type theory with an interval type";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hora" = callPackage
@@ -116535,6 +124286,8 @@ self: {
        libraryHaskellDepends = [ AC-Angle base time ];
        description = "Sunrise and sunset UTC approximations from latitude and longitude coordinates";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "horname" = callPackage
@@ -116553,6 +124306,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "Rename function definitions returned by SMT solvers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hosc" = callPackage
@@ -116588,6 +124343,8 @@ self: {
        ];
        description = "Haskell Open Sound Control JSON Serialisation";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hosc-utils" = callPackage
@@ -116667,6 +124424,8 @@ self: {
        ];
        description = "An dns server which is extremely easy to config";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hothasktags" = callPackage
@@ -116685,6 +124444,8 @@ self: {
        ];
        description = "Generates ctags for Haskell, incorporating import lists and qualified imports";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hotswap" = callPackage
@@ -116696,6 +124457,8 @@ self: {
        libraryHaskellDepends = [ base plugins ];
        description = "Simple code hotswapping";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hourglass" = callPackage
@@ -116726,6 +124489,8 @@ self: {
        libraryHaskellDepends = [ base hourglass parsec ];
        description = "A small library for parsing more human friendly date/time formats";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hourglass-orphans" = callPackage
@@ -116771,6 +124536,8 @@ self: {
        ];
        description = "A Haskell implementation of Foreman";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hp2any-core" = callPackage
@@ -116787,6 +124554,8 @@ self: {
        ];
        description = "Heap profiling helper library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hp2any-graph" = callPackage
@@ -116808,6 +124577,8 @@ self: {
        executableSystemDepends = [ freeglut libGL libGLU ];
        description = "Real-time heap graphing utility and profile stream server with a reusable graphing module";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) freeglut; inherit (pkgs) libGL; 
          inherit (pkgs) libGLU;};
 
@@ -116829,6 +124600,8 @@ self: {
        ];
        description = "A utility to visualise and compare heap profiles";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hp2html" = callPackage
@@ -116930,6 +124703,8 @@ self: {
        ];
        description = "Convert Cabal manifests into hpack's package.yamls";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpack-dhall" = callPackage
@@ -116960,6 +124735,8 @@ self: {
        ];
        description = "hpack's dhalling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpaco" = callPackage
@@ -116977,6 +124754,8 @@ self: {
        ];
        description = "Modular template compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpaco-lib" = callPackage
@@ -116994,6 +124773,8 @@ self: {
        ];
        description = "Modular template compiler library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpage" = callPackage
@@ -117015,6 +124796,8 @@ self: {
        ];
        description = "A scrapbook for Haskell developers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpapi" = callPackage
@@ -117027,6 +124810,8 @@ self: {
        librarySystemDepends = [ papi ];
        description = "Binding for the PAPI library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) papi;};
 
   "hpaste" = callPackage
@@ -117054,6 +124839,8 @@ self: {
        ];
        description = "Haskell paste web site";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpasteit" = callPackage
@@ -117073,6 +124860,8 @@ self: {
        ];
        description = "A command-line client for hpaste.org";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpath" = callPackage
@@ -117215,6 +125004,8 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Coveralls.io support for Haskell.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpc-lcov" = callPackage
@@ -117285,6 +125076,8 @@ self: {
        ];
        description = "Tracer with AJAX interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpdft" = callPackage
@@ -117305,6 +125098,8 @@ self: {
        executableHaskellDepends = [ base bytestring utf8-string ];
        description = "A tool for looking through PDF file using Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpg" = callPackage
@@ -117318,6 +125113,8 @@ self: {
        executableHaskellDepends = [ base random ];
        description = "a simple password generator";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpio" = callPackage
@@ -117347,6 +125144,8 @@ self: {
        ];
        description = "Monads for GPIO in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hplayground" = callPackage
@@ -117378,6 +125177,8 @@ self: {
        executableHaskellDepends = [ base directory filepath process ];
        description = "Application for managing playlist files on a music player";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpodder" = callPackage
@@ -117397,6 +125198,8 @@ self: {
        ];
        description = "Podcast Aggregator (downloader)";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpp" = callPackage
@@ -117446,6 +125249,8 @@ self: {
        ];
        description = "Haskell bindings to libpqtypes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) postgresql;};
 
   "hpqtypes-extras" = callPackage
@@ -117469,6 +125274,8 @@ self: {
        ];
        description = "Extra utilities for hpqtypes library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hprotoc" = callPackage
@@ -117496,6 +125303,8 @@ self: {
        executableToolDepends = [ alex ];
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hprotoc-fork" = callPackage
@@ -117524,6 +125333,8 @@ self: {
        executableToolDepends = [ alex ];
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hprox" = callPackage
@@ -117558,6 +125369,8 @@ self: {
        libraryHaskellDepends = [ base filepath hcg-minus process ];
        description = "Haskell Postscript";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hps-cairo" = callPackage
@@ -117573,6 +125386,8 @@ self: {
        executableHaskellDepends = [ base cairo gtk hps random ];
        description = "Cairo rendering for the haskell postscript library";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hps-kmeans" = callPackage
@@ -117584,6 +125399,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "A nice implementation of the k-Means algorithm";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpuz" = callPackage
@@ -117612,6 +125429,8 @@ self: {
        ];
        description = "Highlight source code using Pygments";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpylos" = callPackage
@@ -117627,6 +125446,8 @@ self: {
        ];
        description = "AI of Pylos game with GLUT interface";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpyrg" = callPackage
@@ -117642,6 +125463,8 @@ self: {
        ];
        description = "pyrg utility done right";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hpython" = callPackage
@@ -117671,6 +125494,8 @@ self: {
        ];
        description = "Python language tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hquantlib" = callPackage
@@ -117700,6 +125525,8 @@ self: {
        ];
        description = "HQuantLib is a port of essencial parts of QuantLib to Haskell";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hquantlib-time" = callPackage
@@ -117711,6 +125538,8 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "HQuantLib Time is a business calendar functions extracted from HQuantLib";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hquery" = callPackage
@@ -117741,6 +125570,8 @@ self: {
        executableHaskellDepends = [ base HCL NonEmpty ];
        description = "Basic utility for ranking a list of items";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hreader" = callPackage
@@ -117803,6 +125634,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A Type dependent Highlevel HTTP client library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hreq-conduit" = callPackage
@@ -117827,6 +125660,8 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Conduit streaming support for Hreq";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hreq-core" = callPackage
@@ -117872,6 +125707,8 @@ self: {
        executableHaskellDepends = [ base containers ];
        description = "A Cricket scoring application";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hriemann" = callPackage
@@ -117897,6 +125734,8 @@ self: {
        ];
        description = "A Riemann Client for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hruby" = callPackage
@@ -117963,6 +125802,8 @@ self: {
        benchmarkSystemDepends = [ libb2 ];
        description = "A cryptohash-inspired library for blake2";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libb2;};
 
   "hs-brotli" = callPackage
@@ -117983,6 +125824,8 @@ self: {
        ];
        description = "Compression and decompression in the brotli format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {brotlidec = null; brotlienc = null; libbrotlidec = null; 
          libbrotlienc = null;};
 
@@ -118024,6 +125867,8 @@ self: {
        ];
        description = "Example Monte Carlo simulations implemented with Carbon";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-cdb" = callPackage
@@ -118039,6 +125884,8 @@ self: {
        ];
        description = "A library for reading CDB (Constant Database) files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-conllu" = callPackage
@@ -118059,6 +125906,8 @@ self: {
        ];
        description = "Conllu validating parser and utils";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-di" = callPackage
@@ -118088,6 +125937,8 @@ self: {
        ];
        description = "Dependency Injection library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-dotnet" = callPackage
@@ -118100,6 +125951,8 @@ self: {
        librarySystemDepends = [ ole32 oleaut32 ];
        description = "Pragmatic .NET interop for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {ole32 = null; oleaut32 = null;};
 
   "hs-duktape" = callPackage
@@ -118137,6 +125990,8 @@ self: {
        ];
        description = "HS-Excelx provides basic read-only access to Excel 2007 and 2010 documents in XLSX format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-ffmpeg" = callPackage
@@ -118148,6 +126003,8 @@ self: {
        libraryHaskellDepends = [ base bytestring haskell98 ];
        description = "Bindings to FFMPEG library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-fltk" = callPackage
@@ -118161,6 +126018,8 @@ self: {
        librarySystemDepends = [ fltk fltk_images ];
        description = "Binding to GUI library FLTK";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) fltk; fltk_images = null;};
 
   "hs-functors" = callPackage
@@ -118186,6 +126045,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Haskell wrapper for the Google Chart API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-gen-iface" = callPackage
@@ -118204,6 +126065,8 @@ self: {
        ];
        description = "Utility to generate haskell-names interface files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-gizapp" = callPackage
@@ -118219,6 +126082,8 @@ self: {
        ];
        description = "Haskell wrapper around the GIZA++ toolkit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-inspector" = callPackage
@@ -118267,6 +126132,8 @@ self: {
        ];
        description = "Java .class files assembler/disassembler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-json-rpc" = callPackage
@@ -118280,6 +126147,8 @@ self: {
        ];
        description = "JSON-RPC client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-logo" = callPackage
@@ -118306,6 +126175,8 @@ self: {
        ];
        description = "Logo interpreter written in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-mesos" = callPackage
@@ -118330,6 +126201,8 @@ self: {
          tasty-quickcheck
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) mesos; inherit (pkgs) protobuf;};
 
   "hs-multiaddr" = callPackage
@@ -118363,6 +126236,8 @@ self: {
        executableHaskellDepends = [ base HandsomeSoup hxt random ];
        description = "Name generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-pattrans" = callPackage
@@ -118388,6 +126263,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "DSL for musical patterns and transformation, based on contravariant functors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-pgms" = callPackage
@@ -118407,6 +126284,8 @@ self: {
        ];
        description = "Programmer's Mine Sweeper in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-php-session" = callPackage
@@ -118431,6 +126310,8 @@ self: {
        libraryHaskellDepends = [ base data-default-class text ];
        description = "Create pkg-config configuration files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-pkpass" = callPackage
@@ -118451,6 +126332,8 @@ self: {
        ];
        description = "A library for Passbook pass creation & signing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-popen" = callPackage
@@ -118487,6 +126370,8 @@ self: {
        libraryHaskellDepends = [ array base regex-base regex-posix ];
        description = "Easy to use Regex";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-rqlite" = callPackage
@@ -118523,6 +126408,8 @@ self: {
        testHaskellDepends = [ base protolude ];
        description = "Experimental! Wraps this awesome rust library so you can use it in haskell. https://docs.rs/crate/notify";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {notifier = null;};
 
   "hs-scrape" = callPackage
@@ -118543,6 +126430,8 @@ self: {
        ];
        description = "Simple and easy web scraping and automation in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-server-starter" = callPackage
@@ -118558,6 +126447,8 @@ self: {
        testHaskellDepends = [ base HUnit network temporary unix ];
        description = "Write a server supporting Server::Starter's protocol in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-snowtify" = callPackage
@@ -118574,6 +126465,8 @@ self: {
        ];
        description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-speedscope" = callPackage
@@ -118607,6 +126500,8 @@ self: {
        ];
        description = "Haskell binding to the Twitter API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-twitterarchiver" = callPackage
@@ -118621,6 +126516,8 @@ self: {
        executableHaskellDepends = [ base HTTP json mtl network pretty ];
        description = "Commandline Twitter feed archiver";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-vcard" = callPackage
@@ -118632,6 +126529,8 @@ self: {
        libraryHaskellDepends = [ base old-locale time ];
        description = "Implements the RFC 2426 vCard 3.0 spec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-watchman" = callPackage
@@ -118651,6 +126550,8 @@ self: {
        ];
        description = "Client library for Facebook's Watchman tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs-zstd" = callPackage
@@ -118737,6 +126638,8 @@ self: {
        ];
        description = "Haskell to Brainfuck compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hs2dot" = callPackage
@@ -118767,6 +126670,8 @@ self: {
        testHaskellDepends = [ base hspec template-haskell ];
        description = "Translate Haskell types to PureScript";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsConfigure" = callPackage
@@ -118791,6 +126696,8 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "I2C access for Haskell and Linux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsPID" = callPackage
@@ -118819,6 +126726,8 @@ self: {
        ];
        description = "Sqlite3 bindings";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsXenCtrl" = callPackage
@@ -118831,6 +126740,8 @@ self: {
        librarySystemDepends = [ xenctrl ];
        description = "FFI bindings to the Xen Control library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {xenctrl = null;};
 
   "hsakamai" = callPackage
@@ -118890,6 +126801,8 @@ self: {
        ];
        description = "OASIS Security Assertion Markup Language (SAML) V2.0";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libxml2;};
 
   "hsass" = callPackage
@@ -118926,6 +126839,8 @@ self: {
        executableHaskellDepends = [ base Hclip HTTP process unix ];
        description = "(ab)Use Google Translate as a speech synthesiser";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsb2hs" = callPackage
@@ -118961,6 +126876,8 @@ self: {
        ];
        description = "simple utility for rolling filesystem backups";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsbc" = callPackage
@@ -118974,6 +126891,8 @@ self: {
        executableHaskellDepends = [ attoparsec base text vector ];
        description = "A command line calculator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsbencher" = callPackage
@@ -118996,6 +126915,8 @@ self: {
        ];
        description = "Launch and gather data from Haskell and non-Haskell benchmarks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsbencher-codespeed" = callPackage
@@ -119014,6 +126935,8 @@ self: {
        ];
        description = "Backend for uploading benchmark data to CodeSpeed";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsbencher-fusion" = callPackage
@@ -119037,6 +126960,8 @@ self: {
        ];
        description = "Backend for uploading benchmark data to Google Fusion Tables";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc2hs" = callPackage
@@ -119090,6 +127015,8 @@ self: {
        ];
        description = "Haskell SuperCollider Auditor";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-cairo" = callPackage
@@ -119102,6 +127029,8 @@ self: {
        libraryHaskellDepends = [ base cairo gtk hosc hsc3 split ];
        description = "haskell supercollider cairo drawing";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-data" = callPackage
@@ -119119,6 +127048,8 @@ self: {
        ];
        description = "haskell supercollider data";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-db" = callPackage
@@ -119131,6 +127062,8 @@ self: {
        libraryHaskellDepends = [ base hsc3 safe ];
        description = "Haskell SuperCollider Unit Generator Database";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-dot" = callPackage
@@ -119143,6 +127076,8 @@ self: {
        libraryHaskellDepends = [ base directory filepath hsc3 process ];
        description = "haskell supercollider graph drawing";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-forth" = callPackage
@@ -119162,6 +127097,8 @@ self: {
        ];
        description = "FORTH SUPERCOLLIDER";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-graphs" = callPackage
@@ -119186,6 +127123,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Haskell SuperCollider Graphs";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-lang" = callPackage
@@ -119206,6 +127145,8 @@ self: {
        ];
        description = "Haskell SuperCollider Language";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-lisp" = callPackage
@@ -119225,6 +127166,8 @@ self: {
        ];
        description = "LISP SUPERCOLLIDER";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-plot" = callPackage
@@ -119242,6 +127185,8 @@ self: {
        ];
        description = "Haskell SuperCollider Plotting";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-process" = callPackage
@@ -119261,6 +127206,8 @@ self: {
        ];
        description = "Create and control scsynth processes";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-rec" = callPackage
@@ -119273,6 +127220,8 @@ self: {
        libraryHaskellDepends = [ base hsc3 ];
        description = "Haskell SuperCollider Record Variants";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-rw" = callPackage
@@ -119290,6 +127239,8 @@ self: {
        ];
        description = "hsc3 re-writing";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-server" = callPackage
@@ -119316,6 +127267,8 @@ self: {
        ];
        description = "SuperCollider server resource management and synchronization";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-sf" = callPackage
@@ -119328,6 +127281,8 @@ self: {
        libraryHaskellDepends = [ base bytestring hosc ];
        description = "Haskell SuperCollider SoundFile";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-sf-hsndfile" = callPackage
@@ -119344,6 +127299,8 @@ self: {
        ];
        description = "Haskell SuperCollider SoundFile";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-unsafe" = callPackage
@@ -119356,6 +127313,8 @@ self: {
        libraryHaskellDepends = [ base hsc3 ];
        description = "Unsafe Haskell SuperCollider";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsc3-utils" = callPackage
@@ -119377,6 +127336,8 @@ self: {
        ];
        description = "Haskell SuperCollider Utilities";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hscaffold" = callPackage
@@ -119403,6 +127364,8 @@ self: {
        ];
        description = "Very simple file/directory structure scaffolding writer monad EDSL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hscamwire" = callPackage
@@ -119417,6 +127380,8 @@ self: {
        librarySystemDepends = [ camwire_1394 dc1394_control raw1394 ];
        description = "Haskell bindings to IIDC1394 cameras, via Camwire";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {camwire_1394 = null; dc1394_control = null; raw1394 = null;};
 
   "hscassandra" = callPackage
@@ -119433,6 +127398,8 @@ self: {
        ];
        description = "cassandra database interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hscd" = callPackage
@@ -119447,6 +127414,8 @@ self: {
        executableHaskellDepends = [ aeson base bytestring ghc-prim HTTP ];
        description = "Command line client and library for SoundCloud.com";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hscharm" = callPackage
@@ -119555,6 +127524,8 @@ self: {
        executableHaskellDepends = [ base cairo glib gtk old-time ];
        description = "An elegant analog clock using Haskell, GTK and Cairo";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hscolour" = callPackage
@@ -119592,6 +127563,8 @@ self: {
        ];
        description = "cscope like browser for Haskell code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hscrtmpl" = callPackage
@@ -119626,6 +127599,8 @@ self: {
        testHaskellDepends = [ base containers text ];
        description = "Collision-resistant IDs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hscurses" = callPackage
@@ -119698,6 +127673,8 @@ self: {
        ];
        description = "Haskell development library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsdif" = callPackage
@@ -119710,6 +127687,8 @@ self: {
        libraryHaskellDepends = [ base bytestring hosc ];
        description = "Haskell SDIF";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsdip" = callPackage
@@ -119724,6 +127703,8 @@ self: {
        libraryHaskellDepends = [ base cairo containers HUnit parsec ];
        description = "hsdip - a Diplomacy parser/renderer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsdns" = callPackage
@@ -119756,6 +127737,8 @@ self: {
        ];
        description = "Caching asynchronous DNS resolver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hse-cpp" = callPackage
@@ -119828,6 +127811,8 @@ self: {
        ];
        description = "Virtual Haskell Environment builder";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hserv" = callPackage
@@ -119873,6 +127858,8 @@ self: {
        ];
        description = "EXIF handling library in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsfacter" = callPackage
@@ -119884,6 +127871,8 @@ self: {
        libraryHaskellDepends = [ base containers language-puppet text ];
        description = "A small and ugly library that emulates the output of the puppet facter program";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsfcsh" = callPackage
@@ -119899,6 +127888,8 @@ self: {
        ];
        description = "Incremental builder for flash";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsfilt" = callPackage
@@ -119912,6 +127903,8 @@ self: {
        executableHaskellDepends = [ base ghc ];
        description = "Z-decoder";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsforce" = callPackage
@@ -119935,6 +127928,8 @@ self: {
        ];
        description = "Salesforce API Client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsgnutls" = callPackage
@@ -119947,6 +127942,8 @@ self: {
        librarySystemDepends = [ gcrypt gnutls ];
        description = "Library wrapping the GnuTLS API";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gcrypt = null; inherit (pkgs) gnutls;};
 
   "hsgnutls-yj" = callPackage
@@ -119959,6 +127956,8 @@ self: {
        librarySystemDepends = [ gcrypt gnutls ];
        description = "Library wrapping the GnuTLS API";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gcrypt = null; inherit (pkgs) gnutls;};
 
   "hsgsom" = callPackage
@@ -119971,6 +127970,8 @@ self: {
        libraryHaskellDepends = [ base containers random stm time ];
        description = "An implementation of the GSOM clustering algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsgtd" = callPackage
@@ -120018,6 +128019,8 @@ self: {
        libraryPkgconfigDepends = [ gsl ];
        description = "Signal processing and EEG data analysis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) blas; inherit (pkgs) gsl; 
          inherit (pkgs) liblapack;};
 
@@ -120060,6 +128063,8 @@ self: {
        doHaddock = false;
        description = "Extend the import list of a Haskell source file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsini" = callPackage
@@ -120086,8 +128091,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsinspect";
-       version = "0.0.10";
-       sha256 = "0ydb0dqy3javffb8a4gfn840wlh2l3ixxxzj7sc53bqanadlg1in";
+       version = "0.0.11";
+       sha256 = "03537zzxaxrcw6lv9vr5b0j1k6w97xxfavj8n3vv0rxjy3xsj54j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -120129,6 +128134,8 @@ self: {
        libraryHaskellDepends = [ base Cabal ];
        description = "Skeleton for new Haskell programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hslackbuilder" = callPackage
@@ -120144,6 +128151,8 @@ self: {
        ];
        description = "HSlackBuilder automatically generates slackBuild scripts from a cabal package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hslibsvm" = callPackage
@@ -120157,6 +128166,8 @@ self: {
        librarySystemDepends = [ svm ];
        description = "A FFI binding to libsvm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {svm = null;};
 
   "hslinks" = callPackage
@@ -120173,6 +128184,8 @@ self: {
        ];
        description = "Resolves links to Haskell identifiers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hslogger" = callPackage
@@ -120208,6 +128221,8 @@ self: {
        ];
        description = "Parsing hslogger-produced logs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hslogger-template" = callPackage
@@ -120219,6 +128234,8 @@ self: {
        libraryHaskellDepends = [ base hslogger mtl template-haskell ];
        description = "Automatic generation of hslogger functions";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hslogger4j" = callPackage
@@ -120257,6 +128274,8 @@ self: {
        ];
        description = "A library to work with, or as, a logstash server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hslua" = callPackage
@@ -120344,6 +128363,8 @@ self: {
        testHaskellDepends = [ aeson base bytestring colour containers ];
        description = "HSLuv conversion utility";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsmagick" = callPackage
@@ -120367,6 +128388,8 @@ self: {
        ];
        description = "FFI bindings for the GraphicsMagick library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {GraphicsMagick = null; inherit (pkgs) bzip2; freetype2 = null; 
          inherit (pkgs) jasper; inherit (pkgs) lcms; 
          inherit (pkgs) libjpeg; inherit (pkgs) libpng; 
@@ -120404,6 +128427,8 @@ self: {
        ];
        description = "Tool for generating .dir-locals.el for intero";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsmtpclient" = callPackage
@@ -120415,6 +128440,8 @@ self: {
        libraryHaskellDepends = [ array base directory network old-time ];
        description = "Simple SMTP Client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsndfile" = callPackage
@@ -120471,6 +128498,8 @@ self: {
        ];
        description = "Nock 5K interpreter";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsnoise" = callPackage
@@ -120495,6 +128524,8 @@ self: {
        executableHaskellDepends = [ base network pcap ];
        description = "a miniature network sniffer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsnsq" = callPackage
@@ -120513,6 +128544,8 @@ self: {
        ];
        description = "Haskell NSQ client";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsntp" = callPackage
@@ -120529,6 +128562,8 @@ self: {
        executableHaskellDepends = [ unix ];
        description = "Libraries to use SNTP protocol and small client/server implementations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsoptions" = callPackage
@@ -120553,6 +128588,8 @@ self: {
        ];
        description = "Haskell library that supports command-line flag processing";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsoz" = callPackage
@@ -120591,6 +128628,8 @@ self: {
        ];
        description = "Iron, Hawk, Oz: Web auth protocols";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsp" = callPackage
@@ -120613,6 +128652,8 @@ self: {
        libraryHaskellDepends = [ base containers harp hsp network ];
        description = "Facilitates running Haskell Server Pages web pages as CGI programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsparklines" = callPackage
@@ -120645,6 +128686,8 @@ self: {
        ];
        description = "A SPARQL query generator and DSL, and a client to query a SPARQL server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspear" = callPackage
@@ -120660,6 +128703,8 @@ self: {
        ];
        description = "Haskell Spear Parser";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec" = callPackage
@@ -120851,6 +128896,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "An hspec expectation that asserts a value matches a pattern";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec-expectations-pretty" = callPackage
@@ -120866,6 +128913,8 @@ self: {
        ];
        description = "hspec-expectations with pretty printing on failure";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec-expectations-pretty-diff" = callPackage
@@ -120894,6 +128943,8 @@ self: {
        testHaskellDepends = [ base hspec-meta ];
        description = "An experimental DSL for testing on top of Hspec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec-golden" = callPackage
@@ -120948,6 +128999,8 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec-hedgehog" = callPackage
@@ -120960,6 +129013,8 @@ self: {
        testHaskellDepends = [ base hedgehog hspec hspec-core ];
        description = "Hedgehog support for the Hspec testing framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec-jenkins" = callPackage
@@ -120971,6 +129026,8 @@ self: {
        libraryHaskellDepends = [ base blaze-markup hspec ];
        description = "Jenkins-friendly XML formatter for Hspec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec-laws" = callPackage
@@ -121055,6 +129112,8 @@ self: {
        ];
        description = "Orphan instances of MonadBase and MonadBaseControl for SpecM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec-multicheck" = callPackage
@@ -121115,6 +129174,8 @@ self: {
        ];
        description = "Helpers for creating database tests with hspec and pg-transact";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec-server" = callPackage
@@ -121162,6 +129223,8 @@ self: {
        ];
        description = "Add an hspec test-suite in one command";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec-shouldbe" = callPackage
@@ -121173,6 +129236,8 @@ self: {
        libraryHaskellDepends = [ hspec test-shouldbe ];
        description = "Convenience wrapper and utilities for hspec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec-slow" = callPackage
@@ -121227,6 +129292,8 @@ self: {
        ];
        description = "A library for testing with Hspec and the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec-stack-rerun" = callPackage
@@ -121248,6 +129315,8 @@ self: {
        sha256 = "008gm0qvhvp6z6a9sq5vpljqb90258apd83rkzy47k3bczy1sgmj";
        libraryHaskellDepends = [ base hspec ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec-test-framework" = callPackage
@@ -121291,6 +129360,8 @@ self: {
        testHaskellDepends = [ base hspec test-sandbox ];
        description = "Hspec convenience functions for use with test-sandbox";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec-wai" = callPackage
@@ -121348,6 +129419,8 @@ self: {
        ];
        description = "Write end2end web application tests using webdriver and hspec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspec2" = callPackage
@@ -121361,6 +129434,8 @@ self: {
        libraryHaskellDepends = [ base hspec hspec-discover ];
        description = "Alpha version of Hspec 2.0";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspecVariant" = callPackage
@@ -121372,6 +129447,8 @@ self: {
        libraryHaskellDepends = [ base hspec QuickCheckVariant ];
        description = "Spec for testing properties for variant types";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspkcs11" = callPackage
@@ -121390,6 +129467,8 @@ self: {
        ];
        description = "Wrapper for PKCS #11 interface";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspr-sh" = callPackage
@@ -121416,6 +129495,8 @@ self: {
        ];
        description = "A client library for the spread toolkit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hspresent" = callPackage
@@ -121430,6 +129511,8 @@ self: {
        doHaddock = false;
        description = "A terminal presentation tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsprocess" = callPackage
@@ -121455,6 +129538,8 @@ self: {
        ];
        description = "The Haskell Stream Processor command line utility";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsql" = callPackage
@@ -121466,6 +129551,8 @@ self: {
        libraryHaskellDepends = [ base old-time ];
        description = "Database access from Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsql-mysql" = callPackage
@@ -121480,6 +129567,8 @@ self: {
        librarySystemDepends = [ mysqlclient ];
        description = "MySQL driver for HSQL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {mysqlclient = null;};
 
   "hsql-odbc" = callPackage
@@ -121492,6 +129581,8 @@ self: {
        librarySystemDepends = [ unixODBC ];
        description = "A Haskell Interface to ODBC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) unixODBC;};
 
   "hsql-postgresql" = callPackage
@@ -121504,6 +129595,8 @@ self: {
        librarySystemDepends = [ postgresql ];
        description = "A Haskell Interface to PostgreSQL via the PQ library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) postgresql;};
 
   "hsql-sqlite3" = callPackage
@@ -121516,6 +129609,8 @@ self: {
        librarySystemDepends = [ sqlite ];
        description = "SQLite3 driver for HSQL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) sqlite;};
 
   "hsqml" = callPackage
@@ -121537,6 +129632,8 @@ self: {
        ];
        description = "Haskell binding for Qt Quick";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {qt5 = null;};
 
   "hsqml-datamodel" = callPackage
@@ -121549,6 +129646,8 @@ self: {
        libraryPkgconfigDepends = [ qt5 ];
        description = "HsQML (Qt5) data model";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {qt5 = null;};
 
   "hsqml-datamodel-vinyl" = callPackage
@@ -121564,6 +129663,8 @@ self: {
        ];
        description = "HsQML DataModel instances for Vinyl Rec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsqml-demo-manic" = callPackage
@@ -121580,6 +129681,8 @@ self: {
        ];
        description = "HsQML-based clone of Pipe Mania";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsqml-demo-morris" = callPackage
@@ -121598,6 +129701,8 @@ self: {
        ];
        description = "HsQML-based implementation of Nine Men's Morris";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsqml-demo-notes" = callPackage
@@ -121616,6 +129721,8 @@ self: {
        ];
        description = "Sticky notes example program implemented in HsQML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsqml-demo-samples" = callPackage
@@ -121630,6 +129737,8 @@ self: {
        executableHaskellDepends = [ base hsqml OpenGL OpenGLRaw text ];
        description = "HsQML sample programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsqml-morris" = callPackage
@@ -121648,6 +129757,8 @@ self: {
        ];
        description = "HsQML-based implementation of Nine Men's Morris";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsreadability" = callPackage
@@ -121671,6 +129782,8 @@ self: {
        ];
        description = "Access to the Readability API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsrelp" = callPackage
@@ -121685,6 +129798,8 @@ self: {
        ];
        description = "RELP (Reliable Event Logging Protocol) server implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsseccomp" = callPackage
@@ -121698,6 +129813,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit unix ];
        description = "Haskell bindings to libseccomp";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {seccomp = null;};
 
   "hssh" = callPackage
@@ -121769,6 +129886,8 @@ self: {
        ];
        description = "SQL parser and type checker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hssqlppp-th" = callPackage
@@ -121787,6 +129906,8 @@ self: {
        ];
        description = "hssqlppp extras which need template-haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hstatistics" = callPackage
@@ -121804,6 +129925,8 @@ self: {
        ];
        description = "Statistics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hstats" = callPackage
@@ -121815,6 +129938,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Statistical Computing in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hstatsd" = callPackage
@@ -121826,6 +129951,8 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl network text ];
        description = "Quick and dirty statsd interface";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hstest" = callPackage
@@ -121843,6 +129970,8 @@ self: {
        ];
        description = "Runs tests via QuickCheck1 and HUnit; like quickCheck-script but uses GHC api";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hstidy" = callPackage
@@ -121856,6 +129985,8 @@ self: {
        executableHaskellDepends = [ base haskell-src-exts ];
        description = "Takes haskell source on stdin, parses it, then prettyprints it to stdout";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hstorchat" = callPackage
@@ -121884,6 +130015,8 @@ self: {
        ];
        description = "Distributed instant messaging over Tor";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hstox" = callPackage
@@ -121911,6 +130044,8 @@ self: {
        testHaskellDepends = [ async base ];
        description = "A Tox protocol implementation in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hstradeking" = callPackage
@@ -121935,6 +130070,8 @@ self: {
        ];
        description = "Tradeking API bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hstyle" = callPackage
@@ -121952,6 +130089,8 @@ self: {
        ];
        description = "Checks Haskell source code for style compliance";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hstzaar" = callPackage
@@ -121972,6 +130111,8 @@ self: {
        ];
        description = "A two player abstract strategy game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsubconvert" = callPackage
@@ -121993,6 +130134,8 @@ self: {
        ];
        description = "One-time, faithful conversion of Subversion repositories to Git";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsudoku" = callPackage
@@ -122021,6 +130164,8 @@ self: {
        ];
        description = "Sudoku game with a GTK3 interface";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsverilog" = callPackage
@@ -122052,6 +130197,8 @@ self: {
        librarySystemDepends = [ ncurses readline swipl ];
        description = "embedding prolog in haskell";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ncurses; inherit (pkgs) readline; 
          swipl = null;};
 
@@ -122068,6 +130215,8 @@ self: {
        libraryHaskellDepends = [ base haskell-src-exts mtl utf8-string ];
        description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsx-jmacro" = callPackage
@@ -122081,6 +130230,8 @@ self: {
        ];
        description = "hsp+jmacro support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsx-xhtml" = callPackage
@@ -122092,6 +130243,8 @@ self: {
        libraryHaskellDepends = [ base hsx mtl ];
        description = "XHTML utilities to use together with HSX";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsx2hs" = callPackage
@@ -122121,6 +130274,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "FFI to syscalls";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsyslog" = callPackage
@@ -122152,6 +130307,8 @@ self: {
        ];
        description = "syslog over TCP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hsyslog-udp" = callPackage
@@ -122168,6 +130325,8 @@ self: {
        testHaskellDepends = [ base hspec time ];
        description = "Log to syslog over a network via UDP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hszephyr" = callPackage
@@ -122180,6 +130339,8 @@ self: {
        librarySystemDepends = [ com_err zephyr ];
        description = "Simple libzephyr bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {com_err = null; zephyr = null;};
 
   "htaglib" = callPackage
@@ -122229,6 +130390,8 @@ self: {
        ];
        description = "Command-line tar archive utility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "htaut" = callPackage
@@ -122256,6 +130419,8 @@ self: {
        ];
        description = "Beginner friendly graphics library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "htestu" = callPackage
@@ -122271,6 +130436,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A library for testing correctness of pseudo random number generators in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gcc;};
 
   "htiled" = callPackage
@@ -122287,6 +130454,8 @@ self: {
        ];
        description = "Import from the Tiled map editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "htime" = callPackage
@@ -122327,6 +130496,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Heterogenous Set";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "html" = callPackage
@@ -122362,6 +130533,8 @@ self: {
        ];
        description = "Determine character encoding of HTML documents/fragments";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "html-conduit_1_2_1_2" = callPackage
@@ -122482,6 +130655,8 @@ self: {
        libraryHaskellDepends = [ base hxt kure ];
        description = "HTML rewrite engine, using KURE";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "html-minimalist" = callPackage
@@ -122518,6 +130693,8 @@ self: {
        ];
        description = "A high-performance HTML tokenizer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "html-rules" = callPackage
@@ -122529,6 +130706,8 @@ self: {
        libraryHaskellDepends = [ base lens mtl tagsoup transformers ];
        description = "Perform traversals of HTML structures using sets of rules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "html-tokenizer" = callPackage
@@ -122551,6 +130730,8 @@ self: {
        ];
        description = "An \"attoparsec\"-based HTML tokenizer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "html-truncate" = callPackage
@@ -122721,6 +130902,8 @@ self: {
        libraryHaskellDepends = [ base hmt xml ];
        description = "Haskell Music Typesetting";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "htsn" = callPackage
@@ -122744,6 +130927,8 @@ self: {
        ];
        description = "Parse XML files from The Sports Network feed";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "htsn-common" = callPackage
@@ -122786,6 +130971,8 @@ self: {
        ];
        description = "Import XML files from The Sports Network into an RDBMS";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "htssets" = callPackage
@@ -122797,6 +130984,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Heterogenous Sets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-accept" = callPackage
@@ -122845,6 +131034,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring http-types ];
        description = "Attoparsec parsers for http-types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-client" = callPackage
@@ -122890,6 +131081,8 @@ self: {
        ];
        description = "HTTP authorization (both basic and digest) done right";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-client-conduit" = callPackage
@@ -122936,6 +131129,8 @@ self: {
        ];
        description = "Optics for http-client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-client-multipart" = callPackage
@@ -123007,6 +131202,8 @@ self: {
        ];
        description = "Convenient monadic HTTP request modifiers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-client-restricted" = callPackage
@@ -123023,6 +131220,8 @@ self: {
        ];
        description = "restricting the servers that http-client will use";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-client-session" = callPackage
@@ -123038,6 +131237,8 @@ self: {
        ];
        description = "A simple abstraction over the \"http-client\" connection manager";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-client-streams" = callPackage
@@ -123054,6 +131255,8 @@ self: {
        ];
        description = "http-client for io-streams supporting openssl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-client-tls" = callPackage
@@ -123181,6 +131384,8 @@ self: {
        ];
        description = "Browser interface to the http-conduit package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-conduit-downloader" = callPackage
@@ -123233,6 +131438,8 @@ self: {
        testHaskellDepends = [ base hspec text ];
        description = "http directory listing library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-dispatch" = callPackage
@@ -123250,6 +131457,8 @@ self: {
        testHaskellDepends = [ aeson base hspec ];
        description = "High level HTTP client for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-download" = callPackage
@@ -123317,6 +131526,8 @@ self: {
        ];
        description = "HTTP client package with enumerator interface and HTTPS support. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-grammar" = callPackage
@@ -123328,6 +131539,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "Attoparsec-based parsers for the RFC-2616 HTTP grammar rules";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-io-streams" = callPackage
@@ -123348,6 +131561,8 @@ self: {
        ];
        description = "HTTP client based on io-streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-kinder" = callPackage
@@ -123370,6 +131585,8 @@ self: {
        ];
        description = "Generic kinds and types for working with HTTP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-kit" = callPackage
@@ -123429,6 +131646,8 @@ self: {
        ];
        description = "Listen to HTTP requests and handle them in arbitrary ways";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-media" = callPackage
@@ -123486,6 +131705,8 @@ self: {
        ];
        description = "Monad abstraction for HTTP allowing lazy transfer and non-I/O simulation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-pony" = callPackage
@@ -123502,6 +131723,8 @@ self: {
        ];
        description = "A type unsafe http library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-pony-serve-wai" = callPackage
@@ -123521,6 +131744,8 @@ self: {
        ];
        description = "Serve a WAI application with http-pony";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-pony-transformer-case-insensitive" = callPackage
@@ -123587,6 +131812,8 @@ self: {
        ];
        description = "A library for writing HTTP and HTTPS proxies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-querystring" = callPackage
@@ -123603,6 +131830,8 @@ self: {
        ];
        description = "The HTTP query builder";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-response-decoder" = callPackage
@@ -123622,6 +131851,8 @@ self: {
        ];
        description = "Declarative DSL for parsing an HTTP response";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-reverse-proxy" = callPackage
@@ -123661,6 +131892,8 @@ self: {
        ];
        description = "A library for writing Haskell web servers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-shed" = callPackage
@@ -123674,6 +131907,8 @@ self: {
        libraryHaskellDepends = [ base network ];
        description = "A simple websever with an interact style API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-streams" = callPackage
@@ -123743,6 +131978,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Tracking http redirects";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http-types" = callPackage
@@ -123772,6 +132009,8 @@ self: {
        libraryHaskellDepends = [ base failure process transformers ];
        description = "Provide a simple HTTP client interface by wrapping the wget command line tool. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http2" = callPackage
@@ -123823,6 +132062,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A native HTTP2 client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http2-client-exe" = callPackage
@@ -123842,6 +132083,8 @@ self: {
        ];
        description = "A command-line http2 client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http2-client-grpc" = callPackage
@@ -123861,6 +132104,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Implement gRPC-over-HTTP2 clients";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http2-grpc-proto-lens" = callPackage
@@ -123893,6 +132138,8 @@ self: {
        ];
        description = "Encoders based on `proto3-wire` for gRPC over HTTP2";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "http2-grpc-types" = callPackage
@@ -123943,6 +132190,8 @@ self: {
        ];
        description = "High-level access to HTTPS Everywhere rulesets";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "https-everywhere-rules-raw" = callPackage
@@ -123957,6 +132206,8 @@ self: {
        ];
        description = "Low-level (i.e. XML) access to HTTPS Everywhere rulesets.";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "httpspec" = callPackage
@@ -123974,6 +132225,8 @@ self: {
        ];
        description = "Specification of HTTP request/response generators and parsers";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "htune" = callPackage
@@ -123987,6 +132240,8 @@ self: {
        executableHaskellDepends = [ alsa-pcm base carray fft gloss ];
        description = "harmonic analyser and tuner for musical instruments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "htvm" = callPackage
@@ -124014,6 +132269,8 @@ self: {
        testSystemDepends = [ tvm_runtime ];
        description = "Bindings for TVM machine learning framework";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {tvm_runtime = null;};
 
   "htzaar" = callPackage
@@ -124027,6 +132284,8 @@ self: {
        executableHaskellDepends = [ base OpenGL random SDL ];
        description = "A two player abstract strategy game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hub" = callPackage
@@ -124102,6 +132361,8 @@ self: {
        ];
        description = "huck";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "huckleberry" = callPackage
@@ -124133,6 +132394,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A fast-foward-based planner";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "huffman" = callPackage
@@ -124144,6 +132407,8 @@ self: {
        libraryHaskellDepends = [ base containers fingertree ];
        description = "Pure Haskell implementation of the Huffman encoding algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hugs2yc" = callPackage
@@ -124160,6 +132425,8 @@ self: {
        ];
        description = "Hugs Front-end to Yhc Core";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hulk" = callPackage
@@ -124186,6 +132453,8 @@ self: {
        ];
        description = "IRC server written in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "human-parse" = callPackage
@@ -124197,6 +132466,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "A lawless typeclass for parsing text entered by humans";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "human-readable-duration" = callPackage
@@ -124221,6 +132492,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "A lawless typeclass for converting values to human-friendly text";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "humble-prelude" = callPackage
@@ -124256,6 +132529,8 @@ self: {
        ];
        description = "Haskell UPnP Media Server";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hunch" = callPackage
@@ -124304,6 +132579,8 @@ self: {
        executableHaskellDepends = [ base cairo gtk haskell98 HUnit ];
        description = "A GUI testrunner for HUnit";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hunit-parsec" = callPackage
@@ -124327,6 +132604,8 @@ self: {
        testHaskellDepends = [ base hspec HUnit rematch ];
        description = "HUnit support for rematch";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hunp" = callPackage
@@ -124345,6 +132624,8 @@ self: {
        ];
        description = "Unpacker tool with DWIM";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hunspell-hs" = callPackage
@@ -124361,6 +132642,8 @@ self: {
        benchmarkPkgconfigDepends = [ hunspell ];
        description = "Hunspell thread-safe FFI bindings for spell checking";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) hunspell;};
 
   "hunt-searchengine" = callPackage
@@ -124392,6 +132675,8 @@ self: {
        ];
        description = "A search and indexing engine";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hunt-server" = callPackage
@@ -124415,6 +132700,8 @@ self: {
        ];
        description = "A search and indexing engine server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hunt-server-cli" = callPackage
@@ -124470,6 +132757,8 @@ self: {
        ];
        description = "Upload packages or documentation to a hackage server";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hurdle" = callPackage
@@ -124485,6 +132774,8 @@ self: {
        ];
        description = "Extract function names from Windows DLLs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hurl" = callPackage
@@ -124502,6 +132793,8 @@ self: {
        ];
        description = "Haskell URL resolver";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hurriyet" = callPackage
@@ -124520,6 +132813,8 @@ self: {
        ];
        description = "Haskell bindings for Hurriyet API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "husk-scheme" = callPackage
@@ -124544,6 +132839,8 @@ self: {
        ];
        description = "R5RS Scheme interpreter, compiler, and library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "husk-scheme-libs" = callPackage
@@ -124559,6 +132856,8 @@ self: {
        ];
        description = "Extra libraries for the husk Scheme platform";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "husky" = callPackage
@@ -124576,6 +132875,8 @@ self: {
        ];
        description = "A simple command line calculator";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hutton" = callPackage
@@ -124596,6 +132897,8 @@ self: {
        ];
        description = "A program for the button on Reddit";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "huttons-razor" = callPackage
@@ -124609,6 +132912,8 @@ self: {
        executableHaskellDepends = [ base parsec parsec-numbers ];
        description = "Quick implemention of Hutton's Razor";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "huzzy" = callPackage
@@ -124620,6 +132925,8 @@ self: {
        libraryHaskellDepends = [ base easyplot ];
        description = "Fuzzy logic library with support for T1, IT2, GT2";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hvect" = callPackage
@@ -124662,6 +132969,8 @@ self: {
        libraryHaskellDepends = [ base hvega text ];
        description = "Theme for hvega";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hw-aeson" = callPackage
@@ -124772,6 +133081,8 @@ self: {
        doHaddock = false;
        description = "CI Assistant for Haskell projects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hw-conduit" = callPackage
@@ -125696,6 +134007,8 @@ self: {
        ];
        description = "Initial version of firewall Authentication for IITK network";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hweblib" = callPackage
@@ -125718,6 +134031,8 @@ self: {
        ];
        description = "Haskell Web Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hwhile" = callPackage
@@ -125738,6 +134053,8 @@ self: {
        testHaskellDepends = [ array base Cabal containers mtl ];
        description = "An implementation of Neil D. Jones' While language";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hworker" = callPackage
@@ -125759,6 +134076,8 @@ self: {
        ];
        description = "A reliable at-least-once job queue built on top of redis";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hworker-ses" = callPackage
@@ -125775,6 +134094,8 @@ self: {
        ];
        description = "Library for sending email with Amazon's SES and hworker";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hwormhole" = callPackage
@@ -125807,6 +134128,8 @@ self: {
        ];
        description = "magic-wormhole client";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hws" = callPackage
@@ -125825,6 +134148,8 @@ self: {
        ];
        description = "Simple Haskell Web Server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hwsl2" = callPackage
@@ -125844,6 +134169,8 @@ self: {
        ];
        description = "Hashing with SL2";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hwsl2-bytevector" = callPackage
@@ -125855,6 +134182,8 @@ self: {
        libraryHaskellDepends = [ base bytestring fingertree hwsl2 ];
        description = "A hashed byte-vector based on algebraic hashes and finger trees";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hwsl2-reducers" = callPackage
@@ -125868,6 +134197,8 @@ self: {
        ];
        description = "Semigroup and Reducer instances for Data.Hash.SL2";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hx" = callPackage
@@ -125879,6 +134210,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell extras (missing utility functions)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hxmppc" = callPackage
@@ -125897,6 +134230,8 @@ self: {
        ];
        description = "Haskell XMPP (Jabber Client) Command Line Interface (CLI)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hxournal" = callPackage
@@ -125923,6 +134258,8 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        description = "A pen notetaking program written in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hxt" = callPackage
@@ -126078,6 +134415,8 @@ self: {
        libraryHaskellDepends = [ base hxt mtl ];
        description = "Utility functions for using HXT picklers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hxt-regex-xmlschema" = callPackage
@@ -126184,6 +134523,8 @@ self: {
        libraryHaskellDepends = [ base bytestring encoding hxt mtl ];
        description = "Helper functions for HXT";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hxweb" = callPackage
@@ -126195,6 +134536,8 @@ self: {
        libraryHaskellDepends = [ base cgi fastcgi libxml mtl xslt ];
        description = "Minimal webframework using fastcgi, libxml2 and libxslt";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hyahtzee" = callPackage
@@ -126208,6 +134551,8 @@ self: {
        executableHaskellDepends = [ base containers HUnit random ];
        description = "A Yahtzee game implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hyakko" = callPackage
@@ -126229,6 +134574,8 @@ self: {
        ];
        description = "Literate-style Documentation Generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hybrid" = callPackage
@@ -126245,6 +134592,8 @@ self: {
        ];
        description = "A implementation of a type-checker for Lambda-H";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hybrid-vectors" = callPackage
@@ -126273,6 +134622,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Haskell binding to the Sixense SDK for the Razer Hydra";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {sixense_x64 = null;};
 
   "hydra-print" = callPackage
@@ -126304,6 +134655,8 @@ self: {
        ];
        description = "NCurses interface to view multiple ByteString streams in parallel";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hydrogen" = callPackage
@@ -126320,6 +134673,8 @@ self: {
        testHaskellDepends = [ base Cabal containers mtl QuickCheck ];
        description = "An alternate Prelude";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hydrogen-cli" = callPackage
@@ -126340,6 +134695,8 @@ self: {
        ];
        description = "Hydrogen Data";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hydrogen-cli-args" = callPackage
@@ -126355,6 +134712,8 @@ self: {
        ];
        description = "Hydrogen Command Line Arguments Parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hydrogen-data" = callPackage
@@ -126366,6 +134725,8 @@ self: {
        libraryHaskellDepends = [ base hydrogen-parsing hydrogen-prelude ];
        description = "Hydrogen Data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hydrogen-multimap" = callPackage
@@ -126377,6 +134738,8 @@ self: {
        libraryHaskellDepends = [ base containers ghc-prim ];
        description = "Hydrogen Multimap";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hydrogen-parsing" = callPackage
@@ -126390,6 +134753,8 @@ self: {
        ];
        description = "Hydrogen Parsing Utilities";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hydrogen-prelude" = callPackage
@@ -126409,6 +134774,8 @@ self: {
        ];
        description = "Hydrogen Prelude";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hydrogen-prelude-parsec" = callPackage
@@ -126420,6 +134787,8 @@ self: {
        libraryHaskellDepends = [ base hydrogen-prelude parsec ];
        description = "Hydrogen Prelude /w Parsec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hydrogen-syntax" = callPackage
@@ -126436,6 +134805,8 @@ self: {
        ];
        description = "Hydrogen Syntax";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hydrogen-util" = callPackage
@@ -126450,6 +134821,8 @@ self: {
        ];
        description = "Hydrogen Tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hydrogen-version" = callPackage
@@ -126478,6 +134851,8 @@ self: {
        ];
        description = "Simple web application server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hylide" = callPackage
@@ -126499,6 +134874,8 @@ self: {
        ];
        description = "WebGL live-coding environment for writing shaders with Hylogen";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hylogen" = callPackage
@@ -126525,6 +134902,8 @@ self: {
        ];
        description = "Tools for hybrid logics related programs";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hylotab" = callPackage
@@ -126539,6 +134918,8 @@ self: {
        executableHaskellDepends = [ base hylolib mtl ];
        description = "Tableau based theorem prover for hybrid logics";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hyloutils" = callPackage
@@ -126554,6 +134935,8 @@ self: {
        ];
        description = "Very small programs for hybrid logics";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hyper" = callPackage
@@ -126565,6 +134948,8 @@ self: {
        libraryHaskellDepends = [ base blaze-html deepseq text ];
        description = "Display class for the HyperHaskell graphical Haskell interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hyper-extra" = callPackage
@@ -126580,6 +134965,8 @@ self: {
        ];
        description = "Display instances for the HyperHaskell graphical Haskell interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hyper-haskell-server" = callPackage
@@ -126598,6 +134985,8 @@ self: {
        ];
        description = "Server back-end for the HyperHaskell graphical Haskell interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hyperdrive" = callPackage
@@ -126616,6 +135005,8 @@ self: {
        ];
        description = "a fast, trustworthy HTTP(s) server built";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hyperfunctions" = callPackage
@@ -126631,6 +135022,8 @@ self: {
        ];
        description = "Hyperfunctions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hyperion" = callPackage
@@ -126658,6 +135051,8 @@ self: {
        ];
        description = "Reliable performance measurement with robust data export";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hyperloglog" = callPackage
@@ -126699,6 +135094,8 @@ self: {
        testHaskellDepends = [ base HUnit semigroups tasty tasty-hunit ];
        description = "Approximate cardinality estimation using constant space";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hyperpublic" = callPackage
@@ -126714,6 +135111,8 @@ self: {
        ];
        description = "A thin wrapper for the Hyperpublic API";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hyphenate" = callPackage
@@ -126774,6 +135173,8 @@ self: {
        ];
        description = "A Haskell neo4j client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hyraxAbif" = callPackage
@@ -126902,6 +135303,8 @@ self: {
        ];
        description = "A haskell wrapper for the Zulip API";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "i18n" = callPackage
@@ -126922,6 +135325,8 @@ self: {
        ];
        description = "Internationalization for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "i3blocks-hs-contrib" = callPackage
@@ -126941,6 +135346,8 @@ self: {
        ];
        description = "Base i3blocks written in haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "i3ipc" = callPackage
@@ -126958,6 +135365,8 @@ self: {
        testHaskellDepends = [ aeson base bytestring hspec ];
        description = "A type-safe wrapper around i3's IPC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iCalendar" = callPackage
@@ -126976,6 +135385,8 @@ self: {
        ];
        description = "iCalendar data types, parser, and printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iException" = callPackage
@@ -127004,6 +135415,8 @@ self: {
        ];
        description = "A simple wrapper of In-App-Purchase receipt validate APIs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ib-api" = callPackage
@@ -127020,6 +135433,8 @@ self: {
        ];
        description = "An API for the Interactive Brokers Trading Workstation written in pure Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iban" = callPackage
@@ -127038,6 +135453,8 @@ self: {
        testHaskellDepends = [ base HUnit tasty tasty-hunit text ];
        description = "Validate and generate IBANs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ibus-hs" = callPackage
@@ -127070,6 +135487,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "iCalendar format parser and org-mode converter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "icepeak" = callPackage
@@ -127115,6 +135534,8 @@ self: {
        ];
        description = "A fast JSON document store with push notification support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "icon-fonts" = callPackage
@@ -127153,6 +135574,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Type safe iconv wrapper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ide-backend" = callPackage
@@ -127199,6 +135622,8 @@ self: {
        ];
        description = "An IDE backend library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ide-backend-common" = callPackage
@@ -127223,6 +135648,8 @@ self: {
        ];
        description = "Shared library used be ide-backend and ide-backend-server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ide-backend-rts" = callPackage
@@ -127257,6 +135684,8 @@ self: {
        ];
        description = "An IDE backend server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ideas" = callPackage
@@ -127276,6 +135705,8 @@ self: {
        ];
        description = "Feedback services for intelligent tutoring systems";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ideas-math" = callPackage
@@ -127293,6 +135724,8 @@ self: {
        ];
        description = "Interactive domain reasoner for logic and mathematics";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ideas-math-types" = callPackage
@@ -127306,6 +135739,8 @@ self: {
        ];
        description = "Common types for mathematical domain reasoners";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "idempotent" = callPackage
@@ -127318,6 +135753,8 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "Idempotent monoids";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "identicon" = callPackage
@@ -127360,6 +135797,8 @@ self: {
        ];
        description = "Squares style for the identicon package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "identifiers" = callPackage
@@ -127384,6 +135823,8 @@ self: {
        ];
        description = "Numeric identifiers for values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "idiii" = callPackage
@@ -127409,6 +135850,8 @@ self: {
        ];
        description = "ID3v2 (tagging standard for MP3 files) library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "idna" = callPackage
@@ -127431,6 +135874,8 @@ self: {
        libraryHaskellDepends = [ base punycode split ];
        description = "Converts Unicode hostnames into ASCII";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "idringen" = callPackage
@@ -127451,6 +135896,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "A project manage tool for Idris";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "idris" = callPackage
@@ -127495,6 +135942,8 @@ self: {
        ];
        description = "Functional Programming Language with Dependent Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gmp;};
 
   "ieee" = callPackage
@@ -127517,6 +135966,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "ieee-utils";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ieee-utils-tempfix" = callPackage
@@ -127566,6 +136017,8 @@ self: {
        testHaskellDepends = [ base bytestring HUnit stocks ];
        description = "Library for the IEX Trading API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "if" = callPackage
@@ -127591,6 +136044,8 @@ self: {
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "put if statements within type constraints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iff" = callPackage
@@ -127639,6 +136094,8 @@ self: {
        ];
        description = "Bindings to Instagram's API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ige" = callPackage
@@ -127661,6 +136118,8 @@ self: {
        ];
        description = "An keyboard-driven interactive graph editor";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ige-mac-integration" = callPackage
@@ -127679,6 +136138,8 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {ige-mac-integration = null;};
 
   "ignore" = callPackage
@@ -127698,6 +136159,8 @@ self: {
        testHaskellDepends = [ base HTF text ];
        description = "Handle ignore files of different VCSes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "igraph" = callPackage
@@ -127715,6 +136178,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to the igraph C library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) igraph;};
 
   "igrf" = callPackage
@@ -127728,6 +136193,8 @@ self: {
        libraryHaskellDepends = [ ad base polynomial ];
        description = "International Geomagnetic Reference Field";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ihaskell" = callPackage
@@ -127791,6 +136258,8 @@ self: {
        libraryHaskellDepends = [ base ihaskell ];
        description = "IHaskell display instances for basic types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ihaskell-blaze" = callPackage
@@ -127845,6 +136314,8 @@ self: {
        libraryHaskellDepends = [ base classy-prelude ihaskell ];
        description = "IHaskell display instances for basic types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ihaskell-gnuplot" = callPackage
@@ -127906,6 +136377,8 @@ self: {
        ];
        description = "Embed R quasiquotes and plots in IHaskell notebooks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ihaskell-juicypixels" = callPackage
@@ -127951,6 +136424,8 @@ self: {
        ];
        description = "IHaskell display instances for Parsec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ihaskell-plot" = callPackage
@@ -127962,6 +136437,8 @@ self: {
        libraryHaskellDepends = [ base bytestring hmatrix ihaskell plot ];
        description = "IHaskell display instance for Plot (from plot package)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ihaskell-rlangqq" = callPackage
@@ -127979,6 +136456,8 @@ self: {
        ];
        description = "a rDisp quasiquote to show plots from Rlang-QQ in IHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ihaskell-widgets" = callPackage
@@ -127996,6 +136475,8 @@ self: {
        ];
        description = "IPython standard widgets for IHaskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ihs" = callPackage
@@ -128027,6 +136508,8 @@ self: {
        executableHaskellDepends = [ base network ];
        description = "Incremental HTTP iteratee";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ilist" = callPackage
@@ -128064,6 +136547,8 @@ self: {
        executableToolDepends = [ alex ];
        description = "A fast syntax highlighting library built with alex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "image-type" = callPackage
@@ -128132,6 +136617,8 @@ self: {
        ];
        description = "Command-line image paste utility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imagesize-conduit" = callPackage
@@ -128178,6 +136665,8 @@ self: {
        ];
        description = "An efficient IMAP client library, with SSL and streaming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imapget" = callPackage
@@ -128195,6 +136684,8 @@ self: {
        ];
        description = "Downloads email from imap SSL servers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imbib" = callPackage
@@ -128216,6 +136707,8 @@ self: {
        ];
        description = "Minimalistic reference manager";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imgur" = callPackage
@@ -128231,6 +136724,8 @@ self: {
        ];
        description = "A function to post an image to imgur";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imgurder" = callPackage
@@ -128251,6 +136746,8 @@ self: {
        ];
        description = "Uploader for Imgur";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imj-animation" = callPackage
@@ -128263,6 +136760,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Animation Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imj-base" = callPackage
@@ -128287,6 +136786,8 @@ self: {
        ];
        description = "Game engine with geometry, easing, animated text, delta rendering";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imj-game-hamazed" = callPackage
@@ -128307,6 +136808,8 @@ self: {
        testHaskellDepends = [ base imj-base mtl text ];
        description = "A game with flying numbers and 8-bit color animations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imj-measure-stdout" = callPackage
@@ -128322,6 +136825,8 @@ self: {
        ];
        description = "An application to determine the maximum capacity of stdout buffer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imj-prelude" = callPackage
@@ -128333,6 +136838,8 @@ self: {
        libraryHaskellDepends = [ base mtl text ];
        description = "Prelude library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imm" = callPackage
@@ -128375,6 +136882,8 @@ self: {
        ];
        description = "Execute arbitrary callbacks for each element of RSS/Atom feeds";
        license = stdenv.lib.licenses.cc0;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "immortal" = callPackage
@@ -128412,6 +136921,8 @@ self: {
        ];
        description = "Multi-platform parser analyzer and generator";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imperative-edsl" = callPackage
@@ -128437,6 +136948,8 @@ self: {
        ];
        description = "Deep embedding of imperative programs with code generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imperative-edsl-vhdl" = callPackage
@@ -128453,6 +136966,8 @@ self: {
        ];
        description = "Deep embedding of VHDL programs with code generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "impl" = callPackage
@@ -128465,6 +136980,8 @@ self: {
        doHaddock = false;
        description = "Framework for defaulting superclasses";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "implicit" = callPackage
@@ -128508,6 +137025,8 @@ self: {
        libraryHaskellDepends = [ base mtl time transformers ];
        description = "A logging framework built around implicit parameters";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "implicit-params" = callPackage
@@ -128519,6 +137038,8 @@ self: {
        libraryHaskellDepends = [ base data-default-class ];
        description = "Named and unnamed implicit parameters with defaults";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "importify" = callPackage
@@ -128551,6 +137072,8 @@ self: {
        ];
        description = "Tool for haskell imports refactoring";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imports" = callPackage
@@ -128563,6 +137086,8 @@ self: {
        testHaskellDepends = [ base directory filepath mtl ];
        description = "Generate code for importing directories automatically";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "impossible" = callPackage
@@ -128574,6 +137099,8 @@ self: {
        libraryHaskellDepends = [ base lens ];
        description = "Set of data and type definitions of impossible types. Impossible types are useful when declaring type classes / type families instances that should not be expanded by GHC until a specific type is provided in order to keep the types nice and readable.";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "imprevu" = callPackage
@@ -128631,6 +137158,8 @@ self: {
        testHaskellDepends = [ base binary constraints hspec ];
        description = "Serialization of arbitrary Haskell expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "improve" = callPackage
@@ -128642,6 +137171,8 @@ self: {
        libraryHaskellDepends = [ base mtl yices ];
        description = "An imperative, verifiable programming language for high assurance applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "impure-containers" = callPackage
@@ -128697,6 +137228,8 @@ self: {
        ];
        description = "A type-checker for Haskell with integer constraints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "inchworm" = callPackage
@@ -128708,6 +137241,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Simple parser combinators for lexical analysis";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "include-file" = callPackage
@@ -128762,6 +137297,8 @@ self: {
        benchmarkHaskellDepends = [ base containers deepseq QuickCheck ];
        description = "Incremental computing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "incremental-maps" = callPackage
@@ -128785,6 +137322,8 @@ self: {
        ];
        description = "Package for doing incremental computations on maps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "incremental-parser" = callPackage
@@ -128837,6 +137376,8 @@ self: {
        ];
        description = "type classes for incremental updates to data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "indent" = callPackage
@@ -128867,6 +137408,8 @@ self: {
        ];
        description = "Indentation sensitive parsing combinators for Parsec and Trifecta";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "indentation-core" = callPackage
@@ -128878,6 +137421,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Indentation sensitive parsing combinators core library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "indentation-parsec" = callPackage
@@ -128892,6 +137437,8 @@ self: {
        testHaskellDepends = [ base parsec tasty tasty-hunit ];
        description = "Indentation sensitive parsing combinators for Parsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "indentation-trifecta" = callPackage
@@ -128908,6 +137455,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit trifecta ];
        description = "Indentation sensitive parsing combinators for Trifecta";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "indentparser" = callPackage
@@ -128944,6 +137493,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Indexed Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "indexation" = callPackage
@@ -128965,6 +137516,8 @@ self: {
        ];
        description = "Tools for entity indexation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "indexed" = callPackage
@@ -129064,6 +137617,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "A series of type families and constraints for \"indexable\" types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "indian-language-font-converter" = callPackage
@@ -129090,6 +137645,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Multi-dimensional statically bounded indices";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "indieweb-algorithms" = callPackage
@@ -129115,6 +137672,8 @@ self: {
        ];
        description = "A collection of implementations of IndieWeb algorithms";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "inf-interval" = callPackage
@@ -129127,6 +137686,8 @@ self: {
        testHaskellDepends = [ array base deepseq QuickCheck text vector ];
        description = "Non-contiguous interval data types with potentially infinite ranges";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "infer-license" = callPackage
@@ -129162,6 +137723,8 @@ self: {
        ];
        description = "Find the repository from where a given repo was forked";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "infernal" = callPackage
@@ -129180,6 +137743,8 @@ self: {
        ];
        description = "The Infernal Machine - An AWS Lambda Custom Runtime for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "infernu" = callPackage
@@ -129200,6 +137765,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative parsec ];
        description = "Type inference and checker for JavaScript (experimental)";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "infinite-search" = callPackage
@@ -129226,6 +137793,8 @@ self: {
          base binary Cabal filepath ghc irc plugins
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "infix" = callPackage
@@ -129237,6 +137806,8 @@ self: {
        libraryHaskellDepends = [ base containers haskell-src ];
        description = "Infix expression re-parsing (for HsParser library)";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "inflections" = callPackage
@@ -129268,6 +137839,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "An infinite list type and operations thereon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "influxdb" = callPackage
@@ -129323,6 +137896,8 @@ self: {
        ];
        description = "A yesod subsite serving a wiki";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ini" = callPackage
@@ -129353,6 +137928,8 @@ self: {
        testHaskellDepends = [ base HUnit ini raw-strings-qq text ];
        description = "Quasiquoter for INI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "inilist" = callPackage
@@ -129372,6 +137949,8 @@ self: {
        ];
        description = "Processing for .ini files with duplicate sections and options";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "initialize" = callPackage
@@ -129383,6 +137962,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Initialization and Deinitialization of 'Storable' values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "inj" = callPackage
@@ -129434,6 +138015,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Monadic functions with injected parameters";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "inline-asm" = callPackage
@@ -129578,6 +138161,8 @@ self: {
        testHaskellDepends = [ base hspec jni jvm text ];
        description = "Java interop via inline Java code in Haskell modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "inline-r" = callPackage
@@ -129612,6 +138197,8 @@ self: {
        ];
        description = "Seamlessly call R from Haskell and vice versa. No FFI required.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) R;};
 
   "inliterate" = callPackage
@@ -129680,6 +138267,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring dlist ];
        description = "Stupid simple bytestring templates";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "inspection-proxy" = callPackage
@@ -129735,6 +138324,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Create benchmarks from the HAR files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "instana-haskell-trace-sdk" = callPackage
@@ -129769,6 +138360,8 @@ self: {
        ];
        description = "SDK for adding custom Instana tracing support to Haskell applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "instance-control" = callPackage
@@ -129796,6 +138389,8 @@ self: {
        ];
        description = "Template haskell utilities for helping with deserialization etc. of existential types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "instant-aeson" = callPackage
@@ -129812,6 +138407,8 @@ self: {
        ];
        description = "Generic Aeson instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "instant-bytes" = callPackage
@@ -129828,6 +138425,8 @@ self: {
        ];
        description = "Generic Serial instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "instant-deepseq" = callPackage
@@ -129839,6 +138438,8 @@ self: {
        libraryHaskellDepends = [ base deepseq instant-generics ];
        description = "Generic NFData instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "instant-generics" = callPackage
@@ -129852,6 +138453,8 @@ self: {
        libraryHaskellDepends = [ base containers syb template-haskell ];
        description = "Generic programming library with a sum of products view";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "instant-hashable" = callPackage
@@ -129863,6 +138466,8 @@ self: {
        libraryHaskellDepends = [ base hashable instant-generics ];
        description = "Generic Hashable instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "instant-zipper" = callPackage
@@ -129876,6 +138481,8 @@ self: {
        libraryHaskellDepends = [ base instant-generics mtl ];
        description = "Heterogenous Zipper in Instant Generics";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "instapaper-sender" = callPackage
@@ -129895,6 +138502,8 @@ self: {
        ];
        description = "Basic HTTP gateway to save articles to Instapaper";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "instinct" = callPackage
@@ -129906,6 +138515,8 @@ self: {
        libraryHaskellDepends = [ base containers mersenne-random vector ];
        description = "Fast artifical neural networks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "instrument-chord" = callPackage
@@ -129956,6 +138567,8 @@ self: {
        ];
        description = "A data structure that associates each Int key with a set of values";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "intcode" = callPackage
@@ -130010,6 +138623,8 @@ self: {
        sha256 = "0lrhf6mw90bfph3hbyxv3n7g2n2xnjfq4qnhyhw4ml76k4yybmxa";
        description = "A pure-Haskell implementation of arbitrary-precision Integers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "integer-roots" = callPackage
@@ -130074,6 +138689,8 @@ self: {
        ];
        description = "Integrate different assays";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "intel-aes" = callPackage
@@ -130092,6 +138709,8 @@ self: {
        librarySystemDepends = [ intel_aes ];
        description = "Hardware accelerated AES encryption and Random Number Generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {intel_aes = null;};
 
   "interactive-plot" = callPackage
@@ -130188,6 +138807,8 @@ self: {
        ];
        description = "Prelude replacement based on protolude";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "intern" = callPackage
@@ -130223,6 +138844,8 @@ self: {
        ];
        description = "Shell command for constructing custom stamps for German Post";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "intero" = callPackage
@@ -130249,6 +138872,8 @@ self: {
        ];
        description = "Complete interactive development program for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "interp" = callPackage
@@ -130280,6 +138905,8 @@ self: {
        ];
        description = "Tracery-like randomized text interpolation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "interpol" = callPackage
@@ -130303,6 +138930,8 @@ self: {
        ];
        description = "GHC preprocessor and library to enable variable interpolation in strings";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "interpolate" = callPackage
@@ -130352,6 +138981,8 @@ self: {
        ];
        description = "QuasiQuoter for Ruby-style multi-line interpolated strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "interpolatedstring-qq-mwotton" = callPackage
@@ -130367,6 +138998,8 @@ self: {
        ];
        description = "DO NOT USE THIS. interpolatedstring-qq works now.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "interpolatedstring-qq2" = callPackage
@@ -130385,6 +139018,8 @@ self: {
        ];
        description = "QuasiQuoter for multi-line interpolated strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "interpolation" = callPackage
@@ -130454,6 +139089,8 @@ self: {
        testHaskellDepends = [ base Cabal either transformers ];
        description = "Monad transformers that can be run and resumed later, conserving their context";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "interspersed" = callPackage
@@ -130479,6 +139116,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Intervals with adherences";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "intervals" = callPackage
@@ -130583,6 +139222,8 @@ self: {
        doHaddock = false;
        description = "Intro reexported as Prelude";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "introduction" = callPackage
@@ -130603,6 +139244,8 @@ self: {
        ];
        description = "A prelude for safe new projects";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "introduction-test" = callPackage
@@ -130622,6 +139265,8 @@ self: {
        ];
        description = "A prelude for the tests of safe new projects";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "intset" = callPackage
@@ -130633,6 +139278,8 @@ self: {
        libraryHaskellDepends = [ base bits-extras bytestring deepseq ];
        description = "Pure, mergeable, succinct Int sets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "intset-imperative" = callPackage
@@ -130713,6 +139360,8 @@ self: {
        ];
        description = "Invertible parsing combinators framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "invertible-hlist" = callPackage
@@ -130724,6 +139373,8 @@ self: {
        libraryHaskellDepends = [ base HList invertible ];
        description = "invertible functions and instances for HList";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "invertible-hxt" = callPackage
@@ -130748,6 +139399,8 @@ self: {
        libraryHaskellDepends = [ base partial-isomorphisms ];
        description = "Invertible syntax descriptions for both parsing and pretty printing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "io-capture" = callPackage
@@ -130766,6 +139419,8 @@ self: {
        ];
        description = "Capture IO actions' stdout and stderr";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "io-choice" = callPackage
@@ -130785,6 +139440,8 @@ self: {
        ];
        description = "Choice for IO and lifted IO";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "io-machine" = callPackage
@@ -130836,6 +139493,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "An API for generating TIMBER style reactive objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "io-region" = callPackage
@@ -130964,6 +139623,8 @@ self: {
        libraryHaskellDepends = [ base network unix ];
        description = "Type-safe I/O control package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ion" = callPackage
@@ -130984,6 +139645,8 @@ self: {
        ];
        description = "EDSL for concurrent, realtime, embedded programming on top of Ivory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ioref-stable" = callPackage
@@ -131006,6 +139669,8 @@ self: {
        libraryHaskellDepends = [ base bytestring path text ];
        description = "A class of strings that can be involved in IO";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iothread" = callPackage
@@ -131017,6 +139682,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "run IOs in a single thread";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iotransaction" = callPackage
@@ -131028,6 +139695,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Supports the automatic undoing of IO operations when an exception is thrown";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ip" = callPackage
@@ -131059,6 +139728,8 @@ self: {
        ];
        description = "Library for IP and MAC addresses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ip-quoter" = callPackage
@@ -131084,6 +139755,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring iproute ];
        description = "IP2Location Haskell package for IP geolocation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ip2proxy" = callPackage
@@ -131095,6 +139768,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring iproute ];
        description = "IP2Proxy Haskell package for proxy detection";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ip6addr" = callPackage
@@ -131126,6 +139801,8 @@ self: {
        ];
        description = "interactive patch editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ipc" = callPackage
@@ -131141,6 +139818,8 @@ self: {
        ];
        description = "High level inter-process communication library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ipcvar" = callPackage
@@ -131183,6 +139862,8 @@ self: {
        ];
        description = "Access IPFS locally and remotely";
        license = stdenv.lib.licenses.agpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ipfs-api" = callPackage
@@ -131219,6 +139900,8 @@ self: {
        ];
        description = "IPLD Content-IDentifiers <https://github.com/ipld/cid>";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ipopt-hs" = callPackage
@@ -131240,6 +139923,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "haskell binding to ipopt and nlopt including automatic differentiation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ipopt; inherit (pkgs) nlopt;};
 
   "ipprint" = callPackage
@@ -131251,6 +139936,8 @@ self: {
        libraryHaskellDepends = [ base haskell-src sr-extra ];
        description = "Tiny helper for pretty-printing values in ghci console";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iproute" = callPackage
@@ -131288,6 +139975,8 @@ self: {
        executableHaskellDepends = [ base QuickCheck syb ];
        description = "iptables rules parser/printer library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iptadmin" = callPackage
@@ -131312,6 +140001,8 @@ self: {
        ];
        description = "web-interface for iptables";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ipynb" = callPackage
@@ -131486,6 +140177,8 @@ self: {
        ];
        description = "A DCC message parsing and helper library for IRC clients";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "irc-fun-bot" = callPackage
@@ -131506,6 +140199,8 @@ self: {
        ];
        description = "Library for writing fun IRC bots";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "irc-fun-client" = callPackage
@@ -131524,6 +140219,8 @@ self: {
        ];
        description = "Another library for writing IRC clients";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "irc-fun-color" = callPackage
@@ -131540,6 +140237,8 @@ self: {
        testHaskellDepends = [ base text ];
        description = "Add color and style decorations to IRC messages";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "irc-fun-messages" = callPackage
@@ -131553,6 +140252,8 @@ self: {
        ];
        description = "Types and functions for working with the IRC protocol";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "irc-fun-types" = callPackage
@@ -131564,6 +140265,8 @@ self: {
        libraryHaskellDepends = [ base hashable text ];
        description = "Common types for IRC related packages";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ircbot" = callPackage
@@ -131586,6 +140289,8 @@ self: {
        ];
        description = "A library for writing IRC bots";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ircbouncer" = callPackage
@@ -131634,6 +140339,8 @@ self: {
        ];
        description = "RFC-based resource identifier library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iridium" = callPackage
@@ -131661,6 +140368,8 @@ self: {
        ];
        description = "Automated Local Cabal Package Testing and Uploading";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iron-mq" = callPackage
@@ -131672,6 +140381,8 @@ self: {
        libraryHaskellDepends = [ aeson base http-client lens text wreq ];
        description = "Iron.IO message queueing client library";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ironforge" = callPackage
@@ -131694,6 +140405,8 @@ self: {
        ];
        description = "A technical demo for Antisplice";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "irt" = callPackage
@@ -131705,6 +140418,8 @@ self: {
        libraryHaskellDepends = [ ad base data-default-class statistics ];
        description = "Item Response Theory functions for use in computerized adaptive testing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "is" = callPackage
@@ -131736,6 +140451,8 @@ self: {
        ];
        description = "An executable and library to determine if a file is a DICOM file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "isevaluated" = callPackage
@@ -131747,6 +140464,8 @@ self: {
        libraryHaskellDepends = [ base vacuum ];
        description = "Check whether a value has been evaluated";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "isiz" = callPackage
@@ -131787,6 +140506,8 @@ self: {
        ];
        description = "Advanced ESMTP library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iso3166-country-codes" = callPackage
@@ -131846,6 +140567,8 @@ self: {
        ];
        description = "Types and parser for ISO8601 durations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iso8601-time" = callPackage
@@ -131883,6 +140606,8 @@ self: {
        ];
        description = "A parser and generator for the ISO-14496-12/14 base media file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "isobmff-builder" = callPackage
@@ -131907,6 +140632,8 @@ self: {
        ];
        description = "A (bytestring-) builder for the ISO-14496-12 base media file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "isohunt" = callPackage
@@ -131923,6 +140650,8 @@ self: {
        ];
        description = "Bindings to the isoHunt torrent search API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "isotope" = callPackage
@@ -131941,6 +140670,8 @@ self: {
        ];
        description = "Isotopic masses and relative abundances";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ispositive" = callPackage
@@ -131989,6 +140720,8 @@ self: {
        ];
        description = "Issue Tracker for the CLI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "itemfield" = callPackage
@@ -132016,6 +140749,8 @@ self: {
        ];
        description = "A brick Widget for selectable summary of many elements on a terminal";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iter-stats" = callPackage
@@ -132034,6 +140769,8 @@ self: {
        ];
        description = "iteratees for statistical processing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iterIO" = callPackage
@@ -132052,6 +140789,8 @@ self: {
        librarySystemDepends = [ zlib ];
        description = "Iteratee-based IO with pipe operators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "iterable" = callPackage
@@ -132095,6 +140834,8 @@ self: {
        ];
        description = "Iteratee-based I/O";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iteratee-compress" = callPackage
@@ -132107,6 +140848,8 @@ self: {
        librarySystemDepends = [ bzip2 zlib ];
        description = "Enumeratees for compressing and decompressing streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) bzip2; inherit (pkgs) zlib;};
 
   "iteratee-mtl" = callPackage
@@ -132124,6 +140867,8 @@ self: {
        ];
        description = "Iteratee-based I/O";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iteratee-parsec" = callPackage
@@ -132139,6 +140884,8 @@ self: {
        ];
        description = "Package allowing parsec parser initeratee";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iteratee-stm" = callPackage
@@ -132152,6 +140899,8 @@ self: {
        ];
        description = "Concurrent iteratees using STM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iterio-server" = callPackage
@@ -132168,6 +140917,8 @@ self: {
        ];
        description = "Library for building servers with IterIO";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iterm-show" = callPackage
@@ -132195,6 +140946,8 @@ self: {
        libraryHaskellDepends = [ base iterm-show JuicyPixels ];
        description = "Orphan Show instances for JuciyPixels image types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iterm-show-diagrams" = callPackage
@@ -132210,6 +140963,8 @@ self: {
        ];
        description = "Orphan Show instances for diagrams package that render inline in some terminals";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ival" = callPackage
@@ -132255,6 +141010,8 @@ self: {
        ];
        description = "Theorem proving library based on dependent type theory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ivory" = callPackage
@@ -132273,6 +141030,8 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Safe embedded C programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ivory-artifact" = callPackage
@@ -132308,6 +141067,8 @@ self: {
        ];
        description = "Ivory C backend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ivory-bitdata" = callPackage
@@ -132326,6 +141087,8 @@ self: {
        executableHaskellDepends = [ base ivory ivory-backend-c ];
        description = "Ivory bit-data support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ivory-eval" = callPackage
@@ -132344,6 +141107,8 @@ self: {
        ];
        description = "Simple concrete evaluator for Ivory programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ivory-examples" = callPackage
@@ -132366,6 +141131,8 @@ self: {
        ];
        description = "Ivory examples";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ivory-hw" = callPackage
@@ -132378,6 +141145,8 @@ self: {
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        description = "Ivory hardware model (STM32F4)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ivory-opts" = callPackage
@@ -132394,6 +141163,8 @@ self: {
        ];
        description = "Ivory compiler optimizations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ivory-quickcheck" = callPackage
@@ -132415,6 +141186,8 @@ self: {
        ];
        description = "QuickCheck driver for Ivory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ivory-serialize" = callPackage
@@ -132431,6 +141204,8 @@ self: {
        ];
        description = "Serialization library for Ivory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ivory-stdlib" = callPackage
@@ -132443,6 +141218,8 @@ self: {
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        description = "Ivory standard library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ivy-web" = callPackage
@@ -132458,6 +141235,8 @@ self: {
        ];
        description = "A lightweight web framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iwlib" = callPackage
@@ -132511,6 +141290,8 @@ self: {
        executableHaskellDepends = [ base preprocessor-tools syb ];
        description = "A preprocessor for expanding \"ixdo\" notation for indexed monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ixmonad" = callPackage
@@ -132524,6 +141305,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Embeds effect systems into Haskell using parameteric effect monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ixset" = callPackage
@@ -132563,6 +141346,8 @@ self: {
        ];
        description = "Efficient relational queries on Haskell sets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ixshader" = callPackage
@@ -132579,6 +141364,8 @@ self: {
        ];
        description = "A shallow embedding of the OpenGL Shading Language in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "iyql" = callPackage
@@ -132598,6 +141385,8 @@ self: {
        ];
        description = "CLI (command line interface) to YQL";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "j2hs" = callPackage
@@ -132618,6 +141407,8 @@ self: {
        ];
        description = "j2hs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ja-base-extra" = callPackage
@@ -132662,6 +141453,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "DEPRECATED Bindings to the JACK Audio Connection Kit";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libjack2;};
 
   "jackminimix" = callPackage
@@ -132673,6 +141466,8 @@ self: {
        libraryHaskellDepends = [ base hosc ];
        description = "control JackMiniMix";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jacobi-roots" = callPackage
@@ -132685,6 +141480,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Roots of two shifted Jacobi polynomials (Legendre and Radau) to double precision";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jaeger-flamegraph" = callPackage
@@ -132710,6 +141507,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Generate flamegraphs from Jaeger .json dumps.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jail" = callPackage
@@ -132725,6 +141524,8 @@ self: {
        ];
        description = "Jailed IO monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jailbreak-cabal" = callPackage
@@ -132752,6 +141553,8 @@ self: {
        benchmarkHaskellDepends = [ base deepseq time ];
        description = "Convert Jalaali and Gregorian calendar systems to each other";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jalla" = callPackage
@@ -132774,6 +141577,8 @@ self: {
        ];
        description = "Higher level functions for linear algebra. Wraps BLAS and LAPACKE.";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) blas; cblas = null; lapacke = null;};
 
   "jammittools" = callPackage
@@ -132839,6 +141644,8 @@ self: {
        ];
        description = "Tool for searching java classes, members and fields in classfiles and JAR archives";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jarify" = callPackage
@@ -132860,6 +141667,8 @@ self: {
        doHaddock = false;
        description = "Jarification of Haskell sources";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jason" = callPackage
@@ -132879,6 +141688,8 @@ self: {
        testHaskellDepends = [ aeson base bytestring text ];
        description = "A fast JASONETTE-iOS JSON combinator library for haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "java-adt" = callPackage
@@ -132918,6 +141729,8 @@ self: {
        ];
        description = "Bindings to the JNI and a high level interface generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "java-bridge-extras" = callPackage
@@ -132929,6 +141742,8 @@ self: {
        libraryHaskellDepends = [ base java-bridge transformers ];
        description = "Utilities for working with the java-bridge package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "java-character" = callPackage
@@ -132940,6 +141755,8 @@ self: {
        libraryHaskellDepends = [ base diet ];
        description = "Functions to simulate Java's Character class";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "java-poker" = callPackage
@@ -132965,6 +141782,8 @@ self: {
        libraryHaskellDepends = [ base containers hx java-bridge ];
        description = "Tools for reflecting on Java classes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "javaclass" = callPackage
@@ -133007,6 +141826,8 @@ self: {
        testHaskellDepends = [ aeson base scotty stm text time wai-extra ];
        description = "Remote Monad for JavaScript on the browser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "javascript-extras" = callPackage
@@ -133047,6 +141868,8 @@ self: {
        ];
        description = "A utility to print the SourceFile attribute of one or more Java class files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "javav" = callPackage
@@ -133063,6 +141886,8 @@ self: {
        ];
        description = "A utility to print the target version of Java class files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jbi" = callPackage
@@ -133084,6 +141909,8 @@ self: {
        ];
        description = "Just Build It - a \"do what I mean\" abstraction for Haskell build tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jcdecaux-vls" = callPackage
@@ -133099,6 +141926,8 @@ self: {
        ];
        description = "JCDecaux self-service bicycles API client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jdi" = callPackage
@@ -133117,6 +141946,8 @@ self: {
        executableHaskellDepends = [ base mtl network ];
        description = "Implementation of Java Debug Interface";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jenga" = callPackage
@@ -133138,6 +141969,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "Generate a cabal freeze file from a stack.yaml";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jenkinsPlugins2nix" = callPackage
@@ -133161,6 +141994,8 @@ self: {
        testHaskellDepends = [ base containers tasty-hspec text ];
        description = "Generate nix for Jenkins plugins";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jespresso" = callPackage
@@ -133190,6 +142025,8 @@ self: {
        ];
        description = "Extract all JavaScript from an HTML page and consolidate it in one script";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jinquantities" = callPackage
@@ -133212,6 +142049,8 @@ self: {
        ];
        description = "Unit conversion and manipulation library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jira-wiki-markup" = callPackage
@@ -133253,6 +142092,8 @@ self: {
        ];
        description = "QuasiQuotation library for programmatic generation of Javascript code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jmacro-rpc" = callPackage
@@ -133271,6 +142112,8 @@ self: {
        ];
        description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jmacro-rpc-happstack" = callPackage
@@ -133287,6 +142130,8 @@ self: {
        ];
        description = "Happstack backend for jmacro-rpc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jmacro-rpc-snap" = callPackage
@@ -133302,6 +142147,8 @@ self: {
        ];
        description = "Snap backend for jmacro-rpc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jml-web-service" = callPackage
@@ -133322,6 +142169,8 @@ self: {
        testHaskellDepends = [ base protolude tasty ];
        description = "Common utilities for running a web service";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jmonkey" = callPackage
@@ -133334,6 +142183,8 @@ self: {
        testHaskellDepends = [ base casing free jmacro ];
        description = "Jmonkey is very restricted but handy EDSL for JavaScript";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jni" = callPackage
@@ -133352,6 +142203,8 @@ self: {
        libraryToolDepends = [ cpphs ];
        description = "Complete JNI raw bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) jdk;};
 
   "jobqueue" = callPackage
@@ -133377,6 +142230,8 @@ self: {
        ];
        description = "A job queue library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jobs-ui" = callPackage
@@ -133397,6 +142252,8 @@ self: {
        ];
        description = "A library for creating a jobs management website running custom jobs";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "join" = callPackage
@@ -133409,6 +142266,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 multisetrewrite stm ];
        description = "Parallel Join Patterns with Guards and Propagation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "join-api" = callPackage
@@ -133422,6 +142281,8 @@ self: {
        ];
        description = "Bindings for Join push notifications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "joinlist" = callPackage
@@ -133433,6 +142294,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Join list - symmetric list type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "joint" = callPackage
@@ -133459,6 +142322,8 @@ self: {
        ];
        description = "An implementation of the Jonathan's Card API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jord" = callPackage
@@ -133560,6 +142425,8 @@ self: {
        ];
        description = "Tiny markdown notebook";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jpeg" = callPackage
@@ -133571,6 +142438,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A library for decoding JPEG files written in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jps" = callPackage
@@ -133619,6 +142488,8 @@ self: {
        libraryHaskellDepends = [ base wl-pprint ];
        description = "Javascript: The Good Parts -- AST & Pretty Printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "js-jquery" = callPackage
@@ -133698,6 +142569,8 @@ self: {
        executableHaskellDepends = [ base jsaddle lens text ];
        description = "JSaddle Hello World, an example package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jsaddle-warp" = callPackage
@@ -133724,6 +142597,8 @@ self: {
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jsaddle-webkit2gtk" = callPackage
@@ -133779,6 +142654,8 @@ self: {
        ];
        description = "Interface for JavaScript that works with GHCJS and GHC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jsc" = callPackage
@@ -133807,6 +142684,8 @@ self: {
        libraryHaskellDepends = [ base DOM mtl WebBits ];
        description = "Javascript Monadic Writer base package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json" = callPackage
@@ -133891,6 +142770,8 @@ self: {
        ];
        description = "Test that your (Aeson) JSON encoding matches your expectations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-ast" = callPackage
@@ -133923,6 +142804,8 @@ self: {
        ];
        description = "Encoders of JSON AST";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-ast-quickcheck" = callPackage
@@ -133937,6 +142820,8 @@ self: {
        ];
        description = "Compatibility layer for \"json-ast\" and \"QuickCheck\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-autotype" = callPackage
@@ -133970,7 +142855,8 @@ self: {
        ];
        description = "Automatic type declaration for JSON input data";
        license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-b" = callPackage
@@ -133993,6 +142879,8 @@ self: {
        ];
        description = "JSON parser that uses byte strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-builder" = callPackage
@@ -134011,6 +142899,8 @@ self: {
        ];
        description = "Data structure agnostic JSON serialization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-bytes-builder" = callPackage
@@ -134028,6 +142918,8 @@ self: {
        benchmarkHaskellDepends = [ aeson criterion rebase ];
        description = "Direct-to-bytes JSON Builder";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-directory" = callPackage
@@ -134046,6 +142938,8 @@ self: {
        executableHaskellDepends = [ aeson base bytestring ];
        description = "Load JSON from files in a directory structure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-encoder" = callPackage
@@ -134063,6 +142957,8 @@ self: {
        ];
        description = "A direct-to-bytes single-pass JSON encoder with a declarative DSL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-enumerator" = callPackage
@@ -134080,6 +142976,8 @@ self: {
        ];
        description = "Pure-Haskell utilities for dealing with JSON with the enumerator package. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-extra" = callPackage
@@ -134096,6 +142994,8 @@ self: {
        ];
        description = "Utility functions to extend Aeson";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-feed" = callPackage
@@ -134136,6 +143036,8 @@ self: {
        ];
        description = "Generic JSON serialization / deserialization";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-incremental-decoder" = callPackage
@@ -134160,6 +143062,8 @@ self: {
        ];
        description = "Incremental JSON parser with early termination and a declarative DSL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-litobj" = callPackage
@@ -134172,6 +143076,8 @@ self: {
        testHaskellDepends = [ base hspec json QuickCheck ];
        description = "Extends Text.JSON to handle literal JS objects.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-pointer" = callPackage
@@ -134216,6 +143122,8 @@ self: {
        ];
        description = "JSON Pointer extensions for Hasql";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-pointy" = callPackage
@@ -134256,6 +143164,8 @@ self: {
        libraryPkgconfigDepends = [ python ];
        description = "Call python inline from haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) python;};
 
   "json-qq" = callPackage
@@ -134331,6 +143241,8 @@ self: {
        ];
        description = "JSON-RPC 2.0 on the client side.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-rpc-generic" = callPackage
@@ -134400,6 +143312,8 @@ self: {
        ];
        description = "Types and type classes for defining JSON schemas";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-sop" = callPackage
@@ -134416,6 +143330,8 @@ self: {
        ];
        description = "Generics JSON (de)serialization using generics-sop";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-state" = callPackage
@@ -134496,6 +143412,8 @@ self: {
        ];
        description = "Effectful parsing of JSON documents";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-tokens" = callPackage
@@ -134523,6 +143441,8 @@ self: {
        ];
        description = "Tokenize JSON";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-tools" = callPackage
@@ -134565,6 +143485,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A polymorphic, type-safe, json-structured tracing library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json-types" = callPackage
@@ -134592,6 +143514,8 @@ self: {
        ];
        description = "Library provides support for JSON";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json2-hdbc" = callPackage
@@ -134607,6 +143531,8 @@ self: {
        ];
        description = "Support JSON for SQL Database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "json2-types" = callPackage
@@ -134646,6 +143572,8 @@ self: {
        ];
        description = "Serialising to and from JSON5";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jsonextfilter" = callPackage
@@ -134666,6 +143594,8 @@ self: {
        ];
        description = "Filter select values in JSON objects to unix programs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jsonpath" = callPackage
@@ -134702,6 +143632,8 @@ self: {
        ];
        description = "Parser and datatypes for the JSON Resume format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jsonrpc-conduit" = callPackage
@@ -134722,6 +143654,8 @@ self: {
        ];
        description = "JSON-RPC 2.0 server over a Conduit.";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jsons-to-schema" = callPackage
@@ -134753,6 +143687,8 @@ self: {
        ];
        description = "JSON to JSON Schema";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jsonschema-gen" = callPackage
@@ -134794,6 +143730,8 @@ self: {
        ];
        description = "Interpolate JSON object values into SQL strings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jsontsv" = callPackage
@@ -134814,6 +143752,8 @@ self: {
        ];
        description = "JSON to TSV transformer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jsonxlsx" = callPackage
@@ -134834,6 +143774,8 @@ self: {
        ];
        description = "json to xlsx converter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jspath" = callPackage
@@ -134849,6 +143791,8 @@ self: {
        ];
        description = "Extract substructures from JSON by following a path";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "juandelacosa" = callPackage
@@ -134873,6 +143817,8 @@ self: {
        ];
        description = "Manage users in MariaDB >= 10.1.1";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "judge" = callPackage
@@ -134899,6 +143845,8 @@ self: {
        ];
        description = "Tableau-based theorem prover for justification logic";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "judy" = callPackage
@@ -134914,6 +143862,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Fast, scalable, mutable dynamic arrays, maps and hashes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {Judy = null;};
 
   "juicy-draw" = callPackage
@@ -134948,6 +143898,8 @@ self: {
        ];
        description = "SVG to G-Code converter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jukebox" = callPackage
@@ -135035,6 +143987,8 @@ self: {
        ];
        description = "A library for creating and using Jupyter kernels";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "justified-containers" = callPackage
@@ -135072,6 +144026,8 @@ self: {
        ];
        description = "Call JVM methods from Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jvm-batching" = callPackage
@@ -135096,6 +144052,8 @@ self: {
        ];
        description = "Provides batched marshalling of values between Java and Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jvm-binary" = callPackage
@@ -135127,6 +144085,8 @@ self: {
        ];
        description = "A library for reading Java class-files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jvm-parser" = callPackage
@@ -135143,6 +144103,8 @@ self: {
        ];
        description = "A parser for JVM bytecode files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jvm-streaming" = callPackage
@@ -135165,6 +144127,8 @@ self: {
        ];
        description = "Expose Java iterators as streams from the streaming package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "jwt" = callPackage
@@ -135214,6 +144178,8 @@ self: {
        ];
        description = "An implementation of the Kademlia DHT Protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kafka" = callPackage
@@ -135244,6 +144210,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Low-level Haskell client library for Apache Kafka 0.7.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kafka-client-sync" = callPackage
@@ -135258,6 +144226,8 @@ self: {
        testHaskellDepends = [ base hw-kafka-client monad-parallel text ];
        description = "Synchronous Kafka Client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kafka-device" = callPackage
@@ -135278,6 +144248,8 @@ self: {
        ];
        description = "UI device events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kafka-device-glut" = callPackage
@@ -135292,6 +144264,8 @@ self: {
        executableHaskellDepends = [ base GLUT kafka-device OpenGL ];
        description = "GLUT events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kafka-device-joystick" = callPackage
@@ -135312,6 +144286,8 @@ self: {
        ];
        description = "Linux joystick events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kafka-device-leap" = callPackage
@@ -135330,6 +144306,8 @@ self: {
        ];
        description = "Leap Motion events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kafka-device-spacenav" = callPackage
@@ -135350,6 +144328,8 @@ self: {
        ];
        description = "Linux SpaceNavigator events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kafka-device-vrpn" = callPackage
@@ -135364,6 +144344,8 @@ self: {
        executableHaskellDepends = [ base kafka-device vrpn ];
        description = "VRPN events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kaleidoscope" = callPackage
@@ -135386,6 +144368,8 @@ self: {
        doHaddock = false;
        description = "Haskell Kaleidoscope tutorial";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kalman" = callPackage
@@ -135405,6 +144389,8 @@ self: {
        ];
        description = "Kalman and particle filters and smoothers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kan-extensions" = callPackage
@@ -135434,6 +144420,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Binary parsing with random access";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kanji" = callPackage
@@ -135501,6 +144489,8 @@ self: {
        ];
        description = "Kansas Lava is a hardware simulator and VHDL generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kansas-lava-cores" = callPackage
@@ -135520,6 +144510,8 @@ self: {
        ];
        description = "FPGA Cores Written in Kansas Lava";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kansas-lava-papilio" = callPackage
@@ -135538,6 +144530,8 @@ self: {
        ];
        description = "Kansas Lava support files for the Papilio FPGA board";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kansas-lava-shake" = callPackage
@@ -135554,6 +144548,8 @@ self: {
        ];
        description = "Shake rules for building Kansas Lava projects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "karakuri" = callPackage
@@ -135569,6 +144565,8 @@ self: {
        ];
        description = "Good stateful automata";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "karps" = callPackage
@@ -135596,6 +144594,8 @@ self: {
        ];
        description = "Haskell bindings for Spark Dataframes and Datasets";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "karver" = callPackage
@@ -135671,6 +144671,8 @@ self: {
        ];
        description = "Datadog scribe for the Katip logging framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "katip-elasticsearch" = callPackage
@@ -135702,6 +144704,8 @@ self: {
        ];
        description = "ElasticSearch scribe for the Katip logging framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "katip-kafka" = callPackage
@@ -135715,6 +144719,8 @@ self: {
        ];
        description = "Katip scribe to send logs to Kafka";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "katip-logzio" = callPackage
@@ -135757,6 +144763,8 @@ self: {
        ];
        description = "Katip scribe that logs to Rollbar";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "katip-scalyr-scribe" = callPackage
@@ -135775,6 +144783,8 @@ self: {
        ];
        description = "A katip scribe for logging to json";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "katip-syslog" = callPackage
@@ -135791,6 +144801,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Syslog Katip Scribe";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "katt" = callPackage
@@ -135812,6 +144824,8 @@ self: {
        testHaskellDepends = [ base bytestring directory mtl ];
        description = "Client for the Kattis judge system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "katydid" = callPackage
@@ -135845,6 +144859,8 @@ self: {
        ];
        description = "A haskell implementation of Katydid";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kawa" = callPackage
@@ -135891,6 +144907,8 @@ self: {
        ];
        description = "Utilities for serving static sites and blogs with Wai/Warp";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kawhi" = callPackage
@@ -135913,6 +144931,8 @@ self: {
        ];
        description = "stats.NBA.com library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kazura-queue" = callPackage
@@ -135982,6 +145002,8 @@ self: {
        ];
        description = "A simple k-d tree implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kdesrc-build-extra" = callPackage
@@ -136000,6 +145022,8 @@ self: {
        ];
        description = "Build profiles for kdesrc-build";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kdt" = callPackage
@@ -136044,6 +145068,8 @@ self: {
        ];
        description = "cryptographic functions based on the sponge construction";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keenser" = callPackage
@@ -136098,6 +145124,8 @@ self: {
        ];
        description = "Rapid Gtk Application Development - I18N";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-hails-mvc-controller" = callPackage
@@ -136125,6 +145153,8 @@ self: {
        ];
        description = "Haskell on Gtk rails - Gtk-based global environment for MVC applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-hails-mvc-model-lightmodel" = callPackage
@@ -136141,6 +145171,8 @@ self: {
        ];
        description = "Rapid Gtk Application Development - Reactive Protected Light Models";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-hails-mvc-model-protectedmodel" = callPackage
@@ -136157,6 +145189,8 @@ self: {
        ];
        description = "Rapid Gtk Application Development - Protected Reactive Models";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-hails-mvc-solutions-config" = callPackage
@@ -136189,6 +145223,8 @@ self: {
        ];
        description = "Haskell on Gtk rails - Common solutions to recurrent problems in Gtk applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-hails-mvc-view" = callPackage
@@ -136228,6 +145264,8 @@ self: {
        ];
        description = "Haskell on Rails - Files as Reactive Values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-hails-reactive-gtk" = callPackage
@@ -136244,6 +145282,8 @@ self: {
        ];
        description = "Haskell on Gtk rails - Reactive Fields for Gtk widgets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-hails-reactive-network" = callPackage
@@ -136259,6 +145299,8 @@ self: {
        ];
        description = "Haskell on Rails - Sockets as Reactive Values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-hails-reactive-polling" = callPackage
@@ -136273,6 +145315,8 @@ self: {
        ];
        description = "Haskell on Rails - Polling based Readable RVs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-hails-reactive-wx" = callPackage
@@ -136286,6 +145330,8 @@ self: {
        ];
        description = "Haskell on Rails - Reactive Fields for WX widgets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-hails-reactive-yampa" = callPackage
@@ -136301,6 +145347,8 @@ self: {
        ];
        description = "Haskell on Rails - FRP Yampa Signal Functions as RVs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-hails-reactivelenses" = callPackage
@@ -136312,6 +145360,8 @@ self: {
        libraryHaskellDepends = [ base keera-hails-reactivevalues lens ];
        description = "Reactive Haskell on Rails - Lenses applied to Reactive Values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-hails-reactivevalues" = callPackage
@@ -136330,6 +145380,8 @@ self: {
        ];
        description = "Haskell on Rails - Reactive Values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keera-posture" = callPackage
@@ -136409,6 +145461,8 @@ self: {
        ];
        description = "Manage and abstract your packer configurations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keter" = callPackage
@@ -136442,6 +145496,8 @@ self: {
        ];
        description = "Web application deployment manager, focusing on Haskell web frameworks";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kevin" = callPackage
@@ -136462,6 +145518,8 @@ self: {
        ];
        description = "a dAmn ↔ IRC proxy";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "key" = callPackage
@@ -136546,6 +145604,8 @@ self: {
        libraryHaskellDepends = [ base containers vector ];
        description = "Generic indexing for many data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keyring" = callPackage
@@ -136559,6 +145619,8 @@ self: {
        libraryHaskellDepends = [ base udbus ];
        description = "Keyring access";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keys" = callPackage
@@ -136606,6 +145668,8 @@ self: {
        ];
        description = "back up a secret key securely to the cloud";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keystore" = callPackage
@@ -136637,6 +145701,8 @@ self: {
        ];
        description = "Managing stores of secret things";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keyvaluehash" = callPackage
@@ -136653,6 +145719,8 @@ self: {
        ];
        description = "Pure Haskell key/value store implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "keyword-args" = callPackage
@@ -136674,6 +145742,8 @@ self: {
        ];
        description = "Extract data from a keyword-args config file format";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "khph" = callPackage
@@ -136693,6 +145763,8 @@ self: {
        ];
        description = "Command-line file tagging and organization tool";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kibro" = callPackage
@@ -136725,6 +145797,8 @@ self: {
        ];
        description = "Parser and writer for KiCad files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kickass-torrents-dump-parser" = callPackage
@@ -136742,6 +145816,8 @@ self: {
        ];
        description = "Parses kat.ph torrent dumps";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kickchan" = callPackage
@@ -136760,6 +145836,8 @@ self: {
        ];
        description = "Kick Channels: bounded channels with non-blocking writes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kif-parser" = callPackage
@@ -136778,6 +145856,8 @@ self: {
        ];
        description = "Process KIF iOS test logs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kind-apply" = callPackage
@@ -136847,6 +145927,8 @@ self: {
        ];
        description = "A dependency manager for Xcode (Objective-C) projects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kleene" = callPackage
@@ -136900,6 +145982,8 @@ self: {
        ];
        description = "Sequential and parallel implementations of Lloyd's algorithm";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kmeans-vector" = callPackage
@@ -136916,6 +146000,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion QuickCheck vector ];
        description = "An implementation of the kmeans clustering algorithm based on the vector package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kmp-dfa" = callPackage
@@ -136928,6 +146014,8 @@ self: {
        testHaskellDepends = [ array base QuickCheck ];
        description = "KMP algorithm implementation, based on Deterministic Finite State Automata";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "knead" = callPackage
@@ -136946,6 +146034,8 @@ self: {
        ];
        description = "Repa-like array processing using LLVM JIT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "knead-arithmetic" = callPackage
@@ -136959,6 +146049,8 @@ self: {
        ];
        description = "Linear algebra and interpolation using LLVM JIT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "knit-haskell" = callPackage
@@ -136990,6 +146082,8 @@ self: {
        ];
        description = "a minimal Rmarkdown sort-of-thing for haskell, by way of Pandoc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "knob" = callPackage
@@ -137019,6 +146113,8 @@ self: {
        executableHaskellDepends = [ base containers parallel ];
        description = "Khovanov homology computations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "koellner-phonetic" = callPackage
@@ -137032,6 +146128,8 @@ self: {
        doHaddock = false;
        description = "\"map German words to code representing pronunciation\"";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kontra-config" = callPackage
@@ -137048,6 +146146,8 @@ self: {
        ];
        description = "JSON config file parsing based on unjson";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kontrakcja-templates" = callPackage
@@ -137125,6 +146225,8 @@ self: {
        ];
        description = "The Korfu ORF Utility";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kqueue" = callPackage
@@ -137140,6 +146242,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A binding to the kqueue event library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kraken" = callPackage
@@ -137157,6 +146261,8 @@ self: {
        ];
        description = "Kraken.io API client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "krank" = callPackage
@@ -137205,6 +146311,8 @@ self: {
        ];
        description = "Haskell bindings for Spark Dataframes and Datasets";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "krpc" = callPackage
@@ -137230,6 +146338,8 @@ self: {
        ];
        description = "KRPC protocol implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ks-test" = callPackage
@@ -137241,6 +146351,8 @@ self: {
        libraryHaskellDepends = [ base gamma random-fu roots vector ];
        description = "Kolmogorov distribution and Kolmogorov-Smirnov test";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ksystools" = callPackage
@@ -137264,6 +146376,8 @@ self: {
        libraryPkgconfigDepends = [ egl glew ];
        description = "A binding for libktx from Khronos";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {egl = null; inherit (pkgs) glew;};
 
   "kubernetes-client" = callPackage
@@ -137291,6 +146405,8 @@ self: {
        ];
        description = "Client library for Kubernetes";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kubernetes-client-core" = callPackage
@@ -137320,6 +146436,8 @@ self: {
        ];
        description = "Auto-generated kubernetes-client-core API Client";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kubernetes-webhook-haskell" = callPackage
@@ -137347,6 +146465,8 @@ self: {
        libraryHaskellDepends = [ base boxes containers lens ];
        description = "A Quantitative Information Flow aware programming language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kure" = callPackage
@@ -137360,6 +146480,8 @@ self: {
        libraryHaskellDepends = [ base dlist transformers ];
        description = "Combinators for Strategic Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kure-your-boilerplate" = callPackage
@@ -137371,6 +146493,8 @@ self: {
        libraryHaskellDepends = [ base kure template-haskell ];
        description = "Generator for Boilerplate KURE Combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kurita" = callPackage
@@ -137403,6 +146527,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Find the alpha emoji";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "kyotocabinet" = callPackage
@@ -137427,6 +146553,8 @@ self: {
        librarySystemDepends = [ lbfgsb ];
        description = "Bindings to L-BFGS-B, Fortran code for limited-memory quasi-Newton bound-constrained optimization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {lbfgsb = null;};
 
   "l10n" = callPackage
@@ -137449,6 +146577,8 @@ self: {
        libraryHaskellDepends = [ base labeled-tree ];
        description = "Labeled graph structure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "labeled-tree" = callPackage
@@ -137494,6 +146624,8 @@ self: {
        ];
        description = "an experiment management framework";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "labsat" = callPackage
@@ -137517,6 +146649,8 @@ self: {
        ];
        description = "LabSat TCP Interface Wrapper";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "labyrinth" = callPackage
@@ -137538,6 +146672,8 @@ self: {
        ];
        description = "A complicated turn-based game";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "labyrinth-server" = callPackage
@@ -137571,6 +146707,8 @@ self: {
        ];
        description = "A complicated turn-based game - Web server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lackey" = callPackage
@@ -137614,6 +146752,8 @@ self: {
        ];
        description = "Solve Lagrange multiplier problems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "laika" = callPackage
@@ -137633,6 +146773,8 @@ self: {
        ];
        description = "Minimalistic type-checked compile-time template engine";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambda-ast" = callPackage
@@ -137658,6 +146800,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A bridge from Haskell (on a CPU) to VHDL on a FPGA";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambda-calculator" = callPackage
@@ -137677,6 +146821,8 @@ self: {
        testHaskellDepends = [ base containers hlint hspec HUnit ];
        description = "A lambda calculus interpreter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambda-calculus-interpreter" = callPackage
@@ -137703,6 +146849,8 @@ self: {
        libraryHaskellDepends = [ base GLUT mtl OpenGL time ];
        description = "Educational drawing canvas for FP explorers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambda-devs" = callPackage
@@ -137729,6 +146877,8 @@ self: {
        ];
        description = "a Paralell-DEVS implementaion based on distributed-process";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambda-options" = callPackage
@@ -137743,6 +146893,8 @@ self: {
        ];
        description = "Declarative command-line parser with type-driven pattern matching";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambda-placeholders" = callPackage
@@ -137783,6 +146935,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "An application to work with the lambda calculus (for learning)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambda2js" = callPackage
@@ -137796,6 +146950,8 @@ self: {
        executableHaskellDepends = [ base parsec ];
        description = "Untyped Lambda calculus to JavaScript compiler";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdaBase" = callPackage
@@ -137807,6 +146963,8 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base parsec ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdaFeed" = callPackage
@@ -137820,6 +146978,8 @@ self: {
        executableHaskellDepends = [ base haskell98 html ];
        description = "RSS 2.0 feed generator";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdaLit" = callPackage
@@ -137837,6 +146997,8 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdabot" = callPackage
@@ -137859,6 +147021,8 @@ self: {
        ];
        description = "Lambdabot is a development tool and advanced IRC bot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdabot-core" = callPackage
@@ -137886,6 +147050,8 @@ self: {
        ];
        description = "Lambdabot core functionality";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdabot-haskell-plugins" = callPackage
@@ -137911,6 +147077,8 @@ self: {
        ];
        description = "Lambdabot Haskell plugins";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdabot-irc-plugins" = callPackage
@@ -137928,6 +147096,8 @@ self: {
        ];
        description = "IRC plugins for lambdabot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdabot-misc-plugins" = callPackage
@@ -137949,6 +147119,8 @@ self: {
        ];
        description = "Lambdabot miscellaneous plugins";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdabot-novelty-plugins" = callPackage
@@ -137966,6 +147138,8 @@ self: {
        ];
        description = "Novelty plugins for Lambdabot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdabot-reference-plugins" = callPackage
@@ -137983,6 +147157,8 @@ self: {
        ];
        description = "Lambdabot reference plugins";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdabot-social-plugins" = callPackage
@@ -137998,6 +147174,8 @@ self: {
        ];
        description = "Social plugins for Lambdabot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdabot-trusted" = callPackage
@@ -138009,6 +147187,8 @@ self: {
        libraryHaskellDepends = [ base oeis QuickCheck QuickCheck-safe ];
        description = "Lambdabot trusted code";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdabot-utils" = callPackage
@@ -138029,6 +147209,8 @@ self: {
        ];
        description = "Utility libraries for the advanced IRC bot, Lambdabot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdabot-xmpp" = callPackage
@@ -138075,6 +147257,8 @@ self: {
        testHaskellDepends = [ base hspec HUnit text ];
        description = "Lambdabot for Zulip Chat";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdacat" = callPackage
@@ -138118,6 +147302,8 @@ self: {
        ];
        description = "LambdaCms 'core' subsite for Yesod apps";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdacms-media" = callPackage
@@ -138134,6 +147320,8 @@ self: {
        ];
        description = "LambdaCms \"media\" extension";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdacube" = callPackage
@@ -138147,6 +147335,8 @@ self: {
        executableHaskellDepends = [ base editline mtl pretty ];
        description = "A simple lambda cube type checker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdacube-bullet" = callPackage
@@ -138160,6 +147350,8 @@ self: {
        ];
        description = "Example for combining LambdaCube and Bullet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdacube-compiler" = callPackage
@@ -138184,6 +147376,8 @@ self: {
        ];
        description = "LambdaCube 3D is a DSL to program GPUs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdacube-core" = callPackage
@@ -138199,6 +147393,8 @@ self: {
        ];
        description = "LambdaCube 3D IR";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdacube-edsl" = callPackage
@@ -138215,6 +147411,8 @@ self: {
        ];
        description = "LambdaCube 3D EDSL definition";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdacube-engine" = callPackage
@@ -138234,6 +147432,8 @@ self: {
        ];
        description = "3D rendering engine written entirely in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdacube-examples" = callPackage
@@ -138250,6 +147450,8 @@ self: {
        ];
        description = "Examples for LambdaCube";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdacube-gl" = callPackage
@@ -138268,6 +147470,8 @@ self: {
        ];
        description = "OpenGL 3.3 Core Profile backend for LambdaCube 3D";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdacube-ir" = callPackage
@@ -138279,6 +147483,8 @@ self: {
        libraryHaskellDepends = [ aeson base containers mtl text vector ];
        description = "LambdaCube 3D intermediate representation of 3D graphics pipelines";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdacube-samples" = callPackage
@@ -138300,6 +147506,8 @@ self: {
        ];
        description = "Samples for LambdaCube 3D";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdatex" = callPackage
@@ -138320,6 +147528,8 @@ self: {
        ];
        description = "Type-Safe LaTeX EDSL";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdatwit" = callPackage
@@ -138345,6 +147555,8 @@ self: {
        ];
        description = "Lambdabot running as a twitter bot. Similar to the @fsibot f# bot.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdaya-bus" = callPackage
@@ -138358,6 +147570,8 @@ self: {
        ];
        description = "Fpga bus core and serialization for RedPitaya";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lambdiff" = callPackage
@@ -138375,6 +147589,8 @@ self: {
        ];
        description = "Diff Viewer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lame" = callPackage
@@ -138398,6 +147614,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Fairly complete high-level binding to LAME encoder";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {mp3lame = null;};
 
   "lame-tester" = callPackage
@@ -138414,6 +147632,8 @@ self: {
        testHaskellDepends = [ bizzlelude containers tasty tasty-hunit ];
        description = "A strange and unnecessary selective test-running library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lang" = callPackage
@@ -138425,6 +147645,8 @@ self: {
        libraryHaskellDepends = [ base bytestring http-streams Mapping ];
        description = "A Lisp";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-asn" = callPackage
@@ -138466,8 +147688,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-ats";
-       version = "1.7.7.2";
-       sha256 = "0pqkywscx7xzmqm4yvp2c0mfyx5dj9bahqq0y48dvicc3c2pdzkp";
+       version = "1.7.8.0";
+       sha256 = "0syr7jnwv7j1i6rz7sal8m1lggxzal30mksyjsmlxxs9ancfiy93";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array base composition-prelude containers deepseq
@@ -138498,14 +147720,14 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
-  "language-avro_0_1_1_0" = callPackage
+  "language-avro_0_1_2_0" = callPackage
     ({ mkDerivation, avro, base, containers, directory, filepath, hspec
      , hspec-megaparsec, megaparsec, text, vector
      }:
      mkDerivation {
        pname = "language-avro";
-       version = "0.1.1.0";
-       sha256 = "1q5qzas4j2swyripsjx9zf716kgwn3imricvz0jplwsgzm6cfy2k";
+       version = "0.1.2.0";
+       sha256 = "0cpkkp4v5sqrf6khkhmdvklmhcjc4c4rcfprd5c854vf1zq06hhl";
        libraryHaskellDepends = [
          avro base containers directory filepath megaparsec text vector
        ];
@@ -138533,6 +147755,8 @@ self: {
        ];
        description = "Parsing and pretty-printing Bash shell scripts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-boogie" = callPackage
@@ -138555,6 +147779,8 @@ self: {
        ];
        description = "Interpreter and language infrastructure for Boogie";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-c" = callPackage
@@ -138586,6 +147812,8 @@ self: {
        libraryToolDepends = [ alex ];
        description = "Extracting comments from C code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-c-inline" = callPackage
@@ -138602,6 +147830,8 @@ self: {
        ];
        description = "Inline C & Objective-C code in Haskell for language interoperability";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-c-quote" = callPackage
@@ -138695,6 +147925,8 @@ self: {
        ];
        description = "Conf parsers and pretty-printers for the Haskell programming language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-csharp" = callPackage
@@ -138709,6 +147941,8 @@ self: {
        libraryToolDepends = [ alex ];
        description = "C# source code manipulation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-css" = callPackage
@@ -138720,6 +147954,8 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        description = "CSS 2.1 syntax";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-dart" = callPackage
@@ -138732,6 +147968,8 @@ self: {
        testHaskellDepends = [ base hspec raw-strings-qq ];
        description = "Manipulating Dart source: abstract syntax and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-docker" = callPackage
@@ -138754,6 +147992,8 @@ self: {
        ];
        description = "Dockerfile parser, pretty-printer and embedded DSL";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-dockerfile" = callPackage
@@ -138782,6 +148022,8 @@ self: {
        ];
        description = "Dockerfile linter, parser, pretty-printer and embedded DSL";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-dot" = callPackage
@@ -138837,6 +148079,8 @@ self: {
        ];
        description = "JavaScript static analysis library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-eiffel" = callPackage
@@ -138855,6 +148099,8 @@ self: {
        libraryToolDepends = [ alex ];
        description = "Parser and pretty printer for the Eiffel language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-elm" = callPackage
@@ -138872,6 +148118,8 @@ self: {
        testToolDepends = [ doctest ];
        description = "Generate elm code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-fortran" = callPackage
@@ -138896,6 +148144,8 @@ self: {
        libraryHaskellDepends = [ base bifunctors parsers ];
        description = "Something similar to Dijkstra's guarded command language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-glsl" = callPackage
@@ -138928,6 +148178,8 @@ self: {
        libraryHaskellDepends = [ array base parsec utf8-string ];
        description = "A library for analysis and synthesis of Go code";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-guess" = callPackage
@@ -138940,6 +148192,8 @@ self: {
        libraryHaskellDepends = [ base bytestring cereal containers ];
        description = "Guess at which language a text is written in using trigrams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-haskell-extract" = callPackage
@@ -138975,6 +148229,8 @@ self: {
        ];
        description = "HCL parsers and pretty-printers for the Haskell programming language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-java" = callPackage
@@ -139011,6 +148267,8 @@ self: {
        ];
        description = "Parser for Java .class files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-javascript" = callPackage
@@ -139067,6 +148325,8 @@ self: {
        ];
        description = "Parser and serializer for the Kort information language";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-lua" = callPackage
@@ -139091,6 +148351,8 @@ self: {
        ];
        description = "Lua parser and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-lua-qq" = callPackage
@@ -139107,6 +148369,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-lua2" = callPackage
@@ -139132,6 +148396,8 @@ self: {
        ];
        description = "Lua parser and pretty printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-mixal" = callPackage
@@ -139146,6 +148412,8 @@ self: {
        executableHaskellDepends = [ base pretty ];
        description = "Parser, pretty-printer, and AST types for the MIXAL assembly language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-ninja" = callPackage
@@ -139184,6 +148452,8 @@ self: {
        ];
        description = "A library for dealing with the Ninja build language";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-nix" = callPackage
@@ -139229,6 +148499,8 @@ self: {
        ];
        description = "Parser, pretty-printer, and type checker for the Oberon programming language";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-objc" = callPackage
@@ -139246,6 +148518,8 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Analysis and generation of Objective C code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-ocaml" = callPackage
@@ -139271,6 +148545,8 @@ self: {
        ];
        description = "Language tools for manipulating OCaml programs in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "language-openscad" = callPackage
@@ -139287,6 +148563,8 @@ self: {
        executableHaskellDepends = [ attoparsec base bytestring ];
        description = "A simple parser for OpenSCAD";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-pig" = callPackage
@@ -139307,6 +148585,8 @@ self: {
        ];
        description = "Pig parser in haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-protobuf" = callPackage
@@ -139379,6 +148659,8 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Parsing and pretty printing of Python code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-python-colour" = callPackage
@@ -139394,6 +148676,8 @@ self: {
        ];
        description = "Generate coloured XHTML for Python code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-python-test" = callPackage
@@ -139407,6 +148691,8 @@ self: {
        executableHaskellDepends = [ base language-python ];
        description = "testing code for the language-python library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-qux" = callPackage
@@ -139423,6 +148709,8 @@ self: {
        ];
        description = "Utilities for working with the Qux language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-rust" = callPackage
@@ -139452,6 +148740,8 @@ self: {
        ];
        description = "Parsing and pretty printing of Rust code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-sally" = callPackage
@@ -139480,6 +148770,8 @@ self: {
        ];
        description = "A package for parsing shell scripts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-slice" = callPackage
@@ -139518,6 +148810,8 @@ self: {
        ];
        description = "Various tools to detect/correct mistakes in words";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-sqlite" = callPackage
@@ -139533,6 +148827,8 @@ self: {
        ];
        description = "Full parser and generator for SQL as implemented by SQLite3";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-sygus" = callPackage
@@ -139547,6 +148843,8 @@ self: {
        testHaskellDepends = [ base deepseq tasty tasty-hunit text ];
        description = "A parser and printer for the SyGuS 2.0 language.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-thrift" = callPackage
@@ -139569,6 +148867,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Parser and pretty printer for the Thrift IDL format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-typescript" = callPackage
@@ -139580,6 +148880,8 @@ self: {
        libraryHaskellDepends = [ base containers parsec pretty ];
        description = "A library for working with TypeScript Definition files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-vhdl" = callPackage
@@ -139591,6 +148893,8 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        description = "VHDL AST and pretty printer in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "language-webidl" = callPackage
@@ -139603,6 +148907,8 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Parser and Pretty Printer for WebIDL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "laop" = callPackage
@@ -139639,6 +148945,8 @@ self: {
        ];
        description = "Numerical Linear Algebra using LAPACK";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lapack-carray" = callPackage
@@ -139733,6 +149041,8 @@ self: {
        ];
        description = "Efficiently hash (large) Haskell values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "largeword" = callPackage
@@ -139769,6 +149079,8 @@ self: {
        ];
        description = "Tool to track security alerts on LWN";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "latest-npm-version" = callPackage
@@ -139799,6 +149111,8 @@ self: {
        ];
        description = "Find the latest version of a package on npm";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "latex" = callPackage
@@ -139828,6 +149142,8 @@ self: {
        ];
        description = "Use actual LaTeX to render formulae inside Hakyll pages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "latex-formulae-image" = callPackage
@@ -139867,6 +149183,8 @@ self: {
        ];
        description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX installation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "latex-function-tables" = callPackage
@@ -139904,35 +149222,11 @@ self: {
        ];
        description = "Automatically inline Haskell snippets into LaTeX documents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lattices" = callPackage
-    ({ mkDerivation, base, base-compat, containers, deepseq, hashable
-     , integer-logarithms, QuickCheck, quickcheck-instances
-     , semigroupoids, tagged, tasty, tasty-quickcheck, transformers
-     , universe-base, universe-reverse-instances, unordered-containers
-     }:
-     mkDerivation {
-       pname = "lattices";
-       version = "2.0.1";
-       sha256 = "0c7n7fh89llg8ijylwc14ikqrg077vcqcgph5h9nar6i5dyaprfy";
-       revision = "1";
-       editedCabalFile = "1zfxq1gpfv0vb7arw0hw2nf61hyjwl8c72jng4v61xywvqh9i36q";
-       libraryHaskellDepends = [
-         base base-compat containers deepseq hashable integer-logarithms
-         QuickCheck semigroupoids tagged transformers universe-base
-         universe-reverse-instances unordered-containers
-       ];
-       testHaskellDepends = [
-         base base-compat containers QuickCheck quickcheck-instances tasty
-         tasty-quickcheck transformers universe-base
-         universe-reverse-instances unordered-containers
-       ];
-       description = "Fine-grained library for constructing and manipulating lattices";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lattices_2_0_2" = callPackage
     ({ mkDerivation, base, base-compat, containers, deepseq, hashable
      , integer-logarithms, QuickCheck, quickcheck-instances
      , semigroupoids, tagged, tasty, tasty-quickcheck, transformers
@@ -139954,7 +149248,6 @@ self: {
        ];
        description = "Fine-grained library for constructing and manipulating lattices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "launchdarkly-server-sdk" = callPackage
@@ -139987,6 +149280,8 @@ self: {
        ];
        description = "Server-side SDK for integrating with LaunchDarkly";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "launchpad-control" = callPackage
@@ -140004,6 +149299,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "High and low-level interface to the Novation Launchpad midi controller";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lawful" = callPackage
@@ -140036,6 +149333,8 @@ self: {
        benchmarkHaskellDepends = [ base machines time ];
        description = "Concurrent networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lawz" = callPackage
@@ -140080,6 +149379,8 @@ self: {
        ];
        description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types.";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "layers" = callPackage
@@ -140091,6 +149392,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Modular type class machinery for monad transformer stacks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "layers-game" = callPackage
@@ -140110,6 +149413,8 @@ self: {
        ];
        description = "A prototypical 2d platform game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "layout" = callPackage
@@ -140121,6 +149426,8 @@ self: {
        libraryHaskellDepends = [ base convertible hinduce-missingh ];
        description = "Turn values into pretty text or markup";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "layout-bootstrap" = callPackage
@@ -140132,6 +149439,8 @@ self: {
        libraryHaskellDepends = [ base blaze-html containers text ];
        description = "Template and widgets for Bootstrap2 to use with Text.Blaze.Html5";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "layout-rules" = callPackage
@@ -140158,6 +149467,8 @@ self: {
        ];
        description = "General layouting library. Currently supports layouting 2D areas and can be used as a backend for text pretty printing or automatic windows layouting managers.";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lazy" = callPackage
@@ -140201,6 +149512,8 @@ self: {
        ];
        description = "Identifiers for not-yet-computed values";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lazy-hash-cache" = callPackage
@@ -140221,6 +149534,8 @@ self: {
        ];
        description = "Storing computed values for re-use when the same program runs again";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lazy-io" = callPackage
@@ -140245,6 +149560,8 @@ self: {
        libraryHaskellDepends = [ base bytestring io-streams ];
        description = "Get lazy with your io-streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lazy-priority-queue" = callPackage
@@ -140261,6 +149578,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Lazy-Spined Monadic Priority Queues";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lazy-search" = callPackage
@@ -140283,6 +149602,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Efficient implementation of lazy monolithic arrays (lazy in indexes)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lazyboy" = callPackage
@@ -140302,6 +149623,8 @@ self: {
        ];
        description = "An EDSL for programming the Game Boy";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lazyio" = callPackage
@@ -140332,6 +149655,8 @@ self: {
        ];
        description = "Set and Map from lazy/infinite lists";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lazysmallcheck" = callPackage
@@ -140402,6 +149727,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Data structures for representing arbitrary intervals";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lda" = callPackage
@@ -140417,6 +149744,8 @@ self: {
        ];
        description = "Online Latent Dirichlet Allocation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ldap-client" = callPackage
@@ -140435,6 +149764,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec process semigroups ];
        description = "Pure Haskell LDAP Client Library";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ldapply" = callPackage
@@ -140453,6 +149784,8 @@ self: {
        ];
        description = "LDIF idempotent apply tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ldif" = callPackage
@@ -140475,6 +149808,8 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "The LDAP Data Interchange Format (LDIF) tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "leaf" = callPackage
@@ -140493,6 +149828,8 @@ self: {
        ];
        description = "A simple portfolio generator";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "leaky" = callPackage
@@ -140511,6 +149848,8 @@ self: {
        ];
        description = "Robust space leak, and its strictification";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lean" = callPackage
@@ -140526,6 +149865,8 @@ self: {
        ];
        description = "Bonds to Lean theorem prover";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lean-peano" = callPackage
@@ -140625,6 +149966,8 @@ self: {
        ];
        description = "Use the Leanpub API via Wreq";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "leapseconds" = callPackage
@@ -140638,6 +149981,8 @@ self: {
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base tasty tasty-hunit time ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "leapseconds-announced" = callPackage
@@ -140661,6 +150006,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Learning Algorithms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "learn-physics" = callPackage
@@ -140698,6 +150045,8 @@ self: {
        ];
        description = "examples for learn-physics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "learning-hmm" = callPackage
@@ -140713,6 +150062,8 @@ self: {
        ];
        description = "Yet another library for hidden Markov models";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "leetify" = callPackage
@@ -140727,6 +150078,8 @@ self: {
        executableHaskellDepends = [ base containers ];
        description = "Leetify text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "left4deadrl" = callPackage
@@ -140761,6 +150114,8 @@ self: {
        ];
        description = "Distributed, stateful, homogeneous microservice framework";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "legion-discovery" = callPackage
@@ -140786,6 +150141,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A discovery service based on Legion";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "legion-discovery-client" = callPackage
@@ -140805,6 +150162,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Client library for communicating with legion-discovery";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "legion-extra" = callPackage
@@ -140826,6 +150185,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Extra non-essential utilities for building legion applications";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "leksah" = callPackage
@@ -140901,6 +150262,8 @@ self: {
        ];
        description = "Metadata collection for leksah";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lendingclub" = callPackage
@@ -140917,6 +150280,8 @@ self: {
        ];
        description = "Bindings for the LendingClub marketplace API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lens" = callPackage
@@ -141011,6 +150376,8 @@ self: {
        libraryHaskellDepends = [ accelerate base lens ];
        description = "Instances to mix lens with accelerate";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lens-action" = callPackage
@@ -141087,6 +150454,8 @@ self: {
        ];
        description = "Lenses, Folds and Traversals";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lens-csv" = callPackage
@@ -141206,6 +150575,8 @@ self: {
          base directory filepath hspec lens lens-action
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lens-labels_0_1_0_2" = callPackage
@@ -141218,6 +150589,7 @@ self: {
        description = "Integration of lenses with OverloadedLabels";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lens-labels" = callPackage
@@ -141229,6 +150601,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim profunctors tagged ];
        description = "Integration of lenses with OverloadedLabels";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lens-misc" = callPackage
@@ -141268,6 +150642,8 @@ self: {
        ];
        description = "Alternate prelude that exports lens combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lens-process" = callPackage
@@ -141278,6 +150654,8 @@ self: {
        pname = "lens-process";
        version = "0.3.0.1";
        sha256 = "05vznfn28a35k3qyjx28jva9d5acgzcdzn8s24mkb8mz1l8722d6";
+       revision = "1";
+       editedCabalFile = "1znsf836c0jar22ll6s01q8nb2zq8vgrz2nni0mkagx02fknshai";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base filepath lens process ];
        testHaskellDepends = [
@@ -141357,6 +150735,8 @@ self: {
        ];
        description = "simplified import of elementary lens-family combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lens-sop" = callPackage
@@ -141381,6 +150761,8 @@ self: {
        libraryHaskellDepends = [ base bytestring lens text ];
        description = "Isomorphisms and prisms for text <=> bytestring conversions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lens-time" = callPackage
@@ -141392,6 +150774,8 @@ self: {
        libraryHaskellDepends = [ base lens time ];
        description = "lens for Data.Time";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lens-toml-parser" = callPackage
@@ -141408,6 +150792,8 @@ self: {
        ];
        description = "Lenses for toml-parser";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lens-tutorial" = callPackage
@@ -141420,6 +150806,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Tutorial for the lens library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lens-typelevel" = callPackage
@@ -141431,6 +150819,8 @@ self: {
        libraryHaskellDepends = [ base singletons ];
        description = "Type-level lenses using singletons";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lens-utils" = callPackage
@@ -141447,6 +150837,8 @@ self: {
        ];
        description = "Collection of missing lens utilities";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lens-xml" = callPackage
@@ -141484,6 +150876,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "References which can be joined and on which lenses can be applied";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lentil" = callPackage
@@ -141510,6 +150904,8 @@ self: {
        ];
        description = "frugal issue tracker";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lenz" = callPackage
@@ -141574,6 +150970,8 @@ self: {
        libraryHaskellDepends = [ base fmlist ];
        description = "Non-Determinism Monad for Level-Wise Search";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "leveldb-haskell" = callPackage
@@ -141632,6 +151030,8 @@ self: {
        libraryHaskellDepends = [ base bindings-levmar hmatrix vector ];
        description = "An implementation of the Levenberg-Marquardt algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "levmar-chart" = callPackage
@@ -141645,6 +151045,8 @@ self: {
        libraryHaskellDepends = [ base Chart colour data-accessor levmar ];
        description = "Plots the results of the Levenberg-Marquardt algorithm in a chart";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lex-applicative" = callPackage
@@ -141664,6 +151066,8 @@ self: {
        benchmarkHaskellDepends = [ base gauge util ];
        description = "See README for more info";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lexer-applicative" = callPackage
@@ -141692,6 +151096,8 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "L-Fuzzy Set Theory implementation in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lgtk" = callPackage
@@ -141719,6 +151125,8 @@ self: {
        ];
        description = "Lens GUI Toolkit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lha" = callPackage
@@ -141730,6 +151138,8 @@ self: {
        libraryHaskellDepends = [ haskell2010 ];
        description = "Data structures for the Les Houches Accord";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lhae" = callPackage
@@ -141749,6 +151159,8 @@ self: {
        ];
        description = "Simple spreadsheet program";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lhc" = callPackage
@@ -141762,6 +151174,8 @@ self: {
        enableSeparateDataOutput = true;
        description = "LHC Haskell Compiler";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lhe" = callPackage
@@ -141773,6 +151187,8 @@ self: {
        libraryHaskellDepends = [ bytestring haskell2010 HaXml lha ];
        description = "Parser and writer for Les-Houches event files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lhs2TeX-hl" = callPackage
@@ -141791,6 +151207,8 @@ self: {
        ];
        description = "Literate highlighter preprocessor for lhs2tex";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lhs2html" = callPackage
@@ -141840,6 +151258,8 @@ self: {
        ];
        description = "Tool for using pdflatex with .lhs files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libGenI" = callPackage
@@ -141856,6 +151276,8 @@ self: {
        ];
        description = "A natural language generator (specifically, an FB-LTAG surface realiser)";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libarchive" = callPackage
@@ -141920,6 +151342,8 @@ self: {
        testHaskellDepends = [ base doctest doctest-prop lens ];
        description = "Haskell bindings to libconfig";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libconfig;};
 
   "libcspm" = callPackage
@@ -141940,6 +151364,8 @@ self: {
        ];
        description = "A library providing a parser, type checker and evaluator for CSPM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libexpect" = callPackage
@@ -141952,6 +151378,8 @@ self: {
        librarySystemDepends = [ expect tcl ];
        description = "Library for interacting with console applications via pseudoterminals";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) expect; inherit (pkgs) tcl;};
 
   "libffi" = callPackage
@@ -142028,6 +151456,8 @@ self: {
        ];
        description = "Backend for text editors to provide better Haskell editing support";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libinfluxdb" = callPackage
@@ -142046,6 +151476,8 @@ self: {
        ];
        description = "libinfluxdb";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libjenkins" = callPackage
@@ -142074,6 +151506,8 @@ self: {
        ];
        description = "Jenkins API interface";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "liblastfm" = callPackage
@@ -142100,6 +151534,8 @@ self: {
        ];
        description = "Lastfm API interface";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "liblawless" = callPackage
@@ -142135,6 +151571,8 @@ self: {
        ];
        description = "Prelude based on protolude for GHC 8 and beyond";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "liblinear-enumerator" = callPackage
@@ -142148,6 +151586,8 @@ self: {
        ];
        description = "liblinear iteratee";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libltdl" = callPackage
@@ -142161,6 +151601,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "FFI interface to libltdl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libmodbus" = callPackage
@@ -142173,6 +151615,8 @@ self: {
        librarySystemDepends = [ modbus ];
        description = "Haskell bindings to the C modbus library";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {modbus = null;};
 
   "libmolude" = callPackage
@@ -142205,6 +151649,8 @@ self: {
        ];
        description = "Prelude based on protolude for GHC 8 and beyond";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libmpd" = callPackage
@@ -142297,6 +151743,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Bindings to liboath";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {liboath = null; oath = null;};
 
   "liboleg" = callPackage
@@ -142312,6 +151760,8 @@ self: {
        ];
        description = "An evolving collection of Oleg Kiselyov's Haskell modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libpafe" = callPackage
@@ -142325,6 +151775,8 @@ self: {
        testHaskellDepends = [ base bytestring iconv transformers ];
        description = "Wrapper for libpafe";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {pafe = null;};
 
   "libpq" = callPackage
@@ -142337,6 +151789,8 @@ self: {
        librarySystemDepends = [ postgresql ];
        description = "libpq binding for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) postgresql;};
 
   "libraft" = callPackage
@@ -142388,6 +151842,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Raft consensus algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "librandomorg" = callPackage
@@ -142399,6 +151855,8 @@ self: {
        libraryHaskellDepends = [ base bytestring curl ];
        description = "Wrapper to Random.org API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "librato" = callPackage
@@ -142419,6 +151877,8 @@ self: {
        ];
        description = "Bindings to the Librato API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libravatar" = callPackage
@@ -142497,6 +151957,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libssh2;};
 
   "libssh2-conduit" = callPackage
@@ -142514,6 +151976,8 @@ self: {
        ];
        description = "Conduit wrappers for libssh2 FFI bindings (see libssh2 package)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libstackexchange" = callPackage
@@ -142551,6 +152015,8 @@ self: {
        ];
        description = "Haskell bindings for libsystemd-daemon";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {libsystemd-daemon = null; systemd-daemon = null;};
 
   "libsystemd-journal" = callPackage
@@ -142570,6 +152036,8 @@ self: {
        libraryPkgconfigDepends = [ systemd ];
        description = "Haskell bindings to libsystemd-journal";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) systemd;};
 
   "libtagc" = callPackage
@@ -142584,6 +152052,8 @@ self: {
        libraryPkgconfigDepends = [ taglib ];
        description = "Binding to TagLib C library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) taglib;};
 
   "libtelnet" = callPackage
@@ -142633,6 +152103,8 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Bindings to libxls";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libxml" = callPackage
@@ -142663,6 +152135,8 @@ self: {
        ];
        description = "Enumerator-based API for libXML's SAX interface";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "libxml-sax" = callPackage
@@ -142688,6 +152162,8 @@ self: {
        librarySystemDepends = [ xslt ];
        description = "Binding to libxslt";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {xslt = null;};
 
   "libyaml" = callPackage
@@ -142737,6 +152213,8 @@ self: {
        ];
        description = "A license compatibility helper";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lie" = callPackage
@@ -142751,6 +152229,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Lie Algebras";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "life" = callPackage
@@ -142792,6 +152272,8 @@ self: {
        ];
        testToolDepends = [ tasty-discover ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lift-generics" = callPackage
@@ -142887,6 +152369,8 @@ self: {
        ];
        description = "lifted IO operations from the base library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lifted-protolude" = callPackage
@@ -142904,6 +152388,8 @@ self: {
        ];
        description = "A sensible set of defaults for writing lifted custom Preludes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lifted-stm" = callPackage
@@ -142920,6 +152406,8 @@ self: {
        ];
        description = "STM operations lifted through monad transformer stacks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lifted-threads" = callPackage
@@ -142953,6 +152441,8 @@ self: {
        ];
        description = "A boulderdash-like game and solution validator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ligature" = callPackage
@@ -142964,6 +152454,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Expand ligatures in unicode text";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ligd" = callPackage
@@ -143010,6 +152502,8 @@ self: {
        ];
        description = "Haskell client for lightning-viz REST API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lightstep-haskell" = callPackage
@@ -143041,6 +152535,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "LightStep OpenTracing client library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lighttpd-conf" = callPackage
@@ -143057,6 +152553,8 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Lighttpd configuration file tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lighttpd-conf-qq" = callPackage
@@ -143073,6 +152571,8 @@ self: {
        ];
        description = "A QuasiQuoter for lighttpd configuration files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lilypond" = callPackage
@@ -143089,6 +152589,8 @@ self: {
        ];
        description = "Bindings to Lilypond";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "limp" = callPackage
@@ -143122,6 +152624,8 @@ self: {
        ];
        description = "bindings for integer linear programming solver Coin/CBC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lin-alg" = callPackage
@@ -143144,6 +152648,8 @@ self: {
        libraryHaskellDepends = [ base hmatrix HUnit ];
        description = "LINear Discriminant Analysis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linden" = callPackage
@@ -143173,6 +152679,8 @@ self: {
        ];
        description = "Zen gardening, based on l-systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lindenmayer" = callPackage
@@ -143241,6 +152749,8 @@ self: {
        ];
        description = "Haskell SDK for LINE Messaging API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "line-break" = callPackage
@@ -143371,6 +152881,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Lifting linear vector spaces into Accelerate";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linear-algebra-cblas" = callPackage
@@ -143391,6 +152903,8 @@ self: {
        ];
        description = "A linear algebra library with bindings to BLAS and LAPACK";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linear-circuit" = callPackage
@@ -143412,6 +152926,8 @@ self: {
        ];
        description = "Compute resistance of linear electrical circuits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linear-code" = callPackage
@@ -143437,6 +152953,8 @@ self: {
        ];
        description = "A simple library for linear codes (coding theory, error correction)";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linear-grammar" = callPackage
@@ -143463,6 +152981,8 @@ self: {
        libraryHaskellDepends = [ base containers HUnit ];
        description = "Finite maps for linear use";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linear-opengl" = callPackage
@@ -143478,6 +152998,8 @@ self: {
        ];
        description = "Isomorphisms between linear and OpenGL types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linear-socket" = callPackage
@@ -143501,6 +153023,8 @@ self: {
        libraryHaskellDepends = [ base random ];
        description = "A low-dimensional linear algebra library, operating on the Num typeclass";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linearEqSolver" = callPackage
@@ -143512,6 +153036,8 @@ self: {
        libraryHaskellDepends = [ base sbv ];
        description = "Use SMT solvers to solve linear systems over integers and rationals";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linearmap-category" = callPackage
@@ -143531,6 +153057,8 @@ self: {
        ];
        description = "Native, complete, matrix-free linear algebra";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linearscan" = callPackage
@@ -143544,6 +153072,8 @@ self: {
        ];
        description = "Linear scan register allocator, formally verified in Coq";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linearscan-hoopl" = callPackage
@@ -143564,6 +153094,8 @@ self: {
        ];
        description = "Makes it easy to use the linearscan register allocator with Hoopl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linebreak" = callPackage
@@ -143606,6 +153138,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl safe ];
        description = "Lines of Action, 2-player strategy board game";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lingo" = callPackage
@@ -143668,6 +153202,8 @@ self: {
        ];
        description = "linkchk is a network interface link ping monitor";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linkcore" = callPackage
@@ -143684,6 +153220,8 @@ self: {
        ];
        description = "Combines multiple GHC Core modules into a single module";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linked-list-with-iterator" = callPackage
@@ -143696,6 +153234,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A pure linked list which is mutable through iterators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linkedhashmap" = callPackage
@@ -143718,6 +153258,8 @@ self: {
        ];
        description = "Persistent LinkedHashMap data structure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linklater" = callPackage
@@ -143824,6 +153366,8 @@ self: {
        ];
        description = "Bindings to the Linode API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linode-v4" = callPackage
@@ -143840,6 +153384,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Haskell wrapper for the Linode v4 API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linux-blkid" = callPackage
@@ -143856,6 +153402,8 @@ self: {
        libraryPkgconfigDepends = [ blkid ];
        description = "Linux libblkid";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {blkid = null;};
 
   "linux-cgroup" = callPackage
@@ -143867,6 +153415,8 @@ self: {
        libraryHaskellDepends = [ base filepath ];
        description = "Very basic interface to the Linux CGroup Virtual Filesystem";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linux-evdev" = callPackage
@@ -143904,6 +153454,8 @@ self: {
        libraryHaskellDepends = [ base bytestring hashable unix ];
        description = "Thinner binding to the Linux Kernel's inotify interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linux-kmod" = callPackage
@@ -143916,6 +153468,8 @@ self: {
        libraryPkgconfigDepends = [ libkmod ];
        description = "Linux kernel modules support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {libkmod = null;};
 
   "linux-mount" = callPackage
@@ -143960,6 +153514,8 @@ self: {
        ];
        description = "Read files generated by perf on Linux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linux-ptrace" = callPackage
@@ -143977,6 +153533,8 @@ self: {
        ];
        description = "Wrapping of Linux' ptrace(2)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "linux-xattr" = callPackage
@@ -144008,6 +153566,8 @@ self: {
        ];
        description = "Implementation of the Enea LINX gateway protocol";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lio" = callPackage
@@ -144019,6 +153579,8 @@ self: {
        libraryHaskellDepends = [ base bytestring containers hashable ];
        description = "Labeled IO Information Flow Control Library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lio-eci11" = callPackage
@@ -144035,6 +153597,8 @@ self: {
        ];
        description = "Labeled IO library";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lio-fs" = callPackage
@@ -144051,6 +153615,8 @@ self: {
        description = "Labeled File System interface for LIO";
        license = "GPL";
        platforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lio-simple" = callPackage
@@ -144075,6 +153641,8 @@ self: {
        ];
        description = "LIO support for the Simple web framework";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lipsum-gen" = callPackage
@@ -144086,6 +153654,8 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Generators for random sequences of English-like nonsense text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "liquid" = callPackage
@@ -144110,6 +153680,8 @@ self: {
        benchmarkHaskellDepends = [ aeson attoparsec base criterion text ];
        description = "Liquid template language library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "liquid-fixpoint" = callPackage
@@ -144145,7 +153717,8 @@ self: {
        doCheck = false;
        description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver";
        license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) git; inherit (pkgs) nettools; 
          inherit (pkgs) ocaml; inherit (pkgs) z3;};
 
@@ -144184,7 +153757,8 @@ self: {
        testSystemDepends = [ z3 ];
        description = "Liquid Types for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) z3;};
 
   "liquidhaskell-cabal" = callPackage
@@ -144198,6 +153772,8 @@ self: {
        libraryHaskellDepends = [ base Cabal directory filepath ];
        description = "Liquid Haskell integration for Cabal and Stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "liquidhaskell-cabal-demo" = callPackage
@@ -144248,6 +153824,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "testing list fusion for success";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "list-grouping" = callPackage
@@ -144270,6 +153848,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "List Multiplexing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "list-prompt" = callPackage
@@ -144290,6 +153870,8 @@ self: {
        ];
        description = "A simple list prompt UI for the terminal";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "list-remote-forwards" = callPackage
@@ -144316,6 +153898,8 @@ self: {
        ];
        description = "List all remote forwards for mail accounts stored in a SQL database";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "list-singleton" = callPackage
@@ -144343,6 +153927,8 @@ self: {
        testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
        description = "ListT done right";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "list-t-attoparsec" = callPackage
@@ -144361,6 +153947,8 @@ self: {
        ];
        description = "An \"attoparsec\" adapter for \"list-t\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "list-t-html-parser" = callPackage
@@ -144384,6 +153972,8 @@ self: {
        ];
        description = "Streaming HTML parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "list-t-http-client" = callPackage
@@ -144399,6 +153989,8 @@ self: {
        ];
        description = "A streaming HTTP client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "list-t-libcurl" = callPackage
@@ -144415,6 +154007,8 @@ self: {
        ];
        description = "A \"libcurl\"-based streaming HTTP client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "list-t-text" = callPackage
@@ -144434,6 +154028,8 @@ self: {
        ];
        description = "A streaming text codec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "list-transformer" = callPackage
@@ -144464,6 +154060,8 @@ self: {
        ];
        description = "Tries and Patricia tries: finite sets and maps for list keys";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "list-tuple" = callPackage
@@ -144483,6 +154081,8 @@ self: {
        ];
        description = "List-like operations for tuples";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "list-witnesses" = callPackage
@@ -144510,6 +154110,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Provides zips with default values";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "list-zipper" = callPackage
@@ -144532,6 +154134,8 @@ self: {
        ];
        description = "A list zipper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "listenbrainz-client" = callPackage
@@ -144549,6 +154153,8 @@ self: {
        ];
        description = "A client library to the ListenBrainz project";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "listlike-instances" = callPackage
@@ -144560,6 +154166,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ListLike text vector ];
        description = "Extra instances of the ListLike class";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lists" = callPackage
@@ -144617,6 +154225,8 @@ self: {
        ];
        description = "Append only key-list database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lit" = callPackage
@@ -144636,6 +154246,8 @@ self: {
        ];
        description = "A simple tool for literate programming";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "literals" = callPackage
@@ -144647,6 +154259,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Non-overloaded functions for concrete literals";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "live-sequencer" = callPackage
@@ -144674,6 +154288,8 @@ self: {
        ];
        description = "Live coding of MIDI music";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "liveplot" = callPackage
@@ -144709,6 +154325,8 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ picosat ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) picosat;};
 
   "llrbtree" = callPackage
@@ -144740,6 +154358,8 @@ self: {
        ];
        description = "An implementation of the LLSD data system";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm" = callPackage
@@ -144756,6 +154376,8 @@ self: {
        ];
        description = "Bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-analysis" = callPackage
@@ -144783,6 +154405,8 @@ self: {
        ];
        description = "A Haskell library for analyzing LLVM bitcode";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-base" = callPackage
@@ -144794,6 +154418,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "FFI bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-base-types" = callPackage
@@ -144814,6 +154440,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "The base types for a mostly pure Haskell LLVM analysis library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-base-util" = callPackage
@@ -144825,6 +154453,8 @@ self: {
        libraryHaskellDepends = [ base llvm-base ];
        description = "Utilities for bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-data-interop" = callPackage
@@ -144845,6 +154475,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A low-level data interoperability binding for LLVM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-extension" = callPackage
@@ -144863,6 +154495,8 @@ self: {
        ];
        description = "Processor specific intrinsics for the llvm interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-extra" = callPackage
@@ -144884,6 +154518,8 @@ self: {
        doHaddock = false;
        description = "Utility functions for the llvm interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-ffi" = callPackage
@@ -144898,6 +154534,8 @@ self: {
        librarySystemDepends = [ LLVM ];
        description = "FFI bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {LLVM = null;};
 
   "llvm-ffi-tools" = callPackage
@@ -144915,6 +154553,8 @@ self: {
        ];
        description = "Tools for maintaining the llvm-ffi package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-general" = callPackage
@@ -144941,6 +154581,8 @@ self: {
        ];
        description = "General purpose LLVM bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {llvm-config = null;};
 
   "llvm-general-pure" = callPackage
@@ -144961,6 +154603,8 @@ self: {
        ];
        description = "Pure Haskell LLVM functionality (no FFI)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-general-quote" = callPackage
@@ -144984,6 +154628,8 @@ self: {
        ];
        description = "QuasiQuoting llvm code for llvm-general";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-hs" = callPackage
@@ -145010,6 +154656,8 @@ self: {
        ];
        description = "General purpose LLVM bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {llvm-config = null;};
 
   "llvm-hs-pretty" = callPackage
@@ -145030,6 +154678,8 @@ self: {
        ];
        description = "A pretty printer for LLVM IR";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-hs-pure" = callPackage
@@ -145065,6 +154715,8 @@ self: {
        ];
        description = "Bindings to the LLVM compiler toolkit with some custom extensions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-pkg-config" = callPackage
@@ -145083,6 +154735,8 @@ self: {
        ];
        description = "Generate Pkg-Config configuration file for LLVM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-pretty" = callPackage
@@ -145094,6 +154748,8 @@ self: {
        libraryHaskellDepends = [ base containers monadLib parsec pretty ];
        description = "A pretty printing library inspired by the llvm binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-pretty-bc-parser" = callPackage
@@ -145120,6 +154776,8 @@ self: {
        ];
        description = "LLVM bitcode parsing library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-tf" = callPackage
@@ -145139,6 +154797,8 @@ self: {
        ];
        description = "Bindings to the LLVM compiler toolkit using type families";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "llvm-tools" = callPackage
@@ -145166,6 +154826,8 @@ self: {
        ];
        description = "Useful tools built on llvm-analysis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lmdb" = callPackage
@@ -145235,6 +154897,8 @@ self: {
        ];
        description = "LMonad is an Information Flow Control (IFC) framework for Haskell applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lmonad-yesod" = callPackage
@@ -145255,6 +154919,8 @@ self: {
        ];
        description = "LMonad for Yesod integrates LMonad's IFC with Yesod web applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "load-balancing" = callPackage
@@ -145266,6 +154932,8 @@ self: {
        libraryHaskellDepends = [ base containers hslogger PSQueue stm ];
        description = "Client-side load balancing utilities";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "load-env" = callPackage
@@ -145298,6 +154966,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A cross platform library for loading bundled fonts into your application";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "loadavg" = callPackage
@@ -145321,6 +154991,8 @@ self: {
        testHaskellDepends = [ base containers doctest hedgehog ];
        description = "Types representing line and column positions and ranges in text files";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "loc-test" = callPackage
@@ -145332,6 +155004,8 @@ self: {
        libraryHaskellDepends = [ base containers hedgehog loc ];
        description = "Test-related utilities related to the /loc/ package";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "local-address" = callPackage
@@ -145343,6 +155017,8 @@ self: {
        libraryHaskellDepends = [ base network ];
        description = "Functions to get local interface address";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "local-search" = callPackage
@@ -145359,6 +155035,8 @@ self: {
        ];
        description = "Generalised local search within Haskell, for applications in combinatorial optimisation";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "localization" = callPackage
@@ -145388,6 +155066,8 @@ self: {
        ];
        description = "GNU Gettext-based messages localization library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "located" = callPackage
@@ -145399,6 +155079,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Source location helpers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "located-base" = callPackage
@@ -145423,6 +155105,8 @@ self: {
        libraryHaskellDepends = [ base monad-logger text ];
        description = "Location-aware logging without Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "locators" = callPackage
@@ -145453,6 +155137,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Support for precise error locations in source files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "loch-th" = callPackage
@@ -145505,6 +155191,8 @@ self: {
        ];
        description = "Very simple poll lock";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lockfree-queue" = callPackage
@@ -145562,6 +155250,8 @@ self: {
        ];
        description = "Structured logging solution with multiple backends";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "log-base" = callPackage
@@ -145661,6 +155351,8 @@ self: {
        ];
        description = "Structured logging solution (Elasticsearch back end)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "log-postgres" = callPackage
@@ -145682,6 +155374,8 @@ self: {
        ];
        description = "Structured logging solution (PostgreSQL back end)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "log-utils" = callPackage
@@ -145704,6 +155398,8 @@ self: {
        ];
        description = "Utils for working with logs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "log-warper" = callPackage
@@ -145739,6 +155435,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Flexible, configurable, monadic and pretty logging";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "log2json" = callPackage
@@ -145752,6 +155450,8 @@ self: {
        executableHaskellDepends = [ base containers json parsec ];
        description = "Turn log file records into JSON";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "log4hs" = callPackage
@@ -145801,6 +155501,8 @@ self: {
        ];
        description = "Request logger middleware for Logentries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "logfloat" = callPackage
@@ -145829,6 +155531,8 @@ self: {
        ];
        description = "Fast & extensible logging framework";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "logger-thread" = callPackage
@@ -145907,6 +155611,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Supplemental packages for `logging-effect`";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "logging-effect-extra-file" = callPackage
@@ -145925,6 +155631,8 @@ self: {
        executableHaskellDepends = [ base logging-effect prettyprinter ];
        description = "TH splices to augment log messages with file info";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "logging-effect-extra-handler" = callPackage
@@ -145943,6 +155651,8 @@ self: {
        executableHaskellDepends = [ base logging-effect prettyprinter ];
        description = "Handy logging handler combinators";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "logging-facade" = callPackage
@@ -145974,6 +155684,8 @@ self: {
        ];
        description = "Journald back-end for logging-facade";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "logging-facade-syslog" = callPackage
@@ -145995,8 +155707,8 @@ self: {
      }:
      mkDerivation {
        pname = "logic-TPTP";
-       version = "0.4.7.0";
-       sha256 = "1xl9cq85myhfci40dzifd9dhn2mv234m4rbaxiyfbv2ldg81f5mk";
+       version = "0.5.0.0";
+       sha256 = "0sqzf332c7zdwkdi1346dxljrdammiz1vc332j85487nb0ypnxwi";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -146031,6 +155743,8 @@ self: {
        ];
        description = "Framework for propositional and first order logic, theorem proving";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "logicst" = callPackage
@@ -146042,6 +155756,8 @@ self: {
        libraryHaskellDepends = [ base logict transformers ];
        description = "Backtracking mutable references in the ST and IO monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "logict" = callPackage
@@ -146065,6 +155781,8 @@ self: {
        libraryHaskellDepends = [ base logict mtl transformers ];
        description = "Library for logic programming based on haskell package logict";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "loglevel" = callPackage
@@ -146089,6 +155807,8 @@ self: {
        testHaskellDepends = [ base hspec time ];
        description = "Parse Heroku application/logplex documents";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "logsink" = callPackage
@@ -146123,6 +155843,8 @@ self: {
        executableHaskellDepends = [ haskell98 ];
        description = "Useful utilities for the Lojban language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lojbanParser" = callPackage
@@ -146137,6 +155859,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "lojban parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lojbanXiragan" = callPackage
@@ -146151,6 +155875,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "lojban to xiragan";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lojysamban" = callPackage
@@ -146164,6 +155890,8 @@ self: {
        executableHaskellDepends = [ base lojbanParser yjtools ];
        description = "Prolog with lojban";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lol" = callPackage
@@ -146192,6 +155920,8 @@ self: {
        testHaskellDepends = [ base test-framework ];
        description = "A library for lattice cryptography";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lol-apps" = callPackage
@@ -146212,6 +155942,8 @@ self: {
        ];
        description = "Lattice-based cryptographic applications using <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lol-benches" = callPackage
@@ -146228,6 +155960,8 @@ self: {
        ];
        description = "A library for benchmarking <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lol-calculus" = callPackage
@@ -146249,6 +155983,8 @@ self: {
        ];
        description = "Calculus for LOL (λω language)";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lol-cpp" = callPackage
@@ -146268,6 +156004,8 @@ self: {
        benchmarkHaskellDepends = [ base DRBG lol lol-apps MonadRandom ];
        description = "A fast C++ backend for <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lol-repa" = callPackage
@@ -146287,6 +156025,8 @@ self: {
        benchmarkHaskellDepends = [ base DRBG lol lol-benches ];
        description = "A repa backend for <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lol-tests" = callPackage
@@ -146306,6 +156046,8 @@ self: {
        testHaskellDepends = [ base lol test-framework ];
        description = "A library for testing <https://hackage.haskell.org/package/lol Λ ∘ λ>.";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lol-typing" = callPackage
@@ -146330,6 +156072,8 @@ self: {
        ];
        description = "Type inferencer for LOL (λω language)";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "loli" = callPackage
@@ -146347,6 +156091,8 @@ self: {
        ];
        description = "A minimum web dev DSL in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "long-double" = callPackage
@@ -146371,6 +156117,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Dependently-typed linked list implementation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lookup-tables" = callPackage
@@ -146385,6 +156133,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Statically generate lookup tables using Template Haskell";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "loop" = callPackage
@@ -146412,6 +156162,8 @@ self: {
        libraryHaskellDepends = [ base effin ];
        description = "control-monad-loop port for effin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "loop-while" = callPackage
@@ -146423,6 +156175,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformer supporting various styles of while loop";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "loopbreaker" = callPackage
@@ -146457,6 +156211,8 @@ self: {
          aeson base hspec optparse-applicative text time unliftio
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "loops" = callPackage
@@ -146474,6 +156230,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion transformers vector ];
        description = "Fast imperative-style loops";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "loopy" = callPackage
@@ -146492,6 +156250,8 @@ self: {
        ];
        description = "Find all biological feedback loops within an ecosystem graph";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lord" = callPackage
@@ -146532,6 +156292,8 @@ self: {
        ];
        description = "A command line interface to online radios";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lorem" = callPackage
@@ -146546,6 +156308,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Library for generating filler text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lorentz" = callPackage
@@ -146577,6 +156341,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "EDSL for the Michelson Language";
        license = stdenv.lib.licenses.agpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "loris" = callPackage
@@ -146590,6 +156356,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "interface to Loris API";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {loris = null;};
 
   "loshadka" = callPackage
@@ -146608,6 +156376,8 @@ self: {
        ];
        description = "Minecraft 1.7 server proxy that answers to queries when the server is offline";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lostcities" = callPackage
@@ -146625,6 +156395,8 @@ self: {
        ];
        description = "An implementation of an adictive two-player card game";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "louis" = callPackage
@@ -146658,6 +156430,8 @@ self: {
        executableHaskellDepends = [ base optparse-generic shakers ];
        description = "Amazon Simple Workflow Service Wrapper for Work Pools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lowgl" = callPackage
@@ -146669,6 +156443,8 @@ self: {
        libraryHaskellDepends = [ base gl linear vector ];
        description = "Basic gl wrapper and reference";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lp-diagrams" = callPackage
@@ -146687,6 +156463,8 @@ self: {
        ];
        description = "An EDSL for diagrams based based on linear constraints";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lp-diagrams-svg" = callPackage
@@ -146706,6 +156484,8 @@ self: {
        ];
        description = "SVG Backend for lp-diagrams";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lrucache" = callPackage
@@ -146755,6 +156535,8 @@ self: {
        ];
        description = "List USB devices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lscabal" = callPackage
@@ -146772,6 +156554,8 @@ self: {
        ];
        description = "List exported modules from a set of .cabal files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lsp-test" = callPackage
@@ -146797,6 +156581,8 @@ self: {
        ];
        description = "Functional test framework for LSP servers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lss" = callPackage
@@ -146834,6 +156620,8 @@ self: {
        ];
        description = "Paint an L-System Grammar";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ltext" = callPackage
@@ -146865,6 +156653,8 @@ self: {
        ];
        description = "Parameterized file evaluator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ltiv1p1" = callPackage
@@ -146904,6 +156694,8 @@ self: {
        libraryPkgconfigDepends = [ gtk3 ];
        description = "Leksah tool kit";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk3;};
 
   "ltl" = callPackage
@@ -146933,6 +156725,8 @@ self: {
        ];
        description = "Lua bytecode parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lua-bytecode" = callPackage
@@ -146965,6 +156759,8 @@ self: {
        ];
        description = "Library functions for reading and writing Lua chunks";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "luautils" = callPackage
@@ -146986,6 +156782,8 @@ self: {
        ];
        description = "Helpers for Haskell integration with Lua";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lub" = callPackage
@@ -147031,6 +156829,8 @@ self: {
        libraryHaskellDepends = [ base colonnade lucid text ];
        description = "Helper functions for using lucid with colonnade";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lucid-extras" = callPackage
@@ -147097,6 +156897,8 @@ self: {
        ];
        description = "Server side feed aggregator/reader";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "luhn" = callPackage
@@ -147108,6 +156910,8 @@ self: {
        libraryHaskellDepends = [ base digits QuickCheck ];
        description = "An implementation of Luhn's check digit algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lui" = callPackage
@@ -147123,6 +156927,8 @@ self: {
        ];
        description = "Purely FunctionaL User Interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "luis-client" = callPackage
@@ -147137,6 +156943,8 @@ self: {
        ];
        description = "An unofficial client for the LUIS NLP service";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "luka" = callPackage
@@ -147150,6 +156958,8 @@ self: {
        librarySystemDepends = [ objc ];
        description = "Simple ObjectiveC runtime binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {objc = null;};
 
   "lukko" = callPackage
@@ -147204,6 +157014,8 @@ self: {
        ];
        description = "Type-safe, type-level and stateless graphics framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "luminance-samples" = callPackage
@@ -147222,6 +157034,8 @@ self: {
        ];
        description = "Luminance samples";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lushtags" = callPackage
@@ -147235,6 +157049,8 @@ self: {
        executableHaskellDepends = [ base haskell-src-exts text vector ];
        description = "Create ctags compatible tags files for Haskell programs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "luthor" = callPackage
@@ -147247,6 +157063,8 @@ self: {
        testHaskellDepends = [ base mtl parsec ];
        description = "Tools for lexing and utilizing lexemes that integrate with Parsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lvish" = callPackage
@@ -147274,6 +157092,8 @@ self: {
        ];
        description = "Parallel scheduler, LVar data structures, and infrastructure to build more";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lvmlib" = callPackage
@@ -147296,6 +157116,8 @@ self: {
        ];
        description = "The Lazy Virtual Machine (LVM)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lvmrun" = callPackage
@@ -147319,6 +157141,8 @@ self: {
        libraryHaskellDepends = [ base bindings-lxc mtl transformers ];
        description = "High level Haskell bindings to LXC (Linux containers)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lxd-client" = callPackage
@@ -147348,6 +157172,8 @@ self: {
        ];
        description = "LXD client written in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lxd-client-config" = callPackage
@@ -147385,6 +157211,8 @@ self: {
        ];
        description = "A Lilypond-compiling music box";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lz4" = callPackage
@@ -147418,6 +157246,8 @@ self: {
        ];
        description = "Bindings to LZ4";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lz4-conduit" = callPackage
@@ -147441,6 +157271,8 @@ self: {
        ];
        description = "LZ4 compression for conduits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "lzip" = callPackage
@@ -147544,6 +157376,8 @@ self: {
        ];
        description = "Enumerator interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) lzma;};
 
   "lzma-streams" = callPackage
@@ -147564,6 +157398,8 @@ self: {
        ];
        description = "IO-Streams interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mDNSResponder-client" = callPackage
@@ -147580,6 +157416,8 @@ self: {
        testHaskellDepends = [ base bytestring Cabal ];
        description = "Library for talking to the mDNSResponder daemon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "maam" = callPackage
@@ -147596,6 +157434,8 @@ self: {
        ];
        description = "Monadic Abstracting Abstract Machines (MAAM) built on Galois Transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mac" = callPackage
@@ -147607,6 +157447,8 @@ self: {
        libraryHaskellDepends = [ base network transformers ];
        description = "Static Mandatory Access Control in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "macbeth-lib" = callPackage
@@ -147632,6 +157474,8 @@ self: {
        testHaskellDepends = [ attoparsec base bytestring hspec ];
        description = "Macbeth - A beautiful and minimalistic FICS client";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "maccatcher" = callPackage
@@ -147663,6 +157507,8 @@ self: {
        ];
        description = "Arrow based stream transducers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "machines" = callPackage
@@ -147708,6 +157554,8 @@ self: {
        ];
        description = "Machine transducers for Amazonka calls";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "machines-attoparsec" = callPackage
@@ -147739,6 +157587,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring machines ];
        description = "Binary utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "machines-bytestring" = callPackage
@@ -147750,6 +157600,8 @@ self: {
        libraryHaskellDepends = [ base bytestring machines ];
        description = "ByteString support for machines";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "machines-directory" = callPackage
@@ -147765,6 +157617,8 @@ self: {
        ];
        description = "Directory (system) utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "machines-encoding" = callPackage
@@ -147776,6 +157630,8 @@ self: {
        libraryHaskellDepends = [ base bytestring machines text ];
        description = "Transcode encodings with machines";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "machines-io" = callPackage
@@ -147791,6 +157647,8 @@ self: {
        ];
        description = "IO utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "machines-process" = callPackage
@@ -147805,6 +157663,8 @@ self: {
        ];
        description = "Process (system) utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "machines-zlib" = callPackage
@@ -147819,6 +157679,8 @@ self: {
        ];
        description = "Decompression support for machines";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "macho" = callPackage
@@ -147831,6 +157693,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring ];
        description = "Parser for Mach-O object format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mackerel-client" = callPackage
@@ -147878,6 +157742,8 @@ self: {
        ];
        description = "Control screen and keyboard backlights on MACs under Linux";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "macos-corelibs" = callPackage
@@ -147893,6 +157759,8 @@ self: {
        ];
        description = "Haskell bindings to C-based Mac OS SDK frameworks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "macosx-make-standalone" = callPackage
@@ -147912,6 +157780,8 @@ self: {
        ];
        description = "Make a macosx app standalone deployable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mad-props" = callPackage
@@ -147964,6 +157834,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion megaparsec text ];
        description = "Randomized templating language DSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mage" = callPackage
@@ -147979,6 +157851,8 @@ self: {
        executableSystemDepends = [ ncurses ];
        description = "Rogue-like";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ncurses;};
 
   "magic" = callPackage
@@ -148002,6 +157876,8 @@ self: {
        libraryHaskellDepends = [ base ghc ghc-tcplugins-extra syb ];
        description = "Write plugins for magic type families with ease";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "magic-wormhole" = callPackage
@@ -148032,6 +157908,8 @@ self: {
        ];
        description = "Interact with Magic Wormhole";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "magicbane" = callPackage
@@ -148062,6 +157940,8 @@ self: {
        ];
        description = "A web framework that integrates Servant, RIO, EKG, fast-logger, wai-cli…";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "magico" = callPackage
@@ -148079,6 +157959,8 @@ self: {
        ];
        description = "Compute solutions for Magico puzzle";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "magma" = callPackage
@@ -148090,6 +157972,8 @@ self: {
        libraryHaskellDepends = [ base deepseq profunctors semigroups ];
        description = "magma is an algebraic structure consisting a set together with an binary operation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "magmas" = callPackage
@@ -148121,6 +158005,8 @@ self: {
        ];
        description = "ImageBoards to XMPP gate";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "maid" = callPackage
@@ -148142,6 +158028,8 @@ self: {
        ];
        description = "A simple static web server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mail-pool" = callPackage
@@ -148164,6 +158052,8 @@ self: {
        ];
        description = "Preconfigured email connection pool on top of smtp";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mailbox-count" = callPackage
@@ -148188,6 +158078,8 @@ self: {
        ];
        description = "Count mailboxes in a SQL database";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mailchimp" = callPackage
@@ -148206,6 +158098,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Bindings for the MailChimp API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mailchimp-subscribe" = callPackage
@@ -148224,6 +158118,8 @@ self: {
        ];
        description = "MailChimp subscription request handler";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mailgun" = callPackage
@@ -148243,6 +158139,8 @@ self: {
        ];
        description = "API binding for Mailgun";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "main-tester" = callPackage
@@ -148306,6 +158204,8 @@ self: {
        ];
        description = "Majordomo protocol for ZeroMQ";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "majority" = callPackage
@@ -148317,6 +158217,8 @@ self: {
        libraryHaskellDepends = [ haskell2010 ];
        description = "Boyer-Moore Majority Vote Algorithm";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "make-hard-links" = callPackage
@@ -148334,6 +158236,8 @@ self: {
        ];
        description = "Change duplicated files into hard-links";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "make-monofoldable-foldable" = callPackage
@@ -148345,6 +158249,8 @@ self: {
        libraryHaskellDepends = [ base mono-traversable ];
        description = "Make a MonoFoldable type into an ordinary Foldable type";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "make-package" = callPackage
@@ -148365,6 +158271,8 @@ self: {
        ];
        description = "Make a cabalized package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "makedo" = callPackage
@@ -148376,6 +158284,8 @@ self: {
        libraryHaskellDepends = [ base directory filepath HSH process ];
        description = "Helper for writing redo scripts in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "makefile" = callPackage
@@ -148393,6 +158303,8 @@ self: {
        ];
        description = "Simple Makefile parser and generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mallard" = callPackage
@@ -148420,6 +158332,8 @@ self: {
        ];
        description = "Database migration and testing as a library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mameya" = callPackage
@@ -148466,6 +158380,8 @@ self: {
        ];
        description = "The Haskell/Gtk+ Integrated Live Environment";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manatee-all" = callPackage
@@ -148512,6 +158428,8 @@ self: {
        ];
        description = "Multithread interactive input/search framework for Manatee";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manatee-browser" = callPackage
@@ -148555,6 +158473,8 @@ self: {
        ];
        description = "The core of Manatee";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manatee-curl" = callPackage
@@ -148577,6 +158497,8 @@ self: {
        ];
        description = "Download Manager extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manatee-editor" = callPackage
@@ -148597,6 +158519,8 @@ self: {
        ];
        description = "Editor extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manatee-filemanager" = callPackage
@@ -148617,6 +158541,8 @@ self: {
        ];
        description = "File manager extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manatee-imageviewer" = callPackage
@@ -148637,6 +158563,8 @@ self: {
        ];
        description = "Image viewer extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manatee-ircclient" = callPackage
@@ -148661,6 +158589,8 @@ self: {
        ];
        description = "IRC client extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manatee-mplayer" = callPackage
@@ -148682,6 +158612,8 @@ self: {
        ];
        description = "Mplayer client extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manatee-pdfviewer" = callPackage
@@ -148702,6 +158634,8 @@ self: {
        ];
        description = "PDF viewer extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manatee-processmanager" = callPackage
@@ -148721,6 +158655,8 @@ self: {
        ];
        description = "Process manager extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manatee-reader" = callPackage
@@ -148761,6 +158697,8 @@ self: {
        ];
        description = "Template code to create Manatee application";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manatee-terminal" = callPackage
@@ -148780,6 +158718,8 @@ self: {
        ];
        description = "Terminal Emulator extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manatee-welcome" = callPackage
@@ -148799,6 +158739,8 @@ self: {
        ];
        description = "Welcome module to help user play Manatee quickly";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mancala" = callPackage
@@ -148854,6 +158796,8 @@ self: {
        ];
        description = "A zooming visualisation of the Mandelbrot Set as many Julia Sets";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mangopay" = callPackage
@@ -148892,6 +158836,8 @@ self: {
        ];
        description = "Bindings to the MangoPay API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manifold-random" = callPackage
@@ -148908,6 +158854,8 @@ self: {
        ];
        description = "Sampling random points on general manifolds";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manifolds" = callPackage
@@ -148937,6 +158885,8 @@ self: {
        ];
        description = "Coordinate-free hypersurfaces";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "manifolds-core" = callPackage
@@ -148978,6 +158928,8 @@ self: {
        executableHaskellDepends = [ base bytestring cassava containers ];
        description = "Extensions to Data.Map";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "map-reduce-folds" = callPackage
@@ -149043,6 +158995,8 @@ self: {
        ];
        description = "Efficient, polymorphic Map Algebra";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mappy" = callPackage
@@ -149065,6 +159019,8 @@ self: {
        testHaskellDepends = [ base containers hspec parsec QuickCheck ];
        description = "A functional programming language focused around maps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mapquest-api" = callPackage
@@ -149124,6 +159080,8 @@ self: {
        ];
        description = "A study of marionetta movements";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "markdown" = callPackage
@@ -149169,6 +159127,8 @@ self: {
        ];
        description = "Convert Markdown to HTML, with XSS protection";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "markdown-pap" = callPackage
@@ -149180,6 +159140,8 @@ self: {
        libraryHaskellDepends = [ base monads-tf papillon ];
        description = "markdown parser with papillon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "markdown-unlit" = callPackage
@@ -149218,6 +159180,8 @@ self: {
        ];
        description = "markdown to svg converter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "marked-pretty" = callPackage
@@ -149230,6 +159194,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Pretty-printing library, with scoping, based on pretty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "markov" = callPackage
@@ -149285,6 +159251,8 @@ self: {
        testHaskellDepends = [ assertions base bifunctors memoize random ];
        description = "Hidden Markov processes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "markov-realization" = callPackage
@@ -149297,6 +159265,8 @@ self: {
        testHaskellDepends = [ base HTF ];
        description = "Realizations of Markov chains";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "markup" = callPackage
@@ -149315,6 +159285,8 @@ self: {
        ];
        description = "Abstraction for HTML-embedded content";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "markup-preview" = callPackage
@@ -149363,6 +159335,8 @@ self: {
        ];
        description = "Upload packages to Marmalade";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "marquise" = callPackage
@@ -149397,6 +159371,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec ];
        description = "Client library for Vaultaire";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mars" = callPackage
@@ -149412,6 +159388,8 @@ self: {
        ];
        description = "Generates mountainous terrain using a random walk algorithm";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "marshal-contt" = callPackage
@@ -149459,6 +159437,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "A framework for modular, portable chat bots";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "marvin-interpolate" = callPackage
@@ -149475,6 +159455,8 @@ self: {
        testHaskellDepends = [ base hspec text ];
        description = "Compile time string interpolation a la Scala and CoffeeScript";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "marxup" = callPackage
@@ -149498,6 +159480,8 @@ self: {
        ];
        description = "Markup language preprocessor for Haskell";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "masakazu-bot" = callPackage
@@ -149520,6 +159504,8 @@ self: {
        ];
        description = "@minamiyama1994_bot on haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mason" = callPackage
@@ -149695,6 +159681,8 @@ self: {
        ];
        description = "The project management tool for hackers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mastermind" = callPackage
@@ -149724,6 +159712,8 @@ self: {
        testHaskellDepends = [ base containers doctest hspec ];
        description = "A type class for Matchable Functors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "matchable-th" = callPackage
@@ -149742,6 +159732,8 @@ self: {
        testHaskellDepends = [ base containers matchable ];
        description = "Generates Matchable instances using TemplateHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "matcher" = callPackage
@@ -149769,6 +159761,8 @@ self: {
        librarySystemDepends = [ pcre ];
        description = "Text matchers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) pcre;};
 
   "math-functions" = callPackage
@@ -149806,6 +159800,8 @@ self: {
        testHaskellDepends = [ array base containers hspec random ];
        description = "Library containing graph data structures and graph algorithms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "math-interpolate" = callPackage
@@ -149817,6 +159813,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Class for interpolation of values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "math-metric" = callPackage
@@ -149828,6 +159826,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Typeclass for metric spaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mathblog" = callPackage
@@ -149854,6 +159854,8 @@ self: {
        ];
        description = "A program for creating and managing a static weblog with LaTeX math and diagrams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mathexpr" = callPackage
@@ -149884,6 +159886,8 @@ self: {
        ];
        description = "Dependently typed tensorflow modeler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mathgenealogy" = callPackage
@@ -149926,6 +159930,8 @@ self: {
        testHaskellDepends = [ base hspec parsec ];
        description = "A small programming language for numerical computing";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mathlink" = callPackage
@@ -149942,6 +159948,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Write Mathematica packages in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "matlab" = callPackage
@@ -150028,6 +160036,8 @@ self: {
        ];
        description = "Read and Display representation of matrix like \"x,y,z\"";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "matrix-market" = callPackage
@@ -150039,6 +160049,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Read and write NIST Matrix Market files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "matrix-market-attoparsec" = callPackage
@@ -150127,6 +160139,8 @@ self: {
        ];
        description = "ncurses XMPP client";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "matterhorn" = callPackage
@@ -150227,6 +160241,8 @@ self: {
        ];
        description = "An interface to the Maude rewriting system";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "maxent" = callPackage
@@ -150248,6 +160264,8 @@ self: {
        ];
        description = "Compute Maximum Entropy Distributions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "maxent-learner-hw" = callPackage
@@ -150271,6 +160289,8 @@ self: {
        ];
        description = "Hayes and Wilson's maxent learning algorithm for phonotactic grammars";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "maxent-learner-hw-gui" = callPackage
@@ -150292,6 +160312,8 @@ self: {
        ];
        description = "GUI for maxent-learner-hw";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "maximal-cliques" = callPackage
@@ -150324,6 +160346,8 @@ self: {
        ];
        description = "Maximal sharing of terms in the lambda calculus with letrec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "maybe-justify" = callPackage
@@ -150354,6 +160378,8 @@ self: {
        ];
        description = "Automated benchmarking tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mbox" = callPackage
@@ -150385,6 +160411,8 @@ self: {
        ];
        description = "A collection of tools to process mbox files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mbox-utility" = callPackage
@@ -150421,6 +160449,8 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Haskell MBTiles client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mbug" = callPackage
@@ -150446,6 +160476,8 @@ self: {
        ];
        description = "download bugs mailboxes";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mcl" = callPackage
@@ -150472,6 +160504,8 @@ self: {
        ];
        description = "Bindings to mcl, a generic and fast pairing-based cryptography library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gmpxx; mcl = null; inherit (pkgs) openssl;};
 
   "mcm" = callPackage
@@ -150491,6 +160525,8 @@ self: {
        ];
        description = "Machine Configuration Manager";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mcmaster-gloss-examples" = callPackage
@@ -150503,6 +160539,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base gloss ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mcmc-samplers" = callPackage
@@ -150518,6 +160556,8 @@ self: {
        ];
        description = "Combinators for MCMC sampling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mcmc-synthesis" = callPackage
@@ -150529,6 +160569,8 @@ self: {
        libraryHaskellDepends = [ base MonadRandom ];
        description = "MCMC applied to probabilistic program synthesis";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mcmc-types" = callPackage
@@ -150556,6 +160598,8 @@ self: {
        executableHaskellDepends = [ base transformers ];
        description = "Connect to MineCraft running on a Raspberry PI";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mdapi" = callPackage
@@ -150574,6 +160618,8 @@ self: {
        ];
        description = "Haskell interface to Fedora's mdapi";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mdcat" = callPackage
@@ -150593,6 +160639,8 @@ self: {
        ];
        description = "Markdown viewer in your terminal";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mdo" = callPackage
@@ -150622,6 +160670,8 @@ self: {
        testHaskellDepends = [ base HTF HUnit QuickCheck vector ];
        description = "Tools for solving Markov Decision Processes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mealstrom" = callPackage
@@ -150643,6 +160693,8 @@ self: {
        ];
        description = "Manipulate FSMs and store them in PostgreSQL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "means" = callPackage
@@ -150666,6 +160718,8 @@ self: {
        librarySystemDepends = [ mecab ];
        description = "A Haskell binding to MeCab";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) mecab;};
 
   "mech" = callPackage
@@ -150677,6 +160731,8 @@ self: {
        libraryHaskellDepends = [ base machines ];
        description = "mecha are the most complex composite machines known to humanity, lets build them well!";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mecha" = callPackage
@@ -150701,6 +160757,8 @@ self: {
        libraryHaskellDepends = [ base machines ];
        description = "mecha are the most complex composite machines known to humanity, lets build them well!";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "med-module" = callPackage
@@ -150748,6 +160806,8 @@ self: {
        ];
        description = "Multimedia streaming on top of Conduit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mediabus-fdk-aac" = callPackage
@@ -150775,6 +160835,8 @@ self: {
        ];
        description = "Mediabus plugin for the Frauenhofer ISO-14496-3 AAC FDK";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {fdk-aac = null;};
 
   "mediabus-rtp" = callPackage
@@ -150812,6 +160874,8 @@ self: {
        ];
        description = "Receive and Send RTP Packets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "median-stream" = callPackage
@@ -150842,6 +160906,8 @@ self: {
        ];
        description = "Interfacing with the MediaWiki API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mediawiki2latex" = callPackage
@@ -150885,6 +160951,8 @@ self: {
        ];
        description = "Haskell SDK for communicating with the Medium API";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "meep" = callPackage
@@ -150923,6 +160991,8 @@ self: {
        ];
        description = "Handles uploading to Hackage from mega repos";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "megaparsec" = callPackage
@@ -151000,6 +161070,8 @@ self: {
        ];
        description = "Control physical access devices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mellon-gpio" = callPackage
@@ -151011,6 +161083,8 @@ self: {
        libraryHaskellDepends = [ base hpio mellon-core protolude ];
        description = "GPIO support for mellon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mellon-web" = callPackage
@@ -151052,6 +161126,8 @@ self: {
        ];
        description = "A REST web service for Mellon controllers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "melody" = callPackage
@@ -151073,6 +161149,8 @@ self: {
        ];
        description = "A functional scripting language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "membership" = callPackage
@@ -151124,6 +161202,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "A memcached client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "memcache-conduit" = callPackage
@@ -151143,6 +161223,8 @@ self: {
        ];
        description = "Conduit library for memcache procotol";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "memcache-haskell" = callPackage
@@ -151165,6 +161247,8 @@ self: {
        ];
        description = "Memcache procotol library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "memcached" = callPackage
@@ -151199,6 +161283,8 @@ self: {
        ];
        description = "memcached client using binary protocol";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "memdb" = callPackage
@@ -151264,6 +161350,8 @@ self: {
        ];
        description = "Memis Efficient Manual Image Sorting";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "memo-ptr" = callPackage
@@ -151275,6 +161363,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Pointer equality memoization";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "memo-sqlite" = callPackage
@@ -151302,6 +161392,8 @@ self: {
        testHaskellDepends = [ base hspec time time-units ];
        description = "Utilities for memoizing functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "memoize" = callPackage
@@ -151375,6 +161467,8 @@ self: {
        ];
        description = "basic memory pool outside of haskell heap/GC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "memscript" = callPackage
@@ -151416,6 +161510,8 @@ self: {
        ];
        description = "Haskell binding for Menoh DNN inference library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {menoh = null;};
 
   "menshen" = callPackage
@@ -151434,6 +161530,8 @@ self: {
        ];
        description = "Data Validation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mercury-api" = callPackage
@@ -151557,6 +161655,8 @@ self: {
        ];
        description = "A modified Merkle Patricia DB";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "merkle-tree" = callPackage
@@ -151639,6 +161739,8 @@ self: {
        ];
        description = "Message Pack RPC over TCP";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "messente" = callPackage
@@ -151652,6 +161754,8 @@ self: {
        ];
        description = "Messente SMS Gateway";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "meta-misc" = callPackage
@@ -151663,6 +161767,8 @@ self: {
        libraryHaskellDepends = [ base loch-th template-haskell ];
        description = "Utility library providing miscellaneous meta-programming utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "meta-par" = callPackage
@@ -151679,6 +161785,8 @@ self: {
        ];
        description = "Provides the monad-par interface, but based on modular scheduler \"mix-ins\"";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "meta-par-accelerate" = callPackage
@@ -151696,6 +161804,8 @@ self: {
        ];
        description = "Support for integrated Accelerate computations within Meta-par";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "metadata" = callPackage
@@ -151707,6 +161817,8 @@ self: {
        libraryHaskellDepends = [ base text time ];
        description = "metadata library for semantic web";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "metaheuristics" = callPackage
@@ -151718,6 +161830,8 @@ self: {
        libraryHaskellDepends = [ arrows base random Stream ];
        description = "Generalised local search within Haskell, for applications in combinatorial optimisation";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "metamorphic" = callPackage
@@ -151741,6 +161855,8 @@ self: {
        libraryHaskellDepends = [ base Cabal filepath ghc haskell98 ];
        description = "a tiny ghc api wrapper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "metar" = callPackage
@@ -151766,6 +161882,8 @@ self: {
        ];
        description = "Australian METAR";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "metar-http" = callPackage
@@ -151790,6 +161908,8 @@ self: {
        ];
        description = "HTTP for METAR";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "metric" = callPackage
@@ -151808,6 +161928,8 @@ self: {
        ];
        description = "Metric spaces";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "metrics" = callPackage
@@ -151841,6 +161963,8 @@ self: {
        libraryHaskellDepends = [ base network ];
        description = "Client for the metrics aggregator Metricsd";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "metronome" = callPackage
@@ -151854,6 +161978,8 @@ self: {
        ];
        description = "Time Synchronized execution";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mezzo" = callPackage
@@ -151874,6 +162000,8 @@ self: {
        ];
        description = "Typesafe music composition";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mezzolens" = callPackage
@@ -151885,6 +162013,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl transformers ];
        description = "Pure Profunctor Functional Lenses";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mfsolve" = callPackage
@@ -151914,6 +162044,8 @@ self: {
        ];
        description = "Generics with multiple parameters";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mi" = callPackage
@@ -151929,6 +162061,8 @@ self: {
        ];
        description = "Multiple Instance for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "miconix-test" = callPackage
@@ -151944,6 +162078,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "micro-recursion-schemes" = callPackage
@@ -151961,6 +162097,8 @@ self: {
        testHaskellDepends = [ base HUnit template-haskell ];
        description = "Simple recursion schemes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "microaeson" = callPackage
@@ -151984,6 +162122,8 @@ self: {
        ];
        description = "A tiny JSON library with light dependency footprint";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "microbench" = callPackage
@@ -152046,6 +162186,8 @@ self: {
        ];
        description = "A Microformats 2 parser";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "microformats2-types" = callPackage
@@ -152061,6 +162203,8 @@ self: {
        ];
        description = "Microformats 2 types (with Aeson instances)";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "microgroove" = callPackage
@@ -152072,6 +162216,8 @@ self: {
        libraryHaskellDepends = [ base primitive vector ];
        description = "Array-backed extensible records";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "microlens" = callPackage
@@ -152126,6 +162272,8 @@ self: {
        libraryHaskellDepends = [ base microlens ];
        description = "'each' for microlens";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "microlens-ghc" = callPackage
@@ -152182,8 +162330,8 @@ self: {
        pname = "microlens-process";
        version = "0.2.0.1";
        sha256 = "0grnqs0b76la48ql6amrjnqfkgcb0rcq3s2xqs2czjg2jgp3zw5r";
-       revision = "2";
-       editedCabalFile = "0jy50p09axr5gwkhc2qnlragpzvy3s6b947s7r3354ya2byli4dz";
+       revision = "3";
+       editedCabalFile = "01p3glv58jhiw6znjba247r6d6b63illnjfx26yxlqk2bhib90ap";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base filepath microlens process ];
        testHaskellDepends = [ base doctest microlens process ];
@@ -152223,6 +162371,8 @@ self: {
        testHaskellDepends = [ aeson base hspec text ];
        description = "A super simple logging module";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "microsoft-translator" = callPackage
@@ -152240,6 +162390,8 @@ self: {
        ];
        description = "Bindings to the Microsoft Translator API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "microspec" = callPackage
@@ -152315,6 +162467,8 @@ self: {
        ];
        description = "Language for algorithmic generation of MIDI files";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "midair" = callPackage
@@ -152381,6 +162535,8 @@ self: {
        ];
        description = "Convert MIDI file to music box punch tape";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "midi-simple" = callPackage
@@ -152432,6 +162588,8 @@ self: {
        ];
        description = "Utilities for working with MIDI data";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "midimory" = callPackage
@@ -152451,6 +162609,8 @@ self: {
        ];
        description = "A Memory-like (Concentration, Pairs, ...) game for tones";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "midisurface" = callPackage
@@ -152468,6 +162628,8 @@ self: {
        ];
        description = "A control midi surface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mighttpd" = callPackage
@@ -152488,6 +162650,8 @@ self: {
        ];
        description = "Simple Web Server in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mighttpd2" = callPackage
@@ -152537,6 +162701,8 @@ self: {
        testHaskellDepends = [ base containers mwc-probability ];
        description = "The Metropolis algorithm";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mikmod" = callPackage
@@ -152550,6 +162716,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "MikMod bindings";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mikrokosmos" = callPackage
@@ -152575,6 +162743,8 @@ self: {
        ];
        description = "Lambda calculus interpreter";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "miku" = callPackage
@@ -152591,6 +162761,8 @@ self: {
        ];
        description = "A minimum web dev DSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "milena" = callPackage
@@ -152614,6 +162786,8 @@ self: {
        ];
        description = "A Kafka client for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mime" = callPackage
@@ -152642,6 +162816,8 @@ self: {
        ];
        description = "A library for parsing/printing the text/directory mime type";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mime-mail" = callPackage
@@ -152723,6 +162899,8 @@ self: {
        ];
        description = "Double-ended priority queues";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "minecraft" = callPackage
@@ -152752,6 +162930,8 @@ self: {
        ];
        description = "a DSL for generating minecraft commands and levels";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mines" = callPackage
@@ -152786,6 +162966,8 @@ self: {
        ];
        description = "Minesweeper game which is always solvable without guessing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mini-egison" = callPackage
@@ -152838,6 +163020,8 @@ self: {
        ];
        description = "Miniature FORTH-like interpreter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "minilens" = callPackage
@@ -152853,6 +163037,8 @@ self: {
        ];
        description = "A minimalistic lens library, providing only the simplest, most basic lens functionality";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "minilight" = callPackage
@@ -152884,6 +163070,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A SDL2-based graphics library, batteries-included";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "minimal-configuration" = callPackage
@@ -152925,6 +163113,8 @@ self: {
        executableHaskellDepends = [ base GLUT haskell98 unix ];
        description = "Shows how to run grabber on Mac OS X";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "minio-hs" = callPackage
@@ -152977,6 +163167,8 @@ self: {
        ];
        description = "A fast parallel ssh tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "minioperational" = callPackage
@@ -152993,6 +163185,8 @@ self: {
        ];
        description = "fast and simple operational monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "miniplex" = callPackage
@@ -153009,6 +163203,8 @@ self: {
        ];
        description = "simple 1-to-N interprocess communication";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "minirotate" = callPackage
@@ -153028,6 +163224,8 @@ self: {
        ];
        description = "Minimalistic file rotation utility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "minisat" = callPackage
@@ -153069,6 +163267,8 @@ self: {
        ];
        description = "an interpreter for an operational semantics for the STG machine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "minitypeset-opengl" = callPackage
@@ -153127,6 +163327,8 @@ self: {
        testHaskellDepends = [ base binary directory hspec vector ];
        description = "Read and write IDX data that is used in e.g. the MINST database.";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mintty" = callPackage
@@ -153161,6 +163363,8 @@ self: {
        ];
        description = "A Minisat-based CDCL SAT solver in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mirror-tweet" = callPackage
@@ -153179,6 +163383,8 @@ self: {
        ];
        description = "Tweet mirror";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "misfortune" = callPackage
@@ -153200,6 +163406,8 @@ self: {
        executableHaskellDepends = [ monad-loops regex-base regex-pcre ];
        description = "fortune-mod clone";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mismi-core" = callPackage
@@ -153335,6 +163543,8 @@ self: {
        libraryHaskellDepends = [ aeson base ghcjs-base miso ];
        description = "Miso state transition logger";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "miso-examples" = callPackage
@@ -153347,6 +163557,8 @@ self: {
        isExecutable = true;
        description = "A tasty Haskell front-end framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "miso-from-html" = callPackage
@@ -153394,6 +163606,8 @@ self: {
        ];
        description = "A Haskell git implimentation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "miss-porcelain" = callPackage
@@ -153412,6 +163626,8 @@ self: {
        ];
        description = "Useability extras built on top of miss";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "missing-foreign" = callPackage
@@ -153437,6 +163653,8 @@ self: {
        ];
        description = "Haskell interface to Python";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "miv" = callPackage
@@ -153471,6 +163689,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Mixing effects of one arrow into another one";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mixed-strategies" = callPackage
@@ -153487,6 +163707,8 @@ self: {
        ];
        description = "Find optimal mixed strategies for two-player games";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mixed-types-num" = callPackage
@@ -153527,6 +163749,8 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Mixpanel client";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mkbndl" = callPackage
@@ -153541,6 +163765,8 @@ self: {
        executableHaskellDepends = [ base directory filepath haskell98 ];
        description = "Makes an OS X .app bundle from a binary.";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mkcabal" = callPackage
@@ -153559,6 +163785,8 @@ self: {
        ];
        description = "Generate cabal files for a Haskell project";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ml-w" = callPackage
@@ -153573,6 +163801,8 @@ self: {
        executableHaskellDepends = [ base mtl parsec pretty ];
        description = "Minimal ML language to to demonstrate the W type infererence algorithm";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mlist" = callPackage
@@ -153584,6 +163814,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "Monadic List alternative to lazy I/O";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mltool" = callPackage
@@ -153607,6 +163839,8 @@ self: {
        ];
        description = "Machine Learning Toolbox";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mm2" = callPackage
@@ -153618,6 +163852,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "The library that can be used for optimization of multiple (Ord a) => a -> b transformations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mmap" = callPackage
@@ -153825,15 +164061,15 @@ self: {
      }) {};
 
   "mmsyn7s" = callPackage
-    ({ mkDerivation, base, mmsyn6ukr, vector }:
+    ({ mkDerivation, base, mmsyn2, mmsyn5, mmsyn6ukr, vector }:
      mkDerivation {
        pname = "mmsyn7s";
-       version = "0.5.0.2";
-       sha256 = "1im1axprp3s8ii3gd15rz82az36k3lhyiplsm7pf86ysx9d2f5i0";
+       version = "0.6.3.0";
+       sha256 = "03gfnz0h9agi8zr1567b4ccrq1mhcm86f19minmx43gsipgr0gj4";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base mmsyn6ukr vector ];
-       executableHaskellDepends = [ base mmsyn6ukr vector ];
+       libraryHaskellDepends = [ base mmsyn2 mmsyn5 mmsyn6ukr vector ];
+       executableHaskellDepends = [ base mmsyn2 mmsyn5 mmsyn6ukr vector ];
        description = "Shows a sorted list of the Ukrainian sounds representations that can be used by mmsyn7 series of programs";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -153877,6 +164113,8 @@ self: {
        ];
        description = "Macromolecular Transmission Format implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mmtl" = callPackage
@@ -153888,6 +164126,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Modular Monad transformer library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mmtl-base" = callPackage
@@ -153901,6 +164141,8 @@ self: {
        libraryHaskellDepends = [ base mmtl ];
        description = "MonadBase type-class for mmtl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mnist-idx" = callPackage
@@ -153930,6 +164172,8 @@ self: {
        ];
        description = "Language-agnostic analyzer for positional morphosyntactic tags";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mockazo" = callPackage
@@ -154034,6 +164278,8 @@ self: {
        ];
        description = "A parser for the modelica language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "modern-uri" = callPackage
@@ -154085,6 +164331,8 @@ self: {
        ];
        description = "Modify fasta (and CLIP) files in several optional ways";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "modsplit" = callPackage
@@ -154105,6 +164353,8 @@ self: {
        ];
        description = "Haskell source splitter driven by special comments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "modular" = callPackage
@@ -154145,6 +164395,8 @@ self: {
        ];
        description = "A new Prelude featuring first class modules";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "modular-prelude-classy" = callPackage
@@ -154156,6 +164408,8 @@ self: {
        libraryHaskellDepends = [ base classy-prelude modular-prelude ];
        description = "Reifying ClassyPrelude a la ModularPrelude";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "modularity" = callPackage
@@ -154171,6 +164425,8 @@ self: {
        ];
        description = "Find the modularity of a network";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "module-management" = callPackage
@@ -154201,6 +164457,8 @@ self: {
        ];
        description = "Clean up module imports, split and merge modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "modulespection" = callPackage
@@ -154217,6 +164475,8 @@ self: {
        ];
        description = "Template Haskell for introspecting a module's declarations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "modulo" = callPackage
@@ -154236,6 +164496,8 @@ self: {
        ];
        description = "Modular C code generator";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "moe" = callPackage
@@ -154251,6 +164513,8 @@ self: {
        ];
        description = "html with style";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "moesocks" = callPackage
@@ -154273,6 +164537,8 @@ self: {
        ];
        description = "A functional firewall killer";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mohws" = callPackage
@@ -154295,6 +164561,8 @@ self: {
        ];
        description = "Modular Haskell Web Server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mole" = callPackage
@@ -154325,6 +164593,8 @@ self: {
        ];
        description = "A glorified string replacement tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mollie-api-haskell" = callPackage
@@ -154350,6 +164620,8 @@ self: {
        ];
        description = "Mollie API client for Haskell http://www.mollie.com";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-abort-fd" = callPackage
@@ -154366,6 +164638,8 @@ self: {
        ];
        description = "A better error monad transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-atom" = callPackage
@@ -154377,6 +164651,8 @@ self: {
        libraryHaskellDepends = [ base containers ghc-prim mtl ];
        description = "Monadically convert object to unique integers and back";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-atom-simple" = callPackage
@@ -154388,6 +164664,8 @@ self: {
        libraryHaskellDepends = [ base containers ghc-prim mtl ];
        description = "Monadically map objects to unique ints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-batcher" = callPackage
@@ -154454,6 +164732,8 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Monadic abstraction for computations that can be branched and run independently";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-chronicle" = callPackage
@@ -154602,6 +164882,8 @@ self: {
        testHaskellDepends = [ base hlint tasty tasty-hspec ];
        description = "A monad transformer for weighted graph searches";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-exception" = callPackage
@@ -154618,6 +164900,8 @@ self: {
        ];
        description = "Exstensible monadic exceptions";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-extras" = callPackage
@@ -154649,6 +164933,8 @@ self: {
        ];
        description = "Guard monadic computations with cleanup actions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-fork" = callPackage
@@ -154660,6 +164946,8 @@ self: {
        libraryHaskellDepends = [ base monad-control ];
        description = "Type class for monads which support a fork operation";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-gen" = callPackage
@@ -154708,6 +164996,8 @@ self: {
        ];
        description = "A class of monads which can do http requests";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-interleave" = callPackage
@@ -154719,6 +165009,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Monads with an unsaveInterleaveIO-like operation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-io-adapter" = callPackage
@@ -154766,6 +165058,8 @@ self: {
        ];
        description = "Specific levels of monad transformers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-lgbt" = callPackage
@@ -154784,6 +165078,8 @@ self: {
        ];
        description = "Monad transformers for combining local and global state";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-log" = callPackage
@@ -154803,6 +165099,8 @@ self: {
        ];
        description = "A simple and fast logging monad";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-logger" = callPackage
@@ -154872,6 +165170,8 @@ self: {
        ];
        description = "syslog output for monad-logger";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-loops" = callPackage
@@ -154914,6 +165214,8 @@ self: {
        ];
        description = "a monad to calculate linear recursive sequence";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-markov" = callPackage
@@ -154965,6 +165267,8 @@ self: {
        libraryHaskellDepends = [ base mersenne-random-pure64 ];
        description = "An efficient random generator monad, based on the Mersenne Twister";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-metrics" = callPackage
@@ -154982,6 +165286,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A convenient wrapper around EKG metrics";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-metrics-extensible" = callPackage
@@ -155002,6 +165308,8 @@ self: {
        ];
        description = "An extensible and type-safe wrapper around EKG metrics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-mock" = callPackage
@@ -155020,6 +165328,8 @@ self: {
        testHaskellDepends = [ base hspec mtl ];
        description = "A monad transformer for mocking mtl-style typeclasses";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-open" = callPackage
@@ -155031,6 +165341,8 @@ self: {
        libraryHaskellDepends = [ base exceptions mtl transformers ];
        description = "Open recursion for when you need it";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-ox" = callPackage
@@ -155112,6 +165424,8 @@ self: {
        ];
        description = "Parallel execution of monadic computations with a progress bar";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-param" = callPackage
@@ -155123,6 +165437,8 @@ self: {
        libraryHaskellDepends = [ base mtl stm ];
        description = "Parameterized monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-peel" = callPackage
@@ -155163,6 +165479,8 @@ self: {
        ];
        description = "An mtl-style typeclass and transformer for persistent";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-primitive" = callPackage
@@ -155196,6 +165514,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim mtl ];
        description = "Fast monads and monad transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-recorder" = callPackage
@@ -155212,6 +165532,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Record and replay the results of monadic actions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-resumption" = callPackage
@@ -155260,6 +165582,8 @@ self: {
        ];
        description = "Utility library for monads, particularly those involving state";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-statevar" = callPackage
@@ -155272,6 +165596,8 @@ self: {
        testHaskellDepends = [ base stm ];
        description = "Concise, overloaded accessors for IORef, STRef, TVar";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-ste" = callPackage
@@ -155288,6 +165614,8 @@ self: {
        testHaskellDepends = [ base hspec HUnit ];
        description = "ST monad with efficient explicit errors";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-stlike-io" = callPackage
@@ -155302,6 +165630,8 @@ self: {
        ];
        description = "ST-like monad capturing variables to regions and supporting IO";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-stlike-stm" = callPackage
@@ -155313,6 +165643,8 @@ self: {
        libraryHaskellDepends = [ base monad-stlike-io stm ];
        description = "ST-like monad capturing variables to regions and supporting STM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-stm" = callPackage
@@ -155335,6 +165667,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Stateful supply monad";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-task" = callPackage
@@ -155346,6 +165680,8 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A monad transformer that turns event processing into co-routine programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-time" = callPackage
@@ -155375,6 +165711,8 @@ self: {
        testHaskellDepends = [ base containers hlint hspec transformers ];
        description = "Monad transformer for recording timing events";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-tx" = callPackage
@@ -155386,6 +165724,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A transactional state monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-unify" = callPackage
@@ -155399,6 +165739,8 @@ self: {
        libraryHaskellDepends = [ base mtl unordered-containers ];
        description = "Generic first-order unification";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-unlift" = callPackage
@@ -155462,6 +165804,8 @@ self: {
        libraryHaskellDepends = [ base base-compat stm ];
        description = "Generic operations over variables";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monad-wrap" = callPackage
@@ -155473,6 +165817,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Wrap functions such as catch around different monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monadIO" = callPackage
@@ -155508,6 +165854,8 @@ self: {
        libraryHaskellDepends = [ base monadLib ];
        description = "Arrow-like monad composition for monadLib";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monadacme" = callPackage
@@ -155519,6 +165867,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "The Acme and AcmeT monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monadbi" = callPackage
@@ -155589,6 +165939,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Constraint Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monadiccp-gecode" = callPackage
@@ -155607,6 +165959,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Constraint Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gecodeint = null; gecodekernel = null; gecodesearch = null; 
          gecodeset = null; gecodesupport = null;};
 
@@ -155658,6 +166012,8 @@ self: {
        ];
        description = "A preprocessor for generating monadic call traces";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monadlog" = callPackage
@@ -155677,6 +166033,8 @@ self: {
        ];
        description = "A simple and fast logging monad";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monadoid" = callPackage
@@ -155703,6 +166061,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell98 partial maps and filters over MonadPlus";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monads-fd" = callPackage
@@ -155714,6 +166074,8 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Monad classes, using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monads-tf" = callPackage
@@ -155754,6 +166116,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Monadic interface for TokyoTyrant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mondo" = callPackage
@@ -155777,6 +166141,8 @@ self: {
        ];
        description = "Haskell bindings for the Mondo API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monetdb-mapi" = callPackage
@@ -155788,6 +166154,8 @@ self: {
        libraryHaskellDepends = [ base bindings-monetdb-mapi ];
        description = "Mid-level bindings for the MonetDB API (mapi)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "money" = callPackage
@@ -155800,6 +166168,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Money";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mongoDB" = callPackage
@@ -155832,6 +166202,8 @@ self: {
        ];
        description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mongodb-queue" = callPackage
@@ -155852,6 +166224,8 @@ self: {
        ];
        description = "message queue using MongoDB";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mongrel2-handler" = callPackage
@@ -155869,6 +166243,8 @@ self: {
        ];
        description = "Mongrel2 Handler Library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monitor" = callPackage
@@ -155882,6 +166258,8 @@ self: {
        executableHaskellDepends = [ base filepath hinotify process ];
        description = "Do things when files change";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monky" = callPackage
@@ -155906,6 +166284,8 @@ self: {
        ];
        description = "A system state collecting library and application";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mono-foldable" = callPackage
@@ -155917,6 +166297,8 @@ self: {
        libraryHaskellDepends = [ base bytestring text vector ];
        description = "Folds for monomorphic containers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mono-traversable" = callPackage
@@ -155997,6 +166379,8 @@ self: {
        libraryHaskellDepends = [ base containers lens mtl ];
        description = "Monoid type classes, designed in modular way, distinguish Monoid from Mempty and Semigroup. This design allows mempty operation don't bring Semigroups related constraints until (<>) is used.";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monoid-absorbing" = callPackage
@@ -156008,6 +166392,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A library for (left, right) zero monoids and backtracking with cut";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monoid-extras" = callPackage
@@ -156035,6 +166421,8 @@ self: {
        libraryHaskellDepends = [ base bytestring containers ];
        description = "a practical monoid implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monoid-record" = callPackage
@@ -156125,6 +166513,8 @@ self: {
        ];
        description = "Extra classes/functions about monoids";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monoids" = callPackage
@@ -156140,6 +166530,8 @@ self: {
        ];
        description = "Deprecated: Use 'reducers'";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monomorphic" = callPackage
@@ -156167,6 +166559,8 @@ self: {
        ];
        description = "Well-typed paths";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "montage" = callPackage
@@ -156232,6 +166626,8 @@ self: {
        ];
        description = "A monad and transformer for Monte Carlo calculations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "months" = callPackage
@@ -156268,6 +166664,8 @@ self: {
        ];
        description = "a 'Monus' is a commutative monoid that allows a notion of substraction";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "monzo" = callPackage
@@ -156291,6 +166689,8 @@ self: {
        ];
        description = "Haskell bindings for the Monzo API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "moo" = callPackage
@@ -156312,6 +166712,8 @@ self: {
        ];
        description = "Genetic algorithm library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "moonshine" = callPackage
@@ -156328,6 +166730,8 @@ self: {
        ];
        description = "A web service framework for Haskell, similar in purpose to dropwizard";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "more-containers" = callPackage
@@ -156371,6 +166775,8 @@ self: {
        ];
        description = "A tool for supervised learning of morphology";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "morfeusz" = callPackage
@@ -156388,6 +166794,8 @@ self: {
        librarySystemDepends = [ morfeusz ];
        description = "Bindings to the morphological analyser Morfeusz";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {morfeusz = null;};
 
   "morley" = callPackage
@@ -156437,6 +166845,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Developer tools for the Michelson Language";
        license = stdenv.lib.licenses.agpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "morley-prelude" = callPackage
@@ -156512,6 +166922,8 @@ self: {
        ];
        description = "Morpheus GraphQL CLI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "morphisms" = callPackage
@@ -156533,6 +166945,8 @@ self: {
        libraryHaskellDepends = [ morphisms ];
        description = "Functors, theirs compositions and transformations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "morphisms-functors-inventory" = callPackage
@@ -156544,6 +166958,8 @@ self: {
        libraryHaskellDepends = [ morphisms morphisms-functors ];
        description = "Inventory is state and store";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "morphisms-objects" = callPackage
@@ -156555,6 +166971,8 @@ self: {
        libraryHaskellDepends = [ morphisms ];
        description = "Algebraic structures";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "morte" = callPackage
@@ -156588,6 +167006,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion system-filepath text ];
        description = "A bare-bones calculus of constructions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mosaico-lib" = callPackage
@@ -156606,6 +167026,8 @@ self: {
        ];
        description = "Generación interactiva de mosaicos";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mosquitto-hs" = callPackage
@@ -156658,6 +167080,8 @@ self: {
        ];
        description = "General purpose migrations library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "moto-postgresql" = callPackage
@@ -156673,6 +167097,8 @@ self: {
        ];
        description = "PostgreSQL-based migrations registry for moto";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "motor" = callPackage
@@ -156713,6 +167139,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Generate state diagrams from Motor FSM typeclasses";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "motor-reflection" = callPackage
@@ -156730,6 +167158,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Reflect on Motor FSM typeclasses to obtain runtime representations";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mount" = callPackage
@@ -156741,6 +167171,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Mounts and umounts filesystems";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mountpoints" = callPackage
@@ -156775,6 +167207,8 @@ self: {
        ];
        description = "Plays videos using GStreamer and GTK+";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "moving-averages" = callPackage
@@ -156811,6 +167245,8 @@ self: {
        ];
        description = "Music player for linux";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mp3decoder" = callPackage
@@ -156842,6 +167278,8 @@ self: {
        ];
        description = "MPD/PowerMate executable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mpg123-bindings" = callPackage
@@ -156879,6 +167317,8 @@ self: {
        benchmarkSystemDepends = [ openmpi ];
        description = "MPI bindings for Haskell";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) openmpi;};
 
   "mplayer-spot" = callPackage
@@ -156912,6 +167352,8 @@ self: {
        ];
        description = "Multi-dimensional parametric pretty-printer with color";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mpretty" = callPackage
@@ -156928,6 +167370,8 @@ self: {
        ];
        description = "a monadic, extensible pretty printing library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mpris" = callPackage
@@ -156939,6 +167383,8 @@ self: {
        libraryHaskellDepends = [ base containers dbus mtl ];
        description = "Interface for MPRIS";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mprover" = callPackage
@@ -156956,6 +167402,8 @@ self: {
        ];
        description = "Simple equational reasoning for a Haskell-ish language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mps" = callPackage
@@ -156975,6 +167423,8 @@ self: {
        ];
        description = "simply oo";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mptcp-pm" = callPackage
@@ -156999,6 +167449,8 @@ self: {
        executableToolDepends = [ c2hs ];
        description = "A work in progress Multipath TCP path manager";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mpvguihs" = callPackage
@@ -157017,6 +167469,8 @@ self: {
        ];
        description = "A minimalist mpv GUI written in I/O heavy Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mqtt" = callPackage
@@ -157045,6 +167499,8 @@ self: {
        ];
        description = "An MQTT protocol implementation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mqtt-hs" = callPackage
@@ -157061,6 +167517,8 @@ self: {
        ];
        description = "A MQTT client library";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mrifk" = callPackage
@@ -157074,6 +167532,8 @@ self: {
        executableHaskellDepends = [ array base containers mtl ];
        description = "Decompiles Glulx files";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mrm" = callPackage
@@ -157085,6 +167545,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Modular Refiable Matching, first-class matches";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ms" = callPackage
@@ -157105,6 +167567,8 @@ self: {
        ];
        description = "metric spaces";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ms-tds" = callPackage
@@ -157148,6 +167612,8 @@ self: {
        ];
        description = "A Haskell implementation of MessagePack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "msgpack-aeson" = callPackage
@@ -157166,6 +167632,8 @@ self: {
        testHaskellDepends = [ aeson base msgpack tasty tasty-hunit ];
        description = "Aeson adapter for MessagePack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "msgpack-idl" = callPackage
@@ -157187,6 +167655,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "An IDL Compiler for MessagePack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "msgpack-rpc" = callPackage
@@ -157207,6 +167677,8 @@ self: {
        testHaskellDepends = [ async base mtl network tasty tasty-hunit ];
        description = "A MessagePack-RPC Implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "msh" = callPackage
@@ -157223,6 +167695,8 @@ self: {
        ];
        description = "Object-Oriented Programming in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "msi-kb-backlit" = callPackage
@@ -157236,6 +167710,8 @@ self: {
        executableHaskellDepends = [ base bytestring hid split ];
        description = "A command line tool to change backlit colors of your MSI keyboards";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mssql-simple" = callPackage
@@ -157310,6 +167786,8 @@ self: {
        ];
        description = "Library to communicate with Mt.Gox";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mtl_2_1_3_1" = callPackage
@@ -157345,6 +167823,8 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Very strict CPS'd transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mtl-compat" = callPackage
@@ -157372,6 +167852,8 @@ self: {
        ];
        description = "Instances for the mtl classes for all monad transformers";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mtl-extras" = callPackage
@@ -157383,6 +167865,8 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Higher order versions of MTL classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mtl-prelude_1_0_3" = callPackage
@@ -157417,6 +167901,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Monad Transformer Library with Type Families";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mtl-unleashed" = callPackage
@@ -157458,6 +167944,8 @@ self: {
        libraryHaskellDepends = [ base mtl QuickCheck ];
        description = "Monad transformer library with type indexes, providing 'free' copies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mtp" = callPackage
@@ -157470,6 +167958,8 @@ self: {
        librarySystemDepends = [ mtp ];
        description = "Bindings to libmtp";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {mtp = null;};
 
   "mtree" = callPackage
@@ -157484,20 +167974,21 @@ self: {
      }) {};
 
   "mu-avro" = callPackage
-    ({ mkDerivation, aeson, avro, base, bytestring, containers
-     , mu-schema, sop-core, tagged, template-haskell, text
-     , unordered-containers, vector
+    ({ mkDerivation, aeson, avro, base, bytestring, containers, deepseq
+     , language-avro, mu-rpc, mu-schema, sop-core, tagged
+     , template-haskell, text, time, unordered-containers, uuid, vector
      }:
      mkDerivation {
        pname = "mu-avro";
-       version = "0.1.0.0";
-       sha256 = "1g5083vwd0s7h27r8l8mdrqwbflq89cgm1660cd1nd29vypwz55x";
+       version = "0.2.0.0";
+       sha256 = "12cjq2pfaksa8s93j731p6i572xlnpl7p42lz1kvyyn4bg5r222y";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson avro base bytestring containers mu-schema sop-core tagged
-         template-haskell text unordered-containers vector
+         aeson avro base bytestring containers deepseq language-avro mu-rpc
+         mu-schema sop-core tagged template-haskell text time
+         unordered-containers uuid vector
        ];
        executableHaskellDepends = [ avro base bytestring mu-schema ];
        description = "Avro serialization support for Mu microservices";
@@ -157506,49 +167997,86 @@ self: {
 
   "mu-grpc-client" = callPackage
     ({ mkDerivation, async, base, bytestring, conduit, http2
-     , http2-client, http2-client-grpc, http2-grpc-proto3-wire
-     , mu-protobuf, mu-rpc, mu-schema, sop-core, stm, stm-chans
-     , stm-conduit, template-haskell, text, th-abstraction
+     , http2-client, http2-client-grpc, http2-grpc-types, mu-grpc-common
+     , mu-optics, mu-protobuf, mu-rpc, mu-schema, optics-core, sop-core
+     , stm, stm-chans, stm-conduit, template-haskell, text
+     , th-abstraction
      }:
      mkDerivation {
        pname = "mu-grpc-client";
-       version = "0.1.0.0";
-       sha256 = "00i6z413dknh71dnzy61wcgkcwczj74042glsag8193pr1kxa3s6";
+       version = "0.2.0.0";
+       sha256 = "0dy9nfzyls5410dh7crgk03bfwcrxgcwryqhplsg25x5rxplkcfb";
        libraryHaskellDepends = [
          async base bytestring conduit http2 http2-client http2-client-grpc
-         http2-grpc-proto3-wire mu-protobuf mu-rpc mu-schema sop-core stm
-         stm-chans stm-conduit template-haskell text th-abstraction
+         http2-grpc-types mu-grpc-common mu-optics mu-protobuf mu-rpc
+         mu-schema optics-core sop-core stm stm-chans stm-conduit
+         template-haskell text th-abstraction
        ];
        description = "gRPC clients from Mu definitions";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "mu-grpc-common" = callPackage
+    ({ mkDerivation, avro, base, binary, bytestring
+     , http2-grpc-proto3-wire, http2-grpc-types, mu-avro, mu-protobuf
+     , mu-rpc, mu-schema
+     }:
+     mkDerivation {
+       pname = "mu-grpc-common";
+       version = "0.2.0.0";
+       sha256 = "04984ibj6ma880jchibmr1z696mrik29gc2qnaf0vsp0nxwqr9vv";
+       libraryHaskellDepends = [
+         avro base binary bytestring http2-grpc-proto3-wire http2-grpc-types
+         mu-avro mu-protobuf mu-rpc mu-schema
+       ];
+       description = "gRPC for Mu, common modules for client and server";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mu-grpc-server" = callPackage
-    ({ mkDerivation, async, base, bytestring, conduit
-     , http2-grpc-proto3-wire, http2-grpc-types, mtl, mu-protobuf
-     , mu-rpc, mu-schema, sop-core, stm, stm-conduit, wai, warp
-     , warp-grpc, warp-tls
+    ({ mkDerivation, async, base, binary, bytestring, conduit
+     , http2-grpc-types, mtl, mu-grpc-common, mu-protobuf, mu-rpc
+     , mu-schema, sop-core, stm, stm-conduit, wai, warp, warp-grpc
+     , warp-tls
      }:
      mkDerivation {
        pname = "mu-grpc-server";
-       version = "0.1.0.1";
-       sha256 = "0f494cn3x1v6hdmyf7w97hvhlvichw70pz9jza232rv7ds6bq38j";
-       revision = "1";
-       editedCabalFile = "0g1qs1ydjy0yn2997il049ldb303gvjvc1pn7j161zb31zlc699m";
+       version = "0.2.0.0";
+       sha256 = "1g3dr66b6915ci53lhygahw8ganqivd42a918amv1xcxq7li1m76";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         async base bytestring conduit http2-grpc-proto3-wire
-         http2-grpc-types mtl mu-protobuf mu-rpc mu-schema sop-core stm
+         async base binary bytestring conduit http2-grpc-types mtl
+         mu-grpc-common mu-protobuf mu-rpc mu-schema sop-core stm
          stm-conduit wai warp warp-grpc warp-tls
        ];
        executableHaskellDepends = [
-         async base bytestring conduit http2-grpc-proto3-wire
-         http2-grpc-types mtl mu-protobuf mu-rpc mu-schema sop-core stm
+         async base binary bytestring conduit http2-grpc-types mtl
+         mu-grpc-common mu-protobuf mu-rpc mu-schema sop-core stm
          stm-conduit wai warp warp-grpc warp-tls
        ];
        description = "gRPC servers for Mu definitions";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "mu-optics" = callPackage
+    ({ mkDerivation, base, containers, mu-schema, optics-core, sop-core
+     }:
+     mkDerivation {
+       pname = "mu-optics";
+       version = "0.2.0.0";
+       sha256 = "1b3954pq7iia4vq2bnl1gw2qakdrwkh647qpb1sl1dmrpi0mc77m";
+       libraryHaskellDepends = [
+         base containers mu-schema optics-core sop-core
+       ];
+       description = "Optics for @mu-schema@ terms";
+       license = stdenv.lib.licenses.asl20;
      }) {};
 
   "mu-persistent" = callPackage
@@ -157557,8 +168085,8 @@ self: {
      }:
      mkDerivation {
        pname = "mu-persistent";
-       version = "0.1.0.0";
-       sha256 = "16y1d69zwfrv2wdx0xj1aavhkfv5z6bg9wvzj29215k1vcvarx7i";
+       version = "0.2.0.0";
+       sha256 = "1n81dpayp0q0i19w1pchgwwblxz0jd510q01r8mvwpf099gb27pa";
        libraryHaskellDepends = [
          base monad-logger mu-schema persistent resourcet transformers
        ];
@@ -157574,8 +168102,8 @@ self: {
      }:
      mkDerivation {
        pname = "mu-protobuf";
-       version = "0.1.0.0";
-       sha256 = "1vlsq45cjkll4y9fjgjnvp1d9ax850zxy9rawprcrnwc48wmpdxz";
+       version = "0.2.0.0";
+       sha256 = "10yxb4dfdm9bm41gpd2jbb7jz79gk7s5yzqf3d994zqcq0d5k5fh";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -157589,6 +168117,8 @@ self: {
        ];
        description = "Protocol Buffers serialization and gRPC schema import for Mu microservices";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mu-rpc" = callPackage
@@ -157597,8 +168127,8 @@ self: {
      }:
      mkDerivation {
        pname = "mu-rpc";
-       version = "0.1.0.0";
-       sha256 = "1hinkmhgp49sl7d00iz20p9maf47almii9000hfkszyqbq1dh58p";
+       version = "0.2.0.0";
+       sha256 = "1rw4gci0m5isij0bgngbm7zjxafnkibmg3qsxs6dym19mxgqs9nk";
        libraryHaskellDepends = [
          base conduit mtl mu-schema sop-core template-haskell text
        ];
@@ -157613,8 +168143,8 @@ self: {
      }:
      mkDerivation {
        pname = "mu-schema";
-       version = "0.1.0.0";
-       sha256 = "0yqm70w5xbzlcgqdwywfr0qncxlzi9z3nshs8x06shd0g0gjgmhy";
+       version = "0.2.0.0";
+       sha256 = "1rdv2mvp66xy41l0g8v03szn5ndg8wji4mzpnqdd90z2xzim4z0w";
        libraryHaskellDepends = [
          aeson base bytestring containers sop-core template-haskell text
          th-abstraction unordered-containers vector
@@ -157656,6 +168186,8 @@ self: {
        ];
        description = "Multi-version deployer for web applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mudbath" = callPackage
@@ -157693,6 +168225,8 @@ self: {
        ];
        description = "A simple document-oriented database";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mueval" = callPackage
@@ -157746,6 +168280,8 @@ self: {
        testToolDepends = [ alex happy ];
        description = "An intermediate language designed to perform advanced code analysis";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multext-east-msd" = callPackage
@@ -157757,6 +168293,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "MULTEXT-East morphosyntactic descriptors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multi-cabal" = callPackage
@@ -157778,6 +168316,8 @@ self: {
        ];
        description = "A tool supporting multi cabal project builds";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multi-containers" = callPackage
@@ -157803,6 +168343,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Typeclasses augmented with a phantom type parameter";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multi-trie" = callPackage
@@ -157815,6 +168357,8 @@ self: {
        testHaskellDepends = [ base containers HTF ];
        description = "Trie of sets, as a model for compound names having multiple values";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multiaddr" = callPackage
@@ -157835,6 +168379,8 @@ self: {
        ];
        description = "A network address format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multiarg" = callPackage
@@ -157853,6 +168399,8 @@ self: {
        ];
        description = "Command lines for options that take multiple arguments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multibase" = callPackage
@@ -157875,6 +168423,8 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck template-haskell ];
        description = "Self-identifying base encodings, implementation of <https://github.com/multiformats/multihash>";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multifile" = callPackage
@@ -157918,6 +168468,8 @@ self: {
        ];
        description = "Bidirectional Two-level Transformation of XML Schemas";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multihash" = callPackage
@@ -157941,6 +168493,8 @@ self: {
        ];
        description = "Multihash library and CLI executable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multihash-cryptonite" = callPackage
@@ -157960,6 +168514,8 @@ self: {
        testHaskellDepends = [ base cryptonite doctest hedgehog ];
        description = "Self-identifying hashes, implementation of <https://github.com/multiformats/multihash>";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multihash-serialise" = callPackage
@@ -157977,6 +168533,8 @@ self: {
        testHaskellDepends = [ base cryptonite hedgehog serialise ];
        description = "CBOR encoding of multihashes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multihashmap" = callPackage
@@ -158009,6 +168567,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq weigh ];
        description = "Comprehensive and efficient (multi)linear algebra implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multilinear-io" = callPackage
@@ -158032,6 +168592,8 @@ self: {
        ];
        description = "Conduit-based input/output capability for multilinear package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multimap" = callPackage
@@ -158086,6 +168648,8 @@ self: {
        ];
        description = "Folding data with multiple named passes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multipath" = callPackage
@@ -158097,6 +168661,8 @@ self: {
        libraryHaskellDepends = [ base parsec utf8-string ];
        description = "Parser and builder for unix-path-like objects";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multiplate" = callPackage
@@ -158123,6 +168689,8 @@ self: {
        libraryHaskellDepends = [ base multiplate transformers ];
        description = "Shorter, more generic functions for Multiplate";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multiplicity" = callPackage
@@ -158139,6 +168707,8 @@ self: {
        ];
        description = "Wrapper program for duplicity, adding config files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multipool" = callPackage
@@ -158203,6 +168773,8 @@ self: {
        ];
        description = "Read and write appropriately from both master and replicated postgresql instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multipool-postgresql-simple" = callPackage
@@ -158246,6 +168818,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Generic programming for families of recursive datatypes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multirec-alt-deriver" = callPackage
@@ -158261,6 +168835,8 @@ self: {
        ];
        description = "Alternative multirec instances deriver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multirec-binary" = callPackage
@@ -158272,6 +168848,8 @@ self: {
        libraryHaskellDepends = [ base binary multirec ];
        description = "Generic Data.Binary instances using MultiRec.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multiset" = callPackage
@@ -158313,6 +168891,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 stm ];
        description = "Multi-set rewrite rules with guards and a parallel execution scheme";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multistate" = callPackage
@@ -158361,6 +168941,8 @@ self: {
        ];
        description = "Multivariant assignments generation language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "multivector" = callPackage
@@ -158401,6 +168983,8 @@ self: {
        ];
        description = "Static blog generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "murder" = callPackage
@@ -158417,6 +169001,8 @@ self: {
        ];
        description = "MUtually Recursive Definitions Explicitly Represented";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "murmur" = callPackage
@@ -158442,6 +169028,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Simple CUI Twitter Client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "murmur-hash" = callPackage
@@ -158482,6 +169070,8 @@ self: {
        libraryHaskellDepends = [ haskell2010 ];
        description = "32-bit non-cryptographic hashing";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mushu" = callPackage
@@ -158508,6 +169098,8 @@ self: {
        testHaskellDepends = [ base classy-prelude ];
        description = "Minimalist MPD client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "music-articulation" = callPackage
@@ -158572,6 +169164,8 @@ self: {
        ];
        description = "Diagrams-based visualization of musical data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "music-parts" = callPackage
@@ -158594,6 +169188,8 @@ self: {
        ];
        description = "Musical instruments, parts and playing techniques";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "music-pitch" = callPackage
@@ -158611,6 +169207,8 @@ self: {
        ];
        description = "Musical pitch representation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "music-pitch-literal" = callPackage
@@ -158651,6 +169249,8 @@ self: {
        testHaskellDepends = [ base process tasty tasty-golden ];
        description = "Some useful preludes for the Music Suite";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "music-score" = callPackage
@@ -158674,6 +169274,8 @@ self: {
        ];
        description = "Musical score and part representation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "music-sibelius" = callPackage
@@ -158693,6 +169295,8 @@ self: {
        ];
        description = "Interaction with Sibelius";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "music-suite" = callPackage
@@ -158712,6 +169316,8 @@ self: {
        doHaddock = false;
        description = "A set of libraries for composition, analysis and manipulation of music";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "music-util" = callPackage
@@ -158729,6 +169335,8 @@ self: {
        ];
        description = "Utility for developing the Music Suite";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "musicScroll" = callPackage
@@ -158750,6 +169358,8 @@ self: {
        executablePkgconfigDepends = [ gtk3 ];
        description = "Supply your tunes info without leaving your music player";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk3;};
 
   "musicbrainz-email" = callPackage
@@ -158783,6 +169393,8 @@ self: {
        ];
        description = "Send an email to all MusicBrainz editors";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "musicw" = callPackage
@@ -158818,6 +169430,8 @@ self: {
        ];
        description = "MusicXML format encoded as Haskell type and functions of reading and writting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "musicxml2" = callPackage
@@ -158835,6 +169449,8 @@ self: {
        ];
        description = "A representation of the MusicXML format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mustache" = callPackage
@@ -158888,6 +169504,8 @@ self: {
        ];
        description = "Straight implementation of mustache templates";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mustache2hs" = callPackage
@@ -158928,6 +169546,8 @@ self: {
        ];
        description = "Automatic piecewise-mutable references for your types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mutable-containers" = callPackage
@@ -158962,6 +169582,8 @@ self: {
        ];
        description = "iteratees based upon mutable buffers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mute-unmute" = callPackage
@@ -158980,6 +169602,8 @@ self: {
        ];
        description = "Watches your screensaver and (un)mutes music when you (un)lock the screen";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mvar-lock" = callPackage
@@ -158991,6 +169615,8 @@ self: {
        libraryHaskellDepends = [ base safe-exceptions ];
        description = "A trivial lock based on MVar";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mvc" = callPackage
@@ -159007,6 +169633,8 @@ self: {
        ];
        description = "Model-view-controller";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mvc-updates" = callPackage
@@ -159018,6 +169646,8 @@ self: {
        libraryHaskellDepends = [ async base foldl mvc ];
        description = "Concurrent and combinable updates";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mvclient" = callPackage
@@ -159036,6 +169666,8 @@ self: {
        ];
        description = "Client library for metaverse systems like Second Life";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mwc-probability" = callPackage
@@ -159097,6 +169729,8 @@ self: {
        libraryHaskellDepends = [ accelerate base mwc-random ];
        description = "Generate Accelerate arrays filled with high quality pseudorandom numbers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mwc-random-monad" = callPackage
@@ -159144,6 +169778,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit vector ];
        description = "MXNet interface in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) mxnet;};
 
   "mxnet-dataiter" = callPackage
@@ -159161,6 +169797,8 @@ self: {
        testHaskellDepends = [ base hspec mxnet streaming ];
        description = "mxnet dataiters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mxnet-examples" = callPackage
@@ -159174,6 +169812,8 @@ self: {
        executableHaskellDepends = [ base mxnet ];
        description = "Examples for MXNet in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mxnet-nn" = callPackage
@@ -159199,6 +169839,8 @@ self: {
        ];
        description = "Train a neural network with MXNet in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mxnet-nnvm" = callPackage
@@ -159212,6 +169854,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "NNVM interface in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) mxnet;};
 
   "my-package-testing" = callPackage
@@ -159236,6 +169880,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "my-test-docs" = callPackage
@@ -159260,6 +169906,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "spam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "myTestlll" = callPackage
@@ -159284,6 +169932,8 @@ self: {
        ];
        description = "None";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "myanimelist-export" = callPackage
@@ -159307,6 +169957,8 @@ self: {
        ];
        description = "Export from MyAnimeList";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mybitcoin-sci" = callPackage
@@ -159343,6 +169995,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Haskell binding to the Myo armband";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mysnapsession" = callPackage
@@ -159359,6 +170013,8 @@ self: {
        ];
        description = "Sessions and continuations for Snap web apps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mysnapsession-example" = callPackage
@@ -159378,6 +170034,8 @@ self: {
        ];
        description = "Example projects using mysnapsession";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mysql" = callPackage
@@ -159410,6 +170068,8 @@ self: {
        ];
        description = "An extensible mysql effect using extensible-effects and mysql-simple";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mysql-haskell" = callPackage
@@ -159433,6 +170093,8 @@ self: {
        ];
        description = "pure haskell MySQL driver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mysql-haskell-nem" = callPackage
@@ -159448,6 +170110,8 @@ self: {
        ];
        description = "Adds a interface like mysql-simple to mysql-haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mysql-haskell-openssl" = callPackage
@@ -159464,6 +170128,8 @@ self: {
        ];
        description = "TLS support for mysql-haskell package using openssl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mysql-simple" = callPackage
@@ -159497,6 +170163,8 @@ self: {
        ];
        description = "Quasi-quoter for use with mysql-simple";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mysql-simple-typed" = callPackage
@@ -159512,6 +170180,8 @@ self: {
        ];
        description = "Typed extension to mysql simple";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mystem" = callPackage
@@ -159530,6 +170200,8 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "Bindings for Mystem morphological analyzer executabe";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mywatch" = callPackage
@@ -159554,6 +170226,8 @@ self: {
        ];
        description = "Web application to view and kill MySQL queries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "myxine-client" = callPackage
@@ -159573,6 +170247,8 @@ self: {
        testHaskellDepends = [ bytestring text ];
        description = "A Haskell client for the Myxine GUI server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mzv" = callPackage
@@ -159584,6 +170260,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Implementation of the \"Monads, Zippers and Views\" (Schrijvers and Oliveira, ICFP'11)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "n-ary-functor" = callPackage
@@ -159627,6 +170305,8 @@ self: {
        libraryHaskellDepends = [ base singletons vector ];
        description = "Homogeneous tuples of arbitrary length";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "n2o" = callPackage
@@ -159671,6 +170351,8 @@ self: {
        ];
        description = "N2O Protocols Starter Pack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "n2o-web" = callPackage
@@ -159689,6 +170371,8 @@ self: {
        ];
        description = "N2O adapter for WebSockets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nagios-check" = callPackage
@@ -159735,6 +170419,8 @@ self: {
        ];
        description = "Parse Nagios performance data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nagios-plugin-ekg" = callPackage
@@ -159758,6 +170444,8 @@ self: {
        ];
        description = "Monitor ekg metrics via Nagios";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nakadi-client" = callPackage
@@ -159796,6 +170484,8 @@ self: {
        ];
        description = "Client library for the Nakadi Event Broker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "namecoin-update" = callPackage
@@ -159848,6 +170538,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A named lock that is created on demand";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "named-records" = callPackage
@@ -159889,6 +170581,8 @@ self: {
        ];
        description = "fortran90 namelist parser/pretty printer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "names" = callPackage
@@ -159963,6 +170657,8 @@ self: {
        librarySystemDepends = [ openssl ];
        description = "Bindings to OpenSSL HMAC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "nano-md5" = callPackage
@@ -159977,6 +170673,8 @@ self: {
        librarySystemDepends = [ openssl ];
        description = "Efficient, ByteString bindings to OpenSSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "nanoAgda" = callPackage
@@ -160007,6 +170705,8 @@ self: {
        librarySystemDepends = [ ncurses ];
        description = "Simple Curses binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ncurses;};
 
   "nanomsg" = callPackage
@@ -160019,6 +170719,8 @@ self: {
        librarySystemDepends = [ nanomsg ];
        description = "nanomsg - scalability protocols library";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) nanomsg;};
 
   "nanomsg-haskell" = callPackage
@@ -160043,6 +170745,8 @@ self: {
        ];
        description = "Bindings to the nanomsg library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) nanomsg;};
 
   "nanoparsec" = callPackage
@@ -160054,6 +170758,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ListLike ];
        description = "An implementation of attoparsec-like parser around list-like";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nanospec" = callPackage
@@ -160087,6 +170793,8 @@ self: {
        testHaskellDepends = [ base containers hspec inline-c QuickCheck ];
        description = "Haskell bindings for nanovg";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {GLEW = null; inherit (pkgs) glew; inherit (pkgs) libGL; 
          inherit (pkgs) libGLU;};
 
@@ -160105,6 +170813,8 @@ self: {
        ];
        description = "Simple interface to rendering with NanoVG";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nanq" = callPackage
@@ -160124,6 +170834,8 @@ self: {
        ];
        description = "Performs 漢字検定 (Japan Kanji Aptitude Test) level analysis on given Kanji";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "naperian" = callPackage
@@ -160141,6 +170853,8 @@ self: {
        ];
        description = "Efficient representable functors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "naqsha" = callPackage
@@ -160159,6 +170873,8 @@ self: {
        doHaddock = false;
        description = "A library for working with anything map related";
        license = "(Apache-2.0 OR BSD-3-Clause)";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "narc" = callPackage
@@ -160170,6 +170886,8 @@ self: {
        libraryHaskellDepends = [ base HDBC HUnit mtl QuickCheck random ];
        description = "Query SQL databases using Nested Relational Calculus embedded in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nat" = callPackage
@@ -160193,6 +170911,8 @@ self: {
        testHaskellDepends = [ base doctest hedgehog QuickCheck ];
        description = "Variable-sized numbers from type-level nats";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nationstates" = callPackage
@@ -160209,6 +170929,8 @@ self: {
        ];
        description = "NationStates API client";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "native" = callPackage
@@ -160268,6 +170990,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion time ];
        description = "Another Haskell client for NATS (https://nats.io)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nats-queue" = callPackage
@@ -160288,6 +171012,8 @@ self: {
        ];
        description = "Haskell API for NATS messaging system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "natural" = callPackage
@@ -160308,6 +171034,8 @@ self: {
        ];
        description = "Natural number";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "natural-arithmetic" = callPackage
@@ -160348,6 +171076,8 @@ self: {
        ];
        description = "Natural numbers tagged with a type-level representation of the number";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "natural-numbers" = callPackage
@@ -160425,6 +171155,8 @@ self: {
        ];
        description = "Interface to Naver Translate";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nbt" = callPackage
@@ -160444,6 +171176,8 @@ self: {
        ];
        description = "A parser/serializer for Minecraft's Named Binary Tag (NBT) data format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nc-indicators" = callPackage
@@ -160506,6 +171240,8 @@ self: {
        executableHaskellDepends = [ base filepath parsec ];
        description = "A Fast Retargetable Template Engine";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "neat-interpolation" = callPackage
@@ -160559,6 +171295,8 @@ self: {
        ];
        description = "ASCII-fied arrow notation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "neet" = callPackage
@@ -160575,6 +171313,8 @@ self: {
        ];
        description = "A NEAT library for Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nehe-tuts" = callPackage
@@ -160594,6 +171334,8 @@ self: {
        ];
        description = "Port of the NeHe OpenGL tutorials to Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "neil" = callPackage
@@ -160612,6 +171354,8 @@ self: {
        ];
        description = "General tools for Neil";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "neither" = callPackage
@@ -160623,6 +171367,8 @@ self: {
        libraryHaskellDepends = [ base failure transformers ];
        description = "Provide versions of Either with good monad and applicative instances. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "neko-lib" = callPackage
@@ -160643,6 +171389,8 @@ self: {
        ];
        description = "Neko VM code generation and disassembly library";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "neko-obfs" = callPackage
@@ -160696,6 +171444,8 @@ self: {
        ];
        description = "A collection of Nemesis tasks to bootstrap a Haskell project with a focus on continuous integration";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nerf" = callPackage
@@ -160722,6 +171472,8 @@ self: {
        ];
        description = "Nerf, a named entity recognition tool based on linear-chain CRFs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nero" = callPackage
@@ -160740,6 +171492,8 @@ self: {
        ];
        description = "Lens-based HTTP toolkit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nero-wai" = callPackage
@@ -160755,6 +171509,8 @@ self: {
        ];
        description = "WAI adapter for Nero server applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nero-warp" = callPackage
@@ -160766,6 +171522,8 @@ self: {
        libraryHaskellDepends = [ base nero nero-wai warp ];
        description = "Run Nero server applications with Warp";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nest" = callPackage
@@ -160781,6 +171539,8 @@ self: {
        ];
        testHaskellDepends = [ base bytestring containers hedgehog text ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nested-routes" = callPackage
@@ -160810,6 +171570,8 @@ self: {
        ];
        description = "Declarative, compositional Wai responses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nested-sequence" = callPackage
@@ -160826,6 +171588,8 @@ self: {
        ];
        description = "List-like data structures with O(log(n)) random access";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nested-sets" = callPackage
@@ -160854,6 +171618,8 @@ self: {
        ];
        description = "A library for nested maps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "net-concurrent" = callPackage
@@ -160949,6 +171715,8 @@ self: {
        ];
        description = "A graph database middleware to maintain a time-varying graph";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "net-spider-cli" = callPackage
@@ -160969,6 +171737,8 @@ self: {
        ];
        description = "CLI option parsers for NetSpider objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "net-spider-pangraph" = callPackage
@@ -160987,6 +171757,8 @@ self: {
        ];
        description = "Conversion between net-spider and pangraph";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "net-spider-rpl" = callPackage
@@ -161008,6 +171780,8 @@ self: {
        ];
        description = "NetSpider data model and utility for RPL networks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "net-spider-rpl-cli" = callPackage
@@ -161032,6 +171806,8 @@ self: {
        ];
        description = "CLI executable of NetSpider.RPL.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "netclock" = callPackage
@@ -161045,6 +171821,8 @@ self: {
        libraryHaskellDepends = [ base bytestring hosc network ];
        description = "Netclock protocol";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "netcore" = callPackage
@@ -161076,6 +171854,8 @@ self: {
        ];
        description = "The NetCore compiler and runtime system for OpenFlow networks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "netease-fm" = callPackage
@@ -161104,6 +171884,8 @@ self: {
        ];
        description = "NetEase Cloud Music FM client in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "netlib-carray" = callPackage
@@ -161163,6 +171945,8 @@ self: {
        executableHaskellDepends = [ base HTF random ];
        description = "Enumerator tools for text-based network protocols";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "netlink" = callPackage
@@ -161259,6 +172043,8 @@ self: {
        ];
        description = "Contract normaliser and simulator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "netspec" = callPackage
@@ -161275,6 +172061,8 @@ self: {
        ];
        description = "Simplify static Networking tasks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "netstring-enumerator" = callPackage
@@ -161288,6 +172076,8 @@ self: {
        ];
        description = "Enumerator-based netstring parsing";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nettle" = callPackage
@@ -161313,6 +172103,8 @@ self: {
        ];
        description = "safe nettle binding";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) nettle;};
 
   "nettle-frp" = callPackage
@@ -161329,6 +172121,8 @@ self: {
        ];
        description = "FRP for controlling networks of OpenFlow switches";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nettle-netkit" = callPackage
@@ -161344,6 +172138,8 @@ self: {
        ];
        description = "DSL for describing OpenFlow networks, and a compiler generating NetKit labs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nettle-openflow" = callPackage
@@ -161360,6 +172156,8 @@ self: {
        ];
        description = "OpenFlow protocol messages, binary formats, and servers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "netwire" = callPackage
@@ -161419,6 +172217,8 @@ self: {
        ];
        description = "JavaScript instance of netwire-input";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "netwire-vinylglfw-examples" = callPackage
@@ -161441,6 +172241,8 @@ self: {
        ];
        description = "Netwire/GLFW/VinylGL input handling demo";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network_2_6_3_1" = callPackage
@@ -161507,6 +172309,8 @@ self: {
        ];
        description = "IP data structures and textual representation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-anonymous-i2p" = callPackage
@@ -161529,6 +172333,8 @@ self: {
        ];
        description = "Haskell API for I2P anonymous networking";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-anonymous-tor" = callPackage
@@ -161558,6 +172364,8 @@ self: {
        ];
        description = "Haskell API for Tor anonymous networking";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-api-support" = callPackage
@@ -161575,6 +172383,8 @@ self: {
        ];
        description = "Toolkit for building http client libraries over Network.Http.Conduit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-arbitrary" = callPackage
@@ -161596,6 +172406,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Arbitrary Instances for Network Types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-attoparsec" = callPackage
@@ -161619,6 +172431,8 @@ self: {
        doCheck = false;
        description = "Utility functions for running a parser against a socket";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-bitcoin" = callPackage
@@ -161641,6 +172455,8 @@ self: {
        ];
        description = "An interface to bitcoind";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-bsd" = callPackage
@@ -161675,6 +172491,8 @@ self: {
        ];
        description = "Linux NetworkNameSpace Builder";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-byte-order" = callPackage
@@ -161700,6 +172518,8 @@ self: {
        libraryHaskellDepends = [ base bytestring network unix ];
        description = "Fast, memory-efficient, low-level networking";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-carbon" = callPackage
@@ -161713,6 +172533,8 @@ self: {
        ];
        description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-conduit" = callPackage
@@ -161760,6 +172582,8 @@ self: {
        ];
        description = "A wrapper around a generic stream-like connection";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-data" = callPackage
@@ -161810,6 +172634,8 @@ self: {
        ];
        description = "Domain Name System data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-enumerator" = callPackage
@@ -161825,6 +172651,8 @@ self: {
        ];
        description = "Enumerators for network sockets";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-fancy" = callPackage
@@ -161847,6 +172675,8 @@ self: {
        libraryHaskellDepends = [ base bytestring hans parsec ];
        description = "HaNS to Network shims for easier HaNS integration";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-house" = callPackage
@@ -161858,6 +172688,8 @@ self: {
        libraryHaskellDepends = [ array base containers mtl ];
        description = "data and parsers for Ethernet, TCP, UDP, IPv4, IPv6, ICMP, DHCP, TFTP";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-info" = callPackage
@@ -161882,6 +172714,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ioctl network ];
        description = "Haskell bindings for the ifreq structure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-ip" = callPackage
@@ -161943,6 +172777,8 @@ self: {
        ];
        description = "MessagePack RPC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-messagepack-rpc-websocket" = callPackage
@@ -161963,6 +172799,8 @@ self: {
        ];
        description = "WebSocket backend for MessagePack RPC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-metrics" = callPackage
@@ -161998,6 +172836,8 @@ self: {
        ];
        description = "A ByteString based library for writing HTTP(S) servers and clients";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-msg" = callPackage
@@ -162032,6 +172872,8 @@ self: {
        testHaskellDepends = [ async base bytestring hspec mtl network ];
        description = "A MessagePack-RPC Implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-multicast" = callPackage
@@ -162059,6 +172901,8 @@ self: {
        ];
        description = "Haskell bindings for low-level packet sockets (AF_PACKET)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-pgi" = callPackage
@@ -162091,6 +172935,8 @@ self: {
        ];
        description = "Client library for the XMPP protocol";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-rpca" = callPackage
@@ -162108,6 +172954,8 @@ self: {
        ];
        description = "A cross-platform RPC library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-run" = callPackage
@@ -162133,6 +172981,8 @@ self: {
        executableHaskellDepends = [ base network unix ];
        description = "A light abstraction over sockets & co. for servers";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-service" = callPackage
@@ -162148,6 +172998,8 @@ self: {
        ];
        description = "Provide a service at the data type level";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-simple" = callPackage
@@ -162179,6 +173031,8 @@ self: {
        ];
        description = "network-simple for resolved addresses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-simple-tls" = callPackage
@@ -162229,6 +173083,8 @@ self: {
        ];
        description = "Simple interface to TLS secured WebSockets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-socket-options" = callPackage
@@ -162240,6 +173096,8 @@ self: {
        libraryHaskellDepends = [ base network ];
        description = "Type-safe, portable alternative to getSocketOption/setSocketOption";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-stream" = callPackage
@@ -162256,6 +173114,8 @@ self: {
        ];
        description = "ByteString and Text streams for networking";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-topic-models" = callPackage
@@ -162277,6 +173137,8 @@ self: {
        ];
        description = "A few network topic model implementations for bayes-stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-transport" = callPackage
@@ -162317,6 +173179,8 @@ self: {
        ];
        description = "AMQP-based transport layer for distributed-process (aka Cloud Haskell)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-transport-composed" = callPackage
@@ -162348,6 +173212,8 @@ self: {
        ];
        description = "In-memory instantiation of Network.Transport";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-transport-tcp" = callPackage
@@ -162367,6 +173233,8 @@ self: {
        ];
        description = "TCP instantiation of Network.Transport";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-transport-tests" = callPackage
@@ -162414,26 +173282,6 @@ self: {
      }) {};
 
   "network-uri" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, HUnit, parsec
-     , template-haskell, test-framework, test-framework-hunit
-     , test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "network-uri";
-       version = "2.6.2.0";
-       sha256 = "0fmjc4p6pnzjxyg32pp7xh4wdbpqzp0rya80mccixyracvs1q3nw";
-       revision = "1";
-       editedCabalFile = "14ab4k2biga40z7nyksy0ca56zwghmrlab2fxhnq1km3rj7qa4k6";
-       libraryHaskellDepends = [ base deepseq parsec template-haskell ];
-       testHaskellDepends = [
-         base criterion deepseq HUnit test-framework test-framework-hunit
-         test-framework-quickcheck2
-       ];
-       description = "URI manipulation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "network-uri_2_6_3_0" = callPackage
     ({ mkDerivation, base, criterion, deepseq, HUnit, parsec
      , template-haskell, test-framework, test-framework-hunit
      , test-framework-quickcheck2
@@ -162449,7 +173297,6 @@ self: {
        ];
        description = "URI manipulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-uri-flag" = callPackage
@@ -162481,6 +173328,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "FromJSON and ToJSON Instances for Network.URI";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-uri-lenses" = callPackage
@@ -162504,6 +173353,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "A small utility to declare type-safe static URIs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-voicetext" = callPackage
@@ -162520,6 +173371,8 @@ self: {
        ];
        description = "VoiceText Web API wrapper";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-wai-router" = callPackage
@@ -162531,6 +173384,8 @@ self: {
        libraryHaskellDepends = [ base wai ];
        description = "A routing library for wai";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "network-websocket" = callPackage
@@ -162544,6 +173399,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 network webserver ];
        description = "WebSocket library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "networked-game" = callPackage
@@ -162561,6 +173418,8 @@ self: {
        ];
        description = "Networked-game support library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "neural" = callPackage
@@ -162593,6 +173452,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Neural Networks in native Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "neural-network-base" = callPackage
@@ -162623,6 +173484,8 @@ self: {
        ];
        description = "Yet Another High Performance and Extendable Neural Network in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "neural-network-hmatrix" = callPackage
@@ -162640,6 +173503,8 @@ self: {
        librarySystemDepends = [ blas ];
        description = "Yet Another High Performance and Extendable Neural Network in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) blas;};
 
   "newhope" = callPackage
@@ -162671,6 +173536,8 @@ self: {
        ];
        description = "Library implementing the NewHope cryptographic key-exchange protocol";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "newports" = callPackage
@@ -162684,6 +173551,8 @@ self: {
        executableHaskellDepends = [ base directory old-time ];
        description = "List ports newer than N days on a FreeBSD system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "newsletter" = callPackage
@@ -162712,6 +173581,8 @@ self: {
        ];
        description = "A basic newsletter implimentation, using various backends";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "newsletter-mailgun" = callPackage
@@ -162727,6 +173598,8 @@ self: {
        ];
        description = "A mailgun backend for the newsletter package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "newsynth" = callPackage
@@ -162764,6 +173637,8 @@ self: {
        executableHaskellDepends = [ base cmdargs containers mtl ];
        description = "A trivially simple app to create things from simple templates";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "newtype" = callPackage
@@ -162791,6 +173666,8 @@ self: {
        ];
        description = "Instance derivers for newtype wrappers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "newtype-generics" = callPackage
@@ -162825,6 +173702,8 @@ self: {
        ];
        description = "A template haskell deriver to create Control.Newtype instances.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "newtype-zoo" = callPackage
@@ -162841,6 +173720,8 @@ self: {
        ];
        description = "Newtype Wrapper Zoo";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "newtyper" = callPackage
@@ -162864,6 +173745,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "A concurrency primitive for a slow consumer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nextstep-plist" = callPackage
@@ -162875,6 +173758,8 @@ self: {
        libraryHaskellDepends = [ base parsec pretty QuickCheck ];
        description = "NextStep style plist parser and printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nf" = callPackage
@@ -162901,6 +173786,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "libnfc bindings";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {nfc = null;};
 
   "ngram" = callPackage
@@ -162940,6 +173827,8 @@ self: {
        executableHaskellDepends = [ base parseargs ];
        description = "Ngrams loader based on http://www.ngrams.info format";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ngx-export" = callPackage
@@ -162991,6 +173880,8 @@ self: {
        ];
        description = "More extra tools for Nginx haskell module";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "niagra" = callPackage
@@ -163007,6 +173898,8 @@ self: {
        testHaskellDepends = [ base HUnit QuickCheck ];
        description = "High performance CSS EDSL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nibblestring" = callPackage
@@ -163027,6 +173920,8 @@ self: {
        ];
        description = "Packed, strict nibble arrays with a list interface (ByteString for nibbles)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nice-html" = callPackage
@@ -163050,6 +173945,8 @@ self: {
        ];
        description = "A fast and nice HTML templating library with distinct compilation/rendering phases";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nicify" = callPackage
@@ -163096,6 +173993,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Nico Nico Douga (ニコニコ動画) Comment Translator";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nikepub" = callPackage
@@ -163116,6 +174015,8 @@ self: {
        ];
        description = "Command line utility publishes Nike+ runs on blogs and Twitter";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nimber" = callPackage
@@ -163165,6 +174066,8 @@ self: {
        ];
        description = "IDL compiler and RPC/distributed object framework for microservices";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nist-beacon" = callPackage
@@ -163189,6 +174092,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Haskell bindings for Nitro";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "niv" = callPackage
@@ -163244,6 +174149,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Convenient utility for distributed Nix builds";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nix-deploy" = callPackage
@@ -163262,6 +174169,8 @@ self: {
        ];
        description = "Deploy Nix-built software to a NixOS machine";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nix-derivation" = callPackage
@@ -163303,6 +174212,8 @@ self: {
        ];
        description = "Explain why two Nix derivations differ";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nix-eval" = callPackage
@@ -163318,6 +174229,8 @@ self: {
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "Evaluate Haskell expressions using Nix to get packages";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nix-freeze-tree" = callPackage
@@ -163345,6 +174258,8 @@ self: {
        doHaddock = false;
        description = "Convert a tree of files into fixed-output derivations";
        license = stdenv.lib.licenses.agpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nix-paths" = callPackage
@@ -163388,6 +174303,8 @@ self: {
        ];
        description = "cabal/stack to nix translation tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nixfmt" = callPackage
@@ -163408,6 +174325,8 @@ self: {
        ];
        description = "An opinionated formatter for Nix";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nixfromnpm" = callPackage
@@ -163434,6 +174353,8 @@ self: {
        ];
        description = "Generate nix expressions from npm packages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nixos-types" = callPackage
@@ -163469,6 +174390,8 @@ self: {
        ];
        description = "Tool for semi-automatic updating of nixpkgs repository";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nkjp" = callPackage
@@ -163487,6 +174410,8 @@ self: {
        ];
        description = "Manipulating the National Corpus of Polish (NKJP)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nlopt-haskell" = callPackage
@@ -163511,6 +174436,8 @@ self: {
        libraryHaskellDepends = [ base containers strict ];
        description = "Scoring functions commonly used for evaluation in NLP and IR";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nlp-scores-scripts" = callPackage
@@ -163526,6 +174453,8 @@ self: {
        ];
        description = "NLP scoring command-line programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nm" = callPackage
@@ -163542,6 +174471,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Network Manager, binding to libnm-glib";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {g = null; inherit (pkgs) glib; libnm-glib = null; 
          nm-glib = null;};
 
@@ -163598,6 +174529,8 @@ self: {
        ];
        description = "Library to connect to an NNTP Server";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "no-buffering-workaround" = callPackage
@@ -163621,6 +174554,8 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Role annotations without -XRoleAnnotations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "no-value" = callPackage
@@ -163654,6 +174589,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Math in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nofib-analyse" = callPackage
@@ -163667,6 +174604,8 @@ self: {
        executableHaskellDepends = [ array base containers regex-compat ];
        description = "Parse and compare nofib runs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nofib-analyze" = callPackage
@@ -163680,6 +174619,8 @@ self: {
        executableHaskellDepends = [ array base containers regex-compat ];
        description = "Parse and compare nofib runs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "noise" = callPackage
@@ -163703,6 +174644,8 @@ self: {
        ];
        description = "A friendly language for graphic design";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nominal" = callPackage
@@ -163912,6 +174855,8 @@ self: {
        testHaskellDepends = [ base checkers QuickCheck ];
        description = "The Zipper for NonEmpty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "non-negative" = callPackage
@@ -163998,6 +174943,8 @@ self: {
        testHaskellDepends = [ base hedgehog hedgehog-classes ];
        description = "nonempty structure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nonempty-vector" = callPackage
@@ -164008,6 +174955,8 @@ self: {
        pname = "nonempty-vector";
        version = "0.2.0.1";
        sha256 = "0qiwl58d5bvack33djhwqkblwk541w63a3hjqc7mik54y3j40s71";
+       revision = "1";
+       editedCabalFile = "1bkba3fbhf6bccqprlrz32hjfdhdg9gnlyhpqah0jw51hlj1ahsg";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base deepseq primitive semigroups vector
@@ -164114,6 +175063,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        description = "Normalization insensitive string comparison";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "normalize" = callPackage
@@ -164182,6 +175133,8 @@ self: {
        ];
        description = "examples for not-gloss";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "not-in-base" = callPackage
@@ -164206,6 +175159,8 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Avoiding the C preprocessor via cunning use of Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "notifications-tray-icon" = callPackage
@@ -164231,6 +175186,8 @@ self: {
          transformers tuple
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "notmuch" = callPackage
@@ -164268,6 +175225,8 @@ self: {
        executableSystemDepends = [ notmuch ];
        description = "Binding for notmuch MUA library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) notmuch;};
 
   "notmuch-web" = callPackage
@@ -164305,6 +175264,8 @@ self: {
        ];
        description = "A web interface to the notmuch email indexer";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "notzero" = callPackage
@@ -164358,6 +175319,8 @@ self: {
        ];
        description = "Zeit Now haskell-side integration and introspection tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nowdoc" = callPackage
@@ -164385,6 +175348,8 @@ self: {
        libraryHaskellDepends = [ base containers numeric-prelude primes ];
        description = "NumericPrelude extras";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "np-linear" = callPackage
@@ -164400,6 +175365,8 @@ self: {
        ];
        description = "Linear algebra for the numeric-prelude framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nptools" = callPackage
@@ -164418,6 +175385,8 @@ self: {
        ];
        description = "A collection of random tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nqe" = callPackage
@@ -164520,6 +175489,8 @@ self: {
        ];
        description = "Client library for NTP control messaging";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ntrip-client" = callPackage
@@ -164544,6 +175515,8 @@ self: {
        ];
        description = "NTRIP client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ntype" = callPackage
@@ -164572,6 +175545,8 @@ self: {
        ];
        description = "HTML5 Canvas Graphics Library - forked Blank Canvas";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nullary" = callPackage
@@ -164583,6 +175558,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A package for working with nullary type classes";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nullpipe" = callPackage
@@ -164595,6 +175572,8 @@ self: {
        testHaskellDepends = [ base hspec pipes ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "num-non-negative" = callPackage
@@ -164710,6 +175689,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Convert numbers to number words";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "numerals-base" = callPackage
@@ -164731,6 +175712,8 @@ self: {
        ];
        description = "Convert numbers to number words";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "numeric-domains" = callPackage
@@ -164792,6 +175775,8 @@ self: {
        ];
        description = "Ode solvers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "numeric-prelude" = callPackage
@@ -164828,6 +175813,8 @@ self: {
        doCheck = false;
        description = "Quasi-quoters for numbers of different bases";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "numeric-quest" = callPackage
@@ -164854,6 +175841,8 @@ self: {
        testHaskellDepends = [ base hspec HUnit QuickCheck ];
        description = "A framework for numeric ranges";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "numeric-tools" = callPackage
@@ -164887,6 +175876,8 @@ self: {
        ];
        description = "core package for Numerical Haskell project";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "numericpeano" = callPackage
@@ -164929,6 +175920,8 @@ self: {
        ];
        description = "n-dimensional arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "numhask-hedgehog" = callPackage
@@ -164945,6 +175938,8 @@ self: {
        testHaskellDepends = [ base hedgehog numhask numhask-prelude ];
        description = "Laws and tests for numhask";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "numhask-histogram" = callPackage
@@ -164961,6 +175956,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "numhask-prelude" = callPackage
@@ -164973,6 +175970,8 @@ self: {
        testHaskellDepends = [ doctest ];
        description = "A numeric prelude";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "numhask-range" = callPackage
@@ -164993,6 +175992,8 @@ self: {
        ];
        description = "Numbers that are range representations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "numhask-space" = callPackage
@@ -165010,6 +176011,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "numerical spaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "numhask-test" = callPackage
@@ -165026,6 +176029,8 @@ self: {
        testHaskellDepends = [ base numhask-prelude QuickCheck tasty ];
        description = "Laws and tests for numhask";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nums" = callPackage
@@ -165241,6 +176246,8 @@ self: {
        ];
        description = "Client for the Nylas API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nymphaea" = callPackage
@@ -165259,6 +176266,8 @@ self: {
        ];
        description = "An interactive GUI for manipulating L-systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "nyx-game" = callPackage
@@ -165330,6 +176339,8 @@ self: {
        ];
        description = "Client to the OANDA REST API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "oasis-xrd" = callPackage
@@ -165352,6 +176363,8 @@ self: {
        ];
        description = "Extensible Resource Descriptor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "oauth10a" = callPackage
@@ -165396,6 +176409,8 @@ self: {
        ];
        description = "OAuth2 jwt-bearer client flow as per rfc7523";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "oauthenticated" = callPackage
@@ -165421,6 +176436,8 @@ self: {
        ];
        description = "Simple OAuth for http-client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "obd" = callPackage
@@ -165445,6 +176462,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Communicate to OBD interfaces over ELM327";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "obdd" = callPackage
@@ -165461,6 +176480,8 @@ self: {
        testHaskellDepends = [ array base containers text ];
        description = "Ordered Reduced Binary Decision Diagrams";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "oberon0" = callPackage
@@ -165480,6 +176501,8 @@ self: {
        doHaddock = false;
        description = "Oberon0 Compiler";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "obj" = callPackage
@@ -165499,6 +176522,8 @@ self: {
        ];
        description = "Reads and writes obj models";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "objectid" = callPackage
@@ -165519,6 +176544,8 @@ self: {
        ];
        description = "Rather unique identifier for things that need to be stored";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "objective" = callPackage
@@ -165539,6 +176566,8 @@ self: {
        ];
        description = "Composable objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "oblivious-transfer" = callPackage
@@ -165611,6 +176640,8 @@ self: {
        ];
        description = "Convert Haskell types in OCaml types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ochintin-daicho" = callPackage
@@ -165651,6 +176682,8 @@ self: {
        ];
        description = "Parse Rocket League replays";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "octohat" = callPackage
@@ -165681,6 +176714,8 @@ self: {
        ];
        description = "A tested, minimal wrapper around GitHub's API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "octopus" = callPackage
@@ -165701,6 +176736,8 @@ self: {
        ];
        description = "Lisp with more dynamism, more power, more simplicity";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "oculus" = callPackage
@@ -165717,6 +176754,8 @@ self: {
        librarySystemDepends = [ libGL libX11 libXinerama ovr systemd ];
        description = "Oculus Rift ffi providing head tracking data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
          inherit (pkgs.xorg) libXinerama; ovr = null; 
          inherit (pkgs) systemd;};
@@ -165747,6 +176786,8 @@ self: {
        benchmarkHaskellDepends = [ async base text weigh ];
        description = "Haskell binding to the ODBC API, aimed at SQL Server driver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) unixODBC;};
 
   "oden-go-packages" = callPackage
@@ -165762,6 +176803,8 @@ self: {
        ];
        description = "Provides Go package metadata";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "odpic-raw" = callPackage
@@ -165818,6 +176861,8 @@ self: {
        ];
        description = "Interface for Online Encyclopedia of Integer Sequences (OEIS)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "off-simple" = callPackage
@@ -165829,6 +176874,8 @@ self: {
        libraryHaskellDepends = [ base parsec3 vector ];
        description = "A parser for simplified-syntax OFF files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ofx" = callPackage
@@ -165859,6 +176906,8 @@ self: {
        ];
        description = "A lightweight markup language for story writers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ohloh-hs" = callPackage
@@ -165882,6 +176931,8 @@ self: {
        ];
        description = "Interface to the Ohloh API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "oi" = callPackage
@@ -165898,6 +176949,8 @@ self: {
        executableHaskellDepends = [ base directory filepath parallel ];
        description = "Library for purely functional lazy interactions with the outer world";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "oidc-client" = callPackage
@@ -165923,6 +176976,8 @@ self: {
        ];
        description = "OpenID Connect 1.0 library for RP";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ois-input-manager" = callPackage
@@ -165935,6 +176990,8 @@ self: {
        librarySystemDepends = [ OIS ];
        description = "wrapper for OIS input manager for use with hogre";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {OIS = null;};
 
   "old-locale" = callPackage
@@ -165998,6 +177055,8 @@ self: {
        ];
        description = "An OpenLayers JavaScript Wrapper and Webframework with snaplet-fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "om-elm" = callPackage
@@ -166015,6 +177074,8 @@ self: {
        ];
        description = "Haskell utilities for building embedded Elm programs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "omaketex" = callPackage
@@ -166032,6 +177093,8 @@ self: {
        ];
        description = "A simple tool to generate OMakefile for latex files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ombra" = callPackage
@@ -166051,6 +177114,8 @@ self: {
        ];
        description = "Render engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "omega" = callPackage
@@ -166069,6 +177134,8 @@ self: {
        ];
        description = "A purely functional programming language and a proof system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "omnicodec" = callPackage
@@ -166114,6 +177181,8 @@ self: {
        ];
        description = "A pretty-printer wrapper to faciliate ease of formatting during development";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "on-a-horse" = callPackage
@@ -166132,6 +177201,8 @@ self: {
        ];
        description = "\"Haskell on a Horse\" - A combinatorial web framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "on-demand-ssh-tunnel" = callPackage
@@ -166152,6 +177223,8 @@ self: {
        ];
        description = "Program that sends traffic through SSH tunnels on-demand";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "onama" = callPackage
@@ -166163,6 +177236,8 @@ self: {
        libraryHaskellDepends = [ base containers parsec tagsoup ];
        description = "HTML-parsing primitives for Parsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "once" = callPackage
@@ -166266,6 +177341,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A never-empty list type";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "online" = callPackage
@@ -166306,6 +177383,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "partition lenses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "onu-course" = callPackage
@@ -166317,6 +177396,8 @@ self: {
        libraryHaskellDepends = [ base smallcheck ];
        description = "Code for the Haskell course taught at the Odessa National University in 2012";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "oo-prototypes" = callPackage
@@ -166340,6 +177421,8 @@ self: {
        testHaskellDepends = [ base containers doctest ];
        description = "Common operators encouraging large-scale easy reading";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "opaleye" = callPackage
@@ -166386,6 +177469,8 @@ self: {
        ];
        description = "Opaleye wrapped up in classy MTL attire";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "opaleye-sqlite" = callPackage
@@ -166410,6 +177495,8 @@ self: {
        ];
        description = "An SQL-generating DSL targeting SQLite";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "opaleye-trans" = callPackage
@@ -166492,6 +177579,8 @@ self: {
        executableHaskellDepends = [ base basic-prelude text turtle ];
        description = "Open haddock HTML documentation";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "open-pandoc" = callPackage
@@ -166514,6 +177603,8 @@ self: {
        ];
        description = "Conversion between markup formats";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "open-signals" = callPackage
@@ -166526,6 +177617,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A mechanism similar to checked exceptions that integrates with MTL and transformer stacks";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "open-symbology" = callPackage
@@ -166553,6 +177646,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Open type representations and dynamic types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "open-union" = callPackage
@@ -166584,6 +177679,8 @@ self: {
        testHaskellDepends = [ base mtl tasty tasty-hunit witness ];
        description = "open witnesses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "openapi-petstore" = callPackage
@@ -166611,6 +177708,8 @@ self: {
        ];
        description = "Auto-generated openapi-petstore API Client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "opench-meteo" = callPackage
@@ -166622,6 +177721,8 @@ self: {
        libraryHaskellDepends = [ aeson base data-default text time ];
        description = "A Haskell implementation of the Swiss Meteo Net data API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "opencog-atomspace" = callPackage
@@ -166702,6 +177803,8 @@ self: {
        libraryPkgconfigDepends = [ opencv ];
        description = "Raw Haskell bindings to OpenCV >= 2.0";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) opencv;};
 
   "opendatatable" = callPackage
@@ -166713,6 +177816,8 @@ self: {
        libraryHaskellDepends = [ base hxt template-haskell th-lift ];
        description = "A library for working with Open Data Tables";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "openexchangerates" = callPackage
@@ -166819,6 +177924,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Functional interface for OpenGL 4.1+ and OpenGL ES 2.0+";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {EGL = null; GLESv2 = null;};
 
   "openid" = callPackage
@@ -166944,6 +178051,8 @@ self: {
        ];
        description = "Haskell OpenSoundControl utilities";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "opensource" = callPackage
@@ -166985,6 +178094,8 @@ self: {
        ];
        description = "Fetch OpenSSH keys from a GitHub team";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "openssh-protocol" = callPackage
@@ -167001,6 +178112,8 @@ self: {
        testHaskellDepends = [ base cereal hedgehog time ];
        description = "Haskell implementation of openssh protocol primitives";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "openssl-createkey" = callPackage
@@ -167074,6 +178187,8 @@ self: {
        ];
        testHaskellDepends = [ async base opentelemetry ];
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "opentheory" = callPackage
@@ -167140,6 +178255,8 @@ self: {
        ];
        description = "Unicode characters";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "opentheory-divides" = callPackage
@@ -167305,6 +178422,8 @@ self: {
        ];
        description = "An OpenTok SDK for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "opentype" = callPackage
@@ -167322,6 +178441,8 @@ self: {
        ];
        description = "Opentype loading and writing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "openweathermap" = callPackage
@@ -167342,6 +178463,8 @@ self: {
        ];
        description = "Access data at OpenWeatherMap";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "operate-do" = callPackage
@@ -167358,6 +178481,8 @@ self: {
        testHaskellDepends = [ base doctest filemanip hspec QuickCheck ];
        description = "Simple project template from stack";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "operational" = callPackage
@@ -167410,6 +178535,8 @@ self: {
        ];
        description = "Interpretation functions and simple instruction sets for operational";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "opml" = callPackage
@@ -167449,6 +178576,8 @@ self: {
        ];
        description = "Streaming parser/renderer for the OPML 2.0 format.";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "opn" = callPackage
@@ -167467,6 +178596,8 @@ self: {
        ];
        description = "Open files or URLs using associated programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "optics" = callPackage
@@ -167574,6 +178705,8 @@ self: {
        testHaskellDepends = [ attoparsec-data rerebase ];
        description = "Simple command line interface arguments parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "optima-for-hasql" = callPackage
@@ -167589,6 +178722,8 @@ self: {
        ];
        description = "Command-line arguments parsing for Hasql";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "optimal-blocks" = callPackage
@@ -167613,6 +178748,8 @@ self: {
        ];
        description = "Optimal Block boundary determination for rsync-like behaviours";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "optimization" = callPackage
@@ -167628,6 +178765,8 @@ self: {
        ];
        description = "Numerical optimization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "optimusprime" = callPackage
@@ -167646,6 +178785,8 @@ self: {
        ];
        description = "A supercompiler for f-lite";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "option" = callPackage
@@ -167671,6 +178812,8 @@ self: {
        ];
        description = "Using type-classes for optional function arguments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "optional-args" = callPackage
@@ -167712,6 +178855,8 @@ self: {
        testHaskellDepends = [ base chell options time ];
        description = "Command-line option types for dates and times";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "optparse-applicative" = callPackage
@@ -167744,6 +178889,8 @@ self: {
        testHaskellDepends = [ attoparsec-data rerebase ];
        description = "Simple command line interface arguments parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "optparse-declarative" = callPackage
@@ -167769,6 +178916,8 @@ self: {
        ];
        description = "An enum-text based toolkit for optparse-applicative";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "optparse-generic" = callPackage
@@ -167798,6 +178947,8 @@ self: {
        libraryHaskellDepends = [ base optparse-applicative ];
        description = "Helper functions for optparse-applicative";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "optparse-simple" = callPackage
@@ -167855,6 +179006,8 @@ self: {
        ];
        description = "Orchestration-style co-ordination EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "orchestrate" = callPackage
@@ -167878,6 +179031,8 @@ self: {
        ];
        description = "An API client for http://orchestrate.io/.";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "orchid" = callPackage
@@ -167898,6 +179053,8 @@ self: {
        ];
        description = "Haskell Wiki Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "orchid-demo" = callPackage
@@ -167917,6 +179074,8 @@ self: {
        ];
        description = "Haskell Wiki Demo";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ord-adhoc" = callPackage
@@ -167944,6 +179103,8 @@ self: {
        ];
        description = "Algorithms for the order maintenance problem with a safe interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "order-statistic-tree" = callPackage
@@ -167976,6 +179137,8 @@ self: {
        ];
        description = "L-Estimators for robust statistics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ordered" = callPackage
@@ -168021,6 +179184,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "basic orders";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ordrea" = callPackage
@@ -168035,6 +179200,8 @@ self: {
        testHaskellDepends = [ base directory process split ];
        description = "Push-pull implementation of discrete-time FRP";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "org2anki" = callPackage
@@ -168061,6 +179228,8 @@ self: {
        executableHaskellDepends = [ attoparsec base text ];
        description = "Organize scala imports";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "orgmode" = callPackage
@@ -168080,6 +179249,8 @@ self: {
        ];
        description = "Org Mode library for haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "orgmode-parse" = callPackage
@@ -168135,6 +179306,8 @@ self: {
        ];
        description = "Statistics visualizer for org-mode";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "origami" = callPackage
@@ -168153,6 +179326,8 @@ self: {
        ];
        description = "An un-SYB framework for transforming heterogenous data through folds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "orion-hs" = callPackage
@@ -168193,6 +179368,8 @@ self: {
        testHaskellDepends = [ base hspec jwt mtl time ];
        description = "Token-based authentication and authorization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ormolu" = callPackage
@@ -168254,6 +179431,8 @@ self: {
        ];
        description = "A library to handle messages in the OSC protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "oscpacking" = callPackage
@@ -168265,6 +179444,8 @@ self: {
        libraryHaskellDepends = [ base colour gloss random ];
        description = "Implements an osculatory packing (kissing circles) algorithm and display";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "osdkeys" = callPackage
@@ -168300,6 +179481,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "An insertion-order-preserving set";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "osm-conduit" = callPackage
@@ -168319,6 +179502,8 @@ self: {
        ];
        description = "Parse and operate on OSM data in efficient way";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "osm-download" = callPackage
@@ -168340,6 +179525,8 @@ self: {
        ];
        description = "Download Open Street Map tiles";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "oso2pdf" = callPackage
@@ -168358,6 +179545,8 @@ self: {
        ];
        description = "Better conversion of Oxford Scholarship Online material to PDF";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "osx-ar" = callPackage
@@ -168370,6 +179559,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for OS X static archive format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ot" = callPackage
@@ -168390,6 +179581,8 @@ self: {
        ];
        description = "Real-time collaborative editing with Operational Transformation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "otp-authenticator" = callPackage
@@ -168415,6 +179608,8 @@ self: {
        ];
        description = "OTP Authenticator (a la google) command line client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ottparse-pretty" = callPackage
@@ -168432,6 +179627,8 @@ self: {
        ];
        description = "Pretty-printer for Ott parse trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "outsort" = callPackage
@@ -168456,6 +179653,8 @@ self: {
        ];
        description = "External sorting package based on Conduit";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "overhang" = callPackage
@@ -168482,6 +179681,8 @@ self: {
        ];
        description = "Finite overloading";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "overloaded" = callPackage
@@ -168527,6 +179728,8 @@ self: {
        ];
        description = "Overloaded Records based on current GHC proposal";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "overture" = callPackage
@@ -168540,6 +179743,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "An alternative to some of the Prelude";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pack" = callPackage
@@ -168555,6 +179760,8 @@ self: {
        ];
        description = "Bidirectional fast ByteString packer/unpacker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "package-description-remote" = callPackage
@@ -168569,6 +179776,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Fetches a 'GenericPackageDescription' from Hackage";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "package-o-tron" = callPackage
@@ -168587,6 +179796,8 @@ self: {
        ];
        description = "Utilities for working with cabal packages and your package database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "package-vt" = callPackage
@@ -168602,6 +179813,8 @@ self: {
        ];
        description = "Haskell Package Versioning Tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "packcheck" = callPackage
@@ -168637,6 +179850,8 @@ self: {
        ];
        description = "Check your cabal packages for lagging dependencies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "packed" = callPackage
@@ -168653,6 +179868,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base gauge ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "packed-dawg" = callPackage
@@ -168680,6 +179897,8 @@ self: {
        ];
        description = "Generation and traversal of highly compressed directed acyclic word graphs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "packed-multikey-map" = callPackage
@@ -168698,6 +179917,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "Efficient “spreadsheet table” like maps with multiple marginals";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "packedstring" = callPackage
@@ -168711,6 +179932,8 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "(Deprecated) Packed Strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "packer" = callPackage
@@ -168745,6 +179968,8 @@ self: {
        ];
        description = "MessagePack Serialization an Deserialization for Packer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "packman" = callPackage
@@ -168764,6 +179989,8 @@ self: {
        ];
        description = "Serialization library for GHC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "packunused" = callPackage
@@ -168784,6 +180011,8 @@ self: {
        ];
        description = "Tool for detecting redundant Cabal package dependencies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pacman-memcache" = callPackage
@@ -168797,6 +180026,8 @@ self: {
        executableHaskellDepends = [ base deepseq directory-tree ];
        description = "Read whole Pacman database which pushes it into the memory cache";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "padKONTROL" = callPackage
@@ -168812,6 +180043,8 @@ self: {
        ];
        description = "Controlling padKONTROL native mode";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pads-haskell" = callPackage
@@ -168839,6 +180072,8 @@ self: {
        ];
        description = "PADS data description language for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pagarme" = callPackage
@@ -168857,6 +180092,8 @@ self: {
        executableHaskellDepends = [ base text wreq ];
        description = "Pagarme API wrapper";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pager" = callPackage
@@ -168950,6 +180187,8 @@ self: {
        ];
        description = "Receive hooks from pagure and do things with them";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "paint" = callPackage
@@ -169033,6 +180272,8 @@ self: {
        description = "Haskell binding for C PAM API";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {pam = null;};
 
   "pan-os-syslog" = callPackage
@@ -169050,6 +180291,8 @@ self: {
        benchmarkHaskellDepends = [ base byteslice gauge primitive ];
        description = "Parse syslog traffic from PAN-OS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "panda" = callPackage
@@ -169070,6 +180313,8 @@ self: {
        ];
        description = "A simple static blog engine";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc" = callPackage
@@ -169303,6 +180548,8 @@ self: {
        ];
        description = "Pandoc filter for cross-references";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-csv2table" = callPackage
@@ -169343,6 +180590,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A Pandoc filter for emphasizing code in fenced blocks";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-filter-graphviz" = callPackage
@@ -169362,6 +180611,8 @@ self: {
        ];
        description = "A Pandoc filter to use graphviz";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-highlighting-extensions" = callPackage
@@ -169398,6 +180649,8 @@ self: {
        doHaddock = false;
        description = "Include other Markdown files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-include-code" = callPackage
@@ -169441,6 +180694,8 @@ self: {
        ];
        description = "Japanese-specific markup filters for pandoc";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-lens" = callPackage
@@ -169452,6 +180707,8 @@ self: {
        libraryHaskellDepends = [ base containers lens pandoc-types ];
        description = "Lenses for Pandoc documents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-markdown-ghci-filter" = callPackage
@@ -169477,6 +180734,8 @@ self: {
        ];
        description = "Pandoc-filter to evaluate `code` section in markdown and auto-embed output";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-placetable" = callPackage
@@ -169498,6 +180757,8 @@ self: {
        ];
        description = "Pandoc filter to include CSV files";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-plantuml-diagrams" = callPackage
@@ -169521,6 +180782,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Render and insert PlantUML diagrams with Pandoc";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-plot" = callPackage
@@ -169552,6 +180815,8 @@ self: {
        ];
        description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-pyplot" = callPackage
@@ -169582,6 +180847,8 @@ self: {
        ];
        description = "A Pandoc filter to include figures generated from Python code blocks";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-sidenote" = callPackage
@@ -169596,6 +180863,8 @@ self: {
        executableHaskellDepends = [ base pandoc-types ];
        description = "Convert Pandoc Markdown-style footnotes into sidenotes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-stylefrommeta" = callPackage
@@ -169649,6 +180918,8 @@ self: {
        executableHaskellDepends = [ base pandoc ];
        description = "Literate Haskell support for GitHub's Markdown flavor";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pandoc-vimhl" = callPackage
@@ -169696,6 +180967,8 @@ self: {
        ];
        description = "A super-pang clone";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pango" = callPackage
@@ -169732,6 +181005,8 @@ self: {
        testHaskellDepends = [ base bytestring containers HUnit ];
        description = "A set of parsers for graph languages and conversions to graph libaries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "panhandle" = callPackage
@@ -169787,6 +181062,8 @@ self: {
        ];
        description = "Pandoc filter to execute code blocks";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pansite" = callPackage
@@ -169815,6 +181092,8 @@ self: {
        testHaskellDepends = [ base doctest Glob hspec QuickCheck ];
        description = "Pansite: a simple web site management tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pantry" = callPackage
@@ -169867,6 +181146,8 @@ self: {
        ];
        description = "Content addressable Haskell package management";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pantry-tmp" = callPackage
@@ -169921,6 +181202,8 @@ self: {
        ];
        description = "Content addressable Haskell package management";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa" = callPackage
@@ -169944,6 +181227,8 @@ self: {
        ];
        description = "Reasonable default import";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-base" = callPackage
@@ -169957,6 +181242,8 @@ self: {
        ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-base-export" = callPackage
@@ -169968,6 +181255,8 @@ self: {
        libraryHaskellDepends = [ base semigroups ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-base-implement" = callPackage
@@ -169979,6 +181268,8 @@ self: {
        libraryHaskellDepends = [ base papa-base-export semigroups ];
        description = "Useful base functions reimplemented";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-bifunctors" = callPackage
@@ -170038,6 +181329,8 @@ self: {
        ];
        description = "Reasonable default import";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-implement" = callPackage
@@ -170059,6 +181352,8 @@ self: {
        ];
        description = "Reasonable default import";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-include" = callPackage
@@ -170075,6 +181370,8 @@ self: {
        ];
        description = "Third party libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-lens" = callPackage
@@ -170126,6 +181423,8 @@ self: {
        ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-prelude-core" = callPackage
@@ -170142,6 +181441,8 @@ self: {
        ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-prelude-lens" = callPackage
@@ -170158,6 +181459,8 @@ self: {
        ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-prelude-semigroupoids" = callPackage
@@ -170174,6 +181477,8 @@ self: {
        ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-prelude-semigroups" = callPackage
@@ -170190,6 +181495,8 @@ self: {
        ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-semigroupoids" = callPackage
@@ -170205,6 +181512,8 @@ self: {
        ];
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-semigroupoids-export" = callPackage
@@ -170227,6 +181536,8 @@ self: {
        libraryHaskellDepends = [ base semigroupoids semigroups ];
        description = "useful `semigroupoids` functions reimplemented";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papa-x" = callPackage
@@ -170273,6 +181584,8 @@ self: {
        executableHaskellDepends = [ base bytestring containers ];
        description = "A passphrase generator";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "papillon" = callPackage
@@ -170306,6 +181619,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Packrat parsing; linear-time parsers for grammars in TDPL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "paprika" = callPackage
@@ -170328,6 +181643,8 @@ self: {
        ];
        description = "The Haskell library and examples for the kids programming robot paprika";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "par-traverse" = callPackage
@@ -170377,6 +181694,8 @@ self: {
        executableToolDepends = [ alex ];
        description = "Paragon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parallel_3_2_0_3" = callPackage
@@ -170434,6 +181753,8 @@ self: {
          transformers vector vector-algorithms
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parallel-tree-search" = callPackage
@@ -170445,6 +181766,8 @@ self: {
        libraryHaskellDepends = [ base parallel tree-monad ];
        description = "Parallel Tree Search";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parameterized" = callPackage
@@ -170457,6 +181780,8 @@ self: {
        testHaskellDepends = [ base data-diverse hspec transformers ];
        description = "Parameterized/indexed monoids and monads using only a single parameter type variable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parameterized-data" = callPackage
@@ -170533,6 +181858,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "http proxy server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parco" = callPackage
@@ -170544,6 +181871,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Generalised parser combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parco-attoparsec" = callPackage
@@ -170555,6 +181884,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base mtl parco ];
        description = "Generalised parser combinators - Attoparsec interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parco-parsec" = callPackage
@@ -170566,6 +181897,8 @@ self: {
        libraryHaskellDepends = [ base mtl parco parsec ];
        description = "Generalised parser combinators - Parsec interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parcom-lib" = callPackage
@@ -170581,6 +181914,8 @@ self: {
        ];
        description = "A simple parser-combinator library, a bit like Parsec but without the frills";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parconc-examples" = callPackage
@@ -170609,6 +181944,8 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Examples to accompany the book \"Parallel and Concurrent Programming in Haskell\"";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pareto" = callPackage
@@ -170620,6 +181957,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A library for cause-effect relationships";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "paripari" = callPackage
@@ -170679,6 +182018,8 @@ self: {
        ];
        description = "Streaming Parquet reader";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parse-dimacs" = callPackage
@@ -170707,6 +182048,8 @@ self: {
        testHaskellDepends = [ cmdargs ];
        description = "generate command line arguments from a --help output";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parseargs" = callPackage
@@ -170722,6 +182065,8 @@ self: {
        testHaskellDepends = [ base process ];
        description = "Parse command-line arguments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsec_3_1_14_0" = callPackage
@@ -170776,6 +182121,8 @@ self: {
        ];
        description = "Parsec API encoded as a deeply-embedded DSL, for debugging and analysis";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsec-numbers" = callPackage
@@ -170819,6 +182166,8 @@ self: {
        testHaskellDepends = [ base directory doctest filepath ];
        description = "Parsing instances for Parsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsec-permutation" = callPackage
@@ -170845,6 +182194,8 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec pretty ];
        description = "Pratt Parser combinator for Parsec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsec-tagsoup" = callPackage
@@ -170891,6 +182242,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Portable monadic parser combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsec2" = callPackage
@@ -170902,6 +182255,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsec3" = callPackage
@@ -170913,6 +182268,8 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl text ];
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsec3-numbers" = callPackage
@@ -170947,6 +182304,8 @@ self: {
        testHaskellDepends = [ base hspec parsec ];
        description = "Adds and Eq instance for Parsec's ParseError if needed";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsek" = callPackage
@@ -170958,6 +182317,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Parallel Parsing Processes";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsely" = callPackage
@@ -170968,6 +182329,8 @@ self: {
        sha256 = "16sg32qs1kq184wk6d83z20b9firh1kjmysqwd2aqaiyq37zjyyb";
        libraryHaskellDepends = [ base mtl parsec ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parser-combinators" = callPackage
@@ -170999,6 +182362,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Test suite of parser-combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parser-helper" = callPackage
@@ -171014,6 +182379,8 @@ self: {
        ];
        description = "Prints Haskell parse trees in JSON";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parser241" = callPackage
@@ -171028,6 +182395,8 @@ self: {
        testHaskellDepends = [ base containers hspec mtl ];
        description = "An interface to create production rules using augmented grammars";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsergen" = callPackage
@@ -171049,6 +182418,8 @@ self: {
        ];
        description = "TH parser generator for splitting bytestring into fixed-width fields";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsers" = callPackage
@@ -171085,6 +182456,8 @@ self: {
        ];
        description = "`parsers` instances for Megaparsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsestar" = callPackage
@@ -171108,6 +182481,8 @@ self: {
        ];
        description = "NMR-STAR file format parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsimony" = callPackage
@@ -171119,6 +182494,8 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        description = "Monadic parser combinators derived from Parsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "parsix" = callPackage
@@ -171139,6 +182516,8 @@ self: {
        ];
        description = "Parser combinators with slicing, error recovery, and syntax highlighting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "partage" = callPackage
@@ -171157,6 +182536,8 @@ self: {
        testHaskellDepends = [ base containers HUnit tasty tasty-hunit ];
        description = "Parsing factorized";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "partial" = callPackage
@@ -171205,6 +182586,8 @@ self: {
        ];
        description = "Haskell 98 Partial Lenses";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "partial-order" = callPackage
@@ -171222,6 +182605,8 @@ self: {
        ];
        description = "Provides typeclass suitable for types admitting a partial order";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "partial-records" = callPackage
@@ -171233,6 +182618,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell transformers ];
        description = "Template haskell utilities for constructing records with default values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "partial-semigroup" = callPackage
@@ -171245,6 +182632,8 @@ self: {
        testHaskellDepends = [ base doctest hedgehog ];
        description = "A partial binary associative operator";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "partial-semigroup-hedgehog" = callPackage
@@ -171256,6 +182645,8 @@ self: {
        libraryHaskellDepends = [ base hedgehog partial-semigroup ];
        description = "Property testing for partial semigroups using Hedgehog";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "partial-semigroup-test" = callPackage
@@ -171268,6 +182659,8 @@ self: {
        doHaddock = false;
        description = "Testing utilities for the partial-semigroup package";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "partial-uri" = callPackage
@@ -171302,6 +182695,8 @@ self: {
        ];
        description = "Inspect, create, and alter MBRs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "passage" = callPackage
@@ -171320,6 +182715,8 @@ self: {
        ];
        description = "Parallel code generation for hierarchical Bayesian modeling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "passman" = callPackage
@@ -171345,6 +182742,8 @@ self: {
        ];
        description = "a simple password manager";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "passman-cli" = callPackage
@@ -171438,6 +182837,8 @@ self: {
        libraryHaskellDepends = [ base containers MonadRandom random ];
        description = "Password generation/validation library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pasta" = callPackage
@@ -171454,6 +182855,8 @@ self: {
        testHaskellDepends = [ base hspec microlens protolude ];
        description = "PostgreSQL Abstract Syntax Tree Assember";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pastis" = callPackage
@@ -171465,6 +182868,8 @@ self: {
        libraryHaskellDepends = [ base HTTP network ];
        description = "Interface to the past.is URL shortening service";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pasty" = callPackage
@@ -171478,6 +182883,8 @@ self: {
        executableHaskellDepends = [ base bytestring mtl ];
        description = "A simple command line pasting utility";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "patat" = callPackage
@@ -171506,6 +182913,8 @@ self: {
        ];
        description = "Terminal-based presentations using Pandoc";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "patch" = callPackage
@@ -171526,6 +182935,8 @@ self: {
        testHaskellDepends = [ base directory filemanip filepath hlint ];
        description = "Infrastructure for writing patches which act on other types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "patch-combinators" = callPackage
@@ -171586,6 +182997,8 @@ self: {
        ];
        description = "Patches (diffs) on vectors: composable, mergeable, and invertible";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "path" = callPackage
@@ -171677,6 +183090,8 @@ self: {
        ];
        description = "Read and write UTF-8 text files";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pathfinding" = callPackage
@@ -171706,6 +183121,8 @@ self: {
        ];
        description = "A toy pathfinding library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pathological-bytestrings" = callPackage
@@ -171804,6 +183221,8 @@ self: {
        executableHaskellDepends = [ base HandsomeSoup hxt ];
        description = "A webpage scraper for Patreon which dumps a list of patrons to a text file";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pattern-arrows" = callPackage
@@ -171853,6 +183272,8 @@ self: {
        ];
        description = "Pattern tries";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "patterns" = callPackage
@@ -171869,6 +183290,8 @@ self: {
        ];
        description = "Common patterns in message-oriented applications";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "paymill" = callPackage
@@ -171905,6 +183328,8 @@ self: {
        ];
        description = "Client for a limited part of PayPal's Adaptive Payments API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "paypal-api" = callPackage
@@ -171921,6 +183346,8 @@ self: {
        ];
        description = "PayPal API, currently supporting \"ButtonManager\"";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "paypal-rest-client" = callPackage
@@ -171937,6 +183364,8 @@ self: {
        ];
        description = "A client to connect to PayPal's REST API (v1)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pb" = callPackage
@@ -171952,6 +183381,8 @@ self: {
        ];
        description = "pastebin command line application";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pb-next" = callPackage
@@ -171971,6 +183402,8 @@ self: {
        testHaskellDepends = [ base parsec tasty tasty-hunit ];
        description = "Utility CLI for working with protobuf files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pbc4hs" = callPackage
@@ -171982,6 +183415,8 @@ self: {
        libraryHaskellDepends = [ base hslua string-qq ];
        description = "pbc for HsLua";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pbkdf" = callPackage
@@ -172038,6 +183473,8 @@ self: {
        ];
        description = "Convert a pcap into an enumerator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pcd-loader" = callPackage
@@ -172062,6 +183499,8 @@ self: {
        ];
        description = "PCD file loader";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pcf" = callPackage
@@ -172079,6 +183518,8 @@ self: {
        ];
        description = "A one file compiler for PCF";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pcf-font" = callPackage
@@ -172093,6 +183534,8 @@ self: {
        ];
        description = "PCF font parsing and rendering library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pcf-font-embed" = callPackage
@@ -172108,6 +183551,8 @@ self: {
        ];
        description = "Template Haskell for embedding text rendered using PCF fonts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pcg-random" = callPackage
@@ -172194,6 +183639,8 @@ self: {
        libraryHaskellDepends = [ base bytestring pcre-light ];
        description = "pcre-light extra functionality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pcre-utils" = callPackage
@@ -172235,6 +183682,8 @@ self: {
        ];
        description = "Tool to generate PDF from haskintex templates and YAML input";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pdf-slave-server" = callPackage
@@ -172285,6 +183734,8 @@ self: {
        ];
        description = "Template format definition for pdf-slave tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pdf-toolbox-content" = callPackage
@@ -172301,6 +183752,8 @@ self: {
        ];
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pdf-toolbox-core" = callPackage
@@ -172317,6 +183770,8 @@ self: {
        ];
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pdf-toolbox-document" = callPackage
@@ -172335,6 +183790,8 @@ self: {
        ];
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pdf-toolbox-viewer" = callPackage
@@ -172355,6 +183812,8 @@ self: {
        ];
        description = "Simple pdf viewer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pdf2line" = callPackage
@@ -172404,6 +183863,8 @@ self: {
        ];
        description = "Name a PDF file using information from the pdfinfo command";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pdfsplit" = callPackage
@@ -172419,6 +183880,8 @@ self: {
        ];
        description = "split two-column PDFs, so there is one column per page";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pdynload" = callPackage
@@ -172435,6 +183898,8 @@ self: {
        ];
        description = "pdynload is polymorphic dynamic linking library";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "peakachu" = callPackage
@@ -172450,6 +183915,8 @@ self: {
        ];
        description = "Experiemental library for composable interactive programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "peano" = callPackage
@@ -172499,6 +183966,8 @@ self: {
        ];
        description = "pec embedded compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pecoff" = callPackage
@@ -172511,6 +183980,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring containers ];
        description = "Parser for PE/COFF format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pedersen-commitment" = callPackage
@@ -172544,6 +184015,8 @@ self: {
        libraryHaskellDepends = [ array base binary containers ];
        description = "A pedestrian implementation of directed acyclic graphs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "peg" = callPackage
@@ -172561,6 +184034,8 @@ self: {
        ];
        description = "a lazy non-deterministic concatenative programming language";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "peggy" = callPackage
@@ -172579,6 +184054,8 @@ self: {
        ];
        description = "The Parser Generator for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pell" = callPackage
@@ -172637,6 +184114,8 @@ self: {
        ];
        description = "Static site generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "penn-treebank" = callPackage
@@ -172676,6 +184155,8 @@ self: {
        ];
        description = "Extensible double-entry accounting system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "penny-bin" = callPackage
@@ -172694,6 +184175,8 @@ self: {
        ];
        description = "Deprecated - use penny package instead";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "penny-lib" = callPackage
@@ -172715,6 +184198,8 @@ self: {
        ];
        description = "Deprecated - use penny package instead";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "penrose" = callPackage
@@ -172750,6 +184235,8 @@ self: {
        ];
        description = "Create beautiful diagrams just by typing mathematical notation in plain text";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "peparser" = callPackage
@@ -172761,6 +184248,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring haskell98 ];
        description = "A parser for PE object files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "percent-format" = callPackage
@@ -172784,6 +184273,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "The perceptron learning algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "perceptual-hash" = callPackage
@@ -172855,6 +184346,8 @@ self: {
        ];
        description = "Database migration support for use in other libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "perf" = callPackage
@@ -172871,6 +184364,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Low-level run time measurement";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "perf-analysis" = callPackage
@@ -172893,6 +184388,8 @@ self: {
        ];
        description = "analysis example using perf";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "perfect-hash-generator" = callPackage
@@ -172971,6 +184468,8 @@ self: {
        ];
        description = "A perfect hashing library for mapping bytestrings to values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "perhaps" = callPackage
@@ -172988,6 +184487,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Perhaps, a monad";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "period" = callPackage
@@ -173024,6 +184525,8 @@ self: {
        testHaskellDepends = [ base cereal hedis hspec text time ];
        description = "A reliable at-least-once periodic job scheduler backed by redis";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "perm" = callPackage
@@ -173040,6 +184543,8 @@ self: {
        ];
        description = "permutation Applicative and Monad with many mtl instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "permutation" = callPackage
@@ -173054,6 +184559,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim QuickCheck ];
        description = "A library for permutations and combinations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "permutations" = callPackage
@@ -173077,6 +184584,8 @@ self: {
        ];
        description = "Permutations of finite sets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "permute" = callPackage
@@ -173088,6 +184597,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Generalised permutation parser combinator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persist" = callPackage
@@ -173120,6 +184631,8 @@ self: {
        ];
        description = "Transforms persist's quasi-quoted syntax into ER format";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistable-record" = callPackage
@@ -173252,6 +184765,8 @@ self: {
        ];
        description = "Parses a Persist Model file and produces Audit Models";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-cereal" = callPackage
@@ -173263,6 +184778,8 @@ self: {
        libraryHaskellDepends = [ base cereal persistent text ];
        description = "Helper functions for writing Persistent instances";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-database-url" = callPackage
@@ -173282,6 +184799,8 @@ self: {
        ];
        description = "Parse DATABASE_URL into configuration types for Persistent";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-documentation" = callPackage
@@ -173302,6 +184821,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Documentation DSL for persistent entities";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-equivalence" = callPackage
@@ -173313,6 +184834,8 @@ self: {
        libraryHaskellDepends = [ array base diffarray ];
        description = "Persistent equivalence relations (aka union-find)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-hssqlppp" = callPackage
@@ -173329,6 +184852,8 @@ self: {
        ];
        description = "Declare Persistent entities using SQL SELECT query syntax";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-instances-iproute" = callPackage
@@ -173356,6 +184881,8 @@ self: {
        ];
        description = "Persistent instances for types in iproute";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-map" = callPackage
@@ -173372,6 +184899,8 @@ self: {
        ];
        description = "A thread-safe (STM) persistency interface for finite map types";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-migration" = callPackage
@@ -173396,6 +184925,8 @@ self: {
        ];
        description = "Manual migrations for the persistent library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-mongoDB" = callPackage
@@ -173423,6 +184954,8 @@ self: {
        ];
        description = "Backend for the persistent library using mongoDB";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-mysql" = callPackage
@@ -173449,6 +184982,8 @@ self: {
        ];
        description = "Backend for the persistent library using MySQL database server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-mysql-haskell" = callPackage
@@ -173481,6 +185016,8 @@ self: {
        ];
        description = "A pure haskell backend for the persistent library using MySQL database server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-odbc" = callPackage
@@ -173579,6 +185116,8 @@ self: {
        ];
        description = "Template-Haskell helpers for integrating protobufs with persistent";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-qq" = callPackage
@@ -173611,6 +185150,8 @@ self: {
        libraryHaskellDepends = [ base time yesod ];
        description = "A library for rate limiting activities with a persistent backend";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-redis" = callPackage
@@ -173635,6 +185176,8 @@ self: {
        ];
        description = "Backend for persistent library using Redis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-refs" = callPackage
@@ -173671,6 +185214,8 @@ self: {
        ];
        description = "relational-record on persisten backends";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-spatial" = callPackage
@@ -173802,6 +185347,8 @@ self: {
        ];
        description = "Generate classy lens field accessors for persistent models";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-test" = callPackage
@@ -173849,6 +185396,8 @@ self: {
        ];
        description = "Type safe access to multiple database schemata";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-vector" = callPackage
@@ -173866,6 +185415,8 @@ self: {
        benchmarkHaskellDepends = [ base containers criterion deepseq ];
        description = "A persistent sequence based on array mapped tries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-zookeeper" = callPackage
@@ -173895,6 +185446,8 @@ self: {
        ];
        description = "Backend for persistent library using Zookeeper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persona" = callPackage
@@ -173911,6 +185464,8 @@ self: {
        ];
        description = "Persona (BrowserID) library";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persona-idp" = callPackage
@@ -173932,6 +185487,8 @@ self: {
        ];
        description = "Persona (BrowserID) Identity Provider";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pesca" = callPackage
@@ -173946,6 +185503,8 @@ self: {
        executableHaskellDepends = [ base process ];
        description = "Proof Editor for Sequent Calculus";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "peyotls" = callPackage
@@ -173972,6 +185531,8 @@ self: {
        ];
        description = "Pretty Easy YOshikuni-made TLS library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "peyotls-codec" = callPackage
@@ -173989,6 +185550,8 @@ self: {
        ];
        description = "Codec parts of Pretty Easy YOshikuni-made TLS library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pez" = callPackage
@@ -174005,6 +185568,8 @@ self: {
        ];
        description = "A Pretty Extraordinary Zipper library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pg-harness" = callPackage
@@ -174024,6 +185589,8 @@ self: {
        ];
        description = "REST service and library for creating/consuming temporary PostgreSQL databases";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pg-harness-client" = callPackage
@@ -174079,6 +185646,8 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pg-store" = callPackage
@@ -174102,6 +185671,8 @@ self: {
        ];
        description = "Simple storage interface to PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pg-transact" = callPackage
@@ -174123,6 +185694,8 @@ self: {
        ];
        description = "A postgresql-simple transaction monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pgdl" = callPackage
@@ -174148,6 +185721,8 @@ self: {
        ];
        description = "browse directory listing webpages and download files from them";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pgm" = callPackage
@@ -174195,6 +185770,8 @@ self: {
        ];
        description = "A mid-level PostgreSQL client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pgstream" = callPackage
@@ -174219,6 +185796,8 @@ self: {
        ];
        description = "Streaming Postgres bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "phantom-state" = callPackage
@@ -174245,6 +185824,8 @@ self: {
        ];
        description = "Freezing, thawing, and copy elision";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "phaser" = callPackage
@@ -174259,6 +185840,8 @@ self: {
        ];
        description = "Incremental multiple pass parser library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "phash" = callPackage
@@ -174316,6 +185899,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Deprecated - ghci debug viewer with simple editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "phoityne-vscode" = callPackage
@@ -174338,6 +185923,8 @@ self: {
        ];
        description = "Haskell Debug Adapter for Visual Studio Code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "phone-metadata" = callPackage
@@ -174366,6 +185953,8 @@ self: {
        testHaskellDepends = [ base bytestring ];
        description = "Haskell bindings to the libphonenumber library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {phonenumber = null; inherit (pkgs) protobuf;};
 
   "phone-push" = callPackage
@@ -174383,6 +185972,8 @@ self: {
        ];
        description = "Push notifications for Android and iOS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "phonetic-code" = callPackage
@@ -174409,6 +186000,8 @@ self: {
        ];
        description = "Functional user interfaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "photoname" = callPackage
@@ -174430,6 +186023,8 @@ self: {
        ];
        description = "Rename photo image files based on EXIF shoot date";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "phraskell" = callPackage
@@ -174443,6 +186038,8 @@ self: {
        executableHaskellDepends = [ base mtl SDL transformers ];
        description = "A fractal viewer";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "phybin" = callPackage
@@ -174475,6 +186072,8 @@ self: {
        ];
        description = "Utility for clustering phylogenetic trees in Newick format based on Robinson-Foulds distance";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "physics" = callPackage
@@ -174506,6 +186105,8 @@ self: {
        ];
        description = "Applied pi-calculus interpreter";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pi-forall" = callPackage
@@ -174529,6 +186130,8 @@ self: {
        ];
        description = "Demo implementation of typechecker for dependently-typed language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pi-hoole" = callPackage
@@ -174554,6 +186157,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Lightweight access control solution for the pijul vcs";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pi-lcd" = callPackage
@@ -174595,6 +186200,8 @@ self: {
        ];
        description = "Set up port forwarding with the Private Internet Access VPN service";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pianola" = callPackage
@@ -174617,6 +186224,8 @@ self: {
        ];
        description = "Remotely controlling Java Swing applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "picedit" = callPackage
@@ -174631,6 +186240,8 @@ self: {
        executableHaskellDepends = [ base cli hmatrix ];
        description = "simple image manipulation functions";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pickle" = callPackage
@@ -174644,6 +186255,8 @@ self: {
        libraryHaskellDepends = [ base containers network stm text ];
        description = "Instant StatsD in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "picologic" = callPackage
@@ -174666,6 +186279,8 @@ self: {
        ];
        description = "Utilities for symbolic predicate logic expressions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "picoparsec" = callPackage
@@ -174698,6 +186313,8 @@ self: {
        ];
        description = "Fast combinator parsing for bytestrings and text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "picosat" = callPackage
@@ -174723,6 +186340,8 @@ self: {
        executableHaskellDepends = [ base matrix transformers xml ];
        description = "Converts a svg image to tikz code";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pid1" = callPackage
@@ -174770,6 +186389,8 @@ self: {
        ];
        description = "Yet another Haskell build system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pier-core" = callPackage
@@ -174789,6 +186410,8 @@ self: {
        ];
        description = "A library for writing forwards-declared build systems in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "piet" = callPackage
@@ -174802,6 +186425,8 @@ self: {
        libraryHaskellDepends = [ array base containers Imlib mtl ];
        description = "A Piet interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pig" = callPackage
@@ -174818,6 +186443,8 @@ self: {
        ];
        description = "dice game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "piki" = callPackage
@@ -174856,6 +186483,8 @@ self: {
        ];
        description = "Access to the Pinboard API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pinboard-notes-backup" = callPackage
@@ -174876,6 +186505,8 @@ self: {
        ];
        description = "Back up the notes you've saved to Pinboard";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pinch" = callPackage
@@ -174899,6 +186530,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "An alternative implementation of Thrift for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pinchot" = callPackage
@@ -174917,6 +186550,8 @@ self: {
        ];
        description = "Write grammars, not parsers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pine" = callPackage
@@ -174936,6 +186571,8 @@ self: {
        testHaskellDepends = [ base containers sdl2 sdl2-image stm text ];
        description = "Functional 2D Game Framework";
        license = stdenv.lib.licenses.zlib;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ping" = callPackage
@@ -174954,6 +186591,8 @@ self: {
        ];
        description = "icmp echo requests";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ping-parser-attoparsec" = callPackage
@@ -175032,6 +186671,8 @@ self: {
        testHaskellDepends = [ base doctest protolude ];
        description = "A gateway for various cloud notification services";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipe-enumerator" = callPackage
@@ -175043,6 +186684,8 @@ self: {
        libraryHaskellDepends = [ base enumerator pipes transformers ];
        description = "A bidirectional bridge between pipes and iteratees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipeclip" = callPackage
@@ -175150,6 +186793,8 @@ self: {
        ];
        description = "A higher-level interface to using concurrency with pipes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-attoparsec" = callPackage
@@ -175189,6 +186834,8 @@ self: {
        ];
        description = "Streaming parsing in the pipes-core framework with Attoparsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-bgzf" = callPackage
@@ -175204,6 +186851,8 @@ self: {
        ];
        description = "Blocked GZip";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-binary" = callPackage
@@ -175257,6 +186906,8 @@ self: {
        ];
        description = "Brotli (RFC7932) compressors and decompressors for the Pipes package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-bytestring" = callPackage
@@ -175296,6 +186947,8 @@ self: {
        benchmarkHaskellDepends = [ base ];
        description = "Streaming compression/decompression via pipes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) bzip2;};
 
   "pipes-cacophony" = callPackage
@@ -175312,6 +186965,8 @@ self: {
        testHaskellDepends = [ base hlint ];
        description = "Pipes for Noise-secured network connections";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-category" = callPackage
@@ -175387,6 +187042,8 @@ self: {
        ];
        description = "Encode and decode binary streams using the pipes and cereal libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-cereal-plus" = callPackage
@@ -175402,6 +187059,8 @@ self: {
        ];
        description = "A streaming serialization library on top of \"pipes\" and \"cereal-plus\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-cliff" = callPackage
@@ -175448,6 +187107,8 @@ self: {
        libraryHaskellDepends = [ base conduit mtl pipes-core ];
        description = "Conduit adapters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-core" = callPackage
@@ -175463,6 +187124,8 @@ self: {
        ];
        description = "Compositional pipelines";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-courier" = callPackage
@@ -175474,6 +187137,8 @@ self: {
        libraryHaskellDepends = [ base courier pipes ];
        description = "Pipes utilities for interfacing with the courier message-passing framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-csv" = callPackage
@@ -175495,6 +187160,8 @@ self: {
        ];
        description = "Fast, streaming csv parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-errors" = callPackage
@@ -175506,6 +187173,8 @@ self: {
        libraryHaskellDepends = [ base errors pipes ];
        description = "Integration between pipes and errors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-extra" = callPackage
@@ -175533,6 +187202,8 @@ self: {
        ];
        description = "Various basic utilities for Pipes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-extras" = callPackage
@@ -175593,6 +187264,8 @@ self: {
        ];
        description = "Fast traversal of directory trees using pipes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-fluid" = callPackage
@@ -175663,6 +187336,8 @@ self: {
        ];
        description = "Illumina NGS data processing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-interleave" = callPackage
@@ -175674,6 +187349,8 @@ self: {
        libraryHaskellDepends = [ base containers heaps pipes ];
        description = "Interleave and merge streams of elements";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-io" = callPackage
@@ -175688,6 +187365,8 @@ self: {
        testHaskellDepends = [ base hspec pipes ];
        description = "Stateful IO streams based on pipes";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-kafka" = callPackage
@@ -175728,6 +187407,8 @@ self: {
        ];
        description = "Streaming processing of CSV files preceded by key-value pairs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-lines" = callPackage
@@ -175765,6 +187446,8 @@ self: {
        ];
        description = "LZMA compressors and decompressors for the Pipes package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-misc" = callPackage
@@ -175797,7 +187480,8 @@ self: {
        testHaskellDepends = [ base monad-control mongoDB pipes text ];
        description = "Stream results from MongoDB";
        license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ jb55 ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-network" = callPackage
@@ -175873,6 +187557,8 @@ self: {
        ];
        description = "P2P network nodes with pipes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-p2p-examples" = callPackage
@@ -175891,6 +187577,8 @@ self: {
        ];
        description = "Examples using pipes-p2p";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-parse" = callPackage
@@ -175941,6 +187629,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Alternate Prelude for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-random" = callPackage
@@ -175966,6 +187656,8 @@ self: {
        executableHaskellDepends = [ base pipes time ];
        description = "A few pipes to control the timing of yields";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-s3" = callPackage
@@ -175988,6 +187680,8 @@ self: {
        ];
        description = "A simple interface for streaming data to and from Amazon S3";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-safe" = callPackage
@@ -176024,6 +187718,8 @@ self: {
        ];
        description = "Create proper Pipes from System.Process";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-sqlite-simple" = callPackage
@@ -176037,6 +187733,8 @@ self: {
        ];
        description = "Functions that smash Pipes and sqlite-simple together";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-text" = callPackage
@@ -176054,6 +187752,8 @@ self: {
        ];
        description = "properly streaming text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-transduce" = callPackage
@@ -176077,6 +187777,8 @@ self: {
        ];
        description = "Interfacing pipes with foldl folds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-vector" = callPackage
@@ -176092,6 +187794,8 @@ self: {
        ];
        description = "Various proxies for streaming data into vectors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-wai" = callPackage
@@ -176142,6 +187846,8 @@ self: {
        ];
        description = "Pipes integration for ZeroMQ messaging";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pipes-zlib" = callPackage
@@ -176181,6 +187887,8 @@ self: {
        ];
        description = "A dependently typed core language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pit" = callPackage
@@ -176203,6 +187911,8 @@ self: {
        ];
        description = "Account management tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pitchtrack" = callPackage
@@ -176223,6 +187933,8 @@ self: {
        ];
        description = "Pitch tracking library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pivotal-tracker" = callPackage
@@ -176246,6 +187958,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "A library and a CLI tool for accessing Pivotal Tracker API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pixela" = callPackage
@@ -176290,6 +188004,8 @@ self: {
        ];
        description = "A library and application for generating pixelated avatars";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "piyo" = callPackage
@@ -176346,6 +188062,8 @@ self: {
        ];
        description = "PKCS#10 library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pkcs7" = callPackage
@@ -176358,6 +188076,8 @@ self: {
        testHaskellDepends = [ base bytestring Cabal HUnit QuickCheck ];
        description = "PKCS #7 padding in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pkggraph" = callPackage
@@ -176371,6 +188091,8 @@ self: {
        executableHaskellDepends = [ base Cabal split ];
        description = "Package dependency graph for installed packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pkgtreediff" = callPackage
@@ -176389,6 +188111,8 @@ self: {
        ];
        description = "Package tree diff tool";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pktree" = callPackage
@@ -176423,6 +188147,8 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl time unix ];
        description = "plaimi's prelude";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plan-applicative" = callPackage
@@ -176443,6 +188169,8 @@ self: {
        ];
        description = "Applicative/Arrow for resource estimation and progress tracking";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plan-b" = callPackage
@@ -176461,6 +188189,8 @@ self: {
        testHaskellDepends = [ base hspec path path-io ];
        description = "Failure-tolerant file and directory editing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "planar-graph" = callPackage
@@ -176477,6 +188207,8 @@ self: {
        ];
        description = "A representation of planar graphs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "planb-token-introspection" = callPackage
@@ -176554,6 +188286,8 @@ self: {
        ];
        description = "Planet Mitchell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "planet-mitchell-test" = callPackage
@@ -176570,6 +188304,8 @@ self: {
        ];
        description = "Planet Mitchell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plankton" = callPackage
@@ -176581,6 +188317,8 @@ self: {
        libraryHaskellDepends = [ adjunctions base protolude ];
        description = "The core of a numeric prelude, taken from numhask";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plat" = callPackage
@@ -176594,6 +188332,8 @@ self: {
        ];
        description = "Simple templating library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "platinum-parsing" = callPackage
@@ -176617,6 +188357,8 @@ self: {
        testHaskellDepends = [ base containers fgl hspec vector ];
        description = "General Framework for compiler development";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "playlists" = callPackage
@@ -176690,6 +188432,8 @@ self: {
        libraryHaskellDepends = [ base base64-bytestring bytestring hxt ];
        description = "Generate and parse Mac OS X property list format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plist-buddy" = callPackage
@@ -176713,6 +188457,8 @@ self: {
        ];
        description = "Remote monad for editing plists";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plivo" = callPackage
@@ -176746,6 +188492,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative socketed ];
        description = "plot data from stdin through socketed";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plot" = callPackage
@@ -176761,6 +188509,8 @@ self: {
        ];
        description = "A plotting library, exportable as eps/pdf/svg/png or renderable with gtk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plot-gtk" = callPackage
@@ -176772,6 +188522,8 @@ self: {
        libraryHaskellDepends = [ base glib gtk hmatrix mtl plot process ];
        description = "GTK plots and interaction with GHCi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plot-gtk-ui" = callPackage
@@ -176788,6 +188540,8 @@ self: {
        ];
        description = "A quick way to use Mathematica like Manipulation abilities";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plot-gtk3" = callPackage
@@ -176801,6 +188555,8 @@ self: {
        ];
        description = "GTK3 plots and interaction with GHCi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plot-lab" = callPackage
@@ -176817,6 +188573,8 @@ self: {
        ];
        description = "A plotting tool with Mathematica like Manipulation abilities";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plot-light" = callPackage
@@ -176925,6 +188683,8 @@ self: {
        ];
        description = "Diagrams based plotting library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plotserver-api" = callPackage
@@ -176965,6 +188725,8 @@ self: {
        ];
        description = "Dynamic linking for Haskell and C objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plugins-auto" = callPackage
@@ -176981,6 +188743,8 @@ self: {
        testHaskellDepends = [ base directory process ];
        description = "Automatic recompilation and reloading of haskell modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plugins-multistage" = callPackage
@@ -176999,6 +188763,8 @@ self: {
        ];
        description = "Dynamic linking for embedded DSLs with staged compilation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plumbers" = callPackage
@@ -177022,6 +188788,8 @@ self: {
        testHaskellDepends = [ base hedgehog hedgehog-classes ];
        description = "Plurality monad: Zero, one, or at least two";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "plural" = callPackage
@@ -177034,6 +188802,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Pluralize";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ply-loader" = callPackage
@@ -177068,6 +188838,8 @@ self: {
        ];
        description = "read/write png file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pngload" = callPackage
@@ -177084,6 +188856,8 @@ self: {
        ];
        description = "Pure Haskell loader for PNG images";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pngload-fixed" = callPackage
@@ -177096,6 +188870,8 @@ self: {
        libraryHaskellDepends = [ array base bytestring mtl parsec zlib ];
        description = "Pure Haskell loader for PNG images";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pnm" = callPackage
@@ -177123,6 +188899,8 @@ self: {
        ];
        description = "Bindings for the Pocket API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pocket-dns" = callPackage
@@ -177157,6 +188935,8 @@ self: {
        ];
        description = "Multi-backend (zookeeper and sqlite) DNS Server using persistent-library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "point-octree" = callPackage
@@ -177175,6 +188955,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Point octree, with bounding boxes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pointed" = callPackage
@@ -177206,6 +188988,8 @@ self: {
        libraryHaskellDepends = [ base mtl semigroups transformers ];
        description = "Alternative done right";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pointedlist" = callPackage
@@ -177282,6 +189066,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Pointful refactoring tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pointless-fun" = callPackage
@@ -177304,6 +189090,8 @@ self: {
        libraryHaskellDepends = [ base GHood process syb ];
        description = "Pointless Haskell library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pointless-lenses" = callPackage
@@ -177319,6 +189107,8 @@ self: {
        ];
        description = "Pointless Lenses library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pointless-rewrite" = callPackage
@@ -177334,6 +189124,8 @@ self: {
        ];
        description = "Pointless Rewrite library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pokemon-go-protobuf-types" = callPackage
@@ -177350,6 +189142,8 @@ self: {
        ];
        description = "Haskell types for the Pokemon Go protobuf protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "poker-eval" = callPackage
@@ -177362,6 +189156,8 @@ self: {
        librarySystemDepends = [ poker-eval ];
        description = "Binding to libpoker-eval";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {poker-eval = null;};
 
   "pokitdok" = callPackage
@@ -177379,6 +189175,8 @@ self: {
        ];
        description = "PokitDok Platform API Client for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polar" = callPackage
@@ -177402,6 +189200,8 @@ self: {
        testHaskellDepends = [ base containers HUnit MissingH mtl parsec ];
        description = "Fork of ConfigFile for Polar Game Engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polar-shader" = callPackage
@@ -177414,6 +189214,8 @@ self: {
        testHaskellDepends = [ base containers hspec ];
        description = "High-level shader compiler framework";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polh-lexicon" = callPackage
@@ -177432,6 +189234,8 @@ self: {
        ];
        description = "A library for manipulating the historical dictionary of Polish (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "policeman" = callPackage
@@ -177535,6 +189339,8 @@ self: {
        libraryHaskellDepends = [ base lens ];
        description = "This package provides abstraction for polymorphic controls, like PolyMonads or PolyApplicatives";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polyToMonoid" = callPackage
@@ -177564,6 +189370,8 @@ self: {
        ];
        description = "Wrap together data and it's constraints";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polydata-core" = callPackage
@@ -177575,6 +189383,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Core data definitions for the \"polydata\" package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polymap" = callPackage
@@ -177630,6 +189440,8 @@ self: {
        ];
        description = "Polynomials";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polynomials-bernstein" = callPackage
@@ -177743,6 +189555,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Experimental, RandomFu effect and interpreters for polysemy";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polysemy-plugin" = callPackage
@@ -177766,6 +189580,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Disambiguate obvious uses of effects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polysemy-zoo" = callPackage
@@ -177791,6 +189607,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Experimental, user-contributed effects and interpreters for polysemy";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polyseq" = callPackage
@@ -177811,6 +189629,8 @@ self: {
        executableHaskellDepends = [ cgi free-theorems utf8-string xhtml ];
        description = "Taming Selective Strictness";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polysoup" = callPackage
@@ -177824,6 +189644,8 @@ self: {
        ];
        description = "Online XML parsing with polyparse and tagsoup";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polytypeable" = callPackage
@@ -177835,6 +189657,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Typeable for polymorphic types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polytypeable-utils" = callPackage
@@ -177846,6 +189670,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 polytypeable ];
        description = "Utilities for polytypeable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "polyvariadic" = callPackage
@@ -177899,6 +189725,8 @@ self: {
        ];
        description = "pomodoro timer";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pomohoro" = callPackage
@@ -177922,6 +189750,8 @@ self: {
        testHaskellDepends = [ base hspec protolude ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ponder" = callPackage
@@ -177933,6 +189763,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "PEG parser combinator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pong-server" = callPackage
@@ -177950,6 +189782,8 @@ self: {
        testHaskellDepends = [ base hspec network QuickCheck ];
        description = "A simple embedded pingable server that runs in the background";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pontarius-mediaserver" = callPackage
@@ -178009,6 +189843,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "An XMPP client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pontarius-xpmn" = callPackage
@@ -178051,6 +189887,8 @@ self: {
        libraryHaskellDepends = [ base monad-control transformers ];
        description = "Thread-safe resource pools. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pool-conduit" = callPackage
@@ -178068,6 +189906,8 @@ self: {
        ];
        description = "Resource pool allocations via ResourceT. (deprecated)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pooled-io" = callPackage
@@ -178098,6 +189938,8 @@ self: {
        libraryHaskellDepends = [ base mtl network ];
        description = "POP3 Client Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "popenhs" = callPackage
@@ -178110,6 +189952,8 @@ self: {
        libraryHaskellDepends = [ base directory haskell98 unix ];
        description = "popenhs is a popen-like library for Haskell";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "poppler" = callPackage
@@ -178130,6 +189974,8 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the Poppler";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gdk-pixbuf; inherit (pkgs) gtk2; 
          inherit (pkgs) pango; inherit (pkgs) poppler;};
 
@@ -178184,6 +190030,8 @@ self: {
        ];
        description = "Express portable, composable and reusable data tasks and pipelines";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "porcupine-http" = callPackage
@@ -178212,6 +190060,8 @@ self: {
        ];
        description = "A location accessor for porcupine to connect to HTTP sources/sinks";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "porcupine-s3" = callPackage
@@ -178242,6 +190092,8 @@ self: {
        ];
        description = "A location accessor for porcupine to connect to AWS S3 sources/sinks";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "port-utils" = callPackage
@@ -178295,6 +190147,8 @@ self: {
        testHaskellDepends = [ base containers hspec mtl QuickCheck text ];
        description = "DSL for configuring Gentoo portage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "portaudio" = callPackage
@@ -178325,6 +190179,8 @@ self: {
        ];
        description = "FreeBSD ports index search and analysis tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "porter" = callPackage
@@ -178347,6 +190203,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 unix ];
        description = "The Haskell Ports Library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ports-tools" = callPackage
@@ -178381,6 +190239,8 @@ self: {
        ];
        description = "Simple extensible library to run SQL file against PostgreSQL database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "poseidon-postgis" = callPackage
@@ -178401,6 +190261,8 @@ self: {
        ];
        description = "Extension of Poseidon library for Postgis (Spatial and Geographic objects for PostgreSQL)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "positive" = callPackage
@@ -178446,6 +190308,8 @@ self: {
        librarySystemDepends = [ acl ];
        description = "Support for Posix ACL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) acl;};
 
   "posix-api" = callPackage
@@ -178545,6 +190409,8 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "POSIX Realtime functionality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "posix-socket" = callPackage
@@ -178585,6 +190451,8 @@ self: {
        libraryHaskellDepends = [ base unix ];
        description = "Low-level wrapping of POSIX waitpid(2)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "posplyu" = callPackage
@@ -178602,6 +190470,8 @@ self: {
        ];
        description = "Sleep tracker for X11, using XScreenSaver extension and manual input";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "possible" = callPackage
@@ -178646,6 +190516,8 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring HTTP ];
        description = "A library that gets postcode information from the uk-postcodes.com";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgres-embedded" = callPackage
@@ -178664,6 +190536,8 @@ self: {
        ];
        description = "Library for easily running embedded PostgreSQL server for tests";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgres-options" = callPackage
@@ -178691,6 +190565,8 @@ self: {
        libraryHaskellDepends = [ base bytestring postgresql-simple text ];
        description = "Create a temporary database that is deleted after performing some operation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgres-websockets" = callPackage
@@ -178725,6 +190601,8 @@ self: {
        ];
        description = "Middleware to map LISTEN/NOTIFY messages to Websockets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgresql-binary" = callPackage
@@ -178886,6 +190764,8 @@ self: {
        ];
        description = "Utilities for streaming PostgreSQL LargeObjects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgresql-named" = callPackage
@@ -178903,6 +190783,8 @@ self: {
        testHaskellDepends = [ base generics-sop hspec postgresql-simple ];
        description = "Generic deserialization of PostgreSQL rows based on column names";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgresql-orm" = callPackage
@@ -179006,6 +190888,8 @@ self: {
        ];
        description = "Sql interpolating quasiquote plus some kind of primitive ORM using it";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgresql-schema" = callPackage
@@ -179077,6 +190961,8 @@ self: {
        ];
        description = "FFI-like bindings for PostgreSQL stored functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgresql-simple-interpolate" = callPackage
@@ -179134,6 +191020,8 @@ self: {
        ];
        description = "Implementation of named parameters for `postgresql-simple` library";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgresql-simple-opts" = callPackage
@@ -179157,6 +191045,8 @@ self: {
        ];
        description = "An optparse-applicative and envy parser for postgres options";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgresql-simple-queue" = callPackage
@@ -179182,6 +191072,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A PostgreSQL backed queue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgresql-simple-sop" = callPackage
@@ -179193,6 +191085,8 @@ self: {
        libraryHaskellDepends = [ base generics-sop postgresql-simple ];
        description = "Generic functions for postgresql-simple";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgresql-simple-typed" = callPackage
@@ -179209,6 +191103,8 @@ self: {
        ];
        description = "Typed extension for PostgreSQL simple";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgresql-simple-url" = callPackage
@@ -179285,6 +191181,8 @@ self: {
        ];
        description = "PostgreSQL interface with compile-time SQL type checking, optional HDBC backend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgresql-typed-lifted" = callPackage
@@ -179301,6 +191199,8 @@ self: {
        ];
        description = "postgresql-typed operations lifted to any instance of MonadBase or MonadBaseControl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgrest" = callPackage
@@ -179347,6 +191247,8 @@ self: {
        ];
        description = "REST API for any Postgres database";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postgrest-ws" = callPackage
@@ -179382,6 +191284,8 @@ self: {
        ];
        description = "PostgREST extension to map LISTEN/NOTIFY messages to Websockets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postie" = callPackage
@@ -179401,6 +191305,8 @@ self: {
        ];
        description = "SMTP server library to receive emails from within Haskell programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postmark" = callPackage
@@ -179419,6 +191325,8 @@ self: {
        ];
        description = "Library for postmarkapp.com HTTP Api";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "postmark-streams" = callPackage
@@ -179455,6 +191363,8 @@ self: {
        ];
        description = "Postmaster ESMTP Server";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "potato-tool" = callPackage
@@ -179468,6 +191378,8 @@ self: {
        executableHaskellDepends = [ base binary bytestring split ];
        description = "Command line Dreamcast VMU filesystem toolset";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "potoki" = callPackage
@@ -179479,6 +191391,8 @@ self: {
        libraryHaskellDepends = [ potoki-core ];
        description = "Simple streaming in IO";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "potoki-cereal" = callPackage
@@ -179501,6 +191415,8 @@ self: {
        ];
        description = "Streaming serialization";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "potoki-conduit" = callPackage
@@ -179523,6 +191439,8 @@ self: {
        ];
        description = "Integration of \"potoki\" and \"conduit\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "potoki-core" = callPackage
@@ -179550,6 +191468,8 @@ self: {
        benchmarkHaskellDepends = [ criterion rerebase ];
        description = "Low-level components of \"potoki\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "potoki-hasql" = callPackage
@@ -179565,6 +191485,8 @@ self: {
        ];
        description = "Integration of \"potoki\" and \"hasql\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "potoki-zlib" = callPackage
@@ -179578,6 +191500,8 @@ self: {
        ];
        description = "Streaming ZLib decompression";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "potrace" = callPackage
@@ -179621,6 +191545,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "bindings for Griffin PowerMate USB";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "powerpc" = callPackage
@@ -179632,6 +191558,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Tools for PowerPC programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "powerqueue" = callPackage
@@ -179645,6 +191573,8 @@ self: {
        testHaskellDepends = [ async base hspec stm ];
        description = "A flexible job queue with exchangeable backends";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "powerqueue-distributed" = callPackage
@@ -179663,6 +191593,8 @@ self: {
        testHaskellDepends = [ async base hspec powerqueue stm timespan ];
        description = "A distributed worker backend for powerqueu";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "powerqueue-levelmem" = callPackage
@@ -179689,6 +191621,8 @@ self: {
        benchmarkSystemDepends = [ leveldb snappy ];
        description = "A high performance in memory and LevelDB backend for powerqueue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) leveldb; inherit (pkgs) snappy;};
 
   "powerqueue-sqs" = callPackage
@@ -179702,6 +191636,8 @@ self: {
        ];
        description = "A Amazon SQS backend for powerqueue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ppm" = callPackage
@@ -179758,6 +191694,8 @@ self: {
        libraryHaskellDepends = [ base QuickCheck random stm ];
        description = "Parallel batch driver for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pqueue" = callPackage
@@ -179787,6 +191725,8 @@ self: {
        ];
        description = "Fully encapsulated monad transformers with queuelike functionality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "practice-room" = callPackage
@@ -179805,6 +191745,8 @@ self: {
        ];
        description = "Practice Room";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "praglude" = callPackage
@@ -179825,6 +191767,8 @@ self: {
        ];
        description = "A pragmatic Prelude";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pragmatic-show" = callPackage
@@ -179862,6 +191806,8 @@ self: {
        ];
        description = "Yet another prelude";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "precis" = callPackage
@@ -179897,6 +191843,8 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Prelude replacement";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pred-set" = callPackage
@@ -179908,6 +191856,8 @@ self: {
        libraryHaskellDepends = [ base hashable hashtables HSet ];
        description = "Simple cached predicates";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pred-trie" = callPackage
@@ -179936,6 +191886,8 @@ self: {
        ];
        description = "Predicative tries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "predicate-class" = callPackage
@@ -179947,6 +191899,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Helper class for passing context along a predicate value";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "predicate-transformers" = callPackage
@@ -179987,6 +191941,8 @@ self: {
        ];
        description = "Predicates, Refinement types and Dsl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "predicates" = callPackage
@@ -180030,6 +191986,8 @@ self: {
        ];
        description = "Evaluate and display trees of predicates";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prednote-test" = callPackage
@@ -180052,6 +192010,8 @@ self: {
        ];
        description = "Tests and QuickCheck generators to accompany prednote";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prefetch" = callPackage
@@ -180115,6 +192075,8 @@ self: {
        ];
        description = "A library for building a prefork-style server quickly";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pregame" = callPackage
@@ -180134,6 +192096,8 @@ self: {
        ];
        description = "Prelude for applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "preliminaries" = callPackage
@@ -180155,6 +192119,8 @@ self: {
        ];
        description = "A larger alternative to the Prelude";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prelude-compat" = callPackage
@@ -180199,6 +192165,8 @@ self: {
        libraryHaskellDepends = [ base comonad logict transformers ];
        description = "Another kind of alternate Prelude file";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prelude-plus" = callPackage
@@ -180212,6 +192180,8 @@ self: {
        libraryHaskellDepends = [ base utf8-string ];
        description = "Prelude for rest of us";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prelude-prime" = callPackage
@@ -180275,6 +192245,8 @@ self: {
        ];
        description = "Preprocess Haskell Repositories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "preprocessor" = callPackage
@@ -180295,6 +192267,8 @@ self: {
        ];
        description = "Remove cpp annotations to get the source ready for static analysis";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "preprocessor-tools" = callPackage
@@ -180320,6 +192294,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "A decision procedure for quantifier-free linear arithmetic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "present" = callPackage
@@ -180331,6 +192307,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Make presentations for data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "press" = callPackage
@@ -180342,6 +192320,8 @@ self: {
        libraryHaskellDepends = [ base containers json mtl parsec ];
        description = "Text template library targeted at the web / HTML generation";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "presto-hdbc" = callPackage
@@ -180361,6 +192341,8 @@ self: {
        ];
        description = "An HDBC connector for Presto";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prettify" = callPackage
@@ -180416,6 +192398,8 @@ self: {
        ];
        description = "Pretty-printing library";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pretty-diff" = callPackage
@@ -180432,6 +192416,8 @@ self: {
        ];
        description = "Pretty printing a diff of two values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pretty-display" = callPackage
@@ -180484,6 +192470,8 @@ self: {
        ];
        description = "Functionality for beautifying GHCi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pretty-hex" = callPackage
@@ -180517,6 +192505,8 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        description = "A implementation of multi-column layout w/ Text.PrettyPrint";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pretty-relative-time" = callPackage
@@ -180573,30 +192563,6 @@ self: {
      }) {};
 
   "pretty-simple" = callPackage
-    ({ mkDerivation, ansi-terminal, base, Cabal, cabal-doctest
-     , containers, criterion, doctest, Glob, mtl, QuickCheck
-     , template-haskell, text, transformers
-     }:
-     mkDerivation {
-       pname = "pretty-simple";
-       version = "3.2.1.0";
-       sha256 = "01cnvfn2y7qgp9pc9ra9glmgs64f1m8bxa8n31yy8jlkwwmyhly6";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         ansi-terminal base containers mtl text transformers
-       ];
-       testHaskellDepends = [
-         base doctest Glob QuickCheck template-haskell
-       ];
-       benchmarkHaskellDepends = [ base criterion text ];
-       description = "pretty printer for data types with a 'Show' instance";
-       license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ cdepillabout ];
-     }) {};
-
-  "pretty-simple_3_2_2_0" = callPackage
     ({ mkDerivation, ansi-terminal, base, Cabal, cabal-doctest
      , containers, criterion, doctest, Glob, mtl, QuickCheck
      , template-haskell, text, transformers
@@ -180617,7 +192583,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "pretty printer for data types with a 'Show' instance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ cdepillabout ];
      }) {};
 
@@ -180806,6 +192771,8 @@ self: {
        libraryHaskellDepends = [ base graphviz prettyprinter text ];
        description = "a prettyprinter backend for graphviz";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prettyprinter-vty" = callPackage
@@ -180819,6 +192786,8 @@ self: {
        libraryHaskellDepends = [ base prettyprinter vty ];
        description = "prettyprinter backend for vty";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "preview" = callPackage
@@ -180834,6 +192803,8 @@ self: {
        ];
        description = "The method of previewing data (instead of wholly show-ing it)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prim-array" = callPackage
@@ -180847,6 +192818,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim primitive semigroups ];
        description = "Primitive byte array with type variable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prim-instances" = callPackage
@@ -180870,6 +192843,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim primitive semigroups ];
        description = "Primitive byte array with type variable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prim-spoon" = callPackage
@@ -180920,6 +192895,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion primes ];
        description = "Type-safe prime numbers";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primesieve" = callPackage
@@ -181061,6 +193038,8 @@ self: {
        ];
        description = "Extras for the \"primitive\" library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primitive-foreign" = callPackage
@@ -181084,6 +193063,8 @@ self: {
        libraryHaskellDepends = [ base primitive ];
        testHaskellDepends = [ base doctest QuickCheck ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primitive-maybe" = callPackage
@@ -181101,6 +193082,8 @@ self: {
        ];
        description = "Arrays of Maybes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primitive-offset" = callPackage
@@ -181126,6 +193109,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq random vector ];
        description = "SIMD data types and functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primitive-sort" = callPackage
@@ -181158,6 +193143,8 @@ self: {
        libraryHaskellDepends = [ base primitive ];
        description = "primitive operations on StableNames";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primitive-unaligned" = callPackage
@@ -181204,6 +193191,8 @@ self: {
        ];
        description = "ImageBoard on Happstack and HSP";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "primula-bot" = callPackage
@@ -181222,6 +193211,8 @@ self: {
        ];
        description = "Jabber-bot for primula-board ImageBoard";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pringletons" = callPackage
@@ -181238,6 +193229,8 @@ self: {
        ];
        description = "Classes and data structures complementing the singletons library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "print-console-colors" = callPackage
@@ -181263,6 +193256,8 @@ self: {
        libraryHaskellDepends = [ base split ];
        description = "Debug print formatting library";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "printcess" = callPackage
@@ -181279,6 +193274,8 @@ self: {
        ];
        description = "Pretty printing with indentation, mixfix operators, and automatic line breaks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "printf-mauke" = callPackage
@@ -181320,6 +193317,8 @@ self: {
        ];
        description = "The Artist Formerly Known as Prints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "printxosd" = callPackage
@@ -181344,6 +193343,8 @@ self: {
        libraryHaskellDepends = [ base containers queue reord stateref ];
        description = "Simple implementation of a priority queue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "priority-sync" = callPackage
@@ -181447,6 +193448,8 @@ self: {
        ];
        description = "Easy and reasonably efficient probabilistic programming and random generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proc" = callPackage
@@ -181465,6 +193468,8 @@ self: {
        ];
        description = "Parse process information for Linux";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proc-net" = callPackage
@@ -181515,6 +193520,8 @@ self: {
        ];
        description = "Conduits for processes (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "process-extras" = callPackage
@@ -181550,6 +193557,8 @@ self: {
        ];
        description = "IterIO Process Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "process-leksah" = callPackage
@@ -181561,6 +193570,8 @@ self: {
        libraryHaskellDepends = [ base directory filepath unix ];
        description = "Process libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "process-listlike" = callPackage
@@ -181577,6 +193588,8 @@ self: {
        ];
        description = "Process extras";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "process-progress" = callPackage
@@ -181593,6 +193606,8 @@ self: {
        ];
        description = "Run a process and do reportsing on its progress";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "process-qq" = callPackage
@@ -181609,6 +193624,8 @@ self: {
        ];
        description = "Quasi-Quoters for exec process";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "process-streaming" = callPackage
@@ -181640,6 +193657,8 @@ self: {
        ];
        description = "Streaming interface to system processes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "processing" = callPackage
@@ -181658,6 +193677,8 @@ self: {
        ];
        description = "Web graphic applications with processing.js.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "processing-for-haskell" = callPackage
@@ -181712,6 +193733,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell values that cannot be evaluated immediately";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "procstat" = callPackage
@@ -181723,6 +193746,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring ];
        description = "get information on processes in Linux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proctest" = callPackage
@@ -181758,6 +193783,8 @@ self: {
        ];
        description = "Simple streaming datatype";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "product" = callPackage
@@ -181815,6 +193842,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative ];
        description = "Generate flamegraphs from ghc RTS .prof files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prof2dot" = callPackage
@@ -181830,6 +193859,8 @@ self: {
        ];
        description = "Convert GHC profiles into GraphViz's dot format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prof2pretty" = callPackage
@@ -181848,6 +193879,8 @@ self: {
        ];
        description = "generate pretty source from time/allocation profiles";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "profiterole" = callPackage
@@ -181936,6 +193969,8 @@ self: {
        ];
        description = "Monadic bidirectional programming";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "profunctor-optics" = callPackage
@@ -181961,6 +193996,8 @@ self: {
        testHaskellDepends = [ base connections hedgehog ];
        description = "An optics library compatible with the typeclasses in 'profunctors'";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "profunctors" = callPackage
@@ -181988,6 +194025,8 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "Simple progress tracking & projection library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "progress-meter" = callPackage
@@ -181999,6 +194038,8 @@ self: {
        libraryHaskellDepends = [ ansi-terminal async base stm ];
        description = "Live diagnostics for concurrent activity";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "progress-reporting" = callPackage
@@ -182012,6 +194053,8 @@ self: {
        libraryHaskellDepends = [ base deepseq mtl time ];
        description = "Functionality for reporting function progress";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "progressbar" = callPackage
@@ -182025,6 +194068,8 @@ self: {
        libraryHaskellDepends = [ base io-reactive ];
        description = "Progressbar API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "progression" = callPackage
@@ -182041,6 +194086,8 @@ self: {
        ];
        description = "Automates the recording and graphing of criterion benchmarks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "progressive" = callPackage
@@ -182059,6 +194106,8 @@ self: {
        ];
        description = "Multilabel classification model which learns sequentially (online)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proj4-hs-bindings" = callPackage
@@ -182071,6 +194120,8 @@ self: {
        librarySystemDepends = [ proj ];
        description = "Haskell bindings for the Proj4 C dynamic library";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) proj;};
 
   "project-m36" = callPackage
@@ -182142,6 +194193,8 @@ self: {
        ];
        description = "Relational Algebra Engine";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "project-template" = callPackage
@@ -182184,6 +194237,8 @@ self: {
        ];
        description = "Go to README.md";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "projection" = callPackage
@@ -182225,6 +194280,8 @@ self: {
        ];
        description = "A Prolog interpreter written in Haskell";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prolog-graph" = callPackage
@@ -182242,6 +194299,8 @@ self: {
        ];
        description = "A command line tool to visualize query resolution in Prolog";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prolog-graph-lib" = callPackage
@@ -182253,6 +194312,8 @@ self: {
        libraryHaskellDepends = [ base fgl graphviz mtl prolog text ];
        description = "Generating images of resolution trees for Prolog queries";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prologue" = callPackage
@@ -182278,6 +194339,8 @@ self: {
        ];
        description = "Better, more general Prelude exporting common utilities";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prometheus" = callPackage
@@ -182348,6 +194411,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Instrument applications with metrics and publish/push to Prometheus";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prometheus-metrics-ghc" = callPackage
@@ -182391,6 +194456,8 @@ self: {
        libraryHaskellDepends = [ async base ];
        description = "A monadic interface for async";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "promises" = callPackage
@@ -182433,6 +194500,8 @@ self: {
        ];
        description = "A library for interfacing with the CMU Pronouncing Dictionary";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proof-combinators" = callPackage
@@ -182444,6 +194513,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Proof Combinators used in Liquid Haskell for Theorem Proving";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "propane" = callPackage
@@ -182459,6 +194530,8 @@ self: {
        ];
        description = "Functional synthesis of images and animations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "propeller" = callPackage
@@ -182492,6 +194565,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "property-based host configuration management in haskell";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "properties" = callPackage
@@ -182503,6 +194578,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "check quickCheck properties in real time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "property" = callPackage
@@ -182533,6 +194610,8 @@ self: {
        ];
        description = "Apple property list parser";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proplang" = callPackage
@@ -182544,6 +194623,8 @@ self: {
        libraryHaskellDepends = [ base glade glib gtk ];
        description = "A library for functional GUI development";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "props" = callPackage
@@ -182617,6 +194698,8 @@ self: {
        ];
        description = "Bindings to the Prosper marketplace API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proteaaudio" = callPackage
@@ -182671,6 +194754,8 @@ self: {
        ];
        description = "neovim project manager";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proto-lens_0_2_2_0" = callPackage
@@ -182746,6 +194831,8 @@ self: {
        ];
        description = "Utilities functions to proto-lens";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proto-lens-descriptors" = callPackage
@@ -182762,6 +194849,8 @@ self: {
        ];
        description = "Protocol buffers for describing the definitions of messages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proto-lens-jsonpb" = callPackage
@@ -182948,6 +195037,8 @@ self: {
        ];
        description = "A low level library for writing out data in the Protocol Buffers wire format";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proto3-wire" = callPackage
@@ -183015,6 +195106,8 @@ self: {
        ];
        description = "Protocol Buffers via C++";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "protobuf-simple" = callPackage
@@ -183057,6 +195150,8 @@ self: {
        ];
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "protocol-buffers-descriptor" = callPackage
@@ -183071,6 +195166,8 @@ self: {
        ];
        description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "protocol-buffers-descriptor-fork" = callPackage
@@ -183087,6 +195184,8 @@ self: {
        ];
        description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "protocol-buffers-fork" = callPackage
@@ -183103,6 +195202,8 @@ self: {
        ];
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "protocol-radius" = callPackage
@@ -183167,6 +195268,8 @@ self: {
        ];
        description = "Protolude with lifted-base and lifted-async";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proton-haskell" = callPackage
@@ -183185,6 +195288,8 @@ self: {
        ];
        description = "Simple XML templating library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prototype" = callPackage
@@ -183196,6 +195301,8 @@ self: {
        libraryHaskellDepends = [ base monads-tf ];
        description = "prototype-based programming on Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "prove-everywhere-server" = callPackage
@@ -183216,6 +195323,8 @@ self: {
        ];
        description = "The server for ProveEverywhere";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "provenience" = callPackage
@@ -183234,6 +195343,8 @@ self: {
        ];
        description = "Computations that automatically track data dependencies";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proxied" = callPackage
@@ -183267,6 +195378,8 @@ self: {
        libraryHaskellDepends = [ base tagged ];
        description = "A library for kind-polymorphic manipulation and inspection of Proxy values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "proxy-mapping" = callPackage
@@ -183278,6 +195391,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Mapping of Proxy Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "psc-ide" = callPackage
@@ -183307,6 +195422,8 @@ self: {
        ];
        description = "Language support for the PureScript programming language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pseudo-boolean" = callPackage
@@ -183329,6 +195446,8 @@ self: {
        ];
        description = "Reading/Writing OPB/WBO files used in pseudo boolean competition";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pseudo-trie" = callPackage
@@ -183342,6 +195461,8 @@ self: {
        libraryHaskellDepends = [ base semigroups ];
        description = "A tagged rose-tree with short circuited unique leaves";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pseudomacros" = callPackage
@@ -183449,6 +195570,8 @@ self: {
        ];
        description = "Abstractions for operations on pointers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pub" = callPackage
@@ -183518,6 +195641,8 @@ self: {
        testHaskellDepends = [ base cereal HUnit publicsuffixlist ];
        description = "Create the publicsuffixlist package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "publish" = callPackage
@@ -183544,6 +195669,8 @@ self: {
        ];
        description = "Publishing tools for papers, books, and presentations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pubnub" = callPackage
@@ -183576,6 +195703,8 @@ self: {
        ];
        description = "PubNub Haskell SDK";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pubsub" = callPackage
@@ -183594,6 +195723,8 @@ self: {
        executableHaskellDepends = [ fastcgi ];
        description = "A library for Google/SixApart pubsub hub interaction";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "puffytools" = callPackage
@@ -183623,6 +195754,8 @@ self: {
        ];
        description = "A CLI assistant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pugixml" = callPackage
@@ -183639,6 +195772,8 @@ self: {
        testHaskellDepends = [ base bytestring tasty tasty-hunit ];
        description = "pugixml binding";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pugs-DrIFT" = callPackage
@@ -183662,6 +195797,8 @@ self: {
        ];
        description = "DrIFT with pugs-specific rules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pugs-HsSyck" = callPackage
@@ -183694,6 +195831,8 @@ self: {
        ];
        description = "Portable Haskell/POSIX layer for Pugs";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pugs-hsregex" = callPackage
@@ -183705,6 +195844,8 @@ self: {
        libraryHaskellDepends = [ array base haskell98 ];
        description = "Haskell PCRE binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pulse" = callPackage
@@ -183760,6 +195901,8 @@ self: {
        ];
        description = "Multilingual unsupervised sentence tokenization with Punkt";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "punycode" = callPackage
@@ -183794,6 +195937,8 @@ self: {
        ];
        description = "A program that displays the puppet resources associated to a node given .pp files.";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pure-cdb" = callPackage
@@ -183812,6 +195957,8 @@ self: {
        ];
        description = "Another pure-haskell CDB (Constant Database) implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pure-fft" = callPackage
@@ -183836,6 +195983,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl safe ];
        description = "Pure IO monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pure-priority-queue" = callPackage
@@ -183847,6 +195996,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A pure priority queue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pure-priority-queue-tests" = callPackage
@@ -183865,6 +196016,8 @@ self: {
        ];
        description = "Tests for the pure-priority-queue package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pure-shuffle" = callPackage
@@ -183951,6 +196104,8 @@ self: {
        ];
        description = "types and parser for email messages (including MIME)";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "purescheme-wai-routing-core" = callPackage
@@ -184107,6 +196262,8 @@ self: {
        ];
        description = "Isomorphic trivial data type definitions over JSON";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "purescript-tsd-gen" = callPackage
@@ -184129,6 +196286,8 @@ self: {
        ];
        description = "TypeScript Declaration File (.d.ts) generator for PureScript";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pursuit-client" = callPackage
@@ -184164,6 +196323,8 @@ self: {
        ];
        description = "Push notifications for Android and iOS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "push-notify" = callPackage
@@ -184187,6 +196348,8 @@ self: {
        ];
        description = "A server-side library for sending push notifications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "push-notify-apn" = callPackage
@@ -184212,6 +196375,8 @@ self: {
        testHaskellDepends = [ aeson base hspec ];
        description = "Send push notifications to mobile iOS devices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "push-notify-ccs" = callPackage
@@ -184231,6 +196396,8 @@ self: {
        ];
        description = "A server-side library for sending/receiving push notifications through CCS (Google Cloud Messaging)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "push-notify-general" = callPackage
@@ -184249,6 +196416,8 @@ self: {
        ];
        description = "A general library for sending/receiving push notif. through dif. services.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pushbullet" = callPackage
@@ -184297,6 +196466,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "A Pusher.com client written in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pusher-http-haskell" = callPackage
@@ -184340,6 +196511,8 @@ self: {
        ];
        description = "Implementation of the Pusher WebSocket protocol";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pushme" = callPackage
@@ -184365,6 +196538,8 @@ self: {
        ];
        description = "Tool to synchronize directories with rsync, zfs or git-annex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pushover" = callPackage
@@ -184401,6 +196576,8 @@ self: {
        ];
        description = "Put-based lens library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "puzzle-draw" = callPackage
@@ -184432,6 +196609,8 @@ self: {
        ];
        description = "Creating graphics for pencil puzzles";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "puzzle-draw-cmdline" = callPackage
@@ -184450,6 +196629,8 @@ self: {
        ];
        description = "Creating graphics for pencil puzzles, command line tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "pvd" = callPackage
@@ -184469,6 +196650,8 @@ self: {
        executableSystemDepends = [ libdevil ];
        description = "A photo viewer daemon application with remote controlling abilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libdevil;};
 
   "pvss" = callPackage
@@ -184573,6 +196756,8 @@ self: {
        libraryPkgconfigDepends = [ python ];
        description = "Call python inline from haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) python;};
 
   "pyfi" = callPackage
@@ -184589,6 +196774,8 @@ self: {
        libraryPkgconfigDepends = [ python ];
        description = "Call python inline from haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) python;};
 
   "python-pickle" = callPackage
@@ -184612,6 +196799,8 @@ self: {
        ];
        description = "Serialization/deserialization using Python Pickle format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "q4c12-twofinger" = callPackage
@@ -184630,6 +196819,8 @@ self: {
        ];
        description = "Efficient alternating finger trees";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "qc-oi-testgenerator" = callPackage
@@ -184643,6 +196834,8 @@ self: {
        ];
        description = "Compile time generation of operation invariance tests for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "qchas" = callPackage
@@ -184671,6 +196864,8 @@ self: {
        librarySystemDepends = [ qd ];
        description = "double-double and quad-double number type via libqd";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {qd = null;};
 
   "qd-vec" = callPackage
@@ -184682,6 +196877,8 @@ self: {
        libraryHaskellDepends = [ base qd Vec ];
        description = "'Vec' instances for 'qd' types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "qed" = callPackage
@@ -184700,6 +196897,8 @@ self: {
        testHaskellDepends = [ base transformers ];
        description = "Simple prover";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "qhull-simple" = callPackage
@@ -184712,6 +196911,8 @@ self: {
        librarySystemDepends = [ qhull ];
        description = "Simple bindings to Qhull, a library for computing convex hulls";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) qhull;};
 
   "qif" = callPackage
@@ -184731,6 +196932,8 @@ self: {
        ];
        description = "A simple QIF file format parser / printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "qm-interpolated-string" = callPackage
@@ -184811,6 +197014,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Library to generate images";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) qrencode;};
 
   "qr-repa" = callPackage
@@ -184830,6 +197035,8 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Library to generate QR codes from bytestrings and objects and scale image files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "qrcode" = callPackage
@@ -184885,6 +197092,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "quantity semaphores";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "qt" = callPackage
@@ -184918,6 +197127,8 @@ self: {
        librarySystemDepends = [ qtbase ];
        description = "Qt bindings for Haskell - C++ library";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs.qt5) qtbase;};
 
   "qtah-examples" = callPackage
@@ -184935,6 +197146,8 @@ self: {
        ];
        description = "Example programs for Qtah Qt bindings";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "qtah-generator" = callPackage
@@ -184957,6 +197170,8 @@ self: {
        doHaddock = false;
        description = "Generator for Qtah Qt bindings";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "qtah-qt5" = callPackage
@@ -184976,6 +197191,8 @@ self: {
        testHaskellDepends = [ base hoppy-runtime HUnit ];
        description = "Qt bindings for Haskell";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs.qt5) qtbase;};
 
   "quack" = callPackage
@@ -185043,6 +197260,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Quant finance library in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quantification" = callPackage
@@ -185090,6 +197309,8 @@ self: {
        libraryHaskellDepends = [ base MonadRandom mtl QuickCheck random ];
        description = "An embedding of quantum computation as a Haskell arrow";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quantum-random" = callPackage
@@ -185112,6 +197333,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Retrieve, store and manage real quantum random data";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "qudb" = callPackage
@@ -185130,6 +197353,8 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Quite Useless DB";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quenya-verb" = callPackage
@@ -185152,6 +197377,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Quenya verb conjugator";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "queryparser" = callPackage
@@ -185171,6 +197398,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Analysis and parsing library for SQL queries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "queryparser-demo" = callPackage
@@ -185187,6 +197416,8 @@ self: {
        ];
        description = "Demo package containing queryparser examples";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "queryparser-hive" = callPackage
@@ -185206,6 +197437,8 @@ self: {
        ];
        description = "Parsing for Hive SQL queries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "queryparser-presto" = callPackage
@@ -185225,6 +197458,8 @@ self: {
        ];
        description = "Parsing for Presto SQL queries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "queryparser-vertica" = callPackage
@@ -185244,6 +197479,8 @@ self: {
        ];
        description = "Parsing for Vertica SQL queries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "querystring-pickle" = callPackage
@@ -185277,6 +197514,8 @@ self: {
        ];
        description = "A package for prompting values from the command-line";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "queue" = callPackage
@@ -185299,6 +197538,8 @@ self: {
        libraryHaskellDepends = [ array base containers mtl stateful-mtl ];
        description = "A library of queuelike data structures, both functional and stateful";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quick-generator" = callPackage
@@ -185329,6 +197570,8 @@ self: {
        ];
        description = "Slimmed down json schema language and validator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickbench" = callPackage
@@ -185349,6 +197592,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "quick & easy benchmarking of command-line programs";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickbooks" = callPackage
@@ -185367,6 +197612,8 @@ self: {
        ];
        description = "QuickBooks API binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickcheck-arbitrary-adt" = callPackage
@@ -185400,6 +197647,8 @@ self: {
        ];
        description = "Generate QuickCheck Gen for Sum Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickcheck-assertions" = callPackage
@@ -185461,6 +197710,8 @@ self: {
        sha256 = "0qdjls949kmcv8wj3a27p4dz8nb1dq4i99zizkw7qyqn47r9ccxd";
        libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickcheck-enum-instances" = callPackage
@@ -185542,6 +197793,8 @@ self: {
        ];
        description = "Automating QuickCheck for polymorphic and overlaoded properties";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickcheck-properties" = callPackage
@@ -185564,6 +197817,8 @@ self: {
        libraryHaskellDepends = [ base mtl QuickCheck ];
        description = "Combinators for Quickcheck Property construction and diagnostics";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickcheck-property-monad" = callPackage
@@ -185575,6 +197830,8 @@ self: {
        libraryHaskellDepends = [ base either QuickCheck transformers ];
        description = "A monad for generating QuickCheck properties without Arbitrary instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickcheck-regex" = callPackage
@@ -185590,6 +197847,8 @@ self: {
        ];
        description = "Generate regex-constrained strings for QuickCheck";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickcheck-relaxng" = callPackage
@@ -185605,6 +197864,8 @@ self: {
        ];
        description = "Generate RelaxNG-constrained XML documents for QuickCheck";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickcheck-rematch" = callPackage
@@ -185617,6 +197878,8 @@ self: {
        testHaskellDepends = [ base hspec HUnit QuickCheck rematch ];
        description = "QuickCheck support for rematch";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickcheck-report" = callPackage
@@ -185632,6 +197895,8 @@ self: {
        ];
        description = "Customizable reports for quickcheck properties";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickcheck-script" = callPackage
@@ -185700,6 +197965,8 @@ self: {
        ];
        description = "Test monadic programs using state machine based models";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickcheck-state-machine-distributed" = callPackage
@@ -185723,6 +197990,8 @@ self: {
        ];
        description = "Test monadic programs using state machine based models";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickcheck-string-random" = callPackage
@@ -185784,6 +198053,8 @@ self: {
        libraryHaskellDepends = [ base QuickCheck transformers webdriver ];
        description = "Utilities for using WebDriver with QuickCheck";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickcheck-with-counterexamples" = callPackage
@@ -185827,6 +198098,8 @@ self: {
        testHaskellDepends = [ base directory filepath QuickCheck ];
        description = "Generate Main module with QuickCheck tests";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickselect" = callPackage
@@ -185852,6 +198125,8 @@ self: {
        libraryHaskellDepends = [ base vector vector-algorithms ];
        description = "Very fast and memory-compact query-only set and map structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickson" = callPackage
@@ -185916,6 +198191,8 @@ self: {
        ];
        description = "A reflective batch tester for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quickwebapp" = callPackage
@@ -185934,6 +198211,8 @@ self: {
        ];
        description = "A quick webapp generator for any file processing tool";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quiet" = callPackage
@@ -186026,6 +198305,8 @@ self: {
        ];
        description = "An embedded, scalable functional programming language for quantum computing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quipper-demos" = callPackage
@@ -186104,6 +198385,8 @@ self: {
        ];
        description = "An embedded, scalable functional programming language for quantum computing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quipper-tools" = callPackage
@@ -186152,6 +198435,8 @@ self: {
        libraryHaskellDepends = [ base mmorph transformers ];
        description = "Quiver finite stream processing library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quiver-binary" = callPackage
@@ -186168,6 +198453,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck quiver transformers ];
        description = "Binary serialisation support for Quivers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quiver-bytestring" = callPackage
@@ -186179,6 +198466,8 @@ self: {
        libraryHaskellDepends = [ base bytestring quiver ];
        description = "Quiver combinators for bytestring streaming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quiver-cell" = callPackage
@@ -186190,6 +198479,8 @@ self: {
        libraryHaskellDepends = [ base data-cell quiver ];
        description = "Quiver combinators for cellular data processing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quiver-csv" = callPackage
@@ -186205,6 +198496,8 @@ self: {
        ];
        description = "Quiver combinators for cellular CSV data processing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quiver-enumerator" = callPackage
@@ -186216,6 +198509,8 @@ self: {
        libraryHaskellDepends = [ base enumerator quiver ];
        description = "Bridge between Quiver and Iteratee paradigms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quiver-groups" = callPackage
@@ -186228,6 +198523,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck quiver ];
        description = "Group and chunk values within a Quiver";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quiver-http" = callPackage
@@ -186245,6 +198542,8 @@ self: {
        ];
        description = "Adapter to stream over HTTP(s) with quiver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quiver-instances" = callPackage
@@ -186260,6 +198559,8 @@ self: {
        ];
        description = "Extra instances for Quiver";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quiver-interleave" = callPackage
@@ -186272,6 +198573,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck quiver ];
        description = "Interleave values from multiple Quivers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quiver-sort" = callPackage
@@ -186295,6 +198598,8 @@ self: {
        ];
        description = "Sort the values in a quiver";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quokka" = callPackage
@@ -186313,6 +198618,8 @@ self: {
        ];
        description = "Test helpers which help generate data for projects that use postgresql";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "quoridor-hs" = callPackage
@@ -186337,6 +198644,8 @@ self: {
        testHaskellDepends = [ base HUnit mtl ];
        description = "A Quoridor implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "qux" = callPackage
@@ -186355,6 +198664,8 @@ self: {
        ];
        description = "Command line binary for working with the Qux language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "r3x-haskell-sdk" = callPackage
@@ -186406,6 +198717,8 @@ self: {
        ];
        description = "The raaz cryptographic library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rabocsv2qif" = callPackage
@@ -186435,6 +198748,8 @@ self: {
        libraryHaskellDepends = [ array base containers data-reify ];
        description = "Reverse Automatic Differentiation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "radian" = callPackage
@@ -186449,6 +198764,8 @@ self: {
        testHaskellDepends = [ base HUnit lens ];
        description = "Isomorphisms for measurements that use radians";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "radium" = callPackage
@@ -186465,6 +198782,8 @@ self: {
        ];
        description = "Chemistry";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "radium-formula-parser" = callPackage
@@ -186480,6 +198799,8 @@ self: {
        ];
        description = "Chemistry";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "radius" = callPackage
@@ -186508,6 +198829,8 @@ self: {
        executableHaskellDepends = [ base filepath ];
        description = "Command-line tool for emitting numbers in various bases";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "radix-tree" = callPackage
@@ -186576,6 +198899,8 @@ self: {
        ];
        description = "librados haskell bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {rados = null;};
 
   "raft" = callPackage
@@ -186594,6 +198919,8 @@ self: {
        ];
        description = "Miscellaneous Haskell utilities for data structures and data manipulation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rail-compiler-editor" = callPackage
@@ -186616,6 +198943,8 @@ self: {
        testHaskellDepends = [ base containers HUnit process ];
        description = "Compiler and editor for the esolang rail";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rails-session" = callPackage
@@ -186639,6 +198968,8 @@ self: {
        ];
        description = "Decrypt Ruby on Rails sessions in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rainbow" = callPackage
@@ -186669,6 +199000,8 @@ self: {
        ];
        description = "Tests and QuickCheck generators to accompany rainbow";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rainbox" = callPackage
@@ -186729,6 +199062,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "distributed-process node";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rakhana" = callPackage
@@ -186745,6 +199080,8 @@ self: {
        ];
        description = "Stream based PDF library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rakuten" = callPackage
@@ -186769,6 +199106,8 @@ self: {
        ];
        description = "The Rakuten API in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ral" = callPackage
@@ -186823,6 +199162,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Random access list with a list compatible interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rallod" = callPackage
@@ -186835,6 +199176,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "'$' in reverse";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "raml" = callPackage
@@ -186850,6 +199193,8 @@ self: {
        ];
        description = "RESTful API Modeling Language (RAML) library for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ramus" = callPackage
@@ -186875,6 +199220,8 @@ self: {
        libraryHaskellDepends = [ array base IntervalMap mtl random ];
        description = "Random variable library, with Functor, Applicative and Monad instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "randfile" = callPackage
@@ -186893,6 +199240,8 @@ self: {
        ];
        description = "Program for picking a random file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rando" = callPackage
@@ -186907,6 +199256,8 @@ self: {
        ];
        description = "Easy-to-use randomness for livecoding";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "random" = callPackage
@@ -186954,6 +199305,8 @@ self: {
        libraryHaskellDepends = [ array base containers ];
        description = "Random-access lists in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "random-bytestring" = callPackage
@@ -186995,6 +199348,8 @@ self: {
        libraryHaskellDepends = [ base random template-haskell ];
        description = "A Template Haskell helper for deriving Random instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "random-eff" = callPackage
@@ -187006,6 +199361,8 @@ self: {
        libraryHaskellDepends = [ base extensible-effects random ];
        description = "A simple random generator library for extensible-effects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "random-effin" = callPackage
@@ -187017,6 +199374,8 @@ self: {
        libraryHaskellDepends = [ base effin random ];
        description = "A simple random generator library for effin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "random-extras" = callPackage
@@ -187031,6 +199390,8 @@ self: {
        ];
        description = "Additional functions for random values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "random-fu" = callPackage
@@ -187048,6 +199409,8 @@ self: {
        ];
        description = "Random number generation";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "random-fu-multivariate" = callPackage
@@ -187060,6 +199423,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Multivariate distributions for random-fu";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "random-hypergeometric" = callPackage
@@ -187077,6 +199442,8 @@ self: {
        ];
        description = "Random variate generation from hypergeometric distributions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "random-names" = callPackage
@@ -187127,6 +199494,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring random ];
        description = "An infinite stream of random data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "random-string" = callPackage
@@ -187289,6 +199658,8 @@ self: {
        ];
        description = "A Range type with vector-space instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rangemin" = callPackage
@@ -187300,6 +199671,8 @@ self: {
        libraryHaskellDepends = [ base containers primitive vector ];
        description = "Linear range-min algorithms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ranges" = callPackage
@@ -187329,6 +199702,8 @@ self: {
        ];
        description = "Find the rank product of a data set";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rank1dynamic" = callPackage
@@ -187347,6 +199722,8 @@ self: {
        ];
        description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rank2classes" = callPackage
@@ -187383,6 +199760,8 @@ self: {
        ];
        description = "Rapid prototyping with GHCi: hot reloading of running components and reload-surviving values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rapid-term" = callPackage
@@ -187398,6 +199777,8 @@ self: {
        ];
        description = "External terminal support for rapid";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rasa" = callPackage
@@ -187422,6 +199803,8 @@ self: {
        ];
        description = "A modular text editor";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rasa-example-config" = callPackage
@@ -187441,6 +199824,8 @@ self: {
        ];
        description = "Example user config for Rasa";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rasa-ext-bufs" = callPackage
@@ -187455,6 +199840,8 @@ self: {
        ];
        description = "Rasa Ext for useful buffer utilities";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rasa-ext-cmd" = callPackage
@@ -187469,6 +199856,8 @@ self: {
        ];
        description = "Rasa Ext for running commands";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rasa-ext-cursors" = callPackage
@@ -187484,6 +199873,8 @@ self: {
        ];
        description = "Rasa Ext adding cursor(s)";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rasa-ext-files" = callPackage
@@ -187500,6 +199891,8 @@ self: {
        ];
        description = "Rasa Ext for filesystem actions";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rasa-ext-logger" = callPackage
@@ -187511,6 +199904,8 @@ self: {
        libraryHaskellDepends = [ base lens mtl rasa ];
        description = "Rasa Ext for logging state/actions";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rasa-ext-slate" = callPackage
@@ -187527,6 +199922,8 @@ self: {
        ];
        description = "Rasa extension for rendering to terminal with vty";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rasa-ext-status-bar" = callPackage
@@ -187538,6 +199935,8 @@ self: {
        libraryHaskellDepends = [ base data-default lens rasa yi-rope ];
        description = "Rasa Ext for populating status-bar";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rasa-ext-style" = callPackage
@@ -187549,6 +199948,8 @@ self: {
        libraryHaskellDepends = [ base data-default lens rasa ];
        description = "Rasa Ext managing rendering styles";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rasa-ext-views" = callPackage
@@ -187565,6 +199966,8 @@ self: {
        ];
        description = "Rasa Ext managing rendering views";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rasa-ext-vim" = callPackage
@@ -187583,6 +199986,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Rasa Ext for vim bindings";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rascal" = callPackage
@@ -187611,6 +200016,8 @@ self: {
        ];
        description = "A command-line client for Reddit";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rasterific-svg" = callPackage
@@ -187751,6 +200158,8 @@ self: {
        ];
        description = "finite or repeating lists";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rattle" = callPackage
@@ -187771,6 +200180,8 @@ self: {
        testHaskellDepends = [ base directory extra filepattern shake ];
        description = "Forward build system, with caching and speculation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rattletrap" = callPackage
@@ -187802,6 +200213,8 @@ self: {
        ];
        description = "Parse and generate Rocket League replays";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "raven-haskell" = callPackage
@@ -187837,6 +200250,8 @@ self: {
        ];
        description = "Sentry http interface for Scotty web server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "raw-feldspar" = callPackage
@@ -187860,6 +200275,8 @@ self: {
        ];
        description = "Resource-Aware Feldspar";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "raw-strings-qq" = callPackage
@@ -187901,6 +200318,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Anonymous extensible records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rawstring-qm" = callPackage
@@ -187929,6 +200348,8 @@ self: {
        ];
        description = "Random Access Zippers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "razom-text-util" = callPackage
@@ -187947,6 +200368,8 @@ self: {
        testHaskellDepends = [ base QuickCheck regex-applicative smaoin ];
        description = "Common text/parsing tools for Razom language packages";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rbpcp-api" = callPackage
@@ -187982,6 +200405,8 @@ self: {
        executableHaskellDepends = [ base bio bytestring containers ];
        description = "Mask nucleotide (EST) sequences in Fasta format";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rc" = callPackage
@@ -188005,6 +200430,8 @@ self: {
        ];
        description = "Reservoir Computing, fast RNNs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rclient" = callPackage
@@ -188020,6 +200447,8 @@ self: {
        ];
        description = "Haskell client for Rserve";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rcu" = callPackage
@@ -188096,6 +200525,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq text ];
        description = "A library for RDF processing in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rdioh" = callPackage
@@ -188118,6 +200549,8 @@ self: {
        ];
        description = "A Haskell wrapper for Rdio's API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rdtsc" = callPackage
@@ -188171,6 +200604,8 @@ self: {
        ];
        description = "A binding to React based on the Flux application architecture for GHCJS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "react-flux-servant" = callPackage
@@ -188182,6 +200617,8 @@ self: {
        libraryHaskellDepends = [ aeson base react-flux servant text ];
        description = "Allow react-flux stores to send requests to a servant server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "react-haskell" = callPackage
@@ -188199,6 +200636,8 @@ self: {
        ];
        description = "Haskell React bindings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "react-tutorial-haskell-server" = callPackage
@@ -188216,6 +200655,8 @@ self: {
        ];
        description = "react-tutorial web server";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reaction-logic" = callPackage
@@ -188230,6 +200671,8 @@ self: {
        executableHaskellDepends = [ base mtl QuickCheck ];
        description = "pluggable pure logic serializable reactor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive" = callPackage
@@ -188259,6 +200702,8 @@ self: {
        testHaskellDepends = [ base containers HUnit old-time stm ];
        description = "FRP (functional reactive programming) framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-balsa" = callPackage
@@ -188280,6 +200725,8 @@ self: {
        ];
        description = "Programmatically edit MIDI events via ALSA and reactive-banana";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-banana" = callPackage
@@ -188302,6 +200749,8 @@ self: {
        ];
        description = "Library for functional reactive programming (FRP)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-banana-automation" = callPackage
@@ -188318,6 +200767,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "home (etc) automation using reactive-banana";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-banana-bunch" = callPackage
@@ -188333,6 +200784,8 @@ self: {
        ];
        description = "Extend reactive-banana to multiple events per time point";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-banana-gi-gtk" = callPackage
@@ -188349,6 +200802,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Simple reactive programming with GTK GObject Introspection";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-banana-sdl" = callPackage
@@ -188365,6 +200820,8 @@ self: {
        ];
        description = "Reactive Banana bindings for SDL";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-banana-sdl2" = callPackage
@@ -188377,6 +200834,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Reactive Banana integration with SDL2";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-banana-threepenny" = callPackage
@@ -188391,6 +200850,8 @@ self: {
        libraryHaskellDepends = [ base reactive-banana threepenny-gui ];
        description = "Examples for the reactive-banana library, using threepenny-gui";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-banana-wx" = callPackage
@@ -188408,6 +200869,8 @@ self: {
        ];
        description = "Examples for the reactive-banana library, using wxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-fieldtrip" = callPackage
@@ -188424,6 +200887,8 @@ self: {
        ];
        description = "Connect Reactive and FieldTrip";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-glut" = callPackage
@@ -188439,6 +200904,8 @@ self: {
        ];
        description = "Connects Reactive and GLUT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-haskell" = callPackage
@@ -188481,6 +200948,8 @@ self: {
        ];
        description = "Process MIDI events via reactive-banana and JACK";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-midyim" = callPackage
@@ -188500,6 +200969,8 @@ self: {
        ];
        description = "Process MIDI events via reactive-banana";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactive-thread" = callPackage
@@ -188516,6 +200987,8 @@ self: {
        ];
        description = "Reactive programming via imperative threads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reactivity" = callPackage
@@ -188550,6 +201023,8 @@ self: {
        ];
        description = "Reactor - task parallel reactive programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "read-bounded" = callPackage
@@ -188561,6 +201036,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Class for reading bounded values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "read-ctags" = callPackage
@@ -188583,6 +201060,8 @@ self: {
          base bytestring containers directory hspec text
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "read-editor" = callPackage
@@ -188620,6 +201099,8 @@ self: {
        testHaskellDepends = [ base containers directory filepath hspec ];
        description = "Read IO library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "readable" = callPackage
@@ -188673,6 +201154,8 @@ self: {
        librarySystemDepends = [ ncurses readline ];
        description = "An interface to the GNU readline library";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ncurses; inherit (pkgs) readline;};
 
   "readline-statevar" = callPackage
@@ -188684,6 +201167,8 @@ self: {
        libraryHaskellDepends = [ base readline StateVar ];
        description = "Readline with variables (setX/getY) wrapped in state vars";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "readme-lhs" = callPackage
@@ -188703,6 +201188,8 @@ self: {
        testHaskellDepends = [ base doctest protolude ];
        description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "readpyc" = callPackage
@@ -188716,6 +201203,8 @@ self: {
        executableHaskellDepends = [ base bliplib parseargs ];
        description = "Read and pretty print Python bytecode (.pyc) files.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "readshp" = callPackage
@@ -188733,6 +201222,8 @@ self: {
        ];
        description = "Code for reading ESRI Shapefiles";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "real-day-end" = callPackage
@@ -188760,6 +201251,8 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "A really simple XML parser";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reanimate" = callPackage
@@ -188788,26 +201281,6 @@ self: {
      }) {};
 
   "reanimate-svg" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, hspec
-     , JuicyPixels, lens, linear, mtl, scientific, svg-tree, text
-     , transformers, vector, xml
-     }:
-     mkDerivation {
-       pname = "reanimate-svg";
-       version = "0.9.4.0";
-       sha256 = "0jmlcxnfh5119fxhhvga4ldmdgxmsw305k6fm6v4n3plmqp0j2c4";
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers JuicyPixels lens linear mtl
-         scientific text transformers vector xml
-       ];
-       testHaskellDepends = [
-         attoparsec base hspec linear scientific svg-tree
-       ];
-       description = "SVG file loader and serializer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "reanimate-svg_0_9_8_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , double-conversion, hspec, JuicyPixels, lens, linear, mtl
      , scientific, svg-tree, text, transformers, vector, xml
@@ -188825,7 +201298,6 @@ self: {
        ];
        description = "SVG file loader and serializer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reason-export" = callPackage
@@ -188858,6 +201330,8 @@ self: {
        libraryHaskellDepends = [ base mtl split template-haskell ];
        description = "Lens implementation. It is more small but adequately.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reasonable-operational" = callPackage
@@ -188952,6 +201426,8 @@ self: {
        ];
        description = "Anonymous records";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "record-aeson" = callPackage
@@ -188968,6 +201444,8 @@ self: {
        testHaskellDepends = [ aeson base-prelude hspec record ];
        description = "Instances of \"aeson\" classes for the \"record\" types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "record-dot-preprocessor" = callPackage
@@ -189001,6 +201479,8 @@ self: {
        ];
        description = "Generic encoding of records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "record-gl" = callPackage
@@ -189024,6 +201504,8 @@ self: {
        ];
        description = "Utilities for working with OpenGL's GLSL shading language and Nikita Volkov's \"Record\"s";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "record-hasfield" = callPackage
@@ -189055,6 +201537,8 @@ self: {
        doHaddock = false;
        description = "Compiler preprocessor introducing a syntactic extension for anonymous records";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "record-syntax" = callPackage
@@ -189078,6 +201562,8 @@ self: {
        ];
        description = "A library for parsing and processing the Haskell syntax sprinkled with anonymous records";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "record-wrangler" = callPackage
@@ -189103,6 +201589,8 @@ self: {
        libraryHaskellDepends = [ base kinds type-functions ];
        description = "A flexible record system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "records-sop" = callPackage
@@ -189135,6 +201623,8 @@ self: {
        ];
        description = "Template Haskell declarations for the records package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "recursion" = callPackage
@@ -189213,6 +201703,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck template-haskell ];
        description = "Auto-generate final encodings and their isomorphisms using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "red-black-record" = callPackage
@@ -189284,6 +201776,8 @@ self: {
        ];
        description = "Library for interfacing with Reddit's API";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "redis" = callPackage
@@ -189300,6 +201794,8 @@ self: {
        ];
        description = "A driver for Redis key-value database";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "redis-hs" = callPackage
@@ -189311,6 +201807,8 @@ self: {
        libraryHaskellDepends = [ base bytestring network utf8-string ];
        description = "A simple Redis library for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "redis-io" = callPackage
@@ -189339,6 +201837,8 @@ self: {
        ];
        description = "Yet another redis client";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "redis-job-queue" = callPackage
@@ -189378,6 +201878,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring redis ];
        description = "Simple redis bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "redland" = callPackage
@@ -189390,6 +201892,8 @@ self: {
        libraryPkgconfigDepends = [ raptor2 redland ];
        description = "Redland RDF library bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {raptor2 = null; redland = null;};
 
   "redo" = callPackage
@@ -189432,6 +201936,8 @@ self: {
        ];
        description = "Simplify a set of equations by removing redundancies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reducers" = callPackage
@@ -189478,6 +201984,8 @@ self: {
        ];
        description = "Reed-Solomon Erasure Coding in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reenact" = callPackage
@@ -189491,6 +201999,8 @@ self: {
        ];
        description = "A reimplementation of the Reactive library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reexport-crypto-random" = callPackage
@@ -189512,6 +202022,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Generic Mutable Ref Abstraction Layer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ref-fd" = callPackage
@@ -189534,6 +202046,8 @@ self: {
        libraryHaskellDepends = [ base mtl stm transformers ];
        description = "A type class for monads with references compatible with the mtl2 library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ref-tf" = callPackage
@@ -189577,6 +202091,8 @@ self: {
        ];
        description = "Container with element counts";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reference" = callPackage
@@ -189610,6 +202126,8 @@ self: {
        ];
        description = "Selectors for reading and updating data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "refh" = callPackage
@@ -189627,6 +202145,8 @@ self: {
        ];
        description = "A command-line tool for pasting to https://www.refheap.com";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "refined" = callPackage
@@ -189644,6 +202164,8 @@ self: {
        testHaskellDepends = [ base doctest QuickCheck ];
        description = "Refinement types with static and runtime checking";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "refined-http-api-data" = callPackage
@@ -189655,6 +202177,8 @@ self: {
        libraryHaskellDepends = [ base http-api-data refined text ];
        description = "http-api-data instances for refined types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "refinery" = callPackage
@@ -189702,6 +202226,8 @@ self: {
        ];
        description = "Utilities for the reflection package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflection-without-remorse" = callPackage
@@ -189751,6 +202277,8 @@ self: {
        ];
        description = "Higher-order Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-animation" = callPackage
@@ -189767,6 +202295,8 @@ self: {
        ];
        description = "Continuous animations support for reflex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-backend-socket" = callPackage
@@ -189792,6 +202322,8 @@ self: {
        ];
        description = "Reflex bindings for TCP sockets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-backend-wai" = callPackage
@@ -189812,6 +202344,8 @@ self: {
        executableHaskellDepends = [ base http-types reflex wai ];
        description = "Reflex interface to `wai`";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-basic-host" = callPackage
@@ -189830,6 +202364,8 @@ self: {
        executableHaskellDepends = [ base lens reflex witherable ];
        description = "A basic Reflex host for backend work";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-dom" = callPackage
@@ -189976,6 +202512,8 @@ self: {
        ];
        description = "Routing and retractable back button for reflex-dom";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-dom-svg" = callPackage
@@ -189991,6 +202529,8 @@ self: {
        ];
        description = "Reflex functions for SVG elements";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-fsnotify" = callPackage
@@ -190006,6 +202546,8 @@ self: {
        ];
        description = "reflex-frp interface for watching files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-ghci" = callPackage
@@ -190034,6 +202576,8 @@ self: {
        ];
        description = "A GHCi widget library for use in reflex applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-gloss" = callPackage
@@ -190049,6 +202593,8 @@ self: {
        ];
        description = "An reflex interface for gloss";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-gloss-scene" = callPackage
@@ -190076,6 +202622,8 @@ self: {
        ];
        description = "A simple scene-graph using reflex and gloss";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-jsx" = callPackage
@@ -190109,6 +202657,8 @@ self: {
        ];
        description = "Reflex bindings for libtelnet";
        license = stdenv.lib.licenses.gpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-orphans" = callPackage
@@ -190125,6 +202675,8 @@ self: {
        ];
        description = "Useful missing instances for Reflex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-process" = callPackage
@@ -190145,6 +202697,8 @@ self: {
        ];
        description = "reflex-frp interface for running shell commands";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-sdl2" = callPackage
@@ -190164,6 +202718,8 @@ self: {
        executableHaskellDepends = [ base mtl reflex ];
        description = "SDL2 and reflex FRP";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-transformers" = callPackage
@@ -190179,6 +202735,8 @@ self: {
        ];
        description = "Collections and switchable Monad transformers for Reflex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reflex-vty" = callPackage
@@ -190203,6 +202761,8 @@ self: {
        ];
        description = "Reflex FRP host and widgets for vty applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reform" = callPackage
@@ -190288,6 +202848,8 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "The parser and render to parsec and render the string";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "refractor" = callPackage
@@ -190324,6 +202886,8 @@ self: {
        libraryHaskellDepends = [ base data-default exceptions lens mtl ];
        description = "Environment Monad with automatic resource refreshment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "refty" = callPackage
@@ -190366,6 +202930,8 @@ self: {
        ];
        description = "Tools for maintaining a database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reg-alloc" = callPackage
@@ -190377,6 +202943,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Register allocation API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reg-alloc-graph-color" = callPackage
@@ -190400,6 +202968,8 @@ self: {
        doHaddock = false;
        description = "Register allocation by graph colorization";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reg-alloc-types" = callPackage
@@ -190513,6 +203083,8 @@ self: {
        ];
        description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Brzozowski's Deriviatives";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-dfa" = callPackage
@@ -190526,6 +203098,8 @@ self: {
        libraryHaskellDepends = [ base mtl parsec regex-base ];
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-do" = callPackage
@@ -190614,6 +203188,8 @@ self: {
        ];
        description = "Generate a random string from a PCRE";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-genex" = callPackage
@@ -190646,6 +203222,8 @@ self: {
        libraryHaskellDepends = [ base parsec regex-base ];
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-pcre" = callPackage
@@ -190693,6 +203271,8 @@ self: {
        ];
        description = "Text-based PCRE API for regex-base";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-pderiv" = callPackage
@@ -190709,6 +203289,8 @@ self: {
        ];
        description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Antimirov's partial derivatives.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-posix" = callPackage
@@ -190751,6 +203333,8 @@ self: {
        ];
        description = "Unit tests for the plaform's Posix regex library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-tdfa" = callPackage
@@ -190785,6 +203369,8 @@ self: {
        ];
        description = "Parse with regular expressions on Producers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-tdfa-quasiquoter" = callPackage
@@ -190796,6 +203382,8 @@ self: {
        libraryHaskellDepends = [ base regex-tdfa template-haskell ];
        description = "Quasi-quoter for TDFA (extended POSIX) regular expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-tdfa-rc" = callPackage
@@ -190811,6 +203399,8 @@ self: {
        ];
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-tdfa-text" = callPackage
@@ -190824,6 +203414,8 @@ self: {
        libraryHaskellDepends = [ array base regex-base regex-tdfa text ];
        description = "Text interface for regex-tdfa";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-tdfa-unittest" = callPackage
@@ -190842,6 +203434,8 @@ self: {
        ];
        description = "Unit tests for the regex-tdfa";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-tdfa-utf8" = callPackage
@@ -190859,6 +203453,8 @@ self: {
        ];
        description = "This combines regex-tdfa with utf8-string to allow searching over UTF8 encoded lazy bytestrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-tre" = callPackage
@@ -190873,6 +203469,8 @@ self: {
        librarySystemDepends = [ tre ];
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) tre;};
 
   "regex-type" = callPackage
@@ -190884,6 +203482,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Type-level regular expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-with-pcre" = callPackage
@@ -190918,6 +203518,8 @@ self: {
        ];
        description = "Types that can only be constructed if they match a regular expression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regex-xmlschema" = callPackage
@@ -190929,6 +203531,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 parsec ];
        description = "A regular expression library for W3C XML Schema regular expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regexchar" = callPackage
@@ -190984,6 +203588,8 @@ self: {
        ];
        description = "Regular Expressions on Tries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regexpr" = callPackage
@@ -191007,6 +203613,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Regular expressions via symbolic manipulation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regexqq" = callPackage
@@ -191020,6 +203628,8 @@ self: {
        ];
        description = "A quasiquoter for PCRE regexes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regional-pointers" = callPackage
@@ -191034,6 +203644,8 @@ self: {
        ];
        description = "Regional memory pointers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regions" = callPackage
@@ -191049,6 +203661,8 @@ self: {
        ];
        description = "Provides the region monad for safely opening and working with scarce resources";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regions-monadsfd" = callPackage
@@ -191064,6 +203678,8 @@ self: {
        ];
        description = "Monads-fd instances for the RegionT monad transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regions-monadstf" = callPackage
@@ -191079,6 +203695,8 @@ self: {
        ];
        description = "Monads-tf instances for the RegionT monad transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regions-mtl" = callPackage
@@ -191090,6 +203708,8 @@ self: {
        libraryHaskellDepends = [ base-unicode-symbols mtl regions ];
        description = "mtl instances for the RegionT monad transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "register-machine-typelevel" = callPackage
@@ -191101,6 +203721,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A computationally universal register machine implementation at the type-level";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "registry" = callPackage
@@ -191128,6 +203750,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "data structure for assembling components";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "registry-hedgehog" = callPackage
@@ -191153,6 +203777,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "utilities to work with Hedgehog generators and `registry`";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regress" = callPackage
@@ -191164,6 +203790,8 @@ self: {
        libraryHaskellDepends = [ ad base vector ];
        description = "Linear and logistic regression through automatic differentiation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regression-simple" = callPackage
@@ -191188,6 +203816,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Generic programming library for regular datatypes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regular-extras" = callPackage
@@ -191199,6 +203829,8 @@ self: {
        libraryHaskellDepends = [ base binary deepseq QuickCheck regular ];
        description = "Additional functions for regular: arbitrary, coarbitrary, and binary get/put";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regular-web" = callPackage
@@ -191214,6 +203846,8 @@ self: {
        ];
        description = "Generic programming for the web";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "regular-xmlpickler" = callPackage
@@ -191225,6 +203859,8 @@ self: {
        libraryHaskellDepends = [ base hxt regular text ];
        description = "Generic generation of HXT XmlPickler instances using Regular";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reheat" = callPackage
@@ -191239,6 +203875,8 @@ self: {
        testHaskellDepends = [ base directory QuickCheck text vty vty-ui ];
        description = "to make notes and reduce impact on idle time on writing other programms";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rehoo" = callPackage
@@ -191256,6 +203894,8 @@ self: {
        ];
        description = "Rebuild default.hoo from many .hoo files in the current directory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rei" = callPackage
@@ -191273,6 +203913,8 @@ self: {
        ];
        description = "Process lists easily";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reified-records" = callPackage
@@ -191284,6 +203926,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "Reify records to Maps and back again";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reify" = callPackage
@@ -191299,6 +203943,8 @@ self: {
        executableHaskellDepends = [ base ghc ];
        description = "Serialize data";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reinterpret-cast" = callPackage
@@ -191325,6 +203971,8 @@ self: {
        libraryHaskellDepends = [ array base containers ];
        description = "A relation data structure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "relapse" = callPackage
@@ -191360,6 +204008,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A data structure representing Relations on Sets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "relational-postgresql8" = callPackage
@@ -191377,6 +204027,8 @@ self: {
        ];
        description = "PostgreSQL v8.x driver for haskell-relational-record";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "relational-query" = callPackage
@@ -191492,6 +204144,8 @@ self: {
        ];
        description = "Durations and generalized time parsing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "releaser" = callPackage
@@ -191510,6 +204164,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Automation of Haskell package release process";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "relevant-time" = callPackage
@@ -191521,6 +204177,8 @@ self: {
        libraryHaskellDepends = [ aeson base chronos text torsor ];
        description = "humanised relevant time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "relit" = callPackage
@@ -191567,6 +204225,8 @@ self: {
        ];
        description = "A web based Haskell IDE";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "relude" = callPackage
@@ -191609,6 +204269,8 @@ self: {
        ];
        description = "A DSL for marking student work";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "remarks" = callPackage
@@ -191630,6 +204292,8 @@ self: {
        ];
        description = "A DSL for marking student work";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rematch" = callPackage
@@ -191671,6 +204335,8 @@ self: {
        ];
        description = "Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "remote-debugger" = callPackage
@@ -191686,6 +204352,8 @@ self: {
        ];
        description = "Interface to ghci debugger";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "remote-json" = callPackage
@@ -191710,6 +204378,8 @@ self: {
        ];
        description = "Remote Monad implementation of the JSON RPC protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "remote-json-client" = callPackage
@@ -191727,6 +204397,8 @@ self: {
        ];
        description = "Web client wrapper for remote-json";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "remote-json-server" = callPackage
@@ -191744,6 +204416,8 @@ self: {
        ];
        description = "Web server wrapper for remote-json";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "remote-monad" = callPackage
@@ -191766,6 +204440,8 @@ self: {
        ];
        description = "An parametrizable Remote Monad, and parametrizable Applicative Functor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "remotion" = callPackage
@@ -191798,6 +204474,8 @@ self: {
        ];
        description = "A library for client-server applications based on custom protocols";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "render-utf8" = callPackage
@@ -191898,6 +204576,8 @@ self: {
        ];
        description = "Bulk array representations and operators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repa-bytestring" = callPackage
@@ -191910,6 +204590,8 @@ self: {
        doHaddock = false;
        description = "(deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repa-convert" = callPackage
@@ -191925,6 +204607,8 @@ self: {
        ];
        description = "Packing and unpacking flat tables";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repa-devil" = callPackage
@@ -191937,6 +204621,8 @@ self: {
        librarySystemDepends = [ libdevil ];
        description = "Support for image reading and writing of Repa arrays using in-place FFI calls";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libdevil;};
 
   "repa-eval" = callPackage
@@ -191948,6 +204634,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Low-level parallel operators on bulk random-accessble arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repa-examples" = callPackage
@@ -192006,6 +204694,8 @@ self: {
        ];
        description = "Data-parallel data flows";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repa-io" = callPackage
@@ -192034,6 +204724,8 @@ self: {
        libraryHaskellDepends = [ base hmatrix repa vector ];
        description = "HMatrix operations for Repa";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repa-plugin" = callPackage
@@ -192050,6 +204742,8 @@ self: {
        ];
        description = "Data Flow Fusion GHC Plugin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repa-scalar" = callPackage
@@ -192078,6 +204772,8 @@ self: {
        libraryHaskellDepends = [ base ghc ghc-prim vector ];
        description = "Series Expressionss API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repa-sndfile" = callPackage
@@ -192107,6 +204803,8 @@ self: {
        libraryHaskellDepends = [ base mtl primitive repa-scalar vector ];
        description = "Stream functions not present in the vector library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repa-v4l2" = callPackage
@@ -192126,6 +204824,8 @@ self: {
        executableHaskellDepends = [ base gloss repa ];
        description = "Provides high-level access to webcams";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repl" = callPackage
@@ -192139,6 +204839,8 @@ self: {
        ];
        description = "IRC friendly REPL library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repl-toolkit" = callPackage
@@ -192205,6 +204907,8 @@ self: {
          wai-websockets websockets
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "replicant" = callPackage
@@ -192231,6 +204935,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repline" = callPackage
@@ -192276,6 +204982,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Blogging module using blaze html for markup";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repr" = callPackage
@@ -192291,6 +204999,8 @@ self: {
        ];
        description = "Render overloaded expressions to their textual representation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "repr-tree-syb" = callPackage
@@ -192320,6 +205030,8 @@ self: {
        ];
        description = "Representable functors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "representable-profunctors" = callPackage
@@ -192350,6 +205062,8 @@ self: {
        ];
        description = "Tries from representations of polynomial functors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reprinter" = callPackage
@@ -192364,6 +205078,8 @@ self: {
        ];
        description = "Scrap Your Reprinter";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reproject" = callPackage
@@ -192376,6 +205092,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Define and combine \"materialized\" projections";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "req" = callPackage
@@ -192429,6 +205147,8 @@ self: {
        ];
        description = "Conduit helpers for the req HTTP client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "req-oauth2" = callPackage
@@ -192451,6 +205171,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Provides OAuth2 authentication for use with Req";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "req-url-extra" = callPackage
@@ -192466,6 +205188,8 @@ self: {
        testHaskellDepends = [ base hspec modern-uri req ];
        description = "Provides URI/URL helper functions for use with Req";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reqcatcher" = callPackage
@@ -192482,6 +205206,8 @@ self: {
        ];
        description = "A local http server to catch the HTTP redirect";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "request-monad" = callPackage
@@ -192493,6 +205219,8 @@ self: {
        libraryHaskellDepends = [ base free mtl transformers ];
        description = "A transformer for generic requests";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "require" = callPackage
@@ -192523,6 +205251,8 @@ self: {
        ];
        description = "Scrap your qualified import clutter";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rerebase" = callPackage
@@ -192595,6 +205325,8 @@ self: {
        ];
        description = "Reserve reloads web applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reservoir" = callPackage
@@ -192606,6 +205338,8 @@ self: {
        libraryHaskellDepends = [ base containers random ];
        description = "Unweighted reservoir sampling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "resin" = callPackage
@@ -192617,6 +205351,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ralist semigroupoids ];
        description = "High performance variable binders";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "resistor-cube" = callPackage
@@ -192630,6 +205366,8 @@ self: {
        executableHaskellDepends = [ base comfort-array lapack ];
        description = "Compute total resistance of a cube of resistors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "resolv_0_1_1_2" = callPackage
@@ -192684,6 +205422,8 @@ self: {
        ];
        description = "A name resolusion library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "resolve-trivial-conflicts" = callPackage
@@ -192702,6 +205442,8 @@ self: {
        ];
        description = "Remove trivial conflict markers in a git repository";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "resource-effect" = callPackage
@@ -192720,6 +205462,8 @@ self: {
        ];
        description = "A port of the package 'resourcet' for extensible effects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "resource-embed" = callPackage
@@ -192733,6 +205477,8 @@ self: {
        executableHaskellDepends = [ base bytestring directory ];
        description = "Embed data files via C and FFI";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "resource-pool" = callPackage
@@ -192765,6 +205511,8 @@ self: {
        ];
        description = "Fork of resource-pool, with a MonadCatchIO constraint";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "resource-pool-monad" = callPackage
@@ -192796,6 +205544,8 @@ self: {
        ];
        description = "Allocate resources which are guaranteed to be released";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "resourcet_1_1_11" = callPackage
@@ -192861,6 +205611,8 @@ self: {
        ];
        description = "process and route HTTP requests and generate responses on top of WAI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rest-client" = callPackage
@@ -192882,6 +205634,8 @@ self: {
        ];
        description = "Utility library for use in generated API client libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rest-core" = callPackage
@@ -192909,6 +205663,8 @@ self: {
        ];
        description = "Rest API library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rest-example" = callPackage
@@ -192931,6 +205687,8 @@ self: {
        executableHaskellDepends = [ base base-compat rest-gen ];
        description = "Example project for rest";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rest-gen" = callPackage
@@ -192958,6 +205716,8 @@ self: {
        ];
        description = "Documentation and client generation from rest definition";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rest-happstack" = callPackage
@@ -192975,6 +205735,8 @@ self: {
        ];
        description = "Rest driver for Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rest-snap" = callPackage
@@ -192992,6 +205754,8 @@ self: {
        ];
        description = "Rest driver for Snap";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rest-stringmap" = callPackage
@@ -193008,6 +205772,8 @@ self: {
        ];
        description = "Maps with stringy keys that can be transcoded to JSON and XML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rest-types" = callPackage
@@ -193027,6 +205793,8 @@ self: {
        ];
        description = "Silk Rest Framework Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rest-wai" = callPackage
@@ -193046,6 +205814,8 @@ self: {
        ];
        description = "Rest driver for WAI applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "restful-snap" = callPackage
@@ -193065,6 +205835,8 @@ self: {
          time-locale-compat xmlhtml
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "restless-git" = callPackage
@@ -193083,6 +205855,8 @@ self: {
        ];
        description = "Easy Git repository serialization";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "restricted-workers" = callPackage
@@ -193101,6 +205875,8 @@ self: {
        ];
        description = "Running worker processes under system resource restrictions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "restyle" = callPackage
@@ -193115,6 +205891,8 @@ self: {
        executableHaskellDepends = [ base directory filepath utf8-string ];
        description = "Convert between camel case and separated words style";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "result" = callPackage
@@ -193162,6 +205940,8 @@ self: {
        benchmarkHaskellDepends = [ aeson async base criterion text ];
        description = "A driver for RethinkDB 2.2";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rethinkdb-client-driver" = callPackage
@@ -193190,6 +205970,8 @@ self: {
        ];
        description = "Client driver for RethinkDB";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rethinkdb-model" = callPackage
@@ -193205,6 +205987,8 @@ self: {
        ];
        description = "Useful tools for modeling data with rethinkdb";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rethinkdb-wereHamster" = callPackage
@@ -193224,6 +206008,8 @@ self: {
        ];
        description = "RethinkDB driver for Haskell";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "retry" = callPackage
@@ -193257,6 +206043,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative process ];
        description = "Retry failed commands";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rev-state" = callPackage
@@ -193321,6 +206109,8 @@ self: {
        ];
        description = "Simple reverse geocoding using OpenStreeMap";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "reversi" = callPackage
@@ -193334,6 +206124,8 @@ self: {
        executableHaskellDepends = [ array base process ];
        description = "Text-only reversi (aka othelo) game";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rewrite" = callPackage
@@ -193349,6 +206141,8 @@ self: {
        ];
        description = "open file and rewrite it with new contents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rewrite-inspector" = callPackage
@@ -193368,6 +206162,8 @@ self: {
        executableHaskellDepends = [ base prettyprinter ];
        description = "Inspection of rewriting steps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rewriting" = callPackage
@@ -193379,6 +206175,8 @@ self: {
        libraryHaskellDepends = [ base containers regular ];
        description = "Generic rewriting library for regular datatypes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rex" = callPackage
@@ -193414,6 +206212,8 @@ self: {
        ];
        description = "Github resume generator";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rfc" = callPackage
@@ -193447,6 +206247,8 @@ self: {
        ];
        description = "Robert Fischer's Common library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rfc-env" = callPackage
@@ -193458,6 +206260,8 @@ self: {
        libraryHaskellDepends = [ base envy network rfc-prelude time ];
        description = "Environment variable support from the Robert Fischer Commons";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rfc-http-client" = callPackage
@@ -193475,6 +206279,8 @@ self: {
        ];
        description = "The HTTP client extensions from the Robert Fischer Commons";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rfc-prelude" = callPackage
@@ -193498,6 +206304,8 @@ self: {
        ];
        description = "The Prelude from the Robert Fischer Commons";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rfc-psql" = callPackage
@@ -193514,6 +206322,8 @@ self: {
        ];
        description = "The PostgreSQL extensions from the Robert Fischer Commons";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rfc-redis" = callPackage
@@ -193525,6 +206335,8 @@ self: {
        libraryHaskellDepends = [ base hedis rfc-env rfc-prelude time ];
        description = "The Redis extensions from the Robert Fischer Commons";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rfc-servant" = callPackage
@@ -193546,6 +206358,8 @@ self: {
        ];
        description = "The Servant extensions from the Robert Fischer Commons";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rfc1413-server" = callPackage
@@ -193657,6 +206471,8 @@ self: {
        ];
        description = "Functional Reactive Programming with type-level clocks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rhine-gloss" = callPackage
@@ -193671,6 +206487,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Gloss backend for Rhine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rhythm-game-tutorial" = callPackage
@@ -193689,6 +206507,8 @@ self: {
        ];
        description = "Haskell rhythm game tutorial";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "riak" = callPackage
@@ -193781,6 +206601,8 @@ self: {
        ];
        description = "Static site generator using Shake";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ribbit" = callPackage
@@ -193792,6 +206614,8 @@ self: {
        libraryHaskellDepends = [ base Only postgresql-simple text time ];
        description = "Type-level Relational DB combinators";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ribosome" = callPackage
@@ -193891,6 +206715,8 @@ self: {
        libraryHaskellDepends = [ ascetic base MissingH ];
        description = "Integrated pretty-printing and error/static analysis reporting";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ridley" = callPackage
@@ -193919,6 +206745,8 @@ self: {
        ];
        description = "Quick metrics to grow your app strong";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ridley-extras" = callPackage
@@ -193936,6 +206764,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Handy metrics that don't belong to ridley";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "riemann" = callPackage
@@ -193965,6 +206795,8 @@ self: {
        ];
        description = "A Riemann client for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "riff" = callPackage
@@ -193983,6 +206815,8 @@ self: {
        executableHaskellDepends = [ base bytestring filepath ];
        description = "RIFF parser for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rigel-viz" = callPackage
@@ -194013,6 +206847,8 @@ self: {
        testHaskellDepends = [ base HUnit QuickCheck vector ];
        description = "A concurrent, mutable ring-buffer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ring-buffers" = callPackage
@@ -194024,6 +206860,8 @@ self: {
        libraryHaskellDepends = [ base contiguous primitive semirings ];
        description = "mutable ring buffers with atomic updates in GHC Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rings" = callPackage
@@ -194121,6 +206959,8 @@ self: {
        executableSystemDepends = [ ncurses ];
        description = "Riot is an Information Organisation Tool";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ncurses;};
 
   "ripple" = callPackage
@@ -194191,6 +207031,8 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Reduced instruction set i386 simulator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "riscv-isa" = callPackage
@@ -194205,6 +207047,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Haskell representation of the RISC-V instruction set architecture";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rison" = callPackage
@@ -194236,6 +207080,8 @@ self: {
        libraryHaskellDepends = [ base lazysmallcheck oeis QuickCheck ];
        description = "Rivers are like Streams, but different";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rivet" = callPackage
@@ -194249,6 +207095,8 @@ self: {
        executableHaskellDepends = [ base rivet-core rivet-simple-deploy ];
        description = "A project management tool for Haskell applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rivet-adaptor-postgresql" = callPackage
@@ -194296,6 +207144,8 @@ self: {
        libraryHaskellDepends = [ base postgresql-simple text ];
        description = "Postgresql migration support for project management tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rivet-simple-deploy" = callPackage
@@ -194307,6 +207157,8 @@ self: {
        libraryHaskellDepends = [ base configurator mtl rivet-core text ];
        description = "Basic deployment support for project management tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rl-satton" = callPackage
@@ -194332,6 +207184,8 @@ self: {
        ];
        description = "Collection of Reinforcement Learning algorithms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rlglue" = callPackage
@@ -194354,6 +207208,8 @@ self: {
        ];
        description = "A Haskell codec for RL-Glue";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rlist" = callPackage
@@ -194389,6 +207245,8 @@ self: {
        executableHaskellDepends = [ ansi-terminal base options time ];
        description = "Ring-LWE/LWR challenges using Lol";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rmonad" = callPackage
@@ -194405,6 +207263,8 @@ self: {
        ];
        description = "Restricted monad library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rncryptor" = callPackage
@@ -194433,6 +207293,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Haskell implementation of the RNCryptor file format";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rng-utils" = callPackage
@@ -194450,6 +207312,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "RNG within an IORef for convenient concurrent use";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rob" = callPackage
@@ -194471,6 +207335,8 @@ self: {
        testHaskellDepends = [ base directory ];
        description = "Simple projects generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "robin" = callPackage
@@ -194490,6 +207356,8 @@ self: {
        ];
        description = "A build daemon for Haskell development";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "robot" = callPackage
@@ -194523,6 +207391,8 @@ self: {
        ];
        description = "Parser for robots.txt";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "roc-cluster" = callPackage
@@ -194537,6 +207407,8 @@ self: {
        testHaskellDepends = [ base hspec HUnit ];
        description = "ROC online clustering algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "roc-cluster-demo" = callPackage
@@ -194554,6 +207426,8 @@ self: {
        ];
        description = "Gloss interactive demo for roc-cluster package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "roc-id" = callPackage
@@ -194717,6 +207591,8 @@ self: {
        ];
        description = "Bindings to Roku's External Control API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "roles" = callPackage
@@ -194744,6 +207620,8 @@ self: {
        ];
        description = "error tracking through rollbar.com";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rollbar-hs" = callPackage
@@ -194766,6 +207644,8 @@ self: {
        ];
        description = "Core Rollbar data types and APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "roller" = callPackage
@@ -194786,6 +207666,8 @@ self: {
        ];
        description = "Playing with applicatives and dice!";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rolling-queue" = callPackage
@@ -194846,6 +207728,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq integer-gmp ];
        description = "RON";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ron-rdt" = callPackage
@@ -194862,6 +207746,8 @@ self: {
        ];
        description = "Replicated Data Types (RON-RDT)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ron-schema" = callPackage
@@ -194879,6 +207765,8 @@ self: {
        ];
        description = "RON-Schema";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ron-storage" = callPackage
@@ -194896,6 +207784,8 @@ self: {
        ];
        description = "RON Storage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "roots" = callPackage
@@ -194920,6 +207810,8 @@ self: {
        ];
        description = "Tools for manipulating fingertrees of bytestrings with optional annotations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rope-utf16-splay" = callPackage
@@ -194984,6 +207876,8 @@ self: {
        ];
        description = "A collection of rose tree structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rose-trie" = callPackage
@@ -194999,6 +207893,8 @@ self: {
        ];
        description = "Trees with polymorphic paths to nodes, combining properties of Rose Trees and Tries";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rosezipper" = callPackage
@@ -195042,6 +207938,8 @@ self: {
        ];
        description = "Haskell support for the ROS robotics framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rosmsg" = callPackage
@@ -195059,6 +207957,8 @@ self: {
        ];
        description = "ROS message parser, render, TH";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rosmsg-bin" = callPackage
@@ -195076,6 +207976,8 @@ self: {
        ];
        description = "ROS message management tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rospkg" = callPackage
@@ -195107,6 +208009,8 @@ self: {
        libraryHaskellDepends = [ base containers deepseq ];
        description = "General purpose utility library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rot13" = callPackage
@@ -195138,6 +208042,8 @@ self: {
        ];
        description = "Size-limited, concurrent, automatically-rotating log writer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "roundRobin" = callPackage
@@ -195183,6 +208089,8 @@ self: {
        libraryHaskellDepends = [ array base numeric-extras ];
        description = "Explicit floating point rounding mode wrappers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "roundtrip" = callPackage
@@ -195200,6 +208108,8 @@ self: {
        ];
        description = "Bidirectional (de-)serialization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "roundtrip-aeson" = callPackage
@@ -195220,6 +208130,8 @@ self: {
        ];
        description = "Un-/parse JSON with roundtrip invertible syntax definitions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "roundtrip-string" = callPackage
@@ -195231,6 +208143,8 @@ self: {
        libraryHaskellDepends = [ base mtl parsec roundtrip ];
        description = "Bidirectional (de-)serialization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "roundtrip-xml" = callPackage
@@ -195252,6 +208166,8 @@ self: {
        ];
        description = "Bidirectional (de-)serialization for XML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "route-generator" = callPackage
@@ -195286,6 +208202,8 @@ self: {
        ];
        description = "A library and utilities for creating a route";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "row" = callPackage
@@ -195355,6 +208273,8 @@ self: {
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Build records from lists of strings, as from CSV files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rpc" = callPackage
@@ -195371,6 +208291,8 @@ self: {
        ];
        description = "type safe rpcs provided as basic IO actions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rpc-framework" = callPackage
@@ -195389,6 +208311,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "a remote procedure call framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rpf" = callPackage
@@ -195408,6 +208332,8 @@ self: {
        ];
        description = "Receiver Policy Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rpm" = callPackage
@@ -195421,6 +208347,8 @@ self: {
        libraryHaskellDepends = [ base directory filepath HaXml process ];
        description = "Cozy little project to question unruly rpm packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rpmbuild-order" = callPackage
@@ -195458,6 +208386,8 @@ self: {
        ];
        description = "The RogueStar Animation and Graphics Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rsagl-frp" = callPackage
@@ -195473,6 +208403,8 @@ self: {
        ];
        description = "The RogueStar Animation and Graphics Library: Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rsagl-math" = callPackage
@@ -195489,6 +208421,8 @@ self: {
        ];
        description = "The RogueStar Animation and Graphics Library: Mathematics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rset" = callPackage
@@ -195513,6 +208447,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A Rational Street Performer Protocol solver";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rss" = callPackage
@@ -195556,6 +208492,8 @@ self: {
        ];
        description = "Streaming parser/renderer for the RSS standard";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rss2irc" = callPackage
@@ -195579,6 +208517,8 @@ self: {
        ];
        description = "watches an RSS/Atom feed and writes it to an IRC channel";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rstream" = callPackage
@@ -195590,6 +208530,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "stream-fusion framework from vector";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rtcm" = callPackage
@@ -195618,6 +208560,8 @@ self: {
        ];
        description = "Haskell bindings for RTCM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rtld" = callPackage
@@ -195666,6 +208610,8 @@ self: {
        ];
        description = "Manipulate network devices, addresses, and routes on Linux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rtorrent-rpc" = callPackage
@@ -195682,6 +208628,8 @@ self: {
        ];
        description = "A library for communicating with RTorrent over its XML-RPC interface";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rtorrent-state" = callPackage
@@ -195721,6 +208669,8 @@ self: {
        executableHaskellDepends = [ base Cabal process ];
        description = "Dynamically load Haskell libraries";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rubberband" = callPackage
@@ -195757,6 +208707,8 @@ self: {
        ];
        description = "Parse a subset of Ruby objects serialised with Marshal.dump.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ruby-qq" = callPackage
@@ -195773,6 +208725,8 @@ self: {
        ];
        description = "rubyish quasiquoters";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ruff" = callPackage
@@ -195805,6 +208759,8 @@ self: {
        ];
        description = "Pliable records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ruler" = callPackage
@@ -195823,6 +208779,8 @@ self: {
        ];
        description = "Ruler tool for UHC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ruler-core" = callPackage
@@ -195840,6 +208798,8 @@ self: {
          uulib
        ];
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "run-st" = callPackage
@@ -195862,6 +208822,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A collection of explicit Runge-Kutta methods of various orders";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "runghc" = callPackage
@@ -195896,6 +208858,8 @@ self: {
        ];
        description = "Run multiple commands, interleaving output and errors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "runmemo" = callPackage
@@ -195918,6 +208882,8 @@ self: {
        libraryHaskellDepends = [ base ifcxt QuickCheck template-haskell ];
        description = "Runtime generation of Arbitrary values";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rv" = callPackage
@@ -195952,6 +208918,8 @@ self: {
        ];
        description = "Random Variables";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rwlock" = callPackage
@@ -195983,6 +208951,8 @@ self: {
        ];
        description = "Packet Generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "s-cargot" = callPackage
@@ -196024,6 +208994,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "simple general-purpose s-expressions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "s3-signer" = callPackage
@@ -196085,6 +209057,8 @@ self: {
        ];
        description = "A monadic buffer resilient to exceptions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safe-coerce" = callPackage
@@ -196096,6 +209070,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A friendly shorthand for an old friend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safe-decimal" = callPackage
@@ -196173,6 +209149,8 @@ self: {
        ];
        description = "control-monad-exception Instances for safe-failure";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safe-foldable" = callPackage
@@ -196195,6 +209173,8 @@ self: {
        libraryHaskellDepends = [ base indexed mtl vector ];
        description = "Support for safely freezing multiple arrays in the ST monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safe-globals" = callPackage
@@ -196206,6 +209186,8 @@ self: {
        libraryHaskellDepends = [ base stm template-haskell ];
        description = "Safe top-level mutable variables which scope like ordinary values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safe-json" = callPackage
@@ -196244,6 +209226,8 @@ self: {
        ];
        description = "A library providing safe lazy IO features";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safe-length" = callPackage
@@ -196261,6 +209245,8 @@ self: {
        ];
        description = "Tired of accidentally calling length on tuples? Relief at last!";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safe-money" = callPackage
@@ -196367,6 +209353,8 @@ self: {
        ];
        description = "Instances from the xmlbf library for the safe-money library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safe-plugins" = callPackage
@@ -196382,6 +209370,8 @@ self: {
        ];
        description = "A small wrapper over hs-plugins to allow loading safe plugins";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safe-printf" = callPackage
@@ -196401,6 +209391,8 @@ self: {
        ];
        description = "Well-typed, flexible and variadic printf for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safecopy" = callPackage
@@ -196441,6 +209433,8 @@ self: {
        ];
        description = "Making SafeCopy migrations easier";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safecopy-store" = callPackage
@@ -196464,6 +209458,8 @@ self: {
        ];
        description = "Binary serialization with version control";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safeint" = callPackage
@@ -196481,6 +209477,8 @@ self: {
        ];
        description = "overflow-checked Int type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safeio" = callPackage
@@ -196515,6 +209513,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Safe Paths in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safer-file-handles" = callPackage
@@ -196531,6 +209531,8 @@ self: {
        ];
        description = "Type-safe file handling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safer-file-handles-bytestring" = callPackage
@@ -196547,6 +209549,8 @@ self: {
        ];
        description = "Extends safer-file-handles with ByteString operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safer-file-handles-text" = callPackage
@@ -196562,6 +209566,8 @@ self: {
        ];
        description = "Extends safer-file-handles with Text operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "saferoute" = callPackage
@@ -196573,6 +209579,8 @@ self: {
        libraryHaskellDepends = [ base blaze-html containers text ];
        description = "A simple type-safe routing library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sai-shape-syb" = callPackage
@@ -196588,6 +209596,8 @@ self: {
        ];
        description = "Obtain homogeneous values from arbitrary values, transforming or culling data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sajson" = callPackage
@@ -196610,6 +209620,8 @@ self: {
        ];
        description = "Fast JSON parsing powered by Chad Austin's sajson library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sakuraio-platform" = callPackage
@@ -196681,6 +209693,8 @@ self: {
        ];
        description = "Configuration Loader for toml";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "salak-yaml" = callPackage
@@ -196719,6 +209733,8 @@ self: {
        ];
        description = "Cryptography that's easy to digest (NaCl/libsodium bindings)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libsodium;};
 
   "saltine-quickcheck" = callPackage
@@ -196738,6 +209754,8 @@ self: {
        ];
        description = "Quickcheck implementations for some NaCl data";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libsodium;};
 
   "salve" = callPackage
@@ -196770,6 +209788,8 @@ self: {
        ];
        description = "Modular web application framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "salvia-demo" = callPackage
@@ -196792,6 +209812,8 @@ self: {
        doHaddock = false;
        description = "Demo Salvia servers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "salvia-extras" = callPackage
@@ -196812,6 +209834,8 @@ self: {
        ];
        description = "Collection of non-fundamental handlers for the Salvia web server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "salvia-protocol" = callPackage
@@ -196828,6 +209852,8 @@ self: {
        ];
        description = "Salvia webserver protocol suite supporting URI, HTTP, Cookie and MIME";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "salvia-sessions" = callPackage
@@ -196845,6 +209871,8 @@ self: {
        ];
        description = "Session support for the Salvia webserver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "salvia-websocket" = callPackage
@@ -196861,6 +209889,8 @@ self: {
        ];
        description = "Websocket implementation for the Salvia Webserver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sample-frame" = callPackage
@@ -196919,6 +209949,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Binding to the C samtools library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "samtools-conduit" = callPackage
@@ -196939,6 +209971,8 @@ self: {
        ];
        description = "Conduit interface to SAM/BAM format files through samtools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "samtools-enumerator" = callPackage
@@ -196954,6 +209988,8 @@ self: {
        ];
        description = "Enumerator interface to SamTools library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "samtools-iteratee" = callPackage
@@ -196970,6 +210006,8 @@ self: {
        ];
        description = "Iteratee interface to SamTools library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sandi" = callPackage
@@ -197000,6 +210038,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "SAND data serialization and manipulation library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sandman" = callPackage
@@ -197018,6 +210058,8 @@ self: {
        ];
        description = "Manages Cabal sandboxes to avoid rebuilding packages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sarasvati" = callPackage
@@ -197029,6 +210071,8 @@ self: {
        libraryHaskellDepends = [ base deepseq portaudio ];
        description = "audio library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sarsi" = callPackage
@@ -197056,6 +210100,8 @@ self: {
        ];
        description = "A universal quickfix toolkit and his protocol";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sasl" = callPackage
@@ -197072,6 +210118,8 @@ self: {
        ];
        description = "SASL implementation using simple-pipe";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sat" = callPackage
@@ -197085,6 +210133,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "CNF SATisfier";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sat-micro-hs" = callPackage
@@ -197102,6 +210152,8 @@ self: {
        ];
        description = "A minimal SAT solver";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "satchmo" = callPackage
@@ -197120,6 +210172,8 @@ self: {
        testHaskellDepends = [ array base ];
        description = "SAT encoding monad";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "satchmo-backends" = callPackage
@@ -197135,6 +210189,8 @@ self: {
        ];
        description = "driver for external satchmo backends";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "satchmo-examples" = callPackage
@@ -197152,6 +210208,8 @@ self: {
        ];
        description = "examples that show how to use satchmo";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "satchmo-funsat" = callPackage
@@ -197167,6 +210225,8 @@ self: {
        ];
        description = "funsat driver as backend for satchmo";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "satchmo-minisat" = callPackage
@@ -197178,6 +210238,8 @@ self: {
        libraryHaskellDepends = [ base containers process satchmo ];
        description = "minisat driver as backend for satchmo";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "satchmo-toysat" = callPackage
@@ -197193,6 +210255,8 @@ self: {
        ];
        description = "toysat driver as backend for satchmo";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "savage" = callPackage
@@ -197211,6 +210275,8 @@ self: {
        ];
        description = "re-export of the random generators from Hedgehog";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sax" = callPackage
@@ -197229,6 +210295,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec ];
        description = "Monadic streaming XML parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "say" = callPackage
@@ -197345,6 +210413,8 @@ self: {
        ];
        description = "Formally prove properties of Haskell programs using SBV/SMT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sc2-lowlevel" = callPackage
@@ -197364,6 +210434,8 @@ self: {
        ];
        description = "Low-level Starcraft II API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sc2-proto" = callPackage
@@ -197383,6 +210455,8 @@ self: {
        libraryToolDepends = [ proto-lens-protoc protoc ];
        description = "A protocol buffer model for the Starcraft II bot API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {protoc = null;};
 
   "sc2-support" = callPackage
@@ -197399,6 +210473,8 @@ self: {
        ];
        description = "Support and utility library for sc2hs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sc2hs" = callPackage
@@ -197439,6 +210515,8 @@ self: {
        libraryHaskellDepends = [ base hsc3 hsc3-db ];
        description = "Haskell bindings to sc3-rdu (sc3 rd ugens)";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scalable-server" = callPackage
@@ -197456,6 +210534,8 @@ self: {
        ];
        description = "Library for writing fast/scalable TCP-based services";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scaleimage" = callPackage
@@ -197469,6 +210549,8 @@ self: {
        executableHaskellDepends = [ base filepath gd ];
        description = "Scale an image to a new geometry";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scalendar" = callPackage
@@ -197485,6 +210567,8 @@ self: {
        ];
        description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scalp-webhooks" = callPackage
@@ -197511,6 +210595,8 @@ self: {
        ];
        description = "Test webhooks locally";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scalpel" = callPackage
@@ -197588,6 +210674,8 @@ self: {
        testHaskellDepends = [ array base HUnit ];
        description = "An implementation of the Scan Vector Machine instruction set in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scanf" = callPackage
@@ -197684,6 +210772,8 @@ self: {
        ];
        description = "Streaming component combinators";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scenegraph" = callPackage
@@ -197700,6 +210790,8 @@ self: {
        ];
        description = "Scene Graph";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scgi" = callPackage
@@ -197715,6 +210807,8 @@ self: {
        ];
        description = "A Haskell library for writing SCGI programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "schedevr" = callPackage
@@ -197732,6 +210826,8 @@ self: {
        ];
        description = "Marge schedules and show EVR";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "schedule" = callPackage
@@ -197772,6 +210868,8 @@ self: {
        ];
        description = "Find the ideal lesson layout";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scheduler" = callPackage
@@ -197810,6 +210908,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Exposes standard POSIX function sched_yield";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "schema" = callPackage
@@ -197874,6 +210974,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "JSON-biased spec and validation tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scholdoc" = callPackage
@@ -197918,6 +211020,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Converts ScholarlyMarkdown documents to HTML5/LaTeX/Docx format";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scholdoc-citeproc" = callPackage
@@ -197951,6 +211055,8 @@ self: {
        ];
        description = "Scholdoc fork of pandoc-citeproc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scholdoc-texmath" = callPackage
@@ -197973,6 +211079,8 @@ self: {
        ];
        description = "Scholdoc fork of texmath";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scholdoc-types" = callPackage
@@ -197988,6 +211096,8 @@ self: {
        ];
        description = "Scholdoc fork of pandoc-types";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "schonfinkeling" = callPackage
@@ -198011,6 +211121,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Rational numbers in scientific notation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scidb-hquery" = callPackage
@@ -198044,6 +211156,8 @@ self: {
        ];
        description = "Haskell query for SciDB via shim";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "science-constants" = callPackage
@@ -198139,6 +211253,8 @@ self: {
        ];
        description = "Haskell IDE library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scion-browser" = callPackage
@@ -198173,6 +211289,8 @@ self: {
        ];
        description = "Command-line interface for browsing and searching packages documentation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scons2dot" = callPackage
@@ -198186,6 +211304,8 @@ self: {
        executableHaskellDepends = [ base bytestring containers process ];
        description = "Generates graphviz file of scons dependency information";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scope" = callPackage
@@ -198203,6 +211323,8 @@ self: {
        ];
        description = "An interactive renderer for plotting time-series data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scope-cairo" = callPackage
@@ -198226,6 +211348,8 @@ self: {
        ];
        description = "An interactive renderer for plotting time-series data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scottish" = callPackage
@@ -198243,6 +211367,8 @@ self: {
        ];
        description = "scotty with batteries included";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scotty" = callPackage
@@ -198288,6 +211414,8 @@ self: {
        ];
        description = "The Play Framework style data binding in Scotty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scotty-blaze" = callPackage
@@ -198302,6 +211430,8 @@ self: {
        ];
        description = "blaze-html integration for Scotty";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scotty-cookie" = callPackage
@@ -198342,6 +211472,8 @@ self: {
        ];
        description = "Fay integration for Scotty";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scotty-form" = callPackage
@@ -198371,6 +211503,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Response format helper for the Scotty web framework";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scotty-hastache" = callPackage
@@ -198387,6 +211521,8 @@ self: {
        ];
        description = "Easy Mustache templating support for Scotty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scotty-params-parser" = callPackage
@@ -198430,6 +211566,8 @@ self: {
        ];
        description = "A Better way of modeling web resources";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scotty-rest" = callPackage
@@ -198455,6 +211593,8 @@ self: {
        ];
        description = "Webmachine-style REST library for scotty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scotty-session" = callPackage
@@ -198473,6 +211613,8 @@ self: {
        ];
        description = "Adding session functionality to scotty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scotty-tls" = callPackage
@@ -198502,6 +211644,8 @@ self: {
        libraryHaskellDepends = [ base scotty text transformers ];
        executableHaskellDepends = [ base scotty text transformers ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scp-streams" = callPackage
@@ -198523,6 +211667,8 @@ self: {
        testHaskellDepends = [ base bytestring io-streams ];
        description = "An SCP protocol implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scrabble-bot" = callPackage
@@ -198542,6 +211688,8 @@ self: {
        ];
        description = "Scrabble play generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scrapbook" = callPackage
@@ -198569,6 +211717,8 @@ self: {
        ];
        description = "Automatically derive Kotlin class to query servant webservices";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scrape-changes" = callPackage
@@ -198595,6 +211745,8 @@ self: {
        ];
        description = "Scrape websites for changes";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "script-monad" = callPackage
@@ -198621,6 +211773,8 @@ self: {
        ];
        description = "Stack of error, reader, writer, state, and prompt monad transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scrobble" = callPackage
@@ -198643,6 +211797,8 @@ self: {
        ];
        description = "Scrobbling server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scroll" = callPackage
@@ -198739,6 +211895,8 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Fast CSV lexing on ByteString";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "scyther-proof" = callPackage
@@ -198760,6 +211918,8 @@ self: {
        executableToolDepends = [ alex ];
        description = "Automatic generation of Isabelle/HOL correctness proofs for security protocols";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sde-solver" = callPackage
@@ -198778,6 +211938,8 @@ self: {
        ];
        description = "Distributed SDE solver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sdf2p1-parser" = callPackage
@@ -198855,6 +212017,8 @@ self: {
        ];
        description = "An image loading and rendering library for sdl2 / sdl2-cairo";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sdl2-compositor" = callPackage
@@ -198878,6 +212042,8 @@ self: {
        ];
        description = "image compositing with sdl2 - declarative style";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sdl2-fps" = callPackage
@@ -198891,6 +212057,8 @@ self: {
        libraryHaskellDepends = [ base sdl2 ];
        description = "Run of the mill, frames per second timer implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sdl2-gfx" = callPackage
@@ -199040,6 +212208,8 @@ self: {
        description = "A software defined radio library";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "seacat" = callPackage
@@ -199075,6 +212245,8 @@ self: {
        libraryHaskellDepends = [ base bytestring free mtl text ];
        description = "Pure SQL layer on top of other libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "seakale-postgresql" = callPackage
@@ -199090,6 +212262,8 @@ self: {
        ];
        description = "PostgreSQL backend for Seakale";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "seakale-tests" = callPackage
@@ -199105,6 +212279,8 @@ self: {
        ];
        description = "Helpers to test code using Seakale";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "seal-module" = callPackage
@@ -199157,6 +212333,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Semantic Editor Combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "secd" = callPackage
@@ -199187,6 +212365,8 @@ self: {
        executableHaskellDepends = [ base containers ];
        description = "SECDH Machine Simulator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "seclib" = callPackage
@@ -199198,6 +212378,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A simple library for static information-flow security in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "second-transfer" = callPackage
@@ -199225,6 +212407,8 @@ self: {
        testToolDepends = [ cpphs ];
        description = "Second Transfer HTTP/2 web server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "secp256k1" = callPackage
@@ -199248,6 +212432,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bindings for secp256k1 library from Bitcoin Core";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) secp256k1;};
 
   "secp256k1-haskell" = callPackage
@@ -199271,6 +212457,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bindings for secp256k1 library from Bitcoin Core";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {libsecp256k1 = null;};
 
   "secp256k1-legacy" = callPackage
@@ -199294,6 +212482,8 @@ self: {
        ];
        description = "fork of secp256k1";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "secret-santa" = callPackage
@@ -199311,6 +212501,8 @@ self: {
        ];
        description = "Secret Santa game assigner using QR-Codes";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "secret-sharing" = callPackage
@@ -199331,6 +212523,8 @@ self: {
        ];
        description = "Information-theoretic secure secret sharing";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "secrm" = callPackage
@@ -199344,6 +212538,8 @@ self: {
        executableHaskellDepends = [ base haskell98 ];
        description = "Example of writing \"secure\" file removal in Haskell rather than C";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "secure-sockets" = callPackage
@@ -199359,6 +212555,8 @@ self: {
        ];
        description = "Secure point-to-point connectivity library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "secureUDP" = callPackage
@@ -199370,6 +212568,8 @@ self: {
        libraryHaskellDepends = [ base bytestring containers network ];
        description = "Setups secure (unsorted) UDP packet transfer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "securemem" = callPackage
@@ -199399,6 +212599,8 @@ self: {
        librarySystemDepends = [ sedna ];
        description = "Sedna C API XML Binding";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {sedna = null;};
 
   "selda" = callPackage
@@ -199531,6 +212733,8 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "CSS Selectors for DOM traversal";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "selenium" = callPackage
@@ -199542,6 +212746,8 @@ self: {
        libraryHaskellDepends = [ base HTTP HUnit mtl network pretty ];
        description = "Test web applications through a browser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "selenium-server" = callPackage
@@ -199561,6 +212767,8 @@ self: {
        testHaskellDepends = [ base hspec text webdriver ];
        description = "Run the selenium standalone server for usage with webdriver";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "self-extract" = callPackage
@@ -199580,6 +212788,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A Haskell library to make self-extracting executables";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "selfrestart" = callPackage
@@ -199603,6 +212813,8 @@ self: {
        librarySystemDepends = [ selinux ];
        description = "SELinux bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {selinux = null;};
 
   "semantic" = callPackage
@@ -199636,6 +212848,8 @@ self: {
        ];
        description = "Types and functionality for working with source code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "semaphore-plus" = callPackage
@@ -199667,6 +212881,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Evaluate code snippets in Literate Haskell";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "semi-iso" = callPackage
@@ -199682,6 +212898,8 @@ self: {
        ];
        description = "Weakened partial isomorphisms, reversible computations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "semialign" = callPackage
@@ -199761,6 +212979,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A Haskell implementation of semibounded lattices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "semigroupoid-extras" = callPackage
@@ -199813,6 +213033,8 @@ self: {
        ];
        description = "RebindableSyntax using the semigroupoids package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "semigroups" = callPackage
@@ -199835,6 +213057,8 @@ self: {
        libraryHaskellDepends = [ base containers semigroups ];
        description = "Semigroups actions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "semilattices" = callPackage
@@ -199866,6 +213090,8 @@ self: {
        libraryHaskellDepends = [ base Boolean containers monoids ];
        description = "Semirings, ring-like structures used for dynamic programming applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "semiring-num" = callPackage
@@ -199891,6 +213117,8 @@ self: {
        ];
        description = "Basic semiring class and instances";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "semiring-simple" = callPackage
@@ -199905,21 +213133,6 @@ self: {
      }) {};
 
   "semirings" = callPackage
-    ({ mkDerivation, base, containers, hashable, integer-gmp
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "semirings";
-       version = "0.5.2";
-       sha256 = "1r7zh3gif49rhy9kwq56r3lryjkkdnxzj1md1p9nh0ld3blagdsz";
-       libraryHaskellDepends = [
-         base containers hashable integer-gmp unordered-containers
-       ];
-       description = "two monoids as one, in holy haskimony";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "semirings_0_5_3" = callPackage
     ({ mkDerivation, base, containers, hashable, integer-gmp
      , unordered-containers
      }:
@@ -199932,7 +213145,6 @@ self: {
        ];
        description = "two monoids as one, in holy haskimony";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semver" = callPackage
@@ -199968,6 +213180,8 @@ self: {
        ];
        description = "An implementation of semver and semantic version ranges";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sendfile" = callPackage
@@ -199995,6 +213209,8 @@ self: {
        ];
        description = "Sengrid API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sendgrid-v3" = callPackage
@@ -200009,6 +213225,8 @@ self: {
        testHaskellDepends = [ base semigroups tasty tasty-hunit text ];
        description = "Sendgrid v3 API library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sensei" = callPackage
@@ -200036,6 +213254,8 @@ self: {
        ];
        description = "Automatically run Hspec tests on file modifications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sensenet" = callPackage
@@ -200053,6 +213273,8 @@ self: {
        ];
        description = "Distributed sensor network for the raspberry pi";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sensu-run" = callPackage
@@ -200087,6 +213309,8 @@ self: {
        ];
        description = "Easily generating message of japanese natural language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sentiwordnet-parser" = callPackage
@@ -200123,6 +213347,8 @@ self: {
        executableHaskellDepends = [ base directory filepath unix ];
        description = "Process monitoring tool written and configured in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "senza" = callPackage
@@ -200170,6 +213396,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "SmartyPants for Korean language";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "separated" = callPackage
@@ -200216,6 +213444,8 @@ self: {
        ];
        description = "Dynamic strictness control, including space leak repair";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "seqalign" = callPackage
@@ -200293,6 +213523,8 @@ self: {
        ];
        description = "Handle sequence locations for bioinformatics";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "seqloc-datafiles" = callPackage
@@ -200326,6 +213558,8 @@ self: {
        ];
        description = "Read and write BED and GTF format genome annotations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sequence" = callPackage
@@ -200404,6 +213638,8 @@ self: {
        ];
        description = "Alternative Core language for GHC plugins";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sequential-index" = callPackage
@@ -200438,6 +213674,8 @@ self: {
        ];
        description = "A sequence labeler based on Collins's sequence perceptron";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "serf" = callPackage
@@ -200531,6 +213769,8 @@ self: {
        ];
        description = "Instances for Serialize of cereal";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "serialport" = callPackage
@@ -200573,6 +213813,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "General-purpose functions by Serokell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "serpentine" = callPackage
@@ -200591,6 +213833,8 @@ self: {
        executableHaskellDepends = [ base singletons text ];
        description = "Simple project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "serv" = callPackage
@@ -200604,6 +213848,8 @@ self: {
        ];
        description = "Dependently typed API framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "serv-wai" = callPackage
@@ -200628,6 +213874,8 @@ self: {
        ];
        description = "Dependently typed API servers with Serv";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant" = callPackage
@@ -200731,6 +213979,8 @@ self: {
        ];
        description = "generic tests for aeson serialization in servant";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth" = callPackage
@@ -200800,6 +214050,8 @@ self: {
        ];
        description = "Authentication via encrypted cookies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-docs" = callPackage
@@ -200859,6 +214111,8 @@ self: {
        ];
        description = "Authentication via HMAC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-server" = callPackage
@@ -200928,6 +214182,8 @@ self: {
        ];
        description = "Servant based API and server for token based authorisation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-token-acid" = callPackage
@@ -200949,6 +214205,8 @@ self: {
        ];
        description = "Acid-state backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-token-api" = callPackage
@@ -200965,6 +214223,8 @@ self: {
        ];
        description = "Servant based API for token based authorisation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-token-leveldb" = callPackage
@@ -200986,6 +214246,8 @@ self: {
        ];
        description = "Leveldb backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-token-persistent" = callPackage
@@ -201005,6 +214267,8 @@ self: {
        ];
        description = "Persistent backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-token-rocksdb" = callPackage
@@ -201027,6 +214291,8 @@ self: {
        ];
        description = "RocksDB backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-auth-wordpress" = callPackage
@@ -201295,6 +214561,8 @@ self: {
        ];
        description = "Automatically derive API client functions with named and optional parameters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-conduit" = callPackage
@@ -201336,6 +214604,8 @@ self: {
        ];
        description = "Generate servant client library for C#";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-db" = callPackage
@@ -201347,6 +214617,8 @@ self: {
        libraryHaskellDepends = [ base servant ];
        description = "Servant types for defining API with relational DBs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-db-postgresql" = callPackage
@@ -201372,6 +214644,8 @@ self: {
        ];
        description = "Derive a postgres client to database API specified by servant-db";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-dhall" = callPackage
@@ -201393,6 +214667,8 @@ self: {
        ];
        description = "Servant Dhall content-type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-docs" = callPackage
@@ -201473,6 +214749,8 @@ self: {
        ];
        description = "Combinators for rendering EDE templates in servant web applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-ekg" = callPackage
@@ -201499,6 +214777,8 @@ self: {
        ];
        description = "Helpers for using ekg with servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-elm" = callPackage
@@ -201540,6 +214820,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Servant Errors wai-middlware";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-examples" = callPackage
@@ -201562,6 +214844,8 @@ self: {
        ];
        description = "Example programs for servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-exceptions" = callPackage
@@ -201582,6 +214866,8 @@ self: {
          aeson base exceptions http-types servant-server text warp
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-fiat-content" = callPackage
@@ -201656,6 +214942,8 @@ self: {
        libraryHaskellDepends = [ base servant servant-server ];
        description = "Utilities for generating mock server implementations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-generic" = callPackage
@@ -201672,6 +214960,8 @@ self: {
        ];
        description = "Specify Servant APIs with records";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-github" = callPackage
@@ -201695,6 +214985,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Bindings to GitHub API using servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-github-webhook" = callPackage
@@ -201717,6 +215009,8 @@ self: {
        ];
        description = "Servant combinators to facilitate writing GitHub webhooks";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-haxl-client" = callPackage
@@ -201744,6 +215038,8 @@ self: {
        ];
        description = "automatical derivation of querying functions for servant webservices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-hmac-auth" = callPackage
@@ -201770,6 +215066,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Servant authentication with HMAC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-http-streams" = callPackage
@@ -201803,6 +215101,8 @@ self: {
        testToolDepends = [ hspec-discover markdown-unlit ];
        description = "Automatic derivation of querying functions for servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-http2-client" = callPackage
@@ -201827,6 +215127,8 @@ self: {
        ];
        description = "Generate HTTP2 clients from Servant API descriptions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-iCalendar" = callPackage
@@ -201843,6 +215145,8 @@ self: {
        ];
        description = "Servant support for iCalendar";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-jquery" = callPackage
@@ -201861,6 +215165,8 @@ self: {
        ];
        description = "Automatically derive (jquery) javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-js" = callPackage
@@ -201895,6 +215201,8 @@ self: {
        libraryHaskellDepends = [ aeson base servant ];
        description = "JSON-RPC messages and endpoints";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-jsonrpc-client" = callPackage
@@ -201910,6 +215218,8 @@ self: {
        ];
        description = "Generate JSON-RPC servant clients";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-jsonrpc-server" = callPackage
@@ -201925,6 +215235,8 @@ self: {
        ];
        description = "JSON-RPC servant servers";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-kotlin" = callPackage
@@ -201950,6 +215262,8 @@ self: {
        ];
        description = "Automatically derive Kotlin class to query servant webservices";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-lucid" = callPackage
@@ -202037,6 +215351,8 @@ self: {
        ];
        description = "Matrix parameter combinator for servant";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-mock" = callPackage
@@ -202150,6 +215466,8 @@ self: {
        testHaskellDepends = [ base hspec named QuickCheck servant ];
        description = "Combinators for servant providing named parameters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-nix" = callPackage
@@ -202171,6 +215489,8 @@ self: {
        ];
        description = "Servant Nix content-type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-options" = callPackage
@@ -202221,6 +215541,8 @@ self: {
        ];
        description = "Use Pandoc to render servant API documentation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-pipes" = callPackage
@@ -202257,6 +215579,8 @@ self: {
        libraryHaskellDepends = [ base resource-pool servant time ];
        description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-postgresql" = callPackage
@@ -202273,6 +215597,8 @@ self: {
        ];
        description = "Useful functions and instances for using servant with a PostgreSQL context";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-proto-lens" = callPackage
@@ -202295,6 +215621,8 @@ self: {
        ];
        description = "Servant Content-Type for proto-lens protobuf modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-purescript" = callPackage
@@ -202337,6 +215665,8 @@ self: {
        ];
        description = "Bindings to the Pushbullet API using servant-client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-py" = callPackage
@@ -202358,6 +215688,8 @@ self: {
        ];
        description = "Automatically derive python functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-quickcheck" = callPackage
@@ -202386,6 +215718,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "QuickCheck entire APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-rawm" = callPackage
@@ -202434,6 +215768,8 @@ self: {
        ];
        description = "Derive Reason types to interact with a Haskell backend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-reflex" = callPackage
@@ -202456,6 +215792,8 @@ self: {
        ];
        description = "servant API generator for reflex apps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-response" = callPackage
@@ -202488,6 +215826,8 @@ self: {
        ];
        description = "Servant router for non-server applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-ruby" = callPackage
@@ -202520,6 +215860,8 @@ self: {
        ];
        description = "Generate a web service for servant 'Resource's using scotty and JSON";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-server" = callPackage
@@ -202614,6 +215956,8 @@ self: {
        ];
        description = "Automatically derive API server functions with named and optional parameters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-smsc-ru" = callPackage
@@ -202636,6 +215980,8 @@ self: {
        ];
        description = "Servant client for smsc.ru service for sending SMS to cell phones";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-snap" = callPackage
@@ -202673,6 +216019,8 @@ self: {
        ];
        description = "A family of combinators for defining webservices APIs and serving them";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-stache" = callPackage
@@ -202735,6 +216083,8 @@ self: {
        testHaskellDepends = [ base hspec http-types QuickCheck servant ];
        description = "Servant combinators for the 'streaming' package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-streaming-client" = callPackage
@@ -202760,6 +216110,8 @@ self: {
        ];
        description = "Client instances for the 'servant-streaming' package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-streaming-docs" = callPackage
@@ -202777,6 +216129,8 @@ self: {
        ];
        description = "Client instances for the 'servant-docs' package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-streaming-server" = callPackage
@@ -202803,6 +216157,8 @@ self: {
        ];
        description = "Server instances for the 'servant-streaming' package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-subscriber" = callPackage
@@ -202904,6 +216260,8 @@ self: {
        ];
        description = "Swagger Tags for Servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-swagger-ui" = callPackage
@@ -203000,6 +216358,8 @@ self: {
        ];
        description = "Automatically generate Elm clients for Servant APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-tracing" = callPackage
@@ -203054,6 +216414,8 @@ self: {
        ];
        description = "Servant Integration for Waargonaut JSON Package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-websockets" = callPackage
@@ -203091,6 +216453,8 @@ self: {
        ];
        description = "Servant support for the XML Content-Type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-yaml" = callPackage
@@ -203123,6 +216487,8 @@ self: {
        libraryHaskellDepends = [ base singletons ];
        description = "Types and definitions of servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-zeppelin-client" = callPackage
@@ -203146,6 +216512,8 @@ self: {
        ];
        description = "Client library for servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-zeppelin-server" = callPackage
@@ -203169,6 +216537,8 @@ self: {
        ];
        description = "Server library for servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "servant-zeppelin-swagger" = callPackage
@@ -203190,6 +216560,8 @@ self: {
        ];
        description = "Swagger instances for servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "server-generic" = callPackage
@@ -203205,6 +216577,8 @@ self: {
        ];
        description = "Auto-generate a server for your datatype";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "serverless-haskell" = callPackage
@@ -203274,6 +216648,8 @@ self: {
        ];
        description = "Storage backend for serversession using acid-state";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "serversession-backend-persistent" = callPackage
@@ -203300,6 +216676,8 @@ self: {
        ];
        description = "Storage backend for serversession using persistent and an RDBMS";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "serversession-backend-redis" = callPackage
@@ -203321,6 +216699,8 @@ self: {
        ];
        description = "Storage backend for serversession using Redis";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "serversession-frontend-snap" = callPackage
@@ -203338,6 +216718,8 @@ self: {
        ];
        description = "Snap bindings for serversession";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "serversession-frontend-wai" = callPackage
@@ -203373,6 +216755,8 @@ self: {
        ];
        description = "Yesod bindings for serversession";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "services" = callPackage
@@ -203390,6 +216774,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Tools for building services";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "serviette" = callPackage
@@ -203455,6 +216841,8 @@ self: {
        ];
        description = "Snaplet for the ses-html package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sessions" = callPackage
@@ -203469,6 +216857,8 @@ self: {
        ];
        description = "Session Types for Haskell";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sessiontypes" = callPackage
@@ -203490,6 +216880,8 @@ self: {
        testHaskellDepends = [ base directory exceptions hspec ];
        description = "Session types library";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sessiontypes-distributed" = callPackage
@@ -203512,6 +216904,8 @@ self: {
        ];
        description = "Session types distributed";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "set-cover" = callPackage
@@ -203571,6 +216965,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Sets of fixed size, with typelits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "set-with" = callPackage
@@ -203588,6 +216984,8 @@ self: {
        ];
        description = "Set of elements sorted by a different data type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "setdown" = callPackage
@@ -203607,6 +217005,8 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Treating files as sets to perform rapid set manipulation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "setenv" = callPackage
@@ -203636,6 +217036,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A console interface to the game of Set";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "setlocale" = callPackage
@@ -203667,6 +217069,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A Haskell implementation of setoid";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "setop" = callPackage
@@ -203744,6 +217148,8 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Small (TH) library to declare setters for typical `record' data type fields";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "settings" = callPackage
@@ -203779,6 +217185,8 @@ self: {
        ];
        description = "S-Expression parsing/printing made fun and easy";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sexp-grammar" = callPackage
@@ -203807,6 +217215,8 @@ self: {
        ];
        description = "Invertible grammar combinators for S-expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sexp-show" = callPackage
@@ -203854,6 +217264,8 @@ self: {
        testHaskellDepends = [ base data-default hspec megaparsec ];
        description = "Simple s-expression parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sexpresso" = callPackage
@@ -203890,6 +217302,8 @@ self: {
        ];
        description = "Lists, Texts, ByteStrings and Vectors with type-encoded length";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sfml-audio" = callPackage
@@ -203914,6 +217328,8 @@ self: {
        libraryHaskellDepends = [ base bytestring entropy primitive ];
        description = "SIMD-oriented Fast Mersenne Twister(SFMT) binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sfnt2woff" = callPackage
@@ -203934,6 +217350,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A command line tool to convert TrueType/OpenType fonts to WOFF format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) zlib;};
 
   "sgd" = callPackage
@@ -203958,6 +217376,8 @@ self: {
        ];
        description = "Stochastic gradient descent library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sgf" = callPackage
@@ -203974,6 +217394,8 @@ self: {
        ];
        description = "SGF (Smart Game Format) parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sgrep" = callPackage
@@ -203987,6 +217409,8 @@ self: {
        executableHaskellDepends = [ base bio regex-compat ];
        description = "Sgrep - grep Fasta files for sequences matching a regular expression";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sh2md" = callPackage
@@ -204013,6 +217437,8 @@ self: {
        ];
        description = "Record your shell session and print in the markdown format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sha-streams" = callPackage
@@ -204027,6 +217453,8 @@ self: {
        executableHaskellDepends = [ base io-streams SHA ];
        description = "SHA hashes for io-streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shade" = callPackage
@@ -204040,6 +217468,8 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "A control structure used to combine heterogenous types with delayed effects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shadower" = callPackage
@@ -204062,6 +217492,8 @@ self: {
        ];
        description = "An automated way to run doctests in files that are changing";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shadowsocks" = callPackage
@@ -204221,6 +217653,8 @@ self: {
        ];
        description = "Utility for building Shake build systems using Cabal sandboxes";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shake-ccjs" = callPackage
@@ -204269,6 +217703,8 @@ self: {
        ];
        description = "Extra utilities for shake build systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shake-google-closure-compiler" = callPackage
@@ -204322,6 +217758,8 @@ self: {
        ];
        description = "Shake Minify Rules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shake-minify-css" = callPackage
@@ -204346,6 +217784,8 @@ self: {
        libraryHaskellDepends = [ base bytestring bzlib shake tar ];
        description = "Shake File Pack Rule";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shake-path" = callPackage
@@ -204357,6 +217797,8 @@ self: {
        libraryHaskellDepends = [ base path path-io shake ];
        description = "path alternatives to shake functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shake-persist" = callPackage
@@ -204374,6 +217816,8 @@ self: {
        executableHaskellDepends = [ base shake ];
        description = "Shake build system on-disk caching";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shaker" = callPackage
@@ -204402,6 +217846,8 @@ self: {
        ];
        description = "simple and interactive command-line build tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shakers" = callPackage
@@ -204457,6 +217903,8 @@ self: {
        ];
        description = "compile es2015";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shakespeare-css" = callPackage
@@ -204508,6 +217956,8 @@ self: {
        ];
        description = "SASS support for Shakespeare and Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shakespeare-text" = callPackage
@@ -204546,6 +217996,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Shannon-fano compression algorithm implementation in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shapefile" = callPackage
@@ -204561,6 +218013,8 @@ self: {
        ];
        description = "Parser and related tools for ESRI shapefile format";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shapely-data" = callPackage
@@ -204579,6 +218033,8 @@ self: {
        ];
        description = "Generics using @(,)@ and @Either@, with algebraic operations and typed conversions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shapes" = callPackage
@@ -204676,6 +218132,8 @@ self: {
        ];
        description = "A circular buffer built on shared memory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shared-fields" = callPackage
@@ -204689,6 +218147,8 @@ self: {
        testHaskellDepends = [ base Cabal hspec lens text ];
        description = "a tiny library for using shared lens fields";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shared-memory" = callPackage
@@ -204728,6 +218188,8 @@ self: {
        executableHaskellDepends = [ base filepath mtl ];
        description = "A Haskell preprocessor adding miscellaneous features";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shelduck" = callPackage
@@ -204758,6 +218220,8 @@ self: {
        ];
        description = "Test webhooks locally";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shell-conduit" = callPackage
@@ -204820,6 +218284,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Pipe streams through external shell commands";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shell-utility" = callPackage
@@ -204847,6 +218313,8 @@ self: {
        ];
        description = "shell-/perl- like (systems) programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shellmate" = callPackage
@@ -204863,6 +218331,8 @@ self: {
        ];
        description = "Simple interface for shell scripting in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shellmate-extras" = callPackage
@@ -204879,6 +218349,8 @@ self: {
        ];
        description = "Extra functionality for shellmate";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shellmet" = callPackage
@@ -205033,6 +218505,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Simple shell scripting from Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shh-extras" = callPackage
@@ -205045,6 +218519,8 @@ self: {
        testHaskellDepends = [ base tasty ];
        description = "Utility functions for using shh";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shift" = callPackage
@@ -205103,6 +218579,8 @@ self: {
        ];
        description = "The Reflective Lambda Machine";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shine" = callPackage
@@ -205132,6 +218610,8 @@ self: {
        isExecutable = true;
        description = "Examples for the shine package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shine-varying" = callPackage
@@ -205162,6 +218642,8 @@ self: {
        ];
        description = "Implementation of Shivers' Control-Flow Analysis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shoap" = callPackage
@@ -205173,6 +218655,8 @@ self: {
        libraryHaskellDepends = [ base curl ];
        description = "A very basic SOAP package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shopify" = callPackage
@@ -205193,6 +218677,8 @@ self: {
        ];
        description = "A haskell API binding for shopify.com";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shortcircuit" = callPackage
@@ -205238,6 +218724,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Shorten a variety of string-like types adding ellipsis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "should-not-typecheck" = callPackage
@@ -205310,6 +218798,8 @@ self: {
        ];
        description = "Robust prettyprinter for output of auto-generated Show instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "show-type" = callPackage
@@ -205335,6 +218825,8 @@ self: {
        executableHaskellDepends = [ base glade gtk random ];
        description = "A simple gtk based Russian Roulette game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shower" = callPackage
@@ -205374,6 +218866,8 @@ self: {
        ];
        description = "Web automation library in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shplit" = callPackage
@@ -205423,6 +218917,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Shuffle tool for UHC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shunya-library" = callPackage
@@ -205454,8 +218950,8 @@ self: {
      }:
      mkDerivation {
        pname = "shwifty";
-       version = "0.0.1.0";
-       sha256 = "1xipwh2cw4n608spxg011hnmima3badz6l8biry7q1nygc6mnc9a";
+       version = "0.0.2.0";
+       sha256 = "0akzrba7kihcv4f1hv1hirkl2w1y7d04mzc8y21f6fqvqjnnqsq6";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers mtl primitive
          template-haskell text th-abstraction time unordered-containers
@@ -205476,6 +218972,8 @@ self: {
        ];
        description = "An interface to the Silicon Labs Si5351 clock chip";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sibe" = callPackage
@@ -205501,6 +218999,8 @@ self: {
        ];
        description = "Machine Learning algorithms";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sieve" = callPackage
@@ -205535,6 +219035,8 @@ self: {
        ];
        description = "Simple, visual, functional language for learning about recursion";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sifflet-lib" = callPackage
@@ -205553,6 +219055,8 @@ self: {
        librarySystemDepends = [ gdk_x11 gtk_x11 ];
        description = "Library of modules shared by sifflet and its tests and its exporters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {gdk_x11 = null; gtk_x11 = null;};
 
   "siggy-chardust" = callPackage
@@ -205593,6 +219097,8 @@ self: {
        ];
        description = "Thom polynomials of second order Thom-Boardman singularities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sign" = callPackage
@@ -205645,6 +219151,8 @@ self: {
        ];
        description = "Synchronous signal processing for DSLs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "signed-multiset" = callPackage
@@ -205656,6 +219164,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Multisets with negative membership";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "silently" = callPackage
@@ -205685,6 +219195,8 @@ self: {
        testHaskellDepends = [ base quantification savage text ];
        description = "A generator for different kinds of data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simd" = callPackage
@@ -205696,6 +219208,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim primitive vector ];
        description = "simple interface to GHC's SIMD instructions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simgi" = callPackage
@@ -205713,6 +219227,8 @@ self: {
        ];
        description = "stochastic simulation engine";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple" = callPackage
@@ -205747,6 +219263,8 @@ self: {
        ];
        description = "A minimalist web framework for the WAI server interface";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-actors" = callPackage
@@ -205761,6 +219279,8 @@ self: {
        ];
        description = "A library for more structured concurrent programming, based on the Actor Model";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-affine-space" = callPackage
@@ -205777,6 +219297,8 @@ self: {
        ];
        description = "A simple library for affine and vector spaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-atom" = callPackage
@@ -205788,6 +219310,8 @@ self: {
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Atom (or symbol) datatype for fast comparision and sorting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-bluetooth" = callPackage
@@ -205800,6 +219324,8 @@ self: {
        librarySystemDepends = [ bluetooth ];
        description = "Simple Bluetooth API for Windows and Linux (bluez)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {bluetooth = null;};
 
   "simple-c-value" = callPackage
@@ -205822,6 +219348,8 @@ self: {
        ];
        description = "A simple C value type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-cabal" = callPackage
@@ -205886,6 +219414,8 @@ self: {
        ];
        description = "A simple streaming I/O library based on monadic folds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-config" = callPackage
@@ -205903,6 +219433,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Simple config file parser generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-css" = callPackage
@@ -205918,6 +219450,8 @@ self: {
        ];
        description = "simple binding of css and html";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-download" = callPackage
@@ -205933,6 +219467,8 @@ self: {
        ];
        description = "A simple wrapper of http-conduit for file download";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-effects" = callPackage
@@ -205954,6 +219490,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion mtl transformers ];
        description = "A simple effect system that integrates with MTL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-enumeration" = callPackage
@@ -205980,6 +219518,8 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "Evaluate a Text to an Integer: \"1 + 1\" -> 2";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-firewire" = callPackage
@@ -205991,6 +219531,8 @@ self: {
        libraryHaskellDepends = [ base bindings-dc1394 CV ];
        description = "Simplified interface for firewire cameras";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-form" = callPackage
@@ -206022,6 +219564,8 @@ self: {
        executableHaskellDepends = [ base deepseq parallel random ];
        description = "Simple parallel genetic algorithm implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-genetic-algorithm-mr" = callPackage
@@ -206068,6 +219612,8 @@ self: {
        ];
        description = "Allows simple indexation on any data type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-log" = callPackage
@@ -206099,6 +219645,8 @@ self: {
        libraryHaskellDepends = [ base hsyslog simple-log text ];
        description = "Syslog backend for simple-log";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-logger" = callPackage
@@ -206110,6 +219658,8 @@ self: {
        libraryHaskellDepends = [ base fast-logger mtl text ];
        description = "A very simple but efficient logging framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-logging" = callPackage
@@ -206132,6 +219682,8 @@ self: {
        ];
        description = "Logging effect to plug into the simple-effects framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-ltl" = callPackage
@@ -206156,6 +219708,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Simple library to handle and interexchange money";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-neural-networks" = callPackage
@@ -206175,6 +219729,8 @@ self: {
        ];
        description = "Simple parallel neural networks implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-nix" = callPackage
@@ -206196,6 +219752,8 @@ self: {
        ];
        description = "Simple parsing/pretty printing for Nix expressions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-observer" = callPackage
@@ -206224,6 +219782,8 @@ self: {
        ];
        description = "Simplified Pascal language to SSVM compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-pipe" = callPackage
@@ -206242,6 +219802,8 @@ self: {
        ];
        description = "simple pipeline library like conduit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-postgresql-orm" = callPackage
@@ -206259,6 +219821,8 @@ self: {
        ];
        description = "Connector package for integrating postgresql-orm with the Simple web framework";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-reflect" = callPackage
@@ -206281,6 +219845,8 @@ self: {
        libraryHaskellDepends = [ base bytestring QuickCheck ];
        description = "Memory-efficient strings with concatenation and splitting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-sendfile" = callPackage
@@ -206314,6 +219880,8 @@ self: {
        ];
        description = "Simple Server interface";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-session" = callPackage
@@ -206331,6 +219899,8 @@ self: {
        ];
        description = "Cookie-based session management for the Simple web framework";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-sessions" = callPackage
@@ -206401,6 +219971,8 @@ self: {
        ];
        description = "Simple stacked virtual machine: assembler, disassembler, bytecode interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-tabular" = callPackage
@@ -206412,6 +219984,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Simple tabular-text formatter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-tar" = callPackage
@@ -206427,6 +220001,8 @@ self: {
        ];
        description = "Simple, pure, file-system-free reading of tar files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-templates" = callPackage
@@ -206478,6 +220054,8 @@ self: {
        ];
        description = "UI library for terminal";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-units" = callPackage
@@ -206489,6 +220067,8 @@ self: {
        libraryHaskellDepends = [ base first-class-families ];
        description = "Simple arithmetic with SI units using type-checked dimensional analysis";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-vec3" = callPackage
@@ -206506,6 +220086,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "Three-dimensional vectors of doubles with basic operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simple-zipper" = callPackage
@@ -206518,6 +220100,8 @@ self: {
        testHaskellDepends = [ base hspec lens ];
        description = "Zippers made slightly easier";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simpleargs" = callPackage
@@ -206530,6 +220114,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Provides a more flexible getArgs function with better error reporting";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simpleconfig" = callPackage
@@ -206546,6 +220132,8 @@ self: {
        ];
        description = "Short description of your package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simpleirc" = callPackage
@@ -206562,6 +220150,8 @@ self: {
        testHaskellDepends = [ base bytestring hspec HUnit knob ];
        description = "Simple IRC Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simpleirc-lens" = callPackage
@@ -206573,6 +220163,8 @@ self: {
        libraryHaskellDepends = [ base bytestring simpleirc ];
        description = "Lenses for simpleirc types";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simplelru" = callPackage
@@ -206614,6 +220206,8 @@ self: {
        ];
        description = "Haskell interface for the simplenote API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simpleprelude" = callPackage
@@ -206632,6 +220226,8 @@ self: {
        ];
        description = "A simplified Haskell prelude for teaching";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simplesmtpclient" = callPackage
@@ -206645,6 +220241,8 @@ self: {
        libraryHaskellDepends = [ array base directory network old-time ];
        description = "Very simple SMTP Client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simplessh" = callPackage
@@ -206736,6 +220334,8 @@ self: {
        executableHaskellDepends = [ base bio bytestring random ];
        description = "Simulate sequencing with different models for priming and errors";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "simtreelo" = callPackage
@@ -206799,6 +220399,8 @@ self: {
        testHaskellDepends = [ base hspec OneTuple Only ];
        description = "a class for single tuple implementations";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "singleton-bool" = callPackage
@@ -206823,6 +220425,8 @@ self: {
        libraryHaskellDepends = [ base singletons ];
        description = "Typelevel balanced search trees via a singletonized Data.Map";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "singleton-nats" = callPackage
@@ -206845,6 +220449,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Singletons and induction over GHC TypeLits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "singletons" = callPackage
@@ -206894,6 +220500,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Singnal";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "singular-factory" = callPackage
@@ -206914,6 +220522,8 @@ self: {
        ];
        description = "Multivariate polynomial factorization via bindings to Singular-factory";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {singular-factory = null;};
 
   "sink" = callPackage
@@ -206925,6 +220535,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An alternative to lazy I/O that doesn't conflate execution with evaluation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "siphash" = callPackage
@@ -206971,6 +220583,8 @@ self: {
        ];
        description = "Encode and decode CSV files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "siren-json" = callPackage
@@ -206995,6 +220609,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Siren Tools for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sirkel" = callPackage
@@ -207011,6 +220627,8 @@ self: {
        ];
        description = "Sirkel, a Chord DHT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sitemap" = callPackage
@@ -207058,6 +220676,8 @@ self: {
        ];
        description = "A simple to understand static site generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sixfiguregroup" = callPackage
@@ -207074,6 +220694,8 @@ self: {
        ];
        description = "A six figure group of time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sixty-five-oh-two" = callPackage
@@ -207145,6 +220767,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Multidimensional grids with sized specified at compile time";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sized-types" = callPackage
@@ -207163,6 +220787,8 @@ self: {
        ];
        description = "Sized types in Haskell using the GHC Nat kind";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sized-vector" = callPackage
@@ -207179,6 +220805,8 @@ self: {
        ];
        description = "Size-parameterized vector types and functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sizes" = callPackage
@@ -207198,6 +220826,8 @@ self: {
        ];
        description = "Recursively show space (size and i-nodes) used in subdirectories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sjsp" = callPackage
@@ -207219,6 +220849,8 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Simple JavaScript Profiler";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "skein" = callPackage
@@ -207255,6 +220887,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Skeletal set - a set with equivalence relation different from equality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "skeleton" = callPackage
@@ -207273,6 +220907,8 @@ self: {
        ];
        description = "a tool to access the OSX keychain";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "skeletons" = callPackage
@@ -207291,6 +220927,8 @@ self: {
        ];
        description = "Manage project skeletons";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "skell" = callPackage
@@ -207306,6 +220944,8 @@ self: {
        ];
        description = "An overly complex Haskell web framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "skemmtun" = callPackage
@@ -207324,6 +220964,8 @@ self: {
        ];
        description = "A MyAnimeList.net client.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "skews" = callPackage
@@ -207340,6 +220982,8 @@ self: {
        ];
        description = "A very quick-and-dirty WebSocket server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "skip-list" = callPackage
@@ -207378,6 +221022,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Eclectic collection of utility functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "skylark-client" = callPackage
@@ -207400,6 +221046,8 @@ self: {
        ];
        description = "Skylark client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "skylighting" = callPackage
@@ -207492,6 +221140,8 @@ self: {
        ];
        description = "Skype Desktop API binding for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "skypelogexport" = callPackage
@@ -207529,6 +221179,8 @@ self: {
        ];
        description = "Haskell API for interacting with Slack";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "slack-api" = callPackage
@@ -207571,6 +221223,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Slack notifier for Haskell project";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "slack-verify" = callPackage
@@ -207612,6 +221266,8 @@ self: {
        ];
        description = "Bindings for the Slack web API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "slate" = callPackage
@@ -207659,6 +221315,8 @@ self: {
        ];
        description = "A fundamental solution to ghost threads and silent exceptions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sleep" = callPackage
@@ -207691,6 +221349,8 @@ self: {
        ];
        description = "Generate C++ skeletons from slice files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sliceofpy" = callPackage
@@ -207715,6 +221375,8 @@ self: {
        ];
        description = "Python-ish slicing traversals for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "slick" = callPackage
@@ -207749,6 +221411,8 @@ self: {
        ];
        description = "ws convert markdown to reveal-js";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "slim" = callPackage
@@ -207764,6 +221428,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Functional reactive user interface programming";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "slist" = callPackage
@@ -207797,6 +221463,8 @@ self: {
        ];
        description = "A command line interface to Sloane's OEIS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "slope-field" = callPackage
@@ -207831,6 +221499,8 @@ self: {
        ];
        description = "Write lambdas without naming the parameters";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sloth" = callPackage
@@ -207842,6 +221512,8 @@ self: {
        libraryHaskellDepends = [ base mtl process ];
        description = "Testing for minimal strictness";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "slotmap" = callPackage
@@ -207875,6 +221547,8 @@ self: {
        ];
        description = "Type-safe slugs for Yesod ecosystem";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "slynx" = callPackage
@@ -207904,6 +221578,8 @@ self: {
        ];
        description = "Handle molecular sequences";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "small-bytearray-builder" = callPackage
@@ -207933,6 +221609,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "small-bytearray-builder_0_3_4_0" = callPackage
+    ({ mkDerivation, base, bytebuild, byteslice }:
+     mkDerivation {
+       pname = "small-bytearray-builder";
+       version = "0.3.4.0";
+       sha256 = "1243s192sc6q7vlazj2bybkzs99sq7x45m30xlkky6ly15r9yn5r";
+       libraryHaskellDepends = [ base bytebuild byteslice ];
+       doHaddock = false;
+       description = "Serialize to bytes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "smallarray" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, hashable }:
      mkDerivation {
@@ -207942,6 +221631,8 @@ self: {
        libraryHaskellDepends = [ base bytestring deepseq hashable ];
        description = "low-level unboxed arrays, with minimal features";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smallcaps" = callPackage
@@ -208003,6 +221694,8 @@ self: {
        libraryHaskellDepends = [ base smallcheck smallcheck-series ];
        description = "SmallCheck properties for common laws";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smallcheck-lens" = callPackage
@@ -208018,6 +221711,8 @@ self: {
        ];
        description = "SmallCheck properties for lens";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smallcheck-series" = callPackage
@@ -208036,6 +221731,8 @@ self: {
        testHaskellDepends = [ base doctest Glob ];
        description = "Extra SmallCheck series and utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smallpt-hs" = callPackage
@@ -208049,6 +221746,8 @@ self: {
        executableHaskellDepends = [ base vector ];
        description = "A Haskell port of the smallpt path tracer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smallstring" = callPackage
@@ -208064,6 +221763,8 @@ self: {
        ];
        description = "A Unicode text type, optimized for low memory overhead";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smaoin" = callPackage
@@ -208110,6 +221811,8 @@ self: {
        ];
        description = "A command line tool for working with sets and maps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smartGroup" = callPackage
@@ -208123,6 +221826,8 @@ self: {
        ];
        description = "group strings or bytestrings by words in common";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smartcheck" = callPackage
@@ -208143,6 +221848,8 @@ self: {
        ];
        description = "A smarter QuickCheck";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smartconstructor" = callPackage
@@ -208154,6 +221861,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "A package exposing a helper function for generating smart constructors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smartword" = callPackage
@@ -208170,6 +221879,8 @@ self: {
        ];
        description = "Web based flash card for Word Smart I and II vocabularies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smcdel" = callPackage
@@ -208196,6 +221907,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion time ];
        description = "Symbolic Model Checking for Dynamic Epistemic Logic";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sme" = callPackage
@@ -208207,6 +221920,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A library for Secure Multi-Execution in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smerdyakov" = callPackage
@@ -208225,6 +221940,8 @@ self: {
          transformers yaml
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smiles" = callPackage
@@ -208236,6 +221953,8 @@ self: {
        libraryHaskellDepends = [ base megaparsec text ];
        testHaskellDepends = [ base hspec megaparsec QuickCheck text ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smith" = callPackage
@@ -208270,6 +221989,8 @@ self: {
        ];
        description = "Command line tool for <https://smith.st/ Smith>.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smith-client" = callPackage
@@ -208293,6 +222014,8 @@ self: {
        ];
        description = "API client for <https://smith.st/ Smith>.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smoothie" = callPackage
@@ -208321,6 +222044,8 @@ self: {
        ];
        description = "SMSAero API and HTTP client based on servant library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smt" = callPackage
@@ -208347,6 +222072,8 @@ self: {
        libraryHaskellDepends = [ array base directory polyparse ];
        description = "Parsing and printing SMT-LIB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smtLib" = callPackage
@@ -208390,6 +222117,8 @@ self: {
        ];
        description = "Dump the communication with an SMT solver for debugging purposes";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smtlib2-pipe" = callPackage
@@ -208411,6 +222140,8 @@ self: {
        ];
        description = "A type-safe interface to communicate with an SMT solver";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smtlib2-quickcheck" = callPackage
@@ -208426,6 +222157,8 @@ self: {
        ];
        description = "Helper functions to create SMTLib expressions in QuickCheck";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smtlib2-timing" = callPackage
@@ -208476,6 +222209,8 @@ self: {
        ];
        description = "An SMTP client EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smtp2mta" = callPackage
@@ -208508,6 +222243,8 @@ self: {
        ];
        description = "Gmail SMTP Client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "smuggler" = callPackage
@@ -208530,6 +222267,8 @@ self: {
        testHaskellDepends = [ base directory filepath ];
        description = "GHC Source Plugin that helps to manage imports";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snake" = callPackage
@@ -208543,6 +222282,8 @@ self: {
        executableHaskellDepends = [ base random split terminal-size ];
        description = "A basic console snake game";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snake-game" = callPackage
@@ -208554,6 +222295,8 @@ self: {
        libraryHaskellDepends = [ base GLUT OpenGL random ];
        description = "Snake Game Using OpenGL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snap" = callPackage
@@ -208591,6 +222334,8 @@ self: {
        ];
        description = "Top-level package for the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snap-accept" = callPackage
@@ -208606,6 +222351,8 @@ self: {
        ];
        description = "Accept header branching for the Snap web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snap-app" = callPackage
@@ -208637,6 +222384,8 @@ self: {
        ];
        description = "Command-line tool to manage Snap AuthManager database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snap-blaze" = callPackage
@@ -208659,6 +222408,8 @@ self: {
        libraryHaskellDepends = [ base blaze-html clay snap-core ];
        description = "blaze-html-clay integration for Snap";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snap-configuration-utilities" = callPackage
@@ -208672,6 +222423,8 @@ self: {
        ];
        description = "Methods to manipulate Configurator objects for Snap & Snaplets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snap-core" = callPackage
@@ -208750,6 +222503,8 @@ self: {
        ];
        description = "Collect errors in batches and dispatch them";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snap-extras" = callPackage
@@ -208781,6 +222536,8 @@ self: {
        ];
        description = "A collection of useful helpers and utilities for Snap web applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snap-language" = callPackage
@@ -208812,6 +222569,8 @@ self: {
        ];
        description = "Snap dynamic loader";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snap-loader-static" = callPackage
@@ -208825,6 +222584,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Snap static loader";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snap-predicates" = callPackage
@@ -208868,6 +222629,8 @@ self: {
        ];
        description = "Typesafe URLs for Snap applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snap-server" = callPackage
@@ -208925,6 +222688,8 @@ self: {
        ];
        description = "Streaming Snap handlers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snap-templates" = callPackage
@@ -208946,6 +222711,8 @@ self: {
        ];
        description = "Scaffolding CLI for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snap-testing" = callPackage
@@ -208969,6 +222736,8 @@ self: {
        ];
        description = "A library for BDD-style testing with the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snap-utils" = callPackage
@@ -208986,6 +222755,8 @@ self: {
        ];
        description = "Snap Framework utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snap-web-routes" = callPackage
@@ -209001,6 +222772,8 @@ self: {
        ];
        description = "Type safe URLs for Snap";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-acid-state" = callPackage
@@ -209014,6 +222787,8 @@ self: {
        ];
        description = "acid-state snaplet for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-actionlog" = callPackage
@@ -209038,6 +222813,8 @@ self: {
        ];
        description = "Generic action log snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-amqp" = callPackage
@@ -209055,6 +222832,8 @@ self: {
        ];
        description = "Snap framework snaplet for the AMQP library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-auth-acid" = callPackage
@@ -209075,6 +222854,8 @@ self: {
        ];
        description = "Provides an Acid-State backend for the Auth Snaplet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-coffee" = callPackage
@@ -209092,6 +222873,8 @@ self: {
        ];
        description = "CoffeeScript for Snap, auto-compilation and pre-compilation";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-css-min" = callPackage
@@ -209108,6 +222891,8 @@ self: {
        ];
        description = "A Snaplet for CSS minification";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-customauth" = callPackage
@@ -209131,6 +222916,8 @@ self: {
        ];
        description = "Alternate authentication snaplet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-environments" = callPackage
@@ -209147,6 +222934,8 @@ self: {
        ];
        description = "DEPRECATED! You should use standard Snap >= 0.9 \"environments\" functionality. It provided ability to easly read configuration based on given app environment given at command line, envs are defined in app configuration file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-fay" = callPackage
@@ -209166,6 +222955,8 @@ self: {
        ];
        description = "Fay integration for Snap with request- and pre-compilation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-ghcjs" = callPackage
@@ -209182,6 +222973,8 @@ self: {
        ];
        description = "Serve javascript files compiled with GHCJS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-hasql" = callPackage
@@ -209199,6 +222992,8 @@ self: {
        ];
        description = "A Hasql snaplet";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-haxl" = callPackage
@@ -209214,6 +223009,8 @@ self: {
        ];
        description = "Snaplet for Facebook's Haxl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-hdbc" = callPackage
@@ -209234,6 +223031,8 @@ self: {
        ];
        description = "HDBC snaplet for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-hslogger" = callPackage
@@ -209250,6 +223049,8 @@ self: {
        ];
        description = "Snap framework snaplet for the Logger API library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-i18n" = callPackage
@@ -209273,6 +223074,8 @@ self: {
        ];
        description = "snaplet-i18n";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-influxdb" = callPackage
@@ -209291,6 +223094,8 @@ self: {
        ];
        description = "Snap framework snaplet for the InfluxDB library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-lss" = callPackage
@@ -209323,6 +223128,8 @@ self: {
        ];
        description = "Snap framework snaplet for the Mandrill API library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-mongoDB" = callPackage
@@ -209342,6 +223149,8 @@ self: {
        ];
        description = "Snap Framework MongoDB support as Snaplet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-mongodb-minimalistic" = callPackage
@@ -209356,6 +223165,8 @@ self: {
        ];
        description = "Minimalistic MongoDB Snaplet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-mysql-simple" = callPackage
@@ -209376,6 +223187,8 @@ self: {
        ];
        description = "mysql-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-oauth" = callPackage
@@ -209401,6 +223214,8 @@ self: {
        ];
        description = "snaplet-oauth";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-persistent" = callPackage
@@ -209423,6 +223238,8 @@ self: {
        ];
        description = "persistent snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-postgresql-simple" = callPackage
@@ -209445,6 +223262,8 @@ self: {
        ];
        description = "postgresql-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-postmark" = callPackage
@@ -209461,6 +223280,8 @@ self: {
        ];
        description = "Postmark snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-purescript" = callPackage
@@ -209477,6 +223298,8 @@ self: {
        ];
        description = "Automatic (re)compilation of purescript projects";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-recaptcha" = callPackage
@@ -209494,6 +223317,8 @@ self: {
        ];
        description = "A ReCAPTCHA verification snaplet with Heist integration and connection sharing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-redis" = callPackage
@@ -209513,6 +223338,8 @@ self: {
        ];
        description = "Redis support for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-redson" = callPackage
@@ -209532,6 +223359,8 @@ self: {
        ];
        description = "CRUD for JSON data with Redis storage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-rest" = callPackage
@@ -209549,6 +223378,8 @@ self: {
        ];
        description = "REST resources for the Snap web framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-riak" = callPackage
@@ -209566,6 +223397,8 @@ self: {
        ];
        description = "A Snaplet for the Riak database";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-sass" = callPackage
@@ -209583,6 +223416,8 @@ self: {
        ];
        description = "Sass integration for Snap with request- and pre-compilation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-scoped-session" = callPackage
@@ -209599,6 +223434,8 @@ self: {
        ];
        description = "Modularised session state for Snaplets, in a Snaplet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-sedna" = callPackage
@@ -209615,6 +223452,8 @@ self: {
        ];
        description = "Snaplet for Sedna Bindings. Essentailly a rip of snaplet-hdbc.";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-ses-html" = callPackage
@@ -209631,6 +223470,8 @@ self: {
        ];
        description = "Snaplet for the ses-html package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-sqlite-simple" = callPackage
@@ -209661,6 +223502,8 @@ self: {
        ];
        description = "sqlite-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-sqlite-simple-jwt-auth" = callPackage
@@ -209680,6 +223523,8 @@ self: {
        ];
        description = "Snaplet for JWT authentication with snaplet-sqlite-simple";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-stripe" = callPackage
@@ -209698,6 +223543,8 @@ self: {
        ];
        description = "Stripe snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-tasks" = callPackage
@@ -209714,6 +223561,8 @@ self: {
        ];
        description = "Snaplet for Snap Framework enabling developers to administrative tasks akin to Rake tasks from Ruby On Rails framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-typed-sessions" = callPackage
@@ -209731,6 +223580,8 @@ self: {
        ];
        description = "Typed session snaplets and continuation-based programming for the Snap web framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snaplet-wordpress" = callPackage
@@ -209757,6 +223608,8 @@ self: {
        ];
        description = "A snaplet that communicates with wordpress over its api";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snappy" = callPackage
@@ -209786,6 +223639,8 @@ self: {
        libraryHaskellDepends = [ base bytestring conduit snappy ];
        description = "Conduit bindings for Snappy (see snappy package)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snappy-framing" = callPackage
@@ -209808,6 +223663,8 @@ self: {
        libraryHaskellDepends = [ base bytestring iteratee snappy ];
        description = "An enumeratee that uses Google's snappy compression library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sndfile-enumerators" = callPackage
@@ -209826,6 +223683,8 @@ self: {
        ];
        description = "Audio file reading/writing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sneakyterm" = callPackage
@@ -209841,6 +223700,8 @@ self: {
        ];
        description = "Tiny, declarative wrapper around ncurses";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sneathlane-haste" = callPackage
@@ -209864,6 +223725,8 @@ self: {
        libraryHaskellDepends = [ base containers pandoc process text ];
        description = "Markdown tester";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snippet-extractor" = callPackage
@@ -209898,6 +223761,8 @@ self: {
        ];
        description = "The Simple Nice-Looking Manual Generator";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snmp" = callPackage
@@ -209916,6 +223781,8 @@ self: {
        ];
        description = "SNMP protocol library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snorkels" = callPackage
@@ -209938,6 +223805,8 @@ self: {
        ];
        description = "Strategic board game of medium complexity";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snow-white" = callPackage
@@ -209950,6 +223819,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring mps ];
        description = "encode any binary instance to white space";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snowball" = callPackage
@@ -209997,6 +223868,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "twitter's snowflake";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snowflake-server" = callPackage
@@ -210015,6 +223888,8 @@ self: {
        ];
        description = "snowflake http server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "snowglobe" = callPackage
@@ -210048,6 +223923,8 @@ self: {
        ];
        description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "soap" = callPackage
@@ -210089,6 +223966,8 @@ self: {
        ];
        description = "TLS-enabled SOAP transport (using openssl bindings)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "soap-tls" = callPackage
@@ -210166,6 +224045,8 @@ self: {
        libraryHaskellDepends = [ base network transformers unix ];
        description = "systemd socket activation library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "socket-icmp" = callPackage
@@ -210192,6 +224073,8 @@ self: {
          transformers unordered-containers vector
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "socket-sctp" = callPackage
@@ -210205,6 +224088,8 @@ self: {
        testHaskellDepends = [ base bytestring socket ];
        description = "STCP socket extensions library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) lksctp-tools;};
 
   "socket-unix" = callPackage
@@ -210221,6 +224106,8 @@ self: {
        ];
        description = "Unix domain sockets";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "socketed" = callPackage
@@ -210247,6 +224134,8 @@ self: {
        ];
        description = "simpe tool to serve piped data over http and websocket";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "socketio" = callPackage
@@ -210275,6 +224164,8 @@ self: {
        ];
        description = "Socket.IO server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sockets" = callPackage
@@ -210305,6 +224196,8 @@ self: {
        doHaddock = false;
        description = "High-level network sockets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "socketson" = callPackage
@@ -210330,6 +224223,8 @@ self: {
        ];
        description = "A small websocket backend provider";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "socks" = callPackage
@@ -210354,6 +224249,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "Sodium Reactive Programming (FRP) System";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "soegtk" = callPackage
@@ -210366,6 +224263,8 @@ self: {
        libraryHaskellDepends = [ base cairo gtk old-time stm ];
        description = "GUI functions as used in the book \"The Haskell School of Expression\"";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "softfloat-hs" = callPackage
@@ -210378,6 +224277,8 @@ self: {
        librarySystemDepends = [ softfloat ];
        description = "Haskell bindings for SoftFloat";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {softfloat = null;};
 
   "solar" = callPackage
@@ -210414,6 +224315,8 @@ self: {
        ];
        description = "Simple typesafe web routing";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "solga-swagger" = callPackage
@@ -210431,6 +224334,8 @@ self: {
        ];
        description = "Swagger generation for Solga";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "solr" = callPackage
@@ -210455,6 +224360,8 @@ self: {
        ];
        description = "A minimal Solr client library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "solve" = callPackage
@@ -210502,6 +224409,8 @@ self: {
        ];
        description = "Sonic Visualiser";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sop-core" = callPackage
@@ -210570,6 +224479,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Efficient, type-safe sorted sequences";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sorted-list" = callPackage
@@ -210605,6 +224516,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Utils for sorting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sorty" = callPackage
@@ -210618,6 +224531,8 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Sort lines per file size";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "souffle-haskell" = callPackage
@@ -210638,6 +224553,8 @@ self: {
        testToolDepends = [ souffle ];
        description = "Souffle Datalog bindings for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) souffle;};
 
   "sound-collage" = callPackage
@@ -210660,6 +224577,8 @@ self: {
        ];
        description = "Approximate a song from other pieces of sound";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sounddelay" = callPackage
@@ -210673,6 +224592,8 @@ self: {
        executableHaskellDepends = [ base containers parseargs WAVE ];
        description = "Audio delay line";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "soundgen" = callPackage
@@ -210686,6 +224607,8 @@ self: {
        executableHaskellDepends = [ base split WAVE ];
        description = "sound generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "source-code-server" = callPackage
@@ -210709,6 +224632,8 @@ self: {
        ];
        description = "The server backend for the source code iPhone app";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sourcemap" = callPackage
@@ -210750,6 +224675,8 @@ self: {
        ];
        description = "Source/Sink/Transform: An alternative to lazy IO and iteratees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sox" = callPackage
@@ -210805,6 +224732,8 @@ self: {
        ];
        description = "DCPU-16 architecture utilities for Notch's 0x10c game";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "space" = callPackage
@@ -210870,6 +224799,8 @@ self: {
        libraryHaskellDepends = [ base vector-space ];
        description = "Space partition data structures. Currently only a QuadTree.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spaceprobe" = callPackage
@@ -210914,6 +224845,8 @@ self: {
        ];
        description = "Implementation of the SPAKE2 Password-Authenticated Key Exchange algorithm";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spanout" = callPackage
@@ -210931,6 +224864,8 @@ self: {
        ];
        description = "A breakout clone written in netwire and gloss";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sparkle" = callPackage
@@ -210956,6 +224891,8 @@ self: {
        ];
        description = "Distributed Apache Spark applications in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sparql-protocol" = callPackage
@@ -211001,6 +224938,8 @@ self: {
        ];
        description = "Unified streaming data-dependency framework for web apps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sparse" = callPackage
@@ -211028,6 +224967,8 @@ self: {
        benchmarkHaskellDepends = [ array base criterion deepseq vector ];
        description = "A playground of sparse linear algebra primitives using Morton ordering";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sparse-lin-alg" = callPackage
@@ -211045,6 +224986,8 @@ self: {
        ];
        description = "Effective linear algebra on sparse matrices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sparse-linear-algebra" = callPackage
@@ -211100,6 +225043,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "Sparse bitmaps for pattern match coverage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sparsecheck" = callPackage
@@ -211111,6 +225056,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A Logic Programming Library for Test-Data Generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sparser" = callPackage
@@ -211126,6 +225073,8 @@ self: {
        ];
        description = "Lightweight parsing library based on partial functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spata" = callPackage
@@ -211138,6 +225087,8 @@ self: {
        libraryHaskellDepends = [ base dlist mps mtl ];
        description = "brainless form validation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spatial-math" = callPackage
@@ -211232,6 +225183,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Control.Applicative, Data.Foldable, Data.Traversable (compatibility package)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "special-keys" = callPackage
@@ -211249,6 +225202,8 @@ self: {
        ];
        description = "Simple data types that help me here and there";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "special-values" = callPackage
@@ -211288,6 +225243,8 @@ self: {
        ];
        description = "Create specialized types from polymorphic ones using TH";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "species" = callPackage
@@ -211306,6 +225263,8 @@ self: {
        ];
        description = "Computational combinatorial species";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spectral-clustering" = callPackage
@@ -211323,6 +225282,8 @@ self: {
        ];
        description = "Library for spectral clustering";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "speculate" = callPackage
@@ -211349,6 +225310,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim stm transformers ];
        description = "A framework for safe, programmable, speculative parallelism";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "speculation-transformers" = callPackage
@@ -211361,6 +225324,8 @@ self: {
        doHaddock = false;
        description = "Merged into 'speculation'. Use that instead.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "speechmatics" = callPackage
@@ -211391,6 +225356,8 @@ self: {
        ];
        description = "Speechmatics api client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "speedy-slice" = callPackage
@@ -211408,6 +225375,8 @@ self: {
        testHaskellDepends = [ base containers mwc-probability ];
        description = "Speedy slice sampling";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spelling-suggest" = callPackage
@@ -211429,6 +225398,8 @@ self: {
        ];
        description = "Spelling suggestion tool with library and command-line interfaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spherical" = callPackage
@@ -211455,6 +225426,8 @@ self: {
        ];
        description = "Orbotix Sphero client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sphinx" = callPackage
@@ -211471,6 +225444,8 @@ self: {
        ];
        description = "Haskell bindings to the Sphinx full-text searching daemon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sphinx-cli" = callPackage
@@ -211484,6 +225459,8 @@ self: {
        executableHaskellDepends = [ base sphinx ];
        description = "Sphinx CLI and demo of Haskell Sphinx library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sphinxesc" = callPackage
@@ -211502,6 +225479,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative ];
        description = "Transform queries for sphinx input";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spice" = callPackage
@@ -211518,6 +225497,8 @@ self: {
        ];
        description = "An FRP-based game engine written in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spike" = callPackage
@@ -211561,6 +225542,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Some utilities for reading and writing SPIR-V files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spiros" = callPackage
@@ -211587,6 +225570,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Spiros Boosalis's Custom Prelude";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "splay" = callPackage
@@ -211598,6 +225583,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Generic splay-based sequence representation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "splaytree" = callPackage
@@ -211615,6 +225602,8 @@ self: {
        ];
        description = "Provides an annotated splay tree";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "splice" = callPackage
@@ -211649,6 +225638,8 @@ self: {
        ];
        description = "A parallel implementation of the Sorokina/Zeilfelder spline scheme";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "splines" = callPackage
@@ -211670,6 +225661,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion polynomial vector ];
        description = "B-Splines, other splines, and NURBS";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "split_0_1_4_3" = callPackage
@@ -211685,20 +225678,6 @@ self: {
      }) {};
 
   "split" = callPackage
-    ({ mkDerivation, base, QuickCheck }:
-     mkDerivation {
-       pname = "split";
-       version = "0.2.3.3";
-       sha256 = "04qlmkcyklznl03gsjg95b4nzb6i96gdapqg60rny9szgi7ngk8x";
-       revision = "2";
-       editedCabalFile = "1c8bcssxq5rkxkixgms6w6x6lzf4n7cxk6cx6av1dp3lixdy9j34";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base QuickCheck ];
-       description = "Combinator library for splitting lists";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "split_0_2_3_4" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "split";
@@ -211708,7 +225687,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Combinator library for splitting lists";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "split-channel" = callPackage
@@ -211732,6 +225710,8 @@ self: {
        testHaskellDepends = [ base invariant lens QuickCheck ];
        description = "Split Epimorphisms and Monomorphisms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "split-record" = callPackage
@@ -211821,6 +225801,8 @@ self: {
        ];
        description = "Use numerical ranges to split out certain lines from a file";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "splot" = callPackage
@@ -211840,6 +225822,8 @@ self: {
        ];
        description = "A tool for visualizing the lifecycle of many concurrent multi-staged processes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spool" = callPackage
@@ -211881,6 +225865,8 @@ self: {
        ];
        description = "Spoon's utilities. Simple testing and nice looking error reporting.";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spoty" = callPackage
@@ -211897,6 +225883,8 @@ self: {
        ];
        description = "Spotify web API wrapper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spreadsheet" = callPackage
@@ -211956,6 +225944,8 @@ self: {
        ];
        description = "JSON API to HTML website wrapper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spritz" = callPackage
@@ -211967,6 +225957,8 @@ self: {
        libraryHaskellDepends = [ base lens mtl vector ];
        description = "An implementation of the Spritz RC4-like stream cipher in Haskell";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sproxy" = callPackage
@@ -211991,6 +225983,8 @@ self: {
        ];
        description = "HTTP proxy for authenticating users via OAuth2";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sproxy-web" = callPackage
@@ -212016,6 +226010,8 @@ self: {
        ];
        description = "Web interface to sproxy database";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sproxy2" = callPackage
@@ -212041,6 +226037,8 @@ self: {
        ];
        description = "Secure HTTP proxy for authenticating users via OAuth2";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spsa" = callPackage
@@ -212060,6 +226058,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion hmatrix random ];
        description = "Simultaneous Perturbation Stochastic Approximation Optimization Algorithm";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "spy" = callPackage
@@ -212085,6 +226085,8 @@ self: {
        ];
        description = "A compact file system watcher for Mac OS X, Linux and Windows";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sql-simple" = callPackage
@@ -212101,6 +226103,8 @@ self: {
        ];
        description = "common middle-level sql client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sql-simple-mysql" = callPackage
@@ -212116,6 +226120,8 @@ self: {
        ];
        description = "mysql backend for sql-simple";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sql-simple-pool" = callPackage
@@ -212132,6 +226138,8 @@ self: {
        ];
        description = "conection pool for sql-simple";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sql-simple-postgresql" = callPackage
@@ -212147,6 +226155,8 @@ self: {
        ];
        description = "postgresql backend for sql-simple";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sql-simple-sqlite" = callPackage
@@ -212158,6 +226168,8 @@ self: {
        libraryHaskellDepends = [ base sql-simple sqlite-simple ];
        description = "sqlite backend for sql-simple";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sql-words" = callPackage
@@ -212188,6 +226200,8 @@ self: {
        testHaskellDepends = [ base filepath hspec temporary ];
        description = "Haskell binding to sqlcipher";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "sqlcli" = callPackage
@@ -212228,6 +226242,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Haskell binding to sqlite3";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) sqlite;};
 
   "sqlite-simple" = callPackage
@@ -212237,10 +226253,8 @@ self: {
      }:
      mkDerivation {
        pname = "sqlite-simple";
-       version = "0.4.16.0";
-       sha256 = "1pih3nbfczyb91smci2dg9p1wvjsqiv5f5y97q6vqzlns64a3lk0";
-       revision = "1";
-       editedCabalFile = "123bykwxl3p6918bjxv073ksf8k1hn6s0rlph934h18400n51fdf";
+       version = "0.4.17.0";
+       sha256 = "1bd1883kn2bvzglqg3l2yjcd94liv36181ib8g40k34zdm67wvbz";
        libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-textual bytestring containers
          direct-sqlite Only semigroups template-haskell text time
@@ -212251,6 +226265,8 @@ self: {
        ];
        description = "Mid-Level SQLite client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sqlite-simple-errors" = callPackage
@@ -212263,6 +226279,8 @@ self: {
        testHaskellDepends = [ base mtl sqlite-simple text ];
        description = "Wrapper around errors from sqlite-simple";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sqlite-simple-typed" = callPackage
@@ -212279,6 +226297,8 @@ self: {
        ];
        description = "Typed extension to sqlite simple";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sqlvalue-list" = callPackage
@@ -212290,6 +226310,8 @@ self: {
        libraryHaskellDepends = [ base convertible HDBC template-haskell ];
        description = "Class and instances for conversion to list of SqlValue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sqsd-local" = callPackage
@@ -212311,6 +226333,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "squeal-postgresql" = callPackage
@@ -212341,6 +226365,8 @@ self: {
        ];
        description = "Squeal PostgreSQL Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "squeather" = callPackage
@@ -212401,6 +226427,8 @@ self: {
        ];
        description = "Module limbo";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "srcinst" = callPackage
@@ -212419,6 +226447,8 @@ self: {
        ];
        description = "Build and install Debian packages completely from source";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "srcloc" = callPackage
@@ -212459,6 +226489,8 @@ self: {
        ];
        description = "text UI for scanning with SANE";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sscgi" = callPackage
@@ -212476,6 +226508,8 @@ self: {
        ];
        description = "Simple SCGI Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sscript" = callPackage
@@ -212517,6 +226551,8 @@ self: {
        doCheck = false;
        description = "A pure-Haskell SSH server library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ssh-known-hosts" = callPackage
@@ -212554,6 +226590,8 @@ self: {
        ];
        description = "Proxy http-client via ssh tunnel";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sshd-lint" = callPackage
@@ -212574,6 +226612,8 @@ self: {
        ];
        description = "Check sshd configuration for adherence to best practices";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sshtun" = callPackage
@@ -212621,6 +226661,8 @@ self: {
        ];
        description = "HTTP proxy for S3";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sstable" = callPackage
@@ -212639,6 +226681,8 @@ self: {
        executableHaskellDepends = [ cmdargs ];
        description = "SSTables in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ssv" = callPackage
@@ -212664,6 +226708,8 @@ self: {
        libraryHaskellDepends = [ base gdp ghc-prim primitive ];
        description = "shared heap regions between local mutable state threads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stable-heap" = callPackage
@@ -212680,6 +226726,8 @@ self: {
        ];
        description = "Purely functional stable heaps (fair priority queues)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stable-maps" = callPackage
@@ -212691,6 +226739,8 @@ self: {
        libraryHaskellDepends = [ base containers ghc-prim ];
        description = "Heterogeneous maps keyed by StableNames";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stable-marriage" = callPackage
@@ -212702,6 +226752,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "algorithms around stable marriage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stable-memo" = callPackage
@@ -212715,6 +226767,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim hashtables ];
        description = "Memoization based on argument identity";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stable-tree" = callPackage
@@ -212739,6 +226793,8 @@ self: {
        ];
        description = "Trees whose branches are resistant to change";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stache" = callPackage
@@ -212865,7 +226921,8 @@ self: {
        '';
        description = "The Haskell Tool Stack";
        license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stack-bump" = callPackage
@@ -212889,6 +226946,8 @@ self: {
        ];
        description = "Dead simple version bumping for hpack packages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stack-fix" = callPackage
@@ -212902,6 +226961,8 @@ self: {
        executableHaskellDepends = [ base options text turtle ];
        description = "Console program used to fix Stack build errors automatically";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stack-hpc-coveralls" = callPackage
@@ -212928,6 +226989,8 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stack-lib" = callPackage
@@ -212943,6 +227006,8 @@ self: {
        ];
        description = "Wrapper to use stack as a library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stack-network" = callPackage
@@ -212984,6 +227049,8 @@ self: {
        ];
        description = "A program for extending Stack to add distributed capabilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stack-prism" = callPackage
@@ -213002,6 +227069,8 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Stack prisms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stack-run" = callPackage
@@ -213021,6 +227090,8 @@ self: {
        ];
        description = "An equivalent to cabal run for stack";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stack-run-auto" = callPackage
@@ -213048,6 +227119,8 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stack-tag" = callPackage
@@ -213069,22 +227142,11 @@ self: {
        ];
        description = "Create etags for Haskell projects based on Stack snapshots";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stack-templatizer" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath }:
-     mkDerivation {
-       pname = "stack-templatizer";
-       version = "0.1.0.1";
-       sha256 = "1wcs1hpz096k60d33bs1xn65adry8869b6yg8gvy46lv3f64q4x3";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [ base bytestring directory filepath ];
-       description = "Generate a stack template from a folder";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "stack-templatizer_0_1_0_2" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath }:
      mkDerivation {
        pname = "stack-templatizer";
@@ -213095,7 +227157,6 @@ self: {
        executableHaskellDepends = [ base bytestring directory filepath ];
        description = "Generate a stack template from a folder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack-type" = callPackage
@@ -213107,6 +227168,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "The basic stack type";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stack-wrapper" = callPackage
@@ -213123,6 +227186,8 @@ self: {
        executableHaskellDepends = [ base filepath process ];
        description = "Call ghc within stack by calling ghc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stack-yaml" = callPackage
@@ -213164,6 +227229,8 @@ self: {
        ];
        description = "Convert stack projects to cabal.project + cabal.project.freeze";
        license = stdenv.lib.licenses.gpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stack2nix" = callPackage
@@ -213190,6 +227257,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Convert stack.yaml files into Nix build instructions.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackage" = callPackage
@@ -213208,6 +227277,8 @@ self: {
        ];
        description = "Dummy package forcing installation of other Stackage packages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackage-build-plan" = callPackage
@@ -213232,6 +227303,8 @@ self: {
        ];
        description = "Calculate and print (in different formats) Stackage build plans";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackage-cabal" = callPackage
@@ -213252,6 +227325,8 @@ self: {
        ];
        description = "A CLI executable for cabal-based stackage commands";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackage-cli" = callPackage
@@ -213273,6 +227348,8 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "A CLI library for stackage commands";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackage-curator" = callPackage
@@ -213317,6 +227394,8 @@ self: {
        ];
        description = "Tools for curating Stackage bundles";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackage-install" = callPackage
@@ -213365,6 +227444,8 @@ self: {
        ];
        description = "DEPRECATED Grab current metadata for all packages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackage-query" = callPackage
@@ -213388,6 +227469,8 @@ self: {
        ];
        description = "Tool for querying Stackage";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackage-sandbox" = callPackage
@@ -213408,6 +227491,8 @@ self: {
        ];
        description = "Work with shared stackage sandboxes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackage-setup" = callPackage
@@ -213431,6 +227516,8 @@ self: {
        ];
        description = "An executable for downloading a Haskell setup";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackage-to-hackage" = callPackage
@@ -213456,6 +227543,8 @@ self: {
        ];
        description = "Convert stack.yaml to cabal.project + cabal.project.freeze";
        license = stdenv.lib.licenses.gpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackage-types" = callPackage
@@ -213475,6 +227564,8 @@ self: {
        ];
        description = "Shared data types between various Stackage packages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackage-update" = callPackage
@@ -213511,6 +227602,8 @@ self: {
        ];
        description = "A more secure version of cabal upload which uses HTTPS";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stackage2nix" = callPackage
@@ -213541,6 +227634,8 @@ self: {
        ];
        description = "Convert Stack files into Nix build instructions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stacked-dag" = callPackage
@@ -213606,6 +227701,8 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "This package will derive class instance along the data type declaration tree. (Deprecated)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "standalone-haddock" = callPackage
@@ -213623,6 +227720,8 @@ self: {
        ];
        description = "Generate standalone haddock documentation for a set of packages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "star" = callPackage
@@ -213671,6 +227770,8 @@ self: {
        ];
        description = "A memcached client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "starrover2" = callPackage
@@ -213717,6 +227818,8 @@ self: {
        ];
        description = "To be written";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "state" = callPackage
@@ -213728,6 +227831,8 @@ self: {
        libraryHaskellDepends = [ arrows base mtl ];
        description = "Data.State";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "state-bag" = callPackage
@@ -213744,6 +227849,8 @@ self: {
        testHaskellDepends = [ base hspec transformers ];
        description = "Monad transformers for holding bags of state";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "state-codes" = callPackage
@@ -213769,6 +227876,8 @@ self: {
        testHaskellDepends = [ base checkers mtl QuickCheck ];
        description = "MonadPlus for StateT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "state-record" = callPackage
@@ -213780,6 +227889,8 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Better records for State monad states";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stateWriter" = callPackage
@@ -213800,6 +227911,8 @@ self: {
        ];
        description = "A faster variant of the RWS monad transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "statechart" = callPackage
@@ -213824,6 +227937,8 @@ self: {
        libraryHaskellDepends = [ base MaybeT mtl ];
        description = "Typeclass instances for monad transformer stacks with an ST thread at the bottom";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stateref" = callPackage
@@ -213891,6 +228006,8 @@ self: {
        libraryHaskellDepends = [ base double-conversion free mtl text ];
        description = "DSL to generate HTML5 Canvas javascript";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "static-closure" = callPackage
@@ -213907,6 +228024,8 @@ self: {
        ];
        description = "Serialisable static pointers to functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "static-hash" = callPackage
@@ -213939,6 +228058,8 @@ self: {
        ];
        description = "JavaScript and Css files concat for http optimization. Now with LESS support.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "static-tensor" = callPackage
@@ -213962,6 +228083,8 @@ self: {
        ];
        description = "Tensors of statically known size";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "static-text" = callPackage
@@ -213983,6 +228106,8 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Lists, Texts, ByteStrings and Vectors of statically known length";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "staticanalysis" = callPackage
@@ -213994,6 +228119,8 @@ self: {
        libraryHaskellDepends = [ base MissingH ];
        description = "Reusable static analysis interfaces and modules";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "statistics" = callPackage
@@ -214035,6 +228162,8 @@ self: {
        ];
        description = "Functions for working with Dirichlet densities and mixtures on vectors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "statistics-fusion" = callPackage
@@ -214046,6 +228175,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "An implementation of high performance, minimal statistics functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "statistics-hypergeometric-genvar" = callPackage
@@ -214061,6 +228192,8 @@ self: {
        ];
        description = "Random variate generation from hypergeometric distributions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "statistics-linreg" = callPackage
@@ -214089,6 +228222,8 @@ self: {
        executableHaskellDepends = [ base statistics text vector ];
        description = "command line statistics";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "statsd" = callPackage
@@ -214104,6 +228239,8 @@ self: {
        ];
        description = "StatsD API";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "statsd-client" = callPackage
@@ -214121,6 +228258,8 @@ self: {
        ];
        description = "Statsd UDP client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "statsd-datadog" = callPackage
@@ -214159,6 +228298,8 @@ self: {
        ];
        description = "A lovely [Dog]StatsD implementation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "status-notifier-item" = callPackage
@@ -214182,6 +228323,8 @@ self: {
        ];
        description = "A wrapper over the StatusNotifierItem/libappindicator dbus specification";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "statvfs" = callPackage
@@ -214193,6 +228336,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Get unix filesystem statistics with statfs, statvfs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "staversion" = callPackage
@@ -214245,6 +228390,7 @@ self: {
        description = "Image loading and writing microlibrary";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stb-image-redux" = callPackage
@@ -214257,6 +228403,8 @@ self: {
        testHaskellDepends = [ base hspec vector ];
        description = "Image loading and writing microlibrary";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stb-truetype" = callPackage
@@ -214301,6 +228449,8 @@ self: {
        ];
        description = "A library for implicit, monadic dataflow parallelism";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "std" = callPackage
@@ -214323,6 +228473,8 @@ self: {
        libraryHaskellDepends = [ base parsec syb template-haskell ];
        description = "Structure Data Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stdf" = callPackage
@@ -214345,6 +228497,8 @@ self: {
        ];
        description = "Parse Structured Test Data Format (STDF)";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stdio" = callPackage
@@ -214370,6 +228524,8 @@ self: {
        ];
        description = "A simple and high performance IO toolkit for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libuv;};
 
   "steambrowser" = callPackage
@@ -214383,6 +228539,8 @@ self: {
        executableHaskellDepends = [ base directory parsec transformers ];
        description = "List and launch steam games from the cli";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "steeloverseer" = callPackage
@@ -214426,6 +228584,8 @@ self: {
        testHaskellDepends = [ base random uuid ];
        description = "Generator and verifier for steganographic numbers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stemmer" = callPackage
@@ -214437,6 +228597,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell bindings to the Snowball stemming library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stemmer-german" = callPackage
@@ -214450,6 +228612,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Extract the stem of a German inflected word form";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "step-function" = callPackage
@@ -214478,6 +228642,8 @@ self: {
        sha256 = "059k8g3wb4hkxk42vm83vv6kh3igrpf7fc97xvn3qai5rx3jmgqf";
        libraryHaskellDepends = [ base containers mtl ];
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stern-brocot" = callPackage
@@ -214495,6 +228661,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Positive rational numbers represented as paths in the Stern-Brocot tree";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stgi" = callPackage
@@ -214523,6 +228691,8 @@ self: {
        ];
        description = "Educational implementation of the STG (Spineless Tagless G-machine)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stickyKeysHotKey" = callPackage
@@ -214602,6 +228772,8 @@ self: {
        testHaskellDepends = [ async base HUnit stm tasty tasty-hunit ];
        description = "Chunked Communication Queues";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stm-conduit" = callPackage
@@ -214647,6 +228819,8 @@ self: {
        ];
        description = "Containers for STM";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stm-delay" = callPackage
@@ -214688,6 +228862,8 @@ self: {
        testHaskellDepends = [ base hspec HUnit stm ];
        description = "Conduits and STM operations for fire hoses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stm-hamt" = callPackage
@@ -214714,6 +228890,8 @@ self: {
        ];
        description = "STM-specialised Hash Array Mapped Trie";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stm-io-hooks" = callPackage
@@ -214770,6 +228948,8 @@ self: {
        testHaskellDepends = [ base QuickCheck stm ];
        description = "Simple STM Promises for IO computations and external processes";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stm-queue-extras" = callPackage
@@ -214816,6 +228996,8 @@ self: {
        ];
        description = "retry statistics for STM transactions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stm-supply" = callPackage
@@ -214853,6 +229035,8 @@ self: {
        libraryHaskellDepends = [ base haskell98 mtl stm ];
        description = "Control communication among retrying transactions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stochastic" = callPackage
@@ -214868,6 +229052,8 @@ self: {
        ];
        description = "Monadic composition of probabilistic functions and sampling";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stocks" = callPackage
@@ -214970,6 +229156,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Storable type class for variable-sized data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "storable-complex" = callPackage
@@ -215031,6 +229219,8 @@ self: {
        libraryHaskellDepends = [ array base tagged vector ];
        description = "Statically-sized array wrappers with Storable instances for FFI marshaling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "storable-tuple" = callPackage
@@ -215093,6 +229283,8 @@ self: {
        ];
        description = "Conversion between storablevector and stream-fusion lists with fusion";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "store" = callPackage
@@ -215181,6 +229373,8 @@ self: {
        ];
        description = "Streaming interfaces for `store`";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stp" = callPackage
@@ -215195,6 +229389,8 @@ self: {
        executableHaskellDepends = [ base regex-compat ];
        description = "Simple Theorem Prover";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "str" = callPackage
@@ -215211,6 +229407,8 @@ self: {
        ];
        description = "A type class to abstract between many different string types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stratosphere" = callPackage
@@ -215255,6 +229453,8 @@ self: {
        ];
        description = "Client for Stratum protocol";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stratux" = callPackage
@@ -215270,6 +229470,8 @@ self: {
        ];
        description = "A library for stratux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stratux-demo" = callPackage
@@ -215292,6 +229494,8 @@ self: {
        ];
        description = "A demonstration of the stratux library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stratux-http" = callPackage
@@ -215338,6 +229542,8 @@ self: {
        ];
        description = "A library for using websockets with stratux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stream" = callPackage
@@ -215357,6 +229563,8 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stream-fusion" = callPackage
@@ -215370,6 +229578,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Faster Haskell lists using stream fusion";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stream-monad" = callPackage
@@ -215383,6 +229593,8 @@ self: {
        libraryHaskellDepends = [ base logict ];
        description = "Simple, Fair and Terminating Backtracking Monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streamdeck" = callPackage
@@ -215394,6 +229606,8 @@ self: {
        libraryHaskellDepends = [ base bytestring hidapi mtl split ];
        description = "Control library for the Elgato Stream Deck";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streamed" = callPackage
@@ -215412,6 +229626,8 @@ self: {
        ];
        description = "Programmatically edit MIDI event streams via ALSA";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming" = callPackage
@@ -215547,6 +229763,8 @@ self: {
        ];
        description = "Streaming interface for Brotli (RFC7932) compression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming-bytestring" = callPackage
@@ -215589,6 +229807,8 @@ self: {
        ];
        description = "Cassava support for the streaming ecosystem";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming-commons" = callPackage
@@ -215651,6 +229871,8 @@ self: {
        testHaskellDepends = [ base conduit hspec streaming ];
        description = "Bidirectional support between the streaming and conduit libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming-events" = callPackage
@@ -215702,6 +229924,8 @@ self: {
        ];
        description = "online streaming fft";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming-histogram" = callPackage
@@ -215738,6 +229962,8 @@ self: {
        ];
        description = "Streaming interface for LZMA/XZ compression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming-osm" = callPackage
@@ -215801,6 +230027,8 @@ self: {
        ];
        description = "Perfectly streaming PNG image decoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming-postgresql-simple" = callPackage
@@ -215842,6 +230070,8 @@ self: {
        ];
        description = "Streaming support for running system process";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming-sort" = callPackage
@@ -215863,6 +230093,8 @@ self: {
        ];
        description = "Sorting streams";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streaming-utils" = callPackage
@@ -215918,31 +230150,6 @@ self: {
      }) {};
 
   "streamly" = callPackage
-    ({ mkDerivation, atomic-primops, base, containers, deepseq
-     , directory, exceptions, gauge, ghc-prim, heaps, hspec
-     , lockfree-queue, monad-control, mtl, network, QuickCheck, random
-     , transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "streamly";
-       version = "0.7.0";
-       sha256 = "1v9fndyh1bhdidwg9jpq4j10i5d1w9hw0rbhd69x8pd02gzqkpbh";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         atomic-primops base containers deepseq directory exceptions
-         ghc-prim heaps lockfree-queue monad-control mtl network
-         transformers transformers-base
-       ];
-       testHaskellDepends = [
-         base containers exceptions hspec mtl QuickCheck random transformers
-       ];
-       benchmarkHaskellDepends = [ base deepseq gauge random ];
-       description = "Beautiful Streaming, Concurrent and Reactive Composition";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "streamly_0_7_1" = callPackage
     ({ mkDerivation, atomic-primops, base, containers, deepseq
      , directory, exceptions, fusion-plugin-types, gauge, ghc, ghc-prim
      , heaps, hspec, lockfree-queue, monad-control, mtl, network
@@ -215969,7 +230176,6 @@ self: {
        ];
        description = "Beautiful Streaming, Concurrent and Reactive Composition";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streamly-bytestring" = callPackage
@@ -216067,7 +230273,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Stream Processer Arrow";
        license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "streams" = callPackage
@@ -216104,6 +230311,8 @@ self: {
        ];
        description = "A simple, flexible and composable web-router";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "strelka-core" = callPackage
@@ -216211,6 +230420,8 @@ self: {
        ];
        description = "A collection of commonly used strict data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "strict-ghc-plugin" = callPackage
@@ -216329,6 +230540,8 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        description = "Combinators for strictifying functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "string" = callPackage
@@ -216461,6 +230674,8 @@ self: {
        ];
        description = "Tools for working with isomorphisms of strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "string-qq" = callPackage
@@ -216485,6 +230700,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "QuasiQuoter for non-interpolated strings, texts and bytestrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "string-random" = callPackage
@@ -216554,6 +230771,8 @@ self: {
        ];
        description = "Type-level Chars and Strings, with decidable equality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stringable" = callPackage
@@ -216594,6 +230813,8 @@ self: {
        ];
        description = "Transformations to several string-like types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stringprep" = callPackage
@@ -216646,6 +230867,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring containers syb ];
        description = "Memoize Strings as Atoms for fast comparison and sorting, with maps and sets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "strio" = callPackage
@@ -216691,6 +230914,8 @@ self: {
        ];
        description = "A Haskell implementation of the Stripe API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stripe-concepts" = callPackage
@@ -216718,6 +230943,8 @@ self: {
        ];
        description = "Stripe API for Haskell - Pure Core";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stripe-haskell" = callPackage
@@ -216729,6 +230956,8 @@ self: {
        libraryHaskellDepends = [ base stripe-core stripe-http-client ];
        description = "Stripe API for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stripe-http-client" = callPackage
@@ -216748,6 +230977,8 @@ self: {
        ];
        description = "Stripe API for Haskell - http-client backend";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stripe-http-streams" = callPackage
@@ -216768,6 +230999,8 @@ self: {
        doCheck = false;
        description = "Stripe API for Haskell - http-streams backend";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stripe-scotty" = callPackage
@@ -216820,6 +231053,8 @@ self: {
        ];
        description = "Tests for Stripe API bindings for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stripe-wreq" = callPackage
@@ -216904,6 +231139,8 @@ self: {
        ];
        description = "Interface library for strongSwan SQL backend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "strptime" = callPackage
@@ -216956,6 +231193,8 @@ self: {
        ];
        description = "Instantiate structural induction schemas for algebraic data types";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "structural-traversal" = callPackage
@@ -216968,6 +231207,8 @@ self: {
        testHaskellDepends = [ base HUnit mtl ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "structured-cli" = callPackage
@@ -217046,6 +231287,8 @@ self: {
        ];
        description = "Structured MongoDB interface";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "structures" = callPackage
@@ -217076,6 +231319,8 @@ self: {
        ];
        description = "\"Advanced\" Data Structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stt" = callPackage
@@ -217092,6 +231337,8 @@ self: {
        ];
        description = "A monad transformer version of the ST monad";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stunclient" = callPackage
@@ -217115,6 +231362,8 @@ self: {
        ];
        description = "RFC 5389: Session Traversal Utilities for NAT (STUN) client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stunts" = callPackage
@@ -217135,6 +231384,8 @@ self: {
        ];
        description = "A revival of the classic game Stunts (LambdaCube tech demo)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stutter" = callPackage
@@ -217162,6 +231413,8 @@ self: {
        ];
        description = "(Stutter Text|String)-Utterer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stylish-cabal" = callPackage
@@ -217271,6 +231524,8 @@ self: {
        ];
        description = "Apply CSS styles to a document tree";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stylized" = callPackage
@@ -217282,6 +231537,8 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base ];
        description = "Ways to output stylized text on ANSI consoles";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "styx" = callPackage
@@ -217338,6 +231595,8 @@ self: {
        ];
        description = "Get the total, put a single element";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "subhask" = callPackage
@@ -217364,6 +231623,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion MonadRandom ];
        description = "Type safe interface for programming in subcategories of Hask";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "subleq-toolchain" = callPackage
@@ -217385,6 +231646,8 @@ self: {
        ];
        description = "Toolchain of subleq computer";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "submark" = callPackage
@@ -217406,6 +231669,8 @@ self: {
        ];
        description = "Extract a part from CommonMark/Markdown docs";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "subnet" = callPackage
@@ -217435,6 +231700,8 @@ self: {
        ];
        description = "Subsample data";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "substring-parser" = callPackage
@@ -217453,6 +231720,8 @@ self: {
        ];
        description = "Match / replace substrings with a parser combinators";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "subtitleParser" = callPackage
@@ -217489,6 +231758,8 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Subword graph implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "subzero" = callPackage
@@ -217527,6 +231798,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An applicative functor to manage successors";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "suffix-array" = callPackage
@@ -217547,6 +231820,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion random ];
        description = "Simple and moderately efficient suffix array implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "suffixarray" = callPackage
@@ -217561,6 +231836,8 @@ self: {
        executableHaskellDepends = [ base HUnit ];
        description = "n log n implementation of suffix array";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "suffixtree" = callPackage
@@ -217585,6 +231862,8 @@ self: {
        executableHaskellDepends = [ base process ];
        description = "Library-based syntactic extensibility for Haskell";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "suitable" = callPackage
@@ -217596,6 +231875,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Abstract over the constraints on the parameters to type constructors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sum-type-boilerplate" = callPackage
@@ -217634,6 +231915,8 @@ self: {
        ];
        description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "summoner-tui" = callPackage
@@ -217653,6 +231936,8 @@ self: {
        executableHaskellDepends = [ base relude ];
        description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects using TUI";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sump" = callPackage
@@ -217670,6 +231955,8 @@ self: {
        ];
        description = "A Haskell interface to SUMP-compatible logic analyzers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sundown" = callPackage
@@ -217697,6 +231984,8 @@ self: {
        ];
        description = "Test Cabalized package against multiple dependency versions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sunroof-compiler" = callPackage
@@ -217714,6 +232003,8 @@ self: {
        ];
        description = "Monadic Javascript Compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sunroof-examples" = callPackage
@@ -217735,6 +232026,8 @@ self: {
        ];
        description = "Tests for Sunroof";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sunroof-server" = callPackage
@@ -217756,6 +232049,8 @@ self: {
        ];
        description = "Monadic Javascript Compiler - Server Utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "super-user-spark" = callPackage
@@ -217785,6 +232080,8 @@ self: {
        ];
        description = "Configure your dotfile deployment with a DSL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "superbubbles" = callPackage
@@ -217799,6 +232096,8 @@ self: {
        testHaskellDepends = [ base containers hspec ];
        description = "Find \"superbubbles\", as described in https://arxiv.org/abs/1307.7925";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "superbuffer" = callPackage
@@ -217816,6 +232115,8 @@ self: {
        ];
        description = "Efficiently build a bytestring from smaller chunks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "supercollider-ht" = callPackage
@@ -217833,6 +232134,8 @@ self: {
        ];
        description = "Haskell SuperCollider utilities";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "supercollider-midi" = callPackage
@@ -217855,6 +232158,8 @@ self: {
        ];
        description = "Demonstrate how to control SuperCollider via ALSA-MIDI";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "superconstraints" = callPackage
@@ -217871,6 +232176,8 @@ self: {
        ];
        description = "Access an instance's constraints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "superdoc" = callPackage
@@ -217910,6 +232217,8 @@ self: {
        ];
        description = "A simple opinionated event store implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "supermonad" = callPackage
@@ -217926,6 +232235,8 @@ self: {
        testHaskellDepends = [ base containers ghc QuickCheck ];
        description = "Plugin and base library to support supermonads in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "supero" = callPackage
@@ -217944,6 +232255,8 @@ self: {
        ];
        description = "A Supercompiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "superrecord" = callPackage
@@ -217976,6 +232289,8 @@ self: {
        ];
        description = "Control an internal monad execution for trace generation, backtrakcking, testing and other purposes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "supervisors" = callPackage
@@ -217992,6 +232307,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Monitor groups of threads with non-hierarchical lifetimes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "supplemented" = callPackage
@@ -218010,6 +232327,8 @@ self: {
        ];
        description = "Early termination for monads";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "surjective" = callPackage
@@ -218021,6 +232340,8 @@ self: {
        libraryHaskellDepends = [ base lens mtl template-haskell ];
        description = "An output coverage checker";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "suspend" = callPackage
@@ -218062,6 +232383,8 @@ self: {
        ];
        description = "Encode and decode separated values (CSV, PSV, ...)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sv-cassava" = callPackage
@@ -218127,6 +232450,8 @@ self: {
        ];
        description = "sv-core + svfactor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "svfactor" = callPackage
@@ -218152,6 +232477,8 @@ self: {
        ];
        description = "Syntax-preserving CSV manipulation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "svg-builder" = callPackage
@@ -218184,6 +232511,8 @@ self: {
        ];
        description = "DSL for building SVG";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "svg-tree" = callPackage
@@ -218218,6 +232547,8 @@ self: {
        ];
        description = "Code generation tool for Quartz code from a SVG";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "svgcairo" = callPackage
@@ -218234,6 +232565,8 @@ self: {
        libraryPkgconfigDepends = [ librsvg ];
        description = "Binding to the libsvg-cairo library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) librsvg;};
 
   "svgutils" = callPackage
@@ -218248,6 +232581,8 @@ self: {
        executableHaskellDepends = [ base filepath xml ];
        description = "Helper functions for dealing with SVG files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "svm" = callPackage
@@ -218272,6 +232607,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring containers ];
        description = "Parsers and formatters for the SVMlight input file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "svm-simple" = callPackage
@@ -218288,6 +232625,8 @@ self: {
        ];
        description = "Medium level, simplified, bindings to libsvm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "svndump" = callPackage
@@ -218306,6 +232645,8 @@ self: {
        ];
        description = "Library for reading Subversion dump files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "swagger" = callPackage
@@ -218350,6 +232691,8 @@ self: {
        ];
        description = "Auto-generated openapi-petstore API Client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "swagger-test" = callPackage
@@ -218379,6 +232722,8 @@ self: {
        ];
        description = "Testing of Swagger APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "swagger2" = callPackage
@@ -218428,6 +232773,8 @@ self: {
        librarySystemDepends = [ tokyocabinet ];
        description = "Transparently swapping data from in-memory structures to disk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) tokyocabinet;};
 
   "swearjure" = callPackage
@@ -218447,6 +232794,8 @@ self: {
        ];
        description = "Clojure without alphanumerics";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "swf" = callPackage
@@ -218458,6 +232807,8 @@ self: {
        libraryHaskellDepends = [ base mtl pretty ];
        description = "A library for creating Shockwave Flash (SWF) files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "swift-lda" = callPackage
@@ -218473,6 +232824,8 @@ self: {
        ];
        description = "Online sampler for Latent Dirichlet Allocation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "swish" = callPackage
@@ -218521,6 +232874,8 @@ self: {
        ];
        description = "A simple web server for serving directories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sxml" = callPackage
@@ -218559,6 +232914,8 @@ self: {
        libraryHaskellDepends = [ base eq prelude-extras ];
        description = "Higher order versions of the Scrap Your Boilerplate classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "syb-with-class" = callPackage
@@ -218586,6 +232943,8 @@ self: {
        libraryHaskellDepends = [ base syb-with-class text ];
        description = "Scrap Your Boilerplate With Class Text instance";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "syfco" = callPackage
@@ -218606,6 +232965,8 @@ self: {
        ];
        description = "Synthesis Format Conversion Tool / Library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sylvia" = callPackage
@@ -218631,6 +232992,8 @@ self: {
        ];
        description = "Lambda calculus visualization";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sym" = callPackage
@@ -218643,6 +233006,8 @@ self: {
        testHaskellDepends = [ base hashable QuickCheck ];
        description = "Permutations, patterns, and statistics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sym-plot" = callPackage
@@ -218654,6 +233019,8 @@ self: {
        libraryHaskellDepends = [ base diagrams-cairo diagrams-lib sym ];
        description = "Plot permutations; an addition to the sym package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "symantic" = callPackage
@@ -218670,6 +233037,8 @@ self: {
        ];
        description = "Library for Typed Tagless-Final Higher-Order Composable DSL";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "symantic-cli" = callPackage
@@ -218844,6 +233213,8 @@ self: {
        ];
        description = "Test symantic-http and its companion libraries";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "symantic-lib" = callPackage
@@ -218866,6 +233237,8 @@ self: {
        ];
        description = "Symantics for common types";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "symantic-xml" = callPackage
@@ -218889,6 +233262,8 @@ self: {
        ];
        description = "Library for reading, validating and writing a subset of the XML format";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "symbiote" = callPackage
@@ -218920,6 +233295,8 @@ self: {
        ];
        description = "Data serialization, communication, and operation verification implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "symbol" = callPackage
@@ -218945,6 +233322,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit unix ];
        description = "Symlink functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "symbols" = callPackage
@@ -218971,6 +233350,8 @@ self: {
        testSystemDepends = [ gmp gmpxx symengine ];
        description = "SymEngine symbolic mathematics engine for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; 
          inherit (pkgs) symengine;};
 
@@ -218989,6 +233370,8 @@ self: {
        testSystemDepends = [ gmp gmpxx symengine ];
        description = "SymEngine symbolic mathematics engine for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; 
          inherit (pkgs) symengine;};
 
@@ -219028,6 +233411,8 @@ self: {
        libraryHaskellDepends = [ base stm ];
        description = "A fast implementation of synchronous channels with a CML-like API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sync-mht" = callPackage
@@ -219065,6 +233450,8 @@ self: {
        ];
        description = "Fast incremental file transfer using Merkle-Hash-Trees";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "synchronous-channels" = callPackage
@@ -219103,6 +233490,8 @@ self: {
        ];
        description = "Haskell bindings for the Syncthing REST API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "synt" = callPackage
@@ -219151,6 +233540,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Generic representation and manipulation of abstract syntax";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "syntactical" = callPackage
@@ -219179,6 +233570,8 @@ self: {
        ];
        description = "Reversible parsing and pretty-printing";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "syntax-attoparsec" = callPackage
@@ -219194,6 +233587,8 @@ self: {
        ];
        description = "Syntax instances for Attoparsec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "syntax-example" = callPackage
@@ -219212,6 +233607,8 @@ self: {
        ];
        description = "Example application using syntax, a library for abstract syntax descriptions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "syntax-example-json" = callPackage
@@ -219230,6 +233627,8 @@ self: {
        ];
        description = "Example JSON parser/pretty-printer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "syntax-pretty" = callPackage
@@ -219244,6 +233643,8 @@ self: {
        ];
        description = "Syntax instance for pretty, the pretty printing library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "syntax-printer" = callPackage
@@ -219260,6 +233661,8 @@ self: {
        ];
        description = "Text and ByteString printers for 'syntax'";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "syntax-trees" = callPackage
@@ -219275,6 +233678,8 @@ self: {
        ];
        description = "Convert between different Haskell syntax trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "syntax-trees-fork-bairyn" = callPackage
@@ -219290,6 +233695,8 @@ self: {
        ];
        description = "Convert between different Haskell syntax trees. Bairyn's fork.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "syntaxnet-haskell" = callPackage
@@ -219308,6 +233715,8 @@ self: {
        testHaskellDepends = [ aeson base cassava haskell-conll hspec ];
        description = "Working with Google's SyntaxNet output files - CoNLL, Tree";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "synthesizer" = callPackage
@@ -219329,6 +233738,8 @@ self: {
        ];
        description = "Audio signal processing coded in Haskell";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "synthesizer-alsa" = callPackage
@@ -219467,6 +233878,8 @@ self: {
        doHaddock = false;
        description = "Efficient signal processing using runtime compilation";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "synthesizer-midi" = callPackage
@@ -219526,6 +233939,8 @@ self: {
        ];
        description = "A replacement for System.Exit and System.Process.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sysinfo" = callPackage
@@ -219565,6 +233980,8 @@ self: {
        testHaskellDepends = [ base basic-prelude chell system-filepath ];
        description = "Abstract data type for canonical paths with some utilities";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "system-command" = callPackage
@@ -219583,6 +234000,8 @@ self: {
        ];
        description = "A replacement for System.Exit and System.Process";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "system-error" = callPackage
@@ -219608,6 +234027,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A bunch of system utilities used by other projects";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "system-fileio" = callPackage
@@ -219679,6 +234100,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Binding to Linux's inotify interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "system-lifted" = callPackage
@@ -219701,6 +234124,8 @@ self: {
        ];
        description = "Lifted versions of System functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "system-linux-proc" = callPackage
@@ -219717,6 +234142,8 @@ self: {
        testHaskellDepends = [ base hedgehog ];
        description = "A library for accessing the /proc filesystem in Linux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "system-locale" = callPackage
@@ -219733,6 +234160,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Get system locales";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "system-posix-redirect" = callPackage
@@ -219770,6 +234199,8 @@ self: {
        ];
        description = "Random number generation for extensible effects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "system-test" = callPackage
@@ -219874,6 +234305,8 @@ self: {
        ];
        description = "An application that regularly logs system stats for later analysis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "syz" = callPackage
@@ -219902,6 +234335,8 @@ self: {
        ];
        description = "Matchers and grammars using tree regular expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "t3-client" = callPackage
@@ -219913,6 +234348,8 @@ self: {
        libraryHaskellDepends = [ base t3-game t3-server ];
        description = "tic-tac-toe Rexports for client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "t3-game" = callPackage
@@ -219948,6 +234385,8 @@ self: {
        ];
        description = "tic-tac-toe server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ta" = callPackage
@@ -219963,6 +234402,8 @@ self: {
        ];
        description = "Transito Abierto: convenience library when using Takusen and Oracle";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tabl" = callPackage
@@ -219992,6 +234433,8 @@ self: {
        ];
        description = "Simple tool to generate tables from DSV input";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "table-layout" = callPackage
@@ -220016,6 +234459,8 @@ self: {
        ];
        description = "Layout text as grid or table";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "table-tennis" = callPackage
@@ -220027,6 +234472,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A table tennis game tracking engine";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tableaux" = callPackage
@@ -220044,6 +234491,8 @@ self: {
        ];
        description = "An interactive theorem prover based on semantic tableaux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tables" = callPackage
@@ -220067,6 +234516,8 @@ self: {
        ];
        description = "In-memory storage with multiple keys using lenses and traversals";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tablestorage" = callPackage
@@ -220087,6 +234538,8 @@ self: {
        ];
        description = "Azure Table Storage REST API Wrapper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tablize" = callPackage
@@ -220123,6 +234576,8 @@ self: {
        ];
        description = "View the output of shell commands in a table";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tabs" = callPackage
@@ -220137,6 +234592,8 @@ self: {
        executableHaskellDepends = [ base filepath monadlist mtl tagged ];
        description = "Indents source files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tabular" = callPackage
@@ -220192,6 +234649,8 @@ self: {
        executablePkgconfigDepends = [ gtk3 ];
        description = "A desktop bar similar to xmobar, but with more GUI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) gtk3;};
 
   "tag-bits" = callPackage
@@ -220203,6 +234662,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Provides access to the dynamic pointer tagging bits used by GHC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tag-stream" = callPackage
@@ -220218,6 +234679,8 @@ self: {
        ];
        description = "streamlined html tag parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tagchup" = callPackage
@@ -220284,6 +234747,8 @@ self: {
        ];
        description = "Reflect exceptions using phantom types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tagged-identity" = callPackage
@@ -220314,6 +234779,8 @@ self: {
        ];
        description = "Lists tagged with a type-level natural number representing their length";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tagged-th" = callPackage
@@ -220327,6 +234794,8 @@ self: {
        ];
        description = "QuasiQuoter and Template Haskell splices for creating proxies at higher-kinds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tagged-timers" = callPackage
@@ -220340,6 +234809,8 @@ self: {
        ];
        description = "Simple wrappers for timing IO actions (single-threaded)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tagged-transformer" = callPackage
@@ -220442,6 +234913,8 @@ self: {
        libraryPkgconfigDepends = [ taglib ];
        description = "An FFI layer over TagLib's C bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) taglib;};
 
   "tagset-positional" = callPackage
@@ -220507,6 +234980,8 @@ self: {
        ];
        description = "alternative parser for the tagsoup package";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tagsoup-megaparsec" = callPackage
@@ -220523,6 +234998,8 @@ self: {
        ];
        description = "A Tag token parser and Tag specific parsing combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tagsoup-navigate" = callPackage
@@ -220540,6 +235017,8 @@ self: {
        ];
        description = "Tagsoup Navigate";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tagsoup-parsec" = callPackage
@@ -220551,6 +235030,8 @@ self: {
        libraryHaskellDepends = [ base parsec tagsoup ];
        description = "Tokenizes Tag, so [ Tag ] can be used as parser input";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tagsoup-selection" = callPackage
@@ -220562,6 +235043,8 @@ self: {
        libraryHaskellDepends = [ base containers parsec tagsoup ];
        description = "Selecting subtrees from TagSoup's TagTrees using CSS selectors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tagstream-conduit" = callPackage
@@ -220582,6 +235065,8 @@ self: {
        ];
        description = "streamlined html tag parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tai" = callPackage
@@ -220599,6 +235084,8 @@ self: {
        ];
        description = "Support library to enable TAI usage on systems with time kept in UTC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tai64" = callPackage
@@ -220617,6 +235104,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Tai64 Labels for Haskell";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tailfile-hinotify" = callPackage
@@ -220689,6 +235178,8 @@ self: {
        libraryHaskellDepends = [ base lens monad-skeleton mtl ];
        description = "create slide for presentation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "takusen-oracle" = callPackage
@@ -220703,6 +235194,8 @@ self: {
        librarySystemDepends = [ clntsh ];
        description = "Database library with left-fold interface for Oracle";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {clntsh = null;};
 
   "tal" = callPackage
@@ -220718,6 +235211,8 @@ self: {
        ];
        description = "An implementation of Typed Assembly Language (Morrisett, Walker, Crary, Glew)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tamarin-prover" = callPackage
@@ -220747,6 +235242,8 @@ self: {
        ];
        description = "The Tamarin prover for security protocol analysis";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tamarin-prover-term" = callPackage
@@ -220765,6 +235262,8 @@ self: {
        ];
        description = "Term manipulation library for the tamarin prover";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tamarin-prover-theory" = callPackage
@@ -220786,6 +235285,8 @@ self: {
        ];
        description = "Term manipulation library for the tamarin prover";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tamarin-prover-utils" = callPackage
@@ -220803,6 +235304,8 @@ self: {
        ];
        description = "Utility library for the tamarin prover";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tamper" = callPackage
@@ -220864,6 +235367,8 @@ self: {
        testHaskellDepends = [ base hspec vector ];
        description = "A tasty enhancement to cassava for easy csv exporting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tar_0_4_1_0" = callPackage
@@ -220933,6 +235438,8 @@ self: {
        ];
        description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tar-conduit" = callPackage
@@ -221009,6 +235516,8 @@ self: {
        ];
        description = "Generate test-suites from refinement types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) z3;};
 
   "tart" = callPackage
@@ -221033,6 +235542,8 @@ self: {
        ];
        description = "Terminal Art";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "task" = callPackage
@@ -221052,6 +235563,8 @@ self: {
        ];
        description = "A command line tool for keeping track of tasks you worked on";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "task-distribution" = callPackage
@@ -221088,6 +235601,8 @@ self: {
        ];
        description = "Distributed processing of changing tasks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "taskell" = callPackage
@@ -221117,6 +235632,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A command-line kanban board/task manager";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "taskpool" = callPackage
@@ -221211,6 +235728,8 @@ self: {
        ];
        description = "Auto discovery for Tasty with support for ingredients and test tree generation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tasty-dejafu" = callPackage
@@ -221275,29 +235794,11 @@ self: {
        ];
        description = "Adds the ability to fail a tasty test suite on first test failure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tasty-golden" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, deepseq
-     , directory, filepath, mtl, optparse-applicative, process, tagged
-     , tasty, tasty-hunit, temporary, temporary-rc
-     }:
-     mkDerivation {
-       pname = "tasty-golden";
-       version = "2.3.2";
-       sha256 = "0k3ibjhjc9vcwzrjnl4rnwvfm8l81q347nb7dgvcib6n5wm3s404";
-       libraryHaskellDepends = [
-         async base bytestring containers deepseq directory filepath mtl
-         optparse-applicative process tagged tasty temporary
-       ];
-       testHaskellDepends = [
-         base directory filepath process tasty tasty-hunit temporary-rc
-       ];
-       description = "Golden tests support for tasty";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-golden_2_3_3" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, deepseq
      , directory, filepath, mtl, optparse-applicative, process, tagged
      , tasty, tasty-hunit, temporary
@@ -221317,7 +235818,6 @@ self: {
        ];
        description = "Golden tests support for tasty";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-groundhog-converters" = callPackage
@@ -221336,6 +235836,8 @@ self: {
        ];
        description = "Tasty Tests for groundhog converters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tasty-hedgehog" = callPackage
@@ -221374,6 +235876,8 @@ self: {
        ];
        description = "Coverage tracking for Hedgehog Property-Based Testing via Tasty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tasty-hspec" = callPackage
@@ -221473,6 +235977,8 @@ self: {
        ];
        description = "automated integration of QuickCheck properties into tasty suites";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tasty-jenkins-xml" = callPackage
@@ -221492,6 +235998,8 @@ self: {
        ];
        description = "Render tasty output to both console and XML for Jenkins";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tasty-kat" = callPackage
@@ -221525,6 +236033,8 @@ self: {
        testHaskellDepends = [ base smallcheck smallcheck-laws tasty ];
        description = "Test common laws";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tasty-leancheck" = callPackage
@@ -221553,6 +236063,8 @@ self: {
        testHaskellDepends = [ base lens tasty ];
        description = "Tasty TestTrees for Lens validation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tasty-lua" = callPackage
@@ -221681,6 +236193,8 @@ self: {
        ];
        description = "Collect statistics of your Tasty testsuite";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tasty-tap" = callPackage
@@ -221697,6 +236211,8 @@ self: {
        ];
        description = "TAP (Test Anything Protocol) Version 13 formatter for tasty";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tasty-test-reporter" = callPackage
@@ -221807,6 +236323,8 @@ self: {
        ];
        description = "Meta tic-tac-toe ncurses game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tau" = callPackage
@@ -221848,6 +236366,8 @@ self: {
        ];
        description = "Transactional variables and data structures with IO hooks";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tcache-AWS" = callPackage
@@ -221863,6 +236383,8 @@ self: {
        ];
        description = "tcache using Amazon Web Services as default persistence mechanism";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tccli" = callPackage
@@ -221880,6 +236402,8 @@ self: {
        ];
        description = "TokyoCabinet CLI interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tce-conf" = callPackage
@@ -221913,6 +236437,8 @@ self: {
        libraryPkgconfigDepends = [ libtcod ];
        description = "Bindings to libtcod roguelike engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libtcod;};
 
   "tconfig" = callPackage
@@ -221935,6 +236461,8 @@ self: {
        libraryHaskellDepends = [ base containers old-time ];
        description = "A purely functional TCP implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tcp-streams" = callPackage
@@ -221978,6 +236506,8 @@ self: {
        ];
        description = "Tcp streams using openssl for tls support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tdd-util" = callPackage
@@ -222005,6 +236535,8 @@ self: {
        ];
        description = "Test framework wrapper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tdigest" = callPackage
@@ -222086,6 +236618,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Pure Haskell TDS protocol implementation. Mainly for beam-mssql and beam-sybase";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "teams" = callPackage
@@ -222097,6 +236631,8 @@ self: {
        libraryHaskellDepends = [ base containers fgl graphviz ];
        description = "Graphical modeling tools for sequential teams";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "teardown" = callPackage
@@ -222129,6 +236665,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Dental data types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "telegram" = callPackage
@@ -222144,6 +236682,8 @@ self: {
        ];
        description = "Telegram API client";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "telegram-api" = callPackage
@@ -222171,6 +236711,8 @@ self: {
        ];
        description = "Telegram Bot API bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "telegram-bot" = callPackage
@@ -222191,6 +236733,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Telegram Bot microframework for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "telegram-bot-simple" = callPackage
@@ -222222,6 +236766,8 @@ self: {
        ];
        description = "Easy to use library for building Telegram bots";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "teleport" = callPackage
@@ -222242,6 +236788,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A tool to quickly switch between directories";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "teleshell" = callPackage
@@ -222264,6 +236812,8 @@ self: {
        ];
        description = "Telnet client and other things";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tellbot" = callPackage
@@ -222283,6 +236833,8 @@ self: {
        ];
        description = "IRC tellbot";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tempered" = callPackage
@@ -222326,6 +236878,8 @@ self: {
        libraryHaskellDepends = [ base data-default template-haskell ];
        description = "declaring Default instances just got even easier";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "template-haskell_2_15_0_0" = callPackage
@@ -222362,6 +236916,8 @@ self: {
        ];
        description = "Some utilities for template Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "template-hsml" = callPackage
@@ -222382,6 +236938,8 @@ self: {
        ];
        description = "Haskell's Simple Markup Language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "template-toolkit" = callPackage
@@ -222412,6 +236970,8 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        description = "Process template file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "templateify" = callPackage
@@ -222425,6 +236985,8 @@ self: {
        executableHaskellDepends = [ base mtl tagsoup uniplate ];
        description = "Make template from website";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "templatepg" = callPackage
@@ -222442,6 +237004,8 @@ self: {
        ];
        description = "A PostgreSQL access library with compile-time SQL type inference";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "templater" = callPackage
@@ -222479,6 +237043,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Command-line tool to log time-tracking information into JIRA Tempo plugin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tempodb" = callPackage
@@ -222496,6 +237062,8 @@ self: {
        ];
        description = "A small Haskell wrapper around the TempoDB api";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "temporal-csound" = callPackage
@@ -222513,6 +237081,8 @@ self: {
        ];
        description = "library to make electronic music, brings together temporal-music-notation and csound-expression packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "temporal-media" = callPackage
@@ -222634,6 +237204,8 @@ self: {
        executableToolDepends = [ happy ];
        description = "Interpreter for the FRP language Tempus";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tempus-fugit" = callPackage
@@ -222661,6 +237233,8 @@ self: {
        testHaskellDepends = [ base QuickCheck random ];
        description = "A completely type-safe library for linear algebra";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tensor-safe" = callPackage
@@ -222684,6 +237258,8 @@ self: {
        ];
        description = "Create valid deep neural network architectures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tensorflow" = callPackage
@@ -222712,6 +237288,8 @@ self: {
        ];
        description = "TensorFlow bindings";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libtensorflow;};
 
   "tensorflow-core-ops" = callPackage
@@ -222732,6 +237310,8 @@ self: {
        ];
        description = "Haskell wrappers for Core Tensorflow Ops";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tensorflow-logging" = callPackage
@@ -222760,6 +237340,8 @@ self: {
        ];
        description = "TensorBoard related functionality";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tensorflow-mnist" = callPackage
@@ -222812,6 +237394,8 @@ self: {
        ];
        description = "Code generation for TensorFlow operations";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tensorflow-ops" = callPackage
@@ -222841,6 +237425,8 @@ self: {
        ];
        description = "Friendly layer around TensorFlow bindings";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tensorflow-proto" = callPackage
@@ -222858,6 +237444,8 @@ self: {
        libraryToolDepends = [ protobuf ];
        description = "TensorFlow protocol buffers";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) protobuf;};
 
   "tensorflow-records" = callPackage
@@ -222950,6 +237538,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "termbox bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "termbox-banana" = callPackage
@@ -222965,6 +237555,8 @@ self: {
        libraryHaskellDepends = [ base reactive-banana termbox ];
        description = "reactive-banana + termbox";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "termbox-bindings" = callPackage
@@ -222980,6 +237572,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Bindings to the Termbox library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "termcolor" = callPackage
@@ -223075,6 +237669,8 @@ self: {
        ];
        description = "Text data type for styled terminal output, including all standard ANSI effects (bold, italic, blinking) and ANSI / 256 / truecolor colors support for Unix and Windows (whenever possible)";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "termination-combinators" = callPackage
@@ -223086,6 +237682,8 @@ self: {
        libraryHaskellDepends = [ base containers contravariant ];
        description = "Termination combinators for forcing non-terminating algorithms to terminate";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "terminfo_0_4_1_4" = callPackage
@@ -223172,6 +237770,8 @@ self: {
        ];
        description = "Plot time series in your terminal using commands stdout";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "terntup" = callPackage
@@ -223189,6 +237789,8 @@ self: {
        ];
        description = "a ternary library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "terrahs" = callPackage
@@ -223201,6 +237803,8 @@ self: {
        librarySystemDepends = [ terralib4c translib ];
        description = "A Haskell GIS Programming Environment";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {terralib4c = null; translib = null;};
 
   "tersmu" = callPackage
@@ -223221,6 +237825,8 @@ self: {
        ];
        description = "A semantic parser for lojban";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tesla" = callPackage
@@ -223265,6 +237871,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Test monadic side-effects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-framework" = callPackage
@@ -223305,6 +237913,8 @@ self: {
        testHaskellDepends = [ base test-framework ];
        description = "Test.Framework wrapper for DocTest";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-framework-golden" = callPackage
@@ -223374,6 +237984,8 @@ self: {
        ];
        description = "QuickCheck support for the test-framework package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-framework-quickcheck2" = callPackage
@@ -223411,6 +238023,8 @@ self: {
        ];
        description = "test-sandbox support for the test-framework package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-framework-skip" = callPackage
@@ -223430,6 +238044,8 @@ self: {
        ];
        description = "Functions for conveniently marking some of the tests in a suite as being skipped";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-framework-smallcheck" = callPackage
@@ -223455,6 +238071,8 @@ self: {
        testHaskellDepends = [ base test-framework testing-feat ];
        description = "A test framework provider for testing-feat";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-framework-th" = callPackage
@@ -223567,6 +238185,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Just tests Hackage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-sandbox" = callPackage
@@ -223594,6 +238214,8 @@ self: {
        ];
        description = "Sandbox for system tests";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-sandbox-compose" = callPackage
@@ -223625,6 +238247,8 @@ self: {
        ];
        description = "Lightweight development enviroments using test-sandbox";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-sandbox-hunit" = callPackage
@@ -223636,6 +238260,8 @@ self: {
        libraryHaskellDepends = [ base HUnit lifted-base test-sandbox ];
        description = "HUnit convenience functions for use with test-sandbox";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-sandbox-quickcheck" = callPackage
@@ -223651,6 +238277,8 @@ self: {
        ];
        description = "QuickCheck convenience functions for use with test-sandbox";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-shouldbe" = callPackage
@@ -223664,6 +238292,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Catchy combinators for HUnit";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "test-simple" = callPackage
@@ -223682,6 +238312,8 @@ self: {
        ];
        description = "Simple Perl inspired testing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "testCom" = callPackage
@@ -223699,6 +238331,8 @@ self: {
        ];
        description = "Write your tests in comments";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "testPkg" = callPackage
@@ -223734,6 +238368,8 @@ self: {
        ];
        description = "Create tests and benchmarks together";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "testing-feat" = callPackage
@@ -223778,6 +238414,8 @@ self: {
        ];
        description = "Quick feedback loop for test suites";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "testpack" = callPackage
@@ -223794,6 +238432,8 @@ self: {
        ];
        description = "Test Utililty Pack for HUnit and QuickCheck (unmaintained)";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "testpattern" = callPackage
@@ -223808,6 +238448,8 @@ self: {
        executableHaskellDepends = [ base filepath gtk ];
        description = "Display a monitor test pattern";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "testrunner" = callPackage
@@ -223822,6 +238464,8 @@ self: {
        ];
        description = "Easy unit test driver framework";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tetris" = callPackage
@@ -223850,6 +238494,8 @@ self: {
        executableHaskellDepends = [ base containers deepseq parsec ];
        description = "LaTeX to plain-text conversion";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "texbuilder" = callPackage
@@ -223870,6 +238516,8 @@ self: {
        ];
        description = "View your latex output while editing";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "texmath" = callPackage
@@ -223953,6 +238601,8 @@ self: {
        ];
        description = "Everything Data.Text related in one package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-and-plots" = callPackage
@@ -223969,6 +238619,8 @@ self: {
        ];
        description = "EDSL to create HTML documents with plots based on the C3.js library.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-ansi" = callPackage
@@ -223980,6 +238632,8 @@ self: {
        libraryHaskellDepends = [ base text text-builder ];
        description = "Text styling for ANSI terminals";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-binary" = callPackage
@@ -224034,6 +238688,8 @@ self: {
        ];
        description = "Memory-efficient string-indexed container types";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-conversions" = callPackage
@@ -224085,6 +238741,8 @@ self: {
        ];
        description = "Text formatting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-format-heavy" = callPackage
@@ -224103,6 +238761,8 @@ self: {
        testHaskellDepends = [ base hspec time ];
        description = "Full-weight string formatting library, analog of Python's string.format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-format-simple" = callPackage
@@ -224114,6 +238774,8 @@ self: {
        libraryHaskellDepends = [ base MissingH ];
        description = "Simple text formatting library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-generic-pretty" = callPackage
@@ -224138,6 +238800,8 @@ self: {
        ];
        description = "A generic, derivable, haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-icu" = callPackage
@@ -224181,6 +238845,8 @@ self: {
        ];
        description = "Dealing with Strict Text in NFC normalization";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-icu-translit" = callPackage
@@ -224264,6 +238930,8 @@ self: {
        testHaskellDepends = [ base hspec lens ];
        description = "Lenses for operating over text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-lips" = callPackage
@@ -224279,6 +238947,8 @@ self: {
        ];
        description = "Monadic parsing combinator library with attention to locations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-loc" = callPackage
@@ -224301,6 +238971,8 @@ self: {
        libraryHaskellDepends = [ base bytestring bytestring-handle text ];
        description = "Encode and decode Text to/from ByteString using TextEncoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-manipulate" = callPackage
@@ -224332,6 +239004,8 @@ self: {
        ];
        description = "A data structure for mapping metadata to text subsequences";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-metrics" = callPackage
@@ -224365,6 +239039,8 @@ self: {
        ];
        description = "Unicode-normalized text";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-offset" = callPackage
@@ -224383,6 +239059,8 @@ self: {
        ];
        description = "Library for converting between line/column and byte offset";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-plus" = callPackage
@@ -224399,6 +239077,8 @@ self: {
        testHaskellDepends = [ base doctest HTF text ];
        description = "Utils for text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-position" = callPackage
@@ -224413,6 +239093,8 @@ self: {
        testHaskellDepends = [ base QuickCheck regex-applicative ];
        description = "Handling positions in text and position-tagging it";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-postgresql" = callPackage
@@ -224492,6 +239174,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl vector ];
        description = "A Haskell implementation of the 1# Text Register Machine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-render" = callPackage
@@ -224520,6 +239204,8 @@ self: {
        testHaskellDepends = [ base hedgehog neat-interpolation text ];
        description = "Simple text replacements from a list of search/replace pairs";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-short" = callPackage
@@ -224574,6 +239260,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-show_3_8_5" = callPackage
+    ({ mkDerivation, array, base, base-compat-batteries, base-orphans
+     , bifunctors, bytestring, bytestring-builder, containers, criterion
+     , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim
+     , hspec, hspec-discover, integer-gmp, QuickCheck
+     , quickcheck-instances, template-haskell, text, th-abstraction
+     , th-lift, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "text-show";
+       version = "3.8.5";
+       sha256 = "0xc2269v0bfcvlwm60l2zs6l6lwljfnq5n05n9kp580qybvynzjg";
+       libraryHaskellDepends = [
+         array base base-compat-batteries bifunctors bytestring
+         bytestring-builder containers generic-deriving ghc-boot-th ghc-prim
+         integer-gmp template-haskell text th-abstraction th-lift
+         transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         array base base-compat-batteries base-orphans bytestring
+         bytestring-builder deriving-compat generic-deriving ghc-prim hspec
+         QuickCheck quickcheck-instances template-haskell text transformers
+         transformers-compat
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ];
+       description = "Efficient conversion of values into Text";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-show-instances" = callPackage
     ({ mkDerivation, base, base-compat-batteries, bifunctors, binary
      , containers, directory, generic-deriving, ghc-boot-th, ghc-prim
@@ -224639,6 +239356,8 @@ self: {
        ];
        description = "Library for Time parsing from Text into UTCTime";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-trie" = callPackage
@@ -224656,6 +239375,8 @@ self: {
        ];
        description = "An efficient finite map from Text to values, based on bytestring-trie";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-utf7" = callPackage
@@ -224697,6 +239418,8 @@ self: {
        ];
        description = "An efficient packed UTF-8 backed Unicode text type";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-utils" = callPackage
@@ -224709,6 +239432,8 @@ self: {
        testHaskellDepends = [ base HTF text ];
        description = "Various text utilities";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-xml-generic" = callPackage
@@ -224737,6 +239462,8 @@ self: {
        libraryHaskellDepends = [ base parsec template-haskell xml ];
        description = "Quasiquoter for xml. XML DSL in Haskell.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text-zipper" = callPackage
@@ -224762,6 +239489,8 @@ self: {
        testHaskellDepends = [ base hspec text-zipper ];
        description = "Monadic interface to the text-zipper package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "text1" = callPackage
@@ -224778,6 +239507,8 @@ self: {
        ];
        description = "Non-empty values of `Data.Text`.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "textPlot" = callPackage
@@ -224818,6 +239549,8 @@ self: {
        executableHaskellDepends = [ base haskell98 process ];
        description = "A simple Haskell program to provide tags for Haskell code completion in TextMate";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "textocat-api" = callPackage
@@ -224838,6 +239571,8 @@ self: {
        ];
        description = "Unofficial Haskell SDK for Textocat API -- http://textocat.com";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "texts" = callPackage
@@ -224860,6 +239595,8 @@ self: {
        libraryHaskellDepends = [ base bytestring text utf8-string ];
        description = "Textual type class for data that represent text";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tf-random" = callPackage
@@ -224894,6 +239631,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell tfp ];
        description = "Template-Haskell code for tfp";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tftp" = callPackage
@@ -224918,6 +239657,8 @@ self: {
        ];
        description = "A library for building tftp servers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tga" = callPackage
@@ -224929,6 +239670,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Reading and writing of tga image files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-abstraction" = callPackage
@@ -224962,6 +239705,8 @@ self: {
        ];
        description = "Alpha equivalence for TH Exp";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-bang-compat" = callPackage
@@ -224984,6 +239729,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "More convenient construction of TH ASTs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-cas" = callPackage
@@ -225030,6 +239777,8 @@ self: {
        ];
        description = "Test instance context";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-data-compat" = callPackage
@@ -225075,6 +239824,8 @@ self: {
        libraryHaskellDepends = [ base constraints template-haskell ];
        description = "Automatically discover available dictionaries at compile time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-env" = callPackage
@@ -225122,6 +239873,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "TH fold generator";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-format" = callPackage
@@ -225138,6 +239891,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit text ];
        description = "Template Haskell based support for format strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-inline-io-action" = callPackage
@@ -225169,6 +239924,8 @@ self: {
        ];
        description = "Fixed versions of instances reification functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-instances" = callPackage
@@ -225192,6 +239949,8 @@ self: {
        ];
        description = "A place to collect orphan instances for Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-kinds" = callPackage
@@ -225207,6 +239966,8 @@ self: {
        ];
        description = "Automated kind inference in Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-kinds-fork" = callPackage
@@ -225222,6 +239983,8 @@ self: {
        ];
        description = "Automated kind inference in Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-lift" = callPackage
@@ -225301,6 +240064,8 @@ self: {
        libraryHaskellDepends = [ base lens pretty template-haskell ];
        description = "Simplify and render Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-printf" = callPackage
@@ -225359,6 +240124,8 @@ self: {
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Binding group analysis in Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-strict-compat" = callPackage
@@ -225385,6 +240152,8 @@ self: {
        ];
        description = "Typechecking in Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-test-utils" = callPackage
@@ -225413,6 +240182,8 @@ self: {
        testHaskellDepends = [ base hspec template-haskell ];
        description = "Provides a way to persist data from compile-time to runtime";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-traced" = callPackage
@@ -225424,6 +240195,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        description = "Tracing Q monad computation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-typegraph" = callPackage
@@ -225451,6 +240224,8 @@ self: {
        ];
        description = "Graph of the subtype relation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "th-utilities" = callPackage
@@ -225493,6 +240268,8 @@ self: {
        ];
        description = "Give your dependencies stars on GitHub!";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "theatre" = callPackage
@@ -225508,6 +240285,8 @@ self: {
        ];
        description = "Minimalistic actor library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "themoviedb" = callPackage
@@ -225579,6 +240358,8 @@ self: {
        ];
        description = "All-in-one session handling for servant-based frontends";
        license = "AGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "theoremquest" = callPackage
@@ -225590,6 +240371,8 @@ self: {
        libraryHaskellDepends = [ base HTTP json utf8-string ];
        description = "A common library for TheoremQuest, a theorem proving game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "theoremquest-client" = callPackage
@@ -225603,6 +240386,8 @@ self: {
        executableHaskellDepends = [ base HTTP network theoremquest ];
        description = "A simple client for the TheoremQuest theorem proving game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "these_0_7_6" = callPackage
@@ -225723,6 +240508,8 @@ self: {
        libraryHaskellDepends = [ base pretty ];
        description = "Typing Haskell In Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "thimk" = callPackage
@@ -225741,6 +240528,8 @@ self: {
        ];
        description = "Command-line spelling word suggestion tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "thorn" = callPackage
@@ -225759,6 +240548,8 @@ self: {
        ];
        description = "Datatype Manipulation with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "thread-hierarchy" = callPackage
@@ -225846,6 +240637,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "(deprecated in favor of 'threads') Simple thread management";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "threads" = callPackage
@@ -225930,6 +240723,8 @@ self: {
        ];
        description = "A graphical tool for profiling parallel Haskell programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "threefish" = callPackage
@@ -225964,6 +240759,8 @@ self: {
        ];
        description = "Composable algebraic editors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "threepenny-gui" = callPackage
@@ -226002,6 +240799,8 @@ self: {
        executableHaskellDepends = [ base threepenny-gui ];
        description = "Write simple nested context menus for threepenny-gui";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "threepenny-gui-flexbox" = callPackage
@@ -226016,6 +240815,8 @@ self: {
        executableHaskellDepends = [ base threepenny-gui ];
        description = "Flexbox layouts for Threepenny-gui";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "thrift" = callPackage
@@ -226038,6 +240839,8 @@ self: {
        ];
        description = "Haskell bindings for the Apache Thrift RPC system";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "thrist" = callPackage
@@ -226100,6 +240903,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Loop over an action but throttle it to a certain rate";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "through-text" = callPackage
@@ -226113,6 +240918,8 @@ self: {
        libraryHaskellDepends = [ base bytestring case-insensitive text ];
        description = "Convert textual types through Text without needing O(n^2) instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "throwable-exceptions" = callPackage
@@ -226165,6 +240972,8 @@ self: {
        ];
        description = "Generate thumbnails easily and safely";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "thumbnail-polish" = callPackage
@@ -226181,6 +240990,8 @@ self: {
        ];
        description = "Image thumbnail creation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "thyme" = callPackage
@@ -226281,6 +241092,8 @@ self: {
        executableHaskellDepends = [ base glade gtk haskell98 ];
        description = "Useful if reading \"Why FP matters\" by John Hughes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ticker" = callPackage
@@ -226317,6 +241130,8 @@ self: {
        ];
        description = "A port of @Data.Binary@";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tictactoe3d" = callPackage
@@ -226328,6 +241143,8 @@ self: {
        libraryHaskellDepends = [ base tuples-homogenous-h98 vector ];
        description = "3D Tic-Tac-Toe game";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tidal" = callPackage
@@ -226366,6 +241183,8 @@ self: {
        ];
        description = "MIDI support for tidal";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tidal-serial" = callPackage
@@ -226379,6 +241198,8 @@ self: {
        ];
        description = "Serial support for tidal";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tidal-vis" = callPackage
@@ -226399,6 +241220,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Visual rendering for Tidal patterns and osc messages";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tie-knot" = callPackage
@@ -226410,6 +241233,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl recursion-schemes ];
        description = "\"Ties the knot\" on a given set of structures that reference each other by keys";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tiempo" = callPackage
@@ -226421,6 +241246,8 @@ self: {
        libraryHaskellDepends = [ base deepseq time ];
        description = "Specify time intervals in different units (secs, mins, hours, etc.)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tiger" = callPackage
@@ -226437,6 +241264,8 @@ self: {
        ];
        description = "Tiger Compiler of Universiteit Utrecht";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tight-apply" = callPackage
@@ -226464,6 +241293,8 @@ self: {
        ];
        description = "Nice API for a Slackbot";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tighttp" = callPackage
@@ -226482,6 +241313,8 @@ self: {
        ];
        description = "Tiny and Incrementally-Growing HTTP library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tile" = callPackage
@@ -226524,6 +241357,8 @@ self: {
        executableToolDepends = [ happy ];
        description = "The Timber Compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "time_1_9_3" = callPackage
@@ -226587,6 +241422,8 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "Data instances for the time package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "time-exts" = callPackage
@@ -226608,6 +241445,8 @@ self: {
        ];
        description = "Yet another time library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "time-http" = callPackage
@@ -226631,6 +241470,8 @@ self: {
        ];
        description = "Parse and format HTTP/1.1 Date and Time strings";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "time-interval" = callPackage
@@ -226653,6 +241494,8 @@ self: {
        libraryHaskellDepends = [ base base-io-access time ];
        description = "IO Access for time";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "time-lens" = callPackage
@@ -226698,6 +241541,8 @@ self: {
        testHaskellDepends = [ base hspec HUnit mtl time tz ];
        description = "A library to mock the current time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "time-manager" = callPackage
@@ -226772,6 +241617,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Quasi-quoter for UTCTime times";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "time-quote" = callPackage
@@ -226788,6 +241635,8 @@ self: {
        ];
        description = "Quasi-quoters for dates and times";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "time-recurrence" = callPackage
@@ -226805,6 +241654,8 @@ self: {
        ];
        description = "Generate recurring dates";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "time-series" = callPackage
@@ -226819,6 +241670,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Time series analysis";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "time-series-lib" = callPackage
@@ -226832,6 +241685,8 @@ self: {
        doHaddock = false;
        description = "Library for Time Series processing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "time-units" = callPackage
@@ -226856,6 +241711,8 @@ self: {
        libraryHaskellDepends = [ base convertible parsec time ];
        description = "Parse, format and convert W3C Date and Time";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "time-warp" = callPackage
@@ -226893,6 +241750,8 @@ self: {
        ];
        description = "Distributed systems execution emulation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "timecalc" = callPackage
@@ -226905,6 +241764,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base haskeline uu-parsinglib ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "timeconsole" = callPackage
@@ -227027,6 +241888,8 @@ self: {
          time unordered-containers
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "timeout" = callPackage
@@ -227043,6 +241906,8 @@ self: {
        ];
        description = "Generalized sleep and timeout functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "timeout-control" = callPackage
@@ -227069,6 +241934,8 @@ self: {
        libraryHaskellDepends = [ base deepseq mtl parallel ];
        description = "Runs a time-limited computation alowing it to return intermediate results";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "timeparsers" = callPackage
@@ -227084,6 +241951,8 @@ self: {
        ];
        description = "Attoparsec parsers for various Date/Time formats";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "timeplot" = callPackage
@@ -227104,6 +241973,8 @@ self: {
        ];
        description = "A tool for visualizing time series from log files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "timeprint" = callPackage
@@ -227115,6 +241986,8 @@ self: {
        libraryHaskellDepends = [ base datetime ];
        description = "Prints timestamps after each line evaluated";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "timer-wheel" = callPackage
@@ -227127,6 +242000,8 @@ self: {
        testHaskellDepends = [ base random ];
        description = "A timer wheel";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "timerep" = callPackage
@@ -227202,6 +242077,8 @@ self: {
        ];
        description = "Library for Time Series processing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "timespan" = callPackage
@@ -227213,6 +242090,8 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "Useful timespan datatype and functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "timestamp" = callPackage
@@ -227273,6 +242152,8 @@ self: {
        testHaskellDepends = [ base hspec microlens time ];
        description = "Time utilities";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "timezone-olson" = callPackage
@@ -227303,6 +242184,8 @@ self: {
        ];
        description = "Load TimeZoneSeries from an Olson file at compile time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "timezone-series" = callPackage
@@ -227334,6 +242217,8 @@ self: {
          timezone-series
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "timing-convenience" = callPackage
@@ -227370,6 +242255,8 @@ self: {
        testHaskellDepends = [ base require ];
        description = "A softer alternative to Haddock";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tiny-scheduler" = callPackage
@@ -227381,6 +242268,8 @@ self: {
        libraryHaskellDepends = [ async base time ];
        description = "tiny no-brainer job scheduler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tinyMesh" = callPackage
@@ -227396,6 +242285,8 @@ self: {
        ];
        description = "TinyMesh - communicating with auto-meshing sensor network";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tinyXml" = callPackage
@@ -227420,6 +242311,8 @@ self: {
        ];
        description = "A fast DOM parser for a subset of XML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tinyfiledialogs" = callPackage
@@ -227461,6 +242354,8 @@ self: {
        testHaskellDepends = [ base QuickCheck text ];
        description = "A tiny text templating library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tip-haskell-frontend" = callPackage
@@ -227485,6 +242380,8 @@ self: {
        ];
        description = "Convert from Haskell to Tip";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tip-lib" = callPackage
@@ -227508,6 +242405,8 @@ self: {
        ];
        description = "tons of inductive problems - support library and tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tiphys" = callPackage
@@ -227552,6 +242451,8 @@ self: {
        ];
        description = "Testing Infrastructure for Temporal AbstractioNs - GUI to debug temporal programs";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "titan-debug-yampa" = callPackage
@@ -227569,6 +242470,8 @@ self: {
        ];
        description = "Testing Infrastructure for Temporal AbstractioNs - Interactive Yampa debugging layer";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "titan-record-yampa" = callPackage
@@ -227580,6 +242483,8 @@ self: {
        libraryHaskellDepends = [ base Yampa ];
        description = "Testing Infrastructure for Temporal AbstractioNs - Yampa record-and-replay layer";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "titlecase" = callPackage
@@ -227614,6 +242519,8 @@ self: {
        testHaskellDepends = [ HUnit test-framework test-framework-hunit ];
        description = "Simple Presentation Utility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tkyprof" = callPackage
@@ -227640,6 +242547,8 @@ self: {
        ];
        description = "A web-based visualizer for GHC Profiling Reports";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tld" = callPackage
@@ -227675,36 +242584,11 @@ self: {
        testHaskellDepends = [ base tasty tasty-golden ];
        description = "Haskell tldr client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tls" = callPackage
-    ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring
-     , cereal, cryptonite, data-default-class, gauge, hourglass, memory
-     , mtl, network, QuickCheck, tasty, tasty-quickcheck, transformers
-     , x509, x509-store, x509-validation
-     }:
-     mkDerivation {
-       pname = "tls";
-       version = "1.5.3";
-       sha256 = "172awd9kl1dg83pcckp1ryl1yllxlx25s592m8rndzj6xkrlm70c";
-       libraryHaskellDepends = [
-         asn1-encoding asn1-types async base bytestring cereal cryptonite
-         data-default-class hourglass memory mtl network transformers x509
-         x509-store x509-validation
-       ];
-       testHaskellDepends = [
-         asn1-types async base bytestring cryptonite data-default-class
-         hourglass QuickCheck tasty tasty-quickcheck x509 x509-validation
-       ];
-       benchmarkHaskellDepends = [
-         asn1-types async base bytestring cryptonite data-default-class
-         gauge hourglass QuickCheck tasty-quickcheck x509 x509-validation
-       ];
-       description = "TLS/SSL protocol native implementation (Server and Client)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tls_1_5_4" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring
      , cereal, cryptonite, data-default-class, gauge, hourglass, memory
      , mtl, network, QuickCheck, tasty, tasty-quickcheck, transformers
@@ -227729,7 +242613,6 @@ self: {
        ];
        description = "TLS/SSL protocol native implementation (Server and Client)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tls-debug" = callPackage
@@ -227768,6 +242651,8 @@ self: {
        ];
        description = "TLS extra default values and helpers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tls-session-manager" = callPackage
@@ -227812,6 +242697,8 @@ self: {
        ];
        description = "Handle phylogenetic trees";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tmapchan" = callPackage
@@ -227882,6 +242769,8 @@ self: {
        ];
        description = "Start and stop a temporary postgres";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tmpl" = callPackage
@@ -227919,6 +242808,8 @@ self: {
        ];
        description = "A simple daily journal program";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tnet" = callPackage
@@ -227964,6 +242855,8 @@ self: {
        ];
        description = "A type class and some utilities for generating Haskell code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "to-string-class" = callPackage
@@ -227977,6 +242870,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Converting string-like types to Strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "to-string-instances" = callPackage
@@ -227988,6 +242883,8 @@ self: {
        libraryHaskellDepends = [ bytestring pretty text to-string-class ];
        description = "Instances for the ToString class";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "toboggan" = callPackage
@@ -228006,6 +242903,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Twitter bot generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "todo" = callPackage
@@ -228017,6 +242916,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A todo bottom";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "todos" = callPackage
@@ -228042,6 +242943,8 @@ self: {
        ];
        description = "Easy-to-use TODOs manager";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tofromxml" = callPackage
@@ -228060,6 +242963,8 @@ self: {
        ];
        description = "Reading and writing Haskell data from and to XML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "toilet" = callPackage
@@ -228077,6 +242982,8 @@ self: {
        ];
        description = "Manage the toilet queue at the IMO";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "token-bucket" = callPackage
@@ -228137,6 +243044,8 @@ self: {
          text unordered-containers
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tokenify" = callPackage
@@ -228148,6 +243057,8 @@ self: {
        libraryHaskellDepends = [ base containers text ];
        description = "A regex lexer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tokenize" = callPackage
@@ -228191,6 +243102,8 @@ self: {
        ];
        description = "A variant of tokenizer-monad that supports streaming";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tokstyle" = callPackage
@@ -228205,6 +243118,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "TokTok C code style checker";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "toktok" = callPackage
@@ -228219,6 +243134,8 @@ self: {
        libraryHaskellDepends = [ base containers haskell98 ];
        executableHaskellDepends = [ base bytestring gf iconv ];
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tokyocabinet-haskell" = callPackage
@@ -228231,6 +243148,8 @@ self: {
        librarySystemDepends = [ tokyocabinet ];
        description = "Haskell binding of Tokyo Cabinet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) tokyocabinet;};
 
   "tokyotyrant-haskell" = callPackage
@@ -228245,6 +243164,8 @@ self: {
        description = "FFI bindings to libtokyotyrant";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;};
 
   "tomato-rubato-openal" = callPackage
@@ -228256,6 +243177,8 @@ self: {
        libraryHaskellDepends = [ base OpenAL stm vector ];
        description = "Easy to use library for audio programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "toml" = callPackage
@@ -228272,6 +243195,8 @@ self: {
          attoparsec base bytestring containers old-locale time
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "toml-parser" = callPackage
@@ -228396,6 +243321,8 @@ self: {
        ];
        description = "tonatona plugin for google-server-api";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tonatona-logger" = callPackage
@@ -228428,6 +243355,8 @@ self: {
        ];
        description = "tonatona plugin for accessing PostgreSQL database";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tonatona-persistent-sqlite" = callPackage
@@ -228515,6 +243444,8 @@ self: {
        ];
        description = "Cluster single cells and analyze cell clade relationships";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "toodles" = callPackage
@@ -228550,6 +243481,8 @@ self: {
        ];
        description = "Manage the TODO entries in your code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "toolshed" = callPackage
@@ -228591,6 +243524,8 @@ self: {
        ];
        description = "Top (typed oriented protocol) API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "topkata" = callPackage
@@ -228609,6 +243544,8 @@ self: {
        ];
        description = "OpenGL Arcade Game";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "topograph" = callPackage
@@ -228637,6 +243574,8 @@ self: {
        libraryHaskellDepends = [ base mtl parallel QuickCheck ];
        description = "Simple unit test library (or framework)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "torrent" = callPackage
@@ -228707,6 +243646,8 @@ self: {
        libraryHaskellDepends = [ base containers semiring-num ];
        description = "Finitely represented total maps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "total-maps" = callPackage
@@ -228737,6 +243678,8 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        description = "Library (and cli) to execute a procedure on file change";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tower" = callPackage
@@ -228779,6 +243722,8 @@ self: {
        ];
        description = "Haskell bindings to the C reference implementation of Tox";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {toxcore = null;};
 
   "toxiproxy-haskell" = callPackage
@@ -228798,6 +243743,8 @@ self: {
        ];
        description = "Client library for Toxiproxy: a TCP failure testing proxy";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "toysolver" = callPackage
@@ -228854,6 +243801,8 @@ self: {
        ];
        description = "Assorted decision procedures for SAT, SMT, Max-SAT, PB, MIP, etc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tpar" = callPackage
@@ -228890,6 +243839,8 @@ self: {
        ];
        description = "simple, parallel job scheduling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tpb" = callPackage
@@ -228915,6 +243866,8 @@ self: {
        ];
        description = "Applications for interacting with the Pushbullet API";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tpdb" = callPackage
@@ -228955,6 +243908,8 @@ self: {
        ];
        description = "A parser and a pretty printer for the TPTP language";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trace" = callPackage
@@ -228971,6 +243926,8 @@ self: {
        ];
        description = "A monad transformer for tracing provenience of errors";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trace-call" = callPackage
@@ -228982,6 +243939,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "functions for logging the arguments and results of function calls";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trace-function-call" = callPackage
@@ -228993,6 +243952,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Easy lightweight tracing of function arguments and results for ad hoc debugging";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "traced" = callPackage
@@ -229004,6 +243965,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl pretty ];
        description = "Simple evaluation trace";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tracer" = callPackage
@@ -229033,6 +243996,8 @@ self: {
        ];
        description = "Visualize Haskell data structures as edge-labeled trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tracing" = callPackage
@@ -229054,6 +244019,8 @@ self: {
        ];
        description = "Distributed tracing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tracker" = callPackage
@@ -229065,6 +244032,8 @@ self: {
        libraryHaskellDepends = [ base containers glib ];
        description = "Client library for Tracker metadata database, indexer and search tool";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trackit" = callPackage
@@ -229083,6 +244052,8 @@ self: {
        ];
        description = "A command-line tool for live monitoring";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "traction" = callPackage
@@ -229104,6 +244075,8 @@ self: {
        ];
        description = "Tools for postgresql-simple";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tracy" = callPackage
@@ -229115,6 +244088,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Convenience wrappers for non-intrusive debug tracing";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "traildb" = callPackage
@@ -229138,6 +244113,8 @@ self: {
        ];
        description = "TrailDB bindings for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {Judy = null; traildb = null;};
 
   "trajectory" = callPackage
@@ -229160,6 +244137,8 @@ self: {
        ];
        description = "Tools and a library for working with Trajectory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trans-fx-core" = callPackage
@@ -229223,6 +244202,8 @@ self: {
        libraryHaskellDepends = [ base ListZipper MonadPrompt stm ];
        description = "Transactional events, based on Concurrent ML semantics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "transf" = callPackage
@@ -229241,6 +244222,8 @@ self: {
        ];
        description = "Text transformer and interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "transfer-db" = callPackage
@@ -229269,6 +244252,8 @@ self: {
        ];
        description = "ODBC database transfer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "transformations" = callPackage
@@ -229289,6 +244274,8 @@ self: {
        ];
        description = "Generic representation of tree transformations";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "transformers_0_4_3_0" = callPackage
@@ -229331,6 +244318,8 @@ self: {
        ];
        description = "Error and short-circuit monad transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "transformers-base" = callPackage
@@ -229381,6 +244370,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Arrow-like / category-like composition for transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "transformers-continue" = callPackage
@@ -229410,6 +244401,8 @@ self: {
        ];
        description = "Sensible conversions between some of the monad transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "transformers-eff" = callPackage
@@ -229491,6 +244484,8 @@ self: {
        ];
        description = "Ad-hoc type classes for lifting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "transformers-runnable" = callPackage
@@ -229502,6 +244497,8 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "A unified interface for the run operation of monad transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "transformers-supply" = callPackage
@@ -229533,6 +244530,8 @@ self: {
        ];
        description = "composing programs with multithreading, events and distributed computing";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "transient-universe" = callPackage
@@ -229565,6 +244564,8 @@ self: {
        ];
        description = "Remote execution and map-reduce: distributed computing for Transient";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "transient-universe-tls" = callPackage
@@ -229581,6 +244582,8 @@ self: {
        ];
        description = "transient with secure communications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "translatable-intset" = callPackage
@@ -229594,6 +244597,8 @@ self: {
        libraryHaskellDepends = [ base fingertree ];
        description = "Integer sets with a constant time translate operation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "translate" = callPackage
@@ -229606,6 +244611,8 @@ self: {
        libraryHaskellDepends = [ base curl json network utf8-string ];
        description = "Haskell binding to Google's AJAX Language API for Translation and Detection";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "translate-cli" = callPackage
@@ -229623,6 +244630,8 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Translation cli tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trasa" = callPackage
@@ -229641,6 +244650,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Type Safe Web Routing";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trasa-client" = callPackage
@@ -229657,6 +244668,8 @@ self: {
        ];
        description = "Type safe http requests";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trasa-extra" = callPackage
@@ -229674,6 +244687,8 @@ self: {
        ];
        description = "Extra functions for trasa";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trasa-form" = callPackage
@@ -229692,6 +244707,8 @@ self: {
        ];
        description = "generate forms using lucid, ditto and trasa";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trasa-reflex" = callPackage
@@ -229725,6 +244742,8 @@ self: {
        ];
        description = "Type safe web server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trasa-th" = callPackage
@@ -229741,6 +244760,8 @@ self: {
        testHaskellDepends = [ base trasa ];
        description = "Template Haskell to generate trasa routes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "traversal-template" = callPackage
@@ -229787,6 +244808,8 @@ self: {
        ];
        description = "A simple client implementation using Travis CI API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "travis-meta-yaml" = callPackage
@@ -229816,6 +244839,8 @@ self: {
        ];
        description = ".travis.yml preprocessor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "travis-pogodi" = callPackage
@@ -229848,6 +244873,8 @@ self: {
        ];
        description = "A tool for finding haddocks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "traypoweroff" = callPackage
@@ -229862,6 +244889,8 @@ self: {
        executableHaskellDepends = [ base gtk process ];
        description = "Tray Icon application to PowerOff / Reboot computer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "treap" = callPackage
@@ -229876,6 +244905,8 @@ self: {
        testHaskellDepends = [ base doctest Glob hspec hspec-core ];
        description = "Efficient implementation of the implicit treap data structure";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tree-diff" = callPackage
@@ -229925,6 +244956,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Non-Determinism Monad for Tree Search";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tree-render-text" = callPackage
@@ -229936,6 +244969,8 @@ self: {
        libraryHaskellDepends = [ base boxes containers mtl ];
        description = "Configurable text rendering of trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tree-sitter" = callPackage
@@ -229954,6 +244989,8 @@ self: {
        testHaskellDepends = [ base hedgehog ];
        description = "Unstable bindings for the tree-sitter parsing library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tree-sitter-go" = callPackage
@@ -229966,6 +245003,8 @@ self: {
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for Go";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tree-sitter-haskell" = callPackage
@@ -229979,6 +245018,8 @@ self: {
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for Haskell (with GHC extensions)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tree-sitter-java" = callPackage
@@ -229991,6 +245032,8 @@ self: {
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for Java";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tree-sitter-json" = callPackage
@@ -230003,6 +245046,8 @@ self: {
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for JSON";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tree-sitter-php" = callPackage
@@ -230015,6 +245060,8 @@ self: {
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for PHP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tree-sitter-python" = callPackage
@@ -230027,6 +245074,8 @@ self: {
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for Python";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tree-sitter-ruby" = callPackage
@@ -230039,6 +245088,8 @@ self: {
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for Ruby";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tree-sitter-tsx" = callPackage
@@ -230051,6 +245102,8 @@ self: {
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for TSX";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tree-sitter-typescript" = callPackage
@@ -230063,6 +245116,8 @@ self: {
        libraryHaskellDepends = [ base tree-sitter ];
        description = "Tree-sitter grammar/parser for TypeScript";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tree-traversals" = callPackage
@@ -230075,6 +245130,8 @@ self: {
        testHaskellDepends = [ base containers doctest mtl ];
        description = "Functions and newtype wrappers for traversing Trees";
        license = stdenv.lib.licenses.cc0;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tree-view" = callPackage
@@ -230138,6 +245195,8 @@ self: {
        ];
        description = "Generates HTML for Data.Tree as TreeMap";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "treemap-html-tools" = callPackage
@@ -230157,6 +245216,8 @@ self: {
        doHaddock = false;
        description = "Treemap related commands for producing foldable TreeMap HTML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "treersec" = callPackage
@@ -230208,6 +245269,8 @@ self: {
        ];
        description = "Library for polling Tremulous servers";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trhsx" = callPackage
@@ -230218,6 +245281,8 @@ self: {
        sha256 = "11jx2jf6vi7368ys39mz0ziy6xknbi0z87926n2y16am6k2h25k3";
        description = "Deprecated";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "triangulation" = callPackage
@@ -230233,6 +245298,8 @@ self: {
        ];
        description = "triangulation of polygons";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trie-simple" = callPackage
@@ -230281,6 +245348,8 @@ self: {
        ];
        description = "Various trie implementations in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trifecta" = callPackage
@@ -230327,6 +245396,8 @@ self: {
        testHaskellDepends = [ base hspec protolude ];
        description = "Trigger is a cross platform file system watcher for super fast build-and-restart workflows";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trim" = callPackage
@@ -230342,6 +245413,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "A command-line tool for trimming whitespace";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trimpolya" = callPackage
@@ -230355,6 +245428,8 @@ self: {
        executableHaskellDepends = [ base bio bytestring simpleargs ];
        description = "Search for, annotate and trim poly-A tail";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tripLL" = callPackage
@@ -230370,6 +245445,8 @@ self: {
        ];
        description = "A very simple triple store";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "triplesec" = callPackage
@@ -230400,6 +245477,8 @@ self: {
        libraryHaskellDepends = [ base comonad distributive ];
        description = "The trivial monad and comonad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trivial-constraint" = callPackage
@@ -230422,6 +245501,8 @@ self: {
        libraryHaskellDepends = [ base semiring-simple ];
        description = "A library for tropical mathematics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tropical-geometry" = callPackage
@@ -230446,6 +245527,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "A Tropical Geometry package for Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "true-name" = callPackage
@@ -230460,6 +245543,8 @@ self: {
        testHaskellDepends = [ base containers template-haskell time ];
        description = "Template Haskell hack to violate module abstractions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "truelevel" = callPackage
@@ -230473,6 +245558,8 @@ self: {
        executableHaskellDepends = [ base containers parseargs WAVE ];
        description = "Audio file compressor-limiter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "trurl" = callPackage
@@ -230495,6 +245582,8 @@ self: {
        testHaskellDepends = [ base hastache tasty tasty-hunit ];
        description = "Haskell template code generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "truthful" = callPackage
@@ -230519,6 +245608,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl time transformers ];
        description = "A Transaction Framework for Web Applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tsession-happstack" = callPackage
@@ -230532,6 +245623,8 @@ self: {
        ];
        description = "A Transaction Framework for Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tsetchan" = callPackage
@@ -230622,6 +245715,8 @@ self: {
        executableHaskellDepends = [ base gloss stm vector ];
        description = "Real time TSP tour visualization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tsparse" = callPackage
@@ -230639,6 +245734,8 @@ self: {
        ];
        description = "Parses U.S. federal Thrift Savings Plan PDF quarterly statements";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tst" = callPackage
@@ -230670,6 +245767,8 @@ self: {
        ];
        description = "Interacts with tesseract to ease reading of RAW Japanese manga";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tsv2csv" = callPackage
@@ -230702,6 +245801,8 @@ self: {
        ];
        description = "Template tsv into SQL";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tsweb" = callPackage
@@ -230730,6 +245831,8 @@ self: {
        ];
        description = "An API binding Web.Spock to Database.Beam";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ttask" = callPackage
@@ -230752,6 +245855,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "This is task management tool for yourself, that inspired by scrum";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ttc" = callPackage
@@ -230831,6 +245936,8 @@ self: {
        ];
        description = "TheThingsNetwork client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ttrie" = callPackage
@@ -230883,6 +245990,8 @@ self: {
        ];
        description = "Working with files for the Tiptoi® pen";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tubes" = callPackage
@@ -230899,6 +246008,8 @@ self: {
        ];
        description = "Write stream processing computations with side effects in a series of tubes";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tuntap" = callPackage
@@ -230910,6 +246021,8 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "Interface to TUN/TAP drivers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tuntap-simple" = callPackage
@@ -230923,6 +246036,8 @@ self: {
        libraryHaskellDepends = [ base ioctl ];
        description = "A simple tun/tap library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tup-functor" = callPackage
@@ -230937,6 +246052,8 @@ self: {
        executableHaskellDepends = [ base haskell-src-exts parsec2 ];
        description = "Homogeneous tuples";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tuple" = callPackage
@@ -230959,6 +246076,8 @@ self: {
        libraryHaskellDepends = [ base combinat ];
        description = "Enum instances for tuples where the digits increase with the same speed";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tuple-generic" = callPackage
@@ -230993,6 +246112,8 @@ self: {
        libraryHaskellDepends = [ base lens template-haskell ];
        description = "Stock FieldN combos and generators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tuple-morph" = callPackage
@@ -231006,6 +246127,8 @@ self: {
        libraryHaskellDepends = [ base HList template-haskell ];
        description = "Morph between tuples, or convert them from and to HLists";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tuple-ops" = callPackage
@@ -231017,6 +246140,8 @@ self: {
        libraryHaskellDepends = [ base type-combinators ];
        description = "various operations on n-ary tuples via GHC.Generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tuple-sop" = callPackage
@@ -231051,6 +246176,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Functor, Applicative and Monad for n-ary tuples";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tuples" = callPackage
@@ -231101,6 +246228,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A simple simulator for Turing machines";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "turing-music" = callPackage
@@ -231114,6 +246243,8 @@ self: {
        executableHaskellDepends = [ ALUT base ];
        description = "Plays music generated by Turing machines with 5 states and 2 symbols";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "turingMachine" = callPackage
@@ -231130,6 +246261,8 @@ self: {
        ];
        description = "An implementation of Turing Machine and Automaton";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "turkish-deasciifier" = callPackage
@@ -231212,6 +246345,8 @@ self: {
        testHaskellDepends = [ base HUnit parsec ];
        description = "Collection of command line options and parsers for these options";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tw" = callPackage
@@ -231236,6 +246371,8 @@ self: {
        libraryHaskellDepends = [ base containers lens stm transformers ];
        description = "A library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twee" = callPackage
@@ -231322,6 +246459,8 @@ self: {
        ];
        description = "Used as Lab Assignments Environment at the University of Twente";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twentefp-eventloop-trees" = callPackage
@@ -231333,6 +246472,8 @@ self: {
        libraryHaskellDepends = [ base eventloop ];
        description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twentefp-graphs" = callPackage
@@ -231344,6 +246485,8 @@ self: {
        libraryHaskellDepends = [ base twentefp-eventloop-graphics ];
        description = "Lab Assignments Environment at Univeriteit Twente";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twentefp-number" = callPackage
@@ -231369,6 +246512,8 @@ self: {
        ];
        description = "RoseTree type and show functions for lab assignment of University of Twente";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twentefp-trees" = callPackage
@@ -231380,6 +246525,8 @@ self: {
        libraryHaskellDepends = [ base twentefp-eventloop-graphics ];
        description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and ParseTree";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twentefp-websockets" = callPackage
@@ -231398,6 +246545,8 @@ self: {
        ];
        description = "A fork of the popular websockets package. It is used for the practical assignments of the University of Twente. A sensible and clean way to write WebSocket-capable servers in Haskell.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twentyseven" = callPackage
@@ -231427,6 +246576,8 @@ self: {
        ];
        description = "Rubik's cube solver";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twfy-api-client" = callPackage
@@ -231452,6 +246603,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "They Work For You API Client Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twhs" = callPackage
@@ -231482,6 +246635,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "CLI twitter client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twidge" = callPackage
@@ -231502,6 +246657,8 @@ self: {
        ];
        description = "Unix Command-Line Twitter and Identica Client";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twilight-stm" = callPackage
@@ -231513,6 +246670,8 @@ self: {
        libraryHaskellDepends = [ base containers haskell98 mtl ];
        description = "STM library with safe irrevocable I/O and inconsistency repair";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twilio" = callPackage
@@ -231539,6 +246698,8 @@ self: {
        doCheck = false;
        description = "Twilio REST API library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twill" = callPackage
@@ -231557,6 +246718,8 @@ self: {
        ];
        description = "Twilio API interaction";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twiml" = callPackage
@@ -231589,6 +246752,8 @@ self: {
        ];
        description = "very simple template language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twirp" = callPackage
@@ -231663,6 +246828,8 @@ self: {
        ];
        description = "A Haskell-based CLI Twitter client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twitter-conduit" = callPackage
@@ -231696,6 +246863,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Twitter API package with conduit interface and Streaming API support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twitter-enumerator" = callPackage
@@ -231714,6 +246883,8 @@ self: {
        ];
        description = "Twitter API package with enumerator interface and Streaming API support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twitter-feed" = callPackage
@@ -231735,6 +246906,8 @@ self: {
        ];
        description = "Client for fetching Twitter timeline via Oauth";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twitter-types" = callPackage
@@ -231756,6 +246929,8 @@ self: {
        ];
        description = "Twitter JSON parser and types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "twitter-types-lens" = callPackage
@@ -231771,6 +246946,8 @@ self: {
        ];
        description = "Twitter JSON types (lens powered)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tx" = callPackage
@@ -231786,6 +246963,8 @@ self: {
        ];
        description = "Persistent transactions on top of STM";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "txt" = callPackage
@@ -231804,6 +246983,8 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "txt-sushi" = callPackage
@@ -231845,6 +247026,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Deprecated in favor of eros";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ty" = callPackage
@@ -231869,6 +247052,8 @@ self: {
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Provide proof witnesses for closed type family evaluation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typalyze" = callPackage
@@ -231887,6 +247072,8 @@ self: {
        ];
        description = "Analyzes Haskell source files for easy reference";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-aligned" = callPackage
@@ -231911,6 +247098,8 @@ self: {
        testHaskellDepends = [ base hspec test-fixture ];
        description = "Runtime type assertions for testing";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-booleans" = callPackage
@@ -231937,6 +247126,8 @@ self: {
        ];
        description = "Utilities for caching type families results. Sometimes complex type families take long time to compile, so it is proficient to cache them and use the final result without the need of re-computation.";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-cereal" = callPackage
@@ -231953,6 +247144,8 @@ self: {
        ];
        description = "Type-level serialization of type constructors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-combinators" = callPackage
@@ -231966,6 +247159,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A collection of data types for type-level programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-combinators-quote" = callPackage
@@ -231981,6 +247176,8 @@ self: {
        ];
        description = "Quasiquoters for the 'type-combinators' package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-combinators-singletons" = callPackage
@@ -231992,6 +247189,8 @@ self: {
        libraryHaskellDepends = [ base singletons type-combinators ];
        description = "Interop between /type-combinators/ and /singletons/";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-digits" = callPackage
@@ -232003,6 +247202,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell type-spine ];
        description = "Arbitrary-base type-level digits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-eq" = callPackage
@@ -232017,6 +247218,8 @@ self: {
        libraryToolDepends = [ cpphs ];
        description = "Type equality evidence you can carry around";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-equality" = callPackage
@@ -232128,6 +247331,8 @@ self: {
        ];
        description = "Queues with verified and unverified versions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-int" = callPackage
@@ -232139,6 +247344,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Type Level 2s- and 16s- Complement Integers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-interpreter" = callPackage
@@ -232151,6 +247358,8 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Interpreter for Template Haskell types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-iso" = callPackage
@@ -232189,6 +247398,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "type-level binary search trees in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-level-integers" = callPackage
@@ -232237,6 +247448,8 @@ self: {
        ];
        description = "High-level combinators for performing inductive operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-level-natural-number-operations" = callPackage
@@ -232248,6 +247461,8 @@ self: {
        libraryHaskellDepends = [ base type-level-natural-number ];
        description = "Basic operations on type-level natural numbers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-level-numbers" = callPackage
@@ -232295,6 +247510,8 @@ self: {
        libraryHaskellDepends = [ base singletons ];
        description = "Operations on type-level lists and tuples";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-map" = callPackage
@@ -232388,6 +247605,8 @@ self: {
        ];
        description = "Type-level comparison operator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-ord-spine-cereal" = callPackage
@@ -232403,6 +247622,8 @@ self: {
        ];
        description = "Generic type-level comparison of types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-prelude" = callPackage
@@ -232414,6 +247635,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Partial port of prelude to the type level. Requires GHC 7.6.1.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-sets" = callPackage
@@ -232426,6 +247649,8 @@ self: {
        testHaskellDepends = [ base cmptype ];
        description = "Type-level sets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-settheory" = callPackage
@@ -232441,6 +247666,8 @@ self: {
        ];
        description = "Sets and functions-as-relations in the type system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-spec" = callPackage
@@ -232464,6 +247691,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "A spine-view on types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-structure" = callPackage
@@ -232490,6 +247719,8 @@ self: {
        ];
        description = "Type structure analysis";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-sub-th" = callPackage
@@ -232514,6 +247745,8 @@ self: {
        ];
        description = "Substitute types for other types with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-tree" = callPackage
@@ -232531,6 +247764,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Tree representations of datatypes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "type-unary" = callPackage
@@ -232562,6 +247797,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Automatic deriving of TypeableN instances with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typed-admin" = callPackage
@@ -232659,6 +247896,8 @@ self: {
        executableHaskellDepends = [ base diagrams-lib text ];
        description = "Typed and composable spreadsheets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typed-streams" = callPackage
@@ -232680,6 +247919,8 @@ self: {
        ];
        description = "A stream based replacement for lists";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typed-uuid" = callPackage
@@ -232720,6 +247961,8 @@ self: {
        ];
        description = "Language-independent type-safe communication";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typed-wire-utils" = callPackage
@@ -232749,6 +247992,8 @@ self: {
        ];
        description = "Typed frontend to TensorFlow and higher-order deep learning";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typedquery" = callPackage
@@ -232765,6 +248010,8 @@ self: {
        ];
        description = "Parser for SQL augmented with types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typehash" = callPackage
@@ -232776,6 +248023,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring mtl pureMD5 syb ];
        description = "Create a unique hash value for a type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typelevel" = callPackage
@@ -232792,6 +248041,8 @@ self: {
        ];
        description = "Useful type level operations (type families and related operators)";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typelevel-rewrite-rules" = callPackage
@@ -232825,6 +248076,8 @@ self: {
        ];
        description = "Tensors whose ranks and dimensions type-inferred and type-checked";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typelits-printf" = callPackage
@@ -232888,6 +248141,8 @@ self: {
        ];
        description = "Lens-like interface for type level parameters; allows unboxed unboxed vectors and supercompilation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typerep-map" = callPackage
@@ -232917,6 +248172,8 @@ self: {
        doHaddock = false;
        description = "Efficient implementation of a dependent map with types as keys";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "types-compat" = callPackage
@@ -232930,6 +248187,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "ghc-7.6/7.8 compatible GHC.TypeLits, Data.Typeable and Data.Proxy.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typesafe-endian" = callPackage
@@ -232960,6 +248219,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Type-safe transformations and purifications of PreCures (Japanese Battle Heroine)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typescript-docs" = callPackage
@@ -232979,6 +248240,8 @@ self: {
        ];
        description = "A documentation generator for TypeScript Definition files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typical" = callPackage
@@ -233016,6 +248279,8 @@ self: {
        ];
        description = "Just let me draw nice text already";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "typography-geometry" = callPackage
@@ -233051,6 +248316,8 @@ self: {
        ];
        description = "Type derived JSON parsing using Aeson";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tz" = callPackage
@@ -233117,6 +248384,8 @@ self: {
        testHaskellDepends = [ base bytestring either-unwrap hspec text ];
        description = "Haskell Universal Two Factor helper toolbox library thing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uAgda" = callPackage
@@ -233194,6 +248463,8 @@ self: {
        testHaskellDepends = [ base hspec text ];
        description = "Uber client for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uberlast" = callPackage
@@ -233205,6 +248476,8 @@ self: {
        libraryHaskellDepends = [ base lens tagged template-haskell ];
        description = "Generate overloaded lenses from plain data declaration";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ucam-webauth" = callPackage
@@ -233234,6 +248507,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "The Ucam-Webauth protocol, used by Raven";
        license = "(BSD-3-Clause OR Apache-2.0)";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ucam-webauth-types" = callPackage
@@ -233255,6 +248530,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Types for the Ucam-Webauth protocol, as used by Raven";
        license = "(BSD-3-Clause OR Apache-2.0)";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ucd" = callPackage
@@ -233285,6 +248562,8 @@ self: {
        librarySystemDepends = [ icu ];
        description = "String encoding conversion with ICU";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) icu;};
 
   "udbus" = callPackage
@@ -233360,6 +248639,8 @@ self: {
        ];
        description = "Simple fire-and-forget conduit UDP wrappers";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "udp-streaming" = callPackage
@@ -233373,6 +248654,8 @@ self: {
        ];
        description = "Streaming to and from UDP socket";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uglymemo" = callPackage
@@ -233411,6 +248694,8 @@ self: {
        ];
        description = "Part of UHC packaged as cabal/hackage installable library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uhc-util" = callPackage
@@ -233430,6 +248715,8 @@ self: {
        ];
        description = "UHC utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uhexdump" = callPackage
@@ -233443,6 +248730,8 @@ self: {
        executableHaskellDepends = [ base bytestring split ];
        description = "hex dumper for UTF-8 text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uhttpc" = callPackage
@@ -233465,6 +248754,8 @@ self: {
        ];
        description = "Minimal HTTP client library optimized for benchmarking";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ui-command" = callPackage
@@ -233478,6 +248769,8 @@ self: {
        libraryHaskellDepends = [ base data-default mtl old-locale time ];
        description = "A framework for friendly commandline programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uid" = callPackage
@@ -233518,6 +248811,8 @@ self: {
        ];
        description = "Implementation of ULID, lexicographically sortable unique identifiers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "una" = callPackage
@@ -233552,6 +248847,8 @@ self: {
        ];
        description = "A fast, cache-efficient, concurrent bloom filter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unagi-chan" = callPackage
@@ -233606,6 +248903,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "Functional concurrency with unamb using a custom scheduler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unbeliever" = callPackage
@@ -233655,6 +248954,8 @@ self: {
        ];
        description = "Generic support for programming with names and binders";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unbound-generics" = callPackage
@@ -233677,6 +248978,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Support for programming with names and binders using GHC Generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unbound-kind-generics" = callPackage
@@ -233692,6 +248995,8 @@ self: {
        ];
        description = "Support for programming with names and binders using kind-generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unbounded-delays" = callPackage
@@ -233714,6 +249019,8 @@ self: {
        libraryHaskellDepends = [ base unbounded-delays units units-defs ];
        description = "Thread delays and timeouts using proper time units";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unboxed" = callPackage
@@ -233736,6 +249043,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Self-optimizing unboxed sets using view patterns and data families";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unboxed-ref" = callPackage
@@ -233804,6 +249113,8 @@ self: {
        executableHaskellDepends = [ base bytestring cmdargs ];
        description = "Secure and resilient remote file storage utility";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uncertain" = callPackage
@@ -233884,6 +249195,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Unfixing and recursion schemes for data types with binders";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unfoldable" = callPackage
@@ -233901,6 +249214,8 @@ self: {
        ];
        description = "Class of data structures that can be unfolded";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unfoldable-restricted" = callPackage
@@ -233917,6 +249232,8 @@ self: {
        ];
        description = "An alternative to the Unfoldable typeclass";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ungadtagger" = callPackage
@@ -233939,6 +249256,8 @@ self: {
        libraryHaskellDepends = [ base containers uni-util ];
        description = "Event handling for the uniform workbench";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uni-graphs" = callPackage
@@ -233954,6 +249273,8 @@ self: {
        ];
        description = "Graphs";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uni-htk" = callPackage
@@ -233970,6 +249291,8 @@ self: {
        ];
        description = "Graphical User Interface for Haskell Programs";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uni-posixutil" = callPackage
@@ -233985,6 +249308,8 @@ self: {
        ];
        description = "Posix utilities for the uniform workbench";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uni-reactor" = callPackage
@@ -233999,6 +249324,8 @@ self: {
        ];
        description = "Reactors for the uniform workbench";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uni-uDrawGraph" = callPackage
@@ -234015,6 +249342,8 @@ self: {
        ];
        description = "Graphs binding";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uni-util" = callPackage
@@ -234031,6 +249360,8 @@ self: {
        ];
        description = "Utilities for the uniform workbench";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unicode" = callPackage
@@ -234070,6 +249401,8 @@ self: {
        librarySystemDepends = [ icu ];
        description = "Unicode normalization using the ICU library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) icu;};
 
   "unicode-prelude" = callPackage
@@ -234081,6 +249414,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Unicode notation for some definitions in Prelude";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unicode-properties" = callPackage
@@ -234104,6 +249439,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "print and show in unicode";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unicode-symbols" = callPackage
@@ -234115,6 +249452,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Unicode alternatives for common functions and operators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unicode-transforms" = callPackage
@@ -234201,6 +249540,8 @@ self: {
        testHaskellDepends = [ attoparsec base bytestring Cabal ];
        description = "Uniform IO over files, network, anything";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) openssl;};
 
   "uniform-pair" = callPackage
@@ -234235,6 +249576,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq lens ];
        description = "Extensible type-safe unions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "union-find" = callPackage
@@ -234270,6 +249613,8 @@ self: {
        libraryHaskellDepends = [ base containers extensible ];
        description = "Heterogeneous map by open unions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unipatterns" = callPackage
@@ -234391,6 +249736,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Splittable Unique Identifier Supply";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uniquely-represented-sets" = callPackage
@@ -234407,6 +249754,8 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion random ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unit" = callPackage
@@ -234467,6 +249816,8 @@ self: {
        ];
        description = "Attoparsec parsers for the units package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "units-defs" = callPackage
@@ -234507,6 +249858,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "An extendable library for type-safe computations including units";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unity-testresult-parser" = callPackage
@@ -234529,6 +249882,8 @@ self: {
          text
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unitym" = callPackage
@@ -234566,6 +249921,8 @@ self: {
        libraryHaskellDepends = [ base unitym yesod ];
        description = "Implementation of the unity monad for the Yesod framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "universal" = callPackage
@@ -234597,6 +249954,8 @@ self: {
        libraryHaskellDepends = [ base binary bytestring ];
        description = "Parser for OS X Universal Binary format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "universe" = callPackage
@@ -234736,6 +250095,8 @@ self: {
        ];
        description = "Construct a Dec's ancestor list";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "universum" = callPackage
@@ -234813,6 +250174,8 @@ self: {
        libraryHaskellDepends = [ base foreign-var ];
        description = "Comprehensive bindings to fcntl(2)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unix-handle" = callPackage
@@ -234824,6 +250187,8 @@ self: {
        libraryHaskellDepends = [ base unix ];
        description = "POSIX operations on Handles";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unix-io-extra" = callPackage
@@ -234873,6 +250238,8 @@ self: {
        ];
        description = "Run processes on Unix systems, with a conduit interface (deprecated)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unix-pty-light" = callPackage
@@ -234924,6 +250291,8 @@ self: {
        ];
        description = "Bidirectional JSON parsing and generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unlambda" = callPackage
@@ -234949,6 +250318,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim semigroups ];
        description = "GHC Haskell lists of non-thunks (things of kind TYPE 'UnliftedRep)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unliftio" = callPackage
@@ -235045,6 +250416,8 @@ self: {
        ];
        description = "A Library for the manipulation of images";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unmed2" = callPackage
@@ -235101,6 +250474,8 @@ self: {
        ];
        description = "Rematch support for unordered containers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unordered-graphs" = callPackage
@@ -235116,6 +250491,8 @@ self: {
        ];
        description = "Graph library using unordered-containers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unordered-intmap" = callPackage
@@ -235132,6 +250509,8 @@ self: {
        ];
        description = "A specialization of `HashMap Int v`";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unpack-funcs" = callPackage
@@ -235147,6 +250526,8 @@ self: {
        ];
        description = "Monad transformers that mirror worker-wrapper transformations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unpacked-containers" = callPackage
@@ -235176,6 +250557,8 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked either data type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unpacked-maybe" = callPackage
@@ -235188,6 +250571,8 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked maybe data type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unpacked-maybe-numeric" = callPackage
@@ -235202,6 +250587,8 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "maybes of numeric values with fewer indirections";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unpacked-maybe-text" = callPackage
@@ -235229,6 +250616,8 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked these data type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unpacked-validation" = callPackage
@@ -235245,6 +250634,8 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked validation data type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unparse-attoparsec" = callPackage
@@ -235265,6 +250656,8 @@ self: {
        ];
        description = "An attoparsec roundtrip";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unroll-ghc-plugin" = callPackage
@@ -235276,6 +250669,8 @@ self: {
        libraryHaskellDepends = [ base ghc ];
        description = "Compiler plugin for loop unrolling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unsafe" = callPackage
@@ -235312,6 +250707,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Flexible access control for unsafe operations and instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unsafeperformst" = callPackage
@@ -235342,6 +250739,8 @@ self: {
        ];
        description = "Solve Boggle-like word games";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unsequential" = callPackage
@@ -235360,6 +250759,8 @@ self: {
        ];
        description = "An extension removing the sequentiality from monads";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unusable-pkg" = callPackage
@@ -235401,6 +250802,8 @@ self: {
        testHaskellDepends = [ base containers hspec text ];
        description = "A command line tool to identify unused code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "unwrapped-functors" = callPackage
@@ -235430,6 +250833,8 @@ self: {
        testHaskellDepends = [ base hlint tasty tasty-hunit ];
        description = "Units of measure as a GHC typechecker plugin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "up" = callPackage
@@ -235447,6 +250852,8 @@ self: {
        ];
        description = "Command-line tool to generate paths for moving upward in a file system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "up-grade" = callPackage
@@ -235491,6 +250898,8 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "A program to update fetchgit values in Nix expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "update-repos" = callPackage
@@ -235529,6 +250938,8 @@ self: {
        ];
        description = "Haskell client for Uploadcare";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uploadtest" = callPackage
@@ -235551,6 +250962,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Binding to upskirt";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "urbit-hob" = callPackage
@@ -235568,6 +250981,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "urbit-hob_0_3_2" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, deepseq, hspec
+     , hspec-core, murmur3, QuickCheck, text, vector
+     }:
+     mkDerivation {
+       pname = "urbit-hob";
+       version = "0.3.2";
+       sha256 = "0zs9gwnik7l587apf4giiii6jc4l6a7gj3ygfcab1gd58wfwwm6f";
+       libraryHaskellDepends = [ base bytestring murmur3 text vector ];
+       testHaskellDepends = [ base hspec hspec-core QuickCheck text ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
+       description = "Hoon-style atom manipulation and printing functions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ureader" = callPackage
     ({ mkDerivation, ansi-wl-pprint, async, base, bytestring
      , containers, curl, data-default, deepseq, directory, download-curl
@@ -235589,6 +251018,8 @@ self: {
        ];
        description = "Minimalistic CLI RSS reader";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "urembed" = callPackage
@@ -235609,6 +251040,8 @@ self: {
        ];
        description = "Ur/Web static content generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uri" = callPackage
@@ -235620,6 +251053,8 @@ self: {
        libraryHaskellDepends = [ base parsec safe utf8-string ];
        description = "Library for working with URIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uri-bytestring" = callPackage
@@ -235678,6 +251113,8 @@ self: {
        ];
        description = "Read and write URIs (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uri-encode" = callPackage
@@ -235710,6 +251147,8 @@ self: {
        ];
        description = "Read and write URIs (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uri-enumerator-file" = callPackage
@@ -235728,6 +251167,8 @@ self: {
        ];
        description = "uri-enumerator backend for the file scheme (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uri-parse" = callPackage
@@ -235744,6 +251185,8 @@ self: {
        testHaskellDepends = [ base data-default hspec lens ];
        description = "A simple library for parsing and generating URIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uri-template" = callPackage
@@ -235758,6 +251201,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "URI template library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uri-templater" = callPackage
@@ -235781,6 +251226,8 @@ self: {
        ];
        description = "Parsing & Quasiquoting for RFC 6570 URI Templates";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "url" = callPackage
@@ -235814,6 +251261,8 @@ self: {
        benchmarkHaskellDepends = [ criterion http-types rerebase ];
        description = "Decoders for URL-encoding (aka Percent-encoding)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "url-generic" = callPackage
@@ -235827,6 +251276,8 @@ self: {
        libraryHaskellDepends = [ base mtl syb ];
        description = "Parse/format generic key/value URLs from record data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "urlcheck" = callPackage
@@ -235844,6 +251295,8 @@ self: {
        ];
        description = "Parallel link checker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "urldecode" = callPackage
@@ -235857,6 +251310,8 @@ self: {
        executableHaskellDepends = [ base network ];
        description = "Decode percent-encoded strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "urldisp-happstack" = callPackage
@@ -235868,6 +251323,8 @@ self: {
        libraryHaskellDepends = [ base bytestring happstack-server mtl ];
        description = "Simple, declarative, expressive URL routing -- on happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "urlencoded" = callPackage
@@ -235883,6 +251340,8 @@ self: {
        testHaskellDepends = [ base network network-uri QuickCheck ];
        description = "Generate or process x-www-urlencoded data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "urlpath" = callPackage
@@ -235902,6 +251361,8 @@ self: {
        ];
        description = "Painfully simple URL deployment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "urn" = callPackage
@@ -235914,6 +251375,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Universal Resource Names";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "urn-random" = callPackage
@@ -235930,6 +251393,8 @@ self: {
        ];
        description = "A package for updatable discrete distributions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "urxml" = callPackage
@@ -235947,6 +251412,8 @@ self: {
        ];
        description = "XML parser-printer supporting Ur/Web syntax extensions";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "usa-holidays" = callPackage
@@ -235989,6 +251456,8 @@ self: {
        ];
        description = "Iteratee enumerators for the usb package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "usb-hid" = callPackage
@@ -236002,6 +251471,8 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring usb ];
        description = "Parser and request Library for USB HIDs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "usb-id-database" = callPackage
@@ -236021,6 +251492,8 @@ self: {
        ];
        description = "A database of USB identifiers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "usb-iteratee" = callPackage
@@ -236037,6 +251510,8 @@ self: {
        ];
        description = "Iteratee enumerators for the usb package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "usb-safe" = callPackage
@@ -236053,6 +251528,8 @@ self: {
        ];
        description = "Type-safe communication with USB devices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "useragents" = callPackage
@@ -236067,6 +251544,8 @@ self: {
        executableHaskellDepends = [ base random-fu text ];
        description = "A collection of user agents";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "userid" = callPackage
@@ -236116,6 +251595,8 @@ self: {
        ];
        description = "A mysql-haskell backend for the users library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "users-persistent" = callPackage
@@ -236136,6 +251617,8 @@ self: {
        ];
        description = "A persistent backend for the users package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "users-postgresql-simple" = callPackage
@@ -236183,6 +251666,8 @@ self: {
        ];
        description = "A pragmatic time and date library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "utf" = callPackage
@@ -236232,6 +251717,8 @@ self: {
        libraryHaskellDepends = [ base utf8-string ];
        description = "Variants of Prelude and System.IO with UTF8 text I/O operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "utf8-string" = callPackage
@@ -236262,6 +251749,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Constant-space UTF8 validator for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "util" = callPackage
@@ -236288,6 +251777,8 @@ self: {
        libraryHaskellDepends = [ base basic control lifted-base-tf util ];
        description = "Exceptional utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "util-logict" = callPackage
@@ -236317,6 +251808,8 @@ self: {
        testHaskellDepends = [ base containers HTF QuickCheck ];
        description = "A collection of commonly used utils";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "util-primitive" = callPackage
@@ -236328,6 +251821,8 @@ self: {
        libraryHaskellDepends = [ base primitive ];
        description = "Primitive memory-related utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "util-primitive-control" = callPackage
@@ -236342,6 +251837,8 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Utilities for stateful primitive types and types based on them";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "util-universe" = callPackage
@@ -236358,6 +251855,8 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Utilities for universal types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "utility-ht" = callPackage
@@ -236381,6 +251880,8 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base ];
        description = "Utilities for compiler construction: core functionality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uu-cco-examples" = callPackage
@@ -236394,6 +251895,8 @@ self: {
        executableHaskellDepends = [ base uu-cco uuagc uuagc-cabal ];
        description = "Utilities for compiler construction: example programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uu-cco-hut-parsing" = callPackage
@@ -236405,6 +251908,8 @@ self: {
        libraryHaskellDepends = [ base uu-cco uulib ];
        description = "Utilities for compiler construction: Feedback wrapper around parser in uulib";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uu-cco-uu-parsinglib" = callPackage
@@ -236416,6 +251921,8 @@ self: {
        libraryHaskellDepends = [ base ListLike uu-cco uu-parsinglib ];
        description = "Utilities for compiler construction: Feedback wrapper around parser in uu-parsinglib";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uu-interleaved" = callPackage
@@ -236486,6 +251993,8 @@ self: {
        executableHaskellDepends = [ base uuagc-cabal ];
        description = "Attribute Grammar System of Universiteit Utrecht";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uuagc-bootstrap" = callPackage
@@ -236508,6 +252017,8 @@ self: {
        ];
        description = "Attribute Grammar System of Universiteit Utrecht";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uuagc-cabal" = callPackage
@@ -236523,6 +252034,8 @@ self: {
        ];
        description = "Cabal plugin for UUAGC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uuagc-diagrams" = callPackage
@@ -236534,6 +252047,8 @@ self: {
        libraryHaskellDepends = [ base diagrams-lib SVGFonts ];
        description = "Utility for drawing attribute grammar pictures with the diagrams package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uuagd" = callPackage
@@ -236590,6 +252105,8 @@ self: {
        libraryHaskellDepends = [ aeson base text uuid ];
        description = "Aeson types for UUID instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uuid-bytes" = callPackage
@@ -236714,6 +252231,8 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Fast unboxed arrays with a flexible interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uvector-algorithms" = callPackage
@@ -236725,6 +252244,8 @@ self: {
        libraryHaskellDepends = [ base uvector ];
        description = "Efficient algorithms for uvector unboxed arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uxadt" = callPackage
@@ -236736,6 +252257,8 @@ self: {
        libraryHaskellDepends = [ base json MissingH mtl ];
        description = "Cross-language extensible representation for algebraic data type instances";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "uzbl-with-source" = callPackage
@@ -236763,6 +252286,8 @@ self: {
        ];
        description = "interface to Video For Linux Two (V4L2)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "v4l2-examples" = callPackage
@@ -236776,6 +252301,8 @@ self: {
        executableHaskellDepends = [ base GLUT v4l2 ];
        description = "video for linux two examples";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vabal" = callPackage
@@ -236797,6 +252324,8 @@ self: {
        testHaskellDepends = [ base process ];
        description = "the cabal companion";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vabal-lib" = callPackage
@@ -236814,6 +252343,8 @@ self: {
        testHaskellDepends = [ base Cabal containers ];
        description = "Core algorithms and datatypes used by vabal";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vacuum" = callPackage
@@ -236825,6 +252356,8 @@ self: {
        libraryHaskellDepends = [ array base containers ghc-prim ];
        description = "Graph representation of the GHC heap";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vacuum-cairo" = callPackage
@@ -236841,6 +252374,8 @@ self: {
        ];
        description = "Visualize live Haskell data structures using vacuum, graphviz and cairo";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vacuum-graphviz" = callPackage
@@ -236852,6 +252387,8 @@ self: {
        libraryHaskellDepends = [ base filepath graphviz vacuum ];
        description = "A library for transforming vacuum graphs into GraphViz output";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vacuum-opengl" = callPackage
@@ -236871,6 +252408,8 @@ self: {
        ];
        description = "Visualize live Haskell data structures using vacuum, graphviz and OpenGL";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vacuum-ubigraph" = callPackage
@@ -236882,6 +252421,8 @@ self: {
        libraryHaskellDepends = [ base containers hubigraph vacuum ];
        description = "Visualize Haskell data structures using vacuum and Ubigraph";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vado" = callPackage
@@ -236927,6 +252468,8 @@ self: {
        libraryHaskellDepends = [ base containers MonadRandom ];
        description = "Valid operator/module characters";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "validate" = callPackage
@@ -236957,6 +252500,8 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Input validation combinator library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "validated-literals" = callPackage
@@ -236988,6 +252533,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Type-level constraints on strings and other input";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "validation" = callPackage
@@ -237027,6 +252574,8 @@ self: {
        ];
        description = "A nice way to define field validations in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "validationt" = callPackage
@@ -237044,6 +252593,8 @@ self: {
        ];
        description = "Straightforward validation monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "validators" = callPackage
@@ -237224,6 +252775,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A library for generating values without having to thread state";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vampire" = callPackage
@@ -237246,6 +252799,8 @@ self: {
        ];
        description = "Analyze and visualize expression trees";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "var" = callPackage
@@ -237263,6 +252818,8 @@ self: {
        benchmarkHaskellDepends = [ array base criterion deepseq ];
        description = "Mutable variables and tuples";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "var-monad" = callPackage
@@ -237292,6 +252849,8 @@ self: {
        ];
        description = "Process mpileup output to identify significant differences";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "variable-precision" = callPackage
@@ -237308,6 +252867,8 @@ self: {
        ];
        description = "variable-precision floating point";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "variables" = callPackage
@@ -237320,6 +252881,8 @@ self: {
        testHaskellDepends = [ base hspec mtl QuickCheck stm ];
        description = "Monads with variables, without deep magic";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "variation" = callPackage
@@ -237334,6 +252897,8 @@ self: {
        ];
        description = "nominal value with possible variations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "varying" = callPackage
@@ -237408,6 +252973,8 @@ self: {
        ];
        description = "Utility library for spawning a HashiCorp Vault process";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vault-trans" = callPackage
@@ -237424,6 +252991,8 @@ self: {
        ];
        description = "A monad transformer for vault-tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vaultaire-common" = callPackage
@@ -237447,6 +253016,8 @@ self: {
        ];
        description = "Common types and instances for Vaultaire";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vcache" = callPackage
@@ -237463,6 +253034,8 @@ self: {
        ];
        description = "semi-transparent persistence for Haskell using LMDB, STM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vcache-trie" = callPackage
@@ -237478,6 +253051,8 @@ self: {
        ];
        description = "patricia tries modeled above VCache";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vcard" = callPackage
@@ -237491,6 +253066,8 @@ self: {
        ];
        description = "A library for parsing/printing vCards from/to various formats";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vcatt" = callPackage
@@ -237505,6 +253082,8 @@ self: {
        executableHaskellDepends = [ base shelly text ];
        description = "Recursively check that a directory is under version control";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vcd" = callPackage
@@ -237532,6 +253111,8 @@ self: {
        ];
        description = "A package to parse VCF files inspired in similar python libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vcs-revision" = callPackage
@@ -237577,6 +253158,8 @@ self: {
        ];
        description = "GUI library for source code management systems";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vcswrapper" = callPackage
@@ -237600,6 +253183,8 @@ self: {
        ];
        description = "Wrapper for source code management systems";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vec" = callPackage
@@ -237665,6 +253250,8 @@ self: {
        libraryHaskellDepends = [ base random ];
        description = "A low-dimensional linear algebra library, operating on the Floating typeclass";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vect-floating-accelerate" = callPackage
@@ -237678,6 +253265,8 @@ self: {
        libraryHaskellDepends = [ accelerate base vect-floating ];
        description = "Accelerate instances for vect-floating types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vect-opengl" = callPackage
@@ -237689,6 +253278,8 @@ self: {
        libraryHaskellDepends = [ base OpenGL vect ];
        description = "OpenGL support for the `vect' low-dimensional linear algebra library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector_0_10_9_3" = callPackage
@@ -237825,6 +253416,8 @@ self: {
        testHaskellDepends = [ base directory QuickCheck random ];
        description = "ByteStrings as type synonyms of Storable Vectors of Word8s";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-clock" = callPackage
@@ -237844,6 +253437,8 @@ self: {
        ];
        description = "Vector clocks for versioning message flows";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-conduit" = callPackage
@@ -237862,6 +253457,8 @@ self: {
        ];
        description = "Conduit utilities for vectors";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-endian" = callPackage
@@ -237876,6 +253473,8 @@ self: {
        doHaddock = false;
        description = "Storable vectors with cpu-independent representation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-extras" = callPackage
@@ -237906,6 +253505,8 @@ self: {
        librarySystemDepends = [ fftw ];
        description = "A binding to the fftw library for one-dimensional vectors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) fftw;};
 
   "vector-functorlazy" = callPackage
@@ -237920,6 +253521,8 @@ self: {
        ];
        description = "vectors that perform the fmap operation in constant time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-heterogenous" = callPackage
@@ -237931,6 +253534,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "A type-safe library for vectors whose elements can be of any type, or any type satisfying some constraints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-instances" = callPackage
@@ -237959,6 +253564,8 @@ self: {
        ];
        description = "Instances of the Data.Collections classes for Data.Vector.*";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-mmap" = callPackage
@@ -237986,6 +253593,8 @@ self: {
        libraryHaskellDepends = [ base mersenne-random-pure64 vector ];
        description = "Generate vectors filled with high quality pseudorandom numbers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-read-instances" = callPackage
@@ -237997,6 +253606,8 @@ self: {
        libraryHaskellDepends = [ base vector ];
        description = "(deprecated) Read instances for 'Data.Vector'";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-rotcev" = callPackage
@@ -238060,6 +253671,8 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "vector-space operations for finite maps using Data.Map";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-space-opengl" = callPackage
@@ -238077,6 +253690,8 @@ self: {
        ];
        description = "Instances of vector-space classes for OpenGL types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-space-points" = callPackage
@@ -238090,6 +253705,8 @@ self: {
        libraryHaskellDepends = [ base vector-space ];
        description = "A type for points, as distinct from vectors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-split" = callPackage
@@ -238117,6 +253734,8 @@ self: {
        libraryHaskellDepends = [ base primitive vector ];
        description = "Statically checked sizes on Data.Vector";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-strategies" = callPackage
@@ -238143,6 +253762,8 @@ self: {
        ];
        description = "Text implementation based on unboxed char vector";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vector-th-unbox" = callPackage
@@ -238182,6 +253803,8 @@ self: {
        ];
        description = "GIS Vector Tiles, as defined by Mapbox";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vega-view" = callPackage
@@ -238227,6 +253850,8 @@ self: {
        ];
        description = "ASCII platform-adventure game";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "verbalexpressions" = callPackage
@@ -238238,6 +253863,8 @@ self: {
        libraryHaskellDepends = [ base regex-pcre ];
        description = "Regular expressions made easy";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "verbosity" = callPackage
@@ -238288,6 +253915,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Validation framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "verdict-json" = callPackage
@@ -238308,6 +253937,8 @@ self: {
        ];
        description = "JSON instances and JSON Schema for verdict";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "verifiable-expressions" = callPackage
@@ -238323,6 +253954,8 @@ self: {
        ];
        description = "An intermediate language for Hoare logic style verification";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "verify" = callPackage
@@ -238345,6 +253978,8 @@ self: {
        ];
        description = "A new Haskeleton package";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "verilog" = callPackage
@@ -238357,6 +253992,8 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Verilog preprocessor, parser, and AST";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "verismith" = callPackage
@@ -238394,6 +254031,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion lens ];
        description = "Random verilog generation and simulator testing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "versioning" = callPackage
@@ -238406,6 +254045,8 @@ self: {
        testHaskellDepends = [ aeson base bytestring hspec ];
        description = "Type-safe data versioning";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "versioning-servant" = callPackage
@@ -238426,6 +254067,8 @@ self: {
        ];
        description = "Servant combinators for the versioning library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "versions" = callPackage
@@ -238464,6 +254107,8 @@ self: {
        ];
        description = "types for ingesting vflow data with aeson";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vformat" = callPackage
@@ -238541,6 +254186,8 @@ self: {
        ];
        description = "VFR waypoints, as published in the AIP (ERSA)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vgrep" = callPackage
@@ -238570,6 +254217,8 @@ self: {
        ];
        description = "A pager for grep";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vhd" = callPackage
@@ -238595,6 +254244,8 @@ self: {
        ];
        description = "Provides functions to inspect and manipulate virtual hard disk (VHD) files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vhdl" = callPackage
@@ -238606,6 +254257,8 @@ self: {
        libraryHaskellDepends = [ base mtl pretty regex-posix ];
        description = "VHDL AST and pretty printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vicinity" = callPackage
@@ -238621,6 +254274,8 @@ self: {
          base containers doctest QuickCheck quickcheck-classes
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "viewprof" = callPackage
@@ -238639,6 +254294,8 @@ self: {
        ];
        description = "Text-based interactive GHC .prof viewer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "views" = callPackage
@@ -238650,6 +254307,8 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Views allow you to run a State monad on part of a state";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vigilance" = callPackage
@@ -238690,6 +254349,8 @@ self: {
        ];
        description = "An extensible dead-man's switch system";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vimeta" = callPackage
@@ -238745,6 +254406,8 @@ self: {
        ];
        description = "An MPD client with vim-like key bindings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) ncurses;};
 
   "vintage-basic" = callPackage
@@ -238765,6 +254428,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Interpreter for microcomputer-era BASIC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vinyl" = callPackage
@@ -238777,6 +254442,8 @@ self: {
        pname = "vinyl";
        version = "0.12.1";
        sha256 = "0bwy1814762vy2din5i73h4d6mmf4hw71ix5c1mnnzmbmjnmbqc0";
+       revision = "1";
+       editedCabalFile = "0v5rhc9xxb1q8z1kj1y2c0zy5ijx044fggvvk1844hz2z93f5x83";
        libraryHaskellDepends = [ array base ghc-prim ];
        testHaskellDepends = [
          aeson base doctest hspec lens lens-aeson microlens mtl
@@ -238825,6 +254492,8 @@ self: {
        ];
        description = "Utilities for working with OpenGL's GLSL shading language and vinyl records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vinyl-json" = callPackage
@@ -238841,6 +254510,8 @@ self: {
        testHaskellDepends = [ base hlint ];
        description = "Provide json instances automagically to vinyl types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vinyl-named-sugar" = callPackage
@@ -238852,6 +254523,8 @@ self: {
        libraryHaskellDepends = [ base vinyl ];
        description = "Syntax sugar for vinyl records using overloaded labels";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vinyl-operational" = callPackage
@@ -238866,6 +254539,8 @@ self: {
        ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vinyl-plus" = callPackage
@@ -238885,6 +254560,8 @@ self: {
        testHaskellDepends = [ base doctest vinyl ];
        description = "Vinyl records utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vinyl-utils" = callPackage
@@ -238896,6 +254573,8 @@ self: {
        libraryHaskellDepends = [ base contravariant transformers vinyl ];
        description = "Utilities for vinyl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vinyl-vectors" = callPackage
@@ -238914,6 +254593,8 @@ self: {
        ];
        description = "Vectors for vinyl vectors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "virthualenv" = callPackage
@@ -238933,6 +254614,8 @@ self: {
        ];
        description = "Virtual Haskell Environment builder";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "visibility" = callPackage
@@ -238944,6 +254627,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Simple computation of visibility polygons";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vision" = callPackage
@@ -238965,6 +254650,8 @@ self: {
        ];
        description = "An XMMS2 client";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "visual-graphrewrite" = callPackage
@@ -238992,6 +254679,8 @@ self: {
        ];
        description = "Visualize the graph-rewrite steps of a Haskell program";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "visual-prof" = callPackage
@@ -239010,6 +254699,8 @@ self: {
        ];
        description = "Create a visual profile of a program's source code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "visualize-cbn" = callPackage
@@ -239029,6 +254720,8 @@ self: {
        ];
        description = "Visualize CBN reduction";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vivid" = callPackage
@@ -239048,6 +254741,8 @@ self: {
        ];
        description = "Sound synthesis with SuperCollider";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vivid-osc" = callPackage
@@ -239060,6 +254755,8 @@ self: {
        testHaskellDepends = [ base bytestring cereal microspec time ];
        description = "Open Sound Control encode/decode";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vivid-supercollider" = callPackage
@@ -239079,6 +254776,8 @@ self: {
        ];
        description = "Implementation of SuperCollider server specifications";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vk-aws-route53" = callPackage
@@ -239096,6 +254795,8 @@ self: {
        ];
        description = "Amazon Route53 DNS service plugin for the aws package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vk-posix-pty" = callPackage
@@ -239147,6 +254848,8 @@ self: {
        testHaskellDepends = [ aeson base hspec roundtrip-aeson ];
        description = "Upload audio files to voicebase to get a transcription";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "void" = callPackage
@@ -239172,6 +254875,8 @@ self: {
        ];
        description = "Reading of Vorbis comments from Ogg Vorbis files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vowpal-utils" = callPackage
@@ -239183,6 +254888,8 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Vowpal Wabbit utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "voyeur" = callPackage
@@ -239194,6 +254901,8 @@ self: {
        libraryHaskellDepends = [ base bytestring process utf8-string ];
        description = "Haskell bindings for libvoyeur";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vpq" = callPackage
@@ -239210,6 +254919,8 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Priority queue based on vector";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vrpn" = callPackage
@@ -239267,6 +254978,8 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) vte;};
 
   "vtegtk3" = callPackage
@@ -239284,6 +254997,8 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) vte;};
 
   "vty" = callPackage
@@ -239320,6 +255035,41 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vty_5_27" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
+     , deepseq, directory, filepath, hashable, HUnit, microlens
+     , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
+     , quickcheck-assertions, random, smallcheck, stm, string-qq
+     , terminfo, test-framework, test-framework-hunit
+     , test-framework-smallcheck, text, transformers, unix, utf8-string
+     , vector
+     }:
+     mkDerivation {
+       pname = "vty";
+       version = "5.27";
+       sha256 = "1iif1lcf59bypxlamla085bzrp3bl23jq2rcfzrjy6a3grywdgdl";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers deepseq directory filepath
+         hashable microlens microlens-mtl microlens-th mtl parallel parsec
+         stm terminfo text transformers unix utf8-string vector
+       ];
+       executableHaskellDepends = [
+         base containers microlens microlens-mtl mtl
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring Cabal containers deepseq HUnit
+         microlens microlens-mtl mtl QuickCheck quickcheck-assertions random
+         smallcheck stm string-qq terminfo test-framework
+         test-framework-hunit test-framework-smallcheck text unix
+         utf8-string vector
+       ];
+       description = "A simple terminal UI library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vty-examples" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck
@@ -239338,6 +255088,8 @@ self: {
        ];
        description = "Examples programs using the vty library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vty-menu" = callPackage
@@ -239351,6 +255103,8 @@ self: {
        libraryHaskellDepends = [ base vty ];
        description = "A lib for displaying a menu and getting a selection using VTY";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vty-ui" = callPackage
@@ -239372,6 +255126,8 @@ self: {
        executableHaskellDepends = [ base QuickCheck random text vty ];
        description = "An interactive terminal user interface library for Vty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vty-ui-extras" = callPackage
@@ -239383,6 +255139,8 @@ self: {
        libraryHaskellDepends = [ base regex-base regex-pcre vty vty-ui ];
        description = "Extra vty-ui functionality not included in the core library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "vulkan" = callPackage
@@ -239395,6 +255153,8 @@ self: {
        librarySystemDepends = [ vulkan ];
        description = "Bindings to the Vulkan graphics API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {vulkan = null;};
 
   "vulkan-api" = callPackage
@@ -239444,6 +255204,8 @@ self: {
        ];
        description = "JSON wrangling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wacom-daemon" = callPackage
@@ -239467,6 +255229,8 @@ self: {
        ];
        description = "Manage Wacom tablet settings profiles, including Intuos Pro ring modes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "waddle" = callPackage
@@ -239489,6 +255253,8 @@ self: {
        ];
        description = "DOOM WAD file utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wahsp" = callPackage
@@ -239509,6 +255275,8 @@ self: {
        ];
        description = "A haskell binding of the Web Audio API ala blank-canvas";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai" = callPackage
@@ -239628,6 +255396,8 @@ self: {
        ];
        description = "Command line runner for Wai apps (using Warp) with TLS, CGI, socket activation & graceful shutdown";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-conduit" = callPackage
@@ -239695,6 +255465,8 @@ self: {
        testHaskellDepends = [ base hspec stm ];
        description = "A web server for the development of WAI compliant web applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-digestive-functors" = callPackage
@@ -239760,35 +255532,6 @@ self: {
      }) {};
 
   "wai-extra" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
-     , bytestring, case-insensitive, containers, cookie
-     , data-default-class, deepseq, directory, fast-logger, hspec
-     , http-types, http2, HUnit, iproute, network, old-locale, resourcet
-     , streaming-commons, text, time, transformers, unix, unix-compat
-     , vault, void, wai, wai-logger, word8, zlib
-     }:
-     mkDerivation {
-       pname = "wai-extra";
-       version = "3.0.29";
-       sha256 = "1p0ngzz2p072v71dfylp90994qzz34lmbc7jqain2bm22616bs1f";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-terminal base base64-bytestring bytestring
-         case-insensitive containers cookie data-default-class deepseq
-         directory fast-logger http-types http2 iproute network old-locale
-         resourcet streaming-commons text time transformers unix unix-compat
-         vault void wai wai-logger word8 zlib
-       ];
-       testHaskellDepends = [
-         base bytestring case-insensitive cookie fast-logger hspec
-         http-types http2 HUnit resourcet text time transformers wai zlib
-       ];
-       description = "Provides some basic WAI handlers and middleware";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wai-extra_3_0_29_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
      , bytestring, case-insensitive, containers, cookie
      , data-default-class, deepseq, directory, fast-logger, hspec
@@ -239815,7 +255558,6 @@ self: {
        ];
        description = "Provides some basic WAI handlers and middleware";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-frontend-monadcgi" = callPackage
@@ -239855,6 +255597,8 @@ self: {
        ];
        description = "Git http-backend CGI App of WAI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-graceful" = callPackage
@@ -239866,6 +255610,8 @@ self: {
        libraryHaskellDepends = [ base http-types mtl resourcet unix wai ];
        description = "Graceful shutdown for WAI applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-handler-devel" = callPackage
@@ -239886,6 +255632,8 @@ self: {
        executableHaskellDepends = [ cmdargs ];
        description = "WAI server that automatically reloads code after modification. (deprecated)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-handler-fastcgi" = callPackage
@@ -239925,6 +255673,8 @@ self: {
        libraryHaskellDepends = [ base bytestring wai wai-extra ];
        description = "Wai handler to SCGI (deprecated)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-handler-snap" = callPackage
@@ -239941,6 +255691,8 @@ self: {
        ];
        description = "Web Application Interface handler using snap-server. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-handler-webkit" = callPackage
@@ -239953,6 +255705,8 @@ self: {
        libraryPkgconfigDepends = [ QtWebKit ];
        description = "Turn WAI applications into standalone GUIs using QtWebkit";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {QtWebKit = null;};
 
   "wai-hastache" = callPackage
@@ -239991,6 +255745,8 @@ self: {
        ];
        description = "hmac authentication tools for WAI apps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-http2-extra" = callPackage
@@ -240047,6 +255803,8 @@ self: {
        ];
        description = "Lenses for WAI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-lite" = callPackage
@@ -240062,6 +255820,8 @@ self: {
        ];
        description = "DEPCRECATED (use package \"simple\" instead) A minimalist web framework for WAI web applications";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-log" = callPackage
@@ -240117,6 +255877,8 @@ self: {
        ];
        description = "Buffer requets before logging them";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-logger-prefork" = callPackage
@@ -240133,6 +255895,8 @@ self: {
        ];
        description = "A logging system for preforked WAI apps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-make-assets" = callPackage
@@ -240162,6 +255926,8 @@ self: {
        ];
        description = "Compiling and serving assets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-auth" = callPackage
@@ -240197,6 +255963,8 @@ self: {
        ];
        description = "Authentication middleware that secures WAI application";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-brotli" = callPackage
@@ -240245,6 +256013,8 @@ self: {
        ];
        description = "Caching middleware for WAI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-cache-redis" = callPackage
@@ -240263,6 +256033,8 @@ self: {
        ];
        description = "Redis backend for wai-middleware-cache";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-caching" = callPackage
@@ -240325,6 +256097,8 @@ self: {
        ];
        description = "Wai error catching middleware";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-consul" = callPackage
@@ -240347,6 +256121,8 @@ self: {
        ];
        description = "Wai Middleware for Consul";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-content-type" = callPackage
@@ -240379,6 +256155,8 @@ self: {
        ];
        description = "Route to different middlewares based on the incoming Accept header";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-crowd" = callPackage
@@ -240410,6 +256188,8 @@ self: {
        ];
        description = "Middleware and utilities for using Atlassian Crowd authentication";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-delegate" = callPackage
@@ -240436,6 +256216,8 @@ self: {
        ];
        description = "WAI middleware that delegates handling of requests";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-etag" = callPackage
@@ -240453,6 +256235,8 @@ self: {
        ];
        description = "WAI ETag middleware for static files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-gunzip" = callPackage
@@ -240479,6 +256263,8 @@ self: {
        libraryHaskellDepends = [ base bytestring http-types wai ];
        description = "cors and addHeaders for WAI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-hmac" = callPackage
@@ -240521,6 +256307,8 @@ self: {
        ];
        description = "WAI HMAC Authentication Middleware Client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-json-errors" = callPackage
@@ -240561,6 +256349,8 @@ self: {
        ];
        description = "A WAI middleware to collect EKG request metrics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-preprocessor" = callPackage
@@ -240579,6 +256369,8 @@ self: {
        ];
        description = "WAI middleware for preprocessing static files";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-prometheus" = callPackage
@@ -240612,6 +256404,8 @@ self: {
        ];
        description = "Middleware that communicates to Rollbar";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-route" = callPackage
@@ -240632,6 +256426,8 @@ self: {
        ];
        description = "Wai dispatch middleware";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-slack-verify" = callPackage
@@ -240689,6 +256485,8 @@ self: {
        ];
        description = "WAI middleware that serves requests to static files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-static-embedded" = callPackage
@@ -240748,6 +256546,8 @@ self: {
        ];
        description = "WAI middleware for authenticating webhook payloads from Travis CI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-middleware-verbs" = callPackage
@@ -240808,6 +256608,8 @@ self: {
        ];
        description = "Declarative request parsing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-responsible" = callPackage
@@ -240819,6 +256621,8 @@ self: {
        libraryHaskellDepends = [ base bytestring http-types wai ];
        description = "Response interface for WAI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-route" = callPackage
@@ -240841,6 +256645,8 @@ self: {
        ];
        description = "WAI middleware for path-based request routing with captures";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-router" = callPackage
@@ -240852,6 +256658,8 @@ self: {
        libraryHaskellDepends = [ base text wai ];
        description = "Provides basic routing on URL paths for WAI";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-routes" = callPackage
@@ -240876,6 +256684,8 @@ self: {
        ];
        description = "Typesafe URLs for Wai applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-routing" = callPackage
@@ -240902,6 +256712,8 @@ self: {
        ];
        description = "Declarative routing for WAI";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-secure-cookies" = callPackage
@@ -240925,6 +256737,8 @@ self: {
          wai-extra
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-session" = callPackage
@@ -240959,6 +256773,8 @@ self: {
        ];
        description = "An alternative session middleware for WAI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-session-clientsession" = callPackage
@@ -240996,6 +256812,8 @@ self: {
        ];
        description = "MySQL backed Wai session store";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-session-postgresql" = callPackage
@@ -241017,6 +256835,8 @@ self: {
        ];
        description = "PostgreSQL backed Wai session store";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-session-tokyocabinet" = callPackage
@@ -241065,6 +256885,8 @@ self: {
        ];
        description = "A simple cache for serving static files in a WAI middleware";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-static-pages" = callPackage
@@ -241108,6 +256930,8 @@ self: {
        ];
        description = "Thrift transport layer for Wai";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-throttler" = callPackage
@@ -241123,6 +256947,8 @@ self: {
        ];
        description = "Wai middleware for request throttling";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wai-transformers" = callPackage
@@ -241202,6 +257028,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A wrapping library for waitfree computation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "waitra" = callPackage
@@ -241226,6 +257054,8 @@ self: {
        ];
        description = "A very simple Wai router";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "waldo" = callPackage
@@ -241258,6 +257088,8 @@ self: {
        ];
        description = "A generator of comics based on some ascertainable data about the requester";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wallpaper" = callPackage
@@ -241279,6 +257111,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "A library and executable for creating wallpaper, frieze, and rosette patterns";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "warc" = callPackage
@@ -241307,6 +257141,8 @@ self: {
        ];
        description = "A parser for the Web Archive (WARC) format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "warp" = callPackage
@@ -241356,6 +257192,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Dynamic configurable warp HTTP server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "warp-grpc" = callPackage
@@ -241392,6 +257230,8 @@ self: {
        ];
        description = "Static file server based on Warp and wai-app-static (deprecated)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "warp-systemd" = callPackage
@@ -241403,6 +257243,8 @@ self: {
        libraryHaskellDepends = [ base network systemd unix wai warp ];
        description = "Socket activation and other systemd integration for the Warp web server (WAI)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "warp-tls" = callPackage
@@ -241456,6 +257298,8 @@ self: {
        ];
        description = "Warp and Wai Library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wasm" = callPackage
@@ -241484,6 +257328,8 @@ self: {
        testToolDepends = [ alex happy ];
        description = "WebAssembly Language Toolkit and Interpreter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "watchdog" = callPackage
@@ -241497,6 +257343,8 @@ self: {
        libraryHaskellDepends = [ base mtl time ];
        description = "Simple control structure to re-try an action with exponential backoff";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "watcher" = callPackage
@@ -241513,6 +257361,8 @@ self: {
        ];
        description = "Opinionated filesystem watcher";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "watchit" = callPackage
@@ -241541,6 +257391,8 @@ self: {
        ];
        description = "File change watching utility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wavconvert" = callPackage
@@ -241607,6 +257459,8 @@ self: {
        testHaskellDepends = [ base hspec linear ];
        description = "Wavefront .obj file loader";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wavesurfer" = callPackage
@@ -241623,6 +257477,8 @@ self: {
        ];
        description = "Parse WaveSurfer files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wavy" = callPackage
@@ -241643,6 +257499,8 @@ self: {
        ];
        description = "Process WAVE files in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wcwidth" = callPackage
@@ -241667,6 +257525,8 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Mutable bag backed by weak pointers to each item";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "weather-api" = callPackage
@@ -241683,6 +257543,8 @@ self: {
        ];
        description = "Weather API implemented in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "web-browser-in-haskell" = callPackage
@@ -241706,6 +257568,8 @@ self: {
        libraryHaskellDepends = [ base text ];
        description = "Simple functions for CSS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "web-encodings" = callPackage
@@ -241723,6 +257587,8 @@ self: {
        ];
        description = "Encapsulate multiple web encoding in a single package. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "web-fpco" = callPackage
@@ -241738,6 +257604,8 @@ self: {
        ];
        description = "Wrappers for web frameworks to ease usage with the FP Complete environment";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "web-inv-route" = callPackage
@@ -241758,6 +257626,8 @@ self: {
        testHaskellDepends = [ base bytestring HUnit network-uri text ];
        description = "Composable, reversible, efficient web routing using invertible invariants and bijections";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "web-mongrel2" = callPackage
@@ -241776,6 +257646,8 @@ self: {
        ];
        description = "Bindings for the Mongrel2 web server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "web-output" = callPackage
@@ -241794,6 +257666,8 @@ self: {
        ];
        description = "Library to present content to an user via their browser";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "web-page" = callPackage
@@ -241813,6 +257687,8 @@ self: {
        ];
        description = "Monoidally construct web pages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "web-plugins" = callPackage
@@ -241846,6 +257722,8 @@ self: {
        ];
        description = "Send messages using Web Push protocol";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "web-rep" = callPackage
@@ -241878,6 +257756,8 @@ self: {
        ];
        description = "representations of a web page";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "web-routes" = callPackage
@@ -241970,6 +257850,8 @@ self: {
        libraryHaskellDepends = [ base path-pieces template-haskell text ];
        description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "web-routes-regular" = callPackage
@@ -241981,6 +257863,8 @@ self: {
        libraryHaskellDepends = [ base parsec regular text web-routes ];
        description = "portable, type-safe URL routing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "web-routes-th" = callPackage
@@ -242008,6 +257892,8 @@ self: {
        libraryHaskellDepends = [ base transformers web-routes ];
        description = "Extends web-routes with some transformers instances for RouteT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "web-routes-wai" = callPackage
@@ -242042,6 +257928,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "simple routing library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "web3" = callPackage
@@ -242075,6 +257963,8 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Ethereum API for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "webapi" = callPackage
@@ -242101,6 +257991,8 @@ self: {
        ];
        description = "WAI based library for web api";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "webapp" = callPackage
@@ -242123,6 +258015,8 @@ self: {
        ];
        description = "Haskell web app framework based on WAI & Warp";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "webby" = callPackage
@@ -242162,6 +258056,8 @@ self: {
        executableHaskellDepends = [ base optparse-applicative ];
        description = "Turn an optparse-applicative program into a CGI program!";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "webcrank" = callPackage
@@ -242189,6 +258085,8 @@ self: {
        ];
        description = "Webmachine inspired toolkit for building http applications and services";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "webcrank-dispatch" = callPackage
@@ -242204,6 +258102,8 @@ self: {
        ];
        description = "A simple request dispatcher";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "webcrank-wai" = callPackage
@@ -242221,6 +258121,8 @@ self: {
        ];
        description = "Build a WAI Application from Webcrank Resources";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "webdriver" = callPackage
@@ -242265,6 +258167,8 @@ self: {
        ];
        description = "Webdriver actions to assist with testing a webpage which uses Angular.Js";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "webdriver-snoy" = callPackage
@@ -242291,6 +258195,8 @@ self: {
        testHaskellDepends = [ base parallel text ];
        description = "a Haskell client for the Selenium WebDriver protocol (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "webdriver-w3c" = callPackage
@@ -242326,6 +258232,8 @@ self: {
        ];
        description = "Bindings to the WebDriver API";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "webex-teams-api" = callPackage
@@ -242422,6 +258330,8 @@ self: {
        ];
        description = "WebFinger client library";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "webidl" = callPackage
@@ -242463,6 +258373,8 @@ self: {
        ];
        description = "webfont generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "webkit" = callPackage
@@ -242496,6 +258408,8 @@ self: {
        libraryPkgconfigDepends = [ webkit ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {webkit = null;};
 
   "webkit2gtk3-javascriptcore" = callPackage
@@ -242586,6 +258500,8 @@ self: {
        ];
        description = "HTTP server library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "webshow" = callPackage
@@ -242605,6 +258521,8 @@ self: {
        ];
        description = "Show programming language printed values in a web UI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "websnap" = callPackage
@@ -242680,6 +258598,8 @@ self: {
        ];
        description = "Simple streaming RPC mechanism using WebSockets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "websockets-simple" = callPackage
@@ -242750,6 +258670,8 @@ self: {
        ];
        description = "Functional reactive web framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wedding-announcement" = callPackage
@@ -242857,6 +258779,8 @@ self: {
        libraryHaskellDepends = [ base mtl semiring-num transformers ];
        description = "Writer monad which uses semiring constraint";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "weighted-regexp" = callPackage
@@ -242871,6 +258795,8 @@ self: {
        libraryToolDepends = [ happy ];
        description = "Weighted Regular Expression Matcher";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "weighted-search" = callPackage
@@ -242901,6 +258827,8 @@ self: {
        ];
        description = "Haskell web framework (because Scotty had trouble yodeling)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wembley" = callPackage
@@ -242942,6 +258870,8 @@ self: {
        ];
        description = "A game engine for playing werewolf within an arbitrary chat client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "werewolf-slack" = callPackage
@@ -242961,6 +258891,8 @@ self: {
        ];
        description = "A chat interface for playing werewolf in Slack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wheb-mongo" = callPackage
@@ -242972,6 +258904,8 @@ self: {
        libraryHaskellDepends = [ base bson mongoDB mtl text Wheb ];
        description = "MongoDB plugin for Wheb";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wheb-redis" = callPackage
@@ -242983,6 +258917,8 @@ self: {
        libraryHaskellDepends = [ base bytestring hedis mtl text Wheb ];
        description = "Redis connection for Wheb";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wheb-strapped" = callPackage
@@ -242994,6 +258930,8 @@ self: {
        libraryHaskellDepends = [ base mtl StrappedTemplates text Wheb ];
        description = "Strapped templates for Wheb";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "which" = callPackage
@@ -243005,6 +258943,8 @@ self: {
        libraryHaskellDepends = [ base shelly template-haskell text ];
        description = "Determine the full path to an executable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "while-lang-parser" = callPackage
@@ -243016,6 +258956,8 @@ self: {
        libraryHaskellDepends = [ base indents parsec ];
        description = "Parser for the While language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "whim" = callPackage
@@ -243034,6 +258976,8 @@ self: {
        ];
        description = "A Haskell window manager";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "whiskers" = callPackage
@@ -243045,6 +258989,8 @@ self: {
        libraryHaskellDepends = [ base parsec template-haskell ];
        description = "Mustache templates with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "whitespace" = callPackage
@@ -243059,6 +259005,8 @@ self: {
        executableHaskellDepends = [ haskell98 random ];
        description = "Whitespace, an esoteric programming language";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "whois" = callPackage
@@ -243072,6 +259020,8 @@ self: {
        libraryHaskellDepends = [ base network network-uri split ];
        description = "WHOIS client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wholepixels" = callPackage
@@ -243088,6 +259038,8 @@ self: {
          random-fu random-shuffle random-source relude temporary time
        ];
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "why3" = callPackage
@@ -243106,6 +259058,8 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Haskell support for the Why3 input format";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wide-word" = callPackage
@@ -243189,6 +259143,8 @@ self: {
        ];
        description = "Wikipedia EPUB E-Book construction from Firefox history";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wild-bind" = callPackage
@@ -243223,6 +259179,8 @@ self: {
        ];
        description = "Graphical indicator for WildBind";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wild-bind-task-x11" = callPackage
@@ -243239,6 +259197,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Task to install and export everything you need to use WildBind in X11";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wild-bind-x11" = callPackage
@@ -243297,6 +259257,8 @@ self: {
        librarySystemDepends = [ dnsapi ];
        description = "Domain Name Service (DNS) lookup via the <windns.h>/dnsapi.dll standard library";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {dnsapi = null;};
 
   "windowslive" = callPackage
@@ -243314,6 +259276,8 @@ self: {
        ];
        description = "Implements Windows Live Web Authentication and Delegated Authentication";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "winerror" = callPackage
@@ -243325,6 +259289,8 @@ self: {
        doHaddock = false;
        description = "Error handling for foreign calls to the Windows API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "winery" = callPackage
@@ -243378,6 +259344,8 @@ self: {
        librarySystemDepends = [ kernel32 ws2_32 ];
        description = "I/O library for Windows";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {kernel32 = null; ws2_32 = null;};
 
   "wire-streams" = callPackage
@@ -243420,6 +259388,8 @@ self: {
        ];
        description = "Functional reactive programming library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wiring" = callPackage
@@ -243436,6 +259406,8 @@ self: {
        ];
        description = "Wiring, promotion and demotion of types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wiringPi" = callPackage
@@ -243549,6 +259521,8 @@ self: {
        executableHaskellDepends = [ base bytestring network unix ];
        description = "A network server to show bottlenecks of GHC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wizard" = callPackage
@@ -243593,6 +259567,8 @@ self: {
        ];
        description = "Parsec parsers and types for geographic data in well-known text (WKT) format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wkt-geom" = callPackage
@@ -243616,6 +259592,8 @@ self: {
        ];
        description = "A parser of WKT, WKB and eWKB";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wl-pprint" = callPackage
@@ -243659,6 +259637,8 @@ self: {
        ];
        description = "ANSI Terminal support with wl-pprint-extras";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wl-pprint-console" = callPackage
@@ -243693,6 +259673,8 @@ self: {
        ];
        description = "A free monad based on the Wadler/Leijen pretty printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wl-pprint-terminfo" = callPackage
@@ -243710,6 +259692,8 @@ self: {
        ];
        description = "A color pretty printer with terminfo support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wl-pprint-text" = callPackage
@@ -243739,6 +259723,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Haskell bindings for the wlc library";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {wlc = null;};
 
   "wobsurv" = callPackage
@@ -243774,6 +259760,8 @@ self: {
        ];
        description = "A simple and highly performant HTTP file server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "woe" = callPackage
@@ -243785,6 +259773,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Convenient typeclass for defining arbitrary-index enums";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "woffex" = callPackage
@@ -243800,6 +259790,8 @@ self: {
        ];
        description = "Web Open Font Format (WOFF) unpacker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wol" = callPackage
@@ -243814,6 +259806,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Send a Wake on LAN Magic Packet";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wolf" = callPackage
@@ -243836,6 +259830,8 @@ self: {
        executableHaskellDepends = [ base optparse-generic ];
        description = "Amazon Simple Workflow Service Wrapper";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "woot" = callPackage
@@ -243948,6 +259944,8 @@ self: {
        ];
        description = "Reading word2vec binary models";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "word8" = callPackage
@@ -244039,6 +260037,8 @@ self: {
          unordered-containers
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wordlist" = callPackage
@@ -244057,6 +260057,8 @@ self: {
        ];
        description = "Command-line tool to get random words";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wordpass" = callPackage
@@ -244079,6 +260081,8 @@ self: {
        ];
        description = "Dictionary-based password generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wordpress-auth" = callPackage
@@ -244123,6 +260127,8 @@ self: {
        executableHaskellDepends = [ base containers fclabels ];
        description = "A word search solver library and executable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wordsetdiff" = callPackage
@@ -244155,6 +260161,8 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "A library for parsing a chat-based work hour reporting scheme";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "workdays" = callPackage
@@ -244167,6 +260175,8 @@ self: {
        testHaskellDepends = [ base containers doctest hspec ];
        description = "Workday calculations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "workflow-extra" = callPackage
@@ -244189,6 +260199,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Utilities (e.g. Googling the clipboard contents) for the `workflow` pacakge";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "workflow-osx" = callPackage
@@ -244208,6 +260220,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "a \"Desktop Workflow\" monad with Objective-C bindings";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "workflow-pure" = callPackage
@@ -244230,6 +260244,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "manipulate `workflow-types:Workflow`'s";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "workflow-types" = callPackage
@@ -244248,6 +260264,8 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Automate keyboard\\/mouse\\/clipboard\\/application interaction";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "workflow-windows" = callPackage
@@ -244262,6 +260280,8 @@ self: {
        testHaskellDepends = [ base doctest hspec QuickCheck ];
        description = "Automate keyboard/mouse/clipboard/application interaction";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "world-peace" = callPackage
@@ -244293,6 +260313,8 @@ self: {
        ];
        description = "Subscribe to a wiki's RSS feed and archive external links";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wrap" = callPackage
@@ -244335,6 +260357,8 @@ self: {
        ];
        description = "Lazy wrapper to HaXML, HXT, TagSoup via custom XML tree structure";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wrecker" = callPackage
@@ -244375,6 +260399,8 @@ self: {
        ];
        description = "An HTTP Performance Benchmarker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wrecker-ui" = callPackage
@@ -244407,6 +260433,8 @@ self: {
        ];
        description = "A web interface for Wrecker, the HTTP Performance Benchmarker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wreq" = callPackage
@@ -244484,6 +260512,8 @@ self: {
        ];
        description = "An easy-to-use HTTP client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wreq-stringless" = callPackage
@@ -244512,6 +260542,8 @@ self: {
        ];
        description = "Colour space transformations and metrics";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "write-buffer-core" = callPackage
@@ -244572,6 +260604,8 @@ self: {
        ];
        description = "WriteT and RWST monad transformers (Reexport with all dependencies)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "writer-cps-lens" = callPackage
@@ -244588,6 +260622,8 @@ self: {
        ];
        description = "Lens instances for the stricter CPS WriterT and RWST";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "writer-cps-monads-tf" = callPackage
@@ -244603,6 +260639,8 @@ self: {
        ];
        description = "MonadWriter orphan instances for writer-cps-transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "writer-cps-morph" = callPackage
@@ -244616,6 +260654,8 @@ self: {
        libraryHaskellDepends = [ base mmorph writer-cps-transformers ];
        description = "MFunctor instance for CPS style WriterT and RWST";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "writer-cps-mtl" = callPackage
@@ -244678,6 +260718,8 @@ self: {
        ];
        description = "A simple CLI utility for interacting with a websocket";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ws-chans" = callPackage
@@ -244719,6 +260761,8 @@ self: {
        ];
        description = "WSDL parsing in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wsedit" = callPackage
@@ -244736,6 +260780,8 @@ self: {
        ];
        description = "A small tool to list, add and remove webseeds from a torrent file";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wshterm" = callPackage
@@ -244755,6 +260801,8 @@ self: {
        ];
        description = "Terminal emulator over websockets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wsjtx-udp" = callPackage
@@ -244791,6 +260839,8 @@ self: {
        testHaskellDepends = [ base bytestring envy hspec skews text ];
        description = "A-little-higher-level WebSocket client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wtk" = callPackage
@@ -244802,6 +260852,8 @@ self: {
        libraryHaskellDepends = [ base old-locale time transformers ];
        description = "Wojcik Tool Kit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wtk-gtk" = callPackage
@@ -244817,6 +260869,8 @@ self: {
        ];
        description = "GTK tools within Wojcik Tool Kit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wu-wei" = callPackage
@@ -244832,6 +260886,8 @@ self: {
        ];
        description = "Unimportant Unix adminstration tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wumpus-basic" = callPackage
@@ -244847,6 +260903,8 @@ self: {
        ];
        description = "Basic objects and system code built on Wumpus-Core";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wumpus-core" = callPackage
@@ -244860,6 +260918,8 @@ self: {
        libraryHaskellDepends = [ base containers time vector-space ];
        description = "Pure Haskell PostScript and SVG generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wumpus-drawing" = callPackage
@@ -244875,6 +260935,8 @@ self: {
        ];
        description = "High-level drawing objects built on Wumpus-Basic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wumpus-microprint" = callPackage
@@ -244890,6 +260952,8 @@ self: {
        ];
        description = "Microprints - \"greek-text\" pictures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wumpus-tree" = callPackage
@@ -244906,6 +260970,8 @@ self: {
        ];
        description = "Drawing trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wuss" = callPackage
@@ -244947,6 +261013,8 @@ self: {
        executableHaskellDepends = [ base directory random wx wxcore ];
        description = "Try to avoid the asteroids with your space ship";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wxFruit" = callPackage
@@ -244961,6 +261029,8 @@ self: {
        executableHaskellDepends = [ base wx wxcore Yampa ];
        description = "An implementation of Fruit using wxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wxSimpleCanvas" = callPackage
@@ -244972,6 +261042,8 @@ self: {
        libraryHaskellDepends = [ base cubicbezier wx wxcore ];
        description = "Simple zoomable canvas for wxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wxc" = callPackage
@@ -245034,6 +261106,8 @@ self: {
        ];
        description = "helper tool for building wxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wxhnotepad" = callPackage
@@ -245048,6 +261122,8 @@ self: {
        executableHaskellDepends = [ base wx wxcore ];
        description = "An example of how to implement a basic notepad with wxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wxturtle" = callPackage
@@ -245063,6 +261139,8 @@ self: {
        ];
        description = "turtle like LOGO with wxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "wybor" = callPackage
@@ -245102,6 +261180,8 @@ self: {
        ];
        description = "An autoresponder for Dragon Go Server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "x-dsp" = callPackage
@@ -245118,6 +261198,8 @@ self: {
        ];
        description = "A embedded DSL for manipulating DSP languages in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "x11-xim" = callPackage
@@ -245262,6 +261344,8 @@ self: {
        ];
        description = "Runtime code generation for x86 64 bit machine code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xattr" = callPackage
@@ -245352,6 +261436,8 @@ self: {
        ];
        description = "XChat";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xcp" = callPackage
@@ -245367,6 +261453,8 @@ self: {
        ];
        description = "Partial implementation of the XCP protocol with ethernet as transport layer";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xdcc" = callPackage
@@ -245392,6 +261480,8 @@ self: {
        ];
        description = "A wget-like utility for retrieving files from XDCC bots on IRC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xdg-basedir" = callPackage
@@ -245419,6 +261509,8 @@ self: {
        ];
        description = "Parse files conforming to the xdg desktop entry spec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xdg-userdirs" = callPackage
@@ -245453,6 +261545,8 @@ self: {
        ];
        description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xeno" = callPackage
@@ -245486,6 +261580,8 @@ self: {
        libraryHaskellDepends = [ base bytestring cereal mtl network ];
        description = "Xenstore client access";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xfconf" = callPackage
@@ -245506,6 +261602,8 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "FFI bindings to xfconf";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {libxfconf = null;};
 
   "xformat" = callPackage
@@ -245518,6 +261616,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Extensible, type-safe formatting with scanf- and printf-like functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xgboost-haskell" = callPackage
@@ -245548,6 +261648,8 @@ self: {
        ];
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xhb" = callPackage
@@ -245564,6 +261666,8 @@ self: {
        ];
        description = "X Haskell Bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xhb-atom-cache" = callPackage
@@ -245579,6 +261683,8 @@ self: {
        ];
        description = "Atom cache for XHB";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xhb-ewmh" = callPackage
@@ -245595,6 +261701,8 @@ self: {
        ];
        description = "EWMH utilities for XHB";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xhtml_3000_2_2_1" = callPackage
@@ -245637,6 +261745,8 @@ self: {
        executableHaskellDepends = [ base directory process ];
        description = "The Lava system for Xilinx FPGA design with layout combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xine" = callPackage
@@ -245651,6 +261761,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to xine-lib";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {libxine = null; xine = null;};
 
   "xing-api" = callPackage
@@ -245674,6 +261786,8 @@ self: {
        ];
        description = "Wrapper for the XING API, v1";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xinput-conduit" = callPackage
@@ -245713,6 +261827,8 @@ self: {
        benchmarkHaskellDepends = [ base random time vector ];
        description = "Haskell bindings for libxkbcommon";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libxkbcommon;};
 
   "xkcd" = callPackage
@@ -245732,6 +261848,8 @@ self: {
        ];
        description = "Downloads the most recent xkcd comic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xleb" = callPackage
@@ -245747,6 +261865,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl xml ];
        description = "A simple monadic language for parsing XML structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xls" = callPackage
@@ -245768,6 +261888,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Parse Microsoft Excel xls files (BIFF/Excel 97-2004)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xlsior" = callPackage
@@ -245791,6 +261913,8 @@ self: {
        ];
        description = "Streaming Excel file generation and parsing";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xlsx" = callPackage
@@ -245819,6 +261943,8 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Simple and incomplete Excel file parser/writer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xlsx-tabular" = callPackage
@@ -245835,6 +261961,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Xlsx table cell value extraction utility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xlsx-templater" = callPackage
@@ -245853,6 +261981,8 @@ self: {
        ];
        description = "Simple and incomplete Excel file templater";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml" = callPackage
@@ -245898,6 +262028,8 @@ self: {
        ];
        description = "Parse XML catalog files (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-conduit_1_7_1_2" = callPackage
@@ -245988,6 +262120,8 @@ self: {
        ];
        description = "Historical cursors & decoding on top of xml-conduit";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-conduit-parse" = callPackage
@@ -246028,6 +262162,8 @@ self: {
        ];
        description = "Bridge between xml-conduit/html-conduit and stylist";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-conduit-writer" = callPackage
@@ -246067,6 +262203,8 @@ self: {
        ];
        description = "Pure-Haskell utilities for dealing with XML with the enumerator package. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-enumerator-combinators" = callPackage
@@ -246084,6 +262222,8 @@ self: {
        ];
        description = "Parser combinators for xml-enumerator and compatible XML parsers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-extractors" = callPackage
@@ -246095,6 +262235,8 @@ self: {
        libraryHaskellDepends = [ base mtl transformers xml ];
        description = "Extension to the xml package to extract data from parsed xml";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-hamlet" = callPackage
@@ -246144,6 +262286,8 @@ self: {
        ];
        description = "Optics for xml-conduit and html-conduit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-html-qq" = callPackage
@@ -246239,6 +262383,8 @@ self: {
        ];
        description = "Monadic extensions to the xml package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-parsec" = callPackage
@@ -246250,6 +262396,8 @@ self: {
        libraryHaskellDepends = [ base HaXml parsec ];
        description = "Parsing XML with Parsec";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-picklers" = callPackage
@@ -246278,6 +262426,8 @@ self: {
        libraryHaskellDepends = [ base bytestring papillon simple-pipe ];
        description = "XML parser which uses simple-pipe";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-prettify" = callPackage
@@ -246292,6 +262442,8 @@ self: {
        executableHaskellDepends = [ base cmdargs unix ];
        description = "Pretty print XML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-push" = callPackage
@@ -246312,6 +262464,8 @@ self: {
        ];
        description = "Push XML from/to client to/from server over XMPP or HTTP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-query" = callPackage
@@ -246323,6 +262477,8 @@ self: {
        libraryHaskellDepends = [ base-prelude free text ];
        description = "A parser-agnostic declarative API for querying XML-documents";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-query-xml-conduit" = callPackage
@@ -246339,6 +262495,8 @@ self: {
        ];
        description = "A binding for the \"xml-query\" and \"xml-conduit\" libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-query-xml-types" = callPackage
@@ -246362,6 +262520,8 @@ self: {
        ];
        description = "An interpreter of \"xml-query\" queries for the \"xml-types\" documents";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-to-json" = callPackage
@@ -246418,6 +262578,8 @@ self: {
        ];
        description = "Typed XML encoding for an xml-conduit backend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-tydom-core" = callPackage
@@ -246429,6 +262591,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl QuickCheck text ];
        description = "Typed XML encoding (core library)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml-types" = callPackage
@@ -246480,6 +262644,8 @@ self: {
        ];
        description = "translate xml to json";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xml2x" = callPackage
@@ -246498,6 +262664,8 @@ self: {
        ];
        description = "Convert BLAST output in XML format to CSV or HTML";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xmlbf" = callPackage
@@ -246519,6 +262687,8 @@ self: {
        ];
        description = "XML back and forth! Parser, renderer, ToXml, FromXml, fixpoints";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xmlbf-xeno" = callPackage
@@ -246539,6 +262709,8 @@ self: {
        ];
        description = "xeno backend support for the xmlbf library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xmlbf-xmlhtml" = callPackage
@@ -246560,6 +262732,8 @@ self: {
        ];
        description = "xmlhtml backend support for the xmlbf library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xmlgen" = callPackage
@@ -246629,6 +262803,8 @@ self: {
        ];
        description = "Show tv channels in the terminal";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xmms2-client" = callPackage
@@ -246645,6 +262821,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An XMMS2 client library";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xmms2-client-glib" = callPackage
@@ -246657,6 +262835,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An XMMS2 client library — GLib integration";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xmobar" = callPackage
@@ -246749,6 +262929,8 @@ self: {
        ];
        description = "A tiling window manager";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xmonad-contrib" = callPackage
@@ -246787,6 +262969,8 @@ self: {
        ];
        description = "Third party extensions for xmonad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xmonad-contrib-gpl" = callPackage
@@ -246798,6 +262982,8 @@ self: {
        libraryHaskellDepends = [ base mtl xmonad xmonad-contrib ];
        description = "Third party extensions for xmonad";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xmonad-entryhelper" = callPackage
@@ -246830,6 +263016,8 @@ self: {
        ];
        description = "Module for evaluation Haskell expressions in the running xmonad instance";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xmonad-extras" = callPackage
@@ -246907,6 +263095,8 @@ self: {
        testHaskellDepends = [ base hspec xmonad ];
        description = "Custom xmonad, which builds with stack or cabal";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xmonad-volume" = callPackage
@@ -246952,6 +263142,8 @@ self: {
        ];
        description = "A library to automatically put named windows into the DynamicLog";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xmpipe" = callPackage
@@ -246968,6 +263160,8 @@ self: {
        ];
        description = "XMPP implementation using simple-PIPE";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xorshift" = callPackage
@@ -246997,6 +263191,8 @@ self: {
        ];
        description = "Simple implementation of xorshift+ PRNG";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xosd" = callPackage
@@ -247026,6 +263222,8 @@ self: {
        ];
        description = "text builder for xournal file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xournal-convert" = callPackage
@@ -247047,6 +263245,8 @@ self: {
        executableHaskellDepends = [ base cmdargs ];
        description = "convert utility for xoj files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xournal-parser" = callPackage
@@ -247066,6 +263266,8 @@ self: {
        ];
        description = "Xournal file parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xournal-render" = callPackage
@@ -247083,6 +263285,8 @@ self: {
        ];
        description = "Xournal file renderer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xournal-types" = callPackage
@@ -247100,6 +263304,8 @@ self: {
        ];
        description = "Data types for programs for xournal file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xpathdsv" = callPackage
@@ -247180,6 +263386,8 @@ self: {
        ];
        description = "Cluster EST sequences";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xsd" = callPackage
@@ -247196,6 +263404,8 @@ self: {
        ];
        description = "XML Schema data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xsha1" = callPackage
@@ -247219,6 +263429,8 @@ self: {
        librarySystemDepends = [ xslt ];
        description = "Binding to libxslt";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {xslt = null;};
 
   "xss-sanitize" = callPackage
@@ -247251,6 +263463,8 @@ self: {
        libraryHaskellDepends = [ base wx wxcore ];
        description = "eXtended & Typed Controls for wxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xtest" = callPackage
@@ -247295,6 +263509,8 @@ self: {
        ];
        description = "A Haskell implementation of the xxHash algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "xxhash-ffi" = callPackage
@@ -247331,6 +263547,8 @@ self: {
        ];
        description = "#plaimi's all-encompassing bot";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yabi" = callPackage
@@ -247364,6 +263582,8 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec ];
        description = "Yet Another Brainfuck Interpreter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yackage" = callPackage
@@ -247387,6 +263607,8 @@ self: {
        ];
        description = "Personal Hackage replacement for testing new packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yahoo-finance-api" = callPackage
@@ -247408,6 +263630,8 @@ self: {
        ];
        description = "Read quotes from Yahoo Finance API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yahoo-finance-conduit" = callPackage
@@ -247423,6 +263647,8 @@ self: {
        ];
        description = "Streaming aproach to the yahoo finance api";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yahoo-web-search" = callPackage
@@ -247434,6 +263660,8 @@ self: {
        libraryHaskellDepends = [ base HTTP network xml ];
        description = "Yahoo Web Search Services";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yajl" = callPackage
@@ -247447,6 +263675,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings for YAJL, an event-based JSON implementation";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) yajl;};
 
   "yajl-enumerator" = callPackage
@@ -247462,6 +263692,8 @@ self: {
        ];
        description = "Enumerator-based interface to YAJL, an event-based JSON implementation";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yak" = callPackage
@@ -247489,6 +263721,8 @@ self: {
        libraryHaskellDepends = [ base categories transformers ];
        description = "Lenses with a southern twang";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yam" = callPackage
@@ -247522,6 +263756,8 @@ self: {
        ];
        description = "A wrapper of servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yam-app" = callPackage
@@ -247561,6 +263797,8 @@ self: {
        ];
        description = "Yam Configuation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yam-datasource" = callPackage
@@ -247578,6 +263816,8 @@ self: {
        ];
        description = "Yam DataSource Middleware";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yam-job" = callPackage
@@ -247603,6 +263843,8 @@ self: {
        ];
        description = "Yam Logger";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yam-redis" = callPackage
@@ -247619,6 +263861,8 @@ self: {
        ];
        description = "Yam Redis Middleware";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yam-servant" = callPackage
@@ -247635,6 +263879,8 @@ self: {
          servant-swagger-ui swagger2 text wai wai-extra warp yam-app yam-job
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yam-transaction" = callPackage
@@ -247655,6 +263901,8 @@ self: {
        ];
        description = "Yam transaction";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yam-transaction-odbc" = callPackage
@@ -247667,6 +263915,8 @@ self: {
          base containers persistent-odbc yam-app
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yam-transaction-postgresql" = callPackage
@@ -247681,6 +263931,8 @@ self: {
          base containers persistent-postgresql unliftio-core yam-app
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yam-web" = callPackage
@@ -247710,6 +263962,8 @@ self: {
        ];
        description = "Yam Web";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yamemo" = callPackage
@@ -247829,6 +264083,8 @@ self: {
        testHaskellDepends = [ base hspec microlens-platform rio ];
        description = "Extra functionality for pretty printing Yaml documents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yaml-rpc" = callPackage
@@ -247847,6 +264103,8 @@ self: {
        ];
        description = "Simple library for network (HTTP REST-like) YAML RPC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yaml-rpc-scotty" = callPackage
@@ -247863,6 +264121,8 @@ self: {
        ];
        description = "Scotty server backend for yaml-rpc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yaml-rpc-snap" = callPackage
@@ -247879,6 +264139,8 @@ self: {
        ];
        description = "Snap server backend for yaml-rpc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yaml-union" = callPackage
@@ -247957,6 +264219,8 @@ self: {
        libraryHaskellDepends = [ base blank-canvas stm time Yampa ];
        description = "blank-canvas frontend for Yampa";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yampa-glfw" = callPackage
@@ -247974,6 +264238,8 @@ self: {
        ];
        description = "Connects GLFW-b (GLFW 3+) with the Yampa FRP library";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yampa-gloss" = callPackage
@@ -247987,6 +264253,8 @@ self: {
        libraryHaskellDepends = [ base gloss Yampa ];
        description = "A GLOSS backend for Yampa";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yampa-glut" = callPackage
@@ -248004,6 +264272,8 @@ self: {
        ];
        description = "Connects Yampa and GLUT";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yampa-sdl2" = callPackage
@@ -248022,6 +264292,8 @@ self: {
        ];
        description = "Yampa and SDL2 made easy";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yampa-test" = callPackage
@@ -248040,6 +264312,8 @@ self: {
        ];
        description = "Testing library for Yampa";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yampa2048" = callPackage
@@ -248053,6 +264327,8 @@ self: {
        executableHaskellDepends = [ base gloss random Yampa ];
        description = "2048 game clone using Yampa/Gloss";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yandex-translate" = callPackage
@@ -248070,6 +264346,8 @@ self: {
        ];
        description = "Bindings to Yandex translate API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yaop" = callPackage
@@ -248083,6 +264361,8 @@ self: {
        libraryHaskellDepends = [ base mtl template-haskell ];
        description = "Yet another option parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yap" = callPackage
@@ -248094,6 +264374,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "yet another prelude - a simplistic refactoring with algebraic classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yarn-lock" = callPackage
@@ -248168,6 +264450,8 @@ self: {
        ];
        description = "Yet another array library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yarr-image-io" = callPackage
@@ -248180,6 +264464,8 @@ self: {
        librarySystemDepends = [ libdevil ];
        description = "Image IO for Yarr library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libdevil;};
 
   "yate" = callPackage
@@ -248218,6 +264504,8 @@ self: {
        executableHaskellDepends = [ base Cabal directory process ];
        description = "yet another visual editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yaya" = callPackage
@@ -248276,6 +264564,8 @@ self: {
        ];
        description = "Additional utilities to work with Yhc Core";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yeamer" = callPackage
@@ -248311,6 +264601,8 @@ self: {
        ];
        description = "Yesod-based server for interactive presentation slides";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yeganesh" = callPackage
@@ -248354,6 +264646,8 @@ self: {
        ];
        description = "A Yeller Client For Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yes-precure5-command" = callPackage
@@ -248386,6 +264680,8 @@ self: {
        libraryHaskellDepends = [ base yeshql-core yeshql-hdbc ];
        description = "YesQL-style SQL database abstraction (legacy compatibility wrapper)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yeshql-core" = callPackage
@@ -248404,6 +264700,8 @@ self: {
        ];
        description = "YesQL-style SQL database abstraction (core)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yeshql-hdbc" = callPackage
@@ -248424,6 +264722,8 @@ self: {
        ];
        description = "YesQL-style SQL database abstraction (HDBC backend)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yeshql-postgresql-simple" = callPackage
@@ -248445,6 +264745,8 @@ self: {
        ];
        description = "YesQL-style SQL database abstraction (postgresql-simple backend)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod_1_4_5" = callPackage
@@ -248521,6 +264823,8 @@ self: {
        ];
        description = "Angular JS integratoin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-angular-ui" = callPackage
@@ -248540,6 +264844,8 @@ self: {
        ];
        description = "Angular Helpers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-articles" = callPackage
@@ -248562,6 +264868,8 @@ self: {
        ];
        description = "Automatically generate article previews for a yesod site";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth" = callPackage
@@ -248612,6 +264920,8 @@ self: {
        ];
        description = "An account authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-account-fork" = callPackage
@@ -248636,6 +264946,8 @@ self: {
        ];
        description = "An account authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-basic" = callPackage
@@ -248652,6 +264964,8 @@ self: {
        testHaskellDepends = [ base hlint hspec text yesod yesod-test ];
        description = "Yesod Middleware for HTTP Basic Authentication";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-bcrypt" = callPackage
@@ -248668,6 +264982,8 @@ self: {
        ];
        description = "BCrypt salted and hashed passwords in a database as auth for yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-bcryptdb" = callPackage
@@ -248684,6 +265000,8 @@ self: {
        ];
        description = "Authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-deskcom" = callPackage
@@ -248705,6 +265023,8 @@ self: {
        ];
        description = "Desk.com remote authentication support for Yesod apps.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-fb" = callPackage
@@ -248722,6 +265042,8 @@ self: {
        ];
        description = "Authentication backend for Yesod using Facebook";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-hashdb" = callPackage
@@ -248765,6 +265087,8 @@ self: {
        ];
        description = "An account authentication plugin for yesod with encrypted token transfer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-kerberos" = callPackage
@@ -248782,6 +265106,8 @@ self: {
        ];
        description = "Kerberos Authentication for Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-ldap" = callPackage
@@ -248798,6 +265124,8 @@ self: {
        ];
        description = "LDAP Authentication for Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-ldap-mediocre" = callPackage
@@ -248813,6 +265141,8 @@ self: {
        ];
        description = "Very simlple LDAP auth for yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-ldap-native" = callPackage
@@ -248830,6 +265160,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Yesod LDAP authentication plugin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-nopassword" = callPackage
@@ -248846,6 +265178,8 @@ self: {
        ];
        description = "A plugin for Yesod to provide email-only authentication";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-oauth" = callPackage
@@ -248883,6 +265217,8 @@ self: {
        testHaskellDepends = [ base hspec uri-bytestring ];
        description = "OAuth 2.0 authentication plugins";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-pam" = callPackage
@@ -248898,6 +265234,8 @@ self: {
        ];
        description = "Provides PAM authentication module";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-smbclient" = callPackage
@@ -248914,6 +265252,8 @@ self: {
        ];
        description = "Authentication plugin for Yesod using smbclient";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-auth-zendesk" = callPackage
@@ -248932,6 +265272,8 @@ self: {
        ];
        description = "Zendesk remote authentication support for Yesod apps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-bin" = callPackage
@@ -248975,6 +265317,8 @@ self: {
        ];
        description = "Bootstrap widgets for yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-colonnade" = callPackage
@@ -248993,6 +265337,8 @@ self: {
        ];
        description = "Helper functions for using yesod with colonnade";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-comments" = callPackage
@@ -249011,6 +265357,8 @@ self: {
        ];
        description = "A generic comments interface for a Yesod application";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-content-pdf" = callPackage
@@ -249032,6 +265380,8 @@ self: {
        ];
        description = "PDF Content Type for Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-continuations" = callPackage
@@ -249050,6 +265400,8 @@ self: {
        ];
        description = "Continuations for Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-core_1_4_37_3" = callPackage
@@ -249149,6 +265501,8 @@ self: {
        ];
        description = "Generic administrative CRUD operations as a Yesod subsite";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-crud-persist" = callPackage
@@ -249167,6 +265521,8 @@ self: {
        ];
        description = "Flexible CRUD subsite usable with Yesod and Persistent";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-csp" = callPackage
@@ -249214,6 +265570,8 @@ self: {
        ];
        description = "Yesod plugin for DataTables (jQuery grid plugin)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-default" = callPackage
@@ -249251,6 +265609,8 @@ self: {
        ];
        description = "DSL for generating Yesod subsite to manage an RDBMS;";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-elements" = callPackage
@@ -249303,6 +265663,8 @@ self: {
        executableSystemDepends = [ sqlite ];
        description = "Example programs using the Yesod Web Framework. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) sqlite;};
 
   "yesod-fast-devel" = callPackage
@@ -249324,6 +265686,8 @@ self: {
        ];
        description = "Fast live-reloading for yesod applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-fay" = callPackage
@@ -249343,6 +265707,8 @@ self: {
        ];
        description = "Utilities for using the Fay Haskell-to-JS compiler with Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-fb" = callPackage
@@ -249359,6 +265725,8 @@ self: {
        ];
        description = "Useful glue functions between the fb library and Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-form_1_4_16" = callPackage
@@ -249491,6 +265859,8 @@ self: {
        ];
        description = "Various rich-text WYSIWYG editors for Yesod forms";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-gitrepo" = callPackage
@@ -249522,6 +265892,8 @@ self: {
        testHaskellDepends = [ base yesod-core ];
        description = "A subsite for displaying git information";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-goodies" = callPackage
@@ -249538,6 +265910,8 @@ self: {
        ];
        description = "A collection of various small helpers useful in any yesod application";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-ip" = callPackage
@@ -249556,6 +265930,8 @@ self: {
        ];
        description = "Code for using the ip package with yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-job-queue" = callPackage
@@ -249577,6 +265953,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Background jobs library for Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-json" = callPackage
@@ -249599,6 +265977,8 @@ self: {
        libraryHaskellDepends = [ base text yesod-core ];
        description = "A typeclass which simplifies creating link widgets throughout your site";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-lucid" = callPackage
@@ -249610,6 +265990,8 @@ self: {
        libraryHaskellDepends = [ base lucid monads-tf text yesod-core ];
        description = "Lucid support for Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-mangopay" = callPackage
@@ -249629,6 +266011,8 @@ self: {
        ];
        description = "Yesod library for MangoPay API access";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-markdown" = callPackage
@@ -249647,6 +266031,8 @@ self: {
        testHaskellDepends = [ base blaze-html hspec text ];
        description = "Tools for using markdown in a yesod application";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-media-simple" = callPackage
@@ -249690,6 +266076,8 @@ self: {
        libraryHaskellDepends = [ base template-haskell yesod ];
        description = "Pagination for Yesod sites";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-pagination" = callPackage
@@ -249708,6 +266096,8 @@ self: {
        ];
        description = "Pagination in Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-paginator" = callPackage
@@ -249744,6 +266134,8 @@ self: {
        ];
        description = "Yesod plugin to use PayPal with the paypal-rest-client library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-persistent_1_4_3" = callPackage
@@ -249856,6 +266248,8 @@ self: {
        ];
        description = "Meta package for Yesod (deprecated)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-pnotify" = callPackage
@@ -249876,6 +266270,8 @@ self: {
        ];
        description = "Yet another getMessage/setMessage using pnotify jquery plugins";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-pure" = callPackage
@@ -249887,6 +266283,8 @@ self: {
        libraryHaskellDepends = [ base fast-logger text yesod yesod-core ];
        description = "Yesod in pure Haskell: no Template Haskell or QuasiQuotes (deprecated)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-purescript" = callPackage
@@ -249906,6 +266304,8 @@ self: {
        ];
        description = "PureScript integration for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-raml" = callPackage
@@ -249929,6 +266329,8 @@ self: {
        ];
        description = "RAML style route definitions for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-raml-bin" = callPackage
@@ -249951,6 +266353,8 @@ self: {
        ];
        description = "The raml helper executable";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-raml-docs" = callPackage
@@ -249967,6 +266371,8 @@ self: {
        ];
        description = "A html documentation generator library for RAML";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-raml-mock" = callPackage
@@ -249990,6 +266396,8 @@ self: {
        ];
        description = "A mock-handler generator library from RAML";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-recaptcha" = callPackage
@@ -250008,6 +266416,8 @@ self: {
        ];
        description = "Dead simple support for reCAPTCHA on Yesod applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-recaptcha2" = callPackage
@@ -250045,6 +266455,8 @@ self: {
        ];
        description = "Efficient routing for Yesod. (deprecated)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-routes-flow" = callPackage
@@ -250061,6 +266473,8 @@ self: {
        ];
        description = "Generate Flow routes for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-routes-typescript" = callPackage
@@ -250077,6 +266491,8 @@ self: {
        ];
        description = "generate TypeScript routes for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-rst" = callPackage
@@ -250093,6 +266509,8 @@ self: {
        ];
        description = "Tools for using reStructuredText (RST) in a yesod application";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-s3" = callPackage
@@ -250109,6 +266527,8 @@ self: {
        ];
        description = "Simple Helper Library for using Amazon's Simple Storage Service (S3) with Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-sass" = callPackage
@@ -250125,6 +266545,8 @@ self: {
        ];
        description = "A simple quasiquoter to include sass code in yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-session-redis" = callPackage
@@ -250142,6 +266564,8 @@ self: {
        ];
        description = "Redis-Powered Sessions for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-sitemap" = callPackage
@@ -250250,6 +266674,8 @@ self: {
        ];
        description = "Yesod generators for embedding AngularJs code into yesod-static at compile time";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-static-remote" = callPackage
@@ -250266,6 +266692,8 @@ self: {
        ];
        testHaskellDepends = [ base yesod-static ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-table" = callPackage
@@ -250365,6 +266793,8 @@ self: {
        ];
        description = "Utility functions for testing JSON web services written in Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-text-markdown" = callPackage
@@ -250397,6 +266827,8 @@ self: {
        ];
        description = "Provides main functions using warp-tls for yesod projects";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-transloadit" = callPackage
@@ -250441,6 +266873,8 @@ self: {
        ];
        description = "Simple CRUD classes for easy view creation for Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yesod-websockets" = callPackage
@@ -250488,6 +266922,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yet-another-logger" = callPackage
@@ -250519,6 +266955,8 @@ self: {
        ];
        description = "Yet Another Logger";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yggdrasil" = callPackage
@@ -250535,6 +266973,8 @@ self: {
        testHaskellDepends = [ base cryptonite hspec QuickCheck ];
        description = "Executable specifications of composable cryptographic protocols";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yhccore" = callPackage
@@ -250546,6 +266986,8 @@ self: {
        libraryHaskellDepends = [ base containers mtl pretty uniplate ];
        description = "Yhc's Internal Core language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yhseq" = callPackage
@@ -250581,6 +267023,8 @@ self: {
        ];
        description = "Yi editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-contrib" = callPackage
@@ -250599,6 +267043,8 @@ self: {
        ];
        description = "Add-ons to Yi, the Haskell-Scriptable Editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-core" = callPackage
@@ -250629,6 +267075,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq yi-rope ];
        description = "Yi editor core library";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-dynamic-configuration" = callPackage
@@ -250645,6 +267093,8 @@ self: {
        ];
        description = "Dynamic configuration support for Yi";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-emacs-colours" = callPackage
@@ -250656,6 +267106,8 @@ self: {
        libraryHaskellDepends = [ base containers split yi-language ];
        description = "Simple mapping from colour names used in emacs to Color";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-frontend-pango" = callPackage
@@ -250675,6 +267127,8 @@ self: {
        ];
        description = "Pango frontend for Yi editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-frontend-vty" = callPackage
@@ -250692,6 +267146,8 @@ self: {
        ];
        description = "Vty frontend for Yi editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-fuzzy-open" = callPackage
@@ -250710,6 +267166,8 @@ self: {
        ];
        description = "Fuzzy open plugin for yi";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-gtk" = callPackage
@@ -250737,6 +267195,8 @@ self: {
        ];
        description = "Yi editor incremental reader";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-keymap-cua" = callPackage
@@ -250752,6 +267212,8 @@ self: {
        ];
        description = "Cua keymap for Yi editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-keymap-emacs" = callPackage
@@ -250769,6 +267231,8 @@ self: {
        ];
        description = "Emacs keymap for Yi editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-keymap-vim" = callPackage
@@ -250795,6 +267259,8 @@ self: {
        ];
        description = "Vim keymap for Yi editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-language" = callPackage
@@ -250822,6 +267288,8 @@ self: {
        ];
        description = "Collection of language-related Yi libraries";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-misc-modes" = callPackage
@@ -250839,6 +267307,8 @@ self: {
        libraryToolDepends = [ alex ];
        description = "Yi editor miscellaneous modes";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-mode-haskell" = callPackage
@@ -250856,6 +267326,8 @@ self: {
        libraryToolDepends = [ alex ];
        description = "Yi editor haskell mode";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-mode-javascript" = callPackage
@@ -250874,6 +267346,8 @@ self: {
        libraryToolDepends = [ alex ];
        description = "Yi editor javascript mode";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-monokai" = callPackage
@@ -250885,6 +267359,8 @@ self: {
        libraryHaskellDepends = [ base yi ];
        description = "Monokai colour theme for the Yi text editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-rope" = callPackage
@@ -250924,6 +267400,8 @@ self: {
        ];
        description = "Snippet support for yi";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-solarized" = callPackage
@@ -250935,6 +267413,8 @@ self: {
        libraryHaskellDepends = [ base yi ];
        description = "Solarized colour theme for the Yi text editor";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-spolsky" = callPackage
@@ -250946,6 +267426,8 @@ self: {
        libraryHaskellDepends = [ base yi ];
        description = "Spolsky colour theme for the Yi text editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yi-vty" = callPackage
@@ -250969,6 +267451,8 @@ self: {
        libraryHaskellDepends = [ base parsec process ];
        description = "Haskell programming interface to Yices SMT solver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yices-easy" = callPackage
@@ -251041,6 +267525,8 @@ self: {
        executableHaskellDepends = [ hsConfigure ];
        description = "CUI FTP client like 'ftp', 'ncftp'";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yjftp-libs" = callPackage
@@ -251054,6 +267540,8 @@ self: {
        libraryHaskellDepends = [ base directory ftphs mtl process unix ];
        description = "CUI FTP client like 'ftp', 'ncftp'";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yjsvg" = callPackage
@@ -251116,6 +267604,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Parser combinators for young padawans";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yoga" = callPackage
@@ -251148,6 +267638,8 @@ self: {
        ];
        description = "Generic Programming with Disbanded Data Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "york-lava" = callPackage
@@ -251159,6 +267651,8 @@ self: {
        libraryHaskellDepends = [ base containers haskell98 ];
        description = "A library for digital circuit description";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "youtube" = callPackage
@@ -251199,6 +267693,8 @@ self: {
        ];
        description = "A YQL engine to execute Open Data Tables";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yst" = callPackage
@@ -251221,6 +267717,8 @@ self: {
        ];
        description = "Builds a static website from templates and data in YAML or CSV files";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yu-auth" = callPackage
@@ -251235,6 +267733,8 @@ self: {
        testHaskellDepends = [ base MonadRandom random yu-utils ];
        description = "Auth module for Yu";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yu-core" = callPackage
@@ -251247,6 +267747,8 @@ self: {
        testHaskellDepends = [ base blaze-markup hspec yu-utils ];
        description = "The core of Yu";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yu-launch" = callPackage
@@ -251262,6 +267764,8 @@ self: {
        ];
        description = "The launcher for Yu";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yu-tool" = callPackage
@@ -251279,6 +267783,8 @@ self: {
        ];
        description = "Tool for Yu";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yu-utils" = callPackage
@@ -251302,6 +267808,8 @@ self: {
        ];
        description = "Utils for Yu";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yuiGrid" = callPackage
@@ -251337,6 +267845,8 @@ self: {
        ];
        description = "A transcendental HTML parser gently wrapping the HXT library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "yx" = callPackage
@@ -251387,6 +267897,8 @@ self: {
        ];
        description = "Utilities for reading and writing Alteryx .yxdb files";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "z3" = callPackage
@@ -251416,6 +267928,8 @@ self: {
        testHaskellDepends = [ base containers hspec z3 ];
        description = "High-level assertion encoding to Z3 solver";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "z85" = callPackage
@@ -251439,6 +267953,8 @@ self: {
        ];
        description = "Implementation of the z85 binary codec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zabt" = callPackage
@@ -251451,6 +267967,8 @@ self: {
        testHaskellDepends = [ base tasty tasty-hspec ];
        description = "Simple-minded abstract binding trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zalgo" = callPackage
@@ -251480,6 +267998,8 @@ self: {
        ];
        description = "A tool for checking how much work is done on group projects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zasni-gerna" = callPackage
@@ -251504,6 +268024,8 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "zbar bindings in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) zbar;};
 
   "zcache" = callPackage
@@ -251549,6 +268071,8 @@ self: {
        ];
        description = "Zendesk API for Haskell programming language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zenhack-prelude" = callPackage
@@ -251560,6 +268084,8 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "@zenhack's personal custom prelude";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zeno" = callPackage
@@ -251579,6 +268105,8 @@ self: {
        ];
        description = "An automated proof system for Haskell programs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zephyr" = callPackage
@@ -251615,6 +268143,8 @@ self: {
        ];
        description = "Zephyr tree shaking for PureScript Language";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zero" = callPackage
@@ -251647,6 +268177,8 @@ self: {
        ];
        description = "Post to 0bin services";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zeromq-haskell" = callPackage
@@ -251665,6 +268197,8 @@ self: {
        ];
        description = "Bindings to ZeroMQ 2.1.x";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) zeromq;};
 
   "zeromq3-conduit" = callPackage
@@ -251681,6 +268215,8 @@ self: {
        ];
        description = "Conduit bindings for zeromq3-haskell";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zeromq3-haskell" = callPackage
@@ -251703,6 +268239,8 @@ self: {
        ];
        description = "Bindings to ZeroMQ 3.x";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) zeromq;};
 
   "zeromq4-clone-pattern" = callPackage
@@ -251729,6 +268267,8 @@ self: {
        ];
        description = "Haskell implementation of the ZeroMQ clone pattern";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zeromq4-conduit" = callPackage
@@ -251747,6 +268287,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "Conduit wrapper around zeromq4-haskell";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zeromq4-haskell" = callPackage
@@ -251791,6 +268333,8 @@ self: {
        ];
        description = "Haskell implementation of several ZeroMQ patterns";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zeromq4-simple" = callPackage
@@ -251829,6 +268373,8 @@ self: {
        ];
        description = "ZeroTH - remove unnecessary TH dependencies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zifter" = callPackage
@@ -251852,6 +268398,8 @@ self: {
        ];
        description = "zifter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zifter-cabal" = callPackage
@@ -251867,6 +268415,8 @@ self: {
        ];
        description = "zifter-cabal";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zifter-git" = callPackage
@@ -251878,6 +268428,8 @@ self: {
        libraryHaskellDepends = [ base path process zifter ];
        description = "zifter-git";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zifter-google-java-format" = callPackage
@@ -251893,6 +268445,8 @@ self: {
        ];
        description = "zifter-google-java-format";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zifter-hindent" = callPackage
@@ -251908,6 +268462,8 @@ self: {
        ];
        description = "zifter-hindent";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zifter-hlint" = callPackage
@@ -251922,6 +268478,8 @@ self: {
        ];
        description = "zifter-hlint";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zifter-stack" = callPackage
@@ -251941,6 +268499,8 @@ self: {
        ];
        description = "zifter-stack";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zigbee-znet25" = callPackage
@@ -251957,6 +268517,8 @@ self: {
        testHaskellDepends = [ base bytestring mtl QuickCheck random ];
        description = "XBee ZNet 2.5 (ZigBee) wireless modem communications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zim-parser" = callPackage
@@ -252080,6 +268642,8 @@ self: {
        ];
        description = "Working with zip archives via conduits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zip-stream" = callPackage
@@ -252116,6 +268680,8 @@ self: {
        libraryHaskellDepends = [ base directory mtl process ];
        description = "Create simple list editor interfaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zipkin" = callPackage
@@ -252131,6 +268697,8 @@ self: {
        ];
        description = "Zipkin-style request tracing monad";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zipper" = callPackage
@@ -252142,6 +268710,8 @@ self: {
        libraryHaskellDepends = [ base multirec ];
        description = "Generic zipper for families of recursive datatypes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zippers" = callPackage
@@ -252171,6 +268741,8 @@ self: {
        libraryHaskellDepends = [ base mtl yall ];
        description = "A simple lens-based, generic, heterogenous, type-checked zipper library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ziptastic-client" = callPackage
@@ -252192,6 +268764,8 @@ self: {
        ];
        description = "A type-safe client for the Ziptastic API for doing forward and reverse geocoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ziptastic-core" = callPackage
@@ -252211,6 +268785,8 @@ self: {
        ];
        description = "Core Servant specification for the Ziptastic API for doing forward and reverse geocoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zlib" = callPackage
@@ -252271,6 +268847,8 @@ self: {
        ];
        description = "Enumerator interface for zlib compression";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zlib-lens" = callPackage
@@ -252304,6 +268882,8 @@ self: {
        ];
        description = "Language independent, reproducible, absolute types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zmcat" = callPackage
@@ -252318,6 +268898,8 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Command-line tool for ZeroMQ";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zmidi-core" = callPackage
@@ -252346,6 +268928,8 @@ self: {
        ];
        description = "Representing MIDI a simple score";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zmqat" = callPackage
@@ -252375,6 +268959,8 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "ZoneInfo library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zoom" = callPackage
@@ -252393,6 +268979,8 @@ self: {
        ];
        description = "A rake/thor-like task runner written in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zoom-cache" = callPackage
@@ -252424,6 +269012,8 @@ self: {
        ];
        description = "A streamable, seekable, zoomable cache file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zoom-cache-pcm" = callPackage
@@ -252440,6 +269030,8 @@ self: {
        ];
        description = "Library for zoom-cache PCM audio codecs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zoom-cache-sndfile" = callPackage
@@ -252459,6 +269051,8 @@ self: {
        ];
        description = "Tools for generating zoom-cache-pcm files";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zoom-refs" = callPackage
@@ -252470,6 +269064,8 @@ self: {
        libraryHaskellDepends = [ base lens stm ];
        description = "Zoom (~ Functor) and pairing (~ Applicative) for mutable references";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zot" = callPackage
@@ -252514,6 +269110,8 @@ self: {
        testHaskellDepends = [ base ];
        description = "ZRE protocol implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zsh-battery" = callPackage
@@ -252527,6 +269125,8 @@ self: {
        executableHaskellDepends = [ base directory filepath mtl ];
        description = "Ascii bars representing battery status";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zstd" = callPackage
@@ -252561,6 +269161,8 @@ self: {
        testHaskellDepends = [ base containers mtl multiset ];
        description = "Automated theorem prover for the Zsyntax biochemical calculus";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ztail" = callPackage
@@ -252581,6 +269183,8 @@ self: {
        ];
        description = "Multi-file, colored, filtered log tailer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ztar" = callPackage
@@ -252602,6 +269206,8 @@ self: {
        ];
        description = "Creating and extracting arbitrary archives";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zuramaru" = callPackage
@@ -252640,6 +269246,8 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A lisp processor, An inline-lisp, in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zxcvbn-c" = callPackage
@@ -252669,6 +269277,8 @@ self: {
        ];
        description = "Password strength estimation based on zxcvbn";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "zxcvbn-hs" = callPackage
@@ -252707,6 +269317,8 @@ self: {
        ];
        description = "Password strength estimation based on zxcvbn";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
 }

From 05b6836816aef6aea9e0bac2d4f9ba5d711bc274 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Thu, 27 Feb 2020 13:25:30 +0100
Subject: [PATCH 1843/4636] torchPackages, torch-repl: remove

See https://github.com/NixOS/nixpkgs/issues/71888
and https://github.com/NixOS/nixpkgs/issues/56398

To sump up, development has moved on to other technologies than lua:
https://github.com/torch/torch7#development-status
and the current packages are broken anyway.
---
 .../machine-learning/torch/default.nix        |  10 -
 .../machine-learning/torch/torch-distro.nix   | 336 ------------------
 pkgs/top-level/all-packages.nix               |   6 -
 3 files changed, 352 deletions(-)
 delete mode 100644 pkgs/applications/science/machine-learning/torch/default.nix
 delete mode 100644 pkgs/applications/science/machine-learning/torch/torch-distro.nix

diff --git a/pkgs/applications/science/machine-learning/torch/default.nix b/pkgs/applications/science/machine-learning/torch/default.nix
deleted file mode 100644
index bdeeaad189a7..000000000000
--- a/pkgs/applications/science/machine-learning/torch/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, fetchgit, lua } :
-let
-  src = fetchgit {
-    url = "https://github.com/grwlf/torch-distro";
-    rev = "f972c4253b14b95b53aefe7b24efa496223e73f2";
-    sha256 = "1lhjhivhyypaic33vj1nsghshsajf7vi6gwsclaf3nqdl27d1h1s";
-  };
-
-in
-  callPackage (import ./torch-distro.nix) { inherit lua src; }
diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix
deleted file mode 100644
index 73272df99221..000000000000
--- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix
+++ /dev/null
@@ -1,336 +0,0 @@
-{ luarocks, lib , stdenv,  readline,  makeWrapper,
-  less, ncurses, cmake, coreutils, fetchgit, libuuid, czmq, openssl,
-  gnuplot, lua, src, libjpeg, libpng
-} :
-
-let
-
-  common_meta = {
-    homepage = http://torch.ch;
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ smironov ];
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
-  };
-
-  distro_src = src;
-
-  default_luarocks = luarocks;
-
-  pkgs_gnuplot = gnuplot;
-
-  luapkgs = rec {
-
-    luarocks = default_luarocks.override {
-      inherit lua;
-    };
-
-    buildLuaRocks = { rockspec ? "", luadeps ? [] , buildInputs ? []
-                    , preBuild ? "" , postInstall ? ""
-                    , runtimeDeps ? [] ,  ... }@args :
-      let
-
-        luadeps_ =
-          luadeps ++
-          (lib.concatMap (d : if d ? luadeps then d.luadeps else []) luadeps);
-
-        runtimeDeps_ =
-          runtimeDeps ++
-          (lib.concatMap (d : if d ? runtimeDeps then d.runtimeDeps else []) luadeps) ++
-          [ lua coreutils ];
-
-        mkcfg = ''
-          export LUAROCKS_CONFIG=config.lua
-          cat >config.lua <<EOF
-            rocks_trees = {
-                 { name = [[system]], root = [[${luarocks}]] }
-               ${lib.concatImapStrings (i : dep :  ", { name = [[dep${toString i}]], root = [[${dep}]] }") luadeps_}
-            };
-
-            variables = {
-              LUA_BINDIR = "$out/bin";
-              LUA_INCDIR = "$out/include";
-              LUA_LIBDIR = "$out/lib/lua/${lua.luaversion}";
-            };
-          EOF
-        '';
-
-      in
-      stdenv.mkDerivation (args // {
-
-        name = "${args.name}-${lua.luaversion}";
-
-        inherit preBuild postInstall;
-
-        inherit luadeps runtimeDeps;
-
-        phases = [ "unpackPhase" "patchPhase" "buildPhase"];
-
-        buildInputs = runtimeDeps ++ buildInputs ++ [ makeWrapper lua ];
-
-        buildPhase = ''
-          eval "$preBuild"
-          ${mkcfg}
-          eval "`${luarocks}/bin/luarocks --deps-mode=all --tree=$out path`"
-          ${luarocks}/bin/luarocks make --deps-mode=all --tree=$out ${rockspec}
-
-          for p in $out/bin/*; do
-            wrapProgram $p \
-              --suffix LD_LIBRARY_PATH ';' "${lib.makeLibraryPath runtimeDeps_}" \
-              --suffix PATH ';' "${lib.makeBinPath runtimeDeps_}" \
-              --suffix LUA_PATH ';' "\"$LUA_PATH\"" \
-              --suffix LUA_PATH ';' "\"$out/share/lua/${lua.luaversion}/?.lua;$out/share/lua/${lua.luaversion}/?/init.lua\"" \
-              --suffix LUA_CPATH ';' "\"$LUA_CPATH\"" \
-              --suffix LUA_CPATH ';' "\"$out/lib/lua/${lua.luaversion}/?.so;$out/lib/lua/${lua.luaversion}/?/init.so\""
-          done
-
-          eval "$postInstall"
-        '';
-      });
-
-    # FIXME: doesn't installs lua-files for some reason
-    # lua-cjson = buildLuaPackage {
-    #   name = "lua-cjson";
-    #   src = ./extra/lua-cjson;
-    #   rockspec = "lua-cjson-2.1devel-1.rockspec";
-    # };
-
-    lua-cjson = stdenv.mkDerivation {
-      name = "lua-cjson";
-      src = "${distro_src}/extra/lua-cjson";
-
-      preConfigure = ''
-        makeFlags="PREFIX=$out LUA_LIBRARY=$out/lib/lua"
-      '';
-
-      buildInputs = [lua];
-
-      installPhase = ''
-        make install-extra $makeFlags
-      '';
-      meta.broken = true;
-    };
-
-    luafilesystem = buildLuaRocks {
-      name = "filesystem";
-      src = "${distro_src}/extra/luafilesystem";
-      luadeps = [lua-cjson];
-      rockspec = "rockspecs/luafilesystem-1.6.3-1.rockspec";
-    };
-
-    penlight = buildLuaRocks {
-      name = "penlight";
-      src = "${distro_src}/extra/penlight";
-      luadeps = [luafilesystem];
-    };
-
-    luaffifb = buildLuaRocks {
-      name = "luaffifb";
-      src = "${distro_src}/extra/luaffifb";
-      meta.broken = true;
-    };
-
-    sundown = buildLuaRocks rec {
-      name = "sundown";
-      src = "${distro_src}/pkg/sundown";
-      rockspec = "rocks/${name}-scm-1.rockspec";
-      meta.broken = true; # 2018-04-11
-    };
-
-    cwrap = buildLuaRocks rec {
-      name = "cwrap";
-      src = "${distro_src}/pkg/cwrap";
-      rockspec = "rocks/${name}-scm-1.rockspec";
-    };
-
-    paths = buildLuaRocks rec {
-      name = "paths";
-      src = "${distro_src}/pkg/paths";
-      buildInputs = [cmake];
-      rockspec = "rocks/${name}-scm-1.rockspec";
-    };
-
-    torch = buildLuaRocks rec {
-      name = "torch";
-      src = "${distro_src}/pkg/torch";
-      luadeps = [ paths cwrap ];
-      buildInputs = [ cmake ];
-      rockspec = "rocks/torch-scm-1.rockspec";
-      preBuild = ''
-        substituteInPlace ${rockspec} \
-          --replace '"sys >= 1.0"' ' '
-        export LUA_PATH="$src/?.lua;$LUA_PATH"
-      '';
-      meta = common_meta // {
-        description = "Torch is a machine-learning library";
-        longDescription = ''
-          Torch is the main package in [Torch7](http://torch.ch) where data
-          structures for multi-dimensional tensors and mathematical operations
-          over these are defined. Additionally, it provides many utilities for
-          accessing files, serializing objects of arbitrary types and other
-          useful utilities.
-        '';
-      };
-    };
-
-    dok = buildLuaRocks rec {
-      name = "dok";
-      src = "${distro_src}/pkg/dok";
-      luadeps = [sundown];
-      rockspec = "rocks/${name}-scm-1.rockspec";
-    };
-
-    sys = buildLuaRocks {
-      name = "sys";
-      luadeps = [torch];
-      buildInputs = [readline cmake];
-      src = "${distro_src}/pkg/sys";
-      rockspec = "sys-1.1-0.rockspec";
-      preBuild = ''
-        export Torch_DIR=${torch}/share/cmake/torch
-      '';
-    };
-
-    xlua = buildLuaRocks {
-      name = "xlua";
-      luadeps = [torch sys];
-      src = "${distro_src}/pkg/xlua";
-      rockspec = "xlua-1.0-0.rockspec";
-    };
-
-    nn = buildLuaRocks {
-      name = "nn";
-      luadeps = [torch luaffifb];
-      buildInputs = [cmake];
-      src = "${distro_src}/extra/nn";
-      rockspec = "rocks/nn-scm-1.rockspec";
-      preBuild = ''
-        export Torch_DIR=${torch}/share/cmake/torch
-      '';
-    };
-
-    graph = buildLuaRocks {
-      name = "graph";
-      luadeps = [ torch ];
-      buildInputs = [cmake];
-      src = "${distro_src}/extra/graph";
-      rockspec = "rocks/graph-scm-1.rockspec";
-      preBuild = ''
-        export Torch_DIR=${torch}/share/cmake/torch
-      '';
-    };
-
-    nngraph = buildLuaRocks {
-      name = "nngraph";
-      luadeps = [ torch nn graph ];
-      buildInputs = [cmake];
-      src = "${distro_src}/extra/nngraph";
-      preBuild = ''
-        export Torch_DIR=${torch}/share/cmake/torch
-      '';
-    };
-
-    image = buildLuaRocks {
-      name = "image";
-      luadeps = [ torch dok sys xlua ];
-      buildInputs = [cmake libjpeg libpng];
-      src = "${distro_src}/pkg/image";
-      rockspec = "image-1.1.alpha-0.rockspec";
-      preBuild = ''
-        export Torch_DIR=${torch}/share/cmake/torch
-      '';
-    };
-
-    optim = buildLuaRocks {
-      name = "optim";
-      luadeps = [ torch ];
-      buildInputs = [cmake];
-      src = "${distro_src}/pkg/optim";
-      rockspec = "optim-1.0.5-0.rockspec";
-      preBuild = ''
-        export Torch_DIR=${torch}/share/cmake/torch
-      '';
-    };
-
-    gnuplot = buildLuaRocks {
-      name = "gnuplot";
-      luadeps = [ torch paths ];
-      runtimeDeps = [ pkgs_gnuplot less ];
-      src = "${distro_src}/pkg/gnuplot";
-      rockspec = "rocks/gnuplot-scm-1.rockspec";
-    };
-
-    unsup = buildLuaRocks {
-      name = "unsup";
-      luadeps = [ torch xlua optim ];
-      buildInputs = [ cmake ];
-      src = fetchgit {
-        url = "https://github.com/koraykv/unsup";
-        rev = "1d4632e716dc3c82feecc7dd4b22549df442859f";
-        sha256 = "0npjq3y1cfmk026sdijcw3f766innrmb3qggnxsz62grczhfvgls";
-      };
-      rockspec = "unsup-0.1-0.rockspec";
-      preBuild = ''
-        export Torch_DIR=${torch}/share/cmake/torch
-      '';
-      meta.broken = true;
-    };
-
-    trepl = buildLuaRocks {
-      name = "trepl";
-      luadeps = [torch gnuplot paths penlight graph nn nngraph image gnuplot optim sys dok unsup];
-      runtimeDeps = [ ncurses readline ];
-      src = "${distro_src}/exe/trepl";
-      meta = common_meta // {
-        description = "A pure Lua REPL for Lua(JIT), with heavy support for Torch types.";
-      };
-    };
-
-    lbase64 = buildLuaRocks {
-      name = "lbase64";
-      src = fetchgit {
-        url = "https://github.com/LuaDist2/lbase64";
-        rev = "1e9e4f1e0bf589a0ed39f58acc185ec5e213d207";
-        sha256 = "1i1fpy9v6r4w3lrmz7bmf5ppq65925rv90gx39b3pykfmn0hcb9c";
-      };
-      meta.broken = true; # 2018-04-11
-    };
-
-    luuid = stdenv.mkDerivation {
-      name = "luuid";
-      src = fetchgit {
-        url = "https://github.com/LuaDist/luuid";
-        sha256 = "062gdf1rild11jg46vry93hcbb36b4527pf1dy7q9fv89f7m2nav";
-      };
-
-      preConfigure = ''
-        cmakeFlags="-DLUA_LIBRARY=${lua}/lib/lua/${lua.luaversion} -DINSTALL_CMOD=$out/lib/lua/${lua.luaversion} -DINSTALL_MOD=$out/lib/lua/${lua.luaversion}"
-      '';
-
-      buildInputs = [cmake libuuid lua];
-      meta = {
-        # FIXME: set the exact revision for src
-        broken = true;
-      };
-    };
-
-    # Doesn't work due to missing deps (according to luarocs).
-    itorch = buildLuaRocks {
-      name = "itorch";
-      luadeps = [torch gnuplot paths penlight graph nn nngraph image gnuplot
-                  optim sys dok lbase64 lua-cjson luuid];
-      buildInputs = [czmq openssl];
-      src = "${distro_src}/extra/iTorch";
-      meta = {
-        # FIXME: figure out whats wrong with deps
-        broken = true;
-      };
-    };
-
-
-  };
-
-in
-
-luapkgs
-
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99633c168f2f..02dcca5065df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21901,12 +21901,6 @@ in
 
   topydo = callPackage ../applications/misc/topydo {};
 
-  torchPackages = recurseIntoAttrs ( callPackage ../applications/science/machine-learning/torch {
-    lua = luajit ;
-  } );
-
-  torch-repl = lib.setName "torch-repl" torchPackages.trepl;
-
   torchat = callPackage ../applications/networking/instant-messengers/torchat {
     inherit (pythonPackages) wrapPython wxPython;
   };

From 20c393aaec3fe58718920ee182d14e488c4dc936 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 28 Feb 2020 20:50:47 +0100
Subject: [PATCH 1844/4636] findomain: 1.4.0 -> 1.4.1

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

diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix
index 5f65d9194d19..98c4473ac09c 100644
--- a/pkgs/tools/networking/findomain/default.nix
+++ b/pkgs/tools/networking/findomain/default.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "findomain";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "Edu4rdSHL";
     repo = pname;
     rev = version;
-    sha256 = "1hqvs6h6cfimg0y6hggnmc0mlddajwmh3h36n160n6imq0lfixka";
+    sha256 = "1mg0awsf8z5sd7s7vj5rs18my3aksxsggb5y85kaf0skq79ybmrx";
   };
 
-  cargoSha256 = "1agijiq9cxpla2szy0j1n74dpvfsw63pgdscjidr8c00c088pw7g";
+  cargoSha256 = "0mnp2hl9q6qsfj4x37ss9gfhss184lzs63zv327l6jnd2m1yq8b2";
 
   nativeBuildInputs = [ installShellFiles perl ];
   buildInputs = lib.optional stdenv.isDarwin Security;

From 4f50bee7c09aa5514f5df9d33dcc65511f7b3905 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 28 Feb 2020 20:55:43 +0100
Subject: [PATCH 1845/4636] androidStudioPackages.{dev,canary}: 4.0.0.10 ->
 4.1.0.1

---
 pkgs/applications/editors/android-studio/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 28490f2ce7bb..255d87500c7c 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -12,12 +12,16 @@ let
     build = "192.6200805";
     sha256Hash = "1rf79fh6fbaxsj26q9bgl4vvmakv4wc0amjz026cm89hcwwzrb4d";
   };
-  betaVersion = latestVersion;
-  latestVersion = { # canary & dev
+  betaVersion = {
     version = "4.0.0.10"; # "Android Studio 4.0 Beta 1"
     build = "193.6220182";
     sha256Hash = "0ibp54wcss4ihm454hbavv1bhar6cd4alp5b0z248ryjr5w9mixf";
   };
+  latestVersion = { # canary & dev
+    version = "4.1.0.1"; # "Android Studio 4.1 Canary 1"
+    build = "193.6224510";
+    sha256Hash = "0misff7xx8jcg4zr5ahc8qdwvlkx605il0shzd9i1cm9v1br3sqx";
+  };
 in {
   # Attributes are named by their corresponding release channels
 

From f6281d448045d793764fbfa97cf90eaf474ab5c1 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 28 Feb 2020 20:59:52 +0100
Subject: [PATCH 1846/4636] android-studio: 3.6.0.21 -> 3.6.1.0

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

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 255d87500c7c..5736ec1dccc7 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -8,9 +8,9 @@ let
     inherit (gnome2) GConf gnome_vfs;
   };
   stableVersion = {
-    version = "3.6.0.21"; # "Android Studio 3.6"
-    build = "192.6200805";
-    sha256Hash = "1rf79fh6fbaxsj26q9bgl4vvmakv4wc0amjz026cm89hcwwzrb4d";
+    version = "3.6.1.0"; # "Android Studio 3.6.1"
+    build = "192.6241897";
+    sha256Hash = "1mwzk18224bl8hbw9cdxwzgj5cfain4y70q64cpj4p0snffxqm77";
   };
   betaVersion = {
     version = "4.0.0.10"; # "Android Studio 4.0 Beta 1"

From 18938fb2a57b46dd1a069261f8ea7082d718140b Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 28 Feb 2020 21:07:28 +0100
Subject: [PATCH 1847/4636] wallutils: 5.8.3 -> 5.9.0

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

diff --git a/pkgs/tools/graphics/wallutils/default.nix b/pkgs/tools/graphics/wallutils/default.nix
index 263425aef1dd..7425056cfae3 100644
--- a/pkgs/tools/graphics/wallutils/default.nix
+++ b/pkgs/tools/graphics/wallutils/default.nix
@@ -4,13 +4,13 @@
 
 buildGoPackage rec {
   pname = "wallutils";
-  version = "5.8.3";
+  version = "5.9.0";
 
   src = fetchFromGitHub {
     owner = "xyproto";
     repo = "wallutils";
     rev = version;
-    sha256 = "1cc0bb6bdh3pm9mf6rcgk9myr62xhqc6l84xgw44lhm6hkkp16gb";
+    sha256 = "17xw1311xpmi5c8mwa9yvn4pxa7g4n09j84lvy61gmxc5m128fwy";
   };
 
   goPackagePath = "github.com/xyproto/wallutils";

From ff6aeefb916a0dd1fad2825d4f08311df275828b Mon Sep 17 00:00:00 2001
From: Gabor Greif <ggreif@gmail.com>
Date: Fri, 28 Feb 2020 21:17:10 +0100
Subject: [PATCH 1848/4636] ghc-8.8.3: really use ld.gold (port #80466)

---
 pkgs/development/compilers/ghc/8.8.3.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.8.3.nix b/pkgs/development/compilers/ghc/8.8.3.nix
index 43d4b84c5f80..e4ece9b8d8c1 100644
--- a/pkgs/development/compilers/ghc/8.8.3.nix
+++ b/pkgs/development/compilers/ghc/8.8.3.nix
@@ -84,6 +84,8 @@ let
 
   targetCC = builtins.head toolsForTarget;
 
+  useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
+
 in
 stdenv.mkDerivation (rec {
   version = "8.8.3";
@@ -110,7 +112,7 @@ stdenv.mkDerivation (rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString (targetPlatform.isLinux && !(targetPlatform.useLLVM or false)) ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString useLdGold ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -147,18 +149,24 @@ stdenv.mkDerivation (rec {
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms = [ "build" "host" ]
     ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
   # `--with` flags for libraries needed for RTS linker
   configureFlags = [
     "--datadir=$doc/share/doc/ghc"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
+  ] ++ stdenv.lib.optionals (libffi != null) [
+    "--with-system-libffi"
+    "--with-ffi-includes=${targetPackages.libffi.dev}/include"
+    "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
   ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
-    "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
+    "--with-gmp-includes=${targetPackages.gmp.dev}/include"
+    "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
   ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
-    "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
+    "--with-iconv-includes=${libiconv}/include"
+    "--with-iconv-libraries=${libiconv}/lib"
   ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
+  ] ++ stdenv.lib.optionals useLdGold [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"

From a0d61c0135b182233ff82399127beb8a4dc264ad Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 28 Feb 2020 10:32:04 +0100
Subject: [PATCH 1849/4636] gollum: Update the dependencies (security,
 CVE-2020-7595)

This updates nokogiri to 1.10.8 for CVE-2020-7595 [0].

[0]: https://github.com/sparklemotion/nokogiri/issues/1992
---
 pkgs/applications/misc/gollum/Gemfile.lock | 14 +++++------
 pkgs/applications/misc/gollum/gemset.nix   | 27 +++++++---------------
 2 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock
index 8ecb546df703..6a705b6a9d82 100644
--- a/pkgs/applications/misc/gollum/Gemfile.lock
+++ b/pkgs/applications/misc/gollum/Gemfile.lock
@@ -6,10 +6,10 @@ GEM
     gemojione (3.3.0)
       json
     github-markup (1.7.0)
-    gitlab-grit (2.8.2)
-      charlock_holmes (~> 0.6)
+    gitlab-grit (2.8.3)
+      charlock_holmes (~> 0.7)
       diff-lcs (~> 1.1)
-      mime-types (>= 1.16)
+      mime-types (>= 1.16, < 3)
       posix-spawn (~> 0.3)
     gollum (4.1.4)
       gemojione (~> 3.2)
@@ -31,15 +31,13 @@ GEM
       twitter-text (= 1.14.7)
     json (2.3.0)
     kramdown (1.9.0)
-    mime-types (3.3)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
+    mime-types (2.99.3)
     mini_portile2 (2.4.0)
     mustache (0.99.8)
-    nokogiri (1.10.7)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
     posix-spawn (0.3.13)
-    rack (1.6.12)
+    rack (1.6.13)
     rack-protection (1.5.5)
       rack
     rouge (2.2.1)
diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix
index 61e0db781b87..7ce1d853f368 100644
--- a/pkgs/applications/misc/gollum/gemset.nix
+++ b/pkgs/applications/misc/gollum/gemset.nix
@@ -46,10 +46,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4";
+      sha256 = "0xvcizc4856xlvara1zzwl6j61vxxshzcrdagp58xzfl68vbi63p";
       type = "gem";
     };
-    version = "2.8.2";
+    version = "2.8.3";
   };
   gollum = {
     dependencies = ["gemojione" "gollum-lib" "kramdown" "mustache" "sinatra" "useragent"];
@@ -105,25 +105,14 @@
     version = "1.9.0";
   };
   mime-types = {
-    dependencies = ["mime-types-data"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0g7l18igjb9z7q4b2ykvyxyvjxlx5pwsmx5z3ibdbr6372xgfglk";
+      sha256 = "03j98xr0qw2p2jkclpmk7pm29yvmmh0073d8d43ajmr0h3w7i5l9";
       type = "gem";
     };
-    version = "3.3";
-  };
-  mime-types-data = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "18x61fc36951vw7f74gq8cyybdpxvyg5d0azvqhrs82ddw3v16xh";
-      type = "gem";
-    };
-    version = "3.2019.1009";
+    version = "2.99.3";
   };
   mini_portile2 = {
     groups = ["default"];
@@ -151,10 +140,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln";
+      sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8";
       type = "gem";
     };
-    version = "1.10.7";
+    version = "1.10.8";
   };
   posix-spawn = {
     groups = ["default"];
@@ -171,10 +160,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1riq0z408dwvqcqrpq05bp2w879l4sjxzb4cbrbx55kpi6h2g1cj";
+      sha256 = "0wr1f3g9rc9i8svfxa9cijajl1661d817s56b2w7rd572zwn0zi0";
       type = "gem";
     };
-    version = "1.6.12";
+    version = "1.6.13";
   };
   rack-protection = {
     dependencies = ["rack"];

From 9b0defc76510831fd35775318d35c9f2d3027e0a Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 28 Feb 2020 10:55:50 +0100
Subject: [PATCH 1850/4636] jekyll: Update the dependencies (security,
 CVE-2020-7595)

This updates nokogiri to 1.10.8 for CVE-2020-7595 [0].

[0]: https://github.com/sparklemotion/nokogiri/issues/1992
---
 .../misc/jekyll/basic/Gemfile.lock            | 32 +++----
 .../applications/misc/jekyll/basic/gemset.nix | 64 ++++++-------
 .../misc/jekyll/full/Gemfile.lock             | 45 +++++-----
 pkgs/applications/misc/jekyll/full/gemset.nix | 90 +++++++++----------
 4 files changed, 116 insertions(+), 115 deletions(-)

diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
index f75889904326..332f1bbf1977 100644
--- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.1)
+    activesupport (6.0.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -10,19 +10,19 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    ffi (1.11.2)
+    ffi (1.12.2)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
-    html-pipeline (2.12.2)
+    html-pipeline (2.12.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
-    i18n (1.7.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     jekyll (4.0.0)
       addressable (~> 2.4)
@@ -44,11 +44,11 @@ GEM
     jekyll-mentions (1.5.1)
       html-pipeline (~> 2.3)
       jekyll (>= 3.7, < 5.0)
-    jekyll-sass-converter (2.0.1)
+    jekyll-sass-converter (2.1.0)
       sassc (> 2.0.1, < 3.0)
     jekyll-seo-tag (2.6.1)
       jekyll (>= 3.3, < 5.0)
-    jekyll-sitemap (1.3.1)
+    jekyll-sitemap (1.4.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
@@ -60,31 +60,31 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.3)
-    listen (3.2.0)
+    listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
     mini_portile2 (2.4.0)
-    minitest (5.13.0)
-    nokogiri (1.10.5)
+    minitest (5.14.0)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.1)
+    public_suffix (4.0.3)
     rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rouge (3.13.0)
+    rouge (3.16.0)
     safe_yaml (1.0.5)
     sassc (2.2.1)
       ffi (~> 1.9)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
-    zeitwerk (2.2.1)
+    unicode-display_width (1.6.1)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby
diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix
index 7fd9abd82a3f..d698d25cb3b9 100644
--- a/pkgs/applications/misc/jekyll/basic/gemset.nix
+++ b/pkgs/applications/misc/jekyll/basic/gemset.nix
@@ -5,10 +5,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "190xv21yz03zz8nlfly557ir859jr5zkwi89naziy65hskdnkw1s";
+      sha256 = "1dd6gh66ffdbhsxv33rxxsiciqyhhkm69l1yqspwdj2brvh1jzl1";
       type = "gem";
     };
-    version = "6.0.1";
+    version = "6.0.2.1";
   };
   addressable = {
     dependencies = ["public_suffix"];
@@ -36,10 +36,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
+      sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl";
       type = "gem";
     };
-    version = "1.1.5";
+    version = "1.1.6";
   };
   em-websocket = {
     dependencies = ["eventmachine" "http_parser.rb"];
@@ -67,10 +67,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0cbads5da12lb3j0mg2hjrd57s5qkkairxh2y6r9bqyblb5b8xbw";
+      sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4";
       type = "gem";
     };
-    version = "1.11.2";
+    version = "1.12.2";
   };
   forwardable-extended = {
     groups = ["default"];
@@ -98,10 +98,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "19hc7njr029pzqljpfhzhdi0p2rgn8ihn3bdnai2apy6nj1g1sg2";
+      sha256 = "1x5i330yks7pb1jxcbm9n6gslkgaqhyvl13d0cqxmxzkcajvb7z4";
       type = "gem";
     };
-    version = "2.12.2";
+    version = "2.12.3";
   };
   "http_parser.rb" = {
     groups = ["default"];
@@ -119,10 +119,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0hmypvx9iyc0b4hski7aic2xzm09cg1c7q1qlpnk3k8s5acxzyhl";
+      sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm";
       type = "gem";
     };
-    version = "1.7.0";
+    version = "1.8.2";
   };
   jekyll = {
     dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"];
@@ -163,10 +163,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xjzqpp35qr2vnf2zpak0srn773mp21glcq81a0iqpnrva7h80m3";
+      sha256 = "04ncr44wrilz26ayqwlg7379yjnkb29mvx4j04i62b7czmdrc9dv";
       type = "gem";
     };
-    version = "2.0.1";
+    version = "2.1.0";
   };
   jekyll-seo-tag = {
     dependencies = ["jekyll"];
@@ -185,10 +185,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0d3wqvbn37b24ag31xchb5hhnwfl6fnw6pyzp434jggbssxy0a5m";
+      sha256 = "0622rwsn5i0m5xcyzdn86l68wgydqwji03lqixdfm1f1xdfqrq0d";
       type = "gem";
     };
-    version = "1.3.1";
+    version = "1.4.0";
   };
   jekyll-watch = {
     dependencies = ["listen"];
@@ -249,10 +249,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1j3s7bprp2jfhgb959wd1h98978zg3207nl87yg8k5w7k08f7snb";
+      sha256 = "1w923wmdi3gyiky0asqdw5dnh3gcjs2xyn82ajvjfjwh6sn0clgi";
       type = "gem";
     };
-    version = "3.2.0";
+    version = "3.2.1";
   };
   mercenary = {
     groups = ["default"];
@@ -279,10 +279,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0w16p7cvslh3hxd3cia8jg4pd85z7rz7xqb16vh42gj4rijn8rmi";
+      sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz";
       type = "gem";
     };
-    version = "5.13.0";
+    version = "5.14.0";
   };
   nokogiri = {
     dependencies = ["mini_portile2"];
@@ -290,10 +290,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7";
+      sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8";
       type = "gem";
     };
-    version = "1.10.5";
+    version = "1.10.8";
   };
   pathutil = {
     dependencies = ["forwardable-extended"];
@@ -311,10 +311,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0";
+      sha256 = "1c6kq6s13idl2036b5lch8r7390f8w82cal8hcp4ml76fm2vdac7";
       type = "gem";
     };
-    version = "4.0.1";
+    version = "4.0.3";
   };
   rb-fsevent = {
     groups = ["default"];
@@ -332,20 +332,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4";
+      sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005";
       type = "gem";
     };
-    version = "0.10.0";
+    version = "0.10.1";
   };
   rouge = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1y90nx9ph9adnrpcsvs2adca2l3dyz8am2d2kzxkwd3a086ji7aw";
+      sha256 = "1ivsvkwdxl44q4xl8bnf6kqmvy47n98akcvlfmhaz0614zlf4bxi";
       type = "gem";
     };
-    version = "3.13.0";
+    version = "3.16.0";
   };
   safe_yaml = {
     groups = ["default"];
@@ -395,29 +395,29 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
+      sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp";
       type = "gem";
     };
-    version = "1.2.5";
+    version = "1.2.6";
   };
   unicode-display_width = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w";
+      sha256 = "1pppclzq4qb26g321553nm9xqca3zgllvpwb2kqxsdadwj51s09x";
       type = "gem";
     };
-    version = "1.6.0";
+    version = "1.6.1";
   };
   zeitwerk = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0w7w7y4jr6pcbgnzmh113fh8wz0f00xixl7qvf2rpvnanb68d5gw";
+      sha256 = "0jywi63w1m2b2w9fj9rjb9n3imf6p5bfijfmml1xzdnsrdrjz0x1";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "2.2.2";
   };
 }
\ No newline at end of file
diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock
index 43a2d0cf2d0b..ebde3c93e215 100644
--- a/pkgs/applications/misc/jekyll/full/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.1)
+    activesupport (6.0.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -17,23 +17,23 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     colorator (1.1.0)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
     execjs (2.7.0)
-    faraday (0.17.0)
+    faraday (1.0.0)
       multipart-post (>= 1.2, < 3)
     fast-stemmer (1.0.2)
-    ffi (1.11.2)
+    ffi (1.12.2)
     forwardable-extended (2.6.0)
     gemoji (3.0.1)
-    html-pipeline (2.12.2)
+    html-pipeline (2.12.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
-    i18n (1.7.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     jekyll (4.0.0)
       addressable (~> 2.4)
@@ -63,13 +63,13 @@ GEM
       html-pipeline (~> 2.3)
       jekyll (>= 3.7, < 5.0)
     jekyll-paginate (1.1.0)
-    jekyll-redirect-from (0.15.0)
+    jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
-    jekyll-sass-converter (2.0.1)
+    jekyll-sass-converter (2.1.0)
       sassc (> 2.0.1, < 3.0)
     jekyll-seo-tag (2.6.1)
       jekyll (>= 3.3, < 5.0)
-    jekyll-sitemap (1.3.1)
+    jekyll-sitemap (1.4.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
@@ -86,28 +86,29 @@ GEM
     liquid (4.0.3)
     liquid-c (4.0.0)
       liquid (>= 3.0.0)
-    listen (3.2.0)
+    listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
-    mime-types (3.3)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.1009)
     mini_portile2 (2.4.0)
-    minitest (5.13.0)
+    minitest (5.14.0)
     multipart-post (2.1.1)
-    nokogiri (1.10.5)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
-    octokit (4.14.0)
+    octokit (4.16.0)
+      faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.1)
+    public_suffix (4.0.3)
     rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.2.0)
-    rouge (3.13.0)
+    rdoc (6.2.1)
+    rouge (3.16.0)
     safe_yaml (1.0.5)
     sassc (2.2.1)
       ffi (~> 1.9)
@@ -117,12 +118,12 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
-    tomlrb (1.2.8)
-    tzinfo (1.2.5)
+    tomlrb (1.2.9)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.6.1)
     yajl-ruby (1.4.1)
-    zeitwerk (2.2.1)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby
diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix
index 2b1c03ce882d..44d7f1d0fc8c 100644
--- a/pkgs/applications/misc/jekyll/full/gemset.nix
+++ b/pkgs/applications/misc/jekyll/full/gemset.nix
@@ -5,10 +5,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "190xv21yz03zz8nlfly557ir859jr5zkwi89naziy65hskdnkw1s";
+      sha256 = "1dd6gh66ffdbhsxv33rxxsiciqyhhkm69l1yqspwdj2brvh1jzl1";
       type = "gem";
     };
-    version = "6.0.1";
+    version = "6.0.2.1";
   };
   addressable = {
     dependencies = ["public_suffix"];
@@ -90,10 +90,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an";
+      sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl";
       type = "gem";
     };
-    version = "1.1.5";
+    version = "1.1.6";
   };
   em-websocket = {
     dependencies = ["eventmachine" "http_parser.rb"];
@@ -132,10 +132,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0jk2bar4x6miq2cr73lv0lsbmw4cymiljvp29xb85jifsb3ba6az";
+      sha256 = "11yn7mhi4rl24brs2qfwysas14csjf1zmb835cfklqz5ka032xp6";
       type = "gem";
     };
-    version = "0.17.0";
+    version = "1.0.0";
   };
   fast-stemmer = {
     groups = ["default"];
@@ -164,10 +164,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0cbads5da12lb3j0mg2hjrd57s5qkkairxh2y6r9bqyblb5b8xbw";
+      sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4";
       type = "gem";
     };
-    version = "1.11.2";
+    version = "1.12.2";
   };
   forwardable-extended = {
     groups = ["default"];
@@ -195,10 +195,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "19hc7njr029pzqljpfhzhdi0p2rgn8ihn3bdnai2apy6nj1g1sg2";
+      sha256 = "1x5i330yks7pb1jxcbm9n6gslkgaqhyvl13d0cqxmxzkcajvb7z4";
       type = "gem";
     };
-    version = "2.12.2";
+    version = "2.12.3";
   };
   "http_parser.rb" = {
     groups = ["default"];
@@ -216,10 +216,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0hmypvx9iyc0b4hski7aic2xzm09cg1c7q1qlpnk3k8s5acxzyhl";
+      sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm";
       type = "gem";
     };
-    version = "1.7.0";
+    version = "1.8.2";
   };
   jekyll = {
     dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"];
@@ -303,10 +303,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1cwpr1z7irar81nm60prvl8ywadc82xhpdxs50n7kiic6q6lkjsb";
+      sha256 = "1nz6kd6qsa160lmjmls4zgx7fwcpp8ac07mpzy80z6zgd7jwldb6";
       type = "gem";
     };
-    version = "0.15.0";
+    version = "0.16.0";
   };
   jekyll-sass-converter = {
     dependencies = ["sassc"];
@@ -314,10 +314,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xjzqpp35qr2vnf2zpak0srn773mp21glcq81a0iqpnrva7h80m3";
+      sha256 = "04ncr44wrilz26ayqwlg7379yjnkb29mvx4j04i62b7czmdrc9dv";
       type = "gem";
     };
-    version = "2.0.1";
+    version = "2.1.0";
   };
   jekyll-seo-tag = {
     dependencies = ["jekyll"];
@@ -336,10 +336,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0d3wqvbn37b24ag31xchb5hhnwfl6fnw6pyzp434jggbssxy0a5m";
+      sha256 = "0622rwsn5i0m5xcyzdn86l68wgydqwji03lqixdfm1f1xdfqrq0d";
       type = "gem";
     };
-    version = "1.3.1";
+    version = "1.4.0";
   };
   jekyll-watch = {
     dependencies = ["listen"];
@@ -446,10 +446,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1j3s7bprp2jfhgb959wd1h98978zg3207nl87yg8k5w7k08f7snb";
+      sha256 = "1w923wmdi3gyiky0asqdw5dnh3gcjs2xyn82ajvjfjwh6sn0clgi";
       type = "gem";
     };
-    version = "3.2.0";
+    version = "3.2.1";
   };
   mercenary = {
     groups = ["default"];
@@ -467,10 +467,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0g7l18igjb9z7q4b2ykvyxyvjxlx5pwsmx5z3ibdbr6372xgfglk";
+      sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh";
       type = "gem";
     };
-    version = "3.3";
+    version = "3.3.1";
   };
   mime-types-data = {
     groups = ["default"];
@@ -497,10 +497,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0w16p7cvslh3hxd3cia8jg4pd85z7rz7xqb16vh42gj4rijn8rmi";
+      sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz";
       type = "gem";
     };
-    version = "5.13.0";
+    version = "5.14.0";
   };
   multipart-post = {
     groups = ["default"];
@@ -518,21 +518,21 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7";
+      sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8";
       type = "gem";
     };
-    version = "1.10.5";
+    version = "1.10.8";
   };
   octokit = {
-    dependencies = ["sawyer"];
+    dependencies = ["faraday" "sawyer"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1w7agbfg39jzqk81yad9xhscg31869277ysr2iwdvpjafl5lj4ha";
+      sha256 = "06kx258qa5k24q5pv8i4daaw3g57gif6p5k5h3gndj3q2jk6vhkn";
       type = "gem";
     };
-    version = "4.14.0";
+    version = "4.16.0";
   };
   pathutil = {
     dependencies = ["forwardable-extended"];
@@ -550,10 +550,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0";
+      sha256 = "1c6kq6s13idl2036b5lch8r7390f8w82cal8hcp4ml76fm2vdac7";
       type = "gem";
     };
-    version = "4.0.1";
+    version = "4.0.3";
   };
   rb-fsevent = {
     groups = ["default"];
@@ -571,30 +571,30 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4";
+      sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005";
       type = "gem";
     };
-    version = "0.10.0";
+    version = "0.10.1";
   };
   rdoc = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1gh7sc3xd4rgl9z90181cq580r1xqn063mmv51wdrhhsrkkw2bi9";
+      sha256 = "08862mr1575j8g32wma4pv2qwj4xpllk29i5j61hgf9nwn64afhc";
       type = "gem";
     };
-    version = "6.2.0";
+    version = "6.2.1";
   };
   rouge = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1y90nx9ph9adnrpcsvs2adca2l3dyz8am2d2kzxkwd3a086ji7aw";
+      sha256 = "1ivsvkwdxl44q4xl8bnf6kqmvy47n98akcvlfmhaz0614zlf4bxi";
       type = "gem";
     };
-    version = "3.13.0";
+    version = "3.16.0";
   };
   safe_yaml = {
     groups = ["default"];
@@ -654,10 +654,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0g28ssfal6vry3cmhy509ba3vi5d5aggz1gnffnvvmc8ml8vkpiv";
+      sha256 = "0njkyq5csj4km8spmw33b5902v254wvyvqq1b0f0kky5hs7bvrgg";
       type = "gem";
     };
-    version = "1.2.8";
+    version = "1.2.9";
   };
   tzinfo = {
     dependencies = ["thread_safe"];
@@ -665,20 +665,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
+      sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp";
       type = "gem";
     };
-    version = "1.2.5";
+    version = "1.2.6";
   };
   unicode-display_width = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w";
+      sha256 = "1pppclzq4qb26g321553nm9xqca3zgllvpwb2kqxsdadwj51s09x";
       type = "gem";
     };
-    version = "1.6.0";
+    version = "1.6.1";
   };
   yajl-ruby = {
     groups = ["default"];
@@ -707,9 +707,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0w7w7y4jr6pcbgnzmh113fh8wz0f00xixl7qvf2rpvnanb68d5gw";
+      sha256 = "0jywi63w1m2b2w9fj9rjb9n3imf6p5bfijfmml1xzdnsrdrjz0x1";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "2.2.2";
   };
 }
\ No newline at end of file

From ad0c620a089be000b5523e50b05bc982ff6dba49 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 28 Feb 2020 11:28:47 +0100
Subject: [PATCH 1851/4636] html-proofer: Update the dependencies (security,
 CVE-2020-7595)

This updates nokogiri to 1.10.8 for CVE-2020-7595 [0].

[0]: https://github.com/sparklemotion/nokogiri/issues/1992
---
 pkgs/tools/misc/html-proofer/Gemfile.lock |  6 +++---
 pkgs/tools/misc/html-proofer/gemset.nix   | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock
index cab69d41f936..a998ccb3f63c 100644
--- a/pkgs/tools/misc/html-proofer/Gemfile.lock
+++ b/pkgs/tools/misc/html-proofer/Gemfile.lock
@@ -5,7 +5,7 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ethon (0.12.0)
       ffi (>= 1.3.0)
-    ffi (1.12.1)
+    ffi (1.12.2)
     html-proofer (3.15.1)
       addressable (~> 2.3)
       mercenary (~> 0.3)
@@ -16,7 +16,7 @@ GEM
       yell (~> 2.0)
     mercenary (0.4.0)
     mini_portile2 (2.4.0)
-    nokogiri (1.10.7)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.2)
       nokogiri (~> 1.8, >= 1.8.4)
@@ -25,7 +25,7 @@ GEM
     rainbow (3.0.0)
     typhoeus (1.3.1)
       ethon (>= 0.9.0)
-    yell (2.2.1)
+    yell (2.2.2)
 
 PLATFORMS
   ruby
diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix
index fbf65a8a0c03..5ddb6accb940 100644
--- a/pkgs/tools/misc/html-proofer/gemset.nix
+++ b/pkgs/tools/misc/html-proofer/gemset.nix
@@ -26,10 +26,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0i2vxj3ryvih5y06mgsa19dwy8fpyx58byh5szp7m6i702p78rni";
+      sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4";
       type = "gem";
     };
-    version = "1.12.1";
+    version = "1.12.2";
   };
   html-proofer = {
     dependencies = ["addressable" "mercenary" "nokogumbo" "parallel" "rainbow" "typhoeus" "yell"];
@@ -68,10 +68,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln";
+      sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8";
       type = "gem";
     };
-    version = "1.10.7";
+    version = "1.10.8";
   };
   nokogumbo = {
     dependencies = ["nokogiri"];
@@ -130,9 +130,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1r2kygdh193qdbjjwhfghzl9czj4jr9xrw3gqyg5hmvmn7lygjwm";
+      sha256 = "1g16kcdhdfvczn7x81jiq6afg3bdxmb73skqjyjlkp5nqcy6y5hx";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "2.2.2";
   };
 }
\ No newline at end of file

From fca7f386db55f4e3bd456855113969e05c0b4804 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 20 Feb 2020 18:37:35 +0100
Subject: [PATCH 1852/4636] trv: remove at 0.1.3

---
 pkgs/development/tools/misc/trv/default.nix | 37 ---------------------
 pkgs/top-level/all-packages.nix             |  2 --
 pkgs/top-level/ocaml-packages.nix           |  2 --
 3 files changed, 41 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/trv/default.nix

diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix
deleted file mode 100644
index 2e056306db4f..000000000000
--- a/pkgs/development/tools/misc/trv/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{stdenv, fetchFromGitHub, ocaml, findlib, camlp4, core_p4, async_p4, async_unix_p4
-, re2_p4, async_extra_p4, sexplib_p4, async_shell, core_extended_p4, async_find
-, cohttp, conduit, magic-mime
-}:
-
-assert stdenv.lib.versionOlder "4.02" ocaml.version;
-
-stdenv.mkDerivation rec {
-  pname = "trv";
-  version = "0.1.3";
-
-  src = fetchFromGitHub {
-    owner = "afiniate";
-    repo = "trv";
-    rev = version;
-    sha256 = "0fv0zh76djqhkzfzwv6k60rnky50pw9gn01lwhijrggrcxrrphz1";
-  };
-
-
-  buildInputs = [ ocaml findlib camlp4 ];
-  propagatedBuildInputs = [ core_p4 async_p4 async_unix_p4
-                            async_extra_p4 sexplib_p4 async_shell core_extended_p4
-                            async_find cohttp conduit magic-mime re2_p4 ];
-
-  createFindlibDestdir = true;
-  dontStrip = true;
-
-  installFlags = [ "SEMVER=${version}" "PREFIX=$(out)" ];
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/afiniate/trv;
-    description = "Shim for vrt to enable bootstrapping";
-    license = licenses.asl20;
-    maintainers = [ maintainers.ericbmerritt ];
-    platforms = ocaml.meta.platforms or [];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 02dcca5065df..8c9720287083 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8986,8 +8986,6 @@ in
     stdenv = gccStdenv;
   };
 
-  inherit (ocaml-ng.ocamlPackages_4_02) trv;
-
   bupc = callPackage ../development/compilers/bupc { };
 
   urn = callPackage ../development/compilers/urn { };
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index dc7abbd15a62..d3f0d620fdec 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1207,8 +1207,6 @@ let
 
     ocamlnat = callPackage  ../development/ocaml-modules/ocamlnat { };
 
-    trv = callPackage ../development/tools/misc/trv { };
-
     omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { };
 
     google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { };

From 305dc2a199a8a9571b22d26fc67420c9e5fb8524 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 20 Feb 2020 18:37:40 +0100
Subject: [PATCH 1853/4636] ocamlPackages.cohttp_p4: remove at 0.19.3

---
 .../ocaml-modules/cohttp/0.19.3.nix           | 30 -------------------
 pkgs/top-level/ocaml-packages.nix             | 10 +------
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 pkgs/development/ocaml-modules/cohttp/0.19.3.nix

diff --git a/pkgs/development/ocaml-modules/cohttp/0.19.3.nix b/pkgs/development/ocaml-modules/cohttp/0.19.3.nix
deleted file mode 100644
index 24547a03a086..000000000000
--- a/pkgs/development/ocaml-modules/cohttp/0.19.3.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, buildOcaml, fetchurl, ocaml, cmdliner, re, uri_p4, fieldslib_p4
-, sexplib_p4, conduit , stringext, base64, magic-mime, ounit, alcotest
-, asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
-, lwt ? null, async_p4 ? null, async_ssl_p4 ? null
-}:
-
-buildOcaml rec {
-  name = "cohttp";
-  version = "0.19.3";
-
-  minimumSupportedOcamlVersion = "4.01";
-
-  src = fetchurl {
-    url = "https://github.com/mirage/ocaml-cohttp/archive/v${version}.tar.gz";
-    sha256 = "1nrzpd4h52c1hnzcgsz462676saj9zss708ng001h54dglk8i1iv";
-  };
-
-  buildInputs = [ alcotest cmdliner conduit magic-mime ounit lwt ]
-  ++ stdenv.lib.optionals asyncSupport [ async_p4 async_ssl_p4 ];
-  propagatedBuildInputs = [ re stringext uri_p4 fieldslib_p4 sexplib_p4 base64 ];
-
-  buildFlags = [ "PREFIX=$(out)" ];
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/mirage/ocaml-cohttp;
-    description = "Very lightweight HTTP server using Lwt or Async";
-    license = licenses.mit;
-    maintainers = [ maintainers.ericbmerritt ];
-  };
-}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index d3f0d620fdec..72d41621c235 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -154,15 +154,7 @@ let
 
     cmdliner = callPackage ../development/ocaml-modules/cmdliner { };
 
-    cohttp_p4 = callPackage ../development/ocaml-modules/cohttp/0.19.3.nix {
-      base64 = base64_2;
-      lwt = lwt2;
-    };
-
-    cohttp =
-      if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/cohttp { }
-      else cohttp_p4;
+    cohttp = callPackage ../development/ocaml-modules/cohttp { };
 
     cohttp-lwt = callPackage ../development/ocaml-modules/cohttp/lwt.nix { };
 

From fe0ebdf8257bc817f1b76a453d63b40309a0d937 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 20 Feb 2020 18:37:42 +0100
Subject: [PATCH 1854/4636] ocamlPackages.conduit_p4: remove at 0.10.0

---
 .../ocaml-modules/conduit/0.10.0.nix          | 26 -------------------
 pkgs/top-level/ocaml-packages.nix             |  9 +------
 2 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 pkgs/development/ocaml-modules/conduit/0.10.0.nix

diff --git a/pkgs/development/ocaml-modules/conduit/0.10.0.nix b/pkgs/development/ocaml-modules/conduit/0.10.0.nix
deleted file mode 100644
index 4d1c43e0ae18..000000000000
--- a/pkgs/development/ocaml-modules/conduit/0.10.0.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, buildOcaml, fetchurl, ocaml, sexplib_p4, stringext, uri_p4, cstruct, ipaddr_p4
-, asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
-, async_p4 ? null, async_ssl_p4 ? null, lwt ? null
-}:
-
-buildOcaml rec {
-  name = "conduit";
-  version = "0.10.0";
-
-  src = fetchurl {
-    url = "https://github.com/mirage/ocaml-conduit/archive/v${version}.tar.gz";
-    sha256 = "1jz2skzsyg0axlkk9s6ahfblfrjx599wisyfs0cvn5dik9jqjadh";
-  };
-
-  propagatedBuildInputs = [ sexplib_p4 stringext uri_p4 cstruct ipaddr_p4 ];
-  buildInputs = stdenv.lib.optional (lwt != null) lwt
-             ++ stdenv.lib.optional (asyncSupport && async_p4 != null) async_p4
-             ++ stdenv.lib.optional (asyncSupport && async_ssl_p4 != null) async_ssl_p4;
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/mirage/ocaml-conduit;
-    description = "Resolve URIs into communication channels for Async or Lwt ";
-    license = licenses.mit;
-    maintainers = [ maintainers.ericbmerritt ];
-  };
-}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 72d41621c235..471810235399 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -160,14 +160,7 @@ let
 
     cohttp-lwt-unix = callPackage ../development/ocaml-modules/cohttp/lwt-unix.nix { };
 
-    conduit_p4 = callPackage ../development/ocaml-modules/conduit/0.10.0.nix {
-       lwt = lwt2;
-    };
-
-    conduit =
-      if lib.versionOlder "4.03" ocaml.version
-      then callPackage ../development/ocaml-modules/conduit { }
-      else conduit_p4;
+    conduit = callPackage ../development/ocaml-modules/conduit { };
 
     conduit-lwt = callPackage ../development/ocaml-modules/conduit/lwt.nix { };
 

From 9095ca22bcf9049c62d8fba941a096a34decafb9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 27 Feb 2020 09:41:59 +0100
Subject: [PATCH 1855/4636] ocamlPackages.ocaml_plugin: remove at 0.11.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This package is broken with glibc ≥ 2.28
---
 pkgs/development/ocaml-modules/janestreet/default.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix
index a8fff893d5c9..d3aaed012431 100644
--- a/pkgs/development/ocaml-modules/janestreet/default.nix
+++ b/pkgs/development/ocaml-modules/janestreet/default.nix
@@ -565,14 +565,6 @@ rec {
     meta.description = "Helpers for incremental operations on map like data structures";
   };
 
-  ocaml_plugin = janePackage {
-    pname = "ocaml_plugin";
-    hash = "0fal5j59qkbksg6ak1ngn92pcgg3f9gwfaglpxb7l6bck20kaigp";
-    buildInputs = [ ocamlbuild ];
-    propagatedBuildInputs = [ async ];
-    meta.description = "Automatically build and dynlink ocaml source files";
-  };
-
   parsexp_io = janePackage {
     pname = "parsexp_io";
     hash = "0rhdl40jiirvv6fhgjk50n8wzs3jly5d8dyyyfgpjgl39mwkjjnb";

From 5c274c6c051bea303c2d8165a1f581644f00f650 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 27 Feb 2020 09:42:08 +0100
Subject: [PATCH 1856/4636] ocamlPackages.core_profiler: remove at 0.11.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This package is broken with glibc ≥ 2.28
---
 pkgs/development/ocaml-modules/janestreet/default.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix
index d3aaed012431..ff93d65357a8 100644
--- a/pkgs/development/ocaml-modules/janestreet/default.nix
+++ b/pkgs/development/ocaml-modules/janestreet/default.nix
@@ -515,13 +515,6 @@ rec {
     meta.description = "Micro-benchmarking library for OCaml";
   };
 
-  core_profiler = janePackage {
-    pname = "core_profiler";
-    hash = "1kaaw3jp3qarbd9rgpjfb9md0dqblf2bxiqb245sqmx4c1346v1c";
-    propagatedBuildInputs = [ core_extended ];
-    meta.description = "Profiling library";
-  };
-
   csvfields = janePackage {
     pname = "csvfields";
     hash = "10zw4fjlniivfdzzz79lnbvcjnhk5y16m1p8mn4xbs23n6mbix0f";

From b6b3e047593dff14c871214bf5df691a8c2c23ed Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Fri, 28 Feb 2020 15:19:51 -0500
Subject: [PATCH 1857/4636] pam_ssh_agent_auth: fix dependency on insecure
 openssl

There have been a couple of patches floating around for about the last
18 months.  While they originated with FreeBSD, but they've been
adopted by Gentoo and Debian as well---and the most straightforward
way to get access to them was from the Debian repository.
---
 .../linux/pam_ssh_agent_auth/default.nix      | 23 ++++++++++++++++++-
 pkgs/top-level/all-packages.nix               |  4 +---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix
index 48c02be9c389..b47ad4815b5b 100644
--- a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix
+++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pam, openssl, perl }:
+{ stdenv, fetchpatch, fetchurl, pam, openssl, perl }:
 
 stdenv.mkDerivation rec {
   name = "pam_ssh_agent_auth-0.10.3";
@@ -12,10 +12,31 @@ stdenv.mkDerivation rec {
     [ # Allow multiple colon-separated authorized keys files to be
       # specified in the file= option.
       ./multiple-key-files.patch
+      (fetchpatch {
+        name = "openssl-1.1.1-1.patch";
+        url = "https://sources.debian.org/data/main/p/pam-ssh-agent-auth/0.10.3-3/debian/patches/openssl-1.1.1-1.patch";
+        sha256 = "1ndp5j4xfhzshhnl345gb4mkldx6vjfa7284xgng6ikhzpc6y7pf";
+      })
+      (fetchpatch {
+        name = "openssl-1.1.1-2.patch";
+        url = "https://sources.debian.org/data/main/p/pam-ssh-agent-auth/0.10.3-3/debian/patches/openssl-1.1.1-2.patch";
+        sha256 = "0ksrs4xr417by8klf7862n3dircvnw30an1akq4pnsd3ichscmww";
+      })
     ];
 
   buildInputs = [ pam openssl perl ];
 
+  # It's not clear to me why this is necessary, but without it, you see:
+  #
+  # checking OpenSSL header version... 1010104f (OpenSSL 1.1.1d  10 Sep 2019)
+  # checking OpenSSL library version... 1010104f (OpenSSL 1.1.1d  10 Sep 2019)
+  # checking whether OpenSSL's headers match the library... no
+  # configure: WARNING: Your OpenSSL headers do not match your
+  # library. Check config.log for details.
+  #
+  # ...despite the fact that clearly the values match
+  configureFlags = [ "--without-openssl-header-check" ];
+
   enableParallelBuilding = true;
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e94c64551407..1c4539c2f1ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17067,9 +17067,7 @@ in
 
   pam_pgsql = callPackage ../os-specific/linux/pam_pgsql { };
 
-  pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth {
-    openssl = openssl_1_0_2;
-  };
+  pam_ssh_agent_auth = callPackage ../os-specific/linux/pam_ssh_agent_auth { };
 
   pam_u2f = callPackage ../os-specific/linux/pam_u2f { };
 

From fc8e5c65ca5c96e626e84fcf30e1b073820116d4 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 28 Feb 2020 15:30:05 -0500
Subject: [PATCH 1858/4636] linux: 5.4.22 -> 5.4.23

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 8c75304da7fc..c1ea3b1cd978 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.4.22";
+  version = "5.4.23";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "06kx9bmrrk1brici8wvvd6dxqawgcig4i59pwllcq39rgs6wn6v6";
+    sha256 = "1jhyg2yc03fka92l7hwdajim6q5rk538hjdr1gwgvpfyyp6sla1z";
   };
 } // (args.argsOverride or {}))

From b4af096c4c23798a77dcecafd5b401d4f4651165 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 28 Feb 2020 15:31:15 -0500
Subject: [PATCH 1859/4636] linux: 5.5.6 -> 5.5.7

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.5.nix b/pkgs/os-specific/linux/kernel/linux-5.5.nix
index 061e719cc2b4..3f8f3b774c89 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.5.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.5.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.5.6";
+  version = "5.5.7";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0dgfwqmkqlrn2anwf2bj7lgl9bi4fhkmp44jhmyjc5vmknmqik2l";
+    sha256 = "0j3ykz9yym2hvv3qx286g4yrx2ala4b1d5p9zif9qmch28ryyhxq";
   };
 } // (args.argsOverride or {}))

From 2bbdd94868b41e0a4d64b3902301bb411e42ecb8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 28 Feb 2020 15:33:12 -0500
Subject: [PATCH 1860/4636] oh-my-zsh: 2020-02-26 -> 2020-02-28

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

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 1e533c1df048..1c3367b12dbb 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2020-02-26";
+  version = "2020-02-28";
   pname = "oh-my-zsh";
-  rev = "01bfb57446fdc77e8b4ae696729688284392c0e6";
+  rev = "1689e9bb907ab184d7418dd88bc2639a794c916d";
 
   src = fetchgit { inherit rev;
     url = "https://github.com/ohmyzsh/ohmyzsh";
-    sha256 = "1mkmdyzz89c48zncszv67lkhgkincpzx5hfssbyfyj3pkrgf97xx";
+    sha256 = "095gjh2xymjn808lvbln7qyccnv5gf9nz911a41rzs9cfsvkbsl0";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];

From 8b748207366e6e2abd38bf6fd95ec6eb0880ecc5 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 28 Feb 2020 22:46:06 +0100
Subject: [PATCH 1861/4636] cargo-deb: 1.23.1 -> 1.23.2

---
 pkgs/tools/package-management/cargo-deb/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-deb/default.nix b/pkgs/tools/package-management/cargo-deb/default.nix
index 493633d99f06..623c8e2065c7 100644
--- a/pkgs/tools/package-management/cargo-deb/default.nix
+++ b/pkgs/tools/package-management/cargo-deb/default.nix
@@ -6,18 +6,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-deb";
-  version = "1.23.1";
+  version = "1.23.2";
 
   src = fetchFromGitHub {
     owner = "mmstick";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "0dkkbyzimnzfyrzmfn83jqg5xq53wzrknixnyh46cniqffqhd663";
+    rev = "367910e0020de93f45c175c92a37a53ee401978f";
+    sha256 = "1s0xv818rlafdzpb70c1ldv5iq3hh2jxj7g3l6p7v20q1wx0nnvv";
   };
 
   buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 
-  cargoSha256 = "0ji6d5a23rzhkkk27iigqcf2zw3mx1p1ap0cryqcj43z5ixdygiw";
+  cargoSha256 = "0ffzq2gm0f56vyfkmdzxfs5z1xsdj2kcsyc1fdrk4k1cylqn2f47";
 
   meta = with lib; {
     description = "Generate Debian packages from information in Cargo.toml";

From 096691a787748d643b726635ef20ecf0edb7761f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 28 Feb 2020 22:46:27 +0100
Subject: [PATCH 1862/4636] cargo-crev: 0.16.0 -> 0.16.1

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

diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix
index b1d326ebdb76..1093440ecbfe 100644
--- a/pkgs/development/tools/rust/cargo-crev/default.nix
+++ b/pkgs/development/tools/rust/cargo-crev/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-crev";
-  version = "0.16.0";
+  version = "0.16.1";
 
   src = fetchFromGitHub {
     owner = "crev-dev";
     repo = "cargo-crev";
     rev = "v${version}";
-    sha256 = "1vf78hrc84xgr73r72vmilh24s4qy80a1z6gyk97nd8ipn93m2k5";
+    sha256 = "16da30zbv8f7w8bxsssmrpzm41a966wby1l6ldyiiszs980qh7c5";
   };
 
-  cargoSha256 = "0h7izq4sq6nf0gip7ylyglq1mvpfipm4qmjsifb3x559lqwfbxli";
+  cargoSha256 = "0z365pgdd95apk2zz2n0gx85s0gf8ccfbqippxqn1fdsppihib6g";
 
   nativeBuildInputs = [ pkgconfig ];
 

From 41aef772bbcb1afbf77f7bfc207672e1558db2fe Mon Sep 17 00:00:00 2001
From: Raphael Das Gupta <raphael.das.gupta@hsr.ch>
Date: Thu, 27 Feb 2020 16:55:24 +0100
Subject: [PATCH 1863/4636] josm: 15806 -> 15937

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

diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index fd56830d17f6..4a47437b2497 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "josm";
-  version = "15806";
+  version = "15937";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "03a1hw566z6jd232hjkxjxqs1ggd0ir12ndkz9swxkif6aqbrnvs";
+    sha256 = "1mwrmhs5k3b3pvl3cmq78h8gh8zna06l4sym1a4vvlcx6j26a01f";
   };
 
   buildInputs = [ jdk11 makeWrapper ];

From b001273b59f9bf6156f27ff09b63d9bb5a189091 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Feb 2020 22:57:36 +0000
Subject: [PATCH 1864/4636] libgdata: 0.17.11 -> 0.17.12

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

diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix
index 6830d47df74b..7f820aae4ec3 100644
--- a/pkgs/development/libraries/libgdata/default.nix
+++ b/pkgs/development/libraries/libgdata/default.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libgdata";
-  version = "0.17.11";
+  version = "0.17.12";
 
   outputs = [ "out" "dev" "installedTests" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "11m99sh2k679rnsvqsi95s1l0r8lkvj61dmwg1pnxvsd5q91g6bb";
+    sha256 = "0613nihsvwvdnmlbjnwi8zqxgmpwyxdapzznq4cy1fp84246zzd0";
   };
 
   patches = [
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "GData API library";
-    homepage = https://wiki.gnome.org/Projects/libgdata;
+    homepage = "https://wiki.gnome.org/Projects/libgdata";
     maintainers = with maintainers; [ raskin lethalman ] ++ gnome3.maintainers;
     platforms = platforms.linux;
     license = licenses.lgpl21Plus;

From 330fab179866806ca2460917c9012d35217950f5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Feb 2020 23:49:19 +0000
Subject: [PATCH 1865/4636] gnome3.libsoup: 2.68.3 -> 2.68.4

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

diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 2d2f2da6a399..6925bd2de4b8 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libsoup";
-  version = "2.68.3";
+  version = "2.68.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1yxs0ax4rq3g0lgkbv7mz497rqj16iyyizddyc13gzxh6n7b0jsk";
+    sha256 = "151j5dc84gbl6a917pxvd0b372lw5za48n63lyv6llfc48lv2l1d";
   };
 
   postPatch = ''
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "HTTP client/server library for GNOME";
-    homepage = https://wiki.gnome.org/Projects/libsoup;
+    homepage = "https://wiki.gnome.org/Projects/libsoup";
     license = stdenv.lib.licenses.gpl2;
     inherit (glib.meta) maintainers platforms;
   };

From ef97505059a37f5539cc4593751e0e190702ce3d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 28 Feb 2020 19:20:00 -0500
Subject: [PATCH 1866/4636] certigo: 1.11.0 -> 1.12.1

---
 pkgs/tools/admin/certigo/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix
index 923344c64118..5474cb254298 100644
--- a/pkgs/tools/admin/certigo/default.nix
+++ b/pkgs/tools/admin/certigo/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "certigo";
-  version = "1.11.0";
+  version = "1.12.1";
 
   src = fetchFromGitHub {
     owner = "square";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1vi4gn484kc7vyxnm2nislzy587h2h4gc8d197vslhyfygac9y7b";
+    sha256 = "0siwbxxzknmbsjy23d0lvh591ngabqhr2g8mip0siwa7c1y7ivv4";
   };
 
-  goPackagePath = "github.com/square/certigo";
+  modSha256 = "1i5n5yh6nvv2i2nm60vqy1gngj8p5w6ma5fcwmp7bl4jxjrzbi83";
 
   meta = with stdenv.lib; {
     description = "A utility to examine and validate certificates in a variety of formats";

From f23674a51a4a559f04ceb97d642ba079dfb00eef Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Feb 2020 23:19:15 +0000
Subject: [PATCH 1867/4636] kubeseal: 0.9.7 -> 0.9.8

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

diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix
index db71b9b7e30b..ef5f03253979 100644
--- a/pkgs/applications/networking/cluster/kubeseal/default.nix
+++ b/pkgs/applications/networking/cluster/kubeseal/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "kubeseal";
-  version = "0.9.7";
+  version = "0.9.8";
 
   src = fetchFromGitHub {
     owner = "bitnami-labs";
     repo = "sealed-secrets";
     rev = "v${version}";
-    sha256 = "01skvf8jsianyk9xq7lhcnpn3anhi4lma9bn66ngv279av147h9c";
+    sha256 = "1d3m13pl30w8d7pxjdhspxprk2jm8cm25rc5s867z4a37c5igv7y";
   };
 
   modSha256 = "04dmjyz3vi2l0dfpyy42lkp2fv1vlfkvblrxh1dvb37phrkd5lbd";

From 87762c126aed3124989a4dfd98b24d0581b4534d Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 28 Feb 2020 15:18:21 -0800
Subject: [PATCH 1868/4636] shellcheck: fix build

---
 .../haskell-modules/configuration-common.nix          | 11 +++++++++++
 .../haskell-modules/configuration-hackage2nix.yaml    |  1 -
 pkgs/development/haskell-modules/hackage-packages.nix |  1 -
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d0af64c59860..b39b454b1d53 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -48,6 +48,17 @@ self: super: {
   # Needs older QuickCheck version
   attoparsec-varword = dontCheck super.attoparsec-varword;
 
+  ShellCheck = overrideCabal super.ShellCheck (drv: {
+    patches = [
+      # cabal 3.0 support
+      ( pkgs.fetchpatch {
+        url = "https://github.com/koalaman/shellcheck/commit/2c026f1ec7c205c731ff2a0ccd85365f37245.patch";
+        sha256 = "0z6yf350ngr6rwfkvdy670c476fgzj8a0n4ppdm1xr8r1lij7sfz";
+        excludes = [ "Dockerfile" ];
+      })
+    ];
+  });
+
   # Tests are failing
   # https://github.com/bos/statistics/issues/123
   statistics = dontCheck super.statistics;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 2b95625ad5e1..06acf07ad79e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -9248,7 +9248,6 @@ broken-packages:
   - Shellac-editline
   - Shellac-haskeline
   - Shellac-readline
-  - ShellCheck
   - shellish
   - shellmate
   - shellmate-extras
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 639e73e84a36..7425f9e784d7 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -17899,7 +17899,6 @@ self: {
        description = "Shell script analysis tool";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "Shellac" = callPackage

From add741efc4468477c30a30c4ebdc1229217bddfb Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 28 Feb 2020 16:02:19 -0800
Subject: [PATCH 1869/4636] release.nix: remove stack job from x86_64-darwin

---
 pkgs/top-level/release.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 78d70c0239a5..e0723523f4e5 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -57,7 +57,8 @@ let
               jobs.python3.x86_64-darwin
               jobs.ruby.x86_64-darwin
               jobs.rustc.x86_64-darwin
-              jobs.stack.x86_64-darwin
+              # blocking ofBorg CI 2020-02-28
+              # jobs.stack.x86_64-darwin
               jobs.stdenv.x86_64-darwin
               jobs.vim.x86_64-darwin
               jobs.cachix.x86_64-darwin

From a54dcfe076c5733b48e9165c33a26853a214395d Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 28 Feb 2020 19:15:30 -0500
Subject: [PATCH 1870/4636] pantheon.appcenter: 3..2.1 -> 3.2.2

https://github.com/elementary/appcenter/releases/tag/3.2.2
---
 pkgs/desktops/pantheon/apps/appcenter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix
index 244146771c43..3f4f04377ed3 100644
--- a/pkgs/desktops/pantheon/apps/appcenter/default.nix
+++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation rec {
   pname = "appcenter";
-  version = "3.2.1";
+  version = "3.2.2";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "18l0kbm778728rksifslnaw2arnpr92sk24nw26k1zvs4prz5i7j";
+    sha256 = "0aqslkig7vs95z719mp3xrl1zp65ypp2lq9aikvsis6nssadn2cd";
   };
 
   passthru = {

From e85290ba5494276c89c40790ba112eb19a1d7a43 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 28 Feb 2020 19:16:05 -0500
Subject: [PATCH 1871/4636] pantheon.sideload: 1.0.0 -> 1.0.1

https://github.com/elementary/sideload/releases/tag/1.0.1
---
 pkgs/desktops/pantheon/apps/sideload/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix
index f04cb7cd53b3..efe34da7b262 100644
--- a/pkgs/desktops/pantheon/apps/sideload/default.nix
+++ b/pkgs/desktops/pantheon/apps/sideload/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sideload";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "1qi4wm773bf1szi5a77g9lxjn305v1m85j4nb6il9q4qlh9b1cs5";
+    sha256 = "0camg34skiisfbf9s9awfkdkq72s9jhl4ipmax7dqr33n8a86hic";
   };
 
   passthru = {

From ecca257d736c7567640489a90f1df5a643cd56f6 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 28 Feb 2020 19:16:38 -0500
Subject: [PATCH 1872/4636] pantheon.switchboard-plug-bluetooth: 2.3.0 -> 2.3.1

https://github.com/elementary/switchboard-plug-bluetooth/releases/tag/2.3.1
---
 .../pantheon/apps/switchboard-plugs/bluetooth/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
index 6f2fefa4873f..b5adf7c97e28 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-bluetooth";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "1m8nzav976xs3sash2nbyrfn2sk7aah352ypihbp7bacid5wnhr7";
+    sha256 = "06ws1swl2jg6a1b3m4b1v1rawgzs5k7rq4dcnd5v0czda110yhg0";
   };
 
   passthru = {

From b4943b018064d75ece0647867416df89bd549241 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 28 Feb 2020 19:17:14 -0500
Subject: [PATCH 1873/4636] pantheon.elementary-greeter: 5.0.1 -> 5.0.2

https://github.com/elementary/greeter/releases/tag/5.0.2
---
 pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
index dc0b764d3197..21698bed22df 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
@@ -28,7 +28,7 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-greeter";
-  version = "5.0.1";
+  version = "5.0.2";
 
   repoName = "greeter";
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = repoName;
     rev = version;
-    sha256 = "0qy6iw71p8hv6fpcr7p3hqbzlcpxrz18qdm1inannq68d0pxfx76";
+    sha256 = "0557lr8czqwjrm39ykfacqw5x7nng7fmf1gxkif70xg7dk3lc7gd";
   };
 
   passthru = {

From 5cf6f3a46bb9df089dbba1dd282c99296c580166 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 26 Feb 2020 13:22:17 +0000
Subject: [PATCH 1874/4636] nss_wrapper: 1.1.7 -> 1.1.8

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

diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix
index 40ee4f890d49..dec4e61a7bc8 100644
--- a/pkgs/development/libraries/nss_wrapper/default.nix
+++ b/pkgs/development/libraries/nss_wrapper/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "nss_wrapper-1.1.7";
+  name = "nss_wrapper-1.1.8";
 
   src = fetchurl {
     url = "mirror://samba/cwrap/${name}.tar.gz";
-    sha256 = "1pa7gakprkxblxdqbcy2242lk924gvzdgfr5648wb7cslksm7hbq";
+    sha256 = "1cnzhnz68ywx1jwj6xaxv8hg8hpm63ssxmrlhsz3sfgjhfkmw95l";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 3be04570e06e46c184e3a00455fe3518cedcc1bb Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 18 Feb 2020 11:28:28 -0500
Subject: [PATCH 1875/4636] nixos/pantheon: add docs

---
 .../x11/desktop-managers/pantheon.nix         |   5 +-
 .../x11/desktop-managers/pantheon.xml         | 130 ++++++++++++++++++
 2 files changed, 134 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/services/x11/desktop-managers/pantheon.xml

diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index b46a2d189ef9..869c66944897 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -16,7 +16,10 @@ in
 
 {
 
-  meta.maintainers = pkgs.pantheon.maintainers;
+  meta = {
+    doc = ./pantheon.xml;
+    maintainers = pkgs.pantheon.maintainers;
+  };
 
   options = {
 
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.xml b/nixos/modules/services/x11/desktop-managers/pantheon.xml
new file mode 100644
index 000000000000..4d92a7446c0d
--- /dev/null
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.xml
@@ -0,0 +1,130 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xml:id="chap-pantheon">
+ <title>Pantheon Destkop</title>
+ <para>
+  Pantheon is the desktop environment created for the elementary OS distribution. It is written from scratch in Vala, utilizing GNOME technologies with GTK 3 and Granite.
+ </para>
+ <section xml:id="sec-pantheon-enable">
+  <title>Enabling Pantheon</title>
+
+  <para>
+   All of Pantheon is working in NixOS and the applications should be available, aside from a few <link xlink:href="https://github.com/NixOS/nixpkgs/issues/58161">exceptions</link>. To enable Pantheon, set
+<programlisting>
+<xref linkend="opt-services.xserver.desktopManager.pantheon.enable"/> = true;
+</programlisting>
+   This automatically enables LightDM and Pantheon's LightDM greeter. If you'd like to disable this, set
+<programlisting>
+<xref linkend="opt-services.xserver.displayManager.lightdm.greeters.pantheon.enable"/> = false;
+<xref linkend="opt-services.xserver.displayManager.lightdm.enable"/> = false;
+</programlisting>
+   but please be aware using Pantheon without LightDM as a display manager will break screenlocking from the UI. The NixOS module for Pantheon installs all of Pantheon's default applications. If you'd like to not install Pantheon's apps, set
+<programlisting>
+<xref linkend="opt-services.pantheon.apps.enable"/> = false;
+</programlisting>
+   You can also use <xref linkend="opt-environment.pantheon.excludePackages"/> to remove any other app (like <package>geary</package>).
+  </para>
+ </section>
+ <section xml:id="sec-pantheon-wingpanel-switchboard">
+  <title>Wingpanel and Switchboard plugins</title>
+
+  <para>
+   Wingpanel and Switchboard work differently than they do in other distributions, as far as using plugins. You cannot install a plugin globally (like with <option>environment.systemPackages</option>) to start using it. You should instead be using the following options:
+   <itemizedlist>
+    <listitem>
+     <para>
+      <xref linkend="opt-services.xserver.desktopManager.pantheon.extraWingpanelIndicators"/>
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      <xref linkend="opt-services.xserver.desktopManager.pantheon.extraSwitchboardPlugs"/>
+     </para>
+    </listitem>
+   </itemizedlist>
+   to configure the programs with plugs or indicators.
+  </para>
+
+  <para>
+   The difference in NixOS is both these programs are patched to load plugins from a directory that is the value of an environment variable. All of which is controlled in Nix. If you need to configure the particular packages manually you can override the packages like:
+<programlisting>
+wingpanel-with-indicators.override {
+  indicators = [
+    pkgs.some-special-indicator
+  ];
+};
+
+switchboard-with-plugs.override {
+  plugs = [
+    pkgs.some-special-plug
+  ];
+};
+</programlisting>
+   please note that, like how the NixOS options describe these as extra plugins, this would only add to the default plugins included with the programs. If for some reason you'd like to configure which plugins to use exactly, both packages have an argument for this:
+<programlisting>
+wingpanel-with-indicators.override {
+  useDefaultIndicators = false;
+  indicators = specialListOfIndicators;
+};
+
+switchboard-with-plugs.override {
+  useDefaultPlugs = false;
+  plugs = specialListOfPlugs;
+};
+</programlisting>
+   this could be most useful for testing a particular plug-in in isolation.
+  </para>
+ </section>
+ <section xml:id="sec-pantheon-faq">
+  <title>FAQ</title>
+
+  <variablelist>
+   <varlistentry xml:id="sec-pantheon-faq-messed-up-theme">
+    <term>
+     I have switched from a different desktop and Pantheon’s theming looks messed up.
+    </term>
+    <listitem>
+     <para>
+      Open Switchboard and go to: <guilabel>Administration</guilabel> → <guilabel>About</guilabel> → <guilabel>Restore Default Settings</guilabel> → <guibutton>Restore Settings</guibutton>. This will reset any dconf settings to their Pantheon defaults. Note this could reset certain GNOME specific preferences if that desktop was used prior.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry xml:id="sec-pantheon-faq-slow-shutdown">
+    <term>
+     Using Pantheon sometimes makes my shutdown take a long time.
+    </term>
+    <listitem>
+     <para>
+      We have not yet determined what processes fight with systemd during shutdown, there are many reports. In elementary OS the default system timeout is lowered to lessen the impact of the issue. If you'd like to do this in NixOS, set
+<programlisting>
+ <xref linkend="opt-systemd.extraConfig"/> = ''
+  DefaultTimeoutStopSec=10s
+  DefaultTimeoutStartSec=10s
+'';
+</programlisting>
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry xml:id="sec-pantheon-faq-gnome3-and-pantheon">
+    <term>
+     I cannot enable both GNOME 3 and Pantheon.
+    </term>
+    <listitem>
+     <para>
+      This is a known <link xlink:href="https://github.com/NixOS/nixpkgs/issues/64611">issue</link> and there is no known workaround.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry xml:id="sec-pantheon-faq-appcenter">
+    <term>
+     Does AppCenter work, or is it available?
+    </term>
+    <listitem>
+     <para>
+      AppCenter has been available since 20.03, but it is of little use. This is because there is no functioning PackageKit backend for Nix 2.0. In the near future you will be able to install Flatpak applications from AppCenter on NixOS. See this <link xlink:href="https://github.com/NixOS/nixpkgs/issues/70214">issue</link>.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </section>
+</chapter>

From 05a9b7fe2a695c39118230df3ce8dfa2b1364c36 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 10 Feb 2020 02:33:40 +0000
Subject: [PATCH 1876/4636] fonts/gdouros: correct license to unfree

---
 pkgs/data/fonts/gdouros/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/gdouros/default.nix b/pkgs/data/fonts/gdouros/default.nix
index 71c92a72e593..afe73aa1caf1 100644
--- a/pkgs/data/fonts/gdouros/default.nix
+++ b/pkgs/data/fonts/gdouros/default.nix
@@ -26,10 +26,11 @@ let
 
     meta = {
       inherit description;
-      # In lieu of a license:
-      # Fonts in this site are offered free for any use;
-      # they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed.
-      license = lib.licenses.free;
+      # see http://users.teilar.gr/~g1951d/License.pdf
+      # quite draconian: non-commercial, no modifications,
+      # no redistribution, "a single instantiation and no
+      # network installation"
+      license = lib.licenses.unfree;
       homepage = http://users.teilar.gr/~g1951d/;
     };
   };

From 7a621a04b88727fa165b5c3a8becce9a2b662df3 Mon Sep 17 00:00:00 2001
From: Greg Roodt <greg@canva.com>
Date: Sat, 29 Feb 2020 12:47:25 +1100
Subject: [PATCH 1877/4636] argo: 2.4.3 -> 2.6.0

---
 .../networking/cluster/argo/default.nix       |  36 +-
 .../networking/cluster/argo/deps.nix          | 903 ------------------
 2 files changed, 30 insertions(+), 909 deletions(-)
 delete mode 100644 pkgs/applications/networking/cluster/argo/deps.nix

diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix
index 9295e90794d2..52da70bc8b86 100644
--- a/pkgs/applications/networking/cluster/argo/default.nix
+++ b/pkgs/applications/networking/cluster/argo/default.nix
@@ -1,20 +1,44 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, buildGoPackage, fetchFromGitHub }:
 
-buildGoPackage rec {
+let
+  # Argo can package a static server in the CLI using the `staticfiles` go module.
+  # We build the CLI without the static server for simplicity, but the tool is still required for
+  # compilation to succeed.
+  # See: https://github.com/argoproj/argo/blob/d7690e32faf2ac5842468831daf1443283703c25/Makefile#L117
+  staticfiles = buildGoPackage rec {
+    name = "staticfiles";
+    src = fetchFromGitHub {
+      owner = "bouk";
+      repo = "staticfiles";
+      rev = "827d7f6389cd410d0aa3f3d472a4838557bf53dd";
+      sha256 = "0xarhmsqypl8036w96ssdzjv3k098p2d4mkmw5f6hkp1m3j67j61";
+    };
+
+    goPackagePath = "bou.ke/staticfiles";
+  };
+in
+buildGoModule rec {
   pname = "argo";
-  version = "2.4.3";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo";
     rev = "v${version}";
-    sha256 = "15726n5rrbzszq5dpmrxbw9cn7ahihn28jqk274270140gz5aak1";
+    sha256 = "0hlvsi706jwlf43mdwic6j7iriii4daxjr82qgi80ac4h4x0z3h2";
   };
 
-  goDeps = ./deps.nix;
-  goPackagePath = "github.com/argoproj/argo";
+  modSha256 = "1394bav1k1xv9n1rvji0j9a09mibk97xpha24640jkgmy9bnmg45";
+
   subPackages = [ "cmd/argo" ];
 
+  preBuild = ''
+    mkdir -p ui/dist/app
+    echo "Built without static files" > ui/dist/app/index.html
+
+    ${staticfiles}/bin/staticfiles -o server/static/files.go ui/dist/app
+  '';
+
   meta = with lib; {
     description = "Container native workflow engine for Kubernetes";
     homepage = https://github.com/argoproj/argo;
diff --git a/pkgs/applications/networking/cluster/argo/deps.nix b/pkgs/applications/networking/cluster/argo/deps.nix
deleted file mode 100644
index b275cd21cf48..000000000000
--- a/pkgs/applications/networking/cluster/argo/deps.nix
+++ /dev/null
@@ -1,903 +0,0 @@
-# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
-[
-  {
-    goPackagePath  = "cloud.google.com/go";
-    fetch = {
-      type = "git";
-      url = "https://code.googlesource.com/gocloud";
-      rev =  "ceeb313ad77b789a7fa5287b36a1d127b69b7093";
-      sha256 = "0z5z3qag9g4fc7g6di7ijxzz0s3c7al1rx0sxxkbqbpwlgk4iwf2";
-    };
-  }
-  {
-    goPackagePath  = "contrib.go.opencensus.io/exporter/ocagent";
-    fetch = {
-      type = "git";
-      url = "https://github.com/census-ecosystem/opencensus-go-exporter-ocagent";
-      rev =  "f9129169651c35ecbdc1186c3ba4aa876ee62e1e";
-      sha256 = "09n7w31668f6f55qw6qkw85mp6mhkmxs2x5hk4vr0p5qiqap576h";
-    };
-  }
-  {
-    goPackagePath  = "github.com/Azure/go-autorest";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Azure/go-autorest";
-      rev =  "880eb0e2aca291c40538ddef66e5914fb1cc1d7f";
-      sha256 = "0v6d6la29n3kkgn7r3b63pf96cpj5kf88rddkm2x2vqb9x2gmi0p";
-    };
-  }
-  {
-    goPackagePath  = "github.com/Knetic/govaluate";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Knetic/govaluate";
-      rev =  "9aa49832a739dcd78a5542ff189fb82c3e423116";
-      sha256 = "12klijhq4fckzbhv0cwygbazj6lvhmdqksha9y6jgfmwzv51kwv5";
-    };
-  }
-  {
-    goPackagePath  = "github.com/PuerkitoBio/purell";
-    fetch = {
-      type = "git";
-      url = "https://github.com/PuerkitoBio/purell";
-      rev =  "44968752391892e1b0d0b821ee79e9a85fa13049";
-      sha256 = "0c525frsxmalrn55hzzsxy17ng8avkd40ga0wxfw9haxsdjgqdqy";
-    };
-  }
-  {
-    goPackagePath  = "github.com/PuerkitoBio/urlesc";
-    fetch = {
-      type = "git";
-      url = "https://github.com/PuerkitoBio/urlesc";
-      rev =  "de5bf2ad457846296e2031421a34e2568e304e35";
-      sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw";
-    };
-  }
-  {
-    goPackagePath  = "github.com/argoproj/pkg";
-    fetch = {
-      type = "git";
-      url = "https://github.com/argoproj/pkg";
-      rev =  "5616f48963eebf7cca912632230032b263bb62bc";
-      sha256 = "1m50mpmgdv4hjdpl994xdkdbjfwv7dagn6mhix17cb5mf61ixs6z";
-    };
-  }
-  {
-    goPackagePath  = "github.com/aws/aws-sdk-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/aws/aws-sdk-go";
-      rev =  "d57c8d96f72d9475194ccf18d2ba70ac294b0cb3";
-      sha256 = "09bv2ay7vnv15vj83ysqs98v0hcjg0nziwnp7qjdr0iasrhl4r21";
-    };
-  }
-  {
-    goPackagePath  = "github.com/beorn7/perks";
-    fetch = {
-      type = "git";
-      url = "https://github.com/beorn7/perks";
-      rev =  "37c8de3658fcb183f997c4e13e8337516ab753e6";
-      sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7";
-    };
-  }
-  {
-    goPackagePath  = "github.com/census-instrumentation/opencensus-proto";
-    fetch = {
-      type = "git";
-      url = "https://github.com/census-instrumentation/opencensus-proto";
-      rev =  "d89fa54de508111353cb0b06403c00569be780d8";
-      sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj";
-    };
-  }
-  {
-    goPackagePath  = "github.com/colinmarc/hdfs";
-    fetch = {
-      type = "git";
-      url = "https://github.com/colinmarc/hdfs";
-      rev =  "9746310a4d311e21ce43b2a645c5a1e64c5e8efa";
-      sha256 = "0r5dyadjck22i7fyci67r00ajbcqgx52z13rhriy0sw68j510r1r";
-    };
-  }
-  {
-    goPackagePath  = "github.com/davecgh/go-spew";
-    fetch = {
-      type = "git";
-      url = "https://github.com/davecgh/go-spew";
-      rev =  "8991bc29aa16c548c550c7ff78260e27b9ab7c73";
-      sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
-    };
-  }
-  {
-    goPackagePath  = "github.com/dgrijalva/jwt-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/dgrijalva/jwt-go";
-      rev =  "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e";
-      sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
-    };
-  }
-  {
-    goPackagePath  = "github.com/docker/spdystream";
-    fetch = {
-      type = "git";
-      url = "https://github.com/docker/spdystream";
-      rev =  "6480d4af844c189cf5dd913db24ddd339d3a4f85";
-      sha256 = "19glzj20vvy19igsl5bji9xrxi9m0ixhk4zs98dg15mh8ah36zak";
-    };
-  }
-  {
-    goPackagePath  = "github.com/dustin/go-humanize";
-    fetch = {
-      type = "git";
-      url = "https://github.com/dustin/go-humanize";
-      rev =  "9f541cc9db5d55bce703bd99987c9d5cb8eea45e";
-      sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3";
-    };
-  }
-  {
-    goPackagePath  = "github.com/emicklei/go-restful";
-    fetch = {
-      type = "git";
-      url = "https://github.com/emicklei/go-restful";
-      rev =  "6ac3b8eb89d325e5c750d77f344a6870464d03c3";
-      sha256 = "0dgjld5240xhz45rj929ffm452n931qfw3fx8x99vhlnii9qrwz2";
-    };
-  }
-  {
-    goPackagePath  = "github.com/emirpasic/gods";
-    fetch = {
-      type = "git";
-      url = "https://github.com/emirpasic/gods";
-      rev =  "1615341f118ae12f353cc8a983f35b584342c9b3";
-      sha256 = "0i5qqq7ajvw3mikr95zl9rsnfsjanzwpqqs6kzzplsfgsifybar1";
-    };
-  }
-  {
-    goPackagePath  = "github.com/evanphx/json-patch";
-    fetch = {
-      type = "git";
-      url = "https://github.com/evanphx/json-patch";
-      rev =  "026c730a0dcc5d11f93f1cf1cc65b01247ea7b6f";
-      sha256 = "144mk2v9q37l1qjf8498nff4hhz96mlkl7ls7ihixbmrji4lmch4";
-    };
-  }
-  {
-    goPackagePath  = "github.com/ghodss/yaml";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ghodss/yaml";
-      rev =  "0ca9ea5df5451ffdf184b4428c902747c2c11cd7";
-      sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g";
-    };
-  }
-  {
-    goPackagePath  = "github.com/go-openapi/jsonpointer";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-openapi/jsonpointer";
-      rev =  "a105a905c5e6ad147f08504784917f3e178e0ba5";
-      sha256 = "1s3cqf4svrbygvvpvi7hf122szsgihas52vqh0bba3avf4w03g9n";
-    };
-  }
-  {
-    goPackagePath  = "github.com/go-openapi/jsonreference";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-openapi/jsonreference";
-      rev =  "2903bfd4bfbaf188694f1edf731f2725a8fa344f";
-      sha256 = "0v933yvcwyzzlpdxwb9204ki7lls2rwfd96ww2i901ndvz37kdf8";
-    };
-  }
-  {
-    goPackagePath  = "github.com/go-openapi/spec";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-openapi/spec";
-      rev =  "bdfd7e07daecc404d77868a88b2364d0aed0ee5a";
-      sha256 = "1r2my46qc85fp1j4lbddmd6c1n0am9bq1wyqsnw7x8raiznqxp5l";
-    };
-  }
-  {
-    goPackagePath  = "github.com/go-openapi/swag";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-openapi/swag";
-      rev =  "c3d0f7896d589f3babb99eea24bbc7de98108e72";
-      sha256 = "1z34vqc5yz6rzvarrvlhkimxx33p74iaxb28l1mv716njvlsmjhg";
-    };
-  }
-  {
-    goPackagePath  = "github.com/go-sql-driver/mysql";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-sql-driver/mysql";
-      rev =  "72cd26f257d44c1114970e19afddcd812016007e";
-      sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1";
-    };
-  }
-  {
-    goPackagePath  = "github.com/gogo/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gogo/protobuf";
-      rev =  "0ca988a254f991240804bf9821f3450d87ccbb1b";
-      sha256 = "0slfyrmbpdcppf0z3waar90bpszdhi2gv705ys1b0zx5x6ax8f1a";
-    };
-  }
-  {
-    goPackagePath  = "github.com/golang/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/protobuf";
-      rev =  "6c65a5562fc06764971b7c5d05c76c75e84bdbf7";
-      sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
-    };
-  }
-  {
-    goPackagePath  = "github.com/google/gofuzz";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/gofuzz";
-      rev =  "f140a6486e521aad38f5917de355cbf147cc0496";
-      sha256 = "0qz439qvccm91w0mmjz4fqgx48clxdwagkvvx89cr43q1d4iry36";
-    };
-  }
-  {
-    goPackagePath  = "github.com/googleapis/gnostic";
-    fetch = {
-      type = "git";
-      url = "https://github.com/googleapis/gnostic";
-      rev =  "ab0dd09aa10e2952b28e12ecd35681b20463ebab";
-      sha256 = "1f4bs71hrqkwg8fdhsxh25s12xnkxly13cnmp6m4qj6vc6k6zr2n";
-    };
-  }
-  {
-    goPackagePath  = "github.com/gorilla/websocket";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gorilla/websocket";
-      rev =  "c3e18be99d19e6b3e8f1559eea2c161a665c4b6b";
-      sha256 = "03n1n0nwz3k9qshmriycqznnnvd3dkzsfwpnfjzzvafjxk9kyapv";
-    };
-  }
-  {
-    goPackagePath  = "github.com/grpc-ecosystem/grpc-gateway";
-    fetch = {
-      type = "git";
-      url = "https://github.com/grpc-ecosystem/grpc-gateway";
-      rev =  "471f45a5a99a578de7a8638dc7ed29e245bde097";
-      sha256 = "1jbr14p1dh6jpq3q6b4nq97ryh56h17ali0nckicpxhdrvxgi81c";
-    };
-  }
-  {
-    goPackagePath  = "github.com/hashicorp/go-uuid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/go-uuid";
-      rev =  "4f571afc59f3043a65f8fe6bf46d887b10a01d43";
-      sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k";
-    };
-  }
-  {
-    goPackagePath  = "github.com/hashicorp/golang-lru";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/golang-lru";
-      rev =  "7f827b33c0f158ec5dfbba01bb0b14a4541fd81d";
-      sha256 = "1p2igd58xkm8yaj2c2wxiplkf2hj6kxwrg6ss7mx61s5rd71v5xb";
-    };
-  }
-  {
-    goPackagePath  = "github.com/imdario/mergo";
-    fetch = {
-      type = "git";
-      url = "https://github.com/imdario/mergo";
-      rev =  "7c29201646fa3de8506f701213473dd407f19646";
-      sha256 = "05ir0jj74w0yfi1lrhjd97v759in1dpsma64cgmbiqvyp6hfmmf8";
-    };
-  }
-  {
-    goPackagePath  = "github.com/inconshreveable/mousetrap";
-    fetch = {
-      type = "git";
-      url = "https://github.com/inconshreveable/mousetrap";
-      rev =  "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
-      sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
-    };
-  }
-  {
-    goPackagePath  = "github.com/jbenet/go-context";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jbenet/go-context";
-      rev =  "d14ea06fba99483203c19d92cfcd13ebe73135f4";
-      sha256 = "0q91f5549n81w3z5927n4a1mdh220bdmgl42zi3h992dcc4ls0sl";
-    };
-  }
-  {
-    goPackagePath  = "github.com/jcmturner/gofork";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jcmturner/gofork";
-      rev =  "dc7c13fece037a4a36e2b3c69db4991498d30692";
-      sha256 = "0xzsnjqv3d59w9pgqzf6550wdwaqnac7zcdgqfd25w65yhcffzhr";
-    };
-  }
-  {
-    goPackagePath  = "github.com/jmespath/go-jmespath";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jmespath/go-jmespath";
-      rev =  "c2b33e84";
-      sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz";
-    };
-  }
-  {
-    goPackagePath  = "github.com/json-iterator/go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/json-iterator/go";
-      rev =  "27518f6661eba504be5a7a9a9f6d9460d892ade3";
-      sha256 = "0n79p4s67zl5zprxv7diayw3vavnmmfqkmd6snz0i9bxp825dsyz";
-    };
-  }
-  {
-    goPackagePath  = "github.com/kevinburke/ssh_config";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kevinburke/ssh_config";
-      rev =  "6cfae18c12b8934b1afba3ce8159476fdef666ba";
-      sha256 = "05jvz5r58a057zxvic9dyr9v2wilha8l6366npwkqgxmnmk9sh5f";
-    };
-  }
-  {
-    goPackagePath  = "github.com/konsorten/go-windows-terminal-sequences";
-    fetch = {
-      type = "git";
-      url = "https://github.com/konsorten/go-windows-terminal-sequences";
-      rev =  "f55edac94c9bbba5d6182a4be46d86a2c9b5b50e";
-      sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7";
-    };
-  }
-  {
-    goPackagePath  = "github.com/lib/pq";
-    fetch = {
-      type = "git";
-      url = "https://github.com/lib/pq";
-      rev =  "3427c32cb71afc948325f299f040e53c1dd78979";
-      sha256 = "08j1smm6rassdssdks4yh9aspa1dv1g5nvwimmknspvhx8a7waqz";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mailru/easyjson";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mailru/easyjson";
-      rev =  "b2ccc519800e761ac8000b95e5d57c80a897ff9e";
-      sha256 = "0q85h383mhbkcjm2vqm72bi8n2252fv3c56q3lclzb8n2crnjcdk";
-    };
-  }
-  {
-    goPackagePath  = "github.com/matttproud/golang_protobuf_extensions";
-    fetch = {
-      type = "git";
-      url = "https://github.com/matttproud/golang_protobuf_extensions";
-      rev =  "c12348ce28de40eed0136aa2b644d0ee0650e56c";
-      sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
-    };
-  }
-  {
-    goPackagePath  = "github.com/minio/minio-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/minio/minio-go";
-      rev =  "c6c2912aa5522e5f5a505e6cba30e95f0d8456fa";
-      sha256 = "0f5av1da4xbcy34j6dfy7c90na4a1capmsyac9qswq4xzq2zky10";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mitchellh/go-homedir";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mitchellh/go-homedir";
-      rev =  "af06845cf3004701891bf4fdb884bfe4920b3727";
-      sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mitchellh/go-ps";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mitchellh/go-ps";
-      rev =  "621e5597135b1d14a7d9c2bfc7bc312e7c58463c";
-      sha256 = "0sjkz24kqz5nzgncnvdlzhlyba4jwmf6cxj8c4p8mb44679gkphh";
-    };
-  }
-  {
-    goPackagePath  = "github.com/modern-go/concurrent";
-    fetch = {
-      type = "git";
-      url = "https://github.com/modern-go/concurrent";
-      rev =  "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94";
-      sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs";
-    };
-  }
-  {
-    goPackagePath  = "github.com/modern-go/reflect2";
-    fetch = {
-      type = "git";
-      url = "https://github.com/modern-go/reflect2";
-      rev =  "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd";
-      sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49";
-    };
-  }
-  {
-    goPackagePath  = "github.com/pkg/errors";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pkg/errors";
-      rev =  "ba968bfe8b2f7e042a574c888954fccecfa385b4";
-      sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
-    };
-  }
-  {
-    goPackagePath  = "github.com/pmezard/go-difflib";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pmezard/go-difflib";
-      rev =  "792786c7400a136282c1664665ae0a8db921c6c2";
-      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
-    };
-  }
-  {
-    goPackagePath  = "github.com/prometheus/client_golang";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/client_golang";
-      rev =  "c5b7fccd204277076155f10851dad72b76a49317";
-      sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd";
-    };
-  }
-  {
-    goPackagePath  = "github.com/prometheus/client_model";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/client_model";
-      rev =  "14fe0d1b01d4d5fc031dd4bec1823bd3ebbe8016";
-      sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550";
-    };
-  }
-  {
-    goPackagePath  = "github.com/prometheus/common";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/common";
-      rev =  "31bed53e4047fd6c510e43a941f90cb31be0972a";
-      sha256 = "1q16br348117ffycxdwsldb0i39p34miclfa8z93k6vjwnrqbh2l";
-    };
-  }
-  {
-    goPackagePath  = "github.com/prometheus/procfs";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/procfs";
-      rev =  "00ec24a6a2d86e7074629c8384715dbb05adccd8";
-      sha256 = "1z5jq5rjala0a0di4nwk1rai0z9f73qwqj6mgcbpjbg2qknlb544";
-    };
-  }
-  {
-    goPackagePath  = "github.com/sergi/go-diff";
-    fetch = {
-      type = "git";
-      url = "https://github.com/sergi/go-diff";
-      rev =  "1744e2970ca51c86172c8190fadad617561ed6e7";
-      sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7";
-    };
-  }
-  {
-    goPackagePath  = "github.com/sirupsen/logrus";
-    fetch = {
-      type = "git";
-      url = "https://github.com/sirupsen/logrus";
-      rev =  "839c75faf7f98a33d445d181f3018b5c3409a45e";
-      sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x";
-    };
-  }
-  {
-    goPackagePath  = "github.com/spf13/cobra";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/cobra";
-      rev =  "fe5e611709b0c57fa4a89136deaa8e1d4004d053";
-      sha256 = "1pn7g9jmhqc9yg6x02dgp4phiggnnxz8a11pv5y4vxhrvkjm6h71";
-    };
-  }
-  {
-    goPackagePath  = "github.com/spf13/pflag";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/pflag";
-      rev =  "298182f68c66c05229eb03ac171abe6e309ee79a";
-      sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd";
-    };
-  }
-  {
-    goPackagePath  = "github.com/src-d/gcfg";
-    fetch = {
-      type = "git";
-      url = "https://github.com/src-d/gcfg";
-      rev =  "1ac3a1ac202429a54835fe8408a92880156b489d";
-      sha256 = "044j95skmyrwjw5fwjk6ka32rjgsg0ar0mfp9np19sh1acwv4x4r";
-    };
-  }
-  {
-    goPackagePath  = "github.com/stretchr/objx";
-    fetch = {
-      type = "git";
-      url = "https://github.com/stretchr/objx";
-      rev =  "477a77ecc69700c7cdeb1fa9e129548e1c1c393c";
-      sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
-    };
-  }
-  {
-    goPackagePath  = "github.com/stretchr/testify";
-    fetch = {
-      type = "git";
-      url = "https://github.com/stretchr/testify";
-      rev =  "221dbe5ed46703ee255b1da0dec05086f5035f62";
-      sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb";
-    };
-  }
-  {
-    goPackagePath  = "github.com/tidwall/gjson";
-    fetch = {
-      type = "git";
-      url = "https://github.com/tidwall/gjson";
-      rev =  "c5e72cdf74dff23857243dd662c465b810891c21";
-      sha256 = "0cg23va26ga6d0gckp5i3ramc98cbz6ij9gn9dqqyc8igvcx9cb3";
-    };
-  }
-  {
-    goPackagePath  = "github.com/tidwall/match";
-    fetch = {
-      type = "git";
-      url = "https://github.com/tidwall/match";
-      rev =  "33827db735fff6510490d69a8622612558a557ed";
-      sha256 = "1ip5nkjvmzzzsypyzdd9nsnzbhwssprlx8qs5llqh16fl7kcvi3n";
-    };
-  }
-  {
-    goPackagePath  = "github.com/tidwall/pretty";
-    fetch = {
-      type = "git";
-      url = "https://github.com/tidwall/pretty";
-      rev =  "1166b9ac2b65e46a43d8618d30d1554f4652d49b";
-      sha256 = "1jwpj5903lh8hsj9apm2gwd70809zq0gjgmivkxaq4iq29wnv0n9";
-    };
-  }
-  {
-    goPackagePath  = "github.com/valyala/bytebufferpool";
-    fetch = {
-      type = "git";
-      url = "https://github.com/valyala/bytebufferpool";
-      rev =  "e746df99fe4a3986f4d4f79e13c1e0117ce9c2f7";
-      sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93";
-    };
-  }
-  {
-    goPackagePath  = "github.com/valyala/fasttemplate";
-    fetch = {
-      type = "git";
-      url = "https://github.com/valyala/fasttemplate";
-      rev =  "8b5e4e491ab636663841c42ea3c5a9adebabaf36";
-      sha256 = "0l131znbv8v67y20s4q361mwiww2c33zdc68mwvxchzk1gpy5ywq";
-    };
-  }
-  {
-    goPackagePath  = "github.com/xanzy/ssh-agent";
-    fetch = {
-      type = "git";
-      url = "https://github.com/xanzy/ssh-agent";
-      rev =  "6a3e2ff9e7c564f36873c2e36413f634534f1c44";
-      sha256 = "1chjlnv5d6svpymxgsr62d992m2xi6jb5lybjc5zn1h3hv1m01av";
-    };
-  }
-  {
-    goPackagePath  = "go.opencensus.io";
-    fetch = {
-      type = "git";
-      url = "https://github.com/census-instrumentation/opencensus-go";
-      rev =  "aab39bd6a98b853ab66c8a564f5d6cfcad59ce8a";
-      sha256 = "1x1ysvpyak1hcmfgvy0mk30g1ammbsmw19c9s0brz5h9wn7m4vva";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev =  "9756ffdc24725223350eb3266ffb92590d28f278";
-      sha256 = "0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev =  "ba9fcec4b297b415637633c5a6e8fa592e4a16c3";
-      sha256 = "1hbqvy6r0s5h0dpdqw8fynl3cq0acin3iyqki9xvl5r8h33yb9bx";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/oauth2";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/oauth2";
-      rev =  "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33";
-      sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/sync";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sync";
-      rev =  "112230192c580c3556b8cee6403af37a4fc5f28c";
-      sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev =  "9109b7679e13aa34a54834cfb4949cac4b96e576";
-      sha256 = "169sg6fyjkykiylrgxr0pynv2zc3frkgssbsk5w2lqyl8mb319hl";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/text";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/text";
-      rev =  "342b2e1fbaa52c93f31447ad2c6abc048c63e475";
-      sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/time";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/time";
-      rev =  "9d24e82272b4f38b78bc8cff74fa936d31ccd8ef";
-      sha256 = "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/tools";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/tools";
-      rev =  "be0da057c5e3c2df569a2c25cd280149b7d7e7d0";
-      sha256 = "19i9sjvbk79sgzyzjzrnmf575rnwj2bjsj4r1fmp7827dq97kqks";
-    };
-  }
-  {
-    goPackagePath  = "google.golang.org/api";
-    fetch = {
-      type = "git";
-      url = "https://code.googlesource.com/google-api-go-client";
-      rev =  "feb0267beb8644f5088a03be4d5ec3f8c7020152";
-      sha256 = "1lzdzkd2i41v6amxs9jah1q44qbvf1yvm8906jpfjiq6c3ffhqss";
-    };
-  }
-  {
-    goPackagePath  = "google.golang.org/appengine";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/appengine";
-      rev =  "5f2a59506353b8d5ba8cbbcd9f3c1f41f1eaf079";
-      sha256 = "1gwcwh8w5b1l15pjm8pqs3bbymvjcak3wva37zi5z9ilzr8c5wnx";
-    };
-  }
-  {
-    goPackagePath  = "google.golang.org/genproto";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/go-genproto";
-      rev =  "24fa4b261c55da65468f2abfdae2b024eef27dfb";
-      sha256 = "109zhaqlfd8zkbr1hk6zqbs6vcxfrk64scjwh2nswph05gr0m84d";
-    };
-  }
-  {
-    goPackagePath  = "google.golang.org/grpc";
-    fetch = {
-      type = "git";
-      url = "https://github.com/grpc/grpc-go";
-      rev =  "6eaf6f47437a6b4e2153a190160ef39a92c7eceb";
-      sha256 = "1cn33r2gclmq2v1ndpf1n5bmhf2qs8mms7ii5cnl6f9ch4r2c4k3";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/inf.v0";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-inf/inf";
-      rev =  "d2d2541c53f18d2a059457998ce2876cc8e67cbf";
-      sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/ini.v1";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-ini/ini";
-      rev =  "d4cae42d398bc0095297fc3315669590d29166ea";
-      sha256 = "1z7531wz62305hwg9y2f04d819am8x3ys96ssy6qndlzmw60yjsr";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/jcmturner/aescts.v1";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jcmturner/aescts";
-      rev =  "f6abebb3171c4c1b1fea279cb7c7325020a26290";
-      sha256 = "0rbq4zf3db48xa2gqdp2swws7wizmbwagigqkr1zxzd1ramps6rv";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/jcmturner/dnsutils.v1";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jcmturner/dnsutils";
-      rev =  "13eeb8d49ffb74d7a75784c35e4d900607a3943c";
-      sha256 = "0l543c64pyzbnrc00jspg21672l3a0kjjw9pbdxwna93w8d8m927";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/jcmturner/gokrb5.v5";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jcmturner/gokrb5";
-      rev =  "32ba44ca5b42f17a4a9f33ff4305e70665a1bc0f";
-      sha256 = "0jynpkncifdd2ib2pc9qhh0r8q7ab7yw0ygzpzgisdzv8ars1diq";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/jcmturner/rpc.v0";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jcmturner/rpc";
-      rev =  "4480c480c9cd343b54b0acb5b62261cbd33d7adf";
-      sha256 = "0hivgq52gwxsqs5x1my2047k7nqh7wx3yi0llsj3lc3h2mjy4yhd";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/src-d/go-billy.v4";
-    fetch = {
-      type = "git";
-      url = "https://github.com/src-d/go-billy";
-      rev =  "780403cfc1bc95ff4d07e7b26db40a6186c5326e";
-      sha256 = "0jcyi4ink2njgflp3f2mbl5b86p2w0rh945k5xplcl158i5wkrc6";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/src-d/go-git.v4";
-    fetch = {
-      type = "git";
-      url = "https://github.com/src-d/go-git";
-      rev =  "0d1a009cbb604db18be960db5f1525b99a55d727";
-      sha256 = "0n4x7r69qrmpss51b3wd3vj4b9jmip4archz3fbqk6q1yyd1pxjb";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/warnings.v0";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-warnings/warnings";
-      rev =  "ec4a0fea49c7b46c2aeb0b51aac55779c607e52b";
-      sha256 = "1kzj50jn708cingn7a13c2wdlzs6qv89dr2h4zj8d09647vlnd81";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/yaml.v2";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-yaml/yaml";
-      rev =  "51d6538a90f86fe93ac480b35f37b2be17fef232";
-      sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
-    };
-  }
-  {
-    goPackagePath  = "k8s.io/api";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kubernetes/api";
-      rev =  "e3a6b8045b0b303430f6d0c261fd9e35be50800e";
-      sha256 = "1c1nrcy0j7aj93l2xgdw0asyvxa4h8pzz004drf7pvh9pvsg0vqq";
-    };
-  }
-  {
-    goPackagePath  = "k8s.io/apimachinery";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kubernetes/apimachinery";
-      rev =  "8f6ac2502e5143406f4eaedc4ca4262854d877ce";
-      sha256 = "0v8cb63nvry4b0ls1h185hb3llp6rk0b4n92f76jcjsv1b7sspbi";
-    };
-  }
-  {
-    goPackagePath  = "k8s.io/client-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kubernetes/client-go";
-      rev =  "6d55c1b1f1ca8ad83d572bbc3ca55ba5526d9d71";
-      sha256 = "1j8m0pqn9c6lwr7h5aq7zrpdd73bwbwnhy4mbc0654ylmc3lnq8q";
-    };
-  }
-  {
-    goPackagePath  = "k8s.io/code-generator";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kubernetes/code-generator";
-      rev =  "6c2a4329ac290d921e8616cad41635c87dbb1518";
-      sha256 = "18kx2wcqb5cvivbl61q7vyic5rp0fica9n6xgrjfsxczjbihlq70";
-    };
-  }
-  {
-    goPackagePath  = "k8s.io/gengo";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kubernetes/gengo";
-      rev =  "a874a240740c2ae854082ec73d46c5efcedd2149";
-      sha256 = "0z8gay4bj6l8cv7gzi55l2c3jx94caq28sk0x6p3s6wxqxmnqp92";
-    };
-  }
-  {
-    goPackagePath  = "k8s.io/klog";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kubernetes/klog";
-      rev =  "3ca30a56d8a775276f9cdae009ba326fdc05af7f";
-      sha256 = "0a7kn145q4cbsd2cfpv7sz09prjrxl6aaqzdcgq7p7jxc23a7zps";
-    };
-  }
-  {
-    goPackagePath  = "k8s.io/kube-openapi";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kubernetes/kube-openapi";
-      rev =  "5e22f3d471e6f24ca20becfdffdc6206c7cecac8";
-      sha256 = "08drikf269fhlnrhc29v7rhxl1950d94rl5x8l11n0qf2v2ffwib";
-    };
-  }
-  {
-    goPackagePath  = "k8s.io/utils";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kubernetes/utils";
-      rev =  "3a4a5477acf81b48e20870a3b9dc743f63c66730";
-      sha256 = "1f01ck7nvm9rmw1fkylbnr1cdd9byiagl9ni40j9p9gfy5v5nxk8";
-    };
-  }
-  {
-    goPackagePath  = "sigs.k8s.io/yaml";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kubernetes-sigs/yaml";
-      rev =  "fd68e9863619f6ec2fdd8625fe1f02e7c877e480";
-      sha256 = "1p7hvjdr5jsyk7nys1g1pmgnf3ys6n320i6hds85afppk81k01kb";
-    };
-  }
-  {
-    goPackagePath  = "upper.io/db.v3";
-    fetch = {
-      type = "git";
-      url = "https://upper.io/db.v3";
-      rev =  "fad80cdab4f761cb26416675df120f5d8c3f0db7";
-      sha256 = "1bddpi278bzp39470llrgnsnnfyqqmzym5hmd8dxmczmzhhkirfv";
-    };
-  }
-]
\ No newline at end of file

From 87f098f0948acd60663effdb19353710b43c4f27 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 28 Feb 2020 19:56:11 -0600
Subject: [PATCH 1878/4636] incrtcl: chores, maintain it, touch up results

Soon, this will be needed for the Bluespec compiler.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../development/libraries/incrtcl/default.nix | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix
index e7f575b04be7..a8a714067f4b 100644
--- a/pkgs/development/libraries/incrtcl/default.nix
+++ b/pkgs/development/libraries/incrtcl/default.nix
@@ -1,31 +1,39 @@
-{stdenv, fetchurl, tcl}:
+{ stdenv, fetchurl, tcl }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "incrtcl";
   version = "4.2.0";
 
   src = fetchurl {
-    url = mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl4.2.0.tar.gz;
+    url    = "mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl${version}.tar.gz";
     sha256 = "0w28v0zaraxcq1s9pa6cihqqwqvvwfgz275lks7w4gl7hxjxmasw";
   };
 
   buildInputs = [ tcl ];
   configureFlags = [ "--with-tcl=${tcl}/lib" ];
+  enableParallelBuilding = true;
+
   patchPhase = ''
-      substituteInPlace configure --replace "\''${TCL_SRC_DIR}/generic" "${tcl}/include"
-  '';
-  preConfigure = ''
-      configureFlags="--exec_prefix=$prefix $configureFlags"
+    substituteInPlace configure --replace "\''${TCL_SRC_DIR}/generic" "${tcl}/include"
   '';
 
-  passthru = {
-    libPrefix = "itcl3.4";
-  };
+  preConfigure = ''
+    configureFlags="--exec_prefix=$prefix $configureFlags"
+  '';
+
+  postInstall = ''
+    rmdir $out/bin
+    mv $out/lib/itcl${version}/* $out/lib
+    rmdir $out/lib/itcl${version}
+  '';
+
+  outputs = [ "out" "dev" "man" ];
 
   meta = with stdenv.lib; {
-    homepage = http://incrtcl.sourceforge.net/;
+    homepage    = "http://incrtcl.sourceforge.net/";
     description = "Object Oriented Enhancements for Tcl/Tk";
-    platforms = platforms.unix;
-    license = licenses.tcltk;
+    license     = licenses.tcltk;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ thoughtpolice ];
   };
 }

From 6e797033c8c385fdf461e99ef9e3212412294291 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 28 Feb 2020 19:57:39 -0600
Subject: [PATCH 1879/4636] itktcl: init at 4.1.0

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/libraries/itktcl/default.nix | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/libraries/itktcl/default.nix

diff --git a/pkgs/development/libraries/itktcl/default.nix b/pkgs/development/libraries/itktcl/default.nix
new file mode 100644
index 000000000000..ecf2e306b1fd
--- /dev/null
+++ b/pkgs/development/libraries/itktcl/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, tcl, tk, incrtcl }:
+
+stdenv.mkDerivation rec {
+  pname = "itk-tcl";
+  version = "4.1.0";
+
+  src = fetchurl {
+    url    = "mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itk${version}.tar.gz";
+    sha256 = "1iy964jfgsfnc1agk1w6bbm44x18ily8d4wmr7cc9z9f4acn2r6s";
+  };
+
+  buildInputs = [ tcl tk incrtcl ];
+  enableParallelBuilding = true;
+
+  configureFlags = [
+    "--with-tcl=${tcl}/lib"
+    "--with-tk=${tk}/lib"
+    "--with-tkinclude=${tk.dev}/include"
+    "--with-itcl=${incrtcl}/lib"
+  ];
+
+  postInstall = ''
+    rmdir $out/bin
+    mv $out/lib/itk${version}/* $out/lib
+    rmdir $out/lib/itk${version}
+  '';
+
+  outputs = [ "out" "dev" "man" ];
+
+  meta = with stdenv.lib; {
+    homepage    = "http://incrtcl.sourceforge.net/";
+    description = "Mega-widget toolkit for incr Tk";
+    license     = licenses.tcltk;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9e67b61f09c..e8d49ca01b7a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12054,6 +12054,7 @@ in
 
   ijs = callPackage ../development/libraries/ijs { };
 
+  itktcl  = callPackage ../development/libraries/itktcl { };
   incrtcl = callPackage ../development/libraries/incrtcl { };
 
   indicator-application-gtk2 = callPackage ../development/libraries/indicator-application/gtk2.nix { };

From ad30a304883f5a689f499e47e7ec388265f024f5 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 16 Feb 2020 02:33:02 -0500
Subject: [PATCH 1880/4636] rustPlatform.fetchCargo: handle custom Cargo.lock
 patchfiles with validation

Previously, we would asssert that the lockfiles are consistent during the
unpackPhase, but if the pkg has a patch for the lockfile itself then we must
wait until the patchPhase is complete to check.

This also removes an implicity dependency on the src attribute coming from
`fetchzip` / `fetchFromGitHub`, which happens to name the source directory
"source". Now we glob for it, so different fetchers will work consistently.
---
 doc/languages-frameworks/rust.section.md      |   10 +-
 .../science/misc/rink/default.nix             |    7 +-
 .../virtualization/crosvm/default.nix         |    5 +-
 .../virtualization/railcar/default.nix        |   10 +-
 pkgs/build-support/rust/default.nix           |   30 +-
 .../tools/rust/cargo-make/cargo.patch         | 1053 +++++++++++++++++
 6 files changed, 1092 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/development/tools/rust/cargo-make/cargo.patch

diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index f23926eee3b6..97dc9e2ff531 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -53,10 +53,12 @@ all crate sources of this package. Currently it is obtained by inserting a
 fake checksum into the expression and building the package once. The correct
 checksum can be then take from the failed build.
 
-When the `Cargo.lock`, provided by upstream, is not in sync with the
-`Cargo.toml`, it is possible to use `cargoPatches` to update it. All patches
-added in `cargoPatches` will also be prepended to the patches in `patches` at
-build-time.
+Per the instructions in the [Cargo Book](https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html)
+best practices guide, Rust applications should always commit the `Cargo.lock`
+file in git to ensure a reproducible build. However, a few packages do not, and
+Nix depends on this file, so if it missing you can use `cargoPatches` to apply
+it in the `patchPhase`. Consider sending a PR upstream with a note to the
+maintainer describing why it's important to include in the application.
 
 Unless `legacyCargoFetcher` is set to `true`, the fetcher will also verify that
 the `Cargo.lock` file is in sync with the `src` attribute, and will compress the
diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix
index 4c759308a5c6..1bb74ec17a34 100644
--- a/pkgs/applications/science/misc/rink/default.nix
+++ b/pkgs/applications/science/misc/rink/default.nix
@@ -10,12 +10,11 @@ rustPlatform.buildRustPackage rec {
     rev = "v${version}";
     sha256 = "0vl996y58a9b62d8sqrpfn2h8qkya7qbg5zqsmy7nxhph1vhbspj";
   };
+
+  # Upstreamed in https://github.com/tiffany352/rink-rs/pull/53
   cargoPatches = [ ./cargo-lock.patch ];
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0q2g1hkqyzq9lsas4fhsbpk3jn5hikchh6i1jf9c08ca2xm136c2";
+  cargoSha256 = "0shlh0m9k0iqxpv9zmiw7a6v197swrvpz9x6qzhximzkdwni9gz9";
 
   buildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ openssl gmp ncurses ];
diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix
index 091ea0fa1c54..28614efa7f3b 100644
--- a/pkgs/applications/virtualization/crosvm/default.nix
+++ b/pkgs/applications/virtualization/crosvm/default.nix
@@ -53,10 +53,7 @@ in
       ./default-seccomp-policy-dir.diff
     ];
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-    cargoSha256 = "1d7y07wkliy5qnlyx5zj6ni39avhs3s48sqgvwxm5g5zrahg2a85";
+    cargoSha256 = "1s9nfgfqk140hg08i0xzylnrgrx84dqss0vnvhxnydwy9q03nk7r";
 
     nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/applications/virtualization/railcar/default.nix b/pkgs/applications/virtualization/railcar/default.nix
index 8dd3c270b23d..7b56da0f7bc3 100644
--- a/pkgs/applications/virtualization/railcar/default.nix
+++ b/pkgs/applications/virtualization/railcar/default.nix
@@ -11,15 +11,11 @@ rustPlatform.buildRustPackage rec {
     sha256 = "09zn160qxd7760ii6rs5nhr00qmaz49x1plclscznxh9hinyjyh9";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1k4y37x783fsd8li17k56vlx5ziwmrz167a0w5mcb9sgyd2kc19a";
-
-  buildInputs = [ libseccomp ];
-
   # Submitted upstream https://github.com/oracle/railcar/pull/44
   cargoPatches = [ ./cargo-lock.patch ];
+  cargoSha256 = "10qxkxpdprl2rcgy52s3q5gyg3i75qmx68rpl7cx1bgjzppfn9c3";
+
+  buildInputs = [ libseccomp ];
 
   meta = with lib; {
     description = "Rust implementation of the Open Containers Initiative oci-runtime";
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 3fdfc0636f94..387c7904db09 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -114,15 +114,37 @@ stdenv.mkDerivation (filteredArgs // {
     EOF
 
     export RUST_LOG=${logLevel}
-  '' + stdenv.lib.optionalString validateCargoDeps ''
-    if ! diff source/Cargo.lock $cargoDepsCopy/Cargo.lock ; then
+  '' + (args.postUnpack or "");
+
+  # After unpacking and applying patches, check that the Cargo.lock matches our
+  # src package. Note that we do this after the patchPhase, because the
+  # patchPhase may create the Cargo.lock if upstream has not shipped one.
+  postPatch = (args.postPatch or "") + stdenv.lib.optionalString validateCargoDeps ''
+    cargoDepsLockfile=$NIX_BUILD_TOP/$cargoDepsCopy/Cargo.lock
+    srcLockfile=$NIX_BUILD_TOP/$sourceRoot/Cargo.lock
+
+    echo "Validating consistency between $srcLockfile and $cargoDepsLockfile"
+    if ! diff $srcLockfile $cargoDepsLockfile; then
+
+      # If the diff failed, first double-check that the file exists, so we can
+      # give a friendlier error msg.
+      if ! [ -e $srcLockfile ]; then
+        echo "ERROR: Missing Cargo.lock from src. Expected to find it at: $srcLockfile"
+        exit 1
+      fi
+
+      if ! [ -e $cargoDepsLockfile ]; then
+        echo "ERROR: Missing lockfile from cargo vendor. Expected to find it at: $cargoDepsLockfile"
+        exit 1
+      fi
+
       echo
       echo "ERROR: cargoSha256 is out of date"
       echo
       echo "Cargo.lock is not the same in $cargoDepsCopy"
       echo
       echo "To fix the issue:"
-      echo '1. Use "1111111111111111111111111111111111111111111111111111" as the cargoSha256 value'
+      echo '1. Use "0000000000000000000000000000000000000000000000000000" as the cargoSha256 value'
       echo "2. Build the derivation and wait it to fail with a hash mismatch"
       echo "3. Copy the 'got: sha256:' value back into the cargoSha256 field"
       echo
@@ -131,7 +153,7 @@ stdenv.mkDerivation (filteredArgs // {
     fi
   '' + ''
     unset cargoDepsCopy
-  '' + (args.postUnpack or "");
+  '';
 
   configurePhase = args.configurePhase or ''
     runHook preConfigure
diff --git a/pkgs/development/tools/rust/cargo-make/cargo.patch b/pkgs/development/tools/rust/cargo-make/cargo.patch
new file mode 100644
index 000000000000..b75a5a298878
--- /dev/null
+++ b/pkgs/development/tools/rust/cargo-make/cargo.patch
@@ -0,0 +1,1053 @@
+diff --git a/Cargo.lock b/Cargo.lock
+new file mode 100644
+index 0000000..fe75e29
+--- /dev/null
++++ b/Cargo.lock
+@@ -0,0 +1,1047 @@
++# This file is automatically @generated by Cargo.
++# It is not intended for manual editing.
++[[package]]
++name = "adler32"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "aho-corasick"
++version = "0.7.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "ansi_term"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "arrayref"
++version = "0.3.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "arrayvec"
++version = "0.5.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "attohttpc"
++version = "0.11.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl 0.10.28 (registry+https://github.com/rust-lang/crates.io-index)",
++ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "atty"
++version = "0.2.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "autocfg"
++version = "0.1.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "autocfg"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "base64"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "bitflags"
++version = "1.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "blake2b_simd"
++version = "0.5.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "bytes"
++version = "0.5.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "c2-chacha"
++version = "0.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "cargo-make"
++version = "0.27.0"
++dependencies = [
++ "ci_info 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "duckscript 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "duckscriptsdk 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "run_script 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rust_info 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
++ "shell2batch 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "cc"
++version = "1.0.50"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "cfg-if"
++version = "0.1.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "chrono"
++version = "0.4.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "ci_info"
++version = "0.9.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "clap"
++version = "2.33.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "colored"
++version = "1.9.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "constant_time_eq"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "core-foundation"
++version = "0.6.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "core-foundation-sys"
++version = "0.6.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "crc32fast"
++version = "1.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "crossbeam-utils"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "dirs"
++version = "2.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "dirs-sys"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "duckscript"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "duckscriptsdk"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "attohttpc 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "duckscript 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "java-properties 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "meval 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "whoami 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "encoding"
++version = "0.2.33"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "encoding-index-japanese"
++version = "1.20141219.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "encoding-index-korean"
++version = "1.20141219.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "encoding-index-simpchinese"
++version = "1.20141219.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "encoding-index-singlebyte"
++version = "1.20141219.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "encoding-index-tradchinese"
++version = "1.20141219.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "encoding_index_tests"
++version = "0.1.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "envmnt"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "fern"
++version = "0.5.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "flate2"
++version = "1.0.13"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "miniz_oxide 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "fnv"
++version = "1.0.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "foreign-types"
++version = "0.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "foreign-types-shared"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "fs_extra"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "getrandom"
++version = "0.1.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "git_info"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "glob"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "hermit-abi"
++version = "0.1.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "home"
++version = "0.5.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "http"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "idna"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "indexmap"
++version = "1.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "itoa"
++version = "0.4.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "java-properties"
++version = "1.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "lazy_static"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "libc"
++version = "0.2.66"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "log"
++version = "0.4.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "matches"
++version = "0.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "memchr"
++version = "2.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "meval"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "nom 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "miniz_oxide"
++version = "0.3.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "native-tls"
++version = "0.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl 0.10.28 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
++ "schannel 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
++ "security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "nom"
++version = "1.2.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "num-integer"
++version = "0.1.42"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "num-traits"
++version = "0.2.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "openssl"
++version = "0.10.28"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "openssl-probe"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "openssl-sys"
++version = "0.9.54"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
++ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "percent-encoding"
++version = "2.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "pkg-config"
++version = "0.3.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "ppv-lite86"
++version = "0.2.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "proc-macro2"
++version = "1.0.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "quote"
++version = "1.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand"
++version = "0.7.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_chacha"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.5.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rand_hc"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "redox_syscall"
++version = "0.1.56"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "redox_users"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "regex"
++version = "1.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "aho-corasick 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
++ "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "regex-syntax"
++version = "0.6.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "remove_dir_all"
++version = "0.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "run_script"
++version = "0.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "users 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rust-argon2"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "rust_info"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "same-file"
++version = "1.0.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "schannel"
++version = "0.1.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "security-framework"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "security-framework-sys"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "semver"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "semver-parser"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "serde"
++version = "1.0.104"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "serde_derive"
++version = "1.0.104"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "shell2batch"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "smallvec"
++version = "1.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "strsim"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "syn"
++version = "1.0.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "tempfile"
++version = "3.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
++ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "textwrap"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "thread_local"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "time"
++version = "0.1.42"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "toml"
++version = "0.5.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "unicode-bidi"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "unicode-normalization"
++version = "0.1.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "unicode-width"
++version = "0.1.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "unicode-xid"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "url"
++version = "2.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "users"
++version = "0.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "vcpkg"
++version = "0.2.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "vec_map"
++version = "0.8.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "walkdir"
++version = "2.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "wasi"
++version = "0.9.0+wasi-snapshot-preview1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "whoami"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi"
++version = "0.3.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "winapi-i686-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
++name = "winapi-util"
++version = "0.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++dependencies = [
++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++]
++
++[[package]]
++name = "winapi-x86_64-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[metadata]
++"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
++"checksum aho-corasick 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)" = "743ad5a418686aad3b87fd14c43badd828cf26e214a00f92a384291cf22e1811"
++"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
++"checksum arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
++"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
++"checksum attohttpc 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ac9fd7bdf8ff0a1b9d73b41f95cb189d77528110295c80e3c858bf343db24fa3"
++"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
++"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
++"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
++"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
++"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
++"checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
++"checksum bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1"
++"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
++"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
++"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
++"checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01"
++"checksum ci_info 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a9c4ad4399f16ccee06f6a62acad539f42de4a80fa21cbe994df1bbb51bee3b9"
++"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
++"checksum colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8815e2ab78f3a59928fc32e141fbeece88320a240e43f47b2fd64ea3a88a5b3d"
++"checksum constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
++"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
++"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
++"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
++"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
++"checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
++"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
++"checksum duckscript 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "747bb4e541a0830b4581bffc001045d3dc259683546fbf35a35f47af831634b5"
++"checksum duckscriptsdk 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "799c03843d05bb809ea1ee653c4f9ba9a5ee766c07490cc684cf6b259b68ba94"
++"checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
++"checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"
++"checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81"
++"checksum encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7"
++"checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"
++"checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
++"checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
++"checksum envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db101f16134ca37f91a6e30c32d9df5bbfcbe8d926f0c1f03602baf2fc2f7352"
++"checksum fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e69ab0d5aca163e388c3a49d284fed6c3d0810700e77c5ae2756a50ec1a4daaa"
++"checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f"
++"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
++"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
++"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
++"checksum fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674"
++"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
++"checksum git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "add3a9c3c08c8905a2165ff06891dd1c3bb32d81b2a32d79528abc9793dfb06f"
++"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
++"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772"
++"checksum home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654"
++"checksum http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b708cc7f06493459026f53b9a61a7a121a5d1ec6238dee58ea4941132b30156b"
++"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
++"checksum indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "076f042c5b7b98f31d205f1249267e12a6518c1481e9dae9764af19b707d2292"
++"checksum itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
++"checksum java-properties 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "caf4418ade5bde22a283a7f2fb537ea397ec102718f259f2630714e7a5b389fa"
++"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
++"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
++"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
++"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
++"checksum memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53445de381a1f436797497c61d851644d0e8e88e6140f22872ad33a704933978"
++"checksum meval 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f79496a5651c8d57cd033c5add8ca7ee4e3d5f7587a4777484640d9cb60392d9"
++"checksum miniz_oxide 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aa679ff6578b1cddee93d7e82e263b94a575e0bfced07284eb0c037c1d2416a5"
++"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e"
++"checksum nom 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce"
++"checksum num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba"
++"checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
++"checksum openssl 0.10.28 (registry+https://github.com/rust-lang/crates.io-index)" = "973293749822d7dd6370d6da1e523b0d1db19f06c459134c658b2a4261378b52"
++"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
++"checksum openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)" = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986"
++"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
++"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
++"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
++"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548"
++"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
++"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
++"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
++"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
++"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
++"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
++"checksum redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431"
++"checksum regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8"
++"checksum regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)" = "b28dfe3fe9badec5dbf0a79a9cccad2cfc2ab5484bdb3e44cbd1ae8b3ba2be06"
++"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
++"checksum run_script 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80a217951e2afacc57d3129bd52aeddc550559f5a82f57529a31fc5675bd6621"
++"checksum rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017"
++"checksum rust_info 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be941f2b996df7ffaf093366039c9dc182b3ca2e00f3e81df44e08c3611e773d"
++"checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
++"checksum schannel 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "507a9e6e8ffe0a4e0ebb9a10293e62fdf7657c06f1b8bb07a8fcf697d2abf295"
++"checksum security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df"
++"checksum security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895"
++"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
++"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
++"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
++"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
++"checksum shell2batch 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "185a52ee351c1001753c9e3b2eb48c525ff7f51803a4f2cef4365b5c3b743f65"
++"checksum smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5c2fb2ec9bcd216a5b0d0ccf31ab17b5ed1d627960edff65bbe95d3ce221cefc"
++"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
++"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5"
++"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
++"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
++"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
++"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
++"checksum toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
++"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
++"checksum unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4"
++"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
++"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
++"checksum url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
++"checksum users 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c72f4267aea0c3ec6d07eaabea6ead7c5ddacfafc5e22bcf8d186706851fb4cf"
++"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
++"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
++"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
++"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
++"checksum whoami 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "622a663c45e12b7ae198748afb532d0c53d2daea11037312221e26198ca4e8e9"
++"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
++"checksum winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80"
++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

From 84878c923ccef2d5c515694c4b8eda485ab7079e Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 28 Feb 2020 21:03:06 -0600
Subject: [PATCH 1881/4636] incrtcl: export ITCL_LIBRARY for downstream users

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/libraries/incrtcl/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix
index a8a714067f4b..614a8f048aa5 100644
--- a/pkgs/development/libraries/incrtcl/default.nix
+++ b/pkgs/development/libraries/incrtcl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, tcl }:
+{ stdenv, fetchurl, writeText, tcl }:
 
 stdenv.mkDerivation rec {
   pname = "incrtcl";
@@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
     rmdir $out/lib/itcl${version}
   '';
 
+  setupHook = writeText "setup-hook.sh" ''
+    export ITCL_LIBRARY=@out@/lib
+  '';
+
   outputs = [ "out" "dev" "man" ];
 
   meta = with stdenv.lib; {

From 806fac5d109cdc6653c33a18924dac31ac477a2b Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 28 Feb 2020 21:03:21 -0600
Subject: [PATCH 1882/4636] itktcl: wibble [NFC]

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/libraries/itktcl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/itktcl/default.nix b/pkgs/development/libraries/itktcl/default.nix
index ecf2e306b1fd..36503fc1add9 100644
--- a/pkgs/development/libraries/itktcl/default.nix
+++ b/pkgs/development/libraries/itktcl/default.nix
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-tcl=${tcl}/lib"
     "--with-tk=${tk}/lib"
-    "--with-tkinclude=${tk.dev}/include"
     "--with-itcl=${incrtcl}/lib"
+    "--with-tkinclude=${tk.dev}/include"
   ];
 
   postInstall = ''

From 3a0e58d8f71c6136c9f07915fe13498ba6bce283 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Fri, 28 Feb 2020 22:33:06 -0500
Subject: [PATCH 1883/4636] chefdk: broken on aarch64

---
 pkgs/development/tools/chefdk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix
index 6ad4b378d8c5..7f52dec229a2 100644
--- a/pkgs/development/tools/chefdk/default.nix
+++ b/pkgs/development/tools/chefdk/default.nix
@@ -16,5 +16,6 @@ bundlerEnv {
     license     = licenses.asl20;
     maintainers = with maintainers; [ offline nicknovitski ];
     platforms   = platforms.unix;
+    badPlatforms = [ "aarch64-linux" ];
   };
 }

From 5d90f9c1eb4ad3bd1c4c899477c6a6dedeee9af1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 29 Feb 2020 03:56:46 +0000
Subject: [PATCH 1884/4636] ne: 3.2.1 -> 3.3.0

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

diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix
index 3c96ba911651..4faf1e28b1cc 100644
--- a/pkgs/applications/editors/ne/default.nix
+++ b/pkgs/applications/editors/ne/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ne";
-  version = "3.2.1";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "vigna";
     repo = pname;
     rev = version;
-    sha256 = "0h6d08cnwrk96ss83i9bragwwanph6x54sm3ak1z81146dsqsiif";
+    sha256 = "01aglnsfljlvx0wvyvpjfn4y88jf450a06qnj9a8lgdqv1hdkq1a";
   };
 
   postPatch = ''

From aab3d3399d42ab5cb0776ffaa9b792351bb1deea Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 29 Feb 2020 06:04:16 +0000
Subject: [PATCH 1885/4636] openfortivpn: 1.11.0 -> 1.12.0

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

diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix
index d1a73f1c148b..548f0e97be99 100644
--- a/pkgs/tools/networking/openfortivpn/default.nix
+++ b/pkgs/tools/networking/openfortivpn/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 let repo = "openfortivpn";
-    version = "1.11.0";
+    version = "1.12.0";
 
 in stdenv.mkDerivation {
   name = "${repo}-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
     owner = "adrienverge";
     inherit repo;
     rev = "v${version}";
-    sha256 = "03ljyam0027w412vmi4gc0bp9c2xfmcspi676qck8cvvzg4gf736";
+    sha256 = "1ndyiw4c2s8m0xds4ff87rdpixhbma5v2g420w3gfc1p7alhqz66";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -26,7 +26,7 @@ in stdenv.mkDerivation {
 
   meta = {
     description = "Client for PPP+SSL VPN tunnel services";
-    homepage = https://github.com/adrienverge/openfortivpn;
+    homepage = "https://github.com/adrienverge/openfortivpn";
     license = stdenv.lib.licenses.gpl3;
     maintainers = [ stdenv.lib.maintainers.madjar ];
     platforms = stdenv.lib.platforms.linux;

From ece763e6296fb1f8649a916af1f68c805c643baa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 29 Feb 2020 06:16:02 +0000
Subject: [PATCH 1886/4636] ocamlPackages.ppx_deriving: 4.4 -> 4.4.1

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

diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix
index d45298972cce..612a12bb4183 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix
@@ -4,11 +4,11 @@
 
 buildDunePackage rec {
   pname = "ppx_deriving";
-  version = "4.4";
+  version = "4.4.1";
 
   src = fetchzip {
     url = "https://github.com/ocaml-ppx/ppx_deriving/archive/v${version}.tar.gz";
-    sha256 = "0b2gaxlh54pcz3b4891yd143nx852mwggcy0yhq8g85dl3iisxzq";
+    sha256 = "1map50w2a35y83bcd19p9yakdkhp04z5as2j2wlygi0b6s0a9vba";
   };
 
   buildInputs = [ ppxfind cppo ounit ];

From ebd4ccc122f1bc1c0700e21835b0d50e49f098bf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 29 Feb 2020 07:27:29 +0000
Subject: [PATCH 1887/4636] ocamlPackages.ocamlnet: 4.1.6 -> 4.1.7

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

diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix
index fe276ac6e94f..493ec7f3f512 100644
--- a/pkgs/development/ocaml-modules/ocamlnet/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix
@@ -2,14 +2,14 @@
 , gnutls, nettle
 }:
 
-let version = "4.1.6"; in
+let version = "4.1.7"; in
 
 stdenv.mkDerivation {
   name = "ocaml${ocaml.version}-ocamlnet-${version}";
 
   src = fetchurl {
     url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz";
-    sha256 = "1j0k0drybcjpysvs8xpq3cnpg3wqk6d5sy7y1h5rq8jk7hrirf0k";
+    sha256 = "0r9gl0lsgxk2achixxqzm8bm5l9jwc4vwihf0rvxxa9v9q9vfdhi";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = http://projects.camlcity.org/projects/ocamlnet.html;
+    homepage = "http://projects.camlcity.org/projects/ocamlnet.html";
     description = "A library implementing Internet protocols (http, cgi, email, etc.) for OCaml";
     license = "Most Ocamlnet modules are released under the zlib/png license. The HTTP server module Nethttpd is, however, under the GPL.";
     platforms = ocaml.meta.platforms or [];

From 3b9dc545a958f9fcbdb1d1a2ff617190fdc5d714 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 29 Feb 2020 04:20:00 -0500
Subject: [PATCH 1888/4636] libvmaf: 1.3.15 -> 1.5.1

Changelog: https://github.com/Netflix/vmaf/releases/tag/v1.5.1
---
 .../development/libraries/libvmaf/default.nix | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix
index 82c76f7ea372..321f5f70d2cc 100644
--- a/pkgs/development/libraries/libvmaf/default.nix
+++ b/pkgs/development/libraries/libvmaf/default.nix
@@ -1,31 +1,26 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, intltool, libtool, pkgconfig }:
+{ stdenv, fetchFromGitHub, meson, ninja }:
 
 stdenv.mkDerivation rec {
   pname = "libvmaf";
-  version = "1.3.15";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "netflix";
     repo = "vmaf";
     rev = "v${version}";
-    sha256="10kgcdf06hzhbl5r7zsllq88bxbyn282hfqx5i3hkp66fpq896d2";
+    sha256 = "10fw53k9k4aq4p2qi5qkfjfnhldw4p5bbmxggf8220gfa95nvyl3";
   };
 
-  nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig ];
+  sourceRoot = "source/libvmaf";
+
+  nativeBuildInputs = [ meson ninja ];
   outputs = [ "out" "dev" ];
   doCheck = true;
 
-  postFixup = ''
-    substituteInPlace "$dev/lib/pkgconfig/libvmaf.pc" \
-      --replace "includedir=/usr/local/include" "includedir=$dev"
-  '';
-
-  makeFlags = [ "INSTALL_PREFIX=${placeholder "out"}" ];
-
   meta = with stdenv.lib; {
     homepage = "https://github.com/Netflix/vmaf";
     description = "Perceptual video quality assessment based on multi-method fusion (VMAF)";
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     license = licenses.asl20;
     maintainers = [ maintainers.cfsmp3 ];
   };

From e24855d70d6e435fcfa7380dc9dcdb9efb49405b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 29 Feb 2020 04:20:00 -0500
Subject: [PATCH 1889/4636] docker-slim: 1.26.1 -> 1.27.0

Changelog: https://github.com/docker-slim/docker-slim/releases/tag/1.27.0
---
 .../virtualization/docker-slim/default.nix    | 37 +++++--------------
 1 file changed, 10 insertions(+), 27 deletions(-)

diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix
index 6004898f08e5..8e0bd8e54ed2 100644
--- a/pkgs/applications/virtualization/docker-slim/default.nix
+++ b/pkgs/applications/virtualization/docker-slim/default.nix
@@ -4,26 +4,17 @@
 , makeWrapper
 }:
 
-let
-
-  version = "1.26.1";
-  rev = "2ec04e169b12a87c5286aa09ef44eac1cea2c7a1";
-
-in buildGoPackage rec {
+buildGoPackage rec {
   pname = "docker-slim";
-  inherit version;
+  version = "1.27.0";
 
   goPackagePath = "github.com/docker-slim/docker-slim";
 
   src = fetchFromGitHub {
     owner = "docker-slim";
     repo = "docker-slim";
-    inherit rev;
-    # fetchzip yields a different hash on Darwin because `use-case-hack`
-    sha256 =
-      if stdenv.isDarwin
-      then "0j72rn6qap78qparrnslxm3yv83mzy1yc7ha0crb4frwkzmspyvf"
-      else "01bjb14z7yblm7qdqrx1j2pw5x5da7a6np4rkzay931gly739gbh";
+    rev = version;
+    sha256 = "1pd9sz981qgr5lx6ikrhdp0n21nyrnpjpnyl8i4r2jx35zr8b5q8";
   };
 
   subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ];
@@ -32,20 +23,12 @@ in buildGoPackage rec {
     makeWrapper
   ];
 
-  # docker-slim vendorized logrus files in different directories, which
-  # conflicts on case-sensitive filesystems
-  preBuild = stdenv.lib.optionalString stdenv.isLinux ''
-    mv go/src/${goPackagePath}/vendor/github.com/Sirupsen/logrus/* \
-      go/src/${goPackagePath}/vendor/github.com/sirupsen/logrus/
-  '';
-
-  buildFlagsArray =
-    let
-      ldflags = "-ldflags=-s -w " +
-                "-X ${goPackagePath}/pkg/version.appVersionTag=${version} " +
-                "-X ${goPackagePath}/pkg/version.appVersionRev=${rev}";
-    in
-      [ ldflags ];
+  buildFlagsArray = [
+    ''-ldflags=
+        -s -w -X ${goPackagePath}/pkg/version.appVersionTag=${version}
+              -X ${goPackagePath}/pkg/version.appVersionRev=${src.rev}
+    ''
+  ];
 
   # docker-slim tries to create its state dir next to the binary (inside the nix
   # store), so we set it to use the working directory at the time of invocation

From bd086255efa5186ef379f34670d7eacd416f0f63 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 29 Feb 2020 04:21:00 -0500
Subject: [PATCH 1890/4636] libvmaf: add marsam to maintainers

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

diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix
index 321f5f70d2cc..fb494909c838 100644
--- a/pkgs/development/libraries/libvmaf/default.nix
+++ b/pkgs/development/libraries/libvmaf/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     description = "Perceptual video quality assessment based on multi-method fusion (VMAF)";
     platforms = platforms.unix;
     license = licenses.asl20;
-    maintainers = [ maintainers.cfsmp3 ];
+    maintainers = [ maintainers.cfsmp3 maintainers.marsam ];
   };
 
 }

From f1230a2ecadc56a861925ac8a240cc7fbbdbea57 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 29 Feb 2020 04:22:00 -0500
Subject: [PATCH 1891/4636] ffmpeg: enable libvmaf on darwin

---
 pkgs/top-level/all-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e02b42d95a7..c5446dbf5685 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11376,7 +11376,6 @@ in
     frei0r = if stdenv.isDarwin then null else frei0r;
     game-music-emu = if stdenv.isDarwin then null else game-music-emu;
     libjack2 = if stdenv.isDarwin then null else libjack2;
-    libvmaf = if stdenv.isDarwin then null else libvmaf;
     libmodplug = if stdenv.isDarwin then null else libmodplug;
     openal = if stdenv.isDarwin then null else openal;
     libmfx = if stdenv.isDarwin then null else intel-media-sdk;

From eaf2f2620120c3f8c315afe2edc6a9594b948766 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 29 Feb 2020 09:27:19 +0000
Subject: [PATCH 1892/4636] phoronix-test-suite: 9.2.1 -> 9.4.0

---
 pkgs/tools/misc/phoronix-test-suite/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix
index bdb86cbb8020..b9a59dffae7a 100644
--- a/pkgs/tools/misc/phoronix-test-suite/default.nix
+++ b/pkgs/tools/misc/phoronix-test-suite/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "phoronix-test-suite";
-  version = "9.2.1";
+  version = "9.4.0";
 
   src = fetchurl {
     url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz";
-    sha256 = "00c5xgyn34psj538zrzql16z16532c9444vc5asg7qhrcylpqpk7";
+    sha256 = "108h3zs7p9vmb56dwlw7wicv9z4kxbndl82075sx4c12rzrmssi9";
   };
 
   buildInputs = [ php ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Open-Source, Automated Benchmarking";
-    homepage = https://www.phoronix-test-suite.com/;
+    homepage = "https://www.phoronix-test-suite.com/";
     maintainers = with maintainers; [ davidak ];
     license = licenses.gpl3;
     platforms = with platforms; unix;

From 03fbecff083adf7bf2063b5e46b9ef251aec60be Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 29 Feb 2020 09:56:31 +0000
Subject: [PATCH 1893/4636] powerstat: 0.02.21 -> 0.02.22

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

diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix
index 91e1bc0f53a2..f5b54769f003 100644
--- a/pkgs/os-specific/linux/powerstat/default.nix
+++ b/pkgs/os-specific/linux/powerstat/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "powerstat";
-  version = "0.02.21";
+  version = "0.02.22";
   
   src = fetchurl {
     url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "00396dyn3mw3virx9h2g9kzw9ai10x7wpn8zclnvvidn9g0jhf31";
+    sha256 = "0r355b9syqa2nhfy8ksvxyy5d58v0isf983842js091s6liy0x7g";
   };
   
   installFlags = [ "DESTDIR=${placeholder "out"}" ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   
   meta = with lib; {
     description = "Laptop power measuring tool";
-    homepage = https://kernel.ubuntu.com/~cking/powerstat/;
+    homepage = "https://kernel.ubuntu.com/~cking/powerstat/";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ womfoo ];

From a6130f1848c6fd5ba0379f8ccf934043d1a6e9dc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 29 Feb 2020 10:58:46 +0100
Subject: [PATCH 1894/4636] hackage2nix: mark stylish-cabal broken

https://github.com/pikajude/stylish-cabal/issues/12
---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 06acf07ad79e..c8215c57533d 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2433,7 +2433,6 @@ package-maintainers:
     - nix-paths
     - pandoc
     - structured-haskell-mode
-    - stylish-cabal
     - titlecase
     - xmonad
     - xmonad-contrib
@@ -9701,6 +9700,7 @@ broken-packages:
   - stunclient
   - stunts
   - stutter
+  - stylish-cabal
   - stylist
   - stylized
   - sub-state

From 376ff258b5a8605ed1d177a389463e808fe8a436 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 29 Feb 2020 11:10:19 +0100
Subject: [PATCH 1895/4636] stylish-cabal: fix the build

We can still compile the package with ghc-8.6.5. Later
compiler versions don't work, unfortunately.
---
 .../configuration-ghc-8.6.x.nix               |  4 ++++
 .../configuration-hackage2nix.yaml            |  1 +
 .../haskell-modules/hackage-packages.nix      | 24 ++++++++++++++++++-
 pkgs/top-level/all-packages.nix               |  4 +++-
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 8d64286402f3..915f7b3e635f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -87,4 +87,8 @@ self: super: {
   # Builds only with ghc-8.8.x and beyond.
   policeman = markBroken super.policeman;
 
+  # https://github.com/pikajude/stylish-cabal/issues/12
+  stylish-cabal = doDistribute (markUnbroken (super.stylish-cabal.override { haddock-library = self.haddock-library_1_7_0; }));
+  haddock-library_1_7_0 = dontCheck super.haddock-library_1_7_0;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index c8215c57533d..42223a656f80 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2367,6 +2367,7 @@ extra-packages:
   - gloss < 1.9.3                       # new versions don't compile with GHC 7.8.x
   - haddock == 2.22.*                   # required on GHC 8.0.x
   - haddock-api == 2.22.*               # required on GHC 7.8.x
+  - haddock-library ==1.7.*             # required by stylish-cabal-0.5.0.0
   - happy <1.19.6                       # newer versions break Agda
   - happy == 1.19.9                     # for purescript
   - haskell-gi-overloading == 0.0       # gi-* packages use this dependency to disable overloading support
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 7425f9e784d7..59eb91b774ed 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -107228,6 +107228,27 @@ self: {
        broken = true;
      }) {};
 
+  "haddock-library_1_7_0" = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, containers, deepseq
+     , hspec, hspec-discover, parsec, QuickCheck, text, transformers
+     }:
+     mkDerivation {
+       pname = "haddock-library";
+       version = "1.7.0";
+       sha256 = "04fhcjk0pvsaqvsgp2w06cv2qvshq1xs1bwc157q4lmkgr57khp7";
+       libraryHaskellDepends = [
+         base bytestring containers parsec text transformers
+       ];
+       testHaskellDepends = [
+         base base-compat bytestring containers deepseq hspec parsec
+         QuickCheck text transformers
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Library exposing some functionality of Haddock";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haddock-library" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, containers, deepseq
      , directory, filepath, hspec, hspec-discover, optparse-applicative
@@ -231440,7 +231461,8 @@ self: {
        doHaddock = false;
        description = "Format Cabal files";
        license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "stylish-haskell" = callPackage
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d00b878c7816..b40eb6db6b5c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8292,7 +8292,9 @@ in
 
   stack = haskell.lib.justStaticExecutables haskellPackages.stack;
   hlint = haskell.lib.justStaticExecutables haskellPackages.hlint;
-  stylish-cabal = haskell.lib.justStaticExecutables haskellPackages.stylish-cabal;
+
+  # We use a version built with an older compiler because of https://github.com/pikajude/stylish-cabal/issues/12.
+  stylish-cabal = haskell.lib.justStaticExecutables haskell.packages.ghc865.stylish-cabal;
 
   all-cabal-hashes = callPackage ../data/misc/hackage { };
 

From 8947cba1602a984e27376b15c405643b6be1f3dd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 29 Feb 2020 11:11:24 +0100
Subject: [PATCH 1896/4636] ShellCheck: let Hydra compile the binary

---
 pkgs/development/haskell-modules/hackage-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 59eb91b774ed..7f596626cde3 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -17898,7 +17898,6 @@ self: {
        ];
        description = "Shell script analysis tool";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Shellac" = callPackage

From 10da6658ad1fbe29da22bed9e05ce45975188d77 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 29 Feb 2020 11:34:32 +0100
Subject: [PATCH 1897/4636] ShellCheck: record the URL of the upstream issues
 our patches fix

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b39b454b1d53..0901af4e7b31 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -48,6 +48,7 @@ self: super: {
   # Needs older QuickCheck version
   attoparsec-varword = dontCheck super.attoparsec-varword;
 
+  # https://github.com/koalaman/shellcheck/issues/1778
   ShellCheck = overrideCabal super.ShellCheck (drv: {
     patches = [
       # cabal 3.0 support

From fe690a84ebca6eeb0076c07caa92c215d307fa66 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 10 Feb 2020 21:28:49 +0000
Subject: [PATCH 1898/4636] noto-fonts{,-extra}: 2018-11-30 -> 2020-01-23

---
 pkgs/data/fonts/noto-fonts/default.nix | 77 ++++++++++++++++----------
 1 file changed, 47 insertions(+), 30 deletions(-)

diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix
index 04e8e581b634..c8b8de8c12ef 100644
--- a/pkgs/data/fonts/noto-fonts/default.nix
+++ b/pkgs/data/fonts/noto-fonts/default.nix
@@ -1,28 +1,44 @@
-{ stdenv, fetchzip, fetchFromGitHub, optipng, cairo, python3Packages, pkgconfig, pngquant, which, imagemagick }:
+{ stdenv
+, stdenvNoCC
+, lib
+, fetchFromGitHub
+, fetchzip
+, optipng
+, cairo
+, python3Packages
+, pkgconfig
+, pngquant
+, which
+, imagemagick
+}:
 
 let
-  mkNoto = { name, weights, sha256, }:
-    let
-      version = "2018-11-30";
-      ref = "85e78f831469323c85847e23f95026c894159135";
-    in
-    fetchzip {
-      name = "${name}-${version}";
-      inherit sha256;
-      url = "https://github.com/googlei18n/noto-fonts/archive/${ref}.zip";
-      postFetch = ''
-        unzip $downloadedFile
-        mkdir -p $out/share/fonts/noto
-        # Also copy unhinted & alpha fonts for better glyph coverage,
-        # if they don't have a hinted version
-        # (see https://groups.google.com/d/msg/noto-font/ZJSkZta4n5Y/tZBnLcPdbS0J)
-        for ttf in noto-fonts-*/{hinted,unhinted,alpha}/*-${weights}.ttf
-        do
-            cp -n "$ttf" -t "$out/share/fonts/noto"
-        done
+  mkNoto = { pname, weights }:
+    stdenvNoCC.mkDerivation {
+      inherit pname;
+      version = "2020-01-23";
+
+      src = fetchFromGitHub {
+        owner = "googlefonts";
+        repo = "noto-fonts";
+        rev = "f4726a2ec36169abd02a6d8abe67c8ff0236f6d8";
+        sha256 = "0zc1r7zph62qmvzxqfflsprazjf6x1qnwc2ma27kyzh6v36gaykw";
+      };
+
+      installPhase = ''
+        # We copy in reverse preference order -- unhinted first, then
+        # hinted -- to get the "best" version of each font while
+        # maintaining maximum coverage.
+        #
+        # TODO: install OpenType, variable versions?
+        local out_ttf=$out/share/fonts/truetype/noto
+        install -m444 -Dt $out_ttf phaseIII_only/unhinted/ttf/*/*-${weights}.ttf
+        install -m444 -Dt $out_ttf phaseIII_only/hinted/ttf/*/*-${weights}.ttf
+        install -m444 -Dt $out_ttf unhinted/*/*-${weights}.ttf
+        install -m444 -Dt $out_ttf hinted/*/*-${weights}.ttf
       '';
-      meta = with stdenv.lib; {
-        inherit version;
+
+      meta = with lib; {
         description = "Beautiful and free fonts for many languages";
         homepage = https://www.google.com/get/noto/;
         longDescription =
@@ -39,24 +55,24 @@ let
 
           This package also includes the Arimo, Cousine, and Tinos fonts.
         '';
-        license = licenses.asl20;
+        license = licenses.ofl;
         platforms = platforms.all;
-        maintainers = with maintainers; [ mathnerd314 ];
+        maintainers = with maintainers; [ mathnerd314 emily ];
       };
     };
 in
 
 {
   noto-fonts = mkNoto {
-    name = "noto-fonts";
+    pname = "noto-fonts";
     weights = "{Regular,Bold,Light,Italic,BoldItalic,LightItalic}";
-    sha256 = "0kvq5ldip2ra2njlxg9fxj46nfqzq5l3n359d3kwfbsld7hixm2d";
   };
+
   noto-fonts-extra = mkNoto {
-    name = "noto-fonts-extra";
+    pname = "noto-fonts-extra";
     weights = "{Black,Condensed,Extra,Medium,Semi,Thin}*";
-    sha256 = "0l94aiy1b3qirg2mmbagbr0014vqk32za79pzck1acy2hgy716kq";
   };
+
   noto-fonts-cjk = let version = "1.004"; in fetchzip {
     name = "noto-fonts-cjk-${version}";
 
@@ -68,7 +84,7 @@ in
     '';
     sha256 = "0ghw2azqq3nkcxsbvf53qjmrhcfsnry79rq7jsr0wwi2pn7d3dsq";
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       inherit version;
       description = "Beautiful and free fonts for CJK languages";
       homepage = https://www.google.com/get/noto/help/cjk/;
@@ -89,6 +105,7 @@ in
       maintainers = with maintainers; [ mathnerd314 ];
     };
   };
+
   noto-fonts-emoji = let
     version = "unstable-2019-10-22";
   in stdenv.mkDerivation {
@@ -118,7 +135,7 @@ in
       cp NotoColorEmoji.ttf fonts/NotoEmoji-Regular.ttf $out/share/fonts/noto
     '';
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       inherit version;
       description = "Color and Black-and-White emoji fonts";
       homepage = https://github.com/googlei18n/noto-emoji;

From 7948e6785b4aa6a1289645575816e423d85f6aea Mon Sep 17 00:00:00 2001
From: Suwon Park <35622998+sepiabrown@users.noreply.github.com>
Date: Sat, 29 Feb 2020 20:11:42 +0900
Subject: [PATCH 1899/4636] nixos/manual: add environment.systemPackages option
 in an example

The environment.systemPackages option lacks in the example which is used in the next paragraph to explain merging of the options defined by multiple modules.
---
 nixos/doc/manual/configuration/modularity.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml
index 7ad0ae80a48a..532a2c615e4d 100644
--- a/nixos/doc/manual/configuration/modularity.xml
+++ b/nixos/doc/manual/configuration/modularity.xml
@@ -36,6 +36,7 @@
 { <xref linkend="opt-services.xserver.enable"/> = true;
   <xref linkend="opt-services.xserver.displayManager.sddm.enable"/> = true;
   <xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/> = true;
+  <xref linkend="opt-environment.systemPackages"/> = [ pkgs.vim ];
 }
 </programlisting>
   Note that both <filename>configuration.nix</filename> and

From cf792da8357df593068d4f47c38ddb83fb5fd837 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 10 Feb 2020 21:29:28 +0000
Subject: [PATCH 1900/4636] noto-fonts-cjk: 1.004 -> 2.001

---
 pkgs/data/fonts/noto-fonts/default.nix | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix
index c8b8de8c12ef..9681bb50efac 100644
--- a/pkgs/data/fonts/noto-fonts/default.nix
+++ b/pkgs/data/fonts/noto-fonts/default.nix
@@ -73,19 +73,21 @@ in
     weights = "{Black,Condensed,Extra,Medium,Semi,Thin}*";
   };
 
-  noto-fonts-cjk = let version = "1.004"; in fetchzip {
-    name = "noto-fonts-cjk-${version}";
+  noto-fonts-cjk = let zip = fetchzip {
+    url = let rev = "be6c059ac1587e556e2412b27f5155c8eb3ddbe6"; in
+      "https://raw.githubusercontent.com/googlefonts/noto-cjk/${rev}/NotoSansCJK.ttc.zip";
+    # __MACOSX...
+    stripRoot = false;
+    sha256 = "0ik4z2b15i0pghskgfm3adzb0h35fr4gyzvz3bq49hhkhn9h85vi";
+  }; in stdenvNoCC.mkDerivation {
+    pname = "noto-fonts-cjk";
+    version = "2.001";
 
-    # Same as https://noto-website.storage.googleapis.com/pkgs/NotoSansCJK.ttc.zip but versioned & with no extra SIL license file
-    url = "https://raw.githubusercontent.com/googlei18n/noto-cjk/40d9f5b179a59a06b98373c76bdc3e2119e4e6b2/NotoSansCJK.ttc.zip";
-    postFetch = ''
-      mkdir -p $out/share/fonts
-      unzip -j $downloadedFile \*.ttc -d $out/share/fonts/noto
+    buildCommand = ''
+      install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${zip}/*.ttc
     '';
-    sha256 = "0ghw2azqq3nkcxsbvf53qjmrhcfsnry79rq7jsr0wwi2pn7d3dsq";
 
     meta = with lib; {
-      inherit version;
       description = "Beautiful and free fonts for CJK languages";
       homepage = https://www.google.com/get/noto/help/cjk/;
       longDescription =
@@ -102,7 +104,7 @@ in
       '';
       license = licenses.ofl;
       platforms = platforms.all;
-      maintainers = with maintainers; [ mathnerd314 ];
+      maintainers = with maintainers; [ mathnerd314 emily ];
     };
   };
 

From c580dfc0cee3a201521df41ce4c8adbdecd971c0 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 29 Feb 2020 06:49:19 -0500
Subject: [PATCH 1901/4636] viu: upgrade cargo fetcher and cargoSha256 (#81240)

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/tools/graphics/viu/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/graphics/viu/default.nix b/pkgs/tools/graphics/viu/default.nix
index 2ad33b8eef92..dcb95ecc5530 100644
--- a/pkgs/tools/graphics/viu/default.nix
+++ b/pkgs/tools/graphics/viu/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0p4ibvv0qrflqdc2bi9rjn7yhn01ncxrpqpxmh8cbq67rbvm7jnx";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1h9dm2hhld2079dnx4x5nzkn3ivk6g5ijhv49jxnc200mx4mr1s5";
+  cargoSha256 = "1wvqln3xr192ml9gfzfv6qdv59g654xyaw15d790sysm82gd0inz";
 
   meta = with lib; {
     description = "A command-line application to view images from the terminal written in Rust";

From 6eb45bf38ac122a242be8bce2b9868ac72a6e0cc Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 10 Feb 2020 22:59:42 +0000
Subject: [PATCH 1902/4636] source-han-{sans,serif,mono}:
 {update,refactor,init}
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* source-han-sans: 1.004R -> 2.001
* source-han-serif: switch to Super OTC
* source-han-mono: init at 1.002

The Source Han fonts now use shared package infrastructure, and the
Super OTC distributions, which unify the various scripts into a single
bundle file, improving automatic font selection and reducing overall
disk space usage. This also means that the Traditional
Chinese—Hong Kong language variant is now included.

The old package names including language are aliased to the Super OTC
bundle packages.
---
 pkgs/data/fonts/source-han-sans/default.nix  | 52 -------------------
 pkgs/data/fonts/source-han-serif/default.nix | 52 -------------------
 pkgs/data/fonts/source-han/default.nix       | 54 ++++++++++++++++++++
 pkgs/top-level/aliases.nix                   | 23 +++++++++
 pkgs/top-level/all-packages.nix              | 14 ++---
 5 files changed, 81 insertions(+), 114 deletions(-)
 delete mode 100644 pkgs/data/fonts/source-han-sans/default.nix
 delete mode 100644 pkgs/data/fonts/source-han-serif/default.nix
 create mode 100644 pkgs/data/fonts/source-han/default.nix

diff --git a/pkgs/data/fonts/source-han-sans/default.nix b/pkgs/data/fonts/source-han-sans/default.nix
deleted file mode 100644
index 87e24c0e23c3..000000000000
--- a/pkgs/data/fonts/source-han-sans/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ lib, fetchzip }:
-
-let
-  makePackage = {variant, language, region, sha256}: let
-    version = "1.004R";
-    revision = "5f5311e71cb628321cc0cffb51fb38d862b726aa";
-  in fetchzip {
-    name = "source-han-sans-${variant}-${version}";
-
-    url = "https://github.com/adobe-fonts/source-han-sans/raw/${revision}/SubsetOTF/SourceHanSans${region}.zip";
-
-    postFetch = ''
-      mkdir -p $out/share/fonts
-      unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
-    '';
-
-    inherit sha256;
-
-    meta = {
-      description = "${language} subset of an open source Pan-CJK sans-serif typeface";
-      homepage = https://github.com/adobe-fonts/source-han-sans;
-      license = lib.licenses.ofl;
-      maintainers = with lib.maintainers; [ taku0 ];
-    };
-  };
-in
-{
-  japanese = makePackage {
-    variant = "japanese";
-    language = "Japanese";
-    region = "JP";
-    sha256 = "194zapswaqly8ycx3k66vznlapvpyhdigp3sabsl4hn87j9xsc5v";
-  };
-  korean = makePackage {
-    variant = "korean";
-    language = "Korean";
-    region = "KR";
-    sha256 = "0xij6mciiqgpwv1agqily2jji377x084k7fj4rpv6z0r5vvhqr08";
-  };
-  simplified-chinese = makePackage {
-    variant = "simplified-chinese";
-    language = "Simplified Chinese";
-    region = "CN";
-    sha256 = "038av18d45qr85bgx95j2fm8j64d72nsm9xzg0lpwr9xwni2sbx0";
-  };
-  traditional-chinese = makePackage {
-    variant = "traditional-chinese";
-    language = "Traditional Chinese";
-    region = "TW";
-    sha256 = "1mzcv5hksyxplyv5q3w5nr1xz73hdnvip5gicz35j0by4gc739lr";
-  };
-}
diff --git a/pkgs/data/fonts/source-han-serif/default.nix b/pkgs/data/fonts/source-han-serif/default.nix
deleted file mode 100644
index bb5a67c83068..000000000000
--- a/pkgs/data/fonts/source-han-serif/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ lib, fetchzip }:
-
-let
-  makePackage = {variant, language, region, sha256}: let
-    version = "1.000R";
-    revision = "f6cf97d92b22e7bd77e355a61fe549ae44b6de76";
-  in fetchzip {
-    name = "source-han-serif-${variant}-${version}";
-
-    url = "https://github.com/adobe-fonts/source-han-serif/raw/${revision}/SubsetOTF/SourceHanSerif${region}.zip";
-
-    postFetch = ''
-      mkdir -p $out/share/fonts/opentype
-      unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
-    '';
-
-    inherit sha256;
-
-    meta = {
-      description = "${language} subset of an open source Pan-CJK serif typeface";
-      homepage = https://github.com/adobe-fonts/source-han-sans;
-      license = lib.licenses.ofl;
-      maintainers = with lib.maintainers; [ taku0 ];
-    };
-  };
-in
-{
-  japanese = makePackage {
-    variant = "japanese";
-    language = "Japanese";
-    region = "JP";
-    sha256 = "0cklcy6y3r7pg8z43fzd8zl5g46bkqa1iy0li49rm0fgdaw7kin2";
-  };
-  korean = makePackage {
-    variant = "korean";
-    language = "Korean";
-    region = "KR";
-    sha256 = "0lxrr978djsych8fmbl57n1c9c7ihl61w0b9q4plw27vd6p41fza";
-  };
-  simplified-chinese = makePackage {
-    variant = "simplified-chinese";
-    language = "Simplified Chinese";
-    region = "CN";
-    sha256 = "0k3x4kncjnbipf4i3lkk6b33zpf1ckp5648z51v48q47l3zqpm6p";
-  };
-  traditional-chinese = makePackage {
-    variant = "traditional-chinese";
-    language = "Traditional Chinese";
-    region = "TW";
-    sha256 = "00bi66nlkrargmmf4av24qfd716py7a9smcvr4xnll7fffldxv06";
-  };
-}
diff --git a/pkgs/data/fonts/source-han/default.nix b/pkgs/data/fonts/source-han/default.nix
new file mode 100644
index 000000000000..7b6bef0198da
--- /dev/null
+++ b/pkgs/data/fonts/source-han/default.nix
@@ -0,0 +1,54 @@
+{ stdenvNoCC
+, lib
+, fetchzip
+, fetchurl
+}:
+
+let
+  makePackage = { family, description, rev, sha256 }: let
+    Family =
+      lib.toUpper (lib.substring 0 1 family) +
+      lib.substring 1 (lib.stringLength family) family;
+
+    ttc = fetchurl {
+      url = "https://github.com/adobe-fonts/source-han-${family}/releases/download/${rev}/SourceHan${Family}.ttc";
+      inherit sha256;
+    };
+  in stdenvNoCC.mkDerivation {
+    pname = "source-han-${family}";
+    version = lib.removeSuffix "R" rev;
+
+    buildCommand = ''
+      install -m444 -Dt $out/share/fonts/opentype/source-han-${family} ${ttc}
+    '';
+
+    meta = {
+      description = "An open source Pan-CJK ${description} typeface";
+      homepage = "https://github.com/adobe-fonts/source-han-${family}";
+      license = lib.licenses.ofl;
+      maintainers = with lib.maintainers; [ taku0 emily ];
+    };
+  };
+in
+{
+  sans = makePackage {
+    family = "sans";
+    description = "sans-serif";
+    rev = "2.001R";
+    sha256 = "101p8q0sagf1sd1yzwdrmmxvkqq7j0b8hi0ywsfck9w56r4zx54y";
+  };
+
+  serif = makePackage {
+    family = "serif";
+    description = "serif";
+    rev = "1.001R";
+    sha256 = "1d968h30qvvwy3s77m9y3f1glq8zlr6bnfw00yinqa18l97n7k45";
+  };
+
+  mono = makePackage {
+    family = "mono";
+    description = "monospaced";
+    rev = "1.002";
+    sha256 = "1haqffkcgz0cc24y8rc9bg36v8x9hdl8fdl3xc8qz14hvr42868c";
+  };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 7a7139cb3ceb..3a504f20d944 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -425,6 +425,29 @@ mapAliases ({
   slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11
   slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11
   sundials_3 = throw "removed 2020-02. outdated and no longer needed";
+
+  # added 2020-02-10
+  sourceHanSansPackages = {
+    japanese = source-han-sans;
+    korean = source-han-sans;
+    simplified-chinese = source-han-sans;
+    traditional-chinese = source-han-sans;
+  };
+  source-han-sans-japanese = source-han-sans;
+  source-han-sans-korean = source-han-sans;
+  source-han-sans-simplified-chinese = source-han-sans;
+  source-han-sans-traditional-chinese = source-han-sans;
+  sourceHanSerifPackages = {
+    japanese = source-han-serif;
+    korean = source-han-serif;
+    simplified-chinese = source-han-serif;
+    traditional-chinese = source-han-serif;
+  };
+  source-han-serif-japanese = source-han-serif;
+  source-han-serif-korean = source-han-serif;
+  source-han-serif-simplified-chinese = source-han-serif;
+  source-han-serif-traditional-chinese = source-han-serif;
+
   net_snmp = net-snmp; # added 2019-12-21
   spaceOrbit = space-orbit; # addewd 2016-05-23
   speech_tools = speech-tools; # added 2018-04-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b40eb6db6b5c..6e02b42d95a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18010,16 +18010,10 @@ in
 
   source-han-code-jp = callPackage ../data/fonts/source-han-code-jp { };
 
-  sourceHanSansPackages = dontRecurseIntoAttrs (callPackage ../data/fonts/source-han-sans { });
-  source-han-sans-japanese = sourceHanSansPackages.japanese;
-  source-han-sans-korean = sourceHanSansPackages.korean;
-  source-han-sans-simplified-chinese = sourceHanSansPackages.simplified-chinese;
-  source-han-sans-traditional-chinese = sourceHanSansPackages.traditional-chinese;
-  sourceHanSerifPackages = dontRecurseIntoAttrs (callPackage ../data/fonts/source-han-serif { });
-  source-han-serif-japanese = sourceHanSerifPackages.japanese;
-  source-han-serif-korean = sourceHanSerifPackages.korean;
-  source-han-serif-simplified-chinese = sourceHanSerifPackages.simplified-chinese;
-  source-han-serif-traditional-chinese = sourceHanSerifPackages.traditional-chinese;
+  sourceHanPackages = dontRecurseIntoAttrs (callPackage ../data/fonts/source-han { });
+  source-han-sans = sourceHanPackages.sans;
+  source-han-serif = sourceHanPackages.serif;
+  source-han-mono = sourceHanPackages.mono;
 
   spleen = callPackage ../data/fonts/spleen { inherit (buildPackages.xorg) mkfontscale; };
 

From 5ff9441471e4a63be0eb60632a26ad33f2a4afc3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 29 Feb 2020 14:39:55 +0100
Subject: [PATCH 1903/4636] nixos/acme: renew after rebuild and on boot

Fixes #81069
---
 nixos/modules/security/acme.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 238c18242c19..9e660b3d6a3b 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -294,6 +294,7 @@ in
                   description = "Renew ACME Certificate for ${cert}";
                   after = [ "network.target" "network-online.target" ];
                   wants = [ "network-online.target" ];
+                  wantedBy = [ "multi-user.target" ];
                   serviceConfig = {
                     Type = "oneshot";
                     # With RemainAfterExit the service is considered active even

From cf6477076b4ea05e9dcf1e6dda565604076ec6d8 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 29 Feb 2020 14:39:55 +0100
Subject: [PATCH 1904/4636] wob: 0.6 -> 0.7

---
 pkgs/tools/misc/wob/default.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/wob/default.nix b/pkgs/tools/misc/wob/default.nix
index c3b3cd112398..e2c5bd744e53 100644
--- a/pkgs/tools/misc/wob/default.nix
+++ b/pkgs/tools/misc/wob/default.nix
@@ -1,21 +1,29 @@
 { stdenv, fetchFromGitHub
 , meson, ninja, pkg-config, scdoc, wayland # wayland-scanner
-, wayland-protocols
+, wayland-protocols, libseccomp
 }:
 
 stdenv.mkDerivation rec {
   pname = "wob";
-  version = "0.6";
+  version = "0.7";
 
   src = fetchFromGitHub {
     owner = "francma";
     repo = pname;
     rev = version;
-    sha256 = "0cfglwh1inv6ng55vgznhll51m9g1lxfh37k4ridyxl64rc9jfq8";
+    sha256 = "1j3l4v9iqhidn1b6vx86px9hz5wbsbgj3zy2jzwf9204k5sfv715";
   };
 
+  postPatch = ''
+    substituteInPlace meson.build \
+      --replace "version: '0.6'" "version: '${version}'"
+  '';
+
   nativeBuildInputs = [ meson ninja pkg-config scdoc wayland ];
-  buildInputs = [ wayland-protocols ];
+  buildInputs = [ wayland-protocols ]
+    ++ stdenv.lib.optional stdenv.isLinux libseccomp;
+
+  mesonFlags = stdenv.lib.optional stdenv.isLinux "-Dseccomp=enabled";
 
   meta = with stdenv.lib; {
     description = "A lightweight overlay bar for Wayland";
@@ -24,6 +32,7 @@ stdenv.mkDerivation rec {
       inspired by xob.
     '';
     inherit (src.meta) homepage;
+    changelog = "https://github.com/francma/wob/releases/tag/${version}";
     license = licenses.isc;
     platforms = platforms.unix;
     maintainers = with maintainers; [ primeos ];

From 89d7cc11c1e5a4905023f96faba536e876ca2913 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 29 Feb 2020 13:53:00 +0000
Subject: [PATCH 1905/4636] python37Packages.goocalendar: 0.6 -> 0.7.0

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

diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix
index 9fc0acc30afa..e9b33f330813 100644
--- a/pkgs/development/python-modules/goocalendar/default.nix
+++ b/pkgs/development/python-modules/goocalendar/default.nix
@@ -14,13 +14,13 @@ with stdenv.lib;
 
 buildPythonPackage rec {
   pname = "GooCalendar";
-  version = "0.6";
+  version = "0.7.0";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4c22c93e19b933d10d8ea1c67a67f485267af82175ef59419427dd39d1e3af18";
+    sha256 = "14m05pi1vwl7i8iv1wvc0r3450dlivsh85f4cyny08l869cr9lf1";
   };
 
   nativeBuildInputs = [
@@ -42,7 +42,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "A calendar widget for GTK using PyGoocanvas.";
-    homepage = https://goocalendar.tryton.org/;
+    homepage = "https://goocalendar.tryton.org/";
     license = licenses.gpl2;
     maintainers = [ maintainers.udono ];
   };

From 7b14bbd7342cde743e5b06a4ccc53a7001d7a1d5 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 23 Feb 2020 01:46:46 +0000
Subject: [PATCH 1906/4636] nixos/acme: adjust renewal timer options

The current weekly setting causes every NixOS server to try to renew
its certificate at midnight on the dot on Monday. This contributes to
the general problem of periodic load spikes for Let's Encrypt; NixOS
is probably not a major contributor to that problem, but we can lead by
example by picking good defaults here.

The values here were chosen after consulting with @yuriks, an SRE at
Let's Encrypt:

* Randomize the time certificates are renewed within a 24 hour period.

* Check for renewal every 24 hours, to ensure the certificate is always
  renewed before an expiry notice is sent out.

* Increase the AccuracySec (thus lowering the accuracy(!)), so that
  systemd can coalesce the renewal with other timers being run.

  (You might be worried that this would defeat the purpose of the time
  skewing, but systemd is documented as avoiding this by picking a
  random time.)
---
 nixos/modules/security/acme.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 7da6666f79c6..dfd0c2cc2e3c 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -174,7 +174,7 @@ in
 
       renewInterval = mkOption {
         type = types.str;
-        default = "weekly";
+        default = "daily";
         description = ''
           Systemd calendar expression when to check for renewal. See
           <citerefentry><refentrytitle>systemd.time</refentrytitle>
@@ -399,7 +399,17 @@ in
       systemd.tmpfiles.rules =
         map (data: "d ${data.webroot}/.well-known/acme-challenge - ${data.user} ${data.group}") (filter (data: data.webroot != null) (attrValues cfg.certs));
 
-      systemd.timers = flip mapAttrs' cfg.certs (cert: data: nameValuePair
+      systemd.timers = let
+        # Allow systemd to pick a convenient time within the day
+        # to run the check.
+        # This allows the coalescing of multiple timer jobs.
+        # We divide by the number of certificates so that if you
+        # have many certificates, the renewals are distributed over
+        # the course of the day to avoid rate limits.
+        numCerts = length (attrNames cfg.certs);
+        _24hSecs = 60 * 60 * 24;
+        AccuracySec = "${toString (_24hSecs / numCerts)}s";
+      in flip mapAttrs' cfg.certs (cert: data: nameValuePair
         ("acme-${cert}")
         ({
           description = "Renew ACME Certificate for ${cert}";
@@ -408,8 +418,9 @@ in
             OnCalendar = cfg.renewInterval;
             Unit = "acme-${cert}.service";
             Persistent = "yes";
-            AccuracySec = "5m";
-            RandomizedDelaySec = "1h";
+            inherit AccuracySec;
+            # Skew randomly within the day, per https://letsencrypt.org/docs/integration-guide/.
+            RandomizedDelaySec = "24h";
           };
         })
       );

From c1e77269cf7975386c52b5bd9f54808ffd318d4f Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 29 Feb 2020 15:26:17 +0100
Subject: [PATCH 1907/4636] neatvnc: Disable the CPU acceleration by default

For Nixpkgs it seems best to disable the usage of CPU extensions by
default as older CPUs don't support them which will result in a crash at
runtime (SIGILL: Illegal instruction) [0].
The performance on my old test system was more than enough anyway
(usually ~10% CPU usage due to wayvnc).

[0]: https://github.com/any1/neatvnc/issues/21
---
 pkgs/development/libraries/neatvnc/default.nix  |  3 +++
 .../neatvnc/disable-cpu-acceleration.patch      | 17 +++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/libraries/neatvnc/disable-cpu-acceleration.patch

diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix
index 8dbcf92feed8..127f25a50bea 100644
--- a/pkgs/development/libraries/neatvnc/default.nix
+++ b/pkgs/development/libraries/neatvnc/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchFromGitHub, meson, pkg-config, ninja
 , pixman, libuv, gnutls, libdrm
 # libjpeg_turbo: Optional, for tight encoding (disabled because experimental)
+, enableCpuAcceleration ? false # Whether to use CPU extensions (e.g. AVX)
 }:
 
 stdenv.mkDerivation rec {
@@ -17,6 +18,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ meson pkg-config ninja ];
   buildInputs = [ pixman libuv gnutls libdrm ];
 
+  patches = stdenv.lib.optional (!enableCpuAcceleration) ./disable-cpu-acceleration.patch;
+
   meta = with stdenv.lib; {
     description = "A VNC server library";
     longDescription = ''
diff --git a/pkgs/development/libraries/neatvnc/disable-cpu-acceleration.patch b/pkgs/development/libraries/neatvnc/disable-cpu-acceleration.patch
new file mode 100644
index 000000000000..97b77c02df48
--- /dev/null
+++ b/pkgs/development/libraries/neatvnc/disable-cpu-acceleration.patch
@@ -0,0 +1,17 @@
+diff --git a/meson.build b/meson.build
+index 31dd8b8..8761087 100644
+--- a/meson.build
++++ b/meson.build
+@@ -21,12 +21,6 @@ endif
+ 
+ cpu = host_machine.cpu_family()
+ 
+-if cpu == 'x86_64'
+-	c_args += '-mavx'
+-elif cpu == 'arm'
+-	c_args += '-mfpu=neon'
+-endif
+-
+ add_project_arguments(c_args, language: 'c')
+ 
+ cc = meson.get_compiler('c')

From 02115d3fa15d894b9f3cf0a26e589a8111927ed2 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 29 Feb 2020 10:38:32 -0500
Subject: [PATCH 1908/4636] pueue: upgrade cargo fetcher and cargoSha256

---
 pkgs/applications/misc/pueue/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix
index e283a5381e76..d2ee27ed1d1f 100644
--- a/pkgs/applications/misc/pueue/default.nix
+++ b/pkgs/applications/misc/pueue/default.nix
@@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1y33n0dmrssv35l0apfq1mchyh92cfbzjarh0m8zb2nxwhvk7paw";
+  cargoSha256 = "08zqhj3b0v4fxj8vi323zrxg4xvbp9gndm2khzs6daacglbwbvhk";
 
   postInstall = ''
     installShellCompletion utils/completions/pueue.{bash,fish} --zsh utils/completions/_pueue

From b3c3fbb2b39a473fb10dd77f9882aa3a3c8b7b3a Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 29 Feb 2020 10:44:54 -0500
Subject: [PATCH 1909/4636] webmetro: upgrade cargo fetcher and cargoSha256

---
 pkgs/servers/webmetro/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/servers/webmetro/default.nix
index 4bf329fa5db1..7d0079fca203 100644
--- a/pkgs/servers/webmetro/default.nix
+++ b/pkgs/servers/webmetro/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1n2c7ygs8qsd5zgii6fqqcwg427bsij082bg4ijnzkq5630dx651";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "03ncwj9bn21590phcnqyclclcird7rikbhxbwhg8i9i0nad81aaa";
+  cargoSha256 = "0xifc3jwj0c6ynx0gzm5zlnfcq023fjpjmdg9x0vs1fh3b42pdsy";
 
   meta = with stdenv.lib; {
     description = "Simple relay server for broadcasting a WebM stream";

From 741d7a76f3d141c6a3a2b88b2e8864a65c67824a Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 29 Feb 2020 10:51:30 -0500
Subject: [PATCH 1910/4636] routinator: upgrade cargo fetcher and cargoSha256

---
 pkgs/servers/routinator/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix
index 906ee07f3556..9c99faca4842 100644
--- a/pkgs/servers/routinator/default.nix
+++ b/pkgs/servers/routinator/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1hbqvjv9h1aghpyrl03w5f4j8gjy6n9lx83rmpsh5p7yd9ahwmf9";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "08lizhag7aqz3a59gaapsymn7sf9c6im1aw64n0r9a5advhwdh18";
+  cargoSha256 = "1chf1l9jlnhi9cyqpmcz8yfzwzmkn4lfxqhdhclvl8j4b2zvbcgc";
 
   meta = with stdenv.lib; {
     description = "An RPKI Validator written in Rust";

From fe7d112c92a9c890fac24699f1a97847907198cf Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 29 Feb 2020 10:53:48 -0500
Subject: [PATCH 1911/4636] system-syzygy: upgrade cargo fetcher and
 cargoSha256

---
 pkgs/games/system-syzygy/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/games/system-syzygy/default.nix b/pkgs/games/system-syzygy/default.nix
index 34eb5315e749..2e417e2a3cfc 100644
--- a/pkgs/games/system-syzygy/default.nix
+++ b/pkgs/games/system-syzygy/default.nix
@@ -23,10 +23,7 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ SDL2 ];
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "03724z33dqxbbrzpvz172qh45qrgnyb801algjdcm32v8xsx81qg";
+  cargoSha256 = "001cwdq8zxji56yahwfsydi7s0j7c5zsip60lxk3qmn078wcipdp";
 
   postInstall = ''
     mkdir -p $out/share/syzygy/

From 76366fba17d3eb119c130efbc907544b28b6637f Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 29 Feb 2020 10:58:17 -0500
Subject: [PATCH 1912/4636] cargo-web: upgrade cargo fetcher and cargoSha256

---
 pkgs/development/tools/cargo-web/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/cargo-web/default.nix
index 7e84baba0dda..5b1e91dda2a1 100644
--- a/pkgs/development/tools/cargo-web/default.nix
+++ b/pkgs/development/tools/cargo-web/default.nix
@@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1dl5brj5fnmxmwl130v36lvy4j64igdpdvjwmxw3jgg2c6r6b7cd";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1cbyy9rc33f69hbs0ff00v0v3p92f3lqq8ma5aqid5dm6d8l2dx5";
+  cargoSha256 = "0i9xp7vd1rp6xgkbbrspm3qq4hxwfwa00di3k73z1x64d3d8r5fm";
 
   nativeBuildInputs = [ openssl perl pkgconfig ];
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];

From c3794a2e556ccfe5f48599fa5f759e4a71fccecf Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 29 Feb 2020 11:02:45 -0500
Subject: [PATCH 1913/4636] wasm-pack: upgrade cargo fetcher and cargoSha256

---
 pkgs/development/tools/wasm-pack/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix
index e91a08303947..77920dfeeed9 100644
--- a/pkgs/development/tools/wasm-pack/default.nix
+++ b/pkgs/development/tools/wasm-pack/default.nix
@@ -18,10 +18,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1rqyfg6ajxxyfx87ar25nf5ck9hd0p12qgv98dicniqag8l4rvsr";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "095gk6lcck5864wjhrkhgnkxn9pzcg82xk5p94br7lmf15y9gc7j";
+  cargoSha256 = "0fw04hgxxqsbp1pylp32yd087r9bb8bpa05v90qdshkgp6znfl9s";
 
   nativeBuildInputs = [ pkgconfig ];
 

From 93fcac02cd7cb0ba269d6798eb0b3d7738f84337 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 29 Feb 2020 11:05:34 -0500
Subject: [PATCH 1914/4636] rx: upgrade cargo fetcher and cargoSha256

---
 pkgs/applications/graphics/rx/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/rx/default.nix b/pkgs/applications/graphics/rx/default.nix
index 51d03831e32b..b4338d8f3cda 100644
--- a/pkgs/applications/graphics/rx/default.nix
+++ b/pkgs/applications/graphics/rx/default.nix
@@ -16,10 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1n5s7v2z13550gkqz7w6dw62jdy60wdi8w1lfa23609b4yhg4w94";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "173jfjvdag97f6jvfg366hjk9v3cz301cbzpcahy51rbf1cip1w1";
+  cargoSha256 = "077cs9bf7f3h5aschcv7pbbnpaq1rg79j7f6pnyrzkmn7gxzicg3";
 
   nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
 

From e16b069ebd841cbe233e68b7775abe2d2a0e58d0 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 29 Feb 2020 11:11:26 -0500
Subject: [PATCH 1915/4636] gleam: upgrade cargo fetcher and cargoSha256

---
 pkgs/development/compilers/gleam/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix
index 0af8a6cd42dd..9d2f828dfa6c 100644
--- a/pkgs/development/compilers/gleam/default.nix
+++ b/pkgs/development/compilers/gleam/default.nix
@@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0zfdsnrnxplvi4f92l7sqdp5yk5p738ra64m41izlcilkwj1j3vp";
+  cargoSha256 = "1vhra9v4jsy9hyhjrmxjy6rnraxz13h1b7l51xvbai5wxsxm7z8m";
 
   meta = with stdenv.lib; {
     description = "A statically typed language for the Erlang VM";

From 7b8d1fb53bfc9eafbb841cc5a72560d8a0ef1d2f Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 29 Feb 2020 11:15:12 -0500
Subject: [PATCH 1916/4636] contrast: upgrade cargo fetcher and cargoSha256

---
 pkgs/applications/accessibility/contrast/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix
index ebd0a7a44a6c..f82462c39333 100644
--- a/pkgs/applications/accessibility/contrast/default.nix
+++ b/pkgs/applications/accessibility/contrast/default.nix
@@ -30,10 +30,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0rm705zrk9rfv31pwbqxrswi5v6vhnghxa8dgxjmcrh00l8dm6j9";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "06vgc89d93fhjcyy9d1v6lf8kr34pl5bbpwbv2jpfahpj9y84bgj";
+  cargoSha256 = "0qj0vmxa1d6war1vb3zgkf1drvk7awm970fw6692hd9msa9c1kkf";
 
   nativeBuildInputs = [
     desktop-file-utils

From 64b1993b812e7abacced6cabef32cab16f9cad01 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 29 Feb 2020 11:20:47 -0500
Subject: [PATCH 1917/4636] git-backup: upgrade cargo fetcher and cargoSha256

---
 pkgs/applications/version-management/git-backup/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/git-backup/default.nix b/pkgs/applications/version-management/git-backup/default.nix
index 51ae994b43bb..d65e2cf6ebff 100644
--- a/pkgs/applications/version-management/git-backup/default.nix
+++ b/pkgs/applications/version-management/git-backup/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0h31j8clvk4gkw4mgva9p0ypf26zhf7f0y564fdmzyw6rsz9wzcj";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1vfyhfdy5ks9zs9sy61ck9459w86hn9v6jqcar7rib82bclzr1mx";
+  cargoSha256 = "09nfvzvgpdl5glzjays4lm50iwvjzbz364y6agya1a94qqwkaj7f";
 
   nativeBuildInputs = [ pkg-config ];
 

From ac8cadac23d1e7d5b700d584e75fb9ac3200b543 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 29 Feb 2020 11:32:43 -0500
Subject: [PATCH 1918/4636] cargo-generate: upgrade cargo fetcher and
 cargoSha256

---
 pkgs/development/tools/rust/cargo-generate/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix
index 3fed52a2fafe..a5337e94087a 100644
--- a/pkgs/development/tools/rust/cargo-generate/default.nix
+++ b/pkgs/development/tools/rust/cargo-generate/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "07hklya22ixklb44f3qp6yyh5d03a7rjcn0g76icqr36hvcjyjjh";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1rsk9j1ij53dz4gakxwdppgmv12lmyj0ihh9qypdbgskvyq3a2j9";
+  cargoSha256 = "133n8j4d0j0rasns3a4kkflhrvmvkqfggcrfj4sp79am19pr146b";
 
   nativeBuildInputs = [ pkgconfig ];
 

From b522aeda5a133cbd9b2b861dced816ec9fb5fb4b Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 23 Feb 2020 01:51:19 +0000
Subject: [PATCH 1919/4636] nixos/acme: add ocspMustStaple option

---
 nixos/modules/security/acme.nix | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 7da6666f79c6..897c0aec6189 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -136,6 +136,19 @@ let
           challenge to ensure the DNS entries required are available.
         '';
       };
+
+      ocspMustStaple = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Turns on the OCSP Must-Staple TLS extension.
+          Make sure you know what you're doing! See:
+          <itemizedlist>
+            <listitem><para><link xlink:href="https://blog.apnic.net/2019/01/15/is-the-web-ready-for-ocsp-must-staple/" /></para></listitem>
+            <listitem><para><link xlink:href="https://blog.hboeck.de/archives/886-The-Problem-with-OCSP-Stapling-and-Must-Staple-and-why-Certificate-Revocation-is-still-broken.html" /></para></listitem>
+          </itemizedlist>
+        '';
+      };
     };
   };
 
@@ -288,8 +301,11 @@ in
                           ++ concatLists (mapAttrsToList (name: root: [ "-d" name ]) data.extraDomains)
                           ++ (if data.dnsProvider != null then [ "--dns" data.dnsProvider ] else [ "--http" "--http.webroot" data.webroot ])
                           ++ optionals (cfg.server != null || data.server != null) ["--server" (if data.server == null then cfg.server else data.server)];
-                runOpts = escapeShellArgs (globalOpts ++ [ "run" ]);
-                renewOpts = escapeShellArgs (globalOpts ++ [ "renew" "--days" (toString cfg.validMinDays) ]);
+                certOpts = optionals data.ocspMustStaple [ "--must-staple" ];
+                runOpts = escapeShellArgs (globalOpts ++ [ "run" ] ++ certOpts);
+                renewOpts = escapeShellArgs (globalOpts ++
+                  [ "renew" "--days" (toString cfg.validMinDays) ] ++
+                  certOpts);
                 acmeService = {
                   description = "Renew ACME Certificate for ${cert}";
                   after = [ "network.target" "network-online.target" ];

From ffb7b984b2c5e07384536f3f0e25db819ca84eef Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 23 Feb 2020 02:02:44 +0000
Subject: [PATCH 1920/4636] nixos/acme: add extraLegoRenewFlags option

---
 nixos/modules/security/acme.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 897c0aec6189..4e2805d6cac5 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -149,6 +149,14 @@ let
           </itemizedlist>
         '';
       };
+
+      extraLegoRenewFlags = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = ''
+          Additional flags to pass to lego renew.
+        '';
+      };
     };
   };
 
@@ -305,7 +313,7 @@ in
                 runOpts = escapeShellArgs (globalOpts ++ [ "run" ] ++ certOpts);
                 renewOpts = escapeShellArgs (globalOpts ++
                   [ "renew" "--days" (toString cfg.validMinDays) ] ++
-                  certOpts);
+                  certOpts ++ data.extraLegoRenewFlags);
                 acmeService = {
                   description = "Renew ACME Certificate for ${cert}";
                   after = [ "network.target" "network-online.target" ];

From e892cde4c7d523c2920736cdf198723113f57e49 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 28 Feb 2020 20:02:03 -0500
Subject: [PATCH 1921/4636] wakatime: 13.0.4 -> 13.0.7

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

diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix
index 68527ebebb47..4e0e9193fe7d 100644
--- a/pkgs/tools/misc/wakatime/default.nix
+++ b/pkgs/tools/misc/wakatime/default.nix
@@ -3,13 +3,13 @@
 with python3Packages;
 buildPythonApplication rec {
   pname = "wakatime";
-  version = "13.0.4";
+  version = "13.0.7";
 
   src = fetchFromGitHub {
     owner = "wakatime";
     repo = "wakatime";
     rev = version;
-    sha256 = "11np3cc5ha785vlmknk7vr7spgk2nw0wls0li60vfpvggbv0r4j6";
+    sha256 = "1rnapzaabg962wxrmfcq9lxz0yyqd3mxqbx3dq1ih4w33lf4fi8d";
   };
 
   # needs more dependencies from https://github.com/wakatime/wakatime/blob/191b302bfb5f272ae928c6d3867d06f3dfcba4a8/dev-requirements.txt

From ad1d08c7fce1e3d0048e136455bf66d12daf186f Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 29 Feb 2020 11:58:37 -0500
Subject: [PATCH 1922/4636] cargo-xbuild: upgrade cargo fetcher and cargoSha256

---
 pkgs/development/tools/rust/cargo-xbuild/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/development/tools/rust/cargo-xbuild/default.nix
index 1877ac6e1223..b92a65842cc3 100644
--- a/pkgs/development/tools/rust/cargo-xbuild/default.nix
+++ b/pkgs/development/tools/rust/cargo-xbuild/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1haq8gv4k6qgihyjplf76589d2hbb1720g6yvwk88aksjxmqj4jm";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "011r5n68ay94dvfm37xpd9s8x086l6qsll74iw98hcvw3inxp1ws";
+  cargoSha256 = "08y64yqvar1ph1pcbh6lhqf4kj85zw74dfg0ii9lycvzxvkwvhqp";
 
   meta = with stdenv.lib; {
     description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc";

From cfa3100d18bb19ff30e5fa59aba7f5b38c69208a Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 29 Feb 2020 12:06:27 -0500
Subject: [PATCH 1923/4636] cargo-inspect: upgrade cargo fetcher and
 cargoSha256

---
 pkgs/development/tools/rust/cargo-inspect/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-inspect/default.nix b/pkgs/development/tools/rust/cargo-inspect/default.nix
index ccd9fd3e4879..34d45ac83c72 100644
--- a/pkgs/development/tools/rust/cargo-inspect/default.nix
+++ b/pkgs/development/tools/rust/cargo-inspect/default.nix
@@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1pxvcf991w0jfxdissvwal5slrx7vpk3rqkzwk4hxfv0mjiqxsg5";
+  cargoSha256 = "0v7g9rkw7axy99vcfi7sy2pw7wnpq424jvd8xchcv8ghh8yw9lyc";
 
   meta = with lib; {
     description = "See what Rust is doing behind the curtains";

From 0f5520dc02af3400976fc9ef0a49e2640e9ce270 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 29 Feb 2020 12:10:09 -0500
Subject: [PATCH 1924/4636] cargo-watch: upgrade cargo fetcher and cargoSha256

---
 pkgs/development/tools/rust/cargo-watch/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix
index d0b20ffe3b25..d092274cf367 100644
--- a/pkgs/development/tools/rust/cargo-watch/default.nix
+++ b/pkgs/development/tools/rust/cargo-watch/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0l1aalb8ans7scljrza7akhi821jbpqgn6sa8kgd8sys83r93fkj";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0dlbln8nsvmrc9p99bl6yni57fravicias9gbv88fg7az904ilzz";
+  cargoSha256 = "07zkfpw0zyakpsm1mg525ibpsfs9swwmijb0xfsk3nbv66caqd04";
 
   buildInputs = lib.optional stdenv.isDarwin CoreServices;
 

From 18ff53d7656636aa440b2f73d2da788b785e6a9c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 29 Feb 2020 16:30:00 +0000
Subject: [PATCH 1925/4636] python27Packages.pymupdf: 1.16.10 -> 1.16.11

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

diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix
index 4ff50ad7b96c..7cd504dec810 100644
--- a/pkgs/development/python-modules/pymupdf/default.nix
+++ b/pkgs/development/python-modules/pymupdf/default.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPythonPackage, fetchPypi, mupdf, swig }:
 buildPythonPackage rec {
   pname = "PyMuPDF";
-  version = "1.16.10";
+  version = "1.16.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d7893954f97fa6087629f3875f3be066dab51302e7c73f4c98c0516a8e2893fb";
+    sha256 = "006m31qvvdwbpmxnhj1gs7rpd1jb214mf2hacqmisryx8dnb2jm7";
   };
 
   patchPhase = ''
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Python bindings for MuPDF's rendering library.";
-    homepage = https://github.com/pymupdf/PyMuPDF;
+    homepage = "https://github.com/pymupdf/PyMuPDF";
     maintainers = with maintainers; [ teto ];
     license =  licenses.agpl3;
     platforms = platforms.linux;

From a169f4d50049ea112426c804ec7d843fae85fe16 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 29 Feb 2020 12:15:02 -0500
Subject: [PATCH 1926/4636] cargo-fuzz: upgrade cargo fetcher and cargoSha256

---
 pkgs/development/tools/rust/cargo-fuzz/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix
index c61c7306b8c3..a31bcab82d4b 100644
--- a/pkgs/development/tools/rust/cargo-fuzz/default.nix
+++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0qy4xb7bxyw2x2ya7zmbkz48wxb69jcnvvj7021f1kyc6wdwcxs7";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1d42cmpg1yn1ql9isx26kxsxzf5rg6qw6j948skc5p054r0c9n3f";
+  cargoSha256 = "0d24crgx6wrb1p96w2yww7cs474x2pz4i6f26cry8pf5dwqfsqdm";
 
   meta = with stdenv.lib; {
     description = "Command line helpers for fuzzing";

From a666cda22a0951cba2e82621602839c09e23d226 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 29 Feb 2020 12:34:00 -0500
Subject: [PATCH 1927/4636] cargo-udeps: upgrade cargo fetcher and cargoSha256

---
 pkgs/development/tools/rust/cargo-udeps/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix
index 54008300c512..d37b578ced9c 100644
--- a/pkgs/development/tools/rust/cargo-udeps/default.nix
+++ b/pkgs/development/tools/rust/cargo-udeps/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1wh8w5p9rb9cqgpmclaywfsz3ckfi9mw38hhg31w7hkgjmqalyj9";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0vb2qr03qv66mmxgs1d5fvs63cdfxaldlg7pilhmdzha1kgy7ib0";
+  cargoSha256 = "0g56rvan0p57hkl00warx4ig7a54g0qw6p2gkwn9yxi6p3p2wddj";
 
   nativeBuildInputs = [ pkgconfig ];
 

From 321d788e2a1e122896627ffaed740dd31a44db31 Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Sat, 29 Feb 2020 18:31:57 +0100
Subject: [PATCH 1928/4636] rstudio: 1.2.1335 -> 1.2.5033

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

diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index cab7ac119b6a..f10578b11680 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -8,7 +8,7 @@ with lib;
 let
   verMajor = "1";
   verMinor = "2";
-  verPatch = "1335";
+  verPatch = "5033";
   version = "${verMajor}.${verMinor}.${verPatch}";
   ginVer = "2.1.2";
   gwtVer = "2.8.1";
@@ -26,7 +26,7 @@ mkDerivation rec {
     owner = "rstudio";
     repo = "rstudio";
     rev = "v${version}";
-    sha256 = "0jv1d4yznv2lzwp0fdf377vqpg0k2q4z9qvji4sj86fabj835lqd";
+    sha256 = "0f3p2anz9xay2859bxj3bvyj582igsp628qxsccpkgn0jifvi4np";
   };
 
   # Hack RStudio to only use the input R and provided libclang.

From c3ed8a0e4005db8be60faaec8b45193d24b25ef2 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 29 Feb 2020 12:47:03 -0500
Subject: [PATCH 1929/4636] rustup: upgrade cargo fetcher and cargoSha256

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

diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix
index b9a417e3b665..5d4e4fbeb8d9 100644
--- a/pkgs/development/tools/rust/rustup/default.nix
+++ b/pkgs/development/tools/rust/rustup/default.nix
@@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0d7l3j8js16zgdx37kykavr343v65vchldz88j38jjyc43pcm2pg";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0kn3sq99sgsh8msignyb4vjllv0wf1crqaw7sqp3ggmlkrdq35sd";
+  cargoSha256 = "1y13kfski36rfvqkp3mxxn12aidp339j7rigv49msyr004ac5y8s";
 
   nativeBuildInputs = [ pkgconfig ];
 

From 1f72964eef4b01f6293c566980a512f8d5994cb9 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 29 Feb 2020 12:56:15 -0500
Subject: [PATCH 1930/4636] newsboat: upgrade cargo fetcher and cargoSha256

---
 .../applications/networking/feedreaders/newsboat/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix
index f567dabf5a66..27bf8e81b117 100644
--- a/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix
@@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1bg2qjkzdawn4fnn0w7jhw1dk6191w8axnqra43z21pinfyim6da";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0q0iqd8y9rph8pwild5i2kv00h217a166c88hxpmbrigq9w960lp";
+  cargoSha256 = "0q7bira2adfmx0ghb1c5nqz200iajaxap9bq8j5wvvk9l2wywslp";
 
   postPatch = ''
     substituteInPlace Makefile --replace "|| true" ""

From 9fa218e3a0e6ed7ab01aebb401288bada5394c36 Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Tue, 18 Feb 2020 17:18:29 +0100
Subject: [PATCH 1931/4636] pythonPackages.ifconfig-parser: init at 0.0.5

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

diff --git a/pkgs/development/python-modules/ifconfig-parser/default.nix b/pkgs/development/python-modules/ifconfig-parser/default.nix
new file mode 100644
index 000000000000..cb3fb0fded5d
--- /dev/null
+++ b/pkgs/development/python-modules/ifconfig-parser/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub }:
+
+buildPythonPackage rec {
+  pname = "ifconfig-parser";
+  version = "0.0.5";
+
+  src = fetchFromGitHub {
+    owner = "KnightWhoSayNi";
+    repo = pname;
+    rev = "4921ac9d6be6244b062d082c164f5a5e69522478";
+    sha256 = "07hbkbr1qspr7qgzldkaslzc6ripj5zlif12d4fk5j801yhvnxjd";
+  };
+
+  checkPhase = ''
+    export PYTHONPATH=$PYTHONPATH:$(pwd)/ifconfigparser:$(pwd)/ifconfigparser/tests
+    python -m unittest -v test_ifconfig_parser.TestIfconfigParser
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Unsophisticated python package for parsing raw output of ifconfig.";
+    homepage = "https://github.com/KnightWhoSayNi/ifconfig-parser";
+    license = licenses.mit;
+    maintainers = with maintainers; [ atemu ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 53b7eba5f30c..92dff2435d72 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3926,6 +3926,8 @@ in {
 
   ifaddr = callPackage ../development/python-modules/ifaddr { };
 
+  ifconfig-parser = callPackage ../development/python-modules/ifconfig-parser { };
+
   imagecorruptions = callPackage ../development/python-modules/imagecorruptions { };
 
   imageio = callPackage ../development/python-modules/imageio { };

From c6a5cc3fdfd6a08b9538015101cb11a04514a3f6 Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Fri, 7 Feb 2020 13:03:39 +0100
Subject: [PATCH 1932/4636] pythonPackages.jc: init at 1.7.5

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

diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix
new file mode 100644
index 000000000000..1773a077fdd5
--- /dev/null
+++ b/pkgs/development/python-modules/jc/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi,
+  ruamel_yaml
+, ifconfig-parser
+, xmltodict
+, isPy27
+}:
+
+buildPythonPackage rec {
+  pname = "jc";
+  version = "1.7.5";
+  disabled = isPy27;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "16ndzvyvx4s3b6cnhxbd5fs3fkc3fwygz7qzaw7ws76sag1zpx67";
+  };
+
+  propagatedBuildInputs = [ ruamel_yaml ifconfig-parser xmltodict ];
+
+  meta = with stdenv.lib; {
+    description = "This tool serializes the output of popular command line tools and filetypes to structured JSON output.";
+    homepage = "https://github.com/kellyjonbrazil/jc";
+    license = licenses.mit;
+    maintainers = with maintainers; [ atemu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39eb6dfdd005..04eacccf2c11 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4309,6 +4309,8 @@ in
 
   jazzy = callPackage ../development/tools/jazzy { };
 
+  jc = with python3Packages; toPythonApplication jc;
+
   jd = callPackage ../development/tools/jd { };
 
   jd-gui = callPackage ../tools/security/jd-gui { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 92dff2435d72..e10a814cfd41 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -803,6 +803,8 @@ in {
 
   janus = callPackage ../development/python-modules/janus { };
 
+  jc = callPackage ../development/python-modules/jc { };
+
   jira = callPackage ../development/python-modules/jira { };
 
   junit-xml = callPackage ../development/python-modules/junit-xml { };

From 4313049ed0a0c52ae147144e6b31b18003ea48e3 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 29 Feb 2020 13:00:17 -0500
Subject: [PATCH 1933/4636] tiny: upgrade cargo fetcher and cargoSha256

---
 pkgs/applications/networking/irc/tiny/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix
index 4fbbbfd140fb..abb296d64744 100644
--- a/pkgs/applications/networking/irc/tiny/default.nix
+++ b/pkgs/applications/networking/irc/tiny/default.nix
@@ -19,10 +19,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1m57xsrc7lzkrm8k1wh3yx3in5bhd0qjzygxdwr8lvigpsiy5caa";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1vj6whnx8gd5r66zric9163ddlqc4al4azj0dvhv5sq0r33871kv";
+  cargoSha256 = "1s93zxk85wa7zw8745ba1sgipal75w1y18nc9vca6sig4pzvvj41";
 
   RUSTC_BOOTSTRAP = 1;
 

From 630598c215afb54f63111d0837db3e1f190d219f Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 29 Feb 2020 13:05:01 -0500
Subject: [PATCH 1934/4636] click: upgrade cargo fetcher and cargoSha256

---
 pkgs/applications/networking/cluster/click/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix
index dd5deff294a0..ef90c0cde321 100644
--- a/pkgs/applications/networking/cluster/click/default.nix
+++ b/pkgs/applications/networking/cluster/click/default.nix
@@ -13,10 +13,7 @@ buildRustPackage rec {
     sha256 = "18mpzvvww2g6y2d3m8wcfajzdshagihn59k03xvcknd5d8zxagl3";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0298x7wkr4j1l5flmv5vhl1ay8icvh4dlhsh4xi8fd3p8jl9jpqv";
+  cargoSha256 = "1f9yn4pvp58laylngdrfdkwygisnzkhkm7pndf6l33k3aqxhz5mm";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 

From 96e36bf1ba7f7f90898950b1c3f3befbbd06f879 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Sat, 29 Feb 2020 18:55:53 +0100
Subject: [PATCH 1935/4636] nixos/firejail: add example for wrappedBinaries

---
 nixos/modules/programs/firejail.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/firejail.nix b/nixos/modules/programs/firejail.nix
index 74c3e4425a7c..0abdde5ddebd 100644
--- a/nixos/modules/programs/firejail.nix
+++ b/nixos/modules/programs/firejail.nix
@@ -25,8 +25,14 @@ in {
     enable = mkEnableOption "firejail";
 
     wrappedBinaries = mkOption {
-      type = types.attrs;
+      type = types.attrsOf types.path;
       default = {};
+      example = literalExample ''
+        {
+          firefox = "''${lib.getBin pkgs.firefox}/bin/firefox";
+          mpv = "''${lib.getBin pkgs.mpv}/bin/mpv";
+        }
+      '';
       description = ''
         Wrap the binaries in firejail and place them in the global path.
         </para>

From 71113dbc692332eeb85ef03cbc7cdce911b7d3da Mon Sep 17 00:00:00 2001
From: Renato Alves <alves.rjc@gmail.com>
Date: Thu, 27 Feb 2020 01:02:28 +0100
Subject: [PATCH 1936/4636] pythonPackages.gtts: init at 2.1.1

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

diff --git a/pkgs/development/python-modules/gtts/default.nix b/pkgs/development/python-modules/gtts/default.nix
new file mode 100644
index 000000000000..934f3bd58202
--- /dev/null
+++ b/pkgs/development/python-modules/gtts/default.nix
@@ -0,0 +1,53 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, beautifulsoup4
+, click
+, gtts-token
+, mock
+, pytest
+, requests
+, six
+, testfixtures
+, twine
+, urllib3
+}:
+
+buildPythonPackage rec {
+  pname = "gtts";
+  version = "2.1.1";
+
+  src = fetchFromGitHub {
+    owner = "pndurette";
+    repo = "gTTS";
+    rev = "v${version}";
+    sha256 = "1d0r6dnb8xvgyvxz7nfj4q4xqmpmvcwcsjghxrh76m6p364lh1hj";
+  };
+
+  propagatedBuildInputs = [
+    beautifulsoup4
+    click
+    gtts-token
+    requests
+    six
+    urllib3
+    twine
+  ];
+
+  checkInputs = [ pytest mock testfixtures ];
+
+  # majority of tests just try to call out to Google's Translate API endpoint
+  doCheck = false;
+  checkPhase = ''
+    pytest
+  '';
+
+  pythonImportsCheck = [ "gtts" ];
+
+  meta = with lib; {
+    description = "A Python library and CLI tool to interface with Google Translate text-to-speech API";
+    homepage = "https://gtts.readthedocs.io";
+    license = licenses.mit;
+    maintainers = with maintainers; [ unode ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e10a814cfd41..db4864aed48d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2777,6 +2777,8 @@ in {
 
   gtimelog = callPackage ../development/python-modules/gtimelog { };
 
+  gtts = callPackage ../development/python-modules/gtts { };
+
   gurobipy = if stdenv.hostPlatform.system == "x86_64-darwin"
   then callPackage ../development/python-modules/gurobipy/darwin.nix {
     inherit (pkgs.darwin) cctools insert_dylib;

From 1d3eaff5e6b41190975d36f2e5ee08facad1001a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 29 Feb 2020 18:14:43 +0000
Subject: [PATCH 1937/4636] python27Packages.rasterio: 1.1.2 -> 1.1.3

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

diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix
index 4fe5fd9e63b4..0916695ed43a 100644
--- a/pkgs/development/python-modules/rasterio/default.nix
+++ b/pkgs/development/python-modules/rasterio/default.nix
@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "rasterio";
-  version = "1.1.2";
+  version = "1.1.3";
 
   # Pypi doesn't ship the tests, so we fetch directly from GitHub
   src = fetchFromGitHub {
     owner = "mapbox";
     repo = "rasterio";
     rev = version;
-    sha256 = "12szhfify7wn02cbiz9xapwfyp7bg0zm2ja9wq4jyaz5ijy6rm45";
+    sha256 = "0i081bkmv7qw24ivmdh92ma6x0hnjlf8jgj6rp2c3rb8hjzmi452";
   };
 
   checkInputs = [ boto3 pytest pytestcov packaging hypothesis ] ++ lib.optional (!isPy3k) mock;
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python package to read and write geospatial raster data";
     license = licenses.bsd3;
-    homepage = https://rasterio.readthedocs.io/en/latest/;
+    homepage = "https://rasterio.readthedocs.io/en/latest/";
     maintainers = with maintainers; [ mredaelli ];
   };
 }

From a5e82af9d811847750ffef19cfe9cf46b13180f5 Mon Sep 17 00:00:00 2001
From: xbreak <xbreak@alphaware.se>
Date: Tue, 25 Feb 2020 12:13:10 +0000
Subject: [PATCH 1938/4636] pythonPackages.astroquery 0.3.10 -> 0.4

Tests are disabled until pytest-astropy is updated with
pytest-astropy-header.
---
 pkgs/development/python-modules/astroquery/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix
index 461d8801e608..c6620de3d0c3 100644
--- a/pkgs/development/python-modules/astroquery/default.nix
+++ b/pkgs/development/python-modules/astroquery/default.nix
@@ -9,21 +9,26 @@
 , pytest
 , pytest-astropy
 , astropy-helpers
+, isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "astroquery";
-  version = "0.3.10";
+  version = "0.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ce57a8792c7d5d74206d797d379de6da35d56be433ea5840c41a49f202e2fab";
+    sha256 = "1ddwnj9vpvxkrfb45c4pwv5f5za9kn2q0040dpw2ymj2bwlpl61h";
   };
 
+  disabled = !isPy3k;
+
   propagatedBuildInputs = [ astropy requests keyring beautifulsoup4 html5lib ];
 
   nativeBuildInputs = [ astropy-helpers ];
 
+  # Tests disabled until pytest-astropy has been updated to include pytest-astropy-header
+  doCheck = false;
   checkInputs = [ pytest pytest-astropy ];
 
   # Disable automatic update of the astropy-helper module

From 45e199985203af9ec97306973297e8303440f267 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 29 Feb 2020 18:32:40 +0000
Subject: [PATCH 1939/4636] python27Packages.orderedset: 2.0.1 -> 2.0.3

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

diff --git a/pkgs/development/python-modules/orderedset/default.nix b/pkgs/development/python-modules/orderedset/default.nix
index f1e6f1bf918e..ac7b21361c97 100644
--- a/pkgs/development/python-modules/orderedset/default.nix
+++ b/pkgs/development/python-modules/orderedset/default.nix
@@ -2,16 +2,16 @@
 
 buildPythonPackage rec {
   pname = "orderedset";
-  version = "2.0.1";
+  version = "2.0.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "11643qr12ypxfffcminlsgl9xz751b2d0pnjl6zn8vfhxddjr57f";
+    sha256 = "0abf19w37kxypsj6v7dz79jj92y1kivjk2zivnrv7rw6bbxwrxdj";
   };
 
   meta = with stdenv.lib; {
     description = "An Ordered Set implementation in Cython";
-    homepage = https://pypi.python.org/pypi/orderedset;
+    homepage = "https://pypi.python.org/pypi/orderedset";
     license = licenses.bsd3;
     maintainers = [ maintainers.jtojnar ];
   };

From 3575555fa8a15049bada8bf8e8ba68a3aba71419 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 29 Feb 2020 14:17:25 +0100
Subject: [PATCH 1940/4636] nixos/acme: apply chmod and ownership
 unconditionally

Also separate directory and file permissions so the certificate files
don't end up with the executable bit.

Fixes #81335
---
 nixos/modules/security/acme.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 238c18242c19..1cf167ba7a25 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -281,7 +281,7 @@ in
                 lpath = "acme/${cert}";
                 apath = "/var/lib/${lpath}";
                 spath = "/var/lib/acme/.lego";
-                rights = if data.allowKeysForGroup then "750" else "700";
+                fileMode = if data.allowKeysForGroup then "640" else "600";
                 globalOpts = [ "-d" data.domain "--email" data.email "--path" "." "--key-type" data.keyType ]
                           ++ optionals (cfg.acceptTerms) [ "--accept-tos" ]
                           ++ optionals (data.dnsProvider != null && !data.dnsPropagationCheck) [ "--dns.disable-cp" ]
@@ -306,7 +306,7 @@ in
                     Group = data.group;
                     PrivateTmp = true;
                     StateDirectory = "acme/.lego ${lpath}";
-                    StateDirectoryMode = rights;
+                    StateDirectoryMode = if data.allowKeysForGroup then "750" else "700";
                     WorkingDirectory = spath;
                     # Only try loading the credentialsFile if the dns challenge is enabled
                     EnvironmentFile = if data.dnsProvider != null then data.credentialsFile else null;
@@ -329,10 +329,11 @@ in
                             cp -p ${spath}/certificates/${keyName}.issuer.crt chain.pem
                             ln -s fullchain.pem cert.pem
                             cat key.pem fullchain.pem > full.pem
-                            chmod ${rights} *.pem
-                            chown '${data.user}:${data.group}' *.pem
                           fi
 
+                          chmod ${fileMode} *.pem
+                          chown '${data.user}:${data.group}' *.pem
+
                           ${data.postRun}
                         '';
                       in
@@ -374,7 +375,7 @@ in
 
                       # Give key acme permissions
                       chown '${data.user}:${data.group}' "${apath}/"{key,fullchain,full}.pem
-                      chmod ${rights} "${apath}/"{key,fullchain,full}.pem
+                      chmod ${fileMode} "${apath}/"{key,fullchain,full}.pem
                     '';
                   serviceConfig = {
                     Type = "oneshot";

From 27578856bfa817ad92c4fd0dcd87a67749ea3a5d Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 28 Feb 2020 13:55:13 -0500
Subject: [PATCH 1941/4636] blender: fix enableNumpy option, enable it
 unconditionally

Workarounds https://developer.blender.org/T74304

Audaspace requires numpy, we already have to provide numpy
unconditionally via PYTHON_NUMPY_PATH.
---
 pkgs/applications/misc/blender/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 277bb5fe1f25..75f5b8302e6f 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -7,7 +7,7 @@
 , jackaudioSupport ? false, libjack2
 , cudaSupport ? config.cudaSupport or false, cudatoolkit
 , colladaSupport ? true, opencollada
-, enableNumpy ? false, makeWrapper
+, makeWrapper
 , pugixml, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL
 }:
 
@@ -117,11 +117,13 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  postInstall = optionalString enableNumpy
-    ''
-      wrapProgram $out/bin/blender \
-        --prefix PYTHONPATH : ${python3Packages.numpy}/${python.sitePackages}
-    '';
+  blenderExecutable =
+    placeholder "out" + (if stdenv.isDarwin then "/Blender.app/Contents/MacOS/Blender" else "/bin/blender");
+  # --python-expr is used to workaround https://developer.blender.org/T74304
+  postInstall = ''
+    wrapProgram $blenderExecutable \
+      --add-flags '--python-expr "import sys; sys.path.append(\"${python3Packages.numpy}/${python.sitePackages}\")"'
+  '';
 
   # Set RUNPATH so that libcuda and libnvrtc in /run/opengl-driver(-32)/lib can be
   # found. See the explanation in libglvnd.

From be41f703ad192f71ef9cb200a5b41c7c9db89971 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 29 Feb 2020 15:26:43 -0500
Subject: [PATCH 1942/4636] libyamlcpp: actually build shared libraries
 (#81051)

---
 pkgs/development/libraries/libyaml-cpp/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix
index 3d0a94a35d0b..cf880ef1e16c 100644
--- a/pkgs/development/libraries/libyaml-cpp/default.nix
+++ b/pkgs/development/libraries/libyaml-cpp/default.nix
@@ -11,6 +11,13 @@ stdenv.mkDerivation rec {
     sha256 = "0ykkxzxcwwiv8l8r697gyqh1nl582krpvi7m7l6b40ijnk4pw30s";
   };
 
+  # implement https://github.com/jbeder/yaml-cpp/commit/52a1378e48e15d42a0b755af7146394c6eff998c
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace 'option(YAML_BUILD_SHARED_LIBS "Build Shared Libraries" OFF)' \
+                'option(YAML_BUILD_SHARED_LIBS "Build yaml-cpp shared library" ''${BUILD_SHARED_LIBS})'
+  '';
+
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DYAML_CPP_BUILD_TESTS=OFF" ];

From 95e3292eed02942bbb1196dd43f5b191b8a13481 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 29 Feb 2020 20:09:29 +0100
Subject: [PATCH 1943/4636] wayland-protocols: 1.18 -> 1.20

Release announcements and changelogs:
- 1.19: https://lists.freedesktop.org/archives/wayland-devel/2020-February/041267.html
- 1.20: https://lists.freedesktop.org/archives/wayland-devel/2020-February/041269.html
---
 pkgs/development/libraries/wayland/protocols.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix
index 8c2823d74b0a..41495b1c2e50 100644
--- a/pkgs/development/libraries/wayland/protocols.nix
+++ b/pkgs/development/libraries/wayland/protocols.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "wayland-protocols";
-  version = "1.18";
+  version = "1.20";
 
   src = fetchurl {
     url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz";
-    sha256 = "1cvl93h83ymbfhb567jv5gzyq08181w7c46rsw4xqqqpcvkvfwrx";
+    sha256 = "1rsdgvkkvxs3cjhpl6agvbkm53vm7k8rg127j9y2vn33m2hvg0lp";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 85c90b91b67f19b32d89d3741e18c35017f64b6b Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 29 Feb 2020 21:43:15 +0100
Subject: [PATCH 1944/4636] python3Packages.ics: 0.6 -> 0.7

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

diff --git a/pkgs/development/python-modules/ics/default.nix b/pkgs/development/python-modules/ics/default.nix
index b642bdf311e1..d304dddd79db 100644
--- a/pkgs/development/python-modules/ics/default.nix
+++ b/pkgs/development/python-modules/ics/default.nix
@@ -5,14 +5,14 @@
 
 buildPythonPackage rec {
   pname = "ics";
-  version = "0.6";
+  version = "0.7";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "C4ptainCrunch";
     repo = "ics.py";
     rev = "v${version}";
-    sha256 = "02bs9wlh40p1n33jchrl2cdpsnm5hq84070by3b6gm0vmgz6gn5v";
+    sha256 = "0rrdc9rcxc3ys6rml81b8m8qdlisk78a34bdib0wy65hlkmyyykn";
   };
 
   propagatedBuildInputs = [ tatsu arrow ];
@@ -34,6 +34,7 @@ buildPythonPackage rec {
       write ics data in a developer friendly way.
     '';
     homepage = "http://icspy.readthedocs.org/en/stable/";
+    changelog = "https://github.com/C4ptainCrunch/ics.py/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ primeos ];
   };

From 609a140993593462e05ce0bb5a971361b5bb72bb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 29 Feb 2020 17:30:00 -0500
Subject: [PATCH 1945/4636] recursive: 1.030 -> 1.042

Changelog: https://github.com/arrowtype/recursive/releases/tag/1.042
---
 pkgs/data/fonts/recursive/default.nix | 31 +++++++++++++--------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix
index 3b1e8931b897..9636d50a54f9 100644
--- a/pkgs/data/fonts/recursive/default.nix
+++ b/pkgs/data/fonts/recursive/default.nix
@@ -1,24 +1,23 @@
-{ stdenv, fetchzip }:
+{ lib, fetchzip }:
 
-stdenv.mkDerivation rec {
-  pname = "recursive";
-  version = "1.030";
+let
+  version = "1.042";
+in
+fetchzip {
+  name = "recursive-${version}";
 
-  src = fetchzip {
-    url = "https://github.com/arrowtype/recursive/releases/download/${version}/recursive-beta_1_030--statics.zip";
-    sha256 = "1clds4ljiqdf0zc3b7nlna1w7kc23pc9gxdd5vwbgmz9xfvkam0f";
-    stripRoot = false;
-  };
+  url = "https://github.com/arrowtype/recursive/releases/download/${version}/Recursive-Beta_${version}.zip";
 
-  installPhase = ''
-    mkdir -p $out/share/fonts/{opentype,truetype,woff2}
-    find -name "*.otf" -exec cp "{}" $out/share/fonts/opentype \;
-    find -name "*.ttf" -exec cp "{}" $out/share/fonts/truetype \;
-    find -name "*.woff2" -exec cp "{}" $out/share/fonts/woff2 \;
+  postFetch = ''
+    mkdir -p $out/share/fonts/
+    unzip -j $downloadedFile \*.ttf   -d $out/share/fonts/truetype
+    unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2
   '';
 
-  meta = with stdenv.lib; {
-    homepage = https://github.com/arrowtype/recursive;
+  sha256 = "1zcrvnzwd39fim2jxa3by6jgdrx7fdp64iw2bd181iwzinv1yqsa";
+
+  meta = with lib; {
+    homepage = "https://recursive.design/";
     description = "A variable font family for code & UI";
     license = licenses.ofl;
     maintainers = [ maintainers.eadwu ];

From 0fa9ef1ee2cd0bd2185bce446c731f7cd78a89b8 Mon Sep 17 00:00:00 2001
From: Aaron VonderHaar <gruen0aermel@gmail.com>
Date: Sat, 29 Feb 2020 14:34:11 -0800
Subject: [PATCH 1946/4636] elm-format: 0.8.2 -> 0.8.3

---
 pkgs/development/compilers/elm/packages/elm-format.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix
index 3660e42e363b..e498b4b1494f 100644
--- a/pkgs/development/compilers/elm/packages/elm-format.nix
+++ b/pkgs/development/compilers/elm/packages/elm-format.nix
@@ -6,11 +6,11 @@
 }:
 mkDerivation {
   pname = "elm-format";
-  version = "0.8.2";
+  version = "0.8.3";
   src = fetchgit {
     url = "https://github.com/avh4/elm-format";
-    sha256 = "0ly37fszrfviwqgrww57ikdcr7i8lcpczhqm8xqp5s7mrlpdxv7z";
-    rev = "ab3627cce01e5556b3fe8c2b5e3d92b80bfc74af";
+    sha256 = "0n6lrqj6mq044hdyraj3ss5cg74dn8k4z05xmwn2apjpm146iaw8";
+    rev = "b97e3593d564a1e069c0a022da8cbd98ca2c5a4b";
   };
   postPatch = ''
     mkdir -p ./generated
@@ -18,7 +18,7 @@ mkDerivation {
     module Build_elm_format where
 
     gitDescribe :: String
-    gitDescribe = "0.8.2"
+    gitDescribe = "0.8.3"
     EOHS
   '';
   isLibrary = false;

From a0a724938ed477af0b25f87d6c69baf038b66b27 Mon Sep 17 00:00:00 2001
From: Raphael Das Gupta <raphael.das.gupta@hsr.ch>
Date: Tue, 18 Feb 2020 15:28:41 +0100
Subject: [PATCH 1947/4636] osmpythontools: init at 0.2.6

---
 .../python-modules/osmpythontools/default.nix | 60 +++++++++++++++++++
 .../remove-unused-dependency.patch            | 22 +++++++
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 84 insertions(+)
 create mode 100644 pkgs/development/python-modules/osmpythontools/default.nix
 create mode 100644 pkgs/development/python-modules/osmpythontools/remove-unused-dependency.patch

diff --git a/pkgs/development/python-modules/osmpythontools/default.nix b/pkgs/development/python-modules/osmpythontools/default.nix
new file mode 100644
index 000000000000..1c80dd6fe552
--- /dev/null
+++ b/pkgs/development/python-modules/osmpythontools/default.nix
@@ -0,0 +1,60 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, beautifulsoup4
+, geojson
+, lxml
+, matplotlib
+, numpy
+, pandas
+, ujson
+, xarray
+}:
+
+buildPythonPackage rec {
+  pname = "osmpythontools";
+  version = "0.2.6";
+
+  src = fetchPypi {
+    pname = "OSMPythonTools";
+    inherit version;
+    sha256 = "efc72e3963971c6c7fd94bd374704a5b78eb6c07397a4ffb5f9176c1e4aee096";
+  };
+
+  propagatedBuildInputs = [
+    beautifulsoup4
+    geojson
+    lxml
+    matplotlib
+    numpy
+    pandas
+    ujson
+    xarray
+  ];
+
+  patches = [ ./remove-unused-dependency.patch ];
+
+  # no tests included
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "OSMPythonTools"
+    "OSMPythonTools.api"
+    "OSMPythonTools.data"
+    "OSMPythonTools.element"
+    "OSMPythonTools.nominatim"
+    "OSMPythonTools.overpass"
+  ];
+
+  meta = with lib; {
+    description = "A library to access OpenStreetMap-related services";
+    longDescription = ''
+      The python package OSMPythonTools provides easy access to
+      OpenStreetMap-related services, among them an Overpass endpoint,
+      Nominatim, and the OpenStreetMap editing API.
+    '';
+    homepage = "https://github.com/mocnik-science/osm-python-tools";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ das-g ];
+  };
+}
diff --git a/pkgs/development/python-modules/osmpythontools/remove-unused-dependency.patch b/pkgs/development/python-modules/osmpythontools/remove-unused-dependency.patch
new file mode 100644
index 000000000000..bac80e9bd8cc
--- /dev/null
+++ b/pkgs/development/python-modules/osmpythontools/remove-unused-dependency.patch
@@ -0,0 +1,22 @@
+diff --git a/OSMPythonTools.egg-info/requires.txt b/OSMPythonTools.egg-info/requires.txt
+index 16a5019..e58155c 100644
+--- a/OSMPythonTools.egg-info/requires.txt
++++ b/OSMPythonTools.egg-info/requires.txt
+@@ -1,5 +1,4 @@
+ beautifulsoup4
+-datetime
+ geojson
+ lxml
+ matplotlib
+diff --git a/setup.py b/setup.py
+index 08e9455..1a6435e 100644
+--- a/setup.py
++++ b/setup.py
+@@ -14,7 +14,6 @@ setup(
+     packages = ['OSMPythonTools', 'OSMPythonTools.internal'],
+     install_requires = [
+         'beautifulsoup4',
+-        'datetime',
+         'geojson',
+         'lxml',
+         'matplotlib',
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index db4864aed48d..c182c586f211 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -949,6 +949,8 @@ in {
 
   osmnx = callPackage ../development/python-modules/osmnx { };
 
+  osmpythontools = callPackage ../development/python-modules/osmpythontools { };
+
   outcome = callPackage ../development/python-modules/outcome {};
 
   ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito {

From cad99590a2f132be578a234490c5fa416aa6109a Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 27 Feb 2020 08:23:32 -0800
Subject: [PATCH 1948/4636] glances: move from python-module to application

---
 .../system}/glances/default.nix               | 25 +++++++++++--------
 .../system}/glances/skip-failing-tests.patch  |  0
 pkgs/top-level/all-packages.nix               |  2 ++
 pkgs/top-level/python-packages.nix            |  2 +-
 4 files changed, 17 insertions(+), 12 deletions(-)
 rename pkgs/{development/python-modules => applications/system}/glances/default.nix (79%)
 rename pkgs/{development/python-modules => applications/system}/glances/skip-failing-tests.patch (100%)

diff --git a/pkgs/development/python-modules/glances/default.nix b/pkgs/applications/system/glances/default.nix
similarity index 79%
rename from pkgs/development/python-modules/glances/default.nix
rename to pkgs/applications/system/glances/default.nix
index 0a0864e52b6c..946cc1125863 100644
--- a/pkgs/development/python-modules/glances/default.nix
+++ b/pkgs/applications/system/glances/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, isPyPy, lib
-, psutil, setuptools, bottle, batinfo, pysnmp
-, hddtemp, future
+{ stdenv, buildPythonApplication, fetchFromGitHub, fetchpatch, isPyPy, lib
+, future, psutil, setuptools
 # Optional dependencies:
+, bottle, batinfo, pysnmp
+, hddtemp
 , netifaces # IP module
-# Tests:
-, unittest2
 }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   pname = "glances";
   version = "3.1.3";
   disabled = isPyPy;
@@ -44,13 +43,18 @@ buildPythonPackage rec {
   ];
 
   doCheck = true;
-  checkInputs = [ unittest2 ];
   preCheck = lib.optional stdenv.isDarwin ''
     export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks
   '';
 
-  propagatedBuildInputs = [ psutil setuptools bottle batinfo pysnmp future
+  propagatedBuildInputs = [
+    batinfo
+    bottle
+    future
     netifaces
+    psutil
+    pysnmp
+    setuptools
   ] ++ lib.optional stdenv.isLinux hddtemp;
 
   preConfigure = ''
@@ -58,10 +62,9 @@ buildPythonPackage rec {
   '';
 
   meta = with lib; {
-    homepage = https://nicolargo.github.io/glances/;
+    homepage = "https://nicolargo.github.io/glances/";
     description = "Cross-platform curses-based monitoring tool";
     license = licenses.lgpl3;
-    maintainers = with maintainers; [ primeos koral ];
-    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ jonringer primeos koral ];
   };
 }
diff --git a/pkgs/development/python-modules/glances/skip-failing-tests.patch b/pkgs/applications/system/glances/skip-failing-tests.patch
similarity index 100%
rename from pkgs/development/python-modules/glances/skip-failing-tests.patch
rename to pkgs/applications/system/glances/skip-failing-tests.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d10df86f7c1..c7bfb8a7acfa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -929,6 +929,8 @@ in
 
   gjs = callPackage ../development/libraries/gjs { };
 
+  glances = python3Packages.callPackage ../applications/system/glances { };
+
   glasgow = with python3Packages; toPythonApplication glasgow;
 
   gucci = callPackage ../tools/text/gucci { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c182c586f211..d7ef1072ec5a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3724,7 +3724,7 @@ in {
 
   git-sweep = callPackage ../development/python-modules/git-sweep { };
 
-  glances = callPackage ../development/python-modules/glances { };
+  glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28
 
   github3_py = callPackage ../development/python-modules/github3_py { };
 

From c397b5e3d2c81acd11531a169797960a30e97139 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 29 Feb 2020 22:13:16 +0000
Subject: [PATCH 1949/4636] python27Packages.smmap: 0.9.0 -> 3.0.1

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

diff --git a/pkgs/development/python-modules/smmap/default.nix b/pkgs/development/python-modules/smmap/default.nix
index 366897d3e198..469c892a9034 100644
--- a/pkgs/development/python-modules/smmap/default.nix
+++ b/pkgs/development/python-modules/smmap/default.nix
@@ -2,17 +2,17 @@
 
 buildPythonPackage rec {
   pname = "smmap";
-  version = "0.9.0";
+  version = "3.0.1";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0qlx25f6n2n9ff37w9gg62f217fzj16xlbh0pkz0lpxxjys64aqf";
+    sha256 = "0ijlnv60y8f41py1wnn5n1a1i81cxd9dfpdhr0k3cgkrcbz8850p";
   };
 
   checkInputs = [ nosexcover ];
 
   meta = {
     description = "A pure python implementation of a sliding window memory map manager";
-    homepage = https://github.com/gitpython-developers/smmap;
+    homepage = "https://github.com/gitpython-developers/smmap";
     maintainers = [ ];
     license = lib.licenses.bsd3;
   };

From 07727dbd1673c651ecb4449a38f2207134fc6097 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 29 Feb 2020 18:24:02 -0500
Subject: [PATCH 1950/4636] buildbot: 2.6.0 -> 2.7.0 (#81406)

---
 nixos/tests/buildbot.nix                           |  2 +-
 .../python-modules/buildbot/default.nix            |  3 ++-
 pkgs/development/python-modules/buildbot/pkg.nix   |  4 ++--
 .../python-modules/buildbot/plugins.nix            | 14 ++++++--------
 .../development/python-modules/buildbot/worker.nix |  4 ++--
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/nixos/tests/buildbot.nix b/nixos/tests/buildbot.nix
index 5655a34a8b51..0d979dc2d054 100644
--- a/nixos/tests/buildbot.nix
+++ b/nixos/tests/buildbot.nix
@@ -41,7 +41,7 @@ import ./make-test-python.nix {
       systemd.services.git-daemon = {
         description   = "Git daemon for the test";
         wantedBy      = [ "multi-user.target" ];
-        after         = [ "network.target" ];
+        after         = [ "network.target" "sshd.service" ];
 
         serviceConfig.Restart = "always";
         path = with pkgs; [ coreutils git openssh ];
diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix
index 528acf572f2a..b088480f5de4 100644
--- a/pkgs/development/python-modules/buildbot/default.nix
+++ b/pkgs/development/python-modules/buildbot/default.nix
@@ -3,7 +3,7 @@
   sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq,
   txrequests, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial,
   isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins,
-  parameterized, git, openssh, glibcLocales }:
+  parameterized, git, openssh, glibcLocales, nixosTests }:
 
 let
   withPlugins = plugins: buildPythonPackage {
@@ -91,6 +91,7 @@ let
 
     passthru = {
       inherit withPlugins;
+      tests.buildbot = nixosTests.buildbot;
     };
 
     meta = with lib; {
diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix
index 4f3a0ea04b8f..cb3124ec7e38 100644
--- a/pkgs/development/python-modules/buildbot/pkg.nix
+++ b/pkgs/development/python-modules/buildbot/pkg.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "buildbot-pkg";
-  version = "2.6.0";
+  version = "2.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "07ynk46c9h47ibbdm93h15xbrzflsl4llm0jr4c8pm6krs6byb4z";
+    sha256 = "03zb09r8w8dvd9qas7h6gdwlqc7q482ikph6h3708lpnkn72xdkb";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix
index 4bb82b598568..cd35f14fb37d 100644
--- a/pkgs/development/python-modules/buildbot/plugins.nix
+++ b/pkgs/development/python-modules/buildbot/plugins.nix
@@ -7,14 +7,12 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "0njix8g6g1dgfviick55p9calm82nnkhhgkikh7a5yvqk524cprg";
+      sha256 = "1d8xdk4rq4p3fw03cvz7d1pmpjjbyrnzzjifzv46q88vk7jakgxi";
     };
 
     # Remove unneccessary circular dependency on buildbot
     postPatch = ''
-      sed -i setup.py \
-        -e "/import buildbot/d" \
-        -e "s/'buildbot',//"
+      sed -i "s/'buildbot'//" setup.py
     '';
 
     buildInputs = [ buildbot-pkg mock ];
@@ -36,7 +34,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "1wmay9bbb1wwf0zh9rw95swmdc7bxabgvx2n6dyyzs4p8k92px10";
+      sha256 = "03pl75avi6cmmhjvfn0a0b4drn35yv37kvgn04zjdwa3m6p3haa8";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -58,7 +56,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "14b28vpkk68yk6zmdd64n7izb1r3barb7y711n4g37skqd13jygb";
+      sha256 = "0rzjk3qmlvid8qag3r00zaszchncl1nl8l2yapvc1zqh2dqlln58";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -80,7 +78,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "1m8kbycjq7jsl72xbrzjj48hb65r53lfxx78yvlnhc2f9ian5vnh";
+      sha256 = "1n4j73y9kwfqk7dz1fh1bpan68vlpnbz7idxpmsphyay8w8y9dd4";
     };
 
     buildInputs = [ buildbot-pkg ];
@@ -102,7 +100,7 @@
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "1sbp13qimv8kc7dp0xz1pmda1x1n4948zgrz2pc45rwlbbn5h69r";
+      sha256 = "1babkcgxczs6zfk2b6jmsy2vwbrgdydrp2px1mfwa3wmv8fwlssg";
     };
 
     buildInputs = [ buildbot-pkg ];
diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix
index 6352b22b55d6..365ca0bcf14a 100644
--- a/pkgs/development/python-modules/buildbot/worker.nix
+++ b/pkgs/development/python-modules/buildbot/worker.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage (rec {
   pname = "buildbot-worker";
-  version = "2.6.0";
+  version = "2.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0hr42fp3sw6c59qahihm9440618z7prwsy4z0ax553zvw47pc22l";
+    sha256 = "1vwy46acvczgk1hhpsqdwpcw55j4hm5pkw6j01f92axiga8r5jk6";
   };
 
   propagatedBuildInputs = [ twisted future ];

From aa89871ae0382e766368164c22a8762fe8330bf5 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 28 Feb 2020 12:02:03 -0800
Subject: [PATCH 1951/4636] errbot: freeze slackclient at 1.2.1

errbot requires slackclient 1.x, see https://github.com/errbotio/errbot/pull/1367
latest 1.x release would be 1.3.2, but it requires an older websocket_client than the one in nixpkgs
so let's just vendor the known-working version until they've migrated to 2.x.
---
 .../networking/errbot/default.nix             | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix
index 402017e129d6..66dc8e0d0b59 100644
--- a/pkgs/applications/networking/errbot/default.nix
+++ b/pkgs/applications/networking/errbot/default.nix
@@ -1,9 +1,9 @@
 { lib, fetchFromGitHub, python, glibcLocales }:
 
 let
-  # errbot requires markdown<3, and is not compatible with it either.
   py = python.override {
     packageOverrides = self: super: {
+      # errbot requires markdown<3, and is not compatible with it either.
       markdown = super.markdown.overridePythonAttrs (oldAttrs: rec {
         version = "2.6.11";
         src = super.fetchPypi {
@@ -12,6 +12,28 @@ let
           sha256 = "108g80ryzykh8bj0i7jfp71510wrcixdi771lf2asyghgyf8cmm8";
         };
       });
+
+      # errbot requires slackclient 1.x, see https://github.com/errbotio/errbot/pull/1367
+      # latest 1.x release would be 1.3.2, but it requires an older websocket_client than the one in nixpkgs
+      # so let's just vendor the known-working version until they've migrated to 2.x.
+      slackclient = super.slackclient.overridePythonAttrs (oldAttrs: rec {
+        version = "1.2.1";
+        pname = "slackclient";
+        src = fetchFromGitHub {
+          owner  = "slackapi";
+          repo   = "python-slackclient";
+          rev    = version;
+          sha256 = "073fwf6fm2sqdp5ms3vm1v3ljh0pldi69k048404rp6iy3cfwkp0";
+        };
+
+        propagatedBuildInputs = with self; [ websocket_client requests six ];
+
+        checkInputs = with self; [ pytest codecov coverage mock pytestcov pytest-mock responses flake8 ];
+        # test_server.py fails because it needs connection (I think);
+        checkPhase = ''
+          py.test --cov-report= --cov=slackclient tests --ignore=tests/test_server.py
+        '';
+      });
     };
   };
 

From 56d4afdc8354f477badd1bb076c773963f8e65a9 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 28 Feb 2020 12:02:57 -0800
Subject: [PATCH 1952/4636] python.pkgs.slackclient: 1.2.1 -> 2.5.0

---
 .../python-modules/slackclient/default.nix    | 53 ++++++++++++++-----
 1 file changed, 41 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix
index 6a16b38c6e15..b2578d5dd63d 100644
--- a/pkgs/development/python-modules/slackclient/default.nix
+++ b/pkgs/development/python-modules/slackclient/default.nix
@@ -1,29 +1,58 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, websocket_client, requests, six, pytest, codecov, coverage, mock, pytestcov, pytest-mock, responses, flake8 }:
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, aiohttp
+, black
+, codecov
+, flake8
+, isPy3k
+, mock
+, pytest-mock
+, pytestCheckHook
+, pytestcov
+, pytestrunner
+, requests
+, responses
+, six
+, websocket_client
+}:
 
 buildPythonPackage rec {
   pname = "python-slackclient";
-  version = "1.2.1";
+  version = "2.5.0";
+
+  disabled = !isPy3k;
 
   src = fetchFromGitHub {
     owner  = "slackapi";
     repo   = pname;
     rev    = version;
-    sha256 = "073fwf6fm2sqdp5ms3vm1v3ljh0pldi69k048404rp6iy3cfwkp0";
+    sha256 = "1ngj1mivbln19546195k400w9yaw69g0w6is7c75rqwyxr8wgzsk";
   };
 
-  propagatedBuildInputs = [ websocket_client requests six ];
+  propagatedBuildInputs = [
+    aiohttp
+    websocket_client
+    requests
+    six
+  ];
 
-  checkInputs = [ pytest codecov coverage mock pytestcov pytest-mock responses flake8 ];
-  # test_server.py fails because it needs connection (I think);
-  checkPhase = ''
-    py.test --cov-report= --cov=slackclient tests --ignore=tests/test_server.py
-  '';
+  checkInputs = [
+    black
+    codecov
+    flake8
+    mock
+    pytest-mock
+    pytestCheckHook
+    pytestcov
+    pytestrunner
+    responses
+  ];
 
   meta = with stdenv.lib; {
     description = "A client for Slack, which supports the Slack Web API and Real Time Messaging (RTM) API";
-    homepage = https://github.com/slackapi/python-slackclient;
+    homepage = "https://github.com/slackapi/python-slackclient";
     license = licenses.mit;
-    maintainers = with maintainers; [ psyanticy ];
+    maintainers = with maintainers; [ flokli psyanticy ];
   };
 }
-

From ba27e63d8e18919cdd667aff791e5735e54ea85d Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 29 Feb 2020 15:08:30 -0800
Subject: [PATCH 1953/4636] errbot: disable for darwin

At least tests seem to be flaky there.
---
 pkgs/applications/networking/errbot/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix
index 66dc8e0d0b59..d5dc287ecac7 100644
--- a/pkgs/applications/networking/errbot/default.nix
+++ b/pkgs/applications/networking/errbot/default.nix
@@ -70,6 +70,7 @@ py.pkgs.buildPythonApplication rec {
     homepage = http://errbot.io/;
     maintainers = with maintainers; [ fpletz globin ];
     license = licenses.gpl3;
-    platforms = platforms.unix;
+    platforms = platforms.linux;
+    # flaky on darwin, "RuntimeError: can't start new thread"
   };
 }

From 200473b2254b7b67df33083ca03254ecb0dc24b1 Mon Sep 17 00:00:00 2001
From: Tadeo Kondrak <me@tadeo.ca>
Date: Sat, 29 Feb 2020 15:52:39 -0700
Subject: [PATCH 1954/4636] wofi: 1.0 -> 1.1

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

diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix
index 289c60b44029..659b7099943d 100644
--- a/pkgs/applications/misc/wofi/default.nix
+++ b/pkgs/applications/misc/wofi/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "wofi";
-  version = "1.0";
+  version = "1.1";
 
   src = fetchhg {
     url = "https://hg.sr.ht/~scoopta/wofi";
     rev = "v${version}";
-    sha256 = "147yarm26nl0zc0a2rs7qi4jd7bz48vvyaygsif1qsv8fx0xiqqf";
+    sha256 = "0rq6c8fv0h7xj3jw1i01r39dz0f31k7jgf7hpgl6mlsyn0ddc80z";
   };
 
   nativeBuildInputs = [ pkg-config meson ninja ];

From aaf997511bf43f78298b76770066bfbfe52fa5c4 Mon Sep 17 00:00:00 2001
From: Gabor Greif <ggreif@gmail.com>
Date: Sat, 29 Feb 2020 12:58:22 +0100
Subject: [PATCH 1955/4636] wasmtime: bump to v0.12.0 (from v0.8.0)

- moved to modern cargo fetcher
- removed patch (not needed)
- disabled test (due to bytecodealliance/wasmtime#1197)
---
 .../interpreters/wasmtime/cargo-lock.patch    | 2282 -----------------
 .../interpreters/wasmtime/default.nix         |   13 +-
 2 files changed, 5 insertions(+), 2290 deletions(-)
 delete mode 100644 pkgs/development/interpreters/wasmtime/cargo-lock.patch

diff --git a/pkgs/development/interpreters/wasmtime/cargo-lock.patch b/pkgs/development/interpreters/wasmtime/cargo-lock.patch
deleted file mode 100644
index 3ce3f7659886..000000000000
--- a/pkgs/development/interpreters/wasmtime/cargo-lock.patch
+++ /dev/null
@@ -1,2282 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-new file mode 100644
-index 00000000..818de492
---- /dev/null
-+++ b/Cargo.lock
-@@ -0,0 +1,2276 @@
-+# This file is automatically @generated by Cargo.
-+# It is not intended for manual editing.
-+[[package]]
-+name = "aho-corasick"
-+version = "0.7.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "ansi_term"
-+version = "0.11.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "anyhow"
-+version = "1.0.26"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "arrayref"
-+version = "0.3.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "arrayvec"
-+version = "0.4.12"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "arrayvec"
-+version = "0.5.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "atty"
-+version = "0.2.14"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "autocfg"
-+version = "0.1.7"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "backtrace"
-+version = "0.3.40"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "backtrace-sys"
-+version = "0.1.32"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "base64"
-+version = "0.10.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "base64"
-+version = "0.11.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "bincode"
-+version = "1.2.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "bindgen"
-+version = "0.51.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cexpr 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "clang-sys 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "which 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "bitflags"
-+version = "1.2.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "blake2b_simd"
-+version = "0.5.10"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "block-buffer"
-+version = "0.7.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "block-padding"
-+version = "0.1.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "byte-tools"
-+version = "0.3.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "byteorder"
-+version = "1.3.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "c2-chacha"
-+version = "0.2.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "capstone"
-+version = "0.6.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "capstone-sys 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "capstone-sys"
-+version = "0.10.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "cc"
-+version = "1.0.49"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "jobserver 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "cexpr"
-+version = "0.3.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "cfg-if"
-+version = "0.1.10"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "chrono"
-+version = "0.4.10"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "clang-sys"
-+version = "0.28.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "clap"
-+version = "2.33.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "cloudabi"
-+version = "0.0.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "cmake"
-+version = "0.1.42"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "constant_time_eq"
-+version = "0.1.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "cpu-time"
-+version = "1.0.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "cranelift-bforest"
-+version = "0.50.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "cranelift-codegen"
-+version = "0.50.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-bforest 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-codegen-meta 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-codegen-shared 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "cranelift-codegen-meta"
-+version = "0.50.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cranelift-codegen-shared 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "cranelift-codegen-shared"
-+version = "0.50.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "cranelift-entity"
-+version = "0.50.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "cranelift-frontend"
-+version = "0.50.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "cranelift-native"
-+version = "0.50.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "raw-cpuid 7.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "cranelift-wasm"
-+version = "0.50.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-frontend 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "crossbeam-deque"
-+version = "0.7.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "crossbeam-epoch"
-+version = "0.8.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "crossbeam-queue"
-+version = "0.2.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "crossbeam-utils"
-+version = "0.6.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "crossbeam-utils"
-+version = "0.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "ctor"
-+version = "0.1.12"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "cvt"
-+version = "0.1.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "digest"
-+version = "0.8.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "directories"
-+version = "2.0.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "dirs-sys"
-+version = "0.3.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "docopt"
-+version = "1.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "strsim 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "dynasm"
-+version = "0.5.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "dynasmrt"
-+version = "0.5.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "either"
-+version = "1.5.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "env_logger"
-+version = "0.6.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "errno"
-+version = "0.2.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "errno-dragonfly"
-+version = "0.1.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "faerie"
-+version = "0.13.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "goblin 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "scroll 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "string-interner 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "failure"
-+version = "0.1.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "failure_derive"
-+version = "0.1.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "fake-simd"
-+version = "0.1.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "fallible-iterator"
-+version = "0.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "file-per-thread-logger"
-+version = "0.1.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "filetime"
-+version = "0.2.8"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "fuchsia-cprng"
-+version = "0.1.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "gcc"
-+version = "0.3.55"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "generic-array"
-+version = "0.12.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "getrandom"
-+version = "0.1.13"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "ghost"
-+version = "0.1.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "gimli"
-+version = "0.19.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "fallible-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "glob"
-+version = "0.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "goblin"
-+version = "0.1.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "scroll 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "heck"
-+version = "0.3.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "hermit-abi"
-+version = "0.1.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "humantime"
-+version = "1.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "id-arena"
-+version = "2.2.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "indexmap"
-+version = "1.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "indoc"
-+version = "0.3.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "indoc-impl 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "indoc-impl"
-+version = "0.3.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unindent 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "inventory"
-+version = "0.1.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "ctor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "ghost 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "inventory-impl 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "inventory-impl"
-+version = "0.1.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "itertools"
-+version = "0.8.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "itoa"
-+version = "0.4.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "jobserver"
-+version = "0.1.17"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "lazy_static"
-+version = "1.4.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "leb128"
-+version = "0.2.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "libc"
-+version = "0.2.66"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "libloading"
-+version = "0.5.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "lightbeam"
-+version = "0.8.0"
-+dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "capstone 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "dynasm 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "dynasmrt 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "multi_mut 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quickcheck 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "log"
-+version = "0.4.8"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "mach"
-+version = "0.2.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "memchr"
-+version = "2.2.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "memmap"
-+version = "0.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "memoffset"
-+version = "0.5.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "more-asserts"
-+version = "0.2.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "multi_mut"
-+version = "0.1.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "nix"
-+version = "0.15.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "nodrop"
-+version = "0.1.14"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "nom"
-+version = "4.2.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "num"
-+version = "0.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "num-complex 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "num-complex"
-+version = "0.2.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "num-integer"
-+version = "0.1.41"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "num-iter"
-+version = "0.1.39"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "num-rational"
-+version = "0.2.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "num-traits"
-+version = "0.2.10"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "num_cpus"
-+version = "1.11.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "opaque-debug"
-+version = "0.2.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "os_pipe"
-+version = "0.9.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "owning_ref"
-+version = "0.4.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "paste"
-+version = "0.1.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "paste-impl 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "paste-impl"
-+version = "0.1.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "peeking_take_while"
-+version = "0.1.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "plain"
-+version = "0.2.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "ppv-lite86"
-+version = "0.2.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "pretty_env_logger"
-+version = "0.3.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "proc-macro-hack"
-+version = "0.5.11"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "proc-macro2"
-+version = "1.0.7"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "pyo3"
-+version = "0.8.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "indoc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "inventory 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pyo3cls 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unindent 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "pyo3-derive-backend"
-+version = "0.8.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "pyo3cls"
-+version = "0.8.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pyo3-derive-backend 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "quick-error"
-+version = "1.2.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "quickcheck"
-+version = "0.9.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "quote"
-+version = "1.0.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "rand"
-+version = "0.7.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_pcg 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "rand_chacha"
-+version = "0.2.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "rand_core"
-+version = "0.3.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "rand_core"
-+version = "0.4.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "rand_core"
-+version = "0.5.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "rand_hc"
-+version = "0.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "rand_os"
-+version = "0.1.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "rand_pcg"
-+version = "0.2.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "raw-cpuid"
-+version = "7.0.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "rayon"
-+version = "1.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "rayon-core"
-+version = "1.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "rdrand"
-+version = "0.4.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "redox_syscall"
-+version = "0.1.56"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "redox_users"
-+version = "0.3.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "regex"
-+version = "1.3.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "regex-syntax"
-+version = "0.6.12"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "region"
-+version = "2.1.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "remove_dir_all"
-+version = "0.5.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "rust-argon2"
-+version = "0.5.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "rustc-demangle"
-+version = "0.1.16"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "rustc-hash"
-+version = "1.0.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "rustc_version"
-+version = "0.2.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "ryu"
-+version = "1.0.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "scopeguard"
-+version = "1.0.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "scroll"
-+version = "0.10.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "scroll_derive 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "scroll_derive"
-+version = "0.10.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "semver"
-+version = "0.9.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "semver-parser"
-+version = "0.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "serde"
-+version = "1.0.104"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "serde_derive"
-+version = "1.0.104"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "serde_json"
-+version = "1.0.44"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "sha2"
-+version = "0.8.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "shlex"
-+version = "0.1.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "smallvec"
-+version = "1.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "spin"
-+version = "0.5.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "stable_deref_trait"
-+version = "1.1.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "string-interner"
-+version = "0.7.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "strsim"
-+version = "0.8.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "strsim"
-+version = "0.9.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "syn"
-+version = "1.0.13"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "synstructure"
-+version = "0.12.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "target-lexicon"
-+version = "0.9.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "tempfile"
-+version = "3.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "termcolor"
-+version = "1.0.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "test-programs"
-+version = "0.8.0"
-+dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "os_pipe 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasi-common 0.8.0",
-+ "wasmtime 0.8.0",
-+ "wasmtime-environ 0.8.0",
-+ "wasmtime-jit 0.8.0",
-+ "wasmtime-runtime 0.8.0",
-+ "wasmtime-wasi 0.8.0",
-+ "wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "textwrap"
-+version = "0.11.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "thiserror"
-+version = "1.0.9"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "thiserror-impl 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "thiserror-impl"
-+version = "1.0.9"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "thread_local"
-+version = "0.3.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "time"
-+version = "0.1.42"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "toml"
-+version = "0.5.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "traitobject"
-+version = "0.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "trybuild"
-+version = "1.0.19"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "typemap"
-+version = "0.3.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "typenum"
-+version = "1.11.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "unicode-segmentation"
-+version = "1.6.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "unicode-width"
-+version = "0.1.7"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "unicode-xid"
-+version = "0.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "unindent"
-+version = "0.1.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "unsafe-any"
-+version = "0.4.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "vec_map"
-+version = "0.8.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "version_check"
-+version = "0.1.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "version_check"
-+version = "0.9.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "void"
-+version = "1.0.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "walrus"
-+version = "0.13.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walrus-macro 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "walrus-macro"
-+version = "0.13.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "wasi"
-+version = "0.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "wasi-common"
-+version = "0.8.0"
-+dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cpu-time 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasi-common-cbindgen 0.8.0",
-+ "wig 0.8.0",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winx 0.8.0",
-+]
-+
-+[[package]]
-+name = "wasi-common-cbindgen"
-+version = "0.8.0"
-+dependencies = [
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "trybuild 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "wasm-webidl-bindings"
-+version = "0.6.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "wasmparser"
-+version = "0.39.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "wasmtime"
-+version = "0.8.0"
-+dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-frontend 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-native 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasi-common 0.8.0",
-+ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmtime-environ 0.8.0",
-+ "wasmtime-jit 0.8.0",
-+ "wasmtime-runtime 0.8.0",
-+ "wasmtime-wasi 0.8.0",
-+ "wasmtime-wast 0.8.0",
-+ "wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "wasmtime-cli"
-+version = "0.8.0"
-+dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-native 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "faerie 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "test-programs 0.8.0",
-+ "wasi-common 0.8.0",
-+ "wasm-webidl-bindings 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmtime 0.8.0",
-+ "wasmtime-debug 0.8.0",
-+ "wasmtime-environ 0.8.0",
-+ "wasmtime-interface-types 0.8.0",
-+ "wasmtime-jit 0.8.0",
-+ "wasmtime-obj 0.8.0",
-+ "wasmtime-runtime 0.8.0",
-+ "wasmtime-wasi 0.8.0",
-+ "wasmtime-wasi-c 0.8.0",
-+ "wasmtime-wast 0.8.0",
-+ "wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "wasmtime-debug"
-+version = "0.8.0"
-+dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "faerie 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "gimli 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmtime-environ 0.8.0",
-+]
-+
-+[[package]]
-+name = "wasmtime-environ"
-+version = "0.8.0"
-+dependencies = [
-+ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "directories 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lightbeam 0.8.0",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "zstd 0.5.1+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "wasmtime-interface-types"
-+version = "0.8.0"
-+dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-webidl-bindings 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmtime 0.8.0",
-+ "wasmtime-jit 0.8.0",
-+ "wasmtime-runtime 0.8.0",
-+ "wasmtime-wasi 0.8.0",
-+]
-+
-+[[package]]
-+name = "wasmtime-jit"
-+version = "0.8.0"
-+dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-frontend 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmtime-debug 0.8.0",
-+ "wasmtime-environ 0.8.0",
-+ "wasmtime-runtime 0.8.0",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "wasmtime-obj"
-+version = "0.8.0"
-+dependencies = [
-+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "faerie 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmtime-environ 0.8.0",
-+]
-+
-+[[package]]
-+name = "wasmtime-py"
-+version = "0.8.0"
-+dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-frontend 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-native 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pyo3 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmtime 0.8.0",
-+ "wasmtime-environ 0.8.0",
-+ "wasmtime-interface-types 0.8.0",
-+ "wasmtime-jit 0.8.0",
-+ "wasmtime-runtime 0.8.0",
-+ "wasmtime-wasi 0.8.0",
-+]
-+
-+[[package]]
-+name = "wasmtime-runtime"
-+version = "0.8.0"
-+dependencies = [
-+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmtime-environ 0.8.0",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "wasmtime-rust"
-+version = "0.8.0"
-+dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmtime 0.8.0",
-+ "wasmtime-interface-types 0.8.0",
-+ "wasmtime-jit 0.8.0",
-+ "wasmtime-rust-macro 0.8.0",
-+ "wasmtime-wasi 0.8.0",
-+]
-+
-+[[package]]
-+name = "wasmtime-rust-macro"
-+version = "0.8.0"
-+dependencies = [
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "wasmtime-wasi"
-+version = "0.8.0"
-+dependencies = [
-+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasi-common 0.8.0",
-+ "wasmtime 0.8.0",
-+ "wasmtime-environ 0.8.0",
-+ "wasmtime-jit 0.8.0",
-+ "wasmtime-runtime 0.8.0",
-+]
-+
-+[[package]]
-+name = "wasmtime-wasi-c"
-+version = "0.8.0"
-+dependencies = [
-+ "bindgen 0.51.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cmake 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmtime-environ 0.8.0",
-+ "wasmtime-jit 0.8.0",
-+ "wasmtime-runtime 0.8.0",
-+]
-+
-+[[package]]
-+name = "wasmtime-wast"
-+version = "0.8.0"
-+dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmtime-environ 0.8.0",
-+ "wasmtime-jit 0.8.0",
-+ "wasmtime-runtime 0.8.0",
-+ "wast 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "wast"
-+version = "3.0.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "wast"
-+version = "5.0.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "wat"
-+version = "1.0.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "wast 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "which"
-+version = "3.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "wig"
-+version = "0.8.0"
-+dependencies = [
-+ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "witx 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "winapi"
-+version = "0.3.8"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "winapi-i686-pc-windows-gnu"
-+version = "0.4.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "winapi-util"
-+version = "0.1.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "winapi-x86_64-pc-windows-gnu"
-+version = "0.4.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "wincolor"
-+version = "1.0.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "winx"
-+version = "0.8.0"
-+dependencies = [
-+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cvt 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "witx"
-+version = "0.5.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wast 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "zstd"
-+version = "0.5.1+zstd.1.4.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "zstd-safe 2.0.3+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "zstd-safe"
-+version = "2.0.3+zstd.1.4.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "zstd-sys 1.4.15+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "zstd-sys"
-+version = "1.4.15+zstd.1.4.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[metadata]
-+"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
-+"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-+"checksum anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)" = "7825f6833612eb2414095684fcf6c635becf3ce97fe48cf6421321e93bfbd53c"
-+"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee"
-+"checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
-+"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
-+"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-+"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
-+"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
-+"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
-+"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
-+"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
-+"checksum bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5753e2a71534719bf3f4e57006c3a4f0d2c672a4b676eec84161f763eca87dbf"
-+"checksum bindgen 0.51.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ebd71393f1ec0509b553aa012b9b58e81dadbdff7130bd3b8cba576e69b32f75"
-+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-+"checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
-+"checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
-+"checksum block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
-+"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
-+"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
-+"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
-+"checksum capstone 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "031ba51c39151a1d6336ec859646153187204b0147c7b3f6fe2de636f1b8dbb3"
-+"checksum capstone-sys 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fae25eddcb80e24f98c35952c37a91ff7f8d0f60dbbdafb9763e8d5cc566b8d7"
-+"checksum cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)" = "e450b8da92aa6f274e7c6437692f9f2ce6d701fb73bacfcf87897b3f89a4c20e"
-+"checksum cexpr 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fce5b5fb86b0c57c20c834c1b412fd09c77c8a59b9473f86272709e78874cd1d"
-+"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-+"checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01"
-+"checksum clang-sys 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)" = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853"
-+"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
-+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-+"checksum cmake 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "81fb25b677f8bf1eb325017cb6bb8452f87969db0fedb4f757b297bee78a7c62"
-+"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120"
-+"checksum cpu-time 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e9e393a7668fe1fad3075085b86c781883000b4ede868f43627b34a87c8b7ded"
-+"checksum cranelift-bforest 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bd05aac8cefcde54ce26178df8f36cb1f518ac691db650e7d2440c2b6b41c4dc"
-+"checksum cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c63d9b6ff8a94f98deabab21880d7fd54996e0e16be687b6f80a3b6bdd9c188d"
-+"checksum cranelift-codegen-meta 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7cb3df51c2c07d719d02869bfac6cabd8d82ee308d5b29ca62e6528723cc33a4"
-+"checksum cranelift-codegen-shared 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "758f9426b2e22bf83fc1a6b231a9d53cd4830751883c7f0e196ebb3c210467b3"
-+"checksum cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff064733df8b98f453060264a8790393d1e807aca6942706b42f79a4f7aae9ed"
-+"checksum cranelift-frontend 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1eaafb5fa623dcbe19a28084a8226d7a1b17184a949c1a1f29a46b479867998d"
-+"checksum cranelift-native 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "90033dbd7293f6fad4cf9dcd769cd621d60df22b1c5a11799e86359b7447a51d"
-+"checksum cranelift-wasm 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)" = "54cb82a1071f88822763a583ec1a8688ffe5e2cda02c111d4483dd4376ed14d8"
-+"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca"
-+"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac"
-+"checksum crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db"
-+"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
-+"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
-+"checksum ctor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8ce37ad4184ab2ce004c33bf6379185d3b1c95801cab51026bd271bf68eedc"
-+"checksum cvt 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "34ac344c7efccb80cd25bc61b2170aec26f2f693fd40e765a539a1243db48c71"
-+"checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
-+"checksum directories 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c"
-+"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
-+"checksum docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969"
-+"checksum dynasm 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "42a814e1edeb85dd2a3c6fc0d6bf76d02ca5695d438c70ecee3d90774f3259c5"
-+"checksum dynasmrt 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8a393aaeb4441a48bcf47b5b6155971f82cc1eb77e22855403ccc0415ac8328d"
-+"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
-+"checksum env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
-+"checksum errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c2a071601ed01b988f896ab14b95e67335d1eeb50190932a1320f7fe3cadc84e"
-+"checksum errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "14ca354e36190500e1e1fb267c647932382b54053c50b14970856c0b00a35067"
-+"checksum faerie 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f902f2af041f6c7177a2a04f805687cdc71e69c7cbef059a2755d8923f4cd7a8"
-+"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9"
-+"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08"
-+"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
-+"checksum fallible-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
-+"checksum file-per-thread-logger 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8505b75b31ef7285168dd237c4a7db3c1f3e0927e7d314e670bc98e854272fe9"
-+"checksum filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d"
-+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-+"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
-+"checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
-+"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407"
-+"checksum ghost 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2a36606a68532b5640dc86bb1f33c64b45c4682aad4c50f3937b317ea387f3d6"
-+"checksum gimli 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "162d18ae5f2e3b90a993d202f1ba17a5633c2484426f8bcae201f86194bacd00"
-+"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
-+"checksum goblin 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3081214398d39e4bd7f2c1975f0488ed04614ffdd976c6fc7a0708278552c0da"
-+"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
-+"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772"
-+"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-+"checksum id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005"
-+"checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2"
-+"checksum indoc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3f9553c1e16c114b8b77ebeb329e5f2876eed62a8d51178c8bc6bff0d65f98f8"
-+"checksum indoc-impl 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b714fc08d0961716390977cdff1536234415ac37b509e34e5a983def8340fb75"
-+"checksum inventory 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2bf98296081bd2cb540acc09ef9c97f22b7e487841520350293605db1b2c7a27"
-+"checksum inventory-impl 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0a8e30575afe28eea36a9a39136b70b2fb6b0dd0a212a5bd1f30a498395c0274"
-+"checksum itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
-+"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
-+"checksum jobserver 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b1d42ef453b30b7387e113da1c83ab1605d90c5b4e0eb8e96d016ed3b8c160"
-+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-+"checksum leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a"
-+"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
-+"checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
-+"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
-+"checksum mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1"
-+"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
-+"checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
-+"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
-+"checksum more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0debeb9fcf88823ea64d64e4a815ab1643f33127d995978e099942ce38f25238"
-+"checksum multi_mut 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "816df386e5557ac1843a96f1ba8a7cbf4ab175d05ccc15c87a3cda27b4fbdece"
-+"checksum nix 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3b2e0b4f3320ed72aaedb9a5ac838690a8047c7b275da22711fddff4f8a14229"
-+"checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-+"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
-+"checksum num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cf4825417e1e1406b3782a8ce92f4d53f26ec055e3622e1881ca8e9f5f9e08db"
-+"checksum num-complex 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fcb0cf31fb3ff77e6d2a6ebd6800df7fdcd106f2ad89113c9130bcd07f93dffc"
-+"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09"
-+"checksum num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "76bd5272412d173d6bf9afdf98db8612bbabc9a7a830b7bfc9c188911716132e"
-+"checksum num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2885278d5fe2adc2f75ced642d52d879bffaceb5a2e0b1d4309ffdfb239b454"
-+"checksum num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4"
-+"checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72"
-+"checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
-+"checksum os_pipe 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "db4d06355a7090ce852965b2d08e11426c315438462638c6d721448d0b47aa22"
-+"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
-+"checksum paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "423a519e1c6e828f1e73b720f9d9ed2fa643dce8a7737fb43235ce0b41eeaa49"
-+"checksum paste-impl 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4214c9e912ef61bf42b81ba9a47e8aad1b2ffaf739ab162bf96d1e011f54e6c5"
-+"checksum peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-+"checksum plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
-+"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
-+"checksum pretty_env_logger 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "717ee476b1690853d222af4634056d830b5197ffd747726a9a1eee6da9f49074"
-+"checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"
-+"checksum proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0319972dcae462681daf4da1adeeaa066e3ebd29c69be96c6abb1259d2ee2bcc"
-+"checksum pyo3 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e1bfe257586436fbe1296d917f14a167d4253d0873bf43e2c9b9bdd58a3f9f35"
-+"checksum pyo3-derive-backend 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4882d8237fd8c7373cc25cb802fe0dab9ff70830fd56f47ef6c7f3f287fcc057"
-+"checksum pyo3cls 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fdf321cfab555f7411298733c86d21e5136f5ded13f5872fabf9de3337beecda"
-+"checksum quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
-+"checksum quickcheck 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d5ca504a2fdaa08d3517f442fbbba91ac24d1ec4c51ea68688a038765e3b2662"
-+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
-+"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412"
-+"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
-+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-+"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-+"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-+"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-+"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
-+"checksum rand_pcg 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
-+"checksum raw-cpuid 7.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4a349ca83373cfa5d6dbb66fd76e58b2cca08da71a5f6400de0a0a6a9bceeaf"
-+"checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098"
-+"checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9"
-+"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-+"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
-+"checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d"
-+"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd"
-+"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
-+"checksum region 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "448e868c6e4cfddfa49b6a72c95906c04e8547465e9536575b95c70a4044f856"
-+"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
-+"checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf"
-+"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
-+"checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"
-+"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-+"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
-+"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
-+"checksum scroll 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "abb2332cb595d33f7edd5700f4cbf94892e680c7f0ae56adab58a35190b66cb1"
-+"checksum scroll_derive 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8584eea9b9ff42825b46faf46a8c24d2cff13ec152fa2a50df788b87c07ee28"
-+"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-+"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
-+"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
-+"checksum serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)" = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7"
-+"checksum sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "27044adfd2e1f077f649f59deb9490d3941d674002f7d062870a60ebe9bd47a0"
-+"checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
-+"checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4"
-+"checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-+"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
-+"checksum string-interner 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd710eadff449a1531351b0e43eb81ea404336fa2f56c777427ab0e32a4cf183"
-+"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-+"checksum strsim 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
-+"checksum syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4ff033220a41d1a57d8125eab57bf5263783dfdcc18688b1dacc6ce9651ef8"
-+"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
-+"checksum target-lexicon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6f4c118a7a38378f305a9e111fcb2f7f838c0be324bfb31a77ea04f7f6e684b4"
-+"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
-+"checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e"
-+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-+"checksum thiserror 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6f357d1814b33bc2dc221243f8424104bfe72dbe911d5b71b3816a2dff1c977e"
-+"checksum thiserror-impl 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "eb2e25d25307eb8436894f727aba8f65d07adf02e5b35a13cebed48bd282bfef"
-+"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
-+"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
-+"checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf"
-+"checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
-+"checksum trybuild 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)" = "987d6fdc45ddd7f3be5aa7386c8c8a844d1655c95b9ed948a9cd9cded8f2b79f"
-+"checksum typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6"
-+"checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9"
-+"checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
-+"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
-+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
-+"checksum unindent 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "63f18aa3b0e35fed5a0048f029558b1518095ffe2a0a31fb87c93dece93a4993"
-+"checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f"
-+"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
-+"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
-+"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
-+"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-+"checksum walrus 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "85ce93ab0c27412ba41d509f2410fa575ecbfdb4a6aba0e02e79e12c09745485"
-+"checksum walrus-macro 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8757b0da38353d55a9687f4dee68a8f441f980dd36e16ab07d6e6c673f505f76"
-+"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
-+"checksum wasm-webidl-bindings 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b5cae185868c6038a48f487b9af3766ee0c68d4a85fa3610c3a0522092b3cec1"
-+"checksum wasmparser 0.39.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c702914acda5feeeffbc29e4d953e5b9ce79d8b98da4dbf18a77086e116c5470"
-+"checksum wast 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "233648f540f07fce9b972436f2fbcae8a750c1121b6d32d949e1a44b4d9fc7b1"
-+"checksum wast 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8d1de68310854a9840d39487701a8c1acccb5c9f9f2650d5fce3cdfe6650c372"
-+"checksum wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d916cc60b1b79ac1ca7683af8d6ec56b789167f7f696b3f1ab3d98961129f192"
-+"checksum which 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5475d47078209a02e60614f7ba5e645ef3ed60f771920ac1906d7c1cc65024c8"
-+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
-+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-+"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
-+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-+"checksum wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9"
-+"checksum witx 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d075344afebe51633c0302fc11698c2d6414f9d366c749db1af57710f112561"
-+"checksum zstd 0.5.1+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5c5d978b793ae64375b80baf652919b148f6a496ac8802922d9999f5a553194f"
-+"checksum zstd-safe 2.0.3+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bee25eac9753cfedd48133fa1736cbd23b774e253d89badbeac7d12b23848d3f"
-+"checksum zstd-sys 1.4.15+zstd.1.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "89719b034dc22d240d5b407fb0a3fe6d29952c181cff9a9f95c0bd40b4f8f7d8"
diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix
index 08d583c54b43..eaecd1eb89b9 100644
--- a/pkgs/development/interpreters/wasmtime/default.nix
+++ b/pkgs/development/interpreters/wasmtime/default.nix
@@ -2,28 +2,25 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wasmtime";
-  version = "v0.8.0";
+  version = "v0.12.0";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "${pname}";
     rev = "${version}";
-    sha256 = "0az893srw49szvs5461bd165ffla4cc98gh42p3dwskwfkhpqjm4";
+    sha256 = "08dhk5s8rv41mjqbwfqwqmp6p6p9y7qc5yc76ljjd9l7j1phl7mr";
     fetchSubmodules = true;
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "08b3rbnl7qwyfbwaqcb7z84sh0h94v18v6557hrf0dlil414v54i";
-
-  cargoPatches = [ ./cargo-lock.patch ];
+  cargoSha256 = "0wqd2yy6ih1rcz1fq7x3aiqq1ma2nmif1w8r8x0vpxjxk395zil9";
 
   nativeBuildInputs = [ python cmake clang ];
   buildInputs = [ llvmPackages.libclang ] ++
    lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
   LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
 
+  doCheck = false; # https://github.com/bytecodealliance/wasmtime/issues/1197
+
   meta = with lib; {
     description = "Standalone JIT-style runtime for WebAssembly, using Cranelift";
     homepage = https://github.com/CraneStation/wasmtime;

From 30c861e0a9f85ab4fe7665eac5843195ff081f86 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Mar 2020 03:25:19 +0000
Subject: [PATCH 1956/4636] smemstat: 0.02.06 -> 0.02.07

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

diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/os-specific/linux/smemstat/default.nix
index dbaf6f413251..6693b3799482 100644
--- a/pkgs/os-specific/linux/smemstat/default.nix
+++ b/pkgs/os-specific/linux/smemstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "smemstat";
-  version = "0.02.06";
+  version = "0.02.07";
   src = fetchurl {
     url = "https://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.xz";
-    sha256 = "1069gwmc29vbw7zszqa5v5yxfvgaq7c41r0g456zdpm6msy5kb0w";
+    sha256 = "09i5n1zjw45qrfbc2vglh1xk1jwqnc91bgsq7bkp29d9dpfpzhdc";
   };
   buildInputs = [ ncurses ];
   installFlags = [ "DESTDIR=$(out)" ];
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   '';
   meta = with lib; {
     description = "Memory usage monitoring tool";
-    homepage = https://kernel.ubuntu.com/~cking/smemstat/;
+    homepage = "https://kernel.ubuntu.com/~cking/smemstat/";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ womfoo ];

From a8b644f35808be65a5ad28d3f433fe49a9c2a405 Mon Sep 17 00:00:00 2001
From: Evan Stoll <evanjsx@gmail.com>
Date: Sat, 29 Feb 2020 16:45:51 -0500
Subject: [PATCH 1957/4636] postman: 7.18.0 -> 7.19.1

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

diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix
index 142ce8cd5e8c..647bdf6f3af9 100644
--- a/pkgs/development/web/postman/default.nix
+++ b/pkgs/development/web/postman/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "postman";
-  version = "7.18.0";
+  version = "7.19.1";
 
   src = fetchurl {
     url = "https://dl.pstmn.io/download/version/${version}/linux64";
-    sha256 = "144yd4w1hqjmcp5v24ghkxh78fxc5ylzbgv7szp7y3vhwdanaiy7";
+    sha256 = "1p3614lhyn0qwqj99iqclpg4xfd3x4n1m34ya79530phqrrmnsh7";
     name = "${pname}.tar.gz";
   };
 

From 1cb0e94f34496262b3b75d3f0503fff250f41614 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sun, 1 Mar 2020 10:50:42 +0300
Subject: [PATCH 1958/4636] mame: 0.218 -> 0.219

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

diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix
index a0455b88bec2..995fd72a6e22 100644
--- a/pkgs/misc/emulators/mame/default.nix
+++ b/pkgs/misc/emulators/mame/default.nix
@@ -4,7 +4,7 @@
 
 let
   majorVersion = "0";
-  minorVersion = "218";
+  minorVersion = "219";
 
   desktopItem = makeDesktopItem {
     name = "MAME";
@@ -23,7 +23,7 @@ in mkDerivation {
     owner = "mamedev";
     repo = "mame";
     rev = "mame${majorVersion}${minorVersion}";
-    sha256 = "11qschyxhi45pbpf9q3k71kybqxmcfhjml8axqpi43sv4q2ack6q";
+    sha256 = "048ar1j2vsrvqqc3spy9qcch2lbxn0ycd9lv4ig5wfnvjkdjdvgr";
   };
 
   hardeningDisable = [ "fortify" ];

From 56684794989b23efffebd79cde634600526b4729 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Mar 2020 08:58:30 +0000
Subject: [PATCH 1959/4636] aesop: 1.2.3 -> 1.2.4

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

diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix
index d5a10f43c55a..1e1f686ab194 100644
--- a/pkgs/applications/office/aesop/default.nix
+++ b/pkgs/applications/office/aesop/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "aesop";
-  version = "1.2.3";
+  version = "1.2.4";
 
   src = fetchFromGitHub {
     owner = "lainsce";
     repo = pname;
     rev = version;
-    sha256 = "1aa1kp1rndi2dj1d9sf8zhssn5dw183yx1fm2xccdy9zjf9wi4jk";
+    sha256 = "1bqykr1mwanfm55w1v9ipqcqgzj8kbjvlm4d5b2swvhng77gnf3d";
   };
 
   nativeBuildInputs = [
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "The simplest PDF viewer around";
-    homepage = https://github.com/lainsce/aesop;
+    homepage = "https://github.com/lainsce/aesop";
     license = licenses.gpl2Plus;
     maintainers = pantheon.maintainers;
     platforms = platforms.linux;

From 543c864f23749f00ef6cc8efe3239eb29cc19fee Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Mar 2020 09:16:22 +0000
Subject: [PATCH 1960/4636] aws-google-auth: 0.0.33 -> 0.0.34

---
 pkgs/tools/admin/aws-google-auth/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/aws-google-auth/default.nix b/pkgs/tools/admin/aws-google-auth/default.nix
index e878369f1770..d96eadf0eab5 100644
--- a/pkgs/tools/admin/aws-google-auth/default.nix
+++ b/pkgs/tools/admin/aws-google-auth/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonApplication rec {
   pname = "aws-google-auth";
-  version = "0.0.33";
+  version = "0.0.34";
 
   # Pypi doesn't ship the tests, so we fetch directly from GitHub
   # https://github.com/cevoaustralia/aws-google-auth/issues/120
@@ -27,7 +27,7 @@ buildPythonApplication rec {
     owner = "cevoaustralia";
     repo = "aws-google-auth";
     rev = version;
-    sha256 = "07sisv7b17bpjwikmm9zpxn3l3xpzywsbxi4brri2hdjmjb6p7w7";
+    sha256 = "12c5ssdy870szrizhs4d7dzcpq3hvszjvl8ba60qf1ak5jsr1ay4";
   };
 
   propagatedBuildInputs = [ 
@@ -55,7 +55,7 @@ buildPythonApplication rec {
 
   meta = with lib; {
     description = "Acquire AWS STS (temporary) credentials via Google Apps SAML Single Sign On";
-    homepage = https://github.com/cevoaustralia/aws-google-auth;
+    homepage = "https://github.com/cevoaustralia/aws-google-auth";
     maintainers = [ maintainers.marsam ];
     license = licenses.mit;
   };

From 424a1eba0c2f200a09d59dc8ce641f99aa4d505a Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 1 Mar 2020 04:20:00 -0500
Subject: [PATCH 1961/4636] flexget: 3.1.26 -> 3.1.30

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

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 4361679fc884..30665b240818 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "FlexGet";
-  version = "3.1.26";
+  version = "3.1.30";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "0bd8ccc9ae8e9fd9d5aa4f61a1a5d8b62ff30257fc0f5b2ec61b2f4b26275eee";
+    sha256 = "453992c6bf8a7b0f83abeddd0e8f989dc10fd59e407e3803b886072cff2576a7";
   };
 
   postPatch = ''

From 2585a75cf1bf7e71b15a12f8374514232da951ba Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 1 Mar 2020 04:20:00 -0500
Subject: [PATCH 1962/4636] gtk3: fix build on darwin

gdkquartz-gtk-only.h is now included in distribution tarballs [1]

[1] https://gitlab.gnome.org/GNOME/gtk/-/commit/235d28f02d54e6601cef51fec91d46961f64009e
---
 pkgs/development/libraries/gtk/3.x.nix        |  3 -
 .../gtk/patches/missing-header.patch          | 56 -------------------
 2 files changed, 59 deletions(-)
 delete mode 100644 pkgs/development/libraries/gtk/patches/missing-header.patch

diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix
index 7caf32921de3..9f381c5ac708 100644
--- a/pkgs/development/libraries/gtk/3.x.nix
+++ b/pkgs/development/libraries/gtk/3.x.nix
@@ -77,9 +77,6 @@ stdenv.mkDerivation rec {
     # let’s drop that dependency in similar way to how other parts of the library do it
     # e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33
     ./patches/3.0-darwin-x11.patch
-    # 3.24.13 failed to ship a header file
-    # https://gitlab.gnome.org/GNOME/gtk/issues/2279
-    ./patches/missing-header.patch
   ];
 
   separateDebugInfo = stdenv.isLinux;
diff --git a/pkgs/development/libraries/gtk/patches/missing-header.patch b/pkgs/development/libraries/gtk/patches/missing-header.patch
deleted file mode 100644
index 49eb51dae9af..000000000000
--- a/pkgs/development/libraries/gtk/patches/missing-header.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/gdk/quartz/gdkquartz-gtk-only.h b/gdk/quartz/gdkquartz-gtk-only.h
-new file mode 100644
-index 0000000000000000000000000000000000000000..193686c041971e4d8b3a1bc6bb2a79d8ba6e9a70
---- /dev/null
-+++ b/gdk/quartz/gdkquartz-gtk-only.h
-@@ -0,0 +1,50 @@
-+/* gdkquartz-gtk-only.h
-+ *
-+ * Copyright (C) 2005-2007 Imendio AB
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef __GDK_QUARTZ_GTK_ONLY_H__
-+#define __GDK_QUARTZ_GTK_ONLY_H__
-+
-+#if !(defined (GTK_COMPILATION) || defined (GDK_COMPILATION))
-+#error "This API is for use only in Gtk internal code."
-+#endif
-+
-+#include <Appkit/Appkit.h>
-+#include <gdk/gdk.h>
-+#include <gdk/quartz/gdkquartz.h>
-+
-+/* Drag and Drop/Clipboard */
-+GDK_AVAILABLE_IN_ALL
-+GdkAtom   gdk_quartz_pasteboard_type_to_atom_libgtk_only        (NSString       *type);
-+GDK_AVAILABLE_IN_ALL
-+NSString *gdk_quartz_target_to_pasteboard_type_libgtk_only      (const gchar    *target);
-+GDK_AVAILABLE_IN_ALL
-+NSString *gdk_quartz_atom_to_pasteboard_type_libgtk_only        (GdkAtom         atom);
-+
-+/* Utilities */
-+GDK_AVAILABLE_IN_ALL
-+NSImage  *gdk_quartz_pixbuf_to_ns_image_libgtk_only (GdkPixbuf *pixbuf);
-+GDK_AVAILABLE_IN_ALL
-+NSEvent  *gdk_quartz_event_get_nsevent              (GdkEvent  *event);
-+
-+/* Window */
-+GDK_AVAILABLE_IN_ALL
-+NSWindow *gdk_quartz_window_get_nswindow            (GdkWindow *window);
-+GDK_AVAILABLE_IN_ALL
-+NSView   *gdk_quartz_window_get_nsview              (GdkWindow *window);
-+
-+#endif

From 02ca096a85eced0d653004ae95f7cc6d8597b13e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 1 Mar 2020 10:01:55 +0100
Subject: [PATCH 1963/4636] chromiumDev: Add the missing clang-format binary

The fix from 1d961a4c6d6 was unfortunately incomplete. This commit fixes
the second error [0] that occurs later during the build (the Python
script third_party/blink/renderer/bindings/scripts/generate_bindings.py
requires buildtools/linux64/clang-format).

[0]: https://github.com/NixOS/nixpkgs/pull/81016#issuecomment-591572821
---
 pkgs/applications/networking/browsers/chromium/common.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 31e699161968..255b399ef3da 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -7,7 +7,7 @@
 , xdg_utils, yasm, minizip, libwebp
 , libusb1, pciutils, nss, re2, zlib
 
-, python2Packages, perl, pkgconfig
+, python2Packages, perl, pkgconfig, clang-tools
 , nspr, systemd, kerberos
 , utillinux, alsaLib
 , bison, gperf
@@ -104,6 +104,8 @@ let
             result
        else result;
 
+  llvm-clang-tools = clang-tools.override { inherit llvmPackages; };
+
   base = rec {
     name = "${packageName}-unwrapped-${version}";
     inherit (upstream-info) channel version;
@@ -214,6 +216,8 @@ let
       ln -s ${stdenv.cc}/bin/clang              third_party/llvm-build/Release+Asserts/bin/clang
       ln -s ${stdenv.cc}/bin/clang++            third_party/llvm-build/Release+Asserts/bin/clang++
       ln -s ${llvmPackages.llvm}/bin/llvm-ar    third_party/llvm-build/Release+Asserts/bin/llvm-ar
+    '' + optionalString (stdenv.lib.versionAtLeast version "82") ''
+      ln -s ${llvm-clang-tools}/bin/clang-format buildtools/linux64/clang-format
     '';
 
     gnFlags = mkGnFlags ({

From d8e58850751bd4ded712d5f6fe9f43f01bdb78a9 Mon Sep 17 00:00:00 2001
From: ngerstle <ngerstle@gmail.com>
Date: Sun, 1 Mar 2020 11:24:41 +0100
Subject: [PATCH 1964/4636] kube3d: 1.3.1 -> 1.6.0

---
 .../applications/networking/cluster/kube3d/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index 7058c009f2dd..c34065bb22cb 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -2,8 +2,8 @@
 
 buildGoModule rec {
   pname = "kube3d";
-  version = "1.3.1";
-  k3sVersion = "0.9.1";
+  version = "1.6.0";
+  k3sVersion = "1.17.3+k3s1";
 
   goPackagePath = "github.com/rancher/k3d";
 
@@ -11,7 +11,7 @@ buildGoModule rec {
     owner  = "rancher";
     repo   = "k3d";
     rev    = "v${version}";
-    sha256 = "0bdpjnzyxd6mdc1qv0ml89qds6305kn3wmyci2kv6g2y7r7wxvm2";
+    sha256 = "0qjwqqynvgzainq66fpzczgynwk3hv7wzgfy5271fc6mj2k0zz5x";
   };
 
   buildFlagsArray = ''
@@ -21,13 +21,13 @@ buildGoModule rec {
       -X github.com/rancher/k3d/version.K3sVersion=v${k3sVersion}
   '';
 
-  modSha256 = "1qadf3gc2626l4jpad4lzi649nh8if9m6fgs2cf46r1nish16h95";
+  modSha256 = "0c8bfl0hz5cfhi6jzhhylz051jiix6s7s20fn23w7wri4xaqrjn8";
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/rancher/k3d";
     description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container";
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ kuznero jlesquembre ];
+    maintainers = with maintainers; [ kuznero jlesquembre ngerstle ];
   };
 }

From 3c62152e0e657d83bd86106e14786c627ac358dc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Mar 2020 11:22:58 +0000
Subject: [PATCH 1965/4636] endless-sky: 0.9.10 -> 0.9.11

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

diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix
index 5d1ed1c11a95..f0950cf4d349 100644
--- a/pkgs/games/endless-sky/default.nix
+++ b/pkgs/games/endless-sky/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  version = "0.9.10";
+  version = "0.9.11";
 
 in
 stdenv.mkDerivation {
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
     owner = "endless-sky";
     repo = "endless-sky";
     rev = "v${version}";
-    sha256 = "1wax9qhxakydg6bs92d1jy2fki1n9r0wkps1np02y0pvm1fl189i";
+    sha256 = "0f4svg448bg8qx49f8fr8l4yzks7an6673jwgva15p3zzfxy6w03";
   };
 
   enableParallelBuilding = true;
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "A sandbox-style space exploration game similar to Elite, Escape Velocity, or Star Control";
-    homepage = https://endless-sky.github.io/;
+    homepage = "https://endless-sky.github.io/";
     license = with licenses; [
       gpl3Plus cc-by-sa-30 cc-by-sa-40 publicDomain
     ];

From fe0aaf1f7414b51d586bd75c1c1de2ca4357af13 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Mar 2020 05:17:25 -0800
Subject: [PATCH 1966/4636] gortr: 0.13.0 -> 0.14.1 (#81430)

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

diff --git a/pkgs/servers/gortr/default.nix b/pkgs/servers/gortr/default.nix
index 375631d5cbf8..35c6e1452437 100644
--- a/pkgs/servers/gortr/default.nix
+++ b/pkgs/servers/gortr/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "gortr";
-  version = "0.13.0";
+  version = "0.14.1";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1kg42qynqqj05bvfwzd77mpl63y3gnkk15x2a4rspxf4w1ziaxkr";
+    sha256 = "03wxlras2akk2ig8sxzs89nvbc6zr2kbcmjlqldjdfhs1rcg82ra";
   };
   modSha256 = "157dpalfz3z1s3mxq63xy6lrkwzyy9xzmvn7wsxkwznjq4djv1a1";
 

From cb424d6a689c2f2628c70e4cc58b7e3e71797c9f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Mar 2020 13:37:00 +0000
Subject: [PATCH 1967/4636] libamqpcpp: 4.1.5 -> 4.1.6

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

diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix
index 315d3f499560..bdf081222b6d 100644
--- a/pkgs/development/libraries/libamqpcpp/default.nix
+++ b/pkgs/development/libraries/libamqpcpp/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libamqpcpp";
-  version = "4.1.5";
+  version = "4.1.6";
 
   src = fetchFromGitHub {
     owner = "CopernicaMarketingSoftware";
     repo = "AMQP-CPP";
     rev = "v${version}";
-    sha256 = "1jyvpa68wymnn8wnh8i59pa9kdbixv86mh8q338agnwkmzvlgm58";
+    sha256 = "0cw1apj4qxfxpp0gz4my4656d5ijjj6s2y4rjahhj67h10qj4bd2";
   };
 
   buildInputs = [ openssl ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Library for communicating with a RabbitMQ server";
-    homepage = https://github.com/CopernicaMarketingSoftware/AMQP-CPP;
+    homepage = "https://github.com/CopernicaMarketingSoftware/AMQP-CPP";
     license = licenses.asl20;
     maintainers = [ maintainers.mjp ];
     platforms = platforms.all;

From 43ec75d47083ae4e35ebad14e25dd6249c19f44f Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 28 Feb 2020 12:09:54 -0800
Subject: [PATCH 1968/4636] ipmitool: cleanup expression

* remove no-op substitution of s6_addr16 -> s6_addr

This string doesn't exist anymore in that file.

* clean up configureFlags
---
 pkgs/tools/system/ipmitool/default.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix
index e86dc14b0201..75bfd7126613 100644
--- a/pkgs/tools/system/ipmitool/default.nix
+++ b/pkgs/tools/system/ipmitool/default.nix
@@ -19,19 +19,19 @@ stdenv.mkDerivation {
     })
   ];
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
-    substituteInPlace src/plugins/ipmi_intf.c --replace "s6_addr16" "s6_addr"
-  '';
-
   buildInputs = [ openssl ];
 
-  preConfigure = ''
-    configureFlagsArray=(
-      --infodir=$out/share/info
-      --mandir=$out/share/man
-      ${if static then "LDFLAGS=-static --enable-static --disable-shared" else "--enable-shared"}
-    )
-  '';
+  configureFlags = [
+    "--infodir=${placeholder "out"}/share/info"
+    "--mandir=${placeholder "out"}/share/man"
+  ] ++ stdenv.lib.optionals static [
+    "LDFLAGS=-static"
+    "--enable-static"
+    "--disable-shared"
+  ] ++ stdenv.lib.optionals (!static) [
+    "--enable-shared"
+  ];
+
   makeFlags = stdenv.lib.optional static "AM_LDFLAGS=-all-static";
   dontDisableStatic = static;
 

From 82217553b0e5926bb8f178a31b5511dc0fe895f1 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 1 Mar 2020 08:18:36 -0500
Subject: [PATCH 1969/4636] ipmitool: fix compile on darwin

---
 pkgs/tools/system/ipmitool/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix
index 75bfd7126613..2b6479198c97 100644
--- a/pkgs/tools/system/ipmitool/default.nix
+++ b/pkgs/tools/system/ipmitool/default.nix
@@ -17,6 +17,11 @@ stdenv.mkDerivation {
       url = "https://sources.debian.org/data/main/i/ipmitool/1.8.18-6/debian/patches/0120-openssl1.1.patch";
       sha256 = "1xvsjxb782lzy72bnqqnsk3r5h4zl3na95s4pqn2qg7cic2mnbfk";
     })
+    # Fix build on non-linux systems
+    (fetchpatch {
+      url = "https://github.com/ipmitool/ipmitool/commit/5db314f694f75c575cd7c9ffe9ee57aaf3a88866.patch";
+      sha256 = "01niwrgajhrdhl441gzmw6v1r1yc3i8kn98db4b6smfn5fwdp1pa";
+    })
   ];
 
   buildInputs = [ openssl ];
@@ -39,7 +44,7 @@ stdenv.mkDerivation {
     description = ''Command-line interface to IPMI-enabled devices'';
     license = licenses.bsd3;
     homepage = https://sourceforge.net/projects/ipmitool/;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ fpletz ];
   };
 }

From b19ce7cfe90d984e0d230b967fbbb80a112a204f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 24 Feb 2020 22:21:27 +0100
Subject: [PATCH 1970/4636] netpbm: add updateScript

---
 pkgs/tools/graphics/netpbm/default.nix |  2 ++
 pkgs/tools/graphics/netpbm/update.sh   | 40 ++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100755 pkgs/tools/graphics/netpbm/update.sh

diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index b67e71c0fdf0..903c6336bcda 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -61,6 +61,8 @@ stdenv.mkDerivation {
     done
   '';
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     homepage = http://netpbm.sourceforge.net/;
     description = "Toolkit for manipulation of graphic images";
diff --git a/pkgs/tools/graphics/netpbm/update.sh b/pkgs/tools/graphics/netpbm/update.sh
new file mode 100755
index 000000000000..670e872e951d
--- /dev/null
+++ b/pkgs/tools/graphics/netpbm/update.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -p bash -p subversion -p common-updater-scripts -i bash
+
+die() {
+    echo "error: $1" >&2
+    exit 1
+}
+
+attr=netpbm
+svnRoot=https://svn.code.sf.net/p/netpbm/code/advanced
+
+oldRev=$(nix-instantiate --eval -E "with import ./. {}; $attr.src.rev" | tr -d '"')
+if [[ -z "$oldRev" ]]; then
+    die "Could not extract old revision."
+fi
+
+latestRev=$(svn info --show-item "last-changed-revision" "$svnRoot")
+if [[ -z "$latestRev" ]]; then
+    die "Could not find out last changed revision."
+fi
+
+versionInfo=$(svn cat -r "$latestRev" "$svnRoot/version.mk")
+if [[ -z "$versionInfo" ]]; then
+    die "Could not get version info."
+fi
+
+nixFile=$(nix-instantiate --eval --strict -A "$attr.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/')
+if [[ ! -f "$nixFile" ]]; then
+    die "Could not evaluate '$attr.meta.position' to locate the .nix file!"
+fi
+
+# h remembers if we found the pattern; on the last line, if a pattern was previously found, we exit with 1
+# https://stackoverflow.com/a/12145797/160386
+sed -i "$nixFile" -re '/(\brev\b\s*=\s*)"'"$oldRev"'"/{ s||\1"'"$latestRev"'"|; h }; ${x; /./{x; q1}; x}' && die "Unable to update revision."
+
+majorRelease=$(grep --perl-regex --only-matching 'NETPBM_MAJOR_RELEASE = \K.+' <<< "$versionInfo")
+minorRelease=$(grep --perl-regex --only-matching 'NETPBM_MINOR_RELEASE = \K.+' <<< "$versionInfo")
+pointRelease=$(grep --perl-regex --only-matching 'NETPBM_POINT_RELEASE = \K.+' <<< "$versionInfo")
+
+update-source-version "$attr" "$majorRelease.$minorRelease.$pointRelease"

From 8ea075bcb9b959f48fa0100bc94cae17713b31ea Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 20 Feb 2020 08:53:04 +0100
Subject: [PATCH 1971/4636] netpbm: Clean up

* Format with nixpkgs-fmt
* Move build tools to nativeBuildInputs
* Clarify license
---
 pkgs/tools/graphics/netpbm/default.nix | 41 ++++++++++++++++++++------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index 903c6336bcda..b5a46f22533d 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -1,6 +1,18 @@
-{ lib, stdenv, fetchsvn, pkgconfig, libjpeg, libpng, flex, zlib, perl, libxml2
-, makeWrapper, libtiff
-, enableX11 ? false, libX11 }:
+{ lib
+, stdenv
+, fetchsvn
+, pkgconfig
+, libjpeg
+, libpng
+, flex
+, zlib
+, perl
+, libxml2
+, makeWrapper
+, libtiff
+, enableX11 ? false
+, libX11
+}:
 
 stdenv.mkDerivation {
   # Determine version and revision from:
@@ -18,9 +30,20 @@ stdenv.mkDerivation {
       --replace '"-dSAFER"' '"-dPARANOIDSAFER"'
   '';
 
-  buildInputs =
-    [ pkgconfig flex zlib perl libpng libjpeg libxml2 makeWrapper libtiff ]
-    ++ lib.optional enableX11 libX11;
+  nativeBuildInputs = [
+    pkgconfig
+    flex
+    makeWrapper
+  ];
+
+  buildInputs = [
+    zlib
+    perl
+    libpng
+    libjpeg
+    libxml2
+    libtiff
+  ] ++ lib.optional enableX11 libX11;
 
   configurePhase = ''
     cp config.mk.in config.mk
@@ -30,7 +53,7 @@ stdenv.mkDerivation {
         --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff.dev}/include" \
         --replace "JPEGLIB = NONE" "JPEGLIB = ${libjpeg.out}/lib/libjpeg.so" \
         --replace "JPEGHDR_DIR =" "JPEGHDR_DIR = ${libjpeg.dev}/include"
-   '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
     echo "LDSHLIB=-dynamiclib -install_name $out/lib/libnetpbm.\$(MAJ).dylib" >> config.mk
     echo "NETPBMLIBTYPE = dylib" >> config.mk
     echo "NETPBMLIBSUFFIX = dylib" >> config.mk
@@ -64,9 +87,9 @@ stdenv.mkDerivation {
   passthru.updateScript = ./update.sh;
 
   meta = {
-    homepage = http://netpbm.sourceforge.net/;
+    homepage = "http://netpbm.sourceforge.net/";
     description = "Toolkit for manipulation of graphic images";
-    license = "GPL,free";
+    license = lib.licenses.free; # http://netpbm.svn.code.sourceforge.net/p/netpbm/code/trunk/doc/copyright_summary
     platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }

From 6b4d057b667e0f05fe36bd385aa81dc69f709bc3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 25 Feb 2020 00:03:06 +0100
Subject: [PATCH 1972/4636] netpbm: add pre/post phase hooks

---
 pkgs/tools/graphics/netpbm/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index b5a46f22533d..9e6e95114065 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -46,6 +46,8 @@ stdenv.mkDerivation {
   ] ++ lib.optional enableX11 libX11;
 
   configurePhase = ''
+    runHook preConfigure
+
     cp config.mk.in config.mk
     echo "STATICLIB_TOO = n" >> config.mk
     substituteInPlace "config.mk" \
@@ -57,6 +59,8 @@ stdenv.mkDerivation {
     echo "LDSHLIB=-dynamiclib -install_name $out/lib/libnetpbm.\$(MAJ).dylib" >> config.mk
     echo "NETPBMLIBTYPE = dylib" >> config.mk
     echo "NETPBMLIBSUFFIX = dylib" >> config.mk
+
+    runHook postConfigure
   '';
 
   preBuild = ''
@@ -71,6 +75,8 @@ stdenv.mkDerivation {
   enableParallelBuilding = false;
 
   installPhase = ''
+    runHook preInstall
+
     make package pkgdir=$out
 
     rm -rf $out/link $out/*_template $out/{pkginfo,README,VERSION} $out/man/web
@@ -82,6 +88,8 @@ stdenv.mkDerivation {
     for prog in ppmquant; do
         wrapProgram "$out/bin/$prog" --prefix PATH : "$out/bin"
     done
+
+    runHook postInstall
   '';
 
   passthru.updateScript = ./update.sh;

From aa1aefd06a135f88a87e871dba3a1665130d3d8d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 24 Feb 2020 22:21:55 +0100
Subject: [PATCH 1973/4636] =?UTF-8?q?netpbm:=2010.82.01=20=E2=86=92=2010.8?=
 =?UTF-8?q?9.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://sourceforge.net/p/netpbm/code/3735/tree//advanced/doc/HISTORY
---
 pkgs/tools/graphics/netpbm/default.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index 9e6e95114065..99946c5a9e5b 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -17,17 +17,22 @@
 stdenv.mkDerivation {
   # Determine version and revision from:
   # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced
-  name = "netpbm-10.82.01";
+  name = "netpbm-10.89.1";
 
   src = fetchsvn {
     url = "https://svn.code.sf.net/p/netpbm/code/advanced";
-    rev = "3264";
-    sha256 = "17fmyjbxp1l18rma7gb0m8wd9kx2iwhqs8dd6fpalsn2cr8mf8hf";
+    rev = "3735";
+    sha256 = "hRepEUBlf83p77Amjze+Qz7XTHhCuPdV01K/UabR89Q=";
   };
 
-  postPatch = /* CVE-2005-2471, from Arch */ ''
+  postPatch = ''
+    # CVE-2005-2471, from Arch
     substituteInPlace converter/other/pstopnm.c \
       --replace '"-dSAFER"' '"-dPARANOIDSAFER"'
+
+    # Install libnetpbm.so symlink to correct destination
+    substituteInPlace lib/Makefile \
+      --replace '/sharedlink' '/lib'
   '';
 
   nativeBuildInputs = [
@@ -79,7 +84,7 @@ stdenv.mkDerivation {
 
     make package pkgdir=$out
 
-    rm -rf $out/link $out/*_template $out/{pkginfo,README,VERSION} $out/man/web
+    rm -rf $out/*_template $out/{pkginfo,README,VERSION} $out/man/web
 
     mkdir -p $out/share/netpbm
     mv $out/misc $out/share/netpbm/

From 90180905a2557aefaf4f9ca5416968d829254861 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 26 Feb 2020 00:14:24 +0100
Subject: [PATCH 1974/4636] netpbm: Fix tiff support

The build script check whether JPEGLIB and ZLIB are not set to NONE.
We did not set the latter as pkg-config handles zlib requirement
for libpng dependency and the comment in config.mk only talks about
zlib being needed for libpng.

Since libtiff only needs libz for static linking, we turn TIFFLIB_NEEDS_ZLIB
off instead of pointlessly setting ZLIB value.

Closes: https://github.com/NixOS/nixpkgs/issues/75156
---
 pkgs/tools/graphics/netpbm/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index 99946c5a9e5b..2755b6b2a0e5 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -58,6 +58,8 @@ stdenv.mkDerivation {
     substituteInPlace "config.mk" \
         --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff.out}/lib/libtiff.so" \
         --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff.dev}/include" \
+        --replace "TIFFLIB_NEEDS_JPEG = Y" "TIFFLIB_NEEDS_JPEG = N" \
+        --replace "TIFFLIB_NEEDS_Z = Y" "TIFFLIB_NEEDS_Z = N" \
         --replace "JPEGLIB = NONE" "JPEGLIB = ${libjpeg.out}/lib/libjpeg.so" \
         --replace "JPEGHDR_DIR =" "JPEGHDR_DIR = ${libjpeg.dev}/include"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''

From 95558343993bcae045b955dfc96737ba733e1c69 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 26 Feb 2020 00:41:09 +0100
Subject: [PATCH 1975/4636] netpbm: split into multiple outputs

---
 pkgs/applications/editors/texmacs/darwin.nix         |  2 +-
 .../science/electronics/fped/default.nix             |  2 +-
 pkgs/tools/graphics/netpbm/default.nix               |  4 ++++
 pkgs/tools/graphics/pfstools/default.nix             |  6 +++---
 pkgs/tools/graphics/sng/default.nix                  |  2 +-
 pkgs/tools/misc/yad/default.nix                      |  2 +-
 pkgs/tools/text/groff/default.nix                    | 12 ++++++------
 7 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/editors/texmacs/darwin.nix b/pkgs/applications/editors/texmacs/darwin.nix
index 5d5843890e14..a5117f3a6786 100644
--- a/pkgs/applications/editors/texmacs/darwin.nix
+++ b/pkgs/applications/editors/texmacs/darwin.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
     "${ghostscript}/bin:" +
     (if aspell == null then "" else "${aspell}/bin:") +
     (if tex == null then "" else "${tex}/bin:") +
-    (if netpbm == null then "" else "${netpbm}/bin:") +
+    (if netpbm == null then "" else "${stdenv.lib.getBin netpbm}/bin:") +
     (if imagemagick == null then "" else "${imagemagick}/bin:");
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix
index 4eb666ada7ce..f93fddba8cb5 100644
--- a/pkgs/applications/science/electronics/fped/default.nix
+++ b/pkgs/applications/science/electronics/fped/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   makeFlags = [
     "PREFIX=${placeholder "out"}"
     "LEX=flex"
-    "RGBDEF=${netpbm}/share/netpbm/misc/rgb.txt"
+    "RGBDEF=${netpbm.out}/share/netpbm/misc/rgb.txt"
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index 2755b6b2a0e5..f50b9d63f002 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -19,6 +19,8 @@ stdenv.mkDerivation {
   # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced
   name = "netpbm-10.89.1";
 
+  outputs = [ "bin" "out" "dev" ];
+
   src = fetchsvn {
     url = "https://svn.code.sf.net/p/netpbm/code/advanced";
     rev = "3735";
@@ -96,6 +98,8 @@ stdenv.mkDerivation {
         wrapProgram "$out/bin/$prog" --prefix PATH : "$out/bin"
     done
 
+    moveToOutput bin "''${!outputBin}"
+
     runHook postInstall
   '';
 
diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix
index 6a0385614e87..668f73c04f42 100644
--- a/pkgs/tools/graphics/pfstools/default.nix
+++ b/pkgs/tools/graphics/pfstools/default.nix
@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     rm cmake/FindNETPBM.cmake
-    echo "SET(NETPBM_LIBRARY `find ${netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake
-    echo "SET(NETPBM_LIBRARIES `find ${netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake
-    echo "SET(NETPBM_INCLUDE_DIR ${netpbm}/include/netpbm)" >> cmake/FindNETPBM.cmake
+    echo "SET(NETPBM_LIBRARY `find ${stdenv.lib.getLib netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake
+    echo "SET(NETPBM_LIBRARIES `find ${stdenv.lib.getLib netpbm} -name "*.${stdenv.hostPlatform.extensions.sharedLibrary}*" -type f`)" >> cmake/FindNETPBM.cmake
+    echo "SET(NETPBM_INCLUDE_DIR ${stdenv.lib.getDev netpbm}/include/netpbm)" >> cmake/FindNETPBM.cmake
     echo "INCLUDE(FindPackageHandleStandardArgs)" >> cmake/FindNETPBM.cmake
     echo "FIND_PACKAGE_HANDLE_STANDARD_ARGS(NETPBM DEFAULT_MSG NETPBM_LIBRARY NETPBM_INCLUDE_DIR)" >> cmake/FindNETPBM.cmake
   '';
diff --git a/pkgs/tools/graphics/sng/default.nix b/pkgs/tools/graphics/sng/default.nix
index c7d2f49406b7..71bf0160a1e1 100644
--- a/pkgs/tools/graphics/sng/default.nix
+++ b/pkgs/tools/graphics/sng/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libpng ];
 
   configureFlags = [
-    "--with-rgbtxt=${netpbm}/share/netpbm/misc/rgb.txt"
+    "--with-rgbtxt=${netpbm.out}/share/netpbm/misc/rgb.txt"
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix
index 776b41ac1aaf..d6b1b423ae2f 100644
--- a/pkgs/tools/misc/yad/default.nix
+++ b/pkgs/tools/misc/yad/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     sed -i src/form.c -e '21i#include <stdlib.h>'
 
     # there is no point to bring in the whole netpbm package just for this file
-    install -Dm644 ${netpbm}/share/netpbm/misc/rgb.txt $out/share/yad/rgb.txt
+    install -Dm644 ${netpbm.out}/share/netpbm/misc/rgb.txt $out/share/yad/rgb.txt
   '';
 
   postAutoreconf = ''
diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix
index ec7e724d1fc3..391e7543eca5 100644
--- a/pkgs/tools/text/groff/default.nix
+++ b/pkgs/tools/text/groff/default.nix
@@ -29,13 +29,13 @@ stdenv.mkDerivation rec {
       --replace "psselect" "${psutils}/bin/psselect"
   '' + stdenv.lib.optionalString (netpbm != null) ''
     substituteInPlace src/preproc/html/pre-html.cpp \
-      --replace "pnmcut" "${netpbm}/bin/pnmcut" \
-      --replace "pnmcrop" "${netpbm}/bin/pnmcrop" \
-      --replace "pnmtopng" "${netpbm}/bin/pnmtopng"
+      --replace "pnmcut" "${stdenv.lib.getBin netpbm}/bin/pnmcut" \
+      --replace "pnmcrop" "${stdenv.lib.getBin netpbm}/bin/pnmcrop" \
+      --replace "pnmtopng" "${stdenv.lib.getBin netpbm}/bin/pnmtopng"
     substituteInPlace tmac/www.tmac \
-      --replace "pnmcrop" "${netpbm}/bin/pnmcrop" \
-      --replace "pngtopnm" "${netpbm}/bin/pngtopnm" \
-      --replace "@PNMTOPS_NOSETPAGE@" "${netpbm}/bin/pnmtops -nosetpage"
+      --replace "pnmcrop" "${stdenv.lib.getBin netpbm}/bin/pnmcrop" \
+      --replace "pngtopnm" "${stdenv.lib.getBin netpbm}/bin/pngtopnm" \
+      --replace "@PNMTOPS_NOSETPAGE@" "${stdenv.lib.getBin netpbm}/bin/pnmtops -nosetpage"
   '';
 
   buildInputs = [ ghostscript psutils netpbm perl ];

From c3b331a7771386d2d56186a275ab802a80897a47 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 1 Mar 2020 15:04:33 +0100
Subject: [PATCH 1976/4636] bandwhich: 0.11.0 -> 0.12.0

https://github.com/imsnif/bandwhich/releases/tag/0.12.0
---
 pkgs/tools/networking/bandwhich/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix
index e42de87f58be..1cee7ecdc218 100644
--- a/pkgs/tools/networking/bandwhich/default.nix
+++ b/pkgs/tools/networking/bandwhich/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bandwhich";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "imsnif";
     repo = pname;
     rev = version;
-    sha256 = "1c4lndrr7xndgp60zcdjqpciwibm9sjwwrd3921fyz4jg44g76zy";
+    sha256 = "0vg2fkjksjysm5ckdlfswg8w7f52wkh417l7k96hghg9ni4yz575";
   };
 
-  cargoSha256 = "1jnkfiyp5mlwm6bn7i66g5vbbrhps2avlmbilip4346m2j8qc2qv";
+  cargoSha256 = "1cyra3mqxpi3m1gqrc5dmjykpsw6swq695dsqirhgb6qxcclxw7p";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 

From 256f7172ac1e59721c3aaf2498b57f2f651803e3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 1 Mar 2020 14:57:51 +0100
Subject: [PATCH 1977/4636] netpbm: more clean ups

* Append to config.mk instead of substituting
* Remove unused path substitution (rgbpaths.patch was deleted in https://github.com/NixOS/nixpkgs/commit/f6c28984f2568e3eee4ce988364075a31636b4f3)
* -lz in LDFLAGS does not seem to be necessary
* Touching the file (introduced in https://github.com/NixOS/nixpkgs/commit/4dd9507b835fd0b8ff556a1c547601a9ac1857ae) does not seem to be necessary.
---
 pkgs/tools/graphics/netpbm/default.nix | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index f50b9d63f002..792173473810 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -56,14 +56,15 @@ stdenv.mkDerivation {
     runHook preConfigure
 
     cp config.mk.in config.mk
-    echo "STATICLIB_TOO = n" >> config.mk
-    substituteInPlace "config.mk" \
-        --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff.out}/lib/libtiff.so" \
-        --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff.dev}/include" \
-        --replace "TIFFLIB_NEEDS_JPEG = Y" "TIFFLIB_NEEDS_JPEG = N" \
-        --replace "TIFFLIB_NEEDS_Z = Y" "TIFFLIB_NEEDS_Z = N" \
-        --replace "JPEGLIB = NONE" "JPEGLIB = ${libjpeg.out}/lib/libjpeg.so" \
-        --replace "JPEGHDR_DIR =" "JPEGHDR_DIR = ${libjpeg.dev}/include"
+
+    # Disable building static library
+    echo "STATICLIB_TOO = N" >> config.mk
+
+    # Use libraries from Nixpkgs
+    echo "TIFFLIB = libtiff.so" >> config.mk
+    echo "TIFFLIB_NEEDS_JPEG = N" >> config.mk
+    echo "TIFFLIB_NEEDS_Z = N" >> config.mk
+    echo "JPEGLIB = libjpeg.so" >> config.mk
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     echo "LDSHLIB=-dynamiclib -install_name $out/lib/libnetpbm.\$(MAJ).dylib" >> config.mk
     echo "NETPBMLIBTYPE = dylib" >> config.mk
@@ -72,15 +73,6 @@ stdenv.mkDerivation {
     runHook postConfigure
   '';
 
-  preBuild = ''
-    export LDFLAGS="-lz"
-    substituteInPlace "pm_config.in.h" \
-        --subst-var-by "rgbPath1" "$out/lib/rgb.txt" \
-        --subst-var-by "rgbPath2" "/var/empty/rgb.txt" \
-        --subst-var-by "rgbPath3" "/var/empty/rgb.txt"
-    touch lib/standardppmdfont.c
-  '';
-
   enableParallelBuilding = false;
 
   installPhase = ''

From 44f69611ad87338f9730482f0eede74be9ae38c3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 1 Mar 2020 15:04:36 +0100
Subject: [PATCH 1978/4636] netpbm: re-enable parallel building

It was disabled in https://github.com/NixOS/nixpkgs/commit/abd3c246a43ea5e2128d3372b5fe0295f18cad78 but it no longer seems to fail.
---
 pkgs/tools/graphics/netpbm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index 792173473810..e0d44dc723bf 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation {
     runHook postConfigure
   '';
 
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
 
   installPhase = ''
     runHook preInstall

From 8acbc62f4ee1d9546dfafc0972fb08286584625a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 1 Mar 2020 09:19:55 -0500
Subject: [PATCH 1979/4636] pantheon.elementary-code: 3.2.0 -> 3.3.0

https://github.com/elementary/code/releases/tag/3.3.0
---
 pkgs/desktops/pantheon/apps/elementary-code/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
index d92f24d615e0..148b82fd84a0 100644
--- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
@@ -27,7 +27,7 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-code";
-  version = "3.2.0";
+  version = "3.3.0";
 
   repoName = "code";
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = repoName;
     rev = version;
-    sha256 = "0sdh22dc38qikak9iyrw402ap6zxckg9vkfppvv526jg88cckibd";
+    sha256 = "0v544zw99wjcy0bflaci9fssx4sibz4b05bxs3a7j8hrpl102r4w";
   };
 
   passthru = {

From dab121ac69d12b22ab7177b647e55996bd3056c9 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 1 Mar 2020 09:20:53 -0500
Subject: [PATCH 1980/4636] pantheon.elementary-gtk-theme: 5.4.1 -> 5.4.2

https://github.com/elementary/stylesheet/compare/5.4.1...5.4.2
---
 .../pantheon/artwork/elementary-gtk-theme/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
index 25c3f2201ef1..c1af68e8d5ba 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-gtk-theme";
-  version = "5.4.1";
+  version = "5.4.2";
 
   repoName = "stylesheet";
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = repoName;
     rev = version;
-    sha256 = "0fnh08wqlhvigkxp69xkdha19ny9j0hg4ycwhhwvyr0d0z47kilw";
+    sha256 = "0aqq0d21mqgrfiyhpfa8k51wxw2pia0qlsgp0sli79v7nwn3ykbq";
   };
 
   passthru = {

From 4b771aa2e6064cc20dfbeb1fd4f0d2e491841da0 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 1 Mar 2020 09:26:11 -0500
Subject: [PATCH 1981/4636] ideogram: 1.3.2 -> 1.3.3

better icon https://github.com/cassidyjames/ideogram/releases/tag/1.3.3
---
 pkgs/applications/graphics/ideogram/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix
index 386916083bb6..3e17a045ecc1 100644
--- a/pkgs/applications/graphics/ideogram/default.nix
+++ b/pkgs/applications/graphics/ideogram/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ideogram";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchFromGitHub {
     owner = "cassidyjames";
     repo = pname;
     rev = version;
-    sha256 = "08nl11gj3234nrqyigqkq3yiyrqf2hha24x5jkl78ypj2xhcnhw8";
+    sha256 = "1zkr7x022khn5g3sq2dkxzy1hiiz66vl81s3i5sb9qr88znh79p1";
   };
 
   nativeBuildInputs = [

From 43ea7f1c0a1611250dddfda076fb3fc1962702fe Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 1 Mar 2020 15:38:32 +0100
Subject: [PATCH 1982/4636] netpbm: Hardcode rgb.txt path

We did that in the past with rgbpaths.patch in the past but it was eventually removed. This fixes the regression.
---
 pkgs/tools/graphics/netpbm/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index e0d44dc723bf..78c12e3b8dce 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -65,6 +65,9 @@ stdenv.mkDerivation {
     echo "TIFFLIB_NEEDS_JPEG = N" >> config.mk
     echo "TIFFLIB_NEEDS_Z = N" >> config.mk
     echo "JPEGLIB = libjpeg.so" >> config.mk
+
+    # Fix path to rgb.txt
+    echo "RGB_DB_PATH = $out/share/netpbm/misc/rgb.txt" >> config.mk
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     echo "LDSHLIB=-dynamiclib -install_name $out/lib/libnetpbm.\$(MAJ).dylib" >> config.mk
     echo "NETPBMLIBTYPE = dylib" >> config.mk

From e50306dfe3c70095387ce2b3a87c63ebb4b9fe6d Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 1 Mar 2020 09:51:43 -0500
Subject: [PATCH 1983/4636] libgpod: also remove mutagen

I think this was my mistake. This is also a python2 dependency
that should have been removed with pygobject.
---
 pkgs/development/libraries/libgpod/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix
index 063588e9f1e5..5c25a4d5abf6 100644
--- a/pkgs/development/libraries/libgpod/default.nix
+++ b/pkgs/development/libraries/libgpod/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, gettext, perlPackages, intltool, pkgconfig, glib,
   libxml2, sqlite, zlib, sg3_utils, gdk-pixbuf, taglib,
-  libimobiledevice, mutagen,
+  libimobiledevice,
   monoSupport ? false, mono, gtk-sharp-2_0
 }:
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   dontStrip = true;
 
   propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils
-    gdk-pixbuf taglib libimobiledevice  mutagen ];
+    gdk-pixbuf taglib libimobiledevice ];
 
   nativeBuildInputs = [ gettext intltool pkgconfig ]
     ++ (with perlPackages; [ perl XMLParser ])
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 409a2d9f79fa..404953a78294 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4062,7 +4062,7 @@ in
   pixd = callPackage ../tools/misc/pixd { };
 
   hey = callPackage ../tools/networking/hey { };
-  
+
   hhpc = callPackage ../tools/misc/hhpc { };
 
   hiera-eyaml = callPackage ../tools/system/hiera-eyaml { };
@@ -12647,9 +12647,7 @@ in
 
   libgpiod = callPackage ../development/libraries/libgpiod { };
 
-  libgpod = callPackage ../development/libraries/libgpod {
-    inherit (pkgs.pythonPackages) mutagen;
-  };
+  libgpod = callPackage ../development/libraries/libgpod { };
 
   libgssglue = callPackage ../development/libraries/libgssglue { };
 

From 917b0884903cf6d955a148610524563f451f9858 Mon Sep 17 00:00:00 2001
From: Thibault Gagnaux <thibault@gagnaux.ch>
Date: Sun, 1 Mar 2020 15:53:39 +0100
Subject: [PATCH 1984/4636] iterm2: 3.0.14 -> 3.3.9 & fix build

---
 pkgs/applications/misc/iterm2/default.nix | 33 +++++++++++++++++------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/iterm2/default.nix b/pkgs/applications/misc/iterm2/default.nix
index d63576d5cbd0..db60644bfbbc 100644
--- a/pkgs/applications/misc/iterm2/default.nix
+++ b/pkgs/applications/misc/iterm2/default.nix
@@ -1,31 +1,48 @@
 { stdenv, fetchFromGitHub }:
 
+ /*
+ This derivation is impure: it relies on an Xcode toolchain being installed
+ and available in the expected place. The values of sandboxProfile
+ are copied pretty directly from the MacVim derivation, which
+ is also impure. In order to build you at least need the `build-use-chroot`
+ option set to `relaxed` or set the `sandbox` option to `false`.
+ */
+
 stdenv.mkDerivation rec {
   pname = "iterm2";
-  version = "3.0.14";
+  version = "3.3.9";
 
   src = fetchFromGitHub {
     owner = "gnachman";
     repo = "iTerm2";
     rev = "v${version}";
-    sha256 = "03m0ja11w9910z96yi8fzq3436y8xl14q031rdb2w3sapjd54qrj";
+    sha256 = "06mq3gfjgy8jw2f3fzdsi3pbfkdijfzzlhlw6ixa5bfb4hbcgn5j";
   };
 
   patches = [ ./disable_updates.patch ];
   postPatch = ''
     sed -i -e 's/CODE_SIGN_IDENTITY = "Developer ID Application"/CODE_SIGN_IDENTITY = ""/g' ./iTerm2.xcodeproj/project.pbxproj
   '';
+
   preConfigure = "LD=$CC";
-  makeFlagsArray = ["Deployment"];
+  makeFlagsArray = ["Nix"];
   installPhase = ''
-    mkdir -p "$out/Applications"
-    mv "build/Deployment/iTerm2.app" "$out/Applications/iTerm.app"
+    mkdir -p $out/Applications
+    mv Build/Products/Deployment/iTerm2.app $out/Applications/iTerm.app
   '';
 
-  meta = {
+  sandboxProfile = ''
+     (allow file-read* file-write* process-exec mach-lookup)
+     ; block homebrew dependencies
+     (deny file-read* file-write* process-exec mach-lookup (subpath "/usr/local") (with no-log))
+  '';
+
+  meta = with stdenv.lib; {
     description = "A replacement for Terminal and the successor to iTerm";
     homepage = https://www.iterm2.com/;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.darwin;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ tricktron ];
+    platforms = platforms.darwin;
+    hydraPlatforms = [];
   };
 }

From 7566c09a0cccbf184846ee0d5e49973994d13b35 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 1 Mar 2020 16:14:38 +0100
Subject: [PATCH 1985/4636] netpbm: Remove "CVE" patch

The CVE was patched upstream long ago.

http://cve.circl.lu/cve/CVE-2005-2471

-dPARANOIDSAFER seems not to be supported any more.

https://phabricator.wikimedia.org/T136402#2338482
https://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=79a06b45e784e6839b2b2129cd2620ea606254e1
---
 pkgs/tools/graphics/netpbm/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index 78c12e3b8dce..8f3a5ea274ec 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -28,10 +28,6 @@ stdenv.mkDerivation {
   };
 
   postPatch = ''
-    # CVE-2005-2471, from Arch
-    substituteInPlace converter/other/pstopnm.c \
-      --replace '"-dSAFER"' '"-dPARANOIDSAFER"'
-
     # Install libnetpbm.so symlink to correct destination
     substituteInPlace lib/Makefile \
       --replace '/sharedlink' '/lib'

From 1e41aa803044f77802c6764bd8b77c92d1540914 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 1 Mar 2020 10:40:36 -0500
Subject: [PATCH 1986/4636] linux: 5.6-rc2 -> 5.6-rc3

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 81e39ad647cd..77a4327e89f9 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.6-rc2";
+  version = "5.6-rc3";
   extraMeta.branch = "5.6";
 
   # modDirVersion needs to be x.y.z, will always add .0
@@ -11,7 +11,7 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "1b3ds8dv5rc9f4c3czj689dxbl8lyrmnfk6ywa51h9vx3lsd5jrp";
+    sha256 = "1w265k9rspg9rkmay6cy6r1rxy4javpj1f6ify4jc3zpwqmp4ymk";
   };
 
   # Should the testing kernels ever be built on Hydra?

From 4e1f77e9aa470a829ee8ae268b67b22efabce8a5 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 1 Mar 2020 17:42:20 +0100
Subject: [PATCH 1987/4636] wob: 0.7 -> 0.8

---
 pkgs/tools/misc/wob/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/wob/default.nix b/pkgs/tools/misc/wob/default.nix
index e2c5bd744e53..d9ea0648ebe4 100644
--- a/pkgs/tools/misc/wob/default.nix
+++ b/pkgs/tools/misc/wob/default.nix
@@ -5,20 +5,15 @@
 
 stdenv.mkDerivation rec {
   pname = "wob";
-  version = "0.7";
+  version = "0.8";
 
   src = fetchFromGitHub {
     owner = "francma";
     repo = pname;
     rev = version;
-    sha256 = "1j3l4v9iqhidn1b6vx86px9hz5wbsbgj3zy2jzwf9204k5sfv715";
+    sha256 = "0gzqc75wjm3yj81rm03zkp5lvsmlhhp79qlz85yyan1gcz5spdb6";
   };
 
-  postPatch = ''
-    substituteInPlace meson.build \
-      --replace "version: '0.6'" "version: '${version}'"
-  '';
-
   nativeBuildInputs = [ meson ninja pkg-config scdoc wayland ];
   buildInputs = [ wayland-protocols ]
     ++ stdenv.lib.optional stdenv.isLinux libseccomp;

From f0004b41baa68199799b6f1af255c0f41ec65658 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <brightone@protonmail.com>
Date: Sun, 1 Mar 2020 18:29:18 +0200
Subject: [PATCH 1988/4636] lazygit: 0.14.3 -> 0.15.7

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

diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix
index aaccfe8ee762..37c6396e2e3a 100644
--- a/pkgs/development/tools/lazygit/default.nix
+++ b/pkgs/development/tools/lazygit/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "lazygit";
-  version = "0.14.3";
+  version = "0.15.7";
 
   goPackagePath = "github.com/jesseduffield/lazygit";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "jesseduffield";
     repo = pname;
     rev = "v${version}";
-    sha256 = "163d05081yrbnzvpkjd7knsl50pkqg9g22ncc2hi54i1i0h5pp80";
+    sha256 = "18scwla36bjpylha4fwis0aa333r14bavzd7xhx4677xgaz7l73j";
   };
 
   meta = with stdenv.lib; {

From 31f2ff1d618ba7d8e16ffb210811c9c41f745c5d Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 1 Mar 2020 18:24:57 +0100
Subject: [PATCH 1989/4636] wf-recorder: 0.1 -> 0.2

---
 .../video/wf-recorder/default.nix             | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/applications/video/wf-recorder/default.nix
index d52a4a6ab9b9..ef98239f32f2 100644
--- a/pkgs/applications/video/wf-recorder/default.nix
+++ b/pkgs/applications/video/wf-recorder/default.nix
@@ -1,26 +1,29 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, wayland, wayland-protocols
-, ffmpeg, x264, libpulseaudio
+{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland, scdoc
+, wayland-protocols, ffmpeg_4, x264, libpulseaudio, ocl-icd, opencl-headers
 }:
 
 stdenv.mkDerivation rec {
   pname = "wf-recorder";
-  version = "0.1";
+  version = "0.2";
 
   src = fetchFromGitHub {
     owner = "ammen99";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1rl75r87ijja9mfyrwrsz8r4zvjnhm0103qmgyhq2phlrdpkks5d";
+    sha256 = "1772hrd7j8b32y65x5c392kdijlcn13iqg9hrlagfar92102vsbf";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig ];
-  buildInputs = [ wayland wayland-protocols ffmpeg x264 libpulseaudio ];
+  nativeBuildInputs = [ meson ninja pkg-config wayland scdoc ];
+  buildInputs = [
+    wayland-protocols ffmpeg_4 x264 libpulseaudio ocl-icd opencl-headers
+  ];
 
   meta = with stdenv.lib; {
     description = "Utility program for screen recording of wlroots-based compositors";
-    homepage = https://github.com/ammen99/wf-recorder;
+    inherit (src.meta) homepage;
+    changelog = "https://github.com/ammen99/wf-recorder/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ CrazedProgrammer ];
+    maintainers = with maintainers; [ primeos CrazedProgrammer ];
     platforms = platforms.linux;
   };
 }

From 655dff2ef02584a0c07a3f6e0e31c80580d69df0 Mon Sep 17 00:00:00 2001
From: Thibault Gagnaux <thibault@gagnaux.ch>
Date: Sun, 1 Mar 2020 19:30:17 +0100
Subject: [PATCH 1990/4636] Corrects comment: `build-use-chroot` is the same as
 `sandbox`.

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

diff --git a/pkgs/applications/misc/iterm2/default.nix b/pkgs/applications/misc/iterm2/default.nix
index db60644bfbbc..cabe306defc8 100644
--- a/pkgs/applications/misc/iterm2/default.nix
+++ b/pkgs/applications/misc/iterm2/default.nix
@@ -4,8 +4,8 @@
  This derivation is impure: it relies on an Xcode toolchain being installed
  and available in the expected place. The values of sandboxProfile
  are copied pretty directly from the MacVim derivation, which
- is also impure. In order to build you at least need the `build-use-chroot`
- option set to `relaxed` or set the `sandbox` option to `false`.
+ is also impure. In order to build you at least need the `sandbox`
+ option set to `relaxed` or `false`.
  */
 
 stdenv.mkDerivation rec {

From b7b46d01846c7163dca82cd8fffd7fd936a26e44 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 1 Mar 2020 13:42:46 -0500
Subject: [PATCH 1991/4636] doc/xfce: remove trailing code

---
 nixos/doc/manual/configuration/xfce.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml
index a81a327c09b6..ebf1f493c5ce 100644
--- a/nixos/doc/manual/configuration/xfce.xml
+++ b/nixos/doc/manual/configuration/xfce.xml
@@ -9,7 +9,6 @@
 <programlisting>
 <xref linkend="opt-services.xserver.desktopManager.xfce.enable" /> = true;
 <xref linkend="opt-services.xserver.displayManager.defaultSession" /> = "xfce";
-};
 </programlisting>
  </para>
  <para>

From 7ff2e7c96e150c3c5f46784f2fcffa8a25400dc9 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 1 Mar 2020 18:49:17 +0000
Subject: [PATCH 1992/4636] elpa-packages: 2020-03-01

---
 .../editors/emacs-modes/elpa-generated.nix    | 169 ++++++++++--------
 1 file changed, 92 insertions(+), 77 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 9d4fb66f7322..56624498aeac 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -39,10 +39,10 @@
       elpaBuild {
         pname = "ada-mode";
         ename = "ada-mode";
-        version = "6.2.1";
+        version = "7.0.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ada-mode-6.2.1.tar";
-          sha256 = "0lg2y28qs8ls70d43ikhy5zcwadh5ddfw4k59p7sqb79w0y3lbnq";
+          url = "https://elpa.gnu.org/packages/ada-mode-7.0.1.tar";
+          sha256 = "0iqninv4wf4ap8axk9m0gi39j3kq4jpbpdc8hczd34xrp83ml46a";
         };
         packageRequires = [ emacs uniquify-files wisi ];
         meta = {
@@ -343,10 +343,10 @@
       elpaBuild {
         pname = "bnf-mode";
         ename = "bnf-mode";
-        version = "0.4.2";
+        version = "0.4.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/bnf-mode-0.4.2.tar";
-          sha256 = "04wl563hxgjbhz6hhwvysdfvdni9fm7kahy5wxkyqxi1sy64gn7d";
+          url = "https://elpa.gnu.org/packages/bnf-mode-0.4.3.tar";
+          sha256 = "1hdhk6kw50vsixprrri0jb5i1c2y94ihifipqgq6kil7y4blr614";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -557,10 +557,10 @@
       elpaBuild {
         pname = "company";
         ename = "company";
-        version = "0.9.11";
+        version = "0.9.12";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/company-0.9.11.tar";
-          sha256 = "05fmkvsn5byaakl8i26nvnmiiz0766r17pni6x7bfrqby39ls233";
+          url = "https://elpa.gnu.org/packages/company-0.9.12.tar";
+          sha256 = "1vcgfccdc06alba3jl6dg7ms20wdzdhaqikh7id5lbawb00hc10j";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -655,10 +655,10 @@
       elpaBuild {
         pname = "csv-mode";
         ename = "csv-mode";
-        version = "1.10";
+        version = "1.12";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/csv-mode-1.10.el";
-          sha256 = "0q7j2cmj7vs6hz8cnf7j7lmlcjmig3jn2p6az345z96agl8a5xsq";
+          url = "https://elpa.gnu.org/packages/csv-mode-1.12.tar";
+          sha256 = "0bya12smlrzwv4cbcmch4kg1fazp4k0ndrh1z17ix9p8c14d0v1j";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -730,10 +730,10 @@
       elpaBuild {
         pname = "debbugs";
         ename = "debbugs";
-        version = "0.21";
+        version = "0.22";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/debbugs-0.21.tar";
-          sha256 = "1xx1wjfpsnwx2fpydqhwy9k1b5kjk8dqbkzf8lqaj9c4rvjbn50a";
+          url = "https://elpa.gnu.org/packages/debbugs-0.22.tar";
+          sha256 = "05ik9qv539b5c1nzxkk3lk23bqj4vqgmfmd8x367abhb7c9gix2z";
         };
         packageRequires = [ emacs soap-client ];
         meta = {
@@ -925,10 +925,10 @@
       elpaBuild {
         pname = "ebdb";
         ename = "ebdb";
-        version = "0.6.12";
+        version = "0.6.13";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ebdb-0.6.12.tar";
-          sha256 = "1nmg2xxhfv53h13kb19xd4x5a7q9ln2rwzxc5v8zkf0g3vaxmhxw";
+          url = "https://elpa.gnu.org/packages/ebdb-0.6.13.tar";
+          sha256 = "1nxbp7w4xxij07q8manc15b896sl10yh2h1cg88prdqbw1wk62qr";
         };
         packageRequires = [ cl-lib emacs seq ];
         meta = {
@@ -985,10 +985,10 @@
       elpaBuild {
         pname = "eev";
         ename = "eev";
-        version = "20191105";
+        version = "20200224";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/eev-20191105.tar";
-          sha256 = "0w53wq8nhl4c5czda5imcv7y97pgbpfmvcvpi6kdwl3jbn9cx396";
+          url = "https://elpa.gnu.org/packages/eev-20200224.tar";
+          sha256 = "1r1wh001ikg34axihffrhzl0n8r0w42s2hac2jys8sil1hqvx306";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1070,10 +1070,10 @@
       elpaBuild {
         pname = "elisp-benchmarks";
         ename = "elisp-benchmarks";
-        version = "1.1";
+        version = "1.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.1.tar";
-          sha256 = "1blx3wsnz94va67437rmqa4i90gm9ig69bbmg9lp6jqyxrm9d7gc";
+          url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.2.tar";
+          sha256 = "0grm4qw3aaf3hzrfg0vdgb5q67haappbc77qjgsy4jip85z7njmj";
         };
         packageRequires = [];
         meta = {
@@ -1153,6 +1153,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    expand-region = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "expand-region";
+        ename = "expand-region";
+        version = "0.11.0";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/expand-region-0.11.0.tar";
+          sha256 = "1q6xaqkv40z4c6rgdkxqqkvxgsaj8yjqjrxi40kz5y0ck3bjrk0i";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/expand-region.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }:
       elpaBuild {
         pname = "exwm";
@@ -1352,10 +1367,10 @@
       elpaBuild {
         pname = "gnorb";
         ename = "gnorb";
-        version = "1.6.4";
+        version = "1.6.5";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gnorb-1.6.4.tar";
-          sha256 = "1zm4c48x9vjqyn1h60lphhnzzg005wcad5mzn0majk0h59qcr0ff";
+          url = "https://elpa.gnu.org/packages/gnorb-1.6.5.tar";
+          sha256 = "1har3j8gb65mawrwn93939jg157wbap138qa1z1myznrrish6vzc";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -1846,10 +1861,10 @@
       elpaBuild {
         pname = "map";
         ename = "map";
-        version = "2.0";
+        version = "2.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/map-2.0.el";
-          sha256 = "1djygpvk1qgldg9my0lh8n2z1n6acz3y5ws7sv2w08hvxdlxz857";
+          url = "https://elpa.gnu.org/packages/map-2.1.el";
+          sha256 = "0ydz5w1n4vwhhzxxj003s7jv8n1wjijwfryk5z93bwhnr0cak0i0";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2095,10 +2110,10 @@
       elpaBuild {
         pname = "nhexl-mode";
         ename = "nhexl-mode";
-        version = "1.4";
+        version = "1.5";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/nhexl-mode-1.4.el";
-          sha256 = "1c2q4w6hkvc7z4026hiqdcsm2scd6q35x7b0dk80h8qicsbi14c8";
+          url = "https://elpa.gnu.org/packages/nhexl-mode-1.5.el";
+          sha256 = "0qvxfg7sv4iqyjxzaim6b4v9k5hav36qd4vkf9jwzw6p5fri8w8d";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -2245,10 +2260,10 @@
       elpaBuild {
         pname = "org";
         ename = "org";
-        version = "9.3.1";
+        version = "9.3.6";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-9.3.1.tar";
-          sha256 = "1n79h6ihhsaxxbnl9hw511aav0215m3pa51sa5fh3ddknjfplian";
+          url = "https://elpa.gnu.org/packages/org-9.3.6.tar";
+          sha256 = "0jwpgfzjvf1hd3mx582pw86hysdryaqzp69hk6azi9kmq4bzk87d";
         };
         packageRequires = [];
         meta = {
@@ -2260,10 +2275,10 @@
       elpaBuild {
         pname = "org-edna";
         ename = "org-edna";
-        version = "1.0.2";
+        version = "1.1.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-edna-1.0.2.tar";
-          sha256 = "005pmnqr41s2w72gahq9bf4l5kw601i19ypiqfnb8aq0f4acjr3d";
+          url = "https://elpa.gnu.org/packages/org-edna-1.1.1.tar";
+          sha256 = "1hfkdjbjnhbwb27vgs43ywl4kn2lqc037f4xppp2v0s97850za8r";
         };
         packageRequires = [ emacs org seq ];
         meta = {
@@ -2410,10 +2425,10 @@
       elpaBuild {
         pname = "phps-mode";
         ename = "phps-mode";
-        version = "0.3.27";
+        version = "0.3.38";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/phps-mode-0.3.27.tar";
-          sha256 = "1p6s5dq0d1ysm993qax8mi2sv4956ggainfbhsn65gc2718kjd0h";
+          url = "https://elpa.gnu.org/packages/phps-mode-0.3.38.tar";
+          sha256 = "1m8f1z259c66k0hf0cfjqidfd0cra2c2mb7k5lj71v1kfckwj6bh";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2455,10 +2470,10 @@
       elpaBuild {
         pname = "posframe";
         ename = "posframe";
-        version = "0.5.0";
+        version = "0.6.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/posframe-0.5.0.el";
-          sha256 = "1fjnpwg1fj9j54nymh802vd4viggrg3qnqwh52281n7zv6xfv0qb";
+          url = "https://elpa.gnu.org/packages/posframe-0.6.0.el";
+          sha256 = "14x2jgjn8di03rrad4x4mn8fhcqibk1j5c0ya0vmv8648fki6i9d";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2746,16 +2761,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    relint = callPackage ({ elpaBuild, fetchurl, lib, xr }:
+    relint = callPackage ({ elpaBuild, emacs, fetchurl, lib, xr }:
       elpaBuild {
         pname = "relint";
         ename = "relint";
-        version = "1.11";
+        version = "1.14";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/relint-1.11.tar";
-          sha256 = "0c7d35kp5k11fnyjrq9cg8i2r005gs57pmb3rvpf8ilwv0scn1m7";
+          url = "https://elpa.gnu.org/packages/relint-1.14.tar";
+          sha256 = "0hjzhxcygb2r2s3g2pk3z9x3appy1y8gkw8gpg9cpkl6lpwcsh2f";
         };
-        packageRequires = [ xr ];
+        packageRequires = [ emacs xr ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/relint.html";
           license = lib.licenses.free;
@@ -2936,10 +2951,10 @@
       elpaBuild {
         pname = "sml-mode";
         ename = "sml-mode";
-        version = "6.9";
+        version = "6.10";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/sml-mode-6.9.el";
-          sha256 = "1bdg9ywpvj85hxqah9w1raxlcrhkyx67nw22jwd1bd5j0fhmgqij";
+          url = "https://elpa.gnu.org/packages/sml-mode-6.10.el";
+          sha256 = "01yf0s474r9xhj6nbs14ljn9ccxb5yy758i17c8nmgmqvm8fx7sb";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -3041,10 +3056,10 @@
       elpaBuild {
         pname = "stream";
         ename = "stream";
-        version = "2.2.4";
+        version = "2.2.5";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/stream-2.2.4.tar";
-          sha256 = "1fdjjxfnpzfv5jsy0wmmnrsk821bg8d3magsng609fb2pkwvk1ij";
+          url = "https://elpa.gnu.org/packages/stream-2.2.5.tar";
+          sha256 = "00c3n4gyxzv7vczqms0d62kl8zsmjfyxa92mwxn2snyx857a9jfw";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3176,10 +3191,10 @@
       elpaBuild {
         pname = "tramp";
         ename = "tramp";
-        version = "2.4.3";
+        version = "2.4.3.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/tramp-2.4.3.tar";
-          sha256 = "0m1w4myvd2z293xcdyj7yc75b108f67f98i0jrizhdaj9nlw8j5f";
+          url = "https://elpa.gnu.org/packages/tramp-2.4.3.2.tar";
+          sha256 = "17kay6rpkgz79jggzj53awkbqfsp5sq93wpssw5vlwnigd4mrkzx";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3236,10 +3251,10 @@
       elpaBuild {
         pname = "undo-tree";
         ename = "undo-tree";
-        version = "0.7.2";
+        version = "0.7.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/undo-tree-0.7.2.el";
-          sha256 = "0gdqh5rkgwlancbjx5whgl5gqkdipdkspkl2bqmrq70sgg5ahrcc";
+          url = "https://elpa.gnu.org/packages/undo-tree-0.7.4.el";
+          sha256 = "018ixl802f076sfyf4gkacpgrdpybin88jd8vq9zgyvc6x2dalfa";
         };
         packageRequires = [];
         meta = {
@@ -3352,10 +3367,10 @@
       elpaBuild {
         pname = "verilog-mode";
         ename = "verilog-mode";
-        version = "2019.12.17.268053413";
+        version = "2020.2.23.232634261";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/verilog-mode-2019.12.17.268053413.el";
-          sha256 = "0g42sd5s5xrck077qx0p2sldnr2f9qm8dsr9d0fiaks294sk8li8";
+          url = "https://elpa.gnu.org/packages/verilog-mode-2020.2.23.232634261.el";
+          sha256 = "07r2nzyfwmpv1299q1v768ai14rdgq7y4bvz5xsnp4qj3g06p0f6";
         };
         packageRequires = [];
         meta = {
@@ -3565,10 +3580,10 @@
       elpaBuild {
         pname = "wisi";
         ename = "wisi";
-        version = "2.2.1";
+        version = "3.0.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/wisi-2.2.1.tar";
-          sha256 = "1qvhx8bpms7gri7y6wniwqd6nmqxj4lip5l3sphbq2kjf4zq4qd4";
+          url = "https://elpa.gnu.org/packages/wisi-3.0.1.tar";
+          sha256 = "01961apbirdi4y8qx2wb01f04knkw3hyin3ndrkjlkfslqbsnzzv";
         };
         packageRequires = [ emacs seq ];
         meta = {
@@ -3615,10 +3630,10 @@
       elpaBuild {
         pname = "xclip";
         ename = "xclip";
-        version = "1.9";
+        version = "1.10";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/xclip-1.9.el";
-          sha256 = "0xbs6fw0dfm5iynhdx62cwixzizjkrwrib6n0fjnsj31kajbkf3y";
+          url = "https://elpa.gnu.org/packages/xclip-1.10.el";
+          sha256 = "0i3i9kwfg8qmhcmqhhnrb1kljgwkccv63s9q1mjwqfjldyfh8j8i";
         };
         packageRequires = [];
         meta = {
@@ -3656,16 +3671,16 @@
           license = lib.licenses.free;
         };
       }) {};
-    xr = callPackage ({ elpaBuild, fetchurl, lib }:
+    xr = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "xr";
         ename = "xr";
-        version = "1.13";
+        version = "1.16";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/xr-1.13.tar";
-          sha256 = "1km4x92pii8c4bcimks4xzhmwpypdf183z0zh7raj062jz4jb74r";
+          url = "https://elpa.gnu.org/packages/xr-1.16.tar";
+          sha256 = "1s6pkbr7gkan0r9gfmix75m587d8cg6l11722v70zzgf2z9w2xg9";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/xr.html";
           license = lib.licenses.free;
@@ -3734,4 +3749,4 @@
           license = lib.licenses.free;
         };
       }) {};
-  }
+  }
\ No newline at end of file

From 096a00a7092fc495ab64279af1cccce297b4180b Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 1 Mar 2020 18:50:01 +0000
Subject: [PATCH 1993/4636] melpa-packages: 2020-03-01

---
 .../emacs-modes/recipes-archive-melpa.json    | 6925 ++++++++++-------
 1 file changed, 3992 insertions(+), 2933 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
index 66d5f65953bc..338766b4ebe4 100644
--- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
@@ -31,20 +31,20 @@
   "url": "https://git.sr.ht/~zge/nullpointer-emacs",
   "unstable": {
    "version": [
-    20190902,
-    929
+    20200222,
+    948
    ],
-   "commit": "87efcc058f40e8a38a613cb479a2affba9f0ebe5",
-   "sha256": "0cdh64z1mass9fl05n9xn1q82ka38iar27g5dsidkfhlg6wqxmlk"
+   "commit": "265b7d65e1bc54d84435e9d79379bc808e9a488b",
+   "sha256": "1nk2kqv7blahfiihz5vdvsb1j5bji1w5w9zz3lwzrv8i7pdbh34w"
   },
   "stable": {
    "version": [
     0,
-    1,
+    2,
     1
    ],
-   "commit": "129585c4096e78f46b741c7729915f666bfee501",
-   "sha256": "0jplfnp4cn5vgj99g0ks0g9k2ij8yz1h24c6ghbz0hxd5bh5g889"
+   "commit": "ae55ae0397ff3cf28a3ea52111bfc053dffb126d",
+   "sha256": "179snc2z047afw2h5jqbwdc64vxdngjmg4zca46wap114c4alrm1"
   }
  },
  {
@@ -82,21 +82,20 @@
  },
  {
   "ename": "4clojure",
-  "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44",
-  "sha256": "09bmdxkkp676sn1sbbly44k99i47w83yznq950nkxv6x8753ifgk",
+  "commit": "3fea8d290fe4d71b954ad6b68a8d182e40ee1e13",
+  "sha256": "1cqab8kh4varf5hasvhkia39fa8qmmqycica7mbcvp33n8w3941j",
   "fetcher": "github",
-  "repo": "losingkeys/4clojure.el",
+  "repo": "emacsorphanage/4clojure",
   "unstable": {
    "version": [
-    20131014,
-    2207
+    20200123,
+    2008
    ],
    "deps": [
-    "json",
     "request"
    ],
-   "commit": "3cdfd356c24cd3518397d29ae833f56a4d20b4ca",
-   "sha256": "1fybicg46fc5jjqv7g2d3dnj1x9n58m2fg9x6qxn9l8qlzk9yxkq"
+   "commit": "557eecb5da50fedd92840021c8b08d87dfdc782b",
+   "sha256": "19x653lzc1dxil4ix257hciidbdmbhaxhs6qhlkwi9ygjrlrgvnk"
   }
  },
  {
@@ -234,16 +233,16 @@
   "repo": "abstools/abs-mode",
   "unstable": {
    "version": [
-    20191204,
-    1751
+    20200220,
+    1701
    ],
    "deps": [
     "erlang",
     "flymake",
     "maude-mode"
    ],
-   "commit": "30479e8341679711dc960b26d01d5908f8a05bb4",
-   "sha256": "1dbrz1wxwqjg25pzjhgfs9mnii8mna2ydqvrz6xahvqsvfplmlrf"
+   "commit": "2db38537e9c481c38477997467bc98ee00607d7a",
+   "sha256": "006l73nacbr45y81ypj3x91nd1pnqppvgrlc6wmysma14lndazqx"
   },
   "stable": {
    "version": [
@@ -1065,20 +1064,20 @@
     "auto-complete",
     "rtags"
    ],
-   "commit": "5f1eaf4355e2093afb2b7828f3ebddfcad1234be",
-   "sha256": "1ankfl792qq0p2mdp89gldisw2l3lp8p10dmmqxm3ys898b0p2rh"
+   "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a",
+   "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n"
   },
   "stable": {
    "version": [
     2,
-    37
+    38
    ],
    "deps": [
     "auto-complete",
     "rtags"
    ],
-   "commit": "11f49ef5c488da4c744f700b5cf07a8ebcb9f4ec",
-   "sha256": "0g443kw9y469banr70nv2fhlb7vyc3911d2mcyssrcsqjm1xdvlv"
+   "commit": "9687ccdb9e539981e7934e768ea5c84464a61139",
+   "sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx"
   }
  },
  {
@@ -1213,11 +1212,11 @@
   "repo": "tam17aki/ace-isearch",
   "unstable": {
    "version": [
-    20190630,
-    1552
+    20200205,
+    1105
    ],
-   "commit": "e296077a5f74782a2d103b08551e0d673217393f",
-   "sha256": "05cd35rnglz5a1z03s7iqa4sbar1b35mwrx821y7pg7mxl5xbb14"
+   "commit": "cb6d7306cb5d2d4d36cb3803c0eaf779d88c2666",
+   "sha256": "1lrgjz7a4s50shc74kx6k958i1ayv5pfncsrjb3n87bvrx9wq6g3"
   },
   "stable": {
    "version": [
@@ -1361,14 +1360,14 @@
   "repo": "abo-abo/ace-link",
   "unstable": {
    "version": [
-    20191219,
-    1209
+    20200210,
+    2031
    ],
    "deps": [
     "avy"
    ],
-   "commit": "1ae238e1a00c65e47cdd1bc1bd88015332b2b615",
-   "sha256": "0izdfx834dsgnxdh3gx6f38rmxg1dwwwjknl64f6il0b3dxbnbx9"
+   "commit": "9b22793789263b2e2fc06ca8b6073bb01211df9b",
+   "sha256": "0ik2v881rnik58zvxczjg847fvc9vf493h85rv8q72hb7zi9p0gy"
   },
   "stable": {
    "version": [
@@ -1450,8 +1449,8 @@
    "deps": [
     "avy-menu"
    ],
-   "commit": "708e160747870657ea46815e3913f2c4805737e1",
-   "sha256": "186464acrg1k80s4mnmi2dj9fjn03a6knb9hzm85prk65wigy2cs"
+   "commit": "02b22bdb40a5828dbd0a2af290034adb761743f0",
+   "sha256": "12b6s99d0wzs4q827kn5zr56vrp3x1kf2pxp4cr8z5hikylfswcs"
   },
   "stable": {
    "version": [
@@ -1474,14 +1473,14 @@
   "repo": "abo-abo/ace-window",
   "unstable": {
    "version": [
-    20191022,
-    1203
+    20200201,
+    1753
    ],
    "deps": [
     "avy"
    ],
-   "commit": "edbbb1b77c3fb939e4d9057443bc1897321d0095",
-   "sha256": "1n8w6svks0pmslzg5zz1sny4hfnvych06cwzs3bvbmnfm4x6maqh"
+   "commit": "a36c1472d0ee59c2c1e6fb3ad66304141b154ef5",
+   "sha256": "1mkf1zi8z435jfpdi239gbn8243lwwsf1mgr6qq60pxbxxw9g13d"
   },
   "stable": {
    "version": [
@@ -1564,8 +1563,8 @@
   "repo": "pauldub/activity-watch-mode",
   "unstable": {
    "version": [
-    20190916,
-    1212
+    20200130,
+    805
    ],
    "deps": [
     "cl-lib",
@@ -1573,14 +1572,14 @@
     "projectile",
     "request"
    ],
-   "commit": "fb7e415484fa65f03660f59e2799bc2bcb9441ff",
-   "sha256": "1dzla3j6s3s5fnh8y9xq0k869fbdmzvqgbbvk6dphhzwi1wwhlzm"
+   "commit": "153d93eac0b9511dc00b50c2ba409c085b58602b",
+   "sha256": "18idfbdrk3b2y573g2ld5sqkb9j216ixik679qj7qdnwa2b7m2xx"
   },
   "stable": {
    "version": [
     1,
     1,
-    0
+    1
    ],
    "deps": [
     "cl-lib",
@@ -1588,8 +1587,8 @@
     "projectile",
     "request"
    ],
-   "commit": "fb7e415484fa65f03660f59e2799bc2bcb9441ff",
-   "sha256": "1dzla3j6s3s5fnh8y9xq0k869fbdmzvqgbbvk6dphhzwi1wwhlzm"
+   "commit": "153d93eac0b9511dc00b50c2ba409c085b58602b",
+   "sha256": "18idfbdrk3b2y573g2ld5sqkb9j216ixik679qj7qdnwa2b7m2xx"
   }
  },
  {
@@ -1600,14 +1599,14 @@
   "repo": "gonewest818/adafruit-wisdom.el",
   "unstable": {
    "version": [
-    20191217,
-    511
+    20200217,
+    306
    ],
    "deps": [
     "request"
    ],
-   "commit": "656e360c8121e8c2f5f11b32671a416e1c8e52f4",
-   "sha256": "09dry0i92m1hhh1xrm1bb28d8plr1ard6wgl90a3d8hnbdl5p0fg"
+   "commit": "86bb7249bd4b0c8ebaf749f69f00c8faeff11063",
+   "sha256": "062m653pyzddwjf75a6clsdkihfg35b3phbbff6vdyymg77608f2"
   },
   "stable": {
    "version": [
@@ -2273,14 +2272,14 @@
   "repo": "jtbm37/all-the-icons-dired",
   "unstable": {
    "version": [
-    20170418,
-    2131
+    20200229,
+    2225
    ],
    "deps": [
     "all-the-icons"
    ],
-   "commit": "980b7747d6c4a7992a1ec56afad908956db0a519",
-   "sha256": "1pvbgyxfj4j205nj1r02045f1y4wgavdsk7f45hxkkhms1rj8jyy"
+   "commit": "9d535651412a20105ba58c0fceb3a807891c3606",
+   "sha256": "1w6rj619rx13jrhd5nvgm5j7ipazngm0sk66ll9c62lja43lmkwh"
   }
  },
  {
@@ -2302,6 +2301,36 @@
    "sha256": "0yi3nbhx7cdxq2192kh5ra2n0a3qg20p342prz3a0bm3w7q2ym11"
   }
  },
+ {
+  "ename": "all-the-icons-ibuffer",
+  "commit": "3b3899fbae1e54e4385e1edfc8cc88d5ff0080d1",
+  "sha256": "08p4jj932x6xrq8ylx1hl9a3i2x8mm6l1jxi21akgjszf4s41mix",
+  "fetcher": "github",
+  "repo": "seagle0128/all-the-icons-ibuffer",
+  "unstable": {
+   "version": [
+    20200301,
+    654
+   ],
+   "deps": [
+    "all-the-icons"
+   ],
+   "commit": "04578528f609ee837854f329cbf64ddd40f7a2ae",
+   "sha256": "0m5y18z2w3c0paq07papj1dc3m7cxhrrjyfav4gbbi5cpmh5sxnp"
+  },
+  "stable": {
+   "version": [
+    1,
+    1,
+    0
+   ],
+   "deps": [
+    "all-the-icons"
+   ],
+   "commit": "07a55895ded043fa317c61c3a7013736345e7a38",
+   "sha256": "14c5rbl48hfdnj186p9g9csf5xrzid2jv90x3n4p8r5nigy5j74m"
+  }
+ },
  {
   "ename": "all-the-icons-ivy",
   "commit": "9496e6bb6f03f35444fb204860bc50e5e1b36214",
@@ -2317,8 +2346,8 @@
     "all-the-icons",
     "ivy"
    ],
-   "commit": "babea626db20773de4c408acb2788e2b9c8277e3",
-   "sha256": "03fssygwia1gv35y6mzifnkg5cb4klaq240jfqmyfji9jq95jzrd"
+   "commit": "a70cbfa1effe36efc946a823a580cec686d5e88d",
+   "sha256": "17h7gscrvdi9rygagwzcqzbw6dbfvwmv7jbi8pjkj1c06p3kbq8i"
   },
   "stable": {
    "version": [
@@ -2334,6 +2363,38 @@
    "sha256": "03fssygwia1gv35y6mzifnkg5cb4klaq240jfqmyfji9jq95jzrd"
   }
  },
+ {
+  "ename": "all-the-icons-ivy-rich",
+  "commit": "66c873f1b542404d8982385ff7f6defe5b68f0ff",
+  "sha256": "16q294s61310aisqkhznzml2g05x24grzm93ga1wnyksn20wm9l2",
+  "fetcher": "github",
+  "repo": "seagle0128/all-the-icons-ivy-rich",
+  "unstable": {
+   "version": [
+    20200301,
+    656
+   ],
+   "deps": [
+    "all-the-icons",
+    "ivy-rich"
+   ],
+   "commit": "b3dda7af490e606b85e1e0cd9806988ce301dac5",
+   "sha256": "0bj0m7gbjkgwyh87zhsx2vhbw6g6ncjc1r63ai726scz10h5y0a4"
+  },
+  "stable": {
+   "version": [
+    1,
+    1,
+    0
+   ],
+   "deps": [
+    "all-the-icons",
+    "ivy-rich"
+   ],
+   "commit": "7344a94182cca55d33f3c04e0d9c9e9e91db0637",
+   "sha256": "03pmfx528dhywas4j40h95r1v3dprn9n3ydhk13jsclmjy471cz9"
+  }
+ },
  {
   "ename": "almost-mono-themes",
   "commit": "71ca87a0dd28f911dd988e1c208896b1ec5bfcc7",
@@ -2342,11 +2403,11 @@
   "repo": "cryon/almost-mono-themes",
   "unstable": {
    "version": [
-    20190527,
-    654
+    20200211,
+    2126
    ],
-   "commit": "c3a85c1a665530a5d830665969725cdba8eceb75",
-   "sha256": "034k32xkr5ma415hlkbl35z0jxc4sa1inf87hg3y6lrlfl83fyjh"
+   "commit": "2f5935a1a9d042751c7135cac79875886edb2556",
+   "sha256": "1q1ry37rcpzwwl2bwf3j8nmhap7v72fg0hdzxlls89gm3jl3nb97"
   }
  },
  {
@@ -2534,25 +2595,25 @@
   "repo": "DarwinAwardWinner/amx",
   "unstable": {
    "version": [
-    20200101,
-    1701
+    20200215,
+    1901
    ],
    "deps": [
     "s"
    ],
-   "commit": "3af93ca066aa42dd1342f1ee0ab0d02360075613",
-   "sha256": "1jm5zr4xlz2ik80kmjsvlka8kzxxp6k9g5ymxhc1k726kw808lf8"
+   "commit": "e512e74e8368f9b1cf83bee16dd2522f3b1dbeea",
+   "sha256": "08vx7rd36j4ls7a7i2vn7mf74vbzcyrzzv0wzqzyb8ihv4qhjc0g"
   },
   "stable": {
    "version": [
     3,
-    2
+    3
    ],
    "deps": [
     "s"
    ],
-   "commit": "260e7c013690d412ec8d965c282572505596636d",
-   "sha256": "0bb8y1dmzyqkrb4mg6zndcsxppby3glridv2aap2pv05gv8kx7mj"
+   "commit": "394734e42aa8c43940df358e77a69248b42f2a9c",
+   "sha256": "0ikjzs119g57cwh2v3jmy63lggqc0ib99q5gsl93slkk4y2ihavw"
   }
  },
  {
@@ -2563,8 +2624,8 @@
   "repo": "pythonic-emacs/anaconda-mode",
   "unstable": {
    "version": [
-    20191204,
-    111
+    20200129,
+    1718
    ],
    "deps": [
     "dash",
@@ -2572,8 +2633,8 @@
     "pythonic",
     "s"
    ],
-   "commit": "1bc301b2d2bc336988f4a16a891c275a90136ca5",
-   "sha256": "18albgjh7bcsyw7004pagldz510zwjswlyp9lk2lwqnrrw2wryr5"
+   "commit": "10299bd9ff38c4f0da1d892905d02ef828e7fdce",
+   "sha256": "0s5pxfjcsmyrqc5pa2lqx6mxzwy3g8mc3iaxbj313sn1nly26vjw"
   },
   "stable": {
    "version": [
@@ -2851,11 +2912,11 @@
   "repo": "bastibe/annotate.el",
   "unstable": {
    "version": [
-    20191221,
-    959
+    20200219,
+    1558
    ],
-   "commit": "d10b9158573017a02194a6d594387bfa88f03edf",
-   "sha256": "0sv1flx7s03avirgmq91alg35yyc25l57vfvniyi4raa4ldnp6vp"
+   "commit": "818f66f4a3d6a33ae90c4e5de12f8dce770e7875",
+   "sha256": "017yzg3jqf0x7zn7xhdgbr6m97zzcjv6icj5zl5q4zj0ksm9l82q"
   },
   "stable": {
    "version": [
@@ -3004,14 +3065,14 @@
   "repo": "zellio/ansible-vault-mode",
   "unstable": {
    "version": [
-    20191123,
-    1919
+    20200130,
+    2300
    ],
    "deps": [
     "seq"
    ],
-   "commit": "fb56eb5e85fb5621ecd94b28d069504add010ea9",
-   "sha256": "0qjjzmnx4pczv6jkafmji2kn2a0rqsxcm8g5jp8lq2cc6dx86ad4"
+   "commit": "5653e82a2706cc7e9f46d24c6319b00ba6eb7528",
+   "sha256": "02p970jh7vl2bx8arm04mk313rqgh2s48rm0mn8zbiam8s71m2bm"
   },
   "stable": {
    "version": [
@@ -3277,10 +3338,10 @@
  },
  {
   "ename": "applescript-mode",
-  "commit": "576e42b33a5245e1aae0f0d879fd18762342db32",
-  "sha256": "0rj03xw8yx79xj9ahdwfxicxna0a0lykn2n39xng5gnm4bh2n6z4",
+  "commit": "3fea8d290fe4d71b954ad6b68a8d182e40ee1e13",
+  "sha256": "1ihf4b2r14ikjkqpibqv1ipjgdq7q1pkhw7rs3ph1gzg5j552waf",
   "fetcher": "github",
-  "repo": "ieure/applescript-mode",
+  "repo": "emacsorphanage/applescript-mode",
   "unstable": {
    "version": [
     20090321,
@@ -3595,25 +3656,25 @@
   "repo": "phillord/assess",
   "unstable": {
    "version": [
-    20190102,
-    1011
+    20200211,
+    1817
    ],
    "deps": [
     "m-buffer"
    ],
-   "commit": "0781fd79c4040dbceed42dc79edab4ec661c2593",
-   "sha256": "15ismdk8fl6xjgkjh9nkn8kgg7rpy2ra7924r1iddlfs2q8l8p4w"
+   "commit": "5bac045b273623772b6a2d820997d50f7ab4e466",
+   "sha256": "0mq59wz9anvywazl7d01fis1z7z7fsp9c7pymrc8rgmz77xpwnqx"
   },
   "stable": {
    "version": [
     0,
-    5
+    6
    ],
    "deps": [
     "m-buffer"
    ],
-   "commit": "0781fd79c4040dbceed42dc79edab4ec661c2593",
-   "sha256": "15ismdk8fl6xjgkjh9nkn8kgg7rpy2ra7924r1iddlfs2q8l8p4w"
+   "commit": "5bac045b273623772b6a2d820997d50f7ab4e466",
+   "sha256": "0mq59wz9anvywazl7d01fis1z7z7fsp9c7pymrc8rgmz77xpwnqx"
   }
  },
  {
@@ -3639,11 +3700,11 @@
   "repo": "jwiegley/emacs-async",
   "unstable": {
    "version": [
-    20191226,
-    1227
+    20200113,
+    1745
    ],
-   "commit": "036b475a29bbbee52f88c7d0332341c2643155fb",
-   "sha256": "01jpgxzfkj4zqnjh167598qk2pp59vpkd2gmgal27gwm4g3y2q11"
+   "commit": "86aef2c38e7d35e8509b7feeee3e989d825eba91",
+   "sha256": "1slxlpxjggyg5q8xppn9csh54j93b2hc4v8lcn85ymw2hp3rsib9"
   },
   "stable": {
    "version": [
@@ -3663,14 +3724,27 @@
   "repo": "chuntaro/emacs-async-await",
   "unstable": {
    "version": [
-    20191108,
-    539
+    20200117,
+    828
    ],
    "deps": [
+    "iter2",
     "promise"
    ],
-   "commit": "2a2351d52af8f0141a1849bc36292f068196aa63",
-   "sha256": "15g862hpjdwja9ii30vps1vk6nxr8allmj890yrfycvalvhrkfm5"
+   "commit": "deef2bb343463f5196545f1dd8c2a32d0cb3b146",
+   "sha256": "0aav9qdswnw7ynqlzn0sm34as5fj2d85syxgg8zjabzp6646ay29"
+  },
+  "stable": {
+   "version": [
+    1,
+    1
+   ],
+   "deps": [
+    "iter2",
+    "promise"
+   ],
+   "commit": "deef2bb343463f5196545f1dd8c2a32d0cb3b146",
+   "sha256": "0aav9qdswnw7ynqlzn0sm34as5fj2d85syxgg8zjabzp6646ay29"
   }
  },
  {
@@ -3681,15 +3755,15 @@
   "repo": "sei40kr/emacs-atcoder-tools",
   "unstable": {
    "version": [
-    20200104,
-    624
+    20200109,
+    1236
    ],
    "deps": [
     "f",
     "s"
    ],
-   "commit": "4c805a03a9b0ee331dfa409472e38b4085a1628e",
-   "sha256": "0fcamxvz8wvy9b8f03y7hllv88xc25v9dhdjmw58x400pycra19x"
+   "commit": "cfe61ed18ea9b3b1bfb6f9e7d80a47599680cd1f",
+   "sha256": "04v775vsy01h7wv2p4nc26d0p9ss8106v4whqfgd0c1rrkh5012p"
   },
   "stable": {
    "version": [
@@ -3784,8 +3858,8 @@
   "repo": "jyp/attrap",
   "unstable": {
    "version": [
-    20191119,
-    1515
+    20200114,
+    1928
    ],
    "deps": [
     "dash",
@@ -3793,13 +3867,13 @@
     "flycheck",
     "s"
    ],
-   "commit": "12e234aeb16e190435133b29e93c69c67ec1ee6b",
-   "sha256": "04gnqhg1bq02vk6s2p7v2vh4djl5m6bf3jfxhx6q3i9hmayk2ya2"
+   "commit": "4cf3e4a16255997e7c3c39682a72866a0a37dd4b",
+   "sha256": "0wqc7bqx9rvk8r7fd3x84h8p01v97s6w2jf29nnjb59xakwp22i7"
   },
   "stable": {
    "version": [
     1,
-    0
+    1
    ],
    "deps": [
     "dash",
@@ -3807,8 +3881,8 @@
     "flycheck",
     "s"
    ],
-   "commit": "a971acb251e343d4c6b0253f69dcce0c2cee0fac",
-   "sha256": "0p93y151730ga7v9xa5gkp306s32qw53086i829fcbxf83c2wslv"
+   "commit": "4cf3e4a16255997e7c3c39682a72866a0a37dd4b",
+   "sha256": "0wqc7bqx9rvk8r7fd3x84h8p01v97s6w2jf29nnjb59xakwp22i7"
   }
  },
  {
@@ -4565,14 +4639,14 @@
   "repo": "ncaq/auto-sudoedit",
   "unstable": {
    "version": [
-    20190821,
-    209
+    20200122,
+    857
    ],
    "deps": [
     "f"
    ],
-   "commit": "b589d7c8653204fe07b3355a51d5b622ac6a647a",
-   "sha256": "10ini7q91gbkvmk6j7fcybgdv5jrhfpk6dfwyl2vcb1nlkxfbnzc"
+   "commit": "bfad607be640bed3a107e36c91b091e136c1c9ec",
+   "sha256": "0nwnmqhfy4378p43a12bc32y4qqw349xjkrdh6x7fkdsd4wpf7f4"
   }
  },
  {
@@ -4664,6 +4738,24 @@
    "sha256": "0cfx447185shbiadhbar72bgqwzmbia82f8a2py215hgw9wrgqr9"
   }
  },
+ {
+  "ename": "autobuild",
+  "commit": "c738dea2608e68ec0758cb9d5fde1af472f49f1e",
+  "sha256": "0k5s86xcva3v0zg3dcpkrrcvxxk93gfp7nb80dvac8dyk1qx99bd",
+  "fetcher": "github",
+  "repo": "erjoalgo/autobuild",
+  "unstable": {
+   "version": [
+    20200209,
+    2005
+   ],
+   "deps": [
+    "cl-lib"
+   ],
+   "commit": "b5ac7436be372dffc97280f4b835f61ab6b716d5",
+   "sha256": "138kzn20gfy6dj15nkfwsz7lz91n6ffsjzz2kkmclnfkazxixjhq"
+  }
+ },
  {
   "ename": "autodisass-java-bytecode",
   "commit": "a094845521d76754a29435012af5fba9f7975a8e",
@@ -4766,8 +4858,8 @@
     20190331,
     2230
    ],
-   "commit": "ce213afc026590871ca7d514e563720ef967c938",
-   "sha256": "0wq4c4dzpkrppic65ma7gfzr9mxsln87csmb1laz3b2g4b19cy6k"
+   "commit": "052881b101d8c2d11c89ae4f1befe7a999de987e",
+   "sha256": "0k9sjjsqxnrh0cq6m3cd9rk44n0rjbjgqcbfv6fg33a0gpybvryf"
   }
  },
  {
@@ -4929,8 +5021,8 @@
    "deps": [
     "avy"
    ],
-   "commit": "e1d0097edbfc7c1b056323732e341482551ca660",
-   "sha256": "0kc98ksm7cfpsf21b3hb2xfkiq0y1hnk1i8900gch7gws2q2fml8"
+   "commit": "aee6878a8c2f18c3ac3bd34d608783b52cd708e0",
+   "sha256": "1526a6cqaa16x5gi2fsdi9brqa54n3m0dvrnkd85w6sgaz33cpiz"
   },
   "stable": {
    "version": [
@@ -5067,11 +5159,11 @@
   "url": "https://bitbucket.org/pdo/axiom-environment",
   "unstable": {
    "version": [
-    20191027,
-    1928
+    20200109,
+    2207
    ],
-   "commit": "3e7885d694efef923e7b53827d277c28bfa09320",
-   "sha256": "048x8mj72c57f62ffsad43mcrc201d8ilh339gnpm2yi8midv0ih"
+   "commit": "2c5384b994266008a20558db4ffe0525e66c0f5f",
+   "sha256": "17f40w9r4whz0v007pp13w060jq87ag42p21hcj93c14py5s4g67"
   }
  },
  {
@@ -5364,11 +5456,11 @@
   "repo": "fkie-cad/bap-mode",
   "unstable": {
    "version": [
-    20190401,
-    1546
+    20200128,
+    1354
    ],
-   "commit": "9f493b4ec852ec126c80afefa784f8a8d020e309",
-   "sha256": "0q4grzhrg52i2a3hq9dgsp9i38wi7jcsr09a6k4sxszrf90n030d"
+   "commit": "8969679f60db0aa918d35f40d959c0a9c723b111",
+   "sha256": "1i5yhqig104j33cyhkhil4d1wfvnldkvrk2wgxbm4p01xw1rs6cq"
   }
  },
  {
@@ -5523,8 +5615,8 @@
   "repo": "AlonTzarafi/battle-haxe",
   "unstable": {
    "version": [
-    20190729,
-    1219
+    20200222,
+    56
    ],
    "deps": [
     "async",
@@ -5536,8 +5628,8 @@
     "helm",
     "s"
    ],
-   "commit": "8c6760969fdc2de0598e22b48c7f14202e08519f",
-   "sha256": "0vrbayhrsb5rvlbrh7wkbgzzx9iwf0cqh04k330diibh9jcn76f4"
+   "commit": "64d20c9ea3fd503fdefafda122e7095c192e72a3",
+   "sha256": "15ykwqg100vjl014awwwzmch84vwqyrlm46c22w9x3dgqk8yxyi2"
   }
  },
  {
@@ -5847,11 +5939,11 @@
   "repo": "DamienCassou/beginend",
   "unstable": {
    "version": [
-    20191030,
-    839
+    20200203,
+    1035
    ],
-   "commit": "d2a0a7ba6f8f8eb400c0ee309307602922573630",
-   "sha256": "1dqdd4hgiyldsggzkrs719xplihnaq1q5n91k7v4bs7szbdbgccn"
+   "commit": "3ab68d77839060f5e85bbf9455846b68cc63ef00",
+   "sha256": "049r18sa4646rhp2cidpdnk09c87xxf52d6mffq82xphzsniqarz"
   },
   "stable": {
    "version": [
@@ -5995,11 +6087,11 @@
   "repo": "technomancy/better-defaults",
   "unstable": {
    "version": [
-    20200101,
-    2257
+    20200209,
+    1717
    ],
-   "commit": "e051c5278f71af8414f8c6101695197dd4365cca",
-   "sha256": "0m4cc9qwwm14drdars5a5hbiv5fapd245n3iry9x5ar76rb20hcb"
+   "commit": "fc9a03138c959f0d24301c6401f800eb6e7d3af9",
+   "sha256": "1hi1xxc99z0pkbj8w63fx3qsy4sq5b3gdc2ccyk0gnbzw2sfc93j"
   },
   "stable": {
    "version": [
@@ -6356,8 +6448,8 @@
     "bind-key",
     "key-chord"
    ],
-   "commit": "4b58ab78177f636f862a66c7a8fdcf9b070e0925",
-   "sha256": "04jva9wi8rpvz61qyvzd2fpsfsw43jkr5741yndrzkxx43q67qxj"
+   "commit": "42db6b3d90ee57d0f5947d3b0bf4b0010bdf7b40",
+   "sha256": "1an2whgy68l9c1l1qx8p8jz47g4hj2abf0kxvcmbc6wj8lp5zny8"
   },
   "stable": {
    "version": [
@@ -6383,8 +6475,8 @@
     20191110,
     416
    ],
-   "commit": "4b58ab78177f636f862a66c7a8fdcf9b070e0925",
-   "sha256": "04jva9wi8rpvz61qyvzd2fpsfsw43jkr5741yndrzkxx43q67qxj"
+   "commit": "42db6b3d90ee57d0f5947d3b0bf4b0010bdf7b40",
+   "sha256": "1an2whgy68l9c1l1qx8p8jz47g4hj2abf0kxvcmbc6wj8lp5zny8"
   },
   "stable": {
    "version": [
@@ -6427,11 +6519,11 @@
   "repo": "cute-jumper/bing-dict.el",
   "unstable": {
    "version": [
-    20190723,
-    122
+    20200216,
+    110
    ],
-   "commit": "52718ae3a3abfa5e5457239ee7ddf8f0c23a79a7",
-   "sha256": "1kn8kmljn0pj0hz7dj7r7nxw43xd6acndaqq92d02mla12hiqayz"
+   "commit": "1d581aaa9622b34f8fb83af5579fa252aa24cfef",
+   "sha256": "1v0ncgnj9vv2r0qbwiipg63rlhnfjz8q23jx3la2l22l0i2lyivb"
   },
   "stable": {
    "version": [
@@ -6475,11 +6567,11 @@
   "repo": "Wilfred/bison-mode",
   "unstable": {
    "version": [
-    20160617,
-    552
+    20200226,
+    47
    ],
-   "commit": "314af3b7af7eb897fd3932616cb8600a85228cea",
-   "sha256": "0ymjgwyi73vl81i7v1g2ad09lxp4mhp47r6zcijqa5hbx9l1skik"
+   "commit": "675df47193accaf30ca44e142523b2b3bb122979",
+   "sha256": "08yg51pzpry5gy29fdbrrb7s5j5c5fxsrhgy0ncp0vl082fs1bv9"
   }
  },
  {
@@ -6624,8 +6716,8 @@
    "deps": [
     "eimp"
    ],
-   "commit": "a4c538c52f2371f4a184e4c905584c6decf7b407",
-   "sha256": "1vzpigvkzcglanardsy0pi8ficsdxrfgwnh1jyx12pnxzqyb879m"
+   "commit": "39562f02acc1113595cb253a85bb3b9da743ddd2",
+   "sha256": "0wzdln3rqqvckkc63q5sb83kimnyk6hrc4slbxhwapdfk53gz0j9"
   }
  },
  {
@@ -6768,26 +6860,26 @@
   "repo": "sergeyklay/bnf-mode",
   "unstable": {
    "version": [
-    20190611,
-    519
+    20200122,
+    2155
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "eb1a2edb2d798e9fb84fcefb7b646f1c5edc18e9",
-   "sha256": "0s7rq0mhc2kxczs3v2k71zq9imndxw8b4aw1m8zzgbbnq9qn0q3f"
+   "commit": "11b19fa77ab0a6bb2208c776ccd17887a0325b8c",
+   "sha256": "10sb8ixfhxnan2cs6xhpy21lniv8yqp5xy0q9dla3z8897clrnw7"
   },
   "stable": {
    "version": [
     0,
     4,
-    2
+    3
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "2f217ecf76fa775da4b28de7dd2b615460d9f8ad",
-   "sha256": "17nhy9mwaji230d3dhi3d40wibqviapa5h60mlm20mc5b2vb0vyd"
+   "commit": "fecc2a8fc9cfff9d75da8809c24ef56ca4985dde",
+   "sha256": "04wj1s483khi2qvnbjcyfihip150qjmizc8qnjsqg60nwcxjh5j5"
   }
  },
  {
@@ -6956,16 +7048,16 @@
   "repo": "jyp/boon",
   "unstable": {
    "version": [
-    20191128,
-    820
+    20200212,
+    1535
    ],
    "deps": [
     "dash",
     "expand-region",
     "multiple-cursors"
    ],
-   "commit": "ed8bc8bbc4ea13f68bd2aec6a59c4765b49fc610",
-   "sha256": "0rzv687yfv756pvvdjpjh0zgvqgqgg1hjl9h1lls1mc5vndny1rz"
+   "commit": "19bc70fa6f9e5c001f8ac714ce90af14788f35dd",
+   "sha256": "0ippdjd4j8y1xx438pvxiw0h0my6zdmvnbpay3fckrssirhi1m6l"
   },
   "stable": {
    "version": [
@@ -6989,16 +7081,16 @@
   "repo": "emacscollective/borg",
   "unstable": {
    "version": [
-    20191205,
-    2240
+    20200223,
+    1448
    ],
    "deps": [
     "dash",
     "epkg",
     "magit"
    ],
-   "commit": "7efd982e8e84b5761acbed9db98ec21eefca5048",
-   "sha256": "19ivl467n19ny4138vhzgzdbrsycclxmy34cck5z50nh42is3865"
+   "commit": "3cfb35f5c54a76f200272ed11b4a39f11a57552c",
+   "sha256": "1y4c7bdy4vzv630d3yxhgq3v29q5f071d30kig4wwv460nai7c4c"
   },
   "stable": {
    "version": [
@@ -7199,16 +7291,16 @@
   "repo": "rmuslimov/browse-at-remote",
   "unstable": {
    "version": [
-    20190213,
-    1929
+    20200127,
+    145
    ],
    "deps": [
     "cl-lib",
     "f",
     "s"
    ],
-   "commit": "1a9392e9d1fad4e1aafb25b68b4e6857fde8f564",
-   "sha256": "1shpkzyg0lf3s5199qhy7kcanx55yk27sgbsc1pbkv0crkh8dv14"
+   "commit": "aeee6bf38f78aaed5dd2efd6305f30a7594e3060",
+   "sha256": "1hp61vd5vxgyz61l8h59v9yvadpqzrc3ihsd731gl1k9siajg8q2"
   },
   "stable": {
    "version": [
@@ -7233,11 +7325,11 @@
   "repo": "browse-kill-ring/browse-kill-ring",
   "unstable": {
    "version": [
-    20171219,
-    1908
+    20200210,
+    921
    ],
-   "commit": "8debc43e41d7e51532698331c6f283905890b904",
-   "sha256": "18yg35raks0kbzg5wjay6liingdcv4glyzl9n14sgr9vzc7h96f9"
+   "commit": "1ef72cc6accd94cd7032c02b1b2c78ae7f1d1965",
+   "sha256": "0mil32g7hcw376jibs5hdyv00xbaql3m4a27rwqaafg0x59avxdj"
   },
   "stable": {
    "version": [
@@ -7611,11 +7703,11 @@
   "repo": "arnested/bug-reference-github",
   "unstable": {
    "version": [
-    20180128,
-    1314
+    20200206,
+    2158
    ],
-   "commit": "83e028e1b2359f75c8bcd3159f7b56c3fcdf85b9",
-   "sha256": "0g9wwkjznc9vvzi2z0q7x0fzj0ixnxlgb7gggl1blqjzbswwy394"
+   "commit": "c9512a010f19633e69f1d4b1597eff7048b21112",
+   "sha256": "0nyxd9dnvvdvjik94m9frbbhcf9axi50vpcs0mk0xy5raxq3scf7"
   },
   "stable": {
    "version": [
@@ -7745,15 +7837,15 @@
   "repo": "endofunky/bundler.el",
   "unstable": {
    "version": [
-    20190701,
-    1013
+    20200129,
+    1338
    ],
    "deps": [
     "cl-lib",
     "inf-ruby"
    ],
-   "commit": "05a91d68e21e129b6c4d5462c888ea249c2ea001",
-   "sha256": "0x37bilxl3shx5mdm00d3m2z5srfsy3y588w9971i8r7y2sfngna"
+   "commit": "43efb6be4ed118b06d787ce7fbcffd68a31732a7",
+   "sha256": "1r7x3xw4l5bp4dfqk2v2nrd2yl0rs064gw75nx99ifm92n7nkmgh"
   },
   "stable": {
    "version": [
@@ -7880,19 +7972,19 @@
   "repo": "jorgenschaefer/emacs-buttercup",
   "unstable": {
    "version": [
-    20200106,
-    2136
+    20200229,
+    620
    ],
-   "commit": "9b87afc57f5131259957a8bfd5d4bf53917e4beb",
-   "sha256": "0pncvp89axm6pv83j5lly9pyxcp3yr6v8llzi0ixy9jnf43679ry"
+   "commit": "b2985171b8f745c8edab3d6fccf72d036519ca86",
+   "sha256": "129rxvd83i3jzivmqkx9a9lpq3g80716y9mc55hqf60l7wxg9787"
   },
   "stable": {
    "version": [
     1,
-    19
+    20
    ],
-   "commit": "8a284895e9f9856e3b27a7aaff4ce7e9600e36e3",
-   "sha256": "1v2zjncn92p08fisds761yxrfa7k24wn0qmakgpn4ksyghmzdjlg"
+   "commit": "adba24e575a07f4db3e9058953b441f390e8f2a2",
+   "sha256": "0143j6f271l19j41a4pgakxvslip8375jg8pwcvn22gz25s4g45w"
   }
  },
  {
@@ -8326,8 +8418,8 @@
   "repo": "beacoder/call-graph",
   "unstable": {
    "version": [
-    20190828,
-    2340
+    20200211,
+    240
    ],
    "deps": [
     "anaconda-mode",
@@ -8336,8 +8428,8 @@
     "ivy",
     "tree-mode"
    ],
-   "commit": "8ccb0323651155e3407ee5649b1a0355fd70ffe2",
-   "sha256": "0xflaqv88saq6i2wdggrwh06i9svp7v5070rmd860wg1pwi0qm81"
+   "commit": "768a1b2169dca60a130204065dbc54bdff415b0f",
+   "sha256": "12f9wc3kp3pafip283yr8qd5s93nmcf84b07i72fv69nxxi4a41q"
   },
   "stable": {
    "version": [
@@ -8425,7 +8517,7 @@
    "error": [
     "exited abnormally with code 1\n",
     "",
-    ""
+    "error: unable to download 'https://github.com/ocaml/caml-mode/archive/9803cf37ac52bbfa5130fde0f228dc51c4590c2d.tar.gz': HTTP error 404\n"
    ]
   }
  },
@@ -8795,8 +8887,8 @@
     20151205,
     1343
    ],
-   "commit": "51747f7afb5b66675bd9e1e812c93a8aba4d8249",
-   "sha256": "1kfx4w7bmw42x3g64zj3wpvg9cawgblrrywlp18zl0qygxj4jg5c"
+   "commit": "f6abd9f4d4ec44edd04eeb75e23ec87988509d8b",
+   "sha256": "1vy653j7abbnvc03vy28y0vnvq8rzfd2zv0qbgp8zs70svfcnjxz"
   }
  },
  {
@@ -8807,16 +8899,16 @@
   "repo": "MaskRay/emacs-ccls",
   "unstable": {
    "version": [
-    20191219,
-    913
+    20200204,
+    444
    ],
    "deps": [
     "dash",
     "lsp-mode",
     "projectile"
    ],
-   "commit": "aab3e31fd716daf59f9794e62d473357263e8cc0",
-   "sha256": "1ykgw21ypyhwlyflppjcgqrj1xw4d9rld4z65qvwhk3f12cv113j"
+   "commit": "e5cc4c3e6f40c9c9f0f53e99154c08018eb36944",
+   "sha256": "1yc7jj4g0kh0m1a4r98shvr48wp9i5mawld0xzs9mbfj97dsb96v"
   }
  },
  {
@@ -8842,11 +8934,11 @@
   "repo": "skk-dev/ddskk",
   "unstable": {
    "version": [
-    20151205,
-    1343
+    20200210,
+    1326
    ],
-   "commit": "51747f7afb5b66675bd9e1e812c93a8aba4d8249",
-   "sha256": "1kfx4w7bmw42x3g64zj3wpvg9cawgblrrywlp18zl0qygxj4jg5c"
+   "commit": "f6abd9f4d4ec44edd04eeb75e23ec87988509d8b",
+   "sha256": "1vy653j7abbnvc03vy28y0vnvq8rzfd2zv0qbgp8zs70svfcnjxz"
   }
  },
  {
@@ -8980,15 +9072,15 @@
   "repo": "ema2159/centaur-tabs",
   "unstable": {
    "version": [
-    20200103,
-    1548
+    20200214,
+    1651
    ],
    "deps": [
     "cl-lib",
     "powerline"
    ],
-   "commit": "9b2ae1ace8c0d4ad1fa90047105793274baa1d48",
-   "sha256": "1rcf2jnpvkrmpsqcbrbqrn142dzgixzcv8fa095a2gzp9cdf64rj"
+   "commit": "96b7c90bdcb6fe3d7c5146b579ab7b9794c2a17b",
+   "sha256": "01dik5v8b331vplvm3qclg04z2qdcfk0gfb12rz8p503s8y4xisi"
   },
   "stable": {
    "version": [
@@ -9115,8 +9207,8 @@
     20171115,
     2108
    ],
-   "commit": "c505dc774244e8cb10ec479940a04a0580d36f06",
-   "sha256": "0sn459dj9a0zr4bbbzlwx2hcmd82x535ap4czybjpsnyjn51lpac"
+   "commit": "911033c7b88a5aa166cfabe36df3c9a2083caf8a",
+   "sha256": "1imbp99fxyq6zjkfnjmmhra68p0kgg3axhnx57k3xmlfqqw69hw9"
   },
   "stable": {
    "version": [
@@ -9311,8 +9403,8 @@
    "deps": [
     "avy-menu"
    ],
-   "commit": "e73949b26406a397a70624f6086183cb41ce1353",
-   "sha256": "1v3zqazw89i0v68ga262s1ljf3g7s838vx6hirdy1xc2qxfqqmlk"
+   "commit": "22d0e061f170d59d7cf6bcd948c11fa0266b7771",
+   "sha256": "1m29vg4cispsd8nl8lpmv5fify1208nrf8h7nkl17pplrk7hqhwb"
   },
   "stable": {
    "version": [
@@ -9382,11 +9474,11 @@
   "repo": "davep/cheat-sh.el",
   "unstable": {
    "version": [
-    20191027,
-    1038
+    20200226,
+    1021
    ],
-   "commit": "bd970d7c576b8720d63a1e7fd88ea8a943f2160b",
-   "sha256": "027ws9hz84d4j00bfl5s0id8jcv2yqjkjmph1890w37miwj62cjf"
+   "commit": "52293c366044e44c8f6b648a312433345e4718ad",
+   "sha256": "098b70gvyr74ygzbpyfvpn2zzlij47bzvqqj89igh10s4lxj0lzb"
   },
   "stable": {
    "version": [
@@ -9754,8 +9846,8 @@
   "repo": "clojure-emacs/cider",
   "unstable": {
    "version": [
-    20200101,
-    839
+    20200227,
+    1414
    ],
    "deps": [
     "clojure-mode",
@@ -9766,13 +9858,13 @@
     "sesman",
     "spinner"
    ],
-   "commit": "6e00ad359f87e658d7fa2c533731b60d9ce26a35",
-   "sha256": "1xvzlvv20hmcssk6lijdknqwikf8yfsv4hjp6zbglq60545s1hx2"
+   "commit": "1a33e62cc56c1d3f4e4c80604140bdef40e3cf57",
+   "sha256": "0i4kbkl6vck2pnk2p6ars9ifj5b7haigfrmaid9qq8qq2nslczrq"
   },
   "stable": {
    "version": [
     0,
-    23,
+    24,
     0
    ],
    "deps": [
@@ -9784,8 +9876,8 @@
     "sesman",
     "spinner"
    ],
-   "commit": "ce42702154709ef5d991e2732511c50d69de256c",
-   "sha256": "05yjkqc6d4grq9z5pxmv3anqh4zlhfg4v46jlccp6ynh030g7axs"
+   "commit": "bfcf9157a970c9423fe27c5021f445b509e71280",
+   "sha256": "1y7fngd47c5dz6sdf4b5w5lxdw5jmm4wa98l4h48badl8cn6m1vl"
   }
  },
  {
@@ -9958,14 +10050,14 @@
   "repo": "jorgenschaefer/circe",
   "unstable": {
    "version": [
-    20191202,
-    1028
+    20200125,
+    2110
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "0c79138fb2d37940654649787cb17cb619268748",
-   "sha256": "0b2zmqrnvg37hwiywnb43zaggi3c7jh6zfdwp7z90hf98il13jpk"
+   "commit": "e5bf5f89741a9c43aa406491e94dd8d58c302fb4",
+   "sha256": "104l0b9n9ia7zrha20yaxp6c09wg1h5l5a8b988k6mhyj9a1w1aw"
   },
   "stable": {
    "version": [
@@ -10060,8 +10152,8 @@
     20191230,
     2341
    ],
-   "commit": "b3d28f3c7136be728caa6e57ce7eea16c7066bc9",
-   "sha256": "0ykz1gkaigb92ap491h8mlgp8vzw4yx67x1hizrrda9z65869avb"
+   "commit": "fa0f762cf55d42251b23b3096ab69ed32cd97c14",
+   "sha256": "1z4kplbnld62f396lh1hggdpvhlzk5fll7lcjz0dsh96m4cmx907"
   }
  },
  {
@@ -10095,14 +10187,14 @@
   "repo": "skeeto/cl-lib-highlight",
   "unstable": {
    "version": [
-    20140127,
-    2112
+    20200210,
+    1951
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "fd1b308e6e989791d1df14438efa6b77d20f7c7e",
-   "sha256": "1mc8kayw8fmvpl0z09v6i68s2lharlwpzff0cvcsfn0an2imj2d0"
+   "commit": "72afc4dd0107c357543244d09903767f49651c5c",
+   "sha256": "1ndjjdada219fgs68np4r7vg50s2h6060wd6wf0x3pnj8b0ca5wm"
   },
   "stable": {
    "version": [
@@ -10380,43 +10472,42 @@
   "repo": "clojure-emacs/clj-refactor.el",
   "unstable": {
    "version": [
-    20191223,
-    917
+    20200229,
+    1105
    ],
    "deps": [
     "cider",
     "clojure-mode",
-    "edn",
     "hydra",
     "inflections",
     "multiple-cursors",
     "paredit",
+    "parseedn",
     "seq",
     "yasnippet"
    ],
-   "commit": "e24ba6284317dbb3e678fcad325044c628da56da",
-   "sha256": "1ci08jkjvksy6wr3djij4wv3n8r4dar11z1sn1ap67sngx4q3z3f"
+   "commit": "92d372393a031e5fa73ef926447afe72b574cb45",
+   "sha256": "0lnis1qwk1gyxgapl06d7ww1mlb9a8ahl8zwa7y2n3jrgfm25qp4"
   },
   "stable": {
    "version": [
     2,
-    4,
+    5,
     0
    ],
    "deps": [
     "cider",
     "clojure-mode",
-    "edn",
     "hydra",
     "inflections",
     "multiple-cursors",
     "paredit",
-    "s",
+    "parseedn",
     "seq",
     "yasnippet"
    ],
-   "commit": "3d5d1fbf28bfcc00f917cd96d6784968dcbbc962",
-   "sha256": "1z9278syijnzxfwlghz7bps3jp4cdl0fxg6igwpjfl8ln56hxazk"
+   "commit": "92d372393a031e5fa73ef926447afe72b574cb45",
+   "sha256": "0lnis1qwk1gyxgapl06d7ww1mlb9a8ahl8zwa7y2n3jrgfm25qp4"
   }
  },
  {
@@ -10754,11 +10845,11 @@
   "repo": "vallyscode/cloud-theme",
   "unstable": {
    "version": [
-    20191106,
-    1836
+    20200221,
+    2201
    ],
-   "commit": "37e5246c90b747b634cbbc16871a156bb8477e91",
-   "sha256": "15pjvxgdamq69s344hasjc9gr8qczlcqz0y80la0c9xnbjgqdhns"
+   "commit": "bdac53baf1c38f83a16091db515047f7d42dac14",
+   "sha256": "0ikhngr4cq4v6dgj59fffbdd6z9pdfcckgblsk3xs26frqqqxknf"
   }
  },
  {
@@ -10892,17 +10983,19 @@
     20190710,
     1319
    ],
-   "commit": "75dfba223f0fbe9b599fe10662a5bc733f4f2623",
-   "sha256": "05gisydanpwq3mmdnvy6cf6969l42jf2ksanwlx6b5xh2mfpc1ni"
+   "commit": "61596e1cc861f975ec822f72d34842674b388646",
+   "sha256": "04m4im5qaxybh9kir1kclljzql3qiadhi1g64byyilgbl81vx6nv"
   },
   "stable": {
    "version": [
     3,
-    16,
-    2
+    17,
+    0,
+    -1,
+    1
    ],
-   "commit": "512ab500f06d6c645985cc8014c5e6291b9a059f",
-   "sha256": "0m0sd8ynrrhj8636jgixakpha814r1qpzcqdbnpddvjcvmijqjxv"
+   "commit": "125f0451a9061c60036c5f92d104ee9fb3111a98",
+   "sha256": "15spvk8392ngnxxm5v919nnvakw8aw4h1g3i41mhr9fs901z9cis"
   }
  },
  {
@@ -10970,11 +11063,11 @@
   "repo": "tumashu/cnfonts",
   "unstable": {
    "version": [
-    20191214,
-    1006
+    20200226,
+    206
    ],
-   "commit": "4af009919ab8965afe8b0daacef1ad13606da5bc",
-   "sha256": "1sgy6dkwn22nxm0rgrxbkq1sfrdh55ry5sq96xsl9k52gzzh27zz"
+   "commit": "1baddba41af7edd6d4eb3c24ac85ba4a1b30aa3f",
+   "sha256": "0hspqc5xhi0mmrwyakqbq7dikn56q05c5xsnpgkx2mjjx7z05jh1"
   },
   "stable": {
    "version": [
@@ -11072,14 +11165,14 @@
   "repo": "xuchunyang/code-stats-emacs",
   "unstable": {
    "version": [
-    20190407,
-    236
+    20200216,
+    2020
    ],
    "deps": [
     "request"
    ],
-   "commit": "15242297279cb0dee01fbb93ef7536e337e20bb7",
-   "sha256": "1f2fmxpijggk804pa2m86z2n9kp11n4w5k83a7l2qw6c855ax8lx"
+   "commit": "055c9ce9c1b630d062305919cbffb9cf88fd24a8",
+   "sha256": "12rydfm05i1qvav1c73wwlk63i8mvqi148hdx1fks7al4lkhg2nl"
   },
   "stable": {
    "version": [
@@ -11259,14 +11352,14 @@
   "repo": "ankurdave/color-identifiers-mode",
   "unstable": {
    "version": [
-    20190805,
-    1455
+    20200129,
+    144
    ],
    "deps": [
     "dash"
    ],
-   "commit": "58fc8706a8f44e8df4678eec8ce15636fd4db758",
-   "sha256": "04splp4nvfva2cv87gwmga9ak4fk1x8z087lbz0x46qy9sj0dpz4"
+   "commit": "923ed4789c5ab66369ac4dda7eedb910951684a6",
+   "sha256": "1d502n6bpdscgpqfanax1h0iirgpq8x56vh6bbpzg9i042i3z7ls"
   },
   "stable": {
    "version": [
@@ -11402,11 +11495,11 @@
   "repo": "purcell/color-theme-sanityinc-tomorrow",
   "unstable": {
    "version": [
-    20191231,
-    616
+    20200220,
+    1500
    ],
-   "commit": "09067a0744dd5c0e37d5bd03fc528b0fdfab95a2",
-   "sha256": "1gv8qq1ngw4s4xm9rbwx94sk2w7l64l0315f797dsc7sgjki0yma"
+   "commit": "437bdd7a96fee751c6f817aff0100dd44bb07b23",
+   "sha256": "0cjbl7m6a0mmiiidn7w7hcggc58l5503swfnasbzyd1pzdrnn15y"
   },
   "stable": {
    "version": [
@@ -11443,11 +11536,19 @@
   "url": "https://git.sr.ht/~lthms/colorless-themes.el",
   "unstable": {
    "version": [
-    20190927,
-    1305
+    20200221,
+    1655
    ],
-   "commit": "12678144d17edf36d34e6bcdc5435593e191d96d",
-   "sha256": "0fld15h92193bnbmka3ikq27hggxvsikzlzq4pi2n3kknq9hyh56"
+   "commit": "a7b7c0a32b174988f40378996cd8997f73524f19",
+   "sha256": "0khsf4xz0wjn774hy08pxafm79j55ns28q25pfzyj9s07hi4r0vz"
+  },
+  "stable": {
+   "version": [
+    0,
+    2
+   ],
+   "commit": "8e539097185704444a5dd5545924de92c11ba767",
+   "sha256": "1p16vxai8dj1vy4ahflwij1ldx00jzrjcinpgpc7wgh6ka748v11"
   }
  },
  {
@@ -11529,11 +11630,11 @@
   "repo": "cyrus-and/comb",
   "unstable": {
    "version": [
-    20190918,
-    14
+    20200114,
+    1325
    ],
-   "commit": "a68fd0274592e8dcca28a337c9ee913cb84efa9b",
-   "sha256": "1n2nk8nhvfiz8dw863q91k04jrmafirdi0mj88awq9ibpw453vzz"
+   "commit": "bd8e11b8593bc48f81ce01c0657d5a7977cafdf6",
+   "sha256": "0ndz25x1l0rzn5j8xg9ql2s2lgin1893kzf722chyk8147qwb0i8"
   },
   "stable": {
    "version": [
@@ -11825,20 +11926,20 @@
   "repo": "company-mode/company-mode",
   "unstable": {
    "version": [
-    20200102,
-    2354
+    20200228,
+    1919
    ],
-   "commit": "3c11c30c9ab41d8a9c88560071c48fbcdcbcba5d",
-   "sha256": "0x7ag716jp4xb7kmcmr8pqlxx1v0f2gkjx5gx34wxxqfrndwyx8i"
+   "commit": "94e22c45e92cf220abb9b5a582f85aa99c06004d",
+   "sha256": "0l3hxj2cf9fw7ma3ac95cigw733h2k0dv987hanfhlx2jckjyma1"
   },
   "stable": {
    "version": [
     0,
     9,
-    11
+    12
    ],
-   "commit": "3c11c30c9ab41d8a9c88560071c48fbcdcbcba5d",
-   "sha256": "0x7ag716jp4xb7kmcmr8pqlxx1v0f2gkjx5gx34wxxqfrndwyx8i"
+   "commit": "490d3e4e7ef3fbc90fb3e8747f902bf839a924cc",
+   "sha256": "0c31amc6gyfkmb1ii6mm56c75za1yxkj2iyhrjc45nn2mrh7yj7a"
   }
  },
  {
@@ -11849,8 +11950,8 @@
   "repo": "pythonic-emacs/company-anaconda",
   "unstable": {
    "version": [
-    20181025,
-    1305
+    20200129,
+    1830
    ],
    "deps": [
     "anaconda-mode",
@@ -11859,8 +11960,8 @@
     "dash",
     "s"
    ],
-   "commit": "398fad19160cc1d0e31dcb1d4a3f88de7a2d355d",
-   "sha256": "182cijh6l82jj1r7iwd93h3np9c8fvcibjhv7860rk9ik41n7wil"
+   "commit": "a31354ca8ea35c0b2c1f6bb2b1a02a6cfb5e564b",
+   "sha256": "05qaxb3qpz3bi6c88qspf50sh15hzc01354zhj0amd07bmqzhwfg"
   },
   "stable": {
    "version": [
@@ -11887,14 +11988,14 @@
   "repo": "krzysztof-magosa/company-ansible",
   "unstable": {
    "version": [
-    20191029,
-    2127
+    20200228,
+    2134
    ],
    "deps": [
     "company"
    ],
-   "commit": "8d1ffbc357ccb0c307815d0c7f2cbb699f92537b",
-   "sha256": "0rsdj502mqw9w1g5ylyi4szi789z9k7n8ay9ms4h6f1wi7fjd974"
+   "commit": "0bbf6561d95fb6e1f34aa971e7db5203f22366b5",
+   "sha256": "0ygdhrqva1q6qll40bg9bpd4z023vibzzb0xkidjvwhaa40m33b7"
   },
   "stable": {
    "version": [
@@ -11967,8 +12068,8 @@
     "axiom-environment",
     "company"
    ],
-   "commit": "3e7885d694efef923e7b53827d277c28bfa09320",
-   "sha256": "048x8mj72c57f62ffsad43mcrc201d8ilh339gnpm2yi8midv0ih"
+   "commit": "2c5384b994266008a20558db4ffe0525e66c0f5f",
+   "sha256": "17f40w9r4whz0v007pp13w060jq87ag42p21hcj93c14py5s4g67"
   }
  },
  {
@@ -12107,14 +12208,14 @@
   "repo": "redguardtoo/company-ctags",
   "unstable": {
    "version": [
-    20191108,
-    1018
+    20200209,
+    47
    ],
    "deps": [
     "company"
    ],
-   "commit": "3d21eaa511b5f0ca55205f203d28fd10ea1d3b39",
-   "sha256": "0lj5gkj2dl0c7sva8bi3bng2gm90sjq15g7w8r9nz70666szdr1i"
+   "commit": "fa5a3f7b765fc0e42a378fa2293be4c2817fe04e",
+   "sha256": "1wgxmy1pwwc7mvgw9bx3vvaay1pirzghvpqs6d9mnx1wbzn1x29b"
   },
   "stable": {
    "version": [
@@ -12644,8 +12745,8 @@
     "lean-mode",
     "s"
    ],
-   "commit": "f26e40daad2c1bd090e440a2b931205ac3b9b613",
-   "sha256": "022i1v885pvzz42cwrz7wp5amx25k664pvap7c4487hlrrkp1bg9"
+   "commit": "c9dffcda2951c22c483d1d22411d13bc132ce609",
+   "sha256": "1lj6j21hzya41fmlnw7faqmhvsdcgcidwibyvicgsb0gm6qqipjf"
   }
  },
  {
@@ -12713,27 +12814,27 @@
   "repo": "vspinu/company-math",
   "unstable": {
    "version": [
-    20190507,
-    2006
+    20200131,
+    2337
    ],
    "deps": [
     "company",
     "math-symbol-lists"
    ],
-   "commit": "600e49449644f6835f9dc3501bc58461999e8ab9",
-   "sha256": "1ps2lpkzn8mjbpcbvvy1qz3xbgrh6951x8y9bsd1fm32drdph9lh"
+   "commit": "a796053590012e6a15c8b527b521ffc15d137bd0",
+   "sha256": "1y1fw926insgdl7ib9ynxjrxf3p6wfjkfxvf5vgdca7267cvcll1"
   },
   "stable": {
    "version": [
     1,
-    3
+    4
    ],
    "deps": [
     "company",
     "math-symbol-lists"
    ],
-   "commit": "7e7f8c71f57b12f9bcbbf01f2bbcc59343ad76d4",
-   "sha256": "0akqhhjvzsg0lbqx4bbkfkzijidwgi3bb32sxl3yxz7zfm9pbhn2"
+   "commit": "a796053590012e6a15c8b527b521ffc15d137bd0",
+   "sha256": "1y1fw926insgdl7ib9ynxjrxf3p6wfjkfxvf5vgdca7267cvcll1"
   }
  },
  {
@@ -12879,15 +12980,15 @@
   "repo": "emacs-php/phpactor.el",
   "unstable": {
    "version": [
-    20190823,
-    1219
+    20200121,
+    1218
    ],
    "deps": [
     "company",
     "phpactor"
    ],
-   "commit": "b69f2d9b2490c26c782d327344a54c19b5142cb3",
-   "sha256": "0pkby33g4ih6mssndcv2d59b1xkisw64p14fn131d6cqfwqvcwjn"
+   "commit": "5ccf65d59e6bbc9cd958dd5988e8fd2143b0d57f",
+   "sha256": "0k4dzn4a5y4kq7yz3ifvzziv90rp5si380c5ypgxr5iwb1b8a0l3"
   },
   "stable": {
    "version": [
@@ -12939,8 +13040,8 @@
     "company",
     "pollen-mode"
    ],
-   "commit": "9673c72c5f38ab1196f17e694ed48b4ceb1b13be",
-   "sha256": "0mfz1x80zsjhq1870h7q4s2cncvh6jllci022fb9bllw4mrzh9a5"
+   "commit": "d0a33591498013886c2c4676e204cd684954e82a",
+   "sha256": "0lg65hzdjwbc3dav79f3jm7251yyq8ghcbccvkb32vwz281xhjnh"
   }
  },
  {
@@ -12951,15 +13052,15 @@
   "repo": "tumashu/company-posframe",
   "unstable": {
    "version": [
-    20200108,
-    450
+    20200225,
+    454
    ],
    "deps": [
     "company",
     "posframe"
    ],
-   "commit": "23da6d89f018517181afb4a82a711387bf102c48",
-   "sha256": "0wl2y304crkc5ylgbwqp8zply1r76758mm407rw1mlzijpljzldy"
+   "commit": "483ca5225681da5fa64ecc219604dc3acbab1059",
+   "sha256": "1jid82hvhdvvgcwy7ql5dd00bd9j3wgxrim15imjb22vwsq00qj3"
   },
   "stable": {
    "version": [
@@ -13092,8 +13193,8 @@
     "company",
     "s"
    ],
-   "commit": "33935e96540201adab43f3a765d62289eba9e286",
-   "sha256": "1sp4109fbj6cxq6v9lmkpkrlr6is340ibaqpslkkjyacjv6sv4cm"
+   "commit": "275ef708f08d3bf0eb30632148e5c6184eeaacdb",
+   "sha256": "118cgw5lsffqdqz95mnkw36mmnsbg9m52r2np4m7v14mjjwr9fby"
   }
  },
  {
@@ -13147,20 +13248,20 @@
     "company",
     "rtags"
    ],
-   "commit": "5f1eaf4355e2093afb2b7828f3ebddfcad1234be",
-   "sha256": "1ankfl792qq0p2mdp89gldisw2l3lp8p10dmmqxm3ys898b0p2rh"
+   "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a",
+   "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n"
   },
   "stable": {
    "version": [
     2,
-    37
+    38
    ],
    "deps": [
     "company",
     "rtags"
    ],
-   "commit": "11f49ef5c488da4c744f700b5cf07a8ebcb9f4ec",
-   "sha256": "0g443kw9y469banr70nv2fhlb7vyc3911d2mcyssrcsqjm1xdvlv"
+   "commit": "9687ccdb9e539981e7934e768ea5c84464a61139",
+   "sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx"
   }
  },
  {
@@ -13213,21 +13314,22 @@
     "company",
     "solidity-mode"
    ],
-   "commit": "20d769513f42d8f82a4de7a42db89f59fb1c8fa1",
-   "sha256": "00y7arkg16yp7p4pvhjq0gkgchvpq65ql8jq42hkamh3gvj8gssq"
+   "commit": "b190993dcb8376e80fb1d9b71f3ed6170bd2a341",
+   "sha256": "0s5xk38k3mc1d40dszlcgfpn5rvb7nsnnpmgr3c0bwqa4xh6yqrg"
   },
   "stable": {
    "version": [
     0,
     1,
-    9
+    10
    ],
    "deps": [
     "cl-lib",
-    "company"
+    "company",
+    "solidity-mode"
    ],
-   "commit": "d0ff4dea49540f37301d869f2797fca2492f55d5",
-   "sha256": "1wcy5z4wggn3zs9h1kyvm0ji51ppjcqdmym3mmxbrhan6a0kq724"
+   "commit": "93412f211fad7dfc3b02aa226856fc52b6a15c22",
+   "sha256": "06zqs7p22h1jkm3zs1i16wvch6rnzzb3m8d5r9r51clzpasf6zy8"
   }
  },
  {
@@ -13274,28 +13376,28 @@
   "repo": "stan-dev/stan-mode",
   "unstable": {
    "version": [
-    20191106,
-    131
+    20200221,
+    2025
    ],
    "deps": [
     "company",
     "stan-mode"
    ],
-   "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a",
-   "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0"
+   "commit": "599a0440086c660e6823622b35058f6d2d6d9637",
+   "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y"
   },
   "stable": {
    "version": [
     10,
-    0,
+    1,
     0
    ],
    "deps": [
     "company",
     "stan-mode"
    ],
-   "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a",
-   "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0"
+   "commit": "599a0440086c660e6823622b35058f6d2d6d9637",
+   "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y"
   }
  },
  {
@@ -13560,11 +13662,41 @@
   "repo": "jjzmajic/compdef",
   "unstable": {
    "version": [
-    20191211,
-    249
+    20200222,
+    338
    ],
-   "commit": "bb210101f2673cb9ff368027b8d272ad5b268648",
-   "sha256": "18iqhgpcvikk352x5g8m05lxmigpbc079rzwycg25w8n1hi2bvqi"
+   "commit": "79639b90e537058ab4de1961cee63a26c4ca2a10",
+   "sha256": "0rgf145x7v0y47knnkhx6dc1vflibs45daprc7wi8qlnjmjmr4vw"
+  }
+ },
+ {
+  "ename": "competitive-programming-snippets",
+  "commit": "0100042ee1356dd709d8bbeec4539ddc64317baa",
+  "sha256": "1mdkv2pn83mgj7yy4xf8nkm9bvxldiy7gdx4bpv36b9xw5zz6q6r",
+  "fetcher": "github",
+  "repo": "sei40kr/competitive-programming-snippets",
+  "unstable": {
+   "version": [
+    20200122,
+    1558
+   ],
+   "deps": [
+    "yasnippet"
+   ],
+   "commit": "b0245fcbabf035d89b80150add5d6a47859ab555",
+   "sha256": "07l495vv3by6r62i48jbfyr5pp1p6896cz25gkc7p3xqwrhi2min"
+  },
+  "stable": {
+   "version": [
+    1,
+    1,
+    4
+   ],
+   "deps": [
+    "yasnippet"
+   ],
+   "commit": "b0245fcbabf035d89b80150add5d6a47859ab555",
+   "sha256": "07l495vv3by6r62i48jbfyr5pp1p6896cz25gkc7p3xqwrhi2min"
   }
  },
  {
@@ -13599,18 +13731,19 @@
   "repo": "emacs-php/composer.el",
   "unstable": {
    "version": [
-    20180923,
-    1140
+    20200214,
+    1119
    ],
    "deps": [
+    "cl-lib",
     "f",
     "php-runtime",
     "request",
     "s",
     "seq"
    ],
-   "commit": "269270e13b2be00a9cc7d08bd2a96d6bca64cae2",
-   "sha256": "1bwrmgkkyq35zm5vb9krhdgirsz5hilif6i1k7nsm4bl1msf0h6m"
+   "commit": "8b4867e30efcdf10c6d9a74822aa281404377818",
+   "sha256": "1605fk7nkzjshn6faxw0ycn45a1wbivpmlmyaxcqzjhmawavky6b"
   },
   "stable": {
    "version": [
@@ -13643,8 +13776,8 @@
    "deps": [
     "dash"
    ],
-   "commit": "bcda169785d02285226cab06cdb3fec4407b7eb3",
-   "sha256": "14jx6k70595jhb86l2h48k6j2j5m2sc7v8ldyycdiba8i3dj510i"
+   "commit": "e6e2d9ca71a7a46c0e4ebeb30e4994c2a8b5fe0d",
+   "sha256": "16x9xbf3km6k8xjivlf2ill7pmvrmaf3c35baznixm6hwdcv4wib"
   }
  },
  {
@@ -13685,8 +13818,8 @@
   "repo": "necaris/conda.el",
   "unstable": {
    "version": [
-    20191121,
-    1521
+    20200120,
+    1721
    ],
    "deps": [
     "dash",
@@ -13694,8 +13827,8 @@
     "pythonic",
     "s"
    ],
-   "commit": "41e9593cf230a50183a36fa9c0a4853acb2e7505",
-   "sha256": "07ckq7zvn00izk39wqrl2hgg8pa5p2nra0xdi9p5ra481iiinq47"
+   "commit": "335474e409774e31125fe320a4a54c8d92bf5fa2",
+   "sha256": "10aadbvsg6qy11nfkmc5rvivjvyak6501srmjl6lvzxsw8q79fj4"
   },
   "stable": {
    "version": [
@@ -14141,14 +14274,14 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20200105,
-    1947
+    20200224,
+    2036
    ],
    "deps": [
     "swiper"
    ],
-   "commit": "baac6e1c32ee895ea543f341a62204946237fe9c",
-   "sha256": "0z9mgvvs8dqkbzp3gqpvfwrdh88arvxiqmrgvl3xxcix5w06gqnb"
+   "commit": "fcf5dcfd5796637d64164fd17956c5bc54e25612",
+   "sha256": "1hx00axmjfgc14ixj16pg7029zj7rsx2i80sw6f2bvp543l2aicq"
   },
   "stable": {
    "version": [
@@ -14288,14 +14421,14 @@
   "repo": "redguardtoo/counsel-etags",
   "unstable": {
    "version": [
-    20191211,
-    1129
+    20200224,
+    410
    ],
    "deps": [
     "counsel"
    ],
-   "commit": "9d7f0c4aea8f36710fa7957c306a39f7abf49202",
-   "sha256": "02gygn77x9rm51bqa9mykykjwflmz7cdz3qp1b8kd8qkd2zl3q1q"
+   "commit": "172c1f1d806f36d10bdeb6284e1adbce6c52091f",
+   "sha256": "0kbkf5244ajxri4x8aaxsc11jq90lsmpw3jyb5z8yfk1wisdx274"
   },
   "stable": {
    "version": [
@@ -14473,15 +14606,15 @@
   "repo": "ericdanan/counsel-projectile",
   "unstable": {
    "version": [
-    20191204,
-    1759
+    20200214,
+    1450
    ],
    "deps": [
     "counsel",
     "projectile"
    ],
-   "commit": "cadc6de7070458781a373b052adddf102bbed302",
-   "sha256": "04fn3rg68ssa5kj2yv5gr62jlhpsvmspiqssgmaqfnx6rhkd3vpx"
+   "commit": "b556ed8995f375e57496f3482aef4b0def565de8",
+   "sha256": "105lvn2bmz6lgxx5y6k9gnhkl4p8igxwgnfz5anxlcv32w7q21pw"
   },
   "stable": {
    "version": [
@@ -14523,14 +14656,14 @@
   "repo": "Lautaro-Garcia/counsel-spotify",
   "unstable": {
    "version": [
-    20200104,
-    2216
+    20200119,
+    1340
    ],
    "deps": [
     "ivy"
    ],
-   "commit": "e673b7adbaff423f14613f90ec2ed00b0f242792",
-   "sha256": "0mx8b7x81i6rr5hzym66qhaz65bgbayf2q9rvqgd2rh6l51icbm9"
+   "commit": "d70bdd7e92a138195234e0c002252c8972807e08",
+   "sha256": "1q94cgx86fi6xxys9a5j31mg10sg5ds2s8xljp71a3g1hcwk7vkw"
   }
  },
  {
@@ -14635,8 +14768,8 @@
     "f",
     "s"
    ],
-   "commit": "803592baf1fb210415d943689af2bf5b79cdd24e",
-   "sha256": "0wp89sq9jy97cvsihqn9dk62m7rp6154c00214f84xb1vab7bcpw"
+   "commit": "9e6f4af7a07e281913f9f50f20dbbf6f26807563",
+   "sha256": "1w27hi64wcd86pw4ds2w4yldfm0wsk15f9mpcinyb68sj1p7sn9y"
   }
  },
  {
@@ -15164,8 +15297,8 @@
   "repo": "hlolli/csound-mode",
   "unstable": {
    "version": [
-    20191113,
-    158
+    20200301,
+    31
    ],
    "deps": [
     "dash",
@@ -15173,8 +15306,8 @@
     "multi",
     "shut-up"
    ],
-   "commit": "623127836352b1b83afed71fd542d87e5d3be352",
-   "sha256": "0nnsh6f02glrjrzs2f2blm0j397c8zkbwvwb61l7y9dx15a3rdrx"
+   "commit": "f8a1af8cfdf9093911a159f73d39ba4f1f671e6c",
+   "sha256": "1gni984j1jlv2is0ah4730xalhv96wimm1iziavbsrsm4hcqqcgh"
   },
   "stable": {
    "version": [
@@ -15571,11 +15704,11 @@
   "repo": "n3mo/cyberpunk-theme.el",
   "unstable": {
    "version": [
-    20190717,
-    1509
+    20200115,
+    1720
    ],
-   "commit": "9779fc4c9f89b14c8c8bb238dd4ed6428ed30ba9",
-   "sha256": "1pgam947hcan24s2p0vswvjvg3kn39z8qmzpz433ilxd4wd2qz1c"
+   "commit": "07edefdec3956fba9076fe98cdc33df7bf617afc",
+   "sha256": "0swjbc61ii88j4myxfl5inn2j46jpf7giqd1kf0rjdyrc8zmj08h"
   },
   "stable": {
    "version": [
@@ -15645,8 +15778,8 @@
     20190713,
     1339
    ],
-   "commit": "f72f6a564ff32ec9af83df5c474de0374e29a266",
-   "sha256": "0vr44v674nsv7jsglmxvwcdm254rmvz4bxkak99rv39lkq2rvc09"
+   "commit": "78e3705cca65e1456ce26221690dca74c71735c1",
+   "sha256": "1mr0q76p7yw9wv48qwp66nw95c1k3x2yly1vfvdq3phbb8xr6g4q"
   },
   "stable": {
    "version": [
@@ -15684,17 +15817,17 @@
     20190111,
     2150
    ],
-   "commit": "3dc2b9dfc23638fbef2558d619709b5235d5df08",
-   "sha256": "0nh552256vh47l6zzjlf2r9wdndhpw0pkhm4mf1yfmkcxmyywyz4"
+   "commit": "f6bf6aa9c7d2414b54e7289639ae5f43b15ede05",
+   "sha256": "0sl9vz753np0qb6v5c3nf1kgyd7gyp4yslas5fwfs5j4f3981cdk"
   },
   "stable": {
    "version": [
     0,
     29,
-    14
+    15
    ],
-   "commit": "bfcaf163e3dcf472ef2af5dec6ac3fffd0d34e66",
-   "sha256": "0rzdx15z6y97cr1g1a3pqiiy2vx3jps3zgzz25bd9043nhhnmjcf"
+   "commit": "26cb654dcf4ed1b1858daf16b39fd13406b1ac64",
+   "sha256": "1b76f47yhalg4pipiarmax3869bwbv43a4qs8h1qrnibyzpwfy2z"
   }
  },
  {
@@ -15782,11 +15915,11 @@
   "repo": "cbowdon/daemons.el",
   "unstable": {
    "version": [
-    20190923,
-    1644
+    20200129,
+    929
    ],
-   "commit": "fac6c8bdd295138ddfc830dd94637c3e45a0823e",
-   "sha256": "1mpbshib5il4sxricirqlx37cy2kcfmd3x1szg7xk7i3ghayp0df"
+   "commit": "9320c6af524f923f20aa95c1a48b7ae41c3005a8",
+   "sha256": "0wlv3vjhw6v6q5br4bassw34k4kai6nrw10av4y6nkvw58i5b3h7"
   },
   "stable": {
    "version": [
@@ -15836,11 +15969,11 @@
   "repo": "rails-to-cosmos/danneskjold-theme",
   "unstable": {
    "version": [
-    20200107,
-    819
+    20200223,
+    1128
    ],
-   "commit": "79be83dac9f10a1487ed9a8b75ea2e606ffec639",
-   "sha256": "0is3jqr0fxd1winqjf6k23fxiflji4r9vgh493fhxzqn4r08yp8q"
+   "commit": "c6776c5f40587429a4fd6e9c52008bb9242ef692",
+   "sha256": "0qh21ry2vjsvr7yz110c6ggn8bhxdq2x37mwqalpibyx81clh3nw"
   }
  },
  {
@@ -15851,8 +15984,8 @@
   "repo": "jyp/dante",
   "unstable": {
    "version": [
-    20191229,
-    1922
+    20200131,
+    1211
    ],
    "deps": [
     "company",
@@ -15863,8 +15996,8 @@
     "lcr",
     "s"
    ],
-   "commit": "9289b6f053f343cb841ea7ca74758fe41bf6b74c",
-   "sha256": "1x36ck1wy19rlqfzcdy2xs888iqs1r1vkllnx8ld4z4aak1sg2mj"
+   "commit": "4955bc7363e250d22579bc34b0b4ab6611c0766c",
+   "sha256": "06xagrjl00iwvaf0cli3dhhvvn4x7ysvkir4120lwc9ispzc077m"
   },
   "stable": {
    "version": [
@@ -15892,8 +16025,8 @@
   "repo": "emacs-lsp/dap-mode",
   "unstable": {
    "version": [
-    20200104,
-    946
+    20200223,
+    1146
    ],
    "deps": [
     "bui",
@@ -15901,12 +16034,11 @@
     "dash-functional",
     "f",
     "lsp-mode",
-    "s",
-    "tree-mode",
-    "treemacs"
+    "lsp-treemacs",
+    "s"
    ],
-   "commit": "68f9c19bcc4c8f76c2d7258ec15d7b80cf2ade9a",
-   "sha256": "0zch80h1a151wpwcpj9s3v77p4qma6ah38k7r9cki79phlhz0ca1"
+   "commit": "e7a5144ce746942b00a21d35a1ca8be71195f5d4",
+   "sha256": "1ryn49v89d204f7dhdc6igw03vzz5gzqrpqmsdrcxcj5yci2wxyk"
   },
   "stable": {
    "version": [
@@ -16159,20 +16291,20 @@
   "repo": "magnars/dash.el",
   "unstable": {
    "version": [
-    20191109,
-    1327
+    20200119,
+    2310
    ],
-   "commit": "ea7adeb09c13de58336caa16243e192ea6ee88fb",
-   "sha256": "045nx37lnp9rncxgdarb6jn81pqrybggjf7ab6aknmh1imppqz0d"
+   "commit": "721436b04da4e2795387cb48a98ac6de37ece0fd",
+   "sha256": "153f55dqkhs8w2xlf6b88wp5vlkap7h8vjd9wxh4jp2ram5g4l1n"
   },
   "stable": {
    "version": [
     2,
-    16,
+    17,
     0
    ],
-   "commit": "258c324d9840901db83b2cabef3fa75bba57c1ba",
-   "sha256": "150k48llqz2mb66vbznpyj47r6g16amfl7hbg8q46djq8mp7zc2v"
+   "commit": "721436b04da4e2795387cb48a98ac6de37ece0fd",
+   "sha256": "153f55dqkhs8w2xlf6b88wp5vlkap7h8vjd9wxh4jp2ram5g4l1n"
   }
  },
  {
@@ -16238,20 +16370,20 @@
    "deps": [
     "dash"
    ],
-   "commit": "ea7adeb09c13de58336caa16243e192ea6ee88fb",
-   "sha256": "045nx37lnp9rncxgdarb6jn81pqrybggjf7ab6aknmh1imppqz0d"
+   "commit": "721436b04da4e2795387cb48a98ac6de37ece0fd",
+   "sha256": "153f55dqkhs8w2xlf6b88wp5vlkap7h8vjd9wxh4jp2ram5g4l1n"
   },
   "stable": {
    "version": [
     2,
-    16,
+    17,
     0
    ],
    "deps": [
     "dash"
    ],
-   "commit": "258c324d9840901db83b2cabef3fa75bba57c1ba",
-   "sha256": "150k48llqz2mb66vbznpyj47r6g16amfl7hbg8q46djq8mp7zc2v"
+   "commit": "721436b04da4e2795387cb48a98ac6de37ece0fd",
+   "sha256": "153f55dqkhs8w2xlf6b88wp5vlkap7h8vjd9wxh4jp2ram5g4l1n"
   }
  },
  {
@@ -16262,26 +16394,26 @@
   "repo": "emacs-dashboard/emacs-dashboard",
   "unstable": {
    "version": [
-    20191210,
-    1041
+    20200225,
+    745
    ],
    "deps": [
     "page-break-lines"
    ],
-   "commit": "87779af059b33559c88596793cc55504c418fd32",
-   "sha256": "15jpw52kjcl0zpzx3yancw6kyz3ddyzl9lah8qya2914sv5w01c7"
+   "commit": "b7857a361967a9f0f6370879b30854f1e2fd81ff",
+   "sha256": "1l6n707v77gc4lgrg5livl2isigv7j6dsrkfppkcyjz2xyvl0n3y"
   },
   "stable": {
    "version": [
     1,
-    6,
+    7,
     0
    ],
    "deps": [
     "page-break-lines"
    ],
-   "commit": "5b66b65c4c7536f43e8e58b3f7055e5bd6381cda",
-   "sha256": "1g6g8vad1kdmv1zxp95a8sn70idl26isqjb3xk1r95pqnx1cn591"
+   "commit": "8dda82fcd4d0954f37a472ad68fb8df55195820e",
+   "sha256": "1qv4cqjy2s2d2bysbq10vq1axpbd8qc3jn1s1r81lxqkcja8zasa"
   }
  },
  {
@@ -16415,26 +16547,26 @@
   "repo": "doublep/datetime",
   "unstable": {
    "version": [
-    20190404,
-    1837
+    20200208,
+    1629
    ],
    "deps": [
     "extmap"
    ],
-   "commit": "8c6d6fc991766e6bf9cefc4ea4b04eeae8116a84",
-   "sha256": "0c5y304pvns8jhy4fpz4jmbfxdgz8ms04hgrnsb0g168szc9g0s9"
+   "commit": "0ae7addb2c46133393f59011b2aecc08de49b8d1",
+   "sha256": "1df6c5wsn6nwqvfx11d7x3wkjazri3946fwy0m9i6mx18yac38h0"
   },
   "stable": {
    "version": [
     0,
     6,
-    4
+    5
    ],
    "deps": [
     "extmap"
    ],
-   "commit": "8c6d6fc991766e6bf9cefc4ea4b04eeae8116a84",
-   "sha256": "0c5y304pvns8jhy4fpz4jmbfxdgz8ms04hgrnsb0g168szc9g0s9"
+   "commit": "4a480b66179f016100a582af170a76cda19c980a",
+   "sha256": "0j7k6157fvzl1395ybnrgcz697h6cjk9v445nnfi7q0l8vylbfvm"
   }
  },
  {
@@ -16537,15 +16669,15 @@
   "repo": "skk-dev/ddskk",
   "unstable": {
    "version": [
-    20191210,
-    1919
+    20200301,
+    237
    ],
    "deps": [
     "ccc",
     "cdb"
    ],
-   "commit": "51747f7afb5b66675bd9e1e812c93a8aba4d8249",
-   "sha256": "1kfx4w7bmw42x3g64zj3wpvg9cawgblrrywlp18zl0qygxj4jg5c"
+   "commit": "f6abd9f4d4ec44edd04eeb75e23ec87988509d8b",
+   "sha256": "1vy653j7abbnvc03vy28y0vnvq8rzfd2zv0qbgp8zs70svfcnjxz"
   }
  },
  {
@@ -16587,16 +16719,16 @@
   "repo": "Wilfred/deadgrep",
   "unstable": {
    "version": [
-    20191031,
-    2214
+    20200202,
+    1520
    ],
    "deps": [
     "dash",
     "s",
     "spinner"
    ],
-   "commit": "6ea9ad874827e7ba6c8f5e62a89a5a479cd20735",
-   "sha256": "0ngq8ysyfyrrb7mkh02i7wwqig29njad9ndam3bbsbqh07ihdywa"
+   "commit": "3ec95398d09719a9dbdc3a67d29d22ca224516cf",
+   "sha256": "0rxzm30md5s87s6j1aqgjxa9kb637v11b7q194l8zzhf457ky6la"
   },
   "stable": {
    "version": [
@@ -17056,11 +17188,11 @@
   "repo": "DamienCassou/desktop-environment",
   "unstable": {
    "version": [
-    20191114,
-    441
+    20200225,
+    1042
    ],
-   "commit": "57de5e018baa1c7667230cae657c80ca765ae912",
-   "sha256": "195n99xvxyh4cfxjpfa1h1maalqrxf7nyi0bh3lqa1z6z5bdb6x2"
+   "commit": "dbcf3d9411d53908de09ab0d34932d19c8117144",
+   "sha256": "12lqwc3aqrly85ihdrh4k4vwglqypbi250fl0aasbbiwpbnraawa"
   },
   "stable": {
    "version": [
@@ -17234,15 +17366,15 @@
   "repo": "cqql/dictcc.el",
   "unstable": {
    "version": [
-    20190807,
-    1504
+    20200209,
+    1810
    ],
    "deps": [
     "cl-lib",
     "ivy"
    ],
-   "commit": "33df7c64ee5bb9faf77a4b80cd123d35a15ad706",
-   "sha256": "1dxn41p4bmi7l8lz6kp56qhb4v2qi7x8wijyicd3715amsagl2jc"
+   "commit": "e07ebfc577b904b3387705a91395ac873e42c727",
+   "sha256": "0wi3iz31qizd3xsys1pyfr2zfn03x27lrja5s8170s27zqkwm56j"
   },
   "stable": {
    "version": [
@@ -17519,8 +17651,8 @@
     20160818,
     949
    ],
-   "commit": "79b81724b951fedffdd3113f473c18990af837a9",
-   "sha256": "1fclhpcrsi09z2np7q3dq3hhb3pqxsvv1l2dqis27afxnb1zshr3"
+   "commit": "5515f2e8657ef14adcc34aa5b05383a2684328ae",
+   "sha256": "044f337k5swz9bgfmisk6mqr5gjfv3y7zclqspdw846ka4kwpr2z"
   },
   "stable": {
    "version": [
@@ -17610,11 +17742,11 @@
   "repo": "gonewest818/dimmer.el",
   "unstable": {
    "version": [
-    20191213,
-    2008
+    20200301,
+    43
    ],
-   "commit": "f42411f8678e5745b6610ec24ab62bcb389a83ec",
-   "sha256": "00lq0zaslnhm51yymbprd9s93waszq6skjy6y6a6yr1pfsa6ibhv"
+   "commit": "b9a35a236314e9afe173287a5aaf5ac7307f6067",
+   "sha256": "1a8aagg6087l9pi4pjk91k1liikbsp6mxbnpx3mzzcvylh2kis5f"
   },
   "stable": {
    "version": [
@@ -17871,6 +18003,27 @@
    "sha256": "0b5mk501sy3b2ak46yyy8qcl5f5fsc9py750n962qfh2zs1amrbs"
   }
  },
+ {
+  "ename": "dired-git",
+  "commit": "640074b41e5b70e3b32484ea850a681e9026a9cf",
+  "sha256": "09qh6zjpyasqlsjnakal6a5i04pkhps51b064470rgg855jfh9li",
+  "fetcher": "github",
+  "repo": "conao3/dired-git.el",
+  "unstable": {
+   "version": [
+    20200130,
+    743
+   ],
+   "deps": [
+    "all-the-icons",
+    "async",
+    "async-await",
+    "ppp"
+   ],
+   "commit": "11938721f7202aa784cc493027e3a0ec2c0d39b5",
+   "sha256": "1b5vc9hc26cs1dq7lmvm5gly4h6ahpp0dnlbxi8p4mza12yhnrwi"
+  }
+ },
  {
   "ename": "dired-hacks-utils",
   "commit": "568e524b7bdf91b31655bdbb30fe9481d7a0ffbf",
@@ -18163,15 +18316,15 @@
   "repo": "stsquad/dired-rsync",
   "unstable": {
    "version": [
-    20200101,
-    1207
+    20200225,
+    1343
    ],
    "deps": [
     "dash",
     "s"
    ],
-   "commit": "698294cbd4b731abcb617f29aa133bc9c60b2651",
-   "sha256": "0q4w99cjp7ibbhjcgyzbwchk8k7qljp7w9p5dvszsfxiwfxgyg4w"
+   "commit": "276a313bd61096ad680769c8d419c1cf3d5981e9",
+   "sha256": "1s4cllfwyspp65f05f3jw449ijn6m96pbn3vjpil4b116hsxm1qb"
   },
   "stable": {
    "version": [
@@ -18194,14 +18347,14 @@
   "repo": "jojojames/dired-sidebar",
   "unstable": {
    "version": [
-    20191024,
-    116
+    20200226,
+    333
    ],
    "deps": [
     "dired-subtree"
    ],
-   "commit": "21ccb6723bea69f2e2ca25998268d8a039f904cc",
-   "sha256": "0mck4qk6srbbf8xnn2sg11j822z4ybxvgavvy402d5sli515i8ca"
+   "commit": "5f88a4570eae9645be06ff22542f110aeb70dd7d",
+   "sha256": "0l1wr7g4lfqmvhw3vir6fmwxmid9sasxlf5pxxvh0z8kps53f0cn"
   },
   "stable": {
    "version": [
@@ -18227,8 +18380,8 @@
     20180824,
     312
    ],
-   "commit": "b0ccca83df0542c5525c047ae283c0eadf500f5c",
-   "sha256": "14q8lp1x1b78ra9mk90n6dyrm1j9ny5pr7valgpkg8agqyqn7xmn"
+   "commit": "cfd463598175d89672a766a4f4a4a778836186e2",
+   "sha256": "0bpk4hqa9k702k0mcbg62wy29sx1n1dzrprkzp4x76ixgzfav3lj"
   },
   "stable": {
    "version": [
@@ -18236,7 +18389,7 @@
     2,
     0
    ],
-   "commit": "c66c9969428d1cf3544a164d7e5347e8efb5dd5a",
+   "commit": "27120d6a079541e994105e3f969032d3ae7edaa4",
    "sha256": "14q8lp1x1b78ra9mk90n6dyrm1j9ny5pr7valgpkg8agqyqn7xmn"
   }
  },
@@ -18360,34 +18513,34 @@
   "repo": "wbolster/emacs-direnv",
   "unstable": {
    "version": [
-    20191016,
-    1907
+    20200229,
+    1525
    ],
    "deps": [
     "dash"
    ],
-   "commit": "fd0b6bbd5e3eaf6aa48bccd4a1ff3048bfb2c69b",
-   "sha256": "0py0if1wl61y6f55s4p8y11rjvrgx3yk2v5n1q2xl3gg7f4ra136"
+   "commit": "1f93e3f9cae5ec171939fe5c1fe9744a28fa6576",
+   "sha256": "0xkqn4604k2imas6azy1www56br8ls4iv9a44pxcd8h94j1fp44d"
   },
   "stable": {
    "version": [
     2,
-    0,
+    1,
     0
    ],
    "deps": [
     "dash"
    ],
-   "commit": "468f2fb20d825dd7134e4efbaff3666917cd4ec3",
-   "sha256": "005ibyzsx1fdyrl5iyhqpb1bg83mphzahq7zvw58x00syyqi2z49"
+   "commit": "1f93e3f9cae5ec171939fe5c1fe9744a28fa6576",
+   "sha256": "0xkqn4604k2imas6azy1www56br8ls4iv9a44pxcd8h94j1fp44d"
   }
  },
  {
   "ename": "direx",
-  "commit": "a4b0903466d63b1c87abc002b0e064e36a8cddd3",
-  "sha256": "1x3rnrhhyrrvgry9n7kc0734la1zp4gc4bpy50f2qpfd452jwqdm",
+  "commit": "7856a62fb86415c88aa72b574895328c93c10a09",
+  "sha256": "0qp3pidsa9gwz8vhcfg3l5vl6w8071gk04amba8cpc0w3a9pps95",
   "fetcher": "github",
-  "repo": "m2ym/direx-el",
+  "repo": "emacsorphanage/direx",
   "unstable": {
    "version": [
     20170422,
@@ -18772,14 +18925,14 @@
   "repo": "unhammer/dix",
   "unstable": {
    "version": [
-    20191115,
-    824
+    20200108,
+    1057
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "da94351df5b185d5ad620bb7c3bbe7a6a5fa59fc",
-   "sha256": "1mk2nqiva6g7z8632qm5nbgbj9z3vf13hkjcaxz3jyw00lhyhsql"
+   "commit": "391832823f3f9835d957bc0224e122b376e5d825",
+   "sha256": "1h7wxi1nk6051arzx8671sf3m178ci9gs3a78h4hp8z0jrz364kz"
   },
   "stable": {
    "version": [
@@ -18809,8 +18962,8 @@
     "dix",
     "evil"
    ],
-   "commit": "da94351df5b185d5ad620bb7c3bbe7a6a5fa59fc",
-   "sha256": "1mk2nqiva6g7z8632qm5nbgbj9z3vf13hkjcaxz3jyw00lhyhsql"
+   "commit": "391832823f3f9835d957bc0224e122b376e5d825",
+   "sha256": "1h7wxi1nk6051arzx8671sf3m178ci9gs3a78h4hp8z0jrz364kz"
   },
   "stable": {
    "version": [
@@ -19117,8 +19270,8 @@
   "repo": "Silex/docker.el",
   "unstable": {
    "version": [
-    20191222,
-    939
+    20200218,
+    1257
    ],
    "deps": [
     "dash",
@@ -19128,8 +19281,8 @@
     "tablist",
     "transient"
    ],
-   "commit": "baba7f72ea9e642536ca3664c2082722062b046e",
-   "sha256": "0vcmlw8v9rgpfyahfjx8fbdh524m2dkil23gp4gf5n4l696chk6z"
+   "commit": "a2092b3b170214587127b6c05f386504cae6981b",
+   "sha256": "1q3fgh3sjly62h86yvjqhr7j1yyrsfygk4rqkx0p7a052s2qvqi7"
   },
   "stable": {
    "version": [
@@ -19280,6 +19433,21 @@
    "sha256": "1cmh8pwwa6dhl4w66wy8s5yqxs326mnaalg1ig2yhl4bjk8gi4m2"
   }
  },
+ {
+  "ename": "doct",
+  "commit": "f075d73b3269eec73dda992ce2bee67ccdfe4911",
+  "sha256": "0z4h2pmlmzaz2726pmd2y7g63k5ncw4fwd5jh5rv744f5pxxfs2m",
+  "fetcher": "github",
+  "repo": "progfolio/doct",
+  "unstable": {
+   "version": [
+    20200225,
+    2305
+   ],
+   "commit": "671ff27f9ee97b4ca79edcad8626a0356732d0cc",
+   "sha256": "0ajvys20w8fp661x8y7j7f72kmw5ylwvcdxrhiplk6h6xhacjwdc"
+  }
+ },
  {
   "ename": "dokuwiki",
   "commit": "e608f40d00a3b2a80a6997da00e7d04f76d8ef0d",
@@ -19351,8 +19519,8 @@
     20181110,
     1857
    ],
-   "commit": "925845844035998a941faed57baea9142cb61a44",
-   "sha256": "0nbr9ncc73w6b138ccgnknlynn0lja2ap2h7131krz9p0n07hkll"
+   "commit": "da4fa915a2a659001eea04498d790cdd8cac1fce",
+   "sha256": "1xlh20vc43ywljjw13cp0aj4h9qackhqqzm0yi5g881lcyng2ca1"
   }
  },
  {
@@ -19392,21 +19560,21 @@
   "repo": "seagle0128/doom-modeline",
   "unstable": {
    "version": [
-    20200106,
-    622
+    20200301,
+    657
    ],
    "deps": [
     "all-the-icons",
     "dash",
     "shrink-path"
    ],
-   "commit": "4afe41ef3de2407f52c4954829240a3714256107",
-   "sha256": "041hdfp8ykiqm6apajriipbc6wgbysxak6ffaiwzw9zv909qywyh"
+   "commit": "0df558598451c36714c0793283fecc064adaf786",
+   "sha256": "1gi3qcqnv0qs8f1921s0bs6ppc3z44sbb035qdlzm1lii7s2v4ll"
   },
   "stable": {
    "version": [
     2,
-    8,
+    9,
     2
    ],
    "deps": [
@@ -19414,8 +19582,8 @@
     "dash",
     "shrink-path"
    ],
-   "commit": "a6f6f25877343a5fcf04eaffa410175411a4c1dd",
-   "sha256": "11srz1mr821axggs2jcmdhihxx09a2dniqv3n039wbdfaimfaidz"
+   "commit": "e6d690bae01cb68e7171857fe07ac914d7a19f4b",
+   "sha256": "0k5rppzpycl1aggg6cvwvgxylgvjbxksvdah8fkrrmx3dwcr2y3p"
   }
  },
  {
@@ -19426,14 +19594,14 @@
   "repo": "hlissner/emacs-doom-themes",
   "unstable": {
    "version": [
-    20200106,
-    100
+    20200225,
+    1641
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "2ec6df8905e22586f349290b6f39b320fc2e21be",
-   "sha256": "0wbxn41j2i6ca7y7gvdr3qmwhsw2bbazg9ckkbl9ycjmchjpxb20"
+   "commit": "756cf15a6bfb3146f2a28a861c1d9e4e86605cdf",
+   "sha256": "01w67r9vms19mrz8nc8mbyq0gkvgbixpcl14xbb51mrvnssaf3qb"
   },
   "stable": {
    "version": [
@@ -19662,11 +19830,11 @@
   "repo": "dracula/emacs",
   "unstable": {
    "version": [
-    20191227,
-    1527
+    20200228,
+    1008
    ],
-   "commit": "a492387de86096bd274834bfc9e8f35ef708b958",
-   "sha256": "03wsj02mqb6czcx5205fzfg3bzxazy2hmkhjac4dr2qma09w59j5"
+   "commit": "f7cf1b23ae8f70aaf723552159213d143b92889a",
+   "sha256": "1lz24sbwc3d98ibjvqb160qb2jkknm53v0imdykw86bjqgplxvv7"
   },
   "stable": {
    "version": [
@@ -19805,14 +19973,14 @@
   "repo": "arnested/drupal-mode",
   "unstable": {
    "version": [
-    20171120,
-    2309
+    20200210,
+    2222
    ],
    "deps": [
     "php-mode"
    ],
-   "commit": "ee53f9e12bb3a80d65876a005b3a5a8ae6c7ab59",
-   "sha256": "1nrgx70gb1v84zn11a30ix24453g34v2zxw20d9w2xs9fv7vx55x"
+   "commit": "ee1a24c96a7487bb9df8dd15656be7d8330028f0",
+   "sha256": "1h0p1z0s02vn7b4p2kj6jr49y245wjf5grcv0n5riqds2s863q2v"
   },
   "stable": {
    "version": [
@@ -19874,8 +20042,8 @@
   "repo": "dtk01/dtk",
   "unstable": {
    "version": [
-    20191215,
-    2352
+    20200215,
+    554
    ],
    "deps": [
     "cl-lib",
@@ -19883,8 +20051,8 @@
     "s",
     "seq"
    ],
-   "commit": "be7a8e148c022f73794e168dbba2ae821f400bf7",
-   "sha256": "1n6idkkmpbjrasacbyxdbfmxcy1v2kwxfwnbndmwn0pl9zqk4kbc"
+   "commit": "eb153de123af04fa7ce10ba4ce77f0cf764bc2de",
+   "sha256": "0prk6fl76dl5ay27ncfqr06spiv2fqr7hc8dad5dqw70w9d29vji"
   }
  },
  {
@@ -19992,8 +20160,8 @@
   "repo": "jacktasia/dumb-jump",
   "unstable": {
    "version": [
-    20191128,
-    1910
+    20200222,
+    2006
    ],
    "deps": [
     "dash",
@@ -20001,8 +20169,8 @@
     "popup",
     "s"
    ],
-   "commit": "738d40ceb7e2d6a3a26f7f27a31ba93924baaa2d",
-   "sha256": "0fpvzxvn6vhqsxqjhsxdf92x8vsiwyapgahbzl8c5bvq9rqdmlfi"
+   "commit": "a0ec2f139325bf3b39664e2a85be042a06f63af8",
+   "sha256": "12agvqxx50sg0klz3q6rcgfx5m2dw7idn65vwwamb019fpr4q94p"
   },
   "stable": {
    "version": [
@@ -20046,17 +20214,17 @@
     20191016,
     1241
    ],
-   "commit": "78495a08c9b271b324d0b2485dda539599c0fbc9",
-   "sha256": "1765z4v30crrsivvhr3qqspj3n0rhpb72isxpvbabswyawh4900m"
+   "commit": "d90488a7e2c24ecc7136bbcb270bfb30d4f1ad4f",
+   "sha256": "0pqlwkz3j5kpghqgx29xns0s8a66mi48prarirgqq8knfd7vkvzs"
   },
   "stable": {
    "version": [
     2,
-    1,
+    3,
     1
    ],
-   "commit": "4cba00ad7b228c46166404412dac92436c1f86de",
-   "sha256": "1lgpzf2mca3rh1mg46vn0d5jb7afm26p8n83iv5ngjarwd5064gk"
+   "commit": "4e9ca5de1bf9eb8cd3d2277634d418ba747be864",
+   "sha256": "124x7yh8mjmqrf3z962sdcakd1ka3js5kg2vx767ygw4q6w8cjdh"
   }
  },
  {
@@ -20506,28 +20674,28 @@
   "repo": "masasam/emacs-easy-hugo",
   "unstable": {
    "version": [
-    20191215,
-    318
+    20200209,
+    743
    ],
    "deps": [
     "popup",
     "request"
    ],
-   "commit": "9b3249872ed7b698909f580eb80b3d756acb94c2",
-   "sha256": "0i6smms1wck41d4gzkqx0q1ab5s1qszcfdb0gdncqq42qxwbqbvl"
+   "commit": "30145bb0bd5b04d9c413f5ace2fd0e52b2519663",
+   "sha256": "1i3wjkxksmq4d364sc56243p847rkyzzh10xj1j5a3zm69g3v53z"
   },
   "stable": {
    "version": [
     3,
-    8,
+    9,
     45
    ],
    "deps": [
     "popup",
     "request"
    ],
-   "commit": "9b3249872ed7b698909f580eb80b3d756acb94c2",
-   "sha256": "0i6smms1wck41d4gzkqx0q1ab5s1qszcfdb0gdncqq42qxwbqbvl"
+   "commit": "30145bb0bd5b04d9c413f5ace2fd0e52b2519663",
+   "sha256": "1i3wjkxksmq4d364sc56243p847rkyzzh10xj1j5a3zm69g3v53z"
   }
  },
  {
@@ -20538,26 +20706,26 @@
   "repo": "masasam/emacs-easy-jekyll",
   "unstable": {
    "version": [
-    20191215,
-    1016
+    20200209,
+    651
    ],
    "deps": [
     "request"
    ],
-   "commit": "063f69505f4559b77fa4a5418df1a53849b29f19",
-   "sha256": "1z8997a9nvr0c04x5i7qrf5khy3l5w5llqshzgcxyb5jpmhl2hwz"
+   "commit": "3582ed543b3e9f5c32834f530abeba92ef0b4244",
+   "sha256": "0bqp6z1c1bf5gbj4rz717q47cj54ral2gagz8b6d7ihyn7398qq6"
   },
   "stable": {
    "version": [
     2,
-    3,
+    4,
     24
    ],
    "deps": [
     "request"
    ],
-   "commit": "063f69505f4559b77fa4a5418df1a53849b29f19",
-   "sha256": "1z8997a9nvr0c04x5i7qrf5khy3l5w5llqshzgcxyb5jpmhl2hwz"
+   "commit": "75f057caf54714b4e8a0934107f1ff8a05fc5349",
+   "sha256": "1753wf817z65sd23bkispsxyk67sd4r2yx9k6f1ncaywcl0z974k"
   }
  },
  {
@@ -20715,26 +20883,25 @@
   "repo": "joostkremers/ebib",
   "unstable": {
    "version": [
-    20191207,
-    844
+    20200229,
+    741
    ],
    "deps": [
     "parsebib"
    ],
-   "commit": "99bd909f47f71e024ce324981109b73a50e82fba",
-   "sha256": "131vgl4d1j9s4055x88409w19q52x2m0x08b961hylp7yb5ljzgh"
+   "commit": "96dff9eacad70d2fbd3cc432c9235413569080f9",
+   "sha256": "044p78y48cgv9wyxpf6kd137ppbh96dmd5xyaykafk9jf75h47kz"
   },
   "stable": {
    "version": [
     2,
-    19,
-    3
+    22
    ],
    "deps": [
     "parsebib"
    ],
-   "commit": "d69f59ae83ea92c17cc2f92040b76d9e47e12b81",
-   "sha256": "19hnrrvb0iwkmj095mqvm9qdpm0crr6f3268h5mh6l3qbm4zpj4l"
+   "commit": "f094f7741264ba5de14624b1b8da8a2ba678bfe7",
+   "sha256": "1hn11y09bpb10hxp0b7j72shivnnq1qyvw13lyjqlycr6rgvckb9"
   }
  },
  {
@@ -20745,11 +20912,11 @@
   "repo": "flexibeast/ebuku",
   "unstable": {
    "version": [
-    20200105,
-    201
+    20200203,
+    1122
    ],
-   "commit": "9ca9dbd65112157b265dc040db2e8fa9504d5d21",
-   "sha256": "1frk27lba5g195a03mf0wyyhbghi614zkzkbmm2avkvqzq7649mv"
+   "commit": "2f1af38469966c788483cbce4ab70436f72cf30d",
+   "sha256": "15liiczqjf8p2jr9356zrj65ijp5gdrnb5i7m09armyhb8282rmg"
   }
  },
  {
@@ -21255,14 +21422,14 @@
   "repo": "editorconfig/editorconfig-emacs",
   "unstable": {
    "version": [
-    20191127,
-    529
+    20200212,
+    739
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "65f8244ffbeb9bf2720d922d4b5fc74849b9af82",
-   "sha256": "0ifz26mnv53mlk2vvyb2vrrid58y4dbw7wk1pfxxv0xbam9rihh4"
+   "commit": "19de0ec1bac67c5a76a4dd3d8ffe6c5411ace1af",
+   "sha256": "187vcflpbv4zpbzdsxw5i6c9j6dva7v3d3skh3b6wybjzh6ib4jf"
   },
   "stable": {
    "version": [
@@ -21401,8 +21568,8 @@
   "repo": "tjarvstrand/edts",
   "unstable": {
    "version": [
-    20191217,
-    630
+    20200217,
+    801
    ],
    "deps": [
     "auto-complete",
@@ -21413,8 +21580,8 @@
     "popup",
     "s"
    ],
-   "commit": "6e08bc97ce8a923a6ec4e0af442e861ad5010298",
-   "sha256": "085rrmcwpy0jdj84jiiz8wpscsnicp6flj96pc45g2f3arqccgj0"
+   "commit": "299e4553551a88dc5f26921125bccbc3efc662ef",
+   "sha256": "0fsgnh7g1fignsvl5i0kbkqb6f4ffc9k0202xm8p3b41vxgzdky5"
   },
   "stable": {
    "version": [
@@ -21434,11 +21601,11 @@
   "repo": "ajgrf/edwina",
   "unstable": {
    "version": [
-    20190821,
-    1850
+    20200113,
+    1714
    ],
-   "commit": "8d6f7ce117c622e19576888fbff9145615683815",
-   "sha256": "12rvmr8r85k9hfgbz2qwp0ryvy4qdarr82hq16ilppq5vlkiar02"
+   "commit": "c5368716a504c93407fd8cb4ef925a8d8eb62698",
+   "sha256": "0rsi1v9rr76crbgb7f13g31rfq5bjk0hchqr356h97xlqr39168y"
   },
   "stable": {
    "version": [
@@ -21562,17 +21729,17 @@
     20200107,
     2333
    ],
-   "commit": "84b42d0532561c902ed6dba40b134fa7f3cc1dcd",
-   "sha256": "132aj070k7yqzq01bwyipnvg6m5v9rggrlhc5rx0zzn9qy49x5fy"
+   "commit": "de8ccd81a8312634a3c8c7f06b6993105538d29f",
+   "sha256": "08wpwpyskx59k31bqakw3mzir0blqcqk8m7dmr5mvp9gji41mb2d"
   },
   "stable": {
    "version": [
     3,
     10,
-    2
+    3
    ],
-   "commit": "fa7adfd9abf5f7cf61fbbdac6a2add4f46d0c659",
-   "sha256": "15rf1mhzgaadp2kf5vrvnylc08fmq4ilpgsk55if8y337aafvy7i"
+   "commit": "79ab16f093aa3b2373422d0044f3119467755f5e",
+   "sha256": "0fisq0g3css641fh7y9vhagkfbsm2rfw9pnzyz434cr41wnjmjfz"
   }
  },
  {
@@ -21583,15 +21750,15 @@
   "repo": "joaotavora/eglot",
   "unstable": {
    "version": [
-    20200105,
-    1332
+    20200113,
+    1722
    ],
    "deps": [
     "flymake",
     "jsonrpc"
    ],
-   "commit": "a4c83a65cf0054de1cfa0d74d7261a5177ebfb63",
-   "sha256": "0zwyc8mvxpdg661mkm2kv5b3sf4nixq0c3lg7liz1r2vdjm5pjqv"
+   "commit": "606e234ea867d057f201fde9a4de2a896f35782e",
+   "sha256": "0fjgy377vb3znzlb49xjf5a6k4ihmql1lbiaw2fla7282r5z5ja6"
   },
   "stable": {
    "version": [
@@ -21614,28 +21781,28 @@
   "repo": "non-Jedi/eglot-jl",
   "unstable": {
    "version": [
-    20200102,
-    1615
+    20200120,
+    1457
    ],
    "deps": [
     "eglot",
     "julia-mode"
    ],
-   "commit": "38b7c0f1aa0f677ed1f966319e38535df4dad36a",
-   "sha256": "0d6232wlmyf58116h8z309h911z6gh4j5dma5y4znbk485q31ivm"
+   "commit": "94e84fe0d14585192dca53e1e962bec7596f095c",
+   "sha256": "0dsnyp30c9nrglv4ifv6g272sa6pgrn5f75ak81z4pkdhdn6wvnb"
   },
   "stable": {
    "version": [
     1,
     1,
-    0
+    1
    ],
    "deps": [
     "eglot",
     "julia-mode"
    ],
-   "commit": "38b7c0f1aa0f677ed1f966319e38535df4dad36a",
-   "sha256": "0d6232wlmyf58116h8z309h911z6gh4j5dma5y4znbk485q31ivm"
+   "commit": "94e84fe0d14585192dca53e1e962bec7596f095c",
+   "sha256": "0dsnyp30c9nrglv4ifv6g272sa6pgrn5f75ak81z4pkdhdn6wvnb"
   }
  },
  {
@@ -21708,29 +21875,26 @@
   "repo": "millejoh/emacs-ipython-notebook",
   "unstable": {
    "version": [
-    20200104,
-    1609
+    20200301,
+    802
    ],
    "deps": [
-    "auto-complete",
+    "anaphora",
     "dash",
     "deferred",
-    "markdown-mode",
     "polymode",
     "request",
-    "s",
-    "skewer-mode",
     "websocket"
    ],
-   "commit": "41d8e61df6f18f5accc341e7ae42e03069501870",
-   "sha256": "0qws01ba15rmc1bv3qzwzzcxl764iyr1xdzs7zsfay7s91px9cr0"
+   "commit": "10d7f10179f05eec243de3e55addd533bc46ce31",
+   "sha256": "0w2vlsr6s79mdlis4vsad9svs4ywbrkbyg5wygpd89m10sclkqcy"
   },
   "stable": {
    "version": [
     0,
     16,
     2,
-    2
+    3
    ],
    "deps": [
     "auto-complete",
@@ -21743,8 +21907,8 @@
     "skewer-mode",
     "websocket"
    ],
-   "commit": "4399f92b6b5d23240e8f447b36521b8db2a650a3",
-   "sha256": "12zq35ab84j6rhwnq6flp3ljm17ild95nv73mxgig9vsrvx1y57v"
+   "commit": "42f8efc54bfb915248972490a4b438b8d5bda381",
+   "sha256": "0jnqi8pq83s8q0dy2y1518yz8lsc0graqrqf8frss21fcj7ny22g"
   }
  },
  {
@@ -21797,8 +21961,8 @@
   "repo": "kostafey/ejc-sql",
   "unstable": {
    "version": [
-    20191201,
-    1636
+    20200212,
+    1038
    ],
    "deps": [
     "auto-complete",
@@ -21807,8 +21971,8 @@
     "direx",
     "spinner"
    ],
-   "commit": "c151fdfceaa9cb9009878c30134cc45dd6386441",
-   "sha256": "1rvbnpxzg0qd47rw1w431mdjw3qf8lf6d5a2152ii6aa46jg9a3l"
+   "commit": "af7a59dba2ee2e906cbe6d1686d639b65f8838b2",
+   "sha256": "1pvhb1i4xhic89hn9l27afinxrgs50s0lpln8daa6dci3z0i8xx8"
   },
   "stable": {
    "version": [
@@ -21891,8 +22055,8 @@
     20181006,
     225
    ],
-   "commit": "8f60d6249a2f7a5518d1a95a6d6a06f1f45cc6ad",
-   "sha256": "1rnvs3xrcl9fk5ryp0zdx6gcp4y8nnq34wy38zbhf1h87zd40px2"
+   "commit": "456fea0866ee71cb5a68eb65e9464565674081bf",
+   "sha256": "1hcjf88xjgkgp5wv7ccnfifnmpdj33csx6xm7rrdal3cy0f3ydj8"
   },
   "stable": {
    "version": [
@@ -22234,11 +22398,11 @@
   "repo": "Mstrodl/elcord",
   "unstable": {
    "version": [
-    20191218,
-    1744
+    20200224,
+    1509
    ],
-   "commit": "88bc8f6f6b92a9d3095d55e4ddc3601ea13d4447",
-   "sha256": "0vsfnlrp3s64iv34mdzjp3shm63sasfmiddi7ig70d0a9ylcnvly"
+   "commit": "61cd3834f8650a13d34d845138e40c5aaab75cb7",
+   "sha256": "0l3hv190xkzyalfnxsb0x7npmwdgf9bpc0qdi7p7issbf0vrjp4n"
   }
  },
  {
@@ -22274,6 +22438,30 @@
    "sha256": "0l9ah3ijlidjshwkazfcdasm3hmigw8dcyqgi9pmpv0kw9096y64"
   }
  },
+ {
+  "ename": "eldev",
+  "commit": "dd7ae513905a4e4cc23078239ecf2d5f346f1226",
+  "sha256": "11vxhssii5h5c3qm8iwg8d5zrxas3nzl391h9dl83v9h1pg98kg1",
+  "fetcher": "github",
+  "repo": "doublep/eldev",
+  "unstable": {
+   "version": [
+    20200221,
+    2047
+   ],
+   "commit": "a533ea3add577bb50a96ba24cee26f7e3e79a13f",
+   "sha256": "0wfpy5ib0f54lj394jmd45835iks8mvzxhnn0ii3qcsyjfs1jdnj"
+  },
+  "stable": {
+   "version": [
+    0,
+    2,
+    1
+   ],
+   "commit": "77e1e90efa6622c6784ef10f26e6f845aca5ee3e",
+   "sha256": "0ip9dnyh53m2yd92bp0jddm3db4fbcpm9zniqij9anvzhjdfqx1b"
+  }
+ },
  {
   "ename": "eldoc-box",
   "commit": "aac2e64f9e0d06b95bdf0dece214263f75470ea8",
@@ -22344,15 +22532,15 @@
   "repo": "stardiviner/eldoc-overlay",
   "unstable": {
    "version": [
-    20190223,
-    543
+    20200216,
+    546
    ],
    "deps": [
     "inline-docs",
     "quick-peek"
    ],
-   "commit": "cfec077d9a699c88265af2e9480d5e76a3b3f833",
-   "sha256": "0c16i6y7675rzif5gj9s6rz3nc59339yp4fn27a56sly42qfnh9f"
+   "commit": "4dcd6644c7aee2565dd32c1f65e2d1fa4432ceb8",
+   "sha256": "0xnp937xpjvypz2cv0xsdc47g484qr7kbdjccdflgv2yn244dc37"
   }
  },
  {
@@ -22363,26 +22551,26 @@
   "repo": "stan-dev/stan-mode",
   "unstable": {
    "version": [
-    20191106,
-    131
+    20200221,
+    2025
    ],
    "deps": [
     "stan-mode"
    ],
-   "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a",
-   "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0"
+   "commit": "599a0440086c660e6823622b35058f6d2d6d9637",
+   "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y"
   },
   "stable": {
    "version": [
     10,
-    0,
+    1,
     0
    ],
    "deps": [
     "stan-mode"
    ],
-   "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a",
-   "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0"
+   "commit": "599a0440086c660e6823622b35058f6d2d6d9637",
+   "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y"
   }
  },
  {
@@ -22439,11 +22627,11 @@
   "repo": "xwl/electric-spacing",
   "unstable": {
    "version": [
-    20161209,
-    1957
+    20200223,
+    838
    ],
-   "commit": "9d0f8a213133f2619a4e9dfbba3b00d4348c07b0",
-   "sha256": "1wzf8q2k2iwnm9b5kj16bwif7g0qc7ll3cjs20gbmcnq5xmhwx9f"
+   "commit": "83568a7f2f0e2f0983e348b6e4adc0fc75b98adf",
+   "sha256": "03710cr8jvr22c9j3c266460aln26j7y9vqj6qm3mmzhsr3v7q2c"
   }
  },
  {
@@ -22493,11 +22681,11 @@
   "repo": "skeeto/elfeed",
   "unstable": {
    "version": [
-    20191227,
-    426
+    20200209,
+    1942
    ],
-   "commit": "fb7de7b6d299bb4190fed3cab541dbf5a5a1bbcd",
-   "sha256": "1wx55myyj15mii4zgczm1qpx2fa864ri87c1jr6fbl8vwcg4k0xq"
+   "commit": "d0405e63863e54a01200740a6717ac875eceabc1",
+   "sha256": "1pbcs4i9d1v8pmgrsxnacnbdrcswifpbnrb613z18caj1a17nl02"
   },
   "stable": {
    "version": [
@@ -22562,28 +22750,28 @@
   "repo": "fasheng/elfeed-protocol",
   "unstable": {
    "version": [
-    20200106,
-    1038
+    20200301,
+    236
    ],
    "deps": [
     "cl-lib",
     "elfeed"
    ],
-   "commit": "2baf0b8bdda34911cd58b119f4f649603dd21500",
-   "sha256": "1m2fw4kxaj5apjk8hi8hbgsxs56ra2irqmg4mghqvkssjyjm1bfl"
+   "commit": "8f5cdb32c7d9f53427086fd8309c6c72d0bd9e79",
+   "sha256": "0brc185y8gb34xci5cv3g5i9s0gzrglkkbyxck5zk36icbh6wm3k"
   },
   "stable": {
    "version": [
     0,
-    6,
-    1
+    7,
+    3
    ],
    "deps": [
     "cl-lib",
     "elfeed"
    ],
-   "commit": "2baf0b8bdda34911cd58b119f4f649603dd21500",
-   "sha256": "1m2fw4kxaj5apjk8hi8hbgsxs56ra2irqmg4mghqvkssjyjm1bfl"
+   "commit": "7048b8e3f55d6c8a9508d34b86f7a3434cda8e30",
+   "sha256": "0rg2nczzzbljmm3kkh5cnvj3ji0shrhwxw46lg3h93dp1nja9lzz"
   }
  },
  {
@@ -22594,26 +22782,28 @@
   "repo": "sp1ff/elfeed-score",
   "unstable": {
    "version": [
-    20200104,
-    2247
+    20200222,
+    7
    ],
    "deps": [
+    "cl-lib",
     "elfeed"
    ],
-   "commit": "7c76684ceccb0623f3320c16ea22c04b5ca4433a",
-   "sha256": "1qzmgryk9dg3jmz2v6mrrjbmkzik4isxlh02zmh1ajmcr93hkn3v"
+   "commit": "f14c0526676dd90be62b6aa086462047f7ac2da0",
+   "sha256": "099ch2jlj0fxn3d2v6z9rymkqbkrm3xp0bz4zkqbm54qcvdwib79"
   },
   "stable": {
    "version": [
     0,
-    2,
+    3,
     0
    ],
    "deps": [
+    "cl-lib",
     "elfeed"
    ],
-   "commit": "b1419ac54e5dfaa4b88352a3919e7fdedc61bb17",
-   "sha256": "0pkvq0f7linwxm9vv389wjhw60v3jcgw71q5ic4nrvayizx6ld5h"
+   "commit": "f14c0526676dd90be62b6aa086462047f7ac2da0",
+   "sha256": "099ch2jlj0fxn3d2v6z9rymkqbkrm3xp0bz4zkqbm54qcvdwib79"
   }
  },
  {
@@ -22631,8 +22821,8 @@
     "elfeed",
     "simple-httpd"
    ],
-   "commit": "fb7de7b6d299bb4190fed3cab541dbf5a5a1bbcd",
-   "sha256": "1wx55myyj15mii4zgczm1qpx2fa864ri87c1jr6fbl8vwcg4k0xq"
+   "commit": "d0405e63863e54a01200740a6717ac875eceabc1",
+   "sha256": "1pbcs4i9d1v8pmgrsxnacnbdrcswifpbnrb613z18caj1a17nl02"
   },
   "stable": {
    "version": [
@@ -22662,8 +22852,8 @@
    "deps": [
     "async"
    ],
-   "commit": "4a139c820c9dfe00dcd403818051fc78fca87782",
-   "sha256": "0g70d1a2677ga3f8lp0f4k8vr7j4fjdxn790fah9zcmc23nl8g6m"
+   "commit": "c475cee98bc607746901318ef9da463c96d5e04e",
+   "sha256": "02jfpi8bvjxw5jnjjpzq87xf1xjly745k8s74jc9lpginip3kj95"
   },
   "stable": {
    "version": [
@@ -22734,20 +22924,20 @@
   "repo": "xuchunyang/elisp-demos",
   "unstable": {
    "version": [
-    20200101,
-    1259
+    20200219,
+    2102
    ],
-   "commit": "d61fd603f115214c582436fc7f4798a711b69de4",
-   "sha256": "148mqad8mk50zbjaacdjngb44i7maqxx8i71kwbaw27pgbcbfpbl"
+   "commit": "1d3b349f90dc6572a90d49ee247c43a4ba64252e",
+   "sha256": "0jvphz7ql4wbcj88w9igcgid4mjn7qysqgp8jmp7aqaf9zfpl2bd"
   },
   "stable": {
    "version": [
     2020,
-    1,
-    1
+    2,
+    19
    ],
-   "commit": "966517c818c8fa0440c10a66008a2c209af8cf26",
-   "sha256": "02axxz3xin5n6kr8cmn19qqv96agcy8ml2apwwgrmbxrvqdhm1ia"
+   "commit": "7cc5ae4eac5bd8f38ade9ba1c28ad6faaba82160",
+   "sha256": "0mckgaz92v3y2vlkggx9kd51fd1mahylw39c42l51dyv8wscm7sc"
   }
  },
  {
@@ -22803,11 +22993,15 @@
   "repo": "gonewest818/elisp-lint",
   "unstable": {
    "version": [
-    20200102,
-    1550
+    20200217,
+    38
    ],
-   "commit": "f8316b84513261b17817006f5fcc25599d8e12b2",
-   "sha256": "0xv5n2qlk5i1jx441m5nhp1w7smyx5szv0jy7iayz4a3kn8lkvis"
+   "deps": [
+    "dash",
+    "package-lint"
+   ],
+   "commit": "7a3866326631ba1ba8f4cd7a6cfd03c467c32aae",
+   "sha256": "1ldyv0c21dvl362kj566q8gd84gqq8g558slxyl73cf651q0nr84"
   },
   "stable": {
    "version": [
@@ -22875,14 +23069,14 @@
   "repo": "purcell/elisp-slime-nav",
   "unstable": {
    "version": [
-    20160128,
-    1909
+    20200129,
+    2057
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "be36d66b4781eab7218bff419f3ec79573bbd15c",
-   "sha256": "0q0nisc0k4dl67n8c1068g32z8a642dawmq1h9licad71c42s95p"
+   "commit": "fea3bedf6383fea8370a9484a5610759c25055f9",
+   "sha256": "1mxs519gqax1fnaf5lirg69jrv4hj5a39hf7lzai7hyhcf9slzc1"
   },
   "stable": {
    "version": [
@@ -22904,14 +23098,14 @@
   "repo": "elixir-editors/emacs-elixir",
   "unstable": {
    "version": [
-    20191203,
-    408
+    20200121,
+    623
    ],
    "deps": [
     "pkg-info"
    ],
-   "commit": "5920edcf19f0526bbee97b01435c4b8bf3b59c36",
-   "sha256": "0ymxrc0qy4p1ryffj8a57f6jn3i4ll5z0ay56m5fh9l46xz6b3am"
+   "commit": "231291ecadc479295d83fee619049030940bfbe5",
+   "sha256": "0lzzgdd1fkswij0d9rh6gyyvhf6z5m0az1hhvyighi45al3mj78s"
   },
   "stable": {
    "version": [
@@ -22964,15 +23158,15 @@
   "repo": "walseb/ellocate",
   "unstable": {
    "version": [
-    20190920,
-    1407
+    20200112,
+    1931
    ],
    "deps": [
     "f",
     "s"
    ],
-   "commit": "55b49500090247728d5abcd3670527a394ba16e4",
-   "sha256": "0gilc9z2mb53mp5702izdrbyjbmvij20jn8zgji1z629ckjivwh7"
+   "commit": "81405082f68f0577c9f176d3d4f034a7142aba59",
+   "sha256": "0amzbazg53956h1h5ppxd9psr1d1fwvlpm27kpfvhw5ipqzp3ws4"
   }
  },
  {
@@ -22983,8 +23177,8 @@
   "repo": "jcollard/elm-mode",
   "unstable": {
    "version": [
-    20191228,
-    2356
+    20200301,
+    19
    ],
    "deps": [
     "dash",
@@ -22992,22 +23186,23 @@
     "reformatter",
     "s"
    ],
-   "commit": "de2521ec8f47e7ef1a5120d7ba0e0d7cba94498f",
-   "sha256": "0rzrizzbrmsyd6703fqkabx7k7fh5n2f4skrisgcwph2sqzn89wy"
+   "commit": "3f042ec430e7d915bfdca21d4f4d6201a882434b",
+   "sha256": "16b66kv49bslnnhya2a9q0zshcwx58017sy0ab451j5zsq42v2qh"
   },
   "stable": {
    "version": [
     0,
-    20,
-    3
+    21,
+    0
    ],
    "deps": [
+    "dash",
     "f",
-    "let-alist",
+    "reformatter",
     "s"
    ],
-   "commit": "29f50a940113d793a21998f3bb414fdd9b0c5daa",
-   "sha256": "02c7xl9w81140l7p9kywr5qwsdyv92nxdhzqcxjk0r09x7s0cvsk"
+   "commit": "5df694e307cf8fa5a3555d800984aa4ebb40664f",
+   "sha256": "0iwk4fmw8hq3ry4ky1zc7lgl4cpbnrjyk74c2xzddfspi3ks41fd"
   }
  },
  {
@@ -23320,8 +23515,8 @@
   "repo": "jorgenschaefer/elpy",
   "unstable": {
    "version": [
-    20191229,
-    2252
+    20200202,
+    2031
    ],
    "deps": [
     "company",
@@ -23330,8 +23525,8 @@
     "s",
     "yasnippet"
    ],
-   "commit": "a698cfd03e35a7b821fa343e4e13d1c5a22902da",
-   "sha256": "0wxjwgrac2r3y9q83gjb95253r440db39npqpisj4r9zxkn5ss3m"
+   "commit": "b25ab8c195472cf152fed80c212750b33837025e",
+   "sha256": "1nidig1yxr1fbwkfhpgd5zyqkd4mi5bp5h9bg17azs79xqprkrfx"
   },
   "stable": {
    "version": [
@@ -23395,8 +23590,8 @@
   "repo": "emacs-elsa/Elsa",
   "unstable": {
    "version": [
-    20191002,
-    2030
+    20200225,
+    1440
    ],
    "deps": [
     "cl-lib",
@@ -23404,8 +23599,8 @@
     "f",
     "trinary"
    ],
-   "commit": "b43236e5e183249726b93f13e09c56a081817804",
-   "sha256": "0j0qppbhmb43nh1j1hrsyg6m0710m25i12sc9k9s2drz9wva7jc3"
+   "commit": "5ac373088eca10581e848ad42f5e278aedcd85c0",
+   "sha256": "11q5bh1mxc3z8a2zxs157pf7aqld9vddcffibgawh4r8q661ys03"
   }
  },
  {
@@ -23438,15 +23633,15 @@
   "repo": "jeffgran/elscreen-buffer-group",
   "unstable": {
    "version": [
-    20190621,
-    225
+    20200109,
+    2338
    ],
    "deps": [
     "cl-lib",
     "elscreen"
    ],
-   "commit": "c78fc19b8a80415997b191fc08bf6768449ea12e",
-   "sha256": "1g8dm3vqgws9grhl435s7f1n26vpgyp5kvfryv98idqa7aqj3wvq"
+   "commit": "b48e71d4782adfeb2958f227d78c04164d26e4bd",
+   "sha256": "13wfnkg42k1fk1dbf7zspxfp116xm1z4j6pc82wk8lz5k5xjlpzq"
   }
  },
  {
@@ -23810,14 +24005,14 @@
   "repo": "cireu/emacsql-sqlite3",
   "unstable": {
    "version": [
-    20191211,
-    1229
+    20200117,
+    1922
    ],
    "deps": [
     "emacsql"
    ],
-   "commit": "998ba547bd14c7406ab5d59820ef140c1819784e",
-   "sha256": "026hkbf90sp3q71g2pds63dvnfpw2q1i66vglfy42502c08l8285"
+   "commit": "82b90d493dba404473b515ffd670e0dd0dba1248",
+   "sha256": "1azv9mllvyjzqjkjw9n5rmdj79fa8srbpmx61w6vm25bl9f62vpf"
   }
  },
  {
@@ -23918,14 +24113,14 @@
   "repo": "madnificent/ember-mode",
   "unstable": {
    "version": [
-    20191123,
-    958
+    20200208,
+    1423
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "34373dd9413986288b2709365b2725e9390ecf9e",
-   "sha256": "005c679f9gpjixdcidsb50vzkg4gsy5qcz4rdjr84nspxz6nvjjw"
+   "commit": "a587c423041b2fcb065fd5b6a03b2899b764e462",
+   "sha256": "0x5fnrflbgafwcqr6v0jj6522j2j086s7msh2mr6yysmrfjhx2zk"
   }
  },
  {
@@ -24062,14 +24257,14 @@
   "url": "https://git.savannah.gnu.org/git/emms.git",
   "unstable": {
    "version": [
-    20191205,
-    2229
+    20200212,
+    1825
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "eedd61d9639de043933293b662a148d57d2f8a2f",
-   "sha256": "1nx0xvl03g2626xszqv9mw6v6xa83xxsjm11522g0srfvibj2iwn"
+   "commit": "2767c660562d35f02f9b272252a697804d70dd14",
+   "sha256": "1jg5m9684kdxvgfqvf56x5c7fqnlqf0mmqqlrrvl5di3n79cfmsb"
   },
   "stable": {
    "version": [
@@ -24275,26 +24470,26 @@
   "repo": "syl20bnr/emacs-emoji-cheat-sheet-plus",
   "unstable": {
    "version": [
-    20150617,
-    1331
+    20200202,
+    1404
    ],
    "deps": [
     "helm"
    ],
-   "commit": "96a003127d646a2683d81ca906a17eace0a6413e",
-   "sha256": "1rk7am0xvpnv98yi7a62wlyh576md4n2ddj7nm201bjd4wdl2yxk"
+   "commit": "ffcc84d7060dfa000148e7f8be4fd6701593a74f",
+   "sha256": "1na7mn9pgnwf9a1fbpb5k36aczzc7506ld5xm7mqpqgwshdxk0hq"
   },
   "stable": {
    "version": [
     1,
     2,
-    1
+    2
    ],
    "deps": [
     "helm"
    ],
-   "commit": "96a003127d646a2683d81ca906a17eace0a6413e",
-   "sha256": "1rk7am0xvpnv98yi7a62wlyh576md4n2ddj7nm201bjd4wdl2yxk"
+   "commit": "ffcc84d7060dfa000148e7f8be4fd6701593a74f",
+   "sha256": "1na7mn9pgnwf9a1fbpb5k36aczzc7506ld5xm7mqpqgwshdxk0hq"
   }
  },
  {
@@ -24636,8 +24831,8 @@
   "repo": "youngker/eopengrok.el",
   "unstable": {
    "version": [
-    20160904,
-    659
+    20200205,
+    624
    ],
    "deps": [
     "cl-lib",
@@ -24645,8 +24840,8 @@
     "magit",
     "s"
    ],
-   "commit": "78f734328aaf19c52720415c037708ece1944c4c",
-   "sha256": "1c5kzq3h7gr0459z364dyq5m8vq0ydclw5wphqj9fyg28mxjj6ns"
+   "commit": "6fa16c4ccaaebaef64dca0d3d29904c45fd6597d",
+   "sha256": "1y6n5b9pk4c3badzhwm7qv1jw60p34z55ljwhaaqlnmv7nq1qnj3"
   },
   "stable": {
    "version": [
@@ -24864,15 +25059,15 @@
   "repo": "emacsomancer/equake",
   "unstable": {
    "version": [
-    20200101,
-    630
+    20200214,
+    1651
    ],
    "deps": [
     "dash",
     "tco"
    ],
-   "commit": "4568d865e3524a284808e2a79c7ac9703bd228dc",
-   "sha256": "1ng1d0nrj0nzp4w209jr0gcnfl7chrlx7m6bapbq11lkf9qwgg35"
+   "commit": "2039faac5f649f586d86d5ace10204d5a510fe0e",
+   "sha256": "1zg1bxwpqgzak5nvcwlcv9k8lkpa071kpnh11yv7s74ykvxa49l0"
   }
  },
  {
@@ -25317,20 +25512,21 @@
   "repo": "erlang/otp",
   "unstable": {
    "version": [
-    20191219,
-    1238
+    20200220,
+    2206
    ],
-   "commit": "52412c598ad67786032d17762e8655ad3d6771b5",
-   "sha256": "19d3whdfi21a0mlvgls549s8j3ygcmrw2sk7m36vpqf17k6059fw"
+   "commit": "2839ecb8fc1ba424b863867b2086127fad839d28",
+   "sha256": "0r7cljx0f1c0mbzgvny7aka0zsyvmnryvzly9qfx0psgr06x8qfw"
   },
   "stable": {
    "version": [
-    22,
-    2,
+    23,
+    0,
+    -1,
     1
    ],
-   "commit": "4583b137e585e59a3fc7020b781911a6927187a2",
-   "sha256": "070l0c40jwaq2s19mklq7459a0gd9v81q29xga39rbkv6diqcdq0"
+   "commit": "2b823b90b7dbd56aae3a3fbdcb182f9fd5127a59",
+   "sha256": "00dsbnii0w56jmbzzn43j18rprmc4d2ckd8ad0kzc6cb856mxs9s"
   }
  },
  {
@@ -25820,15 +26016,15 @@
   "repo": "xuchunyang/eshell-git-prompt",
   "unstable": {
    "version": [
-    20200103,
-    1444
+    20200109,
+    2250
    ],
    "deps": [
     "cl-lib",
     "dash"
    ],
-   "commit": "5a73993f351e89255538f60ae546511362a49c91",
-   "sha256": "1ja2nfq266mnr1iqyl8g7180xmpi563fjh17xc4fhizhfvp650ai"
+   "commit": "48ee35774c9b8d0e2d96110e3ae84bac60f43dfd",
+   "sha256": "1w0drk4sfljshcnlvvn028v4lzqznglfx8ly0mfridsm85xws3pw"
   },
   "stable": {
    "version": [
@@ -26089,8 +26285,8 @@
    "deps": [
     "pcsv"
    ],
-   "commit": "bc4047e09b8f6c34802db86095cd465935670dce",
-   "sha256": "05f8n24yvzm3zjvc1523ib44wv76ms5sn6mv8s1wrjsl190av0rn"
+   "commit": "08a779a821f8d32c1a1985d8d9eb6cf21646ce2e",
+   "sha256": "18dvg2yagk9qyn3xfnhgfv192vyqzahzfy8xgc1fnm7a1l0gcg2x"
   }
  },
  {
@@ -26108,8 +26304,8 @@
     "esqlite",
     "helm"
    ],
-   "commit": "bc4047e09b8f6c34802db86095cd465935670dce",
-   "sha256": "05f8n24yvzm3zjvc1523ib44wv76ms5sn6mv8s1wrjsl190av0rn"
+   "commit": "08a779a821f8d32c1a1985d8d9eb6cf21646ce2e",
+   "sha256": "18dvg2yagk9qyn3xfnhgfv192vyqzahzfy8xgc1fnm7a1l0gcg2x"
   }
  },
  {
@@ -26120,14 +26316,14 @@
   "repo": "emacs-ess/ESS",
   "unstable": {
    "version": [
-    20200103,
-    915
+    20200226,
+    2140
    ],
    "deps": [
     "julia-mode"
    ],
-   "commit": "2812b85880807e5da35dbf2e69fc1b577f2ad7f4",
-   "sha256": "055chn6vln1hg9r5fkzddk92c7y2ha42symzkkn0smpwjr12niry"
+   "commit": "a2be8cb97c6fff13fc28170d6359f835b8b562a5",
+   "sha256": "1jj040lng03jmp8ddn5fi8cg2v6fwxxv9ikispx3n03va1mrzf7m"
   },
   "stable": {
    "version": [
@@ -26262,25 +26458,26 @@
   "repo": "jschaf/esup",
   "unstable": {
    "version": [
-    20180727,
-    342
+    20200130,
+    2034
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "0877d7831d0bf60e33097df135a889da153243c8",
-   "sha256": "0c9g9nhszxzyab57y48vj95wqzdjj441vvm2pnx1dyij7g0abqpl"
+   "commit": "4e5bf7d265c3b1484017fc0fd0ad50d2403c2bbe",
+   "sha256": "1jdsy5bqnmbai7kylidyfd0nla26apqvfl2f6vdvjs02hlr1w2s7"
   },
   "stable": {
    "version": [
     0,
-    6
+    7,
+    1
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "53355b13dc9f1636ba681ffff830162ebbd3b223",
-   "sha256": "1a4b8390azimlrr5ayxvaks1w7009vfbm56q11ybx00xxrd26v43"
+   "commit": "49e05d4f96adfbf71e608a78d23bbf148a8a7fc0",
+   "sha256": "020svy3r1m7xs38vcinad8kjd4622wvh4scfmjpklbln8r99n178"
   }
  },
  {
@@ -26575,30 +26772,30 @@
   "repo": "emacs-evil/evil",
   "unstable": {
    "version": [
-    20200103,
-    1756
+    20200224,
+    914
    ],
    "deps": [
     "cl-lib",
     "goto-chg",
     "undo-tree"
    ],
-   "commit": "d14a349fcf7acf429ab9aa5e0faf43c816559fe7",
-   "sha256": "0vpd3x5hwi3g8qi5r961cxffvg1r2q62f4dd8svzx0dlxvfpbr3i"
+   "commit": "7c42ba4de086dc8f5b2d277c8d2806adc6b84279",
+   "sha256": "1pzznnibgk0x33m04064w2r0ksk26liynswa785nld4king70iq2"
   },
   "stable": {
    "version": [
     1,
     12,
-    16
+    17
    ],
    "deps": [
     "cl-lib",
     "goto-chg",
     "undo-tree"
    ],
-   "commit": "210316cbf9615ade96834e30352366985752f11e",
-   "sha256": "1nszhnl7j3pkdjxpzljqkaqr0c0xqpy97rwpbv6zb96qllallsmi"
+   "commit": "5b690258fcfc47ca1fed25f17e04356edc713925",
+   "sha256": "001ywnhjl0dmywc8vg8brsisx432kcfdgv6xksawbg1czw6j0y02"
   }
  },
  {
@@ -26689,14 +26886,14 @@
   "repo": "YourFin/evil-better-visual-line",
   "unstable": {
    "version": [
-    20181026,
-    1028
+    20200123,
+    2045
    ],
    "deps": [
     "evil"
    ],
-   "commit": "15f77e67fcc3c48db323ccd8c8c4bc249e2911b8",
-   "sha256": "05wzq663p3irrmd5b2yg001qf8m9wmaj3mnsc76fad184m03g81r"
+   "commit": "4373f930ab1a8d3a2a90e68540967702313b2ce9",
+   "sha256": "0dnh932ib3hhphprm1jjh1hdwnj96d6cnfc64rj2y4mgxji4y19l"
   }
  },
  {
@@ -26778,16 +26975,16 @@
   "repo": "emacs-evil/evil-collection",
   "unstable": {
    "version": [
-    20200105,
-    1846
+    20200219,
+    1042
    ],
    "deps": [
     "annalist",
     "cl-lib",
     "evil"
    ],
-   "commit": "815c127d020f8c45a17fe7b23dbd82240aaee390",
-   "sha256": "0djrhqvj3x75hj278qfz9pa2ikl4752yc8h0aslhkdvdfvs2nazv"
+   "commit": "a478a95a8a3665e40bdae3bab2a0519db6c1f29c",
+   "sha256": "15ii5lw6hs4yyl22yyzfwzagdma2sman4rm5gq4m9773g4ava515"
   },
   "stable": {
    "version": [
@@ -26993,15 +27190,15 @@
   "repo": "Dewdrops/evil-exchange",
   "unstable": {
    "version": [
-    20191105,
-    255
+    20200118,
+    252
    ],
    "deps": [
     "cl-lib",
     "evil"
    ],
-   "commit": "35dd0f0662789f043bd89a9f9801ffaf4318123f",
-   "sha256": "1wx8wpdgwhfgf5vykkjw2skbf6xhxmzj40vsq8dj5vhmiq4njw5k"
+   "commit": "3030e21ee16a42dfce7f7cf86147b778b3f5d8c1",
+   "sha256": "0zchmnzkq7bz2c4hl95xwnz5w243ya4ryi6hgbdss7mc9rnyyarh"
   }
  },
  {
@@ -27312,15 +27509,15 @@
   "repo": "emacs-evil/evil-magit",
   "unstable": {
    "version": [
-    20200102,
-    1856
+    20200226,
+    1347
    ],
    "deps": [
     "evil",
     "magit"
    ],
-   "commit": "7223dca89c0b4bca9871c453a30a4d4edfdb444e",
-   "sha256": "1sp1l6p88dj6qpgcmh0caprq0vv6ps6kmqrakrm2kgdnirvzqign"
+   "commit": "ba0e59248f8d7f59de811ed2e1f2c565dd7da1ca",
+   "sha256": "1jy1nzjr8mxn4153qdcvk3s0cdy7xrim7jq2c6dzdqxjdprhj8nz"
   },
   "stable": {
    "version": [
@@ -27404,15 +27601,15 @@
   "repo": "gabesoft/evil-mc",
   "unstable": {
    "version": [
-    20191202,
-    806
+    20200228,
+    1535
    ],
    "deps": [
     "cl-lib",
     "evil"
    ],
-   "commit": "007d471e26b44e692250804f82f06ebbd27b6ec4",
-   "sha256": "1hkynxs42sh24dd842lskysrn0s37c22w2p6422miykczq6dgffi"
+   "commit": "4d4c0172e4c7f80acc1d0e73d5fb3e536929b262",
+   "sha256": "1a5glj1n5dyhdaas5b8m3v2p36s1w9qcpmj7gnfxyp75iy0rqlbs"
   },
   "stable": {
    "version": [
@@ -27475,16 +27672,16 @@
   "repo": "hlissner/evil-multiedit",
   "unstable": {
    "version": [
-    20200103,
-    1006
+    20200229,
+    528
    ],
    "deps": [
     "cl-lib",
     "evil",
     "iedit"
    ],
-   "commit": "c3d43b1a65c193755dae2c41ce5c072c4c01b35d",
-   "sha256": "0nk5cg3ammn3mlymb093la8wab4jdzh3qhc15s1235vw3s47g6ag"
+   "commit": "9f271e0e6048297692f80ed6c5ae8994ac523abc",
+   "sha256": "03imayy9afv084yl6g4kg6qis3mikllpbbizd2fya7njbsnpbpq1"
   },
   "stable": {
    "version": [
@@ -27509,20 +27706,20 @@
   "repo": "redguardtoo/evil-nerd-commenter",
   "unstable": {
    "version": [
-    20191231,
-    938
+    20200222,
+    901
    ],
-   "commit": "a5555ff02a43ddc4b54ba38e19c5a233c3a0b304",
-   "sha256": "0rpgjmybkk47p0n4j02sipx16xvam6hhiich8y3n7qsznbq97pbi"
+   "commit": "fa40dab8d2f010db17e1e62dfd245c1504d0542f",
+   "sha256": "0dn712k54qsxy82jqbqip77k5i3zv8m7afj2yi39zqx28iqvic0z"
   },
   "stable": {
    "version": [
     3,
-    4,
-    0
+    5,
+    1
    ],
-   "commit": "a5555ff02a43ddc4b54ba38e19c5a233c3a0b304",
-   "sha256": "0rpgjmybkk47p0n4j02sipx16xvam6hhiich8y3n7qsznbq97pbi"
+   "commit": "fa40dab8d2f010db17e1e62dfd245c1504d0542f",
+   "sha256": "0dn712k54qsxy82jqbqip77k5i3zv8m7afj2yi39zqx28iqvic0z"
   }
  },
  {
@@ -27633,14 +27830,14 @@
   "repo": "mamapanda/evil-owl",
   "unstable": {
    "version": [
-    20190828,
-    435
+    20200113,
+    405
    ],
    "deps": [
     "evil"
    ],
-   "commit": "93913d4e9b3a34973756d0c18803dde0ae52cb64",
-   "sha256": "1qn10lhy05ib9g8yc7cx18ca1hka94ni36fd98ixln6zqlwl6n78"
+   "commit": "ed5a98644a9cf321de213b50df6473de9f3a71ed",
+   "sha256": "03afn47fgz3bxifmpwlmckpkl9nc237lc0khmaks0jfpmzcbkagc"
   },
   "stable": {
    "version": [
@@ -28106,26 +28303,26 @@
   "repo": "emacs-evil/evil",
   "unstable": {
    "version": [
-    20191218,
-    852
+    20200129,
+    815
    ],
    "deps": [
     "evil"
    ],
-   "commit": "d14a349fcf7acf429ab9aa5e0faf43c816559fe7",
-   "sha256": "0vpd3x5hwi3g8qi5r961cxffvg1r2q62f4dd8svzx0dlxvfpbr3i"
+   "commit": "7c42ba4de086dc8f5b2d277c8d2806adc6b84279",
+   "sha256": "1pzznnibgk0x33m04064w2r0ksk26liynswa785nld4king70iq2"
   },
   "stable": {
    "version": [
     1,
     12,
-    16
+    17
    ],
    "deps": [
     "evil"
    ],
-   "commit": "210316cbf9615ade96834e30352366985752f11e",
-   "sha256": "1nszhnl7j3pkdjxpzljqkaqr0c0xqpy97rwpbv6zb96qllallsmi"
+   "commit": "5b690258fcfc47ca1fed25f17e04356edc713925",
+   "sha256": "001ywnhjl0dmywc8vg8brsisx432kcfdgv6xksawbg1czw6j0y02"
   }
  },
  {
@@ -28278,8 +28475,8 @@
    "deps": [
     "evil"
    ],
-   "commit": "257c66bd7a9162caef3b04137af0dc9360fe3d53",
-   "sha256": "1saf7kpmz09j1q8nzriqmllxg4l3chqgy9x0j8qz91wflf15xbbs"
+   "commit": "bc25cae9fa5ab0ba1507827f0944f52ce0ca7462",
+   "sha256": "0xz2yjgz6h2d6h7gfhnvrylh8gj0s7vf45bvqa450j5579gz5sqz"
   }
  },
  {
@@ -28338,15 +28535,15 @@
   "repo": "alexmurray/evil-vimish-fold",
   "unstable": {
    "version": [
-    20171030,
-    1151
+    20200122,
+    117
    ],
    "deps": [
     "evil",
     "vimish-fold"
    ],
-   "commit": "c617fecb91303f8c63f85a6101a503fdc88aae84",
-   "sha256": "05zm0gngdamfs5cqnjq4lh7253hdj0lggdgfphl56ynblhf8qf36"
+   "commit": "b6e0e6b91b8cd047e80debef1a536d9d49eef31a",
+   "sha256": "14qhfhk3d4c7v4jhr909dbxy8222flpqwk73bwg0pqwpkcifyv7n"
   }
  },
  {
@@ -28481,19 +28678,20 @@
   "repo": "jjzmajic/ewal",
   "unstable": {
    "version": [
-    20190911,
-    1319
+    20200301,
+    823
    ],
-   "commit": "17d5fda0b912813eb754f23547ad019e55a679da",
-   "sha256": "1p7y91hdd4qn0w09k8p1xna9c9lhqxsl4vlgmm214ybbvacrgm1n"
+   "commit": "732a2f4abb480f9f5a3249af822d8eb1e90324e3",
+   "sha256": "09dgs0g5hcf5hris8i1w6w7wxarzmsagyc3l50rflvxy3djhlbkd"
   },
   "stable": {
    "version": [
     0,
-    2
+    2,
+    1
    ],
-   "commit": "f822c0b26635c69a62e36cbc9696eb35b425ca61",
-   "sha256": "1qgb10mhjgpk51pwbd726pzcn48730kw9q7nfib8r4rqsgk1r9ar"
+   "commit": "732a2f4abb480f9f5a3249af822d8eb1e90324e3",
+   "sha256": "09dgs0g5hcf5hris8i1w6w7wxarzmsagyc3l50rflvxy3djhlbkd"
   }
  },
  {
@@ -28510,19 +28708,20 @@
    "deps": [
     "ewal"
    ],
-   "commit": "17d5fda0b912813eb754f23547ad019e55a679da",
-   "sha256": "1p7y91hdd4qn0w09k8p1xna9c9lhqxsl4vlgmm214ybbvacrgm1n"
+   "commit": "732a2f4abb480f9f5a3249af822d8eb1e90324e3",
+   "sha256": "09dgs0g5hcf5hris8i1w6w7wxarzmsagyc3l50rflvxy3djhlbkd"
   },
   "stable": {
    "version": [
     0,
-    2
+    2,
+    1
    ],
    "deps": [
     "ewal"
    ],
-   "commit": "f822c0b26635c69a62e36cbc9696eb35b425ca61",
-   "sha256": "1qgb10mhjgpk51pwbd726pzcn48730kw9q7nfib8r4rqsgk1r9ar"
+   "commit": "732a2f4abb480f9f5a3249af822d8eb1e90324e3",
+   "sha256": "09dgs0g5hcf5hris8i1w6w7wxarzmsagyc3l50rflvxy3djhlbkd"
   }
  },
  {
@@ -28540,20 +28739,21 @@
     "ewal",
     "spacemacs-theme"
    ],
-   "commit": "17d5fda0b912813eb754f23547ad019e55a679da",
-   "sha256": "1p7y91hdd4qn0w09k8p1xna9c9lhqxsl4vlgmm214ybbvacrgm1n"
+   "commit": "732a2f4abb480f9f5a3249af822d8eb1e90324e3",
+   "sha256": "09dgs0g5hcf5hris8i1w6w7wxarzmsagyc3l50rflvxy3djhlbkd"
   },
   "stable": {
    "version": [
     0,
-    2
+    2,
+    1
    ],
    "deps": [
     "ewal",
     "spacemacs-theme"
    ],
-   "commit": "f822c0b26635c69a62e36cbc9696eb35b425ca61",
-   "sha256": "1qgb10mhjgpk51pwbd726pzcn48730kw9q7nfib8r4rqsgk1r9ar"
+   "commit": "732a2f4abb480f9f5a3249af822d8eb1e90324e3",
+   "sha256": "09dgs0g5hcf5hris8i1w6w7wxarzmsagyc3l50rflvxy3djhlbkd"
   }
  },
  {
@@ -28644,8 +28844,8 @@
     20191229,
     112
    ],
-   "commit": "76fbdf5d01bace97dbabf5a4b56b6d9414a7aea3",
-   "sha256": "0vmdwdn60cq12bh2pinqzpdvd0yqizjrq77zbqszzscblb31cg0d"
+   "commit": "d17c4e0b73fc5ffeb2bc28156785c6bdda058654",
+   "sha256": "0nxrdfr9y37ws647qbb0c25l2vwapkqp3qhxwds20jwkskpqa7vm"
   },
   "stable": {
    "version": [
@@ -28747,11 +28947,11 @@
   "repo": "magnars/expand-region.el",
   "unstable": {
    "version": [
-    20200106,
-    2058
+    20200224,
+    1501
    ],
-   "commit": "0fa7c2d349e40c0e1de0965acf0f0b77b7070451",
-   "sha256": "1rqkrf021lmm761caskn0npp9aph7xjkr6v8973cgj9v09yk5mn1"
+   "commit": "1603d01fbfbef0d73ac940f7847c7e0b9b978093",
+   "sha256": "0apwvqbv04pgl682ja96l6cchfflr83s2h4p7vzpjc05h8pc0znr"
   },
   "stable": {
    "version": [
@@ -28831,11 +29031,11 @@
   "repo": "extemporelang/extempore-emacs-mode",
   "unstable": {
    "version": [
-    20190917,
-    1031
+    20200213,
+    1249
    ],
-   "commit": "848ad0084f27b92d1cf98dabffbad29f959a642d",
-   "sha256": "00wr025php7nl33x541s9rjm99hj0jbdcmnw9ljx5hqpm04aqm7c"
+   "commit": "d73c1af831584311d8ad8b45b2ec14cac6eb6edb",
+   "sha256": "1wm4qavrf9b76309cmmw0jf5hg7j3cym5m5syjhv9lh2hlyl358q"
   }
  },
  {
@@ -28872,8 +29072,8 @@
     20181028,
     1645
    ],
-   "commit": "1139b57d8f4276fe56b8416fdaf4745f2cdfe7c3",
-   "sha256": "0jgyscjfparnby0whrmbgvsab2a7qkaqhysmh3s3jh635fndm253"
+   "commit": "187f621cb2d9413595cb47917641e5692e3b37cd",
+   "sha256": "1h9d7fgvy9xz9rw6kf5q606j2k54xqmvva028d929h8aibb6pch2"
   },
   "stable": {
    "version": [
@@ -28911,11 +29111,11 @@
   "repo": "agzam/exwm-edit",
   "unstable": {
    "version": [
-    20191017,
-    107
+    20200126,
+    27
    ],
-   "commit": "80c1cbecafde96a59e620d8fa7e5510a5a7bbd3d",
-   "sha256": "14qnnz3sa8ldhp8lgmvn7xh43prf6ajir90xxij3qaw85km25yi9"
+   "commit": "bc25ba094b383be3c650ca0b7e1534efe2bb154f",
+   "sha256": "1z1ya9xgknka3dy3b3x8zzfkxdx5jqsi8q5aqkvxjxa6n7mmqdwv"
   }
  },
  {
@@ -28944,16 +29144,16 @@
   "repo": "walseb/exwm-firefox-evil",
   "unstable": {
    "version": [
-    20190608,
-    2230
+    20200206,
+    2212
    ],
    "deps": [
     "evil",
     "exwm",
     "exwm-firefox-core"
    ],
-   "commit": "69e8eff0e5443183713213386c450ebfef3b4d0a",
-   "sha256": "1h8h7v1cwbqbdk168vqz8ndb4zgxlkx28dyy0b315vib226vkxq6"
+   "commit": "9407977034baf5f8b1e43c07ed8728f8f42d70d8",
+   "sha256": "1fha5fxjylgylmbr6fn5cz9py9csh4na9h7vljvapkrazwkpvbsy"
   }
  },
  {
@@ -29122,19 +29322,18 @@
   "repo": "thblt/eziam-theme-emacs",
   "unstable": {
    "version": [
-    20200102,
-    2210
+    20200124,
+    1045
    ],
-   "commit": "bfa61cf62f20bd35e74425fa8105e12f7790f044",
-   "sha256": "159k9mk57349w8xw79l8dzsaysn04xnbmnvxa537psmlrrh3jdch"
+   "commit": "9ae0fdb2ad751044b3bd60aee08523d460db2bd6",
+   "sha256": "0gvf7g5s7wrchwbh0bnr0ryx9zaw56mx09bd4f32793lpv9sxyi6"
   },
   "stable": {
    "version": [
-    1,
     3
    ],
-   "commit": "bfa61cf62f20bd35e74425fa8105e12f7790f044",
-   "sha256": "159k9mk57349w8xw79l8dzsaysn04xnbmnvxa537psmlrrh3jdch"
+   "commit": "e0c0daa37c3d70880052b3d55fcda05b92d575a6",
+   "sha256": "0jv0l1hcb33cinqivckhp18a8fkxpg38pkdyva1zripgz1ldjvxc"
   }
  },
  {
@@ -29400,14 +29599,14 @@
   "repo": "jrosdahl/fancy-dabbrev",
   "unstable": {
    "version": [
-    20190921,
-    1811
+    20200129,
+    1933
    ],
    "deps": [
     "popup"
    ],
-   "commit": "2d9c55ce0ef20cd405c597bbac8b204cfaeee77a",
-   "sha256": "0ap13sxycvwg5dxvm65qkp11816hz4vvw3828q730y9j30fizn0r"
+   "commit": "158e1e54055cafe5da9122a59519e8b3ed1057cf",
+   "sha256": "06616lzvv6vdc2i37gy47zw3rb4yjml83vn5py2k30ck8gl4fhs2"
   }
  },
  {
@@ -29711,11 +29910,11 @@
   "repo": "technomancy/fennel-mode",
   "unstable": {
    "version": [
-    20190927,
-    4
+    20200206,
+    2001
    ],
-   "commit": "deea7b971edf238f9018053de4e02fe931064694",
-   "sha256": "0bkpys736r70l9q7r101ghhik6lv14j303xf6sd8xk55v23wh1b8"
+   "commit": "c02f4a9ed1b9c26f9cfc3237906c2844f5937622",
+   "sha256": "1bcdicgp3wlxpdzardx1ry9js192dy26q8af6pdlvrnxqvdl2asm"
   }
  },
  {
@@ -29733,6 +29932,38 @@
    "sha256": "0pjw9fb3n08yd38680ifdn2wlnw2k6q97lzhqb2259mywsycyqy8"
   }
  },
+ {
+  "ename": "ffmpeg-player",
+  "commit": "c3b60e5e699e0731ba195e5ea0760c218b3df4e9",
+  "sha256": "03ni2m92rjsz1dclw3gl983aganv9s88mczxw06lpmflrc5w0ac6",
+  "fetcher": "github",
+  "repo": "jcs-elpa/ffmpeg-player",
+  "unstable": {
+   "version": [
+    20200224,
+    554
+   ],
+   "deps": [
+    "f",
+    "s"
+   ],
+   "commit": "1f2199f653ebae152ab34ebd8ccd364ab96ae392",
+   "sha256": "1idpm3gbbvq4s0q5dk7gs3lycnfwi58nhg4vdss084kgckwfz62r"
+  },
+  "stable": {
+   "version": [
+    0,
+    2,
+    0
+   ],
+   "deps": [
+    "f",
+    "s"
+   ],
+   "commit": "214c08b362daa138d2e17883a6b4d096f22f5ebb",
+   "sha256": "0w2afgdd3pasrqi9apnmp0qqg4qvd0skizybrnyi9abnc0bp9v7x"
+  }
+ },
  {
   "ename": "fic-mode",
   "commit": "0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f",
@@ -29945,26 +30176,26 @@
   "repo": "technomancy/find-file-in-project",
   "unstable": {
    "version": [
-    20191223,
-    2328
+    20200227,
+    1204
    ],
    "deps": [
     "ivy"
    ],
-   "commit": "9aff62217a16c6261b25237eef1ce41130692b29",
-   "sha256": "1ygmr2scbaawi7gzsay6rrapvxc2rb2260xf3riikb4w43dbzi79"
+   "commit": "acedab403f69f242fa41012c20078500d46aa9e8",
+   "sha256": "0p21vm6xz6093nic2wwgly18a85xki3wp0a2vy4hgy0dl7qici86"
   },
   "stable": {
    "version": [
     5,
     7,
-    8
+    10
    ],
    "deps": [
     "ivy"
    ],
-   "commit": "4540416d5aaf7f6adcdcea3ac5b80a08bb695e44",
-   "sha256": "0ak7i76m3b6gi5favcd6rvmh2flr11995jlx5d52as5lrbx01x7m"
+   "commit": "e5bd59c52ddf3cd59bbaa4247770d7b2957a6ea3",
+   "sha256": "156sfd5xs831sdlkf7p5m20hzznv1zlf9nm3pfm8n8ixp13fnzj0"
   }
  },
  {
@@ -29998,11 +30229,11 @@
   "repo": "thisirs/find-temp-file",
   "unstable": {
    "version": [
-    20170107,
-    1339
+    20200117,
+    2254
    ],
-   "commit": "513005d19d72d71f34481ee00158dd57bd93206f",
-   "sha256": "129jnn16vxmp6r9gx8k4rvv6spag5q0if52b5fhsybicnsl35mrz"
+   "commit": "2bfcdba0d6a8a0e6faa080cb04ff0f7ed06491ba",
+   "sha256": "1fr48mkrwxmpjk5lrznrr6nhnj8h6d3v984261nm44c0rzziq7vj"
   }
  },
  {
@@ -30161,11 +30392,11 @@
   "repo": "wasamasa/firestarter",
   "unstable": {
    "version": [
-    20161219,
-    1323
+    20200116,
+    2023
    ],
-   "commit": "f2fd47d9be0c53d63bae5c248d23874fab7e2d6d",
-   "sha256": "14cb46jsvp5s7g6dmhadm9dmi2sqrk215bsq8bwsh6f81fnkvy87"
+   "commit": "eecd8f97a09bbfbc03113b71fa3c8b92766e3956",
+   "sha256": "1a7cp4rfa9r707pg7g9xhhs7nj79gva8fnmbq6ck0hxyllcabwa7"
   },
   "stable": {
    "version": [
@@ -30223,11 +30454,11 @@
   "repo": "wwwjfy/emacs-fish",
   "unstable": {
    "version": [
-    20190921,
-    526
+    20200213,
+    2137
    ],
-   "commit": "688c82decad108029b0434e3bce6c3d129ede6f3",
-   "sha256": "1s961nhwxpb9xyc26rxpn6hvwn63sng452l03mm2ply32b247f9p"
+   "commit": "db257db81058b0b12f788c324c264cc59b9a5bf4",
+   "sha256": "1f6viga13k90ws8v18az3vh3rdc5vd28xkpx9vfv3542bx1np1im"
   },
   "stable": {
    "version": [
@@ -30250,8 +30481,8 @@
     20190713,
     1349
    ],
-   "commit": "d4199bd1e2c4d4e1ff120fc683c526fda0877266",
-   "sha256": "18wbclnqwzgnab6jr32mfsldr1373ivf6v84f4xbj5j6k7n8b6q6"
+   "commit": "d3e17161d137fb75baf1449741ccaadb949e127a",
+   "sha256": "18yk3vs4v7n8zmxv80ss7bd94zmr14nring0d5bavax65b4wqk59"
   },
   "stable": {
    "version": [
@@ -30300,8 +30531,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "53f8d77bfdb8087949a80a62e90a17ebefc9ce98",
-   "sha256": "1kwvjmp88yrbi2psnlv1kcg9gqxnx85qbhgnz8izpic0qnv76f1g"
+   "commit": "8d023f13710a90ae4da644d5485bf2be2646b6a1",
+   "sha256": "0pb5sd5cpz4173xi9kzgl9jx69169aymk94kdr6xgzhqda7iwy7p"
   },
   "stable": {
    "version": [
@@ -30709,11 +30940,11 @@
   "repo": "MetroWind/flucui-theme",
   "unstable": {
    "version": [
-    20190321,
-    2313
+    20200204,
+    1930
    ],
-   "commit": "ec4b20dd5471ee20d5dd6d2e140225ad607550dc",
-   "sha256": "0bazkkdv3gyyxv3ci9wgwnm3mn9yzb1l8h2mjap5xzy4hm6zj627"
+   "commit": "01a3df3530474da7b4303e4eea2ed1fae00d1776",
+   "sha256": "1bfnpligs32mpizrz9fb1pyp1zxq2rmympcg9pqrgpkdlxvs6xrf"
   }
  },
  {
@@ -30724,11 +30955,11 @@
   "repo": "amake/flutter.el",
   "unstable": {
    "version": [
-    20191210,
-    550
+    20200226,
+    640
    ],
-   "commit": "01473aeec61a19e9638a6c032228c054a578aba5",
-   "sha256": "1frlfc6wgg4pyhzvk6pa96lqn2dkz1h5c7nzw5rxvg9xm6vp8s86"
+   "commit": "ec92a4df842ad7e5bd8f60a648ffe7b004abb09d",
+   "sha256": "1l7nd01p5p9l2a4k2rl61vjs337sagx4m3qr4isvhvy2bk2cppmy"
   }
  },
  {
@@ -30739,15 +30970,15 @@
   "repo": "amake/flutter.el",
   "unstable": {
    "version": [
-    20190729,
-    401
+    20200221,
+    1415
    ],
    "deps": [
     "flutter",
     "flycheck"
    ],
-   "commit": "01473aeec61a19e9638a6c032228c054a578aba5",
-   "sha256": "1frlfc6wgg4pyhzvk6pa96lqn2dkz1h5c7nzw5rxvg9xm6vp8s86"
+   "commit": "ec92a4df842ad7e5bd8f60a648ffe7b004abb09d",
+   "sha256": "1l7nd01p5p9l2a4k2rl61vjs337sagx4m3qr4isvhvy2bk2cppmy"
   }
  },
  {
@@ -30857,8 +31088,8 @@
   "repo": "flycheck/flycheck",
   "unstable": {
    "version": [
-    20191126,
-    2142
+    20200224,
+    2057
    ],
    "deps": [
     "dash",
@@ -30866,8 +31097,8 @@
     "pkg-info",
     "seq"
    ],
-   "commit": "269237f6529a4ad7db5bbbc5a40c1f038accf3cd",
-   "sha256": "11gjfnrk5s6pr3ggalcxxv9x0grhyliyyz3px2pf5jgc1n115pmk"
+   "commit": "08345d38e2872a3dcb14228edff796195809266f",
+   "sha256": "183s05gm7zkgwphrwq0bq9fv2sldhrxjik8skz7rvbz448syh0c5"
   },
   "stable": {
    "version": [
@@ -31100,8 +31331,8 @@
    "deps": [
     "flycheck"
    ],
-   "commit": "2f89698ab0d78818875d5ef08d0b470a9ffc402f",
-   "sha256": "1l4jla3vlyx37nz9hjaihy9pi3ywbrg3512k2zp9cdis7130mvrb"
+   "commit": "2ae5542960785604a2974548f89e10407e2ccfc1",
+   "sha256": "0gpvavwmb4zp5c5b8z60jcsza0zsb29hsg4sapp9d35hk3ranbx5"
   },
   "stable": {
    "version": [
@@ -31511,6 +31742,25 @@
    "sha256": "0wmp4q1jzb6giwrv8ajgqriy155mcc7jnj5sycpfk3hw6q74js66"
   }
  },
+ {
+  "ename": "flycheck-drstring",
+  "commit": "2070680f0d883ea61def1b7a9487c4524886a579",
+  "sha256": "08hyh39wyphh2lr879y2havw0wfgppq0v763j0sa5hpvaf0y46h7",
+  "fetcher": "github",
+  "repo": "danielmartin/flycheck-drstring",
+  "unstable": {
+   "version": [
+    20200210,
+    1903
+   ],
+   "deps": [
+    "flycheck",
+    "swift-mode"
+   ],
+   "commit": "d8d5a560e792a6657ef5ac69934c74f1ed51372d",
+   "sha256": "0vcp3zbpi5vb8cs01fzb4268gj9ijq9qndqarwnls8w9wky4548w"
+  }
+ },
  {
   "ename": "flycheck-dtrace",
   "commit": "cdcdd10fbcd58a5c67e4d07632212e7dedf42dbe",
@@ -31575,14 +31825,14 @@
   "repo": "emacs-elsa/flycheck-elsa",
   "unstable": {
    "version": [
-    20200104,
-    1523
+    20200203,
+    1758
    ],
    "deps": [
     "seq"
    ],
-   "commit": "4796cdae375f51e8364660518c2948b8a90bcd40",
-   "sha256": "1nmf51jrw0xixrb0nawl6shfw68nw4zs1w12plhghaiwr4430rjp"
+   "commit": "6274e6d5391bcdca46164b3238b045ca21c353a2",
+   "sha256": "0dr52dqxsgswswbkdbv0dax57k41j58n5wf3gny6yz52626kv8n8"
   }
  },
  {
@@ -31736,6 +31986,40 @@
    "sha256": "0s7kbs764nhq4nlfbbilz5clvadcyz5bi0ksrbm9kczhagisxnjv"
   }
  },
+ {
+  "ename": "flycheck-grammarly",
+  "commit": "5fdf51167be86e0871125d5548bddc0c926b79dd",
+  "sha256": "0rdgb9ig3gda33xwl8p9c11gf274v02zibzd660ncp0cipapvqp7",
+  "fetcher": "github",
+  "repo": "jcs-elpa/flycheck-grammarly",
+  "unstable": {
+   "version": [
+    20200203,
+    446
+   ],
+   "deps": [
+    "cl-lib",
+    "flycheck",
+    "grammarly"
+   ],
+   "commit": "72425743364f4fd9516f94546a7432457e1e7df0",
+   "sha256": "17dl0g9f58gc9rkk87kg1bqy6qqz225ng7ymdg2ikhd8i2pd2zkw"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    4
+   ],
+   "deps": [
+    "cl-lib",
+    "flycheck",
+    "grammarly"
+   ],
+   "commit": "1bcb11c3c7878c1b0d73318399e572e9a15587b1",
+   "sha256": "1daw5mmif1nzg4yr5zm42bzzfg1n4qxps3pkcisga11mbp9g553r"
+  }
+ },
  {
   "ename": "flycheck-haskell",
   "commit": "6ca601613788ae830655e148a222625035195f55",
@@ -31744,8 +32028,8 @@
   "repo": "flycheck/flycheck-haskell",
   "unstable": {
    "version": [
-    20190907,
-    2035
+    20200218,
+    753
    ],
    "deps": [
     "dash",
@@ -31754,8 +32038,8 @@
     "let-alist",
     "seq"
    ],
-   "commit": "4b585264826a9f0f35d121dd52aa0e381f336d69",
-   "sha256": "1cz8yxb06acm77jlr0mk9kx79v6pnhb97p2601pik9rndr824c2a"
+   "commit": "23cfb9387faf6f70b421bb4c11b6847f0db38dfc",
+   "sha256": "0s36fcqvmi3kmvhmmb0vrbgjkxjpx9wkj343f0rjjz1rh4b3n7qv"
   },
   "stable": {
    "version": [
@@ -31811,15 +32095,28 @@
   "repo": "conao3/indent-lint.el",
   "unstable": {
    "version": [
-    20191228,
-    235
+    20200129,
+    2046
    ],
    "deps": [
     "flycheck",
     "indent-lint"
    ],
-   "commit": "e76b127241635677a4cb2d457d5c4c74ca93ee92",
-   "sha256": "1bmik58ygg9r9p7cnvxhss49hkcqy3zgcwrhwq59baqixclfwrd1"
+   "commit": "23ef4bab5509e2e7fb1f4a194895a9510fa7c797",
+   "sha256": "00ipp87hjiymraiv6xy0lqzhn9h3wcrw7z4dkzb2934d7bd08j29"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    0
+   ],
+   "deps": [
+    "flycheck",
+    "indent-lint"
+   ],
+   "commit": "5601a716d4daeb444642736ddef420cbc1047968",
+   "sha256": "0ndpdqdcg2rlrw5z86gyj46qsmsilh3a4snyyybi87kk5ajk2k64"
   }
  },
  {
@@ -32119,15 +32416,15 @@
   "repo": "tomekowal/flycheck-mix",
   "unstable": {
    "version": [
-    20190714,
-    958
+    20200211,
+    1414
    ],
    "deps": [
     "elixir-mode",
     "flycheck"
    ],
-   "commit": "04681608e52ac660f74989a045579da75bc489f2",
-   "sha256": "0lszvz83xkzna349vmks7p63v5r7039lmk22m796gd7ynhw7k7qy"
+   "commit": "d3c075f61ace6695919e90239cee6567cce09638",
+   "sha256": "19bvnryfxz4idw1dgp90mpjbp3512423m3xqgczskv4csns4hw1q"
   },
   "stable": {
    "version": [
@@ -32157,8 +32454,8 @@
    "deps": [
     "flycheck"
    ],
-   "commit": "c796a2f18884bfc2afeec1fb2060da0f4044ddee",
-   "sha256": "09q676m4izyr50c49rsk8dsq7bys227d782x9r2kdld0fr7c7hpd"
+   "commit": "f8fdd59ccb9ddc7d81efbf3dde096dc66e3f9fa1",
+   "sha256": "08rwmvddla2h0wjiljl8qab87chsyc42hzap2mqih2n7finvzj4f"
   },
   "stable": {
    "version": [
@@ -32181,14 +32478,14 @@
   "repo": "lbolla/emacs-flycheck-mypy",
   "unstable": {
    "version": [
-    20180907,
-    1016
+    20200113,
+    1336
    ],
    "deps": [
     "flycheck"
    ],
-   "commit": "6f99166f5229c7b4298cff1818b7eaece1c9c8bd",
-   "sha256": "06rdwjljhficbdf74qzlxsy02xhd8msp79fx75nwbxbd84q6dr5w"
+   "commit": "12a77ee8ee3f6e774365f63be3cd5aede6462dd5",
+   "sha256": "187v8877wh247j26d5h2qcnc8i3fmqgyzfvjjjlw9sswqgrln6m7"
   }
  },
  {
@@ -32312,27 +32609,27 @@
   "repo": "purcell/flycheck-package",
   "unstable": {
    "version": [
-    20191007,
-    51
+    20200222,
+    512
    ],
    "deps": [
     "flycheck",
     "package-lint"
    ],
-   "commit": "d76e04009f2548581fc9e9a84f79f1a3112f1096",
-   "sha256": "1jndjq5mnhxmjvhaay4f07p5dbz4zsqv1zhyr98v8zc5dv7qkkfk"
+   "commit": "e867b83dc84f1f8870eea069a71fa2a24cbcd5c9",
+   "sha256": "1b7javiqbcfzh1xkrjld9f5xrmld69gvnjz72mqpqmzbilfvmdpq"
   },
   "stable": {
    "version": [
     0,
-    12
+    13
    ],
    "deps": [
     "flycheck",
     "package-lint"
    ],
-   "commit": "afe8a49343d90d08ee72ac6f993d424dcc39cc38",
-   "sha256": "19pz8h01yacfqsyh5940pam6vigvavsqg6qd84994d7mmzl534qa"
+   "commit": "e867b83dc84f1f8870eea069a71fa2a24cbcd5c9",
+   "sha256": "1b7javiqbcfzh1xkrjld9f5xrmld69gvnjz72mqpqmzbilfvmdpq"
   }
  },
  {
@@ -32380,28 +32677,28 @@
   "repo": "emacs-php/phpstan.el",
   "unstable": {
    "version": [
-    20190626,
-    1902
+    20200122,
+    1256
    ],
    "deps": [
     "flycheck",
     "phpstan"
    ],
-   "commit": "81bcfa59d1e5708239d8c32d99cd84405449fb64",
-   "sha256": "1m4vk7v3aafj64qqs0aa9m1w8fbjziq0l6c9k4n10yr8dnm5j9aw"
+   "commit": "6744215d82ce9e82416d83e5b27fb9bac9e8d461",
+   "sha256": "0hbm881w84nm4g67085xzikz422vkb08y98hfk2n3kqmznvp8i51"
   },
   "stable": {
    "version": [
     0,
     3,
-    2
+    3
    ],
    "deps": [
     "flycheck",
     "phpstan"
    ],
-   "commit": "de74ebfcbce53a08daf95d324d7447dede094222",
-   "sha256": "01x5gf7z0iqx601z3g4cdq6cv27aflxw5kmqrwrj0aijcb7nb9c6"
+   "commit": "535e172e1c561bc7b8c706b4e03bbf71689bd83a",
+   "sha256": "1hn1rdgymv81rm8nkibnc5jazgjrx3sz4w1lin85rgypzbfaf6wk"
   }
  },
  {
@@ -32581,25 +32878,25 @@
   "repo": "msherry/flycheck-pycheckers",
   "unstable": {
    "version": [
-    20191025,
-    2137
+    20200206,
+    2158
    ],
    "deps": [
     "flycheck"
    ],
-   "commit": "da328975c5554a879d6cd198e3ebb4f8427f0c36",
-   "sha256": "16n41bjmx6nk6gz70d1xv6rvhfw7sxmjs9y14ikp9fyg5j2kdy39"
+   "commit": "c5349c0fb3b719469b7e66dbdfbe58d0813f6a74",
+   "sha256": "02886xggdb09880jp57cah3fmf1nm77gvb0aaws8j4abl278g7x5"
   },
   "stable": {
    "version": [
     0,
-    13
+    14
    ],
    "deps": [
     "flycheck"
    ],
-   "commit": "680ed9bc1bfb6dc043294b705f5b6d87ca5a1700",
-   "sha256": "1d2caskc87kdclj6gsymnf8bxhyn4n9r9816z76hx88pn16xxqh5"
+   "commit": "c5349c0fb3b719469b7e66dbdfbe58d0813f6a74",
+   "sha256": "02886xggdb09880jp57cah3fmf1nm77gvb0aaws8j4abl278g7x5"
   }
  },
  {
@@ -32639,6 +32936,37 @@
    "sha256": "0f58127197q6yfylz53nigyn7v91pcsdd91ywfgq5lrl0f5fvmdy"
   }
  },
+ {
+  "ename": "flycheck-relint",
+  "commit": "e20128460e942a78a88bd9e6389a8fcbb14343ad",
+  "sha256": "1q443078jf6cxzwxz6mc4m9drzfcd86q0lcw5vszmfyzn35nwyzb",
+  "fetcher": "github",
+  "repo": "purcell/flycheck-relint",
+  "unstable": {
+   "version": [
+    20200226,
+    508
+   ],
+   "deps": [
+    "flycheck",
+    "relint"
+   ],
+   "commit": "6dbd319a49d334653a3e4f9bff229f482bbb7ba4",
+   "sha256": "0rmnq0llmc96hmvhim451fknzafj80pjkd6qdb0x1bdr7iww1ilc"
+  },
+  "stable": {
+   "version": [
+    0,
+    2
+   ],
+   "deps": [
+    "flycheck",
+    "relint"
+   ],
+   "commit": "6dbd319a49d334653a3e4f9bff229f482bbb7ba4",
+   "sha256": "0rmnq0llmc96hmvhim451fknzafj80pjkd6qdb0x1bdr7iww1ilc"
+  }
+ },
  {
   "ename": "flycheck-rtags",
   "commit": "3dea16daf0d72188c8b4043534f0833fe9b04e07",
@@ -32654,20 +32982,20 @@
     "flycheck",
     "rtags"
    ],
-   "commit": "5f1eaf4355e2093afb2b7828f3ebddfcad1234be",
-   "sha256": "1ankfl792qq0p2mdp89gldisw2l3lp8p10dmmqxm3ys898b0p2rh"
+   "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a",
+   "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n"
   },
   "stable": {
    "version": [
     2,
-    37
+    38
    ],
    "deps": [
     "flycheck",
     "rtags"
    ],
-   "commit": "11f49ef5c488da4c744f700b5cf07a8ebcb9f4ec",
-   "sha256": "0g443kw9y469banr70nv2fhlb7vyc3911d2mcyssrcsqjm1xdvlv"
+   "commit": "9687ccdb9e539981e7934e768ea5c84464a61139",
+   "sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx"
   }
  },
  {
@@ -32732,28 +33060,28 @@
   "repo": "stan-dev/stan-mode",
   "unstable": {
    "version": [
-    20191107,
-    320
+    20200221,
+    2025
    ],
    "deps": [
     "flycheck",
     "stan-mode"
    ],
-   "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a",
-   "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0"
+   "commit": "599a0440086c660e6823622b35058f6d2d6d9637",
+   "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y"
   },
   "stable": {
    "version": [
     10,
-    0,
+    1,
     0
    ],
    "deps": [
     "flycheck",
     "stan-mode"
    ],
-   "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a",
-   "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0"
+   "commit": "599a0440086c660e6823622b35058f6d2d6d9637",
+   "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y"
   }
  },
  {
@@ -33507,6 +33835,24 @@
    "sha256": "1ygg51r4ym4x7h4svizwllsvr72x9np6jvjqpk8ayv3w2fpb9l31"
   }
  },
+ {
+  "ename": "flymake-joker",
+  "commit": "1b40ad24abac91b6beb550e743cdcece8c3ab849",
+  "sha256": "1wflpdqdczjsvkqnlr6p4qv1s7865lr4gpm9aq7gcfqwb0fm7pbw",
+  "fetcher": "github",
+  "repo": "beetleman/flymake-joker",
+  "unstable": {
+   "version": [
+    20200118,
+    1937
+   ],
+   "deps": [
+    "flymake-quickdef"
+   ],
+   "commit": "c4350eb9198fb6fe1ebfb356e3c9c37dd6b0f171",
+   "sha256": "0c25nzainwcy5wxh2q1r98fvbnvgylyp6s41sh4zdpzid34rf1vz"
+  }
+ },
  {
   "ename": "flymake-jshint",
   "commit": "144511ce3378b468751b1ee627b77a2d22fe8dfc",
@@ -34033,11 +34379,11 @@
   "repo": "d12frosted/flyspell-correct",
   "unstable": {
    "version": [
-    20191230,
-    630
+    20200215,
+    1408
    ],
-   "commit": "7b4cf8c9ba5ac65e3bb2b62f5b72d45f4c9cf7b6",
-   "sha256": "1m5da6r82hk0c2x3lw03qnkk79sx67875afw0ybblj3cmfk6szd1"
+   "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87",
+   "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp"
   },
   "stable": {
    "version": [
@@ -34057,15 +34403,15 @@
   "repo": "d12frosted/flyspell-correct",
   "unstable": {
    "version": [
-    20191230,
-    630
+    20200215,
+    1337
    ],
    "deps": [
     "avy-menu",
     "flyspell-correct"
    ],
-   "commit": "7b4cf8c9ba5ac65e3bb2b62f5b72d45f4c9cf7b6",
-   "sha256": "1m5da6r82hk0c2x3lw03qnkk79sx67875afw0ybblj3cmfk6szd1"
+   "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87",
+   "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp"
   },
   "stable": {
    "version": [
@@ -34089,15 +34435,15 @@
   "repo": "d12frosted/flyspell-correct",
   "unstable": {
    "version": [
-    20191230,
-    630
+    20200215,
+    1337
    ],
    "deps": [
     "flyspell-correct",
     "helm"
    ],
-   "commit": "7b4cf8c9ba5ac65e3bb2b62f5b72d45f4c9cf7b6",
-   "sha256": "1m5da6r82hk0c2x3lw03qnkk79sx67875afw0ybblj3cmfk6szd1"
+   "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87",
+   "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp"
   },
   "stable": {
    "version": [
@@ -34121,15 +34467,15 @@
   "repo": "d12frosted/flyspell-correct",
   "unstable": {
    "version": [
-    20191230,
-    630
+    20200215,
+    1503
    ],
    "deps": [
     "flyspell-correct",
     "ivy"
    ],
-   "commit": "7b4cf8c9ba5ac65e3bb2b62f5b72d45f4c9cf7b6",
-   "sha256": "1m5da6r82hk0c2x3lw03qnkk79sx67875afw0ybblj3cmfk6szd1"
+   "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87",
+   "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp"
   },
   "stable": {
    "version": [
@@ -34153,15 +34499,15 @@
   "repo": "d12frosted/flyspell-correct",
   "unstable": {
    "version": [
-    20191230,
-    630
+    20200204,
+    521
    ],
    "deps": [
     "flyspell-correct",
     "popup"
    ],
-   "commit": "7b4cf8c9ba5ac65e3bb2b62f5b72d45f4c9cf7b6",
-   "sha256": "1m5da6r82hk0c2x3lw03qnkk79sx67875afw0ybblj3cmfk6szd1"
+   "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87",
+   "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp"
   },
   "stable": {
    "version": [
@@ -34634,8 +34980,8 @@
   "repo": "magit/forge",
   "unstable": {
    "version": [
-    20200102,
-    2204
+    20200228,
+    1527
    ],
    "deps": [
     "closql",
@@ -34647,8 +34993,8 @@
     "markdown-mode",
     "transient"
    ],
-   "commit": "269effb4954071f590954c0e5b4faba3f27d03d0",
-   "sha256": "0d6l1rllzznc9qvim1zn5w3plqcdpk9lwc7m4jsx8jkhxzyajw68"
+   "commit": "0ade907a469d7159d9f5b3290e2aebec4397c58a",
+   "sha256": "12pvnasc4nr3n4k91ch90zsvyc1rv1ghga8lx7xp78fc6b3y959r"
   },
   "stable": {
    "version": [
@@ -34703,26 +35049,28 @@
   "repo": "lassik/emacs-format-all-the-code",
   "unstable": {
    "version": [
-    20200107,
-    1608
+    20200219,
+    1628
    ],
    "deps": [
-    "cl-lib"
+    "cl-lib",
+    "language-id"
    ],
-   "commit": "f0ff413f09b5982b39df6ebe0d566aa221da7327",
-   "sha256": "0bzss41dg25sn7cgf21v5v8hl0qb47l5cr5ngqc9yzd8lgg3x56y"
+   "commit": "8c8c47a863a397d947999fff4358caf20bafca0a",
+   "sha256": "0ayb57p114z64ppf74g2wpm2g2iga2vrl8rhay7fnfv1j2i4xjss"
   },
   "stable": {
    "version": [
     0,
-    1,
+    3,
     0
    ],
    "deps": [
-    "cl-lib"
+    "cl-lib",
+    "language-id"
    ],
-   "commit": "09119a61855efe084e77f14544d5432b94cfa82c",
-   "sha256": "1890i4h18rciyl0vngxchdc01hw3wciq7s8qzgnikdz2pcqfwf2m"
+   "commit": "8c8c47a863a397d947999fff4358caf20bafca0a",
+   "sha256": "0ayb57p114z64ppf74g2wpm2g2iga2vrl8rhay7fnfv1j2i4xjss"
   }
  },
  {
@@ -34846,20 +35194,26 @@
   "repo": "rnkn/fountain-mode",
   "unstable": {
    "version": [
-    20191217,
-    914
+    20200218,
+    1249
    ],
-   "commit": "4805d4149366e69cdce2e4206540fcf064eac91b",
-   "sha256": "1xavb8yp24y2pvvmh68m0mfdslfifgni22dv7p20lnqz7dp3x3n6"
+   "deps": [
+    "seq"
+   ],
+   "commit": "974c9df2c73cf52030dfe0c771d97d3d37bd08e4",
+   "sha256": "0103rnq9x07a11930jgcg04ayd7npri9wd2j2ghr510y7sm86p0d"
   },
   "stable": {
    "version": [
-    2,
-    8,
-    1
+    3,
+    0,
+    3
    ],
-   "commit": "cd58c7e8d8fde05ef521fbcd066a290b005e6d40",
-   "sha256": "063bdfr0rnnr4k1js9vjcwhdliw374iw433a5hwj3cqj1jwz133q"
+   "deps": [
+    "seq"
+   ],
+   "commit": "974c9df2c73cf52030dfe0c771d97d3d37bd08e4",
+   "sha256": "0103rnq9x07a11930jgcg04ayd7npri9wd2j2ghr510y7sm86p0d"
   }
  },
  {
@@ -35165,16 +35519,16 @@
   "repo": "waymondo/frog-jump-buffer",
   "unstable": {
    "version": [
-    20190810,
-    1749
+    20200114,
+    1826
    ],
    "deps": [
     "avy",
     "dash",
     "frog-menu"
    ],
-   "commit": "2d7b342785ae27d45f5d252272df6eb773c78e20",
-   "sha256": "1z00by8hiss1r2lwmzrl8pnz6jykia2849dqqm4l3z5rf6lwvc0f"
+   "commit": "1eb289c9b2a4bbebb3065076750f54216ac9c718",
+   "sha256": "0qlwjk3a13gb3glib9irgpyx94j933kflky7pbnrl17a53pnryrw"
   }
  },
  {
@@ -35216,8 +35570,8 @@
     "eglot",
     "s"
    ],
-   "commit": "0415c45489fa7d83e9a7c94530aa1943682aabf9",
-   "sha256": "1cwyj9xw9d2hyvibvyr046bhgmxpf55nmgb33la7564wfgkmr37f"
+   "commit": "8c86e38b93aac55f57d5baf3a9575b45b54cd16a",
+   "sha256": "08c8v5wnb7fi4pbi5ivkhi3l4nf8mhn9b9829nkpz1l5q9lmz263"
   },
   "stable": {
    "version": [
@@ -35241,8 +35595,8 @@
   "repo": "FStarLang/fstar-mode.el",
   "unstable": {
    "version": [
-    20190815,
-    1357
+    20200131,
+    1622
    ],
    "deps": [
     "company",
@@ -35252,8 +35606,8 @@
     "quick-peek",
     "yasnippet"
    ],
-   "commit": "5af6fea23d1631f3f6653f804f17cd1b7358ca6b",
-   "sha256": "1wpr8hsvf923k7fwadl6j47k50vvfhzvpgrpj91j8208g8br87l8"
+   "commit": "336b41ecd7ecb64fac869ec61e683e20a14d79d2",
+   "sha256": "1122m5l16sw3mi9xvsmkrxxsvx6895g0agd55w8wk5968323n01y"
   },
   "stable": {
    "version": [
@@ -35283,8 +35637,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "ca1612cc57239c37c7646544d40a6a10adb80476",
-   "sha256": "1nnim6q1ab2din657qdnlzn5fy1a9wdvkw7gjlb2n9xd27ln00gy"
+   "commit": "573e4ed198584f17126549f708bd8426e93058be",
+   "sha256": "0baqikbbgxb2a0jyqz8s9ibivh9q14bq2g2kngd89pssd74fv04k"
   },
   "stable": {
    "version": [
@@ -35437,14 +35791,14 @@
   "repo": "diku-dk/futhark-mode",
   "unstable": {
    "version": [
-    20200107,
-    2336
+    20200123,
+    931
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "c0899e431e5819575231a7e637d6c77f51e384f5",
-   "sha256": "0xayw1jwxfln67k8fwkdvc784zrv5sf0jajngxhcx0ljwaqj97q3"
+   "commit": "ca22b1e5fe46125b968c3da46e0bc9780b32e346",
+   "sha256": "1zkqlacxmiwprx8xbnp6phf3gh3faxghxv0j90019k0g3dq9l3ws"
   }
  },
  {
@@ -35636,19 +35990,19 @@
   "repo": "ShiroTakeda/gams-mode",
   "unstable": {
    "version": [
-    20181112,
-    601
+    20200131,
+    1335
    ],
-   "commit": "210bd355dd2075bde3fd76c880aa489a25a54cb5",
-   "sha256": "1xvga0hjwcjvz9vpdn2pxq84wp6f3hrq8g55hhpr4gqxx7yg1bwj"
+   "commit": "bb4e8a223c8aac5ec9268d1cfcf1a9ea9b3d8a49",
+   "sha256": "084xjxj03d0ghh1lgrgwlkzf78y3szh47m3qva4r344yg0051yz3"
   },
   "stable": {
    "version": [
     6,
-    5
+    6
    ],
-   "commit": "3022e9f8411628e6a210fb5843d858b15a7513f5",
-   "sha256": "06hc8yy1g2vyvib8yrhwzs8fvgxnrxlw6iyzi7phjp9fgr3cp504"
+   "commit": "bb4e8a223c8aac5ec9268d1cfcf1a9ea9b3d8a49",
+   "sha256": "084xjxj03d0ghh1lgrgwlkzf78y3szh47m3qva4r344yg0051yz3"
   }
  },
  {
@@ -35713,11 +36067,11 @@
   "repo": "koral/gcmh",
   "unstable": {
    "version": [
-    20190807,
-    2023
+    20200213,
+    944
    ],
-   "commit": "f542908b9ae4405d70fa70f42bd62618c5de4b95",
-   "sha256": "0mpi6x06kg5a7dr13q69irv58j3rda62fbscm5b7d1b9vlp4vcqi"
+   "commit": "8867533a736f2098917904c26fd833feca2310a5",
+   "sha256": "0fwbxh0ywy6prjvgl91xdxfmcca4cnnn2cy2zndj5mdl0zx5k3a2"
   }
  },
  {
@@ -35820,19 +36174,20 @@
   "repo": "jaor/geiser",
   "unstable": {
    "version": [
-    20200103,
-    1329
+    20200225,
+    1423
    ],
-   "commit": "645e4775420c59bb10ef0693ed2631a8df8c0e29",
-   "sha256": "035rf5i37zwl4glnpvvgn25sp1lf3c212ycsah5xpyh0ddzw5v4v"
+   "commit": "5fcd56b2d560c04a173ae7d8b21540471322afa4",
+   "sha256": "00zvll0glzx9lp4s9l1ix1grdqa9cj24kszil1akaa8rqniiafn1"
   },
   "stable": {
    "version": [
     0,
-    10
+    11,
+    2
    ],
-   "commit": "775d1d734a677274fbbf4af780592bb3768d3f9b",
-   "sha256": "086qlii1w7sqxwnxwxvc4d6d71p829jabhgwvi0l0bjkxn7bx8pq"
+   "commit": "51252bcb35d6afe006487b73c1e2276210b4ed83",
+   "sha256": "1khi1bghsjx6cs5acizmlbw9z19s4qycnji9krdbn42cbpv0rysv"
   }
  },
  {
@@ -35921,8 +36276,8 @@
   "repo": "thisch/gerrit.el",
   "unstable": {
    "version": [
-    20200107,
-    2305
+    20200226,
+    2137
    ],
    "deps": [
     "dash",
@@ -35930,8 +36285,8 @@
     "magit",
     "s"
    ],
-   "commit": "a88e2ca8a6b3ccab44ed8f4f7653e6235c96353b",
-   "sha256": "0mm7naq50wwjljky1yzcxh1mzi5x74dc4yzqaxl5wrqkc80calhz"
+   "commit": "36870fd34ad681f907a57a2d82b2002735878614",
+   "sha256": "0h9v4ajp50wpg3zz0p7klyi705ynfy2mka0hpzz81kgpq8q8f46z"
   }
  },
  {
@@ -36219,30 +36574,28 @@
   "repo": "magit/ghub",
   "unstable": {
    "version": [
-    20200102,
-    2204
+    20200228,
+    4
    ],
    "deps": [
     "let-alist",
     "treepy"
    ],
-   "commit": "a9c5ac44bc7691752e6bfea87ac75c7459ce88f3",
-   "sha256": "07wanc8l1k9dk1r7ykgpiq1yfp5dwhvwlfaay1y86xblpd9jaagi"
+   "commit": "b0faadaf079542f81ac06a15a1bd225e2a7af1ec",
+   "sha256": "1fasnipic9mkhkm7km56f43s19cyzrrs1cd8nr81b9kxmp95ik3r"
   },
   "stable": {
    "version": [
     3,
-    2,
+    3,
     0
    ],
    "deps": [
-    "dash",
-    "graphql",
     "let-alist",
     "treepy"
    ],
-   "commit": "b04c7d9a3318316ef67a5d360582d990dc9f6098",
-   "sha256": "0lp52qygyavddl1lrgsyb6mq7hcf9h89dy2pzya3mb2va49f0vvl"
+   "commit": "eec071aa9e2810c8ce2f2522e6be8d78f579069d",
+   "sha256": "1229g0d9f4ywwjndx32x4z5jdr0kzyi44hjxmy0sifwfmg9nn251"
   }
  },
  {
@@ -36284,11 +36637,19 @@
   "repo": "Ambrevar/emacs-gif-screencast",
   "unstable": {
    "version": [
-    20191212,
-    147
+    20200207,
+    1358
    ],
-   "commit": "2ed2ebe710690f041c074cc59816ecd3e0f8e980",
-   "sha256": "1nyysz7bcx4lm2jp08c50xqrz14piwpvr83yk77rrdjg837iasg4"
+   "commit": "dce0f3bb71ab8761a689c7382864a20198874b8e",
+   "sha256": "0yf665w06ijjxvzfbg8naa95f5ga3z2kcaq9baq7md222r52xd7q"
+  },
+  "stable": {
+   "version": [
+    1,
+    1
+   ],
+   "commit": "9522f7e41d07b59afe21e28abbf186f78be3eab6",
+   "sha256": "1g1by8lvf8c9vzm4wwsi5kp285kaj0ahsl54048ympin4pi0njw9"
   }
  },
  {
@@ -36443,20 +36804,20 @@
   "repo": "ryuslash/git-auto-commit-mode",
   "unstable": {
    "version": [
-    20191214,
-    1021
+    20200217,
+    2348
    ],
-   "commit": "6f7b58f866a72709c213f4c1f7c957beb474bd6c",
-   "sha256": "0lfyksjl4wlb0vlw99ng4wi0q6q9dh6skia2ji836h0hbqnfyp3l"
+   "commit": "ae69e61233417a7f14efba35e42bd842b707aeb0",
+   "sha256": "0nrx3wnn2jii4yiv9c1cbbll4bgll5j73ypp1fi82kk99n0d8372"
   },
   "stable": {
    "version": [
     4,
-    5,
+    6,
     0
    ],
-   "commit": "3db70af7d3659d1fe0ed2edf34cae23708a6d511",
-   "sha256": "1w3v9pmlmdxl4pglsb6j0igp13lbzg5bhbr1rv2vll93m6zxmyma"
+   "commit": "ae69e61233417a7f14efba35e42bd842b707aeb0",
+   "sha256": "0nrx3wnn2jii4yiv9c1cbbll4bgll5j73ypp1fi82kk99n0d8372"
   }
  },
  {
@@ -36564,16 +36925,16 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20200102,
-    2204
+    20200207,
+    1819
    ],
    "deps": [
     "dash",
     "transient",
     "with-editor"
    ],
-   "commit": "2191261223078077bf35eb12187e35ff0228174a",
-   "sha256": "1fn1ygaw71qq5b6dqk4bj05rfjqb4qz2hv0vc3m3zvpckxar6v5g"
+   "commit": "c8cd22e28d20b0d7ae74102df4e35d7c0c61ebe6",
+   "sha256": "134n9m2zrf60ljm867bv92qjgk61cmgns1a3cqpvj4wflpaahnbv"
   },
   "stable": {
    "version": [
@@ -36771,20 +37132,21 @@
   "repo": "akirak/git-identity.el",
   "unstable": {
    "version": [
-    20191006,
-    443
+    20200124,
+    1856
    ],
    "deps": [
     "dash",
     "f",
     "hydra"
    ],
-   "commit": "747ea7c2694754719261c2845cdd9f5f8b3aae20",
-   "sha256": "1hg2na6djk2ca4hdsnk3n04yk8q6cdjf6zm63142wgkmzd31qplx"
+   "commit": "8471e6f8ef6c502dc999e513b552d6b23974d40d",
+   "sha256": "1w4dnrc0dq0brdq0dpk5lj7ji50v5b7q32f1ghkvx50i7a3dslvq"
   },
   "stable": {
    "version": [
     0,
+    1,
     1
    ],
    "deps": [
@@ -36792,8 +37154,8 @@
     "f",
     "hydra"
    ],
-   "commit": "fcfcb054c08b9a391add639123faf7f700b57af4",
-   "sha256": "1lyz4cwlskwfgh6jgvpbyc9c119znc651gwl4bchbqr97bgq2nqm"
+   "commit": "d5b8dcfc9f93aecfcd9c6fb212742c165d48173f",
+   "sha256": "1dblc0vlnkm1b16pgi40yr21wh45larb7818l9q8p9nbpxcjinh2"
   }
  },
  {
@@ -36915,11 +37277,11 @@
   "repo": "10sr/git-ps1-mode-el",
   "unstable": {
    "version": [
-    20181115,
-    349
+    20200113,
+    704
    ],
-   "commit": "b9188e26a64fa6f8678da6cbf5e3e865065f4f04",
-   "sha256": "0l9y6x53li7fqfrwb4037psn92xciylanj0fmmy8jy6n51dlzxyn"
+   "commit": "6762a309bd593d26258dfbf43e7bc21254a70fbf",
+   "sha256": "1xrp9c7ih5xvq9mhd4h2vwn47khmiycdinzhn4kmp69xy1a93b2c"
   },
   "stable": {
    "version": [
@@ -37177,16 +37539,16 @@
   "repo": "10sr/github-elpa",
   "unstable": {
    "version": [
-    20180831,
-    811
+    20200129,
+    417
    ],
    "deps": [
     "commander",
     "git",
     "package-build"
    ],
-   "commit": "279b6c352859cfd519ea8726eafed84d6875c418",
-   "sha256": "0qhsi6qayjxg15wyjbj4sjhq4y6nhb9vd8nhc8qx26qlmvmnd0mg"
+   "commit": "04a55c723ffcd84dd35e5438e7e2b9f1cce08d42",
+   "sha256": "19jidx1v3awga0d95shdcz5vgwfw4svpgs5l43d4l340lz84c4dk"
   },
   "stable": {
    "version": [
@@ -37299,16 +37661,16 @@
   "repo": "charignon/github-review",
   "unstable": {
    "version": [
-    20190830,
-    1639
+    20200123,
+    523
    ],
    "deps": [
     "dash",
     "ghub",
     "s"
    ],
-   "commit": "4f7f927f57d39beac231cadcd1fea42c77103073",
-   "sha256": "1wcmkz47ylid9p5fvy9a6yzylv457vrcpc64msmfsnai6qbqx8k3"
+   "commit": "1de2d6d148e3604899270be36eb6b0385b837aac",
+   "sha256": "1g1j6c93aw9n9v7r20dzlnylkn4292vwi59l8hai49i1944hr00h"
   }
  },
  {
@@ -37408,11 +37770,19 @@
   "repo": "xuchunyang/gitignore-templates.el",
   "unstable": {
    "version": [
-    20180327,
-    1326
+    20200228,
+    1419
    ],
-   "commit": "b0705b8de4cbdd631c64c4e0024d62ba4ad68052",
-   "sha256": "1f0lcyw7yrdfmv0h8b87kz0pdrzhy28fzv688z4aaw964qn8jz0k"
+   "commit": "b147d1930645dda76dbd48fb6f4f7f790353de26",
+   "sha256": "17g66y8swy8pjkrv0in9bb1qbaq04ixn5wp6h7r54nfvjlnl1rza"
+  },
+  "stable": {
+   "version": [
+    1,
+    0
+   ],
+   "commit": "b147d1930645dda76dbd48fb6f4f7f790353de26",
+   "sha256": "17g66y8swy8pjkrv0in9bb1qbaq04ixn5wp6h7r54nfvjlnl1rza"
   }
  },
  {
@@ -37767,11 +38137,11 @@
   "repo": "juergenhoetzel/emacs-gnome-screencast",
   "unstable": {
    "version": [
-    20191217,
-    2007
+    20200115,
+    2230
    ],
-   "commit": "cff1c312224b4943df6fb6559492fd94caa82f86",
-   "sha256": "0cwdmlq3aibai1g4jbxvwms9wvqxscak7bvlxv52i9qxyr7gjlnv"
+   "commit": "8c5e787230b2b8a51520ab970d5b505cbbc8f32f",
+   "sha256": "1zalx97b92vxjczm798arxyxhl29hla9c9j4da9ykpyspf3wry4d"
   },
   "stable": {
    "version": [
@@ -37833,11 +38203,11 @@
   "repo": "lokedhs/gnu-apl-mode",
   "unstable": {
    "version": [
-    20181217,
-    854
+    20200108,
+    1633
    ],
-   "commit": "3b5b13abeb424e8ed399379fdefc168422664def",
-   "sha256": "0nhbfzfwl44ffvhzrnkjxaxz2nfrp1a7zcy6fg6cm13c2z40jslp"
+   "commit": "7f84eb307e9765fadcd1e0a9201ae562724ef1c9",
+   "sha256": "0aqlgsl19p2vlagdvahxxhqdcvmr8g7wlziwjvm2pina3lqfw4wc"
   }
  },
  {
@@ -37990,6 +38360,15 @@
    ],
    "commit": "3968667bfded60fbbf33f2fba3170e2b6501ec43",
    "sha256": "0rxaxc7b0dkhsd5547hngq24bdvnxig5a7xp9jir59fp2k8xd4aw"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    0
+   ],
+   "commit": "3968667bfded60fbbf33f2fba3170e2b6501ec43",
+   "sha256": "0rxaxc7b0dkhsd5547hngq24bdvnxig5a7xp9jir59fp2k8xd4aw"
   }
  },
  {
@@ -38104,11 +38483,11 @@
   "url": "https://git.sr.ht/~zge/go-capf",
   "unstable": {
    "version": [
-    20200102,
-    1957
+    20200216,
+    936
    ],
-   "commit": "d391dd08cc33be958d9ff21daeb88b79e5ab68e4",
-   "sha256": "0snwaj702xjy3qrknjjywqsgr8553rk6kr1qdcbpln9nj9hyksb4"
+   "commit": "9e66ce4ef4307e9f0e73e65f6bb2f287ed2c940b",
+   "sha256": "1sgsxd511xw1g707c0d58j3xzxfbay7k5b7hyamd2fnh30pw2hb3"
   },
   "stable": {
    "version": [
@@ -38327,8 +38706,8 @@
     "cl-lib",
     "go-mode"
    ],
-   "commit": "e10d6775f486ef09ed993567b0bd2c69f35deb45",
-   "sha256": "0z41kbyl8g0nb00sx8y5lhnx8w99rawnpkm7avn93f8kd5fan8im"
+   "commit": "53c76cddf54638dea5e4cae99ce0181de28e1064",
+   "sha256": "0fpdschrcbx2fjx01x5z84gk7pmicssxv23q9p88k6d11nj80iqc"
   },
   "stable": {
    "version": [
@@ -38420,11 +38799,11 @@
   "repo": "dominikh/go-mode.el",
   "unstable": {
    "version": [
-    20200107,
-    546
+    20200112,
+    2140
    ],
-   "commit": "e10d6775f486ef09ed993567b0bd2c69f35deb45",
-   "sha256": "0z41kbyl8g0nb00sx8y5lhnx8w99rawnpkm7avn93f8kd5fan8im"
+   "commit": "53c76cddf54638dea5e4cae99ce0181de28e1064",
+   "sha256": "0fpdschrcbx2fjx01x5z84gk7pmicssxv23q9p88k6d11nj80iqc"
   },
   "stable": {
    "version": [
@@ -38528,8 +38907,8 @@
    "deps": [
     "go-mode"
    ],
-   "commit": "e10d6775f486ef09ed993567b0bd2c69f35deb45",
-   "sha256": "0z41kbyl8g0nb00sx8y5lhnx8w99rawnpkm7avn93f8kd5fan8im"
+   "commit": "53c76cddf54638dea5e4cae99ce0181de28e1064",
+   "sha256": "0fpdschrcbx2fjx01x5z84gk7pmicssxv23q9p88k6d11nj80iqc"
   },
   "stable": {
    "version": [
@@ -38776,8 +39155,8 @@
     20180221,
     2015
    ],
-   "commit": "fdd1cda4f05fd1fd86124f0ef9ce31a0b72c8448",
-   "sha256": "0a23pc90fqar8sm1b480sls15ss20rqk13yrf63b6rnyd2c6z0x2"
+   "commit": "910be7a94367618fd0fd25eaabbee4fdc0ac7092",
+   "sha256": "08gskshgfwxhmm9i4vgd4q7kqd5i7yihqh33v6r07br6kqd0g995"
   }
  },
  {
@@ -38821,8 +39200,8 @@
     20180130,
     1736
    ],
-   "commit": "f704c352f4f0597d2bd8b85d089b093946ff75d7",
-   "sha256": "0kki38izdw7wl6x8cvcwidmrrw1cgx18a64gffwl05ka59yw375g"
+   "commit": "305ac8725a166ed42e3f5dd3f80d6de2cf840ef1",
+   "sha256": "05znbhy98pyc6r7dii8drw4p8vy6f5b3zk0hmlw8w73vcwia59ay"
   }
  },
  {
@@ -39213,14 +39592,14 @@
     "magit-popup",
     "s"
    ],
-   "commit": "deff37c279fe783a0ea565cd572565d37bbedafd",
-   "sha256": "0zamng9677kj13wp6gmadmrb4r9bngf74pmd6xvvnwdwn5s0gvrz"
+   "commit": "5d909f3e947adbce0482a0a00ede8654499cd28b",
+   "sha256": "122r7clj081gwxgw03d162garrjw604ynfpyzhawix0wh8hwmg9z"
   },
   "stable": {
    "version": [
     0,
-    21,
-    0
+    22,
+    2
    ],
    "deps": [
     "dash",
@@ -39228,8 +39607,8 @@
     "magit-popup",
     "s"
    ],
-   "commit": "a0fef816799db3e430bb7a5ac951e7835fe4d56b",
-   "sha256": "0mig8w0szxqcii3gihrsm8n8hzziq9l6axc5z32nw9kiy9bi4130"
+   "commit": "e7df0c1118c15c0b35fe08f183ca084269ea6542",
+   "sha256": "0lm1jaw5bpz7z4gibbbhswjr7qdhxkgbawr5bnykprsmp663i3nm"
   }
  },
  {
@@ -39440,8 +39819,8 @@
   "repo": "jcs-elpa/grammarly",
   "unstable": {
    "version": [
-    20200105,
-    125
+    20200126,
+    420
    ],
    "deps": [
     "cl-lib",
@@ -39449,8 +39828,8 @@
     "s",
     "websocket"
    ],
-   "commit": "87b46bb1c906e86fe9ea16b54d3699deb33d7221",
-   "sha256": "1jkb2g1xiwgwdyhgk1v9lr8s2h1hw1drq3d1kiba0djiicchy46y"
+   "commit": "ffff850b77ebbab827538f6ebee872b2638586bc",
+   "sha256": "1kxcnivlbv7dl09y09j72368sycqs96hk5nf7vsnqlfrrbc0337a"
   },
   "stable": {
    "version": [
@@ -39612,20 +39991,20 @@
   "repo": "ppareit/graphviz-dot-mode",
   "unstable": {
    "version": [
-    20191126,
-    2016
+    20200203,
+    1919
    ],
-   "commit": "158644714e8f35d8d2b9e5e4fbd00dbd8075a7bb",
-   "sha256": "0ymz88244dccbrysaq1yik6nzrqmaw37jh6h1sqqla0nbbidgvr1"
+   "commit": "0a4197d1c2b440db37f3e77cba01fb2c00a1a88d",
+   "sha256": "0a2p4vnchb63275j0w9fhkq1x4dkyyvaxqpyhx41zlg2zfzvcpwh"
   },
   "stable": {
    "version": [
     0,
     4,
-    1
+    2
    ],
-   "commit": "1574c504d9810f34a85e2ff49b6f7648c2be5f27",
-   "sha256": "03l6zkkxhbcxj5i13hzjv6ypmzaw70zqqagh7ix1kdn33kpp37jj"
+   "commit": "80b9c5e7f464c70cfa423e5ee3237581bc69d643",
+   "sha256": "1v1p85wk73nfsvv66qf90flgf9dqhmv15z1r7q4zmc4ifklqn08m"
   }
  },
  {
@@ -39875,20 +40254,20 @@
   "repo": "seagle0128/grip-mode",
   "unstable": {
    "version": [
-    20191114,
-    1754
+    20200217,
+    1151
    ],
-   "commit": "d1ee2d170b50ccd6f32d875db527581e6ee959fd",
-   "sha256": "15892kak2ag4hc3vi01yp5qsn9yzjqqhfxyfxf4lv0xh02gnbh5j"
+   "commit": "061f78d0f1699288e7abc7eaa0dd13749524464a",
+   "sha256": "0dg4aq4x2wn7mwv04nydkz773ip3n3ps7j1kw4mcrvv65m62ks9y"
   },
   "stable": {
    "version": [
     2,
-    1,
-    3
+    2,
+    0
    ],
-   "commit": "923ebc91e37e6489e02c11c5cd6c490f7aa5efb5",
-   "sha256": "0jhk8agn0y56gf6hcd15yn1lbfzdc7522j9xqly90pd3jjcllpbp"
+   "commit": "25650c9412df8b57c6546ffecfa5a9f6c0c362c8",
+   "sha256": "06xjr34srrmbbxaml45y3f6cq1n1q6a0rfjd54zq30fwanplklqk"
   }
  },
  {
@@ -39987,11 +40366,11 @@
   "repo": "rexim/gruber-darker-theme",
   "unstable": {
    "version": [
-    20180529,
-    712
+    20200227,
+    2238
    ],
-   "commit": "c7687ec0511941db1371dcd70b31061d74aa5668",
-   "sha256": "1dn4vb07wrnc6w94563isx8jfv6vbpp04kh0jfqjmc7nbmyzpaf2"
+   "commit": "7f95ce96079eb22b9214435ed25c5af98f60b482",
+   "sha256": "1zdqbjhcb8b1f4szzjmkzhpxcg17dqfp91882h95f1x9c2an5gdw"
   },
   "stable": {
    "version": [
@@ -40042,14 +40421,14 @@
   "repo": "greduan/emacs-theme-gruvbox",
   "unstable": {
    "version": [
-    20190720,
-    337
+    20200216,
+    2257
    ],
    "deps": [
     "autothemer"
    ],
-   "commit": "37548041b6c541b69ab6d18b53f7513781a1f2b3",
-   "sha256": "08cmwspkijrfr1k0p7ady44vxjv27yjp7kj3achp024j4g2jvybc"
+   "commit": "d5218aec3283d21566cb2c5619a19268743fc07e",
+   "sha256": "1cp7imprwk5vvgsfskpvjzxypq06xf5pqjhicvnyg4386ckznfib"
   },
   "stable": {
    "version": [
@@ -40242,8 +40621,8 @@
   "repo": "alezost/guix.el",
   "unstable": {
    "version": [
-    20191121,
-    1620
+    20200219,
+    1821
    ],
    "deps": [
     "bui",
@@ -40252,8 +40631,8 @@
     "geiser",
     "magit-popup"
    ],
-   "commit": "c2796e68868c91253b6aca422a9ae07363aa03a9",
-   "sha256": "0i0bvv3wd3fd22mffa62076mi1cnzwyphibqiimll23kngg507b2"
+   "commit": "3b5990618e70494aa89ff18c58ff24f369005323",
+   "sha256": "1w5dhacl451cbi8s6y49dcgzkxyai9ggrkpkf16kpmgwf7j0rapk"
   },
   "stable": {
    "version": [
@@ -40894,11 +41273,11 @@
   "repo": "haskell/haskell-mode",
   "unstable": {
    "version": [
-    20191229,
-    2357
+    20200221,
+    1959
    ],
-   "commit": "c69ced59b6e2b452858a9469ce2c343a09aee871",
-   "sha256": "0lbbn5kh3c2yvh5xn8b2a2s5364yms3iga6x0ks442yzkfrbf78g"
+   "commit": "35363a98445e27dad532d134d3ce863f8d95dd91",
+   "sha256": "1m3mhvaj5b7vavv507x92mzhm7r4clqs1via8zsza4v3ccbsgjws"
   },
   "stable": {
    "version": [
@@ -40992,8 +41371,8 @@
    "deps": [
     "avy-menu"
    ],
-   "commit": "e5eb3cb72a3e86be9a682169885194941ce8ef40",
-   "sha256": "0mhlp053s7j632pckzsj585wkda6akg1pq70r4wj78mwmcrbm6qh"
+   "commit": "4a0d1d9beb3be8ff4a1857eb920c916734dcc8e1",
+   "sha256": "1sp07lqvxxcl625qr9ka7idvci3j0p77ll90pwzykr5cs7r3lzl2"
   },
   "stable": {
    "version": [
@@ -41023,8 +41402,8 @@
     "f",
     "magit-popup"
    ],
-   "commit": "98bd4046a9fca6eb98a7466694871325d787ca57",
-   "sha256": "1jd69blrwafc3x3l663zwfck07nrvij1p8xsprzjvx3hzyci7bdb"
+   "commit": "9ef133ed831a95a2b9990a46a3c57f1918d0274f",
+   "sha256": "08h795hplyy7d0yqxvdfx3ylb7gkjplyriyq0w9dsv6ggvmc5hhl"
   },
   "stable": {
    "version": [
@@ -41079,17 +41458,17 @@
  },
  {
   "ename": "haxe-mode",
-  "commit": "6c2287c7b4c543e92ccfab120388b2c05174d2db",
-  "sha256": "14grb7lcaw57rzqlyy4ja10068r59i2ifxk0q177p4yg8rm519cy",
+  "commit": "31ab3513c2d048ee6d8277916e29987f981b81ca",
+  "sha256": "1h5v0vza8pyqf76hmzwgavh2zzrzwfjl4xdcc469bb6c59gzvhmr",
   "fetcher": "github",
-  "repo": "jcs-elpa/haxe-mode",
+  "repo": "emacsorphanage/haxe-mode",
   "unstable": {
    "version": [
-    20190703,
-    619
+    20200204,
+    1015
    ],
-   "commit": "ed99906a808ff4a00bf6b0e231c30c240a563954",
-   "sha256": "1lnx8qrqix2n3bvw8blqc7msghfy1w1dzyga9s8c9z5pawqrbm85"
+   "commit": "9449b2b8bc733faa130d3ab68b97ac1ae1db3bff",
+   "sha256": "1xpjwzd8vd41hs3i3yy4l1w0q0pk8s12bgky5q524n03pdq4n756"
   },
   "stable": {
    "version": [
@@ -41160,17 +41539,17 @@
  },
  {
   "ename": "hcl-mode",
-  "commit": "66b441525dc300b364d9be0358ae1e0fa2a8b4fe",
-  "sha256": "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin",
+  "commit": "979fe43b4f9325a4fccad6998763af2b44431b30",
+  "sha256": "0kvyvjv19fag60vv9qv0j91jmj8nilamcwqd1mj70qcj35pwlp60",
   "fetcher": "github",
-  "repo": "syohex/emacs-hcl-mode",
+  "repo": "purcell/emacs-hcl-mode",
   "unstable": {
    "version": [
-    20170107,
-    827
+    20200225,
+    2130
    ],
-   "commit": "0f2c5ec7e7bcf77c8548e8cac8721ea935ca1b5e",
-   "sha256": "0qggby20h8sir4cs5af9y6b2cibix3r067sadygsrvx9ml17indw"
+   "commit": "6599520a350e01354300a962463ecbf5564db622",
+   "sha256": "18vs2cwa1pyly2kh2lapm10n8akam5fvsx8rvgp41lcwrdxs2323"
   },
   "stable": {
    "version": [
@@ -41228,16 +41607,16 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20200107,
-    1518
+    20200227,
+    923
    ],
    "deps": [
     "async",
     "helm-core",
     "popup"
    ],
-   "commit": "05d70ff116a696f5c18e5ad569573d8936ff01da",
-   "sha256": "0v7xgfilnzcyha7vyqgr5imjhppw9y8vxazdvkl5n4vdh7n0xb98"
+   "commit": "21e778bc8858b082ed45e3d0bb287ca9d13e101b",
+   "sha256": "14rcgdmb7vlxzkfprps2svzk8r9198fzzkkrls8cafw9zg4fimxg"
   },
   "stable": {
    "version": [
@@ -42083,14 +42462,14 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20200108,
-    724
+    20200207,
+    1836
    ],
    "deps": [
     "async"
    ],
-   "commit": "05d70ff116a696f5c18e5ad569573d8936ff01da",
-   "sha256": "0v7xgfilnzcyha7vyqgr5imjhppw9y8vxazdvkl5n4vdh7n0xb98"
+   "commit": "21e778bc8858b082ed45e3d0bb287ca9d13e101b",
+   "sha256": "14rcgdmb7vlxzkfprps2svzk8r9198fzzkkrls8cafw9zg4fimxg"
   },
   "stable": {
    "version": [
@@ -43640,8 +44019,8 @@
     "helm",
     "lean-mode"
    ],
-   "commit": "f26e40daad2c1bd090e440a2b931205ac3b9b613",
-   "sha256": "022i1v885pvzz42cwrz7wp5amx25k664pvap7c4487hlrrkp1bg9"
+   "commit": "c9dffcda2951c22c483d1d22411d13bc132ce609",
+   "sha256": "1lj6j21hzya41fmlnw7faqmhvsdcgcidwibyvicgsb0gm6qqipjf"
   }
  },
  {
@@ -43827,11 +44206,11 @@
   "repo": "abo-abo/helm-make",
   "unstable": {
    "version": [
-    20190729,
-    1221
+    20200228,
+    1742
    ],
-   "commit": "6f3d9a0feed47c1d6a9b82baef2e2663ac496514",
-   "sha256": "0xgx1qr3ypnqnv38850zxak7rga9mn3d428szz80r6438nl8hlb0"
+   "commit": "a52b3a34ade00e695a412bc0c5873d4f4d22c323",
+   "sha256": "1jqihwh24f190zsc3a2xc7ja6j6q3nl742a0m9d6fiw28aijg34f"
   },
   "stable": {
    "version": [
@@ -44343,15 +44722,15 @@
   "repo": "tumashu/helm-posframe",
   "unstable": {
    "version": [
-    20200103,
-    644
+    20200118,
+    2302
    ],
    "deps": [
     "helm",
     "posframe"
    ],
-   "commit": "f9b41d6ef3471506528fc7edfeb784c050d87db0",
-   "sha256": "1j65nabxin0czr0vq9wh9fvgc3fswqgbls3l6bncw64y1wzpfbng"
+   "commit": "7970f9397ba7d148e590e4ffb340bf6c7c0602fc",
+   "sha256": "0106fsdzp3911spylrixqkgpnjnfg491f0rmbqmn4hc1shnc2sbk"
   }
  },
  {
@@ -44823,20 +45202,20 @@
     "helm",
     "rtags"
    ],
-   "commit": "5f1eaf4355e2093afb2b7828f3ebddfcad1234be",
-   "sha256": "1ankfl792qq0p2mdp89gldisw2l3lp8p10dmmqxm3ys898b0p2rh"
+   "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a",
+   "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n"
   },
   "stable": {
    "version": [
     2,
-    37
+    38
    ],
    "deps": [
     "helm",
     "rtags"
    ],
-   "commit": "11f49ef5c488da4c744f700b5cf07a8ebcb9f4ec",
-   "sha256": "0g443kw9y469banr70nv2fhlb7vyc3911d2mcyssrcsqjm1xdvlv"
+   "commit": "9687ccdb9e539981e7934e768ea5c84464a61139",
+   "sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx"
   }
  },
  {
@@ -45192,14 +45571,14 @@
   "repo": "emacsorphanage/helm-swoop",
   "unstable": {
    "version": [
-    20191225,
-    959
+    20200121,
+    1859
    ],
    "deps": [
     "helm"
    ],
-   "commit": "eab47a9991ec3e6d332b091af3cbc5ee7761b121",
-   "sha256": "1h749s3vx5p8lgpavpvj49a3zipq6ajdrjh8bxv0qxn6k3lc1nly"
+   "commit": "9324d8c196ab2a86fde7142f159e081b87a4d277",
+   "sha256": "1nznfrnzfbxa5qlwbddjma96k93f9hr7jv9sqx3krc0i1061nbg8"
   },
   "stable": {
    "version": [
@@ -45623,8 +46002,8 @@
   "repo": "Wilfred/helpful",
   "unstable": {
    "version": [
-    20200101,
-    1346
+    20200111,
+    2324
    ],
    "deps": [
     "dash",
@@ -45633,8 +46012,8 @@
     "f",
     "s"
    ],
-   "commit": "982dd49c9c7e63fa94b56824f50dea4186081f8e",
-   "sha256": "03fkk0dybzj6ckkvih7fxsw7kf3a26h7mlly44acxcpkyjxq0k1k"
+   "commit": "c54e9ddbd6a77858048c1a4c4b549de98af8f88e",
+   "sha256": "0x339wxhwma1i27j52wnbhc541633dxqmx1wyxg3yp78aciyrfhv"
   },
   "stable": {
    "version": [
@@ -46418,11 +46797,11 @@
   "repo": "PythonNut/historian.el",
   "unstable": {
    "version": [
-    20190111,
-    313
+    20200203,
+    1927
    ],
-   "commit": "64f4ef8cd4e417dfa090138a2d4ea1e72fd4456a",
-   "sha256": "0py43kml7fcf1k28pali7n9nhsjp003j02cpynqcz6hmk8zr7b48"
+   "commit": "ac1bea7d99dd6965c72fabeb72d5fdc38c5380a4",
+   "sha256": "13pray3iapy6vbd1y1y7fqcnjpsvgfz2z7j1a1awzd8ifp12g9cp"
   }
  },
  {
@@ -46538,11 +46917,11 @@
   "repo": "ideasman42/emacs-hl-block-mode",
   "unstable": {
    "version": [
-    20200106,
-    448
+    20200118,
+    310
    ],
-   "commit": "646c8cb8938b22b34f7c75a8644680a3f75f6bf5",
-   "sha256": "1ydnf53fk6gbcmqijwpi5yqwbz4b86y2xjbmf264a7yavb7gqpjh"
+   "commit": "6a8f871d7aa5d0d58b7c6ede281f8f8965124c9e",
+   "sha256": "1jdqz3cfncka4rdqxa4qg7f8dhkwx2h9s16gd3xqjwh8xrpf9qnd"
   }
  },
  {
@@ -46614,8 +46993,8 @@
     20200103,
     1239
    ],
-   "commit": "5d2ea49f83a7e6953f9d71de94dee478d08f9543",
-   "sha256": "1v51mlq13wr890ijwcwf0ymmc768cipj7a1nvmbmwh7y4ymlrsgn"
+   "commit": "3bba4591c54951d2abab113ec5e58a6319808ca9",
+   "sha256": "1i5mdmkbrxqx75grwl01pywbgl8pasr00mq6fidspp0aligsbg6w"
   },
   "stable": {
    "version": [
@@ -46804,28 +47183,28 @@
   "repo": "dunn/homebrew-mode",
   "unstable": {
    "version": [
-    20160615,
-    1320
+    20200205,
+    224
    ],
    "deps": [
     "dash",
     "inf-ruby"
    ],
-   "commit": "d422307aee2f897d1a92e3b959c3214bc54cbe38",
-   "sha256": "1z4d0niz8q24f2z8rnfnc2rlmkffkf7qc57qn4695jbkzb7galfz"
+   "commit": "8c04b040656dc99719efd7663c10f26f74df4a47",
+   "sha256": "0hqpj9fqq0b4nj7ya93jgkagafixqkinyr7qj8dsy2j1q458ynzf"
   },
   "stable": {
    "version": [
-    1,
-    3,
-    6
+    2,
+    0,
+    0
    ],
    "deps": [
     "dash",
     "inf-ruby"
    ],
-   "commit": "d422307aee2f897d1a92e3b959c3214bc54cbe38",
-   "sha256": "1z4d0niz8q24f2z8rnfnc2rlmkffkf7qc57qn4695jbkzb7galfz"
+   "commit": "8c04b040656dc99719efd7663c10f26f74df4a47",
+   "sha256": "0hqpj9fqq0b4nj7ya93jgkagafixqkinyr7qj8dsy2j1q458ynzf"
   }
  },
  {
@@ -46878,6 +47257,21 @@
    "sha256": "1yvz9d5h7npxhsdf6s9fgxpmqk5ixx91iwivbhzcz935gs2886hc"
   }
  },
+ {
+  "ename": "horizon-theme",
+  "commit": "e2021dcf9db816a28cdc3fda226dc58431d7baca",
+  "sha256": "1532ab1blkxyfjcalr2vzp6yk9mkxnxh9yim2v9l0h7j17ddmw2v",
+  "fetcher": "github",
+  "repo": "aodhneine/horizon-theme.el",
+  "unstable": {
+   "version": [
+    20200129,
+    1957
+   ],
+   "commit": "5bed6dd5bb9faf7d113b19f61cbca98da6262a3e",
+   "sha256": "0nhx0j3ffd24v9hvwfwwrp3bhx1105g9vwz543hn6yagx63y4vxz"
+  }
+ },
  {
   "ename": "horoscope",
   "commit": "180248c19160940a208b32fa7a9660a838f68de5",
@@ -46901,15 +47295,15 @@
   "repo": "ryoung786/hound.el",
   "unstable": {
    "version": [
-    20170627,
-    1959
+    20200122,
+    1700
    ],
    "deps": [
     "cl-lib",
     "request"
    ],
-   "commit": "0c5a250ef82870dca737a429b6e9b9db93874ed3",
-   "sha256": "0kf2nhp5k3gk82ad1k9qi4aysqhw36x4mcdhg6kjckmcakfjw3g6"
+   "commit": "35e2cdc81fcc904b450a7ef3ec00fd25df6a4431",
+   "sha256": "04pb5yhv4ysmm9ngpipxglbwd6msxr4d0jd64mixxq77g2yfmfm4"
   },
   "stable": {
    "version": [
@@ -47004,14 +47398,14 @@
   "repo": "Wilfred/ht.el",
   "unstable": {
    "version": [
-    20190924,
-    704
+    20200217,
+    2331
    ],
    "deps": [
     "dash"
    ],
-   "commit": "66c5f9131242697fabaede5566d87ecda4c14b1f",
-   "sha256": "0mip7v2w89wjs2nw4c198y7rpf9i7wsrjibmcnnzwxhcm1sidjnh"
+   "commit": "fff8c43f0e03d5b98deb9f988522b839ce2ca253",
+   "sha256": "0v89jrz0igkj1w4jxi365nqny2vqr1wjmrvknzdlrm7g0islinwc"
   },
   "stable": {
    "version": [
@@ -47300,6 +47694,21 @@
    "sha256": "0pcr39x8yxl5aa0sz20gw20ixz5imw5m19bzhzbzyn7slr65hlqn"
   }
  },
+ {
+  "ename": "humanoid-themes",
+  "commit": "3f4a3e3f257a02c4d702ddc38f5aff5a9411e21e",
+  "sha256": "070y1xrfabpzc4rdj7qhxa6yl8fdv4p7imi8yivbv0cwx3rpx75s",
+  "fetcher": "github",
+  "repo": "humanoid-colors/emacs-humanoid-themes",
+  "unstable": {
+   "version": [
+    20200209,
+    1402
+   ],
+   "commit": "80eeceadc595899a7b87abccf33099c3d4a14d0a",
+   "sha256": "0ji1wxlfyjdrwkfphkn6yl3y57701a0ywqzxpjbb9k762i20qycr"
+  }
+ },
  {
   "ename": "hungarian-holidays",
   "commit": "0c2dc20ce4b878a32c540744016a40f6cc2a657a",
@@ -47458,15 +47867,15 @@
   "repo": "abo-abo/hydra",
   "unstable": {
    "version": [
-    20191125,
-    955
+    20200228,
+    1830
    ],
    "deps": [
     "cl-lib",
     "lv"
    ],
-   "commit": "9db28034d7d61bfeff89899633b958f22befc53d",
-   "sha256": "1vay297i270n0s0bs1a96h9mn73i03885nnrcs8723i3iv7b51mp"
+   "commit": "d2b921d067d7c7ea2f087b4d8edfdc37bcdf4af8",
+   "sha256": "1zsm7qhqj17wnx611rz6f917lvvj4ifz4vg4x144y8a5740pkihi"
   },
   "stable": {
    "version": [
@@ -47604,20 +48013,19 @@
   "repo": "muffinmad/emacs-ibuffer-project",
   "unstable": {
    "version": [
-    20191128,
-    1938
+    20200210,
+    2252
    ],
-   "commit": "38d0d528f7ec008d2953fc9c6217b327c50088ec",
-   "sha256": "08ahkjs2rwdn93mmwsp2snvvparq76y3k788q5nj90xl396j5l4r"
+   "commit": "8cc8c96cb15874dd55cdbfce759f528de0046f9f",
+   "sha256": "0ysjyirw9gkrs8wivvvxfgdq8radpkl6nhh2a0ac3s42vrwbf9g1"
   },
   "stable": {
    "version": [
-    1,
     2,
-    1
+    0
    ],
-   "commit": "a83e74952244f46a759a8ccd5e55176c763c7309",
-   "sha256": "09pcd0xlijxmz2lh69m3rs53agzq4zr7i2wg652v25s4rhipl55r"
+   "commit": "8cc8c96cb15874dd55cdbfce759f528de0046f9f",
+   "sha256": "0ysjyirw9gkrs8wivvvxfgdq8radpkl6nhh2a0ac3s42vrwbf9g1"
   }
  },
  {
@@ -47972,16 +48380,16 @@
   "repo": "DarwinAwardWinner/ido-completing-read-plus",
   "unstable": {
    "version": [
-    20191105,
-    532
+    20200215,
+    1841
    ],
    "deps": [
     "cl-lib",
     "memoize",
-    "s"
+    "seq"
    ],
-   "commit": "74861eabd0a2619be9efc4c91fe0c5e69db5f263",
-   "sha256": "04rykll588dkvmanskqnfvkb9pgsj4ymlzx1msahj1g144laijnc"
+   "commit": "46202cf953139332ea79b8904bc30166a9cc6148",
+   "sha256": "06h437hni3lh90qnxq2a489h6f312b11wfvrcj21jwbn2zxak1hb"
   },
   "stable": {
    "version": [
@@ -48768,20 +49176,20 @@
   "repo": "petergardfjall/emacs-immaterial-theme",
   "unstable": {
    "version": [
-    20200104,
-    1433
+    20200217,
+    1302
    ],
-   "commit": "fbfceeca10c745829a9a4e0c982f41458e477a5b",
-   "sha256": "0whrgv8g6ml5d45lymwn4qh1cqsj19hwjl0mrhmzgsxj7cx5gfxq"
+   "commit": "a0fd571723adcfc780fd31a3a4444e1d6edbb64d",
+   "sha256": "1xby0qsbv1maqs31lkaq6h8djm08cahsxkas8q0cvnlfvgxxim1d"
   },
   "stable": {
    "version": [
     0,
     3,
-    3
+    10
    ],
-   "commit": "fbfceeca10c745829a9a4e0c982f41458e477a5b",
-   "sha256": "0whrgv8g6ml5d45lymwn4qh1cqsj19hwjl0mrhmzgsxj7cx5gfxq"
+   "commit": "1a18584252a79553dbc3bbfd3b6612235661bad3",
+   "sha256": "1dvl52innx742pg4lls1dgx8avpg2k3kqll7x04alxkc9wk6ms73"
   }
  },
  {
@@ -48976,11 +49384,20 @@
   "repo": "terlar/indent-info.el",
   "unstable": {
    "version": [
-    20180423,
-    1912
+    20200128,
+    1052
    ],
-   "commit": "d218b4cb3726476caee91db6f6c920856ab992bc",
-   "sha256": "0z427rvvhw5raql5391sajm4rk1n2y8khsy2wqr7r66fdv5hg2mg"
+   "commit": "2976e6d9679f3578196ed7c104b4054f4a713b7e",
+   "sha256": "0ggnlvarpy49cp98970jla34khknj7xlkkg4r74hrywa9kk7j0hk"
+  },
+  "stable": {
+   "version": [
+    0,
+    2,
+    0
+   ],
+   "commit": "4713807101bff80b342d0f847da9006be001141b",
+   "sha256": "0sprs5qgrbvgxd6k8h8fyybxdxfd3izhvk1bh13vg238qbn09a26"
   }
  },
  {
@@ -48991,11 +49408,28 @@
   "repo": "conao3/indent-lint.el",
   "unstable": {
    "version": [
-    20191229,
-    846
+    20200129,
+    2046
    ],
-   "commit": "e76b127241635677a4cb2d457d5c4c74ca93ee92",
-   "sha256": "1bmik58ygg9r9p7cnvxhss49hkcqy3zgcwrhwq59baqixclfwrd1"
+   "deps": [
+    "async",
+    "async-await"
+   ],
+   "commit": "23ef4bab5509e2e7fb1f4a194895a9510fa7c797",
+   "sha256": "00ipp87hjiymraiv6xy0lqzhn9h3wcrw7z4dkzb2934d7bd08j29"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    0
+   ],
+   "deps": [
+    "async",
+    "async-await"
+   ],
+   "commit": "5601a716d4daeb444642736ddef420cbc1047968",
+   "sha256": "0ndpdqdcg2rlrw5z86gyj46qsmsilh3a4snyyybi87kk5ajk2k64"
   }
  },
  {
@@ -49060,8 +49494,8 @@
   "repo": "NicolasPetton/Indium",
   "unstable": {
    "version": [
-    20191128,
-    1600
+    20200116,
+    1247
    ],
    "deps": [
     "company",
@@ -49070,8 +49504,8 @@
     "json-process-client",
     "seq"
    ],
-   "commit": "036f237840dd47e2dc5d368ce4ee3ec18fd4839d",
-   "sha256": "1gxd6ka99j10nlwkv2bmql5yf4lgpa0gh5ys0snci7d5565rxbr9"
+   "commit": "59f12cb1bc73bb399e00b2c6c69d21bdcb9c0955",
+   "sha256": "06x20zapygdgh7i2nr3c8xk8znrpp69yl5vpz08kkix7vssr9sxx"
   },
   "stable": {
    "version": [
@@ -49113,14 +49547,14 @@
   "repo": "clojure-emacs/inf-clojure",
   "unstable": {
    "version": [
-    20191008,
-    843
+    20200118,
+    1533
    ],
    "deps": [
     "clojure-mode"
    ],
-   "commit": "575538e27bf0109693c30afd1a0b5b5bd3eeba0c",
-   "sha256": "13rq2x9y5nadi6qplg56dmr8d0d4gy8zl4dw3vskj1hnj0yi9bv6"
+   "commit": "49390d9dfde1d6354629b7662edd0ee422477f4a",
+   "sha256": "1jhh4ablxmwy4diai6jhki5ifiw1d0fcza7l9gy8iqqnd1yc2m25"
   },
   "stable": {
    "version": [
@@ -49188,11 +49622,11 @@
   "repo": "nonsequitur/inf-ruby",
   "unstable": {
    "version": [
-    20190927,
-    1649
+    20200228,
+    2320
    ],
-   "commit": "fd8d392fefd1d99eb58fc597d537d0d7df29c334",
-   "sha256": "0axnjqgamy762ky5al56aryx0mp2b2i9almw9gkjcvxm7nc6zlq9"
+   "commit": "fe1ea9925c6a6cfa7620fe13ea7769e264494749",
+   "sha256": "0zk4w3fwgashql8vx4ihn6zdfzn6206gklf74wn2b3k4awb9mj8b"
   },
   "stable": {
    "version": [
@@ -49244,8 +49678,16 @@
     20180604,
     2122
    ],
-   "commit": "af443795af20481af91ac54a489b20f6a9d90b0a",
-   "sha256": "0r938pp10szrqiv37ryzfir4h5pg68farm56cpnh9hh8cnix6nrh"
+   "commit": "97db34d23cb05b23e50c15875ee84f5d3236e0db",
+   "sha256": "0z1cya3mhgh5ibj3dgwzii1fkbzsq7zjjzg6hfdv3pd4a7722qlx"
+  },
+  "stable": {
+   "version": [
+    0,
+    1
+   ],
+   "commit": "f65e89ad0c2a7acdef1dc182947d59287f371783",
+   "sha256": "0vd8d3dgqgqhrkmmvvf90ac04hcng03q32niwd54c0xj63hcxg8l"
   }
  },
  {
@@ -49279,14 +49721,14 @@
   "repo": "ubolonton/info-colors",
   "unstable": {
    "version": [
-    20180205,
-    1150
+    20200125,
+    1447
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "a8ebb7b8efa314c08ea8110d8b1876afb562bb45",
-   "sha256": "0wvyf2w5s184kwacs6lbpjryx6hziayvdrl3crxir8gmg2kcv07m"
+   "commit": "47ee73cc19b1049eef32c9f3e264ea7ef2aaf8a5",
+   "sha256": "1zmiik1ba7xspbk2g8igr1rscxxzxpzjrzspxjcw9khw6z4iwr51"
   },
   "stable": {
    "version": [
@@ -49584,11 +50026,11 @@
   "url": "https://git.carcosa.net/jmcbray/emacs-instapaper.git",
   "unstable": {
    "version": [
-    20130104,
-    1421
+    20110419,
+    1355
    ],
-   "commit": "8daa0058ede70025e9f020656abe0e0d01cd8f89",
-   "sha256": "0krscid3yz2b7kv75gd9fs92zgfl7pnl77dbp5gycv5rmw5mivp8"
+   "commit": "f21531bcb935e7e9b9e8df83dd0e0838adbf9b1b",
+   "sha256": "1ckkdkwhhyc8nwz293m18i526817gldd8br193px0hwfaxqlxadl"
   },
   "stable": {
    "version": [
@@ -49697,16 +50139,16 @@
   "repo": "commercialhaskell/intero",
   "unstable": {
    "version": [
-    20191103,
-    1239
+    20200125,
+    848
    ],
    "deps": [
     "company",
     "flycheck",
     "haskell-mode"
    ],
-   "commit": "30d8e7330c9b20c2905035bc417fa8645e7b4b85",
-   "sha256": "054ml379drc1gqykv2wlzaw8d8y2qmsk3rbxgry5nz9w7j66j5jp"
+   "commit": "fdb0550a2ddb5692d470336aa4a057717d572695",
+   "sha256": "0myjhj416cbvlfv2x9h624nygfis94jaw9gqf75sjv6y4inkzy73"
   },
   "stable": {
    "version": [
@@ -49981,15 +50423,15 @@
   "repo": "Sarcasm/irony-mode",
   "unstable": {
    "version": [
-    20191009,
-    2139
+    20200130,
+    849
    ],
    "deps": [
     "cl-lib",
     "json"
    ],
-   "commit": "8387098286132abd6472a8f49750e38ddb8096b6",
-   "sha256": "0vbv0h75vxwhjk0wxmdvnyb20ymjp4jyyify6ycaq9i2byl84b1v"
+   "commit": "5f75fc0c9274f4622470e2324e2f4457087aa643",
+   "sha256": "107ry1jxl7qiqa0ackn03whygndkabg20s7szl5xm1l87vx5xghc"
   },
   "stable": {
    "version": [
@@ -50222,8 +50664,8 @@
     20190113,
     1424
    ],
-   "commit": "fc1fcea5379bc7728a25dd81546886213e3db6fa",
-   "sha256": "1gvm5gfgmcw4mibi8899x9ry1zqm3ij6yl0dnmdqmv9dbv1zlqp2"
+   "commit": "698ffb93954817be0064ca6739f295d846707439",
+   "sha256": "10v6il7811w2907d8w2c28lnn29nlhdinlwwb7wy7rzl2vfinbm9"
   },
   "stable": {
    "version": [
@@ -50298,11 +50740,11 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20200105,
-    1946
+    20200229,
+    2136
    ],
-   "commit": "3c6e5daccbc8678ee881b435ac956778de82a076",
-   "sha256": "184cdd41da1xizhbdymq9g3a8ryscdr6fq15vswdfv5gx8dx2fz6"
+   "commit": "fcf5dcfd5796637d64164fd17956c5bc54e25612",
+   "sha256": "1hx00axmjfgc14ixj16pg7029zj7rsx2i80sw6f2bvp543l2aicq"
   },
   "stable": {
    "version": [
@@ -50356,6 +50798,27 @@
    "sha256": "0arhy051945lxjqg77b275ny9nsv60cqj0qfpmvd8xkc07lqfn23"
   }
  },
+ {
+  "ename": "ivy-clipmenu",
+  "commit": "17561e8af89bcb4da3d29a1acc04b8ff508af65b",
+  "sha256": "1zn5ccbsr1vniyznj597k98dy752g2ilfp8sznh4w2sljwxd74gi",
+  "fetcher": "github",
+  "repo": "wpcarro/ivy-clipmenu.el",
+  "unstable": {
+   "version": [
+    20200217,
+    1656
+   ],
+   "deps": [
+    "dash",
+    "f",
+    "ivy",
+    "s"
+   ],
+   "commit": "305ff456e700621e96b552f8e4857a7edc664518",
+   "sha256": "06pi64375bmmdal3pdhsv9j35jfizxciks9zwbvwc90k9wbgvxrf"
+  }
+ },
  {
   "ename": "ivy-clojuredocs",
   "commit": "ef20e3b6fa8d4586d6f17a4e9a6746390dbb2b50",
@@ -50432,7 +50895,7 @@
    "version": [
     0,
     3,
-    1
+    2
    ],
    "deps": [
     "async",
@@ -50440,8 +50903,8 @@
     "erlang",
     "ivy"
    ],
-   "commit": "62e2b14ff25b0c143c882cb38d029b216acc3dd6",
-   "sha256": "0sbxmj3ap0navgi7lxlgwb9ykfb8khgh7nl1hmqfh2jn9vx2s568"
+   "commit": "7d60ed111dbfd34ab6ec1b07c06e2d16a5380b9a",
+   "sha256": "0z34ljmwr0hmkaq5z85p87vljywpv3nnsvhp1zc8cw4hvqarcjqg"
   }
  },
  {
@@ -50474,30 +50937,6 @@
    "sha256": "0ffajyl21vz4662738dgga140yrkkcfynhhnk42fzrn5z5zqlwp1"
   }
  },
- {
-  "ename": "ivy-feedwrangler",
-  "commit": "cf1c112939545f6d157111eabcb573738b09ef7c",
-  "sha256": "1mxm37biix8c0s32gfv4pidffvlgdz5i9325zk71fhgfzqwkf5vx",
-  "fetcher": "github",
-  "repo": "asimpson/ivy-feedwrangler",
-  "unstable": {
-   "version": [
-    20180618,
-    1522
-   ],
-   "commit": "051eac49cae32b16fab2e06ff0115cd8fb5dc499",
-   "sha256": "1irp76kbg8d7wmgvfjbb4c3wmd29bdrl503jkq4w52fl57g94cvj"
-  },
-  "stable": {
-   "version": [
-    0,
-    4,
-    2
-   ],
-   "commit": "051eac49cae32b16fab2e06ff0115cd8fb5dc499",
-   "sha256": "1irp76kbg8d7wmgvfjbb4c3wmd29bdrl503jkq4w52fl57g94cvj"
-  }
- },
  {
   "ename": "ivy-fuz",
   "commit": "578c150cb8f61058f8003554d372944a990d7a7d",
@@ -50582,8 +51021,8 @@
     "historian",
     "ivy"
    ],
-   "commit": "64f4ef8cd4e417dfa090138a2d4ea1e72fd4456a",
-   "sha256": "0py43kml7fcf1k28pali7n9nhsjp003j02cpynqcz6hmk8zr7b48"
+   "commit": "ac1bea7d99dd6965c72fabeb72d5fdc38c5380a4",
+   "sha256": "13pray3iapy6vbd1y1y7fqcnjpsvgfz2z7j1a1awzd8ifp12g9cp"
   }
  },
  {
@@ -50601,8 +51040,8 @@
     "hydra",
     "ivy"
    ],
-   "commit": "3c6e5daccbc8678ee881b435ac956778de82a076",
-   "sha256": "184cdd41da1xizhbdymq9g3a8ryscdr6fq15vswdfv5gx8dx2fz6"
+   "commit": "fcf5dcfd5796637d64164fd17956c5bc54e25612",
+   "sha256": "1hx00axmjfgc14ixj16pg7029zj7rsx2i80sw6f2bvp543l2aicq"
   },
   "stable": {
    "version": [
@@ -50679,15 +51118,15 @@
   "repo": "akirak/ivy-omni-org",
   "unstable": {
    "version": [
-    20191207,
-    528
+    20200125,
+    807
    ],
    "deps": [
     "dash",
     "ivy"
    ],
-   "commit": "5460a9fc061a4a5ae8372dc8df966ced94abab58",
-   "sha256": "1np1f51hc3phkl5w02a9a79gl38ra2d535i784fn4pqaasvm0rq8"
+   "commit": "113477ae46ec857c5794fc0a031c1e579615f0a9",
+   "sha256": "1j9gwl3azh6y24yiy2s9p9yh6vhs2rmydv2496ivwxqnq9md5b49"
   }
  },
  {
@@ -50847,26 +51286,26 @@
   "repo": "Yevgnen/ivy-rich",
   "unstable": {
    "version": [
-    20191209,
-    1200
+    20200214,
+    504
    ],
    "deps": [
     "ivy"
    ],
-   "commit": "efcacd869ab8f214d95e4c0445da771ba21d62a6",
-   "sha256": "01whwckj0zlnck7b281r1z4c0kvjdmksjjajb6g2f62vdpjpd48r"
+   "commit": "af43abad5c87b44a46ce74d57e54cad5112c22eb",
+   "sha256": "0qa6kj88dh4vrxiyxrd7jg231hkmw7mfk96jvxqyldvsagp5ybcc"
   },
   "stable": {
    "version": [
     0,
     1,
-    4
+    5
    ],
    "deps": [
     "ivy"
    ],
-   "commit": "25e36b10eff7fd299fcc03f15288b4fff33974e4",
-   "sha256": "070y28ldp5dvh12b7qv27mqdgxiq2dll7fx432hb2i6mk8lz5hpp"
+   "commit": "d2e64aee221228e27e670f6b1c051052cea33ea6",
+   "sha256": "1g45pk1w5vcrrlv7d7yz4qdk26v31a8ik2zkzk323bqwzc2safhi"
   }
  },
  {
@@ -50884,20 +51323,20 @@
     "ivy",
     "rtags"
    ],
-   "commit": "5f1eaf4355e2093afb2b7828f3ebddfcad1234be",
-   "sha256": "1ankfl792qq0p2mdp89gldisw2l3lp8p10dmmqxm3ys898b0p2rh"
+   "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a",
+   "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n"
   },
   "stable": {
    "version": [
     2,
-    37
+    38
    ],
    "deps": [
     "ivy",
     "rtags"
    ],
-   "commit": "11f49ef5c488da4c744f700b5cf07a8ebcb9f4ec",
-   "sha256": "0g443kw9y469banr70nv2fhlb7vyc3911d2mcyssrcsqjm1xdvlv"
+   "commit": "9687ccdb9e539981e7934e768ea5c84464a61139",
+   "sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx"
   }
  },
  {
@@ -51670,15 +52109,15 @@
   "repo": "rmuslimov/jenkins.el",
   "unstable": {
    "version": [
-    20190521,
-    400
+    20200115,
+    2133
    ],
    "deps": [
     "dash",
     "json"
    ],
-   "commit": "9c7b9d4cb39eff7d6ac4d0cbd5ebc103dc86cac2",
-   "sha256": "1s49xmpc975q1ffb5c7cjrcwpa4a7kcakri26f5vqy3hn1h0c2v7"
+   "commit": "29e27a685ec971b518251ce0e66a0b67d78ea395",
+   "sha256": "0ms9i4dww801q09n4wzjpaqd6k89xdkn5vx3i565p748kp9lqhz6"
   }
  },
  {
@@ -51704,8 +52143,8 @@
   "repo": "emiller88/emacs-jest",
   "unstable": {
    "version": [
-    20181216,
-    459
+    20200223,
+    28
    ],
    "deps": [
     "cl-lib",
@@ -51716,8 +52155,8 @@
     "projectile",
     "s"
    ],
-   "commit": "4c3b718b6a6fd4bf1d6209be1beffa33f6156b90",
-   "sha256": "18hqsk81f846nrx5wcbm4c0v8a500aag9ki435ls4axsv0ka7n2b"
+   "commit": "777cca00f8fdb93226225b16b48eb955493243c5",
+   "sha256": "0292bhkc98pbj6lchfkx9i6zyllab2h60cly07ck71glq96kfx3c"
   }
  },
  {
@@ -52050,20 +52489,20 @@
   "repo": "redguardtoo/js-comint",
   "unstable": {
    "version": [
-    20190606,
-    6
+    20200117,
+    615
    ],
-   "commit": "ab8953bdf0176b1fadd7a3bb621f848ec5dc1f0c",
-   "sha256": "0li5za8zamwpr6cdz4b171wa0njana0ddmclrkbw1imkarb4yhp5"
+   "commit": "0dedaf4753fbe8cdbab14aa85f05d7673cbee8b6",
+   "sha256": "09wfafrklkybfg44skn1lg2hvcj4gfdv908dq87w1r4wv6ibkvka"
   },
   "stable": {
    "version": [
     1,
-    1,
-    1
+    2,
+    0
    ],
-   "commit": "83e932e4a83d1a69098ee87e0ab911d299368e60",
-   "sha256": "1r2fwsdfkbqnm4n4dwlp7gc267ghj4vd0naj431w7pl529dmrb6x"
+   "commit": "0dedaf4753fbe8cdbab14aa85f05d7673cbee8b6",
+   "sha256": "09wfafrklkybfg44skn1lg2hvcj4gfdv908dq87w1r4wv6ibkvka"
   }
  },
  {
@@ -52205,14 +52644,14 @@
   "repo": "mooz/js2-mode",
   "unstable": {
    "version": [
-    20190815,
-    1327
+    20200211,
+    2057
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "b3841a7a304d9d1328fdb0868fbbecf0c2f9831f",
-   "sha256": "0rl9vz194c29ljiwgk7xfcgc047hi2ybda7mlj3r1plhk80768n6"
+   "commit": "fe53814dc2a0db2e95ac06083362e43923bf83fc",
+   "sha256": "0b30c5valf58md5h5zm45nkx9xdszwi4kz12qfzh27fyn46gdwjq"
   },
   "stable": {
    "version": [
@@ -52528,11 +52967,11 @@
   "repo": "mgyucht/jsonnet-mode",
   "unstable": {
    "version": [
-    20181211,
-    1853
+    20200218,
+    2217
    ],
-   "commit": "2b90b4e12a11c42df0f1e5db327a50555b6ff023",
-   "sha256": "0j1dggxq1rm47cbi7khask40sj1wrcd0jki4m7j15qaxw7ryihhm"
+   "commit": "d8b486c8376a4785a7f2dc8a16fe1f2d82c6bfae",
+   "sha256": "0xpy699jh6ia46brd7i2qrfi0zrcdrhj3dc8d275va9w8a78paks"
   },
   "stable": {
    "version": [
@@ -53056,10 +53495,10 @@
  },
  {
   "ename": "kanban",
-  "commit": "855ea20024b606314f8590129259747cac0bcc97",
-  "sha256": "1j4qv3xcg0gk07yx3b4kayiy1n3w8yq1r78h07613iljx2ny91fz",
-  "fetcher": "bitbucket",
-  "repo": "ArneBab/kanban.el",
+  "commit": "c5c918900ad97075d788b3de658cddbb0c94f5d0",
+  "sha256": "04sy524zz5y99pb1nvlvqf9qyk57mrlmjqbjy44crl34ypi8gik6",
+  "fetcher": "hg",
+  "url": "https://hg.sr.ht/~arnebab/kanban.el",
   "unstable": {
    "version": [
     20170418,
@@ -53126,15 +53565,15 @@
   "repo": "ogdenwebb/emacs-kaolin-themes",
   "unstable": {
    "version": [
-    20200107,
-    1719
+    20200210,
+    237
    ],
    "deps": [
     "autothemer",
     "cl-lib"
    ],
-   "commit": "f5fcb5b375ff559214be0fce2a0930cfbe6be3e4",
-   "sha256": "0r73k6lgkar4sdigczpiw2i1f4l3f9dlvmdl5jsx0pd8kb4nyzxp"
+   "commit": "0afcaff33ceff03420635feca835d760915e4c08",
+   "sha256": "0rw7dgd4dv8gk4n5xjl6mlvgyxm29vnzk8zlk7b07k264kxqr7c7"
   },
   "stable": {
    "version": [
@@ -53244,6 +53683,30 @@
    "sha256": "07aqzfg2nn35bkikrmk1lszqkc6h8vn2551m22mwc19lmdx94p2i"
   }
  },
+ {
+  "ename": "keepass-mode",
+  "commit": "350528855b482abee717d9d0515279e41ea9265e",
+  "sha256": "0vgkx8iz7vzavdkpgfxpnn6pcsnrfhf0vgx2m17rqv3g8ryb38hs",
+  "fetcher": "github",
+  "repo": "ifosch/keepass-mode",
+  "unstable": {
+   "version": [
+    20200216,
+    723
+   ],
+   "commit": "09dcc1da15808b5b6c22bc5d0cb4e2ba5d425ef8",
+   "sha256": "0r3aczydp6435alirl9c2gbb1a92c9mv6ibk9h57ds30z9ia31jr"
+  },
+  "stable": {
+   "version": [
+    0,
+    0,
+    2
+   ],
+   "commit": "ad073eaab4f96ca033df023736d195dc3b611897",
+   "sha256": "0kyzcws47ch3pkw9ijb4gjr7l933c3mrxc9bsy16ddkc8dvl7yng"
+  }
+ },
  {
   "ename": "kerl",
   "commit": "166afdc776689b0da93576dbeaa71ff6dfb627db",
@@ -53343,11 +53806,11 @@
   "repo": "federicotdn/key-quiz",
   "unstable": {
    "version": [
-    20190721,
-    1357
+    20200226,
+    2129
    ],
-   "commit": "f4a27da3c09dbee62d63dd756bc44652f6319692",
-   "sha256": "1bw3ywjv49bmkxkcjfr8pnshy2kxklfx253cd1qaplw1g28d0plb"
+   "commit": "1ee67f3f8977d95785e021f7896685de1979137e",
+   "sha256": "0cv0naq2g8z52vgf1p4mb55ww30bp2kpj1jp5cjnql1hxsvbx0mm"
   }
  },
  {
@@ -53465,8 +53928,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "9c665c8c219d18866403897936427bb408e3d6b9",
-   "sha256": "1dhdk4f6q340n0r9n8jld2n2fykp7m40x23n7sw4wpm8g151gxin"
+   "commit": "e5fe9d585ce882f1ba9afa5d894eaa82c79be4f4",
+   "sha256": "12m1jy8m8i39b809qbxx9g3r066jxhqwfyf5mqbd1lzlaw63b1i7"
   },
   "stable": {
    "version": [
@@ -53696,8 +54159,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "fec16e7e5bf603c6971230f344882ce7a0d04e90",
-   "sha256": "0p1zd1kyw48xf40zvbssmkf8cj6gb0lln4xdnx3v2hh1m2mr3xs5"
+   "commit": "e77fcf46284afa1fd13499db695745112f41c8cd",
+   "sha256": "0c65qnsibcppyrf3bqp4blv2bfamisfwgxqy90z0gkbxzw9q4lxw"
   },
   "stable": {
    "version": [
@@ -53808,8 +54271,8 @@
     20180702,
     2029
    ],
-   "commit": "52d12ebf33e410c9f4798674a93cbd0db8038bf1",
-   "sha256": "0hgfqy5yysfg3z04bj6xw53icixadigf3yxnskrnrs76sj4pd1qi"
+   "commit": "9398c8d5d260c9f4d5dd0aadc7de5001bddaf984",
+   "sha256": "1hps804r3pwnkndwr797ayg002i857ck3lvknvzz7j04xvs7g5s3"
   },
   "stable": {
    "version": [
@@ -53831,15 +54294,15 @@
   "repo": "stardiviner/kiwix.el",
   "unstable": {
    "version": [
-    20191016,
-    951
+    20200301,
+    307
    ],
    "deps": [
     "cl-lib",
     "request"
    ],
-   "commit": "1fdcfcc6c080b5232cf588460283e16180a81dc9",
-   "sha256": "0088bnizccf372yivkw07x541ispmak8yy6ri2kqa15pkmszjfjh"
+   "commit": "f11e8fb9955b89a14db7092e48baa0b69667834e",
+   "sha256": "1ipkgnlvbdmgxh92hsrvqmyg8hxv4165kr0305hz2cr88wp8zsm1"
   },
   "stable": {
    "version": [
@@ -54064,6 +54527,30 @@
    "sha256": "192s6hz71i0d8bwxn2pdl9yggs2l5fd6jxlxmry8fpk04qg3lqrg"
   }
  },
+ {
+  "ename": "kubectx-mode",
+  "commit": "e1a9badd46f8900a1d6355cb2c703788ed66e8fb",
+  "sha256": "0g73yf3kl1f1c40p1na29hli4q0ligy0dh0lxc21k9mj57dbnzyg",
+  "fetcher": "github",
+  "repo": "terjesannum/emacs-kubectx-mode",
+  "unstable": {
+   "version": [
+    20200116,
+    1918
+   ],
+   "commit": "f08687ae5403eb18bbeffc6dafdfde469bdb9a36",
+   "sha256": "1yml417gj8ds3fiy0vvrv9vxnjyis157hcmhyn491hb67bd6xl5j"
+  },
+  "stable": {
+   "version": [
+    1,
+    2,
+    0
+   ],
+   "commit": "f08687ae5403eb18bbeffc6dafdfde469bdb9a36",
+   "sha256": "1yml417gj8ds3fiy0vvrv9vxnjyis157hcmhyn491hb67bd6xl5j"
+  }
+ },
  {
   "ename": "kubel",
   "commit": "6fe35f90b858d0b6710b4bae8a2b80f97f1b8228",
@@ -54072,14 +54559,25 @@
   "repo": "abrochard/kubel",
   "unstable": {
    "version": [
-    20191219,
-    1646
+    20200211,
+    1819
    ],
    "deps": [
     "transient"
    ],
-   "commit": "12d8434fe435b81a3874911c7852aac8976fdb2f",
-   "sha256": "0gfacv3c79pih61dpwy6xq58wk233f4kxxrgf3q58x8kns3iymzc"
+   "commit": "fe9f51e678a8b74e1116bffd662abc3d504fc857",
+   "sha256": "1dhhpjjpxl0j18nq4h0pmkz9l55cdzd7kaxhvkr0r0mvhpa7d04m"
+  },
+  "stable": {
+   "version": [
+    1,
+    0
+   ],
+   "deps": [
+    "transient"
+   ],
+   "commit": "fe9f51e678a8b74e1116bffd662abc3d504fc857",
+   "sha256": "1dhhpjjpxl0j18nq4h0pmkz9l55cdzd7kaxhvkr0r0mvhpa7d04m"
   }
  },
  {
@@ -54097,8 +54595,20 @@
     "evil",
     "kubel"
    ],
-   "commit": "12d8434fe435b81a3874911c7852aac8976fdb2f",
-   "sha256": "0gfacv3c79pih61dpwy6xq58wk233f4kxxrgf3q58x8kns3iymzc"
+   "commit": "fe9f51e678a8b74e1116bffd662abc3d504fc857",
+   "sha256": "1dhhpjjpxl0j18nq4h0pmkz9l55cdzd7kaxhvkr0r0mvhpa7d04m"
+  },
+  "stable": {
+   "version": [
+    1,
+    0
+   ],
+   "deps": [
+    "evil",
+    "kubel"
+   ],
+   "commit": "fe9f51e678a8b74e1116bffd662abc3d504fc857",
+   "sha256": "1dhhpjjpxl0j18nq4h0pmkz9l55cdzd7kaxhvkr0r0mvhpa7d04m"
   }
  },
  {
@@ -54109,16 +54619,16 @@
   "repo": "chrisbarrett/kubernetes-el",
   "unstable": {
    "version": [
-    20200106,
-    848
+    20200114,
+    436
    ],
    "deps": [
     "dash",
     "magit",
     "magit-popup"
    ],
-   "commit": "239f4a1b40bfc76464ecf900eb16c3b078cd7d64",
-   "sha256": "1b41r8yhf14ki56638y0qk006idmvx1bs354b6cyq9z2k1h9x05v"
+   "commit": "cc33d8c7bb114c34809ee86020b9e635eff0017b",
+   "sha256": "11bi1z28rf2ldx20mqgq6yfkpc1af9kgvjzrz3w3dcf074jp89lb"
   },
   "stable": {
    "version": [
@@ -54150,8 +54660,8 @@
     "evil",
     "kubernetes"
    ],
-   "commit": "239f4a1b40bfc76464ecf900eb16c3b078cd7d64",
-   "sha256": "1b41r8yhf14ki56638y0qk006idmvx1bs354b6cyq9z2k1h9x05v"
+   "commit": "cc33d8c7bb114c34809ee86020b9e635eff0017b",
+   "sha256": "11bi1z28rf2ldx20mqgq6yfkpc1af9kgvjzrz3w3dcf074jp89lb"
   },
   "stable": {
    "version": [
@@ -54211,14 +54721,14 @@
   "repo": "emacsfodder/kurecolor",
   "unstable": {
    "version": [
-    20191218,
-    148
+    20200113,
+    2027
    ],
    "deps": [
     "s"
    ],
-   "commit": "f8a51febc4cd2576887d477c88d881a865a62d07",
-   "sha256": "141r35z6sq0ainvja83plypf2bnn6hbwn8xfi5bsqpk27mpd2709"
+   "commit": "3fc84840cbbd75e646cafa2fd3a00004b55e37ec",
+   "sha256": "0y8wj8f2wzhg5vl4kjrqny3333616s4lcil085190yyb7mjakvn5"
   },
   "stable": {
    "version": [
@@ -54271,11 +54781,11 @@
   "repo": "MetroWind/lab-theme",
   "unstable": {
    "version": [
-    20190320,
-    1827
+    20200204,
+    1931
    ],
-   "commit": "a4d1806793ab7a651c5380ebb2d1b53c8fbf7944",
-   "sha256": "06mw3x40wl4hfqwps41z2sps3vamgj89b7ks0ri7z9f90x645v4q"
+   "commit": "2cd61072d2b4c563d961f80918fc6b1dc45f7ba4",
+   "sha256": "0jwslzxjyclr4iw8ir0glcj5iasgx2z9i16qn7705sdmdmbzkdwz"
   }
  },
  {
@@ -54286,11 +54796,11 @@
   "repo": "ksjogo/labburn-theme",
   "unstable": {
    "version": [
-    20170502,
-    907
+    20200206,
+    1213
    ],
-   "commit": "e95334acd8a73fbe8e156f70e047014a87e92e66",
-   "sha256": "0ai8gr4an4d44lgin7kdzydn2d0a98jb8mv0n9b93bq160lbmkwj"
+   "commit": "ae3dafe552ab6f9d5b0760ace44555317e6c90c6",
+   "sha256": "1lx7ci0j5havhsymjr4mb4nnh71ajmviysmanjbbm6wsg470ig7r"
   },
   "stable": {
    "version": [
@@ -54373,14 +54883,14 @@
   "repo": "mhayashi1120/Emacs-langtool",
   "unstable": {
    "version": [
-    20200104,
-    18
+    20200117,
+    441
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "37e1e007e80fc01b040b7da21be5a628fbddfb1a",
-   "sha256": "0zlinwq5hzwws8frwdaw22q43xba3a4764qk6rhlpg6p6imf6s6m"
+   "commit": "a71ed02ce06920ae3cafd6708de1c21811ce14c3",
+   "sha256": "1ars70nx8gxb8szlp6jyqjll9gr7j9z5cd9ip1izqv00si6p1fvn"
   },
   "stable": {
    "version": [
@@ -54421,25 +54931,25 @@
   "repo": "lassik/emacs-language-id",
   "unstable": {
    "version": [
-    20191208,
-    1933
+    20200214,
+    2254
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "57f3094cb576d6d1a10467953e0ea161c43e4cfa",
-   "sha256": "0dq81m245nbj1d6jry0jdf55h90p99z8n77r1ycsfcqmhk2x8ndi"
+   "commit": "dc18099dd74a954601ab425ef6cfd3ed32003023",
+   "sha256": "1mwkv4cyz8n8vm9jf7nw980j0ig487ch37ayx356nvvznnrfnm5s"
   },
   "stable": {
    "version": [
     0,
-    3
+    4
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "57f3094cb576d6d1a10467953e0ea161c43e4cfa",
-   "sha256": "0dq81m245nbj1d6jry0jdf55h90p99z8n77r1ycsfcqmhk2x8ndi"
+   "commit": "dc18099dd74a954601ab425ef6cfd3ed32003023",
+   "sha256": "1mwkv4cyz8n8vm9jf7nw980j0ig487ch37ayx356nvvznnrfnm5s"
   }
  },
  {
@@ -54450,8 +54960,8 @@
   "repo": "mihaiolteanu/lastfm.el",
   "unstable": {
    "version": [
-    20191117,
-    1908
+    20200207,
+    1316
    ],
    "deps": [
     "anaphora",
@@ -54460,8 +54970,8 @@
     "request",
     "s"
    ],
-   "commit": "c2b39d2fa4fb7f56e4aacb0a50ed2aa509ab992c",
-   "sha256": "09k8p5bpl7f4dgkvvx4gf91pgyc5ikm6kynkjhdwrsnpnnl2cc9b"
+   "commit": "cff7699343467b36ff3dad90061b567025ff9b23",
+   "sha256": "1jk400xh07pnwzab23xwsiyv9j0f4b8fl0v6w712vsn2n1ab88gm"
   },
   "stable": {
    "version": [
@@ -54682,6 +55192,35 @@
    "sha256": "0pbpns387fmalkakbdl2q7d2y720m7ai7mnydsinjwlkdrshvj4g"
   }
  },
+ {
+  "ename": "lavenderless-theme",
+  "commit": "f21ef334dd997fb96e0306cd56538279644765f8",
+  "sha256": "1lbk654d4y5fg4j71kqmfq3xx8dr9rib2zcv9njaip77zjzbbxid",
+  "fetcher": "git",
+  "url": "https://git.sr.ht/~lthms/colorless-themes.el",
+  "unstable": {
+   "version": [
+    20200213,
+    2057
+   ],
+   "deps": [
+    "colorless-themes"
+   ],
+   "commit": "a7b7c0a32b174988f40378996cd8997f73524f19",
+   "sha256": "0khsf4xz0wjn774hy08pxafm79j55ns28q25pfzyj9s07hi4r0vz"
+  },
+  "stable": {
+   "version": [
+    0,
+    2
+   ],
+   "deps": [
+    "colorless-themes"
+   ],
+   "commit": "8e539097185704444a5dd5545924de92c11ba767",
+   "sha256": "1p16vxai8dj1vy4ahflwij1ldx00jzrjcinpgpc7wgh6ka748v11"
+  }
+ },
  {
   "ename": "lcb-mode",
   "commit": "fd1380a9ba363f62f297e3ab2995341258b51fd1",
@@ -54743,20 +55282,20 @@
   "repo": "conao3/leaf.el",
   "unstable": {
    "version": [
-    20191117,
-    339
+    20200225,
+    1023
    ],
-   "commit": "57b99052f949f34471265f8b010549ee4725c320",
-   "sha256": "1vxcwdp7kgmv4pxjr33yfy2ba3x3zs6qacblyrah57f92xg85jg7"
+   "commit": "0179836fcc8ef613d6f9d7fa509a79a8fbf8db22",
+   "sha256": "0r5crz2n0q8xrh840gp3m8gy647i0khvwzj9pc3w5y9xkw7ca7vh"
   },
   "stable": {
    "version": [
     3,
-    5,
+    6,
     0
    ],
-   "commit": "c8ca1ecc892229dc16019fe3a7eb98a7307e746f",
-   "sha256": "1rgd59146wad92yc64las0qgx67k2ifgsw1vwhp40xvkd7kb0r6d"
+   "commit": "c0a0fca2f9c83909c49729af75664411b4affab8",
+   "sha256": "18vrk19273xlg2nhkf7fvvhspnsfgk4dxa42x2q5599p9z7aph00"
   }
  },
  {
@@ -54767,14 +55306,14 @@
   "repo": "conao3/leaf-keywords.el",
   "unstable": {
    "version": [
-    20191123,
-    1814
+    20200214,
+    1749
    ],
    "deps": [
     "leaf"
    ],
-   "commit": "c3223e54eddf82a9b264ef81d958a017049141da",
-   "sha256": "1qwcir8d16gqr1xbl5bi9k51qfc5yvzaqvp03sji55bfqnx7zjwv"
+   "commit": "138af8613feded5eaeda84ffaff2621e62c2e0fe",
+   "sha256": "03jvjmr6ki28ngdc0j7sjj14qyzd730jxp8gdcajjln76ni5cayy"
   },
   "stable": {
    "version": [
@@ -54794,8 +55333,8 @@
   "repo": "leanprover/lean-mode",
   "unstable": {
    "version": [
-    20191229,
-    1613
+    20200211,
+    2010
    ],
    "deps": [
     "dash",
@@ -54804,8 +55343,8 @@
     "flycheck",
     "s"
    ],
-   "commit": "f26e40daad2c1bd090e440a2b931205ac3b9b613",
-   "sha256": "022i1v885pvzz42cwrz7wp5amx25k664pvap7c4487hlrrkp1bg9"
+   "commit": "c9dffcda2951c22c483d1d22411d13bc132ce609",
+   "sha256": "1lj6j21hzya41fmlnw7faqmhvsdcgcidwibyvicgsb0gm6qqipjf"
   }
  },
  {
@@ -54848,6 +55387,21 @@
    "sha256": "1k58rhk5p819cvfa6zg7j3ysvzhq6dc433fzhh1ff0gwga2vrqbz"
   }
  },
+ {
+  "ename": "learn-ocaml",
+  "commit": "6110b273c4f3bb8eddf1b79dbfa82f9c01600182",
+  "sha256": "17fah2109s9dzavmbsw5bgpjb4m9r2j9rgpf38av3bd89qba416z",
+  "fetcher": "github",
+  "repo": "pfitaxel/learn-ocaml.el",
+  "unstable": {
+   "version": [
+    20200224,
+    2229
+   ],
+   "commit": "e3424b3ae3f7d85ef020d030c2fa58df86ed8955",
+   "sha256": "0a8x2c0lxa0xihpbc9i1dvn1l00nsmawl1nv3i06r6iq5486pqdn"
+  }
+ },
  {
   "ename": "ledger-import",
   "commit": "4a1e2a9546b8b40f5f880197cb8166a6a715451f",
@@ -54886,11 +55440,11 @@
   "repo": "ledger/ledger-mode",
   "unstable": {
    "version": [
-    20191226,
-    2018
+    20200229,
+    1453
    ],
-   "commit": "6b78e483dde4276a11d6946d081e41c7e3b894e8",
-   "sha256": "0xi5pwyzv81iqxj10sr1fl9csa6k5z1nisxwnpg9i3i1nj7ad3p6"
+   "commit": "6286366e6074e048d2a997d971d4d1c350f6bc63",
+   "sha256": "1bkfmvq7a6bq3b94495cfzzlxdxdiwyjar5rn5z2hsw1dljc7380"
   },
   "stable": {
    "version": [
@@ -54936,6 +55490,21 @@
    ],
    "commit": "28b78c45c86570cb1e3538f275eb4de1cf28cd04",
    "sha256": "1c9zsh4ikflgqjrkjbilfqjjb0g698mqy2g5b210ssbivvkvncb5"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    10
+   ],
+   "deps": [
+    "aio",
+    "dash",
+    "graphql",
+    "spinner"
+   ],
+   "commit": "28b78c45c86570cb1e3538f275eb4de1cf28cd04",
+   "sha256": "1c9zsh4ikflgqjrkjbilfqjjb0g698mqy2g5b210ssbivvkvncb5"
   }
  },
  {
@@ -54946,11 +55515,11 @@
   "repo": "jorgenschaefer/legalese",
   "unstable": {
    "version": [
-    20150820,
-    1724
+    20200119,
+    2248
    ],
-   "commit": "ec23e69d18329456beed9546a1d6c72f96db91cf",
-   "sha256": "05zpc8b2pyjz76fvmgr7zkl56g6nf6hi4nmxdg6gkw8fx6p8i19f"
+   "commit": "e465471d2d5a62d35073d93e0f8d40387a82e302",
+   "sha256": "0xg4pyyyzd637i7shhq1frbva5rmy2j7y9cnf7zmms6a5qq4k1af"
   }
  },
  {
@@ -55109,11 +55678,11 @@
   "repo": "fniessen/emacs-leuven-theme",
   "unstable": {
    "version": [
-    20200102,
-    2003
+    20200122,
+    1934
    ],
-   "commit": "ee89b5d8b08c94eb78c0398720381c44342e2f44",
-   "sha256": "1g6bhfd39jbz8awxh2d4syvqblw3yniind76fzsvsapis1za8yfg"
+   "commit": "dccd751682a0954165c7f2c08414bea0168a9a9f",
+   "sha256": "12njc6pmbadwn71h811alr4rpsmw1b48b3jjmxpy3s51ja44vcc4"
   }
  },
  {
@@ -55237,11 +55806,11 @@
   "repo": "magit/libegit2",
   "unstable": {
    "version": [
-    20191217,
-    1254
+    20200223,
+    1431
    ],
-   "commit": "65fde63a0bde9b4cef74204db5d9ac0a740d6b4d",
-   "sha256": "0q7jyrgq67449i524dskiqfvf3znb048ksb9v6ja1x9xhpfw27d2"
+   "commit": "6c3b89276a149b2d009882f756a9edf866671f05",
+   "sha256": "1r59bw0dggjf6ry2vbl0vddd5hxxh1mshr5h2bk9z74gy04cfi4y"
   }
  },
  {
@@ -55362,8 +55931,8 @@
     20180219,
     1024
    ],
-   "commit": "5136c339864ca961629e6eb48c3ff9d0228aaf52",
-   "sha256": "14mzwnnsqjmzp8jb9jac43ga7vxzmrl2mch7kqdm244d605k0xlz"
+   "commit": "8eacaf88ee7ef9445c767a032177a90711cb3ff7",
+   "sha256": "1334d09qsc5clcmkh1qi6mlph158ggf1p5kpsyl48vl1knj4ia9s"
   },
   "stable": {
    "version": [
@@ -55467,15 +56036,15 @@
   "repo": "noctuid/link-hint.el",
   "unstable": {
    "version": [
-    20200101,
-    1633
+    20200205,
+    2244
    ],
    "deps": [
     "avy",
     "cl-lib"
    ],
-   "commit": "8d8f9505f87dc8a3b3baee7cb516f091072893a7",
-   "sha256": "1bmb3x8i2ak72k2m3niczjqv2xg9lhvflxxfjj67j9ki7994vzx4"
+   "commit": "0d9cabcdb783ddc834ede6dcb1bed627c3acd303",
+   "sha256": "1ybzxc421wyy34w71lgbdfx7vgy9j6va9jjv1mkxa0zxqpdar974"
   }
  },
  {
@@ -55631,8 +56200,8 @@
   "repo": "abo-abo/lispy",
   "unstable": {
    "version": [
-    20200105,
-    1844
+    20200227,
+    1354
    ],
    "deps": [
     "ace-window",
@@ -55641,8 +56210,8 @@
     "iedit",
     "zoutline"
    ],
-   "commit": "ba59a11e122170620e7d151df4b609490ee416f6",
-   "sha256": "0qynzadzklb7wnldcs7sj9v003v6xffvq0y85x8knj04cbl09bwy"
+   "commit": "c1286a2b41fa1f21c4f2ecdd5ba191805e04e268",
+   "sha256": "05vq28ziqamc0sysaa4zrljac4r0nq7j6a23m2vsf7nf8ymzff1c"
   },
   "stable": {
    "version": [
@@ -55693,16 +56262,16 @@
   "repo": "noctuid/lispyville",
   "unstable": {
    "version": [
-    20190719,
-    141
+    20200129,
+    243
    ],
    "deps": [
     "cl-lib",
     "evil",
     "lispy"
    ],
-   "commit": "56198f1c4488a52a0d0512c717dff36e8b9fbfd0",
-   "sha256": "1zrhn5pgjvwprwnsr85zs4rhs7mijyq3wbd5s0ff96m9n1dbj6vp"
+   "commit": "25a70126ea807653e0a8c512d4128c90ed673d7a",
+   "sha256": "0h4zz3k5chipswpp7abmd9agwacrss1dd5981x70wblpabdxm39m"
   }
  },
  {
@@ -55836,14 +56405,14 @@
   "repo": "Fuco1/litable",
   "unstable": {
    "version": [
-    20160922,
-    1559
+    20200130,
+    1329
    ],
    "deps": [
     "dash"
    ],
-   "commit": "b0278f3f8dcff424bfbdfdefb545b1fbff33206f",
-   "sha256": "0bny40hv9a024n01clxns351cs4j4ifhgcc7m4743xncqf612p7g"
+   "commit": "02247ca284cbc79f3afb783d62ed092bfc5b8d83",
+   "sha256": "0c84fvc33ddicfi8blkcd6dv1lagjnlk9bwjj88zcvg48fnykqvr"
   }
  },
  {
@@ -55854,15 +56423,15 @@
   "repo": "zzkt/litanizer",
   "unstable": {
    "version": [
-    20200108,
-    607
+    20200211,
+    621
    ],
    "deps": [
     "enlive",
     "s"
    ],
-   "commit": "ce74f10540d6b335c4d0966cbabcf5099531280e",
-   "sha256": "1gzpvl7pgawikkhprja6p94ymsjbsbklqjgdvhzca835mx1g4aw4"
+   "commit": "ba73259e35b4649884ba56542d3a55f43bd3b80b",
+   "sha256": "0147dqzhphnhxrcjxnbjk258j7g7y0rpbw6q3xrd340j9fk1q60k"
   },
   "stable": {
    "version": [
@@ -56052,20 +56621,20 @@
   "repo": "donkirkby/live-py-plugin",
   "unstable": {
    "version": [
-    20200108,
-    546
+    20200221,
+    611
    ],
-   "commit": "96a72eb3d2d03ea9910f1712ab55990705275343",
-   "sha256": "1g6f2rxy93x2mpphmnvvqx848638s7pzxbgnsipvzmx5hx2g1pm8"
+   "commit": "0048b6c4b4f948f08786f3fb06935aa3ce227368",
+   "sha256": "0mfqxjn0hhrm0w8wf7hf85g1i8b9ihnavkw870rmyfj8y8nnp8qb"
   },
   "stable": {
    "version": [
-    3,
+    4,
     0,
-    3
+    1
    ],
-   "commit": "96a72eb3d2d03ea9910f1712ab55990705275343",
-   "sha256": "1g6f2rxy93x2mpphmnvvqx848638s7pzxbgnsipvzmx5hx2g1pm8"
+   "commit": "0cc8f0a31ef815e26eb7da314a516e908ba25838",
+   "sha256": "13wbsapnq5p75c27smzsgmmgzjbx7x2vbj7b7707bm6cakqjwdzv"
   }
  },
  {
@@ -56448,27 +57017,27 @@
   "repo": "doublep/logview",
   "unstable": {
    "version": [
-    20181027,
-    1757
+    20200125,
+    1808
    ],
    "deps": [
     "datetime",
     "extmap"
    ],
-   "commit": "72566479cbd8d90dfe2fec5984ebb4484994525c",
-   "sha256": "1ldqkbdl4vyqg6kibp1z8d5cam4r8za1pb851k886bqwag0zaj3b"
+   "commit": "638dbd4833c6387be3849d0097b5b1a14c619afb",
+   "sha256": "1arzz27vf6r62m7qhfq049n5zw1x2zbbrvmlnvbd9yaanlgrf0hc"
   },
   "stable": {
    "version": [
     0,
-    12
+    13
    ],
    "deps": [
     "datetime",
     "extmap"
    ],
-   "commit": "bd662d467dbd7c93cfe1e3058e4f11c49314fd6a",
-   "sha256": "03s4q5xdz84cjn4qkfhsc3l9y3v5avrl2i5dby4bgsg2zj7n7f73"
+   "commit": "638dbd4833c6387be3849d0097b5b1a14c619afb",
+   "sha256": "1arzz27vf6r62m7qhfq049n5zw1x2zbbrvmlnvbd9yaanlgrf0hc"
   }
  },
  {
@@ -56684,8 +57253,8 @@
   "repo": "emacs-lsp/lsp-java",
   "unstable": {
    "version": [
-    20200105,
-    1046
+    20200114,
+    2313
    ],
    "deps": [
     "dash",
@@ -56697,8 +57266,8 @@
     "request",
     "treemacs"
    ],
-   "commit": "a3ebf619a2b12b8dbbb24c39c4f78b1ba9c29e6a",
-   "sha256": "1x6il7pnyc7ylayiw35kn6jk8dphzwsas7dk129p6q0wjfdvif9d"
+   "commit": "dbeeee9c74db25db217059011935b882f7ec1257",
+   "sha256": "1ra16rm61xwhp583ib1ran6bv0z353qs4aag75l809kyvq9szlyg"
   },
   "stable": {
    "version": [
@@ -56777,8 +57346,8 @@
   "repo": "emacs-lsp/lsp-mode",
   "unstable": {
    "version": [
-    20200107,
-    1910
+    20200229,
+    1850
    ],
    "deps": [
     "dash",
@@ -56789,8 +57358,8 @@
     "markdown-mode",
     "spinner"
    ],
-   "commit": "752674a9efba4860ec85ea159fc4f9679a44819c",
-   "sha256": "0wi05v6a536y54kk9dc1a1id1arv8v6r5jpy49g9q2kglkhkaji8"
+   "commit": "db3f7f022b6d8c509b5f5d84ff437840dc0fdaa1",
+   "sha256": "0p0fkby3i87zjjilv7pzbi1bkvr1gnrqpc4rrly2nn9pcrg5l16w"
   },
   "stable": {
    "version": [
@@ -56907,28 +57476,28 @@
   "repo": "emacs-lsp/lsp-python-ms",
   "unstable": {
    "version": [
-    20200106,
-    1738
+    20200223,
+    2136
    ],
    "deps": [
     "cl-lib",
     "lsp-mode"
    ],
-   "commit": "9780be701545064847456eff8ae30fadcdf63b0d",
-   "sha256": "021nmpabad3vgq10bs3qsgg3m5vd4vzlsbyi2jgk1si9kgw898j1"
+   "commit": "5d0c799099aa5810858174f390e28fff3894bc06",
+   "sha256": "002h0i93blsv092pnfmzsfx0pj98r9glki0ki9n7gxg1z3nb0ybp"
   },
   "stable": {
    "version": [
     0,
-    5,
+    6,
     0
    ],
    "deps": [
     "cl-lib",
     "lsp-mode"
    ],
-   "commit": "d8fa9d9eea03a457eaf9944c6188107ff2ed342c",
-   "sha256": "09v5i2sdayxa69csmfyr8x8lkqmz9578vw9vrm7ayys0sc1g2zh2"
+   "commit": "5d0c799099aa5810858174f390e28fff3894bc06",
+   "sha256": "002h0i93blsv092pnfmzsfx0pj98r9glki0ki9n7gxg1z3nb0ybp"
   }
  },
  {
@@ -56976,8 +57545,8 @@
   "repo": "emacs-lsp/lsp-treemacs",
   "unstable": {
    "version": [
-    20191229,
-    1039
+    20200220,
+    534
    ],
    "deps": [
     "dash",
@@ -56987,8 +57556,8 @@
     "lsp-mode",
     "treemacs"
    ],
-   "commit": "4faf0e3fa14fff712d9cd325a2bf17ba452fa2c1",
-   "sha256": "1bqmv64skm6w0m3wxg914jzqs34cd5axwj2c6wjli4sja162h8ab"
+   "commit": "2e3606eebfa8bd909b45b88e59d8eecc6afea4a2",
+   "sha256": "08xpf677jj1cnfkbpb148h3wld8lvlarp2yq89539nfcmajx53ch"
   }
  },
  {
@@ -56999,8 +57568,8 @@
   "repo": "emacs-lsp/lsp-ui",
   "unstable": {
    "version": [
-    20200106,
-    1152
+    20200224,
+    743
    ],
    "deps": [
     "dash",
@@ -57008,13 +57577,13 @@
     "lsp-mode",
     "markdown-mode"
    ],
-   "commit": "01f89e40f473032376f70a90e33831356832f084",
-   "sha256": "0avi8hfyh61gjrv0c8aj28y8nx8qw1vvsb3l15v9xzblvdrx7v5x"
+   "commit": "bf3966e87c91c5d825c483ce0883f30dd2272b62",
+   "sha256": "0wapq3472cjdr1m47isv0lg61byanpb67k7cn9iyrlqp11y2xcjp"
   },
   "stable": {
    "version": [
     6,
-    0
+    2
    ],
    "deps": [
     "dash",
@@ -57022,8 +57591,8 @@
     "lsp-mode",
     "markdown-mode"
    ],
-   "commit": "a8c50a93952afae3cd8948fecf4c1a3dc7f3e094",
-   "sha256": "1r4327fd8cvjxfwkddp5c4bdskyncbs4sx9m3z2w4d773y2jrakc"
+   "commit": "207bc8d61abff7c3024f8a484f63bc60bc4ad58b",
+   "sha256": "024753bi0p1jyjhw7wk8k6s16kbwab5ar4cfasvbn8g08acf293b"
   }
  },
  {
@@ -57077,8 +57646,8 @@
     20180816,
     2200
    ],
-   "commit": "7cfc993709d712f75c51b505078608c9e1c11466",
-   "sha256": "0v17srm3l8p556d4j5im2bn7brxv7v0g2crlm4gb8x1cwjrbajzf"
+   "commit": "645e1959143532df8f7ef90e1184e9556df18af7",
+   "sha256": "0j9gbr3chaxc16yysyaaa1n2cvlrdc1y063l1kxj0mf435d1l7py"
   }
  },
  {
@@ -57089,11 +57658,14 @@
   "repo": "sjbach/lusty-emacs",
   "unstable": {
    "version": [
-    20191203,
-    1635
+    20200115,
+    1413
    ],
-   "commit": "1fbd5cfbdbb8ed744b5a141648febf620bbf5a84",
-   "sha256": "140af29angfnf9kakx65bpl233bn0xgr1lsb2na9qmbsarhva1kw"
+   "deps": [
+    "s"
+   ],
+   "commit": "3f4be19e0c466399c680a355c402b09792123e4d",
+   "sha256": "1915w43dwvqkklxdh1scy4yxzmalyyrx76iy9wl024svwjq3i0np"
   },
   "stable": {
    "version": [
@@ -57113,11 +57685,11 @@
   "repo": "abo-abo/hydra",
   "unstable": {
    "version": [
-    20191214,
-    1357
+    20200227,
+    1301
    ],
-   "commit": "9db28034d7d61bfeff89899633b958f22befc53d",
-   "sha256": "1vay297i270n0s0bs1a96h9mn73i03885nnrcs8723i3iv7b51mp"
+   "commit": "d2b921d067d7c7ea2f087b4d8edfdc37bcdf4af8",
+   "sha256": "1zsm7qhqj17wnx611rz6f917lvvj4ifz4vg4x144y8a5740pkihi"
   },
   "stable": {
    "version": [
@@ -57247,25 +57819,25 @@
   "repo": "DarwinAwardWinner/mac-pseudo-daemon",
   "unstable": {
    "version": [
-    20170728,
-    1940
+    20200215,
+    513
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "d235680a72677f11925b912428ad1a57b664e3e8",
-   "sha256": "0gqknrwhfzr7cf5pgs33a5xh79y0yzxghs6wsvavvqkmf4cvck40"
+   "commit": "703ee41303dc251b7672b7cba5aeb6aa54a76c90",
+   "sha256": "0cplbz7mc2zrxfk8g349ahb7gzli2hn5kda9155nbk8dw74xmj7d"
   },
   "stable": {
    "version": [
     2,
-    1
+    2
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "4d10e327cd8ee5bb7f006d68744be21c7097c1fc",
-   "sha256": "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2"
+   "commit": "564b006835facc4a8df247d8a47ab1030d7e7beb",
+   "sha256": "1ilqxl1851rg9v6ixi924xhzykc3c34f4nq1x0vyyq5b9m2fpb27"
   }
  },
  {
@@ -57428,32 +58000,32 @@
   "repo": "roadrunner1776/magik",
   "unstable": {
    "version": [
-    20191227,
-    929
+    20200217,
+    1213
    ],
-   "commit": "f42fd8080781983ba593c9df39f2f5efc45bcf1f",
-   "sha256": "11vm25wkil9n2m9s330xy9c111qa85dffkig8x7m1qc9xka25wi7"
+   "commit": "c42d7c084c1b928815cd665d1e42ea29b280853e",
+   "sha256": "0kgpynkqny8rj9ly6q72fgpv07sry92dda2v6wqhwd9nr84p1nkk"
   },
   "stable": {
    "version": [
     0,
     0,
-    1
+    3
    ],
-   "commit": "11ea02254f2bdfaecc12a75545c558fd37b98954",
-   "sha256": "0msgpi4g8k6zyjshfaf5jb00idc5j5mrzl2kc5p2k1kg19bh3178"
+   "commit": "d280836c77fd263ee404273d7c21f47395a657f9",
+   "sha256": "0ibasyhqc6zgvzvkfyfvx7g6f18z4n7hy2lqjvyckh40cqpzpwj0"
   }
  },
  {
   "ename": "magit",
-  "commit": "9f963950d69a944443d9b6a1658799f7860d0f93",
-  "sha256": "13fipghvlzbx2d4dwxmm1hhnnd28davdp8rjqhq8g4g0lcn3h8b1",
+  "commit": "15a5916ec8e9062e41b1dd7d4f5535a86c2170a3",
+  "sha256": "1bcv0yv5l51j3xyli9rq3zqjkf0b9w7yd0kykfmy1dp1hx39qf8r",
   "fetcher": "github",
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20200108,
-    532
+    20200228,
+    1207
    ],
    "deps": [
     "async",
@@ -57462,8 +58034,8 @@
     "transient",
     "with-editor"
    ],
-   "commit": "2191261223078077bf35eb12187e35ff0228174a",
-   "sha256": "1fn1ygaw71qq5b6dqk4bj05rfjqb4qz2hv0vc3m3zvpckxar6v5g"
+   "commit": "c8cd22e28d20b0d7ae74102df4e35d7c0c61ebe6",
+   "sha256": "134n9m2zrf60ljm867bv92qjgk61cmgns1a3cqpvj4wflpaahnbv"
   },
   "stable": {
    "version": [
@@ -57491,15 +58063,15 @@
   "repo": "magit/magit-annex",
   "unstable": {
    "version": [
-    20190421,
-    241
+    20200224,
+    1
    ],
    "deps": [
     "cl-lib",
     "magit"
    ],
-   "commit": "d5d819c609256a3b7b11ccaf6664be61aa3597b6",
-   "sha256": "0bwbvwbnyp01vvp76fvn6capk17692c6ippw3z6pknlfiqcz3z0y"
+   "commit": "9ffebd50a18adba70a9cfc2710012dfd650c5376",
+   "sha256": "0sihrmk9snazdj1dana7q89a5qd7xjclhmfqh15gvxchs4a8jwqg"
   },
   "stable": {
    "version": [
@@ -57727,8 +58299,8 @@
    "deps": [
     "magit"
    ],
-   "commit": "a7357ab87c89187234fe333bb869727c417638d1",
-   "sha256": "1s5ysmzyvlhnb9yzxwsrs0rj50ib0wzb2wrmisghxi10pk3j9sk9"
+   "commit": "3b588991d30a69d2209dbcbb041777ae8af62bd0",
+   "sha256": "19fyrann61k8viak05y0f5v9xr2p531ysrcq05d8pq8qf3vna1y1"
   },
   "stable": {
    "version": [
@@ -57790,8 +58362,8 @@
     "libgit",
     "magit"
    ],
-   "commit": "2191261223078077bf35eb12187e35ff0228174a",
-   "sha256": "1fn1ygaw71qq5b6dqk4bj05rfjqb4qz2hv0vc3m3zvpckxar6v5g"
+   "commit": "c8cd22e28d20b0d7ae74102df4e35d7c0c61ebe6",
+   "sha256": "134n9m2zrf60ljm867bv92qjgk61cmgns1a3cqpvj4wflpaahnbv"
   }
  },
  {
@@ -57845,6 +58417,24 @@
    "sha256": "0s2zmfw449gyc8lf8cqwm47wnqy9g5nai72agvapam2h5613mx4i"
   }
  },
+ {
+  "ename": "magit-patch-changelog",
+  "commit": "caf023c2af4c09c04de7bc0338fc1d07da895ddd",
+  "sha256": "1lkgrnhiis0rwx14pcvhi5r775mgysb04srnvqfsihdn31bqjh6g",
+  "fetcher": "github",
+  "repo": "dickmao/magit-patch-changelog",
+  "unstable": {
+   "version": [
+    20200217,
+    1202
+   ],
+   "deps": [
+    "magit"
+   ],
+   "commit": "876c780bdb676b6ece64861704e199b94f33cf71",
+   "sha256": "0wkjh9s67vs90lysdx3gjyrax9mlbzfvs563pzr6ab3l4p5pgnsw"
+  }
+ },
  {
   "ename": "magit-popup",
   "commit": "0263ca6aea7bf6eae26a637454affbda6bd106df",
@@ -57913,6 +58503,33 @@
    "sha256": "0xlhy328h2wxklpy71dhy1fk7zv6hs2v4jrl1mm9x5mnrbrdfvxx"
   }
  },
+ {
+  "ename": "magit-section",
+  "commit": "92cab05cc5ba4153be97648d6fcd95417871e9c7",
+  "sha256": "1v9g8y9r0lmp54hgaxgjqr3x86l7cz4wvrrjbpij7aai40ddqdp3",
+  "fetcher": "github",
+  "repo": "magit/magit",
+  "unstable": {
+   "version": [
+    20200226,
+    1251
+   ],
+   "deps": [
+    "dash"
+   ],
+   "commit": "c8cd22e28d20b0d7ae74102df4e35d7c0c61ebe6",
+   "sha256": "134n9m2zrf60ljm867bv92qjgk61cmgns1a3cqpvj4wflpaahnbv"
+  },
+  "stable": {
+   "version": [
+    2,
+    90,
+    1
+   ],
+   "commit": "791901b2f1d26fa0a383147fe77948a9abc753da",
+   "sha256": "1kw94sdczswsyzn1zlk5s5aplpdv4qd7qcqc5zfxsmsfwm3jacl4"
+  }
+ },
  {
   "ename": "magit-stgit",
   "commit": "72a38bbc5bba53dfb971f17213287caf0d190db0",
@@ -57981,8 +58598,8 @@
    "deps": [
     "magit"
    ],
-   "commit": "2b08d93c5ead14f34f9cc3c3140ecf25b1531151",
-   "sha256": "1h5lnns6adpyah2i1k8fznbq4qf43sf64a4vp8s5h67q2ajlf52j"
+   "commit": "0162390581c1165a0c4c68081d8fc5ffae4cf1a9",
+   "sha256": "0blwbgr4by0rawzw2hdpc5jcckmj96p0dxvgcml61rg3andsqyyl"
   },
   "stable": {
    "version": [
@@ -58005,8 +58622,8 @@
   "repo": "alphapapa/magit-todos",
   "unstable": {
    "version": [
-    20200102,
-    7
+    20200204,
+    823
    ],
    "deps": [
     "async",
@@ -58017,13 +58634,13 @@
     "pcre2el",
     "s"
    ],
-   "commit": "40d268f9b487ad7e3b7aff2da2bc44e596bc8052",
-   "sha256": "1xgwz13nmk2apbgq00ac9qrcf2hip558x0qcn8rg9n9shnbixsqq"
+   "commit": "ad5663aa26fad147f1afbd878cbe21a064ba5745",
+   "sha256": "1naqyl9qy15nkjz41l8pzqy79bkm7cp5ih63ji8ycq416400pia1"
   },
   "stable": {
    "version": [
     1,
-    4,
+    5,
     1
    ],
    "deps": [
@@ -58035,8 +58652,8 @@
     "pcre2el",
     "s"
    ],
-   "commit": "8557cf36260743674e7c3ecdb3038dca5106416b",
-   "sha256": "1rcl6j53yabxqk3jzgaxvm3wqq7rayf1hdib2v2fapw5b0layym6"
+   "commit": "ad5663aa26fad147f1afbd878cbe21a064ba5745",
+   "sha256": "1naqyl9qy15nkjz41l8pzqy79bkm7cp5ih63ji8ycq416400pia1"
   }
  },
  {
@@ -58233,15 +58850,16 @@
   "repo": "stardiviner/major-mode-icons",
   "unstable": {
    "version": [
-    20170301,
-    714
+    20200127,
+    512
    ],
    "deps": [
     "all-the-icons",
-    "powerline"
+    "powerline",
+    "xpm"
    ],
-   "commit": "e6117a236b2ad52e948576550b183053321dfc91",
-   "sha256": "0gpp9x23qz7ll8d7hlbvynv891hw907k38i7v0b08s8zh1ilvnwa"
+   "commit": "b36eae2e976bad3c431b082c64b1a724a2ba1fe6",
+   "sha256": "1jjmma9lx5g4qprmy71izgdp564lbdb0wsiysl1f6d8wipml78ys"
   }
  },
  {
@@ -58461,11 +59079,19 @@
   "repo": "emacsorphanage/manage-minor-mode",
   "unstable": {
    "version": [
-    20140310,
-    1600
+    20200123,
+    1406
    ],
-   "commit": "1bed33b0752380b548b822fe72e6858c5fe70c8e",
-   "sha256": "10wl7kc76dyijrmdlcl5cx821jg7clsj35r22955mbbgh7zl1x07"
+   "commit": "0dfab46a728a21c91658ffcb14101b182cf1b403",
+   "sha256": "1c17r1vz6181plbhb5nh36q6r2rwkrxhy45xmk7rjghmdd765f2r"
+  },
+  "stable": {
+   "version": [
+    1,
+    1
+   ],
+   "commit": "d07d269586233787b4bea4c40df43d6357a40f58",
+   "sha256": "074bm7kfvslfl06zjrp7h0plbx6aqagzppczgnpslqa41373b8jx"
   }
  },
  {
@@ -58687,26 +59313,26 @@
   "repo": "plandes/markdown-changelog",
   "unstable": {
    "version": [
-    20191231,
-    1825
+    20200120,
+    2253
    ],
    "deps": [
     "dash"
    ],
-   "commit": "251c675d38aadb314184a7477f8a2f53399843be",
-   "sha256": "17nb57q9dmrrrn68zvm6bmrkp5yz18aivgmcz46y4a269srdsc28"
+   "commit": "1a2c3a4c3e4196f2b5dbb145b01b4bc435a93a96",
+   "sha256": "0dw9bz1iq8v816n0z4v9zc6nsrx4qzl99q2pj04f37s7x9vgmc4x"
   },
   "stable": {
    "version": [
     0,
     0,
-    1
+    2
    ],
    "deps": [
     "dash"
    ],
-   "commit": "83feaf9635a244bd26cb1959196be7efa143267b",
-   "sha256": "157imgdpwzmi5k02kqnpj2spyxkq663bka5gwxcf194h781icb61"
+   "commit": "1a2c3a4c3e4196f2b5dbb145b01b4bc435a93a96",
+   "sha256": "0dw9bz1iq8v816n0z4v9zc6nsrx4qzl99q2pj04f37s7x9vgmc4x"
   }
  },
  {
@@ -59084,20 +59710,19 @@
   "repo": "vspinu/math-symbol-lists",
   "unstable": {
    "version": [
-    20190605,
-    2058
+    20200131,
+    2333
    ],
-   "commit": "dc7531cff0c845d5470a50c24d5d7309b2ced7eb",
-   "sha256": "094m21i9rns6m59cmhxcivxxafbg52w8f8na4y3v47aq67zmhhqm"
+   "commit": "1cf7e2885f3352f55852ee9eba26c7cb5a7cd74b",
+   "sha256": "0c2fs87vsxx00svzx09x90p8sc1zm4mj24ab0bvqf7ghpl5qgwa8"
   },
   "stable": {
    "version": [
     1,
-    2,
-    1
+    3
    ],
-   "commit": "499986959356f7a905fd4f2a1609c17d7ff067c3",
-   "sha256": "1h6fwj2w77gm4wafqll5bd6r8xafh6f4a0piqmgjvcwxy2sxrk0q"
+   "commit": "590d9f09f8ad9aab747b97f077396a2035dcf50f",
+   "sha256": "1r2i600356k8g0l53s4b5xc24flpka664i8f23zbj4h7gk1g2787"
   }
  },
  {
@@ -59120,17 +59745,17 @@
  },
  {
   "ename": "matlab-mode",
-  "commit": "6f78cff288077e04f8c9e4c2e5be9f3c33d8ff49",
-  "sha256": "1q3sdmahf915ix4lrv65cxsfh6hrs91c8pmyixbqmbhifqi33d0q",
+  "commit": "08b700ce0068646b51cd856df98ca583e21da8a1",
+  "sha256": "1qxbcklmhwn4478chnf9n8hwc4qznjb7y8cj78a179hhws70l97j",
   "fetcher": "git",
   "url": "https://git.code.sf.net/p/matlab-emacs/src",
   "unstable": {
    "version": [
-    20200106,
-    2217
+    20200213,
+    930
    ],
-   "commit": "b3057e8ca6a8703bf59ba365521cf37ad25c700b",
-   "sha256": "1ydls6g9fnsapvd5cnxba2b6g936q3ym4mlms7rvlazj3g1lma1n"
+   "commit": "e14d97df706049ea2e2d6e5b515fdbd08cd94dd3",
+   "sha256": "0zi873fpskv18k0xs9rgb2yfj49sga3yyq1b6xxc4ik0r45wi9cz"
   }
  },
  {
@@ -59283,11 +59908,11 @@
   "repo": "dimitri/mbsync-el",
   "unstable": {
    "version": [
-    20191002,
-    751
+    20200128,
+    1053
    ],
-   "commit": "b62491c0e0d89eb9c66261a16d7ac81231c9c453",
-   "sha256": "1zlih37mkqjn2czl12zn7lgxxljvrwhqqpbksj9c91zn0f0rm3mz"
+   "commit": "d3c81da81ce5b154c0d048047a47277338721a70",
+   "sha256": "10xxgvzjb7bl3lzgjkdsnnkd9wphkc2pm621agyjlayzcjnldz5p"
   }
  },
  {
@@ -59600,8 +60225,8 @@
     20191025,
     851
    ],
-   "commit": "28fc61128198f023d88c104e98451e17c896afd9",
-   "sha256": "0lc2y6lb4h0l0jlmsyf4n6nf87z6nfixnsipyg5cbkj7xzji0xys"
+   "commit": "077385b3f9f3050678963d47c56e18aecc9f8b28",
+   "sha256": "1p926jsajhn10679gbsj0lgmfvz8q5mxx0w326qni7y9mmrxvsni"
   },
   "stable": {
    "version": [
@@ -59650,14 +60275,14 @@
   "repo": "abrochard/mermaid-mode",
   "unstable": {
    "version": [
-    20191206,
-    443
+    20200221,
+    1938
    ],
    "deps": [
     "f"
    ],
-   "commit": "83eb6627d793db39a147c7b499f65637db1341b2",
-   "sha256": "110im31z8fvl34h80y0kq6070id9p6cr7d6ssfkbmipl3w26x71d"
+   "commit": "833abce1fb232b7dbeac0ee568afe8c468077029",
+   "sha256": "0znc9sv5xv0bqq4szcaz6nlxypijqm5lmi0igkcpibry6bwfipgj"
   }
  },
  {
@@ -59668,19 +60293,19 @@
   "repo": "wentasah/meson-mode",
   "unstable": {
    "version": [
-    20181115,
-    2125
+    20200216,
+    2254
    ],
-   "commit": "b507a87455af906e6c49aa4af70eba5b1d1af9ef",
-   "sha256": "046kf04vqq1wf9ncxq40fcjcgl18hk4vii5wl3m08rpvdwbnmfwr"
+   "commit": "bc6c09136c7f7de6f4b6ce9294e9b998e24b93c7",
+   "sha256": "113vj7z8zk80653ldq4sfxkk3pja8yjscywb0cwpkaq0088n5jf7"
   },
   "stable": {
    "version": [
     0,
-    1
+    2
    ],
-   "commit": "212d9f38a08074f1cb6e914e12b60bc52dcb8bee",
-   "sha256": "1kv7413y5530frs1nrp0nl40h9j0idwp7vlg761r260200m8sl3v"
+   "commit": "d80ef159242402609a52c29949bd550c8442db53",
+   "sha256": "1720b3hpfqd989zrgcns51jbjrv4vzl9di9mccl55vkmkbqzfin0"
   }
  },
  {
@@ -59778,17 +60403,17 @@
     20191018,
     242
    ],
-   "commit": "58398120907504ff200adfd9b817f297142c9680",
-   "sha256": "0c8r9k803fc57ny56ny81s276r3m3y4cd7mxvwjmpz7ycivvg0v5"
+   "commit": "4fa095ff8416d1759ffd9cbd01d667cff386bbb5",
+   "sha256": "171fsvzk0msvz1052034g60prf40w6qdkglg560v73iika8x2k4s"
   },
   "stable": {
    "version": [
     1,
     1,
-    1
+    5
    ],
-   "commit": "3cad357cd5c0f7f949fc6c7aa42d76155d036e78",
-   "sha256": "136l0lm8lv7fgpzply241fngxfl3ck11raamqwislyv0nnjwdfdi"
+   "commit": "2e28cf362b7e4a8b6a5bbaf60983a72e19798c8b",
+   "sha256": "0lal6d4a4pbni1xl3g1gb3rnmyz2kym9r1mhb2n14awqqxxg7l3q"
   }
  },
  {
@@ -59799,14 +60424,14 @@
   "repo": "ianxm/emacs-tracker",
   "unstable": {
    "version": [
-    20200105,
-    1555
+    20200126,
+    1851
    ],
    "deps": [
     "seq"
    ],
-   "commit": "e8b2d96114ae52060e757d21003a5f242e744fe1",
-   "sha256": "1c6l7a9rl69vkvfidz2vc8agk4fzdlkjcn4dw01zq607m036jwzi"
+   "commit": "4da64b60091c3d7b23c7c5fd3dba981122b0e1f7",
+   "sha256": "1jy07b1am1g4hwiwywmi9iyidv3yp933j2y4f9nmfhpb4yjs193y"
   }
  },
  {
@@ -59817,11 +60442,11 @@
   "repo": "kazu-yamamoto/Mew",
   "unstable": {
    "version": [
-    20200106,
-    143
+    20200130,
+    145
    ],
-   "commit": "9cd86a81ee71268f007f949184a5d386cf737d77",
-   "sha256": "0zmdjxkp2mw9s2s7bryif5gjrqx29gjh47xkq05l8vvgf36r98rg"
+   "commit": "bdafb13aadeae6af73dadd9f6b383ea6903da32f",
+   "sha256": "09k9bkwf6hz8jnklsm30w79v3vkwsf5nd97cxfmi44j7wlb6kkr1"
   },
   "stable": {
    "version": [
@@ -59858,8 +60483,8 @@
     20200104,
     108
    ],
-   "commit": "f07387225bfcb0b67850546ace4b74dfefb35ab3",
-   "sha256": "02pk90zrbrf8vwg0i83z48xvgaziwaar89rghnd5lggrj429kahv"
+   "commit": "3bce96bbd509ad5ffb35ead52128dec5c1a67abf",
+   "sha256": "01wx7cvk3bvdvkpldhbj7wvqyrra7ajqjkgnj4knjg8m2wrhilhj"
   },
   "stable": {
    "version": [
@@ -60062,25 +60687,25 @@
   "repo": "kiennq/emacs-mini-modeline",
   "unstable": {
    "version": [
-    20191006,
-    1733
+    20200131,
+    312
    ],
    "deps": [
     "dash"
    ],
-   "commit": "01608829d895d3a6f4160e3b33175e1a5bde628f",
-   "sha256": "19qdzn8jd8k85aalkl4751fyfw5lcrk0vvwrrvp2qmj5s3rr16jm"
+   "commit": "8762d2ec5de2994f05a2a11f505d0963eb28e59e",
+   "sha256": "0dc9frairj081g326b64mddr3knpxhwvmn19w7m1ckmxbv7lg0in"
   },
   "stable": {
    "version": [
-    20191006,
-    1733
+    20200131,
+    312
    ],
    "deps": [
     "dash"
    ],
-   "commit": "fe7b723b5e609a721a15800faa9bd8b34fddd3e3",
-   "sha256": "047v8x9i8j6vcn3ba2kzy2lzdxwcm867bby0a5l297jp6mqfw92h"
+   "commit": "8762d2ec5de2994f05a2a11f505d0963eb28e59e",
+   "sha256": "0dc9frairj081g326b64mddr3knpxhwvmn19w7m1ckmxbv7lg0in"
   }
  },
  {
@@ -60216,14 +60841,14 @@
   "repo": "tarsius/minions",
   "unstable": {
    "version": [
-    20200103,
-    1239
+    20200204,
+    1950
    ],
    "deps": [
     "dash"
    ],
-   "commit": "c331c1516111b9d2136e632a218c1d7707215356",
-   "sha256": "095yx8zg61nka6f7biyj1binbp8g872vq275ycwgmd2ix462zyf4"
+   "commit": "bc1edab09d3fc1b248c17775ae2eb7d35b96be40",
+   "sha256": "09z5wynw3xaxx2jr55ymlnhczryp5c5zgb1g9nr99k2rksq2j980"
   },
   "stable": {
    "version": [
@@ -60246,14 +60871,14 @@
   "repo": "arthurnn/minitest-emacs",
   "unstable": {
    "version": [
-    20191229,
-    1711
+    20200224,
+    1823
    ],
    "deps": [
     "dash"
    ],
-   "commit": "6d9f6233b7ce63c63c96675514c228fd93a2b6a1",
-   "sha256": "01mfsyj0iq6rgh0q5b1acczdzr46n0nj5v94gb3iw9hs54vm4871"
+   "commit": "97d7d1760b24e117ffd163531b0f57fd4321677b",
+   "sha256": "0d8kg68yy5x1y3ivj43vzcakb3gii6bh8jm40g4sah5f53bbrs16"
   },
   "stable": {
    "version": [
@@ -60455,8 +61080,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "753f6dc888acbd932c4fbd7c73ff750381058561",
-   "sha256": "0smamgvl6qlvzyc4119szxllx5ydw6pmix0g4zfjqf47lwxdd2yi"
+   "commit": "6d3eedf4fae3c88dee33691aa2856514122adc8c",
+   "sha256": "0fykf7svgsbcjfcsbp1r571mgjhxwkdvmmhhl2clyi5z3mwg0s1g"
   },
   "stable": {
    "version": [
@@ -60622,8 +61247,8 @@
     20190713,
     1335
    ],
-   "commit": "0a641093f5edb1e0849b82f90a1464623bb14a2f",
-   "sha256": "0fv03frlcqfa4sfnvv5v6qg9k79jpnv4pbwifzdafqwgpd34jgy1"
+   "commit": "8f71e0a85c2f6039111663e65d9a13f3310f12ed",
+   "sha256": "0vz58nk044jm97wh77v02h24571nwg57j1vx2v4rx9wmwrnifwid"
   },
   "stable": {
    "version": [
@@ -60759,11 +61384,11 @@
   "repo": "protesilaos/modus-themes",
   "unstable": {
    "version": [
-    20200106,
-    1823
+    20200228,
+    1019
    ],
-   "commit": "3c287ae6bf05b3cdc29fb9841bdce990c77ed61b",
-   "sha256": "171qhi4xcgrkvx1gg5ayz95b6pjazqi2swigl10qf5gxj2b26ys1"
+   "commit": "e1b2d0a6235c26ce9e8ca7085393eeff20408378",
+   "sha256": "0cjbvqnw2xhvrzihzywbb5x568vrmxwmrq2rzdm1bw2596ycrnd3"
   },
   "stable": {
    "version": [
@@ -60783,11 +61408,11 @@
   "repo": "protesilaos/modus-themes",
   "unstable": {
    "version": [
-    20200106,
-    1823
+    20200228,
+    1019
    ],
-   "commit": "3c287ae6bf05b3cdc29fb9841bdce990c77ed61b",
-   "sha256": "171qhi4xcgrkvx1gg5ayz95b6pjazqi2swigl10qf5gxj2b26ys1"
+   "commit": "e1b2d0a6235c26ce9e8ca7085393eeff20408378",
+   "sha256": "0cjbvqnw2xhvrzihzywbb5x568vrmxwmrq2rzdm1bw2596ycrnd3"
   },
   "stable": {
    "version": [
@@ -60807,11 +61432,11 @@
   "repo": "kuanyui/moe-theme.el",
   "unstable": {
    "version": [
-    20180617,
-    200
+    20200216,
+    1927
    ],
-   "commit": "6e086d855d6bb446bbd1090742815589a81a915f",
-   "sha256": "0xj4wfd7h4jqnr193pizm9frf6lmwjr0dsdv2l9mqh9k691z1dnc"
+   "commit": "01d00a8d75b19f641b639ba23793cdd507c61f05",
+   "sha256": "14higsv6h0pka90gr25a3yxh95xn65l6qxb39mmdzkfdlnzsg664"
   },
   "stable": {
    "version": [
@@ -60855,10 +61480,10 @@
  },
  {
   "ename": "mongo",
-  "commit": "855ea20024b606314f8590129259747cac0bcc97",
-  "sha256": "0jb5m611m7w26wgfwijgy0dn65s7p1y6fdcfpfgpxa7j5vrcxasc",
+  "commit": "7856a62fb86415c88aa72b574895328c93c10a09",
+  "sha256": "1xkhn8h6z60jah7v5gvkp4pfwdnmc2wcka4rcjaky51yv50zymad",
   "fetcher": "github",
-  "repo": "m2ym/mongo-el",
+  "repo": "emacsorphanage/mongo",
   "unstable": {
    "version": [
     20150315,
@@ -61085,20 +61710,20 @@
   "repo": "tarsius/moody",
   "unstable": {
    "version": [
-    20200103,
-    1238
+    20200113,
+    2321
    ],
-   "commit": "3616a6bd7c6b028753dc11feabd14597da694a63",
-   "sha256": "1fj66x2vgxqi36fvzh2q0b3p9bijq4a86sqv57zjs59yknib29h7"
+   "commit": "2751d36152abcc2ac1479225392182b53f1e02dd",
+   "sha256": "1xyw4l42053595r76lj8safsx6pj25as0107wd96by3h7dg9m586"
   },
   "stable": {
    "version": [
     0,
     5,
-    2
+    3
    ],
-   "commit": "3616a6bd7c6b028753dc11feabd14597da694a63",
-   "sha256": "1fj66x2vgxqi36fvzh2q0b3p9bijq4a86sqv57zjs59yknib29h7"
+   "commit": "2751d36152abcc2ac1479225392182b53f1e02dd",
+   "sha256": "1xyw4l42053595r76lj8safsx6pj25as0107wd96by3h7dg9m586"
   }
  },
  {
@@ -61143,6 +61768,31 @@
    "sha256": "1v2phdpfngrb01x4qygpfgxdzpgvbprki2kbmpc83vlqxlmkvvjk"
   }
  },
+ {
+  "ename": "moonshot",
+  "commit": "a0d294051a792679d215dbb830a600fdf5090866",
+  "sha256": "12gj1df28s7c05vplsx88hcsxjr13hnh8sc7878pj11kabgihpf6",
+  "fetcher": "github",
+  "repo": "ageldama/moonshot",
+  "unstable": {
+   "version": [
+    20200210,
+    2356
+   ],
+   "deps": [
+    "cl-lib",
+    "counsel",
+    "f",
+    "levenshtein",
+    "projectile",
+    "realgud",
+    "s",
+    "seq"
+   ],
+   "commit": "83a9933cd4af234ae15fdc3a39e660d646b0c246",
+   "sha256": "0rljyk4pkjwwh9mrpjdzywc4lyf163glzqhjs3nlvfy2yz9j0863"
+  }
+ },
  {
   "ename": "morganey-mode",
   "commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -61408,15 +62058,16 @@
   "repo": "akirak/mozc-posframe",
   "unstable": {
    "version": [
-    20190817,
-    2037
+    20200208,
+    750
    ],
    "deps": [
     "mozc",
-    "posframe"
+    "posframe",
+    "s"
    ],
-   "commit": "20df08f0bf239bc2a686ff2c6d9390b5ea6d89fa",
-   "sha256": "0azcwdig6xp5vxr6yidmnbqbrfhgb7jwfmyk4cci5ca8sfm4ycvp"
+   "commit": "1d07d5055381008ccbb29b97315d140e09a7ee95",
+   "sha256": "1hwc66xj2js5srmshmba5q6adn638qgbslnxg9l15znfhq3qcy9w"
   }
  },
  {
@@ -61511,15 +62162,15 @@
   "repo": "mpdel/mpdel",
   "unstable": {
    "version": [
-    20200102,
-    1938
+    20200221,
+    1316
    ],
    "deps": [
     "libmpdel",
     "navigel"
    ],
-   "commit": "706268d988a7f3560190694f5d21e27f5eeb58da",
-   "sha256": "1jsh6x844j33n27ny2rwc5c0psc89fzqy8g2ny09sywm3j4lg281"
+   "commit": "29e7c46f83bab7aedfa0136c58e776faba6ad4ed",
+   "sha256": "1lz3i3ygdihr7r9rnb08fkcxrdg905wkb0s55pid57yhh4iva7fg"
   },
   "stable": {
    "version": [
@@ -61834,11 +62485,11 @@
   "repo": "mkcms/mu4e-overview",
   "unstable": {
    "version": [
-    20191020,
-    842
+    20200218,
+    546
    ],
-   "commit": "c34f45b3ab9cce892835e14c6701b531a4f54cce",
-   "sha256": "1jc291xwym2ddiqvn83s2b2jw6a08dd63x0f6526qv8g3yr1jl1s"
+   "commit": "151d5d9e0dd5e8e8c775035203d3e17538151f33",
+   "sha256": "1gvlh306pcn1g4b7j5pk5m2n2wa72bl9vscfsp0gqr4fwrfnm3r6"
   },
   "stable": {
    "version": [
@@ -62009,11 +62660,11 @@
   "repo": "manateelazycat/multi-term",
   "unstable": {
    "version": [
-    20191104,
-    1156
+    20200112,
+    533
    ],
-   "commit": "8deb0f2252399cca2426eb3cc3e9646c5de726b3",
-   "sha256": "19qbhxhpdsi76jlf6cfacy7g5z6a0r27v2hcf159p4xc4w93yphy"
+   "commit": "7307ddd456db44045206253e5a905d3d8c143d5c",
+   "sha256": "0cqq6y7whx4zwwd8360vdmbvsmkrvmxnn7cvz6hafrh5mrcfqmvn"
   },
   "stable": {
    "version": [
@@ -62116,14 +62767,26 @@
   "repo": "zevlg/multitran.el",
   "unstable": {
    "version": [
-    20190714,
-    1049
+    20200201,
+    55
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "eea1e4a57870dd6ee6c6f0a85e53cb66af8954de",
-   "sha256": "0gvijqs0n3n98fpx61qvzx0akpzfyxhik70dvxp15skr2rvnh17j"
+   "commit": "475e2a92795dbed1aa3b1c5eba2c6c779cac4508",
+   "sha256": "0nl4cm1nx7lmb2gd76jw8v0hqdfjjcwy0xskpi0brd8z6dp1m5n3"
+  },
+  "stable": {
+   "version": [
+    0,
+    4,
+    10
+   ],
+   "deps": [
+    "cl-lib"
+   ],
+   "commit": "258b1232af6680396b6c0912597ed52e583326f4",
+   "sha256": "08b9a0pb38swgvg2v97pm4g2zda0xagdgq42znwhkmhzjiskh2g1"
   }
  },
  {
@@ -62876,11 +63539,11 @@
   "repo": "naota/navi2ch",
   "unstable": {
    "version": [
-    20150330,
-    216
+    20200130,
+    36
    ],
-   "commit": "f39d93c32acd5b9c3a7fb1a9fe14c5e1c4b5288e",
-   "sha256": "0i0icyaa2zzzl0cr9n1zv44pg2lric8gic58dkjxjv8yyk6y01cn"
+   "commit": "7811dba052f679bd920a1f648d621a6fecace10f",
+   "sha256": "0glr8cfxpp23j8sr0147x1ba7f6i8vzn2c15kgfs94y5h2d4jv3l"
   }
  },
  {
@@ -62891,14 +63554,14 @@
   "repo": "DamienCassou/navigel",
   "unstable": {
    "version": [
-    20191229,
-    1357
+    20200202,
+    1214
    ],
    "deps": [
     "tablist"
    ],
-   "commit": "2695f1df2260398930319095cf6b6a49ba98d6a5",
-   "sha256": "0v9f7wb6yghds3hjj8x5di6gfa8n5kjwhav7la1ca2zwgs2c1a9p"
+   "commit": "0a2d624d6b49f8363badc5ba8699b7028ef85632",
+   "sha256": "1lf46qsa6xb9rpb0s96vcvwv6n9v08iqp332pyhli0937afij454"
   },
   "stable": {
    "version": [
@@ -63027,8 +63690,8 @@
     20161029,
     2023
    ],
-   "commit": "f7ebf8f2cff477c3d9b8abdb6470e7b8d80f51ce",
-   "sha256": "0nfj072wvvyzbc6xfw2m9fmfx19rv65s4l3hy2faa4d4skw425zz"
+   "commit": "7c63573fe66897b089963e9831546e5de7787c5a",
+   "sha256": "15cwfma9cq8i9x8cpaanzjgszddgvxbkn9q5aci0nnvl6nggqzpn"
   },
   "stable": {
    "version": [
@@ -63334,11 +63997,11 @@
   "repo": "aaronjensen/night-owl-emacs",
   "unstable": {
    "version": [
-    20190825,
-    1559
+    20200118,
+    1513
    ],
-   "commit": "44c1b98f7c0d8b7ad31d6e1b3382bcf0294e03f2",
-   "sha256": "1nv2s0rz8ihixqxhxj3qn3h0zxfphgjzvldv3y32cg50gxnrb85n"
+   "commit": "b52fbf83ffef1ca265c9ea273bf51827532cef67",
+   "sha256": "0blgf7wx8i7am943m1jc7q4ndkb7pdczfgigrdnqsaf861m0nhng"
   },
   "stable": {
    "version": [
@@ -63412,11 +64075,11 @@
   "repo": "m-cat/nimbus-theme",
   "unstable": {
    "version": [
-    20191123,
-    1238
+    20200203,
+    1941
    ],
-   "commit": "c3d2b591de0763df11dbf62101578ca385ebe7cf",
-   "sha256": "0jc4zp1b0fk4fc1d2byi2vrbifiy0k89b75kh4qr702vkk9vgl4g"
+   "commit": "32c5c88502aec1afb6700a798c215b7fc6ce6101",
+   "sha256": "1s0f7wgik5383ffkys27376s0gzhhz6m0rap7l8iqq67yz0k6hxw"
   }
  },
  {
@@ -63430,17 +64093,17 @@
     20181024,
     1439
    ],
-   "commit": "bab5626e57a8b07b6778cd6d41ff29155fefb2af",
-   "sha256": "1jvcn32986xk33i7ashpva035qaaxw1sjs3g587x2j7iqqhp0s74"
+   "commit": "2ca4c711f77d9cb95e3698de70d07823f4baa256",
+   "sha256": "1g53dfs7dycihh98lsril6b57v5mfkqhicy74d3jpkyny7zpshaz"
   },
   "stable": {
    "version": [
     1,
-    9,
+    10,
     0
    ],
-   "commit": "b25c08bda4949192c69cea4cee057887341a2ffc",
-   "sha256": "1q0nld3g0d210zmdjyjzjz2xb2bw1s58gj6zsx7p8q30yh0wg610"
+   "commit": "ed7f67040b370189d989adbd60ff8ea29957231f",
+   "sha256": "1fbzl7mrcrwp527sgkc1npfl3k6bbpydpiq98xcf1a1hkrx0z5x4"
   }
  },
  {
@@ -63481,11 +64144,11 @@
   "repo": "akirak/nix-env-install",
   "unstable": {
    "version": [
-    20191223,
-    1651
+    20200113,
+    751
    ],
-   "commit": "f362590216e8a86ff85b3f444695f8e1dd1b2bcc",
-   "sha256": "108lyrix9gh438df6y432qppagpq3m2vn3gqsgp9sv24bvkv3wkf"
+   "commit": "b343a7e885206e78544da7313b860442abbd7440",
+   "sha256": "06sq5biv15pgz8azp1kkbkj6ifi2xpa688gx8hj3xvkms9hy6b29"
   }
  },
  {
@@ -63684,8 +64347,8 @@
   "repo": "dickmao/nnhackernews",
   "unstable": {
    "version": [
-    20200102,
-    1857
+    20200225,
+    1605
    ],
    "deps": [
     "anaphora",
@@ -63693,8 +64356,8 @@
     "dash-functional",
     "request"
    ],
-   "commit": "da85bf90989c1a4f4e50a40fa64c5b5e82e03043",
-   "sha256": "1p1jc8daflndbp19ya4h8719zc60xsvxn2l8z3rh291wm2azp2gf"
+   "commit": "2fbe9052d93fa7b8fca107aa0dfaebbdf734c95c",
+   "sha256": "0c09hdr79i701gjalav6vj9k7qp8w5ln4s3ji2hk6z03fqpf7g91"
   }
  },
  {
@@ -63720,8 +64383,8 @@
   "repo": "dickmao/nnreddit",
   "unstable": {
    "version": [
-    20191215,
-    1438
+    20200225,
+    1558
    ],
    "deps": [
     "anaphora",
@@ -63730,8 +64393,8 @@
     "request",
     "virtualenvwrapper"
    ],
-   "commit": "b5655519c1bf4c540f17bfd6e1af03241e3c1fc3",
-   "sha256": "0m4gfx87lyz5p8d3bwp3hw5y95vaijnwl8gg9cjy98riw309xpzf"
+   "commit": "13c6bc1db743f047a952d023be6c2b982a0e95bf",
+   "sha256": "13qzgvpngja3cd9fkarx7scsvna97fz79snai3ap4qfy5d9gqyqh"
   }
  },
  {
@@ -63757,14 +64420,14 @@
   "repo": "emacscollective/no-littering",
   "unstable": {
    "version": [
-    20191203,
-    645
+    20200123,
+    1753
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "d1d6965c70fc6ce0cfb38a5115d0e112aefac1d7",
-   "sha256": "17is06l0w6glppabv2kaclrnqi3dqb6p6alpslpg7lrjd8vd45ir"
+   "commit": "14ed8ed2a2d8ae700ce1889d76bc4588d22549b1",
+   "sha256": "0gdnvvlrakyi1xpvlxr55k0rjnb6fprrc7pwjzpl79j87srrj9k0"
   },
   "stable": {
    "version": [
@@ -63893,20 +64556,20 @@
   "repo": "abicky/nodejs-repl.el",
   "unstable": {
    "version": [
-    20190616,
-    1753
+    20200223,
+    1449
    ],
-   "commit": "d43b8b276a90ccf980150a7d6fbb1f4d2a7cbe20",
-   "sha256": "1kkj888k9x5n0i7xkia177gzsa84my3g8n0n7v65281cc4f1yhk5"
+   "commit": "ed2052522d1770cc951863000f96165e0c42ec7b",
+   "sha256": "0a5mmg3cmdi73giblp07ksl06xzl9nb2m3f96ny4r3rv0ar3v1bx"
   },
   "stable": {
    "version": [
     0,
     2,
-    2
+    4
    ],
-   "commit": "0deb44e6c800daf061d9f8c07760b1e381382766",
-   "sha256": "1kkj888k9x5n0i7xkia177gzsa84my3g8n0n7v65281cc4f1yhk5"
+   "commit": "f5ce3d5b7b4e0d06f6e9d4930d9ecc417633586b",
+   "sha256": "0a5mmg3cmdi73giblp07ksl06xzl9nb2m3f96ny4r3rv0ar3v1bx"
   }
  },
  {
@@ -64019,14 +64682,25 @@
   "url": "https://git.sr.ht/~lthms/colorless-themes.el",
   "unstable": {
    "version": [
-    20190802,
-    725
+    20200213,
+    2057
    ],
    "deps": [
     "colorless-themes"
    ],
-   "commit": "12678144d17edf36d34e6bcdc5435593e191d96d",
-   "sha256": "0fld15h92193bnbmka3ikq27hggxvsikzlzq4pi2n3kknq9hyh56"
+   "commit": "a7b7c0a32b174988f40378996cd8997f73524f19",
+   "sha256": "0khsf4xz0wjn774hy08pxafm79j55ns28q25pfzyj9s07hi4r0vz"
+  },
+  "stable": {
+   "version": [
+    0,
+    2
+   ],
+   "deps": [
+    "colorless-themes"
+   ],
+   "commit": "8e539097185704444a5dd5545924de92c11ba767",
+   "sha256": "1p16vxai8dj1vy4ahflwij1ldx00jzrjcinpgpc7wgh6ka748v11"
   }
  },
  {
@@ -64067,11 +64741,11 @@
   "url": "https://git.notmuchmail.org/git/notmuch",
   "unstable": {
    "version": [
-    20191214,
-    1128
+    20200109,
+    114
    ],
-   "commit": "cedc6db19d2bb37ce0c8f74be25cdf045b35caca",
-   "sha256": "19siq81y03ngj3idc3g892fpg0qvhf1y40spmy8ffnzzliqysvcj"
+   "commit": "018ad3703ba46ea603854f51f8ff5ae86183cca0",
+   "sha256": "0vr17rhc74cf8k1n1snnfb82rzpsfc9xxcb8y2ydi0pbwd2h87r6"
   },
   "stable": {
    "version": [
@@ -64083,6 +64757,36 @@
    "sha256": "0w9k7jfhcp34inkqciisrjfgflrx8h5q4svfa6bij9p93g1hig0b"
   }
  },
+ {
+  "ename": "notmuch-bookmarks",
+  "commit": "dda2f16bfd15bebae67b51f04c068ffd032a42fb",
+  "sha256": "0ckl2hspjmk8gr2szh6xg1kv9vsnc2s0jjqymqvckpsl2g4n82p9",
+  "fetcher": "github",
+  "repo": "publicimageltd/notmuch-bookmarks",
+  "unstable": {
+   "version": [
+    20200105,
+    1041
+   ],
+   "deps": [
+    "notmuch",
+    "seq"
+   ],
+   "commit": "28a8e58521b50bfe0944f74eb2945521e03daad3",
+   "sha256": "0ma8rmxcq0xh1gskzyc8ay5681nidc340ghjryic3g30njidbiwd"
+  },
+  "stable": {
+   "version": [
+    0,
+    1
+   ],
+   "deps": [
+    "seq"
+   ],
+   "commit": "c0071310f01dd5296600bdc4d6135667d38ef0de",
+   "sha256": "0zg53b77g4s05dj3a7n3vxdvfwya6pzc0v86kqk0443m2y96vfwc"
+  }
+ },
  {
   "ename": "notmuch-labeler",
   "commit": "2e9940e66bbf70ec868dbdaaeaa1fbd4f076a2e1",
@@ -64120,15 +64824,15 @@
   "repo": "wasamasa/nov.el",
   "unstable": {
    "version": [
-    20190821,
-    1920
+    20200220,
+    939
    ],
    "deps": [
     "dash",
     "esxml"
    ],
-   "commit": "ecbdecc927a3b3f7e0927d225e6e6464c244c2ae",
-   "sha256": "0z6h3vgp0vawr96ni7814csdzkq7q710kya8raf9ii90fkzwhpi1"
+   "commit": "cd1b264b3f978a9285fa9297e40ad29d1434adf5",
+   "sha256": "02apbr5x9vdrx05mfs8qyp4ami1y30n8mmy4kpd4xw04nza9wxki"
   },
   "stable": {
    "version": [
@@ -64152,11 +64856,11 @@
   "repo": "muirmanders/emacs-nova-theme",
   "unstable": {
    "version": [
-    20191213,
-    2202
+    20200213,
+    102
    ],
-   "commit": "ff566133747cd3508f4d576234a1c3fcd3f8cf09",
-   "sha256": "0lpjbrnpxw0dxl34hlkn6lb1ddmwazi1l5201rwpf1yg512x176q"
+   "commit": "4553fabbcd340f3f2fa59dbfb6f3f32ecb016e6f",
+   "sha256": "0y0f7f03hikd5j20fc40g0hrp7aiwzna9rfwpxzlj10n8ijmygq9"
   }
  },
  {
@@ -64314,8 +65018,8 @@
     20191210,
     815
    ],
-   "commit": "54b590303626fcd53b017f92454ffe97c97ca69e",
-   "sha256": "1n0kjnx5xgd7x9zqrkgy8klydkv4ihxmn0gvprzsscp268rkrfnh"
+   "commit": "484ef531f67df358923dd5fef015233095928f8a",
+   "sha256": "10imnf6fq8bxbkzpnz47b55wjpf4mcr24ibnjrpy0z8rkf4i8gq3"
   }
  },
  {
@@ -64659,8 +65363,8 @@
    "deps": [
     "axiom-environment"
    ],
-   "commit": "3e7885d694efef923e7b53827d277c28bfa09320",
-   "sha256": "048x8mj72c57f62ffsad43mcrc201d8ilh339gnpm2yi8midv0ih"
+   "commit": "2c5384b994266008a20558db4ffe0525e66c0f5f",
+   "sha256": "17f40w9r4whz0v007pp13w060jq87ag42p21hcj93c14py5s4g67"
   }
  },
  {
@@ -64955,15 +65659,15 @@
   "repo": "jdormit/ob-graphql",
   "unstable": {
    "version": [
-    20191223,
-    1358
+    20200108,
+    2228
    ],
    "deps": [
     "graphql-mode",
     "request"
    ],
-   "commit": "c62d6a2ea2c162772d5e255715cff7b35fe660d5",
-   "sha256": "1s4rgr6v7xxpjr219a44309jg50iip5isch6x90zk5vig735c30h"
+   "commit": "ced37c6761d69e1ff206ff0ebd633f0e4fd2ac54",
+   "sha256": "0575w89sr97dv4ccygbhj4k7rpk2934q9f0p3q0hxf8a5wikf493"
   }
  },
  {
@@ -65205,14 +65909,14 @@
   "repo": "alf/ob-restclient.el",
   "unstable": {
    "version": [
-    20191119,
-    924
+    20200109,
+    730
    ],
    "deps": [
     "restclient"
    ],
-   "commit": "fa4ac671756c9d4e395bd481405239d06b202bae",
-   "sha256": "119rkz8dwrmxdsybkq3yhw6g4gral3xfqvdgbnl4i3w89j16wwcr"
+   "commit": "c5c22e603531dca48575d0a425fddff16dc0f391",
+   "sha256": "19fs6ms6rj75w4v7p7z0k2004gnb246nksv20mb8cqjnzkj0495s"
   }
  },
  {
@@ -65738,26 +66442,26 @@
   "repo": "oer/oer-reveal",
   "unstable": {
    "version": [
-    20200107,
-    851
+    20200124,
+    1310
    ],
    "deps": [
     "org-re-reveal"
    ],
-   "commit": "0e603b25ffa7dd2ea7935e7d9a5ad4c1f19e9d7e",
-   "sha256": "0ga6ii780bqpc5vj67s2avpg8hf4hszn5nfyvma9ir1prkskn0g6"
+   "commit": "64235b073c47baf7f1d7909706875c42a7f6da3d",
+   "sha256": "124f98q8bcd832wsdkmzm3rjmmhpqyf8z5ddx841j6p68ds8066r"
   },
   "stable": {
    "version": [
     2,
-    1,
-    1
+    2,
+    0
    ],
    "deps": [
     "org-re-reveal"
    ],
-   "commit": "0e603b25ffa7dd2ea7935e7d9a5ad4c1f19e9d7e",
-   "sha256": "0ga6ii780bqpc5vj67s2avpg8hf4hszn5nfyvma9ir1prkskn0g6"
+   "commit": "64235b073c47baf7f1d7909706875c42a7f6da3d",
+   "sha256": "124f98q8bcd832wsdkmzm3rjmmhpqyf8z5ddx841j6p68ds8066r"
   }
  },
  {
@@ -65820,20 +66524,20 @@
   "repo": "rnkn/olivetti",
   "unstable": {
    "version": [
-    20191217,
-    917
+    20200212,
+    1439
    ],
-   "commit": "6c7505f426c1bb55bb209e45ea69e9a3cd683be0",
-   "sha256": "0m65wc7jz3hvq8kspr3h9m0sf3klf8facf59q2k2xpjn33ab6dps"
+   "commit": "4b113151308c1214e8e70a7846558dad9c918859",
+   "sha256": "0cb06dy22897nx0wakar24frdhg5865icj25a2wb198br8r094ik"
   },
   "stable": {
    "version": [
     1,
-    8,
-    1
+    9,
+    2
    ],
-   "commit": "c7784fe2dccf676310a9a602b6eedc2a7b667499",
-   "sha256": "1fbj9s49y5yx5i429awv9rybacfgvhwp7v5h0zw67bpgx4qs44pa"
+   "commit": "4b113151308c1214e8e70a7846558dad9c918859",
+   "sha256": "0cb06dy22897nx0wakar24frdhg5865icj25a2wb198br8r094ik"
   }
  },
  {
@@ -66289,8 +66993,8 @@
     "request",
     "s"
    ],
-   "commit": "13499b7ae602c735e40c1c494bda6252a2f1c98f",
-   "sha256": "14vb47y5cq3j80aah8fjjf5aw343p9p7bhlxnpz5fr8r9a883dka"
+   "commit": "6819b6271960dcdc7c32981dadd48968a3640cef",
+   "sha256": "12frm9w6xh5rkfyvvvpwhdd55nlgsv8w4f52pch0sl437vidcsqg"
   },
   "stable": {
    "version": [
@@ -66370,11 +67074,11 @@
   "repo": "abo-abo/orca",
   "unstable": {
    "version": [
-    20191112,
-    1629
+    20200122,
+    1511
    ],
-   "commit": "6ecf211b56e4296898aa87eec8c6fed365a5d220",
-   "sha256": "15plspxxg18nch4q22ilc6pvmyrhnhfz18g7p6c9hmxkrlkvg43n"
+   "commit": "654f185861ed4fedfe1394db48a83639a0be57f6",
+   "sha256": "1dwps9zv1jnc7m75j5cdla14pnv2vnivm5bq0zcvqfsvilvd38ds"
   }
  },
  {
@@ -66675,15 +67379,15 @@
   "repo": "Kungsgeten/org-brain",
   "unstable": {
    "version": [
-    20200104,
-    2235
+    20200229,
+    2229
    ],
    "deps": [
     "org",
     "org-ql"
    ],
-   "commit": "5cfacc842842132894f6d8f4f0cb4ade8a9d657f",
-   "sha256": "07csazgchji964ch5yccfx6prrpdqpzk4hdjisx4qc8d3hjvhw78"
+   "commit": "6b7fced8015387efd03f28e53be47c3ca8907d7f",
+   "sha256": "01s8cjgxfl5pplswy80qgxisiv7p1kmbq28g3xx1qn2w7pfiyfwa"
   }
  },
  {
@@ -66781,14 +67485,14 @@
   "repo": "Chobbes/org-chef",
   "unstable": {
    "version": [
-    20191201,
-    1435
+    20200220,
+    2016
    ],
    "deps": [
     "org"
    ],
-   "commit": "a40ad1e5cda5a80faca255a344c14280b841ebbd",
-   "sha256": "1sr035jld69sv4yx787ci7rsll8z59q1s3gsmmmdkiab6sah09v6"
+   "commit": "61686fd87892e60268fc43348282abbfd879e5c9",
+   "sha256": "0n493p9dqx9bb6jcrb34s1rk8afwpz1fdgwrm64g7a0y2mbfga74"
   }
  },
  {
@@ -66814,15 +67518,15 @@
   "repo": "dfeich/org-clock-convenience",
   "unstable": {
    "version": [
-    20190130,
-    1610
+    20200123,
+    1029
    ],
    "deps": [
     "cl-lib",
     "org"
    ],
-   "commit": "7d14699a15ad6c5b9a63246a11188c77f8800e94",
-   "sha256": "05r6jgh8ys4ihpns7g64n4zbnvyy5fvndf9v7zinq2nk6grb393q"
+   "commit": "4e522706a90a504c75d377161005f9543575ea02",
+   "sha256": "08d0hv2shpbw01pjh8ks04avyl4zc0zcyqlmn4hbdhwjz7lzp8dv"
   }
  },
  {
@@ -66926,11 +67630,11 @@
   "repo": "thisirs/org-context",
   "unstable": {
    "version": [
-    20170107,
-    1337
+    20200217,
+    1006
    ],
-   "commit": "a3b4a4ce6d15e3c2d45eb5dcb78bea81913f3e21",
-   "sha256": "18swz38q8z1nga6l8f1l27b7ba3y5y3ikk0baplmich3hxav58xj"
+   "commit": "f354108ecd3d33cadee05a4aec95d2df4bc61ae9",
+   "sha256": "1zlqciqadhwkhmzlag7w0i83pn9gg0gikfcrv2qlr9nsn5rzzvj4"
   }
  },
  {
@@ -67049,14 +67753,14 @@
   "repo": "abo-abo/org-download",
   "unstable": {
    "version": [
-    20191219,
-    1227
+    20200211,
+    1541
    ],
    "deps": [
     "async"
    ],
-   "commit": "a367669384859261bcb11bac4b782f231f972353",
-   "sha256": "0yh1pfr3k04f98pywq54pgajhl3l1hy5x3marg0waqzgrbchr7yi"
+   "commit": "3c4810279334d487c76fb5e23e6e6cd098ccd6ac",
+   "sha256": "1xc98xbkrj56gp3njmbqnkvkigbgqjqfyiacrnqf9fkznwvjhrrp"
   },
   "stable": {
    "version": [
@@ -67107,16 +67811,30 @@
   "repo": "phillord/org-drill",
   "unstable": {
    "version": [
-    20191219,
-    2100
+    20200216,
+    1336
    ],
    "deps": [
     "org",
     "persist",
     "seq"
    ],
-   "commit": "d2fe915d7a6602b337d4413eec10baa1c1a10dff",
-   "sha256": "1d87z3fwr5p657fbl6h8gf3xw1znjcc12090y0lk1n88nfmwbckf"
+   "commit": "4c114489e682e514e79701045d541ab6f3dc3fb4",
+   "sha256": "13y302lyscdqrba1sfx60yf5ji2xi7fbsvjsjbw7hiz63kg6rccy"
+  },
+  "stable": {
+   "version": [
+    2,
+    7,
+    0
+   ],
+   "deps": [
+    "org",
+    "persist",
+    "seq"
+   ],
+   "commit": "4c114489e682e514e79701045d541ab6f3dc3fb4",
+   "sha256": "13y302lyscdqrba1sfx60yf5ji2xi7fbsvjsjbw7hiz63kg6rccy"
   }
  },
  {
@@ -67320,6 +68038,24 @@
    "sha256": "13cyzlx0415i953prq6ch7r5iy23c1pz116bdxi5yqags4igh4wv"
   }
  },
+ {
+  "ename": "org-fragtog",
+  "commit": "b1136eb881139e51588b6110b9f13544b469259a",
+  "sha256": "09zb72l6hsvwi5kgmrihjlagdqbcr6nwj9a4c32hp9xm14rpd75h",
+  "fetcher": "github",
+  "repo": "io12/org-fragtog",
+  "unstable": {
+   "version": [
+    20200215,
+    2217
+   ],
+   "deps": [
+    "org"
+   ],
+   "commit": "8eca8084cc025c43ce2677b38ed4919218dd9ad9",
+   "sha256": "0irr4l40djgmgvg41gx7kqza6zwi2mz69drq7dyrr10pz5hd0ikp"
+  }
+ },
  {
   "ename": "org-gcal",
   "commit": "d97c701819ea8deaa8a9664db1f391200ee52c4f",
@@ -67516,11 +68252,11 @@
   "repo": "bastibe/org-journal",
   "unstable": {
    "version": [
-    20200103,
-    1227
+    20200227,
+    1830
    ],
-   "commit": "11b8255d8839515895581450a090351d18770c99",
-   "sha256": "17mqbb3hddkinr9r7q5m4rp20hp97fbygp18rnx0j2vhc7jpc4g3"
+   "commit": "271b99f5ec4fa45fdf546713a9c3f55543e9cbb9",
+   "sha256": "1ayqxcfbs3mcygwjyx93lclpp1dhqaq35v7bl8739d59i0drsyhq"
   },
   "stable": {
    "version": [
@@ -67555,30 +68291,30 @@
   "repo": "gizmomogwai/org-kanban",
   "unstable": {
    "version": [
-    20191003,
-    1455
+    20200126,
+    1158
    ],
    "deps": [
     "dash",
     "org",
     "s"
    ],
-   "commit": "3007d636f0c7b69d767d7adcca4ab462708f9610",
-   "sha256": "0mqi85gfaq60dxvm5r7rn6mi479fk26dy0nmss7dnqxwm2s39414"
+   "commit": "4e352ca1a0b712fc92f656b4fe436a04c7033a20",
+   "sha256": "0smjn7jmg5w9nwjp0qadl0sx6r78ycaqm8y3a2wm6slmdad2p1jb"
   },
   "stable": {
    "version": [
     0,
     4,
-    21
+    23
    ],
    "deps": [
     "dash",
     "org",
     "s"
    ],
-   "commit": "3007d636f0c7b69d767d7adcca4ab462708f9610",
-   "sha256": "0mqi85gfaq60dxvm5r7rn6mi479fk26dy0nmss7dnqxwm2s39414"
+   "commit": "93f8135f2b7ae2d5ed807cb92954640796bbe273",
+   "sha256": "1wxc4y5swldqv3jqdz9gj1gx30r4xzis8g2m572bbsrdfjf04c26"
   }
  },
  {
@@ -67600,24 +68336,6 @@
    "sha256": "1h3pbjiy5v8lp3p6dry4jk3pvdp7hpkc517d3w9ldhz6nmaiccgg"
   }
  },
- {
-  "ename": "org-link-minor-mode",
-  "commit": "b1d2add7baf96c9a18671766d61c8aa028756796",
-  "sha256": "1akb670mzzhmldw2202x3k6b7vwfcn0rs55znpxsrc4iqihdgka3",
-  "fetcher": "github",
-  "repo": "seanohalpin/org-link-minor-mode",
-  "unstable": {
-   "version": [
-    20170805,
-    1852
-   ],
-   "deps": [
-    "org"
-   ],
-   "commit": "7b92df60f3fee7f609d649d80ef243b45771ebea",
-   "sha256": "1lz7qj57s391ssawmccvhgxv1w99fj1m9rg3g4pymdl3sgdcz4g4"
-  }
- },
  {
   "ename": "org-link-travis",
   "commit": "52c7f9539630e5ac7748fe36fd27c3486649ab74",
@@ -67648,38 +68366,6 @@
    "sha256": "1797pd264zn19zk93nifyw6pwk2a7wrpfir373qclk601yv2g5h8"
   }
  },
- {
-  "ename": "org-linkany",
-  "commit": "df82cf95e34775b22da0a8bb29750f603c58f259",
-  "sha256": "0arjj3c23yqm1ljvbnl7v9cqvd9lbz4381g8f3jyqbafs25bdc3c",
-  "fetcher": "github",
-  "repo": "aki2o/org-linkany",
-  "unstable": {
-   "version": [
-    20160207,
-    411
-   ],
-   "deps": [
-    "log4e",
-    "yaxception"
-   ],
-   "commit": "8cfe2f1a46e6654a79f56505349d1396263cecb3",
-   "sha256": "0lqxzmjxs80z3z90f66f3zfrdajiamdcwpvfv5j2w40js9xz4x37"
-  },
-  "stable": {
-   "version": [
-    0,
-    0,
-    2
-   ],
-   "deps": [
-    "log4e",
-    "yaxception"
-   ],
-   "commit": "ed4a6614b56c9baef31647ea728b3d5fae6ed3a2",
-   "sha256": "1bggz782ci0z6aw76v51ykbmfzh5g6cxh43w798as1152sn7im3p"
-  }
- },
  {
   "ename": "org-listcruncher",
   "commit": "5bed5078a3e56a825be61d158ca8321763b92f7c",
@@ -67725,30 +68411,29 @@
   "repo": "alphapapa/org-make-toc",
   "unstable": {
    "version": [
-    20200101,
-    305
+    20200110,
+    1804
    ],
    "deps": [
     "dash",
     "org",
     "s"
    ],
-   "commit": "f640826c8e66c83adb2b511f99f32525e9da94c0",
-   "sha256": "0n3gm2g2zyqnqnbizajmlvy3h3bhvazfjvw68vikdn6x9fcnvmdl"
+   "commit": "be86a4e026befd9d10af42a22b2483c7969ccee1",
+   "sha256": "0348iq3bc3rxs5bqdvskyly4agqxiapamqkfm0323620kxl70agw"
   },
   "stable": {
    "version": [
     0,
-    3,
-    1
+    4
    ],
    "deps": [
     "dash",
     "org",
     "s"
    ],
-   "commit": "e92fd443c998532ff786361ae72b6981dc1f2ff0",
-   "sha256": "03vgygni5f1qrmchwy0szks47hwhpl21qvk4wlwh2bd79rxnhc1f"
+   "commit": "be86a4e026befd9d10af42a22b2483c7969ccee1",
+   "sha256": "0348iq3bc3rxs5bqdvskyly4agqxiapamqkfm0323620kxl70agw"
   }
  },
  {
@@ -67826,11 +68511,11 @@
   "repo": "unhammer/org-mru-clock",
   "unstable": {
    "version": [
-    20191121,
-    840
+    20200128,
+    1208
    ],
-   "commit": "1ec07f8ce60b3eca281072e51f88065469450ab1",
-   "sha256": "1a2vp6bk5lgcgy95ynflql5hacr3ckmfh8nq36bkakqw97k7wih9"
+   "commit": "8f9f4f978a3c40adf2ff00eebb56bccfe4caf4e1",
+   "sha256": "0v0q3qzz6fwh0y9c9ci46284msr0x69jfki2ng89hpz8aab90bli"
   },
   "stable": {
    "version": [
@@ -67850,14 +68535,14 @@
   "repo": "jeremy-compostella/org-msg",
   "unstable": {
    "version": [
-    20191129,
-    2329
+    20200221,
+    25
    ],
    "deps": [
     "htmlize"
    ],
-   "commit": "a236211e4928610c56b5ee40ea401db60bc2845a",
-   "sha256": "04ngim6204pii0xpg6cfdzac1b4dfyy7lnp6zfb9mjajrf40fyr1"
+   "commit": "4278cf11735a2890e22acf6d34c632dd64a2e5a4",
+   "sha256": "1fyr5z441bncgnazwgbpfk5bd4k5p9nh525sfdxzw6w8s26i8pnw"
   }
  },
  {
@@ -68223,14 +68908,14 @@
   "repo": "rlister/org-present",
   "unstable": {
    "version": [
-    20180303,
-    2330
+    20200204,
+    1647
    ],
    "deps": [
     "org"
    ],
-   "commit": "d13acd70eff6a1608bc991920232146a0de76b21",
-   "sha256": "0jz8xiny3rv9ql0p623byz32pip1b82j2c2nyfz2wd114kiabb6q"
+   "commit": "9709ca2d04a59959354222ac4d3f8b750785739a",
+   "sha256": "08f8gh2zg4gr4d5ajlcnlj2lsp8nywni4mhw4w4nfa4dwyq7mxgv"
   }
  },
  {
@@ -68260,20 +68945,20 @@
   "repo": "marcowahl/org-pretty-tags",
   "unstable": {
    "version": [
-    20191120,
-    1343
+    20200124,
+    2002
    ],
-   "commit": "549fa6969660dcf0cf9bca5b7341d0cb48ec3b77",
-   "sha256": "12s74if74vw8q5awgrk0d1244ysfgb9kw3dxhypsccsbf413jmii"
+   "commit": "f52744ab69a9077450c84b80475147d7c435f4bb",
+   "sha256": "1nycdawb065c8cakmlfpcqpkyij0kv1c940mi49ps2k58nz4554x"
   },
   "stable": {
    "version": [
     0,
     2,
-    1
+    2
    ],
-   "commit": "8249601b6c75ac26254f3f12e38f5cb51e22bfdd",
-   "sha256": "0ws9b473b0dh8sp4qaj8v8p1qvfi0xxmgwnv1biydjwm50mzlran"
+   "commit": "549fa6969660dcf0cf9bca5b7341d0cb48ec3b77",
+   "sha256": "12s74if74vw8q5awgrk0d1244ysfgb9kw3dxhypsccsbf413jmii"
   }
  },
  {
@@ -68396,8 +69081,30 @@
   "repo": "alphapapa/org-ql",
   "unstable": {
    "version": [
-    20200103,
-    1257
+    20200228,
+    203
+   ],
+   "deps": [
+    "dash",
+    "dash-functional",
+    "f",
+    "map",
+    "org",
+    "org-super-agenda",
+    "ov",
+    "peg",
+    "s",
+    "transient",
+    "ts"
+   ],
+   "commit": "fc91bdd4836a026ae5b5df18ed133f85cf3ff138",
+   "sha256": "1li9x44zd63s4xvhhimvnq6nd995hyhdrzybcxhvyr1qbqgnga5i"
+  },
+  "stable": {
+   "version": [
+    0,
+    4,
+    1
    ],
    "deps": [
     "dash",
@@ -68410,27 +69117,8 @@
     "s",
     "ts"
    ],
-   "commit": "21c7dc15878f90eddee6375faf6b138d7784579c",
-   "sha256": "0qv4hysrgk34mzkfzmmqy1w8mbar768hcwjwbnz4pr15jq016d6d"
-  },
-  "stable": {
-   "version": [
-    0,
-    3,
-    2
-   ],
-   "deps": [
-    "dash",
-    "dash-functional",
-    "org",
-    "org-super-agenda",
-    "ov",
-    "peg",
-    "s",
-    "ts"
-   ],
-   "commit": "2274efce077c7cf8b2930a8bfb9980c251d8e737",
-   "sha256": "11bhpi2l28vp8mm9nx18jljbqdnh9vxpv9kp1dn9lpsgivcdbc34"
+   "commit": "32c68d7f249e1780a7e1a0b1155db3f36d535e1c",
+   "sha256": "0bw4568vx3swxc3khnnz28288h70z473pvw2m38ygjq7kyqnrq9b"
   }
  },
  {
@@ -68489,16 +69177,16 @@
   "repo": "mwfogleman/org-randomnote",
   "unstable": {
    "version": [
-    20190403,
-    1633
+    20200110,
+    1407
    ],
    "deps": [
     "dash",
     "f",
     "org"
    ],
-   "commit": "f35a9d948751ad409aa057bfb68f1d008fdf9442",
-   "sha256": "01nf3h5sg74lph1hjj7q77pxn6xxv4zq9cjnd97a7bfbpilq86a0"
+   "commit": "ea8cf4385970637efffff8f79e14576ba6d7ad13",
+   "sha256": "0q6xfwf35dy13hif3qrkqyhlwpmpcfsaw3lfwgv0dhi0g7h5bpry"
   }
  },
  {
@@ -68509,28 +69197,28 @@
   "repo": "oer/org-re-reveal",
   "unstable": {
    "version": [
-    20200107,
-    751
+    20200206,
+    712
    ],
    "deps": [
     "htmlize",
     "org"
    ],
-   "commit": "29bc467201220dbf5091fe2d32a2b237c744ff10",
-   "sha256": "17rz5z1gbwav2ihszl509vqmhpavg3abs6ggjk41v5v11szckyf8"
+   "commit": "14df7542f2a675f65501962e344e03d798cf0d39",
+   "sha256": "1mc01v257884pdsw37dghgddyyy6v6rd9cmnnpq45xvd5ibz1vaf"
   },
   "stable": {
    "version": [
     2,
     12,
-    0
+    1
    ],
    "deps": [
     "htmlize",
     "org"
    ],
-   "commit": "62f0868c4e9b098fb43b62b257bcd924779838c0",
-   "sha256": "0nbbynpgwmw85y90frbkna0s0sxxdhskpijnl41f9l6psll70mq4"
+   "commit": "14df7542f2a675f65501962e344e03d798cf0d39",
+   "sha256": "1mc01v257884pdsw37dghgddyyy6v6rd9cmnnpq45xvd5ibz1vaf"
   }
  },
  {
@@ -68560,8 +69248,8 @@
   "repo": "alphapapa/org-recent-headings",
   "unstable": {
    "version": [
-    20190909,
-    1618
+    20200228,
+    215
    ],
    "deps": [
     "dash",
@@ -68570,8 +69258,8 @@
     "org",
     "s"
    ],
-   "commit": "6430700dbe2ba34d852b36d56b3a879d71dabc9a",
-   "sha256": "0rl7f2dnwv90l7dnhgzaqnpmff0li366dmkiprjydxchkh1n7mic"
+   "commit": "bb9c96bea63a0ce8c0d18e8b8b4b24085d4c9d89",
+   "sha256": "15fa794drfz9vh9jms4ivayys3kf50nry8x06i8v76kn716klv49"
   },
   "stable": {
    "version": [
@@ -68628,8 +69316,8 @@
   "repo": "jkitchin/org-ref",
   "unstable": {
    "version": [
-    20200107,
-    1307
+    20200225,
+    246
    ],
    "deps": [
     "dash",
@@ -68643,8 +69331,8 @@
     "pdf-tools",
     "s"
    ],
-   "commit": "52cf11378b31b070111ed43fb59138146819f926",
-   "sha256": "0vcpy107znh1xvi121kd8rhqvhibwmspcqdyvy2h2xp0pd2xnhwx"
+   "commit": "caca18f8eeae213c2719e628949df70910f7d3c7",
+   "sha256": "0w31xjyyn2122c7n3s3rs64wgmhb82q49hqsy48m7ynkm9x9a0jq"
   },
   "stable": {
    "version": [
@@ -68699,14 +69387,26 @@
   "repo": "akirak/org-reverse-datetree",
   "unstable": {
    "version": [
-    20190914,
-    102
+    20200224,
+    548
    ],
    "deps": [
     "dash"
    ],
-   "commit": "7668fb561320bf01e73d98795eb6ad69f1e933ac",
-   "sha256": "1vw4996dj9j10b72vf9cya61h031bl2a4dsrqdg52v2j45bhk4dy"
+   "commit": "800e1094892be1b62087317bd7dbd6c2cdca07f2",
+   "sha256": "1rb9gc99jb1sbzc7hlc6yndaci1dfravjvnlix9wk9bix27g3vca"
+  },
+  "stable": {
+   "version": [
+    0,
+    3,
+    1
+   ],
+   "deps": [
+    "dash"
+   ],
+   "commit": "6fad8d248acfd32c7b2347223c9326351f8cefd4",
+   "sha256": "08kwbc630ijmz7nzypzm6bcr3yzij47rhb3ih1hgq6z5pm5cla6v"
   }
  },
  {
@@ -68774,16 +69474,16 @@
   "repo": "ianxm/emacs-scrum",
   "unstable": {
    "version": [
-    20200107,
-    1048
+    20200131,
+    1129
    ],
    "deps": [
     "cl-lib",
     "org",
     "seq"
    ],
-   "commit": "227de5157d9dea4fb52527d3a30a61969731a040",
-   "sha256": "1hh29gjj7d629g5mzcpvvh6jpsm7fz1vypiq8ppfmpi9jxflz631"
+   "commit": "8b5cd196bb37cebd1aa5b02ed189ad7dadd92078",
+   "sha256": "1bb9njb8wqw5vm1kl63jqql2q5fmms2v6rhvfywr75iiirakxqzz"
   }
  },
  {
@@ -68890,14 +69590,14 @@
   "repo": "ndwarshuis/org-sql",
   "unstable": {
    "version": [
-    20190621,
-    2111
+    20200217,
+    2130
    ],
    "deps": [
     "dash"
    ],
-   "commit": "e1bcfd7d648ce60bc2dd24b6e2144199af03563a",
-   "sha256": "0a0g60bbi3lfzj9gg0l0a068p8c8lqln4qcsf1rk879i70g365fv"
+   "commit": "9543ad58bc471abf09705d2615c50c1ead90c660",
+   "sha256": "18i4zhk955q13qvascvr8ag6pv2i9s14xfwl2061zjqarx89sxa1"
   }
  },
  {
@@ -68972,11 +69672,11 @@
   "repo": "bastibe/org-static-blog",
   "unstable": {
    "version": [
-    20191107,
-    805
+    20200117,
+    800
    ],
-   "commit": "6381b933853878eb0eac9404d9596ea59c5b1a1e",
-   "sha256": "15xrginwc7lhykwllsz68n8ms8zfg6sx63lm87f3f7aqf8hrsnig"
+   "commit": "5c19300d7634e94ae813b1b66abc716fbb1e5fc9",
+   "sha256": "1m7vmibjc6yk2npfrnnqd3g2099300r0q8mr8cvyivmk5ailbfrh"
   },
   "stable": {
    "version": [
@@ -69026,8 +69726,8 @@
   "repo": "alphapapa/org-super-agenda",
   "unstable": {
    "version": [
-    20200107,
-    1609
+    20200129,
+    16
    ],
    "deps": [
     "dash",
@@ -69036,8 +69736,8 @@
     "s",
     "ts"
    ],
-   "commit": "bd6f821e6e812ffe84cdf8d92cef7502f62355d7",
-   "sha256": "0r3lzlh9xw0zm0ycq7qkap60y204715vd80hbypcc2fpdqn6kmf4"
+   "commit": "ab9c335f9738853c52aae9b946f50e8b6c46a1e0",
+   "sha256": "1l1k7jbn1n1qp5q5h174sdwpqhh8l5zbg9flk1pwaxzq88103gy5"
   },
   "stable": {
    "version": [
@@ -69168,11 +69868,11 @@
   "repo": "mtekman/org-tanglesync.el",
   "unstable": {
    "version": [
-    20200107,
-    2134
+    20200127,
+    1616
    ],
-   "commit": "e17f64c6472ab2c90d1f32eae83b9fe0843fc028",
-   "sha256": "1sljzjgwgw654lijl20p82pr8pas8v64dmyjagm6cw9ss8p75vj1"
+   "commit": "af83a73ae542d5cb3c9d433cbf2ce1d4f4259117",
+   "sha256": "11rfn0byy0k0321w7fjgpa785ik1nrk1j6d0y4j0j4a8gys5hjr5"
   }
  },
  {
@@ -69397,11 +70097,11 @@
   "repo": "takaxp/org-tree-slide",
   "unstable": {
    "version": [
-    20190729,
-    1550
+    20200114,
+    2334
    ],
-   "commit": "036a36eec1cf712d3db155572aed325daa372eb5",
-   "sha256": "1r8ncx25xmxicgciyv5przp68y8qgy40fm10ba55awvql4xcm0yk"
+   "commit": "7bf09a02bd2d8f1ccfcb5209bfb18fbe02d1f44e",
+   "sha256": "1pzgb1z5k8zsbdqiaa7l94xlrncji1l09zqxvq62fyc0slxcf4ix"
   },
   "stable": {
    "version": [
@@ -69421,8 +70121,8 @@
   "repo": "org-trello/org-trello",
   "unstable": {
    "version": [
-    20190304,
-    900
+    20200130,
+    1748
    ],
    "deps": [
     "dash",
@@ -69431,8 +70131,8 @@
     "request-deferred",
     "s"
    ],
-   "commit": "94539558343ff109030e20ebba6a282af41a5eb9",
-   "sha256": "10pdr3pgshnbk2g3srn2ja5a1z37fxvjr4xz5r1zni109m8x98mp"
+   "commit": "e8e88239b5130307368f554b96fbf05ff4c207b5",
+   "sha256": "0kzvyv8rs0fsfbqsvgdjxlfa0qyi7wsdnfjw7c0hbwi25al39zm7"
   },
   "stable": {
    "version": [
@@ -69587,19 +70287,19 @@
   "repo": "marcIhm/org-working-set",
   "unstable": {
    "version": [
-    20191117,
-    1948
+    20200207,
+    2036
    ],
-   "commit": "ee4cec8bea3cc8fd8456108fc3c5e53a62b5553c",
-   "sha256": "0gcgs8flxy1dldj7hscvzs23gjnyvshj9p9mbdhlq7cggbxly26m"
+   "commit": "813c2e7af2ec1dacf037b1f971f070a4f784d2a5",
+   "sha256": "12dagcvcba3j74grijgibpskr3qc373m25xkp2p86ap81bg58zn8"
   },
   "stable": {
    "version": [
-    1,
-    1
+    2,
+    0
    ],
-   "commit": "ee4cec8bea3cc8fd8456108fc3c5e53a62b5553c",
-   "sha256": "0gcgs8flxy1dldj7hscvzs23gjnyvshj9p9mbdhlq7cggbxly26m"
+   "commit": "813c2e7af2ec1dacf037b1f971f070a4f784d2a5",
+   "sha256": "12dagcvcba3j74grijgibpskr3qc373m25xkp2p86ap81bg58zn8"
   }
  },
  {
@@ -69632,8 +70332,8 @@
   "repo": "org2blog/org2blog",
   "unstable": {
    "version": [
-    20191102,
-    28
+    20200301,
+    501
    ],
    "deps": [
     "htmlize",
@@ -69641,22 +70341,23 @@
     "metaweblog",
     "xml-rpc"
    ],
-   "commit": "58398120907504ff200adfd9b817f297142c9680",
-   "sha256": "0c8r9k803fc57ny56ny81s276r3m3y4cd7mxvwjmpz7ycivvg0v5"
+   "commit": "4fa095ff8416d1759ffd9cbd01d667cff386bbb5",
+   "sha256": "171fsvzk0msvz1052034g60prf40w6qdkglg560v73iika8x2k4s"
   },
   "stable": {
    "version": [
     1,
     1,
-    1
+    5
    ],
    "deps": [
     "htmlize",
     "hydra",
+    "metaweblog",
     "xml-rpc"
    ],
-   "commit": "3cad357cd5c0f7f949fc6c7aa42d76155d036e78",
-   "sha256": "136l0lm8lv7fgpzply241fngxfl3ck11raamqwislyv0nnjwdfdi"
+   "commit": "2e28cf362b7e4a8b6a5bbaf60983a72e19798c8b",
+   "sha256": "0lal6d4a4pbni1xl3g1gb3rnmyz2kym9r1mhb2n14awqqxxg7l3q"
   }
  },
  {
@@ -70078,14 +70779,14 @@
   "repo": "vyorkin/ormolu.el",
   "unstable": {
    "version": [
-    20191201,
-    1243
+    20200207,
+    2111
    ],
    "deps": [
     "reformatter"
    ],
-   "commit": "aa2c561e0e71584c1d8dc354d2dd1c541f226f57",
-   "sha256": "0vrp0yl3v3cmli8ryq8d1zf0q4kv4fd311gij1w6kb5mjdahqfvb"
+   "commit": "f6f2ea12ae158a400525857a82eb05bf2b7e88f3",
+   "sha256": "0v3ci5wyydpj14r2lvw7fn9yp7ra8nhz8z2c68521dydhblbry7b"
   }
  },
  {
@@ -70225,6 +70926,30 @@
    "sha256": "1rgykby1ysbapq53lnk9yy04r9q4qirnzs2abgvz7g2qjq5fyzag"
   }
  },
+ {
+  "ename": "osx-plist",
+  "commit": "3f536906e3272e1b377d1a192accbc80927e788f",
+  "sha256": "02m8sam2wi4lfwf1hm5xwal7n50nqvb1bv8k0sikh90yq56zympv",
+  "fetcher": "github",
+  "repo": "gonewest818/osx-plist",
+  "unstable": {
+   "version": [
+    20200212,
+    1724
+   ],
+   "commit": "7e717532c78a97eb77b79e2985cea0b201117ff8",
+   "sha256": "129874d3g5c1dim6gmx1fllx22rfjg4zdvgdmfpm37l1n8hyzccn"
+  },
+  "stable": {
+   "version": [
+    2,
+    0,
+    0
+   ],
+   "commit": "bbed74d334e8a4141c8f6ed07c8e42ee7979c35c",
+   "sha256": "0d4qb7by8b069mk98wd9n9qn9ibbc6gqchxvws8r8y1sqjv1ssv8"
+  }
+ },
  {
   "ename": "osx-pseudo-daemon",
   "commit": "6104efc035bcf469d133ab9a2caf42c9d4482334",
@@ -70233,19 +70958,19 @@
   "repo": "DarwinAwardWinner/mac-pseudo-daemon",
   "unstable": {
    "version": [
-    20170722,
-    607
+    20200215,
+    513
    ],
-   "commit": "d235680a72677f11925b912428ad1a57b664e3e8",
-   "sha256": "0gqknrwhfzr7cf5pgs33a5xh79y0yzxghs6wsvavvqkmf4cvck40"
+   "commit": "703ee41303dc251b7672b7cba5aeb6aa54a76c90",
+   "sha256": "0cplbz7mc2zrxfk8g349ahb7gzli2hn5kda9155nbk8dw74xmj7d"
   },
   "stable": {
    "version": [
     2,
-    1
+    2
    ],
-   "commit": "4d10e327cd8ee5bb7f006d68744be21c7097c1fc",
-   "sha256": "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2"
+   "commit": "564b006835facc4a8df247d8a47ab1030d7e7beb",
+   "sha256": "1ilqxl1851rg9v6ixi924xhzykc3c34f4nq1x0vyyq5b9m2fpb27"
   }
  },
  {
@@ -70474,11 +71199,11 @@
   "repo": "emacsorphanage/ov",
   "unstable": {
    "version": [
-    20191127,
-    32
+    20200124,
+    1842
    ],
-   "commit": "d1ae4d2a488e8ed99ab395e567bc00d21dd6c478",
-   "sha256": "0d8px0j9drviw02mx7zqkl5sgb9qa42dsczkqg02ggcbvhy6cm9g"
+   "commit": "3b246691d5b728ef1f0164f0cefffe00c9554e64",
+   "sha256": "10synkwxz6kqldx97pc52falr7h7khq97gck5fqidijwzmvs7jb2"
   },
   "stable": {
    "version": [
@@ -70711,25 +71436,25 @@
   "url": "https://git.sr.ht/~jakob/ox-haunt",
   "unstable": {
    "version": [
-    20190720,
-    2352
+    20200202,
+    229
    ],
    "deps": [
     "org"
    ],
-   "commit": "9d25ec4fc66fccbae23489abd4b9e8933c5b7dbd",
-   "sha256": "10kpz2qns0q92qh3hdwv1s8c9n4yb9iz9s7zas0h61rjqx22cz9n"
+   "commit": "f3c8fda6fee78f45a259e5d218a519dfd11c00c7",
+   "sha256": "1rs1n228c2fmpvirc57bqgf2616ijpphkgf4w9ln5j46snmkam25"
   },
   "stable": {
    "version": [
     0,
-    1
+    2
    ],
    "deps": [
     "org"
    ],
-   "commit": "9d25ec4fc66fccbae23489abd4b9e8933c5b7dbd",
-   "sha256": "10kpz2qns0q92qh3hdwv1s8c9n4yb9iz9s7zas0h61rjqx22cz9n"
+   "commit": "f3c8fda6fee78f45a259e5d218a519dfd11c00c7",
+   "sha256": "1rs1n228c2fmpvirc57bqgf2616ijpphkgf4w9ln5j46snmkam25"
   }
  },
  {
@@ -70758,14 +71483,14 @@
   "repo": "kaushalmodi/ox-hugo",
   "unstable": {
    "version": [
-    20191217,
-    1543
+    20200122,
+    2049
    ],
    "deps": [
     "org"
    ],
-   "commit": "d2892b3b5ea19f85063f2fba4a5b7ffa1123a395",
-   "sha256": "1z0y07y9m1svxiypfgcadsajfd728aksa1bmka5a7y9fsag3l4zh"
+   "commit": "16f1b0c9a9e01bdc3582284f570be5fd70004e03",
+   "sha256": "0z6cz93kcr7h3yag36m58mmncp6klyalqprj4ifpk9wj3802yyyi"
   },
   "stable": {
    "version": [
@@ -70854,14 +71579,14 @@
   "repo": "stig/ox-jira.el",
   "unstable": {
    "version": [
-    20171001,
-    916
+    20200218,
+    2301
    ],
    "deps": [
     "org"
    ],
-   "commit": "db2ec528f46c9e611624ba28611c440a99bff255",
-   "sha256": "04zz6359xkn4w7jmmadxyvjd8pw21gw12mqwch1l9yxc4m9q474l"
+   "commit": "00767df8ba024eb1ef09fe16c3aed30d729d6add",
+   "sha256": "0fbic43vzp0dp8wbx12cq22ca192v2jl2w131xcqmbhbww6j5xv2"
   }
  },
  {
@@ -70904,11 +71629,11 @@
   "repo": "linktohack/ox-latex-subfigure",
   "unstable": {
    "version": [
-    20191208,
-    1616
+    20200113,
+    1029
    ],
-   "commit": "b9e3ee8abd3b9f29e03f8b0b9cd6b4df134ca159",
-   "sha256": "09nv9anqldqlxqk71g40by1hch9jw7siilxgkc59hn9dn2ibbbq9"
+   "commit": "18bcee0c89c19da847f38660946a5b9343607cfb",
+   "sha256": "1hpwsx3cba6kk2n954h144pb1ba5yy46gcni8ikvsbqm8j17ragm"
   },
   "stable": {
    "version": [
@@ -71069,14 +71794,14 @@
   "repo": "yjwen/org-reveal",
   "unstable": {
    "version": [
-    20191127,
-    319
+    20200216,
+    1516
    ],
    "deps": [
     "org"
    ],
-   "commit": "a4c12432ec564187b8acd0814d5f66e45ea30e4d",
-   "sha256": "04rzrx9y4imnhg47rq16sqmhdwyl82w1fjylxm8s6p2s89ql1d7f"
+   "commit": "aafedfd8052d1ac4b0ddf946b3258a3b5ae5bbbe",
+   "sha256": "1hiidlagr7y3l22xwk4nd7m6c83j2vlhyijb0hmw89casfsdixbj"
   }
  },
  {
@@ -71123,15 +71848,15 @@
   "repo": "titaniumbones/ox-slack",
   "unstable": {
    "version": [
-    20181119,
-    1131
+    20200108,
+    1546
    ],
    "deps": [
     "org",
     "ox-gfm"
    ],
-   "commit": "96d90914e6df1a0141657fc51f1dc5bb8f1da6bd",
-   "sha256": "1cda5c35wm7aqyj7yj80wkwb79dgzlzis1dlpysdxv30ahcf4w8p"
+   "commit": "89cedb9da6ea08b78bc1fe77d6a39aa078172c1e",
+   "sha256": "0a97la3hwkb792a26c6byavwzg8gca6s0ccajd7pi9p430ys1i9y"
   }
  },
  {
@@ -71457,25 +72182,25 @@
   "repo": "melpa/package-build",
   "unstable": {
    "version": [
-    20191010,
-    616
+    20200125,
+    1707
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "f761c2ffeed0daba9c17ac7571c7b979b6ceed64",
-   "sha256": "05snrl5slkwp8c1vzfndrp132xbjk61a63vbllm77nbm9acibq41"
+   "commit": "f0ded6bf6532f475fdf62a62ef432604d6dddbe3",
+   "sha256": "0wg5xsj6x101ng0fxdzqbkf307igxr9vcja4gnhgcbrvkzsn7ydc"
   },
   "stable": {
    "version": [
     2,
-    3
+    4
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "385cd427ce15ca1715f3dd758b6aa408bf0186b1",
-   "sha256": "1412pjghyvzkdlsrrs0ql30vw591bhyk1wlbf49f15dzjbspx3w0"
+   "commit": "bc06686806d676658b5e962497770e47025c17f1",
+   "sha256": "1lm5mgvjhpxqfw5gcv99h4mwbq728b6f2hj5vjh1j67kdwy7ws8k"
   }
  },
  {
@@ -71501,27 +72226,27 @@
   "repo": "purcell/package-lint",
   "unstable": {
    "version": [
-    20191220,
-    419
+    20200226,
+    2001
    ],
    "deps": [
     "cl-lib",
     "let-alist"
    ],
-   "commit": "3b26941686700a7500ca4c68650e9235c823a410",
-   "sha256": "0qscdxa7jy32vdrkp1kmc5p5kgn27rqbpj68igw4q6581pk4mjil"
+   "commit": "78d0cdbe63d142801cbd046871353ae0455dad33",
+   "sha256": "0ghq8sg3jgidr1srdrl1cighsdvk314an3l2w56ak0ss99h6q28a"
   },
   "stable": {
    "version": [
     0,
-    11
+    12
    ],
    "deps": [
     "cl-lib",
     "let-alist"
    ],
-   "commit": "197684c60df4902e632aac1fb0f99e2e967dcf12",
-   "sha256": "1sxl3zf733iyw6k5d6hh4isr6gp1qlvhbp2q8jpzcby8gmvy6l3r"
+   "commit": "f86705d0d4ed81ea8ea14e00fe59714f11f7c2ba",
+   "sha256": "00inrfla7f824yh10rxlr0xq1cmyqigppsrfspd637d58239l6sw"
   }
  },
  {
@@ -71538,19 +72263,19 @@
    "deps": [
     "package-lint"
    ],
-   "commit": "3b26941686700a7500ca4c68650e9235c823a410",
-   "sha256": "0qscdxa7jy32vdrkp1kmc5p5kgn27rqbpj68igw4q6581pk4mjil"
+   "commit": "78d0cdbe63d142801cbd046871353ae0455dad33",
+   "sha256": "0ghq8sg3jgidr1srdrl1cighsdvk314an3l2w56ak0ss99h6q28a"
   },
   "stable": {
    "version": [
     0,
-    11
+    12
    ],
    "deps": [
     "package-lint"
    ],
-   "commit": "197684c60df4902e632aac1fb0f99e2e967dcf12",
-   "sha256": "1sxl3zf733iyw6k5d6hh4isr6gp1qlvhbp2q8jpzcby8gmvy6l3r"
+   "commit": "f86705d0d4ed81ea8ea14e00fe59714f11f7c2ba",
+   "sha256": "00inrfla7f824yh10rxlr0xq1cmyqigppsrfspd637d58239l6sw"
   }
  },
  {
@@ -71705,11 +72430,11 @@
   "repo": "purcell/page-break-lines",
   "unstable": {
    "version": [
-    20190519,
-    2238
+    20200121,
+    837
    ],
-   "commit": "2e1d274e11071bb8daea4d6f4c0369c84466de7a",
-   "sha256": "1w6ckbb8rmi65knwnapyjy9amzcikgw088c6d9h5gqzdknbfdrqc"
+   "commit": "6fb993a42059b58d1a0219006f2d61ebd3b2c9e6",
+   "sha256": "09crppxqc0d2bdr1pb7k24mhbax5ibdcgd1mw7ybvifakgvfwbkf"
   },
   "stable": {
    "version": [
@@ -71761,11 +72486,11 @@
   "repo": "danielsz/Palimpsest",
   "unstable": {
    "version": [
-    20170119,
-    2032
+    20200211,
+    641
    ],
-   "commit": "e6d5944393c260ceb724462c84046cc62c9ae916",
-   "sha256": "0vw3lv02rf8f9vm379zff4l85psjwxsrvba4xcpdkqi1w4rbsnxr"
+   "commit": "389ec5b4c5067fa903c543b7fe1d804f30b6ced5",
+   "sha256": "1yki1sl2m7fj4m52gmb768h2qkv0j93lmd72jv21n20bnzvjp73v"
   }
  },
  {
@@ -71812,16 +72537,16 @@
   "repo": "abo-abo/pamparam",
   "unstable": {
    "version": [
-    20190827,
-    1127
+    20200228,
+    1902
    ],
    "deps": [
     "hydra",
     "lispy",
     "worf"
    ],
-   "commit": "3690a3691da7792ed2f2270d1006632640182ae0",
-   "sha256": "1kn0ckfpr3s5yfkll7rn9mqg35jmplai2vafhrvnifhilf94dp7f"
+   "commit": "21ceadbf95cc49202e2704ba9704a5784230efd8",
+   "sha256": "0n7ia4fpp3lgdmf7m0q1lqqnkbpw24bdk1apjvacwjlpy4gsqy2z"
   }
  },
  {
@@ -71894,15 +72619,15 @@
   "repo": "joostkremers/pandoc-mode",
   "unstable": {
    "version": [
-    20191003,
-    1221
+    20200219,
+    2243
    ],
    "deps": [
     "dash",
     "hydra"
    ],
-   "commit": "f4f10a329acd354aa7dda52e7f7bc23ca28366d3",
-   "sha256": "1j4bawr7a4lfhy76nxsivxngs4w7l1xlifzx69hjn157qdhbqawn"
+   "commit": "7e417a670cff080650f2c1153dd9c50fc4ac8a48",
+   "sha256": "0jd2avxzidfac5nz9xk405jpb3rba9bq2cw6acdz7wj37lnxxnh7"
   },
   "stable": {
    "version": [
@@ -72020,20 +72745,23 @@
   "repo": "ajgrf/parchment",
   "unstable": {
    "version": [
-    20190703,
-    1531
+    20200221,
+    1702
    ],
-   "commit": "30eedd346175072e013b7bcf6ae1795f022fee0b",
-   "sha256": "01yiz4zkbmb95whgpg6n0mmjsi2fvnakvpg1cnx68k1nmd8waiv2"
+   "deps": [
+    "autothemer"
+   ],
+   "commit": "206dfc8e459971b0d5795ef5da4f1f737020eeab",
+   "sha256": "097vs3792054jczsk8jy6dhwqqlfvfgfshg3bhlzyiwzcd5x98dw"
   },
   "stable": {
    "version": [
     0,
-    2,
-    2
+    3,
+    0
    ],
-   "commit": "7d48ae9b39c37eeef7ab5bf7ee049d2edf0411a6",
-   "sha256": "071k34i48dsmlgpi8mpdff1fgcnz29dj2ci52c1i3alp9yc7s67a"
+   "commit": "b4dabed7939f8cf052c858ba29e295eee3f0ca13",
+   "sha256": "0361621f0xg786dvcw6xrfm9qkjr19cs8dkxgj8b5nq9isxyknh5"
   }
  },
  {
@@ -72210,8 +72938,8 @@
     20191015,
     2127
    ],
-   "commit": "13757524f1c708b866f4aaab5a9fb3599a1c4f56",
-   "sha256": "02anyi6mhw457pwsna3ycn1yxsavsmp6p96ffpwg1s7qidc44a4s"
+   "commit": "29265d118267e524453aaa9121c4eae213a63164",
+   "sha256": "04mpwsn16i00rbjyd3959kjyw1qn9xw9d9as6syhsfq5mzhwksni"
   },
   "stable": {
    "version": [
@@ -72278,11 +73006,11 @@
   "repo": "joostkremers/parsebib",
   "unstable": {
    "version": [
-    20181219,
-    928
+    20190126,
+    901
    ],
-   "commit": "9a5f1730b8ef1fb6c29262a8ba79f8136e5548d4",
-   "sha256": "1d9x57njgl16yyjmscmai5ml9wrqfh35ilcz2s674s8fa4krqw72"
+   "commit": "1357cb0e5916dfe63477d92f16c863a4c5e67b0e",
+   "sha256": "09b24j074dwawfm3b379m948f9pv859qsnrmz8k9qx97ls4jjmbw"
   },
   "stable": {
    "version": [
@@ -72855,8 +73583,8 @@
    "deps": [
     "eieio"
    ],
-   "commit": "1f8086077d770e524492e6fa59b07856e85a6fea",
-   "sha256": "09z5295f8051ag13ndq8rhxgg2m0gim45yfpjv4xkbmdcfkfinc2"
+   "commit": "1f31433ad0b37a2e68d60ee043a8188ef1ce3176",
+   "sha256": "1bk6rg9qaaasbng6m6mdkjbwdm68zkr7mfwj18l34ivlz0f05sxw"
   },
   "stable": {
    "version": [
@@ -73056,15 +73784,15 @@
   "repo": "politza/pdf-tools",
   "unstable": {
    "version": [
-    20191228,
-    1005
+    20200214,
+    536
    ],
    "deps": [
     "let-alist",
     "tablist"
    ],
-   "commit": "cc29d4c9c2d81fcb1255f7172fd5b9b7851d656c",
-   "sha256": "0833x6q048sym8jlc7fhi2ypsdc1vgiy5b6ijg4wgsnskg91nyva"
+   "commit": "0159cb1ab36f75879151e5ea24a6918ef58e50a3",
+   "sha256": "1ai8g6n3d40mcr2zx4h8ih3b1fxx6xzwbr0h3m8yh32vjj5qlwrp"
   },
   "stable": {
    "version": [
@@ -73105,11 +73833,11 @@
   "repo": "jeremy-compostella/pdfgrep",
   "unstable": {
    "version": [
-    20181007,
-    1728
+    20200124,
+    2236
    ],
-   "commit": "e251cd5c88a4ba5cb69008ba412d329f4d59e1d2",
-   "sha256": "0fy6h8ys490kw63l9jigsa0cf1psybyd9gcljpddnjd3nhkdwikw"
+   "commit": "e250376d97fc5240e07d81108bbca9b5a9ab50f4",
+   "sha256": "17yqvvgkgxmcl8nc0mb9yaz884zcdnz7dwvfi4mxjzp1l05fvwjk"
   }
  },
  {
@@ -73213,14 +73941,14 @@
   "repo": "sebasmonia/pepita",
   "unstable": {
    "version": [
-    20190907,
-    409
+    20200228,
+    2257
    ],
    "deps": [
     "csv"
    ],
-   "commit": "489ddc2675906f9dd27bd4ec69ef140e52194952",
-   "sha256": "1k77c7zz73j2vais62qbymk246fyc6nw4jd1abdx2c9jjp3sn94k"
+   "commit": "263d6d940d7e4203bbecda46dbaa89b7af1db54f",
+   "sha256": "1jw27asnfd48mx3mi9qiihvj2hgzpmk53xdq87ajq9nsx8m6x110"
   }
  },
  {
@@ -73403,20 +74131,20 @@
   "repo": "Bad-ptr/persp-mode.el",
   "unstable": {
    "version": [
-    20190511,
-    1402
+    20200222,
+    1106
    ],
-   "commit": "e330e6240bbb82589077f30472b05b95d1ff430d",
-   "sha256": "0gy0h9mrgig0d2gjs2z949ld1ccgfhmp0dfd8g33g2kxgzp7wnv2"
+   "commit": "391a7dc248c9c04b7ad424c696bdff578e14dd2c",
+   "sha256": "0b4y7a6j70s9lvr37riyy9k5kh3yvmx0m6nd9c0c8572ji4ij65g"
   },
   "stable": {
    "version": [
     2,
     9,
-    6
+    8
    ],
-   "commit": "1dfea0de788f6d25ee47b5c62ddbeaf9e8e92f06",
-   "sha256": "11ww8hg9p8qlmr8zpir0m5xzzbvd1faiqjx6vn4b05d4ll03rnhm"
+   "commit": "391a7dc248c9c04b7ad424c696bdff578e14dd2c",
+   "sha256": "0b4y7a6j70s9lvr37riyy9k5kh3yvmx0m6nd9c0c8572ji4ij65g"
   }
  },
  {
@@ -73481,14 +74209,14 @@
   "repo": "nex3/perspective-el",
   "unstable": {
    "version": [
-    20191211,
-    401
+    20200224,
+    2013
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "f5d0424440656834540534d4074cca2f607bc8ae",
-   "sha256": "10bhq654ripqhnankxscgjrc0ihrw6xfifxv5yqrxb1wdjyzjb4k"
+   "commit": "d415c154fa59f1a85c4f2812d21ba29bb39677b8",
+   "sha256": "07ncr5jmn5lrmxdc0c6dw92cqkasc8yivjn9q4ri0wy08zfh298i"
   },
   "stable": {
    "version": [
@@ -73536,19 +74264,19 @@
   "repo": "Alexander-Miller/pfuture",
   "unstable": {
    "version": [
-    20190505,
-    1006
+    20200113,
+    620
    ],
-   "commit": "368254ee30692c709400db413c347e18e76a8a55",
-   "sha256": "096raqpjx84njws85r7pqq1wi9w9bjwkr0ga1mbbhlna1mfn3mg4"
+   "commit": "fbecd1562b34fcd15563b7cc00d98e5af0d7e43d",
+   "sha256": "1imqavzc0isba3yh128jzsy27x2983sjiqkf6q2xw43mbjknl8dy"
   },
   "stable": {
    "version": [
     1,
-    7
+    8
    ],
-   "commit": "263227534e8bb98aedce18698c34db9fd4d6500b",
-   "sha256": "13r1f741rk5k35s413iyh1kng20zmp29qr4bzlxg8wjl7d8q6da2"
+   "commit": "fbecd1562b34fcd15563b7cc00d98e5af0d7e43d",
+   "sha256": "1imqavzc0isba3yh128jzsy27x2983sjiqkf6q2xw43mbjknl8dy"
   }
  },
  {
@@ -73950,11 +74678,11 @@
   "repo": "emacs-php/php-mode",
   "unstable": {
    "version": [
-    20200104,
-    21
+    20200301,
+    1404
    ],
-   "commit": "167b35749dbf700543d4a540d098c015af58df2b",
-   "sha256": "1zmk5qrw5af6bv19914xifcbkiqd3vdifzimhmy84rgl9gw78fi2"
+   "commit": "547a31d71991e7bb1d9e5d1ce45b6be6e5740058",
+   "sha256": "1iwbh8cc3a5ayq1r6lv8jkx5hfa4yfz1rgzmvb2s08si9q3y5wna"
   },
   "stable": {
    "version": [
@@ -74042,8 +74770,8 @@
   "repo": "emacs-php/phpactor.el",
   "unstable": {
    "version": [
-    20191207,
-    2030
+    20200121,
+    1218
    ],
    "deps": [
     "async",
@@ -74052,8 +74780,8 @@
     "f",
     "php-runtime"
    ],
-   "commit": "b69f2d9b2490c26c782d327344a54c19b5142cb3",
-   "sha256": "0pkby33g4ih6mssndcv2d59b1xkisw64p14fn131d6cqfwqvcwjn"
+   "commit": "5ccf65d59e6bbc9cd958dd5988e8fd2143b0d57f",
+   "sha256": "0k4dzn4a5y4kq7yz3ifvzziv90rp5si380c5ypgxr5iwb1b8a0l3"
   },
   "stable": {
    "version": [
@@ -74107,20 +74835,20 @@
   "repo": "emacs-php/phpstan.el",
   "unstable": {
    "version": [
-    20190929,
-    612
+    20200122,
+    1256
    ],
-   "commit": "81bcfa59d1e5708239d8c32d99cd84405449fb64",
-   "sha256": "1m4vk7v3aafj64qqs0aa9m1w8fbjziq0l6c9k4n10yr8dnm5j9aw"
+   "commit": "6744215d82ce9e82416d83e5b27fb9bac9e8d461",
+   "sha256": "0hbm881w84nm4g67085xzikz422vkb08y98hfk2n3kqmznvp8i51"
   },
   "stable": {
    "version": [
     0,
     3,
-    2
+    3
    ],
-   "commit": "de74ebfcbce53a08daf95d324d7447dede094222",
-   "sha256": "01x5gf7z0iqx601z3g4cdq6cv27aflxw5kmqrwrj0aijcb7nb9c6"
+   "commit": "535e172e1c561bc7b8c706b4e03bbf71689bd83a",
+   "sha256": "1hn1rdgymv81rm8nkibnc5jazgjrx3sz4w1lin85rgypzbfaf6wk"
   }
  },
  {
@@ -74328,8 +75056,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "e14dd43cf74f254a898ae1c698a97d58734fc1a8",
-   "sha256": "0ljxvp9yppnmy1lnnipqqbk09bmay523haa8h0gnfnrl02jwgs91"
+   "commit": "9351a2320f1e75896f56032959c7bcbf9d9aa560",
+   "sha256": "080fzpr7is05cb8fj0rzhfc8pmb1rwfmkqnydj36d56da1ndrfmw"
   },
   "stable": {
    "version": [
@@ -74564,21 +75292,6 @@
    "sha256": "1amqjm6kn1xda058kdwq3xgk7raz6y9iw0mzrac78sgf57qaczyb"
   }
  },
- {
-  "ename": "pivotal-tracker",
-  "commit": "855ea20024b606314f8590129259747cac0bcc97",
-  "sha256": "0yiyz11sd25ybgr2qmg62qqmcz96va1pq3q866cqmpl38xn7znpj",
-  "fetcher": "github",
-  "repo": "jxa/pivotal-tracker",
-  "unstable": {
-   "version": [
-    20170720,
-    1516
-   ],
-   "commit": "0311d117037c74512149a4a78b269c2e46d7dfba",
-   "sha256": "0g3xzh8jr9lbg6h2hk81cdyxkxx3l79qhxrp4g34rc0dml79rzf9"
-  }
- },
  {
   "ename": "pixie-mode",
   "commit": "a57300bfdae57c9996db0411d56a5fc7b35778c3",
@@ -75277,15 +75990,15 @@
   "repo": "galaunay/poetry.el",
   "unstable": {
    "version": [
-    20191022,
-    938
+    20200112,
+    2309
    ],
    "deps": [
     "pyvenv",
     "transient"
    ],
-   "commit": "3f9ac720b423f087797b9e345b575275f2dcd740",
-   "sha256": "0gs8jpihqckijbm5w300mdm5jl4f9j754fkv5mj1ghj78q6bjmmp"
+   "commit": "01da45f478c8ace3dea5088746873ac2d7c23dbb",
+   "sha256": "08x1q54pnb3hh4a2wbmghffl5cnq99sf280qdbgc65vqhdkj8r1z"
   },
   "stable": {
    "version": [
@@ -75369,8 +76082,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "9673c72c5f38ab1196f17e694ed48b4ceb1b13be",
-   "sha256": "0mfz1x80zsjhq1870h7q4s2cncvh6jllci022fb9bllw4mrzh9a5"
+   "commit": "d0a33591498013886c2c4676e204cd684954e82a",
+   "sha256": "0lg65hzdjwbc3dav79f3jm7251yyq8ghcbccvkb32vwz281xhjnh"
   }
  },
  {
@@ -75994,39 +76707,39 @@
   "repo": "kostafey/popup-switcher",
   "unstable": {
    "version": [
-    20191231,
-    1631
+    20200201,
+    1913
    ],
    "deps": [
     "cl-lib",
     "popup"
    ],
-   "commit": "e66769ea72f1fd38c2ba3cff505da334e2b26b45",
-   "sha256": "0b2w12cqpd7ms47x788x8qd1h5mkp73v62dxiz4kyzz70pk65szb"
+   "commit": "e275ec35de3b9cdedf0d6b2a4a78e91c605381be",
+   "sha256": "1zm6zk7c2i7gmn5am2d7090j1a71vbis8lbrzrbxdx53q6sklgi7"
   }
  },
  {
   "ename": "popwin",
-  "commit": "2b3d6a8b734e0820fd904c215a83fe5519496dc3",
-  "sha256": "1zp54nv8rh0b3g8y5aj4793miiw2r1ijwbzq31lkwmbdr09mixmf",
+  "commit": "7856a62fb86415c88aa72b574895328c93c10a09",
+  "sha256": "0zkaaj80ymssscj8iknndc3p6ydg1l32s2l63kqiy9kc46r2r5fz",
   "fetcher": "github",
-  "repo": "m2ym/popwin-el",
+  "repo": "emacsorphanage/popwin",
   "unstable": {
    "version": [
-    20150315,
-    1300
+    20200122,
+    1440
    ],
-   "commit": "95dea14c60019d6cccf9a3b33e0dec4e1f22c304",
-   "sha256": "0nips9npm4zmz3f37vvb4s0g1ci0p9cl6w0z4sc6agg4rybjhpdp"
+   "commit": "d69dca5c9ec4b08f5268ff2d6b5097618d4082d7",
+   "sha256": "1w2dmzmy8k4drdhjzkryk6nbkl56aizvyawwn3dyc2gr0vg8lbb4"
   },
   "stable": {
    "version": [
     1,
     0,
-    0
+    1
    ],
-   "commit": "95dea14c60019d6cccf9a3b33e0dec4e1f22c304",
-   "sha256": "0nips9npm4zmz3f37vvb4s0g1ci0p9cl6w0z4sc6agg4rybjhpdp"
+   "commit": "4052b6e51bc6cc80cfc86007d2cadbbc4bbd55b5",
+   "sha256": "0kdlpjrf1xqyqyzfdymbin34jgs06l465p2ggpj4bb4zaypw2hr5"
   }
  },
  {
@@ -76114,20 +76827,35 @@
   "repo": "tumashu/posframe",
   "unstable": {
    "version": [
-    20191219,
-    57
+    20200226,
+    241
    ],
-   "commit": "913b90dee7de5b6cb7e0791ca2b1dddeec5da38d",
-   "sha256": "1mbpwih6l2ixllv82i5gwzihc7lllqwlfiii4cwvr72ryyvy01ld"
+   "commit": "8a9af547e6fc63e9a1c4741349fabdf625f703c4",
+   "sha256": "03n5sbyh0acrmpwc69d834lrxxfybxgjn0lg7iphwfdv11xkf3g4"
   },
   "stable": {
    "version": [
     0,
-    5,
+    6,
     0
    ],
-   "commit": "fc90a1a558200e5c3688c65add9afdea695a2c10",
-   "sha256": "1fhjxj7gi2pj5rdnmf0gddiwd8iifgjgjp01c01npz1gwwixyqh3"
+   "commit": "9638b9d9cf8b9727a13c86f70b5d33bf938497a5",
+   "sha256": "12r1as9lqqc6anckq455dqv8dbqahnbdzj437i11053wv33cv5vd"
+  }
+ },
+ {
+  "ename": "posix-manual",
+  "commit": "5322048b88381fa4ec49fcd14bb749144d29585c",
+  "sha256": "1bmjy3gxr4k6yy18rj7pc8b7ziw2ynfily7siqcb59r9rygx6m9l",
+  "fetcher": "github",
+  "repo": "lassik/emacs-posix-manual",
+  "unstable": {
+   "version": [
+    20200301,
+    1103
+   ],
+   "commit": "ebaacd7266ae7a66605317f57b9f42e9cfb2ce1e",
+   "sha256": "0kdcpd59jd1gasqk5gx4ggbyp492b53dy6n3nkv9j2rj8618yzs6"
   }
  },
  {
@@ -76309,11 +77037,11 @@
   "repo": "conao3/ppp.el",
   "unstable": {
    "version": [
-    20200102,
-    929
+    20200224,
+    1320
    ],
-   "commit": "345cc3c2b4e6166cc67231aee0962bca89e227d7",
-   "sha256": "0g6c5s82babc2khsvf2p5ljp4spx0zifnnyj4b8f3mqr1mahzqj2"
+   "commit": "a4eaec44216b189108164b42381abf35d0031200",
+   "sha256": "1gvzgx9nq6gqdgb5m6pdp14w96fd6j7b9bgc0pric0aw04i2bzp6"
   },
   "stable": {
    "version": [
@@ -76559,14 +77287,25 @@
   "repo": "alphapapa/prism.el",
   "unstable": {
    "version": [
-    20190908,
-    1820
+    20200301,
+    1139
    ],
    "deps": [
     "dash"
    ],
-   "commit": "49c8b97b286c7403bf239645964416200ea82dd5",
-   "sha256": "0dcy032g4jc027mwq8dfadsc05bsi1k6yiab3rpdxwc17c9pg9x8"
+   "commit": "5782653a7e58fa2ba26feb3c1ea34a81761da7b0",
+   "sha256": "0cdqgnrqmwk4wm8xc3kppm8zvccv2qalckfi4k1w847s91q60zv5"
+  },
+  "stable": {
+   "version": [
+    0,
+    1
+   ],
+   "deps": [
+    "dash"
+   ],
+   "commit": "682034ff5f3fd62bd24eee1873a2c68498e8b7d3",
+   "sha256": "1bzqqvyraj5h4flzmhxbjgaw98wgqd21hmjq1jg4j3yxwg8cbrw9"
   }
  },
  {
@@ -76961,26 +77700,26 @@
   "repo": "bbatsov/projectile",
   "unstable": {
    "version": [
-    20191216,
-    2105
+    20200206,
+    1749
    ],
    "deps": [
     "pkg-info"
    ],
-   "commit": "1e7b37f0ae07a6b4ac1b1a5f0e5422cfcb8e1c55",
-   "sha256": "16shvynx98r34wanbmphlw090iiydjnhgiqcz5xn8zhl0giljmza"
+   "commit": "341150c0e77c63075f53e346dae87a4c60ea3b5b",
+   "sha256": "1kywmyckgf8swjbnzc2vcbpsqhrdnxcqaxwwwxwdkapy640nnslv"
   },
   "stable": {
    "version": [
     2,
-    0,
+    1,
     0
    ],
    "deps": [
     "pkg-info"
    ],
-   "commit": "823c0aa9ffd1e8e03b20efe97c16cfb66e2c56c5",
-   "sha256": "16y0zcqydfag4igwcbljqymkwjgjxdh97ii616wgdsyjgk9xxd4h"
+   "commit": "34b2665023f9a29ebd2a415bfb8091db3c804d46",
+   "sha256": "16p79m8mkrlczx4b5v28nnlcd1ny49861lax28r7cb9ps9jhdz7d"
   }
  },
  {
@@ -77082,8 +77821,8 @@
   "repo": "asok/projectile-rails",
   "unstable": {
    "version": [
-    20191226,
-    2100
+    20200203,
+    1226
    ],
    "deps": [
     "f",
@@ -77092,14 +77831,14 @@
     "projectile",
     "rake"
    ],
-   "commit": "411f8a4ab54f58a27b8f1f0cbd2f68f3fb4ee216",
-   "sha256": "0194lp2fdw2dik9gvbdvsllqg32fwdhwmcrdwv0q09b2x2hwfqkn"
+   "commit": "0398d940a201128946f619de842b0d1f9f0fffbd",
+   "sha256": "0cfrm56bxdwb96xqpdih6hqh61gvc1wal4yp7d7c414j8h0s7d02"
   },
   "stable": {
    "version": [
     0,
-    19,
-    1
+    20,
+    0
    ],
    "deps": [
     "f",
@@ -77108,8 +77847,8 @@
     "projectile",
     "rake"
    ],
-   "commit": "85c5bfef22a0ba95ffc65320b53462077531be49",
-   "sha256": "1kzb1mr19zsn87rjbfxsvxp5ss9q7z97jk8nzysb13yrpb4f3d7l"
+   "commit": "228f6316f2da229bc82fbbcf52323da951a17871",
+   "sha256": "1l9l0hza6p1l750i7lvys6gnrdy2j0dmlg6nbb6zr2cq6jbf1lkd"
   }
  },
  {
@@ -77333,14 +78072,19 @@
   "repo": "chuntaro/emacs-promise",
   "unstable": {
    "version": [
-    20200106,
-    619
+    20200209,
+    616
    ],
-   "deps": [
-    "async"
+   "commit": "c45b4e09d796385823cfb42ab15a4e67feb01b77",
+   "sha256": "1crhny97p6yz3z2lb1m43334vsprdiz3sb79jp7czyxskkwqn86r"
+  },
+  "stable": {
+   "version": [
+    1,
+    1
    ],
-   "commit": "4e764a50e0c3bb87193ea7bbd7f5c67f10e80d54",
-   "sha256": "01fbs2d7dkhamb690jnx6vw1c7qzgiibxzxsbyzpqcflaaga0wn8"
+   "commit": "53e1dfe9a8bd613fdfa31944e5259dcdd3a29e12",
+   "sha256": "1xb34zdbwjvahfhycjphdkm925kgd22dr298c57hwxza4ljc2hxj"
   }
  },
  {
@@ -77385,6 +78129,21 @@
    "sha256": "10y8x54p64zs1jlq4nf1kixpb42078n2gdf9s62b1siyb1vhl581"
   }
  },
+ {
+  "ename": "pronto",
+  "commit": "b0de92782a7305aee5a803607f9db0fe8b8e988e",
+  "sha256": "0vkas9h45i029wx04wsvm72dlhhq46vdx9y20c2rkq4n9ny94hr3",
+  "fetcher": "github",
+  "repo": "julianrubisch/pronto.el",
+  "unstable": {
+   "version": [
+    20200218,
+    1633
+   ],
+   "commit": "c2a2ec718c08de1fd2e681970456786cf4eac8fe",
+   "sha256": "1xgkl263iyrdin6mdlmvswr411qyciskasa2jbqi84ffiw83313m"
+  }
+ },
  {
   "ename": "proof-general",
   "commit": "135c8f2a04739145b500b8742a697907e398d270",
@@ -77393,11 +78152,11 @@
   "repo": "ProofGeneral/PG",
   "unstable": {
    "version": [
-    20191209,
-    2031
+    20200206,
+    1448
    ],
-   "commit": "cf904b955056f16e46d1541b3ffb1ca1533c936d",
-   "sha256": "0yfpnihhfvkwdza98szwa4m5nlgn907q3v22x8pim2c0nrc0z9xp"
+   "commit": "2a17093f6a7b168fedabc623602edec35aef8d8a",
+   "sha256": "0pm7hv3c88mpmbi3xsmlqqffxvphnh2cslm2rpqbgffk5kp98ach"
   },
   "stable": {
    "version": [
@@ -77464,11 +78223,11 @@
   "repo": "ksjogo/proportional",
   "unstable": {
    "version": [
-    20190806,
-    1901
+    20200206,
+    1211
    ],
-   "commit": "f600b7ed2ab19a3072adad3f47048a5bbdb82703",
-   "sha256": "03vyyi5n5rq2hcd5yz7yirsnrgs6cin2y8xhly5skqsv60zs15p1"
+   "commit": "4c20c876b93b9b5d82931dabb42396d5ff471f50",
+   "sha256": "1sck0kjzlr5rcbclj9whrwz7lxik7is9av7ai720hzrlv0yvqgmq"
   }
  },
  {
@@ -77500,17 +78259,17 @@
     20170526,
     1650
    ],
-   "commit": "3214d0b0b20f98a2e3172ceab2d2c55a8ffd344c",
-   "sha256": "19sr6p9a86lcsqpjxz75k6l9qc5c4iwcbdzpi2ci57l0jdsw0l3n"
+   "commit": "4ff0fb841cfb8c6850613094d55bf51448dfd16b",
+   "sha256": "15wlrzz93wfpk7fkpl3n1vqvrlj8swxg9zjflja4dgn7sgy9f5bv"
   },
   "stable": {
    "version": [
     3,
     11,
-    2
+    4
    ],
-   "commit": "fe1790ca0df67173702f70d5646b82f48f412b99",
-   "sha256": "0j456a42k27khpa4g8mm0xh3zymhhypqdy4gdiqrw6wv3z2r66s5"
+   "commit": "d0bfd5221182da1a7cc280f3337b5e41a89539cf",
+   "sha256": "00g61f1yd8z5l0z0svmr3hms38ph35lcx2y7hivw6fahslw0l8yw"
   }
  },
  {
@@ -77550,11 +78309,11 @@
   "repo": "stardiviner/proxy-mode",
   "unstable": {
    "version": [
-    20190130,
-    8
+    20200131,
+    816
    ],
-   "commit": "a6c55e97dbe4ec4df9dc21d234cabe806dce3a29",
-   "sha256": "13xa19k0xyqq03ypih0lrkm97l2c5zha8mwl264h9vamn81i8vm2"
+   "commit": "e9b2a4bb032aaf13b006b74eec309a9bf2249cf0",
+   "sha256": "1wmj3ahjj1g7sx36fda6fhicvmxkm8qm64zqdk3qqj808jik1pry"
   }
  },
  {
@@ -77712,8 +78471,8 @@
   "repo": "fvdbeek/emacs-pubmed",
   "unstable": {
    "version": [
-    20191219,
-    2321
+    20200221,
+    1013
    ],
    "deps": [
     "deferred",
@@ -77721,14 +78480,14 @@
     "s",
     "unidecode"
    ],
-   "commit": "9ab55cfd8bf243cb43cd4d68dd157bcb846940f6",
-   "sha256": "0x0sy2bkgs1gwl6rgrxp6jwhmk6jybz0irxh10zjzlx3wqzyzm84"
+   "commit": "de005c16750dfd925cd528b265fea133bb1cf342",
+   "sha256": "00fbks0f8kcmsazncrpkmi7w0ygd9ph1js6z1dwbdkjzwb161xv7"
   },
   "stable": {
    "version": [
     0,
     3,
-    1
+    3
    ],
    "deps": [
     "deferred",
@@ -77736,8 +78495,8 @@
     "s",
     "unidecode"
    ],
-   "commit": "a220f446e9b075a4f1b2ab4fc532e850b27083a4",
-   "sha256": "1qs3n7d47sn00406r4f2z1jfwnmyrzf53wa93jp6xq1c3hg220fd"
+   "commit": "de005c16750dfd925cd528b265fea133bb1cf342",
+   "sha256": "00fbks0f8kcmsazncrpkmi7w0ygd9ph1js6z1dwbdkjzwb161xv7"
   }
  },
  {
@@ -78324,8 +79083,8 @@
   "repo": "tumashu/pyim",
   "unstable": {
    "version": [
-    20200103,
-    558
+    20200228,
+    645
    ],
    "deps": [
     "async",
@@ -78333,8 +79092,8 @@
     "pyim-basedict",
     "xr"
    ],
-   "commit": "03b06703a42fe1feb3e1ef8f024db3625c8c125f",
-   "sha256": "01mn59cc81wbx45savskxx369j6amh6rl2fyn3ppp7zdsyf8sxqx"
+   "commit": "99e04546a5cc05b17866f83a7dd26163e3d7ee59",
+   "sha256": "0hx7qph91jxzip9n0xqfx2zc2f9mwmgkgp8jrj943dindcrbrfy0"
   },
   "stable": {
    "version": [
@@ -78479,8 +79238,8 @@
     20170402,
     1255
    ],
-   "commit": "b3d52631ea19328ab3ff5b2a12c280bc4e63ccaa",
-   "sha256": "06zy9k8zd48x0shcp8mb2274n1nigxwwapw5yrjkkh5mp21fbpv4"
+   "commit": "fb38afb55a6f27f17c113589c406b527dfa5c332",
+   "sha256": "04n9qyi1gnr6wfk6k2q8q6f0zz02lg9v9bbwrvr6jj976vaz4mfa"
   }
  },
  {
@@ -78533,8 +79292,20 @@
     "pythonic",
     "tablist"
    ],
-   "commit": "05697e881a8b57c4f183344c42ae36662b180663",
-   "sha256": "148dhzpjv5ykakxdyp0fcxjbqjvf4r6sv8jq9jlyqk2q1nxz45fr"
+   "commit": "f0687b8aee3e685b55e2c66b16211e02ac5f9d94",
+   "sha256": "18kqqdk7yifcjmn11jgsqxvzr6izcgify1d8gm504sxw2qqc3q0i"
+  },
+  "stable": {
+   "version": [
+    0,
+    1
+   ],
+   "deps": [
+    "pythonic",
+    "tablist"
+   ],
+   "commit": "59d7ec03dcb1968160ac1dfe3c979cc83fe0fe4b",
+   "sha256": "132l0sf08hwq5wa6yffm8n60a51303zf4ivnfz57vyja70qdbp8b"
   }
  },
  {
@@ -78709,11 +79480,11 @@
   "repo": "python-mode-devs/python-mode",
   "unstable": {
    "version": [
-    20191220,
-    1543
+    20200224,
+    1148
    ],
-   "commit": "a79b5d111b18a83b1d0eb6ae01a5178f47938c93",
-   "sha256": "1rcqwxw5k4y5752hrp0pa2sqaq07k3s68rx34wbggz9l9r6c0jhr"
+   "commit": "5bf2c0dafb086684124c3997a618d40ac8db0fb0",
+   "sha256": "1hz9j8k4bybvi3kgq51rqi0rwy3d7c5wqvx2kkljh6734m9x8xp2"
   },
   "stable": {
    "version": [
@@ -78995,6 +79766,21 @@
    "sha256": "1xprnq3y74hfm931a80wcj35faafzqc59j3vavx95wzv4z4yfgdm"
   }
  },
+ {
+  "ename": "qtcreator-theme",
+  "commit": "bf0caf3c60f4b8c6ed1c126a5feb91c99eea1f60",
+  "sha256": "0ic7a9zas8ndrp15xbw4j2987ajfjjq003fcmqhibp0sc66rldfx",
+  "fetcher": "github",
+  "repo": "lesleylai/emacs-qtcreator-theme",
+  "unstable": {
+   "version": [
+    20200203,
+    1436
+   ],
+   "commit": "c56d792d5ab01743e1350e0a7a8a89bb3d2e0c4f",
+   "sha256": "1h7l094h5ccn24c8qp7aqcc4yn1gx8hlkgvsamh1zn8qpsx9bipy"
+  }
+ },
  {
   "ename": "quack",
   "commit": "aa58bf19d4b65ec785677a36709794ae5aebded4",
@@ -79041,11 +79827,11 @@
   "repo": "quelpa/quelpa",
   "unstable": {
    "version": [
-    20191223,
-    1925
+    20200129,
+    743
    ],
-   "commit": "667fce0d43eb2b112b1eaefbeb3ec5bc186cdf4e",
-   "sha256": "1g9g1m7a1qxhw278y6b5f66j1k97fp2l3k20rl6x69ljxn8icj02"
+   "commit": "e7283c5e79197288ff4b875315816d49df6404e5",
+   "sha256": "0g1r03iaw0i803wlh3adicxb7p8lkl1hv1x7afp5fv7chmp0fp4i"
   }
  },
  {
@@ -79090,11 +79876,11 @@
   "repo": "cpitclaudel/quick-peek",
   "unstable": {
    "version": [
-    20190208,
-    1515
+    20200130,
+    2059
    ],
-   "commit": "fd8a6c81422932539d221f39f18c90f2811f2dd9",
-   "sha256": "18jr3syd7jd809qq1j61zwaaclmqn24qyb0mv0q8sj6ac4vzl1c3"
+   "commit": "03a276086795faad46a142454fc3e28cab058b70",
+   "sha256": "1kzsphzc9n80v6vf00dr2id9qkm78wqa6sb2ncnasgga6qj358ql"
   }
  },
  {
@@ -79178,11 +79964,11 @@
   "repo": "zzkt/quiet",
   "unstable": {
    "version": [
-    20191230,
-    714
+    20200211,
+    721
    ],
-   "commit": "aa3a6e039dbc9437e7dd178a6596d43cf19293eb",
-   "sha256": "0rl3l7wwdfn8bm1a1lajqsxp62xdqn9xihglv8a1ggq3wi40fw61"
+   "commit": "f8a4ef0be086f97e7fb631df7060f29cc4025b98",
+   "sha256": "01nbxgi1v6kqmcnzfdxxc0cqsswi8h12l98ngdiq6b62mv7cfcrs"
   },
   "stable": {
    "version": [
@@ -79316,14 +80102,14 @@
   "repo": "greghendershott/racket-mode",
   "unstable": {
    "version": [
-    20191204,
-    205
+    20200218,
+    1623
    ],
    "deps": [
     "faceup"
    ],
-   "commit": "09eba92e846733db1acc8b9e58ff2b5f52c79b23",
-   "sha256": "1q610znwy4wi26ka6ri6lzx2kl1pwi4sc4cbajk3d5i2c1d00rv3"
+   "commit": "7a1414f83981aa174feba28f3d83e95574c7f075",
+   "sha256": "1bszd21fwaqfqkksqpqiq5058hm7wr500qj75zx1xa2j6r67w7sa"
   }
  },
  {
@@ -79545,11 +80331,11 @@
   "repo": "ralesi/ranger.el",
   "unstable": {
    "version": [
-    20190412,
-    624
+    20200218,
+    203
    ],
-   "commit": "c3f349e52f5c50926dc0f285c97676934f50bc18",
-   "sha256": "1yc5g631xrvfkdgxzzy9rzvnacnl87r504yr1mpggsw1inklhzkk"
+   "commit": "ae9b3816a6da927cca5beb62c45400103797a2da",
+   "sha256": "07fiyw0gw51dxc7r92pj75lbxppg0gixjv9317qx9c3v1lcxaqiv"
   },
   "stable": {
    "version": [
@@ -79811,19 +80597,19 @@
   "repo": "simenheg/rdf-prefix",
   "unstable": {
    "version": [
-    20190511,
-    1212
+    20200216,
+    914
    ],
-   "commit": "6daf675d96aa4a0bc78adc93560b791a77651b22",
-   "sha256": "0mxzpbmaw8qz6ykyhdhq0jvxsnbgsb98psjy0w99jpxkg09fas17"
+   "commit": "825af2c584fbad9e67c2c08e29040776fa647fe0",
+   "sha256": "0ky81w36dn6c69x4v4b46j8ixqqws9dc8adi4q19149xkiijx1kl"
   },
   "stable": {
    "version": [
     1,
-    11
+    12
    ],
-   "commit": "6daf675d96aa4a0bc78adc93560b791a77651b22",
-   "sha256": "0mxzpbmaw8qz6ykyhdhq0jvxsnbgsb98psjy0w99jpxkg09fas17"
+   "commit": "825af2c584fbad9e67c2c08e29040776fa647fe0",
+   "sha256": "0ky81w36dn6c69x4v4b46j8ixqqws9dc8adi4q19149xkiijx1kl"
   }
  },
  {
@@ -79900,25 +80686,6 @@
    "sha256": "0wmfjbk3s45wj8j6xwfdldxwkrxsfcby2a242r2p88y3f8pp30i1"
   }
  },
- {
-  "ename": "readability",
-  "commit": "7a4e84530b4607a277fc3b678fe7b34b1c5e3b4f",
-  "sha256": "06kykmf1yrk4jiazahk7qqf1ds34ppg9zbj9my5l52j3gjr7v9zq",
-  "fetcher": "github",
-  "repo": "emacsorphanage/readability",
-  "unstable": {
-   "version": [
-    20140716,
-    27
-   ],
-   "deps": [
-    "oauth",
-    "ov"
-   ],
-   "commit": "6c220ab8e0ca63946574ed892add5c8fd14002ce",
-   "sha256": "0kg18ybgwcxhv5fiya5d3wn5w9si4914q946gjannk67d6jcq08g"
-  }
- },
  {
   "ename": "readline-complete",
   "commit": "0cf3b56dae7669b34df9d2abe2d78164cbf064c9",
@@ -80222,11 +80989,11 @@
   "repo": "xendk/reaper",
   "unstable": {
    "version": [
-    20200105,
-    2137
+    20200120,
+    2006
    ],
-   "commit": "ba9b8b5eba06d97d81fc391dc3a9f0c6105b96ad",
-   "sha256": "1mmxqrzy1dyw3gq2w7j25limw46v9yzp9dkhsdsckmv7y912gan5"
+   "commit": "6602e74d6190d2e8dd61358bebb513c3ae8b89fb",
+   "sha256": "1pywz6xm3wjkbcj5zr7w5xh5wfggvivnw94mmsm6lybnv2zgjg1d"
   },
   "stable": {
    "version": [
@@ -80362,14 +81129,14 @@
   "repo": "10sr/recently-el",
   "unstable": {
    "version": [
-    20190317,
-    1234
+    20200120,
+    1432
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "7b5d1128becb387d759a3a95f6afb9ef54be792a",
-   "sha256": "0wghawh47jd2j5s77h1b69fg5njff1yccx1xpvwmlj6ssh3p38xp"
+   "commit": "fa8b52fe891a0adaabe0456f6f5a56a2600a831f",
+   "sha256": "0y0msmfwsrbsd59jhj9dh3vz49f2g0ykyp34c2i8l8vz5vkac3lp"
   },
   "stable": {
    "version": [
@@ -80619,8 +81386,8 @@
     20181121,
     21
    ],
-   "commit": "0904065857c4388c18d1eacca89769e566d36a9f",
-   "sha256": "0yvn3c8hx0xj911n197xp5islx0hnbzzn2wx869scysn7wfh4kd7"
+   "commit": "50689559ff970e33013b8cf8a3bbc8be18ec4e09",
+   "sha256": "0v1xc27hfa223bganb7gksv6cc2v95bdfms7riv75sf30v3vh59s"
   }
  },
  {
@@ -80904,6 +81671,26 @@
    "sha256": "11kcqpw1wrhghbw2dx3pqndmq9a1rbqir3k71ggaj1x2y2arzvm7"
   }
  },
+ {
+  "ename": "remind-bindings",
+  "commit": "b55af46fa0ca3b32bcafcb8601ce1a3e660502ba",
+  "sha256": "0s6pqg9pgi1qjss90ip2ryn4604lij3z4acpg6pqhf99y4yjrchv",
+  "fetcher": "github",
+  "repo": "mtekman/remind-bindings.el",
+  "unstable": {
+   "version": [
+    20200224,
+    1037
+   ],
+   "deps": [
+    "map",
+    "omni-quotes",
+    "popwin"
+   ],
+   "commit": "be4c34a52711d9f942994ec3fc0ee27e4aaa7c3f",
+   "sha256": "03gz7ca4486j58mrjr16akwwy9d9190fl3cv82hx849h48rabavf"
+  }
+ },
  {
   "ename": "renpy",
   "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228",
@@ -81141,11 +81928,11 @@
   "repo": "tkf/emacs-request",
   "unstable": {
    "version": [
-    20191211,
-    2051
+    20200219,
+    2257
    ],
-   "commit": "b207ebb298dbf181583ebf56c3e18a52fcbaa165",
-   "sha256": "0pmifizgj8y99rzp97cn0qmxr544hfb0x7l97f8s160c09fs3lsi"
+   "commit": "216d570a58d05ef1307edb63d2539bafa5f688c6",
+   "sha256": "11malas5n5g4yxydx8pz8aahr5rkjq256cg5avhd64fvfryz9wj2"
   },
   "stable": {
    "version": [
@@ -81172,8 +81959,8 @@
     "deferred",
     "request"
    ],
-   "commit": "b207ebb298dbf181583ebf56c3e18a52fcbaa165",
-   "sha256": "0pmifizgj8y99rzp97cn0qmxr544hfb0x7l97f8s160c09fs3lsi"
+   "commit": "216d570a58d05ef1307edb63d2539bafa5f688c6",
+   "sha256": "11malas5n5g4yxydx8pz8aahr5rkjq256cg5avhd64fvfryz9wj2"
   },
   "stable": {
    "version": [
@@ -81418,11 +82205,11 @@
   "repo": "a13/reverse-im.el",
   "unstable": {
    "version": [
-    20191113,
-    1509
+    20200219,
+    1137
    ],
-   "commit": "a04ce1236dd6bfaa0c520162e6c5a1017c099030",
-   "sha256": "14cq2162gcasv8112jdmb1cx6fidszqlcf2kalgq2ikj5bqs03av"
+   "commit": "45a55810ce3e07d4e42d9fb666100d7242004b4e",
+   "sha256": "1669fksymr24fz2lhxv419fm7csm94bkpycz20l2qy55ppn03his"
   }
  },
  {
@@ -81456,11 +82243,11 @@
   "repo": "kmuto/review-el",
   "unstable": {
    "version": [
-    20191227,
-    1255
+    20200131,
+    122
    ],
-   "commit": "09b41ca47d99e7f1baddcbec6408ca2f60aafff4",
-   "sha256": "1rlk9wxqyac3dz1vzy157wc59gf67avwgiahjyj81y13kmz88nxc"
+   "commit": "09e2df58398b392f19642a12c8cb78eae726dbd2",
+   "sha256": "13cy7wy2jv1cjncfnayp28w1ka4s0jim2sarcw0dn2iiniqlkbwf"
   }
  },
  {
@@ -81486,26 +82273,26 @@
   "repo": "galdor/rfc-mode",
   "unstable": {
    "version": [
-    20190525,
-    1910
+    20200215,
+    1357
    ],
    "deps": [
     "helm"
    ],
-   "commit": "e7d9e2f4cb9ff302231efe57af6fdc201e5b48f0",
-   "sha256": "0hx3754ids3i40hl7cb3s5xi5gy676856h9y6aj50f4g8il16jq1"
+   "commit": "55d28321b480a095d29e5c6cd03c8dea9ad55553",
+   "sha256": "0f9h8vmfn8xi0c3qwigzbbvsck4wwxbflxl06m7ky2h5jnj6n0g3"
   },
   "stable": {
    "version": [
     1,
-    1,
-    1
+    2,
+    0
    ],
    "deps": [
     "helm"
    ],
-   "commit": "5cdf7172e307c0e23bb5342c61263d4439292ede",
-   "sha256": "091yqk257z19rs9mcy6b52ll87s85s7fbsd235kzqmacfcqyjsmi"
+   "commit": "55d28321b480a095d29e5c6cd03c8dea9ad55553",
+   "sha256": "0f9h8vmfn8xi0c3qwigzbbvsck4wwxbflxl06m7ky2h5jnj6n0g3"
   }
  },
  {
@@ -81525,8 +82312,8 @@
     "transient",
     "wgrep"
    ],
-   "commit": "2b01b8bb77e687f3f9243a8649b289ca9823edb4",
-   "sha256": "1lsq9h842gg722mm2xbpcjldby2rgsj07rmcf167ghba0rwn3kf4"
+   "commit": "ed638db439e5010d1968a6ce904b7c21383506e8",
+   "sha256": "1qm26d6ra5d30rk62rik56gsndi35xi01pmjdkm2afbs1n1707ix"
   },
   "stable": {
    "version": [
@@ -81810,14 +82597,14 @@
   "repo": "felipeochoa/rjsx-mode",
   "unstable": {
    "version": [
-    20190614,
-    2215
+    20200120,
+    1446
    ],
    "deps": [
     "js2-mode"
    ],
-   "commit": "0e7fa6b4facdec4f85a7a8865bdf59dfd57217b5",
-   "sha256": "0s0871sx3ch09kgvbcp9na4zdrfrda62xjq8m9knbq5vnj8q8qpi"
+   "commit": "0061587a06cdc2579a8d0e90863498d96bf982d8",
+   "sha256": "08b4hdgq4hc1yfd9pvyir2j3cqqdqa3j5svgaba97x5fzhsz7y8i"
   },
   "stable": {
    "version": [
@@ -81942,8 +82729,8 @@
     20191215,
     1240
    ],
-   "commit": "879af5c8cfbe284fa37695840784f1d74d730837",
-   "sha256": "1673b1xcmjg7058q44v190a940kgla6vxr1z5imx4hbjn5b76var"
+   "commit": "d1246557e2c9c685b0ee4ec0e58237431b846096",
+   "sha256": "11yd10b6pxg92ybn4lv3n7h7b7xa4xsvsmpz42hbqdarm50hxsdn"
   },
   "stable": {
    "version": [
@@ -81963,11 +82750,11 @@
   "repo": "DerBeutlin/ros.el",
   "unstable": {
    "version": [
-    20191109,
-    1939
+    20200109,
+    1940
    ],
-   "commit": "46ce6b5c16d24ebd80da39cf48f207cf12f1a5d0",
-   "sha256": "10h2hy1inrk6ph4gi3bd8l89mf4lbf0cizfwlymmarkjfmlrsz2w"
+   "commit": "0babdd3bbc038ee7436db0cc869df35752456268",
+   "sha256": "1f0bxbm1rgvf68q6qbsf63mzr44541aapk4237rs7pkxk81nnrrl"
   }
  },
  {
@@ -82064,15 +82851,15 @@
   "repo": "pezra/rspec-mode",
   "unstable": {
    "version": [
-    20191206,
-    1559
+    20200228,
+    2348
    ],
    "deps": [
     "cl-lib",
     "ruby-mode"
    ],
-   "commit": "c4353a1bff164bccf6c55fda16aa7b9c9ab36685",
-   "sha256": "1xfxm54nyyspfly4f4wszb2v1r8f4q04bd8g9mhc57bjfrpqvzpy"
+   "commit": "9a2a9d2935ae17b8570485bdea7c347533b464f6",
+   "sha256": "0plr71dbghzcnbrl9l4g52g59yvlcx1dh41fwcnp0b12x13vslay"
   },
   "stable": {
    "version": [
@@ -82095,19 +82882,19 @@
   "repo": "Andersbakken/rtags",
   "unstable": {
    "version": [
-    20191227,
-    958
+    20200221,
+    36
    ],
-   "commit": "5f1eaf4355e2093afb2b7828f3ebddfcad1234be",
-   "sha256": "1ankfl792qq0p2mdp89gldisw2l3lp8p10dmmqxm3ys898b0p2rh"
+   "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a",
+   "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n"
   },
   "stable": {
    "version": [
     2,
-    37
+    38
    ],
-   "commit": "11f49ef5c488da4c744f700b5cf07a8ebcb9f4ec",
-   "sha256": "0g443kw9y469banr70nv2fhlb7vyc3911d2mcyssrcsqjm1xdvlv"
+   "commit": "9687ccdb9e539981e7934e768ea5c84464a61139",
+   "sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx"
   }
  },
  {
@@ -82118,22 +82905,25 @@
   "repo": "Andersbakken/rtags",
   "unstable": {
    "version": [
-    20191222,
-    920
+    20200130,
+    1624
    ],
    "deps": [
     "rtags"
    ],
-   "commit": "5f1eaf4355e2093afb2b7828f3ebddfcad1234be",
-   "sha256": "1ankfl792qq0p2mdp89gldisw2l3lp8p10dmmqxm3ys898b0p2rh"
+   "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a",
+   "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n"
   },
   "stable": {
    "version": [
     2,
-    37
+    38
    ],
-   "commit": "11f49ef5c488da4c744f700b5cf07a8ebcb9f4ec",
-   "sha256": "0g443kw9y469banr70nv2fhlb7vyc3911d2mcyssrcsqjm1xdvlv"
+   "deps": [
+    "rtags"
+   ],
+   "commit": "9687ccdb9e539981e7934e768ea5c84464a61139",
+   "sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx"
   }
  },
  {
@@ -82278,8 +83068,8 @@
     20191217,
     1214
    ],
-   "commit": "0e6c1f1022ac84db6a03d60e7a0f9f1fd42ecc99",
-   "sha256": "1l3zz62d04m3kwj3swffsbkpvkayp9r651cpl07palghx9b34h3m"
+   "commit": "ea9571ce3af546fdb1234274c8b1a147109b4869",
+   "sha256": "16g1764igf9y717sg2rg4b2ysxxlnyjyzk2s6w9jx9dnr2lqih39"
   },
   "stable": {
    "version": [
@@ -82593,11 +83383,11 @@
   "repo": "rust-lang/rust-mode",
   "unstable": {
    "version": [
-    20191208,
-    1654
+    20200229,
+    1547
    ],
-   "commit": "d0f3f45cc4fe1c5b72466253f051294d275a4b64",
-   "sha256": "0q6gq4qrcjz7hgjfqs4h2qh0v7z4zf5q8fvnpv7jn7agrzhrfwnm"
+   "commit": "86650056717be0661feae32e294ff991c087ed4d",
+   "sha256": "0m7cribk9xfmgil103491mwi0z9ykg19pn3qifdg4i80bs0h8xhj"
   },
   "stable": {
    "version": [
@@ -82617,11 +83407,11 @@
   "repo": "grafov/rust-playground",
   "unstable": {
    "version": [
-    20180807,
-    1158
+    20200116,
+    1043
    ],
-   "commit": "092c8b11d62dea23953a004744833092bac85fe1",
-   "sha256": "0n2c1pjbvy46ic0k84jd3ffwwb5hibjqc1wv7knzkldi5agigfsh"
+   "commit": "5a117781dcb66065bea7830dd73618008fc34949",
+   "sha256": "1vmas5mg32lsyiki753a7hy597f54k1rx9sjiahw63jpgg785zys"
   },
   "stable": {
    "version": [
@@ -82640,8 +83430,8 @@
   "repo": "brotzeit/rustic",
   "unstable": {
    "version": [
-    20200107,
-    1956
+    20200226,
+    1915
    ],
    "deps": [
     "dash",
@@ -82655,8 +83445,8 @@
     "spinner",
     "xterm-color"
    ],
-   "commit": "3f1deff592ee5349d3618c080a0b26b5e30fbc63",
-   "sha256": "1w1yfiv80plbczw1y52vk8wkpddkbp57sj0jkxr0i3w14733cpjs"
+   "commit": "99396915c78556f4ad0da8caf9cb2a269582c39f",
+   "sha256": "0azr2kv77amr60ms64c2366sn9ak7959krz4whjl4wsdsd5rhqy4"
   }
  },
  {
@@ -82843,8 +83633,8 @@
     20171202,
     1332
    ],
-   "commit": "bb5ed0f0b0cd72f2eb1af065b7587ec81866b089",
-   "sha256": "1b53mdqgcmjay3i3fnxnycv8crqi20yvyv57ybgs2ikfl3v282h2"
+   "commit": "65c6b04abadd2cdeb4cc2dc2a8b96b06e0f27ed8",
+   "sha256": "18c6l36sdc3any2fccm49wiyrda97pnd07jdir22wfl5wba7xnj8"
   }
  },
  {
@@ -82873,29 +83663,29 @@
   "repo": "glynnforrest/salt-mode",
   "unstable": {
    "version": [
-    20181225,
-    1157
+    20200210,
+    1200
    ],
    "deps": [
     "mmm-jinja2",
     "mmm-mode",
     "yaml-mode"
    ],
-   "commit": "5ed02dabe0c5c58f51959a48b559f7fc5425ea2c",
-   "sha256": "13xz5kfq4kgs94bx6ygl1b26j66l4bjhkvrcv40cvi5mpik2lp98"
+   "commit": "c46b24e7fdf4a46df5507dc9c533bbc0064a46fa",
+   "sha256": "07qnn8svgd0ishajx5dr91mk4nx9fm9phxsv00cjapvpd4f26xn6"
   },
   "stable": {
    "version": [
     0,
-    1
+    2
    ],
    "deps": [
     "mmm-jinja2",
     "mmm-mode",
     "yaml-mode"
    ],
-   "commit": "e14ed8f2ce0ab7a783c4341879ec8c003e2b5c81",
-   "sha256": "19gw35qv13f2r4wif5fgqfhrph2r320n81faxx8980zds28x2q0x"
+   "commit": "6a1fedb4da7181b00f1bebfc88c87dd2f0c58766",
+   "sha256": "1vygzx7i3cxghji4517sa2v9w5yl84mjpfixf000mf897xpk7288"
   }
  },
  {
@@ -82990,11 +83780,11 @@
   "repo": "nflath/save-visited-files",
   "unstable": {
    "version": [
-    20190927,
-    2153
+    20200212,
+    414
    ],
-   "commit": "0b61c9bd16947bd99ccd61208bd481325e8c5cba",
-   "sha256": "04rrl0nn4mk8h7qyzh3lljagldm5hqhxv8ps6hkh0zz4il7ds018"
+   "commit": "8203a05a322324ec17b14437c8dfb38efdb53241",
+   "sha256": "1zc7f5l7i60fpi8vw41xhpnhz5jpiqkk7fdkd2k6lnmv7jnnilfc"
   }
  },
  {
@@ -83100,8 +83890,8 @@
     20190413,
     1246
    ],
-   "commit": "552643c03e90ff47ae905c06f1d1afbbdb808966",
-   "sha256": "0gqazmv279b45ycvmkf403cxi3imd0vn97k1ldnnbwxjp3993cp7"
+   "commit": "5696d0703583d3d53b34683bbc59d3b1cb284a78",
+   "sha256": "1kkcqdnphvmiwvcvr2balqpszcf87bjy9la682w9b846g53pgmin"
   }
  },
  {
@@ -83133,8 +83923,8 @@
     20190929,
     1522
    ],
-   "commit": "44772cbf1e1ade52bc5066555ff0aed68569aaec",
-   "sha256": "0xnsyrsardsmjyj563dkl03f5d6g2syng1x721i0w36qkiqwcqr7"
+   "commit": "46bb948345f165ebffe6ff3116e36a3b8a3f219d",
+   "sha256": "1072lsin7dxadc0xyhy42wd0cw549axbbd4dy95wfmfcc1xbzjwv"
   },
   "stable": {
    "version": [
@@ -83794,20 +84584,20 @@
   "repo": "rbanffy/selectric-mode",
   "unstable": {
    "version": [
-    20170216,
-    1111
+    20200209,
+    2107
    ],
-   "commit": "aed70015b29074b52a5d0c49b88b7a501d276dda",
-   "sha256": "0v2wfmi5y7jkg8wpc5fmhy1zpdckzlkvnwlz14ymylwpq62nl216"
+   "commit": "bb9e66678f34e9bc23624ff6292cf5e7857e8e5f",
+   "sha256": "1kkxm8ysjcx0vs6lic0lcncr2kcmjmh2n5y8j9303lhzzhh73psg"
   },
   "stable": {
    "version": [
     1,
     4,
-    1
+    2
    ],
-   "commit": "a35cb3815caceaf273ad7d16ac3b2dd3c7a3003e",
-   "sha256": "04bj71080wqybznyx63dawhppq6x3p88x1j56gvl8kvxv2hwzgzf"
+   "commit": "bb9e66678f34e9bc23624ff6292cf5e7857e8e5f",
+   "sha256": "1kkxm8ysjcx0vs6lic0lcncr2kcmjmh2n5y8j9303lhzzhh73psg"
   }
  },
  {
@@ -83870,16 +84660,16 @@
   "repo": "conao3/seml-mode.el",
   "unstable": {
    "version": [
-    20191123,
-    1851
+    20200203,
+    1858
    ],
    "deps": [
     "htmlize",
     "simple-httpd",
     "web-mode"
    ],
-   "commit": "1f8bda7e5a4a36212f968b462cfc31ce53c6db85",
-   "sha256": "1hc0rwlgapbqf9965n3nsyvd4chdga5av7ya82wjzxn1mx4bhifa"
+   "commit": "6e09efaa613f411b9cc8cd30f46ddab44154a1e2",
+   "sha256": "0f6x2w94y1clqzl65f3qgw9hm9d97p91jaak4k8k92qnd9s3471r"
   },
   "stable": {
    "version": [
@@ -84196,11 +84986,11 @@
   "repo": "voloyev/sexy-monochrome-theme",
   "unstable": {
    "version": [
-    20180526,
-    808
+    20200115,
+    2146
    ],
-   "commit": "036bc238e48dd21aae1c34e6971d376582d8281b",
-   "sha256": "1nfij1wzzs23aqbc7k6cc5a714bkywmmid95c8cj4wh3lwz2bpnh"
+   "commit": "f3ad07d60c966ef34cb11026eaba053e114bb8f1",
+   "sha256": "1lq7csb5dgpy9hd6dw1ds5klmp88zqyk9x97hg1llzic6rkkfjrr"
   },
   "stable": {
    "version": [
@@ -84211,6 +85001,21 @@
    "sha256": "17ahrdyk2v7vz13b4934xn8xjza4b7bfrkq8n42frq3pc8mgwqfd"
   }
  },
+ {
+  "ename": "sfz-mode",
+  "commit": "6e61f77045deaf0dd6a344911b73cf5b1a779a52",
+  "sha256": "1x7873xvqwj1nwp18pj50bp2s9djqbqzp37fr2hjx2rygfvpxzmg",
+  "fetcher": "github",
+  "repo": "sfztools/emacs-sfz-mode",
+  "unstable": {
+   "version": [
+    20200105,
+    316
+   ],
+   "commit": "614506bac2795c531ab118840ba010ee378e96d4",
+   "sha256": "042ci8kbhlmhwyx3kiwf8gnr9f1f85faviinv0g7yn80g3shxyp1"
+  }
+ },
  {
   "ename": "shackle",
   "commit": "806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21",
@@ -84625,8 +85430,8 @@
     20190930,
     730
    ],
-   "commit": "550cd4250d7db1248ffc3b6d897925558d9ef604",
-   "sha256": "116c0x7wric1gqxm8jswv732aymwd5hpy7dwzw19cx22w2j0imzy"
+   "commit": "6eda3828bb8530ecd69a3823bd5569a5f779c239",
+   "sha256": "0ij85i0zy9wi1cgm0j8cvqpv9802kfy7g4ffx381l7k28m35lqh2"
   }
  },
  {
@@ -84849,23 +85654,37 @@
  },
  {
   "ename": "shroud",
-  "commit": "2e4334a47a173e9cfb1e803d5781317da27702d7",
-  "sha256": "0s7gap41y2ncnlbj2cc6b2l7q7qc8psxpbznkc71y53ch1mc9isg",
-  "fetcher": "github",
-  "repo": "o-nly/emacs-shroud",
+  "commit": "261a5b2c77288cf38bc309504215fb23c719f09b",
+  "sha256": "03226c2v76zdscxlbhq32wp5wgpg385phqnxcsibn1apk2rb4s4m",
+  "fetcher": "git",
+  "url": "https://git.savannah.nongnu.org/git/emacs-shroud.git",
   "unstable": {
    "version": [
-    20191219,
-    1722
+    20200124,
+    1833
    ],
-   "commit": "f758d497f87afd847126d2e69b2f7ba10a5bbbfa",
-   "sha256": "0q2pb3w8s833fjhkzicciw2php4lsnismad1dnwgp2lcway757ra"
+   "deps": [
+    "bui",
+    "dash",
+    "dash-functional",
+    "epg",
+    "s"
+   ],
+   "commit": "bf8a854ecd440c525b870f9439f6785700af80d3",
+   "sha256": "1rfmykbv2jipkb8by9jsx51gdh62spilffj3c49h3rfcllqnbv2g"
   },
   "stable": {
    "version": [
     1,
     105
    ],
+   "deps": [
+    "bui",
+    "dash",
+    "dash-functional",
+    "epg",
+    "s"
+   ],
    "commit": "f758d497f87afd847126d2e69b2f7ba10a5bbbfa",
    "sha256": "0q2pb3w8s833fjhkzicciw2php4lsnismad1dnwgp2lcway757ra"
   }
@@ -84908,20 +85727,20 @@
   "repo": "riscy/shx-for-emacs",
   "unstable": {
    "version": [
-    20191027,
-    2130
+    20200203,
+    41
    ],
-   "commit": "298f96e68068d6891d20e6188e918ab55ac56b30",
-   "sha256": "17j406lxsa9d905j5g4707lmbiqb6lrswrrbyivda07blrrxrdpb"
+   "commit": "e90dccf40320ee0df306cab3f94fdb79504698b5",
+   "sha256": "0g4w5w53pknphxr7i7kwksq1789qi8rk8yk9gp4s788iq1f0i6vr"
   },
   "stable": {
    "version": [
     1,
     3,
-    0
+    1
    ],
-   "commit": "298f96e68068d6891d20e6188e918ab55ac56b30",
-   "sha256": "17j406lxsa9d905j5g4707lmbiqb6lrswrrbyivda07blrrxrdpb"
+   "commit": "e90dccf40320ee0df306cab3f94fdb79504698b5",
+   "sha256": "0g4w5w53pknphxr7i7kwksq1789qi8rk8yk9gp4s788iq1f0i6vr"
   }
  },
  {
@@ -84950,8 +85769,8 @@
     20180823,
     1222
    ],
-   "commit": "33acfa10a058aa65b6b22084a5b86a82410d794e",
-   "sha256": "1l8isy8kicr4xa6iilxj0cf0f5rqmkidzr6pigql74204db56jhd"
+   "commit": "26bc593aeae01da34ad92363b5bbd6aedab66da2",
+   "sha256": "0qvgdrzdp92mskqfh0x5garq0zcr8r7n834jlx5ky8q00xvb1a06"
   }
  },
  {
@@ -85176,14 +85995,14 @@
   "repo": "andreas-roehler/simple-paren",
   "unstable": {
    "version": [
-    20190603,
-    1836
+    20200120,
+    2036
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "2d3304af173b657176a1284abecdad2861820119",
-   "sha256": "1ac03h5hmx6qhsscq5n1n75wc5s1nnvpghws3sij6j64ksixi3b6"
+   "commit": "2a4ba8f99f39abf17976db8118e32b80eff0798b",
+   "sha256": "0897i5ggdivi2knblcbkyv9lpnwgdlr8ql9brd09bkdsbzhsqb6y"
   }
  },
  {
@@ -85228,20 +86047,20 @@
   "repo": "rolandwalker/simpleclip",
   "unstable": {
    "version": [
-    20181105,
-    1636
+    20200210,
+    1406
    ],
-   "commit": "2468b08ad829aaf4a90246541978be3974c60ab8",
-   "sha256": "1pkv4mi0pmi3hwbl3yyzahin5xv4zkd0jw8xh1cdipymndga4iwq"
+   "commit": "970159c788d38877f55f6fe93fe590642d45fb47",
+   "sha256": "0divawrww9py1r3yd7v0574lhf186f1d227gsmmal5m9zzi7pk7k"
   },
   "stable": {
    "version": [
     1,
     0,
-    8
+    10
    ],
-   "commit": "63b1a5356e6ff839b1dbacdf22a5c7a275ec88e6",
-   "sha256": "0iic8r0q21gjhj0d1k5nin9abx3789j0a37n96a5sx6rb4ps4f2v"
+   "commit": "d327abe0522b9b9a26e005eae5ffa4c34ea2ba0a",
+   "sha256": "1xkv34ibp3zv1b4y2q0i8x7c6vqrqf8r5jzj30nzz4lm5ipvd98r"
   }
  },
  {
@@ -85488,8 +86307,8 @@
   "repo": "yuya373/emacs-slack",
   "unstable": {
    "version": [
-    20191230,
-    1016
+    20200221,
+    417
    ],
    "deps": [
     "alert",
@@ -85499,8 +86318,8 @@
     "request",
     "websocket"
    ],
-   "commit": "4e536bb4ee7a743605c5bfe7b91fc72b5c77fdf0",
-   "sha256": "1paiy7fx7b8fi6b2dd18qmwwldr2sdilccmvhdm4s70xrg90yxkw"
+   "commit": "b7b9eada0bf62d40dfe764b00f55913a2d3d742e",
+   "sha256": "0cqr7jnfxzb0z2wy79pdwpv9cvmawjif1kin3zbp8q7zhwrq09v0"
   }
  },
  {
@@ -85561,15 +86380,15 @@
   "repo": "slime/slime",
   "unstable": {
    "version": [
-    20191224,
-    2328
+    20200228,
+    1656
    ],
    "deps": [
     "cl-lib",
     "macrostep"
    ],
-   "commit": "e1a640a92ee8e63cc2670ef0cc44673f0c0bad0a",
-   "sha256": "0bycp6zcqxhrzq8ihqhqkyws2y8623jwc399ln4gklybgsdm1ibf"
+   "commit": "cd8cc3c95c3391b1f1cffa9e100336250a4509a7",
+   "sha256": "11b9747y43cia8s8dlgxsx3l326pjgsr20qmv5rs9ziby38502mq"
   },
   "stable": {
    "version": [
@@ -85786,11 +86605,11 @@
   "repo": "joaotavora/sly",
   "unstable": {
    "version": [
-    20200101,
-    1514
+    20200228,
+    1350
    ],
-   "commit": "91e5a8e7401c9907825b4e72e0fde3498c10021e",
-   "sha256": "0jgpf4d3sik45l7y7igh3kgd3iqigmz4n3ic59mqcfi8lrhppscm"
+   "commit": "86a63df73360be51529806c7ed9b775b3f02284d",
+   "sha256": "0sx6fdckcfcld41db0695svvlvllnfaazwx513686gnykwfd209n"
   },
   "stable": {
    "version": [
@@ -85809,14 +86628,15 @@
   "repo": "mmgeorge/sly-asdf",
   "unstable": {
    "version": [
-    20191021,
-    718
+    20200217,
+    2332
    ],
    "deps": [
+    "popup",
     "sly"
    ],
-   "commit": "69123fcebe63bb4d6e40e3dcb187299622401b74",
-   "sha256": "0f5ycdh02w6b6jkzw6fhsq9brdld78277cjykpy291112fx0ppny"
+   "commit": "feb25636fb729a08c92e8ba801fae5382f2668e3",
+   "sha256": "1j73s7xhlys97mwcnm4dpgfhdg7pf5nv2xqiz67fdbpdxwd4s6wj"
   },
   "stable": {
    "version": [
@@ -85839,14 +86659,14 @@
   "repo": "joaotavora/sly-hello-world",
   "unstable": {
    "version": [
-    20191013,
-    2137
+    20200225,
+    1755
    ],
    "deps": [
     "sly"
    ],
-   "commit": "ae8fe0a0ebcce50425a1d411c027db06ddec39ce",
-   "sha256": "0gimlph6pbq0s313gqa85gzc2x2d9ba4yww91apikd6xl32707bg"
+   "commit": "d25acc1220a3ce066bd9908251c2f0f88b1781e9",
+   "sha256": "0par51rbspk2gqfqag24rynzdvv4npdifdy7bjz9n0b0p2ly39kc"
   }
  },
  {
@@ -85991,11 +86811,11 @@
   "repo": "malsyned/smart-dash",
   "unstable": {
    "version": [
-    20110131,
-    316
+    20200104,
+    1620
    ],
-   "commit": "f8f23121ecb1b4b153e3561065cd0846d6722638",
-   "sha256": "069jwi74qh9hy152k19c7avdgb89zym989v92kgghbaaiyinng22"
+   "commit": "cc540eea7452e15d4ef2b09d8809d88174f509c0",
+   "sha256": "10xp7nf42v9rz9as3gspjcm3rjy075xza3yqbcppdk1zm59xxljr"
   }
  },
  {
@@ -86295,15 +87115,15 @@
   "repo": "Fuco1/smartparens",
   "unstable": {
    "version": [
-    20200105,
-    1259
+    20200229,
+    1752
    ],
    "deps": [
     "cl-lib",
     "dash"
    ],
-   "commit": "9449ae08593180ba99e4517897e8e825d3c422a8",
-   "sha256": "1h08awp6jr6ab7kb79dld6aygjl2vjnml81q3h7hqm3p7v9jv2h2"
+   "commit": "1f8857c5febe8b82654ba44ae43e6d2f435f4832",
+   "sha256": "02b05rh474kyk3vmkgh54366k7fqshdf2x5zgrd5q4a8jcffb5nf"
   },
   "stable": {
    "version": [
@@ -86520,6 +87340,24 @@
    "sha256": "0hzs8xi7n3bsqwm3nlm3vk8p2p33ydwxpwk9wp3325g03jl921in"
   }
  },
+ {
+  "ename": "smog",
+  "commit": "cc829fc6353e5cd78222eb2c7194eb3b796d2cc9",
+  "sha256": "0qq7ib8gv006jddhzrdfm702bgwgsk3rdd64v67xi5a39csrsfpw",
+  "fetcher": "github",
+  "repo": "zzkt/smog",
+  "unstable": {
+   "version": [
+    20200211,
+    528
+   ],
+   "deps": [
+    "org"
+   ],
+   "commit": "0a6374493363d10826a8151d37fc461b08cc9b9a",
+   "sha256": "0vfhcnlz0p4dsnn7ac0fjqbk6xklanaa6jk0zbqcrlf2ww926v29"
+  }
+ },
  {
   "ename": "smooth-scroll",
   "commit": "4ad6411f76281232848c870e8f4f5bb78e6cf328",
@@ -86620,28 +87458,28 @@
   "repo": "kyleam/snakemake-mode",
   "unstable": {
    "version": [
-    20190912,
-    308
+    20200222,
+    1710
    ],
    "deps": [
     "cl-lib",
     "magit-popup"
    ],
-   "commit": "239b0c812b6963877d64c7051128353f2b9bcb55",
-   "sha256": "11p5gcpb4j5y1wbz212wi8nc7vznbxd70aafb1891q6bcli10g2c"
+   "commit": "701f970bfb48d2f7abb241b9f69127ff5b667c76",
+   "sha256": "0di8wqwj0l2vx29kkpy2h1yxrxgcq51y2lss5lmqp6kmw3avkvi2"
   },
   "stable": {
    "version": [
     1,
-    6,
+    7,
     0
    ],
    "deps": [
     "cl-lib",
     "magit-popup"
    ],
-   "commit": "239b0c812b6963877d64c7051128353f2b9bcb55",
-   "sha256": "11p5gcpb4j5y1wbz212wi8nc7vznbxd70aafb1891q6bcli10g2c"
+   "commit": "701f970bfb48d2f7abb241b9f69127ff5b667c76",
+   "sha256": "0di8wqwj0l2vx29kkpy2h1yxrxgcq51y2lss5lmqp6kmw3avkvi2"
   }
  },
  {
@@ -86868,26 +87706,26 @@
   "repo": "hlissner/emacs-solaire-mode",
   "unstable": {
    "version": [
-    20200106,
-    57
+    20200120,
+    455
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "2bfb3efe5a646079389dad6ca60e5e7f2c986829",
-   "sha256": "04inv9iny0ndkm2lwr82gvyfv73v50bn0sjrdbdqhkzxqxf8yr2k"
+   "commit": "4ac324ccb0b751be80ce64449553462eafab4f32",
+   "sha256": "1klyzqrlsgx8q89zx1kn5z6wnpv1dmvbglldpv1y74hxhzi6ryps"
   },
   "stable": {
    "version": [
     1,
-    0,
-    9
+    1,
+    2
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "fffdcc46f3956f415496342de7e24488b6e751c5",
-   "sha256": "011m4r7s6i9lgjymh7jgq5jwwrpz4vmpvp3c8d4ix96v5hi04kzg"
+   "commit": "4ac324ccb0b751be80ce64449553462eafab4f32",
+   "sha256": "1klyzqrlsgx8q89zx1kn5z6wnpv1dmvbglldpv1y74hxhzi6ryps"
   }
  },
  {
@@ -86898,27 +87736,27 @@
   "repo": "bbatsov/solarized-emacs",
   "unstable": {
    "version": [
-    20191212,
-    1808
+    20200113,
+    37
    ],
    "deps": [
     "dash"
    ],
-   "commit": "fac531ce8890795850bc12bb3ca63526b5252a07",
-   "sha256": "0rfdhfyp0b60cfz7q9bdk5y8nyr0rp6jg0mrb34mvnxc54aardag"
+   "commit": "b51d4f43fa5b814fd2de1f9348888c733af89b1c",
+   "sha256": "1jh6x447br0zdglazy58a6j1gbngi3x7750v6cwzzrrfiz9cb4h6"
   },
   "stable": {
    "version": [
     1,
     3,
-    0
+    1
    ],
    "deps": [
     "cl-lib",
     "dash"
    ],
-   "commit": "c42a932e5c467c1ce12c42276d35bfb8f666e96d",
-   "sha256": "1m6grd8ym4azxi09ya236vil9ylqalli99p9fafd5zmzq647l840"
+   "commit": "55cd77b61b6968048c61e13358ba487d217f24c0",
+   "sha256": "15ql8xcixgm7mbs7rsbybwszanqibq057j5b5ds89a31dw7zxf1g"
   }
  },
  {
@@ -86929,24 +87767,28 @@
   "repo": "ethereum/emacs-solidity",
   "unstable": {
    "version": [
-    20181117,
-    1518
+    20200113,
+    1721
    ],
    "deps": [
     "flycheck",
     "solidity-mode"
    ],
-   "commit": "20d769513f42d8f82a4de7a42db89f59fb1c8fa1",
-   "sha256": "00y7arkg16yp7p4pvhjq0gkgchvpq65ql8jq42hkamh3gvj8gssq"
+   "commit": "b190993dcb8376e80fb1d9b71f3ed6170bd2a341",
+   "sha256": "0s5xk38k3mc1d40dszlcgfpn5rvb7nsnnpmgr3c0bwqa4xh6yqrg"
   },
   "stable": {
    "version": [
     0,
     1,
-    9
+    10
    ],
-   "commit": "d0ff4dea49540f37301d869f2797fca2492f55d5",
-   "sha256": "1wcy5z4wggn3zs9h1kyvm0ji51ppjcqdmym3mmxbrhan6a0kq724"
+   "deps": [
+    "flycheck",
+    "solidity-mode"
+   ],
+   "commit": "93412f211fad7dfc3b02aa226856fc52b6a15c22",
+   "sha256": "06zqs7p22h1jkm3zs1i16wvch6rnzzb3m8d5r9r51clzpasf6zy8"
   }
  },
  {
@@ -86957,20 +87799,20 @@
   "repo": "ethereum/emacs-solidity",
   "unstable": {
    "version": [
-    20191214,
-    859
+    20200124,
+    827
    ],
-   "commit": "20d769513f42d8f82a4de7a42db89f59fb1c8fa1",
-   "sha256": "00y7arkg16yp7p4pvhjq0gkgchvpq65ql8jq42hkamh3gvj8gssq"
+   "commit": "b190993dcb8376e80fb1d9b71f3ed6170bd2a341",
+   "sha256": "0s5xk38k3mc1d40dszlcgfpn5rvb7nsnnpmgr3c0bwqa4xh6yqrg"
   },
   "stable": {
    "version": [
     0,
     1,
-    9
+    10
    ],
-   "commit": "d0ff4dea49540f37301d869f2797fca2492f55d5",
-   "sha256": "1wcy5z4wggn3zs9h1kyvm0ji51ppjcqdmym3mmxbrhan6a0kq724"
+   "commit": "93412f211fad7dfc3b02aa226856fc52b6a15c22",
+   "sha256": "06zqs7p22h1jkm3zs1i16wvch6rnzzb3m8d5r9r51clzpasf6zy8"
   }
  },
  {
@@ -87386,11 +88228,11 @@
   "repo": "nashamri/spacemacs-theme",
   "unstable": {
    "version": [
-    20191227,
-    1039
+    20200127,
+    1656
    ],
-   "commit": "06a41d03274902bf16888b89db5a6ab6a054b11e",
-   "sha256": "0iml1qisamwv9pf07h0k5a3sff5m7vlnk4780k5nyv324aih1r05"
+   "commit": "e088bff4f190495615c29de93079aaa823e2300c",
+   "sha256": "09p5pzy3ibrl8dxmg10v8j16wxdn1fkdqpbi8l9pgfib2azmnvnc"
   }
  },
  {
@@ -87518,11 +88360,11 @@
   "repo": "brailcom/speechd-el",
   "unstable": {
    "version": [
-    20190821,
-    1129
+    20200122,
+    2036
    ],
-   "commit": "1d4086a64ba554bb8c7d648c8d0e6c176277f6f3",
-   "sha256": "06sz5yl12mn0mq43bbv3ln14pk176ij8rxs95wi25yxdblznhsg0"
+   "commit": "590278f2b37919d082f576e522cbb790167a7f8d",
+   "sha256": "0s2znn91jy342xrcsda6mbf78f19ixxf5lf401jls8l5gj9bnx7f"
   }
  },
  {
@@ -87782,15 +88624,15 @@
   "repo": "benmaughan/spotlight.el",
   "unstable": {
    "version": [
-    20150929,
-    755
+    20200109,
+    2137
    ],
    "deps": [
     "counsel",
     "swiper"
    ],
-   "commit": "ab902900f22e7d1ea2dd8169441d2da7155aaa68",
-   "sha256": "05knlca2dvpyqp9lw8dc47fl5kh2jb04q57cygkzfjjkzvywdwq8"
+   "commit": "ea71f4fd380c51e50c47bb25855af4f40e4d8da0",
+   "sha256": "1dda4gwxyhnr73ckjr70yjah9dmddvyfcwlrbb6d6bidb70ib0dj"
   }
  },
  {
@@ -88095,11 +88937,11 @@
   "repo": "srcery-colors/srcery-emacs",
   "unstable": {
    "version": [
-    20191123,
-    1753
+    20200205,
+    1729
    ],
-   "commit": "bbd9b9239fc1a05f1aa1b7e7810166b4aa463ccc",
-   "sha256": "0ikxqxm4bfnl6v6ykn0zzbkqn7bj12b66x4bcyz8cp3vqv5v8fkg"
+   "commit": "5ce86917ad50d64c460eea6b6fa16bdcf88cc8f5",
+   "sha256": "16317yy64qcx7mi194xp9kbxpisjfz976yf637s6zabmk6xmmpcl"
   },
   "stable": {
    "version": [
@@ -88165,11 +89007,11 @@
   "repo": "AdamNiederer/ssass-mode",
   "unstable": {
    "version": [
-    20190521,
-    249
+    20200211,
+    132
    ],
-   "commit": "c2c610abd85fecd171466bf5a9a4943bd62ffda5",
-   "sha256": "0vbh0nqbc7j2xjksk0xdfsrqfxd64fcqyladgk2v3jw0qply6ydw"
+   "commit": "96f557887ad97a0066a60c54f92b7234b8407016",
+   "sha256": "0kfk1dp8mgirbsrcg3klxi005gryqrr3jn2ss9m6vsxldjg69svb"
   },
   "stable": {
    "version": [
@@ -88191,8 +89033,8 @@
     20120904,
     2042
    ],
-   "commit": "c17cf5b43df8ac4662a0580f85898e1f078df0d1",
-   "sha256": "1rdhdkwdhb727rj53xyxk6i00sjr58a48hfig14m12niy1k739vd"
+   "commit": "812e27409d01c38d74906a1816640506d6e7e3ef",
+   "sha256": "1ffwfgi450f95y1j1zp3k9lfwb6h26jzy88ng2bk4x92n53mhpww"
   }
  },
  {
@@ -88308,20 +89150,20 @@
   "repo": "stan-dev/stan-mode",
   "unstable": {
    "version": [
-    20191106,
-    131
+    20200221,
+    2025
    ],
-   "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a",
-   "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0"
+   "commit": "599a0440086c660e6823622b35058f6d2d6d9637",
+   "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y"
   },
   "stable": {
    "version": [
     10,
-    0,
+    1,
     0
    ],
-   "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a",
-   "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0"
+   "commit": "599a0440086c660e6823622b35058f6d2d6d9637",
+   "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y"
   }
  },
  {
@@ -88332,28 +89174,28 @@
   "repo": "stan-dev/stan-mode",
   "unstable": {
    "version": [
-    20191104,
-    1056
+    20200221,
+    2025
    ],
    "deps": [
     "stan-mode",
     "yasnippet"
    ],
-   "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a",
-   "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0"
+   "commit": "599a0440086c660e6823622b35058f6d2d6d9637",
+   "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y"
   },
   "stable": {
    "version": [
     10,
-    0,
+    1,
     0
    ],
    "deps": [
     "stan-mode",
     "yasnippet"
    ],
-   "commit": "711b56bce5ec6adbcabe964342d2d0adbd0fbf6a",
-   "sha256": "0d1kp6lhg1jvfqz5j33lc2156bh41nahprcbgdhmsx49lm7g2cn0"
+   "commit": "599a0440086c660e6823622b35058f6d2d6d9637",
+   "sha256": "0mm0kpyihpd55hx14smlm0ayz05zw750fihhqhxqc258y8y73m5y"
   }
  },
  {
@@ -88511,8 +89353,8 @@
     20171130,
     1559
    ],
-   "commit": "f2086b33ab310b70a47453011318d0ed5d432239",
-   "sha256": "0rx5h0d54f9w232w7r654qzpk2937zcgv0s3r2sya0ansxkk79kx"
+   "commit": "b505a5f524c9c92cf9f055a7038d19bb168bdfa8",
+   "sha256": "161mxajfl8rqik3cpapblngwwh7hwl8b6rym3rydcbya8i38015a"
   },
   "stable": {
    "version": [
@@ -88580,14 +89422,14 @@
   "repo": "beacoder/stock-tracker",
   "unstable": {
    "version": [
-    20190902,
-    812
+    20200228,
+    542
    ],
    "deps": [
     "dash"
    ],
-   "commit": "c7455081fa78fd8ffa229dcf0c691f66bf2ece16",
-   "sha256": "19phvf5xcaiwlxx0s8p9ys6xrw6ljp9qxjik98v2ab6d8f2x123q"
+   "commit": "32ae436a4cad49fea5038cc3e8eb638a3a83dd6c",
+   "sha256": "0dmjvgkhd445azs6vrj8lzcfmnm3h4prajr0c416s2ircrzpgnd9"
   }
  },
  {
@@ -89473,14 +90315,14 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20200105,
-    1958
+    20200227,
+    1405
    ],
    "deps": [
     "ivy"
    ],
-   "commit": "3c6e5daccbc8678ee881b435ac956778de82a076",
-   "sha256": "184cdd41da1xizhbdymq9g3a8ryscdr6fq15vswdfv5gx8dx2fz6"
+   "commit": "fcf5dcfd5796637d64164fd17956c5bc54e25612",
+   "sha256": "1hx00axmjfgc14ixj16pg7029zj7rsx2i80sw6f2bvp543l2aicq"
   },
   "stable": {
    "version": [
@@ -89535,11 +90377,11 @@
   "repo": "10sr/switch-buffer-functions-el",
   "unstable": {
    "version": [
-    20171011,
-    1704
+    20200127,
+    409
    ],
-   "commit": "b8d8e01e21ae8c8c84234dddeb3cc8250814f7ba",
-   "sha256": "17bspkj4fxn9albjmj5g3gd5hi6x4d5rmv76qvyv3mdqws9x52j6"
+   "commit": "95a846baa93bac4c3b3c028b9d53507f1042b23a",
+   "sha256": "0ykdggzgdlb3dcg1qm388290h612kf5l224kwiv5jvvp8wqzb47l"
   },
   "stable": {
    "version": [
@@ -89714,8 +90556,8 @@
   "repo": "countvajhula/symex.el",
   "unstable": {
    "version": [
-    20191203,
-    2038
+    20200225,
+    1928
    ],
    "deps": [
     "cider",
@@ -89732,13 +90574,13 @@
     "slime",
     "smartparens"
    ],
-   "commit": "bf3c566868cfbc1d1a280a099918c8ce4802a0f1",
-   "sha256": "1jbjk0j13ya0s2mzzir45w07544mlhzr4wqsdj2ar9h3kmw4y97x"
+   "commit": "c8bdd672ec7fc50f72599081b87ef48bcec45c9c",
+   "sha256": "04s0nacv9qy5a95hsblz2an6ipzxmqi98pz71vyc0nghzp6j24zd"
   },
   "stable": {
    "version": [
     0,
-    4,
+    5,
     0
    ],
    "deps": [
@@ -89756,8 +90598,8 @@
     "slime",
     "smartparens"
    ],
-   "commit": "bf3c566868cfbc1d1a280a099918c8ce4802a0f1",
-   "sha256": "1jbjk0j13ya0s2mzzir45w07544mlhzr4wqsdj2ar9h3kmw4y97x"
+   "commit": "c8bdd672ec7fc50f72599081b87ef48bcec45c9c",
+   "sha256": "04s0nacv9qy5a95hsblz2an6ipzxmqi98pz71vyc0nghzp6j24zd"
   }
  },
  {
@@ -90023,11 +90865,11 @@
   "repo": "jabranham/system-packages",
   "unstable": {
    "version": [
-    20190614,
-    1320
+    20200227,
+    1741
    ],
-   "commit": "3ad6d52072f0bd043dced40ba7bd422fd9c00a7b",
-   "sha256": "0pxkyys2lgn16rhf4mzqlh27vs9aw6g083z2vr2agr7bmbavd2fp"
+   "commit": "c6fa6650202300265fbeb82db7d2223ab98951bc",
+   "sha256": "1b8ksr15bfmmmcq4d1vhpwd6sljsh1hpal21140z4hvplll35n1y"
   },
   "stable": {
    "version": [
@@ -90225,11 +91067,11 @@
   "repo": "politza/tablist",
   "unstable": {
    "version": [
-    20191129,
-    1850
+    20200227,
+    1918
    ],
-   "commit": "41a9612f51bad36d6689667c11f42f8143103bb2",
-   "sha256": "0j6y9jh3qynbsya5aag3pfjfdizmxdz4ldry0qnx4rd9nz0cs7mi"
+   "commit": "10a573dc0e66981110507ee8b8b6408be48ce891",
+   "sha256": "0yzzkn6k8jjjkq5awiyi0li6j4bhynv8ayqa7sp1cqbgg4hd8rd4"
   },
   "stable": {
    "version": [
@@ -90382,11 +91224,11 @@
   "repo": "saf-dmitry/taskpaper-mode",
   "unstable": {
    "version": [
-    20191128,
-    1140
+    20200225,
+    1349
    ],
-   "commit": "b3e844ae64b9a7cbbb1427a26fca2d01f8e74c6d",
-   "sha256": "0yj1mxy81pfz71drdyvz5gmam6ypw798m5wiff0zj93kjs5f2k4q"
+   "commit": "6ebb8b188a39decf22a5cd675aeaa9684e4ea4ef",
+   "sha256": "0j3cxakgf943wv7bf73bwa69gc3m0g2ksw78xanz5hc0r0bsxbac"
   },
   "stable": {
    "version": [
@@ -90430,20 +91272,20 @@
    "deps": [
     "cider"
    ],
-   "commit": "079028b7547743a36384650981ea068849aac53e",
-   "sha256": "06sjr4fv8p8y56a35pzghn89r1nzr2h5h3m98h0296bgnz8jgyg2"
+   "commit": "6c2631e3fd68e70110aa0cc5b83b7511eab363e2",
+   "sha256": "1sgnzgy0b61hxkj2fzkgnlrrpgsc5v1prns9hv1za4mv60xs8f15"
   },
   "stable": {
    "version": [
     2,
     0,
-    0
+    2
    ],
    "deps": [
     "cider"
    ],
-   "commit": "d13389f701fc96fdd98b73fd068c6838a1d8ed4e",
-   "sha256": "0gdbkvb6vk7vhchl29gqqg5paq2hrq9ijxgbbk8qbss7ipmfj4zz"
+   "commit": "d4ce3b51e97fd7e9f5a650796dee9ba4079f9df0",
+   "sha256": "1vday9jnmzspnfy3ppladj0z5by4yysfwp1dnqv7n3ayyza5r8w0"
   }
  },
  {
@@ -90582,26 +91424,26 @@
   "repo": "zevlg/telega.el",
   "unstable": {
    "version": [
-    20200101,
-    2251
+    20200226,
+    1557
    ],
    "deps": [
     "visual-fill-column"
    ],
-   "commit": "88623eeb1ca4b79667d1a860496f5ea636611514",
-   "sha256": "1w5krpqraxfiwyz8nr9fwa4gfrj0fzr698dhvxzbpyjibdsna5xx"
+   "commit": "ee6f2a278b5f198cc6bf3d08b74e5ad2fffd6f05",
+   "sha256": "0q8x007p4888j1ljvh92wf012vdkiayawlqd43vhxmakl3zbgaq4"
   },
   "stable": {
    "version": [
     0,
-    5,
-    4
+    6,
+    0
    ],
    "deps": [
     "visual-fill-column"
    ],
-   "commit": "9bfb637b2e71f5f293debd35abd627a064faf8ef",
-   "sha256": "06v8i3862n5kf2lnxii8vp9g8cq5ql51kr8yxh7l1wccsidri67a"
+   "commit": "ae09592498ce380e57fbb76725fd4c89ae248864",
+   "sha256": "0mv6i80958d9crzspzik5xh5g8326115bvg2frgv0dp9p6rm86m3"
   }
  },
  {
@@ -90686,16 +91528,16 @@
   "repo": "kostafey/temporary-persistent",
   "unstable": {
    "version": [
-    20161210,
-    1133
+    20200201,
+    1719
    ],
    "deps": [
     "dash",
     "names",
     "s"
    ],
-   "commit": "ac66f3054fc701d53f11ada9d2d9ab18ea481dc0",
-   "sha256": "15mjcr9gwf1ijppvcxwddnxj84y9idwz7s3lcqr910xb4d3ai8nb"
+   "commit": "0080879b0257d350aeba1c4d6901613d7dc534de",
+   "sha256": "1np9xh6gqynp96rby2shh4w40r14vsvpvwaibq0c1wr1ydwggm9i"
   }
  },
  {
@@ -90918,11 +91760,11 @@
   "repo": "10sr/term-run-el",
   "unstable": {
    "version": [
-    20190529,
-    743
+    20200128,
+    702
    ],
-   "commit": "fe8bf58814b167f887aaef98a148b8d5d8a11d3f",
-   "sha256": "0jzk0b07rj5a7va6nc93sjd4zii228gg63v1q49wg0hz2x2yjmfl"
+   "commit": "0fd135d55fcf864598b1fb8dd880833a1a322910",
+   "sha256": "1x1qdm5ahd5bxb4xi2i7ha5zqcxa5n0yskiqcz2hdbwpsdiirmlc"
   },
   "stable": {
    "version": [
@@ -91034,8 +91876,8 @@
     "cl-lib",
     "json"
    ],
-   "commit": "0d19800db70a6348c627a69f444b91d21ad89629",
-   "sha256": "0ydrxxc3lgs8mpg577iw5sfxgyqfbdkrghwxmv8sxf6sawvhx8zv"
+   "commit": "a295a80a502771cc07dc061961e0eb85343c2925",
+   "sha256": "02szncbbvb52kv9mn2clqhzg49knpny1bxsa7wd5l0gwbsqly3dw"
   },
   "stable": {
    "version": [
@@ -91067,8 +91909,8 @@
     "cl-lib",
     "tern"
    ],
-   "commit": "0d19800db70a6348c627a69f444b91d21ad89629",
-   "sha256": "0ydrxxc3lgs8mpg577iw5sfxgyqfbdkrghwxmv8sxf6sawvhx8zv"
+   "commit": "a295a80a502771cc07dc061961e0eb85343c2925",
+   "sha256": "02szncbbvb52kv9mn2clqhzg49knpny1bxsa7wd5l0gwbsqly3dw"
   },
   "stable": {
    "version": [
@@ -91506,10 +92348,10 @@
  },
  {
   "ename": "thingopt",
-  "commit": "1b82d4102fa2c7622e76dae1154aaa8340b7f4b8",
-  "sha256": "0yvzq1z2nrldr8vhcvxqgzvh4gbrjjwfmprg59p4v5hlxvhxsb1y",
+  "commit": "7856a62fb86415c88aa72b574895328c93c10a09",
+  "sha256": "1a91rvpgbil0cvp90zhj7rv9dqi48j2xr10ycyn52ps3ixhlcyl3",
   "fetcher": "github",
-  "repo": "m2ym/thingopt-el",
+  "repo": "emacsorphanage/thingopt",
   "unstable": {
    "version": [
     20160520,
@@ -91589,21 +92431,21 @@
   "repo": "facebook/fbthrift",
   "unstable": {
    "version": [
-    20180905,
-    1050
+    20200212,
+    1903
    ],
-   "commit": "71240fbb5fec6d0aef967f26cfe6f29d5fa0404c",
-   "sha256": "1m8ahhz02fii84arzn9zpy0i2y1z2rbc1743y9dhf2ajqc0znigm"
+   "commit": "9a0b5eebf6a21a1941b56d4b27c0c90f37626c8a",
+   "sha256": "0daj7c6bz286dc1gdgjh0zhb0qvzjxm4qsjscig447m61hjjjbzj"
   },
   "stable": {
    "version": [
     2020,
-    1,
-    6,
+    2,
+    24,
     0
    ],
-   "commit": "1362aa1d2d0ccc8a3ce28957a1385c216e72bad7",
-   "sha256": "1axhy9rg75bmqckahriaxrwg9avn67vnna5d9m7cpzq2pj7spssc"
+   "commit": "e67ec8ea5cb8c5e6213b0c00b12a242ac31db8f9",
+   "sha256": "15if11riz19vq33jnsc497ya99fflpksshp2zrf5q24l8pq9lz3g"
   }
  },
  {
@@ -91659,20 +92501,20 @@
    "deps": [
     "haskell-mode"
    ],
-   "commit": "014560454f352997839ffd54dbca24b638a9d456",
-   "sha256": "1yvqfc0jfyzc1nkvafnk5jpnbrrfbmj4i28gd1dkq79h6hykl4li"
+   "commit": "b28951be9abee7dc234c318849169bb578db3c49",
+   "sha256": "0absv56yqrqf3mzgs064q88lh6k28a7knzqrgdmf4100gf32np4j"
   },
   "stable": {
    "version": [
     1,
     4,
-    7
+    8
    ],
    "deps": [
     "haskell-mode"
    ],
-   "commit": "014560454f352997839ffd54dbca24b638a9d456",
-   "sha256": "1yvqfc0jfyzc1nkvafnk5jpnbrrfbmj4i28gd1dkq79h6hykl4li"
+   "commit": "b28951be9abee7dc234c318849169bb578db3c49",
+   "sha256": "0absv56yqrqf3mzgs064q88lh6k28a7knzqrgdmf4100gf32np4j"
   }
  },
  {
@@ -91683,8 +92525,8 @@
   "repo": "ananthakumaran/tide",
   "unstable": {
    "version": [
-    20200103,
-    1159
+    20200111,
+    1236
    ],
    "deps": [
     "cl-lib",
@@ -91693,14 +92535,14 @@
     "s",
     "typescript-mode"
    ],
-   "commit": "ac0f0a6f688c5abade71a0277ea5f1cef45a0b8b",
-   "sha256": "11igdklmsn5y6xx9ws2im2m5hn70kqv8l4n9c5abr4ibslxjaffa"
+   "commit": "fd79540360dc8cc96f4a9cfc92d1d51f96fd2b28",
+   "sha256": "0zjs30gi0sqgr6qlvmzq5xcwjd4prni8zn38bd2qxr79r62s1sw7"
   },
   "stable": {
    "version": [
     3,
-    2,
-    3
+    7,
+    4
    ],
    "deps": [
     "cl-lib",
@@ -91709,8 +92551,8 @@
     "s",
     "typescript-mode"
    ],
-   "commit": "2d17c051cccd248a980575caf5728f4d5c986b30",
-   "sha256": "19kjq4kr2j853p5qp1s79zxmrfprli82lsnphbrlp9vbnib28xyd"
+   "commit": "1878a097fc41ee81c40c155022c8feaaf8bfaa6d",
+   "sha256": "0ipri5jxx73vrra6dikbv0y2ws96wfi7bjh2v6pshiw3b1x2isav"
   }
  },
  {
@@ -92022,15 +92864,15 @@
   "repo": "laishulu/emacs-tmux-pane",
   "unstable": {
    "version": [
-    20181210,
-    1210
+    20200227,
+    1230
    ],
    "deps": [
     "names",
     "s"
    ],
-   "commit": "5e83ec65a1d38af9b8a389bdf34a78d13437e63d",
-   "sha256": "1451d51ml36i1pgksjkd4x2y8zjf4in9q8m6gda3b25v57fnkg2i"
+   "commit": "be321093575c1b68946296edd57762c4323c253b",
+   "sha256": "14f1nvnp6qxgq64410kqwi59f29p2shr6v8qg1ck8g9fiarilx5w"
   }
  },
  {
@@ -92065,16 +92907,16 @@
   "repo": "abrochard/emacs-todoist",
   "unstable": {
    "version": [
-    20191014,
-    2033
+    20200227,
+    1510
    ],
    "deps": [
     "dash",
     "org",
     "transient"
    ],
-   "commit": "3b8f8b4fc6d5cfdfca149b142ff7cadba6ffae7a",
-   "sha256": "0w8d53njk81smdk7vm6mxdrrg1310cyxapjbylv2a51d442hrf5g"
+   "commit": "b1fba9f3600e6cfe129efae304b96a7f6dc66e1a",
+   "sha256": "0391m19ws4ajqfbbwd1q1z8p1l6ai94xzf2rqg5zdvlnmc06kl76"
   }
  },
  {
@@ -92100,11 +92942,11 @@
   "repo": "avillafiorita/todotxt-mode",
   "unstable": {
    "version": [
-    20191017,
-    1319
+    20200228,
+    952
    ],
-   "commit": "ec94ac719e2f879c474d29e21dc84353b20258d7",
-   "sha256": "0x5syh0gvkqn3d32baf1r8xnqrpyzy5ywa9vwdbcjrkqfnnap8zb"
+   "commit": "8b616ce1cf3e18a60757450a0acf22996abb9b79",
+   "sha256": "1frvksra8s004xknlizs5gz5rhy9xbis5r353pzsybmn1bxa40wk"
   }
  },
  {
@@ -92139,8 +92981,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "ce213afc026590871ca7d514e563720ef967c938",
-   "sha256": "0wq4c4dzpkrppic65ma7gfzr9mxsln87csmb1laz3b2g4b19cy6k"
+   "commit": "052881b101d8c2d11c89ae4f1befe7a999de987e",
+   "sha256": "0k9sjjsqxnrh0cq6m3cd9rk44n0rjbjgqcbfv6fg33a0gpybvryf"
   }
  },
  {
@@ -92448,8 +93290,8 @@
     20171210,
     2102
    ],
-   "commit": "0c79138fb2d37940654649787cb17cb619268748",
-   "sha256": "0b2zmqrnvg37hwiywnb43zaggi3c7jh6zfdwp7z90hf98il13jpk"
+   "commit": "e5bf5f89741a9c43aa406491e94dd8d58c302fb4",
+   "sha256": "104l0b9n9ia7zrha20yaxp6c09wg1h5l5a8b988k6mhyj9a1w1aw"
   },
   "stable": {
    "version": [
@@ -92552,24 +93394,20 @@
   "repo": "magit/transient",
   "unstable": {
    "version": [
-    20200107,
-    2156
+    20200226,
+    1612
    ],
-   "commit": "95389b31ec45984e3ff0849f4216adbd183d946f",
-   "sha256": "06c47pcicjqcfs8w0jfs4ggb1x431zwz9frx52w6xahb0p37qirm"
+   "commit": "a269614c69ad8b2703e6e5093d0017d6afad6cca",
+   "sha256": "0w50sh55c04gacx2pp19rvi0fwj9h19c9gzd8dpa82zjiidfxckr"
   },
   "stable": {
    "version": [
     0,
-    1,
+    2,
     0
    ],
-   "deps": [
-    "dash",
-    "lv"
-   ],
-   "commit": "33f538a0bb83c8d4abc8f4c2db0dfbb9b09c4f92",
-   "sha256": "1hrn4mgag6rkcqzpmn5ysa9rj79dsgmh8vrihjvaikrdyshf9zxc"
+   "commit": "a269614c69ad8b2703e6e5093d0017d6afad6cca",
+   "sha256": "0w50sh55c04gacx2pp19rvi0fwj9h19c9gzd8dpa82zjiidfxckr"
   }
  },
  {
@@ -92580,14 +93418,14 @@
   "repo": "holomorph/transmission",
   "unstable": {
    "version": [
-    20190211,
-    246
+    20200215,
+    1350
    ],
    "deps": [
     "let-alist"
    ],
-   "commit": "7293beeb8a49cf6822abd16a9f4b9e4bef0a9296",
-   "sha256": "0pbmxl5654l1y213pq2h65dyrr78jlkybbdwz1dq52km98mpnf3r"
+   "commit": "49d3d764819afabf7a66f9d887a6b16c53566317",
+   "sha256": "00hk1rgqilxhlaabi7pgz25k0ykfizwhpp65yzgs453q6kvhccfv"
   },
   "stable": {
    "version": [
@@ -92715,8 +93553,8 @@
   "repo": "cyberthal/treefactor",
   "unstable": {
    "version": [
-    20191223,
-    1230
+    20200131,
+    621
    ],
    "deps": [
     "avy",
@@ -92724,14 +93562,14 @@
     "f",
     "org"
    ],
-   "commit": "caa431c3a512426de8abade3300d7fd21b969f7a",
-   "sha256": "1ppiwxnjcma5w3r0jnzywnsl7jn2yhjwq7gbam22phyf0jmpqnvd"
+   "commit": "273fe37aa4ba0fde084976f1b303ceec789a9f7b",
+   "sha256": "0bgbjkr81xrf4p9jcvdrb3d1nh6hyvdg6dgzbxsh7s73smal9kwk"
   },
   "stable": {
    "version": [
     3,
-    0,
-    2
+    2,
+    1
    ],
    "deps": [
     "avy",
@@ -92739,20 +93577,20 @@
     "f",
     "org"
    ],
-   "commit": "caa431c3a512426de8abade3300d7fd21b969f7a",
-   "sha256": "1ppiwxnjcma5w3r0jnzywnsl7jn2yhjwq7gbam22phyf0jmpqnvd"
+   "commit": "273fe37aa4ba0fde084976f1b303ceec789a9f7b",
+   "sha256": "0bgbjkr81xrf4p9jcvdrb3d1nh6hyvdg6dgzbxsh7s73smal9kwk"
   }
  },
  {
   "ename": "treemacs",
-  "commit": "37cca017cf529a0553ba73bcb824a945ec8b1137",
-  "sha256": "0is4waygw902vkha4jwav0i05298zhf4d559m91gmsfg1cfrlrr3",
+  "commit": "8fec46a8717fb5b0eedfba39b4b6001cce1c7145",
+  "sha256": "1vmqqq830ffqyp0jj9am60b88whvabzimpg12gp6wk86h41qpbqq",
   "fetcher": "github",
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20200103,
-    1907
+    20200301,
+    1232
    ],
    "deps": [
     "ace-window",
@@ -92764,8 +93602,8 @@
     "pfuture",
     "s"
    ],
-   "commit": "e2453d92b582fc1bb5cff1450aa350d4ee2c936a",
-   "sha256": "08aagxjawh25iymyjp5zlrg4wihr92wgpwbr3lgx0b0ffv4g0rxb"
+   "commit": "5f82d4414b8e89d45720fbd80acc18be073ff6d7",
+   "sha256": "1azk87gjclilk90fii9hjqr266015mwz58b7wm94zjp65dx1ig36"
   },
   "stable": {
    "version": [
@@ -92794,15 +93632,15 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20191223,
-    1047
+    20200114,
+    1715
    ],
    "deps": [
     "evil",
     "treemacs"
    ],
-   "commit": "e2453d92b582fc1bb5cff1450aa350d4ee2c936a",
-   "sha256": "08aagxjawh25iymyjp5zlrg4wihr92wgpwbr3lgx0b0ffv4g0rxb"
+   "commit": "5f82d4414b8e89d45720fbd80acc18be073ff6d7",
+   "sha256": "1azk87gjclilk90fii9hjqr266015mwz58b7wm94zjp65dx1ig36"
   },
   "stable": {
    "version": [
@@ -92825,15 +93663,15 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20200108,
-    553
+    20200205,
+    548
    ],
    "deps": [
     "cl-lib",
     "treemacs"
    ],
-   "commit": "e2453d92b582fc1bb5cff1450aa350d4ee2c936a",
-   "sha256": "08aagxjawh25iymyjp5zlrg4wihr92wgpwbr3lgx0b0ffv4g0rxb"
+   "commit": "5f82d4414b8e89d45720fbd80acc18be073ff6d7",
+   "sha256": "1azk87gjclilk90fii9hjqr266015mwz58b7wm94zjp65dx1ig36"
   },
   "stable": {
    "version": [
@@ -92856,16 +93694,16 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20191223,
-    1047
+    20200114,
+    1715
    ],
    "deps": [
     "magit",
     "pfuture",
     "treemacs"
    ],
-   "commit": "e2453d92b582fc1bb5cff1450aa350d4ee2c936a",
-   "sha256": "08aagxjawh25iymyjp5zlrg4wihr92wgpwbr3lgx0b0ffv4g0rxb"
+   "commit": "5f82d4414b8e89d45720fbd80acc18be073ff6d7",
+   "sha256": "1azk87gjclilk90fii9hjqr266015mwz58b7wm94zjp65dx1ig36"
   },
   "stable": {
    "version": [
@@ -92889,15 +93727,16 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20200103,
-    1832
+    20200301,
+    1156
    ],
    "deps": [
+    "dash",
     "persp-mode",
     "treemacs"
    ],
-   "commit": "e2453d92b582fc1bb5cff1450aa350d4ee2c936a",
-   "sha256": "08aagxjawh25iymyjp5zlrg4wihr92wgpwbr3lgx0b0ffv4g0rxb"
+   "commit": "5f82d4414b8e89d45720fbd80acc18be073ff6d7",
+   "sha256": "1azk87gjclilk90fii9hjqr266015mwz58b7wm94zjp65dx1ig36"
   }
  },
  {
@@ -92908,15 +93747,15 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20200107,
-    1640
+    20200114,
+    1715
    ],
    "deps": [
     "projectile",
     "treemacs"
    ],
-   "commit": "e2453d92b582fc1bb5cff1450aa350d4ee2c936a",
-   "sha256": "08aagxjawh25iymyjp5zlrg4wihr92wgpwbr3lgx0b0ffv4g0rxb"
+   "commit": "5f82d4414b8e89d45720fbd80acc18be073ff6d7",
+   "sha256": "1azk87gjclilk90fii9hjqr266015mwz58b7wm94zjp65dx1ig36"
   },
   "stable": {
    "version": [
@@ -93176,10 +94015,10 @@
  },
  {
   "ename": "ttl-mode",
-  "commit": "d56140a50abeab0953825d3646122d6e6ed19a7c",
-  "sha256": "1nnn2y0n9rj3a8r85y2vp6qja5rm4drcbnj9q793zzqfjl9akqd4",
+  "commit": "f91dc8c20b7b8a06cc2ee25b6f376aac3a6ad2c8",
+  "sha256": "07jryy2dws2q0v3184fzijx68gz65rv83csfwr5llm9ic6xmw5ky",
   "error": "Not in archive",
-  "fetcher": "bitbucket",
+  "fetcher": "github",
   "repo": "nxg/ttl-mode"
  },
  {
@@ -93442,11 +94281,11 @@
   "repo": "emacs-typescript/typescript.el",
   "unstable": {
    "version": [
-    20191209,
-    1107
+    20200221,
+    2312
    ],
-   "commit": "761f3aec6e192ddf0a9f1cc3d5d2ee77d32cb06c",
-   "sha256": "0b9gcidsgrmnz7dca8wx9ky8cqprxfi4zghf0cbfb31n0x2dqq5n"
+   "commit": "a8b7e76e85c1f8b4e353498e3e2d52f1dbcfb6d9",
+   "sha256": "13s4jclbs5563vjxh44ynzxh5k5hq5h1l9icf33wxwwqwk8b93lj"
   },
   "stable": {
    "version": [
@@ -93495,15 +94334,15 @@
   "repo": "mrkkrp/typit",
   "unstable": {
    "version": [
-    20190713,
-    1336
+    20200217,
+    2059
    ],
    "deps": [
     "f",
     "mmt"
    ],
-   "commit": "2adb0e0df4689b5abaa89a71808ec7993ecfaf9b",
-   "sha256": "1b4n85dp65naswp6s960l8kvdkd9424f6r2w5n3lxijxb8a5jlbw"
+   "commit": "231cb7df43253b84323520b8ed70f128d37003af",
+   "sha256": "1savrxs7xl92ifyxpxkkzv2didr7lb405h0dwz1bs1wldr5fb53f"
   },
   "stable": {
    "version": [
@@ -93527,11 +94366,11 @@
   "repo": "jorgenschaefer/typoel",
   "unstable": {
    "version": [
-    20191202,
-    1033
+    20200212,
+    919
    ],
-   "commit": "54a9dbcfb24a146fd14232e927109eec59b50171",
-   "sha256": "02ri51iyw99m1735j76qfd5spyyvxwg6mjzjd7g493h23pc6bvy6"
+   "commit": "505b4b1ead337b773863ea54066f867d07735f9e",
+   "sha256": "0n8xh6bp757fjqa68slphw04kb4g0489g66r6f4n4v8bpbbi3bbl"
   },
   "stable": {
    "version": [
@@ -93670,14 +94509,14 @@
   "repo": "ianxm/emacs-uml",
   "unstable": {
    "version": [
-    20191231,
-    1145
+    20200129,
+    1147
    ],
    "deps": [
     "seq"
    ],
-   "commit": "4ce7a07670832e3b22de2cef2130bc7867aadbf6",
-   "sha256": "0v2q2spk19n2mn7jfywnnik52kn7n30bgsznw6vs38z59z8z1nqn"
+   "commit": "4c37ac1c4424b2313cd8f16ba48a98a4cc214200",
+   "sha256": "145i4srnfvd1vyibri2a1l6p9mbjvkkwlrpi41134pbarqffcnka"
   }
  },
  {
@@ -93783,11 +94622,26 @@
   "repo": "ideasman42/emacs-undo-fu",
   "unstable": {
    "version": [
-    20200103,
-    1445
+    20200229,
+    2346
    ],
-   "commit": "a0e111b955c6f654faaf8125f95558a804a7b37c",
-   "sha256": "18vz67ifmlwprf5x7bp3crbimmg086a80cv1pd0lar25nc2cs7v6"
+   "commit": "8b0b289bbd83fac489baee3f46be2225a868e0f4",
+   "sha256": "1d4chzmx248pyk8qaswxyw4gzyk8r844gzzxh08dnl48406zhcy2"
+  }
+ },
+ {
+  "ename": "undo-fu-session",
+  "commit": "f39d9dc5e57554b42eca54ad5399a53947c2c25f",
+  "sha256": "0k9qxs3igzf7zcg1vd4v9npfiah512w9j2scnm333brmx4jfgvb7",
+  "fetcher": "gitlab",
+  "repo": "ideasman42/emacs-undo-fu-session",
+  "unstable": {
+   "version": [
+    20200221,
+    1152
+   ],
+   "commit": "35d4cf3771d905d647a35df050abfd9015833aad",
+   "sha256": "0846whh01bzxhl98wlywd11ki6wk2iyzzxvc5gnlj85cdasjrz10"
   }
  },
  {
@@ -93798,29 +94652,41 @@
   "repo": "jackkamm/undo-propose-el",
   "unstable": {
    "version": [
-    20191229,
-    2229
+    20200204,
+    1612
    ],
-   "commit": "71002612480fe5cb2b139e73d18c87ddf1fd76b2",
-   "sha256": "0mlmck46cgm95hsdqskadd975fdq03mh6pq6lfgzl1ffd0nfqm0z"
+   "commit": "20409358ad321fb937152cf93a50a4a775e405d6",
+   "sha256": "0mc6qldsjh8671kayl6wxmmcb8q0wjcg09qr7ppmsmwzsd9ydn0n"
   }
  },
  {
   "ename": "undohist",
-  "commit": "aebd16ca1ac51d9982eae5437c6084a2a3946b88",
-  "sha256": "0zzfzh8sf2dkz8h3kidv7zmwz2c2qq9n9qz2mab2lk0y44njzwhn",
+  "commit": "7856a62fb86415c88aa72b574895328c93c10a09",
+  "sha256": "0nsf4y5zbyhw965rdshky03n999pz71f4sy1nrp0y99ld1z2mk49",
   "fetcher": "github",
-  "repo": "m2ym/undohist-el",
+  "repo": "emacsorphanage/undohist",
   "unstable": {
    "version": [
-    20150315,
-    1242
+    20200120,
+    1328
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "d2239a5f736724ceb9e3b6bcaa86f4064805cda0",
-   "sha256": "1c0daw246ky7b1x5b8h55x79pl1pjqk1k348l487bdd8zdj4w9wx"
+   "commit": "6c905772e6aa9969fd9ca500d2fe93e114130fe6",
+   "sha256": "0hmx2b20nrxg2lb8vplgrzdh8chgxwlbmjvbq5scddggd302sd56"
+  },
+  "stable": {
+   "version": [
+    0,
+    2,
+    1
+   ],
+   "deps": [
+    "cl-lib"
+   ],
+   "commit": "6c905772e6aa9969fd9ca500d2fe93e114130fe6",
+   "sha256": "0hmx2b20nrxg2lb8vplgrzdh8chgxwlbmjvbq5scddggd302sd56"
   }
  },
  {
@@ -94353,8 +95219,8 @@
    "deps": [
     "bind-key"
    ],
-   "commit": "4b58ab78177f636f862a66c7a8fdcf9b070e0925",
-   "sha256": "04jva9wi8rpvz61qyvzd2fpsfsw43jkr5741yndrzkxx43q67qxj"
+   "commit": "42db6b3d90ee57d0f5947d3b0bf4b0010bdf7b40",
+   "sha256": "1an2whgy68l9c1l1qx8p8jz47g4hj2abf0kxvcmbc6wj8lp5zny8"
   },
   "stable": {
    "version": [
@@ -94385,8 +95251,8 @@
     "key-chord",
     "use-package"
    ],
-   "commit": "4b58ab78177f636f862a66c7a8fdcf9b070e0925",
-   "sha256": "04jva9wi8rpvz61qyvzd2fpsfsw43jkr5741yndrzkxx43q67qxj"
+   "commit": "42db6b3d90ee57d0f5947d3b0bf4b0010bdf7b40",
+   "sha256": "1an2whgy68l9c1l1qx8p8jz47g4hj2abf0kxvcmbc6wj8lp5zny8"
   },
   "stable": {
    "version": [
@@ -94447,8 +95313,8 @@
     "system-packages",
     "use-package"
    ],
-   "commit": "4b58ab78177f636f862a66c7a8fdcf9b070e0925",
-   "sha256": "04jva9wi8rpvz61qyvzd2fpsfsw43jkr5741yndrzkxx43q67qxj"
+   "commit": "42db6b3d90ee57d0f5947d3b0bf4b0010bdf7b40",
+   "sha256": "1an2whgy68l9c1l1qx8p8jz47g4hj2abf0kxvcmbc6wj8lp5zny8"
   },
   "stable": {
    "version": [
@@ -94557,8 +95423,8 @@
     20190715,
     1836
    ],
-   "commit": "ba35712f1bd1c489a54088a4fd807f8484c1d98a",
-   "sha256": "1bl4943qpi3qy152dbdm5glhx19zsiylmn4rcxi8l66g58hikyjp"
+   "commit": "c719401992c255f30ed42c4a942651ce7982ce9d",
+   "sha256": "1dafg3549mpkkl4c698byghai7nlr9nfzl2l7bgqxqwh5qrwp15k"
   },
   "stable": {
    "version": [
@@ -94593,11 +95459,19 @@
   "repo": "kanru/uuidgen-el",
   "unstable": {
    "version": [
-    20140918,
-    2301
+    20200223,
+    509
    ],
-   "commit": "7eb96415484c3854a3f383d1a3e10b87ae674e22",
-   "sha256": "19bf6vpc2b9hfjkjanji96fflvk1lbillasnpwcb6zzyq0cs47bw"
+   "commit": "f096f35a6e1f27d2bc9e9093cd61dd97bc33f502",
+   "sha256": "1nzf7cllyvx7kwdzpf0nl3g5a8mn6qgifa60aw68h0sx9a80xp01"
+  },
+  "stable": {
+   "version": [
+    1,
+    0
+   ],
+   "commit": "f096f35a6e1f27d2bc9e9093cd61dd97bc33f502",
+   "sha256": "1nzf7cllyvx7kwdzpf0nl3g5a8mn6qgifa60aw68h0sx9a80xp01"
   }
  },
  {
@@ -94665,14 +95539,14 @@
   "repo": "dougm/vagrant-tramp",
   "unstable": {
    "version": [
-    20190816,
-    1846
+    20200118,
+    2324
    ],
    "deps": [
     "dash"
    ],
-   "commit": "47c6fdc07722934eacce9f91c47bb1ee7d46b86f",
-   "sha256": "0a423h6klk0m3vjkds27a3h60xq8n72j15p1izrhgdzf1642w1g1"
+   "commit": "f67925928dd844b74e4002f433e6f0ebd3aae357",
+   "sha256": "1s022vcjzm78v1j7z29pda3lk9x93fvks4qw5v9kh2yzsrxdq4h8"
   }
  },
  {
@@ -94918,21 +95792,20 @@
   "repo": "stepnem/vcsh-el",
   "unstable": {
    "version": [
-    20191007,
-    1102
+    20200226,
+    1339
    ],
-   "commit": "cbb2b387ea035ee4f95455964144d699f573491d",
-   "sha256": "0apqrhdv0mrv52ws4yyd9q3fd5hrp084nvq5ji9gva8rs2qyki2v"
+   "commit": "7e376436b8f450a5571e19246136ccf77bbdd4f1",
+   "sha256": "183pffdiqb7qqmjq31wxl3fpv8qswqgg99gb716rddiyk15ysri7"
   },
   "stable": {
    "version": [
     0,
     4,
-    2,
-    1
+    4
    ],
-   "commit": "cbb2b387ea035ee4f95455964144d699f573491d",
-   "sha256": "0apqrhdv0mrv52ws4yyd9q3fd5hrp084nvq5ji9gva8rs2qyki2v"
+   "commit": "7e376436b8f450a5571e19246136ccf77bbdd4f1",
+   "sha256": "183pffdiqb7qqmjq31wxl3fpv8qswqgg99gb716rddiyk15ysri7"
   }
  },
  {
@@ -94966,14 +95839,14 @@
   "repo": "justbur/emacs-vdiff",
   "unstable": {
    "version": [
-    20190227,
-    303
+    20200214,
+    1845
    ],
    "deps": [
     "hydra"
    ],
-   "commit": "09e15fc932bfd2febe1d4a65780a532394562b07",
-   "sha256": "1gvqi5l4zs872nn4pmj603aza09d81qad2rgijzv268lif8z34db"
+   "commit": "c0541ae9c2cb878be9ab3935da058a72155a14fc",
+   "sha256": "0jqkr92y5xrwlj2aa8nm2s153nbzsy9xf04c2rixizg7xzz5jky8"
   },
   "stable": {
    "version": [
@@ -95163,6 +96036,30 @@
    "sha256": "0lzq31zqnk32vfp3kicnvgfr3nkv8amjzxmk9nrz1kwgmq7gvkjk"
   }
  },
+ {
+  "ename": "verb",
+  "commit": "3802b91f39ef7800afd49589d398182cb191b756",
+  "sha256": "12hskj4d7w43a8mjqqa535p02w778hi7lsxm47mh1xjiimibad3p",
+  "fetcher": "github",
+  "repo": "federicotdn/verb",
+  "unstable": {
+   "version": [
+    20200225,
+    2133
+   ],
+   "commit": "01555842722ee5ee3abfca1bffc60a188dd5d5ac",
+   "sha256": "1wa9jvz3yph0cxpda4s8lvnlpnlj4vpmvbvg5kvz6pi8kv39ajws"
+  },
+  "stable": {
+   "version": [
+    2,
+    8,
+    0
+   ],
+   "commit": "f9199768e55849cbe5a879a530b33bce88ac4c2c",
+   "sha256": "1zpsvjsr5mvi0l0mgfwirxg5bkhkp305h85fbv5g3hr4g0vnr448"
+  }
+ },
  {
   "ename": "veri-kompass",
   "commit": "18c3a69bec780e3e7456b310db6f0eec2a35c753",
@@ -95171,15 +96068,15 @@
   "repo": "koral/veri-kompass",
   "unstable": {
    "version": [
-    20181110,
-    933
+    20200213,
+    934
    ],
    "deps": [
     "cl-lib",
     "org"
    ],
-   "commit": "8638eea5a14f9834c001c943e7c22d8d90abc455",
-   "sha256": "1iy1qdh7bf3g7j3ipnpw96qgw4f4y4x8l2rg2kz651lhail3dk8i"
+   "commit": "271903cdf92db05898ee7cffb65641f30fa08280",
+   "sha256": "0ag2975bwj6l6wzd03min8dj5cy1429fzm3z2p2807i4j7fd7bkr"
   }
  },
  {
@@ -95288,16 +96185,16 @@
   "repo": "csantosb/vhdl-tools",
   "unstable": {
    "version": [
-    20191127,
-    2102
+    20200128,
+    957
    ],
    "deps": [
     "ggtags",
     "helm-rg",
     "outshine"
    ],
-   "commit": "e174a7077eb8b80cd76bb9688a4a5f08a747f212",
-   "sha256": "1c8wkfidvzpsv73d666n0n8marhavgm1yc6bv6ig5h4xsblhaigc"
+   "commit": "8584e73ab550841b3df7419dea32b874cdd64425",
+   "sha256": "0s0ljcn6lgcr6zqhw31llg4ri2drkxbz31kviir0xwgr8hn4p5dn"
   },
   "stable": {
    "version": [
@@ -95403,6 +96300,30 @@
    "sha256": "1750gx65ymibam8ahx5blfv5jc26f3mzbklk1jrmfwpsalyghdd9"
   }
  },
+ {
+  "ename": "vimgolf",
+  "commit": "1de0a1cdc8fd33601ecca982fa9aa66f4400843b",
+  "sha256": "15xq5vm82hy4pjw04m7xcqav7azsb3c65lp8cfxa29z7xg81w62f",
+  "fetcher": "github",
+  "repo": "timvisher/vimgolf.el",
+  "unstable": {
+   "version": [
+    20200205,
+    1420
+   ],
+   "commit": "f565447ed294898588a19438d56c116555d8c628",
+   "sha256": "0vyxqs575xfvk9vdwwx5vd9fmcjj1hl2139yw31902dd9lrf55ag"
+  },
+  "stable": {
+   "version": [
+    0,
+    10,
+    3
+   ],
+   "commit": "78e91f810a1b49d68ef19565e1c6513c84855e1e",
+   "sha256": "1picdbrkpd694aqmsjcs1v7fh6s6l8bb6j89bicss9gxn65p6bs8"
+  }
+ },
  {
   "ename": "vimish-fold",
   "commit": "b4862b0a3d43f073e645803cbbf11d973a4b51d5",
@@ -95411,15 +96332,15 @@
   "repo": "mrkkrp/vimish-fold",
   "unstable": {
    "version": [
-    20190713,
-    1333
+    20200223,
+    1836
    ],
    "deps": [
     "cl-lib",
     "f"
    ],
-   "commit": "863bef039672693566cfcfe1d0ad236d3af48fea",
-   "sha256": "0kr4rzfmydqcxsgzg88c3b8g5323dliirx1v01gdbinf868hlkh7"
+   "commit": "d3248a41a79092ea270b07ac60bf7420befa2146",
+   "sha256": "164jx09m7sgmffixlarjdyn8zdrqcmm4ngwddpjyv3phi65pnpj0"
   },
   "stable": {
    "version": [
@@ -95450,6 +96371,25 @@
    "sha256": "0026dqs3hwygk2k2xfra90w5sfnxrfj7l69jz7sq5glavbf340pk"
   }
  },
+ {
+  "ename": "virtual-auto-fill",
+  "commit": "a77a66240098fe2e6a4a8097ca9d0f85f3c2b9af",
+  "sha256": "14832wgn6kl122v3lddcnshgl6rk80cpm6xmmxcqcimhiybb9vcx",
+  "fetcher": "github",
+  "repo": "luisgerhorst/virtual-auto-fill",
+  "unstable": {
+   "version": [
+    20200217,
+    2333
+   ],
+   "deps": [
+    "adaptive-wrap",
+    "visual-fill-column"
+   ],
+   "commit": "91fb699ead3f86663e56b48a10adeb5723ca7b84",
+   "sha256": "0rfrgjflgn0c9xj7f4fwdzyclp2p9fbfir19iwy77z7jnkjk78dv"
+  }
+ },
  {
   "ename": "virtualenv",
   "commit": "923e4fcf29423ad55b13132d53759bc436466ef9",
@@ -95546,8 +96486,8 @@
     20190422,
     2154
    ],
-   "commit": "772d4b25ba19f57409cd03524be0f5bfdc2e8da1",
-   "sha256": "1k4a7nqc2zxwxrcrryap2jk6bwc6ln3j6yzgkg5yyf2imsbil4br"
+   "commit": "9a3a2ef3c7c76666a0c9271a821256eec9daab2a",
+   "sha256": "1z535rddy8q4gxdmsf7p1z3hm2vav0zcjh9kpxnq3v49scq1nd5j"
   },
   "stable": {
    "version": [
@@ -95722,6 +96662,52 @@
    "sha256": "0ymibjq6iwab5ia1fglhz4gm5cnbi792018fmrabcqkisj2zsjb7"
   }
  },
+ {
+  "ename": "vs-dark-theme",
+  "commit": "60b9b00d18334f2d7b737e3cc6b3c733e1b163e4",
+  "sha256": "0didkb2zd9ac7h1ccwi9y1q5mcqpwxyws7nsk5g8rhrkygdf9lds",
+  "fetcher": "github",
+  "repo": "jcs-elpa/vs-dark-theme",
+  "unstable": {
+   "version": [
+    20191209,
+    1600
+   ],
+   "commit": "d1f954a3879ec3f93c8dea9177772bf4d5bd0ecb",
+   "sha256": "13kfwp129wrlbbpvl9n4h7ybnycph68x214dx5v6v7ap6gnv0lr6"
+  },
+  "stable": {
+   "version": [
+    0,
+    1
+   ],
+   "commit": "c3c6b0be8bd525079b341490afc8875941b8af79",
+   "sha256": "0w4gygxdfbb7gp92f59p9qvw725l70sy2baf4h6rifrf92af55f2"
+  }
+ },
+ {
+  "ename": "vs-light-theme",
+  "commit": "c997456be95ece85fdef87905e9e14fe308fd827",
+  "sha256": "02w5zyxf34r1lvk56s3xbkzpvinbwsyv1h685hg9vhn0yy0a23ns",
+  "fetcher": "github",
+  "repo": "jcs-elpa/vs-light-theme",
+  "unstable": {
+   "version": [
+    20191209,
+    1600
+   ],
+   "commit": "764f478f5866140b121b1e43857487b7a66afa72",
+   "sha256": "0s8fh7n8qhsfdk8l7r81ifscaazgmpls4n3pginaqb5cszdy4063"
+  },
+  "stable": {
+   "version": [
+    0,
+    1
+   ],
+   "commit": "8b34cbe6294ad02676970bd72c9efbcc09981f3f",
+   "sha256": "0sw8k737ra2qhakxyf83lz41a5sv0dzw5xssnvyiyrarh73n5pp0"
+  }
+ },
  {
   "ename": "vscdark-theme",
   "commit": "8f3accf76fcd91e1507b9e8ac8577d3af5ae0b88",
@@ -95760,11 +96746,11 @@
   "repo": "akermu/emacs-libvterm",
   "unstable": {
    "version": [
-    20200107,
-    1419
+    20200224,
+    307
    ],
-   "commit": "58b4cc40ee9872a08fc5cbfee78ad0e195a3306c",
-   "sha256": "1w5yfl8nq4k7xyldf0ivzv36vhz3dwdzk6q2vs3xwpx6ljy52px6"
+   "commit": "b9bccf38dfeb495bfd93d55618b3791ebad24588",
+   "sha256": "053x5zpfsj0n0a8gdzra7awg3y3py2a2nxv14vn4g8r7hrhdwac0"
   }
  },
  {
@@ -95775,14 +96761,14 @@
   "repo": "jixiuf/vterm-toggle",
   "unstable": {
    "version": [
-    20191209,
-    928
+    20200228,
+    628
    ],
    "deps": [
     "vterm"
    ],
-   "commit": "88c823b532493b95a24d9cbd749278552a047860",
-   "sha256": "0ascpjc3c5q9pw2xbqfc60vxmsdhw7yakb2rvkgglha314p3fwkb"
+   "commit": "24d68a0ab920875d0834598688128e692fe9a5b2",
+   "sha256": "0bzxd5xzpajvg7mv7ggplcba7plchhlrl1m14dnx3nrx6q0936cr"
   }
  },
  {
@@ -95888,11 +96874,11 @@
   "repo": "emacs-w3m/emacs-w3m",
   "unstable": {
    "version": [
-    20200105,
-    2322
+    20200113,
+    2320
    ],
-   "commit": "550cd4250d7db1248ffc3b6d897925558d9ef604",
-   "sha256": "116c0x7wric1gqxm8jswv732aymwd5hpy7dwzw19cx22w2j0imzy"
+   "commit": "6eda3828bb8530ecd69a3823bd5569a5f779c239",
+   "sha256": "0ij85i0zy9wi1cgm0j8cvqpv9802kfy7g4ffx381l7k28m35lqh2"
   }
  },
  {
@@ -96006,6 +96992,25 @@
    "sha256": "0bgvniw3ibcjsmzwrndg6pxwbpnpnxsb8ijs2gxg5kbm1hqqly32"
   }
  },
+ {
+  "ename": "walkman",
+  "commit": "603a2bf865eb16505504cf20ab1ecfd619cce6dc",
+  "sha256": "1hr5c95pv30l18f0kv0sgn5h46x8989lg4n0kg7bd1kb7k6hc8n1",
+  "fetcher": "github",
+  "repo": "abrochard/walkman",
+  "unstable": {
+   "version": [
+    20200224,
+    1501
+   ],
+   "deps": [
+    "org",
+    "transient"
+   ],
+   "commit": "bdc026b58dc023cf078ec5eafae3b334ac5c39ef",
+   "sha256": "13bhdmylg7k9r5y6wi158rv8rm4cndv8av35g65vc6qk0bgnnwpz"
+  }
+ },
  {
   "ename": "wand",
   "commit": "38be840bbb32094b753ec169b717a70817006655",
@@ -96014,15 +97019,15 @@
   "repo": "cmpitg/wand",
   "unstable": {
    "version": [
-    20191122,
-    1408
+    20200211,
+    2238
    ],
    "deps": [
     "dash",
     "s"
    ],
-   "commit": "93a5a4ecab1973e5846b35f856391daf8068d12e",
-   "sha256": "067149rrl6rgfdq55fpx8d2y4b0kqi1ify53ajksrddz74fl6h0c"
+   "commit": "fe4bf7b35b61eda15437a212e96d08395d307f73",
+   "sha256": "1rfiyh2v28zpdv8sd6hjz5fgv3knyhgz1ymp9ycl9m4y93s78wbq"
   }
  },
  {
@@ -96151,19 +97156,19 @@
   "repo": "bnbeckwith/wc-mode",
   "unstable": {
    "version": [
-    20170127,
-    429
+    20200108,
+    1841
    ],
-   "commit": "f218f42709a651b34d6c1ddd98856f44648ef707",
-   "sha256": "0h79kf37pns92w4zsgazwhg087vkjvnhk9p1npll5ka87zbknndm"
+   "commit": "79107d1130e8be3e1db4619373b98045b4fd9033",
+   "sha256": "01icd63mb2hg1bgbmkq3jm8kc3ic8whfy2awcgx53zqkmyz87qxc"
   },
   "stable": {
    "version": [
     1,
-    3
+    4
    ],
-   "commit": "122f90bd1d422a84cc50acabd350d44d39ddeb69",
-   "sha256": "0pjlxv46zzqdq6q131jb306vqlg4sfqls1x8vag7mmfw462hafqp"
+   "commit": "79107d1130e8be3e1db4619373b98045b4fd9033",
+   "sha256": "01icd63mb2hg1bgbmkq3jm8kc3ic8whfy2awcgx53zqkmyz87qxc"
   }
  },
  {
@@ -96205,6 +97210,29 @@
    "sha256": "0j7sv3dcpq2fvcip9834v6k8q1d8bpnbxnvz1g691lmc58z1a86a"
   }
  },
+ {
+  "ename": "weak-ref",
+  "commit": "ef1a6048d197a4feebb8d4ebb6dbfd600bce100e",
+  "sha256": "08c887xkj18j9s92pqlik7x6984y2fi4q7xlqa6wrbmjgl27cl1z",
+  "fetcher": "github",
+  "repo": "skeeto/elisp-weak-ref",
+  "unstable": {
+   "version": [
+    20200217,
+    2200
+   ],
+   "commit": "24e8c37da6465e65ce9f866267bd3fa53c8899c6",
+   "sha256": "0jh3l64sagvm3jdhxk8wwfddckwgk66w1cfn7cchklz0wss82cs2"
+  },
+  "stable": {
+   "version": [
+    2,
+    0
+   ],
+   "commit": "434e7d7cc84d0813bd06606a04c08fc96cd9eec8",
+   "sha256": "1rri4q600vs3fhvvyds6jshjranfvb1zzn6zwy44q5g914ghhnfw"
+  }
+ },
  {
   "ename": "weather-metno",
   "commit": "75beac314565b9becb701ddd9bc85660e268c3ae",
@@ -96309,11 +97337,11 @@
   "repo": "fxbois/web-mode",
   "unstable": {
    "version": [
-    20191104,
+    20200229,
     1859
    ],
-   "commit": "cd000fcfce97152f8b831b7eef4ea0d0b1eed11a",
-   "sha256": "0fm9gwgcg3qgx8q2l27lsn76mzdkdsxvrwgwfsq34gzwzm1yg2xb"
+   "commit": "f271e1b97989e7de8e33cb49a97a829ebec1911d",
+   "sha256": "192zkjlz3dm1p6lrivc0qqws7mfyv1nvbgcq71gfpm9x085rqyn4"
   },
   "stable": {
    "version": [
@@ -96402,11 +97430,11 @@
   "repo": "eschulte/emacs-web-server",
   "unstable": {
    "version": [
-    20190310,
-    213
+    20200216,
+    1126
    ],
-   "commit": "cafa5b7582c57252a0884b2c33da9b18fb678713",
-   "sha256": "1c0lfqmbs5hvz3fh3c8wgp6ipwmxrwx9xj264bjpj3phixd5419y"
+   "commit": "33afdb46e1cd61251736816d965495525b36c9cd",
+   "sha256": "109gxdk7xznxm85fvlvccj01bznali98wzywypzy73l8zxs2yj74"
   }
  },
  {
@@ -96453,15 +97481,15 @@
   "repo": "etu/webpaste.el",
   "unstable": {
    "version": [
-    20191214,
-    649
+    20200227,
+    912
    ],
    "deps": [
     "cl-lib",
     "request"
    ],
-   "commit": "8f9322fb1c6b8a80187f48ba2cb96cc107fad2b2",
-   "sha256": "135gz07zwizvp4iv9k3s20rx8f5rmzmqwas5rfkx9c2nffarnjii"
+   "commit": "ef33b0f298bf36cfb84b37af4870706fc376b0c3",
+   "sha256": "0v2yw3jbwlamkycgfmd5abxr764zyzcggyzn2ybzlkffxaxaz6dw"
   },
   "stable": {
    "version": [
@@ -96609,20 +97637,20 @@
   "repo": "mhayashi1120/Emacs-wgrep",
   "unstable": {
    "version": [
-    20181229,
-    40
+    20200217,
+    1030
    ],
-   "commit": "379afd89ebd76f63842c8589127d66096a8bb595",
-   "sha256": "0v1qx8z1xj9qzirlycbihnkpwcklyi3a0j8lil78pmdpixdbgh47"
+   "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c",
+   "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j"
   },
   "stable": {
    "version": [
     2,
     3,
-    0
+    2
    ],
-   "commit": "36c5e8d0e03bc16b19d30a603730065f74b5b767",
-   "sha256": "0pgyf9vfcahb495q01hi1mvkmv846w4rj6zyf52is8x7sjj7x44s"
+   "commit": "fcd8c22748024342af15d54f3e7ab5596cf5c4bd",
+   "sha256": "00cwqzb94jlq4mwgv8z7r3mn0a6mhq95z6j189kacq9g4473zh8d"
   }
  },
  {
@@ -96633,26 +97661,26 @@
   "repo": "mhayashi1120/Emacs-wgrep",
   "unstable": {
    "version": [
-    20141012,
-    1011
+    20200128,
+    109
    ],
    "deps": [
     "wgrep"
    ],
-   "commit": "379afd89ebd76f63842c8589127d66096a8bb595",
-   "sha256": "0v1qx8z1xj9qzirlycbihnkpwcklyi3a0j8lil78pmdpixdbgh47"
+   "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c",
+   "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j"
   },
   "stable": {
    "version": [
     2,
     3,
-    0
+    2
    ],
    "deps": [
     "wgrep"
    ],
-   "commit": "36c5e8d0e03bc16b19d30a603730065f74b5b767",
-   "sha256": "0pgyf9vfcahb495q01hi1mvkmv846w4rj6zyf52is8x7sjj7x44s"
+   "commit": "fcd8c22748024342af15d54f3e7ab5596cf5c4bd",
+   "sha256": "00cwqzb94jlq4mwgv8z7r3mn0a6mhq95z6j189kacq9g4473zh8d"
   }
  },
  {
@@ -96663,26 +97691,26 @@
   "repo": "mhayashi1120/Emacs-wgrep",
   "unstable": {
    "version": [
-    20181229,
-    124
+    20200217,
+    1028
    ],
    "deps": [
     "wgrep"
    ],
-   "commit": "379afd89ebd76f63842c8589127d66096a8bb595",
-   "sha256": "0v1qx8z1xj9qzirlycbihnkpwcklyi3a0j8lil78pmdpixdbgh47"
+   "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c",
+   "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j"
   },
   "stable": {
    "version": [
     2,
     3,
-    0
+    2
    ],
    "deps": [
     "wgrep"
    ],
-   "commit": "36c5e8d0e03bc16b19d30a603730065f74b5b767",
-   "sha256": "0pgyf9vfcahb495q01hi1mvkmv846w4rj6zyf52is8x7sjj7x44s"
+   "commit": "fcd8c22748024342af15d54f3e7ab5596cf5c4bd",
+   "sha256": "00cwqzb94jlq4mwgv8z7r3mn0a6mhq95z6j189kacq9g4473zh8d"
   }
  },
  {
@@ -96693,26 +97721,26 @@
   "repo": "mhayashi1120/Emacs-wgrep",
   "unstable": {
    "version": [
-    20190401,
-    2156
+    20200128,
+    109
    ],
    "deps": [
     "wgrep"
    ],
-   "commit": "379afd89ebd76f63842c8589127d66096a8bb595",
-   "sha256": "0v1qx8z1xj9qzirlycbihnkpwcklyi3a0j8lil78pmdpixdbgh47"
+   "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c",
+   "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j"
   },
   "stable": {
    "version": [
     2,
     3,
-    0
+    2
    ],
    "deps": [
     "wgrep"
    ],
-   "commit": "36c5e8d0e03bc16b19d30a603730065f74b5b767",
-   "sha256": "0pgyf9vfcahb495q01hi1mvkmv846w4rj6zyf52is8x7sjj7x44s"
+   "commit": "fcd8c22748024342af15d54f3e7ab5596cf5c4bd",
+   "sha256": "00cwqzb94jlq4mwgv8z7r3mn0a6mhq95z6j189kacq9g4473zh8d"
   }
  },
  {
@@ -96723,26 +97751,26 @@
   "repo": "mhayashi1120/Emacs-wgrep",
   "unstable": {
    "version": [
-    20140510,
-    2231
+    20200128,
+    109
    ],
    "deps": [
     "wgrep"
    ],
-   "commit": "379afd89ebd76f63842c8589127d66096a8bb595",
-   "sha256": "0v1qx8z1xj9qzirlycbihnkpwcklyi3a0j8lil78pmdpixdbgh47"
+   "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c",
+   "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j"
   },
   "stable": {
    "version": [
     2,
     3,
-    0
+    2
    ],
    "deps": [
     "wgrep"
    ],
-   "commit": "36c5e8d0e03bc16b19d30a603730065f74b5b767",
-   "sha256": "0pgyf9vfcahb495q01hi1mvkmv846w4rj6zyf52is8x7sjj7x44s"
+   "commit": "fcd8c22748024342af15d54f3e7ab5596cf5c4bd",
+   "sha256": "00cwqzb94jlq4mwgv8z7r3mn0a6mhq95z6j189kacq9g4473zh8d"
   }
  },
  {
@@ -96768,20 +97796,20 @@
   "repo": "justbur/emacs-which-key",
   "unstable": {
    "version": [
-    20191221,
-    1857
+    20200216,
+    1350
    ],
-   "commit": "1e3640e48c31f8062f018b5fc84acad696a0ea2a",
-   "sha256": "1ahgb7dqdc75farkl0fg0a6hvx2067gdvjq99cd3z2dz56km0p05"
+   "commit": "8b49ae978cceca65967f3544c236f32964ddbed0",
+   "sha256": "15ydzqv23m1w6g27il57fmzs6pjcasdb7drml3msjpq2l8kr4ard"
   },
   "stable": {
    "version": [
     3,
-    3,
-    1
+    4,
+    0
    ],
-   "commit": "2f5661646b771f6c5a00a8a9aaa3f183abd5f84d",
-   "sha256": "1dh6kr00wmql46whjkvnl953zngiv5j99ypvr1b3cb2174623afb"
+   "commit": "1e3640e48c31f8062f018b5fc84acad696a0ea2a",
+   "sha256": "1ahgb7dqdc75farkl0fg0a6hvx2067gdvjq99cd3z2dz56km0p05"
   }
  },
  {
@@ -96933,8 +97961,8 @@
     20190529,
     1554
    ],
-   "commit": "b4cdab4d25225c6e834727a7d85cdb0d493da152",
-   "sha256": "058wym1iwgz5n5yd508xdc05ncdyqbs53a5c9mq0s6gs06h5xfyw"
+   "commit": "c86c0ad9adc4787a422cca11b66229cc14a6d83a",
+   "sha256": "1abn5rzapbvk217h1s7lk166y48g7fvdvjmy2fsbz60rwq2zhpk6"
   },
   "stable": {
    "version": [
@@ -97446,14 +98474,14 @@
   "repo": "magit/with-editor",
   "unstable": {
    "version": [
-    20200102,
-    2147
+    20200217,
+    1015
    ],
    "deps": [
     "async"
    ],
-   "commit": "7e0bf753709f1775d2bbbb6edf4482fca7fd286a",
-   "sha256": "1y4zrgsfs0504ks30qb7hl32ygd3hb6yx5x8032b30j7rh5ks29d"
+   "commit": "4fe66d4d55c8eacebda53a13cc38e01d32bdaaa2",
+   "sha256": "1lyjrh1vddnf8v4i6g05bfx1kq8angbdhyh5v3j0d27gb66cshxp"
   },
   "stable": {
    "version": [
@@ -97476,11 +98504,11 @@
   "repo": "twlz0ne/with-emacs.el",
   "unstable": {
    "version": [
-    20191219,
-    1521
+    20200210,
+    1543
    ],
-   "commit": "295e5d5b16fd96ed476ea55efa60819515daafef",
-   "sha256": "1fgqzwg1p9by1zqhhdvh8g25wdig6d9d4p5ish70qij46gvaf7a0"
+   "commit": "9f99bec56f87e53deb9f33b364eda77677a17eb9",
+   "sha256": "0ay860skpnbv6a8xid0hhz9vx33ks2vkdicvpm3a4qngp932jvnp"
   }
  },
  {
@@ -97517,6 +98545,24 @@
    "sha256": "1nxssc8xn8i2zf9bs9rv61im3jxi38lq1ph9qr0hazwncndcsb39"
   }
  },
+ {
+  "ename": "with-shell-interpreter",
+  "commit": "dc61e8f90dbae7184228b16de447ce1ede630a1c",
+  "sha256": "0qjr7j3jv20ja94ma0rk4rr0fx6vazqp25sgc806xl034ax669y9",
+  "fetcher": "github",
+  "repo": "p3r7/with-shell-interpreter",
+  "unstable": {
+   "version": [
+    20200217,
+    1112
+   ],
+   "deps": [
+    "cl-lib"
+   ],
+   "commit": "62c3b0bd16c6fc4a0ee42f4d6a2dd7f66beab7cc",
+   "sha256": "1hp3i9njipzppdlwl7a3xhdrvvmc0ynmh85nmj0csxzpnahyp12d"
+  }
+ },
  {
   "ename": "with-simulated-input",
   "commit": "e4ddf16e19f5018106a423327ddc7e7499cf9248",
@@ -97525,15 +98571,11 @@
   "repo": "DarwinAwardWinner/with-simulated-input",
   "unstable": {
    "version": [
-    20191127,
-    2116
+    20200215,
+    1807
    ],
-   "deps": [
-    "s",
-    "seq"
-   ],
-   "commit": "7b044003150ee39505234080b86f474c60ad3471",
-   "sha256": "1y544fff80cjdzx9js5fwqnicdc75k5kn6i0hl6ns0cr6779b3z2"
+   "commit": "29173588751eeb33d2392d380b26648b2e213438",
+   "sha256": "0qmcv1ks3cnvl7l6cmbl5a03irwp38zfc98rzp9hbd3xw7rh970b"
   },
   "stable": {
    "version": [
@@ -97556,14 +98598,14 @@
   "repo": "10sr/with-venv-el",
   "unstable": {
    "version": [
-    20190516,
-    606
+    20200125,
+    1620
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "3728d3a60c600d7ac505ce281cd2579a8992c14d",
-   "sha256": "16gb7fcgz2akd78hxi8fy0h62957xfrgqb7flw8hkrixxi26jxyn"
+   "commit": "51ba19ac75a2796d494587b3b20ce51d4eb178a5",
+   "sha256": "1nbw88727spdgivrafjnlzbda81nnd1xprqdgmy6h2xfvki23zzb"
   },
   "stable": {
    "version": [
@@ -97750,8 +98792,8 @@
   "repo": "abo-abo/worf",
   "unstable": {
    "version": [
-    20191116,
-    1730
+    20200121,
+    1629
    ],
    "deps": [
     "ace-link",
@@ -97759,8 +98801,8 @@
     "swiper",
     "zoutline"
    ],
-   "commit": "b1fb5771c4a3a47b628b8c349595c4ace347113b",
-   "sha256": "0s6c91r48cr306dh7pf3jlrkjvjbipxvv7936h8q8a8l97y3a5wv"
+   "commit": "bdc8240ff4188c7403a020eb58dc10eea104b7df",
+   "sha256": "1lkix09lwnjsycaacwdn7gyqnm0n2frcp1p0l3hfhayz3p18dy5p"
   },
   "stable": {
    "version": [
@@ -97943,25 +98985,25 @@
   "repo": "joostkremers/writeroom-mode",
   "unstable": {
    "version": [
-    20191208,
-    2351
+    20200225,
+    2011
    ],
    "deps": [
     "visual-fill-column"
    ],
-   "commit": "fa17eb651102502f60086d62784f1dae15c0630d",
-   "sha256": "1nrppnfqsaki6myp58w8jhmzb94rzskh5n98glcn4ghr8sqnafi8"
+   "commit": "c806c41f7c2ecb3f945aef7f0c25e3e223ededc0",
+   "sha256": "0wi8l1nz4g8ygxvffpa525lm80l0jwj92argsa5i11sh7w6hjksv"
   },
   "stable": {
    "version": [
     3,
-    9
+    10
    ],
    "deps": [
     "visual-fill-column"
    ],
-   "commit": "fa17eb651102502f60086d62784f1dae15c0630d",
-   "sha256": "1nrppnfqsaki6myp58w8jhmzb94rzskh5n98glcn4ghr8sqnafi8"
+   "commit": "6552c056b85fd26a3ac509100d9d5c5c3c19515a",
+   "sha256": "0la4q2dm123l4rdfh0ry03b99ihvh324y7iw12az909198bcx335"
   }
  },
  {
@@ -98049,20 +99091,20 @@
   "repo": "redguardtoo/wucuo",
   "unstable": {
    "version": [
-    20191219,
-    418
+    20200116,
+    1447
    ],
-   "commit": "95c417f49321071645214a5774209393f0db3dbd",
-   "sha256": "1scw0lzbix4ifh0mkh20wbb4a9h32n8ncpxnlxwdim8z4b469w11"
+   "commit": "92e562077cc21dbe285ad2fa7b171c8aae7b556f",
+   "sha256": "0wbmprg7nbwwpxffknkrg662v0dzdvlipz9f104bhaxvfcmy36ij"
   },
   "stable": {
    "version": [
     0,
     0,
-    6
+    7
    ],
-   "commit": "dc56b11e0f5c4e4a121e6ac72523fa0e6cae4c02",
-   "sha256": "0mjvdj9j1l27i5nmam087fig6183awbn6xnib4wrrfbyc6q4qxlw"
+   "commit": "92e562077cc21dbe285ad2fa7b171c8aae7b556f",
+   "sha256": "0wbmprg7nbwwpxffknkrg662v0dzdvlipz9f104bhaxvfcmy36ij"
   }
  },
  {
@@ -98218,11 +99260,11 @@
   "repo": "xahlee/xah-fly-keys",
   "unstable": {
    "version": [
-    20191226,
-    2348
+    20200215,
+    124
    ],
-   "commit": "b3702573524c8bde14a6eb32cf2da20cfa0a0bbf",
-   "sha256": "10rlpd8jxndv3pg2vafq3dgpfifzdid1377agmxr5m646n8a4ddf"
+   "commit": "064cb19b1d3d133ea0f123e570f0c6c3351af9c7",
+   "sha256": "0vsm7lbv0sw0zxiprgq756fcl1hz8aj5v1lczwzd7v7sxzkcslv6"
   }
  },
  {
@@ -98248,11 +99290,11 @@
   "repo": "xahlee/lookup-word-on-internet",
   "unstable": {
    "version": [
-    20181225,
-    1942
+    20200225,
+    31
    ],
-   "commit": "2cafbf3605a8f2ac4c56392c5b1f75adc3b11f24",
-   "sha256": "1xr2fp6dylv098g7m7x31j7jllr87545snab3qw5r32rzsa7fswz"
+   "commit": "5ddd01520ca49d459f67567901fc08c84aa553bd",
+   "sha256": "07fx4vypgim39rw022v5m7gfp68095s393j8s28k2j038jqgzdp5"
   }
  },
  {
@@ -98263,11 +99305,11 @@
   "repo": "xahlee/xah-math-input",
   "unstable": {
    "version": [
-    20190206,
-    1658
+    20200217,
+    740
    ],
-   "commit": "af787f87815b85d56c35bbe0f22e03a31c8e670d",
-   "sha256": "05fqjyzz6c0nclhqc7qxs3hg99d3yxb3qjzn1wc26m6jcmm2l6zd"
+   "commit": "c1e72c4578a134e9aa3ec9ef425038d8c16fba94",
+   "sha256": "0laq440vk8mnjbdjz0h4n18qh72n83hxqmwjm124ykzclzjcdknh"
   }
  },
  {
@@ -98491,11 +99533,11 @@
   "repo": "ndw/xml-quotes",
   "unstable": {
    "version": [
-    20151230,
-    2249
+    20200301,
+    1222
    ],
-   "commit": "26db170e80b9295861227cdf970721b12539ed44",
-   "sha256": "0z3yd3dzcsd7584jchv9q55fx04ig4yjzp8ay2pa112lykv4jxxd"
+   "commit": "8fc21e43b45f9a50b24642412f05afcc3a316a1f",
+   "sha256": "1czz6zgbnvwf3bn6k5iczs02rjx6frjnc0d78gcxhvsnbsvv60iw"
   }
  },
  {
@@ -98803,26 +99845,26 @@
  },
  {
   "ename": "yafolding",
-  "commit": "855ea20024b606314f8590129259747cac0bcc97",
-  "sha256": "1yb1rlxa5f1y1xjqs7ndr5jnf9j5cv0ccqdpbrx4l9xkm3npw9zl",
+  "commit": "aca84b24c4d95b330b233851af35e7c8a8e6615c",
+  "sha256": "0xlcxhmgm8nmv14yr2ffvmf5g7fs6rnq9yc1zpcar8x3d11s0ql2",
   "fetcher": "github",
-  "repo": "zenozeng/yafolding.el",
+  "repo": "emacsorphanage/yafolding",
   "unstable": {
    "version": [
-    20170305,
-    317
+    20200119,
+    1353
    ],
-   "commit": "57c015ddd7c3454571c80825bc5391d7a10fa1d7",
-   "sha256": "144v8nn4l8ngfdrsgj5nrxp09391gnfrqf950y956cbmqvnlw7z8"
+   "commit": "4c1888ae45f9241516519ae0ae3a899f2efa05ba",
+   "sha256": "1bb763lx5cs5z06irjllip8z9c61brjsamfcjajibi24wcajkprx"
   },
   "stable": {
    "version": [
     0,
     4,
-    0
+    1
    ],
-   "commit": "57c015ddd7c3454571c80825bc5391d7a10fa1d7",
-   "sha256": "144v8nn4l8ngfdrsgj5nrxp09391gnfrqf950y956cbmqvnlw7z8"
+   "commit": "4c1888ae45f9241516519ae0ae3a899f2efa05ba",
+   "sha256": "1bb763lx5cs5z06irjllip8z9c61brjsamfcjajibi24wcajkprx"
   }
  },
  {
@@ -98866,8 +99908,8 @@
     20171022,
     1412
    ],
-   "commit": "f13ba9d613c0edaa23fac57721529cf41413353f",
-   "sha256": "1ijacfcz2b7cmgxfyx9b7yhs9nybv19388fb9y0527nhbnjls4v4"
+   "commit": "db84dbb30ed39079d34d5eba01cc67af6f7d92de",
+   "sha256": "1syxgm3a51i3kybbjgjlwlrrgr6rscr4iqam3aa7r55z0hlx8k2r"
   }
  },
  {
@@ -99004,11 +100046,11 @@
   "repo": "Kungsgeten/yankpad",
   "unstable": {
    "version": [
-    20191228,
-    1345
+    20200108,
+    1811
    ],
-   "commit": "0230b1dd2477673ba45a7c07da6bac15414f10cd",
-   "sha256": "01007dz4lxv50qkcb3z4z5ibc0jkqw79hyxg7qfjdar8157ylb2s"
+   "commit": "dd97994a8bff58e4d98aa6cb90aa08c5ddde5c82",
+   "sha256": "114qnr8s5v2dr3v3jvy4aagyi1wbn3fw27mrb6zdg6faxvfpd8sk"
   },
   "stable": {
    "version": [
@@ -99027,11 +100069,11 @@
   "repo": "JorisE/yapfify",
   "unstable": {
    "version": [
-    20191103,
-    2100
+    20200117,
+    1245
    ],
-   "commit": "530ca2b589070edfe9bd59034af55c924d03b83a",
-   "sha256": "14f2zfb4l3fd2sry7b3cjzk0bhdfsmwjqsc25zaf2y5dy0ryllds"
+   "commit": "0b4f20af0b00a86353ddc286df26eade89381269",
+   "sha256": "1k91fav3dvdjkg632zhkmgbjvichbixwqdir4x8lc332ma3wwi0h"
   },
   "stable": {
    "version": [
@@ -99104,10 +100146,10 @@
   "repo": "anachronic/yarn-mode",
   "unstable": {
    "version": [
-    20191208,
-    2153
+    20200208,
+    2332
    ],
-   "commit": "218cdb3c53d740b4520c807cb0d8479bfecedaed",
+   "commit": "8239d4dc7d8a52fa1e3fa81bd32c904a359fcfc1",
    "sha256": "0pf98jkz8k4gyc650wwfhww6gli847hmxb8lrnmw50yb88dqa38f"
   },
   "stable": {
@@ -99121,28 +100163,32 @@
  },
  {
   "ename": "yascroll",
-  "commit": "091dcc3775ec2137cb61d66df4e72aca4900897a",
-  "sha256": "11g7wn4hgdwnx3n7ra0sh8gk6rykwvrg9g2cihvcv7mjbqgcv53f",
+  "commit": "7856a62fb86415c88aa72b574895328c93c10a09",
+  "sha256": "1hdh8xfmgj0w3vrl3nr3i6j8b9qf8ndnfa1bvwainzdbxpfwiz1v",
   "fetcher": "github",
-  "repo": "m2ym/yascroll-el",
+  "repo": "emacsorphanage/yascroll",
   "unstable": {
    "version": [
-    20170315,
-    1906
+    20200224,
+    1117
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "fe4494e5f4faf2832e665c7de0fed99cdbb39478",
-   "sha256": "09y8phmvqdwp1k9w84rf6p609jrg0mhgx6akwda8rsvxrrbsh6j4"
+   "commit": "b298a34ae872a45c3e83d29d33888abde59c185b",
+   "sha256": "1pnynyy3scrd15q4ag769af5njrxx6rw48svbsfx3xrz1n0x9snz"
   },
   "stable": {
    "version": [
     0,
-    1
+    1,
+    7
    ],
-   "commit": "0a8b531b3a3c8afe7235c8c212e08bfe2021a629",
-   "sha256": "007837w6gd7k253h7g2in6l3ihcbwv733yiffs26pnymgk21xdqz"
+   "deps": [
+    "cl-lib"
+   ],
+   "commit": "784ebb0ee5496b5e7762bfd4c8101166542cb90d",
+   "sha256": "1k9y319ny01yqkg1xsh4rh2xs3dpx5jgvhs17p4c4dvqm0g53mkm"
   }
  },
  {
@@ -99165,14 +100211,14 @@
   "stable": {
    "version": [
     0,
-    13,
+    14,
     0
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "5a29fe67d70de3749e30ebb37206395b4d1a51a8",
-   "sha256": "0fkkplycrw8f8r30hjjxl1wm7p2irq2ipzzc1g7cc52abaal796p"
+   "commit": "3bf9a3b1af37174a004798b7195826af0123fa6a",
+   "sha256": "0via9dzw8m5lzymg1h78xkwjssh39zr3g6ccyamlf1rjzjsyxknv"
   }
  },
  {
@@ -99201,14 +100247,14 @@
   "repo": "AndreaCrotti/yasnippet-snippets",
   "unstable": {
    "version": [
-    20191230,
-    1405
+    20200122,
+    1140
    ],
    "deps": [
     "yasnippet"
    ],
-   "commit": "e813c1479a9fb2773d95ddba39c4aa0e7a1c33c5",
-   "sha256": "095w7cdmfwmmr6426mbq15n0a5izgbmv9408m9yh1pqz5x3v3vsx"
+   "commit": "612be838d2e50c3601c349d7842702d95e17682a",
+   "sha256": "1m7iyg7zw1jwv4sq788sv84269nydn7c6xbhvhip8hkddyn03pcl"
   },
   "stable": {
    "version": [
@@ -99224,31 +100270,31 @@
  },
  {
   "ename": "yatemplate",
-  "commit": "8ba3cdb74f121cbf36b6d9d5a434c363905ce526",
+  "commit": "67a9079253ebd9ab3b34e16eea0443812fb1a8ee",
   "sha256": "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q",
   "fetcher": "github",
   "repo": "mineo/yatemplate",
   "unstable": {
    "version": [
-    20180617,
-    952
+    20200108,
+    2102
    ],
    "deps": [
     "yasnippet"
    ],
-   "commit": "4f4fca9f04f7088c98aa195cf33635a35a6055cb",
-   "sha256": "04nd9fcp0ff2sjhwrq4nqjicc50m7498vq1qzw2cn5c5gaqmzff8"
+   "commit": "bfee45cfc179d6b7fbc3ff06c9f79b76dc7fbf58",
+   "sha256": "0h2fc9vjwb94n3nklq35s3dy9i4ihrqffp2556cmsaq7gzlipb81"
   },
   "stable": {
    "version": [
-    3,
+    4,
     0
    ],
    "deps": [
     "yasnippet"
    ],
-   "commit": "c1de31d2b16d98af197a4392b6481346ab4e8d57",
-   "sha256": "0lp5ym2smmvmlxpdyv4kh75qsz8dsdz9afd8nxaq8y4fazzabblx"
+   "commit": "bfee45cfc179d6b7fbc3ff06c9f79b76dc7fbf58",
+   "sha256": "0h2fc9vjwb94n3nklq35s3dy9i4ihrqffp2556cmsaq7gzlipb81"
   }
  },
  {
@@ -99259,11 +100305,11 @@
   "url": "https://www.yatex.org/hgrepos/yatex",
   "unstable": {
    "version": [
-    20191226,
-    351
+    20200208,
+    931
    ],
-   "commit": "89a13c59674f57dc057594117f2dc929500e82a0",
-   "sha256": "1si880lg2idb088c7hywyyrkrm3by3f957kjgd28r4zv8d2z0k0p"
+   "commit": "f4c2dca86202c2da5b4f0f6ec97c49dd1cb01e6c",
+   "sha256": "1dh4i2dj2cfg693bvwdi4frmi2892h4q25xdacdm63c7fmn3ap6l"
   }
  },
  {
@@ -99380,14 +100426,25 @@
   "repo": "alphapapa/yequake",
   "unstable": {
    "version": [
-    20191121,
-    1726
+    20200219,
+    2323
    ],
    "deps": [
     "dash"
    ],
-   "commit": "16dd29c68f4b59ee2da7b7c13d17a687c9c79e16",
-   "sha256": "1mgnnbss3id8hnas69gc91v2ni3fjy93wn1fjmmw5qq1gl56bgqc"
+   "commit": "d18166e597414350117d0b82a29e509fc53c636d",
+   "sha256": "074wijjphnpch7bl3455apfkdv35b0iw4l4lzwj0jcxyfszviq9f"
+  },
+  "stable": {
+   "version": [
+    0,
+    1
+   ],
+   "deps": [
+    "dash"
+   ],
+   "commit": "d18166e597414350117d0b82a29e509fc53c636d",
+   "sha256": "074wijjphnpch7bl3455apfkdv35b0iw4l4lzwj0jcxyfszviq9f"
   }
  },
  {
@@ -99598,11 +100655,11 @@
   "repo": "bbatsov/zenburn-emacs",
   "unstable": {
    "version": [
-    20200105,
-    1010
+    20200227,
+    751
    ],
-   "commit": "eaaba83ce08e8afff5f4c8dd6be0921ef34f9cef",
-   "sha256": "1a02cpm0j9x59f864nkhbv4acr111kmrwdv4myd33m0yf31x9ilr"
+   "commit": "f42847d617d4314d4b8e272f2b58007e479b964d",
+   "sha256": "1ydfkynfclx7djji1hjfvm1pf6ndfjy43y0piqk3v14n6mxz78al"
   },
   "stable": {
    "version": [
@@ -99694,26 +100751,26 @@
   "url": "https://gitlab.emacsos.com/sylecn/zero-el",
   "unstable": {
    "version": [
-    20191110,
-    910
+    20200220,
+    1619
    ],
    "deps": [
     "s"
    ],
-   "commit": "cd075a5ff4a979f0ab850d0fc747b4db429298e4",
-   "sha256": "0p1ir4zk13n0hmxrx02an014bwd2rpypdxndik4p90b7yl25vw56"
+   "commit": "3e6e45482c223d3a9610fb366e9cc3aab98a7aab",
+   "sha256": "1qqk419f4y59vadpqf4my75pzgap9maylfbmaw7k2sqwajy2mxnl"
   },
   "stable": {
    "version": [
     2,
-    0,
-    7
+    6,
+    0
    ],
    "deps": [
     "s"
    ],
-   "commit": "cd075a5ff4a979f0ab850d0fc747b4db429298e4",
-   "sha256": "0p1ir4zk13n0hmxrx02an014bwd2rpypdxndik4p90b7yl25vw56"
+   "commit": "3e6e45482c223d3a9610fb366e9cc3aab98a7aab",
+   "sha256": "1qqk419f4y59vadpqf4my75pzgap9maylfbmaw7k2sqwajy2mxnl"
   }
  },
  {
@@ -99753,14 +100810,14 @@
   "repo": "efls/zetteldeft",
   "unstable": {
    "version": [
-    20200105,
-    1705
+    20200214,
+    2052
    ],
    "deps": [
     "deft"
    ],
-   "commit": "fbd9c3f619548aab0bff088c2682e5c70b4c2fcd",
-   "sha256": "1q6j3aqrrfmv1jdsg51vx1vby5rjb06cx76a8jlvlcc8fgmb4s45"
+   "commit": "301adcf54205a3780aed2988c58420da3feaeb43",
+   "sha256": "1mhxnmbmxj40774hvazp7n2yhwh9ikhmss4phk3y85gls30lqbyx"
   }
  },
  {
@@ -99999,8 +101056,8 @@
     20200106,
     1204
    ],
-   "commit": "4d4b6d9feca600f9cc0f0dec2e8988c3a07f9189",
-   "sha256": "0fxks1508ah0c3i2j454cjapc2k5fq4akvhjzz9lj04wwhjxilgg"
+   "commit": "a54324344eca49cfb11626446e1ebe239cba6557",
+   "sha256": "01ycz8496ywb2d980hxpvlnzxw5012mrj8kh8d97vdclhdbkx0y1"
   },
   "stable": {
    "version": [
@@ -100116,26 +101173,28 @@
   "repo": "egh/zotxt-emacs",
   "unstable": {
    "version": [
-    20180518,
-    147
+    20200120,
+    1950
    ],
    "deps": [
-    "request-deferred"
+    "deferred",
+    "request"
    ],
-   "commit": "1578e7fd82cb09a7a4349fd8e4d59f16d0ed7074",
-   "sha256": "0ynaz90an0ar4r5yjmjy2nvv00gg0qslshnqg15n6j7gkq1zg1rd"
+   "commit": "2e7ce60fa4b0311c646a509c140fd1c94c08fa79",
+   "sha256": "0ww0bg3bbrynnfhkkr7vdsrjc3341ngkzf83nn934zl0aphg87wb"
   },
   "stable": {
    "version": [
+    5,
     0,
-    1,
-    34
+    5
    ],
    "deps": [
-    "request-deferred"
+    "deferred",
+    "request"
    ],
-   "commit": "43c0c6d23b31126bac6b14bb85608180fd9c866f",
-   "sha256": "0qksa67aazs9vx7v14nlakr34z6l0h6mhfzi2c0vhrr0c210r6hp"
+   "commit": "98323098c37a444de49cfef44f1506e9386e8c5f",
+   "sha256": "1zr67h0w49rsi84mgf6jdili28h8782q6vjl8za0iq1hcx9zqxyf"
   }
  },
  {
@@ -100284,8 +101343,8 @@
     "avy",
     "cl-lib"
    ],
-   "commit": "3499777d74add95625b4592b5d675a82abc8f888",
-   "sha256": "0548skxh3gyriwscjkz2zf8l3gn16vwz5ardwab03gw7a7arsrc9"
+   "commit": "09613d53e1e6e7c58102fb8812bbef2121d57026",
+   "sha256": "1rfi7gp5z2lm71qrf9akkn8iiiv297i1mqkvwyv7vlhx5vk21r4s"
   },
   "stable": {
    "version": [

From 33c04eac64f32eae3ca3c18c2a4785fd464ab105 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <meurerbernardo@gmail.com>
Date: Sun, 1 Mar 2020 10:55:17 -0800
Subject: [PATCH 1994/4636] zoom-us: add qtgraphicaleffects dependency

---
 .../networking/instant-messengers/zoom-us/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 25e273bda51e..87e9ec6ccf9f 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -2,8 +2,9 @@
 , fetchFromGitHub
 # Dynamic libraries
 , dbus, glib, libGL, libX11, libXfixes, libuuid, libxcb, qtbase, qtdeclarative
-, qtimageformats, qtlocation, qtquickcontrols, qtquickcontrols2, qtscript, qtsvg
-, qttools, qtwayland, qtwebchannel, qtwebengine
+, qtgraphicaleffects, qtimageformats, qtlocation, qtquickcontrols
+, qtquickcontrols2, qtscript, qtsvg , qttools, qtwayland, qtwebchannel
+, qtwebengine
 # Runtime
 , coreutils, libjpeg_turbo, pciutils, procps, utillinux
 , pulseaudioSupport ? true, libpulseaudio ? null
@@ -39,9 +40,9 @@ in mkDerivation {
   nativeBuildInputs = [ autoPatchelfHook ];
 
   buildInputs = [
-    dbus glib libGL libX11 libXfixes libuuid libxcb libjpeg_turbo
-    qtbase qtdeclarative qtlocation qtquickcontrols qtquickcontrols2 qtscript
-    qtwebchannel qtwebengine qtimageformats qtsvg qttools qtwayland
+    dbus glib libGL libX11 libXfixes libuuid libxcb libjpeg_turbo qtbase
+    qtdeclarative qtgraphicaleffects qtlocation qtquickcontrols qtquickcontrols2
+    qtscript qtwebchannel qtwebengine qtimageformats qtsvg qttools qtwayland
   ];
 
   runtimeDependencies = optional pulseaudioSupport libpulseaudio;

From 3deb1caa82671337ac4c01ddca665769b9de4021 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Sun, 1 Mar 2020 19:01:54 +0100
Subject: [PATCH 1995/4636] androidenv: add platform SDK 29

---
 .../mobile/androidenv/generated/packages.nix    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/development/mobile/androidenv/generated/packages.nix b/pkgs/development/mobile/androidenv/generated/packages.nix
index db1f7f1b8d32..fc9f50e13164 100644
--- a/pkgs/development/mobile/androidenv/generated/packages.nix
+++ b/pkgs/development/mobile/androidenv/generated/packages.nix
@@ -1504,6 +1504,23 @@
     };
   };
   
+  "platforms"."29" = {
+    
+    name = "platforms";
+    path = "platforms/android-29";
+    revision = "29";
+    displayName = "Android SDK Platform 29";
+    archives = {
+      
+        all = fetchurl {
+          url = https://dl.google.com/android/repository/platform-29_r03.zip;
+          sha1 = "670e2e104333dae90e16ea3b615f0b63da5883ae";
+        };
+      
+    };
+  };
+
+
   "platforms"."3" = {
     
     name = "platforms";

From d0bf2ff810cf228d3c7d9009fcd935e5abea1549 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Sun, 1 Mar 2020 19:02:21 +0100
Subject: [PATCH 1996/4636] titaniumenv: add Titanium SDK 8.3

---
 .../mobile/titaniumenv/default.nix            |  3 +-
 .../mobile/titaniumenv/titaniumsdk-8.3.nix    | 97 +++++++++++++++++++
 2 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix

diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix
index c85eab108ffc..5e0f943a158d 100644
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@@ -1,9 +1,10 @@
-{pkgs, androidenv, xcodeenv, tiVersion ? "8.2.1.GA"}:
+{pkgs, androidenv, xcodeenv, tiVersion ? "8.3.2.GA"}:
 
 rec {
   titaniumsdk = let
     titaniumSdkFile = if tiVersion == "8.2.1.GA" then ./titaniumsdk-8.2.nix
       else if tiVersion == "7.5.1.GA" then ./titaniumsdk-7.5.nix
+      else if tiVersion == "8.3.2.GA" then ./titaniumsdk-8.3.nix
       else throw "Titanium version not supported: "+tiVersion;
     in
     import titaniumSdkFile {
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
new file mode 100644
index 000000000000..b8e6b5a2271d
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
@@ -0,0 +1,97 @@
+{stdenv, fetchurl, unzip, makeWrapper}:
+
+let
+  # Gradle is a build system that bootstraps itself. This is what it actually
+  # downloads in the bootstrap phase.
+  gradleAllZip = fetchurl {
+    url = http://services.gradle.org/distributions/gradle-4.1-all.zip;
+    sha256 = "1rcrh263vq7a0is800y5z36jj97p67c6zpqzzfcbr7r0qaxb61sw";
+  };
+
+  # A Titanium-Android build requires proguard plugins. We create a fake
+  # repository so that Gradle does not attempt to download them in the builder.
+  # Since there are only 3 plugins required, this is still (sort of) manageable
+  # without a generator.
+  proguardVersion = "5.3.3";
+
+  proguardGradlePOM = fetchurl {
+    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom";
+    sha256 = "03v9zm3ykfkyb5cs5ald07ph103fh68d5c33rv070r29p71dwszj";
+  };
+  proguardGradleJAR = fetchurl {
+    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar";
+    sha256 = "0shhpsjfc5gam15jnv1hk718v5c7vi7dwdc3gvmnid6dc85kljzk";
+  };
+  proguardParentPOM = fetchurl {
+    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom";
+    sha256 = "0mv0zbwyw8xa4mkc5kw69y5xqashkz9gp123akfvh9f6152l3202";
+  };
+  proguardBasePOM = fetchurl {
+    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom";
+    sha256 = "1jnr6zsxfimb8wglqlwa6rrdc3g3nqf1dyw0k2dq9cj0q4pgn7p5";
+  };
+  proguardBaseJAR = fetchurl {
+    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar";
+    sha256 = "11nwdb9y84cghcx319nsjjf9m035s4s1184zrhzpvaxq2wvqhbhx";
+  };
+
+  # Put the downloaded plugins in a fake Maven repository
+  fakeMavenRepo = stdenv.mkDerivation {
+    name = "fake-maven-repo";
+    buildCommand = ''
+      mkdir -p $out
+      cd $out
+      mkdir -p net/sf/proguard/proguard-gradle/${proguardVersion}
+      cp ${proguardGradlePOM} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom
+      cp ${proguardGradleJAR} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar
+      mkdir -p net/sf/proguard/proguard-parent/${proguardVersion}
+      cp ${proguardParentPOM} net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom
+      mkdir -p net/sf/proguard/proguard-base/${proguardVersion}
+      cp ${proguardBasePOM} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom
+      cp ${proguardBaseJAR} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar
+    '';
+  };
+in
+stdenv.mkDerivation {
+  name = "mobilesdk-8.3.2.GA";
+  src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
+    url = https://builds.appcelerator.com/mobile/8_3_X/mobilesdk-8.3.2.v20200117111803-linux.zip;
+    sha256 = "04pfw21jrx9w259lphynwykqjk4c9hm0zix4d40s7mf8mmh3xdx9";
+  }
+  else if stdenv.system == "x86_64-darwin" then fetchurl {
+    url = https://builds.appcelerator.com/mobile/8_3_X/mobilesdk-8.3.2.v20200117111803-osx.zip;
+    sha256 = "1zflq5hc96lrriw71ya623kkskkisi9yayg8qs03zimi0gksizxw";
+  }
+  else throw "Platform: ${stdenv.system} not supported!";
+
+  buildInputs = [ unzip makeWrapper ];
+
+  buildCommand = ''
+    mkdir -p $out
+    cd $out
+    unzip $src
+
+    # Rename ugly version number
+    cd mobilesdk/*
+    mv * 8.3.2.GA
+    cd *
+
+    # Patch bundled gradle build infrastructure to make shebangs work
+    patchShebangs android/templates/gradle
+
+    # Substitute the gradle-all zip URL by a local file to prevent downloads from happening while building an Android app
+    sed -i -e "s|distributionUrl=|#distributionUrl=|" android/templates/gradle/gradle/wrapper/gradle-wrapper.properties
+    cp ${gradleAllZip} android/templates/gradle/gradle/wrapper/gradle-4.1-all.zip
+    echo "distributionUrl=gradle-4.1-all.zip" >> android/templates/gradle/gradle/wrapper/gradle-wrapper.properties
+
+    # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts
+    sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle
+
+    ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
+      # Patch the strip frameworks script in the iPhone build template to not let
+      # it skip the strip phase. This is caused by an assumption on the file
+      # permissions in which Nix deviates from the standard.
+      sed -i -e "s|-perm +111|-perm /111|" iphone/templates/build/strip-frameworks.sh
+    ''}
+  '';
+}

From 6896b1cb1de84342103d7495816a8100a0a45a40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= <felix@alternativebit.fr>
Date: Sat, 29 Feb 2020 23:57:43 +0100
Subject: [PATCH 1997/4636] linux: add policy routing config flag for aarch64

CONFIG_IP_MULTIPLE_TABLES is part of the default x86 kernel config but
absent from the Aarch64 one. Adding explicitely this flag together
with its dependency IP_ADVANCED_ROUTER.

Both of these config flags are needed to use the routing policy
facilities.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index f9579a9fde53..e925068421d6 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -104,6 +104,7 @@ let
 
     networking = {
       NET                = yes;
+      IP_ADVANCED_ROUTER = yes;
       IP_PNP             = no;
       IP_VS_PROTO_TCP    = yes;
       IP_VS_PROTO_UDP    = yes;
@@ -126,6 +127,7 @@ let
       IP_ROUTE_VERBOSE            = yes;
       IP_MROUTE_MULTIPLE_TABLES   = yes;
       IP_MULTICAST                = yes;
+      IP_MULTIPLE_TABLES          = yes;
       IPV6_ROUTER_PREF            = yes;
       IPV6_ROUTE_INFO             = yes;
       IPV6_OPTIMISTIC_DAD         = yes;

From de24759142c93516a478e9f40504ad2f29c0d8b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 1 Mar 2020 17:55:28 -0300
Subject: [PATCH 1998/4636] matcha: 2020-02-27 -> 2020-03-01

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

diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
index e1a383fb10b7..152b08a960da 100644
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "matcha";
-  version = "2020-02-27";
+  version = "2020-03-01";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    sha256 = "1ngndd8lz1m2c9zm9m0wgnz35mdyrxnxxaxbg09zckqp1nrj4lm9";
+    sha256 = "09nb6xsysfg477zcm9y49iaczxksxrd4zh3n8dp7rlzc2h2kicpn";
   };
 
   buildInputs = [ gdk-pixbuf librsvg ];

From d02dc3c5fdfd5214f165c67fd6fcf20c36634bdf Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 24 Feb 2020 18:19:44 +0100
Subject: [PATCH 1999/4636] =?UTF-8?q?ocamlPackages.ocp-build:=20fix=20for?=
 =?UTF-8?q?=20OCaml=20=E2=89=A5=204.08?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/tools/ocaml/ocp-build/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix
index cf5372bdc202..ca74a701315a 100644
--- a/pkgs/development/tools/ocaml/ocp-build/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-build/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses }:
+{ stdenv, fetchpatch, fetchFromGitHub, ocaml, findlib, ncurses }:
 let
   version = "1.99.19-beta";
 in
@@ -13,6 +13,11 @@ stdenv.mkDerivation {
     sha256 = "162k5l0cxyqanxlml5v8mqapdq5qbqc9m4b8wdjq7mf523b3h2zj";
   };
 
+  patches = stdenv.lib.optional (stdenv.lib.versionAtLeast ocaml.version "4.08") (fetchpatch {
+    url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocp-pp/ocp-pp.1.99.19-beta/files/0001-Fix-ocp-pp-for-changes-in-compiler-libs.patch";
+    sha256 = "0s0s2hh4d7cmwd6i7ixjgb79vij0r1v54m0vwwi26b3fips09qyn";
+  });
+
   buildInputs = [ ocaml findlib ];
   propagatedBuildInputs = [ ncurses ];
   preInstall = "mkdir -p $out/bin";

From 9794d1e5fc4af39a864b0287d7983e019cc41391 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 24 Feb 2020 18:19:48 +0100
Subject: [PATCH 2000/4636] =?UTF-8?q?ocamlPackages.ocp-index:=201.1.9=20?=
 =?UTF-8?q?=E2=86=92=201.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/ocaml/ocp-index/default.nix            | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix
index 9ea01a8dca72..cf2be985b143 100644
--- a/pkgs/development/tools/ocaml/ocp-index/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-index/default.nix
@@ -1,14 +1,12 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, ocp-build, ocp-indent, cmdliner, re,  }:
+{ lib, fetchurl, buildDunePackage, ocp-build, ocp-indent, cmdliner, re }:
 
 buildDunePackage rec {
   pname = "ocp-index";
-  version = "1.1.9";
+  version = "1.2";
 
-  src = fetchFromGitHub {
-    owner = "OCamlPro";
-    repo = pname;
-    rev = version;
-    sha256 = "0dq1kap16xfajc6gg9hbiadax782winpvxnr3dkm2ncznnxds37p";
+  src = fetchurl {
+    url = "https://github.com/OCamlPro/ocp-index/releases/download/${version}/ocp-index-${version}.tbz";
+    sha256 = "1lchw02sakjjppmzr0rzlarwbg1lc2bl7pwcfpsiycnaz46x6gmr";
   };
 
   buildInputs = [ ocp-build cmdliner re ];
@@ -18,7 +16,7 @@ buildDunePackage rec {
   meta = {
     homepage = http://typerex.ocamlpro.com/ocp-index.html;
     description = "A simple and light-weight documentation extractor for OCaml";
-    license = stdenv.lib.licenses.lgpl3;
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+    license = lib.licenses.lgpl3;
+    maintainers = with lib.maintainers; [ vbgl ];
   };
 }

From deec2268c9268f936aa9094c620cc145eb8ef18c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Mar 2020 21:50:41 +0000
Subject: [PATCH 2001/4636] at-spi2-atk: 2.34.1 -> 2.34.2

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

diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix
index f63a341e26ea..f16b38e3fd84 100644
--- a/pkgs/development/libraries/at-spi2-atk/default.nix
+++ b/pkgs/development/libraries/at-spi2-atk/default.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "at-spi2-atk";
-  version = "2.34.1";
+  version = "2.34.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "05ncp7s5nddjinffs26mcvpbd63vk1m3cv5y530p3plgfhqgjvbp";
+    sha256 = "1w7l4xg00qx3dwhn0zaa64daiv5f073hdvjdxh0mrw7fw37264wh";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig ];
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "D-Bus bridge for Assistive Technology Service Provider Interface (AT-SPI) and Accessibility Toolkit (ATK)";
-    homepage = https://gitlab.gnome.org/GNOME/at-spi2-atk;
+    homepage = "https://gitlab.gnome.org/GNOME/at-spi2-atk";
     license = licenses.lgpl21Plus;
     maintainers = gnome3.maintainers;
     platforms = platforms.unix;

From 1439ba682e0fba84efdd4e46671f3335e0ea1b0a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 1 Mar 2020 22:28:37 +0000
Subject: [PATCH 2002/4636] bacula: 9.4.4 -> 9.6.2

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

diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix
index e5e26169b745..f40d54adfc85 100644
--- a/pkgs/tools/backup/bacula/default.nix
+++ b/pkgs/tools/backup/bacula/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }:
 
 stdenv.mkDerivation rec {
-  name = "bacula-9.4.4";
+  name = "bacula-9.6.2";
 
   src = fetchurl {
     url    = "mirror://sourceforge/bacula/${name}.tar.gz";
-    sha256 = "1gi0zkkzh6a87xk4sm051hwz5bv4qc4kbl6hk40752knr817mqqg";
+    sha256 = "0hw7wvgh7ymyyar5diqjn9kflhcb8a9kjgz6phb0x9r06j8yahaw";
   };
 
   buildInputs = [ postgresql sqlite zlib ncurses openssl readline ]
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Enterprise ready, Network Backup Tool";
-    homepage    = http://bacula.org/;
+    homepage    = "http://bacula.org/";
     license     = licenses.gpl2;
     maintainers = with maintainers; [ domenkozar lovek323 eleanor ];
     platforms   = platforms.all;

From 6740593bdd1738aa9771990f88655becc4dc343e Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 24 Feb 2020 10:32:47 -0500
Subject: [PATCH 2003/4636] glibc: provide fallback for kernels with missing
 prlimit64

The current version of glibc implements support for kernels down to
3.2.0 (and we make sure to enable such support with apporopriate
--enable-kernel setting). The current RHEL6 operating system is based on
a maintained kernel based on 2.6.32 with lots of backports. We provide
basic support for this specific kernel by patching glibc to provide an
exception for this specific version of kernel. This allows for nixpkgs
software distribution to work on RHEL6 and it does so quite well with
almost no problems. There are, however, a few syscalls that are missing
in the 2.6.32 kernel, one of which is prlimit64. This commit provides a
fallback that uses an older {get,set}rlimit syscalls in cases when
prlimit64 is not available. This should streamline the experience for
nixpkgs users wanting to run it on RHEL6, namely, this fixes one of the
tests in findutils.

See also discussion in guix:
https://lists.gnu.org/archive/html/guix-devel/2018-03/msg00356.html
---
 pkgs/development/libraries/glibc/common.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index d1ff681097dd..50ee5097d1b8 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -89,6 +89,18 @@ stdenv.mkDerivation ({
         less linux-*?/arch/x86/kernel/syscall_table_32.S
        */
       ./allow-kernel-2.6.32.patch
+
+      /* Provide a fallback for missing prlimit64 syscall on RHEL 6 -like
+         kernels.
+
+         This patch is maintained by @veprbl. If it gives you trouble, feel
+         free to ping me, I'd be happy to help.
+       */
+      (fetchurl {
+        url = "https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/patches/glibc-reinstate-prlimit64-fallback.patch?id=eab07e78b691ae7866267fc04d31c7c3ad6b0eeb";
+        sha256 = "091bk3kyrx1gc380gryrxjzgcmh1ajcj8s2rjhp2d2yzd5mpd5ps";
+      })
+
       /* Provide utf-8 locales by default, so we can use it in stdenv without depending on our large locale-archive. */
       (fetchurl {
         url = "https://salsa.debian.org/glibc-team/glibc/raw/49767c9f7de4828220b691b29de0baf60d8a54ec/debian/patches/localedata/locale-C.diff";

From 611d765b76d7e97f2618cb04a5d1c1604496cac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= <felix@alternativebit.fr>
Date: Sat, 29 Feb 2020 18:17:27 +0100
Subject: [PATCH 2004/4636] nixos/networkd: Add the RoutingPolicyRule-related
 options

---
 nixos/modules/system/boot/networkd.nix    | 46 +++++++++++++++++++++++
 nixos/modules/system/boot/systemd-lib.nix |  5 +++
 2 files changed, 51 insertions(+)

diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index a77dbc609f46..44550b2f09cd 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -235,6 +235,21 @@ let
     (assertValueOneOf "AutoJoin" boolValues)
   ];
 
+  checkRoutingPolicyRule = checkUnitConfig "RoutingPolicyRule" [
+    (assertOnlyFields [
+      "TypeOfService" "From" "To" "FirewallMark" "Table" "Priority"
+      "IncomingInterface" "OutgoingInterface" "SourcePort" "DestinationPort"
+      "IPProtocol" "InvertRule" "Family"
+    ])
+    (assertRange "TypeOfService" 0 255)
+    (assertRange "FirewallMark" 1 4294967295)
+    (assertInt "Priority")
+    (assertPort "SourcePort")
+    (assertPort "DestinationPort")
+    (assertValueOneOf "InvertRule" boolValues)
+    (assertValueOneOf "Family" ["ipv4" "ipv6" "both"])
+  ];
+
   checkRoute = checkUnitConfig "Route" [
     (assertOnlyFields [
       "Gateway" "GatewayOnLink" "Destination" "Source" "Metric"
@@ -535,6 +550,22 @@ let
     };
   };
 
+  routingPolicyRulesOptions = {
+    options = {
+      routingPolicyRuleConfig = mkOption {
+        default = { };
+        example = { routingPolicyRuleConfig = { Table = 10; IncomingInterface = "eth1"; } ;};
+        type = types.addCheck (types.attrsOf unitOption) checkRoutingPolicyRule;
+        description = ''
+          Each attribute in this set specifies an option in the
+          <literal>[RoutingPolicyRule]</literal> section of the unit.  See
+          <citerefentry><refentrytitle>systemd.network</refentrytitle>
+          <manvolnum>5</manvolnum></citerefentry> for details.
+        '';
+      };
+    };
+  };
+
   routeOptions = {
     options = {
       routeConfig = mkOption {
@@ -772,6 +803,16 @@ let
       '';
     };
 
+    routingPolicyRules = mkOption {
+      default = [ ];
+      type = with types; listOf (submodule routingPolicyRulesOptions);
+      description = ''
+        A list of routing policy rules sections to be added to the unit.  See
+        <citerefentry><refentrytitle>systemd.network</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
     routes = mkOption {
       default = [ ];
       type = with types; listOf (submodule routeOptions);
@@ -928,6 +969,11 @@ let
             [Route]
             ${attrsToSection x.routeConfig}
 
+          '')}
+          ${flip concatMapStrings def.routingPolicyRules (x: ''
+            [RoutingPolicyRule]
+            ${attrsToSection x.routingPolicyRuleConfig}
+
           '')}
           ${def.extraConfig}
         '';
diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix
index fd1a5b9f62c5..a33602915867 100644
--- a/nixos/modules/system/boot/systemd-lib.nix
+++ b/nixos/modules/system/boot/systemd-lib.nix
@@ -59,6 +59,11 @@ in rec {
     optional (attr ? ${name} && ! isMacAddress attr.${name})
       "Systemd ${group} field `${name}' must be a valid mac address.";
 
+  isPort = i: i >= 0 && i <= 65535;
+
+  assertPort = name: group: attr:
+    optional (attr ? ${name} && ! isPort attr.${name})
+      "Error on the systemd ${group} field `${name}': ${attr.name} is not a valid port number.";
 
   assertValueOneOf = name: values: group: attr:
     optional (attr ? ${name} && !elem attr.${name} values)

From 1841620b23744b8b832bc34a8f9be82667ea3621 Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Sun, 1 Mar 2020 23:58:28 +0100
Subject: [PATCH 2005/4636] sgt-puzzles: add desktop files

---
 pkgs/games/sgt-puzzles/default.nix | 31 ++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix
index 8349be64264a..7ac32fa2d2fd 100644
--- a/pkgs/games/sgt-puzzles/default.nix
+++ b/pkgs/games/sgt-puzzles/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, desktop-file-utils
 , gtk3, libX11
 , makeWrapper, pkgconfig, perl, autoreconfHook, wrapGAppsHook
 }:
@@ -8,17 +8,19 @@ stdenv.mkDerivation rec {
   version = "20191114.1c0c49d";
 
   src = fetchurl {
-   url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
-   sha256 = "01fi2f3w71bfbgcfr6gxdp5a9cxh4dshbflv83q2j5rxxs2ll870";
+    url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
+    sha256 = "01fi2f3w71bfbgcfr6gxdp5a9cxh4dshbflv83q2j5rxxs2ll870";
   };
 
-  nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig perl wrapGAppsHook ];
+  nativeBuildInputs = [ autoreconfHook desktop-file-utils makeWrapper
+    pkgconfig perl wrapGAppsHook ];
 
   buildInputs = [ gtk3 libX11 ];
 
   makeFlags = ["prefix=$(out)" "gamesdir=$(out)/bin"];
+
   preInstall = ''
-    mkdir -p "$out"/{bin,share/doc/sgtpuzzles}
+    mkdir -p "$out"/{bin,share/doc/sgtpuzzles,share/icons/hicolor/48x48/apps}
     cp gamedesc.txt LICENCE README "$out/share/doc/sgtpuzzles"
   '';
   # SGT Puzzles use generic names like net, map, etc.
@@ -26,10 +28,27 @@ stdenv.mkDerivation rec {
   # disambiguation
   postInstall = ''
     (
+      currentSrc=$PWD
       cd "$out"/bin ;
-      for i in *; do ln -s "$i" "sgt-puzzle-$i"; done
+      for i in *; do
+        ln -s "$i" "sgt-puzzle-$i"
+
+        install -Dm644 $currentSrc/icons/$i-48d24.png $out/share/icons/hicolor/48x48/apps/
+
+        # Generate/validate/install .desktop files.
+        echo "[Desktop Entry]" > $i.desktop
+        desktop-file-install --dir $out/share/applications \
+          --set-key Type --set-value Application \
+          --set-key Exec --set-value $i \
+          --set-key Name --set-value $i \
+          --set-key Comment --set-value "${meta.description}" \
+          --set-key Categories --set-value LogicGame \
+          --set-key Icon --set-value $i-48d24 $i.desktop
+        rm $i.desktop
+      done
     )
   '';
+
   preConfigure = ''
     perl mkfiles.pl
     export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"

From 5ce2974294c976f5daea89954c035ea6ad77e9aa Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 2 Mar 2020 09:15:28 +1000
Subject: [PATCH 2006/4636] youtube-dl: 2020.02.16 -> 2020.03.01

https://github.com/ytdl-org/youtube-dl/releases/tag/2020.03.01
---
 pkgs/tools/misc/youtube-dl/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 1fc8acdda2cd..151e520e5d1a 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
   # The websites youtube-dl deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2020.02.16";
+  version = "2020.03.01";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1ip0p7gifwmkls8ppfvz89j1lh82dg60zmvabj8njnhj170ikkdb";
+    sha256 = "01hk00nbxxa81yajkbv65nv5amwyavhjs127xkyqqcrq6ws3z92w";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -54,8 +54,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with lib; {
-    homepage = https://rg3.github.io/youtube-dl/;
-    repositories.git = https://github.com/rg3/youtube-dl.git;
+    homepage = "https://rg3.github.io/youtube-dl/";
     description = "Command-line tool to download videos from YouTube.com and other sites";
     longDescription = ''
       youtube-dl is a small, Python-based command-line program

From bf9beeb1c5f4d8b1f12403854cb5c02ab3fbcee8 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 2 Mar 2020 09:20:12 +1000
Subject: [PATCH 2007/4636] yq-go: 3.1.2 -> 3.2.1

https://github.com/mikefarah/yq/releases/tag/3.2.0
https://github.com/mikefarah/yq/releases/tag/3.2.1
---
 pkgs/development/tools/yq-go/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix
index eb507857ca83..9041667a0fc7 100644
--- a/pkgs/development/tools/yq-go/default.nix
+++ b/pkgs/development/tools/yq-go/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "yq-go";
-  version = "3.1.2";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "mikefarah";
     rev = version;
     repo = "yq";
-    sha256 = "0gjxmnmphav8ms4zdkcjcsgrjs77ccwdfpc1qpxjp6fr2g4v5vmq";
+    sha256 = "1n20m1zizbkgzag4676fvf16h6f8vll6pniblj7haqdwvnza8zwd";
   };
 
-  modSha256 = "035w9bh96rr2x21w7bwwpngyng6839wglpgwf7gy8p6difvnn2v9";
+  modSha256 = "0hbazc6hf3zrni25lpbyi36sbxyabbrpi591gkqwxgr9hdbdpcg9";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Portable command-line YAML processor";
     homepage = "https://mikefarah.gitbook.io/yq/";
     license = [ licenses.mit ];

From 619a095af0efa15631e311c98b56a015fdf4614b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2020 07:58:34 +0000
Subject: [PATCH 2008/4636] mgba: 0.7.3 -> 0.8.0

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

diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix
index c2b30f8ce47a..17955d355231 100644
--- a/pkgs/misc/emulators/mgba/default.nix
+++ b/pkgs/misc/emulators/mgba/default.nix
@@ -15,13 +15,13 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "mgba";
-  version = "0.7.3";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "mgba-emu";
     repo = "mgba";
     rev = version;
-    sha256 = "1wrmwh50rv8bd328r8cisrihq6h90kx2bfb0vmjfbsd3l1jvgrgm";
+    sha256 = "0m3rgcdv32ms98j7rrmk2hphvn462bwsd6xfz2ssy05398pj4ljh";
   };
 
   enableParallelBuilding = true;

From 6d4fd1361256f9df6633425b1d5107143ca41d84 Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Mon, 2 Mar 2020 00:06:38 +0100
Subject: [PATCH 2009/4636] riot-web: mention incompatible config change in
 release notes

Mention the changes introduced in commit c9e5cca.

GitHub: closes #81416
---
 nixos/doc/manual/release-notes/rl-2003.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index 31f08d9da341..b506e94e47b2 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -631,6 +631,16 @@ auth required pam_succeed_if.so uid >= 1000 quiet
      </citerefentry>-script now uses the python test-driver.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     The <package>riot-web</package> package now accepts configuration overrides as an attribute set instead of a string.
+     A formerly used JSON configuration can be converted to an attribute set with <literal>builtins.fromJSON</literal>.
+    </para>
+    <para>
+     The new default configuration also disables automatic guest account registration and analytics to improve privacy.
+     The previous behavior can be restored by setting <literal>config.riot-web.conf = { disable_guests = false; piwik = true; }</literal>.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 

From 9176f20bc31662d991782a04c339feb2b4ef02a9 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 2 Mar 2020 00:44:35 +0100
Subject: [PATCH 2010/4636] httpie: add manpage and html docs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

httpie has quite extensive documentation in form of its rst readme.
With docutils it’s quite easy to convert to html.

We can also convert it to a manpage, which makes the documentation
accessible from the command line (even though it’s not quite standard
format as far as manpages go; however a lot better than nothing).
---
 pkgs/tools/networking/httpie/default.nix | 50 ++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix
index 38fdab358c90..b6a7c6329302 100644
--- a/pkgs/tools/networking/httpie/default.nix
+++ b/pkgs/tools/networking/httpie/default.nix
@@ -11,6 +11,8 @@ python3Packages.buildPythonApplication rec {
     sha256 = "0d0rsn5i973l9y0ws3xmnzaw4jwxdlryyjbasnlddph5mvkf7dq0";
   };
 
+  outputs = [ "out" "doc" "man" ];
+
   propagatedBuildInputs = with python3Packages; [ pygments requests setuptools ];
   dontUseSetuptoolsCheck = true;
   patches = [ ./strip-venv.patch ];
@@ -22,6 +24,54 @@ python3Packages.buildPythonApplication rec {
     pytestCheckHook
   ];
 
+  postInstall = ''
+    mkdir -p $man/share/man/man1
+
+    docdir=$doc/share/doc/httpie
+    mkdir -p $docdir/html
+
+    cp AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst $docdir
+
+    # helpfully, the readme has a `no-web` class to exclude
+    # the parts that are not relevant for offline docs
+
+    # this one build link was not marked however
+    sed -e 's/^|build|//g' -i README.rst
+
+    toHtml() {
+      ${docutils}/bin/rst2html5 \
+        --strip-elements-with-class=no-web \
+        --title=http \
+        --no-generator \
+        --no-datestamp \
+        --no-source-link \
+        "$1" \
+        "$2"
+    }
+
+    toHtml README.rst $docdir/html/index.html
+    toHtml CHANGELOG.rst $docdir/html/CHANGELOG.html
+    toHtml CONTRIBUTING.rst $docdir/html/CONTRIBUTING.html
+
+    # change a few links to the local files
+    substituteInPlace $docdir/html/index.html \
+      --replace \
+        'https://github.com/jakubroztocil/httpie/blob/master/CHANGELOG.rst' \
+        "CHANGELOG.html" \
+      --replace \
+        'https://github.com/jakubroztocil/httpie/blob/master/CONTRIBUTING.rst' \
+        "CONTRIBUTING.html"
+
+    ${docutils}/bin/rst2man \
+      --strip-elements-with-class=no-web \
+      --title=http \
+      --no-generator \
+      --no-datestamp \
+      --no-source-link \
+      README.rst \
+      $man/share/man/man1/http.1
+  '';
+
   # the tests call rst2pseudoxml.py from docutils
   preCheck = ''
     export PATH=${docutils}/bin:$PATH

From 2167ed8aac16025303564edac2e9646db1995da7 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 2 Mar 2020 01:16:54 +0100
Subject: [PATCH 2011/4636] httpie: add fish and bash completions

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

diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix
index b6a7c6329302..a0e2b8e01cc1 100644
--- a/pkgs/tools/networking/httpie/default.nix
+++ b/pkgs/tools/networking/httpie/default.nix
@@ -25,6 +25,14 @@ python3Packages.buildPythonApplication rec {
   ];
 
   postInstall = ''
+    # install completions
+    install -Dm555 \
+      extras/httpie-completion.bash \
+      $out/share/bash-completion/completions/http.bash
+    install -Dm555 \
+      extras/httpie-completion.fish \
+      $out/share/fish/vendor_completions.d/http.fish
+
     mkdir -p $man/share/man/man1
 
     docdir=$doc/share/doc/httpie

From 93823571609177fe6a7208f6bd3af32cc98b40c2 Mon Sep 17 00:00:00 2001
From: GTrunsec <gtrunsec@hardenedlinux.org>
Date: Sun, 1 Mar 2020 16:48:23 -0800
Subject: [PATCH 2012/4636] zeek: fix hardlinking duplicate files

---
 .../networking/ids/zeek/default.nix           |  7 ++-
 .../networking/ids/zeek/script.nix            | 62 +++++++++++++++++++
 2 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/networking/ids/zeek/script.nix

diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix
index 947abc39c21a..302a5c913f4f 100644
--- a/pkgs/applications/networking/ids/zeek/default.nix
+++ b/pkgs/applications/networking/ids/zeek/default.nix
@@ -1,6 +1,8 @@
 {stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, zlib, file, curl
 , libmaxminddb, gperftools, python, swig, rocksdb }:
-
+let
+  preConfigure = (import ./script.nix);
+in
 stdenv.mkDerivation rec {
   pname = "zeek";
   version = "3.0.1";
@@ -13,6 +15,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake flex bison file ];
   buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig rocksdb ];
 
+  #see issue https://github.com/zeek/zeek/issues/804 to modify hardlinking duplicate files.
+  inherit preConfigure;
+  
   enableParallelBuilding = true;
 
   cmakeFlags = [
diff --git a/pkgs/applications/networking/ids/zeek/script.nix b/pkgs/applications/networking/ids/zeek/script.nix
new file mode 100644
index 000000000000..10a2d11a1489
--- /dev/null
+++ b/pkgs/applications/networking/ids/zeek/script.nix
@@ -0,0 +1,62 @@
+''
+   sed -i "1i##! test dpd" $PWD/scripts/base/frameworks/dpd/__load__.zeek
+   sed -i "1i##! test x509" $PWD/scripts/base/files/x509/__load__.zeek
+   sed -i "1i##! test files-extract" $PWD/scripts/base/files/extract/__load__.zeek
+   sed -i "1i##! test files-hash" $PWD/scripts/base/files/hash/__load__.zeek
+   sed -i "1i##! test files-pe" $PWD/scripts/base/files/pe/__load__.zeek
+   sed -i "1i##! test analyzer" $PWD/scripts/base/frameworks/analyzer/__load__.zeek
+   sed -i "1i##! test cluster" $PWD/scripts/base/frameworks/cluster/__load__.zeek
+   sed -i "1i##! test config" $PWD/scripts/base/frameworks/config/__load__.zeek
+   sed -i "1i##! test contro" $PWD/scripts/base/frameworks/control/__load__.zeek
+   sed -i "1i##! test files" $PWD/scripts/base/frameworks/files/__load__.zeek
+   sed -i "1i##! test files-magic" $PWD/scripts/base/frameworks/files/magic/__load__.zeek
+   sed -i "1i##! test input" $PWD/scripts/base/frameworks/input/__load__.zeek
+   sed -i "1i##! test intel" $PWD/scripts/base/frameworks/intel/__load__.zeek
+   sed -i "1i##! test logging" $PWD/scripts/base/frameworks/logging/__load__.zeek
+   sed -i "1i##! test logging-postprocessors" $PWD/scripts/base/frameworks/logging/postprocessors/__load__.zeek
+   sed -i "1i##! test netcontrol" $PWD/scripts/base/frameworks/netcontrol/__load__.zeek
+   sed -i "1i##! test netcontrol-plugins" $PWD/scripts/base/frameworks/netcontrol/plugins/__load__.zeek
+   sed -i "1i##! test notice" $PWD/scripts/base/frameworks/notice/__load__.zeek
+   sed -i "1i##! test openflow" $PWD/scripts/base/frameworks/openflow/__load__.zeek
+   sed -i "1i##! test openflow-plugins" $PWD/scripts/base/frameworks/openflow/plugins/__load__.zeek
+   sed -i "1i##! test packet-filter" $PWD/scripts/base/frameworks/packet-filter/__load__.zeek
+   sed -i "1i##! test reporter" $PWD/scripts/base/frameworks/reporter/__load__.zeek
+   sed -i "1i##! test signatures" $PWD/scripts/base/frameworks/signatures/__load__.zeek
+   sed -i "1i##! test software" $PWD/scripts/base/frameworks/software/__load__.zeek
+   sed -i "1i##! test sumstats" $PWD/scripts/base/frameworks/sumstats/__load__.zeek
+   sed -i "1i##! test sumstats-plugins" $PWD/scripts/base/frameworks/sumstats/plugins/__load__.zeek
+   sed -i "1i##! test conn" $PWD/scripts/base/protocols/conn/__load__.zeek
+   sed -i "1i##! test dce-rpc" $PWD/scripts/base/protocols/dce-rpc/__load__.zeek
+   sed -i "1i##! test dhcp" $PWD/scripts/base/protocols/dhcp/__load__.zeek
+   sed -i "1i##! test dnp3" $PWD/scripts/base/protocols/dnp3/__load__.zeek
+   sed -i "1i##! test dns" $PWD/scripts/base/protocols/dns/__load__.zeek
+   sed -i "1i##! test ftp" $PWD/scripts/base/protocols/ftp/__load__.zeek
+   sed -i "1i##! test http" $PWD/scripts/base/protocols/http/__load__.zeek
+   sed -i "1i##! test imap" $PWD/scripts/base/protocols/imap/__load__.zeek
+   sed -i "1i##! test irc" $PWD/scripts/base/protocols/irc/__load__.zeek
+   sed -i "1i##! test krb" $PWD/scripts/base/protocols/krb/__load__.zeek
+   sed -i "1i##! test modbus" $PWD/scripts/base/protocols/modbus/__load__.zeek
+   sed -i "1i##! test mqtt" $PWD/scripts/base/protocols/mqtt/__load__.zeek
+   sed -i "1i##! test mysql" $PWD/scripts/base/protocols/mysql/__load__.zeek
+   sed -i "1i##! test ntlm" $PWD/scripts/base/protocols/ntlm/__load__.zeek
+   sed -i "1i##! test ntp" $PWD/scripts/base/protocols/ntp/__load__.zeek
+   sed -i "1i##! test pop3" $PWD/scripts/base/protocols/pop3/__load__.zeek
+   sed -i "1i##! test radius" $PWD/scripts/base/protocols/radius/__load__.zeek
+   sed -i "1i##! test rdp" $PWD/scripts/base/protocols/rdp/__load__.zeek
+   sed -i "1i##! test rfb" $PWD/scripts/base/protocols/rfb/__load__.zeek
+   sed -i "1i##! test sip" $PWD/scripts/base/protocols/sip/__load__.zeek
+   sed -i "1i##! test smb" $PWD/scripts/base/protocols/smb/__load__.zeek
+   sed -i "1i##! test smtp" $PWD/scripts/base/protocols/smtp/__load__.zeek
+   sed -i "1i##! test snmp" $PWD/scripts/base/protocols/snmp/__load__.zeek
+   sed -i "1i##! test socks" $PWD/scripts/base/protocols/socks/__load__.zeek
+   sed -i "1i##! test ssh" $PWD/scripts/base/protocols/ssh/__load__.zeek
+   sed -i "1i##! test ssl" $PWD/scripts/base/protocols/ssl/__load__.zeek
+   sed -i "1i##! test syslog" $PWD/scripts/base/protocols/syslog/__load__.zeek
+   sed -i "1i##! test xmpp" $PWD/scripts/base/protocols/xmpp/__load__.zeek
+   sed -i "1i##! test unified2" $PWD/scripts/policy/files/unified2/__load__.zeek
+   sed -i "1i##! test intel-seen" $PWD/scripts/policy/frameworks/intel/seen/__load__.zeek
+   sed -i "1i##! test notice" $PWD/scripts/policy/frameworks/notice/__load__.zeek
+   sed -i "1i##! test barnyard2" $PWD/scripts/policy/integration/barnyard2/__load__.zeek
+   sed -i "1i##! test collective-intel" $PWD/scripts/policy/integration/collective-intel/__load__.zeek
+   sed -i "1i##! test detect-traceroute" $PWD/scripts/policy/misc/detect-traceroute/__load__.zeek
+''

From 43f394ac951afacb38f17360d79b399b466cd054 Mon Sep 17 00:00:00 2001
From: GTrunsec <gtrunsec@hardenedlinux.org>
Date: Sun, 1 Mar 2020 16:50:43 -0800
Subject: [PATCH 2013/4636] zeek: 3.0.1 -> 3.0.2

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

diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix
index 302a5c913f4f..79cc390ec275 100644
--- a/pkgs/applications/networking/ids/zeek/default.nix
+++ b/pkgs/applications/networking/ids/zeek/default.nix
@@ -5,11 +5,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "zeek";
-  version = "3.0.1";
+  version = "3.0.2";
 
   src = fetchurl {
     url = "https://www.zeek.org/downloads/zeek-${version}.tar.gz";
-    sha256 = "1lhik212wrbi092qizc08f3i0b9pj318sxwm0abc5jc3v3pz7x3r";
+    sha256 = "0d5agk6yc4xyx2lwfx6r1psks1373h53m0icyka1jf15b4zjg3m7";
   };
 
   nativeBuildInputs = [ cmake flex bison file ];

From 3a2790c3426b59a6836a0441c77d4668e09bbcb7 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sun, 1 Mar 2020 16:00:01 -0500
Subject: [PATCH 2014/4636] services.mailman: RemainAfterExit so settings take
 effect properly

Prior to this fix, changes to certain settings would not be applied
automatically and users would have to know to manually restart the
affected service.  A prime example of this is
`services.mailman.hyperkitty.baseUrl`, or various things that affect
`mailman3/settings.py`
---
 nixos/modules/services/mail/mailman.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix
index 43dc185cdd77..f5e78b182933 100644
--- a/nixos/modules/services/mail/mailman.nix
+++ b/nixos/modules/services/mail/mailman.nix
@@ -265,6 +265,11 @@ in {
       '';
       serviceConfig = {
         Type = "oneshot";
+        # RemainAfterExit makes restartIfChanged work for this service, so
+        # downstream services will get updated automatically when things like
+        # services.mailman.hyperkitty.baseUrl change.  Otherwise users have to
+        # restart things manually, which is confusing.
+        RemainAfterExit = "yes";
       };
     };
 
@@ -282,6 +287,9 @@ in {
       serviceConfig = {
         User = cfg.webUser;
         Type = "oneshot";
+        # Similar to mailman-settings.service, this makes restartTriggers work
+        # properly for this service.
+        RemainAfterExit = "yes";
         WorkingDirectory = "/var/lib/mailman-web";
       };
     };

From 81461cff5f540c92e5030f62b89ee7b64e85c6df Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <meurerbernardo@gmail.com>
Date: Fri, 28 Feb 2020 10:33:15 -0800
Subject: [PATCH 2015/4636] Revert "Merge pull request #79750 from
 doronbehar/update-luarocks"

This reverts commit 0566b5ce19fabe3c70ab1f56415dd8a019fa0aa8, reversing
changes made to 4d6e3bf1272b839cd8978c9f3aac98c7d9126055.
---
 pkgs/development/tools/misc/luarocks/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix
index 565b6a5ca041..fa19b2494076 100644
--- a/pkgs/development/tools/misc/luarocks/default.nix
+++ b/pkgs/development/tools/misc/luarocks/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "luarocks";
-  version = "3.3.1";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "luarocks";
     repo = "luarocks";
     rev = "v${version}";
-    sha256 = "0859k2b9pihmcw45fdsbwx936npcj3vbp3hxi1v3j7n61dkw7r0s";
+    sha256 = "0viiafmb8binksda79ah828q1dfnb6jsqlk7vyndl2xvx9yfn4y2";
   };
 
   patches = [ ./darwin-3.1.3.patch ];

From c10f66991a51e127e9b6fac84baae15def07d38f Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Mon, 2 Mar 2020 04:13:48 +0100
Subject: [PATCH 2016/4636] sgt-puzzles: fix desktop files and add desktop
 sgt-puzzles.menu

---
 pkgs/games/sgt-puzzles/default.nix | 56 +++++++++++++++++-------------
 1 file changed, 32 insertions(+), 24 deletions(-)

diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix
index 7ac32fa2d2fd..f138e1d04913 100644
--- a/pkgs/games/sgt-puzzles/default.nix
+++ b/pkgs/games/sgt-puzzles/default.nix
@@ -12,41 +12,49 @@ stdenv.mkDerivation rec {
     sha256 = "01fi2f3w71bfbgcfr6gxdp5a9cxh4dshbflv83q2j5rxxs2ll870";
   };
 
+  sgt-puzzles-menu = fetchurl {
+    url = "https://raw.githubusercontent.com/Oleh-Kravchenko/portage/master/games-puzzle/sgt-puzzles/files/sgt-puzzles.menu";
+    sha256 = "088w0x9g3j8pn725ix8ny8knhdsfgjr3hpswsh9fvfkz5vlg2xkm";
+  };
+
   nativeBuildInputs = [ autoreconfHook desktop-file-utils makeWrapper
     pkgconfig perl wrapGAppsHook ];
 
   buildInputs = [ gtk3 libX11 ];
 
-  makeFlags = ["prefix=$(out)" "gamesdir=$(out)/bin"];
+  makeFlags = [ "prefix=$(out)" "gamesdir=$(out)/bin"];
 
   preInstall = ''
-    mkdir -p "$out"/{bin,share/doc/sgtpuzzles,share/icons/hicolor/48x48/apps}
+    mkdir -p "$out"/{bin,share/doc/sgtpuzzles}
     cp gamedesc.txt LICENCE README "$out/share/doc/sgtpuzzles"
   '';
-  # SGT Puzzles use generic names like net, map, etc.
-  # Create symlinks with sgt-puzzle- prefix for possibility of
-  # disambiguation
+
   postInstall = ''
-    (
-      currentSrc=$PWD
-      cd "$out"/bin ;
-      for i in *; do
-        ln -s "$i" "sgt-puzzle-$i"
+    for i in  $(basename -s $out/bin/*); do
 
-        install -Dm644 $currentSrc/icons/$i-48d24.png $out/share/icons/hicolor/48x48/apps/
+      ln -s $out/bin/$i $out/bin/sgt-puzzle-$i
+      install -Dm644 icons/$i-48d24.png -t $out/share/icons/hicolor/48x48/apps/
 
-        # Generate/validate/install .desktop files.
-        echo "[Desktop Entry]" > $i.desktop
-        desktop-file-install --dir $out/share/applications \
-          --set-key Type --set-value Application \
-          --set-key Exec --set-value $i \
-          --set-key Name --set-value $i \
-          --set-key Comment --set-value "${meta.description}" \
-          --set-key Categories --set-value LogicGame \
-          --set-key Icon --set-value $i-48d24 $i.desktop
-        rm $i.desktop
-      done
-    )
+      # Generate/validate/install .desktop files.
+      echo "[Desktop Entry]" > $i.desktop
+      desktop-file-install --dir $out/share/applications \
+        --set-key Type --set-value Application \
+        --set-key Exec --set-value $i \
+        --set-key Name --set-value $i \
+        --set-key Comment --set-value "${meta.description}" \
+        --set-key Categories --set-value "Game;LogicGame;X-sgt-puzzles;" \
+        --set-key Icon --set-value $out/share/icons/hicolor/48x48/apps/$i-48d24 \
+        $i.desktop
+    done
+
+    echo "[Desktop Entry]" > sgt-puzzles.directory
+    desktop-file-install --dir $out/share/desktop-directories \
+      --set-key Type --set-value Directory \
+      --set-key Name --set-value Puzzles \
+      --set-key Icon --set-value $out/share/icons/hicolor/48x48/apps/sgt-puzzles_map \
+      sgt-puzzles.directory
+
+    install -Dm644 ${sgt-puzzles-menu} -t $out/etc/xdg/menus/applications-merged/
   '';
 
   preConfigure = ''
@@ -58,7 +66,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Simon Tatham's portable puzzle collection";
     license = licenses.mit;
-    maintainers = [ maintainers.raskin ];
+    maintainers = [ maintainers.raskin maintainers.genesis ];
     platforms = platforms.linux;
     homepage = https://www.chiark.greenend.org.uk/~sgtatham/puzzles/;
   };

From 6181bfc353e32e4c8c3db1a1998a85f78a5ae8f1 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 28 Feb 2020 11:36:13 -0800
Subject: [PATCH 2017/4636] pythonPackages.setuptools: 44.0.0 -> 45.2.0

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

diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 194b90cb42ad..93c6c0ca38e5 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -13,7 +13,7 @@
 
 let
   pname = "setuptools";
-  version = "44.0.0";
+  version = "45.2.0";
 
   # Create an sdist of setuptools
   sdist = stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ let
       owner = "pypa";
       repo = pname;
       rev = "v${version}";
-      sha256 = "0z3q0qinyp1rmnxkw3y5f6nbsxhqlfq5k7skfrqa6ymb3zr009y1";
+      sha256 = "003iflm3ifjab3g1bnmhpwx1v3vpl4w90vwcvn8jf9449302d0md";
       name = "${pname}-${version}-source";
     };
 

From c3c47544e06cc028f1a9b590e7e16edddce8b2ee Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 28 Feb 2020 11:41:51 -0800
Subject: [PATCH 2018/4636] python2Packages.setuptools: freeze at 44.0.0

---
 .../python-modules/setuptools/44.0.nix        | 74 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  5 +-
 2 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/setuptools/44.0.nix

diff --git a/pkgs/development/python-modules/setuptools/44.0.nix b/pkgs/development/python-modules/setuptools/44.0.nix
new file mode 100644
index 000000000000..194b90cb42ad
--- /dev/null
+++ b/pkgs/development/python-modules/setuptools/44.0.nix
@@ -0,0 +1,74 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, python
+, wrapPython
+, unzip
+, callPackage
+, bootstrapped-pip
+, lib
+, pipInstallHook
+, setuptoolsBuildHook
+}:
+
+let
+  pname = "setuptools";
+  version = "44.0.0";
+
+  # Create an sdist of setuptools
+  sdist = stdenv.mkDerivation rec {
+    name = "${pname}-${version}-sdist.tar.gz";
+
+    src = fetchFromGitHub {
+      owner = "pypa";
+      repo = pname;
+      rev = "v${version}";
+      sha256 = "0z3q0qinyp1rmnxkw3y5f6nbsxhqlfq5k7skfrqa6ymb3zr009y1";
+      name = "${pname}-${version}-source";
+    };
+
+    buildPhase = ''
+      ${python.pythonForBuild.interpreter} bootstrap.py
+      ${python.pythonForBuild.interpreter} setup.py sdist --formats=gztar
+    '';
+
+    installPhase = ''
+      echo "Moving sdist..."
+      mv dist/*.tar.gz $out
+    '';
+  };
+in buildPythonPackage rec {
+  inherit pname version;
+  # Because of bootstrapping we don't use the setuptoolsBuildHook that comes with format="setuptools" directly.
+  # Instead, we override it to remove setuptools to avoid a circular dependency.
+  # The same is done for pip and the pipInstallHook.
+  format = "other";
+
+  src = sdist;
+
+  nativeBuildInputs = [
+    bootstrapped-pip
+    (pipInstallHook.override{pip=null;})
+    (setuptoolsBuildHook.override{setuptools=null; wheel=null;})
+  ];
+
+  preBuild = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''
+    export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
+  '';
+
+  pipInstallFlags = [ "--ignore-installed" ];
+
+  # Adds setuptools to nativeBuildInputs causing infinite recursion.
+  catchConflicts = false;
+
+  # Requires pytest, causing infinite recursion.
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Utilities to facilitate the installation of Python packages";
+    homepage = https://pypi.python.org/pypi/setuptools;
+    license = with licenses; [ psfl zpl20 ];
+    platforms = python.meta.platforms;
+    priority = 10;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 53b7eba5f30c..1ce9b7627a93 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -121,7 +121,10 @@ in {
 
   recursivePthLoader = callPackage ../development/python-modules/recursive-pth-loader { };
 
-  setuptools = callPackage ../development/python-modules/setuptools { };
+  setuptools = if isPy27 then
+    callPackage ../development/python-modules/setuptools/44.0.nix { }
+  else
+    callPackage ../development/python-modules/setuptools { };
 
   vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { };
 

From e93a6fdedabebfe7511a097717be13869b39f629 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 28 Feb 2020 20:00:52 -0500
Subject: [PATCH 2019/4636] vscode-extensions.ms-python.python: 2020.1.58038 ->
 2020.2.64397

---
 pkgs/misc/vscode-extensions/python/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix
index efbd163abbbb..dec6bbbba10a 100644
--- a/pkgs/misc/vscode-extensions/python/default.nix
+++ b/pkgs/misc/vscode-extensions/python/default.nix
@@ -41,8 +41,8 @@ in vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "python";
     publisher = "ms-python";
-    version = "2020.1.58038";
-    sha256 = "09iawy1p2akan090461137d4p5gqqf0aanm9i534p0kmbxmjfpqv";
+    version = "2020.2.64397";
+    sha256 = "1kwyc5ycz1276i2zbw93mpq59y2py6kj71gvhzya8xvm184jk07a";
   };
 
   buildInputs = [

From ed8ff48843df0def79435c28d9e1a1d8d0b8bf3b Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 28 Feb 2020 20:01:17 -0500
Subject: [PATCH 2020/4636] vscode-extensions.WakaTime.vscode-wakatime: 2.2.1
 -> 4.0.0

---
 pkgs/misc/vscode-extensions/wakatime/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix
index da8d940f71c7..30b2f94f1a58 100644
--- a/pkgs/misc/vscode-extensions/wakatime/default.nix
+++ b/pkgs/misc/vscode-extensions/wakatime/default.nix
@@ -8,8 +8,8 @@ in
     mktplcRef = {
       name = "vscode-wakatime";
       publisher = "WakaTime";
-      version = "2.2.1";
-      sha256 = "18hdmx993wvhcv13z9p8ylp3lf480axv4lyl0qx52pw2y2jgj1z8";
+      version = "4.0.0";
+      sha256 = "0bwxz8dg00k8frnvkvcngll5yaf9k7z13dg309vmw8xbdgkiyid4";
     };
 
     postPatch = ''

From 2e6b7b00a00ae323a9fc7b74fd42f82ad9e63296 Mon Sep 17 00:00:00 2001
From: Kovacsics Robert <rmk35@cam.ac.uk>
Date: Sun, 1 Mar 2020 19:40:44 +0000
Subject: [PATCH 2021/4636] vim-easytags: Fix to work with universal-ctags
 (which is in nixpkgs)

---
 pkgs/misc/vim-plugins/overrides.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index cecd53ae8201..431c0f032c4b 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -1,6 +1,6 @@
 { lib, stdenv
 , python, cmake, meson, vim, ruby
-, which, fetchFromGitHub, fetchgit, fetchurl, fetchzip
+, which, fetchFromGitHub, fetchgit, fetchurl, fetchzip, fetchpatch
 , llvmPackages, rustPlatform
 , xkb-switch, fzf, skim, stylish-haskell
 , python3, boost, icu, ncurses
@@ -365,6 +365,12 @@ self: super: {
 
   vim-easytags = super.vim-easytags.overrideAttrs(old: {
     dependencies = with super; [ vim-misc ];
+    patches = [
+      (fetchpatch { # https://github.com/xolox/vim-easytags/pull/170 fix version detection for universal-ctags
+        url = https://github.com/xolox/vim-easytags/commit/46e4709500ba3b8e6cf3e90aeb95736b19e49be9.patch;
+        sha256 = "0x0xabb56xkgdqrg1mpvhbi3yw4d829n73lsnnyj5yrxjffy4ax4";
+      })
+    ];
   });
 
   # change the go_bin_path to point to a path in the nix store. See the code in

From 83015ff7954a1a111737359ac644443327ce6f6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 2 Mar 2020 08:19:44 +0100
Subject: [PATCH 2022/4636] nixpkgs manual: fix build after pandoc(?) update

I din't try to pinpoint the exact commit, but we started getting:
> The extension smart is not supported for docbook
Reading pandoc docs, I can't see what use to us "smart" could be
when writing the in-between docbook (to be converted to html).
https://pandoc.org/MANUAL.html#extension-smart
---
 doc/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index e7ca31b20d71..cdef493502bf 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -87,7 +87,7 @@ functions/library/generated: doc-support/result
 	ln -rfs ./doc-support/result/function-docs functions/library/generated
 
 %.section.xml: %.section.md
-	pandoc $^ -w docbook+smart \
+	pandoc $^ -w docbook \
 		-f markdown+smart \
 	  | sed -e 's|<ulink url=|<link xlink:href=|' \
 	      -e 's|</ulink>|</link>|' \
@@ -98,7 +98,7 @@ functions/library/generated: doc-support/result
 	| cat  > $@
 
 %.chapter.xml: %.chapter.md
-	pandoc $^ -w docbook+smart \
+	pandoc $^ -w docbook \
 		--top-level-division=chapter \
 		-f markdown+smart \
 	  | sed -e 's|<ulink url=|<link xlink:href=|' \

From 4eb9e9a20c303f86129277e1fd48542fce4dad4f Mon Sep 17 00:00:00 2001
From: Evan Hanson <evhan@foldling.org>
Date: Sun, 1 Mar 2020 11:02:11 +1300
Subject: [PATCH 2023/4636] chicken: 5.1.0 -> 5.2.0

Also updates the matchable egg (used by egg2nix) from 1.0 -> 1.1 and
removes trailing slashes from the path prefix variables passed to
wrapProgram (they're unnecessary and only result in doubled-up slashes
in the values).
---
 pkgs/development/compilers/chicken/5/chicken.nix       | 4 ++--
 pkgs/development/compilers/chicken/5/eggDerivation.nix | 4 ++--
 pkgs/development/compilers/chicken/5/eggs.nix          | 6 +++---
 pkgs/development/compilers/chicken/5/setup-hook.sh     | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix
index 3e47e4136363..eefd8e35a272 100644
--- a/pkgs/development/compilers/chicken/5/chicken.nix
+++ b/pkgs/development/compilers/chicken/5/chicken.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, bootstrap-chicken ? null }:
 
 let
-  version = "5.1.0";
+  version = "5.2.0";
   platform = with stdenv;
     if isDarwin then "macosx"
     else if isCygwin then "cygwin"
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://code.call-cc.org/releases/${version}/chicken-${version}.tar.gz";
-    sha256 = "0jsbp3kp0134f318j3wpd1n85gf8qzh034fn198gvazsv2l024aw";
+    sha256 = "1yl0hxm9cirgcp8jgxp6vv29lpswfvaw3zfkh6rsj0vkrv44k4c1";
   };
 
   setupHook = lib.ifEnable (bootstrap-chicken != null) ./setup-hook.sh;
diff --git a/pkgs/development/compilers/chicken/5/eggDerivation.nix b/pkgs/development/compilers/chicken/5/eggDerivation.nix
index 8d4a62776d0e..f5ed4b4b7f8b 100644
--- a/pkgs/development/compilers/chicken/5/eggDerivation.nix
+++ b/pkgs/development/compilers/chicken/5/eggDerivation.nix
@@ -31,8 +31,8 @@ stdenv.mkDerivation ({
     for f in $out/bin/*
     do
       wrapProgram $f \
-        --prefix CHICKEN_REPOSITORY_PATH : "$out/lib/chicken/${toString chicken.binaryVersion}/:$CHICKEN_REPOSITORY_PATH" \
-        --prefix CHICKEN_INCLUDE_PATH : "$CHICKEN_INCLUDE_PATH:$out/share/" \
+        --prefix CHICKEN_REPOSITORY_PATH : "$out/lib/chicken/${toString chicken.binaryVersion}:$CHICKEN_REPOSITORY_PATH" \
+        --prefix CHICKEN_INCLUDE_PATH : "$CHICKEN_INCLUDE_PATH:$out/share" \
         --prefix PATH : "$out/bin:${chicken}/bin:$CHICKEN_REPOSITORY_PATH"
     done
 
diff --git a/pkgs/development/compilers/chicken/5/eggs.nix b/pkgs/development/compilers/chicken/5/eggs.nix
index a35b1f058919..3c4ae74c1e66 100644
--- a/pkgs/development/compilers/chicken/5/eggs.nix
+++ b/pkgs/development/compilers/chicken/5/eggs.nix
@@ -19,12 +19,12 @@ rec {
   };
 
   matchable = eggDerivation {
-    name = "matchable-1.0";
+    name = "matchable-1.1";
 
     src = fetchegg {
       name = "matchable";
-      version = "1.0";
-      sha256 = "01vy2ppq3sq0wirvsvl3dh0bwa5jqs1i6rdjdd7pnwj4nncxd1ga";
+      version = "1.1";
+      sha256 = "084hm5dvbvgnpb32ispkp3hjili8z02hamln860r99jx68jx6j2v";
     };
 
     buildInputs = [
diff --git a/pkgs/development/compilers/chicken/5/setup-hook.sh b/pkgs/development/compilers/chicken/5/setup-hook.sh
index f5ebaaf638e3..55324c05508e 100644
--- a/pkgs/development/compilers/chicken/5/setup-hook.sh
+++ b/pkgs/development/compilers/chicken/5/setup-hook.sh
@@ -1,6 +1,6 @@
 addChickenRepositoryPath() {
-    addToSearchPathWithCustomDelimiter : CHICKEN_REPOSITORY_PATH "$1/lib/chicken/11/"
-    addToSearchPathWithCustomDelimiter : CHICKEN_INCLUDE_PATH "$1/share/"
+    addToSearchPathWithCustomDelimiter : CHICKEN_REPOSITORY_PATH "$1/lib/chicken/11"
+    addToSearchPathWithCustomDelimiter : CHICKEN_INCLUDE_PATH "$1/share"
 }
 
 addEnvHooks "$targetOffset" addChickenRepositoryPath

From 1c4f22a5da51705c60e7e2582cbe1dd1e0555857 Mon Sep 17 00:00:00 2001
From: Michael Lingelbach <m.j.lbach@gmail.com>
Date: Wed, 26 Feb 2020 04:07:59 -0800
Subject: [PATCH 2024/4636] Add bazel 1.2.1

---
 .../bazel/{ => bazel-latest}/default.nix      |   8 +-
 .../bazel/{ => bazel-latest}/src-deps.json    |   0
 .../build-managers/bazel/bazel_1/default.nix  | 559 ++++++++++++++++++
 .../build-managers/bazel/bazel_1/glibc.patch  |  78 +++
 .../bazel/bazel_1/src-deps.json               | 506 ++++++++++++++++
 pkgs/top-level/all-packages.nix               |  11 +-
 6 files changed, 1157 insertions(+), 5 deletions(-)
 rename pkgs/development/tools/build-managers/bazel/{ => bazel-latest}/default.nix (99%)
 rename pkgs/development/tools/build-managers/bazel/{ => bazel-latest}/src-deps.json (100%)
 create mode 100644 pkgs/development/tools/build-managers/bazel/bazel_1/default.nix
 create mode 100644 pkgs/development/tools/build-managers/bazel/bazel_1/glibc.patch
 create mode 100644 pkgs/development/tools/build-managers/bazel/bazel_1/src-deps.json

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-latest/default.nix
similarity index 99%
rename from pkgs/development/tools/build-managers/bazel/default.nix
rename to pkgs/development/tools/build-managers/bazel/bazel-latest/default.nix
index 2a784b30b322..2bbc4b4afeec 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel-latest/default.nix
@@ -160,7 +160,7 @@ stdenv.mkDerivation rec {
     # On Darwin, the last argument to gcc is coming up as an empty string. i.e: ''
     # This is breaking the build of any C target. This patch removes the last
     # argument if it's found to be an empty string.
-    ./trim-last-argument-to-gcc-if-empty.patch
+    ../trim-last-argument-to-gcc-if-empty.patch
 
     # --experimental_strict_action_env (which may one day become the default
     # see bazelbuild/bazel#2574) hardcodes the default
@@ -169,17 +169,17 @@ stdenv.mkDerivation rec {
     # So we are replacing this bazel paths by defaultShellPath,
     # improving hermeticity and making it work in nixos.
     (substituteAll {
-      src = ./strict_action_env.patch;
+      src = ../strict_action_env.patch;
       strictActionEnvPatch = defaultShellPath;
     })
 
     # bazel reads its system bazelrc in /etc
     # override this path to a builtin one
     (substituteAll {
-      src = ./bazel_rc.patch;
+      src = ../bazel_rc.patch;
       bazelSystemBazelRCPath = bazelRC;
     })
-  ] ++ lib.optional enableNixHacks ./nix-hacks.patch;
+  ] ++ lib.optional enableNixHacks ../nix-hacks.patch;
 
 
   # Additional tests that check bazel’s functionality. Execute
diff --git a/pkgs/development/tools/build-managers/bazel/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel-latest/src-deps.json
similarity index 100%
rename from pkgs/development/tools/build-managers/bazel/src-deps.json
rename to pkgs/development/tools/build-managers/bazel/bazel-latest/src-deps.json
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix
new file mode 100644
index 000000000000..2844eb4aec41
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix
@@ -0,0 +1,559 @@
+{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub
+, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs
+# this package (through the fixpoint glass)
+, bazel_1
+, lr, xe, zip, unzip, bash, writeCBin, coreutils
+, which, gawk, gnused, gnutar, gnugrep, gzip, findutils
+# updater
+, python27, python3, writeScript
+# Apple dependencies
+, cctools, libcxx, CoreFoundation, CoreServices, Foundation
+# Allow to independently override the jdks used to build and run respectively
+, buildJdk, runJdk
+, buildJdkName
+, runtimeShell
+# Downstream packages for tests
+, bazel-watcher
+# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic).
+# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers).
+, enableNixHacks ? false
+, gcc-unwrapped
+, autoPatchelfHook
+, file
+, substituteAll
+, writeTextFile
+}:
+
+let
+  version = "1.2.1";
+
+  src = fetchurl {
+    url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
+    sha256 = "1qfk14mgx1m454b4w4ldggljzqkqwpdwrlynq7rc8aq11yfs8p95";
+  };
+
+  # Update with `eval $(nix-build -A bazel.updater)`,
+  # then add new dependencies from the dict in ./src-deps.json as required.
+  srcDeps = lib.attrsets.attrValues srcDepsSet;
+  srcDepsSet =
+    let
+      srcs = (builtins.fromJSON (builtins.readFile ./src-deps.json));
+      toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl {
+        urls = d.urls;
+        sha256 = d.sha256;
+        });
+        in builtins.listToAttrs (map toFetchurl [
+      srcs.desugar_jdk_libs
+      srcs.io_bazel_skydoc
+      srcs.bazel_skylib
+      srcs.io_bazel_rules_sass
+      srcs.platforms
+      (if stdenv.hostPlatform.isDarwin
+       then srcs."java_tools_javac11_darwin-v6.1.zip"
+       else srcs."java_tools_javac11_linux-v6.1.zip")
+      srcs."coverage_output_generator-v2.0.zip"
+      srcs.build_bazel_rules_nodejs
+      srcs."android_tools_pkg-0.12.tar.gz"
+      srcs."0.28.3.tar.gz"
+      srcs.rules_pkg
+      srcs.rules_cc
+      srcs.rules_java
+      srcs.rules_proto
+      ]);
+
+  distDir = runCommand "bazel-deps" {} ''
+    mkdir -p $out
+    for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done
+  '';
+
+  defaultShellPath = lib.makeBinPath
+    # Keep this list conservative. For more exotic tools, prefer to use
+    # @rules_nixpkgs to pull in tools from the nix repository. Example:
+    #
+    # WORKSPACE:
+    #
+    #     nixpkgs_git_repository(
+    #         name = "nixpkgs",
+    #         revision = "def5124ec8367efdba95a99523dd06d918cb0ae8",
+    #     )
+    #
+    #     # This defines an external Bazel workspace.
+    #     nixpkgs_package(
+    #         name = "bison",
+    #         repositories = { "nixpkgs": "@nixpkgs//:default.nix" },
+    #     )
+    #
+    # some/BUILD.bazel:
+    #
+    #     genrule(
+    #        ...
+    #        cmd = "$(location @bison//:bin/bison) -other -args",
+    #        tools = [
+    #            ...
+    #            "@bison//:bin/bison",
+    #        ],
+    #     )
+    #
+    [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip file zip ];
+
+  # Java toolchain used for the build and tests
+  javaToolchain = "@bazel_tools//tools/jdk:toolchain_host${buildJdkName}";
+
+  platforms = lib.platforms.linux ++ lib.platforms.darwin;
+
+  # This repository is fetched by bazel at runtime
+  # however it contains prebuilt java binaries, with wrong interpreter
+  # and libraries path.
+  # We prefetch it, patch it, and override it in a global bazelrc.
+  system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux";
+
+  remote_java_tools = stdenv.mkDerivation {
+    name = "remote_java_tools_${system}";
+
+    src = srcDepsSet."java_tools_javac11_${system}-v6.1.zip";
+
+    nativeBuildInputs = [ autoPatchelfHook unzip ];
+    buildInputs = [ gcc-unwrapped ];
+
+    sourceRoot = ".";
+
+    buildPhase = ''
+      mkdir $out;
+    '';
+
+    installPhase = ''
+      cp -Ra * $out/
+      touch $out/WORKSPACE
+    '';
+  };
+
+  bazelRC = writeTextFile {
+    name = "bazel-rc";
+    text = ''
+      build --override_repository=${remote_java_tools.name}=${remote_java_tools}
+      build --distdir=${distDir}
+      startup --server_javabase=${runJdk}
+
+      # load default location for the system wide configuration
+      try-import /etc/bazel.bazelrc
+    '';
+  };
+
+in
+stdenv.mkDerivation rec {
+  pname = "bazel";
+  inherit version;
+
+  meta = with lib; {
+    homepage = "https://github.com/bazelbuild/bazel/";
+    description = "Build tool that builds code quickly and reliably";
+    license = licenses.asl20;
+    maintainers = [ maintainers.mboes ];
+    inherit platforms;
+  };
+
+  inherit src;
+  sourceRoot = ".";
+
+  patches = [
+    # On Darwin, the last argument to gcc is coming up as an empty string. i.e: ''
+    # This is breaking the build of any C target. This patch removes the last
+    # argument if it's found to be an empty string.
+    ../trim-last-argument-to-gcc-if-empty.patch
+    ./glibc.patch
+
+    # --experimental_strict_action_env (which may one day become the default
+    # see bazelbuild/bazel#2574) hardcodes the default
+    # action environment to a non hermetic value (e.g. "/usr/local/bin").
+    # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries.
+    # So we are replacing this bazel paths by defaultShellPath,
+    # improving hermeticity and making it work in nixos.
+    (substituteAll {
+      src = ../strict_action_env.patch;
+      strictActionEnvPatch = defaultShellPath;
+    })
+
+    # bazel reads its system bazelrc in /etc
+    # override this path to a builtin one
+    (substituteAll {
+      src = ../bazel_rc.patch;
+      bazelSystemBazelRCPath = bazelRC;
+    })
+  ] ++ lib.optional enableNixHacks ../nix-hacks.patch;
+
+
+  # Additional tests that check bazel’s functionality. Execute
+  #
+  #     nix-build . -A bazel.tests
+  #
+  # in the nixpkgs checkout root to exercise them locally.
+  passthru.tests =
+    let
+      runLocal = name: attrs: script:
+      let
+        attrs' = removeAttrs attrs [ "buildInputs" ];
+        buildInputs = [ python3 ] ++ (attrs.buildInputs or []);
+      in
+      runCommandCC name ({
+        inherit buildInputs;
+        preferLocalBuild = true;
+        meta.platforms = platforms;
+      } // attrs') script;
+
+      # bazel wants to extract itself into $install_dir/install every time it runs,
+      # so let’s do that only once.
+      extracted = bazelPkg:
+        let install_dir =
+          # `install_base` field printed by `bazel info`, minus the hash.
+          # yes, this path is kinda magic. Sorry.
+          "$HOME/.cache/bazel/_bazel_nixbld";
+        in runLocal "bazel-extracted-homedir" { passthru.install_dir = install_dir; } ''
+            export HOME=$(mktemp -d)
+            touch WORKSPACE # yeah, everything sucks
+            install_base="$(${bazelPkg}/bin/bazel info | grep install_base)"
+            # assert it’s actually below install_dir
+            [[ "$install_base" =~ ${install_dir} ]] \
+              || (echo "oh no! $install_base but we are \
+            trying to copy ${install_dir} to $out instead!"; exit 1)
+            cp -R ${install_dir} $out
+          '';
+
+      bazelTest = { name, bazelScript, workspaceDir, bazelPkg, buildInputs ? [] }:
+        let
+          be = extracted bazelPkg;
+        in runLocal name { inherit buildInputs; } (
+          # skip extraction caching on Darwin, because nobody knows how Darwin works
+          (lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
+            # set up home with pre-unpacked bazel
+            export HOME=$(mktemp -d)
+            mkdir -p ${be.install_dir}
+            cp -R ${be}/install ${be.install_dir}
+
+            # https://stackoverflow.com/questions/47775668/bazel-how-to-skip-corrupt-installation-on-centos6
+            # Bazel checks whether the mtime of the install dir files
+            # is >9 years in the future, otherwise it extracts itself again.
+            # see PosixFileMTime::IsUntampered in src/main/cpp/util
+            # What the hell bazel.
+            ${lr}/bin/lr -0 -U ${be.install_dir} | ${xe}/bin/xe -N0 -0 touch --date="9 years 6 months" {}
+          '')
+          +
+          ''
+            # Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609
+            # about why to create a subdir for the workspace.
+            cp -r ${workspaceDir} wd && chmod u+w wd && cd wd
+
+            ${bazelScript}
+
+            touch $out
+          '');
+
+      bazelWithNixHacks = bazel_1.override { enableNixHacks = true; };
+
+      bazel-examples = fetchFromGitHub {
+        owner = "bazelbuild";
+        repo = "examples";
+        rev = "5d8c8961a2516ebf875787df35e98cadd08d43dc";
+        sha256 = "03c1bwlq5bs3hg96v4g4pg2vqwhqq6w538h66rcpw02f83yy7fs8";
+      };
+
+    in (if !stdenv.hostPlatform.isDarwin then {
+      # `extracted` doesn’t work on darwin
+      shebang = callPackage ./shebang-test.nix { inherit runLocal extracted bazelTest distDir; };
+    } else {}) // {
+      bashTools = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest distDir; };
+      cpp = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; };
+      java = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples distDir; };
+      protobuf = callPackage ./protobuf-test.nix { inherit runLocal bazelTest distDir; };
+      pythonBinPath = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest distDir; };
+
+      bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; };
+
+      cppWithNixHacks = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; };
+      javaWithNixHacks = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; };
+      protobufWithNixHacks = callPackage ./protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; };
+      pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; };
+
+      # downstream packages using buildBazelPackage
+      # fixed-output hashes of the fetch phase need to be spot-checked manually
+      downstream = recurseIntoAttrs ({
+        inherit bazel-watcher;
+      }
+          # dm-sonnet is only packaged for linux
+      // (lib.optionalAttrs stdenv.isLinux {
+          # TODO(timokau) dm-sonnet is broken currently
+          # dm-sonnet-linux = python3.pkgs.dm-sonnet;
+      }));
+    };
+
+  # update the list of workspace dependencies
+  passthru.updater = writeScript "update-bazel-deps.sh" ''
+    #!${runtimeShell}
+    cat ${runCommand "bazel-deps.json" {} ''
+        ${unzip}/bin/unzip ${src} WORKSPACE
+        ${python3}/bin/python3 ${./update-srcDeps.py} ./WORKSPACE > $out
+    ''} > ${builtins.toString ./src-deps.json}
+  '';
+
+  # Necessary for the tests to pass on Darwin with sandbox enabled.
+  # Bazel starts a local server and needs to bind a local address.
+  __darwinAllowLocalNetworking = true;
+
+  # Bazel expects several utils to be available in Bash even without PATH. Hence this hack.
+  customBash = writeCBin "bash" ''
+    #include <stdio.h>
+    #include <stdlib.h>
+    #include <string.h>
+    #include <unistd.h>
+
+    extern char **environ;
+
+    int main(int argc, char *argv[]) {
+      char *path = getenv("PATH");
+      char *pathToAppend = "${defaultShellPath}";
+      char *newPath;
+      if (path != NULL) {
+        int length = strlen(path) + 1 + strlen(pathToAppend) + 1;
+        newPath = malloc(length * sizeof(char));
+        snprintf(newPath, length, "%s:%s", path, pathToAppend);
+      } else {
+        newPath = pathToAppend;
+      }
+      setenv("PATH", newPath, 1);
+      execve("${bash}/bin/bash", argv, environ);
+      return 0;
+    }
+  '';
+
+  postPatch = let
+
+    darwinPatches = ''
+      bazelLinkFlags () {
+        eval set -- "$NIX_LDFLAGS"
+        local flag
+        for flag in "$@"; do
+          printf ' -Wl,%s' "$flag"
+        done
+      }
+
+      # Disable Bazel's Xcode toolchain detection which would configure compilers
+      # and linkers from Xcode instead of from PATH
+      export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
+
+      # Explicitly configure gcov since we don't have it on Darwin, so autodetection fails
+      export GCOV=${coreutils}/bin/false
+
+      # Framework search paths aren't added by bintools hook
+      # https://github.com/NixOS/nixpkgs/pull/41914
+      export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks"
+
+      # libcxx includes aren't added by libcxx hook
+      # https://github.com/NixOS/nixpkgs/pull/41589
+      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1"
+
+      # don't use system installed Xcode to run clang, use Nix clang instead
+      sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \
+        scripts/bootstrap/compile.sh \
+        src/tools/xcode/realpath/BUILD \
+        src/tools/xcode/stdredirect/BUILD \
+        tools/osx/BUILD
+
+      # nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead
+      sed -i -e "/#include <pthread\/spawn.h>/i #include <dispatch/dispatch.h>" src/main/cpp/blaze_util_darwin.cc
+
+      # clang installed from Xcode has a compatibility wrapper that forwards
+      # invocations of gcc to clang, but vanilla clang doesn't
+      sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl
+
+      sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl
+      wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl )
+      for wrapper in "''${wrappers[@]}"; do
+        sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper
+      done
+    '';
+
+    genericPatches = ''
+      # Substitute j2objc and objc wrapper's python shebang to plain python path.
+      # These scripts explicitly depend on Python 2.7, hence we use python27.
+      # See also `postFixup` where python27 is added to $out/nix-support
+      substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
+      substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
+      substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
+
+      # md5sum is part of coreutils
+      sed -i 's|/sbin/md5|md5sum|' \
+        src/BUILD
+
+      # substituteInPlace is rather slow, so prefilter the files with grep
+      grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do
+        # If you add more replacements here, you must change the grep above!
+        # Only files containing /bin are taken into account.
+        # We default to python3 where possible. See also `postFixup` where
+        # python3 is added to $out/nix-support
+        substituteInPlace "$path" \
+          --replace /bin/bash ${customBash}/bin/bash \
+          --replace "/usr/bin/env bash" ${customBash}/bin/bash \
+          --replace "/usr/bin/env python" ${python3}/bin/python \
+          --replace /usr/bin/env ${coreutils}/bin/env \
+          --replace /bin/true ${coreutils}/bin/true
+      done
+
+      # bazel test runner include references to /bin/bash
+      substituteInPlace tools/build_rules/test_rules.bzl \
+        --replace /bin/bash ${customBash}/bin/bash
+
+      for i in $(find tools/cpp/ -type f)
+      do
+        substituteInPlace $i \
+          --replace /bin/bash ${customBash}/bin/bash
+      done
+
+      # Fixup scripts that generate scripts. Not fixed up by patchShebangs below.
+      substituteInPlace scripts/bootstrap/compile.sh \
+          --replace /bin/bash ${customBash}/bin/bash
+
+      # add nix environment vars to .bazelrc
+      cat >> .bazelrc <<EOF
+      build --distdir=${distDir}
+      fetch --distdir=${distDir}
+      build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')"
+      build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')"
+      build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')"
+      build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')"
+      build --host_javabase='@local_jdk//:jdk'
+      build --host_java_toolchain='${javaToolchain}'
+      EOF
+
+      # add the same environment vars to compile.sh
+      sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \
+          -e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \
+          -e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \
+          -e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \
+          -e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \
+          -e "/\$command \\\\$/a --host_java_toolchain='${javaToolchain}' \\\\" \
+          -i scripts/bootstrap/compile.sh
+
+      # This is necessary to avoid:
+      # "error: no visible @interface for 'NSDictionary' declares the selector
+      # 'initWithContentsOfURL:error:'"
+      # This can be removed when the apple_sdk is upgraded beyond 10.13+
+      sed -i '/initWithContentsOfURL:versionPlistUrl/ {
+        N
+        s/error:nil\];/\];/
+      }' tools/osx/xcode_locator.m
+
+      # append the PATH with defaultShellPath in tools/bash/runfiles/runfiles.bash
+      echo "PATH=\$PATH:${defaultShellPath}" >> runfiles.bash.tmp
+      cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp
+      mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash
+
+      patchShebangs .
+    '';
+    in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches
+     + genericPatches;
+
+  buildInputs = [
+    buildJdk
+    python3
+  ];
+
+  # when a command can’t be found in a bazel build, you might also
+  # need to add it to `defaultShellPath`.
+  nativeBuildInputs = [
+    zip
+    python3
+    unzip
+    makeWrapper
+    which
+    customBash
+  ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ];
+
+  # Bazel makes extensive use of symlinks in the WORKSPACE.
+  # This causes problems with infinite symlinks if the build output is in the same location as the
+  # Bazel WORKSPACE. This is why before executing the build, the source code is moved into a
+  # subdirectory.
+  # Failing to do this causes "infinite symlink expansion detected"
+  preBuildPhases = ["preBuildPhase"];
+  preBuildPhase = ''
+    mkdir bazel_src
+    shopt -s dotglob extglob
+    mv !(bazel_src) bazel_src
+  '';
+
+  buildPhase = ''
+    # Increasing memory during compilation might be necessary.
+    # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m"
+    ./bazel_src/compile.sh
+    ./bazel_src/scripts/generate_bash_completion.sh \
+        --bazel=./bazel_src/output/bazel \
+        --output=./bazel_src/output/bazel-complete.bash \
+        --prepend=./bazel_src/scripts/bazel-complete-header.bash \
+        --prepend=./bazel_src/scripts/bazel-complete-template.bash
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+
+    # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel
+    # if it can’t find something in tools, it calls $out/bin/bazel-real
+    cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel
+    mv ./bazel_src/output/bazel $out/bin/bazel-real
+
+    # shell completion files
+    mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions
+    mv ./bazel_src/output/bazel-complete.bash $out/share/bash-completion/completions/bazel
+    cp ./bazel_src/scripts/zsh_completion/_bazel $out/share/zsh/site-functions/
+  '';
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    export TEST_TMPDIR=$(pwd)
+
+    hello_test () {
+      $out/bin/bazel test --distdir=${distDir} \
+        --test_output=errors \
+        --java_toolchain='${javaToolchain}' \
+        examples/cpp:hello-success_test \
+        examples/java-native/src/test/java/com/example/myproject:hello
+    }
+
+    cd ./bazel_src
+
+    # test whether $WORKSPACE_ROOT/tools/bazel works
+
+    mkdir -p tools
+    cat > tools/bazel <<"EOF"
+    #!${runtimeShell} -e
+    exit 1
+    EOF
+    chmod +x tools/bazel
+
+    # first call should fail if tools/bazel is used
+    ! hello_test
+
+    cat > tools/bazel <<"EOF"
+    #!${runtimeShell} -e
+    exec "$BAZEL_REAL" "$@"
+    EOF
+
+    # second call succeeds because it defers to $out/bin/bazel-real
+    hello_test
+  '';
+
+  # Save paths to hardcoded dependencies so Nix can detect them.
+  postFixup = ''
+    mkdir -p $out/nix-support
+    echo "${customBash} ${defaultShellPath}" >> $out/nix-support/depends
+    # The templates get tar’d up into a .jar,
+    # so nix can’t detect python is needed in the runtime closure
+    # Some of the scripts explicitly depend on Python 2.7. Otherwise, we
+    # default to using python3. Therefore, both python27 and python3 are
+    # runtime dependencies.
+    echo "${python27}" >> $out/nix-support/depends
+    echo "${python3}" >> $out/nix-support/depends
+  '' + lib.optionalString stdenv.isDarwin ''
+    echo "${cctools}" >> $out/nix-support/depends
+  '';
+
+  dontStrip = true;
+  dontPatchELF = true;
+}
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_1/glibc.patch b/pkgs/development/tools/build-managers/bazel/bazel_1/glibc.patch
new file mode 100644
index 000000000000..c4de48068f11
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bazel/bazel_1/glibc.patch
@@ -0,0 +1,78 @@
+From https://github.com/grpc/grpc/commit/57586a1ca7f17b1916aed3dea4ff8de872dbf853
+From: Benjamin Peterson <benjamin@dropbox.com>
+Date: Fri, 3 May 2019 08:11:00 -0700
+Subject: [PATCH] Rename gettid() functions.
+
+glibc 2.30 will declare its own gettid; see https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92. Rename the grpc versions to avoid naming conflicts.
+---
+ src/core/lib/gpr/log_linux.cc          | 6 ++----
+ src/core/lib/gpr/log_posix.cc          | 4 ++--
+ src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++--
+ 3 files changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/third_party/grpc/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc
+index 81026e5689b..8b597b4cf2f 100644
+--- a/third_party/grpc/src/core/lib/gpr/log_linux.cc
++++ b/third_party/grpc/src/core/lib/gpr/log_linux.cc
+@@ -40,7 +40,7 @@
+ #include <time.h>
+ #include <unistd.h>
+
+-static long gettid(void) { return syscall(__NR_gettid); }
++static long sys_gettid(void) { return syscall(__NR_gettid); }
+
+ void gpr_log(const char* file, int line, gpr_log_severity severity,
+              const char* format, ...) {
+@@ -70,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) {
+   gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME);
+   struct tm tm;
+   static __thread long tid = 0;
+-  if (tid == 0) tid = gettid();
++  if (tid == 0) tid = sys_gettid();
+
+   timer = static_cast<time_t>(now.tv_sec);
+   final_slash = strrchr(args->file, '/');
+diff --git a/third_party/grpc/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc
+index b6edc14ab6b..2f7c6ce3760 100644
+--- a/third_party/grpc/src/core/lib/gpr/log_posix.cc
++++ b/third_party/grpc/src/core/lib/gpr/log_posix.cc
+@@ -31,7 +31,7 @@
+ #include <string.h>
+ #include <time.h>
+
+-static intptr_t gettid(void) { return (intptr_t)pthread_self(); }
++static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); }
+
+ void gpr_log(const char* file, int line, gpr_log_severity severity,
+              const char* format, ...) {
+@@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) {
+   char* prefix;
+   gpr_asprintf(&prefix, "%s%s.%09d %7" PRIdPTR " %s:%d]",
+                gpr_log_severity_string(args->severity), time_buffer,
+-               (int)(now.tv_nsec), gettid(), display_file, args->line);
++               (int)(now.tv_nsec), sys_gettid(), display_file, args->line);
+
+   fprintf(stderr, "%-70s %s\n", prefix, args->message);
+   gpr_free(prefix);
+diff --git a/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc
+index c2d80c08ddb..4a83cb6c215 100644
+--- a/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc
++++ b/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc
+@@ -1077,7 +1077,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker,
+ }
+
+ #ifndef NDEBUG
+-static long gettid(void) { return syscall(__NR_gettid); }
++static long sys_gettid(void) { return syscall(__NR_gettid); }
+ #endif
+
+ /* pollset->mu lock must be held by the caller before calling this.
+@@ -1097,7 +1097,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset,
+ #define WORKER_PTR (&worker)
+ #endif
+ #ifndef NDEBUG
+-  WORKER_PTR->originator = gettid();
++  WORKER_PTR->originator = sys_gettid();
+ #endif
+   if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) {
+     gpr_log(GPR_INFO,
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_1/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_1/src-deps.json
new file mode 100644
index 000000000000..7cf939daa72b
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bazel/bazel_1/src-deps.json
@@ -0,0 +1,506 @@
+{
+    "0.16.2.zip": {
+        "name": "0.16.2.zip",
+        "sha256": "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip",
+            "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip"
+        ]
+    },
+    "0.28.3.tar.gz": {
+        "name": "0.28.3.tar.gz",
+        "sha256": "d8c2f20deb2f6143bac792d210db1a4872102d81529fe0ea3476c1696addd7ff",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/0.28.3.tar.gz",
+            "https://github.com/bazelbuild/bazel-toolchains/archive/0.28.3.tar.gz"
+        ]
+    },
+    "0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip": {
+        "name": "0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip",
+        "sha256": "36fa66d4d49debd71d05fba55c1353b522e8caef4a20f8080a3d17cdda001d89",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip",
+            "https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip"
+        ]
+    },
+    "441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip": {
+        "name": "441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip",
+        "sha256": "a07fe5e75964361885db725039c2ba673f0ee0313d971ae4f50c9b18cd28b0b5",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip",
+            "https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip"
+        ]
+    },
+    "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": {
+        "name": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip",
+        "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip",
+            "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"
+        ]
+    },
+    "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz": {
+        "name": "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz",
+        "sha256": "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz",
+            "https://github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz"
+        ]
+    },
+    "97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz": {
+        "name": "97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz",
+        "sha256": "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz",
+            "https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz"
+        ]
+    },
+    "android_tools_pkg-0.12.tar.gz": {
+        "name": "android_tools_pkg-0.12.tar.gz",
+        "sha256": "96c4eef4d195dd95e43a4259cf5b82a1e34f67333439e91955bbdc0e1c8e7a31",
+        "urls": [
+            "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.12.tar.gz"
+        ]
+    },
+    "bazel_j2objc": {
+        "name": "bazel_j2objc",
+        "sha256": "8d3403b5b7db57e347c943d214577f6879e5b175c2b59b7e075c0b6453330e9b",
+        "strip_prefix": "j2objc-2.5",
+        "urls": [
+            "https://mirror.bazel.build/github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip",
+            "https://github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip"
+        ]
+    },
+    "bazel_skylib": {
+        "name": "bazel_skylib",
+        "sha256": "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52",
+        "strip_prefix": "bazel-skylib-f83cb8dd6f5658bc574ccd873e25197055265d1c",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz",
+            "https://github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz"
+        ]
+    },
+    "bazel_toolchains": {
+        "name": "bazel_toolchains",
+        "sha256": "d8c2f20deb2f6143bac792d210db1a4872102d81529fe0ea3476c1696addd7ff",
+        "strip_prefix": "bazel-toolchains-0.28.3",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/0.28.3.tar.gz",
+            "https://github.com/bazelbuild/bazel-toolchains/archive/0.28.3.tar.gz"
+        ]
+    },
+    "build_bazel_rules_nodejs": {
+        "name": "build_bazel_rules_nodejs",
+        "sha256": "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0",
+        "strip_prefix": "rules_nodejs-0.16.2",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip",
+            "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip"
+        ]
+    },
+    "c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz": {
+        "name": "c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz",
+        "sha256": "e6a76586b264f30679688f65f7e71ac112d1446681010a13bf22d9ca071f34b7",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz",
+            "https://github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz"
+        ]
+    },
+    "com_google_googletest": {
+        "name": "com_google_googletest",
+        "sha256": "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb",
+        "strip_prefix": "googletest-release-1.10.0",
+        "urls": [
+            "https://mirror.bazel.build/github.com/google/googletest/archive/release-1.10.0.tar.gz",
+            "https://github.com/google/googletest/archive/release-1.10.0.tar.gz"
+        ]
+    },
+    "coverage_output_generator-v2.0.zip": {
+        "name": "coverage_output_generator-v2.0.zip",
+        "sha256": "3a6951051272d51613ac4c77af6ce238a3db321bf06506fde1b8866eb18a89dd",
+        "urls": [
+            "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.0.zip"
+        ]
+    },
+    "desugar_jdk_libs": {
+        "name": "desugar_jdk_libs",
+        "sha256": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d",
+        "strip_prefix": "desugar_jdk_libs-e0b0291b2c51fbe5a7cfa14473a1ae850f94f021",
+        "urls": [
+            "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip",
+            "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip"
+        ]
+    },
+    "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": {
+        "name": "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip",
+        "sha256": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d",
+        "urls": [
+            "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip",
+            "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip"
+        ]
+    },
+    "f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz": {
+        "name": "f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz",
+        "sha256": "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz",
+            "https://github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz"
+        ]
+    },
+    "io_bazel_rules_sass": {
+        "name": "io_bazel_rules_sass",
+        "sha256": "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898",
+        "strip_prefix": "rules_sass-8ccf4f1c351928b55d5dddf3672e3667f6978d60",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz",
+            "https://github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz"
+        ]
+    },
+    "io_bazel_skydoc": {
+        "name": "io_bazel_skydoc",
+        "sha256": "e6a76586b264f30679688f65f7e71ac112d1446681010a13bf22d9ca071f34b7",
+        "strip_prefix": "skydoc-c7bbde2950769aac9a99364b0926230060a3ce04",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz",
+            "https://github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz"
+        ]
+    },
+    "java_tools_javac11_darwin-v6.1.zip": {
+        "name": "java_tools_javac11_darwin-v6.1.zip",
+        "sha256": "f0c488dac18f18ab1a0d18bbd65288c7a128e90a24d9c16f65bd8243f79483a0",
+        "urls": [
+            "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v6.1/java_tools_javac11_darwin-v6.1.zip"
+        ]
+    },
+    "java_tools_javac11_linux-v6.1.zip": {
+        "name": "java_tools_javac11_linux-v6.1.zip",
+        "sha256": "12f7940ed0bc4c2e82238951cdf19b4179c7dcc361d16fe40fe4266538fb4ac6",
+        "urls": [
+            "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v6.1/java_tools_javac11_linux-v6.1.zip"
+        ]
+    },
+    "java_tools_javac11_windows-v6.1.zip": {
+        "name": "java_tools_javac11_windows-v6.1.zip",
+        "sha256": "e2deb2efff684de78787e0bdc7620f9672d13f04a12856d8e7f677369a8e286b",
+        "urls": [
+            "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v6.1/java_tools_javac11_windows-v6.1.zip"
+        ]
+    },
+    "java_tools_langtools_javac10": {
+        "name": "java_tools_langtools_javac10",
+        "sha256": "0e9c9ac5ef17869de3cb8c3497c4c0d31836ef7b63efe1690506f53783adb212",
+        "urls": [
+            "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk10_v2.zip"
+        ]
+    },
+    "java_tools_langtools_javac11": {
+        "name": "java_tools_langtools_javac11",
+        "sha256": "cf0814fa002ef3d794582bb086516d8c9ed0958f83f19799cdb08949019fe4c7",
+        "urls": [
+            "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11_v2.zip"
+        ]
+    },
+    "java_tools_langtools_javac12": {
+        "name": "java_tools_langtools_javac12",
+        "sha256": "99b107105165a91df82cd7cf82a8efb930d803fb7de1663cf7f780142104cd14",
+        "urls": [
+            "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk12.zip"
+        ]
+    },
+    "java_tools_langtools_javac9": {
+        "name": "java_tools_langtools_javac9",
+        "sha256": "d94befcfb325a9a62aebc2052e631fde2322b4df5c82a19ed260b38ba12a0ad1",
+        "urls": [
+            "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk9_v2.zip"
+        ]
+    },
+    "jdk10-server-release-1804.tar.xz": {
+        "name": "jdk10-server-release-1804.tar.xz",
+        "sha256": "b7098b7aaf6ee1ffd4a2d0371a0be26c5a5c87f6aebbe46fe9a92c90583a84be",
+        "urls": [
+            "https://mirror.bazel.build/openjdk.linaro.org/releases/jdk10-server-release-1804.tar.xz"
+        ]
+    },
+    "jdk9-server-release-1708.tar.xz": {
+        "name": "jdk9-server-release-1708.tar.xz",
+        "sha256": "72e7843902b0395e2d30e1e9ad2a5f05f36a4bc62529828bcbc698d54aec6022",
+        "urls": [
+            "https://mirror.bazel.build/openjdk.linaro.org/releases/jdk9-server-release-1708.tar.xz"
+        ]
+    },
+    "openjdk10_linux_archive": {
+        "build_file_content": "java_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])",
+        "name": "openjdk10_linux_archive",
+        "sha256": "b3c2d762091a615b0c1424ebbd05d75cc114da3bf4f25a0dec5c51ea7e84146f",
+        "strip_prefix": "zulu10.2+3-jdk10.0.1-linux_x64",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-linux_x64.tar.gz"
+        ]
+    },
+    "openjdk11_linux_archive": {
+        "build_file_content": "java_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])",
+        "name": "openjdk11_linux_archive",
+        "sha256": "ddb0fd4526089cf1ce2db36282c282263f587a9e8be373fa02f511a12923cc48",
+        "strip_prefix": "zulu11.31.11-ca-jdk11.0.3-linux_x64",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu11.31.11-ca-jdk11.0.3/zulu11.31.11-ca-jdk11.0.3-linux_x64.tar.gz"
+        ]
+    },
+    "openjdk12_linux_archive": {
+        "build_file_content": "java_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])",
+        "name": "openjdk12_linux_archive",
+        "sha256": "529c99841d69e11a85aea967ccfb9d0fd40b98c5b68dbe1d059002655e0a9c13",
+        "strip_prefix": "zulu12.2.3-ca-jdk12.0.1-linux_x64",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu12.2.3-ca-jdk12.0.1/zulu12.2.3-ca-jdk12.0.1-linux_x64.tar.gz"
+        ]
+    },
+    "openjdk9_linux_archive": {
+        "build_file_content": "java_runtime(name = 'runtime', srcs =  glob(['**']), visibility = ['//visibility:public'])",
+        "name": "openjdk9_linux_archive",
+        "sha256": "45f2dfbee93b91b1468cf81d843fc6d9a47fef1f831c0b7ceff4f1eb6e6851c8",
+        "strip_prefix": "zulu9.0.7.1-jdk9.0.7-linux_x64",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-linux_x64.tar.gz"
+        ]
+    },
+    "openjdk_linux": {
+        "downloaded_file_path": "zulu-linux.tar.gz",
+        "name": "openjdk_linux",
+        "sha256": "460d8a4f0c0204160b48086e341b22943c9cca471b195340e75b38ae9eb33c1c",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209950.tar.gz"
+        ]
+    },
+    "openjdk_linux_aarch64": {
+        "downloaded_file_path": "zulu-linux-aarch64.tar.gz",
+        "name": "openjdk_linux_aarch64",
+        "sha256": "23c37c0c3a8fdcbc68e96e70ff5c5c020c14db76deaae9b547849afda4586e5e",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64-allmodules-c82eb4878c7dc829455caeb915affe36c89df06f-1561630858.tar.gz"
+        ]
+    },
+    "openjdk_linux_aarch64_minimal": {
+        "downloaded_file_path": "zulu-linux-aarch64-minimal.tar.gz",
+        "name": "openjdk_linux_aarch64_minimal",
+        "sha256": "7af2583fe5ef0a781d4a9dca0c0160d42e7db1305ec1b66f98aa44c91cc875df",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64-minimal-c82eb4878c7dc829455caeb915affe36c89df06f-1561630858.tar.gz"
+        ]
+    },
+    "openjdk_linux_aarch64_vanilla": {
+        "downloaded_file_path": "zulu-linux-aarch64-vanilla.tar.gz",
+        "name": "openjdk_linux_aarch64_vanilla",
+        "sha256": "3b0d91611b1bdc4d409afcf9eab4f0e7f4ae09f88fc01bd9f2b48954882ae69b",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz"
+        ]
+    },
+    "openjdk_linux_minimal": {
+        "downloaded_file_path": "zulu-linux-minimal.tar.gz",
+        "name": "openjdk_linux_minimal",
+        "sha256": "5123bc8dd21886761d1fd9ca0fb1898b3372d7243064a070ec81ca9c9d1a6791",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64-minimal-524ae2ca2a782c9f15e00f08bd35b3f8ceacbd7f-1556011926.tar.gz"
+        ]
+    },
+    "openjdk_linux_vanilla": {
+        "downloaded_file_path": "zulu-linux-vanilla.tar.gz",
+        "name": "openjdk_linux_vanilla",
+        "sha256": "f3f44b6235508e87b760bf37a49e186cc1fa4e9cd28384c4dbf5a33991921e08",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz"
+        ]
+    },
+    "openjdk_macos": {
+        "downloaded_file_path": "zulu-macos.tar.gz",
+        "name": "openjdk_macos",
+        "sha256": "8fa61d85ca6f657d646fdb50cfc8634987f8f7d8a3250ed39fb7364647633252",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209951.tar.gz"
+        ]
+    },
+    "openjdk_macos_minimal": {
+        "downloaded_file_path": "zulu-macos-minimal.tar.gz",
+        "name": "openjdk_macos_minimal",
+        "sha256": "ac56e44db46fd56ac78b39b6823daed4faa74a2677ac340c7d217f863884ec0f",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64-minimal-524ae2ca2a782c9f15e00f08bd35b3f8ceacbd7f-1556003114.tar.gz"
+        ]
+    },
+    "openjdk_macos_vanilla": {
+        "downloaded_file_path": "zulu-macos-vanilla.tar.gz",
+        "name": "openjdk_macos_vanilla",
+        "sha256": "059f8e3484bf07b63a8f2820d5f528f473eff1befdb1896ee4f8ff06be3b8d8f",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip"
+        ]
+    },
+    "openjdk_win": {
+        "downloaded_file_path": "zulu-win.zip",
+        "name": "openjdk_win",
+        "sha256": "e6ddb361309f8e84eb5fb5ad8b0f5cc031ba3679910139262c31efd8f7579d05",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209972.zip"
+        ]
+    },
+    "openjdk_win_minimal": {
+        "downloaded_file_path": "zulu-win-minimal.zip",
+        "name": "openjdk_win_minimal",
+        "sha256": "8e5dada6e9ebcc9ce29b4d051449bb95d3ee1e620e166da862224bbf15211f8b",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64-minimal-524ae2ca2a782c9f15e00f08bd35b3f8ceacbd7f-1556003136.zip"
+        ]
+    },
+    "openjdk_win_vanilla": {
+        "downloaded_file_path": "zulu-win-vanilla.zip",
+        "name": "openjdk_win_vanilla",
+        "sha256": "e1f5b4ce1b9148140fae2fcfb8a96d1c9b7eac5b8df0e13fbcad9b8561284880",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64.zip"
+        ]
+    },
+    "platforms": {
+        "name": "platforms",
+        "sha256": "a07fe5e75964361885db725039c2ba673f0ee0313d971ae4f50c9b18cd28b0b5",
+        "strip_prefix": "platforms-441afe1bfdadd6236988e9cac159df6b5a9f5a98",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip",
+            "https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip"
+        ]
+    },
+    "rules_cc": {
+        "name": "rules_cc",
+        "sha256": "36fa66d4d49debd71d05fba55c1353b522e8caef4a20f8080a3d17cdda001d89",
+        "strip_prefix": "rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip",
+            "https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip"
+        ]
+    },
+    "rules_java": {
+        "name": "rules_java",
+        "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598",
+        "strip_prefix": "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip",
+            "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"
+        ]
+    },
+    "rules_pkg": {
+        "name": "rules_pkg",
+        "sha256": "5bdc04987af79bd27bc5b00fe30f59a858f77ffa0bd2d8143d5b31ad8b1bd71c",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/rules_pkg-0.2.0.tar.gz",
+            "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.0/rules_pkg-0.2.0.tar.gz"
+        ]
+    },
+    "rules_pkg-0.2.0.tar.gz": {
+        "name": "rules_pkg-0.2.0.tar.gz",
+        "sha256": "5bdc04987af79bd27bc5b00fe30f59a858f77ffa0bd2d8143d5b31ad8b1bd71c",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/rules_pkg-0.2.0.tar.gz",
+            "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.0/rules_pkg-0.2.0.tar.gz"
+        ]
+    },
+    "rules_proto": {
+        "name": "rules_proto",
+        "sha256": "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208",
+        "strip_prefix": "rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313",
+        "urls": [
+            "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz",
+            "https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz"
+        ]
+    },
+    "zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz": {
+        "name": "zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz",
+        "sha256": "57fad3602e74c79587901d6966d3b54ef32cb811829a2552163185d5064fe9b5",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz"
+        ]
+    },
+    "zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz": {
+        "name": "zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz",
+        "sha256": "e669c9a897413d855b550b4e39d79614392e6fb96f494e8ef99a34297d9d85d3",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz"
+        ]
+    },
+    "zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip": {
+        "name": "zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip",
+        "sha256": "c39e7700a8d41794d60985df5a20352435196e78ecbc6a2b30df7be8637bffd5",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip"
+        ]
+    },
+    "zulu11.2.3-jdk11.0.1-linux_x64.tar.gz": {
+        "name": "zulu11.2.3-jdk11.0.1-linux_x64.tar.gz",
+        "sha256": "232b1c3511f0d26e92582b7c3cc363be7ac633e371854ca2f2e9f2b50eb72a75",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-linux_x64.tar.gz"
+        ]
+    },
+    "zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz": {
+        "name": "zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz",
+        "sha256": "1edf366ee821e5db8e348152fcb337b28dfd6bf0f97943c270dcc6747cedb6cb",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz"
+        ]
+    },
+    "zulu11.2.3-jdk11.0.1-win_x64.zip": {
+        "name": "zulu11.2.3-jdk11.0.1-win_x64.zip",
+        "sha256": "8e1e2b8347de6746f3fd1538840dd643201533ab113abc4ed93678e342d28aa3",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-win_x64.zip"
+        ]
+    },
+    "zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz": {
+        "name": "zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz",
+        "sha256": "f3f44b6235508e87b760bf37a49e186cc1fa4e9cd28384c4dbf5a33991921e08",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz"
+        ]
+    },
+    "zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip": {
+        "name": "zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip",
+        "sha256": "059f8e3484bf07b63a8f2820d5f528f473eff1befdb1896ee4f8ff06be3b8d8f",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip"
+        ]
+    },
+    "zulu11.29.3-ca-jdk11.0.2-win_x64.zip": {
+        "name": "zulu11.29.3-ca-jdk11.0.2-win_x64.zip",
+        "sha256": "e1f5b4ce1b9148140fae2fcfb8a96d1c9b7eac5b8df0e13fbcad9b8561284880",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64.zip"
+        ]
+    },
+    "zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz": {
+        "name": "zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz",
+        "sha256": "3b0d91611b1bdc4d409afcf9eab4f0e7f4ae09f88fc01bd9f2b48954882ae69b",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz"
+        ]
+    },
+    "zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz": {
+        "name": "zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz",
+        "sha256": "f27cb933de4f9e7fe9a703486cf44c84bc8e9f138be0c270c9e5716a32367e87",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz"
+        ]
+    },
+    "zulu9.0.7.1-jdk9.0.7-macosx_x64-allmodules.tar.gz": {
+        "name": "zulu9.0.7.1-jdk9.0.7-macosx_x64-allmodules.tar.gz",
+        "sha256": "404e7058ff91f956612f47705efbee8e175a38b505fb1b52d8c1ea98718683de",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-macosx_x64-allmodules.tar.gz"
+        ]
+    },
+    "zulu9.0.7.1-jdk9.0.7-win_x64-allmodules.zip": {
+        "name": "zulu9.0.7.1-jdk9.0.7-win_x64-allmodules.zip",
+        "sha256": "e738829017f107e7a7cd5069db979398ec3c3f03ef56122f89ba38e7374f63ed",
+        "urls": [
+            "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-win_x64-allmodules.zip"
+        ]
+    }
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 404953a78294..f9426c0f60f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9766,7 +9766,16 @@ in
 
   bam = callPackage ../development/tools/build-managers/bam {};
 
-  bazel = callPackage ../development/tools/build-managers/bazel {
+  bazel = callPackage ../development/tools/build-managers/bazel/bazel-latest {
+    inherit (darwin) cctools;
+    inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
+    buildJdk = jdk8;
+    buildJdkName = "jdk8";
+    runJdk = jdk11_headless;
+    stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
+  };
+
+  bazel_1 = callPackage ../development/tools/build-managers/bazel/bazel_1 {
     inherit (darwin) cctools;
     inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
     buildJdk = jdk8;

From 171d374c178aefdc8b3b8c08b894d9a4acd58954 Mon Sep 17 00:00:00 2001
From: Gasper Vozel <gv@niteo.co>
Date: Mon, 2 Mar 2020 09:10:08 +0100
Subject: [PATCH 2025/4636] Add hashdeep 4.4 package

A set of cross-platform tools to compute hashes.

See: http://md5deep.sourceforge.net/start-hashdeep.html
---
 maintainers/maintainer-list.nix          |  6 ++++++
 pkgs/tools/security/hashdeep/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 3 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/security/hashdeep/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index da84bffe116e..af519cad42fb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3721,6 +3721,12 @@
     github = "kampfschlaefer";
     name = "Arnold Krille";
   };
+  karantan = {
+    name = "Gasper Vozel";
+    email = "karantan@gmail.com";
+    github = "karantan";
+    githubId = 7062631;
+  };
   karolchmist = {
     email = "info+nix@chmist.com";
     name = "karolchmist";
diff --git a/pkgs/tools/security/hashdeep/default.nix b/pkgs/tools/security/hashdeep/default.nix
new file mode 100644
index 000000000000..edb5794eef76
--- /dev/null
+++ b/pkgs/tools/security/hashdeep/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, autoreconfHook }:
+
+let version = "4.4";
+in stdenv.mkDerivation {
+  name = "hashdeep-${version}";
+
+  src = fetchFromGitHub {
+    owner = "jessek";
+    repo = "hashdeep";
+    rev = "release-${version}";
+    sha256 = "0m2b042ndikavmplv3qjdhfj44hl1h8car83c192xi9nv5ahi7mf";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = with stdenv.lib; {
+    description = "A set of cross-platform tools to compute hashes.";
+    homepage = "https://github.com/jessek/hashdeep";
+    license = licenses.gpl2;
+    platforms = with platforms; linux ++ freebsd ++ openbsd ++ darwin;
+    maintainers = [ stdenv.lib.maintainers.karantan ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 404953a78294..2a8d46bcacde 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26099,4 +26099,6 @@ in
   quartus-prime-lite = callPackage ../applications/editors/quartus-prime {};
 
   go-license-detector = callPackage ../development/tools/misc/go-license-detector { };
+
+  hashdeep = callPackage ../tools/security/hashdeep { };
 }

From 33f11be707e39acf96423f97f3baa80d8f11a0cb Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Fri, 28 Feb 2020 18:14:52 +0900
Subject: [PATCH 2026/4636] python3Packages.tensorflow-tensorboard: 1.15.0 ->
 2.1.0

---
 .../python-modules/tensorflow-tensorboard/default.nix     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix
index e0108aed5ef6..202b167c7e6c 100644
--- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix
+++ b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix
@@ -7,6 +7,7 @@
 , markdown
 , futures
 , absl-py
+, google-auth-oauthlib
 }:
 
 # tensorflow/tensorboard is built from a downloaded wheel, because
@@ -15,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "tensorflow-tensorboard";
-  version = "1.15.0";
+  version = "2.1.0";
   format = "wheel";
 
   src = fetchPypi ({
@@ -24,10 +25,10 @@ buildPythonPackage rec {
     format = "wheel";
   } // (if isPy3k then {
     python = "py3";
-    sha256 = "1g62i3nrgp8q9wfsyqqjkkfnsz7x2k018c26kdh527h1yrjjrbac";
+    sha256 = "1wpjdzhjpcdkyaahzd4bl71k4l30z5c55280ndiwj32hw70lxrp6";
   } else {
     python = "py2";
-    sha256 = "0l3zc8j2sh7h1z4qpy8kfvclv3kzndri55p10i42q6xahs9phav1";
+    sha256 = "1f805839xa36wxb7xac9fyxzaww92vw4d50vs6g61wnlr4byp00w";
   }));
 
   propagatedBuildInputs = [
@@ -37,6 +38,7 @@ buildPythonPackage rec {
     markdown
     grpcio
     absl-py
+    google-auth-oauthlib
     # not declared in install_requires, but used at runtime
     # https://github.com/NixOS/nixpkgs/issues/73840
     wheel

From c186f5ec4d5148b95ac535ee6affb43bd1de9bc2 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Fri, 28 Feb 2020 18:15:28 +0900
Subject: [PATCH 2027/4636] python3Packages.tensorflow-estimator: 1.15.1 ->
 2.1.0

---
 .../python-modules/tensorflow-estimator/default.nix        | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/tensorflow-estimator/default.nix b/pkgs/development/python-modules/tensorflow-estimator/default.nix
index 9f6be4d1ddac..47ce0f83b02d 100644
--- a/pkgs/development/python-modules/tensorflow-estimator/default.nix
+++ b/pkgs/development/python-modules/tensorflow-estimator/default.nix
@@ -1,19 +1,18 @@
 { stdenv, fetchPypi, buildPythonPackage
 , numpy
-, absl-py 
+, absl-py
 , mock
 }:
 
 buildPythonPackage rec {
   pname = "tensorflow-estimator";
-  # This is effectively 1.15.0. Upstream tagged 1.15.0 by mistake before actually updating the version in setup.py, which is why this tag is called 1.15.1.
-  version = "1.15.1";
+  version = "2.1.0";
   format = "wheel";
 
   src = fetchPypi {
     pname = "tensorflow_estimator";
     inherit version format;
-    sha256 = "1fc61wmc0w22frs79j2x4g6wnv5g21xc6rix1g4bsvy9qfvvylw8";
+    sha256 = "0wk9viil54ms1s2ir7zxygqa425i69hx8zngwhdqvw9nlr4gdig5";
   };
 
   propagatedBuildInputs = [ mock numpy absl-py ];

From d8d9358c041d2f2af9655090d8eba24c177fe989 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Fri, 28 Feb 2020 18:16:46 +0900
Subject: [PATCH 2028/4636] python3Packages.protobuf: bump protobuf dep to from
 3.7 to 3.8 for tensorflow-2.1.0

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d7ef1072ec5a..ea8a38ac95b3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4892,7 +4892,7 @@ in {
   protobuf = callPackage ../development/python-modules/protobuf {
     disabled = isPyPy;
     doCheck = !isPy3k;
-    protobuf = pkgs.protobuf;
+    protobuf = pkgs.protobuf3_8;
   };
 
   psd-tools = callPackage ../development/python-modules/psd-tools { };

From 9e8dea7986dbdde850a58c7704182776642d8919 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Fri, 28 Feb 2020 18:18:04 +0900
Subject: [PATCH 2029/4636] python3Packages.tensorflow-bin: 1.14.0 -> 2.1.0

---
 .../python-modules/tensorflow/bin.nix         | 106 ++++++++++++++----
 .../tensorflow/binary-hashes.nix              |  70 +++++++-----
 .../python-modules/tensorflow/prefetcher.sh   |  61 +++++-----
 3 files changed, 157 insertions(+), 80 deletions(-)

diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index 38fec9adc7dc..e81dc2dbd002 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -14,6 +14,9 @@
 , absl-py
 , grpcio
 , mock
+, scipy
+, wheel
+, opt-einsum
 , backports_weakref
 , tensorflow-estimator
 , tensorflow-tensorboard
@@ -55,21 +58,22 @@ in buildPythonPackage {
 
   src = let
     pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion;
-    pyver = if stdenv.isDarwin then builtins.substring 0 1 pyVerNoDot else pyVerNoDot;
     platform = if stdenv.isDarwin then "mac" else "linux";
     unit = if cudaSupport then "gpu" else "cpu";
-    key = "${platform}_py_${pyver}_${unit}";
+    key = "${platform}_py_${pyVerNoDot}_${unit}";
   in fetchurl packages.${key};
 
   propagatedBuildInputs = [
     protobuf
     numpy
+    scipy
     termcolor
     grpcio
     six
     astor
     absl-py
     gast
+    opt-einsum
     google-pasta
     wrapt
     tensorflow-estimator
@@ -79,40 +83,94 @@ in buildPythonPackage {
   ] ++ lib.optional (!isPy3k) mock
     ++ lib.optionals (pythonOlder "3.4") [ backports_weakref ];
 
-  nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath;
+  nativeBuildInputs = [ wheel ] ++ lib.optional cudaSupport addOpenGLRunpath;
 
-  # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow
-  # and the propageted input tensorflow-tensorboard which causes environment collisions.
-  # another possibility would be to have tensorboard only in the buildInputs
-  # https://github.com/tensorflow/tensorflow/blob/v1.7.1/tensorflow/tools/pip_package/setup.py#L79
-  postInstall = ''
-    rm $out/bin/tensorboard
+  preConfigure = ''
+    unset SOURCE_DATE_EPOCH
+
+    # Make sure that dist and the wheel file are writable.
+    chmod u+rwx -R ./dist
+
+    pushd dist
+
+    # Unpack the wheel file.
+    wheel unpack --dest unpacked ./*.whl
+
+    # Tensorflow has a hard dependency on gast==0.2.2, but we relax it to
+    # gast==0.3.2.
+    substituteInPlace ./unpacked/tensorflow*/tensorflow_core/tools/pip_package/setup.py --replace "gast == 0.2.2" "gast == 0.3.2"
+    substituteInPlace ./unpacked/tensorflow*/tensorflow_*.dist-info/METADATA --replace "gast (==0.2.2)" "gast (==0.3.2)"
+
+    # Pack the wheel file back up.
+    wheel pack ./unpacked/tensorflow*
+
+    popd
   '';
 
   # Note that we need to run *after* the fixup phase because the
   # libraries are loaded at runtime. If we run in preFixup then
   # patchelf --shrink-rpath will remove the cuda libraries.
-  postFixup = let
-    rpath = stdenv.lib.makeLibraryPath
-      ([ stdenv.cc.cc.lib zlib ] ++ lib.optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn nvidia_x11 ]);
-  in
-  lib.optionalString stdenv.isLinux ''
-    rrPath="$out/${python.sitePackages}/tensorflow/:$out/${python.sitePackages}/tensorflow/contrib/tensor_forest/:${rpath}"
-    internalLibPath="$out/${python.sitePackages}/tensorflow/python/_pywrap_tensorflow_internal.so"
-    find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
-      patchelf --set-rpath "$rrPath" "$lib"
-      ${lib.optionalString cudaSupport ''
-        addOpenGLRunpath "$lib"
-      ''}
-    done
-  '';
+  postFixup =
+    let
+      # rpaths we only need to add if CUDA is enabled.
+      cudapaths = lib.optionals cudaSupport [
+        cudatoolkit.out
+        cudatoolkit.lib
+        cudnn
+        nvidia_x11
+      ];
 
+      libpaths = [
+        stdenv.cc.cc.lib
+        zlib
+      ];
+
+      rpath = stdenv.lib.makeLibraryPath (libpaths ++ cudapaths);
+    in
+    lib.optionalString stdenv.isLinux ''
+      # This is an array containing all the directories in the tensorflow2
+      # package that contain .so files.
+      #
+      # TODO: Create this list programmatically, and remove paths that aren't
+      # actually needed.
+      rrPathArr=(
+        "$out/${python.sitePackages}/tensorflow_core/"
+        "$out/${python.sitePackages}/tensorflow_core/compiler/tf2tensorrt/"
+        "$out/${python.sitePackages}/tensorflow_core/compiler/tf2xla/ops/"
+        "$out/${python.sitePackages}/tensorflow_core/lite/experimental/microfrontend/python/ops/"
+        "$out/${python.sitePackages}/tensorflow_core/lite/python/interpreter_wrapper/"
+        "$out/${python.sitePackages}/tensorflow_core/lite/python/optimize/"
+        "$out/${python.sitePackages}/tensorflow_core/python/"
+        "$out/${python.sitePackages}/tensorflow_core/python/framework/"
+        "${rpath}"
+      )
+
+      # The the bash array into a colon-separated list of RPATHs.
+      rrPath=$(IFS=$':'; echo "''${rrPathArr[*]}")
+      echo "about to run patchelf with the following rpath: $rrPath"
+
+      find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
+        echo "about to patchelf $lib..."
+        chmod a+rx "$lib"
+        patchelf --set-rpath "$rrPath" "$lib"
+        ${lib.optionalString cudaSupport ''
+          addOpenGLRunpath "$lib"
+        ''}
+      done
+    '';
+
+  pythonImportsCheck = [
+    "tensorflow"
+    "tensorflow.keras"
+    "tensorflow.python"
+    "tensorflow.python.framework"
+  ];
 
   meta = with stdenv.lib; {
     description = "Computation using data flow graphs for scalable machine learning";
     homepage = http://tensorflow.org;
     license = licenses.asl20;
-    maintainers = with maintainers; [ jyp abbradar ];
+    maintainers = with maintainers; [ jyp abbradar cdepillabout ];
     platforms = [ "x86_64-linux" "x86_64-darwin" ];
     # Python 2.7 build uses different string encoding.
     # See https://github.com/NixOS/nixpkgs/pull/37044#issuecomment-373452253
diff --git a/pkgs/development/python-modules/tensorflow/binary-hashes.nix b/pkgs/development/python-modules/tensorflow/binary-hashes.nix
index fa4809dc3f19..90848e93273f 100644
--- a/pkgs/development/python-modules/tensorflow/binary-hashes.nix
+++ b/pkgs/development/python-modules/tensorflow/binary-hashes.nix
@@ -1,43 +1,51 @@
 {
-version = "1.14.0";
-linux_py_27_cpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp27-none-linux_x86_64.whl";
-  sha256 = "0yywdrfk97dh1bxhibspg0raz70fx9lcczj6xlimqy4xb60clx7k";
-};
-linux_py_35_cpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp35-cp35m-linux_x86_64.whl";
-  sha256 = "1xvyb6xcrjhlwvrmrhn5vs9xy7g98smqmpv4i3hhpry4qyasphhj";
-};
-linux_py_36_cpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp36-cp36m-linux_x86_64.whl";
-  sha256 = "1psd9vyxz9f39dwj77nvrg373sxv3p5vdp9fnz81dpsm0b0mwl44";
-};
-linux_py_37_cpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp37-cp37m-linux_x86_64.whl";
-  sha256 = "0bg2sb1n2ag27r7ww695kg5hb0mjrw4kc5893krmixx2j71860c5";
-};
+version = "2.1.0";
 linux_py_27_gpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp27-none-linux_x86_64.whl";
-  sha256 = "0y1x91gayg6pjddgl8ndcm63wfzhyv4s5khgl7ffzsgni1ivaqw5";
+  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.1.0-cp27-cp27mu-manylinux2010_x86_64.whl";
+  sha256 = "17lnhr7vdrls68c79n3sah5rpd0q1x2v5m84azvlyxxh2wpypfmb";
+};
+linux_py_27_cpu = {
+  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.1.0-cp27-cp27mu-manylinux2010_x86_64.whl";
+  sha256 = "10lz3i4pcpgqrcbjmxm0n7k1gsqlpna3kdid902j2fy060cpi93z";
 };
 linux_py_35_gpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp35-cp35m-linux_x86_64.whl";
-  sha256 = "03piggpbz1jx8m2b95spq3jrdff4w6xx63ji07am7hyw2nsgx3mx";
+  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.1.0-cp35-cp35m-manylinux2010_x86_64.whl";
+  sha256 = "09s081n08dpmflwgir3zwzfijfpmahbh2gy5fn5bv5ll86g1szsy";
+};
+linux_py_35_cpu = {
+  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.1.0-cp35-cp35m-manylinux2010_x86_64.whl";
+  sha256 = "1aa7v9fnvx03hqvhl3x3xcn41qy6qxw5xybg54ifjvvicp455c8l";
 };
 linux_py_36_gpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp36-cp36m-linux_x86_64.whl";
-  sha256 = "0ypkp8cfhharsyyikb1qgf44cfm6284km9xswzvzymjzz75vg3gd";
+  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.1.0-cp36-cp36m-manylinux2010_x86_64.whl";
+  sha256 = "1dqp080ljbl9v3115vjp63ls0fimiwym6zxyanyhrlk8kwsq20zc";
+};
+linux_py_36_cpu = {
+  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.1.0-cp36-cp36m-manylinux2010_x86_64.whl";
+  sha256 = "133z8anx7xm9rr5i9s9dwnp1wf06nr6s7q1lbs4lxpk6kn9nl480";
 };
 linux_py_37_gpu = {
-  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp37-cp37m-linux_x86_64.whl";
-  sha256 = "0virp8nn2ysx4855hq29kas6fm6b3dsiybwzdxy9nnb9n2d8qlm2";
+  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-2.1.0-cp37-cp37m-manylinux2010_x86_64.whl";
+  sha256 = "0yabl3xmcpr67w0zksqs3qc68nl9ax0vcd7w7b35nq8f65xl0ghy";
 };
-mac_py_2_cpu = {
-  url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.14.0-py2-none-any.whl";
-  sha256 = "14f86k3pgq7z6i4s4im55zpp38f0drnm7xlclavsgcc0nxnj3z26";
+linux_py_37_cpu = {
+  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-2.1.0-cp37-cp37m-manylinux2010_x86_64.whl";
+  sha256 = "04gngbngyg7p1gwx1q89my0cl8j7lq4kknqh51s2ynrix71zvsy6";
 };
-mac_py_3_cpu = {
-  url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.14.0-py3-none-any.whl";
-  sha256 = "0f3swpcjfgqhj6h5wnx8snc0xjkx4hnkqx83fmlrwpncs8c131d3";
+mac_py_27_cpu = {
+  url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.1.0-cp27-cp27m-macosx_10_9_x86_64.whl";
+  sha256 = "1mprp72w5kk0lyjm2mh4lf57827xk3wsg28c4gizwm00ydfgacg6";
+};
+mac_py_35_cpu = {
+  url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.1.0-cp35-cp35m-macosx_10_6_intel.whl";
+  sha256 = "1as7brf5ai6r7v1di9646jfrbnirpk2b0d1g29mn3shavb62kw8w";
+};
+mac_py_36_cpu = {
+  url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.1.0-cp36-cp36m-macosx_10_9_x86_64.whl";
+  sha256 = "1v1rw9kjrskhcq1yas4ly2yfnzf2i1pjh6qg6zixfbkpkw7sw3wc";
+};
+mac_py_37_cpu = {
+  url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-2.1.0-cp37-cp37m-macosx_10_9_x86_64.whl";
+  sha256 = "1hh4n0d97mrq35cmmsrnlmcv9vlswsyjy368lj3pda3y9dvck3rf";
 };
 }
diff --git a/pkgs/development/python-modules/tensorflow/prefetcher.sh b/pkgs/development/python-modules/tensorflow/prefetcher.sh
index d590fb0f1732..abb0faac2834 100755
--- a/pkgs/development/python-modules/tensorflow/prefetcher.sh
+++ b/pkgs/development/python-modules/tensorflow/prefetcher.sh
@@ -1,33 +1,44 @@
 #!/usr/bin/env bash
 
-version=1.14.0
+version=2.1.0
+
+# List of binary wheels for Tensorflow.  The most recent versions can be found
+# on the following page:
+# https://www.tensorflow.org/install/pip?lang=python3#package-location
+url_and_key_list=(
+  "linux_py_27_gpu https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-${version}-cp27-cp27mu-manylinux2010_x86_64.whl"
+  "linux_py_27_cpu https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-${version}-cp27-cp27mu-manylinux2010_x86_64.whl"
+  "linux_py_35_gpu https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-${version}-cp35-cp35m-manylinux2010_x86_64.whl"
+  "linux_py_35_cpu https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-${version}-cp35-cp35m-manylinux2010_x86_64.whl"
+  "linux_py_36_gpu https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-${version}-cp36-cp36m-manylinux2010_x86_64.whl"
+  "linux_py_36_cpu https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-${version}-cp36-cp36m-manylinux2010_x86_64.whl"
+  "linux_py_37_gpu https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-${version}-cp37-cp37m-manylinux2010_x86_64.whl"
+  "linux_py_37_cpu https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow_cpu-${version}-cp37-cp37m-manylinux2010_x86_64.whl"
+  "mac_py_27_cpu https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-cp27-cp27m-macosx_10_9_x86_64.whl"
+  "mac_py_35_cpu https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-cp35-cp35m-macosx_10_6_intel.whl"
+  "mac_py_36_cpu https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-cp36-cp36m-macosx_10_9_x86_64.whl"
+  "mac_py_37_cpu https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-cp37-cp37m-macosx_10_9_x86_64.whl"
+)
+
 hashfile=binary-hashes.nix
 rm -f $hashfile
 echo "{" >> $hashfile
 echo "version = \"$version\";" >> $hashfile
-for sys in "linux" "mac"; do
-    for tfpref in "cpu/tensorflow" "gpu/tensorflow_gpu"; do
-        for pykind in "py2-none-any" "py3-none-any" "cp27-none-linux_x86_64" "cp35-cp35m-linux_x86_64" "cp36-cp36m-linux_x86_64" "cp37-cp37m-linux_x86_64"; do
-            if [ $sys == "mac" ]; then
-               [[ $pykind =~ py.* ]] && [[ $tfpref =~ cpu.* ]]
-               result=$?
-               pyver=${pykind:2:1}
-               flavour=cpu
-            else
-               [[ $pykind =~ .*linux.* ]]
-               result=$?
-               pyver=${pykind:2:2}
-               flavour=${tfpref:0:3}
-            fi
-            if [ $result == 0 ]; then
-                url=https://storage.googleapis.com/tensorflow/$sys/$tfpref-$version-$pykind.whl
-                hash=$(nix-prefetch-url $url)
-                echo "${sys}_py_${pyver}_${flavour} = {" >> $hashfile
-                echo "  url = \"$url\";" >> $hashfile
-                echo "  sha256 = \"$hash\";" >> $hashfile
-                echo "};" >> $hashfile
-            fi
-        done
-    done
+
+for url_and_key in "${url_and_key_list[@]}"; do
+  key=$(echo "$url_and_key" | cut -d' ' -f1)
+  url=$(echo "$url_and_key" | cut -d' ' -f2)
+
+  echo "prefetching ${url}..."
+  hash=$(nix-prefetch-url $url)
+
+  echo "$key = {" >> $hashfile
+  echo "  url = \"$url\";" >> $hashfile
+  echo "  sha256 = \"$hash\";" >> $hashfile
+  echo "};" >> $hashfile
+
+  echo
 done
+
 echo "}" >> $hashfile
+echo "done."

From f8c402ecad06da9dc703cddaf74942472057dbd4 Mon Sep 17 00:00:00 2001
From: Kovacsics Robert <rmk35@cam.ac.uk>
Date: Tue, 25 Feb 2020 15:29:27 +0000
Subject: [PATCH 2030/4636] polyml: fix with new libffi

New libffi doesn't have FFI_SYSV for x86/64 unix, this pulls in the
commit for the upstream version which fixes it, and ports that patch to
the 5.7 version. The 5.6 version is unchanged.

For ZHF: #80379
---
 .../polyml/5.7-new-libffi-FFI_SYSV.patch      | 34 +++++++++++++++++++
 pkgs/development/compilers/polyml/5.7.nix     |  2 ++
 pkgs/development/compilers/polyml/default.nix | 10 +++++-
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/polyml/5.7-new-libffi-FFI_SYSV.patch

diff --git a/pkgs/development/compilers/polyml/5.7-new-libffi-FFI_SYSV.patch b/pkgs/development/compilers/polyml/5.7-new-libffi-FFI_SYSV.patch
new file mode 100644
index 000000000000..c5c9846300f1
--- /dev/null
+++ b/pkgs/development/compilers/polyml/5.7-new-libffi-FFI_SYSV.patch
@@ -0,0 +1,34 @@
+For 5.7 the copyright header is different.
+
+From ad32de7f181acaffaba78d5c3d9e5aa6b84a741c Mon Sep 17 00:00:00 2001
+From: David Matthews <dm@prolingua.co.uk>
+Date: Sun, 7 Apr 2019 13:41:33 +0100
+Subject: [PATCH] Remove FFI_SYSV from abi table for X86/64 Unix.  It appears
+ that this has been removed in upstream versions of libffi and causes problems
+ when building using the system libffi.
+
+---
+ libpolyml/polyffi.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/libpolyml/polyffi.cpp b/libpolyml/polyffi.cpp
+index 5424dd84..3dc9cc7c 100644
+--- a/libpolyml/polyffi.cpp
++++ b/libpolyml/polyffi.cpp
+@@ -1,7 +1,7 @@
+ /*
+     Title:  New Foreign Function Interface
+
+-    Copyright (c) 2015  David C.J. Matthews
++    Copyright (c) 2015, 2019  David C.J. Matthews
+
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+@@ -109,7 +109,6 @@ static struct _abiTable { const char *abiName; ffi_abi abiCode; } abiTable[] =
+ #elif defined(X86_WIN64)
+     {"win64", FFI_WIN64},
+ #elif defined(X86_ANY)
+-    {"sysv", FFI_SYSV},
+     {"unix64", FFI_UNIX64},
+ #endif
+     { "default", FFI_DEFAULT_ABI}
diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix
index db1c7613f65b..dca34ca67273 100644
--- a/pkgs/development/compilers/polyml/5.7.nix
+++ b/pkgs/development/compilers/polyml/5.7.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     substituteInPlace configure.ac --replace stdc++ c++
   '';
 
+  patches = [ ./5.7-new-libffi-FFI_SYSV.patch ];
+
   buildInputs = [ libffi gmp ];
 
   nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook;
diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index 7be5fd993aef..f35021b6597b 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }:
+{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gmp, libffi }:
 
 stdenv.mkDerivation rec {
   pname = "polyml";
@@ -8,6 +8,14 @@ stdenv.mkDerivation rec {
     substituteInPlace configure.ac --replace stdc++ c++
   '';
 
+  patches = [
+    (fetchpatch {
+      name = "new-libffi-FFI_SYSV.patch";
+      url = "https://github.com/polyml/polyml/commit/ad32de7f181acaffaba78d5c3d9e5aa6b84a741c.patch";
+      sha256 = "007q3r2h9kfh3c1nv0dyhipmak44q468ab9bwnz4kk4a2dq76n8v";
+    })
+  ];
+
   buildInputs = [ libffi gmp ];
 
   nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook;

From f4c29ebfc2b599005f874509938171c73d833d33 Mon Sep 17 00:00:00 2001
From: Kovacsics Robert <rmk35@cam.ac.uk>
Date: Wed, 26 Feb 2020 10:08:38 +0000
Subject: [PATCH 2031/4636] polyml: updated maintainers

I am not sure if we still need the old packages, nothing explicitly
depends on polyml56 or polyml57 according to a grep, not sure if
external packages might (hol and isabelle depend on polyml, the latest
version).
---
 pkgs/development/compilers/polyml/5.7.nix     | 2 +-
 pkgs/development/compilers/polyml/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix
index dca34ca67273..5b2d127f377f 100644
--- a/pkgs/development/compilers/polyml/5.7.nix
+++ b/pkgs/development/compilers/polyml/5.7.nix
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
     homepage = https://www.polyml.org/;
     license = licenses.lgpl21;
     platforms = with platforms; (linux ++ darwin);
-    maintainers = with maintainers; [ maggesi yurrriq ];
+    maintainers = with maintainers; [ maggesi ];
   };
 }
diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index f35021b6597b..dafcdc3d6868 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
     homepage = https://www.polyml.org/;
     license = licenses.lgpl21;
     platforms = with platforms; (linux ++ darwin);
-    maintainers = with maintainers; [ maggesi yurrriq ];
+    maintainers = with maintainers; [ maggesi kovirobi ];
   };
 }

From dbb4826457929842e2ae48eb4ad98cba976cd645 Mon Sep 17 00:00:00 2001
From: scalavision <scalavision@gmail.com>
Date: Mon, 24 Feb 2020 17:58:21 +0100
Subject: [PATCH 2032/4636] truvari:1.3.2->1.3.4

---
 pkgs/applications/science/biology/truvari/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/biology/truvari/default.nix b/pkgs/applications/science/biology/truvari/default.nix
index bee43da6719d..e64c9d3493e9 100644
--- a/pkgs/applications/science/biology/truvari/default.nix
+++ b/pkgs/applications/science/biology/truvari/default.nix
@@ -5,13 +5,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "truvari";
-  version = "1.3.2";
+  version = "1.3.4";
 
   src = fetchFromGitHub {
     owner = "spiralgenetics";
     repo = "truvari";
     rev = "v${version}";
-    sha256 = "0wmjz8nzibvj0ixky1m0qi7iyd204prk7glbvig1cvaab33k19f1";
+    sha256 = "1bph7v48s7pyfagz8a2fzl5fycjliqzn5lcbv3m2bp2ih1f1gd1v";
   };
 
   propagatedBuildInputs = with python3Packages; [
@@ -25,8 +25,9 @@ python3Packages.buildPythonApplication rec {
 
   prePatch = ''
     substituteInPlace ./setup.py \
-      --replace '"progressbar2==3.41.0",' "" \
-      --replace '"pysam==0.15.2",' ""
+      --replace '"progressbar2==3.41.0",' '"progressbar2==3.47.0",' \
+      --replace '"pysam==0.15.2",' '"pysam==0.15.4",' \
+      --replace '"pyfaidx==0.5.5.2",' '"pyfaidx==0.5.8",'
   '';
 
   meta = with lib; {

From 3a802953bbe8b810636f42139718a32d52db6056 Mon Sep 17 00:00:00 2001
From: Claudio Bley <cbley@exa-online.de>
Date: Mon, 10 Feb 2020 11:39:44 +0100
Subject: [PATCH 2033/4636] wtf: 0.25.0 -> 0.27.0

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

diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix
index 3dee9844c0c9..f12f96871c00 100644
--- a/pkgs/applications/misc/wtf/default.nix
+++ b/pkgs/applications/misc/wtf/default.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "wtf";
-  version = "0.25.0";
+  version = "0.27.0";
 
   src = fetchFromGitHub {
     owner = "wtfutil";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1g76hzlyi8s8dayd36cs4bhnwgrrr731ybflw3xk5pgkgcbs14sd";
+    sha256 = "0j184s82bnnhrpm7vdsqg7i3xfm2wqz8jmwqxjkfw87ifgvaha5d";
    };
 
-  modSha256 = "186m7s20r59dyh5lpby4sd4vw3rvnkfzslylwin0c3r6150yrx8h";
+  modSha256 = "14qbjv8rnidfqxzqhli7jyj4573s0swwypdj11mpykcrzk9by8xk";
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 

From daca52912645883192876e25318de1c1c3a487ad Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Mar 2020 08:51:18 +0000
Subject: [PATCH 2034/4636] latte-dock: 0.9.8.1 -> 0.9.9

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

diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix
index 45b788a9489a..ad824b238f8e 100644
--- a/pkgs/applications/misc/latte-dock/default.nix
+++ b/pkgs/applications/misc/latte-dock/default.nix
@@ -3,11 +3,11 @@
 
 mkDerivation rec {
   pname = "latte-dock";
-  version = "0.9.8.1";
+  version = "0.9.9";
 
   src = fetchurl {
     url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "10x5aplkjyi2w0793whjjzi777ffh3m4d0sp06qzkpx8jqd46him";
+    sha256 = "01b2zr2x5hnadkvj687lwi3l6dwq3kdn5y9k4qf1bv0sa4vw6hn9";
     name = "${pname}-${version}.tar.xz";
   };
 
@@ -20,7 +20,7 @@ mkDerivation rec {
 
   meta = with lib; {
     description = "Dock-style app launcher based on Plasma frameworks";
-    homepage = https://github.com/psifidotos/Latte-Dock;
+    homepage = "https://github.com/psifidotos/Latte-Dock";
     license = licenses.gpl2;
     platforms = platforms.unix;
     maintainers = [ maintainers.benley maintainers.ysndr ];

From 34296980d1b35ad40752fe9330f9814ba2186428 Mon Sep 17 00:00:00 2001
From: Michael Lingelbach <m.j.lbach@gmail.com>
Date: Tue, 25 Feb 2020 08:00:44 -0800
Subject: [PATCH 2035/4636] tensorflow: 1.15.0 -> 1.15.1 * Apply glibc 2.3
 patch * build tensorflow with bazel_1 * Bump openssl version to 1.1

---
 pkgs/build-support/build-bazel-package/default.nix |  5 +++++
 .../python-modules/tensorflow/default.nix          | 14 ++++++++++----
 pkgs/top-level/python-packages.nix                 |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix
index a17712472b19..058f42aa8d5a 100644
--- a/pkgs/build-support/build-bazel-package/default.nix
+++ b/pkgs/build-support/build-bazel-package/default.nix
@@ -4,8 +4,13 @@
 , lib
 }:
 
+let
+  bazelPkg = bazel;
+in
+
 args@{
   name
+, bazel ? bazelPkg
 , bazelFlags ? []
 , bazelBuildFlags ? []
 , bazelFetchFlags ? []
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index a9f3ebf9e486..9e5acca4749b 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin
+{ stdenv, pkgs, bazel_1, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin
 , addOpenGLRunpath
 # Python deps
 , buildPythonPackage, isPy3k, pythonOlder, pythonAtLeast, python
@@ -69,7 +69,7 @@ let
 
   tfFeature = x: if x then "1" else "0";
 
-  version = "1.15.0";
+  version = "1.15.1";
   variant = if cudaSupport then "-gpu" else "";
   pname = "tensorflow${variant}";
 
@@ -94,6 +94,7 @@ let
 
   bazel-build = buildBazelPackage {
     name = "${pname}-${version}";
+    bazel = bazel_1;
 
     src = fetchFromGitHub {
       owner = "tensorflow";
@@ -114,6 +115,11 @@ let
         url = "https://github.com/tensorflow/tensorflow/pull/29673/commits/498e35a3bfe38dd75cf1416a1a23c07c3b59e6af.patch";
         sha256 = "1m2qmwv1ysqa61z6255xggwbq6mnxbig749bdvrhnch4zydxb4di";
       })
+      (fetchpatch {
+        name = "backport-pr-18950.patch";
+        url = "https://github.com/tensorflow/tensorflow/commit/73640aaec2ab0234d9fff138e3c9833695570c0a.patch";
+        sha256 = "1n9ypbrx36fc1kc9cz5b3p9qhg15xxhq4nz6ap3hwqba535nakfz";
+      })
 
       ./tf-1.15-bazel-1.0.patch
 
@@ -291,9 +297,9 @@ let
 
       # cudaSupport causes fetch of ncclArchive, resulting in different hashes
       sha256 = if cudaSupport then
-        "1rbg8w8pjf15hpvzrclsi19lhsrwdns6f8psb1wz35ay0ggdw8c0"
+        "1p544yk7jcspgc4qr4amw11ds16c2an5yxvagx5pmwawz0s083pf"
       else
-        "0d8wq89iz9vrzvr971mgdclxxjcjr32r7aj817h019x3pc53qnwx";
+        "1dqbw3k3avqiy9xpgs44l6z65ab5rjjlxwig8z7gcl7fw9h6sbq9";
     };
 
     buildAttrs = {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ea8a38ac95b3..05bf84bd6115 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6671,7 +6671,7 @@ in {
     cudatoolkit = pkgs.cudatoolkit_10;
     cudnn = pkgs.cudnn_cudatoolkit_10;
     nccl = pkgs.nccl_cudatoolkit_10;
-    openssl = pkgs.openssl_1_0_2;
+    openssl = pkgs.openssl_1_1;
     inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security;
   };
 

From 476dd85c093d3a2618530bdb5065a4dc966a281f Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 2 Mar 2020 17:41:47 +0800
Subject: [PATCH 2036/4636] vmfs-tools: minor cleanup

---
 pkgs/tools/filesystems/vmfs-tools/default.nix | 36 +++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/filesystems/vmfs-tools/default.nix b/pkgs/tools/filesystems/vmfs-tools/default.nix
index c15a782fa3c6..f473fa04334a 100644
--- a/pkgs/tools/filesystems/vmfs-tools/default.nix
+++ b/pkgs/tools/filesystems/vmfs-tools/default.nix
@@ -1,25 +1,39 @@
-{ stdenv, fetchFromGitHub, pkgconfig
-, asciidoc, docbook_xsl, fuse, libuuid, libxslt }:
+{ stdenv
+, fetchFromGitHub
+, pkgconfig
+, asciidoc
+, docbook_xsl
+, fuse
+, libuuid
+, libxslt
+}:
 
-stdenv.mkDerivation {
-  name = "vmfs-tools";
+stdenv.mkDerivation rec {
+  pname = "vmfs-tools";
+  version = "0.2.5.20160116";
 
   src = fetchFromGitHub {
-    owner  = "glandium";
-    repo   = "vmfs-tools";
-    rev    = "4ab76ef5b074bdf06e4b518ff6d50439de05ae7f";
+    owner = "glandium";
+    repo = pname;
+    rev = "4ab76ef5b074bdf06e4b518ff6d50439de05ae7f";
     sha256 = "14y412ww5hxk336ils62s3fwykfh6mx1j0iiaa5cwc615pi6qvi4";
   };
 
-  nativeBuildInputs = [ asciidoc docbook_xsl fuse libuuid libxslt pkgconfig ];
+  nativeBuildInputs = [ asciidoc docbook_xsl libxslt pkgconfig ];
+
+  buildInputs = [ fuse libuuid ];
 
   enableParallelBuilding = true;
 
+  postInstall = ''
+    install -Dm444 -t $out/share/doc/${pname} AUTHORS LICENSE README TODO
+  '';
+
   meta = with stdenv.lib; {
-    homepage = https://github.com/glandium/vmfs-tools;
-    description = "FUSE-based VMFS (vmware) mounting tools";
+    description = "FUSE-based VMFS (vmware) file system tools";
     maintainers = with maintainers; [ peterhoeg ];
-    platforms = platforms.linux;
     license = licenses.gpl2;
+    platforms = platforms.linux;
+    inherit (src.meta) homepage;
   };
 }

From 740ec9474ef3a22ca3608093e128746c167031f9 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 2 Mar 2020 17:48:27 +0800
Subject: [PATCH 2037/4636] teensy-loader-cli: 2.1 -> 2.1.20191110

Add manpages and documentation.
---
 .../tools/misc/teensy-loader-cli/default.nix  | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix
index 2975d64113e8..e03320f84295 100644
--- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix
+++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix
@@ -1,26 +1,31 @@
-{ stdenv, libusb, fetchgit }:
-let
-  version = "2.1";
-in
-stdenv.mkDerivation {
+{ stdenv, fetchFromGitHub, go-md2man, installShellFiles, libusb }:
+
+stdenv.mkDerivation rec {
   pname = "teensy-loader-cli";
-  inherit version;
-  src = fetchgit {
-    url = "git://github.com/PaulStoffregen/teensy_loader_cli.git";
-    rev = "f5b6d7aafda9a8b014b4bb08660833ca45c136d2";
-    sha256 = "1a663bv3lvm7bsf2wcaj2c0vpmniak7w5hwix5qgz608bvm2v781";
+  version = "2.1.20191110";
+
+  src = fetchFromGitHub {
+    owner = "PaulStoffregen";
+    repo = "teensy_loader_cli";
+    rev = "e98b5065cdb9f04aa4dde3f2e6e6e6f12dd97592";
+    sha256 = "1yx8vsh6b29pqr4zb6sx47429i9x51hj9psn8zksfz75j5ivfd5i";
   };
 
   buildInputs = [ libusb ];
 
+  nativeBuildInputs = [ go-md2man installShellFiles ];
+
   installPhase = ''
-    install -Dm755 teensy_loader_cli $out/bin/teensy-loader-cli
+    install -Dm555 teensy_loader_cli $out/bin/teensy-loader-cli
+    install -Dm444 -t $out/share/doc/${pname} *.md *.txt
+    go-md2man -in README.md -out ${pname}.1
+    installManPage *.1
   '';
 
   meta = with stdenv.lib; {
-    license = licenses.gpl3;
     description = "Firmware uploader for the Teensy microcontroller boards";
-    homepage = https://www.pjrc.com/teensy/;
+    homepage = "https://www.pjrc.com/teensy/";
+    license = licenses.gpl3;
     maintainers = with maintainers; [ the-kenny ];
     platforms = platforms.unix;
   };

From c1b5cfe26783ec0483be8cfa8ec6ec3e94d31f34 Mon Sep 17 00:00:00 2001
From: Jeffry Molanus <jeffry.molanus@gmail.com>
Date: Mon, 2 Mar 2020 10:24:40 +0100
Subject: [PATCH 2038/4636] terraform-providers.libvirt: 0.5.1 -> 0.6.1

---
 .../cluster/terraform-providers/libvirt/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
index 23c4f4bfa8b3..40a6bb11c7da 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
@@ -19,7 +19,7 @@
 
 buildGoPackage rec {
   pname = "terraform-provider-libvirt";
-  version = "0.5.1";
+  version = "0.6.1";
 
   goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt";
 
@@ -27,7 +27,7 @@ buildGoPackage rec {
     owner = "dmacvicar";
     repo = "terraform-provider-libvirt";
     rev = "v${version}";
-    sha256 = "0shnj5byqj3qzyqniiy1dcygd8xw1h2bx9z6mgcydw8k64fkm4bw";
+    sha256 = "1l2n97nj6g44n7bhnbjwmv36xi6754p4iq2qnpkdh39x4384a0zz";
   };
 
   buildInputs = [ libvirt pkgconfig makeWrapper ];

From 934f57c2dd9f5e68d9c9b3f8edddb04e52b90a13 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Mar 2020 10:46:32 +0000
Subject: [PATCH 2039/4636] libabigail: 1.6 -> 1.7

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

diff --git a/pkgs/development/libraries/libabigail/default.nix b/pkgs/development/libraries/libabigail/default.nix
index dc19adfb6a66..168ce0c9e571 100644
--- a/pkgs/development/libraries/libabigail/default.nix
+++ b/pkgs/development/libraries/libabigail/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libabigail";
-  version = "1.6";
+  version = "1.7";
 
   outputs = [ "bin" "out" "dev" ];
 
   src = fetchurl {
     url = "https://mirrors.kernel.org/sourceware/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "04j07lhvwbp6qp8pdwbf7iqnr7kgpabmqylsw4invpmzwnyp6g6g";
+    sha256 = "0bf8w01l6wm7mm4clfg5rqi30m1ws11qqa4bp2vxghfwgi9ai8i7";
   };
 
   nativeBuildInputs = [

From 44014a4f533646db0e02d3a3c885073dabe2ed2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 2 Mar 2020 07:48:23 -0300
Subject: [PATCH 2040/4636] mate.mate-backgrounds: 1.24.0 -> 1.24.1

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

diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix
index 85bf57ff1c04..1b509f5d6a73 100644
--- a/pkgs/desktops/mate/mate-backgrounds/default.nix
+++ b/pkgs/desktops/mate/mate-backgrounds/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-backgrounds";
-  version = "1.24.0";
+  version = "1.24.1";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "16rmsy02fyq6mj6xgc5mdyh146z3zmkn7iwsi44s962aqwbpn4i8";
+    sha256 = "0b9yx68p9l867bqsl9z2g4wrs8p396ls673jgaliys5snmk8n8dn";
   };
 
   nativeBuildInputs = [ gettext ];

From 8f9de025ae987167b783bde5c2e0671cad591ab6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 2 Mar 2020 07:56:03 -0300
Subject: [PATCH 2041/4636] mate.mate-backgrounds: switch to meson build system

---
 pkgs/desktops/mate/mate-backgrounds/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix
index 1b509f5d6a73..e1f19ca8d695 100644
--- a/pkgs/desktops/mate/mate-backgrounds/default.nix
+++ b/pkgs/desktops/mate/mate-backgrounds/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gettext }:
+{ stdenv, fetchurl, meson, ninja, gettext }:
 
 stdenv.mkDerivation rec {
   pname = "mate-backgrounds";
@@ -9,9 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "0b9yx68p9l867bqsl9z2g4wrs8p396ls673jgaliys5snmk8n8dn";
   };
 
-  nativeBuildInputs = [ gettext ];
-
-  enableParallelBuilding = true;
+  nativeBuildInputs = [
+    gettext
+    meson
+    ninja
+  ];
 
   meta = with stdenv.lib; {
     description = "Background images and data for MATE";

From 29b91a16b29f3672a763804971520659608b3981 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Mar 2020 11:20:53 +0000
Subject: [PATCH 2042/4636] libgpiod: 1.4.2 -> 1.5

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

diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix
index 772027de0fb3..7bb2785dbcf2 100644
--- a/pkgs/development/libraries/libgpiod/default.nix
+++ b/pkgs/development/libraries/libgpiod/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libgpiod";
-  version = "1.4.2";
+  version = "1.5";
 
   src = fetchurl {
     url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz";
-    sha256 = "0r0hdindy6pi1va3mhk2lg5dis0qbi535k790w76dxfx1hyavk70";
+    sha256 = "1r337ici2nvi9v2h33nf3b7nisirc4s8p31cpv1cg8jbzn3wi15g";
   };
 
   buildInputs = [ kmod ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
       the character device instead. This library encapsulates the ioctl calls and
       data structures behind a straightforward API.
     '';
-    homepage = https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/;
+    homepage = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/";
     license = licenses.lgpl2;
     maintainers = [ maintainers.expipiplus1 ];
     platforms = platforms.linux;

From dbeb004e734611e7c10a652fe080935976b1a263 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 2 Mar 2020 08:44:19 -0300
Subject: [PATCH 2043/4636] mgba: 0.8.0 -> 0.8.1

---
 pkgs/misc/emulators/mgba/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix
index 17955d355231..597737646615 100644
--- a/pkgs/misc/emulators/mgba/default.nix
+++ b/pkgs/misc/emulators/mgba/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, makeDesktopItem, wrapQtAppsHook, pkgconfig
-, cmake, epoxy, libzip, ffmpeg, imagemagick, SDL2, qtbase, qtmultimedia, libedit
-, qttools, minizip }:
+, cmake, epoxy, libzip, libelf, libedit, ffmpeg, SDL2, imagemagick
+, qtbase, qtmultimedia, qttools, minizip }:
 
 let
   desktopItem = makeDesktopItem {
@@ -15,21 +15,21 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "mgba";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "mgba-emu";
     repo = "mgba";
     rev = version;
-    sha256 = "0m3rgcdv32ms98j7rrmk2hphvn462bwsd6xfz2ssy05398pj4ljh";
+    sha256 = "1if82mfaak3696w5d5yshynpzywrxgvg3ifdfi2rwlpvq1gpd429";
   };
 
   enableParallelBuilding = true;
   nativeBuildInputs = [ wrapQtAppsHook pkgconfig cmake ];
 
   buildInputs = [
-    libzip epoxy ffmpeg imagemagick SDL2 qtbase qtmultimedia libedit minizip
-    qttools
+    epoxy libzip libelf libedit ffmpeg SDL2 imagemagick
+    qtbase qtmultimedia qttools minizip
   ];
 
   postInstall = ''

From 166836eadcac6a993dfcfa3b6ec3fba373b9c73f Mon Sep 17 00:00:00 2001
From: Travis CI <travis@travis-ci.org>
Date: Mon, 2 Mar 2020 11:54:21 +0000
Subject: [PATCH 2044/4636] gitAndTools.git-machete: 2.13.1 -> 2.13.5

###### Motivation for this change
Update to latest upstream version

###### Things done
 * [ ]  Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux)
 * Built on platform(s)

   * [x]  NixOS
   * [ ]  macOS
   * [ ]  other Linux distributions
 * [ ]  Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
 * [ ]  Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"`
 * [x]  Tested execution of all binary files (usually in `./result/bin/`)
 * [ ]  Determined the impact on package closure size (by running `nix path-info -S` before and after)
 * [ ]  Ensured that relevant documentation is up to date
 * [x]  Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

###### Notify maintainers
cc @worldofpeace @tfc @jtraue
---
 .../version-management/git-and-tools/git-machete/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
index 960d0826a847..e420fe405cf0 100644
--- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonApplication rec {
   pname = "git-machete";
-  version = "2.13.1";
+  version = "2.13.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1qq94x4rqn8vl5h11bn5d4x5ybsbj769kgf4lnj56my7si7qy8qn";
+    sha256 = "1ll5l1f3vcib9a8qsqm8bfzz4g4q1dnr389x7x26kl13n6a50wib";
   };
 
   nativeBuildInputs = [ installShellFiles pbr ];

From 39c1774d9f06b45f9dcb53ed40b4e4a22e20ccfe Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Mon, 2 Mar 2020 12:00:00 +0000
Subject: [PATCH 2045/4636] python3Packages.matrix-nio: 0.7.1 -> 0.8.0

---
 pkgs/development/python-modules/matrix-nio/default.nix | 4 ++--
 pkgs/development/tools/misc/luarocks/default.nix       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix
index c7631f0c5b25..f8c1222fb3ff 100644
--- a/pkgs/development/python-modules/matrix-nio/default.nix
+++ b/pkgs/development/python-modules/matrix-nio/default.nix
@@ -20,13 +20,13 @@
 
 buildPythonPackage rec {
   pname = "nio";
-  version = "0.7.1";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "poljar";
     repo = "matrix-nio";
     rev = version;
-    sha256 = "05cggfhsfa0irvzc7x3fndv6n0zszxxhmlv89r5rkrl5wvrhbb2h";
+    sha256 = "151c59a913y6kx99g7g3mhpgbgavwic1mh21nfrr9x0rm98ilay9";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix
index 565b6a5ca041..fa19b2494076 100644
--- a/pkgs/development/tools/misc/luarocks/default.nix
+++ b/pkgs/development/tools/misc/luarocks/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "luarocks";
-  version = "3.3.1";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "luarocks";
     repo = "luarocks";
     rev = "v${version}";
-    sha256 = "0859k2b9pihmcw45fdsbwx936npcj3vbp3hxi1v3j7n61dkw7r0s";
+    sha256 = "0viiafmb8binksda79ah828q1dfnb6jsqlk7vyndl2xvx9yfn4y2";
   };
 
   patches = [ ./darwin-3.1.3.patch ];

From b1237f5569b78c846e0d5e1c201087ab939c7198 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Mon, 2 Mar 2020 12:00:00 +0000
Subject: [PATCH 2046/4636] pantalaimon: 0.4 -> 0.5.1

---
 .../instant-messengers/pantalaimon/default.nix      | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
index 2fcf65dfc1c2..c7d8ce4b56d5 100644
--- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPythonApplication, fetchPypi, pythonOlder,
+{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder,
   attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus,
   prompt_toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3,
 
@@ -9,13 +9,16 @@
 
 buildPythonApplication rec {
   pname = "pantalaimon";
-  version = "0.4";
+  version = "0.5.1";
 
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1canj9w72wh1rcw6fivrvaahpxy13gb6gh1k8nss6bgixalvnq9m";
+  # pypi tarball miss tests
+  src = fetchFromGitHub {
+    owner = "matrix-org";
+    repo = pname;
+    rev = version;
+    sha256 = "18jihvqlfk8lx97hxcr36zdkp2sffg2l8mkg5lflylwcgwy1dx0y";
   };
 
   propagatedBuildInputs = [

From 0723bf3b72eb53103f7c003e0e23eafcefb77a29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Mon, 2 Mar 2020 13:11:14 +0100
Subject: [PATCH 2047/4636] pkgs/bazel*: Fix path to update-srcDeps.py

Otherwise, the -small channel fails on the tarball output.
---
 .../tools/build-managers/bazel/bazel-latest/default.nix         | 2 +-
 pkgs/development/tools/build-managers/bazel/bazel_1/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/bazel-latest/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-latest/default.nix
index 2bbc4b4afeec..6c12003b9649 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel-latest/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel-latest/default.nix
@@ -290,7 +290,7 @@ stdenv.mkDerivation rec {
     #!${runtimeShell}
     cat ${runCommand "bazel-deps.json" {} ''
         ${unzip}/bin/unzip ${src} WORKSPACE
-        ${python3}/bin/python3 ${./update-srcDeps.py} ./WORKSPACE > $out
+        ${python3}/bin/python3 ${../update-srcDeps.py} ./WORKSPACE > $out
     ''} > ${builtins.toString ./src-deps.json}
   '';
 
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix
index 2844eb4aec41..ffb5714631ca 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix
@@ -290,7 +290,7 @@ stdenv.mkDerivation rec {
     #!${runtimeShell}
     cat ${runCommand "bazel-deps.json" {} ''
         ${unzip}/bin/unzip ${src} WORKSPACE
-        ${python3}/bin/python3 ${./update-srcDeps.py} ./WORKSPACE > $out
+        ${python3}/bin/python3 ${../update-srcDeps.py} ./WORKSPACE > $out
     ''} > ${builtins.toString ./src-deps.json}
   '';
 

From 14a48a96b962f1f199d174ad10acf1af1d94aa90 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Mar 2020 12:18:18 +0000
Subject: [PATCH 2048/4636] liquibase: 3.8.6 -> 3.8.7

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

diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix
index 990fbba7226c..890ef73a73f9 100644
--- a/pkgs/development/tools/database/liquibase/default.nix
+++ b/pkgs/development/tools/database/liquibase/default.nix
@@ -10,11 +10,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "liquibase";
-  version = "3.8.6";
+  version = "3.8.7";
 
   src = fetchurl {
     url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "19x6v8kji3mjpf3r0khmlvgkljm269r16w8p4yvknsw4rf0rl9x4";
+    sha256 = "0gs3pmzyx2bz6af2fr5jla3s33vfaw64pgahfvj5bgpj6d7vx1wg";
   };
 
   buildInputs = [ jre makeWrapper ];
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Version Control for your database";
-    homepage = http://www.liquibase.org/;
+    homepage = "http://www.liquibase.org/";
     changelog = "https://raw.githubusercontent.com/liquibase/liquibase/v${version}/changelog.txt";
     license = licenses.asl20;
     maintainers = with maintainers; [ nequissimus ];

From f2468b8342d6046d858f456429a230cc051c3666 Mon Sep 17 00:00:00 2001
From: Johannes Schleifenbaum <johannes@js-webcoding.de>
Date: Mon, 2 Mar 2020 13:32:02 +0100
Subject: [PATCH 2049/4636] dbeaver: 6.3.5 -> 7.0.0

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

diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index e5590bfe8556..08746ff88789 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   pname = "dbeaver-ce";
-  version = "6.3.5";
+  version = "7.0.0";
 
   desktopItem = makeDesktopItem {
     name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
-    sha256 = "1ssxgnd23cy6br7sbfszvx283c5vz9hgfhx0vqyvm13wyr67hk45";
+    sha256 = "0ggay9igpqwq016yzfz2dw3cjhlzadaml0hi06iqzhxljr86qm44";
   };
 
   installPhase = ''

From 4087790cc95a461592879a715a1098692c481136 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 2 Mar 2020 13:38:18 +0100
Subject: [PATCH 2050/4636] dmenu-wayland: init at 2020-02-28

Although this one isn't feature-complete yet, it fixes the scaling
issues on Wayland I'm experiencing when using `pkgs.dmenu`
through XWayland.
---
 pkgs/applications/misc/dmenu/wayland.nix | 33 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/misc/dmenu/wayland.nix

diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/applications/misc/dmenu/wayland.nix
new file mode 100644
index 000000000000..7b17d4847718
--- /dev/null
+++ b/pkgs/applications/misc/dmenu/wayland.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, meson, ninja, cairo, pango, pkg-config, wayland-protocols
+, glib, wayland, libxkbcommon, makeWrapper
+}:
+
+stdenv.mkDerivation rec {
+  pname = "dmenu-wayland-unstable";
+  version = "2020-02-28";
+
+  src = fetchFromGitHub {
+    owner = "nyyManni";
+    repo = "dmenu-wayland";
+    rev = "68e08e8bcde10a10ac3290431f173c6c7fce4238";
+    sha256 = "10b1v2brgpgb6wkzn62haj56zmkf3aq6fs3p9rp6bxiw8bs2nvlm";
+  };
+
+  outputs = [ "out" "man" ];
+
+  nativeBuildInputs = [ meson ninja pkg-config makeWrapper ];
+  buildInputs = [ cairo pango wayland-protocols glib wayland libxkbcommon ];
+
+  postInstall = ''
+    wrapProgram $out/bin/dmenu-wl_run \
+      --prefix PATH : $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    license = licenses.mit;
+    platforms = platforms.linux;
+    description = "dmenu for wayland-compositors";
+    homepage = "https://github.com/nyyManni/dmenu-wayland";
+    maintainers = with maintainers; [ ma27 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f9426c0f60f0..ba0db1e1e8eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18752,6 +18752,7 @@ in
   djview4 = pkgs.djview;
 
   dmenu = callPackage ../applications/misc/dmenu { };
+  dmenu-wayland = callPackage ../applications/misc/dmenu/wayland.nix { };
 
   dmensamenu = callPackage ../applications/misc/dmensamenu {
     inherit (python3Packages) buildPythonApplication requests;

From 1ccc73cd1fd29806b053e1e4f8362face5d2dcab Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 2 Mar 2020 07:49:10 -0500
Subject: [PATCH 2051/4636] zoom-us: 3.5.359539.0224 -> 3.5.361976.0301

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

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 25e273bda51e..1a83a2f7cd96 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -14,11 +14,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
 let
   inherit (stdenv.lib) concatStringsSep makeBinPath optional;
 
-  version = "3.5.359539.0224";
+  version = "3.5.361976.0301";
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
-      sha256 = "1n6rcsl86150y2dzkcgy5rzdij0d6ib3nvg4dz4a4dkyhq5hbla2";
+      sha256 = "12pqs4pk73d7y9b49vq6f4fryph27k45zm1rjrpijnbi6ln2w993";
     };
   };
 

From 2cc00e2e8a738aa56cb42a9b2c4ff45eb17204f3 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 2 Mar 2020 07:51:35 -0500
Subject: [PATCH 2052/4636] jenkins: 2.204.2 -> 2.204.3

---
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 9708674c6d67..662daeb873f1 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jenkins";
-  version = "2.204.2";
+  version = "2.204.3";
 
   src = fetchurl {
     url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
-    sha256 = "1iviffgz32i6rhmk6hgas4l8wpwr0h5lw5s1f5zjk3aw0r6cb42a";
+    sha256 = "1sn9km7r3dbhbchn1szmhkwmx5im3qmy4lkzv4gm2aw1j9pghdda";
   };
 
   buildCommand = ''

From e8494d77f809412a4027365b91ded919a5c8b58b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 2 Mar 2020 07:52:09 -0500
Subject: [PATCH 2053/4636] oh-my-zsh: 2020-02-28 -> 2020-03-02

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

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 1c3367b12dbb..d8c072950a72 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2020-02-28";
+  version = "2020-03-02";
   pname = "oh-my-zsh";
-  rev = "1689e9bb907ab184d7418dd88bc2639a794c916d";
+  rev = "72707d92b1f127a2c16f0447e4d8233ed7b3c10e";
 
   src = fetchgit { inherit rev;
     url = "https://github.com/ohmyzsh/ohmyzsh";
-    sha256 = "095gjh2xymjn808lvbln7qyccnv5gf9nz911a41rzs9cfsvkbsl0";
+    sha256 = "0yzzlryf22hp16zjcgcv8lqhx9znkp0g2b1sq93rdvy3cvypz5nj";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];

From 2fe55e7e2c2aae327b838b9fcf8290c3f74f8903 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Mar 2020 13:09:14 +0000
Subject: [PATCH 2054/4636] libmypaint: 1.5.0 -> 1.5.1

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

diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix
index 32251afffde5..409867695fc0 100644
--- a/pkgs/development/libraries/libmypaint/default.nix
+++ b/pkgs/development/libraries/libmypaint/default.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libmypaint";
-  version = "1.5.0";
+  version = "1.5.1";
 
   outputs = [ "out" "dev" ];
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     owner = "mypaint";
     repo = "libmypaint";
     rev = "v${version}";
-    sha256 = "06szsadj589vlvn33gzybygdknsaahr4cpigh2xyg8mr3h9ngqrl";
+    sha256 = "1pxx8fjdabcindxhzgbhg4p7yanl4ihbd8kq71y2nyi9dqsjr2fw";
   };
 
   nativeBuildInputs = [
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   preConfigure = "./autogen.sh";
 
   meta = with stdenv.lib; {
-    homepage = http://mypaint.org/;
+    homepage = "http://mypaint.org/";
     description = "Library for making brushstrokes which is used by MyPaint and other projects";
     license = licenses.isc;
     maintainers = with maintainers; [ goibhniu jtojnar ];

From b6b8a9ded28a5b8a2b4c4e9a0876031e04c22340 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 2 Mar 2020 08:41:16 -0500
Subject: [PATCH 2055/4636] libgdata: disable liboauth

See https://gitlab.gnome.org/GNOME/libgdata/issues/1
---
 pkgs/development/libraries/libgdata/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix
index 7f820aae4ec3..91bb9869f3c6 100644
--- a/pkgs/development/libraries/libgdata/default.nix
+++ b/pkgs/development/libraries/libgdata/default.nix
@@ -12,7 +12,6 @@
 , gcr
 , gnome-online-accounts
 , gobject-introspection
-, liboauth
 , gnome3
 , p11-kit
 , openssl
@@ -47,7 +46,6 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gcr
     glib
-    liboauth
     libsoup
     libxml2
     openssl

From f266db2b969436570722c16f5519cb6fb3080b8a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Mar 2020 14:18:08 +0000
Subject: [PATCH 2056/4636] libx86emu: 2.6 -> 3.1

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

diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix
index 35d45845ce62..1b10ac5fdaab 100644
--- a/pkgs/development/libraries/libx86emu/default.nix
+++ b/pkgs/development/libraries/libx86emu/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libx86emu";
-  version = "2.6";
+  version = "3.1";
 
   src = fetchFromGitHub {
     owner = "wfeldt";
     repo = "libx86emu";
     rev = version;
-    sha256 = "1a43xrgxyl1bawcyf4qnvasgjrmnl1npzlz07yz90vyg56x5c102";
+    sha256 = "104xqc6nj9rpi7knl3dfqvasf087hlz2n5yndb1iycw35a6j509b";
   };
 
   nativeBuildInputs = [ perl ];
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "x86 emulation library";
     license = licenses.bsd2;
-    homepage = https://github.com/wfeldt/libx86emu;
+    homepage = "https://github.com/wfeldt/libx86emu";
     maintainers = with maintainers; [ bobvanderlinden ];
     platforms = platforms.linux;
   };

From 55247e7c26bb4c65c6656d77f48916cd5f9d795a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Mar 2020 14:21:23 +0000
Subject: [PATCH 2057/4636] liblo: 0.30 -> 0.31

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

diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix
index 2ba5750b1bf3..a25666dfcf26 100644
--- a/pkgs/development/libraries/liblo/default.nix
+++ b/pkgs/development/libraries/liblo/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "liblo-0.30";
+  name = "liblo-0.31";
 
   src = fetchurl {
-    url = "mirror://sourceforge/liblo/liblo/0.30/${name}.tar.gz";
-    sha256 = "06wdjzxjdshr6hyl4c94yvg3jixiylap8yjs8brdfpm297gck9rh";
+    url = "mirror://sourceforge/liblo/liblo/0.31/${name}.tar.gz";
+    sha256 = "0l67rkdhfa8cffa0nynql3lh2xlbn1454h6qxhjddp1029p48krb";
   };
 
   doCheck = false; # fails 1 out of 3 tests
 
   meta = {
     description = "Lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol";
-    homepage = https://sourceforge.net/projects/liblo;
+    homepage = "https://sourceforge.net/projects/liblo";
     license = stdenv.lib.licenses.gpl2;
     maintainers = [stdenv.lib.maintainers.marcweber];
     platforms = with stdenv.lib.platforms; linux ++ darwin;

From 9897d83f5863cbf19ac9eab621b3997ae463d756 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= <felix@alternativebit.fr>
Date: Sat, 29 Feb 2020 19:34:48 +0100
Subject: [PATCH 2058/4636] nixos/networkd: test routingPolicyRules with a
 nixos vm test

---
 nixos/modules/system/boot/networkd.nix        | 23 +++++++++---
 nixos/tests/all-tests.nix                     |  2 +-
 ...rkd-wireguard.nix => systemd-networkd.nix} | 35 +++++++++++++++++--
 3 files changed, 52 insertions(+), 8 deletions(-)
 rename nixos/tests/{systemd-networkd-wireguard.nix => systemd-networkd.nix} (65%)

diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 44550b2f09cd..6dfbe66fc647 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -67,7 +67,12 @@ let
     (assertOnlyFields [
       "PrivateKeyFile" "ListenPort" "FwMark"
     ])
-    (assertRange "FwMark" 1 4294967295)
+    # The following check won't work on nix <= 2.2
+    # see https://github.com/NixOS/nix/pull/2378
+    #
+    # Add this again when we'll have drop the
+    # nix < 2.2 support.
+    # (assertRange "FwMark" 1 4294967295)
   ];
 
   # NOTE The PresharedKey directive is missing on purpose here, please
@@ -181,7 +186,12 @@ let
     (assertOnlyFields [
       "InterfaceId" "Independent"
     ])
-    (assertRange "InterfaceId" 1 4294967295)
+    # The following check won't work on nix <= 2.2
+    # see https://github.com/NixOS/nix/pull/2378
+    #
+    # Add this again when we'll have drop the
+    # nix < 2.2 support.
+    # (assertRange "InterfaceId" 1 4294967295)
     (assertValueOneOf "Independent" boolValues)
   ];
 
@@ -242,7 +252,12 @@ let
       "IPProtocol" "InvertRule" "Family"
     ])
     (assertRange "TypeOfService" 0 255)
-    (assertRange "FirewallMark" 1 4294967295)
+    # The following check won't work on nix <= 2.2
+    # see https://github.com/NixOS/nix/pull/2378
+    #
+    # Add this again when we'll have drop the
+    # nix < 2.2 support.
+    #  (assertRange "FirewallMark" 1 4294967295)
     (assertInt "Priority")
     (assertPort "SourcePort")
     (assertPort "DestinationPort")
@@ -554,7 +569,7 @@ let
     options = {
       routingPolicyRuleConfig = mkOption {
         default = { };
-        example = { routingPolicyRuleConfig = { Table = 10; IncomingInterface = "eth1"; } ;};
+        example = { routingPolicyRuleConfig = { Table = 10; IncomingInterface = "eth1"; Family = "both"; } ;};
         type = types.addCheck (types.attrsOf unitOption) checkRoutingPolicyRule;
         description = ''
           Each attribute in this set specifies an option in the
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 893c2c423efd..b57a2e0b2766 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -283,7 +283,7 @@ in
   systemd-confinement = handleTest ./systemd-confinement.nix {};
   systemd-timesyncd = handleTest ./systemd-timesyncd.nix {};
   systemd-networkd-vrf = handleTest ./systemd-networkd-vrf.nix {};
-  systemd-networkd-wireguard = handleTest ./systemd-networkd-wireguard.nix {};
+  systemd-networkd = handleTest ./systemd-networkd.nix {};
   systemd-nspawn = handleTest ./systemd-nspawn.nix {};
   pdns-recursor = handleTest ./pdns-recursor.nix {};
   taskserver = handleTest ./taskserver.nix {};
diff --git a/nixos/tests/systemd-networkd-wireguard.nix b/nixos/tests/systemd-networkd.nix
similarity index 65%
rename from nixos/tests/systemd-networkd-wireguard.nix
rename to nixos/tests/systemd-networkd.nix
index be5c0da981d2..319e5e94eceb 100644
--- a/nixos/tests/systemd-networkd-wireguard.nix
+++ b/nixos/tests/systemd-networkd.nix
@@ -41,15 +41,25 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: {
               { routeConfig = { Gateway = "10.0.0.${nodeId}"; Destination = "10.0.0.0/24"; }; }
             ];
           };
-          "90-eth1" = {
+          "30-eth1" = {
             matchConfig = { Name = "eth1"; };
-            address = [ "192.168.1.${nodeId}/24" ];
+            address = [
+              "192.168.1.${nodeId}/24"
+              "fe80::${nodeId}/64"
+            ];
+            routingPolicyRules = [
+              { routingPolicyRuleConfig = { Table = 10; IncomingInterface = "eth1"; Family = "both"; };}
+              { routingPolicyRuleConfig = { Table = 20; OutgoingInterface = "eth1"; };}
+              { routingPolicyRuleConfig = { Table = 30; From = "192.168.1.1"; To = "192.168.1.2"; SourcePort = 666 ; DestinationPort = 667; };}
+              { routingPolicyRuleConfig = { Table = 40; IPProtocol = "tcp"; InvertRule = true; };}
+              { routingPolicyRuleConfig = { Table = 50; IncomingInterface = "eth1"; Family = "ipv4"; };}
+            ];
           };
         };
       };
     };
 in import ./make-test-python.nix ({pkgs, ... }: {
-  name = "networkd-wireguard";
+  name = "networkd";
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ ninjatrappeur ];
   };
@@ -76,9 +86,28 @@ testScript = ''
     start_all()
     node1.wait_for_unit("systemd-networkd-wait-online.service")
     node2.wait_for_unit("systemd-networkd-wait-online.service")
+
+    # ================================
+    # Wireguard
+    # ================================
     node1.succeed("ping -c 5 10.0.0.2")
     node2.succeed("ping -c 5 10.0.0.1")
     # Is the fwmark set?
     node2.succeed("wg | grep -q 42")
+
+    # ================================
+    # Routing Policies
+    # ================================
+    # Testing all the routingPolicyRuleConfig members:
+    # Table + IncomingInterface
+    node1.succeed("sudo ip rule | grep 'from all iif eth1 lookup 10'")
+    # OutgoingInterface
+    node1.succeed("sudo ip rule | grep 'from all oif eth1 lookup 20'")
+    # From + To + SourcePort + DestinationPort
+    node1.succeed(
+        "sudo ip rule | grep 'from 192.168.1.1 to 192.168.1.2 sport 666 dport 667 lookup 30'"
+    )
+    # IPProtocol + InvertRule
+    node1.succeed("sudo ip rule | grep 'not from all ipproto tcp lookup 40'")
 '';
 })

From bb46f897d1396768cec5d42a57b7fe17574c4369 Mon Sep 17 00:00:00 2001
From: Bruce Toll <4109762+tollb@users.noreply.github.com>
Date: Mon, 2 Mar 2020 09:38:08 -0500
Subject: [PATCH 2059/4636] gdal: 3.0.3 -> 3.0.4

Update GDAL/OGR to 3.0.4

GDAL 3.0.4 includes a fix for build failure due to poppler 0.85.0
upgrade (change to parameters for setErrorCallback). See commit:

https://github.com/OSGeo/gdal/commit/6e9e51ef93a911df781c22ba2cb04e0e24d8fd6d
---
 pkgs/development/libraries/gdal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 1734ee9ce589..7f3e796bbf1b 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "gdal";
-  version = "3.0.3";
+  version = "3.0.4";
 
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "gdal";
     rev = "v${version}";
-    sha256 = "1rbyxmgmp27a5wvm4g70jr79bazhdl8q9rcch2b78m73njdv73xa";
+    sha256 = "00a7q9wv8s1bmdhqxvixkq2afr8aibg3pkc76gg50r8lavf6j84c";
   };
 
   sourceRoot = "source/gdal";

From 96b472e95d661d3544048d066874a93b7180477a Mon Sep 17 00:00:00 2001
From: Mark Karpov <markkarpov92@gmail.com>
Date: Wed, 12 Feb 2020 11:39:09 +0100
Subject: [PATCH 2060/4636] module/nix-store-gcs-proxy: init

---
 nixos/modules/module-list.nix                 |  1 +
 .../networking/nix-store-gcs-proxy.nix        | 75 +++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 nixos/modules/services/networking/nix-store-gcs-proxy.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6b032f64bdb1..f50d532e888a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -661,6 +661,7 @@
   ./services/networking/ngircd.nix
   ./services/networking/nghttpx/default.nix
   ./services/networking/nix-serve.nix
+  ./services/networking/nix-store-gcs-proxy.nix
   ./services/networking/nixops-dns.nix
   ./services/networking/nntp-proxy.nix
   ./services/networking/nsd.nix
diff --git a/nixos/modules/services/networking/nix-store-gcs-proxy.nix b/nixos/modules/services/networking/nix-store-gcs-proxy.nix
new file mode 100644
index 000000000000..3f2ce5bca4da
--- /dev/null
+++ b/nixos/modules/services/networking/nix-store-gcs-proxy.nix
@@ -0,0 +1,75 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  opts = { name, config, ... }: {
+    options = {
+      enable = mkOption {
+        default = true;
+        type = types.bool;
+        example = true;
+        description = "Whether to enable proxy for this bucket";
+      };
+      bucketName = mkOption {
+        type = types.str;
+        default = name;
+        example = "my-bucket-name";
+        description = "Name of Google storage bucket";
+      };
+      address = mkOption {
+        type = types.str;
+        example = "localhost:3000";
+        description = "The address of the proxy.";
+      };
+    };
+  };
+  enabledProxies = lib.filterAttrs (n: v: v.enable) config.services.nix-store-gcs-proxy;
+  mapProxies = function: lib.mkMerge (lib.mapAttrsToList function enabledProxies);
+in
+{
+  options.services.nix-store-gcs-proxy = mkOption {
+    type = types.attrsOf (types.submodule opts);
+    default = {};
+    description = ''
+      An attribute set describing an HTTP to GCS proxy that allows us to use GCS
+      bucket via HTTP protocol.
+    '';
+  };
+
+  config.systemd.services = mapProxies (name: cfg: {
+    "nix-store-gcs-proxy-${name}" = {
+      description = "A HTTP nix store that proxies requests to Google Storage";
+      wantedBy = ["multi-user.target"];
+
+      serviceConfig = {
+        RestartSec = 5;
+        StartLimitInterval = 10;
+        ExecStart = ''
+          ${pkgs.nix-store-gcs-proxy}/bin/nix-store-gcs-proxy \
+            --bucket-name ${cfg.bucketName} \
+            --addr ${cfg.address}
+        '';
+
+        DynamicUser = true;
+
+        ProtectSystem = "strict";
+        ProtectHome = true;
+        PrivateTmp = true;
+        PrivateDevices = true;
+        PrivateMounts = true;
+        PrivateUsers = true;
+
+        ProtectKernelTunables = true;
+        ProtectKernelModules = true;
+        ProtectControlGroups = true;
+
+        NoNewPrivileges = true;
+        LockPersonality = true;
+        RestrictRealtime = true;
+      };
+    };
+  });
+
+  meta.maintainers = [ maintainers.mrkkrp ];
+}

From f01b25ee6d8397d1b98327586638dcd4d33c60b0 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 2 Mar 2020 04:20:00 -0500
Subject: [PATCH 2061/4636] ocamlPackages.ocamlnet: disable for Ocaml<4.02

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

diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix
index 493ec7f3f512..7d9a0573db7b 100644
--- a/pkgs/development/ocaml-modules/ocamlnet/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix
@@ -2,10 +2,13 @@
 , gnutls, nettle
 }:
 
-let version = "4.1.7"; in
+if stdenv.lib.versionOlder ocaml.version "4.02"
+then throw "ocamlnet is not available for OCaml ${ocaml.version}"
+else
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-ocamlnet-${version}";
+  version = "4.1.7";
 
   src = fetchurl {
     url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz";

From b396d23834be07b79ae0c6a08adb85054dc8b2d0 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 1 Mar 2020 23:23:42 -0800
Subject: [PATCH 2062/4636] pythonPackages.dash-table: 4.6.0 -> 4.6.1

---
 pkgs/development/python-modules/dash-table/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/dash-table/default.nix b/pkgs/development/python-modules/dash-table/default.nix
index 4a9a6c42ff48..3a0e0c401768 100644
--- a/pkgs/development/python-modules/dash-table/default.nix
+++ b/pkgs/development/python-modules/dash-table/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "dash_table";
-  version = "4.6.0";
+  version = "4.6.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "01wzac09ac6nr27if1liaxafzdf67x00vw1iq5vaad1147rdh36k";
+    sha256 = "0xwwkp7zsmrcnl3fswm5f319cxk7hk4dzacvfsarll2b47rmm434";
   };
 
   # No tests in archive
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "A First-Class Interactive DataTable for Dash";
-    homepage = https://dash.plot.ly/datatable;
+    homepage = "https://dash.plot.ly/datatable";
     license = licenses.mit;
     maintainers = [ maintainers.antoinerg ];
   };

From 0fffce6bdbe9cddfebf5b924f72a41da8c0268a9 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 1 Mar 2020 23:24:06 -0800
Subject: [PATCH 2063/4636] pythonPackages.dash-renderer: 1.2.3 -> 1.2.4

---
 pkgs/development/python-modules/dash-renderer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/dash-renderer/default.nix b/pkgs/development/python-modules/dash-renderer/default.nix
index 97942a13043b..d009ce192d7b 100644
--- a/pkgs/development/python-modules/dash-renderer/default.nix
+++ b/pkgs/development/python-modules/dash-renderer/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "dash_renderer";
-  version = "1.2.3";
+  version = "1.2.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ccsykv24dz9xj24106aaj7f0w7x7sv7mamjbx0m6k0wyhh58vw1";
+    sha256 = "1w6mpmvfj6nv5rdzikwc7wwhrgscbh50d0azzydhsa9jccxvkakl";
   };
 
   # No tests in archive
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Renderer for the Dash framework";
-    homepage = https://dash.plot.ly/;
+    homepage = "https://dash.plot.ly/";
     license = licenses.mit;
     maintainers = [ maintainers.antoinerg ];
   };

From cab91d59e6a85bd9f87c5ba3fed7d4b238e26e2a Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 1 Mar 2020 23:26:14 -0800
Subject: [PATCH 2064/4636] python3Packages.dash-core-components: 1.7.0 ->
 1.8.1

---
 .../python-modules/dash-core-components/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/dash-core-components/default.nix b/pkgs/development/python-modules/dash-core-components/default.nix
index dfcbb9b6404a..4f1e26e42cbf 100644
--- a/pkgs/development/python-modules/dash-core-components/default.nix
+++ b/pkgs/development/python-modules/dash-core-components/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "dash_core_components";
-  version = "1.7.0";
+  version = "1.8.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "16jjanq4glj6c2cwyw94954hrqqv49fknisbxj03lfmflg61j32k";
+    sha256 = "0qqf51mphv1pqqc2ff50rkbw44sp9liifg0mg7xkh41sgnv032cs";
   };
 
   # No tests in archive
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "A dash component starter pack";
-    homepage = https://dash.plot.ly/dash-core-components;
+    homepage = "https://dash.plot.ly/dash-core-components";
     license = licenses.mit;
     maintainers = [ maintainers.antoinerg ];
   };

From 52c5c8a81f31fa9b32fc751dca63546ba1ec1663 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 1 Mar 2020 23:26:41 -0800
Subject: [PATCH 2065/4636] python3Packages.dash: 1.8.0 -> 1.9.1

---
 pkgs/development/python-modules/dash/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix
index 2106235230f8..72ae7104536d 100644
--- a/pkgs/development/python-modules/dash/default.nix
+++ b/pkgs/development/python-modules/dash/default.nix
@@ -16,13 +16,13 @@
 
 buildPythonPackage rec {
   pname = "dash";
-  version = "1.8.0";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "plotly";
     repo = pname;
     rev = "v${version}";
-    sha256 = "11skbvjlj93aw1pqx6j56h73sy9r06jwq7z5h64fd1a3d4z2gsvy";
+    sha256 = "0lqvcq7xaw5l1mwmgfdhr9jspq8jzkxf77862k0ca4d9zglkqp4z";
   };
 
   propagatedBuildInputs = [
@@ -43,11 +43,8 @@ buildPythonPackage rec {
   ];
 
   checkPhase = ''
-    pytest tests/unit/test_configs.py
-    pytest tests/unit/test_fingerprint.py
-    pytest tests/unit/test_import.py
-    pytest tests/unit/test_resources.py
-    pytest tests/unit/dash/
+    pytest tests/unit/test_{configs,fingerprint,import,resources}.py \
+      tests/unit/dash/
   '';
 
   pythonImportsCheck = [
@@ -56,7 +53,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python framework for building analytical web applications";
-    homepage = https://dash.plot.ly/;
+    homepage = "https://dash.plot.ly/";
     license = licenses.mit;
     maintainers = [ maintainers.antoinerg ];
   };

From f4d71e2e732b4e947cc1aa9bb3bb3791465fdb9c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 2 Mar 2020 17:55:39 +0100
Subject: [PATCH 2066/4636] nixos/release-notes: mention fix for predictable
 network-interfaces in initrd

---
 nixos/doc/manual/release-notes/rl-2003.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index b506e94e47b2..78618ed18a5d 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -703,6 +703,15 @@ auth required pam_succeed_if.so uid >= 1000 quiet
     via <option>boot.initrd.luks.fido2Support</option>.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     Predicatbly named network-interfaces get renamed in stage-1. This means that it's possible
+     to use the proper interface name for e.g. dropbear-setups.
+    </para>
+    <para>
+     For further reference, please read <link xlink:href="https://github.com/NixOS/nixpkgs/pull/68953">#68953</link> or the corresponding <link xlink:href="https://discourse.nixos.org/t/predictable-network-interface-names-in-initrd/4055">discourse thread</link>.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>

From 745dbf46afcecc07cdfea3bb6bdecc17bc808317 Mon Sep 17 00:00:00 2001
From: Brett Lyons <blyons@fastmail.com>
Date: Tue, 25 Feb 2020 10:51:26 -0700
Subject: [PATCH 2067/4636] Revert "vimPlugins.notational-fzf-vim: Fix missing
 runtime deps"

This reverts commit 976aa974354aa7f05d341a33e7c6854a8410f172.
---
 pkgs/misc/vim-plugins/overrides.nix | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 431c0f032c4b..79418c62aa8e 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -28,9 +28,6 @@
 
 # vCoolor dependency
 , gnome3
-
-# notational-fzf-vim dependencies
-, ripgrep
 }:
 
 self: super: {
@@ -252,17 +249,6 @@ self: super: {
   ncm2-ultisnips = super.ncm2-ultisnips.overrideAttrs(old: {
     dependencies = with super; [ ultisnips ];
   });
-  
-  notational-fzf-vim = super.notational-fzf-vim.overrideAttrs(old: {
-    dependencies = with self; [ fzf-vim ];
-    patchPhase = ''
-      substituteInPlace plugin/notational_fzf.vim \
-        --replace "'rg'" "'${ripgrep}/bin/rg'" \
-        --replace \
-        "let s:python_executable = executable('pypy3') ? 'pypy3' : 'python3'" \
-        "let s:python_executable = '${python3}/bin/python3'"
-    '';
-  });
 
   fzf-vim = super.fzf-vim.overrideAttrs(old: {
     dependencies = [ self.fzfWrapper ];

From d1d4d90bd31d587e64ed550f9e82332ffc77d708 Mon Sep 17 00:00:00 2001
From: Brett Lyons <blyons@fastmail.com>
Date: Tue, 25 Feb 2020 10:57:14 -0700
Subject: [PATCH 2068/4636] Revert "vimPlugins.notational-fzf-vim: init at
 2019-12-03"

This reverts commit 0eb33b0485b6a681aebdc99ce3c169c6faac1158.
---
 pkgs/misc/vim-plugins/generated.nix    | 11 -----------
 pkgs/misc/vim-plugins/vim-plugin-names |  1 -
 2 files changed, 12 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 4181ddbdd9dc..9d6a47e507db 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2190,17 +2190,6 @@ let
     };
   };
 
-  notational-fzf-vim = buildVimPluginFrom2Nix {
-    pname = "notational-fzf-vim";
-    version = "2019-12-03";
-    src = fetchFromGitHub {
-      owner = "alok";
-      repo = "notational-fzf-vim";
-      rev = "16ea3477c8dbf3167f15246a29bd1d1fcc18c914";
-      sha256 = "1j1nfb297rqmg2h96hx4bmgxq55z179fh4f1ak79d6v815mr72bi";
-    };
-  };
-
   NrrwRgn = buildVimPluginFrom2Nix {
     pname = "NrrwRgn";
     version = "2019-12-12";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 7f271aa0adc0..0dc770ea29ef 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -4,7 +4,6 @@ airblade/vim-rooter
 ajh17/Spacegray.vim
 aklt/plantuml-syntax
 albfan/nerdtree-git-plugin
-alok/notational-fzf-vim
 altercation/vim-colors-solarized
 alvan/vim-closetag
 alx741/vim-hindent

From e0a2f0fc2483dd5d2b1d9d2301f6cf84c9199c5a Mon Sep 17 00:00:00 2001
From: conferno <conferno@camfex.cz>
Date: Mon, 2 Mar 2020 17:22:07 +0000
Subject: [PATCH 2069/4636] xfce.xfdashbooard: fix typo

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

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 7442ff478f59..9f49299c03a8 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -78,7 +78,7 @@ lib.makeScope pkgs.newScope (self: with self; {
     inherit (pkgs.gnome3) libsoup;
   };
 
-  xfdashbooard = callPackage ./applications/xfdashboard {};
+  xfdashboard = callPackage ./applications/xfdashboard {};
 
   # TODO: this repo is inactive for many years. Remove?
   xfce4-volumed = callPackage ./applications/xfce4-volumed { };

From d68dfbb545e862c8445bb52c641b3bc51a8726b6 Mon Sep 17 00:00:00 2001
From: Kovacsics Robert <rmk35@cam.ac.uk>
Date: Tue, 25 Feb 2020 17:45:53 +0000
Subject: [PATCH 2070/4636] noweb: fix installation, use placeholders

The problem was that nix passes lists as space-separated strings not as
arrays of strings, so `"${foo[@]}"` doesn't work as intended because
it's not an array. Instead we pass it in a bash array.

Also, using builtins.placeholder instead of passing "$(out)" to bash, as
that's not what we want to do (the `$(...)` is the process expansion in
bash)
---
 .../tools/literate-programming/noweb/default.nix  | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix
index 8806b5a81cd1..11ff50016785 100644
--- a/pkgs/development/tools/literate-programming/noweb/default.nix
+++ b/pkgs/development/tools/literate-programming/noweb/default.nix
@@ -27,16 +27,19 @@ let noweb = stdenv.mkDerivation rec {
     "CC=clang"
   ];
 
+
   installFlags = [
-    "BIN=$(out)/bin"
-    "ELISP=$(out)/share/emacs/site-lisp"
-    "LIB=$(out)/lib/noweb"
-    "MAN=$(out)/share/man"
-    "TEXINPUTS=$(tex)/tex/latex/noweb"
   ];
 
   preInstall = ''
     mkdir -p "$tex/tex/latex/noweb"
+    installFlagsArray+=(                                   \
+        "BIN=${placeholder "out"}/bin"                     \
+        "ELISP=${placeholder "out"}/share/emacs/site-lisp" \
+        "LIB=${placeholder "out"}/lib/noweb"               \
+        "MAN=${placeholder "out"}/share/man"               \
+        "TEXINPUTS=${placeholder "tex"}/tex/latex/noweb"   \
+    )
   '';
 
   installTargets = [ "install-code" "install-tex" "install-elisp" ];
@@ -57,7 +60,7 @@ let noweb = stdenv.mkDerivation rec {
 
     # HACK: This is ugly, but functional.
     PATH=$out/bin:$PATH make -BC xdoc
-    make "''${installFlags[@]} install-man"
+    make "''${installFlagsArray[@]}" install-man
 
     ln -s "$tex" "$out/share/texmf"
   '';

From 4bd23a3abc2106ad2d15a5451b00cb30ad91643f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Mar 2020 14:27:22 +0000
Subject: [PATCH 2071/4636] mpd: 0.21.19 -> 0.21.20

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

diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 7626d487e2ab..3df5f2d64ee0 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -102,13 +102,13 @@ let
 
     in stdenv.mkDerivation rec {
       pname = "mpd";
-      version = "0.21.19";
+      version = "0.21.20";
 
       src = fetchFromGitHub {
         owner  = "MusicPlayerDaemon";
         repo   = "MPD";
         rev    = "v${version}";
-        sha256 = "0awfnhygasww2xbxnc3a81hv2kbw3v3mblav6wjvzz25qipv19dq";
+        sha256 = "05148zwaf1ix369i1n1fx84j66qa1ab1p3m7781lk3dz5hqf185x";
       };
 
       buildInputs = [ glib boost ]
@@ -130,7 +130,7 @@ let
 
       meta = with stdenv.lib; {
         description = "A flexible, powerful daemon for playing music";
-        homepage    = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki;
+        homepage    = "http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki";
         license     = licenses.gpl2;
         maintainers = with maintainers; [ astsmtl ehmry fpletz tobim ];
         platforms   = platforms.unix;

From 6096d6b1efe4ee1869a0dff850683ccef1bc836f Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Mon, 2 Mar 2020 16:30:28 +0100
Subject: [PATCH 2072/4636] mpd: fix homepage

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

diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 3df5f2d64ee0..e328a79afa69 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -130,7 +130,7 @@ let
 
       meta = with stdenv.lib; {
         description = "A flexible, powerful daemon for playing music";
-        homepage    = "http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki";
+        homepage    = "https://www.musicpd.org/";
         license     = licenses.gpl2;
         maintainers = with maintainers; [ astsmtl ehmry fpletz tobim ];
         platforms   = platforms.unix;

From a4019eb9deb9c2986a4923a78a69ed06032743e0 Mon Sep 17 00:00:00 2001
From: YI <uuuuuu@protonmail.com>
Date: Mon, 2 Mar 2020 14:00:08 +0800
Subject: [PATCH 2073/4636] pyradio: init at 0.8.7.1

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

diff --git a/pkgs/applications/radio/pyradio/default.nix b/pkgs/applications/radio/pyradio/default.nix
new file mode 100644
index 000000000000..88ce23cd7096
--- /dev/null
+++ b/pkgs/applications/radio/pyradio/default.nix
@@ -0,0 +1,24 @@
+{ lib, python3Packages, fetchFromGitHub }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "pyradio";
+  version = "0.8.7.1";
+
+  src = fetchFromGitHub {
+    owner = "coderholic";
+    repo = pname;
+    rev = version;
+    sha256 = "1f1dch5vrx2armrff19rh9gpqydspn3nvzc9p9j2jfi6gsxhppyb";
+  };
+
+  checkPhase = ''
+    $out/bin/pyradio --help
+  '';
+
+  meta = with lib; {
+    homepage = "http://www.coderholic.com/pyradio/";
+    description = "Curses based internet radio player";
+    license = licenses.mit;
+    maintainers = with maintainers; [ contrun ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f9426c0f60f0..4a6fd8d065e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9445,6 +9445,8 @@ in
 
   pipewire = callPackage ../development/libraries/pipewire {};
 
+  pyradio = callPackage ../applications/radio/pyradio {};
+
   pyrex = pyrex095;
 
   pyrex095 = callPackage ../development/interpreters/pyrex/0.9.5.nix { };

From 486b9fc16027b14142d1e762b3714de0a8966b9d Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Thu, 6 Feb 2020 22:40:54 -0800
Subject: [PATCH 2074/4636] pythonPackages.mpv-jsonipc: init at
 unstable-2020-02-19

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

diff --git a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
new file mode 100644
index 000000000000..18e73f56686d
--- /dev/null
+++ b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildPythonPackage, fetchFromGitHub, requests
+, tqdm, websocket_client, pythonOlder }:
+
+buildPythonPackage rec {
+  pname = "python-mpv-jsonipc";
+  version = "1.1.6";
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "iwalton3";
+    repo = "python-mpv-jsonipc";
+    rev = "v${version}";
+    sha256 = "08bs6qrcf5fi72jijmr2w7zs6aa5976dwv04f11ajwhj6i8kfq35";
+  };
+
+  # 'mpv-jsonipc' does not have any tests
+  doCheck = false;
+
+  propagatedBuildInputs = [ requests tqdm websocket_client ];
+
+  pythonImportsCheck = [ "python_mpv_jsonipc" ];
+
+  meta = with lib; {
+    homepage = "https://github.com/iwalton3/python-mpv-jsonipc";
+    description = "Python API to MPV using JSON IPC";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ colemickens ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ebe69a1b14c2..60f8f69a73e1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -883,6 +883,8 @@ in {
     mpi = pkgs.openmpi;
   };
 
+  python-mpv-jsonipc = callPackage ../development/python-modules/python-mpv-jsonipc { };
+
   msal = callPackage ../development/python-modules/msal { };
 
   msal-extensions = callPackage ../development/python-modules/msal-extensions { };

From bd250532981d7a1fa6fbab117b2424c170cd786f Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Wed, 26 Feb 2020 16:36:48 -0800
Subject: [PATCH 2075/4636] plex-mpv-shim: init at 1.7.12

---
 .../video/plex-mpv-shim/default.nix           | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/video/plex-mpv-shim/default.nix

diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix
new file mode 100644
index 000000000000..019d080f9739
--- /dev/null
+++ b/pkgs/applications/video/plex-mpv-shim/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonApplication, fetchFromGitHub, mpv, requests, python-mpv-jsonipc }:
+
+buildPythonApplication rec {
+  pname = "plex-mpv-shim";
+  version = "1.7.12";
+
+  src = fetchFromGitHub {
+    owner = "iwalton3";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0l13g4vkvcd1q4lkdkbgv4hgkx5pql6ym2fap35581z7rzy9jhkq";
+  };
+
+  propagatedBuildInputs = [ mpv requests python-mpv-jsonipc ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/iwalton3/plex-mpv-shim";
+    description = "Allows casting of videos to MPV via the Plex mobile and web app.";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a6fd8d065e5..5211271baeaf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21086,6 +21086,8 @@ in
 
   plex-media-player = libsForQt512.callPackage ../applications/video/plex-media-player { };
 
+  plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { };
+
   plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { });
 
   plugin-torture = callPackage ../applications/audio/plugin-torture { };

From c1e2642da673a642fe8078e68feaac70c7d8f080 Mon Sep 17 00:00:00 2001
From: Mathias Schreck <mathias.schreck@joyn.de>
Date: Mon, 2 Mar 2020 17:06:25 +0100
Subject: [PATCH 2076/4636] aws-sam-cli: 0.41.0 -> 0.43.0

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

diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix
index f5a5d0e65d65..38fd32f38b65 100644
--- a/pkgs/development/tools/aws-sam-cli/default.nix
+++ b/pkgs/development/tools/aws-sam-cli/default.nix
@@ -30,11 +30,11 @@ with py.pkgs;
 
 buildPythonApplication rec {
   pname = "aws-sam-cli";
-  version = "0.41.0";
+  version = "0.43.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1v21bhylys1mvrsvxqw88cvghl6s46hdni52xn661bbn4byrrv3b";
+    sha256 = "0v852636chil5n4cjqjvh29hhik881pkljs64jy5jiznbrph9ryr";
   };
 
   # Tests are not included in the PyPI package

From e2a0073e2d6f84998f412c0da8e95e57d96f9d5d Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Fri, 28 Feb 2020 17:38:18 -0800
Subject: [PATCH 2077/4636] qimgv: init at 0.8.9

A few notes:

* I only run Linux, so that is what I set `meta.platforms` to.
* Video support is broken in both Nix and Arch builds.
---
 pkgs/applications/graphics/qimgv/default.nix | 49 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/applications/graphics/qimgv/default.nix

diff --git a/pkgs/applications/graphics/qimgv/default.nix b/pkgs/applications/graphics/qimgv/default.nix
new file mode 100644
index 000000000000..6402868b9221
--- /dev/null
+++ b/pkgs/applications/graphics/qimgv/default.nix
@@ -0,0 +1,49 @@
+{ mkDerivation, fetchFromGitHub, lib
+, pkgconfig, cmake
+, exiv2, qtbase, qtimageformats, qtsvg
+}:
+
+mkDerivation rec {
+  pname = "qimgv";
+  version = "0.8.9";
+
+  src = fetchFromGitHub {
+    owner = "easymodo";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0cmya06j466v0pirhxbzbj1vbz0346y7rbc1gbv4n9xcp6c6bln6";
+  };
+
+  cmakeFlags = [
+    # Video support appears to be broken; the following gets printed upon
+    # attempting to view an mp4, webm, or mkv (and probably all video formats):
+    #
+    #   [VideoPlayerInitProxy] Error - could not load player library
+    #   "qimgv_player_mpv"
+    #
+    # GIFs are unaffected. If this ever gets addressed, all that is necessary is
+    # to add `mpv` to the arguments list and to `buildInputs`, and to remove
+    # `cmakeFlags`.
+    "-DVIDEO_SUPPORT=OFF"
+  ];
+
+  nativeBuildInputs = [
+    pkgconfig
+    cmake
+  ];
+
+  buildInputs = [
+    exiv2
+    qtbase
+    qtimageformats
+    qtsvg
+  ];
+
+  meta = with lib; {
+    description = "Qt5 image viewer with optional video support";
+    homepage = "https://github.com/easymodo/qimgv";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cole-h ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5211271baeaf..a424c2734144 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21191,6 +21191,8 @@ in
 
   qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { };
 
+  qimgv = libsForQt5.callPackage ../applications/graphics/qimgv { };
+
   qlandkartegt = libsForQt5.callPackage ../applications/misc/qlandkartegt {};
 
   garmindev = callPackage ../applications/misc/qlandkartegt/garmindev.nix {};

From ecf79a07e1cf1d895b058d33def554ae7c35283d Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Fri, 28 Feb 2020 18:19:27 -0800
Subject: [PATCH 2078/4636] maintainers: add cole-h

---
 maintainers/maintainer-list.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index da84bffe116e..655740d0d0e8 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1461,6 +1461,16 @@
     githubId = 5684605;
     name = "Cole Scott";
   };
+  cole-h = {
+    name = "Cole Helbling";
+    email = "cole.e.helbling@outlook.com";
+    github = "cole-h";
+    githubId = 28582702;
+    keys = [{
+      longkeyid = "rsa4096/0xB37E0F2371016A4C";
+      fingerprint = "68B8 0D57 B2E5 4AC3 EC1F  49B0 B37E 0F23 7101 6A4C";
+    }];
+  };
   copumpkin = {
     email = "pumpkingod@gmail.com";
     github = "copumpkin";

From 519ac8cff4b7c6ba566647ee211e9bc241a14d83 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Mar 2020 18:12:18 +0000
Subject: [PATCH 2079/4636] parallel: 20200122 -> 20200222

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

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 32db897ae0ff..6c334db1ede8 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl, makeWrapper, procps }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20200122";
+  name = "parallel-20200222";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "070cv3b1ja8lmn2a5h1ry6b5y35jpm4z5r9yv9nb5kd5im11wvqi";
+    sha256 = "077b72h2d191bmsb78fmzcynxj5mi5v3axmwwxz1d1q8xhv756r6";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
          it possible to use output from GNU Parallel as input for other
          programs.
       '';
-    homepage = https://www.gnu.org/software/parallel/;
+    homepage = "https://www.gnu.org/software/parallel/";
     license = licenses.gpl3Plus;
     platforms = platforms.all;
     maintainers = with maintainers; [ pSub vrthra ];

From bebcf42905e4cd8125603826ceecf80e8be01b43 Mon Sep 17 00:00:00 2001
From: Jennifer Wilcox <jennifer@nitori.org>
Date: Sat, 29 Feb 2020 18:11:49 -0600
Subject: [PATCH 2080/4636] cocotb: 1.2.0 -> 1.3.0

The fix for the CC/CXX variables was merged some time before 1.3.0.

The `-Werror` seems to be new. It is removed in upstream's master so it
should be removable in the next release. Something in glibc is causing a
warning that is killing the build if `-Werror` isn't removed.
---
 pkgs/development/python-modules/cocotb/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix
index e10ecd8e840a..9bde31d1f13c 100644
--- a/pkgs/development/python-modules/cocotb/default.nix
+++ b/pkgs/development/python-modules/cocotb/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "cocotb";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "091q63jcm87xggqgqi44lw2vjxhl1v4yl0mv2c76hgavb29w4w5y";
+    sha256 = "0gwd79zm7196fhnbzbdpyvgzsfjfzl3pmc5hh27h7hckfpxzj9yw";
   };
 
   propagatedBuildInputs = [
@@ -24,10 +24,10 @@ buildPythonPackage rec {
       cocotb/share/makefiles/simulators/Makefile.*
     do
       substituteInPlace $f --replace 'shell which' 'shell command -v'
-      # replace hardcoded gcc. Remove once https://github.com/cocotb/cocotb/pull/1137 gets merged
-      substituteInPlace $f --replace 'gcc' '$(CC)'
-      substituteInPlace $f --replace 'g++' '$(CXX)'
     done
+
+    # This can probably be removed in the next update after 1.3.0
+    substituteInPlace cocotb/share/makefiles/Makefile.inc --replace "-Werror" ""
   '';
 
   checkInputs = [ swig verilog ];
@@ -39,7 +39,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Coroutine based cosimulation library for writing VHDL and Verilog testbenches in Python";
-    homepage = https://github.com/cocotb/cocotb;
+    homepage = "https://github.com/cocotb/cocotb";
     license = licenses.bsd3;
     maintainers = with maintainers; [ matthuszagh ];
   };

From 76079f270c81fb608c9c3ba71b81115e091e8fab Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Mar 2020 09:59:03 -0800
Subject: [PATCH 2081/4636] pythonPackages.aria2p: inherit poetry from
 python-modules

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 60f8f69a73e1..9516ce18dbc3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -187,7 +187,7 @@ in {
 
   argon2_cffi = callPackage ../development/python-modules/argon2_cffi { };
 
-  aria2p = callPackage ../development/python-modules/aria2p { inherit (pkgs) aria2 poetry; };
+  aria2p = callPackage ../development/python-modules/aria2p { inherit (pkgs) aria2; };
 
   arviz = callPackage ../development/python-modules/arviz { };
 

From 725dc741c1eaedc8106bdbe5108710f093a6a191 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Mar 2020 10:12:04 -0800
Subject: [PATCH 2082/4636] python37Packages.poetry: fix build

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

diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix
index 44621d353830..2828cb6b3f97 100644
--- a/pkgs/development/python-modules/poetry/default.nix
+++ b/pkgs/development/python-modules/poetry/default.nix
@@ -32,6 +32,7 @@ let
 in buildPythonPackage rec {
   pname = "poetry";
   version = "1.0.3";
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
@@ -42,12 +43,10 @@ in buildPythonPackage rec {
     substituteInPlace pyproject.toml \
      --replace "pyrsistent = \"^0.14.2\"" "pyrsistent = \"^0.15.0\"" \
      --replace "requests-toolbelt = \"^0.8.0\"" "requests-toolbelt = \"^0.9.0\"" \
-     --replace "importlib-metadata = {version = \"~1.1.3\", python = \"<3.8\"}" \
-       "importlib-metadata = {version = \"~1.3.0\", python = \"<3.8\"}"
+     --replace 'importlib-metadata = {version = "~1.1.3", python = "<3.8"}' \
+       'importlib-metadata = {version = ">=1.3,<2", python = "<3.8"}'
   '';
 
-  format = "pyproject";
-
   nativeBuildInputs = [ intreehooks ];
 
   propagatedBuildInputs = [

From d3f756d9b7e0d8126a4f2a28d267854a0e7bb141 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Mon, 2 Mar 2020 16:23:25 +0000
Subject: [PATCH 2083/4636] poetry2nix: 1.5.0 -> 1.6.0

---
 .../tools/poetry2nix/poetry2nix/default.nix   | 113 ++++++++---------
 .../poetry2nix/poetry2nix/hooks/default.nix   |   8 ++
 .../poetry2nix/poetry2nix/hooks/fixup-hook.sh |   8 ++
 .../hooks/remove-path-dependencies.sh         |   4 +
 .../tools/poetry2nix/poetry2nix/lib.nix       |  33 +++++
 .../poetry2nix/poetry2nix/mk-poetry-dep.nix   |  26 ++--
 .../tools/poetry2nix/poetry2nix/overrides.nix | 115 ++++++++++++++++--
 7 files changed, 237 insertions(+), 70 deletions(-)
 create mode 100644 pkgs/development/tools/poetry2nix/poetry2nix/hooks/fixup-hook.sh

diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
index ac866a139d97..7d3164fcec62 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
@@ -3,12 +3,11 @@
 , poetry ? null
 , poetryLib ? import ./lib.nix { inherit lib pkgs; }
 }:
-
 let
   inherit (poetryLib) isCompatible readTOML;
 
   # Poetry2nix version
-  version = "1.1.0";
+  version = "1.6.0";
 
   /* The default list of poetry2nix override overlays */
   defaultPoetryOverrides = (import ./overrides.nix { inherit pkgs lib; });
@@ -29,14 +28,15 @@ let
      Returns an attrset { python, poetryPackages, pyProject, poetryLock } for the given pyproject/lockfile.
   */
   mkPoetryPackages =
-    { pyproject
-    , poetrylock
-    , poetryPkg
+    { projectDir ? null
+    , pyproject ? projectDir + "/pyproject.toml"
+    , poetrylock ? projectDir + "/poetry.lock"
     , overrides ? [ defaultPoetryOverrides ]
-    , meta ? {}
     , python ? pkgs.python3
-    , pwd ? null
+    , pwd ? projectDir
     }@attrs: let
+      poetryPkg = poetry.override { inherit python; };
+
       pyProject = readTOML pyproject;
       poetryLock = readTOML poetrylock;
       lockFiles = lib.getAttrFromPath [ "metadata" "files" ] poetryLock;
@@ -52,14 +52,7 @@ let
 
       # Filter packages by their PEP508 markers & pyproject interpreter version
       partitions = let
-        supportsPythonVersion = pkgMeta: let
-          pep508Result = if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true;
-
-          flatDeps = (pyProject.tool.poetry.dependencies or {}) // (pyProject.tool.poetry.dev-dependencies or {});
-          constraints = flatDeps.${pkgMeta.name}.python or "";
-          pyprojectResult = isCompatible python.pythonVersion constraints;
-        in
-          pyprojectResult && pep508Result;
+        supportsPythonVersion = pkgMeta: if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true;
       in
         lib.partition supportsPythonVersion poetryLock.package;
 
@@ -105,7 +98,7 @@ let
                 # The canonical name is setuptools-scm
                 setuptools-scm = super.setuptools_scm;
 
-                inherit (hooks) removePathDependenciesHook;
+                inherit (hooks) removePathDependenciesHook poetry2nixFixupHook;
               }
           )
           # Null out any filtered packages, we don't want python.pkgs from nixpkgs
@@ -133,18 +126,17 @@ let
        poetry2nix.mkPoetryEnv { poetrylock = ./poetry.lock; python = python3; }
   */
   mkPoetryEnv =
-    { pyproject
-    , poetrylock
+    { projectDir ? null
+    , pyproject ? projectDir + "/pyproject.toml"
+    , poetrylock ? projectDir + "/poetry.lock"
     , overrides ? [ defaultPoetryOverrides ]
-    , meta ? {}
-    , pwd ? null
+    , pwd ? projectDir
     , python ? pkgs.python3
     }:
       let
-        poetryPkg = poetry.override { inherit python; };
         py = mkPoetryPackages (
           {
-            inherit poetryPkg pyproject poetrylock overrides meta python pwd;
+            inherit pyproject poetrylock overrides python pwd;
           }
         );
       in
@@ -152,19 +144,18 @@ let
 
   /* Creates a Python application from pyproject.toml and poetry.lock */
   mkPoetryApplication =
-    { src
-    , pyproject
-    , poetrylock
+    { projectDir ? null
+    , src ? poetryLib.cleanPythonSources { src = projectDir; }
+    , pyproject ? projectDir + "/pyproject.toml"
+    , poetrylock ? projectDir + "/poetry.lock"
     , overrides ? [ defaultPoetryOverrides ]
     , meta ? {}
     , python ? pkgs.python3
-    , pwd ? null
+    , pwd ? projectDir
     , ...
     }@attrs: let
-      poetryPkg = poetry.override { inherit python; };
-
       poetryPython = mkPoetryPackages {
-        inherit poetryPkg pyproject poetrylock overrides meta python pwd;
+        inherit pyproject poetrylock overrides python pwd;
       };
       py = poetryPython.python;
 
@@ -178,11 +169,20 @@ let
       ];
       passedAttrs = builtins.removeAttrs attrs specialAttrs;
 
+      # Get dependencies and filter out depending on interpreter version
       getDeps = depAttr: let
+        compat = isCompatible py.pythonVersion;
         deps = pyProject.tool.poetry.${depAttr} or {};
         depAttrs = builtins.map (d: lib.toLower d) (builtins.attrNames deps);
       in
-        builtins.map (dep: py.pkgs."${dep}") depAttrs;
+        builtins.map (
+          dep: let
+            pkg = py.pkgs."${dep}";
+            constraints = deps.${dep}.python or "";
+            isCompat = compat constraints;
+          in
+            if isCompat then pkg else null
+        ) depAttrs;
 
       getInputs = attr: attrs.${attr} or [];
       mkInput = attr: extraInputs: getInputs attr ++ extraInputs;
@@ -198,6 +198,8 @@ let
           pname = pyProject.tool.poetry.name;
           version = pyProject.tool.poetry.version;
 
+          inherit src;
+
           format = "pyproject";
 
           buildInputs = mkInput "buildInputs" buildSystemPkgs;
@@ -211,6 +213,7 @@ let
 
           meta = meta // {
             inherit (pyProject.tool.poetry) description homepage;
+            inherit (py.meta) platforms;
             license = getLicenseBySpdxId (pyProject.tool.poetry.license or "unknown");
           };
 
@@ -220,34 +223,11 @@ let
   /* Poetry2nix CLI used to supplement SHA-256 hashes for git dependencies  */
   cli = import ./cli.nix { inherit pkgs lib version; };
 
-  /* Poetry2nix documentation  */
-  doc = pkgs.stdenv.mkDerivation {
-    pname = "poetry2nix-docs";
-    inherit version;
-
-    src = pkgs.runCommandNoCC "poetry2nix-docs-src" {} ''
-      mkdir -p $out
-      cp ${./default.nix} $out/default.nix
-    '';
-
-    buildInputs = [
-      pkgs.nixdoc
-    ];
-
-    buildPhase = ''
-      nixdoc --category poetry2nix --description "Poetry2nix functions" --file ./default.nix > poetry2nix.xml
-    '';
-
-    installPhase = ''
-      mkdir -p $out
-      cp poetry2nix.xml $out/
-    '';
-
-  };
-
 in
 {
-  inherit mkPoetryEnv mkPoetryApplication mkPoetryPackages cli doc;
+  inherit mkPoetryEnv mkPoetryApplication mkPoetryPackages cli version;
+
+  inherit (poetryLib) cleanPythonSources;
 
   /*
   The default list of poetry2nix override overlays
@@ -262,4 +242,25 @@ in
     in
       defaultSet // customSet;
   };
+
+  /*
+  Convenience functions for specifying overlays with or without the poerty2nix default overrides
+  */
+  overrides = {
+    /*
+    Returns the specified overlay in a list
+    */
+    withoutDefaults = overlay: [
+      overlay
+    ];
+
+    /*
+    Returns the specified overlay and returns a list
+    combining it with poetry2nix default overrides
+    */
+    withDefaults = overlay: [
+      defaultPoetryOverrides
+      overlay
+    ];
+  };
 }
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix
index dd24b2634e00..ec3fa0afa69d 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix
@@ -22,4 +22,12 @@ in
       } ./remove-path-dependencies.sh
   ) {};
 
+  poetry2nixFixupHook = callPackage (
+    {}:
+      makeSetupHook {
+        name = "fixup-hook.sh";
+        deps = [];
+      } ./fixup-hook.sh
+  ) {};
+
 }
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/fixup-hook.sh b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/fixup-hook.sh
new file mode 100644
index 000000000000..fc539e4298c6
--- /dev/null
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/fixup-hook.sh
@@ -0,0 +1,8 @@
+poetry2nix-fixup-hook() {
+    # Including tests in the output is a common mistake
+    if [ -z "${dontFixupTests-}" ]; then
+        rm -rf $out/lib/python3.7/site-packages/tests
+    fi
+}
+
+postFixupHooks+=(poetry2nix-fixup-hook)
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh
index 900fe66908bf..b22a05900a05 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/remove-path-dependencies.sh
@@ -1,4 +1,8 @@
 remove-path-dependencies-hook() {
+    if ! test -f pyproject.toml; then
+        return
+    fi
+
     # Tell poetry not to resolve the path dependencies. Any version is fine!
     @yj@ -tj < pyproject.toml | @pythonInterpreter@ @pyprojectPatchScript@ > pyproject.json
     @yj@ -jt < pyproject.json > pyproject.toml
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
index 64ba0293132e..b816feb38e89 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
@@ -96,6 +96,38 @@ let
         [ pythonPackages.${drvAttr} or (throw "unsupported build system ${buildSystem}") ]
       );
 
+  # Find gitignore files recursively in parent directory stopping with .git
+  findGitIgnores = path: let
+    parent = path + "/..";
+    gitIgnore = path + "/.gitignore";
+    isGitRoot = builtins.pathExists (path + "/.git");
+    hasGitIgnore = builtins.pathExists gitIgnore;
+    gitIgnores = if hasGitIgnore then [ gitIgnore ] else [];
+  in
+    lib.optionals (builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores;
+
+  /*
+  Provides a source filtering mechanism that:
+
+  - Filters gitignore's
+  - Filters pycache/pyc files
+  - Uses cleanSourceFilter to filter out .git/.hg, .o/.so, editor backup files & nix result symlinks
+  */
+  cleanPythonSources = { src }: let
+    gitIgnores = findGitIgnores src;
+    pycacheFilter = name: type:
+      (type == "directory" && ! lib.strings.hasInfix "__pycache__" name)
+      || (type == "regular" && ! lib.strings.hasSuffix ".pyc" name)
+    ;
+  in
+    lib.cleanSourceWith {
+      filter = lib.cleanSourceFilter;
+      src = lib.cleanSourceWith {
+        filter = pkgs.nix-gitignore.gitignoreFilterPure pycacheFilter gitIgnores src;
+        inherit src;
+      };
+    };
+
 in
 {
   inherit
@@ -105,5 +137,6 @@ in
     readTOML
     getBuildSystemPkgs
     satisfiesSemver
+    cleanPythonSources
     ;
 }
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
index 5113ad25e4b6..5ae35dfed49e 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
@@ -106,8 +106,10 @@ pythonPackages.callPackage (
         # Stripping pre-built wheels lead to `ELF load command address/offset not properly aligned`
         dontStrip = format == "wheel";
 
-        nativeBuildInputs = (if (!isSource && (getManyLinuxDeps fileInfo.name).str != null) then [ autoPatchelfHook ] else [])
-        ++ lib.optional (isLocal) pkgs.yj
+        nativeBuildInputs = [
+          pythonPackages.poetry2nixFixupHook
+        ]
+        ++ lib.optional (!isSource && (getManyLinuxDeps fileInfo.name).str != null) autoPatchelfHook
         ++ lib.optional (format == "pyproject") pythonPackages.removePathDependenciesHook
         ;
 
@@ -117,14 +119,24 @@ pythonPackages.callPackage (
           ++ lib.optional isLocal buildSystemPkgs
         );
 
-        propagatedBuildInputs =
-          # Some dependencies like django get the attribute name django
-          # but dependencies try to access Django
-          builtins.map (n: pythonPackages.${lib.toLower n}) (builtins.attrNames dependencies);
+        propagatedBuildInputs = let
+          compat = isCompatible python.pythonVersion;
+          deps = lib.filterAttrs (n: v: v) (
+            lib.mapAttrs (
+              n: v: let
+                constraints = v.python or "";
+              in
+                compat constraints
+            ) dependencies
+          );
+          depAttrs = lib.attrNames deps;
+        in
+          builtins.map (n: pythonPackages.${lib.toLower n}) depAttrs;
 
         meta = {
           broken = ! isCompatible python.pythonVersion python-versions;
           license = [];
+          inherit (python.meta) platforms;
         };
 
         passthru = {
@@ -139,7 +151,7 @@ pythonPackages.callPackage (
             inherit (source) url;
             rev = source.reference;
           }
-        ) else if isLocal then (localDepPath) else fetchFromPypi {
+        ) else if isLocal then (poetryLib.cleanPythonSources { src = localDepPath; }) else fetchFromPypi {
           pname = name;
           inherit (fileInfo) file hash kind;
         };
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
index 6316dcf51c0c..9eb3f92bd12b 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
@@ -6,6 +6,13 @@
 self: super:
 
 {
+  astroid = super.astroid.overrideAttrs (
+    old: rec {
+      buildInputs = old.buildInputs ++ [ self.pytest-runner ];
+      doCheck = false;
+    }
+  );
+
   av = super.av.overrideAttrs (
     old: {
       nativeBuildInputs = old.nativeBuildInputs ++ [
@@ -81,17 +88,36 @@ self: super:
   enum34 = if self.pythonAtLeast "3.4" then null else super.enum34;
 
   faker = super.faker.overrideAttrs (
+    old: {
+      buildInputs = old.buildInputs ++ [ self.pytest-runner ];
+      doCheck = false;
+    }
+  );
+
+  fancycompleter = super.fancycompleter.overrideAttrs (
     old: {
       postPatch = ''
-        substituteInPlace setup.py --replace 'setup_requires=["pytest-runner"],' 'setup_requires=[],' || true
+        substituteInPlace setup.py \
+          --replace 'setup_requires="setupmeta"' 'setup_requires=[]' \
+          --replace 'versioning="devcommit"' 'version="${old.version}"'
       '';
     }
   );
 
   grandalf = super.grandalf.overrideAttrs (
     old: {
-      postPatch = ''
-        substituteInPlace setup.py --replace "setup_requires=['pytest-runner',]," "setup_requires=[]," || true
+      buildInputs = old.buildInputs ++ [ self.pytest-runner ];
+      doCheck = false;
+    }
+  );
+
+  h5py = super.h5py.overrideAttrs (
+    old: rec {
+      nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
+      buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ];
+      configure_flags = "--hdf5=${pkgs.hdf5}";
+      postConfigure = ''
+        ${self.python.executable} setup.py configure ${configure_flags}
       '';
     }
   );
@@ -103,12 +129,21 @@ self: super:
   );
 
   # importlib-metadata has an incomplete dependency specification
-  importlib-metadata = if super.importlib-metadata == null then null else super.importlib-metadata.overrideAttrs (
+  importlib-metadata = super.importlib-metadata.overrideAttrs (
     old: {
       propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional self.python.isPy2 self.pathlib2;
     }
   );
 
+  jupyter = super.jupyter.overrideAttrs (
+    old: rec {
+      # jupyter is a meta-package. Everything relevant comes from the
+      # dependencies. It does however have a jupyter.py file that conflicts
+      # with jupyter-core so this meta solves this conflict.
+      meta.priority = 100;
+    }
+  );
+
   lap = super.lap.overrideAttrs (
     old: {
       propagatedBuildInputs = old.propagatedBuildInputs ++ [
@@ -202,9 +237,8 @@ self: super:
 
   mccabe = super.mccabe.overrideAttrs (
     old: {
-      postPatch = ''
-        substituteInPlace setup.py --replace "setup_requires=['pytest-runner']," "setup_requires=[]," || true
-      '';
+      buildInputs = old.buildInputs ++ [ self.pytest-runner ];
+      doCheck = false;
     }
   );
 
@@ -264,6 +298,13 @@ self: super:
       }
   );
 
+  openexr = super.openexr.overrideAttrs (
+    old: rec {
+      buildInputs = old.buildInputs ++ [ pkgs.openexr pkgs.ilmbase ];
+      NIX_CFLAGS_COMPILE = [ "-I${pkgs.openexr.dev}/include/OpenEXR" "-I${pkgs.ilmbase.dev}/include/OpenEXR" ];
+    }
+  );
+
   peewee = super.peewee.overridePythonAttrs (
     old: let
       withPostgres = old.passthru.withPostgres or false;
@@ -346,6 +387,13 @@ self: super:
     }
   );
 
+  pylint = super.pylint.overrideAttrs (
+    old: {
+      buildInputs = old.buildInputs ++ [ self.pytest-runner ];
+      doCheck = false;
+    }
+  );
+
   pyopenssl = super.pyopenssl.overrideAttrs (
     old: {
       buildInputs = old.buildInputs ++ [ pkgs.openssl ];
@@ -461,6 +509,14 @@ self: super:
     }
   );
 
+  pytest = super.pytest.overridePythonAttrs (
+    old: {
+      doCheck = false;
+    }
+  );
+
+  pytest-runner = super.pytest-runner or super.pytestrunner;
+
   python-prctl = super.python-prctl.overrideAttrs (
     old: {
       buildInputs = old.buildInputs ++ [
@@ -469,6 +525,21 @@ self: super:
     }
   );
 
+  pyzmq = super.pyzmq.overrideAttrs (
+    old: {
+      nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
+      propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ];
+    }
+  );
+
+  rockset = super.rockset.overrideAttrs (
+    old: rec {
+      postPatch = ''
+        cp ./setup_rockset.py ./setup.py
+      '';
+    }
+  );
+
   scaleapi = super.scaleapi.overrideAttrs (
     old: {
       postPatch = ''
@@ -477,6 +548,12 @@ self: super:
     }
   );
 
+  pandas = super.pandas.overrideAttrs (
+    old: {
+      nativeBuildInputs = old.nativeBuildInputs ++ [ self.cython ];
+    }
+  );
+
   # Pybind11 is an undeclared dependency of scipy that we need to pick from nixpkgs
   # Make it not fail with infinite recursion
   pybind11 = super.pybind11.overridePythonAttrs (
@@ -529,6 +606,30 @@ self: super:
     }
   );
 
+  shellingham = if lib.versionAtLeast super.shellingham.version "1.3.2" then (
+    super.shellingham.overridePythonAttrs (
+      old: {
+        format = "pyproject";
+      }
+    )
+  ) else super.shellingham;
+
+  tables = super.tables.overrideAttrs (
+    old: {
+      HDF5_DIR = "${pkgs.hdf5}";
+      nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
+      propagatedBuildInputs = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ];
+    }
+  );
+
+  tensorpack = super.tensorpack.overrideAttrs (
+    old: {
+      postPatch = ''
+        substituteInPlace setup.cfg --replace "# will call find_packages()" ""
+      '';
+    }
+  );
+
   urwidtrees = super.urwidtrees.overrideAttrs (
     old: {
       propagatedBuildInputs = old.propagatedBuildInputs ++ [

From 298b50df1dd09f6df7a8dcc566822ffa6a5c475c Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Mon, 2 Mar 2020 16:29:38 +0000
Subject: [PATCH 2084/4636] poetry: 1.0.3 -> 1.0.5

---
 pkgs/development/tools/poetry/default.nix    |  32 --
 pkgs/development/tools/poetry/poetry.lock    | 413 +++++++++++++------
 pkgs/development/tools/poetry/pyproject.toml |   6 +-
 pkgs/development/tools/poetry/src.json       |   4 +-
 4 files changed, 298 insertions(+), 157 deletions(-)

diff --git a/pkgs/development/tools/poetry/default.nix b/pkgs/development/tools/poetry/default.nix
index 1517e53f219c..ac2ab258df47 100644
--- a/pkgs/development/tools/poetry/default.nix
+++ b/pkgs/development/tools/poetry/default.nix
@@ -17,38 +17,6 @@ poetry2nix.mkPoetryApplication {
     done
   '';
 
-  # Poetry is a bit special in that it can't use itself as the `build-system` property in pyproject.toml.
-  # That's why we need to hackily install outputs completely manually.
-  #
-  # For projects using poetry normally overriding the installPhase is not required.
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/lib/${python.libPrefix}/site-packages
-    cp -r poetry $out/lib/${python.libPrefix}/site-packages
-
-    mkdir -p $out/bin
-    cat > $out/bin/poetry <<EOF
-    #!${python.interpreter}
-    import sys
-
-    if __name__ == '__main__':
-        sys.path.append("$out/lib/${python.libPrefix}/site-packages")
-        from poetry.console import main
-        main()
-    EOF
-    chmod +x $out/bin/poetry
-
-    mkdir -p "$out/share/bash-completion/completions"
-    "$out/bin/poetry" completions bash > "$out/share/bash-completion/completions/poetry"
-    mkdir -p "$out/share/zsh/vendor-completions"
-    "$out/bin/poetry" completions zsh > "$out/share/zsh/vendor-completions/_poetry"
-    mkdir -p "$out/share/fish/vendor_completions.d"
-    "$out/bin/poetry" completions fish > "$out/share/fish/vendor_completions.d/poetry.fish"
-
-    runHook postInstall
-  '';
-
   # Propagating dependencies leads to issues downstream
   # We've already patched poetry to prefer "vendored" dependencies
   postFixup = ''
diff --git a/pkgs/development/tools/poetry/poetry.lock b/pkgs/development/tools/poetry/poetry.lock
index 8cc557994055..68b195a47b16 100644
--- a/pkgs/development/tools/poetry/poetry.lock
+++ b/pkgs/development/tools/poetry/poetry.lock
@@ -1,7 +1,6 @@
 [[package]]
 category = "dev"
 description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
-marker = "python_version >= \"3.6\" and python_version < \"4.0\""
 name = "appdirs"
 optional = false
 python-versions = "*"
@@ -109,7 +108,7 @@ marker = "python_version >= \"2.7\" and python_version < \"2.8\" and (sys_platfo
 name = "cffi"
 optional = false
 python-versions = "*"
-version = "1.13.2"
+version = "1.14.0"
 
 [package.dependencies]
 pycparser = "*"
@@ -159,10 +158,10 @@ description = "CliKit is a group of utilities to build beautiful and testable co
 name = "clikit"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "0.4.1"
+version = "0.4.2"
 
 [package.dependencies]
-pastel = ">=0.1.0,<0.2.0"
+pastel = ">=0.2.0,<0.3.0"
 pylev = ">=1.3,<2.0"
 
 [package.dependencies.enum34]
@@ -173,6 +172,10 @@ version = ">=1.1,<2.0"
 python = ">=2.7,<2.8 || >=3.4,<3.5"
 version = ">=3.6,<4.0"
 
+[package.dependencies.typing-extensions]
+python = ">=3.5.0,<3.5.4"
+version = ">=3.6,<4.0"
+
 [[package]]
 category = "dev"
 description = "Cross-platform colored terminal text."
@@ -260,6 +263,14 @@ idna = ["idna (>=2.1)"]
 pep8test = ["flake8", "flake8-import-order", "pep8-naming"]
 test = ["pytest (>=3.6.0,<3.9.0 || >3.9.0,<3.9.1 || >3.9.1,<3.9.2 || >3.9.2)", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,<3.79.2 || >3.79.2)"]
 
+[[package]]
+category = "dev"
+description = "Distribution utilities"
+name = "distlib"
+optional = false
+python-versions = "*"
+version = "0.3.0"
+
 [[package]]
 category = "main"
 description = "Discover and load entry points from installed packages."
@@ -281,7 +292,7 @@ marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_versi
 name = "enum34"
 optional = false
 python-versions = "*"
-version = "1.1.6"
+version = "1.1.9"
 
 [[package]]
 category = "dev"
@@ -309,6 +320,15 @@ optional = false
 python-versions = "*"
 version = "3.2.3-2"
 
+[[package]]
+category = "dev"
+description = "Clean single-source support for Python 3 and 2"
+marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\""
+name = "future"
+optional = false
+python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
+version = "0.18.2"
+
 [[package]]
 category = "dev"
 description = "Backport of the concurrent.futures package from Python 3"
@@ -376,6 +396,14 @@ optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 version = "2.8"
 
+[[package]]
+category = "main"
+description = "Internationalized Domain Names in Applications (IDNA)"
+name = "idna"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+version = "2.9"
+
 [[package]]
 category = "main"
 description = "Read metadata from Python packages"
@@ -557,6 +585,26 @@ optional = false
 python-versions = "*"
 version = "0.12.2"
 
+[[package]]
+category = "dev"
+description = "A Python implementation of Lunr.js"
+marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\""
+name = "lunr"
+optional = false
+python-versions = "*"
+version = "0.5.6"
+
+[package.dependencies]
+future = ">=0.16.0"
+six = ">=1.11.0"
+
+[package.dependencies.nltk]
+optional = true
+version = ">=3.2.5"
+
+[package.extras]
+languages = ["nltk (>=3.2.5)"]
+
 [[package]]
 category = "dev"
 description = "Python implementation of Markdown."
@@ -579,6 +627,20 @@ setuptools = ">=36"
 [package.extras]
 testing = ["coverage", "pyyaml"]
 
+[[package]]
+category = "dev"
+description = "Python implementation of Markdown."
+name = "markdown"
+optional = false
+python-versions = ">=3.5"
+version = "3.2.1"
+
+[package.dependencies]
+setuptools = ">=36"
+
+[package.extras]
+testing = ["coverage", "pyyaml"]
+
 [[package]]
 category = "dev"
 description = "This is an extension to Python-Markdown which provides an \"include\" function, similar to that found in LaTeX (and also the C pre-processor and Fortran). I originally wrote it for my FORD Fortran auto-documentation generator."
@@ -616,6 +678,27 @@ click = ">=3.3"
 livereload = ">=2.5.1"
 tornado = ">=5.0"
 
+[[package]]
+category = "dev"
+description = "Project documentation with Markdown."
+marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\""
+name = "mkdocs"
+optional = false
+python-versions = ">=3.5"
+version = "1.1"
+
+[package.dependencies]
+Jinja2 = ">=2.10.1"
+Markdown = ">=3.2.1"
+PyYAML = ">=3.10"
+click = ">=3.3"
+livereload = ">=2.5.1"
+tornado = ">=5.0"
+
+[package.dependencies.lunr]
+extras = ["languages"]
+version = "0.5.6"
+
 [[package]]
 category = "dev"
 description = "Rolling backport of unittest.mock for all Pythons"
@@ -673,7 +756,27 @@ description = "MessagePack (de)serializer."
 name = "msgpack"
 optional = false
 python-versions = "*"
-version = "0.6.2"
+version = "1.0.0"
+
+[[package]]
+category = "dev"
+description = "Natural Language Toolkit"
+marker = "python_version >= \"2.7.9\" and python_version < \"2.8.0\" or python_version >= \"3.4\" and python_version < \"4.0\""
+name = "nltk"
+optional = false
+python-versions = "*"
+version = "3.4.5"
+
+[package.dependencies]
+six = "*"
+
+[package.extras]
+all = ["pyparsing", "scikit-learn", "python-crfsuite", "matplotlib", "scipy", "gensim", "requests", "twython", "numpy"]
+corenlp = ["requests"]
+machine_learning = ["gensim", "numpy", "python-crfsuite", "scikit-learn", "scipy"]
+plot = ["matplotlib"]
+tgrep = ["pyparsing"]
+twitter = ["twython"]
 
 [[package]]
 category = "dev"
@@ -681,7 +784,7 @@ description = "Node.js virtual environment builder"
 name = "nodeenv"
 optional = false
 python-versions = "*"
-version = "1.3.4"
+version = "1.3.5"
 
 [[package]]
 category = "dev"
@@ -701,7 +804,7 @@ description = "Bring colors to your terminal."
 name = "pastel"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "0.1.1"
+version = "0.2.0"
 
 [[package]]
 category = "main"
@@ -910,6 +1013,17 @@ version = "6.2.1"
 Markdown = ">=3.0.1"
 pep562 = "*"
 
+[[package]]
+category = "dev"
+description = "Extension pack for Python Markdown."
+name = "pymdown-extensions"
+optional = false
+python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*"
+version = "6.3"
+
+[package.dependencies]
+Markdown = ">=3.2"
+
 [[package]]
 category = "main"
 description = "Python parsing module"
@@ -1055,7 +1169,7 @@ marker = "python_version >= \"3.6\" and python_version < \"4.0\""
 name = "regex"
 optional = false
 python-versions = "*"
-version = "2020.1.8"
+version = "2020.2.20"
 
 [[package]]
 category = "main"
@@ -1081,16 +1195,16 @@ description = "Python HTTP for Humans."
 name = "requests"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
-version = "2.22.0"
+version = "2.23.0"
 
 [package.dependencies]
 certifi = ">=2017.4.17"
-chardet = ">=3.0.2,<3.1.0"
-idna = ">=2.5,<2.9"
+chardet = ">=3.0.2,<4"
+idna = ">=2.5,<3"
 urllib3 = ">=1.21.1,<1.25.0 || >1.25.0,<1.25.1 || >1.25.1,<1.26"
 
 [package.extras]
-security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)"]
+security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"]
 socks = ["PySocks (>=1.5.6,<1.5.7 || >1.5.7)", "win-inet-pton"]
 
 [[package]]
@@ -1107,7 +1221,7 @@ requests = ">=2.0.1,<3.0.0"
 [[package]]
 category = "main"
 description = "scandir, a better directory iterator and faster os.walk()"
-marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\""
+marker = "python_version >= \"2.7\" and python_version < \"2.8\" or python_version >= \"3.4\" and python_version < \"3.5\" or python_version < \"3.5\""
 name = "scandir"
 optional = false
 python-versions = "*"
@@ -1146,8 +1260,8 @@ category = "main"
 description = "Tool to Detect Surrounding Shell"
 name = "shellingham"
 optional = false
-python-versions = ">=2.6,!=3.0,!=3.1,!=3.2,!=3.3"
-version = "1.3.1"
+python-versions = "!=3.0,!=3.1,!=3.2,!=3.3,>=2.6"
+version = "1.3.2"
 
 [[package]]
 category = "main"
@@ -1188,7 +1302,7 @@ description = "Style preserving TOML library"
 name = "tomlkit"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "0.5.8"
+version = "0.5.11"
 
 [package.dependencies]
 [package.dependencies.enum34]
@@ -1248,7 +1362,7 @@ description = "tox is a generic virtualenv management and test command line tool
 name = "tox"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
-version = "3.14.3"
+version = "3.14.5"
 
 [package.dependencies]
 colorama = ">=0.4.1"
@@ -1256,7 +1370,7 @@ filelock = ">=3.0.0,<4"
 packaging = ">=14"
 pluggy = ">=0.12.0,<1"
 py = ">=1.4.17,<2"
-six = ">=1.0.0,<2"
+six = ">=1.14.0,<2"
 toml = ">=0.9.4"
 virtualenv = ">=16.0.0"
 
@@ -1286,6 +1400,15 @@ optional = false
 python-versions = "*"
 version = "3.7.4.1"
 
+[[package]]
+category = "main"
+description = "Backported and Experimental Type Hints for Python 3.5+"
+marker = "python_version >= \"3.5.0\" and python_version < \"3.5.4\""
+name = "typing-extensions"
+optional = false
+python-versions = "*"
+version = "3.7.4.1"
+
 [[package]]
 category = "main"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
@@ -1317,12 +1440,38 @@ description = "Virtual Python Environment builder"
 name = "virtualenv"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7"
-version = "16.7.9"
+version = "16.7.10"
 
 [package.extras]
 docs = ["sphinx (>=1.8.0,<2)", "towncrier (>=18.5.0)", "sphinx-rtd-theme (>=0.4.2,<1)"]
 testing = ["pytest (>=4.0.0,<5)", "coverage (>=4.5.0,<5)", "pytest-timeout (>=1.3.0,<2)", "six (>=1.10.0,<2)", "pytest-xdist", "pytest-localserver", "pypiserver", "mock", "xonsh"]
 
+[[package]]
+category = "dev"
+description = "Virtual Python Environment builder"
+name = "virtualenv"
+optional = false
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7"
+version = "20.0.7"
+
+[package.dependencies]
+appdirs = ">=1.4.3,<2"
+distlib = ">=0.3.0,<1"
+filelock = ">=3.0.0,<4"
+six = ">=1.9.0,<2"
+
+[package.dependencies.importlib-metadata]
+python = "<3.8"
+version = ">=0.12,<2"
+
+[package.dependencies.importlib-resources]
+python = "<3.7"
+version = ">=1.0,<2"
+
+[package.extras]
+docs = ["sphinx (>=2.0.0,<3)", "sphinx-argparse (>=0.2.5,<1)", "sphinx-rtd-theme (>=0.4.3,<1)", "towncrier (>=19.9.0rc1)", "proselint (>=0.10.2,<1)"]
+testing = ["pytest (>=4.0.0,<6)", "coverage (>=4.5.1,<6)", "pytest-mock (>=2.0.0,<3)", "pytest-env (>=0.6.2,<1)", "packaging (>=20.0)", "xonsh (>=0.9.13,<1)"]
+
 [[package]]
 category = "dev"
 description = "Measures number of Terminal column cells of wide-character codes"
@@ -1342,11 +1491,10 @@ version = "0.5.1"
 [[package]]
 category = "main"
 description = "Backport of pathlib-compatible object wrapper for zip files"
-marker = "python_version >= \"3.5\" and python_version < \"3.8\" or python_version < \"3.8\""
 name = "zipp"
 optional = false
 python-versions = ">=2.7"
-version = "1.1.0"
+version = "1.2.0"
 
 [package.dependencies]
 [package.dependencies.contextlib2]
@@ -1355,10 +1503,10 @@ version = "*"
 
 [package.extras]
 docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"]
-testing = ["pathlib2", "unittest2", "jaraco.itertools"]
+testing = ["pathlib2", "unittest2", "jaraco.itertools", "func-timeout"]
 
 [metadata]
-content-hash = "e0b632d8363fdf9f70d93901ff537714611bfc31705a897f6d2fb3bc010bca0a"
+content-hash = "70609fddc0d3768b1003fc24207951ab7ad8bfad4c6cb326d6217c52f5a92e3d"
 python-versions = "~2.7 || ^3.4"
 
 [metadata.files]
@@ -1395,39 +1543,34 @@ certifi = [
     {file = "certifi-2019.11.28.tar.gz", hash = "sha256:25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f"},
 ]
 cffi = [
-    {file = "cffi-1.13.2-cp27-cp27m-macosx_10_6_intel.whl", hash = "sha256:3c9fff570f13480b201e9ab69453108f6d98244a7f495e91b6c654a47486ba43"},
-    {file = "cffi-1.13.2-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:2c5e309ec482556397cb21ede0350c5e82f0eb2621de04b2633588d118da4396"},
-    {file = "cffi-1.13.2-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:19db0cdd6e516f13329cba4903368bff9bb5a9331d3410b1b448daaadc495e54"},
-    {file = "cffi-1.13.2-cp27-cp27m-win32.whl", hash = "sha256:5c4fae4e9cdd18c82ba3a134be256e98dc0596af1e7285a3d2602c97dcfa5159"},
-    {file = "cffi-1.13.2-cp27-cp27m-win_amd64.whl", hash = "sha256:32a262e2b90ffcfdd97c7a5e24a6012a43c61f1f5a57789ad80af1d26c6acd97"},
-    {file = "cffi-1.13.2-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:4a43c91840bda5f55249413037b7a9b79c90b1184ed504883b72c4df70778579"},
-    {file = "cffi-1.13.2-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:8169cf44dd8f9071b2b9248c35fc35e8677451c52f795daa2bb4643f32a540bc"},
-    {file = "cffi-1.13.2-cp34-cp34m-macosx_10_6_intel.whl", hash = "sha256:71a608532ab3bd26223c8d841dde43f3516aa5d2bf37b50ac410bb5e99053e8f"},
-    {file = "cffi-1.13.2-cp34-cp34m-manylinux1_i686.whl", hash = "sha256:7f627141a26b551bdebbc4855c1157feeef18241b4b8366ed22a5c7d672ef858"},
-    {file = "cffi-1.13.2-cp34-cp34m-manylinux1_x86_64.whl", hash = "sha256:0b49274afc941c626b605fb59b59c3485c17dc776dc3cc7cc14aca74cc19cc42"},
-    {file = "cffi-1.13.2-cp34-cp34m-win32.whl", hash = "sha256:4424e42199e86b21fc4db83bd76909a6fc2a2aefb352cb5414833c030f6ed71b"},
-    {file = "cffi-1.13.2-cp34-cp34m-win_amd64.whl", hash = "sha256:7d4751da932caaec419d514eaa4215eaf14b612cff66398dd51129ac22680b20"},
-    {file = "cffi-1.13.2-cp35-cp35m-macosx_10_6_intel.whl", hash = "sha256:ccb032fda0873254380aa2bfad2582aedc2959186cce61e3a17abc1a55ff89c3"},
-    {file = "cffi-1.13.2-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:dcd65317dd15bc0451f3e01c80da2216a31916bdcffd6221ca1202d96584aa25"},
-    {file = "cffi-1.13.2-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:135f69aecbf4517d5b3d6429207b2dff49c876be724ac0c8bf8e1ea99df3d7e5"},
-    {file = "cffi-1.13.2-cp35-cp35m-win32.whl", hash = "sha256:7b93a885bb13073afb0aa73ad82059a4c41f4b7d8eb8368980448b52d4c7dc2c"},
-    {file = "cffi-1.13.2-cp35-cp35m-win_amd64.whl", hash = "sha256:e570d3ab32e2c2861c4ebe6ffcad6a8abf9347432a37608fe1fbd157b3f0036b"},
-    {file = "cffi-1.13.2-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:0e3ea92942cb1168e38c05c1d56b0527ce31f1a370f6117f1d490b8dcd6b3a04"},
-    {file = "cffi-1.13.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:5ecfa867dea6fabe2a58f03ac9186ea64da1386af2159196da51c4904e11d652"},
-    {file = "cffi-1.13.2-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:291f7c42e21d72144bb1c1b2e825ec60f46d0a7468f5346841860454c7aa8f57"},
-    {file = "cffi-1.13.2-cp36-cp36m-win32.whl", hash = "sha256:62f2578358d3a92e4ab2d830cd1c2049c9c0d0e6d3c58322993cc341bdeac22e"},
-    {file = "cffi-1.13.2-cp36-cp36m-win_amd64.whl", hash = "sha256:fd43a88e045cf992ed09fa724b5315b790525f2676883a6ea64e3263bae6549d"},
-    {file = "cffi-1.13.2-cp37-cp37m-macosx_10_6_intel.whl", hash = "sha256:d75c461e20e29afc0aee7172a0950157c704ff0dd51613506bd7d82b718e7410"},
-    {file = "cffi-1.13.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:aa00d66c0fab27373ae44ae26a66a9e43ff2a678bf63a9c7c1a9a4d61172827a"},
-    {file = "cffi-1.13.2-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:2e9c80a8c3344a92cb04661115898a9129c074f7ab82011ef4b612f645939f12"},
-    {file = "cffi-1.13.2-cp37-cp37m-win32.whl", hash = "sha256:d754f39e0d1603b5b24a7f8484b22d2904fa551fe865fd0d4c3332f078d20d4e"},
-    {file = "cffi-1.13.2-cp37-cp37m-win_amd64.whl", hash = "sha256:6471a82d5abea994e38d2c2abc77164b4f7fbaaf80261cb98394d5793f11b12a"},
-    {file = "cffi-1.13.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:74a1d8c85fb6ff0b30fbfa8ad0ac23cd601a138f7509dc617ebc65ef305bb98d"},
-    {file = "cffi-1.13.2-cp38-cp38-manylinux1_i686.whl", hash = "sha256:42194f54c11abc8583417a7cf4eaff544ce0de8187abaf5d29029c91b1725ad3"},
-    {file = "cffi-1.13.2-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:415bdc7ca8c1c634a6d7163d43fb0ea885a07e9618a64bda407e04b04333b7db"},
-    {file = "cffi-1.13.2-cp38-cp38-win32.whl", hash = "sha256:6d4f18483d040e18546108eb13b1dfa1000a089bcf8529e30346116ea6240506"},
-    {file = "cffi-1.13.2-cp38-cp38-win_amd64.whl", hash = "sha256:2781e9ad0e9d47173c0093321bb5435a9dfae0ed6a762aabafa13108f5f7b2ba"},
-    {file = "cffi-1.13.2.tar.gz", hash = "sha256:599a1e8ff057ac530c9ad1778293c665cb81a791421f46922d80a86473c13346"},
+    {file = "cffi-1.14.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:1cae98a7054b5c9391eb3249b86e0e99ab1e02bb0cc0575da191aedadbdf4384"},
+    {file = "cffi-1.14.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:cf16e3cf6c0a5fdd9bc10c21687e19d29ad1fe863372b5543deaec1039581a30"},
+    {file = "cffi-1.14.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:f2b0fa0c01d8a0c7483afd9f31d7ecf2d71760ca24499c8697aeb5ca37dc090c"},
+    {file = "cffi-1.14.0-cp27-cp27m-win32.whl", hash = "sha256:99f748a7e71ff382613b4e1acc0ac83bf7ad167fb3802e35e90d9763daba4d78"},
+    {file = "cffi-1.14.0-cp27-cp27m-win_amd64.whl", hash = "sha256:c420917b188a5582a56d8b93bdd8e0f6eca08c84ff623a4c16e809152cd35793"},
+    {file = "cffi-1.14.0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:399aed636c7d3749bbed55bc907c3288cb43c65c4389964ad5ff849b6370603e"},
+    {file = "cffi-1.14.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:cab50b8c2250b46fe738c77dbd25ce017d5e6fb35d3407606e7a4180656a5a6a"},
+    {file = "cffi-1.14.0-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:001bf3242a1bb04d985d63e138230802c6c8d4db3668fb545fb5005ddf5bb5ff"},
+    {file = "cffi-1.14.0-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:e56c744aa6ff427a607763346e4170629caf7e48ead6921745986db3692f987f"},
+    {file = "cffi-1.14.0-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:b8c78301cefcf5fd914aad35d3c04c2b21ce8629b5e4f4e45ae6812e461910fa"},
+    {file = "cffi-1.14.0-cp35-cp35m-win32.whl", hash = "sha256:8c0ffc886aea5df6a1762d0019e9cb05f825d0eec1f520c51be9d198701daee5"},
+    {file = "cffi-1.14.0-cp35-cp35m-win_amd64.whl", hash = "sha256:8a6c688fefb4e1cd56feb6c511984a6c4f7ec7d2a1ff31a10254f3c817054ae4"},
+    {file = "cffi-1.14.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:95cd16d3dee553f882540c1ffe331d085c9e629499ceadfbda4d4fde635f4b7d"},
+    {file = "cffi-1.14.0-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:66e41db66b47d0d8672d8ed2708ba91b2f2524ece3dee48b5dfb36be8c2f21dc"},
+    {file = "cffi-1.14.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:028a579fc9aed3af38f4892bdcc7390508adabc30c6af4a6e4f611b0c680e6ac"},
+    {file = "cffi-1.14.0-cp36-cp36m-win32.whl", hash = "sha256:cef128cb4d5e0b3493f058f10ce32365972c554572ff821e175dbc6f8ff6924f"},
+    {file = "cffi-1.14.0-cp36-cp36m-win_amd64.whl", hash = "sha256:337d448e5a725bba2d8293c48d9353fc68d0e9e4088d62a9571def317797522b"},
+    {file = "cffi-1.14.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:e577934fc5f8779c554639376beeaa5657d54349096ef24abe8c74c5d9c117c3"},
+    {file = "cffi-1.14.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:62ae9af2d069ea2698bf536dcfe1e4eed9090211dbaafeeedf5cb6c41b352f66"},
+    {file = "cffi-1.14.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:14491a910663bf9f13ddf2bc8f60562d6bc5315c1f09c704937ef17293fb85b0"},
+    {file = "cffi-1.14.0-cp37-cp37m-win32.whl", hash = "sha256:c43866529f2f06fe0edc6246eb4faa34f03fe88b64a0a9a942561c8e22f4b71f"},
+    {file = "cffi-1.14.0-cp37-cp37m-win_amd64.whl", hash = "sha256:2089ed025da3919d2e75a4d963d008330c96751127dd6f73c8dc0c65041b4c26"},
+    {file = "cffi-1.14.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:3b911c2dbd4f423b4c4fcca138cadde747abdb20d196c4a48708b8a2d32b16dd"},
+    {file = "cffi-1.14.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:7e63cbcf2429a8dbfe48dcc2322d5f2220b77b2e17b7ba023d6166d84655da55"},
+    {file = "cffi-1.14.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:3d311bcc4a41408cf5854f06ef2c5cab88f9fded37a3b95936c9879c1640d4c2"},
+    {file = "cffi-1.14.0-cp38-cp38-win32.whl", hash = "sha256:675686925a9fb403edba0114db74e741d8181683dcf216be697d208857e04ca8"},
+    {file = "cffi-1.14.0-cp38-cp38-win_amd64.whl", hash = "sha256:00789914be39dffba161cfc5be31b55775de5ba2235fe49aa28c148236c4e06b"},
+    {file = "cffi-1.14.0.tar.gz", hash = "sha256:2d384f4a127a15ba701207f7639d94106693b6cd64173d6c8988e2c25f3ac2b6"},
 ]
 cfgv = [
     {file = "cfgv-2.0.1-py2.py3-none-any.whl", hash = "sha256:fbd93c9ab0a523bf7daec408f3be2ed99a980e20b2d19b50fc184ca6b820d289"},
@@ -1446,8 +1589,8 @@ click = [
     {file = "Click-7.0.tar.gz", hash = "sha256:5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7"},
 ]
 clikit = [
-    {file = "clikit-0.4.1-py2.py3-none-any.whl", hash = "sha256:80b0bfee42310a715773dded69590c4c33fa9fc9a351fa7c262cb67f21d0758f"},
-    {file = "clikit-0.4.1.tar.gz", hash = "sha256:8ae4766b974d7b1983e39d501da9a0aadf118a907a0c9b50714d027c8b59ea81"},
+    {file = "clikit-0.4.2-py2.py3-none-any.whl", hash = "sha256:95394982cfa460a77ded2f173380a958e5f90c16972307c19d79b96f6e335326"},
+    {file = "clikit-0.4.2.tar.gz", hash = "sha256:f67336462800078e0896cf6ecfa3b460dfea4dfa01de659388a4ff0d83c8d6ca"},
 ]
 colorama = [
     {file = "colorama-0.4.1-py2.py3-none-any.whl", hash = "sha256:f8ac84de7840f5b9c4e3347b3c1eaa50f7e49c2b07596221daec5edaabbd7c48"},
@@ -1551,15 +1694,17 @@ cryptography = [
     {file = "cryptography-2.8-cp38-cp38-win_amd64.whl", hash = "sha256:971221ed40f058f5662a604bd1ae6e4521d84e6cad0b7b170564cc34169c8f13"},
     {file = "cryptography-2.8.tar.gz", hash = "sha256:3cda1f0ed8747339bbdf71b9f38ca74c7b592f24f65cdb3ab3765e4b02871651"},
 ]
+distlib = [
+    {file = "distlib-0.3.0.zip", hash = "sha256:2e166e231a26b36d6dfe35a48c4464346620f8645ed0ace01ee31822b288de21"},
+]
 entrypoints = [
     {file = "entrypoints-0.3-py2.py3-none-any.whl", hash = "sha256:589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19"},
     {file = "entrypoints-0.3.tar.gz", hash = "sha256:c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451"},
 ]
 enum34 = [
-    {file = "enum34-1.1.6-py2-none-any.whl", hash = "sha256:6bd0f6ad48ec2aa117d3d141940d484deccda84d4fcd884f5c3d93c23ecd8c79"},
-    {file = "enum34-1.1.6-py3-none-any.whl", hash = "sha256:644837f692e5f550741432dd3f223bbb9852018674981b1664e5dc339387588a"},
-    {file = "enum34-1.1.6.tar.gz", hash = "sha256:8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1"},
-    {file = "enum34-1.1.6.zip", hash = "sha256:2d81cbbe0e73112bdfe6ef8576f2238f2ba27dd0d55752a776c41d38b7da2850"},
+    {file = "enum34-1.1.9-py2-none-any.whl", hash = "sha256:98df1f1937840b7d8012fea7f0b36392a3e6fd8a2f429c48a3ff4b1aad907f3f"},
+    {file = "enum34-1.1.9-py3-none-any.whl", hash = "sha256:708aabfb3d5898f99674c390d360d59efdd08547019763622365f19e84a7fef4"},
+    {file = "enum34-1.1.9.tar.gz", hash = "sha256:13ef9a1c478203252107f66c25b99b45b1865693ca1284aab40dafa7e1e7ac17"},
 ]
 filelock = [
     {file = "filelock-3.0.12-py3-none-any.whl", hash = "sha256:929b7d63ec5b7d6b71b0fa5ac14e030b3f70b75747cef1b10da9b879fef15836"},
@@ -1573,6 +1718,9 @@ functools32 = [
     {file = "functools32-3.2.3-2.tar.gz", hash = "sha256:f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d"},
     {file = "functools32-3.2.3-2.zip", hash = "sha256:89d824aa6c358c421a234d7f9ee0bd75933a67c29588ce50aaa3acdf4d403fa0"},
 ]
+future = [
+    {file = "future-0.18.2.tar.gz", hash = "sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d"},
+]
 futures = [
     {file = "futures-3.3.0-py2-none-any.whl", hash = "sha256:49b3f5b064b6e3afc3316421a3f25f66c137ae88f068abbf72830170033c5e16"},
     {file = "futures-3.3.0.tar.gz", hash = "sha256:7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794"},
@@ -1594,6 +1742,8 @@ identify = [
 idna = [
     {file = "idna-2.8-py2.py3-none-any.whl", hash = "sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c"},
     {file = "idna-2.8.tar.gz", hash = "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407"},
+    {file = "idna-2.9-py2.py3-none-any.whl", hash = "sha256:a068a21ceac8a4d63dbfd964670474107f541babbd2250d61922f029858365fa"},
+    {file = "idna-2.9.tar.gz", hash = "sha256:7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb"},
 ]
 importlib-metadata = [
     {file = "importlib_metadata-1.1.3-py2.py3-none-any.whl", hash = "sha256:7c7f8ac40673f507f349bef2eed21a0e5f01ddf5b2a7356a6c65eb2099b53764"},
@@ -1635,11 +1785,17 @@ lockfile = [
     {file = "lockfile-0.12.2-py2.py3-none-any.whl", hash = "sha256:6c3cb24f344923d30b2785d5ad75182c8ea7ac1b6171b08657258ec7429d50fa"},
     {file = "lockfile-0.12.2.tar.gz", hash = "sha256:6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799"},
 ]
+lunr = [
+    {file = "lunr-0.5.6-py2.py3-none-any.whl", hash = "sha256:1208622930c915a07e6f8e8640474357826bad48534c0f57969b6fca9bffc88e"},
+    {file = "lunr-0.5.6.tar.gz", hash = "sha256:7be69d7186f65784a4f2adf81e5c58efd6a9921aa95966babcb1f2f2ada75c20"},
+]
 markdown = [
     {file = "Markdown-3.0.1-py2.py3-none-any.whl", hash = "sha256:c00429bd503a47ec88d5e30a751e147dcb4c6889663cd3e2ba0afe858e009baa"},
     {file = "Markdown-3.0.1.tar.gz", hash = "sha256:d02e0f9b04c500cde6637c11ad7c72671f359b87b9fe924b2383649d8841db7c"},
     {file = "Markdown-3.1.1-py2.py3-none-any.whl", hash = "sha256:56a46ac655704b91e5b7e6326ce43d5ef72411376588afa1dd90e881b83c7e8c"},
     {file = "Markdown-3.1.1.tar.gz", hash = "sha256:2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a"},
+    {file = "Markdown-3.2.1-py2.py3-none-any.whl", hash = "sha256:e4795399163109457d4c5af2183fbe6b60326c17cfdf25ce6e7474c6624f725d"},
+    {file = "Markdown-3.2.1.tar.gz", hash = "sha256:90fee683eeabe1a92e149f7ba74e5ccdc81cd397bd6c516d93a8da0ef90b6902"},
 ]
 markdown-include = [
     {file = "markdown-include-0.5.1.tar.gz", hash = "sha256:72a45461b589489a088753893bc95c5fa5909936186485f4ed55caa57d10250f"},
@@ -1672,11 +1828,18 @@ markupsafe = [
     {file = "MarkupSafe-1.1.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6"},
     {file = "MarkupSafe-1.1.1-cp37-cp37m-win32.whl", hash = "sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2"},
     {file = "MarkupSafe-1.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c"},
+    {file = "MarkupSafe-1.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15"},
+    {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2"},
+    {file = "MarkupSafe-1.1.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42"},
+    {file = "MarkupSafe-1.1.1-cp38-cp38-win32.whl", hash = "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b"},
+    {file = "MarkupSafe-1.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be"},
     {file = "MarkupSafe-1.1.1.tar.gz", hash = "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"},
 ]
 mkdocs = [
     {file = "mkdocs-1.0.4-py2.py3-none-any.whl", hash = "sha256:8cc8b38325456b9e942c981a209eaeb1e9f3f77b493ad755bfef889b9c8d356a"},
     {file = "mkdocs-1.0.4.tar.gz", hash = "sha256:17d34329aad75d5de604b9ed4e31df3a4d235afefdc46ce7b1964fddb2e1e939"},
+    {file = "mkdocs-1.1-py2.py3-none-any.whl", hash = "sha256:1e385a70aea8a9dedb731aea4fd5f3704b2074801c4f96f06b2920999babda8a"},
+    {file = "mkdocs-1.1.tar.gz", hash = "sha256:9243291392f59e20b655e4e46210233453faf97787c2cf72176510e868143174"},
 ]
 mock = [
     {file = "mock-3.0.5-py2.py3-none-any.whl", hash = "sha256:d157e52d4e5b938c550f39eb2fd15610db062441a9c2747d3dbfa9298211d0f8"},
@@ -1692,38 +1855,39 @@ more-itertools = [
     {file = "more_itertools-8.2.0-py3-none-any.whl", hash = "sha256:5dd8bcf33e5f9513ffa06d5ad33d78f31e1931ac9a18f33d37e77a180d393a7c"},
 ]
 msgpack = [
-    {file = "msgpack-0.6.2-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:774f5edc3475917cd95fe593e625d23d8580f9b48b570d8853d06cac171cd170"},
-    {file = "msgpack-0.6.2-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:a06efd0482a1942aad209a6c18321b5e22d64eb531ea20af138b28172d8f35ba"},
-    {file = "msgpack-0.6.2-cp27-cp27m-win32.whl", hash = "sha256:8a3ada8401736df2bf497f65589293a86c56e197a80ae7634ec2c3150a2f5082"},
-    {file = "msgpack-0.6.2-cp27-cp27m-win_amd64.whl", hash = "sha256:b8b4bd3dafc7b92608ae5462add1c8cc881851c2d4f5d8977fdea5b081d17f21"},
-    {file = "msgpack-0.6.2-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:24149a75643aeaa81ece4259084d11b792308a6cf74e796cbb35def94c89a25a"},
-    {file = "msgpack-0.6.2-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:757bd71a9b89e4f1db0622af4436d403e742506dbea978eba566815dc65ec895"},
-    {file = "msgpack-0.6.2-cp35-cp35m-macosx_10_6_intel.whl", hash = "sha256:32fea0ea3cd1ef820286863a6202dcfd62a539b8ec3edcbdff76068a8c2cc6ce"},
-    {file = "msgpack-0.6.2-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:db7ff14abc73577b0bcbcf73ecff97d3580ecaa0fc8724babce21fdf3fe08ef6"},
-    {file = "msgpack-0.6.2-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:187794cd1eb73acccd528247e3565f6760bd842d7dc299241f830024a7dd5610"},
-    {file = "msgpack-0.6.2-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:b24afc52e18dccc8c175de07c1d680bdf315844566f4952b5bedb908894bec79"},
-    {file = "msgpack-0.6.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:355f7fd0f90134229eaeefaee3cf42e0afc8518e8f3cd4b25f541a7104dcb8f9"},
-    {file = "msgpack-0.6.2-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:76df51492bc6fa6cc8b65d09efdb67cbba3cbfe55004c3afc81352af92b4a43c"},
-    {file = "msgpack-0.6.2-cp36-cp36m-win32.whl", hash = "sha256:f0f47bafe9c9b8ed03e19a100a743662dd8c6d0135e684feea720a0d0046d116"},
-    {file = "msgpack-0.6.2-cp36-cp36m-win_amd64.whl", hash = "sha256:c6e5024fc0cdf7f83b6624850309ddd7e06c48a75fa0d1c5173de4d93300eb19"},
-    {file = "msgpack-0.6.2-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:30b88c47e0cdb6062daed88ca283b0d84fa0d2ad6c273aa0788152a1c643e408"},
-    {file = "msgpack-0.6.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:229a0ccdc39e9b6c6d1033cd8aecd9c296823b6c87f0de3943c59b8bc7c64bee"},
-    {file = "msgpack-0.6.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:4abdb88a9b67e64810fb54b0c24a1fd76b12297b4f7a1467d85a14dd8367191a"},
-    {file = "msgpack-0.6.2-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:dedf54d72d9e7b6d043c244c8213fe2b8bbfe66874b9a65b39c4cc892dd99dd4"},
-    {file = "msgpack-0.6.2-cp37-cp37m-win32.whl", hash = "sha256:0cc7ca04e575ba34fea7cfcd76039f55def570e6950e4155a4174368142c8e1b"},
-    {file = "msgpack-0.6.2-cp37-cp37m-win_amd64.whl", hash = "sha256:1904b7cb65342d0998b75908304a03cb004c63ef31e16c8c43fee6b989d7f0d7"},
-    {file = "msgpack-0.6.2.tar.gz", hash = "sha256:ea3c2f859346fcd55fc46e96885301d9c2f7a36d453f5d8f2967840efa1e1830"},
+    {file = "msgpack-1.0.0-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:cec8bf10981ed70998d98431cd814db0ecf3384e6b113366e7f36af71a0fca08"},
+    {file = "msgpack-1.0.0-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:aa5c057eab4f40ec47ea6f5a9825846be2ff6bf34102c560bad5cad5a677c5be"},
+    {file = "msgpack-1.0.0-cp36-cp36m-macosx_10_13_x86_64.whl", hash = "sha256:4233b7f86c1208190c78a525cd3828ca1623359ef48f78a6fea4b91bb995775a"},
+    {file = "msgpack-1.0.0-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:b3758dfd3423e358bbb18a7cccd1c74228dffa7a697e5be6cb9535de625c0dbf"},
+    {file = "msgpack-1.0.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:25b3bc3190f3d9d965b818123b7752c5dfb953f0d774b454fd206c18fe384fb8"},
+    {file = "msgpack-1.0.0-cp36-cp36m-win32.whl", hash = "sha256:e7bbdd8e2b277b77782f3ce34734b0dfde6cbe94ddb74de8d733d603c7f9e2b1"},
+    {file = "msgpack-1.0.0-cp36-cp36m-win_amd64.whl", hash = "sha256:5dba6d074fac9b24f29aaf1d2d032306c27f04187651511257e7831733293ec2"},
+    {file = "msgpack-1.0.0-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:908944e3f038bca67fcfedb7845c4a257c7749bf9818632586b53bcf06ba4b97"},
+    {file = "msgpack-1.0.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:db685187a415f51d6b937257474ca72199f393dad89534ebbdd7d7a3b000080e"},
+    {file = "msgpack-1.0.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:ea41c9219c597f1d2bf6b374d951d310d58684b5de9dc4bd2976db9e1e22c140"},
+    {file = "msgpack-1.0.0-cp37-cp37m-win32.whl", hash = "sha256:e35b051077fc2f3ce12e7c6a34cf309680c63a842db3a0616ea6ed25ad20d272"},
+    {file = "msgpack-1.0.0-cp37-cp37m-win_amd64.whl", hash = "sha256:5bea44181fc8e18eed1d0cd76e355073f00ce232ff9653a0ae88cb7d9e643322"},
+    {file = "msgpack-1.0.0-cp38-cp38-macosx_10_13_x86_64.whl", hash = "sha256:c901e8058dd6653307906c5f157f26ed09eb94a850dddd989621098d347926ab"},
+    {file = "msgpack-1.0.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:271b489499a43af001a2e42f42d876bb98ccaa7e20512ff37ca78c8e12e68f84"},
+    {file = "msgpack-1.0.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7a22c965588baeb07242cb561b63f309db27a07382825fc98aecaf0827c1538e"},
+    {file = "msgpack-1.0.0-cp38-cp38-win32.whl", hash = "sha256:002a0d813e1f7b60da599bdf969e632074f9eec1b96cbed8fb0973a63160a408"},
+    {file = "msgpack-1.0.0-cp38-cp38-win_amd64.whl", hash = "sha256:39c54fdebf5fa4dda733369012c59e7d085ebdfe35b6cf648f09d16708f1be5d"},
+    {file = "msgpack-1.0.0.tar.gz", hash = "sha256:9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0"},
+]
+nltk = [
+    {file = "nltk-3.4.5.win32.exe", hash = "sha256:a08bdb4b8a1c13de16743068d9eb61c8c71c2e5d642e8e08205c528035843f82"},
+    {file = "nltk-3.4.5.zip", hash = "sha256:bed45551259aa2101381bbdd5df37d44ca2669c5c3dad72439fa459b29137d94"},
 ]
 nodeenv = [
-    {file = "nodeenv-1.3.4-py2.py3-none-any.whl", hash = "sha256:561057acd4ae3809e665a9aaaf214afff110bbb6a6d5c8a96121aea6878408b3"},
+    {file = "nodeenv-1.3.5-py2.py3-none-any.whl", hash = "sha256:5b2438f2e42af54ca968dd1b374d14a1194848955187b0e5e4be1f73813a5212"},
 ]
 packaging = [
     {file = "packaging-20.1-py2.py3-none-any.whl", hash = "sha256:170748228214b70b672c581a3dd610ee51f733018650740e98c7df862a583f73"},
     {file = "packaging-20.1.tar.gz", hash = "sha256:e665345f9eef0c621aa0bf2f8d78cf6d21904eef16a93f020240b704a57f1334"},
 ]
 pastel = [
-    {file = "pastel-0.1.1-py2.py3-none-any.whl", hash = "sha256:a904e1659512cc9880a028f66de77cc813a4c32f7ceb68725cbc8afad57ef7ef"},
-    {file = "pastel-0.1.1.tar.gz", hash = "sha256:bf3b1901b2442ea0d8ab9a390594e5b0c9584709d543a3113506fe8b28cbace3"},
+    {file = "pastel-0.2.0-py2.py3-none-any.whl", hash = "sha256:18b559dc3ad4ba9b8bd5baebe6503f25f36d21460f021cf27a8d889cb5d17840"},
+    {file = "pastel-0.2.0.tar.gz", hash = "sha256:46155fc523bdd4efcd450bbcb3f2b94a6e3b25edc0eb493e081104ad09e1ca36"},
 ]
 pathlib2 = [
     {file = "pathlib2-2.3.5-py2.py3-none-any.whl", hash = "sha256:0ec8205a157c80d7acc301c0b18fbd5d44fe655968f5d947b6ecef5290fc35db"},
@@ -1785,6 +1949,8 @@ pymdown-extensions = [
     {file = "pymdown_extensions-6.0-py2.py3-none-any.whl", hash = "sha256:25b0a7967fa697b5035e23340a48594e3e93acb10b06d74574218ace3347d1df"},
     {file = "pymdown-extensions-6.2.1.tar.gz", hash = "sha256:3bbe6048275f8a0d13a0fe44e0ea201e67268aa7bb40c2544eef16abbf168f7b"},
     {file = "pymdown_extensions-6.2.1-py2.py3-none-any.whl", hash = "sha256:dce5e17b93be0572322b7d06c9a13c13a9d98694d6468277911d50ca87d26f29"},
+    {file = "pymdown-extensions-6.3.tar.gz", hash = "sha256:cb879686a586b22292899771f5e5bc3382808e92aa938f71b550ecdea709419f"},
+    {file = "pymdown_extensions-6.3-py2.py3-none-any.whl", hash = "sha256:66fae2683c7a1dac53184f7de57f51f8dad73f9ead2f453e94e85096cb811335"},
 ]
 pyparsing = [
     {file = "pyparsing-2.4.6-py2.py3-none-any.whl", hash = "sha256:c342dccb5250c08d45fd6f8b4a559613ca603b57498511740e65cd11a2e7dcec"},
@@ -1838,33 +2004,33 @@ pyyaml = [
     {file = "PyYAML-5.3.tar.gz", hash = "sha256:e9f45bd5b92c7974e59bcd2dcc8631a6b6cc380a904725fce7bc08872e691615"},
 ]
 regex = [
-    {file = "regex-2020.1.8-cp27-cp27m-win32.whl", hash = "sha256:4e8f02d3d72ca94efc8396f8036c0d3bcc812aefc28ec70f35bb888c74a25161"},
-    {file = "regex-2020.1.8-cp27-cp27m-win_amd64.whl", hash = "sha256:e6c02171d62ed6972ca8631f6f34fa3281d51db8b326ee397b9c83093a6b7242"},
-    {file = "regex-2020.1.8-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:4eae742636aec40cf7ab98171ab9400393360b97e8f9da67b1867a9ee0889b26"},
-    {file = "regex-2020.1.8-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:bd25bb7980917e4e70ccccd7e3b5740614f1c408a642c245019cff9d7d1b6149"},
-    {file = "regex-2020.1.8-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:3e77409b678b21a056415da3a56abfd7c3ad03da71f3051bbcdb68cf44d3c34d"},
-    {file = "regex-2020.1.8-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:07b39bf943d3d2fe63d46281d8504f8df0ff3fe4c57e13d1656737950e53e525"},
-    {file = "regex-2020.1.8-cp36-cp36m-win32.whl", hash = "sha256:23e2c2c0ff50f44877f64780b815b8fd2e003cda9ce817a7fd00dea5600c84a0"},
-    {file = "regex-2020.1.8-cp36-cp36m-win_amd64.whl", hash = "sha256:27429b8d74ba683484a06b260b7bb00f312e7c757792628ea251afdbf1434003"},
-    {file = "regex-2020.1.8-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:0e182d2f097ea8549a249040922fa2b92ae28be4be4895933e369a525ba36576"},
-    {file = "regex-2020.1.8-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:e3cd21cc2840ca67de0bbe4071f79f031c81418deb544ceda93ad75ca1ee9f7b"},
-    {file = "regex-2020.1.8-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:ecc6de77df3ef68fee966bb8cb4e067e84d4d1f397d0ef6fce46913663540d77"},
-    {file = "regex-2020.1.8-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:26ff99c980f53b3191d8931b199b29d6787c059f2e029b2b0c694343b1708c35"},
-    {file = "regex-2020.1.8-cp37-cp37m-win32.whl", hash = "sha256:7bcd322935377abcc79bfe5b63c44abd0b29387f267791d566bbb566edfdd146"},
-    {file = "regex-2020.1.8-cp37-cp37m-win_amd64.whl", hash = "sha256:10671601ee06cf4dc1bc0b4805309040bb34c9af423c12c379c83d7895622bb5"},
-    {file = "regex-2020.1.8-cp38-cp38-manylinux1_i686.whl", hash = "sha256:98b8ed7bb2155e2cbb8b76f627b2fd12cf4b22ab6e14873e8641f266e0fb6d8f"},
-    {file = "regex-2020.1.8-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:6a6ba91b94427cd49cd27764679024b14a96874e0dc638ae6bdd4b1a3ce97be1"},
-    {file = "regex-2020.1.8-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:6a6ae17bf8f2d82d1e8858a47757ce389b880083c4ff2498dba17c56e6c103b9"},
-    {file = "regex-2020.1.8-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:0932941cdfb3afcbc26cc3bcf7c3f3d73d5a9b9c56955d432dbf8bbc147d4c5b"},
-    {file = "regex-2020.1.8-cp38-cp38-win32.whl", hash = "sha256:d58e4606da2a41659c84baeb3cfa2e4c87a74cec89a1e7c56bee4b956f9d7461"},
-    {file = "regex-2020.1.8-cp38-cp38-win_amd64.whl", hash = "sha256:e7c7661f7276507bce416eaae22040fd91ca471b5b33c13f8ff21137ed6f248c"},
-    {file = "regex-2020.1.8.tar.gz", hash = "sha256:d0f424328f9822b0323b3b6f2e4b9c90960b24743d220763c7f07071e0778351"},
+    {file = "regex-2020.2.20-cp27-cp27m-win32.whl", hash = "sha256:99272d6b6a68c7ae4391908fc15f6b8c9a6c345a46b632d7fdb7ef6c883a2bbb"},
+    {file = "regex-2020.2.20-cp27-cp27m-win_amd64.whl", hash = "sha256:974535648f31c2b712a6b2595969f8ab370834080e00ab24e5dbb9d19b8bfb74"},
+    {file = "regex-2020.2.20-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:5de40649d4f88a15c9489ed37f88f053c15400257eeb18425ac7ed0a4e119400"},
+    {file = "regex-2020.2.20-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:82469a0c1330a4beb3d42568f82dffa32226ced006e0b063719468dcd40ffdf0"},
+    {file = "regex-2020.2.20-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:d58a4fa7910102500722defbde6e2816b0372a4fcc85c7e239323767c74f5cbc"},
+    {file = "regex-2020.2.20-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:f1ac2dc65105a53c1c2d72b1d3e98c2464a133b4067a51a3d2477b28449709a0"},
+    {file = "regex-2020.2.20-cp36-cp36m-win32.whl", hash = "sha256:8c2b7fa4d72781577ac45ab658da44c7518e6d96e2a50d04ecb0fd8f28b21d69"},
+    {file = "regex-2020.2.20-cp36-cp36m-win_amd64.whl", hash = "sha256:269f0c5ff23639316b29f31df199f401e4cb87529eafff0c76828071635d417b"},
+    {file = "regex-2020.2.20-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:bed7986547ce54d230fd8721aba6fd19459cdc6d315497b98686d0416efaff4e"},
+    {file = "regex-2020.2.20-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:046e83a8b160aff37e7034139a336b660b01dbfe58706f9d73f5cdc6b3460242"},
+    {file = "regex-2020.2.20-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:b33ebcd0222c1d77e61dbcd04a9fd139359bded86803063d3d2d197b796c63ce"},
+    {file = "regex-2020.2.20-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:bba52d72e16a554d1894a0cc74041da50eea99a8483e591a9edf1025a66843ab"},
+    {file = "regex-2020.2.20-cp37-cp37m-win32.whl", hash = "sha256:01b2d70cbaed11f72e57c1cfbaca71b02e3b98f739ce33f5f26f71859ad90431"},
+    {file = "regex-2020.2.20-cp37-cp37m-win_amd64.whl", hash = "sha256:113309e819634f499d0006f6200700c8209a2a8bf6bd1bdc863a4d9d6776a5d1"},
+    {file = "regex-2020.2.20-cp38-cp38-manylinux1_i686.whl", hash = "sha256:25f4ce26b68425b80a233ce7b6218743c71cf7297dbe02feab1d711a2bf90045"},
+    {file = "regex-2020.2.20-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:9b64a4cc825ec4df262050c17e18f60252cdd94742b4ba1286bcfe481f1c0f26"},
+    {file = "regex-2020.2.20-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:9ff16d994309b26a1cdf666a6309c1ef51ad4f72f99d3392bcd7b7139577a1f2"},
+    {file = "regex-2020.2.20-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:c7f58a0e0e13fb44623b65b01052dae8e820ed9b8b654bb6296bc9c41f571b70"},
+    {file = "regex-2020.2.20-cp38-cp38-win32.whl", hash = "sha256:200539b5124bc4721247a823a47d116a7a23e62cc6695744e3eb5454a8888e6d"},
+    {file = "regex-2020.2.20-cp38-cp38-win_amd64.whl", hash = "sha256:7f78f963e62a61e294adb6ff5db901b629ef78cb2a1cfce3cf4eeba80c1c67aa"},
+    {file = "regex-2020.2.20.tar.gz", hash = "sha256:9e9624440d754733eddbcd4614378c18713d2d9d0dc647cf9c72f64e39671be5"},
 ]
 requests = [
     {file = "requests-2.21.0-py2.py3-none-any.whl", hash = "sha256:7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b"},
     {file = "requests-2.21.0.tar.gz", hash = "sha256:502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e"},
-    {file = "requests-2.22.0-py2.py3-none-any.whl", hash = "sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31"},
-    {file = "requests-2.22.0.tar.gz", hash = "sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4"},
+    {file = "requests-2.23.0-py2.py3-none-any.whl", hash = "sha256:43999036bfa82904b6af1d99e4882b560e5e2c68e5c4b0aa03b655f3d7d73fee"},
+    {file = "requests-2.23.0.tar.gz", hash = "sha256:b3f43d496c6daba4493e7c431722aeb7dbc6288f52a6e04e7b6023b0247817e6"},
 ]
 requests-toolbelt = [
     {file = "requests-toolbelt-0.8.0.tar.gz", hash = "sha256:f6a531936c6fa4c6cfce1b9c10d5c4f498d16528d2a54a22ca00011205a187b5"},
@@ -1889,8 +2055,8 @@ secretstorage = [
     {file = "SecretStorage-3.1.2.tar.gz", hash = "sha256:15da8a989b65498e29be338b3b279965f1b8f09b9668bd8010da183024c8bff6"},
 ]
 shellingham = [
-    {file = "shellingham-1.3.1-py2.py3-none-any.whl", hash = "sha256:77d37a4fd287c1e663006f7ecf1b9deca9ad492d0082587bd813c44eb49e4e62"},
-    {file = "shellingham-1.3.1.tar.gz", hash = "sha256:985b23bbd1feae47ca6a6365eacd314d93d95a8a16f8f346945074c28fe6f3e0"},
+    {file = "shellingham-1.3.2-py2.py3-none-any.whl", hash = "sha256:7f6206ae169dc1a03af8a138681b3f962ae61cc93ade84d0585cca3aaf770044"},
+    {file = "shellingham-1.3.2.tar.gz", hash = "sha256:576c1982bea0ba82fb46c36feb951319d7f42214a82634233f58b40d858a751e"},
 ]
 six = [
     {file = "six-1.14.0-py2.py3-none-any.whl", hash = "sha256:8f3cd2e254d8f793e7f3d6d9df77b92252b52637291d0f0da013c76ea2724b6c"},
@@ -1909,8 +2075,8 @@ toml = [
     {file = "toml-0.10.0.tar.gz", hash = "sha256:229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c"},
 ]
 tomlkit = [
-    {file = "tomlkit-0.5.8-py2.py3-none-any.whl", hash = "sha256:96e6369288571799a3052c1ef93b9de440e1ab751aa045f435b55e9d3bcd0690"},
-    {file = "tomlkit-0.5.8.tar.gz", hash = "sha256:32c10cc16ded7e4101c79f269910658cc2a0be5913f1252121c3cd603051c269"},
+    {file = "tomlkit-0.5.11-py2.py3-none-any.whl", hash = "sha256:4e1bd6c9197d984528f9ff0cc9db667c317d8881288db50db20eeeb0f6b0380b"},
+    {file = "tomlkit-0.5.11.tar.gz", hash = "sha256:f044eda25647882e5ef22b43a1688fb6ab12af2fc50e8456cdfc751c873101cf"},
 ]
 tornado = [
     {file = "tornado-5.1.1-cp35-cp35m-win32.whl", hash = "sha256:732e836008c708de2e89a31cb2fa6c0e5a70cb60492bee6f1ea1047500feaf7f"},
@@ -1931,8 +2097,8 @@ tornado = [
 tox = [
     {file = "tox-3.12.1-py2.py3-none-any.whl", hash = "sha256:f5c8e446b51edd2ea97df31d4ded8c8b72e7d6c619519da6bb6084b9dd5770f9"},
     {file = "tox-3.12.1.tar.gz", hash = "sha256:f87fd33892a2df0950e5e034def9468988b8d008c7e9416be665fcc0dd45b14f"},
-    {file = "tox-3.14.3-py2.py3-none-any.whl", hash = "sha256:806d0a9217584558cc93747a945a9d9bff10b141a5287f0c8429a08828a22192"},
-    {file = "tox-3.14.3.tar.gz", hash = "sha256:06ba73b149bf838d5cd25dc30c2dd2671ae5b2757cf98e5c41a35fe449f131b3"},
+    {file = "tox-3.14.5-py2.py3-none-any.whl", hash = "sha256:0cbe98369081fa16bd6f1163d3d0b2a62afa29d402ccfad2bd09fb2668be0956"},
+    {file = "tox-3.14.5.tar.gz", hash = "sha256:676f1e3e7de245ad870f956436b84ea226210587d1f72c8dfb8cd5ac7b6f0e70"},
 ]
 typed-ast = [
     {file = "typed_ast-1.4.1-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:73d785a950fc82dd2a25897d525d003f6378d1cb23ab305578394694202a58c3"},
@@ -1962,6 +2128,11 @@ typing = [
     {file = "typing-3.7.4.1-py3-none-any.whl", hash = "sha256:f38d83c5a7a7086543a0f649564d661859c5146a85775ab90c0d2f93ffaa9714"},
     {file = "typing-3.7.4.1.tar.gz", hash = "sha256:91dfe6f3f706ee8cc32d38edbbf304e9b7583fb37108fef38229617f8b3eba23"},
 ]
+typing-extensions = [
+    {file = "typing_extensions-3.7.4.1-py2-none-any.whl", hash = "sha256:910f4656f54de5993ad9304959ce9bb903f90aadc7c67a0bef07e678014e892d"},
+    {file = "typing_extensions-3.7.4.1-py3-none-any.whl", hash = "sha256:cf8b63fedea4d89bab840ecbb93e75578af28f76f66c35889bd7065f5af88575"},
+    {file = "typing_extensions-3.7.4.1.tar.gz", hash = "sha256:091ecc894d5e908ac75209f10d5b4f118fbdb2eb1ede6a63544054bb1edb41f2"},
+]
 urllib3 = [
     {file = "urllib3-1.24.3-py2.py3-none-any.whl", hash = "sha256:a637e5fae88995b256e3409dc4d52c2e2e0ba32c42a6365fee8bbd2238de3cfb"},
     {file = "urllib3-1.24.3.tar.gz", hash = "sha256:2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4"},
@@ -1969,8 +2140,10 @@ urllib3 = [
     {file = "urllib3-1.25.8.tar.gz", hash = "sha256:87716c2d2a7121198ebcb7ce7cccf6ce5e9ba539041cfbaeecfb641dc0bf6acc"},
 ]
 virtualenv = [
-    {file = "virtualenv-16.7.9-py2.py3-none-any.whl", hash = "sha256:55059a7a676e4e19498f1aad09b8313a38fcc0cdbe4fdddc0e9b06946d21b4bb"},
-    {file = "virtualenv-16.7.9.tar.gz", hash = "sha256:0d62c70883c0342d59c11d0ddac0d954d0431321a41ab20851facf2b222598f3"},
+    {file = "virtualenv-16.7.10-py2.py3-none-any.whl", hash = "sha256:105893c8dc66b7817691c7371439ec18e3b6c5e323a304b5ed96cdd2e75cc1ec"},
+    {file = "virtualenv-16.7.10.tar.gz", hash = "sha256:e88fdcb08b0ecb11da97868f463dd06275923f50d87f4b9c8b2fc0994eec40f4"},
+    {file = "virtualenv-20.0.7-py2.py3-none-any.whl", hash = "sha256:30ea90b21dabd11da5f509710ad3be2ae47d40ccbc717dfdd2efe4367c10f598"},
+    {file = "virtualenv-20.0.7.tar.gz", hash = "sha256:4a36a96d785428278edd389d9c36d763c5755844beb7509279194647b1ef47f1"},
 ]
 wcwidth = [
     {file = "wcwidth-0.1.8-py2.py3-none-any.whl", hash = "sha256:8fd29383f539be45b20bd4df0dc29c20ba48654a41e661925e612311e9f3c603"},
@@ -1981,6 +2154,6 @@ webencodings = [
     {file = "webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"},
 ]
 zipp = [
-    {file = "zipp-1.1.0-py2.py3-none-any.whl", hash = "sha256:15428d652e993b6ce86694c3cccf0d71aa7afdc6ef1807fa25a920e9444e0281"},
-    {file = "zipp-1.1.0.tar.gz", hash = "sha256:d9d2efe11d3a3fb9184da550d35bd1319dc8e30a63255927c82bb42fca1f4f7c"},
+    {file = "zipp-1.2.0-py2.py3-none-any.whl", hash = "sha256:e0d9e63797e483a30d27e09fffd308c59a700d365ec34e93cc100844168bf921"},
+    {file = "zipp-1.2.0.tar.gz", hash = "sha256:c70410551488251b0fee67b460fb9a536af8d6f9f008ad10ac51f615b6a521b1"},
 ]
diff --git a/pkgs/development/tools/poetry/pyproject.toml b/pkgs/development/tools/poetry/pyproject.toml
index 13e8199331b6..938b89fe422c 100644
--- a/pkgs/development/tools/poetry/pyproject.toml
+++ b/pkgs/development/tools/poetry/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "poetry"
-version = "1.0.3"
+version = "1.0.5"
 description = "Python dependency management and packaging made easy."
 authors = [
     "Sébastien Eustace <sebastien@eustace.io>"
@@ -24,7 +24,7 @@ classifiers = [
 [tool.poetry.dependencies]
 python = "~2.7 || ^3.4"
 cleo = "^0.7.6"
-clikit = "^0.4.1"
+clikit = "^0.4.2"
 requests = "^2.18"
 cachy = "^0.3.0"
 requests-toolbelt = "^0.8.0"
@@ -35,7 +35,7 @@ cachecontrol = { version = "^0.12.4", extras = ["filecache"] }
 pkginfo = "^1.4"
 html5lib = "^1.0"
 shellingham = "^1.1"
-tomlkit = "^0.5.8"
+tomlkit = "^0.5.11"
 pexpect = "^4.7.0"
 
 # The typing module is not in the stdlib in Python 2.7 and 3.4
diff --git a/pkgs/development/tools/poetry/src.json b/pkgs/development/tools/poetry/src.json
index dd8816ac0724..45f41ab9cfcf 100644
--- a/pkgs/development/tools/poetry/src.json
+++ b/pkgs/development/tools/poetry/src.json
@@ -1,6 +1,6 @@
 {
     "owner": "python-poetry",
     "repo": "poetry",
-    "rev": "ed4434253762f943255af20e98098b19a65ca1a6",
-    "sha256": "1ivi984rkavxzxap1rq55yf6jjf2pi90f4riw2ww41hj87prv26q"
+    "rev": "754dbf80dc022b89974288cff10b40ab2f1c2697",
+    "sha256": "1khjx598n222fhzvsxsc6cq4m2i8rss1k1whxw9k03kxi4dx6x5g"
 }
\ No newline at end of file

From e633927c811b574b45418aac9273e0aa876bf69f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Mar 2020 19:42:45 +0000
Subject: [PATCH 2085/4636] palemoon: 28.8.2.1 -> 28.8.4

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

diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index 1065f3499726..7c010b91a1e6 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -13,13 +13,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "palemoon";
-  version = "28.8.2.1";
+  version = "28.8.4";
 
   src = fetchFromGitHub {
     owner  = "MoonchildProductions";
     repo   = "UXP";
     rev    = "PM${version}_Release";
-    sha256 = "1m7dfgy5vjw1ndjsh0aksvsp0ii2kj7gxn0sp3h0xgwi0yq7lwyb";
+    sha256 = "1k2j4rlgjwkns3a592pbiwwhrpja3fachvzby1his3d1mhdvyc6f";
   };
 
   desktopItem = makeDesktopItem {

From eaef96093a30175159444b2328ea732d06671e4d Mon Sep 17 00:00:00 2001
From: WilliButz <WilliButz@users.noreply.github.com>
Date: Mon, 2 Mar 2020 20:48:40 +0100
Subject: [PATCH 2086/4636] prometheus-nginx-exporter: 0.5.0 -> 0.6.0 (#81285)

* prometheus-nginx-exporter: 0.5.0 -> 0.6.0

* nixos/prometheus-nginx-exporter: update for 0.6.0

Added new option constLabels and updated virtualHost name in the
exporter's test.
---
 .../monitoring/prometheus/exporters/nginx.nix       | 13 ++++++++++++-
 nixos/tests/prometheus-exporters.nix                |  2 +-
 .../monitoring/prometheus/nginx-exporter.nix        |  4 ++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
index ba852fea4336..56cddfc55b71 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
@@ -30,7 +30,17 @@ in
         Whether to perform certificate verification for https.
       '';
     };
-
+    constLabels = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = [
+        "label1=value1"
+        "label2=value2"
+      ];
+      description = ''
+        A list of constant labels that will be used in every metric.
+      '';
+    };
   };
   serviceOpts = {
     serviceConfig = {
@@ -40,6 +50,7 @@ in
           --nginx.ssl-verify ${toString cfg.sslVerify} \
           --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
           --web.telemetry-path ${cfg.telemetryPath} \
+          --prometheus.const-labels ${concatStringsSep "," cfg.constLabels} \
           ${concatStringsSep " \\\n  " cfg.extraFlags}
       '';
     };
diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix
index 563f24726477..3d0d00bfbe63 100644
--- a/nixos/tests/prometheus-exporters.nix
+++ b/nixos/tests/prometheus-exporters.nix
@@ -287,7 +287,7 @@ let
         services.nginx = {
           enable = true;
           statusPage = true;
-          virtualHosts."/".extraConfig = "return 204;";
+          virtualHosts."test".extraConfig = "return 204;";
         };
       };
       exporterTest = ''
diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
index ce3ed9ab9d66..70f39418198e 100644
--- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "nginx_exporter";
-  version = "0.5.0";
+  version = "0.6.0";
 
   goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter";
 
@@ -14,7 +14,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "nginxinc";
     repo = "nginx-prometheus-exporter";
-    sha256 = "1fyn2bjq80dx4jv1rakrm0vg6i657a5rs7kkg0f9mbv1alir8kkx";
+    sha256 = "1rwafmm9x0sxj4z7x4axhrjgdy15z70a1y00hw6smq30fcpkazhq";
   };
 
   doCheck = true;

From f4d6ed2e8b26657726b46bfe7afc84a2e308bdf9 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Mon, 2 Mar 2020 14:38:48 +0000
Subject: [PATCH 2087/4636] starship: 0.36.1 -> 0.37.0

Signed-off-by: David Wood <david@davidtw.co>
---
 pkgs/tools/misc/starship/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index 338452e213cf..9d1fcb897891 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -3,13 +3,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "starship";
-  version = "0.36.1";
+  version = "0.37.0";
 
   src = fetchFromGitHub {
     owner = "starship";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1ip6jfnlw0maabvihzbmmka453njnw1yf7hq3fd89l6dx57315m5";
+    sha256 = "17jgb8fp6zarsnl1hm2y24h0xb0w2w6m61k8g3ww3r4fm8yj649v";
   };
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
       --replace "/bin/echo" "echo"
   '';
 
-  cargoSha256 = "16wsd8z4cfb5pplwfvwgi5qawwv8c0aa220wnvphplmgz8cpq35r";
+  cargoSha256 = "01qzwk3q1f6pmyqsq5gnczdjm3157ja2zlrahw5bd5vmy929l5gq";
   checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root";
 
   meta = with stdenv.lib; {

From bfbf3c5b09777627b5ec0965fe10825ebf7f1dbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= <code@andre-bubel.de>
Date: Mon, 2 Mar 2020 21:23:47 +0100
Subject: [PATCH 2088/4636] travis: 1.8.10 -> 1.8.11

---
 .../tools/misc/travis/Gemfile.lock            | 14 ++++----
 pkgs/development/tools/misc/travis/gemset.nix | 32 ++++++++++++-------
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/tools/misc/travis/Gemfile.lock b/pkgs/development/tools/misc/travis/Gemfile.lock
index a29f329ca8af..c13c9646393a 100644
--- a/pkgs/development/tools/misc/travis/Gemfile.lock
+++ b/pkgs/development/tools/misc/travis/Gemfile.lock
@@ -2,15 +2,15 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.4.0)
-    backports (3.15.0)
+    backports (3.16.1)
     coderay (1.1.2)
     ethon (0.12.0)
       ffi (>= 1.3.0)
-    faraday (0.17.0)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.13.1)
+    faraday_middleware (0.14.0)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.11.2)
+    ffi (1.12.2)
     gh (0.15.1)
       addressable (~> 2.4.0)
       backports
@@ -19,7 +19,7 @@ GEM
       net-http-persistent (~> 2.9)
       net-http-pipeline
     highline (1.7.10)
-    json (2.2.0)
+    json (2.3.0)
     launchy (2.4.3)
       addressable (~> 2.3)
     method_source (0.9.2)
@@ -33,7 +33,7 @@ GEM
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
-    travis (1.8.10)
+    travis (1.8.11)
       backports
       faraday (~> 0.9)
       faraday_middleware (~> 0.9, >= 0.9.1)
@@ -54,4 +54,4 @@ DEPENDENCIES
   travis
 
 BUNDLED WITH
-   1.17.2
+   1.17.3
diff --git a/pkgs/development/tools/misc/travis/gemset.nix b/pkgs/development/tools/misc/travis/gemset.nix
index a12a891b3e78..da2f5e8e7ac8 100644
--- a/pkgs/development/tools/misc/travis/gemset.nix
+++ b/pkgs/development/tools/misc/travis/gemset.nix
@@ -8,12 +8,14 @@
     version = "2.4.0";
   };
   backports = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0cczfi1yp7a68bg7ipzi4lvrmi4xsi36n9a19krr4yb3nfwd8fn2";
+      sha256 = "0sp3l5wa77klj34sqib95ppxyam53x3p57xk0y6gy2c3z29z6hs5";
       type = "gem";
     };
-    version = "3.15.0";
+    version = "3.16.1";
   };
   coderay = {
     groups = ["default"];
@@ -40,29 +42,31 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0jk2bar4x6miq2cr73lv0lsbmw4cymiljvp29xb85jifsb3ba6az";
+      sha256 = "13aghksmni2sl15y7wfpx6k5l3lfd8j9gdyqi6cbw6jgc7bqyyn2";
       type = "gem";
     };
-    version = "0.17.0";
+    version = "0.17.3";
   };
   faraday_middleware = {
     dependencies = ["faraday"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1a93rs58bakqck7bcihasz66a1riy22h2zpwrpmb13gp8mw3wkmr";
+      sha256 = "1x7jgvpzl1nm7hqcnc8carq6yj1lijq74jv8pph4sb3bcpfpvcsc";
       type = "gem";
     };
-    version = "0.13.1";
+    version = "0.14.0";
   };
   ffi = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0cbads5da12lb3j0mg2hjrd57s5qkkairxh2y6r9bqyblb5b8xbw";
+      sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4";
       type = "gem";
     };
-    version = "1.11.2";
+    version = "1.12.2";
   };
   gh = {
     dependencies = ["addressable" "backports" "faraday" "multi_json" "net-http-persistent" "net-http-pipeline"];
@@ -82,12 +86,14 @@
     version = "1.7.10";
   };
   json = {
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
+      sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.3.0";
   };
   launchy = {
     dependencies = ["addressable"];
@@ -164,12 +170,14 @@
   };
   travis = {
     dependencies = ["backports" "faraday" "faraday_middleware" "gh" "highline" "launchy" "pusher-client" "typhoeus"];
+    groups = ["default"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ggdksipvnkl7s0g84l4wfpm9v70x9id8xvb9jmn3l0hhlk54dsk";
+      sha256 = "18zbi46as4d2wn83safawciyny0g2sk7yz5fvjvqmfk4ywpfrwrr";
       type = "gem";
     };
-    version = "1.8.10";
+    version = "1.8.11";
   };
   typhoeus = {
     dependencies = ["ethon"];

From b07eb540480ece33e44ddc97d1c072138bac082f Mon Sep 17 00:00:00 2001
From: Brenton Horne <brentonhorne77@gmail.com>
Date: Fri, 28 Feb 2020 00:13:58 +1000
Subject: [PATCH 2089/4636] marvin: 20.4.0 -> 20.6.0

---
 pkgs/applications/science/chemistry/marvin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix
index b27af67c974f..2c155e4e848f 100644
--- a/pkgs/applications/science/chemistry/marvin/default.nix
+++ b/pkgs/applications/science/chemistry/marvin/default.nix
@@ -4,12 +4,12 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "marvin";
-  version = "20.4.0";
+  version = "20.6.0";
 
   src = fetchurl {
     name = "marvin-${version}.deb";
     url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
-    sha256 = "12kygxq24in7hbp7shkx1baqig8rwmzvv0d3kc3ld9sj9hb0a2n1";
+    sha256 = "1vd1hsj36wzghpn6xnppjmva35kdcin7h0xdj3xmi4w5l3qw7fl6";
   };
 
   nativeBuildInputs = [ dpkg makeWrapper ];

From e0e4d591cc4ed4ff14c3f5bffb96d99b971ae639 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 19 Feb 2020 14:43:48 -0500
Subject: [PATCH 2090/4636] nixos/cage: init

Add a cage module to nixos. This can be used to make kiosk-style
systems that boot directly to a single application. The user (demo by
default) is automatically logged in by this service and the
program (xterm by default) is automatically started.

This is useful for some embedded, single-user systems where we want
automatic booting. To keep the system secure, the user should have
limited privileges.

Based on the service provided in the Cage wiki here:

https://github.com/Hjdskes/cage/wiki/Starting-Cage-on-boot-with-systemd

Co-Authored-By: Florian Klink <flokli@flokli.de>
---
 nixos/modules/module-list.nix           |  1 +
 nixos/modules/services/wayland/cage.nix | 99 +++++++++++++++++++++++++
 nixos/tests/all-tests.nix               |  1 +
 nixos/tests/cage.nix                    | 43 +++++++++++
 4 files changed, 144 insertions(+)
 create mode 100644 nixos/modules/services/wayland/cage.nix
 create mode 100644 nixos/tests/cage.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6734929b9d4e..e2722389e339 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -807,6 +807,7 @@
   ./services/ttys/agetty.nix
   ./services/ttys/gpm.nix
   ./services/ttys/kmscon.nix
+  ./services/wayland/cage.nix
   ./services/web-apps/atlassian/confluence.nix
   ./services/web-apps/atlassian/crowd.nix
   ./services/web-apps/atlassian/jira.nix
diff --git a/nixos/modules/services/wayland/cage.nix b/nixos/modules/services/wayland/cage.nix
new file mode 100644
index 000000000000..cac5c042ec16
--- /dev/null
+++ b/nixos/modules/services/wayland/cage.nix
@@ -0,0 +1,99 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.cage;
+in {
+  options.services.cage.enable = mkEnableOption "cage kiosk service";
+
+  options.services.cage.user = mkOption {
+    type = types.str;
+    default = "demo";
+    description = ''
+      User to log-in as.
+    '';
+  };
+
+  options.services.cage.extraArguments = mkOption {
+    type = types.listOf types.str;
+    default = [];
+    defaultText = "[]";
+    description = "Additional command line arguments to pass to Cage.";
+    example = ["-d"];
+  };
+
+  options.services.cage.program = mkOption {
+    type = types.path;
+    default = "${pkgs.xterm}/bin/xterm";
+    description = ''
+      Program to run in cage.
+    '';
+  };
+
+  config = mkIf cfg.enable {
+
+    # The service is partially based off of the one provided in the
+    # cage wiki at
+    # https://github.com/Hjdskes/cage/wiki/Starting-Cage-on-boot-with-systemd.
+    systemd.services."cage-tty1" = {
+      enable = true;
+      after = [
+        "systemd-user-sessions.service"
+        "plymouth-start.service"
+        "plymouth-quit.service"
+        "systemd-logind.service"
+        "getty@tty1.service"
+      ];
+      before = [ "graphical.target" ];
+      wants = [ "dbus.socket" "systemd-logind.service" "plymouth-quit.service"];
+      wantedBy = [ "graphical.target" ];
+      conflicts = [ "getty@tty1.service" ];
+
+      restartIfChanged = false;
+      serviceConfig = {
+        ExecStart = ''
+          ${pkgs.cage}/bin/cage \
+            ${escapeShellArgs cfg.extraArguments} \
+            -- ${cfg.program}
+        '';
+        User = cfg.user;
+
+        ConditionPathExists = "/dev/tty1";
+        IgnoreSIGPIPE = "no";
+
+        # Log this user with utmp, letting it show up with commands 'w' and
+        # 'who'. This is needed since we replace (a)getty.
+        UtmpIdentifier = "%n";
+        UtmpMode = "user";
+        # A virtual terminal is needed.
+        TTYPath = "/dev/tty1";
+        TTYReset = "yes";
+        TTYVHangup = "yes";
+        TTYVTDisallocate = "yes";
+        # Fail to start if not controlling the virtual terminal.
+        StandardInput = "tty-fail";
+        StandardOutput = "syslog";
+        StandardError = "syslog";
+        # Set up a full (custom) user session for the user, required by Cage.
+        PAMName = "cage";
+      };
+    };
+
+    security.pam.services.cage.text = ''
+      auth    required pam_unix.so nullok
+      account required pam_unix.so
+      session required pam_unix.so
+      session required ${pkgs.systemd}/lib/security/pam_systemd.so
+    '';
+
+    hardware.opengl.enable = mkDefault true;
+
+    systemd.targets.graphical.wants = [ "cage-tty1.service" ];
+
+    systemd.defaultUnit = "graphical.target";
+  };
+
+  meta.maintainers = with lib.maintainers; [ matthewbauer flokli ];
+
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 2e547780439a..9858113c8bed 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -39,6 +39,7 @@ in
   buildbot = handleTest ./buildbot.nix {};
   caddy = handleTest ./caddy.nix {};
   cadvisor = handleTestOn ["x86_64-linux"] ./cadvisor.nix {};
+  cage = handleTest ./cage.nix {};
   cassandra = handleTest ./cassandra.nix {};
   ceph-single-node = handleTestOn ["x86_64-linux"] ./ceph-single-node.nix {};
   ceph-multi-node = handleTestOn ["x86_64-linux"] ./ceph-multi-node.nix {};
diff --git a/nixos/tests/cage.nix b/nixos/tests/cage.nix
new file mode 100644
index 000000000000..a6f73e00c066
--- /dev/null
+++ b/nixos/tests/cage.nix
@@ -0,0 +1,43 @@
+import ./make-test-python.nix ({ pkgs, ...} :
+
+{
+  name = "cage";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ matthewbauer flokli ];
+  };
+
+  machine = { ... }:
+
+  {
+    imports = [ ./common/user-account.nix ];
+    services.cage = {
+      enable = true;
+      user = "alice";
+      program = "${pkgs.xterm}/bin/xterm -cm -pc"; # disable color and bold to make OCR easier
+    };
+
+    # this needs a fairly recent kernel, otherwise:
+    #   [backend/drm/util.c:215] Unable to add DRM framebuffer: No such file or directory
+    #   [backend/drm/legacy.c:15] Virtual-1: Failed to set CRTC: No such file or directory
+    #   [backend/drm/util.c:215] Unable to add DRM framebuffer: No such file or directory
+    #   [backend/drm/legacy.c:15] Virtual-1: Failed to set CRTC: No such file or directory
+    #   [backend/drm/drm.c:618] Failed to initialize renderer on connector 'Virtual-1': initial page-flip failed
+    #   [backend/drm/drm.c:701] Failed to initialize renderer for plane
+    boot.kernelPackages = pkgs.linuxPackages_latest;
+
+    virtualisation.memorySize = 1024;
+  };
+
+  enableOCR = true;
+
+  testScript = { nodes, ... }: let
+    user = nodes.machine.config.users.users.alice;
+  in ''
+    with subtest("Wait for cage to boot up"):
+        start_all()
+        machine.wait_for_file("/run/user/${toString user.uid}/wayland-0.lock")
+        machine.wait_until_succeeds("pgrep xterm")
+        machine.wait_for_text("alice@machine")
+        machine.screenshot("screen")
+  '';
+})

From 01e352ac449d51480ca4750f5637bc7ad156ceb4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 14 Feb 2020 12:56:51 +0100
Subject: [PATCH 2091/4636] fetchpatch: Allow using base64-encoded hash

Nix now returns base64-encoded SRI hashes on hash mismatch. Usually,
people copy the returned hashes in TOFU fashion but since base64-encoded
strings can contain slashes, they often broke our use of them for temporary file name.

Escaping them should prevent the failures.
---
 pkgs/build-support/fetchpatch/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix
index 2fb32b2324f2..71c0d4664983 100644
--- a/pkgs/build-support/fetchpatch/default.nix
+++ b/pkgs/build-support/fetchpatch/default.nix
@@ -11,9 +11,13 @@ let
 in
 { stripLen ? 0, extraPrefix ? null, excludes ? [], includes ? [], revert ? false, ... }@args:
 
+let
+  # Make base-64 encoded SRI hash filename-safe using RFC 4648 §5
+  tmpname = lib.replaceStrings [ "+" "/" "=" ] [ "-" "_" "" ] args.sha256;
+in
 fetchurl ({
   postFetch = ''
-    tmpfile="$TMPDIR/${args.sha256}"
+    tmpfile="$TMPDIR/${tmpname}"
     if [ ! -s "$out" ]; then
       echo "error: Fetched patch file '$out' is empty!" 1>&2
       exit 1

From e41580fbc3d502c455e03894637bf7d360e41bc2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Mar 2020 23:28:42 +0000
Subject: [PATCH 2092/4636] python27Packages.azure-mgmt-keyvault: 2.0.0 ->
 2.1.1

---
 .../python-modules/azure-mgmt-keyvault/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
index 26918fbd7db6..43f0394669b7 100644
--- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-keyvault";
-  version = "2.0.0";
+  version = "2.1.1";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "057ii54h8yr7rhfnbl0r29xbsg7mhf031hjffmdv0zf93552kmja";
+    sha256 = "0ga6lzqlinfxlzx1g35a5sv5chjx4im0m4b8i33hqrhmdv9m7ypg";
   };
 
   propagatedBuildInputs = [

From c37b4466c0fca907ba2d62a2e7c85402aa8f4800 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Mar 2020 23:31:15 +0000
Subject: [PATCH 2093/4636] python27Packages.authlib: 0.13 -> 0.14.1

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

diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix
index 579652c3f95e..cbbf64524f57 100644
--- a/pkgs/development/python-modules/authlib/default.nix
+++ b/pkgs/development/python-modules/authlib/default.nix
@@ -8,14 +8,14 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.13";
+  version = "0.14.1";
   pname = "authlib";
 
   src = fetchFromGitHub {
     owner = "lepture";
     repo = "authlib";
     rev = "v${version}";
-    sha256 = "1nv0jbsaqr9qjn7nnl55s42iyx655k7fsj8hs69652lqnfn5y3d5";
+    sha256 = "0z56r5s8z8pfp0p8zrf1chgzan4q25zg0awgc7bgkvkwgxbhzx4m";
   };
 
   propagatedBuildInputs = [ cryptography requests ];
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/lepture/authlib;
+    homepage = "https://github.com/lepture/authlib";
     description = "The ultimate Python library in building OAuth and OpenID Connect servers. JWS,JWE,JWK,JWA,JWT included.";
     maintainers = with maintainers; [ flokli ];
     license = licenses.bsd3;

From fa6c5c3dc76ae4428b9643b3f0ab05bb9049181e Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 19 Feb 2020 14:50:12 +0100
Subject: [PATCH 2094/4636] buildBazelPackage: prime fixed output derivations

All bazel fixed output derivations should be specific to the bazel
version that was used to generate them. There is not guarantee that the
build will still succeed or reproduces (without the cached fixed output)
if the fetch phase wasn't rerun with a different bazel version.

In the past bazel had been bumped but not all those packages that have
fixed outputs from bazel builds. This lead to compiling and somewhat
working TF versions that couldn't be reproduced without the cached fixed
outputs.
---
 pkgs/build-support/build-bazel-package/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix
index 058f42aa8d5a..47c72bf92602 100644
--- a/pkgs/build-support/build-bazel-package/default.nix
+++ b/pkgs/build-support/build-bazel-package/default.nix
@@ -122,6 +122,8 @@ in stdenv.mkDerivation (fBuildAttrs // {
 
       cp -r $bazelOut/external $out
 
+      echo '${bazel.name}' > $out/.nix-bazel-version
+
       runHook postInstall
     '';
 
@@ -143,6 +145,14 @@ in stdenv.mkDerivation (fBuildAttrs // {
 
   preConfigure = ''
     mkdir -p "$bazelOut"
+
+    test "${bazel.name}" = "$(<$deps/.nix-bazel-version)" || {
+      echo "fixed output derivation was built for a different bazel version" >&2
+      echo "     got: $(<$deps/.nix-bazel-version)" >&2
+      echo "expected: ${bazel.name}" >&2
+      exit 1
+    }
+
     cp -r $deps $bazelOut/external
     chmod -R +w $bazelOut
     find $bazelOut -type l | while read symlink; do

From abd312b6b1cd17b6def045ca9007f7d17e984820 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 19 Feb 2020 14:54:44 +0100
Subject: [PATCH 2095/4636] gvisor: update fixed output hash

---
 pkgs/applications/virtualization/gvisor/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix
index 2d99fb3bf573..3d0ae35f5608 100644
--- a/pkgs/applications/virtualization/gvisor/default.nix
+++ b/pkgs/applications/virtualization/gvisor/default.nix
@@ -76,7 +76,7 @@ in buildBazelPackage rec {
       rm -f "$bazelOut"/java.log "$bazelOut"/java.log.*
     '';
 
-    sha256 = "122qk6iv8hd7g2a84y9aqqhij4r0m47vpxzbqhhh6k5livc73qd6";
+    sha256 = "1bn7nhv5pag8fdm8l8nvgg3fzvhpy2yv9yl2slrb16lckxzha3v6";
   };
 
   buildAttrs = {

From 9683826ffa9b17f812d1baff556e2ca2ac4334ad Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 19 Feb 2020 14:58:10 +0100
Subject: [PATCH 2096/4636] bazel-watcher: update fixed output hash

---
 pkgs/development/tools/bazel-watcher/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix
index 62ecc47b17bd..29276fb6bfba 100644
--- a/pkgs/development/tools/bazel-watcher/default.nix
+++ b/pkgs/development/tools/bazel-watcher/default.nix
@@ -62,7 +62,7 @@ buildBazelPackage rec {
       sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
     '';
 
-    sha256 = "0g2y283glx2ykxxqc3vsg520a6s2w5d937wndhgpfajc5yjgiz43";
+    sha256 = "0cmj186n2y1g9kkdhcivmh2qvigvpnbp03m575b7hgsxi1cp3ssj";
   };
 
   buildAttrs = {

From fa7b4d513c56e39e41e92cb73766f7adc341ab9e Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 19 Feb 2020 15:04:34 +0100
Subject: [PATCH 2097/4636] tensorflow-probabilit: update fixed output hash

---
 .../python-modules/tensorflow-probability/default.nix           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix
index b585ab4f81b5..99a3a978a4e7 100644
--- a/pkgs/development/python-modules/tensorflow-probability/default.nix
+++ b/pkgs/development/python-modules/tensorflow-probability/default.nix
@@ -42,7 +42,7 @@ let
     bazelTarget = ":pip_pkg";
 
     fetchAttrs = {
-      sha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5";
+      sha256 = "0135nxxvkmjzpd80r1g9fdkk9h62g0xlvp32g5zgk0hkma5kq0bx";
     };
 
     buildAttrs = {

From 0ff376c03f1459e12ae5e28b7ef298e1311fce36 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 19 Feb 2020 15:09:48 +0100
Subject: [PATCH 2098/4636] bazel-remote: update fixed output hash

---
 .../tools/build-managers/bazel/bazel-remote/default.nix         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
index ffdeb01c2bb1..88dd7f45ab58 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
@@ -64,7 +64,7 @@ buildBazelPackage rec {
       sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
     '';
 
-    sha256 = "1n66hg1w5jv2rc8q4sjlaf0agvxr713aa40mbkhgjv57x9j7bgn0";
+    sha256 = "0lnwc7ya6sjlx6jk5dwws166vli1lzdfc256f9g6dy1fci3sc17y";
   };
 
   buildAttrs = {

From 84b36780723ad90052a87b151c8fafbf1763f56d Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 24 Feb 2020 13:36:39 +0100
Subject: [PATCH 2099/4636] pythonPackages.dm-sonned: update fixed output hash

---
 pkgs/development/python-modules/dm-sonnet/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix
index 4ce61680f03b..603d900b8106 100644
--- a/pkgs/development/python-modules/dm-sonnet/default.nix
+++ b/pkgs/development/python-modules/dm-sonnet/default.nix
@@ -36,7 +36,7 @@ let
     bazelTarget = ":install";
 
     fetchAttrs = {
-      sha256 = "0mxma7jajm42v1hv6agl909xra0azihj588032ivhlmmh403x6wg";
+      sha256 = "0wb2gh9ji8bgq4s9ci9x017dybxqzjhncpw33b1wjksm2yhbkvlz";
     };
 
     bazelFlags = [

From c539f937c539b99e8c8b763b2568b52e39d3e9c4 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 2 Mar 2020 17:22:35 +0100
Subject: [PATCH 2100/4636] pythonPackages.tensorflow-estimator_1_15_1: init at
 1.15.1

TF 1.15 still needs an older version of the tensorflow-estimator
package.
---
 .../tensorflow-estimator/1_15_1.nix           | 27 +++++++++++++++++++
 .../python-modules/tensorflow/default.nix     |  4 +--
 pkgs/top-level/python-packages.nix            |  1 +
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/python-modules/tensorflow-estimator/1_15_1.nix

diff --git a/pkgs/development/python-modules/tensorflow-estimator/1_15_1.nix b/pkgs/development/python-modules/tensorflow-estimator/1_15_1.nix
new file mode 100644
index 000000000000..39c667357c8f
--- /dev/null
+++ b/pkgs/development/python-modules/tensorflow-estimator/1_15_1.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchPypi, buildPythonPackage
+, numpy
+, absl-py
+, mock
+}:
+
+buildPythonPackage rec {
+  pname = "tensorflow-estimator";
+  version = "1.15.1";
+  format = "wheel";
+
+  src = fetchPypi {
+    pname = "tensorflow_estimator";
+    inherit version format;
+    sha256 = "1fc61wmc0w22frs79j2x4g6wnv5g21xc6rix1g4bsvy9qfvvylw8";
+  };
+
+  propagatedBuildInputs = [ mock numpy absl-py ];
+
+  meta = with stdenv.lib; {
+    description = "TensorFlow Estimator is a high-level API that encapsulates model training, evaluation, prediction, and exporting.";
+    homepage = http://tensorflow.org;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ jyp ];
+  };
+}
+
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 9e5acca4749b..5422503173ca 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -7,7 +7,7 @@
 , future, setuptools, wheel, keras-preprocessing, keras-applications, google-pasta
 , functools32
 , opt-einsum
-, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator
+, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator_1_15_1
 # Common deps
 , git, swig, which, binutils, glibcLocales, cython
 # Common libraries
@@ -374,7 +374,7 @@ in buildPythonPackage {
     numpy
     six
     protobuf
-    tensorflow-estimator
+    tensorflow-estimator_1_15_1
     termcolor
     wrapt
     grpcio
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ebe69a1b14c2..90e80890c6f2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6657,6 +6657,7 @@ in {
   zerobin = callPackage ../development/python-modules/zerobin { };
 
   tensorflow-estimator = callPackage ../development/python-modules/tensorflow-estimator { };
+  tensorflow-estimator_1_15_1 = callPackage ../development/python-modules/tensorflow-estimator/1_15_1.nix { };
 
   tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { };
 

From 642bea6cecf5ee1258b2a317f6e56278c7a355b9 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 24 Feb 2020 13:32:36 +0100
Subject: [PATCH 2101/4636] tensorflow: update fixed output hashes

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

diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 5422503173ca..cdf659a74dc7 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -296,10 +296,12 @@ let
       TF_SYSTEM_LIBS = null;
 
       # cudaSupport causes fetch of ncclArchive, resulting in different hashes
+      # FIXME: can't (re)produce this output with current bazel.
+      # FIXME: build log: https://gist.github.com/andir/eff3e9c8eda5b56c8ea84903aed9cc35
       sha256 = if cudaSupport then
-        "1p544yk7jcspgc4qr4amw11ds16c2an5yxvagx5pmwawz0s083pf"
+        "0gyhjvzshgj59mbns8njlfl9qpz4sdg4j0xs2dva0w2nql7cr7im"
       else
-        "1dqbw3k3avqiy9xpgs44l6z65ab5rjjlxwig8z7gcl7fw9h6sbq9";
+        "04jvg3mc2si4xdbszc1vnw1rmf22p7snbjphmnklp7bc39jxkcrz";
     };
 
     buildAttrs = {

From ebaedb5377dcc5e6aca28ef666871e424dd39938 Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Tue, 3 Mar 2020 01:40:57 +0100
Subject: [PATCH 2102/4636] appimage: refactoring extractType2 to avoid use of
 appimage packer

---
 pkgs/build-support/appimage/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index c871df787b7e..f4ccd038f765 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, libarchive, patchelf, zlib, buildFHSUserEnv, writeScript }:
+{ stdenv, libarchive, radare2, jq, buildFHSUserEnv, squashfsTools, writeScript }:
 
 rec {
   # Both extraction functions could be unified, but then
@@ -19,15 +19,16 @@ rec {
     name = "${name}-extracted";
     inherit src;
 
-    nativeBuildInputs = [ patchelf ];
+    nativeBuildInputs = [ radare2 jq squashfsTools ];
     buildCommand = ''
       install $src ./appimage
-      patchelf \
-        --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
-        --replace-needed libz.so.1 ${zlib}/lib/libz.so.1 \
-        ./appimage
 
-      ./appimage --appimage-extract
+      # multiarch offset one-liner using same method as AppImage
+      # see https://gist.github.com/probonopd/a490ba3401b5ef7b881d5e603fa20c93
+      offset=$(r2 ./appimage -nn -Nqc "pfj.elf_header @ 0" |\
+        jq 'map({(.name): .value}) | add | .shoff + (.shnum * .shentsize)')
+
+      unsquashfs -o $offset ./appimage
 
       cp -rv squashfs-root $out
     '';

From 8653b7ab87e2bfa8e7b3296d8a94564a8b7041a2 Mon Sep 17 00:00:00 2001
From: Robert Djubek <envy1988@gmail.com>
Date: Thu, 27 Feb 2020 22:52:14 +0000
Subject: [PATCH 2103/4636] pythonPackages.digital-ocean: 1.13.2 -> 1.15.0

updated to newest version (1.13.2 was released ~2.25 years ago). switched to fetchFromGitHub to enable tests. added kiwi to maintainers. formatted with nixpkgs-fmt
---
 .../python-modules/digitalocean/default.nix   | 50 +++++++++++++++----
 1 file changed, 40 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/digitalocean/default.nix b/pkgs/development/python-modules/digitalocean/default.nix
index e81caa66e5f3..404331a49577 100644
--- a/pkgs/development/python-modules/digitalocean/default.nix
+++ b/pkgs/development/python-modules/digitalocean/default.nix
@@ -1,23 +1,53 @@
-{ stdenv, buildPythonPackage, fetchPypi, requests, jsonpickle }:
+{ buildPythonPackage
+, fetchFromGitHub
+, fetchPypi
+, isPy3k
+, jsonpickle
+, mock
+, pytest
+, pytestCheckHook
+, requests
+, responses
+, stdenv
+}:
 
 buildPythonPackage rec {
   pname = "python-digitalocean";
-  version = "1.13.2";
+  version = "1.15.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0h4drpdsmk0b3rlvg6q6cz11k23w0swj1iddk7xdcw4m7r7c52kw";
+  src = fetchFromGitHub {
+    owner = "koalalorenzo";
+    repo = "python-digitalocean";
+    rev = "v${version}";
+    sha256 = "1pz15mh72i992p63grwzqn2bbp6sm37zcp4f0fy1z7rsargwsbcz";
   };
 
-  propagatedBuildInputs = [ requests jsonpickle ];
+  propagatedBuildInputs = [
+    jsonpickle
+    requests
+  ];
 
-  # Package doesn't distribute tests.
-  doCheck = false;
+  dontUseSetuptoolsCheck = true;
+
+  checkInputs = [
+    pytest
+    pytestCheckHook
+    responses
+  ] ++ stdenv.lib.optionals (!isPy3k) [
+    mock
+  ];
+
+  preCheck = ''
+    cd digitalocean
+  '';
 
   meta = with stdenv.lib; {
     description = "digitalocean.com API to manage Droplets and Images";
-    homepage = https://pypi.python.org/pypi/python-digitalocean;
+    homepage = "https://pypi.python.org/pypi/python-digitalocean";
     license = licenses.lgpl3;
-    maintainers = with maintainers; [ teh ];
+    maintainers = with maintainers; [
+      kiwi
+      teh
+    ];
   };
 }

From 44fb029ff86f91bf2c97205028f30106f6df4c86 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 3 Mar 2020 04:33:39 +0100
Subject: [PATCH 2104/4636] dragonfly-reverb: 2.0.0 -> 3.0.0

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

diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix
index da915f3fc3e4..1ce7115ad85b 100644
--- a/pkgs/applications/audio/dragonfly-reverb/default.nix
+++ b/pkgs/applications/audio/dragonfly-reverb/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dragonfly-reverb";
-  version = "2.0.0";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "michaelwillis";
     repo = "dragonfly-reverb";
     rev = version;
-    sha256 = "1qrbv4kk5v6ynx424h1i54qj0w8v6vpw81b759jawxvzzprpgq72";
+    sha256 = "1z2x33lzpd26dv1p29ca7vy8mjfzkfpin35iq46spwd9k3sqn1ja";
     fetchSubmodules = true;
   };
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/lib/lv2/
     mkdir -p $out/lib/vst/
     cd bin
-    for bin in DragonflyHallReverb DragonflyRoomReverb; do
+    for bin in DragonflyEarlyReflections DragonflyPlateReverb DragonflyHallReverb DragonflyRoomReverb; do
       cp -a $bin        $out/bin/
       cp -a $bin-vst.so $out/lib/vst/
       cp -a $bin.lv2/   $out/lib/lv2/ ;

From 3fe7a65e236e55dfb70ad722b174177426e5cecf Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 25 Feb 2020 08:21:36 +0100
Subject: [PATCH 2105/4636] =?UTF-8?q?ocaml-ng.ocamlPackages=5F4=5F10.ocaml?=
 =?UTF-8?q?:=204.10.0+rc2=20=E2=86=92=204.10.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/compilers/ocaml/4.10.nix | 4 ++--
 pkgs/top-level/ocaml-packages.nix         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ocaml/4.10.nix b/pkgs/development/compilers/ocaml/4.10.nix
index 234b2c446318..955cc3bebe2a 100644
--- a/pkgs/development/compilers/ocaml/4.10.nix
+++ b/pkgs/development/compilers/ocaml/4.10.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
   major_version = "4";
   minor_version = "10";
-  patch_version = "0+rc2";
-  sha256 = "1iv8x9xr4k2s1x1p4rj4fqdh2iwzhgi56lyshvh6gg224i14rkbz";
+  patch_version = "0";
+  sha256 = "1dzy7lbdapcmwn1wg8k87419khi54f8hb6n314bdv7v0gfqlswrh";
 }
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 471810235399..15bd1d616770 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1229,7 +1229,7 @@ in let inherit (pkgs) callPackage; in rec
 
   ocamlPackages_4_10 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.10.nix { });
 
-  ocamlPackages_latest = ocamlPackages_4_09;
+  ocamlPackages_latest = ocamlPackages_4_10;
 
   ocamlPackages = ocamlPackages_4_07;
 }

From 0c855100a27524762117ea91a96ef4c6f3e8d441 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 06:17:13 +0000
Subject: [PATCH 2106/4636] python27Packages.msal: 1.0.0 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix
index 6f2566c2c1c0..10e62f5cc58f 100644
--- a/pkgs/development/python-modules/msal/default.nix
+++ b/pkgs/development/python-modules/msal/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "msal";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0h33wayvakggr684spdyhiqvrwraavcbk3phmcbavb3zqxd3zgpc";
+    sha256 = "16l2bmmm5pdlb61av5748mhy0lg9r965lmyn69is6mhsyr9zi38s";
   };
 
   propagatedBuildInputs = [

From 3c7eb6f1be3bcda224fb9b387d1c15136a8cdc02 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 3 Mar 2020 16:25:05 +1000
Subject: [PATCH 2107/4636] kepubify: 3.0.0 -> 3.1.0

https://github.com/geek1011/kepubify/releases/tag/v3.1.0
---
 pkgs/tools/misc/kepubify/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix
index faa5e9d85e81..207492a89449 100644
--- a/pkgs/tools/misc/kepubify/default.nix
+++ b/pkgs/tools/misc/kepubify/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "kepubify";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "geek1011";
     repo = pname;
     rev = "v${version}";
-    sha256 = "168n4xbhjrzwzlhvakmsd0nwqjwgibphkwzq5hcxrk9ywpqpxjad";
+    sha256 = "17zhfq1nfdas4k5yzyr82zs3r3mm4n8f907ih1ckx081hy4g7a2p";
   };
 
   modSha256 = "18q9ywsjc2v1bsmw7307dpd4v5m7v80hbhijkfrkcyqzj34jrq43";

From 2a019cc48c78814a37873190266fab1cd0d59b4c Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Mar 2020 13:42:33 -0800
Subject: [PATCH 2108/4636] python38: 3.8.1 -> 3.8.2

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

diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 4166fbb7ccf5..1ddd7cd366fa 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -105,10 +105,10 @@ in {
     sourceVersion = {
       major = "3";
       minor = "8";
-      patch = "1";
+      patch = "2";
       suffix = "";
     };
-    sha256 = "1s4lwn5vzsajlc88m6hkghsvnjw4d00l2dsgng0m2w6vyqbl32bm";
+    sha256 = "1ps5v323cp5czfshqjmbsqw7nvrdpcbk06f62jbzaqik4gfffii6";
     inherit (darwin) configd;
     inherit passthruFun;
   };

From fe4580359e6402fcdfe75dc4ca3e7d4de846ec33 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Mar 2020 13:44:08 -0800
Subject: [PATCH 2109/4636] python39: 3.9.0.a3 -> 3.9.0.a4

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

diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 1ddd7cd366fa..3cc0eecb1b08 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -119,9 +119,9 @@ in {
       major = "3";
       minor = "9";
       patch = "0";
-      suffix = "a3";
+      suffix = "a4";
     };
-    sha256 = "09l68jyfhhass3cqyqyp2cv3a3i86qs0x736isidmpbrbxsincva";
+    sha256 = "0qzy0wlq0izxk8ii28gy70v138g6xnz9sgsxpyayls2j04l6b5vz";
     inherit (darwin) configd;
     inherit passthruFun;
   };

From 2148a154c627845194217bb9886d24268052d9b4 Mon Sep 17 00:00:00 2001
From: Aiken Cairncross <acairncross@gmail.com>
Date: Mon, 2 Mar 2020 22:18:08 +0000
Subject: [PATCH 2110/4636] python3Packages.monosat: Fix Python 3.8 build

---
 .../science/logic/monosat/default.nix         | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix
index c0512b744884..d7718f71b727 100644
--- a/pkgs/applications/science/logic/monosat/default.nix
+++ b/pkgs/applications/science/logic/monosat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, zlib, gmp, jdk8,
+{ stdenv, fetchpatch, fetchFromGitHub, cmake, zlib, gmp, jdk8,
   # The JDK we use on Darwin currenly makes extensive use of rpaths which are
   # annoying and break the python library, so let's not bother for now
   includeJava ? !stdenv.hostPlatform.isDarwin, includeGplCode ? true }:
@@ -20,9 +20,17 @@ let
     inherit rev sha256;
   };
 
+  patches = [
+    # Python 3.8 compatibility
+    (fetchpatch {
+      url = https://github.com/sambayless/monosat/commit/a5079711d0df0451f9840f3a41248e56dbb03967.patch;
+      sha256 = "0fwsk67798dns7izdry19r7r3nmym4cbgxfpbjbnx4b4mlak65j8";
+    })
+  ];
+
   core = stdenv.mkDerivation {
     name = "${pname}-${version}";
-    inherit src;
+    inherit src patches;
     buildInputs = [ cmake zlib gmp jdk8 ];
 
     cmakeFlags = [
@@ -48,20 +56,22 @@ let
   };
 
   python = { buildPythonPackage, cython }: buildPythonPackage {
-    inherit pname version src;
-
-    # The top-level "source" is what fetchFromGitHub gives us. The rest is inside the repo
-    sourceRoot = "source/src/monosat/api/python/";
+    inherit pname version src patches;
 
     propagatedBuildInputs = [ core cython ];
 
     # This tells setup.py to use cython, which should produce faster bindings
     MONOSAT_CYTHON = true;
 
+    # After patching src, move to where the actually relevant source is. This could just be made
+    # the sourceRoot if it weren't for the patch.
+    postPatch = ''
+      cd src/monosat/api/python
+    '' +
     # The relative paths here don't make sense for our Nix build
     # TODO: do we want to just reference the core monosat library rather than copying the
     # shared lib? The current setup.py copies the .dylib/.so...
-    postPatch = ''
+    ''
       substituteInPlace setup.py \
         --replace 'library_dir = "../../../../"' 'library_dir = "${core}/lib/"'
     '';

From fe898d5f76131477e6fe5bdeda90d07bac682751 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Mar 2020 15:12:42 +0000
Subject: [PATCH 2111/4636] modemmanager: 1.12.4 -> 1.12.6

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

diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix
index 70107d2c74da..e9d925fb930c 100644
--- a/pkgs/tools/networking/modem-manager/default.nix
+++ b/pkgs/tools/networking/modem-manager/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   pname = "modem-manager";
-  version = "1.12.4";
+  version = "1.12.6";
 
   package = "ModemManager";
   src = fetchurl {
     url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz";
-    sha256 = "0nx9b6wfz2r29gb3wgsi5vflycibfhnij5wvc068s6hcbrsn2bc5";
+    sha256 = "0k32rjh06p3q9yq054gxya6c7n39bilhi4s23p2hb02iwlz3bcrf";
   };
 
   nativeBuildInputs = [ vala gobject-introspection gettext pkgconfig ];
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "WWAN modem manager, part of NetworkManager";
-    homepage = https://www.freedesktop.org/wiki/Software/ModemManager/;
+    homepage = "https://www.freedesktop.org/wiki/Software/ModemManager/";
     license = licenses.gpl2Plus;
     maintainers = [ ];
     platforms = platforms.linux;

From 25057960cec97234e3a6cabbc96c9fcb0f18b933 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Mon, 2 Mar 2020 22:24:40 -0800
Subject: [PATCH 2112/4636] howard-hinnant-date: allow access to zoneinfo

This fixes the situtation where, if `/usr/share/zoneinfo` was
inaccessible/didn't otherwise exist, `howard-hinnant-date` would
download and drop a `~/Downloads/tzdata` directory containing some
timezone information from IANA [1]. To avoid this, we make use of the
`tzdata`'s `zoneinfo`, preventing the dropping of random directories and
files.

[1] https://data.iana.org/time-zones/releases/tzdata2019c.tar.gz
---
 .../libraries/howard-hinnant-date/default.nix       | 10 +++++++++-
 .../make-zoneinfo-available.diff                    | 13 +++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/howard-hinnant-date/make-zoneinfo-available.diff

diff --git a/pkgs/development/libraries/howard-hinnant-date/default.nix b/pkgs/development/libraries/howard-hinnant-date/default.nix
index 30e5c92b8f09..185af3dff319 100644
--- a/pkgs/development/libraries/howard-hinnant-date/default.nix
+++ b/pkgs/development/libraries/howard-hinnant-date/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, curl, fetchpatch }:
+{ stdenv, fetchFromGitHub, cmake, curl, tzdata, fetchpatch, substituteAll }:
 
 stdenv.mkDerivation rec {
   pname = "howard-hinnant-date-unstable";
@@ -16,6 +16,13 @@ stdenv.mkDerivation rec {
       url = "https://github.com/HowardHinnant/date/commit/e56b2dce7e89a92e1b9b35caa13b3e938c4cedea.patch";
       sha256 = "0m3qbhq7kmm9qa3jm6d2px7c1dxdj5k9lffgdvqnrwmhxwj1p9n2";
     })
+    # Without this patch, this library will drop a `tzdata` directory into
+    # `~/Downloads` if it cannot find `/usr/share/zoneinfo`. Make the path it
+    # searches for `zoneinfo` be the one from the `tzdata` package.
+    (substituteAll {
+      src = ./make-zoneinfo-available.diff;
+      inherit tzdata;
+    })
   ];
 
   nativeBuildInputs = [ cmake ];
@@ -24,6 +31,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DBUILD_TZ_LIB=true"
     "-DBUILD_SHARED_LIBS=true"
+    "-DUSE_SYSTEM_TZ_DB=true"
   ];
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/howard-hinnant-date/make-zoneinfo-available.diff b/pkgs/development/libraries/howard-hinnant-date/make-zoneinfo-available.diff
new file mode 100644
index 000000000000..f9e69ff38cbb
--- /dev/null
+++ b/pkgs/development/libraries/howard-hinnant-date/make-zoneinfo-available.diff
@@ -0,0 +1,13 @@
+diff --git a/src/tz.cpp b/src/tz.cpp
+index 68436c3..2bfe19e 100644
+--- a/src/tz.cpp
++++ b/src/tz.cpp
+@@ -349,7 +349,7 @@ discover_tz_dir()
+     struct stat sb;
+     using namespace std;
+ #  ifndef __APPLE__
+-    CONSTDATA auto tz_dir_default = "/usr/share/zoneinfo";
++    CONSTDATA auto tz_dir_default = "@tzdata@/share/zoneinfo";
+     CONSTDATA auto tz_dir_buildroot = "/usr/share/zoneinfo/uclibc";
+ 
+     // Check special path which is valid for buildroot with uclibc builds

From 4c23487951906a4235fefa85192340af62a67483 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 06:36:33 +0000
Subject: [PATCH 2113/4636] python27Packages.phonenumbers: 8.11.3 -> 8.11.4

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

diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index 6b219ed0dd17..ff64f9ca82df 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,16 +2,16 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.11.3";
+  version = "8.11.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1rh0860ml00kw5c4b4r31wz5s8cmd5mpxx5slypdgljk4ralyg6p";
+    sha256 = "13hfcw89kppm8s2qx0s5bafzxjc0qhm9sxmpf6yqvshz2fn82pk8";
   };
 
   meta = {
     description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers";
-    homepage    = https://github.com/daviddrysdale/python-phonenumbers;
+    homepage    = "https://github.com/daviddrysdale/python-phonenumbers";
     license     = stdenv.lib.licenses.asl20;
     maintainers = with stdenv.lib.maintainers; [ fadenb ];
   };

From c27a87e288e70987abae07b619646729abe9dec6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 06:26:53 +0000
Subject: [PATCH 2114/4636] python27Packages.identify: 1.4.10 -> 1.4.11

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

diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix
index 86d1617852b8..7102995cdf24 100644
--- a/pkgs/development/python-modules/identify/default.nix
+++ b/pkgs/development/python-modules/identify/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "identify";
-  version = "1.4.10";
+  version = "1.4.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0q1k22n8w7mmab1vh2r3bsqbxkxbb2zka548rcnn2rd9yg8rxnca";
+    sha256 = "15kbcgqz6zf9qqvyw3pwy611knv1lyaqmc213ivmqciq3zifn96q";
   };
 
   # Tests not included in PyPI tarball
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "File identification library for Python";
-    homepage = https://github.com/chriskuehl/identify;
+    homepage = "https://github.com/chriskuehl/identify";
     license = licenses.mit;
   };
 }

From d07158447e11ab7a4e42cde78a5dc165020541db Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 06:14:43 +0000
Subject: [PATCH 2115/4636] python27Packages.localzone: 0.9.5 -> 0.9.6

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

diff --git a/pkgs/development/python-modules/localzone/default.nix b/pkgs/development/python-modules/localzone/default.nix
index 9c968fa37229..3827c2972058 100644
--- a/pkgs/development/python-modules/localzone/default.nix
+++ b/pkgs/development/python-modules/localzone/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "localzone";
-  version = "0.9.5";
+  version = "0.9.6";
 
   src = fetchFromGitHub {
     owner = "ags-slc";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1zziqyhbg8vg901b4hjzzab0paag5cng48vk9xf1hchxk5naf58n";
+    sha256 = "154l7qglsm4jrhqddvlas8cgl9qm2z4dzihv05jmsyqjikcmfwk8";
   };
 
   propagatedBuildInputs = [ dnspython sphinx ];
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "A simple DNS library for managing zone files";
-    homepage = https://localzone.iomaestro.com;
+    homepage = "https://localzone.iomaestro.com";
     license = licenses.bsd3;
     maintainers = with maintainers; [ flyfloh ];
   };

From 6e686dd6817b3f79517616a780b03d83e64dc47d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 07:23:48 +0000
Subject: [PATCH 2116/4636] python27Packages.ipdb: 0.12.3 -> 0.13.0

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

diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix
index 49b0991f1fd0..5de9e25bcf1f 100644
--- a/pkgs/development/python-modules/ipdb/default.nix
+++ b/pkgs/development/python-modules/ipdb/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "ipdb";
-  version = "0.12.3";
+  version = "0.13.0";
   disabled = isPyPy;  # setupterm: could not find terminfo database
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1zbj7xjhkr44grfyv1hb7ff5n1218f9jjabgzica29vh7c74m6jx";
+    sha256 = "0nbs9m2pqg4j10m7c31vyb8h7wy29d9s8kiv0k2igbr821k1y3xr";
   };
 
   propagatedBuildInputs = [ ipython ];
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/gotcha/ipdb;
+    homepage = "https://github.com/gotcha/ipdb";
     description = "IPython-enabled pdb";
     license = licenses.bsd0;
     maintainers = [ maintainers.costrouc ];

From 774324ae76e0790b0dd9dd91bb67588f7f8d5d4b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Mar 2020 21:59:39 +0000
Subject: [PATCH 2117/4636] plantuml: 1.2020.1 -> 1.2020.2

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

diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index 34a6cb03d8bb..0e9df5350f90 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre, graphviz }:
 
 stdenv.mkDerivation rec {
-  version = "1.2020.1";
+  version = "1.2020.2";
   pname = "plantuml";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
-    sha256 = "02a55na86561fnxf6pk0cpg13mx8qr7pvigyp65rqks0f9ygj9ga";
+    sha256 = "1wvlhy76h1bxwjj8r48ixypch1bj9m9721rbawayj8v0hpyr1an4";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Draw UML diagrams using a simple and human readable text description";
-    homepage = http://plantuml.sourceforge.net/;
+    homepage = "http://plantuml.sourceforge.net/";
     # "plantuml -license" says GPLv3 or later
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ bjornfor ];

From 24c765c744ba856700db92ab94ef9c695d73f95f Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 3 Mar 2020 08:36:14 +0000
Subject: [PATCH 2118/4636] clickhouse: fix rpath

ClickHouse sets LINKER_NAME to lld which is not yet wrapped with ld-wrapper.sh
and the results lack rpath needed to use the programs and libraries.
---
 pkgs/servers/clickhouse/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index 90cdfc3e7051..31c05f3d0bb3 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DENABLE_TESTS=OFF"
+    "-DLINKER_NAME=gold" # lld is not wrapped with ld-wrapper.sh, does not set rpath.
     "-DUNBUNDLED=ON"
     "-DUSE_STATIC_LIBRARIES=OFF"
   ];

From 1b5ae92f0f93dba70dcde70443101d227ee21091 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 3 Mar 2020 09:50:50 +0100
Subject: [PATCH 2119/4636] timewarrior: Fix homepage

Thanks to repology.org

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/applications/misc/timewarrior/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix
index a8b86e71cb13..1a21bb43868f 100644
--- a/pkgs/applications/misc/timewarrior/default.nix
+++ b/pkgs/applications/misc/timewarrior/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A command-line time tracker";
-    homepage = https://taskwarrior.org/docs/timewarrior;
+    homepage = "https://timewarrior.net";
     license = licenses.mit;
     maintainers = with maintainers; [ matthiasbeyer mrVanDalo ];
     platforms = platforms.linux ++ platforms.darwin;

From 0da63e8af275bd9be614ba9227a8bbe3fca537a2 Mon Sep 17 00:00:00 2001
From: ccellado <44584960+ccellado@users.noreply.github.com>
Date: Tue, 3 Mar 2020 12:02:04 +0300
Subject: [PATCH 2120/4636] deadbeef: 1.8.0 -> 1.8.2

---
 pkgs/applications/audio/deadbeef/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix
index a6ca5b3639da..2df6b9931cfc 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@@ -59,22 +59,15 @@ assert remoteSupport -> curl != null;
 
 stdenv.mkDerivation rec {
   pname = "deadbeef";
-  version = "1.8.0";
+  version = "1.8.2";
 
   src = fetchFromGitHub {
     owner = "DeaDBeeF-Player";
     repo = "deadbeef";
     rev = version;
-    sha256 = "126i5qlkpv7pvi1mmc9y0jhqs6jjspsj7j615n2ddvsb2jsps81c";
+    sha256 = "016wwnh5jqdcfxn1ff6in5dz73c3gdhh3fva8inq7sc3vzdz5khj";
   };
 
-  patches = [
-    # Fix broken symbol name
-    # https://github.com/NixOS/nixpkgs/pull/59187#issuecomment-480977993
-    # will be fixed in deadbeef 1.8.1
-    ./fix-wildmidi.patch
-  ];
-
   buildInputs = with stdenv.lib; [ jansson ]
     ++ optional gtk2Support gtk2
     ++ optionals gtk3Support [ gtk3 gsettings-desktop-schemas ]

From 26d0577ef2313bc06a2fb9b6fd9a4dec6a73bc64 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 3 Mar 2020 04:20:00 -0500
Subject: [PATCH 2121/4636] pythonPackages.protego: init at 0.1.16

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

diff --git a/pkgs/development/python-modules/protego/default.nix b/pkgs/development/python-modules/protego/default.nix
new file mode 100644
index 000000000000..ad7e4aa4af6e
--- /dev/null
+++ b/pkgs/development/python-modules/protego/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, six
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "Protego";
+  version = "0.1.16";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "a682771bc7b51b2ff41466460896c1a5a653f9a1e71639ef365a72e66d8734b4";
+  };
+  propagatedBuildInputs = [ six ];
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    pytest tests
+  '';
+
+  meta = with lib; {
+    description = "A pure-Python robots.txt parser with support for modern conventions";
+    homepage = "https://github.com/scrapy/protego";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.marsam ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c812c7cd9f8b..e8b03ae029d6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5189,6 +5189,8 @@ in {
 
   progressbar33 = callPackage ../development/python-modules/progressbar33 { };
 
+  protego = callPackage ../development/python-modules/protego {};
+
   ldap = callPackage ../development/python-modules/ldap {
     inherit (pkgs) openldap cyrus_sasl;
   };

From 5286afc72bcd676b925fabff103eb69980801873 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 3 Mar 2020 04:20:00 -0500
Subject: [PATCH 2122/4636] pythonPackages.sybil: 1.0.9 -> 1.2.2

---
 .../python-modules/sybil/default.nix          | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix
index 8b1677a7b843..cf30b4546cdc 100644
--- a/pkgs/development/python-modules/sybil/default.nix
+++ b/pkgs/development/python-modules/sybil/default.nix
@@ -1,31 +1,28 @@
-{ stdenv, buildPythonApplication, fetchPypi, fetchpatch
-, pytest, nose }:
+{ lib
+, buildPythonApplication
+, fetchPypi
+, pytest
+, nose
+}:
 
 buildPythonApplication rec {
-  pname   = "sybil";
-  version = "1.0.9";
+  pname = "sybil";
+  version = "1.2.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "41d2f1dba8fd1d8ead5e9b1220b590fab8b0d1ca01d43da08555b1fb08d4d8e8";
+    sha256 = "dd84e68facfcb778298ef50a4d7446d4d9092e9d8596012b12bcb82858fd10e1";
   };
 
-  patches = [
-    (fetchpatch {
-      url = https://github.com/cjw296/sybil/commit/6461d8156cfb68bd073ec613a5a516916e97e549.patch;
-      sha256 = "0aqny0i7l6g6d7vr025b90zz8wzszqdbmi05mp67dxw5xqjqvxj2";
-    })
-  ];
-
   checkInputs = [ pytest nose ];
 
   checkPhase = ''
     py.test tests
   '';
 
-  meta = with stdenv.lib; {
-    description = "Automated testing for the examples in your documentation.";
-    homepage    = https://github.com/cjw296/sybil/;
-    license     = licenses.mit;
+  meta = with lib; {
+    description = "Automated testing for the examples in your documentation";
+    homepage = "https://github.com/cjw296/sybil";
+    license = licenses.mit;
   };
 }

From d112ef306f0c3d1e3656a684dc2c99d8a9ec902d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 3 Mar 2020 04:21:00 -0500
Subject: [PATCH 2123/4636] pythonPackages.pytest-twisted: init at 1.12

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

diff --git a/pkgs/development/python-modules/pytest-twisted/default.nix b/pkgs/development/python-modules/pytest-twisted/default.nix
new file mode 100644
index 000000000000..6bdf1089d5d5
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-twisted/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, greenlet
+, pytest
+, decorator
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-twisted";
+  version = "1.12";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "bb9af117c5c6063d9ef20ffdf2fa297caaf57de5a687e4d3607db7b0a6f74fea";
+  };
+
+  propagatedBuildInputs = [ greenlet pytest decorator ];
+
+  meta = with lib; {
+    description = "A twisted plugin for py.test";
+    homepage = "https://github.com/pytest-dev/pytest-twisted";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.marsam ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e8b03ae029d6..3ade3d2e68b4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1290,6 +1290,8 @@ in {
 
   pytest-tornado = callPackage ../development/python-modules/pytest-tornado { };
 
+  pytest-twisted = callPackage ../development/python-modules/pytest-twisted { };
+
   pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { };
 
   pytest-xvfb = callPackage ../development/python-modules/pytest-xvfb { };

From fcc818acd547f044d3dc9fc5569324082f85c508 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 3 Mar 2020 04:22:00 -0500
Subject: [PATCH 2124/4636] python3Packages.scrapy: 1.8.0 -> 2.0.1

---
 .../python-modules/scrapy/default.nix         | 67 ++++++++++++++++---
 1 file changed, 57 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix
index 8fee4b6631ab..05c0c43c15c7 100644
--- a/pkgs/development/python-modules/scrapy/default.nix
+++ b/pkgs/development/python-modules/scrapy/default.nix
@@ -1,13 +1,60 @@
-{ stdenv, buildPythonPackage, fetchPypi, glibcLocales, mock, pytest, botocore,
-  testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl,
-  service-identity, parsel, pydispatcher, cssselect, lib }:
+{ stdenv
+, buildPythonPackage
+, isPy27
+, fetchPypi
+, glibcLocales
+, pytest
+, testfixtures
+, pillow
+, twisted
+, cryptography
+, w3lib
+, lxml
+, queuelib
+, pyopenssl
+, service-identity
+, parsel
+, pydispatcher
+, cssselect
+, zope_interface
+, protego
+, lib
+, jmespath
+, sybil
+, pytest-twisted
+, botocore
+}:
+
 buildPythonPackage rec {
-  version = "1.8.0";
+  version = "2.0.1";
   pname = "Scrapy";
 
-  checkInputs = [ glibcLocales mock pytest botocore testfixtures pillow ];
+  disabled = isPy27;
+
+  checkInputs = [
+    glibcLocales
+    jmespath
+    pytest
+    sybil
+    testfixtures
+    pillow
+    pytest-twisted
+    botocore
+  ];
+
   propagatedBuildInputs = [
-    six twisted w3lib lxml cssselect queuelib pyopenssl service-identity parsel pydispatcher
+    twisted
+    cryptography
+    cssselect
+    lxml
+    parsel
+    pydispatcher
+    pyopenssl
+    queuelib
+    service-identity
+    w3lib
+    zope_interface
+    protego
   ];
 
   patches = [
@@ -18,20 +65,20 @@ buildPythonPackage rec {
     ./permissions-fix.patch
   ];
 
-  LC_ALL="en_US.UTF-8";
+  LC_ALL = "en_US.UTF-8";
 
   # Disable doctest plugin—enabled in the shipped pytest.ini—because it causes pytest to hang
   # Ignore proxy tests because requires mitmproxy
   # Ignore test_retry_dns_error because tries to resolve an invalid dns and weirdly fails with "Reactor was unclean"
   # Ignore xml encoding test on darwin because lxml can't find encodings https://bugs.launchpad.net/lxml/+bug/707396
   checkPhase = ''
-    substituteInPlace pytest.ini --replace "addopts = --doctest-modules" "addopts ="
+    substituteInPlace pytest.ini --replace "--doctest-modules" ""
     pytest --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py --deselect tests/test_crawl.py::CrawlTestCase::test_retry_dns_error ${lib.optionalString stdenv.isDarwin "--deselect tests/test_utils_iterators.py::LxmlXmliterTestCase::test_xmliter_encoding"}
   '';
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fe06576f9a4971de9dc0175c60fd92561e8275f2bad585c1cb5d65c5181b2db0";
+    sha256 = "85581a01f4160a103ca9906ffa4e44474f4ecd1685f0934728892c58ebf111f6";
   };
 
   postInstall = ''
@@ -42,7 +89,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages";
-    homepage = https://scrapy.org/;
+    homepage = "https://scrapy.org/";
     license = licenses.bsd3;
     maintainers = with maintainers; [ drewkett marsam ];
     platforms = platforms.unix;

From a8e06a8e899394083e58585adeef59d88a0852a7 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 3 Mar 2020 09:18:33 +0000
Subject: [PATCH 2125/4636] clickhouse: link with lld

lld buildInput is still needed for the library.

Related: #24744
---
 pkgs/servers/clickhouse/default.nix | 5 ++---
 pkgs/top-level/all-packages.nix     | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index 31c05f3d0bb3..40760093462a 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libtool, ninja
+{ stdenv, fetchFromGitHub, cmake, libtool, lldClang, ninja
 , boost, brotli, capnproto, cctz, clang-unwrapped, double-conversion, gperftools
 , icu, jemalloc, libcpuid, libxml2, lld, llvm, lz4, libmysqlclient, openssl
 , poco, protobuf, rapidjson, re2, rdkafka, readline, sparsehash, unixODBC
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ck6kcifj7y4i2j1jj1a9vf5nfpp9mxk5x8y8557zp9yayjm9qyr";
   };
 
-  nativeBuildInputs = [ cmake libtool ninja ];
+  nativeBuildInputs = [ cmake libtool lldClang.bintools ninja ];
   buildInputs = [
     boost brotli capnproto cctz clang-unwrapped double-conversion gperftools
     icu jemalloc libcpuid libxml2 lld llvm lz4 libmysqlclient openssl
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DENABLE_TESTS=OFF"
-    "-DLINKER_NAME=gold" # lld is not wrapped with ld-wrapper.sh, does not set rpath.
     "-DUNBUNDLED=ON"
     "-DUSE_STATIC_LIBRARIES=OFF"
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 636cffaeec5e..34367904190b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15254,7 +15254,7 @@ in
 
   clickhouse = callPackage ../servers/clickhouse {
     # clickhouse doesn't build on llvm8.
-    inherit (llvmPackages_7) clang-unwrapped lld llvm;
+    inherit (llvmPackages_7) clang-unwrapped lld lldClang llvm;
   };
 
   couchdb = callPackage ../servers/http/couchdb {

From 017926a8b3e8a3daa49313ec5520cce7fc20569e Mon Sep 17 00:00:00 2001
From: "Ian M. Jones" <ian@ianmjones.com>
Date: Mon, 2 Mar 2020 19:54:35 +0000
Subject: [PATCH 2126/4636] snippetpixie: 1.2.2 -> 1.3.1

---
 pkgs/tools/text/snippetpixie/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/tools/text/snippetpixie/default.nix
index 585c183a81cb..e273105a14a5 100644
--- a/pkgs/tools/text/snippetpixie/default.nix
+++ b/pkgs/tools/text/snippetpixie/default.nix
@@ -18,17 +18,19 @@
 , ibus
 , json-glib
 , pantheon
+, libwnck3
+, xorg
 }:
 
 stdenv.mkDerivation rec {
   pname = "snippetpixie";
-  version = "1.2.2";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "bytepixie";
     repo = pname;
     rev = version;
-    sha256 = "096xj7n1ypr8ss8mbwd1hyypvmzw5lc0hjlj2d1x8hbjljldfd13";
+    sha256 = "0cnx7snw3h7p77fhihvqxb6bgg4s2ffvjr8nbymb4bnqlg2a7v97";
   };
 
   nativeBuildInputs = [
@@ -52,6 +54,8 @@ stdenv.mkDerivation rec {
     dbus
     ibus
     json-glib
+    libwnck3
+    xorg.libXtst
     pantheon.granite
     pantheon.elementary-gtk-theme
     pantheon.elementary-icon-theme

From 6eb3154ff6b18eaf6c769d8c981c25a59a306e09 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 3 Mar 2020 10:34:20 +0100
Subject: [PATCH 2127/4636] gsasl: export LOCALDOMAIN before running tests

Recently kerberos added a code path that relies ont he local domain part
to be available. See [hydra] for the recent build failure and [github]
for a brief analysis of the error.

[hydra] https://hydra.nixos.org/build/113717403
[github]:
  - https://github.com/NixOS/nixpkgs/pull/81531#issuecomment-593840860
  - https://github.com/NixOS/nixpkgs/pull/81531#issuecomment-593853565
---
 pkgs/development/libraries/gsasl/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix
index 899aa116b2ca..c5e1deea6e12 100644
--- a/pkgs/development/libraries/gsasl/default.nix
+++ b/pkgs/development/libraries/gsasl/default.nix
@@ -12,16 +12,19 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-gssapi-impl=mit" ];
 
+  preCheck = ''
+    export LOCALDOMAIN="dummydomain"
+  '';
   doCheck = !stdenv.hostPlatform.isDarwin;
 
   meta = {
     description = "GNU SASL, Simple Authentication and Security Layer library";
 
     longDescription =
-      '' GNU SASL is a library that implements the IETF Simple 
-         Authentication and Security Layer (SASL) framework and 
-         some SASL mechanisms. SASL is used in network servers 
-         (e.g. IMAP, SMTP, etc.) to authenticate peers. 
+      '' GNU SASL is a library that implements the IETF Simple
+         Authentication and Security Layer (SASL) framework and
+         some SASL mechanisms. SASL is used in network servers
+         (e.g. IMAP, SMTP, etc.) to authenticate peers.
        '';
 
     homepage = https://www.gnu.org/software/gsasl/;

From fad94709ce8c11c86e00eb56b7b12e43edee07a8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 03:15:19 +0000
Subject: [PATCH 2128/4636] python27Packages.bayesian-optimization: 1.0.1 ->
 1.1.0

---
 .../python-modules/bayesian-optimization/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bayesian-optimization/default.nix b/pkgs/development/python-modules/bayesian-optimization/default.nix
index 1f1d33fe329e..990d471bc6b0 100644
--- a/pkgs/development/python-modules/bayesian-optimization/default.nix
+++ b/pkgs/development/python-modules/bayesian-optimization/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "bayesian-optimization";
-  version = "1.0.1";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "fmfn";
     repo = "BayesianOptimization";
     rev = "v${version}";
-    sha256 = "07sqymg6k5512k7wq4kbp7rsrkb4g90n0ck1f0b9s6glyfpcy4pq";
+    sha256 = "0ylip9xdi0cjzmdayxxpazdfaa9dl0sdcl2qsfn3p0cipj59bdvd";
   };
 
   propagatedBuildInputs = [

From b35abf2478646e5871b9669f7198f7eb1d0a5e3a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 09:05:42 +0000
Subject: [PATCH 2129/4636] python27Packages.jupytext: 1.3.2 -> 1.3.4

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

diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix
index 41eb2b58ca88..a77a1a576b47 100644
--- a/pkgs/development/python-modules/jupytext/default.nix
+++ b/pkgs/development/python-modules/jupytext/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "jupytext";
-  version = "1.3.2";
+  version = "1.3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "081c8dbql93bpl72pzg0z8vg482r3f350490mhqn965s10bz8say";
+    sha256 = "0jijf4a3iaskzi6frjwhd8drh7brn94r1zl7gni6d0dzr296mm93";
   };
 
   propagatedBuildInputs = [
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Jupyter notebooks as Markdown documents, Julia, Python or R scripts";
-    homepage = https://github.com/mwouts/jupytext;
+    homepage = "https://github.com/mwouts/jupytext";
     license = licenses.mit;
     maintainers = with maintainers; [ timokau ];
   };

From 478bf130e2b4a615ea272c49f754511c6d745335 Mon Sep 17 00:00:00 2001
From: David Wood <david.wood@codeplay.com>
Date: Tue, 3 Mar 2020 09:50:10 +0000
Subject: [PATCH 2130/4636] pastel: 0.7.0 -> 0.7.1

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

diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix
index 4847f06ebb82..90b42ba72b7f 100644
--- a/pkgs/applications/misc/pastel/default.nix
+++ b/pkgs/applications/misc/pastel/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pastel";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1fh0l64bvpbgm1725qmyq3042pglr8wz3w1azjv6lml9ivrm4b0k";
+    sha256 = "1xrg25w175m2iz7q9v7c05a0p0v5rr71vd4m3v6p0lqvij3sih4s";
   };
 
-  cargoSha256 = "0q7p66r6hwqaalwm9fd2bshadlynhjf3pzd6rnamr07mknyfzh5s";
+  cargoSha256 = "17rw9wp9mfv38h0azdjwl60bxdknb5q84ia0a2r1vi91gz6275cs";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 

From eebd6fe75a2306469ed5554975b11246f3ce3e56 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Tue, 3 Mar 2020 10:54:23 +0100
Subject: [PATCH 2131/4636] octopus: 9.1 -> 9.2

---
 pkgs/applications/science/chemistry/octopus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix
index d37f8d17336e..a5abbe2d1de6 100644
--- a/pkgs/applications/science/chemistry/octopus/default.nix
+++ b/pkgs/applications/science/chemistry/octopus/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "octopus";
-  version = "9.1";
+  version = "9.2";
 
   src = fetchFromGitLab {
     owner = "octopus-code";
     repo = "octopus";
     rev = version;
-    sha256 = "1l5fqgllk7rij16q7a3la7qq6isy8a5n37vk400qcscw1v32s90h";
+    sha256 = "083z51sjv70asr04rv53wb9gf4396nblq1zl22qw7jdr28hji4is";
   };
 
   nativeBuildInputs = [ perl procps autoreconfHook ];

From 29a7464115ea9e78fe25cba1957085f98c8b6178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 3 Mar 2020 11:16:53 +0100
Subject: [PATCH 2132/4636] knot-dns: 2.9.2 -> 2.9.3

https://gitlab.labs.nic.cz/knot/knot-dns/-/tags/v2.9.3
---
 pkgs/servers/dns/knot-dns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 234a39574506..7756c5fa3f19 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -8,11 +8,11 @@ let inherit (stdenv.lib) optional optionals; in
 # Note: ATM only the libraries have been tested in nixpkgs.
 stdenv.mkDerivation rec {
   pname = "knot-dns";
-  version = "2.9.2";
+  version = "2.9.3";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "298cdf33aa7589b50df7e5833694b24cd2de8b6d17cee7e1673873fe576db6ee";
+    sha256 = "f2adf137d70955a4a20df90c5409e10be8e1127204a98b27d626ac090531a07e";
   };
 
   outputs = [ "bin" "out" "dev" ];

From 8f543ed80d450556f6b442d32a8a433731b49f01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 3 Mar 2020 11:19:59 +0000
Subject: [PATCH 2133/4636] nixos/zfs: continue trimming also if one pool fails

fixes https://github.com/NixOS/nixpkgs/issues/81602
---
 nixos/modules/tasks/filesystems/zfs.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index d14ba98ec48b..09c7e074e121 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -623,7 +623,11 @@ in
         after = [ "zfs-import.target" ];
         path = [ packages.zfsUser ];
         startAt = cfgTrim.interval;
-        serviceConfig.ExecStart = "${pkgs.runtimeShell} -c 'zpool list -H -o name | xargs --no-run-if-empty -n1 zpool trim'";
+        # By default we ignore errors returned by the trim command, in case:
+        # - HDDs are mixed with SSDs
+        # - There is a SSDs in a pool that is currently trimmed.
+        # - There are only HDDs and we would set the system in a degraded state
+        serviceConfig.ExecStart = ''${pkgs.runtimeShell} -c 'for pool in $(zpool list -H -o name); do zpool trim $pool;  done || true' '';
       };
     })
   ];

From faa5c3bde36023c650f87f22f7391eba3894ab33 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 11:34:22 +0000
Subject: [PATCH 2134/4636] R: 3.6.2 -> 3.6.3

---
 pkgs/applications/science/math/R/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index f613f94b9ccd..3ee62fad44da 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -10,11 +10,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "R-3.6.2";
+  name = "R-3.6.3";
 
   src = fetchurl {
     url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz";
-    sha256 = "0m69pfi0nxyriyb2yz74xfzaxwfkinnf9kpvf1rz727vvmfa8rdx";
+    sha256 = "13xaxwfbzj0bd6rn2n27z0n04lb93mcyq991w4vdbbg8v282jc49";
   };
 
   dontUseImakeConfigure = true;
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec {
   setupHook = ./setup-hook.sh;
 
   meta = with stdenv.lib; {
-    homepage = http://www.r-project.org/;
+    homepage = "http://www.r-project.org/";
     description = "Free software environment for statistical computing and graphics";
     license = licenses.gpl2Plus;
 

From 2a5292313caf290d7e2531b440a027fdbe9ea4e3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Mar 2020 12:47:36 +0100
Subject: [PATCH 2135/4636] =?UTF-8?q?gom:=200.3.3=20=E2=86=92=200.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://ftp.gnome.org/pub/GNOME/sources/gom/0.4/gom-0.4.news
---
 pkgs/development/libraries/gom/default.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/development/libraries/gom/default.nix
index e006f8cd6f8e..2d5133afab4d 100644
--- a/pkgs/development/libraries/gom/default.nix
+++ b/pkgs/development/libraries/gom/default.nix
@@ -1,6 +1,5 @@
 { stdenv
 , fetchurl
-, fetchpatch
 , meson
 , ninja
 , pkgconfig
@@ -14,26 +13,16 @@
 
 stdenv.mkDerivation rec {
   pname = "gom";
-  version = "0.3.3";
+  version = "0.4";
 
   outputs = [ "out" "py" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1n1n226dyb3q98216aah87in9hhjcwsbpspsdqqfswz2bx5y6mxc";
+    sha256 = "aNCABqqjtYFpznzxg5SY9FaG+6gRXwms7Lidd+EBip0=";
   };
 
   patches = [
-    # Needed to apply the next patch
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gom/commit/e8b7c314ce61d459132cf03c9e455d2a01fdc6ea.patch";
-      sha256 = "0d7g3nm5lrfhfx9ly8qgf5bfp12kvr7m1xmlgin2q8vqpn0r2ggp";
-    })
-    # https://gitlab.gnome.org/GNOME/gom/merge_requests/3
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/worldofpeace/gom/commit/b621c15600b1c32826c9878565eb2398a50907f2.patch";
-      sha256 = "1hqck9bb7sxn4akisnn26sbddlphjsavgksick5k4h3rsc0xwx1v";
-    })
     ./longer-stress-timeout.patch
   ];
 

From b46c48c12a11250a684da6a8e1f4d765a148b2da Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 3 Mar 2020 09:12:44 -0300
Subject: [PATCH 2136/4636] mednaffe: 0.8.6 -> 0.8.8

---
 pkgs/misc/emulators/mednaffe/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/misc/emulators/mednaffe/default.nix
index 40390068e7be..7e231c5edd3a 100644
--- a/pkgs/misc/emulators/mednaffe/default.nix
+++ b/pkgs/misc/emulators/mednaffe/default.nix
@@ -5,13 +5,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "mednaffe";
-  version = "0.8.6";
+  version = "0.8.8";
 
   src = fetchFromGitHub {
     owner = "AmatCoder";
     repo = "mednaffe";
-    rev = "v${version}";
-    sha256 = "13l7gls430dcslpan39k0ymdnib2v6crdsmn6bs9k9g30nfnqi6m";
+    rev = "${version}";
+    sha256 = "15qk3a3l1phr8bap2ayh3c0vyvw2jwhny1iz1ajq2adyjpm9fhr7";
   };
 
   nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig wrapGAppsHook ];
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "GTK-based frontend for mednafen emulator";
-    homepage = https://github.com/AmatCoder/mednaffe;
+    homepage = "https://github.com/AmatCoder/mednaffe";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ sheenobu yegortimoshenko ];
+    maintainers = with maintainers; [ sheenobu yegortimoshenko AndersonTorres ];
     platforms = platforms.linux;
   };
 }

From 3867188af72d2317c900d75642b0d4ffe0d25b2c Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 3 Mar 2020 09:14:07 -0300
Subject: [PATCH 2137/4636] mednafen: 0.9.48 -> 1.22.2

---
 pkgs/misc/emulators/mednafen/default.nix | 43 ++++++++++++++++++++----
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix
index 337d19804fc4..777c9f043f40 100644
--- a/pkgs/misc/emulators/mednafen/default.nix
+++ b/pkgs/misc/emulators/mednafen/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pkgconfig, freeglut, libGLU, libGL, libcdio, libjack2
-, libsamplerate, libsndfile, libX11, SDL, SDL_net, zlib }:
+, libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "mednafen";
-  version = "0.9.48";
+  version = "1.22.2";
 
   src = fetchurl {
     url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz";
-    sha256 = "00i12mywhp43274aq466fwavglk5b7d8z8bfdna12ra9iy1hrk6k";
+    sha256 = "159gvzrf4as1fp74czzc14vamhd6s3hlnvwglfgdd5j6d6n37m7s";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
     libsamplerate
     libsndfile
     libX11
-    SDL
-    SDL_net
+    SDL2
+    SDL2_net
     zlib
   ];
 
@@ -34,7 +34,38 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator";
-    homepage = https://mednafen.github.io/;
+    longDescription = ''
+      Mednafen is a portable, utilizing OpenGL and SDL,
+      argument(command-line)-driven multi-system emulator. Mednafen has the
+      ability to remap hotkey functions and virtual system inputs to a keyboard,
+      a joystick, or both simultaneously. Save states are supported, as is
+      real-time game rewinding. Screen snapshots may be taken, in the PNG file
+      format, at the press of a button. Mednafen can record audiovisual movies
+      in the QuickTime file format, with several different lossless codecs
+      supported.
+
+      The following systems are supported (refer to the emulation module
+      documentation for more details):
+
+      - Apple II/II+
+      - Atari Lynx
+      - Neo Geo Pocket (Color)
+      - WonderSwan
+      - GameBoy (Color)
+      - GameBoy Advance
+      - Nintendo Entertainment System
+      - Super Nintendo Entertainment System/Super Famicom
+      - Virtual Boy
+      - PC Engine/TurboGrafx 16 (CD)
+      - SuperGrafx
+      - PC-FX
+      - Sega Game Gear
+      - Sega Genesis/Megadrive
+      - Sega Master System
+      - Sega Saturn (experimental, x86_64 only)
+      - Sony PlayStation
+    '';
+    homepage = "https://mednafen.github.io/";
     license = licenses.gpl2;
     maintainers = with maintainers; [ AndersonTorres ];
     platforms = platforms.linux;

From 66bd71cf131653c766925fbba3974726f8a22e4a Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 3 Mar 2020 09:15:30 -0300
Subject: [PATCH 2138/4636] mednafen-server: convert meta.homepage to an
 explicit string

---
 pkgs/misc/emulators/mednafen/server.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/misc/emulators/mednafen/server.nix
index 146d53202614..9a1edc00452d 100644
--- a/pkgs/misc/emulators/mednafen/server.nix
+++ b/pkgs/misc/emulators/mednafen/server.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Netplay server for Mednafen";
-    homepage = https://mednafen.github.io/;
+    homepage = "https://mednafen.github.io/";
     license = licenses.gpl2;
     maintainers = with maintainers; [ AndersonTorres ];
     platforms = platforms.linux;

From 54d984f62a538c37babd2f34e067398c6ec165df Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Mar 2020 13:22:51 +0100
Subject: [PATCH 2139/4636] folks: Fix build

This was missed in https://github.com/NixOS/nixpkgs/pull/80594.

Also re-enable tests.
---
 pkgs/development/libraries/folks/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix
index 6179ea983e33..be574ae4aa12 100644
--- a/pkgs/development/libraries/folks/default.nix
+++ b/pkgs/development/libraries/folks/default.nix
@@ -75,10 +75,16 @@ stdenv.mkDerivation rec {
 
   checkInputs = [
     dbus
+    (python3.withPackages (pp: with pp; [
+      python-dbusmock
+      # The following possibly need to be propagated by dbusmock
+      # if they are not optional
+      dbus-python
+      pygobject3
+    ]))
   ];
 
-  # TODO: enable tests
-  # doCheck = true;
+  doCheck = true;
 
   postPatch = ''
     chmod +x meson_post_install.py

From 4dc27717c3d68192f5912f1d40dfde2ba555afa6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Mar 2020 13:41:12 +0100
Subject: [PATCH 2140/4636] folks: re-enable docs

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

diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix
index be574ae4aa12..89b7938de1e4 100644
--- a/pkgs/development/libraries/folks/default.nix
+++ b/pkgs/development/libraries/folks/default.nix
@@ -23,6 +23,9 @@
 , python3
 , readline
 , gtk3
+, gtk-doc
+, docbook-xsl-nons
+, docbook_xml_dtd_43
 }:
 
 # TODO: enable more folks backends
@@ -31,7 +34,7 @@ stdenv.mkDerivation rec {
   pname = "folks";
   version = "0.13.2";
 
-  outputs = [ "out" "dev" ];
+  outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
@@ -39,14 +42,16 @@ stdenv.mkDerivation rec {
   };
 
   mesonFlags = [
-    # TODO: https://gitlab.gnome.org/GNOME/folks/issues/108
-    "-Ddocs=false"
+    "-Ddocs=true"
   ];
 
   nativeBuildInputs = [
     gettext
     gobject-introspection
     gtk3
+    gtk-doc
+    docbook-xsl-nons
+    docbook_xml_dtd_43
     meson
     ninja
     pkgconfig

From 1e4084361615effe6e766eab7456d46c87cef21e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 3 Mar 2020 07:47:47 -0500
Subject: [PATCH 2141/4636] oh-my-zsh: 2020-03-02 -> 2020-03-03

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

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index d8c072950a72..871791dd4589 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2020-03-02";
+  version = "2020-03-03";
   pname = "oh-my-zsh";
-  rev = "72707d92b1f127a2c16f0447e4d8233ed7b3c10e";
+  rev = "bbe54e4e6009dcbb69a4ace22ddae3672b323fdc";
 
   src = fetchgit { inherit rev;
     url = "https://github.com/ohmyzsh/ohmyzsh";
-    sha256 = "0yzzlryf22hp16zjcgcv8lqhx9znkp0g2b1sq93rdvy3cvypz5nj";
+    sha256 = "13znfpr9dvvvasrszdi2qr4iprx1s1z5rx16f01hc6r9jqnbqi5s";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];

From 6212e0aa152ac8483170964eba07cbaa26d526cd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 13:09:48 +0000
Subject: [PATCH 2142/4636] python27Packages.spotipy: 2.7.1 -> 2.9.0

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

diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix
index aebe38fc69a4..e733c269cd0e 100644
--- a/pkgs/development/python-modules/spotipy/default.nix
+++ b/pkgs/development/python-modules/spotipy/default.nix
@@ -2,17 +2,17 @@
 
 buildPythonPackage rec {
   pname = "spotipy";
-  version = "2.7.1";
+  version = "2.9.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1i4gpmvjk608fxz1kwfb3dnmm4dydr0bir0zw9k2nng7n8b6knvr";
+    sha256 = "163z3j0sd9a7cc9pv9hcrh230gisvvi2fxabh1f6nzhfr8avrncr";
   };
 
   propagatedBuildInputs = [ requests ];
 
   meta = with stdenv.lib; {
-    homepage = https://spotipy.readthedocs.org/;
+    homepage = "https://spotipy.readthedocs.org/";
     description = "A light weight Python library for the Spotify Web API";
     license = licenses.mit;
     maintainers = [ maintainers.rvolosatovs ];

From 4c00e6f654a7cf3c40eab91f1b9a079660d87988 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 3 Mar 2020 14:34:28 +0100
Subject: [PATCH 2143/4636] bazel-remote: fix fixed output derivation hash

---
 .../tools/build-managers/bazel/bazel-remote/default.nix         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
index 88dd7f45ab58..3222406c15d7 100644
--- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix
@@ -64,7 +64,7 @@ buildBazelPackage rec {
       sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker
     '';
 
-    sha256 = "0lnwc7ya6sjlx6jk5dwws166vli1lzdfc256f9g6dy1fci3sc17y";
+    sha256 = "141kw2zpr612xdcrg6x9kslg4d5b3fbpzx0vgp3lqwdihfj3sc1l";
   };
 
   buildAttrs = {

From 66a7f5d4e2f6a1eb9d28c0de18b11917dd64d9ad Mon Sep 17 00:00:00 2001
From: Cyril Cohen <cohen@crans.org>
Date: Tue, 3 Mar 2020 14:10:12 +0100
Subject: [PATCH 2144/4636] elpi: 1.7.0 -> 1.10.2; coq-elpi: 1.1 -> 1.3

---
 pkgs/development/coq-modules/coq-elpi/default.nix | 9 +++++++--
 pkgs/development/ocaml-modules/elpi/default.nix   | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix
index 56aa005c4a92..0dd8817ab3f3 100644
--- a/pkgs/development/coq-modules/coq-elpi/default.nix
+++ b/pkgs/development/coq-modules/coq-elpi/default.nix
@@ -2,9 +2,14 @@
 
 let params = {
   "8.10" = rec {
-    version = "1.1.0";
+    version = "1.3.0";
     rev = "v${version}";
-    sha256 = "06jyw7n27ylg02jvlaa3hs13hg8qgx47yn4dxhg9as1xri9a2rvm";
+    sha256 = "1bbadh4qmsm0c5qw41apf4k8va6d44rpw294mc6pg556nmma87ra";
+  };
+  "8.11" = rec {
+    version = "1.3.1";
+    rev = "v${version}";
+    sha256 = "06dg0i1jay9anhx68jfki5qs2g481n3s4q3m124qniyadlx80bh3";
   };
 };
   param = params.${coq.coq-version};
diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix
index b69a4900f6f1..1c71f7fceb78 100644
--- a/pkgs/development/ocaml-modules/elpi/default.nix
+++ b/pkgs/development/ocaml-modules/elpi/default.nix
@@ -4,13 +4,13 @@
 
 buildDunePackage rec {
   pname = "elpi";
-  version = "1.7.0";
+  version = "1.10.2";
 
   src = fetchFromGitHub {
     owner = "LPCIC";
     repo = "elpi";
     rev = "v${version}";
-    sha256 = "1q6s3x4gba0hdymlgj4rf1bny4v7ac4jj7q134cwd3sxiwqcyhww";
+    sha256 = "0w5z0pxyshqawq7w5rw3nqii49y88rizvwqf202pl11xqi14icsn";
   };
 
   minimumOCamlVersion = "4.04";

From 79b582b1ff000881f8b50ad00e5532c7a8413b44 Mon Sep 17 00:00:00 2001
From: Bruce Toll <4109762+tollb@users.noreply.github.com>
Date: Tue, 3 Mar 2020 09:08:17 -0500
Subject: [PATCH 2145/4636] python-mapnik: 3.0.16 -> unstable-2020-02-24

Update to fix build errors with mapnik 3.0.23, along with other pending
upstream commits.

Upstream has not tagged a python-mapnik release since 2017. This
unstable commit, however, is also the basis for the python-mapnik
package in Debian testing.
---
 pkgs/development/python-modules/python-mapnik/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix
index 35b7a706f609..2b3c4ba1e9b5 100644
--- a/pkgs/development/python-modules/python-mapnik/default.nix
+++ b/pkgs/development/python-modules/python-mapnik/default.nix
@@ -18,13 +18,13 @@ let
 
 in buildPythonPackage rec {
   pname = "python-mapnik";
-  version = "3.0.16";
+  version = "unstable-2020-02-24";
 
   src = pkgs.fetchFromGitHub {
     owner = "mapnik";
     repo = "python-mapnik";
-    rev = "v${version}";
-    sha256 = "1gqs4kvmjawdgl80j0ab5r8y0va9kw0rvwix3093xsv4hwd00lcc";
+    rev = "7da019cf9eb12af8f8aa88b7d75789dfcd1e901b";
+    sha256 = "0snn7q7w1ab90311q8wgd1z64kw1svm5w831q0xd6glqhah86qc8";
   };
 
   disabled = isPyPy;

From 54856683536f14684518391a4c4bf1d57440b939 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 15:04:32 +0000
Subject: [PATCH 2146/4636] radarr: 0.2.0.1450 -> 0.2.0.1480

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

diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix
index 61fee03a7a18..b0871a99f671 100644
--- a/pkgs/servers/radarr/default.nix
+++ b/pkgs/servers/radarr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "radarr";
-  version = "0.2.0.1450";
+  version = "0.2.0.1480";
 
   src = fetchurl {
     url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz";
-    sha256 = "1sknq6fifpmgzryr07dnriaw2x425v2zxdcqzm65viw5p5j9xh00";
+    sha256 = "066kr9fk2ipid11aq057rqzy3b2kgd5qf9msq1fsmxixqg82m64h";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A Usenet/BitTorrent movie downloader";
-    homepage = https://radarr.video/;
+    homepage = "https://radarr.video/";
     license = licenses.gpl3;
     maintainers = with maintainers; [ edwtjo ];
     platforms = platforms.all;

From 473c80526ae89cfce340c30884d01a29699710d5 Mon Sep 17 00:00:00 2001
From: sjau <github.com@sjau.ch>
Date: Tue, 25 Feb 2020 11:29:23 +0100
Subject: [PATCH 2147/4636] evdi: 2019-01-16 -> 2019-02-25

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

diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix
index 6dbf6ace693c..2a6ce13c1628 100644
--- a/pkgs/os-specific/linux/evdi/default.nix
+++ b/pkgs/os-specific/linux/evdi/default.nix
@@ -2,26 +2,19 @@
 
 stdenv.mkDerivation rec {
   pname = "evdi";
-  version = "-unstable-20190116";
+  version = "unstable-20200222";
 
   src = fetchFromGitHub {
     owner = "DisplayLink";
     repo = pname;
-    rev = "391f1f71e4c86fc18de27947c78e02b5e3e9f128";
-    sha256 = "147cwmk57ldchvzr06lila6av7jvcdggs9jgifqscklp9x6dc4ny";
+    rev = "bb3038c1b10aae99feddc7354c74a5bf22341246";
+    sha256 = "058f8gdma6fndg2w512l08mwl79h4hffacx4rnfkjxrb2ard3gd1";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
   buildInputs = [ kernel libdrm ];
 
-  patches = [
-    (fetchpatch {
-      url    = "https://crazy.dev.frugalware.org/evdi-all-in-one-fixes.patch";
-      sha256 = "03hs68v8c2akf8a4rc02m15fzyp14ay70rcx8kwg2y98qkqh7w30";
-    })
-  ];
-
   makeFlags = [
     "KVER=${kernel.modDirVersion}"
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

From 18f7b5e404be70fb153d8b78fb26a097556eaf07 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 15:54:33 +0000
Subject: [PATCH 2148/4636] snd: 20.0 -> 20.1

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

diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index 54f8fe4c9ad1..cfe79f4e3613 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "snd-20.0";
+  name = "snd-20.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/snd/${name}.tar.gz";
-    sha256 = "195j0mkxvkb0znwhc0pjp4r0r8j4i12i27nxbkq27wg9rck6likc";
+    sha256 = "0v7zhavkkbh1bagzy3l08kb235hhdqn28y0m4znkd3k31p4l4dz8";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Sound editor";
-    homepage = http://ccrma.stanford.edu/software/snd;
+    homepage = "http://ccrma.stanford.edu/software/snd";
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.free;
     maintainers = with stdenv.lib.maintainers; [ ];

From adfb8a039b583a0a3dee94024cef7085032ee4ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Tue, 3 Mar 2020 16:53:13 +0100
Subject: [PATCH 2149/4636] lcov: Fix patch checksums

The previously committed checksums seem to have been mistakenly taken
directly from fetchurl without fetchpatch normalization.
---
 pkgs/development/tools/analysis/lcov/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix
index a5e8c81e313a..50bb85eae0d4 100644
--- a/pkgs/development/tools/analysis/lcov/default.nix
+++ b/pkgs/development/tools/analysis/lcov/default.nix
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
   patches =
     [ (fetchpatch {
         url = https://github.com/linux-test-project/lcov/commit/ebfeb3e179e450c69c3532f98cd5ea1fbf6ccba7.patch;
-        sha256 = "1z9jfqpj34jnzdvmqr5fs8hl56bvbwd8xhlbg3chcswbjj97vk7l";
+        sha256 = "0dalkqbjb6a4vp1lcsxd39dpn5fzdf7ihsjbiviq285s15nxdj1j";
       })
       (fetchpatch {
         url = https://github.com/linux-test-project/lcov/commit/75fbae1cfc5027f818a0bb865bf6f96fab3202da.patch;
-        sha256 = "1wgd4y7vhvfnxyhdd0z2pi9ys6l0z88f14i69a7prb296m1zwg5j";
+        sha256 = "0v1hn0511dxqbf50ppwasc6vmg0m6rns7ydbdy2rdbn0j7gxw30x";
       })
     ];
 

From ab4d825f3bac0e41506c88685ffe83604eab8483 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 17:08:22 +0000
Subject: [PATCH 2150/4636] rspamd: 2.3 -> 2.4

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

diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index 15a651d8a321..79020ce78488 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -10,13 +10,13 @@ assert withHyperscan -> stdenv.isx86_64;
 
 stdenv.mkDerivation rec {
   pname = "rspamd";
-  version = "2.3";
+  version = "2.4";
 
   src = fetchFromGitHub {
     owner = "rspamd";
     repo = "rspamd";
     rev = version;
-    sha256 = "1v4kbvj9r0hs8jaisq3fr0rg0qndpbhc5h8cbpfpprmkbw4nj6pf";
+    sha256 = "15rdxcvnfn3fzjpjz6z2ljrzhlmhn2y4sxz09z2789k442n4m1qv";
   };
 
   nativeBuildInputs = [ cmake pkgconfig perl ];

From c7b428de3aad930f1f25dbce4f9b986365121ecd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 17:19:45 +0000
Subject: [PATCH 2151/4636] python27Packages.ROPGadget: 6.0 -> 6.2

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

diff --git a/pkgs/development/python-modules/ROPGadget/default.nix b/pkgs/development/python-modules/ROPGadget/default.nix
index 310e84a918d4..dc3ff1dbf4d4 100644
--- a/pkgs/development/python-modules/ROPGadget/default.nix
+++ b/pkgs/development/python-modules/ROPGadget/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "ROPGadget";
-  version = "6.0";
+  version = "6.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "02wgrdrg0s0cr9yjsb4945244m8x8rr8jzxr8h8c6k2na4d17xf4";
+    sha256 = "0idiicgpijar9l9kqmfdh865c2mkfgxg0q7lpz77jc09l6q0afjh";
   };
 
   propagatedBuildInputs = [ capstone ];

From fa2546f1b94b896021246e8c14542327eba6a44d Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 3 Mar 2020 12:44:04 -0500
Subject: [PATCH 2152/4636] tdlib: enable on darwin

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

diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix
index 5224744c6a2c..4bf49e297e33 100644
--- a/pkgs/development/libraries/tdlib/default.nix
+++ b/pkgs/development/libraries/tdlib/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     description = "Cross-platform library for building Telegram clients";
     homepage = "https://core.telegram.org/tdlib/";
     license = [ licenses.boost ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.vyorkin ];
   };
 }

From f22aadbc896c2935a68f0f60a20d9e3b8bf9738a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 30 Jan 2020 09:06:07 +0000
Subject: [PATCH 2153/4636] teamspeak_server: 3.10.2 -> 3.11.0

---
 .../networking/instant-messengers/teamspeak/server.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
index 9c57ac829afb..1cc3cf9cdd59 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
@@ -4,13 +4,13 @@ let
   arch = if stdenv.is64bit then "amd64" else "x86";
 in stdenv.mkDerivation rec {
   pname = "teamspeak-server";
-  version = "3.10.2";
+  version = "3.11.0";
 
   src = fetchurl {
     url = "https://files.teamspeak-services.com/releases/server/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2";
     sha256 = if stdenv.is64bit
-      then "03c717qjlbym02nwy82l6jhrkbidsdm1jv5k8p3c10p6a46jy9nl"
-      else "1ay0lmbv2rw9klz289yg0hhsac83kfzzlbwwhjpi28xndl2lq4bf";
+      then "18hsr119dq46rvhz5sb9snn2gfxwiig37g6bfzk24x6wlga3xihq"
+      else "1lyazw328azi0asvgvcsxglc1saqih6ss0g8pc8f5pzqngk9p953";
   };
 
   buildInputs = [ stdenv.cc.cc ];

From 0b121e343d6f3064a382bfccb3c2aa9407eb5033 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 18:59:55 +0000
Subject: [PATCH 2154/4636] stress-ng: 0.10.19 -> 0.11.01

---
 pkgs/tools/system/stress-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index 29a838e49143..b1d04d992eae 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "stress-ng";
-  version = "0.10.19";
+  version = "0.11.01";
 
   src = fetchurl {
     url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "0v85q5sch1rx68cr69s1wrr79ny9gv99awgqkailk76z2cjva38g";
+    sha256 = "152lyqv7g6jl4xsvg639n6y8h6v2qag3afxynaws38bsr149bqcz";
   };
 
   postPatch = ''

From 3973a3c79c255db358a82f1ffc88dc2cda0f03d6 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Mar 2020 09:37:05 -0800
Subject: [PATCH 2155/4636] python: add pythonRemoveTestsDirHook

This will automatically remove a top-level "tests"
directory from being installed.
---
 .../interpreters/python/hooks/default.nix         |  8 ++++++++
 .../python/hooks/python-remove-tests-dir-hook.sh  | 15 +++++++++++++++
 .../interpreters/python/mk-python-derivation.nix  |  2 ++
 pkgs/top-level/python-packages.nix                |  2 +-
 4 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh

diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix
index 159637ae9d5f..47690320e81e 100644
--- a/pkgs/development/interpreters/python/hooks/default.nix
+++ b/pkgs/development/interpreters/python/hooks/default.nix
@@ -94,6 +94,14 @@ in rec {
       name = "python-remove-bin-bytecode-hook";
     } ./python-remove-bin-bytecode-hook.sh) {};
 
+  pythonRemoveTestsDirHook = callPackage ({ }:
+    makeSetupHook {
+      name = "python-remove-tests-dir-hook";
+      substitutions = {
+        inherit pythonSitePackages;
+      };
+    } ./python-remove-tests-dir-hook.sh) {};
+
   setuptoolsBuildHook = callPackage ({ setuptools, wheel }:
     makeSetupHook {
       name = "setuptools-setup-hook";
diff --git a/pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh b/pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh
new file mode 100644
index 000000000000..83bea786db6d
--- /dev/null
+++ b/pkgs/development/interpreters/python/hooks/python-remove-tests-dir-hook.sh
@@ -0,0 +1,15 @@
+# Clean up top-level tests directory in site-package installation.
+echo "Sourcing python-remove-tests-dir-hook"
+
+pythonRemoveTestsDir() {
+    echo "Executing pythonRemoveTestsDir"
+
+    rm -rf $out/@pythonSitePackages@/tests
+
+    echo "Finished executing pythonRemoveTestsDir"
+}
+
+if [ -z "${dontUsePythonRemoveTestsDir-}" ]; then
+    postFixupHooks+=(pythonRemoveTestsDir)
+fi
+
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index 020298cc8e9f..180bc63857c2 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -17,6 +17,7 @@
 , pythonCatchConflictsHook
 , pythonImportsCheckHook
 , pythonRemoveBinBytecodeHook
+, pythonRemoveTestsDirHook
 , setuptoolsBuildHook
 , setuptoolsCheckHook
 , wheelUnpackHook
@@ -108,6 +109,7 @@ let
     python
     wrapPython
     ensureNewerSourcesForZipFilesHook  # move to wheel installer (pip) or builder (setuptools, flit, ...)?
+    pythonRemoveTestsDirHook
   ] ++ lib.optionals catchConflicts [
     setuptools pythonCatchConflictsHook
   ] ++ lib.optionals removeBinBytecode [
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1ce9b7627a93..d260567f1c6c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -108,7 +108,7 @@ in {
   inherit buildSetupcfg;
 
   inherit (callPackage ../development/interpreters/python/hooks { })
-    eggUnpackHook eggBuildHook eggInstallHook flitBuildHook pipBuildHook pipInstallHook pytestCheckHook pythonCatchConflictsHook pythonImportsCheckHook pythonRemoveBinBytecodeHook setuptoolsBuildHook setuptoolsCheckHook venvShellHook wheelUnpackHook;
+    eggUnpackHook eggBuildHook eggInstallHook flitBuildHook pipBuildHook pipInstallHook pytestCheckHook pythonCatchConflictsHook pythonImportsCheckHook pythonRemoveBinBytecodeHook pythonRemoveTestsDirHook setuptoolsBuildHook setuptoolsCheckHook venvShellHook wheelUnpackHook;
 
   # helpers
 

From 3a250de1d8b793bd23d1679eff5270575bc1c60d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 02:26:35 +0000
Subject: [PATCH 2156/4636] python37Packages.asdf: 2.5.0 -> 2.5.2

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

diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix
index 384421c8966f..dd845b1d3496 100644
--- a/pkgs/development/python-modules/asdf/default.nix
+++ b/pkgs/development/python-modules/asdf/default.nix
@@ -15,12 +15,12 @@
 
 buildPythonPackage rec {
   pname = "asdf";
-  version = "2.5.0";
+  version = "2.5.2";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1qddczr5vhlbhmzmw6bwmkrvsj8dml76zf9gnk22qzab60ali99j";
+    sha256 = "0ai5l62ldaq1cqfmq3hvnzp8gp0hjjmjnck9d3cnx5r8la5ig18y";
   };
 
   postPatch = ''
@@ -50,7 +50,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python tools to handle ASDF files";
-    homepage = https://github.com/spacetelescope/asdf;
+    homepage = "https://github.com/spacetelescope/asdf";
     license = licenses.bsd3;
     maintainers = [ maintainers.costrouc ];
   };

From 3db82f6fc317516303f93b61ef01138f7c040cbd Mon Sep 17 00:00:00 2001
From: Aiken Cairncross <acairncross@gmail.com>
Date: Tue, 3 Mar 2020 17:44:33 +0000
Subject: [PATCH 2157/4636] python3Packages.monosat: Fix hash

PR #81562 inadvertently broke these builds
---
 pkgs/applications/science/logic/monosat/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix
index d7718f71b727..ba0e787af721 100644
--- a/pkgs/applications/science/logic/monosat/default.nix
+++ b/pkgs/applications/science/logic/monosat/default.nix
@@ -24,7 +24,7 @@ let
     # Python 3.8 compatibility
     (fetchpatch {
       url = https://github.com/sambayless/monosat/commit/a5079711d0df0451f9840f3a41248e56dbb03967.patch;
-      sha256 = "0fwsk67798dns7izdry19r7r3nmym4cbgxfpbjbnx4b4mlak65j8";
+      sha256 = "1p2y0jw8hb9c90nbffhn86k1dxd6f6hk5v70dfmpzka3y6g1ksal";
     })
   ];
 

From 511ebca3a3c18452ec4bdff51d1ab28de59c5973 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 13:59:45 +0000
Subject: [PATCH 2158/4636] python27Packages.tomlkit: 0.5.8 -> 0.5.11

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

diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix
index 72e6e0aca632..de48b3736cfc 100644
--- a/pkgs/development/python-modules/tomlkit/default.nix
+++ b/pkgs/development/python-modules/tomlkit/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "tomlkit";
-  version = "0.5.8";
+  version = "0.5.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "32c10cc16ded7e4101c79f269910658cc2a0be5913f1252121c3cd603051c269";
+    sha256 = "1kq1663iqxgwrmb883n55ypi5axnixla2hrby9g2x227asifsi7h";
   };
 
   propagatedBuildInputs =
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with lib; {
-    homepage = https://github.com/sdispater/tomlkit;
+    homepage = "https://github.com/sdispater/tomlkit";
     description = "Style-preserving TOML library for Python";
     license = licenses.mit;
     maintainers = with maintainers; [ jakewaksbaum ];

From 43568a2f048b22a9941bdf46407e9b8ec92a91cd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 19:10:15 +0000
Subject: [PATCH 2159/4636] talloc: 2.1.16 -> 2.3.1

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

diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix
index 4c0b16c140b6..9e9bc1c804bb 100644
--- a/pkgs/development/libraries/talloc/default.nix
+++ b/pkgs/development/libraries/talloc/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "talloc";
-  version = "2.1.16";
+  version = "2.3.1";
 
   src = fetchurl {
     url = "mirror://samba/talloc/${pname}-${version}.tar.gz";
-    sha256 = "1aajda08yf7njgvg6r21ccxlvkarb9bwvf4jqh8yn3871a1zcnqr";
+    sha256 = "0xwzgzrqamfdlklwacp9d219pqkah0yfrhxb1j7bxlmgzp924j7g";
   };
 
   nativeBuildInputs = [ pkgconfig fixDarwinDylibNames python wafHook
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Hierarchical pool based memory allocator with destructors";
-    homepage = https://tdb.samba.org/;
+    homepage = "https://tdb.samba.org/";
     license = licenses.gpl3;
     platforms = platforms.all;
   };

From e88113846c1a5f5c7f62ae7a97cbb7ea154774e3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 11:22:38 -0800
Subject: [PATCH 2160/4636] gnomeExtensions.appindicator: 30 -> 32 (#81309)

---
 pkgs/desktops/gnome-3/extensions/appindicator/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
index 910007bc05b4..6ec7dee1722a 100644
--- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-appindicator";
-  version = "30";
+  version = "32";
 
   src = fetchFromGitHub {
     owner = "Ubuntu";
     repo = "gnome-shell-extension-appindicator";
     rev = "v${version}";
-    sha256 = "1fjhx23jqwv3d0smwhnjvc35gqhwk9p5f96ic22pfax653cn5vh8";
+    sha256 = "1qv9ll4iwkinwk5mf2jppj4fbk8rfncix6q4hhrwnqmhmsbiz6n2";
   };
 
   # This package has a Makefile, but it's used for building a zip for
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ jonafato ];
     platforms = gnome3.gnome-shell.meta.platforms;
-    homepage = https://github.com/Ubuntu/gnome-shell-extension-appindicator;
+    homepage = "https://github.com/Ubuntu/gnome-shell-extension-appindicator";
   };
 }

From b66896f2224d0fdd9ff4cfbc61c581732d7571d5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 19:29:13 +0000
Subject: [PATCH 2161/4636] tribler: 7.4.1 -> 7.4.4

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

diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index 8bd536624086..e9c5f2741432 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "tribler";
-  version = "7.4.1";
+  version = "7.4.4";
 
   src = fetchurl {
     url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz";
-    sha256 = "1s9hzr0n00d3hb1z2srq75j7mbml6csylb14hzy9psw27q2c0fqs";
+    sha256 = "0hxiyf1k07ngym2p8r1b5mcx1y2crkyz43gi9sgvsvsyijyaff3p";
   };
 
   nativeBuildInputs = [
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     maintainers = with maintainers; [ xvapx ];
-    homepage = https://www.tribler.org/;
+    homepage = "https://www.tribler.org/";
     description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol";
     license = licenses.lgpl21;
     platforms = platforms.linux;

From 15b4beb627471a1326c08eaa3b749788091493cf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 19:46:27 +0000
Subject: [PATCH 2162/4636] sqlite: 3.31.0 -> 3.31.1

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

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index fe0eb54cf114..a59325ba6caf 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -10,12 +10,12 @@ in
 
 stdenv.mkDerivation rec {
   pname = "sqlite";
-  version = "3.31.0";
+  version = "3.31.1";
 
   # NB! Make sure to update analyzer.nix src (in the same directory).
   src = fetchurl {
     url = "https://sqlite.org/2020/sqlite-autoconf-${archiveVersion version}.tar.gz";
-    sha256 = "1w7i954349sjd5a6rvy118prra43k07y9hy8rpajs6vmjmnnx7bw";
+    sha256 = "1bj936svd8i5g25xd1bj52hj4zca01fgl3sqkj86z9q5pkz4wa32";
   };
 
   outputs = [ "bin" "dev" "out" ];
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A self-contained, serverless, zero-configuration, transactional SQL database engine";
     downloadPage = https://sqlite.org/download.html;
-    homepage = https://www.sqlite.org/;
+    homepage = "https://www.sqlite.org/";
     license = licenses.publicDomain;
     maintainers = with maintainers; [ eelco np ];
     platforms = platforms.unix ++ platforms.windows;

From 7d8a2004cfd507be8391c3304d43850812046e5c Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Mon, 2 Mar 2020 21:16:19 +0100
Subject: [PATCH 2163/4636] gitlab: 12.7.6 -> 12.8.1

https://about.gitlab.com/releases/2020/02/22/gitlab-12-8-released/
https://about.gitlab.com/releases/2020/02/24/gitlab-12-8-1-released/
---
 .../version-management/gitlab/data.json       |  12 +-
 .../version-management/gitlab/rubyEnv/Gemfile |  34 +-
 .../gitlab/rubyEnv/Gemfile.lock               | 178 ++--
 .../gitlab/rubyEnv/gemset.nix                 | 213 ++--
 .../version-management/gitlab/yarnPkgs.nix    | 960 ++++++++++--------
 5 files changed, 761 insertions(+), 636 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index e7e73d4c48a0..87c37f1c75f4 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,13 +1,13 @@
 {
-  "version": "12.7.6",
-  "repo_hash": "092c6n2jg8himmcc23gh3gvmx0y272kwk00cj1s2k4b92dlzvm18",
+  "version": "12.8.1",
+  "repo_hash": "1h844a79scf3an5rv0wi332lrf7mv1zcv2mg6zllk82f7nf341gn",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v12.7.6-ee",
+  "rev": "v12.8.1-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "1.83.0",
-    "GITLAB_PAGES_VERSION": "1.12.0",
+    "GITALY_SERVER_VERSION": "12.8.1",
+    "GITLAB_PAGES_VERSION": "1.16.0",
     "GITLAB_SHELL_VERSION": "11.0.0",
-    "GITLAB_WORKHORSE_VERSION": "8.20.0"
+    "GITLAB_WORKHORSE_VERSION": "8.21.0"
   }
 }
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
index 04c9f9808a74..20c713e8c39d 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '5.2.3'
+gem 'rails', '6.0.2'
 
 gem 'bootsnap', '~> 1.4'
 
@@ -26,14 +26,14 @@ gem 'marginalia', '~> 1.8.0'
 
 # Authentication libraries
 gem 'devise', '~> 4.6'
-gem 'doorkeeper', '~> 4.3'
-gem 'doorkeeper-openid_connect', '~> 1.5'
+gem 'doorkeeper', '~> 5.0.2'
+gem 'doorkeeper-openid_connect', '~> 1.6.3'
 gem 'omniauth', '~> 1.8'
 gem 'omniauth-auth0', '~> 2.0.0'
 gem 'omniauth-azure-oauth2', '~> 0.0.9'
 gem 'omniauth-cas3', '~> 1.1.4'
 gem 'omniauth-facebook', '~> 4.0.0'
-gem 'omniauth-github', '~> 1.3'
+gem 'omniauth-github', '~> 1.4'
 gem 'omniauth-gitlab', '~> 1.0.2'
 gem 'omniauth-google-oauth2', '~> 0.6.0'
 gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
@@ -67,7 +67,7 @@ gem 'u2f', '~> 0.2.1'
 gem 'validates_hostname', '~> 1.0.6'
 gem 'rubyzip', '~> 2.0.0', require: 'zip'
 # GitLab Pages letsencrypt support
-gem 'acme-client', '~> 2.0.2'
+gem 'acme-client', '~> 2.0.5'
 
 # Browser detection
 gem 'browser', '~> 2.5'
@@ -84,10 +84,10 @@ gem 'net-ldap'
 # API
 gem 'grape', '~> 1.1.0'
 gem 'grape-entity', '~> 0.7.1'
-gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
+gem 'rack-cors', '~> 1.0.6', require: 'rack/cors'
 
 # GraphQL API
-gem 'graphql', '~> 1.9.11'
+gem 'graphql', '~> 1.9.12'
 # NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab/issues/31771
 # TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released:
 # https://gitlab.com/gitlab-org/gitlab/issues/31747
@@ -149,7 +149,7 @@ gem 'wikicloth', '0.8.1'
 gem 'asciidoctor', '~> 2.0.10'
 gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
 gem 'asciidoctor-plantuml', '0.0.10'
-gem 'rouge', '~> 3.11.0'
+gem 'rouge', '~> 3.15.0'
 gem 'truncato', '~> 0.7.11'
 gem 'bootstrap_form', '~> 4.2.0'
 gem 'nokogiri', '~> 1.10.5'
@@ -301,11 +301,11 @@ gem 'sentry-raven', '~> 2.9'
 gem 'premailer-rails', '~> 1.10.3'
 
 # LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '0.8.0'
+gem 'gitlab-labkit', '0.9.1'
 
 # I18n
 gem 'ruby_parser', '~> 3.8', require: false
-gem 'rails-i18n', '~> 5.1'
+gem 'rails-i18n', '~> 6.0'
 gem 'gettext_i18n_rails', '~> 1.8.0'
 gem 'gettext_i18n_rails_js', '~> 1.3'
 gem 'gettext', '~> 3.2.2', require: false, group: :development
@@ -349,7 +349,7 @@ end
 group :development, :test do
   gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET']
   gem 'pry-byebug', '~> 3.5.1', platform: :mri
-  gem 'pry-rails', '~> 0.3.4'
+  gem 'pry-rails', '~> 0.3.9'
 
   gem 'awesome_print', require: false
 
@@ -381,8 +381,6 @@ group :development, :test do
 
   gem 'knapsack', '~> 1.17'
 
-  gem 'stackprof', '~> 0.2.13', require: false
-
   gem 'simple_po_parser', '~> 1.1.2', require: false
 
   gem 'timecop', '~> 0.8.0'
@@ -427,6 +425,7 @@ gem 'email_reply_trimmer', '~> 0.1'
 gem 'html2text'
 
 gem 'ruby-prof', '~> 1.0.0'
+gem 'stackprof', '~> 0.2.15', require: false
 gem 'rbtrace', '~> 0.4', require: false
 gem 'memory_profiler', '~> 0.9', require: false
 gem 'benchmark-memory', '~> 0.1', require: false
@@ -456,7 +455,7 @@ group :ed25519 do
 end
 
 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 1.81.0'
+gem 'gitaly', '~> 1.86.0'
 
 gem 'grpc', '~> 1.24.0'
 
@@ -486,3 +485,10 @@ gem 'liquid', '~> 4.0'
 
 # LRU cache
 gem 'lru_redux'
+
+gem 'erubi', '~> 1.9.0'
+
+# Locked as long as quoted-printable encoding issues are not resolved
+# Monkey-patched in `config/initializers/mail_encoding_patch.rb`
+# See https://gitlab.com/gitlab-org/gitlab/issues/197386
+gem 'mail', '= 2.7.1'
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
index 0733d49c3de4..aa33bd4cd68a 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
@@ -4,52 +4,66 @@ GEM
     RedCloth (4.3.2)
     abstract_type (0.0.7)
     ace-rails-ap (4.1.2)
-    acme-client (2.0.2)
+    acme-client (2.0.5)
       faraday (~> 0.9, >= 0.9.1)
-    actioncable (5.2.3)
-      actionpack (= 5.2.3)
+    actioncable (6.0.2)
+      actionpack (= 6.0.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
+    actionmailbox (6.0.2)
+      actionpack (= 6.0.2)
+      activejob (= 6.0.2)
+      activerecord (= 6.0.2)
+      activestorage (= 6.0.2)
+      activesupport (= 6.0.2)
+      mail (>= 2.7.1)
+    actionmailer (6.0.2)
+      actionpack (= 6.0.2)
+      actionview (= 6.0.2)
+      activejob (= 6.0.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
+    actionpack (6.0.2)
+      actionview (= 6.0.2)
+      activesupport (= 6.0.2)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.2)
+      actionpack (= 6.0.2)
+      activerecord (= 6.0.2)
+      activestorage (= 6.0.2)
+      activesupport (= 6.0.2)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.2)
+      activesupport (= 6.0.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.3)
-      activesupport (= 5.2.3)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.2)
+      activesupport (= 6.0.2)
       globalid (>= 0.3.6)
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
-      arel (>= 9.0)
+    activemodel (6.0.2)
+      activesupport (= 6.0.2)
+    activerecord (6.0.2)
+      activemodel (= 6.0.2)
+      activesupport (= 6.0.2)
     activerecord-explain-analyze (0.1.0)
       activerecord (>= 4)
       pg
-    activestorage (5.2.3)
-      actionpack (= 5.2.3)
-      activerecord (= 5.2.3)
+    activestorage (6.0.2)
+      actionpack (= 6.0.2)
+      activejob (= 6.0.2)
+      activerecord (= 6.0.2)
       marcel (~> 0.3.1)
-    activesupport (5.2.3)
+    activesupport (6.0.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
     acts-as-taggable-on (6.5.0)
       activerecord (>= 5.0, < 6.1)
     adamantium (0.2.0)
@@ -62,7 +76,6 @@ GEM
     apollo_upload_server (2.0.0.beta.3)
       graphql (>= 1.8)
       rails (>= 4.2)
-    arel (9.0.0)
     asana (0.9.3)
       faraday (~> 0.9)
       faraday_middleware (~> 0.9)
@@ -171,7 +184,7 @@ GEM
       unicode_utils (~> 1.4)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    crass (1.0.5)
+    crass (1.0.6)
     creole (0.5.0)
     css_parser (1.7.0)
       addressable
@@ -198,13 +211,14 @@ GEM
     declarative-option (0.1.0)
     default_value_for (3.3.0)
       activerecord (>= 3.2.0, < 6.1)
-    derailed_benchmarks (1.3.5)
+    derailed_benchmarks (1.4.2)
       benchmark-ips (~> 2)
       get_process_mem (~> 0)
       heapy (~> 0)
       memory_profiler (~> 0)
       rack (>= 1)
-      rake (> 10, < 13)
+      rake (> 10, < 14)
+      ruby-statistics (>= 2.1)
       thor (~> 0.19)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
@@ -229,10 +243,10 @@ GEM
     docile (1.3.1)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (4.3.2)
+    doorkeeper (5.0.2)
       railties (>= 4.2)
-    doorkeeper-openid_connect (1.5.0)
-      doorkeeper (~> 4.3)
+    doorkeeper-openid_connect (1.6.3)
+      doorkeeper (>= 5.0, < 5.2)
       json-jwt (~> 1.6)
     ed25519 (1.2.4)
     elasticsearch (6.8.0)
@@ -348,7 +362,8 @@ GEM
     gemoji (3.0.1)
     gemojione (3.3.0)
       json
-    get_process_mem (0.2.3)
+    get_process_mem (0.2.5)
+      ffi (~> 1.0)
     gettext (3.2.9)
       locale (>= 2.0.5)
       text (>= 1.3.0)
@@ -360,12 +375,12 @@ GEM
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
     git (1.5.0)
-    gitaly (1.81.0)
+    gitaly (1.86.0)
       grpc (~> 1.0)
     github-markup (1.7.0)
     gitlab-chronic (0.10.5)
       numerizer (~> 0.2)
-    gitlab-labkit (0.8.0)
+    gitlab-labkit (0.9.1)
       actionpack (>= 5.0.0, < 6.1.0)
       activesupport (>= 5.0.0, < 6.1.0)
       grpc (~> 1.19)
@@ -434,12 +449,13 @@ GEM
       activesupport
       grape (~> 1.0)
       rake (~> 12)
-    grape_logging (1.7.0)
+    grape_logging (1.8.3)
       grape
+      rack
     graphiql-rails (1.4.10)
       railties
       sprockets-rails
-    graphql (1.9.11)
+    graphql (1.9.12)
     graphql-docs (1.6.0)
       commonmarker (~> 0.16)
       escape_utils (~> 1.2)
@@ -510,7 +526,7 @@ GEM
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.7.1)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     i18n_data (0.8.0)
     icalendar (2.4.1)
@@ -609,12 +625,12 @@ GEM
     memoist (0.16.0)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
-    memory_profiler (0.9.13)
+    memory_profiler (0.9.14)
     method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0331)
-    mimemagic (0.3.2)
+    mimemagic (0.3.3)
     mini_magick (4.9.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
@@ -672,7 +688,7 @@ GEM
       omniauth (~> 1.2)
     omniauth-facebook (4.0.0)
       omniauth-oauth2 (~> 1.2)
-    omniauth-github (1.3.0)
+    omniauth-github (1.4.0)
       omniauth (~> 1.5)
       omniauth-oauth2 (>= 1.4.0, < 2.0)
     omniauth-gitlab (1.0.3)
@@ -739,7 +755,7 @@ GEM
     parslet (1.8.2)
     peek (1.1.0)
       railties (>= 4.0.0)
-    pg (1.1.4)
+    pg (1.2.2)
     png_quantizator (0.2.1)
     po_to_json (1.0.1)
       json (>= 1.6.0)
@@ -762,7 +778,7 @@ GEM
     pry-byebug (3.5.1)
       byebug (~> 9.1)
       pry (~> 0.10)
-    pry-rails (0.3.6)
+    pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.3)
     pyu-ruby-sasl (0.0.3.3)
@@ -787,18 +803,20 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rack-timeout (0.5.1)
-    rails (5.2.3)
-      actioncable (= 5.2.3)
-      actionmailer (= 5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
-      activemodel (= 5.2.3)
-      activerecord (= 5.2.3)
-      activestorage (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails (6.0.2)
+      actioncable (= 6.0.2)
+      actionmailbox (= 6.0.2)
+      actionmailer (= 6.0.2)
+      actionpack (= 6.0.2)
+      actiontext (= 6.0.2)
+      actionview (= 6.0.2)
+      activejob (= 6.0.2)
+      activemodel (= 6.0.2)
+      activerecord (= 6.0.2)
+      activestorage (= 6.0.2)
+      activesupport (= 6.0.2)
       bundler (>= 1.3.0)
-      railties (= 5.2.3)
+      railties (= 6.0.2)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.4)
       actionpack (>= 5.0.1.x)
@@ -809,15 +827,15 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    rails-i18n (5.1.1)
+    rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
-      railties (>= 5.0, < 6)
-    railties (5.2.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
+      railties (>= 6.0.0, < 7)
+    railties (6.0.2)
+      actionpack (= 6.0.2)
+      activesupport (= 6.0.2)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
     raindrops (0.19.0)
     rake (12.3.3)
@@ -871,7 +889,7 @@ GEM
     retriable (3.1.2)
     rinku (2.0.0)
     rotp (2.1.2)
-    rouge (3.11.0)
+    rouge (3.15.0)
     rqrcode (0.7.0)
       chunky_png
     rqrcode-rails3 (0.1.7)
@@ -937,6 +955,7 @@ GEM
     ruby-progressbar (1.10.1)
     ruby-saml (1.7.2)
       nokogiri (>= 1.5.10)
+    ruby-statistics (2.1.1)
     ruby_dep (1.5.0)
     ruby_parser (3.13.1)
       sexp_processor (~> 4.9)
@@ -1018,7 +1037,7 @@ GEM
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
     sshkey (2.0.0)
-    stackprof (0.2.13)
+    stackprof (0.2.15)
     state_machines (0.5.0)
     state_machines-activemodel (0.7.1)
       activemodel (>= 4.1)
@@ -1111,9 +1130,9 @@ GEM
       hashdiff
     webpack-rails (0.9.11)
       railties (>= 3.2.0)
-    websocket-driver (0.7.0)
+    websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.4)
     wikicloth (0.8.1)
       builder
       expression_parser
@@ -1122,6 +1141,7 @@ GEM
     xml-simple (1.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby
@@ -1129,7 +1149,7 @@ PLATFORMS
 DEPENDENCIES
   RedCloth (~> 4.3.2)
   ace-rails-ap (~> 4.1.0)
-  acme-client (~> 2.0.2)
+  acme-client (~> 2.0.5)
   activerecord-explain-analyze (~> 0.1)
   acts-as-taggable-on (~> 6.0)
   addressable (~> 2.7)
@@ -1177,14 +1197,15 @@ DEPENDENCIES
   diff_match_patch (~> 0.1.0)
   diffy (~> 3.1.0)
   discordrb-webhooks-blackst0ne (~> 3.3)
-  doorkeeper (~> 4.3)
-  doorkeeper-openid_connect (~> 1.5)
+  doorkeeper (~> 5.0.2)
+  doorkeeper-openid_connect (~> 1.6.3)
   ed25519 (~> 1.2)
   elasticsearch-api (~> 6.8)
   elasticsearch-model (~> 6.1)
   elasticsearch-rails (~> 6.1)
   email_reply_trimmer (~> 0.1)
   email_spec (~> 2.2.0)
+  erubi (~> 1.9.0)
   escape_utils (~> 1.1)
   factory_bot_rails (~> 5.1.0)
   faraday (~> 0.12)
@@ -1209,10 +1230,10 @@ DEPENDENCIES
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly (~> 1.81.0)
+  gitaly (~> 1.86.0)
   github-markup (~> 1.7.0)
   gitlab-chronic (~> 0.10.5)
-  gitlab-labkit (= 0.8.0)
+  gitlab-labkit (= 0.9.1)
   gitlab-license (~> 1.0)
   gitlab-markup (~> 1.7.0)
   gitlab-net-dns (~> 0.9.1)
@@ -1231,7 +1252,7 @@ DEPENDENCIES
   grape-path-helpers (~> 1.2)
   grape_logging (~> 1.7)
   graphiql-rails (~> 1.4.10)
-  graphql (~> 1.9.11)
+  graphql (~> 1.9.12)
   graphql-docs (~> 1.6.0)
   grpc (~> 1.24.0)
   gssapi
@@ -1262,6 +1283,7 @@ DEPENDENCIES
   lograge (~> 0.5)
   loofah (~> 2.2)
   lru_redux
+  mail (= 2.7.1)
   mail_room (~> 0.10.0)
   marginalia (~> 1.8.0)
   memory_profiler (~> 0.9)
@@ -1282,7 +1304,7 @@ DEPENDENCIES
   omniauth-azure-oauth2 (~> 0.0.9)
   omniauth-cas3 (~> 1.1.4)
   omniauth-facebook (~> 4.0.0)
-  omniauth-github (~> 1.3)
+  omniauth-github (~> 1.4)
   omniauth-gitlab (~> 1.0.2)
   omniauth-google-oauth2 (~> 0.6.0)
   omniauth-kerberos (~> 0.3.0)
@@ -1302,16 +1324,16 @@ DEPENDENCIES
   premailer-rails (~> 1.10.3)
   prometheus-client-mmap (~> 0.10.0)
   pry-byebug (~> 3.5.1)
-  pry-rails (~> 0.3.4)
+  pry-rails (~> 0.3.9)
   rack (~> 2.0.7)
   rack-attack (~> 6.2.0)
-  rack-cors (~> 1.0.0)
+  rack-cors (~> 1.0.6)
   rack-oauth2 (~> 1.9.3)
   rack-proxy (~> 0.6.0)
   rack-timeout
-  rails (= 5.2.3)
+  rails (= 6.0.2)
   rails-controller-testing
-  rails-i18n (~> 5.1)
+  rails-i18n (~> 6.0)
   rainbow (~> 3.0)
   raindrops (~> 0.18)
   rblineprof (~> 0.3.6)
@@ -1325,7 +1347,7 @@ DEPENDENCIES
   request_store (~> 1.3)
   responders (~> 3.0)
   retriable (~> 3.1.2)
-  rouge (~> 3.11.0)
+  rouge (~> 3.15.0)
   rqrcode-rails3 (~> 0.1.7)
   rspec-parameterized
   rspec-rails (~> 4.0.0.beta3)
@@ -1360,7 +1382,7 @@ DEPENDENCIES
   spring-commands-rspec (~> 1.0.4)
   sprockets (~> 3.7.0)
   sshkey (~> 2.0)
-  stackprof (~> 0.2.13)
+  stackprof (~> 0.2.15)
   state_machines-activerecord (~> 0.6.0)
   sys-filesystem (~> 1.1.6)
   test-prof (~> 0.10.0)
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
index a1f2a95197c3..efba20ab0822 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
@@ -25,21 +25,32 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1552fkgaj6qfylwsckgmhck34shjqnfrzymj1ji1kq3r310qqrnp";
+      sha256 = "1k9pddds2kfw0br2c153csly4248w9rppkvslx46gncadp9gdb4n";
       type = "gem";
     };
-    version = "2.0.2";
+    version = "2.0.5";
   };
   actioncable = {
     dependencies = ["actionpack" "nio4r" "websocket-driver"];
-    groups = ["default" "development" "test"];
+    groups = ["default" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04wd9rf8sglrqc8jz49apqcxbi51gdj7l1apf5qr4i86iddk6pkm";
+      sha256 = "0dngxp5r9ww4xgryn458ngq2h3ylx7d6d258wcfqhibpyjr7qvpj";
       type = "gem";
     };
-    version = "5.2.3";
+    version = "6.0.2";
+  };
+  actionmailbox = {
+    dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"];
+    groups = ["default" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11wpcjc806y82p1nn3ly9savcdqcf4b0qml5ri5bmd6r2g802s2z";
+      type = "gem";
+    };
+    version = "6.0.2";
   };
   actionmailer = {
     dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
@@ -47,10 +58,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15laym06zcm2021qdhlyr6y9jn1marw436i89hcxqg14a8zvyvwa";
+      sha256 = "0ych434bbim8n65png7hg35xfgmpv0qxvkngpvrr3qgj7l1xgdi5";
       type = "gem";
     };
-    version = "5.2.3";
+    version = "6.0.2";
   };
   actionpack = {
     dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
@@ -58,10 +69,21 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1s2iay17i2k0xx36cmnpbrmr5w6x70jk7fq1d8w70xcdw5chm0w1";
+      sha256 = "0zg96vjjw1kbli6nk6cyk64zfh4lgpl7fqx38ncbgfacl4dq7y0b";
       type = "gem";
     };
-    version = "5.2.3";
+    version = "6.0.2";
+  };
+  actiontext = {
+    dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"];
+    groups = ["default" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1acw3yypd4w35ra87d0kzwwcwj3hps6j0g108rnxy7pscvzajw8q";
+      type = "gem";
+    };
+    version = "6.0.2";
   };
   actionview = {
     dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@@ -69,10 +91,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1v49rgf8305grqf6gq7qa47qhamr369igyy0giycz60x86afyr4h";
+      sha256 = "1bfh9z3n98c76c6jdp6avh75wsckxyp74r59hmgnqdhfznbkppv4";
       type = "gem";
     };
-    version = "5.2.3";
+    version = "6.0.2";
   };
   activejob = {
     dependencies = ["activesupport" "globalid"];
@@ -80,32 +102,32 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "17vizibxbsli5yppgrvmw13wj7a9xy19s5nqxf1k23bbk2s5b87s";
+      sha256 = "0bhf4lxnrmz73zshl5rzvw65x3kd18yligf11lcg7ik9b2i9j6pi";
       type = "gem";
     };
-    version = "5.2.3";
+    version = "6.0.2";
   };
   activemodel = {
     dependencies = ["activesupport"];
-    groups = ["default" "development" "test"];
+    groups = ["default" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0mghh9di8011ara9h1r5a216yzk1vjm9r3p0gdvdi8j1zmkl6k6h";
+      sha256 = "09p7si419x0fb5cw8cbfmzplyk2bdrx0m5cy9pwja89rnhp8yhl0";
       type = "gem";
     };
-    version = "5.2.3";
+    version = "6.0.2";
   };
   activerecord = {
-    dependencies = ["activemodel" "activesupport" "arel"];
-    groups = ["default" "development" "test"];
+    dependencies = ["activemodel" "activesupport"];
+    groups = ["default" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0d6036f592803iyvp6bw98p3sg638mia5dbw19lvachx6jgzfvpw";
+      sha256 = "1w60vnkg88frbpsixfm9immh211pbqg9dwm0gqrr17kdjd00r5z4";
       type = "gem";
     };
-    version = "5.2.3";
+    version = "6.0.2";
   };
   activerecord-explain-analyze = {
     dependencies = ["activerecord" "pg"];
@@ -119,26 +141,26 @@
     version = "0.1.0";
   };
   activestorage = {
-    dependencies = ["actionpack" "activerecord" "marcel"];
-    groups = ["default" "development" "test"];
+    dependencies = ["actionpack" "activejob" "activerecord" "marcel"];
+    groups = ["default" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04is6ipjqw1f337i8pm8w5bd99rpygqfd0fzzxkr7jd308ggmsjk";
+      sha256 = "0qsjhyrjcklqf7dqw6yjvmbfd8yhqyz0dy9apmpd0swiwxnn8kds";
       type = "gem";
     };
-    version = "5.2.3";
+    version = "6.0.2";
   };
   activesupport = {
-    dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+    dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
     groups = ["default" "development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8";
+      sha256 = "1brlp5pmawb2hqdybjb732zxxkamcmis6px3wyh09rjlc0gqnzzz";
       type = "gem";
     };
-    version = "5.2.3";
+    version = "6.0.2";
   };
   acts-as-taggable-on = {
     dependencies = ["activerecord"];
@@ -204,16 +226,6 @@
     };
     version = "2.0.0.beta.3";
   };
-  arel = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0";
-      type = "gem";
-    };
-    version = "9.0.0";
-  };
   asana = {
     dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"];
     groups = ["default"];
@@ -814,10 +826,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "030sc98kjrb36rh7g21qsbdfxrj6knsjkx0mn3b7gig8zknwhp2f";
+      sha256 = "0pfl5c0pyqaparxaqxi6s4gfl21bdldwiawrc0aknyvflli60lfw";
       type = "gem";
     };
-    version = "1.0.5";
+    version = "1.0.6";
   };
   creole = {
     groups = ["default"];
@@ -938,15 +950,15 @@
     version = "3.3.0";
   };
   derailed_benchmarks = {
-    dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "rack" "rake" "thor"];
+    dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "rack" "rake" "ruby-statistics" "thor"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1c9djg1r2w461h97zmmdsdgnsrxqm4qfyp7gry9qxbav9skrplb8";
+      sha256 = "1bsxrmrjhjvvxpl3sgq0c6yyzspazgmxcpdkfipqknd7p8r0hd53";
       type = "gem";
     };
-    version = "1.3.5";
+    version = "1.4.2";
   };
   descendants_tracker = {
     dependencies = ["thread_safe"];
@@ -1059,10 +1071,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "022r03i830b2lvmr0xzlj6ivlvc1zr64hy4a4bsy3flv94da77rz";
+      sha256 = "0488m6nwp31mxrhayj60gsb7jgyw1lzh73r2kldx00a9bw3634d4";
       type = "gem";
     };
-    version = "4.3.2";
+    version = "5.0.2";
   };
   doorkeeper-openid_connect = {
     dependencies = ["doorkeeper" "json-jwt"];
@@ -1070,10 +1082,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1wgrz0xcply5vl6d1m62blqwcbn4v0b27bswyws2y9wbyglz6f95";
+      sha256 = "1qcl11dw9b0si45id7sqwv19g8am4i221sqkigimnvhc1cci2yfw";
       type = "gem";
     };
-    version = "1.5.0";
+    version = "1.6.3";
   };
   ed25519 = {
     groups = ["ed25519"];
@@ -1597,14 +1609,15 @@
     version = "3.3.0";
   };
   get_process_mem = {
+    dependencies = ["ffi"];
     groups = ["default" "puma" "unicorn"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1bvfjdign16r0zwm2rlfrq0sk1licvmlgbnlpnyckniv5r7i080g";
+      sha256 = "1q7pivp9z9pdxc2ha32q7x9zgqy8m9jf87g6n5mvi5l6knxya8sh";
       type = "gem";
     };
-    version = "0.2.3";
+    version = "0.2.5";
   };
   gettext = {
     dependencies = ["locale" "text"];
@@ -1655,10 +1668,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "048s8p93srl3fvaj4l38qhrqzndzgiv32dvrr3s5k65pcxm0vb5i";
+      sha256 = "14ihiw3xsr3r7pk4mbwarasakhq31vzg87bm8g4qaym9ihpf7y77";
       type = "gem";
     };
-    version = "1.81.0";
+    version = "1.86.0";
   };
   github-markup = {
     groups = ["default"];
@@ -1687,10 +1700,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1q3qd8jriafyblivqd5fzb95x9mzm8hgizg5401m3m5i957957z9";
+      sha256 = "1s1cgnnzlnfglsh5r0iihgvyasa2zbqkyrrnbxshvnkddb10i94z";
       type = "gem";
     };
-    version = "0.8.0";
+    version = "0.9.1";
   };
   gitlab-license = {
     groups = ["default"];
@@ -1898,15 +1911,15 @@
     version = "1.2.0";
   };
   grape_logging = {
-    dependencies = ["grape"];
+    dependencies = ["grape" "rack"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0lg2vhk0dlnyqs2rz8wilfm039q5mbsp5nvf51asir48a1rf9yza";
+      sha256 = "0x6cmmj0wi1m689r8d4yhyhpl8dwj5skn8b29igm4xvw3swkg94x";
       type = "gem";
     };
-    version = "1.7.0";
+    version = "1.8.3";
   };
   graphiql-rails = {
     dependencies = ["railties" "sprockets-rails"];
@@ -1924,10 +1937,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "17gpvpv3zpmcbzgdx9skaaj5frxw12ja5hssk7xwzckna0v782vh";
+      sha256 = "17p5c1432fxcqpj7yl70a1667n9774chmam6zswdm021vn8cfwmv";
       type = "gem";
     };
-    version = "1.9.11";
+    version = "1.9.12";
   };
   graphql-docs = {
     dependencies = ["commonmarker" "escape_utils" "extended-markdown-filter" "gemoji" "graphql" "html-pipeline" "sass"];
@@ -2202,10 +2215,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "11ss256hnild52qg5kxisidf1fn0n6gm8hq65y9fnqnq0wq7daw9";
+      sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm";
       type = "gem";
     };
-    version = "1.7.1";
+    version = "1.8.2";
   };
   i18n_data = {
     groups = ["default"];
@@ -2657,10 +2670,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1xki7jrbzylsmk1brjibmhifb0x70skr55pdq4rvxcyrlnrrvyxz";
+      sha256 = "04ivhv1bilwqm33jv28gar2vwzsichb5nipaq395d3axabv8qmfy";
       type = "gem";
     };
-    version = "0.9.13";
+    version = "0.9.14";
   };
   method_source = {
     groups = ["default" "development" "metrics" "test"];
@@ -2698,14 +2711,14 @@
     version = "3.2019.0331";
   };
   mimemagic = {
-    groups = ["default" "development" "test"];
+    groups = ["default" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "00ibc1mhvdfyfyl103xwb45621nwyqxf124cni5hyfhag0fn1c3q";
+      sha256 = "04cp5sfbh1qx82yqxn0q75c7hlcx8y1dr5g3kyzwm4mx6wi2gifw";
       type = "gem";
     };
-    version = "0.3.2";
+    version = "0.3.3";
   };
   mini_magick = {
     groups = ["default"];
@@ -3055,10 +3068,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0yg7k4p95ybcsii17spqarl8rpfzkq0kb19ab6wl4lc922zgfbqc";
+      sha256 = "0xbk0dbxqfpyfb33ghz6vrlz3m6442rp18ryf13gwzlnifcawhlb";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "1.4.0";
   };
   omniauth-gitlab = {
     dependencies = ["omniauth" "omniauth-oauth2"];
@@ -3329,14 +3342,14 @@
     version = "1.1.0";
   };
   pg = {
-    groups = ["default" "development" "test"];
+    groups = ["default" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy";
+      sha256 = "1r01bqqhnk272dsyhg3cqx6j0aiwbcdnrwp7vxzc969mb5dgnnrl";
       type = "gem";
     };
-    version = "1.1.4";
+    version = "1.2.2";
   };
   png_quantizator = {
     groups = ["development" "test"];
@@ -3448,10 +3461,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0k2d43bwmqbswfra4fkadjjbszwb11pr7qdkma91qrcrk62wqxvy";
+      sha256 = "1cf4ii53w2hdh7fn8vhqpzkymmchjbwij4l3m7s6fsxvb9bn51j6";
       type = "gem";
     };
-    version = "0.3.6";
+    version = "0.3.9";
   };
   public_suffix = {
     groups = ["default" "development" "test"];
@@ -3581,15 +3594,15 @@
     version = "0.5.1";
   };
   rails = {
-    dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"];
-    groups = ["default" "development" "test"];
+    dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"];
+    groups = ["default" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1p7cszi3n9ksxchxnccmz61pd1i3rjg4813dsdinsm8xm5k1pdgr";
+      sha256 = "02sxw1f3n2ydmhacakmgjjwv84vqplgr1888cv5dyflb11a3f8mm";
       type = "gem";
     };
-    version = "5.2.3";
+    version = "6.0.2";
   };
   rails-controller-testing = {
     dependencies = ["actionpack" "actionview" "activesupport"];
@@ -3630,10 +3643,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1rqij2ggqz5iq36lbibhnd7pl4qxrvv9kgw9s0c6594vzbbxmhs0";
+      sha256 = "05mcgv748vppnm3fnml37wjy3dw61wj8vfw14ldaj1yx1bmkhb07";
       type = "gem";
     };
-    version = "5.1.1";
+    version = "6.0.0";
   };
   railties = {
     dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"];
@@ -3641,10 +3654,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1gn9fwb5wm08fbj7zpilqgblfl315l5b7pg4jsvxlizvrzg8h8q4";
+      sha256 = "0lpzw7bwvg42x6mwfv7d3bhcnyy8p7rcd8yy8cj5qq5mjznhawca";
       type = "gem";
     };
-    version = "5.2.3";
+    version = "6.0.2";
   };
   rainbow = {
     groups = ["default" "development" "test"];
@@ -3948,10 +3961,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zsyv6abqrk7lpql5f1ja4m88bfy9qndi8xykpss6cpvjdmi3ydb";
+      sha256 = "1ipgdir89a6pp1zscl2fkb99pppa7c513pk4wvis157bn8p9hlrx";
       type = "gem";
     };
-    version = "3.11.0";
+    version = "3.15.0";
   };
   rqrcode = {
     dependencies = ["chunky_png"];
@@ -4202,6 +4215,16 @@
     };
     version = "1.7.2";
   };
+  ruby-statistics = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1f5mpzb1way683klgggsj029a4kw7krj72i17ggmvlp83804s6a3";
+      type = "gem";
+    };
+    version = "2.1.1";
+  };
   ruby_dep = {
     groups = ["default" "test"];
     platforms = [];
@@ -4584,14 +4607,14 @@
     version = "2.0.0";
   };
   stackprof = {
-    groups = ["development" "test"];
+    groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1wck8lqmlndaic2c8z678ylxkkyqlip9ikms9x6lplk298rrdybl";
+      sha256 = "1g2zzasjdr1qnwmpmn28ddv2z9jsnv4w5raiz26y9h1jh03sagqd";
       type = "gem";
     };
-    version = "0.2.13";
+    version = "0.2.15";
   };
   state_machines = {
     groups = ["default"];
@@ -5049,24 +5072,24 @@
   };
   websocket-driver = {
     dependencies = ["websocket-extensions"];
-    groups = ["default" "development" "test"];
+    groups = ["default" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1551k3fs3kkb3ghqfj3n5lps0ikb9pyrdnzmvgfdxy8574n4g1dn";
+      sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2";
       type = "gem";
     };
-    version = "0.7.0";
+    version = "0.7.1";
   };
   websocket-extensions = {
-    groups = ["default" "development" "test"];
+    groups = ["default" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "034sdr7fd34yag5l6y156rkbhiqgmy395m231dwhlpcswhs6d270";
+      sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m";
       type = "gem";
     };
-    version = "0.1.3";
+    version = "0.1.4";
   };
   wikicloth = {
     dependencies = ["builder" "expression_parser" "rinku"];
@@ -5110,4 +5133,14 @@
     };
     version = "3.2.0";
   };
+  zeitwerk = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jywi63w1m2b2w9fj9rjb9n3imf6p5bfijfmml1xzdnsrdrjz0x1";
+      type = "gem";
+    };
+    version = "2.2.2";
+  };
 }
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix
index 67b08d2c234f..0215a47756f9 100644
--- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix
+++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix
@@ -106,11 +106,11 @@
       };
     }
     {
-      name = "_babel_helper_module_imports___helper_module_imports_7.0.0.tgz";
+      name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_helper_module_imports___helper_module_imports_7.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz";
-        sha1 = "96081b7111e486da4d2cd971ad1a4fe216cc2e3d";
+        name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz";
+        sha1 = "7fe39589b39c016331b6b8c3f441e8f0b1419498";
       };
     }
     {
@@ -594,11 +594,11 @@
       };
     }
     {
-      name = "_babel_standalone___standalone_7.5.5.tgz";
+      name = "_babel_standalone___standalone_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_standalone___standalone_7.5.5.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.5.5.tgz";
-        sha1 = "9d3143f6078ff408db694a4254bd6f03c5c33962";
+        name = "_babel_standalone___standalone_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.8.3.tgz";
+        sha1 = "0674730a8c5fbb9352de5342bf0c0c040d658380";
       };
     }
     {
@@ -618,11 +618,11 @@
       };
     }
     {
-      name = "_babel_types___types_7.6.1.tgz";
+      name = "_babel_types___types_7.8.3.tgz";
       path = fetchurl {
-        name = "_babel_types___types_7.6.1.tgz";
-        url  = "https://registry.yarnpkg.com/@babel/types/-/types-7.6.1.tgz";
-        sha1 = "53abf3308add3ac2a2884d539151c57c4b3ac648";
+        name = "_babel_types___types_7.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz";
+        sha1 = "5a383dffa5416db1b73dedffd311ffd0788fb31c";
       };
     }
     {
@@ -642,11 +642,19 @@
       };
     }
     {
-      name = "_gitlab_eslint_config___eslint_config_2.0.0.tgz";
+      name = "_gitlab_at.js___at.js_1.5.5.tgz";
       path = fetchurl {
-        name = "_gitlab_eslint_config___eslint_config_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/@gitlab/eslint-config/-/eslint-config-2.0.0.tgz";
-        sha1 = "e30dbf2b170a7a4ca003a321de9f4170a2512510";
+        name = "_gitlab_at.js___at.js_1.5.5.tgz";
+        url  = "https://registry.yarnpkg.com/@gitlab/at.js/-/at.js-1.5.5.tgz";
+        sha1 = "5f6bfe6baaef360daa9b038fa78798d7a6a916b4";
+      };
+    }
+    {
+      name = "_gitlab_eslint_config___eslint_config_3.0.0.tgz";
+      path = fetchurl {
+        name = "_gitlab_eslint_config___eslint_config_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@gitlab/eslint-config/-/eslint-config-3.0.0.tgz";
+        sha1 = "9a93662ffefb7792d5d0d96d876c316f2c393315";
       };
     }
     {
@@ -658,27 +666,27 @@
       };
     }
     {
-      name = "_gitlab_eslint_plugin_vue_i18n___eslint_plugin_vue_i18n_1.2.0.tgz";
+      name = "_gitlab_eslint_plugin_vue_i18n___eslint_plugin_vue_i18n_2.0.0.tgz";
       path = fetchurl {
-        name = "_gitlab_eslint_plugin_vue_i18n___eslint_plugin_vue_i18n_1.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/@gitlab/eslint-plugin-vue-i18n/-/eslint-plugin-vue-i18n-1.2.0.tgz";
-        sha1 = "6dcd8bf6bdd7a31c1c4c2c4114762508af435836";
+        name = "_gitlab_eslint_plugin_vue_i18n___eslint_plugin_vue_i18n_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@gitlab/eslint-plugin-vue-i18n/-/eslint-plugin-vue-i18n-2.0.0.tgz";
+        sha1 = "5a01912d9d5a7524539d678f09cac6fa57d6d838";
       };
     }
     {
-      name = "_gitlab_svgs___svgs_1.89.0.tgz";
+      name = "_gitlab_svgs___svgs_1.96.0.tgz";
       path = fetchurl {
-        name = "_gitlab_svgs___svgs_1.89.0.tgz";
-        url  = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.89.0.tgz";
-        sha1 = "5bdaff1b0af1cc07ed34e89c21c34c7c6a3e1caa";
+        name = "_gitlab_svgs___svgs_1.96.0.tgz";
+        url  = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.96.0.tgz";
+        sha1 = "1d32730389e94358dc245e8336912523446d1269";
       };
     }
     {
-      name = "_gitlab_ui___ui_8.17.0.tgz";
+      name = "_gitlab_ui___ui_9.8.0.tgz";
       path = fetchurl {
-        name = "_gitlab_ui___ui_8.17.0.tgz";
-        url  = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-8.17.0.tgz";
-        sha1 = "674baa9b5c05fa6ecb23b233c5b308ff82ba5660";
+        name = "_gitlab_ui___ui_9.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-9.8.0.tgz";
+        sha1 = "b1a0b5f1f6ac9fdb19b64d74f0f729e3ec182495";
       };
     }
     {
@@ -794,11 +802,11 @@
       };
     }
     {
-      name = "_nuxt_opencollective___opencollective_0.2.2.tgz";
+      name = "_nuxt_opencollective___opencollective_0.3.0.tgz";
       path = fetchurl {
-        name = "_nuxt_opencollective___opencollective_0.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/@nuxt/opencollective/-/opencollective-0.2.2.tgz";
-        sha1 = "17adc7d380457379cd14cbb64a435ea196cc4a6e";
+        name = "_nuxt_opencollective___opencollective_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/@nuxt/opencollective/-/opencollective-0.3.0.tgz";
+        sha1 = "11d8944dcf2d526e31660bb69570be03f8fb72b7";
       };
     }
     {
@@ -850,11 +858,11 @@
       };
     }
     {
-      name = "_sourcegraph_code_host_integration___code_host_integration_0.0.18.tgz";
+      name = "_sourcegraph_code_host_integration___code_host_integration_0.0.30.tgz";
       path = fetchurl {
-        name = "_sourcegraph_code_host_integration___code_host_integration_0.0.18.tgz";
-        url  = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.18.tgz";
-        sha1 = "814467cdbc94bbfee5768193acf89fdf404ca949";
+        name = "_sourcegraph_code_host_integration___code_host_integration_0.0.30.tgz";
+        url  = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.30.tgz";
+        sha1 = "85f52eca0f8fd5efb1526a7ec6a09d261ab43bda";
       };
     }
     {
@@ -1042,11 +1050,11 @@
       };
     }
     {
-      name = "_vue_component_compiler_utils___component_compiler_utils_3.0.0.tgz";
+      name = "_vue_component_compiler_utils___component_compiler_utils_3.1.1.tgz";
       path = fetchurl {
-        name = "_vue_component_compiler_utils___component_compiler_utils_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.0.0.tgz";
-        sha1 = "d16fa26b836c06df5baaeb45f3d80afc47e35634";
+        name = "_vue_component_compiler_utils___component_compiler_utils_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.1.1.tgz";
+        sha1 = "d4ef8f80292674044ad6211e336a302e4d2a6575";
       };
     }
     {
@@ -1274,11 +1282,11 @@
       };
     }
     {
-      name = "acorn_jsx___acorn_jsx_5.0.1.tgz";
+      name = "acorn_jsx___acorn_jsx_5.1.0.tgz";
       path = fetchurl {
-        name = "acorn_jsx___acorn_jsx_5.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz";
-        sha1 = "32a064fd925429216a09b141102bfdd185fae40e";
+        name = "acorn_jsx___acorn_jsx_5.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz";
+        sha1 = "294adb71b57398b0680015f0a38c563ee1db5384";
       };
     }
     {
@@ -1305,6 +1313,14 @@
         sha1 = "0087509119ffa4fc0a0041d1e93a417e68cb856e";
       };
     }
+    {
+      name = "acorn___acorn_7.1.0.tgz";
+      path = fetchurl {
+        name = "acorn___acorn_7.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz";
+        sha1 = "949d36f2c292535da602283586c2477c57eb2d6c";
+      };
+    }
     {
       name = "after___after_0.8.2.tgz";
       path = fetchurl {
@@ -1313,6 +1329,14 @@
         sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f";
       };
     }
+    {
+      name = "aggregate_error___aggregate_error_3.0.1.tgz";
+      path = fetchurl {
+        name = "aggregate_error___aggregate_error_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz";
+        sha1 = "db2fe7246e536f40d9b5442a39e117d7dd6a24e0";
+      };
+    }
     {
       name = "ajv_errors___ajv_errors_1.0.0.tgz";
       path = fetchurl {
@@ -1330,11 +1354,11 @@
       };
     }
     {
-      name = "ajv___ajv_6.10.2.tgz";
+      name = "ajv___ajv_6.11.0.tgz";
       path = fetchurl {
-        name = "ajv___ajv_6.10.2.tgz";
-        url  = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz";
-        sha1 = "d3cea04d6b017b2894ad69040fec8b623eb4bd52";
+        name = "ajv___ajv_6.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz";
+        sha1 = "c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9";
       };
     }
     {
@@ -1369,6 +1393,14 @@
         sha1 = "8780b98ff9dbf5638152d1f1fe5c1d7b4442976b";
       };
     }
+    {
+      name = "ansi_escapes___ansi_escapes_4.3.0.tgz";
+      path = fetchurl {
+        name = "ansi_escapes___ansi_escapes_4.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.0.tgz";
+        sha1 = "a4ce2b33d6b214b7950d8595c212f12ac9cc569d";
+      };
+    }
     {
       name = "ansi_html___ansi_html_0.0.7.tgz";
       path = fetchurl {
@@ -1633,6 +1665,14 @@
         sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428";
       };
     }
+    {
+      name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz";
+      path = fetchurl {
+        name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz";
+        sha1 = "0de82b426b0318dbfdb940089e38b043d37f6c7b";
+      };
+    }
     {
       name = "arraybuffer.slice___arraybuffer.slice_0.0.7.tgz";
       path = fetchurl {
@@ -1745,14 +1785,6 @@
         sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
       };
     }
-    {
-      name = "at.js___at.js_1.5.4.tgz";
-      path = fetchurl {
-        name = "at.js___at.js_1.5.4.tgz";
-        url  = "https://registry.yarnpkg.com/at.js/-/at.js-1.5.4.tgz";
-        sha1 = "8fc60cc80eadbe4874449b166a818e7ae1d784c1";
-      };
-    }
     {
       name = "atob___atob_2.1.2.tgz";
       path = fetchurl {
@@ -1826,11 +1858,11 @@
       };
     }
     {
-      name = "babel_eslint___babel_eslint_10.0.1.tgz";
+      name = "babel_eslint___babel_eslint_10.0.3.tgz";
       path = fetchurl {
-        name = "babel_eslint___babel_eslint_10.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.1.tgz";
-        sha1 = "919681dc099614cd7d31d45c8908695092a1faed";
+        name = "babel_eslint___babel_eslint_10.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.3.tgz";
+        sha1 = "81a2c669be0f205e19462fed2482d33e4687a88a";
       };
     }
     {
@@ -1873,6 +1905,14 @@
         sha1 = "f7f7f7ad150ee96d7a5e8e2c5da8319579e78019";
       };
     }
+    {
+      name = "babel_plugin_lodash___babel_plugin_lodash_3.3.4.tgz";
+      path = fetchurl {
+        name = "babel_plugin_lodash___babel_plugin_lodash_3.3.4.tgz";
+        url  = "https://registry.yarnpkg.com/babel-plugin-lodash/-/babel-plugin-lodash-3.3.4.tgz";
+        sha1 = "4f6844358a1340baed182adbeffa8df9967bc196";
+      };
+    }
     {
       name = "babel_plugin_rewire___babel_plugin_rewire_1.2.0.tgz";
       path = fetchurl {
@@ -2066,11 +2106,11 @@
       };
     }
     {
-      name = "bootstrap_vue___bootstrap_vue_2.0.0_rc.27.tgz";
+      name = "bootstrap_vue___bootstrap_vue_2.1.0.tgz";
       path = fetchurl {
-        name = "bootstrap_vue___bootstrap_vue_2.0.0_rc.27.tgz";
-        url  = "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.0.0-rc.27.tgz";
-        sha1 = "884a46a71948d13c9729134cb564467f79a7b2b9";
+        name = "bootstrap_vue___bootstrap_vue_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.1.0.tgz";
+        sha1 = "41c0cd265a6cea14ffe29eeea71543ec396d1789";
       };
     }
     {
@@ -2273,14 +2313,6 @@
         sha1 = "f6cf7933a360e0588fa9fde85651cdc7f805d1f6";
       };
     }
-    {
-      name = "cacache___cacache_11.3.3.tgz";
-      path = fetchurl {
-        name = "cacache___cacache_11.3.3.tgz";
-        url  = "https://registry.yarnpkg.com/cacache/-/cacache-11.3.3.tgz";
-        sha1 = "8bd29df8c6a718a6ebd2d010da4d7972ae3bbadc";
-      };
-    }
     {
       name = "cacache___cacache_12.0.3.tgz";
       path = fetchurl {
@@ -2289,6 +2321,14 @@
         sha1 = "be99abba4e1bf5df461cd5a2c1071fc432573390";
       };
     }
+    {
+      name = "cacache___cacache_13.0.1.tgz";
+      path = fetchurl {
+        name = "cacache___cacache_13.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/cacache/-/cacache-13.0.1.tgz";
+        sha1 = "a8000c21697089082f85287a1aec6e382024a71c";
+      };
+    }
     {
       name = "cache_base___cache_base_1.0.1.tgz";
       path = fetchurl {
@@ -2321,14 +2361,6 @@
         sha1 = "847e0fce0a223750a9a027c54b33731ad3154134";
       };
     }
-    {
-      name = "caller_path___caller_path_0.1.0.tgz";
-      path = fetchurl {
-        name = "caller_path___caller_path_0.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz";
-        sha1 = "94085ef63581ecd3daa92444a8fe94e82577751f";
-      };
-    }
     {
       name = "caller_path___caller_path_2.0.0.tgz";
       path = fetchurl {
@@ -2345,14 +2377,6 @@
         sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20";
       };
     }
-    {
-      name = "callsites___callsites_0.2.0.tgz";
-      path = fetchurl {
-        name = "callsites___callsites_0.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz";
-        sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
-      };
-    }
     {
       name = "callsites___callsites_2.0.0.tgz";
       path = fetchurl {
@@ -2426,11 +2450,11 @@
       };
     }
     {
-      name = "caniuse_lite___caniuse_lite_1.0.30000985.tgz";
+      name = "caniuse_lite___caniuse_lite_1.0.30001025.tgz";
       path = fetchurl {
-        name = "caniuse_lite___caniuse_lite_1.0.30000985.tgz";
-        url  = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000985.tgz";
-        sha1 = "0eb40f6c8a8c219155cbe43c4975c0efb4a0f77f";
+        name = "caniuse_lite___caniuse_lite_1.0.30001025.tgz";
+        url  = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001025.tgz";
+        sha1 = "30336a8aca7f98618eb3cf38e35184e13d4e5fe6";
       };
     }
     {
@@ -2522,11 +2546,11 @@
       };
     }
     {
-      name = "chardet___chardet_0.5.0.tgz";
+      name = "chardet___chardet_0.7.0.tgz";
       path = fetchurl {
-        name = "chardet___chardet_0.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/chardet/-/chardet-0.5.0.tgz";
-        sha1 = "fe3ac73c00c3d865ffcc02a0682e2c20b6a06029";
+        name = "chardet___chardet_0.7.0.tgz";
+        url  = "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz";
+        sha1 = "90094849f0937f2eedc2425d0d28a9e5f0cbad9e";
       };
     }
     {
@@ -2586,11 +2610,11 @@
       };
     }
     {
-      name = "chownr___chownr_1.1.1.tgz";
+      name = "chownr___chownr_1.1.3.tgz";
       path = fetchurl {
-        name = "chownr___chownr_1.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz";
-        sha1 = "54726b8b8fff4df053c42187e801fb4412df1494";
+        name = "chownr___chownr_1.1.3.tgz";
+        url  = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz";
+        sha1 = "42d837d5239688d55f303003a508230fa6727142";
       };
     }
     {
@@ -2625,14 +2649,6 @@
         sha1 = "8760e4ecc272f4c363532f926d874aae2c1397de";
       };
     }
-    {
-      name = "circular_json___circular_json_0.3.3.tgz";
-      path = fetchurl {
-        name = "circular_json___circular_json_0.3.3.tgz";
-        url  = "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz";
-        sha1 = "815c99ea84f6809529d2f45791bdf82711352d66";
-      };
-    }
     {
       name = "class_utils___class_utils_0.3.6.tgz";
       path = fetchurl {
@@ -2657,6 +2673,14 @@
         sha1 = "2d411ef76b8569b6d0c84068dabe85b0aa5e5c17";
       };
     }
+    {
+      name = "clean_stack___clean_stack_2.2.0.tgz";
+      path = fetchurl {
+        name = "clean_stack___clean_stack_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz";
+        sha1 = "ee8472dbb129e727b31e8a10a427dee9dfe4008b";
+      };
+    }
     {
       name = "cli_boxes___cli_boxes_1.0.0.tgz";
       path = fetchurl {
@@ -2666,19 +2690,19 @@
       };
     }
     {
-      name = "cli_cursor___cli_cursor_2.1.0.tgz";
+      name = "cli_cursor___cli_cursor_3.1.0.tgz";
       path = fetchurl {
-        name = "cli_cursor___cli_cursor_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz";
-        sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5";
+        name = "cli_cursor___cli_cursor_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz";
+        sha1 = "264305a7ae490d1d03bf0c9ba7c925d1753af307";
       };
     }
     {
-      name = "cli_width___cli_width_2.1.0.tgz";
+      name = "cli_width___cli_width_2.2.0.tgz";
       path = fetchurl {
-        name = "cli_width___cli_width_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.1.0.tgz";
-        sha1 = "b234ca209b29ef66fc518d9b98d5847b00edf00a";
+        name = "cli_width___cli_width_2.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz";
+        sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639";
       };
     }
     {
@@ -2890,11 +2914,11 @@
       };
     }
     {
-      name = "compression_webpack_plugin___compression_webpack_plugin_3.0.0.tgz";
+      name = "compression_webpack_plugin___compression_webpack_plugin_3.0.1.tgz";
       path = fetchurl {
-        name = "compression_webpack_plugin___compression_webpack_plugin_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-3.0.0.tgz";
-        sha1 = "097d2e4d95c3a14cb5c8ed20899009ab5b9bbca0";
+        name = "compression_webpack_plugin___compression_webpack_plugin_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-3.0.1.tgz";
+        sha1 = "be7a343e6dfbccbd64a77c5fbe29627d140fc321";
       };
     }
     {
@@ -2945,6 +2969,14 @@
         sha1 = "094ee662ab83fad9917678de114faaea8fcdca90";
       };
     }
+    {
+      name = "confusing_browser_globals___confusing_browser_globals_1.0.9.tgz";
+      path = fetchurl {
+        name = "confusing_browser_globals___confusing_browser_globals_1.0.9.tgz";
+        url  = "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz";
+        sha1 = "72bc13b483c0276801681871d4898516f8f54fdd";
+      };
+    }
     {
       name = "connect_history_api_fallback___connect_history_api_fallback_1.6.0.tgz";
       path = fetchurl {
@@ -2962,11 +2994,11 @@
       };
     }
     {
-      name = "consola___consola_2.9.0.tgz";
+      name = "consola___consola_2.10.1.tgz";
       path = fetchurl {
-        name = "consola___consola_2.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/consola/-/consola-2.9.0.tgz";
-        sha1 = "57760e3a65a53ec27337f4add31505802d902278";
+        name = "consola___consola_2.10.1.tgz";
+        url  = "https://registry.yarnpkg.com/consola/-/consola-2.10.1.tgz";
+        sha1 = "4693edba714677c878d520e4c7e4f69306b4b927";
       };
     }
     {
@@ -3074,19 +3106,19 @@
       };
     }
     {
-      name = "copy_to_clipboard___copy_to_clipboard_3.0.8.tgz";
+      name = "copy_to_clipboard___copy_to_clipboard_3.2.0.tgz";
       path = fetchurl {
-        name = "copy_to_clipboard___copy_to_clipboard_3.0.8.tgz";
-        url  = "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.0.8.tgz";
-        sha1 = "f4e82f4a8830dce4666b7eb8ded0c9bcc313aba9";
+        name = "copy_to_clipboard___copy_to_clipboard_3.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.2.0.tgz";
+        sha1 = "d2724a3ccbfed89706fac8a894872c979ac74467";
       };
     }
     {
-      name = "copy_webpack_plugin___copy_webpack_plugin_5.0.4.tgz";
+      name = "copy_webpack_plugin___copy_webpack_plugin_5.1.1.tgz";
       path = fetchurl {
-        name = "copy_webpack_plugin___copy_webpack_plugin_5.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.4.tgz";
-        sha1 = "c78126f604e24f194c6ec2f43a64e232b5d43655";
+        name = "copy_webpack_plugin___copy_webpack_plugin_5.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz";
+        sha1 = "5481a03dea1123d88a988c6ff8b78247214f0b88";
       };
     }
     {
@@ -3849,14 +3881,6 @@
         sha1 = "d459689e8d654ba77e02a817f8710d702cb16e9d";
       };
     }
-    {
-      name = "del___del_2.2.2.tgz";
-      path = fetchurl {
-        name = "del___del_2.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz";
-        sha1 = "c12c981d067846c84bcaf862cff930d907ffd1a8";
-      };
-    }
     {
       name = "del___del_4.1.1.tgz";
       path = fetchurl {
@@ -4034,11 +4058,11 @@
       };
     }
     {
-      name = "doctrine___doctrine_2.1.0.tgz";
+      name = "doctrine___doctrine_3.0.0.tgz";
       path = fetchurl {
-        name = "doctrine___doctrine_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz";
-        sha1 = "5cd01fc101621b42c4cd7f5d1a66243716d3f39d";
+        name = "doctrine___doctrine_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz";
+        sha1 = "addebead72a6574db783639dc87a121773973961";
       };
     }
     {
@@ -4170,11 +4194,11 @@
       };
     }
     {
-      name = "echarts___echarts_4.2.1.tgz";
+      name = "echarts___echarts_4.6.0.tgz";
       path = fetchurl {
-        name = "echarts___echarts_4.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/echarts/-/echarts-4.2.1.tgz";
-        sha1 = "9a8ea3b03354f86f824d97625c334cf16965ef03";
+        name = "echarts___echarts_4.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/echarts/-/echarts-4.6.0.tgz";
+        sha1 = "b5a47a1046cec93ceeef954f9ee54751340558ec";
       };
     }
     {
@@ -4346,11 +4370,11 @@
       };
     }
     {
-      name = "es_abstract___es_abstract_1.16.2.tgz";
+      name = "es_abstract___es_abstract_1.17.4.tgz";
       path = fetchurl {
-        name = "es_abstract___es_abstract_1.16.2.tgz";
-        url  = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.2.tgz";
-        sha1 = "4e874331645e9925edef141e74fc4bd144669d34";
+        name = "es_abstract___es_abstract_1.17.4.tgz";
+        url  = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz";
+        sha1 = "e3aedf19706b20e7c2594c35fc0d57605a79e184";
       };
     }
     {
@@ -4402,27 +4426,27 @@
       };
     }
     {
-      name = "eslint_config_airbnb_base___eslint_config_airbnb_base_13.1.0.tgz";
+      name = "eslint_config_airbnb_base___eslint_config_airbnb_base_14.0.0.tgz";
       path = fetchurl {
-        name = "eslint_config_airbnb_base___eslint_config_airbnb_base_13.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.1.0.tgz";
-        sha1 = "b5a1b480b80dfad16433d6c4ad84e6605052c05c";
+        name = "eslint_config_airbnb_base___eslint_config_airbnb_base_14.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.0.0.tgz";
+        sha1 = "8a7bcb9643d13c55df4dd7444f138bf4efa61e17";
       };
     }
     {
-      name = "eslint_config_prettier___eslint_config_prettier_3.3.0.tgz";
+      name = "eslint_config_prettier___eslint_config_prettier_6.10.0.tgz";
       path = fetchurl {
-        name = "eslint_config_prettier___eslint_config_prettier_3.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-3.3.0.tgz";
-        sha1 = "41afc8d3b852e757f06274ed6c44ca16f939a57d";
+        name = "eslint_config_prettier___eslint_config_prettier_6.10.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.10.0.tgz";
+        sha1 = "7b15e303bf9c956875c948f6b21500e48ded6a7f";
       };
     }
     {
-      name = "eslint_import_resolver_jest___eslint_import_resolver_jest_2.1.1.tgz";
+      name = "eslint_import_resolver_jest___eslint_import_resolver_jest_2.1.2.tgz";
       path = fetchurl {
-        name = "eslint_import_resolver_jest___eslint_import_resolver_jest_2.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-import-resolver-jest/-/eslint-import-resolver-jest-2.1.1.tgz";
-        sha1 = "78c1934e3b5b77283326f036e089cc3b9fae6346";
+        name = "eslint_import_resolver_jest___eslint_import_resolver_jest_2.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-import-resolver-jest/-/eslint-import-resolver-jest-2.1.2.tgz";
+        sha1 = "8720fbe8b8498e95cb2bc6ef52b46b713aedaa59";
       };
     }
     {
@@ -4434,19 +4458,27 @@
       };
     }
     {
-      name = "eslint_import_resolver_webpack___eslint_import_resolver_webpack_0.10.1.tgz";
+      name = "eslint_import_resolver_webpack___eslint_import_resolver_webpack_0.12.1.tgz";
       path = fetchurl {
-        name = "eslint_import_resolver_webpack___eslint_import_resolver_webpack_0.10.1.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.10.1.tgz";
-        sha1 = "4cbceed2c0c43e488a74775c30861e58e00fb290";
+        name = "eslint_import_resolver_webpack___eslint_import_resolver_webpack_0.12.1.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.12.1.tgz";
+        sha1 = "771ae561e887ca4e53ee87605fbb36c5e290b0f5";
       };
     }
     {
-      name = "eslint_module_utils___eslint_module_utils_2.4.1.tgz";
+      name = "eslint_module_utils___eslint_module_utils_2.5.2.tgz";
       path = fetchurl {
-        name = "eslint_module_utils___eslint_module_utils_2.4.1.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz";
-        sha1 = "7b4675875bf96b0dbf1b21977456e5bb1f5e018c";
+        name = "eslint_module_utils___eslint_module_utils_2.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz";
+        sha1 = "7878f7504824e1b857dd2505b59a8e5eda26a708";
+      };
+    }
+    {
+      name = "eslint_plugin_babel___eslint_plugin_babel_5.3.0.tgz";
+      path = fetchurl {
+        name = "eslint_plugin_babel___eslint_plugin_babel_5.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-5.3.0.tgz";
+        sha1 = "2e7f251ccc249326da760c1a4c948a91c32d0023";
       };
     }
     {
@@ -4458,19 +4490,19 @@
       };
     }
     {
-      name = "eslint_plugin_import___eslint_plugin_import_2.18.2.tgz";
+      name = "eslint_plugin_import___eslint_plugin_import_2.20.1.tgz";
       path = fetchurl {
-        name = "eslint_plugin_import___eslint_plugin_import_2.18.2.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz";
-        sha1 = "02f1180b90b077b33d447a17a2326ceb400aceb6";
+        name = "eslint_plugin_import___eslint_plugin_import_2.20.1.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz";
+        sha1 = "802423196dcb11d9ce8435a5fc02a6d3b46939b3";
       };
     }
     {
-      name = "eslint_plugin_jasmine___eslint_plugin_jasmine_2.10.1.tgz";
+      name = "eslint_plugin_jasmine___eslint_plugin_jasmine_4.1.0.tgz";
       path = fetchurl {
-        name = "eslint_plugin_jasmine___eslint_plugin_jasmine_2.10.1.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-plugin-jasmine/-/eslint-plugin-jasmine-2.10.1.tgz";
-        sha1 = "5733b709e751f4bc40e31e1c16989bd2cdfbec97";
+        name = "eslint_plugin_jasmine___eslint_plugin_jasmine_4.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-jasmine/-/eslint-plugin-jasmine-4.1.0.tgz";
+        sha1 = "4f6d41b1a8622348c97559cbcd29badffa74dbfa";
       };
     }
     {
@@ -4482,43 +4514,35 @@
       };
     }
     {
-      name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.3.0.tgz";
+      name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.3.1.tgz";
       path = fetchurl {
-        name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.3.0.tgz";
-        sha1 = "fccdad84afa61baa4c0527dd6249cdcbfa0f74a8";
+        name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.3.1.tgz";
+        sha1 = "1c364cb863a38cc1570c8020155b6004cca62178";
       };
     }
     {
-      name = "eslint_plugin_promise___eslint_plugin_promise_4.1.1.tgz";
+      name = "eslint_plugin_promise___eslint_plugin_promise_4.2.1.tgz";
       path = fetchurl {
-        name = "eslint_plugin_promise___eslint_plugin_promise_4.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.1.1.tgz";
-        sha1 = "1e08cb68b5b2cd8839f8d5864c796f56d82746db";
+        name = "eslint_plugin_promise___eslint_plugin_promise_4.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz";
+        sha1 = "845fd8b2260ad8f82564c1222fce44ad71d9418a";
       };
     }
     {
-      name = "eslint_plugin_vue___eslint_plugin_vue_5.0.0.tgz";
+      name = "eslint_plugin_vue___eslint_plugin_vue_6.1.2.tgz";
       path = fetchurl {
-        name = "eslint_plugin_vue___eslint_plugin_vue_5.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-5.0.0.tgz";
-        sha1 = "4a2cc1c0e71ea45e1bd9c1a60f925bfe68bb5710";
+        name = "eslint_plugin_vue___eslint_plugin_vue_6.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-6.1.2.tgz";
+        sha1 = "4b05c28c83c0ec912669b64dbd998bb8bf692ef6";
       };
     }
     {
-      name = "eslint_restricted_globals___eslint_restricted_globals_0.1.1.tgz";
+      name = "eslint_rule_composer___eslint_rule_composer_0.3.0.tgz";
       path = fetchurl {
-        name = "eslint_restricted_globals___eslint_restricted_globals_0.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-restricted-globals/-/eslint-restricted-globals-0.1.1.tgz";
-        sha1 = "35f0d5cbc64c2e3ed62e93b4b1a7af05ba7ed4d7";
-      };
-    }
-    {
-      name = "eslint_scope___eslint_scope_3.7.1.tgz";
-      path = fetchurl {
-        name = "eslint_scope___eslint_scope_3.7.1.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz";
-        sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8";
+        name = "eslint_rule_composer___eslint_rule_composer_0.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz";
+        sha1 = "79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9";
       };
     }
     {
@@ -4530,43 +4554,43 @@
       };
     }
     {
-      name = "eslint_utils___eslint_utils_1.4.2.tgz";
+      name = "eslint_scope___eslint_scope_5.0.0.tgz";
       path = fetchurl {
-        name = "eslint_utils___eslint_utils_1.4.2.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz";
-        sha1 = "166a5180ef6ab7eb462f162fd0e6f2463d7309ab";
+        name = "eslint_scope___eslint_scope_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz";
+        sha1 = "e87c8887c73e8d1ec84f1ca591645c358bfc8fb9";
       };
     }
     {
-      name = "eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz";
+      name = "eslint_utils___eslint_utils_1.4.3.tgz";
       path = fetchurl {
-        name = "eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz";
-        sha1 = "3f3180fb2e291017716acb4c9d6d5b5c34a6a81d";
+        name = "eslint_utils___eslint_utils_1.4.3.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz";
+        sha1 = "74fec7c54d0776b6f67e0251040b5806564e981f";
       };
     }
     {
-      name = "eslint___eslint_5.9.0.tgz";
+      name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz";
       path = fetchurl {
-        name = "eslint___eslint_5.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/eslint/-/eslint-5.9.0.tgz";
-        sha1 = "b234b6d15ef84b5849c6de2af43195a2d59d408e";
+        name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz";
+        sha1 = "e2a82cea84ff246ad6fb57f9bde5b46621459ec2";
       };
     }
     {
-      name = "espree___espree_4.1.0.tgz";
+      name = "eslint___eslint_6.8.0.tgz";
       path = fetchurl {
-        name = "espree___espree_4.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/espree/-/espree-4.1.0.tgz";
-        sha1 = "728d5451e0fd156c04384a7ad89ed51ff54eb25f";
+        name = "eslint___eslint_6.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz";
+        sha1 = "62262d6729739f9275723824302fb227c8c93ffb";
       };
     }
     {
-      name = "espree___espree_5.0.1.tgz";
+      name = "espree___espree_6.1.2.tgz";
       path = fetchurl {
-        name = "espree___espree_5.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz";
-        sha1 = "5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a";
+        name = "espree___espree_6.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz";
+        sha1 = "6c272650932b4f91c3714e5e7b5f5e2ecf47262d";
       };
     }
     {
@@ -4778,11 +4802,11 @@
       };
     }
     {
-      name = "external_editor___external_editor_3.0.0.tgz";
+      name = "external_editor___external_editor_3.1.0.tgz";
       path = fetchurl {
-        name = "external_editor___external_editor_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.0.tgz";
-        sha1 = "dc35c48c6f98a30ca27a20e9687d7f3c77704bb6";
+        name = "external_editor___external_editor_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz";
+        sha1 = "cb03f740befae03ea4d283caed2741a83f335495";
       };
     }
     {
@@ -4818,11 +4842,11 @@
       };
     }
     {
-      name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz";
+      name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz";
       path = fetchurl {
-        name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz";
-        sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
+        name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz";
+        sha1 = "545145077c501491e33b15ec408c294376e94ae4";
       };
     }
     {
@@ -4898,19 +4922,11 @@
       };
     }
     {
-      name = "figures___figures_2.0.0.tgz";
+      name = "figures___figures_3.2.0.tgz";
       path = fetchurl {
-        name = "figures___figures_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz";
-        sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962";
-      };
-    }
-    {
-      name = "file_entry_cache___file_entry_cache_2.0.0.tgz";
-      path = fetchurl {
-        name = "file_entry_cache___file_entry_cache_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz";
-        sha1 = "c392990c3e684783d838b8c84a45d8a048458361";
+        name = "figures___figures_3.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz";
+        sha1 = "625c18bd293c604dc4a8ddb2febf0c88341746af";
       };
     }
     {
@@ -5041,14 +5057,6 @@
         sha1 = "17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1";
       };
     }
-    {
-      name = "flat_cache___flat_cache_1.2.2.tgz";
-      path = fetchurl {
-        name = "flat_cache___flat_cache_1.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.2.2.tgz";
-        sha1 = "fa86714e72c21db88601761ecf2f555d1abc6b96";
-      };
-    }
     {
       name = "flat_cache___flat_cache_2.0.1.tgz";
       path = fetchurl {
@@ -5169,6 +5177,14 @@
         sha1 = "2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07";
       };
     }
+    {
+      name = "fs_minipass___fs_minipass_2.0.0.tgz";
+      path = fetchurl {
+        name = "fs_minipass___fs_minipass_2.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.0.0.tgz";
+        sha1 = "a6415edab02fae4b9e9230bc87ee2e4472003cd1";
+      };
+    }
     {
       name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz";
       path = fetchurl {
@@ -5434,11 +5450,11 @@
       };
     }
     {
-      name = "globby___globby_5.0.0.tgz";
+      name = "globals___globals_12.3.0.tgz";
       path = fetchurl {
-        name = "globby___globby_5.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz";
-        sha1 = "ebd84667ca0dbb330b99bcfc68eac2bc54370e0d";
+        name = "globals___globals_12.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz";
+        sha1 = "1e564ee5c4dded2ab098b0f88f24702a3c56be13";
       };
     }
     {
@@ -5506,11 +5522,11 @@
       };
     }
     {
-      name = "graceful_fs___graceful_fs_4.2.0.tgz";
+      name = "graceful_fs___graceful_fs_4.2.3.tgz";
       path = fetchurl {
-        name = "graceful_fs___graceful_fs_4.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz";
-        sha1 = "8d8fdc73977cb04104721cb53666c1ca64cd328b";
+        name = "graceful_fs___graceful_fs_4.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz";
+        sha1 = "4a12ff1b60376ef09862c2093edd908328be8423";
       };
     }
     {
@@ -5570,11 +5586,11 @@
       };
     }
     {
-      name = "handlebars___handlebars_4.1.2.tgz";
+      name = "handlebars___handlebars_4.7.2.tgz";
       path = fetchurl {
-        name = "handlebars___handlebars_4.1.2.tgz";
-        url  = "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz";
-        sha1 = "b6b37c1ced0306b221e094fc7aca3ec23b131b67";
+        name = "handlebars___handlebars_4.7.2.tgz";
+        url  = "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.2.tgz";
+        sha1 = "01127b3840156a0927058779482031afe0e730d7";
       };
     }
     {
@@ -5969,6 +5985,14 @@
         sha1 = "d81355c15612d386c61f9ddd3922d4304822a546";
       };
     }
+    {
+      name = "import_fresh___import_fresh_3.2.1.tgz";
+      path = fetchurl {
+        name = "import_fresh___import_fresh_3.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz";
+        sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66";
+      };
+    }
     {
       name = "import_lazy___import_lazy_2.1.0.tgz";
       path = fetchurl {
@@ -6033,6 +6057,14 @@
         sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289";
       };
     }
+    {
+      name = "indent_string___indent_string_4.0.0.tgz";
+      path = fetchurl {
+        name = "indent_string___indent_string_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz";
+        sha1 = "624f8f4497d619b2d9768531d58f4122854d7251";
+      };
+    }
     {
       name = "indexes_of___indexes_of_1.0.1.tgz";
       path = fetchurl {
@@ -6090,11 +6122,11 @@
       };
     }
     {
-      name = "inquirer___inquirer_6.2.0.tgz";
+      name = "inquirer___inquirer_7.0.4.tgz";
       path = fetchurl {
-        name = "inquirer___inquirer_6.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz";
-        sha1 = "51adcd776f661369dc1e894859c2560a224abdd8";
+        name = "inquirer___inquirer_7.0.4.tgz";
+        url  = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.4.tgz";
+        sha1 = "99af5bde47153abca23f5c7fc30db247f39da703";
       };
     }
     {
@@ -6250,11 +6282,11 @@
       };
     }
     {
-      name = "is_callable___is_callable_1.1.4.tgz";
+      name = "is_callable___is_callable_1.1.5.tgz";
       path = fetchurl {
-        name = "is_callable___is_callable_1.1.4.tgz";
-        url  = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz";
-        sha1 = "1e1adf219e1eeb684d691f9d6a05ff0d30a24d75";
+        name = "is_callable___is_callable_1.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz";
+        sha1 = "f7e46b596890456db74e7f6e976cb3273d06faab";
       };
     }
     {
@@ -6457,14 +6489,6 @@
         sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f";
       };
     }
-    {
-      name = "is_path_cwd___is_path_cwd_1.0.0.tgz";
-      path = fetchurl {
-        name = "is_path_cwd___is_path_cwd_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz";
-        sha1 = "d225ec23132e89edd38fda767472e62e65f1106d";
-      };
-    }
     {
       name = "is_path_cwd___is_path_cwd_2.2.0.tgz";
       path = fetchurl {
@@ -6473,14 +6497,6 @@
         sha1 = "67d43b82664a7b5191fd9119127eb300048a9fdb";
       };
     }
-    {
-      name = "is_path_in_cwd___is_path_in_cwd_1.0.0.tgz";
-      path = fetchurl {
-        name = "is_path_in_cwd___is_path_in_cwd_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz";
-        sha1 = "6477582b8214d602346094567003be8a9eac04dc";
-      };
-    }
     {
       name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz";
       path = fetchurl {
@@ -6538,11 +6554,11 @@
       };
     }
     {
-      name = "is_regex___is_regex_1.0.4.tgz";
+      name = "is_regex___is_regex_1.0.5.tgz";
       path = fetchurl {
-        name = "is_regex___is_regex_1.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz";
-        sha1 = "5517489b547091b0930e095654ced25ee97e9491";
+        name = "is_regex___is_regex_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz";
+        sha1 = "39d589a358bf18967f726967120b8fc1aed74eae";
       };
     }
     {
@@ -6561,14 +6577,6 @@
         sha1 = "cd734a56864e23b956bf4e7c66c396a4c0b22c2d";
       };
     }
-    {
-      name = "is_resolvable___is_resolvable_1.1.0.tgz";
-      path = fetchurl {
-        name = "is_resolvable___is_resolvable_1.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz";
-        sha1 = "fb18f87ce1feb925169c9a407c19318a3206ed88";
-      };
-    }
     {
       name = "is_retry_allowed___is_retry_allowed_1.1.0.tgz";
       path = fetchurl {
@@ -7106,11 +7114,11 @@
       };
     }
     {
-      name = "js_beautify___js_beautify_1.10.2.tgz";
+      name = "js_beautify___js_beautify_1.10.3.tgz";
       path = fetchurl {
-        name = "js_beautify___js_beautify_1.10.2.tgz";
-        url  = "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.10.2.tgz";
-        sha1 = "88c9099cd6559402b124cfab18754936f8a7b178";
+        name = "js_beautify___js_beautify_1.10.3.tgz";
+        url  = "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.10.3.tgz";
+        sha1 = "c73fa10cf69d3dfa52d8ed624f23c64c0a6a94c1";
       };
     }
     {
@@ -8137,14 +8145,6 @@
         sha1 = "bd7b91135fc6b01cde3e9bae33d659b63d8857e5";
       };
     }
-    {
-      name = "mimic_fn___mimic_fn_1.2.0.tgz";
-      path = fetchurl {
-        name = "mimic_fn___mimic_fn_1.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz";
-        sha1 = "820c86a39334640e99516928bd03fca88057d022";
-      };
-    }
     {
       name = "mimic_fn___mimic_fn_2.1.0.tgz";
       path = fetchurl {
@@ -8217,6 +8217,30 @@
         sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
       };
     }
+    {
+      name = "minipass_collect___minipass_collect_1.0.2.tgz";
+      path = fetchurl {
+        name = "minipass_collect___minipass_collect_1.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz";
+        sha1 = "22b813bf745dc6edba2576b940022ad6edc8c617";
+      };
+    }
+    {
+      name = "minipass_flush___minipass_flush_1.0.5.tgz";
+      path = fetchurl {
+        name = "minipass_flush___minipass_flush_1.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz";
+        sha1 = "82e7135d7e89a50ffe64610a787953c4c4cbb373";
+      };
+    }
+    {
+      name = "minipass_pipeline___minipass_pipeline_1.2.2.tgz";
+      path = fetchurl {
+        name = "minipass_pipeline___minipass_pipeline_1.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz";
+        sha1 = "3dcb6bb4a546e32969c7ad710f2c79a86abba93a";
+      };
+    }
     {
       name = "minipass___minipass_2.3.5.tgz";
       path = fetchurl {
@@ -8225,6 +8249,14 @@
         sha1 = "cacebe492022497f656b0f0f51e2682a9ed2d848";
       };
     }
+    {
+      name = "minipass___minipass_3.1.1.tgz";
+      path = fetchurl {
+        name = "minipass___minipass_3.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz";
+        sha1 = "7607ce778472a185ad6d89082aa2070f79cedcd5";
+      };
+    }
     {
       name = "minizlib___minizlib_1.2.1.tgz";
       path = fetchurl {
@@ -8338,11 +8370,11 @@
       };
     }
     {
-      name = "mute_stream___mute_stream_0.0.7.tgz";
+      name = "mute_stream___mute_stream_0.0.8.tgz";
       path = fetchurl {
-        name = "mute_stream___mute_stream_0.0.7.tgz";
-        url  = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz";
-        sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab";
+        name = "mute_stream___mute_stream_0.0.8.tgz";
+        url  = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz";
+        sha1 = "1630c42b2251ff81e2a283de96a5497ea92e5e0d";
       };
     }
     {
@@ -8690,11 +8722,11 @@
       };
     }
     {
-      name = "object.entries___object.entries_1.0.4.tgz";
+      name = "object.entries___object.entries_1.1.1.tgz";
       path = fetchurl {
-        name = "object.entries___object.entries_1.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.0.4.tgz";
-        sha1 = "1bf9a4dd2288f5b33f3a993d257661f05d161a5f";
+        name = "object.entries___object.entries_1.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz";
+        sha1 = "ee1cf04153de02bb093fec33683900f57ce5399b";
       };
     }
     {
@@ -8754,11 +8786,11 @@
       };
     }
     {
-      name = "onetime___onetime_2.0.1.tgz";
+      name = "onetime___onetime_5.1.0.tgz";
       path = fetchurl {
-        name = "onetime___onetime_2.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz";
-        sha1 = "067428230fd67443b2794b22bba528b6867962d4";
+        name = "onetime___onetime_5.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz";
+        sha1 = "fff0f3c91617fe62bb50189636e99ac8a6df7be5";
       };
     }
     {
@@ -8794,11 +8826,11 @@
       };
     }
     {
-      name = "optionator___optionator_0.8.2.tgz";
+      name = "optionator___optionator_0.8.3.tgz";
       path = fetchurl {
-        name = "optionator___optionator_0.8.2.tgz";
-        url  = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz";
-        sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64";
+        name = "optionator___optionator_0.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz";
+        sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495";
       };
     }
     {
@@ -8906,11 +8938,11 @@
       };
     }
     {
-      name = "p_limit___p_limit_2.2.0.tgz";
+      name = "p_limit___p_limit_2.2.2.tgz";
       path = fetchurl {
-        name = "p_limit___p_limit_2.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz";
-        sha1 = "417c9941e6027a9abcba5092dd2904e255b5fbc2";
+        name = "p_limit___p_limit_2.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz";
+        sha1 = "61279b67721f5287aa1c13a9a7fbbc48c9291b1e";
       };
     }
     {
@@ -8945,6 +8977,14 @@
         sha1 = "310928feef9c9ecc65b68b17693018a665cea175";
       };
     }
+    {
+      name = "p_map___p_map_3.0.0.tgz";
+      path = fetchurl {
+        name = "p_map___p_map_3.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz";
+        sha1 = "d704d9af8a2ba684e2600d9a215983d4141a979d";
+      };
+    }
     {
       name = "p_reduce___p_reduce_1.0.0.tgz";
       path = fetchurl {
@@ -9009,6 +9049,14 @@
         sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247";
       };
     }
+    {
+      name = "parent_module___parent_module_1.0.1.tgz";
+      path = fetchurl {
+        name = "parent_module___parent_module_1.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz";
+        sha1 = "691d2709e78c79fae3a156622452d00762caaaa2";
+      };
+    }
     {
       name = "parse_asn1___parse_asn1_5.1.0.tgz";
       path = fetchurl {
@@ -9329,14 +9377,6 @@
         sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3";
       };
     }
-    {
-      name = "pluralize___pluralize_7.0.0.tgz";
-      path = fetchurl {
-        name = "pluralize___pluralize_7.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz";
-        sha1 = "298b89df8b93b0221dbf421ad2b1b1ea23fc6777";
-      };
-    }
     {
       name = "pn___pn_1.1.0.tgz";
       path = fetchurl {
@@ -9362,19 +9402,19 @@
       };
     }
     {
-      name = "popper.js___popper.js_1.15.0.tgz";
+      name = "popper.js___popper.js_1.16.0.tgz";
       path = fetchurl {
-        name = "popper.js___popper.js_1.15.0.tgz";
-        url  = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.15.0.tgz";
-        sha1 = "5560b99bbad7647e9faa475c6b8056621f5a4ff2";
+        name = "popper.js___popper.js_1.16.0.tgz";
+        url  = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.0.tgz";
+        sha1 = "2e1816bcbbaa518ea6c2e15a466f4cb9c6e2fbb3";
       };
     }
     {
-      name = "portal_vue___portal_vue_2.1.7.tgz";
+      name = "portal_vue___portal_vue_2.1.6.tgz";
       path = fetchurl {
-        name = "portal_vue___portal_vue_2.1.7.tgz";
-        url  = "https://registry.yarnpkg.com/portal-vue/-/portal-vue-2.1.7.tgz";
-        sha1 = "ea08069b25b640ca08a5b86f67c612f15f4e4ad4";
+        name = "portal_vue___portal_vue_2.1.6.tgz";
+        url  = "https://registry.yarnpkg.com/portal-vue/-/portal-vue-2.1.6.tgz";
+        sha1 = "a7d4790b14a79af7fd159a60ec88c30cddc6c639";
       };
     }
     {
@@ -9658,11 +9698,11 @@
       };
     }
     {
-      name = "progress___progress_2.0.0.tgz";
+      name = "progress___progress_2.0.3.tgz";
       path = fetchurl {
-        name = "progress___progress_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz";
-        sha1 = "8a1be366bf8fc23db2bd23f10c6fe920b4389d1f";
+        name = "progress___progress_2.0.3.tgz";
+        url  = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz";
+        sha1 = "7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8";
       };
     }
     {
@@ -10370,11 +10410,11 @@
       };
     }
     {
-      name = "require_uncached___require_uncached_1.0.3.tgz";
+      name = "require_package_name___require_package_name_2.0.1.tgz";
       path = fetchurl {
-        name = "require_uncached___require_uncached_1.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz";
-        sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3";
+        name = "require_package_name___require_package_name_2.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/require-package-name/-/require-package-name-2.0.1.tgz";
+        sha1 = "c11e97276b65b8e2923f75dabf5fb2ef0c3841b9";
       };
     }
     {
@@ -10425,14 +10465,6 @@
         sha1 = "79a40644c362be82f26effe739c9bb5382046f43";
       };
     }
-    {
-      name = "resolve_from___resolve_from_1.0.1.tgz";
-      path = fetchurl {
-        name = "resolve_from___resolve_from_1.0.1.tgz";
-        url  = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz";
-        sha1 = "26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226";
-      };
-    }
     {
       name = "resolve_from___resolve_from_3.0.0.tgz";
       path = fetchurl {
@@ -10441,6 +10473,14 @@
         sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748";
       };
     }
+    {
+      name = "resolve_from___resolve_from_4.0.0.tgz";
+      path = fetchurl {
+        name = "resolve_from___resolve_from_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz";
+        sha1 = "4abcd852ad32dd7baabfe9b40e00a36db5f392e6";
+      };
+    }
     {
       name = "resolve_from___resolve_from_5.0.0.tgz";
       path = fetchurl {
@@ -10466,19 +10506,19 @@
       };
     }
     {
-      name = "resolve___resolve_1.12.0.tgz";
+      name = "resolve___resolve_1.15.0.tgz";
       path = fetchurl {
-        name = "resolve___resolve_1.12.0.tgz";
-        url  = "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz";
-        sha1 = "3fc644a35c84a48554609ff26ec52b66fa577df6";
+        name = "resolve___resolve_1.15.0.tgz";
+        url  = "https://registry.yarnpkg.com/resolve/-/resolve-1.15.0.tgz";
+        sha1 = "1b7ca96073ebb52e741ffd799f6b39ea462c67f5";
       };
     }
     {
-      name = "restore_cursor___restore_cursor_2.0.0.tgz";
+      name = "restore_cursor___restore_cursor_3.1.0.tgz";
       path = fetchurl {
-        name = "restore_cursor___restore_cursor_2.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz";
-        sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf";
+        name = "restore_cursor___restore_cursor_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz";
+        sha1 = "39f67c54b3a7a58cea5236d95cf0034239631f7e";
       };
     }
     {
@@ -10505,6 +10545,14 @@
         sha1 = "ba72cc1367a0ccd9cf81a870b3b58bd3ad07f8c2";
       };
     }
+    {
+      name = "rimraf___rimraf_2.7.1.tgz";
+      path = fetchurl {
+        name = "rimraf___rimraf_2.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz";
+        sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec";
+      };
+    }
     {
       name = "rimraf___rimraf_2.6.3.tgz";
       path = fetchurl {
@@ -10562,11 +10610,11 @@
       };
     }
     {
-      name = "rxjs___rxjs_6.2.1.tgz";
+      name = "rxjs___rxjs_6.5.4.tgz";
       path = fetchurl {
-        name = "rxjs___rxjs_6.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.1.tgz";
-        sha1 = "246cebec189a6cbc143a3ef9f62d6f4c91813ca1";
+        name = "rxjs___rxjs_6.5.4.tgz";
+        url  = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz";
+        sha1 = "e0777fe0d184cec7872df147f303572d414e211c";
       };
     }
     {
@@ -10650,11 +10698,11 @@
       };
     }
     {
-      name = "schema_utils___schema_utils_2.2.0.tgz";
+      name = "schema_utils___schema_utils_2.6.1.tgz";
       path = fetchurl {
-        name = "schema_utils___schema_utils_2.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.2.0.tgz";
-        sha1 = "48a065ce219e0cacf4631473159037b2c1ae82da";
+        name = "schema_utils___schema_utils_2.6.1.tgz";
+        url  = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.1.tgz";
+        sha1 = "eb78f0b945c7bcfa2082b3565e8db3548011dc4f";
       };
     }
     {
@@ -10714,11 +10762,11 @@
       };
     }
     {
-      name = "semver___semver_5.7.0.tgz";
+      name = "semver___semver_5.7.1.tgz";
       path = fetchurl {
-        name = "semver___semver_5.7.0.tgz";
-        url  = "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz";
-        sha1 = "790a7cf6fea5459bac96110b29b60412dc8ff96b";
+        name = "semver___semver_5.7.1.tgz";
+        url  = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz";
+        sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7";
       };
     }
     {
@@ -10745,14 +10793,6 @@
         sha1 = "c1d8b059f7900f7466dd4938bdc44e11ddb376c8";
       };
     }
-    {
-      name = "serialize_javascript___serialize_javascript_1.7.0.tgz";
-      path = fetchurl {
-        name = "serialize_javascript___serialize_javascript_1.7.0.tgz";
-        url  = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.7.0.tgz";
-        sha1 = "d6e0dfb2a3832a8c94468e6eb1db97e55a192a65";
-      };
-    }
     {
       name = "serialize_javascript___serialize_javascript_2.1.2.tgz";
       path = fetchurl {
@@ -10825,14 +10865,6 @@
         sha1 = "b1fde5cd7d11a5626638a07c604ab909cfa31f9b";
       };
     }
-    {
-      name = "sha1___sha1_1.1.1.tgz";
-      path = fetchurl {
-        name = "sha1___sha1_1.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/sha1/-/sha1-1.1.1.tgz";
-        sha1 = "addaa7a93168f393f19eb2b15091618e2700f848";
-      };
-    }
     {
       name = "shallow_clone___shallow_clone_3.0.1.tgz";
       path = fetchurl {
@@ -11185,6 +11217,14 @@
         sha1 = "2a3c41b28dd45b62b63676ecb74001265ae9edd8";
       };
     }
+    {
+      name = "ssri___ssri_7.1.0.tgz";
+      path = fetchurl {
+        name = "ssri___ssri_7.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/ssri/-/ssri-7.1.0.tgz";
+        sha1 = "92c241bf6de82365b5c7fb4bd76e975522e1294d";
+      };
+    }
     {
       name = "stack_utils___stack_utils_1.0.2.tgz";
       path = fetchurl {
@@ -11330,19 +11370,19 @@
       };
     }
     {
-      name = "string.prototype.trimleft___string.prototype.trimleft_2.1.0.tgz";
+      name = "string.prototype.trimleft___string.prototype.trimleft_2.1.1.tgz";
       path = fetchurl {
-        name = "string.prototype.trimleft___string.prototype.trimleft_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz";
-        sha1 = "6cc47f0d7eb8d62b0f3701611715a3954591d634";
+        name = "string.prototype.trimleft___string.prototype.trimleft_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz";
+        sha1 = "9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74";
       };
     }
     {
-      name = "string.prototype.trimright___string.prototype.trimright_2.1.0.tgz";
+      name = "string.prototype.trimright___string.prototype.trimright_2.1.1.tgz";
       path = fetchurl {
-        name = "string.prototype.trimright___string.prototype.trimright_2.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz";
-        sha1 = "669d164be9df9b6f7559fa8e89945b168a5a6c58";
+        name = "string.prototype.trimright___string.prototype.trimright_2.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz";
+        sha1 = "440314b15996c866ce8a0341894d45186200c5d9";
       };
     }
     {
@@ -11441,6 +11481,14 @@
         sha1 = "5ef8db295d01e6ed6cbf7aab96998d7822527b68";
       };
     }
+    {
+      name = "strip_json_comments___strip_json_comments_3.0.1.tgz";
+      path = fetchurl {
+        name = "strip_json_comments___strip_json_comments_3.0.1.tgz";
+        url  = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz";
+        sha1 = "85713975a91fb87bf1b305cca77395e40d2a64a7";
+      };
+    }
     {
       name = "strip_json_comments___strip_json_comments_2.0.1.tgz";
       path = fetchurl {
@@ -12049,6 +12097,14 @@
         sha1 = "d6ef42a0356c6cd45f49485c3b6281fc148e48a2";
       };
     }
+    {
+      name = "type_fest___type_fest_0.8.1.tgz";
+      path = fetchurl {
+        name = "type_fest___type_fest_0.8.1.tgz";
+        url  = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz";
+        sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d";
+      };
+    }
     {
       name = "type_is___type_is_1.6.18.tgz";
       path = fetchurl {
@@ -12370,11 +12426,11 @@
       };
     }
     {
-      name = "url_search_params_polyfill___url_search_params_polyfill_5.0.0.tgz";
+      name = "url_search_params_polyfill___url_search_params_polyfill_5.1.0.tgz";
       path = fetchurl {
-        name = "url_search_params_polyfill___url_search_params_polyfill_5.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/url-search-params-polyfill/-/url-search-params-polyfill-5.0.0.tgz";
-        sha1 = "09b98337c89dcf6c6a6a0bfeb096f6ba83b7526b";
+        name = "url_search_params_polyfill___url_search_params_polyfill_5.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/url-search-params-polyfill/-/url-search-params-polyfill-5.1.0.tgz";
+        sha1 = "f0405dcc2e921bf7f5fdf8c4e616f1e8088ef31b";
       };
     }
     {
@@ -12465,6 +12521,14 @@
         sha1 = "00f7494d2ae2b688cfe2899df6ed2c54bef91dbe";
       };
     }
+    {
+      name = "v8_compile_cache___v8_compile_cache_2.1.0.tgz";
+      path = fetchurl {
+        name = "v8_compile_cache___v8_compile_cache_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz";
+        sha1 = "e14de37b31a6d194f5690d67efc4e7f6fc6ab30e";
+      };
+    }
     {
       name = "validate_npm_package_license___validate_npm_package_license_3.0.1.tgz";
       path = fetchurl {
@@ -12546,19 +12610,11 @@
       };
     }
     {
-      name = "vue_eslint_parser___vue_eslint_parser_4.0.3.tgz";
+      name = "vue_eslint_parser___vue_eslint_parser_7.0.0.tgz";
       path = fetchurl {
-        name = "vue_eslint_parser___vue_eslint_parser_4.0.3.tgz";
-        url  = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-4.0.3.tgz";
-        sha1 = "80cf162e484387b2640371ad21ba1f86e0c10a61";
-      };
-    }
-    {
-      name = "vue_eslint_parser___vue_eslint_parser_6.0.4.tgz";
-      path = fetchurl {
-        name = "vue_eslint_parser___vue_eslint_parser_6.0.4.tgz";
-        url  = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-6.0.4.tgz";
-        sha1 = "56ff47e2c2644bff39951d5a284982c7ecd6f7fa";
+        name = "vue_eslint_parser___vue_eslint_parser_7.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.0.0.tgz";
+        sha1 = "a4ed2669f87179dedd06afdd8736acbb3a3864d6";
       };
     }
     {
@@ -12586,11 +12642,11 @@
       };
     }
     {
-      name = "vue_loader___vue_loader_15.7.1.tgz";
+      name = "vue_loader___vue_loader_15.8.3.tgz";
       path = fetchurl {
-        name = "vue_loader___vue_loader_15.7.1.tgz";
-        url  = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.7.1.tgz";
-        sha1 = "6ccacd4122aa80f69baaac08ff295a62e3aefcfd";
+        name = "vue_loader___vue_loader_15.8.3.tgz";
+        url  = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.8.3.tgz";
+        sha1 = "857cb9e30eb5fc25e66db48dce7e4f768602a23c";
       };
     }
     {
@@ -12857,6 +12913,14 @@
         sha1 = "0142a4e8a243f8882c0233aa0e0281aa76152273";
       };
     }
+    {
+      name = "word_wrap___word_wrap_1.2.3.tgz";
+      path = fetchurl {
+        name = "word_wrap___word_wrap_1.2.3.tgz";
+        url  = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz";
+        sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c";
+      };
+    }
     {
       name = "wordwrap___wordwrap_0.0.3.tgz";
       path = fetchurl {
@@ -12865,14 +12929,6 @@
         sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
       };
     }
-    {
-      name = "wordwrap___wordwrap_1.0.0.tgz";
-      path = fetchurl {
-        name = "wordwrap___wordwrap_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz";
-        sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
-      };
-    }
     {
       name = "worker_farm___worker_farm_1.7.0.tgz";
       path = fetchurl {
@@ -12929,14 +12985,6 @@
         sha1 = "0800e14523b923a387e415123c865616aae0f5c3";
       };
     }
-    {
-      name = "write___write_0.2.1.tgz";
-      path = fetchurl {
-        name = "write___write_0.2.1.tgz";
-        url  = "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz";
-        sha1 = "5fc03828e264cea3fe91455476f7a3c566cb0757";
-      };
-    }
     {
       name = "ws___ws_5.2.2.tgz";
       path = fetchurl {
@@ -13089,6 +13137,14 @@
         sha1 = "b4b049e314be545e3ce802236d6cd22cd91c3de9";
       };
     }
+    {
+      name = "yallist___yallist_4.0.0.tgz";
+      path = fetchurl {
+        name = "yallist___yallist_4.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz";
+        sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72";
+      };
+    }
     {
       name = "yargs_parser___yargs_parser_10.1.0.tgz";
       path = fetchurl {
@@ -13145,6 +13201,14 @@
         sha1 = "6ba318eb16961727f5d284f8ea003e8d6154d0c8";
       };
     }
+    {
+      name = "yarn_check_webpack_plugin___yarn_check_webpack_plugin_1.2.0.tgz";
+      path = fetchurl {
+        name = "yarn_check_webpack_plugin___yarn_check_webpack_plugin_1.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/yarn-check-webpack-plugin/-/yarn-check-webpack-plugin-1.2.0.tgz";
+        sha1 = "0eb00cdcdb430f0494222a3eab1d2832737840cc";
+      };
+    }
     {
       name = "yarn_deduplicate___yarn_deduplicate_1.1.1.tgz";
       path = fetchurl {
@@ -13178,11 +13242,11 @@
       };
     }
     {
-      name = "zrender___zrender_4.0.7.tgz";
+      name = "zrender___zrender_4.2.0.tgz";
       path = fetchurl {
-        name = "zrender___zrender_4.0.7.tgz";
-        url  = "https://registry.yarnpkg.com/zrender/-/zrender-4.0.7.tgz";
-        sha1 = "15ae960822f5efed410995d37e5107fe3de10e6d";
+        name = "zrender___zrender_4.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/zrender/-/zrender-4.2.0.tgz";
+        sha1 = "d001302e155f28de1f9fc7fcd5c254bad28471cf";
       };
     }
   ];

From facef286652520168e26a78b93170a4b4c85d9e2 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Mon, 2 Mar 2020 21:21:35 +0100
Subject: [PATCH 2164/4636] gitaly: 1.83.0 -> 12.8.1

In order to build gitaly, this locally overrides the version of
libgit2, since gitaly is not compatible with the latest version.
---
 .../version-management/gitlab/gitaly/Gemfile  |  4 +-
 .../gitlab/gitaly/Gemfile.lock                | 46 +++++++------
 .../gitlab/gitaly/default.nix                 | 18 +++--
 .../version-management/gitlab/gitaly/deps.nix |  8 +--
 .../gitlab/gitaly/gemset.nix                  | 68 +++++++++++--------
 5 files changed, 85 insertions(+), 59 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
index 81a8d9f69c89..1d7cf17161c9 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
@@ -6,7 +6,7 @@ gem 'bundler', '>= 1.17.3'
 gem 'rugged', '~> 0.28'
 gem 'github-linguist', '~> 7.5', require: 'linguist'
 gem 'gitlab-markup', '~> 1.7.0'
-gem 'activesupport', '~> 5.2.3'
+gem 'activesupport', '6.0.2'
 gem 'rdoc', '~> 6.0'
 gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false
 gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false
@@ -16,7 +16,7 @@ gem 'faraday', '~> 0.12'
 gem 'rbtrace', require: false
 
 # Labkit provides observability functionality
-gem 'gitlab-labkit', '~> 0.5.0'
+gem 'gitlab-labkit', '~> 0.9.1'
 
 # Detects the open source license the repository includes
 # This version needs to be in sync with GitLab CE/EE
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
index c095ad39f516..e3f7865226a2 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
@@ -2,24 +2,25 @@ GEM
   remote: https://rubygems.org/
   specs:
     abstract_type (0.0.7)
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
+    actionpack (6.0.2)
+      actionview (= 6.0.2)
+      activesupport (= 6.0.2)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.0.2)
+      activesupport (= 6.0.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (5.2.3)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activesupport (6.0.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
     adamantium (0.2.0)
       ice_nine (~> 0.11.0)
       memoizable (~> 0.4.0)
@@ -27,7 +28,7 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     ast (2.4.0)
     binding_ninja (0.2.3)
-    builder (3.2.3)
+    builder (3.2.4)
     charlock_holmes (0.7.6)
     coderay (1.1.2)
     concord (0.1.5)
@@ -36,11 +37,11 @@ GEM
     concurrent-ruby (1.1.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    crass (1.0.5)
+    crass (1.0.6)
     diff-lcs (1.3)
     docile (1.3.2)
     equalizer (0.0.11)
-    erubi (1.8.0)
+    erubi (1.9.0)
     escape_utils (1.2.1)
     factory_bot (5.0.2)
       activesupport (>= 4.2.0)
@@ -71,9 +72,9 @@ GEM
       diff-lcs (~> 1.1)
       mime-types (>= 1.16)
       posix-spawn (~> 0.3)
-    gitlab-labkit (0.5.2)
-      actionpack (~> 5)
-      activesupport (~> 5)
+    gitlab-labkit (0.9.1)
+      actionpack (>= 5.0.0, < 6.1.0)
+      activesupport (>= 5.0.0, < 6.1.0)
       grpc (~> 1.19)
       jaeger-client (~> 0.10)
       opentracing (~> 0.4)
@@ -88,7 +89,7 @@ GEM
       google-protobuf (~> 3.8)
       googleapis-common-protos-types (~> 1.0)
     hashdiff (0.3.9)
-    i18n (1.6.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     jaeger-client (0.10.0)
@@ -110,7 +111,7 @@ GEM
     mime-types-data (3.2019.0331)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
+    minitest (5.14.0)
     msgpack (1.3.1)
     multipart-post (2.0.0)
     nokogiri (1.10.7)
@@ -132,7 +133,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (3.0.3)
-    rack (2.0.7)
+    rack (2.1.2)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
@@ -146,8 +147,8 @@ GEM
       msgpack (>= 0.4.3)
       optimist (>= 3.0.0)
     rdoc (6.2.0)
-    redis (4.1.2)
-    rouge (3.11.0)
+    redis (4.1.3)
+    rouge (3.15.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -192,7 +193,7 @@ GEM
     thread_safe (0.3.6)
     thrift (0.11.0.0)
     timecop (0.9.1)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
     unicode-display_width (1.6.0)
     unparser (0.4.5)
@@ -208,19 +209,20 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 5.2.3)
+  activesupport (= 6.0.2)
   bundler (>= 1.17.3)
   factory_bot
   faraday (~> 0.12)
   github-linguist (~> 7.5)
   gitlab-gollum-lib (~> 4.2.7.7)
   gitlab-gollum-rugged_adapter (~> 0.4.4.2)
-  gitlab-labkit (~> 0.5.0)
+  gitlab-labkit (~> 0.9.1)
   gitlab-markup (~> 1.7.0)
   google-protobuf (~> 3.8.0)
   grpc (~> 1.24.0)
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 831fdb398d6a..4f9b8dc86963 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitLab, buildGoPackage, ruby, bundlerEnv, pkgconfig, libgit2 }:
+{ stdenv, fetchFromGitLab, fetchFromGitHub, buildGoPackage, ruby,
+  bundlerEnv, pkgconfig, libgit2 }:
 
 let
   rubyEnv = bundlerEnv rec {
@@ -16,15 +17,24 @@ let
         };
       };
   };
+  libgit2_0_27 = libgit2.overrideAttrs (oldAttrs: rec {
+    version = "0.27.8";
+    src = fetchFromGitHub {
+      owner = "libgit2";
+      repo = "libgit2";
+      rev = "v${version}";
+      sha256 = "0wzx8nkyy9m7mx6cks58chjd4289vjsw97mxm9w6f1ggqsfnmbr9";
+    };
+  });
 in buildGoPackage rec {
-  version = "1.83.0";
+  version = "12.8.1";
   pname = "gitaly";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitaly";
     rev = "v${version}";
-    sha256 = "1vwa38mhnxyncrrvp45d8s6fg94xaq8c71d7qh9ip77db0ak45kh";
+    sha256 = "0sjkh0j36dpakqmq7l5gd1ydmx1kxgij53bjvvn37r19liqdijnx";
   };
 
   # Fix a check which assumes that hook files are writeable by their
@@ -38,7 +48,7 @@ in buildGoPackage rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ rubyEnv.wrappedRuby libgit2 ];
+  buildInputs = [ rubyEnv.wrappedRuby libgit2_0_27 ];
   goDeps = ./deps.nix;
   preBuild = "rm -r go/src/gitlab.com/gitlab-org/labkit/vendor";
 
diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix
index f710523103f6..83a2f0f5f748 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix
@@ -1319,8 +1319,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/ugorji/go";
-      rev = "d75b2dcb6bc8";
-      sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps";
+      rev = "v1.1.4";
+      sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w";
     };
   }
   {
@@ -1670,8 +1670,8 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/yaml.v2";
-      rev = "v2.2.5";
-      sha256 = "08smz8dfyxp02ha74my9iszqa5qzgl3ksi28ilyp8lqipssiq6fg";
+      rev = "v2.2.8";
+      sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw";
     };
   }
   {
diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
index 3b4e4e5faa6f..d91c84b1fa29 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
@@ -13,10 +13,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1s2iay17i2k0xx36cmnpbrmr5w6x70jk7fq1d8w70xcdw5chm0w1";
+      sha256 = "0zg96vjjw1kbli6nk6cyk64zfh4lgpl7fqx38ncbgfacl4dq7y0b";
       type = "gem";
     };
-    version = "5.2.3";
+    version = "6.0.2";
   };
   actionview = {
     dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@@ -24,21 +24,21 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1v49rgf8305grqf6gq7qa47qhamr369igyy0giycz60x86afyr4h";
+      sha256 = "1bfh9z3n98c76c6jdp6avh75wsckxyp74r59hmgnqdhfznbkppv4";
       type = "gem";
     };
-    version = "5.2.3";
+    version = "6.0.2";
   };
   activesupport = {
-    dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+    dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
     groups = ["default" "development" "test"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8";
+      sha256 = "1brlp5pmawb2hqdybjb732zxxkamcmis6px3wyh09rjlc0gqnzzz";
       type = "gem";
     };
-    version = "5.2.3";
+    version = "6.0.2";
   };
   adamantium = {
     dependencies = ["ice_nine" "memoizable"];
@@ -83,10 +83,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1";
+      sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr";
       type = "gem";
     };
-    version = "3.2.3";
+    version = "3.2.4";
   };
   charlock_holmes = {
     source = {
@@ -137,10 +137,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "030sc98kjrb36rh7g21qsbdfxrj6knsjkx0mn3b7gig8zknwhp2f";
+      sha256 = "0pfl5c0pyqaparxaqxi6s4gfl21bdldwiawrc0aknyvflli60lfw";
       type = "gem";
     };
-    version = "1.0.5";
+    version = "1.0.6";
   };
   diff-lcs = {
     source = {
@@ -173,10 +173,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1kagnf6ziahj0d781s6ryy6fwqwa3ad4xbzzj84p9m4nv4c2jir1";
+      sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x";
       type = "gem";
     };
-    version = "1.8.0";
+    version = "1.9.0";
   };
   escape_utils = {
     source = {
@@ -283,10 +283,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1j06gl4ksd83rycg3fb46bb77iw74i1ivs5li6pyf5klrxjq8k3h";
+      sha256 = "1s1cgnnzlnfglsh5r0iihgvyasa2zbqkyrrnbxshvnkddb10i94z";
       type = "gem";
     };
-    version = "0.5.2";
+    version = "0.9.1";
   };
   gitlab-markup = {
     groups = ["default"];
@@ -355,10 +355,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
+      sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm";
       type = "gem";
     };
-    version = "1.6.0";
+    version = "1.8.2";
   };
   ice_nine = {
     source = {
@@ -482,12 +482,14 @@
     version = "2.4.0";
   };
   minitest = {
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
+      sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz";
       type = "gem";
     };
-    version = "5.11.3";
+    version = "5.14.0";
   };
   msgpack = {
     groups = ["default"];
@@ -613,10 +615,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i";
+      sha256 = "04qa0ry26hxfwkmvhi0fjlvbm8irzg66ahnpx2pp3bl6qbdc0i8w";
       type = "gem";
     };
-    version = "2.0.7";
+    version = "2.1.2";
   };
   rack-test = {
     dependencies = ["rack"];
@@ -683,20 +685,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1mymdx7s5sr4mablklaipz679ckczsiigswm1g2v5mc93yj5amw3";
+      sha256 = "08v2y91q1pmv12g9zsvwj66w3s8j9d82yrmxgyv4y4gz380j3wyh";
       type = "gem";
     };
-    version = "4.1.2";
+    version = "4.1.3";
   };
   rouge = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zsyv6abqrk7lpql5f1ja4m88bfy9qndi8xykpss6cpvjdmi3ydb";
+      sha256 = "1ipgdir89a6pp1zscl2fkb99pppa7c513pk4wvis157bn8p9hlrx";
       type = "gem";
     };
-    version = "3.11.0";
+    version = "3.15.0";
   };
   rspec = {
     dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
@@ -881,12 +883,14 @@
   };
   tzinfo = {
     dependencies = ["thread_safe"];
+    groups = ["default" "development" "test"];
+    platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
+      sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp";
       type = "gem";
     };
-    version = "1.2.5";
+    version = "1.2.6";
   };
   unicode-display_width = {
     groups = ["default" "development" "test"];
@@ -926,4 +930,14 @@
     };
     version = "3.4.2";
   };
+  zeitwerk = {
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jywi63w1m2b2w9fj9rjb9n3imf6p5bfijfmml1xzdnsrdrjz0x1";
+      type = "gem";
+    };
+    version = "2.2.2";
+  };
 }
\ No newline at end of file

From f2bb5238aa79c52adb7e8744bea5ec33a5ecb664 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Mon, 2 Mar 2020 21:23:07 +0100
Subject: [PATCH 2165/4636] gitlab-workhorse: 8.20.0 -> 8.21.0

---
 .../version-management/gitlab/gitlab-workhorse/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index 9506a9a86c30..937c3576fc33 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -3,13 +3,13 @@
 buildGoPackage rec {
   pname = "gitlab-workhorse";
 
-  version = "8.20.0";
+  version = "8.21.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-workhorse";
     rev = "v${version}";
-    sha256 = "0a64qrbyxvpqgf5ksczn3kisbhyx6fcw58g5nlag4jnjj6w5i0wr";
+    sha256 = "04vhshm9lwnx77q9l7znxwkvvwm3gxgxw12y1xwahfilj352xr7q";
   };
 
   goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse";

From a3b2828de3aa0468d93e39ccf59f6d560d064a9f Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Mon, 2 Mar 2020 21:24:40 +0100
Subject: [PATCH 2166/4636] gitlab-shell: Change name from gitlab-shell-go to
 gitlab-shell

This is left over from when gitlab-shell had a ruby part and a go
part. The ruby part is now gone, so let's call the go part
gitlab-shell.
---
 .../version-management/gitlab/gitlab-shell/default.nix          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
index 38cb8767e785..7327f7e02a8f 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitLab, buildGoPackage, ruby }:
 
 buildGoPackage rec {
-  pname = "gitlab-shell-go";
+  pname = "gitlab-shell";
   version = "11.0.0";
   src = fetchFromGitLab {
     owner = "gitlab-org";

From 17721d3b33cea3250f83068f517fbb465e29ca3d Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Mon, 2 Mar 2020 21:27:05 +0100
Subject: [PATCH 2167/4636] gitaly: Add myself to maintainers

---
 pkgs/applications/version-management/gitlab/gitaly/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 4f9b8dc86963..1e77176ec6e8 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -70,7 +70,7 @@ in buildGoPackage rec {
     homepage = https://gitlab.com/gitlab-org/gitaly;
     description = "A Git RPC service for handling all the git calls made by GitLab";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ roblabla globin fpletz ];
+    maintainers = with maintainers; [ roblabla globin fpletz talyz ];
     license = licenses.mit;
   };
 }

From affcf9ba1ef419cb366af6f7482734b23b885c6b Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Tue, 3 Mar 2020 20:07:32 +0100
Subject: [PATCH 2168/4636] bundlerEnv: Add option to copy gem files instead of
 symlinking

The way ruby loads gems and keeps track of their paths seems to not
always work very well when the gems are accessed through
symlinks. Ruby will then complain that the same files are loaded
multiple times; it relies on the file's full path to determine whether
the file is loaded or not.

This adds an option to simply copy all gem files into the environment
instead, which gets rid of this issue, but may instead result in major
file duplication.
---
 .../ruby-modules/bundled-common/default.nix   | 18 ++++++-
 .../ruby-modules/bundler-env/default.nix      | 49 ++++++++++++-------
 2 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix
index 0812ff590a50..66f33f6e31f4 100644
--- a/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/pkgs/development/ruby-modules/bundled-common/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, runCommand, ruby, lib
+{ stdenv, runCommand, ruby, lib, rsync
 , defaultGemConfig, buildRubyGem, buildEnv
 , makeWrapper
 , bundler
@@ -13,6 +13,7 @@
 , lockfile ? null
 , gemset ? null
 , ruby ? defs.ruby
+, copyGemFiles ? false # Copy gem files instead of symlinking
 , gemConfig ? defaultGemConfig
 , postBuild ? null
 , document ? []
@@ -96,7 +97,8 @@ let
 
   envPaths = lib.attrValues gems ++ lib.optional (!hasBundler) bundler;
 
-  basicEnv = buildEnv {
+
+  basicEnvArgs = {
     inherit buildInputs ignoreCollisions;
 
     name = name';
@@ -154,5 +156,17 @@ let
         };
     };
   };
+
+  basicEnv =
+    if copyGemFiles then
+      runCommand name' basicEnvArgs ''
+        mkdir -p $out
+        for i in $paths; do
+          ${rsync}/bin/rsync -a $i/lib $out/
+        done
+        eval "$postBuild"
+      ''
+    else
+      buildEnv basicEnvArgs;
 in
   basicEnv
diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix
index 9e9ccb128cf9..d412d10102f7 100644
--- a/pkgs/development/ruby-modules/bundler-env/default.nix
+++ b/pkgs/development/ruby-modules/bundler-env/default.nix
@@ -1,4 +1,6 @@
-{ ruby, lib, callPackage, defaultGemConfig, buildEnv, bundler }@defs:
+{ ruby, lib, callPackage, defaultGemConfig, buildEnv, runCommand
+, bundler, rsync
+}@defs:
 
 { name ? null
 , pname ? null
@@ -8,6 +10,7 @@
 , gemset ? null
 , groups ? ["default"]
 , ruby ? defs.ruby
+, copyGemFiles ? false # Copy gem files instead of symlinking
 , gemConfig ? defaultGemConfig
 , postBuild ? null
 , document ? []
@@ -38,23 +41,35 @@ in
   if pname == null then
     basicEnv // { inherit name basicEnv; }
   else
-    (buildEnv {
-      inherit ignoreCollisions;
+    let
+      bundlerEnvArgs = {
+        inherit ignoreCollisions;
 
-      name = basicEnv.name;
+        name = basicEnv.name;
 
-      paths = envPaths;
-      pathsToLink = [ "/lib" ];
+        paths = envPaths;
+        pathsToLink = [ "/lib" ];
 
-      postBuild = genStubsScript {
-        inherit lib ruby bundler groups;
-        confFiles = basicEnv.confFiles;
-        binPaths = [ basicEnv.gems.${pname} ];
-      } + lib.optionalString (postBuild != null) postBuild;
+        postBuild = genStubsScript {
+          inherit lib ruby bundler groups;
+          confFiles = basicEnv.confFiles;
+          binPaths = [ basicEnv.gems.${pname} ];
+        } + lib.optionalString (postBuild != null) postBuild;
 
-      meta = { platforms = ruby.meta.platforms; } // meta;
-      passthru = basicEnv.passthru // {
-        inherit basicEnv;
-        inherit (basicEnv) env;
-      } // passthru;
-    })
+        meta = { platforms = ruby.meta.platforms; } // meta;
+        passthru = basicEnv.passthru // {
+          inherit basicEnv;
+          inherit (basicEnv) env;
+        } // passthru;
+      };
+    in
+      if copyGemFiles then
+        runCommand basicEnv.name bundlerEnvArgs ''
+          mkdir -p $out
+          for i in $paths; do
+            ${rsync}/bin/rsync -a $i/lib $out/
+          done
+          eval "$postBuild"
+        ''
+      else
+        buildEnv bundlerEnvArgs

From 74769b67998112f77eac423a4f96730ea0e02e2b Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Tue, 3 Mar 2020 20:13:49 +0100
Subject: [PATCH 2169/4636] gitaly: Copy gem files into bundler env instead of
 symlinking

This fixes issue #79374, where gitaly prints warning messages on the
client side when running push or fetch.
---
 pkgs/applications/version-management/gitlab/gitaly/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 1e77176ec6e8..bac51cd278c2 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -5,6 +5,7 @@ let
   rubyEnv = bundlerEnv rec {
     name = "gitaly-env";
     inherit ruby;
+    copyGemFiles = true;
     gemdir = ./.;
     gemset =
       let x = import (gemdir + "/gemset.nix");

From 7a749709c887b847c3c6008496d90675fe0e95af Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Tue, 3 Mar 2020 13:00:33 -0800
Subject: [PATCH 2170/4636] hugo: 0.65.3 -> 0.66.0

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

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index b32004d0cc77..5af7650982ab 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "hugo";
-  version = "0.65.3";
+  version = "0.66.0";
 
   goPackagePath = "github.com/gohugoio/hugo";
 
@@ -10,7 +10,7 @@ buildGoModule rec {
     owner = "gohugoio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1m0xhzm1w6y778x3fplzr9dif7lcqlkfvk4b7plywrisv3ic8yqs";
+    sha256 = "177vqxzmldpkpaj7giqlbl39091fa2ga2pnshdj6gc393rw52f0a";
   };
 
   modSha256 = "1f320zbqnv2ybsp3qmlgn3rsjgp2zdb24qjd3gcys30mw48cx3na";

From 1459b34afa993f08e53e05d21dd2df73b2e90c78 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Mar 2020 22:30:52 +0100
Subject: [PATCH 2171/4636] netpbm: fix wrappers

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

diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index 8f3a5ea274ec..b2452be7339e 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -84,13 +84,13 @@ stdenv.mkDerivation {
     mkdir -p $out/share/netpbm
     mv $out/misc $out/share/netpbm/
 
+    moveToOutput bin "''${!outputBin}"
+
     # wrap any scripts that expect other programs in the package to be in their PATH
     for prog in ppmquant; do
-        wrapProgram "$out/bin/$prog" --prefix PATH : "$out/bin"
+        wrapProgram "''${!outputBin}/bin/$prog" --prefix PATH : "''${!outputBin}/bin"
     done
 
-    moveToOutput bin "''${!outputBin}"
-
     runHook postInstall
   '';
 

From c8299d69b03c470f80931bab77f16ce8f1889db3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCtke-Stetzkamp?= <christian@lkamp.de>
Date: Tue, 3 Mar 2020 22:40:33 +0100
Subject: [PATCH 2172/4636] licensor: Fix test in 2020

---
 pkgs/tools/misc/licensor/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/licensor/default.nix b/pkgs/tools/misc/licensor/default.nix
index 246684c6638b..376dd2f2e9af 100644
--- a/pkgs/tools/misc/licensor/default.nix
+++ b/pkgs/tools/misc/licensor/default.nix
@@ -1,4 +1,4 @@
-{ lib, rustPlatform, fetchFromGitHub }:
+{ lib, rustPlatform, fetchFromGitHub, fetchpatch }:
 
 rustPlatform.buildRustPackage rec {
   pname = "licensor";
@@ -11,6 +11,11 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0zr8hcq7crmhrdhwcclc0nap68wvg5kqn5l93ha0vn9xgjy8z11p";
   };
 
+  patches = [ (fetchpatch {
+    url = "https://github.com/raftario/licensor/commit/77ae1ea6d9b6de999ee7590d9dbd3c8465d70bb6.patch";
+    sha256 = "0kfyg06wa2v7swm7hs9kkazjg34mircd4nm4qmljyzjh2yh8icg3";
+  })];
+
   # Delete this on next update; see #79975 for details
   legacyCargoFetcher = true;
 

From 85a8d130170d28ece6a62aec8ae8497500b2494d Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 4 Mar 2020 08:16:42 +1000
Subject: [PATCH 2173/4636] gitAndTools.gh: 0.5.7 -> 0.6.0

https://github.com/cli/cli/releases/tag/v0.6.0
---
 .../version-management/git-and-tools/gh/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix
index 594d2a3abae0..03c7bdc1b6ea 100644
--- a/pkgs/applications/version-management/git-and-tools/gh/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "gh";
-  version = "0.5.7";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "14j8210c1dndnhb8l2ifxcljzhajjhil86lvk9y7ndjkq09805q1";
+    sha256 = "0wqc9c30iydwylw53idff1ny2v410jcbhn7hpiinc4x5m3dy7827";
   };
 
-  modSha256 = "1qwcl74sg5az9vaivnvn7f40p72ilmkms5rp52sp5imfrql81lxf";
+  modSha256 = "191ds0dkllc0l2lbqnwlca26js90b2g9f70jsid0zhmz3z9f1zh9";
 
   buildFlagsArray = [
     "-ldflags=-X github.com/cli/cli/command.Version=${version}"

From 4515e395698b29c87734ac62d707748c280302c9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 22:33:35 +0000
Subject: [PATCH 2174/4636] virglrenderer: 0.8.1 -> 0.8.2

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

diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix
index 5c508f133e14..8951ed4b002a 100644
--- a/pkgs/development/libraries/virglrenderer/default.nix
+++ b/pkgs/development/libraries/virglrenderer/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "virglrenderer";
-  version = "0.8.1";
+  version = "0.8.2";
 
   src = fetchurl {
     url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/virglrenderer-${version}/virglrenderer-virglrenderer-${version}.tar.bz2";
-    sha256 = "0ac39mplmy6lmcd6cljmfsrfby7m6ac3dzvmnn5pv200drl415l4";
+    sha256 = "07vfzg99wq92yg2phza9jc0zvps34yy9gc8v4hibqchdl77fmspx";
   };
 
   buildInputs = [ libGLU epoxy libX11 libdrm mesa ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A virtual 3D GPU library that allows a qemu guest to use the host GPU for accelerated 3D rendering";
-    homepage = https://virgil3d.github.io/;
+    homepage = "https://virgil3d.github.io/";
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = [ maintainers.xeji ];

From f1415f633cb5cca0000dc5d5b36b717a1b11ae0f Mon Sep 17 00:00:00 2001
From: Edward Amsden <edward@blackriversoft.com>
Date: Mon, 2 Mar 2020 07:04:31 -0500
Subject: [PATCH 2175/4636] nix: Patch config.nix.in to reference host platform
 binaries

---
 pkgs/tools/package-management/nix/default.nix | 38 +++++++++++++------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index eed14a129785..a17a621fbbef 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -10,6 +10,7 @@ let
 
 common =
   { lib, stdenv, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz
+  , bash, coreutils, gzip, gnutar
   , pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json
   , jq, libarchive, rustc, cargo
   , busybox-sandbox-shell
@@ -30,6 +31,7 @@ common =
 
       is20 = lib.versionAtLeast version "2.0pre";
       is24 = lib.versionAtLeast version "2.4pre";
+      isExactly23 = lib.versionAtLeast version "2.3" && lib.versionOlder version "2.4";
 
       VERSION_SUFFIX = suffix;
 
@@ -64,17 +66,31 @@ common =
       preConfigure =
         # Copy libboost_context so we don't get all of Boost in our closure.
         # https://github.com/NixOS/nixpkgs/issues/45462
-        if is20 then ''
-          mkdir -p $out/lib
-          cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib
-          rm -f $out/lib/*.a
-          ${lib.optionalString stdenv.isLinux ''
-            chmod u+w $out/lib/*.so.*
-            patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.*
-          ''}
-        '' else ''
-          configureFlagsArray+=(BDW_GC_LIBS="-lgc -lgccpp")
-        '';
+        (if is20 then ''
+           mkdir -p $out/lib
+           cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib
+           rm -f $out/lib/*.a
+           ${lib.optionalString stdenv.isLinux ''
+             chmod u+w $out/lib/*.so.*
+             patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.*
+           ''}
+         '' else ''
+           configureFlagsArray+=(BDW_GC_LIBS="-lgc -lgccpp")
+         '') +
+        # For Nix-2.3, patch around an issue where the Nix configure step pulls in the
+        # build system's bash and other utilities when cross-compiling
+        lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform && isExactly23) ''
+          mkdir tmp/
+          substitute corepkgs/config.nix.in tmp/config.nix.in \
+            --subst-var-by bash ${bash}/bin/bash \
+            --subst-var-by coreutils ${coreutils}/bin \
+            --subst-var-by bzip2 ${bzip2}/bin/bzip2 \
+            --subst-var-by gzip ${gzip}/bin/gzip \
+            --subst-var-by xz ${xz}/bin/xz \
+            --subst-var-by tar ${gnutar}/bin/tar \
+            --subst-var-by tr ${coreutils}/bin/tr
+          mv tmp/config.nix.in corepkgs/config.nix.in
+          '';
 
       configureFlags =
         [ "--with-store-dir=${storeDir}"

From 3b72c55fc5aff74cc7bdef1f15c04c29e5671ab1 Mon Sep 17 00:00:00 2001
From: Edward Amsden <edward@blackriversoft.com>
Date: Mon, 2 Mar 2020 07:07:42 -0500
Subject: [PATCH 2176/4636] nix: Drive-by cleanup: replace ifthenelse with
 lib.optionalString

---
 pkgs/tools/package-management/nix/default.nix | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index a17a621fbbef..29af4a90cb90 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -66,17 +66,15 @@ common =
       preConfigure =
         # Copy libboost_context so we don't get all of Boost in our closure.
         # https://github.com/NixOS/nixpkgs/issues/45462
-        (if is20 then ''
-           mkdir -p $out/lib
-           cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib
-           rm -f $out/lib/*.a
-           ${lib.optionalString stdenv.isLinux ''
-             chmod u+w $out/lib/*.so.*
-             patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.*
-           ''}
-         '' else ''
-           configureFlagsArray+=(BDW_GC_LIBS="-lgc -lgccpp")
-         '') +
+        lib.optionalString is20 ''
+          mkdir -p $out/lib
+          cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib
+          rm -f $out/lib/*.a
+          ${lib.optionalString stdenv.isLinux ''
+            chmod u+w $out/lib/*.so.*
+            patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.*
+          ''}
+        '' +
         # For Nix-2.3, patch around an issue where the Nix configure step pulls in the
         # build system's bash and other utilities when cross-compiling
         lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform && isExactly23) ''
@@ -103,6 +101,7 @@ common =
           "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}"
           "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}"
           "--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}"
+          "BDW_GC_LIBS=\"-lgc -lgccpp\""
         ] ++ lib.optionals (is20 && stdenv.isLinux) [
           "--with-sandbox-shell=${sh}/bin/busybox"
         ]

From 72a5256b1ba687d8e0ff5955a7e016f4c14e1a62 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Mar 2020 23:54:50 +0100
Subject: [PATCH 2177/4636] =?UTF-8?q?phpPackages.composer:=201.9.1=20?=
 =?UTF-8?q?=E2=86=92=201.9.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 5903b535f602..3c7704d420c2 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -74,12 +74,12 @@ let
   };
 
   composer = mkDerivation rec {
-    version = "1.9.1";
+    version = "1.9.3";
     pname = "composer";
 
     src = pkgs.fetchurl {
       url = "https://getcomposer.org/download/${version}/composer.phar";
-      sha256 = "04a1fqxhxrckgxw9xbx7mplkzw808k2dz4jqsxq2dy7w6y80n88z";
+      sha256 = "VRZVwvyB9BBlCPQrvEsk6r00sCKxO8Hn2WQr9IPQp9Q=";
     };
 
     dontUnpack = true;

From 08d7cf5c86f49921901e06b3e162dfbc0178fe0b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Mar 2020 23:55:17 +0100
Subject: [PATCH 2178/4636] =?UTF-8?q?phpPackages.phpstan:=200.12.4=20?=
 =?UTF-8?q?=E2=86=92=200.12.14?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 3c7704d420c2..2547a2e4c3a2 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -441,12 +441,12 @@ let
   };
 
   phpstan = mkDerivation rec {
-    version = "0.12.4";
+    version = "0.12.14";
     pname = "phpstan";
 
     src = pkgs.fetchurl {
       url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
-      sha256 = "1h386zsbfw9f1r00pjbvj749q1fg5q22sgrnx7rqjrnwmbl5mh36";
+      sha256 = "JAq1/+bVhTgKRR7oFusqZ/yBOYewaOM38ZoiCjirsTg=";
     };
 
     phases = [ "installPhase" ];

From 2279ce310f2f3e4b4b12d97106321fe8b4cc44ad Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Mar 2020 23:55:45 +0100
Subject: [PATCH 2179/4636] =?UTF-8?q?phpPackages.psalm:=203.7.2=20?=
 =?UTF-8?q?=E2=86=92=203.9.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 2547a2e4c3a2..50bf1ae5dbfc 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -536,12 +536,12 @@ let
   };
 
   psalm = mkDerivation rec {
-    version = "3.7.2";
+    version = "3.9.3";
     pname = "psalm";
 
     src = pkgs.fetchurl {
       url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar";
-      sha256 = "0mcxlckycvpxxc6h0x0kdidbq2l4m3xws1v3kdf797js234x0vjx";
+      sha256 = "KHm2n06y/yxN5B2rCVxT5ja7HxkyxAMsjZ5HLb3xr4M=";
     };
 
     phases = [ "installPhase" ];

From fcdc5e3db0a8a1963693bb0fb398cdb51db9f6f8 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 29 Feb 2020 10:59:51 -0500
Subject: [PATCH 2180/4636] pipewire: format

---
 .../libraries/pipewire/default.nix            | 54 +++++++++++++++----
 1 file changed, 44 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index 3efbea97c5e9..094e90fd500d 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -1,16 +1,36 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind
-, glib, dbus, gst_all_1, alsaLib, ffmpeg, libjack2, udev, libva, xorg
-, sbc, SDL2, makeFontsConf
+{ stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, pkgconfig
+, doxygen
+, graphviz
+, valgrind
+, glib
+, dbus
+, gst_all_1
+, alsaLib
+, ffmpeg
+, libjack2
+, udev
+, libva
+, xorg
+, sbc
+, SDL2
+, makeFontsConf
 }:
 
 let
   fontsConf = makeFontsConf {
-    fontDirectories = [ ];
+    fontDirectories = [];
   };
-in stdenv.mkDerivation rec {
+in
+stdenv.mkDerivation rec {
   pname = "pipewire";
   version = "0.2.7";
 
+  outputs = [ "out" "lib" "dev" "doc" ];
+
   src = fetchFromGitHub {
     owner = "PipeWire";
     repo = "pipewire";
@@ -18,14 +38,28 @@ in stdenv.mkDerivation rec {
     sha256 = "1q5wrqnhhs6r49p8yvkw1pl0cnsd4rndxy4h5lvdydwgf1civcwc";
   };
 
-  outputs = [ "out" "lib" "dev" "doc" ];
-
   nativeBuildInputs = [
-    meson ninja pkgconfig doxygen graphviz valgrind
+    doxygen
+    graphviz
+    meson
+    ninja
+    pkgconfig
+    valgrind
   ];
+
   buildInputs = [
-    glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer
-    alsaLib ffmpeg libjack2 udev libva xorg.libX11 sbc SDL2
+    SDL2
+    alsaLib
+    dbus
+    ffmpeg
+    glib
+    gst_all_1.gst-plugins-base
+    gst_all_1.gstreamer
+    libjack2
+    libva
+    sbc
+    udev
+    xorg.libX11
   ];
 
   mesonFlags = [

From 04037d1e03b9ee08f1b56ab3480e1ffdafd88155 Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Wed, 4 Mar 2020 00:46:00 +0100
Subject: [PATCH 2181/4636] appimage: unify extract functions

---
 pkgs/build-support/appimage/default.nix | 51 +++++++++++++------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index f4ccd038f765..f8e5206bbb5a 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -1,38 +1,39 @@
 { stdenv, libarchive, radare2, jq, buildFHSUserEnv, squashfsTools, writeScript }:
 
 rec {
-  # Both extraction functions could be unified, but then
-  # it would depend on libmagic to correctly identify ISO 9660s
 
-  extractType1 = { name, src }: stdenv.mkDerivation {
+  extract = { name, src }: stdenv.mkDerivation {
     name = "${name}-extracted";
     inherit src;
-
-    nativeBuildInputs = [ libarchive ];
+    nativeBuildInputs = [ radare2 libarchive jq squashfsTools ];
     buildCommand = ''
-      mkdir $out
-      bsdtar -x -C $out -f $src
+      # https://github.com/AppImage/libappimage/blob/ca8d4b53bed5cbc0f3d0398e30806e0d3adeaaab/src/libappimage/utils/MagicBytesChecker.cpp#L45-L63
+      appimageType=$(r2 $src -nn -Nqc "p8 3 @ 8")
+      case "$appimageType" in
+        414901)
+          mkdir $out
+          bsdtar -x -C $out -f $src;;
+
+        414902)
+          install $src ./appimage
+
+          # multiarch offset one-liner using same method as AppImage
+          # see https://gist.github.com/probonopd/a490ba3401b5ef7b881d5e603fa20c93
+          offset=$(r2 ./appimage -nn -Nqc "pfj.elf_header @ 0" |\
+            jq 'map({(.name): .value}) | add | .shoff + (.shnum * .shentsize)')
+
+          unsquashfs -o $offset ./appimage
+
+          cp -rv squashfs-root $out;;
+
+        # 414903) get prepared, https://github.com/TheAssassin/type3-runtime
+        *) echo "Unsupported AppImage Signature: $appimageType";;
+      esac
     '';
   };
 
-  extractType2 = { name, src }: stdenv.mkDerivation {
-    name = "${name}-extracted";
-    inherit src;
-
-    nativeBuildInputs = [ radare2 jq squashfsTools ];
-    buildCommand = ''
-      install $src ./appimage
-
-      # multiarch offset one-liner using same method as AppImage
-      # see https://gist.github.com/probonopd/a490ba3401b5ef7b881d5e603fa20c93
-      offset=$(r2 ./appimage -nn -Nqc "pfj.elf_header @ 0" |\
-        jq 'map({(.name): .value}) | add | .shoff + (.shnum * .shentsize)')
-
-      unsquashfs -o $offset ./appimage
-
-      cp -rv squashfs-root $out
-    '';
-  };
+  extractType1 = extract;
+  extractType2 = extract;
 
   wrapAppImage = args@{ name, src, extraPkgs, ... }: buildFHSUserEnv (defaultFhsEnvArgs // {
     inherit name;

From 9806a7638b7f26fafe48496c5d544aa52aa4bc4a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 4 Mar 2020 01:23:43 +0100
Subject: [PATCH 2182/4636] vips: clean up

---
 pkgs/tools/graphics/vips/default.nix | 58 +++++++++++++++++++++-------
 1 file changed, 45 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index 15cecf3d71e9..3b09f0172cdb 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -1,11 +1,25 @@
-{ stdenv, pkgconfig, glib, libxml2, expat,
-  fftw, orc, lcms, imagemagick, openexr, libtiff, libjpeg, libgsf, libexif,
-  ApplicationServices,
-  python27, libpng ? null,
-  fetchFromGitHub,
-  autoreconfHook,
-  gtk-doc,
-  gobject-introspection,
+{ stdenv
+, pkgconfig
+, glib
+, libxml2
+, expat
+, fftw
+, orc
+, lcms
+, imagemagick
+, openexr
+, libtiff
+, libjpeg
+, libgsf
+, libexif
+, ApplicationServices
+, python27
+, libpng ? null
+, fetchFromGitHub
+, autoreconfHook
+, gtk-doc
+, gobject-introspection
+,
 }:
 
 stdenv.mkDerivation rec {
@@ -24,11 +38,29 @@ stdenv.mkDerivation rec {
     '';
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc gobject-introspection ];
-  buildInputs = [ glib libxml2 fftw orc lcms
-    imagemagick openexr libtiff libjpeg
-    libgsf libexif python27 libpng expat ]
-    ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices;
+  nativeBuildInputs = [
+    pkgconfig
+    autoreconfHook
+    gtk-doc
+    gobject-introspection
+  ];
+
+  buildInputs = [
+    glib
+    libxml2
+    fftw
+    orc
+    lcms
+    imagemagick
+    openexr
+    libtiff
+    libjpeg
+    libgsf
+    libexif
+    python27
+    libpng
+    expat
+  ] ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices;
 
   autoreconfPhase = ''
     ./autogen.sh

From 1829f233dc4d1afda19d4f3866baa7c86993a2ce Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 4 Mar 2020 01:27:23 +0100
Subject: [PATCH 2183/4636] vips: do not run configure twice

---
 pkgs/tools/graphics/vips/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index 3b09f0172cdb..190cc6f0d297 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -16,6 +16,7 @@
 , python27
 , libpng ? null
 , fetchFromGitHub
+, fetchpatch
 , autoreconfHook
 , gtk-doc
 , gobject-introspection
@@ -38,6 +39,15 @@ stdenv.mkDerivation rec {
     '';
   };
 
+  patches = [
+    # autogen.sh should not run configure
+    # https://github.com/libvips/libvips/pull/1566
+    (fetchpatch {
+      url = "https://github.com/libvips/libvips/commit/97a92e0e6abab652fdf99313b138bfd77d70deb4.patch";
+      sha256 = "0w1sm5wmvfp8svdpk8mz57c1n6zzy3snq0g2f8yxjamv0d2gw2dp";
+    })
+  ];
+
   nativeBuildInputs = [
     pkgconfig
     autoreconfHook
@@ -63,7 +73,7 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices;
 
   autoreconfPhase = ''
-    ./autogen.sh
+    NOCONFIGURE=1 ./autogen.sh
   '';
 
   meta = with stdenv.lib; {

From 5e75ba3f420d511db23b8fbf2f54dc92db60ff59 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 00:27:41 +0000
Subject: [PATCH 2184/4636] act: 0.2.4 -> 0.2.5

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

diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix
index 227fb27051a2..03bd2696cce5 100644
--- a/pkgs/development/tools/misc/act/default.nix
+++ b/pkgs/development/tools/misc/act/default.nix
@@ -2,20 +2,22 @@
 
 buildGoModule rec {
   pname = "act";
-  version = "0.2.4";
+  version = "0.2.5";
 
   src = fetchFromGitHub {
     owner = "nektos";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1sn36686nfmqvhmippdapk0pxqx3x1q4dwdyhjr8j8scyfrk68iv";
+    sha256 = "00clafq3izvfwxkb85hf6s40yfw2hpsfz3xg4da28pgh1wlqb9ps";
   };
 
   modSha256 = "0ghp61m8fxg1iwq2ypmp99cqv3n16c06v2xzg9v34299vmd89gi2";
 
+  buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
+
   meta = with lib; {
     description = "Run your GitHub Actions locally";
-    homepage = "https://circleci.com/";
+    homepage = "https://github.com/nektos/act";
     license = licenses.mit;
     maintainers = with maintainers; [ filalex77 ];
   };

From 658b4914f3968e388a930438897875544ecbe7ab Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 4 Mar 2020 01:28:09 +0100
Subject: [PATCH 2185/4636] vips: propagate glib

The .pc file has gobject-2.0 in Requires
---
 pkgs/tools/graphics/vips/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index 190cc6f0d297..8812a632966d 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -72,6 +72,11 @@ stdenv.mkDerivation rec {
     expat
   ] ++ stdenv.lib.optional stdenv.isDarwin ApplicationServices;
 
+  # Required by .pc file
+  propagatedBuildInputs = [
+    glib
+  ];
+
   autoreconfPhase = ''
     NOCONFIGURE=1 ./autogen.sh
   '';

From 29fc27b4ac358b5325ad356f90da54adf941e663 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 1 Mar 2020 18:14:36 -0500
Subject: [PATCH 2186/4636] wrapGAppsHook: Fix #78803

Add to gappsWrapperArgs in preFixupPhases.
---
 .../setup-hooks/wrap-gapps-hook.sh            | 127 +++++++++---------
 1 file changed, 66 insertions(+), 61 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
index ff0cda7eaf0d..1a46e075dbe7 100644
--- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
+++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh
@@ -9,6 +9,37 @@ find_gio_modules() {
 
 addEnvHooks "${targetOffset:?}" find_gio_modules
 
+gappsWrapperArgsHook() {
+    if [ -n "$GDK_PIXBUF_MODULE_FILE" ]; then
+        gappsWrapperArgs+=(--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE")
+    fi
+
+    if [ -n "$XDG_ICON_DIRS" ]; then
+        gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS")
+    fi
+
+    if [ -n "$GSETTINGS_SCHEMAS_PATH" ]; then
+        gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH")
+    fi
+
+    # Check for prefix as well
+    if [ -d "${prefix:?}/share" ]; then
+        gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$prefix/share")
+    fi
+
+    if [ -d "$prefix/lib/gio/modules" ] && [ -n "$(ls -A "$prefix/lib/gio/modules")" ]; then
+        gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$prefix/lib/gio/modules")
+    fi
+
+    for v in ${wrapPrefixVariables:-} GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do
+        if [ -n "${!v}" ]; then
+            gappsWrapperArgs+=(--prefix "$v" : "${!v}")
+        fi
+    done
+}
+
+preFixupPhases+=" gappsWrapperArgsHook"
+
 wrapGApp() {
     local program="$1"
     shift 1
@@ -17,72 +48,46 @@ wrapGApp() {
 
 # Note: $gappsWrapperArgs still gets defined even if ${dontWrapGApps-} is set.
 wrapGAppsHook() {
-  # guard against running multiple times (e.g. due to propagation)
-  [ -z "$wrapGAppsHookHasRun" ] || return 0
-  wrapGAppsHookHasRun=1
+    # guard against running multiple times (e.g. due to propagation)
+    [ -z "$wrapGAppsHookHasRun" ] || return 0
+    wrapGAppsHookHasRun=1
 
-  if [ -n "$GDK_PIXBUF_MODULE_FILE" ]; then
-    gappsWrapperArgs+=(--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE")
-  fi
+    if [[ -z "${dontWrapGApps:-}" ]]; then
+        targetDirsThatExist=()
+        targetDirsRealPath=()
 
-  if [ -n "$XDG_ICON_DIRS" ]; then
-    gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS")
-  fi
-
-  if [ -n "$GSETTINGS_SCHEMAS_PATH" ]; then
-    gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH")
-  fi
-
-  if [ -d "${prefix:?}/share" ]; then
-    gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$prefix/share")
-  fi
-
-  if [ -d "$prefix/lib/gio/modules" ] && [ -n "$(ls -A "$prefix/lib/gio/modules")" ] ; then
-    gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$prefix/lib/gio/modules")
-  fi
-
-  for v in ${wrapPrefixVariables:-} GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do
-    if [ -n "${!v}" ]; then
-      gappsWrapperArgs+=(--prefix "$v" : "${!v}")
-    fi
-  done
-
-  if [[ -z "${dontWrapGApps:-}" ]]; then
-    targetDirsThatExist=()
-    targetDirsRealPath=()
-
-    # wrap binaries
-    targetDirs=( "${prefix}/bin" "${prefix}/libexec" )
-    for targetDir in "${targetDirs[@]}"; do
-      if [[ -d "${targetDir}" ]]; then
-        targetDirsThatExist+=("${targetDir}")
-        targetDirsRealPath+=("$(realpath "${targetDir}")/")
-        find "${targetDir}" -type f -executable -print0 \
-          | while IFS= read -r -d '' file; do
-          echo "Wrapping program '${file}'"
-          wrapGApp "${file}"
+        # wrap binaries
+        targetDirs=("${prefix}/bin" "${prefix}/libexec")
+        for targetDir in "${targetDirs[@]}"; do
+            if [[ -d "${targetDir}" ]]; then
+                targetDirsThatExist+=("${targetDir}")
+                targetDirsRealPath+=("$(realpath "${targetDir}")/")
+                find "${targetDir}" -type f -executable -print0 |
+                    while IFS= read -r -d '' file; do
+                        echo "Wrapping program '${file}'"
+                        wrapGApp "${file}"
+                    done
+            fi
         done
-      fi
-    done
 
-    # wrap links to binaries that point outside targetDirs
-    # Note: links to binaries within targetDirs do not need
-    #       to be wrapped as the binaries have already been wrapped
-    if [[ ${#targetDirsThatExist[@]} -ne 0 ]]; then
-      find "${targetDirsThatExist[@]}" -type l -xtype f -executable -print0 \
-        | while IFS= read -r -d '' linkPath; do
-        linkPathReal=$(realpath "${linkPath}")
-        for targetPath in "${targetDirsRealPath[@]}"; do
-          if [[ "$linkPathReal" == "$targetPath"* ]]; then
-            echo "Not wrapping link: '$linkPath' (already wrapped)"
-            continue 2
-          fi
-        done
-        echo "Wrapping link: '$linkPath'"
-        wrapGApp "${linkPath}"
-      done
+        # wrap links to binaries that point outside targetDirs
+        # Note: links to binaries within targetDirs do not need
+        #       to be wrapped as the binaries have already been wrapped
+        if [[ ${#targetDirsThatExist[@]} -ne 0 ]]; then
+            find "${targetDirsThatExist[@]}" -type l -xtype f -executable -print0 |
+                while IFS= read -r -d '' linkPath; do
+                    linkPathReal=$(realpath "${linkPath}")
+                    for targetPath in "${targetDirsRealPath[@]}"; do
+                        if [[ "$linkPathReal" == "$targetPath"* ]]; then
+                            echo "Not wrapping link: '$linkPath' (already wrapped)"
+                            continue 2
+                        fi
+                    done
+                    echo "Wrapping link: '$linkPath'"
+                    wrapGApp "${linkPath}"
+                done
+        fi
     fi
-  fi
 }
 
 fixupOutputHooks+=(wrapGAppsHook)

From 3aa9d99a0a2714f078b74ddcdce797abe85f9c37 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 4 Mar 2020 01:32:41 +0100
Subject: [PATCH 2187/4636] vips: split into multiple outputs

---
 pkgs/development/ruby-modules/gem-config/default.nix | 2 +-
 pkgs/tools/graphics/vips/default.nix                 | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index f26e33ca2427..d68e1592d887 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -506,7 +506,7 @@ in
         --replace "gobject-2.0" "${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}"
 
       substituteInPlace lib/vips.rb \
-        --replace "vips_libname = 'vips'" "vips_libname = '${vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}'"
+        --replace "vips_libname = 'vips'" "vips_libname = '${stdenv.lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}'"
     '';
   };
 
diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index 8812a632966d..8546c4e8182a 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
   pname = "vips";
   version = "8.9.1";
 
+  outputs = [ "bin" "out" "man" "dev" ];
+
   src = fetchFromGitHub {
     owner = "libvips";
     repo = "libvips";

From 699b2d40c9073d0c45c46882cf31e3734f653c2c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 4 Mar 2020 01:35:17 +0100
Subject: [PATCH 2188/4636] joplin: clean up dependencies

vips now propagates the requirements correctly
---
 pkgs/development/node-packages/default-v10.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix
index 54bd0337fade..5d7e2c7668f2 100644
--- a/pkgs/development/node-packages/default-v10.nix
+++ b/pkgs/development/node-packages/default-v10.nix
@@ -115,12 +115,9 @@ nodePackages // {
   joplin = nodePackages.joplin.override {
     nativeBuildInputs = [ pkgs.pkg-config ];
     buildInputs = with pkgs; [
-      # sharp, dep list:
-      # http://sharp.pixelplumbing.com/en/stable/install/
-      cairo expat fontconfig freetype fribidi gettext giflib
-      glib harfbuzz lcms libcroco libexif libffi libgsf
-      libjpeg_turbo libpng librsvg libtiff vips
-      libwebp libxml2 pango pixman zlib
+      # required by sharp
+      # https://sharp.pixelplumbing.com/install
+      vips
 
       nodePackages.node-pre-gyp
     ];

From c10c96b991b63e3df3baa01afb02ebdfab8ce562 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 3 Mar 2020 19:48:24 -0500
Subject: [PATCH 2189/4636] lollypop: add missing deps

We need the GIO_EXTRA_MODULE from glib-networking
---
 pkgs/applications/audio/lollypop/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix
index 2d2062696d77..b31f55c3d4cb 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -12,6 +12,10 @@
 , desktop-file-utils
 , totem-pl-parser
 , gobject-introspection
+, glib-networking
+, gdk-pixbuf
+, glib
+, pango
 , wrapGAppsHook
 , lastFMSupport ? true
 , youtubeSupport ? true
@@ -42,6 +46,9 @@ python3.pkgs.buildPythonApplication rec  {
   ];
 
   buildInputs = with gst_all_1; [
+    gdk-pixbuf
+    glib
+    glib-networking
     gst-libav
     gst-plugins-bad
     gst-plugins-base
@@ -50,6 +57,7 @@ python3.pkgs.buildPythonApplication rec  {
     gstreamer
     gtk3
     libsoup
+    pango
     totem-pl-parser
   ] ++ lib.optional lastFMSupport libsecret;
 

From 5d31a94b11dc5d1c72505a0a1fdad14295e38f91 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 3 Mar 2020 19:53:31 -0500
Subject: [PATCH 2190/4636] lollypop: 1.2.16 -> 1.2.23

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

diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix
index b31f55c3d4cb..ddb4646ba54d 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -23,7 +23,7 @@
 
 python3.pkgs.buildPythonApplication rec  {
   pname = "lollypop";
-  version = "1.2.16";
+  version = "1.2.23";
 
   format = "other";
   doCheck = false;
@@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec  {
     url = "https://gitlab.gnome.org/World/lollypop";
     rev = "refs/tags/${version}";
     fetchSubmodules = true;
-    sha256 = "0rl4a5npjh5sm3kih11cs2j7ik894nlygllbw4j5pn9n9v66x51w";
+    sha256 = "059z7ri5qwkmfh2kvv8rq5wp80mz75423wc5hnm33wb9sgdd5x47";
   };
 
   nativeBuildInputs = [

From 0e82b0e0ed6346da0f91ca3a6741d95c0b41553b Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 3 Mar 2020 19:54:12 -0500
Subject: [PATCH 2191/4636] ephemeral: 6.2.1 -> 6.3.0

https://github.com/cassidyjames/ephemeral/releases/tag/6.3.0
---
 pkgs/applications/networking/browsers/ephemeral/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix
index 20ecbebd6d8e..ea840694bd31 100644
--- a/pkgs/applications/networking/browsers/ephemeral/default.nix
+++ b/pkgs/applications/networking/browsers/ephemeral/default.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ephemeral";
-  version = "6.2.1";
+  version = "6.3.0";
 
   src = fetchFromGitHub {
     owner = "cassidyjames";
     repo = "ephemeral";
     rev = version;
-    sha256 = "182kzk68l6rr878aaaqx31c6npb65x77qzhbc5rbqlrrdrb69zsg";
+    sha256 = "0h159szljvphs2hvagxwv6nncx46q0mvr4ylhl2nimap9jvss91n";
   };
 
   nativeBuildInputs = [

From 7f7977e296d7c1420e11ec68d26a0b276d107646 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 3 Mar 2020 19:54:36 -0500
Subject: [PATCH 2192/4636] pantheon.elementary-files: 4.4.0 -> 4.4.1

https://github.com/elementary/files/releases/tag/4.4.1
---
 pkgs/desktops/pantheon/apps/elementary-files/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index 858e49900c5a..d83510c49f67 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -30,7 +30,7 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-files";
-  version = "4.4.0";
+  version = "4.4.1";
 
   repoName = "files";
 
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = repoName;
     rev = version;
-    sha256 = "1l5ki203agy3wkhnxf89ziy4xfmn7m3q0qz1hyrzy7a7qaslq3bg";
+    sha256 = "0s874qnqbx20vyp2z2rhz3z8py0dm21v26xc0h6hyc2gfz4s3jcg";
   };
 
   passthru = {

From 9dc1cc507d5a9132b6e8f49b09c0190f462a58b7 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 3 Mar 2020 19:57:49 -0500
Subject: [PATCH 2193/4636] pantheon.wingpanel-indicator-nightlight: 2.0.2 ->
 2.0.3

https://github.com/elementary/wingpanel-indicator-nightlight/releases/tag/2.0.3
---
 .../desktop/wingpanel-indicators/nightlight/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
index 9d2669821de6..5a9a28382ca9 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-nightlight";
-  version = "2.0.2";
+  version = "2.0.3";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "0kw83ws91688xg96k9034dnz15szx2kva9smh1nb7xmdbpzn3qph";
+    sha256 = "1ihg5iz69jgcbyzdkcc2fqmr5l34h2d1jjsx7y86ag1jvhljb82r";
   };
 
   passthru = {

From 50ad33cd0208510397c2a8a5423bf4b90b35c5bb Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 16 Feb 2020 05:00:23 -0500
Subject: [PATCH 2194/4636] gnome-tour: init at 0.0.1

---
 .../gnome-3/core/gnome-tour/default.nix       | 81 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 83 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/core/gnome-tour/default.nix

diff --git a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix
new file mode 100644
index 000000000000..108ff9afca70
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix
@@ -0,0 +1,81 @@
+{ stdenv
+, rustPlatform
+, gettext
+, meson
+, ninja
+, fetchFromGitLab
+, pkg-config
+, gtk3
+, glib
+, gdk-pixbuf
+, desktop-file-utils
+, appstream-glib
+, wrapGAppsHook
+, python3
+, gnome3
+, config
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "gnome-tour";
+  version = "0.0.1";
+
+  # We don't use the uploaded tar.xz because it comes pre-vendored
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "GNOME";
+    repo = "gnome-tour";
+    rev = version;
+    sha256 = "0lbkspnlziq3z177071w3jpghmdwflzra1krdwchzmkfmrhy50ch";
+  };
+
+  cargoSha256 = "0k1wp9wswr57fv2d9bysxn97fchd4vz29n5r8gfyp0gcm8rclmij";
+
+  mesonFlags = [
+    "-Ddistro_name=NixOS"
+    "-Ddistro_icon_name=nix-snowflake"
+    "-Ddistro_version=20.09"
+  ];
+
+  nativeBuildInputs = [
+    appstream-glib
+    desktop-file-utils
+    gettext
+    meson
+    ninja
+    pkg-config
+    python3
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    gdk-pixbuf
+    glib
+    gtk3
+  ];
+
+  # Don't use buildRustPackage phases, only use it for rust deps setup
+  configurePhase = null;
+  buildPhase = null;
+  checkPhase = null;
+  installPhase = null;
+
+  postPatch = ''
+    chmod +x build-aux/meson_post_install.py
+    patchShebangs build-aux/meson_post_install.py
+  '';
+
+  # passthru = {
+  #   updateScript = gnome3.updateScript {
+  #     packageName = pname;
+  #   };
+  # };
+
+  meta = with stdenv.lib; {
+    homepage = "https://gitlab.gnome.org/GNOME/gnome-tour";
+    description = "GNOME Greeter & Tour";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df7f66009769..0522462dc2d1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23695,6 +23695,8 @@ in
     mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md";
   };
 
+  gnome-tour = callPackages ../desktops/gnome-3/core/gnome-tour { };
+
   hsetroot = callPackage ../tools/X11/hsetroot { };
 
   imwheel = callPackage ../tools/X11/imwheel { };

From 7724875caec17ea5555ba7968a702dff48f34786 Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Tue, 3 Mar 2020 18:02:27 -0800
Subject: [PATCH 2195/4636] macvim: 8.1.2234 -> 8.2.319

---
 .../editors/vim/macvim-sparkle.patch          | 106 ------------------
 pkgs/applications/editors/vim/macvim.nix      |  28 +++--
 2 files changed, 13 insertions(+), 121 deletions(-)
 delete mode 100644 pkgs/applications/editors/vim/macvim-sparkle.patch

diff --git a/pkgs/applications/editors/vim/macvim-sparkle.patch b/pkgs/applications/editors/vim/macvim-sparkle.patch
deleted file mode 100644
index e0ba5145b3e5..000000000000
--- a/pkgs/applications/editors/vim/macvim-sparkle.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff --git a/src/MacVim/English.lproj/MainMenu.nib/designable.nib b/src/MacVim/English.lproj/MainMenu.nib/designable.nib
-index bdbcfdb9e..5efc78ab6 100644
---- a/src/MacVim/English.lproj/MainMenu.nib/designable.nib
-+++ b/src/MacVim/English.lproj/MainMenu.nib/designable.nib
-@@ -24,11 +24,6 @@
-                                     <action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/>
-                                 </connections>
-                             </menuItem>
--                            <menuItem title="Check for Updates…" id="255">
--                                <connections>
--                                    <action selector="checkForUpdates:" target="Jqk-qh-n0J" id="Wau-rL-cbn"/>
--                                </connections>
--                            </menuItem>
-                             <menuItem isSeparatorItem="YES" id="196">
-                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
-                             </menuItem>
-@@ -206,6 +201,5 @@
-                 </menuItem>
-             </items>
-         </menu>
--        <customObject id="Jqk-qh-n0J" customClass="SUUpdater"/>
-     </objects>
- </document>
-diff --git a/src/MacVim/English.lproj/Preferences.nib/designable.nib b/src/MacVim/English.lproj/Preferences.nib/designable.nib
-index 889450913..38afc3416 100644
---- a/src/MacVim/English.lproj/Preferences.nib/designable.nib
-+++ b/src/MacVim/English.lproj/Preferences.nib/designable.nib
-@@ -88,14 +88,10 @@
-                     <rect key="frame" x="207" y="208" width="258" height="18"/>
-                     <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
-                     <string key="toolTip">Checks for updates and presents a dialog box showing the release notes and prompt for whether you want to install the new version.</string>
--                    <buttonCell key="cell" type="check" title="Check for updates" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="975">
-+                    <buttonCell key="cell" type="check" title="Check for updates" bezelStyle="regularSquare" imagePosition="left" alignment="left" enabled="NO" inset="2" id="975">
-                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                         <font key="font" metaFont="system"/>
-                     </buttonCell>
--                    <connections>
--                        <action selector="checkForUpdatesChanged:" target="-2" id="YjS-ig-M1j"/>
--                        <binding destination="58" name="value" keyPath="values.SUCheckAtStartup" id="169"/>
--                    </connections>
-                 </button>
-                 <textField verticalHuggingPriority="750" id="121">
-                     <rect key="frame" x="209" y="50" width="243" height="58"/>
-@@ -186,16 +182,13 @@
-                     <rect key="frame" x="221" y="188" width="244" height="18"/>
-                     <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
-                     <string key="toolTip">MacVim will automatically download and install updates without prompting. The updated version will be used the next time MacVim starts.</string>
--                    <buttonCell key="cell" type="check" title="Automatically install updates" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="GfP-vg-mec">
-+                    <buttonCell key="cell" type="check" title="Automatically install updates" bezelStyle="regularSquare" imagePosition="left" alignment="left" enabled="NO" inset="2" id="GfP-vg-mec">
-                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                         <font key="font" metaFont="system"/>
-                         <connections>
-                             <binding destination="58" name="enabled" keyPath="values.SUCheckAtStartup" id="5oY-Gf-XJN"/>
-                         </connections>
-                     </buttonCell>
--                    <connections>
--                        <binding destination="58" name="value" keyPath="values.SUAutomaticallyUpdate" id="kyZ-ah-zKf"/>
--                    </connections>
-                 </button>
-             </subviews>
-             <point key="canvasLocation" x="137.5" y="382"/>
-diff --git a/src/MacVim/MacVim.xcodeproj/project.pbxproj b/src/MacVim/MacVim.xcodeproj/project.pbxproj
-index 648c4290d..c7dd99d1e 100644
---- a/src/MacVim/MacVim.xcodeproj/project.pbxproj
-+++ b/src/MacVim/MacVim.xcodeproj/project.pbxproj
-@@ -66,8 +66,6 @@
- 		1DFE25A50C527BC4003000F7 /* PSMTabBarControl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D493DB90C52533B00AB718C /* PSMTabBarControl.framework */; };
- 		52818B031C1C08CE00F59085 /* QLStephen.qlgenerator in Copy QuickLookPlugin */ = {isa = PBXBuildFile; fileRef = 52818AFF1C1C075300F59085 /* QLStephen.qlgenerator */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
- 		528DA66A1426D4F9003380F1 /* macvim-askpass in Copy Scripts */ = {isa = PBXBuildFile; fileRef = 528DA6691426D4EB003380F1 /* macvim-askpass */; };
--		52A364731C4A5789005757EC /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52A364721C4A5789005757EC /* Sparkle.framework */; };
--		52A364761C4A57C1005757EC /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 52A364721C4A5789005757EC /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
- 		52B7ED9B1C4A4D6900AFFF15 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 52B7ED9A1C4A4D6900AFFF15 /* dsa_pub.pem */; };
- 		8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; };
- 		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
-@@ -124,7 +122,6 @@
- 			dstPath = "";
- 			dstSubfolderSpec = 10;
- 			files = (
--				52A364761C4A57C1005757EC /* Sparkle.framework in Copy Frameworks */,
- 				1D493DBA0C52534300AB718C /* PSMTabBarControl.framework in Copy Frameworks */,
- 			);
- 			name = "Copy Frameworks";
-@@ -250,7 +247,6 @@
- 		32CA4F630368D1EE00C91783 /* MacVim_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacVim_Prefix.pch; sourceTree = "<group>"; };
- 		52818AFA1C1C075300F59085 /* QuickLookStephen.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = QuickLookStephen.xcodeproj; path = qlstephen/QuickLookStephen.xcodeproj; sourceTree = "<group>"; };
- 		528DA6691426D4EB003380F1 /* macvim-askpass */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "macvim-askpass"; sourceTree = "<group>"; };
--		52A364721C4A5789005757EC /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
- 		52B7ED9A1C4A4D6900AFFF15 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = "<group>"; };
- 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
- 		8D1107320486CEB800E47090 /* MacVim.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacVim.app; sourceTree = BUILT_PRODUCTS_DIR; };
-@@ -264,7 +260,6 @@
- 				1DFE25A50C527BC4003000F7 /* PSMTabBarControl.framework in Frameworks */,
- 				8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
- 				1D8B5A53104AF9FF002E59D5 /* Carbon.framework in Frameworks */,
--				52A364731C4A5789005757EC /* Sparkle.framework in Frameworks */,
- 			);
- 			runOnlyForDeploymentPostprocessing = 0;
- 		};
-@@ -443,7 +438,6 @@
- 		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
- 			isa = PBXGroup;
- 			children = (
--				52A364721C4A5789005757EC /* Sparkle.framework */,
- 				1D8B5A52104AF9FF002E59D5 /* Carbon.framework */,
- 				1D493DB30C52533B00AB718C /* PSMTabBarControl.xcodeproj */,
- 				1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index ede12f50feca..92992b8896ab 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -27,13 +27,13 @@ in
 stdenv.mkDerivation {
   pname = "macvim";
 
-  version = "8.1.2234";
+  version = "8.2.319";
 
   src = fetchFromGitHub {
     owner = "macvim-dev";
     repo = "macvim";
-    rev = "snapshot-161";
-    sha256 = "1hp3y85pj1icz053g627a1wp5pnwgxhk07pyd4arwcxs2103agw4";
+    rev = "snapshot-162";
+    sha256 = "1mg55jlrz533wlqrx028fyv86rfhdzvm5kdi8xlf67flc5hh9vrp";
   };
 
   enableParallelBuilding = true;
@@ -43,18 +43,7 @@ stdenv.mkDerivation {
     gettext ncurses cscope luajit ruby tcl perl python.pkg
   ];
 
-  patches = [ ./macvim.patch ./macvim-sparkle.patch ];
-
-  # The sparkle patch modified the nibs, so we have to recompile them
-  postPatch = ''
-    for nib in MainMenu Preferences; do
-      # redirect stdin/stdout/stderr to /dev/null because ibtool marks them nonblocking
-      # and not redirecting screws with subsequent commands.
-      # redirecting stderr is unfortunate but I don't know of a reasonable way to remove O_NONBLOCK
-      # from the fds.
-      /usr/bin/ibtool --compile src/MacVim/English.lproj/$nib.nib/keyedobjects.nib src/MacVim/English.lproj/$nib.nib >/dev/null 2>/dev/null </dev/null
-    done
-  '';
+  patches = [ ./macvim.patch ];
 
   configureFlags = [
       "--enable-cscope"
@@ -76,11 +65,20 @@ stdenv.mkDerivation {
       "--with-tclsh=${tcl}/bin/tclsh"
       "--with-tlib=ncurses"
       "--with-compiledby=Nix"
+      "--disable-sparkle"
       "LDFLAGS=-headerpad_max_install_names"
   ];
 
   makeFlags = ''PREFIX=$(out) CPPFLAGS="-Wno-error"'';
 
+  # Remove references to Sparkle.framework from the project.
+  # It's unused (we disabled it with --disable-sparkle) and this avoids
+  # copying the unnecessary several-megabyte framework into the result.
+  postPatch = ''
+    echo "Patching file src/MacVim/MacVim.xcodeproj/project.pbxproj"
+    sed -e '/Sparkle\.framework/d' -i src/MacVim/MacVim.xcodeproj/project.pbxproj
+  '';
+
   # This is unfortunate, but we need to use the same compiler as Xcode,
   # but Xcode doesn't provide a way to configure the compiler.
   #

From 98bf3a997e85544473ae661807eb2ce79595c01d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 02:05:33 +0000
Subject: [PATCH 2196/4636] checkstyle: 8.29 -> 8.30

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

diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 5ac52c71abea..8649c05d73b9 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  version = "8.29";
+  version = "8.30";
   pname = "checkstyle";
 
   src = fetchurl {
     url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
-    sha256 = "1rbipf4031inv34ci0rczz7dipi3b12cpn45h949i095gdh37pgh";
+    sha256 = "1wsgpfdqasfz6chhy0w5pdjm4by6ih2g0l44lxwks9kik2lrs4av";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
       adheres to a coding standard. By default it supports the Sun Code
       Conventions, but is highly configurable.
     '';
-    homepage = http://checkstyle.sourceforge.net/;
+    homepage = "http://checkstyle.sourceforge.net/";
     license = licenses.lgpl21;
     maintainers = with maintainers; [ pSub ];
     platforms = jre.meta.platforms;

From f50cedf9fb0252510578a09bb8457396d5d9b002 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 02:22:03 +0000
Subject: [PATCH 2197/4636] cmake-format: 0.6.8 -> 0.6.9

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

diff --git a/pkgs/development/tools/cmake-format/default.nix b/pkgs/development/tools/cmake-format/default.nix
index da9dfc9a8193..cdf15f3ad707 100644
--- a/pkgs/development/tools/cmake-format/default.nix
+++ b/pkgs/development/tools/cmake-format/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonApplication rec {
   pname = "cmake-format";
-  version = "0.6.8";
+  version = "0.6.9";
 
   src = fetchPypi {
     inherit version;
     pname = "cmake_format";
-    sha256 = "0zpx7g5j8wv52zj0s7bk7cj5v82icn4il0jfydc1cmg4p5krf5iy";
+    sha256 = "082d7949gsk5v72ap7k4p3vgmc126a0bfm195xpi4lb6khpbzy5j";
   };
 
   propagatedBuildInputs = [ autopep8 flake8 jinja2 pylint pyyaml ];

From f539a47dabe6fd614179ee7df12d596bdab1dff9 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Wed, 12 Feb 2020 04:07:54 -0800
Subject: [PATCH 2198/4636] pythonPackages.stem: 1.7.1 -> 1.8.0

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

diff --git a/pkgs/development/python-modules/stem/default.nix b/pkgs/development/python-modules/stem/default.nix
index 69931a46007f..4d4e75d5326d 100644
--- a/pkgs/development/python-modules/stem/default.nix
+++ b/pkgs/development/python-modules/stem/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "stem";
-  version = "1.7.1";
+  version = "1.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "18lc95pmc7i089nlsb06dsxyjl5wbhxfqgdxbjcia35ndh8z7sn9";
+    sha256 = "1hk8alc0r4m669ggngdfvryndd0fbx0w62sclcmg55af4ak8xd50";
   };
 
   postPatch = ''

From 58ea5f3a177b0eb50497f60be136c94c1d70c2c3 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Thu, 27 Feb 2020 21:25:50 -0800
Subject: [PATCH 2199/4636] rclone: 1.50.2 -> 1.51.0

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

diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index 71421eaf1e71..c40b1573e566 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "rclone";
-  version = "1.50.2";
+  version = "1.51.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "0yaspkh88q8i58i8g8mm6sqb75hczavz2lvzdd1iif1bqgi6b5fz";
+    sha256 = "0z4kaq6wnj5dgl52g7f86phxlvnk5pbpda7prgh3hahpyhxj0z7d";
   };
 
   goPackagePath = "github.com/rclone/rclone";

From 7afb0f82a3dcb803ea6e6b0d2e49527529230c8d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 03:06:44 +0000
Subject: [PATCH 2200/4636] doctest: 2.3.5 -> 2.3.7

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

diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix
index e55313bc9fe4..ae7eca92712c 100644
--- a/pkgs/development/libraries/doctest/default.nix
+++ b/pkgs/development/libraries/doctest/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "doctest";
-  version = "2.3.5";
+  version = "2.3.7";
 
   src = fetchFromGitHub {
     owner = "onqtam";
     repo = "doctest";
     rev = version;
-    sha256 = "0rddlzhnv0f5036q0m0p019pismka7sx6x8cnzk65sk77b1dsbhg";
+    sha256 = "134lx7pjnglrl4wdmyr9dz3rjb6d4ir6rvapg00gp52n44dbhnrq";
   };
 
   nativeBuildInputs = [ cmake ];

From 9d3aa711fe64868aa5a7ac5038a39b861cacefdb Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Tue, 3 Mar 2020 22:14:31 -0500
Subject: [PATCH 2201/4636] NixOS/auto-upgrade: refine option description

---
 nixos/modules/tasks/auto-upgrade.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/tasks/auto-upgrade.nix b/nixos/modules/tasks/auto-upgrade.nix
index 6eaa40613d17..bfc1e301efaf 100644
--- a/nixos/modules/tasks/auto-upgrade.nix
+++ b/nixos/modules/tasks/auto-upgrade.nix
@@ -68,9 +68,11 @@ let cfg = config.system.autoUpgrade; in
         type = types.str;
         example = "45min";
         description = ''
-          Add a randomized delay to wait before automatically upgrading.
-          The delay will be between zero and this value.
-          This value must be a valid systemd timespan.
+          Add a randomized delay before each automatic upgrade.
+          The delay will be chozen between zero and this value.
+          This value must be a time span in the format specified by
+          <citerefentry><refentrytitle>systemd.time</refentrytitle>
+          <manvolnum>7</manvolnum></citerefentry>
         '';
       };
 

From 0e8ce4639d09fae13e59a4f3c7c9914ef0cb12ab Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 03:38:07 +0000
Subject: [PATCH 2202/4636] faudio: 20.02 -> 20.03

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

diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix
index d515d0c07ebf..596de28d2df3 100644
--- a/pkgs/development/libraries/faudio/default.nix
+++ b/pkgs/development/libraries/faudio/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
 	pname = "faudio";
-  version = "20.02";
+  version = "20.03";
 
   src = fetchFromGitHub {
     owner = "FNA-XNA";
     repo = "FAudio";
     rev = version;
-    sha256 = "07f3n8qxjbrn7dhyi90l1zx5klsr3qiw14n0jdk589jgynhjgv5r";
+    sha256 = "0wlbh1py9074896fxa8lcfvjj3l943zz8wjl2rn7g21xf0ar9kyv";
   };
 
 	nativeBuildInputs = [cmake];

From 2cb7cd6573c5ccb0d895f5ecf5e384ed555d873e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 03:55:39 +0000
Subject: [PATCH 2203/4636] flow: 0.119.0 -> 0.119.1

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

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 4772a0e2308e..67ded5bbb4a9 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flow";
-  version = "0.119.0";
+  version = "0.119.1";
 
   src = fetchFromGitHub {
     owner  = "facebook";
     repo   = "flow";
     rev    = "refs/tags/v${version}";
-    sha256 = "0myvhdanhwljqa3irmkkdchd81416xnh9w0mgdajyh4az4safc1k";
+    sha256 = "1p3kjdm4lsbc2lzab3kj1fjvccv8p47bj4s3jnfp2n7qppy7sbbf";
   };
 
   installPhase = ''
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A static type checker for JavaScript";
-    homepage = https://flow.org/;
+    homepage = "https://flow.org/";
     changelog = "https://github.com/facebook/flow/releases/tag/v${version}";
     license = licenses.mit;
     platforms = ocamlPackages.ocaml.meta.platforms;

From fb2f9d807f869c050b48022135c4a588ebac20bd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 03:59:07 +0000
Subject: [PATCH 2204/4636] fluent-bit: 1.3.8 -> 1.3.9

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

diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix
index f25c095dade9..a593805b651e 100644
--- a/pkgs/tools/misc/fluent-bit/default.nix
+++ b/pkgs/tools/misc/fluent-bit/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fluent-bit";
-  version = "1.3.8";
+  version = "1.3.9";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     rev = "v${version}";
-    sha256 = "1b14hm809zy4idg8p2ah1sg4pgzqyy459mlf7rfc2msvf716sicr";
+    sha256 = "1ly6afq4badmvs1rsqcai5kyka66n0rzi8857893wjcscppja55a";
   };
 
   nativeBuildInputs = [ cmake flex bison ];

From 035a65d074074a6f30514093b4dde6ed6ce08aed Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 04:18:55 +0000
Subject: [PATCH 2205/4636] git-quick-stats: 2.0.13 -> 2.0.15

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

diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix
index a779f753d9b4..2681b2705ef4 100644
--- a/pkgs/development/tools/git-quick-stats/default.nix
+++ b/pkgs/development/tools/git-quick-stats/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub }:
 stdenv.mkDerivation rec {
   pname = "git-quick-stats";
-  version = "2.0.13";
+  version = "2.0.15";
   src = fetchFromGitHub {
     repo = "git-quick-stats";
     owner = "arzzen";
     rev = version;
-    sha256 = "0j0a4y50wlwban40lj8y89ch4xnmm1ag8klkl8smbrn972d5d0cy";
+    sha256 = "1m8b0bskhpwjbs0qjp0rdzrjj613639pn92isv1cg0srj8grjcai";
   };
   PREFIX = builtins.placeholder "out";
   meta = with stdenv.lib; {

From 26d7b7ca8a132c2a18428989de248bf012ab84e7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 04:33:59 +0000
Subject: [PATCH 2206/4636] golangci-lint: 1.23.6 -> 1.23.7

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

diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix
index 75bb50f25a49..89d21b5cb5ae 100644
--- a/pkgs/development/tools/golangci-lint/default.nix
+++ b/pkgs/development/tools/golangci-lint/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "golangci-lint";
-  version = "1.23.6";
+  version = "1.23.7";
 
   src = fetchFromGitHub {
     owner = "golangci";
     repo = "golangci-lint";
     rev = "v${version}";
-    sha256 = "0y5kjlqbz9xxlxd8kagrsyz9wvjqf7i28i6zb2m8x9c9zg82kvsn";
+    sha256 = "1dcayxblim97hlgdx0wdlbj2jxvdqfk8912hz7ylb1007x7y5da5";
   };
 
   modSha256 = "0sckz298bvkf4p4fdmsmza0zrj2s2pvc86qwg6i76vdh9yzvq5gx";
@@ -16,7 +16,7 @@ buildGoModule rec {
 
   meta = with lib; {
     description = "Linters Runner for Go. 5x faster than gometalinter. Nice colored output.";
-    homepage = https://golangci.com/;
+    homepage = "https://golangci.com/";
     license = licenses.agpl3;
     platforms = platforms.unix;
     maintainers = with maintainers; [ anpryl manveru ];

From b01052f1387a1ff6db2ecfe1f9c8a408a908d9ec Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 26 Feb 2020 12:59:34 +0100
Subject: [PATCH 2207/4636] coqPackages.paco: enable for Coq 8.10 and 8.11

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

diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix
index fee6de7b35bf..4c0ca4673005 100644
--- a/pkgs/development/coq-modules/paco/default.nix
+++ b/pkgs/development/coq-modules/paco/default.nix
@@ -19,13 +19,15 @@ let
     "8.7" = versions.post_8_6;
     "8.8" = versions.post_8_6;
     "8.9" = versions.post_8_6;
+    "8.10" = versions.post_8_6;
+    "8.11" = versions.post_8_6;
   };
   param = params.${coq.coq-version};
 in
 
 stdenv.mkDerivation rec {
   inherit (param) version;
-  name = "coq-paco-${coq.coq-version}-${version}";
+  name = "coq${coq.coq-version}-paco-${version}";
 
   src = fetchFromGitHub {
     inherit (param) rev sha256;
@@ -52,7 +54,7 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ];
+    compatibleCoqVersions = stdenv.lib.flip builtins.hasAttr params;
   };
 
 }

From 4126c5810d35ae7fa54810fb2acc18551800d6cc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 06:12:11 +0000
Subject: [PATCH 2208/4636] kotlin: 1.3.61 -> 1.3.70

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

diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 6ad3f96bf59d..9a124ad84771 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 let
-  version = "1.3.61";
+  version = "1.3.70";
 in stdenv.mkDerivation {
   inherit version;
   pname = "kotlin";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
-    sha256 = "073vb402b03llscgr298iih5lc3y1dn1qxyid2i9hiyrsld1a09r";
+    sha256 = "1iw9pjacjdhhvriaz2kzf677csq2nfx66k5cickk79h7ywppi7bh";
   };
 
   propagatedBuildInputs = [ jre ] ;
@@ -37,7 +37,7 @@ in stdenv.mkDerivation {
       It is developed by a team at JetBrains although it is an OSS language
       and has external contributors.
     '';
-    homepage = https://kotlinlang.org/;
+    homepage = "https://kotlinlang.org/";
     license = stdenv.lib.licenses.asl20;
     maintainers = with stdenv.lib.maintainers;
       [ nequissimus ];

From 2d2ef3f9848e8fc777f0a3a5e15e0242f4c405a9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 06:16:05 +0000
Subject: [PATCH 2209/4636] krohnkite: 0.6.1 -> 0.7

---
 pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix b/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix
index 569ba1571f80..abd655db3753 100644
--- a/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix
+++ b/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix
@@ -3,13 +3,13 @@
 
 mkDerivation rec {
   pname = "krohnkite";
-  version = "0.6.1";
+  version = "0.7";
 
   src = fetchFromGitHub {
     owner = "esjeon";
     repo = "krohnkite";
     rev = "v${version}";
-    sha256 = "1rjmpnd5fc5dmxwq9pr0l858185h4580fhicgaywx9l3nppam72a";
+    sha256 = "0j3rm1w6d545qlmx02xs72b5zsigm48hp7lp7yh30z3cjqm00aap";
   };
 
   buildInputs = [

From 7f20ec111dd21c77a768651b8b237aadf5617deb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 06:20:44 +0000
Subject: [PATCH 2210/4636] kubeseal: 0.9.8 -> 0.10.0

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

diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix
index ef5f03253979..6d35d233d4f4 100644
--- a/pkgs/applications/networking/cluster/kubeseal/default.nix
+++ b/pkgs/applications/networking/cluster/kubeseal/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "kubeseal";
-  version = "0.9.8";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "bitnami-labs";
     repo = "sealed-secrets";
     rev = "v${version}";
-    sha256 = "1d3m13pl30w8d7pxjdhspxprk2jm8cm25rc5s867z4a37c5igv7y";
+    sha256 = "14ahb02p1gqcqbjz6mn3axw436b6bi4ygq5ckm85jzs28s4wrfsv";
   };
 
   modSha256 = "04dmjyz3vi2l0dfpyy42lkp2fv1vlfkvblrxh1dvb37phrkd5lbd";

From 5b833c08ef127a48cd315dae774d6bbb85ed1bba Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 06:26:01 +0000
Subject: [PATCH 2211/4636] lean: 3.6.0 -> 3.6.1

---
 pkgs/applications/science/logic/lean/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index d718dd01ed42..ae8b0ada8062 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lean";
-  version = "3.6.0";
+  version = "3.6.1";
 
   src = fetchFromGitHub {
     owner  = "leanprover-community";
     repo   = "lean";
     rev    = "v${version}";
-    sha256 = "1filkhyqcjglbavbkjra0nk3y7hw8993wyl7r87ikydb2bjishsc";
+    sha256 = "0crcpzbz75mdyi1vi4mygw3mj4lx73vff58fkic1gfxlpwrwgi20";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Automatic and interactive theorem prover";
-    homepage    = https://leanprover.github.io/;
+    homepage    = "https://leanprover.github.io/";
     license     = licenses.asl20;
     platforms   = platforms.unix;
     maintainers = with maintainers; [ thoughtpolice gebner ];

From 046dae0145cd8b26c72a5087c354c238d70cb7fa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 06:49:45 +0000
Subject: [PATCH 2212/4636] liblouis: 3.12.0 -> 3.13.0

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

diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix
index 932edd20e9a6..83d08dc019bf 100644
--- a/pkgs/development/libraries/liblouis/default.nix
+++ b/pkgs/development/libraries/liblouis/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "liblouis";
-  version = "3.12.0";
+  version = "3.13.0";
 
   src = fetchFromGitHub {
     owner = "liblouis";
     repo = "liblouis";
     rev = "v${version}";
-    sha256 = "0sw7iwb9158z7jslxj9jwh2vqbg0q8wq6fbmk9iz7sfkjqhi80hv";
+    sha256 = "1srpafxdw4627lyv92cn8wd9zda3507qpp5s2z66bsln8jnb1mza";
   };
 
   outputs = [ "out" "dev" "man" "info" "doc" ];
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Open-source braille translator and back-translator";
-    homepage = http://liblouis.org/;
+    homepage = "http://liblouis.org/";
     license = licenses.lgpl21;
     maintainers = with maintainers; [ jtojnar ];
     platforms = platforms.unix;

From b3f54778af4460540780c1719750c573099632ee Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 07:15:28 +0000
Subject: [PATCH 2213/4636] lyra: 1.1 -> 1.3

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

diff --git a/pkgs/development/libraries/lyra/default.nix b/pkgs/development/libraries/lyra/default.nix
index 3e73c9266a03..e7227ac63885 100644
--- a/pkgs/development/libraries/lyra/default.nix
+++ b/pkgs/development/libraries/lyra/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lyra";
-  version = "1.1";
+  version = "1.3";
 
   src = fetchFromGitHub {
     owner = "bfgroup";
     repo = "lyra";
     rev = version;
-    sha256 = "1wcwsmg41bmjir6pjrjxrwccqj25d9068ifi9m6xz6q3fhaq6s81";
+    sha256 = "0rpk1hadfcvjps5k307sddv23q73m2918wclfxfi6mj8l7gwkcn9";
   };
 
   nativeBuildInputs = [ meson ninja ];

From 375c42c3a1bf161d147c449e91e6230fb638da99 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 07:29:40 +0000
Subject: [PATCH 2214/4636] mandelbulber: 2.20 -> 2.21

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

diff --git a/pkgs/applications/graphics/mandelbulber/default.nix b/pkgs/applications/graphics/mandelbulber/default.nix
index 0a3368ec2abe..53d1c5c3f732 100644
--- a/pkgs/applications/graphics/mandelbulber/default.nix
+++ b/pkgs/applications/graphics/mandelbulber/default.nix
@@ -19,13 +19,13 @@ assert withOpenCL -> ocl-icd != null;
 
 mkDerivation rec {
   pname = "mandelbulber";
-  version = "2.20";
+  version = "2.21";
 
   src = fetchFromGitHub {
     owner = "buddhi1980";
     repo = "mandelbulber2";
     rev = version;
-    sha256 = "043dks9fimhradyhdzqdc6lb9z0x9lkj3szj10751g424lppp207";
+    sha256 = "1bmk71vbxc1n8cnizlmzfqlvgxjb95cydbzxlvq1s5givxr2jwli";
   };
 
   nativeBuildInputs = [

From baff63e0ba8adb88d98d1baa5d220a684d338e84 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 08:15:39 +0000
Subject: [PATCH 2215/4636] mutagen: 0.11.0 -> 0.11.2

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

diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix
index 9514ca18b9d9..8940fef2a0dd 100644
--- a/pkgs/tools/misc/mutagen/default.nix
+++ b/pkgs/tools/misc/mutagen/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "mutagen";
-  version = "0.11.0";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "mutagen-io";
     repo = pname;
     rev = "v${version}";
-    sha256 = "19rr2q7kfkivjj23vv3s249jifx9hipi3zwzr2550v9jb4372x1r";
+    sha256 = "0ykzrxlllip4wvhd9rja5bcr2m72695fjj2q1scwn8ri6jcgfa19";
   };
 
   modSha256 = "1r6b4y6civk75if6nljl66pgv5qm7x05qqby1anf7s7cz7d1rc3g";

From 37f9f898adedd14657759a57684e00c34655be68 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 08:31:40 +0000
Subject: [PATCH 2216/4636] nwipe: 0.26 -> 0.27

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

diff --git a/pkgs/tools/security/nwipe/default.nix b/pkgs/tools/security/nwipe/default.nix
index 62d7fb3b34a3..b2ead19a2011 100644
--- a/pkgs/tools/security/nwipe/default.nix
+++ b/pkgs/tools/security/nwipe/default.nix
@@ -1,20 +1,20 @@
 { stdenv, fetchFromGitHub, ncurses, parted, automake, autoconf, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  version = "0.26";
+  version = "0.27";
   pname = "nwipe";
   src = fetchFromGitHub {
     owner = "martijnvanbrummelen";
     repo = "nwipe";
     rev = "v${version}";
-    sha256 = "072gg7hafq4vncpgm62yswshg6qgbi9mg2hl0p22c7if908p4vaa";
+    sha256 = "1rfqv5nxb20g7rfcmqaxwkbz5v294ak0kfsndncx3m4m1791fw04";
   };
   nativeBuildInputs = [ automake autoconf pkgconfig ];
   buildInputs = [ ncurses parted ];
   preConfigure = "sh init.sh || :";
   meta = with stdenv.lib; {
     description = "Securely erase disks";
-    homepage = https://github.com/martijnvanbrummelen/nwipe;
+    homepage = "https://github.com/martijnvanbrummelen/nwipe";
     license = licenses.gpl2;
     maintainers = [ maintainers.woffs ];
     platforms = platforms.linux;

From 2c2584dac8b97791d7b2edc0881bd7cafdb3afcc Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Wed, 4 Mar 2020 09:31:46 +0100
Subject: [PATCH 2217/4636] drawpile: 2.1.16 -> 2.1.17

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

diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix
index abe3bd19f744..a8c4e6d14ba9 100644
--- a/pkgs/applications/graphics/drawpile/default.nix
+++ b/pkgs/applications/graphics/drawpile/default.nix
@@ -60,11 +60,11 @@ let
 
 in mkDerivation rec {
   pname = "drawpile";
-  version = "2.1.16";
+  version = "2.1.17";
 
   src = fetchurl {
     url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz";
-    sha256 = "1mz64c1a5x906j2jqq7i16l1q1d97wgm2y0ybmmcyqzg09x9wyaw";
+    sha256 = "11lhn1mymhqk9g5sh384xhj3qw8h9lv88pr768y9q6kg3sl7nzzf";
   };
 
   nativeBuildInputs = [

From 4f2e31a1318ddb08a6f1d788e5e2460ced26b118 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 4 Mar 2020 18:56:31 +1000
Subject: [PATCH 2218/4636] fuse-overlayfs: 0.7.6 -> 0.7.7

https://github.com/containers/fuse-overlayfs/releases/tag/v0.7.7
---
 pkgs/tools/filesystems/fuse-overlayfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix
index 2beb33857eb9..6debd333c41c 100644
--- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix
+++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fuse-overlayfs";
-  version = "0.7.6";
+  version = "0.7.7";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1sgl6npbhg49aqlxmm3bnk3cmi9xpg8i5m4hickqfk1ni1z070ij";
+    sha256 = "0fifqa4f79lhklajsf1aiipc4cyykscqlns9pzbcq5hdphi9fbsb";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 97a61c8903ada73d1aac70f477582a75f03989ba Mon Sep 17 00:00:00 2001
From: Thomas Dy <thatsmydoing@gmail.com>
Date: Tue, 3 Mar 2020 16:19:54 +0900
Subject: [PATCH 2219/4636] nixos/nat: fix multiple destination ports with
 loopback

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

diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix
index 9c658af30f75..21ae9eb8b6d4 100644
--- a/nixos/modules/services/networking/nat.nix
+++ b/nixos/modules/services/networking/nat.nix
@@ -65,7 +65,7 @@ let
         let
           m                = builtins.match "([0-9.]+):([0-9-]+)" fwd.destination;
           destinationIP    = if (m == null) then throw "bad ip:ports `${fwd.destination}'" else elemAt m 0;
-          destinationPorts = if (m == null) then throw "bad ip:ports `${fwd.destination}'" else elemAt m 1;
+          destinationPorts = if (m == null) then throw "bad ip:ports `${fwd.destination}'" else builtins.replaceStrings ["-"] [":"] (elemAt m 1);
         in ''
           # Allow connections to ${loopbackip}:${toString fwd.sourcePort} from the host itself
           iptables -w -t nat -A nixos-nat-out \

From 6f8dcc3c5e4ca37721524c104e7738f413247243 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 4 Mar 2020 04:20:00 -0500
Subject: [PATCH 2220/4636] zz: init at 2020-03-02

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

diff --git a/pkgs/development/compilers/zz/default.nix b/pkgs/development/compilers/zz/default.nix
new file mode 100644
index 000000000000..7ac59cc58699
--- /dev/null
+++ b/pkgs/development/compilers/zz/default.nix
@@ -0,0 +1,28 @@
+{ lib, rustPlatform, fetchFromGitHub, makeWrapper, z3 }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "zz-unstable";
+  version = "2020-03-02";
+
+  src = fetchFromGitHub {
+    owner = "aep";
+    repo = "zz";
+    rev = "2dd92b959f7c34bf99af84b263e3864a5c41a0fe";
+    sha256 = "14ch5qgga2vpxvb53v4v4y6cwy3kkm10x1vbfpyfa7im57syib85";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  cargoSha256 = "1m9az3adbkx2ab6fkg64cr7f9d73jbx8kx2pmgpw29csmh9hzqjy";
+
+  postInstall = ''
+    wrapProgram $out/bin/zz --prefix PATH ":" "${lib.getBin z3}/bin"
+  '';
+
+  meta = with lib; {
+    description = "🍺🐙 ZetZ a zymbolic verifier and tranzpiler to bare metal C";
+    homepage = "https://github.com/aep/zz";
+    license = licenses.mit;
+    maintainers = [ maintainers.marsam ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 340408715117..495cb1eea9a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14938,6 +14938,8 @@ in
 
   zita-resampler = callPackage ../development/libraries/audio/zita-resampler { };
 
+  zz = callPackage ../development/compilers/zz { };
+
   zziplib = callPackage ../development/libraries/zziplib { };
 
   gsignond = callPackage ../development/libraries/gsignond {

From 51b6f9c6ae277652572bfbc9d85caa298f4c5415 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 3 Mar 2020 22:10:36 +0100
Subject: [PATCH 2221/4636] chromium: 80.0.3987.122 -> 80.0.3987.132

https://chromereleases.googleblog.com/2020/03/stable-channel-update-for-desktop.html

This update includes 4 security fixes.

CVEs:
CVE-2020-6420
---
 .../browsers/chromium/upstream-info.nix        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 8c8e8149f93b..a58131ce0e0d 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "1bahnvn6i08gg10r9p012n7xjwhnjk1xq4c70kw6sqr4p53423mn";
-    sha256bin64 = "066lvnh18k5982dv9481g9i31g9pq6a8q92g93xkqgj2bipbv6si";
-    version = "81.0.4044.26";
+    sha256 = "1yam7lg38dbpvmva7pc3bw3npvgi3d1v6im8ld4z92gjgniwsjh2";
+    sha256bin64 = "0vsly218wv9x2nv5i82slz8pmb0hmdcl1z2mlhf2j5adnsxn9c5z";
+    version = "81.0.4044.34";
   };
   dev = {
-    sha256 = "0k35sa1qq54cixybb12nyzkjyrwb4cbjfffwfvr5dl859i5bz1kk";
-    sha256bin64 = "0ckbgk6jw3zq3gqvvwdlcrqlm110hkvija6jfh9dk0ip1wdx8wkm";
-    version = "82.0.4062.3";
+    sha256 = "0pxvwjvkajlidk5m7jiqk69mxnxg3h56dr7vpi916r51w17pds0l";
+    sha256bin64 = "1jdyp0f2ig4251155db3m7lzd4jlmczcjqqnvdj5nwl2bn3ykc3s";
+    version = "82.0.4068.4";
   };
   stable = {
-    sha256 = "0wr487drgd030d7p84rdz1cys0c87wbgh2qg3d7qd98gqbfcpss8";
-    sha256bin64 = "0kipzd0q3p3wwklcl1fb937xhklc0s76apsfrjwy0jcmcy47blzf";
-    version = "80.0.3987.122";
+    sha256 = "00f2hpi2d0n15yw29dv3dli566cgi7qh55bfpziag9a6j02i401c";
+    sha256bin64 = "00xhacrs74ks3nrpsnnbqm5vk0r9ydyxrq5ifajzviqqyk2n24b8";
+    version = "80.0.3987.132";
   };
 }

From a2ee03f4bbbf4fe7563d10f200d45c634660be30 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 09:40:07 +0000
Subject: [PATCH 2222/4636] papirus-icon-theme: 20200201 -> 20200301

---
 pkgs/data/icons/papirus-icon-theme/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix
index a6751b0938ec..8055b19ad637 100644
--- a/pkgs/data/icons/papirus-icon-theme/default.nix
+++ b/pkgs/data/icons/papirus-icon-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "papirus-icon-theme";
-  version = "20200201";
+  version = "20200301";
 
   src = fetchFromGitHub {
     owner = "PapirusDevelopmentTeam";
     repo = pname;
     rev = version;
-    sha256 = "06scfncid3mhc99lj7iq99la5ls7gsc9kzzccbvcbfnvpzlmwjfh";
+    sha256 = "1hknprylmd5zciaz4nkysmbb03am41r9dgnzm3r9l8qg2548js9v";
   };
 
   nativeBuildInputs = [ gtk3 ];
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Papirus icon theme";
-    homepage = https://github.com/PapirusDevelopmentTeam/papirus-icon-theme;
+    homepage = "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme";
     license = licenses.lgpl3;
     # darwin gives hash mismatch in source, probably because of file names differing only in case
     platforms = platforms.linux;

From c32da2ed9c48cfb9817e7acd9d4534b4945cabdb Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Wed, 4 Mar 2020 12:48:50 +0300
Subject: [PATCH 2223/4636] nixos/acme: force symlink from fullchain.pem to
 cert.pem

Co-authored-by: emily <vcs@emily.moe>
---
 nixos/modules/security/acme.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 211199d148dc..4c7f0ee657ce 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -352,7 +352,7 @@ in
                             cp -p ${spath}/certificates/${keyName}.key key.pem
                             cp -p ${spath}/certificates/${keyName}.crt fullchain.pem
                             cp -p ${spath}/certificates/${keyName}.issuer.crt chain.pem
-                            ln -s fullchain.pem cert.pem
+                            ln -sf fullchain.pem cert.pem
                             cat key.pem fullchain.pem > full.pem
                             chmod ${rights} *.pem
                             chown '${data.user}:${data.group}' *.pem

From 343ec8071230a84ed7283dad6c726b8e08a96d0e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 09:58:40 +0000
Subject: [PATCH 2224/4636] picard-tools: 2.21.8 -> 2.22.0

---
 pkgs/applications/science/biology/picard-tools/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index 42b13a981d9d..93f66810549b 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "picard-tools";
-  version = "2.21.8";
+  version = "2.22.0";
 
   src = fetchurl {
     url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
-    sha256 = "0wxacfyxqvd39mzmwkwz39g4mf0ig1zcgymwbhsnhmn9j60mdmrf";
+    sha256 = "1qgg8r81xn2z965v78kfj05vycrd2cz48gxk5csr6kvwk3ba286c";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Tools for high-throughput sequencing (HTS) data and formats such as SAM/BAM/CRAM and VCF";
     license = licenses.mit;
-    homepage = https://broadinstitute.github.io/picard/;
+    homepage = "https://broadinstitute.github.io/picard/";
     maintainers = with maintainers; [ jbedo ];
     platforms = platforms.all;
   };

From 920165076be787e6d6c36c75647533144d67af62 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Fri, 28 Feb 2020 19:30:23 +0100
Subject: [PATCH 2225/4636] getdns: 1.5.2 -> 1.6.0

---
 pkgs/development/libraries/getdns/default.nix | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix
index 721245ceb6d7..c0268c161aeb 100644
--- a/pkgs/development/libraries/getdns/default.nix
+++ b/pkgs/development/libraries/getdns/default.nix
@@ -1,24 +1,20 @@
-{ stdenv, fetchurl, libtool, unbound, libidn, m4, file
-, openssl, doxygen, autoreconfHook, automake }:
+{ stdenv, fetchurl, unbound, libidn2, openssl, doxygen, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "getdns";
-  version = "1.5.2";
+  version = "1.6.0";
   versionRewrite = builtins.splitVersion version;
 
   src = fetchurl {
-    url = "https://getdnsapi.net/releases/${pname}-${builtins.concatStringsSep "-" versionRewrite}/${pname}-${version}.tar.gz";
-    sha256 = "1h4l0sbkpiahpx2pd5lby10yi22mdxgx5xf1y80r77pa46iac9hq";
+    url = "https://getdnsapi.net/releases/${pname}-${
+        builtins.concatStringsSep "-" versionRewrite
+      }/${pname}-${version}.tar.gz";
+    sha256 = "0jhg7258wz287kjymimvdvv04n69lwxdc3sb62l2p453f5s77ra0";
   };
 
-  nativeBuildInputs = [ libtool m4 autoreconfHook automake file ];
+  nativeBuildInputs = [ cmake ];
 
-  buildInputs = [ unbound libidn openssl doxygen ];
-
-  patchPhase = ''
-    substituteInPlace m4/acx_openssl.m4 \
-      --replace /usr/local/ssl ${openssl.dev}
-    '';
+  buildInputs = [ unbound libidn2 openssl doxygen ];
 
   meta = with stdenv.lib; {
     description = "A modern asynchronous DNS API";
@@ -32,9 +28,9 @@ stdenv.mkDerivation rec {
       interface that enables end-to-end trust in the DNS architecture, and which will
       inspire application developers to implement innovative security solutions in
       their applications.
-'';
-    homepage = https://getdnsapi.net;
-    maintainers = with maintainers; [ leenaars ];
+    '';
+    homepage = "https://getdnsapi.net";
+    maintainers = with maintainers; [ leenaars ehmry ];
     license = licenses.bsd3;
     platforms = platforms.all;
   };

From ea15605aaac02d8655677cade1bb4b94ee55ca28 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Fri, 28 Feb 2020 19:36:33 +0100
Subject: [PATCH 2226/4636] stubby: 0.2.6 -> 0.3.0

---
 pkgs/tools/networking/stubby/default.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/networking/stubby/default.nix b/pkgs/tools/networking/stubby/default.nix
index 9b1ee7a9f799..b560f2768ad7 100644
--- a/pkgs/tools/networking/stubby/default.nix
+++ b/pkgs/tools/networking/stubby/default.nix
@@ -1,20 +1,19 @@
-{ stdenv, fetchFromGitHub, getdns, libtool, m4, file , doxygen
-, autoreconfHook, automake, check, libbsd, libyaml, darwin }:
+{ stdenv, fetchFromGitHub, getdns, doxygen, libyaml, darwin, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "stubby";
-  version = "0.2.6";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "getdnsapi";
     repo = pname;
     rev = "v${version}";
-    sha256 = "164gm5cbnq785s78bqmbsgxrxkq8hw930xwkxxzi1f6jgz928dnf";
+    sha256 = "04izd1v4fv9l7r75aafkrp6svczbx4cvv1vnfyx5n9105pin11mx";
   };
 
-  nativeBuildInputs = [ libtool m4 libbsd libyaml autoreconfHook ];
+  nativeBuildInputs = [ cmake libyaml ];
 
-  buildInputs = [ doxygen getdns automake file check ]
+  buildInputs = [ doxygen getdns ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ];
 
   meta = with stdenv.lib; {
@@ -25,10 +24,10 @@ stdenv.mkDerivation rec {
       queries sent from a client machine (desktop or laptop) to a DNS
       Privacy resolver increasing end user privacy. Stubby is developed by
       the getdns team.
-'';
-    homepage = https://dnsprivacy.org/wiki/x/JYAT;
+    '';
+    homepage = "https://dnsprivacy.org/wiki/x/JYAT";
     downloadPage = "https://github.com/getdnsapi/stubby";
-    maintainers = with maintainers; [ leenaars ];
+    maintainers = with maintainers; [ leenaars ehmry ];
     license = licenses.bsd3; platforms = platforms.all;
-    };
+  };
 }

From f9ff420f0ed22d52bc6d7baff14f58085f14e61c Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Thu, 26 Dec 2019 10:57:51 +0530
Subject: [PATCH 2227/4636] navilu-font: init at 1.2

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

diff --git a/pkgs/data/fonts/navilu/default.nix b/pkgs/data/fonts/navilu/default.nix
new file mode 100644
index 000000000000..0433ad22de53
--- /dev/null
+++ b/pkgs/data/fonts/navilu/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, fontforge }:
+
+stdenv.mkDerivation rec {
+  pname = "navilu-font";
+  version = "1.2";
+
+  src = fetchFromGitHub {
+    owner = "aravindavk";
+    repo = "Navilu";
+    rev = "v${version}";
+    sha256 = "1vm6n04siaa0zf6jzp5s2gzgr2qxs3vdnmcmg4dcy07py2kd2fla";
+  };
+
+  nativeBuildInputs = [ fontforge ];
+
+  dontConfigure = true;
+
+  preBuild = "patchShebangs generate.pe";
+
+  installPhase = "install -Dm444 -t $out/share/fonts/truetype/ Navilu.ttf";
+
+  meta = with stdenv.lib; src.meta // {
+    description = "A Kannada handwriting font";
+    license = licenses.gpl3Plus;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ ehmry ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d01b8bd0742..20b2eeea7dd1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5216,6 +5216,8 @@ in
 
   nat-traverse = callPackage ../tools/networking/nat-traverse { };
 
+  navilu-font = callPackage ../data/fonts/navilu { stdenv = stdenvNoCC; };
+
   nawk = callPackage ../tools/text/nawk { };
 
   nbd = callPackage ../tools/networking/nbd { };

From 6dd9ed79fe30ca15d4eb9543967fac7d0287db29 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Tue, 11 Feb 2020 21:32:39 +0100
Subject: [PATCH 2228/4636] alephone: init at 20150620

Packaging of the AlephOne engine and eight of its scenarios.
---
 pkgs/games/alephone/default.nix           | 99 +++++++++++++++++++++++
 pkgs/games/alephone/durandal/default.nix  | 25 ++++++
 pkgs/games/alephone/eternal/default.nix   | 21 +++++
 pkgs/games/alephone/evil/default.nix      | 18 +++++
 pkgs/games/alephone/infinity/default.nix  | 25 ++++++
 pkgs/games/alephone/marathon/default.nix  | 25 ++++++
 pkgs/games/alephone/pheonix/default.nix   | 18 +++++
 pkgs/games/alephone/red/default.nix       | 18 +++++
 pkgs/games/alephone/rubicon-x/default.nix | 23 ++++++
 pkgs/top-level/all-packages.nix           | 10 +++
 10 files changed, 282 insertions(+)
 create mode 100644 pkgs/games/alephone/default.nix
 create mode 100644 pkgs/games/alephone/durandal/default.nix
 create mode 100644 pkgs/games/alephone/eternal/default.nix
 create mode 100644 pkgs/games/alephone/evil/default.nix
 create mode 100644 pkgs/games/alephone/infinity/default.nix
 create mode 100644 pkgs/games/alephone/marathon/default.nix
 create mode 100644 pkgs/games/alephone/pheonix/default.nix
 create mode 100644 pkgs/games/alephone/red/default.nix
 create mode 100644 pkgs/games/alephone/rubicon-x/default.nix

diff --git a/pkgs/games/alephone/default.nix b/pkgs/games/alephone/default.nix
new file mode 100644
index 000000000000..1936c93ab843
--- /dev/null
+++ b/pkgs/games/alephone/default.nix
@@ -0,0 +1,99 @@
+{ stdenv, fetchurl, boost, curl, ffmpeg, icoutils, libmad, libogg, libpng
+, libsndfile, libvorbis, lua, pkgconfig, SDL, SDL_image, SDL_net, SDL_ttf, smpeg
+, speex, zziplib, zlib, makeWrapper, makeDesktopItem, unzip, alephone }:
+
+let
+  self = stdenv.mkDerivation rec {
+    outputs = [ "out" "icons" ];
+    pname = "alephone";
+    version = "20150620";
+
+    src = fetchurl {
+      url =
+        "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/AlephOne-${version}.tar.bz2";
+      sha256 = "0cz18fa3gx8mz5j09ywz8gq0r4q082kh6l9pbpwn8qjanzgn1wy0";
+    };
+
+    nativeBuildInputs = [ pkgconfig icoutils ];
+
+    buildInputs = [
+      boost
+      curl
+      ffmpeg
+      libmad
+      libsndfile
+      libogg
+      libpng
+      libvorbis
+      lua
+      SDL
+      SDL_image
+      SDL_net
+      SDL_ttf
+      smpeg
+      speex
+      zziplib
+      zlib
+    ];
+
+    configureFlags = [ "--with-boost=${boost}" ];
+
+    enableParallelBuilding = true;
+
+    postInstall = ''
+      mkdir $icons
+      icotool -x -i 5 -o $icons Resources/Windows/*.ico
+      pushd $icons
+      for x in *_5_48x48x32.png; do
+        mv $x ''${x%_5_48x48x32.png}.png
+      done
+      popd
+    '';
+
+    meta = with stdenv.lib; {
+      description =
+        "Aleph One is the open source continuation of Bungie’s Marathon 2 game engine";
+      homepage = "https://alephone.lhowon.org/";
+      license = with licenses; [ gpl3 ];
+      maintainers = with maintainers; [ ehmry ];
+      platforms = platforms.linux;
+    };
+  };
+
+in self // {
+  makeWrapper = { pname, desktopName, version, zip, meta
+    , icon ? alephone.icons + "/alephone.png", ... }@extraArgs:
+    stdenv.mkDerivation ({
+      inherit pname version;
+
+      desktopItem = makeDesktopItem {
+        name = desktopName;
+        exec = pname;
+        genericName = pname;
+        categories = "Game;";
+        comment = meta.description;
+        inherit desktopName icon;
+      };
+
+      src = zip;
+
+      nativeBuildInputs = [ makeWrapper unzip ];
+
+      dontConfigure = true;
+      dontBuild = true;
+
+      installPhase = ''
+        mkdir -p $out/bin $out/data/$pname $out/share/applications
+        cp -a * $out/data/$pname
+        cp $desktopItem/share/applications/* $out/share/applications
+        makeWrapper ${alephone}/bin/alephone $out/bin/$pname \
+          --add-flags $out/data/$pname
+      '';
+
+      meta = with stdenv.lib;
+        {
+          maintainers = with maintainers; [ ehmry ];
+          inherit (alephone.meta) platforms;
+        } // meta;
+    } // extraArgs);
+}
diff --git a/pkgs/games/alephone/durandal/default.nix b/pkgs/games/alephone/durandal/default.nix
new file mode 100644
index 000000000000..cd5450d1c2e4
--- /dev/null
+++ b/pkgs/games/alephone/durandal/default.nix
@@ -0,0 +1,25 @@
+{ alephone, fetchurl }:
+
+alephone.makeWrapper rec {
+  pname = "durandal";
+  desktopName = "Marathon-Durandal";
+  version = "20150620";
+  icon = alephone.icons + "/marathon2.png";
+
+  zip = fetchurl {
+    url =
+      "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon2-${version}-Data.zip";
+    sha256 = "1gpg0dk3z8irvdkm4nj71v14lqx77109chqr2ly594jqf6j9wwqv";
+  };
+
+  meta = {
+    description = "Second chapter of the Marathon trilogy";
+    longDescription = ''
+      Fresh from your triumph on the starship Marathon, you are seized by the rogue computer Durandal to do his bidding in a distant part of the galaxy. Within the ruins of an ancient civilization, you must seek the remnants of a lost clan and uncover their long-buried secrets. Battle opponents ancient and terrible, with sophisticated weapons and devious strategies, all the while struggling to escape the alien nightmare…
+
+      This release of Marathon 2: Durandal includes the classic graphics, and revamped high-definition textures and monsters from the Xbox Live Arcade edition.
+          '';
+    homepage = "https://alephone.lhowon.org/games/marathon2.html";
+  };
+
+}
diff --git a/pkgs/games/alephone/eternal/default.nix b/pkgs/games/alephone/eternal/default.nix
new file mode 100644
index 000000000000..c21284150618
--- /dev/null
+++ b/pkgs/games/alephone/eternal/default.nix
@@ -0,0 +1,21 @@
+{ alephone, fetchurl, unrar }:
+
+alephone.makeWrapper rec {
+  pname = "marathon-eternal";
+  version = "1.2.0";
+  desktopName = "Marathon-Eternal";
+
+  zip = fetchurl {
+    url = "http://eternal.bungie.org/files/_releases/EternalXv120.zip";
+    sha256 = "1qrvx0sp9xc8zbpp5yz8jdz458ajzmyv2si7hrppiyawc8dpcwck";
+  };
+
+  sourceRoot = "Eternal 1.2.0";
+
+  meta = {
+    description =
+      "Picking up from the end of the Marathon trilogy, you find yourself suddenly ninety-four years in the future, in the year 2905";
+    homepage = "http://eternal.bungie.org/";
+  };
+
+}
diff --git a/pkgs/games/alephone/evil/default.nix b/pkgs/games/alephone/evil/default.nix
new file mode 100644
index 000000000000..a0120348c14e
--- /dev/null
+++ b/pkgs/games/alephone/evil/default.nix
@@ -0,0 +1,18 @@
+{ alephone, fetchurl, unrar }:
+
+alephone.makeWrapper rec {
+  pname = "marathon-evil";
+  version = "0";
+  desktopName = "Marathon-Evil";
+
+  zip = fetchurl {
+    url = "http://files3.bungie.org/trilogy/MarathonEvil.zip";
+    sha256 = "08nizbjp2rx10bpqrbhb76as0j2zynmy2c0qa5b482lz1szf9b95";
+  };
+
+  meta = {
+    description = "The first conversion for Marathon Infinity";
+    homepage = "https://alephone.lhowon.org/scenarios.html";
+  };
+
+}
diff --git a/pkgs/games/alephone/infinity/default.nix b/pkgs/games/alephone/infinity/default.nix
new file mode 100644
index 000000000000..f4cea6c73435
--- /dev/null
+++ b/pkgs/games/alephone/infinity/default.nix
@@ -0,0 +1,25 @@
+{ alephone, fetchurl }:
+
+alephone.makeWrapper rec {
+  pname = "marathon-infinity";
+  desktopName = "Marathon-Infinity";
+  version = "20150620";
+  icon = alephone.icons + "/marathon-infinity.png";
+
+  zip = fetchurl {
+    url =
+      "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/MarathonInfinity-${version}-Data.zip";
+    sha256 = "0sgfahppanp9c0p115dg0makrdzghzmbz3iggl6x28fh62j03q64";
+  };
+
+  meta = {
+    description = "Third chapter of the Marathon trilogy";
+    longDescription = ''
+      Marathon Infinity takes the closed universe of the Marathon series and blows it wide open. The solo/co-op campaign, “Blood Tides of Lh’owon,” is a 20-level scenario sporting new textures, weapons, and aliens. More than that, the scenario sheds a surprising new light on the story’s characters and the meaning of events. Having defeated the Pfhor and reawakened the ancient remnants of the S’pht, the player now faces a world where friends become enemies and all is not what it seems…
+
+      Marathon Infinity is the most popular Marathon game in online play, and is compatible with hundreds of community-made maps. This release includes the classic graphics, and revamped high-definition textures and weapons.
+    '';
+    homepage = "https://alephone.lhowon.org/games/infinity.html";
+  };
+
+}
diff --git a/pkgs/games/alephone/marathon/default.nix b/pkgs/games/alephone/marathon/default.nix
new file mode 100644
index 000000000000..84831b6a2691
--- /dev/null
+++ b/pkgs/games/alephone/marathon/default.nix
@@ -0,0 +1,25 @@
+{ alephone, fetchurl }:
+
+alephone.makeWrapper rec {
+  pname = "marathon";
+  desktopName = "Marathon";
+  version = "20150620";
+  icon = alephone.icons + "/marathon.png";
+
+  zip = fetchurl {
+    url =
+      "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon-${version}-Data.zip";
+    sha256 = "0cagsigsjlsr8jqfaqjdxv8fs0f079cjzs26679aacyykc6b8k3p";
+  };
+
+  meta = {
+    description = "First chapter of the Marathon trilogy";
+    longDescription = ''
+      Alien forces have boarded the interstellar colony ship Marathon. The situation is dire. As a security officer onboard, it is your duty to defend the ship and its crew.
+
+      Experience the start of Bungie’s iconic trilogy with Marathon. This release uses the original Marathon data files for the most authentic experience outside of a classic Mac or emulator.
+    '';
+    homepage = "https://alephone.lhowon.org/games/marathon.html";
+  };
+
+}
diff --git a/pkgs/games/alephone/pheonix/default.nix b/pkgs/games/alephone/pheonix/default.nix
new file mode 100644
index 000000000000..90db1aa7c73d
--- /dev/null
+++ b/pkgs/games/alephone/pheonix/default.nix
@@ -0,0 +1,18 @@
+{ alephone, fetchurl }:
+
+alephone.makeWrapper rec {
+  pname = "marathon-pheonix";
+  desktopName = "Marathon-Pheonix";
+  version = "1.3";
+
+  zip = fetchurl {
+    url = "http://simplici7y.com/version/file/998/Marathon_Phoenix_1.3.zip";
+    sha256 = "1r06k0z8km7l9d3njinsrci4jhk8hrnjdcmjd8n5z2qxkqvhn9qj";
+  };
+
+  meta = {
+    description = "A 35-level single player major Marathon conversion";
+    homepage = "http://www.simplici7y.com/items/marathon-phoenix-2";
+  };
+
+}
diff --git a/pkgs/games/alephone/red/default.nix b/pkgs/games/alephone/red/default.nix
new file mode 100644
index 000000000000..f24c9010cd63
--- /dev/null
+++ b/pkgs/games/alephone/red/default.nix
@@ -0,0 +1,18 @@
+{ alephone, fetchurl, unrar }:
+
+alephone.makeWrapper rec {
+  pname = "marathon-red";
+  version = "0";
+  desktopName = "Marathon-Red";
+
+  zip = fetchurl {
+    url = "http://files3.bungie.org/trilogy/MarathonRED.zip";
+    sha256 = "1p13snlrvn39znvfkxql67crhysn71db2bwsfrkhjkq58wzs6qgw";
+  };
+
+  meta = {
+    description = "Survival horror-esque Marathon conversion";
+    homepage = "https://alephone.lhowon.org/scenarios.html";
+  };
+
+}
diff --git a/pkgs/games/alephone/rubicon-x/default.nix b/pkgs/games/alephone/rubicon-x/default.nix
new file mode 100644
index 000000000000..b59fa4cfeb62
--- /dev/null
+++ b/pkgs/games/alephone/rubicon-x/default.nix
@@ -0,0 +1,23 @@
+{ alephone, fetchurl }:
+
+alephone.makeWrapper rec {
+  pname = "rubicon-x";
+  version = "20150620";
+  desktopName = "Marathon-Rubicon-X";
+
+  zip = fetchurl {
+    url = "http://files5.bungie.org/marathon/marathonRubiconX.zip";
+    sha256 = "095si89wap76pvkvk90zqw7djhrhwb1anjm2s8i503jbcn5n4ipm";
+  };
+
+  sourceRoot = "Rubicon X ƒ";
+
+  meta = {
+    description = "Unofficial forth chapter of the Marathon series";
+    longDescription = ''
+      Rubicon X is a free, cross platform, first person shooter that continues the story of Bungie’s Marathon trilogy. First released as Marathon:Rubicon in 2001, Rubicon X is a complete overhaul of the original. It features all new high-resolution artwork, new and updated maps, and enough surprises to feel like a whole new game.
+    '';
+    homepage = "http://www.marathonrubicon.com/";
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 20b2eeea7dd1..a49d3157237e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22903,6 +22903,16 @@ in
 
   airstrike = callPackage ../games/airstrike { };
 
+  alephone = callPackage ../games/alephone { ffmpeg = ffmpeg_2; };
+  alephone-durandal = callPackage ../games/alephone/durandal { };
+  alephone-eternal = callPackage ../games/alephone/eternal { };
+  alephone-evil = callPackage ../games/alephone/evil { };
+  alephone-infinity = callPackage ../games/alephone/infinity { };
+  alephone-marathon = callPackage ../games/alephone/marathon { };
+  alephone-pheonix = callPackage ../games/alephone/pheonix { };
+  alephone-red = callPackage ../games/alephone/red { };
+  alephone-rubicon-x = callPackage ../games/alephone/rubicon-x { };
+
   alienarena = callPackage ../games/alienarena { };
 
   amoeba = callPackage ../games/amoeba { };

From cc5306e1e445919b017f56f2edfb8218c21d0025 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Tue, 11 Feb 2020 21:48:04 +0100
Subject: [PATCH 2229/4636] pathways-into-darkness: init at 1.1.1

---
 .../pathways-into-darkness/default.nix        | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/games/alephone/pathways-into-darkness/default.nix

diff --git a/pkgs/games/alephone/pathways-into-darkness/default.nix b/pkgs/games/alephone/pathways-into-darkness/default.nix
new file mode 100644
index 000000000000..6c6de4b88e8f
--- /dev/null
+++ b/pkgs/games/alephone/pathways-into-darkness/default.nix
@@ -0,0 +1,19 @@
+{ alephone, fetchurl }:
+
+alephone.makeWrapper rec {
+  pname = "pathways-into-darkness";
+  desktopName = "Pathways-Into-Darkness";
+  version = "1.1.1";
+
+  zip = fetchurl {
+    url = "http://simplici7y.com/version/file/1185/AOPID_v1.1.1.zip";
+    sha256 = "0x83xjcw5n5s7sw8z6rb6zzhihjkjgk7x7ynnqq917dcklr7bz4g";
+  };
+
+  meta = {
+    description = ''
+      Port of the 1993 mac game "Pathways Into Darkness" by Bungie to the Aleph One engine'';
+    homepage = "http://simplici7y.com/items/aleph-one-pathways-into-darkness";
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a49d3157237e..b13e8512e700 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22912,6 +22912,8 @@ in
   alephone-pheonix = callPackage ../games/alephone/pheonix { };
   alephone-red = callPackage ../games/alephone/red { };
   alephone-rubicon-x = callPackage ../games/alephone/rubicon-x { };
+  alephone-pathways-into-darkness =
+    callPackage ../games/alephone/pathways-into-darkness { };
 
   alienarena = callPackage ../games/alienarena { };
 

From fbe3eb29dd1989dd05bbd86b425ba7cdaf6cbb8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Wed, 4 Mar 2020 11:38:03 +0100
Subject: [PATCH 2230/4636] gnome-tour: fix at typo breaking metrics job

It's an evalution problem that (unfortunately?) doesn't break
most things.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b13e8512e700..bfbcbf194151 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23857,7 +23857,7 @@ in
     mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md";
   };
 
-  gnome-tour = callPackages ../desktops/gnome-3/core/gnome-tour { };
+  gnome-tour = callPackage ../desktops/gnome-3/core/gnome-tour { };
 
   hsetroot = callPackage ../tools/X11/hsetroot { };
 

From 40d7ce78281319631feceac6e0579a6d01b76b33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 4 Mar 2020 11:54:33 +0100
Subject: [PATCH 2231/4636] vscode: specify runtimeDependencies instead of
 LD_LIBRARY_PATH

This avoids glibc verions mismatches in vscode terminal, as
LD_LIBRARY_PATH leaks into terminal and break with user installed
executables.
---
 pkgs/applications/editors/vscode/generic.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index bdcf786f61d2..ace4bbe9cdc7 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -62,6 +62,8 @@ in
       else [ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages)
         ++ [ libsecret libXScrnSaver ];
 
+    runtimeDependencies = [ systemd.lib fontconfig.lib ];
+
     nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook;
 
     dontBuild = true;
@@ -94,9 +96,5 @@ in
         grep -q "VSCODE_PATH='$out/lib/vscode'" $out/bin/${executableName} # check if sed succeeded
       '';
 
-    preFixup = lib.optionalString (system == "i686-linux" || system == "x86_64-linux") ''
-      gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ systemd fontconfig ]})
-    '';
-
     inherit meta;
   }

From e3461b75e7237dcb6dfdfa95a477cb2b95a4751c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 10:59:53 +0000
Subject: [PATCH 2232/4636] randoop: 4.2.1 -> 4.2.2

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

diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix
index 9c318b0a454d..274418172d15 100644
--- a/pkgs/development/tools/analysis/randoop/default.nix
+++ b/pkgs/development/tools/analysis/randoop/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  version = "4.2.1";
+  version = "4.2.2";
   pname = "randoop";
 
   src = fetchurl {
     url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip";
-    sha256 = "0sq6zyagb8qrj629rq7amzi0dnm6q00mll6gd5yx1nqdnjbfb4qd";
+    sha256 = "1ac4llphh16n5ihc2hb1vggl65mbkw1xd1j3ixfskvmcy8valgqw";
   };
 
   buildInputs = [ unzip ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Automatic test generation for Java";
-    homepage = https://randoop.github.io/randoop/;
+    homepage = "https://randoop.github.io/randoop/";
     license = licenses.mit;
     maintainers = with maintainers; [ pSub ];
     platforms = platforms.linux;

From 3569b327c04300ff09c8572d84f54d241fa104f3 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Tue, 3 Mar 2020 23:07:51 +0100
Subject: [PATCH 2233/4636] python3Packages.cmd2: 0.9.25 -> 1.0.0

https://github.com/python-cmd2/cmd2/releases/tag/1.0.0
---
 pkgs/development/python-modules/cmd2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix
index ac5ef42bdbed..a2e5862f5401 100644
--- a/pkgs/development/python-modules/cmd2/default.nix
+++ b/pkgs/development/python-modules/cmd2/default.nix
@@ -6,11 +6,11 @@
 }:
 buildPythonPackage rec {
   pname = "cmd2";
-  version = "0.9.25";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0w5jh2lanqxsva9fr9p07mmbd5w4v6zmhf6lr0awksvhjx77lhdc";
+    sha256 = "sha256-GtSqmkWCHX/1t31sny3f2ek8uTS1oEMSM1rRXG9DuFI=";
   };
 
   LC_ALL="en_US.UTF-8";

From 0af1d360144955a585835bb9fb5e604c8bd1cb9f Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 2 Dec 2019 19:39:42 +0800
Subject: [PATCH 2234/4636] pythonPackages.Pyro5: init at 5.7

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

diff --git a/pkgs/development/python-modules/pyro5/default.nix b/pkgs/development/python-modules/pyro5/default.nix
new file mode 100644
index 000000000000..36559a032390
--- /dev/null
+++ b/pkgs/development/python-modules/pyro5/default.nix
@@ -0,0 +1,33 @@
+{ buildPythonPackage
+, fetchPypi
+, lib
+, serpent
+, pythonOlder
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "Pyro5";
+  version = "5.7";
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "08n9jqm81pjw9hvzk6kgxwqvh29q3glgccf77kxih5nn77pwdnni";
+  };
+
+  propagatedBuildInputs = [ serpent ];
+
+  checkInputs = [ pytestCheckHook ];
+
+  # ignore network related tests, which fail in sandbox
+  disabledTests = [ "StartNSfunc" "Broadcast" "GetIP" ];
+
+  meta = with lib; {
+    description = "Distributed object middleware for Python (RPC)";
+    homepage = "https://github.com/irmen/Pyro5";
+    license = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d7ef1072ec5a..20c5f00689da 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5444,6 +5444,8 @@ in {
 
   Pyro4 = callPackage ../development/python-modules/pyro4 { };
 
+  Pyro5 = callPackage ../development/python-modules/pyro5 { };
+
   rope = callPackage ../development/python-modules/rope { };
 
   ropper = callPackage ../development/python-modules/ropper { };

From 662700ae91b01f1e678b415fd06e942f07edc850 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 10 Feb 2020 17:52:55 +0800
Subject: [PATCH 2235/4636] pythonPackages.bugsnag: init at 3.6.0

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

diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix
new file mode 100644
index 000000000000..2f0e67683d9a
--- /dev/null
+++ b/pkgs/development/python-modules/bugsnag/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, six
+, webob
+}:
+
+buildPythonPackage rec {
+  pname = "bugsnag";
+  version = "3.6.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "17cjh7g8gbr0gb22nzybkw7vq9x5wfa5ln94hhzijbz934bw1f37";
+  };
+
+  propagatedBuildInputs = [ six webob ];
+
+  # no tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Automatic error monitoring for django, flask, etc.";
+    homepage = "https://www.bugsnag.com";
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 20c5f00689da..381eb2eaaad1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -522,6 +522,8 @@ in {
 
   bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27
 
+  bugsnag = callPackage ../development/python-modules/bugsnag { };
+
   cachecontrol = callPackage ../development/python-modules/cachecontrol { };
 
   cachelib = callPackage ../development/python-modules/cachelib { };

From 75f3ab6b689aa763812cc7c5a99ba52d87874c5a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 2 Dec 2019 09:01:02 +0800
Subject: [PATCH 2236/4636] maestral: 0.4.2 -> 0.6.1

---
 .../networking/maestral/default.nix           | 38 +++++++++++++------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/maestral/default.nix b/pkgs/applications/networking/maestral/default.nix
index 708957bdf015..49348610be57 100644
--- a/pkgs/applications/networking/maestral/default.nix
+++ b/pkgs/applications/networking/maestral/default.nix
@@ -1,24 +1,40 @@
-{ stdenv, lib, python3Packages, fetchFromGitHub
-, withGui ? false, wrapQtAppsHook ? null }:
+{ stdenv
+, lib
+, fetchFromGitHub
+, python3
+, withGui ? false
+, wrapQtAppsHook ? null
+}:
 
-python3Packages.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "maestral${lib.optionalString withGui "-gui"}";
-  version = "0.4.2";
+  version = "0.6.1";
+
+  disabled = python3.pkgs.pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "SamSchott";
     repo = "maestral-dropbox";
     rev = "v${version}";
-    sha256 = "0xis0cqfp3wgajwk44dmi2gbfirmz0a0zi25qxdzpdn0z19hp88m";
+    sha256 = "06i3c7i85x879np158156mba7kxz2cwh75390sc9gwwngc95d9h9";
   };
 
-  disabled = python3Packages.pythonOlder "3.6";
-
-  propagatedBuildInputs = (with python3Packages; [
-    blinker click dropbox keyring keyrings-alt Pyro4 requests u-msgpack-python watchdog
+  propagatedBuildInputs = with python3.pkgs; [
+    blinker
+    bugsnag
+    click
+    dropbox
+    keyring
+    keyrings-alt
+    lockfile
+    Pyro5
+    requests
+    u-msgpack-python
+    watchdog
   ] ++ lib.optionals stdenv.isLinux [
-    sdnotify systemd
-  ] ++ lib.optional withGui pyqt5);
+    sdnotify
+    systemd
+  ] ++ lib.optional withGui pyqt5;
 
   nativeBuildInputs = lib.optional withGui wrapQtAppsHook;
 

From b7f5450e4dcfb0ba7a61c2236246a0d670e887ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Wed, 4 Mar 2020 13:35:43 +0100
Subject: [PATCH 2237/4636] knot-resolver: apply upstream patch

Encrypted ZFS users were affected, in particular some NixOS users
who reported the issue upstream.  Close #81188.
---
 pkgs/servers/dns/knot-resolver/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index c1c826b78129..ccb9a8590590 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -23,6 +23,14 @@ unwrapped = stdenv.mkDerivation rec {
     sha256 = "4a93264ad0cda7ea2252d1ba057e474722f77848165f2893e0c76e21ae406415";
   };
 
+  patches = [
+    (fetchpatch { # merged to upstream master, remove on update
+      name = "zfs-cpu-usage.diff";
+      url = "https://gitlab.labs.nic.cz/knot/knot-resolver/merge_requests/946.diff";
+      sha256 = "0mcvx4pfnl19h6zrv2fcgxdjarqzczn2dz85sylcczsfvdmn6i5m";
+    })
+  ];
+
   outputs = [ "out" "dev" ];
 
   # Path fixups for the NixOS service.

From 6a911a157fdb3f7ca8d31a307f8f1eabb01830e1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 12:43:57 +0000
Subject: [PATCH 2238/4636] tiled: 1.3.2 -> 1.3.3

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

diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index aa6fc0a7d240..0e73dffb20a9 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -3,13 +3,13 @@
 
 mkDerivation rec {
   pname = "tiled";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchFromGitHub {
     owner = "bjorn";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1jfr9ngsbkn9j3yvy3mnx0llfwmk39dj8kfiy9fawkhw0v4bzjbd";
+    sha256 = "0v8imw6zdygs9ymsgk41jclsfr1jwbracjc5balydh15r57rvwjd";
   };
 
   nativeBuildInputs = [ pkgconfig qmake ];
@@ -19,7 +19,7 @@ mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Free, easy to use and flexible tile map editor";
-    homepage = https://www.mapeditor.org/;
+    homepage = "https://www.mapeditor.org/";
     license = with licenses; [
       bsd2	# libtiled and tmxviewer
       gpl2Plus	# all the rest

From 92b36343a8ea29de1bd6d2c3920323ce8b4a1ea8 Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Wed, 4 Mar 2020 05:40:19 +0100
Subject: [PATCH 2239/4636] appimage: split checks between appimageSignature
 and appimageType

---
 pkgs/build-support/appimage/default.nix | 31 ++++++++++++++++---------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index f8e5206bbb5a..7459a028f076 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -8,13 +8,23 @@ rec {
     nativeBuildInputs = [ radare2 libarchive jq squashfsTools ];
     buildCommand = ''
       # https://github.com/AppImage/libappimage/blob/ca8d4b53bed5cbc0f3d0398e30806e0d3adeaaab/src/libappimage/utils/MagicBytesChecker.cpp#L45-L63
-      appimageType=$(r2 $src -nn -Nqc "p8 3 @ 8")
-      case "$appimageType" in
-        414901)
-          mkdir $out
-          bsdtar -x -C $out -f $src;;
+      eval $(r2 $src -nn -Nqc "p8j 3 @ 8" |
+        jq -r '{appimageSignature: (.[:-1]|implode), appimageType: .[-1]}|
+          @sh "appimageSignature=\(.appimageSignature) appimageType=\(.appimageType)"')
 
-        414902)
+      # check AppImage signature
+      if [[ $appimageSignature != "AI" ]]; then
+        echo "Not an appimage."
+        exit
+      fi
+
+      case "$appimageType" in
+        1)
+          mkdir $out
+          bsdtar -x -C $out -f $src
+          ;;
+
+        2)
           install $src ./appimage
 
           # multiarch offset one-liner using same method as AppImage
@@ -22,12 +32,11 @@ rec {
           offset=$(r2 ./appimage -nn -Nqc "pfj.elf_header @ 0" |\
             jq 'map({(.name): .value}) | add | .shoff + (.shnum * .shentsize)')
 
-          unsquashfs -o $offset ./appimage
+          unsquashfs -q -d $out -o $offset ./appimage
+          ;;
 
-          cp -rv squashfs-root $out;;
-
-        # 414903) get prepared, https://github.com/TheAssassin/type3-runtime
-        *) echo "Unsupported AppImage Signature: $appimageType";;
+        # 3) get ready, https://github.com/TheAssassin/type3-runtime
+        *) echo "Unsupported AppImage Type: $appimageType";;
       esac
     '';
   };

From 86e6080daf5936ddd34804c1106af35956127219 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 13:41:09 +0000
Subject: [PATCH 2240/4636] workcraft: 3.2.5 -> 3.2.6

---
 pkgs/applications/science/logic/workcraft/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix
index c0d6d541d6bd..685d6ee48619 100644
--- a/pkgs/applications/science/logic/workcraft/default.nix
+++ b/pkgs/applications/science/logic/workcraft/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "workcraft";
-  version = "3.2.5";
+  version = "3.2.6";
 
   src = fetchurl {
     url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz";
-    sha256 = "11dk00b17yhk7cv8zms4nlffc0qwgsapimzr8csb89qmgabd7rj3";
+    sha256 = "1sfbxmk71gp7paw4l5azqr0lsgsyp4308gx2jz8w4k3nasfshz25";
   };
 
   buildInputs = [ makeWrapper ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = https://workcraft.org/;
+    homepage = "https://workcraft.org/";
     description = "Framework for interpreted graph modeling, verification and synthesis";
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.mit;

From a54908f15e81b5b8fa08e6018c1f914597d7bcc0 Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Wed, 4 Mar 2020 13:47:27 +0000
Subject: [PATCH 2241/4636] delta: 0.0.16 -> 0.0.17

---
 .../version-management/git-and-tools/delta/default.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix
index 91c448e78575..dff06d384dc7 100644
--- a/pkgs/applications/version-management/git-and-tools/delta/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "delta";
-  version = "0.0.16";
+  version = "0.0.17";
 
   src = fetchFromGitHub {
     owner = "dandavison";
     repo = pname;
     rev = version;
-    sha256 = "01jiqizg1ywvrrwhqzfqzbaqrzyfaqm66sixas0mpyzmd6cdwmh6";
+    sha256 = "1j01h60snciqp4psyxf67j3gbmi02c1baprsg9frzjacawbx8cz7";
   };
 
-  cargoSha256 = "0hah0qfgnl4w2h0djyh4xx1jks5dkzwin01qw001dqiasl60prn2";
+  cargoSha256 = "176bfd57gc9casvk0p10ilvzw3q3rkkv7qflja778vrwr9zrmkzq";
 
   meta = with lib; {
     homepage = "https://github.com/dandavison/delta";

From 1332cea0318897fefc5047fbf9956bd5546a601a Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@suse.com>
Date: Wed, 4 Mar 2020 14:51:30 +0100
Subject: [PATCH 2242/4636] buildah: v1.14.1 -> v1.14.2

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
---
 pkgs/development/tools/buildah/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index 3e758af0a7b5..55e0dc790ed3 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -4,13 +4,13 @@
 
 buildGoPackage rec {
   pname = "buildah";
-  version = "1.14.1";
+  version = "1.14.2";
 
   src = fetchFromGitHub {
     owner  = "containers";
     repo   = "buildah";
     rev    = "v${version}";
-    sha256 = "12x80g83xjcjiafcxyqrhg952nq5w91df35d7lnvc2vz8vvpkyx1";
+    sha256 = "1475k8h1l8rbbs6hyq9gxksh9884l1674z77fmiyr5vzql5yf7ca";
   };
 
   outputs = [ "bin" "man" "out" ];

From 13e3fc3e060835debec9b92a7c28d8c7927e7ec3 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 4 Mar 2020 13:16:30 +0100
Subject: [PATCH 2243/4636] nextcloud-client: 2.6.3 -> 2.6.4

https://github.com/nextcloud/desktop/releases/tag/v2.6.4
---
 pkgs/applications/networking/nextcloud-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix
index 53d073caee47..7e096ca94e30 100644
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/applications/networking/nextcloud-client/default.nix
@@ -17,13 +17,13 @@
 
 mkDerivation rec {
   pname = "nextcloud-client";
-  version = "2.6.3";
+  version = "2.6.4";
 
   src = fetchFromGitHub {
     owner = "nextcloud";
     repo = "desktop";
     rev = "v${version}";
-    sha256 = "17w1bx305w656jkiv55lwncxwdly8rf2dsisqw3c9bc7vz19l6p8";
+    sha256 = "1wr57qwcjfzbpb4p0ybfjpw2hhwp91yrk2n3ywrqywcvjj38jg1q";
   };
 
   patches = [

From 2c9cc36b390963905e29f76d9fedcb3a77bd1907 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 14:06:34 +0000
Subject: [PATCH 2244/4636] zimg: 2.9.2 -> 2.9.3

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

diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix
index 75f10f94fb38..f5913137e1c2 100644
--- a/pkgs/development/libraries/zimg/default.nix
+++ b/pkgs/development/libraries/zimg/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "zimg";
-  version = "2.9.2";
+  version = "2.9.3";
 
   src = fetchFromGitHub {
     owner  = "sekrit-twc";
     repo   = "zimg";
     rev    = "release-${version}";
-    sha256 = "0jlgrlfs9maixd8mx7gk2kfawz8ixnihkxi7vhyzfy1gq49vmxm2";
+    sha256 = "1dqyrq3p8bkgvj4ci50ac342hjnhyz6xxvhiwp7wpi3v3nbj7s02";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Scaling, colorspace conversion and dithering library";
-    homepage    = https://github.com/sekrit-twc/zimg;
+    homepage    = "https://github.com/sekrit-twc/zimg";
     license     = licenses.wtfpl;
     platforms   = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ rnhmjoj ];

From 3443b693cc10522cf5513419ba7266afb0ce5da1 Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Wed, 4 Mar 2020 15:10:11 +0100
Subject: [PATCH 2245/4636] appimage: fix suspicious ownership

---
 pkgs/build-support/appimage/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index 7459a028f076..c56aae4c599c 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -13,7 +13,7 @@ rec {
           @sh "appimageSignature=\(.appimageSignature) appimageType=\(.appimageType)"')
 
       # check AppImage signature
-      if [[ $appimageSignature != "AI" ]]; then
+      if [[ "$appimageSignature" != "AI" ]]; then
         echo "Not an appimage."
         exit
       fi
@@ -25,14 +25,13 @@ rec {
           ;;
 
         2)
-          install $src ./appimage
-
           # multiarch offset one-liner using same method as AppImage
           # see https://gist.github.com/probonopd/a490ba3401b5ef7b881d5e603fa20c93
-          offset=$(r2 ./appimage -nn -Nqc "pfj.elf_header @ 0" |\
+          offset=$(r2 $src -nn -Nqc "pfj.elf_header @ 0" |\
             jq 'map({(.name): .value}) | add | .shoff + (.shnum * .shentsize)')
 
-          unsquashfs -q -d $out -o $offset ./appimage
+          unsquashfs -q -d $out -o $offset $src
+          chmod go-w $out
           ;;
 
         # 3) get ready, https://github.com/TheAssassin/type3-runtime

From 0aed07bca2d4fb11cd6f842d0d6836588a389f24 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 4 Mar 2020 15:51:19 +0100
Subject: [PATCH 2246/4636] =?UTF-8?q?libnotify:=200.7.8=20=E2=86=92=200.7.?=
 =?UTF-8?q?9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We added manpage upstream 🎉

https://ftp.gnome.org/pub/GNOME/sources/libnotify/0.7/libnotify-0.7.9.news
---
 .../libraries/libnotify/default.nix           | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix
index f51383833417..aacadc5ea0ad 100644
--- a/pkgs/development/libraries/libnotify/default.nix
+++ b/pkgs/development/libraries/libnotify/default.nix
@@ -3,7 +3,8 @@
 , meson
 , ninja
 , pkgconfig
-, fetchpatch
+, libxslt
+, docbook-xsl-ns
 , glib
 , gdk-pixbuf
 , gobject-introspection
@@ -12,24 +13,15 @@
 
 stdenv.mkDerivation rec {
   pname = "libnotify";
-  version = "0.7.8";
+  version = "0.7.9";
 
-  outputs = [ "out" "dev" ];
+  outputs = [ "out" "man" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1371csx0n92g60b5dmai4mmzdnx8081mc3kcgc6a0xipcq5rw839";
+    sha256 = "ZsBRftFt968ljoMgj6r1Bpcn39ZplcS7xRwWlU1nR2E=";
   };
 
-  patches = [
-    # Fix darwin build
-    # https://gitlab.gnome.org/GNOME/libnotify/merge_requests/9
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/libnotify/commit/55eb69247fe2b479ea43311503042fc03bf4e67d.patch";
-      sha256 = "1hlb5b7c5axiyir1i5j2pi94bm2gyr1ybkp6yaqy7yk6iiqlvv50";
-    })
-  ];
-
   mesonFlags = [
     # disable tests as we don't need to depend on GTK (2/3)
     "-Dtests=false"
@@ -42,6 +34,8 @@ stdenv.mkDerivation rec {
     meson
     ninja
     pkgconfig
+    libxslt
+    docbook-xsl-ns
   ];
 
   propagatedBuildInputs = [

From 30430c0b409c01267d747dfc8ec94a25237ef101 Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Mon, 9 Dec 2019 21:28:44 +0100
Subject: [PATCH 2247/4636] soulseekqt: fix icons, change unpack method, update
 homepage, more generic appimage handling

---
 .../networking/p2p/soulseekqt/default.nix     | 61 +++++++++++--------
 1 file changed, 34 insertions(+), 27 deletions(-)

diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix
index b52320c96814..be9d59caeb25 100644
--- a/pkgs/applications/networking/p2p/soulseekqt/default.nix
+++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, lib, fetchurl, mkDerivation
+{ stdenv, lib, fetchzip, mkDerivation
 , autoPatchelfHook
 , dbus
 , desktop-file-utils
 , fontconfig
+, imagemagick
 , libjson
-, pythonPackages
 , qtmultimedia
+, radare2
+, jq
 , squashfsTools
 , zlib
 }:
@@ -14,46 +16,51 @@ mkDerivation rec {
   pname = "soulseekqt";
   version = "2018-1-30";
 
-  src = fetchurl {
-      urls = [
-        "https://www.dropbox.com/s/0vi87eef3ooh7iy/SoulseekQt-${version}.tgz"
-        "https://www.slsknet.org/SoulseekQt/Linux/SoulseekQt-${version}-64bit-appimage.tgz"
-      ];
-      sha256 = "0d1cayxr1a4j19bc5a3qp9pg22ggzmd55b6f5av3lc6lvwqqg4w6";
+  src = fetchzip {
+      url = "https://www.slsknet.org/SoulseekQt/Linux/SoulseekQt-${version}-64bit-appimage.tgz";
+      sha256 = "16ncnvv8h33f161mgy7qc0wjvvqahsbwvby65qhgfh9pbbgb4xgg";
     };
 
   dontBuild = true;
 
-  nativeBuildInputs = [ autoPatchelfHook pythonPackages.binwalk squashfsTools desktop-file-utils ];
+  nativeBuildInputs = [ imagemagick radare2 jq autoPatchelfHook squashfsTools
+    desktop-file-utils ];
   buildInputs = [ qtmultimedia stdenv.cc.cc ];
 
   # avoid usage of appimage's runner option --appimage-extract
-  unpackCmd = ''
-    export HOME=$(pwd) # workaround for binwalk
-    appimage=$(tar xvf $curSrc) && binwalk --quiet \
-       $appimage -D 'squashfs:squashfs:unsquashfs %e'
-    '';
+  postUnpack = ''
+    cd $sourceRoot
 
-  patchPhase = ''
-    cd squashfs-root/
-    binary="$(readlink AppRun)"
+    # multiarch offset one-liner using same method as AppImage
+    offset=$(r2 *.AppImage -nn -Nqc "pfj.elf_header @ 0" |\
+      jq 'map({(.name): .value}) | add | .shoff + (.shnum * .shentsize)')
 
-    # fixup desktop file
-    desktop-file-edit --set-key Exec --set-value $binary default.desktop
-    desktop-file-edit --set-key Comment --set-value "${meta.description}" default.desktop
-    desktop-file-edit --set-key Categories --set-value Network default.desktop
+    unsquashfs -o $offset *.AppImage
+    sourceRoot=squashfs-root
   '';
 
   installPhase = ''
-    mkdir -p $out/{bin,share/applications,share/icons/}
-    cp default.desktop $out/share/applications/$binary.desktop
-    cp soulseek.png $out/share/icons/
-    cp $binary $out/bin/
-  '';
+
+      binary="$(readlink AppRun)"
+      mv default.desktop $binary.desktop
+      install -Dm755 $binary -t $out/bin
+
+      # fixup and install desktop file
+      desktop-file-install --dir $out/share/applications \
+        --set-key Exec --set-value $binary \
+        --set-key Comment --set-value "${meta.description}" \
+        --set-key Categories --set-value Network $binary.desktop
+
+      #TODO: write generic code to read icon path from $binary.desktop
+      for size in 16 32 48 64 72 96 128 192 256 512 1024; do
+        mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
+        convert -resize "$size"x"$size" ./soulseek.png $out/share/icons/hicolor/"$size"x"$size"/apps/soulseek.png
+      done
+    '';
 
   meta = with lib; {
     description = "Official Qt SoulSeek client";
-    homepage = http://www.soulseekqt.net;
+    homepage = https://www.slsknet.org;
     license = licenses.unfree;
     maintainers = [ maintainers.genesis ];
     platforms = [ "x86_64-linux" ];

From 1c0de27df32d7646304108219695f5987775c588 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 3 Mar 2020 17:29:41 +0100
Subject: [PATCH 2248/4636] bazel_0: init at 0.26.0

---
 .../build-managers/bazel/bazel_0/default.nix  | 375 ++++++++++++++++++
 .../build-managers/bazel/bazel_0/glibc.patch  |  78 ++++
 .../bazel/bazel_0/python-stub-path-fix.patch  |  13 +
 pkgs/top-level/all-packages.nix               |   9 +
 4 files changed, 475 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/bazel/bazel_0/default.nix
 create mode 100644 pkgs/development/tools/build-managers/bazel/bazel_0/glibc.patch
 create mode 100644 pkgs/development/tools/build-managers/bazel/bazel_0/python-stub-path-fix.patch

diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_0/default.nix
new file mode 100644
index 000000000000..f54868de533c
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bazel/bazel_0/default.nix
@@ -0,0 +1,375 @@
+{ stdenv, callPackage, lib, fetchurl, fetchpatch, runCommand, makeWrapper
+, zip, unzip, bash, writeCBin, coreutils
+, which, python, perl, gawk, gnused, gnutar, gnugrep, gzip, findutils
+# Apple dependencies
+, cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation
+# Allow to independently override the jdks used to build and run respectively
+, buildJdk, runJdk
+, buildJdkName
+, runtimeShell
+# Always assume all markers valid (don't redownload dependencies).
+# Also, don't clean up environment variables.
+, enableNixHacks ? false
+}:
+
+let
+  srcDeps = [
+    # From: $REPO_ROOT/WORKSPACE
+    (fetchurl {
+      url = "https://github.com/google/desugar_jdk_libs/archive/915f566d1dc23bc5a8975320cd2ff71be108eb9c.zip";
+      sha256 = "0b926df7yxyyyiwm9cmdijy6kplf0sghm23sf163zh8wrk87wfi7";
+    })
+    (fetchurl {
+        url = "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/2d9566b21fbe405acf5f7bf77eda30df72a4744c.tar.gz";
+        sha256 = "4a1318fed4831697b83ce879b3ab70ae09592b167e5bda8edaff45132d1c3b3f";
+    })
+    (fetchurl {
+        url = "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz";
+        sha256 = "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52";
+    })
+    (fetchurl {
+      url = "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz";
+      sha256 = "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898";
+    })
+     (fetchurl {
+         url = "https://mirror.bazel.build/bazel_java_tools/releases/javac10/v3.1/java_tools_javac10_linux-v3.1.zip";
+         sha256 = "a0cd51f9db1bf05a722ff7f5c60a07fa1c7d27428fff0815c342d32aa6c53576";
+     })
+    (fetchurl {
+        url = "https://mirror.bazel.build/bazel_java_tools/releases/javac10/v3.1/java_tools_javac10_darwin-v3.1.zip";
+        sha256 = "c646aad8808b8ec5844d6a80a1287fc8e13203375fe40d6af4819eff48b9bbaf";
+    })
+    (fetchurl {
+        url = "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v1.0.zip";
+        sha256 = "cc470e529fafb6165b5be3929ff2d99b38429b386ac100878687416603a67889";
+    })
+    (fetchurl {
+        url = "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip";
+        sha256 = "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0";
+    })
+    (fetchurl {
+        url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.2.tar.gz";
+        sha256 = "04f85f2dd049e87805511e3babc5cea3f5e72332b1627e34f3a5461cc38e815f";
+    })
+  ];
+
+  distDir = runCommand "bazel-deps" {} ''
+    mkdir -p $out
+    for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done
+  '';
+
+  defaultShellPath = lib.makeBinPath
+    # Keep this list conservative. For more exotic tools, prefer to use
+    # @rules_nixpkgs to pull in tools from the nix repository. Example:
+    #
+    # WORKSPACE:
+    #
+    #     nixpkgs_git_repository(
+    #         name = "nixpkgs",
+    #         revision = "def5124ec8367efdba95a99523dd06d918cb0ae8",
+    #     )
+    #
+    #     # This defines an external Bazel workspace.
+    #     nixpkgs_package(
+    #         name = "bison",
+    #         repositories = { "nixpkgs": "@nixpkgs//:default.nix" },
+    #     )
+    #
+    # some/BUILD.bazel:
+    #
+    #     genrule(
+    #        ...
+    #        cmd = "$(location @bison//:bin/bison) -other -args",
+    #        tools = [
+    #            ...
+    #            "@bison//:bin/bison",
+    #        ],
+    #     )
+    #
+    [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip ];
+
+  # Java toolchain used for the build and tests
+  javaToolchain = "@bazel_tools//tools/jdk:toolchain_host${buildJdkName}";
+
+in
+stdenv.mkDerivation rec {
+
+  version = "0.26.0";
+
+  meta = with lib; {
+    homepage = "https://github.com/bazelbuild/bazel/";
+    description = "Build tool that builds code quickly and reliably";
+    license = licenses.asl20;
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+
+  # Additional tests that check bazel’s functionality. Execute
+  #
+  #     nix-build . -A bazel.tests
+  #
+  # in the nixpkgs checkout root to exercise them locally.
+  passthru.tests = {
+    pythonBinPath = callPackage ./python-bin-path-test.nix {};
+    bashTools = callPackage ./bash-tools-test.nix {};
+  };
+
+  name = "bazel-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/bazelbuild/bazel/releases/download/${version}/${name}-dist.zip";
+    sha256 = "d26dadf62959255d58e523da3448a6222af768fe1224e321b120c1d5bbe4b4f2";
+  };
+
+  # Necessary for the tests to pass on Darwin with sandbox enabled.
+  # Bazel starts a local server and needs to bind a local address.
+  __darwinAllowLocalNetworking = true;
+
+  sourceRoot = ".";
+
+  patches = [
+    ./glibc.patch
+    ./python-stub-path-fix.patch
+  ] ++ lib.optional enableNixHacks ../nix-hacks.patch;
+
+  # Bazel expects several utils to be available in Bash even without PATH. Hence this hack.
+
+  customBash = writeCBin "bash" ''
+    #include <stdio.h>
+    #include <stdlib.h>
+    #include <string.h>
+    #include <unistd.h>
+
+    extern char **environ;
+
+    int main(int argc, char *argv[]) {
+      char *path = getenv("PATH");
+      char *pathToAppend = "${defaultShellPath}";
+      char *newPath;
+      if (path != NULL) {
+        int length = strlen(path) + 1 + strlen(pathToAppend) + 1;
+        newPath = malloc(length * sizeof(char));
+        snprintf(newPath, length, "%s:%s", path, pathToAppend);
+      } else {
+        newPath = pathToAppend;
+      }
+      setenv("PATH", newPath, 1);
+      execve("${bash}/bin/bash", argv, environ);
+      return 0;
+    }
+  '';
+
+  postPatch = let
+
+    darwinPatches = ''
+      # Disable Bazel's Xcode toolchain detection which would configure compilers
+      # and linkers from Xcode instead of from PATH
+      export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
+
+      # Explicitly configure gcov since we don't have it on Darwin, so autodetection fails
+      export GCOV=${coreutils}/bin/false
+
+      # Framework search paths aren't added by bintools hook
+      # https://github.com/NixOS/nixpkgs/pull/41914
+      export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks"
+
+      # libcxx includes aren't added by libcxx hook
+      # https://github.com/NixOS/nixpkgs/pull/41589
+      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1"
+
+      # don't use system installed Xcode to run clang, use Nix clang instead
+      sed -i -e "s;/usr/bin/xcrun clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \
+        scripts/bootstrap/compile.sh \
+        src/tools/xcode/realpath/BUILD \
+        src/tools/xcode/stdredirect/BUILD \
+        tools/osx/BUILD
+
+      # nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead
+      sed -i -e "/#include <pthread\/spawn.h>/i #include <dispatch/dispatch.h>" src/main/cpp/blaze_util_darwin.cc
+
+      # clang installed from Xcode has a compatibility wrapper that forwards
+      # invocations of gcc to clang, but vanilla clang doesn't
+      sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl
+
+      sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl
+      wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl )
+      for wrapper in "''${wrappers[@]}"; do
+        sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper
+      done
+    '';
+
+    genericPatches = ''
+      # Substitute python's stub shebang to plain python path. (see TODO add pr URL)
+      # See also `postFixup` where python is added to $out/nix-support
+      substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt\
+          --replace "/usr/bin/env python" "${python}/bin/python" \
+          --replace "NIX_STORE_PYTHON_PATH" "${python}/bin/python" \
+
+      # md5sum is part of coreutils
+      sed -i 's|/sbin/md5|md5sum|' \
+        src/BUILD
+
+      # substituteInPlace is rather slow, so prefilter the files with grep
+      grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do
+        # If you add more replacements here, you must change the grep above!
+        # Only files containing /bin are taken into account.
+        substituteInPlace "$path" \
+          --replace /bin/bash ${customBash}/bin/bash \
+          --replace /usr/bin/env ${coreutils}/bin/env \
+          --replace /bin/true ${coreutils}/bin/true
+      done
+
+      # Fixup scripts that generate scripts. Not fixed up by patchShebangs below.
+      substituteInPlace scripts/bootstrap/compile.sh \
+          --replace /bin/bash ${customBash}/bin/bash
+
+      # add nix environment vars to .bazelrc
+      cat >> .bazelrc <<EOF
+      build --experimental_distdir=${distDir}
+      fetch --experimental_distdir=${distDir}
+      build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')"
+      build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')"
+      build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')"
+      build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')"
+      build --host_javabase='@local_jdk//:jdk'
+      build --host_java_toolchain='${javaToolchain}'
+      EOF
+
+      # add the same environment vars to compile.sh
+      sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \
+          -e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \
+          -e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \
+          -e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \
+          -e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \
+          -e "/\$command \\\\$/a --host_java_toolchain='${javaToolchain}' \\\\" \
+          -i scripts/bootstrap/compile.sh
+
+      # --experimental_strict_action_env (which will soon become the
+      # default, see bazelbuild/bazel#2574) hardcodes the default
+      # action environment to a value that on NixOS at least is bogus.
+      # So we hardcode it to something useful.
+      substituteInPlace \
+        src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java \
+        --replace /bin:/usr/bin ${defaultShellPath}
+
+      # This is necessary to avoid:
+      # "error: no visible @interface for 'NSDictionary' declares the selector
+      # 'initWithContentsOfURL:error:'"
+      # This can be removed when the apple_sdk is upgraded beyond 10.13+
+      sed -i '/initWithContentsOfURL:versionPlistUrl/ {
+        N
+        s/error:nil\];/\];/
+      }' tools/osx/xcode_locator.m
+
+      # append the PATH with defaultShellPath in tools/bash/runfiles/runfiles.bash
+      echo "PATH=\$PATH:${defaultShellPath}" >> runfiles.bash.tmp
+      cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp
+      mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash
+
+      patchShebangs .
+    '';
+    in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches
+     + genericPatches;
+
+  buildInputs = [
+    buildJdk
+  ];
+
+  # when a command can’t be found in a bazel build, you might also
+  # need to add it to `defaultShellPath`.
+  nativeBuildInputs = [
+    zip
+    python
+    unzip
+    makeWrapper
+    which
+    customBash
+  ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ];
+
+  # Bazel makes extensive use of symlinks in the WORKSPACE.
+  # This causes problems with infinite symlinks if the build output is in the same location as the
+  # Bazel WORKSPACE. This is why before executing the build, the source code is moved into a
+  # subdirectory.
+  # Failing to do this causes "infinite symlink expansion detected"
+  preBuildPhases = ["preBuildPhase"];
+  preBuildPhase = ''
+    mkdir bazel_src
+    shopt -s dotglob extglob
+    mv !(bazel_src) bazel_src
+  '';
+
+  buildPhase = ''
+    # Increasing memory during compilation might be necessary.
+    # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m"
+    ./bazel_src/compile.sh
+    ./bazel_src/scripts/generate_bash_completion.sh \
+        --bazel=./bazel_src/output/bazel \
+        --output=./bazel_src/output/bazel-complete.bash \
+        --prepend=./bazel_src/scripts/bazel-complete-header.bash \
+        --prepend=./bazel_src/scripts/bazel-complete-template.bash
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+
+    # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel
+    # if it can’t find something in tools, it calls $out/bin/bazel-real
+    cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel
+    mv ./bazel_src/output/bazel $out/bin/bazel-real
+
+    wrapProgram "$out/bin/bazel" --add-flags --server_javabase="${runJdk}"
+
+    # shell completion files
+    mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions
+    mv ./bazel_src/output/bazel-complete.bash $out/share/bash-completion/completions/bazel
+    cp ./bazel_src/scripts/zsh_completion/_bazel $out/share/zsh/site-functions/
+  '';
+
+  # Temporarily disabling for now. A new approach is needed for this derivation as Bazel
+  # accesses the internet during the tests which fails in a sandbox.
+  doInstallCheck = false;
+  installCheckPhase = ''
+    export TEST_TMPDIR=$(pwd)
+
+    hello_test () {
+      $out/bin/bazel test \
+        --test_output=errors \
+        --java_toolchain='${javaToolchain}' \
+        examples/cpp:hello-success_test \
+        examples/java-native/src/test/java/com/example/myproject:hello
+    }
+
+    cd ./bazel_src
+
+    # test whether $WORKSPACE_ROOT/tools/bazel works
+
+    mkdir -p tools
+    cat > tools/bazel <<"EOF"
+    #!${runtimeShell} -e
+    exit 1
+    EOF
+    chmod +x tools/bazel
+
+    # first call should fail if tools/bazel is used
+    ! hello_test
+
+    cat > tools/bazel <<"EOF"
+    #!${runtimeShell} -e
+    exec "$BAZEL_REAL" "$@"
+    EOF
+
+    # second call succeeds because it defers to $out/bin/bazel-real
+    hello_test
+  '';
+
+  # Save paths to hardcoded dependencies so Nix can detect them.
+  postFixup = ''
+    mkdir -p $out/nix-support
+    echo "${customBash} ${defaultShellPath}" >> $out/nix-support/depends
+    # The templates get tar’d up into a .jar,
+    # so nix can’t detect python is needed in the runtime closure
+    echo "${python}" >> $out/nix-support/depends
+  '';
+
+  dontStrip = true;
+  dontPatchELF = true;
+}
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0/glibc.patch b/pkgs/development/tools/build-managers/bazel/bazel_0/glibc.patch
new file mode 100644
index 000000000000..c4de48068f11
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bazel/bazel_0/glibc.patch
@@ -0,0 +1,78 @@
+From https://github.com/grpc/grpc/commit/57586a1ca7f17b1916aed3dea4ff8de872dbf853
+From: Benjamin Peterson <benjamin@dropbox.com>
+Date: Fri, 3 May 2019 08:11:00 -0700
+Subject: [PATCH] Rename gettid() functions.
+
+glibc 2.30 will declare its own gettid; see https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92. Rename the grpc versions to avoid naming conflicts.
+---
+ src/core/lib/gpr/log_linux.cc          | 6 ++----
+ src/core/lib/gpr/log_posix.cc          | 4 ++--
+ src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++--
+ 3 files changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/third_party/grpc/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc
+index 81026e5689b..8b597b4cf2f 100644
+--- a/third_party/grpc/src/core/lib/gpr/log_linux.cc
++++ b/third_party/grpc/src/core/lib/gpr/log_linux.cc
+@@ -40,7 +40,7 @@
+ #include <time.h>
+ #include <unistd.h>
+
+-static long gettid(void) { return syscall(__NR_gettid); }
++static long sys_gettid(void) { return syscall(__NR_gettid); }
+
+ void gpr_log(const char* file, int line, gpr_log_severity severity,
+              const char* format, ...) {
+@@ -70,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) {
+   gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME);
+   struct tm tm;
+   static __thread long tid = 0;
+-  if (tid == 0) tid = gettid();
++  if (tid == 0) tid = sys_gettid();
+
+   timer = static_cast<time_t>(now.tv_sec);
+   final_slash = strrchr(args->file, '/');
+diff --git a/third_party/grpc/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc
+index b6edc14ab6b..2f7c6ce3760 100644
+--- a/third_party/grpc/src/core/lib/gpr/log_posix.cc
++++ b/third_party/grpc/src/core/lib/gpr/log_posix.cc
+@@ -31,7 +31,7 @@
+ #include <string.h>
+ #include <time.h>
+
+-static intptr_t gettid(void) { return (intptr_t)pthread_self(); }
++static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); }
+
+ void gpr_log(const char* file, int line, gpr_log_severity severity,
+              const char* format, ...) {
+@@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) {
+   char* prefix;
+   gpr_asprintf(&prefix, "%s%s.%09d %7" PRIdPTR " %s:%d]",
+                gpr_log_severity_string(args->severity), time_buffer,
+-               (int)(now.tv_nsec), gettid(), display_file, args->line);
++               (int)(now.tv_nsec), sys_gettid(), display_file, args->line);
+
+   fprintf(stderr, "%-70s %s\n", prefix, args->message);
+   gpr_free(prefix);
+diff --git a/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc
+index c2d80c08ddb..4a83cb6c215 100644
+--- a/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc
++++ b/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc
+@@ -1077,7 +1077,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker,
+ }
+
+ #ifndef NDEBUG
+-static long gettid(void) { return syscall(__NR_gettid); }
++static long sys_gettid(void) { return syscall(__NR_gettid); }
+ #endif
+
+ /* pollset->mu lock must be held by the caller before calling this.
+@@ -1097,7 +1097,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset,
+ #define WORKER_PTR (&worker)
+ #endif
+ #ifndef NDEBUG
+-  WORKER_PTR->originator = gettid();
++  WORKER_PTR->originator = sys_gettid();
+ #endif
+   if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) {
+     gpr_log(GPR_INFO,
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0/python-stub-path-fix.patch b/pkgs/development/tools/build-managers/bazel/bazel_0/python-stub-path-fix.patch
new file mode 100644
index 000000000000..cbc4192d2d9b
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bazel/bazel_0/python-stub-path-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt
+index dac21c9a83..69b11c283f 100644
+--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt
++++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt
+@@ -67,7 +67,7 @@ def FindPythonBinary(module_space):
+     return os.path.join(module_space, PYTHON_BINARY)
+   else:
+     # Case 4: Path has to be looked up in the search path.
+-    return SearchPath(PYTHON_BINARY)
++    return "NIX_STORE_PYTHON_PATH"
+ 
+ def CreatePythonPathEntries(python_imports, module_space):
+   parts = python_imports.split(':');
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d01b8bd0742..6af7ad3f34f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9777,6 +9777,15 @@ in
     stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
   };
 
+  bazel_0 = callPackage ../development/tools/build-managers/bazel/bazel_0 {
+    inherit (darwin) cctools;
+    inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
+    buildJdk = jdk8;
+    buildJdkName = "jdk8";
+    runJdk = jdk11_headless;
+    stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
+  };
+
   bazel_1 = callPackage ../development/tools/build-managers/bazel/bazel_1 {
     inherit (darwin) cctools;
     inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;

From c7adb4ee7282672c330b2f8b37ac5f6d74e1a523 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 3 Mar 2020 17:27:44 +0100
Subject: [PATCH 2249/4636] pythonPackages.tensorflow: use bazel_0

This allows us to get rid of the compatibility hacks that we had to add
(tf-1.15-bazel-1.0.patch) and also fixes #77626.
---
 .../python-modules/tensorflow/default.nix     |  13 +-
 .../tensorflow/tf-1.15-bazel-1.0.patch        | 213 ------------------
 2 files changed, 7 insertions(+), 219 deletions(-)
 delete mode 100644 pkgs/development/python-modules/tensorflow/tf-1.15-bazel-1.0.patch

diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index cdf659a74dc7..0cddbd5a0a49 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, bazel_1, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin
+{ stdenv, pkgs, bazel_0, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin
 , addOpenGLRunpath
 # Python deps
 , buildPythonPackage, isPy3k, pythonOlder, pythonAtLeast, python
@@ -94,7 +94,7 @@ let
 
   bazel-build = buildBazelPackage {
     name = "${pname}-${version}";
-    bazel = bazel_1;
+    bazel = bazel_0;
 
     src = fetchFromGitHub {
       owner = "tensorflow";
@@ -121,7 +121,6 @@ let
         sha256 = "1n9ypbrx36fc1kc9cz5b3p9qhg15xxhq4nz6ap3hwqba535nakfz";
       })
 
-      ./tf-1.15-bazel-1.0.patch
 
       (fetchpatch {
         # be compatible with gast >0.2 instead of only gast 0.2.2
@@ -283,7 +282,6 @@ let
     bazelFlags = [
       # temporary fixes to make the build work with bazel 0.27
       "--incompatible_no_support_tools_in_action_inputs=false"
-      "--incompatible_use_native_patch=false"
     ];
     bazelBuildFlags = [
       "--config=opt" # optimize using the flags set in the configure phase
@@ -299,9 +297,9 @@ let
       # FIXME: can't (re)produce this output with current bazel.
       # FIXME: build log: https://gist.github.com/andir/eff3e9c8eda5b56c8ea84903aed9cc35
       sha256 = if cudaSupport then
-        "0gyhjvzshgj59mbns8njlfl9qpz4sdg4j0xs2dva0w2nql7cr7im"
+        "0bzkqjnw1crf0v91yb1frvy0l7kmjawbfwdhm89h73i8fqjab8jw"
       else
-        "04jvg3mc2si4xdbszc1vnw1rmf22p7snbjphmnklp7bc39jxkcrz";
+        "1d7czp43a3a4aksvdcskbdy7dgifily1amqbz9fa6d8mkhdj5if5";
     };
 
     buildAttrs = {
@@ -422,6 +420,9 @@ in buildPythonPackage {
     x = np.random.uniform(size=(1,1))
     y = np.random.uniform(size=(1,))
     model.fit(x, y, epochs=1)
+
+    # regression test for #77626
+    from tensorflow.contrib import tensor_forest
     EOF
   '';
 
diff --git a/pkgs/development/python-modules/tensorflow/tf-1.15-bazel-1.0.patch b/pkgs/development/python-modules/tensorflow/tf-1.15-bazel-1.0.patch
deleted file mode 100644
index 4d70e99108bf..000000000000
--- a/pkgs/development/python-modules/tensorflow/tf-1.15-bazel-1.0.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-diff --git a/tensorflow/c/BUILD b/tensorflow/c/BUILD
-index f740ba66b5..6cc9003787 100644
---- a/tensorflow/c/BUILD
-+++ b/tensorflow/c/BUILD
-@@ -270,6 +270,7 @@ tf_cuda_library(
-         "//tensorflow/core/platform",
-         "@com_google_absl//absl/strings",
-     ],
-+    alwayslink = 1,
- )
- 
- exports_files(
-diff --git a/tensorflow/c/eager/BUILD b/tensorflow/c/eager/BUILD
-index 5c42e508f7..16b421862c 100644
---- a/tensorflow/c/eager/BUILD
-+++ b/tensorflow/c/eager/BUILD
-@@ -79,6 +79,7 @@ tf_cuda_library(
-         "//tensorflow/core/profiler/lib:profiler_session",
-         "//tensorflow/core:gpu_runtime",
-     ],
-+    alwayslink = 1,
- )
- 
- tf_cuda_library(
-@@ -226,6 +227,7 @@ tf_cuda_library(
-         "//tensorflow/core/profiler/rpc/client:capture_profile",
-         "//tensorflow/core:gpu_runtime",
-     ],
-+    alwayslink = 1,
- )
- 
- tf_cuda_cc_test(
-diff --git a/tensorflow/cc/saved_model/BUILD b/tensorflow/cc/saved_model/BUILD
-index 39b84922d1..b2affdd999 100644
---- a/tensorflow/cc/saved_model/BUILD
-+++ b/tensorflow/cc/saved_model/BUILD
-@@ -123,6 +123,7 @@ cc_library(
-         "//tensorflow/core/util/tensor_bundle:naming",
-         # mobile not supported yet
-     ]),
-+    alwayslink = 1,
- )
- 
- tf_cc_test(
-diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
-index c23c1f9b39..805643b217 100644
---- a/tensorflow/core/BUILD
-+++ b/tensorflow/core/BUILD
-@@ -777,6 +777,7 @@ cc_library(
-         ":lib_proto_parsing",
-         ":protos_all_cc",
-     ],
-+    alwayslink = 1,
- )
- 
- # DEPRECATED: use platform:stringpiece instead.
-@@ -2496,6 +2497,7 @@ cc_library(
-                "@com_google_protobuf//:protobuf",
-            ] + tf_protos_all_impl() + tf_protos_grappler_impl() +
-            tf_additional_numa_deps(),
-+    alwayslink = 1,
- )
- 
- # File compiled with extra flags to get cpu-specific acceleration.
-diff --git a/tensorflow/core/lib/random/BUILD b/tensorflow/core/lib/random/BUILD
-index 3bd933261b..e1e589e76d 100644
---- a/tensorflow/core/lib/random/BUILD
-+++ b/tensorflow/core/lib/random/BUILD
-@@ -50,6 +50,7 @@ cc_library(
-         "//tensorflow/core/platform:types",
-         "//third_party/eigen3",
-     ],
-+    alwayslink = 1,
- )
- 
- filegroup(
-diff --git a/tensorflow/core/platform/default/build_config.bzl b/tensorflow/core/platform/default/build_config.bzl
-index 5459d8d428..feba3a5686 100644
---- a/tensorflow/core/platform/default/build_config.bzl
-+++ b/tensorflow/core/platform/default/build_config.bzl
-@@ -228,6 +228,7 @@ def cc_proto_library(
-         hdrs = gen_hdrs,
-         deps = cc_libs + deps,
-         includes = includes,
-+        alwayslink = 1,
-         **kargs
-     )
-     native.cc_library(
-diff --git a/tensorflow/lite/java/src/test/native/BUILD b/tensorflow/lite/java/src/test/native/BUILD
-index 6dcdab2aee..32bb0a8d85 100644
---- a/tensorflow/lite/java/src/test/native/BUILD
-+++ b/tensorflow/lite/java/src/test/native/BUILD
-@@ -19,6 +19,7 @@ cc_library(
-         "//tensorflow/lite/java/jni",
-         "//tensorflow/lite/kernels:kernel_util",
-     ],
-+    alwayslink = 1,
- )
- 
- tflite_jni_binary(
-diff --git a/tensorflow/lite/python/testdata/BUILD b/tensorflow/lite/python/testdata/BUILD
-index 7bda81358f..ac1188d844 100644
---- a/tensorflow/lite/python/testdata/BUILD
-+++ b/tensorflow/lite/python/testdata/BUILD
-@@ -60,6 +60,7 @@ cc_library(
-     deps = [
-         "//tensorflow/lite/c:c_api_internal",
-     ],
-+    alwayslink = 1,
- )
- 
- cc_binary(
-diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
-index 6fd9b4f273..29df3a3dff 100644
---- a/tensorflow/python/BUILD
-+++ b/tensorflow/python/BUILD
-@@ -375,6 +375,7 @@ cc_library(
-         "//tensorflow/core:lib",
-         "//tensorflow/core:protos_all_cc",
-     ],
-+    alwayslink = 1,
- )
- 
- cc_library(
-@@ -411,6 +412,7 @@ cc_library(
-         "//third_party/py/numpy:headers",
-         "//third_party/python_runtime:headers",
-     ],
-+    alwayslink = 1,
- )
- 
- cc_library(
-@@ -617,6 +619,7 @@ cc_library(
-         "//tensorflow/core:op_gen_lib",
-         "//tensorflow/core:protos_all_cc",
-     ],
-+    alwayslink = 1,
- )
- 
- py_library(
-diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
-index a3956322fe..32752f59ad 100644
---- a/tensorflow/tensorflow.bzl
-+++ b/tensorflow/tensorflow.bzl
-@@ -2331,6 +2331,7 @@ def tf_generate_proto_text_sources(name, srcs_relative_dir, srcs, protodeps = []
-         hdrs = out_hdrs,
-         visibility = visibility,
-         deps = deps,
-+        alwayslink = 1,
-     )
- 
- def tf_genrule_cmd_append_to_srcs(to_append):
-diff --git a/tensorflow/tools/graph_transforms/BUILD b/tensorflow/tools/graph_transforms/BUILD
-index adafe2aca1..8965316b12 100644
---- a/tensorflow/tools/graph_transforms/BUILD
-+++ b/tensorflow/tools/graph_transforms/BUILD
-@@ -223,6 +223,7 @@ cc_library(
-         "//tensorflow/core:lib_internal",
-         "//tensorflow/core:protos_all_cc",
-     ],
-+    alwayslink = 1,
- )
- 
- # This library includes a main function, to make it easy to create other
-diff --git a/third_party/icu/data/BUILD.bazel b/third_party/icu/data/BUILD.bazel
-index 7db21566e4..8e18c7cc3a 100644
---- a/third_party/icu/data/BUILD.bazel
-+++ b/third_party/icu/data/BUILD.bazel
-@@ -43,4 +43,5 @@ cc_library(
-     name = "conversion_data",
-     srcs = [":conversion_data.c"],
-     deps = ["@icu//:headers"],
-+    alwayslink = 1,
- )
-diff --git a/third_party/protobuf/protobuf.patch b/third_party/protobuf/protobuf.patch
-index df0648563d..18fc6cdf35 100644
---- a/third_party/protobuf/protobuf.patch
-+++ b/third_party/protobuf/protobuf.patch
-@@ -11,7 +11,15 @@ index 2fb26050..c2744d5b 100644
-  
-  ################################################################################
-  # Protobuf Runtime Library
--@@ -218,7 +218,7 @@ cc_library(
-+@@ -209,6 +209,7 @@ cc_library(
-+     copts = COPTS,
-+     includes = ["src/"],
-+     linkopts = LINK_OPTS,
-++    alwayslink = 1,
-+     visibility = ["//visibility:public"],
-+     deps = [":protobuf_lite"] + PROTOBUF_DEPS,
-+ )
-+@@ -219,7 +220,7 @@ cc_library(
-  # TODO(keveman): Remove this target once the support gets added to Bazel.
-  cc_library(
-      name = "protobuf_headers",
-@@ -20,3 +28,4 @@ index 2fb26050..c2744d5b 100644
-      includes = ["src/"],
-      visibility = ["//visibility:public"],
-  )
-+ 
-\ No newline at end of file
-diff --git a/third_party/systemlibs/protobuf.bzl b/third_party/systemlibs/protobuf.bzl
-index 774514f3fd..1c415b018b 100644
---- a/third_party/systemlibs/protobuf.bzl
-+++ b/third_party/systemlibs/protobuf.bzl
-@@ -262,6 +262,7 @@ def cc_proto_library(
-         hdrs = gen_hdrs,
-         deps = cc_libs + deps,
-         includes = includes,
-+        alwayslink = 1,
-         **kargs
-     )
- 

From 85befe90b0e041984c1d5d3116385ae49f0ecf88 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 4 Mar 2020 17:00:08 +0100
Subject: [PATCH 2250/4636] fetchmail: update from version 6.3.26 to 6.4.2

The new version supports OpenSSL 1.x. Should be back-ported to
release-20.03.

See https://sourceforge.net/projects/fetchmail/files/branch_6.4/
for the changelog.
---
 pkgs/applications/misc/fetchmail/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix              | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix
index 6c4ecf6fa392..07691b26b75b 100644
--- a/pkgs/applications/misc/fetchmail/default.nix
+++ b/pkgs/applications/misc/fetchmail/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, openssl }:
 
 let
-  version = "6.3.26";
+  version = "6.4.2";
 in
 stdenv.mkDerivation {
   pname = "fetchmail";
   inherit version;
 
   src = fetchurl {
-    url = "mirror://sourceforge/fetchmail.berlios/fetchmail-${version}.tar.bz2";
-    sha256 = "08rafrs1dlr11myr0p99kg4k80qyy0fa63gg3ac88zn49174lwhw";
+    url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
+    sha256 = "0c563if3kribnj771l14aj06irmrlhm61dc68w6dp7zj4qrnn7z2";
   };
 
   buildInputs = [ openssl ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bfbcbf194151..7134e930a694 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19052,9 +19052,7 @@ in
 
   fehlstart = callPackage ../applications/misc/fehlstart { };
 
-  fetchmail = callPackage ../applications/misc/fetchmail {
-    openssl = openssl_1_0_2;
-  };
+  fetchmail = callPackage ../applications/misc/fetchmail { };
 
   fff = callPackage ../applications/misc/fff { };
 

From 64310331a5f48c5ce9b1d05d70a1bb790b922e76 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 17:19:28 +0000
Subject: [PATCH 2251/4636] avocode: 4.3.0 -> 4.4.3

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

diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index c5c29459b453..8b1811c645f2 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "avocode";
-  version = "4.3.0";
+  version = "4.4.3";
 
   src = fetchurl {
     url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
-    sha256 = "0ifb4nsh1mw61gb0hqphr1fmdkq1rjbrvvc9hvpclqg7wc7awids";
+    sha256 = "03pq55mdgbaf6c2q57ww2990wr6qz8hk1r6xs1irqy8990m4afvk";
   };
 
   libPath = stdenv.lib.makeLibraryPath (with xorg; [
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = https://avocode.com/;
+    homepage = "https://avocode.com/";
     description = "The bridge between designers and developers";
     license = licenses.unfree;
     platforms = platforms.linux;

From b979f51af48514b06cc9bfb43700b54cc06c18ab Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Wed, 4 Mar 2020 18:22:38 +0100
Subject: [PATCH 2252/4636] soulseekqt: refactoring using appimageTools

---
 .../networking/p2p/soulseekqt/default.nix     | 43 ++++++++-----------
 1 file changed, 17 insertions(+), 26 deletions(-)

diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix
index be9d59caeb25..a5e8d85f128e 100644
--- a/pkgs/applications/networking/p2p/soulseekqt/default.nix
+++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix
@@ -1,60 +1,51 @@
 { stdenv, lib, fetchzip, mkDerivation
+, appimageTools
 , autoPatchelfHook
-, dbus
 , desktop-file-utils
-, fontconfig
 , imagemagick
-, libjson
 , qtmultimedia
-, radare2
-, jq
-, squashfsTools
-, zlib
 }:
 
 mkDerivation rec {
   pname = "soulseekqt";
   version = "2018-1-30";
+  name="${pname}-${version}";
 
   src = fetchzip {
       url = "https://www.slsknet.org/SoulseekQt/Linux/SoulseekQt-${version}-64bit-appimage.tgz";
       sha256 = "16ncnvv8h33f161mgy7qc0wjvvqahsbwvby65qhgfh9pbbgb4xgg";
-    };
+  };
+
+  appextracted = appimageTools.extractType2 {
+    inherit name;
+    src="${src}/SoulseekQt-2018-1-30-64bit.AppImage";
+  };
 
   dontBuild = true;
-
-  nativeBuildInputs = [ imagemagick radare2 jq autoPatchelfHook squashfsTools
-    desktop-file-utils ];
+  dontConfigure = true;
+  
+  nativeBuildInputs = [ imagemagick autoPatchelfHook desktop-file-utils ];
   buildInputs = [ qtmultimedia stdenv.cc.cc ];
 
-  # avoid usage of appimage's runner option --appimage-extract
-  postUnpack = ''
-    cd $sourceRoot
-
-    # multiarch offset one-liner using same method as AppImage
-    offset=$(r2 *.AppImage -nn -Nqc "pfj.elf_header @ 0" |\
-      jq 'map({(.name): .value}) | add | .shoff + (.shnum * .shentsize)')
-
-    unsquashfs -o $offset *.AppImage
-    sourceRoot=squashfs-root
-  '';
-
   installPhase = ''
+      # directory in /nix/store so readonly
+      cd $appextracted
 
       binary="$(readlink AppRun)"
-      mv default.desktop $binary.desktop
       install -Dm755 $binary -t $out/bin
 
       # fixup and install desktop file
       desktop-file-install --dir $out/share/applications \
         --set-key Exec --set-value $binary \
         --set-key Comment --set-value "${meta.description}" \
-        --set-key Categories --set-value Network $binary.desktop
+        --set-key Categories --set-value Network default.desktop
+      mv $out/share/applications/default.desktop $out/share/applications/SoulseekQt.desktop
 
       #TODO: write generic code to read icon path from $binary.desktop
+      icon="$(readlink .DirIcon)"
       for size in 16 32 48 64 72 96 128 192 256 512 1024; do
         mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
-        convert -resize "$size"x"$size" ./soulseek.png $out/share/icons/hicolor/"$size"x"$size"/apps/soulseek.png
+        convert -resize "$size"x"$size" $icon $out/share/icons/hicolor/"$size"x"$size"/apps/$icon
       done
     '';
 

From fb6f2d1488f394f35f99fa0c520e2b8d0d431f33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Wed, 4 Mar 2020 17:27:47 +0000
Subject: [PATCH 2253/4636] radare2: 4.2.1 -> 4.3.0 (#81730)

---
 .../tools/analysis/radare2/default.nix           | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 49c749b21237..8fe5f7a0cab1 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -99,7 +99,7 @@ let
 
       meta = {
         description = "unix-like reverse engineering framework and commandline tools";
-        homepage = http://radare.org/;
+        homepage = "http://radare.org/";
         license = stdenv.lib.licenses.gpl2Plus;
         maintainers = with stdenv.lib.maintainers; [ raskin makefu mic92 ];
         platforms = with stdenv.lib.platforms; linux;
@@ -110,17 +110,17 @@ in {
   #<generated>
   # DO NOT EDIT! Automatically generated by ./update.py
   radare2 = generic {
-    version_commit = "23781";
-    gittap = "4.2.1";
-    gittip = "08478fdd29d8ce2a6c61fbd7b207bffc10682938";
-    rev = "4.2.1";
-    version = "4.2.1";
-    sha256 = "14b9433cgc2nabhz836zfgvgh2dwailcmvy05krsa0inmzbvx9fg";
+    version_commit = "23881";
+    gittap = "4.3.0";
+    gittip = "bb78ef34573020a6e92a975d0dafcddff52e6892";
+    rev = "4.3.0";
+    version = "4.3.0";
+    sha256 = "19mj419shphcgsf6ndii5i45dcac0nwiwnzp83wccnivpyfhcpnv";
     cs_ver = "4.0.1";
     cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6";
   };
   r2-for-cutter = generic {
-    version_commit = "23781";
+    version_commit = "23881";
     gittap = "4.2.1";
     gittip = "08478fdd29d8ce2a6c61fbd7b207bffc10682938";
     rev = "08478fdd29d8ce2a6c61fbd7b207bffc10682938";

From 65a3a512574e3e83b8c36012c408984b72492866 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 17:41:13 +0000
Subject: [PATCH 2254/4636] anydesk: 5.5.2 -> 5.5.4

---
 pkgs/applications/networking/remote/anydesk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix
index 8b194e53b445..3e639c283493 100644
--- a/pkgs/applications/networking/remote/anydesk/default.nix
+++ b/pkgs/applications/networking/remote/anydesk/default.nix
@@ -5,7 +5,7 @@
 
 let
   sha256 = {
-    x86_64-linux = "0az7n4lhmd4pz0spjvyiwd4w1gnqbh8f1fvr1jinsssyq0j26ldj";
+    x86_64-linux = "1ry21zw5ghba4xjx8dvimlpprgap7n8j9lqhjsciahbvc16vx5ks";
     i386-linux   = "0vjxbg5hwkqkh600rr75xviwy848r1xw9mxwf6bb6l8b0isvlsgg";
   }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported");
 
@@ -28,7 +28,7 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "anydesk";
-  version = "5.5.2";
+  version = "5.5.4";
 
   src = fetchurl {
     urls = [
@@ -81,7 +81,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     inherit description;
-    homepage = https://www.anydesk.com;
+    homepage = "https://www.anydesk.com";
     license = licenses.unfree;
     platforms = platforms.linux;
     maintainers = with maintainers; [ shyim ];

From efd0ee0d3cc88f952c170dd33586feca16e59c8e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 17:46:41 +0000
Subject: [PATCH 2255/4636] asymptote: 2.62 -> 2.63

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

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index 6246a5733405..b3b03892fcb3 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -9,14 +9,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.62";
+  version = "2.63";
   pname = "asymptote";
 
   src = fetchFromGitHub {
     owner = "vectorgraphics";
     repo = pname;
     rev = version;
-    sha256 = "1lb3a8r2gv0437viwy25s34g05x5v81gk0nxlgx7hzwv7b9zkv5s";
+    sha256 = "1szy0hmh8fx73ngpfn5p934snv148kf1amdnbcjc0n5zb4x9vzck";
   };
 
   nativeBuildInputs = [

From 2113013ca6a4ce9e49e2bc44530652a7a2c5e1aa Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 4 Mar 2020 13:00:00 -0500
Subject: [PATCH 2256/4636] nodejs-13_x: 13.9.0 -> 13.10.0

Changelog: https://github.com/nodejs/node/releases/tag/v13.10.0
---
 pkgs/development/web/nodejs/v13.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix
index 89ef27c8c5e2..6b332da79be6 100644
--- a/pkgs/development/web/nodejs/v13.nix
+++ b/pkgs/development/web/nodejs/v13.nix
@@ -5,6 +5,6 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "13.9.0";
-    sha256 = "0z68hj3z2y8aj4bc14h77mj5l99jb4ljjc10gp0dpg8s4g1x5xzw";
+    version = "13.10.0";
+    sha256 = "11m8sisi3dmr70fpnb7xi6nljil3rm36liz0wfzd7kgxmv6p9mhj";
   }

From 557b443374f7d3e8b25477a10c6f42c5f32472e4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 22:05:48 +0000
Subject: [PATCH 2257/4636] wesnoth: 1.14.10 -> 1.14.11

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

diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 2ef85ecee53f..20ec0a978f5b 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "wesnoth";
-  version = "1.14.10";
+  version = "1.14.11";
 
   src = fetchurl {
     url = "mirror://sourceforge/sourceforge/${pname}/${pname}-${version}.tar.bz2";
-    sha256 = "0xnfbz7nin56ms929i5f8rv4mpifbvr64r4ryfhrqmba0vkk9sz7";
+    sha256 = "1i8mz6gw3qar09bscczhki0g4scj8pl58v85rp0g55r4bcq41l5v";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
       adventures.
     '';
 
-    homepage = http://www.wesnoth.org/;
+    homepage = "http://www.wesnoth.org/";
     license = licenses.gpl2;
     maintainers = with maintainers; [ abbradar ];
     platforms = platforms.unix;

From 89a09456c714de093d46d51f0c2b03cb61633f54 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 4 Mar 2020 18:04:36 +0000
Subject: [PATCH 2258/4636] Revert "defaultGemConfig: remove
 asciidoctor-diagram JARs" (#81737)

This reverts commit 1ac11cc1c1858af1cef725d68cacf7102366e588.

asciidoctor-diagram starts Java processes, so the JARs are necessary
on all platforms.

See https://github.com/NixOS/nixpkgs/pull/77149#issuecomment-594576339.
---
 pkgs/development/ruby-modules/gem-config/default.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index d68e1592d887..65f27f497b7f 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -39,15 +39,6 @@ let
 in
 
 {
-  asciidoctor-diagram = { version, ruby, ... }: {
-    postInstall = ''
-      # Delete vendored JAR files unless using JRuby.
-      if ruby -e 'exit(RUBY_PLATFORM != "java")'; then
-          rm -v $out/${ruby.gemPath}/gems/$gemName-${version}/lib/*.jar
-      fi
-    '';
-  };
-
   atk = attrs: {
     dependencies = attrs.dependencies ++ [ "gobject-introspection" ];
     nativeBuildInputs = [ rake bundler pkgconfig ];

From e7d690912fd3cbd1f8af00880e622088d2d0e5c5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 18:06:31 +0000
Subject: [PATCH 2259/4636] cherrytree: 0.38.11 -> 0.39.0

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

diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix
index 3cb5738cd426..eec2b9dd24a3 100644
--- a/pkgs/applications/misc/cherrytree/default.nix
+++ b/pkgs/applications/misc/cherrytree/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "cherrytree";
-  version = "0.38.11";
+  version = "0.39.0";
 
   src = fetchurl {
     url = "https://www.giuspen.com/software/${pname}-${version}.tar.xz";
-    sha256 = "1awrrfyawa7d8qaipvikxm1p0961060az2qvmv9wwpl47zcnk1dn";
+    sha256 = "07ibr891qix7xa2sk6fdxdsji8q56c1wf786mxaz77500m0xfx4m";
   };
 
   nativeBuildInputs = [ gettext ];

From d37dbd7e6f35417b0321802781b71102eda8e674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ferry=20J=C3=A9r=C3=A9mie?= <ferryjeremie@free.fr>
Date: Wed, 4 Mar 2020 19:22:54 +0100
Subject: [PATCH 2260/4636] fluxboxlauncher: init at 0.2.1

---
 .../misc/fluxboxlauncher/default.nix          | 56 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 58 insertions(+)
 create mode 100755 pkgs/applications/misc/fluxboxlauncher/default.nix

diff --git a/pkgs/applications/misc/fluxboxlauncher/default.nix b/pkgs/applications/misc/fluxboxlauncher/default.nix
new file mode 100755
index 000000000000..4794e14b4698
--- /dev/null
+++ b/pkgs/applications/misc/fluxboxlauncher/default.nix
@@ -0,0 +1,56 @@
+{ lib
+, fetchFromGitHub
+, python3
+, gtk3
+, wrapGAppsHook
+, glibcLocales
+, gobject-introspection
+, gettext
+, pango
+, gdk-pixbuf
+, atk
+, fluxbox
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "fluxboxlauncher";
+  version = "0.2.1";
+
+  src = fetchFromGitHub {
+    owner = "mothsart";
+    repo = "fluxboxlauncher";
+    rev = "0.2.1";
+    sha256 = "024h1dk0bhc5s4dldr6pqabrgcqih9p8cys5lqgkgz406y4vyzvf";
+  };
+
+  nativeBuildInputs = [
+    wrapGAppsHook
+    gobject-introspection
+    pango
+    gdk-pixbuf
+    atk
+    gettext
+  ];
+
+  buildInputs = [
+    glibcLocales
+    gtk3
+    python3
+    fluxbox
+  ];
+
+  makeWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive"
+                      "--set CHARSET en_us.UTF-8" ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    pygobject3
+  ];
+
+  meta = with lib; {
+    description = "A Gui editor (gtk) to configure applications launching on a fluxbox session";
+    homepage = "https://github.com/mothsART/fluxboxlauncher";
+    maintainers = with maintainers; [ mothsart ];
+    license = licenses.bsdOriginal;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d3691ce2293..bcd0bde3617b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25957,4 +25957,6 @@ in
   quartus-prime-lite = callPackage ../applications/editors/quartus-prime {};
 
   go-license-detector = callPackage ../development/tools/misc/go-license-detector { };
+
+  fluxboxlauncher = callPackage ../applications/misc/fluxboxlauncher {};
 }

From c5f077c0c146b18f3407c77db8918fa5459b2310 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 18:56:56 +0000
Subject: [PATCH 2261/4636] closurecompiler: 20200204 -> 20200224

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

diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index f90e6b4bcfe0..0efdabcde2ee 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "closure-compiler";
-  version = "20200204";
+  version = "20200224";
 
   src = fetchurl {
     url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
-    sha256 = "0diqnvyfh8w7yf7l5zqvb4msw07n50k9grz0k2znykaqwmjsidx9";
+    sha256 = "0qlnpnd64rrlyz7ybdnp7zk5ns2s0071zs1fcrcq9ba2lnhfbmmb";
   };
 
   sourceRoot = ".";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A tool for making JavaScript download and run faster";
-    homepage = https://developers.google.com/closure/compiler/;
+    homepage = "https://developers.google.com/closure/compiler/";
     license = licenses.asl20;
     platforms = platforms.all;
   };

From e384126b17e77b51d5934255bd6af3a5e539dee1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 19:12:08 +0000
Subject: [PATCH 2262/4636] cloudflared: 2020.2.0 -> 2020.2.1

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

diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix
index c5d6e45ac880..d441e539aaa6 100644
--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/pkgs/applications/networking/cloudflared/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "cloudflared";
-  version = "2020.2.0";
+  version = "2020.2.1";
 
   src = fetchFromGitHub {
     owner  = "cloudflare";
     repo   = "cloudflared";
     rev    = version;
-    sha256 = "1fzndqkmfpx15fllxqxbh7n4m13ydlp50dvkdh8n384j09ndmx4r";
+    sha256 = "1wyvf4bilhiwabqgdwmnhifwc845m4g17pz7xmndzvqwmfd7riw5";
   };
 
   modSha256 = "1y5vh8g967rrm9b9hjlr70bs2rm09cpik673brgk3nzqxka10w7p";

From 7bbf7fa6936fcec1de0241bb301a2a155e59664b Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Wed, 4 Mar 2020 20:20:32 +0100
Subject: [PATCH 2263/4636] uwsgi: use pyhome instead of pythonpath for uwsgi
 vassals

---
 nixos/modules/services/web-servers/uwsgi.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix
index 3481b5e60403..4b74c329e3dc 100644
--- a/nixos/modules/services/web-servers/uwsgi.nix
+++ b/nixos/modules/services/web-servers/uwsgi.nix
@@ -32,7 +32,7 @@ let
               inherit plugins;
             } // removeAttrs c [ "type" "pythonPackages" ]
               // optionalAttrs (python != null) {
-                pythonpath = "${pythonEnv}/${python.sitePackages}";
+                pyhome = "${pythonEnv}";
                 env =
                   # Argh, uwsgi expects list of key-values there instead of a dictionary.
                   let env' = c.env or [];

From 88b22b68904419c26d21f58bc2b95c1daf792aca Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 4 Mar 2020 20:22:15 +0100
Subject: [PATCH 2264/4636] =?UTF-8?q?php74:=207.4.2=20=E2=86=92=207.4.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/php/php-src/blob/php-7.4.3/NEWS#L3-L90
---
 pkgs/development/interpreters/php/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 0e4d83c1352e..a31bbe73caee 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -286,7 +286,7 @@ in {
   };
 
   php74 = generic {
-    version = "7.4.2";
-    sha256 = "05p8z0ld058yjanxaphy3ka20hn7x7d6nak5sm782w4wprs9k402";
+    version = "7.4.3";
+    sha256 = "wVF7pJV4+y3MZMc6Ptx21PxQfEp6xjmYFYTMfTtMbRQ=";
   };
 }

From deb059c390217aa2f51ebbbc7b1f214fd3e22acf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 19:47:19 +0000
Subject: [PATCH 2265/4636] clipgrab: 3.8.7 -> 3.8.11

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

diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index c0075d506728..34e0d33bcbc0 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -5,10 +5,10 @@
 
 mkDerivation rec {
   pname = "clipgrab";
-  version = "3.8.7";
+  version = "3.8.11";
 
   src = fetchurl {
-    sha256 = "1mjkq487w168537qzw4pd010lp25vm1s2zji6cykcaa2cxcd6p7p";
+    sha256 = "0jpfdmyzjasq4x1xvk7b1cmhhq6fz6ydvvbwz2wclph367x496xk";
     # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
     url = "https://download.clipgrab.org/${pname}-${version}.tar.gz";
   };
@@ -49,7 +49,7 @@ mkDerivation rec {
       Dailymotion and many other online video sites. It converts downloaded
       videos to MPEG4, MP3 or other formats in just one easy step.
     '';
-    homepage = https://clipgrab.org/;
+    homepage = "https://clipgrab.org/";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
   };

From c522b865b959431c1e5723f47eb320c7897a3003 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 20:39:16 +0000
Subject: [PATCH 2266/4636] eternal-terminal: 6.0.6 -> 6.0.7

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

diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix
index 7ee959905cee..bd39cfba8aeb 100644
--- a/pkgs/tools/networking/eternal-terminal/default.nix
+++ b/pkgs/tools/networking/eternal-terminal/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "eternal-terminal";
-  version = "6.0.6";
+  version = "6.0.7";
 
   src = fetchFromGitHub {
     owner = "MisterTea";
     repo = "EternalTerminal";
     rev = "et-v${version}";
-    sha256 = "0vhhiccyvp9pjdmmscwdwcynxfwd2kgv418z90blnir0yfkvsryq";
+    sha256 = "03pdspggqxkmz95qb96pig5x0xw18hy9a7ivszydr32ry6kxxx1h";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Remote shell that automatically reconnects without interrupting the session";
     license = licenses.asl20;
-    homepage = https://mistertea.github.io/EternalTerminal/;
+    homepage = "https://mistertea.github.io/EternalTerminal/";
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ dezgeg pingiun ];
   };

From 8e4f502fc6a3736f402e320ba7ab3ec630a4cbac Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 4 Mar 2020 21:19:35 +0100
Subject: [PATCH 2267/4636] glib.setupHook: run glibPreFixupPhase before
 gappsWrapperArgsHook

Since we split wrapGAppsHook and move its variable initialization to preFixupPhases in #81475, it was getting run before glibPreFixupPhase which sets GSETTINGS_SCHEMAS_PATH variable gappsWrapperArgsHook depends on. Let's introduce this ugly hack to ensure glibPreFixupPhase will run before gappsWrapperArgsHook.
---
 pkgs/development/libraries/glib/setup-hook.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh
index 37c750b8db66..5d9c330b62eb 100644
--- a/pkgs/development/libraries/glib/setup-hook.sh
+++ b/pkgs/development/libraries/glib/setup-hook.sh
@@ -24,4 +24,12 @@ glibPreFixupPhase() {
 
     addToSearchPath GSETTINGS_SCHEMAS_PATH "${!outputLib}/share/gsettings-schemas/$name"
 }
-preFixupPhases+=" glibPreFixupPhase"
+
+# gappsWrapperArgsHook expects GSETTINGS_SCHEMAS_PATH variable to be set by this.
+# Until we have dependency mechanism in generic builder, we need to use this ugly hack.
+if [[ " ${preFixupPhases:-} " =~ " gappsWrapperArgsHook " ]]; then
+    preFixupPhases+=" "
+    preFixupPhases="${preFixupPhases/ gappsWrapperArgsHook / glibPreFixupPhase gappsWrapperArgsHook }"
+else
+    preFixupPhases+=" glibPreFixupPhase"
+fi

From 950cde99c112a506b682c4cfefce8071e1266da5 Mon Sep 17 00:00:00 2001
From: Stephane Schitter <stephane@github.frozenid.net>
Date: Wed, 4 Mar 2020 10:36:00 +0100
Subject: [PATCH 2268/4636] adminer: init at 4.7.6

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

diff --git a/pkgs/servers/adminer/default.nix b/pkgs/servers/adminer/default.nix
new file mode 100644
index 000000000000..6d7b12df56d4
--- /dev/null
+++ b/pkgs/servers/adminer/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, libbsd, fetchurl, phpPackages, php }:
+
+stdenv.mkDerivation rec {
+  version = "4.7.6";
+  pname = "adminer";
+
+  # not using fetchFromGitHub as the git repo relies on submodules that are included in the tar file
+  src = fetchurl {
+    url = "https://github.com/vrana/adminer/releases/download/v${version}/adminer-${version}.tar.gz";
+    sha256 = "1zgvscz7jk32qga8hp2dg89h7y72v05vz4yh4lq2ahhwwkbnsxpi";
+  };
+
+  nativeBuildInputs = with phpPackages; [ php composer ];
+
+  buildPhase = ''
+    composer --no-cache run compile
+  '';
+
+  installPhase = ''
+    mkdir $out
+    cp adminer-${version}.php $out/adminer.php
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Database management in a single PHP file";
+    homepage = "https://www.adminer.org";
+    license = with licenses; [ asl20 gpl2 ];
+    maintainers = with maintainers; [ sstef ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d8b08c97b03..b0ff8ff4f4fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -541,6 +541,8 @@ in
     pname = "OPNplug";
   };
 
+  adminer = callPackage ../servers/adminer { };
+
   advancecomp = callPackage ../tools/compression/advancecomp {};
 
   aefs = callPackage ../tools/filesystems/aefs { };

From aeee7de22b9383a265e07d3a2b9c3853536b2185 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 28 Feb 2020 23:50:46 +0100
Subject: [PATCH 2269/4636] cargo-xbuild: 0.5.24 -> 0.5.28

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

diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/development/tools/rust/cargo-xbuild/default.nix
index b92a65842cc3..4ae2b55f015f 100644
--- a/pkgs/development/tools/rust/cargo-xbuild/default.nix
+++ b/pkgs/development/tools/rust/cargo-xbuild/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-xbuild";
-  version = "0.5.24";
+  version = "0.5.28";
 
   src = fetchFromGitHub {
     owner = "rust-osdev";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1haq8gv4k6qgihyjplf76589d2hbb1720g6yvwk88aksjxmqj4jm";
+    sha256 = "1rczflf6fllxkag5nah195shwqvqmlna9a1gkcwp9ljlgxlr9zvq";
   };
 
-  cargoSha256 = "08y64yqvar1ph1pcbh6lhqf4kj85zw74dfg0ii9lycvzxvkwvhqp";
+  cargoSha256 = "0xr8wpcw3x0343hm6clygsbikhrp6gcqb8vh7g7h9nijjrbnzxxb";
 
   meta = with stdenv.lib; {
     description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc";

From e1831ebea3bcb415800a74fe458f802e63549e1c Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Mon, 12 Aug 2019 18:59:01 -0400
Subject: [PATCH 2270/4636] gcc: move target-specific runtime libraries to
 separate output

---
 pkgs/build-support/cc-wrapper/default.nix |  4 +++-
 pkgs/development/compilers/gcc/builder.sh | 26 +++++++++++------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index b078bf2fbbd3..9bac8feef6d4 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -41,7 +41,9 @@ let
   libc_bin = if libc == null then null else getBin libc;
   libc_dev = if libc == null then null else getDev libc;
   libc_lib = if libc == null then null else getLib libc;
-  cc_solib = getLib cc;
+  cc_solib = getLib cc
+    + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}";
+
   # The wrapper scripts use 'cat' and 'grep', so we may need coreutils.
   coreutils_bin = if nativeTools then "" else getBin coreutils;
 
diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
index 07a003691d6b..579378764f0d 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc/builder.sh
@@ -133,7 +133,7 @@ if test "$noSysDirs" = "1"; then
 
     if test "$crossStageStatic" == 1; then
         # We don't want the gcc build to assume there will be a libc providing
-        # limits.h in this stagae
+        # limits.h in this stage
         makeFlagsArray+=(
             'LIMITS_H_TEST=false'
         )
@@ -203,31 +203,31 @@ postConfigure() {
 preInstall() {
     # Make ‘lib64’ symlinks to ‘lib’.
     if [ -n "$is64bit" -a -z "$enableMultilib" ]; then
-        mkdir -p "$out/lib"
-        ln -s lib "$out/lib64"
-        mkdir -p "$lib/lib"
-        ln -s lib "$lib/lib64"
+        mkdir -p "$out/${targetConfig}/lib"
+        ln -s lib "$out/${targetConfig}/lib64"
+        mkdir -p "$lib/${targetConfig}/lib"
+        ln -s lib "$lib/${targetConfig}/lib64"
     fi
 }
 
 
 postInstall() {
     # Move runtime libraries to $lib.
-    moveToOutput "lib/lib*.so*" "$lib"
-    moveToOutput "lib/lib*.la"  "$lib"
-    moveToOutput "lib/lib*.dylib" "$lib"
+    moveToOutput "${targetConfig+$targetConfig/}lib/lib*.so*" "$lib"
+    moveToOutput "${targetConfig+$targetConfig/}lib/lib*.la"  "$lib"
+    moveToOutput "${targetConfig+$targetConfig/}lib/lib*.dylib" "$lib"
     moveToOutput "share/gcc-*/python" "$lib"
 
-    for i in "$lib"/lib/*.{la,py}; do
+    for i in "$lib/${targetConfig}"/lib/*.{la,py}; do
         substituteInPlace "$i" --replace "$out" "$lib"
     done
 
     if [ -n "$enableMultilib" ]; then
-        moveToOutput "lib64/lib*.so*" "$lib"
-        moveToOutput "lib64/lib*.la"  "$lib"
-        moveToOutput "lib64/lib*.dylib" "$lib"
+        moveToOutput "${targetConfig+$targetConfig/}lib64/lib*.so*" "$lib"
+        moveToOutput "${targetConfig+$targetConfig/}lib64/lib*.la"  "$lib"
+        moveToOutput "${targetConfig+$targetConfig/}lib64/lib*.dylib" "$lib"
 
-        for i in "$lib"/lib64/*.{la,py}; do
+        for i in "$lib/${targetConfig}"/lib64/*.{la,py}; do
             substituteInPlace "$i" --replace "$out" "$lib"
         done
     fi

From 308d840f03b805ea97ba596432dc73623ce0a585 Mon Sep 17 00:00:00 2001
From: Danylo Hlynskyi <abcz2.uprola@gmail.com>
Date: Wed, 4 Mar 2020 23:47:31 +0200
Subject: [PATCH 2271/4636] brscan4: 0.4.4-4 -> 0.4.8-1 (#79872)

---
 .../applications/graphics/sane/backends/brscan4/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix
index b431cf51b019..cd75088ea53c 100644
--- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix
+++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix
@@ -10,17 +10,17 @@ let
   udevRules = callPackage ./udev_rules_type1.nix {};
 
 in stdenv.mkDerivation rec {
-  name = "brscan4-0.4.4-4";
+  name = "brscan4-0.4.8-1";
   src = 
     if stdenv.hostPlatform.system == "i686-linux" then
       fetchurl {
         url = "http://download.brother.com/welcome/dlf006646/${name}.i386.deb";
-        sha256 = "13mhjbzf9nvpdzrc2s98684r7likg76zxs1wlz2h8w59fsqgx4k2";
+        sha256 = "15hrf1gpm36lniqi6yf47dvdqjinm644xb752c6rcv8n06wb79ag";
       }
     else if stdenv.hostPlatform.system == "x86_64-linux" then
       fetchurl {
         url = "https://download.brother.com/welcome/dlf006645/${name}.amd64.deb";
-        sha256 = "0xy5px96y1saq9l80vwvfn6anr2q42qlxdhm6ci2a0diwib5q9fd";
+        sha256 = "0pyprjl0capg403yp6pp07gd6msx9kn7bzjcdswdbn28fyxrk5l4";
       }
     else throw "${name} is not supported on ${stdenv.hostPlatform.system} (only i686-linux and x86_64 linux are supported)";
 

From 9c8b500354aabedc28547778c11efb35535d6485 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 21:49:16 +0000
Subject: [PATCH 2272/4636] eventstat: 0.04.08 -> 0.04.09

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

diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix
index 15579d066a48..6dfaa6ab38bb 100644
--- a/pkgs/os-specific/linux/eventstat/default.nix
+++ b/pkgs/os-specific/linux/eventstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "eventstat";
-  version = "0.04.08";
+  version = "0.04.09";
   src = fetchzip {
     url = "https://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz";
-    sha256 = "08a2fg2bl7rf29br1mryix5hp2njy0cjl648lnyiv7wngi341qsm";
+    sha256 = "1b3m58mak62ym2amnmk62c2d6fypk30fw6jsmirh1qz7dwix4bl5";
   };
   buildInputs = [ ncurses ];
   installFlags = [ "DESTDIR=$(out)" ];

From 4656fba5ab3bed79af2bbd8f6a2f52549dc3faf4 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 5 Mar 2020 07:49:38 +1000
Subject: [PATCH 2273/4636] gitAndTools.gh 0.6.0 -> 0.6.1

https://github.com/cli/cli/releases/tag/v0.6.1
---
 .../version-management/git-and-tools/gh/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix
index 03c7bdc1b6ea..a7e6918b4d8f 100644
--- a/pkgs/applications/version-management/git-and-tools/gh/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "gh";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "0wqc9c30iydwylw53idff1ny2v410jcbhn7hpiinc4x5m3dy7827";
+    sha256 = "0jqr7i67s00gvi6cbww397jnh8qzwr37prd7frbl12j89glshwy1";
   };
 
-  modSha256 = "191ds0dkllc0l2lbqnwlca26js90b2g9f70jsid0zhmz3z9f1zh9";
+  modSha256 = "03m193ny5z77yy586cwh099ypi1lmhb5vdj7d4kphxycnvpndr66";
 
   buildFlagsArray = [
     "-ldflags=-X github.com/cli/cli/command.Version=${version}"

From f14ee5bce58fc4e63fda449e9d1370a85465a8b0 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 5 Mar 2020 07:50:51 +1000
Subject: [PATCH 2274/4636] conmon: 2.0.10 -> 2.0.11

https://github.com/containers/conmon/releases/tag/v2.0.11
---
 .../virtualization/conmon/default.nix           | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix
index 802272c4b5d7..53a31c656346 100644
--- a/pkgs/applications/virtualization/conmon/default.nix
+++ b/pkgs/applications/virtualization/conmon/default.nix
@@ -1,31 +1,30 @@
 { stdenv
 , fetchFromGitHub
-, pkgconfig
+, pkg-config
 , glib
 , glibc
 , systemd
 }:
 
 stdenv.mkDerivation rec {
-  project = "conmon";
-  name = "${project}-${version}";
-  version = "2.0.10";
+  pname = "conmon";
+  version = "2.0.11";
 
   src = fetchFromGitHub {
     owner = "containers";
-    repo = project;
+    repo = pname;
     rev = "v${version}";
-    sha256 = "194wach3yrkvll2xaj0x77hzlngk2016mflgnd5k8knjn2b9dgvl";
+    sha256 = "1mdnfkbbv41g590a1ja4rfw69z6kp03znyhikdmg6zqp4qsv32ib";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib systemd ] ++
     stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];
 
-  installPhase = "install -Dm755 bin/${project} $out/bin/${project}";
+  installPhase = "install -Dm755 bin/${pname} $out/bin/${pname}";
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/containers/conmon;
+    homepage = "https://github.com/containers/conmon";
     description = "An OCI container runtime monitor";
     license = licenses.asl20;
     maintainers = with maintainers; [ vdemeester saschagrunert ];

From 983a77a46cecee4ccf78a41735d08d7e5342b1dd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 22:17:43 +0000
Subject: [PATCH 2275/4636] fanficfare: 3.15.0 -> 3.16.0

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

diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix
index 105a2d3308f3..ac89b6af32a7 100644
--- a/pkgs/tools/text/fanficfare/default.nix
+++ b/pkgs/tools/text/fanficfare/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "FanFicFare";
-  version = "3.15.0";
+  version = "3.16.0";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "12nsrl8nvg52mi136m7ayvaivwjapn7ry95137ynj1njy2w990hm";
+    sha256 = "1l76fh23a9wmw47bahd5l1bxyqcy54lahvid373iy9p3586fskis";
   };
 
   propagatedBuildInputs = with python3Packages; [
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     description = "Tool for making eBooks from fanfiction web sites";
-    homepage = https://github.com/JimmXinu/FanFicFare;
+    homepage = "https://github.com/JimmXinu/FanFicFare";
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ dwarfmaster ];

From e468301c1924fae3983fe5896a4fcaebafc2d071 Mon Sep 17 00:00:00 2001
From: Greg Roodt <greg@canva.com>
Date: Thu, 5 Mar 2020 09:20:23 +1100
Subject: [PATCH 2276/4636] argo: 2.6.0 -> 2.6.1

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

diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix
index 52da70bc8b86..f02b64e92c8b 100644
--- a/pkgs/applications/networking/cluster/argo/default.nix
+++ b/pkgs/applications/networking/cluster/argo/default.nix
@@ -19,13 +19,13 @@ let
 in
 buildGoModule rec {
   pname = "argo";
-  version = "2.6.0";
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo";
     rev = "v${version}";
-    sha256 = "0hlvsi706jwlf43mdwic6j7iriii4daxjr82qgi80ac4h4x0z3h2";
+    sha256 = "12wq79h4m8wlzf18r66965mbbjjb62kvnxdj50ra7nxa8jjxpsmf";
   };
 
   modSha256 = "1394bav1k1xv9n1rvji0j9a09mibk97xpha24640jkgmy9bnmg45";

From 2954d5544d08ea3ed2e0137d56862206f85ffa94 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 22:58:13 +0000
Subject: [PATCH 2277/4636] graylog: 3.2.1 -> 3.2.2

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

diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index 48b471e3b40b..6ded4f28e9d7 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "graylog";
-  version = "3.2.1";
+  version = "3.2.2";
 
   src = fetchurl {
     url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
-    sha256 = "1pilksik3bbd4sgmnpns9gg9sddybzxzxkn9sknn40dav08k1x6h";
+    sha256 = "1n9nwxq0aklihhp0v39klq4za63ks6v5z76dp5821jcv1cbk96g9";
   };
 
   dontBuild = true;
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Open source log management solution";
-    homepage    = https://www.graylog.org/;
+    homepage    = "https://www.graylog.org/";
     license     = licenses.gpl3;
     platforms   = platforms.unix;
     maintainers = [ maintainers.fadenb ];

From 70296be9f6865e4779df453c721f43018d1407ab Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 4 Mar 2020 18:00:00 -0500
Subject: [PATCH 2278/4636] chezmoi: 1.7.13 -> 1.7.16

---
 pkgs/tools/misc/chezmoi/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix
index da8f8c789181..b2fb6925abac 100644
--- a/pkgs/tools/misc/chezmoi/default.nix
+++ b/pkgs/tools/misc/chezmoi/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "chezmoi";
-  version = "1.7.13";
+  version = "1.7.16";
 
   src = fetchFromGitHub {
     owner = "twpayne";
     repo = "chezmoi";
     rev = "v${version}";
-    sha256 = "1xqmr7sps5s3ib4q91z7drwlglp1av37gb2jm0zw7y3ijyp2c749";
+    sha256 = "1fkjdpqal0yzm58l146pf5xpbhij9iq79933i9a77v2jihdbjn52";
   };
 
-  modSha256 = "07fglc3k3a5y70slly4ri3izwnyk4nwghmvkjwgc8lbw8m1zx0r8";
+  modSha256 = "0gh314d3mspqmz2z3m05bgsp62mrhb48m4mwhfy5h62fs7aqymr8";
 
   buildFlagsArray = [
     "-ldflags=-s -w -X github.com/twpayne/chezmoi/cmd.VersionStr=${version}"
@@ -20,7 +20,7 @@ buildGoModule rec {
   nativeBuildInputs = [ installShellFiles ];
 
   postInstall = ''
-    installShellCompletion --bash completions/chezmoi-completion.bash
+    installShellCompletion --bash --name chezmoi.bash completions/chezmoi-completion.bash
     installShellCompletion --fish completions/chezmoi.fish
     installShellCompletion --zsh completions/chezmoi.zsh
   '';
@@ -28,7 +28,7 @@ buildGoModule rec {
   subPackages = [ "." ];
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/twpayne/chezmoi;
+    homepage = "https://www.chezmoi.io/";
     description = "Manage your dotfiles across multiple machines, securely";
     license = licenses.mit;
     maintainers = with maintainers; [ jhillyerd ];

From 47f27938e75eecf31621e4ada1c65e5c9d4bf244 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm+nix@sourcephile.fr>
Date: Wed, 4 Mar 2020 23:44:35 +0100
Subject: [PATCH 2279/4636] shorewall: fix RestartTriggers

---
 nixos/modules/services/networking/shorewall.nix  | 5 +++--
 nixos/modules/services/networking/shorewall6.nix | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/shorewall.nix b/nixos/modules/services/networking/shorewall.nix
index c59a53669158..16383be2530f 100644
--- a/nixos/modules/services/networking/shorewall.nix
+++ b/nixos/modules/services/networking/shorewall.nix
@@ -26,13 +26,14 @@ in {
         description = "The shorewall package to use.";
       };
       configs = lib.mkOption {
-        type        = types.attrsOf types.str;
+        type        = types.attrsOf types.lines;
         default     = {};
         description = ''
           This option defines the Shorewall configs.
           The attribute name defines the name of the config,
           and the attribute value defines the content of the config.
         '';
+        apply = lib.mapAttrs (name: text: pkgs.writeText "${name}" text);
       };
     };
   };
@@ -62,7 +63,7 @@ in {
       '';
     };
     environment = {
-      etc = lib.mapAttrs' (name: conf: lib.nameValuePair "shorewall/${name}" {text=conf;}) cfg.configs;
+      etc = lib.mapAttrs' (name: conf: lib.nameValuePair "shorewall/${name}" {source=conf;}) cfg.configs;
       systemPackages = [ cfg.package ];
     };
   };
diff --git a/nixos/modules/services/networking/shorewall6.nix b/nixos/modules/services/networking/shorewall6.nix
index 374e407cc7a1..e081aedc6c34 100644
--- a/nixos/modules/services/networking/shorewall6.nix
+++ b/nixos/modules/services/networking/shorewall6.nix
@@ -26,13 +26,14 @@ in {
         description = "The shorewall package to use.";
       };
       configs = lib.mkOption {
-        type        = types.attrsOf types.str;
+        type        = types.attrsOf types.lines;
         default     = {};
         description = ''
           This option defines the Shorewall configs.
           The attribute name defines the name of the config,
           and the attribute value defines the content of the config.
         '';
+        apply = lib.mapAttrs (name: text: pkgs.writeText "${name}" text);
       };
     };
   };
@@ -62,7 +63,7 @@ in {
       '';
     };
     environment = {
-      etc = lib.mapAttrs' (name: conf: lib.nameValuePair "shorewall6/${name}" {text=conf;}) cfg.configs;
+      etc = lib.mapAttrs' (name: conf: lib.nameValuePair "shorewall6/${name}" {source=conf;}) cfg.configs;
       systemPackages = [ cfg.package ];
     };
   };

From 248f387e6d8ef8b896474bc06cdc92c5b8c963ff Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 23:04:43 +0000
Subject: [PATCH 2280/4636] fwts: 19.11.00 -> 20.02.00

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

diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix
index 435086512f69..c230ecaae79f 100644
--- a/pkgs/os-specific/linux/fwts/default.nix
+++ b/pkgs/os-specific/linux/fwts/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "fwts";
-  version = "19.11.00";
+  version = "20.02.00";
 
   src = fetchzip {
     url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz";
-    sha256 = "07adim2pxh1d0395632ds78hcy7xs3jqgdijksq10ridivhqxcli";
+    sha256 = "1mplv4866w3w1vixn7abq9cgh8gxgzhdyxsvj952vkhv3b8in4jq";
     stripRoot = false;
   };
 

From adcdd7b0a77c81f37001e6fe55026352f7c51631 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 23:10:39 +0000
Subject: [PATCH 2281/4636] gromacs: 2020 -> 2020.1

---
 .../science/molecular-dynamics/gromacs/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
index 7536d071f6b3..fadd60d9ebbf 100644
--- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
@@ -9,11 +9,11 @@
 }:
 
 stdenv.mkDerivation {
-  name = "gromacs-2020";
+  name = "gromacs-2020.1";
 
   src = fetchurl {
-    url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.tar.gz";
-    sha256 = "00ds83n5wnm7g7wq91jycp8h82vnam5b4rwg3fv9rk9x5ca5czj7";
+    url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.1.tar.gz";
+    sha256 = "1kwrk3i1dxp8abhqqsl049lh361n4910h0415g052f8shdc6arp1";
   };
 
   nativeBuildInputs = [ cmake ];

From cde784aaa383e95e8370bf23db47c5bf97e226d8 Mon Sep 17 00:00:00 2001
From: ngerstle <ngerstle@gmail.com>
Date: Thu, 5 Mar 2020 00:31:01 +0100
Subject: [PATCH 2282/4636] kube3d: correct k3s version tag

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

diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix
index c34065bb22cb..2eea6adb28d1 100644
--- a/pkgs/applications/networking/cluster/kube3d/default.nix
+++ b/pkgs/applications/networking/cluster/kube3d/default.nix
@@ -3,7 +3,7 @@
 buildGoModule rec {
   pname = "kube3d";
   version = "1.6.0";
-  k3sVersion = "1.17.3+k3s1";
+  k3sVersion = "1.17.3-k3s1";
 
   goPackagePath = "github.com/rancher/k3d";
 

From 8ca769e051c6a28d2db8ac1a0e2d80c2772a852a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 23:34:31 +0000
Subject: [PATCH 2283/4636] gallery-dl: 1.12.3 -> 1.13.1

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

diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix
index 941b6050a1ac..d0cf9673180a 100644
--- a/pkgs/applications/misc/gallery-dl/default.nix
+++ b/pkgs/applications/misc/gallery-dl/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gallery_dl";
-  version = "1.12.3";
+  version = "1.13.1";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "06q6vmbliy935zlf4bbnfgiqyrx9vskz3fsks4jpxi47xs80rqkz";
+    sha256 = "0a5k7gcs3vn6x1f2qg3ajpqsl39pmw2hsj2srd5y2l1xw7mkkqj6";
   };
 
   doCheck = false;
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
 
   meta = {
     description = "Command-line program to download image-galleries and -collections from several image hosting sites";
-    homepage = https://github.com/mikf/gallery-dl;
+    homepage = "https://github.com/mikf/gallery-dl";
     license = lib.licenses.gpl2;
     maintainers = with lib.maintainers; [ dawidsowa ];
   };

From 03cf599ae23d3f38ea8eb7bdad47ea80749465d4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 23:46:59 +0000
Subject: [PATCH 2284/4636] forkstat: 0.02.13 -> 0.02.14

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

diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix
index 78ecded20cf7..eee4691aeb30 100644
--- a/pkgs/os-specific/linux/forkstat/default.nix
+++ b/pkgs/os-specific/linux/forkstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "forkstat";
-  version = "0.02.13";
+  version = "0.02.14";
   src = fetchurl {
     url = "https://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.xz";
-    sha256 = "01ih89yw9gi6j3l40q5m26la1y0p1jidkxs3yffbdiqm6gwz0xbx";
+    sha256 = "10kibb5psb5gqdmq9lfb7qw566diwg54gdb49b5zd71qwpybk3dl";
   };
   installFlags = [ "DESTDIR=$(out)" ];
   postInstall = ''

From 9974067129ac0cac98a536f055804635a238cb51 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2020 00:20:08 +0000
Subject: [PATCH 2285/4636] gmsh: 4.5.2 -> 4.5.4

---
 pkgs/applications/science/math/gmsh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix
index e55bcd8fe218..e65cf52d5815 100644
--- a/pkgs/applications/science/math/gmsh/default.nix
+++ b/pkgs/applications/science/math/gmsh/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gmsh";
-  version = "4.5.2";
+  version = "4.5.4";
 
   src = fetchurl {
     url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
-    sha256 = "10i6i1s68lkccnl73lzr04cf1hc5rd8b7dpiaxs1vzrj1ljgw801";
+    sha256 = "1k9f7qxlwja9i40qy55070sjnr21bl165677mdqw7qyb8d7wgy6c";
   };
 
   buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU libGL

From 7de490a28a9d4aa8d10ce53323485c1104089127 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 5 Mar 2020 02:07:23 +0100
Subject: [PATCH 2286/4636] gnomeExtensions.sound-output-device-chooser: 24 ->
 25

https://github.com/kgshank/gse-sound-output-device-chooser/releases/tag/25
---
 .../sound-output-device-chooser/default.nix   | 21 ++++++++++++++----
 .../fix-paths.patch                           | 22 +++++++++++++++++++
 2 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch

diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
index a5f94288ae57..cc1c2deeef9a 100644
--- a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
@@ -1,16 +1,29 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv
+, substituteAll
+, fetchFromGitHub
+, libpulseaudio
+, python3
+}:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-sound-output-device-chooser";
-  version = "24";
+  version = "25";
 
   src = fetchFromGitHub {
     owner = "kgshank";
     repo = "gse-sound-output-device-chooser";
     rev = version;
-    sha256 = "0n1rf4pdf0b78ivmz89x223sqlzv30qydkvlnvn7hwx0j32kyr0x";
+    sha256 = "16xaa4r01575ix9lrvww8n6pird8r3ml1j037b3sm6dfrf8kvzxs";
   };
 
+  patches = [
+    (substituteAll {
+      src = ./fix-paths.patch;
+      libpulse = "${libpulseaudio}/lib/libpulse.so";
+      python = python3.interpreter;
+    })
+  ];
+
   dontBuild = true;
 
   uuid = "sound-output-device-chooser@kgshank.net";
@@ -23,6 +36,6 @@ stdenv.mkDerivation rec {
     description = "GNOME Shell extension adding audio device chooser to panel";
     license = licenses.gpl3;
     maintainers = with maintainers; [ jtojnar ];
-    homepage = https://github.com/kgshank/gse-sound-output-device-chooser;
+    homepage = "https://github.com/kgshank/gse-sound-output-device-chooser";
   };
 }
diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch
new file mode 100644
index 000000000000..a0a6551fcf81
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch
@@ -0,0 +1,22 @@
+--- a/sound-output-device-chooser@kgshank.net/convenience.js
++++ b/sound-output-device-chooser@kgshank.net/convenience.js
+@@ -111,7 +111,7 @@ function refreshCards() {
+         log("New logic");
+         let pyLocation =  Me.dir.get_child('utils/pa_helper.py').get_path();
+         try {
+-            let [result, out, err, exit_code] = GLib.spawn_command_line_sync('python ' + pyLocation);
++            let [result, out, err, exit_code] = GLib.spawn_command_line_sync('@python@ ' + pyLocation);
+             // log("result" + result +" out"+out + " exit_code" + exit_code + "
+             // err" +err);
+             if(result && !exit_code) {
+--- a/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
++++ b/sound-output-device-chooser@kgshank.net/utils/libpulse_introspect.py
+@@ -86,7 +86,7 @@ else:
+ 
+ _libraries = {}
+ 
+-libpulse_library_name = find_library('pulse')
++libpulse_library_name = '@libpulse@'
+ if libpulse_library_name is None:
+     raise Exception('No libpulse.so library found!')
+ 

From cc92c86ea9070c977746dea23f718bb9d90a8579 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2020 01:43:08 +0000
Subject: [PATCH 2287/4636] flyway: 6.2.2 -> 6.2.4

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

diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix
index dc9abdbcccc5..1498d179d22b 100644
--- a/pkgs/development/tools/flyway/default.nix
+++ b/pkgs/development/tools/flyway/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, jre_headless, makeWrapper }:
   let
-    version = "6.2.2";
+    version = "6.2.4";
   in
     stdenv.mkDerivation {
       pname = "flyway";
       inherit version;
       src = fetchurl {
         url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
-        sha256 = "09x62dbid9gx26q8m7gz4b21kinsx1ag3961krbxks28ihmwlm6a";
+        sha256 = "1ng4ygd44hl63amjaizldsngn72jfz5pqw7wgr1vyvdxdzjfcnwm";
       };
       nativeBuildInputs = [ makeWrapper ];
       dontBuild = true;

From 12628187a9b684b0df4e5fd99ebf9723c74a41eb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 4 Mar 2020 20:45:00 -0500
Subject: [PATCH 2288/4636] nodejs-13_x: 13.10.0 -> 13.10.1

Changelog: https://github.com/nodejs/node/releases/tag/v13.10.1
---
 pkgs/development/web/nodejs/v13.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix
index 6b332da79be6..affb86bece86 100644
--- a/pkgs/development/web/nodejs/v13.nix
+++ b/pkgs/development/web/nodejs/v13.nix
@@ -5,6 +5,6 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "13.10.0";
-    sha256 = "11m8sisi3dmr70fpnb7xi6nljil3rm36liz0wfzd7kgxmv6p9mhj";
+    version = "13.10.1";
+    sha256 = "14pvqwhilq210zn830zmh04a62rj3si0ijc4ihrhdf3dvghrx2c3";
   }

From 3f6d356654db6641895d274b1fdac8a15c452c06 Mon Sep 17 00:00:00 2001
From: Jeff Labonte <jeff.labonte12@gmail.com>
Date: Wed, 4 Mar 2020 21:15:47 -0500
Subject: [PATCH 2289/4636] brave: 1.4.95 -> 1.4.96

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

diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index 63d56a48038c..cf3750addf85 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -82,11 +82,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "brave";
-  version = "1.4.95";
+  version = "1.4.96";
 
   src = fetchurl {
     url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-    sha256 = "1a7rk4r7phlf1y3ap3942z5sfvb6i4qglvq06qqhz49wq1wbgvq1";
+    sha256 = "12fdef417180d295170dd61ff0586e568a0c6475fabc0b3d003921ec924a84fc";
   };
 
   dontConfigure = true;

From 94c7f25f69af939823e3055d15efac236eba9f8b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2020 02:36:00 +0000
Subject: [PATCH 2290/4636] joker: 0.14.1 -> 0.14.2

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

diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix
index e7741ed81eca..ed82f76eec24 100644
--- a/pkgs/development/interpreters/joker/default.nix
+++ b/pkgs/development/interpreters/joker/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "joker";
-  version = "0.14.1";
+  version = "0.14.2";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "candid82";
     repo = "joker";
-    sha256 = "0da07fswj7x87njd9bi3gf8rzfyaq3zfcszgyb37w7q0ng4gg25n";
+    sha256 = "1wi80sr8h9fwh4xipff0y6qdzrliwyk2w1bmi33ncykxd9r2g7nk";
   };
 
   modSha256 = "0i16vf7n1xfz5kp9w3fvyc9y9wgz4h396glgpdaznpxjr12rb43j";
@@ -20,7 +20,7 @@ buildGoModule rec {
   subPackages = [ "." ];
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/candid82/joker;
+    homepage = "https://github.com/candid82/joker";
     description = "A small Clojure interpreter and linter written in Go";
     license = licenses.epl10;
     platforms = platforms.all;

From 03090454286f689ddf275fd0162a2d75b0c32299 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2020 02:38:48 +0000
Subject: [PATCH 2291/4636] jgmenu: 4.0.2 -> 4.1.0

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

diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix
index df690727b27d..47f02e32d77d 100644
--- a/pkgs/applications/misc/jgmenu/default.nix
+++ b/pkgs/applications/misc/jgmenu/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "jgmenu";
-  version = "4.0.2";
+  version = "4.1.0";
 
   src = fetchFromGitHub {
     owner = "johanmalm";
     repo = pname;
     rev = "v${version}";
-    sha256 = "086p91l1igx5mv2i6fwbgx5p72war9aavc7v3m7sd0c0xvb334br";
+    sha256 = "1wsh37rapb1bszlq36hvwxqvfds39hbvbl152m8as4zlh93wfvvk";
   };
 
   nativeBuildInputs = [
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/johanmalm/jgmenu;
+    homepage = "https://github.com/johanmalm/jgmenu";
     description = "Small X11 menu intended to be used with openbox and tint2";
     license = licenses.gpl2;
     platforms = platforms.linux;

From d08fb3b92238d8abe6bd909b2b19b7b4ce56d29e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2020 02:42:20 +0000
Subject: [PATCH 2292/4636] jruby: 9.2.10.0 -> 9.2.11.0

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

diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index 82624d2272b2..3784b6ab282f 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" "";
 jruby = stdenv.mkDerivation rec {
   pname = "jruby";
 
-  version = "9.2.10.0";
+  version = "9.2.11.0";
 
   src = fetchurl {
     url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
-    sha256 = "0lwmqyg06rv3iyhmfnqcg4xzaxcfrgjivjrc4ljwb0y629vp16ci";
+    sha256 = "01yzpasnpqqm0vfc0ki8vkxbzijjfws135jw8k0r50b5lahjvs4a";
   };
 
   buildInputs = [ makeWrapper ];
@@ -48,7 +48,7 @@ jruby = stdenv.mkDerivation rec {
 
   meta = {
     description = "Ruby interpreter written in Java";
-    homepage = http://jruby.org/;
+    homepage = "http://jruby.org/";
     license = with stdenv.lib.licenses; [ cpl10 gpl2 lgpl21 ];
     platforms = stdenv.lib.platforms.unix;
   };

From b0af283e051c44fc7399e7e0f2d1bb905b1092d6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2020 04:04:38 +0000
Subject: [PATCH 2293/4636] ibus-engines.table: 1.9.22 -> 1.9.25

---
 pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
index 2dc200b9ddb9..831161df2b7b 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ibus-table";
-  version = "1.9.22";
+  version = "1.9.25";
 
   src = fetchFromGitHub {
     owner  = "kaio";
     repo   = "ibus-table";
     rev    = version;
-    sha256 = "1a1dr3l6aa69llfyd0k5w29qalvyap369kmnwww9fhppmwfclgd1";
+    sha256 = "0v570qpnb2q79aqr9f0xnska34y7hw34ibiwsf7ybcw69fhi1zkg";
   };
 
   postPatch = ''
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     isIbusEngine = true;
     description  = "An IBus framework for table-based input methods";
-    homepage     = https://github.com/kaio/ibus-table/wiki;
+    homepage     = "https://github.com/kaio/ibus-table/wiki";
     license      = licenses.lgpl21;
     platforms    = platforms.linux;
     maintainers  = with maintainers; [ mudri ];

From bc5617503453c9b7e32bc8d7bc75e0a938a85841 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <daniel.schaefer@hpe.com>
Date: Thu, 5 Mar 2020 05:16:49 +0100
Subject: [PATCH 2294/4636] satallax: Fix build with GCC9

---
 .../science/logic/satallax/default.nix        |  5 +++++
 .../logic/satallax/fix-declaration-gcc9.patch | 21 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/science/logic/satallax/fix-declaration-gcc9.patch

diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix
index 7249eb991d38..d3ceeadbf9a7 100644
--- a/pkgs/applications/science/logic/satallax/default.nix
+++ b/pkgs/applications/science/logic/satallax/default.nix
@@ -9,6 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib";
   };
 
+  patches = [
+    # GCC9 doesn't allow default value in friend declaration.
+    ./fix-declaration-gcc9.patch
+  ];
+
   preConfigure = ''
     mkdir fake-tools
     echo "echo 'Nix-build-host.localdomain'" > fake-tools/hostname
diff --git a/pkgs/applications/science/logic/satallax/fix-declaration-gcc9.patch b/pkgs/applications/science/logic/satallax/fix-declaration-gcc9.patch
new file mode 100644
index 000000000000..1933fc25c4da
--- /dev/null
+++ b/pkgs/applications/science/logic/satallax/fix-declaration-gcc9.patch
@@ -0,0 +1,21 @@
+diff --git i/minisat/core/SolverTypes.h w/minisat/core/SolverTypes.h
+--- i/minisat/core/SolverTypes.h
++++ w/minisat/core/SolverTypes.h
+@@ -47,7 +47,7 @@ struct Lit {
+     int     x;
+ 
+     // Use this as a constructor:
+-    friend Lit mkLit(Var var, bool sign = false);
++    friend Lit mkLit(Var var, bool sign);
+ 
+     bool operator == (Lit p) const { return x == p.x; }
+     bool operator != (Lit p) const { return x != p.x; }
+@@ -55,7 +55,7 @@ struct Lit {
+ };
+ 
+ 
+-inline  Lit  mkLit     (Var var, bool sign) { Lit p; p.x = var + var + (int)sign; return p; }
++inline  Lit  mkLit     (Var var, bool sign = false) { Lit p; p.x = var + var + (int)sign; return p; }
+ inline  Lit  operator ~(Lit p)              { Lit q; q.x = p.x ^ 1; return q; }
+ inline  Lit  operator ^(Lit p, bool b)      { Lit q; q.x = p.x ^ (unsigned int)b; return q; }
+ inline  bool sign      (Lit p)              { return p.x & 1; }

From e08b7fff16b9d11c6e3647dfb5474723b4a7e5b7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2020 04:38:58 +0000
Subject: [PATCH 2295/4636] haproxy: 2.1.2 -> 2.1.3

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

diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index a1e87e3153b0..9c7adfce21da 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -11,11 +11,11 @@ assert usePcre -> pcre != null;
 
 stdenv.mkDerivation rec {
   pname = "haproxy";
-  version = "2.1.2";
+  version = "2.1.3";
 
   src = fetchurl {
     url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
-    sha256 = "0xqb64nyl7hqnzpqb2jhv1ash47fcf4sspl3lalybb85i65b0yb0";
+    sha256 = "0n8bw3d6gikr8c56ycrvksp1sl0b4yfzp19867cxkl3l0daqwrxv";
   };
 
   buildInputs = [ openssl zlib ]

From 4e49c4090b834c4c86de4d5930895b0bddd09a6c Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 5 Mar 2020 01:15:47 -0500
Subject: [PATCH 2296/4636] scaff: 0.1.1 -> 0.1.2

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

diff --git a/pkgs/development/tools/scaff/default.nix b/pkgs/development/tools/scaff/default.nix
index f81ca70c6a9a..97f94e2d61b5 100644
--- a/pkgs/development/tools/scaff/default.nix
+++ b/pkgs/development/tools/scaff/default.nix
@@ -2,17 +2,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "scaff";
-  version = "0.1.1";
+  version = "0.1.2";
 
   src = fetchFromGitLab {
     owner = "jD91mZM2";
     repo = pname;
     rev = version;
 
-    sha256 = "1s5v50205l2h33pccyafrjv3a6lpb62inhm8z81hkvx53bqifvd7";
+    sha256 = "01yf2clf156qv2a6w866a2p8rc2dl8innxnsqrj244x54s1pk27r";
   };
 
-  cargoSha256 = "0k6msvly3yhzl1hhs4zv31qzbllwmw16i55dbznlgp1c8icy2pwr";
+  cargoSha256 = "1v6580mj70d7cqbjw32slz65lg6c8ficq5mdkfbivs63hqkv4hgx";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ openssl ];

From c882a90bc6f8f880222b3f77dc8c5b12894774e0 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 5 Mar 2020 01:30:08 -0500
Subject: [PATCH 2297/4636] procs: 0.9.11 -> 0.9.18

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

diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix
index 453bbfb426aa..7c2c66f9fbaa 100644
--- a/pkgs/tools/admin/procs/default.nix
+++ b/pkgs/tools/admin/procs/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "procs";
-  version = "0.9.11";
+  version = "0.9.18";
 
   src = fetchFromGitHub {
     owner = "dalance";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0nz06q1rdrqgprclgr30la2vp4bx0qgibh22vdlqpd4rzi3x0h2r";
+    sha256 = "0bqaj4a56h26sgiw2r453k6f252sy6lrb71ammr0ki3bqqqjhvdi";
   };
 
-  cargoSha256 = "0hmz19ndfcg7bsrjk89ck9x99ibsvghqwmvgcd89vxmjr5h13rsg";
+  cargoSha256 = "1rrwmi1wwjjql3chw996wki7mx0biaw9wc4v2xzv3vrxspvlvb5g";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 

From 6a443fb7ce28b4bd39a7f6210f72949c8bd00f3d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2020 08:00:03 +0000
Subject: [PATCH 2298/4636] logrotate: 3.15.1 -> 3.16.0

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

diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix
index 9fd6c4ea81a5..3e357d37d837 100644
--- a/pkgs/tools/system/logrotate/default.nix
+++ b/pkgs/tools/system/logrotate/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "logrotate";
-  version = "3.15.1";
+  version = "3.16.0";
 
   src = fetchFromGitHub {
     owner = "logrotate";
     repo = "logrotate";
     rev = version;
-    sha256 = "0l92zarygp34qnw3p5rcwqsvgz7zmmhi7lgh00vj2jb9zkjbldc0";
+    sha256 = "0dsz9cfh9glicrnh1rc3jrc176mimnasslihqnj0aknkv8ajq1jh";
   };
 
   # Logrotate wants to access the 'mail' program; to be done.
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ popt ];
 
   meta = {
-    homepage = https://fedorahosted.org/releases/l/o/logrotate/;
+    homepage = "https://fedorahosted.org/releases/l/o/logrotate/";
     description = "Rotates and compresses system logs";
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ stdenv.lib.maintainers.viric ];

From ebd985439fc1071a45a27be9ddd2e836db1c120c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2020 08:05:02 +0000
Subject: [PATCH 2299/4636] link-grammar: 5.7.0 -> 5.8.0

---
 pkgs/tools/text/link-grammar/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/link-grammar/default.nix b/pkgs/tools/text/link-grammar/default.nix
index ce9b0bfa8838..25a5d129c81b 100644
--- a/pkgs/tools/text/link-grammar/default.nix
+++ b/pkgs/tools/text/link-grammar/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, python3, sqlite, libedit, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "5.7.0";
+  version = "5.8.0";
   pname = "link-grammar";
 
   outputs = [ "bin" "out" "dev" "man" ];
 
   src = fetchurl {
     url = "http://www.abisource.com/downloads/${pname}/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0ak1v469k56v3511kxxkxvx1nw6zcxcl0f1kcvc82ffacqbr4y96";
+    sha256 = "1v8ngx77nachxln68xpvyw2lh7z59pzsi99h8j0mnrm0gjsacrdd";
   };
 
   nativeBuildInputs = [ pkgconfig python3 ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A Grammar Checking library";
-    homepage = https://www.abisource.com/projects/link-grammar/;
+    homepage = "https://www.abisource.com/projects/link-grammar/";
     license = licenses.lgpl21;
     maintainers = with maintainers; [ jtojnar ];
     platforms = platforms.unix;

From bbc2cd89ef4aa3788fc8664f7940f6e15aec8cbb Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Thu, 5 Mar 2020 09:00:26 +0100
Subject: [PATCH 2300/4636] users.groups.disnix instead of a list

related to #63103.
---
 nixos/modules/services/misc/disnix.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix
index c21cb2afc3ca..b7b6eb7cd66e 100644
--- a/nixos/modules/services/misc/disnix.nix
+++ b/nixos/modules/services/misc/disnix.nix
@@ -61,10 +61,7 @@ in
       ++ optional cfg.useWebServiceInterface "${pkgs.dbus_java}/share/java/dbus.jar";
     services.tomcat.webapps = optional cfg.useWebServiceInterface pkgs.DisnixWebService;
 
-    users.groups = singleton
-      { name = "disnix";
-        gid = config.ids.gids.disnix;
-      };
+    users.groups.disnix.gid = config.ids.gids.disnix;
 
     systemd.services = {
       disnix = mkIf cfg.enableMultiUser {

From 3d6cdfa24bd771b36e8c87241d17275dd144c7a3 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 5 Mar 2020 08:28:11 +0000
Subject: [PATCH 2301/4636] nixpkgs-fmt: 0.6.1 -> 0.7.0 (#81805)

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

diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix
index 1088884dca65..dfd7eb63b12d 100644
--- a/pkgs/tools/nix/nixpkgs-fmt/default.nix
+++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix
@@ -1,16 +1,16 @@
 { lib, rustPlatform, fetchFromGitHub }:
 rustPlatform.buildRustPackage rec {
   pname = "nixpkgs-fmt";
-  version = "0.6.1";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1iylldgyvrcarfigpbhicg6j6qyipfiqn7gybza7qajfzyprjqfa";
+    sha256 = "0b9wwv77bpq24yxky44ndgvxsx2zgsl15lvl6wklbkr41mwz3xis";
   };
 
-  cargoSha256 = "1jxvy4w9jxv898wgqyj9bpkhnc7pkj9dxg5x0b39xsnkzl2lr239";
+  cargoSha256 = "1vv2gypbmgd9lksrk5h2z3agcs1269p1i3im9529nhcsl62ckj7n";
 
   meta = with lib; {
     description = "Nix code formatter for nixpkgs";

From 706f13a787a2e89752c806f923078d1e3e8108c4 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 5 Mar 2020 08:39:15 +0000
Subject: [PATCH 2302/4636] mdsh: 0.3.0 -> 0.4.0 (#81802)

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

diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix
index 714ea15cd61e..7e21019ea3f3 100644
--- a/pkgs/development/tools/documentation/mdsh/default.nix
+++ b/pkgs/development/tools/documentation/mdsh/default.nix
@@ -2,20 +2,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mdsh";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "zimbatm";
     repo = "mdsh";
     rev = "v${version}";
-    sha256 = "1a9i6h8fzrrfzjyfxaps73lxgkz92k0bnmwbjbwdmiwci4qgi9ms";
+    sha256 = "0y0k6rsspvpia4lssals4c3rdz9fgvlrhwd8gw38say02hn5b7ip";
   };
 
-  cargoSha256 = "1fxajh1n0qvcdas6w7dy3g92wilhfldy90pyk3779mrnh57fa6n5";
+  cargoSha256 = "07f2ajg9jpp666915cwsjn5clmi9ghkw25qfqj0lj3kfj79n5ash";
 
   meta = with stdenv.lib; {
     description = "Markdown shell pre-processor";
-    homepage = https://github.com/zimbatm/mdsh;
+    homepage = "https://github.com/zimbatm/mdsh";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ zimbatm ];
     platforms = platforms.all;

From 6784c98627f32b9582f8a72c752677bb9df5c3b8 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 5 Mar 2020 09:13:00 +0100
Subject: [PATCH 2303/4636] zam-plugins: 3.11 -> 3.12

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

diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix
index a8236b4b60f1..b9645fa4d8af 100644
--- a/pkgs/applications/audio/zam-plugins/default.nix
+++ b/pkgs/applications/audio/zam-plugins/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation {
   pname = "zam-plugins";
-  version = "3.11";
+  version = "3.12";
 
   src = fetchgit {
     url = "https://github.com/zamaudio/zam-plugins.git";
     deepClone = true;
-    rev = "af338057e42dd5d07cba1889bfc74eda517c6147";
-    sha256 = "1qbskhcvy2k2xv0f32lw13smz5g72v0yy47zv6vnhnaiaqf3f2d5";
+    rev = "87fdee6e87dbee75c1088e2327ea59c1ab1522e4";
+    sha256 = "0kz0xygff3ca1v9nqi0dvrzy9whbzqxrls5b7hydi808d795893n";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 05e6cc4944331e0e54ba05f5261d95102a4188d7 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 5 Mar 2020 11:57:38 +0100
Subject: [PATCH 2304/4636] signal-desktop: 1.31.0 -> 1.32.0

---
 .../instant-messengers/signal-desktop/default.nix          | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index c5921e645f03..ce9c1327db37 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -23,7 +23,7 @@ let
       else "");
 in stdenv.mkDerivation rec {
   pname = "signal-desktop";
-  version = "1.31.0"; # Please backport all updates to the stable channel.
+  version = "1.32.0"; # Please backport all updates to the stable channel.
   # All releases have a limited lifetime and "expire" 90 days after the release.
   # When releases "expire" the application becomes unusable until an update is
   # applied. The expiration date for the current release can be extracted with:
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "19vsv7jv30xvfgq1nr3091b6x4agymy9afpy9r9mxzgn0xfb0ap9";
+    sha256 = "1ggblpw2xxhm78sqadswcv0314zagksj34z8pywjnr8h9zkcyiap";
   };
 
   nativeBuildInputs = [
@@ -127,7 +127,8 @@ in stdenv.mkDerivation rec {
       Signal Desktop is an Electron application that links with your
       "Signal Android" or "Signal iOS" app.
     '';
-    homepage    = https://signal.org/;
+    homepage    = "https://signal.org/";
+    changelog   = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}";
     license     = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ ixmatus primeos equirosa ];
     platforms   = [ "x86_64-linux" ];

From ce416779bbb5d86210cbf2cc5060cc81faf53c94 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Wed, 4 Mar 2020 23:24:22 +0900
Subject: [PATCH 2305/4636] nixos/activation: use eval-config's system argument
 for nesting

This avoids a possible surprise if the user is using `nixpkgs.system`
and `nesting.children`. `nesting.children` is expected to ignore all
parent configuration so we shouldn't propagate the user-facing option
`nixpkgs.system`. To avoid doing so, we introduce a new internal
option for holding the value passed to eval-config.nix, and use that
when recursing for nesting.
---
 nixos/lib/eval-config.nix                     | 6 ++++++
 nixos/modules/misc/nixpkgs.nix                | 8 ++++++++
 nixos/modules/system/activation/top-level.nix | 2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index 77490ca3762a..9892d6f160f7 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -41,6 +41,12 @@ let
       # default to the argument. That way this new default could propagate all
       # they way through, but has the last priority behind everything else.
       nixpkgs.system = lib.mkDefault system;
+
+      # Stash the value of the `system` argument. When using `nesting.children`
+      # we want to have the same default value behavior (immediately above)
+      # without any interference from the user's configuration.
+      nixpkgs.initialSystem = system;
+
       _module.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_);
     };
   };
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index afb74581e239..011d493c1538 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -216,6 +216,14 @@ in
         Ignored when <code>nixpkgs.pkgs</code> is set.
       '';
     };
+
+    initialSystem = mkOption {
+      type = types.str;
+      internal = true;
+      description = ''
+        Preserved value of <literal>system</literal> passed to <literal>eval-config.nix</literal>.
+      '';
+    };
   };
 
   config = {
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 346e0b64230f..14bd751ce324 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -15,7 +15,7 @@ let
     map (childConfig:
       (import ../../../lib/eval-config.nix {
         inherit baseModules;
-        system = config.nixpkgs.system;
+        system = config.nixpkgs.initialSystem;
         modules =
            (optionals inheritParent modules)
         ++ [ ./no-clone.nix ]

From b2bda57104495e5bf89ac325c1d2205c9697164d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2020 11:41:40 +0000
Subject: [PATCH 2306/4636] mercury: 14.01.1 -> 20.01.1

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

diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix
index 0327e0dc2155..5c26d5ab117b 100644
--- a/pkgs/development/compilers/mercury/default.nix
+++ b/pkgs/development/compilers/mercury/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mercury";
-  version = "14.01.1";
+  version = "20.01.1";
 
   src = fetchurl {
     url    = "https://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz";
-    sha256 = "12z8qi3da8q50mcsjsy5bnr4ia6ny5lkxvzy01a3c9blgbgcpxwq";
+    sha256 = "0vxp9f0jmr228n13p6znhbxncav6ay0bnl4ypy6r3lw5lh7z172p";
   };
 
   buildInputs = [ gcc flex bison texinfo jdk erlang makeWrapper

From 269d1eab10bf37b49ec568ea469effeb33c4dd40 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 5 Mar 2020 07:50:26 -0500
Subject: [PATCH 2307/4636] vivaldi: 2.11.1811.44-1 -> 2.11.1811.47-1

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

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 70c93ee03e53..d0e1114bdd3a 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -17,11 +17,11 @@ let
   vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
 in stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "2.11.1811.44-1";
+  version = "2.11.1811.47-1";
 
   src = fetchurl {
     url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
-    sha256 = "1hzlcvbp056nzxdiig91rsm5f0s0cjqs0imlgn7822jadp9wwnwn";
+    sha256 = "16fw6v00xy66mxkkq0b4k49jd0wwlyyvxaaml2gglfk7swxy7i02";
   };
 
   unpackPhase = ''

From 03003d433ce9079ca9f2fa5583b8a6962e504a36 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 5 Mar 2020 07:53:12 -0500
Subject: [PATCH 2308/4636] jenkins: 2.204.3 -> 2.204.4

---
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 662daeb873f1..3f6a7229b30f 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jenkins";
-  version = "2.204.3";
+  version = "2.204.4";
 
   src = fetchurl {
     url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
-    sha256 = "1sn9km7r3dbhbchn1szmhkwmx5im3qmy4lkzv4gm2aw1j9pghdda";
+    sha256 = "0m4g0hm7cfmma5lrs9jsdy2gzp383hhh4k968s41krdms2pf5jhf";
   };
 
   buildCommand = ''

From ae189056ef924b5559bac0b13b0838e829d6fe79 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 5 Mar 2020 07:53:39 -0500
Subject: [PATCH 2309/4636] oh-my-zsh: 2020-03-03 -> 2020-03-05

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

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 871791dd4589..ea43057a07f0 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2020-03-03";
+  version = "2020-03-05";
   pname = "oh-my-zsh";
-  rev = "bbe54e4e6009dcbb69a4ace22ddae3672b323fdc";
+  rev = "2f345a3d0c9a94891c909a9ae6f6e2e2dc6df5b2";
 
   src = fetchgit { inherit rev;
     url = "https://github.com/ohmyzsh/ohmyzsh";
-    sha256 = "13znfpr9dvvvasrszdi2qr4iprx1s1z5rx16f01hc6r9jqnbqi5s";
+    sha256 = "1xs6rz73i04b91ans8j3k46xxb64ljvx7v06j2wmr38lqfplw0ym";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];

From 1cf4fea33f97d35f86fdebf307ba8e7a94926c6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Thu, 5 Mar 2020 14:03:27 +0100
Subject: [PATCH 2310/4636] nixos/release-notes: fix a tiny typo

---
 nixos/doc/manual/release-notes/rl-2003.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index 78618ed18a5d..918906d27e72 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -154,7 +154,7 @@ services.xserver.displayManager.defaultSession = "xfce+icewm";
    </listitem>
    <listitem>
     <para>
-     The <literal>99-main.network</literal> file was removed. Maching all
+     The <literal>99-main.network</literal> file was removed. Matching all
      network interfaces caused many breakages, see
      <link xlink:href="https://github.com/NixOS/nixpkgs/pull/18962">#18962</link>
        and <link xlink:href="https://github.com/NixOS/nixpkgs/pull/71106">#71106</link>.

From 0b2047d71299577e3edef4ca4b7f3b6b3d0c4a19 Mon Sep 17 00:00:00 2001
From: Christoph Bauer <mail@christoph-bauer.net>
Date: Thu, 5 Mar 2020 14:21:50 +0100
Subject: [PATCH 2311/4636] pwsafe -> 1.9.0

fixes the broken build
there is a problem with wxGTK 3.1.2
maybe related to
https://github.com/pwsafe/pwsafe/blob/master/src/ui/wxWidgets/TreeCtrl.cpp
line 107
So I use wxGTK30

file is a new depedency
---
 pkgs/applications/misc/pwsafe/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix
index b1f4e5f9e42b..91845abc8b21 100644
--- a/pkgs/applications/misc/pwsafe/default.nix
+++ b/pkgs/applications/misc/pwsafe/default.nix
@@ -1,27 +1,28 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, zip, gettext, perl
-, wxGTK31, libXext, libXi, libXt, libXtst, xercesc
+, wxGTK30, libXext, libXi, libXt, libXtst, xercesc
 , qrencode, libuuid, libyubikey, yubikey-personalization
-, curl, openssl
+, curl, openssl, file
 }:
 
 stdenv.mkDerivation rec {
   pname = "pwsafe";
-  version = "1.08.2";
+  version = "1.09.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "${version}BETA";
-    sha256 = "14qwk3cv5psj7ll71ikyv452x55c7iwjw9765yrpij6741r4yjln";
+    rev = "${version}";
+    sha256 = "0dmazm95d53wq74qvsjvhl7r6fr4dv11nzf8sgdy47nyxv06xs1b";
   };
 
   nativeBuildInputs = [ 
     cmake gettext perl pkgconfig zip
   ];
   buildInputs = [
-    libXext libXi libXt libXtst wxGTK31
+    libXext libXi libXt libXtst wxGTK30
     curl qrencode libuuid openssl xercesc
     libyubikey yubikey-personalization
+    file
   ];
 
   cmakeFlags = [

From 0072d12b60fa1ce11bce8478710ee6c33565e279 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2020 13:40:28 +0000
Subject: [PATCH 2312/4636] openiscsi: 2.1.0 -> 2.1.1

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

diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix
index 34e2591d44ab..43859dc9af3a 100644
--- a/pkgs/os-specific/linux/open-iscsi/default.nix
+++ b/pkgs/os-specific/linux/open-iscsi/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   pname = "open-iscsi";
-  version = "2.1.0";
+  version = "2.1.1";
 
   nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ];
   buildInputs = [ kmod openisns.lib openssl systemd utillinux ];
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "open-iscsi";
     repo = "open-iscsi";
     rev = version;
-    sha256 = "0z7rnbfa48j3r4ij7335xgjfb835gnnp10v7q6lvwg7bq6v5xvih";
+    sha256 = "1xa3mbid9mkajp8mr8jx6cymv0kd7yqs96jvff54n6wb9qhn9qll";
   };
 
   DESTDIR = "$(out)";
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A high performance, transport independent, multi-platform implementation of RFC3720";
     license = licenses.gpl2;
-    homepage = https://www.open-iscsi.com;
+    homepage = "https://www.open-iscsi.com";
     platforms = platforms.linux;
     maintainers = with maintainers; [ cleverca22 zaninime ];
   };

From b18995ef1002e1047d33c83bd884160825ee5d0a Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 5 Mar 2020 13:44:27 +0100
Subject: [PATCH 2313/4636] wayvnc: 0.1.0 -> 0.1.1

---
 pkgs/applications/networking/remote/wayvnc/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/remote/wayvnc/default.nix b/pkgs/applications/networking/remote/wayvnc/default.nix
index b1498d0a9ce7..7cf989de33ec 100644
--- a/pkgs/applications/networking/remote/wayvnc/default.nix
+++ b/pkgs/applications/networking/remote/wayvnc/default.nix
@@ -4,15 +4,20 @@
 
 stdenv.mkDerivation rec {
   pname = "wayvnc";
-  version = "0.1.0";
+  version = "0.1.1";
 
   src = fetchFromGitHub {
     owner = "any1";
     repo = pname;
     rev = "v${version}";
-    sha256 = "17c30c33zzhhlqzc4a5dd1y74ch7c8gsm98wvcn4n1fv50fbmpbd";
+    sha256 = "1qk8xrqd8ls2hpkj7g4aknr73x3lbzzdjpja16rbp2r0m4iv95ld";
   };
 
+  postPatch = ''
+    substituteInPlace meson.build \
+      --replace "version: '0.1.0'" "version: '${version}'"
+  '';
+
   nativeBuildInputs = [ meson pkg-config ninja ];
   buildInputs = [ pixman libuv libGL libxkbcommon wayland neatvnc libdrm libX11 ];
 
@@ -26,6 +31,7 @@ stdenv.mkDerivation rec {
       display attached.
     '';
     inherit (src.meta) homepage;
+    changelog = "https://github.com/any1/wayvnc/releases/tag/v${version}";
     license = licenses.isc;
     platforms = platforms.linux;
     maintainers = with maintainers; [ primeos ];

From 0e5d4573d4b408ba13711f2e3a48e1f3f4e043dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Thu, 5 Mar 2020 15:08:03 +0100
Subject: [PATCH 2314/4636] nix-bash-completions: 0.6.7 -> 0.6.8 (#81019)

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

diff --git a/pkgs/shells/bash/nix-bash-completions/default.nix b/pkgs/shells/bash/nix-bash-completions/default.nix
index affbd2199586..5dfd673a6298 100644
--- a/pkgs/shells/bash/nix-bash-completions/default.nix
+++ b/pkgs/shells/bash/nix-bash-completions/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "0.6.7";
+  version = "0.6.8";
   pname = "nix-bash-completions";
 
   src = fetchFromGitHub {
     owner = "hedning";
     repo = "nix-bash-completions";
     rev = "v${version}";
-    sha256 = "067j1gavpm9zv3vzw9gq0bi3bi0rjrijwprc1j016g44kvpq49qi";
+    sha256 = "1n5zs6xcnv4bv1hdaypmz7fv4j7dsr4a0ifah99iyj4p5j85i1bc";
   };
 
   # To enable lazy loading via. bash-completion we need a symlink to the script
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/hedning/nix-bash-completions;
+    homepage = "https://github.com/hedning/nix-bash-completions";
     description = "Bash completions for Nix, NixOS, and NixOps";
     license = licenses.bsd3;
     platforms = platforms.all;

From e1611f85c25fbe8df4ad7cf971b6448a3d711822 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Thu, 5 Mar 2020 07:18:44 -0800
Subject: [PATCH 2315/4636] docker: 19.03.6 -> 19.03.7

---
 .../applications/virtualization/docker/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 2154daa2a2c9..e4093ea87e72 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -206,14 +206,14 @@ rec {
   };
 
   docker_19_03 = makeOverridable dockerGen {
-    version = "19.03.6";
-    rev = "369ce74a3ce86a392e39e45d3960ce970fdfac97";
-    sha256 = "0myvh7p9h0j4xc35zhcvp8cqxd3r6p6jx5zxl5rzh14m6lgzmkh0";
-    runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd";
+    version = "19.03.7";
+    rev = "7141c199a2edb2a90b778175f836f9dd2a22c95a";
+    sha256 = "1h1hrp6cw3ah2gaq2vfdd1d9vh7gyf7rs6bdxwpxk9ixc19fxsm4";
+    runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10
     runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk";
-    containerdRev = "35bd7a5f69c13e1563af8a93431411cd9ecf5021";
-    containerdSha256 = "076355bkbdsgsxryhhr9gbpyypdx8gg149lylyd6q5ig98p179ap";
-    tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662";
+    containerdRev = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; # v1.2.13
+    containerdSha256 = "1rac3iak3jpz57yarxc72bxgxvravwrl0j6s6w2nxrmh2m3kxqzn";
+    tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; # v0.18.0
     tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn";
   };
 }

From c25756f91ccfc8b3c085d91de6ec4d6e469ccc20 Mon Sep 17 00:00:00 2001
From: Milan <mil@nyantec.com>
Date: Thu, 5 Mar 2020 16:37:21 +0100
Subject: [PATCH 2316/4636] gitlab: 12.8.1 -> 12.8.2 (#81803)

Includes multiple security fixes mentioned in
https://about.gitlab.com/releases/2020/03/04/gitlab-12-dot-8-dot-2-released/
(unfortunately, no CVE numbers as of yet)

 - Directory Traversal to Arbitrary File Read
 - Account Takeover Through Expired Link
 - Server Side Request Forgery Through Deprecated Service
 - Group Two-Factor Authentication Requirement Bypass
 - Stored XSS in Merge Request Pages
 - Stored XSS in Merge Request Submission Form
 - Stored XSS in File View
 - Stored XSS in Grafana Integration
 - Contribution Analytics Exposed to Non-members
 - Incorrect Access Control in Docker Registry via Deploy Tokens
 - Denial of Service via Permission Checks
 - Denial of Service in Design For Public Issue
 - GitHub Tokens Displayed in Plaintext on Integrations Page
 - Incorrect Access Control via LFS Import
 - Unescaped HTML in Header
 - Private Merge Request Titles Leaked via Widget
 - Project Namespace Exposed via Vulnerability Feedback Endpoint
 - Denial of Service Through Recursive Requests
 - Project Authorization Not Being Updated
 - Incorrect Permission Level For Group Invites
 - Disclosure of Private Group Epic Information
 - User IP Address Exposed via Badge images
 - Update postgresql (GitLab Omnibus)
---
 pkgs/applications/version-management/gitlab/data.json     | 8 ++++----
 .../version-management/gitlab/gitaly/default.nix          | 4 ++--
 .../version-management/gitlab/gitaly/deps.nix             | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 87c37f1c75f4..2772ef5b6f4b 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,11 +1,11 @@
 {
-  "version": "12.8.1",
-  "repo_hash": "1h844a79scf3an5rv0wi332lrf7mv1zcv2mg6zllk82f7nf341gn",
+  "version": "12.8.2",
+  "repo_hash": "1d27s61kglryr5pashwfq55z7fh16fxkx1m4gc82xihwfzarf4x9",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v12.8.1-ee",
+  "rev": "v12.8.2-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "12.8.1",
+    "GITALY_SERVER_VERSION": "12.8.2",
     "GITLAB_PAGES_VERSION": "1.16.0",
     "GITLAB_SHELL_VERSION": "11.0.0",
     "GITLAB_WORKHORSE_VERSION": "8.21.0"
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index bac51cd278c2..af97873463e8 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -28,14 +28,14 @@ let
     };
   });
 in buildGoPackage rec {
-  version = "12.8.1";
+  version = "12.8.2";
   pname = "gitaly";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitaly";
     rev = "v${version}";
-    sha256 = "0sjkh0j36dpakqmq7l5gd1ydmx1kxgij53bjvvn37r19liqdijnx";
+    sha256 = "1zc44y5yl799vqg12w3iaivk4xwj9i4k6f198svplipa760nl9ic";
   };
 
   # Fix a check which assumes that hook files are writeable by their
diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix
index 83a2f0f5f748..5ab063d1deab 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix
@@ -1319,8 +1319,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/ugorji/go";
-      rev = "v1.1.4";
-      sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w";
+      rev = "d75b2dcb6bc8";
+      sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps";
     };
   }
   {

From e7387ad05cd88d17094ed965660022b263bd5970 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2020 16:54:20 +0000
Subject: [PATCH 2317/4636] broot: 0.13.1 -> 0.13.2

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

diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix
index 572bee3d2621..16aaabee6189 100644
--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "broot";
-  version = "0.13.1";
+  version = "0.13.2";
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = pname;
     rev = "v${version}";
-    sha256 = "13b1w9g68aj3r70w9bmrmdc772y959n77ajbdm2cpjs5f4kgfpak";
+    sha256 = "0lrrbzs7s2dgifamp81g41fhg6274pvri4hr3xxr1swpvsinxwfn";
   };
 
-  cargoSha256 = "0zrwpmsrzwnjml0964zky8w222zmlargha3z0n6hf8cfshx23s4k";
+  cargoSha256 = "1whnisc30f7qsd8xdr25s64sd1qlbcasd0b06f216sxsf6bmf8a1";
 
   nativeBuildInputs = [ installShellFiles ];
 

From ee85ecaed97d2b30e5507854fcfbaae2102e5486 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2020 17:28:58 +0000
Subject: [PATCH 2318/4636] clojure-lsp: 20200121T234305 -> 20200305T151710

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

diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix
index 53c2bf9a6bcf..4f8ae1a41498 100644
--- a/pkgs/development/tools/misc/clojure-lsp/default.nix
+++ b/pkgs/development/tools/misc/clojure-lsp/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "clojure-lsp";
-  version = "20200121T234305";
+  version = "20200305T151710";
 
   src = fetchurl {
     url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}";
-    sha256 = "04598vxay85q2blr49xh4pb58i4rsgjbznnn2cszcqgyzh05fs4y";
+    sha256 = "0zi05skp36azv0b6spxdscal32cj5rc6g0d0gzfnsaavvxd128lg";
   };
 
   dontUnpack = true;

From 39bdf9eb679a041e103851a5b47679bdf97b8b01 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2020 17:34:49 +0000
Subject: [PATCH 2319/4636] cloudflare-wrangler: 1.7.0 -> 1.8.1

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

diff --git a/pkgs/development/tools/cloudflare-wrangler/default.nix b/pkgs/development/tools/cloudflare-wrangler/default.nix
index 88c52318da46..d2d4669ad646 100644
--- a/pkgs/development/tools/cloudflare-wrangler/default.nix
+++ b/pkgs/development/tools/cloudflare-wrangler/default.nix
@@ -3,18 +3,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cloudflare-wrangler";
-  version = "1.7.0";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "wrangler";
     rev = "v" + version;
-    sha256 = "0vc7f3jki2fdwlgpwhaxzm58g2898wpwbib7dmibb9kxv4jna8gj";
+    sha256 = "0lh06cnjddmy5h5xvbkg8f97vw2v0wr5fi7vrs3nnidiz7x4rsja";
   };
 
   # Delete this on next update; see #79975 for details
   legacyCargoFetcher = true;
-  cargoSha256 = "1f3gy3agpdg6pck5acxjfrd89hyp9x1byqhfizlizbfmwrqs4il8";
+  cargoSha256 = "0s07143vsrb2vwj4rarx5w3wcz1zh0gi8al6cdrfqyl7nhm1mshm";
 
   nativeBuildInputs = [ pkg-config ];
 
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with stdenv.lib; {
     description = "A CLI tool designed for folks who are interested in using Cloudflare Workers.";
-    homepage = https://github.com/cloudflare/wrangler;
+    homepage = "https://github.com/cloudflare/wrangler";
     license = with licenses; [ asl20 /* or */ mit ];
     maintainers = with maintainers; [ ];
     platforms = platforms.all;

From 349e923e00cf46fa33f118bfd22024f392e95a79 Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Thu, 5 Mar 2020 18:53:11 +0100
Subject: [PATCH 2320/4636] appimage-run: replace writeScript to a standalone
 appimage-exec.sh

---
 .../appimage-run/appimage-exec.sh             | 43 ++++++++++++
 .../appimage-run/default.nix                  | 69 ++++++-------------
 2 files changed, 65 insertions(+), 47 deletions(-)
 create mode 100755 pkgs/tools/package-management/appimage-run/appimage-exec.sh

diff --git a/pkgs/tools/package-management/appimage-run/appimage-exec.sh b/pkgs/tools/package-management/appimage-run/appimage-exec.sh
new file mode 100755
index 000000000000..cdce727af4f3
--- /dev/null
+++ b/pkgs/tools/package-management/appimage-run/appimage-exec.sh
@@ -0,0 +1,43 @@
+#!@bash@/bin/bash
+if [ $# -eq 0 ]; then
+  echo "Usage: $0 FILE [OPTION...]"
+  echo
+  echo 'Options are passed on to the appimage.'
+  echo "If you want to execute a custom command in the appimage's environment, set the APPIMAGE_DEBUG_EXEC environment variable."
+  exit 1
+fi
+APPIMAGE="$(realpath "$1")"
+shift
+
+if [ ! -x "$APPIMAGE" ]; then
+  echo "fatal: $APPIMAGE is not executable"
+  exit 1
+fi
+
+SHA256="$(@coreutils@/bin/sha256sum "$APPIMAGE" | cut -d ' ' -f 1)"
+SQUASHFS_ROOT="''${XDG_CACHE_HOME:-$HOME/.cache}/appimage-run/$SHA256/"
+mkdir -p "$SQUASHFS_ROOT"
+
+export APPDIR="$SQUASHFS_ROOT/squashfs-root"
+if [ ! -x "$APPDIR" ]; then
+  cd "$SQUASHFS_ROOT"
+
+  if @file@/bin/file --mime-type --brief --keep-going "$APPIMAGE" | grep -q iso; then
+    # is type-1 appimage
+    mkdir "$APPDIR"
+    @libarchive@/bin/bsdtar -x -C "$APPDIR" -f "$APPIMAGE"
+  else
+    # is type-2 appimage
+    "$APPIMAGE" --appimage-extract 2>/dev/null
+  fi
+fi
+
+cd "$APPDIR"
+export PATH="$PATH:$PWD/usr/bin"
+export APPIMAGE_SILENT_INSTALL=1
+
+if [ -n "$APPIMAGE_DEBUG_EXEC" ]; then
+  exec "$APPIMAGE_DEBUG_EXEC"
+fi
+
+exec ./AppRun "$@"
diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix
index 426cc7943e5a..3eeaa752f029 100644
--- a/pkgs/tools/package-management/appimage-run/default.nix
+++ b/pkgs/tools/package-management/appimage-run/default.nix
@@ -1,56 +1,31 @@
-{ writeScript, buildFHSUserEnv, coreutils, file, libarchive, runtimeShell
-, extraPkgs ? pkgs: [], appimageTools }:
+{ buildFHSUserEnv, coreutils, file, libarchive, runtimeShell
+, extraPkgs ? pkgs: [], appimageTools, stdenv, bash }:
 
 let
-  fhsArgs = appimageTools.defaultFhsEnvArgs;
-in buildFHSUserEnv (fhsArgs // {
+
   name = "appimage-run";
+  version = "1.0";
+  fhsArgs = appimageTools.defaultFhsEnvArgs;
 
-  targetPkgs = pkgs: fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs;
+  appimage-exec = stdenv.mkDerivation {
+     #inherit pname version;
+     name = "appimage-exec";
 
-  runScript = writeScript "appimage-exec" ''
-    #!${runtimeShell}
-    if [ $# -eq 0 ]; then 
-      echo "Usage: $0 FILE [OPTION...]"
-      echo
-      echo 'Options are passed on to the appimage.'
-      echo "If you want to execute a custom command in the appimage's environment, set the APPIMAGE_DEBUG_EXEC environment variable."
-      exit 1
-    fi
-    APPIMAGE="$(realpath "$1")"
-    shift
+     inherit coreutils file libarchive bash;
 
-    if [ ! -x "$APPIMAGE" ]; then
-      echo "fatal: $APPIMAGE is not executable"
-      exit 1
-    fi
+     buildCommand = ''
+       mkdir -p $out/bin/
+       substituteAll ${./appimage-exec.sh} $out/bin/appimage-exec.sh
+       chmod +x $out/bin/appimage-exec.sh
+    '';
+  };
 
-    SHA256="$(${coreutils}/bin/sha256sum "$APPIMAGE" | cut -d ' ' -f 1)"
-    SQUASHFS_ROOT="''${XDG_CACHE_HOME:-$HOME/.cache}/appimage-run/$SHA256/"
-    mkdir -p "$SQUASHFS_ROOT"
+in buildFHSUserEnv (fhsArgs // {
+  inherit name;
 
-    export APPDIR="$SQUASHFS_ROOT/squashfs-root"
-    if [ ! -x "$APPDIR" ]; then
-      cd "$SQUASHFS_ROOT"
-
-      if ${file}/bin/file --mime-type --brief --keep-going "$APPIMAGE" | grep -q iso; then
-        # is type-1 appimage
-        mkdir "$APPDIR"
-        ${libarchive}/bin/bsdtar -x -C "$APPDIR" -f "$APPIMAGE"
-      else
-        # is type-2 appimage
-        "$APPIMAGE" --appimage-extract 2>/dev/null
-      fi
-    fi
-
-    cd "$APPDIR"
-    export PATH="$PATH:$PWD/usr/bin"
-    export APPIMAGE_SILENT_INSTALL=1
-
-    if [ -n "$APPIMAGE_DEBUG_EXEC" ]; then
-      exec "$APPIMAGE_DEBUG_EXEC"
-    fi
-
-    exec ./AppRun "$@"
-  '';
+  targetPkgs = pkgs:
+    [ appimage-exec
+    ] ++ fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs;
+  #extraInstallCommands = '''';
+  runScript = "appimage-exec.sh";
 })

From 05ee8890bd9b6704e30f8363a82f33f2c3bd9887 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Thu, 5 Mar 2020 18:57:23 +0100
Subject: [PATCH 2321/4636] python3Packages.sapi-python-client: init at 0.13.1
 (#81184)

python3Packages.sapi-python-client: init at 0.13.1
---
 .../sapi-python-client/default.nix            | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/sapi-python-client/default.nix

diff --git a/pkgs/development/python-modules/sapi-python-client/default.nix b/pkgs/development/python-modules/sapi-python-client/default.nix
new file mode 100644
index 000000000000..155950dff2ce
--- /dev/null
+++ b/pkgs/development/python-modules/sapi-python-client/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, git, setuptools, setuptools_scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }: 
+
+buildPythonPackage rec { 
+    pname = "sapi-python-client"; 
+    version = "0.1.3"; 
+
+    src = fetchFromGitHub {
+        owner = "keboola";
+        repo = pname;
+        rev  = version;
+        sha256 = "1xja4v5d30hy26lfys21vcz1lcs88v8mvjxwl2dc3wxx2pzdvcf6";
+    };
+
+    postPatch = ''
+        sed -i 's|use_scm_version=True|version="${version}"|' setup.py
+    '';
+
+    doCheck = false; # requires API token and an active keboola bucket
+
+    nativeBuildInputs = [ git setuptools_scm ]; 
+
+    propagatedBuildInputs = [ setuptools requests boto3 responses ]; 
+
+    meta = with stdenv.lib; { 
+        description = "Keboola Connection Storage API client"; 
+        homepage = "https://github.com/keboola/sapi-python-client"; 
+        maintainers = with maintainers; [ mrmebelman ];
+        license = licenses.mit; 
+    }; 
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 74f2112f0ec4..29fbf3cd8a14 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1377,6 +1377,8 @@ in {
 
   sanic-auth = callPackage ../development/python-modules/sanic-auth { };
 
+  sapi-python-client = callPackage ../development/python-modules/sapi-python-client { };
+
   seekpath = callPackage ../development/python-modules/seekpath { };
 
   selectors2 = callPackage ../development/python-modules/selectors2 { };

From 4e5b0571ed29c1f1c50702821c517764e059b24c Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Thu, 5 Mar 2020 18:00:03 +0000
Subject: [PATCH 2322/4636] create-amis: Add eu-north-1

---
 nixos/maintainers/scripts/ec2/create-amis.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 5dc1c5aaed57..145eb49ced7a 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -18,7 +18,7 @@ state_dir=$HOME/amis/ec2-images
 home_region=eu-west-1
 bucket=nixos-amis
 
-regions=(eu-west-1 eu-west-2 eu-west-3 eu-central-1
+regions=(eu-west-1 eu-west-2 eu-west-3 eu-central-1 eu-north-1
          us-east-1 us-east-2 us-west-1 us-west-2
          ca-central-1
          ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2

From d2bea921e263bdc7aea6b56c4e8e3e99e515552c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2020 18:20:16 +0000
Subject: [PATCH 2323/4636] emplace: 0.2.10 -> 0.2.12

---
 pkgs/tools/package-management/emplace/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix
index 321897369dbf..8845c54b5714 100644
--- a/pkgs/tools/package-management/emplace/default.nix
+++ b/pkgs/tools/package-management/emplace/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "emplace";
-  version = "0.2.10";
+  version = "0.2.12";
 
   src = fetchFromGitHub {
     owner = "tversteeg";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1y77cla6bgy8pjb21cawx7cb69hhri4r7gyjkhnjyiixkh945mwj";
+    sha256 = "1jhv7c68ymwaq9fr586rjbgcaxpkxcr0d3pq7lyhbzihaywz7m6m";
   };
 
-  cargoSha256 = "1vkcr239axxqya0iin74jxkmx6z9nwb67pjjdh89v4qwjvwhiqg3";
+  cargoSha256 = "1n4k8mnsix3sy6pmqkk7wymknn1mn5dkwa9i90nlb4k2h9y709wj";
 
   meta = with lib; {
     description = "Mirror installed software on multiple machines";

From 6c20f4def3e9908867943bfcccceb01c74d591e8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2020 18:36:27 +0000
Subject: [PATCH 2324/4636] findomain: 1.4.1 -> 1.4.2

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

diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix
index 98c4473ac09c..c78a6ad55267 100644
--- a/pkgs/tools/networking/findomain/default.nix
+++ b/pkgs/tools/networking/findomain/default.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "findomain";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "Edu4rdSHL";
     repo = pname;
     rev = version;
-    sha256 = "1mg0awsf8z5sd7s7vj5rs18my3aksxsggb5y85kaf0skq79ybmrx";
+    sha256 = "0c6jjr1343lqwggvpxdhbjyi1far4f7f3yzq1y0nj1j952j7a36x";
   };
 
-  cargoSha256 = "0mnp2hl9q6qsfj4x37ss9gfhss184lzs63zv327l6jnd2m1yq8b2";
+  cargoSha256 = "1cyfxfhbc2xhavnkhva1xdcw8vy9i5pqhfbiwn6idpfy6hm1w0bx";
 
   nativeBuildInputs = [ installShellFiles perl ];
   buildInputs = lib.optional stdenv.isDarwin Security;

From d9feea58aeded06aded50eee7e9d69ebe1086e7e Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Thu, 5 Mar 2020 14:56:52 -0500
Subject: [PATCH 2325/4636] gcc: remove unneeded RPATH patching

---
 pkgs/development/compilers/gcc/builder.sh | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
index 579378764f0d..b153687980a0 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc/builder.sh
@@ -247,13 +247,6 @@ postInstall() {
             NEW_RPATH=`echo "$PREV_RPATH" | sed 's,:[^:]*bootstrap-tools/lib,,g'`
             patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK
         done
-
-        # For some reason the libs retain RPATH to $out
-        for i in "$lib"/lib/{libtsan,libasan,libubsan}.so.*.*.*; do
-            PREV_RPATH=`patchelf --print-rpath "$i"`
-            NEW_RPATH=`echo "$PREV_RPATH" | sed "s,:${out}[^:]*,,g"`
-            patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK
-        done
     fi
 
     if type "install_name_tool"; then

From 2b8ccf0c8c8db267e5a72e8dd43b821def6be991 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2020 20:01:19 +0000
Subject: [PATCH 2326/4636] jackett: 0.12.1301 -> 0.13.467

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

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index cbac1a423525..a9c22489aa8d 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jackett";
-  version = "0.12.1301";
+  version = "0.13.467";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.LinuxAMDx64.tar.gz";
-    sha256 = "03glp5qhyb6bldslbhivywcfbxpv374q9aaybz5f2s0r9il5cb35";
+    sha256 = "1hjihafb8w9gcqdi2i8dmimbbg17c5hwwqhav3avfizq2drsrv5c";
   };
 
   buildInputs = [ makeWrapper ];
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "API Support for your favorite torrent trackers.";
-    homepage = https://github.com/Jackett/Jackett/;
+    homepage = "https://github.com/Jackett/Jackett/";
     license = licenses.gpl2;
     maintainers = with maintainers; [ edwtjo nyanloutre ];
     platforms = platforms.all;

From 972db874b34f6c27cc4bd8ce766013fc5ed3e7d1 Mon Sep 17 00:00:00 2001
From: Michael Reilly <OmnipotentEntity@gmail.com>
Date: Thu, 5 Mar 2020 15:14:10 -0500
Subject: [PATCH 2327/4636] cudnn_cudatoolkit_10_2: init at 7.6.5

---
 .../development/libraries/science/math/cudnn/default.nix | 9 ++++++++-
 pkgs/top-level/all-packages.nix                          | 6 ++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix
index 8cd74939959d..765d634a91f9 100644
--- a/pkgs/development/libraries/science/math/cudnn/default.nix
+++ b/pkgs/development/libraries/science/math/cudnn/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1 }:
+{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2 }:
 
 let
   generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) {
@@ -72,5 +72,12 @@ in rec {
     sha256 = "0qc9f1xpyfibwqrpqxxq2v9h6w90j0dbx564akwy44c1dls5f99m";
   };
 
+  cudnn_cudatoolkit_10_2 = generic rec {
+    version = "7.6.5";
+    cudatoolkit = cudatoolkit_10_2;
+    srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.6.5.32.tgz";
+    sha256 = "084c13vzjdkb5s1996yilybg6dgav1lscjr1xdcgvlmfrbr6f0k0";
+  };
+
   cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_1;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5574d0cc76aa..78a7584adcc6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2683,7 +2683,8 @@ in
     cudatoolkit_9_2
     cudatoolkit_10
     cudatoolkit_10_0
-    cudatoolkit_10_1;
+    cudatoolkit_10_1
+    cudatoolkit_10_2;
 
   cudatoolkit = cudatoolkit_10;
 
@@ -2699,7 +2700,8 @@ in
     cudnn_cudatoolkit_9_2
     cudnn_cudatoolkit_10
     cudnn_cudatoolkit_10_0
-    cudnn_cudatoolkit_10_1;
+    cudnn_cudatoolkit_10_1
+    cudnn_cudatoolkit_10_2;
 
   cudnn = cudnn_cudatoolkit_10;
 

From f730d6da490fe455803d89a2029b5e442936933d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2020 20:22:27 +0000
Subject: [PATCH 2328/4636] khronos: 1.0.5 -> 1.0.6

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

diff --git a/pkgs/applications/office/khronos/default.nix b/pkgs/applications/office/khronos/default.nix
index d7726c13e647..e672b5c3efd0 100644
--- a/pkgs/applications/office/khronos/default.nix
+++ b/pkgs/applications/office/khronos/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "khronos";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchFromGitHub {
     owner = "lainsce";
     repo = pname;
     rev = version;
-    sha256 = "0dk1b2d82gli3z35dn5p002lfkgq326janql0vn1z5hs8jvjakqh";
+    sha256 = "0s6yx05k0x90bmdmr61hw07nf9a1kyvvk6gwlg8m97zq1n3qc0f3";
   };
 
   nativeBuildInputs = [

From 815f25daed35b1507281a13e658b8fa03be1ea74 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 6 Mar 2020 07:24:04 +1000
Subject: [PATCH 2329/4636] youtube-dl: 2020.03.01 -> 2020.03.06

https://github.com/ytdl-org/youtube-dl/releases/tag/2020.03.06
---
 pkgs/tools/misc/youtube-dl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 151e520e5d1a..c17731c8cdb0 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
   # The websites youtube-dl deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2020.03.01";
+  version = "2020.03.06";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "01hk00nbxxa81yajkbv65nv5amwyavhjs127xkyqqcrq6ws3z92w";
+    sha256 = "16c10rgkjrjv115w4r7gsr9hcakqq5s2cg250b1hwvxdsxqp8vnv";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -54,7 +54,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with lib; {
-    homepage = "https://rg3.github.io/youtube-dl/";
+    homepage = "https://ytdl-org.github.io/youtube-dl/";
     description = "Command-line tool to download videos from YouTube.com and other sites";
     longDescription = ''
       youtube-dl is a small, Python-based command-line program

From 18848216eaf556a3f2b1fe14294bf6f3bd0577ce Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Thu, 5 Mar 2020 23:16:02 +0100
Subject: [PATCH 2330/4636] riot-web: 1.5.10 -> 1.5.12

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

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index ee86ba658912..e633f60d9770 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -12,11 +12,11 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "riot-web";
-  version = "1.5.10";
+  version = "1.5.12";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "1c11x8903p38c0f9k3ff4pnpb3n7hzs4pj6g65a4cvp6jgg1zfnn";
+    sha256 = "064zghrsl348ydzngwxhwjn0d0gkkf3nkzq03v5gad2f11qwnwb6";
   };
 
   installPhase = ''

From abc58dc1d0d233f62b909a71305533d965131c6a Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Thu, 5 Mar 2020 23:16:31 +0100
Subject: [PATCH 2331/4636] riot-desktop: 1.5.10 -> 1.5.12

---
 .../instant-messengers/riot/riot-desktop-package.json |  2 +-
 .../instant-messengers/riot/riot-desktop.nix          | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
index 3dc7c79b00b9..418375e80c36 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "1.5.10",
+  "version": "1.5.12",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "dependencies": {
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
index f94d7ad165db..122a7e74f863 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_5, riot-web, mkYarnPackage }:
+{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_7, riot-web, mkYarnPackage }:
 
 # Notes for maintainers:
 # * versions of `riot-web` and `riot-desktop` should be kept in sync.
@@ -6,13 +6,14 @@
 
 let
   executableName = "riot-desktop";
-  version = "1.5.10";
+  version = "1.5.12";
   riot-web-src = fetchFromGitHub {
     owner = "vector-im";
     repo = "riot-web";
     rev = "v${version}";
-    sha256 = "0yr5f3i24qh9b8hjfalpqxwr0qhs7hax450g83vf06skap1l5i5j";
+    sha256 = "1qz3n2dlklhbi6rbhv2v769xbr4rcp9s6pm2cc9r33ak6axn4aym";
   };
+  electron = electron_7;
 
 in mkYarnPackage rec {
   name = "riot-desktop-${version}";
@@ -45,7 +46,7 @@ in mkYarnPackage rec {
     ln -s "${desktopItem}/share/applications" "$out/share/applications"
 
     # executable wrapper
-    makeWrapper '${electron_5}/bin/electron' "$out/bin/${executableName}" \
+    makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
       --add-flags "$out/share/riot/electron"
   '';
 
@@ -78,6 +79,6 @@ in mkYarnPackage rec {
     homepage = https://about.riot.im/;
     license = licenses.asl20;
     maintainers = with maintainers; [ pacien worldofpeace ];
-    inherit (electron_5.meta) platforms;
+    inherit (electron.meta) platforms;
   };
 }

From 6486d191395ff1ec196be7fa53e643abff4ad92c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 5 Mar 2020 18:00:00 -0500
Subject: [PATCH 2332/4636] dbeaver: fix hash

---
 pkgs/applications/misc/dbeaver/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index 08746ff88789..9ff70af73dde 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
-    sha256 = "0ggay9igpqwq016yzfz2dw3cjhlzadaml0hi06iqzhxljr86qm44";
+    sha256 = "1fnvwndzny51z0zmdnlafdcxawsyz435g712mc4bjjj29qy0inzm";
   };
 
   installPhase = ''

From 384ed011544f7bb5e4defaf78ea0955b47744ddd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 05:10:55 +0000
Subject: [PATCH 2333/4636] heimer: 1.15.0 -> 1.15.1

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

diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix
index fe7463491557..f301122a92de 100644
--- a/pkgs/applications/misc/heimer/default.nix
+++ b/pkgs/applications/misc/heimer/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "heimer";
-  version = "1.15.0";
+  version = "1.15.1";
 
   src = fetchFromGitHub {
     owner = "juzzlin";
     repo = pname;
     rev = version;
-    sha256 = "1qh8nr6yvxiy8pxl5pkhzlfr7hanxxc8hd8h00gsdxa0vgmqz11q";
+    sha256 = "13a9yfq7m8jhirb31i0mmigqb135r585zwqddknl090d88164fic";
   };
 
   nativeBuildInputs = [ cmake ];

From 9328cff6be0384fa83f9ed42ded71fcfccc9eabd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2020 18:54:57 +0000
Subject: [PATCH 2334/4636] gleam: 0.6.0 -> 0.7.1

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

diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix
index 9d2f828dfa6c..5179142e40e1 100644
--- a/pkgs/development/compilers/gleam/default.nix
+++ b/pkgs/development/compilers/gleam/default.nix
@@ -2,18 +2,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gleam";
-  version = "0.6.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "gleam-lang";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1fvy2j6pw1rwm0rg7555q3qg2069cx2b9lk0nsyc3jxsqp9hbn6i";
+    sha256 = "1bcxq7bgn0kf1vdw6id8s3izz6mwf3ivr8iph4miig302qm9lmmr";
   };
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
-  cargoSha256 = "1vhra9v4jsy9hyhjrmxjy6rnraxz13h1b7l51xvbai5wxsxm7z8m";
+  cargoSha256 = "17bvms65frxhw0d196qswh3jjqlriidq3xi3mfjjgfh6n17rh608";
 
   meta = with stdenv.lib; {
     description = "A statically typed language for the Erlang VM";

From 0c0f3186856ffaa6dd74e7be6ebb98c6a6b525e1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 04:29:32 +0000
Subject: [PATCH 2335/4636] go-license-detector: 3.0.2 -> 3.1.0

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

diff --git a/pkgs/development/tools/misc/go-license-detector/default.nix b/pkgs/development/tools/misc/go-license-detector/default.nix
index 31e0158eb6b3..6675f7ed3e25 100644
--- a/pkgs/development/tools/misc/go-license-detector/default.nix
+++ b/pkgs/development/tools/misc/go-license-detector/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "go-license-detector";
-  version = "3.0.2";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "src-d";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0gp7na2hqn5crr5x4khllsq7ka9h7rx8b4y10yzxmi0wpmxr53sw";
+    sha256 = "0ln1z3y9q5igf9djkxw05ql2hb1ijcvvz0mrbwz11cdv9xrsa4z4";
   };
 
   modSha256 = "163f1kiy7kqrnaazb8ydaaiz57lv30jyjkvv6i7pczvcg9yfhmdb";

From 10e44571d82efac50e6fcb234942d6bafe44c262 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 06:59:17 +0000
Subject: [PATCH 2336/4636] libqalculate: 3.7.0 -> 3.8.0

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

diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix
index dd6e3cbe9526..8acfcb4b7513 100644
--- a/pkgs/development/libraries/libqalculate/default.nix
+++ b/pkgs/development/libraries/libqalculate/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libqalculate";
-  version = "3.7.0";
+  version = "3.8.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "libqalculate";
     rev = "v${version}";
-    sha256 = "0g3047lwd0rh0dds196iija3kq06mhkh6y8x5whcbv3s0db66h18";
+    sha256 = "1vbaza9c7159xf2ym90l0xkyj2mp6c3hbghhsqn29yvz08fda9df";
   };
 
   outputs = [ "out" "dev" "doc" ];
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An advanced calculator library";
-    homepage = http://qalculate.github.io;
+    homepage = "http://qalculate.github.io";
     maintainers = with maintainers; [ gebner ];
     license = licenses.gpl2Plus;
     platforms = platforms.all;

From ceeaf410be9a1d111aec4cc34ddfde8405a5972f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 16:32:23 +0000
Subject: [PATCH 2337/4636] abcmidi: 2019.12.09 -> 2020.02.12

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

diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix
index 1b1dd10dd13a..b0b65a560bf3 100644
--- a/pkgs/tools/audio/abcmidi/default.nix
+++ b/pkgs/tools/audio/abcmidi/default.nix
@@ -2,18 +2,18 @@
 
 stdenv.mkDerivation rec {
   pname = "abcMIDI";
-  version = "2019.12.09";
+  version = "2020.02.12";
 
   src = fetchzip {
     url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
-    sha256 = "1pc7wm4np43ax13k4sfwr12dzyinw9p2ghacdw0rwdljg0k000a2";
+    sha256 = "1h0ixdbhxdfvii9in9pdidkdv12qfwbhjy3diknywl0yvaa40xw0";
   };
 
   # There is also a file called "makefile" which seems to be preferred by the standard build phase
   makefile = "Makefile";
 
   meta = with stdenv.lib; {
-    homepage = http://abc.sourceforge.net/abcMIDI/;
+    homepage = "http://abc.sourceforge.net/abcMIDI/";
     downloadPage = https://ifdo.ca/~seymour/runabc/top.html;
     license = licenses.gpl2Plus;
     description = "Utilities for converting between abc and MIDI";

From 4b4dcda1b1c596a4b43ae5e35c8d81153c8defa7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 02:00:13 +0000
Subject: [PATCH 2338/4636] chafa: 1.2.1 -> 1.2.2

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

diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix
index 5055ce67d306..e3cc8c938ead 100644
--- a/pkgs/tools/misc/chafa/default.nix
+++ b/pkgs/tools/misc/chafa/default.nix
@@ -2,14 +2,14 @@
 
 
 stdenv.mkDerivation rec{
-  version = "1.2.1";
+  version = "1.2.2";
   pname = "chafa";
 
   src = fetchFromGitHub {
     owner = "hpjansson";
     repo = "chafa";
     rev = version;
-    sha256 = "19dck47v4hd07q9742mgb928h7y1y9638qlh2rzsvqsfqvqmxh85";
+    sha256 = "10in960wzvmb25biifi480dz87c034vwb8mcshclssl7gmzgpzdn";
   };
 
   nativeBuildInputs = [ autoconf
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec{
 
   meta = with stdenv.lib; {
     description = "Terminal graphics for the 21st century.";
-    homepage = https://hpjansson.org/chafa/;
+    homepage = "https://hpjansson.org/chafa/";
     license = licenses.lgpl3Plus;
     platforms = platforms.all;
     maintainers = [ maintainers.mog ];

From e17a1a098c5108b05cc3b0fb00071ea069630d99 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 02:29:15 +0000
Subject: [PATCH 2339/4636] codeql: 2.0.2 -> 2.0.4

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

diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix
index fbe85307b0bc..309ba9d392bd 100644
--- a/pkgs/development/tools/analysis/codeql/default.nix
+++ b/pkgs/development/tools/analysis/codeql/default.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation rec {
   pname = "codeql";
-  version = "2.0.2";
+  version = "2.0.4";
 
   dontConfigure = true;
   dontBuild = true;
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchzip {
     url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
-    sha256 = "11siv8qmj4arl6qxks7bqnhx5669r3kxqcxq37ai7sf9f7v78k1i";
+    sha256 = "02sqs7shxqrq6c6h12ldskk30k7sisa75wjxz99xyg49m4b2lw4m";
   };
 
   nativeBuildInputs = [

From 00c8e2b625cbc26e551b673a2b73d96975bd5edc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 23:53:39 +0000
Subject: [PATCH 2340/4636] zsh-syntax-highlighting: 0.6.0 -> 0.7.1

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

diff --git a/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix b/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix
index 0dbfba52c0fc..906352b8b3e0 100644
--- a/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix
+++ b/pkgs/shells/zsh/zsh-syntax-highlighting/default.nix
@@ -3,14 +3,14 @@
 # To make use of this derivation, use the `programs.zsh.enableSyntaxHighlighting` option
 
 stdenv.mkDerivation rec {
-  version = "0.6.0";
+  version = "0.7.1";
   pname = "zsh-syntax-highlighting";
 
   src = fetchFromGitHub {
     owner = "zsh-users";
     repo = "zsh-syntax-highlighting";
     rev = version;
-    sha256 = "0zmq66dzasmr5pwribyh4kbkk23jxbpdw4rjxx0i7dx8jjp2lzl4";
+    sha256 = "03r6hpb5fy4yaakqm3lbf4xcvd408r44jgpv4lnzl9asp4sb9qc0";
   };
 
   buildInputs = [ zsh ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Fish shell like syntax highlighting for Zsh";
-    homepage = https://github.com/zsh-users/zsh-syntax-highlighting;
+    homepage = "https://github.com/zsh-users/zsh-syntax-highlighting";
     license = licenses.bsd3;
     platforms = platforms.unix;
     maintainers = [ maintainers.loskutov ];

From 19f7c641cca4e26d15aae76d60c29c77237bbd9a Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 2 Mar 2020 15:15:46 -0800
Subject: [PATCH 2341/4636] pythonPackages.cffi: 1.13.2 -> 1.14.0

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

diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix
index b05aeebf9d4d..6f1e362f8bfa 100644
--- a/pkgs/development/python-modules/cffi/default.nix
+++ b/pkgs/development/python-modules/cffi/default.nix
@@ -2,11 +2,11 @@
 
 if isPyPy then null else buildPythonPackage rec {
   pname = "cffi";
-  version = "1.13.2";
+  version = "1.14.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "599a1e8ff057ac530c9ad1778293c665cb81a791421f46922d80a86473c13346";
+    sha256 = "1dn279gw5ql8i5n3s5v4rnv96rhhjjfn7xq729qbl5bs2954yf1d";
   };
 
   outputs = [ "out" "dev" ];

From 7948c35be61657a2dad9557682b26449c5dcfa73 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 01:11:45 +0000
Subject: [PATCH 2342/4636] bitwarden_rs-vault: 2.12.0c -> 2.12.0e

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

diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix
index 6c6ef6ccaa9f..b5f00a4abf91 100644
--- a/pkgs/tools/security/bitwarden_rs/vault.nix
+++ b/pkgs/tools/security/bitwarden_rs/vault.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bitwarden_rs-vault";
-  version = "2.12.0c";
+  version = "2.12.0e";
 
   src = fetchurl {
     url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz";
-    sha256 = "040bqbx6hpwq4qvv4s7d77gwp5n2ay9rr7kdb135582d80wjq5sp";
+    sha256 = "1jy3c5ywlplrjsy37i90x5s8k0i5n1mn8y0fyl074s807glqaxbf";
   };
 
   buildCommand = ''

From 98968b1854d01f76c7f11c97eb6aadd33df87ffa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 21:31:41 +0000
Subject: [PATCH 2343/4636] wpgtk: 6.0.12 -> 6.0.13

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

diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix
index f85878528dbd..4125229237ae 100644
--- a/pkgs/tools/X11/wpgtk/default.nix
+++ b/pkgs/tools/X11/wpgtk/default.nix
@@ -3,13 +3,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "wpgtk";
-  version = "6.0.12";
+  version = "6.0.13";
 
   src = fetchFromGitHub {
     owner = "deviantfero";
     repo = "wpgtk";
     rev = version;
-    sha256 = "1wqdjq3pjgwb1da549izw3bzi1bk6q7d1hjw3i2zg5nhig1vvxw6";
+    sha256 = "1fphv6k2hqfi3fzazjqmvip7sz9fhy5ccsgpqv68vfylrf8g1f92";
   };
 
   buildInputs = [
@@ -43,7 +43,7 @@ python3Packages.buildPythonApplication rec {
 
      INFO: To work properly, this tool needs "programs.dconf.enable = true" on nixos or dconf installed. A reboot may be required after installing dconf.
      '';
-    homepage = https://github.com/deviantfero/wpgtk;
+    homepage = "https://github.com/deviantfero/wpgtk";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = [ maintainers.melkor333 ];

From cd7765c5877be725b8895a3c7c8d7ec8a134b982 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2020 23:23:04 +0000
Subject: [PATCH 2344/4636] pueue: 0.1.5 -> 0.1.6

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

diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix
index d2ee27ed1d1f..aac371164fa8 100644
--- a/pkgs/applications/misc/pueue/default.nix
+++ b/pkgs/applications/misc/pueue/default.nix
@@ -2,18 +2,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pueue";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchFromGitHub {
     owner = "Nukesor";
     repo = pname;
     rev = "v${version}";
-    sha256 = "03aj4vw8kvwqk1i1a4kah5b574ahs930ij7xmqsvdy7f8c2g6pbq";
+    sha256 = "1qp9h1xlfxwswcqi1qn2hfybxl547z13xjbvfgsx1nc8yj51bi3c";
   };
 
   nativeBuildInputs = [ installShellFiles ];
 
-  cargoSha256 = "08zqhj3b0v4fxj8vi323zrxg4xvbp9gndm2khzs6daacglbwbvhk";
+  cargoSha256 = "00va292bjdp42bkqdkjqajmzc2nshhqa1fj0yfwdf3rrx4nhssjd";
 
   postInstall = ''
     installShellCompletion utils/completions/pueue.{bash,fish} --zsh utils/completions/_pueue

From 6c6091a7755ec4ae92c4ef754e0fa4820a65cfea Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Mon, 17 Feb 2020 21:55:26 -0800
Subject: [PATCH 2345/4636] azure-storage-azcopy: v10.3.2 -> v10.3.4

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

diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix
index e3e85ffcd406..328092feafc5 100644
--- a/pkgs/development/tools/azcopy/default.nix
+++ b/pkgs/development/tools/azcopy/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "azure-storage-azcopy";
-  version = "10.3.2";
+  version = "10.3.4";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-storage-azcopy";
-    rev = "v${version}";
-    sha256 = "0n4yns81kwwx725smsgqg8hc693ygqlzrgkqdrhrfszkpm205479";
+    rev = version;
+    sha256 = "16pdvcgy1d5dfqk3as23j45rkwfrv232n384cj5wfz9qwijkcy5g";
   };
 
   subPackages = [ "." ];

From 3aa3291b2088602c85f965030c1b44e60a32dfab Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 01:03:10 +0000
Subject: [PATCH 2346/4636] bitcoin-abc: 0.20.12 -> 0.21.1

---
 pkgs/applications/blockchains/bitcoin-abc.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix
index 6b339091701c..1fb4078696b8 100644
--- a/pkgs/applications/blockchains/bitcoin-abc.nix
+++ b/pkgs/applications/blockchains/bitcoin-abc.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 mkDerivation rec {
 
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
-  version = "0.20.12";
+  version = "0.21.1";
 
   src = fetchFromGitHub {
     owner = "bitcoin-ABC";
     repo = "bitcoin-abc";
     rev = "v${version}";
-    sha256 = "0ar3syrz7psf83bh24hn2y0mxjgn7cjqk2h8q4cgdp7mq55v8ynj";
+    sha256 = "1aswgmzqk3vhxhp5k0m0awk22lf5ayaqg2cmlqy12jvfmpka9lrj";
   };
 
   patches = [ ./fix-bitcoin-qt-build.patch ];
@@ -37,7 +37,7 @@ mkDerivation rec {
 
       Bitcoin ABC is a fork of the Bitcoin Core software project.
     '';
-    homepage = https://bitcoinabc.org/;
+    homepage = "https://bitcoinabc.org/";
     maintainers = with maintainers; [ lassulus ];
     license = licenses.mit;
     broken = stdenv.isDarwin;

From 5db4396b9190ef256aaeab587544ec2c15b237e0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 19:34:32 +0000
Subject: [PATCH 2347/4636] debootstrap: 1.0.117 -> 1.0.119

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

diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index c016b857de3b..04b55a6a6b47 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -15,13 +15,13 @@ let binPath = stdenv.lib.makeBinPath [
   ];
 in stdenv.mkDerivation rec {
   pname = "debootstrap";
-  version = "1.0.117";
+  version = "1.0.119";
 
   src = fetchurl {
     # git clone git://git.debian.org/d-i/debootstrap.git
     # I'd like to use the source. However it's lacking the lanny script ? (still true?)
     url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.gz";
-    sha256 = "0rsdw1yjkx35jd1i45646l07glnwsn9gzd6k8sjccv2xvhcljq77";
+    sha256 = "1q5kw5mm5cnm97j0iz8hfbmjrpdc3n3pcw7f9as1n6h0xp0bmgp6";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -59,7 +59,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Tool to create a Debian system in a chroot";
-    homepage = https://wiki.debian.org/Debootstrap;
+    homepage = "https://wiki.debian.org/Debootstrap";
     license = licenses.mit;
     maintainers = with maintainers; [ marcweber ];
     platforms = platforms.linux;

From 6e103b062e9e5fa41c9c6f41ef5624d5c0a0c210 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 20:34:32 +0000
Subject: [PATCH 2348/4636] xmrig: 5.5.3 -> 5.7.0

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

diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix
index b87e62b0406d..252d9dd87c6b 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xmrig";
-  version = "5.5.3";
+  version = "5.7.0";
 
   src = fetchFromGitHub {
     owner = "xmrig";
     repo = "xmrig";
     rev = "v${version}";
-    sha256 = "1an68ghs65dvxs8lvcflv7wmf431lqw417np76895w10w436gh7x";
+    sha256 = "14mqfjwff7mj3xckz4wkxlmqm6a0ci1bz0zj1h045ac8hfvw5k4k";
   };
 
   nativeBuildInputs = [ cmake ];

From 0ac24ccf2a076c6cdad20f739031fe65d49a51f4 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Fri, 6 Mar 2020 00:22:15 +0100
Subject: [PATCH 2349/4636] nixos/prometheus-*-exporter: escape shell args

---
 .../services/monitoring/prometheus/exporters/blackbox.nix   | 2 +-
 .../services/monitoring/prometheus/exporters/collectd.nix   | 2 +-
 .../services/monitoring/prometheus/exporters/dnsmasq.nix    | 2 +-
 .../services/monitoring/prometheus/exporters/dovecot.nix    | 2 +-
 .../services/monitoring/prometheus/exporters/json.nix       | 2 +-
 .../services/monitoring/prometheus/exporters/mail.nix       | 2 +-
 .../services/monitoring/prometheus/exporters/minio.nix      | 4 ++--
 .../services/monitoring/prometheus/exporters/nextcloud.nix  | 2 +-
 .../services/monitoring/prometheus/exporters/postfix.nix    | 6 +++---
 .../services/monitoring/prometheus/exporters/snmp.nix       | 4 ++--
 .../services/monitoring/prometheus/exporters/unifi.nix      | 4 ++--
 .../services/monitoring/prometheus/exporters/varnish.nix    | 4 ++--
 .../services/monitoring/prometheus/exporters/wireguard.nix  | 2 +-
 13 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix b/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix
index 8a90afa99842..fe8d905da3fe 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix
@@ -61,7 +61,7 @@ in {
       ExecStart = ''
         ${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \
           --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
-          --config.file ${adjustedConfigFile} \
+          --config.file ${escapeShellArg adjustedConfigFile} \
           ${concatStringsSep " \\\n  " cfg.extraFlags}
       '';
       ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix
index 1cc346418091..972104630275 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix
@@ -66,7 +66,7 @@ in
     serviceConfig = {
       ExecStart = ''
         ${pkgs.prometheus-collectd-exporter}/bin/collectd_exporter \
-          -log.format ${cfg.logFormat} \
+          -log.format ${escapeShellArg cfg.logFormat} \
           -log.level ${cfg.logLevel} \
           -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
           ${collectSettingsArgs} \
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix b/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix
index e9fa26cb1f5a..68afba21d64a 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix
@@ -30,7 +30,7 @@ in
         ${pkgs.prometheus-dnsmasq-exporter}/bin/dnsmasq_exporter \
           --listen ${cfg.listenAddress}:${toString cfg.port} \
           --dnsmasq ${cfg.dnsmasqListenAddress} \
-          --leases_path ${cfg.leasesPath} \
+          --leases_path ${escapeShellArg cfg.leasesPath} \
           ${concatStringsSep " \\\n  " cfg.extraFlags}
       '';
     };
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix b/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix
index a01074758ff8..aba3533e4395 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix
@@ -64,7 +64,7 @@ in
         ${pkgs.prometheus-dovecot-exporter}/bin/dovecot_exporter \
           --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
           --web.telemetry-path ${cfg.telemetryPath} \
-          --dovecot.socket-path ${cfg.socketPath} \
+          --dovecot.socket-path ${escapeShellArg cfg.socketPath} \
           --dovecot.scopes ${concatStringsSep "," cfg.scopes} \
           ${concatStringsSep " \\\n  " cfg.extraFlags}
       '';
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/json.nix b/nixos/modules/services/monitoring/prometheus/exporters/json.nix
index 82a55bafc982..bd0026b55f72 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/json.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/json.nix
@@ -27,7 +27,7 @@ in
       ExecStart = ''
         ${pkgs.prometheus-json-exporter}/bin/prometheus-json-exporter \
           --port ${toString cfg.port} \
-          ${cfg.url} ${cfg.configFile} \
+          ${cfg.url} ${escapeShellArg cfg.configFile} \
           ${concatStringsSep " \\\n  " cfg.extraFlags}
       '';
     };
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix b/nixos/modules/services/monitoring/prometheus/exporters/mail.nix
index 7d8c6fb61404..7754e8fb8a6f 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/mail.nix
@@ -148,7 +148,7 @@ in
         ${pkgs.prometheus-mail-exporter}/bin/mailexporter \
           --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
           --config.file ${
-            if cfg.configuration != {} then configurationFile else cfg.configFile
+            if cfg.configuration != {} then configurationFile else (escapeShellArg cfg.configFile)
           } \
           ${concatStringsSep " \\\n  " cfg.extraFlags}
       '';
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/minio.nix b/nixos/modules/services/monitoring/prometheus/exporters/minio.nix
index ab3e3d7d5d50..d6dd62f871bd 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/minio.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/minio.nix
@@ -54,8 +54,8 @@ in
         ${pkgs.prometheus-minio-exporter}/bin/minio-exporter \
           -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
           -minio.server ${cfg.minioAddress} \
-          -minio.access-key ${cfg.minioAccessKey} \
-          -minio.access-secret ${cfg.minioAccessSecret} \
+          -minio.access-key ${escapeShellArg cfg.minioAccessKey} \
+          -minio.access-secret ${escapeShellArg cfg.minioAccessSecret} \
           ${optionalString cfg.minioBucketStats "-minio.bucket-stats"} \
           ${concatStringsSep " \\\n  " cfg.extraFlags}
       '';
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix b/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix
index 5f9a52053f79..aee6bd5e66ce 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix
@@ -50,7 +50,7 @@ in
           -u ${cfg.username} \
           -t ${cfg.timeout} \
           -l ${cfg.url} \
-          -p @${cfg.passwordFile} \
+          -p ${escapeShellArg "@${cfg.passwordFile}"} \
           ${concatStringsSep " \\\n  " cfg.extraFlags}
       '';
     };
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix
index d50564717eaf..3b6ef1631f89 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/postfix.nix
@@ -67,15 +67,15 @@ in
         ${pkgs.prometheus-postfix-exporter}/bin/postfix_exporter \
           --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
           --web.telemetry-path ${cfg.telemetryPath} \
-          --postfix.showq_path ${cfg.showqPath} \
+          --postfix.showq_path ${escapeShellArg cfg.showqPath} \
           ${concatStringsSep " \\\n  " (cfg.extraFlags
           ++ optional cfg.systemd.enable "--systemd.enable"
           ++ optional cfg.systemd.enable (if cfg.systemd.slice != null
                                           then "--systemd.slice ${cfg.systemd.slice}"
                                           else "--systemd.unit ${cfg.systemd.unit}")
           ++ optional (cfg.systemd.enable && (cfg.systemd.journalPath != null))
-                       "--systemd.journal_path ${cfg.systemd.journalPath}"
-          ++ optional (!cfg.systemd.enable) "--postfix.logfile_path ${cfg.logfilePath}")}
+                       "--systemd.journal_path ${escapeShellArg cfg.systemd.journalPath}"
+          ++ optional (!cfg.systemd.enable) "--postfix.logfile_path ${escapeShellArg cfg.logfilePath}")}
       '';
     };
   };
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
index fe7ae8a8ac90..606c9162059a 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
@@ -59,8 +59,8 @@ in
     serviceConfig = {
       ExecStart = ''
         ${pkgs.prometheus-snmp-exporter.bin}/bin/snmp_exporter \
-          --config.file=${configFile} \
-          --log.format=${cfg.logFormat} \
+          --config.file=${escapeShellArg configFile} \
+          --log.format=${escapeShellArg cfg.logFormat} \
           --log.level=${cfg.logLevel} \
           --web.listen-address=${cfg.listenAddress}:${toString cfg.port} \
           ${concatStringsSep " \\\n  " cfg.extraFlags}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix b/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix
index 9aa0f1b85aac..8d0e8764001c 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/unifi.nix
@@ -55,8 +55,8 @@ in
         ${pkgs.prometheus-unifi-exporter}/bin/unifi_exporter \
           -telemetry.addr ${cfg.listenAddress}:${toString cfg.port} \
           -unifi.addr ${cfg.unifiAddress} \
-          -unifi.username ${cfg.unifiUsername} \
-          -unifi.password ${cfg.unifiPassword} \
+          -unifi.username ${escapeShellArg cfg.unifiUsername} \
+          -unifi.password ${escapeShellArg cfg.unifiPassword} \
           -unifi.timeout ${cfg.unifiTimeout} \
           ${optionalString cfg.unifiInsecure "-unifi.insecure" } \
           ${concatStringsSep " \\\n  " cfg.extraFlags}
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix
index 12153fa021ec..5b5a6e18fcd6 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix
@@ -74,10 +74,10 @@ in
         ${pkgs.prometheus-varnish-exporter}/bin/prometheus_varnish_exporter \
           --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
           --web.telemetry-path ${cfg.telemetryPath} \
-          --varnishstat-path ${cfg.varnishStatPath} \
+          --varnishstat-path ${escapeShellArg cfg.varnishStatPath} \
           ${concatStringsSep " \\\n  " (cfg.extraFlags
             ++ optional (cfg.healthPath != null) "--web.health-path ${cfg.healthPath}"
-            ++ optional (cfg.instance != null) "-n ${cfg.instance}"
+            ++ optional (cfg.instance != null) "-n ${escapeShellArg cfg.instance}"
             ++ optional cfg.noExit "--no-exit"
             ++ optional cfg.withGoMetrics "--with-go-metrics"
             ++ optional cfg.verbose "--verbose"
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix b/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix
index 374f83a2939d..04421fc2d25a 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/wireguard.nix
@@ -59,7 +59,7 @@ in {
           ${optionalString cfg.verbose "-v"} \
           ${optionalString cfg.singleSubnetPerField "-s"} \
           ${optionalString cfg.withRemoteIp "-r"} \
-          ${optionalString (cfg.wireguardConfig != null) "-n ${cfg.wireguardConfig}"}
+          ${optionalString (cfg.wireguardConfig != null) "-n ${escapeShellArg cfg.wireguardConfig}"}
       '';
     };
   };

From 87f87fb3e98d49bc7e48b22fb5086de75af46736 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Fri, 6 Mar 2020 01:01:22 +0100
Subject: [PATCH 2350/4636] nixos/prometheus-snmp-exporter: update log options

The allowed values have changed in bd3319d28c43580c74839a10dca5d348cc3e0b29.

0.15:
      --log.level="info"        Only log messages with the given severity or above. Valid levels: [debug, info, warn, error, fatal]
      --log.format="logger:stderr"
                                Set the log target and format. Example: "logger:syslog?appname=bob&local=7" or "logger:stdout?json=true"

0.17:
      --log.level=info          Only log messages with the given severity or above. One of: [debug, info, warn, error]
      --log.format=logfmt       Output format of log messages. One of: [logfmt, json]
---
 .../services/monitoring/prometheus/exporters/snmp.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
index 606c9162059a..ddde3c104810 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
@@ -36,15 +36,15 @@ in
     };
 
     logFormat = mkOption {
-      type = types.str;
-      default = "logger:stderr";
+      type = types.enum ["logfmt" "json"];
+      default = "logfmt";
       description = ''
-        Set the log target and format.
+        Output format of log messages.
       '';
     };
 
     logLevel = mkOption {
-      type = types.enum ["debug" "info" "warn" "error" "fatal"];
+      type = types.enum ["debug" "info" "warn" "error"];
       default = "info";
       description = ''
         Only log messages with the given severity or above.

From 2a080ac4349899a9d1d103ba42b0c8ecba95dba0 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Fri, 6 Mar 2020 01:11:21 +0100
Subject: [PATCH 2351/4636] nixos/prometheus-snmp-exporter: fix assertion

The assertion was printed when user explicitly defined only the
configurationPath option.
---
 nixos/modules/services/monitoring/prometheus/exporters.nix    | 4 +++-
 .../modules/services/monitoring/prometheus/exporters/snmp.nix | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index 36ebffa44636..e9845fc4bb86 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -197,7 +197,9 @@ in
 
   config = mkMerge ([{
     assertions = [ {
-      assertion = (cfg.snmp.configurationPath == null) != (cfg.snmp.configuration == null);
+      assertion = cfg.snmp.enable -> (
+        (cfg.snmp.configurationPath == null) != (cfg.snmp.configuration == null)
+      );
       message = ''
         Please ensure you have either `services.prometheus.exporters.snmp.configuration'
           or `services.prometheus.exporters.snmp.configurationPath' set!
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
index ddde3c104810..045e48a3d0f8 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
@@ -19,7 +19,7 @@ in
 
     configuration = mkOption {
       type = types.nullOr types.attrs;
-      default = {};
+      default = null;
       description = ''
         Snmp exporter configuration as nix attribute set. Mutually exclusive with 'configurationPath' option.
       '';
@@ -54,7 +54,7 @@ in
   serviceOpts = let
     configFile = if cfg.configurationPath != null
                  then cfg.configurationPath
-                 else "${pkgs.writeText "snmp-eporter-conf.yml" (builtins.toJSON cfg.configuration)}";
+                 else "${pkgs.writeText "snmp-exporter-conf.yml" (builtins.toJSON cfg.configuration)}";
     in {
     serviceConfig = {
       ExecStart = ''

From 3b5cf35e8bc5198cbd9f2e34a6df9c971947a7e8 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Fri, 6 Mar 2020 01:41:40 +0100
Subject: [PATCH 2352/4636] nixos/prometheus-mail-exporter: fix assertion

The assertion was printed when user explicitly defined only the
configFile option.
---
 nixos/modules/services/monitoring/prometheus/exporters.nix  | 4 +++-
 .../services/monitoring/prometheus/exporters/mail.nix       | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index e9845fc4bb86..aeed55172daf 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -205,7 +205,9 @@ in
           or `services.prometheus.exporters.snmp.configurationPath' set!
       '';
     } {
-      assertion = (cfg.mail.configFile == null) != (cfg.mail.configuration == {});
+      assertion = cfg.mail.enable -> (
+        (cfg.mail.configFile == null) != (cfg.mail.configuration == null)
+      );
       message = ''
         Please specify either 'services.prometheus.exporters.mail.configuration'
           or 'services.prometheus.exporters.mail.configFile'.
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix b/nixos/modules/services/monitoring/prometheus/exporters/mail.nix
index 7754e8fb8a6f..4d9239f7bb3d 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/mail.nix
@@ -127,8 +127,8 @@ in
       '';
     };
     configuration = mkOption {
-      type = types.submodule exporterOptions;
-      default = {};
+      type = types.nullOr (types.submodule exporterOptions);
+      default = null;
       description = ''
         Specify the mailexporter configuration file to use.
       '';
@@ -148,7 +148,7 @@ in
         ${pkgs.prometheus-mail-exporter}/bin/mailexporter \
           --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
           --config.file ${
-            if cfg.configuration != {} then configurationFile else (escapeShellArg cfg.configFile)
+            if cfg.configuration != null then configurationFile else (escapeShellArg cfg.configFile)
           } \
           ${concatStringsSep " \\\n  " cfg.extraFlags}
       '';

From e7ed7901a8c7242e4c12806547e5405e79b17aeb Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Fri, 6 Mar 2020 01:24:48 +0100
Subject: [PATCH 2353/4636] nixos/prometheus-mail-exporter: misc fixes

 - Fix misspelled option. mkRenamedOptionModule is not used because the
   option hasn't really worked before.
 - Add missing cfg.telemetryPath arg to ExecStart.
 - Fix mkdir invocation in test.
---
 .../modules/services/monitoring/prometheus/exporters/mail.nix  | 3 ++-
 nixos/tests/prometheus-exporters.nix                           | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix b/nixos/modules/services/monitoring/prometheus/exporters/mail.nix
index 4d9239f7bb3d..18c5c4dd1623 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/mail.nix
@@ -90,7 +90,7 @@ let
         Timeout until mails are considered "didn't make it".
       '';
     };
-    disableFileDelition = mkOption {
+    disableFileDeletion = mkOption {
       type = types.bool;
       default = false;
       description = ''
@@ -147,6 +147,7 @@ in
       ExecStart = ''
         ${pkgs.prometheus-mail-exporter}/bin/mailexporter \
           --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+          --web.telemetry-path ${cfg.telemetryPath} \
           --config.file ${
             if cfg.configuration != null then configurationFile else (escapeShellArg cfg.configFile)
           } \
diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix
index 3d0d00bfbe63..b84e589e84cb 100644
--- a/nixos/tests/prometheus-exporters.nix
+++ b/nixos/tests/prometheus-exporters.nix
@@ -224,7 +224,7 @@ let
           after = [ "postfix.service" ];
           requires = [ "postfix.service" ];
           preStart = ''
-            mkdir -p 0600 mail-exporter/new
+            mkdir -p -m 0700 mail-exporter/new
           '';
           serviceConfig = {
             ProtectHome = true;

From 2106ce07d651de4d816a919bb482a8d51984bfd1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2020 01:21:51 +0000
Subject: [PATCH 2354/4636] topgrade: 4.0.2 -> 4.2.0

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

diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix
index e0aba2724af2..db1938160b3d 100644
--- a/pkgs/tools/misc/topgrade/default.nix
+++ b/pkgs/tools/misc/topgrade/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "topgrade";
-  version = "4.0.2";
+  version = "4.2.0";
 
   src = fetchFromGitHub {
     owner = "r-darwish";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0kkk718s65r3j5k3a3wz9p0q1v8rjz0yshmfwxak3aw99nj9yyvq";
+    sha256 = "02rcgz1sklll0gpxjwb7y3jc6flzr4492qp72blra6a26qpb7vxp";
   };
 
-  cargoSha256 = "1g6jzbmicyqnp0dkcbw7sa36b3qxag8f596mb47wq2fl25pg0d3x";
+  cargoSha256 = "1kd4q2ddm5byf62xj923n140k9x89yf9yswwgsnvkbpvrnpl4mwj";
 
   buildInputs = lib.optional stdenv.isDarwin Foundation;
 

From f9b4b8940563318af9b53f76f1fdef6b26dfa321 Mon Sep 17 00:00:00 2001
From: Ding Xiang Fei <6884440+dingxiangfei2009@users.noreply.github.com>
Date: Fri, 6 Mar 2020 09:58:17 +0800
Subject: [PATCH 2355/4636] alsa-firmware: enable cross compilation (#63866)

Co-authored-by: Matthew Bauer <mjbauer95@gmail.com>
---
 .../linux/alsa-firmware/cross.patch           | 347 ++++++++++++++++++
 .../linux/alsa-firmware/default.nix           |   9 +-
 2 files changed, 355 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/alsa-firmware/cross.patch

diff --git a/pkgs/os-specific/linux/alsa-firmware/cross.patch b/pkgs/os-specific/linux/alsa-firmware/cross.patch
new file mode 100644
index 000000000000..989ccea2b984
--- /dev/null
+++ b/pkgs/os-specific/linux/alsa-firmware/cross.patch
@@ -0,0 +1,347 @@
+--- a/hdsploader/Makefile.am	2015-02-26 20:36:03.000000000 +0800
++++ b/hdsploader/Makefile.am	2019-06-28 00:43:41.557803832 +0800
+@@ -32,5 +32,14 @@
+ 	     tobin.c
+ CLEANFILES = $(dsp_hex_files)
+ 
+-$(dsp_hex_files): tobin
+-	./tobin
++LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
++
++$(tobin_OBJECTS) : CC=$(CC_FOR_BUILD)
++$(tobin_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
++$(tobin_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
++
++tobin$(BUILD_EXEEXT): $(tobin_OBJECTS)
++	$(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@
++
++$(dsp_hex_files): tobin$(BUILD_EXEEXT)
++	./$<
+--- a/m4/ax_prog_cc_for_build.m4	2019-06-27 15:50:02.274134717 +0800
++++ b/m4/ax_prog_cc_for_build.m4	2019-06-28 01:32:45.088117432 +0800
+@@ -0,0 +1,125 @@
++# ===========================================================================
++#   https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_PROG_CC_FOR_BUILD
++#
++# DESCRIPTION
++#
++#   This macro searches for a C compiler that generates native executables,
++#   that is a C compiler that surely is not a cross-compiler. This can be
++#   useful if you have to generate source code at compile-time like for
++#   example GCC does.
++#
++#   The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything
++#   needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD).
++#   The value of these variables can be overridden by the user by specifying
++#   a compiler with an environment variable (like you do for standard CC).
++#
++#   It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object
++#   file extensions for the build platform, and GCC_FOR_BUILD to `yes' if
++#   the compiler we found is GCC. All these variables but GCC_FOR_BUILD are
++#   substituted in the Makefile.
++#
++# LICENSE
++#
++#   Copyright (c) 2008 Paolo Bonzini <bonzini@gnu.org>
++#
++#   Copying and distribution of this file, with or without modification, are
++#   permitted in any medium without royalty provided the copyright notice
++#   and this notice are preserved. This file is offered as-is, without any
++#   warranty.
++
++#serial 9
++
++AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
++AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_PROG_CPP])dnl
++AC_REQUIRE([AC_EXEEXT])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++
++dnl Use the standard macros, but make them use other variable names
++dnl
++pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
++pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
++pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
++pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl
++pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl
++pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl
++pushdef([ac_cv_objext], ac_cv_build_objext)dnl
++pushdef([ac_exeext], ac_build_exeext)dnl
++pushdef([ac_objext], ac_build_objext)dnl
++pushdef([CC], CC_FOR_BUILD)dnl
++pushdef([CPP], CPP_FOR_BUILD)dnl
++pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl
++pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl
++pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl
++pushdef([host], build)dnl
++pushdef([host_alias], build_alias)dnl
++pushdef([host_cpu], build_cpu)dnl
++pushdef([host_vendor], build_vendor)dnl
++pushdef([host_os], build_os)dnl
++pushdef([ac_cv_host], ac_cv_build)dnl
++pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl
++pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl
++pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl
++pushdef([ac_cv_host_os], ac_cv_build_os)dnl
++pushdef([ac_cpp], ac_build_cpp)dnl
++pushdef([ac_compile], ac_build_compile)dnl
++pushdef([ac_link], ac_build_link)dnl
++
++save_cross_compiling=$cross_compiling
++save_ac_tool_prefix=$ac_tool_prefix
++cross_compiling=no
++ac_tool_prefix=
++
++AC_PROG_CC
++AC_PROG_CPP
++AC_EXEEXT
++
++ac_tool_prefix=$save_ac_tool_prefix
++cross_compiling=$save_cross_compiling
++
++dnl Restore the old definitions
++dnl
++popdef([ac_link])dnl
++popdef([ac_compile])dnl
++popdef([ac_cpp])dnl
++popdef([ac_cv_host_os])dnl
++popdef([ac_cv_host_vendor])dnl
++popdef([ac_cv_host_cpu])dnl
++popdef([ac_cv_host_alias])dnl
++popdef([ac_cv_host])dnl
++popdef([host_os])dnl
++popdef([host_vendor])dnl
++popdef([host_cpu])dnl
++popdef([host_alias])dnl
++popdef([host])dnl
++popdef([LDFLAGS])dnl
++popdef([CPPFLAGS])dnl
++popdef([CFLAGS])dnl
++popdef([CPP])dnl
++popdef([CC])dnl
++popdef([ac_objext])dnl
++popdef([ac_exeext])dnl
++popdef([ac_cv_objext])dnl
++popdef([ac_cv_exeext])dnl
++popdef([ac_cv_prog_cc_g])dnl
++popdef([ac_cv_prog_cc_cross])dnl
++popdef([ac_cv_prog_cc_works])dnl
++popdef([ac_cv_prog_gcc])dnl
++popdef([ac_cv_prog_CPP])dnl
++
++dnl Finally, set Makefile variables
++dnl
++BUILD_EXEEXT=$ac_build_exeext
++BUILD_OBJEXT=$ac_build_objext
++AC_SUBST(BUILD_EXEEXT)dnl
++AC_SUBST(BUILD_OBJEXT)dnl
++AC_SUBST([CFLAGS_FOR_BUILD])dnl
++AC_SUBST([CPPFLAGS_FOR_BUILD])dnl
++AC_SUBST([LDFLAGS_FOR_BUILD])dnl
++])
+--- a/configure.ac	2019-06-27 23:58:31.045413144 +0800
++++ b/configure.ac	2019-06-28 01:45:36.511771656 +0800
+@@ -1,6 +1,8 @@
+ AC_PREREQ(2.59)
+ AC_INIT(alsa-firmware, 1.0.29)
++AC_CONFIG_MACRO_DIR([m4])
+ AC_PROG_CC
++AC_PROG_CC_FOR_BUILD
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_HEADER_STDC
+--- a/vxloader/Makefile.am	2015-02-26 20:36:03.000000000 +0800
++++ b/vxloader/Makefile.am	2019-06-28 01:55:19.525947146 +0800
+@@ -43,5 +43,14 @@
+ hotplugfw_DATA = 
+ endif
+ 
+-%.xlx: %.rbt toxlx
+-	./toxlx < $< > $@
++LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
++
++$(toxlx_OBJECTS) : CC=$(CC_FOR_BUILD)
++$(toxlx_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
++$(toxlx_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
++
++toxlx$(BUILD_EXEEXT): $(toxlx_OBJECTS)
++	$(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@
++
++%.xlx: %.rbt toxlx$(BUILD_EXEEXT)
++	./toxlx$(BUILD_EXEEXT) < $< > $@
+--- a/echoaudio/Makefile.am	2015-02-26 20:36:03.000000000 +0800
++++ b/echoaudio/Makefile.am	2019-06-28 02:00:00.579426080 +0800
+@@ -74,33 +74,42 @@
+ hotplugfw_DATA = 
+ endif
+ 
+-$(firmware_files): fw_writer
+-	./fw_writer DSP/LoaderDSP.c loader_dsp.fw
+-	./fw_writer DSP/Darla20DSP.c darla20_dsp.fw
+-	./fw_writer DSP/Gina20DSP.c gina20_dsp.fw
+-	./fw_writer DSP/Layla20DSP.c layla20_dsp.fw
+-	./fw_writer ASIC/LaylaASIC.c layla20_asic.fw
+-	./fw_writer DSP/Darla24DSP.c darla24_dsp.fw
+-	./fw_writer DSP/Gina24DSP.c gina24_301_dsp.fw
+-	./fw_writer ASIC/Gina24ASIC.c gina24_301_asic.fw
+-	./fw_writer DSP/Gina24_361DSP.c gina24_361_dsp.fw
+-	./fw_writer ASIC/Gina24ASIC_361.c gina24_361_asic.fw
+-	./fw_writer DSP/Layla24DSP.c layla24_dsp.fw
+-	./fw_writer ASIC/Layla24_1ASIC.c layla24_1_asic.fw
+-	./fw_writer ASIC/Layla24_2A_ASIC.c layla24_2A_asic.fw
+-	./fw_writer ASIC/Layla24_2S_ASIC.c layla24_2S_asic.fw
+-	./fw_writer DSP/MonaDSP.c mona_301_dsp.fw
+-	./fw_writer ASIC/Mona1ASIC48.c mona_301_1_asic_48.fw
+-	./fw_writer ASIC/Mona1ASIC96.c mona_301_1_asic_96.fw
+-	./fw_writer DSP/Mona361DSP.c mona_361_dsp.fw
+-	./fw_writer ASIC/Mona1ASIC48_361.c mona_361_1_asic_48.fw
+-	./fw_writer ASIC/Mona1ASIC96_361.c mona_361_1_asic_96.fw
+-	./fw_writer ASIC/Mona2ASIC.c mona_2_asic.fw
+-	./fw_writer DSP/MiaDSP.c mia_dsp.fw
+-	./fw_writer DSP/Echo3gDSP.c echo3g_dsp.fw
+-	./fw_writer ASIC/3G_ASIC.c 3g_asic.fw
+-	./fw_writer DSP/IndigoDSP.c indigo_dsp.fw
+-	./fw_writer DSP/IndigoIODSP.c indigo_io_dsp.fw
+-	./fw_writer DSP/IndigoIOxDSP.c indigo_iox_dsp.fw
+-	./fw_writer DSP/IndigoDJDSP.c indigo_dj_dsp.fw
+-	./fw_writer DSP/IndigoDJxDSP.c indigo_djx_dsp.fw
++LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
++
++$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD)
++$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
++$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
++
++fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS)
++	$(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@
++
++$(firmware_files): fw_writer$(BUILD_EXEEXT)
++	./fw_writer$(BUILD_EXEEXT) DSP/LoaderDSP.c loader_dsp.fw
++	./fw_writer$(BUILD_EXEEXT) DSP/Darla20DSP.c darla20_dsp.fw
++	./fw_writer$(BUILD_EXEEXT) DSP/Gina20DSP.c gina20_dsp.fw
++	./fw_writer$(BUILD_EXEEXT) DSP/Layla20DSP.c layla20_dsp.fw
++	./fw_writer$(BUILD_EXEEXT) ASIC/LaylaASIC.c layla20_asic.fw
++	./fw_writer$(BUILD_EXEEXT) DSP/Darla24DSP.c darla24_dsp.fw
++	./fw_writer$(BUILD_EXEEXT) DSP/Gina24DSP.c gina24_301_dsp.fw
++	./fw_writer$(BUILD_EXEEXT) ASIC/Gina24ASIC.c gina24_301_asic.fw
++	./fw_writer$(BUILD_EXEEXT) DSP/Gina24_361DSP.c gina24_361_dsp.fw
++	./fw_writer$(BUILD_EXEEXT) ASIC/Gina24ASIC_361.c gina24_361_asic.fw
++	./fw_writer$(BUILD_EXEEXT) DSP/Layla24DSP.c layla24_dsp.fw
++	./fw_writer$(BUILD_EXEEXT) ASIC/Layla24_1ASIC.c layla24_1_asic.fw
++	./fw_writer$(BUILD_EXEEXT) ASIC/Layla24_2A_ASIC.c layla24_2A_asic.fw
++	./fw_writer$(BUILD_EXEEXT) ASIC/Layla24_2S_ASIC.c layla24_2S_asic.fw
++	./fw_writer$(BUILD_EXEEXT) DSP/MonaDSP.c mona_301_dsp.fw
++	./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC48.c mona_301_1_asic_48.fw
++	./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC96.c mona_301_1_asic_96.fw
++	./fw_writer$(BUILD_EXEEXT) DSP/Mona361DSP.c mona_361_dsp.fw
++	./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC48_361.c mona_361_1_asic_48.fw
++	./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC96_361.c mona_361_1_asic_96.fw
++	./fw_writer$(BUILD_EXEEXT) ASIC/Mona2ASIC.c mona_2_asic.fw
++	./fw_writer$(BUILD_EXEEXT) DSP/MiaDSP.c mia_dsp.fw
++	./fw_writer$(BUILD_EXEEXT) DSP/Echo3gDSP.c echo3g_dsp.fw
++	./fw_writer$(BUILD_EXEEXT) ASIC/3G_ASIC.c 3g_asic.fw
++	./fw_writer$(BUILD_EXEEXT) DSP/IndigoDSP.c indigo_dsp.fw
++	./fw_writer$(BUILD_EXEEXT) DSP/IndigoIODSP.c indigo_io_dsp.fw
++	./fw_writer$(BUILD_EXEEXT) DSP/IndigoIOxDSP.c indigo_iox_dsp.fw
++	./fw_writer$(BUILD_EXEEXT) DSP/IndigoDJDSP.c indigo_dj_dsp.fw
++	./fw_writer$(BUILD_EXEEXT) DSP/IndigoDJxDSP.c indigo_djx_dsp.fw
+--- a/emu/Makefile.am	2015-02-26 20:36:03.000000000 +0800
++++ b/emu/Makefile.am	2019-06-28 02:01:37.856710042 +0800
+@@ -22,5 +22,14 @@
+ hotplugfw_DATA = 
+ endif
+ 
+-$(firmware_files): fw_writer
+-	./fw_writer
++LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
++
++$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD)
++$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
++$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
++
++fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS)
++	$(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@
++
++$(firmware_files): fw_writer$(BUILD_EXEEXT)
++	./fw_writer$(BUILD_EXEEXT)
+--- a/maestro3/Makefile.am	2015-02-26 20:36:03.000000000 +0800
++++ b/maestro3/Makefile.am	2019-06-28 02:03:13.704828106 +0800
+@@ -17,5 +17,14 @@
+ hotplugfw_DATA =
+ endif
+ 
+-$(firmware_files): fw_writer
+-	./fw_writer
++LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
++
++$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD)
++$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
++$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
++
++fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS)
++	$(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@
++
++$(firmware_files): fw_writer$(BUILD_EXEEXT)
++	./fw_writer$(BUILD_EXEEXT)
+--- a/sb16/Makefile.am	2015-02-26 20:36:03.000000000 +0800
++++ b/sb16/Makefile.am	2019-06-28 02:04:37.121743871 +0800
+@@ -18,5 +18,14 @@
+ hotplugfw_DATA =
+ endif
+ 
+-$(firmware_files): fw_writer
+-	./fw_writer
++LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
++
++$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD)
++$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
++$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
++
++fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS)
++	$(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@
++
++$(firmware_files): fw_writer$(BUILD_EXEEXT)
++	./fw_writer$(BUILD_EXEEXT)
+--- a/wavefront/Makefile.am	2019-06-28 02:07:27.003727160 +0800
++++ b/wavefront/Makefile.am	2019-06-28 02:07:46.477947626 +0800
+@@ -17,5 +17,14 @@
+ hotplugfw_DATA =
+ endif
+ 
+-$(firmware_files): fw_writer
+-	./fw_writer
++LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
++
++$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD)
++$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
++$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
++
++fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS)
++	$(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@
++
++$(firmware_files): fw_writer$(BUILD_EXEEXT)
++	./fw_writer$(BUILD_EXEEXT)
+--- a/ymfpci/Makefile.am	2015-02-26 20:36:03.000000000 +0800
++++ b/ymfpci/Makefile.am	2019-06-28 02:09:02.487797826 +0800
+@@ -17,5 +17,14 @@
+ hotplugfw_DATA =
+ endif
+ 
+-$(firmware_files): fw_writer
+-	./fw_writer
++LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD)
++
++$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD)
++$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD)
++$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
++
++fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS)
++	$(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@
++
++$(firmware_files): fw_writer$(BUILD_EXEEXT)
++	./fw_writer$(BUILD_EXEEXT)
diff --git a/pkgs/os-specific/linux/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-firmware/default.nix
index 7f0ba5498df6..d0a3d7645b32 100644
--- a/pkgs/os-specific/linux/alsa-firmware/default.nix
+++ b/pkgs/os-specific/linux/alsa-firmware/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{ stdenv, buildPackages, autoreconfHook, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
   name = "alsa-firmware-1.2.1";
@@ -8,6 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "1aq8z8ajpjvcx7bwhwp36bh5idzximyn77ygk3ifs0my3mbpr8mf";
   };
 
+  patches = [ (fetchpatch {
+    url = "https://github.com/alsa-project/alsa-firmware/commit/a8a478485a999ff9e4a8d8098107d3b946b70288.patch";
+    sha256 = "0zd7vrgz00hn02va5bkv7qj2395a1rl6f8jq1mwbryxs7hiysb78";
+  }) ];
+
+  nativeBuildInputs = [ autoreconfHook buildPackages.stdenv.cc ];
+
   configureFlags = [
     "--with-hotplug-dir=$(out)/lib/firmware"
   ];

From 66aea3292fe073f7574183d31ee6dc1819f3d583 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 6 Mar 2020 07:39:41 +1000
Subject: [PATCH 2356/4636] crun: 0.12.2.1 -> 0.13

https://github.com/containers/crun/releases/tag/0.13
---
 pkgs/applications/virtualization/crun/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix
index c82e29eb9a64..35b88d7e4474 100644
--- a/pkgs/applications/virtualization/crun/default.nix
+++ b/pkgs/applications/virtualization/crun/default.nix
@@ -33,13 +33,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "crun";
-  version = "0.12.2.1";
+  version = "0.13";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = version;
-    sha256 = "16hjkkr1fp542ycyp87pj626mzfrza5mcb82hhkp4a8m8bqmpzp4";
+    sha256 = "0c5acf916yv2zv3xjvxk1sa4h3n2wljc5hw61php7q37pbjc1ppn";
     fetchSubmodules = true;
   };
 
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "A fast and lightweight fully featured OCI runtime and C library for running containers";
-    license = licenses.gpl3;
+    license = licenses.gpl2Plus;
     platforms = platforms.linux;
     inherit (src.meta) homepage;
   };

From ced888aea6ba20694f713174e27d82b2252b40ab Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2020 02:26:57 +0000
Subject: [PATCH 2357/4636] xxHash: 0.7.2 -> 0.7.3

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

diff --git a/pkgs/development/libraries/xxHash/default.nix b/pkgs/development/libraries/xxHash/default.nix
index 1ea25fb7209d..9d2ed44cb4bb 100644
--- a/pkgs/development/libraries/xxHash/default.nix
+++ b/pkgs/development/libraries/xxHash/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xxHash";
-  version = "0.7.2";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "Cyan4973";
     repo = "xxHash";
     rev = "v${version}";
-    sha256 = "1f9gl0cymmi92ihsfan0p4zmyf2hxwx4arjimpbmbp719nbcvdsx";
+    sha256 = "0bin0jch6lbzl4f8y052a7azfgq2n7iwqihzgqmcccv5vq4vcx5a";
   };
 
   outputs = [ "out" "dev" ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       highly portable, and hashes are identical on all platforms (little / big
       endian).
     '';
-    homepage = https://github.com/Cyan4973/xxHash;
+    homepage = "https://github.com/Cyan4973/xxHash";
     license = with licenses; [ bsd2 gpl2 ];
     maintainers = with maintainers; [ orivej ];
     platforms = platforms.unix;

From d05f8b3a9556d788ea0b9101cd8df9d7fd4d0769 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 6 Mar 2020 11:49:52 +0800
Subject: [PATCH 2358/4636] pdf2djvu: 0.9.14 -> 0.9.17

---
 pkgs/tools/typesetting/pdf2djvu/default.nix | 64 +++++++++++++--------
 1 file changed, 41 insertions(+), 23 deletions(-)

diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix
index 1090ad300f73..cbd4fa569d19 100644
--- a/pkgs/tools/typesetting/pdf2djvu/default.nix
+++ b/pkgs/tools/typesetting/pdf2djvu/default.nix
@@ -1,42 +1,60 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }:
+{ stdenv
+, lib
+, fetchFromGitHub
+, autoreconfHook
+, gettext
+, libtool
+, pkgconfig
+, djvulibre
+, exiv2
+, fontconfig
+, graphicsmagick
+, libjpeg
+, libuuid
+, poppler
+}:
 
 stdenv.mkDerivation rec {
-  version = "0.9.14";
+  version = "0.9.17";
   pname = "pdf2djvu";
 
-  src = fetchurl {
-    url = "https://github.com/jwilk/pdf2djvu/releases/download/${version}/${pname}-${version}.tar.xz";
-    sha256 = "05z2bbg54pfsi668fwcjrcr5iz9llf9gprzdsrn6fw5wjv4876zi";
+  src = fetchFromGitHub {
+    owner = "jwilk";
+    repo = "pdf2djvu";
+    rev = version;
+    sha256 = "1iff5ha5ls9hni9ivj05r1vzbnjrb326ivjb8d05q2sfng3gfp3z";
   };
 
-  patches = [
-    # fix build with Poppler 0.83
-    (fetchpatch {
-      url = "https://github.com/jwilk/pdf2djvu/commit/0aa17bb79dbcdfc249e4841f5b5398e27cfdfd41.patch";
-      sha256 = "0mr14nz5w7z4ri2556bxkf3cnn2f7dhwsld7csrh6z5qqb7d5805";
-    })
-    (fetchpatch {
-      url = "https://github.com/jwilk/pdf2djvu/commit/27b9e028091a2f370367e9eaf37b4bb1cde87b62.patch";
-      sha256 = "03apsg1487jl800q8j70hicvg6xsndd593bg7babm4vgivkxb0da";
-    })
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  buildInputs = [
+    djvulibre
+    exiv2
+    fontconfig
+    graphicsmagick
+    libjpeg
+    libuuid
+    poppler
   ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  postPatch = ''
+    substituteInPlace private/autogen \
+      --replace /usr/share/gettext ${gettext}/share/gettext \
+      --replace /usr/share/libtool ${libtool}/share/libtool
 
-  buildInputs = [ djvulibre poppler fontconfig libjpeg ];
+    substituteInPlace configure.ac \
+      --replace '$djvulibre_bin_path' ${djvulibre.bin}/bin
+  '';
 
-  preConfigure = ''
-    sed -i 's#\$djvulibre_bin_path#${djvulibre.bin}/bin#g' configure
-
-    # Configure skips the failing check for usability of windres when it is nonempty.
-    unset WINDRES
+  preAutoreconf = ''
+    private/autogen
   '';
 
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "Creates djvu files from PDF files";
-    homepage = https://jwilk.net/software/pdf2djvu;
+    homepage = "https://jwilk.net/software/pdf2djvu";
     license = licenses.gpl2;
     maintainers = with maintainers; [ pSub ];
     inherit version;

From ee39e49b680fa654684ebf00b10cf34ca5c49896 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Mon, 10 Feb 2020 22:28:47 -0500
Subject: [PATCH 2359/4636] stdenv: update ARM bootstrap tarballs

Fixes building glibc 2.30, which requires at least GCC 6.

Picked from the following cross-trunk evaluation:
https://hydra.nixos.org/eval/1568864 based on nixpkgs
commit ac241fb7a57.

armv5tel job: https://hydra.nixos.org/build/111556418
armv6l job: https://hydra.nixos.org/build/111556521
armv7l job: https://hydra.nixos.org/build/111556551
---
 pkgs/stdenv/linux/bootstrap-files/armv5tel.nix | 8 ++++----
 pkgs/stdenv/linux/bootstrap-files/armv6l.nix   | 8 ++++----
 pkgs/stdenv/linux/bootstrap-files/armv7l.nix   | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix b/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
index 37471e9ce426..c5426431b3ce 100644
--- a/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
+++ b/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
@@ -1,12 +1,12 @@
 {
   busybox = import <nix/fetchurl.nix> {
-    url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv5tel/busybox;
-    sha256 = "00mxas5xg2j9n1g0q0nklr0dy87qqxk0jja5qz1yi7xl7zzsnpnw";
+    url = https://hydra.nixos.org/build/112609163/download/2/busybox;
+    sha256 = "0dc5471dc6a5f69ad98eb7445f51a61e88aa5792d7a677025bf012bdb513b763";
     executable = true;
   };
 
   bootstrapTools = import <nix/fetchurl.nix> {
-    url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv5tel/bootstrap-tools.tar.xz;
-    sha256 = "0fhiy9l3mbmlhpkby31c2s63bhjiqx25qqr3wdp8cb7fxz8ayx2f";
+    url = https://hydra.nixos.org/build/112609163/download/1/bootstrap-tools.tar.xz;
+    sha256 = "ca0564eca4eb944649ce10ec70859640427bf2241243af62812b163176487e02";
   };
 }
diff --git a/pkgs/stdenv/linux/bootstrap-files/armv6l.nix b/pkgs/stdenv/linux/bootstrap-files/armv6l.nix
index 447189756821..caf7df66cef6 100644
--- a/pkgs/stdenv/linux/bootstrap-files/armv6l.nix
+++ b/pkgs/stdenv/linux/bootstrap-files/armv6l.nix
@@ -1,12 +1,12 @@
 {
   busybox = import <nix/fetchurl.nix> {
-    url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv6l/busybox;
-    sha256 = "06n8dy8y2v28yx9ws8x64wxrvn9pszgpd299hc90nv9x21m79jzd";
+    url = https://hydra.nixos.org/build/112609441/download/2/busybox;
+    sha256 = "e6f6aecb675e924a96516f4379445dd2c0ba8b9c438fbfbaa2dc14ccce2802e0";
     executable = true;
   };
 
   bootstrapTools = import <nix/fetchurl.nix> {
-    url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv6l/bootstrap-tools.tar.xz;
-    sha256 = "1gg2q3sw81vi65g1gmpvx0nnd6hxb76vlz73wfp292m90z1mym7f";
+    url = https://hydra.nixos.org/build/112609441/download/1/bootstrap-tools.tar.xz;
+    sha256 = "7a3f20def1a17ebf0edb5a92c403558429bcc2ac3d931b5e1bd88606cb217778";
   };
 }
diff --git a/pkgs/stdenv/linux/bootstrap-files/armv7l.nix b/pkgs/stdenv/linux/bootstrap-files/armv7l.nix
index b97fd9967eae..67bca39eaf68 100644
--- a/pkgs/stdenv/linux/bootstrap-files/armv7l.nix
+++ b/pkgs/stdenv/linux/bootstrap-files/armv7l.nix
@@ -1,12 +1,12 @@
 {
   busybox = import <nix/fetchurl.nix> {
-    url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv7l/busybox;
-    sha256 = "187xwzsng5lpak1nanrk88y4mlydmrbhx6la00rrd6kjx376s565";
+    url = https://hydra.nixos.org/build/112609103/download/2/busybox;
+    sha256 = "566a469dac214b31e4abdb0a91d32550bab1be5858d329e1b6074eef05370ca3";
     executable = true;
   };
 
   bootstrapTools = import <nix/fetchurl.nix> {
-    url = http://nixos-arm.dezgeg.me/bootstrap-2017-04-13-1f32d4b4/armv7l/bootstrap-tools.tar.xz;
-    sha256 = "05ayki2kak3i5lw97qidd5h9jv00dmlhx9h7l771bj331yamyqdn";
+    url = https://hydra.nixos.org/build/112609103/download/1/bootstrap-tools.tar.xz;
+    sha256 = "79fa2d7722aeb856c7c9b62a3fd64b6d261fd6f6bcbac486f0a2a7d823210550";
   };
 }

From 05fc2a35240d4bdae638e273b56a2ff2722a40a9 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Tue, 18 Feb 2020 22:33:36 -0500
Subject: [PATCH 2360/4636] unpack-bootstrap-tools: remove obsolete linker
 script patching

The linker scripts no longer contain store paths, so this does nothing. More
importantly, libpthread.so is not longer a linker script on ARM, so the patching
would corrupt it.
---
 .../linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh
index 64583f80fa8f..f394869ea915 100644
--- a/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh
+++ b/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh
@@ -35,12 +35,7 @@ for i in $out/lib/librt-*.so $out/lib/libpcre*; do
     $out/bin/patchelf --set-rpath $out/lib --force-rpath "$i"
 done
 
-# Fix the libc linker script.
 export PATH=$out/bin
-cat $out/lib/libc.so | sed "s|/nix/store/e*-[^/]*/|$out/|g" > $out/lib/libc.so.tmp
-mv $out/lib/libc.so.tmp $out/lib/libc.so
-cat $out/lib/libpthread.so | sed "s|/nix/store/e*-[^/]*/|$out/|g" > $out/lib/libpthread.so.tmp
-mv $out/lib/libpthread.so.tmp $out/lib/libpthread.so
 
 # Provide some additional symlinks.
 ln -s bash $out/bin/sh

From 7cc68a961d8fac4eee14c7a888f08c915a7c2f51 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Sun, 16 Feb 2020 11:17:31 +0100
Subject: [PATCH 2361/4636] gnupg: apply patch to allow import of key updates
 without user ids

This adds a patch series which allows GnuPG to import updates
(revocations and subkeys) from certificates that contain no user ids.
This is relevant for refreshing keys from the default keyserver
keys.openpgp.org, where only user ids that contain verified email
addresses will be distributed, and revoked keys never contain any user
ids.

This patch series was originally authored and submitted to upstream half
a year ago (by me), but now comes from Debian packaging where it's been
included since then.

Relates to the following upstream issue: https://dev.gnupg.org/T4393
---
 pkgs/tools/security/gnupg/22.nix              |   3 +
 ...th-a-good-revocation-but-no-self-sig.patch |  32 +++
 ...reviously-known-keys-even-without-UI.patch | 106 +++++++++
 ...dd-test-cases-for-import-without-uid.patch | 201 ++++++++++++++++++
 4 files changed, 342 insertions(+)
 create mode 100644 pkgs/tools/security/gnupg/accept-subkeys-with-a-good-revocation-but-no-self-sig.patch
 create mode 100644 pkgs/tools/security/gnupg/allow-import-of-previously-known-keys-even-without-UI.patch
 create mode 100644 pkgs/tools/security/gnupg/tests-add-test-cases-for-import-without-uid.patch

diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix
index 9aa92fd6829f..203f50a9c0e9 100644
--- a/pkgs/tools/security/gnupg/22.nix
+++ b/pkgs/tools/security/gnupg/22.nix
@@ -33,6 +33,9 @@ stdenv.mkDerivation rec {
   patches = [
     ./fix-libusb-include-path.patch
     ./0001-dirmngr-Only-use-SKS-pool-CA-for-SKS-pool.patch
+    ./tests-add-test-cases-for-import-without-uid.patch
+    ./allow-import-of-previously-known-keys-even-without-UI.patch
+    ./accept-subkeys-with-a-good-revocation-but-no-self-sig.patch
   ];
   postPatch = ''
     sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' \
diff --git a/pkgs/tools/security/gnupg/accept-subkeys-with-a-good-revocation-but-no-self-sig.patch b/pkgs/tools/security/gnupg/accept-subkeys-with-a-good-revocation-but-no-self-sig.patch
new file mode 100644
index 000000000000..5cbec92ae683
--- /dev/null
+++ b/pkgs/tools/security/gnupg/accept-subkeys-with-a-good-revocation-but-no-self-sig.patch
@@ -0,0 +1,32 @@
+From: Vincent Breitmoser <look@my.amazin.horse>
+Date: Thu, 13 Jun 2019 21:27:43 +0200
+Subject: gpg: accept subkeys with a good revocation but no self-sig during
+ import
+
+* g10/import.c (chk_self_sigs): Set the NODE_GOOD_SELFSIG flag when we
+encounter a valid revocation signature. This allows import of subkey
+revocation signatures, even in the absence of a corresponding subkey
+binding signature.
+
+--
+
+This fixes the remaining test in import-incomplete.scm.
+
+GnuPG-Bug-id: 4393
+Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+---
+ g10/import.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/g10/import.c b/g10/import.c
+index 4fdf248..ee2fed8 100644
+--- a/g10/import.c
++++ b/g10/import.c
+@@ -3613,6 +3613,7 @@ chk_self_sigs (ctrl_t ctrl, kbnode_t keyblock, u32 *keyid, int *non_self)
+                   /* It's valid, so is it newer? */
+                   if (sig->timestamp >= rsdate)
+                     {
++                      knode->flag |= NODE_GOOD_SELFSIG; /* Subkey is valid.  */
+                       if (rsnode)
+                         {
+                           /* Delete the last revocation sig since
diff --git a/pkgs/tools/security/gnupg/allow-import-of-previously-known-keys-even-without-UI.patch b/pkgs/tools/security/gnupg/allow-import-of-previously-known-keys-even-without-UI.patch
new file mode 100644
index 000000000000..723a6952044e
--- /dev/null
+++ b/pkgs/tools/security/gnupg/allow-import-of-previously-known-keys-even-without-UI.patch
@@ -0,0 +1,106 @@
+From: Vincent Breitmoser <look@my.amazin.horse>
+Date: Thu, 13 Jun 2019 21:27:42 +0200
+Subject: gpg: allow import of previously known keys, even without UIDs
+
+* g10/import.c (import_one): Accept an incoming OpenPGP certificate that
+has no user id, as long as we already have a local variant of the cert
+that matches the primary key.
+
+--
+
+This fixes two of the three broken tests in import-incomplete.scm.
+
+GnuPG-Bug-id: 4393
+Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+---
+ g10/import.c | 44 +++++++++++---------------------------------
+ 1 file changed, 11 insertions(+), 33 deletions(-)
+
+diff --git a/g10/import.c b/g10/import.c
+index 95d419a..4fdf248 100644
+--- a/g10/import.c
++++ b/g10/import.c
+@@ -1792,7 +1792,6 @@ import_one_real (ctrl_t ctrl,
+   size_t an;
+   char pkstrbuf[PUBKEY_STRING_SIZE];
+   int merge_keys_done = 0;
+-  int any_filter = 0;
+   KEYDB_HANDLE hd = NULL;
+ 
+   if (r_valid)
+@@ -1829,14 +1828,6 @@ import_one_real (ctrl_t ctrl,
+       log_printf ("\n");
+     }
+ 
+-
+-  if (!uidnode )
+-    {
+-      if (!silent)
+-        log_error( _("key %s: no user ID\n"), keystr_from_pk(pk));
+-      return 0;
+-    }
+-
+   if (screener && screener (keyblock, screener_arg))
+     {
+       log_error (_("key %s: %s\n"), keystr_from_pk (pk),
+@@ -1911,17 +1902,10 @@ import_one_real (ctrl_t ctrl,
+ 	  }
+     }
+ 
+-  if (!delete_inv_parts (ctrl, keyblock, keyid, options ) )
+-    {
+-      if (!silent)
+-        {
+-          log_error( _("key %s: no valid user IDs\n"), keystr_from_pk(pk));
+-          if (!opt.quiet )
+-            log_info(_("this may be caused by a missing self-signature\n"));
+-        }
+-      stats->no_user_id++;
+-      return 0;
+-    }
++  /* Delete invalid parts, and note if we have any valid ones left.
++   * We will later abort import if this key is new but contains
++   * no valid uids.  */
++  delete_inv_parts (ctrl, keyblock, keyid, options);
+ 
+   /* Get rid of deleted nodes.  */
+   commit_kbnode (&keyblock);
+@@ -1931,24 +1915,11 @@ import_one_real (ctrl_t ctrl,
+     {
+       apply_keep_uid_filter (ctrl, keyblock, import_filter.keep_uid);
+       commit_kbnode (&keyblock);
+-      any_filter = 1;
+     }
+   if (import_filter.drop_sig)
+     {
+       apply_drop_sig_filter (ctrl, keyblock, import_filter.drop_sig);
+       commit_kbnode (&keyblock);
+-      any_filter = 1;
+-    }
+-
+-  /* If we ran any filter we need to check that at least one user id
+-   * is left in the keyring.  Note that we do not use log_error in
+-   * this case. */
+-  if (any_filter && !any_uid_left (keyblock))
+-    {
+-      if (!opt.quiet )
+-        log_info ( _("key %s: no valid user IDs\n"), keystr_from_pk (pk));
+-      stats->no_user_id++;
+-      return 0;
+     }
+ 
+   /* The keyblock is valid and ready for real import.  */
+@@ -2006,6 +1977,13 @@ import_one_real (ctrl_t ctrl,
+       err = 0;
+       stats->skipped_new_keys++;
+     }
++  else if (err && !any_uid_left (keyblock))
++    {
++      if (!silent)
++        log_info( _("key %s: new key but contains no user ID - skipped\n"), keystr(keyid));
++      err = 0;
++      stats->no_user_id++;
++    }
+   else if (err)  /* Insert this key. */
+     {
+       /* Note: ERR can only be NO_PUBKEY or UNUSABLE_PUBKEY.  */
diff --git a/pkgs/tools/security/gnupg/tests-add-test-cases-for-import-without-uid.patch b/pkgs/tools/security/gnupg/tests-add-test-cases-for-import-without-uid.patch
new file mode 100644
index 000000000000..37ddeea22495
--- /dev/null
+++ b/pkgs/tools/security/gnupg/tests-add-test-cases-for-import-without-uid.patch
@@ -0,0 +1,201 @@
+From: Vincent Breitmoser <look@my.amazin.horse>
+Date: Thu, 13 Jun 2019 21:27:41 +0200
+Subject: tests: add test cases for import without uid
+
+This commit adds a test case that does the following, in order:
+- Import of a primary key plus user id
+- Check that import of a subkey works, without a user id present in the
+imported key
+- Check that import of a subkey revocation works, without a user id or
+subkey binding signature present in the imported key
+- Check that import of a primary key revocation works, without a user id
+present in the imported key
+
+--
+
+Note that this test currently fails.  The following changesets will
+fix gpg so that the tests pass.
+
+GnuPG-Bug-id: 4393
+Signed-Off-By: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+---
+ tests/openpgp/Makefile.am                          |  1 +
+ tests/openpgp/import-incomplete.scm                | 68 ++++++++++++++++++++++
+ .../import-incomplete/primary+revocation.asc       |  9 +++
+ .../primary+subkey+sub-revocation.asc              | 10 ++++
+ .../import-incomplete/primary+subkey+sub-sig.asc   | 10 ++++
+ .../openpgp/import-incomplete/primary+uid-sig.asc  | 10 ++++
+ tests/openpgp/import-incomplete/primary+uid.asc    | 10 ++++
+ 7 files changed, 118 insertions(+)
+ create mode 100755 tests/openpgp/import-incomplete.scm
+ create mode 100644 tests/openpgp/import-incomplete/primary+revocation.asc
+ create mode 100644 tests/openpgp/import-incomplete/primary+subkey+sub-revocation.asc
+ create mode 100644 tests/openpgp/import-incomplete/primary+subkey+sub-sig.asc
+ create mode 100644 tests/openpgp/import-incomplete/primary+uid-sig.asc
+ create mode 100644 tests/openpgp/import-incomplete/primary+uid.asc
+
+diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
+index f6014c9..6423da1 100644
+--- a/tests/openpgp/Makefile.am
++++ b/tests/openpgp/Makefile.am
+@@ -78,6 +78,7 @@ XTESTS = \
+ 	gpgv-forged-keyring.scm \
+ 	armor.scm \
+ 	import.scm \
++	import-incomplete.scm \
+ 	import-revocation-certificate.scm \
+ 	ecc.scm \
+ 	4gb-packet.scm \
+diff --git a/tests/openpgp/import-incomplete.scm b/tests/openpgp/import-incomplete.scm
+new file mode 100755
+index 0000000..727a027
+--- /dev/null
++++ b/tests/openpgp/import-incomplete.scm
+@@ -0,0 +1,68 @@
++#!/usr/bin/env gpgscm
++
++;; Copyright (C) 2016 g10 Code GmbH
++;;
++;; This file is part of GnuPG.
++;;
++;; GnuPG is free software; you can redistribute it and/or modify
++;; it under the terms of the GNU General Public License as published by
++;; the Free Software Foundation; either version 3 of the License, or
++;; (at your option) any later version.
++;;
++;; GnuPG is distributed in the hope that it will be useful,
++;; but WITHOUT ANY WARRANTY; without even the implied warranty of
++;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++;; GNU General Public License for more details.
++;;
++;; You should have received a copy of the GNU General Public License
++;; along with this program; if not, see <http://www.gnu.org/licenses/>.
++
++(load (in-srcdir "tests" "openpgp" "defs.scm"))
++(setup-environment)
++
++(call-check `(,(tool 'gpg) --import ,(in-srcdir "tests" "openpgp" "import-incomplete" "primary+uid.asc")))
++
++(info "Test import of new subkey, from a certificate without uid")
++(define keyid "573EA710367356BB")
++(call-check `(,(tool 'gpg) --import ,(in-srcdir "tests" "openpgp" "import-incomplete" "primary+subkey+sub-sig.asc")))
++(tr:do
++ (tr:pipe-do
++  (pipe:gpg `(--list-keys --with-colons ,keyid)))
++ (tr:call-with-content
++  (lambda (c)
++    ;; XXX we do not have a regexp library
++    (unless (any (lambda (line)
++		   (and (string-prefix? line "sub:")
++			(string-contains? line "573EA710367356BB")))
++		 (string-split-newlines c))
++	    (exit 1)))))
++
++(info "Test import of a subkey revocation, from a certificate without uid")
++(define keyid "573EA710367356BB")
++(call-check `(,(tool 'gpg) --import ,(in-srcdir "tests" "openpgp" "import-incomplete" "primary+subkey+sub-revocation.asc")))
++(tr:do
++ (tr:pipe-do
++  (pipe:gpg `(--list-keys --with-colons ,keyid)))
++ (tr:call-with-content
++  (lambda (c)
++    ;; XXX we do not have a regexp library
++    (unless (any (lambda (line)
++		   (and (string-prefix? line "sub:r:")
++			(string-contains? line "573EA710367356BB")))
++		 (string-split-newlines c))
++	    (exit 1)))))
++
++(info "Test import of revocation, from a certificate without uid")
++(call-check `(,(tool 'gpg) --import ,(in-srcdir "tests" "openpgp" "import-incomplete" "primary+revocation.asc")))
++(tr:do
++ (tr:pipe-do
++  (pipe:gpg `(--list-keys --with-colons ,keyid)))
++ (tr:call-with-content
++  (lambda (c)
++    ;; XXX we do not have a regexp library
++    (unless (any (lambda (line)
++		   (and (string-prefix? line "pub:r:")
++			(string-contains? line "0843DA969AA8DAFB")))
++		 (string-split-newlines c))
++	    (exit 1)))))
++
+diff --git a/tests/openpgp/import-incomplete/primary+revocation.asc b/tests/openpgp/import-incomplete/primary+revocation.asc
+new file mode 100644
+index 0000000..6b7b608
+--- /dev/null
++++ b/tests/openpgp/import-incomplete/primary+revocation.asc
+@@ -0,0 +1,9 @@
++-----BEGIN PGP PUBLIC KEY BLOCK-----
++Comment: [E] primary key, revocation signature over primary (no user ID)
++
++mDMEXNmUGRYJKwYBBAHaRw8BAQdA75R8VlchvmEd2Iz/8l07RoKUaUPDB71Ao1zZ
++631VAN2IeAQgFggAIBYhBLRpj5W82H/gSMzKKQhD2paaqNr7BQJc2ZQZAh0AAAoJ
++EAhD2paaqNr7qAwA/2jBUpnN0BxwRO/4CrxvrLIsL+C9aSXJUOTv8XkP4lvtAQD3
++XsDFfFNgEueiTfF7HtOGt5LPmRqVvUpQSMVgJJW6CQ==
++=tM90
++-----END PGP PUBLIC KEY BLOCK-----
+diff --git a/tests/openpgp/import-incomplete/primary+subkey+sub-revocation.asc b/tests/openpgp/import-incomplete/primary+subkey+sub-revocation.asc
+new file mode 100644
+index 0000000..83a51a5
+--- /dev/null
++++ b/tests/openpgp/import-incomplete/primary+subkey+sub-revocation.asc
+@@ -0,0 +1,10 @@
++-----BEGIN PGP PUBLIC KEY BLOCK-----
++Comment: [D] primary key, subkey, subkey revocation (no user ID)
++
++mDMEXNmUGRYJKwYBBAHaRw8BAQdA75R8VlchvmEd2Iz/8l07RoKUaUPDB71Ao1zZ
++631VAN24OARc2ZQhEgorBgEEAZdVAQUBAQdABsd5ha0AWXdXcSmfeiWIfrNcGqQK
++j++lwwWDAOlkVicDAQgHiHgEKBYIACAWIQS0aY+VvNh/4EjMyikIQ9qWmqja+wUC
++XNmnkAIdAgAKCRAIQ9qWmqja+ylaAQDmIKf86BJEq4OpDqU+V9D+wn2cyuxbyWVQ
++3r9LiL9qNwD/QAjyrhSN8L3Mfq+wdTHo5i0yB9ZCCpHLXSbhCqfWZwQ=
++=dwx2
++-----END PGP PUBLIC KEY BLOCK-----
+diff --git a/tests/openpgp/import-incomplete/primary+subkey+sub-sig.asc b/tests/openpgp/import-incomplete/primary+subkey+sub-sig.asc
+new file mode 100644
+index 0000000..dc47a02
+--- /dev/null
++++ b/tests/openpgp/import-incomplete/primary+subkey+sub-sig.asc
+@@ -0,0 +1,10 @@
++-----BEGIN PGP PUBLIC KEY BLOCK-----
++Comment: [B] primary key, subkey, subkey binding sig (no user ID)
++
++mDMEXNmUGRYJKwYBBAHaRw8BAQdA75R8VlchvmEd2Iz/8l07RoKUaUPDB71Ao1zZ
++631VAN24OARc2ZQhEgorBgEEAZdVAQUBAQdABsd5ha0AWXdXcSmfeiWIfrNcGqQK
++j++lwwWDAOlkVicDAQgHiHgEGBYIACAWIQS0aY+VvNh/4EjMyikIQ9qWmqja+wUC
++XNmUIQIbDAAKCRAIQ9qWmqja++vFAP98G1L+1/rWTGbsnxOAV2RocBYIroAvsbkR
++Ly6FdP8YNwEA7jOgT05CoKIe37MstpOz23mM80AK369Ca3JMmKKCQgg=
++=xuDu
++-----END PGP PUBLIC KEY BLOCK-----
+diff --git a/tests/openpgp/import-incomplete/primary+uid-sig.asc b/tests/openpgp/import-incomplete/primary+uid-sig.asc
+new file mode 100644
+index 0000000..134607d
+--- /dev/null
++++ b/tests/openpgp/import-incomplete/primary+uid-sig.asc
+@@ -0,0 +1,10 @@
++-----BEGIN PGP PUBLIC KEY BLOCK-----
++Comment: [C] primary key and self-sig expiring in 2024 (no user ID)
++
++mDMEXNmUGRYJKwYBBAHaRw8BAQdA75R8VlchvmEd2Iz/8l07RoKUaUPDB71Ao1zZ
++631VAN2IlgQTFggAPgIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgBYhBLRpj5W8
++2H/gSMzKKQhD2paaqNr7BQJc2ZR1BQkJZgHcAAoJEAhD2paaqNr79soA/0lWkUsu
++3NLwgbni6EzJxnTzgeNMpljqNpipHAwfix9hAP93AVtFdC8g7hdUZxawobl9lnSN
++9ohXOEBWvdJgVv2YAg==
++=KWIK
++-----END PGP PUBLIC KEY BLOCK-----
+diff --git a/tests/openpgp/import-incomplete/primary+uid.asc b/tests/openpgp/import-incomplete/primary+uid.asc
+new file mode 100644
+index 0000000..055f300
+--- /dev/null
++++ b/tests/openpgp/import-incomplete/primary+uid.asc
+@@ -0,0 +1,10 @@
++-----BEGIN PGP PUBLIC KEY BLOCK-----
++Comment: [A] primary key, user ID, and self-sig expiring in 2021
++
++mDMEXNmUGRYJKwYBBAHaRw8BAQdA75R8VlchvmEd2Iz/8l07RoKUaUPDB71Ao1zZ
++631VAN20CHRlc3Qga2V5iJYEExYIAD4WIQS0aY+VvNh/4EjMyikIQ9qWmqja+wUC
++XNmUGQIbAwUJA8JnAAULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRAIQ9qWmqja
+++0G1AQDdQiwhXxjXLMqoth+D4SigVHTJK8ORwifzsy3UE7mPGwD/aZ67XbAF/lgI
++kv2O1Jo0u9BL9RNNF+L0DM7rAFbfMAs=
++=1eII
++-----END PGP PUBLIC KEY BLOCK-----

From 297f755012dfa9c4bea5110eb756d01dbc5dd957 Mon Sep 17 00:00:00 2001
From: Felix Tenley <dev@felschr.com>
Date: Sat, 15 Feb 2020 11:50:43 +0100
Subject: [PATCH 2362/4636] libvdpau: 1.2 -> 1.3

adds support for VP9 decoding
---
 pkgs/development/libraries/libvdpau/default.nix | 17 ++++++++---------
 .../libraries/libvdpau/installdir.patch         |  9 +++++++++
 2 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/libraries/libvdpau/installdir.patch

diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix
index e6a57f1e38c4..977081e0ecf6 100644
--- a/pkgs/development/libraries/libvdpau/default.nix
+++ b/pkgs/development/libraries/libvdpau/default.nix
@@ -1,28 +1,27 @@
-{ stdenv, fetchurl, pkgconfig, xorg, mesa }:
+{ stdenv, fetchurl, pkgconfig, xorg, mesa, meson, ninja }:
 
 stdenv.mkDerivation rec {
   pname = "libvdpau";
-  version = "1.2";
+  version = "1.3";
 
   src = fetchurl {
-    url = "https://gitlab.freedesktop.org/vdpau/libvdpau/uploads/14b620084c027d546fa0b3f083b800c6/${pname}-${version}.tar.bz2";
-    sha256 = "6a499b186f524e1c16b4f5b57a6a2de70dfceb25c4ee546515f26073cd33fa06";
+    url = "https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/${version}/${pname}-${version}.tar.bz2";
+    sha256 = "b5a52eeac9417edbc396f26c40591ba5df0cd18285f68d84614ef8f06196e50e";
   };
+  patches = [ ./installdir.patch ];
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ meson ninja pkgconfig ];
   buildInputs = with xorg; [ xorgproto libXext ];
 
   propagatedBuildInputs = [ xorg.libX11 ];
 
-  configureFlags = stdenv.lib.optional stdenv.isLinux
-    "--with-module-dir=${mesa.drivers.driverLink}/lib/vdpau";
+  mesonFlags = stdenv.lib.optional stdenv.isLinux
+    [ "-Dmoduledir=${mesa.drivers.driverLink}/lib/vdpau" ];
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lX11";
 
-  installFlags = [ "moduledir=$(out)/lib/vdpau" ];
-
   meta = with stdenv.lib; {
     homepage = https://people.freedesktop.org/~aplattner/vdpau/;
     description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)";
diff --git a/pkgs/development/libraries/libvdpau/installdir.patch b/pkgs/development/libraries/libvdpau/installdir.patch
new file mode 100644
index 000000000000..859715f70d39
--- /dev/null
+++ b/pkgs/development/libraries/libvdpau/installdir.patch
@@ -0,0 +1,9 @@
+--- a/trace/meson.build	2020-02-15 16:34:58.698832000 +0100
++++ b/trace/meson.build	2020-02-15 16:39:05.359952802 +0100
+@@ -4,5 +4,5 @@
+     dependencies : libdl,
+     version : '1.0.0',
+     install : true,
+-    install_dir : moduledir,
++    install_dir : get_option('prefix') + '/lib/libvdpau',
+ )

From efc1e24565b4a8738892d23b0e3f76061a336a5f Mon Sep 17 00:00:00 2001
From: Felix Tenley <dev@felschr.com>
Date: Sat, 15 Feb 2020 18:14:56 +0100
Subject: [PATCH 2363/4636] vdpauinfo: 1.0 -> 1.3

---
 pkgs/tools/X11/vdpauinfo/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix
index 153ff45d2a70..c0956fb1dec4 100644
--- a/pkgs/tools/X11/vdpauinfo/default.nix
+++ b/pkgs/tools/X11/vdpauinfo/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, pkgconfig, libvdpau }:
 
 stdenv.mkDerivation rec {
-  name = "vdpauinfo-1.0";
+  pname = "vdpauinfo";
+  version = "1.3";
 
   src = fetchurl {
-    url = "https://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz";
-    sha256 = "1i2b0k9h8r0lnxlrkgqzmrjakgaw3f1ygqqwzx8w6676g85rcm20";
+    url = "https://gitlab.freedesktop.org/vdpau/vdpauinfo/uploads/6fa9718c507ef0fb6966170ef55344bf/${pname}-${version}.tar.gz";
+    sha256 = "0s6jdadnycyd1agsnfx7hrf17hmipasx1fpmppd4m1z6i9sp1i6g";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From bb0d036002eadcf1080bdcc258074c5a7a8693a4 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 13 Feb 2020 22:29:33 +1000
Subject: [PATCH 2364/4636] ncurses: 6.1-20190112 -> 6.2

https://invisible-island.net/ncurses/announce-6.2.html
---
 pkgs/development/libraries/ncurses/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 540ea71abfb8..8b91246b6fdc 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -14,17 +14,17 @@
 
 stdenv.mkDerivation rec {
   # Note the revision needs to be adjusted.
-  version = "6.1-20190112";
+  version = "6.2";
   name = "ncurses-${version}" + lib.optionalString (abiVersion == "5") "-abi5-compat";
 
   # We cannot use fetchFromGitHub (which calls fetchzip)
   # because we need to be able to use fetchurlBoot.
   src = let
     # Note the version needs to be adjusted.
-    rev = "acb4184f8f69fddd052a3daa8c8675f4bf8ce369";
+    rev = "v${version}";
   in fetchurl {
     url = "https://github.com/mirror/ncurses/archive/${rev}.tar.gz";
-    sha256 = "1z8v63cj2y7dxf4m1api8cvk0ns9frif9c60m2sxhibs06pjy4q0";
+    sha256 = "15r2456g0mlq2q7gh2z52vl6zv6y0z8sdchrs80kg4idqd8sm8fd";
   };
 
   patches = lib.optional (!stdenv.cc.isClang) ./clang.patch;

From 4e085866902a33d6989fab6fe444dda062f755ba Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 10 Feb 2020 14:52:49 +0100
Subject: [PATCH 2365/4636] gdb: 8.3.1 -> 9.1

See https://www.gnu.org/software/gdb/download/ANNOUNCEMENT for release
information
---
 .../tools/misc/gdb/darwin-target-match.patch  |  2 +-
 .../tools/misc/gdb/debug-info-from-env.patch  | 33 ++++++++++++-------
 pkgs/development/tools/misc/gdb/default.nix   | 13 ++++++--
 pkgs/top-level/all-packages.nix               |  1 +
 4 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/tools/misc/gdb/darwin-target-match.patch b/pkgs/development/tools/misc/gdb/darwin-target-match.patch
index 1328d919503a..978a67950569 100644
--- a/pkgs/development/tools/misc/gdb/darwin-target-match.patch
+++ b/pkgs/development/tools/misc/gdb/darwin-target-match.patch
@@ -1,6 +1,6 @@
 --- a/configure	2017-06-05 00:51:26.000000000 +0900
 +++ b/configure	2018-03-06 23:12:58.000000000 +0900
-@@ -3603,7 +3603,7 @@
+@@ -3644,7 +3644,7 @@
      noconfigdirs="$noconfigdirs ld gprof"
      noconfigdirs="$noconfigdirs sim target-rda"
      ;;
diff --git a/pkgs/development/tools/misc/gdb/debug-info-from-env.patch b/pkgs/development/tools/misc/gdb/debug-info-from-env.patch
index 499b61ba8696..de59bd2d17bb 100644
--- a/pkgs/development/tools/misc/gdb/debug-info-from-env.patch
+++ b/pkgs/development/tools/misc/gdb/debug-info-from-env.patch
@@ -1,15 +1,24 @@
-Initialize debug-file-directory from NIX_DEBUG_INFO_DIRS, a colon-separated list
-of directories with separate debugging information files.
-
---- a/gdb/main.c
-+++ b/gdb/main.c
-@@ -556,3 +556,8 @@ captured_main_1 (struct captured_main_args *context)
+diff -ur a/gdb/main.c b/gdb/main.c
+--- a/gdb/main.c	2020-02-08 13:50:14.000000000 +0100
++++ b/gdb/main.c	2020-02-24 10:02:07.731806739 +0100
+@@ -567,9 +567,17 @@
+       gdb_sysroot = xstrdup (TARGET_SYSROOT_PREFIX);
+     }
  
--  debug_file_directory = relocate_gdb_directory (DEBUGDIR,
-+  debug_file_directory = getenv("NIX_DEBUG_INFO_DIRS");
-+
+-  debug_file_directory
+-    = xstrdup (relocate_gdb_directory (DEBUGDIR,
+-				     DEBUGDIR_RELOCATABLE).c_str ());
++  debug_file_directory = getenv ("NIX_DEBUG_INFO_DIRS");
 +  if (debug_file_directory != NULL)
-+    debug_file_directory = xstrdup(debug_file_directory);
++    // This might be updated later using
++    // $ set debug-file-directory /to/some/path
++    // which will use xfree. We must then have a xmallocated
++    // copy of the string that can be xfeed later.
++    debug_file_directory = xstrdup (debug_file_directory);
 +  else
-+    debug_file_directory = relocate_gdb_directory (DEBUGDIR,
- 						 DEBUGDIR_RELOCATABLE);
++    debug_file_directory
++      = xstrdup (relocate_gdb_directory (DEBUGDIR,
++                                         DEBUGDIR_RELOCATABLE).c_str ());
+ 
+   gdb_datadir = relocate_gdb_directory (GDB_DATADIR,
+ 					GDB_DATADIR_RELOCATABLE);
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index e125b7418f6b..baaba6245701 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -18,7 +18,7 @@
 
 let
   basename = "gdb-${version}";
-  version = "8.3.1";
+  version = "9.1";
 in
 
 assert pythonSupport -> python3 != null;
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/gdb/${basename}.tar.xz";
-    sha256 = "1i2pjwaafrlz7wqm40b4znr77ai32rjsxkpl2az38yyarpbv8m8y";
+    sha256 = "0dqp1p7w836iwijg1zb4a784n0j4pyjiw5v6h8fg5lpx6b40x7k9";
   };
 
   postPatch = if stdenv.isDarwin then ''
@@ -65,6 +65,13 @@ stdenv.mkDerivation rec {
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target";
 
+  # GDB have to be built out of tree.
+  preConfigure = ''
+    mkdir _build
+    cd _build
+  '';
+  configureScript = "../configure";
+
   configureFlags = with stdenv.lib; [
     "--enable-targets=all" "--enable-64-bit-bfd"
     "--disable-install-libbfd"
@@ -100,6 +107,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl3Plus;
 
     platforms = with platforms; linux ++ cygwin ++ darwin;
-    maintainers = with maintainers; [ pierron globin ];
+    maintainers = with maintainers; [ pierron globin lsix ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7134e930a694..2680f8b776e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10791,6 +10791,7 @@ in
 
   gdb = callPackage ../development/tools/misc/gdb {
     guile = null;
+    readline = readline80;
   };
 
   jhiccup = callPackage ../development/tools/java/jhiccup { };

From dfbe76a68126d03c3f7eb363d7acbb86335b63d3 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 6 Mar 2020 00:08:06 -0500
Subject: [PATCH 2366/4636] waf: move binary to $out/bin/

Originally this was just the executable, but this breaks nix-shell
usage. Instead, just do a normal directory.

Fixes #79909
---
 pkgs/development/tools/build-managers/waf/default.nix       | 2 +-
 pkgs/development/tools/build-managers/wafHook/setup-hook.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix
index 72ea74c9aad8..4c8fa3f234be 100644
--- a/pkgs/development/tools/build-managers/waf/default.nix
+++ b/pkgs/development/tools/build-managers/waf/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     python waf-light build${wafToolsArg}
   '';
   installPhase = ''
-    install waf $out
+    install -D waf $out/bin/waf
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh b/pkgs/development/tools/build-managers/wafHook/setup-hook.sh
index 3da86d3201f5..38998e8db340 100644
--- a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/wafHook/setup-hook.sh
@@ -3,7 +3,7 @@ wafConfigurePhase() {
 
     if ! [ -f "${wafPath:=./waf}" ]; then
         echo "copying waf to $wafPath..."
-        cp @waf@ "$wafPath"
+        cp @waf@/bin/waf "$wafPath"
     fi
 
     if [ -z "${dontAddPrefix:-}" ] && [ -n "$prefix" ]; then

From 023ef3d1a4d8f078e99fdb8214355f516f321c74 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2020 08:53:05 +0000
Subject: [PATCH 2367/4636] libevdev: 1.8.0 -> 1.9.0

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

diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix
index 7a61437b5eee..1ee03db568b1 100644
--- a/pkgs/development/libraries/libevdev/default.nix
+++ b/pkgs/development/libraries/libevdev/default.nix
@@ -2,18 +2,18 @@
 
 stdenv.mkDerivation rec {
   pname = "libevdev";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "04a2klvii0in9ln8r85mk2cm73jq8ry2m3yzmf2z8xyjxzjcmlr0";
+    sha256 = "17pb5375njb1r05xmk0r57a2j986ihglh2n5nqcylbag4rj8mqg7";
   };
 
   buildInputs = [ python3 ];
 
   meta = with stdenv.lib; {
     description = "Wrapper library for evdev devices";
-    homepage = http://www.freedesktop.org/software/libevdev/doc/latest/index.html;
+    homepage = "http://www.freedesktop.org/software/libevdev/doc/latest/index.html";
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = [ maintainers.amorsillo ];

From a1f22cb2bfbf9c0fdd27dfda8bd4a41fae7d1ce4 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Tue, 3 Mar 2020 18:30:39 -0800
Subject: [PATCH 2368/4636] libva: 2.5.0 -> 2.6.1

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

diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index 7aba75a1d235..0d00c9cb253d 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -6,14 +6,14 @@
 
 stdenv.mkDerivation rec {
   name = "libva-${lib.optionalString minimal "minimal-"}${version}";
-  version = "2.5.0";
+  version = "2.6.1";
 
   # update libva-utils and vaapiIntel as well
   src = fetchFromGitHub {
     owner  = "01org";
     repo   = "libva";
     rev    = version;
-    sha256 = "0pys6blkh8ayxmxgfh7qrjzzcrzzn14z5d8q4a34ffqk90b6r93z";
+    sha256 = "1x34kf38p5rf52bf54ljr9f7knnbilm7kbszqnfk3lzsqrfc7r2g";
   };
 
   outputs = [ "dev" "out" ];

From 43ccb035b910d73259717d76370ad4ee6d654014 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 23:12:12 +0000
Subject: [PATCH 2369/4636] vim: 8.2.0227 -> 8.2.0343

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

diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index e5ee1da75801..03b7d57b49dc 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "8.2.0227";
+  version = "8.2.0343";
 
   src = fetchFromGitHub {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    sha256 = "1yi7l2yd214iv6i8pr52m272mlzps5v3h6xdgr1770xfz4y1yc0h";
+    sha256 = "063i52h8v7f87zamrw2ph057f0x2nzwf1s0izrm2psy41cyf4wa3";
   };
 
   enableParallelBuilding = true;
@@ -22,7 +22,7 @@ rec {
 
   meta = with lib; {
     description = "The most popular clone of the VI editor";
-    homepage    = http://www.vim.org;
+    homepage    = "http://www.vim.org";
     license     = licenses.vim;
     maintainers = with maintainers; [ lovek323 equirosa ];
     platforms   = platforms.unix;

From 8d72e6bd5fa8fb40f7aafe955c2ec888231b846b Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 29 Feb 2020 12:43:41 -0500
Subject: [PATCH 2370/4636] util-linux: use $bin output for umount
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This wasn’t updated when adding the bin output.
---
 pkgs/os-specific/linux/util-linux/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index c66b4cbab830..baaa90e431ba 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     substituteInPlace include/pathnames.h \
       --replace "/bin/login" "${shadow}/bin/login"
     substituteInPlace sys-utils/eject.c \
-      --replace "/bin/umount" "$out/bin/umount"
+      --replace "/bin/umount" "$bin/bin/umount"
   '';
 
   # !!! It would be better to obtain the path to the mount helpers

From b3793e1181287cd7624d0bc0189ddb93efe32f67 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2020 06:14:36 +0000
Subject: [PATCH 2371/4636] cmake: 3.16.4 -> 3.16.5

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

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 4eb531f59a8d..0a6335a3eb72 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
           + lib.optionalString useNcurses "-cursesUI"
           + lib.optionalString withQt5 "-qt5UI"
           + lib.optionalString useQt4 "-qt4UI";
-  version = "3.16.4";
+  version = "3.16.5";
 
   src = fetchurl {
     url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
     # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
-    sha256 = "0b5c77lqzfk5l7mnnih5c78i36d3skbkw20jjnph79lx9l8qrk4v";
+    sha256 = "1z4bb8z6b4dvq5hrvajrf1hyybqay3xybyimf71w1jgcp180nxjz";
   };
 
   patches = [
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
   doCheck = false; # fails
 
   meta = with lib; {
-    homepage = http://www.cmake.org/;
+    homepage = "http://www.cmake.org/";
     description = "Cross-Platform Makefile Generator";
     platforms = if useQt4 then qt4.meta.platforms else platforms.all;
     maintainers = with maintainers; [ ttuegel lnl7 ];

From 4665c94d0c3337c410ce588b10412056baa2b6b6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 10 Feb 2020 13:47:38 +0000
Subject: [PATCH 2372/4636] skypeforlinux: 8.55.0.141 -> 8.56.0.103

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

diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index 500f8f3fe873..78b7a6d81a2e 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -7,7 +7,7 @@ let
 
   # Please keep the version x.y.0.z and do not update to x.y.76.z because the
   # source of the latter disappears much faster.
-  version = "8.55.0.141";
+  version = "8.56.0.103";
 
   rpath = stdenv.lib.makeLibraryPath [
     alsaLib
@@ -63,7 +63,7 @@ let
           "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
           "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
         ];
-        sha256 = "0yfbxrnf2mjihrsvp0r81kbxh3rfh53y7sbfp3bwqky951a93qis";
+        sha256 = "01qyi92dh4xalzaqzj9n3bz59y91rx45gkyw4k9ckjknbjwb3c90";
       }
     else
       throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";

From b6245f5061fc3208612b3e18f66f17de488cc4f4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 8 Feb 2020 12:37:17 +0000
Subject: [PATCH 2373/4636] intel-graphics-compiler: 1.0.3041 -> 1.0.3151

---
 .../development/compilers/intel-graphics-compiler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix
index 0070bc23f73e..3e10041c5c80 100644
--- a/pkgs/development/compilers/intel-graphics-compiler/default.nix
+++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix
@@ -24,13 +24,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "intel-graphics-compiler";
-  version = "1.0.3041";
+  version = "1.0.3151";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "intel-graphics-compiler";
     rev = "igc-${version}";
-    sha256 = "1d3vxq4v8jdjgl5jdm9qpxzgaw98r84dzs9lk9ph02khfkajqhjm";
+    sha256 = "1c2ll563a2j4sv3r468i4lv158hkzywnyajyk7iyin7bhqhm2vzf";
   };
 
   nativeBuildInputs = [ clang cmake bison flex llvm python ];

From 853bf469bc3e9e2cfbd9faf1b92ca5a3159f72b9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 6 Feb 2020 14:16:16 +0000
Subject: [PATCH 2374/4636] rawtherapee: 5.7 -> 5.8

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

diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index bda164465245..3f89b7f8b3a3 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "5.7";
+  version = "5.8";
   pname = "rawtherapee";
 
   src = fetchFromGitHub {
     owner = "Beep6581";
     repo = "RawTherapee";
     rev = version;
-    sha256 = "0j3887a3683fqpvp66kaw6x81ai3gf5nvrbmb4cc8rb0lgj2xv2g";
+    sha256 = "0d644s4grfia6f3k6y0byd5pwajr12kai2kc280yxi8v3w1b12ik";
   };
 
   nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ];

From 9a2a995a8fc1a527fc5ce828bcd3f7bf172b9c12 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 27 Feb 2020 18:51:10 +0000
Subject: [PATCH 2375/4636] zotero: 5.0.82 -> 5.0.83

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

diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index f24cc014cddb..54530cb8dce0 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -35,11 +35,11 @@
 
 stdenv.mkDerivation rec {
   pname = "zotero";
-  version = "5.0.82";
+  version = "5.0.83";
 
   src = fetchurl {
     url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
-    sha256 = "02a9dlsdd7dh56dwvsjskr899bqi8ijcvzc71xcjwaik6rp8xw88";
+    sha256 = "1abkwxdi154hnry8nsvxbklvbsnvd7cs2as0041h2kbiz824pv31";
   };
 
   buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme dconf ];
@@ -131,7 +131,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://www.zotero.org;
+    homepage = "https://www.zotero.org";
     description = "Collect, organize, cite, and share your research sources";
     license = licenses.agpl3;
     platforms = platforms.linux;

From 592507780c4e8f851d67b9ad6510663697e332b3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 23 Feb 2020 04:28:36 +0000
Subject: [PATCH 2376/4636] urh: 2.8.2 -> 2.8.3

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

diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix
index 8ca42ab94acc..6c8615fd6310 100644
--- a/pkgs/applications/radio/urh/default.nix
+++ b/pkgs/applications/radio/urh/default.nix
@@ -5,13 +5,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "urh";
-  version = "2.8.2";
+  version = "2.8.3";
 
   src = fetchFromGitHub {
     owner = "jopohl";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0cypm602zl3s4qggmafj4c246h65qgzsj3bsimvc5zz7jspk6m77";
+    sha256 = "17104livp6fv2zg56sqv90lqb7ywqhq2qfnal1hriwwh1b92glv8";
   };
 
   nativeBuildInputs = [ qt5.wrapQtAppsHook ];

From ef1ace9dd21c93de60dbeba76845cb2443be767e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Feb 2020 23:58:57 +0000
Subject: [PATCH 2377/4636] gdcm: 3.0.4 -> 3.0.5

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

diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix
index 0b5e0af84ba2..a227245f6db0 100644
--- a/pkgs/development/libraries/gdcm/default.nix
+++ b/pkgs/development/libraries/gdcm/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cmake, vtk, darwin }:
 
 stdenv.mkDerivation rec {
-  version = "3.0.4";
+  version = "3.0.5";
   pname = "gdcm";
 
   src = fetchurl {
     url = "mirror://sourceforge/gdcm/${pname}-${version}.tar.bz2";
-    sha256 = "0g46l7fjvn37sg29m0nb7wlnnpnxmlm9ryp7vam26ni02l73paid";
+    sha256 = "16d3sf81n4qhwbbx1d80jg6fhrla5paan384c4bbbqvbhm222yby";
   };
 
   dontUseCmakeBuildDir = true;

From d34475c91b45bb72cb9ab14efb5c43e10e6a9f20 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Feb 2020 21:24:30 +0000
Subject: [PATCH 2378/4636] facter: 3.14.7 -> 3.14.8

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

diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index acc3990378fd..89c79be2ce3c 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "facter";
-  version = "3.14.7";
+  version = "3.14.8";
 
   src = fetchFromGitHub {
-    sha256 = "1x71ynnp8l5bf6m1a56rwcjya2swrhpxmd0cg9ndjplam6zys2v7";
+    sha256 = "1rq28sg1yqyx2xpbhb8hj18ar5pva2rwz7v3ylg8kq112cnlngyh";
     rev = version;
     repo = pname;
     owner = "puppetlabs";

From 2d1a19dda14659b3ff53ecea60d564fa7a3eb070 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 19 Feb 2020 04:41:07 +0000
Subject: [PATCH 2379/4636] elogind: 243.4 -> 243.7

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

diff --git a/pkgs/applications/misc/elogind/default.nix b/pkgs/applications/misc/elogind/default.nix
index 9565e7213dcd..84982b6b0197 100644
--- a/pkgs/applications/misc/elogind/default.nix
+++ b/pkgs/applications/misc/elogind/default.nix
@@ -29,13 +29,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "elogind";
-  version = "243.4";
+  version = "243.7";
 
   src = fetchFromGitHub {
     owner = "elogind";
     repo = pname;
     rev = "v${version}";
-    sha256 = "141frvgyk4fafcxsix94qc0d9ffrwksld8lqq4hq6xsgjlvv0mrs";
+    sha256 = "0cihdf7blhncm2359qxli24j9l3dkn15gjys5vpjwny80zlym5ma";
   };
 
   nativeBuildInputs = [

From e04fab644feb61593b98f2f85e97d0fc70a9e451 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 13 Feb 2020 03:58:26 +0000
Subject: [PATCH 2380/4636] osi: 0.108.4 -> 0.108.6

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

diff --git a/pkgs/development/libraries/science/math/osi/default.nix b/pkgs/development/libraries/science/math/osi/default.nix
index 6dc7e746fd35..b6f367ff4fe9 100644
--- a/pkgs/development/libraries/science/math/osi/default.nix
+++ b/pkgs/development/libraries/science/math/osi/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "osi";
-  version = "0.108.4";
+  version = "0.108.6";
 
   src = fetchurl {
     url = "https://www.coin-or.org/download/source/Osi/Osi-${version}.tgz";
-    sha256 = "13bwhdh01g37vp3kjwl9nvij5s5ikh5f7zgrqgwrqfyk35q2x9s5";
+    sha256 = "1n2jlpq4aikbp0ncs16f7q1pj7yk6kny1bh4fmjaqnwrjw63zvsp";
   };
 
   buildInputs =

From 7703cc22fedcd89c863141315cb1b3be6813d8fe Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 11:06:34 +0000
Subject: [PATCH 2381/4636] python27Packages.uproot: 3.11.2 -> 3.11.3

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

diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix
index 481f7a9e7b25..b7322b0f179e 100644
--- a/pkgs/development/python-modules/uproot/default.nix
+++ b/pkgs/development/python-modules/uproot/default.nix
@@ -16,11 +16,11 @@
 
 buildPythonPackage rec {
   pname = "uproot";
-  version = "3.11.2";
+  version = "3.11.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1bn8z640408s4h04ymy0y79fm5ss2mx99mkgdbw68a80x0p6982h";
+    sha256 = "19rvkxv015lkx0g01sb54y6agdbqbmkpxlyka4z1zf9dx2lx1iq5";
   };
 
   nativeBuildInputs = [ pytestrunner ];
@@ -51,7 +51,7 @@ buildPythonPackage rec {
   '';
 
   meta = with lib; {
-    homepage = https://github.com/scikit-hep/uproot;
+    homepage = "https://github.com/scikit-hep/uproot";
     description = "ROOT I/O in pure Python and Numpy";
     license = licenses.bsd3;
     maintainers = with maintainers; [ ktf ];

From 8a21b2f5560630f02b1c006054595fa5713de9e4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 10:34:42 +0000
Subject: [PATCH 2382/4636] python27Packages.traitsui: 6.1.1 -> 6.1.3

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

diff --git a/pkgs/development/python-modules/traitsui/default.nix b/pkgs/development/python-modules/traitsui/default.nix
index 7711b24f44ed..8e7a5643d70e 100644
--- a/pkgs/development/python-modules/traitsui/default.nix
+++ b/pkgs/development/python-modules/traitsui/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "traitsui";
-  version = "6.1.1";
+  version = "6.1.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "080fq9hag7hvcnsd5c5fn74zjmjl6rjq40r0zwdz2bjlk9049xpi";
+    sha256 = "0kw1xy5ax6l0lzmk7pfzjw6qs0idv78k3118my7cbvw1n5iiff28";
   };
 
   propagatedBuildInputs = [ traits pyface wxPython ];
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Traits-capable windowing framework";
-    homepage = https://github.com/enthought/traitsui;
+    homepage = "https://github.com/enthought/traitsui";
     maintainers = with stdenv.lib.maintainers; [ knedlsepp ];
     license = licenses.bsdOriginal;
   };

From 338639e729fecd56e88b1a340bb7b0097a1ac638 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 05:15:27 +0000
Subject: [PATCH 2383/4636] python27Packages.pyface: 6.1.1 -> 6.1.2

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

diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix
index a26d0bdc1a9c..db8b05e8d683 100644
--- a/pkgs/development/python-modules/pyface/default.nix
+++ b/pkgs/development/python-modules/pyface/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "pyface";
-  version = "6.1.1";
+  version = "6.1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1q5rihmhcdyyp44p31f5l4a0mc9m3293rvcnma5p8w0v8j7dbrm7";
+    sha256 = "1g2g3za64rfffbivlihbf5njrqbv63ln62rv9d8fi1gcrgaw6akw";
   };
 
   propagatedBuildInputs = [ setuptools six traits wxPython ];
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Traits-capable windowing framework";
-    homepage = https://github.com/enthought/pyface;
+    homepage = "https://github.com/enthought/pyface";
     maintainers = with stdenv.lib.maintainers; [ knedlsepp ];
     license = licenses.bsdOriginal;
   };

From 9ce73d1a620db2bee7b2d5b23c7d14b78de58153 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 05:41:51 +0000
Subject: [PATCH 2384/4636] python37Packages.pikepdf: 1.10.0 -> 1.10.2

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

diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix
index 64629314bfe9..7b9393754a45 100644
--- a/pkgs/development/python-modules/pikepdf/default.nix
+++ b/pkgs/development/python-modules/pikepdf/default.nix
@@ -22,12 +22,12 @@
 
 buildPythonPackage rec {
   pname = "pikepdf";
-  version = "1.10.0";
+  version = "1.10.2";
   disabled = ! isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1qa4sam1kvglwqwk573mjpsy8cy89yamr4val0g80hq1ribc56ah";
+    sha256 = "1y94ay2jz4m55nlyrg283xsjqsxigmj7vzrzf1mskbpjb20335fb";
   };
 
   buildInputs = [

From 724e4d4acd9d53fa65f3a591f8bfaa06e1b00bc8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 03:40:24 +0000
Subject: [PATCH 2385/4636] python27Packages.denonavr: 0.7.10 -> 0.7.12

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

diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix
index 33c1570060e5..e33382ffd01f 100644
--- a/pkgs/development/python-modules/denonavr/default.nix
+++ b/pkgs/development/python-modules/denonavr/default.nix
@@ -3,13 +3,13 @@
 
 buildPythonPackage rec {
   pname = "denonavr";
-  version = "0.7.10";
+  version = "0.7.12";
 
   src = fetchFromGitHub {
     owner = "scarface-4711";
     repo = "denonavr";
     rev = version;
-    sha256 = "078nhr69f68nfazhmkf2sl7wiadqx96a5ry3ziggiy1xs04vflj7";
+    sha256 = "1i7r0f8ldxpy9vkwjla6rfkaq37071d36zfhb1dwm9jgp6ggi34m";
   };
 
   propagatedBuildInputs = [ requests ];

From 698cb681c5520ab5f56709470e1cc32879688b00 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 03:27:33 +0000
Subject: [PATCH 2386/4636] python37Packages.ckcc-protocol: 1.0.0 -> 1.0.1

---
 pkgs/development/python-modules/ckcc-protocol/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/ckcc-protocol/default.nix b/pkgs/development/python-modules/ckcc-protocol/default.nix
index f1136851f8a8..01e2955d08ac 100644
--- a/pkgs/development/python-modules/ckcc-protocol/default.nix
+++ b/pkgs/development/python-modules/ckcc-protocol/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "ckcc-protocol";
-  version = "1.0.0";
+  version = "1.0.1";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1glws7z7kk9qyl1j4446hb6vv3l4s5xca40zb4fzhsh6chm76h11";
+    sha256 = "13ihbhjgxyn1xvrbppjvnqm199q5fdwrljs0wm16iwyl56kf3wh3";
   };
 
   checkInputs = [
@@ -28,7 +28,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Communicate with your Coldcard using Python";
-    homepage = https://github.com/Coldcard/ckcc-protocol;
+    homepage = "https://github.com/Coldcard/ckcc-protocol";
     license = licenses.gpl3;
     maintainers = [ maintainers.hkjn ];
   };

From cf230185fe703c8c39c4e3a2579d662089bec132 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Mar 2020 15:34:08 +0000
Subject: [PATCH 2387/4636] micronaut: 1.3.0 -> 1.3.2

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

diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix
index 19e825a32f99..6466f1c4a281 100644
--- a/pkgs/development/tools/micronaut/default.nix
+++ b/pkgs/development/tools/micronaut/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "micronaut";
-  version = "1.3.0";
+  version = "1.3.2";
 
   src = fetchzip {
     url = "https://github.com/micronaut-projects/micronaut-core/releases/download/v${version}/${pname}-${version}.zip";
-    sha256 = "1dpg1j0004k6ykj9i2nhkxlyq7vq2c96bwggppq2k7ckma0i4x6z";
+    sha256 = "0jwvbymwaz4whw08n9scz6vk57sx7l3qddh4m5dlv2cxishwf7n3";
   };
 
   nativeBuildInputs = [ makeWrapper installShellFiles ];

From 90f0f471c18969ebf0544eddb6ce9271b2c27ac3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Mar 2020 14:58:53 +0000
Subject: [PATCH 2388/4636] metabase: 0.34.2 -> 0.34.3

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

diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix
index 583c6b739cdc..2a4ac3e17764 100644
--- a/pkgs/servers/metabase/default.nix
+++ b/pkgs/servers/metabase/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "metabase";
-  version = "0.34.2";
+  version = "0.34.3";
 
   src = fetchurl {
     url = "http://downloads.metabase.com/v${version}/metabase.jar";
-    sha256 = "02hpm8h98dsxyjs736bss3pk253aayf9dr7csj6qn3y68hs67jpk";
+    sha256 = "0kvjqdzr9zb65c2kaqb39x8s71ynpp56aax2h1x37rds4zxdg2yg";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From eafe585a71578adf7a5689cbc5d20059dd214277 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Mar 2020 13:32:30 +0000
Subject: [PATCH 2389/4636] librealsense: 2.31.0 -> 2.32.1

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

diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
index a4ae61e12640..05c81e3c73ef 100644
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "librealsense";
-  version = "2.31.0";
+  version = "2.32.1";
 
   outputs = [ "out" "dev" ];
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner = "IntelRealSense";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0lw4dqywahi7wfd1dz5nkil55sh7wscsrwkapkvvgyi418pqvmpn";
+    sha256 = "1l45hrb3lgjh1kdi4khqhljndc434zf9llzbii6dcv911gxkipjr";
   };
 
   buildInputs = [

From 77f5b01d38d5686c4446dc5f8be1b2b71cc7ff2b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 15:40:49 +0000
Subject: [PATCH 2390/4636] rednotebook: 2.16 -> 2.18

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

diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix
index a46a643e136a..7f94b354dd29 100644
--- a/pkgs/applications/editors/rednotebook/default.nix
+++ b/pkgs/applications/editors/rednotebook/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonApplication rec {
   pname = "rednotebook";
-  version = "2.16";
+  version = "2.18";
 
   src = fetchFromGitHub {
     owner = "jendrikseipp";
     repo = "rednotebook";
     rev = "v${version}";
-    sha256 = "1cziac9pmhpxvs8qg54wbckzgjpplqb55hykg5vdwdqqs7j054aj";
+    sha256 = "1m75ns6vgycyi3zjlc9w2gnry1gyfz1jxhrklcxxi6aap0jxlgnr";
   };
 
   # We have not packaged tests.

From ec8946ea0935df47a875609a9fbb87823e3d1182 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 00:20:01 +0000
Subject: [PATCH 2391/4636] python37Packages.hstspreload: 2020.2.5 -> 2020.2.29

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

diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix
index 545f0d001794..a4b7fb3a6520 100644
--- a/pkgs/development/python-modules/hstspreload/default.nix
+++ b/pkgs/development/python-modules/hstspreload/default.nix
@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "hstspreload";
-  version = "2020.2.5";
+  version = "2020.2.29";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "sethmlarson";
     repo = pname;
     rev = version;
-    sha256 = "1jz4qma04vkiczlj0fd9ahjf6c3yxvycvhp48c3n3l4aw4gfsbiz";
+    sha256 = "1s6f9sdr5l9dqri92s8qr7r1nyvai3vnpcaw06293kc8dribi0m2";
   };
 
   # tests require network connection
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Chromium HSTS Preload list as a Python package and updated daily";
-    homepage = https://github.com/sethmlarson/hstspreload;
+    homepage = "https://github.com/sethmlarson/hstspreload";
     license = licenses.bsd3;
     maintainers = [ maintainers.costrouc ];
   };

From 4f8ea1e02ed9fd9701735cfdecc315305bc2a90a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 28 Feb 2020 09:53:48 +0100
Subject: [PATCH 2392/4636] coqPackages.simple-io: enable for Coq 8.10

---
 pkgs/development/coq-modules/simple-io/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix
index e74b158d33a3..07ce35875d1f 100644
--- a/pkgs/development/coq-modules/simple-io/default.nix
+++ b/pkgs/development/coq-modules/simple-io/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" ];
+    compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" ];
   };
 
 }

From e8243467b97cb1cb027d03596ec3e4709e140ee2 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 28 Feb 2020 09:53:54 +0100
Subject: [PATCH 2393/4636] coqPackages_8_10.QuickChick: init at 1.2.0

---
 pkgs/development/coq-modules/QuickChick/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index b99612894802..c1894d3666c6 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -25,6 +25,12 @@ let params =
       rev = "v${version}";
       sha256 = "1c34v1k37rk7v0xk2czv5n79mbjxjrm6nh3llg2mpfmdsqi68wf3";
     };
+
+    "8.10" = rec {
+      version = "1.2.0";
+      rev = "v${version}";
+      sha256 = "1xs4mr3rdb0g44736jb40k370hw3maxdk12jiq1w1dl3q5gfrhah";
+    };
   };
   param = params.${coq.coq-version};
 in

From 2d2a5a9b634e39dec752b112a380055990c3cd35 Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Fri, 6 Mar 2020 07:42:04 +0100
Subject: [PATCH 2394/4636] js_of_ocaml: 3.4.0 -> 3.5.2 (#75766)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

drive-by contributions, as I was playing around with this (it has better
support for the `num` library, it seems.)

js_of_ocaml: 3.4.0 -> 3.5.2
ocamlPackages.js_of_ocaml-ppx_deriving_json: use ppxlib-0.12.0
ocamlPackages.eliom: 6.8.0 → 6.10.1
ocamlPackages.ocsigen-toolkit: 2.2.0 → 2.5.0
ocamlPackages.ocsigen-start: 2.7.0 → 2.16.1

Co-authored-by: Vincent Laporte <Vincent.Laporte@gmail.com>
---
 pkgs/applications/science/logic/why3/default.nix      | 10 ++++++++--
 pkgs/development/ocaml-modules/eliom/default.nix      | 10 ++++------
 .../ocaml-modules/ocsigen-start/default.nix           | 11 +++++------
 .../ocaml-modules/ocsigen-toolkit/default.nix         |  6 +++---
 pkgs/development/ocaml-modules/ppxlib/default.nix     | 11 +++++++++--
 pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix |  8 ++++----
 .../tools/ocaml/js_of_ocaml/ppx_deriving_json.nix     |  4 ++--
 pkgs/top-level/ocaml-packages.nix                     |  4 +++-
 8 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix
index eeb3a6b6d361..e57644618196 100644
--- a/pkgs/applications/science/logic/why3/default.nix
+++ b/pkgs/applications/science/logic/why3/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, fetchurl, stdenv
+{ callPackage, fetchurl, fetchpatch, stdenv
 , ocamlPackages, coqPackages, rubber, hevea, emacs }:
 
 stdenv.mkDerivation {
@@ -30,7 +30,13 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   # Remove unnecessary call to which
-  patches = [ ./configure.patch ];
+  patches = [ ./configure.patch
+    # Compatibility with js_of_ocaml 3.5
+    (fetchpatch {
+      url = "https://gitlab.inria.fr/why3/why3/commit/269ab313382fe3e64ef224813937314748bf7cf0.diff";
+      sha256 = "0i92wdnbh8pihvl93ac0ma1m5g95jgqqqj4kw6qqvbbjjqdgvzwa";
+    })
+  ];
 
   configureFlags = [ "--enable-verbose-make" ];
 
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index 9a9ea28da539..7ffb7a8880b8 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchzip, which, ocsigen_server, ocaml,
   lwt_react,
-  opaline, ppx_tools, ppx_deriving, findlib
-, ppx_tools_versioned
+  opaline, ppx_deriving, findlib
 , js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json
 , js_of_ocaml-lwt
 , js_of_ocaml-tyxml
@@ -15,15 +14,14 @@ else
 stdenv.mkDerivation rec
 {
   pname = "eliom";
-  version = "6.8.0";
+  version = "6.10.1";
 
   src = fetchzip {
     url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz";
-    sha256 = "0di4q0wzbnk9sxlaj97ivghzh8qvjb8n17h80y4nmqhys97pldif";
+    sha256 = "006722wcmhsfhyzv3qbgrrn53fbv9v4i31z52a0pznb6cll45nkm";
   };
 
-  buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline ppx_tools
-    ppx_tools_versioned
+  buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix
index bbdf3d56a474..6d8beb8b07b1 100644
--- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix
@@ -1,15 +1,14 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, camlp4, ocsigen-toolkit, pgocaml, macaque, safepass, yojson
-, js_of_ocaml-camlp4, lwt_camlp4
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, pgocaml_ppx, macaque, safepass, yojson
 , cohttp-lwt-unix
 , resource-pooling
 }:
 
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-ocsigen-start-${version}";
-  version = "2.7.0";
+  version = "2.16.1";
 
-  buildInputs = [ ocaml findlib js_of_ocaml-camlp4 lwt_camlp4 ];
-  propagatedBuildInputs = [ pgocaml macaque safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix camlp4 ];
+  buildInputs = [ ocaml findlib ];
+  propagatedBuildInputs = [ pgocaml_ppx safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix ];
 
   patches = [ ./templates-dir.patch ];
 
@@ -23,7 +22,7 @@ stdenv.mkDerivation rec {
     owner = "ocsigen";
     repo = "ocsigen-start";
     rev = version;
-    sha256 = "1kp9g679xnff2ybwsicnc9c203hi9ri1ijbpp6221b2sj6zxf2wc";
+    sha256 = "1pzpyrd3vbhc7zvzh6bv44793ikx5bglpd5p4wk5jj65v1w39jwd";
   };
 
   meta = {
diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
index 6c9e72f95d75..2ac54eb4e3c1 100644
--- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
@@ -5,9 +5,9 @@
 stdenv.mkDerivation rec {
  pname = "ocsigen-toolkit";
  name = "ocaml${ocaml.version}-${pname}-${version}";
- version = "2.2.0";
+ version = "2.5.0";
 
- propagatedBuildInputs = [ calendar eliom js_of_ocaml-ppx_deriving_json ];
+ propagatedBuildInputs = [ calendar js_of_ocaml-ppx_deriving_json eliom ];
  buildInputs = [ ocaml findlib opaline ];
 
  installPhase =
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     owner = "ocsigen";
     repo = pname;
     rev = version;
-    sha256 = "0qy6501jf81qcmkbicgrb1x4pxsjkhr40plwdn09w37d8vx9va3s";
+    sha256 = "0hll8qr363pbb65jnr2w36zcbplbwn08xb7826ayiwigakj783p9";
   };
 
   createFindlibDestdir = true;
diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix
index 644e1c98c481..bbaf9e27cf4d 100644
--- a/pkgs/development/ocaml-modules/ppxlib/default.nix
+++ b/pkgs/development/ocaml-modules/ppxlib/default.nix
@@ -1,16 +1,23 @@
 { stdenv, fetchFromGitHub, buildDunePackage
+, version ? "0.8.1"
 , ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio
 }:
 
+let sha256 =
+  { "0.8.1" = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6";
+    "0.12.0" = "1cg0is23c05k1rc94zcdz452p9zn11dpqxm1pnifwx5iygz3w0a1";
+  }."${version}"
+; in
+
 buildDunePackage rec {
   pname = "ppxlib";
-  version = "0.8.1";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "ocaml-ppx";
     repo = pname;
     rev = version;
-    sha256 = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6";
+    inherit sha256;
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
index 801e41427804..90e0a7935de5 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
@@ -1,23 +1,23 @@
 { lib, fetchFromGitHub, buildDunePackage
-, ocaml, findlib, cmdliner, dune, cppo, yojson
+, ocaml, findlib, cmdliner, dune, cppo, yojson, ocaml-migrate-parsetree
 }:
 
 buildDunePackage rec {
 	pname = "js_of_ocaml-compiler";
-	version = "3.4.0";
+	version = "3.5.2";
 
 	src = fetchFromGitHub {
 		owner = "ocsigen";
 		repo = "js_of_ocaml";
 		rev = version;
-		sha256 = "0c537say0f3197zn8d83nrihabrxyn28xc6d7c9c3l0vvrv6qvfj";
+		sha256 = "1fm855iavljx7rf9hii2qb7ky920zv082d9zlcl504by1bxp1yg8";
 	};
 
 	nativeBuildInputs = [ ocaml findlib dune cppo ];
   buildInputs = [ cmdliner ];
 
   configurePlatforms = [];
-	propagatedBuildInputs = [ yojson ];
+	propagatedBuildInputs = [ yojson ocaml-migrate-parsetree ];
 
 	meta = {
 		description = "Compiler from OCaml bytecode to Javascript";
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
index 2ff9ddbcf9e1..47396829f8a0 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
@@ -1,5 +1,5 @@
 { stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
-, js_of_ocaml, ppx_deriving
+, js_of_ocaml, ppxlib
 }:
 
 stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
 	buildInputs = [ ocaml findlib dune ];
 
-	propagatedBuildInputs = [ js_of_ocaml ppx_deriving ];
+	propagatedBuildInputs = [ js_of_ocaml ppxlib ];
 
 	buildPhase = "dune build -p js_of_ocaml-ppx_deriving_json";
 }
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 15bd1d616770..002e3bebbb2c 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -413,7 +413,9 @@ let
 
     js_of_ocaml-ppx = callPackage ../development/tools/ocaml/js_of_ocaml/ppx.nix {};
 
-    js_of_ocaml-ppx_deriving_json = callPackage ../development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix {};
+    js_of_ocaml-ppx_deriving_json = callPackage ../development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix {
+      ppxlib = ppxlib.override { version = "0.12.0"; };
+    };
 
     js_of_ocaml-tyxml = callPackage ../development/tools/ocaml/js_of_ocaml/tyxml.nix {};
 

From 53ae5f76a20257a61e231f250196066a7d0667bc Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Sun, 1 Mar 2020 00:21:36 +0100
Subject: [PATCH 2395/4636] tree-sitter.builtGrammars: build parser libraries

except for typescript that provokes an error.
These libraries can be used on neovim 0.5 for instance.
---
 .../tools/parsing/tree-sitter/default.nix     | 18 ++++++++---
 .../tools/parsing/tree-sitter/library.nix     | 30 +++++++++++++++++++
 2 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/tools/parsing/tree-sitter/library.nix

diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index 0e69fa3259f8..e77b338a20a5 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -2,6 +2,7 @@
 , fetchgit, fetchFromGitHub, fetchurl
 , writeShellScript, runCommand, which
 , rustPlatform, jq, nix-prefetch-git, xe, curl, emscripten
+, callPackage
 }:
 
 # TODO: move to carnix or https://github.com/kolloch/crate2nix
@@ -26,15 +27,23 @@ let
     inherit writeShellScript nix-prefetch-git curl jq xe src;
   };
 
+  fetchGrammar = (v: fetchgit {inherit (v) url rev sha256 fetchSubmodules; });
+
   grammars =
-    let fetch =
-      (v: fetchgit {inherit (v) url rev sha256 fetchSubmodules; });
-    in runCommand "grammars" {} (''
+    runCommand "grammars" {} (''
        mkdir $out
      '' + (lib.concatStrings (lib.mapAttrsToList
-            (name: grammar: "ln -s ${fetch grammar} $out/${name}\n")
+            (name: grammar: "ln -s ${fetchGrammar grammar} $out/${name}\n")
             (import ./grammars))));
 
+  builtGrammars = let
+    change = name: grammar:
+      callPackage ./library.nix {
+        language = name; inherit version; source = fetchGrammar grammar;
+      };
+  in
+    # typescript doesn't have parser.c in the same place as others
+    lib.mapAttrs change (removeAttrs (import ./grammars) ["typescript"]);
 
 in rustPlatform.buildRustPackage {
   pname = "tree-sitter";
@@ -64,6 +73,7 @@ in rustPlatform.buildRustPackage {
       inherit update-all-grammars;
     };
     inherit grammars;
+    inherit builtGrammars;
   };
 
   meta = {
diff --git a/pkgs/development/tools/parsing/tree-sitter/library.nix b/pkgs/development/tools/parsing/tree-sitter/library.nix
new file mode 100644
index 000000000000..2d5d3e7d0b4d
--- /dev/null
+++ b/pkgs/development/tools/parsing/tree-sitter/library.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, language
+, tree-sitter
+, version
+, source
+}:
+
+stdenv.mkDerivation {
+
+  pname = "tree-sitter-${language}-library";
+  inherit version;
+
+  src = source;
+
+  buildInputs = [ tree-sitter ];
+
+  dontUnpack = true;
+  configurePhase= ":";
+  buildPhase = ''
+    runHook preBuild
+    $CC -I$src/src/ -shared -o parser -Os $src/src/parser.c
+    runHook postBuild
+  '';
+  installPhase = ''
+    runHook preInstall
+    mkdir $out
+    mv parser $out/
+    runHook postInstall
+  '';
+}

From 2f863c721efa9ed8e3690542bf107001005d51b8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2020 07:12:15 +0000
Subject: [PATCH 2396/4636] byobu: 5.131 -> 5.133

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

diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix
index 89a5154adda2..ad17c5edd6ee 100644
--- a/pkgs/tools/misc/byobu/default.nix
+++ b/pkgs/tools/misc/byobu/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, python3, perl, textual-window-manager }:
 
 stdenv.mkDerivation rec {
-  version = "5.131";
+  version = "5.133";
   name = "byobu-" + version;
 
   src = fetchurl {
     url = "https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz";
-    sha256 = "0ljyk0fkpdjjyqpqsss6d26sd3vkr55vcr5cfw1kz3lxwwd7bb3p";
+    sha256 = "0qvmmdnvwqbgbhn5c8asmrmjhclcl029py2d2zvmd7h5ij7s93jd";
   };
 
   doCheck = true;
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ textual-window-manager ];
 
   meta = {
-    homepage = https://launchpad.net/byobu/;
+    homepage = "https://launchpad.net/byobu/";
     description = "Text-based window manager and terminal multiplexer";
 
     longDescription =

From e572b36a29be05486ba7f24576af86ff8104fd3a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2020 07:28:31 +0000
Subject: [PATCH 2397/4636] cimg: 2.8.3 -> 2.8.4

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

diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix
index 37e85617fb78..89bbdff3bbcb 100644
--- a/pkgs/development/libraries/cimg/default.nix
+++ b/pkgs/development/libraries/cimg/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cimg";
-  version = "2.8.3";
+  version = "2.8.4";
 
   src = fetchurl {
     url = "http://cimg.eu/files/CImg_${version}.zip";
-    sha256 = "0k7cra95v46i1q3rvklrxxhz3z10yql1ysvfrapcas0m4z6f94ld";
+    sha256 = "1y4j2dmk4nnc5rx65c2px7r0nfq5117pmqpvi7klp9wmgcjs29gf";
   };
 
   nativeBuildInputs = [ unzip ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A small, open source, C++ toolkit for image processing";
-    homepage = http://cimg.eu/;
+    homepage = "http://cimg.eu/";
     license = licenses.cecill-c;
     maintainers = [ maintainers.AndersonTorres ];
     platforms = platforms.unix;

From 215e759e19f1e948f84a8a96b34994bc667eaa93 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2020 07:50:32 +0000
Subject: [PATCH 2398/4636] cfr: 0.148 -> 0.149

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

diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix
index 1d928292cd52..09684ea9986e 100644
--- a/pkgs/development/tools/java/cfr/default.nix
+++ b/pkgs/development/tools/java/cfr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cfr";
-  version = "0.148";
+  version = "0.149";
 
   src = fetchurl {
     url = "http://www.benf.org/other/cfr/cfr_${version}.jar";
-    sha256 = "04nhbzcb0n5xckkbl1rz4xa2bz53hrlm938wrh0gfkzrwwgzj1ql";
+    sha256 = "1jksjr1345wj42nfad7k6skvpg5qsm4xgjdwzb90zhn27ddkns6v";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       Java beta 103 changes), Java 7 String switches etc, but is written
       entirely in Java 6.
     '';
-    homepage = http://www.benf.org/other/cfr/;
+    homepage = "http://www.benf.org/other/cfr/";
     license = licenses.mit;
     platforms = platforms.all;
   };

From 0bc0c10a78fa1af651cbfb50503101e231634d46 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Fri, 6 Mar 2020 08:48:56 +0100
Subject: [PATCH 2399/4636] shellcheck: add manpage and docs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The shellcheck source code contains a manpage, so let’s add that to
the output. For good measure, also copy the README to the doc output.

The overrideMeta thing is taking care of setting the right position,
so that `nix edit` points to this file instead of to the original
haskellPackages definition.
---
 pkgs/development/tools/shellcheck/default.nix | 47 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/shellcheck/default.nix

diff --git a/pkgs/development/tools/shellcheck/default.nix b/pkgs/development/tools/shellcheck/default.nix
new file mode 100644
index 000000000000..ca3e801e3ed1
--- /dev/null
+++ b/pkgs/development/tools/shellcheck/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, lib, haskellPackages, haskell }:
+
+# this wraps around the haskell package
+# and puts the documentation into place
+
+let
+  # TODO: move to lib/ in separate PR
+  overrideMeta = drv: overrideFn:
+    let
+      drv' = if drv ? meta then drv else drv // { meta = {}; };
+      pos = (builtins.unsafeGetAttrPos "pname" drv');
+      meta' = drv'.meta // {
+        # copied from the mkDerivation code
+        position = pos.file + ":" + toString pos.line;
+      };
+    in drv' // { meta = meta' // overrideFn meta'; };
+
+  bin = haskell.lib.justStaticExecutables haskellPackages.ShellCheck;
+  src = haskellPackages.ShellCheck.src;
+
+  shellcheck = stdenv.mkDerivation {
+    pname = "shellcheck";
+    version = bin.version;
+
+    inherit src;
+
+    outputs = [ "bin" "man" "doc" "out" ];
+
+    phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+
+    installPhase = ''
+      install -Dm755 ${bin}/bin/shellcheck $bin/bin/shellcheck
+      install -Dm644 README.md $doc/share/shellcheck/README.md
+      install -Dm644 shellcheck.1 $man/share/man/man1/shellcheck.1
+      mkdir $out
+    '';
+
+    # just some file copying
+    preferLocalBuild = true;
+    allowSubstitutes = false;
+  };
+
+in
+  overrideMeta shellcheck (old: {
+    maintainers = with lib.maintainers; [ Profpatsch ];
+    outputsToInstall = [ "bin" "man" "doc" ];
+  })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5574d0cc76aa..cfefb2ca6f68 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10646,7 +10646,7 @@ in
 
   shards = callPackage ../development/tools/build-managers/shards { };
 
-  shellcheck = haskell.lib.justStaticExecutables haskellPackages.ShellCheck;
+  shellcheck = callPackage ../development/tools/shellcheck {};
 
   schemaspy = callPackage ../development/tools/database/schemaspy { };
 

From 450f8fa9b27f29364ad986d2624bb5abeaac3d7f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2020 08:21:15 +0000
Subject: [PATCH 2400/4636] dpic: 2019.11.30 -> 2020.03.01

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

diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/tools/graphics/dpic/default.nix
index 62fa83800cba..0621d885694d 100644
--- a/pkgs/tools/graphics/dpic/default.nix
+++ b/pkgs/tools/graphics/dpic/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "dpic";
-  version = "2019.11.30";
+  version = "2020.03.01";
 
   src = fetchurl {
     url = "https://ece.uwaterloo.ca/~aplevich/dpic/${pname}-${version}.tar.gz";
-    sha256 = "0rgd31mdbaqbm9rz49872s17n25n5ajxcn61xailz3f0kzr4f3dg";
+    sha256 = "1wa1b8m98wdyryf0czn5g3g50znrjcdhsrzpqp6zgwr5w4a086mj";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = https://ece.uwaterloo.ca/~aplevich/dpic/;
+    homepage = "https://ece.uwaterloo.ca/~aplevich/dpic/";
     description = "An implementation of the pic little language for creating drawings";
     license = stdenv.lib.licenses.bsd2;
     maintainers = [ stdenv.lib.maintainers.aespinosa ];

From c4f5f95d8d2d2d5864c7d11548d6ac659ca9fbda Mon Sep 17 00:00:00 2001
From: Dillen Meijboom <info@dmeijboom.nl>
Date: Fri, 6 Mar 2020 09:56:28 +0100
Subject: [PATCH 2401/4636] Updated and fixed libstdc++ issue

---
 pkgs/tools/admin/pulumi/data.nix    | 42 ++++++++++++++---------------
 pkgs/tools/admin/pulumi/default.nix |  5 ++--
 pkgs/tools/admin/pulumi/update.sh   | 10 +++----
 3 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix
index 1edc80c24e2c..8a8888b2aa0a 100644
--- a/pkgs/tools/admin/pulumi/data.nix
+++ b/pkgs/tools/admin/pulumi/data.nix
@@ -1,50 +1,50 @@
 # DO NOT EDIT! This file is generated automatically by update.sh
 { }:
 {
-  version = "1.4.0";
+  version = "1.12.0";
   pulumiPkgs = {
     x86_64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v1.4.0-linux-x64.tar.gz";
-        sha256 = "00ywy2ba4xha6gwd42i3fdrk1myivkd1r6ijdr2vkianmg524k6f";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v1.12.0-linux-x64.tar.gz";
+        sha256 = "14j8f43h920k62h8bhywapphhfbj7whb9l6pjmyigld6x2jpr4mc";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v0.2.0-linux-amd64.tar.gz";
-        sha256 = "1hj4gysjipd091f106a7xz02g9cail5d11rn6j08m0xphg9cf3fn";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v1.5.0-linux-amd64.tar.gz";
+        sha256 = "1vdd5ghlsxqrfd1nrdj7hsl745k8myhxmd3gh1fq6ksa3apnh1ca";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v1.4.1-linux-amd64.tar.gz";
-        sha256 = "0r6xpsb2riqmxwxw28lbi3xd7w4ds510gw99j1rr57h5b9bq19jj";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v2.8.0-linux-amd64.tar.gz";
+        sha256 = "1q34kv41dbmz45s1sg0rqdxp1qlfq0ii0hy9p95lkzd7qj19qrvv";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v1.2.3-linux-amd64.tar.gz";
-        sha256 = "0m7fajy3cy1agsz787ak548khwj8rwahs1ibaswqfyyw092iyzb9";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v1.5.6-linux-amd64.tar.gz";
+        sha256 = "1g5zgkqnzjqfri61p8876czn0ab2n3mjqf1acdyn8kg5q52sd8ix";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v1.7.0-linux-amd64.tar.gz";
-        sha256 = "1qw90l7h8yn06bz2l2995nbrc3svs223dm3ys1807amj4n2jyfwb";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v1.24.0-linux-amd64.tar.gz";
+        sha256 = "1fwnad5p1v4bigcr2icgzmxdn1b3x0j8c361546pqzk67vskn9fg";
       }
     ];
     x86_64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v1.4.0-darwin-x64.tar.gz";
-        sha256 = "02vqw9gn17dy3rfh0j00k9f827l42g3nl3rhlcbc8jbgx3n9c9qy";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v1.12.0-darwin-x64.tar.gz";
+        sha256 = "1bg6vnxic8fzycgv8q7m1bf8pk2bxvcn0b6lwy7aa2f3kzw70q46";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v0.2.0-darwin-amd64.tar.gz";
-        sha256 = "077j9fp8ix00rcqrq8qxk3kvz6gz6sknzb2iv3qjvkh6yh292mz3";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v1.5.0-darwin-amd64.tar.gz";
+        sha256 = "1skvfg8s8f81l4yfgm49jca38cx96khk3f9rpq4ywa3r3f450kni";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v1.4.1-darwin-amd64.tar.gz";
-        sha256 = "1i2vf3bxwf8awvw183hq9bbnmznda1jpv1zqghgz2ybx4s0915nx";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v2.8.0-darwin-amd64.tar.gz";
+        sha256 = "0f0gnbiv2gbam5n3ng9j5rbrml0jfv9k402vd4j9ryfkly4grpa9";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v1.2.3-darwin-amd64.tar.gz";
-        sha256 = "123czx1c31r5r91k2jhdgmnffypnl8w1a6h9mr2rdhwgbx8hzq40";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v1.5.6-darwin-amd64.tar.gz";
+        sha256 = "1l610a0bvwrsbqv4s00ghbplwnk11q3c0n3py0l7w0a2mpl8izzd";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v1.7.0-darwin-amd64.tar.gz";
-        sha256 = "0cl0vakppxi0v8ym8b4fzhzb10nl84wd0vfik8gpfwsg7zwdzhlp";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v1.24.0-darwin-amd64.tar.gz";
+        sha256 = "17qq7w2wk0803y0if7dn3gnxxnfqnb4n2gcil3zgbc4yhqz4py0y";
       }
     ];
   };
diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix
index 977c1991faba..d6fc6e8a837a 100644
--- a/pkgs/tools/admin/pulumi/default.nix
+++ b/pkgs/tools/admin/pulumi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, autoPatchelfHook }:
+{ lib, stdenv, fetchurl, autoPatchelfHook, makeWrapper }:
 
 with lib;
 
@@ -17,9 +17,10 @@ in stdenv.mkDerivation {
   installPhase = ''
     mkdir -p $out/bin
     cp * $out/bin/
+    wrapProgram $out/bin/pulumi --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib"
   '';
 
-  buildInputs = optionals stdenv.isLinux [ autoPatchelfHook ];
+  buildInputs = optionals stdenv.isLinux [ autoPatchelfHook makeWrapper ];
 
   meta = {
     homepage = https://pulumi.io/;
diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh
index 7cb500ee9d32..35494235d36b 100644
--- a/pkgs/tools/admin/pulumi/update.sh
+++ b/pkgs/tools/admin/pulumi/update.sh
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 
-VERSION="1.4.0"
+VERSION="1.12.0"
 
 declare -A plugins
 plugins=(
-    ["aws"]="1.7.0"
-    ["gcp"]="1.4.1"
-    ["kubernetes"]="1.2.3"
-    ["random"]="0.2.0"
+    ["aws"]="1.24.0"
+    ["gcp"]="2.8.0"
+    ["random"]="1.5.0"
+    ["kubernetes"]="1.5.6"
 )
 
 function genMainSrc() {

From 0d832ee98e9db4afb099f715c138c82e66f95743 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Fri, 6 Mar 2020 10:14:47 +0100
Subject: [PATCH 2402/4636] nixos/tests/prometheus-exporters: increase memory
 for rspamd

Before this, the test failed because rspamd did invoke the oom-killer.
---
 nixos/tests/prometheus-exporters.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix
index b84e589e84cb..00c7b915c883 100644
--- a/nixos/tests/prometheus-exporters.nix
+++ b/nixos/tests/prometheus-exporters.nix
@@ -363,6 +363,7 @@ let
       };
       metricProvider = {
         services.rspamd.enable = true;
+        virtualisation.memorySize = 1024;
       };
       exporterTest = ''
         wait_for_unit("rspamd.service")

From ef4b914b113119b7a70cf90b37496413d85723a3 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 6 Mar 2020 04:20:00 -0500
Subject: [PATCH 2403/4636] vault: 1.3.2 -> 1.3.3

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

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 3b209d5c0689..ff4d6f014930 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "vault";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "17zymmm1r4yxwazn2qx2l01i7g91rn40h7hzgwf0pr6pwmdxvkzg";
+    sha256 = "1scwclkpb7v5pcx1afgjqrfgcp0c1bd9gqvwdmjbpfcyxv1f032d";
   };
 
   goPackagePath = "github.com/hashicorp/vault";
@@ -26,7 +26,7 @@ buildGoPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://www.vaultproject.io;
+    homepage = "https://www.vaultproject.io/";
     description = "A tool for managing secrets";
     platforms = platforms.linux ++ platforms.darwin;
     license = licenses.mpl20;

From c4b75f8983281fe3fd65e33e89eb193ce7ac6491 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 6 Mar 2020 04:20:00 -0500
Subject: [PATCH 2404/4636] terraform: 0.12.21 -> 0.12.23

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

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index da943c2aa7ea..6862ed23e742 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -112,8 +112,8 @@ in rec {
   terraform_0_11-full = terraform_0_11.full;
 
   terraform_0_12 = pluggable (generic {
-    version = "0.12.21";
-    sha256 = "128mrqib8rigy6kk6fby0pjh4jh2qm2qwkrlbn0wgfln0637d9ff";
+    version = "0.12.23";
+    sha256 = "1lr2gfk5dmj6rhv5rvzn3fggb34za73ryjy0vdzx4kf3qj12r0wz";
     patches = [ ./provider-path.patch ];
     passthru = { inherit plugins; };
   });

From 80729b6787df693b0f570e166210f5b5db432463 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCtke-Stetzkamp?= <christian@lkamp.de>
Date: Thu, 27 Feb 2020 16:39:35 +0100
Subject: [PATCH 2405/4636] stdenv: Fix gcc multi line libc-cflags

which broke at least libstdc++5.

Closes #79761
---
 pkgs/build-support/cc-wrapper/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index b078bf2fbbd3..8b218eb590b5 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -361,7 +361,11 @@ stdenv.mkDerivation {
       done
     ''
 
+    # There are a few tools (to name one libstdcxx5) which do not work
+    # well with multi line flags, so make the flags single line again
     + ''
+      substituteInPlace $out/nix-support/libc-cflags --replace $'\n' ' '
+
       substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
       substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh
       substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash

From ade67bd0520232c2a5e9f00ace3cb871fa22a9a7 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Thu, 5 Mar 2020 13:44:55 +0100
Subject: [PATCH 2406/4636] prometheus-mikrotik-exporter: init at 2020-02-10

---
 .../prometheus/mikrotik-exporter.nix          | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix

diff --git a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix
new file mode 100644
index 000000000000..12341eee911e
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "mikrotik-exporter-unstable";
+  version = "2020-02-10";
+
+  src = fetchFromGitHub {
+    owner = "nshttpd";
+    repo = "mikrotik-exporter";
+    sha256 = "193zh06rqp9ybsnkxwmv7l4p2h2xisw4f01jjirshsb784j44bh6";
+    rev = "3b33400d24abcfdc07dc31c15ca5ba7b82de444f";
+  };
+
+  modSha256 = "1cqjn6j3dfq51ssjx0qrajprlac1h0lb1r4af44lfpigzmrfyi07";
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Prometheus MikroTik device(s) exporter";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ mmilata ];
+  };
+}

From 421a18f42b93be350ca31cfd5fafd68f1caadeef Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Thu, 5 Mar 2020 22:39:38 +0100
Subject: [PATCH 2407/4636] nixos/prometheus-mikrotik-exporter: init

---
 .../monitoring/prometheus/exporters.nix       |  9 +++
 .../prometheus/exporters/mikrotik.nix         | 66 +++++++++++++++++++
 nixos/tests/prometheus-exporters.nix          | 40 +++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 4 files changed, 116 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/mikrotik.nix

diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index aeed55172daf..f9ad1457fc85 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -29,6 +29,7 @@ let
     "fritzbox"
     "json"
     "mail"
+    "mikrotik"
     "minio"
     "nextcloud"
     "nginx"
@@ -204,6 +205,14 @@ in
         Please ensure you have either `services.prometheus.exporters.snmp.configuration'
           or `services.prometheus.exporters.snmp.configurationPath' set!
       '';
+    } {
+      assertion = cfg.mikrotik.enable -> (
+        (cfg.mikrotik.configFile == null) != (cfg.mikrotik.configuration == null)
+      );
+      message = ''
+        Please specify either `services.prometheus.exporters.mikrotik.configuration'
+          or `services.prometheus.exporters.mikrotik.configFile'.
+      '';
     } {
       assertion = cfg.mail.enable -> (
         (cfg.mail.configFile == null) != (cfg.mail.configuration == null)
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/mikrotik.nix b/nixos/modules/services/monitoring/prometheus/exporters/mikrotik.nix
new file mode 100644
index 000000000000..62c2cc568476
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/mikrotik.nix
@@ -0,0 +1,66 @@
+{ config, lib, pkgs, options }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.exporters.mikrotik;
+in
+{
+  port = 9436;
+  extraOpts = {
+    configFile = mkOption {
+      type = types.nullOr types.path;
+      default = null;
+      description = ''
+        Path to a mikrotik exporter configuration file. Mutually exclusive with
+        <option>configuration</option> option.
+      '';
+      example = literalExample "./mikrotik.yml";
+    };
+
+    configuration = mkOption {
+      type = types.nullOr types.attrs;
+      default = null;
+      description = ''
+        Mikrotik exporter configuration as nix attribute set. Mutually exclusive with
+        <option>configFile</option> option.
+
+        See <link xlink:href="https://github.com/nshttpd/mikrotik-exporter/blob/master/README.md"/>
+        for the description of the configuration file format.
+      '';
+      example = literalExample ''
+        {
+          devices = [
+            {
+              name = "my_router";
+              address = "10.10.0.1";
+              user = "prometheus";
+              password = "changeme";
+            }
+          ];
+          features = {
+            bgp = true;
+            dhcp = true;
+            routes = true;
+            optics = true;
+          };
+        }
+      '';
+    };
+  };
+  serviceOpts = let
+    configFile = if cfg.configFile != null
+                 then cfg.configFile
+                 else "${pkgs.writeText "mikrotik-exporter.yml" (builtins.toJSON cfg.configuration)}";
+    in {
+    serviceConfig = {
+      # -port is misleading name, it actually accepts address too
+      ExecStart = ''
+        ${pkgs.prometheus-mikrotik-exporter}/bin/mikrotik-exporter \
+          -config-file=${escapeShellArg configFile} \
+          -port=${cfg.listenAddress}:${toString cfg.port} \
+          ${concatStringsSep " \\\n  " cfg.extraFlags}
+      '';
+    };
+  };
+}
diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix
index 00c7b915c883..4fc3668cfafb 100644
--- a/nixos/tests/prometheus-exporters.nix
+++ b/nixos/tests/prometheus-exporters.nix
@@ -245,6 +245,46 @@ let
       '';
     };
 
+    mikrotik = {
+      exporterConfig = {
+        enable = true;
+        extraFlags = [ "-timeout=1s" ];
+        configuration = {
+          devices = [
+            {
+              name = "router";
+              address = "192.168.42.48";
+              user = "prometheus";
+              password = "shh";
+            }
+          ];
+          features = {
+            bgp = true;
+            dhcp = true;
+            dhcpl = true;
+            dhcpv6 = true;
+            health = true;
+            routes = true;
+            poe = true;
+            pools = true;
+            optics = true;
+            w60g = true;
+            wlansta = true;
+            wlanif = true;
+            monitor = true;
+            ipsec = true;
+          };
+        };
+      };
+      exporterTest = ''
+        wait_for_unit("prometheus-mikrotik-exporter.service")
+        wait_for_open_port(9436)
+        succeed(
+            "curl -sSf http://localhost:9436/metrics | grep -q 'mikrotik_scrape_collector_success{device=\"router\"} 0'"
+        )
+      '';
+    };
+
     nextcloud = {
       exporterConfig = {
         enable = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5574d0cc76aa..4671c25a67c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15797,6 +15797,7 @@ in
   prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { };
   prometheus-mail-exporter = callPackage ../servers/monitoring/prometheus/mail-exporter.nix { };
   prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { };
+  prometheus-mikrotik-exporter = callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix { };
   prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { };
   prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { };
   prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { };

From 6e09f8cd3c671789af564e0752b23469758e1ed7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2020 09:52:03 +0000
Subject: [PATCH 2408/4636] focuswriter: 1.7.4 -> 1.7.5

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

diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix
index ccda1b4d4cbd..30e8af7facdb 100644
--- a/pkgs/applications/editors/focuswriter/default.nix
+++ b/pkgs/applications/editors/focuswriter/default.nix
@@ -2,11 +2,11 @@
 
 mkDerivation rec {
   pname = "focuswriter";
-  version = "1.7.4";
+  version = "1.7.5";
 
   src = fetchurl {
     url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2";
-    sha256 = "1fli85p9d58gsg2kwmncqdcw1nmx062kddbrhr50mnsn04dc4j3g";
+    sha256 = "19fqxyas941xcqjj68qpj42ayq0vw5rbd4ms5kvx8jyspp7wysqc";
   };
 
   nativeBuildInputs = [ pkgconfig qmake qttools ];
@@ -22,6 +22,6 @@ mkDerivation rec {
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ madjar ];
     platforms = platforms.linux;
-    homepage = https://gottcode.org/focuswriter/;
+    homepage = "https://gottcode.org/focuswriter/";
   };
 }

From 0810dc1129ecca2bdf57266df0bede95e90c26d7 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Fri, 6 Mar 2020 12:00:00 +0100
Subject: [PATCH 2409/4636] perlPackages.AuthenSCRAM: init at 0.011

dependencies:
perlPackages.CryptURandom: init at 0.36
perlPackages.PBKDF2Tiny: init at 0.005
perlPackages.UnicodeStringprep: init at 1.105
perlPackages.AuthenSASLSASLprep: init at 1.100
---
 pkgs/top-level/perl-packages.nix | 77 ++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 316be1531529..c6a610ae0ccd 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -878,6 +878,39 @@ let
     };
   };
 
+  AuthenSASLSASLprep = buildPerlModule {
+    pname = "Authen-SASL-SASLprep";
+    version = "1.100";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/C/CF/CFAERBER/Authen-SASL-SASLprep-1.100.tar.gz";
+      sha256 = "a4cccc34bb3f53acf0ba78c9fc61af8d156d109d1c10487ba5988a55077d1f70";
+    };
+    buildInputs = [ TestNoWarnings ];
+    propagatedBuildInputs = [ UnicodeStringprep ];
+    meta = {
+      description = "A Stringprep Profile for User Names and Passwords (RFC 4013)";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.sgo ];
+    };
+  };
+
+  AuthenSCRAM = buildPerlPackage {
+    pname = "Authen-SCRAM";
+    version = "0.011";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Authen-SCRAM-0.011.tar.gz";
+      sha256 = "45108c239a7373d00941dcf0d171acd03e7c16a63ce6f7d9568ff052b17cf5a8";
+    };
+    buildInputs = [ TestFailWarnings TestFatal ];
+    propagatedBuildInputs = [ AuthenSASLSASLprep CryptURandom Moo PBKDF2Tiny TryTiny TypeTiny namespaceclean ];
+    meta = {
+      homepage = "https://github.com/dagolden/Authen-SCRAM";
+      description = "Salted Challenge Response Authentication Mechanism (RFC 5802)";
+      license = stdenv.lib.licenses.asl20;
+      maintainers = [ maintainers.sgo ];
+    };
+  };
+
   AuthenSimple = buildPerlPackage {
     pname = "Authen-Simple";
     version = "0.5";
@@ -3634,6 +3667,20 @@ let
     };
   };
 
+  CryptURandom = buildPerlPackage {
+    pname = "Crypt-URandom";
+    version = "0.36";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/D/DD/DDICK/Crypt-URandom-0.36.tar.gz";
+      sha256 = "81fec9921adc5d3c91cbe0ad8cb2bb89b045c4fb0de9cb3c43f17e58e477f8a1";
+    };
+    meta = {
+      description = "Provide non blocking randomness";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.sgo ];
+    };
+  };
+
   CryptScryptKDF = buildPerlModule {
     pname = "Crypt-ScryptKDF";
     version = "0.010";
@@ -14555,6 +14602,21 @@ let
     };
   };
 
+  PBKDF2Tiny = buildPerlPackage {
+    pname = "PBKDF2-Tiny";
+    version = "0.005";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/PBKDF2-Tiny-0.005.tar.gz";
+      sha256 = "b4e21dc59b30265eaaa41b705087ec03447d9c655a14ac40ff46e4de29eabf8e";
+    };
+    meta = {
+      homepage = "https://github.com/dagolden/PBKDF2-Tiny";
+      description = "Minimalist PBKDF2 (RFC 2898) with HMAC-SHA1 or HMAC-SHA2";
+      license = stdenv.lib.licenses.asl20;
+      maintainers = [ maintainers.sgo ];
+    };
+  };
+
   pcscperl = buildPerlPackage {
     pname = "pcsc-perl";
     version = "1.4.14";
@@ -20243,6 +20305,21 @@ let
     };
   };
 
+  UnicodeStringprep = buildPerlModule {
+    pname = "Unicode-Stringprep";
+    version = "1.105";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/C/CF/CFAERBER/Unicode-Stringprep-1.105.tar.gz";
+      sha256 = "e6bebbc58408231fd1317db9102449b3e7da4fa437e79f637382d36313efd011";
+    };
+    buildInputs = [ TestNoWarnings ];
+    meta = {
+      description = "Preparation of Internationalized Strings (RFC 3454)";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.sgo ];
+    };
+  };
+
   UnixGetrusage = buildPerlPackage {
     pname = "Unix-Getrusage";
     version = "0.03";

From ee17a6a8379ffd791309b13143d76431f2f671df Mon Sep 17 00:00:00 2001
From: Jethro Kuan <jethrokuan95@gmail.com>
Date: Wed, 12 Feb 2020 18:21:40 +0800
Subject: [PATCH 2410/4636] mkdocs: default to Python 3

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

diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix
index e9e116280a03..605bb3f18c61 100644
--- a/pkgs/development/tools/documentation/mkdocs/default.nix
+++ b/pkgs/development/tools/documentation/mkdocs/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, python, fetchFromGitHub }:
+{ stdenv, lib, python3, fetchFromGitHub }:
 
-with python.pkgs;
+with python3.pkgs;
 
 buildPythonApplication rec {
   pname = "mkdocs";

From 2377b03970582a74696ebfd52a52a3f5511fcb1f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 6 Mar 2020 07:00:59 -0500
Subject: [PATCH 2411/4636] linux: 4.19.107 -> 4.19.108

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 6fc004a57aef..8bbda7aa10be 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.107";
+  version = "4.19.108";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0h02pxzzwc5w2kfqw686bpxc13a93yq449lyzxxkxq1qilcsqjv5";
+    sha256 = "18shyy1z2s8r26qb4rcz7gwl43dnmycjjywp9gss5zlfn2jyrbh9";
   };
 } // (args.argsOverride or {}))

From 0c9564891c3bdd6b952013b33828472b4b9b3e6d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 6 Mar 2020 07:04:42 -0500
Subject: [PATCH 2412/4636] linux: 5.4.23 -> 5.4.24

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index c1ea3b1cd978..2dedc1592e88 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.4.23";
+  version = "5.4.24";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1jhyg2yc03fka92l7hwdajim6q5rk538hjdr1gwgvpfyyp6sla1z";
+    sha256 = "1cvy3mxwzll4f9j8i3hfmi0i0zq75aiafq1jskp9n4kq9iwar83z";
   };
 } // (args.argsOverride or {}))

From 028bf0f722a6d0ef27150c3603d38f4fd58de33b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 6 Mar 2020 07:07:28 -0500
Subject: [PATCH 2413/4636] linux: 5.5.7 -> 5.5.8

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

diff --git a/pkgs/os-specific/linux/kernel/linux-5.5.nix b/pkgs/os-specific/linux/kernel/linux-5.5.nix
index 3f8f3b774c89..6f9305309ca9 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.5.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.5.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.5.7";
+  version = "5.5.8";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0j3ykz9yym2hvv3qx286g4yrx2ala4b1d5p9zif9qmch28ryyhxq";
+    sha256 = "01pw0gfafbsds6vq26qynffwvqm4khs953k1b6rrz8wris9zddp5";
   };
 } // (args.argsOverride or {}))

From 6fb69d61d91eb7907cb0331ea1ec9d3f1658bc92 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 6 Mar 2020 07:09:42 -0500
Subject: [PATCH 2414/4636] oh-my-zsh: 2020-03-05 -> 2020-03-05

---
 pkgs/shells/zsh/oh-my-zsh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index ea43057a07f0..4943a92faa74 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -6,11 +6,11 @@
 stdenv.mkDerivation rec {
   version = "2020-03-05";
   pname = "oh-my-zsh";
-  rev = "2f345a3d0c9a94891c909a9ae6f6e2e2dc6df5b2";
+  rev = "2eb3e9d57cf69f3c2fa557f9047e0a648d80b235";
 
   src = fetchgit { inherit rev;
     url = "https://github.com/ohmyzsh/ohmyzsh";
-    sha256 = "1xs6rz73i04b91ans8j3k46xxb64ljvx7v06j2wmr38lqfplw0ym";
+    sha256 = "025xd53j307wh3bly456b7y6r71wm2dzqn6xway0rsc6r5b70z4x";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];

From 4ed98d69ed434451c597168e77af8a12d69beaae Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 6 Mar 2020 12:53:37 +0000
Subject: [PATCH 2415/4636] nixos/nginx: use Mozilla Intermediate TLS
 configuration

The configuration at https://ssl-config.mozilla.org/#server=nginx&config=intermediate
is reliably kept up-to-date in terms of security and compatible with a
wide range of clients. They've probably had more care and thought put
into them than our defaults, and will be easier to keep updated in
the future.

The only removed (rather than changed) configuration option here is
ssl_ecdh_curve, per https://github.com/mozilla/server-side-tls/issues/189.

Resolves #80952.
---
 .../services/web-servers/nginx/default.nix    | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index c8602e5975b3..28b433104a1c 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -87,10 +87,17 @@ let
       ${optionalString (cfg.sslDhparam != null) "ssl_dhparam ${cfg.sslDhparam};"}
 
       ${optionalString (cfg.recommendedTlsSettings) ''
-        ssl_session_cache shared:SSL:42m;
-        ssl_session_timeout 23m;
-        ssl_ecdh_curve secp384r1;
-        ssl_prefer_server_ciphers on;
+        # Keep in sync with https://ssl-config.mozilla.org/#server=nginx&config=intermediate
+
+        ssl_session_timeout 1d;
+        ssl_session_cache shared:SSL:10m;
+        # Breaks forward secrecy: https://github.com/mozilla/server-side-tls/issues/135
+        ssl_session_tickets off;
+        # We don't enable insecure ciphers by default, so this allows
+        # clients to pick the most performant, per https://github.com/mozilla/server-side-tls/issues/260
+        ssl_prefer_server_ciphers off;
+
+        # OCSP stapling
         ssl_stapling on;
         ssl_stapling_verify on;
       ''}
@@ -487,8 +494,9 @@ in
 
       sslCiphers = mkOption {
         type = types.str;
-        default = "EECDH+aRSA+AESGCM:EDH+aRSA:EECDH+aRSA:+AES256:+AES128:+SHA1:!CAMELLIA:!SEED:!3DES:!DES:!RC4:!eNULL";
-        description = "Ciphers to choose from when negotiating tls handshakes.";
+        # Keep in sync with https://ssl-config.mozilla.org/#server=nginx&config=intermediate
+        default = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384";
+        description = "Ciphers to choose from when negotiating TLS handshakes.";
       };
 
       sslProtocols = mkOption {

From 70e5428d6686d320973473083a6c964ea5f353f7 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 6 Mar 2020 14:28:36 +0100
Subject: [PATCH 2416/4636] elan: 0.7.5 -> 0.8.0

---
 pkgs/applications/science/logic/elan/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix
index b77f5110521c..3ffd23b142a1 100644
--- a/pkgs/applications/science/logic/elan/default.nix
+++ b/pkgs/applications/science/logic/elan/default.nix
@@ -2,7 +2,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "elan";
-  version = "0.7.5";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "kha";
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1147f3lzr6lgvf580ppspn20bdwnf6l8idh1h5ana0p0lf5a0dn1";
   };
 
-  cargoSha256 = "0vja1cq6z7jlr4nzfdzn4gl8l31yld82zmgzwihnalif13q3fcps";
+  cargoSha256 = "19bhfpbj1isr448kpjws8w6b08gl9pafjd4fry7kzh9mhkf0rf7i";
 
   nativeBuildInputs = [ pkgconfig ];
 
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
   postInstall = ''
     pushd $out/bin
     mv elan-init elan
-    for link in lean leanpkg leanchecker; do
+    for link in lean leanpkg leanchecker leanc; do
       ln -s elan $link
     done
     popd

From 1f37499eb470c226dc5e00cf26a2585b201fb121 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2020 13:32:10 +0000
Subject: [PATCH 2417/4636] recursive: 1.042 -> 1.043

---
 pkgs/data/fonts/recursive/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix
index 9636d50a54f9..8aab8c0cd721 100644
--- a/pkgs/data/fonts/recursive/default.nix
+++ b/pkgs/data/fonts/recursive/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchzip }:
 
 let
-  version = "1.042";
+  version = "1.043";
 in
 fetchzip {
   name = "recursive-${version}";
@@ -14,7 +14,7 @@ fetchzip {
     unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2
   '';
 
-  sha256 = "1zcrvnzwd39fim2jxa3by6jgdrx7fdp64iw2bd181iwzinv1yqsa";
+  sha256 = "0y7wg3ssr4j0r8dyxd0i0ji8bjvipzsqf0l6wznl5sfxk41mvjvd";
 
   meta = with lib; {
     homepage = "https://recursive.design/";

From 2c398a1b9d610aa543ca397f4564bfcf44f88e3d Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Sun, 1 Mar 2020 23:23:02 +0300
Subject: [PATCH 2418/4636] gpxsee: 7.22 -> 7.25

---
 pkgs/applications/misc/gpxsee/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 2f314508b749..907a198ee3d4 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -1,24 +1,23 @@
-{ stdenv, mkDerivation, lib, fetchFromGitHub, qmake, qttools }:
+{ stdenv, mkDerivation, fetchFromGitHub, qmake, qttools }:
 
 mkDerivation rec {
   pname = "gpxsee";
-  version = "7.22";
+  version = "7.25";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     rev = version;
-    sha256 = "0gxkx255d8cn5076ync731cdygwvi95rxv463pd4rdw5srbr0gm5";
+    sha256 = "0lml3hz2zxljl9j5wnh7bn9bj8k9v3wf6bk3g77x9nnarsmw0fcx";
   };
 
-  nativeBuildInputs = [ qmake ];
-  buildInputs = [ qttools ];
+  nativeBuildInputs = [ qmake qttools ];
 
   preConfigure = ''
     lrelease lang/*.ts
   '';
 
-  postInstall = lib.optionalString stdenv.isDarwin ''
+  postInstall = with stdenv; lib.optionalString isDarwin ''
     mkdir -p $out/Applications
     mv GPXSee.app $out/Applications
     wrapQtApp $out/Applications/GPXSee.app/Contents/MacOS/GPXSee
@@ -26,8 +25,8 @@ mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
-    homepage = https://www.gpxsee.org/;
+  meta = with stdenv.lib; {
+    homepage = "https://www.gpxsee.org/";
     description = "GPS log file viewer and analyzer";
     longDescription = ''
       GPXSee is a Qt-based GPS log file viewer and analyzer that supports

From 8428f5bb4a7eef95576fb1fb0d30f5f3e92a2d3f Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 6 Mar 2020 15:35:37 +0100
Subject: [PATCH 2419/4636] elan: v0.8.0 tag was force-pushed by upstream

---
 pkgs/applications/science/logic/elan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix
index 3ffd23b142a1..ea3b05850990 100644
--- a/pkgs/applications/science/logic/elan/default.nix
+++ b/pkgs/applications/science/logic/elan/default.nix
@@ -8,10 +8,10 @@ rustPlatform.buildRustPackage rec {
     owner = "kha";
     repo = "elan";
     rev = "v${version}";
-    sha256 = "1147f3lzr6lgvf580ppspn20bdwnf6l8idh1h5ana0p0lf5a0dn1";
+    sha256 = "0n2ncssjcmp3x5kbnci7xbq5fgcihlr3vaglyhhwzrxkjy2vpmpd";
   };
 
-  cargoSha256 = "19bhfpbj1isr448kpjws8w6b08gl9pafjd4fry7kzh9mhkf0rf7i";
+  cargoSha256 = "1pkg0n7kxckr0zhr8dr12b9fxg5q185kj3r9k2rmnkj2dpa2mxh3";
 
   nativeBuildInputs = [ pkgconfig ];
 

From 263e390d9f0c09c089e718419b8a318b03810cfc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2020 14:59:54 +0000
Subject: [PATCH 2420/4636] ipset: 7.5 -> 7.6

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

diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix
index 6696252678dc..2c433ba8c29a 100644
--- a/pkgs/os-specific/linux/ipset/default.nix
+++ b/pkgs/os-specific/linux/ipset/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ipset";
-  version = "7.5";
+  version = "7.6";
 
   src = fetchurl {
     url = "http://ipset.netfilter.org/${pname}-${version}.tar.bz2";
-    sha256 = "02vangpxdyyk9z84vc0ba1vbjvfnd6zlniisc029xzkgmdafwym5";
+    sha256 = "1ny2spcm6bmpj8vnazssg99k59impr7n84jzkdmdjly1m7548z8f";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-kmod=no" ];
 
   meta = with stdenv.lib; {
-    homepage = http://ipset.netfilter.org/;
+    homepage = "http://ipset.netfilter.org/";
     description = "Administration tool for IP sets";
     license = licenses.gpl2;
     platforms = platforms.linux;

From b19c485b221a6486a46626664da5c8c446b1eac5 Mon Sep 17 00:00:00 2001
From: Luis Ressel <aranea@aixah.de>
Date: Fri, 6 Mar 2020 16:01:23 +0100
Subject: [PATCH 2421/4636] nixos/wireguard: Fix typo in error message

generatePrivateKey -> generatePrivateKeyFile
---
 nixos/modules/services/networking/wireguard.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index ff8e54a1ce20..e8f83f6dd8bf 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -428,7 +428,7 @@ in
       ++ (attrValues (
         mapAttrs (name: value: {
           assertion = value.generatePrivateKeyFile -> (value.privateKey == null);
-          message = "networking.wireguard.interfaces.${name}.generatePrivateKey must not be set if networking.wireguard.interfaces.${name}.privateKey is set.";
+          message = "networking.wireguard.interfaces.${name}.generatePrivateKeyFile must not be set if networking.wireguard.interfaces.${name}.privateKey is set.";
         }) cfg.interfaces))
         ++ map ({ interfaceName, peer, ... }: {
           assertion = (peer.presharedKey == null) || (peer.presharedKeyFile == null);

From 25151bcbb65a9f61984443a9f9db41aeb9bf6d7b Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 6 Mar 2020 20:03:05 +0200
Subject: [PATCH 2422/4636] sequoia: 0.14.0 -> 0.15.0

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

diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix
index 45dfddf7c145..fe0b13bbb973 100644
--- a/pkgs/tools/security/sequoia/default.nix
+++ b/pkgs/tools/security/sequoia/default.nix
@@ -9,16 +9,16 @@ assert pythonSupport -> pythonPackages != null;
 
 rustPlatform.buildRustPackage rec {
   pname = "sequoia";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchFromGitLab {
     owner = "sequoia-pgp";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1p17y6vsya8daglvl6yal3759x44dc062ah5vyra0k7dk82cc4pq";
+    sha256 = "1l6isis0ddb0b306z3cv2f5qz2bhw5pmf42shnrxzg7778dnmwhw";
   };
 
-  cargoSha256 = "1x0iwcp7dppxyrggmszd62s52j54szw69n3qnlyl7cdpdr64ckqc";
+  cargoSha256 = "0cfi42wx93yc9yib9lpxl6ph991ra39yfhw1lr16z2qzzbzj2b1j";
 
   nativeBuildInputs = [
     pkgconfig

From bce33c5d74127f2f980a089aab3677be6990d4d7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2020 19:37:20 +0000
Subject: [PATCH 2423/4636] libreswan: 3.30 -> 3.31

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

diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix
index afe37dc07706..71fdcc947d3a 100644
--- a/pkgs/tools/networking/libreswan/default.nix
+++ b/pkgs/tools/networking/libreswan/default.nix
@@ -6,7 +6,7 @@
 
 let
   optional = stdenv.lib.optional;
-  version = "3.30";
+  version = "3.31";
   name = "libreswan-${version}";
   binPath = stdenv.lib.makeBinPath [
     bash iproute iptables procps coreutils gnused gawk nss.tools which python
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://download.libreswan.org/${name}.tar.gz";
-    sha256 = "1bww4w5r6hx0xf9xdxvkfmcv7zyas58ls1mklk6k197kv2i0p24w";
+    sha256 = "1wxqsv11nqgfj5and5xzfgh6ayqvl47midcghd5ryynh60mp7naa";
   };
 
   # These flags were added to compile v3.18. Try to lift them when updating.
@@ -83,7 +83,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = https://libreswan.org;
+    homepage = "https://libreswan.org";
     description = "A free software implementation of the VPN protocol based on IPSec and the Internet Key Exchange";
     platforms = platforms.linux ++ platforms.darwin ++ platforms.freebsd;
     license = licenses.gpl2;

From 4babdd0bac48fc36cd7b2756320ab9982e434d02 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 6 Mar 2020 21:21:39 +0100
Subject: [PATCH 2424/4636] dav1d: 0.5.2 -> 0.6.0 (#81900)

---
 pkgs/development/libraries/dav1d/default.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix
index 5542a37661ac..6b238074fcab 100644
--- a/pkgs/development/libraries/dav1d/default.nix
+++ b/pkgs/development/libraries/dav1d/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab
+{ stdenv, fetchFromGitLab, fetchpatch
 , meson, ninja, nasm, pkgconfig
 , withTools ? false # "dav1d" binary
 , withExamples ? false, SDL2 # "dav1dplay" binary
@@ -9,16 +9,23 @@ assert useVulkan -> withExamples;
 
 stdenv.mkDerivation rec {
   pname = "dav1d";
-  version = "0.5.2";
+  version = "0.6.0";
 
   src = fetchFromGitLab {
     domain = "code.videolan.org";
     owner = "videolan";
     repo = pname;
     rev = version;
-    sha256 = "0acxlgyz6c8ckw8vfgn60y2zg2n00l5xsq5jlxvwbh5w5pkc3ahf";
+    sha256 = "1gr859xzbqrsp892v9zzzgrg8smnnzgc1jmb68qzl54a4g6jrxm0";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://code.videolan.org/videolan/dav1d/-/commit/e04227c5f6729b460e0b8e5fb52eae2d5acd15ef.patch";
+      sha256 = "18mpvwviqx0x9k6av98vgpjqlzcjd89g8496zsbf57bw5dadij3l";
+    })
+  ];
+
   nativeBuildInputs = [ meson ninja nasm pkgconfig ];
   # TODO: doxygen (currently only HTML and not build by default).
   buildInputs = stdenv.lib.optional withExamples SDL2
@@ -38,6 +45,8 @@ stdenv.mkDerivation rec {
       subsampling and bit-depth parameters.
     '';
     inherit (src.meta) homepage;
+    changelog = "https://code.videolan.org/videolan/dav1d/-/tags/${version}";
+    # More technical: https://code.videolan.org/videolan/dav1d/blob/${version}/NEWS
     license = licenses.bsd2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ primeos ];

From 0395f441c0a0b9ecefe54559a6e34494bff4ba7a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2020 20:23:24 +0000
Subject: [PATCH 2425/4636] libxmlb: 0.1.14 -> 0.1.15

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

diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix
index 5ff5209020ce..f559a4e50509 100644
--- a/pkgs/development/libraries/libxmlb/default.nix
+++ b/pkgs/development/libraries/libxmlb/default.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libxmlb";
-  version = "0.1.14";
+  version = "0.1.15";
 
   outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ];
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     owner = "hughsie";
     repo = "libxmlb";
     rev = version;
-    sha256 = "05snbv1dvqa96k7xlwi2sj161315kps3baansr9xdpwim5ckmwc6";
+    sha256 = "1mb73pnfwqc4mm0lm16yfn0lj495h8hcciprb2v6wgy3ifnnjxib";
   };
 
   patches = [
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A library to help create and query binary XML blobs";
-    homepage = https://github.com/hughsie/libxmlb;
+    homepage = "https://github.com/hughsie/libxmlb";
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ jtojnar ];
     platforms = platforms.linux;

From 75087d8882c78707fdcc820145680fad27e1386d Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 6 Mar 2020 15:41:49 +0100
Subject: [PATCH 2426/4636] python3Packages.django_compat: fix tests and
 re-enable

---
 .../python-modules/django-compat/default.nix  |  6 +-
 .../django-compat/fix-tests.diff              | 61 +++++++++++++++++++
 2 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/python-modules/django-compat/fix-tests.diff

diff --git a/pkgs/development/python-modules/django-compat/default.nix b/pkgs/development/python-modules/django-compat/default.nix
index c492e65854a7..9caa1cb730ba 100644
--- a/pkgs/development/python-modules/django-compat/default.nix
+++ b/pkgs/development/python-modules/django-compat/default.nix
@@ -5,8 +5,6 @@
 buildPythonPackage rec {
   pname = "django-compat";
   version = "1.0.15";
-  # django-compat requires django < 2.0
-  disabled = stdenv.lib.versionAtLeast django.version "2.0";
 
   # the pypi packages don't include everything required for the tests
   src = fetchFromGitHub {
@@ -16,6 +14,10 @@ buildPythonPackage rec {
     sha256 = "1pr6v38ahrsvxlgmcx69s4b5q5082f44gzi4h3c32sccdc4pwqxp";
   };
 
+  patches = [
+    ./fix-tests.diff
+  ];
+
   checkPhase = ''
     runHook preCheck
 
diff --git a/pkgs/development/python-modules/django-compat/fix-tests.diff b/pkgs/development/python-modules/django-compat/fix-tests.diff
new file mode 100644
index 000000000000..76d7852c57a9
--- /dev/null
+++ b/pkgs/development/python-modules/django-compat/fix-tests.diff
@@ -0,0 +1,61 @@
+diff -Nur a/compat/tests/settings.py b/compat/tests/settings.py
+--- a/compat/tests/settings.py	2020-03-06 15:32:07.548482597 +0100
++++ b/compat/tests/settings.py	2020-03-06 15:36:45.270265678 +0100
+@@ -16,10 +16,17 @@
+     'django.contrib.admin',
+     'django.contrib.auth',
+     'django.contrib.contenttypes',
++    'django.contrib.messages',
+     'compat',
+     'compat.tests.test_app',
+ ]
+ 
++MIDDLEWARE = (
++    'django.contrib.auth.middleware.AuthenticationMiddleware',
++    'django.contrib.messages.middleware.MessageMiddleware',
++    'django.contrib.sessions.middleware.SessionMiddleware',
++)
++
+ MIDDLEWARE_CLASSES = (
+     'django.contrib.sessions.middleware.SessionMiddleware',
+     'django.middleware.common.CommonMiddleware',
+@@ -43,6 +50,7 @@
+                 'django.template.context_processors.i18n',
+                 'django.template.context_processors.tz',
+                 'django.template.context_processors.request',
++                'django.contrib.messages.context_processors.messages',
+             ],
+             'loaders': [
+                 'django.template.loaders.filesystem.Loader',
+diff -Nur a/compat/tests/test_compat.py b/compat/tests/test_compat.py
+--- a/compat/tests/test_compat.py	2020-03-06 15:32:07.548482597 +0100
++++ b/compat/tests/test_compat.py	2020-03-06 15:37:39.202835075 +0100
+@@ -9,7 +9,7 @@
+ from django.core.serializers.json import DjangoJSONEncoder
+ from django.test import TestCase, SimpleTestCase
+ from django.test.client import RequestFactory
+-from django.contrib.auth.views import logout
++from django.contrib.auth.views import auth_logout
+ try:
+     from django.urls import NoReverseMatch
+ except ImportError:
+@@ -103,7 +103,7 @@
+         Tests that passing a view name to ``resolve_url`` will result in the
+         URL path mapping to that view name.
+         """
+-        resolved_url = resolve_url(logout)
++        resolved_url = resolve_url(auth_logout)
+         self.assertEqual('/accounts/logout/', resolved_url)
+ 
+     '''
+Les fichiers binaires a/compat/tests/.test_compat.py.swp et b/compat/tests/.test_compat.py.swp sont différents
+diff -Nur a/compat/tests/urls.py b/compat/tests/urls.py
+--- a/compat/tests/urls.py	2020-03-06 15:32:07.548482597 +0100
++++ b/compat/tests/urls.py	2020-03-06 15:34:25.962377799 +0100
+@@ -2,5 +2,5 @@
+ from django.contrib.auth import views
+ 
+ urlpatterns = [
+-    url(r'^accounts/logout/$', views.logout, name='logout'),
++    url(r'^accounts/logout/$', views.auth_logout, name='logout'),
+ ]

From 2610d5e762030a3cb53168eb42527b4855a2f72e Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Sat, 29 Feb 2020 23:21:14 +0900
Subject: [PATCH 2427/4636] haskellPackages.pantry: get building with ghc882

---
 .../haskell-modules/configuration-common.nix  | 23 +++++++++++++++++++
 .../configuration-hackage2nix.yaml            |  1 -
 .../haskell-modules/hackage-packages.nix      |  2 --
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0901af4e7b31..0e7aa40272ef 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1401,4 +1401,27 @@ self: super: {
   # https://github.com/bergmark/feed/issues/43
   feed = dontCheck super.feed;
 
+  pantry = appendPatches super.pantry [
+    # Pantry has been updated for ghc-8.8 upstream, but there hasn't been a
+    # release yet with this patch. This can probably be removed when a
+    # version of pantry is released after 0.2.0.0.
+    # https://github.com/commercialhaskell/pantry/pull/6
+    (pkgs.fetchpatch {
+      url = "https://github.com/commercialhaskell/pantry/pull/6.diff";
+      sha256 = "0aml06jshpjh3aiscs5av7y33m3d6s6x5pzdvh7pky476izfg87k";
+      excludes = [
+        ".azure/azure-linux-template.yml"
+        ".azure/azure-osx-template.yml"
+        ".azure/azure-windows-template.yml"
+        "package.yaml"
+        "pantry.cabal"
+        "stack-lts-11.yaml"
+        "stack-lts-12.yaml"
+        "stack-nightly.yaml"
+        "stack-windows.yaml"
+        "stack.yaml"
+      ];
+    })
+  ];
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 42223a656f80..5dc173ae6325 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -8026,7 +8026,6 @@ broken-packages:
   - pangraph
   - panpipe
   - pansite
-  - pantry
   - pantry-tmp
   - papa
   - papa-base
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 7f596626cde3..b2775227fb95 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -181165,8 +181165,6 @@ self: {
        ];
        description = "Content addressable Haskell package management";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "pantry-tmp" = callPackage

From 5682212ae09e079c057c28b2f72ba191e0511af3 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Sat, 29 Feb 2020 23:32:44 +0900
Subject: [PATCH 2428/4636] haskellPackages.stack: get compiling with ghc882

---
 .../haskell-modules/configuration-common.nix  |  24 +++-
 .../configuration-hackage2nix.yaml            |   1 -
 .../haskell-modules/hackage-packages.nix      |   2 -
 .../patches/stack-ghc882-support.patch        | 104 ++++++++++++++++++
 4 files changed, 126 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/patches/stack-ghc882-support.patch

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0e7aa40272ef..55eb4f47cda0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1072,8 +1072,28 @@ self: super: {
 
   # Generate shell completion.
   cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
-  stack = generateOptparseApplicativeCompletion "stack" (super.stack.overrideScope (self: super: {
-  }));
+
+  stack =
+    generateOptparseApplicativeCompletion
+      "stack"
+      (appendPatches super.stack [
+        # This PR fixes stack up to be able to build with Cabal-3.  This patch
+        # can probably be dropped when the next stack release is made after
+        # 2.1.3.1.
+        (pkgs.fetchpatch {
+          url = "https://github.com/commercialhaskell/stack/pull/5156.diff";
+          sha256 = "0knk6f9fh1b4fxkhvx5gfrwclal4vi2va4zy34gpmwnjr7knf42y";
+          excludes = [
+            "snapshot-lts-12.yaml"
+            "snapshot-nightly.yaml"
+            "snapshot.yaml"
+          ];
+        })
+        # This patch fixes stack up to be able to build various GHC-8.8 changes.
+        # This can hopefully be dropped when the next stack release is made
+        # after 2.1.3.1 (assuming the next stack release uses GHC-8.8).
+        ./patches/stack-ghc882-support.patch
+      ]);
 
   # musl fixes
   # dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 5dc173ae6325..995363b5012c 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -9572,7 +9572,6 @@ broken-packages:
   - stable-marriage
   - stable-memo
   - stable-tree
-  - stack
   - stack-bump
   - stack-fix
   - stack-hpc-coveralls
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index b2775227fb95..ed7b9d772da8 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -226938,8 +226938,6 @@ self: {
        '';
        description = "The Haskell Tool Stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "stack-bump" = callPackage
diff --git a/pkgs/development/haskell-modules/patches/stack-ghc882-support.patch b/pkgs/development/haskell-modules/patches/stack-ghc882-support.patch
new file mode 100644
index 000000000000..0d906638e7fa
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/stack-ghc882-support.patch
@@ -0,0 +1,104 @@
+diff --git a/src/Stack/Coverage.hs b/src/Stack/Coverage.hs
+index d95fa332..f80e121a 100644
+--- a/src/Stack/Coverage.hs
++++ b/src/Stack/Coverage.hs
+@@ -235,7 +235,7 @@ generateHpcReportForTargets opts tixFiles targetNames = do
+                              case nc of
+                                  CTest testName ->
+                                      liftM (pkgPath </>) $ parseRelFile (T.unpack testName ++ "/" ++ T.unpack testName ++ ".tix")
+-                                 _ -> fail $
++                                 _ -> liftIO $ fail $
+                                      "Can't specify anything except test-suites as hpc report targets (" ++
+                                      packageNameString name ++
+                                      " is used with a non test-suite target)"
+diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs
+index b69337ce..08eb9b9f 100644
+--- a/src/Stack/Package.hs
++++ b/src/Stack/Package.hs
+@@ -463,7 +463,7 @@ makeObjectFilePathFromC
+ makeObjectFilePathFromC cabalDir namedComponent distDir cFilePath = do
+     relCFilePath <- stripProperPrefix cabalDir cFilePath
+     relOFilePath <-
+-        parseRelFile (replaceExtension (toFilePath relCFilePath) "o")
++        parseRelFile (System.FilePath.replaceExtension (toFilePath relCFilePath) "o")
+     return (componentOutputDir namedComponent distDir </> relOFilePath)
+ 
+ -- | Make the global autogen dir if Cabal version is new enough.
+diff --git a/src/Stack/Script.hs b/src/Stack/Script.hs
+index c63c9f62..70257be1 100644
+--- a/src/Stack/Script.hs
++++ b/src/Stack/Script.hs
+@@ -172,8 +172,8 @@ scriptCmd opts = do
+ 
+   toExeName fp =
+     if osIsWindows
+-      then replaceExtension fp "exe"
+-      else dropExtension fp
++      then System.FilePath.replaceExtension fp "exe"
++      else System.FilePath.dropExtension fp
+ 
+ getPackagesFromImports
+   :: FilePath -- ^ script filename
+diff --git a/src/Stack/Setup.hs b/src/Stack/Setup.hs
+index 8bbfc45c..5c5b028c 100644
+--- a/src/Stack/Setup.hs
++++ b/src/Stack/Setup.hs
+@@ -876,7 +876,7 @@ buildGhcFromSource getSetupInfo' installed (CompilerRepository url) commitId fla
+          (_,files) <- listDir (cwd </> bindistPath)
+          let
+            isBindist p = "ghc-" `isPrefixOf` (toFilePath (filename p))
+-                         && fileExtension (filename p) == ".xz"
++                         && (maybe "" id (fileExtension (filename p))) == ".xz"
+            mbindist = filter isBindist files
+          case mbindist of
+            [bindist] -> do
+diff --git a/src/Stack/Storage/Project.hs b/src/Stack/Storage/Project.hs
+index dc5318d8..984e6259 100644
+--- a/src/Stack/Storage/Project.hs
++++ b/src/Stack/Storage/Project.hs
+@@ -12,6 +12,9 @@
+ {-# LANGUAGE UndecidableInstances #-}
+ {-# OPTIONS_GHC -Wno-unused-top-binds -Wno-identities #-}
+ 
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE StandaloneDeriving #-}
++
+ -- | Work with SQLite database used for caches across a single project.
+ module Stack.Storage.Project
+     ( initProjectStorage
+diff --git a/src/Stack/Storage/User.hs b/src/Stack/Storage/User.hs
+index 3845b094..09695344 100644
+--- a/src/Stack/Storage/User.hs
++++ b/src/Stack/Storage/User.hs
+@@ -12,6 +12,9 @@
+ {-# LANGUAGE UndecidableInstances #-}
+ {-# OPTIONS_GHC -Wno-unused-top-binds -Wno-identities #-}
+ 
++{-# LANGUAGE DerivingStrategies #-}
++{-# LANGUAGE StandaloneDeriving #-}
++
+ -- | Work with SQLite database used for caches across an entire user account.
+ module Stack.Storage.User
+     ( initUserStorage
+diff --git a/src/Stack/Types/Config.hs b/src/Stack/Types/Config.hs
+index a5cc22b5..a329d353 100644
+--- a/src/Stack/Types/Config.hs
++++ b/src/Stack/Types/Config.hs
+@@ -406,7 +406,7 @@ instance FromJSON CabalConfigKey where
+ instance FromJSONKey CabalConfigKey where
+   fromJSONKey = FromJSONKeyTextParser parseCabalConfigKey
+ 
+-parseCabalConfigKey :: Monad m => Text -> m CabalConfigKey
++parseCabalConfigKey :: MonadFail m => Text -> m CabalConfigKey
+ parseCabalConfigKey "$targets" = pure CCKTargets
+ parseCabalConfigKey "$locals" = pure CCKLocals
+ parseCabalConfigKey "$everything" = pure CCKEverything
+@@ -974,7 +974,7 @@ parseConfigMonoidObject rootDir obj = do
+ 
+     return ConfigMonoid {..}
+   where
+-    handleExplicitSetupDep :: Monad m => (Text, Bool) -> m (Maybe PackageName, Bool)
++    handleExplicitSetupDep :: MonadFail m => (Text, Bool) -> m (Maybe PackageName, Bool)
+     handleExplicitSetupDep (name', b) = do
+         name <-
+             if name' == "*"

From 3a986cded99bb8fbbe6d30de0b69074621335865 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Sun, 1 Mar 2020 05:48:18 -0800
Subject: [PATCH 2429/4636] haskellPackages.taffybar: Fix compilation with
 ghc882

---
 .../haskell-modules/configuration-hackage2nix.yaml            | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 995363b5012c..ccabe8ae8180 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -5284,7 +5284,6 @@ broken-packages:
   - gtfs-realtime
   - gtk-jsinput
   - gtk-serialized-event
-  - gtk-sni-tray
   - gtk-toy
   - gtk2hs-hello
   - gtk2hs-rpn
@@ -9622,7 +9621,6 @@ broken-packages:
   - statsd
   - statsd-client
   - statsdi
-  - status-notifier-item
   - statvfs
   - stb-image-redux
   - stc-lang
@@ -9810,7 +9808,6 @@ broken-packages:
   - Tablify
   - tabloid
   - tabs
-  - taffybar
   - tag-bits
   - tag-stream
   - tagged-exception-core
@@ -10697,7 +10694,6 @@ broken-packages:
   - xchat-plugin
   - xcp
   - xdcc
-  - xdg-desktop-entry
   - xdot
   - Xec
   - xenstore

From 3cb572ef292993c54a6896e3a1464001db9456ed Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 2 Mar 2020 18:04:30 +0100
Subject: [PATCH 2430/4636] LTS Haskell 15.2

---
 .../configuration-hackage2nix.yaml            | 61 +++++++++++--------
 1 file changed, 36 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index ccabe8ae8180..4c75b2141cf4 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -76,7 +76,7 @@ default-package-overrides:
   # gi-gdkx11-4.x requires gtk-4.x, which is still under development and
   # not yet available in Nixpkgs
   - gi-gdkx11 < 4
-  # LTS Haskell 15.1
+  # LTS Haskell 15.2
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Angle ==1.0
@@ -104,7 +104,7 @@ default-package-overrides:
   - aeson-schemas ==1.0.3
   - aeson-utils ==0.3.0.2
   - aeson-yak ==0.1.1.3
-  - aeson-yaml ==1.0.5.0
+  - aeson-yaml ==1.0.6.0
   - al ==0.1.4.2
   - alerts ==0.1.2.0
   - alex ==3.2.5
@@ -266,7 +266,7 @@ default-package-overrides:
   - autoexporter ==1.1.15
   - auto-update ==0.1.6
   - avers ==0.0.17.1
-  - avro ==0.4.6.0
+  - avro ==0.4.7.0
   - aws-cloudfront-signed-cookies ==0.2.0.1
   - base16-bytestring ==0.1.1.6
   - base32string ==0.9.1
@@ -354,12 +354,13 @@ default-package-overrides:
   - bv ==0.5
   - bv-little ==1.1.1
   - byteable ==0.1.1
+  - bytebuild ==0.3.4.0
   - bytedump ==1.0
   - byte-order ==0.1.2.0
   - byteorder ==1.0.4
   - bytes ==0.17
   - byteset ==0.1.1.0
-  - byteslice ==0.2.1.0
+  - byteslice ==0.2.2.0
   - bytesmith ==0.3.5.0
   - bytestring-builder ==0.10.8.2.0
   - bytestring-conversion ==0.3.1
@@ -373,7 +374,7 @@ default-package-overrides:
   - cabal-doctest ==1.0.8
   - cabal-flatpak ==0.1
   - cabal-plan ==0.6.2.0
-  - cabal-rpm ==2.0.2
+  - cabal-rpm ==2.0.4
   - cache ==0.1.3.0
   - cacophony ==0.10.1
   - calendar-recycling ==0.0.0.1
@@ -390,7 +391,7 @@ default-package-overrides:
   - cassava-megaparsec ==2.0.1
   - cast ==0.1.0.2
   - category ==0.2.5.0
-  - cayley-client ==0.4.11
+  - cayley-client ==0.4.12
   - cborg ==0.2.2.1
   - cborg-json ==0.2.2.0
   - cereal ==0.5.8.1
@@ -498,7 +499,7 @@ default-package-overrides:
   - core-text ==0.2.3.3
   - countable ==1.0
   - cpio-conduit ==0.7.0
-  - cpphs ==1.20.8
+  - cpphs ==1.20.9
   - cprng-aes ==0.6.1
   - cpu ==0.1.2
   - cpuinfo ==0.1.0.1
@@ -584,7 +585,7 @@ default-package-overrides:
   - declarative ==0.5.2
   - deepseq-generics ==0.2.0.0
   - deferred-folds ==0.9.10.1
-  - dejafu ==2.1.0.1
+  - dejafu ==2.1.0.3
   - dense-linear-algebra ==0.1.0.0
   - deque ==0.4.3
   - deriveJsonNoPrefix ==0.1.0.1
@@ -661,6 +662,7 @@ default-package-overrides:
   - elerea ==2.9.0
   - elf ==0.30
   - eliminators ==0.6
+  - elm2nix ==0.2
   - elm-bridge ==0.5.2
   - elm-core-sources ==1.0.0
   - elm-export ==0.6.0.1
@@ -724,11 +726,11 @@ default-package-overrides:
   - fft ==0.1.8.6
   - fgl ==5.7.0.2
   - filecache ==0.4.1
-  - file-embed ==0.0.11.1
+  - file-embed ==0.0.11.2
   - file-embed-lzma ==0
   - filelock ==0.1.1.4
   - filemanip ==0.3.6.3
-  - filepattern ==0.1.1
+  - filepattern ==0.1.2
   - fileplow ==0.1.0.0
   - filtrable ==0.1.3.0
   - fin ==0.1.1
@@ -836,9 +838,9 @@ default-package-overrides:
   - ghcid ==0.8.1
   - ghci-hexcalc ==0.1.1.0
   - ghcjs-codemirror ==0.0.0.2
-  - ghc-lib ==8.8.2.20200205
-  - ghc-lib-parser ==8.8.2.20200205
-  - ghc-lib-parser-ex ==8.8.5.2
+  - ghc-lib ==8.8.3.20200224
+  - ghc-lib-parser ==8.8.3.20200224
+  - ghc-lib-parser-ex ==8.8.5.3
   - ghc-paths ==0.1.0.12
   - ghc-prof ==1.4.1.6
   - ghc-source-gen ==0.3.0.0
@@ -882,7 +884,7 @@ default-package-overrides:
   - gluturtle ==0.0.58.1
   - gnuplot ==0.5.6.1
   - google-isbn ==1.0.3
-  - gothic ==0.1.3
+  - gothic ==0.1.4
   - gpolyline ==0.1.0.1
   - graph-core ==0.3.0.0
   - graphite ==0.10.0.1
@@ -903,6 +905,7 @@ default-package-overrides:
   - hamtsolo ==1.0.3
   - HandsomeSoup ==0.4.2
   - happy ==1.19.12
+  - HasBigDecimal ==0.1.1
   - hashable ==1.3.0.0
   - hashable-time ==0.2.0.2
   - hashids ==1.0.2.4
@@ -959,7 +962,7 @@ default-package-overrides:
   - hinotify ==0.4
   - hint ==0.9.0.2
   - hjsmin ==0.2.0.4
-  - hkgr ==0.2.4.1
+  - hkgr ==0.2.5.2
   - hlibcpuid ==0.2.0
   - hlibgit2 ==0.18.0.16
   - hmatrix ==0.20.0.0
@@ -1078,7 +1081,7 @@ default-package-overrides:
   - hw-mquery ==0.2.0.2
   - hw-packed-vector ==0.2.0.1
   - hw-parser ==0.1.0.2
-  - hw-prim ==0.6.2.39
+  - hw-prim ==0.6.2.40
   - hw-rankselect ==0.13.3.2
   - hw-rankselect-base ==0.3.3.0
   - hw-simd ==0.1.1.5
@@ -1121,6 +1124,7 @@ default-package-overrides:
   - ini ==0.4.1
   - inj ==1.0
   - inline-c ==0.9.0.0
+  - inline-c-cpp ==0.4.0.2
   - insert-ordered-containers ==0.2.3
   - inspection-testing ==0.4.2.2
   - instance-control ==0.1.2.0
@@ -1163,6 +1167,7 @@ default-package-overrides:
   - ix-shapable ==0.1.0
   - jack ==0.7.1.4
   - jira-wiki-markup ==1.0.0
+  - jose ==0.8.2.0
   - jose-jwt ==0.8.0
   - js-dgtable ==0.5.2
   - js-flot ==0.8.3
@@ -1172,7 +1177,7 @@ default-package-overrides:
   - jsonpath ==0.2.0.0
   - json-rpc ==1.0.1
   - json-rpc-generic ==0.2.1.5
-  - JuicyPixels ==3.3.4
+  - JuicyPixels ==3.3.5
   - JuicyPixels-extra ==0.4.1
   - JuicyPixels-scale-dct ==0.1.2
   - junit-xml ==0.1.0.0
@@ -1197,7 +1202,7 @@ default-package-overrides:
   - lackey ==1.0.11
   - LambdaHack ==0.9.5.0
   - lame ==0.2.0
-  - language-avro ==0.1.0.0
+  - language-avro ==0.1.2.0
   - language-c ==0.8.3
   - language-c-quote ==0.12.2.1
   - language-haskell-extract ==0.2.4
@@ -1333,6 +1338,7 @@ default-package-overrides:
   - miso ==1.4.0.0
   - missing-foreign ==0.1.1
   - mixed-types-num ==0.4.0.1
+  - mixpanel-client ==0.2.1
   - mltool ==0.2.0.1
   - mmap ==0.5.9
   - mmark ==0.0.7.2
@@ -1612,7 +1618,7 @@ default-package-overrides:
   - pretty-sop ==0.2.0.3
   - pretty-types ==0.3.0.1
   - primes ==0.2.1.0
-  - primitive ==0.7.0.0
+  - primitive ==0.7.0.1
   - primitive-addr ==0.1.0.2
   - primitive-extras ==0.8
   - primitive-offset ==0.2.0.0
@@ -1767,7 +1773,7 @@ default-package-overrides:
   - SafeSemaphore ==0.10.1
   - salak ==0.3.5.3
   - salak-yaml ==0.3.5.3
-  - saltine ==0.1.0.2
+  - saltine ==0.1.1.0
   - salve ==1.0.8
   - sample-frame ==0.0.3
   - sample-frame-np ==0.0.4.1
@@ -1809,6 +1815,9 @@ default-package-overrides:
   - serf ==0.1.1.0
   - serialise ==0.2.2.0
   - servant ==0.16.2
+  - servant-auth ==0.3.2.0
+  - servant-auth-server ==0.4.5.1
+  - servant-auth-swagger ==0.2.10.0
   - servant-blaze ==0.9
   - servant-cassava ==0.10
   - servant-checked-exceptions ==2.2.0.0
@@ -1836,6 +1845,7 @@ default-package-overrides:
   - servant-swagger-ui-redoc ==0.3.3.1.22.3
   - servant-websockets ==2.0.0
   - servant-yaml ==0.1.0.1
+  - serverless-haskell ==0.10.1
   - serversession ==1.0.1
   - serversession-frontend-wai ==1.0
   - ses-html ==0.4.0.0
@@ -1881,7 +1891,7 @@ default-package-overrides:
   - skylighting ==0.8.3.2
   - skylighting-core ==0.8.3.2
   - slist ==0.1.0.0
-  - small-bytearray-builder ==0.3.3.0
+  - small-bytearray-builder ==0.3.4.0
   - smallcheck ==1.1.5
   - smoothie ==0.4.2.10
   - snap-blaze ==0.2.1.5
@@ -1907,7 +1917,7 @@ default-package-overrides:
   - Spintax ==0.3.3
   - splice ==0.6.1.1
   - split ==0.2.3.4
-  - splitmix ==0.0.3
+  - splitmix ==0.0.4
   - spoon ==0.3.1
   - spreadsheet ==0.1.3.8
   - sql-words ==0.1.6.3
@@ -1970,6 +1980,7 @@ default-package-overrides:
   - symengine ==0.1.2.0
   - sysinfo ==0.1.1
   - system-argv0 ==0.1.1
+  - systemd ==2.2.0
   - system-fileio ==0.3.16.4
   - system-filepath ==0.4.14
   - system-info ==0.5.1
@@ -2039,7 +2050,7 @@ default-package-overrides:
   - text-printer ==0.5.0.1
   - text-region ==0.3.1.0
   - text-short ==0.1.3
-  - text-show ==3.8.4
+  - text-show ==3.8.5
   - text-show-instances ==3.8.3
   - text-zipper ==0.10.1
   - tfp ==1.0.1.1
@@ -2174,7 +2185,7 @@ default-package-overrides:
   - unordered-containers ==0.2.10.0
   - unordered-intmap ==0.1.1
   - unsafe ==0.0
-  - urbit-hob ==0.3.1
+  - urbit-hob ==0.3.2
   - uri-bytestring ==0.3.2.2
   - uri-bytestring-aeson ==0.1.0.7
   - uri-encode ==1.5.0.5
@@ -2333,7 +2344,7 @@ default-package-overrides:
   - zeromq4-haskell ==0.8.0
   - zeromq4-patterns ==0.3.1.0
   - zim-parser ==0.2.1.0
-  - zip ==1.3.0
+  - zip ==1.3.1
   - zip-archive ==0.4.1
   - zippers ==0.3
   - zip-stream ==0.2.0.1

From e9f89e0fb6546532df9872e68dd7668341cd66df Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Mon, 2 Mar 2020 02:47:42 -0800
Subject: [PATCH 2431/4636] haskellPackages.nixfmt: Unbreak

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 pkgs/development/haskell-modules/configuration-common.nix      | 3 +++
 .../development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 55eb4f47cda0..d0a1929c00e0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1444,4 +1444,7 @@ self: super: {
     })
   ];
 
+  # https://github.com/serokell/nixfmt/pull/62
+  nixfmt = doJailbreak super.nixfmt;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 4c75b2141cf4..cbedb9fcb71e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -7813,7 +7813,6 @@ broken-packages:
   - nix-eval
   - nix-freeze-tree
   - nix-tools
-  - nixfmt
   - nixfromnpm
   - nixpkgs-update
   - nkjp

From 2c7128cb41ed1cbfb6c5e4f6d17f3d0995a41758 Mon Sep 17 00:00:00 2001
From: Gabor Greif <ggreif@gmail.com>
Date: Mon, 2 Mar 2020 20:40:48 +0100
Subject: [PATCH 2432/4636] unbreak lsp-related packages

these work with GHC v8.8.2
---
 .../development/haskell-modules/configuration-hackage2nix.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index cbedb9fcb71e..edb140b3dd1c 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -5530,9 +5530,7 @@ broken-packages:
   - haskell-go-checkers
   - haskell-in-space
   - haskell-kubernetes
-  - haskell-lsp
   - haskell-lsp-client
-  - haskell-lsp-types
   - haskell-ml
   - haskell-mpfr
   - haskell-names
@@ -7192,7 +7190,6 @@ broken-packages:
   - ls-usb
   - lscabal
   - LslPlus
-  - lsp-test
   - lsystem
   - ltext
   - ltk

From f26fee6218f576502b28810a4e904d07ea942e4d Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Sat, 29 Feb 2020 16:46:28 +0900
Subject: [PATCH 2433/4636] haskellPackages.binary-instances: mark unbroken

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index edb140b3dd1c..d889596fd03d 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3106,7 +3106,6 @@ broken-packages:
   - binary-ext
   - binary-file
   - binary-indexed-tree
-  - binary-instances
   - binary-protocol
   - binary-protocol-zmq
   - binary-search

From 17144b143b66d86284e3d4701f9a07d664cef242 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Sat, 29 Feb 2020 16:47:11 +0900
Subject: [PATCH 2434/4636] haskellPackages.github: mark unbroken

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index d889596fd03d..e93d02bd240f 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -5095,7 +5095,6 @@ broken-packages:
   - git-repair
   - git-sanity
   - gitdo
-  - github
   - github-backup
   - github-data
   - github-release

From 34d3bdf0377b54ba953484ac8fa66dc5701c0098 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Thu, 5 Mar 2020 23:07:19 +0100
Subject: [PATCH 2435/4636] perlPackages.ParserYapp: init ad 1.21

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 316be1531529..5848aaa7e787 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14493,6 +14493,19 @@ let
     };
   };
 
+  ParseYapp = buildPerlPackage {
+    pname = "Parser-Yapp";
+    version = "1.21";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/W/WB/WBRASWELL/Parse-Yapp-1.21.tar.gz;
+      sha256 = "1r8kbyk0qd4ficmabj753kjpq0ib0csk01169w7jxflg62cfj41q";
+    };
+    meta = {
+      description = "Perl extension for generating and using LALR parsers";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   PathClass = buildPerlModule {
     pname = "Path-Class";
     version = "0.37";

From 3d61af8e33ee9c54c3049d50f67e48eb6ac51164 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Thu, 5 Mar 2020 23:58:32 +0100
Subject: [PATCH 2436/4636] plex: 1.18.7.2438 -> 1.18.7.2457

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

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index 24422842e355..666da1363517 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -8,13 +8,13 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.18.7.2438-f342a5a43";
+  version = "1.18.7.2457-77cb9455c";
   pname = "plexmediaserver";
 
   # Fetch the source
   src = fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm";
-    sha256 = "07lill29ck5h6lnrxj4k709afh36d6giy4jzv1jwcvcq1hdrvmzh";
+    sha256 = "1lhsf4qrq77vqj63a6r0gm90nnlqg50b6v24lrpld1aia9akm9f1";
   };
 
   outputs = [ "out" "basedb" ];

From 596700c870896ccc00447bf2941550d0b728e4a0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2020 21:09:14 +0000
Subject: [PATCH 2437/4636] libqmi: 1.24.4 -> 1.24.6

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

diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix
index c40e45afaf0b..396706b88e63 100644
--- a/pkgs/development/libraries/libqmi/default.nix
+++ b/pkgs/development/libraries/libqmi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libqmi";
-  version = "1.24.4";
+  version = "1.24.6";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz";
-    sha256 = "12licfsszr6qxpg9b2b04qm2glk8d42fcy32zr8jzwrgr7gbl5h3";
+    sha256 = "1jfq8jdjc9z5c0g7m377svdlniwkr4k9hs7s8fsb5rvdq5xja98k";
   };
 
   outputs = [ "out" "dev" "devdoc" ];

From e7e936ff131becf955e801f80e3766545533972d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Mar 2020 21:06:55 +0100
Subject: [PATCH 2438/4636] hackage2nix: disable Hydra builds that don't
 evaluate or fail

---
 .../configuration-hackage2nix.yaml              | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index e93d02bd240f..789747973e7c 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2359,7 +2359,6 @@ extra-packages:
   - ansi-terminal == 0.10.3             # required by cabal-plan, and policeman in ghc-8.8.x
   - aeson-pretty < 0.8                  # required by elm compiler
   - apply-refact < 0.4                  # newer versions don't work with GHC 8.0.x
-  - aws ^>= 0.18                        # pre-lts-11.x versions neeed by git-annex 6.20180227
   - binary > 0.7 && < 0.8               # keep a 7.x major release around for older compilers
   - binary > 0.8 && < 0.9               # keep a 8.x major release around for older compilers
   - blank-canvas < 0.6.3                # more recent versions depend on base-compat-batteries == 0.10.* but we're on base-compat-0.9.*
@@ -2968,29 +2967,17 @@ broken-packages:
   - awesomium
   - awesomium-glut
   - awesomium-raw
-  - aws
   - aws-configuration-tools
   - aws-dynamodb-conduit
-  - aws-dynamodb-streams
-  - aws-easy
-  - aws-ec2
   - aws-ec2-knownhosts
   - aws-elastic-transcoder
-  - aws-general
-  - aws-kinesis
   - aws-kinesis-client
   - aws-kinesis-reshard
-  - aws-lambda
-  - aws-lambda-haskell-runtime
   - aws-mfa-credentials
   - aws-performance-tests
-  - aws-route53
   - aws-sdk
-  - aws-sdk-text-converter
-  - aws-sdk-xml-unordered
   - aws-sign4
   - aws-simple
-  - aws-sns
   - axel
   - axiom
   - azubi
@@ -3369,7 +3356,6 @@ broken-packages:
   - cabal-install-bundle
   - cabal-install-ghc72
   - cabal-install-ghc74
-  - cabal-install-parsers
   - cabal-lenses
   - cabal-meta
   - cabal-mon
@@ -5512,7 +5498,6 @@ broken-packages:
   - haskell-bitmex-client
   - haskell-bitmex-rest
   - haskell-brainfuck
-  - haskell-ci
   - haskell-cnc
   - haskell-coffee
   - haskell-compression
@@ -7076,6 +7061,7 @@ broken-packages:
   - liquid-fixpoint
   - liquidhaskell
   - liquidhaskell-cabal
+  - Liquorice
   - list-fusion-probe
   - list-mux
   - list-prompt
@@ -10140,6 +10126,7 @@ broken-packages:
   - tree-sitter-json
   - tree-sitter-php
   - tree-sitter-python
+  - tree-sitter-ql
   - tree-sitter-ruby
   - tree-sitter-tsx
   - tree-sitter-typescript

From 71be218584fa9bd8f070ac5cf7d1a5f685d6c45f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 1 Mar 2020 02:30:35 +0100
Subject: [PATCH 2439/4636] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.0-21-ga388e13 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/ed1012ae12b97d5a7964edc97397c6e3490d5881.
---
 .../haskell-modules/hackage-packages.nix      | 2325 ++++++++++-------
 1 file changed, 1444 insertions(+), 881 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index ed7b9d772da8..d2d3c3436821 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2974,8 +2974,8 @@ self: {
      }:
      mkDerivation {
        pname = "Chart-fltkhs";
-       version = "0.1.0.5";
-       sha256 = "1fyi7h3n7n3r0y71j938h4gppr7ywdgj5s2qjjpykh144xqixmdf";
+       version = "0.1.0.6";
+       sha256 = "0wj0im5y76ag10li9ra285z1hdbsx467p2q72clpqa1whasfja2q";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -3310,6 +3310,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Color_0_1_4" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-doctest, colour, criterion
+     , data-default-class, deepseq, doctest, hspec, HUnit, JuicyPixels
+     , massiv, massiv-test, QuickCheck, random, template-haskell, vector
+     }:
+     mkDerivation {
+       pname = "Color";
+       version = "0.1.4";
+       sha256 = "155h0zyl7gqpks4441ib4vjcdqpijmza0hx19lifg6kjvygpfj6d";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [ base data-default-class deepseq vector ];
+       testHaskellDepends = [
+         base colour doctest hspec HUnit JuicyPixels massiv massiv-test
+         QuickCheck random template-haskell vector
+       ];
+       benchmarkHaskellDepends = [ base colour criterion deepseq random ];
+       description = "Color spaces and conversions between them";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Combinatorrent" = callPackage
     ({ mkDerivation, array, attoparsec, base, bytestring, cereal
      , containers, deepseq, directory, filepath, hopenssl, hslogger
@@ -9562,8 +9583,8 @@ self: {
      }:
      mkDerivation {
        pname = "HaTeX";
-       version = "3.22.0.0";
-       sha256 = "06n5r66giqwg9235fdzlky181ll1n7qlqhc9nv8gsb8dv9a6a6yv";
+       version = "3.22.1.0";
+       sha256 = "1an10gxrhb6kxrp2hgmya6bx06xmr6y4dhvz5wnz6jqavnv2mmwh";
        libraryHaskellDepends = [
          base bibtex bytestring containers hashable matrix parsec
          prettyprinter QuickCheck text transformers
@@ -11550,22 +11571,6 @@ self: {
      }) {};
 
   "JuicyPixels" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
-     , primitive, transformers, vector, zlib
-     }:
-     mkDerivation {
-       pname = "JuicyPixels";
-       version = "3.3.4";
-       sha256 = "0qacrnz2qcykj3f6c4k2p8qd31pa2slpv3ykfblgizrfh3401q6x";
-       libraryHaskellDepends = [
-         base binary bytestring containers deepseq mtl primitive
-         transformers vector zlib
-       ];
-       description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "JuicyPixels_3_3_5" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
      , primitive, transformers, vector, zlib
      }:
@@ -11579,7 +11584,6 @@ self: {
        ];
        description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JuicyPixels-blp" = callPackage
@@ -12511,6 +12515,20 @@ self: {
        broken = true;
      }) {};
 
+  "Liquorice" = callPackage
+    ({ mkDerivation, base, binary, bytestring, HTF, mtl }:
+     mkDerivation {
+       pname = "Liquorice";
+       version = "0.0.1";
+       sha256 = "067vnmm74wrdjpy4syabn8l2gr11s4pfarn6156mfhf981svnzqd";
+       libraryHaskellDepends = [ base binary bytestring HTF mtl ];
+       testHaskellDepends = [ base binary bytestring HTF mtl ];
+       description = "Algorithmic Doom map generation";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "List" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -23528,6 +23546,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aeson-combinators" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, fail, hspec
+     , scientific, text, time, time-compat, unordered-containers
+     , utf8-string, uuid-types, vector, void
+     }:
+     mkDerivation {
+       pname = "aeson-combinators";
+       version = "0.0.1.1";
+       sha256 = "0dcdmmpsjs7lkyznyvazxy977niysb58pwjidc2pkv26xdrkm2nk";
+       libraryHaskellDepends = [
+         aeson base bytestring containers fail scientific text time
+         time-compat unordered-containers uuid-types vector void
+       ];
+       testHaskellDepends = [
+         aeson base bytestring hspec text utf8-string
+       ];
+       description = "Aeson combinators for dead simple JSON decoding";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aeson-compat" = callPackage
     ({ mkDerivation, aeson, attoparsec, attoparsec-iso8601, base
      , base-compat, base-orphans, bytestring, containers, exceptions
@@ -24240,16 +24278,16 @@ self: {
      }) {};
 
   "aeson-value-parser" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, mtl
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, hashable, mtl
      , scientific, text, transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "aeson-value-parser";
-       version = "0.16";
-       sha256 = "07l08rbx7xdp0jnr672skmisaa5wikpn6h43m6i9l7l7x1937b38";
+       version = "0.17";
+       sha256 = "0xsvlwsql73g9lmd6izmgqfv8fvbbssmizkryaaphazym443hiw5";
        libraryHaskellDepends = [
-         aeson attoparsec base bytestring mtl scientific text transformers
-         unordered-containers vector
+         aeson attoparsec base bytestring hashable mtl scientific text
+         transformers unordered-containers vector
        ];
        description = "API for parsing \"aeson\" JSON tree into Haskell types";
        license = stdenv.lib.licenses.mit;
@@ -24267,29 +24305,6 @@ self: {
      }) {};
 
   "aeson-yaml" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, string-qq, tasty
-     , tasty-discover, tasty-hunit, text, unordered-containers, vector
-     , yaml
-     }:
-     mkDerivation {
-       pname = "aeson-yaml";
-       version = "1.0.5.0";
-       sha256 = "0cx54xqv2w4lcnnmcwapbizxjzxaf0x2xbr7lbhcy380nx99pi73";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring text unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring string-qq tasty tasty-discover tasty-hunit
-         unordered-containers yaml
-       ];
-       testToolDepends = [ tasty-discover ];
-       description = "Output any Aeson value as YAML (pure Haskell library)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "aeson-yaml_1_0_6_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, string-qq, tasty
      , tasty-discover, tasty-hunit, text, unordered-containers, vector
      , yaml
@@ -24310,7 +24325,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Output any Aeson value as YAML (pure Haskell library)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "affection" = callPackage
@@ -24931,8 +24945,8 @@ self: {
      }:
      mkDerivation {
        pname = "alarmclock";
-       version = "0.7.0.2";
-       sha256 = "0sp9h8vy8i4pvyadnb1ibpxpfxjikdr9ds3y9y8321cmkprlbs87";
+       version = "0.7.0.4";
+       sha256 = "0am8q26yj29k82y9bsgrlqxam1wllzdnxjbwqx4cgmjkzr7x802j";
        libraryHaskellDepends = [
          async base clock stm time unbounded-delays
        ];
@@ -31196,8 +31210,8 @@ self: {
      }:
      mkDerivation {
        pname = "arduino-copilot";
-       version = "1.5.0";
-       sha256 = "0g2mhav0v9q9f3wbb7i42zdkx6wfl3mp6ikmvg4sglv5356z4xw6";
+       version = "1.5.1";
+       sha256 = "0j7j2npipgd6jrlm9gn76ia3xbpnbiicn125ii673qzfgfzmgwrh";
        libraryHaskellDepends = [
          base containers copilot copilot-c99 copilot-language directory
          filepath mtl optparse-applicative unix
@@ -34012,8 +34026,8 @@ self: {
      }:
      mkDerivation {
        pname = "aura";
-       version = "2.2.0";
-       sha256 = "0cgba7f5nnbapxyb180kd5v69jj47zb2j43r5xf233dxw6ac7a8w";
+       version = "2.2.1";
+       sha256 = "01biz0slwjn9pbjfpg2lc1fywjyk9y0zvhjrbv4kx9nxnbrb7b2b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -34515,42 +34529,6 @@ self: {
      }) {};
 
   "avro" = callPackage
-    ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
-     , binary, bytestring, containers, data-binary-ieee754, deepseq
-     , directory, doctest, doctest-discover, extra, fail, gauge
-     , hashable, hspec, hspec-discover, lens, lens-aeson, mtl
-     , QuickCheck, random, raw-strings-qq, scientific, semigroups
-     , tagged, template-haskell, text, tf-random, transformers
-     , unordered-containers, vector, zlib
-     }:
-     mkDerivation {
-       pname = "avro";
-       version = "0.4.6.0";
-       sha256 = "127w8pny2ah05wa44khqs53vdyh54jlxvihxhpqk94wx8ggg00vx";
-       libraryHaskellDepends = [
-         aeson array base base16-bytestring bifunctors binary bytestring
-         containers data-binary-ieee754 deepseq fail hashable mtl scientific
-         semigroups tagged template-haskell text tf-random
-         unordered-containers vector zlib
-       ];
-       testHaskellDepends = [
-         aeson array base base16-bytestring bifunctors binary bytestring
-         containers directory doctest doctest-discover extra fail hashable
-         hspec lens lens-aeson mtl QuickCheck raw-strings-qq scientific
-         semigroups tagged template-haskell text tf-random transformers
-         unordered-containers vector zlib
-       ];
-       testToolDepends = [ doctest-discover hspec-discover ];
-       benchmarkHaskellDepends = [
-         aeson base bytestring containers gauge hashable mtl random
-         raw-strings-qq template-haskell text transformers
-         unordered-containers vector
-       ];
-       description = "Avro serialization support for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "avro_0_4_7_0" = callPackage
     ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
      , binary, bytestring, containers, data-binary-ieee754, deepseq
      , directory, doctest, doctest-discover, extra, fail, gauge
@@ -34584,7 +34562,6 @@ self: {
        ];
        description = "Avro serialization support for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "avro-piper" = callPackage
@@ -34698,13 +34675,13 @@ self: {
        broken = true;
      }) {awesomium = null;};
 
-  "aws_0_18" = callPackage
+  "aws" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , base64-bytestring, blaze-builder, byteable, bytestring
-     , case-insensitive, cereal, conduit, conduit-combinators
-     , conduit-extra, containers, cryptonite, data-default, directory
-     , errors, filepath, http-client, http-client-tls, http-conduit
-     , http-types, lifted-base, memory, monad-control, mtl, network
+     , case-insensitive, cereal, conduit, conduit-extra, containers
+     , cryptonite, data-default, directory, errors, exceptions, filepath
+     , http-client, http-client-tls, http-conduit, http-types
+     , lifted-base, memory, monad-control, mtl, network, network-bsd
      , old-locale, QuickCheck, quickcheck-instances, resourcet, safe
      , scientific, tagged, tasty, tasty-hunit, tasty-quickcheck, text
      , time, transformers, transformers-base, unordered-containers
@@ -34712,48 +34689,8 @@ self: {
      }:
      mkDerivation {
        pname = "aws";
-       version = "0.18";
-       sha256 = "0h7473wkvc5xjzx5fd5k5fp70rjq5gqmn1cpy95mswvvfsq3irxj";
-       revision = "1";
-       editedCabalFile = "0y3xkhnaksj926khsy1d8gks2jzphkaibi97h98l47nbh962ickj";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base base16-bytestring base64-bytestring
-         blaze-builder byteable bytestring case-insensitive cereal conduit
-         conduit-extra containers cryptonite data-default directory filepath
-         http-conduit http-types lifted-base memory monad-control mtl
-         network old-locale resourcet safe scientific tagged text time
-         transformers unordered-containers utf8-string vector xml-conduit
-       ];
-       testHaskellDepends = [
-         aeson base bytestring conduit-combinators errors http-client
-         http-client-tls http-types lifted-base monad-control mtl QuickCheck
-         quickcheck-instances resourcet tagged tasty tasty-hunit
-         tasty-quickcheck text time transformers transformers-base
-       ];
-       description = "Amazon Web Services (AWS) for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "aws" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
-     , base64-bytestring, blaze-builder, byteable, bytestring
-     , case-insensitive, cereal, conduit, conduit-extra, containers
-     , cryptonite, data-default, directory, errors, exceptions, filepath
-     , http-client, http-client-tls, http-conduit, http-types
-     , lifted-base, memory, monad-control, mtl, network, old-locale
-     , QuickCheck, quickcheck-instances, resourcet, safe, scientific
-     , tagged, tasty, tasty-hunit, tasty-quickcheck, text, time
-     , transformers, transformers-base, unordered-containers
-     , utf8-string, vector, xml-conduit
-     }:
-     mkDerivation {
-       pname = "aws";
-       version = "0.21.1";
-       sha256 = "047zfpc3bzdxgh6adfi1xls3j300vhyzcykzf9wyasxksw4xnrxl";
+       version = "0.22";
+       sha256 = "1l3f94mpih7slz37ikyjkyrwvlf110w87997d8sbnbd8glwlcb8r";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -34761,9 +34698,9 @@ self: {
          blaze-builder byteable bytestring case-insensitive cereal conduit
          conduit-extra containers cryptonite data-default directory
          exceptions filepath http-client-tls http-conduit http-types
-         lifted-base memory monad-control mtl network old-locale resourcet
-         safe scientific tagged text time transformers unordered-containers
-         utf8-string vector xml-conduit
+         lifted-base memory monad-control mtl network network-bsd old-locale
+         resourcet safe scientific tagged text time transformers
+         unordered-containers utf8-string vector xml-conduit
        ];
        testHaskellDepends = [
          aeson base bytestring conduit errors http-client http-client-tls
@@ -34773,8 +34710,6 @@ self: {
        ];
        description = "Amazon Web Services (AWS) for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-cloudfront-signed-cookies" = callPackage
@@ -34876,8 +34811,6 @@ self: {
        ];
        description = "Haskell bindings for Amazon DynamoDB Streams";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-easy" = callPackage
@@ -34901,8 +34834,6 @@ self: {
        ];
        description = "Helper function and types for working with amazonka";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-ec2" = callPackage
@@ -34932,8 +34863,6 @@ self: {
        ];
        description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-ec2-knownhosts" = callPackage
@@ -35007,8 +34936,6 @@ self: {
        ];
        description = "Bindings for Amazon Web Services (AWS) General Reference";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-kinesis" = callPackage
@@ -35034,8 +34961,6 @@ self: {
        ];
        description = "Bindings for Amazon Kinesis";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-kinesis-client" = callPackage
@@ -35121,8 +35046,6 @@ self: {
        ];
        description = "Haskell bindings for AWS Lambda";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-lambda-haskell-runtime" = callPackage
@@ -35141,8 +35064,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Haskell runtime for AWS Lambda";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-lambda-runtime" = callPackage
@@ -35232,8 +35153,6 @@ self: {
        ];
        description = "Amazon Route53 DNS service plugin for the aws package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-sdk" = callPackage
@@ -35285,8 +35204,6 @@ self: {
        ];
        description = "The text converter for aws-sdk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-sdk-xml-unordered" = callPackage
@@ -35307,8 +35224,6 @@ self: {
        ];
        description = "The xml parser for aws-sdk package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "aws-ses-easy" = callPackage
@@ -35395,8 +35310,6 @@ self: {
        ];
        description = "Bindings for AWS SNS Version 2013-03-31";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "axel" = callPackage
@@ -36126,8 +36039,8 @@ self: {
     ({ mkDerivation, base, containers, hspec, QuickCheck, time }:
      mkDerivation {
        pname = "bank-holidays-england";
-       version = "0.2.0.2";
-       sha256 = "1r82plqk1danqby90snmp4zjzdkwryvhbzj1c67b0h0k9w42v781";
+       version = "0.2.0.4";
+       sha256 = "1lqjcpxacjkvgy0900av004xsshyjqx1hq1q0ig42f8r6r4cnf3m";
        libraryHaskellDepends = [ base containers time ];
        testHaskellDepends = [ base containers hspec QuickCheck time ];
        description = "Calculation of bank holidays in England and Wales";
@@ -38829,8 +38742,6 @@ self: {
        ];
        description = "Orphan instances for binary";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "binary-list" = callPackage
@@ -41160,17 +41071,17 @@ self: {
      }:
      mkDerivation {
        pname = "bitwise-enum";
-       version = "0.1.0.3";
-       sha256 = "192hv1ln2jb2ms36vrk110j79wsxgqgdwbq47slyq3fcd77l908i";
+       version = "1.0.0";
+       sha256 = "11klr2qxbly9ppcv7b1pcrvqfw6h0l3qqwy0wzlv05jqhaywjxwc";
        libraryHaskellDepends = [
          aeson array base deepseq mono-traversable vector
        ];
        testHaskellDepends = [
-         aeson base deepseq mono-traversable QuickCheck test-framework
+         aeson array base deepseq mono-traversable QuickCheck test-framework
          test-framework-quickcheck2 vector
        ];
        benchmarkHaskellDepends = [
-         aeson base deepseq gauge mono-traversable vector wide-word
+         aeson array base deepseq gauge mono-traversable vector wide-word
        ];
        description = "Bitwise operations on bounded enumerations";
        license = stdenv.lib.licenses.bsd3;
@@ -45115,26 +45026,6 @@ self: {
      }) {};
 
   "byteslice" = callPackage
-    ({ mkDerivation, base, bytestring, primitive, primitive-addr
-     , primitive-unlifted, quickcheck-classes, run-st, tasty
-     , tasty-hunit, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "byteslice";
-       version = "0.2.1.0";
-       sha256 = "0dwvxj0rxk7jfb4yjwrr7jwxwv0f5bz8h21wrr4hw7max2wfanll";
-       libraryHaskellDepends = [
-         base primitive primitive-addr primitive-unlifted run-st
-       ];
-       testHaskellDepends = [
-         base bytestring primitive quickcheck-classes tasty tasty-hunit
-         tasty-quickcheck
-       ];
-       description = "Slicing managed and unmanaged memory";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "byteslice_0_2_2_0" = callPackage
     ({ mkDerivation, base, bytestring, gauge, primitive, primitive-addr
      , primitive-unlifted, quickcheck-classes, run-st, tasty
      , tasty-hunit, tasty-quickcheck
@@ -45153,7 +45044,6 @@ self: {
        benchmarkHaskellDepends = [ base gauge primitive ];
        description = "Slicing managed and unmanaged memory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytesmith" = callPackage
@@ -45180,6 +45070,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bytesmith_0_3_6_0" = callPackage
+    ({ mkDerivation, base, byte-order, byteslice, bytestring
+     , contiguous, gauge, primitive, run-st, tasty, tasty-hunit
+     , tasty-quickcheck, text-short, wide-word
+     }:
+     mkDerivation {
+       pname = "bytesmith";
+       version = "0.3.6.0";
+       sha256 = "0idkkmmw5n8dv7hx236s1543n0k6gsj9s0yk6fggbaqydlsxn641";
+       libraryHaskellDepends = [
+         base byteslice bytestring contiguous primitive run-st text-short
+         wide-word
+       ];
+       testHaskellDepends = [
+         base byte-order byteslice primitive tasty tasty-hunit
+         tasty-quickcheck text-short wide-word
+       ];
+       benchmarkHaskellDepends = [
+         base byteslice bytestring gauge primitive
+       ];
+       description = "Nonresumable byte parser";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bytestring_0_10_10_0" = callPackage
     ({ mkDerivation, base, byteorder, deepseq, directory, dlist
      , ghc-prim, HUnit, integer-gmp, mtl, QuickCheck, random
@@ -46618,8 +46533,6 @@ self: {
        ];
        description = "Utilities to work with cabal-install files";
        license = "GPL-2.0-or-later AND BSD-3-Clause";
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "cabal-lenses" = callPackage
@@ -46790,26 +46703,6 @@ self: {
      }) {};
 
   "cabal-rpm" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, directory, filepath
-     , http-client, http-client-tls, http-conduit, optparse-applicative
-     , process, simple-cabal, simple-cmd, simple-cmd-args, time, unix
-     }:
-     mkDerivation {
-       pname = "cabal-rpm";
-       version = "2.0.2";
-       sha256 = "1cnnibn10sv39ilsy222rr9q5pl56jshnpjp80pih4fzvq8myjbw";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base bytestring Cabal directory filepath http-client
-         http-client-tls http-conduit optparse-applicative process
-         simple-cabal simple-cmd simple-cmd-args time unix
-       ];
-       description = "RPM packaging tool for Haskell Cabal-based packages";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "cabal-rpm_2_0_4" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath
      , http-client, http-client-tls, http-conduit, optparse-applicative
      , process, simple-cabal, simple-cmd, simple-cmd-args, time, unix
@@ -46827,7 +46720,6 @@ self: {
        ];
        description = "RPM packaging tool for Haskell Cabal-based packages";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-scripts" = callPackage
@@ -48538,6 +48430,43 @@ self: {
        broken = true;
      }) {};
 
+  "casa-client" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
+     , bytestring, casa-types, conduit, conduit-extra, cryptonite
+     , exceptions, http-conduit, http-types, memory, network-uri
+     , resourcet, template-haskell, text, th-lift, unliftio-core
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "casa-client";
+       version = "0.0.1";
+       sha256 = "1l8lhk7bbrpjip693a3p6kp92aryajb6aw1w4ycak7nrb947dvjw";
+       libraryHaskellDepends = [
+         aeson attoparsec base base16-bytestring bytestring casa-types
+         conduit conduit-extra cryptonite exceptions http-conduit http-types
+         memory network-uri resourcet template-haskell text th-lift
+         unliftio-core unordered-containers
+       ];
+       description = "Client for Casa";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "casa-types" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
+     , bytestring, hashable, path-pieces, persistent, text
+     }:
+     mkDerivation {
+       pname = "casa-types";
+       version = "0.0.1";
+       sha256 = "0f8c4a43rh6zr5cwingxyjfpisipy4x4xc0lpasfjaj4vhjgwqkp";
+       libraryHaskellDepends = [
+         aeson attoparsec base base16-bytestring bytestring hashable
+         path-pieces persistent text
+       ];
+       description = "Types for Casa";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "casadi-bindings" = callPackage
     ({ mkDerivation, base, binary, casadi, casadi-bindings-core
      , casadi-bindings-internal, cereal, containers, doctest, HUnit
@@ -49465,27 +49394,6 @@ self: {
      }) {};
 
   "cayley-client" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
-     , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
-     , mtl, text, transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "cayley-client";
-       version = "0.4.11";
-       sha256 = "0acsrb2dawcrc088497b3480z3v5ilb2qvgwrxyy13ri36khadgf";
-       libraryHaskellDepends = [
-         aeson attoparsec base binary bytestring exceptions http-client
-         http-conduit lens lens-aeson mtl text transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [ aeson base hspec unordered-containers ];
-       description = "A Haskell client for the Cayley graph database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "cayley-client_0_4_12" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
      , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
      , mtl, text, transformers, unordered-containers, vector
@@ -50859,6 +50767,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "checkers_0_5_4" = callPackage
+    ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }:
+     mkDerivation {
+       pname = "checkers";
+       version = "0.5.4";
+       sha256 = "09g1430hjqxy01w0rgp0d03z2y8nw2zjyvfxs0kl9j0gyv57a10v";
+       libraryHaskellDepends = [
+         array base QuickCheck random semigroupoids
+       ];
+       description = "Check properties on standard classes and data structures";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "checkmate" = callPackage
     ({ mkDerivation, base, bytestring, containers, diff-parse
      , directory, file-embed, filepath, github, hlint, hspec
@@ -52333,13 +52255,13 @@ self: {
      , filepath, ghc, ghc-boot, ghc-prim, ghc-typelits-extra
      , ghc-typelits-knownnat, ghc-typelits-natnormalise, ghci, hashable
      , haskeline, integer-gmp, lens, mtl, primitive, process, reflection
-     , template-haskell, text, time, transformers, uniplate, unix
+     , split, template-haskell, text, time, transformers, uniplate, unix
      , unordered-containers, utf8-string, vector
      }:
      mkDerivation {
        pname = "clash-ghc";
-       version = "1.0.1";
-       sha256 = "00g5j3f8j9virq32mmbk8qi6nkjcgagw6n9n8kwv9x3xyl4cpjkq";
+       version = "1.2.0";
+       sha256 = "1rv8bjs563c8r543crj69dnp1610bch3dsxb5c0wckf799l8bmpn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -52347,7 +52269,7 @@ self: {
          concurrent-supply containers deepseq directory filepath ghc
          ghc-boot ghc-prim ghc-typelits-extra ghc-typelits-knownnat
          ghc-typelits-natnormalise ghci hashable haskeline integer-gmp lens
-         mtl primitive process reflection template-haskell text time
+         mtl primitive process reflection split template-haskell text time
          transformers uniplate unix unordered-containers utf8-string vector
        ];
        executableHaskellDepends = [ base ];
@@ -52360,23 +52282,25 @@ self: {
   "clash-lib" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, binary
      , bytestring, clash-prelude, concurrent-supply, containers
-     , data-binary-ieee754, deepseq, directory, errors, exceptions
-     , filepath, ghc, ghc-typelits-knownnat, hashable, hint, integer-gmp
-     , interpolate, lens, mtl, parsers, prettyprinter, primitive
-     , process, reducers, tasty, tasty-hunit, template-haskell
-     , temporary, text, text-show, time, transformers, trifecta
-     , unordered-containers, vector, vector-binary-instances
+     , data-binary-ieee754, data-default, deepseq, directory, dlist
+     , errors, exceptions, extra, filepath, ghc, ghc-boot-th
+     , ghc-typelits-knownnat, hashable, haskell-src-meta, hint
+     , integer-gmp, interpolate, lens, mtl, ordered-containers, parsers
+     , prettyprinter, primitive, process, reducers, tasty, tasty-hunit
+     , template-haskell, temporary, text, text-show, time, transformers
+     , trifecta, unordered-containers, vector, vector-binary-instances
      }:
      mkDerivation {
        pname = "clash-lib";
-       version = "1.0.1";
-       sha256 = "0icp6lgn5iix8iqcr2dqcjwx7qzx4r61lxqjjdrkfrj87kxaa9v1";
+       version = "1.2.0";
+       sha256 = "0w5ilrqagc7xj14ngjg0rgcc3vhkxhsrz21rgl9qhygcs1cam5j2";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-terminal attoparsec base binary bytestring clash-prelude
-         concurrent-supply containers data-binary-ieee754 deepseq directory
-         errors exceptions filepath ghc hashable hint integer-gmp
-         interpolate lens mtl parsers prettyprinter primitive process
+         concurrent-supply containers data-binary-ieee754 data-default
+         deepseq directory dlist errors exceptions extra filepath ghc
+         ghc-boot-th hashable haskell-src-meta hint integer-gmp interpolate
+         lens mtl ordered-containers parsers prettyprinter primitive process
          reducers template-haskell temporary text text-show time
          transformers trifecta unordered-containers vector
          vector-binary-instances
@@ -52412,24 +52336,27 @@ self: {
      , data-default-class, deepseq, doctest, ghc-prim
      , ghc-typelits-extra, ghc-typelits-knownnat
      , ghc-typelits-natnormalise, half, hashable, hint, integer-gmp
-     , lens, QuickCheck, reflection, singletons, tasty, tasty-hunit
-     , template-haskell, text, th-lift, th-orphans, time, transformers
-     , type-errors, vector
+     , lens, QuickCheck, quickcheck-classes-base, recursion-schemes
+     , reflection, singletons, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, text, text-show, th-abstraction, th-lift
+     , th-orphans, time, transformers, type-errors, vector
      }:
      mkDerivation {
        pname = "clash-prelude";
-       version = "1.0.1";
-       sha256 = "0cqsr561cx27kqrdf56af1ggq4d1wadzlmbx4wm14l4z6vc2579p";
+       version = "1.2.0";
+       sha256 = "181ccw3ajdfhmlwjs9jiqy10b7whsp3pcqyxw166s8rda7h3pvpj";
        libraryHaskellDepends = [
          array base bifunctors binary bytestring constraints containers
          data-binary-ieee754 data-default-class deepseq ghc-prim
          ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise
-         half hashable integer-gmp lens QuickCheck reflection singletons
-         template-haskell text th-lift th-orphans time transformers
-         type-errors vector
+         half hashable integer-gmp lens QuickCheck recursion-schemes
+         reflection singletons template-haskell text text-show
+         th-abstraction th-lift th-orphans time transformers type-errors
+         vector
        ];
        testHaskellDepends = [
-         base doctest ghc-typelits-knownnat hint tasty tasty-hunit
+         base doctest ghc-typelits-knownnat hint quickcheck-classes-base
+         tasty tasty-hunit tasty-quickcheck template-haskell
        ];
        benchmarkHaskellDepends = [
          base criterion deepseq template-haskell
@@ -56465,8 +56392,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-aeson";
-       version = "0.6.2.0";
-       sha256 = "10pz27ky65zm4qa8h3c79m4ly55dhw3np5x5zqza7133dk96hyyj";
+       version = "0.7.1.0";
+       sha256 = "1jv9frfv1ixqyby8zgldp2nkc051fnz0nqwcrnk1mqhav7rf3ilx";
        libraryHaskellDepends = [
          aeson aeson-better-errors base composite-base containers
          contravariant generic-deriving hashable lens mmorph mtl profunctors
@@ -56479,7 +56406,7 @@ self: {
          profunctors QuickCheck scientific tagged template-haskell text time
          unordered-containers vector vinyl
        ];
-       description = "JSON for Vinyl/Frames records";
+       description = "JSON for Vinyl records";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -56491,8 +56418,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-aeson-refined";
-       version = "0.6.2.0";
-       sha256 = "1m86gb9p1rbn4r385xrin0qn6wp26qqd1hhl7557i01226v48w5w";
+       version = "0.7.1.0";
+       sha256 = "12nqw9mg25vblz5my5rrd0w2nwgpvykw0nnlmaibpj7z5z5fnfv6";
        libraryHaskellDepends = [
          aeson-better-errors base composite-aeson mtl refined
        ];
@@ -56509,8 +56436,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-base";
-       version = "0.6.2.0";
-       sha256 = "0svp3n9652qq4np7mwcws099jsiz56kwa26r0zqa3r64kl4kc3v2";
+       version = "0.7.1.0";
+       sha256 = "11sbpl43z65gkafz0y69b33irg51ag4hjg7yswaqiwv1b6qn80w4";
        libraryHaskellDepends = [
          base exceptions lens monad-control mtl profunctors template-haskell
          text transformers transformers-base unliftio-core vinyl
@@ -56531,12 +56458,12 @@ self: {
      }:
      mkDerivation {
        pname = "composite-ekg";
-       version = "0.6.2.0";
-       sha256 = "1wkgnzd4k46vsyxd0gwdsklv92ggprzi0l522sj98qdm6gxfy8if";
+       version = "0.7.1.0";
+       sha256 = "1w2vlbzaxrxj95q3k2vmvzd34d51cz1pj4fv3x34icmp4rx92qvz";
        libraryHaskellDepends = [
          base composite-base ekg-core lens text vinyl
        ];
-       description = "EKG Metrics for Vinyl/Frames records";
+       description = "EKG Metrics for Vinyl records";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -56549,8 +56476,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-opaleye";
-       version = "0.6.2.0";
-       sha256 = "1gnnzn6h15m79my02i0s397y0pdhifq4cq71j3lpc7g7nza0cwc6";
+       version = "0.7.1.0";
+       sha256 = "1p5nrq5i5ssdiqy38p0qraig8r3z1djfa2hrb7wg5pandiplngr8";
        libraryHaskellDepends = [
          base bytestring composite-base lens opaleye postgresql-simple
          product-profunctors profunctors template-haskell text vinyl
@@ -56560,7 +56487,7 @@ self: {
          product-profunctors profunctors QuickCheck template-haskell text
          vinyl
        ];
-       description = "Opaleye SQL for Frames records";
+       description = "Opaleye SQL for Vinyl records";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -56573,8 +56500,8 @@ self: {
      }:
      mkDerivation {
        pname = "composite-swagger";
-       version = "0.6.2.0";
-       sha256 = "0b5kqdqq4hnzjcfclw25ql2fjvr4z0zh88l9n8pv7pw3qdgh0qd1";
+       version = "0.7.1.0";
+       sha256 = "0npzy42ls7r8i4zldkn3569l5nfdcm905mycd5zda7pkjyyi36q4";
        libraryHaskellDepends = [
          base composite-base insert-ordered-containers lens swagger2
          template-haskell text vinyl
@@ -56583,7 +56510,7 @@ self: {
          base composite-aeson composite-base hspec insert-ordered-containers
          lens QuickCheck swagger2 template-haskell text vinyl
        ];
-       description = "Swagger for Vinyl/Frames records";
+       description = "Swagger for Vinyl records";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -60822,8 +60749,8 @@ self: {
      }:
      mkDerivation {
        pname = "cpkg";
-       version = "0.2.4.5";
-       sha256 = "1f6l98nhl4y8az1vpacjqpqk8ngmir5kfq5wijdy4gl5dl4ik7il";
+       version = "0.2.4.6";
+       sha256 = "0ll0qxn7s29ys8w71dvfz3qy0f5rzihz0q3axg1g73pmhqbxqi2m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -60892,37 +60819,19 @@ self: {
      }) {};
 
   "cpphs" = callPackage
-    ({ mkDerivation, base, directory, old-locale, old-time, polyparse
-     }:
-     mkDerivation {
-       pname = "cpphs";
-       version = "1.20.8";
-       sha256 = "1bh524asqhk9v1s0wvipl0hgn7l63iy3js867yv0z3h5v2kn8vg5";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base directory old-locale old-time polyparse
-       ];
-       executableHaskellDepends = [
-         base directory old-locale old-time polyparse
-       ];
-       description = "A liberalised re-implementation of cpp, the C pre-processor";
-       license = "LGPL";
-     }) {};
-
-  "cpphs_1_20_9" = callPackage
     ({ mkDerivation, base, directory, polyparse, time }:
      mkDerivation {
        pname = "cpphs";
        version = "1.20.9";
        sha256 = "07qb1k9iq76a3l0506s08mw3a16i7qvp0hrmn7wxvwj3f6pg53cp";
+       revision = "1";
+       editedCabalFile = "1zsyi2h2b7kcmbda2kr3a1xg81d26a92zqg78ziqqyc5aw1j5z6b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory polyparse time ];
        executableHaskellDepends = [ base directory polyparse time ];
        description = "A liberalised re-implementation of cpp, the C pre-processor";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cprng-aes" = callPackage
@@ -64940,8 +64849,8 @@ self: {
     ({ mkDerivation, base, constraints }:
      mkDerivation {
        pname = "data-compat";
-       version = "0.1.0.0";
-       sha256 = "0j9gx0sg2bwqigw9w3kg286bm6imqa35jkgkzagdjg9mfkgy6kwy";
+       version = "0.1.0.1";
+       sha256 = "1hbb9rx5x9pw5nzi7x9pxswr0w8vqvw1yf3brmgfxshwlq1ac0rh";
        libraryHaskellDepends = [ base constraints ];
        description = "Define Backwards Compatibility Schemes for Arbitrary Data";
        license = stdenv.lib.licenses.mit;
@@ -65835,8 +65744,8 @@ self: {
      }:
      mkDerivation {
        pname = "data-msgpack";
-       version = "0.0.12";
-       sha256 = "11zlw465lpa371y7cpz9r4gn1c4cw0rjrpl5l3h6h0y3zc28p7sw";
+       version = "0.0.13";
+       sha256 = "1x2qgipyjb5h5n1bx429rwdaamw4xdm7gwj08vlw6n6sycqwnq04";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -65862,8 +65771,8 @@ self: {
      }:
      mkDerivation {
        pname = "data-msgpack-types";
-       version = "0.0.2";
-       sha256 = "19c7285mrs9d1afgpdq4cprv44fif76ahahg3xpzijc5lhgxmzal";
+       version = "0.0.3";
+       sha256 = "05jg19sk42cpn2h1mfaam5khwlda4v99z6v0sdzi4kzkswpfj1i5";
        libraryHaskellDepends = [
          base bytestring containers deepseq hashable QuickCheck text
          unordered-containers vector void
@@ -68342,22 +68251,6 @@ self: {
      }) {};
 
   "dejafu" = callPackage
-    ({ mkDerivation, base, concurrency, containers, contravariant
-     , deepseq, exceptions, leancheck, profunctors, random, transformers
-     }:
-     mkDerivation {
-       pname = "dejafu";
-       version = "2.1.0.1";
-       sha256 = "08rm5f4kxwd46si0qkaf2yzsffpndhb3l4x639k11l6n28165nhg";
-       libraryHaskellDepends = [
-         base concurrency containers contravariant deepseq exceptions
-         leancheck profunctors random transformers
-       ];
-       description = "A library for unit-testing concurrent programs";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "dejafu_2_1_0_3" = callPackage
     ({ mkDerivation, base, concurrency, containers, contravariant
      , deepseq, exceptions, leancheck, profunctors, random, transformers
      }:
@@ -68371,7 +68264,6 @@ self: {
        ];
        description = "A library for unit-testing concurrent programs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deka" = callPackage
@@ -68664,6 +68556,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dependent-hashmap" = callPackage
+    ({ mkDerivation, base, constraints, constraints-extras
+     , dependent-sum, hashable, hedgehog, mtl, unordered-containers
+     }:
+     mkDerivation {
+       pname = "dependent-hashmap";
+       version = "0.1.0.1";
+       sha256 = "14jfak4jp0xvjmfh680gygvbf9yg1gzaidjh6wpnrhyv484ldcpl";
+       libraryHaskellDepends = [
+         base constraints-extras dependent-sum hashable unordered-containers
+       ];
+       testHaskellDepends = [
+         base constraints constraints-extras dependent-sum hashable hedgehog
+         mtl unordered-containers
+       ];
+       description = "Dependent hash maps";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dependent-map" = callPackage
     ({ mkDerivation, base, constraints-extras, containers
      , dependent-sum
@@ -69000,8 +68911,8 @@ self: {
     ({ mkDerivation, base, criterion, deepseq, hspec, QuickCheck }:
      mkDerivation {
        pname = "derive-storable";
-       version = "0.1.2.0";
-       sha256 = "1rh2nm4cb34x9rdg9jpz15kidvkvlzja1354v8z5jwpc0pqkp50s";
+       version = "0.2.0.0";
+       sha256 = "0cr13ydc3p5zsrzimha4xkaj5hmf2bj3hylzjh2llgcgi2l8vc53";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
@@ -69086,8 +68997,8 @@ self: {
     ({ mkDerivation, aeson, base, bytestring }:
      mkDerivation {
        pname = "deriving-aeson";
-       version = "0.1.2";
-       sha256 = "0f26pnvarfarlb2jz1ing3997cd9ajhygkcafhl0yc7i7mi0ysm4";
+       version = "0.2";
+       sha256 = "0d9f4xjczks79vrlw93q7jg32s3ygwl488v6ql8lr4rfvbxzik23";
        libraryHaskellDepends = [ aeson base ];
        testHaskellDepends = [ aeson base bytestring ];
        description = "Type driven generic aeson instance customisation";
@@ -69671,8 +69582,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-fly";
-       version = "0.2.4";
-       sha256 = "0bx8il9cq4ma2n2wl5xxzngl26621zgpj54lk884nqwk6glg124m";
+       version = "0.3.0";
+       sha256 = "01152n1g8wfhbsl6znd6jnwb2rkdzcr3wcmdixnp6j3sxbgqbqln";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -73391,6 +73302,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "dobutokO2" = callPackage
+    ({ mkDerivation, base, directory, mmsyn3, mmsyn7s, mmsyn7ukr
+     , process, vector
+     }:
+     mkDerivation {
+       pname = "dobutokO2";
+       version = "0.3.1.1";
+       sha256 = "1fkyk57ckif0yk2fc1gjvla44bj2y9r5k1zms03ld001vpmkwbir";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base directory mmsyn3 mmsyn7s mmsyn7ukr process vector
+       ];
+       executableHaskellDepends = [
+         base directory mmsyn3 mmsyn7s mmsyn7ukr process vector
+       ];
+       description = "A program and a library to create experimental music from a mono audio and a Ukrainian text";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "doc-review" = callPackage
     ({ mkDerivation, base, base64-bytestring, binary, bytestring
      , containers, directory, feed, filepath, haskell98, heist, hexpat
@@ -77025,8 +76956,8 @@ self: {
      }:
      mkDerivation {
        pname = "egison-pattern-src";
-       version = "0.1.1.0";
-       sha256 = "15w0vnph6ba2b1mvlr53qymmdxs6063k77508frybsgb44pq9ns1";
+       version = "0.2.1.0";
+       sha256 = "0zfqrjmbzh7s88dkqc5mabb2yhb3xz88y10n5npkz9f6cjas4cxf";
        libraryHaskellDepends = [
          base containers free megaparsec mtl parser-combinators
          prettyprinter recursion-schemes text
@@ -77045,8 +76976,8 @@ self: {
      }:
      mkDerivation {
        pname = "egison-pattern-src-haskell-mode";
-       version = "0.1.1.0";
-       sha256 = "0zrrr1qbcqz4gypx75q3s4w6i4ifbx82agsli3s2rd2z05lqc4l6";
+       version = "0.2.1.0";
+       sha256 = "0lgvvw23ii0g62b8q67h4mfm2bd07akl2m8dp8855hm16q1b8w8n";
        libraryHaskellDepends = [
          base egison-pattern-src haskell-src-exts mtl text
        ];
@@ -77059,18 +76990,17 @@ self: {
      }) {};
 
   "egison-pattern-src-th-mode" = callPackage
-    ({ mkDerivation, base, egison-pattern-src
-     , egison-pattern-src-haskell-mode, haskell-src-exts
+    ({ mkDerivation, base, egison-pattern-src, haskell-src-exts
      , haskell-src-meta, mtl, pretty, tasty, tasty-discover, tasty-hunit
      , template-haskell, text
      }:
      mkDerivation {
        pname = "egison-pattern-src-th-mode";
-       version = "0.1.1.0";
-       sha256 = "1xdl9r04nmq46chhcqcbz549431zklkzx81agds765j1s7qqpp24";
+       version = "0.2.1.0";
+       sha256 = "0libfs39irdnqfvynmpji21p6nyk2s3zsxhlmsz763aya51ymxpy";
        libraryHaskellDepends = [
-         base egison-pattern-src egison-pattern-src-haskell-mode
-         haskell-src-exts haskell-src-meta mtl pretty template-haskell text
+         base egison-pattern-src haskell-src-exts haskell-src-meta mtl
+         pretty template-haskell text
        ];
        testHaskellDepends = [
          base egison-pattern-src haskell-src-exts mtl tasty tasty-hunit
@@ -77243,12 +77173,12 @@ self: {
      }) {};
 
   "either-list-functions" = callPackage
-    ({ mkDerivation, base, doctest }:
+    ({ mkDerivation, base, containers, doctest }:
      mkDerivation {
        pname = "either-list-functions";
-       version = "0.0.2.0";
-       sha256 = "04xl2xrlrmf0znic1vx521d73i6znyyjijp58h6ak0sx45kclw39";
-       libraryHaskellDepends = [ base ];
+       version = "0.0.4.2";
+       sha256 = "1cagf93vaz41hl5vm1xqvzdds82h2cck294apr5b082nscv6r9bc";
+       libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base doctest ];
        description = "Functions involving lists of Either";
        license = stdenv.lib.licenses.asl20;
@@ -77679,6 +77609,8 @@ self: {
        pname = "eliminators";
        version = "0.6";
        sha256 = "1mxjp2ygf72k3yaiqpfi4lrmhwhx69zkm5kznrb6wainw5r6h0if";
+       revision = "1";
+       editedCabalFile = "03gq3c04arywpp60n5cb6prvwn0yk7ccc5gfpbxl9vdjp5dbikkd";
        libraryHaskellDepends = [
          base extra singleton-nats singletons template-haskell
          th-abstraction th-desugar
@@ -80783,26 +80715,24 @@ self: {
      }) {};
 
   "evdev" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, containers, either, evdev
-     , extra, hinotify, libevdev, monad-loops, paths, posix-paths
-     , process, rawfilepath, safe, streamly, streamly-fsnotify, time
-     , unix
+    ({ mkDerivation, base, bytestring, c2hs, containers, either, extra
+     , hinotify, libevdev, monad-loops, paths, posix-paths, process
+     , rawfilepath, safe, streamly, streamly-fsnotify, time, unix
      }:
      mkDerivation {
        pname = "evdev";
-       version = "1.2.0.1";
-       sha256 = "05l1vvjyc77gjzyswlwnqkicldbdl7wj05z6wz8w8najys16z7s7";
+       version = "1.3.0.0";
+       sha256 = "0jf9zbz04iyrmsr2fi8iq23nx48n38y7rs6czl226sd2dh10jhp3";
        libraryHaskellDepends = [
          base bytestring containers either extra hinotify monad-loops paths
          posix-paths process rawfilepath safe streamly streamly-fsnotify
          time unix
        ];
-       librarySystemDepends = [ evdev ];
        libraryPkgconfigDepends = [ libevdev ];
        libraryToolDepends = [ c2hs ];
        description = "Bindings to libevdev";
        license = stdenv.lib.licenses.bsd3;
-     }) {evdev = null; inherit (pkgs) libevdev;};
+     }) {inherit (pkgs) libevdev;};
 
   "eve" = callPackage
     ({ mkDerivation, base, containers, data-default, free, hspec
@@ -82621,6 +82551,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "extra_1_7" = callPackage
+    ({ mkDerivation, base, clock, directory, filepath, process
+     , QuickCheck, quickcheck-instances, semigroups, time, unix
+     }:
+     mkDerivation {
+       pname = "extra";
+       version = "1.7";
+       sha256 = "1mfhgbvyvrj0z9vpbcgm5dlrys51gd8fh2qwwihxixbw12vmqd86";
+       libraryHaskellDepends = [
+         base clock directory filepath process semigroups time unix
+       ];
+       testHaskellDepends = [
+         base directory filepath QuickCheck quickcheck-instances unix
+       ];
+       description = "Extra functions I use";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "extract-dependencies" = callPackage
     ({ mkDerivation, async, base, Cabal, containers
      , package-description-remote
@@ -83069,7 +83018,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "fakedata_0_6_0" = callPackage
+  "fakedata_0_6_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, directory
      , exceptions, filepath, gauge, hashable, hspec, hspec-discover
      , random, template-haskell, text, time, unordered-containers
@@ -83077,8 +83026,8 @@ self: {
      }:
      mkDerivation {
        pname = "fakedata";
-       version = "0.6.0";
-       sha256 = "0rwj9l2m2w688cp505y77g7q67l57gs8fh429mgnygwzvp7s7z0r";
+       version = "0.6.1";
+       sha256 = "0qqc0hq7lg1s5fpflmnalcsy0043vqd8iiblwa6lvm45h7af8ii2";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers directory exceptions filepath hashable
@@ -83248,8 +83197,8 @@ self: {
      }:
      mkDerivation {
        pname = "fast-arithmetic";
-       version = "0.6.4.3";
-       sha256 = "08fwfk6k081gasfpvil9hhzcc85b6xlpflp2kqi9kwza3pfi3d0s";
+       version = "0.6.5.0";
+       sha256 = "02ccvk09fqp235bl3r8k234xnl6fmis7hkl34v4wmrwpb3f96hmh";
        libraryHaskellDepends = [ base combinat hgmp ];
        testHaskellDepends = [ arithmoi base combinat hspec QuickCheck ];
        benchmarkHaskellDepends = [ arithmoi base combinat criterion ];
@@ -85143,22 +85092,6 @@ self: {
      }) {};
 
   "file-embed" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "file-embed";
-       version = "0.0.11.1";
-       sha256 = "1ml9j5jln9g86qqi7akcxyfy8d2jb46y1sfk817j1s4babzff4x1";
-       libraryHaskellDepends = [
-         base bytestring directory filepath template-haskell
-       ];
-       testHaskellDepends = [ base filepath ];
-       description = "Use Template Haskell to embed file contents directly";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "file-embed_0_0_11_2" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath
      , template-haskell
      }:
@@ -85172,7 +85105,6 @@ self: {
        testHaskellDepends = [ base filepath ];
        description = "Use Template Haskell to embed file contents directly";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "file-embed-lzma" = callPackage
@@ -85433,18 +85365,6 @@ self: {
      }) {};
 
   "filepattern" = callPackage
-    ({ mkDerivation, base, directory, extra, filepath, QuickCheck }:
-     mkDerivation {
-       pname = "filepattern";
-       version = "0.1.1";
-       sha256 = "0jwvbhjsn4k6kpkg0dvsm7p3a79vzp0ffr1w79wkmm7hzvf5pz7p";
-       libraryHaskellDepends = [ base directory extra filepath ];
-       testHaskellDepends = [ base directory extra filepath QuickCheck ];
-       description = "File path glob-like matching";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "filepattern_0_1_2" = callPackage
     ({ mkDerivation, base, directory, extra, filepath, QuickCheck }:
      mkDerivation {
        pname = "filepattern";
@@ -85454,7 +85374,6 @@ self: {
        testHaskellDepends = [ base directory extra filepath QuickCheck ];
        description = "File path glob-like matching";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fileplow" = callPackage
@@ -91160,6 +91079,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fused-effects_1_0_2_0" = callPackage
+    ({ mkDerivation, base, containers, gauge, hedgehog, hedgehog-fn
+     , inspection-testing, markdown-unlit, mtl, tasty, tasty-hedgehog
+     , tasty-hunit, transformers
+     }:
+     mkDerivation {
+       pname = "fused-effects";
+       version = "1.0.2.0";
+       sha256 = "0dy8m54fm3gndj0bda0savl80w7drj8h113bhbi2439wl3x02y6x";
+       libraryHaskellDepends = [ base transformers ];
+       testHaskellDepends = [
+         base containers hedgehog hedgehog-fn inspection-testing mtl tasty
+         tasty-hedgehog tasty-hunit transformers
+       ];
+       testToolDepends = [ markdown-unlit ];
+       benchmarkHaskellDepends = [ base gauge ];
+       description = "A fast, flexible, fused effect system";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fused-effects-exceptions" = callPackage
     ({ mkDerivation, base, fused-effects, markdown-unlit, tasty
      , tasty-hunit, transformers
@@ -94382,6 +94322,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-check" = callPackage
+    ({ mkDerivation, base, ghc, ghc-paths, template-haskell
+     , transformers
+     }:
+     mkDerivation {
+       pname = "ghc-check";
+       version = "0.1.0.2";
+       sha256 = "0xxx1n3xwzfkpbhn2k6s63h8idqy8s15fvy4hbnfkk5fz6mwgvdz";
+       libraryHaskellDepends = [
+         base ghc ghc-paths template-haskell transformers
+       ];
+       description = "detect mismatches between compile-time and run-time versions of the ghc api";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ghc-compact_0_1_0_0" = callPackage
     ({ mkDerivation, base, bytestring, ghc-prim }:
      mkDerivation {
@@ -94760,25 +94715,6 @@ self: {
      }) {};
 
   "ghc-lib" = callPackage
-    ({ mkDerivation, alex, array, base, binary, bytestring, containers
-     , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy
-     , hpc, pretty, process, time, transformers, unix
-     }:
-     mkDerivation {
-       pname = "ghc-lib";
-       version = "8.8.2.20200205";
-       sha256 = "13sq702fv3p8jwvsswxz51lp0h33hd1abxrrflxyqlhz84hn9lk9";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array base binary bytestring containers deepseq directory filepath
-         ghc-lib-parser ghc-prim hpc pretty process time transformers unix
-       ];
-       libraryToolDepends = [ alex happy ];
-       description = "The GHC API, decoupled from GHC versions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-lib_8_8_3_20200224" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
      , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy
      , hpc, pretty, process, time, transformers, unix
@@ -94795,29 +94731,9 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "The GHC API, decoupled from GHC versions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-lib-parser" = callPackage
-    ({ mkDerivation, alex, array, base, binary, bytestring, containers
-     , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty
-     , process, time, transformers, unix
-     }:
-     mkDerivation {
-       pname = "ghc-lib-parser";
-       version = "8.8.2.20200205";
-       sha256 = "17rhzlwya0v6l146hmg6z3j224sr31s2pszspwyab790pncyrxgq";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array base binary bytestring containers deepseq directory filepath
-         ghc-prim hpc pretty process time transformers unix
-       ];
-       libraryToolDepends = [ alex happy ];
-       description = "The GHC API, decoupled from GHC versions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-lib-parser_8_8_3_20200224" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
      , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty
      , process, time, transformers, unix
@@ -94834,31 +94750,9 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "The GHC API, decoupled from GHC versions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-lib-parser-ex" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, extra
-     , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit
-     , uniplate
-     }:
-     mkDerivation {
-       pname = "ghc-lib-parser-ex";
-       version = "8.8.5.2";
-       sha256 = "0jydlqb2nymrqvyn798vb8k4ak49m0qnnv725mzwlnn77krvnlka";
-       revision = "1";
-       editedCabalFile = "010wpn9ivczixfg2cj4n4f8924jaw6y4j6fd9z8bih7f53wyldnr";
-       libraryHaskellDepends = [
-         base bytestring containers ghc ghc-boot ghc-boot-th uniplate
-       ];
-       testHaskellDepends = [
-         base directory extra filepath ghc ghc-boot-th tasty tasty-hunit
-       ];
-       description = "Algorithms on GHC parse trees";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-lib-parser-ex_8_8_5_3" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, extra
      , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit
      , uniplate
@@ -94875,7 +94769,6 @@ self: {
        ];
        description = "Algorithms on GHC parse trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-make" = callPackage
@@ -95296,6 +95189,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-tags-plugin" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , directory, ghc, gitrev
+     }:
+     mkDerivation {
+       pname = "ghc-tags-plugin";
+       version = "0.1.1.0";
+       sha256 = "1bwv5sda0lihc0f0blxgs4j730kd31p9djk8wxyf8qiqdlsp2afa";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers directory ghc gitrev
+       ];
+       doHaddock = false;
+       description = "A compiler plugin which generates tags file from GHC syntax tree";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "ghc-tcplugins-extra" = callPackage
     ({ mkDerivation, base, ghc }:
      mkDerivation {
@@ -97346,7 +97255,7 @@ self: {
      }) {};
 
   "git-annex" = callPackage
-    ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder
+    ({ mkDerivation, aeson, async, attoparsec, aws, base, blaze-builder
      , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive
      , clientsession, concurrent-output, conduit, connection, containers
      , crypto-api, cryptonite, curl, data-default, DAV, dbus, deepseq
@@ -97372,7 +97281,7 @@ self: {
        sha256 = "09v80ni1w9z1im79lzrnpz7xlivwna44zqpwq4axwyd17cffqi9m";
        configureFlags = [
          "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
-         "-fnetworkbsd" "-fpairing" "-fproduction" "-f-s3" "-ftorrentparser"
+         "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser"
          "-fwebapp" "-fwebdav"
        ];
        isLibrary = false;
@@ -97383,7 +97292,7 @@ self: {
          unix-compat utf8-string
        ];
        executableHaskellDepends = [
-         aeson async attoparsec base blaze-builder bloomfilter byteable
+         aeson async attoparsec aws base blaze-builder bloomfilter byteable
          bytestring case-insensitive clientsession concurrent-output conduit
          connection containers crypto-api cryptonite data-default DAV dbus
          deepseq directory disk-free-space dlist edit-distance exceptions
@@ -97896,8 +97805,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Access to the GitHub API, v3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "github-backup" = callPackage
@@ -98020,6 +97927,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "github-rest_1_0_2" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, bytestring, http-client
+     , http-client-tls, http-types, jwt, mtl, scientific, tasty
+     , tasty-golden, tasty-hunit, tasty-quickcheck, text, time
+     , transformers, unliftio, unliftio-core
+     }:
+     mkDerivation {
+       pname = "github-rest";
+       version = "1.0.2";
+       sha256 = "0q4dxr0080pkszq9vv3j2wx89yhy15jjbk5m7wd1mwirgwxv214m";
+       libraryHaskellDepends = [
+         aeson base bytestring http-client http-client-tls http-types jwt
+         mtl scientific text time transformers unliftio unliftio-core
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base bytestring http-client http-client-tls
+         http-types jwt mtl scientific tasty tasty-golden tasty-hunit
+         tasty-quickcheck text time transformers unliftio unliftio-core
+       ];
+       description = "Query the GitHub REST API programmatically";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "github-tools" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions, github
      , groom, html, http-client, http-client-tls, monad-parallel
@@ -98251,6 +98182,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "gitlab-haskell_0_1_7" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, connection, http-conduit
+     , http-types, text, time, transformers, unliftio, unliftio-core
+     }:
+     mkDerivation {
+       pname = "gitlab-haskell";
+       version = "0.1.7";
+       sha256 = "1l7z7sqnipkbf4355zzmjrj9ig8bb9jysyj5r7rgqk8pr1znj524";
+       libraryHaskellDepends = [
+         aeson base bytestring connection http-conduit http-types text time
+         transformers unliftio unliftio-core
+       ];
+       description = "A Haskell library for the GitLab web API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gitlib" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, conduit
      , conduit-combinators, containers, directory, exceptions, filepath
@@ -98898,10 +98846,8 @@ self: {
      }:
      mkDerivation {
        pname = "glirc";
-       version = "2.34";
-       sha256 = "1nmkwzifch01pnzxn3rm0gvxq9xvwvxkvqfwsdsj6zjmiz68w3ca";
-       revision = "1";
-       editedCabalFile = "13dm3cc5m7g7qhpasq2jbzm7x4dizjipjdsy5amghglrs8m0r90y";
+       version = "2.35";
+       sha256 = "093cqbvqijjy6xd0fzas13ldrsf9kg59jak88qzl5kks7z9djl0f";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -102683,25 +102629,6 @@ self: {
      }) {};
 
   "gothic" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, connection
-     , exceptions, hashable, http-client, http-client-tls, http-conduit
-     , http-types, lens, lens-aeson, scientific, text, unix
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "gothic";
-       version = "0.1.3";
-       sha256 = "0hp6p1car5kfzvz24aw04jpgplpyxj3lzgr9hdkj0q24crciwrps";
-       libraryHaskellDepends = [
-         aeson base binary bytestring connection exceptions hashable
-         http-client http-client-tls http-conduit http-types lens lens-aeson
-         scientific text unix unordered-containers vector
-       ];
-       description = "A Haskell Vault KVv2 secret engine client";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "gothic_0_1_4" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, connection
      , exceptions, hashable, http-client, http-client-tls, http-conduit
      , http-types, lens, lens-aeson, scientific, text, unix
@@ -102718,7 +102645,6 @@ self: {
        ];
        description = "A Haskell Vault KVv2 secret engine client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gotta-go-fast" = callPackage
@@ -105033,8 +104959,6 @@ self: {
        ];
        description = "A standalone StatusNotifierItem/AppIndicator tray";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtk3;};
 
   "gtk-strut" = callPackage
@@ -107533,8 +107457,8 @@ self: {
      }:
      mkDerivation {
        pname = "haiji";
-       version = "0.3.1.0";
-       sha256 = "0z0f6w4krfs220342v8sa2ylfk1qnd695pn0i9qxr7k0pwbph2wg";
+       version = "0.3.2.0";
+       sha256 = "1clxvpqwfsybfap746nq8g6gshdizjhbpafs09mnaxp7fi1196xz";
        libraryHaskellDepends = [
          aeson attoparsec base data-default mtl scientific tagged
          template-haskell text transformers unordered-containers vector
@@ -107821,6 +107745,8 @@ self: {
        pname = "hakyll";
        version = "4.13.1.0";
        sha256 = "14l85n69zsczyw2fs8kjnnmkl4gk85xj3f4alfa7604nnmic9mvn";
+       revision = "1";
+       editedCabalFile = "0vbs0y4niirmwcc2r59pbzl33s4qzpdlslvigyb6adf6r79di1r9";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -108183,17 +108109,15 @@ self: {
      }) {};
 
   "hakyll-shortcut-links" = callPackage
-    ({ mkDerivation, base, hakyll, hspec, megaparsec, mtl, pandoc
-     , pandoc-types, shortcut-links, text
+    ({ mkDerivation, base, hakyll, hspec, mtl, pandoc, pandoc-types
+     , parsec, shortcut-links, text
      }:
      mkDerivation {
        pname = "hakyll-shortcut-links";
-       version = "0.0.0.0";
-       sha256 = "1bzkq83rcpvx0cah77q6p27fd7f0l9hrnk8jyzpmngrnvgyjb2sz";
-       revision = "1";
-       editedCabalFile = "0ds3pb90djvqgz1z1w1kp2zdmwvbqkkgvwm05i34a9rh84lh8y8p";
+       version = "0.1.0.0";
+       sha256 = "0zhz0yixcv9xabr47rpcncxg3bwjx7la0g0hx37qfws5aqlvsz4v";
        libraryHaskellDepends = [
-         base hakyll megaparsec mtl pandoc-types shortcut-links text
+         base hakyll mtl pandoc-types parsec shortcut-links text
        ];
        testHaskellDepends = [ base hspec mtl pandoc text ];
        description = "Use shortcut-links in markdown file for Hakyll";
@@ -110119,19 +110043,19 @@ self: {
 
   "hasbolt" = callPackage
     ({ mkDerivation, base, binary, bytestring, connection, containers
-     , data-binary-ieee754, data-default, hex, hspec, mtl, network
+     , data-binary-ieee754, data-default, hspec, mtl, network
      , QuickCheck, text
      }:
      mkDerivation {
        pname = "hasbolt";
-       version = "0.1.4.1";
-       sha256 = "1p2gffh6ym221sgrhlns209p6s0j3qbmam5a0b3s06663qgzvh5b";
+       version = "0.1.4.2";
+       sha256 = "0qrfdfyzm61zaxd9m7s93zhrr2qjpgyn24l3gbyll2v8yj38j5rm";
        libraryHaskellDepends = [
          base binary bytestring connection containers data-binary-ieee754
          data-default mtl network text
        ];
        testHaskellDepends = [
-         base bytestring containers hex hspec QuickCheck text
+         base bytestring containers hspec QuickCheck text
        ];
        description = "Haskell driver for Neo4j 3+ (BOLT protocol)";
        license = stdenv.lib.licenses.bsd3;
@@ -110147,8 +110071,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasbolt-extras";
-       version = "0.0.1.2";
-       sha256 = "1bcp0v9m5miy26yfk0bm5j2zwc3rnijxlbym0iv599m25fhfqxjk";
+       version = "0.0.1.3";
+       sha256 = "1zgrw5k056spvqswgji41whjadq1ixayx817ln339mvc45a4nwa7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -111133,8 +111057,6 @@ self: {
        doHaddock = false;
        description = "Cabal package script generator for Travis-CI";
        license = stdenv.lib.licenses.gpl3Plus;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-cnc" = callPackage
@@ -111666,8 +111588,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Haskell library for the Microsoft Language Server Protocol";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-lsp-client" = callPackage
@@ -111707,8 +111627,6 @@ self: {
        ];
        description = "Haskell library for the Microsoft Language Server Protocol, data types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskell-menu" = callPackage
@@ -116770,8 +116688,8 @@ self: {
      }:
      mkDerivation {
        pname = "headroom";
-       version = "0.1.1.0";
-       sha256 = "1ddxc5ldgkg7kw8qnj0m9gf9hx2gazidrx6ldac14yqlc4qfm2qb";
+       version = "0.1.2.0";
+       sha256 = "0xf657k22bpyx45x0bxljv19adb2qwfv2a5724dsnmvndyvn9kxy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117204,10 +117122,8 @@ self: {
     ({ mkDerivation, base, containers, fakedata, hedgehog, random }:
      mkDerivation {
        pname = "hedgehog-fakedata";
-       version = "0.0.1.0";
-       sha256 = "0qpgdl0r90y1qwzi7iqjxfngpd3scqc7a5p283yknw85zh0bx2bz";
-       revision = "1";
-       editedCabalFile = "003zbj8wmmdq203wa9dn2hy77my4bq0mfpvvi2mk2423q51p0q99";
+       version = "0.0.1.1";
+       sha256 = "05s48h0cf599x5psllid0szynvqmfgkrv5cymsgy1b5mdnc868aj";
        libraryHaskellDepends = [ base fakedata hedgehog random ];
        testHaskellDepends = [ base containers fakedata hedgehog ];
        description = "Use 'fakedata' with 'hedgehog'";
@@ -120679,8 +120595,8 @@ self: {
      }:
      mkDerivation {
        pname = "hip";
-       version = "1.5.4.0";
-       sha256 = "09vv9zshgy6g9333pyny5lcja8662rxnldg1m0vvfiywcjafbn14";
+       version = "1.5.5.0";
+       sha256 = "1qy74a471bh849cil9b3f92gxgl3434x8hcvrzn83v3xa6vnh2cd";
        libraryHaskellDepends = [
          array base bytestring Chart Chart-diagrams colour deepseq directory
          filepath JuicyPixels netpbm primitive process random repa temporary
@@ -121344,8 +121260,8 @@ self: {
      }:
      mkDerivation {
        pname = "hkgr";
-       version = "0.2.4.1";
-       sha256 = "0r6w5n4y5h23ry8cxxl97ibrxn6jr0f2a7iginqbpyd5dzbn9qyn";
+       version = "0.2.5.2";
+       sha256 = "0n7xxm216jzsvm2si276a0x342iwn0jyfcaq5hfs5l92na456kg2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -121459,7 +121375,7 @@ self: {
      }) {};
 
   "hledger" = callPackage
-    ({ mkDerivation, ansi-terminal, base, base-compat-batteries
+    ({ mkDerivation, aeson, ansi-terminal, base, base-compat-batteries
      , bytestring, cmdargs, containers, data-default, Decimal, Diff
      , directory, extra, filepath, hashable, haskeline, hledger-lib
      , lucid, math-functions, megaparsec, mtl, old-time, parsec
@@ -121470,12 +121386,14 @@ self: {
      }:
      mkDerivation {
        pname = "hledger";
-       version = "1.16.2";
-       sha256 = "1jvvmj13n3xv575g5zxfq2nw9bk719yb6ivddxfaf36h10zqpdxl";
+       version = "1.17";
+       sha256 = "1rdafl9c1z16ci3b812aaic6sbh1292dh5n3xqpnaqx9g68w71d4";
+       revision = "1";
+       editedCabalFile = "1lkg0h8hc7m0lj0hzylc3paiip2d6a6k9k37289gdynrm04nj258";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-terminal base base-compat-batteries bytestring cmdargs
+         aeson ansi-terminal base base-compat-batteries bytestring cmdargs
          containers data-default Decimal Diff directory extra filepath
          hashable haskeline hledger-lib lucid math-functions megaparsec mtl
          old-time parsec pretty-show process regex-tdfa safe shakespeare
@@ -121483,7 +121401,7 @@ self: {
          transformers unordered-containers utf8-string utility-ht wizards
        ];
        executableHaskellDepends = [
-         ansi-terminal base base-compat-batteries bytestring cmdargs
+         aeson ansi-terminal base base-compat-batteries bytestring cmdargs
          containers data-default Decimal directory extra filepath haskeline
          hledger-lib math-functions megaparsec mtl old-time parsec
          pretty-show process regex-tdfa safe shakespeare split tabular tasty
@@ -121491,7 +121409,7 @@ self: {
          unordered-containers utf8-string utility-ht wizards
        ];
        testHaskellDepends = [
-         ansi-terminal base base-compat-batteries bytestring cmdargs
+         aeson ansi-terminal base base-compat-batteries bytestring cmdargs
          containers data-default Decimal directory extra filepath haskeline
          hledger-lib math-functions megaparsec mtl old-time parsec
          pretty-show process regex-tdfa safe shakespeare split tabular tasty
@@ -121566,8 +121484,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-flow";
-       version = "0.13.0.0";
-       sha256 = "0lgjb35mpjnyqdc4lr5g2q88nhjbh4znkw9xmlc7vlf1bpa27a8a";
+       version = "0.13.1.0";
+       sha256 = "1ixfsndl2has2pmq5vrf59z96j0pqaa8y8wk61rzjdh9cn62i3jj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121594,6 +121512,8 @@ self: {
        pname = "hledger-iadd";
        version = "1.3.10";
        sha256 = "0kdrdbvs5qi8hc807d245xrv589hgx5aly5syb6zk62pi1kf92s3";
+       revision = "1";
+       editedCabalFile = "0bwpk2h2chhcw74sf1ljkkiy699zdc2dvgq7ixlrlk09yx44jhxc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121654,21 +121574,21 @@ self: {
      }) {};
 
   "hledger-lib" = callPackage
-    ({ mkDerivation, ansi-terminal, array, base, base-compat-batteries
-     , blaze-markup, bytestring, call-stack, cassava, cassava-megaparsec
-     , cmdargs, containers, data-default, Decimal, deepseq, directory
-     , extra, fgl, file-embed, filepath, Glob, hashtables, megaparsec
-     , mtl, old-time, parsec, parser-combinators, pretty-show
-     , regex-tdfa, safe, split, tabular, tasty, tasty-hunit
-     , template-haskell, text, time, timeit, transformers, uglymemo
-     , utf8-string
+    ({ mkDerivation, aeson, ansi-terminal, array, base
+     , base-compat-batteries, blaze-markup, bytestring, call-stack
+     , cassava, cassava-megaparsec, cmdargs, containers, data-default
+     , Decimal, deepseq, directory, extra, fgl, file-embed, filepath
+     , Glob, hashtables, megaparsec, mtl, old-time, parsec
+     , parser-combinators, pretty-show, regex-tdfa, safe, split, tabular
+     , tasty, tasty-hunit, template-haskell, text, time, timeit
+     , transformers, uglymemo, utf8-string
      }:
      mkDerivation {
        pname = "hledger-lib";
-       version = "1.16.2";
-       sha256 = "0b3b68560jszx8frmv8q9bxs1nc33n9c52ns1gcy3a3j3s80ww3g";
+       version = "1.17.0.1";
+       sha256 = "0kmwrkm4arhzzcfh4dhmikad1kfkv9y5dc58mjhi1jacdiy980r9";
        libraryHaskellDepends = [
-         ansi-terminal array base base-compat-batteries blaze-markup
+         aeson ansi-terminal array base base-compat-batteries blaze-markup
          bytestring call-stack cassava cassava-megaparsec cmdargs containers
          data-default Decimal deepseq directory extra fgl file-embed
          filepath Glob hashtables megaparsec mtl old-time parsec
@@ -121677,7 +121597,7 @@ self: {
          utf8-string
        ];
        testHaskellDepends = [
-         ansi-terminal array base base-compat-batteries blaze-markup
+         aeson ansi-terminal array base base-compat-batteries blaze-markup
          bytestring call-stack cassava cassava-megaparsec cmdargs containers
          data-default Decimal deepseq directory extra fgl file-embed
          filepath Glob hashtables megaparsec mtl old-time parsec
@@ -121712,20 +121632,20 @@ self: {
 
   "hledger-ui" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, base-compat-batteries
-     , brick, cmdargs, containers, data-default, directory, filepath
-     , fsnotify, hledger, hledger-lib, megaparsec, microlens
+     , brick, cmdargs, containers, data-default, directory, extra
+     , filepath, fsnotify, hledger, hledger-lib, megaparsec, microlens
      , microlens-platform, pretty-show, process, safe, split, text
      , text-zipper, time, transformers, unix, vector, vty
      }:
      mkDerivation {
        pname = "hledger-ui";
-       version = "1.16.2";
-       sha256 = "1bsg48i9fmml4ga8jg1ikxig30dn7x5i8qbzbd9nr9lz5wg9xxlh";
+       version = "1.17";
+       sha256 = "1168h7lc6r61gpaiy07l9dp534hggnlvdcx3a2lmjx4m29ym1frz";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          ansi-terminal async base base-compat-batteries brick cmdargs
-         containers data-default directory filepath fsnotify hledger
+         containers data-default directory extra filepath fsnotify hledger
          hledger-lib megaparsec microlens microlens-platform pretty-show
          process safe split text text-zipper time transformers unix vector
          vty
@@ -121755,27 +121675,27 @@ self: {
   "hledger-web" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , case-insensitive, clientsession, cmdargs, conduit, conduit-extra
-     , containers, data-default, Decimal, directory, filepath, hjsmin
-     , hledger, hledger-lib, http-client, http-conduit, http-types
-     , megaparsec, mtl, semigroups, shakespeare, template-haskell, text
-     , time, transformers, utf8-string, wai, wai-cors, wai-extra
-     , wai-handler-launch, warp, yaml, yesod, yesod-core, yesod-form
-     , yesod-static
+     , containers, data-default, Decimal, directory, extra, filepath
+     , hjsmin, hledger, hledger-lib, http-client, http-conduit
+     , http-types, megaparsec, mtl, network, semigroups, shakespeare
+     , template-haskell, text, time, transformers, unix-compat
+     , utf8-string, wai, wai-cors, wai-extra, wai-handler-launch, warp
+     , yaml, yesod, yesod-core, yesod-form, yesod-static
      }:
      mkDerivation {
        pname = "hledger-web";
-       version = "1.16.2";
-       sha256 = "1kipq8b1df1iyp0dsdkbmshzdgii1993kb72drqsbl4ihj6vd96s";
+       version = "1.17";
+       sha256 = "15flyvaamr7r3dlzk9ihc3bv8z15myfrzzhlbpc5s3gy6q85lmay";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base blaze-html blaze-markup bytestring case-insensitive
          clientsession cmdargs conduit conduit-extra containers data-default
-         Decimal directory filepath hjsmin hledger hledger-lib http-client
-         http-conduit http-types megaparsec mtl semigroups shakespeare
-         template-haskell text time transformers utf8-string wai wai-cors
-         wai-extra wai-handler-launch warp yaml yesod yesod-core yesod-form
-         yesod-static
+         Decimal directory extra filepath hjsmin hledger hledger-lib
+         http-client http-conduit http-types megaparsec mtl network
+         semigroups shakespeare template-haskell text time transformers
+         unix-compat utf8-string wai wai-cors wai-extra wai-handler-launch
+         warp yaml yesod yesod-core yesod-form yesod-static
        ];
        executableHaskellDepends = [ base ];
        description = "Web interface for the hledger accounting tool";
@@ -122771,16 +122691,16 @@ self: {
      , interpolate, lens-family, lens-family-core, lens-family-th
      , logict, megaparsec, monad-control, monadlist, mtl
      , optparse-applicative, parser-combinators, pretty-show
-     , prettyprinter, process, ref-tf, regex-tdfa, regex-tdfa-text
-     , repline, scientific, semigroups, serialise, split, syb, tasty
-     , tasty-hedgehog, tasty-hunit, tasty-quickcheck, tasty-th
+     , prettyprinter, process, ref-tf, regex-tdfa, repline, scientific
+     , semialign, semialign-indexed, semigroups, serialise, split, syb
+     , tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck, tasty-th
      , template-haskell, text, these, time, transformers
      , transformers-base, unix, unordered-containers, vector, xml
      }:
      mkDerivation {
        pname = "hnix";
-       version = "0.6.1";
-       sha256 = "0q79wdrm3z88mknq6nf7cpg7lwgbx355k95k11rz3iz0sgk9hjwi";
+       version = "0.7.1";
+       sha256 = "02isypknx732c25iqjym6941mfb5x6s6xrb6mijxy46rwzh3xd9l";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -122792,9 +122712,9 @@ self: {
          interpolate lens-family lens-family-core lens-family-th logict
          megaparsec monad-control monadlist mtl optparse-applicative
          parser-combinators pretty-show prettyprinter process ref-tf
-         regex-tdfa regex-tdfa-text scientific semigroups serialise split
-         syb template-haskell text these time transformers transformers-base
-         unix unordered-containers vector xml
+         regex-tdfa scientific semialign semialign-indexed semigroups
+         serialise split syb template-haskell text these time transformers
+         transformers-base unix unordered-containers vector xml
        ];
        executableHaskellDepends = [
          aeson base base16-bytestring bytestring comonad containers
@@ -123522,8 +123442,8 @@ self: {
      }:
      mkDerivation {
        pname = "homplexity";
-       version = "0.4.6.0";
-       sha256 = "1rdb842kzipb7fbkbpcyndi53933yni2s79lfr8br0b7q1ib33j0";
+       version = "0.4.8.0";
+       sha256 = "1a873zfasvlnl7xw2z7z3pgbjl8n0lqqcs6lx1sl64p51icg7bbz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123946,8 +123866,8 @@ self: {
      }:
      mkDerivation {
        pname = "hookup";
-       version = "0.3.0.1";
-       sha256 = "12jwjgbbdiyffy78b90a2jcz1vz1mfsrmgj0q4w3ly3zl79j2la9";
+       version = "0.3.1.0";
+       sha256 = "0dyx0zgxis4viqgdkky25q93vh3z551m7nssjfr15rqj25w8zb5y";
        libraryHaskellDepends = [
          attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network
        ];
@@ -128068,6 +127988,8 @@ self: {
        pname = "hsimport";
        version = "0.11.0";
        sha256 = "1z55gpwyb2gwjlll2c32g9r4aqpdybjpnjy785z60wpjdl48qwaa";
+       revision = "2";
+       editedCabalFile = "00blkkmxc7ldwa7jywrg32pq0nz7z8sidj56qdy5s8cpzx57gwg8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -129023,15 +128945,19 @@ self: {
      }) {};
 
   "hspec-hedgehog" = callPackage
-    ({ mkDerivation, base, hedgehog, hspec, hspec-core }:
+    ({ mkDerivation, base, hedgehog, hspec, hspec-core, HUnit
+     , QuickCheck, splitmix
+     }:
      mkDerivation {
        pname = "hspec-hedgehog";
-       version = "0.0.0.1";
-       sha256 = "08689r0s7qkj7gkkz20z3qhka69b0lvvmcr3zg28yy5x7wgdbi9v";
-       libraryHaskellDepends = [ base hedgehog hspec-core ];
-       testHaskellDepends = [ base hedgehog hspec hspec-core ];
-       description = "Hedgehog support for the Hspec testing framework";
-       license = stdenv.lib.licenses.mit;
+       version = "0.0.1.1";
+       sha256 = "1x61lslkpc67k7rbrggwabx6s60wv2v3iqarrb8746dgn0p225vj";
+       libraryHaskellDepends = [
+         base hedgehog hspec hspec-core HUnit QuickCheck splitmix
+       ];
+       testHaskellDepends = [ base hedgehog hspec ];
+       description = "Integrate Hedgehog and Hspec!";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {};
@@ -131506,6 +131432,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "http-download_0_2_0_0" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, conduit
+     , conduit-extra, cryptonite, cryptonite-conduit, directory
+     , exceptions, filepath, hspec, hspec-discover, http-client
+     , http-conduit, http-types, memory, path, path-io, retry, rio
+     , rio-prettyprint
+     }:
+     mkDerivation {
+       pname = "http-download";
+       version = "0.2.0.0";
+       sha256 = "1wg5jck0h52dysdn0q5xs7gh8cjyq2qr9vaj7qa4fr3am1753n8v";
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring conduit conduit-extra cryptonite
+         cryptonite-conduit directory exceptions filepath http-client
+         http-conduit http-types memory path path-io retry rio
+         rio-prettyprint
+       ];
+       testHaskellDepends = [
+         base cryptonite hspec hspec-discover http-client path path-io retry
+         rio rio-prettyprint
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Verified downloads with retries";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-encodings" = callPackage
     ({ mkDerivation, base, bytestring, HTTP, iconv, mime, mtl, parsec
      , text, utf8-string, zlib
@@ -132979,6 +132932,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hvega_0_6_0_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
+     , filepath, tasty, tasty-golden, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "hvega";
+       version = "0.6.0.0";
+       sha256 = "0znipifss3cz55xj2nw27c4m284sb71gprksabypib3qdigqpwis";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ aeson base text unordered-containers ];
+       testHaskellDepends = [
+         aeson aeson-pretty base bytestring containers filepath tasty
+         tasty-golden text
+       ];
+       description = "Create Vega-Lite visualizations (version 4) in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hvega-theme" = callPackage
     ({ mkDerivation, base, hvega, text }:
      mkDerivation {
@@ -133081,6 +133054,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-bits_0_7_1_2" = callPackage
+    ({ mkDerivation, base, bitvec, bytestring, criterion, deepseq
+     , doctest, doctest-discover, hedgehog, hspec, hspec-discover
+     , hw-hspec-hedgehog, hw-int, hw-prim, hw-string-parse, vector
+     }:
+     mkDerivation {
+       pname = "hw-bits";
+       version = "0.7.1.2";
+       sha256 = "1jgj5j09ddiv6yf605m1azaknbfawqhfqc2m3xpr800v43myr3m8";
+       libraryHaskellDepends = [
+         base bitvec bytestring deepseq hw-int hw-prim hw-string-parse
+         vector
+       ];
+       testHaskellDepends = [
+         base bitvec bytestring doctest doctest-discover hedgehog hspec
+         hw-hspec-hedgehog hw-prim vector
+       ];
+       testToolDepends = [ doctest-discover hspec-discover ];
+       benchmarkHaskellDepends = [ base criterion vector ];
+       description = "Bit manipulation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-ci-assist" = callPackage
     ({ mkDerivation, base, hedgehog, hspec, hspec-discover, hw-hedgehog
      , hw-hspec-hedgehog, optparse-applicative
@@ -133700,32 +133697,6 @@ self: {
      }) {};
 
   "hw-prim" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, deepseq, directory
-     , exceptions, ghc-prim, hedgehog, hspec, hspec-discover
-     , hw-hspec-hedgehog, mmap, QuickCheck, semigroups, transformers
-     , unliftio-core, vector
-     }:
-     mkDerivation {
-       pname = "hw-prim";
-       version = "0.6.2.39";
-       sha256 = "06f4ygwmfb3ambzw972cninj9v0i7pir97qq0832a1mb19h4222g";
-       libraryHaskellDepends = [
-         base bytestring deepseq ghc-prim mmap semigroups transformers
-         unliftio-core vector
-       ];
-       testHaskellDepends = [
-         base bytestring directory exceptions hedgehog hspec
-         hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion mmap semigroups transformers vector
-       ];
-       description = "Primitive functions and data types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-prim_0_6_2_40" = callPackage
     ({ mkDerivation, base, bytestring, criterion, deepseq, directory
      , doctest, doctest-discover, exceptions, ghc-prim, hedgehog, hspec
      , hspec-discover, hw-hspec-hedgehog, mmap, QuickCheck, semigroups
@@ -133750,7 +133721,6 @@ self: {
        ];
        description = "Primitive functions and data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-prim-bits" = callPackage
@@ -136374,8 +136344,8 @@ self: {
     ({ mkDerivation, aeson, base, hvega, ihaskell, text }:
      mkDerivation {
        pname = "ihaskell-hvega";
-       version = "0.2.2.0";
-       sha256 = "1az5jwd3gwv7pmzdd2mgpip4qkxisjq1fgwp1czb7lmmsqwk1jgc";
+       version = "0.2.3.0";
+       sha256 = "02j08ci3ss82g2a26qdnykwb1rggb8w53jqm4xnxc8hqm25fb3mk";
        libraryHaskellDepends = [ aeson base hvega ihaskell text ];
        description = "IHaskell display instance for hvega types";
        license = stdenv.lib.licenses.bsd3;
@@ -136919,6 +136889,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "immortal-queue" = callPackage
+    ({ mkDerivation, async, base, immortal, stm, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "immortal-queue";
+       version = "0.1.0.1";
+       sha256 = "14a0sy4j0b0x2l8j4ajqizjkzrgbicavy3k5xzz349cvy3dq6fz7";
+       libraryHaskellDepends = [ async base immortal ];
+       testHaskellDepends = [ base stm tasty tasty-hunit ];
+       description = "Build a pool of queue-processing worker threads";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "imparse" = callPackage
     ({ mkDerivation, ascetic, base, compilation, containers, directory
      , indents, MissingH, parsec, richreports, split, staticanalysis
@@ -137554,8 +137536,8 @@ self: {
     ({ mkDerivation, base, hspec, hspec-discover }:
      mkDerivation {
        pname = "indexed-containers";
-       version = "0.1.0.1";
-       sha256 = "0karyvfp49jk5dp4cxvcramf295wjr3xsnh0l9qd0p11vn1h98qk";
+       version = "0.1.0.2";
+       sha256 = "18njnawx2wbkgq9f5747id11k8cpm604mc2xqhn3iaiyn3zyn28f";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        testToolDepends = [ hspec-discover ];
@@ -138040,25 +138022,27 @@ self: {
 
   "inline-asm" = callPackage
     ({ mkDerivation, base, bytestring, containers, either, ghc-prim
-     , hspec, megaparsec, mtl, QuickCheck, template-haskell, uniplate
+     , hspec, hspec-core, megaparsec, mtl, parser-combinators
+     , QuickCheck, template-haskell, uniplate
      }:
      mkDerivation {
        pname = "inline-asm";
-       version = "0.3.1.0";
-       sha256 = "1yd5sij6k61z4d6p51c2zsxfn9kn613fzlmqqmgxjvcw5il7mcdn";
+       version = "0.4.0.1";
+       sha256 = "19djbqfidl8spii2y5a4qi5a6k2dhh9kg4lafxx58w60118rsv6z";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers either ghc-prim megaparsec mtl
-         template-haskell uniplate
+         parser-combinators template-haskell uniplate
        ];
        executableHaskellDepends = [
          base bytestring containers either ghc-prim megaparsec mtl
-         template-haskell uniplate
+         parser-combinators template-haskell uniplate
        ];
        testHaskellDepends = [
-         base bytestring containers either ghc-prim hspec megaparsec mtl
-         QuickCheck template-haskell uniplate
+         base bytestring containers either ghc-prim hspec hspec-core
+         megaparsec mtl parser-combinators QuickCheck template-haskell
+         uniplate
        ];
        description = "Inline some Assembly in ur Haskell!";
        license = stdenv.lib.licenses.bsd3;
@@ -143928,8 +143912,8 @@ self: {
      }:
      mkDerivation {
        pname = "jukebox";
-       version = "0.4.3";
-       sha256 = "1daqxkyh95b84z8ijb16syx6wbprnjkrzg14n6p8vf672nnfm20g";
+       version = "0.4.4";
+       sha256 = "0xjyyklwyzblgyakziwyh4420q1fcbqsss35dpxm592wd74wk0mw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -147707,8 +147691,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-ats";
-       version = "1.7.8.0";
-       sha256 = "0syr7jnwv7j1i6rz7sal8m1lggxzal30mksyjsmlxxs9ancfiy93";
+       version = "1.7.10.0";
+       sha256 = "1xixsf3n8ld1fjd96qvvvrmrmypd7idyb7syih09f8gq80jkaw5g";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array base composition-prelude containers deepseq
@@ -147724,22 +147708,6 @@ self: {
      }) {};
 
   "language-avro" = callPackage
-    ({ mkDerivation, avro, base, filepath, hspec, megaparsec, text
-     , vector
-     }:
-     mkDerivation {
-       pname = "language-avro";
-       version = "0.1.0.0";
-       sha256 = "1nns0qlzrcmlfivv2p4qdhni6ngx3r0926z6kmybmqi3jk7wibhw";
-       libraryHaskellDepends = [
-         avro base filepath megaparsec text vector
-       ];
-       testHaskellDepends = [ avro base hspec megaparsec text vector ];
-       description = "Language definition and parser for AVRO files";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "language-avro_0_1_2_0" = callPackage
     ({ mkDerivation, avro, base, containers, directory, filepath, hspec
      , hspec-megaparsec, megaparsec, text, vector
      }:
@@ -147755,7 +147723,6 @@ self: {
        ];
        description = "Language definition and parser for AVRO files";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-bash" = callPackage
@@ -147998,8 +147965,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-docker";
-       version = "8.0.2";
-       sha256 = "00fgxddlim1h7xcklr1q38sxbf8zh1m84mha6yzab5as1x14lhij";
+       version = "8.1.0";
+       sha256 = "0ifvn8xz8qbwy13kmmadi5xdzvxxbq8nmilrnlls8plb8cwsd5ff";
        libraryHaskellDepends = [
          base bytestring containers free megaparsec mtl prettyprinter split
          template-haskell text th-lift time
@@ -148934,8 +148901,8 @@ self: {
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
        pname = "laop";
-       version = "0.1.0.6";
-       sha256 = "1xwyzkn884dwifpi2945pzz830pqillbm6zvy9dwl6dwhgyvlk7y";
+       version = "0.1.0.7";
+       sha256 = "0czxisy1vc4xinci5qhlw8mj1akydy3d5bfg45rd45dk699chxw4";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [ base deepseq ];
        license = stdenv.lib.licenses.bsd3;
@@ -149245,6 +149212,57 @@ self: {
        broken = true;
      }) {};
 
+  "latex-svg-hakyll" = callPackage
+    ({ mkDerivation, base, hakyll, latex-svg-image, latex-svg-pandoc
+     , lrucache, pandoc-types
+     }:
+     mkDerivation {
+       pname = "latex-svg-hakyll";
+       version = "0.1";
+       sha256 = "119mln1k2qlzddz7fwjpvqzkd9gwi9ijmrlzlcxly63a8ffvylcn";
+       libraryHaskellDepends = [
+         base hakyll latex-svg-image latex-svg-pandoc lrucache pandoc-types
+       ];
+       description = "Use actual LaTeX to render formulae inside Hakyll pages";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "latex-svg-image" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring
+     , cryptohash-sha256, deepseq, directory, filepath, parsec, process
+     , temporary, transformers
+     }:
+     mkDerivation {
+       pname = "latex-svg-image";
+       version = "0.1";
+       sha256 = "0g27rg4ip5rg2dkfwxv3khnfn8bjpgwrr3sakxvsrhvsxgb6lwf3";
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring cryptohash-sha256 deepseq
+         directory filepath parsec process temporary transformers
+       ];
+       description = "A library for rendering LaTeX formulae as SVG using an actual LaTeX";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "latex-svg-pandoc" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath
+     , latex-svg-image, pandoc-types, text
+     }:
+     mkDerivation {
+       pname = "latex-svg-pandoc";
+       version = "0.1";
+       sha256 = "17n5gfdl7vdy06pph32yii9sww0mby10mdki6lh9k8wlvm15khv8";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring directory filepath latex-svg-image pandoc-types
+         text
+       ];
+       executableHaskellDepends = [ base latex-svg-image pandoc-types ];
+       description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lattices" = callPackage
     ({ mkDerivation, base, base-compat, containers, deepseq, hashable
      , integer-logarithms, QuickCheck, quickcheck-instances
@@ -149279,8 +149297,8 @@ self: {
      }:
      mkDerivation {
        pname = "launchdarkly-server-sdk";
-       version = "1.0.0";
-       sha256 = "1b9561g4pwprixdzs4k2j0776whxjm2w9cfhi45p5zkjb8hv2jhn";
+       version = "1.0.1";
+       sha256 = "1425n7b587k9c6w3k95lcdhk5blj9blzjgnb67ylr1fizzayxc7h";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring
          bytestring-conversion clock containers cryptohash exceptions extra
@@ -149894,14 +149912,15 @@ self: {
      }:
      mkDerivation {
        pname = "lean-peano";
-       version = "0.1.1.0";
-       sha256 = "19b959z6amsr6jfc5fmbks67sqhribplnv7rzxyn0ipzswxgsppb";
+       version = "1.0.1.0";
+       sha256 = "1h673y0rafh1dh8hy95spr2xwqc64pkkd094p6bd4cqvcmy72nd6";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [
          base base-compat deepseq doctest hedgehog QuickCheck
          template-haskell
        ];
+       description = "A maximally lazy, simple implementation of the Peano numbers with minimal dependencies";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -151301,14 +151320,15 @@ self: {
 
   "libarchive" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, Cabal, chs-cabal
-     , composition-prelude, criterion, deepseq, dir-traverse, directory
-     , dlist, filepath, hspec, libarchive, mtl, pathological-bytestrings
-     , tar, tar-conduit, temporary, unix-compat
+     , composition-prelude, cpphs, criterion, deepseq, dir-traverse
+     , directory, dlist, filepath, hspec, libarchive, mtl
+     , pathological-bytestrings, tar, tar-conduit, temporary
+     , unix-compat
      }:
      mkDerivation {
        pname = "libarchive";
-       version = "2.2.1.0";
-       sha256 = "08i3fm5rfqmdj4csaqdyyyhvnpdjjsgx5sbi0lyyzvk1sih5q968";
+       version = "2.2.3.0";
+       sha256 = "0vnby3clfx3rqs6gw8l55nhdns47my0ihc9l4k5zmy1bvdhywy6y";
        setupHaskellDepends = [ base Cabal chs-cabal ];
        libraryHaskellDepends = [
          base bytestring composition-prelude deepseq dlist filepath mtl
@@ -151320,6 +151340,7 @@ self: {
          base bytestring composition-prelude dir-traverse directory filepath
          hspec mtl pathological-bytestrings temporary
        ];
+       testToolDepends = [ cpphs ];
        benchmarkHaskellDepends = [
          base bytestring criterion tar tar-conduit temporary
        ];
@@ -153033,6 +153054,21 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "linear-tests" = callPackage
+    ({ mkDerivation, base, hspec, hspec-core, lens, linear, QuickCheck
+     }:
+     mkDerivation {
+       pname = "linear-tests";
+       version = "0.1.1.0";
+       sha256 = "0qndn8svhynvis1a69p7sircp8sd56hmk9gd4crcadiy8nf99227";
+       libraryHaskellDepends = [ base lens linear QuickCheck ];
+       testHaskellDepends = [
+         base hspec hspec-core lens linear QuickCheck
+       ];
+       description = "Linear Algebra";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "linear-vect" = callPackage
     ({ mkDerivation, base, random }:
      mkDerivation {
@@ -153167,8 +153203,8 @@ self: {
      }:
      mkDerivation {
        pname = "lingo";
-       version = "0.3.0.0";
-       sha256 = "0cjxd9yflagps5760h62m948nmhbn0ad8kyldv9k28i59phm8gwx";
+       version = "0.3.1.0";
+       sha256 = "0bx3hf0lpi05w2ky0pkak39lhbpqyy8nahyk5j6z8ivi7fpm3p4s";
        setupHaskellDepends = [
          base bytestring Cabal containers directory filepath text yaml
        ];
@@ -155432,8 +155468,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-warper";
-       version = "1.8.11";
-       sha256 = "0xhvipk5dlv7r2pmgn5mf46rrz092xhm6ar611y5lrr99i2kg172";
+       version = "1.9.0";
+       sha256 = "13hjbb1kqxilgqslc0c1fh5459278a71ihly24x9v6hhp1y5if91";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -156600,8 +156636,6 @@ self: {
        ];
        description = "Functional test framework for LSP servers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "lss" = callPackage
@@ -157294,6 +157328,22 @@ self: {
        broken = true;
      }) {};
 
+  "lz4-hs" = callPackage
+    ({ mkDerivation, base, bytestring, c2hs, filepath, tasty
+     , tasty-hunit, temporary
+     }:
+     mkDerivation {
+       pname = "lz4-hs";
+       version = "0.1.1.0";
+       sha256 = "12wcjfqbzh4myyxbnwlf3kddis8h0cgar62gjw7srrfa2025vmc7";
+       libraryHaskellDepends = [ base bytestring ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [ base bytestring tasty tasty-hunit ];
+       benchmarkHaskellDepends = [ base bytestring filepath temporary ];
+       description = "lz4 bindings for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lzip" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -157311,8 +157361,8 @@ self: {
      }:
      mkDerivation {
        pname = "lzlib";
-       version = "1.0.3.0";
-       sha256 = "06xdmrqc5p9nx8rqdx1i0hjlrlyanimvrk8rwb6bv04aprz22q8j";
+       version = "1.0.4.0";
+       sha256 = "1l7mbxh2cn8vgfxwkzrz9mv5ca2bx4ymbswvjz7b3mgjx0wiy9g8";
        libraryHaskellDepends = [ base bytestring ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [
@@ -159614,6 +159664,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "massiv-io_0_2_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, Color
+     , data-default-class, deepseq, doctest, exceptions, filepath, hspec
+     , JuicyPixels, massiv, massiv-test, netpbm, QuickCheck, random
+     , template-haskell, unliftio, vector
+     }:
+     mkDerivation {
+       pname = "massiv-io";
+       version = "0.2.1.0";
+       sha256 = "0p7z4nk0fv9lql17s9d18hi5mrnvr4zry6rghqnhjmhlp97g4yi6";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base bytestring Color data-default-class deepseq exceptions
+         filepath JuicyPixels massiv netpbm unliftio vector
+       ];
+       testHaskellDepends = [
+         base bytestring doctest hspec JuicyPixels massiv massiv-test
+         QuickCheck random template-haskell
+       ];
+       description = "Import/export of Image files into massiv Arrays";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "massiv-scheduler" = callPackage
     ({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest
      , deepseq, doctest, exceptions, hspec, QuickCheck, template-haskell
@@ -159784,6 +159858,18 @@ self: {
        broken = true;
      }) {inherit (pkgs) pcre;};
 
+  "math-extras" = callPackage
+    ({ mkDerivation, base, hedgehog }:
+     mkDerivation {
+       pname = "math-extras";
+       version = "0.1.1.0";
+       sha256 = "0hzk277a3h9ahnlx538p9f821d1i0npf3n6a8wgg8gmmbyn0sk49";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hedgehog ];
+       description = "A variety of mathematical utilities";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "math-functions" = callPackage
     ({ mkDerivation, base, data-default-class, deepseq, erf, primitive
      , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, vector
@@ -162909,8 +162995,8 @@ self: {
      }:
      mkDerivation {
        pname = "min-max-pqueue";
-       version = "0.1.0.0";
-       sha256 = "142cfiybs6slzrdhc0k91rr5xxzi07saxcr834iic304cpbzcdrv";
+       version = "0.1.0.1";
+       sha256 = "09lby8qvjrcdp7ygy4a4dcw8w3y689qzazbcd55249z7ljjw731s";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hedgehog ];
        benchmarkHaskellDepends = [
@@ -163009,6 +163095,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mini-egison_1_0_0" = callPackage
+    ({ mkDerivation, base, egison-pattern-src
+     , egison-pattern-src-th-mode, haskell-src-exts, haskell-src-meta
+     , hspec, mtl, primes, recursion-schemes, sort, template-haskell
+     }:
+     mkDerivation {
+       pname = "mini-egison";
+       version = "1.0.0";
+       sha256 = "1x78p2s706kb6w4ci6w0av19zhw4i64bbl6xmvwrjs66xjgxrai6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base egison-pattern-src egison-pattern-src-th-mode haskell-src-exts
+         haskell-src-meta mtl recursion-schemes template-haskell
+       ];
+       executableHaskellDepends = [ base sort ];
+       testHaskellDepends = [ base hspec primes ];
+       description = "Template Haskell Implementation of Egison Pattern Matching";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "miniball" = callPackage
     ({ mkDerivation, base, vector }:
      mkDerivation {
@@ -163121,6 +163229,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "minimorph_0_2_2_0" = callPackage
+    ({ mkDerivation, base, HUnit, test-framework, test-framework-hunit
+     , text
+     }:
+     mkDerivation {
+       pname = "minimorph";
+       version = "0.2.2.0";
+       sha256 = "1fmnlv2qr8vnxk82b208fp7ckp920zrj9z9xv7lv6d5lgnsasf2c";
+       libraryHaskellDepends = [ base text ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit text
+       ];
+       description = "English spelling functions with an emphasis on simplicity";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "minimung" = callPackage
     ({ mkDerivation, base, GLUT, haskell98, unix }:
      mkDerivation {
@@ -163321,6 +163446,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "miniutter_0_5_1_0" = callPackage
+    ({ mkDerivation, base, binary, containers, HUnit, minimorph
+     , test-framework, test-framework-hunit, text
+     }:
+     mkDerivation {
+       pname = "miniutter";
+       version = "0.5.1.0";
+       sha256 = "0871hhpj5fl5si6rwg9l1lpdarlva3y888rgrrb4gaqsssnh0kk1";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base binary containers minimorph text ];
+       testHaskellDepends = [
+         base containers HUnit test-framework test-framework-hunit text
+       ];
+       description = "Simple English clause creation from arbitrary words";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "minlen" = callPackage
     ({ mkDerivation, base, mono-traversable, semigroups, transformers
      }:
@@ -164083,8 +164226,8 @@ self: {
     ({ mkDerivation, base, mmsyn2, mmsyn5, mmsyn6ukr, vector }:
      mkDerivation {
        pname = "mmsyn7s";
-       version = "0.6.3.0";
-       sha256 = "03gfnz0h9agi8zr1567b4ccrq1mhcm86f19minmx43gsipgr0gj4";
+       version = "0.6.5.1";
+       sha256 = "0n5d3a3sscvasssi38nlbflqibjca2s95b6xyfmdwqn1n95bs6cy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mmsyn2 mmsyn5 mmsyn6ukr vector ];
@@ -164099,8 +164242,8 @@ self: {
      }:
      mkDerivation {
        pname = "mmsyn7ukr";
-       version = "0.15.2.0";
-       sha256 = "1yrzlw1ai6w589ql7xnxcazb0yg2ixnk67fakndjn3gvk3h84gbx";
+       version = "0.15.3.0";
+       sha256 = "02556sgfwi0fzlwj0x22hmyi9pgq0j7w4yfpjy2ni1px8vanwq5j";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -164755,6 +164898,21 @@ self: {
        broken = true;
      }) {};
 
+  "monad-choice" = callPackage
+    ({ mkDerivation, base, invariant, MonadRandom, mtl, transformers }:
+     mkDerivation {
+       pname = "monad-choice";
+       version = "0.1.0.0";
+       sha256 = "0vhfiqrnkfhqkhnh9h4npl3rfam321iikabr3przywfcfd4gap4z";
+       revision = "1";
+       editedCabalFile = "19acnk2dy5zan230g268nyvdx1y8piav3x9z6jsjbi2d7zm9sr38";
+       libraryHaskellDepends = [
+         base invariant MonadRandom mtl transformers
+       ];
+       description = "Monad, monad transformer, and typeclass representing choices";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "monad-chronicle" = callPackage
     ({ mkDerivation, base, data-default-class, mtl, semigroupoids
      , these, transformers, transformers-compat
@@ -165143,6 +165301,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "monad-logger_0_3_32" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, conduit-extra
+     , exceptions, fast-logger, lifted-base, monad-control, monad-loops
+     , mtl, resourcet, stm, stm-chans, template-haskell, text
+     , transformers, transformers-base, transformers-compat
+     , unliftio-core
+     }:
+     mkDerivation {
+       pname = "monad-logger";
+       version = "0.3.32";
+       sha256 = "14f1igbrkvwxxyhk58apc7swpzadaimfyaf75hwmsf5xc7xvjxyr";
+       libraryHaskellDepends = [
+         base bytestring conduit conduit-extra exceptions fast-logger
+         lifted-base monad-control monad-loops mtl resourcet stm stm-chans
+         template-haskell text transformers transformers-base
+         transformers-compat unliftio-core
+       ];
+       description = "A class of monads which can log messages";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-logger-json" = callPackage
     ({ mkDerivation, aeson, base, monad-logger, template-haskell, text
      }:
@@ -174178,8 +174358,8 @@ self: {
      }:
      mkDerivation {
        pname = "nix-deploy";
-       version = "1.0.4";
-       sha256 = "1wmwrnm6wflkdaq0m84az1q6245iyvkzd2r47vdy9a2a1szqnvl3";
+       version = "1.0.5";
+       sha256 = "0jsrmslai8xn1nkijg1196gkn10dagqgm8p39r7jsfaa4jvwm040";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -174344,8 +174524,6 @@ self: {
        ];
        description = "An opinionated formatter for Nix";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "nixfromnpm" = callPackage
@@ -175011,8 +175189,8 @@ self: {
     ({ mkDerivation, base, primitive, vector }:
      mkDerivation {
        pname = "nonlinear-optimization";
-       version = "0.3.12";
-       sha256 = "129wvjrxxzcjzp4k2jjyn186xknglbcqj5jiah48mcrg44iash3r";
+       version = "0.3.12.1";
+       sha256 = "1hva2djjgdk9gjng4zqx9h9m0k3jgjhgjypx2yc3ddhfbs9x2wn0";
        libraryHaskellDepends = [ base primitive vector ];
        description = "Various iterative algorithms for optimization of nonlinear functions";
        license = "GPL";
@@ -175024,8 +175202,10 @@ self: {
      }:
      mkDerivation {
        pname = "nonlinear-optimization-ad";
-       version = "0.2.3";
-       sha256 = "13a7j23ry8fkpvpc061ishcb4x2dnhnjbv3pcbywwri0w86g4g7d";
+       version = "0.2.4";
+       sha256 = "0wqi1y4f2sqn7wg1bj3i73kwdawg9ni6lq1s87m6sshy34n0vbx5";
+       revision = "1";
+       editedCabalFile = "0m3320spwzlyiyfjwdkxn92c858pivskrgazby1c1b3qp3nl2dk6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -175035,6 +175215,24 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "nonlinear-optimization-backprop" = callPackage
+    ({ mkDerivation, backprop, base, mono-traversable, mtl
+     , nonlinear-optimization, primitive, reflection, vector
+     }:
+     mkDerivation {
+       pname = "nonlinear-optimization-backprop";
+       version = "0.2.4";
+       sha256 = "0j7i67m25r4hs81w0j090c8wifvxxs0hzj0l0rj7aa1yrx5iwbhq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         backprop base mono-traversable mtl nonlinear-optimization primitive
+         reflection vector
+       ];
+       description = "Wrapper of nonlinear-optimization package for using with backprop package";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "noodle" = callPackage
     ({ mkDerivation, base, directory, filepath }:
      mkDerivation {
@@ -178188,20 +178386,40 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "opentelemetry_0_1_0" = callPackage
+    ({ mkDerivation, async, base, bytestring, clock, directory
+     , exceptions, hashable, random, stm, tasty, tasty-discover
+     , tasty-hunit, tasty-quickcheck, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "opentelemetry";
+       version = "0.1.0";
+       sha256 = "032dx71zdgsi1qpj948s55j3da0vdqms292166yvdg9h8vl5ji53";
+       libraryHaskellDepends = [
+         base bytestring clock directory exceptions hashable random stm text
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         async base bytestring tasty tasty-discover tasty-hunit
+         tasty-quickcheck
+       ];
+       testToolDepends = [ tasty-discover ];
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "opentelemetry-lightstep" = callPackage
-    ({ mkDerivation, async, base, exceptions, http-types, http2
-     , http2-client, http2-client-grpc, http2-grpc-proto-lens, lens, mtl
-     , network, opentelemetry, proto-lens, proto-lens-protobuf-types
-     , proto-lens-runtime, text, unordered-containers
+    ({ mkDerivation, aeson, async, base, bytestring, exceptions
+     , http-client, http-client-tls, http-types, network, opentelemetry
+     , scientific, stm, text, unordered-containers
      }:
      mkDerivation {
        pname = "opentelemetry-lightstep";
-       version = "0.0.0.0";
-       sha256 = "1nnpis5ka6fgf0vmvcf68zqnjw69pvs91qm6slsgv58aww6fn9a2";
+       version = "0.1.0";
+       sha256 = "01l463xfwn40j3jd54hvmbx0csgjg853j39r38clzwknxsfq60cb";
        libraryHaskellDepends = [
-         base exceptions http-types http2 http2-client http2-client-grpc
-         http2-grpc-proto-lens lens mtl network opentelemetry proto-lens
-         proto-lens-protobuf-types proto-lens-runtime text
+         aeson async base bytestring exceptions http-client http-client-tls
+         http-types network opentelemetry scientific stm text
          unordered-containers
        ];
        testHaskellDepends = [ async base opentelemetry ];
@@ -179223,6 +179441,33 @@ self: {
        broken = true;
      }) {};
 
+  "org-mode" = callPackage
+    ({ mkDerivation, base, filepath, hashable, megaparsec
+     , parser-combinators, tasty, tasty-hunit, text, time
+     }:
+     mkDerivation {
+       pname = "org-mode";
+       version = "1.0.1";
+       sha256 = "0nhpb8x11w0w3jwplk3bx9a2llw77l66wbm31bpgdpr6ak2r0z75";
+       libraryHaskellDepends = [
+         base filepath hashable megaparsec parser-combinators text time
+       ];
+       testHaskellDepends = [
+         base megaparsec tasty tasty-hunit text time
+       ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "org-mode-lucid" = callPackage
+    ({ mkDerivation, base, hashable, lucid, org-mode, text }:
+     mkDerivation {
+       pname = "org-mode-lucid";
+       version = "1.0.1";
+       sha256 = "102hn0r18nm6l9m976bl6qfqwrdj3vmn0f2j32vrxkkybwfjwdkh";
+       libraryHaskellDepends = [ base hashable lucid org-mode text ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "org2anki" = callPackage
     ({ mkDerivation, base, parsec, regex-compat }:
      mkDerivation {
@@ -180963,8 +181208,8 @@ self: {
     ({ mkDerivation }:
      mkDerivation {
        pname = "pandora";
-       version = "0.2.1";
-       sha256 = "0v8jpaz5mwg4qx6a4y7i0d8pk70qd4bla07krlxbix9c56mma33l";
+       version = "0.2.2";
+       sha256 = "16aisw2cafa25hm3si7g0xzai9j602gggd8yz8ixrrhly9jhw0cd";
        description = "A box of patterns and paradigms";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -181115,7 +181360,7 @@ self: {
        broken = true;
      }) {};
 
-  "pantry" = callPackage
+  "pantry_0_2_0_0" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans
      , base64-bytestring, bytestring, Cabal, conduit, conduit-extra
      , containers, contravariant, cryptonite, cryptonite-conduit
@@ -181165,6 +181410,48 @@ self: {
        ];
        description = "Content addressable Haskell package management";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "pantry" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal
+     , casa-client, casa-types, conduit, conduit-extra, containers
+     , cryptonite, cryptonite-conduit, digest, exceptions, filelock
+     , generic-deriving, hackage-security, hedgehog, hpack, hspec
+     , http-client, http-client-tls, http-conduit, http-download
+     , http-types, memory, mtl, network-uri, path, path-io, persistent
+     , persistent-sqlite, persistent-template, primitive, QuickCheck
+     , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint
+     , tar-conduit, text, text-metrics, time, transformers, unix-compat
+     , unliftio, unordered-containers, vector, yaml, zip-archive
+     }:
+     mkDerivation {
+       pname = "pantry";
+       version = "0.3.0.0";
+       sha256 = "0j4ryr3wz2wlfsn9qf0cjbk91iwas89rci3x55cnf8s8ppx159am";
+       libraryHaskellDepends = [
+         aeson ansi-terminal base bytestring Cabal casa-client casa-types
+         conduit conduit-extra containers cryptonite cryptonite-conduit
+         digest filelock generic-deriving hackage-security hpack http-client
+         http-client-tls http-conduit http-download http-types memory mtl
+         network-uri path path-io persistent persistent-sqlite
+         persistent-template primitive resourcet rio rio-orphans
+         rio-prettyprint tar-conduit text text-metrics time transformers
+         unix-compat unliftio unordered-containers vector yaml zip-archive
+       ];
+       testHaskellDepends = [
+         aeson ansi-terminal base bytestring Cabal casa-client casa-types
+         conduit conduit-extra containers cryptonite cryptonite-conduit
+         digest exceptions filelock generic-deriving hackage-security
+         hedgehog hpack hspec http-client http-client-tls http-conduit
+         http-download http-types memory mtl network-uri path path-io
+         persistent persistent-sqlite persistent-template primitive
+         QuickCheck raw-strings-qq resourcet rio rio-orphans rio-prettyprint
+         tar-conduit text text-metrics time transformers unix-compat
+         unliftio unordered-containers vector yaml zip-archive
+       ];
+       description = "Content addressable Haskell package management";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "pantry-tmp" = callPackage
@@ -182522,8 +182809,8 @@ self: {
      }:
      mkDerivation {
        pname = "parsix";
-       version = "0.2.2.0";
-       sha256 = "1l2xg0xca1ss4gpl5gmpvbck0f66r8mazai6x561ldqb3kqjx1as";
+       version = "0.2.2.1";
+       sha256 = "0bkk1186qgnaxv1n5ycs04szrf55ra7jbfzlqbmlx8vaxq9g6xdf";
        libraryHaskellDepends = [
          base containers fingertree mtl parsers prettyprinter
          prettyprinter-ansi-terminal text transformers
@@ -185417,6 +185704,32 @@ self: {
        broken = true;
      }) {};
 
+  "persistent-typed-db_0_1_0_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec
+     , http-api-data, monad-logger, path-pieces, persistent
+     , persistent-template, resource-pool, resourcet, template-haskell
+     , text, transformers
+     }:
+     mkDerivation {
+       pname = "persistent-typed-db";
+       version = "0.1.0.1";
+       sha256 = "07yjzxg5yfxv1zbp5pkrvj8nrsxyhy4n11zgmd0q9g186q6283qn";
+       libraryHaskellDepends = [
+         aeson base bytestring conduit http-api-data monad-logger
+         path-pieces persistent persistent-template resource-pool resourcet
+         template-haskell text transformers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring conduit esqueleto hspec http-api-data
+         monad-logger path-pieces persistent persistent-template
+         resource-pool resourcet template-haskell text transformers
+       ];
+       description = "Type safe access to multiple database schemata";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "persistent-vector" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, QuickCheck
      , test-framework, test-framework-quickcheck2
@@ -192299,6 +192612,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "preql" = callPackage
+    ({ mkDerivation, aeson, alex, array, base, binary-parser
+     , bytestring, bytestring-strict-builder, contravariant, free, happy
+     , mtl, postgresql-binary, postgresql-libpq, postgresql-simple, syb
+     , template-haskell, text, th-lift-instances, time, transformers
+     , uuid, vector
+     }:
+     mkDerivation {
+       pname = "preql";
+       version = "0.1";
+       sha256 = "1a5b45vplknan61l0p68559pg7la89ly97mzbqxb5j6v3cifgmcg";
+       libraryHaskellDepends = [
+         aeson array base binary-parser bytestring bytestring-strict-builder
+         contravariant free mtl postgresql-binary postgresql-libpq
+         postgresql-simple syb template-haskell text th-lift-instances time
+         transformers uuid vector
+       ];
+       libraryToolDepends = [ alex happy ];
+       description = "experiments with SQL";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "presburger" = callPackage
     ({ mkDerivation, base, containers, pretty, QuickCheck }:
      mkDerivation {
@@ -192952,10 +193287,8 @@ self: {
      }:
      mkDerivation {
        pname = "primitive";
-       version = "0.7.0.0";
-       sha256 = "0xhmin3z2vp8jina1wzxg11nqiz8x63wisv2nw2ggji8lgz48skq";
-       revision = "1";
-       editedCabalFile = "1g10dsdadv8sy9mhhwx4jknzshvxc4qx6z9lmgqy7060prlbqnn4";
+       version = "0.7.0.1";
+       sha256 = "1pgpjzlfn037lw7lsszpqmqhbf33fnd86jna1whdd4pl57cbg2yx";
        libraryHaskellDepends = [ base ghc-prim transformers ];
        testHaskellDepends = [
          base base-orphans ghc-prim QuickCheck semigroups tagged tasty
@@ -194665,8 +194998,8 @@ self: {
      }:
      mkDerivation {
        pname = "prosidy";
-       version = "1.5.0.1";
-       sha256 = "1pbqa89khrm0kqcsdd8sj82km1sc9laiw155prplnnv7xp8xiigy";
+       version = "1.6.0.0";
+       sha256 = "19c8kz6kdd2flzi1gyddi4yp4fn62wfjahcp66saydb4ipxdxfs4";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base binary bytestring containers contravariant deepseq
@@ -194682,6 +195015,21 @@ self: {
        license = stdenv.lib.licenses.mpl20;
      }) {};
 
+  "prosidyc" = callPackage
+    ({ mkDerivation, base, free, hashable, microlens, mtl, prosidy
+     , text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "prosidyc";
+       version = "0.2.0.0";
+       sha256 = "19nq969mjnpc51nwa6giv93hz7pyn590yhfbsspr5wp5i9xim39i";
+       libraryHaskellDepends = [
+         base free hashable microlens mtl prosidy text unordered-containers
+       ];
+       description = "A DSL for processing Prosidy documents";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "prospect" = callPackage
     ({ mkDerivation, base, deepseq, free, hspec, inspection-testing
      , kan-extensions, mtl, transformers
@@ -202373,6 +202721,8 @@ self: {
        pname = "reflex-basic-host";
        version = "0.2.0.1";
        sha256 = "1bax3rcrwi3447wd7apramw0f248ddksl8lrdjgrph26bbh8vc1i";
+       revision = "1";
+       editedCabalFile = "11bzd169wpdn57d7krgx9bw4x5qzskp9d5abdn74x6ipy34cj5ml";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -202957,6 +203307,8 @@ self: {
        pname = "reg-alloc";
        version = "0.1.0.0";
        sha256 = "1lik9r2lp1r1zamk3f1ciyw5iwgpx018jhk43hmc4kjg4d5g8l0r";
+       revision = "1";
+       editedCabalFile = "1dzisg5cdb2jrcp6xmkzmgzd00phqhgf1iddlm2c10x49lbqsrld";
        libraryHaskellDepends = [ base ];
        description = "Register allocation API";
        license = stdenv.lib.licenses.bsd3;
@@ -204905,6 +205257,19 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "replace-megaparsec_1_3_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, megaparsec, text }:
+     mkDerivation {
+       pname = "replace-megaparsec";
+       version = "1.3.1.0";
+       sha256 = "074vbw5gc3sg2qsj9zlcjdgzdjc8yxa369dvx2w2adl0jv4dk5ib";
+       libraryHaskellDepends = [ base bytestring megaparsec text ];
+       testHaskellDepends = [ base bytestring Cabal megaparsec text ];
+       description = "Find, replace, and edit text patterns with Megaparsec parsers";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "replica" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, Diff
      , file-embed, http-types, QuickCheck, quickcheck-instances
@@ -205574,8 +205939,8 @@ self: {
        pname = "resourcet";
        version = "1.1.11";
        sha256 = "1n94m2c7rxk2bgm8wywrkp9pmqlnv2dl35yaylninzm8xk1xavil";
-       revision = "1";
-       editedCabalFile = "09sgrzaaishx645hrfflxckyaq0dwk22agjf4sz8nwjafyv3ssh9";
+       revision = "2";
+       editedCabalFile = "08v09k5i8nr09f1kscq044hzibq6hsykd3v1xr480dp4hljcw5kc";
        libraryHaskellDepends = [
          base containers exceptions lifted-base mmorph monad-control mtl
          transformers transformers-base transformers-compat unliftio-core
@@ -205594,6 +205959,8 @@ self: {
        pname = "resourcet";
        version = "1.2.2";
        sha256 = "1rfbfcv3r1h29y0yqr3x6a1s04lbc3vzm3jqnfg4f9rqp9d448qk";
+       revision = "1";
+       editedCabalFile = "18v6frks5zr64hpq8dprbk6dxpq4ykijp1xg00ghp7qz060f1r0i";
        libraryHaskellDepends = [
          base containers exceptions mtl primitive transformers unliftio-core
        ];
@@ -205602,6 +205969,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "resourcet_1_2_3" = callPackage
+    ({ mkDerivation, base, containers, exceptions, hspec, mtl
+     , primitive, transformers, unliftio-core
+     }:
+     mkDerivation {
+       pname = "resourcet";
+       version = "1.2.3";
+       sha256 = "1ig7a22i5hn0ya7d4bg3xq0yy9mqgwawx4sv88db0fvdsnzg868s";
+       libraryHaskellDepends = [
+         base containers exceptions mtl primitive transformers unliftio-core
+       ];
+       testHaskellDepends = [ base exceptions hspec transformers ];
+       description = "Deterministic allocation and freeing of scarce resources";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "respond" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring, containers
      , data-default-class, exceptions, fast-logger, formatting, HList
@@ -206601,20 +206985,21 @@ self: {
 
   "rib" = callPackage
     ({ mkDerivation, aeson, async, base-noprelude, binary, clay
-     , cmdargs, containers, directory, exceptions, foldl, fsnotify
-     , lucid, megaparsec, mmark, mmark-ext, modern-uri, mtl, pandoc
-     , pandoc-include-code, pandoc-types, path, path-io, relude, shake
-     , text, wai, wai-app-static, warp
+     , cmdargs, containers, dhall, directory, exceptions, foldl
+     , fsnotify, lucid, megaparsec, mmark, mmark-ext, modern-uri, mtl
+     , pandoc, pandoc-include-code, pandoc-types, path, path-io, relude
+     , safe-exceptions, shake, text, wai, wai-app-static, warp
      }:
      mkDerivation {
        pname = "rib";
-       version = "0.6.0.0";
-       sha256 = "0h1yfa1hf5wshfs3cvqi53rgfh25d1v7gj00wkgd32nkx1v3jrsg";
+       version = "0.7.0.0";
+       sha256 = "0yi8g6c2hfl09l9906v7vljry9jb98xgxrfbngi17d5iqlld9qz4";
        libraryHaskellDepends = [
-         aeson async base-noprelude binary clay cmdargs containers directory
-         exceptions foldl fsnotify lucid megaparsec mmark mmark-ext
-         modern-uri mtl pandoc pandoc-include-code pandoc-types path path-io
-         relude shake text wai wai-app-static warp
+         aeson async base-noprelude binary clay cmdargs containers dhall
+         directory exceptions foldl fsnotify lucid megaparsec mmark
+         mmark-ext modern-uri mtl pandoc pandoc-include-code pandoc-types
+         path path-io relude safe-exceptions shake text wai wai-app-static
+         warp
        ];
        description = "Static site generator using Shake";
        license = stdenv.lib.licenses.bsd3;
@@ -206626,8 +207011,8 @@ self: {
     ({ mkDerivation, base, Only, postgresql-simple, text, time }:
      mkDerivation {
        pname = "ribbit";
-       version = "1.0.0.1";
-       sha256 = "0zixx1xmqc8893rczhdzcplmdcx5dx1c4ykf7rg7w8h5yvni1r0y";
+       version = "1.1.0.0";
+       sha256 = "1pmg7ii6mpl22hlgmripwp44cz4pwp2yqa4z32f21lfr0y9slz8j";
        libraryHaskellDepends = [ base Only postgresql-simple text time ];
        description = "Type-level Relational DB combinators";
        license = stdenv.lib.licenses.mit;
@@ -206921,6 +207306,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "rio_0_1_14_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, directory
+     , exceptions, filepath, hashable, hspec, microlens, mtl, primitive
+     , process, QuickCheck, text, time, typed-process, unix, unliftio
+     , unliftio-core, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "rio";
+       version = "0.1.14.1";
+       sha256 = "0ysbjxaby846vp2w60747b7sm1zy30i62qg0bgsr7z52jamrx3qm";
+       libraryHaskellDepends = [
+         base bytestring containers deepseq directory exceptions filepath
+         hashable microlens mtl primitive process text time typed-process
+         unix unliftio unliftio-core unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers deepseq directory exceptions filepath
+         hashable hspec microlens mtl primitive process QuickCheck text time
+         typed-process unix unliftio unliftio-core unordered-containers
+         vector
+       ];
+       description = "A standard library for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rio-orphans" = callPackage
     ({ mkDerivation, base, exceptions, fast-logger, hspec
      , monad-control, monad-logger, resourcet, rio, transformers-base
@@ -208386,6 +208797,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rrule" = callPackage
+    ({ mkDerivation, base, hspec, megaparsec, parser-combinators, text
+     , time
+     }:
+     mkDerivation {
+       pname = "rrule";
+       version = "0.1.0.0";
+       sha256 = "0059rrvvfrcsycc8aczayphscviidrq8ig3j4x3ln3xjfscq2l2l";
+       libraryHaskellDepends = [
+         base megaparsec parser-combinators text time
+       ];
+       testHaskellDepends = [ base hspec text ];
+       description = "Recurrence rule parser and formatter";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "rsagl" = callPackage
     ({ mkDerivation, array, arrows, base, containers
      , data-memocombinators, deepseq, mtl, old-time, OpenGL, OpenGLRaw
@@ -209734,15 +210161,15 @@ self: {
      }) {};
 
   "saltine" = callPackage
-    ({ mkDerivation, base, bytestring, libsodium, profunctors
+    ({ mkDerivation, base, bytestring, hashable, libsodium, profunctors
      , QuickCheck, semigroups, test-framework
      , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "saltine";
-       version = "0.1.0.2";
-       sha256 = "0253m8n6s39fnr8wz1z240kaizw3chfm1fgwp51dgqgk0nwrv67x";
-       libraryHaskellDepends = [ base bytestring profunctors ];
+       version = "0.1.1.0";
+       sha256 = "1apcyc39mraqg9394scwqrdc3aaxvry22pl648gyp73z9dfrk5wf";
+       libraryHaskellDepends = [ base bytestring hashable profunctors ];
        libraryPkgconfigDepends = [ libsodium ];
        testHaskellDepends = [
          base bytestring QuickCheck semigroups test-framework
@@ -212184,6 +212611,26 @@ self: {
        platforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;};
 
+  "sdl2-ttf_2_1_1" = callPackage
+    ({ mkDerivation, base, bytestring, SDL2, sdl2, SDL2_ttf
+     , template-haskell, text, transformers
+     }:
+     mkDerivation {
+       pname = "sdl2-ttf";
+       version = "2.1.1";
+       sha256 = "1iyqm1i5k8j4948gvr59rgalqwsdkishs52kp85ncvb6cpylw3qn";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring sdl2 template-haskell text transformers
+       ];
+       libraryPkgconfigDepends = [ SDL2 SDL2_ttf ];
+       description = "Bindings to SDL2_ttf";
+       license = stdenv.lib.licenses.bsd3;
+       platforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;};
+
   "sdnv" = callPackage
     ({ mkDerivation, base, binary, bytestring }:
      mkDerivation {
@@ -213197,8 +213644,6 @@ self: {
        ];
        description = "An implementation of semver and semantic version ranges";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sendfile" = callPackage
@@ -215531,8 +215976,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-pagination";
-       version = "2.2.2";
-       sha256 = "00ki2crhrp87m0dwyrb6rv25cfyag51igm772a54zvgi713qj7rr";
+       version = "2.3.0";
+       sha256 = "0kza7lr3akx3zviqbxlw74f1y66y8c6kys52n49brvrhqwnv4xwd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -215665,6 +216110,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-purescript_0_10_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, http-types, lens, mainland-pretty, purescript-bridge
+     , servant, servant-foreign, servant-server, servant-subscriber
+     , text
+     }:
+     mkDerivation {
+       pname = "servant-purescript";
+       version = "0.10.0.0";
+       sha256 = "07q4nvdhhzyc3xkad130nkv7ckgmj6fmhrpryzpjdvddgq9320b4";
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory filepath http-types lens
+         mainland-pretty purescript-bridge servant servant-foreign
+         servant-server servant-subscriber text
+       ];
+       testHaskellDepends = [
+         aeson base containers lens mainland-pretty purescript-bridge
+         servant servant-foreign servant-subscriber text
+       ];
+       description = "Generate PureScript accessor functions for you servant API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-pushbullet-client" = callPackage
     ({ mkDerivation, aeson, base, http-api-data, http-client
      , http-client-tls, microlens, microlens-th, pushbullet-types
@@ -216204,6 +216673,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-subscriber_0_7_0_0" = callPackage
+    ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder
+     , bytestring, case-insensitive, containers, directory, filepath
+     , http-types, lens, lifted-base, monad-control, monad-logger
+     , network-uri, purescript-bridge, servant, servant-foreign
+     , servant-server, stm, text, time, transformers, wai
+     , wai-websockets, warp, websockets
+     }:
+     mkDerivation {
+       pname = "servant-subscriber";
+       version = "0.7.0.0";
+       sha256 = "1c1g6jx36n5n5qjw82854vkbg7mavmrj7vz97vc1zzk5w54wsj8k";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async attoparsec base blaze-builder bytestring
+         case-insensitive containers directory filepath http-types lens
+         lifted-base monad-control monad-logger network-uri servant
+         servant-foreign servant-server stm text time transformers wai
+         wai-websockets warp websockets
+       ];
+       executableHaskellDepends = [ base purescript-bridge ];
+       description = "When REST is not enough ...";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-swagger" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
      , Cabal, cabal-doctest, directory, doctest, filepath, hspec
@@ -220991,8 +221487,8 @@ self: {
      }:
      mkDerivation {
        pname = "skews";
-       version = "0.1.0.2";
-       sha256 = "0xw9zlv7f77048c47kc3kymwxv9whg286d270n9d1k52c0df8h0p";
+       version = "0.1.0.3";
+       sha256 = "1rwliykb87mvkpajzkx1fh4qlh7fgh6y5z5np1jrdi0rv3ki7hsn";
        libraryHaskellDepends = [ base bytestring deque websockets ];
        testHaskellDepends = [
          async base bytestring deque envy hspec network websockets
@@ -221600,33 +222096,6 @@ self: {
      }) {};
 
   "small-bytearray-builder" = callPackage
-    ({ mkDerivation, base, byteslice, bytestring, gauge
-     , natural-arithmetic, primitive, primitive-offset
-     , primitive-unlifted, QuickCheck, quickcheck-classes, run-st, tasty
-     , tasty-hunit, tasty-quickcheck, text, text-short, vector
-     , wide-word
-     }:
-     mkDerivation {
-       pname = "small-bytearray-builder";
-       version = "0.3.3.0";
-       sha256 = "0qd875rvh59kg1vb0q6sz6fw3dr847c09hgz7jzavhj9z3vhkm51";
-       libraryHaskellDepends = [
-         base byteslice bytestring natural-arithmetic primitive
-         primitive-offset primitive-unlifted run-st text-short wide-word
-       ];
-       testHaskellDepends = [
-         base byteslice bytestring natural-arithmetic primitive
-         primitive-unlifted QuickCheck quickcheck-classes tasty tasty-hunit
-         tasty-quickcheck text vector wide-word
-       ];
-       benchmarkHaskellDepends = [
-         base byteslice gauge natural-arithmetic primitive text-short
-       ];
-       description = "Serialize to a small byte arrays";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "small-bytearray-builder_0_3_4_0" = callPackage
     ({ mkDerivation, base, bytebuild, byteslice }:
      mkDerivation {
        pname = "small-bytearray-builder";
@@ -221636,7 +222105,6 @@ self: {
        doHaddock = false;
        description = "Serialize to bytes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smallarray" = callPackage
@@ -221680,6 +222148,8 @@ self: {
        pname = "smallcheck";
        version = "1.1.5";
        sha256 = "195fj7w3v03d1y1nm2ylavzrwxjcdbq0lb6zsw1dwyx5jmwfc84h";
+       revision = "1";
+       editedCabalFile = "1zhhmad21sv0201hd7fahq769xpmzcj352l0sfalcwqs4kbc3mg0";
        libraryHaskellDepends = [ base ghc-prim logict mtl pretty ];
        description = "A property-based testing library";
        license = stdenv.lib.licenses.bsd3;
@@ -225761,29 +226231,6 @@ self: {
      }) {};
 
   "splitmix" = callPackage
-    ({ mkDerivation, async, base, base-compat-batteries, bytestring
-     , clock, containers, criterion, deepseq, HUnit, process, random
-     , tf-random, time, vector
-     }:
-     mkDerivation {
-       pname = "splitmix";
-       version = "0.0.3";
-       sha256 = "1k0amgkz7rvyz3lnw7m786ilnr1cibwhx9sc4qynq329gxan5r7w";
-       revision = "1";
-       editedCabalFile = "178d81ksnmgppbd09ci53r88iyacn3phy55v5i4ybfz5d8rfjpa5";
-       libraryHaskellDepends = [ base deepseq random time ];
-       testHaskellDepends = [
-         async base base-compat-batteries bytestring deepseq HUnit process
-         random tf-random vector
-       ];
-       benchmarkHaskellDepends = [
-         base clock containers criterion random tf-random
-       ];
-       description = "Fast Splittable PRNG";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "splitmix_0_0_4" = callPackage
     ({ mkDerivation, async, base, base-compat-batteries, bytestring
      , clock, containers, criterion, deepseq, HUnit, process, random
      , tf-random, time, vector
@@ -225802,7 +226249,6 @@ self: {
        ];
        description = "Fast Splittable PRNG";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "splitter" = callPackage
@@ -228318,28 +228764,26 @@ self: {
      }) {};
 
   "status-notifier-item" = callPackage
-    ({ mkDerivation, base, bytestring, bytestring-to-vector, containers
-     , dbus, dbus-hslogger, filepath, hslogger, lens, network
+    ({ mkDerivation, base, byte-order, bytestring, bytestring-to-vector
+     , containers, dbus, dbus-hslogger, filepath, hslogger, lens
      , optparse-applicative, template-haskell, text, transformers
      , vector
      }:
      mkDerivation {
        pname = "status-notifier-item";
-       version = "0.3.0.4";
-       sha256 = "0abck5zvk46kng28qjhvqkxj485zw3l6bsakxpjijb58d1i0g667";
+       version = "0.3.0.5";
+       sha256 = "165kdg1wb0xpy4z7hlk8654ph2psdibal1p0f32zzrccbnk0w801";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring bytestring-to-vector containers dbus filepath
-         hslogger lens network template-haskell text transformers vector
+         base byte-order bytestring bytestring-to-vector containers dbus
+         filepath hslogger lens template-haskell text transformers vector
        ];
        executableHaskellDepends = [
          base dbus dbus-hslogger hslogger optparse-applicative
        ];
        description = "A wrapper over the StatusNotifierItem/libappindicator dbus specification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "statvfs" = callPackage
@@ -234631,17 +235075,17 @@ self: {
      , gi-gdkx11, gi-glib, gi-gtk, gi-gtk-hs, gi-pango, gtk-sni-tray
      , gtk-strut, gtk3, haskell-gi, haskell-gi-base, hslogger
      , HStringTemplate, http-client, http-client-tls, http-types
-     , multimap, network, network-uri, old-locale, optparse-applicative
-     , parsec, process, rate-limit, regex-compat, safe, scotty, split
+     , multimap, old-locale, optparse-applicative, parsec, process
+     , rate-limit, regex-compat, safe, scotty, split
      , status-notifier-item, stm, template-haskell, text, time
      , time-locale-compat, time-units, transformers, transformers-base
-     , tuple, unix, utf8-string, X11, xdg-basedir, xml, xml-helpers
-     , xmonad
+     , tuple, unix, utf8-string, X11, xdg-basedir, xdg-desktop-entry
+     , xml, xml-helpers, xmonad
      }:
      mkDerivation {
        pname = "taffybar";
-       version = "3.2.1";
-       sha256 = "1bha6b8p46pr6hw9iawbffdg8lf6cmv1ryw96r2qn1jfikl6h39v";
+       version = "3.2.2";
+       sha256 = "02b6rmsb89c1h7fr81ljbij30pnl8z4dz6xz367g7a2b9hwq42gz";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -234652,11 +235096,11 @@ self: {
          gi-gdkpixbuf gi-gdkx11 gi-glib gi-gtk gi-gtk-hs gi-pango
          gtk-sni-tray gtk-strut haskell-gi haskell-gi-base hslogger
          HStringTemplate http-client http-client-tls http-types multimap
-         network network-uri old-locale parsec process rate-limit
-         regex-compat safe scotty split status-notifier-item stm
-         template-haskell text time time-locale-compat time-units
-         transformers transformers-base tuple unix utf8-string X11
-         xdg-basedir xml xml-helpers xmonad
+         old-locale parsec process rate-limit regex-compat safe scotty split
+         status-notifier-item stm template-haskell text time
+         time-locale-compat time-units transformers transformers-base tuple
+         unix utf8-string X11 xdg-basedir xdg-desktop-entry xml xml-helpers
+         xmonad
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        executableHaskellDepends = [
@@ -234665,8 +235109,6 @@ self: {
        executablePkgconfigDepends = [ gtk3 ];
        description = "A desktop bar similar to xmobar, but with more GUI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) gtk3;};
 
   "tag-bits" = callPackage
@@ -235433,24 +235875,24 @@ self: {
     ({ mkDerivation, array, base, bytestring, bytestring-handle
      , containers, criterion, deepseq, hpath-directory, hpath-filepath
      , hpath-posix, QuickCheck, safe-exceptions, tasty, tasty-quickcheck
-     , time, unix, word8
+     , these, time, unix, word8
      }:
      mkDerivation {
        pname = "tar-bytestring";
-       version = "0.6.2.0";
-       sha256 = "17ha3c9fiqw2zabnzrz4rlafvg2dynga8cc6j4hhzppc25v5blwj";
+       version = "0.6.3.0";
+       sha256 = "18c5493zwwbri2m50a2najbxaqnprxwng48kdcap7qppbvdmra66";
        libraryHaskellDepends = [
          array base bytestring containers deepseq hpath-directory
-         hpath-filepath hpath-posix safe-exceptions time unix word8
+         hpath-filepath hpath-posix safe-exceptions these time unix word8
        ];
        testHaskellDepends = [
          array base bytestring bytestring-handle containers deepseq
          hpath-directory hpath-filepath hpath-posix QuickCheck
-         safe-exceptions tasty tasty-quickcheck time unix word8
+         safe-exceptions tasty tasty-quickcheck these time unix word8
        ];
        benchmarkHaskellDepends = [
          array base bytestring containers criterion deepseq hpath-directory
-         hpath-filepath hpath-posix safe-exceptions time unix word8
+         hpath-filepath hpath-posix safe-exceptions these time unix word8
        ];
        description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
@@ -237744,8 +238186,8 @@ self: {
      }:
      mkDerivation {
        pname = "termonad";
-       version = "3.0.0.0";
-       sha256 = "11c58k6iyqry5dfdbxsvmca19w10igb4yd1nk2ap6h7zsav2rjgn";
+       version = "3.1.0.0";
+       sha256 = "15zh50v5hszvr4xz6hwmwaga2g1avrfhnjzzx9dmghjyggwkhfa2";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -239247,36 +239689,6 @@ self: {
      }) {};
 
   "text-show" = callPackage
-    ({ mkDerivation, array, base, base-compat-batteries, base-orphans
-     , bifunctors, bytestring, bytestring-builder, containers, criterion
-     , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim
-     , hspec, hspec-discover, integer-gmp, QuickCheck
-     , quickcheck-instances, template-haskell, text, th-abstraction
-     , th-lift, transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "text-show";
-       version = "3.8.4";
-       sha256 = "03ia42rfp0znxjj2amiwj5k4f41rbkg7nfvd5j09rjkwy7532jbq";
-       libraryHaskellDepends = [
-         array base base-compat-batteries bifunctors bytestring
-         bytestring-builder containers generic-deriving ghc-boot-th ghc-prim
-         integer-gmp template-haskell text th-abstraction th-lift
-         transformers transformers-compat
-       ];
-       testHaskellDepends = [
-         array base base-compat-batteries base-orphans bytestring
-         bytestring-builder deriving-compat generic-deriving ghc-prim hspec
-         QuickCheck quickcheck-instances template-haskell text transformers
-         transformers-compat
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ];
-       description = "Efficient conversion of values into Text";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "text-show_3_8_5" = callPackage
     ({ mkDerivation, array, base, base-compat-batteries, base-orphans
      , bifunctors, bytestring, bytestring-builder, containers, criterion
      , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim
@@ -239304,7 +239716,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ];
        description = "Efficient conversion of values into Text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-show-instances" = callPackage
@@ -240727,8 +241138,8 @@ self: {
      }:
      mkDerivation {
        pname = "threadscope";
-       version = "0.2.11.1";
-       sha256 = "18s1k3c3013zsvw3midzpwlh7mn2lmz6ryyrh98rhjccz5nl0qvh";
+       version = "0.2.12";
+       sha256 = "10aalch81w4wrz7asp8amc1353khabqxms9b2r3f30s9kys3703x";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -242193,8 +242604,8 @@ self: {
      }:
      mkDerivation {
        pname = "timezone-olson-th";
-       version = "0.1.0.4";
-       sha256 = "0xrf3hn8246s6n31bhq5arvn3xkwhfibmlfs5ahn5li2iblkn585";
+       version = "0.1.0.5";
+       sha256 = "1b28drcgdal7ifghw9bk3k8rmk7k0mjq3kl55xqbnlip6p99pka7";
        libraryHaskellDepends = [
          base template-haskell time timezone-olson timezone-series
        ];
@@ -244039,6 +244450,21 @@ self: {
        broken = true;
      }) {};
 
+  "tracked-files" = callPackage
+    ({ mkDerivation, base, directory, hspec, process, text }:
+     mkDerivation {
+       pname = "tracked-files";
+       version = "0.1.0.0";
+       sha256 = "0aw99k1kjiwhpvwk3pqhc34cff9lcv4dzg240rs7p3i4j0zf884v";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory process ];
+       executableHaskellDepends = [ base directory process text ];
+       testHaskellDepends = [ base directory hspec process ];
+       description = "Package to list all tracked and untracked existing files via Git";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "tracker" = callPackage
     ({ mkDerivation, base, containers, glib }:
      mkDerivation {
@@ -245094,6 +245520,20 @@ self: {
        broken = true;
      }) {};
 
+  "tree-sitter-ql" = callPackage
+    ({ mkDerivation, base, tree-sitter }:
+     mkDerivation {
+       pname = "tree-sitter-ql";
+       version = "0.1.0.1";
+       sha256 = "07k5vxkwy2l49f1gyvqasqva41n1h4xz381rmy1dd0625mshyvs2";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base tree-sitter ];
+       description = "Tree-sitter grammar/parser for QL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "tree-sitter-ruby" = callPackage
     ({ mkDerivation, base, tree-sitter }:
      mkDerivation {
@@ -247901,8 +248341,8 @@ self: {
      }:
      mkDerivation {
        pname = "typed-spreadsheet";
-       version = "1.1.4";
-       sha256 = "16xbzwaiakimwwkbb0q0nxa08j7842z3894p04ijjvksllkdrlna";
+       version = "1.1.5";
+       sha256 = "1k48y9nh3i50mskkw5h38fjygspkmraz54xfb7m7n8i8kzl1x18h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -249885,8 +250325,8 @@ self: {
      }:
      mkDerivation {
        pname = "unity-testresult-parser";
-       version = "0.1.0.1";
-       sha256 = "1siz1iq66bvwraws628haqf3q2hycd4a2yihpmqs778mzjnhs26r";
+       version = "0.1.0.3";
+       sha256 = "1521dv3d7ssqzy8vf4y55dzg0w192667kqia0f0w76magnwhk8ic";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -250363,6 +250803,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "unliftio_0_2_12_1" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, deepseq
+     , directory, filepath, gauge, hspec, process, QuickCheck, stm, time
+     , transformers, unix, unliftio-core
+     }:
+     mkDerivation {
+       pname = "unliftio";
+       version = "0.2.12.1";
+       sha256 = "18z8db7plbjdgl12p00zj5qd60v89wazgxqc356mwg295w2mydwc";
+       libraryHaskellDepends = [
+         async base bytestring deepseq directory filepath process stm time
+         transformers unix unliftio-core
+       ];
+       testHaskellDepends = [
+         async base bytestring containers deepseq directory filepath hspec
+         process QuickCheck stm time transformers unix unliftio-core
+       ];
+       benchmarkHaskellDepends = [
+         async base bytestring deepseq directory filepath gauge process stm
+         time transformers unix unliftio-core
+       ];
+       description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unliftio-core" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -250376,6 +250842,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "unliftio-core_0_2_0_1" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "unliftio-core";
+       version = "0.2.0.1";
+       sha256 = "16i97jax8rys57l0g0qswfwxh1cl5bgw2lw525rm6bzajw90v7wi";
+       libraryHaskellDepends = [ base transformers ];
+       description = "The MonadUnliftIO typeclass for unlifting monads to IO";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unliftio-pool" = callPackage
     ({ mkDerivation, base, resource-pool, time, transformers
      , unliftio-core
@@ -250983,21 +251461,6 @@ self: {
      }) {};
 
   "urbit-hob" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, deepseq, hspec
-     , hspec-core, murmur3, QuickCheck, text, vector
-     }:
-     mkDerivation {
-       pname = "urbit-hob";
-       version = "0.3.1";
-       sha256 = "16axy690mr7hmqxjb4sd17pizmqy5kdw31rbaf24bfxmaval8ijb";
-       libraryHaskellDepends = [ base bytestring murmur3 text vector ];
-       testHaskellDepends = [ base hspec hspec-core QuickCheck text ];
-       benchmarkHaskellDepends = [ base criterion deepseq ];
-       description = "Hoon-style atom manipulation and printing functions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "urbit-hob_0_3_2" = callPackage
     ({ mkDerivation, base, bytestring, criterion, deepseq, hspec
      , hspec-core, murmur3, QuickCheck, text, vector
      }:
@@ -251010,7 +251473,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Hoon-style atom manipulation and printing functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ureader" = callPackage
@@ -254014,22 +254476,21 @@ self: {
 
   "verismith" = callPackage
     ({ mkDerivation, alex, array, base, binary, blaze-html, bytestring
-     , Cabal, cabal-doctest, criterion, cryptonite, deepseq, DRBG
-     , exceptions, fgl, fgl-visualize, filepath, gitrev, hedgehog, lens
-     , lifted-base, memory, monad-control, mtl, optparse-applicative
-     , parsec, prettyprinter, random, recursion-schemes, shakespeare
-     , shelly, statistics, tasty, tasty-hedgehog, tasty-hunit
-     , template-haskell, text, time, tomland, transformers
-     , transformers-base, unordered-containers, vector
+     , criterion, cryptonite, deepseq, DRBG, exceptions, fgl
+     , fgl-visualize, filepath, gitrev, hedgehog, lens, lifted-base
+     , memory, monad-control, mtl, optparse-applicative, parsec
+     , prettyprinter, random, recursion-schemes, shakespeare, shelly
+     , statistics, tasty, tasty-hedgehog, tasty-hunit, template-haskell
+     , text, time, tomland, transformers, transformers-base
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "verismith";
-       version = "0.6.0.2";
-       sha256 = "1rjcsdizzhc1lr2mfh0r6dhhabnbz1gjva7xkr3z3mqzsqp9jm5f";
+       version = "1.0.0.2";
+       sha256 = "0lrc0idpxg4a7mlwb7s3j43zizinszpfwwqfm91cz3fkb5clv21h";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          array base binary blaze-html bytestring cryptonite deepseq DRBG
          exceptions fgl fgl-visualize filepath gitrev hedgehog lens
@@ -254046,7 +254507,7 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion lens ];
        description = "Random verilog generation and simulator testing";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {};
@@ -255535,6 +255996,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wai-enforce-https_0_0_2" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, hspec
+     , http-types, network, text, wai, wai-extra
+     }:
+     mkDerivation {
+       pname = "wai-enforce-https";
+       version = "0.0.2";
+       sha256 = "0p3j438knirr32j6dhqscws93h3ygk6lvw97r489h8i1dip9rqll";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring case-insensitive http-types network text wai
+       ];
+       testHaskellDepends = [
+         base bytestring case-insensitive hspec http-types wai wai-extra
+       ];
+       description = "Enforce HTTPS in Wai server app safely";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-eventsource" = callPackage
     ({ mkDerivation, wai }:
      mkDerivation {
@@ -259463,6 +259946,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "with-utf8" = callPackage
+    ({ mkDerivation, base, deepseq, hedgehog, HUnit, safe-exceptions
+     , tasty, tasty-discover, tasty-hedgehog, tasty-hunit, temporary
+     , text, unix
+     }:
+     mkDerivation {
+       pname = "with-utf8";
+       version = "1.0.0.0";
+       sha256 = "06xznaszw7d6rznvzhzw3y4z31b4vx4djms85rq4qsbpfbdrh2zc";
+       libraryHaskellDepends = [ base safe-exceptions text ];
+       testHaskellDepends = [
+         base deepseq hedgehog HUnit safe-exceptions tasty tasty-hedgehog
+         tasty-hunit temporary text unix
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "Get your IO right on the first try";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "withdependencies" = callPackage
     ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl
      , profunctors
@@ -260392,10 +260894,8 @@ self: {
      }:
      mkDerivation {
        pname = "wrecker";
-       version = "1.3.1.0";
-       sha256 = "0z0a9k88npw09n54mplg2aa98y4p8kmk14v8ks2dc2ilf24lrri7";
-       revision = "1";
-       editedCabalFile = "1wzpw1cdbrb3mz7qaissdjidwdafhv9jph14066gn9dnyffg1w02";
+       version = "1.3.2.0";
+       sha256 = "02x20w2xb1w58rb9n9yw2kz08q77prs7bfnmgxc6nmcrrafgg6bv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -261350,11 +261850,9 @@ self: {
      }:
      mkDerivation {
        pname = "x86-64bit";
-       version = "0.4.5";
-       sha256 = "1dgl53xra7m8rfczfjvibn8gcmacpg3fagz0yysk1b7sjvlim7cp";
-       libraryHaskellDepends = [
-         base deepseq monads-tf QuickCheck tardis vector
-       ];
+       version = "0.4.6";
+       sha256 = "19av4xkh80al9gr67n10ivf7hwwg3gfkph2mbq63q8wdh67gyg8s";
+       libraryHaskellDepends = [ base deepseq monads-tf tardis vector ];
        testHaskellDepends = [
          base deepseq monads-tf QuickCheck tardis vector
        ];
@@ -261517,16 +262015,14 @@ self: {
      }:
      mkDerivation {
        pname = "xdg-desktop-entry";
-       version = "0.1.1.0";
-       sha256 = "0ss4marv4lyh94v9x12sy5wfdsiw0jppqpgndmg1w8b3mfk0d6s2";
+       version = "0.1.1.1";
+       sha256 = "0xlniirgj01v02dp6wx8iw038p4mx2pa3rmwfv3g7k5raa7gzapb";
        libraryHaskellDepends = [
          base ConfigFile directory either filepath multimap safe
          transformers unix
        ];
        description = "Parse files conforming to the xdg desktop entry spec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "xdg-userdirs" = callPackage
@@ -262691,8 +263187,8 @@ self: {
      }:
      mkDerivation {
        pname = "xmlbf";
-       version = "0.6";
-       sha256 = "02wcjmpgjla568ic621hglzkgqaiq9g1s93fq4iqq4lf20yszr9y";
+       version = "0.6.1";
+       sha256 = "0xhpg10bqmv9cd4sw0vf2vvvyyas3xd36lwarbh5l78hylmibnlf";
        libraryHaskellDepends = [
          base bytestring containers deepseq selective text transformers
          unordered-containers
@@ -265502,6 +265998,44 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-core_1_6_17_3" = callPackage
+    ({ mkDerivation, aeson, async, auto-update, base, blaze-html
+     , blaze-markup, bytestring, case-insensitive, cereal, clientsession
+     , conduit, conduit-extra, containers, cookie, deepseq, fast-logger
+     , gauge, hspec, hspec-expectations, http-types, HUnit, memory
+     , monad-logger, mtl, network, parsec, path-pieces, primitive
+     , random, resourcet, shakespeare, streaming-commons
+     , template-haskell, text, time, transformers, unix-compat, unliftio
+     , unordered-containers, vector, wai, wai-extra, wai-logger, warp
+     , word8
+     }:
+     mkDerivation {
+       pname = "yesod-core";
+       version = "1.6.17.3";
+       sha256 = "0w2i18rjqz9mzldq0bdiaikn5mxws2f9ab0ngmab6rzywcqsvg22";
+       libraryHaskellDepends = [
+         aeson auto-update base blaze-html blaze-markup bytestring
+         case-insensitive cereal clientsession conduit conduit-extra
+         containers cookie deepseq fast-logger http-types memory
+         monad-logger mtl parsec path-pieces primitive random resourcet
+         shakespeare template-haskell text time transformers unix-compat
+         unliftio unordered-containers vector wai wai-extra wai-logger warp
+         word8
+       ];
+       testHaskellDepends = [
+         async base bytestring clientsession conduit conduit-extra
+         containers cookie hspec hspec-expectations http-types HUnit network
+         path-pieces random resourcet shakespeare streaming-commons
+         template-haskell text transformers unliftio wai wai-extra warp
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring gauge shakespeare text
+       ];
+       description = "Creation of type-safe, RESTful web applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-crud" = callPackage
     ({ mkDerivation, base, classy-prelude, containers, MissingH
      , monad-control, persistent, random, safe, stm, uuid, yesod-core
@@ -265728,16 +266262,16 @@ self: {
      }) {};
 
   "yesod-fb" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, conduit, crypto-api, fb
-     , http-client-tls, http-conduit, text, wai, yesod-core
+    ({ mkDerivation, aeson, base, bytestring, conduit, fb
+     , http-client-tls, http-conduit, memory, text, wai, yesod-core
      }:
      mkDerivation {
        pname = "yesod-fb";
-       version = "0.5.0";
-       sha256 = "1ns113f2ylim1b3r2dgwgc65yfy6qxjh9miqfz2fx29fq4250dyy";
+       version = "0.5.2";
+       sha256 = "0srvdipwrmqi3wh8z51432dgr3kpgi5iw9ikbahv6swvhs5k8w41";
        libraryHaskellDepends = [
-         aeson base bytestring conduit crypto-api fb http-client-tls
-         http-conduit text wai yesod-core
+         aeson base bytestring conduit fb http-client-tls http-conduit
+         memory text wai yesod-core
        ];
        description = "Useful glue functions between the fb library and Yesod";
        license = stdenv.lib.licenses.bsd3;
@@ -265797,8 +266331,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-form-bootstrap4";
-       version = "2.1.2";
-       sha256 = "1rx18ik8y55697g9mjdfpgclkny4i9d996fm874ckdmq1qwzn84k";
+       version = "3.0.0";
+       sha256 = "19lnn0xw13gcvp2jzw01pq47jfhxgwm1c84px3xm582p9vqyygx7";
        libraryHaskellDepends = [
          base blaze-html blaze-markup shakespeare text yesod-core yesod-form
        ];
@@ -266442,8 +266976,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-recaptcha2";
-       version = "0.3.0";
-       sha256 = "12bgj16vfmvk6ri55wmx444njhlmf11v4cins8c1a6isjk8alhhc";
+       version = "1.0.0";
+       sha256 = "1hg5g90ld4jc1ggi6rg0si35rr8r8dq79a221zjzs37hsla2cr7i";
        libraryHaskellDepends = [
          aeson base classy-prelude http-conduit yesod-auth yesod-core
          yesod-form
@@ -268586,8 +269120,8 @@ self: {
      }:
      mkDerivation {
        pname = "zip";
-       version = "1.3.0";
-       sha256 = "1wcx48fqvhj823sqgr61rv692hlld3ckp2vyahd8wk3h590sncni";
+       version = "1.3.1";
+       sha256 = "11dbbmwn81j6zmjnlxqz748jd9ywd18nhzr5pqkgk5kd3n27rd0j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -268605,6 +269139,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "zip_1_3_2" = callPackage
+    ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
+     , cereal, conduit, conduit-extra, containers, digest, directory
+     , dlist, exceptions, filepath, hspec, monad-control, mtl
+     , QuickCheck, resourcet, temporary, text, time, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "zip";
+       version = "1.3.2";
+       sha256 = "0nmqp34w82wzlkip9zk05dy4yjnwy8dc2k7n1kq0rrdsb9zsc360";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring bzlib-conduit case-insensitive cereal conduit
+         conduit-extra containers digest directory dlist exceptions filepath
+         monad-control mtl resourcet text time transformers
+         transformers-base
+       ];
+       executableHaskellDepends = [ base filepath ];
+       testHaskellDepends = [
+         base bytestring conduit containers directory dlist exceptions
+         filepath hspec QuickCheck temporary text time transformers
+       ];
+       description = "Operations on zip archives";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "zip-archive" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , digest, directory, filepath, HUnit, mtl, pretty, process

From 6fe6d3b07780e08d66b8a76158c65a61f8f06181 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Sat, 29 Feb 2020 17:13:17 +0900
Subject: [PATCH 2440/4636] haskellPackages.semver-range: disable tests on
 ghc88x

---
 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix  | 4 ++++
 .../haskell-modules/configuration-hackage2nix.yaml            | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
index d42c2c5f6cfd..1b5f64bea6b8 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
@@ -90,4 +90,8 @@ self: super: {
   # https://github.com/kowainik/relude/issues/241
   relude = dontCheck super.relude;
 
+  # The tests for semver-range need to be updated for the MonadFail change in
+  # ghc-8.8:
+  # https://github.com/adnelson/semver-range/issues/15
+  semver-range = dontCheck super.semver-range;
 }
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 789747973e7c..e00b1b0e2d08 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -9097,7 +9097,6 @@ broken-packages:
   - semigroups-actions
   - semiring
   - semiring-num
-  - semver-range
   - sendgrid-haskell
   - sendgrid-v3
   - sensei

From 7b6f436300ad458765c09a760d53a470449fcaf9 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Sat, 29 Feb 2020 17:14:00 +0900
Subject: [PATCH 2441/4636] haskellPackages.dhall_1_29_0: disable tests since
 they access the network

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index da63ec0c22a0..27391ed8bd4d 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -710,4 +710,8 @@ self: super: builtins.intersectAttrs super {
   # break infinite recursion with base-orphans
   primitive = dontCheck super.primitive;
 
+  # dhall-1.29.0 tests access the network.  This override can be removed when
+  # dhall_1_29_0 is no longer used, since more recent versions of dhall don't
+  # access the network in checks.
+  dhall_1_29_0 = dontCheck super.dhall_1_29_0;
 }

From 4e3b120db1b7a8d531222031d41f7b69750d8d8b Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Sat, 29 Feb 2020 17:58:42 +0900
Subject: [PATCH 2442/4636] spago: unbreak after update to ghc-8.8.2

---
 pkgs/development/haskell-modules/configuration-nix.nix | 10 +++++++++-
 pkgs/development/tools/purescript/spago/spago.nix      |  1 -
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 27391ed8bd4d..5824ce2f5e6d 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -635,11 +635,19 @@ self: super: builtins.intersectAttrs super {
 
   spago =
     let
+      # Spago needs a patch for MonadFail changes.
+      # https://github.com/purescript/spago/pull/584
+      # This can probably be removed when a version after spago-0.14.0 is released.
+      spagoWithPatches = appendPatch super.spago (pkgs.fetchpatch {
+        url = "https://github.com/purescript/spago/pull/584/commits/898a8e48665e5a73ea03525ce2c973455ab9ac52.patch";
+        sha256 = "05gs1hjlcf60cr6728rhgwwgxp3ildly14v4l2lrh6ma2fljhyjy";
+      });
+
       # Spago basically compiles with LTS-14, but it requires a newer version
       # of directory.  This is to work around a bug only present on windows, so
       # we can safely jailbreak spago and use the older directory package from
       # LTS-14.
-      spagoWithOverrides = doJailbreak (super.spago.override {
+      spagoWithOverrides = doJailbreak (spagoWithPatches.override {
         # spago requires dhall-1.29.0.
         dhall = self.dhall_1_29_0;
       });
diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix
index 433639ff330d..adf019eef572 100644
--- a/pkgs/development/tools/purescript/spago/spago.nix
+++ b/pkgs/development/tools/purescript/spago/spago.nix
@@ -44,5 +44,4 @@ mkDerivation {
   prePatch = "hpack";
   homepage = "https://github.com/purescript/spago#readme";
   license = stdenv.lib.licenses.bsd3;
-  broken = true;   # Build is broken in lts-15.x.
 }

From 39e8cc9c3032707a216a32e6683de3422e877bde Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Tue, 3 Mar 2020 12:15:48 +0900
Subject: [PATCH 2443/4636] ormolu: remove unneeded override after bump to
 lts-15

---
 pkgs/development/haskell-modules/configuration-common.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d0a1929c00e0..9dc6a30d379a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1326,11 +1326,6 @@ self: super: {
   # https://github.com/haskell-servant/servant-ekg/issues/15
   servant-ekg = doJailbreak super.servant-ekg;
 
-  # Needs ghc-lib-parser 8.8.1 (does not build with 8.8.0)
-  ormolu = doJailbreak (super.ormolu.override {
-    ghc-lib-parser = self.ghc-lib-parser_8_8_3_20200224;
-  });
-
   # krank-0.1.0 does not accept PyF-0.9.0.0.
   krank = doJailbreak super.krank;
 

From 9857e570e9775ec69760f1e30a41598629a4de7a Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Thu, 5 Mar 2020 22:07:35 +0900
Subject: [PATCH 2444/4636] stack: Get building with old version of pantry

---
 .../haskell-modules/configuration-common.nix   | 18 +++++++++++++-----
 .../configuration-hackage2nix.yaml             |  1 +
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9dc6a30d379a..ff589b3b455c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1074,9 +1074,16 @@ self: super: {
   cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
 
   stack =
+    let
+      stackWithOverrides =
+        super.stack.override {
+          # stack-2.1.3.1 requires pantry-0.2.0.0.
+          pantry = self.pantry_0_2_0_0;
+        };
+    in
     generateOptparseApplicativeCompletion
       "stack"
-      (appendPatches super.stack [
+      (appendPatches stackWithOverrides [
         # This PR fixes stack up to be able to build with Cabal-3.  This patch
         # can probably be dropped when the next stack release is made after
         # 2.1.3.1.
@@ -1416,11 +1423,12 @@ self: super: {
   # https://github.com/bergmark/feed/issues/43
   feed = dontCheck super.feed;
 
-  pantry = appendPatches super.pantry [
-    # Pantry has been updated for ghc-8.8 upstream, but there hasn't been a
-    # release yet with this patch. This can probably be removed when a
-    # version of pantry is released after 0.2.0.0.
+  pantry_0_2_0_0 = appendPatches super.pantry_0_2_0_0 [
+    # pantry-0.2.0.0 doesn't build with ghc-8.8, but there is a PR adding support.
     # https://github.com/commercialhaskell/pantry/pull/6
+    # Currently stack-2.1.3.1 requires pantry-0.2.0.0, but when a newer version of
+    # stack is released, it will probably use the newer pantry version, so we
+    # can completely get rid of pantry-0.2.0.0.
     (pkgs.fetchpatch {
       url = "https://github.com/commercialhaskell/pantry/pull/6.diff";
       sha256 = "0aml06jshpjh3aiscs5av7y33m3d6s6x5pzdvh7pky476izfg87k";
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index e00b1b0e2d08..5c66ad9a3909 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2396,6 +2396,7 @@ extra-packages:
   - network == 3.0.*                    # required by network-bsd, HTTP, and many others (2019-04-30)
   - parallel == 3.2.0.3                 # newer versions don't work with GHC 6.12.3
   - patience ^>= 0.1                    # required by chell-0.4.x
+  - pantry == 0.2.0.0                   # required by stack-2.1.3.1
   - persistent >=2.5 && <2.8            # pre-lts-11.x versions neeed by git-annex 6.20180227
   - persistent-sqlite < 2.7             # pre-lts-11.x versions neeed by git-annex 6.20180227
   - prettyprinter == 1.6.1              # required by ghc 8.8.x, and dhall-1.29.0

From 354111dffb726186fd566dfd31f5a1a6b996d9c2 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Fri, 6 Mar 2020 11:19:52 +0900
Subject: [PATCH 2445/4636] haskellPackages.pantry_0_2_0_0: Mark dontCheck

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ff589b3b455c..37f604792510 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1423,7 +1423,7 @@ self: super: {
   # https://github.com/bergmark/feed/issues/43
   feed = dontCheck super.feed;
 
-  pantry_0_2_0_0 = appendPatches super.pantry_0_2_0_0 [
+  pantry_0_2_0_0 = appendPatches (dontCheck super.pantry_0_2_0_0) [
     # pantry-0.2.0.0 doesn't build with ghc-8.8, but there is a PR adding support.
     # https://github.com/commercialhaskell/pantry/pull/6
     # Currently stack-2.1.3.1 requires pantry-0.2.0.0, but when a newer version of

From 4c791cb15aba0a13bd0f749b8976461bdd198f17 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Mar 2020 14:26:03 +0100
Subject: [PATCH 2446/4636] all-cabal-hashes: update to Hackage at
 2020-03-06T12:35:04Z

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

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 5c2f71bf2f77..96617bb0f278 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3ff0be5c9ee1ead33e07158b9a4a579fa2fb7a7f.tar.gz";
-  sha256 = "15jqdjxyzcmg50zvl7szv6s2zi4k82as5wi6mkiwwpbdricg50pl";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/fcb0ed924c8504d54870d6dc2092b9dab8305732.tar.gz";
+  sha256 = "0b7dxgj40y9svddrx14scnxls20ww4f717zhz3lwigb16dm4crpi";
 }

From 46a81f9a15c52b2391b45bd3b24432dc547209d4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Mar 2020 20:38:52 +0100
Subject: [PATCH 2447/4636] haskell-binary-instances: disable test suite to
 avoid spurious failures

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 37f604792510..123493a7694b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1450,4 +1450,7 @@ self: super: {
   # https://github.com/serokell/nixfmt/pull/62
   nixfmt = doJailbreak super.nixfmt;
 
+  # https://github.com/phadej/binary-orphans/issues/45
+  binary-instances = dontCheck super.binary-instances;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From adcd693c2c6da979717ea5e73ae6c0fca03aedf2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Mar 2020 20:39:21 +0100
Subject: [PATCH 2448/4636] haskell-cryptonite: disable the test suite to fix
 the build on older CPUs

Machines without AES-NI support cannot run the binary.
---
 pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 123493a7694b..328df794a8e9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1453,4 +1453,11 @@ self: super: {
   # https://github.com/phadej/binary-orphans/issues/45
   binary-instances = dontCheck super.binary-instances;
 
+  # Disabling the test suite lets the build succeed on older CPUs
+  # that are unable to run the generated library because they
+  # lack support for AES-NI, like some of our Hydra build slaves
+  # do. See https://github.com/NixOS/nixpkgs/issues/81915 for
+  # details.
+  cryptonite = dontCheck super.cryptonite;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 6e2198bd52881783e13914ccac72a6aeca57d1c5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Mar 2020 22:11:33 +0100
Subject: [PATCH 2449/4636] haskell-ci: fix the build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 328df794a8e9..3f28ebebd224 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1460,4 +1460,11 @@ self: super: {
   # details.
   cryptonite = dontCheck super.cryptonite;
 
+  # The test suite depends on an impure cabal-install installation
+  # in $HOME, which we don't have in our build sandbox.
+  cabal-install-parsers = dontCheck super.cabal-install-parsers;
+
+  # haskell-ci-0.8 needs cabal-install-parsers ==0.1, but we have 0.2.
+  haskell-ci = doJailbreak super.haskell-ci;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From e8d5bdb7b3c209d4d1c41531448580b54ec0da55 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 6 Mar 2020 22:20:01 +0100
Subject: [PATCH 2450/4636] python3akcages.django_compat: improve test fix

---
 .../python-modules/django-compat/fix-tests.diff        | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/django-compat/fix-tests.diff b/pkgs/development/python-modules/django-compat/fix-tests.diff
index 76d7852c57a9..4f0c7264ef74 100644
--- a/pkgs/development/python-modules/django-compat/fix-tests.diff
+++ b/pkgs/development/python-modules/django-compat/fix-tests.diff
@@ -10,16 +10,12 @@ diff -Nur a/compat/tests/settings.py b/compat/tests/settings.py
      'compat.tests.test_app',
  ]
  
+-MIDDLEWARE_CLASSES = (
 +MIDDLEWARE = (
-+    'django.contrib.auth.middleware.AuthenticationMiddleware',
-+    'django.contrib.messages.middleware.MessageMiddleware',
-+    'django.contrib.sessions.middleware.SessionMiddleware',
-+)
-+
- MIDDLEWARE_CLASSES = (
      'django.contrib.sessions.middleware.SessionMiddleware',
      'django.middleware.common.CommonMiddleware',
-@@ -43,6 +50,7 @@
+     'django.middleware.csrf.CsrfViewMiddleware',
+@@ -43,6 +44,7 @@
                  'django.template.context_processors.i18n',
                  'django.template.context_processors.tz',
                  'django.template.context_processors.request',

From df155637fe30497ca1052bbf9816a3bf24ac2882 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 6 Mar 2020 22:25:40 +0100
Subject: [PATCH 2451/4636] python3Pakcages.django_compat: fix

---
 .../python-modules/django-compat/fix-tests.diff       | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/django-compat/fix-tests.diff b/pkgs/development/python-modules/django-compat/fix-tests.diff
index 4f0c7264ef74..58165db96a87 100644
--- a/pkgs/development/python-modules/django-compat/fix-tests.diff
+++ b/pkgs/development/python-modules/django-compat/fix-tests.diff
@@ -1,7 +1,7 @@
-diff -Nur a/compat/tests/settings.py b/compat/tests/settings.py
+diff -ur a/compat/tests/settings.py b/compat/tests/settings.py
 --- a/compat/tests/settings.py	2020-03-06 15:32:07.548482597 +0100
-+++ b/compat/tests/settings.py	2020-03-06 15:36:45.270265678 +0100
-@@ -16,10 +16,17 @@
++++ b/compat/tests/settings.py	2020-03-06 22:19:25.422934249 +0100
+@@ -16,11 +16,12 @@
      'django.contrib.admin',
      'django.contrib.auth',
      'django.contrib.contenttypes',
@@ -23,7 +23,7 @@ diff -Nur a/compat/tests/settings.py b/compat/tests/settings.py
              ],
              'loaders': [
                  'django.template.loaders.filesystem.Loader',
-diff -Nur a/compat/tests/test_compat.py b/compat/tests/test_compat.py
+diff -ur a/compat/tests/test_compat.py b/compat/tests/test_compat.py
 --- a/compat/tests/test_compat.py	2020-03-06 15:32:07.548482597 +0100
 +++ b/compat/tests/test_compat.py	2020-03-06 15:37:39.202835075 +0100
 @@ -9,7 +9,7 @@
@@ -44,8 +44,7 @@ diff -Nur a/compat/tests/test_compat.py b/compat/tests/test_compat.py
          self.assertEqual('/accounts/logout/', resolved_url)
  
      '''
-Les fichiers binaires a/compat/tests/.test_compat.py.swp et b/compat/tests/.test_compat.py.swp sont différents
-diff -Nur a/compat/tests/urls.py b/compat/tests/urls.py
+diff -ur a/compat/tests/urls.py b/compat/tests/urls.py
 --- a/compat/tests/urls.py	2020-03-06 15:32:07.548482597 +0100
 +++ b/compat/tests/urls.py	2020-03-06 15:34:25.962377799 +0100
 @@ -2,5 +2,5 @@

From 40877c81a5685348dc5eb0574ff835dd7d661073 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2020 02:04:56 +0000
Subject: [PATCH 2452/4636] vector: 0.8.0 -> 0.8.1

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

diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix
index 92bcf98c9198..17e764698d52 100644
--- a/pkgs/tools/misc/vector/default.nix
+++ b/pkgs/tools/misc/vector/default.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "vector";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner  = "timberio";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "0girph2icl95klwqh3ksyr7fwril2pyb2gmnphgxrs6bibp1a2ha";
+    sha256 = "0k15scvjcg2v4z80vq27yrn2wm50fp8xj8lga2czzs0zxhlv21nl";
   };
 
-  cargoSha256 = "1f4c982i2r2y63h0a79nlwdwrp81ps93zan7a6ag5w7c4223ab5g";
+  cargoSha256 = "1al8jzjxjhxwb5n1d52pvl59d11g0bdg2dcw8ir2nclya1w68f2w";
   buildInputs = [ openssl pkg-config protobuf rdkafka ]
                 ++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv ];
 

From 0904686bccf7d9e890c059ae7c52200af17fbf33 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 6 Mar 2020 15:36:12 +0100
Subject: [PATCH 2453/4636] notable: 1.7.3 -> 1.8.4

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

diff --git a/pkgs/applications/misc/notable/default.nix b/pkgs/applications/misc/notable/default.nix
index 085dff7ce04e..f66d46597d64 100644
--- a/pkgs/applications/misc/notable/default.nix
+++ b/pkgs/applications/misc/notable/default.nix
@@ -2,13 +2,13 @@
 
 let
   pname = "notable";
-  version = "1.7.3";
+  version = "1.8.4";
 in
 appimageTools.wrapType2 rec {
   name = "${pname}-${version}";
   src = fetchurl {
     url = "https://github.com/notable/notable/releases/download/v${version}/Notable-${version}.AppImage";
-    sha256 = "1a7xpdk23np398nrgivyp8z54idqm72dfwx67i2rmxa3dnmcxkvl";
+    sha256 = "0rvz8zwsi62kiq89pv8n2wh9h5yb030kvdr1vf65xwqkhqcrzrby";
   };
 
   profile = ''
@@ -22,7 +22,7 @@ appimageTools.wrapType2 rec {
 
   meta = with lib; {
     description = "The markdown-based note-taking app that doesn't suck";
-    homepage = https://github.com/notable/notable;
+    homepage = "https://github.com/notable/notable";
     license = licenses.agpl3;
     platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ dtzWill ];

From caffd5104883b6a433fc050c35d2076c4d1f4499 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Fri, 6 Mar 2020 23:33:06 +0100
Subject: [PATCH 2454/4636] ppp: 2.4.7 -> 2.4.8

---
 pkgs/tools/networking/ppp/default.nix         | 28 ++++++++-----------
 .../networking/ppp/musl-fix-headers.patch     |  6 ++--
 pkgs/tools/networking/ppp/nix-purity.patch    | 14 +++++-----
 3 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix
index 3446157df7a8..564ba88a97d4 100644
--- a/pkgs/tools/networking/ppp/default.nix
+++ b/pkgs/tools/networking/ppp/default.nix
@@ -1,21 +1,18 @@
-{ stdenv, fetchurl, substituteAll, libpcap, openssl }:
+{ stdenv, fetchurl, fetchpatch, fetchFromGitHub, substituteAll, libpcap, openssl }:
 
 stdenv.mkDerivation rec {
-  version = "2.4.7";
+  version = "2.4.8";
   pname = "ppp";
 
-  src = fetchurl {
-    url = "mirror://samba/ppp/${pname}-${version}.tar.gz";
-    sha256 = "0c7vrjxl52pdwi4ckrvfjr08b31lfpgwf3pp0cqy76a77vfs7q02";
+  src = fetchFromGitHub {
+    owner = "paulusmack";
+    repo = "ppp";
+    rev = "ppp-${version}";
+    sha256 = "1i88m79h6g3fzsb4yw3k8bq1grsx3hsyawm7id2vcaab0gfqzjjv";
   };
 
   patches =
     [
-      # fix for glibc>=2.28
-      (fetchurl {
-        url = "https://github.com/paulusmack/ppp/commit/3c7b86229f7bd2600d74db14b1fe5b3896be3875.patch";
-        sha256 = "0qlbi247lx3injpy8a1gcij9yilik0vfaibkpvdp88k3sa1rs69z";
-      })
       ( substituteAll {
         src = ./nix-purity.patch;
         inherit libpcap;
@@ -25,14 +22,10 @@ stdenv.mkDerivation rec {
       # Without nonpriv.patch, pppd --version doesn't work when not run as
       # root.
       ./nonpriv.patch
-      (fetchurl {
+      (fetchpatch {
         name = "CVE-2015-3310.patch";
-        url = "https://salsa.debian.org/roam/ppp/raw/ef5d585aca6b1200a52c7109caa66ef97964d76e/debian/patches/rc_mksid-no-buffer-overflow";
-        sha256 = "1dk00j7bg9nfgskw39fagnwv1xgsmyv0xnkd6n1v5gy0psw0lvqh";
-      })
-      (fetchurl {
-        url = "https://salsa.debian.org/roam/ppp/raw/ef5d585aca6b1200a52c7109caa66ef97964d76e/debian/patches/0016-pppoe-include-netinet-in.h-before-linux-in.h.patch";
-        sha256 = "1xnmqn02kc6g5y84xynjwnpv9cvrfn3nyv7h7r8j8xi7qf2aj4q8";
+        url = "https://github.com/paulusmack/ppp/commit/858976b1fc3107f1261aae337831959b511b83c2.patch";
+        sha256 = "0wirmcis67xjwllqhz9lsz1b7dcvl8shvz78lxgybc70j2sv7ih4";
       })
       (fetchurl {
         url = https://www.nikhef.nl/~janjust/ppp/ppp-2.4.7-eaptls-mppe-1.102.patch;
@@ -49,6 +42,7 @@ stdenv.mkDerivation rec {
     # everything anyway so we remove it from the Makefiles
     for file in $(find -name Makefile.linux); do
       substituteInPlace "$file" --replace '$(INSTALL) -s' '$(INSTALL)'
+      substituteInPlace "$file" --replace '-m 4550' '-m 550'
     done
   '';
 
diff --git a/pkgs/tools/networking/ppp/musl-fix-headers.patch b/pkgs/tools/networking/ppp/musl-fix-headers.patch
index 030cc97d157f..d6252a52675b 100644
--- a/pkgs/tools/networking/ppp/musl-fix-headers.patch
+++ b/pkgs/tools/networking/ppp/musl-fix-headers.patch
@@ -34,8 +34,8 @@ index c81213b..305aece 100644
  
 +#include <sys/cdefs.h>
 +
- void magic_init __P((void));	/* Initialize the magic number generator */
- u_int32_t magic __P((void));	/* Returns the next magic number */
+ void magic_init (void);	/* Initialize the magic number generator */
+ u_int32_t magic (void);	/* Returns the next magic number */
  
 diff --git a/pppd/plugins/rp-pppoe/if.c b/pppd/plugins/rp-pppoe/if.c
 index 91e9a57..9c0fac3 100644
@@ -119,7 +119,7 @@ index 6d71530..86d224e 100644
  #define MAX_ADDR_LEN 7
  #endif
  
--#if __GLIBC__ >= 2
+-#if !defined(__GLIBC__) || __GLIBC__ >= 2
  #include <asm/types.h>		/* glibc 2 conflicts with linux/types.h */
  #include <net/if.h>
  #include <net/if_arp.h>
diff --git a/pkgs/tools/networking/ppp/nix-purity.patch b/pkgs/tools/networking/ppp/nix-purity.patch
index 5321a472e734..975ea9db6096 100644
--- a/pkgs/tools/networking/ppp/nix-purity.patch
+++ b/pkgs/tools/networking/ppp/nix-purity.patch
@@ -1,26 +1,26 @@
 diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
-index 1ebebec..bf90c62 100644
+index 9664f70..d07e01e 100644
 --- a/pppd/Makefile.linux
 +++ b/pppd/Makefile.linux
-@@ -120,7 +120,7 @@ CFLAGS   += -DHAS_SHADOW
+@@ -125,7 +125,7 @@ CFLAGS   += -DHAS_SHADOW
  #LIBS     += -lshadow $(LIBS)
  endif
  
--ifneq ($(wildcard /usr/include/crypt.h),)
+-ifneq ($(wildcard $(shell $(CC) --print-sysroot)/usr/include/crypt.h),)
 +ifneq ($(wildcard @glibc@/include/crypt.h),)
  CFLAGS  += -DHAVE_CRYPT_H=1
- LIBS	+= -lcrypt
+ LIBS   += -lcrypt
  endif
-@@ -132,7 +132,7 @@ endif
+@@ -137,7 +137,7 @@ endif
  
  ifdef NEEDDES
  ifndef USE_CRYPT
--CFLAGS   += -I/usr/include/openssl
+-CFLAGS   += -I$(shell $(CC) --print-sysroot)/usr/include/openssl
 +CFLAGS   += -I@openssl@/include/openssl
  LIBS     += -lcrypto
  else
  CFLAGS   += -DUSE_CRYPT=1
-@@ -178,7 +178,7 @@ LIBS	+= -ldl
+@@ -188,7 +188,7 @@ LIBS        += -ldl
  endif
  
  ifdef FILTER

From 142c3153f743f9cb6069d2231a95af2c65aec9f7 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Fri, 6 Mar 2020 23:35:18 +0100
Subject: [PATCH 2455/4636] ppp: apply patch for CVE-2020-8597

This fixes a potential buffer overflow in the eap_{request,response}
functions.
---
 pkgs/tools/networking/ppp/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix
index 564ba88a97d4..1579823450b6 100644
--- a/pkgs/tools/networking/ppp/default.nix
+++ b/pkgs/tools/networking/ppp/default.nix
@@ -31,6 +31,11 @@ stdenv.mkDerivation rec {
         url = https://www.nikhef.nl/~janjust/ppp/ppp-2.4.7-eaptls-mppe-1.102.patch;
         sha256 = "04war8l5szql53l36043hvzgfwqp3v76kj8brbz7wlf7vs2mlkia";
       })
+      (fetchpatch {
+        name = "CVE-2020-8597.patch";
+        url = "https://github.com/paulusmack/ppp/commit/8d7970b8f3db727fe798b65f3377fe6787575426.patch";
+        sha256 = "129wnhwxmzvr3y9gzxv82jnb5y8m4yg8vkpa0xl2rwkl8anbzgkh";
+      })
       ./musl-fix-headers.patch
     ];
 

From efcab647abf3fd16020f970f66b1b2f5c29299cf Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 6 Mar 2020 14:03:41 -0800
Subject: [PATCH 2456/4636] onnxruntime: 1.1.1 -> 1.1.2

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

diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix
index 8fb586bcd732..ace08ef018a3 100644
--- a/pkgs/development/libraries/onnxruntime/default.nix
+++ b/pkgs/development/libraries/onnxruntime/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "onnxruntime";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "onnxruntime";
     rev = "v${version}";
-    sha256 = "0d79adxw09cd6xfyb2sxp38j03h3g7gn4ki85zhp9nicrrm179qz";
+    sha256 = "0chbn2wkl1w3msw0zscajinzlaaahg4w3lrpb2l8xgqdwbln0ckj";
     # TODO: use nix-versions of grpc, onnx, eigen, googletest, etc.
     # submodules increase src size and compile times significantly
     # not currently feasible due to how integrated cmake build is with git

From 08edf7f27cf0e3a168dd902b5b34fcf1be9c0f53 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 6 Mar 2020 23:44:36 +0100
Subject: [PATCH 2457/4636] notable: update license to unfree

Notable used to be released under AGPL-v3 until v1.5.x but is is now
nonfree.

See https://github.com/notable/notable/blob/master/SOURCE_CODE.md
---
 pkgs/applications/misc/notable/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/notable/default.nix b/pkgs/applications/misc/notable/default.nix
index f66d46597d64..9a00959de020 100644
--- a/pkgs/applications/misc/notable/default.nix
+++ b/pkgs/applications/misc/notable/default.nix
@@ -23,7 +23,7 @@ appimageTools.wrapType2 rec {
   meta = with lib; {
     description = "The markdown-based note-taking app that doesn't suck";
     homepage = "https://github.com/notable/notable";
-    license = licenses.agpl3;
+    license = licenses.unfree;
     platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ dtzWill ];
   };

From b65a70382378317693cc93d5ac32ea105d3904fe Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2020 23:03:33 +0000
Subject: [PATCH 2458/4636] newlib: 3.1.0 -> 3.3.0

---
 pkgs/development/misc/newlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/development/misc/newlib/default.nix
index df0ef999dd6a..193ec53d5add 100644
--- a/pkgs/development/misc/newlib/default.nix
+++ b/pkgs/development/misc/newlib/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, buildPackages }:
 
-let version = "3.1.0";
+let version = "3.3.0";
 in stdenv.mkDerivation {
   pname = "newlib";
   inherit version;
   src = fetchurl {
     url = "ftp://sourceware.org/pub/newlib/newlib-${version}.tar.gz";
-    sha256 = "0ahh3n079zjp7d9wynggwrnrs27440aac04340chf1p9476a2kzv";
+    sha256 = "0ricyx792ig2cb2x31b653yb7w7f7mf2111dv5h96lfzmqz9xpaq";
   };
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];

From 2a9c43dd4332f601f50826143fce5c9d2e18308d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 03:30:43 +0000
Subject: [PATCH 2459/4636] python27Packages.azure-mgmt-storage: 7.1.0 -> 7.2.0

---
 .../development/python-modules/azure-mgmt-storage/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
index 719e1eae3ccf..0b2442b087de 100644
--- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
@@ -7,13 +7,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "7.1.0";
+  version = "7.2.0";
   pname = "azure-mgmt-storage";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "03yjvw1dwkwsadsv60i625mr9zpdryy7ywvh7p8fg60djszh1p5l";
+    sha256 = "01ck1ankgr9ikvfghhdcs777yrl2j2p8cw9q8nfdrjp22lpchabl";
   };
 
   postInstall = if isPy3k then "" else ''

From e7aef9d18b2f7cf75c339e2840fff2c2ca9eee7c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 6 Mar 2020 23:39:40 +0100
Subject: [PATCH 2460/4636] =?UTF-8?q?zsh-powerlevel10k=20v1.2.0=20?=
 =?UTF-8?q?=E2=86=92=20v1.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changes since the last release

    New prompt segments:
        haskell_stack: haskell version from stack.
    New and changed parameters:
        POWERLEVEL9K_MODE can now be set to ascii for ASCII prompt.
        The default value of POWERLEVEL9K_VIRTUALENV_GENERIC_NAMES now contains env.
        New parameter: POWERLEVEL9K_JAVA_VERSION_PROJECT_ONLY. Display java_version only in java project (sub)directories.
        POWERLEVEL9K_KUBECONTEXT_SHOW_ON_COMMAND now contains istioctl and kogito in all config templates. Thanks, @errantepiphany!
        All *env segments now respect POWERLEVEL9K_*ENV_SHOW_SYSTEM. If set to false, the segment will be hidden if its content is "system". The default value is true.
        nodenv now understand POWERLEVEL9K_NODENV_SOURCES, just like all other *env segments.
        POWERLEVEL9K_DIR_OMIT_FIRST_CHARACTER now has useful semantics (incompatible with powerleve9k, where it was useless). If set to true, it'll remove the leading slash from the current directory if it's absolute. It no longer does anything if the directory is not absolute or if the leading character has been removed or changed by the shortener. This is meant for users who override POWERLEVEL9K_DIR_PATH_SEPARATOR.
    Robustness improvements:
        Powerlevel10k now works when there are no utf-8 locales on the machine.
    Configuration wizard:
        Lean, Classic and Rainbow styles now have an option to restrict prompt character set to ASCII.
        Styles that require 256 colors are not offered when terminal cannot display 256 colors.
        Rainbow and Classic styles now have an option to use flat heads. This option is offered in ASCII mode and when powerline glyphs are unavailable.
        Configuration wizard now restores screen upon exit.
        New segments in config templates: haskell_stack (enabled by default) and java_version (disabled by default).
    Bug fixes:
        Visual mode indicator now correctly switches back to command mode indicator after pressing d and similar when using Zsh >= 5.3. Visual mode indicator no longer gets displayed in Zsh prior to 5.3. Please upgrade Zsh if this matters to you.
        *ENV_DIR parameters are now handled the same way as in the underlying *env projects.
    Misc:
        There is no longer an empty line at the top of the screen after hitting Ctrl-L or typing clear or reset, even with POWERLEVEL9K_PROMPT_ADD_NEWLINE=true and POWERLEVEL9K_TRANSIENT_PROMPT=always.
        It's now possible to install powerlevel10k with Homebrew.
        Subseparators are now displayed with the foreground color of the previous/next segment in left/right prompt. Used to be the other way around. Thanks, @ahaasler!
    gitstatus:
        make now produces usrbin/gitstatusd instead of ./gitstatusd.
        build.zsh now puts the binary in usrbin subdirectory. If you place it in the same subdirectory of your gitstatus installation without changing the file name, gitstatus will pick it up automatically.
---
 pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
index 7daa8fa1fd75..35355bf29759 100644
--- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
+++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "powerlevel10k";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "romkatv";
     repo = "powerlevel10k";
     rev = "v${version}";
-    sha256 = "1hvhql7564j6n6xwg4wckzvzs4fk5zlrdxkx5nd9i3g2d477nbac";
+    sha256 = "1w2iy9anc3cxb5kffrdz8knml8nsl6v3lcrdsigfzfp0zignb4cw";
   };
 
   patches = [

From 4307ef63edf7d1dc8c6c7ada29caeacbf8320a9f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 6 Mar 2020 23:52:49 +0100
Subject: [PATCH 2461/4636] =?UTF-8?q?gitstatusd:=20unstable-2020-02-26=20?=
 =?UTF-8?q?=E2=86=92=20unstable-2020-03-06?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../git-and-tools/gitstatus/default.nix                   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
index ee4cc61c63f9..57caada72b54 100644
--- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation {
   pname = "gitstatus";
-  version = "unstable-2020-02-26";
+  version = "unstable-2020-03-06";
 
   src = fetchFromGitHub {
     owner = "romkatv";
     repo = "gitstatus";
-    rev = "c0e5a24299c1a1a71434dac1de6ea650e80fbe49";
-    sha256 = "0fj84cvr5a895jqgg86raakx6lqyyhahf1dgzgx05y2gfvnxxh8m";
+    rev = "c07996bc3ea1912652f52a816b830a5a3ee9b49c";
+    sha256 = "07s8hwx3i5mnafi2xfim44z3q2nsvlcibfdxj17w8mkjhfpywi00";
   };
 
   buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ];
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     sed -i "1i GITSTATUS_DAEMON=$out/bin/gitstatusd" gitstatus.plugin.zsh
   '';
   installPhase = ''
-    install -Dm755 gitstatusd $out/bin/gitstatusd
+    install -Dm755 usrbin/gitstatusd $out/bin/gitstatusd
     install -Dm444 gitstatus.plugin.zsh $out
   '';
 

From eea3542153fec1cf1ec075db3361e1aad7086bcb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 03:24:58 +0000
Subject: [PATCH 2462/4636] python27Packages.gym: 0.15.6 -> 0.16.0

---
 pkgs/development/python-modules/gym/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix
index d9d66e7a204d..fd08f71aa2bb 100644
--- a/pkgs/development/python-modules/gym/default.nix
+++ b/pkgs/development/python-modules/gym/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "gym";
-  version = "0.15.6";
+  version = "0.16.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0qpx4w6k42sb9ncjk4r6i22qjbcxcnha43svhvvq1nh7796xqzgd";
+    sha256 = "06h5b639nmzhmy4m1j3vigm86iv5pv7k8jy6xpldyd4jdlf37nn5";
   };
 
   postPatch = ''
@@ -26,7 +26,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "A toolkit by OpenAI for developing and comparing your reinforcement learning agents";
-    homepage = https://gym.openai.com/;
+    homepage = "https://gym.openai.com/";
     license = licenses.mit;
     maintainers = with maintainers; [ hyphon81 ];
   };

From 78ee22041a25d024358d36167ddb800cd8e558b9 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sat, 7 Mar 2020 00:21:11 +0000
Subject: [PATCH 2463/4636] tests/kubernetes: remove unreferenced variable and
 import from inexsisting file

---
 nixos/tests/kubernetes/dns.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/tests/kubernetes/dns.nix b/nixos/tests/kubernetes/dns.nix
index 46bcb01a5265..638942e15407 100644
--- a/nixos/tests/kubernetes/dns.nix
+++ b/nixos/tests/kubernetes/dns.nix
@@ -3,8 +3,6 @@ with import ./base.nix { inherit system; };
 let
   domain = "my.zyx";
 
-  certs = import ./certs.nix { externalDomain = domain; kubelets = [ "machine1" "machine2" ]; };
-
   redisPod = pkgs.writeText "redis-pod.json" (builtins.toJSON {
     kind = "Pod";
     apiVersion = "v1";

From ec6e4db6e413219fd55ba52d207de4d59a356057 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Sat, 7 Mar 2020 01:53:31 +0100
Subject: [PATCH 2464/4636] nixos/networking: Add hostFiles option

When blocklists are built with a derivation, using extraHosts would
require IFD, since the result of the derivation needs to be converted to
a string again.

By introducing this option no IFD is needed for such use-cases, since
the fetched files can be assigned directly.
---
 nixos/modules/config/networking.nix | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 81427bb8ee64..dd36696b94d2 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -35,12 +35,22 @@ in
       '';
     };
 
+    networking.hostFiles = lib.mkOption {
+      type = types.listOf types.path;
+      defaultText = lib.literalExample "Hosts from `networking.hosts` and `networking.extraHosts`";
+      example = lib.literalExample ''[ "''${pkgs.my-blocklist-package}/share/my-blocklist/hosts" ]'';
+      description = ''
+        Files that should be concatenated together to form <filename>/etc/hosts</filename>.
+      '';
+    };
+
     networking.extraHosts = lib.mkOption {
       type = types.lines;
       default = "";
       example = "192.168.0.1 lanlocalhost";
       description = ''
         Additional verbatim entries to be appended to <filename>/etc/hosts</filename>.
+        For adding hosts from derivation results, use <option>networking.hostFiles</option> instead.
       '';
     };
 
@@ -159,6 +169,15 @@ in
       "::1" = [ "localhost" ];
     };
 
+    networking.hostFiles = let
+      stringHosts =
+        let
+          oneToString = set: ip: ip + " " + concatStringsSep " " set.${ip} + "\n";
+          allToString = set: concatMapStrings (oneToString set) (attrNames set);
+        in pkgs.writeText "string-hosts" (allToString (filterAttrs (_: v: v != []) cfg.hosts));
+      extraHosts = pkgs.writeText "extra-hosts" cfg.extraHosts;
+    in mkBefore [ stringHosts extraHosts ];
+
     environment.etc =
       { # /etc/services: TCP/UDP port assignments.
         services.source = pkgs.iana-etc + "/etc/services";
@@ -167,12 +186,8 @@ in
         protocols.source  = pkgs.iana-etc + "/etc/protocols";
 
         # /etc/hosts: Hostname-to-IP mappings.
-        hosts.text = let
-          oneToString = set: ip: ip + " " + concatStringsSep " " set.${ip};
-          allToString = set: concatMapStringsSep "\n" (oneToString set) (attrNames set);
-        in ''
-          ${allToString (filterAttrs (_: v: v != []) cfg.hosts)}
-          ${cfg.extraHosts}
+        hosts.source = pkgs.runCommandNoCC "hosts" {} ''
+          cat ${escapeShellArgs cfg.hostFiles} > $out
         '';
 
         # /etc/host.conf: resolver configuration file

From c8523fe0038739ddee2aa653b1927e219830c78b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 7 Mar 2020 00:57:21 +0000
Subject: [PATCH 2465/4636] openvswitch: 2.12.0 -> 2.13.0

---
 pkgs/os-specific/linux/openvswitch/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix
index 53fc986d9f63..f0fb0a834ffe 100644
--- a/pkgs/os-specific/linux/openvswitch/default.nix
+++ b/pkgs/os-specific/linux/openvswitch/default.nix
@@ -8,12 +8,12 @@ let
   _kernel = kernel;
   pythonEnv = python3.withPackages (ps: with ps; [ six ]);
 in stdenv.mkDerivation rec {
-  version = "2.12.0";
+  version = "2.13.0";
   pname = "openvswitch";
 
   src = fetchurl {
     url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz";
-    sha256 = "1y78ix5inhhcvicbvyy2ij38am1215nr55vydhab3d4065q45z8k";
+    sha256 = "0cd5vmfr6zwgcnkwys6rag6cmz68v0librpaplianv734xs74pyx";
   };
 
   kernel = optional (_kernel != null) _kernel.dev;
@@ -58,7 +58,7 @@ in stdenv.mkDerivation rec {
       support distribution across multiple physical servers similar
       to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V.
       '';
-    homepage = https://www.openvswitch.org/;
+    homepage = "https://www.openvswitch.org/";
     license = licenses.asl20;
     maintainers = with maintainers; [ netixx kmcopper ];
   };

From 1906320e68f04664f3bfebffb786db80deefb16f Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Sat, 7 Mar 2020 02:01:19 +0100
Subject: [PATCH 2466/4636] nixos/cjdns: Don't use IFD for extra hosts

---
 nixos/modules/services/networking/cjdns.nix | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index 3fb85b16cbe2..5f912a57845f 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -29,17 +29,13 @@ let
   };
 
   # Additional /etc/hosts entries for peers with an associated hostname
-  cjdnsExtraHosts = import (pkgs.runCommand "cjdns-hosts" {}
-    # Generate a builder that produces an output usable as a Nix string value
-    ''
-      exec >$out
-      echo \'\'
-      ${concatStringsSep "\n" (mapAttrsToList (k: v:
-          optionalString (v.hostname != "")
-            "echo $(${pkgs.cjdns}/bin/publictoip6 ${v.publicKey}) ${v.hostname}")
-          (cfg.ETHInterface.connectTo // cfg.UDPInterface.connectTo))}
-      echo \'\'
-    '');
+  cjdnsExtraHosts = pkgs.runCommandNoCC "cjdns-hosts" {} ''
+    exec >$out
+    ${concatStringsSep "\n" (mapAttrsToList (k: v:
+        optionalString (v.hostname != "")
+          "echo $(${pkgs.cjdns}/bin/publictoip6 ${v.publicKey}) ${v.hostname}")
+        (cfg.ETHInterface.connectTo // cfg.UDPInterface.connectTo))}
+  '';
 
   parseModules = x:
     x // { connectTo = mapAttrs (name: value: { inherit (value) password publicKey; }) x.connectTo; };
@@ -278,7 +274,7 @@ in
       };
     };
 
-    networking.extraHosts = mkIf cfg.addExtraHosts cjdnsExtraHosts;
+    networking.hostFiles = mkIf cfg.addExtraHosts [ cjdnsExtraHosts ];
 
     assertions = [
       { assertion = ( cfg.ETHInterface.bind != "" || cfg.UDPInterface.bind != "" || cfg.confFile != null );

From 64ee425a01fb16f4ceaf09ad1dffe596d6845096 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Sat, 7 Mar 2020 02:01:41 +0100
Subject: [PATCH 2467/4636] nixos/cjdns: Fix connectTo example rendering

---
 nixos/modules/services/networking/cjdns.nix | 32 ++++++++++++---------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index 5f912a57845f..5f8ac96b2292 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -140,13 +140,15 @@ in
         connectTo = mkOption {
           type = types.attrsOf ( types.submodule ( connectToSubmodule ) );
           default = { };
-          example = {
-            "192.168.1.1:27313" = {
-              hostname = "homer.hype";
-              password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM";
-              publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k";
-            };
-          };
+          example = literalExample ''
+            {
+              "192.168.1.1:27313" = {
+                hostname = "homer.hype";
+                password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM";
+                publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k";
+              };
+            }
+          '';
           description = ''
             Credentials for making UDP tunnels.
           '';
@@ -185,13 +187,15 @@ in
         connectTo = mkOption {
           type = types.attrsOf ( types.submodule ( connectToSubmodule ) );
           default = { };
-          example = {
-            "01:02:03:04:05:06" = {
-              hostname = "homer.hype";
-              password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM";
-              publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k";
-            };
-          };
+          example = literalExample ''
+            {
+              "01:02:03:04:05:06" = {
+                hostname = "homer.hype";
+                password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM";
+                publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k";
+              };
+            }
+          '';
           description = ''
             Credentials for connecting look similar to UDP credientials
             except they begin with the mac address.

From 60a94c71c4d264c9ab5d29faac8b6be41e71344c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 7 Mar 2020 02:26:10 +0000
Subject: [PATCH 2468/4636] openmpi: 4.0.2 -> 4.0.3

---
 pkgs/development/libraries/openmpi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 5996dda1e74e..30085e950a49 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -14,7 +14,7 @@
 assert !cudaSupport || cudatoolkit != null;
 
 let
-  version = "4.0.2";
+  version = "4.0.3";
 
   cudatoolkit_joined = symlinkJoin {
     name = "${cudatoolkit.name}-unsplit";
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
 
   src = with stdenv.lib.versions; fetchurl {
     url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2";
-    sha256 = "0ms0zvyxyy3pnx9qwib6zaljyp2b3ixny64xvq3czv3jpr8zf2wh";
+    sha256 = "00zxcw99gr5n693cmcmn4f6a47vx1ywna895p0x7p163v37gw0hl";
   };
 
   postPatch = ''
@@ -88,7 +88,7 @@ in stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = https://www.open-mpi.org/;
+    homepage = "https://www.open-mpi.org/";
     description = "Open source MPI-3 implementation";
     longDescription = "The Open MPI Project is an open source MPI-3 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.";
     maintainers = with maintainers; [ markuskowa ];

From 6528554396dac582f1b6bb771879ff8b3be15ddf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 7 Mar 2020 02:43:40 +0000
Subject: [PATCH 2469/4636] pari: 2.11.2 -> 2.11.3

---
 pkgs/applications/science/math/pari/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 89ae354e7c76..8886a0c8a695 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -12,11 +12,11 @@ assert withThread -> libpthreadstubs != null;
 
 stdenv.mkDerivation rec {
   pname = "pari";
-  version = "2.11.2";
+  version = "2.11.3";
 
   src = fetchurl {
     url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${pname}-${version}.tar.gz";
-    sha256 = "0fck8ssmirl8fy7s4mspgrxjs5sag76xbshqlqzkcl3kqyrk4raa";
+    sha256 = "1jd65h2psrmba2dx7rkf5qidf9ka0cwbsg20pd18k45ggr30l467";
   };
 
   buildInputs = [

From 0ac00f0d3082f663af2f131b1a85484d50729a02 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Thu, 30 Jan 2020 14:34:53 -0500
Subject: [PATCH 2470/4636] mtail: 3.0.0-rc4 -> 3.0.0-rc35

---
 pkgs/servers/monitoring/mtail/default.nix     | 22 +++++---
 pkgs/servers/monitoring/mtail/deps.nix        | 56 -------------------
 .../servers/monitoring/mtail/fix-gopath.patch | 13 -----
 3 files changed, 13 insertions(+), 78 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/mtail/deps.nix
 delete mode 100644 pkgs/servers/monitoring/mtail/fix-gopath.patch

diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix
index 31a6501ea3a5..64966e183fea 100644
--- a/pkgs/servers/monitoring/mtail/default.nix
+++ b/pkgs/servers/monitoring/mtail/default.nix
@@ -1,22 +1,26 @@
-{ lib, fetchFromGitHub, gotools, buildGoPackage }:
+{ lib, fetchFromGitHub, buildGoModule }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "mtail";
-  version = "3.0.0-rc4";
-  goPackagePath = "github.com/google/mtail";
+  version = "3.0.0-rc35";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "mtail";
     rev = "v${version}";
-    sha256 = "1n7pqvid48ayn15qfpgpbsx0iqg24x08wphzpc08mlfw47gq7jg3";
+    sha256 = "04hzr0cw0dq7hmqvp1lhm5wl239yrxmcpsl25sqk74wy06cgrrqd";
   };
 
-  buildInputs = [ gotools ];
-  goDeps = ./deps.nix;
-  patches = [ ./fix-gopath.patch ];
-  preBuild = "go generate -x ./go/src/github.com/google/mtail/vm/";
+  modSha256 = "0h3q1qd9a01wlfkk0yv74a4bk5nilpsppq522cv7kl8ysnrjh5yi";
+  subPackages = [ "cmd/mtail" ];
 
+  preBuild = ''
+    go generate -x ./internal/vm/
+  '';
+
+  buildFlagsArray = [
+    "-ldflags=-X main.Version=${version}"
+  ];
 
   meta = with lib; {
     license = licenses.asl20;
diff --git a/pkgs/servers/monitoring/mtail/deps.nix b/pkgs/servers/monitoring/mtail/deps.nix
deleted file mode 100644
index 6de3c8b6e139..000000000000
--- a/pkgs/servers/monitoring/mtail/deps.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-[
-  rec {
-    goPackagePath = "github.com/golang/glog";
-    fetch = {
-      type = "git";
-      url = "https://${goPackagePath}.git";
-      rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998";
-      sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
-    };
-  }
-  rec {
-    goPackagePath = "github.com/spf13/afero";
-    fetch = {
-      type = "git";
-      url = "https://${goPackagePath}.git";
-      rev = "5660eeed305fe5f69c8fc6cf899132a459a97064";
-      sha256 = "0rpwvjp9xfmy2yvbmy810qamjhimr56zydvx7hb1gjn3b7jp4rhd";
-    };
-  }
-  rec {
-    goPackagePath = "github.com/fsnotify/fsnotify";
-    fetch = {
-      type = "git";
-      url = "https://${goPackagePath}.git";
-      rev = "v1.4.2";
-      sha256 = "06wfg1mmzjj04z7d0q1x2fai9k6hm957brngsaf02fa9a3qqanv3";
-    };
-  }
-  rec {
-    goPackagePath = "github.com/pkg/errors";
-    fetch = {
-      type = "git";
-      url = "https://${goPackagePath}.git";
-      rev = "v0.8.0";
-      sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev = "95c6576299259db960f6c5b9b69ea52422860fce";
-      sha256 = "1fhq8bianb9a1iccpr92mi2hix9zvm10n0f7syx6vfbxdw32i316";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/text";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/text";
-      rev = "3ba1a4dc141f5236b19ccbf2f67cb63d1a688d46";
-      sha256 = "07sbakmman41p5hmdbf4y2wak0gh7k1z88m0zb72acsypp4179h1";
-    };
-  }
-]
diff --git a/pkgs/servers/monitoring/mtail/fix-gopath.patch b/pkgs/servers/monitoring/mtail/fix-gopath.patch
deleted file mode 100644
index 9421d194a9e5..000000000000
--- a/pkgs/servers/monitoring/mtail/fix-gopath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/vm/compiler.go b/vm/compiler.go
-index c55266b..a46417c 100644
---- a/vm/compiler.go
-+++ b/vm/compiler.go
-@@ -2,7 +2,7 @@
- // This file is available under the Apache license.
- 
- // Build the parser:
--//go:generate $GOPATH/bin/goyacc -v y.output -o parser.go -p mtail parser.y
-+//go:generate goyacc -v y.output -o parser.go -p mtail parser.y
- 
- package vm
- 

From 8e8090838748fe4401014c9ca9c74d9a43ff1efd Mon Sep 17 00:00:00 2001
From: skykanin <3789764+skykanin@users.noreply.github.com>
Date: Thu, 5 Mar 2020 05:19:48 +0100
Subject: [PATCH 2471/4636] gomatrix: init at 101.0.0

---
 pkgs/applications/misc/gomatrix/default.nix | 22 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/misc/gomatrix/default.nix

diff --git a/pkgs/applications/misc/gomatrix/default.nix b/pkgs/applications/misc/gomatrix/default.nix
new file mode 100644
index 000000000000..5d412469617f
--- /dev/null
+++ b/pkgs/applications/misc/gomatrix/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "gomatrix";
+  version = "101.0.0";
+
+  src = fetchFromGitHub {
+    owner = "GeertJohan";
+    repo = "gomatrix";
+    rev = "v${version}";
+    sha256 = "1wq55rvpyz0gjn8kiwwj49awsmi86zy1fdjcphzgb7883xalgr2m";
+  };
+
+  modSha256 = "13higizadnf4ypk8qn1b5s6mdg7n6l3indb43mjp1b4cfzjsyl91";
+
+  meta = with lib; {
+    description = ''Displays "The Matrix" in a terminal'';
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ skykanin ];
+    homepage = "https://github.com/GeertJohan/gomatrix";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b864a2b57f0..f413e45459c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -933,6 +933,8 @@ in
 
   glasgow = with python3Packages; toPythonApplication glasgow;
 
+  gomatrix = callPackage ../applications/misc/gomatrix { };
+
   gucci = callPackage ../tools/text/gucci { };
 
   grc = callPackage ../tools/misc/grc { };

From 56a901b8d6841a7dfcb310ad8af9789ead911fc4 Mon Sep 17 00:00:00 2001
From: Robert Djubek <envy1988@gmail.com>
Date: Sat, 7 Mar 2020 04:27:18 +0000
Subject: [PATCH 2472/4636] matomo: 3.13.2 -> 3.13.3

Updated both matomo and matomo-beta to the latest version
---
 pkgs/servers/web-apps/matomo/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix
index 09a8d21c4ce9..90a9a88986ed 100644
--- a/pkgs/servers/web-apps/matomo/default.nix
+++ b/pkgs/servers/web-apps/matomo/default.nix
@@ -3,16 +3,16 @@
 let
   versions = {
     matomo = {
-      version = "3.13.2";
-      sha256 = "1psysdz60h5rvgbsflkfprygxnh3kq60snqamyss07rk0ahbcb16";
+      version = "3.13.3";
+      sha256 = "11mv7q33nhlz9ylsmwrhs315p14imr7sgr70gdbmi9p8jxc7kxrz";
     };
 
     matomo-beta = {
-      version = "3.13.2";
+      version = "3.13.3";
       # `beta` examples: "b1", "rc1", null
       # TOOD when updating: use null if stable version is >= latest beta or release candidate
       beta = null;
-      sha256 = "1psysdz60h5rvgbsflkfprygxnh3kq60snqamyss07rk0ahbcb16";
+      sha256 = "11mv7q33nhlz9ylsmwrhs315p14imr7sgr70gdbmi9p8jxc7kxrz";
     };
   };
   common = pname: { version, sha256, beta ? null }:

From 6609c367eeb4fccfb7fa5b394809998095b69e63 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 7 Mar 2020 04:42:46 +0000
Subject: [PATCH 2473/4636] phoronix-test-suite: 9.4.0 -> 9.4.1

---
 pkgs/tools/misc/phoronix-test-suite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix
index b9a59dffae7a..00ed2db1073b 100644
--- a/pkgs/tools/misc/phoronix-test-suite/default.nix
+++ b/pkgs/tools/misc/phoronix-test-suite/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "phoronix-test-suite";
-  version = "9.4.0";
+  version = "9.4.1";
 
   src = fetchurl {
     url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz";
-    sha256 = "108h3zs7p9vmb56dwlw7wicv9z4kxbndl82075sx4c12rzrmssi9";
+    sha256 = "1c33c8aihsfdxaqkwy4isrvmjam5j5rdz98vv2apy73638vx3q04";
   };
 
   buildInputs = [ php ];

From ad2a10d66cf26b957dff853e8c92316f46fbf594 Mon Sep 17 00:00:00 2001
From: Joshua Fern <JoshuaFern@protonmail.com>
Date: Fri, 6 Mar 2020 20:46:18 -0800
Subject: [PATCH 2474/4636] maintainers: add joshuafern

Feel free to check out my new NUR repo: https://github.com/JoshuaFern/nur-package-lab
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e4947f4c74cd..807c9e66984d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3590,6 +3590,12 @@
     github = "jorsn";
     githubId = 4646725;
   };
+  joshuafern = {
+    name = "Joshua Fern";
+    email = "joshuafern@protonmail.com";
+    github = "JoshuaFern";
+    githubId = 4300747;
+  };
   jpas = {
     name = "Jarrod Pas";
     email = "jarrod@jarrodpas.com";

From b13f8788dc0f9e584ad26786e0558be1734b77c2 Mon Sep 17 00:00:00 2001
From: Rehno Lindeque <errantkid@gmail.com>
Date: Wed, 26 Feb 2020 19:44:03 -0500
Subject: [PATCH 2475/4636] teensyduino: add missing dependencies for
 teensy-loader

---
 pkgs/development/arduino/arduino-core/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix
index 840fbff60ebd..9849afb2c2df 100644
--- a/pkgs/development/arduino/arduino-core/default.nix
+++ b/pkgs/development/arduino/arduino-core/default.nix
@@ -3,7 +3,8 @@
 , withGui ? false, gtk2 ? null, withTeensyduino ? false
   /* Packages needed for Teensyduino */
 , upx, fontconfig, xorg, gcc
-, atk, glib, pango, gdk-pixbuf, libpng12, expat, freetype,
+, atk, glib, pango, gdk-pixbuf, libpng12, expat, freetype
+, cairo, udev
 }:
 
 assert withGui -> gtk2 != null;
@@ -32,6 +33,7 @@ let
 
   teensy_libpath = stdenv.lib.makeLibraryPath [
     atk
+    cairo
     expat
     fontconfig
     freetype
@@ -42,11 +44,13 @@ let
     libpng12
     libusb
     pango
+    udev
     xorg.libSM
     xorg.libX11
     xorg.libXext
     xorg.libXft
     xorg.libXinerama
+    xorg.libXxf86vm
     zlib
   ];
   teensy_architecture =

From ad450e99b9d445eeda92616889657ad6ac042b7c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 7 Mar 2020 07:13:29 +0000
Subject: [PATCH 2476/4636] profile-sync-daemon: 6.35 -> 6.36

---
 pkgs/tools/misc/profile-sync-daemon/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix
index c1496e0dbc9e..9c07254e5873 100644
--- a/pkgs/tools/misc/profile-sync-daemon/default.nix
+++ b/pkgs/tools/misc/profile-sync-daemon/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, utillinux}:
 
 stdenv.mkDerivation rec {
-  version = "6.35";
+  version = "6.36";
   pname = "profile-sync-daemon";
 
   src = fetchurl {
     url = "https://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz";
-    sha256 = "0hd3cjhf9nv4q5gvc8lbh5c82095lll7mxll1mj5hkzmnijzsf0v";
+    sha256 = "0zw9fqpfiz1ld443cw2vp54y86maksmq4mnjs73nlp00nn5z2047";
   };
 
   installPhase = ''
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       between the two. One of the major design goals of psd is a completely
       transparent user experience.
     '';
-    homepage = https://github.com/graysky2/profile-sync-daemon;
+    homepage = "https://github.com/graysky2/profile-sync-daemon";
     downloadPage = https://github.com/graysky2/profile-sync-daemon/releases;
     license = licenses.mit;
     maintainers = [ maintainers.prikhi ];

From b446413aa66b7e6e592a99a779d22fb8a13bd69f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sat, 7 Mar 2020 08:20:57 +0100
Subject: [PATCH 2477/4636] maturin: 0.7.6 -> 0.7.9

Changelog:
https://github.com/PyO3/maturin/blob/master/Changelog.md
---
 pkgs/development/tools/rust/maturin/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix
index 8edd69c28be9..70c424ee0084 100644
--- a/pkgs/development/tools/rust/maturin/default.nix
+++ b/pkgs/development/tools/rust/maturin/default.nix
@@ -5,16 +5,16 @@ let
   inherit (darwin.apple_sdk.frameworks) Security;
 in rustPlatform.buildRustPackage rec {
   name = "maturin-${version}";
-  version = "0.7.6";
+  version = "0.7.9";
 
   src = fetchFromGitHub {
     owner = "PyO3";
     repo = "maturin";
     rev = "v${version}";
-    sha256 = "1siqd8k6grlbj9n1a75jq8px1pzvzpr2ph689g53rjngf1k44zqk";
+    sha256 = "1l8i1mz97zsc8kayvryv6xznwpby9k9jxy7lsx45acs5yksqchrv";
   };
 
-  cargoSha256 = "10x8kr4qxvvmzpr1n41ybsb6rnii2qz5bdhnk0zpfnr2n9215p8s";
+  cargoSha256 = "0ly0f64acn1hxnj7vg1m860xpl06rklwqh545c386nnxaj839b0r";
 
   nativeBuildInputs = [ pkgconfig ];
 

From 1068dd3772ed2260ff63d95decf79bf73094310d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 7 Mar 2020 02:34:00 -0500
Subject: [PATCH 2478/4636] docker-slim: 1.27.0 -> 1.28.0

Changelog: https://github.com/docker-slim/docker-slim/releases/tag/1.28.0
---
 pkgs/applications/virtualization/docker-slim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix
index 8e0bd8e54ed2..4cad4f8cc17c 100644
--- a/pkgs/applications/virtualization/docker-slim/default.nix
+++ b/pkgs/applications/virtualization/docker-slim/default.nix
@@ -6,7 +6,7 @@
 
 buildGoPackage rec {
   pname = "docker-slim";
-  version = "1.27.0";
+  version = "1.28.0";
 
   goPackagePath = "github.com/docker-slim/docker-slim";
 
@@ -14,7 +14,7 @@ buildGoPackage rec {
     owner = "docker-slim";
     repo = "docker-slim";
     rev = version;
-    sha256 = "1pd9sz981qgr5lx6ikrhdp0n21nyrnpjpnyl8i4r2jx35zr8b5q8";
+    sha256 = "1yqg7ngrgq1382clyaal40v7rg9p54hyf78mdrzql454yzxfa819";
   };
 
   subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ];

From c062681530bb7a68a8da052c973eaee7c9be411b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 14 Feb 2020 18:24:57 +0000
Subject: [PATCH 2479/4636] moosefs: 3.0.109 -> 3.0.110

---
 pkgs/tools/filesystems/moosefs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix
index 5d3c2d15fb2d..fe9f1ae11e60 100644
--- a/pkgs/tools/filesystems/moosefs/default.nix
+++ b/pkgs/tools/filesystems/moosefs/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "moosefs";
-  version = "3.0.109";
+  version = "3.0.110";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "1pwackc511fzx28w3an5qk738ykhpspvc1063w2hv901f213xjzw";
+    sha256 = "16m3mxmik2ifrv1g9cp68k57w8xwsxacws3sh1ajlba4azj9sf8v";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];

From 155d9c9be85255410c846634b56ce6e8e4cc7097 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 21 Feb 2020 15:52:47 +0000
Subject: [PATCH 2480/4636] suricata: 5.0.1 -> 5.0.2

---
 pkgs/applications/networking/ids/suricata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix
index d0829fd73a99..04c87b7c25b6 100644
--- a/pkgs/applications/networking/ids/suricata/default.nix
+++ b/pkgs/applications/networking/ids/suricata/default.nix
@@ -34,11 +34,11 @@
 in
 stdenv.mkDerivation rec {
   pname = "suricata";
-  version = "5.0.1";
+  version = "5.0.2";
 
   src = fetchurl {
     url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz";
-    sha256 = "034b0nl0hkh0v26gwbawi2wdv7mb9p54cfg8gc9b8hsw49k3c1wh";
+    sha256 = "1ryfa3bzd8mrq2k5kjfwmblxqqziz6b9n1dnh692mazf5z4wlc3z";
   };
 
   nativeBuildInputs = [

From 5a0bbfa7f27e554866f4a248d0ab2d6c3de9e78d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 11 Feb 2020 13:03:31 +0000
Subject: [PATCH 2481/4636] par2cmdline: 0.8.0 -> 0.8.1

---
 pkgs/tools/networking/par2cmdline/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix
index 9bc4c178665d..29d3230c6d37 100644
--- a/pkgs/tools/networking/par2cmdline/default.nix
+++ b/pkgs/tools/networking/par2cmdline/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "par2cmdline";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "Parchive";
     repo = "par2cmdline";
     rev = "v${version}";
-    sha256 = "0f1jsd5sw2wynjzi7yjqjaf13yhyjfdid91p8yh0jn32y03kjyrz";
+    sha256 = "11mx8q29cr0sryd11awab7y4mhqgbamb1ss77rffjj6in8pb4hdk";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From d0e0acadbb121280896075dc8b79b9838f91b89d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 6 Mar 2020 23:46:07 +0100
Subject: [PATCH 2482/4636] grocy: 2.6.0 -> 2.6.1

---
 ...> 0001-Define-configs-with-env-vars.patch} | 79 +++++++++++--------
 pkgs/servers/grocy/default.nix                |  7 +-
 2 files changed, 51 insertions(+), 35 deletions(-)
 rename pkgs/servers/grocy/{config-locations.patch => 0001-Define-configs-with-env-vars.patch} (54%)

diff --git a/pkgs/servers/grocy/config-locations.patch b/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch
similarity index 54%
rename from pkgs/servers/grocy/config-locations.patch
rename to pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch
index 475be78ec20e..654d96ae4e1a 100644
--- a/pkgs/servers/grocy/config-locations.patch
+++ b/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch
@@ -1,8 +1,20 @@
-diff --git a/app.php b/app.php
-index 5f91e4d..09c6010 100644
---- a/app.php
-+++ b/app.php
-@@ -23,7 +23,7 @@ else
+From 931958d8f11cb55f2e88a178a3b828f3c537eba8 Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch <maximilian@mbosch.me>
+Date: Fri, 6 Mar 2020 23:43:58 +0100
+Subject: [PATCH] Define configs with env vars
+
+---
+ app.php                      | 4 ++--
+ services/DatabaseService.php | 2 +-
+ services/FilesService.php    | 2 +-
+ services/StockService.php    | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/app.php b/app.php
+index af65ad1..4963c28 100644
+--- a/app.php
++++ b/app.php
+@@ -25,7 +25,7 @@ else
  require_once __DIR__ . '/vendor/autoload.php';
  
  // Load config files
@@ -11,20 +23,20 @@ index 5f91e4d..09c6010 100644
  require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones
  
  // Definitions for dev/demo/prerelease mode
-@@ -49,7 +49,7 @@ $appContainer = new \Slim\Container([
- 	],
- 	'view' => function($container)
- 	{
--		return new \Slim\Views\Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache');
-+		return new \Slim\Views\Blade(__DIR__ . '/views', getenv('GROCY_CACHE_DIR'));
- 	},
- 	'LoginControllerInstance' => function($container)
- 	{
-diff --git a/services/DatabaseService.php b/services/DatabaseService.php
-index 0bcf9b8..ec45e93 100644
---- a/services/DatabaseService.php
-+++ b/services/DatabaseService.php
-@@ -13,7 +13,7 @@ class DatabaseService
+@@ -50,7 +50,7 @@ $app = AppFactory::create();
+ $container = $app->getContainer();
+ $container->set('view', function(Container $container)
+ {
+-	return new Slim\Views\Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache');
++	return new \Slim\Views\Blade(__DIR__ . '/views', getenv('GROCY_CACHE_DIR'));
+ });
+ $container->set('LoginControllerInstance', function(Container $container)
+ {
+diff --git a/services/DatabaseService.php b/services/DatabaseService.php
+index 23fc7b9..daa1993 100644
+--- a/services/DatabaseService.php
++++ b/services/DatabaseService.php
+@@ -25,7 +25,7 @@ class DatabaseService
  			return GROCY_DATAPATH . '/grocy_' . GROCY_CULTURE . '.db';
  		}
  
@@ -32,25 +44,25 @@ index 0bcf9b8..ec45e93 100644
 +		return getenv('GROCY_DB_FILE');
  	}
  
- 	private $DbConnectionRaw;
-diff --git a/services/FilesService.php b/services/FilesService.php
-index 7933b73..f52657e 100644
---- a/services/FilesService.php
-+++ b/services/FilesService.php
-@@ -12,7 +12,7 @@ class FilesService extends BaseService
+     private static $DbConnectionRaw = null;
+diff --git a/services/FilesService.php b/services/FilesService.php
+index cecdae3..357298d 100644
+--- a/services/FilesService.php
++++ b/services/FilesService.php
+@@ -12,7 +12,7 @@ class FilesService extends BaseService
  	{
  		parent::__construct();
- 		
+ 
 -		$this->StoragePath = GROCY_DATAPATH . '/storage';
 +		$this->StoragePath = getenv('GROCY_STORAGE_DIR');
- 		
+ 
  		if (!file_exists($this->StoragePath))
  		{
-diff --git a/services/StockService.php b/services/StockService.php
-index d7482ef..d1399a7 100644
---- a/services/StockService.php
-+++ b/services/StockService.php
-@@ -933,7 +933,7 @@ class StockService extends BaseService
+diff --git a/services/StockService.php b/services/StockService.php
+index bfde3fc..53b2245 100644
+--- a/services/StockService.php
++++ b/services/StockService.php
+@@ -934,7 +934,7 @@ class StockService extends BaseService
  			throw new \Exception('No barcode lookup plugin defined');
  		}
  
@@ -59,3 +71,6 @@ index d7482ef..d1399a7 100644
  		if (file_exists($path))
  		{
  			require_once $path;
+-- 
+2.25.0
+
diff --git a/pkgs/servers/grocy/default.nix b/pkgs/servers/grocy/default.nix
index 7af59f6904c5..718d4b1bcded 100644
--- a/pkgs/servers/grocy/default.nix
+++ b/pkgs/servers/grocy/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "grocy";
-  version = "2.6.0";
+  version = "2.6.1";
 
   src = fetchurl {
     url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip";
-    sha256 = "1d4hy495in7p0i4fnhai1yqhjhmblv1g30siggmqpjrzdiiw3bak";
+    sha256 = "1fq1zlxxhpcxj67xxlgf20dia95xcimgnm13cr56sy9f2vjx58m6";
   };
 
   nativeBuildInputs = [ unzip ];
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
     unzip ${src} -d .
   '';
 
-  patches = [ ./config-locations.patch ];
+  patches = [ ./0001-Define-configs-with-env-vars.patch ];
+  patchFlags = [ "--binary" "-p1" ];
 
   dontBuild = true;
 

From dcfccdfc3361dbf9b07893e5e6021740cf3793a6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Sat, 7 Mar 2020 09:56:18 +0100
Subject: [PATCH 2483/4636] =?UTF-8?q?acgtk:=201.5.0=20=E2=86=92=201.5.1=20?=
 =?UTF-8?q?(#81539)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jon <jonringer@users.noreply.github.com>
---
 pkgs/applications/science/logic/acgtk/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix
index 729aef4e21c2..b7dc95712476 100644
--- a/pkgs/applications/science/logic/acgtk/default.nix
+++ b/pkgs/applications/science/logic/acgtk/default.nix
@@ -2,15 +2,16 @@
 
 stdenv.mkDerivation {
 
-  name = "acgtk-1.5.0";
+  pname = "acgtk";
+  version = "1.5.1";
 
   src = fetchurl {
-    url = http://calligramme.loria.fr/acg/software/acg-1.5.0-20181019.tar.gz;
-    sha256 = "14n003gxzw5w79hlpw1ja4nq97jqf9zqyg00ihvpxw4bv9jlm8jm";
+    url = https://acg.loria.fr/software/acg-1.5.1-20191113.tar.gz;
+    sha256 = "17595qfwhzz5q091ak6i6bg5wlppbn8zfn58x3hmmmjvx2yfajn1";
   };
 
   buildInputs = [ dune ] ++ (with ocamlPackages; [
-    ocaml findlib ansiterminal cairo2 fmt logs menhir mtime ocf
+    ocaml findlib ansiterminal cairo2 cmdliner fmt logs menhir mtime yojson
   ]);
 
   buildPhase = "dune build";
@@ -18,7 +19,7 @@ stdenv.mkDerivation {
   inherit (dune) installPhase;
 
   meta = with stdenv.lib; {
-    homepage = http://calligramme.loria.fr/acg/;
+    homepage = https://acg.loria.fr/;
     description = "A toolkit for developing ACG signatures and lexicon";
     license = licenses.cecill20;
     inherit (ocamlPackages.ocaml.meta) platforms;

From ca9b9ef51e2c1e0784da3d698965de3cddb7fead Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 7 Mar 2020 04:20:00 -0500
Subject: [PATCH 2484/4636] gitAndTools.git-trim: init at 0.2.4

---
 .../git-and-tools/default.nix                 |  4 +++
 .../git-and-tools/git-trim/default.nix        | 33 +++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-trim/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 79d2b8190f47..8df8d96e6411 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -140,6 +140,10 @@ let
 
   git-test = callPackage ./git-test { };
 
+  git-trim = callPackage ./git-trim {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
   git-workspace = callPackage ./git-workspace {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
diff --git a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix b/pkgs/applications/version-management/git-and-tools/git-trim/default.nix
new file mode 100644
index 000000000000..ab558ec42d92
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-trim/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, libiconv, Security }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "git-trim";
+  version = "0.2.4";
+
+  src = fetchFromGitHub {
+    owner = "foriequal0";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0gfmv9bwhh6bv0s9kfbxq9wsvrk3zz3ibavbpp9l8cpqc3145pqy";
+  };
+
+  cargoSha256 = "0xklczk4vbh2mqf76r3rsfyclyza9imf6yss7vbkm9w4ir3ar9f3";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
+
+  postInstall = ''
+    install -Dm644 docs/git-trim.md.1 $out/share/man/man1/git-trim.1
+  '';
+
+  # fails with sandbox
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Automatically trims your branches whose tracking remote refs are merged or gone";
+    homepage = "https://github.com/foriequal0/git-trim";
+    license = licenses.mit;
+    maintainers = [ maintainers.marsam ];
+  };
+}

From 427ad73844ac50469e5dfa63b729a032a63d7543 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 7 Mar 2020 10:16:32 +0000
Subject: [PATCH 2485/4636] python27Packages.atlassian-python-api: 1.14.9 ->
 1.15.4

---
 .../python-modules/atlassian-python-api/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix
index 3de3277a72d5..9ef332827eb6 100755
--- a/pkgs/development/python-modules/atlassian-python-api/default.nix
+++ b/pkgs/development/python-modules/atlassian-python-api/default.nix
@@ -16,11 +16,11 @@
 
 buildPythonPackage rec {
   pname = "atlassian-python-api";
-  version = "1.14.9";
+  version = "1.15.4";
   
   src = fetchPypi {
     inherit pname version;
-    sha256 = "28ff793cb43152384a810efc6ee572473daf3dc44bf7c1c295efb270a6d29251";
+    sha256 = "0vkq3sr4a23ipk74swsmc3ydg3q91asixb7hzl8mzkfpgnnyvr77";
   };
   
   checkInputs = [ pytestrunner pytest ];

From 609650a3e8aa434df971a483fa075dd059f3d3b1 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Fri, 28 Feb 2020 12:12:27 +0000
Subject: [PATCH 2486/4636] git-codereview: init at 2020-01-15

---
 .../git-and-tools/default.nix                 |  2 ++
 .../git-and-tools/git-codereview/default.nix  | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-codereview/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index a7008bf44b39..79d2b8190f47 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -70,6 +70,8 @@ let
 
   git-codeowners = callPackage ./git-codeowners { };
 
+  git-codereview = callPackage ./git-codereview { };
+
   git-cola = callPackage ./git-cola { };
 
   git-crypt = callPackage ./git-crypt { };
diff --git a/pkgs/applications/version-management/git-and-tools/git-codereview/default.nix b/pkgs/applications/version-management/git-and-tools/git-codereview/default.nix
new file mode 100644
index 000000000000..902814078485
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-codereview/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage {
+  pname = "git-codereview";
+  version = "2020-01-15";
+  goPackagePath = "golang.org/x/review";
+
+  src = fetchFromGitHub {
+    owner = "golang";
+    repo = "review";
+    rev = "f51a73253c4da005cfdf18a036e11185c04c8ce3";
+    sha256 = "0c4vsyy5zp7pngqn4q87xipndghxyw2x57dkv1kxnrffckx1s3pc";
+  };
+
+  meta = with lib; {
+    description = "Manage the code review process for Git changes using a Gerrit server";
+    homepage = "https://golang.org/x/review/git-codereview";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.edef ];
+  };
+}

From 68d61b1654a4fec02a31f5299edd024cb81accf0 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Sat, 7 Mar 2020 12:27:01 +0100
Subject: [PATCH 2487/4636] containerd: 1.2.6 -> 1.2.13

Signed-off-by: Vincent Demeester <vdemeest@redhat.com>
---
 pkgs/applications/virtualization/containerd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index 9e9e6657291b..6075a7bb2190 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -4,13 +4,13 @@ with lib;
 
 buildGoPackage rec {
   pname = "containerd";
-  version = "1.2.6";
+  version = "1.2.13";
 
   src = fetchFromGitHub {
     owner = "containerd";
     repo = "containerd";
     rev = "v${version}";
-    sha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357";
+    sha256 = "1rac3iak3jpz57yarxc72bxgxvravwrl0j6s6w2nxrmh2m3kxqzn";
   };
 
   goPackagePath = "github.com/containerd/containerd";

From ad126ee28ef52a7a3d6512aaa4e8cb514e160d25 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Sat, 7 Mar 2020 00:33:57 +0100
Subject: [PATCH 2488/4636] du-dust: Change derivation name from dust to
 du-dust

This prevents confusion by nix-env when installing packages by
derivation name, since there is another package named dust already
---
 pkgs/tools/misc/dust/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix
index 7fa9ac9c9712..53594494a83f 100644
--- a/pkgs/tools/misc/dust/default.nix
+++ b/pkgs/tools/misc/dust/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
-  pname = "dust";
+  pname = "du-dust";
   version = "0.5.1";
 
   src = fetchFromGitHub {
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     '';
   };
 
-  cargoSha256 = "1sjzcawyg1xsi4xrx2zwnj8yavzph8k1wgxsffgp55wghzypafwl";
+  cargoSha256 = "0s8z8cg9q0gfqm0ann8rkxwp5y25si97kgginh6b6lbnaai7y4fj";
 
   doCheck = false;
 

From 88d5b00345c68e34743f15fae2c7fb83c45c06d7 Mon Sep 17 00:00:00 2001
From: Nadrieril <nadrieril+git@gmail.com>
Date: Sat, 7 Mar 2020 12:19:00 +0000
Subject: [PATCH 2489/4636] libinsane: init at 1.0.3

---
 .../libraries/libinsane/default.nix           | 47 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/libraries/libinsane/default.nix

diff --git a/pkgs/development/libraries/libinsane/default.nix b/pkgs/development/libraries/libinsane/default.nix
new file mode 100644
index 000000000000..d37ae9426564
--- /dev/null
+++ b/pkgs/development/libraries/libinsane/default.nix
@@ -0,0 +1,47 @@
+{ stdenv
+, lib
+, meson
+, ninja
+, fetchFromGitLab
+, pkg-config
+, glib
+, docbook_xsl
+, sane-backends
+, gobject-introspection
+, vala
+, gtk-doc
+, valgrind
+, doxygen
+, cunit
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libinsane";
+  version = "1.0.3";
+
+  outputs = [ "out" "dev" "devdoc" ];
+
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    repo = "libinsane";
+    group = "World";
+    owner = "OpenPaperwork";
+    rev = version;
+    sha256 = "1x2pl4ahqjc6ql97v7fnyna0qrnw3bxmqg3lyi5biyajfhg9nvql";
+  };
+
+  nativeBuildInputs = [ meson pkg-config ninja doxygen gtk-doc docbook_xsl gobject-introspection vala ];
+
+  buildInputs = [ sane-backends glib ];
+
+  checkInputs = [ cunit valgrind ];
+
+  doCheck = true;
+
+  meta = {
+    description = "Crossplatform access to image scanners (paper eaters only)";
+    homepage = "https://openpaper.work/en/projects/";
+    license = lib.licenses.lgpl3Plus;
+    maintainers = [ lib.maintainers.symphorien ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a41d592696b6..89760e043ec2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4804,6 +4804,8 @@ in
 
   libgumath = callPackage ../development/libraries/libgumath { };
 
+  libinsane = callPackage ../development/libraries/libinsane { };
+
   libipfix = callPackage ../development/libraries/libipfix { };
 
   libircclient = callPackage ../development/libraries/libircclient { };

From 784740aee0657a556f44fc465405a4f28401ffe0 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Tue, 21 Jan 2020 18:13:53 +0300
Subject: [PATCH 2490/4636] mc: 4.8.23 -> 4.8.24

---
 pkgs/tools/misc/mc/default.nix | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index 168afc7efedd..42e155fcaf29 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/pkgs/tools/misc/mc/default.nix
@@ -19,13 +19,23 @@
 
 stdenv.mkDerivation rec {
   pname = "mc";
-  version = "4.8.23";
+  version = "4.8.24";
 
   src = fetchurl {
-    url = "http://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz";
-    sha256 = "077z7phzq3m1sxyz7li77lyzv4rjmmh3wp2vy86pnc4387kpqzyx";
+    url = "https://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz";
+    sha256 = "0ikd2yql44p7nagmb08dmjqdwadclnvgr7ri9pmzc2s5f301r7w5";
   };
 
+  preConfigure = ''
+    for f in \
+      ./configure \
+      ./config/ltmain.sh \
+      ./m4/libtool.m4 \
+      ; do
+      substituteInPlace $f --replace /usr/bin/file ${file}/bin/file
+    done
+  '';
+
   nativeBuildInputs = [ pkgconfig ];
 
   buildInputs = [
@@ -58,8 +68,8 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "File Manager and User Shell for the GNU Project";
-    downloadPage = "http://www.midnight-commander.org/downloads/";
-    homepage = "http://www.midnight-commander.org";
+    downloadPage = "https://www.midnight-commander.org/downloads/";
+    homepage = https://www.midnight-commander.org;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ sander ];
     platforms = with platforms; linux ++ darwin;

From 12d1b8fe2d1720704af5472ee92732e1fed8734d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 7 Mar 2020 14:11:42 +0000
Subject: [PATCH 2491/4636] python37Packages.pyftdi: 0.42.2 -> 0.44.2

---
 pkgs/development/python-modules/pyftdi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix
index 76c7ea9b5bc6..cc1977546921 100644
--- a/pkgs/development/python-modules/pyftdi/default.nix
+++ b/pkgs/development/python-modules/pyftdi/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "pyftdi";
-  version = "0.42.2";
+  version = "0.44.2";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1bpb2rq7bc3p4g9qrfp4a7qcic79cvv1wh17j231bnpmy48njhvj";
+    sha256 = "18k9wnpjxg71v4jm0pwr2bmksq7sckr6ylh1slf0xgpg89b27bxq";
   };
 
   propagatedBuildInputs = [ pyusb pyserial ];

From 37fb7a556866db495282b3a308043b31533a77c7 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 7 Mar 2020 09:34:29 -0500
Subject: [PATCH 2492/4636] buildRustPackage: update docstring comment

The inlined readme that we were iterating on has been moved to GitHub
issue #79975, and the default is now the new cargo fetcher, so this
doc comment is out of date.
---
 pkgs/build-support/rust/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 3fdfc0636f94..34ad4043de95 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -14,9 +14,6 @@
 , cargoUpdateHook ? ""
 , cargoDepsHook ? ""
 , cargoBuildFlags ? []
-  # Please set to true on any Rust package updates. Once all packages set this
-  # to true, we will delete and make it the default. For details, see the Rust
-  # section on the manual and ./README.md.
 , legacyCargoFetcher ? false
 , buildType ? "release"
 , meta ? {}

From 3d266ccdb753354f7b2842a05060a0221ce468d4 Mon Sep 17 00:00:00 2001
From: Atkins <atkins@fstk.io>
Date: Sun, 11 Aug 2019 06:28:39 +0800
Subject: [PATCH 2493/4636] maintainers: add atkinschang

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e4947f4c74cd..e9b05fa7a2f5 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -710,6 +710,12 @@
     githubId = 55833;
     name = "Troels Henriksen";
   };
+  atkinschang = {
+    email = "atkinschang+nixpkgs@gmail.com";
+    github = "AtkinsChang";
+    githubId = 5193600;
+    name = "Atkins Chang";
+  };
   atnnn = {
     email = "etienne@atnnn.com";
     github = "atnnn";

From 37aab73f56a6c9739469849b08485370a05b47c1 Mon Sep 17 00:00:00 2001
From: Atkins <atkins@fstk.io>
Date: Wed, 14 Aug 2019 02:02:34 +0800
Subject: [PATCH 2494/4636] minikube: 1.2.0 -> 1.3.1

---
 .../cluster/docker-machine/kvm2.nix           | 22 ++-----
 .../networking/cluster/minikube/default.nix   | 63 ++++++++++---------
 2 files changed, 40 insertions(+), 45 deletions(-)

diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
index eb2946cec771..78dcc713d323 100644
--- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
@@ -1,32 +1,22 @@
-{ stdenv, buildGoModule, libvirt, pkgconfig, minikube }:
+{ lib, buildGoModule, minikube }:
 
 buildGoModule rec {
-  pname = "docker-machine-kvm2";
-  version = minikube.version;
+  inherit (minikube) version src nativeBuildInputs buildInputs goPackagePath postPatch preBuild;
 
-  goPackagePath = "k8s.io/minikube";
+  pname = "docker-machine-kvm2";
   subPackages = [ "cmd/drivers/kvm" ];
 
-  src = minikube.src;
-
-  modSha256 = minikube.go-modules.outputHash;
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libvirt ];
-
-  preBuild = ''
-    export buildFlagsArray=(-ldflags="-X k8s.io/minikube/pkg/drivers/kvm/version.VERSION=v${version}")
-  '';
+  modSha256   = minikube.go-modules.outputHash;
 
   postInstall = ''
     mv $out/bin/kvm $out/bin/docker-machine-driver-kvm2
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://github.com/kubernetes/minikube/blob/master/docs/drivers.md;
     description = "KVM2 driver for docker-machine.";
     license = licenses.asl20;
-    maintainers = with maintainers; [ tadfisher ];
+    maintainers = with maintainers; [ tadfisher atkinschang ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 5637e486ef11..d59089443bbe 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -1,68 +1,73 @@
-{ stdenv, buildGoModule, fetchFromGitHub, go-bindata, libvirt, qemu
-, gpgme, makeWrapper, vmnet
-, docker-machine-kvm, docker-machine-kvm2
-, extraDrivers ? []
+{ stdenv
+, buildGoModule
+, fetchFromGitHub
+, pkgconfig
+, makeWrapper
+, go-bindata
+, bash
+, libvirt
+, vmnet
 }:
 
-let
-  drivers = stdenv.lib.filter (d: d != null) (extraDrivers
-            ++ stdenv.lib.optionals stdenv.isLinux [ docker-machine-kvm docker-machine-kvm2 ]);
-
-  binPath = drivers
-            ++ stdenv.lib.optionals stdenv.isLinux ([ libvirt qemu ]);
-
-in buildGoModule rec {
+buildGoModule rec {
   pname   = "minikube";
-  version = "1.2.0";
-
-  kubernetesVersion = "1.15.0";
+  version = "1.3.1";
+  # for -ldflags
+  commit  = "ca60a424ce69a4d79f502650199ca2b52f29e631";
 
   goPackagePath = "k8s.io/minikube";
+  subPackages   = [ "cmd/minikube" ];
+  modSha256     = "0ajzkc3xs7ql0v5762d3rh6idk04nhglfph3ldl25mnafwb7qd9l";
 
   src = fetchFromGitHub {
     owner  = "kubernetes";
     repo   = "minikube";
     rev    = "v${version}";
-    sha256 = "0l9znrp49877cp1bkwx84c8lv282ga5a946rjbxi8gznkf3kwaw7";
+    sha256 = "0kfd7041y6fayz8jl7zlw2lccnrx4d9qramx99j8mcw5syc2mwsd";
   };
 
-  modSha256 = "1cp63n0x2lgbqvvymx9byx48r42qw6w224x5x4iiarc2nryfdhn0";
+  nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ];
+  buildInputs = stdenv.lib.optionals stdenv.isLinux [ libvirt ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ vmnet ];
 
-  buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin vmnet;
-  subPackages = [ "cmd/minikube" ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin "cmd/drivers/hyperkit";
+  postPatch = ''
+    substituteInPlace pkg/minikube/command/exec_runner.go \
+      --replace "/bin/bash" ${bash}/bin/bash
+  '';
 
   preBuild = ''
     go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets deploy/addons/...
+    go-bindata -nomemcopy -o pkg/minikube/translate/translations.go -pkg translate translations/...
 
     VERSION_MAJOR=$(grep "^VERSION_MAJOR" Makefile | sed "s/^.*\s//")
     VERSION_MINOR=$(grep "^VERSION_MINOR" Makefile | sed "s/^.*\s//")
     ISO_VERSION=v$VERSION_MAJOR.$VERSION_MINOR.0
     ISO_BUCKET=$(grep "^ISO_BUCKET" Makefile | sed "s/^.*\s//")
-    KUBERNETES_VERSION=${kubernetesVersion}
 
     export buildFlagsArray="-ldflags=\
-      -X k8s.io/minikube/pkg/version.version=v${version} \
-      -X k8s.io/minikube/pkg/version.isoVersion=$ISO_VERSION \
-      -X k8s.io/minikube/pkg/version.isoPath=$ISO_BUCKET \
-      -X k8s.io/minikube/vendor/k8s.io/client-go/pkg/version.gitVersion=$KUBERNETES_VERSION \
-      -X k8s.io/minikube/vendor/k8s.io/kubernetes/pkg/version.gitVersion=$KUBERNETES_VERSION"
+      -X ${goPackagePath}/pkg/version.version=v${version} \
+      -X ${goPackagePath}/pkg/version.isoVersion=$ISO_VERSION \
+      -X ${goPackagePath}/pkg/version.isoPath=$ISO_BUCKET \
+      -X ${goPackagePath}/pkg/version.gitCommitID=${commit} \
+      -X ${goPackagePath}/pkg/drivers/kvm.version=v${version} \
+      -X ${goPackagePath}/pkg/drivers/kvm.gitCommitID=${commit} \
+      -X ${goPackagePath}/pkg/drivers/hyperkit.version=v${version} \
+      -X ${goPackagePath}/pkg/drivers/hyperkit.gitCommitID=${commit}"
   '';
 
   postInstall = ''
-    wrapProgram $out/bin/${pname} --prefix PATH : $out/bin:${stdenv.lib.makeBinPath binPath}
     mkdir -p $out/share/bash-completion/completions/
     MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $out/bin/minikube completion bash > $out/share/bash-completion/completions/minikube
+
     mkdir -p $out/share/zsh/site-functions/
     MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $out/bin/minikube completion zsh > $out/share/zsh/site-functions/_minikube
-  ''+ stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
-    mv $out/bin/hyperkit $out/bin/docker-machine-driver-hyperkit
   '';
 
   meta = with stdenv.lib; {
     homepage    = https://github.com/kubernetes/minikube;
     description = "A tool that makes it easy to run Kubernetes locally";
     license     = licenses.asl20;
-    maintainers = with maintainers; [ ebzzry copumpkin vdemeester ];
+    maintainers = with maintainers; [ ebzzry copumpkin vdemeester atkinschang ];
     platforms   = with platforms; unix;
   };
 }

From 036c2fed12aab1583d79c338b81872a0ca7e543c Mon Sep 17 00:00:00 2001
From: Atkins <atkins@fstk.io>
Date: Wed, 14 Aug 2019 02:02:55 +0800
Subject: [PATCH 2495/4636] docker-machine-hyperkit: separate from minikube

---
 .../cluster/docker-machine/hyperkit.nix       | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/docker-machine/hyperkit.nix

diff --git a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix
new file mode 100644
index 000000000000..7675f8cf6e93
--- /dev/null
+++ b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix
@@ -0,0 +1,21 @@
+{ lib, buildGoModule, minikube }:
+
+buildGoModule rec {
+  inherit (minikube) version src nativeBuildInputs buildInputs goPackagePath postPatch preBuild;
+
+  pname = "docker-machine-hyperkit";
+  subPackages = [ "cmd/drivers/hyperkit" ];
+  modSha256   = minikube.go-modules.outputHash;
+
+  postInstall = ''
+    mv $out/bin/hyperkit $out/bin/docker-machine-driver-hyperkit
+  '';
+
+  meta = with lib; {
+    homepage = https://github.com/kubernetes/minikube/blob/master/docs/drivers.md;
+    description = "HyperKit driver for docker-machine.";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ atkinschang ];
+    platforms = platforms.darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a00adec661d1..ac1c717ca713 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18793,6 +18793,7 @@ in
   docker-gc = callPackage ../applications/virtualization/docker/gc.nix { };
 
   docker-machine = callPackage ../applications/networking/cluster/docker-machine { };
+  docker-machine-hyperkit = callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix { };
   docker-machine-kvm = callPackage ../applications/networking/cluster/docker-machine/kvm.nix { };
   docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { };
   docker-machine-xhyve = callPackage ../applications/networking/cluster/docker-machine/xhyve.nix {

From 8d5e32ec44af3d5c8eb2112b91e1a736ec15d7d6 Mon Sep 17 00:00:00 2001
From: Atkins <atkinschang@gmail.com>
Date: Wed, 4 Dec 2019 18:08:20 +0800
Subject: [PATCH 2496/4636] minikube: 1.3.1 -> 1.5.2

---
 .../networking/cluster/docker-machine/kvm2.nix     |  2 +-
 .../networking/cluster/minikube/default.nix        | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
index 78dcc713d323..609b7b02cbb4 100644
--- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
@@ -1,7 +1,7 @@
 { lib, buildGoModule, minikube }:
 
 buildGoModule rec {
-  inherit (minikube) version src nativeBuildInputs buildInputs goPackagePath postPatch preBuild;
+  inherit (minikube) version src nativeBuildInputs buildInputs goPackagePath preBuild;
 
   pname = "docker-machine-kvm2";
   subPackages = [ "cmd/drivers/kvm" ];
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index d59089443bbe..dbf84d4a36cd 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -4,37 +4,31 @@
 , pkgconfig
 , makeWrapper
 , go-bindata
-, bash
 , libvirt
 , vmnet
 }:
 
 buildGoModule rec {
   pname   = "minikube";
-  version = "1.3.1";
+  version = "1.5.2";
   # for -ldflags
-  commit  = "ca60a424ce69a4d79f502650199ca2b52f29e631";
+  commit  = "792dbf92a1de583fcee76f8791cff12e0c9440ad";
 
   goPackagePath = "k8s.io/minikube";
   subPackages   = [ "cmd/minikube" ];
-  modSha256     = "0ajzkc3xs7ql0v5762d3rh6idk04nhglfph3ldl25mnafwb7qd9l";
+  modSha256     = "0nv7f1a1ag3r58i1hnk0nikrms0a22017rq55nl39bg9z58d4vk2";
 
   src = fetchFromGitHub {
     owner  = "kubernetes";
     repo   = "minikube";
     rev    = "v${version}";
-    sha256 = "0kfd7041y6fayz8jl7zlw2lccnrx4d9qramx99j8mcw5syc2mwsd";
+    sha256 = "1hahils630aajzrb0z82h3kpgibsyj0lwrknd9whdmvzi2yisr3w";
   };
 
   nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ];
   buildInputs = stdenv.lib.optionals stdenv.isLinux [ libvirt ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ vmnet ];
 
-  postPatch = ''
-    substituteInPlace pkg/minikube/command/exec_runner.go \
-      --replace "/bin/bash" ${bash}/bin/bash
-  '';
-
   preBuild = ''
     go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets deploy/addons/...
     go-bindata -nomemcopy -o pkg/minikube/translate/translations.go -pkg translate translations/...

From d6fe4e1ec12f7a0da323c8fd558d344ddcfad8ee Mon Sep 17 00:00:00 2001
From: Atkins <atkinschang@gmail.com>
Date: Wed, 4 Dec 2019 18:57:56 +0800
Subject: [PATCH 2497/4636] minikube: 1.5.2 -> 1.6.2

---
 .../networking/cluster/docker-machine/hyperkit.nix        | 3 ++-
 pkgs/applications/networking/cluster/minikube/default.nix | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix
index 7675f8cf6e93..716e9da8b7e5 100644
--- a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix
@@ -1,10 +1,11 @@
 { lib, buildGoModule, minikube }:
 
 buildGoModule rec {
-  inherit (minikube) version src nativeBuildInputs buildInputs goPackagePath postPatch preBuild;
+  inherit (minikube) version src nativeBuildInputs buildInputs goPackagePath preBuild;
 
   pname = "docker-machine-hyperkit";
   subPackages = [ "cmd/drivers/hyperkit" ];
+
   modSha256   = minikube.go-modules.outputHash;
 
   postInstall = ''
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index dbf84d4a36cd..866b39cacfdf 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -10,19 +10,19 @@
 
 buildGoModule rec {
   pname   = "minikube";
-  version = "1.5.2";
+  version = "1.6.2";
   # for -ldflags
-  commit  = "792dbf92a1de583fcee76f8791cff12e0c9440ad";
+  commit  = "54f28ac5d3a815d1196cd5d57d707439ee4bb392";
 
   goPackagePath = "k8s.io/minikube";
   subPackages   = [ "cmd/minikube" ];
-  modSha256     = "0nv7f1a1ag3r58i1hnk0nikrms0a22017rq55nl39bg9z58d4vk2";
+  modSha256     = "0ix9z0kifjlj9yjrj2m6lk1qya5cqz4v3pkp61cj6xfp36m4z3l2";
 
   src = fetchFromGitHub {
     owner  = "kubernetes";
     repo   = "minikube";
     rev    = "v${version}";
-    sha256 = "1hahils630aajzrb0z82h3kpgibsyj0lwrknd9whdmvzi2yisr3w";
+    sha256 = "1s18asq6bn94i33chyzl8r8hkpq3cf7pip7byadf2i05n59i9ha2";
   };
 
   nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ];

From 735707ef0cea0d22a9d0648ee4f4b173104ae219 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 6 Mar 2020 22:04:07 +0100
Subject: [PATCH 2498/4636] chromium: Update the VA-API patch (fix #81909)

---
 .../browsers/chromium/patches/vaapi-fix.patch | 42 ++++++++++++++-----
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch b/pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch
index db9d6082756d..b5372d1a2556 100644
--- a/pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch
+++ b/pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch
@@ -1,6 +1,6 @@
 --- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
 +++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
-@@ -635,6 +635,7 @@
+@@ -641,6 +641,7 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers(
    // |vpp_vaapi_wrapper_| for VaapiPicture to DownloadFromSurface() the VA's
    // internal decoded frame.
    if (buffer_allocation_mode_ != BufferAllocationMode::kNone &&
@@ -8,24 +8,22 @@
        !vpp_vaapi_wrapper_) {
      vpp_vaapi_wrapper_ = VaapiWrapper::Create(
          VaapiWrapper::kVideoProcess, VAProfileNone,
-@@ -650,7 +651,8 @@
-     // only used as a copy destination. Therefore, the VaapiWrapper used and
-     // owned by |picture| is |vpp_vaapi_wrapper_|.
+@@ -665,7 +666,8 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers(
+     PictureBuffer buffer = buffers[i];
+     buffer.set_size(requested_pic_size_);
      std::unique_ptr<VaapiPicture> picture = vaapi_picture_factory_->Create(
 -        (buffer_allocation_mode_ == BufferAllocationMode::kNone)
 +        ((buffer_allocation_mode_ == BufferAllocationMode::kNone) ||
 +         (buffer_allocation_mode_ == BufferAllocationMode::kWrapVdpau))
              ? vaapi_wrapper_
              : vpp_vaapi_wrapper_,
-         make_context_current_cb_, bind_image_cb_, buffers[i]);
-@@ -1077,6 +1079,14 @@
+         make_context_current_cb_, bind_image_cb_, buffer);
+@@ -1093,6 +1095,12 @@ VaapiVideoDecodeAccelerator::GetSupportedProfiles() {
 
  VaapiVideoDecodeAccelerator::BufferAllocationMode
  VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() {
 +  // NVIDIA blobs use VDPAU
-+  if (base::StartsWith(VaapiWrapper::GetVendorStringForTesting(),
-+              "Splitted-Desktop Systems VDPAU",
-+              base::CompareCase::SENSITIVE)) {
++  if (VaapiWrapper::GetImplementationType() == VAImplementation::kNVIDIAVDPAU) {
 +    LOG(INFO) << "VA-API driver on VDPAU backend";
 +    return BufferAllocationMode::kWrapVdpau;
 +  }
@@ -33,7 +31,7 @@
    // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT
    // |output_mode_| as well.
    if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
-@@ -1089,7 +1099,7 @@
+@@ -1105,7 +1113,7 @@ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() {
    // depends on the bitstream and sometimes it's not enough to cover the amount
    // of frames needed by the client pipeline (see b/133733739).
    // TODO(crbug.com/911754): Enable for VP9 Profile 2.
@@ -44,7 +42,7 @@
      // an extra allocation for both |client_| and |decoder_|, see
 --- a/media/gpu/vaapi/vaapi_video_decode_accelerator.h
 +++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.h
-@@ -204,6 +204,7 @@
+@@ -204,6 +204,7 @@ class MEDIA_GPU_EXPORT VaapiVideoDecodeAccelerator
      // Using |client_|s provided PictureBuffers and as many internally
      // allocated.
      kNormal,
@@ -52,3 +50,25 @@
    };
 
    // Decides the concrete buffer allocation mode, depending on the hardware
+--- a/media/gpu/vaapi/vaapi_wrapper.cc
++++ b/media/gpu/vaapi/vaapi_wrapper.cc
+@@ -131,6 +131,9 @@ media::VAImplementation VendorStringToImplementationType(
+   } else if (base::StartsWith(va_vendor_string, "Intel iHD driver",
+                               base::CompareCase::SENSITIVE)) {
+     return media::VAImplementation::kIntelIHD;
++  } else if (base::StartsWith(va_vendor_string, "Splitted-Desktop Systems VDPAU",
++                              base::CompareCase::SENSITIVE)) {
++    return media::VAImplementation::kNVIDIAVDPAU;
+   }
+   return media::VAImplementation::kOther;
+ }
+--- a/media/gpu/vaapi/vaapi_wrapper.h
++++ b/media/gpu/vaapi/vaapi_wrapper.h
+@@ -79,6 +79,7 @@ enum class VAImplementation {
+   kIntelIHD,
+   kOther,
+   kInvalid,
++  kNVIDIAVDPAU,
+ };
+
+ // This class handles VA-API calls and ensures proper locking of VA-API calls

From 29000587d495fa7bf83361c442155ddeaf082546 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 7 Mar 2020 09:47:19 -0500
Subject: [PATCH 2499/4636] prometheus-wireguard-exporter: upgrade cargo
 fetcher and cargoSha256

---
 pkgs/servers/monitoring/prometheus/wireguard-exporter.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
index 15802510da3c..1a7a2ebdf211 100644
--- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "18khym7ygj29w98zf6i1l5c2pz84zla2z34l5jnh595xvwfl94pc";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1bi9nr1dhyv322pq6fjrhs12h3wdak53mvwkbyim1hmrp62vky4m";
+  cargoSha256 = "0m7xa610k260gxn2xg6bc2y6fww0p72mvvik7278j2d15044c4yl";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
@@ -26,8 +23,8 @@ rustPlatform.buildRustPackage rec {
 
   meta = with lib; {
     description = "A Prometheus exporter for WireGuard, written in Rust.";
+    homepage = "https://github.com/MindFlavor/prometheus_wireguard_exporter";
     license = licenses.mit;
-    homepage = https://github.com/MindFlavor/prometheus_wireguard_exporter;
     maintainers = with maintainers; [ ma27 globin ];
   };
 }

From d8b2f2b1edfb066d3ddc0eece200e20e27aec734 Mon Sep 17 00:00:00 2001
From: Atkins <atkinschang@gmail.com>
Date: Sat, 7 Mar 2020 22:58:56 +0800
Subject: [PATCH 2500/4636] minikube: 1.6.2 -> 1.8.1

---
 pkgs/applications/networking/cluster/minikube/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 866b39cacfdf..f49f1768ced4 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -10,19 +10,19 @@
 
 buildGoModule rec {
   pname   = "minikube";
-  version = "1.6.2";
+  version = "1.8.1";
   # for -ldflags
-  commit  = "54f28ac5d3a815d1196cd5d57d707439ee4bb392";
+  commit  = "cbda04cf6bbe65e987ae52bb393c10099ab62014";
 
   goPackagePath = "k8s.io/minikube";
   subPackages   = [ "cmd/minikube" ];
-  modSha256     = "0ix9z0kifjlj9yjrj2m6lk1qya5cqz4v3pkp61cj6xfp36m4z3l2";
+  modSha256     = "1wyz8aq291lx614ilqrcgzdc8rjxbd6v3rv1fy6r2m6snyysycfn";
 
   src = fetchFromGitHub {
     owner  = "kubernetes";
     repo   = "minikube";
     rev    = "v${version}";
-    sha256 = "1s18asq6bn94i33chyzl8r8hkpq3cf7pip7byadf2i05n59i9ha2";
+    sha256 = "1nf0n701rw3anp8j7k3f553ipqwpzzxci41zsi0il4l35dpln5g0";
   };
 
   nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ];

From 072a3bda788dafd1d80d3a69e832627de1e45969 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 7 Mar 2020 10:28:06 -0500
Subject: [PATCH 2501/4636] ghc: consistent downloads.haskell.org src URLs

Consistency is good in general and these seem to work just as well as the
others, but it also helps with blacklisting package updates, as in:
https://github.com/ryantm/nixpkgs-update/pull/160
---
 pkgs/development/compilers/ghc/8.4.4.nix | 2 +-
 pkgs/development/compilers/ghc/8.6.5.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix
index d1665574de35..4bebd63956e7 100644
--- a/pkgs/development/compilers/ghc/8.4.4.nix
+++ b/pkgs/development/compilers/ghc/8.4.4.nix
@@ -87,7 +87,7 @@ stdenv.mkDerivation (rec {
   name = "${targetPrefix}ghc-${version}";
 
   src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
+    url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
     sha256 = "1ch4j2asg7pr52ai1hwzykxyj553wndg7wq93i47ql4fllspf48i";
   };
 
diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix
index ead28a3076a8..e276d9b12b93 100644
--- a/pkgs/development/compilers/ghc/8.6.5.nix
+++ b/pkgs/development/compilers/ghc/8.6.5.nix
@@ -92,7 +92,7 @@ stdenv.mkDerivation (rec {
   name = "${targetPrefix}ghc-${version}";
 
   src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
+    url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
     sha256 = "0qg3zsmbk4rkwkc3jpas3zs74qaxmw4sp4v1mhsbj0a0dzls2jjd";
   };
 
@@ -187,7 +187,7 @@ stdenv.mkDerivation (rec {
   strictDeps = true;
 
   # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
-	dontAddExtraLibs = true;
+  dontAddExtraLibs = true;
 
   nativeBuildInputs = [
     perl autoconf automake m4 python3 sphinx

From 4a2f72f7c2be08060eae71daff5eacd6658fb6fc Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 7 Mar 2020 11:12:32 -0500
Subject: [PATCH 2502/4636] gir-rs: upgrade cargo fetcher and cargoSha256

---
 pkgs/development/tools/gir/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/gir/default.nix b/pkgs/development/tools/gir/default.nix
index 90acfce1ecb1..8cfcbf26dcd6 100644
--- a/pkgs/development/tools/gir/default.nix
+++ b/pkgs/development/tools/gir/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1kn5kgdma9j6dwpmv6jmydak7ajlgdkw9sfkh3q7h8c2a8yikvxr";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1ybd9h2f13fxmnkzbacd39rcyzjcjd2ra52y8kncg1s0dc0m8rjb";
+  cargoSha256 = "048qhlc4f5khxi7dnakgqkhgww44r6h3mlx2fm7y2wqivr3rj8p1";
 
   meta = with stdenv.lib; {
     description = "Tool to generate rust bindings and user API for glib-based libraries";

From b0ab073145bded06a28088804f28b45159491856 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 7 Mar 2020 16:58:18 +0000
Subject: [PATCH 2503/4636] python27Packages.Quandl: 3.4.6 -> 3.4.8

---
 pkgs/development/python-modules/quandl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix
index 385c51bcd3b2..bd73a0213310 100644
--- a/pkgs/development/python-modules/quandl/default.nix
+++ b/pkgs/development/python-modules/quandl/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "quandl";
-  version = "3.4.6";
+  version = "3.4.8";
 
   src = fetchPypi {
     inherit version;
     pname = "Quandl";
-    sha256 = "15b58nj45bdax0aha6kwjz5pxj3bz8bs6ajwxqp9r89j13xxn94g";
+    sha256 = "179knz21filz6x6qk66b7dk2pj1x4jnvxxd5x71ap19f367dkkb3";
   };
 
   doCheck = true;

From c385ed4d6f86ee28818615a44f0ac54f56ebe898 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 7 Mar 2020 12:10:26 -0500
Subject: [PATCH 2504/4636] wmfocus: 1.1.2 -> 1.1.3

---
 .../applications/window-managers/i3/wmfocus.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/wmfocus.nix b/pkgs/applications/window-managers/i3/wmfocus.nix
index 677108e2163c..c4e22546d1c4 100644
--- a/pkgs/applications/window-managers/i3/wmfocus.nix
+++ b/pkgs/applications/window-managers/i3/wmfocus.nix
@@ -1,21 +1,18 @@
-{ stdenv, fetchFromGitHub, rustPlatform,
-  xorg, python3, pkgconfig, cairo, libxkbcommon }:
+{ stdenv, fetchFromGitHub, rustPlatform
+, xorg, python3, pkgconfig, cairo, libxkbcommon }:
 
 rustPlatform.buildRustPackage rec {
   pname = "wmfocus";
-  version = "1.1.2";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "svenstaro";
     repo = pname;
     rev = version;
-    sha256 = "0jx0h2zyghs3bp4sg8f3vk5rkyprz2dqfqs0v72vmkp3cvgzxbvs";
+    sha256 = "17qdsqp9072yr7rcm6g1h620rff95ldawr8ldpkbjmkh0rc86skn";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1xmc28ns59jcmnv17102s2084baxqdvi0ibbyqwb108385qnixzf";
+  cargoSha256 = "1nsdvzrsgprwq7lsvfpymqslhggdzfk3840y8x92qjb0l2g4jhw1";
 
   nativeBuildInputs = [ python3 pkgconfig ];
   buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ];
@@ -27,9 +24,9 @@ rustPlatform.buildRustPackage rec {
 
   meta = with stdenv.lib; {
     description = "Visually focus windows by label";
+    homepage = "https://github.com/svenstaro/wmfocus";
+    license = licenses.mit;
     maintainers = with maintainers; [ synthetica ];
     platforms = platforms.linux;
-    license = licenses.mit;
-    homepage = https://github.com/svenstaro/wmfocus;
   };
 }

From 176d90e0c8cd31d198d9fed3fdae007917969536 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 7 Mar 2020 11:48:13 -0500
Subject: [PATCH 2505/4636] librustzcash: 2018-10-27 -> 0.1.0

Also includes updates for:

- https://github.com/NixOS/nixpkgs/issues/79975
- https://github.com/NixOS/rfcs/pull/45
---
 .../blockchains/zcash/librustzcash/default.nix   | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/blockchains/zcash/librustzcash/default.nix b/pkgs/applications/blockchains/zcash/librustzcash/default.nix
index 5032594468e7..6cd2ae018fb6 100644
--- a/pkgs/applications/blockchains/zcash/librustzcash/default.nix
+++ b/pkgs/applications/blockchains/zcash/librustzcash/default.nix
@@ -1,20 +1,17 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
 rustPlatform.buildRustPackage rec {
-  pname = "librustzcash-unstable";
-  version = "2018-10-27";
+  pname = "librustzcash";
+  version = "0.1.0";
 
   src = fetchFromGitHub {
     owner = "zcash";
     repo = "librustzcash";
-    rev = "06da3b9ac8f278e5d4ae13088cf0a4c03d2c13f5";
-    sha256 = "0md0pp3k97iv7kfjpfkg14pjanhrql4vafa8ggbxpkajv1j4xldv";
+    rev = version;
+    sha256 = "0d28k29sgzrg9clynz29kpw50kbkp0a4dfdayqhmpjmsh05y6261";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "166v8cxlpfslbs5gljbh7wp0lxqakayw47ikxm9r9a39n7j36mq1";
+  cargoSha256 = "1wzyrcmcbrna6rjzw19c4lq30didzk4w6fs6wmvxp0xfg4qqdlax";
 
   installPhase = ''
     mkdir -p $out/lib
@@ -23,11 +20,12 @@ rustPlatform.buildRustPackage rec {
     cp librustzcash/include/librustzcash.h $out/include/
   '';
 
+  # The tests do pass, but they take an extremely long time to run.
   doCheck = false;
 
   meta = with stdenv.lib; {
     description = "Rust-language assets for Zcash";
-    homepage = https://github.com/zcash/librustzcash;
+    homepage = "https://github.com/zcash/librustzcash";
     maintainers = with maintainers; [ rht tkerber ];
     license = with licenses; [ mit asl20 ];
     platforms = platforms.unix;

From bd1b24b5b1fa08e824d06e64bc1b7ae14f644ca1 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 7 Mar 2020 11:50:03 -0500
Subject: [PATCH 2506/4636] zcash: 2.1.0-1 -> 2.1.1-1

Also enabled parallel building, because otherwise this takes 45+ minutes to
compile! With it enabled, it can build in a couple minutes.
---
 pkgs/applications/blockchains/zcash/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix
index f6114b3c2134..e2c57d514cda 100644
--- a/pkgs/applications/blockchains/zcash/default.nix
+++ b/pkgs/applications/blockchains/zcash/default.nix
@@ -7,15 +7,19 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   pname = "zcash";
-  version = "2.1.0-1";
+  version = "2.1.1-1";
 
   src = fetchFromGitHub {
     owner = "zcash";
     repo  = "zcash";
     rev = "v${version}";
-    sha256 = "05bnn4lxrrcv1ha3jdfrgwg4ar576161n3j9d4gpc14ww3zgf9vz";
+    sha256 = "1g5zlfzfp31my8w8nlg5fncpr2y95iv9fm04x57sjb93rgmjdh5n";
   };
 
+  patchPhase = ''
+    sed -i"" 's,-fvisibility=hidden,,g'            src/Makefile.am
+  '';
+
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ gtest gmock gmp openssl wget db62 boost17x zlib
                   protobuf libevent libsodium librustzcash ]
@@ -23,17 +27,15 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-boost-libdir=${boost17x.out}/lib" ];
 
-  patchPhase = ''
-    sed -i"" 's,-fvisibility=hidden,,g'            src/Makefile.am
-  '';
-
   postInstall = ''
     cp zcutil/fetch-params.sh $out/bin/zcash-fetch-params
   '';
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "Peer-to-peer, anonymous electronic cash system";
-    homepage = https://z.cash/;
+    homepage = "https://z.cash/";
     maintainers = with maintainers; [ rht tkerber ];
     license = licenses.mit;
     platforms = platforms.linux;

From d6d660d9969ce062568f561f035e8e922ff30f72 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 7 Mar 2020 18:57:31 +0100
Subject: [PATCH 2507/4636] =?UTF-8?q?fwupd:=201.3.8=20=E2=86=92=201.3.9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/fwupd/fwupd/blob/1.3.9/data/org.freedesktop.fwupd.metainfo.xml#L38-L63
---
 ...d-option-for-installation-sysconfdir.patch | 39 ++++++++++++-------
 .../linux/firmware/fwupd/default.nix          | 12 ++----
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
index 262c2cbc4f17..a13251476de3 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
+++ b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch
@@ -1,8 +1,8 @@
 diff --git a/data/meson.build b/data/meson.build
-index d59bdc88..4a4cfc35 100644
+index 0667bd78..92d6c7b9 100644
 --- a/data/meson.build
 +++ b/data/meson.build
-@@ -16,7 +16,7 @@
+@@ -17,7 +17,7 @@ endif
  
  if build_standalone
    install_data(['daemon.conf'],
@@ -15,7 +15,7 @@ diff --git a/data/pki/meson.build b/data/pki/meson.build
 index eefcc914..dc801fa1 100644
 --- a/data/pki/meson.build
 +++ b/data/pki/meson.build
-@@ -4,14 +4,14 @@
+@@ -4,14 +4,14 @@ if get_option('gpg')
        'GPG-KEY-Linux-Foundation-Firmware',
        'GPG-KEY-Linux-Vendor-Firmware-Service',
      ],
@@ -32,7 +32,7 @@ index eefcc914..dc801fa1 100644
    )
  endif
  
-@@ -19,12 +19,12 @@
+@@ -19,12 +19,12 @@ if get_option('pkcs7')
    install_data([
        'LVFS-CA.pem',
      ],
@@ -51,7 +51,7 @@ diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build
 index 826a3c1d..b78db663 100644
 --- a/data/remotes.d/meson.build
 +++ b/data/remotes.d/meson.build
-@@ -3,7 +3,7 @@
+@@ -3,7 +3,7 @@ if build_daemon and get_option('lvfs')
        'lvfs.conf',
        'lvfs-testing.conf',
      ],
@@ -60,7 +60,7 @@ index 826a3c1d..b78db663 100644
    )
    i18n.merge_file(
      input: 'lvfs.metainfo.xml',
-@@ -37,12 +37,12 @@
+@@ -37,12 +37,12 @@ configure_file(
    output : 'vendor.conf',
    configuration : con2,
    install: true,
@@ -79,7 +79,7 @@ diff --git a/meson.build b/meson.build
 index b1a523d2..aacb8e0a 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -169,6 +169,12 @@
+@@ -169,6 +169,12 @@ endif
  mandir = join_paths(prefix, get_option('mandir'))
  localedir = join_paths(prefix, get_option('localedir'))
  
@@ -96,7 +96,7 @@ diff --git a/meson_options.txt b/meson_options.txt
 index be0adfef..73983333 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -26,6 +26,7 @@
+@@ -26,6 +26,7 @@ option('plugin_coreboot', type : 'boolean', value : true, description : 'enable
  option('systemd', type : 'boolean', value : true, description : 'enable systemd support')
  option('systemdunitdir', type: 'string', value: '', description: 'Directory for systemd units')
  option('elogind', type : 'boolean', value : false, description : 'enable elogind support')
@@ -108,7 +108,7 @@ diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build
 index ed4eee70..76dbdb1d 100644
 --- a/plugins/dell-esrt/meson.build
 +++ b/plugins/dell-esrt/meson.build
-@@ -37,5 +37,5 @@
+@@ -37,5 +37,5 @@ configure_file(
    output : 'dell-esrt.conf',
    configuration : con2,
    install: true,
@@ -119,7 +119,7 @@ diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build
 index 25fc5c7d..77eb9a83 100644
 --- a/plugins/redfish/meson.build
 +++ b/plugins/redfish/meson.build
-@@ -27,7 +27,7 @@
+@@ -27,7 +27,7 @@ shared_module('fu_plugin_redfish',
  )
  
  install_data(['redfish.conf'],
@@ -132,7 +132,7 @@ diff --git a/plugins/thunderbolt/meson.build b/plugins/thunderbolt/meson.build
 index 06ab34ee..297a9182 100644
 --- a/plugins/thunderbolt/meson.build
 +++ b/plugins/thunderbolt/meson.build
-@@ -46,7 +46,7 @@
+@@ -46,7 +46,7 @@ executable('tbtfwucli',
  )
  
  install_data(['thunderbolt.conf'],
@@ -142,11 +142,11 @@ index 06ab34ee..297a9182 100644
  # we use functions from 2.52 in the tests
  if get_option('tests') and umockdev.found() and gio.version().version_compare('>= 2.52')
 diff --git a/plugins/uefi/meson.build b/plugins/uefi/meson.build
-index 39b5f566..0f904a22 100644
+index 7252580d..7188d1c5 100644
 --- a/plugins/uefi/meson.build
 +++ b/plugins/uefi/meson.build
-@@ -87,7 +87,7 @@
- )
+@@ -104,7 +104,7 @@ if get_option('man')
+ endif
  
  install_data(['uefi.conf'],
 -  install_dir:  join_paths(sysconfdir, 'fwupd')
@@ -154,3 +154,14 @@ index 39b5f566..0f904a22 100644
  )
  
  if get_option('tests')
+diff --git a/plugins/upower/meson.build b/plugins/upower/meson.build
+index 290a3eb6..9ab2f452 100644
+--- a/plugins/upower/meson.build
++++ b/plugins/upower/meson.build
+@@ -23,5 +23,5 @@ shared_module('fu_plugin_upower',
+ )
+ 
+ install_data(['upower.conf'],
+-  install_dir:  join_paths(sysconfdir, 'fwupd')
++  install_dir:  join_paths(sysconfdir_install, 'fwupd')
+ )
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index aa6aeca9549e..86a2bfbcc9e8 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -2,7 +2,6 @@
 
 { stdenv
 , fetchurl
-, fetchpatch
 , substituteAll
 , gtk-doc
 , pkgconfig
@@ -88,11 +87,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "fwupd";
-  version = "1.3.8";
+  version = "1.3.9";
 
   src = fetchurl {
     url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
-    sha256 = "14hbwp3263n4z61ws62vj50kh9a89fz2l29hyv7f1xlas4zz6j8x";
+    sha256 = "ZuRG+UN8ebXv5Z8fOYWT0eCtHykGXoB8Ysu3wAeqx0A=";
   };
 
   # libfwupd goes to lib
@@ -163,12 +162,6 @@ stdenv.mkDerivation rec {
       # needs a different set of modules than po/make-images
       inherit installedTestsPython;
     })
-
-    # Find the correct lds and crt name when specifying -Defi_ldsdir
-    (fetchpatch {
-      url = "https://github.com/fwupd/fwupd/commit/52cda3db9ca9ab4faf99310edf29df926a713b5c.patch";
-      sha256 = "0hsj79dzamys7ryz33iwxwd58kb1h7gaw637whm0nkvzkqq6rm16";
-    })
   ];
 
   postPatch = ''
@@ -271,6 +264,7 @@ stdenv.mkDerivation rec {
       "fwupd/remotes.d/vendor.conf"
       "fwupd/remotes.d/vendor-directory.conf"
       "fwupd/thunderbolt.conf"
+      "fwupd/upower.conf"
       # "fwupd/uefi.conf" # already created by the module
       "pki/fwupd/GPG-KEY-Hughski-Limited"
       "pki/fwupd/GPG-KEY-Linux-Foundation-Firmware"

From 2685e457d331c9644ca94eb53d471956fc8173eb Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Fri, 7 Feb 2020 19:06:22 -0500
Subject: [PATCH 2508/4636] zoneminder: 1.32.3 -> 1.34.3

---
 pkgs/servers/zoneminder/default.nix           | 13 ++++++++-----
 pkgs/servers/zoneminder/link-with-libdl.patch | 17 -----------------
 2 files changed, 8 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/servers/zoneminder/link-with-libdl.patch

diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix
index e536ea0373cf..5ffb803d3a0e 100644
--- a/pkgs/servers/zoneminder/default.nix
+++ b/pkgs/servers/zoneminder/default.nix
@@ -78,19 +78,17 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "zoneminder";
-  version = "1.32.3";
+  version = "1.34.3";
 
   src = fetchFromGitHub {
     owner  = "ZoneMinder";
     repo   = "zoneminder";
     rev    = version;
-    sha256 = "1sx2fn99861zh0gp8g53ynr1q6yfmymxamn82y54jqj6nv475njz";
+    sha256 = "0jp7950v36gxxzkwdp5i0312s26czhfsl5ixdxfzn21cx31hhlg0";
   };
 
   patches = [
     ./default-to-http-1dot1.patch
-    # Explicitly link with dynamic linking library to fix build
-    ./link-with-libdl.patch
   ];
 
   postPatch = ''
@@ -125,6 +123,10 @@ in stdenv.mkDerivation rec {
     substituteInPlace scripts/zmdbbackup.in \
       --replace /usr/bin/mysqldump ${mysql.client}/bin/mysqldump
 
+    substituteInPlace scripts/zmupdate.pl.in \
+      --replace "'mysql'" "'${mysql.client}/bin/mysql'" \
+      --replace "'mysqldump'" "'${mysql.client}/bin/mysqldump'"
+
     for f in scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in \
              scripts/zmupdate.pl.in \
              src/zm_config.h.in \
@@ -133,7 +135,7 @@ in stdenv.mkDerivation rec {
       substituteInPlace $f --replace @ZM_CONFIG_SUBDIR@ /etc/zoneminder
     done
 
-   for f in includes/Event.php views/image.php skins/classic/views/image-ffmpeg.php ; do
+   for f in includes/Event.php views/image.php ; do
      substituteInPlace web/$f \
        --replace "'ffmpeg " "'${ffmpeg}/bin/ffmpeg "
    done
@@ -147,6 +149,7 @@ in stdenv.mkDerivation rec {
     DateManip DBI DBDmysql LWP SysMmap
     # run-time dependencies not checked at build-time
     ClassStdFast DataDump DeviceSerialPort JSONMaybeXS LWPProtocolHttps NumberBytesHuman SysCPU SysMemInfo TimeDate
+    CryptEksblowfish DataEntropy # zmupdate.pl
   ]);
 
   nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
diff --git a/pkgs/servers/zoneminder/link-with-libdl.patch b/pkgs/servers/zoneminder/link-with-libdl.patch
deleted file mode 100644
index 53aaf9b25f7d..000000000000
--- a/pkgs/servers/zoneminder/link-with-libdl.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -20,10 +20,10 @@ add_executable(zms zms.cpp)
- include_directories(libbcrypt/include/bcrypt)
- include_directories(jwt-cpp/include/jwt-cpp)
-
--target_link_libraries(zmc zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
--target_link_libraries(zma zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
--target_link_libraries(zmu zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
--target_link_libraries(zms zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
-+target_link_libraries(zmc zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS})
-+target_link_libraries(zma zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS})
-+target_link_libraries(zmu zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS})
-+target_link_libraries(zms zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS})
-
- # Generate man files for the binaries destined for the bin folder
- FOREACH(CBINARY zma zmc zmu)

From 630de551ef46ec03d94c6a9c82f67c3abb8fa743 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Fri, 21 Feb 2020 20:43:56 -0500
Subject: [PATCH 2509/4636] zoneminder: fix timezone detection

---
 pkgs/servers/zoneminder/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix
index 5ffb803d3a0e..5da0d34e0f2e 100644
--- a/pkgs/servers/zoneminder/default.nix
+++ b/pkgs/servers/zoneminder/default.nix
@@ -135,10 +135,13 @@ in stdenv.mkDerivation rec {
       substituteInPlace $f --replace @ZM_CONFIG_SUBDIR@ /etc/zoneminder
     done
 
-   for f in includes/Event.php views/image.php ; do
-     substituteInPlace web/$f \
-       --replace "'ffmpeg " "'${ffmpeg}/bin/ffmpeg "
-   done
+    for f in includes/Event.php views/image.php ; do
+      substituteInPlace web/$f \
+        --replace "'ffmpeg " "'${ffmpeg}/bin/ffmpeg "
+    done
+
+    substituteInPlace web/includes/functions.php \
+      --replace "'date " "'${coreutils}/bin/date "
   '';
 
   buildInputs = [

From cb5da4eacbffcc7fcb7178069bb14ac879c5999d Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Sun, 9 Feb 2020 13:28:32 -0500
Subject: [PATCH 2510/4636] nixos/zoneminder: update on startup if needed

---
 nixos/modules/services/misc/zoneminder.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix
index d7f7324580c0..d5b3537068d3 100644
--- a/nixos/modules/services/misc/zoneminder.nix
+++ b/nixos/modules/services/misc/zoneminder.nix
@@ -77,6 +77,8 @@ in {
         `config.services.zoneminder.database.createLocally` to true. Otherwise,
         when set to `false` (the default), you will have to create the database
         and database user as well as populate the database yourself.
+        Additionally, you will need to run `zmupdate.pl` yourself when
+        upgrading to a newer version.
       '';
 
       webserver = mkOption {
@@ -330,6 +332,8 @@ in {
             ${config.services.mysql.package}/bin/mysql < ${pkg}/share/zoneminder/db/zm_create.sql
             touch "/var/lib/${dirName}/db-created"
           fi
+
+          ${zoneminder}/bin/zmupdate.pl -nointeractive
         '';
         serviceConfig = {
           User = user;

From ce34b927e0957e2ff2e8723aa2d73cbacd0563dd Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Fri, 21 Feb 2020 22:08:36 -0500
Subject: [PATCH 2511/4636] zoneminder: add patch to fix improper caching

---
 ...use-file-timestamp-in-cache-filename.patch | 32 +++++++++++++++++++
 pkgs/servers/zoneminder/default.nix           |  6 ++--
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch

diff --git a/pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch b/pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch
new file mode 100644
index 000000000000..6ca55a147688
--- /dev/null
+++ b/pkgs/servers/zoneminder/0001-Don-t-use-file-timestamp-in-cache-filename.patch
@@ -0,0 +1,32 @@
+From db38a11228eceea10dc97ecc87023b4919caa918 Mon Sep 17 00:00:00 2001
+From: Daniel Fullmer <danielrf12@gmail.com>
+Date: Fri, 21 Feb 2020 21:52:00 -0500
+Subject: [PATCH] Don't use file timestamp in cache filename
+
+Every file in the nix store has a timestamp of "1", meaning that the
+filename would remain constant even when changing zoneminder versions.
+This would mean that newer versions would use the existing symlink to an
+older version of the source file.  We replace SRC_HASH in nix with a
+hash of the source used to build zoneminder to ensure this filename is
+unique.
+---
+ web/includes/functions.php | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/web/includes/functions.php b/web/includes/functions.php
+index 19567a5c1..0242c09bc 100644
+--- a/web/includes/functions.php
++++ b/web/includes/functions.php
+@@ -2223,7 +2223,8 @@ function cache_bust($file) {
+   $parts = pathinfo($file);
+   global $css;
+   $dirname = preg_replace('/\//', '_', $parts['dirname']);
+-  $cacheFile = $dirname.'_'.$parts['filename'].'-'.$css.'-'.filemtime($file).'.'.$parts['extension'];
++  $srcHash = '@srcHash@';
++  $cacheFile = $dirname.'_'.$parts['filename'].'-'.$css.'-'.$srcHash.'.'.$parts['extension'];
+   if ( file_exists(ZM_DIR_CACHE.'/'.$cacheFile) or symlink(ZM_PATH_WEB.'/'.$file, ZM_DIR_CACHE.'/'.$cacheFile) ) {
+     return 'cache/'.$cacheFile;
+   } else {
+-- 
+2.25.1
+
diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix
index 5da0d34e0f2e..93f22e77f870 100644
--- a/pkgs/servers/zoneminder/default.nix
+++ b/pkgs/servers/zoneminder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchurl, cmake, makeWrapper, pkgconfig
+{ stdenv, lib, fetchFromGitHub, fetchurl, substituteAll, cmake, makeWrapper, pkgconfig
 , curl, ffmpeg, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages
 , polkit, utillinuxMinimal, x264, zlib
 , coreutils, procps, psmisc }:
@@ -89,6 +89,7 @@ in stdenv.mkDerivation rec {
 
   patches = [
     ./default-to-http-1dot1.patch
+    ./0001-Don-t-use-file-timestamp-in-cache-filename.patch
   ];
 
   postPatch = ''
@@ -141,7 +142,8 @@ in stdenv.mkDerivation rec {
     done
 
     substituteInPlace web/includes/functions.php \
-      --replace "'date " "'${coreutils}/bin/date "
+      --replace "'date " "'${coreutils}/bin/date " \
+      --subst-var-by srcHash "`basename $out`"
   '';
 
   buildInputs = [

From bdd16df074e978fcd32d4239e3dcd464bff32691 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 7 Mar 2020 18:51:38 +0100
Subject: [PATCH 2512/4636] vaultenv: fix build

Don't hard fail on warnings, having eg. some redundant imports is fine.
---
 pkgs/development/tools/haskell/vaultenv/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix
index 6c339bf31b56..419f4530dca1 100644
--- a/pkgs/development/tools/haskell/vaultenv/default.nix
+++ b/pkgs/development/tools/haskell/vaultenv/default.nix
@@ -15,6 +15,11 @@ mkDerivation rec {
 
   buildTools = [ hpack ];
 
+  prePatch = ''
+    substituteInPlace package.yaml \
+        --replace -Werror ""
+  '';
+
   isLibrary = false;
   isExecutable = true;
   executableHaskellDepends = [

From b628400f5e70c361cc74e6a5c1d041f6a2189e5f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 7 Mar 2020 18:48:08 +0000
Subject: [PATCH 2513/4636] linuxPackages_{,_latest,_testing}_hardened: enable
 32-bit emulation

Per discussion in #81943.

Resolves #79798.
---
 pkgs/os-specific/linux/kernel/hardened-config.nix | 3 +--
 pkgs/top-level/all-packages.nix                   | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix
index 156a4cf44234..00aceefa1330 100644
--- a/pkgs/os-specific/linux/kernel/hardened-config.nix
+++ b/pkgs/os-specific/linux/kernel/hardened-config.nix
@@ -18,8 +18,7 @@ assert (versionAtLeast version "4.9");
 optionalAttrs (stdenv.hostPlatform.platform.kernelArch == "x86_64") {
   DEFAULT_MMAP_MIN_ADDR = freeform "65536";  # Prevent allocation of first 64K of memory
 
-  # Reduce attack surface by disabling various emulations
-  IA32_EMULATION     = no;
+  # Reduce attack surface by disabling X32
   X86_X32            = no;
   # Note: this config depends on EXPERT y and so will not take effect, hence
   # it is left "optional" for now.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5574d0cc76aa..f47f8df580a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16828,7 +16828,6 @@ in
 
   # Hardened linux
   hardenedLinuxPackagesFor = kernel: linuxPackagesFor (kernel.override {
-    features.ia32Emulation = false;
     structuredExtraConfig = import ../os-specific/linux/kernel/hardened-config.nix {
       inherit stdenv;
       inherit (kernel) version;

From 3a84353edb56a6167fb687f2fdc32cab48a65079 Mon Sep 17 00:00:00 2001
From: Gabor Greif <ggreif@gmail.com>
Date: Thu, 5 Mar 2020 12:34:01 +0100
Subject: [PATCH 2514/4636] llvmPackages_10: rc2 -> rc3

http://lists.llvm.org/pipermail/llvm-dev/2020-March/139729.html

Additionally cherry-picked 3 commits from `llvm-project/master`:
- llvm/llvm-project@d21664c
- llvm/llvm-project@3a0f6e6
- llvm/llvm-project@87dac7d

such that clang can automatically pick up the polly plugin from the
`llvm-polly` build.
---
 .../10/clang/clang-extension-handling.patch   |  18 +++
 .../compilers/llvm/10/clang/default.nix       |   9 +-
 .../compilers/llvm/10/compiler-rt.nix         |   2 +-
 .../development/compilers/llvm/10/default.nix |   5 +-
 .../compilers/llvm/10/libc++/default.nix      |   2 +-
 .../compilers/llvm/10/libc++abi.nix           |   2 +-
 .../compilers/llvm/10/libunwind.nix           |   2 +-
 pkgs/development/compilers/llvm/10/lld.nix    |   2 +-
 pkgs/development/compilers/llvm/10/lldb.nix   |   2 +-
 .../llvm/10/llvm-extension-handling.patch     | 146 ++++++++++++++++++
 pkgs/development/compilers/llvm/10/llvm.nix   |   9 +-
 pkgs/development/compilers/llvm/10/openmp.nix |   2 +-
 12 files changed, 184 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/compilers/llvm/10/clang/clang-extension-handling.patch
 create mode 100644 pkgs/development/compilers/llvm/10/llvm-extension-handling.patch

diff --git a/pkgs/development/compilers/llvm/10/clang/clang-extension-handling.patch b/pkgs/development/compilers/llvm/10/clang/clang-extension-handling.patch
new file mode 100644
index 000000000000..a74d10989ffa
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/clang/clang-extension-handling.patch
@@ -0,0 +1,18 @@
+Compressed diff from
+```
+git show d21664cce1db8debe2528f36b1fbd2b8af9c9401 87dac7da68ea1e0adac78c59ef1891dcf9632b67 3a0f6e699bb6d96dc62dce6faef20ac26cf103fd
+```
+with the purpose of avoiding linker errors arising in the polly-flavoured clang.
+
+diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
+index 781c3eb7f2f..dc1413f4b59 100644
+--- clang/CMakeLists.txt
++++ clang/CMakeLists.txt
+@@ -864,6 +864,7 @@ add_subdirectory(utils/hmaptool)
+ 
+ if(CLANG_BUILT_STANDALONE)
+   llvm_distribution_add_targets()
++  process_llvm_pass_plugins()
+ endif()
+ 
+ configure_file(
diff --git a/pkgs/development/compilers/llvm/10/clang/default.nix b/pkgs/development/compilers/llvm/10/clang/default.nix
index fcabe6d430f4..13fe4bedd46f 100644
--- a/pkgs/development/compilers/llvm/10/clang/default.nix
+++ b/pkgs/development/compilers/llvm/10/clang/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld
 , fixDarwinDylibNames
 , enableManpages ? false
-, enablePolly ? false # TODO: get this info from llvm (passthru?)
 }:
 
 let
@@ -9,7 +8,7 @@ let
     pname = "clang";
     inherit version;
 
-    src = fetch "clang" "1npwv0j6812q9jar79bb5m2j4lmvp11680in45nlma8czrs52w0v";
+    src = fetch "clang" "1w7ixr16a9f0g5kv4irvhwq973wn0d418kb0p9rabyfscm05wfmq";
 
     unpackPhase = ''
       unpackFile $src
@@ -34,12 +33,12 @@ let
       "-DSPHINX_OUTPUT_MAN=ON"
       "-DSPHINX_OUTPUT_HTML=OFF"
       "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
-    ] ++ stdenv.lib.optionals enablePolly [
-      "-DWITH_POLLY=ON"
-      "-DLINK_POLLY_INTO_TOOLS=ON"
     ];
 
     patches = [
+      # 10.0.0rc3-only
+      ./clang-extension-handling.patch
+
       ./purity.patch
       # https://reviews.llvm.org/D51899
       ./compiler-rt-baremetal.patch
diff --git a/pkgs/development/compilers/llvm/10/compiler-rt.nix b/pkgs/development/compilers/llvm/10/compiler-rt.nix
index c9eed4d0070e..2d71268c6624 100644
--- a/pkgs/development/compilers/llvm/10/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/10/compiler-rt.nix
@@ -2,7 +2,7 @@
 stdenv.mkDerivation rec {
   pname = "compiler-rt";
   inherit version;
-  src = fetch pname "11qiass6gbpq3m1srqlk5gm0zcm8j4jk2cmingra237qhaxz8wv9";
+  src = fetch pname "0qv40mv91630l6f75w9g5y6v97s5shz94n82rms12gcd8mir6qp5";
 
   nativeBuildInputs = [ cmake python3 llvm ];
   buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix
index 0f9d302f7cf4..f2a8883a9a7e 100644
--- a/pkgs/development/compilers/llvm/10/default.nix
+++ b/pkgs/development/compilers/llvm/10/default.nix
@@ -6,7 +6,7 @@
 
 let
   release_version = "10.0.0";
-  candidate = "rc2";
+  candidate = "rc3";
   version = "10.0.0${candidate}"; # differentiating these is important for rc's
 
   fetch = name: sha256: fetchurl {
@@ -14,7 +14,7 @@ let
     inherit sha256;
   };
 
-  clang-tools-extra_src = fetch "clang-tools-extra" "1yi34b6lspcpig0gnws2ba0shgmrs2jgjb3hp08mm0dg3blzk8ss";
+  clang-tools-extra_src = fetch "clang-tools-extra" "03669c93wzmbmfpv0pyzb7y4z1xc912l95iqywyx01xgdl1xws0r";
 
   tools = stdenv.lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
@@ -39,7 +39,6 @@ let
     clang-polly-unwrapped = callPackage ./clang {
       inherit clang-tools-extra_src;
       llvm = tools.llvm-polly;
-      enablePolly = true;
     };
 
     llvm-manpages = lowPrio (tools.llvm.override {
diff --git a/pkgs/development/compilers/llvm/10/libc++/default.nix b/pkgs/development/compilers/llvm/10/libc++/default.nix
index 2d2bc4db2d7e..767b1cbbc583 100644
--- a/pkgs/development/compilers/llvm/10/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/10/libc++/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   pname = "libc++";
   inherit version;
 
-  src = fetch "libcxx" "0d83z1dbr6kkwcq72kqpdkvnndjvcjx7w80qlkvqlv7r2zai5kjg";
+  src = fetch "libcxx" "1cjxiby8nq95g02rgx08iy86pswpi66b9wmxqjiyga1s92nb19j0";
 
   postUnpack = ''
     unpackFile ${libcxxabi.src}
diff --git a/pkgs/development/compilers/llvm/10/libc++abi.nix b/pkgs/development/compilers/llvm/10/libc++abi.nix
index 3715ce36ec0a..8ad52b5ed57f 100644
--- a/pkgs/development/compilers/llvm/10/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/10/libc++abi.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   pname = "libc++abi";
   inherit version;
 
-  src = fetch "libcxxabi" "001rnpgya6y0vcsy5jqcc7ria666mswbzw4avdps6dgs6caqrfpd";
+  src = fetch "libcxxabi" "1xs7dr91qzz7lq9am4q3vcj2jf1gx23ar1jbnhn763011hl94vs0";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
diff --git a/pkgs/development/compilers/llvm/10/libunwind.nix b/pkgs/development/compilers/llvm/10/libunwind.nix
index 7a8fb13dad27..74a8687179fe 100644
--- a/pkgs/development/compilers/llvm/10/libunwind.nix
+++ b/pkgs/development/compilers/llvm/10/libunwind.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   pname = "libunwind";
   inherit version;
 
-  src = fetch pname "0194s3qqqz4qcrzdfy7c931sm3d9hnjk624gldja85mwz1v1x9a8";
+  src = fetch pname "1dm7l75ajnjy6kbg2157v2g5gfia3n47fc56ayryyp2jdvbgprwl";
 
   nativeBuildInputs = [ cmake ];
 
diff --git a/pkgs/development/compilers/llvm/10/lld.nix b/pkgs/development/compilers/llvm/10/lld.nix
index cea5ab3ee06e..6323866ae886 100644
--- a/pkgs/development/compilers/llvm/10/lld.nix
+++ b/pkgs/development/compilers/llvm/10/lld.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   pname = "lld";
   inherit version;
 
-  src = fetch pname "0z0a1h94hx0wj5289gvp99bvvj2ghid94xj2c5acmh1df8cx1vna";
+  src = fetch pname "1w9c9xmzbdnkwgal612hqz2lxj9jgqpfzxr2rllcspmf6v7arvf4";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ llvm libxml2 ];
diff --git a/pkgs/development/compilers/llvm/10/lldb.nix b/pkgs/development/compilers/llvm/10/lldb.nix
index 63df2d08454a..fd318314dea5 100644
--- a/pkgs/development/compilers/llvm/10/lldb.nix
+++ b/pkgs/development/compilers/llvm/10/lldb.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (rec {
   pname = "lldb";
   inherit version;
 
-  src = fetch pname "0nh26a4mxd54k5f9gpizr55vdalkzym2l82kvfh3lm8lvimypga1";
+  src = fetch pname "06qzh13cr20wrd5925698yq696bhl68zbvm7kjxp7c2rx5swxmg8";
 
   patches = [ ./lldb-procfs.patch ];
 
diff --git a/pkgs/development/compilers/llvm/10/llvm-extension-handling.patch b/pkgs/development/compilers/llvm/10/llvm-extension-handling.patch
new file mode 100644
index 000000000000..cf4b1eaacf7d
--- /dev/null
+++ b/pkgs/development/compilers/llvm/10/llvm-extension-handling.patch
@@ -0,0 +1,146 @@
+Compressed diff from
+```
+git show d21664cce1db8debe2528f36b1fbd2b8af9c9401 87dac7da68ea1e0adac78c59ef1891dcf9632b67 3a0f6e699bb6d96dc62dce6faef20ac26cf103fd
+```
+with the purpose of avoiding linker errors arising in the polly-flavoured clang.
+
+diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
+index a02c2a5a23f..faf8f561faa 100644
+--- llvm/CMakeLists.txt
++++ llvm/CMakeLists.txt
+@@ -1069,6 +1069,7 @@ endif()
+ # after all targets are created.
+ include(LLVMDistributionSupport)
+ llvm_distribution_add_targets()
++process_llvm_pass_plugins(GEN_CONFIG)
+ 
+ # This allows us to deploy the Universal CRT DLLs by passing -DCMAKE_INSTALL_UCRT_LIBRARIES=ON to CMake
+ if (MSVC AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows" AND CMAKE_INSTALL_UCRT_LIBRARIES)
+@@ -1093,5 +1094,3 @@ endif()
+ if (LLVM_INCLUDE_UTILS AND LLVM_INCLUDE_TOOLS)
+   add_subdirectory(utils/llvm-locstats)
+ endif()
+-
+-process_llvm_pass_plugins()
+diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
+index fd69786544a..8fbb33a22fd 100644
+--- llvm/cmake/modules/AddLLVM.cmake
++++ llvm/cmake/modules/AddLLVM.cmake
+@@ -884,53 +884,71 @@ function(add_llvm_pass_plugin name)
+     if (TARGET intrinsics_gen)
+       add_dependencies(obj.${name} intrinsics_gen)
+     endif()
+-    message(STATUS "Registering ${name} as a pass plugin (static build: ${LLVM_${name_upper}_LINK_INTO_TOOLS})")
+-    set_property(GLOBAL APPEND PROPERTY LLVM_COMPILE_EXTENSIONS ${name})
++    set_property(GLOBAL APPEND PROPERTY LLVM_STATIC_EXTENSIONS ${name})
+   elseif(NOT ARG_NO_MODULE)
+     add_llvm_library(${name} MODULE ${ARG_UNPARSED_ARGUMENTS})
+   else()
+     add_llvm_library(${name} OBJECT ${ARG_UNPARSED_ARGUMENTS})
+   endif()
++  message(STATUS "Registering ${name} as a pass plugin (static build: ${LLVM_${name_upper}_LINK_INTO_TOOLS})")
+ 
+ endfunction(add_llvm_pass_plugin)
+ 
+-# Generate X Macro file for extension handling. It provides a
+-# HANDLE_EXTENSION(extension_namespace, ExtensionProject) call for each extension
+-# allowing client code to define HANDLE_EXTENSION to have a specific code be run for
+-# each extension.
++# process_llvm_pass_plugins([GEN_CONFIG])
++#
++# Correctly set lib dependencies between plugins and tools, based on tools
++# registered with the ENABLE_PLUGINS option.
++#
++# if GEN_CONFIG option is set, also generate X Macro file for extension
++# handling. It provides a HANDLE_EXTENSION(extension_namespace, ExtensionProject)
++# call for each extension allowing client code to define
++# HANDLE_EXTENSION to have a specific code be run for each extension.
+ #
+-# Also correctly set lib dependencies between plugins and tools.
+ function(process_llvm_pass_plugins)
+-  get_property(LLVM_EXTENSIONS GLOBAL PROPERTY LLVM_COMPILE_EXTENSIONS)
+-  file(WRITE "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp" "//extension handlers\n")
+-  foreach(llvm_extension ${LLVM_EXTENSIONS})
+-    string(TOLOWER ${llvm_extension} llvm_extension_lower)
+-
+-    string(TOUPPER ${llvm_extension} llvm_extension_upper)
+-    string(SUBSTRING ${llvm_extension_upper} 0 1 llvm_extension_upper_first)
+-    string(SUBSTRING ${llvm_extension_lower} 1 -1 llvm_extension_lower_tail)
+-    string(CONCAT llvm_extension_project ${llvm_extension_upper_first} ${llvm_extension_lower_tail})
+-
+-    if(LLVM_${llvm_extension_upper}_LINK_INTO_TOOLS)
+-      file(APPEND "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp" "HANDLE_EXTENSION(${llvm_extension_project})\n")
+-
+-      get_property(llvm_plugin_targets GLOBAL PROPERTY LLVM_PLUGIN_TARGETS)
+-      foreach(llvm_plugin_target ${llvm_plugin_targets})
+-        set_property(TARGET ${llvm_plugin_target} APPEND PROPERTY LINK_LIBRARIES ${llvm_extension})
+-        set_property(TARGET ${llvm_plugin_target} APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${llvm_extension})
+-      endforeach()
+-    else()
+-      add_llvm_library(${llvm_extension_lower} MODULE obj.${llvm_extension_lower})
+-    endif()
++  cmake_parse_arguments(ARG
++      "GEN_CONFIG" "" ""
++    ${ARGN})
+ 
++  if(ARG_GEN_CONFIG)
++      get_property(LLVM_STATIC_EXTENSIONS GLOBAL PROPERTY LLVM_STATIC_EXTENSIONS)
++  else()
++      include(LLVMConfigExtensions)
++  endif()
++
++  # Add static plugins to each plugin target.
++  foreach(llvm_extension ${LLVM_STATIC_EXTENSIONS})
++    get_property(llvm_plugin_targets GLOBAL PROPERTY LLVM_PLUGIN_TARGETS)
++    foreach(llvm_plugin_target ${llvm_plugin_targets})
++      set_property(TARGET ${llvm_plugin_target} APPEND PROPERTY LINK_LIBRARIES ${llvm_extension})
++      set_property(TARGET ${llvm_plugin_target} APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${llvm_extension})
++    endforeach()
+   endforeach()
+-  file(APPEND "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp" "#undef HANDLE_EXTENSION\n")
+ 
+-  # only replace if there's an actual change
+-  execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
+-    "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp"
+-    "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def")
+-  file(REMOVE "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp")
++  # Eventually generate the extension header, and store config to a cmake file
++  # for usage in third-party configuration.
++  if(ARG_GEN_CONFIG)
++      set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
++      set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
++      file(WRITE
++          "${llvm_cmake_builddir}/LLVMConfigExtensions.cmake"
++          "set(LLVM_STATIC_EXTENSIONS ${LLVM_STATIC_EXTENSIONS})")
++      install(FILES
++          ${llvm_cmake_builddir}/LLVMConfigExtensions.cmake
++          DESTINATION ${LLVM_INSTALL_PACKAGE_DIR}
++          COMPONENT cmake-exports)
++
++      file(WRITE "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp" "//extension handlers\n")
++      foreach(llvm_extension ${LLVM_STATIC_EXTENSIONS})
++        file(APPEND "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp" "HANDLE_EXTENSION(${llvm_extension})\n")
++      endforeach()
++      file(APPEND "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp" "#undef HANDLE_EXTENSION\n")
++
++      # only replace if there's an actual change
++      execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
++        "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp"
++        "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def")
++      file(REMOVE "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def.tmp")
++  endif()
+ endfunction()
+ 
+ function(export_executable_symbols target)
+diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt
+index 9cf22b436fa..af757d6199a 100644
+--- llvm/cmake/modules/CMakeLists.txt
++++ llvm/cmake/modules/CMakeLists.txt
+@@ -136,6 +136,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
+     FILES_MATCHING PATTERN *.cmake
+     PATTERN .svn EXCLUDE
+     PATTERN LLVMConfig.cmake EXCLUDE
++    PATTERN LLVMConfigExtensions.cmake EXCLUDE
+     PATTERN LLVMConfigVersion.cmake EXCLUDE
+     PATTERN LLVM-Config.cmake EXCLUDE
+     PATTERN GetHostTriple.cmake EXCLUDE)
diff --git a/pkgs/development/compilers/llvm/10/llvm.nix b/pkgs/development/compilers/llvm/10/llvm.nix
index 4496b5abcf45..eb93d8648f9a 100644
--- a/pkgs/development/compilers/llvm/10/llvm.nix
+++ b/pkgs/development/compilers/llvm/10/llvm.nix
@@ -31,8 +31,8 @@ in stdenv.mkDerivation (rec {
   pname = "llvm";
   inherit version;
 
-  src = fetch pname "01azqqygm83s6l1g35kqkc7da06dkc8jxpb4zsd420lmhfhw4gws";
-  polly_src = fetch "polly" "00nvnh0jhi1s5gcyfnb30h9g2j18z79kipiy878bkawg53f4z2xf";
+  src = fetch pname "1pa322iwqg071gxdn5wxri263j6aki6ag36xbdzbyi3g8m8v8jci";
+  polly_src = fetch "polly" "0p9dmv4hxwx4f5k1v4r9b5jp7fbi71ajpmrv3xf3vmp6m4i3r0pc";
 
   unpackPhase = ''
     unpackFile $src
@@ -54,6 +54,11 @@ in stdenv.mkDerivation (rec {
 
   propagatedBuildInputs = [ ncurses zlib ];
 
+  patches = [
+    # 10.0.0rc3-only
+    ./llvm-extension-handling.patch
+  ];
+
   postPatch = optionalString stdenv.isDarwin ''
     substituteInPlace cmake/modules/AddLLVM.cmake \
       --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \
diff --git a/pkgs/development/compilers/llvm/10/openmp.nix b/pkgs/development/compilers/llvm/10/openmp.nix
index ff6d77c1bf64..cff2ad365360 100644
--- a/pkgs/development/compilers/llvm/10/openmp.nix
+++ b/pkgs/development/compilers/llvm/10/openmp.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   pname = "openmp";
   inherit version;
 
-  src = fetch pname "1fpvpsbrrpngm8zplhdbkhnk79mhfdf3xsw1rwcfcv564gilla3w";
+  src = fetch pname "0axdxar18rvk9r4yx7y55ywqr3070mixag9sg2fcck1jzwfgymjb";
 
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [ llvm ];

From b36d3f2c4a94a5e5002fb0647db5465e7c38668b Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Thu, 5 Mar 2020 23:57:36 +0100
Subject: [PATCH 2515/4636] appimage: replace writeScript to a standalone
 appimage-exec.sh

---
 pkgs/build-support/appimage/appimage-exec.sh  | 129 ++++++++++++++++++
 pkgs/build-support/appimage/default.nix       |  68 +++------
 .../appimage-run/appimage-exec.sh             |  43 ------
 .../appimage-run/default.nix                  |  28 +---
 4 files changed, 155 insertions(+), 113 deletions(-)
 create mode 100755 pkgs/build-support/appimage/appimage-exec.sh
 delete mode 100755 pkgs/tools/package-management/appimage-run/appimage-exec.sh

diff --git a/pkgs/build-support/appimage/appimage-exec.sh b/pkgs/build-support/appimage/appimage-exec.sh
new file mode 100755
index 000000000000..fd38889b9aa4
--- /dev/null
+++ b/pkgs/build-support/appimage/appimage-exec.sh
@@ -0,0 +1,129 @@
+#!@shell@
+if [ ! -z "$DEBUG" ] ; then
+  set -x
+fi
+
+export PATH=@path@
+
+# src : AppImage
+# dest : let's unpack() create the directory
+unpack() {
+  src=$1
+  out=$2
+
+  # https://github.com/AppImage/libappimage/blob/ca8d4b53bed5cbc0f3d0398e30806e0d3adeaaab/src/libappimage/utils/MagicBytesChecker.cpp#L45-L63
+  eval "$(r2 "$src" -nn -Nqc "p8j 3 @ 8" |
+    jq -r '{appimageSignature: (.[:-1]|implode), appimageType: .[-1]}|
+      @sh "appimageSignature=\(.appimageSignature) appimageType=\(.appimageType)"')"
+
+  # check AppImage signature
+  if [[ "$appimageSignature" != "AI" ]]; then
+    echo "Not an appimage."
+    exit -1
+  fi
+
+  case "$appimageType" in
+    1)  echo "Uncompress $(basename "$src") of Type: $appimageType."
+        mkdir "$out"
+        pv "$src" | bsdtar -x -C "$out" -f -
+        ;;
+
+    2)  echo "Uncompress $(basename "$src") of Type: $appimageType."
+        # This method avoid issues with non executable appimages,
+        # non-native packer, packer patching and squashfs-root destination prefix.
+
+        # multiarch offset one-liner using same method as AppImage
+        # see https://gist.github.com/probonopd/a490ba3401b5ef7b881d5e603fa20c93
+        offset=$(r2 "$src" -nn -Nqc "pfj.elf_header @ 0" |\
+          jq 'map({(.name): .value}) | add | .shoff + (.shnum * .shentsize)')
+
+        unsquashfs -q -d "$out" -o "$offset" "$src"
+        chmod go-w "$out"
+        ;;
+
+    # 3) get ready, https://github.com/TheAssassin/type3-runtime
+    *)  echo Unsupported AppImage Type: "$appimageType"
+        exit
+        ;;
+  esac
+  echo "$(basename "$src") is now installed in $out"
+}
+
+apprun() {
+
+  eval "$(rahash2 "$APPIMAGE" -j | jq -r '.[] | @sh "SHA256=\(.hash)"')"
+  echo sha256 = \"$SHA256\"\;
+  export APPDIR="${XDG_CACHE_HOME:-$HOME/.cache}/appimage-run/$SHA256"
+
+  #compatibility
+  if [ -x "$APPDIR/squashfs-root" ]; then APPDIR="$APPDIR/squashfs-root"; fi
+
+  if [ ! -x "$APPDIR" ]; then
+    mkdir -p $(dirname "$APPDIR")
+    unpack "$APPIMAGE" "$APPDIR"
+  fi
+
+  echo $(basename "$APPIMAGE") installed in "$APPDIR"
+
+  export PATH="$PATH:$PWD/usr/bin"
+  wrap
+}
+
+wrap() {
+
+  cd "$APPDIR"
+  # quite same in appimageTools
+  export APPIMAGE_SILENT_INSTALL=1
+
+  if [ -n "$APPIMAGE_DEBUG_EXEC" ]; then
+    exec "$APPIMAGE_DEBUG_EXEC"
+  fi
+
+  exec ./AppRun "$@"
+}
+
+usage() {
+  echo "Usage: appimage-run [appimage-run options] <AppImage> [AppImage options]";
+  echo
+  echo 'Options are passed on to the appimage.'
+  echo "If you want to execute a custom command in the appimage's environment, set the APPIMAGE_DEBUG_EXEC environment variable."
+  exit 1
+}
+
+while getopts ":a:d:xrw" option; do
+    case "${option}" in
+        a)  #AppImage file
+            # why realpath?
+            APPIMAGE="$(realpath "${OPTARG}")"
+            ;;
+        d)  #appimage Directory
+            export APPDIR=${OPTARG}
+            ;;
+        x)  # eXtract
+            unpack_opt=true
+            ;;
+        r)  # appimage-Run
+            apprun_opt=true
+            ;;
+        w)  # WrapAppImage
+            wrap_opt=true
+            ;;
+        *)
+            usage
+            ;;
+    esac
+done
+shift $((OPTIND-1))
+
+if [[ $unpack_opt = true ]] && [[ -f "$APPIMAGE" ]]; then
+  unpack "$APPIMAGE" "$APPDIR"
+  exit
+fi
+
+if [[ $apprun_opt = true ]] && [[ -f "$APPIMAGE" ]]; then
+  apprun
+fi
+
+if [[ $wrap_opt = true ]] && [[ -d "$APPDIR" ]]; then
+  wrap
+fi
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index c56aae4c599c..4df0f15d84d8 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -1,61 +1,35 @@
-{ stdenv, libarchive, radare2, jq, buildFHSUserEnv, squashfsTools, writeScript }:
+{ stdenv, buildFHSUserEnv, writeScript, pkgs
+, bash, radare2, jq, squashfsTools, ripgrep
+, coreutils, libarchive, file, runtimeShell, pv
+, lib, runCommand }:
 
 rec {
-
-  extract = { name, src }: stdenv.mkDerivation {
-    name = "${name}-extracted";
-    inherit src;
-    nativeBuildInputs = [ radare2 libarchive jq squashfsTools ];
-    buildCommand = ''
-      # https://github.com/AppImage/libappimage/blob/ca8d4b53bed5cbc0f3d0398e30806e0d3adeaaab/src/libappimage/utils/MagicBytesChecker.cpp#L45-L63
-      eval $(r2 $src -nn -Nqc "p8j 3 @ 8" |
-        jq -r '{appimageSignature: (.[:-1]|implode), appimageType: .[-1]}|
-          @sh "appimageSignature=\(.appimageSignature) appimageType=\(.appimageType)"')
-
-      # check AppImage signature
-      if [[ "$appimageSignature" != "AI" ]]; then
-        echo "Not an appimage."
-        exit
-      fi
-
-      case "$appimageType" in
-        1)
-          mkdir $out
-          bsdtar -x -C $out -f $src
-          ;;
-
-        2)
-          # multiarch offset one-liner using same method as AppImage
-          # see https://gist.github.com/probonopd/a490ba3401b5ef7b881d5e603fa20c93
-          offset=$(r2 $src -nn -Nqc "pfj.elf_header @ 0" |\
-            jq 'map({(.name): .value}) | add | .shoff + (.shnum * .shentsize)')
-
-          unsquashfs -q -d $out -o $offset $src
-          chmod go-w $out
-          ;;
-
-        # 3) get ready, https://github.com/TheAssassin/type3-runtime
-        *) echo "Unsupported AppImage Type: $appimageType";;
-      esac
-    '';
+  appimage-exec = pkgs.substituteAll {
+    src = ./appimage-exec.sh;
+    isExecutable = true;
+    dir = "bin";
+    path = with pkgs; lib.makeBinPath [ pv ripgrep file radare2 libarchive jq squashfsTools coreutils bash ];
   };
 
+  extract = { name, src }: runCommand "${name}-extracted" {
+    buildInputs = [ appimage-exec ];
+  } ''
+    appimage-exec.sh -x -d $out -a ${src}
+  '';
+
+  # for compatibility, deprecated
   extractType1 = extract;
   extractType2 = extract;
+  #wrapType2 = wrapAppImage;
+  #wrapType1 = wrapAppImage;
 
   wrapAppImage = args@{ name, src, extraPkgs, ... }: buildFHSUserEnv (defaultFhsEnvArgs // {
     inherit name;
 
-    targetPkgs = pkgs: defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs;
+    targetPkgs = pkgs: [ appimage-exec ]
+      ++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs;
 
-    runScript = writeScript "run" ''
-      #!${stdenv.shell}
-
-      export APPDIR=${src}
-      export APPIMAGE_SILENT_INSTALL=1
-      cd $APPDIR
-      exec ./AppRun "$@"
-    '';
+    runScript = "appimage-exec.sh -w -d ${src}";
   } // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage))));
 
   wrapType1 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // {
diff --git a/pkgs/tools/package-management/appimage-run/appimage-exec.sh b/pkgs/tools/package-management/appimage-run/appimage-exec.sh
deleted file mode 100755
index cdce727af4f3..000000000000
--- a/pkgs/tools/package-management/appimage-run/appimage-exec.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!@bash@/bin/bash
-if [ $# -eq 0 ]; then
-  echo "Usage: $0 FILE [OPTION...]"
-  echo
-  echo 'Options are passed on to the appimage.'
-  echo "If you want to execute a custom command in the appimage's environment, set the APPIMAGE_DEBUG_EXEC environment variable."
-  exit 1
-fi
-APPIMAGE="$(realpath "$1")"
-shift
-
-if [ ! -x "$APPIMAGE" ]; then
-  echo "fatal: $APPIMAGE is not executable"
-  exit 1
-fi
-
-SHA256="$(@coreutils@/bin/sha256sum "$APPIMAGE" | cut -d ' ' -f 1)"
-SQUASHFS_ROOT="''${XDG_CACHE_HOME:-$HOME/.cache}/appimage-run/$SHA256/"
-mkdir -p "$SQUASHFS_ROOT"
-
-export APPDIR="$SQUASHFS_ROOT/squashfs-root"
-if [ ! -x "$APPDIR" ]; then
-  cd "$SQUASHFS_ROOT"
-
-  if @file@/bin/file --mime-type --brief --keep-going "$APPIMAGE" | grep -q iso; then
-    # is type-1 appimage
-    mkdir "$APPDIR"
-    @libarchive@/bin/bsdtar -x -C "$APPDIR" -f "$APPIMAGE"
-  else
-    # is type-2 appimage
-    "$APPIMAGE" --appimage-extract 2>/dev/null
-  fi
-fi
-
-cd "$APPDIR"
-export PATH="$PATH:$PWD/usr/bin"
-export APPIMAGE_SILENT_INSTALL=1
-
-if [ -n "$APPIMAGE_DEBUG_EXEC" ]; then
-  exec "$APPIMAGE_DEBUG_EXEC"
-fi
-
-exec ./AppRun "$@"
diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix
index 3eeaa752f029..37d1afe28434 100644
--- a/pkgs/tools/package-management/appimage-run/default.nix
+++ b/pkgs/tools/package-management/appimage-run/default.nix
@@ -1,31 +1,13 @@
-{ buildFHSUserEnv, coreutils, file, libarchive, runtimeShell
-, extraPkgs ? pkgs: [], appimageTools, stdenv, bash }:
+{ appimageTools, buildFHSUserEnv, extraPkgs ? pkgs: [] }:
 
 let
 
-  name = "appimage-run";
-  version = "1.0";
   fhsArgs = appimageTools.defaultFhsEnvArgs;
 
-  appimage-exec = stdenv.mkDerivation {
-     #inherit pname version;
-     name = "appimage-exec";
-
-     inherit coreutils file libarchive bash;
-
-     buildCommand = ''
-       mkdir -p $out/bin/
-       substituteAll ${./appimage-exec.sh} $out/bin/appimage-exec.sh
-       chmod +x $out/bin/appimage-exec.sh
-    '';
-  };
-
 in buildFHSUserEnv (fhsArgs // {
-  inherit name;
+  name = "appimage-run";
 
-  targetPkgs = pkgs:
-    [ appimage-exec
-    ] ++ fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs;
-  #extraInstallCommands = '''';
-  runScript = "appimage-exec.sh";
+  targetPkgs = pkgs: [ appimageTools.appimage-exec ]
+    ++ fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs;
+  runScript = "appimage-exec.sh -r -a";
 })

From 877348836c17426549b6546617320137db11ec86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCtke-Stetzkamp?= <christian@lkamp.de>
Date: Sat, 7 Mar 2020 20:32:01 +0100
Subject: [PATCH 2516/4636] cvsq: 1.10 -> 1.11

---
 pkgs/applications/version-management/cvsq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/cvsq/default.nix b/pkgs/applications/version-management/cvsq/default.nix
index f9cabb94b978..c030d8b08784 100644
--- a/pkgs/applications/version-management/cvsq/default.nix
+++ b/pkgs/applications/version-management/cvsq/default.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cvsq";
-  version = "1.10";
+  version = "1.11";
 
   src = fetchurl {
     url = "http://www.linta.de/~aehlig/cvsq/cvsq-${version}.tgz";
-    sha256 = "1a2e5666d4d23f1eb673a505caeb771ac62a86ed69c9ab89c4e2696c2ccd0621";
+    sha256 = "0491k4skk3jyyd6plp2kcihmxxav9rsch7vd1yi697m2fqckp5ws";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 4a148470e4198edfc0039c7657466d97d98f0094 Mon Sep 17 00:00:00 2001
From: Mat Marini <mat@marini.ca>
Date: Sat, 7 Mar 2020 12:53:51 -0500
Subject: [PATCH 2517/4636] maintainers: add illiusdope

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e4947f4c74cd..00ae59df8585 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3096,6 +3096,12 @@
     githubId = 4401220;
     name = "Michael Eden";
   };
+  illiusdope = {
+    email = "mat@marini.ca";
+    github = "illiusdope";
+    gitHubId = 61913481;
+    name = "Mat Marini";
+  };
   ilya-fedin = {
     email = "fedin-ilja2010@ya.ru";
     github = "ilya-fedin";

From 0f9179137cb28622986a8726e909e02faa0963ce Mon Sep 17 00:00:00 2001
From: Mat Marini <mat@marini.ca>
Date: Sat, 7 Mar 2020 13:55:51 -0500
Subject: [PATCH 2518/4636] kubie: init at 0.7.1

---
 pkgs/development/tools/kubie/default.nix | 26 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/tools/kubie/default.nix

diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix
new file mode 100644
index 000000000000..cadaf8238b36
--- /dev/null
+++ b/pkgs/development/tools/kubie/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, rustPlatform, fetchFromGitHub }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  pname = "kubie";
+  version = "0.7.1";
+
+  src = fetchFromGitHub {
+    rev = "v${version}";
+    owner = "sbstp";
+    repo = "kubie";
+    sha256 = "0c94ggrkzyy8zl2z5r4pgfscyhcjp4x64k3bl2byqp3ysgjwkjqx";
+  };
+
+  cargoSha256 = "1lzyda838s9fmg8hibg2w2wszwyvvqsy20w9877skfcx370rvndi";
+
+  meta = with stdenv.lib; {
+    description =
+      "Shell independent context and namespace switcher for kubectl";
+    homepage = "https://github.com/sbstp/kubie";
+    license = with licenses; [ zlib ];
+    maintainers = with maintainers; [ illiusdope ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a00adec661d1..245e1279319a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10355,6 +10355,8 @@ in
 
   kubicorn = callPackage ../development/tools/kubicorn {  };
 
+  kubie = callPackage ../development/tools/kubie { };
+
   kustomize = callPackage ../development/tools/kustomize { };
 
   ktlint = callPackage ../development/tools/ktlint { };

From 01db31c4d7fac7885940d50957743f23758a0494 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 7 Mar 2020 20:56:37 +0100
Subject: [PATCH 2519/4636] signal-desktop: 1.32.0 -> 1.32.1

---
 .../networking/instant-messengers/signal-desktop/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index ce9c1327db37..3592665ef0b4 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -23,7 +23,7 @@ let
       else "");
 in stdenv.mkDerivation rec {
   pname = "signal-desktop";
-  version = "1.32.0"; # Please backport all updates to the stable channel.
+  version = "1.32.1"; # Please backport all updates to the stable channel.
   # All releases have a limited lifetime and "expire" 90 days after the release.
   # When releases "expire" the application becomes unusable until an update is
   # applied. The expiration date for the current release can be extracted with:
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "1ggblpw2xxhm78sqadswcv0314zagksj34z8pywjnr8h9zkcyiap";
+    sha256 = "0sfzz1z57l20prj2s8hdl8ip1hrlzb5fqnccqcfd101a6mjnp9i9";
   };
 
   nativeBuildInputs = [

From d5d648b0f6178dfe03d902bfaf94585b4f85bf7b Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 7 Mar 2020 15:17:27 -0500
Subject: [PATCH 2520/4636] ion: mark as broken

As noted in the comment, its Rust vendor directory no longer compiles. That
said, we can still compute the new `cargoSha256`, and the package fails in
precisely the same way.
---
 pkgs/shells/ion/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix
index 5886fdb5574d..c58302df2102 100644
--- a/pkgs/shells/ion/default.nix
+++ b/pkgs/shells/ion/default.nix
@@ -13,10 +13,7 @@ buildRustPackage rec {
     sha256 = "0i0acl5nw254mw8dbfmb4792rr71is98a5wg32yylfnlrk7zlf8z";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1hs01b1rhbpafxlhw661k907rznqhcgyng85njkb99bg4lxwxaap";
+  cargoSha256 = "0f266kygvw2id771g49s25qsbqb6a0gr1r0czkcj96n5r0wg8wrn";
 
   meta = with stdenv.lib; {
     description = "Modern system shell with simple (and powerful) syntax";
@@ -24,10 +21,12 @@ buildRustPackage rec {
     license = licenses.mit;
     maintainers = with maintainers; [ dywedir ];
     platforms = platforms.all;
-    broken = stdenv.isDarwin;
+    # This has not had a release since 2017, and no longer compiles with the
+    # latest Rust compiler.
+    broken = false;
   };
 
   passthru = {
-	  shellPath = "/bin/ion";
+    shellPath = "/bin/ion";
   };
 }

From 9044bdef6a6aa1e216518020b47516990a00d304 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 7 Mar 2020 15:22:11 -0500
Subject: [PATCH 2521/4636] heatseeker: 1.5.1 -> 1.7.1

The build is currently broken on master; upgrading fixes it.
---
 pkgs/tools/misc/heatseeker/default.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix
index d7944e55d325..22a7d8ec4a7d 100644
--- a/pkgs/tools/misc/heatseeker/default.nix
+++ b/pkgs/tools/misc/heatseeker/default.nix
@@ -1,22 +1,17 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
-with rustPlatform;
-
-buildRustPackage rec {
+rustPlatform.buildRustPackage rec {
   pname = "heatseeker";
-  version = "1.5.1";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "rschmitt";
     repo = "heatseeker";
     rev = "v${version}";
-    sha256 = "1fcrbjwnhcz71i70ppy0rcgk5crwwmbkm9nrk1kapvks33pv0az7";
+    sha256 = "1x7mdyf1m17s55f6yjdr1j510kb7a8f3zkd7lb2kzdc7nd3vgaxg";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0m3sxbz1iii31s30cnv1970i1mwfhl6gm19k8wv0n7zji30ayx07";
+  cargoSha256 = "0jnlcm7v29m4nc318qgf7r7jvs80s7n04fw83imm506vwr9rxbx9";
 
   # some tests require a tty, this variable turns them off for Travis CI,
   # which we can also make use of
@@ -24,7 +19,7 @@ buildRustPackage rec {
 
   meta = with stdenv.lib; {
     description = "A general-purpose fuzzy selector";
-    homepage = https://github.com/rschmitt/heatseeker;
+    homepage = "https://github.com/rschmitt/heatseeker";
     license = licenses.mit;
     maintainers = [ maintainers.michaelpj ];
     platforms = platforms.unix;

From a2514c22a8054b85b5123bf5a35891e7c2177ca4 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 7 Mar 2020 15:28:56 -0500
Subject: [PATCH 2522/4636] sit: mark as broken

Dependencies in the Cargo.lock fail to build due to mutable self borrows.
---
 pkgs/applications/version-management/sit/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix
index 0a1f4c72da6f..aa2cdfab82ac 100644
--- a/pkgs/applications/version-management/sit/default.nix
+++ b/pkgs/applications/version-management/sit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, cmake, libzip, gnupg, 
+{ stdenv, fetchFromGitHub, rustPlatform, cmake, libzip, gnupg,
   # Darwin
   libiconv, CoreFoundation, Security }:
 
@@ -20,10 +20,7 @@ rustPlatform.buildRustPackage rec {
     export HOME=$(mktemp -d)
   '';
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0kijx7s7zh6yisrsjz213h9x5jx43ixr44vy5rb3wwbn9dgsr528";
+  cargoSha256 = "092yfpr2svp1qy7xis1q0sdkbsjmmswmdwb0rklrc0yhydcsghp9";
 
   meta = with stdenv.lib; {
     description = "Serverless Information Tracker";
@@ -31,5 +28,8 @@ rustPlatform.buildRustPackage rec {
     license = with licenses; [ asl20 /* or */ mit ];
     maintainers = with maintainers; [ dywedir yrashk ];
     platforms = platforms.all;
+    # Upstream has not had a release in several years, and dependencies no
+    # longer compile with the latest Rust compiler.
+    broken = true;
   };
 }

From b33062005407bbcb7ea489a0a1171d40f6a6a442 Mon Sep 17 00:00:00 2001
From: Alvar <geistesk@users.noreply.github.com>
Date: Sat, 7 Mar 2020 20:30:23 +0000
Subject: [PATCH 2523/4636] golangci-lint: 1.23.7 -> 1.23.8 (#82010)

---
 pkgs/development/tools/golangci-lint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix
index 89d21b5cb5ae..36c3bde97afc 100644
--- a/pkgs/development/tools/golangci-lint/default.nix
+++ b/pkgs/development/tools/golangci-lint/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "golangci-lint";
-  version = "1.23.7";
+  version = "1.23.8";
 
   src = fetchFromGitHub {
     owner = "golangci";
     repo = "golangci-lint";
     rev = "v${version}";
-    sha256 = "1dcayxblim97hlgdx0wdlbj2jxvdqfk8912hz7ylb1007x7y5da5";
+    sha256 = "166pwgf86lkd277dq98vjry0ad0avrz12zxb9rfgbhl1z4ccwi1g";
   };
 
   modSha256 = "0sckz298bvkf4p4fdmsmza0zrj2s2pvc86qwg6i76vdh9yzvq5gx";

From 805e0680599736c9894e8bf26b6fae3fc3c12f73 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sat, 7 Mar 2020 12:17:19 -0500
Subject: [PATCH 2524/4636] eigen: fetch source from gitlab

---
 pkgs/development/libraries/eigen/2.0.nix     | 21 ++++++++++----------
 pkgs/development/libraries/eigen/default.nix | 20 +++++++++----------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/development/libraries/eigen/2.0.nix
index 015aeaed55ba..d15275719437 100644
--- a/pkgs/development/libraries/eigen/2.0.nix
+++ b/pkgs/development/libraries/eigen/2.0.nix
@@ -1,15 +1,14 @@
-{stdenv, fetchurl, cmake}:
+{ stdenv, fetchFromGitLab, cmake }:
 
-let
-  v = "2.0.17";
-in
-stdenv.mkDerivation {
-  name = "eigen-${v}";
+stdenv.mkDerivation rec {
+  pname = "eigen";
+  version = "2.0.17";
 
-  src = fetchurl {
-    url = "https://bitbucket.org/eigen/eigen/get/${v}.tar.bz2";
-    name = "eigen-${v}.tar.bz2";
-    sha256 = "0q4ry2pmdb9lvm0g92wi6s6qng3m9q73n5flwbkfcz1nxmbfhmbj";
+  src = fetchFromGitLab {
+    owner = "libeigen";
+    repo = "eigen";
+    rev = version;
+    sha256 = "0d4knrcz04pxmxaqs5r3wv092950kl1z9wsw87vdzi9kgvc6wl0b";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -17,7 +16,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
     license = licenses.lgpl3Plus;
-    homepage = http://eigen.tuxfamily.org ;
+    homepage = "https://eigen.tuxfamily.org";
     maintainers = with stdenv.lib.maintainers; [ sander raskin ];
     branch = "2";
     platforms = with stdenv.lib.platforms; unix;
diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index 63e2707917a5..3c6a5cc1ca65 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -1,16 +1,14 @@
-{stdenv, fetchurl, cmake}:
+{ stdenv, fetchFromGitLab, cmake }:
 
-let
-  version = "3.3.7";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "eigen";
-  inherit version;
+  version = "3.3.7";
 
-  src = fetchurl {
-    url = "https://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
-    name = "eigen-${version}.tar.gz";
-    sha256 = "1nnh0v82a5xibcjaph51mx06mxbllk77fvihnd5ba0kpl23yz13y";
+  src = fetchFromGitLab {
+    owner = "libeigen";
+    repo = "eigen";
+    rev = version;
+    sha256 = "1i3cvg8d70dk99fl3lrv3wqhfpdnm5kx01fl7r2bz46sk9bphwm1";
   };
 
   patches = [
@@ -22,7 +20,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
     license = licenses.lgpl3Plus;
-    homepage = http://eigen.tuxfamily.org ;
+    homepage = "https://eigen.tuxfamily.org";
     platforms = platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ sander raskin ];
     inherit version;

From db4ccde60dcb66dec6735e0af8f4b12239325216 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 4 Mar 2020 18:12:14 +0100
Subject: [PATCH 2525/4636] =?UTF-8?q?ocamlPackages.ppx=5Fimport:=201.5-3?=
 =?UTF-8?q?=20=E2=86=92=201.7.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Support for OCaml ≥ 4.08
---
 .../ocaml-modules/ppx_import/default.nix          | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix
index bdcc6568ffe7..f4977992759d 100644
--- a/pkgs/development/ocaml-modules/ppx_import/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_import/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildDunePackage, ocaml
+{ lib, fetchurl, buildDunePackage, ocaml
 , ounit, ppx_deriving, ppx_tools_versioned
 }:
 
@@ -8,24 +8,21 @@ else
 
 buildDunePackage rec {
   pname = "ppx_import";
-  version = "1.5-3";
+  version = "1.7.1";
 
-  src = fetchFromGitHub {
-    owner = "ocaml-ppx";
-    repo = "ppx_import";
-    rev = "bd627d5afee597589761d6fee30359300b5e1d80";
-    sha256 = "1f9bphif1izhyx72hvwpkd9kxi9lfvygaicy6nbxyp6qgc87z4nm";
+  src = fetchurl {
+    url = "https://github.com/ocaml-ppx/ppx_import/releases/download/v${version}/ppx_import-v${version}.tbz";
+    sha256 = "16dyxfb7syz659rqa7yq36ny5vzl7gkqd7f4m6qm2zkjc1gc8j4v";
   };
 
   buildInputs = [ ounit ppx_deriving ];
   propagatedBuildInputs = [ ppx_tools_versioned ];
 
   doCheck = true;
-  checkTarget = "test";
 
   meta = {
     description = "A syntax extension that allows to pull in types or signatures from other compiled interface files";
     license = lib.licenses.mit;
-    inherit (src.meta) homepage;
+    homepage = "https://github.com/ocaml-ppx/ppx_import";
   };
 }

From b848abe4c6cbb744d9464cfe8b9b06b026bb94c9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 7 Mar 2020 20:52:17 +0000
Subject: [PATCH 2526/4636] jdepend: 2.9.1 -> 2.10

---
 pkgs/development/tools/analysis/jdepend/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix
index 455ff7722fa9..c903833a731a 100644
--- a/pkgs/development/tools/analysis/jdepend/default.nix
+++ b/pkgs/development/tools/analysis/jdepend/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "jdepend";
-  version = "2.9.1";
+  version = "2.10";
 
   src = fetchFromGitHub {
     owner = "clarkware";
     repo = "jdepend";
     rev = version;
-    sha256 = "1sxkgj4k4dhg8vb772pvisyzb8x0gwvlfqqir30ma4zvz3rfz60p";
+    sha256 = "1lxf3j9vflky7a2py3i59q7cwd1zvjv2b88l3za39vc90s04dz6k";
   };
 
   nativeBuildInputs = [ ant jdk ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Traverses Java class file directories and generates design quality metrics for each Java package";
-    homepage = http://www.clarkware.com/software/JDepend.html;
+    homepage = "http://www.clarkware.com/software/JDepend.html";
     license = licenses.bsd3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ pSub ];

From 099b52dabf39101cac50d709819761a5e74f50c9 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 7 Mar 2020 15:50:29 -0500
Subject: [PATCH 2527/4636] amp: 0.6.1 -> 0.6.2

The build also happens to be broken on master; this fixes it, along with
upgrading the cargoSha256.
---
 pkgs/applications/editors/amp/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/amp/default.nix b/pkgs/applications/editors/amp/default.nix
index e4248e32447c..625a5d3c0abe 100644
--- a/pkgs/applications/editors/amp/default.nix
+++ b/pkgs/applications/editors/amp/default.nix
@@ -3,19 +3,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "amp";
-  version = "0.6.1";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "jmacdonald";
     repo = pname;
     rev = version;
-    sha256 = "0jhxyl27nwp7rp0lc3kic69g8x55d0azrwlwwhz3z74icqa8f03j";
+    sha256 = "0l1vpcfq6jrq2dkrmsa4ghwdpp7c54f46gz3n7nk0i41b12hnigw";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0rk5c8knx8swqzmj7wd18hq2h5ndkzvcbq4lzggpavkk01a8hlb1";
+  cargoSha256 = "09v991rl2w4c4jh7ga7q1lk6wyl2vr71j5cpniij8mcvszrz78qf";
 
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [ openssl python3 xorg.libxcb libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin

From c4c936f2f766e83263a519be924d48009bfd6cd3 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 8 Mar 2020 07:16:53 +1000
Subject: [PATCH 2528/4636] rkt: add CVEs

https://www.twistlock.com/labs-blog/breaking-out-of-coresos-rkt-3-new-cves/
---
 pkgs/applications/virtualization/rkt/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index fd0bd92faa60..bacd175197d5 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -69,5 +69,10 @@ in stdenv.mkDerivation rec {
     license = licenses.asl20;
     maintainers = with maintainers; [ ragge steveej ];
     platforms = [ "x86_64-linux" ];
+    knownVulnerabilities = [
+      "CVE-2019-10144: processes run with `rkt enter` are given all capabilities during stage 2"
+      "CVE-2019-10145: processes run with `rkt enter` do not have seccomp filtering during stage 2"
+      "CVE-2019-10147: processes run with `rkt enter` are not limited by cgroups during stage 2"
+    ];
   };
 }

From d985dc8e16445b88c2127f3d7abab92946b4b190 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 7 Mar 2020 21:25:02 +0000
Subject: [PATCH 2529/4636] libical: 3.0.7 -> 3.0.8

---
 pkgs/development/libraries/libical/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix
index 69c4b3aeb74e..cd802fde7786 100644
--- a/pkgs/development/libraries/libical/default.nix
+++ b/pkgs/development/libraries/libical/default.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libical";
-  version = "3.0.7";
+  version = "3.0.8";
 
   outputs = [ "out" "dev" ]; # "devdoc" ];
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     owner = "libical";
     repo = "libical";
     rev = "v${version}";
-    sha256 = "1ppf8jlpiclq3jprhx889y5lgf6lc2q4d8wy2zavzsxgnsqf67il";
+    sha256 = "0pkh74bfrgp1slv8wsv7lbmal2m7qkixwm5llpmfwaiv14njlp68";
   };
 
   nativeBuildInputs = [
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/libical/libical;
+    homepage = "https://github.com/libical/libical";
     description = "An Open Source implementation of the iCalendar protocols";
     license = licenses.mpl20;
     platforms = platforms.unix;

From 051637db0902cfc70d669258419be94060e177a3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 7 Mar 2020 21:36:50 +0000
Subject: [PATCH 2530/4636] libseccomp: 2.4.2 -> 2.4.3

---
 pkgs/development/libraries/libseccomp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix
index 08c276c4d558..f3816c2ef0c9 100644
--- a/pkgs/development/libraries/libseccomp/default.nix
+++ b/pkgs/development/libraries/libseccomp/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libseccomp";
-  version = "2.4.2";
+  version = "2.4.3";
 
   src = fetchurl {
     url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz";
-    sha256 = "0nsq81acrbkdr8zairxbwa33bj2a6126npp76b4srjl472sjfkxm";
+    sha256 = "07crwxqzvl5k2b90a47ii9wgvi09s9hsy5b5jddw9ylp351d25fg";
   };
 
   outputs = [ "out" "lib" "dev" "man" ];

From ae29c52db5a883136a2d5ff63c5861ce637d8aa8 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Thu, 5 Mar 2020 23:55:34 +0100
Subject: [PATCH 2531/4636] samba: 4.11.5 -> 4.12.0

- add support for liburing on linux
- remove backported patch
- move native build dependencies to nativeBuildInputs
---
 pkgs/servers/samba/4.x.nix | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 27139ed846c1..d24a9b9748aa 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -1,8 +1,8 @@
-{ lib, stdenv, fetchurl, fetchpatch, python, pkgconfig, perl, libxslt, docbook_xsl, rpcgen
+{ lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl, rpcgen
 , fixDarwinDylibNames
 , docbook_xml_dtd_42, readline
 , popt, iniparser, libbsd, libarchive, libiconv, gettext
-, krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs
+, krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, liburing, fam, libceph, glusterfs
 , gnutls, ncurses, libunwind, systemd, jansson, lmdb, gpgme, libuuid
 
 , enableLDAP ? false
@@ -20,11 +20,11 @@ with lib;
 
 stdenv.mkDerivation rec {
   pname = "samba";
-  version = "4.11.5";
+  version = "4.12.0";
 
   src = fetchurl {
     url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz";
-    sha256 = "0gyr773dl0krcra6pvyp8i9adj3r16ihrrm2b71c0974cbzrkqpk";
+    sha256 = "1zk5jqnkifkfi6ssn02bh2ih7vyw2nsr0angsd6kyg3xaq5bgh3f";
   };
 
   outputs = [ "out" "dev" "man" ];
@@ -34,20 +34,15 @@ stdenv.mkDerivation rec {
     ./patch-source3__libads__kerberos_keytab.c.patch
     ./4.x-no-persistent-install-dynconfig.patch
     ./4.x-fix-makeflags-parsing.patch
-    (fetchpatch {
-      name = "test-oLschema2ldif-fmemopen.patch";
-      url = "https://gitlab.com/samba-team/samba/commit/5e517e57c9d4d35e1042a49d3592652b05f0c45b.patch";
-      sha256 = "1bbldf794svsdvcbp649imghmj0jck7545d3k9xs953qkkgwkbxi";
-    })
   ];
 
-  nativeBuildInputs = optionals stdenv.isDarwin [ rpcgen fixDarwinDylibNames ];
+  nativeBuildInputs = [ pkgconfig perl perl.pkgs.ParseYapp libxslt docbook_xsl docbook_xml_dtd_42 ]
+  ++ optionals stdenv.isDarwin [ rpcgen fixDarwinDylibNames ];
 
   buildInputs = [
-    python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /*
-    docbook_xml_dtd_45 */ readline popt iniparser jansson
+    python readline popt iniparser jansson
     libbsd libarchive zlib fam libiconv gettext libunwind krb5Full gnutls
-  ] ++ optionals stdenv.isLinux [ libaio systemd ]
+  ] ++ optionals stdenv.isLinux [ libaio liburing systemd ]
     ++ optional enableLDAP openldap
     ++ optional (enablePrinting && stdenv.isLinux) cups
     ++ optional enableMDNS avahi

From 88b16119c1e33dc90275c5baff8146c0f35716f3 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 7 Mar 2020 23:03:28 +0100
Subject: [PATCH 2532/4636] wasm-bindgen-cli: 0.2.58 -> 0.2.59

---
 .../0001-Add-cargo.lock.patch                 | 1877 +++++++++--------
 .../tools/wasm-bindgen-cli/default.nix        |    6 +-
 2 files changed, 975 insertions(+), 908 deletions(-)

diff --git a/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch b/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch
index cd06dc30fbef..e30e9c3d7e5f 100644
--- a/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch
+++ b/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch
@@ -1,1215 +1,1360 @@
-From db555b49901f6f9175abaa8e4a6c4ea0253c0acb Mon Sep 17 00:00:00 2001
+From 792dcf4aef3144222e3fab9498bda620879664ab Mon Sep 17 00:00:00 2001
 From: Maximilian Bosch <maximilian@mbosch.me>
-Date: Tue, 7 Jan 2020 21:24:10 +0100
+Date: Sat, 7 Mar 2020 22:56:36 +0100
 Subject: [PATCH] Add cargo.lock
 
 ---
- Cargo.lock | 2365 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 2365 insertions(+)
+ Cargo.lock | 2432 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 2432 insertions(+)
  create mode 100644 Cargo.lock
 
 diff --git a/Cargo.lock b/Cargo.lock
 new file mode 100644
-index 00000000..852644b8
+index 00000000..2cd91628
 --- /dev/null
 +++ b/Cargo.lock
-@@ -0,0 +1,2365 @@
+@@ -0,0 +1,2432 @@
 +# This file is automatically @generated by Cargo.
 +# It is not intended for manual editing.
 +[[package]]
 +name = "add"
 +version = "0.1.0"
 +dependencies = [
-+ "wasm-bindgen 0.2.58",
++ "wasm-bindgen",
 +]
 +
 +[[package]]
 +name = "adler32"
 +version = "1.0.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
 +
 +[[package]]
 +name = "aho-corasick"
-+version = "0.7.6"
++version = "0.7.9"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d5e63fd144e18ba274ae7095c0197a870a7b9468abc801dd62f190d80817d2ec"
 +dependencies = [
-+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memchr",
++]
++
++[[package]]
++name = "ansi_term"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
++dependencies = [
++ "winapi",
 +]
 +
 +[[package]]
 +name = "anyhow"
 +version = "1.0.26"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7825f6833612eb2414095684fcf6c635becf3ce97fe48cf6421321e93bfbd53c"
 +
 +[[package]]
 +name = "arrayref"
-+version = "0.3.5"
++version = "0.3.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
 +
 +[[package]]
 +name = "arrayvec"
 +version = "0.5.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
 +
 +[[package]]
 +name = "ascii"
 +version = "0.8.7"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "97be891acc47ca214468e09425d02cef3af2c94d0d82081cd02061f996802f14"
 +
 +[[package]]
 +name = "askama"
 +version = "0.7.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "eed81479263c8753e06f4981f5a313b3fe6cbff30c3ff8d9ae15ef0c72d93fb5"
 +dependencies = [
-+ "askama_derive 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "askama_shared 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "askama_derive",
++ "askama_shared",
 +]
 +
 +[[package]]
 +name = "askama_derive"
 +version = "0.7.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "46580c08e5520afadc6e9064759e15fc743489a4db78f9c751113e3d32a1e083"
 +dependencies = [
-+ "askama_shared 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
++ "askama_shared",
++ "nom 4.2.3",
++ "proc-macro2 0.4.30",
++ "quote 0.6.13",
++ "syn 0.15.44",
 +]
 +
 +[[package]]
 +name = "askama_shared"
 +version = "0.7.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "64509fd5c2fa767fa7ea973b732c61f0b8d30d1adf084e5164523e51a5e35d71"
 +dependencies = [
-+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.11",
++ "serde",
++ "serde_derive",
++ "toml 0.4.10",
 +]
 +
 +[[package]]
 +name = "assert_cmd"
 +version = "0.11.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2dc477793bd82ec39799b6f6b3df64938532fdf2ab0d49ef817eac65856a5a1e"
 +dependencies = [
-+ "escargot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "escargot",
++ "predicates",
++ "predicates-core",
++ "predicates-tree",
 +]
 +
 +[[package]]
 +name = "atty"
 +version = "0.2.14"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 +dependencies = [
-+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "hermit-abi",
++ "libc",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "autocfg"
 +version = "0.1.7"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 +
 +[[package]]
-+name = "backtrace"
-+version = "0.3.40"
++name = "autocfg"
++version = "1.0.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "backtrace-sys"
-+version = "0.1.32"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
++checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
 +
 +[[package]]
 +name = "base64"
 +version = "0.9.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
 +dependencies = [
-+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "byteorder",
++ "safemem",
 +]
 +
 +[[package]]
 +name = "base64"
-+version = "0.10.1"
++version = "0.11.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
++checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
 +
 +[[package]]
 +name = "bitflags"
 +version = "0.7.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
 +
 +[[package]]
 +name = "bitflags"
 +version = "1.2.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 +
 +[[package]]
 +name = "blake2b_simd"
 +version = "0.5.10"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
 +dependencies = [
-+ "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "arrayref",
++ "arrayvec",
++ "constant_time_eq",
 +]
 +
 +[[package]]
 +name = "buf_redux"
 +version = "0.8.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f"
 +dependencies = [
-+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memchr",
++ "safemem",
 +]
 +
 +[[package]]
 +name = "bumpalo"
-+version = "3.1.2"
++version = "3.2.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1f359dc14ff8911330a51ef78022d376f25ed00248912803b58f00cb1c27f742"
 +
 +[[package]]
 +name = "byteorder"
-+version = "1.3.2"
++version = "1.3.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
 +
 +[[package]]
 +name = "c2-chacha"
 +version = "0.2.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
 +dependencies = [
-+ "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ppv-lite86",
 +]
 +
 +[[package]]
 +name = "canvas"
 +version = "0.1.0"
 +dependencies = [
-+ "js-sys 0.3.35",
-+ "wasm-bindgen 0.2.58",
-+ "web-sys 0.3.35",
++ "js-sys",
++ "wasm-bindgen",
++ "web-sys",
 +]
 +
 +[[package]]
 +name = "cc"
-+version = "1.0.49"
++version = "1.0.50"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
 +
 +[[package]]
 +name = "cfg-if"
 +version = "0.1.10"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 +
 +[[package]]
 +name = "char"
 +version = "0.1.0"
 +dependencies = [
-+ "wasm-bindgen 0.2.58",
++ "wasm-bindgen",
 +]
 +
 +[[package]]
 +name = "chrono"
-+version = "0.4.10"
++version = "0.4.11"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2"
 +dependencies = [
-+ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-integer",
++ "num-traits 0.2.11",
++ "time",
 +]
 +
 +[[package]]
 +name = "chunked_transfer"
 +version = "0.3.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87"
++
++[[package]]
++name = "clap"
++version = "2.33.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
++dependencies = [
++ "ansi_term",
++ "atty",
++ "bitflags 1.2.1",
++ "strsim 0.8.0",
++ "textwrap",
++ "unicode-width",
++ "vec_map",
++]
 +
 +[[package]]
 +name = "closures"
 +version = "0.1.0"
 +dependencies = [
-+ "js-sys 0.3.35",
-+ "wasm-bindgen 0.2.58",
-+ "web-sys 0.3.35",
++ "js-sys",
++ "wasm-bindgen",
++ "web-sys",
 +]
 +
 +[[package]]
 +name = "cloudabi"
 +version = "0.0.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
 +dependencies = [
-+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.2.1",
 +]
 +
 +[[package]]
 +name = "color_quant"
 +version = "1.0.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd"
 +
 +[[package]]
 +name = "console_error_panic_hook"
 +version = "0.1.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
 +dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-bindgen 0.2.58",
++ "cfg-if",
++ "wasm-bindgen",
 +]
 +
 +[[package]]
 +name = "console_log"
 +version = "0.1.0"
 +dependencies = [
-+ "wasm-bindgen 0.2.58",
-+ "web-sys 0.3.35",
++ "wasm-bindgen",
++ "web-sys",
 +]
 +
 +[[package]]
 +name = "constant_time_eq"
-+version = "0.1.4"
++version = "0.1.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 +
 +[[package]]
 +name = "crossbeam-deque"
-+version = "0.7.2"
++version = "0.7.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
 +dependencies = [
-+ "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-epoch",
++ "crossbeam-utils",
++ "maybe-uninit",
 +]
 +
 +[[package]]
 +name = "crossbeam-epoch"
-+version = "0.8.0"
++version = "0.8.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
 +dependencies = [
-+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 1.0.0",
++ "cfg-if",
++ "crossbeam-utils",
++ "lazy_static",
++ "maybe-uninit",
++ "memoffset",
++ "scopeguard",
 +]
 +
 +[[package]]
 +name = "crossbeam-queue"
 +version = "0.2.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db"
 +dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if",
++ "crossbeam-utils",
 +]
 +
 +[[package]]
 +name = "crossbeam-utils"
-+version = "0.6.6"
++version = "0.7.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
 +dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "crossbeam-utils"
-+version = "0.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 1.0.0",
++ "cfg-if",
++ "lazy_static",
 +]
 +
 +[[package]]
 +name = "curl"
-+version = "0.4.25"
++version = "0.4.26"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ecb534fed9060d04bccaa8b8e1e2d3d5a0d7a9ec6d9c667691c80a3c6b7d19ef"
 +dependencies = [
-+ "curl-sys 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "curl-sys",
++ "libc",
++ "openssl-probe",
++ "openssl-sys",
++ "schannel",
++ "socket2",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "curl-sys"
-+version = "0.4.24"
++version = "0.4.28+curl-7.69.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e2c6b7fa5d36aa192e410788b77af65f339af24c8786419e8b48173689a484bf"
 +dependencies = [
-+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc",
++ "libc",
++ "libz-sys",
++ "openssl-sys",
++ "pkg-config",
++ "vcpkg",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "deflate"
 +version = "0.7.20"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4"
 +dependencies = [
-+ "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "adler32",
++ "byteorder",
 +]
 +
 +[[package]]
 +name = "diff"
 +version = "0.1.12"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
 +
 +[[package]]
 +name = "difference"
 +version = "2.0.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
 +
 +[[package]]
 +name = "dirs"
 +version = "1.0.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
 +dependencies = [
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc",
++ "redox_users",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "docopt"
 +version = "1.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969"
 +dependencies = [
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "strsim 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static",
++ "regex",
++ "serde",
++ "strsim 0.9.3",
 +]
 +
 +[[package]]
 +name = "dom"
 +version = "0.1.0"
 +dependencies = [
-+ "wasm-bindgen 0.2.58",
-+ "web-sys 0.3.35",
++ "wasm-bindgen",
++ "web-sys",
 +]
 +
 +[[package]]
 +name = "either"
 +version = "1.5.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
 +
 +[[package]]
 +name = "enum_primitive"
 +version = "0.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180"
 +dependencies = [
-+ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.1.43",
 +]
 +
 +[[package]]
 +name = "env_logger"
 +version = "0.7.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
 +dependencies = [
-+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "atty",
++ "humantime",
++ "log 0.4.8",
++ "regex",
++ "termcolor",
 +]
 +
 +[[package]]
 +name = "escargot"
 +version = "0.4.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ceb9adbf9874d5d028b5e4c5739d22b71988252b25c9c98fe7cf9738bee84597"
 +dependencies = [
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "failure"
-+version = "0.1.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "failure_derive"
-+version = "0.1.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static",
++ "log 0.4.8",
++ "serde",
++ "serde_json",
 +]
 +
 +[[package]]
 +name = "fetch"
 +version = "0.1.0"
 +dependencies = [
-+ "js-sys 0.3.35",
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-bindgen 0.2.58",
-+ "wasm-bindgen-futures 0.4.8",
-+ "web-sys 0.3.35",
++ "js-sys",
++ "serde",
++ "serde_derive",
++ "wasm-bindgen",
++ "wasm-bindgen-futures",
++ "web-sys",
 +]
 +
 +[[package]]
 +name = "filetime"
 +version = "0.2.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d"
 +dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if",
++ "libc",
++ "redox_syscall",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "float-cmp"
-+version = "0.5.3"
++version = "0.6.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "da62c4f1b81918835a8c6a484a397775fff5953fe83529afd51b05f5c6a6617d"
 +dependencies = [
-+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.11",
 +]
 +
 +[[package]]
 +name = "foreign-types"
 +version = "0.3.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
 +dependencies = [
-+ "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "foreign-types-shared",
 +]
 +
 +[[package]]
 +name = "foreign-types-shared"
 +version = "0.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 +
 +[[package]]
 +name = "fuchsia-cprng"
 +version = "0.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 +
 +[[package]]
 +name = "futures-channel-preview"
 +version = "0.3.0-alpha.19"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d5e5f4df964fa9c1c2f8bddeb5c3611631cacd93baf810fc8bb2fb4b495c263a"
 +dependencies = [
-+ "futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
++ "futures-core-preview",
 +]
 +
 +[[package]]
 +name = "futures-core-preview"
 +version = "0.3.0-alpha.19"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a"
 +
 +[[package]]
 +name = "getrandom"
 +version = "0.1.14"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
 +dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if",
++ "libc",
++ "wasi",
 +]
 +
 +[[package]]
 +name = "gif"
 +version = "0.9.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e2e41945ba23db3bf51b24756d73d81acb4f28d85c3dccc32c6fae904438c25f"
 +dependencies = [
-+ "color_quant 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "color_quant",
++ "lzw",
 +]
 +
 +[[package]]
 +name = "glob"
 +version = "0.3.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
 +
 +[[package]]
 +name = "guide-supported-types-examples"
 +version = "0.1.0"
 +dependencies = [
-+ "wasm-bindgen 0.2.58",
++ "wasm-bindgen",
 +]
 +
 +[[package]]
 +name = "heck"
 +version = "0.3.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
 +dependencies = [
-+ "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-segmentation",
 +]
 +
 +[[package]]
 +name = "hello_world"
 +version = "0.1.0"
 +dependencies = [
-+ "wasm-bindgen 0.2.58",
++ "wasm-bindgen",
 +]
 +
 +[[package]]
 +name = "hermit-abi"
-+version = "0.1.6"
++version = "0.1.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1010591b26bbfe835e9faeabeb11866061cc7dcebffd56ad7d0942d0e61aefd8"
 +dependencies = [
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc",
 +]
 +
 +[[package]]
 +name = "httparse"
 +version = "1.3.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
 +
 +[[package]]
 +name = "humantime"
 +version = "1.3.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
 +dependencies = [
-+ "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quick-error",
 +]
 +
 +[[package]]
 +name = "id-arena"
 +version = "2.2.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005"
 +dependencies = [
-+ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rayon",
 +]
 +
 +[[package]]
 +name = "idna"
 +version = "0.1.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
 +dependencies = [
-+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "matches",
++ "unicode-bidi",
++ "unicode-normalization",
 +]
 +
 +[[package]]
 +name = "image"
 +version = "0.12.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d95816db758249fe16f23a4e23f1a3a817fe11892dbfd1c5836f625324702158"
 +dependencies = [
-+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "gif 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "jpeg-decoder 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-rational 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "png 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "byteorder",
++ "enum_primitive",
++ "gif",
++ "jpeg-decoder",
++ "num-iter",
++ "num-rational",
++ "num-traits 0.1.43",
++ "png",
++ "scoped_threadpool",
 +]
 +
 +[[package]]
 +name = "import_js"
 +version = "0.1.0"
 +dependencies = [
-+ "wasm-bindgen 0.2.58",
++ "wasm-bindgen",
 +]
 +
 +[[package]]
 +name = "inflate"
 +version = "0.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e7e0062d2dc2f17d2f13750d95316ae8a2ff909af0fda957084f5defd87c43bb"
 +
 +[[package]]
 +name = "itoa"
-+version = "0.4.4"
++version = "0.4.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
 +
 +[[package]]
 +name = "jpeg-decoder"
 +version = "0.1.18"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0256f0aec7352539102a9efbcb75543227b7ab1117e0f95450023af730128451"
 +dependencies = [
-+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "byteorder",
++ "rayon",
 +]
 +
 +[[package]]
 +name = "js-sys"
-+version = "0.3.35"
++version = "0.3.36"
 +dependencies = [
-+ "wasm-bindgen 0.2.58",
-+ "wasm-bindgen-futures 0.4.8",
-+ "wasm-bindgen-test 0.3.8",
++ "wasm-bindgen",
++ "wasm-bindgen-futures",
++ "wasm-bindgen-test",
 +]
 +
 +[[package]]
 +name = "julia_set"
 +version = "0.1.0"
 +dependencies = [
-+ "wasm-bindgen 0.2.58",
-+ "web-sys 0.3.35",
++ "wasm-bindgen",
++ "web-sys",
 +]
 +
 +[[package]]
 +name = "lazy_static"
 +version = "1.4.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 +
 +[[package]]
 +name = "leb128"
 +version = "0.2.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a"
 +
 +[[package]]
 +name = "libc"
-+version = "0.2.66"
++version = "0.2.67"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "eb147597cdf94ed43ab7a9038716637d2d1bf2bc571da995d0028dec06bd3018"
 +
 +[[package]]
 +name = "libz-sys"
 +version = "1.0.25"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
 +dependencies = [
-+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc",
++ "libc",
++ "pkg-config",
++ "vcpkg",
 +]
 +
 +[[package]]
 +name = "log"
 +version = "0.3.9"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
 +dependencies = [
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.4.8",
 +]
 +
 +[[package]]
 +name = "log"
 +version = "0.4.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
 +dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if",
 +]
 +
 +[[package]]
 +name = "lzw"
 +version = "0.10.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084"
 +
 +[[package]]
 +name = "matches"
 +version = "0.1.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
++
++[[package]]
++name = "maybe-uninit"
++version = "2.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
 +
 +[[package]]
 +name = "memchr"
-+version = "2.2.1"
++version = "2.3.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
 +
 +[[package]]
 +name = "memoffset"
 +version = "0.5.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
 +dependencies = [
-+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rustc_version",
 +]
 +
 +[[package]]
 +name = "mime"
 +version = "0.2.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
 +dependencies = [
-+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "log 0.3.9",
 +]
 +
 +[[package]]
 +name = "mime_guess"
-+version = "1.8.7"
++version = "1.8.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "216929a5ee4dd316b1702eedf5e74548c123d370f47841ceaac38ca154690ca3"
 +dependencies = [
-+ "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "mime",
++ "phf",
++ "phf_codegen",
++ "unicase",
 +]
 +
 +[[package]]
 +name = "multipart"
 +version = "0.15.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "adba94490a79baf2d6a23eac897157047008272fa3eecb3373ae6377b91eca28"
 +dependencies = [
-+ "buf_redux 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "twoway 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "buf_redux",
++ "httparse",
++ "log 0.4.8",
++ "mime",
++ "mime_guess",
++ "quick-error",
++ "rand 0.4.6",
++ "safemem",
++ "tempdir",
++ "twoway",
 +]
 +
 +[[package]]
 +name = "no-std"
 +version = "0.1.0"
 +dependencies = [
-+ "wasm-bindgen 0.2.58",
++ "wasm-bindgen",
 +]
 +
 +[[package]]
 +name = "nom"
 +version = "4.2.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
 +dependencies = [
-+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memchr",
++ "version_check 0.1.5",
++]
++
++[[package]]
++name = "nom"
++version = "5.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0b471253da97532da4b61552249c521e01e736071f71c1a4f7ebbfbf0a06aad6"
++dependencies = [
++ "memchr",
++ "version_check 0.9.1",
 +]
 +
 +[[package]]
 +name = "normalize-line-endings"
-+version = "0.2.2"
++version = "0.3.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
 +
 +[[package]]
 +name = "num-integer"
-+version = "0.1.41"
++version = "0.1.42"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba"
 +dependencies = [
-+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 1.0.0",
++ "num-traits 0.2.11",
 +]
 +
 +[[package]]
 +name = "num-iter"
-+version = "0.1.39"
++version = "0.1.40"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dfb0800a0291891dd9f4fe7bd9c19384f98f7fbe0cd0f39a2c6b88b9868bbc00"
 +dependencies = [
-+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 1.0.0",
++ "num-integer",
++ "num-traits 0.2.11",
 +]
 +
 +[[package]]
 +name = "num-rational"
 +version = "0.1.42"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e"
 +dependencies = [
-+ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-integer",
++ "num-traits 0.2.11",
 +]
 +
 +[[package]]
 +name = "num-traits"
 +version = "0.1.43"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
 +dependencies = [
-+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits 0.2.11",
 +]
 +
 +[[package]]
 +name = "num-traits"
-+version = "0.2.10"
++version = "0.2.11"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
 +dependencies = [
-+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 1.0.0",
 +]
 +
 +[[package]]
 +name = "num_cpus"
-+version = "1.11.1"
++version = "1.12.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6"
 +dependencies = [
-+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
++ "hermit-abi",
++ "libc",
 +]
 +
 +[[package]]
 +name = "openssl"
-+version = "0.10.26"
++version = "0.10.28"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "973293749822d7dd6370d6da1e523b0d1db19f06c459134c658b2a4261378b52"
 +dependencies = [
-+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 1.2.1",
++ "cfg-if",
++ "foreign-types",
++ "lazy_static",
++ "libc",
++ "openssl-sys",
 +]
 +
 +[[package]]
 +name = "openssl-probe"
 +version = "0.1.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
 +
 +[[package]]
 +name = "openssl-src"
 +version = "111.6.1+1.1.1d"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c91b04cb43c1a8a90e934e0cd612e2a5715d976d2d6cff4490278a0cddf35005"
 +dependencies = [
-+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cc",
 +]
 +
 +[[package]]
 +name = "openssl-sys"
-+version = "0.9.53"
++version = "0.9.54"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986"
 +dependencies = [
-+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-src 111.6.1+1.1.1d (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 1.0.0",
++ "cc",
++ "libc",
++ "openssl-src",
++ "pkg-config",
++ "vcpkg",
 +]
 +
 +[[package]]
 +name = "percent-encoding"
 +version = "1.0.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
 +
 +[[package]]
 +name = "performance"
 +version = "0.1.0"
 +dependencies = [
-+ "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-bindgen 0.2.58",
-+ "web-sys 0.3.35",
++ "humantime",
++ "wasm-bindgen",
++ "web-sys",
 +]
 +
 +[[package]]
 +name = "phf"
 +version = "0.7.24"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
 +dependencies = [
-+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
++ "phf_shared",
 +]
 +
 +[[package]]
 +name = "phf_codegen"
 +version = "0.7.24"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
 +dependencies = [
-+ "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
++ "phf_generator",
++ "phf_shared",
 +]
 +
 +[[package]]
 +name = "phf_generator"
 +version = "0.7.24"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
 +dependencies = [
-+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "phf_shared",
++ "rand 0.6.5",
 +]
 +
 +[[package]]
 +name = "phf_shared"
 +version = "0.7.24"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
 +dependencies = [
-+ "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "siphasher",
++ "unicase",
 +]
 +
 +[[package]]
 +name = "pkg-config"
 +version = "0.3.17"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
 +
 +[[package]]
 +name = "png"
 +version = "0.6.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3cb773e9a557edb568ce9935cf783e3cdcabe06a9449d41b3e5506d88e582c82"
 +dependencies = [
-+ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "inflate 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags 0.7.0",
++ "deflate",
++ "inflate",
++ "num-iter",
 +]
 +
 +[[package]]
 +name = "ppv-lite86"
 +version = "0.2.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
 +
 +[[package]]
 +name = "predicates"
-+version = "1.0.2"
++version = "1.0.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "347a1b6f0b21e636bc9872fb60b83b8e185f6f5516298b8238699f7f9a531030"
 +dependencies = [
-+ "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "float-cmp 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "normalize-line-endings 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "difference",
++ "float-cmp",
++ "normalize-line-endings",
++ "predicates-core",
++ "regex",
 +]
 +
 +[[package]]
 +name = "predicates-core"
 +version = "1.0.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178"
 +
 +[[package]]
 +name = "predicates-tree"
 +version = "1.0.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124"
 +dependencies = [
-+ "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "predicates-core",
++ "treeline",
++]
++
++[[package]]
++name = "proc-macro-error"
++version = "0.4.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e7959c6467d962050d639361f7703b2051c43036d03493c36f01d440fdd3138a"
++dependencies = [
++ "proc-macro-error-attr",
++ "proc-macro2 1.0.9",
++ "quote 1.0.3",
++ "syn 1.0.16",
++ "version_check 0.9.1",
++]
++
++[[package]]
++name = "proc-macro-error-attr"
++version = "0.4.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e4002d9f55991d5e019fb940a90e1a95eb80c24e77cb2462dd4dc869604d543a"
++dependencies = [
++ "proc-macro2 1.0.9",
++ "quote 1.0.3",
++ "syn 1.0.16",
++ "syn-mid",
++ "version_check 0.9.1",
 +]
 +
 +[[package]]
 +name = "proc-macro2"
 +version = "0.4.30"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
 +dependencies = [
-+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid 0.1.0",
 +]
 +
 +[[package]]
 +name = "proc-macro2"
-+version = "1.0.7"
++version = "1.0.9"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435"
 +dependencies = [
-+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid 0.2.0",
 +]
 +
 +[[package]]
 +name = "quick-error"
 +version = "1.2.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 +
 +[[package]]
 +name = "quote"
 +version = "0.6.13"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
 +dependencies = [
-+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 0.4.30",
 +]
 +
 +[[package]]
 +name = "quote"
-+version = "1.0.2"
++version = "1.0.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"
 +dependencies = [
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.9",
 +]
 +
 +[[package]]
 +name = "rand"
 +version = "0.4.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
 +dependencies = [
-+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "fuchsia-cprng",
++ "libc",
++ "rand_core 0.3.1",
++ "rdrand",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "rand"
 +version = "0.5.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
 +dependencies = [
-+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cloudabi",
++ "fuchsia-cprng",
++ "libc",
++ "rand_core 0.3.1",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "rand"
 +version = "0.6.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
 +dependencies = [
-+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.7",
++ "libc",
++ "rand_chacha 0.1.1",
++ "rand_core 0.4.2",
++ "rand_hc 0.1.0",
++ "rand_isaac",
++ "rand_jitter",
++ "rand_os",
++ "rand_pcg",
++ "rand_xorshift",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "rand"
-+version = "0.7.2"
++version = "0.7.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 +dependencies = [
-+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "getrandom",
++ "libc",
++ "rand_chacha 0.2.1",
++ "rand_core 0.5.1",
++ "rand_hc 0.2.0",
 +]
 +
 +[[package]]
 +name = "rand_chacha"
 +version = "0.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
 +dependencies = [
-+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.7",
++ "rand_core 0.3.1",
 +]
 +
 +[[package]]
 +name = "rand_chacha"
 +version = "0.2.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
 +dependencies = [
-+ "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "c2-chacha",
++ "rand_core 0.5.1",
 +]
 +
 +[[package]]
 +name = "rand_core"
 +version = "0.3.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
 +dependencies = [
-+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.4.2",
 +]
 +
 +[[package]]
 +name = "rand_core"
 +version = "0.4.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
 +
 +[[package]]
 +name = "rand_core"
 +version = "0.5.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
 +dependencies = [
-+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
++ "getrandom",
 +]
 +
 +[[package]]
 +name = "rand_hc"
 +version = "0.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
 +dependencies = [
-+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.3.1",
 +]
 +
 +[[package]]
 +name = "rand_hc"
 +version = "0.2.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
 +dependencies = [
-+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.5.1",
 +]
 +
 +[[package]]
 +name = "rand_isaac"
 +version = "0.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
 +dependencies = [
-+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.3.1",
 +]
 +
 +[[package]]
 +name = "rand_jitter"
 +version = "0.1.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
 +dependencies = [
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc",
++ "rand_core 0.4.2",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "rand_os"
 +version = "0.1.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
 +dependencies = [
-+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cloudabi",
++ "fuchsia-cprng",
++ "libc",
++ "rand_core 0.4.2",
++ "rdrand",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "rand_pcg"
 +version = "0.1.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
 +dependencies = [
-+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg 0.1.7",
++ "rand_core 0.4.2",
 +]
 +
 +[[package]]
 +name = "rand_xorshift"
 +version = "0.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
 +dependencies = [
-+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.3.1",
 +]
 +
 +[[package]]
 +name = "rayon"
 +version = "1.3.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098"
 +dependencies = [
-+ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-deque",
++ "either",
++ "rayon-core",
 +]
 +
 +[[package]]
 +name = "rayon-core"
 +version = "1.7.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9"
 +dependencies = [
-+ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "crossbeam-deque",
++ "crossbeam-queue",
++ "crossbeam-utils",
++ "lazy_static",
++ "num_cpus",
 +]
 +
 +[[package]]
 +name = "raytrace-parallel"
 +version = "0.1.0"
 +dependencies = [
-+ "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "futures-channel-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "js-sys 0.3.35",
-+ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "raytracer 0.1.0 (git+https://github.com/alexcrichton/raytracer?branch=update-deps)",
-+ "wasm-bindgen 0.2.58",
-+ "wasm-bindgen-futures 0.4.8",
-+ "web-sys 0.3.35",
++ "console_error_panic_hook",
++ "futures-channel-preview",
++ "js-sys",
++ "rayon",
++ "rayon-core",
++ "raytracer",
++ "wasm-bindgen",
++ "wasm-bindgen-futures",
++ "web-sys",
 +]
 +
 +[[package]]
@@ -1217,1168 +1362,1090 @@ index 00000000..852644b8
 +version = "0.1.0"
 +source = "git+https://github.com/alexcrichton/raytracer?branch=update-deps#42faa13859f7d8d47fd18be785c108003a207786"
 +dependencies = [
-+ "image 0.12.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
++ "image",
++ "serde",
++ "serde_derive",
 +]
 +
 +[[package]]
 +name = "rdrand"
 +version = "0.4.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
 +dependencies = [
-+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand_core 0.3.1",
 +]
 +
 +[[package]]
 +name = "redox_syscall"
 +version = "0.1.56"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
 +
 +[[package]]
 +name = "redox_users"
-+version = "0.3.1"
++version = "0.3.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431"
 +dependencies = [
-+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "getrandom",
++ "redox_syscall",
++ "rust-argon2",
 +]
 +
 +[[package]]
 +name = "regex"
-+version = "1.3.1"
++version = "1.3.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8"
 +dependencies = [
-+ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "aho-corasick",
++ "memchr",
++ "regex-syntax",
++ "thread_local",
 +]
 +
 +[[package]]
 +name = "regex-syntax"
-+version = "0.6.12"
++version = "0.6.16"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1132f845907680735a84409c3bebc64d1364a5683ffbce899550cd09d5eaefc1"
 +
 +[[package]]
 +name = "remove_dir_all"
 +version = "0.5.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
 +dependencies = [
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "request-animation-frame"
 +version = "0.1.0"
 +dependencies = [
-+ "wasm-bindgen 0.2.58",
-+ "web-sys 0.3.35",
++ "wasm-bindgen",
++ "web-sys",
 +]
 +
 +[[package]]
 +name = "rouille"
 +version = "3.0.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "112568052ec17fa26c6c11c40acbb30d3ad244bf3d6da0be181f5e7e42e5004f"
 +dependencies = [
-+ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "multipart 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "tiny_http 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "base64 0.9.3",
++ "chrono",
++ "filetime",
++ "multipart",
++ "num_cpus",
++ "rand 0.5.6",
++ "serde",
++ "serde_derive",
++ "serde_json",
++ "sha1",
++ "term",
++ "threadpool",
++ "time",
++ "tiny_http",
++ "url",
 +]
 +
 +[[package]]
 +name = "rust-argon2"
-+version = "0.5.1"
++version = "0.7.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017"
 +dependencies = [
-+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "base64 0.11.0",
++ "blake2b_simd",
++ "constant_time_eq",
++ "crossbeam-utils",
 +]
 +
 +[[package]]
 +name = "rust-duck-typed-interfaces"
 +version = "0.1.0"
 +dependencies = [
-+ "wasm-bindgen 0.2.58",
++ "wasm-bindgen",
 +]
 +
 +[[package]]
 +name = "rustc-demangle"
 +version = "0.1.16"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
 +
 +[[package]]
 +name = "rustc_version"
 +version = "0.2.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 +dependencies = [
-+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "semver",
 +]
 +
 +[[package]]
 +name = "ryu"
 +version = "1.0.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
 +
 +[[package]]
 +name = "safemem"
 +version = "0.3.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
 +
 +[[package]]
 +name = "sample"
 +version = "0.1.0"
 +dependencies = [
-+ "js-sys 0.3.35",
-+ "wasm-bindgen 0.2.58",
-+ "wasm-bindgen-futures 0.4.8",
-+ "wasm-bindgen-test 0.3.8",
++ "js-sys",
++ "wasm-bindgen",
++ "wasm-bindgen-futures",
++ "wasm-bindgen-test",
 +]
 +
 +[[package]]
 +name = "schannel"
-+version = "0.1.16"
++version = "0.1.17"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "507a9e6e8ffe0a4e0ebb9a10293e62fdf7657c06f1b8bb07a8fcf697d2abf295"
 +dependencies = [
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "scoped-tls"
 +version = "1.0.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
 +
 +[[package]]
 +name = "scoped_threadpool"
 +version = "0.1.9"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
 +
 +[[package]]
 +name = "scopeguard"
-+version = "1.0.0"
++version = "1.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 +
 +[[package]]
 +name = "semver"
 +version = "0.9.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 +dependencies = [
-+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "semver-parser",
 +]
 +
 +[[package]]
 +name = "semver-parser"
 +version = "0.7.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 +
 +[[package]]
 +name = "serde"
 +version = "1.0.104"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
 +dependencies = [
-+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde_derive",
 +]
 +
 +[[package]]
 +name = "serde_derive"
 +version = "1.0.104"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
 +dependencies = [
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.9",
++ "quote 1.0.3",
++ "syn 1.0.16",
 +]
 +
 +[[package]]
 +name = "serde_json"
-+version = "1.0.44"
++version = "1.0.48"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9371ade75d4c2d6cb154141b9752cf3781ec9c05e0e5cf35060e1e70ee7b9c25"
 +dependencies = [
-+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
++ "itoa",
++ "ryu",
++ "serde",
 +]
 +
 +[[package]]
 +name = "sha1"
 +version = "0.6.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
 +
 +[[package]]
 +name = "siphasher"
 +version = "0.2.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
 +
 +[[package]]
 +name = "smallvec"
-+version = "1.1.0"
++version = "1.2.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5c2fb2ec9bcd216a5b0d0ccf31ab17b5ed1d627960edff65bbe95d3ce221cefc"
 +
 +[[package]]
 +name = "socket2"
 +version = "0.3.11"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85"
 +dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if",
++ "libc",
++ "redox_syscall",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "sourcefile"
 +version = "0.1.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
++
++[[package]]
++name = "strsim"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 +
 +[[package]]
 +name = "strsim"
 +version = "0.9.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
++
++[[package]]
++name = "structopt"
++version = "0.3.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3fe43617218c0805c6eb37160119dc3c548110a67786da7218d1c6555212f073"
++dependencies = [
++ "clap",
++ "lazy_static",
++ "structopt-derive",
++]
++
++[[package]]
++name = "structopt-derive"
++version = "0.4.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c6e79c80e0f4efd86ca960218d4e056249be189ff1c42824dcd9a7f51a56f0bd"
++dependencies = [
++ "heck",
++ "proc-macro-error",
++ "proc-macro2 1.0.9",
++ "quote 1.0.3",
++ "syn 1.0.16",
++]
 +
 +[[package]]
 +name = "syn"
 +version = "0.15.44"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
 +dependencies = [
-+ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 0.4.30",
++ "quote 0.6.13",
++ "unicode-xid 0.1.0",
 +]
 +
 +[[package]]
 +name = "syn"
-+version = "1.0.13"
++version = "1.0.16"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "123bd9499cfb380418d509322d7a6d52e5315f064fe4b3ad18a53d6b92c07859"
 +dependencies = [
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.9",
++ "quote 1.0.3",
++ "unicode-xid 0.2.0",
 +]
 +
 +[[package]]
-+name = "synstructure"
-+version = "0.12.3"
++name = "syn-mid"
++version = "0.5.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a"
 +dependencies = [
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.9",
++ "quote 1.0.3",
++ "syn 1.0.16",
 +]
 +
 +[[package]]
 +name = "tempdir"
 +version = "0.3.7"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
 +dependencies = [
-+ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "rand 0.4.6",
++ "remove_dir_all",
 +]
 +
 +[[package]]
 +name = "tempfile"
 +version = "3.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 +dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if",
++ "libc",
++ "rand 0.7.3",
++ "redox_syscall",
++ "remove_dir_all",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "term"
 +version = "0.5.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
 +dependencies = [
-+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "byteorder",
++ "dirs",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "termcolor"
-+version = "1.0.5"
++version = "1.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
 +dependencies = [
-+ "wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-util",
++]
++
++[[package]]
++name = "textwrap"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
++dependencies = [
++ "unicode-width",
 +]
 +
 +[[package]]
 +name = "thread_local"
-+version = "0.3.6"
++version = "1.0.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
 +dependencies = [
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static",
 +]
 +
 +[[package]]
 +name = "threadpool"
 +version = "1.7.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865"
 +dependencies = [
-+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num_cpus",
 +]
 +
 +[[package]]
 +name = "time"
 +version = "0.1.42"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
 +dependencies = [
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc",
++ "redox_syscall",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "tiny_http"
 +version = "0.6.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951"
 +dependencies = [
-+ "ascii 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "chunked_transfer 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "ascii",
++ "chrono",
++ "chunked_transfer",
++ "log 0.4.8",
++ "url",
 +]
 +
 +[[package]]
 +name = "todomvc"
 +version = "0.1.0"
 +dependencies = [
-+ "askama 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "js-sys 0.3.35",
-+ "wasm-bindgen 0.2.58",
-+ "web-sys 0.3.35",
++ "askama",
++ "console_error_panic_hook",
++ "js-sys",
++ "wasm-bindgen",
++ "web-sys",
 +]
 +
 +[[package]]
 +name = "toml"
 +version = "0.4.10"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
 +dependencies = [
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde",
 +]
 +
 +[[package]]
 +name = "toml"
-+version = "0.5.5"
++version = "0.5.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
 +dependencies = [
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
++ "serde",
 +]
 +
 +[[package]]
 +name = "treeline"
 +version = "0.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41"
 +
 +[[package]]
 +name = "trybuild"
-+version = "1.0.19"
++version = "1.0.23"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "26ff1b18659a2218332848d76ad1c867ce4c6ee37b085e6bc8de9a6d11401220"
 +dependencies = [
-+ "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "glob",
++ "lazy_static",
++ "serde",
++ "serde_json",
++ "termcolor",
++ "toml 0.5.6",
 +]
 +
 +[[package]]
 +name = "twoway"
 +version = "0.1.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1"
 +dependencies = [
-+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "memchr",
 +]
 +
 +[[package]]
 +name = "typescript-tests"
 +version = "0.1.0"
 +dependencies = [
-+ "wasm-bindgen 0.2.58",
++ "js-sys",
++ "wasm-bindgen",
++ "web-sys",
 +]
 +
 +[[package]]
 +name = "unicase"
 +version = "1.4.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
 +dependencies = [
-+ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "version_check 0.1.5",
 +]
 +
 +[[package]]
 +name = "unicode-bidi"
 +version = "0.3.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
 +dependencies = [
-+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "matches",
 +]
 +
 +[[package]]
 +name = "unicode-normalization"
-+version = "0.1.11"
++version = "0.1.12"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4"
 +dependencies = [
-+ "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "smallvec",
 +]
 +
 +[[package]]
 +name = "unicode-segmentation"
 +version = "1.6.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
++
++[[package]]
++name = "unicode-width"
++version = "0.1.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
 +
 +[[package]]
 +name = "unicode-xid"
 +version = "0.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 +
 +[[package]]
 +name = "unicode-xid"
 +version = "0.2.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
 +
 +[[package]]
 +name = "url"
 +version = "1.7.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
 +dependencies = [
-+ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "idna",
++ "matches",
++ "percent-encoding",
 +]
 +
 +[[package]]
 +name = "vcpkg"
 +version = "0.2.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
++
++[[package]]
++name = "vec_map"
++version = "0.8.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
 +
 +[[package]]
 +name = "version_check"
 +version = "0.1.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
++
++[[package]]
++name = "version_check"
++version = "0.9.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
 +
 +[[package]]
 +name = "walrus"
 +version = "0.14.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4d96e9ec3f81fdb3210b12b2b1e9e39369c8050a3a28e692e5247e3ab5196410"
 +dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walrus-macro 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmparser 0.42.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow",
++ "id-arena",
++ "leb128",
++ "log 0.4.8",
++ "rayon",
++ "walrus-macro",
++ "wasmparser 0.42.1",
 +]
 +
 +[[package]]
 +name = "walrus-macro"
 +version = "0.14.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2bc16925d405153a91e01cdac2a5549aa25ca9148b5176e25e601f6536344d94"
 +dependencies = [
-+ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "heck",
++ "proc-macro2 1.0.9",
++ "quote 1.0.3",
++ "syn 1.0.16",
 +]
 +
 +[[package]]
 +name = "wasi"
 +version = "0.9.0+wasi-snapshot-preview1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
 +
 +[[package]]
 +name = "wasm-bindgen"
-+version = "0.2.58"
++version = "0.2.59"
 +dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "js-sys 0.3.35",
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-bindgen-futures 0.4.8",
-+ "wasm-bindgen-macro 0.2.58",
-+ "wasm-bindgen-test 0.3.8",
-+ "wasm-bindgen-test-crate-a 0.1.0",
-+ "wasm-bindgen-test-crate-b 0.1.0",
++ "cfg-if",
++ "js-sys",
++ "serde",
++ "serde_derive",
++ "serde_json",
++ "wasm-bindgen-futures",
++ "wasm-bindgen-macro",
++ "wasm-bindgen-test",
++ "wasm-bindgen-test-crate-a",
++ "wasm-bindgen-test-crate-b",
 +]
 +
 +[[package]]
 +name = "wasm-bindgen-anyref-xform"
-+version = "0.2.58"
++version = "0.2.59"
 +dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmprinter 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wast 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow",
++ "rayon",
++ "walrus",
++ "wasmprinter",
++ "wast 3.0.4",
++ "wat",
 +]
 +
 +[[package]]
 +name = "wasm-bindgen-backend"
-+version = "0.2.58"
++version = "0.2.59"
 +dependencies = [
-+ "bumpalo 3.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-bindgen-shared 0.2.58",
++ "bumpalo",
++ "lazy_static",
++ "log 0.4.8",
++ "proc-macro2 1.0.9",
++ "quote 1.0.3",
++ "syn 1.0.16",
++ "wasm-bindgen-shared",
 +]
 +
 +[[package]]
 +name = "wasm-bindgen-benchmark"
 +version = "0.1.0"
 +dependencies = [
-+ "wasm-bindgen 0.2.58",
-+ "web-sys 0.3.35",
++ "wasm-bindgen",
++ "web-sys",
 +]
 +
 +[[package]]
 +name = "wasm-bindgen-cli"
-+version = "0.2.58"
++version = "0.2.59"
 +dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "assert_cmd 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "curl 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "diff 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rouille 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-bindgen-cli-support 0.2.58",
-+ "wasm-bindgen-shared 0.2.58",
-+ "wit-printer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wit-text 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wit-validator 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wit-walrus 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow",
++ "assert_cmd",
++ "curl",
++ "diff",
++ "docopt",
++ "env_logger",
++ "log 0.4.8",
++ "openssl",
++ "predicates",
++ "rayon",
++ "rouille",
++ "serde",
++ "serde_derive",
++ "serde_json",
++ "tempfile",
++ "walrus",
++ "wasm-bindgen-cli-support",
++ "wasm-bindgen-shared",
++ "wit-printer",
++ "wit-text",
++ "wit-validator",
++ "wit-walrus",
 +]
 +
 +[[package]]
 +name = "wasm-bindgen-cli-support"
-+version = "0.2.58"
++version = "0.2.59"
 +dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-bindgen-anyref-xform 0.2.58",
-+ "wasm-bindgen-multi-value-xform 0.2.58",
-+ "wasm-bindgen-shared 0.2.58",
-+ "wasm-bindgen-threads-xform 0.2.58",
-+ "wasm-bindgen-wasm-conventions 0.2.58",
-+ "wasm-bindgen-wasm-interpreter 0.2.58",
-+ "wit-text 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wit-validator 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wit-walrus 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow",
++ "base64 0.9.3",
++ "log 0.4.8",
++ "rustc-demangle",
++ "serde_json",
++ "tempfile",
++ "walrus",
++ "wasm-bindgen-anyref-xform",
++ "wasm-bindgen-multi-value-xform",
++ "wasm-bindgen-shared",
++ "wasm-bindgen-threads-xform",
++ "wasm-bindgen-wasm-conventions",
++ "wasm-bindgen-wasm-interpreter",
++ "wit-text",
++ "wit-validator",
++ "wit-walrus",
 +]
 +
 +[[package]]
 +name = "wasm-bindgen-futures"
-+version = "0.4.8"
++version = "0.4.9"
 +dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "futures-channel-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "js-sys 0.3.35",
-+ "wasm-bindgen 0.2.58",
-+ "wasm-bindgen-test 0.3.8",
-+ "web-sys 0.3.35",
++ "cfg-if",
++ "futures-channel-preview",
++ "js-sys",
++ "wasm-bindgen",
++ "wasm-bindgen-test",
++ "web-sys",
 +]
 +
 +[[package]]
 +name = "wasm-bindgen-macro"
-+version = "0.2.58"
++version = "0.2.59"
 +dependencies = [
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "trybuild 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-bindgen 0.2.58",
-+ "wasm-bindgen-futures 0.4.8",
-+ "wasm-bindgen-macro-support 0.2.58",
++ "quote 1.0.3",
++ "trybuild",
++ "wasm-bindgen",
++ "wasm-bindgen-futures",
++ "wasm-bindgen-macro-support",
 +]
 +
 +[[package]]
 +name = "wasm-bindgen-macro-support"
-+version = "0.2.58"
++version = "0.2.59"
 +dependencies = [
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-bindgen-backend 0.2.58",
-+ "wasm-bindgen-shared 0.2.58",
++ "proc-macro2 1.0.9",
++ "quote 1.0.3",
++ "syn 1.0.16",
++ "wasm-bindgen-backend",
++ "wasm-bindgen-shared",
 +]
 +
 +[[package]]
 +name = "wasm-bindgen-multi-value-xform"
-+version = "0.2.58"
++version = "0.2.59"
 +dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmprinter 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wast 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow",
++ "rayon",
++ "walrus",
++ "wasmprinter",
++ "wast 3.0.4",
++ "wat",
 +]
 +
 +[[package]]
 +name = "wasm-bindgen-paint"
 +version = "0.1.0"
 +dependencies = [
-+ "js-sys 0.3.35",
-+ "wasm-bindgen 0.2.58",
-+ "web-sys 0.3.35",
++ "js-sys",
++ "wasm-bindgen",
++ "web-sys",
 +]
 +
 +[[package]]
 +name = "wasm-bindgen-shared"
-+version = "0.2.58"
++version = "0.2.59"
 +
 +[[package]]
 +name = "wasm-bindgen-test"
-+version = "0.3.8"
++version = "0.3.9"
 +dependencies = [
-+ "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "js-sys 0.3.35",
-+ "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-bindgen 0.2.58",
-+ "wasm-bindgen-futures 0.4.8",
-+ "wasm-bindgen-test-macro 0.3.8",
++ "console_error_panic_hook",
++ "js-sys",
++ "scoped-tls",
++ "wasm-bindgen",
++ "wasm-bindgen-futures",
++ "wasm-bindgen-test-macro",
 +]
 +
 +[[package]]
 +name = "wasm-bindgen-test-crate-a"
 +version = "0.1.0"
 +dependencies = [
-+ "wasm-bindgen 0.2.58",
++ "wasm-bindgen",
 +]
 +
 +[[package]]
 +name = "wasm-bindgen-test-crate-b"
 +version = "0.1.0"
 +dependencies = [
-+ "wasm-bindgen 0.2.58",
++ "wasm-bindgen",
 +]
 +
 +[[package]]
 +name = "wasm-bindgen-test-macro"
-+version = "0.3.8"
++version = "0.3.9"
 +dependencies = [
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2 1.0.9",
++ "quote 1.0.3",
 +]
 +
 +[[package]]
 +name = "wasm-bindgen-threads-xform"
-+version = "0.2.58"
++version = "0.2.59"
 +dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-bindgen-wasm-conventions 0.2.58",
++ "anyhow",
++ "walrus",
++ "wasm-bindgen-wasm-conventions",
 +]
 +
 +[[package]]
 +name = "wasm-bindgen-wasm-conventions"
-+version = "0.2.58"
++version = "0.2.59"
 +dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow",
++ "walrus",
 +]
 +
 +[[package]]
 +name = "wasm-bindgen-wasm-interpreter"
-+version = "0.2.58"
++version = "0.2.59"
 +dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow",
++ "log 0.4.8",
++ "tempfile",
++ "walrus",
++ "wat",
 +]
 +
 +[[package]]
 +name = "wasm-bindgen-webidl"
-+version = "0.2.58"
++version = "0.2.59"
 +dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-bindgen-backend 0.2.58",
-+ "weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow",
++ "env_logger",
++ "heck",
++ "lazy_static",
++ "log 0.4.8",
++ "proc-macro2 1.0.9",
++ "quote 1.0.3",
++ "sourcefile",
++ "structopt",
++ "syn 1.0.16",
++ "wasm-bindgen-backend",
++ "weedle",
 +]
 +
 +[[package]]
 +name = "wasm-in-wasm"
 +version = "0.1.0"
 +dependencies = [
-+ "js-sys 0.3.35",
-+ "wasm-bindgen 0.2.58",
-+ "wasm-bindgen-futures 0.4.8",
++ "js-sys",
++ "wasm-bindgen",
++ "wasm-bindgen-futures",
 +]
 +
 +[[package]]
 +name = "wasm2js"
 +version = "0.1.0"
 +dependencies = [
-+ "wasm-bindgen 0.2.58",
++ "wasm-bindgen",
 +]
 +
 +[[package]]
 +name = "wasmparser"
 +version = "0.42.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1527c84a5bd585215f29c06b0e2a5274e478ad4dfc970d26ffad66fdc6cb311d"
++
++[[package]]
++name = "wasmparser"
++version = "0.51.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "aeb1956b19469d1c5e63e459d29e7b5aa0f558d9f16fcef09736f8a265e6c10a"
 +
 +[[package]]
 +name = "wasmprinter"
-+version = "0.2.0"
++version = "0.2.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8bd423d45b95fcee11775472bfdce66c63c45ada23c1b338e0a63d623a6c475b"
 +dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmparser 0.42.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow",
++ "wasmparser 0.51.4",
 +]
 +
 +[[package]]
 +name = "wast"
 +version = "3.0.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "233648f540f07fce9b972436f2fbcae8a750c1121b6d32d949e1a44b4d9fc7b1"
 +dependencies = [
-+ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "leb128",
 +]
 +
 +[[package]]
 +name = "wast"
-+version = "5.0.1"
++version = "9.0.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ee7b16105405ca2aa2376ba522d8d4b1a11604941dd3bb7df9fd2ece60f8d16a"
 +dependencies = [
-+ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "leb128",
 +]
 +
 +[[package]]
 +name = "wat"
-+version = "1.0.6"
++version = "1.0.10"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "56173f7f4fb59aebe35a7e71423845e1c6c7144bfb56362d497931b6b3bed0f6"
 +dependencies = [
-+ "wast 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wast 9.0.0",
 +]
 +
 +[[package]]
 +name = "web-sys"
-+version = "0.3.35"
++version = "0.3.36"
 +dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "js-sys 0.3.35",
-+ "sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasm-bindgen 0.2.58",
-+ "wasm-bindgen-futures 0.4.8",
-+ "wasm-bindgen-test 0.3.8",
-+ "wasm-bindgen-webidl 0.2.58",
++ "js-sys",
++ "wasm-bindgen",
++ "wasm-bindgen-futures",
++ "wasm-bindgen-test",
 +]
 +
 +[[package]]
 +name = "webaudio"
 +version = "0.1.0"
 +dependencies = [
-+ "wasm-bindgen 0.2.58",
-+ "web-sys 0.3.35",
++ "wasm-bindgen",
++ "web-sys",
 +]
 +
 +[[package]]
 +name = "webgl"
 +version = "0.1.0"
 +dependencies = [
-+ "js-sys 0.3.35",
-+ "wasm-bindgen 0.2.58",
-+ "web-sys 0.3.35",
++ "js-sys",
++ "wasm-bindgen",
++ "web-sys",
 +]
 +
 +[[package]]
 +name = "webidl-tests"
 +version = "0.1.0"
 +dependencies = [
-+ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "js-sys 0.3.35",
-+ "wasm-bindgen 0.2.58",
-+ "wasm-bindgen-test 0.3.8",
-+ "wasm-bindgen-webidl 0.2.58",
++ "js-sys",
++ "wasm-bindgen",
++ "wasm-bindgen-test",
++ "wasm-bindgen-webidl",
 +]
 +
 +[[package]]
 +name = "websockets"
 +version = "0.1.0"
 +dependencies = [
-+ "wasm-bindgen 0.2.58",
-+ "web-sys 0.3.35",
++ "wasm-bindgen",
++ "web-sys",
 +]
 +
 +[[package]]
 +name = "weedle"
-+version = "0.10.0"
++version = "0.11.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8a7d4f9feb723a800d8f7b74edc9fa44ff35cb0b2ec64886714362f423427f37"
 +dependencies = [
-+ "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
++ "nom 5.1.1",
 +]
 +
 +[[package]]
 +name = "winapi"
 +version = "0.3.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
 +dependencies = [
-+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-i686-pc-windows-gnu",
++ "winapi-x86_64-pc-windows-gnu",
 +]
 +
 +[[package]]
 +name = "winapi-i686-pc-windows-gnu"
 +version = "0.4.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 +
 +[[package]]
 +name = "winapi-util"
-+version = "0.1.2"
++version = "0.1.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80"
 +dependencies = [
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "winapi-x86_64-pc-windows-gnu"
 +version = "0.4.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "wincolor"
-+version = "1.0.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 +
 +[[package]]
 +name = "wit-parser"
-+version = "0.1.0"
++version = "0.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "29a378ab795034efe2c4a6c8a388a2d9b31d360ad441c0bc9859b3d4d37e62a3"
 +dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wit-schema-version 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow",
++ "leb128",
++ "wit-schema-version",
 +]
 +
 +[[package]]
 +name = "wit-printer"
 +version = "0.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8c76e17384f4feb766d109a42c309b78de75ea2b3745f663ac3f5f331633f77f"
 +dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmprinter 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wit-parser 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wit-schema-version 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow",
++ "wasmprinter",
++ "wit-parser",
++ "wit-schema-version",
 +]
 +
 +[[package]]
 +name = "wit-schema-version"
 +version = "0.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bfee4a6a4716eefa0682e7a3b836152e894a3e4f34a9d6c2c3e1c94429bfe36a"
 +
 +[[package]]
 +name = "wit-text"
 +version = "0.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2aa19a002c984e25356af8938a8f4b7f0c9fe3963498e7ae1f90d64da9e563f5"
 +dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wast 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wit-writer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow",
++ "wast 3.0.4",
++ "wit-writer",
 +]
 +
 +[[package]]
 +name = "wit-validator"
-+version = "0.1.1"
++version = "0.1.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2454229f760a433842db154c9bb54da896fdf2352b1d63261f617bcdf20be0bd"
 +dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasmparser 0.42.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wit-parser 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wit-schema-version 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow",
++ "wasmparser 0.51.4",
++ "wit-parser",
++ "wit-schema-version",
 +]
 +
 +[[package]]
 +name = "wit-walrus"
 +version = "0.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8e14fbb9453201558c582d227c2b75df5c050409f467e8c220fcd57dc369280a"
 +dependencies = [
-+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wit-parser 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wit-schema-version 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wit-writer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "anyhow",
++ "id-arena",
++ "walrus",
++ "wit-parser",
++ "wit-schema-version",
++ "wit-writer",
 +]
 +
 +[[package]]
 +name = "wit-writer"
 +version = "0.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ebeb128df9e103e61f8ddd8a190259f3c48b73fe86a5932f40f4de526ef357e8"
 +dependencies = [
-+ "leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wit-schema-version 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "leb128",
++ "wit-schema-version",
 +]
 +
 +[[package]]
 +name = "without-a-bundler"
 +version = "0.1.0"
 +dependencies = [
-+ "wasm-bindgen 0.2.58",
-+ "web-sys 0.3.35",
++ "wasm-bindgen",
++ "web-sys",
 +]
 +
 +[[package]]
 +name = "without-a-bundler-no-modules"
 +version = "0.1.0"
 +dependencies = [
-+ "wasm-bindgen 0.2.58",
-+ "web-sys 0.3.35",
++ "wasm-bindgen",
++ "web-sys",
 +]
-+
-+[metadata]
-+"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
-+"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
-+"checksum anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)" = "7825f6833612eb2414095684fcf6c635becf3ce97fe48cf6421321e93bfbd53c"
-+"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee"
-+"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
-+"checksum ascii 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "97be891acc47ca214468e09425d02cef3af2c94d0d82081cd02061f996802f14"
-+"checksum askama 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eed81479263c8753e06f4981f5a313b3fe6cbff30c3ff8d9ae15ef0c72d93fb5"
-+"checksum askama_derive 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "46580c08e5520afadc6e9064759e15fc743489a4db78f9c751113e3d32a1e083"
-+"checksum askama_shared 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "64509fd5c2fa767fa7ea973b732c61f0b8d30d1adf084e5164523e51a5e35d71"
-+"checksum assert_cmd 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2dc477793bd82ec39799b6f6b3df64938532fdf2ab0d49ef817eac65856a5a1e"
-+"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-+"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
-+"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
-+"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
-+"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
-+"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
-+"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
-+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-+"checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
-+"checksum buf_redux 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f"
-+"checksum bumpalo 3.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5fb8038c1ddc0a5f73787b130f4cc75151e96ed33e417fde765eb5a81e3532f4"
-+"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
-+"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
-+"checksum cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)" = "e450b8da92aa6f274e7c6437692f9f2ce6d701fb73bacfcf87897b3f89a4c20e"
-+"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-+"checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01"
-+"checksum chunked_transfer 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87"
-+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-+"checksum color_quant 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd"
-+"checksum console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
-+"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120"
-+"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca"
-+"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac"
-+"checksum crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db"
-+"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
-+"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
-+"checksum curl 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)" = "06aa71e9208a54def20792d877bc663d6aae0732b9852e612c4a933177c31283"
-+"checksum curl-sys 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)" = "f659f3ffac9582d6177bb86d1d2aa649f4eb9d0d4de9d03ccc08b402832ea340"
-+"checksum deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4"
-+"checksum diff 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
-+"checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
-+"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
-+"checksum docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969"
-+"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
-+"checksum enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180"
-+"checksum env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
-+"checksum escargot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ceb9adbf9874d5d028b5e4c5739d22b71988252b25c9c98fe7cf9738bee84597"
-+"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9"
-+"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08"
-+"checksum filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d"
-+"checksum float-cmp 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75224bec9bfe1a65e2d34132933f2de7fe79900c96a0174307554244ece8150e"
-+"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-+"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-+"checksum futures-channel-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)" = "d5e5f4df964fa9c1c2f8bddeb5c3611631cacd93baf810fc8bb2fb4b495c263a"
-+"checksum futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)" = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a"
-+"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
-+"checksum gif 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2e41945ba23db3bf51b24756d73d81acb4f28d85c3dccc32c6fae904438c25f"
-+"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
-+"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
-+"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772"
-+"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
-+"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-+"checksum id-arena 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005"
-+"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
-+"checksum image 0.12.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d95816db758249fe16f23a4e23f1a3a817fe11892dbfd1c5836f625324702158"
-+"checksum inflate 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e7e0062d2dc2f17d2f13750d95316ae8a2ff909af0fda957084f5defd87c43bb"
-+"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
-+"checksum jpeg-decoder 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "0256f0aec7352539102a9efbcb75543227b7ab1117e0f95450023af730128451"
-+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-+"checksum leb128 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a"
-+"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
-+"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
-+"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
-+"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
-+"checksum lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084"
-+"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
-+"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
-+"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
-+"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
-+"checksum mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0d977de9ee851a0b16e932979515c0f3da82403183879811bc97d50bd9cc50f7"
-+"checksum multipart 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)" = "adba94490a79baf2d6a23eac897157047008272fa3eecb3373ae6377b91eca28"
-+"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
-+"checksum normalize-line-endings 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2e0a1a39eab95caf4f5556da9289b9e68f0aafac901b2ce80daaf020d3b733a8"
-+"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09"
-+"checksum num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "76bd5272412d173d6bf9afdf98db8612bbabc9a7a830b7bfc9c188911716132e"
-+"checksum num-rational 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e"
-+"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
-+"checksum num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4"
-+"checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72"
-+"checksum openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585"
-+"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
-+"checksum openssl-src 111.6.1+1.1.1d (registry+https://github.com/rust-lang/crates.io-index)" = "c91b04cb43c1a8a90e934e0cd612e2a5715d976d2d6cff4490278a0cddf35005"
-+"checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f"
-+"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
-+"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
-+"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
-+"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
-+"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
-+"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
-+"checksum png 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3cb773e9a557edb568ce9935cf783e3cdcabe06a9449d41b3e5506d88e582c82"
-+"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
-+"checksum predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a9bfe52247e5cc9b2f943682a85a5549fb9662245caf094504e69a2f03fe64d4"
-+"checksum predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178"
-+"checksum predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124"
-+"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-+"checksum proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0319972dcae462681daf4da1adeeaa066e3ebd29c69be96c6abb1259d2ee2bcc"
-+"checksum quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
-+"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
-+"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
-+"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
-+"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
-+"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412"
-+"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
-+"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
-+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-+"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-+"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-+"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
-+"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-+"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-+"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
-+"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
-+"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
-+"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
-+"checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098"
-+"checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9"
-+"checksum raytracer 0.1.0 (git+https://github.com/alexcrichton/raytracer?branch=update-deps)" = "<none>"
-+"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-+"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
-+"checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d"
-+"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd"
-+"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
-+"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
-+"checksum rouille 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "112568052ec17fa26c6c11c40acbb30d3ad244bf3d6da0be181f5e7e42e5004f"
-+"checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf"
-+"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
-+"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-+"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
-+"checksum safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
-+"checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021"
-+"checksum scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
-+"checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
-+"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
-+"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-+"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
-+"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
-+"checksum serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)" = "48c575e0cc52bdd09b47f330f646cf59afc586e9c4e3ccd6fc1f625b8ea1dad7"
-+"checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
-+"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
-+"checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4"
-+"checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85"
-+"checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
-+"checksum strsim 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
-+"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-+"checksum syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4ff033220a41d1a57d8125eab57bf5263783dfdcc18688b1dacc6ce9651ef8"
-+"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
-+"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
-+"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
-+"checksum term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
-+"checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e"
-+"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
-+"checksum threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865"
-+"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
-+"checksum tiny_http 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951"
-+"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
-+"checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf"
-+"checksum treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41"
-+"checksum trybuild 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)" = "987d6fdc45ddd7f3be5aa7386c8c8a844d1655c95b9ed948a9cd9cded8f2b79f"
-+"checksum twoway 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1"
-+"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
-+"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-+"checksum unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b561e267b2326bb4cebfc0ef9e68355c7abe6c6f522aeac2f5bf95d56c59bdcf"
-+"checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
-+"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
-+"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
-+"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
-+"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
-+"checksum walrus 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4d96e9ec3f81fdb3210b12b2b1e9e39369c8050a3a28e692e5247e3ab5196410"
-+"checksum walrus-macro 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bc16925d405153a91e01cdac2a5549aa25ca9148b5176e25e601f6536344d94"
-+"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-+"checksum wasmparser 0.42.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1527c84a5bd585215f29c06b0e2a5274e478ad4dfc970d26ffad66fdc6cb311d"
-+"checksum wasmprinter 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "89101d1890503f4d87cc0512ff2568c00d6c13ed9de3880569e5c9c21556c06c"
-+"checksum wast 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "233648f540f07fce9b972436f2fbcae8a750c1121b6d32d949e1a44b4d9fc7b1"
-+"checksum wast 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8d1de68310854a9840d39487701a8c1acccb5c9f9f2650d5fce3cdfe6650c372"
-+"checksum wat 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d916cc60b1b79ac1ca7683af8d6ec56b789167f7f696b3f1ab3d98961129f192"
-+"checksum weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3bb43f70885151e629e2a19ce9e50bd730fd436cfd4b666894c9ce4de9141164"
-+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
-+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-+"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
-+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-+"checksum wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96f5016b18804d24db43cebf3c77269e7569b8954a8464501c216cc5e070eaa9"
-+"checksum wit-parser 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6bb31e17473db76d44713485a85dec22d7786958a9a9b9693cfe0d7162c1b4f5"
-+"checksum wit-printer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8c76e17384f4feb766d109a42c309b78de75ea2b3745f663ac3f5f331633f77f"
-+"checksum wit-schema-version 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bfee4a6a4716eefa0682e7a3b836152e894a3e4f34a9d6c2c3e1c94429bfe36a"
-+"checksum wit-text 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2aa19a002c984e25356af8938a8f4b7f0c9fe3963498e7ae1f90d64da9e563f5"
-+"checksum wit-validator 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "676e5641088526a9bdcab24dc2f675f464f4ca1a4714aa90307464aa6658b5ba"
-+"checksum wit-walrus 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e14fbb9453201558c582d227c2b75df5c050409f467e8c220fcd57dc369280a"
-+"checksum wit-writer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ebeb128df9e103e61f8ddd8a190259f3c48b73fe86a5932f40f4de526ef357e8"
 -- 
-2.23.1
+2.25.0
 
diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix
index 9e83aae8a05c..a073d0ae9324 100644
--- a/pkgs/development/tools/wasm-bindgen-cli/default.nix
+++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wasm-bindgen-cli";
-  version = "0.2.58";
+  version = "0.2.59";
 
   src = fetchFromGitHub {
     owner = "rustwasm";
     repo = "wasm-bindgen";
     rev = version;
-    sha256 = "18n30i1pzrhm2wasa1737j9gihx1d6pwx77z552dcj1rdp7ar6ir";
+    sha256 = "1i0hdky5dlkrzcphddm122yxfhgcvnszh4q1as0r41vhfs5ss597";
   };
 
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ];
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   # Delete this on next update; see #79975 for details
   legacyCargoFetcher = true;
 
-  cargoSha256 = "1kkvgqvn08pv0654b7s40vs92myzfiv965561mwfzhj8fx8f1y18";
+  cargoSha256 = "1cp8ns0cywzqchdw5hkg4fhxhqb6apxwjjasf1ksf3dgjwynlhzm";
   cargoPatches = [ ./0001-Add-cargo.lock.patch ];
   cargoBuildFlags = [ "-p" pname ];
 

From e6f5bb8dc4fa472c14b6ef3314f24c466d56df6c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 8 Mar 2020 00:14:22 +0000
Subject: [PATCH 2533/4636] qalculate-gtk: 3.7.0 -> 3.8.0

---
 pkgs/applications/science/math/qalculate-gtk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix
index 8370685f00a1..c23debdd7a45 100644
--- a/pkgs/applications/science/math/qalculate-gtk/default.nix
+++ b/pkgs/applications/science/math/qalculate-gtk/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qalculate-gtk";
-  version = "3.7.0";
+  version = "3.8.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "qalculate-gtk";
     rev = "v${version}";
-    sha256 = "1zzvxkpman75lxhhvyggwzvrlc6v0rd5ak76rmcny51i4xirmrc0";
+    sha256 = "0nsg6dzg5r7rzqr671nvrf1c50rjwpz7bxv5f20i4s7agizgv840";
   };
 
   patchPhase = ''
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "The ultimate desktop calculator";
-    homepage = http://qalculate.github.io;
+    homepage = "http://qalculate.github.io";
     maintainers = with maintainers; [ gebner ];
     platforms = platforms.all;
   };

From dac3a7e3f9345dc8ea1dbdae69d9339648956409 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 8 Mar 2020 02:27:11 +0000
Subject: [PATCH 2534/4636] yarn: 1.22.0 -> 1.22.2

---
 pkgs/development/tools/yarn/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix
index daf46ec48967..9db4472f6720 100644
--- a/pkgs/development/tools/yarn/default.nix
+++ b/pkgs/development/tools/yarn/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "yarn";
-  version = "1.22.0";
+  version = "1.22.2";
 
   src = fetchzip {
     url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
-    sha256 = "0hbsdbrqx5xhr171ik862v51xwjzbfncic92pgbnhnlmxy2y974x";
+    sha256 = "1av52k5hl7xylxz5c0h64akz6ccd1vm64v0pzmny1661pbihiwp5";
   };
 
   buildInputs = [ nodejs ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://yarnpkg.com/;
+    homepage = "https://yarnpkg.com/";
     description = "Fast, reliable, and secure dependency management for javascript";
     license = licenses.bsd2;
     maintainers = with maintainers; [ offline screendriver ];

From c7e617f683d0234585168fee7c0176b306207978 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 8 Mar 2020 06:56:50 +0000
Subject: [PATCH 2535/4636] pantheon.elementary-music: 5.0.4 -> 5.0.5

---
 pkgs/desktops/pantheon/apps/elementary-music/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
index b53030217722..85739a6ec2ec 100644
--- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix
@@ -29,7 +29,7 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-music";
-  version = "5.0.4";
+  version = "5.0.5";
 
   repoName = "music";
 
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = repoName;
     rev = version;
-    sha256 = "02qjsf9xnfh043xbls9mll2r1wcdvclw60x8wysv12rhbm90gwvp";
+    sha256 = "0cb0mwsp5w2bmjq8ap9mi0jvaqr9fgq00gfrkj0mzb5x5c26hrnw";
   };
 
   passthru = {
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Music player and library designed for elementary OS";
-    homepage = https://github.com/elementary/music;
+    homepage = "https://github.com/elementary/music";
     license = licenses.lgpl2Plus;
     platforms = platforms.linux;
     maintainers = pantheon.maintainers;

From 3f02faf825564982c14102bed11f3d511a4a5211 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 8 Mar 2020 07:09:51 +0000
Subject: [PATCH 2536/4636] etesync-dav: 0.14.2 -> 0.15.0

---
 pkgs/applications/misc/etesync-dav/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix
index d99d1890563e..27ce4708ac3b 100644
--- a/pkgs/applications/misc/etesync-dav/default.nix
+++ b/pkgs/applications/misc/etesync-dav/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "etesync-dav";
-  version = "0.14.2";
+  version = "0.15.0";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "05kzy74r2hd44sqjgd0bc588ganrzbz5brpiginb8sh8z38igb60";
+    sha256 = "1rjp4lhxs6g5yw99rrdg5v98vcvagsabkqf51k1fhhsmbj47mdsm";
   };
 
   propagatedBuildInputs = with python3Packages; [

From 44085e35017d1a07f436bc66b526f5699698629d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Sun, 8 Mar 2020 08:27:48 +0100
Subject: [PATCH 2537/4636] freeoffice: 973 -> 974

Changelog:

https://www.freeoffice.com/en/download/servicepacks
---
 pkgs/applications/office/softmaker/freeoffice.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/softmaker/freeoffice.nix b/pkgs/applications/office/softmaker/freeoffice.nix
index ff54f8ff90f0..b114194d5633 100644
--- a/pkgs/applications/office/softmaker/freeoffice.nix
+++ b/pkgs/applications/office/softmaker/freeoffice.nix
@@ -2,13 +2,13 @@
 
 callPackage ./generic.nix (args // rec {
   pname = "freeoffice";
-  version = "973";
+  version = "974";
   edition = "2018";
   suiteName = "FreeOffice";
 
   src = fetchurl {
     url = "https://www.softmaker.net/down/softmaker-freeoffice-${version}-amd64.tgz";
-    sha256 = "0xac4ynf1lfh8qmni5bhp4ybaamdfngva4bqaq21n1m4pgrx1ba5";
+    sha256 = "0z7131qmqyv1m9phm7wzvb5z7wkh27h59lsa3zc0zjkykikmjrp2";
   };
 
   archive = "freeoffice${edition}.tar.lzma";

From 88efa8b1aeea46eeeacb8ca87a942372cbcb178f Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 8 Mar 2020 04:20:00 -0500
Subject: [PATCH 2538/4636] flow: 0.119.1 -> 0.120.1

Changelog: https://github.com/facebook/flow/releases/tag/v0.120.1
---
 pkgs/development/tools/analysis/flow/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 67ded5bbb4a9..c977a9d20820 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flow";
-  version = "0.119.1";
+  version = "0.120.1";
 
   src = fetchFromGitHub {
     owner  = "facebook";
     repo   = "flow";
     rev    = "refs/tags/v${version}";
-    sha256 = "1p3kjdm4lsbc2lzab3kj1fjvccv8p47bj4s3jnfp2n7qppy7sbbf";
+    sha256 = "0cqwwrml7yaqyd52rqcz64gbm1pc0yj5yhqqqj9vqyil8wif30v3";
   };
 
   installPhase = ''

From 3d6908bca193f55c4956da3112d19beac9112f6f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 7 Mar 2020 11:04:32 +0100
Subject: [PATCH 2539/4636] medusa-unstable: init at 2018-12-16

---
 pkgs/tools/security/medusa/default.nix | 27 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/tools/security/medusa/default.nix

diff --git a/pkgs/tools/security/medusa/default.nix b/pkgs/tools/security/medusa/default.nix
new file mode 100644
index 000000000000..bc18f165be73
--- /dev/null
+++ b/pkgs/tools/security/medusa/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, pkg-config, freerdp, openssl, libssh2 }:
+
+stdenv.mkDerivation rec {
+  pname = "medusa-unstable";
+  version = "2018-12-16";
+
+  src = fetchFromGitHub {
+    owner = "jmk-foofus";
+    repo = "medusa";
+    rev = "292193b3995444aede53ff873899640b08129fc7";
+    sha256 = "0njlz4fqa0165wdmd5y8lfnafayf3c4la0r8pf3hixkdwsss1509";
+  };
+
+  outputs = [ "out" "man" ];
+
+  configureFlags = [ "--enable-module-ssh=yes" ];
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ freerdp openssl libssh2 ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/jmk-foofus/medusa";
+    description = "A speedy, parallel, and modular, login brute-forcer";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ ma27 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a00adec661d1..fafe354021a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1964,6 +1964,8 @@ in
 
   massren = callPackage ../tools/misc/massren { };
 
+  medusa = callPackage ../tools/security/medusa { };
+
   megasync = libsForQt5.callPackage ../applications/misc/megasync { };
 
   megacmd = callPackage ../applications/misc/megacmd { };

From e0a5d34664036bf9757f59d26f872ea9895c5c52 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 7 Mar 2020 11:06:00 +0100
Subject: [PATCH 2540/4636] brutespray: init at 1.6.6

---
 pkgs/tools/security/brutespray/default.nix | 40 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/tools/security/brutespray/default.nix

diff --git a/pkgs/tools/security/brutespray/default.nix b/pkgs/tools/security/brutespray/default.nix
new file mode 100644
index 000000000000..be7c99f52527
--- /dev/null
+++ b/pkgs/tools/security/brutespray/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, python3, fetchFromGitHub, makeWrapper, medusa }:
+
+stdenv.mkDerivation rec {
+  pname = "brutespray";
+  version = "1.6.6";
+
+  src = fetchFromGitHub {
+    owner = "x90skysn3k";
+    repo = pname;
+    rev = "brutespray-${version}";
+    sha256 = "1rj8fkq1xz4ph1pmldphlsa25mg6xl7i7dranb0qjx00jhfxjxjh";
+  };
+
+  postPatch = ''
+    substituteInPlace brutespray.py \
+      --replace "/usr/share/brutespray" "$out/share/brutespray"
+  '';
+
+  dontBuild = true;
+  nativeBuildInputs = [ python3.pkgs.wrapPython makeWrapper ];
+  buildInputs = [ python3 ];
+
+  installPhase = ''
+    install -Dm0755 brutespray.py $out/bin/brutespray
+    patchShebangs $out/bin
+    patchPythonScript $out/bin/brutespray
+    wrapProgram $out/bin/brutespray \
+      --prefix PATH : ${stdenv.lib.makeBinPath [ medusa ]}
+
+    mkdir -p $out/share/brutespray
+    cp -r wordlist/ $out/share/brutespray/wordlist
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/x90skysn3k/brutespray";
+    description = "Brute-Forcing from Nmap output - Automatically attempts default creds on found services";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ma27 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fafe354021a9..e0600f702cbe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1284,6 +1284,8 @@ in
 
   bruteforce-luks = callPackage ../tools/security/bruteforce-luks { };
 
+  brutespray = callPackage ../tools/security/brutespray { };
+
   breakpointHook = assert stdenv.isLinux;
     makeSetupHook { } ../build-support/setup-hooks/breakpoint-hook.sh;
 

From ef03ff7c1fffe25a85e668bbe3dcf62748179844 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 8 Mar 2020 11:45:01 +0000
Subject: [PATCH 2541/4636] hopper: 4.5.19 -> 4.5.21

---
 pkgs/development/tools/analysis/hopper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix
index f6c5dcaf1adb..14b61eac374c 100644
--- a/pkgs/development/tools/analysis/hopper/default.nix
+++ b/pkgs/development/tools/analysis/hopper/default.nix
@@ -12,12 +12,12 @@
 }:
 stdenv.mkDerivation rec {
   pname = "hopper";
-  version = "4.5.19";
+  version = "4.5.21";
   rev = "v${lib.versions.major version}";
 
   src = fetchurl {
     url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz";
-    sha256 = "1c9wbjwz5xn0skz2a1wpxyx78hhrm8vcbpzagsg4wwnyblap59db";
+    sha256 = "0s733n3hmzpsnrvfryq7kzsvwshd1y9fzm16a64gnii8cmfalrqc";
   };
 
   sourceRoot = ".";

From efc919ad3a70fab52384e64861af32e452e1a91f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 8 Mar 2020 11:51:49 +0000
Subject: [PATCH 2542/4636] intel-media-driver: 19.3.0 -> 19.4.0r

---
 pkgs/development/libraries/intel-media-driver/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix
index 176f28093048..ac4bdb4b14c9 100644
--- a/pkgs/development/libraries/intel-media-driver/default.nix
+++ b/pkgs/development/libraries/intel-media-driver/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-media-driver";
-  version = "19.3.0";
+  version = "19.4.0r";
 
   src = fetchFromGitHub {
     owner  = "intel";
     repo   = "media-driver";
     rev    = "intel-media-${version}";
-    sha256 = "1vzh11qr7dwmi3d10nq46k754h3q1yya71nk2jgicaj2mm0ylzx6";
+    sha256 = "0gnd82z0wgiw5my1hnqlk9hcjjqpsgasqq5xcdrbkfa40wpb132a";
   };
 
   cmakeFlags = [
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libva libpciaccess intel-gmmlib libX11 ];
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/intel/media-driver;
+    homepage = "https://github.com/intel/media-driver";
     license = with licenses; [ bsd3 mit ];
     description = "Intel Media Driver for VAAPI — Broadwell+ iGPUs";
     platforms = platforms.linux;

From 1cd54c9f36a5aa51b6028705a3e6e7bd40f2ca54 Mon Sep 17 00:00:00 2001
From: royneary <christian@ulrich.earth>
Date: Sun, 8 Mar 2020 13:31:07 +0100
Subject: [PATCH 2543/4636] gitAndTools.git-bug: 0.6.0 -> 0.7.0

Update to version 0.7.0. Includes switch to buildGoModule because Gopkg.toml
has been removed upstream.
---
 .../git-and-tools/git-bug/default.nix         | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
index fa3970c4b158..ed0c8680d753 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
@@ -1,18 +1,20 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "git-bug";
-  version = "0.6.0";
-  rev = "fc568209f073b9d775a09e0dbb8289cf9e5749bf";
+  version = "0.7.0";
+  rev = "71580c41a931a1ad2c04682e0fd701661b716c95";
   goPackagePath = "github.com/MichaelMure/git-bug";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "MichaelMure";
     repo = "git-bug";
-    sha256 = "1s18lzip52qpf52ad6m20j306mr16vnwhz9f7rirsa6b7srmcgli";
+    sha256 = "0mhqvcwa6y3hrrv88vbp22k7swzr8xw6ipm80gdpx85yp8j2wdkh";
   };
 
+  modSha256 = "1cfn49cijiarzzczrpd28x1k7ib98xyzlvn3zghwk2ngfgiah3ld";
+
   buildFlagsArray = ''
     -ldflags= 
       -X ${goPackagePath}/commands.GitCommit=${rev}
@@ -21,10 +23,9 @@ buildGoPackage rec {
   '';
 
   postInstall = ''
-    cd go/src/${goPackagePath}
-    install -D -m 0644 misc/bash_completion/git-bug "$bin/etc/bash_completion.d/git-bug"
-    install -D -m 0644 misc/zsh_completion/git-bug "$bin/share/zsh/site-functions/git-bug"
-    install -D -m 0644 -t "$bin/share/man/man1" doc/man/*
+    install -D -m 0644 misc/bash_completion/git-bug "$out/etc/bash_completion.d/git-bug"
+    install -D -m 0644 misc/zsh_completion/git-bug "$out/share/zsh/site-functions/git-bug"
+    install -D -m 0644 -t "$out/share/man/man1" doc/man/*
   '';
 
   meta = with stdenv.lib; {

From 2a6cd0e6c08f837b7599601700313c68eb86a6fa Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Sun, 8 Mar 2020 13:38:32 +0100
Subject: [PATCH 2544/4636] appimageTools: fix appimage-exec.sh according to
 shellcheck

---
 pkgs/build-support/appimage/appimage-exec.sh | 37 +++++++++++---------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/pkgs/build-support/appimage/appimage-exec.sh b/pkgs/build-support/appimage/appimage-exec.sh
index fd38889b9aa4..b209ce983e58 100755
--- a/pkgs/build-support/appimage/appimage-exec.sh
+++ b/pkgs/build-support/appimage/appimage-exec.sh
@@ -1,15 +1,19 @@
 #!@shell@
-if [ ! -z "$DEBUG" ] ; then
+if [ -n "$DEBUG" ] ; then
   set -x
 fi
 
-export PATH=@path@
+#export PATH=@path@
+PATH="@path@:$PATH"
+#DEBUG=0
 
 # src : AppImage
 # dest : let's unpack() create the directory
 unpack() {
-  src=$1
-  out=$2
+  local src=$1
+  local out=$2
+  local appimageSignature=""
+  local appimageType=0
 
   # https://github.com/AppImage/libappimage/blob/ca8d4b53bed5cbc0f3d0398e30806e0d3adeaaab/src/libappimage/utils/MagicBytesChecker.cpp#L45-L63
   eval "$(r2 "$src" -nn -Nqc "p8j 3 @ 8" |
@@ -19,16 +23,15 @@ unpack() {
   # check AppImage signature
   if [[ "$appimageSignature" != "AI" ]]; then
     echo "Not an appimage."
-    exit -1
+    exit
   fi
 
   case "$appimageType" in
-    1)  echo "Uncompress $(basename "$src") of Type: $appimageType."
+    1 ) echo "Uncompress $(basename "$src") of type $appimageType."
         mkdir "$out"
         pv "$src" | bsdtar -x -C "$out" -f -
         ;;
-
-    2)  echo "Uncompress $(basename "$src") of Type: $appimageType."
+    2)
         # This method avoid issues with non executable appimages,
         # non-native packer, packer patching and squashfs-root destination prefix.
 
@@ -37,6 +40,7 @@ unpack() {
         offset=$(r2 "$src" -nn -Nqc "pfj.elf_header @ 0" |\
           jq 'map({(.name): .value}) | add | .shoff + (.shnum * .shentsize)')
 
+        echo "Uncompress $(basename "$src") of type $appimageType @ offset $offset."
         unsquashfs -q -d "$out" -o "$offset" "$src"
         chmod go-w "$out"
         ;;
@@ -52,26 +56,25 @@ unpack() {
 apprun() {
 
   eval "$(rahash2 "$APPIMAGE" -j | jq -r '.[] | @sh "SHA256=\(.hash)"')"
-  echo sha256 = \"$SHA256\"\;
+  echo sha256 = \""$SHA256"\"\;
   export APPDIR="${XDG_CACHE_HOME:-$HOME/.cache}/appimage-run/$SHA256"
 
   #compatibility
   if [ -x "$APPDIR/squashfs-root" ]; then APPDIR="$APPDIR/squashfs-root"; fi
 
   if [ ! -x "$APPDIR" ]; then
-    mkdir -p $(dirname "$APPDIR")
+    mkdir -p "$(dirname "$APPDIR")"
     unpack "$APPIMAGE" "$APPDIR"
+  else echo "$(basename "$APPIMAGE")" installed in "$APPDIR"
   fi
 
-  echo $(basename "$APPIMAGE") installed in "$APPDIR"
-
   export PATH="$PATH:$PWD/usr/bin"
-  wrap
+  wrap "$@"
 }
 
 wrap() {
 
-  cd "$APPDIR"
+  cd "$APPDIR" || exit
   # quite same in appimageTools
   export APPIMAGE_SILENT_INSTALL=1
 
@@ -121,9 +124,11 @@ if [[ $unpack_opt = true ]] && [[ -f "$APPIMAGE" ]]; then
 fi
 
 if [[ $apprun_opt = true ]] && [[ -f "$APPIMAGE" ]]; then
-  apprun
+  apprun "$@"
+  exit
 fi
 
 if [[ $wrap_opt = true ]] && [[ -d "$APPDIR" ]]; then
-  wrap
+  wrap "$@"
+  exit
 fi

From a201e3dbc4949400e99189fa1c5196668722eeaf Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Thu, 13 Feb 2020 13:07:35 +0100
Subject: [PATCH 2545/4636] romdirfs: init at 1.2

---
 pkgs/tools/filesystems/romdirfs/default.nix | 24 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/filesystems/romdirfs/default.nix

diff --git a/pkgs/tools/filesystems/romdirfs/default.nix b/pkgs/tools/filesystems/romdirfs/default.nix
new file mode 100644
index 000000000000..8085eb5f2347
--- /dev/null
+++ b/pkgs/tools/filesystems/romdirfs/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, fuse }:
+
+stdenv.mkDerivation rec {
+  pname = "romdirfs";
+  version = "1.2";
+
+  src = fetchFromGitHub {
+    owner = "mlafeldt";
+    repo = "romdirfs";
+    rev = "v${version}";
+    sha256 = "1jbsmpklrycz5q86qmzvbz4iz2g5fvd7p9nca160aw2izwpws0g7";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ fuse ];
+
+  meta = with stdenv.lib; {
+    description = "FUSE for access Playstation 2 IOP IOPRP images and BIOS dumps";
+    homepage = https://github.com/mlafeldt/romdirfs;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ genesis ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e351a5f90642..e043d19af08a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25281,6 +25281,8 @@ in
 
   rmount = callPackage ../tools/filesystems/rmount {};
 
+  romdirfs = callPackage ../tools/filesystems/romdirfs {};
+
   rss-glx = callPackage ../misc/screensavers/rss-glx { };
 
   run-scaled = callPackage ../tools/X11/run-scaled { };

From 95dc1ef1f0d5da42f3b92d9af00cbb0179cb5ecf Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Sun, 8 Mar 2020 13:53:48 +0100
Subject: [PATCH 2546/4636] appimageTools: fix appimage-exec.sh passing
 arguments

---
 pkgs/build-support/appimage/appimage-exec.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/appimage/appimage-exec.sh b/pkgs/build-support/appimage/appimage-exec.sh
index b209ce983e58..ee952db0fd74 100755
--- a/pkgs/build-support/appimage/appimage-exec.sh
+++ b/pkgs/build-support/appimage/appimage-exec.sh
@@ -3,7 +3,6 @@ if [ -n "$DEBUG" ] ; then
   set -x
 fi
 
-#export PATH=@path@
 PATH="@path@:$PATH"
 #DEBUG=0
 
@@ -69,7 +68,6 @@ apprun() {
   fi
 
   export PATH="$PATH:$PWD/usr/bin"
-  wrap "$@"
 }
 
 wrap() {
@@ -98,6 +96,7 @@ while getopts ":a:d:xrw" option; do
         a)  #AppImage file
             # why realpath?
             APPIMAGE="$(realpath "${OPTARG}")"
+            break
             ;;
         d)  #appimage Directory
             export APPDIR=${OPTARG}
@@ -124,7 +123,8 @@ if [[ $unpack_opt = true ]] && [[ -f "$APPIMAGE" ]]; then
 fi
 
 if [[ $apprun_opt = true ]] && [[ -f "$APPIMAGE" ]]; then
-  apprun "$@"
+  apprun
+  wrap "$@"
   exit
 fi
 

From dbff9b54795574a8bfbf7f679cdecb766aab9455 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 8 Mar 2020 14:00:40 +0100
Subject: [PATCH 2547/4636] =?UTF-8?q?borgbackup:=201.1.10=20=E2=86=92=201.?=
 =?UTF-8?q?1.11?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Version 1.1.11 (2020-03-08)

Compatibility notes:

    When upgrading from borg 1.0.x to 1.1.x, please note:
        read all the compatibility notes for 1.1.0*, starting from 1.1.0b1.
        borg upgrade: you do not need to and you also should not run it.
        borg might ask some security-related questions once after upgrading. You can answer them either manually or via environment variable. One known case is if you use unencrypted repositories, then it will ask about a unknown unencrypted repository one time.
        your first backup with 1.1.x might be significantly slower (it might completely read, chunk, hash a lot files) - this is due to the --files-cache mode change (and happens every time you change mode). You can avoid the one-time slowdown by using the pre-1.1.0rc4-compatible mode (but that is less safe for detecting changed files than the default). See the --files-cache docs for details.
    1.1.11 removes WSL autodetection (Windows 10 Subsystem for Linux). If WSL still has a problem with sync_file_range, you need to set BORG_WORKAROUNDS=basesyncfile in the borg process environment to work around the WSL issue.

Fixes:

    fixed potential index corruption / data loss issue due to bug in hashindex_set, #4829 Please read and follow the more detailled notes close to the top of this document.
    upgrade bundled xxhash to 0.7.3, #4891 0.7.2 is the minimum requirement for correct operations on ARMv6 in non-fixup mode, where unaligned memory accesses cause bus errors. 0.7.3 adds some speedups and libxxhash 0.7.3 even has a pkg-config file now.
    upgrade bundled lz4 to 1.9.2
    upgrade bundled zstd to 1.4.4
    fix crash when upgrading erroneous hints file, #4922
    extract:
        fix KeyError for "partial" extraction, #4607
        fix "partial" extract for hardlinked contentless file types, #4725
        fix preloading for old (0.xx) remote servers, #4652
        fix confusing output of borg extract --list --strip-components, #4934
    delete: after double-force delete, warn about necessary repair, #4704
    create: give invalid repo error msg if repo config not found, #4411
    mount: fix FUSE mount missing st_birthtime, #4763 #4767
    check: do not stumble over invalid item key, #4845
    info: if the archive doesn't exist, print a pretty message, #4793
    SecurityManager.known(): check all files, #4614
    Repository.open: use stat() to check for repo dir, #4695
    Repository.check_can_create_repository: use stat() to check, #4695
    fix invalid archive error message
    fix optional/non-optional location arg, #4541
    commit-time free space calc: ignore bad compact map entries, #4796
    ignore EACCES (errno 13) when hardlinking the old config, #4730
    --prefix / -P: fix processing, avoid argparse issue, #4769

New features:

    enable placeholder usage in all extra archive arguments
    new BORG_WORKAROUNDS mechanism, basesyncfile, #4710
    recreate: support --timestamp option, #4745
    support platforms without os.link (e.g. Android with Termux), #4901 if we don't have os.link, we just extract another copy instead of making a hardlink.
    support linux platforms without sync_file_range (e.g. Android 7 with Termux), #4905

Other:

    ignore --stats when given with --dry-run, but continue, #4373
    add some ProgressIndicator msgids to code / fix docs, #4935
    elaborate on "Calculating size" message
    argparser: always use REPOSITORY in metavar, also use more consistent help phrasing.
    check: improve error output for matching index size, see #4829
    docs:
        changelog: add advisory about hashindex_set bug #4829
        better describe BORG_SECURITY_DIR, BORG_CACHE_DIR, #4919
        infos about cache security assumptions, #4900
        add FAQ describing difference between a local repo vs. repo on a server.
        document how to test exclusion patterns without performing an actual backup
        timestamps in the files cache are now usually ctime, #4583
        fix bad reference to borg compact (does not exist in 1.1), #4660
        create: borg 1.1 is not future any more
        extract: document limitation "needs empty destination", #4598
        how to supply a passphrase, use crypto devices, #4549
        fix osxfuse github link in installation docs
        add example of exclude-norecurse rule in help patterns
        update macOS Brew link
        add note about software for automating backups, #4581
        AUTHORS: mention copyright+license for bundled msgpack
        fix various code blocks in the docs, #4708
        updated docs to cover use of temp directory on remote, #4545
        add restore docs, #4670
        add a pull backup / push restore how-to, #1552
        add FAQ how to retain original paths, #4532
        explain difference between --exclude and --pattern, #4118
        add FAQs for SSH connection issues, #3866
        improve password FAQ, #4591
        reiterate that 'file cache names are absolute' in FAQ
    tests:
        cope with ANY error when importing pytest into borg.testsuite, #4652
        fix broken test that relied on improper zlib assumptions
        test_fuse: filter out selinux xattrs, #4574
    travis / vagrant:
        misc python versions removed / changed (due to openssl 1.1 compatibility) or added (3.7 and 3.8, for better borg compatibility testing)
        binary building is on python 3.5.9 now
    vagrant:
        add new boxes: ubuntu 18.04 and 20.04, debian 10
        update boxes: openindiana, darwin, netbsd
        remove old boxes: centos 6
        darwin: updated osxfuse to 3.10.4
        use debian/ubuntu pip/virtualenv packages
        rather use python 3.6.2 than 3.6.0, fixes coverage/sqlite3 issue
        use requirements.d/development.lock.txt to avoid compat issues
    travis:
        darwin: backport some install code / order from master
        remove deprecated keyword "sudo" from travis config
        allow osx builds to fail, #4955 this is due to travis-ci frequently being so slow that the OS X builds just fail because they exceed 50 minutes and get killed by travis.
---
 pkgs/tools/backup/borg/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index ed8fbbf76cd7..a12cc368ee58 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -2,11 +2,11 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "borgbackup";
-  version = "1.1.10";
+  version = "1.1.11";
 
   src = python3.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "1pp70p4n5kamvcbl4d8021ggrxhyykmg9isjg4yd3wags8b19d7g";
+    sha256 = "190gjzx83b6p64nqj840x382dgz9gfv0gm7wj585lnkrpa90j29n";
   };
 
   nativeBuildInputs = with python3.pkgs; [
@@ -58,7 +58,7 @@ python3.pkgs.buildPythonApplication rec {
     HOME=$(mktemp -d) py.test --pyargs borg.testsuite
   '';
 
-  # 63 failures, needs pytest-benchmark
+  # 64 failures, needs pytest-benchmark
   doCheck = false;
 
   meta = with stdenv.lib; {

From ff54badc616887c9823cf81a89981d3ed5dde791 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 8 Mar 2020 13:11:20 +0000
Subject: [PATCH 2548/4636] java-service-wrapper: 3.5.42 -> 3.5.43

---
 pkgs/tools/system/java-service-wrapper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/java-service-wrapper/default.nix b/pkgs/tools/system/java-service-wrapper/default.nix
index 512bb7341ca9..758942c05494 100644
--- a/pkgs/tools/system/java-service-wrapper/default.nix
+++ b/pkgs/tools/system/java-service-wrapper/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "java-service-wrapper";
-  version = "3.5.42";
+  version = "3.5.43";
 
   src = fetchurl {
     url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
-    sha256 = "1gi4zc7fhqm7rb1ajpnxx0n7ngpa06ja46mb5p65h025mz567ywd";
+    sha256 = "19cx3854rk7b2056z8pvxnf4simsg5js7czsy2bys7jl6vh2x02b";
   };
 
   buildInputs = [ jdk ];

From bc21f7a0ceb729f354d65ff9b2eb76daa2b037af Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Sun, 8 Mar 2020 16:41:00 +0100
Subject: [PATCH 2549/4636] bitwarden_rs-vault: fix directory structure

---
 pkgs/tools/security/bitwarden_rs/vault.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix
index b5f00a4abf91..0ce9d43f967a 100644
--- a/pkgs/tools/security/bitwarden_rs/vault.nix
+++ b/pkgs/tools/security/bitwarden_rs/vault.nix
@@ -10,9 +10,10 @@ stdenv.mkDerivation rec {
   };
 
   buildCommand = ''
-    mkdir -p $out/share/bitwarden_rs/vault
-    cd $out/share/bitwarden_rs/vault
+    mkdir -p $out/share/bitwarden_rs/
+    cd $out/share/bitwarden_rs/
     tar xf $src
+    mv web-vault vault
   '';
 
   meta = with stdenv.lib; {

From 49e7871196ea43f6b8b6c81801f632f57ab892de Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Sun, 8 Mar 2020 17:55:43 +0100
Subject: [PATCH 2550/4636] appimageTools: wrapType1 = wrapType2;

---
 pkgs/build-support/appimage/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index 4df0f15d84d8..eb9a2a5ee085 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -20,8 +20,7 @@ rec {
   # for compatibility, deprecated
   extractType1 = extract;
   extractType2 = extract;
-  #wrapType2 = wrapAppImage;
-  #wrapType1 = wrapAppImage;
+  wrapType1 = wrapType2;
 
   wrapAppImage = args@{ name, src, extraPkgs, ... }: buildFHSUserEnv (defaultFhsEnvArgs // {
     inherit name;
@@ -32,14 +31,9 @@ rec {
     runScript = "appimage-exec.sh -w -d ${src}";
   } // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage))));
 
-  wrapType1 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // {
-    inherit name extraPkgs;
-    src = extractType1 { inherit name src; };
-  });
-
   wrapType2 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // {
     inherit name extraPkgs;
-    src = extractType2 { inherit name src; };
+    src = extract { inherit name src; };
   });
 
   defaultFhsEnvArgs = {

From 5e468ef98191e2a68a2975b737a697d3f1cb5f9d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 7 Mar 2020 10:21:37 +0100
Subject: [PATCH 2551/4636] =?UTF-8?q?ocsigen-i18n:=203.4.0=20=E2=86=92=203?=
 =?UTF-8?q?.5.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/tools/ocaml/ocsigen-i18n/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
index 09ab9587ddba..5144af97f759 100644
--- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
+++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
@@ -1,12 +1,11 @@
-{ stdenv, fetchurl, ocamlPackages }:
+{ stdenv, fetchzip, ocamlPackages }:
 
 stdenv.mkDerivation rec
 {
   pname = "ocsigen-i18n";
-  version = "3.4.0";
-
-  buildInputs = with ocamlPackages; [ ocaml findlib ];
+  version = "3.5.0";
 
+  buildInputs = with ocamlPackages; [ ocaml findlib ppx_tools ];
 
   dontStrip = true;
 
@@ -15,9 +14,9 @@ stdenv.mkDerivation rec
     make bindir=$out/bin install
   '';
 
-  src = fetchurl {
+  src = fetchzip {
     url = "https://github.com/besport/${pname}/archive/${version}.tar.gz";
-    sha256 = "0i7cck6zlgwjpksb4s1jpy193h85jixf4d0nmqj09y3zcpn2i8gb";
+    sha256 = "1qsgwfl64b53w235wm7nnchqinzgsvd2gb52xm0kra2wlwp69rfq";
   };
 
   meta = {

From b4c65bccee9dce268aee74e1a1aa3143183e6424 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 8 Mar 2020 17:13:31 +0000
Subject: [PATCH 2552/4636] libzdb: 3.1 -> 3.2.1

---
 pkgs/development/libraries/libzdb/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libzdb/default.nix b/pkgs/development/libraries/libzdb/default.nix
index b16d897fb5f2..4e7168a02113 100644
--- a/pkgs/development/libraries/libzdb/default.nix
+++ b/pkgs/development/libraries/libzdb/default.nix
@@ -2,20 +2,20 @@
 
 stdenv.mkDerivation rec
 {
-  version = "3.1";
+  version = "3.2.1";
   pname = "libzdb";
 
   src = fetchurl
   {
     url = "https://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz";
-    sha256 = "1596njvy518x7vsvsykmnk1ky82x8jxd6nmmp551y6hxn2qsn08g";
+    sha256 = "1w9zzpgw3qzirsy5g4aaq1469kdq46gr2nhvrs3xqlwz1adbb9xr";
   };
 
   buildInputs = [ sqlite ];
 
   meta =
   {
-    homepage = http://www.tildeslash.com/libzdb/;
+    homepage = "http://www.tildeslash.com/libzdb/";
     description = "A small, easy to use Open Source Database Connection Pool Library";
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;

From 8d612a3b53ad633a85a1f3dd81d48eb5660fc4b0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 8 Mar 2020 17:24:40 +0000
Subject: [PATCH 2553/4636] libgme: 0.6.2 -> 0.6.3

---
 pkgs/development/libraries/audio/libgme/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/audio/libgme/default.nix b/pkgs/development/libraries/audio/libgme/default.nix
index b8f1a5c088ac..bcd6070831bb 100644
--- a/pkgs/development/libraries/audio/libgme/default.nix
+++ b/pkgs/development/libraries/audio/libgme/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromBitbucket, cmake }:
 let
-  version = "0.6.2";
+  version = "0.6.3";
 in stdenv.mkDerivation {
   pname = "libgme";
   inherit version;
 
   meta = with stdenv.lib; {
     description = "A collection of video game music chip emulators";
-    homepage = https://bitbucket.org/mpyne/game-music-emu/overview;
+    homepage = "https://bitbucket.org/mpyne/game-music-emu/overview";
     license = licenses.lgpl21;
     platforms = platforms.all;
     maintainers = with maintainers; [ lheckemann ];
@@ -17,7 +17,7 @@ in stdenv.mkDerivation {
     owner = "mpyne";
     repo = "game-music-emu";
     rev = version;
-    sha256 = "00vlbfk5h99dq5rbwxk20dv72dig6wdwpgf83q451avsscky0jvk";
+    sha256 = "100ahb4n4pvgcry9xzlf2fr4j57n5h9x7pvyhhxys4dcy8axqqsy";
   };
 
   buildInputs = [ cmake ];

From 7107e397dd6fa19250b4bdcba9b8d461dfe984b8 Mon Sep 17 00:00:00 2001
From: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Date: Sun, 8 Mar 2020 10:44:48 -0700
Subject: [PATCH 2554/4636] bs-platform: 7.0.1 -> 7.2.0

---
 .../bs-platform/build-bs-platform.nix         | 23 +++++++++++++------
 .../compilers/bs-platform/default.nix         |  8 +++----
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/compilers/bs-platform/build-bs-platform.nix b/pkgs/development/compilers/bs-platform/build-bs-platform.nix
index 528fa5e4f420..e4e7b7e8619a 100644
--- a/pkgs/development/compilers/bs-platform/build-bs-platform.nix
+++ b/pkgs/development/compilers/bs-platform/build-bs-platform.nix
@@ -16,18 +16,24 @@
     patches = [];
   }))
 }:
-stdenv.mkDerivation {
+
+let
+  bin_folder = if stdenv.isDarwin then "darwin" else "linux";
+in
+
+stdenv.mkDerivation rec {
   inherit src version;
   pname = "bs-platform";
+
   BS_RELEASE_BUILD = "true";
+  BS_TRAVIS_CI = "1";
+
   buildInputs = [ nodejs python3 custom-ninja ];
 
   patchPhase = ''
     sed -i 's:./configure.py --bootstrap:python3 ./configure.py --bootstrap:' ./scripts/install.js
     mkdir -p ./native/${ocaml-version}/bin
     ln -sf ${ocaml}/bin/*  ./native/${ocaml-version}/bin
-    rm -f vendor/ninja/snapshot/ninja.linux
-    cp ${custom-ninja}/bin/ninja vendor/ninja/snapshot/ninja.linux
   '';
 
   # avoid building the development version, will break aarch64 build
@@ -41,10 +47,13 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p $out/bin
-    cp -rf jscomp lib vendor odoc_gen native $out
+    cp -rf jscomp lib ${bin_folder} vendor odoc_gen native bsb bsc $out
+    mkdir $out/lib/ocaml
+    cp jscomp/runtime/js.* jscomp/runtime/*.cm* $out/lib/ocaml
+    cp jscomp/others/*.ml jscomp/others/*.mli jscomp/others/*.cm* $out/lib/ocaml
+    cp jscomp/stdlib-406/*.ml jscomp/stdlib-406/*.mli jscomp/stdlib-406/*.cm* $out/lib/ocaml
     cp bsconfig.json package.json $out
-    ln -s $out/lib/bsb $out/bin/bsb
-    ln -s $out/lib/bsc $out/bin/bsc
-    ln -s $out/lib/bsrefmt $out/bin/bsrefmt
+    ln -s $out/bsb $out/bin/bsb
+    ln -s $out/bsc $out/bin/bsc
   '';
 }
diff --git a/pkgs/development/compilers/bs-platform/default.nix b/pkgs/development/compilers/bs-platform/default.nix
index 763a4e3ba67a..6912cc6e9ff5 100644
--- a/pkgs/development/compilers/bs-platform/default.nix
+++ b/pkgs/development/compilers/bs-platform/default.nix
@@ -2,16 +2,16 @@
 let
   build-bs-platform = import ./build-bs-platform.nix;
 in
-(build-bs-platform {
+(build-bs-platform rec {
   inherit stdenv runCommand fetchFromGitHub ninja nodejs python3;
-  version = "7.0.1";
+  version = "7.2.0";
   ocaml-version = "4.06.1";
 
   src = fetchFromGitHub {
     owner = "BuckleScript";
     repo = "bucklescript";
-    rev = "52770839e293ade2bcf187f2639000ca0a9a1d46";
-    sha256 = "0s7g2zfhshsilv9zyp0246bypg34d294z27alpwz03ws9608yr7k";
+    rev = version;
+    sha256 = "1fsx7gvcp6rbqd0qf5fix02mbbmk9rgm09zbwjrx0lp5cjv3n2s4";
     fetchSubmodules = true;
   };
 }).overrideAttrs (attrs: {

From 202c2a8effa549eab4ca3240d2d5bab36ab00fbc Mon Sep 17 00:00:00 2001
From: mucaho <mucaho@gmail.com>
Date: Fri, 21 Feb 2020 12:43:11 +0100
Subject: [PATCH 2555/4636] clingcon: init at 3.3.0

---
 .../science/logic/potassco/clingcon.nix       | 43 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/applications/science/logic/potassco/clingcon.nix

diff --git a/pkgs/applications/science/logic/potassco/clingcon.nix b/pkgs/applications/science/logic/potassco/clingcon.nix
new file mode 100644
index 000000000000..1203822d86e9
--- /dev/null
+++ b/pkgs/applications/science/logic/potassco/clingcon.nix
@@ -0,0 +1,43 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+, bison
+, re2c
+}:
+
+stdenv.mkDerivation rec {
+  pname = "clingcon";
+  version = "3.3.0";
+
+  src = fetchFromGitHub {
+    owner = "potassco";
+    repo = "${pname}";
+    rev = "v${version}";
+    fetchSubmodules = true;
+    sha256 = "1q7517h10jfvjdk2czq8d6y57r8kr1j1jj2k2ip2qxkpyfigk4rs";
+   };
+
+  # deal with clingcon through git submodules recursively importing
+  # an outdated version of libpotassco which uses deprecated <xlocale.h> header in .cpp files
+  postPatch = ''
+    find ./ -type f -exec sed -i 's/<xlocale.h>/<locale.h>/g' {} \;
+  '';
+
+  nativeBuildInputs = [ cmake bison re2c ];
+
+  cmakeFlags = [
+    "-DCLINGCON_MANAGE_RPATH=ON"
+    "-DCLINGO_BUILD_WITH_PYTHON=OFF"
+    "-DCLINGO_BUILD_WITH_LUA=OFF"
+  ];
+
+  meta = {
+    inherit version;
+    description = "Extension of clingo to handle constraints over integers";
+    license = stdenv.lib.licenses.gpl3; # for now GPL3, next version MIT!
+    platforms = stdenv.lib.platforms.unix;
+    homepage = "https://potassco.org/";
+    downloadPage = "https://github.com/potassco/clingcon/releases/";
+    changelog = "https://github.com/potassco/clingcon/releases/tag/v${version}";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c8282ef729d..aad00a719d8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1451,6 +1451,8 @@ in
 
   clingo = callPackage ../applications/science/logic/potassco/clingo.nix { };
 
+  clingcon = callPackage ../applications/science/logic/potassco/clingcon.nix { };
+
   clprover = callPackage ../applications/science/logic/clprover/clprover.nix { };
 
   coloredlogs = with python3Packages; toPythonApplication coloredlogs;

From 54bab3faafa809f09b420d51469cdea742a7eb5a Mon Sep 17 00:00:00 2001
From: Leon Schuermann <leon.git@is.currently.online>
Date: Sun, 14 Oct 2018 21:51:39 +0200
Subject: [PATCH 2556/4636] libusb-compat: 0.1.5 -> 0.1.7

Also, change the source repository to the GitHub repository pointed to by the
official website.
---
 pkgs/development/libraries/libusb/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libusb/default.nix b/pkgs/development/libraries/libusb/default.nix
index adf354c45f2e..4d62eadda919 100644
--- a/pkgs/development/libraries/libusb/default.nix
+++ b/pkgs/development/libraries/libusb/default.nix
@@ -1,7 +1,8 @@
 {stdenv, fetchurl, pkgconfig, libusb1}:
 
-stdenv.mkDerivation {
-  name = "libusb-compat-0.1.5";
+stdenv.mkDerivation rec {
+  name = "libusb-compat-${version}";
+  version = "0.1.7";
 
   outputs = [ "out" "dev" ]; # get rid of propagating systemd closure
   outputBin = "dev";
@@ -10,8 +11,8 @@ stdenv.mkDerivation {
   propagatedBuildInputs = [ libusb1 ];
 
   src = fetchurl {
-    url = mirror://sourceforge/libusb/libusb-compat-0.1.5.tar.bz2;
-    sha256 = "0nn5icrfm9lkhzw1xjvaks9bq3w6mjg86ggv3fn7kgi4nfvg8kj0";
+    url = "https://github.com/libusb/libusb-compat-0.1/releases/download/v${version}/${name}.tar.gz";
+    sha256 = "1y2wjba4w9r53sfaacj6awyqhmi31n53j4wwx8g8qj82m8wcwy86";
   };
 
   patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch;

From b99feeb269e074f92a799f524a5e49fbcb221ad5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 8 Mar 2020 18:43:29 +0000
Subject: [PATCH 2557/4636] lxcfs: 3.1.2 -> 4.0.0

---
 pkgs/os-specific/linux/lxcfs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix
index 7acee410a4e7..15a3fa5f04ff 100644
--- a/pkgs/os-specific/linux/lxcfs/default.nix
+++ b/pkgs/os-specific/linux/lxcfs/default.nix
@@ -3,13 +3,13 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "lxcfs-3.1.2";
+  name = "lxcfs-4.0.0";
 
   src = fetchFromGitHub {
     owner = "lxc";
     repo = "lxcfs";
     rev = name;
-    sha256 = "195skz6wc2gfcf99f1fz1yaw29ngzg9lphnkag7yxnk3ffbhv40s";
+    sha256 = "0p9fl7zya65wsxg2vabdc0jrhw6mdz081cacd7np4zrppv16v6dx";
   };
 
   nativeBuildInputs = [ pkgconfig help2man autoreconfHook ];
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = https://linuxcontainers.org/lxcfs;
+    homepage = "https://linuxcontainers.org/lxcfs";
     description = "FUSE filesystem for LXC";
     license = licenses.asl20;
     platforms = platforms.linux;

From aa63d51a34d0b171516227f945209f0c5b559d62 Mon Sep 17 00:00:00 2001
From: Leon Schuermann <leon.git@is.currently.online>
Date: Sun, 14 Oct 2018 23:18:17 +0200
Subject: [PATCH 2558/4636] libusb: build from source instead of release
 tarball

---
 pkgs/development/libraries/libusb/default.nix | 12 ++++++----
 .../development/libraries/libusb1/default.nix | 23 ++++++++++---------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/libusb/default.nix b/pkgs/development/libraries/libusb/default.nix
index 4d62eadda919..681b2eef456c 100644
--- a/pkgs/development/libraries/libusb/default.nix
+++ b/pkgs/development/libraries/libusb/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, libusb1}:
+{stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1}:
 
 stdenv.mkDerivation rec {
   name = "libusb-compat-${version}";
@@ -7,12 +7,14 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ]; # get rid of propagating systemd closure
   outputBin = "dev";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
   propagatedBuildInputs = [ libusb1 ];
 
-  src = fetchurl {
-    url = "https://github.com/libusb/libusb-compat-0.1/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "1y2wjba4w9r53sfaacj6awyqhmi31n53j4wwx8g8qj82m8wcwy86";
+  src = fetchFromGitHub {
+    owner = "libusb";
+    repo = "libusb-compat-0.1";
+    rev = "v${version}";
+    sha256 = "1nybccgjs14b3phhaycq2jx1gym4nf6sghvnv9qdfmlqxacx0jz5";
   };
 
   patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch;
diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index 9d90304042c8..650238141718 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -1,5 +1,6 @@
 { stdenv
-, fetchurl
+, fetchFromGitHub
+, autoreconfHook
 , pkgconfig
 , enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl
 , systemd ? null
@@ -10,22 +11,26 @@
 
 assert enableSystemd -> systemd != null;
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   pname = "libusb";
   version = "1.0.23";
 
-  src = fetchurl {
-    url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
-    sha256 = "13dd2a9x290d1q8nb1lqiaf36grcvns5ripk5k2xm0lajmpc04fv";
+  src = fetchFromGitHub {
+    owner = "libusb";
+    repo = "libusb";
+    rev = "v${version}";
+    sha256 = "0mxbpg01kgbk5nh6524b0m4xk7ywkyzmc3yhi5asqcsd3rbhjj98";
   };
 
   outputs = [ "out" "dev" ]; # get rid of propagating systemd closure
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
   propagatedBuildInputs =
     stdenv.lib.optional enableSystemd systemd ++
     stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ];
 
+  dontDisableStatic = withStatic;
+
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
 
   preFixup = stdenv.lib.optionalString stdenv.isLinux ''
@@ -43,8 +48,4 @@ stdenv.mkDerivation (rec {
     license = licenses.lgpl21Plus;
     maintainers = [ ];
   };
-} // stdenv.lib.optionalAttrs withStatic {
-  # Carefully added here to avoid a mass rebuild.
-  # Inline this the next time this package changes.
-  dontDisableStatic = withStatic;
-})
+}

From 14c9441a28df2ea5133659e4ba677c9deec73c97 Mon Sep 17 00:00:00 2001
From: dawidsowa <dawid_sowa@posteo.net>
Date: Sun, 8 Mar 2020 20:21:28 +0100
Subject: [PATCH 2559/4636] capitaine-cursors: 3 -> 4

---
 pkgs/data/icons/capitaine-cursors/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/data/icons/capitaine-cursors/default.nix b/pkgs/data/icons/capitaine-cursors/default.nix
index 46d6c1a731ec..09491b904ef1 100644
--- a/pkgs/data/icons/capitaine-cursors/default.nix
+++ b/pkgs/data/icons/capitaine-cursors/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchFromGitHub
-, inkscape, xcursorgen }:
+, inkscape, xcursorgen, bc }:
 
 stdenv.mkDerivation rec {
   pname = "capitaine-cursors";
-  version = "3";
+  version = "4";
 
   src = fetchFromGitHub {
     owner = "keeferrourke";
     repo = pname;
     rev = "r${version}";
-    sha256 = "0pnfbmrn9nv8pryv6cbjcq5hl9366hzvz1kd8vsdkgb2nlfv5gdv";
+    sha256 = "0652ydy73x29z7wc6ccyqihmfg4bk0ksl7yryycln6c7i0iqfmc9";
   };
 
   postPatch = ''
@@ -19,24 +19,27 @@ stdenv.mkDerivation rec {
   buildInputs  =[
     inkscape
     xcursorgen
+    bc
   ];
 
   buildPhase = ''
+    for variant in dark light ; do
     # https://github.com/NixOS/nixpkgs/blob/master/pkgs/data/fonts/emojione/default.nix#L16
-    HOME="$NIX_BUILD_ROOT" ./build.sh
+      HOME="$NIX_BUILD_ROOT" ./build.sh --max-dpi xhd --type $variant
+    done
   '';
 
   installPhase = ''
     install -dm 0755 $out/share/icons
-    cp -pr dist $out/share/icons/capitaine-cursors
-    cp -pr dist-white $out/share/icons/capitaine-cursors-white
+    cp -pr dist/dark $out/share/icons/capitaine-cursors
+    cp -pr dist/light $out/share/icons/capitaine-cursors-white
   '';
 
   meta = with stdenv.lib; {
     description = ''
       An x-cursor theme inspired by macOS and based on KDE Breeze
     '';
-    homepage = https://github.com/keeferrourke/capitaine-cursors;
+    homepage = "https://github.com/keeferrourke/capitaine-cursors";
     license = licenses.lgpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [

From a3df64c8a7bd5e3e26c1cf469680d563c42103be Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Sun, 8 Mar 2020 20:34:23 +0100
Subject: [PATCH 2560/4636] appimage-exec.sh: simplify and improve getopts
 options

---
 pkgs/build-support/appimage/appimage-exec.sh  | 48 +++++++++++--------
 pkgs/build-support/appimage/default.nix       |  4 +-
 .../appimage-run/default.nix                  |  4 +-
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/pkgs/build-support/appimage/appimage-exec.sh b/pkgs/build-support/appimage/appimage-exec.sh
index ee952db0fd74..1273effe5fe2 100755
--- a/pkgs/build-support/appimage/appimage-exec.sh
+++ b/pkgs/build-support/appimage/appimage-exec.sh
@@ -4,6 +4,8 @@ if [ -n "$DEBUG" ] ; then
 fi
 
 PATH="@path@:$PATH"
+apprun_opt=true
+
 #DEBUG=0
 
 # src : AppImage
@@ -84,32 +86,35 @@ wrap() {
 }
 
 usage() {
-  echo "Usage: appimage-run [appimage-run options] <AppImage> [AppImage options]";
-  echo
-  echo 'Options are passed on to the appimage.'
-  echo "If you want to execute a custom command in the appimage's environment, set the APPIMAGE_DEBUG_EXEC environment variable."
+  cat <<EOF
+Usage: appimage-run [appimage-run options] <AppImage> [AppImage options]
+
+-h      show this message
+-d      debug mode
+-x      <directory> : extract appimage in the directory then exit.
+-w      <directory> : run uncompressed appimage directory (used in appimageTools)
+
+[AppImage options]: Options are passed on to the appimage.
+If you want to execute a custom command in the appimage's environment, set the APPIMAGE_DEBUG_EXEC environment variable.
+
+EOF
   exit 1
 }
 
-while getopts ":a:d:xrw" option; do
+while getopts "x:w:dh" option; do
     case "${option}" in
-        a)  #AppImage file
-            # why realpath?
-            APPIMAGE="$(realpath "${OPTARG}")"
-            break
-            ;;
-        d)  #appimage Directory
-            export APPDIR=${OPTARG}
+        d)  set -x
             ;;
         x)  # eXtract
             unpack_opt=true
-            ;;
-        r)  # appimage-Run
-            apprun_opt=true
+            APPDIR=${OPTARG}
             ;;
         w)  # WrapAppImage
+            export APPDIR=${OPTARG}
             wrap_opt=true
             ;;
+        h)  usage
+            ;;
         *)
             usage
             ;;
@@ -117,6 +122,14 @@ while getopts ":a:d:xrw" option; do
 done
 shift $((OPTIND-1))
 
+if [[ $wrap_opt = true ]] && [[ -d "$APPDIR" ]]; then
+  wrap "$@"
+  exit
+else
+  APPIMAGE="$(realpath "$1")" || usage
+  shift
+fi
+
 if [[ $unpack_opt = true ]] && [[ -f "$APPIMAGE" ]]; then
   unpack "$APPIMAGE" "$APPDIR"
   exit
@@ -127,8 +140,3 @@ if [[ $apprun_opt = true ]] && [[ -f "$APPIMAGE" ]]; then
   wrap "$@"
   exit
 fi
-
-if [[ $wrap_opt = true ]] && [[ -d "$APPDIR" ]]; then
-  wrap "$@"
-  exit
-fi
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index eb9a2a5ee085..993032c5601f 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -14,7 +14,7 @@ rec {
   extract = { name, src }: runCommand "${name}-extracted" {
     buildInputs = [ appimage-exec ];
   } ''
-    appimage-exec.sh -x -d $out -a ${src}
+    appimage-exec.sh -x $out ${src}
   '';
 
   # for compatibility, deprecated
@@ -28,7 +28,7 @@ rec {
     targetPkgs = pkgs: [ appimage-exec ]
       ++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs;
 
-    runScript = "appimage-exec.sh -w -d ${src}";
+    runScript = "appimage-exec.sh -w ${src}";
   } // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage))));
 
   wrapType2 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // {
diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix
index 37d1afe28434..3bc59f2ad148 100644
--- a/pkgs/tools/package-management/appimage-run/default.nix
+++ b/pkgs/tools/package-management/appimage-run/default.nix
@@ -1,13 +1,11 @@
 { appimageTools, buildFHSUserEnv, extraPkgs ? pkgs: [] }:
 
 let
-
   fhsArgs = appimageTools.defaultFhsEnvArgs;
-
 in buildFHSUserEnv (fhsArgs // {
   name = "appimage-run";
 
   targetPkgs = pkgs: [ appimageTools.appimage-exec ]
     ++ fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs;
-  runScript = "appimage-exec.sh -r -a";
+  runScript = "appimage-exec.sh";
 })

From b81f725d0751f4ac8c7e4aaea0a1ca1196a98206 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 8 Mar 2020 20:32:58 +0000
Subject: [PATCH 2561/4636] ocamlPackages.ppx_tools_versioned: 5.2.3 -> 5.3.0

---
 .../ocaml-modules/ppx_tools_versioned/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
index 03cadad7ff4d..7fd939e58ec2 100644
--- a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
@@ -2,19 +2,19 @@
 
 buildDunePackage rec {
   pname = "ppx_tools_versioned";
-  version = "5.2.3";
+  version = "5.3.0";
 
   src = fetchFromGitHub {
     owner = "ocaml-ppx";
     repo = pname;
     rev = version;
-    sha256 = "1hcmpnw26zf70a71r3d2c2c0mn8q084gdn1r36ynng6fv9hq6j0y";
+    sha256 = "0c735w9mq49dmvkdw9ahfwh0icsk2sbhnfwmdhpibj86phfm17yj";
   };
 
   propagatedBuildInputs = [ ocaml-migrate-parsetree ];
 
   meta = with lib; {
-    homepage = https://github.com/let-def/ppx_tools_versioned;
+    homepage = "https://github.com/let-def/ppx_tools_versioned";
     description = "Tools for authors of syntactic tools (such as ppx rewriters)";
     license = licenses.gpl2;
     maintainers = [ maintainers.volth ];

From b862939683da629340a35c80d51f895feca68454 Mon Sep 17 00:00:00 2001
From: Aaron Janse <aaron@ajanse.me>
Date: Sun, 8 Mar 2020 15:30:29 -0700
Subject: [PATCH 2562/4636] flyctl: init at 0.0.102

---
 pkgs/development/web/flyctl/default.nix | 32 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/web/flyctl/default.nix

diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
new file mode 100644
index 000000000000..85165d501d97
--- /dev/null
+++ b/pkgs/development/web/flyctl/default.nix
@@ -0,0 +1,32 @@
+{ buildGoModule, fetchFromGitHub, lib }:
+
+buildGoModule rec {
+  pname = "flyctl";
+  version = "0.0.102";
+
+  src = fetchFromGitHub {
+    owner = "superfly";
+    repo = "flyctl";
+    rev = "v${version}";
+    sha256 = "181j248i8j9g7kz5krg0bkbxkvmcwpz2vlknii5q3dy7yhgg19h3";
+  };
+
+  preBuild = ''
+    go generate ./...
+  '';
+
+  preFixup = ''
+    rm $out/bin/doc
+    rm $out/bin/helpgen
+  '';
+
+  modSha256 = "1mqkc7hnavvpbqar9f1d2vnm47p4car9abnk2ikyf27jr5glwmsd";
+
+  meta = with lib; {
+    description = "Command line tools for fly.io services";
+    homepage = "https://fly.io/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ aaronjanse ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0274ef06ac6..60521450d2c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8002,6 +8002,8 @@ in
   };
   fasm-bin = callPackage ../development/compilers/fasm/bin.nix { };
 
+  flyctl = callPackage ../development/web/flyctl { };
+
   fpc = callPackage ../development/compilers/fpc { };
 
   gambit = callPackage ../development/compilers/gambit { stdenv = gccStdenv; };

From e9d492a89666170be963d06a0200b855e86013ad Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 19:16:56 -0400
Subject: [PATCH 2563/4636] intecture-auth: upgrade cargo fetcher and
 cargoSha256 (#81979)

---
 pkgs/tools/admin/intecture/auth.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix
index 4807cd89aac3..f60cbaf7b6e7 100644
--- a/pkgs/tools/admin/intecture/auth.nix
+++ b/pkgs/tools/admin/intecture/auth.nix
@@ -14,10 +14,7 @@ buildRustPackage rec {
     sha256 = "0c7ar3pc7n59lzfy74lwz51p09s2bglc870rfr4c0vmc91jl0pj2";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1rnhhb4mpf1j7c7a2pz4741hzbf2s2wb0bm25j049n64j49j3jq8";
+  cargoSha256 = "17k4a3jd7n2fkalx7vvgah62pj77n536jvm17d60sj0yz2fxx799";
 
   buildInputs = [ openssl zeromq czmq zlib ];
 

From c1a78b79286c8d0425b28f01f3ad1816cfeaa556 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 19:17:12 -0400
Subject: [PATCH 2564/4636] intecture-agent: upgrade cargo fetcher and
 cargoSha256 (#81981)

---
 pkgs/tools/admin/intecture/agent.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix
index 5f0e63341154..7fc3da2f19c5 100644
--- a/pkgs/tools/admin/intecture/agent.nix
+++ b/pkgs/tools/admin/intecture/agent.nix
@@ -14,10 +14,7 @@ buildRustPackage rec {
     sha256 = "0j27qdgyxybaixggh7k57mpm6rifimn4z2vydk463msc8b3kgywj";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "093ipd8lg2ngnln55x5j40g2n8f3y8aysgz9rjn95a4npxrg4yxw";
+  cargoSha256 = "1is1cbbwxf00dc64h76h57s0wxsai0zm5vfrrss7598cim6a4yxb";
 
   buildInputs = [ openssl zeromq czmq zlib ];
 

From df4ec1545364a63e9cebdfe52ffbbd76669146b9 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 19:18:22 -0400
Subject: [PATCH 2565/4636] intecture-cli: upgrade cargo fetcher and
 cargoSha256 (#81982)

---
 pkgs/tools/admin/intecture/cli.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix
index e5aa379e9c32..73865bdea787 100644
--- a/pkgs/tools/admin/intecture/cli.nix
+++ b/pkgs/tools/admin/intecture/cli.nix
@@ -14,10 +14,7 @@ buildRustPackage rec {
     sha256 = "16a5fkpyqkf8w20k3ircc1d0qmif7nygkzxj6mzk9609dlb0dmxq";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0dhrx6njfbd8w27ifk13g6s3ick579bhc4ijf54rfb9g6n8abafx";
+  cargoSha256 = "11r551baz3hrkyf9nv68mdf09nqyvbcfjh2rgy8babmi7jljpzav";
 
   buildInputs = [ openssl zeromq czmq zlib ];
 

From d1cdeb7aaee04be11010879382e858a57af69391 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 19:18:40 -0400
Subject: [PATCH 2566/4636] ripasso-cursive: upgrade cargo fetcher and
 cargoSha256 (#81988)

---
 pkgs/tools/security/ripasso/cursive.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix
index f0e9cb8959dc..70c4ee864b64 100644
--- a/pkgs/tools/security/ripasso/cursive.nix
+++ b/pkgs/tools/security/ripasso/cursive.nix
@@ -12,10 +12,7 @@ buildRustPackage rec {
     sha256 = "164da20j727p8l7hh37j2r8pai9sj402nhswvg0nrlgj53nr6083";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1vyhdbia7khh0ixim00knai5d270jl5a5crqik1qaz7bkwc02bsp";
+  cargoSha256 = "1wpn67v0xmxhn1dgzhh1pwz1yc3cizmfxhpb7qv9b27ynx4486ji";
 
   cargoBuildFlags = [ "-p ripasso-cursive -p ripasso-man" ];
 

From 0b933b408505df6e5c64fd713930ed6478e9140b Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 19:19:09 -0400
Subject: [PATCH 2567/4636] dwm-status: upgrade cargo fetcher and cargoSha256
 (#82013)

---
 pkgs/applications/window-managers/dwm/dwm-status.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix
index 9507ada40114..69337976f88f 100644
--- a/pkgs/applications/window-managers/dwm/dwm-status.nix
+++ b/pkgs/applications/window-managers/dwm/dwm-status.nix
@@ -21,10 +21,7 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ makeWrapper pkgconfig ];
   buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ];
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0l6x59bzzilc78gsi5rlgq9zjvp8qjphfsds776ljzmkbdq8q4iz";
+  cargoSha256 = "0xybd6110b29ghl66kxfs64704qlhnn9jb5vl7lfk9sv62cs564i";
 
   postInstall = lib.optionalString (bins != [])  ''
     wrapProgram $out/bin/dwm-status --prefix "PATH" : "${stdenv.lib.makeBinPath bins}"

From fa353a0f0a4f275779bd49aa22dc8ea0203afbc9 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 19:19:41 -0400
Subject: [PATCH 2568/4636] gnvim: upgrade cargo fetcher and cargoSha256
 (#82015)

---
 pkgs/applications/editors/neovim/gnvim/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/neovim/gnvim/default.nix b/pkgs/applications/editors/neovim/gnvim/default.nix
index a9b2abd0cb3b..e9f42d2b9b5e 100644
--- a/pkgs/applications/editors/neovim/gnvim/default.nix
+++ b/pkgs/applications/editors/neovim/gnvim/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "11gb59lhc1sp5dxj2fdm6072f4nxxay0war3kmchdwsk41nvxlrh";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "00r5jf5qdw02vcv3522qqrnwj14mip0l58prcncbvyg4pxlm2rb2";
+  cargoSha256 = "0ay7hx5bzchp772ywgxzia12c44kbyarrshl689cmqh59wphsrx5";
 
   buildInputs = [ gtk webkitgtk ];
 
@@ -43,8 +40,7 @@ rustPlatform.buildRustPackage rec {
   meta = with stdenv.lib; {
     description = "GUI for neovim, without any web bloat";
     homepage = "https://github.com/vhakulinen/gnvim";
-    license     = licenses.mit;
-    maintainers =  with maintainers; [ minijackson ];
-    inherit version;
+    license = licenses.mit;
+    maintainers = with maintainers; [ minijackson ];
   };
 }

From a38ad34271e03b7f6fae267c8d61dc6927ffc1fc Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 19:25:13 -0400
Subject: [PATCH 2569/4636] cloudflare-wranger: upgrade cargoSha256 (#82022)

General infrastructure improvement as part of #79975,
no functional changes expected.
---
 .../development/tools/cloudflare-wrangler/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/cloudflare-wrangler/default.nix b/pkgs/development/tools/cloudflare-wrangler/default.nix
index d2d4669ad646..a13433e784b1 100644
--- a/pkgs/development/tools/cloudflare-wrangler/default.nix
+++ b/pkgs/development/tools/cloudflare-wrangler/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin
-}:
+{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cloudflare-wrangler";
@@ -8,13 +7,11 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "wrangler";
-    rev = "v" + version;
+    rev = "v${version}";
     sha256 = "0lh06cnjddmy5h5xvbkg8f97vw2v0wr5fi7vrs3nnidiz7x4rsja";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-  cargoSha256 = "0s07143vsrb2vwj4rarx5w3wcz1zh0gi8al6cdrfqyl7nhm1mshm";
+  cargoSha256 = "1q7vilh0bynhdz5bbpig5ibaqvk2153n07gmc715qb80w92sjw7w";
 
   nativeBuildInputs = [ pkg-config ];
 
@@ -29,7 +26,7 @@ rustPlatform.buildRustPackage rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    description = "A CLI tool designed for folks who are interested in using Cloudflare Workers.";
+    description = "A CLI tool designed for folks who are interested in using Cloudflare Workers";
     homepage = "https://github.com/cloudflare/wrangler";
     license = with licenses; [ asl20 /* or */ mit ];
     maintainers = with maintainers; [ ];

From 1cc9cb7ea1fac5a84b911660625d8eb810b47d8e Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 19:26:19 -0400
Subject: [PATCH 2570/4636] cargo-make: remove unnecessary attribute (#82071)

The default value when left unspecified is now false, so no need to state this explicitly.
---
 pkgs/development/tools/rust/cargo-make/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix
index 35dba1149820..53849e4176fa 100644
--- a/pkgs/development/tools/rust/cargo-make/default.nix
+++ b/pkgs/development/tools/rust/cargo-make/default.nix
@@ -24,8 +24,6 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
-  legacyCargoFetcher = false;
-
   cargoSha256 = "1x0lb68d47nhggnj7jf90adz7shb0cg305mavgqvxizd2s9789dx";
 
   # Some tests fail because they need network access.

From dceec409cca15df4f1a94de85f95890b52d233b0 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 9 Mar 2020 00:47:49 +0100
Subject: [PATCH 2571/4636] nixos/cage: move ConditionPathExists to service
 config

It doesn't belong into [Service]:
> Unknown key name 'ConditionPathExists' in section 'Service', ignoring.
---
 nixos/modules/services/wayland/cage.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/wayland/cage.nix b/nixos/modules/services/wayland/cage.nix
index cac5c042ec16..c59ca9983a6c 100644
--- a/nixos/modules/services/wayland/cage.nix
+++ b/nixos/modules/services/wayland/cage.nix
@@ -51,6 +51,7 @@ in {
       conflicts = [ "getty@tty1.service" ];
 
       restartIfChanged = false;
+      unitConfig.ConditionPathExists = "/dev/tty1";
       serviceConfig = {
         ExecStart = ''
           ${pkgs.cage}/bin/cage \
@@ -59,7 +60,6 @@ in {
         '';
         User = cfg.user;
 
-        ConditionPathExists = "/dev/tty1";
         IgnoreSIGPIPE = "no";
 
         # Log this user with utmp, letting it show up with commands 'w' and

From 2b042250ab8e28927a7002000ed8e93365f0c7ec Mon Sep 17 00:00:00 2001
From: Kevin Quick <kquick@galois.com>
Date: Sun, 8 Mar 2020 16:59:33 -0700
Subject: [PATCH 2572/4636] swiProlog: use default openssl

---
 pkgs/top-level/all-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04597ad02aed..8544b3c328b3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8992,7 +8992,6 @@ in
   swift = callPackage ../development/compilers/swift { };
 
   swiProlog = callPackage ../development/compilers/swi-prolog {
-    openssl = openssl_1_0_2;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
   swiPrologWithGui = swiProlog.override { withGui = true; };

From 2873950bb7130457d8ffe894eb2b6174b1abd523 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sun, 8 Mar 2020 20:59:06 -0400
Subject: [PATCH 2573/4636] perlPackages.TextBibTeX: fix on darwin

Fixes: 6d8539c1d8f ('perl: Enable threading on darwin')
cc #73819
---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 316be1531529..c1f394810668 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -19159,7 +19159,7 @@ let
       install_name_tool -change "$oldPath" "$newPath" "$out/bin/biblex"
       install_name_tool -change "$oldPath" "$newPath" "$out/bin/bibparse"
       install_name_tool -change "$oldPath" "$newPath" "$out/bin/dumpnames"
-      install_name_tool -change "$oldPath" "$newPath" "$out/${perl.libPrefix}/${perl.version}/darwin-2level/auto/Text/BibTeX/BibTeX.bundle"
+      install_name_tool -change "$oldPath" "$newPath" "$out/${perl.libPrefix}/${perl.version}/darwin"*"-2level/auto/Text/BibTeX/BibTeX.bundle"
     '';
     meta = {
       description = "Interface to read and parse BibTeX files";

From a67fbc1562736691d911be78cf8795e34a2303cf Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 21:06:00 -0400
Subject: [PATCH 2574/4636] cargo-license: upgrade cargo fetcher and
 cargoSha256 (#82084)

---
 pkgs/tools/package-management/cargo-license/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-license/default.nix b/pkgs/tools/package-management/cargo-license/default.nix
index e91f099da851..b3c404f476fc 100644
--- a/pkgs/tools/package-management/cargo-license/default.nix
+++ b/pkgs/tools/package-management/cargo-license/default.nix
@@ -1,4 +1,5 @@
 { lib, rustPlatform, fetchFromGitHub }:
+
 rustPlatform.buildRustPackage rec {
   pname = "cargo-license";
   version = "0.3.0";
@@ -12,10 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoPatches = [ ./add-Cargo.lock.patch ];
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0ksxvbrx8d8d09i167mdrhz5m46nbr6l0vyn7xpdanmha31xiaz9";
+  cargoSha256 = "0bkaj54avvib1kipk8ky7gyxfs00qm80jd415zp53hhvinphzb5v";
 
   meta = with lib; {
     description = "Cargo subcommand to see license of dependencies";

From 6331093673d50ff303e832e5e8eb32ff0264ed94 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 21:06:25 -0400
Subject: [PATCH 2575/4636] b3sum: upgrade cargo fetcher and cargoSha256
 (#82086)

---
 pkgs/tools/security/b3sum/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/security/b3sum/default.nix b/pkgs/tools/security/b3sum/default.nix
index db5524ce365b..5dc4f1b81e67 100644
--- a/pkgs/tools/security/b3sum/default.nix
+++ b/pkgs/tools/security/b3sum/default.nix
@@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "source/b3sum";
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0qw7sr817lmj9xicc03cj1k49lwjwc1whllc7sj2g4c0nl2vndir";
+  cargoSha256 = "1rqhz2r60603mylazn37mkm783qb7qhjcg8cqss0iy1g752f3f2i";
   verifyCargoDeps = false;
 
   cargoPatches = [ ./add-cargo-lock.patch ];

From 0757551d3c0b955b541705e16a21f37d0790533a Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 21:06:49 -0400
Subject: [PATCH 2576/4636] cargo-geiger: upgrade cargo fetcher and cargoSha256
 (#82087)

---
 pkgs/development/tools/rust/cargo-geiger/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix
index b6f3bb7af000..7678db0a3866 100644
--- a/pkgs/development/tools/rust/cargo-geiger/default.nix
+++ b/pkgs/development/tools/rust/cargo-geiger/default.nix
@@ -15,10 +15,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0kvmjahyx5dcjhry2hkvcshi0lbgipfj0as74a3h3bllfvdfkkg0";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0aykhhxk416p237safmqh5dhwjgrhvgc6zikkmxi9rq567ypp914";
+  cargoSha256 = "0v50fkyf0a77l7whxalwnfqfi8lxy82z2gpd0fa0ib80qjla2n5z";
   cargoPatches = [ ./cargo-lock.patch ];
 
   # Multiple tests require internet connectivity, so they are disabled here.

From bfa084b56b652f9f0bd17b816adc9d2068dd683b Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 21:15:32 -0400
Subject: [PATCH 2577/4636] git-series: upgrade cargo fetcher and cargoSha256

---
 pkgs/development/tools/git-series/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix
index e94f1f1e14ac..4a09e2225bea 100644
--- a/pkgs/development/tools/git-series/default.nix
+++ b/pkgs/development/tools/git-series/default.nix
@@ -15,10 +15,7 @@ buildRustPackage rec {
     sha256 = "07mgq5h6r1gf3jflbv2khcz32bdazw7z1s8xcsafdarnm13ps014";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "16qjbvppc01yxk8x9jk7gs8jaag5nkfl30j3lyv3dc27vv9mckjv";
+  cargoSha256 = "0ijgx8fksg2najb336dhddxlqfzc338f9ylydkpw6b39k72mm00d";
 
   cargoPatches = [
     (fetchpatch {

From 2c76b3d8d73fee7d09a73dffd6c98a3537d8c9b0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 9 Mar 2020 01:24:14 +0000
Subject: [PATCH 2578/4636] pdns-recursor: 4.2.1 -> 4.3.0

---
 pkgs/servers/dns/pdns-recursor/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix
index e5fc3ac5bb9a..7d6fa7d9c91b 100644
--- a/pkgs/servers/dns/pdns-recursor/default.nix
+++ b/pkgs/servers/dns/pdns-recursor/default.nix
@@ -8,11 +8,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "pdns-recursor";
-  version = "4.2.1";
+  version = "4.3.0";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2";
-    sha256 = "07w9av3v9zjnb1fhknmza168yxsq4zr2jqcla7yg10ajrhsk534d";
+    sha256 = "13v2iah7z10wc43v9agcjrzi3wds4jna8f0b7ph35nyzhzr31h9b";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A recursive DNS server";
-    homepage = https://www.powerdns.com/;
+    homepage = "https://www.powerdns.com/";
     platforms = platforms.linux;
     license = licenses.gpl2;
     maintainers = with maintainers; [ rnhmjoj ];

From 053e735b3cfd94009efcda49fc0cf81528bb5c61 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 21:25:21 -0400
Subject: [PATCH 2579/4636] gnirehtet: upgrade cargo fetcher and cargoSha256

---
 pkgs/tools/networking/gnirehtet/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix
index 913d1c1a52b4..601f70e187a6 100644
--- a/pkgs/tools/networking/gnirehtet/default.nix
+++ b/pkgs/tools/networking/gnirehtet/default.nix
@@ -25,10 +25,7 @@ rustPlatform.buildRustPackage {
       sha256 = "1c99d6zpjxa8xlrg0n1825am20d2pjiicfcjwv8iay9ylfdnvygl";
   };
   sourceRoot = "source/relay-rust";
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1l1cirhmfkpa466vksynlhwggsfiahws7cpsxydrc414l415l283";
+  cargoSha256 = "0rb5xcqg5ikgrxpmzrql5n298j50aqgkkp45znbfv2x2n40dywad";
 
   patchFlags = [ "-p2" ];
   patches = [

From b6d45301de5bb6e275af92333a4c767edef09f0e Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Mon, 9 Mar 2020 02:42:17 +0100
Subject: [PATCH 2580/4636] alot: add patch for email composition

This version is not usable without this patch.
See https://github.com/pazz/alot/issues/1468.
---
 pkgs/development/python-modules/alot/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix
index b7005b4168b5..0b869e4228b0 100644
--- a/pkgs/development/python-modules/alot/default.nix
+++ b/pkgs/development/python-modules/alot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPythonPackage, python, fetchFromGitHub, isPy3k
+{ stdenv, lib, buildPythonPackage, python, fetchFromGitHub, fetchpatch, isPy3k
 , notmuch, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme
 , service-identity
 , gnupg ? null, sphinx, awk ? null, procps ? null, future ? null
@@ -19,6 +19,15 @@ buildPythonPackage rec {
     sha256 = "sha256-WUwOJcq8JE7YO8sFeZwYikCRhpufO0pL6MKu54ZYsHI=";
   };
 
+  patches = [
+    # can't compose email if signature is set: https://github.com/pazz/alot/issues/1468
+    (fetchpatch {
+      name = "envelope-body.patch";
+      url = "https://github.com/pazz/alot/commit/28a4296c7f556c251d71d9502681980d46d9fa55.patch";
+      sha256 = "1iwvmjyz4mh1g08vr85ywhah2xarcqg8dazagygk19icgsn45w06";
+    })
+  ];
+
   nativeBuildInputs = lib.optional withManpage sphinx;
 
   propagatedBuildInputs = [

From 5c6081efdf4bc8a00a6ba87338e2a4ae6d482375 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 22:04:15 -0400
Subject: [PATCH 2581/4636] httplz: upgrade cargo fetcher and cargoSha256

---
 pkgs/tools/networking/httplz/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix
index c394f216e0f7..5d59010ac1ef 100644
--- a/pkgs/tools/networking/httplz/default.nix
+++ b/pkgs/tools/networking/httplz/default.nix
@@ -21,10 +21,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoBuildFlags = [ "--bin httplz" ];
   cargoPatches = [ ./cargo-lock.patch ];
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1ajxfvj1pv6yq84zgrh7vjzghpb2y8qd5r09gzwdvww5rbj920fq";
+  cargoSha256 = "13hk9m09jff3bxbixsjvksiir4j4mak4ckvlq45bx5d5lh8sapxl";
 
   postInstall = ''
     wrapProgram $out/bin/httplz \

From 2fd069c4e5801e84fb67e11123636582cbc33941 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 22:10:27 -0400
Subject: [PATCH 2582/4636] onefetch: upgrade cargo fetcher and cargoSha256

---
 pkgs/tools/misc/onefetch/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix
index 9c5ffc260ffb..58abf6f72f8c 100644
--- a/pkgs/tools/misc/onefetch/default.nix
+++ b/pkgs/tools/misc/onefetch/default.nix
@@ -12,10 +12,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1sgpai3gx3w7w3ilmbnmzgdxdim6klkfiqaqxmffpyap6qgksfqs";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1phv06zf47bv5cmhypivljfiynrblha0kj13c5al9l0hd1xx749h";
+  cargoSha256 = "18z887mklynxpjci6va4i5zhg90j824avykym24vbz9w97nqpdd5";
 
   buildInputs = with stdenv;
     lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ];

From e6180f61b39042e4d56b9464b3c81e163dbe42fe Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 22:14:17 -0400
Subject: [PATCH 2583/4636] diesel-cli: upgrade cargo fetcher and cargoSha256
 (#82089)

---
 pkgs/development/tools/diesel-cli/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix
index d2888dc616a6..5c59703af3e7 100644
--- a/pkgs/development/tools/diesel-cli/default.nix
+++ b/pkgs/development/tools/diesel-cli/default.nix
@@ -37,10 +37,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoBuildFlags = [ "--no-default-features --features \"${features}\"" ];
   cargoPatches = [ ./cargo-lock.patch ];
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0xlcskddhy7xsiwj54gmn1xlgkfxb4dwrys7rbamfz1h8aa6ixjx";
+  cargoSha256 = "1vbb7r0dpmq8363i040bkhf279pz51c59kcq9v5qr34hs49ish8g";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ openssl ]

From 98493add79d048438b51150ec9a56649b04dcfad Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 22:14:49 -0400
Subject: [PATCH 2584/4636] eidolon: upgrade cargo fetcher and cargoSha256
 (#82090)

---
 pkgs/games/eidolon/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/games/eidolon/default.nix b/pkgs/games/eidolon/default.nix
index f6bc271ec02b..5461304d3343 100644
--- a/pkgs/games/eidolon/default.nix
+++ b/pkgs/games/eidolon/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
   };
   cargoPatches = [ ./cargo-lock.patch ];
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1887fjkk641cn6dpmyc5r3r2li61yw1nvfb0f2dp3169gycka15h";
+  cargoSha256 = "1i8qfphynwi42pkhhgllxq42dnw9f0dd6f829z94a3g91czyqvsw";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ openssl ];

From ad5b73c910bd4c4d064f589ee769fb968fe934ea Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 22:15:19 -0400
Subject: [PATCH 2585/4636] pax-rs: upgrade cargo fetcher and cargoSha256

---
 pkgs/development/tools/pax-rs/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix
index f2fff99d1532..aa83a1b8e1b6 100644
--- a/pkgs/development/tools/pax-rs/default.nix
+++ b/pkgs/development/tools/pax-rs/default.nix
@@ -36,8 +36,5 @@ buildRustPackage rec {
       cp ${cargo-lock} $out/Cargo.lock
     '';
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "132a9vnlyp78zxiw5xrazadvx0scs7h2vbm5wz612dmh436mwnxg";
+  cargoSha256 = "0wx5x7ll21bb6v34csk63kkvxdk3as720hdkaj0izdkpy0xf1knr";
 }

From 0696641d9f3801d8263567608007391d1a1d64df Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 22:15:25 -0400
Subject: [PATCH 2586/4636] cargo-raze: upgrade cargo fetcher and cargoSha256
 (#82091)

---
 pkgs/development/tools/rust/cargo-raze/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-raze/default.nix b/pkgs/development/tools/rust/cargo-raze/default.nix
index 48579e431064..f892263dd690 100644
--- a/pkgs/development/tools/rust/cargo-raze/default.nix
+++ b/pkgs/development/tools/rust/cargo-raze/default.nix
@@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec {
   };
   sourceRoot = "source/impl";
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "06rl7v0f1lgj9ii07fcnaxmhn28ckr03cpf5b93q8ripm5qh7my9";
+  cargoSha256 = "1z20xc508a3slc1ii3hy09swvlyib14zwf9akxc0h24d5m48as1c";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ curl libgit2 openssl ]

From ab0c847d8cecf0034f72fb61a79ac80d66268592 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 22:16:06 -0400
Subject: [PATCH 2587/4636] eva: upgrade cargo fetcher and cargoSha256 (#82093)

---
 pkgs/tools/misc/eva/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/tools/misc/eva/default.nix
index c720361b9cd1..dee181d95c23 100644
--- a/pkgs/tools/misc/eva/default.nix
+++ b/pkgs/tools/misc/eva/default.nix
@@ -4,10 +4,7 @@ rustPlatform.buildRustPackage rec {
   pname = "eva";
   version = "0.2.7";
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0n3xvlmp4l925nbz8lx6dr9yrrfh6z7b9z8wd6sli3a1dq26d6bg";
+  cargoSha256 = "1lycjw5i169xx73qw8gknbakrxikdbr65fmqx7xq2mafc0hb1zyn";
 
   src = fetchFromGitHub {
     owner = "NerdyPepper";

From 3dcdededf6623c989ae794530a41f15509e79164 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 22:27:42 -0400
Subject: [PATCH 2588/4636] rav1e: upgrade cargo fetcher and cargoSha256

---
 pkgs/tools/video/rav1e/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix
index 099a02e8f658..8a5e6c9eb40f 100644
--- a/pkgs/tools/video/rav1e/default.nix
+++ b/pkgs/tools/video/rav1e/default.nix
@@ -25,10 +25,7 @@ rustPlatform.buildRustPackage rec {
     '';
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0jxc8qsp5fasnh5cbg6yl9d878n7dppay9gzjndlb65kj9j43h84";
+  cargoSha256 = "0n6gkn4iyqk4bijrvcpq884hiihl4mpw1p417w1m0dw7j4y4karn";
 
   nativeBuildInputs = [ nasm ];
 

From 288561cd5856b81dae3a613178f85ce0109e8154 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 22:29:14 -0400
Subject: [PATCH 2589/4636] svd2rust: upgrade cargo fetcher and cargoSha256

---
 pkgs/development/tools/rust/svd2rust/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix
index fa457477b581..ecc7537267a9 100644
--- a/pkgs/development/tools/rust/svd2rust/default.nix
+++ b/pkgs/development/tools/rust/svd2rust/default.nix
@@ -14,10 +14,7 @@ buildRustPackage rec {
   };
   cargoPatches = [ ./cargo-lock.patch ];
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "03rfb8swxbcc9qm4mhxz5nm4b1gw7g7389wrdc91abxl4mw733ac";
+  cargoSha256 = "0n0xc8b982ra007l6gygssf1n60gfc2rphwyi7n95dbys1chciyg";
 
   # doc tests fail due to missing dependency
   doCheck = false;

From e12ed8e037e8823aeb49f0d67e33c64ad1140cee Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 22:53:57 -0400
Subject: [PATCH 2590/4636] wtftw: remove broken package

This was marked as broken years ago, and its last tagged release from upstream
was in 2015, with its last git commit in 2018.
---
 .../window-managers/wtftw/default.nix         | 42 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 44 deletions(-)
 delete mode 100644 pkgs/applications/window-managers/wtftw/default.nix

diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix
deleted file mode 100644
index febe16dd349f..000000000000
--- a/pkgs/applications/window-managers/wtftw/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchFromGitHub, rustPlatform, libXinerama, libX11, pkgconfig }:
-
-rustPlatform.buildRustPackage {
-  name = "wtftw-0.0pre20170921";
-  src = fetchFromGitHub {
-    owner = "kintaro";
-    repo = "wtftw";
-    rev = "13712d4c051938520b90b6639d4ff813f6fe5f48";
-    sha256 = "1r74nhcwiy2rmifzjhdal3jcqz4jz48nfvhdyw4gasa6nxp3msdl";
-  };
-
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "18lb24k71sndklbwwhbv8jglj2d4y9mdk07l60wsvn5m2jbnpckk";
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libXinerama libX11 ];
-  libPath = stdenv.lib.makeLibraryPath [ libXinerama libX11 ];
-
-  preInstall = ''
-    cargo update
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    mkdir -p $out/share/xsessions
-    cp -p target/release/wtftw $out/bin/
-    echo "[Desktop Entry]
-      Name=wtftw
-      Exec=$out/bin/wtftw
-      Type=XSession
-      DesktopName=wtftw" > $out/share/xsessions/wtftw.desktop
-  '';
-
-  meta = with stdenv.lib; {
-    broken = true;
-    description = "A tiling window manager in Rust";
-    homepage = https://github.com/Kintaro/wtftw;
-    license = stdenv.lib.licenses.bsd3;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21d74996dc8d..413e1a03c5b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22455,8 +22455,6 @@ in
 
   wsjtx = qt5.callPackage ../applications/radio/wsjtx { };
 
-  wtftw = callPackage ../applications/window-managers/wtftw {};
-
   wxhexeditor = callPackage ../applications/editors/wxhexeditor {
     wxGTK = wxGTK31;
   };

From 7fcbbea6548d33058a53801b15a33b80cb17af9c Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 23:06:25 -0400
Subject: [PATCH 2591/4636] wasm-bindgen-cli: upgrade cargo fetcher and
 cargoSha256

---
 pkgs/development/tools/wasm-bindgen-cli/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix
index a073d0ae9324..e5afcb30a817 100644
--- a/pkgs/development/tools/wasm-bindgen-cli/default.nix
+++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix
@@ -14,10 +14,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ];
   nativeBuildInputs = [ pkgconfig ];
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1cp8ns0cywzqchdw5hkg4fhxhqb6apxwjjasf1ksf3dgjwynlhzm";
+  cargoSha256 = "1ylk9vrpajslx1zy4vqmlyqa5ygcmvir1gcn8hsr6liigf5kcz7p";
   cargoPatches = [ ./0001-Add-cargo.lock.patch ];
   cargoBuildFlags = [ "-p" pname ];
 

From aa86eb9261eda71b7931aff70029c4775f0b181d Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 23:06:26 -0400
Subject: [PATCH 2592/4636] svgbob: upgrade cargo fetcher and cargoSha256

---
 pkgs/tools/graphics/svgbob/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/tools/graphics/svgbob/default.nix
index 68640d45bb21..d11f715464d7 100644
--- a/pkgs/tools/graphics/svgbob/default.nix
+++ b/pkgs/tools/graphics/svgbob/default.nix
@@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "source/svgbob_cli";
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0mnq1s809f394x83gjv9zljr07c94k48zkrwxs6ibi19shgmrnnd";
+  cargoSha256 = "1y9jsnxmz51zychmmzp6mi29pb5ks2qww7lk5bshkhp56v51sm8d";
 
   # Test tries to build outdated examples
   doCheck = false;

From 6bfb702a4de3457d5f1d457c29e675d241e0a63d Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 23:09:16 -0400
Subject: [PATCH 2593/4636] unpfs: upgrade cargo fetcher and cargoSha256

---
 pkgs/servers/unpfs/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/servers/unpfs/default.nix b/pkgs/servers/unpfs/default.nix
index dc228c25915d..9b67a901693d 100644
--- a/pkgs/servers/unpfs/default.nix
+++ b/pkgs/servers/unpfs/default.nix
@@ -13,10 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "source/example/unpfs";
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1d33nwj3i333a6ji3r3037mgg553lc3wsawm0pz13kbvhjf336i8";
+  cargoSha256 = "13mk86d8ql2196039qb7z0rx4svwffw1mzpiyxp35gg5fhcphriq";
 
   RUSTC_BOOTSTRAP = 1;
 

From ca015df0c3a5dc65a4037a27cecfd2bc496ad898 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 23:17:17 -0400
Subject: [PATCH 2594/4636] staccato: remove broken and unmaintained package

This package was added in 2017, then never updated, and no longer builds.
While upstream does have a newer release at version 0.1.9, this doesn't build
with the latest rustc either, and was last released in 2018:
https://github.com/tshlabs/staccato/releases

Since the upstream package just has 1 contributor, and the package in Nix has no
maintainer and is not building or updated, let's just delete it.
---
 pkgs/tools/text/staccato/default.nix | 33 ----------------------------
 pkgs/top-level/all-packages.nix      |  2 --
 2 files changed, 35 deletions(-)
 delete mode 100644 pkgs/tools/text/staccato/default.nix

diff --git a/pkgs/tools/text/staccato/default.nix b/pkgs/tools/text/staccato/default.nix
deleted file mode 100644
index cbd53c898233..000000000000
--- a/pkgs/tools/text/staccato/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
-
-rustPlatform.buildRustPackage rec {
-  pname = "staccato";
-  version = "0.1.6";
-
-  src = fetchFromGitHub {
-    owner = "tshlabs";
-    repo = "staccato";
-    rev = version;
-    sha256 = "1zbd1gx0ik2r7bavcid776j37g6rzd3f6cs94kq1qar4gyf1gqjm";
-  };
-
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0h1822hba6lpv14y6hgn8qgh7p812b3kkf592ggr6yjlhqfh37n7";
-
-  meta = {
-    broken = true;
-    description = "A command line program that lets you compute statistics from values from a file or standard input";
-    longDescription = ''
-      Staccato (`st` for short) is a command line program that lets you
-      compute statistics from values from a file or standard input. It
-      computes things about the stream of numbers like min, max, mean, median,
-      and standard deviation. It can also compute these things about some
-      subset of the stream, for example the lower 95% of values.
-    '';
-    homepage = https://docs.rs/crate/staccato;
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21d74996dc8d..2383316fa443 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2104,8 +2104,6 @@ in
 
   socklog = callPackage ../tools/system/socklog { };
 
-  staccato = callPackage ../tools/text/staccato { };
-
   stagit = callPackage ../development/tools/stagit { };
 
   step-ca = callPackage ../tools/security/step-ca { };

From d4844a1a498e5e188dede00baf69e80229948db8 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 23:32:01 -0400
Subject: [PATCH 2595/4636] vdirsyncer: upgrade cargo fetcher and cargoSha256

---
 pkgs/tools/misc/vdirsyncer/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index 2f8bb36990b7..52eec555b165 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -19,10 +19,7 @@ python3Packages.buildPythonApplication rec {
     name = "${name}-native";
     inherit src;
     sourceRoot = "source/rust";
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-    cargoSha256 = "1n1dxq3klsry5mmbfff2jv7ih8mr5zvpncrdgba6qs93wi77qi0y";
+    cargoSha256 = "0cqy0s55pkg6hww86h7qip4xaidh6g8lcypdj84n2x374jq38c5d";
     buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
   };
 

From b20aaf3e7a3d76e9c4dd6208ee7d464917c53f5e Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 23:32:15 -0400
Subject: [PATCH 2596/4636] rustracerd: upgrade cargo fetcher and cargoSha256

---
 pkgs/development/tools/rust/racerd/default.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix
index c9b89abb0b07..c49ea2aaf128 100644
--- a/pkgs/development/tools/rust/racerd/default.nix
+++ b/pkgs/development/tools/rust/racerd/default.nix
@@ -1,10 +1,9 @@
 { stdenv, fetchFromGitHub, rustPlatform, makeWrapper , Security }:
 
-with rustPlatform;
-
-buildRustPackage rec {
+rustPlatform.buildRustPackage rec {
   pname = "racerd";
   version = "unstable-2019-09-02";
+
   src = fetchFromGitHub {
     owner = "jwilm";
     repo = "racerd";
@@ -12,16 +11,13 @@ buildRustPackage rec {
     sha256 = "13jqdvjk4savcl03mrn2vzgdsd7vxv2racqbyavrxp2cm9h6cjln";
   };
 
+  cargoSha256 = "1nwjr7v8hkhsql93wbwk5gqqiq725gj5iwwsbd250my9g5kkfdbw";
+
   # a nightly compiler is required unless we use this cheat code.
   RUSTC_BOOTSTRAP=1;
 
   doCheck = false;
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "07130587drrdkrk7aqb8pl8i3p485qr6xh1m86630ydlnb9z6s6i";
-
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 
@@ -35,7 +31,7 @@ buildRustPackage rec {
 
   meta = with stdenv.lib; {
     description = "JSON/HTTP Server based on racer for adding Rust support to editors and IDEs";
-    homepage = https://github.com/jwilm/racerd;
+    homepage = "https://github.com/jwilm/racerd";
     license = licenses.asl20;
     platforms = platforms.all;
   };

From 12a97158a2758f43b9d79bea1249c6a301d746d6 Mon Sep 17 00:00:00 2001
From: Luca Favatella <lucafavatella@users.noreply.github.com>
Date: Sun, 8 Mar 2020 16:48:01 +0000
Subject: [PATCH 2597/4636] androidenv: rely on shebang of ./generate.sh

---
 doc/languages-frameworks/android.section.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/android.section.md b/doc/languages-frameworks/android.section.md
index 9a5df2523a25..d76b590ede30 100644
--- a/doc/languages-frameworks/android.section.md
+++ b/doc/languages-frameworks/android.section.md
@@ -235,5 +235,5 @@ package manager uses. To update the expressions run the `generate.sh` script
 that is stored in the `pkgs/development/mobile/androidenv/` sub directory:
 
 ```bash
-sh ./generate.sh
+./generate.sh
 ```

From 6f809839633ab4e3434df7eb125cc4d5d0b406b7 Mon Sep 17 00:00:00 2001
From: Tad Fisher <tadfisher@gmail.com>
Date: Fri, 22 Mar 2019 10:44:48 -0700
Subject: [PATCH 2598/4636] androidenv: update generate.sh to use nix-shell and
 fail on error

Update generate.sh to run using nix-shell. Also make it fail with
meaningful output instead of writing empty output files.

This is extracted from https://github.com/NixOS/nixpkgs PR 58131.

This relies on the shebang being used.
---
 .../development/mobile/androidenv/generate.sh | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 pkgs/development/mobile/androidenv/generate.sh

diff --git a/pkgs/development/mobile/androidenv/generate.sh b/pkgs/development/mobile/androidenv/generate.sh
old mode 100644
new mode 100755
index 1c55734f5f42..895a741adffe
--- a/pkgs/development/mobile/androidenv/generate.sh
+++ b/pkgs/development/mobile/androidenv/generate.sh
@@ -1,16 +1,36 @@
-#!/bin/sh -e
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl libxslt
+
+set -e
+
+die() {
+    echo "$1" >&2
+    exit 1
+}
+
+fetch() {
+    local url="https://dl.google.com/android/repository/$1"
+    echo "$url -> $2"
+    curl -s "$url" -o "$2" || die "Failed to fetch $url"
+}
+
+pushd "$(dirname "$0")" &>/dev/null || exit 1
+
+mkdir -p xml
 
 # Convert base packages
-curl https://dl.google.com/android/repository/repository2-1.xml -o xml/repository2-1.xml
+fetch repository2-1.xml xml/repository2-1.xml
 xsltproc convertpackages.xsl xml/repository2-1.xml > generated/packages.nix
 
 # Convert system images
 for img in android android-tv android-wear android-wear-cn google_apis google_apis_playstore
 do
-    curl https://dl.google.com/android/repository/sys-img/$img/sys-img2-1.xml -o xml/$img-sys-img2-1.xml
+    fetch sys-img/$img/sys-img2-1.xml xml/$img-sys-img2-1.xml
     xsltproc --stringparam imageType $img convertsystemimages.xsl xml/$img-sys-img2-1.xml > generated/system-images-$img.nix
 done
 
 # Convert system addons
-curl https://dl.google.com/android/repository/addon2-1.xml -o xml/addon2-1.xml
+fetch addon2-1.xml xml/addon2-1.xml
 xsltproc convertaddons.xsl xml/addon2-1.xml > generated/addons.nix
+
+popd &>/dev/null

From d574ea45a2d3ef49e78d915b119b8d59de5d6a66 Mon Sep 17 00:00:00 2001
From: Tad Fisher <tadfisher@gmail.com>
Date: Fri, 22 Mar 2019 10:44:48 -0700
Subject: [PATCH 2599/4636] androidenv: fix system images xsl used in
 generate.sh

Updated with fixes for `convertsystemimages.xsl`:
- Use `type-details/codename` if it exists, falling back to
  `type-details/api-level`: this results in "Q" rather than "28" for
  preview images
- Use `<xsl:text>` elements to control whitespace in the output.

This is extracted from https://github.com/NixOS/nixpkgs PR 58131.
---
 .../mobile/androidenv/convertsystemimages.xsl | 67 +++++++++++++------
 1 file changed, 48 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/convertsystemimages.xsl b/pkgs/development/mobile/androidenv/convertsystemimages.xsl
index 42d19cb69651..de57041f1923 100644
--- a/pkgs/development/mobile/androidenv/convertsystemimages.xsl
+++ b/pkgs/development/mobile/androidenv/convertsystemimages.xsl
@@ -6,7 +6,7 @@
 
   <xsl:param name="imageType" />
 
-  <xsl:output omit-xml-declaration="yes" indent="no" />
+  <xsl:output method="text" omit-xml-declaration="yes" indent="no" />
 
   <xsl:template name="repository-url">
     <xsl:variable name="raw-url" select="complete/url"/>
@@ -15,33 +15,62 @@
         <xsl:value-of select="$raw-url"/>
       </xsl:when>
       <xsl:otherwise>
-        https://dl.google.com/android/repository/sys-img/<xsl:value-of select="$imageType" />/<xsl:value-of select="$raw-url"/>
+        <xsl:text>https://dl.google.com/android/repository/sys-img/</xsl:text><xsl:value-of select="$imageType" /><xsl:text>/</xsl:text><xsl:value-of select="$raw-url"/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
+  <xsl:template mode="revision" match="type-details[codename]">
+    <xsl:value-of select="codename" />-<xsl:value-of select="tag/id" />-<xsl:value-of select="abi" />
+  </xsl:template>
+
+  <xsl:template mode="revision" match="type-details[not(codename)]">
+    <xsl:value-of select="api-level" />-<xsl:value-of select="tag/id" />-<xsl:value-of select="abi" />
+  </xsl:template>
+
+  <xsl:template mode="attrkey" match="type-details[codename]">
+    <xsl:text>"</xsl:text>
+    <xsl:value-of select="codename" />
+    <xsl:text>".</xsl:text>
+    <xsl:value-of select="tag/id" />
+    <xsl:text>."</xsl:text>
+    <xsl:value-of select="abi" />
+    <xsl:text>"</xsl:text>
+  </xsl:template>
+
+  <xsl:template mode="attrkey" match="type-details[not(codename)]">
+    <xsl:text>"</xsl:text>
+    <xsl:value-of select="api-level" />
+    <xsl:text>".</xsl:text>
+    <xsl:value-of select="tag/id" />
+    <xsl:text>."</xsl:text>
+    <xsl:value-of select="abi" />
+    <xsl:text>"</xsl:text>
+  </xsl:template>
+
   <xsl:template match="/sys-img:sdk-sys-img">
-{fetchurl}:
+<xsl:text>{fetchurl}:
 
 {
-  <xsl:for-each select="remotePackage[starts-with(@path, 'system-images;')]">
-    <xsl:variable name="revision">
-      <xsl:value-of select="type-details/api-level" />-<xsl:value-of select="type-details/tag/id" />-<xsl:value-of select="type-details/abi" />
-    </xsl:variable>
+</xsl:text><xsl:for-each select="remotePackage[starts-with(@path, 'system-images;')]">
+  <xsl:variable name="revision"><xsl:apply-templates mode="revision" select="type-details" /></xsl:variable>
 
-    "<xsl:value-of select="type-details/api-level" />".<xsl:value-of select="type-details/tag/id" />."<xsl:value-of select="type-details/abi" />" = {
-      name = "system-image-<xsl:value-of select="$revision" />";
-      path = "<xsl:value-of select="translate(@path, ';', '/')" />";
-      revision = "<xsl:value-of select="$revision" />";
-      displayName = "<xsl:value-of select="display-name" />";
-      archives.all = fetchurl {
-      <xsl:for-each select="archives/archive">
-        url = <xsl:call-template name="repository-url"/>;
-        sha1 = "<xsl:value-of select="complete/checksum" />";
-      </xsl:for-each>
-      };
+  <xsl:variable name="attrkey"><xsl:apply-templates mode="attrkey" select="type-details" /></xsl:variable>
+
+  <xsl:text>  </xsl:text><xsl:value-of select="$attrkey" /><xsl:text> = {
+    name = "system-image-</xsl:text><xsl:value-of select="$revision" /><xsl:text>";
+    path = "</xsl:text><xsl:value-of select="translate(@path, ';', '/')" /><xsl:text>";
+    revision = "</xsl:text><xsl:value-of select="$revision" /><xsl:text>";
+    displayName = "</xsl:text><xsl:value-of select="display-name" /><xsl:text>";
+    archives.all = fetchurl {</xsl:text>
+    <xsl:for-each select="archives/archive"><xsl:text>
+      url = </xsl:text><xsl:call-template name="repository-url"/><xsl:text>;
+      sha1 = "</xsl:text><xsl:value-of select="complete/checksum" /><xsl:text>";</xsl:text>
+    </xsl:for-each><xsl:text>
+    };
   };
+</xsl:text>
   </xsl:for-each>
-}
+<xsl:text>}</xsl:text>
   </xsl:template>
 </xsl:stylesheet>

From a709184ba31804321ef23ca626445b9b754b97e2 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Mon, 9 Mar 2020 00:02:24 -0400
Subject: [PATCH 2600/4636] polkadot: upgrade cargoSha256 and add maintainer
 note

While the package is broken and does not build, we can still recompute the
cargoSha256. I attempted to upgrade to the latest release, but that doesn't
build either.
---
 .../applications/blockchains/polkadot/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix
index cf83be9b50dc..a919a3054196 100644
--- a/pkgs/applications/blockchains/polkadot/default.nix
+++ b/pkgs/applications/blockchains/polkadot/default.nix
@@ -11,24 +11,27 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchFromGitHub {
     owner = "paritytech";
+    # N.B. In 2018, the thing that was "polkadot" was split off into its own
+    # repo, so if this package is ever updated it should be changed to
+    # paritytech/polkadot, as per comment here:
+    # https://github.com/paritytech/polkadot#note
     repo = "substrate";
     rev = "19f4f4d4df3bb266086b4e488739f73d3d5e588c";
     sha256 = "0v7g03rbml2afw0splmyjh9nqpjg0ldjw09hyc0jqd3qlhgxiiyj";
-  }; 
+  };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "0gc3w0cwdyk8f7cgpp9sfawczk3n6wd7q0nhfvk87sry71b8vvwq";
+  cargoSha256 = "1h5v7c7xi2r2wzh1pj6xidrg7dx23w3rjm88mggpq7574arijk4i";
 
   buildInputs = [ pkgconfig openssl openssl.dev ];
 
   meta = with stdenv.lib; {
     description = "Polkadot Node Implementation";
-    homepage = https://polkadot.network;
+    homepage = "https://polkadot.network";
     license = licenses.gpl3;
     maintainers = [ maintainers.akru ];
     platforms = platforms.linux;
+    # Last attempt at building this was on v0.7.22
+    # https://github.com/paritytech/polkadot/releases
     broken = true;
   };
 }

From 6ea0cad71409217fa28c86ca7e218ff1fb0b06cf Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Mon, 9 Mar 2020 00:10:59 -0400
Subject: [PATCH 2601/4636] rustracer: upgrade cargo fetcher and cargoSha256

---
 pkgs/development/tools/rust/racer/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index 8839464e9f66..82b415bc8a3f 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0svvdkfqpk2rw0wxyrhkxy553k55lg7jxc0ly4w1195iwv14ad3y";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1qxg9r6wpv811fh2l889jm0ya96gsra00kqpyxh41fb7myvl2a4i";
+  cargoSha256 = "0zaqa89z3nf23s2q1jpmfz4lygh4zq9ymql71d748fgjy9psr449";
 
   buildInputs = [ makeWrapper ]
                 ++ stdenv.lib.optional stdenv.isDarwin Security;

From 81cb6ccb576d44277bae074dc5349fc47f1c8b42 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Mon, 9 Mar 2020 00:15:13 -0400
Subject: [PATCH 2602/4636] ja2-stracciatella: upgrade cargo fetcher and
 cargoSha256

---
 pkgs/games/ja2-stracciatella/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix
index a08ce593012c..89d75dd837fa 100644
--- a/pkgs/games/ja2-stracciatella/default.nix
+++ b/pkgs/games/ja2-stracciatella/default.nix
@@ -1,5 +1,4 @@
 { stdenv, fetchFromGitHub, cmake, SDL2, boost, fltk, rustPlatform }:
-with rustPlatform;
 let
   version = "0.16.1";
   src = fetchFromGitHub {
@@ -18,12 +17,11 @@ let
       cp ${lockfile} $out/Cargo.lock
     '';
   };
-  libstracciatella = buildRustPackage {
-    name = "libstracciatella-${version}";
+  libstracciatella = rustPlatform.buildRustPackage {
+    pname = "libstracciatella";
     inherit version;
     src = libstracciatellaSrc;
-    legacyCargoFetcher = true;
-    cargoSha256 = "0a1pc8wyvgmna0a5cbpv3mh0h4nzjxlm887ymcq00cy1ciq5nmj4";
+    cargoSha256 = "15djs4xaz4y1hpfyfqxdgdasxr0b5idy9i5a7c8cmh0jkxjv8bqc";
     doCheck = false;
   };
 in
@@ -37,15 +35,17 @@ stdenv.mkDerivation {
   patches = [
     ./remove-rust-buildstep.patch
   ];
+
   preConfigure = ''
     sed -i -e 's|rust-stracciatella|${libstracciatella}/lib/libstracciatella.so|g' CMakeLists.txt
     cmakeFlagsArray+=("-DEXTRA_DATA_DIR=$out/share/ja2")
   '';
 
   enableParallelBuilding = true;
+
   meta = {
     description = "Jagged Alliance 2, with community fixes";
     license = "SFI Source Code license agreement";
-    homepage = https://ja2-stracciatella.github.io/;
+    homepage = "https://ja2-stracciatella.github.io/";
   };
 }

From 27a0a1376b4f79e65f220f584d648e55e002acfe Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Mon, 9 Mar 2020 00:34:39 -0400
Subject: [PATCH 2603/4636] btrfs-dedupe: remove broken and abandoned package

This package was last released in 2017, and no longer compiles with the latest
Rust compiler. It has just 1 commit from someone other than the original author
and appears to be a dead project.
---
 .../filesystems/btrfs-dedupe/default.nix      | 29 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 31 deletions(-)
 delete mode 100644 pkgs/tools/filesystems/btrfs-dedupe/default.nix

diff --git a/pkgs/tools/filesystems/btrfs-dedupe/default.nix b/pkgs/tools/filesystems/btrfs-dedupe/default.nix
deleted file mode 100644
index 40a58e4227f3..000000000000
--- a/pkgs/tools/filesystems/btrfs-dedupe/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, rustPlatform, lzo, zlib }:
-
-with rustPlatform;
-
-buildRustPackage rec {
-  pname = "btrfs-dedupe";
-  version = "1.1.0";
-
-
-  src = fetchurl {
-    url = "https://gitlab.wellbehavedsoftware.com/well-behaved-software/btrfs-dedupe/repository/archive.tar.bz2?ref=72c6a301d20f935827b994db210bf0a1e121273a";
-    sha256 = "0qy1g4crhfgs2f5cmrsjv6qscg3r66gb8n6sxhimm9ksivhjyyjp";
-  };
-
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1sz3fswb76rnk7x4kpl1rnj2yxbhpx6q8kv8xxiqdr7qyphpi98r";
-
-  buildInputs = [ lzo zlib ];
-
-  meta = with stdenv.lib; {
-    homepage = https://gitlab.wellbehavedsoftware.com/well-behaved-software/btrfs-dedupe;
-    description = "BTRFS deduplication utility";
-    license = licenses.mit;
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ ikervagyok ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21d74996dc8d..dde5273e08db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1293,8 +1293,6 @@ in
 
   btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { };
 
-  btrfs-dedupe = callPackage ../tools/filesystems/btrfs-dedupe {};
-
   btrbk = callPackage ../tools/backup/btrbk {
     asciidoc = asciidoc-full;
   };

From c7874f018fdce0d55561d6f8ba54c50f33144406 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 9 Mar 2020 04:35:17 +0000
Subject: [PATCH 2604/4636] python27Packages.azure-mgmt-sql: 0.16.0 -> 0.17.0

---
 pkgs/development/python-modules/azure-mgmt-sql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix
index 0929ca3ff5c2..a81f336df066 100644
--- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-sql";
-  version = "0.16.0";
+  version = "0.17.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "ddbdc29c1dca437275b0cb5a6fe2d86fa6886ccefb2270287357f07afe80a4ac";
+    sha256 = "1kp1wzcydgyc2mzkxigfv6rqzwzf3d0cnbqc6w7h907qbb4lw2r0";
   };
 
   propagatedBuildInputs = [

From de119ca8eaf85eb6efcf8ca31ba9091cc670e868 Mon Sep 17 00:00:00 2001
From: Luca Favatella <lucafavatella@users.noreply.github.com>
Date: Mon, 9 Mar 2020 02:45:04 +0000
Subject: [PATCH 2605/4636] androidenv: fix packages xsl used in generate.sh

Entry `<remotePackage path="cmdline-tools;latest">` resulted in a
duplicated `"cmdline-tools"."1.0"`.
---
 pkgs/development/mobile/androidenv/convertpackages.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/mobile/androidenv/convertpackages.xsl b/pkgs/development/mobile/androidenv/convertpackages.xsl
index 9623e01abcd7..5c36deb73c08 100644
--- a/pkgs/development/mobile/androidenv/convertpackages.xsl
+++ b/pkgs/development/mobile/androidenv/convertpackages.xsl
@@ -28,7 +28,7 @@
 
 {
   <!-- Convert all remote packages -->
-  <xsl:for-each select="remotePackage"><xsl:sort select="@path" />
+  <xsl:for-each select="remotePackage[not(contains(@path, ';') and substring-after(@path, ';') = 'latest')]"><xsl:sort select="@path" />
 
   <!-- Extract the package name from the path -->
   <xsl:variable name="name">

From 134f8cc84d11e332de2431493e8009fd946ae9d6 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 9 Mar 2020 15:58:22 +1000
Subject: [PATCH 2606/4636] youtube-dl: 2020.03.06 -> 2020.03.08

https://github.com/ytdl-org/youtube-dl/releases/tag/2020.03.08
---
 pkgs/tools/misc/youtube-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index c17731c8cdb0..2f875e01f3f8 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -18,11 +18,11 @@ buildPythonPackage rec {
   # The websites youtube-dl deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2020.03.06";
+  version = "2020.03.08";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "16c10rgkjrjv115w4r7gsr9hcakqq5s2cg250b1hwvxdsxqp8vnv";
+    sha256 = "1xbka14wnalcqkhibfcqw8f5bw1m9b1f44719yifv1jk0614q4bn";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From d140b5f8f713226d3f24c23c5c14fb96550235ca Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 9 Mar 2020 06:02:02 +0000
Subject: [PATCH 2607/4636] python27Packages.jenkins-job-builder: 3.2.0 ->
 3.3.0

---
 .../python-modules/jenkins-job-builder/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix
index a5015f4d3267..26b7ab5d622f 100644
--- a/pkgs/development/python-modules/jenkins-job-builder/default.nix
+++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "jenkins-job-builder";
-  version = "3.2.0";
+  version = "3.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1njxww53d92cpgrqlr09w2n0pk6wamjcb0mvpns1mr2pn5hy1jhi";
+    sha256 = "0znnw1vnvnm8a6gfrk479s2b9hzlxi4qy57c9a47qphvx3mklm8x";
   };
 
   postPatch = ''

From 8e967e8b8db3abf045f60a7cc49bc1bfd1fe168f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 9 Mar 2020 07:26:18 +0000
Subject: [PATCH 2608/4636] python27Packages.dominate: 2.4.0 -> 2.5.1

---
 pkgs/development/python-modules/dominate/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/dominate/default.nix b/pkgs/development/python-modules/dominate/default.nix
index 7288dee77631..3881bf2dd864 100644
--- a/pkgs/development/python-modules/dominate/default.nix
+++ b/pkgs/development/python-modules/dominate/default.nix
@@ -2,17 +2,17 @@
 
 buildPythonPackage rec {
   pname = "dominate";
-  version = "2.4.0";
+  version = "2.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1775cz6lipb43hmjll77m2pxh72pikng74lpg30v9n1b66s78959";
+    sha256 = "0y4xzch6kwzddwz6pmk8cd09r3dpkxm1bh4q1byhm37a0lb4h1cv";
   };
 
   doCheck = !isPy3k;
 
   meta = with lib; {
-    homepage = https://github.com/Knio/dominate/;
+    homepage = "https://github.com/Knio/dominate/";
     description = "Dominate is a Python library for creating and manipulating HTML documents using an elegant DOM API";
     license = licenses.lgpl3;
     maintainers = with maintainers; [ ];

From 08341c372a014505054306a25cce466e624687ac Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 9 Mar 2020 09:10:43 +0000
Subject: [PATCH 2609/4636] python27Packages.lark-parser: 0.8.1 -> 0.8.2

---
 pkgs/development/python-modules/lark-parser/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix
index 1ba7df00ea3a..ddf6cabcae94 100644
--- a/pkgs/development/python-modules/lark-parser/default.nix
+++ b/pkgs/development/python-modules/lark-parser/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "lark-parser";
-  version = "0.8.1";
+  version = "0.8.2";
 
   src = fetchFromGitHub {
     owner = "lark-parser";
     repo = "lark";
     rev = version;
-    sha256 = "1mjicdvrzh9r9q3xrjrzaiaxk04r60a3l6l0vnp1hq3xfc9ccqc8";
+    sha256 = "1i585q27qlwk4rpgsh621s60im1j9ynwyz5pcc8s3ffmjam28vss";
   };
 
   # tests of Nearley support require js2py
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "A modern parsing library for Python, implementing Earley & LALR(1) and an easy interface";
-    homepage = https://github.com/lark-parser/lark;
+    homepage = "https://github.com/lark-parser/lark";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fridh ];
   };

From b074365fd4a0b979f63d5e503195ddd8bfe1a048 Mon Sep 17 00:00:00 2001
From: Luis Hebendanz <luis.nixos@gmail.com>
Date: Wed, 30 Oct 2019 22:40:12 +0100
Subject: [PATCH 2610/4636] rmount: 1.0.1 -> 1.1.0

---
 pkgs/tools/filesystems/rmount/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/rmount/default.nix b/pkgs/tools/filesystems/rmount/default.nix
index 46be9e30f70f..72172ef5baa2 100644
--- a/pkgs/tools/filesystems/rmount/default.nix
+++ b/pkgs/tools/filesystems/rmount/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
 
   pname   = "rmount";
-  version = "1.0.1";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "Luis-Hebendanz";
     repo = "rmount";
-    sha256 = "1wjmfvbsq3126z51f2ivj85cjmkrzdm2acqsiyqs57qga2g6w5p9";
+    sha256 = "0j1ayncw1nnmgna7vyx44vwinh4ah1b0l5y8agc7i4s8clbvy3h0";
   };
 
   buildInputs = [ makeWrapper ];

From cc90ececa78a269bcf185e62e160a0eed4d45a14 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 9 Mar 2020 12:01:19 +0100
Subject: [PATCH 2611/4636] environment.etc: fix typo

---
 nixos/modules/system/etc/etc.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix
index 57ade2880962..1f4d54a1ae20 100644
--- a/nixos/modules/system/etc/etc.nix
+++ b/nixos/modules/system/etc/etc.nix
@@ -94,7 +94,7 @@ in
               default = 0;
               type = types.int;
               description = ''
-                UID of created file. Only takes affect when the file is
+                UID of created file. Only takes effect when the file is
                 copied (that is, the mode is not 'symlink').
                 '';
             };
@@ -103,7 +103,7 @@ in
               default = 0;
               type = types.int;
               description = ''
-                GID of created file. Only takes affect when the file is
+                GID of created file. Only takes effect when the file is
                 copied (that is, the mode is not 'symlink').
               '';
             };
@@ -113,7 +113,7 @@ in
               type = types.str;
               description = ''
                 User name of created file.
-                Only takes affect when the file is copied (that is, the mode is not 'symlink').
+                Only takes effect when the file is copied (that is, the mode is not 'symlink').
                 Changing this option takes precedence over <literal>uid</literal>.
               '';
             };
@@ -123,7 +123,7 @@ in
               type = types.str;
               description = ''
                 Group name of created file.
-                Only takes affect when the file is copied (that is, the mode is not 'symlink').
+                Only takes effect when the file is copied (that is, the mode is not 'symlink').
                 Changing this option takes precedence over <literal>gid</literal>.
               '';
             };

From 5012d8a36cc570d7cc07b95fca80129dea8f32bb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 9 Mar 2020 11:05:00 +0000
Subject: [PATCH 2612/4636] python37Packages.jupyterlab_server: 1.0.6 -> 1.0.7

---
 .../python-modules/jupyterlab_server/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix
index edfe01728a49..9a5261694897 100644
--- a/pkgs/development/python-modules/jupyterlab_server/default.nix
+++ b/pkgs/development/python-modules/jupyterlab_server/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "jupyterlab_server";
-  version = "1.0.6";
+  version = "1.0.7";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d0977527bfce6f47c782cb6bf79d2c949ebe3f22ac695fa000b730c671445dad";
+    sha256 = "1qnqxy6812py7xklg7xfrkadm0v4z8x6n1035i26h2z7y891ff0j";
   };
 
   checkInputs = [ requests pytest ];
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "JupyterLab Server";
-    homepage = https://jupyter.org;
+    homepage = "https://jupyter.org";
     license = licenses.bsdOriginal;
     maintainers = [ maintainers.costrouc ];
   };

From db6c94304f3186b2e09abfd01f8c485b7886e0c4 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Mon, 9 Mar 2020 11:28:07 +0000
Subject: [PATCH 2613/4636] switch-to-configuration: Add new option
 X-OnlyManualStart

This is to facilitate units that should _only_ be manually started and
not activated when a configuration is switched to.

More specifically this is to be used by the new Nixops deploy-*
targets created in https://github.com/NixOS/nixops/pull/1245 that are
triggered by Nixops before/after switch-to-configuration is called.
---
 nixos/modules/system/activation/switch-to-configuration.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 641cf9faadc9..b82d69b3bb85 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -183,7 +183,7 @@ while (my ($unit, $state) = each %{$activePrev}) {
             # active after the system has resumed, which probably
             # should not be the case.  Just ignore it.
             if ($unit ne "suspend.target" && $unit ne "hibernate.target" && $unit ne "hybrid-sleep.target") {
-                unless (boolIsTrue($unitInfo->{'RefuseManualStart'} // "no")) {
+                unless (boolIsTrue($unitInfo->{'RefuseManualStart'} // "no") || boolIsTrue($unitInfo->{'X-OnlyManualStart'} // "no")) {
                     $unitsToStart{$unit} = 1;
                     recordUnit($startListFile, $unit);
                     # Don't spam the user with target units that always get started.
@@ -222,7 +222,7 @@ while (my ($unit, $state) = each %{$activePrev}) {
                     $unitsToReload{$unit} = 1;
                     recordUnit($reloadListFile, $unit);
                 }
-                elsif (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "yes") || boolIsTrue($unitInfo->{'RefuseManualStop'} // "no") ) {
+                elsif (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "yes") || boolIsTrue($unitInfo->{'RefuseManualStop'} // "no") || boolIsTrue($unitInfo->{'X-OnlyManualStart'} // "no")) {
                     $unitsToSkip{$unit} = 1;
                 } else {
                     if (!boolIsTrue($unitInfo->{'X-StopIfChanged'} // "yes")) {

From 0bfada7dda710e1a1a99ab67639eb1deb981cbed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 20 Feb 2020 11:53:24 +0000
Subject: [PATCH 2614/4636] bcc: 0.12.0 -> 0.13.0

---
 pkgs/os-specific/linux/bcc/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix
index ffb14e9c3c12..949d953c3bd5 100644
--- a/pkgs/os-specific/linux/bcc/default.nix
+++ b/pkgs/os-specific/linux/bcc/default.nix
@@ -1,18 +1,15 @@
-{ stdenv, fetchFromGitHub, makeWrapper, cmake, llvmPackages, kernel
+{ stdenv, fetchurl, makeWrapper, cmake, llvmPackages, kernel
 , flex, bison, elfutils, python, luajit, netperf, iperf, libelf
 , systemtap, bash
 }:
 
 python.pkgs.buildPythonApplication rec {
-  version = "0.12.0";
+  version = "0.13.0";
   name = "bcc-${version}";
 
-  src = fetchFromGitHub {
-    owner  = "iovisor";
-    repo   = "bcc";
-    rev    = "v${version}";
-    sha256 = "1r2yjxam23k56prsvjhqf8i8d3irhcvmy0bly6x23h1jc3zc6yym";
-    fetchSubmodules = true;
+  src = fetchurl {
+    url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz";
+    sha256 = "15xpwf17x2j1c1wcb84cgfs35dp5w0rjd9mllmddmdjvn303wffx";
   };
   format = "other";
 

From a615615a2d27aab7f061dfc1d51914818ee9873d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 9 Mar 2020 12:12:53 +0000
Subject: [PATCH 2615/4636] python27Packages.sphinxcontrib_plantuml: 0.17.1 ->
 0.18

---
 .../python-modules/sphinxcontrib_plantuml/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
index d89ecb6218c2..579b2f173eee 100644
--- a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "sphinxcontrib-plantuml";
-  version = "0.17.1";
+  version = "0.18";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1amvczdin078ia1ax2379lklxr0bwjsrin96174dvssxpzjl04cc";
+    sha256 = "08555dndvp12g261wag3qklybdbfnjcmagh4gpl79k2kz5bqrk5c";
   };
 
   # No tests included.

From 634ab6fc5d5cda42a60cceac2cea33935861b9c1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 9 Mar 2020 14:07:43 +0100
Subject: [PATCH 2616/4636] python3Packages.acoustics: 0.2.3 -> 0.2.4

---
 pkgs/development/python-modules/acoustics/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix
index bf3f31d351fa..05f0e29f4e2e 100644
--- a/pkgs/development/python-modules/acoustics/default.nix
+++ b/pkgs/development/python-modules/acoustics/default.nix
@@ -3,14 +3,14 @@
 
 buildPythonPackage rec {
   pname = "acoustics";
-  version = "0.2.3";
+  version = "0.2.4";
 
   checkInputs = [ pytest ];
   propagatedBuildInputs = [ numpy scipy matplotlib pandas tabulate ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ca663059d61fbd2899aed4e3cedbc3f983aa67afd3ae1617db3c59b724206fb3";
+    sha256 = "8ccb68ac258ba81a0b9064523e85eae013f9bfce7244d01db42d7d2d21d712cc";
   };
 
   checkPhase = ''
@@ -26,6 +26,5 @@ buildPythonPackage rec {
     maintainers = with maintainers; [ fridh ];
     license = with licenses; [ bsd3 ];
     homepage = "https://github.com/python-acoustics/python-acoustics";
-    broken = true; # no longer compatible with pandas>=1
   };
 }

From 534f1337c145515368359d0841cfbd1d7be4ff88 Mon Sep 17 00:00:00 2001
From: devhell <devhell@mailfresser.de>
Date: Mon, 9 Mar 2020 13:13:51 +0000
Subject: [PATCH 2617/4636] tests: Fix signal-desktop

This test fails due to OOM on the VM. Setting the memory of the VM to
1024 lets the test succeed.

Cc: @flokli
---
 nixos/tests/signal-desktop.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/signal-desktop.nix b/nixos/tests/signal-desktop.nix
index ae141fe116de..e4b830e9e237 100644
--- a/nixos/tests/signal-desktop.nix
+++ b/nixos/tests/signal-desktop.nix
@@ -17,6 +17,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
     services.xserver.enable = true;
     test-support.displayManager.auto.user = "alice";
     environment.systemPackages = [ pkgs.signal-desktop ];
+    virtualisation.memorySize = 1024;
   };
 
   enableOCR = true;

From 04e7462ee61c3f0477b40204f4d90e6b6d5d0a32 Mon Sep 17 00:00:00 2001
From: Peter Kolloch <info@eigenvalue.net>
Date: Sun, 1 Mar 2020 12:58:26 +0100
Subject: [PATCH 2618/4636] buildRustCrate: refactor colored logging

* Make errors include the crate name and make them much more prominent.
* Move more code into lib.sh
* Already source generated logging code and lib.sh in configure
---
 .../rust/build-rust-crate/build-crate.nix     |  7 +-
 .../rust/build-rust-crate/configure-crate.nix |  8 ++-
 .../rust/build-rust-crate/default.nix         |  8 +--
 .../rust/build-rust-crate/lib.sh              | 10 ++-
 .../rust/build-rust-crate/log.nix             | 70 +++++++++++++------
 5 files changed, 68 insertions(+), 35 deletions(-)

diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
index 2dcca75e299b..9759235e30e3 100644
--- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, echo_build_heading, noisily, mkRustcDepArgs, rust }:
+{ lib, stdenv, mkRustcDepArgs, rust }:
 { crateName,
   dependencies,
   crateFeatures, crateRenames, libName, release, libPath,
@@ -35,16 +35,13 @@
     build_bin = if buildTests then "build_bin_test" else "build_bin";
   in ''
     runHook preBuild
-    ${echo_build_heading colors}
-    ${noisily colors verbose}
-
+ 
     # configure & source common build functions
     LIB_RUSTC_OPTS="${libRustcOpts}"
     BIN_RUSTC_OPTS="${binRustcOpts}"
     LIB_EXT="${stdenv.hostPlatform.extensions.sharedLibrary}"
     LIB_PATH="${libPath}"
     LIB_NAME="${libName}"
-    source ${./lib.sh}
 
     CRATE_NAME='${lib.replaceStrings ["-"] ["_"] libName}'
 
diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
index c146ffef5ff6..bbe7090aed3d 100644
--- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, echo_build_heading, noisily, mkRustcDepArgs }:
+{ lib, stdenv, echo_colored, noisily, mkRustcDepArgs }:
 { build
 , buildDependencies
 , colors
@@ -32,9 +32,11 @@ let version_ = lib.splitString "-" crateVersion;
     completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps;
 in ''
   cd ${workspace_member}
-  runHook preConfigure
-  ${echo_build_heading colors}
+  ${echo_colored colors}
   ${noisily colors verbose}
+  source ${./lib.sh}
+
+  runHook preConfigure
   symlink_dependency() {
     # $1 is the nix-store path of a dependency
     # $2 is the target path
diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix
index 94b64a1225cb..35cb49293e84 100644
--- a/pkgs/build-support/rust/build-rust-crate/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/default.nix
@@ -4,7 +4,7 @@
 # This can be useful for deploying packages with NixOps, and to share
 # binary dependencies between projects.
 
-{ lib, stdenv, defaultCrateOverrides, fetchCrate, rustc, rust }:
+{ lib, stdenv, defaultCrateOverrides, fetchCrate, rustc, rust, cargo, jq }:
 
 let
     # This doesn't appear to be officially documented anywhere yet.
@@ -29,14 +29,14 @@ let
            " --extern ${name}=${dep.lib}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}")
       ) dependencies;
 
-   inherit (import ./log.nix { inherit lib; }) noisily echo_build_heading;
+   inherit (import ./log.nix { inherit lib; }) noisily echo_colored;
 
    configureCrate = import ./configure-crate.nix {
-     inherit lib stdenv echo_build_heading noisily mkRustcDepArgs;
+     inherit lib stdenv echo_colored noisily mkRustcDepArgs;
    };
 
    buildCrate = import ./build-crate.nix {
-     inherit lib stdenv echo_build_heading noisily mkRustcDepArgs rust;
+     inherit lib stdenv mkRustcDepArgs rust;
    };
 
    installCrate = import ./install-crate.nix { inherit stdenv; };
diff --git a/pkgs/build-support/rust/build-rust-crate/lib.sh b/pkgs/build-support/rust/build-rust-crate/lib.sh
index d4d9317496f5..35e804aa1044 100644
--- a/pkgs/build-support/rust/build-rust-crate/lib.sh
+++ b/pkgs/build-support/rust/build-rust-crate/lib.sh
@@ -1,3 +1,11 @@
+echo_build_heading() {
+  if (( $# == 1 )); then
+    echo_colored "Building $1"
+  else
+    echo_colored "Building $1 ($2)"
+  fi
+}
+
 build_lib() {
   lib_src=$1
   echo_build_heading $lib_src ${libName}
@@ -132,7 +140,7 @@ search_for_bin_path() {
   done
 
   if [[ -z "$BIN_PATH" ]]; then
-    echo "failed to find file for binary target: $BIN_NAME" >&2
+    echo_error "ERROR: failed to find file for binary target: $BIN_NAME" >&2
     exit 1
   fi
 }
diff --git a/pkgs/build-support/rust/build-rust-crate/log.nix b/pkgs/build-support/rust/build-rust-crate/log.nix
index 25181c787e2c..a7e2cb4f4639 100644
--- a/pkgs/build-support/rust/build-rust-crate/log.nix
+++ b/pkgs/build-support/rust/build-rust-crate/log.nix
@@ -1,30 +1,56 @@
 { lib }:
-{
-  echo_build_heading = colors: ''
-    echo_build_heading() {
-     start=""
-     end=""
-     ${lib.optionalString (colors == "always") ''
-       start="$(printf '\033[0;1;32m')" #set bold, and set green.
-       end="$(printf '\033[0m')" #returns to "normal"
-     ''}
-     if (( $# == 1 )); then
-       echo "$start""Building $1""$end"
-     else
-       echo "$start""Building $1 ($2)""$end"
-     fi
+
+let echo_colored_body = start_escape:
+      # Body of a function that behaves like "echo" but 
+      # has the output colored by the given start_escape
+      # sequence. E.g.
+      #
+      # * echo_x "Building ..."
+      # * echo_x -n "Running "
+      #
+      # This is more complicated than apparent at first sight 
+      # because:
+      #   * The color markers and the text must be print
+      #     in the same echo statement. Otherise, other
+      #     intermingled text from concurrent builds will 
+      #     be colored as well.
+      #   * We need to preserve the trailing newline of the
+      #     echo if and only if it is present. Bash likes
+      #     to strip those if we capture the output of echo
+      #     in a variable.  
+      #   * Leading "-" will be interpreted by test as an
+      #     option for itself. Therefore, we prefix it with
+      #     an x in `[[ "x$1" =~ ^x- ]]`.
+      ''
+      local echo_args="";
+      while [[ "x$1" =~ ^x- ]]; do
+        echo_args+=" $1"
+        shift
+      done
+      
+      local start_escape="$(printf '${start_escape}')"
+      local reset="$(printf '\033[0m')"
+      echo $echo_args $start_escape"$@"$reset
+      '';
+  echo_conditional_colored_body = colors: start_escape:
+      if colors == "always" 
+      then (echo_colored_body start_escape)
+      else ''echo "$@"'';
+in {
+  echo_colored = colors: ''
+    echo_colored() {
+      ${echo_conditional_colored_body colors ''\033[0;1;32m''}
     }
-  '';
+
+    echo_error() {
+      ${echo_conditional_colored_body colors ''\033[0;1;31m''}
+    }
+   '';
+
   noisily = colors: verbose: ''
     noisily() {
-      start=""
-      end=""
-      ${lib.optionalString (colors == "always") ''
-        start="$(printf '\033[0;1;32m')" #set bold, and set green.
-        end="$(printf '\033[0m')" #returns to "normal"
-      ''}
   	  ${lib.optionalString verbose ''
-        echo -n "$start"Running "$end"
+        echo_colored -n "Running " 
         echo $@
   	  ''}
   	  $@

From 504bfe0767cc6d5ea2be0170bee9a16725b3e194 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 9 Mar 2020 13:54:12 +0000
Subject: [PATCH 2619/4636] python27Packages.python-jenkins: 1.6.0 -> 1.7.0

---
 pkgs/development/python-modules/python-jenkins/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/python-jenkins/default.nix b/pkgs/development/python-modules/python-jenkins/default.nix
index aea31053c5a0..4de5e2910633 100644
--- a/pkgs/development/python-modules/python-jenkins/default.nix
+++ b/pkgs/development/python-modules/python-jenkins/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "python-jenkins";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1aa6rnzlzdgndiwjdbnklgz5pqy5zd7d6g7bhzsvyf0614z1w010";
+    sha256 = "01jid5s09lr3kayr2h1z9n8h9nhyw3jxv9c4b5hrlxijknkqzvfy";
   };
 
   buildInputs = [ mock ];
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python bindings for the remote Jenkins API";
-    homepage = https://pypi.python.org/pypi/python-jenkins;
+    homepage = "https://pypi.python.org/pypi/python-jenkins";
     license = licenses.bsd3;
     maintainers = with maintainers; [ ma27 ];
   };

From 8a6638daa96318f0cf6d37a1d1d67f1f1c06bd05 Mon Sep 17 00:00:00 2001
From: Peter Kolloch <info@eigenvalue.net>
Date: Sun, 1 Mar 2020 13:34:36 +0100
Subject: [PATCH 2620/4636] build-support/rust/buildRustCrate: Search for
 matching Cargo.toml in sub directories

This is what cargo does for git repositories.

See related issues:

* https://github.com/kolloch/crate2nix/issues/53
* https://github.com/kolloch/crate2nix/issues/33
---
 .../rust/build-rust-crate/configure-crate.nix | 15 ++++++-
 .../rust/build-rust-crate/default.nix         |  4 +-
 .../rust/build-rust-crate/lib.sh              | 34 ++++++++++++++
 .../rust/build-rust-crate/test/default.nix    | 44 ++++++++++++++++++-
 4 files changed, 94 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
index bbe7090aed3d..013b99a77b4b 100644
--- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
@@ -31,12 +31,25 @@ let version_ = lib.splitString "-" crateVersion;
     completeDepsDir = lib.concatStringsSep " " completeDeps;
     completeBuildDepsDir = lib.concatStringsSep " " completeBuildDeps;
 in ''
-  cd ${workspace_member}
   ${echo_colored colors}
   ${noisily colors verbose}
   source ${./lib.sh}
 
+  ${lib.optionalString (workspace_member != null) ''
+  noisily cd "${workspace_member}"
+''}
+  ${lib.optionalString (workspace_member == null) ''
+  echo_colored "Searching for matching Cargo.toml (${crateName})" 
+  local cargo_toml_dir=$(matching_cargo_toml_dir "${crateName}")
+  if [ -z "$cargo_toml_dir" ]; then
+    echo_error "ERROR configuring ${crateName}: No matching Cargo.toml in $(pwd) found." >&2
+    exit 23
+  fi
+  noisily cd "$cargo_toml_dir"
+''}
+
   runHook preConfigure
+ 
   symlink_dependency() {
     # $1 is the nix-store path of a dependency
     # $2 is the target path
diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix
index 35cb49293e84..70d48bef8c9b 100644
--- a/pkgs/build-support/rust/build-rust-crate/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/default.nix
@@ -88,7 +88,7 @@ stdenv.mkDerivation (rec {
 
     src = crate.src or (fetchCrate { inherit (crate) crateName version sha256; });
     name = "rust_${crate.crateName}-${crate.version}${lib.optionalString buildTests_ "-test"}";
-    depsBuildBuild = [ rust stdenv.cc ];
+    depsBuildBuild = [ rust stdenv.cc cargo jq ];
     buildInputs = (crate.buildInputs or []) ++ buildInputs_;
     dependencies = map lib.getLib dependencies_;
     buildDependencies = map lib.getLib buildDependencies_;
@@ -114,6 +114,8 @@ stdenv.mkDerivation (rec {
       in lib.substring 0 10 hashedMetadata;
 
     build = crate.build or "";
+    # Either set to a concrete sub path to the crate root
+    # or use `null` for auto-detect.
     workspace_member = crate.workspace_member or ".";
     crateVersion = crate.version;
     crateDescription = crate.description or "";
diff --git a/pkgs/build-support/rust/build-rust-crate/lib.sh b/pkgs/build-support/rust/build-rust-crate/lib.sh
index 35e804aa1044..0f08c133e557 100644
--- a/pkgs/build-support/rust/build-rust-crate/lib.sh
+++ b/pkgs/build-support/rust/build-rust-crate/lib.sh
@@ -144,3 +144,37 @@ search_for_bin_path() {
     exit 1
   fi
 }
+
+# Extracts cargo_toml_path of the matching crate.
+matching_cargo_toml_path() {
+  local manifest_path="$1"
+  local expected_crate_name="$2"
+
+  # If the Cargo.toml is not a workspace root,
+  # it will only contain one package in ".packages"
+  # because "--no-deps" suppressed dependency resolution.
+  #
+  # But to make it more general, we search for a matching
+  # crate in all packages and use the manifest path that
+  # is referenced there.
+  cargo metadata --no-deps --format-version 1 \
+    --manifest-path "$manifest_path" \
+    | jq -r '.packages[] 
+            | select( .name == "'$expected_crate_name'") 
+            | .manifest_path'
+}
+
+# Find a Cargo.toml in the current or any sub directory
+# with a matching crate name.
+matching_cargo_toml_dir() {
+  local expected_crate_name="$1"
+
+  find -L -name Cargo.toml | sort | while read manifest_path; do
+    echo "...checking manifest_path $manifest_path" >&2
+    local matching_path="$(matching_cargo_toml_path "$manifest_path" "$expected_crate_name")"
+    if [ -n "${matching_path}" ]; then
+      echo "$(dirname $matching_path)"
+      break
+    fi
+  done
+}
\ No newline at end of file
diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix
index 6aad02992c1b..710045664686 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix
@@ -8,6 +8,14 @@ let
     } // args;
   in buildRustCrate p;
 
+  mkCargoToml =
+    { name, crateVersion ? "0.1.0", path ? "Cargo.toml" }:
+      mkFile path ''
+        [package]
+        name = ${builtins.toJSON name}
+        version = ${builtins.toJSON crateVersion}
+      '';
+
   mkFile = destination: text: writeTextFile {
     name = "src";
     destination = "/${destination}";
@@ -89,7 +97,7 @@ let
   in rec {
 
   tests = let
-    cases = {
+    cases = rec {
       libPath =  { libPath = "src/my_lib.rs"; src = mkLib "src/my_lib.rs"; };
       srcLib =  { src = mkLib "src/lib.rs"; };
 
@@ -220,6 +228,40 @@ let
           ];
         };
       };
+      rustCargoTomlInSubDir = {
+        # The "workspace_member" can be set to the sub directory with the crate to build.
+        # By default ".", meaning the top level directory is assumed.
+        # Using null will trigger a search.
+        workspace_member = null;
+        src = symlinkJoin rec {
+          name = "find-cargo-toml";
+          paths = [
+            (mkCargoToml { name = "ignoreMe"; })
+            (mkTestFileWithMain "src/main.rs" "ignore_main")
+
+            (mkCargoToml { name = "rustCargoTomlInSubDir"; path = "subdir/Cargo.toml"; })
+            (mkTestFileWithMain "subdir/src/main.rs" "src_main")
+            (mkTestFile "subdir/tests/foo/main.rs" "tests_foo")
+            (mkTestFile "subdir/tests/bar/main.rs" "tests_bar")
+          ];
+        };
+        buildTests = true;
+        expectedTestOutputs = [
+          "test src_main ... ok"
+          "test tests_foo ... ok"
+          "test tests_bar ... ok"
+        ];
+      };
+
+      rustCargoTomlInTopDir =
+        let
+          withoutCargoTomlSearch = builtins.removeAttrs rustCargoTomlInSubDir [ "workspace_member" ];
+        in
+          withoutCargoTomlSearch // {
+            expectedTestOutputs = [
+              "test ignore_main ... ok"
+            ];
+          };
     };
     brotliCrates = (callPackage ./brotli-crates.nix {});
   in lib.mapAttrs (key: value: mkTest (value // lib.optionalAttrs (!value?crateName) { crateName = key; })) cases // {

From 8074942aed9630d3befefc8fd3f03e5adfb55e00 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Mon, 9 Mar 2020 16:47:57 +0200
Subject: [PATCH 2621/4636] nbstripout: 0.3.6 -> 0.3.7

---
 pkgs/applications/version-management/nbstripout/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix
index 797bc7824962..6668631ca9a4 100644
--- a/pkgs/applications/version-management/nbstripout/default.nix
+++ b/pkgs/applications/version-management/nbstripout/default.nix
@@ -2,7 +2,7 @@
 
 with python.pkgs;
 buildPythonApplication rec {
-  version = "0.3.6";
+  version = "0.3.7";
   pname = "nbstripout";
 
   # Mercurial should be added as a build input but because it's a Python
@@ -14,7 +14,7 @@ buildPythonApplication rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1x6010akw7iqxn7ba5m6malfr2fvaf0bjp3cdh983qn1s7vwlq0r";
+    sha256 = "13w2zhw8vrfv6637bw5ygygj1dky55fvvncz11hq0abwkkzb3wb2";
   };
 
   # for some reason, darwin uses /bin/sh echo native instead of echo binary, so

From 350f83785dc9252a8f4b2d5a7496844234786e3c Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Mon, 9 Mar 2020 17:03:34 +0200
Subject: [PATCH 2622/4636] pythonPackages.pvlib: 0.7.0 -> 0.7.1

---
 pkgs/development/python-modules/pvlib/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix
index e04a2a62d493..d1eeb3e31d06 100644
--- a/pkgs/development/python-modules/pvlib/default.nix
+++ b/pkgs/development/python-modules/pvlib/default.nix
@@ -3,14 +3,14 @@
 
 buildPythonPackage rec {
   pname = "pvlib";
-  version = "0.7.0";
+  version = "0.7.1";
 
   # Support for Python <3.5 dropped in 0.6.3 on June 1, 2019.
   disabled = pythonOlder "3.5";
 
   src = fetchPypi{
     inherit pname version;
-    sha256 = "ee935ba52f1d4a514cc3baa743db0377af732952faf800f20ffd8071fa2107c2";
+    sha256 = "1kqwnkbkdv4m3r68pd39va6wqvhr34a6hx4d6q5lfkibclg35c3d";
   };
 
   checkInputs = [ pytest mock pytest-mock ];
@@ -19,8 +19,8 @@ buildPythonPackage rec {
   # Skip a few tests that try to access some URLs
   checkPhase = ''
     runHook preCheck
-    pushd pvlib/test
-    pytest . -k "not test_read_srml_dt_index and not test_read_srml_month_from_solardata and not test_get_psm3"
+    pushd pvlib/tests
+    pytest . -k "not test_read_srml_dt_index and not test_read_srml_month_from_solardata and not test_get_psm3 and not test_pvgis"
     popd
     runHook postCheck
   '';

From 018a46ffe84126b6b71dc4944108877e0b40c745 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 9 Mar 2020 16:15:54 +0100
Subject: [PATCH 2623/4636] minecraft: install missing gsettings schemas

---
 pkgs/games/minecraft/default.nix | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index 5bc2157a70bf..157fb4b93b9e 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/pkgs/games/minecraft/default.nix
@@ -2,6 +2,8 @@
 , fetchurl
 , makeDesktopItem
 , makeWrapper
+, wrapGAppsHook
+, gobject-introspection
 , jre # old or modded versions of the game may require Java 8 (https://aur.archlinux.org/packages/minecraft-launcher/#pinned-674960)
 , xorg
 , zlib
@@ -96,10 +98,12 @@ in
     sha256 = "0w8z21ml79kblv20wh5lz037g130pxkgs8ll9s3bi94zn2pbrhim";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
+  buildInputs = [ gobject-introspection ];
 
   sourceRoot = ".";
 
+  dontWrapGApps = true;
   dontConfigure = true;
   dontBuild = true;
 
@@ -109,11 +113,6 @@ in
 
     ${desktopItem.buildCommand}
     install -D $icon $out/share/icons/hicolor/symbolic/apps/minecraft-launcher.svg
-
-    makeWrapper $out/opt/minecraft-launcher/minecraft-launcher $out/bin/minecraft-launcher \
-      --prefix LD_LIBRARY_PATH : ${envLibPath} \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ jre ]} \
-      --run "cd /tmp" # Do not create `GPUCache` in current directory
   '';
 
   preFixup = ''
@@ -129,6 +128,15 @@ in
       $out/opt/minecraft-launcher/liblauncher.so
   '';
 
+  postFixup = ''
+    # Do not create `GPUCache` in current directory
+    makeWrapper $out/opt/minecraft-launcher/minecraft-launcher $out/bin/minecraft-launcher \
+      --prefix LD_LIBRARY_PATH : ${envLibPath} \
+      --prefix PATH : ${stdenv.lib.makeBinPath [ jre ]} \
+      --run "cd /tmp" \
+      "''${gappsWrapperArgs[@]}"
+  '';
+
   meta = with stdenv.lib; {
     description = "Official launcher for Minecraft, a sandbox-building game";
     homepage = "https://minecraft.net";

From d9e86f4cea4389de0dfd33ff7dcbf31eca0809ac Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 9 Mar 2020 16:11:26 +0000
Subject: [PATCH 2624/4636] python27Packages.stripe: 2.42.0 -> 2.43.0

---
 pkgs/development/python-modules/stripe/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index 3f1c1e53c7c2..4acc694a572e 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "stripe";
-  version = "2.42.0";
+  version = "2.43.0";
 
   # Tests require network connectivity and there's no easy way to disable
   # them. ~ C.
@@ -10,7 +10,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1vrs0mydj2j789slzfv5413qxa067zi7p34h2p63612gm3vdrcl9";
+    sha256 = "0jikvcapg2xp3w824wz0wn74mx91nl3vmd92a10il3gli2p4wcnp";
   };
 
   propagatedBuildInputs = [ requests ];
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Stripe Python bindings";
-    homepage = https://github.com/stripe/stripe-python;
+    homepage = "https://github.com/stripe/stripe-python";
     license = licenses.mit;
   };
 }

From f391999026ba12cbcf176456299b1489772e5ff0 Mon Sep 17 00:00:00 2001
From: Milan <mil@nyantec.com>
Date: Mon, 9 Mar 2020 17:23:51 +0100
Subject: [PATCH 2625/4636] gitlab: 12.8.2 -> 12.8.5 (#82142)

https://about.gitlab.com/releases/2020/03/09/gitlab-12-8-5-released/
---
 pkgs/applications/version-management/gitlab/data.json     | 8 ++++----
 .../version-management/gitlab/gitaly/default.nix          | 4 ++--
 .../version-management/gitlab/gitaly/deps.nix             | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 2772ef5b6f4b..07ec3a291447 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,11 +1,11 @@
 {
-  "version": "12.8.2",
-  "repo_hash": "1d27s61kglryr5pashwfq55z7fh16fxkx1m4gc82xihwfzarf4x9",
+  "version": "12.8.5",
+  "repo_hash": "1y5606p793w1js39420jcd2bj42cripczgrdxgg2cq0r2kq8axk8",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v12.8.2-ee",
+  "rev": "v12.8.5-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "12.8.2",
+    "GITALY_SERVER_VERSION": "12.8.5",
     "GITLAB_PAGES_VERSION": "1.16.0",
     "GITLAB_SHELL_VERSION": "11.0.0",
     "GITLAB_WORKHORSE_VERSION": "8.21.0"
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index af97873463e8..0dd60a6df208 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -28,14 +28,14 @@ let
     };
   });
 in buildGoPackage rec {
-  version = "12.8.2";
+  version = "12.8.5";
   pname = "gitaly";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitaly";
     rev = "v${version}";
-    sha256 = "1zc44y5yl799vqg12w3iaivk4xwj9i4k6f198svplipa760nl9ic";
+    sha256 = "19pwffncihhywfac7ybry38vyj3pmdz66g5nqrvwn4xxw7ypvd24";
   };
 
   # Fix a check which assumes that hook files are writeable by their
diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix
index 5ab063d1deab..83a2f0f5f748 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix
@@ -1319,8 +1319,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/ugorji/go";
-      rev = "d75b2dcb6bc8";
-      sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps";
+      rev = "v1.1.4";
+      sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w";
     };
   }
   {

From a140160314e80555d90b357b87548c73e9358d8a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 9 Mar 2020 16:49:23 +0000
Subject: [PATCH 2626/4636] python27Packages.ua-parser: 0.9.0 -> 0.10.0

---
 pkgs/development/python-modules/ua-parser/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/ua-parser/default.nix b/pkgs/development/python-modules/ua-parser/default.nix
index 9249a1ce044e..875f0ee2075a 100644
--- a/pkgs/development/python-modules/ua-parser/default.nix
+++ b/pkgs/development/python-modules/ua-parser/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "ua-parser";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1qpw1jdm8bp09jwjp8r38rr7rd2jy4k2if798cax3wylphm285xy";
+    sha256 = "0csh307zfz666kkk5idrw3crj1x8q8vsqgwqil0r1n1hs4p7ica7";
   };
 
   buildInputs = [ pyyaml ];
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "A python implementation of the UA Parser";
-    homepage = https://github.com/ua-parser/uap-python;
+    homepage = "https://github.com/ua-parser/uap-python";
     license = licenses.asl20;
     platforms = platforms.unix;
     maintainers = with maintainers; [ dotlambda ];

From c09411b89ec544df274bd6b993b63c5c27f0e567 Mon Sep 17 00:00:00 2001
From: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Date: Mon, 9 Mar 2020 10:20:10 -0700
Subject: [PATCH 2627/4636] Fix refmt

---
 pkgs/development/compilers/bs-platform/build-bs-platform.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/bs-platform/build-bs-platform.nix b/pkgs/development/compilers/bs-platform/build-bs-platform.nix
index e4e7b7e8619a..ed4e5ebba2f3 100644
--- a/pkgs/development/compilers/bs-platform/build-bs-platform.nix
+++ b/pkgs/development/compilers/bs-platform/build-bs-platform.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/bin
-    cp -rf jscomp lib ${bin_folder} vendor odoc_gen native bsb bsc $out
+    cp -rf jscomp lib ${bin_folder} vendor odoc_gen native bsb bsc bsrefmt $out
     mkdir $out/lib/ocaml
     cp jscomp/runtime/js.* jscomp/runtime/*.cm* $out/lib/ocaml
     cp jscomp/others/*.ml jscomp/others/*.mli jscomp/others/*.cm* $out/lib/ocaml
@@ -55,5 +55,6 @@ stdenv.mkDerivation rec {
     cp bsconfig.json package.json $out
     ln -s $out/bsb $out/bin/bsb
     ln -s $out/bsc $out/bin/bsc
+    ln -s $out/bsrefmt $out/bin/bsrefmt
   '';
 }

From 0f0cb0b8575247d3220cc9e352b12a98ac6447db Mon Sep 17 00:00:00 2001
From: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Date: Mon, 9 Mar 2020 10:21:43 -0700
Subject: [PATCH 2628/4636] Note about BuckleScript's build process and why
 `BS_TRAVIS_CI=1` is needed

---
 pkgs/development/compilers/bs-platform/build-bs-platform.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/bs-platform/build-bs-platform.nix b/pkgs/development/compilers/bs-platform/build-bs-platform.nix
index ed4e5ebba2f3..d7d0fe0b12be 100644
--- a/pkgs/development/compilers/bs-platform/build-bs-platform.nix
+++ b/pkgs/development/compilers/bs-platform/build-bs-platform.nix
@@ -26,6 +26,10 @@ stdenv.mkDerivation rec {
   pname = "bs-platform";
 
   BS_RELEASE_BUILD = "true";
+
+  # BuckleScript's idiosyncratic build process only builds artifacts required
+  # for editor-tooling to work when this environment variable is set:
+  # https://github.com/BuckleScript/bucklescript/blob/7.2.0/scripts/install.js#L225-L227
   BS_TRAVIS_CI = "1";
 
   buildInputs = [ nodejs python3 custom-ninja ];

From d4446c563d5d7f1709cb95ce3731b56ea4578447 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 27 Feb 2020 16:08:34 -0500
Subject: [PATCH 2629/4636] firefox: Fix AArch64 build

 * The 'arm.patch' patch doesn't apply anymore.
 * The 'build-arm-libopus.patch' patch isn't required anymore.
 * See the mozilla phabricator link for the added patch.

Additionally, we are now *always* undconditionally applying all patches
to all architectures. That is, unless they have undesirable
side-effects, but those might not be fit for inclusion.

By applying all patches all the time, they'll be removed or replaced
when they stop applying.
---
 .../networking/browsers/firefox/common.nix         | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 4aa8105559b0..7c58072d5af4 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -93,16 +93,12 @@ stdenv.mkDerivation ({
 
   patches = [
     ./env_var_for_system_dir.patch
-  ] ++ lib.optionals (stdenv.isAarch64) [
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/arm.patch";
-      sha256 = "1vbpih23imhv5r3g21m3m541z08n9n9j1nvmqax76bmyhn7mxp32";
-    })
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/build-arm-libopus.patch";
-      sha256 = "1zg56v3lc346fkzcjjx21vjip2s9hb2xw4pvza1dsfdnhsnzppfp";
-    })
   ]
+  ++ lib.optional (lib.versionAtLeast ffversion "73") (fetchpatch {
+    # https://phabricator.services.mozilla.com/D60667
+    url = "https://hg.mozilla.org/mozilla-central/raw-rev/b3d8b08265b800165d684281d19ac845a8ff9a66";
+    sha256 = "0b4s75w7sl619rglcjmlyvyibpj2ar5cpy6pnywl1xpd9qzyb27p";
+  })
   ++ patches;
 
 

From ed8692b9f53ff5e6b327dcc0ee463f7eb41b4a26 Mon Sep 17 00:00:00 2001
From: ysengrimm <ysengrimm@grimmbart.org>
Date: Mon, 9 Mar 2020 18:50:34 +0100
Subject: [PATCH 2630/4636] next: 1.4.0 -> 1.5.0

---
 pkgs/applications/networking/browsers/next/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/next/default.nix b/pkgs/applications/networking/browsers/next/default.nix
index 22f0cf928ab6..d4726fab6511 100644
--- a/pkgs/applications/networking/browsers/next/default.nix
+++ b/pkgs/applications/networking/browsers/next/default.nix
@@ -15,13 +15,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "next";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "atlas-engineer";
     repo = "next";
     rev = version;
-    sha256 = "1gkmr746rqqg94698a051gv79fblc8n9dq0zg04llba44adhpmjl";
+    sha256 = "1gqkp185wcwaxr8py90hqk44nqjblrrdwvig19gizrbzr2gx2zhy";
   };
 
   nativeBuildInputs = [

From 4e5838132e2387fc3ed8f020ce1956b1ea4d1148 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 23:43:10 -0400
Subject: [PATCH 2631/4636] vimPlugins.LanguageClient-neovim: upgrade cargo
 fetcher and cargoSha256

---
 pkgs/misc/vim-plugins/overrides.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 79418c62aa8e..9729d223e857 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -64,10 +64,7 @@ self: super: {
       name = "LanguageClient-neovim-bin";
       src = LanguageClient-neovim-src;
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-      cargoSha256 = "1w8g7pxwnjqp9zi47h4lz2mcg5daldsk5z72h8cjj750wng8a82c";
+      cargoSha256 = "0w66fcrlaxf6zgkrfpgfybfbm759fzimnr3pjq6sm14frar7lhr6";
       buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
 
       # FIXME: Use impure version of CoreFoundation because of missing symbols.

From 36ae82fd3a7a5edba2b5d5acd51966d13bc23ba0 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Mon, 9 Mar 2020 12:48:32 -0400
Subject: [PATCH 2632/4636] openjdk: 13.0.1 -> 13.0.2

---
 pkgs/development/compilers/openjdk/darwin/default.nix | 4 ++--
 pkgs/development/compilers/openjdk/default.nix        | 4 ++--
 pkgs/development/compilers/openjdk/openjfx/13.nix     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix
index 230f01d5720c..775fd3cd3c43 100644
--- a/pkgs/development/compilers/openjdk/darwin/default.nix
+++ b/pkgs/development/compilers/openjdk/darwin/default.nix
@@ -7,11 +7,11 @@ let
   };
 
   jdk = stdenv.mkDerivation rec {
-    name = "zulu13.28.11-ca-jdk13.0.1";
+    name = "zulu13.29.9-ca-jdk13.0.2";
 
     src = fetchurl {
       url = "https://cdn.azul.com/zulu/bin/${name}-macosx_x64.tar.gz";
-      sha256 = "0j148gq7vwhda6y9sazy0qg6ka7milywrdhbvmd31a1xp303r37b";
+      sha256 = "1x8ja3x880a1izrwi7bdrwz1ljdvracjx627slzjd2xk8c4211pf";
       curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/";
     };
 
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 57143bd45cca..24828f16e7be 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -10,7 +10,7 @@
 
 let
   major = "13";
-  update = ".0.1";
+  update = ".0.2";
   build = "-ga";
 
   openjdk = stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ let
 
     src = fetchurl {
       url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
-      sha256 = "1pmgbzlr97ns9fvi3a193miziv5v8fvk9jgymspllsvmb6x9lppk";
+      sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv";
     };
 
     nativeBuildInputs = [ pkgconfig autoconf ];
diff --git a/pkgs/development/compilers/openjdk/openjfx/13.nix b/pkgs/development/compilers/openjdk/openjfx/13.nix
index 71e95968fcd9..632724a9ac00 100644
--- a/pkgs/development/compilers/openjdk/openjfx/13.nix
+++ b/pkgs/development/compilers/openjdk/openjfx/13.nix
@@ -4,8 +4,8 @@
 
 let
   major = "13";
-  update = "";
-  build = "14";
+  update = ".0.2";
+  build = "1";
   repover = "${major}${update}+${build}";
   gradle_ = (gradleGen.override {
     java = openjdk11_headless;
@@ -16,7 +16,7 @@ let
 
     src = fetchurl {
       url = "https://hg.openjdk.java.net/openjfx/${major}-dev/rt/archive/${repover}.tar.gz";
-      sha256 = "0nviv9fiwzp1z4gjbp8iz9mf601nadzcy0sx74f5y3v41a3l59qb";
+      sha256 = "1si9wpb9malnf8zzz57l6b80088z2370zfxp1b0kk6rs0cnvpr74";
     };
 
     buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ];

From 53998cbc583db9c85b05e1b9a9ae89d5b31eabda Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Mon, 9 Mar 2020 18:24:35 +0200
Subject: [PATCH 2633/4636] pythonPackages.XlsxWriter: 1.2.6 -> 1.2.8

---
 pkgs/development/python-modules/XlsxWriter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix
index f9730eb61ae0..d5c24c018b63 100644
--- a/pkgs/development/python-modules/XlsxWriter/default.nix
+++ b/pkgs/development/python-modules/XlsxWriter/default.nix
@@ -3,7 +3,7 @@
 buildPythonPackage rec {
 
   pname = "XlsxWriter";
-  version = "1.2.6";
+  version = "1.2.8";
 
   # PyPI release tarball doesn't contain tests so let's use GitHub. See:
   # https://github.com/jmcnamara/XlsxWriter/issues/327
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     owner = "jmcnamara";
     repo = pname;
     rev = "RELEASE_${version}";
-    sha256 = "05y1py5mn1m65bbwhinzv84jd3xj8snvf2795flw0xbxnkn8nd8p";
+    sha256 = "18q5sxm9jw5sfavdjy5z0yamknwj5fl359jziqllkbj5k2i16lnr";
   };
 
   meta = {

From e04b6ecc64700da7f10358b1d0dee38ebf486290 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 7 Mar 2020 00:54:06 +0000
Subject: [PATCH 2634/4636] ocrmypdf: 9.6.0 -> 9.6.1

---
 pkgs/tools/text/ocrmypdf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix
index 6f7b4d487ef1..83d0bdd92c74 100644
--- a/pkgs/tools/text/ocrmypdf/default.nix
+++ b/pkgs/tools/text/ocrmypdf/default.nix
@@ -29,14 +29,14 @@ let
 
 in buildPythonApplication rec {
   pname = "ocrmypdf";
-  version = "9.6.0";
+  version = "9.6.1";
   disabled = ! python3Packages.isPy3k;
 
   src = fetchFromGitHub {
     owner = "jbarlow83";
     repo = "OCRmyPDF";
     rev = "v${version}";
-    sha256 = "1cpj8fj1mzp6mbd1z9dj38fmlcg5q2gbya4vbag1ddd4vp7rvn2m";
+    sha256 = "0lbld11r8zds79183hh5y2f5fi7cacl7bx9f7f2g58j38y1c65vj";
   };
 
   nativeBuildInputs = with python3Packages; [

From 15e8320ccd7a84077aa4bbf3e5ad8f357a494d3c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 8 Mar 2020 08:16:01 +0000
Subject: [PATCH 2635/4636] extremetuxracer: 0.7.5 -> 0.8.0

---
 pkgs/games/extremetuxracer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix
index c7c618c0c189..1c0a47e4b617 100644
--- a/pkgs/games/extremetuxracer/default.nix
+++ b/pkgs/games/extremetuxracer/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.5";
+  version = "0.8.0";
   pname = "extremetuxracer";
 
   src = fetchurl {
     url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz";
-    sha256 = "1ly63316c07i0gyqqmyzsyvygsvygn0fpk3bnbg25fi6li99rlsg";
+    sha256 = "05ysaxvsgps9fxc421kdifsxmc1sn6n79cjaa0k0i3fs9qqrja2b";
   };
 
   buildInputs = [
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       ExtremeTuxRacer - Tux lies on his belly and accelerates down ice slopes.
     '';
     license = stdenv.lib.licenses.gpl2Plus;
-    homepage = https://sourceforge.net/projects/extremetuxracer/;
+    homepage = "https://sourceforge.net/projects/extremetuxracer/";
     maintainers = with stdenv.lib.maintainers; [ ];
     platforms = with stdenv.lib.platforms; linux;
   };

From 6ec025149e22b1c6eb755aa5256efa020180feff Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Mon, 9 Mar 2020 19:28:24 +0100
Subject: [PATCH 2636/4636] trezord-go: 2.0.28 -> 2.0.29

---
 pkgs/servers/trezord/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix
index e6427e5970fa..7bdee09fca30 100644
--- a/pkgs/servers/trezord/default.nix
+++ b/pkgs/servers/trezord/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "trezord-go";
-  version = "2.0.28";
+  version = "2.0.29";
 
   goPackagePath = "github.com/trezor/trezord-go";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner  = "trezor";
     repo   = "trezord-go";
     rev    = "v${version}";
-    sha256 = "02c1mvn01gcfls37sa0c7v2lwffg14x54np8z7d4hjzxxzwg4gpw";
+    sha256 = "1ks1fa0027s3xp0z6qp0dxmayvrb4dwwscfhbx7da0khp153f2cp";
   };
 
   propagatedBuildInputs = [ trezor-udev-rules ];

From 75aec2aae373445d7e2020cf8e0ffc3de9250270 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 9 Mar 2020 11:56:30 -0700
Subject: [PATCH 2637/4636] datovka: 4.14.1 -> 4.15.0 (#81874)

---
 pkgs/applications/networking/datovka/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix
index 12bad094fcaa..976541177ddb 100644
--- a/pkgs/applications/networking/datovka/default.nix
+++ b/pkgs/applications/networking/datovka/default.nix
@@ -11,11 +11,11 @@
 
 mkDerivation rec {
   pname = "datovka";
-  version = "4.14.1";
+  version = "4.15.0";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/datove_schranky/${version}/${pname}-${version}.tar.xz";
-    sha256 = "0jinxsm2zw77294vz9pjiqpgpzdwx5nijsi4nqzxna5rkmwdyxk6";
+    sha256 = "1f311qnyiay34iqpik4x492py46my89j4nnbdf6qcidnydzas8r1";
   };
 
   buildInputs = [ libisds qmake qtbase qtsvg libxml2 ];

From 0bf5619fe0f269c483750a5a3feceefe62e7ffee Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 6 Feb 2020 20:05:34 +0100
Subject: [PATCH 2638/4636] php: add `buildEnv` function for additional config
 on the CLI SAPI

Initially discussed in #55460.

This patch adds a `buildEnv` function to `php` that has the
following features:

* `php.buildEnv { extraConfig = /* ... */; }` to specify custom
  `php.ini` args for the CLI.

* `php.buildEnv { exts = phpPackages: [phpPackages.apcu] }` to
  create a PHP interpreter for the CLI with the `apcu` extension.
---
 pkgs/development/interpreters/php/default.nix | 35 ++++++++++++++++---
 pkgs/top-level/php-packages.nix               |  2 ++
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index a31bbe73caee..77d27dfd42aa 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -6,7 +6,8 @@
 , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC
 , uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2
 , gd, freetype, libXpm, libjpeg, libpng, libwebp
-, libzip, valgrind, oniguruma
+, libzip, valgrind, oniguruma, symlinkJoin, writeText
+, makeWrapper, callPackage
 }:
 
 with lib;
@@ -255,7 +256,7 @@ let
         description = "An HTML-embedded scripting language";
         homepage = https://www.php.net/;
         license = licenses.php301;
-        maintainers = with maintainers; [ globin etu ];
+        maintainers = with maintainers; [ globin etu ma27 ];
         platforms = platforms.all;
         outputsToInstall = [ "out" "dev" ];
       };
@@ -268,8 +269,32 @@ let
 
     };
 
+    generic' = { version, sha256, ... }@args: let php = generic args; in php.overrideAttrs (_: {
+      passthru.buildEnv = { exts ? (_: []), extraConfig ? "" }: let
+        extraInit = writeText "custom-php.ini" ''
+          ${extraConfig}
+          ${concatMapStringsSep "\n" (ext: let
+            extName = lib.removePrefix "php-" (builtins.parseDrvName ext.name).name;
+            type = "${lib.optionalString (ext.zendExtension or false) "zend_"}extension";
+          in ''
+            ${type}=${ext}/lib/php/extensions/${extName}.so
+          '') (exts (callPackage ../../../top-level/php-packages.nix { inherit php; }))}
+        '';
+      in symlinkJoin {
+        name = "php-custom-${version}";
+        nativeBuildInputs = [ makeWrapper ];
+        paths = [ php ];
+        postBuild = ''
+          wrapProgram $out/bin/php \
+            --add-flags "-c ${extraInit}"
+          wrapProgram $out/bin/php-fpm \
+            --add-flags "-c ${extraInit}"
+        '';
+      };
+    });
+
 in {
-  php72 = generic {
+  php72 = generic' {
     version = "7.2.27";
     sha256 = "0jbhc8x2i6xx6p7zc30ahg9xplsqlz334m1w13mhr1qv2xdnkh2v";
 
@@ -277,7 +302,7 @@ in {
     extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
   };
 
-  php73 = generic {
+  php73 = generic' {
     version = "7.3.14";
     sha256 = "0wn2qsfrnch90l8nxbpcjd2q0ijzdiiyhvcpbycngki9r6xwppxr";
 
@@ -285,7 +310,7 @@ in {
     extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
   };
 
-  php74 = generic {
+  php74 = generic' {
     version = "7.4.3";
     sha256 = "wVF7pJV4+y3MZMc6Ptx21PxQfEp6xjmYFYTMfTtMbRQ=";
   };
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 50bf1ae5dbfc..5ef8e7226207 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -664,6 +664,8 @@ let
 
     doCheck = true;
     checkTarget = "test";
+
+    zendExtension = true;
   };
 
   yaml = buildPecl {

From e95f1f32a0e64ce089ca38801d1733d51bcb5cd2 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Mon, 9 Mar 2020 21:49:24 +0100
Subject: [PATCH 2639/4636] jackett: disable macos platform

---
 pkgs/servers/jackett/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 9f411c69a8d5..a6969fcbeff5 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/Jackett/Jackett/;
     license = licenses.gpl2;
     maintainers = with maintainers; [ edwtjo nyanloutre ];
-    platforms = platforms.all;
+    platforms = platforms.linux;
   };
 }

From 1b74dfcf6dc16bde182ba80867ec133fa501f60d Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Thu, 20 Feb 2020 11:20:21 +0100
Subject: [PATCH 2640/4636] kitty: remove unused nativeBuildInputs on macOS

These two dependencies were used to generate the PNG icons that would later be converted to the icon for the macOS app. The PNGs are now stored in git and are not generated during the build anymore.
---
 pkgs/applications/misc/kitty/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index cdba8c3f686b..f332512bb848 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -12,8 +12,6 @@
   libcanberra,
   libicns,
   libpng,
-  librsvg,
-  optipng,
   python3,
   zlib,
 }:
@@ -55,8 +53,6 @@ buildPythonApplication rec {
   ] ++ stdenv.lib.optionals stdenv.isDarwin [
     imagemagick
     libicns  # For the png2icns tool.
-    librsvg
-    optipng
   ];
 
   propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux libGL;

From 98bd9f51fc493af5a83a593e8c956bba5c7fd078 Mon Sep 17 00:00:00 2001
From: Matt Snider <matt.snider@protonmail.com>
Date: Mon, 9 Mar 2020 22:08:44 +0100
Subject: [PATCH 2641/4636] maintainers: add matt-snider

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0ec698661f24..93697617ba2c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4544,6 +4544,12 @@
     githubId = 1711539;
     name = "matklad";
   };
+  matt-snider = {
+    email = "matt.snider@protonmail.com";
+    github = "matt-snider";
+    githubId = 11810057;
+    name = "Matt Snider";
+  };
   matthewbauer = {
     email = "mjbauer95@gmail.com";
     github = "matthewbauer";

From 7483f9fbaeec160136266996d018ed13a4276d76 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Mon, 9 Mar 2020 23:10:24 +0200
Subject: [PATCH 2642/4636] hexyl: 0.6.0 -> 0.7.0

---
 pkgs/tools/misc/hexyl/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/hexyl/default.nix b/pkgs/tools/misc/hexyl/default.nix
index caef41cb3947..e67b0116df16 100644
--- a/pkgs/tools/misc/hexyl/default.nix
+++ b/pkgs/tools/misc/hexyl/default.nix
@@ -2,18 +2,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname   = "hexyl";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner  = "sharkdp";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "1n2q5a6697bxvl0askywhad2x560cajv456gxihdqqmmyq2vf63h";
+    sha256 = "0blq81zpmzldngk9ymcg56syspjp1g1ziap4z69idv05mfkf6sp3";
   };
 
-  cargoSha256 = "0dd7b6iibjmmriwi081pc65crq0y1j2pmbm1iq0lkqdd89c9f1yp";
+  cargoSha256 = "09kccd1brcbvzimm05dyybwrkganqxdkjrvzgcf1l93xs1z2h94b";
 
   meta = with stdenv.lib; {
+    changelog = "https://github.com/sharkdp/hexyl/releases/tag/v${version}";
     description = "A command-line hex viewer";
     longDescription = ''
       `hexyl` is a simple hex viewer for the terminal. It uses a colored
@@ -21,7 +22,7 @@ rustPlatform.buildRustPackage rec {
       printable ASCII characters, ASCII whitespace characters, other ASCII
       characters and non-ASCII).
     '';
-    homepage    = https://github.com/sharkdp/hexyl;
+    homepage    = "https://github.com/sharkdp/hexyl";
     license     = with licenses; [ asl20 /* or */ mit ];
     maintainers = with maintainers; [ dywedir ];
     platforms   = platforms.linux ++ platforms.darwin;

From 04d6123309fa5f89b436472d7b4fd418f8c3106f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 9 Mar 2020 22:30:46 +0100
Subject: [PATCH 2643/4636] pytrainer: fix missing pkg_resources

---
 pkgs/applications/misc/pytrainer/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix
index 0375b99af483..bb3a92e72c30 100644
--- a/pkgs/applications/misc/pytrainer/default.nix
+++ b/pkgs/applications/misc/pytrainer/default.nix
@@ -57,6 +57,7 @@ python3.pkgs.buildPythonApplication rec {
     psycopg2
     requests
     certifi
+    setuptools
   ];
 
   nativeBuildInputs = [

From 22f578d8c430e3c8d09cc0460e84adf7c1f8968a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 9 Mar 2020 21:32:53 +0000
Subject: [PATCH 2644/4636] python27Packages.sqlmap: 1.4.2 -> 1.4.3

---
 pkgs/development/python-modules/sqlmap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix
index f39c57e6be6c..1e35d4024eb8 100644
--- a/pkgs/development/python-modules/sqlmap/default.nix
+++ b/pkgs/development/python-modules/sqlmap/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "sqlmap";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "12i5s3qs0lxfs06p5b354scbapldf4isfr00cg1dq47n4gnqwa99";
+    sha256 = "0qp9j8c92zbkwlbv5ywrszil6kvlkkf3wkc4krh2vdsrwd9cnf2g";
   };
 
   postPatch = ''

From cb9c6a758bb26fe1ead0e85b1ad71c47fa5c3767 Mon Sep 17 00:00:00 2001
From: Nadrieril <nadrieril+git@gmail.com>
Date: Sat, 7 Mar 2020 12:20:42 +0000
Subject: [PATCH 2645/4636] paperwork: 1.2.4 -> 1.3.1

Also install paperwork-shell and desktop file
---
 .../applications/office/paperwork/backend.nix | 13 ++---
 .../applications/office/paperwork/default.nix | 49 +++++++++++++------
 2 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/office/paperwork/backend.nix b/pkgs/applications/office/paperwork/backend.nix
index 7f82780fbe92..c28a4bc916dc 100644
--- a/pkgs/applications/office/paperwork/backend.nix
+++ b/pkgs/applications/office/paperwork/backend.nix
@@ -3,14 +3,15 @@
 , isPy3k, isPyPy
 
 , pyenchant, simplebayes, pillow, pycountry, whoosh, termcolor
-, python-Levenshtein, pyinsane2, pygobject3, pyocr, natsort
+, python-Levenshtein, pygobject3, pyocr, natsort, libinsane
+, distro
 
 , pkgs
 }:
 
 buildPythonPackage rec {
   pname = "paperwork-backend";
-  version = "1.2.4";
+  version = "1.3.1";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
@@ -18,7 +19,7 @@ buildPythonPackage rec {
     group = "World";
     owner = "OpenPaperwork";
     rev = version;
-    sha256 = "0wjjiw99aswmppnhzq3jir0p5p78r3m8hjinhdirkgm6h7skq5p4";
+    sha256 = "1219yz8z4r1yn6miq8zc2z1m1lnhf3dmkhwfw23n05bg842nvg65";
   };
 
   sourceRoot = "source/paperwork-backend";
@@ -34,14 +35,14 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     pyenchant simplebayes pillow pycountry whoosh termcolor
-    python-Levenshtein pyinsane2 pygobject3 pyocr natsort
-    pkgs.poppler_gi pkgs.gtk3
+    python-Levenshtein libinsane pygobject3 pyocr natsort
+    pkgs.poppler_gi pkgs.gtk3 distro
   ];
 
   meta = {
     description = "Backend part of Paperwork (Python API, no UI)";
     homepage = https://openpaper.work/;
     license = lib.licenses.gpl3Plus;
-    maintainers = [ lib.maintainers.aszlig ];
+    maintainers = with lib.maintainers; [ aszlig symphorien ];
   };
 }
diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix
index 3506ea8b5515..c3930115365c 100644
--- a/pkgs/applications/office/paperwork/default.nix
+++ b/pkgs/applications/office/paperwork/default.nix
@@ -1,7 +1,15 @@
-{ lib, python3Packages, gtk3, cairo
-, aspellDicts, buildEnv
-, gnome3, librsvg
-, xvfb_run, dbus, libnotify
+{ lib
+, python3Packages
+, gtk3
+, cairo
+, aspellDicts
+, buildEnv
+, gnome3
+, librsvg
+, xvfb_run
+, dbus
+, libnotify
+, wrapGAppsHook
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -46,9 +54,23 @@ python3Packages.buildPythonApplication rec {
     paths = lib.collect lib.isDerivation aspellDicts;
   }}/lib/aspell";
 
+  postInstall = ''
+    # paperwork-shell needs to be re-wrapped with access to paperwork
+    cp ${python3Packages.paperwork-backend}/bin/.paperwork-shell-wrapped $out/bin/paperwork-shell
+    # install desktop files and icons
+    XDG_DATA_HOME=$out/share $out/bin/paperwork-shell install
+  '';
+
   checkInputs = [ xvfb_run dbus.daemon ] ++ (with python3Packages; [ paperwork-backend ]);
+
+  nativeBuildInputs = [
+    wrapGAppsHook
+  ];
+
   buildInputs = [
-    gnome3.adwaita-icon-theme libnotify librsvg
+    gnome3.adwaita-icon-theme
+    libnotify
+    librsvg
   ];
 
   # A few parts of chkdeps need to have a display and a dbus session, so we not
@@ -61,21 +83,20 @@ python3Packages.buildPythonApplication rec {
   '';
 
   propagatedBuildInputs = with python3Packages; [
-    paperwork-backend pypillowfight gtk3 cairo pyxdg dateutil setuptools pandas
-  ];
-
-  makeWrapperArgs = [
-    "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\""
-    "--set GDK_PIXBUF_MODULE_FILE \"$GDK_PIXBUF_MODULE_FILE\""
-    "--prefix XDG_DATA_DIRS : \"$out/share\""
-    "--suffix XDG_DATA_DIRS : \"$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\""
+    paperwork-backend
+    pypillowfight
+    gtk3
+    cairo
+    pyxdg
+    dateutil
+    setuptools
   ];
 
   meta = {
     description = "A personal document manager for scanned documents";
     homepage = https://openpaper.work/;
     license = lib.licenses.gpl3Plus;
-    maintainers = [ lib.maintainers.aszlig ];
+    maintainers = with lib.maintainers; [ aszlig symphorien ];
     platforms = lib.platforms.linux;
   };
 }

From 99dfc57bce8dd83f208521028162a56b03ea3a0e Mon Sep 17 00:00:00 2001
From: Nadrieril <nadrieril+git@gmail.com>
Date: Sat, 7 Mar 2020 12:21:41 +0000
Subject: [PATCH 2646/4636] python3Packages.pyinsane2: remove

It is only used for paperwork and is now unmaintained.
---
 .../python-modules/pyinsane2/default.nix      | 45 -------------------
 pkgs/top-level/python-packages.nix            |  2 -
 2 files changed, 47 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pyinsane2/default.nix

diff --git a/pkgs/development/python-modules/pyinsane2/default.nix b/pkgs/development/python-modules/pyinsane2/default.nix
deleted file mode 100644
index 8f96ebe915a6..000000000000
--- a/pkgs/development/python-modules/pyinsane2/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, nose
-, pillow
-, pkgs
-}:
-
-buildPythonPackage rec {
-  pname = "pyinsane2";
-  version = "2.0.13";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0d519531d552e4512776225eb400a6a4a9bfc83a08918ec7fea19cb2fa7ec4ee";
-  };
-
-  # This is needed by setup.py regardless of whether tests are enabled.
-  buildInputs = [ nose ];
-  propagatedBuildInputs = [ pillow ];
-
-  postPatch = ''
-    # pyinsane2 forks itself, so we need to re-inject the PYTHONPATH.
-    sed -i -e '/os.putenv.*PYINSANE_DAEMON/ {
-      a \        os.putenv("PYTHONPATH", ":".join(sys.path))
-    }' pyinsane2/sane/abstract_proc.py
-
-    sed -i -e 's,"libsane.so.1","${pkgs.sane-backends}/lib/libsane.so",' \
-      pyinsane2/sane/rawapi.py
-  '';
-
-  # Tests require a scanner to be physically connected, so let's just do a
-  # quick check whether initialization works.
-  checkPhase = ''
-    python -c 'import pyinsane2; pyinsane2.init()'
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = "https://github.com/jflesch/pyinsane";
-    description = "Access and use image scanners";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-  };
-
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d7ef1072ec5a..32b03a3dadbb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5078,8 +5078,6 @@ in {
 
   pyinotify = callPackage ../development/python-modules/pyinotify { };
 
-  pyinsane2 = callPackage ../development/python-modules/pyinsane2 { };
-
   pyjwt = callPackage ../development/python-modules/pyjwt { };
 
   pykickstart = callPackage ../development/python-modules/pykickstart { };

From 2b1e312b408ba10540a39bb8b6ea00be88f4272a Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Mon, 9 Mar 2020 22:45:07 +0100
Subject: [PATCH 2647/4636] perlPackages.MojoPg: init at 4.18

---
 pkgs/top-level/perl-packages.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d3ef5d83808e..6ba21c40a317 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12224,6 +12224,23 @@ let
     };
   };
 
+  MojoPg = buildPerlPackage {
+    pname = "Mojo-Pg";
+    version = "4.18";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SR/SRI/Mojo-Pg-4.18.tar.gz";
+      sha256 = "31baacc0d6693886b3580e4b3ec6f2d053be8578809c9c1750753576bd1bda3c";
+    };
+    buildInputs = [ TestDeep ];
+    propagatedBuildInputs = [ DBDPg Mojolicious SQLAbstract ];
+    meta = {
+      homepage = "https://github.com/mojolicious/mojo-pg";
+      description = "Mojolicious <3 PostgreSQL";
+      license = stdenv.lib.licenses.artistic2;
+      maintainers = [ maintainers.sgo ];
+    };
+  };
+
   MonitoringPlugin = buildPerlPackage {
     pname = "Monitoring-Plugin";
     version = "0.40";

From a7c53f7640638e7cccce9b763f5cd2a2d14566d8 Mon Sep 17 00:00:00 2001
From: Raphael Borun Das Gupta <git@raphael.dasgupta.ch>
Date: Mon, 9 Mar 2020 23:01:40 +0100
Subject: [PATCH 2648/4636] doc: fix grammar / typo in NixPkgs GNOME manual

---
 doc/languages-frameworks/gnome.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/gnome.xml b/doc/languages-frameworks/gnome.xml
index bb68d026ae23..57f73826670a 100644
--- a/doc/languages-frameworks/gnome.xml
+++ b/doc/languages-frameworks/gnome.xml
@@ -233,7 +233,7 @@ mkDerivation {
     </term>
     <listitem>
      <para>
-      You can rely on applications depending on the library set the necessary environment variables but that it often easy to miss. Instead we recommend to patch the paths in the source code whenever possible. Here are some examples:
+      You can rely on applications depending on the library set the necessary environment variables but that is often easy to miss. Instead we recommend to patch the paths in the source code whenever possible. Here are some examples:
       <itemizedlist>
        <listitem xml:id="ssec-gnome-common-issues-unwrappable-package-gnome-shell-ext">
         <para>

From ab021ffbb94a9ec9fe6564fb2c6fdf6edcb98b86 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 9 Mar 2020 22:09:17 +0000
Subject: [PATCH 2649/4636] sdparm: 1.10 -> 1.11

---
 pkgs/os-specific/linux/sdparm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/sdparm/default.nix b/pkgs/os-specific/linux/sdparm/default.nix
index 5517f163b3e0..e0392e442bf5 100644
--- a/pkgs/os-specific/linux/sdparm/default.nix
+++ b/pkgs/os-specific/linux/sdparm/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation rec {
   pname = "sdparm";
-  version = "1.10";
+  version = "1.11";
 
   src = fetchurl {
     url = "http://sg.danny.cz/sg/p/${pname}-${version}.tar.xz";
-    sha256 = "1jjq3lzgfy4r76rc26q02lv4wm5cb4dx5nh913h489zjrr4f3jbx";
+    sha256 = "1nqjc4w2w47zavcbf5xmm53x1zbwgljaw1lpajcdi537cgy32fa8";
   };
 
   meta = with stdenv.lib; {
-    homepage = http://sg.danny.cz/sg/sdparm.html;
+    homepage = "http://sg.danny.cz/sg/sdparm.html";
     description = "A utility to access SCSI device parameters";
     license = licenses.bsd3;
     platforms = with platforms; linux;

From 6733ecede5e86371e931f43115dd16598785a87f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 9 Mar 2020 23:01:23 +0100
Subject: [PATCH 2650/4636] libgit2: 0.28.4 -> 0.99.0

https://github.com/libgit2/libgit2/releases/tag/v0.99.0
---
 pkgs/development/libraries/git2/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix
index ed32f68635b0..873865cdf837 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/pkgs/development/libraries/git2/default.nix
@@ -5,17 +5,20 @@
 
 stdenv.mkDerivation rec {
   pname = "libgit2";
-  version = "0.28.4";
+  version = "0.99.0";
   # keep the version in sync with python3.pkgs.pygit2 and libgit2-glib
 
   src = fetchFromGitHub {
     owner = "libgit2";
     repo = "libgit2";
     rev = "v${version}";
-    sha256 = "171b25aym4q88bidc4c76y4l6jmdwifm3q9zjqsll0wjhlkycfy1";
+    sha256 = "0qxzv49ip378g1n7hrbifb9c6pys2kj1hnxcafmbb94gj3pgd9kg";
   };
 
-  cmakeFlags = [ "-DTHREADSAFE=ON" ];
+  cmakeFlags = [
+    "-DTHREADSAFE=ON"
+    "-DUSE_HTTP_PARSER=system"
+  ];
 
   nativeBuildInputs = [ cmake python3 pkgconfig ];
 
@@ -30,7 +33,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "The Git linkable library";
-    homepage = https://libgit2.github.com/;
+    homepage = "https://libgit2.github.com/";
     license = stdenv.lib.licenses.gpl2;
     platforms = with stdenv.lib.platforms; all;
   };

From 6a23ca8c8527a7042a31292b6fd47ffcdf76bb21 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 28 Feb 2020 23:12:49 +0000
Subject: [PATCH 2651/4636] libgit2-glib: 0.28.0.1 -> 0.99.0.1

https://ftp.gnome.org/pub/GNOME/sources/libgit2-glib/0.99/libgit2-glib-0.99.0.1.news
---
 pkgs/development/libraries/libgit2-glib/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/development/libraries/libgit2-glib/default.nix
index d5edefc5d54b..f3e07b509176 100644
--- a/pkgs/development/libraries/libgit2-glib/default.nix
+++ b/pkgs/development/libraries/libgit2-glib/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libgit2-glib";
-  version = "0.28.0.1";
+  version = "0.99.0.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0a0g7aw66rfgnqr4z7fgbk5zzcjq66m4rp8v4val3a212941h0g7";
+    sha256 = "1pmrcnsa7qdda73c3dxf47733mwprmj5ljpw3acxbj6r8k27anp0";
   };
 
   postPatch = ''
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A glib wrapper library around the libgit2 git access library";
-    homepage = https://wiki.gnome.org/Projects/Libgit2-glib;
+    homepage = "https://wiki.gnome.org/Projects/Libgit2-glib";
     license = licenses.lgpl21;
     maintainers = gnome3.maintainers;
     platforms = platforms.linux;

From b0be93769ba339f037c62c8fa13955d04648914e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 9 Mar 2020 23:06:56 +0100
Subject: [PATCH 2652/4636] =?UTF-8?q?python3.pkgs.pygit2:=201.0.3=20?=
 =?UTF-8?q?=E2=86=92=201.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/libgit2/pygit2/compare/v1.0.3...v1.1.1#diff-de0a9b67ffe2874a076b5fdb15bad484
---
 pkgs/development/python-modules/pygit2/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix
index cd2994a4dc0f..013ce9ae9162 100644
--- a/pkgs/development/python-modules/pygit2/default.nix
+++ b/pkgs/development/python-modules/pygit2/default.nix
@@ -1,19 +1,25 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, isPy3k, libgit2, pytestCheckHook, cffi, cacert }:
+{ stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, isPy3k, libgit2, cached-property, pytestCheckHook, cffi, cacert }:
 
 buildPythonPackage rec {
   pname = "pygit2";
-  version = "1.0.3";
+  version = "1.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ql7hkcxrh8yszglrg7d3y0ivh1l56xdc3j34j2fjy4qq06ifv6y";
+    sha256 = "klXVB9XYe/It/VeZeniQgBAzH8IfmoPsoSGlP2V76zw=";
   };
 
   preConfigure = lib.optionalString stdenv.isDarwin ''
     export DYLD_LIBRARY_PATH="${libgit2}/lib"
   '';
 
-  propagatedBuildInputs = [ libgit2 ] ++ lib.optional (!isPyPy) cffi;
+  buildInputs = [
+    libgit2
+  ];
+
+  propagatedBuildInputs = [
+    cached-property
+  ] ++ lib.optional (!isPyPy) cffi;
 
   checkInputs = [ pytestCheckHook ];
 

From b150e08169d95c5813ded16959002da38282d850 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Tue, 11 Feb 2020 17:52:48 +0100
Subject: [PATCH 2653/4636] nixos/supybot: stateDir in /var/lib, use tmpfiles

Moving the stateDir is needed in order to use ProtectSystem=strict
systemd option.
---
 nixos/modules/services/networking/supybot.nix | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/networking/supybot.nix b/nixos/modules/services/networking/supybot.nix
index d5b9a97a1c1a..21e9fbd6e604 100644
--- a/nixos/modules/services/networking/supybot.nix
+++ b/nixos/modules/services/networking/supybot.nix
@@ -20,15 +20,18 @@ in
       };
 
       stateDir = mkOption {
-        # Setting this to /var/lib/supybot caused useradd to fail
-        default = "/home/supybot";
+        type = types.path;
+        default = if versionAtLeast config.system.stateVersion "20.09"
+          then "/var/lib/supybot"
+          else "/home/supybot";
+        defaultText = "/var/lib/supybot";
         description = "The root directory, logs and plugins are stored here";
       };
 
       configFile = mkOption {
         type = types.path;
         description = ''
-          Path to a supybot config file. This can be generated by
+          Path to initial supybot config file. This can be generated by
           running supybot-wizard.
 
           Note: all paths should include the full path to the stateDir
@@ -50,7 +53,7 @@ in
       group = "supybot";
       description = "Supybot IRC bot user";
       home = cfg.stateDir;
-      createHome = true;
+      isSystemUser = true;
     };
 
     users.groups.supybot = {
@@ -63,11 +66,8 @@ in
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.pythonPackages.limnoria ];
       preStart = ''
-        cd ${cfg.stateDir}
-        mkdir -p backup conf data plugins logs/plugins tmp web
-        ln -sf ${cfg.configFile} supybot.cfg
         # This needs to be created afresh every time
-        rm -f supybot.cfg.bak
+        rm -f '${cfg.stateDir}/supybot.cfg.bak'
       '';
 
       serviceConfig = {
@@ -82,5 +82,18 @@ in
       };
     };
 
+    systemd.tmpfiles.rules = [
+      "d '${cfg.stateDir}'              0700 supybot supybot - -"
+      "d '${cfg.stateDir}/backup'       0750 supybot supybot - -"
+      "d '${cfg.stateDir}/conf'         0750 supybot supybot - -"
+      "d '${cfg.stateDir}/data'         0750 supybot supybot - -"
+      "d '${cfg.stateDir}/plugins'      0750 supybot supybot - -"
+      "d '${cfg.stateDir}/logs'         0750 supybot supybot - -"
+      "d '${cfg.stateDir}/logs/plugins' 0750 supybot supybot - -"
+      "d '${cfg.stateDir}/tmp'          0750 supybot supybot - -"
+      "d '${cfg.stateDir}/web'          0750 supybot supybot - -"
+      "L '${cfg.stateDir}/supybot.cfg'  -    -       -       - ${cfg.configFile}"
+    ];
+
   };
 }

From 57f5fb62d4bccbf758a766fe11ce662cd07726ea Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Tue, 11 Feb 2020 17:55:03 +0100
Subject: [PATCH 2654/4636] nixos/supybot: enable systemd sandboxing options

---
 nixos/doc/manual/release-notes/rl-2009.xml    | 10 ++++++
 nixos/modules/services/networking/supybot.nix | 33 ++++++++++++++++---
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 892208b01d7d..c2149a687037 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -72,6 +72,16 @@
 }</programlisting>
     </para>
    </listitem>
+   <listitem>
+    <para>
+      The <link linkend="opt-services.supybot.enable">supybot</link> module now uses <literal>/var/lib/supybot</literal>
+      as its default <link linkend="opt-services.supybot.stateDir">stateDir</link> path if <literal>stateVersion</literal>
+      is 20.09 or higher. It also enables number of
+      <link xlink:href="https://www.freedesktop.org/software/systemd/man/systemd.exec.html#Sandboxing">systemd sandboxing options</link>
+      which may possibly interfere with some plugins. If this is the case you can disable the options through attributes in
+      <option>systemd.services.supybot.serviceConfig</option>.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/services/networking/supybot.nix b/nixos/modules/services/networking/supybot.nix
index 21e9fbd6e604..fabe4d0cb2bb 100644
--- a/nixos/modules/services/networking/supybot.nix
+++ b/nixos/modules/services/networking/supybot.nix
@@ -3,13 +3,11 @@
 with lib;
 
 let
-
   cfg  = config.services.supybot;
-
+  isStateDirHome = hasPrefix "/home/" cfg.stateDir;
+  isStateDirVar = cfg.stateDir == "/var/lib/supybot";
 in
-
 {
-
   options = {
 
     services.supybot = {
@@ -43,7 +41,6 @@ in
 
   };
 
-
   config = mkIf cfg.enable {
 
     environment.systemPackages = [ pkgs.pythonPackages.limnoria ];
@@ -79,6 +76,32 @@ in
         Restart = "on-abort";
         StartLimitInterval = "5m";
         StartLimitBurst = "1";
+
+        NoNewPrivileges = true;
+        PrivateDevices = true;
+        PrivateMounts = true;
+        PrivateTmp = true;
+        ProtectControlGroups = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
+        RestrictSUIDSGID = true;
+        SystemCallArchitectures = "native";
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        RemoveIPC = true;
+        ProtectHostname = true;
+        CapabilityBoundingSet = "";
+        ProtectSystem = "full";
+      }
+      // optionalAttrs isStateDirVar {
+        StateDirectory = "supybot";
+        ProtectSystem = "strict";
+      }
+      // optionalAttrs (!isStateDirHome) {
+        ProtectHome = true;
       };
     };
 

From 1affd47cc10e62f5c58e106c9135e86c0c898a5f Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Tue, 11 Feb 2020 17:56:03 +0100
Subject: [PATCH 2655/4636] nixos/supybot: python3 switch, add plugin options

Python2 seems to be no longer supported by limnoria upstream.
---
 nixos/modules/services/networking/supybot.nix | 49 +++++++++++++++++--
 1 file changed, 44 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/networking/supybot.nix b/nixos/modules/services/networking/supybot.nix
index fabe4d0cb2bb..dc9fb31ffd0b 100644
--- a/nixos/modules/services/networking/supybot.nix
+++ b/nixos/modules/services/networking/supybot.nix
@@ -6,6 +6,7 @@ let
   cfg  = config.services.supybot;
   isStateDirHome = hasPrefix "/home/" cfg.stateDir;
   isStateDirVar = cfg.stateDir == "/var/lib/supybot";
+  pyEnv = pkgs.python3.withPackages (p: [ p.limnoria ] ++ (cfg.extraPackages p));
 in
 {
   options = {
@@ -13,8 +14,9 @@ in
     services.supybot = {
 
       enable = mkOption {
+        type = types.bool;
         default = false;
-        description = "Enable Supybot, an IRC bot";
+        description = "Enable Supybot, an IRC bot (also known as Limnoria).";
       };
 
       stateDir = mkOption {
@@ -37,13 +39,47 @@ in
         '';
       };
 
+      plugins = mkOption {
+        type = types.attrsOf types.path;
+        default = {};
+        description = ''
+          Attribute set of additional plugins that will be symlinked to the
+          <filename>plugin</filename> subdirectory.
+
+          Please note that you still need to add the plugins to the config
+          file (or with <literal>!load</literal>) using their attribute name.
+        '';
+        example = literalExample ''
+          let
+            plugins = pkgs.fetchzip {
+              url = "https://github.com/ProgVal/Supybot-plugins/archive/57c2450c.zip";
+              sha256 = "077snf84ibnva3sbpzdfpfma6hcdw7dflwnhg6pw7mgnf0nd84qd";
+            };
+          in
+          {
+            Wikipedia = "''${plugins}/Wikipedia";
+            Decide = ./supy-decide;
+          }
+        '';
+      };
+
+      extraPackages = mkOption {
+        default = p: [];
+        description = ''
+          Extra Python packages available to supybot plugins. The
+          value must be a function which receives the attrset defined
+          in <varname>python3Packages</varname> as the sole argument.
+        '';
+        example = literalExample ''p: [ p.lxml p.requests ]'';
+      };
+
     };
 
   };
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [ pkgs.pythonPackages.limnoria ];
+    environment.systemPackages = [ pkgs.python3Packages.limnoria ];
 
     users.users.supybot = {
       uid = config.ids.uids.supybot;
@@ -59,16 +95,16 @@ in
 
     systemd.services.supybot = {
       description = "Supybot, an IRC bot";
+      documentation = [ "https://limnoria.readthedocs.io/" ];
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      path = [ pkgs.pythonPackages.limnoria ];
       preStart = ''
         # This needs to be created afresh every time
         rm -f '${cfg.stateDir}/supybot.cfg.bak'
       '';
 
       serviceConfig = {
-        ExecStart = "${pkgs.pythonPackages.limnoria}/bin/supybot ${cfg.stateDir}/supybot.cfg";
+        ExecStart = "${pyEnv}/bin/supybot ${cfg.stateDir}/supybot.cfg";
         PIDFile = "/run/supybot.pid";
         User = "supybot";
         Group = "supybot";
@@ -116,7 +152,10 @@ in
       "d '${cfg.stateDir}/tmp'          0750 supybot supybot - -"
       "d '${cfg.stateDir}/web'          0750 supybot supybot - -"
       "L '${cfg.stateDir}/supybot.cfg'  -    -       -       - ${cfg.configFile}"
-    ];
+    ]
+    ++ (flip mapAttrsToList cfg.plugins (name: dest:
+      "L+ '${cfg.stateDir}/plugins/${name}' - - - - ${dest}"
+    ));
 
   };
 }

From 0d300d42d0df2c820a887733fe8fb47220323067 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 9 Mar 2020 22:39:16 +0000
Subject: [PATCH 2656/4636] sg3_utils: 1.44 -> 1.45

---
 pkgs/tools/system/sg3_utils/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix
index 67145bc3cc54..45e3287511a3 100644
--- a/pkgs/tools/system/sg3_utils/default.nix
+++ b/pkgs/tools/system/sg3_utils/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "sg3_utils-1.44";
+  name = "sg3_utils-1.45";
 
   src = fetchurl {
     url = "http://sg.danny.cz/sg/p/${name}.tgz";
-    sha256 = "0yxfbkd48mbzipwmggcvpq60zybsb6anrca878si26z7496nibld";
+    sha256 = "0qasc3qm4i8swjfaywiwpgz76gdxqvm47qycxgmprbsjmxqwk1qb";
   };
 
   meta = with stdenv.lib; {
-    homepage = http://sg.danny.cz/sg/;
+    homepage = "http://sg.danny.cz/sg/";
     description = "Utilities that send SCSI commands to devices";
     platforms = platforms.linux;
     license = with licenses; [ bsd2 gpl2Plus ];

From aa618bbf792fce71d585070bd70edfd1e6589479 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 9 Mar 2020 22:44:06 +0000
Subject: [PATCH 2657/4636] spice-protocol: 0.14.0 -> 0.14.1

---
 pkgs/development/libraries/spice-protocol/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix
index c32f336939cb..cae975b9a589 100644
--- a/pkgs/development/libraries/spice-protocol/default.nix
+++ b/pkgs/development/libraries/spice-protocol/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "spice-protocol";
-  version = "0.14.0";
+  version = "0.14.1";
 
   src = fetchurl {
     url = "https://www.spice-space.org/download/releases/${pname}-${version}.tar.bz2";
-    sha256 = "1b3f44c13pqsp7aabmcinfbmgl79038bp5548l5pjs16lcfam95n";
+    sha256 = "0ahk5hlanwhbc64r80xmchdav3ls156cvh9l68a0l22bhdhxmrkr";
   };
 
   postInstall = ''
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Protocol headers for the SPICE protocol";
-    homepage = https://www.spice-space.org/;
+    homepage = "https://www.spice-space.org/";
     license = licenses.bsd3;
     maintainers = with maintainers; [ bluescreen303 ];
     platforms = platforms.linux;

From ccc502f07a0c22029c49921de230f614a4ed5499 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 9 Mar 2020 23:09:45 +0000
Subject: [PATCH 2658/4636] syslogng: 3.25.1 -> 3.26.1

---
 pkgs/tools/system/syslog-ng/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix
index 8066f07afa93..ed104f3a9ba1 100644
--- a/pkgs/tools/system/syslog-ng/default.nix
+++ b/pkgs/tools/system/syslog-ng/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "syslog-ng";
-  version = "3.25.1";
+  version = "3.26.1";
 
   src = fetchurl {
     url = "https://github.com/${pname}/${pname}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
-    sha256 = "05v8vgs4fbzslqjca9zjk7hkiyb6yj4i2v0fi51xan6ypirrdjrl";
+    sha256 = "1kb2rdhfw4vcdxpvr7rcpg5ysr14ib43bfqdm3755wjdhqil48ch";
   };
 
   nativeBuildInputs = [ pkgconfig which ];
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = https://www.syslog-ng.com;
+    homepage = "https://www.syslog-ng.com";
     description = "Next-generation syslogd with advanced networking and filtering capabilities";
     license = licenses.gpl2;
     maintainers = with maintainers; [ fpletz ];

From 1aeaf9387a0f0c6f61255f3f4ff137d94d03376f Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 9 Mar 2020 22:53:53 +0000
Subject: [PATCH 2659/4636] libbpf: 0.0.3pre114 -> 0.0.7

Fixes #82153
---
 pkgs/os-specific/linux/libbpf/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix
index 1294bd3d2680..b9626aac22d2 100644
--- a/pkgs/os-specific/linux/libbpf/default.nix
+++ b/pkgs/os-specific/linux/libbpf/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchFromGitHub, pkgconfig
-, libelf
+, libelf, zlib
 }:
 
 with builtins;
 
 stdenv.mkDerivation rec {
   pname = "libbpf";
-  version = "0.0.3pre114_${substring 0 7 src.rev}";
+  version = "0.0.7";
 
   src = fetchFromGitHub {
-    owner  = "libbpf";
-    repo   = "libbpf";
-    rev    = "672ae75b66fd8780a4214fe7b116c427e0809a52";
-    sha256 = "1bdw1hc4m95irmybqlwax85b6m856g07p2slcw8b7jw3k4j9x075";
+    owner = "libbpf";
+    repo = "libbpf";
+    rev = "v${version}";
+    sha256 = "1jcqhqvfbnbijm4jn949ibw1qywai9rwhyijf6lg8cvnyxkib2bs";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libelf ];
+  buildInputs = [ libelf zlib ];
 
   sourceRoot = "source/src";
   enableParallelBuilding = true;

From dc9ba48a155790ba4bf4159c349f63829cdb5215 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Tue, 10 Mar 2020 00:40:33 +0100
Subject: [PATCH 2660/4636] ledger-live-desktop: 1.20.0 -> 2.0.1

---
 pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
index 64562fc445ab..091dda618c75 100644
--- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix
+++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
@@ -2,12 +2,12 @@
 
 let
   pname = "ledger-live-desktop";
-  version = "1.20.0";
+  version = "2.0.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
-    sha256 = "09mgd5nsd65w4irgzgmfz1k0r1k4fgkq490pkil8nqy6akjrsw1z";
+    sha256 = "0qml32vxm8iikybbsb0mw6mj5rn27splgxhhpqwvk9i2gvg78hlm";
   };
 
   appimageContents = appimageTools.extractType2 {

From 5ee998bbc264a0fba32b6c1e241cedae688520d1 Mon Sep 17 00:00:00 2001
From: caadar <v88m@posteo.net>
Date: Tue, 10 Mar 2020 02:40:37 +0300
Subject: [PATCH 2661/4636] scantailor-advanced: fix startup using
 wrapQtAppsHook (#82174)

---
 pkgs/applications/graphics/scantailor/advanced.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix
index 63f16f688acd..f9d6c87675f7 100644
--- a/pkgs/applications/graphics/scantailor/advanced.nix
+++ b/pkgs/applications/graphics/scantailor/advanced.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchFromGitHub
+{ stdenv, fetchFromGitHub, mkDerivation
 , cmake, libjpeg, libpng, libtiff, boost
 , qtbase, qttools }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "scantailor-advanced";
   version = "1.0.16";
 

From 6b943186d32980d11ba7c2c98fd8cab6ef44603d Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Tue, 10 Mar 2020 00:54:59 +0100
Subject: [PATCH 2662/4636] jellyfin: 10.4.3 -> 10.5.0

---
 pkgs/servers/jellyfin/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix
index 6da342ae8803..6cac79bdd4e2 100644
--- a/pkgs/servers/jellyfin/default.nix
+++ b/pkgs/servers/jellyfin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, unzip, sqlite, makeWrapper, dotnet-netcore, ffmpeg,
+{ stdenv, lib, fetchurl, unzip, sqlite, makeWrapper, dotnetCorePackages, ffmpeg,
   fontconfig, freetype }:
 
 let
@@ -18,12 +18,12 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "jellyfin";
-  version = "10.4.3";
+  version = "10.5.0";
 
   # Impossible to build anything offline with dotnet
   src = fetchurl {
     url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz";
-    sha256 = "11scxcwf02h6gvll0jwwac1wcpwz8d2y16yc3da0hrhy34yhysbl";
+    sha256 = "1r6ljl535f8jchm5zvrwfl4aqjk5bg7sqbwr03yyjxgriqgf36lp";
   };
 
   buildInputs = [
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
   ];
 
   propagatedBuildInputs = [
-    dotnet-netcore
+    dotnetCorePackages.aspnetcore_3_1
     sqlite
   ];
 
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
     install -dm 755 "$out/opt/jellyfin"
     cp -r * "$out/opt/jellyfin"
 
-    makeWrapper "${dotnet-netcore}/bin/dotnet" $out/bin/jellyfin \
+    makeWrapper "${dotnetCorePackages.aspnetcore_3_1}/bin/dotnet" $out/bin/jellyfin \
       --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
         sqlite fontconfig freetype stdenv.cc.cc.lib
       ]}:$out/opt/jellyfin/runtimes/${runtimeDir}/native/" \

From a8f6860ae45750738520986313907af80dc28ae2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Mar 2020 00:03:53 +0000
Subject: [PATCH 2663/4636] tome4: 1.6.6 -> 1.6.7

---
 pkgs/games/tome4/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix
index 81bc7f4a13c5..99391f2e3018 100644
--- a/pkgs/games/tome4/default.nix
+++ b/pkgs/games/tome4/default.nix
@@ -18,11 +18,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  version = "1.6.6";
+  version = "1.6.7";
 
   src = fetchurl {
     url = "https://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2";
-    sha256 = "1amx0y49scy9hq71wjvkdzvgclwa2g54vkv4bf40mxyp4pl0bq7m";
+    sha256 = "0283hvms5hr29zr0grd6gq059k0hg8hcz3fsmwjmysiih8790i68";
   };
 
   prePatch = ''
@@ -72,7 +72,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Tales of Maj'eyal (rogue-like game)";
-    homepage = https://te4.org/;
+    homepage = "https://te4.org/";
     license = licenses.gpl3;
     maintainers = with maintainers; [ chattered peterhoeg ];
     platforms = with platforms; [ "i686-linux" "x86_64-linux" ];

From 59d3c9118a68ca851095e45a1466685d38c5dc4a Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 9 Mar 2020 19:42:07 -0500
Subject: [PATCH 2664/4636] sqlmap: use toPythonApplication

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f748b141f103..5712dcdfb2fd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10706,7 +10706,7 @@ in
 
   sqlite-web = callPackage ../development/tools/database/sqlite-web { };
 
-  sqlmap = python3Packages.sqlmap;
+  sqlmap = with python3Packages; toPythonApplication sqlmap;
 
   sselp = callPackage ../tools/X11/sselp{ };
 

From 714dd394c8994e6fd587f28adf60dc45a6cc4b9c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Mar 2020 02:57:43 +0000
Subject: [PATCH 2665/4636] you-get: 0.4.1403 -> 0.4.1410

---
 pkgs/tools/misc/you-get/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix
index 466813ee75f7..ab1a3e66825c 100644
--- a/pkgs/tools/misc/you-get/default.nix
+++ b/pkgs/tools/misc/you-get/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonApplication rec {
   pname = "you-get";
-  version = "0.4.1403";
+  version = "0.4.1410";
 
   # Tests aren't packaged, but they all hit the real network so
   # probably aren't suitable for a build environment anyway.
@@ -10,12 +10,12 @@ buildPythonApplication rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "195c91xxcv3l3rd0v8ls5ghncf92ndfx0lpcbjr5zb41bl8alkcl";
+    sha256 = "0isjmx1z5w3m2v25sb7fpi7lyd4h8bl9n9691ylvl5w3bxf6ynm9";
   };
 
   meta = with stdenv.lib; {
     description = "A tiny command line utility to download media contents from the web";
-    homepage = https://you-get.org;
+    homepage = "https://you-get.org";
     license = licenses.mit;
     maintainers = with maintainers; [ ryneeverett ];
     platforms = platforms.all;

From 13964b07adb962f029d0f7983a427d08d29a08af Mon Sep 17 00:00:00 2001
From: Matt Layher <mdlayher@gmail.com>
Date: Tue, 3 Mar 2020 19:23:53 -0500
Subject: [PATCH 2666/4636] corerad: 0.2.1 -> 0.2.2

---
 pkgs/tools/networking/corerad/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix
index 517cb111c511..96798c1c17e9 100644
--- a/pkgs/tools/networking/corerad/default.nix
+++ b/pkgs/tools/networking/corerad/default.nix
@@ -2,17 +2,23 @@
 
 buildGoModule rec {
   pname = "corerad";
-  version = "0.2.1";
+  version = "0.2.2";
 
   src = fetchFromGitHub {
     owner = "mdlayher";
     repo = "corerad";
     rev = "v${version}";
-    sha256 = "04w77cahnphgd8b09a67dkrgx9jh8mvgjfjydj6drcw67v0d18c0";
+    sha256 = "0nxrksv98mxs5spykhzpydwjzii5cc6gk8az7irs3fdi4jx6pq1w";
   };
 
   modSha256 = "0vbbpndqwwz1mc59j7liaayxaj53cs8s3javgj3pvhkn4vp65p7c";
 
+  buildFlagsArray = ''
+    -ldflags=
+    -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1583280117
+    -X github.com/mdlayher/corerad/internal/build.linkVersion=v${version}
+  '';
+
   meta = with stdenv.lib; {
     homepage = "https://github.com/mdlayher/corerad";
     description = "CoreRAD extensible and observable IPv6 NDP RA daemon";

From 3193b639ff13941ec6d5c8d3cbf8a65dda8895a8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Mar 2020 03:41:13 +0000
Subject: [PATCH 2667/4636] vttest: 20190710 -> 20200303

---
 pkgs/tools/misc/vttest/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/vttest/default.nix b/pkgs/tools/misc/vttest/default.nix
index 0aa51363ff8f..38fedbbf0992 100644
--- a/pkgs/tools/misc/vttest/default.nix
+++ b/pkgs/tools/misc/vttest/default.nix
@@ -2,19 +2,19 @@
 
 stdenv.mkDerivation rec {
   pname = "vttest";
-  version = "20190710";
+  version = "20200303";
 
   src = fetchurl {
     urls = [
       "https://invisible-mirror.net/archives/${pname}/${pname}-${version}.tgz"
       "ftp://ftp.invisible-island.net/${pname}/${pname}-${version}.tgz"
     ];
-    sha256 = "00v3a94vpmbdziizdw2dj4bfwzfzfs2lc0ijxv98ln1w01w412q4";
+    sha256 = "1g27yp37kh57hmwicw3ndnsapsbqzk2cnjccmvyj4zw2z0l5iaj9";
   };
 
   meta = with stdenv.lib; {
     description = "Tests the compatibility so-called 'VT100-compatible' terminals";
-    homepage = https://invisible-island.net/vttest/;
+    homepage = "https://invisible-island.net/vttest/";
     license = licenses.mit;
     platforms = platforms.all;
   };

From af1d333bff00e1ea6903f134124f4d81b223369a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Mar 2020 05:54:06 +0000
Subject: [PATCH 2668/4636] devilutionx: 1.0.0 -> 1.0.1

---
 pkgs/games/devilutionx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix
index ac7d61b31c74..69d7e3ca6662 100644
--- a/pkgs/games/devilutionx/default.nix
+++ b/pkgs/games/devilutionx/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }:
 stdenv.mkDerivation rec {
-  version = "1.0.0";
+  version = "1.0.1";
   pname = "devilutionx";
 
   src = fetchFromGitHub {
     owner = "diasurgical";
     repo = "devilutionX";
     rev = version;
-    sha256 = "0lx903gchda4bgr71469yn63rx5ya6xv9j1azx18nrv3sskrphn4";
+    sha256 = "1jvjlch9ql5s5jx9g5y5pkc2xn62199qylsmzpqzx1jc3k2vmw5i";
   };
 
   NIX_CFLAGS_COMPILE = [

From dcd33b7a769ec425c657a808b239b456f2c427c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 10 Mar 2020 10:08:26 +0100
Subject: [PATCH 2669/4636] doc: tiny grammar improvement in the same sentence
 again

---
 doc/languages-frameworks/gnome.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/gnome.xml b/doc/languages-frameworks/gnome.xml
index 57f73826670a..7671714d8a9b 100644
--- a/doc/languages-frameworks/gnome.xml
+++ b/doc/languages-frameworks/gnome.xml
@@ -233,7 +233,7 @@ mkDerivation {
     </term>
     <listitem>
      <para>
-      You can rely on applications depending on the library set the necessary environment variables but that is often easy to miss. Instead we recommend to patch the paths in the source code whenever possible. Here are some examples:
+      You can rely on applications depending on the library setting the necessary environment variables but that is often easy to miss. Instead we recommend to patch the paths in the source code whenever possible. Here are some examples:
       <itemizedlist>
        <listitem xml:id="ssec-gnome-common-issues-unwrappable-package-gnome-shell-ext">
         <para>

From 3a93ec6f6dbf136dda5193e37e22759a7e4620d8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Mar 2020 09:09:46 +0000
Subject: [PATCH 2670/4636] neofetch: 6.1.0 -> 7.0.0

---
 pkgs/tools/misc/neofetch/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix
index 5850c4a90af7..a1a0c159bb41 100644
--- a/pkgs/tools/misc/neofetch/default.nix
+++ b/pkgs/tools/misc/neofetch/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "neofetch";
-  version = "6.1.0";
+  version = "7.0.0";
 
   src = fetchFromGitHub {
     owner = "dylanaraps";
     repo = "neofetch";
     rev = version;
-    sha256 = "022xzn9jk18k2f4b6011d8jk5nbl84i3mw3inlz4q52p2hvk8fch";
+    sha256 = "0xc0fdc7n5bhqirh83agqiy8r14l14zwca07czvj8vgnsnfybslr";
   };
 
   dontBuild = true;
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A fast, highly customizable system info script";
-    homepage = https://github.com/dylanaraps/neofetch;
+    homepage = "https://github.com/dylanaraps/neofetch";
     license = licenses.mit;
     platforms = platforms.all;
     maintainers = with maintainers; [ alibabzo konimex ];

From ea23f5b811f97b1f709931bc623653392d3d5719 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 10 Mar 2020 04:20:00 -0500
Subject: [PATCH 2671/4636] docker-slim: 1.28.0 -> 1.28.1

---
 pkgs/applications/virtualization/docker-slim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix
index 4cad4f8cc17c..6b4db2d5f0ce 100644
--- a/pkgs/applications/virtualization/docker-slim/default.nix
+++ b/pkgs/applications/virtualization/docker-slim/default.nix
@@ -6,7 +6,7 @@
 
 buildGoPackage rec {
   pname = "docker-slim";
-  version = "1.28.0";
+  version = "1.28.1";
 
   goPackagePath = "github.com/docker-slim/docker-slim";
 
@@ -14,7 +14,7 @@ buildGoPackage rec {
     owner = "docker-slim";
     repo = "docker-slim";
     rev = version;
-    sha256 = "1yqg7ngrgq1382clyaal40v7rg9p54hyf78mdrzql454yzxfa819";
+    sha256 = "13lws9vgzq3chlqxc8aggz3i5kmir3vld2af0fx15kvcb9kpd79a";
   };
 
   subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ];

From 1d9e65135916e02294cc626b165462120bfa928a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Mar 2020 09:43:12 +0000
Subject: [PATCH 2672/4636] openxr-loader: 1.0.3 -> 1.0.6

---
 pkgs/development/libraries/openxr-loader/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix
index 6cf03bc990c4..1c30277df120 100644
--- a/pkgs/development/libraries/openxr-loader/default.nix
+++ b/pkgs/development/libraries/openxr-loader/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openxr-loader";
-  version = "1.0.3";
+  version = "1.0.6";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenXR-SDK-Source";
     rev = "release-${version}";
-    sha256 = "0hqf0z38gk4id8d6vcms66mh3gllh2xib5mr11069sh9ak6b3mmp";
+    sha256 = "0zvp3x9hhpww2ym1inc0z8cwmfqhgqgl2g7csmj6ipp2fqwl6dlj";
   };
 
   nativeBuildInputs = [ cmake python3 ];

From 1d9c10c8de0634408a4bd3485092932563d3a463 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 10 Mar 2020 11:04:32 +0100
Subject: [PATCH 2673/4636] stdenv cc-wrapper: deal with edge-case regressions

Regression introduced in PR #81191 80729b6787d.  The file does not exist
somewhere during bootstrap of pkgsStatic.busybox which is used in nix
(by default).

I tested the builds.
---
 pkgs/build-support/cc-wrapper/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index a4370ff67935..7ae1c87e993a 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -366,7 +366,9 @@ stdenv.mkDerivation {
     # There are a few tools (to name one libstdcxx5) which do not work
     # well with multi line flags, so make the flags single line again
     + ''
-      substituteInPlace $out/nix-support/libc-cflags --replace $'\n' ' '
+      if [ -e "$out/nix-support/libc-cflags" ]; then
+        substituteInPlace "$out/nix-support/libc-cflags" --replace $'\n' ' '
+      fi
 
       substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
       substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh

From bbce0e88b9fd524be94b2a116bfb720e2cc063b9 Mon Sep 17 00:00:00 2001
From: Francesco Zanini <francesco@zanini.me>
Date: Tue, 10 Mar 2020 12:46:48 +0100
Subject: [PATCH 2674/4636] libgen-cli: init at 1.0.5

---
 pkgs/tools/misc/libgen-cli/default.nix | 30 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  4 +++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/misc/libgen-cli/default.nix

diff --git a/pkgs/tools/misc/libgen-cli/default.nix b/pkgs/tools/misc/libgen-cli/default.nix
new file mode 100644
index 000000000000..c34e934fba48
--- /dev/null
+++ b/pkgs/tools/misc/libgen-cli/default.nix
@@ -0,0 +1,30 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+buildGoModule rec {
+  pname = "libgen-cli";
+  version = "1.0.5";
+
+  src = fetchFromGitHub {
+    owner = "ciehanski";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1lfsnyzin2dqhwhz6phms6yipli88sqiw55ls18dfv7bvx30sqlp";
+  };
+
+  modSha256 = "1k16zjb7p65g72hr9vsk38jhpsy1yclm7fjgq47qy6jwjd44w1bi";
+
+  subPackages = [ "." ];
+
+  meta = with lib; {
+    homepage = "https://github.com/ciehanski/libgen-cli";
+    description =
+      "A CLI tool used to access the Library Genesis dataset; written in Go";
+    longDescription = ''
+      libgen-cli is a command line interface application which allows users to
+      quickly query the Library Genesis dataset and download any of its
+      contents.
+    '';
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ zaninime ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 269cfe4fe0d6..37ea31e8fe56 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3496,7 +3496,7 @@ in
   fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { };
 
   fuse-overlayfs = callPackage ../tools/filesystems/fuse-overlayfs {};
-  
+
   fusee-interfacee-tk = callPackage ../applications/misc/fusee-interfacee-tk { };
 
   fusee-launcher = callPackage ../development/tools/fusee-launcher { };
@@ -4539,6 +4539,8 @@ in
 
   libsmi = callPackage ../development/libraries/libsmi { };
 
+  libgen-cli = callPackage ../tools/misc/libgen-cli { };
+
   licensor = callPackage ../tools/misc/licensor { };
 
   lesspipe = callPackage ../tools/misc/lesspipe { };

From 9be58002edae99550c1eca155277e2540080eac6 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Tue, 10 Mar 2020 12:51:22 +0100
Subject: [PATCH 2675/4636] vscode, vscodium: 1.42.1 -> 1.43.0

---
 pkgs/applications/editors/vscode/vscode.nix   | 6 +++---
 pkgs/applications/editors/vscode/vscodium.nix | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index cd3e5676e8c7..967cd45946fe 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -11,15 +11,15 @@ let
   archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "0c067qp3aa5kqya3y8pzc9cvyzsafizhgjp9dsibnfl08lvz9hbs";
-    x86_64-darwin = "0vi94nk8p3vp30nx60mwqcmfqbrmrqwvfdjbah0zm480dcjzz7dv";
+    x86_64-linux = "0i8dmh9w7xgzfjii4m116lavydpfpcp7fxs4bcykf0a779pzwv87";
+    x86_64-darwin = "0z0r0dmmzk3k095g7jbrrk9gl1jpb3cai973xrjw17ank1lddcjf";
   }.${system};
 in
   callPackage ./generic.nix rec {
     # The update script doesn't correctly change the hash for darwin, so please:
     # nixpkgs-update: no auto update
 
-    version = "1.42.1";
+    version = "1.43.0";
     pname = "vscode";
 
     executableName = "code" + lib.optionalString isInsiders "-insiders";
diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index eafe1718c2fe..bffe73ec4f6b 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -11,8 +11,8 @@ let
   archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "1pac3rv7ps23ymynvy8dwd5k2154aln33ksr75z1d8w859x3f1dy";
-    x86_64-darwin = "1imzgqynbd65c7gbfp2gb1cxjbazx7afvbdvbqnm5qg7pvq22rni";
+    x86_64-linux = "139sqaixlcqlpcrn2vkcp9fxvcjgnhn2dwxclxq3bnb814pw7rba";
+    x86_64-darwin = "0jkd3p1jqg38z9l22k5w7b45fdnxwrhzlgyhinw7wlqz7zvflkn1";
   }.${system};
 
   sourceRoot = {
@@ -25,7 +25,7 @@ in
     # The update script doesn't correctly change the hash for darwin, so please:
     # nixpkgs-update: no auto update
 
-    version = "1.42.1";
+    version = "1.43.0";
     pname = "vscodium";
 
     executableName = "codium";

From bcb40a5f0440a35a01e3207f3222b710d3a0aef8 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Tue, 10 Mar 2020 12:00:00 +0000
Subject: [PATCH 2676/4636] pythonPackages.pyocr: 0.5.3 -> 0.7.2

---
 .../python-modules/pyocr/default.nix          |  44 +--
 .../python-modules/pyocr/paths.patch          | 290 ++++++++++++++++--
 2 files changed, 272 insertions(+), 62 deletions(-)

diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix
index ca606767f4d5..8cfce9ba43f1 100644
--- a/pkgs/development/python-modules/pyocr/default.nix
+++ b/pkgs/development/python-modules/pyocr/default.nix
@@ -1,10 +1,10 @@
-{ lib, fetchFromGitLab, buildPythonPackage, pillow, six
-, tesseract, cuneiform, isPy3k, substituteAll, pytest, tox
-}:
+{ lib, fetchFromGitLab, buildPythonPackage, pillow, setuptools_scm,
+setuptools-scm-git-archive , tesseract, cuneiform, isPy3k, substituteAll,
+pytest, tox }:
 
 buildPythonPackage rec {
   pname = "pyocr";
-  version = "0.5.3";
+  version = "0.7.2";
   disabled = !isPy3k;
 
   # Don't fetch from PYPI because it doesn't contain tests.
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     owner = "OpenPaperwork";
     repo = "pyocr";
     rev = version;
-    sha256 = "1nihf0qmbpg3yj3yp11jp6hp5z5dqf39nz6j9lqbvgi1nqbs7x15";
+    sha256 = "09ab86bmizpv94w3mdvdqkjyyvk1vafw3jqhkiw5xx7p180xn3il";
   };
 
   patches = [ (substituteAll {
@@ -23,38 +23,8 @@ buildPythonPackage rec {
   })
   ];
 
-  postPatch = ''
-    echo 'version = "${version}"' > src/pyocr/_version.py
-
-    # Disable specific tests that are probably failing because of this issue:
-    # https://github.com/jflesch/pyocr/issues/52
-    for test in $disabledTests; do
-      file="''${test%%:*}"
-      fun="''${test#*:}"
-      echo "import pytest" >> "tests/tests_$file.py"
-      echo "$fun = pytest.mark.skip($fun)" >> "tests/tests_$file.py"
-    done
-  '';
-
-  disabledTests = [
-    "cuneiform:TestTxt.test_basic"
-    "cuneiform:TestTxt.test_european"
-    "cuneiform:TestTxt.test_french"
-    "cuneiform:TestWordBox.test_basic"
-    "cuneiform:TestWordBox.test_european"
-    "cuneiform:TestWordBox.test_french"
-    "libtesseract:TestBasicDoc.test_basic"
-    "libtesseract:TestDigitLineBox.test_digits"
-    "libtesseract:TestLineBox.test_japanese"
-    "libtesseract:TestTxt.test_japanese"
-    "libtesseract:TestWordBox.test_japanese"
-    "libtesseract:TestTxt.test_multi"
-    "tesseract:TestTxt.test_multi"
-    "tesseract:TestDigitLineBox.test_digits"
-    "tesseract:TestTxt.test_japanese"
-  ];
-
-  propagatedBuildInputs = [ pillow six ];
+  buildInputs = [ setuptools_scm setuptools-scm-git-archive ];
+  propagatedBuildInputs = [ pillow ];
   checkInputs = [ pytest tox ];
   checkPhase = "pytest";
 
diff --git a/pkgs/development/python-modules/pyocr/paths.patch b/pkgs/development/python-modules/pyocr/paths.patch
index 9350d4050dad..55cbf7d48da4 100644
--- a/pkgs/development/python-modules/pyocr/paths.patch
+++ b/pkgs/development/python-modules/pyocr/paths.patch
@@ -1,9 +1,9 @@
-Index: current/src/pyocr/cuneiform.py
-===================================================================
---- current.orig/src/pyocr/cuneiform.py
-+++ current/src/pyocr/cuneiform.py
-@@ -27,13 +27,9 @@ from . import error
- from . import util
+diff --git a/src/pyocr/cuneiform.py b/src/pyocr/cuneiform.py
+index 2e5b717..35647e2 100644
+--- a/src/pyocr/cuneiform.py
++++ b/src/pyocr/cuneiform.py
+@@ -25,13 +25,9 @@ from . import builders
+ from .error import CuneiformError
  
  
 -# CHANGE THIS IF CUNEIFORM IS NOT IN YOUR PATH, OR IS NAMED DIFFERENTLY
@@ -18,25 +18,34 @@ Index: current/src/pyocr/cuneiform.py
  
  LANGUAGES_LINE_PREFIX = "Supported languages: "
  LANGUAGES_SPLIT_RE = re.compile("[^a-z]")
-Index: current/src/pyocr/libtesseract/tesseract_raw.py
-===================================================================
---- current.orig/src/pyocr/libtesseract/tesseract_raw.py
-+++ current/src/pyocr/libtesseract/tesseract_raw.py
-@@ -1,52 +1,13 @@
- import ctypes
+diff --git a/src/pyocr/libtesseract/tesseract_raw.py b/src/pyocr/libtesseract/tesseract_raw.py
+index a068e73..9ebea5c 100644
+--- a/src/pyocr/libtesseract/tesseract_raw.py
++++ b/src/pyocr/libtesseract/tesseract_raw.py
+@@ -2,7 +2,6 @@ import ctypes
+ import locale
  import logging
  import os
 -import sys
  
  from ..error import TesseractError
  
- 
+@@ -10,48 +9,16 @@ from ..error import TesseractError
  logger = logging.getLogger(__name__)
  
--TESSDATA_PREFIX = os.getenv('TESSDATA_PREFIX', None)
+ TESSDATA_PREFIX = os.getenv('TESSDATA_PREFIX', None)
 -libnames = []
++if TESSDATA_PREFIX is None:
++    TESSDATA_PREFIX = '@tesseract@/share/tessdata'
++    os.environ['TESSDATA_PREFIX'] = TESSDATA_PREFIX
++
++
+ # 70 is the minimum credible dpi for tesseract and force it to compute an
+ # estimate of the image dpi
+ DPI_DEFAULT = 70
+ 
 -
--if getattr(sys, 'frozen', False):
+-if getattr(sys, 'frozen', False):  # pragma: no cover
 -    # Pyinstaller integration
 -    libnames += [os.path.join(sys._MEIPASS, "libtesseract-4.dll")]
 -    libnames += [os.path.join(sys._MEIPASS, "libtesseract-3.dll")]
@@ -51,7 +60,7 @@ Index: current/src/pyocr/libtesseract/tesseract_raw.py
 -        TESSDATA_PREFIX = tessdata
 -
 -
--if sys.platform[:3] == "win":
+-if sys.platform[:3] == "win":  # pragma: no cover
 -    libnames += [
 -        # Jflesch> Don't they have the equivalent of LD_LIBRARY_PATH on
 -        # Windows ?
@@ -76,15 +85,16 @@ Index: current/src/pyocr/libtesseract/tesseract_raw.py
  
  g_libtesseract = None
  
-@@ -346,12 +307,11 @@ def init(lang=None):
+@@ -364,12 +331,12 @@ def init(lang=None):
      try:
          if lang:
              lang = lang.encode("utf-8")
 -        prefix = None
--        if TESSDATA_PREFIX:
+-        if TESSDATA_PREFIX:  # pragma: no cover
 -            prefix = TESSDATA_PREFIX.encode("utf-8")
-+        prefix = os.getenv('TESSDATA_PREFIX', '@tesseract@/share/tessdata')
-+        os.environ['TESSDATA_PREFIX'] = prefix
++
++        prefix = TESSDATA_PREFIX
++
          g_libtesseract.TessBaseAPIInit3(
              ctypes.c_void_p(handle),
 -            ctypes.c_char_p(prefix),
@@ -92,11 +102,11 @@ Index: current/src/pyocr/libtesseract/tesseract_raw.py
              ctypes.c_char_p(lang)
          )
          g_libtesseract.TessBaseAPISetVariable(
-Index: current/src/pyocr/tesseract.py
-===================================================================
---- current.orig/src/pyocr/tesseract.py
-+++ current/src/pyocr/tesseract.py
-@@ -31,8 +31,7 @@ from .builders import DigitBuilder  # ba
+diff --git a/src/pyocr/tesseract.py b/src/pyocr/tesseract.py
+index 7c30852..44e8446 100644
+--- a/src/pyocr/tesseract.py
++++ b/src/pyocr/tesseract.py
+@@ -28,8 +28,7 @@ from .builders import DigitBuilder  # backward compatibility
  from .error import TesseractError  # backward compatibility
  from .util import digits_only
  
@@ -106,3 +116,233 @@ Index: current/src/pyocr/tesseract.py
  
  TESSDATA_EXTENSION = ".traineddata"
  
+diff --git a/tests/tests_cuneiform.py b/tests/tests_cuneiform.py
+index 45b7f6a..95f55c6 100644
+--- a/tests/tests_cuneiform.py
++++ b/tests/tests_cuneiform.py
+@@ -21,7 +21,7 @@ class TestCuneiform(BaseTest):
+         # XXX is it useful?
+         which.return_value = True
+         self.assertTrue(cuneiform.is_available())
+-        which.assert_called_once_with("cuneiform")
++        which.assert_called_once_with("@cuneiform@/bin/cuneiform")
+ 
+     @patch("subprocess.Popen")
+     def test_version(self, popen):
+@@ -54,7 +54,7 @@ class TestCuneiform(BaseTest):
+         self.assertIn("eng", langs)
+         self.assertIn("fra", langs)
+         popen.assert_called_once_with(
+-            ["cuneiform", "-l"],
++            ["@cuneiform@/bin/cuneiform", "-l"],
+             stdout=subprocess.PIPE, stderr=subprocess.STDOUT
+         )
+ 
+@@ -109,7 +109,7 @@ class TestCuneiformTxt(BaseTest):
+         output = cuneiform.image_to_string(self.image)
+         self.assertEqual(output, self._get_file_content("text").strip())
+         popen.assert_called_once_with(
+-            ["cuneiform", "-f", "text", "-o", self.tmp_filename, "-"],
++            ["@cuneiform@/bin/cuneiform", "-f", "text", "-o", self.tmp_filename, "-"],
+             stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+             stderr=subprocess.STDOUT
+         )
+@@ -125,7 +125,7 @@ class TestCuneiformTxt(BaseTest):
+                                            builder=self.builder)
+         self.assertEqual(output, self._get_file_content("text").strip())
+         popen.assert_called_once_with(
+-            ["cuneiform", "-l", "fra", "-f", "text", "-o", self.tmp_filename,
++            ["@cuneiform@/bin/cuneiform", "-l", "fra", "-f", "text", "-o", self.tmp_filename,
+              "-"],
+             stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+             stderr=subprocess.STDOUT
+@@ -142,7 +142,7 @@ class TestCuneiformTxt(BaseTest):
+                                            builder=self.builder)
+         self.assertEqual(output, self._get_file_content("text").strip())
+         popen.assert_called_once_with(
+-            ["cuneiform", "-f", "text", "-o", self.tmp_filename, "-"],
++            ["@cuneiform@/bin/cuneiform", "-f", "text", "-o", self.tmp_filename, "-"],
+             stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+             stderr=subprocess.STDOUT
+         )
+@@ -173,7 +173,7 @@ class TestCuneiformTxt(BaseTest):
+         output = cuneiform.image_to_string(image, builder=self.builder)
+         self.assertEqual(output, self._get_file_content("text").strip())
+         popen.assert_called_once_with(
+-            ["cuneiform", "-f", "text", "-o", self.tmp_filename, "-"],
++            ["@cuneiform@/bin/cuneiform", "-f", "text", "-o", self.tmp_filename, "-"],
+             stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+             stderr=subprocess.STDOUT
+         )
+@@ -227,7 +227,7 @@ class TestCuneiformWordBox(BaseTest):
+         output = cuneiform.image_to_string(self.image,
+                                            builder=self.builder)
+         popen.assert_called_once_with(
+-            ["cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"],
++            ["@cuneiform@/bin/cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"],
+             stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+             stderr=subprocess.STDOUT
+         )
+@@ -280,7 +280,7 @@ class TestCuneiformLineBox(BaseTest):
+         output = cuneiform.image_to_string(self.image,
+                                            builder=self.builder)
+         popen.assert_called_once_with(
+-            ["cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"],
++            ["@cuneiform@/bin/cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"],
+             stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+             stderr=subprocess.STDOUT
+         )
+diff --git a/tests/tests_libtesseract.py b/tests/tests_libtesseract.py
+index ad7fdc9..57e7a60 100644
+--- a/tests/tests_libtesseract.py
++++ b/tests/tests_libtesseract.py
+@@ -165,7 +165,8 @@ class TestLibTesseractRaw(BaseTest):
+             args = libtess.TessBaseAPIInit3.call_args[0]
+             self.assertEqual(len(args), 3)
+             self.assertEqual(args[0].value, self.handle)
+-            self.assertEqual(args[1].value, None)
++            # we hardcode tesseract data, so we don't get None
++            #self.assertEqual(args[1].value, None)
+             self.assertEqual(args[2].value, lang.encode() if lang else None)
+ 
+             self.assertEqual(
+@@ -201,7 +202,8 @@ class TestLibTesseractRaw(BaseTest):
+             args = libtess.TessBaseAPIInit3.call_args[0]
+             self.assertEqual(len(args), 3)
+             self.assertEqual(args[0].value, self.handle)
+-            self.assertEqual(args[1].value, None)
++            # we hardcode tesseract data, so we don't get None
++            #self.assertEqual(args[1].value, None)
+             self.assertEqual(args[2].value, lang.encode() if lang else None)
+ 
+             self.assertEqual(
+diff --git a/tests/tests_tesseract.py b/tests/tests_tesseract.py
+index 1a55567..a24d96f 100644
+--- a/tests/tests_tesseract.py
++++ b/tests/tests_tesseract.py
+@@ -36,7 +36,7 @@ class TestTesseract(BaseTest):
+     def test_available(self, which):
+         which.return_value = True
+         self.assertTrue(tesseract.is_available())
+-        which.assert_called_once_with("tesseract")
++        which.assert_called_once_with("@tesseract@/bin/tesseract")
+ 
+     @patch("subprocess.Popen")
+     def test_version_error(self, popen):
+@@ -156,7 +156,7 @@ class TestTesseract(BaseTest):
+         for lang in ("eng", "fra", "jpn", "osd"):
+             self.assertIn(lang, langs)
+         popen.assert_called_once_with(
+-            ["tesseract", "--list-langs"],
++            ["@tesseract@/bin/tesseract", "--list-langs"],
+             startupinfo=None, creationflags=0,
+             stdout=subprocess.PIPE, stderr=subprocess.STDOUT
+         )
+@@ -171,7 +171,7 @@ class TestTesseract(BaseTest):
+         self.assertEqual(te.exception.status, 1)
+         self.assertEqual("unable to get languages", te.exception.message)
+         popen.assert_called_once_with(
+-            ["tesseract", "--list-langs"],
++            ["@tesseract@/bin/tesseract", "--list-langs"],
+             startupinfo=None, creationflags=0,
+             stdout=subprocess.PIPE, stderr=subprocess.STDOUT
+         )
+@@ -248,7 +248,7 @@ class TestTesseract(BaseTest):
+         self.assertEqual(status, 0)
+         self.assertEqual(error, message)
+         popen.assert_called_once_with(
+-            ["tesseract", "input.bmp", "output"],
++            ["@tesseract@/bin/tesseract", "input.bmp", "output"],
+             cwd=tmpdir,
+             startupinfo=None,
+             creationflags=0,
+@@ -271,7 +271,7 @@ class TestTesseract(BaseTest):
+         self.assertEqual(status, 0)
+         self.assertEqual(error, message)
+         popen.assert_called_with(
+-            ["tesseract", "input2.bmp", "output2", "-l", "fra", "--psm", "3"],
++            ["@tesseract@/bin/tesseract", "input2.bmp", "output2", "-l", "fra", "--psm", "3"],
+             cwd=tmpdir,
+             startupinfo=None,
+             creationflags=0,
+@@ -302,7 +302,7 @@ class TestTesseract(BaseTest):
+             self.assertEqual(result["angle"], 90)
+             self.assertEqual(result["confidence"], 9.30)
+             popen.assert_called_once_with(
+-                ["tesseract", "input.bmp", "stdout", "--psm", "0"],
++                ["@tesseract@/bin/tesseract", "input.bmp", "stdout", "--psm", "0"],
+                 stdin=subprocess.PIPE,
+                 shell=False,
+                 startupinfo=None,
+@@ -338,7 +338,7 @@ class TestTesseract(BaseTest):
+             self.assertEqual(result["angle"], 90)
+             self.assertEqual(result["confidence"], 9.30)
+             popen.assert_called_once_with(
+-                ["tesseract", "input.bmp", "stdout", "--psm", "0"],
++                ["@tesseract@/bin/tesseract", "input.bmp", "stdout", "--psm", "0"],
+                 stdin=subprocess.PIPE,
+                 shell=False,
+                 startupinfo=None,
+@@ -371,7 +371,7 @@ class TestTesseract(BaseTest):
+             self.assertEqual(result["angle"], 90)
+             self.assertEqual(result["confidence"], 9.30)
+             popen.assert_called_once_with(
+-                ["tesseract", "input.bmp", "stdout",
++                ["@tesseract@/bin/tesseract", "input.bmp", "stdout",
+                  "--psm", "0", "-l", "osd"],
+                 stdin=subprocess.PIPE,
+                 shell=False,
+@@ -399,7 +399,7 @@ class TestTesseract(BaseTest):
+             with self.assertRaises(tesseract.TesseractError) as te:
+                 tesseract.detect_orientation(self.image)
+             popen.assert_called_once_with(
+-                ["tesseract", "input.bmp", "stdout", "--psm", "0"],
++                ["@tesseract@/bin/tesseract", "input.bmp", "stdout", "--psm", "0"],
+                 stdin=subprocess.PIPE,
+                 shell=False,
+                 startupinfo=None,
+@@ -433,7 +433,7 @@ class TestTesseract(BaseTest):
+             with self.assertRaises(tesseract.TesseractError) as te:
+                 tesseract.detect_orientation(self.image)
+             popen.assert_called_once_with(
+-                ["tesseract", "input.bmp", "stdout", "--psm", "0"],
++                ["@tesseract@/bin/tesseract", "input.bmp", "stdout", "--psm", "0"],
+                 stdin=subprocess.PIPE,
+                 shell=False,
+                 startupinfo=None,
+@@ -467,7 +467,7 @@ class TestTesseract(BaseTest):
+             self.assertEqual(result["angle"], 90)
+             self.assertEqual(result["confidence"], 9.30)
+             popen.assert_called_once_with(
+-                ["tesseract", "input.bmp", "stdout", "-psm", "0"],
++                ["@tesseract@/bin/tesseract", "input.bmp", "stdout", "-psm", "0"],
+                 stdin=subprocess.PIPE,
+                 shell=False,
+                 startupinfo=None,
+@@ -500,7 +500,7 @@ class TestTesseract(BaseTest):
+             self.assertEqual(result["angle"], 90)
+             self.assertEqual(result["confidence"], 9.30)
+             popen.assert_called_once_with(
+-                ["tesseract", "input.bmp", "stdout", "-psm", "0", "-l", "fra"],
++                ["@tesseract@/bin/tesseract", "input.bmp", "stdout", "-psm", "0", "-l", "fra"],
+                 stdin=subprocess.PIPE,
+                 shell=False,
+                 startupinfo=None,
+@@ -527,7 +527,7 @@ class TestTesseract(BaseTest):
+             with self.assertRaises(tesseract.TesseractError) as te:
+                 tesseract.detect_orientation(self.image)
+             popen.assert_called_once_with(
+-                ["tesseract", "input.bmp", "stdout", "-psm", "0"],
++                ["@tesseract@/bin/tesseract", "input.bmp", "stdout", "-psm", "0"],
+                 stdin=subprocess.PIPE,
+                 shell=False,
+                 startupinfo=None,
+@@ -561,7 +561,7 @@ class TestTesseract(BaseTest):
+             with self.assertRaises(tesseract.TesseractError) as te:
+                 tesseract.detect_orientation(self.image)
+             popen.assert_called_once_with(
+-                ["tesseract", "input.bmp", "stdout", "-psm", "0"],
++                ["@tesseract@/bin/tesseract", "input.bmp", "stdout", "-psm", "0"],
+                 stdin=subprocess.PIPE,
+                 shell=False,
+                 startupinfo=None,

From 71335774051655fae820bc94c3e06c39dc778b99 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 9 Mar 2020 13:02:29 +0100
Subject: [PATCH 2677/4636] sage: fix test suite with docutils 0.15

The better way to fix this would be to backport the upstream sphinx
patch:

https://github.com/sphinx-doc/sphinx/commit/faedcc48ccb942b9a7b758b699b30f0d026c0771

Unfortunately it doesn't apply cleanly and isn't worth the effort
of backporting. Let's hope we can switch to python3 sage and the recent
sphinx version that comes with it before this becomes a problem.
---
 .../math/sage/patches/docutils-0.15.patch     | 24 +++++++++++++++++++
 .../science/math/sage/sage-src.nix            |  5 ++++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/science/math/sage/patches/docutils-0.15.patch

diff --git a/pkgs/applications/science/math/sage/patches/docutils-0.15.patch b/pkgs/applications/science/math/sage/patches/docutils-0.15.patch
new file mode 100644
index 000000000000..63f5d2e146dd
--- /dev/null
+++ b/pkgs/applications/science/math/sage/patches/docutils-0.15.patch
@@ -0,0 +1,24 @@
+diff --git a/src/sage/misc/sphinxify.py b/src/sage/misc/sphinxify.py
+index 4849c2bffa..76b7bc8602 100644
+--- a/src/sage/misc/sphinxify.py
++++ b/src/sage/misc/sphinxify.py
+@@ -25,6 +25,7 @@ from __future__ import absolute_import, print_function
+ import os
+ import re
+ import shutil
++import warnings
+ from tempfile import mkdtemp
+ from sphinx.application import Sphinx
+ 
+@@ -120,7 +121,10 @@ smart_quotes = no""")
+     # buildername, confoverrides, status, warning, freshenv).
+     sphinx_app = Sphinx(srcdir, confdir, outdir, doctreedir, format,
+                         confoverrides, None, None, True)
+-    sphinx_app.build(None, [rst_name])
++    with warnings.catch_warnings():
++        # Quick and dirty workaround for https://trac.sagemath.org/ticket/28856#comment:19
++        warnings.simplefilter("ignore")
++        sphinx_app.build(None, [rst_name])
+     sys.path = old_sys_path
+ 
+     # We need to remove "_" from __builtin__ that the gettext module installs
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 4530cbf69f4c..1cbea74edae9 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -52,6 +52,11 @@ stdenv.mkDerivation rec {
     # Parallelize docubuild using subprocesses, fixing an isolation issue. See
     # https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE
     ./patches/sphinx-docbuild-subprocesses.patch
+
+    # Fix doctest failures with docutils 0.15:
+    # https://nix-cache.s3.amazonaws.com/log/dzmzrb2zvardsmpy7idg7djkizmkzdhs-sage-tests-8.9.drv
+    # https://trac.sagemath.org/ticket/28856#comment:19
+    ./patches/docutils-0.15.patch
   ];
 
   # Since sage unfortunately does not release bugfix releases, packagers must

From fbd175b11f64963b737683a32eaa34e8f430c639 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Mar 2020 12:27:03 +0000
Subject: [PATCH 2678/4636] tpm2-pkcs11: 1.0.1 -> 1.1.0

---
 pkgs/misc/tpm2-pkcs11/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/tpm2-pkcs11/default.nix b/pkgs/misc/tpm2-pkcs11/default.nix
index d34619d5b52d..9e3be1101a63 100644
--- a/pkgs/misc/tpm2-pkcs11/default.nix
+++ b/pkgs/misc/tpm2-pkcs11/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tpm2-pkcs11";
-  version = "1.0.1";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "tpm2-software";
     repo = pname;
     rev = version;
-    sha256 = "sha256:06kpf730al50xv1q53ahycky3im23ysrqp40libls4k24zxs9ha2";
+    sha256 = "0gqbbxh1y2vcznxw96xn1wpcvg613zzzrbbfrqbw3p7spbn65yfq";
   };
 
   patches = lib.singleton (
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "A PKCS#11 interface for TPM2 hardware";
-    homepage = https://github.com/tpm2-software/tpm2-pkcs11;
+    homepage = "https://github.com/tpm2-software/tpm2-pkcs11";
     license = licenses.bsd2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ lschuermann ];

From 660c015aa83e19f162aec4721b25c0123f801fc9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Mar 2020 12:54:25 +0000
Subject: [PATCH 2679/4636] vaultenv: 0.13.0 -> 0.13.1

---
 pkgs/development/tools/haskell/vaultenv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix
index 419f4530dca1..1d901cb723cf 100644
--- a/pkgs/development/tools/haskell/vaultenv/default.nix
+++ b/pkgs/development/tools/haskell/vaultenv/default.nix
@@ -6,11 +6,11 @@
 }:
 mkDerivation rec {
   pname = "vaultenv";
-  version = "0.13.0";
+  version = "0.13.1";
 
   src = fetchzip {
     url = "https://github.com/channable/vaultenv/archive/v${version}.tar.gz";
-    sha256 = "0kz5p57fq855mhbqrpb737sqrax9cdcyh2g57460hc8fyvs97lq0";
+    sha256 = "0ycf5skxjns77sgbm8faq9ps9rs2hqznsbzrd51hdkpak56k42cp";
   };
 
   buildTools = [ hpack ];

From 60c646c031011c2e28ab6671f4704e469c047b45 Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Tue, 10 Mar 2020 14:35:47 +0100
Subject: [PATCH 2680/4636] nss: 3.49.2 -> 3.51

---
 pkgs/development/libraries/nss/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index fc2763486d1e..3b3f522fdb9e 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -5,7 +5,7 @@ let
     url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz;
     sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
   };
-  version = "3.49.2";
+  version = "3.51";
   underscoreVersion = builtins.replaceStrings ["."] ["_"] version;
 
 in stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
-    sha256 = "1ck0c4ikr0d747pn63h62b2iqzfgi0yzd25aw95hs9797hn519zs";
+    sha256 = "1725d0idf5zzqafdqfdn9vprc7ys2ywhv23sqn328di968xqnd3m";
   };
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];

From 57930a5f0e574f2a816fcefe1bcfa82ad5e46ec6 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Tue, 10 Mar 2020 13:15:25 +0200
Subject: [PATCH 2681/4636] electron-cash: fix build

This commit fixes #82221.
---
 pkgs/applications/misc/electron-cash/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index e6cfca5667e1..5b1cafaea32e 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec {
 
   postPatch = ''
     substituteInPlace contrib/requirements/requirements.txt \
-      --replace "qdarkstyle<2.6" "qdarkstyle<3"
+      --replace "qdarkstyle==2.6.8" "qdarkstyle<3"
 
     substituteInPlace setup.py \
       --replace "(share_dir" "(\"share\""

From 82d7ccfdedc63bfe5e454332688f211090341f99 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Tue, 3 Mar 2020 13:01:09 +0100
Subject: [PATCH 2682/4636] libfido2: change dependency from libressl to
 openssl

libressl does not enable EdDSA functionality in libfido2
see https://github.com/Yubico/libfido2/issues/144
---
 pkgs/development/libraries/libfido2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix
index 01a73f4a1308..498df6a583fc 100644
--- a/pkgs/development/libraries/libfido2/default.nix
+++ b/pkgs/development/libraries/libfido2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig, libcbor, libressl, udev, IOKit }:
+{ stdenv, fetchurl, cmake, pkgconfig, libcbor, openssl, udev, IOKit }:
 
 stdenv.mkDerivation rec {
   pname = "libfido2";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = [ libcbor libressl ]
+  buildInputs = [ libcbor openssl ]
     ++ stdenv.lib.optionals stdenv.isLinux [ udev ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://github.com/Yubico/libfido2;
     license = licenses.bsd2;
-    maintainers = with maintainers; [ dtzWill ];
+    maintainers = with maintainers; [ dtzWill prusnak ];
     platforms = platforms.unix;
   };
 }

From bb660dd01964dbf86c62c2b3969536f3f92155df Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Tue, 10 Mar 2020 15:22:37 +0100
Subject: [PATCH 2683/4636] blockbook: 0.3.1 -> 0.3.2

---
 pkgs/servers/blockbook/default.nix |  4 +-
 pkgs/servers/blockbook/deps.nix    | 75 +++++++++++++++++++++++++++---
 2 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix
index b95c3d41b396..b931e8cfcb20 100644
--- a/pkgs/servers/blockbook/default.nix
+++ b/pkgs/servers/blockbook/default.nix
@@ -14,7 +14,7 @@
 
 buildGoPackage rec {
   pname = "blockbook";
-  version = "0.3.1";
+  version = "0.3.2";
 
   goPackagePath = "blockbook";
 
@@ -22,7 +22,7 @@ buildGoPackage rec {
     owner = "trezor";
     repo = "blockbook";
     rev = "v${version}";
-    sha256 = "0qgd1f3b4vavw55mvpvwvlya39dx1c3kjsc7n46nn7kpc152jv1l";
+    sha256 = "0hcgz4b7k8ia4dnjg6bbii95sqg3clc40ybwwc4qz3jv21ikc54x";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/servers/blockbook/deps.nix b/pkgs/servers/blockbook/deps.nix
index 90ff098581a2..9f9ae0a4704d 100644
--- a/pkgs/servers/blockbook/deps.nix
+++ b/pkgs/servers/blockbook/deps.nix
@@ -9,6 +9,33 @@
       sha256 = "02davg672v9sz8l7a8s0b8m87154p42hkm5r6pavf4gqziw8bmr4";
     };
   }
+  {
+    goPackagePath  = "github.com/allegro/bigcache";
+    fetch = {
+      type = "git";
+      url = "https://github.com/allegro/bigcache";
+      rev =  "69ea0af04088faa57adb9ac683934277141e92a5";
+      sha256 = "0ac9pgzgi9lhklkqmc5f5x3d0cbyxjfpadc6mdbd7hdr7rfrjmxf";
+    };
+  }
+  {
+    goPackagePath  = "github.com/aristanetworks/goarista";
+    fetch = {
+      type = "git";
+      url = "https://github.com/aristanetworks/goarista";
+      rev =  "8e7d5b18fe7ad671e07097d5445dbc70422663b2";
+      sha256 = "1jbjviz8qi8izhvdvnbc5d9nqyxfww75ffcvxyhw5yxw9r1v0sn2";
+    };
+  }
+  {
+    goPackagePath  = "github.com/agl/ed25519";
+    fetch = {
+      type = "git";
+      url = "https://github.com/agl/ed25519";
+      rev =  "5312a61534124124185d41f09206b9fef1d88403";
+      sha256 = "1v8mhkf1m3ga5262s75vabskxvsw5rpqvi5nwhxwiv7gfk6h823i";
+    };
+  }
   {
     goPackagePath  = "github.com/beorn7/perks";
     fetch = {
@@ -45,6 +72,15 @@
       sha256 = "02dl46wcnfpg9sqvg0ipipkpnd7lrf4fnvb9zy56jqa7mfcwc7wk";
     };
   }
+  {
+    goPackagePath  = "github.com/dchest/blake256";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dchest/blake256";
+      rev =  "dee3fe6eb0e98dc774a94fc231f85baf7c29d360";
+      sha256 = "18hkfm1zlkf6fsjzljiz5cjxxcf3kl5p9617si8xjggb33adzhyg";
+    };
+  }
   {
     goPackagePath  = "github.com/deckarep/golang-set";
     fetch = {
@@ -54,13 +90,40 @@
       sha256 = "01kaqrc5ywbwa46b6lz3db7kkg8q6v383h4lnxds4z3kjglkqaff";
     };
   }
+  {
+    goPackagePath  = "github.com/decred/base58";
+    fetch = {
+      type = "git";
+      url = "https://github.com/decred/base58";
+      rev =  "dbeddd8aab76c31eb2ea98351a63fa2c6bf46888";
+      sha256 = "0fm0gsz5myin4n15gx3fhi9pk82p6v0sxza945yvny7n13q44ns5";
+    };
+  }
+  {
+    goPackagePath  = "github.com/decred/dcrd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/decred/dcrd";
+      rev =  "e3e8c47c68b010dbddeb783ebad32a3a4993dd71";
+      sha256 = "0zifsxhrjx282kvsqj80qr3v4af8hx4g6dqvrb6xggpkcaski8b4";
+    };
+  }
+  {
+    goPackagePath  = "github.com/decred/slog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/decred/slog";
+      rev =  "fbd821ef791ba2b8ae945f5d44f4e49396d230c5";
+      sha256 = "0n3c7saiv4j22kjc1pf3771n6khx4g99n8vn4qvvv0i5vv04585n";
+    };
+  }
   {
     goPackagePath  = "github.com/ethereum/go-ethereum";
     fetch = {
       type = "git";
       url = "https://github.com/ethereum/go-ethereum";
-      rev =  "8bbe72075e4e16442c4e28d999edee12e294329e";
-      sha256 = "0q0w0vz85d94wym3xni8y22vly886j6g6zn9hizcww1nanvk4nl6";
+      rev =  "24d727b6d6e2c0cde222fa12155c4a6db5caaf2e";
+      sha256 = "0vrhwfavx3gciihf406f2qfrhvhnygvlj2icbswq0d01dx3s566m";
     };
   }
   {
@@ -140,8 +203,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/martinboehm/btcutil";
-      rev =  "225ed00dbbd5cb8d8b3949a0ee7c9ea540754585";
-      sha256 = "0dn5s6h1524q38glp6fcdws97lyvmchq26dhbd3dqazrq61dhdvy";
+      rev =  "a3d2b8457b77d37c3813742d4030e199b6e09111";
+      sha256 = "0152cyabklv9l39dm1g30jb7hzdv9rj45mp3v9x4kvaza58nz0x4";
     };
   }
   {
@@ -275,8 +338,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev =  "d6449816ce06963d9d136eee5a56fca5b0616e7e";
-      sha256 = "17dkprbbk84q165275zwhcn0s6pcarigq37zlhsxj23pq2qz3aqy";
+      rev =  "a832865fa7ada6126f4c6124ac49f71be71bff2a";
+      sha256 = "0bikp74pdi9fsvfdgy0k0r8ipzz96hy28zm8qpky0vdbwqci0a8p";
     };
   }
   {

From a646f4b45436bd16aa390b22e0548efd3c7a118f Mon Sep 17 00:00:00 2001
From: Daniel Gorin <daniel.gorin@habito.com>
Date: Tue, 10 Mar 2020 14:33:25 +0000
Subject: [PATCH 2684/4636] Fix missing default-policy.json in skopeo

We started having issues with `pkgs.dockerTools.pullImage`, were it
would fail with:

```
FATA[0000] Error loading trust policy: open /etc/containers/policy.json: no such file or directory
```

It turns out that since `skopeo` was bumped to `0.1.40`, it was
accidentally no longer being built with a default policy.

This may happen again, see https://github.com/containers/skopeo/issues/787
---
 pkgs/development/tools/skopeo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index 957f691d2250..c065629018c9 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -33,8 +33,8 @@ buildGoPackage {
 
   buildFlagsArray = ''
     -ldflags=
-    -X github.com/containers/skopeo/vendor/github.com/containers/image/signature.systemDefaultPolicyPath=${defaultPolicyFile}
-    -X github.com/containers/skopeo/vendor/github.com/containers/image/internal/tmpdir.unixTempDirForBigFiles=/tmp
+    -X github.com/containers/skopeo/vendor/github.com/containers/image/v5/signature.systemDefaultPolicyPath=${defaultPolicyFile}
+    -X github.com/containers/skopeo/vendor/github.com/containers/image/v5/internal/tmpdir.unixTempDirForBigFiles=/tmp
   '';
 
   preBuild = ''

From c1d66a5588c023e85a7f2d31cf0f8d36f36ca9c9 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Tue, 10 Mar 2020 15:40:37 +0100
Subject: [PATCH 2685/4636] libfido2: use upstreamed patches

---
 .../libraries/libfido2/default.nix            | 35 ++++++++++++++++---
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix
index 498df6a583fc..d5d2b18e5ed5 100644
--- a/pkgs/development/libraries/libfido2/default.nix
+++ b/pkgs/development/libraries/libfido2/default.nix
@@ -1,4 +1,12 @@
-{ stdenv, fetchurl, cmake, pkgconfig, libcbor, openssl, udev, IOKit }:
+{ stdenv
+, fetchurl
+, fetchpatch
+, cmake
+, pkgconfig
+, libcbor
+, openssl
+, udev
+, IOKit }:
 
 stdenv.mkDerivation rec {
   pname = "libfido2";
@@ -9,14 +17,33 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
+
   buildInputs = [ libcbor openssl ]
     ++ stdenv.lib.optionals stdenv.isLinux [ udev ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
 
-  patches = [ ./detect_apple_ld.patch ];
+  patches = [
+    # fix build on darwin
+    (fetchpatch {
+      url = "https://github.com/Yubico/libfido2/commit/916ebd18a89e4028de203d603726805339be7a5b.patch";
+      sha256 = "07f0xpxnq02cccmqcric87b6pms7k7ssvdw722zr970a6qs8p6i7";
+    })
+    # allow attestation using any supported algorithm
+    (fetchpatch {
+      url = "https://github.com/Yubico/libfido2/commit/f7a9471fa0588cb91cbefffb13c1e4d06c2179b7.patch";
+      sha256 = "02qbw9bqy3sixvwig6az7v3vimgznxnfikn9p1jczm3d7mn8asw2";
+    })
+    # fix EdDSA attestation signature verification bug
+    (fetchpatch {
+      url = "https://github.com/Yubico/libfido2/commit/95126eea52294419515e6540dfd7220f35664c48.patch";
+      sha256 = "076mwpl9xndjhy359jdv2drrwyq7wd3pampkn28mn1rlwxfgf0d0";
+    })
+  ];
 
-  cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d"
-                 "-DCMAKE_INSTALL_LIBDIR=lib" ];
+  cmakeFlags = [
+    "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+  ];
 
   meta = with stdenv.lib; {
     description = ''

From e929b8af46937627756c0a3a44fa0dbd6b7450c2 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 10 Mar 2020 15:33:00 +0100
Subject: [PATCH 2686/4636] wlroots: 0.10.0 -> 0.10.1

I also added some minor improvements and removed unnecessary code.
---
 .../development/libraries/wlroots/default.nix | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index 9f9c4acb0d85..104e0c3440aa 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -1,36 +1,31 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, fetchpatch
-, wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman
+{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland
+, libGL, wayland-protocols, libinput, libxkbcommon, pixman
 , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
 , libpng, ffmpeg_4
 }:
 
 stdenv.mkDerivation rec {
   pname = "wlroots";
-  version = "0.10.0";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "wlroots";
     rev = version;
-    sha256 = "0c0q1p9yss5kx4430ik3n89drqpmm2bvgl8fjlf6prac1a7xzqn8";
+    sha256 = "0j2lh9vc92zhn44rjbia5aw3y1rpgfng1x1h17lcvj5m4i6vj0pc";
   };
 
   # $out for the library and $examples for the example programs (in examples):
   outputs = [ "out" "examples" ];
 
-  nativeBuildInputs = [ meson ninja pkgconfig ];
+  nativeBuildInputs = [ meson ninja pkg-config wayland ];
 
   buildInputs = [
-    wayland libGL wayland-protocols libinput libxkbcommon pixman
+    libGL wayland-protocols libinput libxkbcommon pixman
     xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa
     libpng ffmpeg_4
   ];
 
-  mesonFlags = [
-    "-Dlibcap=enabled" "-Dlogind=enabled" "-Dxwayland=enabled" "-Dx11-backend=enabled"
-    "-Dxcb-icccm=enabled" "-Dxcb-errors=enabled"
-  ];
-
   postInstall = ''
     # Copy the library to $examples
     mkdir -p $examples/lib
@@ -51,7 +46,12 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A modular Wayland compositor library";
+    longDescription = ''
+      Pluggable, composable, unopinionated modules for building a Wayland
+      compositor; or about 50,000 lines of code you were going to write anyway.
+    '';
     inherit (src.meta) homepage;
+    changelog = "https://github.com/swaywm/wlroots/releases/tag/${version}";
     license     = licenses.mit;
     platforms   = platforms.linux;
     maintainers = with maintainers; [ primeos ];

From 0e474f2d2604d83258d8fffef45e473814556366 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Thu, 27 Feb 2020 17:59:01 +0100
Subject: [PATCH 2687/4636] freeradius: add patch for HTTP/2 support in
 rlm_rest module

Co-Authored-By: Franz Pletz <franz.pletz@mayflower.de>
Co-Authored-By: Simon Waibl <simon.waibl@mayflower.de>
---
 pkgs/servers/freeradius/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix
index cbd710853402..7cd80221b4e7 100644
--- a/pkgs/servers/freeradius/default.nix
+++ b/pkgs/servers/freeradius/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, talloc, finger_bsd, perl
+{ stdenv, fetchurl, fetchpatch, autoreconfHook, talloc, finger_bsd, perl
 , openssl
 , linkOpenssl? true
 , openldap
@@ -71,6 +71,12 @@ stdenv.mkDerivation rec {
     "--localstatedir=/var"
   ] ++ optional (!linkOpenssl) "--with-openssl=no";
 
+  patches = stdenv.lib.optional withRest (fetchpatch {
+    # Fix HTTP/2 in rest
+    url = "https://github.com/FreeRADIUS/freeradius-server/commit/6286520698a3cc4053b4d49eb0a61d9ba77632aa.patch";
+    sha256 = "1ycvr3ql1mfkvzydnn4aiygnidicv2hgllppv37nb1p2pk02159g";
+  });
+
   postPatch = ''
     substituteInPlace src/main/checkrad.in --replace "/usr/bin/finger" "${finger_bsd}/bin/finger"
   '';

From 3f11ceb4177e4f3abec066dee47fbd331698830c Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Thu, 27 Feb 2020 18:07:55 +0100
Subject: [PATCH 2688/4636] freeradius: add some maintainers

---
 pkgs/servers/freeradius/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix
index 7cd80221b4e7..f5c5d26ad470 100644
--- a/pkgs/servers/freeradius/default.nix
+++ b/pkgs/servers/freeradius/default.nix
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
     homepage = https://freeradius.org/;
     description = "A modular, high performance free RADIUS suite";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ sheenobu willibutz ];
+    maintainers = with maintainers; [ sheenobu willibutz fpletz lheckemann elseym ];
     platforms = with platforms; linux;
   };
 

From cc9a4c8a06bba3c49323a9eb5df18fca4641acfc Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Fri, 28 Feb 2020 10:50:43 +0100
Subject: [PATCH 2689/4636] freeradius: do not generate TLS stuff

---
 pkgs/servers/freeradius/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix
index f5c5d26ad470..c7d6c509f098 100644
--- a/pkgs/servers/freeradius/default.nix
+++ b/pkgs/servers/freeradius/default.nix
@@ -81,9 +81,19 @@ stdenv.mkDerivation rec {
     substituteInPlace src/main/checkrad.in --replace "/usr/bin/finger" "${finger_bsd}/bin/finger"
   '';
 
+  # By default, freeradius will generate Diffie-Hellman parameters and
+  # self-signed TLS certificates during installation. We don't want
+  # this, for several reasons:
+  # - reproducibility (random generation)
+  # - we don't want _anybody_ to use a cert where the private key is on our public binary cache!
+  # - we don't want the certs to change each time the package is rebuilt
+  # So let's avoid anything getting into our output.
+  makeFlags = [ "LOCAL_CERT_FILES=" ];
+
   installFlags = [
     "sysconfdir=\${out}/etc"
     "localstatedir=\${TMPDIR}"
+    "INSTALL_CERT_FILES=" # see comment at makeFlags
   ];
 
   outputs = [ "out" "dev" "man" "doc" ];

From 0587329191ace2463c2880006baebbb3889d07bc Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Mon, 2 Mar 2020 15:39:14 +0100
Subject: [PATCH 2690/4636] freeradius: make debug logging optional

---
 nixos/modules/services/networking/freeradius.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/freeradius.nix b/nixos/modules/services/networking/freeradius.nix
index e192b70c129c..3a94c6807107 100644
--- a/nixos/modules/services/networking/freeradius.nix
+++ b/nixos/modules/services/networking/freeradius.nix
@@ -17,7 +17,8 @@ let
     '';
 
     serviceConfig = {
-        ExecStart = "${pkgs.freeradius}/bin/radiusd -f -d ${cfg.configDir} -l stdout -xx";
+        ExecStart = "${pkgs.freeradius}/bin/radiusd -f -d ${cfg.configDir} -l stdout" +
+                    optionalString cfg.debug " -xx";
         ExecReload = [
           "${pkgs.freeradius}/bin/radiusd -C -d ${cfg.configDir} -l stdout"
           "${pkgs.coreutils}/bin/kill -HUP $MAINPID"
@@ -41,6 +42,16 @@ let
       '';
     };
 
+    debug = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to enable debug logging for freeradius (-xx
+        option). This should not be left on, since it includes
+        sensitive data such as passwords in the logs.
+      '';
+    };
+
   };
 
 in
@@ -66,6 +77,7 @@ in
     };
 
     systemd.services.freeradius = freeradiusService cfg;
+    warnings = optional cfg.debug "Freeradius debug logging is enabled. This will log passwords in plaintext to the journal!";
 
   };
 

From 065716ab9517747ec760bd0193553ab8453cc53b Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Thu, 27 Feb 2020 18:25:43 +0100
Subject: [PATCH 2691/4636] nixos/freeradius: depend on network.target, not
 online

---
 nixos/modules/services/networking/freeradius.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/freeradius.nix b/nixos/modules/services/networking/freeradius.nix
index 3a94c6807107..f3fdd576b65c 100644
--- a/nixos/modules/services/networking/freeradius.nix
+++ b/nixos/modules/services/networking/freeradius.nix
@@ -10,8 +10,8 @@ let
   {
     description = "FreeRadius server";
     wantedBy = ["multi-user.target"];
-    after = ["network-online.target"];
-    wants = ["network-online.target"];
+    after = ["network.target"];
+    wants = ["network.target"];
     preStart = ''
       ${pkgs.freeradius}/bin/radiusd -C -d ${cfg.configDir} -l stdout
     '';

From 575354babf195cbf55af27dd5e61b8481dfd0558 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Tue, 10 Mar 2020 02:38:28 +0100
Subject: [PATCH 2692/4636] lib/generators: Add toINI option for duplicate keys

---
 lib/generators.nix | 18 ++++++++++++------
 lib/tests/misc.nix | 12 ++++++++++++
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/lib/generators.nix b/lib/generators.nix
index a64e94bd5cbd..240a19789b54 100644
--- a/lib/generators.nix
+++ b/lib/generators.nix
@@ -76,10 +76,14 @@ rec {
    * mkKeyValue is the same as in toINI.
    */
   toKeyValue = {
-    mkKeyValue ? mkKeyValueDefault {} "="
-  }: attrs:
-    let mkLine = k: v: mkKeyValue k v + "\n";
-    in libStr.concatStrings (libAttr.mapAttrsToList mkLine attrs);
+    mkKeyValue ? mkKeyValueDefault {} "=",
+    listsAsDuplicateKeys ? false
+  }:
+  let mkLine = k: v: mkKeyValue k v + "\n";
+      mkLines = if listsAsDuplicateKeys
+        then k: v: map (mkLine k) (if lib.isList v then v else [v])
+        else k: v: [ (mkLine k v) ];
+  in attrs: libStr.concatStrings (lib.concatLists (libAttr.mapAttrsToList mkLines attrs));
 
 
   /* Generate an INI-style config file from an
@@ -106,7 +110,9 @@ rec {
     # apply transformations (e.g. escapes) to section names
     mkSectionName ? (name: libStr.escape [ "[" "]" ] name),
     # format a setting line from key and value
-    mkKeyValue    ? mkKeyValueDefault {} "="
+    mkKeyValue    ? mkKeyValueDefault {} "=",
+    # allow lists as values for duplicate keys
+    listsAsDuplicateKeys ? false
   }: attrsOfAttrs:
     let
         # map function to string for each key val
@@ -115,7 +121,7 @@ rec {
             (libAttr.mapAttrsToList mapFn attrs);
         mkSection = sectName: sectValues: ''
           [${mkSectionName sectName}]
-        '' + toKeyValue { inherit mkKeyValue; } sectValues;
+        '' + toKeyValue { inherit mkKeyValue listsAsDuplicateKeys; } sectValues;
     in
       # map input to ini sections
       mapAttrsToStringsSep "\n" mkSection attrsOfAttrs;
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 01ff5ecf1485..739c5d5fe15d 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -348,6 +348,18 @@ runTests {
     '';
   };
 
+  testToINIDuplicateKeys = {
+    expr = generators.toINI { listsAsDuplicateKeys = true; } { foo.bar = true; baz.qux = [ 1 false ]; };
+    expected = ''
+      [baz]
+      qux=1
+      qux=false
+
+      [foo]
+      bar=true
+    '';
+  };
+
   testToINIDefaultEscapes = {
     expr = generators.toINI {} {
       "no [ and ] allowed unescaped" = {

From 8bbae030b358c8258b78d1ccc07b7f3ab9a4849e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Mar 2020 08:03:10 -0700
Subject: [PATCH 2693/4636] xob: 0.1.1 -> 0.2 (#82246)

---
 pkgs/tools/X11/xob/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/xob/default.nix b/pkgs/tools/X11/xob/default.nix
index 164802470e56..cf74fa3d867b 100644
--- a/pkgs/tools/X11/xob/default.nix
+++ b/pkgs/tools/X11/xob/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xob";
-  version = "0.1.1";
+  version = "0.2";
 
   src = fetchFromGitHub {
     owner = "florentc";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0i163avpij8iy04a0wsds237sjqi5dfvi6ny2z8zicnl4crp34xg";
+    sha256 = "0jbj61adwrpscfaadjman4hbyxhxv3ac8b4d88d623samx6kbvkk";
   };
 
   nativeBuildInputs = [ pkg-config ];

From a65d0d5bf28148ae0e856ab1970105451c41ef48 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 10 Mar 2020 15:58:20 +0100
Subject: [PATCH 2694/4636] androidStudioPackages.{dev,canary}: 4.1.0.1 ->
 4.1.0.2

---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 5736ec1dccc7..bc9944932920 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -18,9 +18,9 @@ let
     sha256Hash = "0ibp54wcss4ihm454hbavv1bhar6cd4alp5b0z248ryjr5w9mixf";
   };
   latestVersion = { # canary & dev
-    version = "4.1.0.1"; # "Android Studio 4.1 Canary 1"
-    build = "193.6224510";
-    sha256Hash = "0misff7xx8jcg4zr5ahc8qdwvlkx605il0shzd9i1cm9v1br3sqx";
+    version = "4.1.0.2"; # "Android Studio 4.1 Canary 2"
+    build = "193.6264773";
+    sha256Hash = "0m09q4jp653i9jlqsjplx3d64xkdm27c35781yz6h5rw0a1sq6kz";
   };
 in {
   # Attributes are named by their corresponding release channels

From c7fb3750cc5d9e15eaa8392b94b68df837746226 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 10 Mar 2020 16:07:42 +0100
Subject: [PATCH 2695/4636] tev: 1.14 -> 1.15

---
 pkgs/applications/graphics/tev/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/tev/default.nix b/pkgs/applications/graphics/tev/default.nix
index b884532279e5..f6ad16d7f90b 100644
--- a/pkgs/applications/graphics/tev/default.nix
+++ b/pkgs/applications/graphics/tev/default.nix
@@ -5,14 +5,14 @@
 
 stdenv.mkDerivation rec {
   pname = "tev";
-  version = "1.14";
+  version = "1.15";
 
   src = fetchFromGitHub {
     owner = "Tom94";
     repo = pname;
     rev = "v${version}";
     fetchSubmodules = true;
-    sha256 = "1g86wl0sdn0wprfxff2q1yc1hiq9fndmzhyvj09cw51lzbab5faw";
+    sha256 = "173nxvj30xmbdj8fc3rbw0mlicxy6zbhxv01i7z5nmcdvpamkdx6";
   };
 
   nativeBuildInputs = [ cmake wrapGAppsHook ];
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
       types of images can also be loaded.
     '';
     inherit (src.meta) homepage;
+    changelog = "https://github.com/Tom94/tev/releases/tag/v${version}";
     license = licenses.bsd3;
     platforms = platforms.unix;
     maintainers = with maintainers; [ primeos ];

From d6c5ce7cf8f95d6c3c27210b132cecf9957d1e7e Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Tue, 10 Mar 2020 08:33:06 -0700
Subject: [PATCH 2696/4636] hugo: 0.66.0 -> 0.67.0

---
 pkgs/applications/misc/hugo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 5af7650982ab..ab240aee12e1 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "hugo";
-  version = "0.66.0";
+  version = "0.67.0";
 
   goPackagePath = "github.com/gohugoio/hugo";
 
@@ -10,7 +10,7 @@ buildGoModule rec {
     owner = "gohugoio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "177vqxzmldpkpaj7giqlbl39091fa2ga2pnshdj6gc393rw52f0a";
+    sha256 = "0rgwrcs1ydwccyf714zpn3427p8zlwynn0q1v8k5j63zxr91jdbq";
   };
 
   modSha256 = "1f320zbqnv2ybsp3qmlgn3rsjgp2zdb24qjd3gcys30mw48cx3na";

From 8565dcf7bc7f6525063c24adb21ccbd663448a61 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Tue, 10 Mar 2020 16:34:48 +0100
Subject: [PATCH 2697/4636] megasync: 4.2.5.0 -> 4.3.0.8

---
 pkgs/applications/misc/megasync/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix
index 27e1b9d1f462..3a26def26c91 100644
--- a/pkgs/applications/misc/megasync/default.nix
+++ b/pkgs/applications/misc/megasync/default.nix
@@ -5,13 +5,13 @@
 
 mkDerivation rec {
   pname = "megasync";
-  version = "4.2.5.0";
+  version = "4.3.0.8";
 
   src = fetchFromGitHub {
     owner = "meganz";
     repo = "MEGAsync";
     rev = "v${version}_Linux";
-    sha256 = "1zw7x8gpvzhnzyirs5ishjl5idzyyin4wdxa67d6gzfgvqi33n7w";
+    sha256 = "1rhxkc6j3039rcsi8cxy3n00g6w7acir82ymnksbpsnp4yxqv5r3";
     fetchSubmodules = true;
   };
 
@@ -40,13 +40,6 @@ mkDerivation rec {
     ./noinstall-distro-version.patch
     # megasync target is not part of the install rule thanks to a commented block
     ./install-megasync.patch
-
-    # Fix build errror also described upstream:
-    # https://github.com/meganz/MEGAsync/pull/313
-    (fetchpatch {
-      url = "https://github.com/meganz/MEGAsync/pull/313.patch";
-      sha256 = "1ld00cnh9afxibvkzkqi8gz59xlzidw2dy4yqngwwdqy76sfsn3w";
-    })
   ];
 
   postPatch = ''

From 7698d7330365e2cce0af02b4b70b74b141edd74d Mon Sep 17 00:00:00 2001
From: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Date: Tue, 10 Mar 2020 09:11:49 -0700
Subject: [PATCH 2698/4636] ppx_deriving_yojson: 3.5.1 -> 3.5.2 (#82085)

---
 .../development/ocaml-modules/ppx_deriving_yojson/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
index d8a8f22ae704..5faaca810394 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
@@ -4,7 +4,7 @@
 
 buildDunePackage rec {
   pname = "ppx_deriving_yojson";
-  version = "3.5.1";
+  version = "3.5.2";
 
   minimumOCamlVersion = "4.04";
 
@@ -12,7 +12,7 @@ buildDunePackage rec {
     owner = "ocaml-ppx";
     repo = "ppx_deriving_yojson";
     rev = "v${version}";
-    sha256 = "13nscby635vab9jf5pl1wgmdmqw192nf2r26m3gr01hp3bpn38zh";
+    sha256 = "1vbhmnhnj1aa4jrp8xqi52nggwj7vrml83z2j0r0qzvl65v02mc0";
   };
 
   buildInputs = [ ppxfind ounit ];

From 1cc9b2501df23ac663fa61acce79606a12dc9540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Tue, 10 Mar 2020 17:16:17 +0100
Subject: [PATCH 2699/4636] suitesparse: Enable parallel building

---
 .../development/libraries/science/math/suitesparse/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index a6c803be260a..f72574cff583 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
 
     # Build individual shared libraries
     make library        \
+        JOBS=$NIX_BUILD_CORES \
         BLAS=-lopenblas \
         LAPACK=""       \
         ${stdenv.lib.optionalString openblas.blas64 "CFLAGS=-DBLAS64"}
@@ -64,7 +65,7 @@ stdenv.mkDerivation rec {
     # Bundling is done by building the static libraries, extracting objects from
     # them and combining the objects into one shared library.
     mkdir -p static
-    make static AR_TARGET=$(pwd)/static/'$(LIBRARY).a'
+    make static JOBS=$NIX_BUILD_CORES AR_TARGET=$(pwd)/static/'$(LIBRARY).a'
     (
         cd static
         for i in lib*.a; do

From cf2bba74ee3a356f9fdc1da9f88b567a6c58f540 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Mar 2020 11:13:39 +0000
Subject: [PATCH 2700/4636] rabbitmq-server: 3.8.2 -> 3.8.3

---
 pkgs/servers/amqp/rabbitmq-server/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 8fd207e9175c..bae6c4ff98f3 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -7,12 +7,12 @@
 stdenv.mkDerivation rec {
   pname = "rabbitmq-server";
 
-  version = "3.8.2";
+  version = "3.8.3";
 
   # when updating, consider bumping elixir version in all-packages.nix
   src = fetchurl {
     url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
-    sha256 = "17gixahxass9n4d697my8sq4an51rw3cicb36fqvl8fbhnwjjrwc";
+    sha256 = "1fhs3g2pgrq2xi4hnlc437hkv3261l4i134m6mxid00sf1c89p5f";
   };
 
   buildInputs =
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = https://www.rabbitmq.com/;
+    homepage = "https://www.rabbitmq.com/";
     description = "An implementation of the AMQP messaging protocol";
     license = stdenv.lib.licenses.mpl11;
     platforms = stdenv.lib.platforms.unix;

From 967a5b30476ca02db43f8406019c6d0d575ad258 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 10 Mar 2020 14:01:02 +0100
Subject: [PATCH 2701/4636] rabbitmq-server: add the VM test to passthru.tests

---
 pkgs/servers/amqp/rabbitmq-server/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index bae6c4ff98f3..e7f0eb73c86d 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -2,6 +2,7 @@
 , docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync, getconf, socat
 , procps, coreutils, gnused, systemd, glibcLocales
 , AppKit, Carbon, Cocoa
+, nixosTests
 }:
 
 stdenv.mkDerivation rec {
@@ -65,4 +66,8 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ Profpatsch ];
   };
+
+  passthru.tests = {
+    vm-test = nixosTests.rabbitmq;
+  };
 }

From 920639ede339d694899c2c0af32ad2d06beab610 Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Tue, 10 Mar 2020 10:35:24 -0600
Subject: [PATCH 2702/4636] pfetch : 0.4.0 -> 0.5.0

---
 pkgs/tools/misc/pfetch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/pfetch/default.nix b/pkgs/tools/misc/pfetch/default.nix
index a858ad696af8..49867331780f 100644
--- a/pkgs/tools/misc/pfetch/default.nix
+++ b/pkgs/tools/misc/pfetch/default.nix
@@ -2,13 +2,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "pfetch";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "dylanaraps";
     repo = "pfetch";
     rev = version;
-    sha256 = "180vvbmvak888vs4dgzlmqk0ss4qfsz09700n4p8s68j7krkxsfq";
+    sha256 = "0yg9nlrjnm2404ysm2qp1klpq1wlmyih302kzfqchn6l2sibsm4j";
   };
 
   dontBuild = true;

From 659e89e21beea872a7c1f012ea7cdfe1053c7c23 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 10 Mar 2020 13:19:29 +0100
Subject: [PATCH 2703/4636] =?UTF-8?q?coqPackages.dpdgraph:=20enable=20for?=
 =?UTF-8?q?=20Coq=20=E2=89=A5=208.9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../development/coq-modules/dpdgraph/default.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix
index 49288d3cb327..300c5a9f4482 100644
--- a/pkgs/development/coq-modules/dpdgraph/default.nix
+++ b/pkgs/development/coq-modules/dpdgraph/default.nix
@@ -1,6 +1,18 @@
 { stdenv, fetchFromGitHub, autoreconfHook, coq }:
 
 let params = {
+  "8.11" = {
+    version = "0.6.7";
+    sha256 = "01vpi7scvkl4ls1z2k2x9zd65wflzb667idj759859hlz3ps9z09";
+  };
+  "8.10" = {
+    version = "0.6.6";
+    sha256 = "1gjrm5zjzw4cisiwdr5b3iqa7s4cssa220xr0k96rwgk61rcjd8w";
+  };
+  "8.9" = {
+    version = "0.6.5";
+    sha256 = "1f34z24yg05b1096gqv36jr3vffkcjkf9qncii3pzhhvagxd0w2f";
+  };
   "8.8" = {
     version = "0.6.3";
     rev = "0acbd0a594c7e927574d5f212cc73a486b5305d2";
@@ -18,7 +30,6 @@ let params = {
   };
   "8.5" = {
     version = "0.6";
-    rev = "v0.6";
     sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n";
   };
 };
@@ -30,7 +41,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "Karmaki";
     repo = "coq-dpdgraph";
-    inherit (param) rev sha256;
+    rev = param.rev or "v${param.version}";
+    inherit (param) sha256;
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From f9c45701836e8b70b7ef9d83b5686905e8440585 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 03:35:44 +0000
Subject: [PATCH 2704/4636] python37Packages.azure-mgmt-appconfiguration: 0.3.0
 -> 0.4.0

---
 .../python-modules/azure-mgmt-appconfiguration/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix
index 1cacd9881572..75c912dfe40c 100644
--- a/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix
@@ -5,13 +5,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.3.0";
+  version = "0.4.0";
   pname = "azure-mgmt-appconfiguration";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1igl3ikdwcz7d2zcja5nm2qjysjh53vgwzcc96lylypmq6z4aq1s";
+    sha256 = "1dn5585nsizszjivx6lp677ka0mrg0ayqgag4yzfdz9ml8mj1xl5";
     extension = "zip";
   };
 

From 970ce2863fd6366e2fba25bb80d149191074cc2f Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Tue, 10 Mar 2020 15:58:43 +0100
Subject: [PATCH 2705/4636] collectd: 5.8.1 -> 5.10.0

---
 pkgs/tools/system/collectd/default.nix | 13 +++----------
 pkgs/tools/system/collectd/plugins.nix |  5 ++++-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index 517d0afb95f2..9118fc55ea96 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -8,21 +8,14 @@ let
   plugins = callPackage ./plugins.nix args;
 in
 stdenv.mkDerivation rec {
-  version = "5.8.1";
+  version = "5.10.0";
   pname = "collectd";
 
   src = fetchurl {
     url = "https://collectd.org/files/${pname}-${version}.tar.bz2";
-    sha256 = "1njk8hh56gb755xafsh7ahmqr9k2d4lam4ddj7s7fqz0gjigv5p7";
+    sha256 = "0nrpq09q6vbbv0hjc1vfa36z8j5802500hy75m678gh2cgsmjcx0";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/rpv-tomsk/collectd/commit/d5a3c020d33cc33ee8049f54c7b4dffcd123bf83.patch";
-      sha256 = "1n65zw4d2k2bxapayaaw51ym7hy72a0cwi2abd8jgxcw3d0m5g15";
-    })
-  ];
-
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [
     libtool
@@ -50,7 +43,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Daemon which collects system performance statistics periodically";
-    homepage = https://collectd.org;
+    homepage = "https://collectd.org";
     license = licenses.gpl2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ bjornfor fpletz ];
diff --git a/pkgs/tools/system/collectd/plugins.nix b/pkgs/tools/system/collectd/plugins.nix
index f1a87847a5ce..defeed4c8928 100644
--- a/pkgs/tools/system/collectd/plugins.nix
+++ b/pkgs/tools/system/collectd/plugins.nix
@@ -25,6 +25,7 @@
 , mongoc
 , mosquitto
 , net-snmp
+, perl
 , postgresql
 , protobufc
 , python
@@ -205,7 +206,9 @@ let
     ovs_stats = {
       buildInputs = [ yajl ];
     };
-    perl = {};
+    perl = {
+      buildInputs = [ perl ];
+    };
     pf = {};
     pinba = {
       buildInputs = [ protobufc ];

From 0c875c28c693c52e9da33ab89b0a1554148ef517 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 10 Mar 2020 12:59:48 +0100
Subject: [PATCH 2706/4636] symmetrica: 2.0 -> 3.0.1

This switches to the sagemath fork, since the original upstream is no
longer maintained and sagemath has effectively maintained symmetrica
through patches for a while now. The update fixes one bug in particular
that has caused failures in the sagemath test suite:

https://github.com/NixOS/nixpkgs/issues/81449
https://trac.sagemath.org/ticket/15312
https://trac.sagemath.org/ticket/29061

Regarding the licensing change:

https://gitlab.com/sagemath/symmetrica/-/commit/7cf91b380078a4def28dd6bab2b4607e2346c650
---
 .../science/math/symmetrica/default.nix       | 68 ++++++-------------
 1 file changed, 21 insertions(+), 47 deletions(-)

diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/applications/science/math/symmetrica/default.nix
index 18daabb9e7e2..b4a77d752038 100644
--- a/pkgs/applications/science/math/symmetrica/default.nix
+++ b/pkgs/applications/science/math/symmetrica/default.nix
@@ -1,62 +1,36 @@
 { stdenv
-, fetchurl
+, lib
+, fetchFromGitLab
 , fetchpatch
+, autoreconfHook
 }:
 stdenv.mkDerivation rec {
   pname = "symmetrica";
-  version = "2.0";
+  version = "3.0.1";
 
-  src = fetchurl {
-    url = "http://www.algorithm.uni-bayreuth.de/en/research/SYMMETRICA/SYM2_0_tar.gz";
-    sha256 = "1qhfrbd5ybb0sinl9pad64rscr08qvlfzrzmi4p4hk61xn6phlmz";
-    name = "symmetrica-2.0.tar.gz";
+  # Fork of the original symmetrica, which can be found here
+  # http://www.algorithm.uni-bayreuth.de/en/research/SYMMETRICA/index.html
+  # "This fork was created to modernize the codebase, and to resume making
+  # releases with the fixes that have accrued over the years."
+  # Also see https://trac.sagemath.org/ticket/29061#comment:3.
+  src = fetchFromGitLab {
+    owner = "sagemath";
+    repo = "symmetrica";
+    rev = version;
+    sha256 = "0wfmrzw82f5i91d7rf24mcdqcj2fmgrgy02pw4pliz7ncwaq14w3";
   };
 
-  sourceRoot = ".";
-
-  patches = [
-      # don't show banner ("SYMMETRICA VERSION X - STARTING)
-      # it doesn't contain very much helpful information and a banner is not ideal for a library
-      (fetchpatch {
-        url = "https://git.sagemath.org/sage.git/plain/build/pkgs/symmetrica/patches/de.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
-        sha256 = "0df0vqixcfpzny6dkhyj87h8aznz3xn3zfwwlj8pd10bpb90k6gb";
-      })
-
-      # use int32_t and uint32_t for type INT
-      # see https://trac.sagemath.org/ticket/13413
-      (fetchpatch {
-        name = "fix_64bit_integer_overflow.patch";
-        url = "https://git.sagemath.org/sage.git/plain/build/pkgs/symmetrica/patches/int32.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
-        sha256 = "0p33c85ck4kd453z687ni4bdcqr1pqx2756j7aq11bf63vjz4cyz";
-      })
-
-      (fetchpatch {
-        url = "https://git.sagemath.org/sage.git/plain/build/pkgs/symmetrica/patches/return_values.patch?id=1615f58890e8f9881c4228c78a6b39b9aab1303a";
-        sha256 = "0dmczkicwl50sivc07w3wm3jpfk78wm576dr25999jdj2ipsb7nk";
-      })
+  nativeBuildInputs = [
+    autoreconfHook
   ];
 
-  postPatch = ''
-    substituteInPlace makefile --replace gcc cc
-  '';
-
   enableParallelBuilding = true;
 
-  installPhase = ''
-    mkdir -p "$out"/{lib,share/doc/symmetrica,include/symmetrica}
-    ar crs libsymmetrica.a *.o
-    ranlib libsymmetrica.a
-    cp libsymmetrica.a "$out/lib"
-    cp *.h "$out/include/symmetrica"
-    cp README *.doc "$out/share/doc/symmetrica"
-  '';
-
-  meta = {
-    inherit version;
+  meta = with lib; {
     description = ''A collection of routines for representation theory and combinatorics'';
-    license = stdenv.lib.licenses.publicDomain;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
-    homepage = http://www.algorithm.uni-bayreuth.de/en/research/SYMMETRICA/index.html;
+    license = licenses.isc;
+    maintainers = with maintainers; [raskin];
+    platforms = platforms.unix;
+    homepage = "https://gitlab.com/sagemath/symmetrica";
   };
 }

From 1a6b1fb32ac8767f2f6684de095ee5ba6ff052fa Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 10 Mar 2020 13:13:19 +0100
Subject: [PATCH 2707/4636] symmetrica: add timokau to maintainers

---
 pkgs/applications/science/math/symmetrica/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/applications/science/math/symmetrica/default.nix
index b4a77d752038..b363137fb99c 100644
--- a/pkgs/applications/science/math/symmetrica/default.nix
+++ b/pkgs/applications/science/math/symmetrica/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = ''A collection of routines for representation theory and combinatorics'';
     license = licenses.isc;
-    maintainers = with maintainers; [raskin];
+    maintainers = with maintainers; [raskin timokau];
     platforms = platforms.unix;
     homepage = "https://gitlab.com/sagemath/symmetrica";
   };

From 8c9f06fc1411a90076c7d8edfcbcdb800fc976ad Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Mon, 9 Mar 2020 16:31:15 +0200
Subject: [PATCH 2708/4636] pythonPackages.eth-typing: 2.1.0 -> 2.2.1

---
 pkgs/development/python-modules/eth-typing/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix
index 0fcf7731ee02..437d2d9ce167 100644
--- a/pkgs/development/python-modules/eth-typing/default.nix
+++ b/pkgs/development/python-modules/eth-typing/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "eth-typing";
-  version = "2.1.0";
+  version = "2.2.1";
 
   # Tests are missing from the PyPI source tarball so let's use GitHub
   # https://github.com/ethereum/eth-typing/issues/8
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     owner = "ethereum";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0chrrfw3kdaihgr2ryhljf56bflipzmfxai688xrc2yk7yiqnll5";
+    sha256 = "0k9jydsclk81qpkvl7hpchwclm3c89gyzlk17480wcw90nkps9ap";
   };
 
   # setuptools-markdown uses pypandoc which is broken at the moment

From 5b676cf48e560134ed86328662743eaad09a4c72 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Mon, 9 Mar 2020 16:31:43 +0200
Subject: [PATCH 2709/4636] pythonPackages.eth-utils: 1.7.0 -> 1.8.4

---
 pkgs/development/python-modules/eth-utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix
index 116fa0273e52..1c373c64e895 100644
--- a/pkgs/development/python-modules/eth-utils/default.nix
+++ b/pkgs/development/python-modules/eth-utils/default.nix
@@ -3,7 +3,7 @@
 
 buildPythonPackage rec {
   pname = "eth-utils";
-  version = "1.7.0";
+  version = "1.8.4";
 
   # Tests are missing from the PyPI source tarball so let's use GitHub
   # https://github.com/ethereum/eth-utils/issues/130
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     owner = "ethereum";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0hhhdz764xgwj5zg3pjzpx10vh54q7kbvlnj9d67qkgwl3fkfgw2";
+    sha256 = "1hfzb3xz3j50dgp51nx2jssh9j07np24fqmpnyr2ycsll90g1j6q";
   };
 
   checkInputs = [ pytest hypothesis ];

From e1f484fe0e09666918ae31dd69388116a31e1f29 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Wed, 27 Nov 2019 18:35:16 +0200
Subject: [PATCH 2710/4636] pythonPackages.ipympl: init at 0.3.3

---
 .../python-modules/ipympl/default.nix         | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/python-modules/ipympl/default.nix

diff --git a/pkgs/development/python-modules/ipympl/default.nix b/pkgs/development/python-modules/ipympl/default.nix
new file mode 100644
index 000000000000..ef023727d70e
--- /dev/null
+++ b/pkgs/development/python-modules/ipympl/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi, ipywidgets, matplotlib }:
+
+buildPythonPackage rec {
+  pname = "ipympl";
+  version = "0.3.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0m5sh2ha9hlgigc5xxsy7nd0gdadx797h1i66i9z616p0r43gx7d";
+  };
+
+  propagatedBuildInputs = [ ipywidgets matplotlib ];
+
+  # There are no unit tests in repository
+  doCheck = false;
+  pythonImportsCheck = [ "ipympl" "ipympl.backend_nbagg" ];
+
+  meta = with lib; {
+    description = "Matplotlib Jupyter Extension";
+    homepage = https://github.com/matplotlib/jupyter-matplotlib;
+    maintainers = with maintainers; [ jluttine ];
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f2ce0218200f..7197787aafc9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -804,6 +804,8 @@ in {
 
   inquirer = callPackage ../development/python-modules/inquirer { };
 
+  ipympl = callPackage ../development/python-modules/ipympl { };
+
   itanium_demangler = callPackage ../development/python-modules/itanium_demangler { };
 
   janus = callPackage ../development/python-modules/janus { };

From 770329ac76cf80d4e509b329a656c84b87304e88 Mon Sep 17 00:00:00 2001
From: peelz <LouisTakePILLz@users.noreply.github.com>
Date: Thu, 5 Mar 2020 19:42:12 -0500
Subject: [PATCH 2711/4636] maintainers: add peelz

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0ec698661f24..574619b2b31f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5899,6 +5899,12 @@
     githubId = 4579165;
     name = "Danny Bautista";
   };
+  peelz = {
+    email = "peelz.dev+nixpkgs@gmail.com";
+    github = "louistakepillz";
+    githubId = 920910;
+    name = "peelz";
+  };
   q3k = {
     email = "q3k@q3k.org";
     github = "q3k";

From 3eea746d74d1fdfa57eef62b9159f5a51f23562a Mon Sep 17 00:00:00 2001
From: peelz <LouisTakePILLz@users.noreply.github.com>
Date: Thu, 5 Mar 2020 19:42:23 -0500
Subject: [PATCH 2712/4636] r8125: init at 9.003.02

---
 pkgs/os-specific/linux/r8125/default.nix | 45 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/os-specific/linux/r8125/default.nix

diff --git a/pkgs/os-specific/linux/r8125/default.nix b/pkgs/os-specific/linux/r8125/default.nix
new file mode 100644
index 000000000000..a837b2261380
--- /dev/null
+++ b/pkgs/os-specific/linux/r8125/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, lib, fetchFromGitHub, kernel }:
+
+stdenv.mkDerivation rec {
+  pname = "r8125";
+  # On update please verify (using `diff -r`) that the source matches the
+  # realtek version.
+  version = "9.003.02";
+
+  # This is a mirror. The original website[1] doesn't allow non-interactive
+  # downloads, instead emailing you a download link.
+  # [1] https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software
+  src = fetchFromGitHub {
+    owner = "ibmibmibm";
+    repo = "r8125";
+    rev = "${version}";
+    sha256 = "09ip17x8nhcpxkkhyyawkmd10n73j2ffh1i2nmsr7l3jfq7f9zac";
+  };
+
+  hardeningDisable = [ "pic" ];
+
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+
+  preBuild = ''
+    substituteInPlace src/Makefile --replace "BASEDIR :=" "BASEDIR ?="
+    substituteInPlace src/Makefile --replace "modules_install" "INSTALL_MOD_PATH=$out modules_install"
+  '';
+
+  makeFlags = [
+    "BASEDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}"
+  ];
+
+  buildFlags = [ "modules" ];
+
+  meta = with lib; {
+    homepage = "https://github.com/ibmibmibm/r8125";
+    downloadPage = "https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software";
+    description = "Realtek r8125 driver";
+    longDescription = ''
+      A kernel module for Realtek 8125 2.5G network cards.
+    '';
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ peelz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c915833ba01f..71fb2a3134e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16705,6 +16705,8 @@ in
 
     ply = callPackage ../os-specific/linux/ply { };
 
+    r8125 = callPackage ../os-specific/linux/r8125 { };
+
     r8168 = callPackage ../os-specific/linux/r8168 { };
 
     rtl8192eu = callPackage ../os-specific/linux/rtl8192eu { };

From 545431757035bba32c7f73fd0758b5c07c328a50 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Mar 2020 18:56:46 +0000
Subject: [PATCH 2713/4636] dpkg: 1.19.7 -> 1.20.0

---
 pkgs/tools/package-management/dpkg/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index 11672e6d456d..8d012c90f928 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "dpkg";
-  version = "1.19.7";
+  version = "1.20.0";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
-    sha256 = "1s4nlaqz4c3p5r85f4il8m21825sfy2s9wgz4ajhl332vzggw9sc";
+    sha256 = "0009dp4p3d2j5vd956achqczf8qizfixha8hw5hzn3h31qmwqcxn";
   };
 
   configureFlags = [
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "The Debian package manager";
-    homepage = https://wiki.debian.org/Teams/Dpkg;
+    homepage = "https://wiki.debian.org/Teams/Dpkg";
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
     maintainers = with maintainers; [ ];

From 52068db0a3fc1d831073053790cdf319cb6ad9ad Mon Sep 17 00:00:00 2001
From: Jason Felice <jason.m.felice@gmail.com>
Date: Mon, 9 Mar 2020 22:16:51 -0400
Subject: [PATCH 2714/4636] elvish: 0.12 -> 0.13

---
 pkgs/shells/elvish/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix
index 80b0f3860514..ad2e845f9bc8 100644
--- a/pkgs/shells/elvish/default.nix
+++ b/pkgs/shells/elvish/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "elvish";
-  version = "0.12";
+  version = "0.13";
 
   goPackagePath = "github.com/elves/elvish";
   excludedPackages = [ "website" ];
@@ -15,9 +15,11 @@ buildGoPackage rec {
     owner = "elves";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1vvbgkpnrnb5aaak4ks45wl0cyp0vbry8bpxl6v2dpmq9x0bscpp";
+    sha256 = "0fprii430p9w8x4wq93iqkgkwi5kypwwlnzgvlcz0mkksayk8bzg";
   };
 
+  modSha256 = "13x4wbfj8049ygm3zbgzyr2bm4sq4x6xddrxx6shr8fydlcf1g8v";
+
   meta = with stdenv.lib; {
     description = "A friendly and expressive command shell";
     longDescription = ''

From 9727da29b0e853ff154a63dc61c321c8bd0c62fa Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 10 Mar 2020 20:06:10 +0100
Subject: [PATCH 2715/4636] firefox-esr-68: 68.5.0esr -> 68.6.0esr

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index b94a33bfa871..d0d3f843152b 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -33,10 +33,10 @@ rec {
 
   firefox-esr-68 = common rec {
     pname = "firefox-esr";
-    ffversion = "68.5.0esr";
+    ffversion = "68.6.0esr";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
-      sha512 = "39i05r7r4rh2jvc8v4m2s2i6d33qaa075a1lc8m9gx7s3rw8yxja2c42cv5hq1imr9zc4dldbk88paz6lv1w8rhncm0dkxw8z6lxkqa";
+      sha512 = "2ipajk86s7hfz7qky9lh24i5fgzgpv9hl12invr1rr6jhpp0h6gbb44ffim0z9lmcj49cr01cgqis0swhb4vph8dl1jvgfq9rjmsml4";
     };
 
     patches = [

From 641b94bdd0b5ca961383c8e81412725058a2b660 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Fri, 6 Mar 2020 19:03:32 -0500
Subject: [PATCH 2716/4636] nixos/mysql: add settings and configFile options

---
 nixos/modules/services/databases/mysql.nix | 103 ++++++++++++++++-----
 1 file changed, 81 insertions(+), 22 deletions(-)

diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 8d520b82fb55..248bf0ebc915 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -21,6 +21,11 @@ let
   installOptions =
     "${mysqldOptions} ${lib.optionalString isMysqlAtLeast57 "--insecure"}";
 
+  settingsFile = pkgs.writeText "my.cnf" (
+    generators.toINI { listsAsDuplicateKeys = true; } cfg.settings +
+    optionalString (cfg.extraOptions != null) "[mysqld]\n${cfg.extraOptions}"
+  );
+
 in
 
 {
@@ -76,9 +81,64 @@ in
         description = "Location where MySQL stores its table files";
       };
 
+      configFile = mkOption {
+        type = types.path;
+        default = settingsFile;
+        defaultText = "settingsFile";
+        description = ''
+          Override the configuration file used by MySQL. By default,
+          NixOS generates one automatically from <option>services.mysql.settings</option>.
+        '';
+        example = literalExample ''
+          pkgs.writeText "my.cnf" '''
+            [mysqld]
+            datadir = /var/lib/mysql
+            bind-address = 127.0.0.1
+            port = 3336
+            plugin-load-add = auth_socket.so
+
+            !includedir /etc/mysql/conf.d/
+          ''';
+        '';
+      };
+
+      settings = mkOption {
+        type = with types; attrsOf (attrsOf (oneOf [ bool int str (listOf str) ]));
+        default = {};
+        description = ''
+          MySQL configuration. Refer to
+          <link xlink:href="https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html"/>,
+          <link xlink:href="https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html"/>,
+          and <link xlink:href="https://mariadb.com/kb/en/server-system-variables/"/>
+          for details on supported values.
+
+          <note>
+            <para>
+              MySQL configuration options such as <literal>--quick</literal> should be treated as
+              boolean options and provided values such as <literal>true</literal>, <literal>false</literal>,
+              <literal>1</literal>, or <literal>0</literal>. See the provided example below.
+            </para>
+          </note>
+        '';
+        example = literalExample ''
+          {
+            mysqld = {
+              key_buffer_size = "6G";
+              table_cache = 1600;
+              log-error = "/var/log/mysql_err.log";
+              plugin-load-add = [ "server_audit" "ed25519=auth_ed25519" ];
+            };
+            mysqldump = {
+              quick = true;
+              max_allowed_packet = "16M";
+            };
+          }
+        '';
+      };
+
       extraOptions = mkOption {
-        type = types.lines;
-        default = "";
+        type = with types; nullOr lines;
+        default = null;
         example = ''
           key_buffer_size = 6G
           table_cache = 1600
@@ -252,10 +312,27 @@ in
 
   config = mkIf config.services.mysql.enable {
 
+    warnings = optional (cfg.extraOptions != null) "services.mysql.`extraOptions` is deprecated, please use services.mysql.`settings`.";
+
     services.mysql.dataDir =
       mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/mysql"
                  else "/var/mysql");
 
+    services.mysql.settings.mysqld = mkMerge [
+      {
+        datadir = cfg.dataDir;
+        bind-address = mkIf (cfg.bind != null) cfg.bind;
+        port = cfg.port;
+        plugin-load-add = optional (cfg.ensureUsers != []) "auth_socket.so";
+      }
+      (mkIf (cfg.replication.role == "master" || cfg.replication.role == "slave") {
+        log-bin = "mysql-bin-${toString cfg.replication.serverId}";
+        log-bin-index = "mysql-bin-${toString cfg.replication.serverId}.index";
+        relay-log = "mysql-relay-bin";
+        server-id = cfg.replication.serverId;
+      })
+    ];
+
     users.users.mysql = {
       description = "MySQL server user";
       group = "mysql";
@@ -266,25 +343,7 @@ in
 
     environment.systemPackages = [mysql];
 
-    environment.etc."my.cnf".text =
-    ''
-      [mysqld]
-      port = ${toString cfg.port}
-      datadir = ${cfg.dataDir}
-      ${optionalString (cfg.bind != null) "bind-address = ${cfg.bind}" }
-      ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave")
-      ''
-        log-bin=mysql-bin-${toString cfg.replication.serverId}
-        log-bin-index=mysql-bin-${toString cfg.replication.serverId}.index
-        relay-log=mysql-relay-bin
-        server-id = ${toString cfg.replication.serverId}
-      ''}
-      ${optionalString (cfg.ensureUsers != [])
-      ''
-        plugin-load-add = auth_socket.so
-      ''}
-      ${cfg.extraOptions}
-    '';
+    environment.etc."my.cnf".source = cfg.configFile;
 
     systemd.tmpfiles.rules = [
       "d '${cfg.dataDir}' 0700 ${cfg.user} mysql -"
@@ -297,7 +356,7 @@ in
 
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
-        restartTriggers = [ config.environment.etc."my.cnf".source ];
+        restartTriggers = [ cfg.configFile ];
 
         unitConfig.RequiresMountsFor = "${cfg.dataDir}";
 

From d0f3de4f23498da35740aa954606a41006a67bcc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Mar 2020 14:44:43 +0000
Subject: [PATCH 2717/4636] arping: 2.20 -> 2.21

---
 pkgs/tools/networking/arping/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/arping/default.nix b/pkgs/tools/networking/arping/default.nix
index 5d1ebc748003..ad0139b184dd 100644
--- a/pkgs/tools/networking/arping/default.nix
+++ b/pkgs/tools/networking/arping/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, libnet, libpcap }:
 
 stdenv.mkDerivation rec {
-  version = "2.20";
+  version = "2.21";
   pname = "arping";
 
   buildInputs = [ libnet libpcap ];
@@ -10,14 +10,14 @@ stdenv.mkDerivation rec {
     owner = "ThomasHabets";
     repo = pname;
     rev = "${pname}-${version}";
-    sha256 = "0gmyip552k6mq7013cvy5yc4akn2rz28s3g4x4vdq35vnxf66cyk";
+    sha256 = "1i7rjn863bnq51ahbvypm1bkzhyshlm5b32yzdd9iaqyz7sa7pa7";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
 
   meta = with stdenv.lib; {
     description = "Broadcasts a who-has ARP packet on the network and prints answers";
-    homepage = https://github.com/ThomasHabets/arping;
+    homepage = "https://github.com/ThomasHabets/arping";
     license = with licenses; [ gpl2 ];
     maintainers = [ maintainers.michalrus ];
     platforms = platforms.unix;

From 40ae28791f6336132918f50261175d1ab41d09e0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 11 Feb 2020 20:02:43 +0100
Subject: [PATCH 2718/4636] suitesparse: clean up

* Split to multiple outputs
* Fetch source from GitLab (the only source for future releases)
* Re-order attrset to be more idiomatic
* Format with nixpkgs-fmt
---
 .../science/math/suitesparse/default.nix      | 81 ++++++++++---------
 .../python-modules/cvxopt/default.nix         |  4 +-
 2 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index f72574cff583..b3b0d444bdcc 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -1,33 +1,46 @@
-{ stdenv, fetchurl, gfortran, openblas, cmake, fixDarwinDylibNames
+{ stdenv
+, fetchFromGitHub
+, gfortran
+, openblas
+, cmake
+, fixDarwinDylibNames
 , gnum4
-, enableCuda  ? false, cudatoolkit
+, enableCuda ? false
+, cudatoolkit
 }:
 
-let
-  version = "5.4.0";
-  name = "suitesparse-${version}";
-
-  SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary;
-in
 stdenv.mkDerivation rec {
-  inherit name;
+  pname = "suitesparse";
+  version = "5.4.0";
 
-  src = fetchurl {
-    url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${version}.tar.gz";
-    sha256 = "1lfvjj787yqyhk25w7brlrkrl7dnnn5dq4ijxws3wrbcd4vd2k9p";
+  outputs = [ "out" "dev" "doc" ];
+
+  src = fetchFromGitHub {
+    owner = "DrTimothyAldenDavis";
+    repo = "SuiteSparse";
+    rev = "v${version}";
+    sha256 = "sha256:1jwqn86z9xxcj6gsiymmws40zfvdcclprffsmdasdjnjax00z9sk";
   };
 
+  nativeBuildInputs = [
+    cmake
+    gnum4
+  ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+  buildInputs = [
+    openblas
+    gfortran.cc.lib
+  ] ++ stdenv.lib.optional enableCuda cudatoolkit;
+
   dontUseCmakeConfigure = true;
 
   preConfigure = ''
     mkdir -p $out/lib
-    mkdir -p $out/include
-    mkdir -p $out/share/doc/${name}
+    mkdir -p $dev/include
+    mkdir -p $doc/share/doc/${pname}-${version}
 
     sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
-        -e 's/METIS .*$/METIS =/' \
-        -e 's/METIS_PATH .*$/METIS_PATH =/' \
-        -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION/'
+        -e '/CHOLMOD_CONFIG ?=/ s/$/ -DNPARTITION/'
   ''
   + stdenv.lib.optionalString stdenv.isDarwin ''
     sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
@@ -49,7 +62,7 @@ stdenv.mkDerivation rec {
         -e 's|^[[:space:]]*\(NVCCFLAGS     =\)|NVCCFLAGS = $(NV20) -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35 -gencode=arch=compute_60,code=sm_60|'
   '';
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER";
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-DNTIMER";
 
   buildPhase = ''
     runHook preBuild
@@ -75,7 +88,7 @@ stdenv.mkDerivation rec {
     ${if enableCuda then "${cudatoolkit}/bin/nvcc" else "${stdenv.cc.outPath}/bin/cc"} \
         static/*.o                                                                     \
         ${if stdenv.isDarwin then "-dynamiclib" else "--shared"}                       \
-        -o "lib/libsuitesparse${SHLIB_EXT}"                                            \
+        -o "lib/libsuitesparse${stdenv.hostPlatform.extensions.sharedLibrary}"         \
         -lopenblas                                                                     \
         ${stdenv.lib.optionalString enableCuda "-lcublas"}
 
@@ -85,12 +98,11 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out
     cp -r lib $out/
-    cp -r include $out/
-    cp -r share $out/
-    ''
-    + stdenv.lib.optionalString stdenv.isDarwin ''
+    cp -r include $dev/
+    cp -r share $doc/
+  ''
+  + stdenv.lib.optionalString stdenv.isDarwin ''
     # The fixDarwinDylibNames in nixpkgs can't seem to fix all the libraries.
     # We manually fix them up here.
     fixDarwinDylibNames() {
@@ -109,28 +121,19 @@ stdenv.mkDerivation rec {
     }
 
     fixDarwinDylibNames $(find "$out" -name "*.dylib")
-    ''
-    + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+  ''
+  + stdenv.lib.optionalString (!stdenv.isDarwin) ''
     # Fix rpaths
     cd $out
     find -name \*.so\* -type f -exec \
       patchelf --set-rpath "$out/lib:${stdenv.lib.makeLibraryPath buildInputs}" {} \;
-    ''
-    +
-    ''
+  ''
+  + ''
     runHook postInstall
-    '';
-
-  nativeBuildInputs = [
-    cmake
-    gnum4
-  ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
-
-  buildInputs = [ openblas gfortran.cc.lib ]
-    ++ stdenv.lib.optional enableCuda cudatoolkit;
+  '';
 
   meta = with stdenv.lib; {
-    homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html;
+    homepage = "http://faculty.cse.tamu.edu/davis/suitesparse.html";
     description = "A suite of sparse matrix algorithms";
     license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ];
     maintainers = with maintainers; [ ttuegel ];
diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix
index a842baca2289..fd44f49b53c9 100644
--- a/pkgs/development/python-modules/cvxopt/default.nix
+++ b/pkgs/development/python-modules/cvxopt/default.nix
@@ -31,8 +31,8 @@ buildPythonPackage rec {
     export CVXOPT_BLAS_LIB_DIR=${openblasCompat}/lib
     export CVXOPT_BLAS_LIB=openblas
     export CVXOPT_LAPACK_LIB=openblas
-    export CVXOPT_SUITESPARSE_LIB_DIR=${suitesparse}/lib
-    export CVXOPT_SUITESPARSE_INC_DIR=${suitesparse}/include
+    export CVXOPT_SUITESPARSE_LIB_DIR=${lib.getLib suitesparse}/lib
+    export CVXOPT_SUITESPARSE_INC_DIR=${lib.getDev suitesparse}/include
   '' + lib.optionalString withGsl ''
     export CVXOPT_BUILD_GSL=1
     export CVXOPT_GSL_LIB_DIR=${gsl}/lib

From b4e6293a8d14d82a6e48466788845ac8bfc51356 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 11 Feb 2020 20:40:00 +0100
Subject: [PATCH 2719/4636] mongoose: init at 2.0.4

---
 .../science/math/mongoose/default.nix         | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/libraries/science/math/mongoose/default.nix

diff --git a/pkgs/development/libraries/science/math/mongoose/default.nix b/pkgs/development/libraries/science/math/mongoose/default.nix
new file mode 100644
index 000000000000..36c53b2994f5
--- /dev/null
+++ b/pkgs/development/libraries/science/math/mongoose/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+}:
+
+stdenv.mkDerivation rec {
+  pname = "mongoose";
+  version = "2.0.4";
+
+  outputs = [ "bin" "out" "dev" ];
+
+  src = fetchFromGitHub {
+    owner = "ScottKolo";
+    repo = "Mongoose";
+    rev = "v${version}";
+    sha256 = "0ymwd4n8p8s0ndh1vcbmjcsm0x2cc2b7v3baww5y6as12873bcrh";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Graph Coarsening and Partitioning Library";
+    homepage = "https://github.com/ScottKolo/Mongoose";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c915833ba01f..94bf821c3620 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25152,6 +25152,8 @@ in
 
   mongoc = callPackage ../development/libraries/mongoc { };
 
+  mongoose = callPackage ../development/libraries/science/math/mongoose {};
+
   morph = callPackage ../tools/package-management/morph { };
 
   mupen64plus = callPackage ../misc/emulators/mupen64plus { };

From 1968755fff9c5673b9436dbe3f5c952c5bf359ef Mon Sep 17 00:00:00 2001
From: Matt Snider <matt.snider@protonmail.com>
Date: Mon, 9 Mar 2020 22:08:44 +0100
Subject: [PATCH 2720/4636] ankisyncd: init at 2.1.0

---
 pkgs/servers/ankisyncd/default.nix | 67 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 +
 2 files changed, 69 insertions(+)
 create mode 100644 pkgs/servers/ankisyncd/default.nix

diff --git a/pkgs/servers/ankisyncd/default.nix b/pkgs/servers/ankisyncd/default.nix
new file mode 100644
index 000000000000..e10986701237
--- /dev/null
+++ b/pkgs/servers/ankisyncd/default.nix
@@ -0,0 +1,67 @@
+{ lib
+, fetchFromGitHub
+, python3
+, anki
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "ankisyncd";
+  version = "2.1.0";
+  src = fetchFromGitHub {
+    owner = "tsudoko";
+    repo = "anki-sync-server";
+    rev = version;
+    sha256 = "6a140afa94fdb1725fed716918875e3d2ad0092cb955136e381c9d826cc4927c";
+  };
+  format = "other";
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/${python3.sitePackages}
+
+    cp -r ankisyncd utils ankisyncd.conf $out/${python3.sitePackages}
+    mkdir $out/share
+    cp ankisyncctl.py $out/share/
+
+    runHook postInstall
+  '';
+
+  fixupPhase = ''
+    PYTHONPATH="$PYTHONPATH:$out/${python3.sitePackages}:${anki}"
+
+    makeWrapper "${python3.interpreter}" "$out/bin/ankisyncd" \
+          --set PYTHONPATH $PYTHONPATH \
+          --add-flags "-m ankisyncd"
+
+    makeWrapper "${python3.interpreter}" "$out/bin/ankisyncctl" \
+          --set PYTHONPATH $PYTHONPATH \
+          --add-flags "$out/share/ankisyncctl.py"
+  '';
+
+  checkInputs = with python3.pkgs; [
+    pytest
+    webtest
+  ];
+
+  buildInputs = [ ];
+
+  propagatedBuildInputs = [ anki ];
+
+  checkPhase = ''
+    # Exclude tests that require sqlite's sqldiff command, since
+    # it isn't yet packaged for NixOS, although 2 PRs exist:
+    # - https://github.com/NixOS/nixpkgs/pull/69112
+    # - https://github.com/NixOS/nixpkgs/pull/75784
+    # Once this is merged, these tests can be run as well.
+    pytest --ignore tests/test_web_media.py tests/
+  '';
+
+  meta = with lib; {
+    description = "Self-hosted Anki sync server";
+    maintainers = with maintainers; [ matt-snider ];
+    homepage = "https://github.com/tsudoko/anki-sync-server";
+    license = licenses.agpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68851738f9e2..51d5b8a01268 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -126,6 +126,8 @@ in
 
   addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { };
 
+  ankisyncd = callPackage ../servers/ankisyncd { };
+
   avro-tools = callPackage ../development/tools/avro-tools { };
 
   # Zip file format only allows times after year 1980, which makes e.g. Python wheel building fail with:

From 559f02e2088a1934d9cca16ad1efcea481487d2d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 12 Feb 2020 06:33:35 +0100
Subject: [PATCH 2721/4636] suitesparse-graphblas: init at 3.1.2

---
 .../math/suitesparse-graphblas/default.nix    | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix

diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix
new file mode 100644
index 000000000000..599c1be66461
--- /dev/null
+++ b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+, gnum4
+}:
+
+stdenv.mkDerivation rec {
+  pname = "suitesparse-graphblas";
+  version = "3.2.1";
+
+  outputs = [ "out" "dev" ];
+
+  src = fetchFromGitHub {
+    owner = "DrTimothyAldenDavis";
+    repo = "GraphBLAS";
+    rev = "v${version}";
+    sha256 = "AAwwzrpKFHy40Ldm6hTO6L0FWPYwi3kJj3zrshFwYas=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    gnum4
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Graph algorithms in the language of linear algebra";
+    homepage = "http://faculty.cse.tamu.edu/davis/GraphBLAS.html";
+    license = licenses.asl20;
+    maintainers = with maintainers; [];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94bf821c3620..79533f825f59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24308,6 +24308,8 @@ in
   suitesparse_5_3 = callPackage ../development/libraries/science/math/suitesparse {};
   suitesparse = suitesparse_5_3;
 
+  suitesparse-graphblas = callPackage ../development/libraries/science/math/suitesparse-graphblas {};
+
   superlu = callPackage ../development/libraries/science/math/superlu {};
 
   symmetrica = callPackage ../applications/science/math/symmetrica {};

From e9d7774b7b466a3d4e19e850d42d80d47df8fa03 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 12 Feb 2020 07:23:00 +0100
Subject: [PATCH 2722/4636] =?UTF-8?q?suitesparse:=205.4.0=20=E2=86=92=205.?=
 =?UTF-8?q?7.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libraries/science/math/suitesparse/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index b3b0d444bdcc..686efc6baf48 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation rec {
   pname = "suitesparse";
-  version = "5.4.0";
+  version = "5.7.1";
 
   outputs = [ "out" "dev" "doc" ];
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     owner = "DrTimothyAldenDavis";
     repo = "SuiteSparse";
     rev = "v${version}";
-    sha256 = "sha256:1jwqn86z9xxcj6gsiymmws40zfvdcclprffsmdasdjnjax00z9sk";
+    sha256 = "SA9SQKRDKUI1GilNMuCXljcvovLUwRKBUi/tiQ4dl5w=";
   };
 
   nativeBuildInputs = [

From 306cf6091ff25523e8df31154ac6d82cb7747ce3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 10 Mar 2020 20:07:26 +0100
Subject: [PATCH 2723/4636] suitesparse: link against system metis

---
 .../libraries/science/math/suitesparse/default.nix         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index 686efc6baf48..5786ae49ee57 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -2,6 +2,7 @@
 , fetchFromGitHub
 , gfortran
 , openblas
+, metis
 , cmake
 , fixDarwinDylibNames
 , gnum4
@@ -29,6 +30,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     openblas
+    metis
     gfortran.cc.lib
   ] ++ stdenv.lib.optional enableCuda cudatoolkit;
 
@@ -71,6 +73,7 @@ stdenv.mkDerivation rec {
     make library        \
         JOBS=$NIX_BUILD_CORES \
         BLAS=-lopenblas \
+        MY_METIS_LIB=-lmetis \
         LAPACK=""       \
         ${stdenv.lib.optionalString openblas.blas64 "CFLAGS=-DBLAS64"}
 
@@ -78,7 +81,9 @@ stdenv.mkDerivation rec {
     # Bundling is done by building the static libraries, extracting objects from
     # them and combining the objects into one shared library.
     mkdir -p static
-    make static JOBS=$NIX_BUILD_CORES AR_TARGET=$(pwd)/static/'$(LIBRARY).a'
+    make static JOBS=$NIX_BUILD_CORES \
+        MY_METIS_LIB=-lmetis \
+        AR_TARGET=$(pwd)/static/'$(LIBRARY).a'
     (
         cd static
         for i in lib*.a; do

From ac184e3c6bffd6abf224d0d159de2b66a8a393d8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Mar 2020 20:45:39 +0000
Subject: [PATCH 2724/4636] fselect: 0.6.8 -> 0.6.9

---
 pkgs/tools/misc/fselect/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix
index 2a3813eb184f..6486e3ca20e1 100644
--- a/pkgs/tools/misc/fselect/default.nix
+++ b/pkgs/tools/misc/fselect/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fselect";
-  version = "0.6.8";
+  version = "0.6.9";
 
   src = fetchFromGitHub {
     owner = "jhspetersson";
     repo = "fselect";
     rev = version;
-    sha256 = "1zccl60l557lhaaqb33myys4vp3jsnjqh3dxb22i46bff28s1w6c";
+    sha256 = "0cgzvzdsy8vbiapgk1l5dp48c3kq0xmx53yfi486mx8nwvz3ksc0";
   };
 
-  cargoSha256 = "0023adx4xkm24p3nwj0j669xns4qf8insalcnlv3r2iv4138w10l";
+  cargoSha256 = "0mjd9nmaggsszf0kx68yrvy3fqbn35v34c7q3584fv50ipqn6drb";
 
   meta = with stdenv.lib; {
     description = "Find files with SQL-like queries";

From 23f37d2db9d7c0333892df5ac92575de62ad41c4 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Tue, 10 Mar 2020 17:07:31 -0400
Subject: [PATCH 2725/4636] licensor: upgrade cargo fetcher and cargoSha256

---
 pkgs/tools/misc/licensor/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/licensor/default.nix b/pkgs/tools/misc/licensor/default.nix
index 376dd2f2e9af..a6570adf1207 100644
--- a/pkgs/tools/misc/licensor/default.nix
+++ b/pkgs/tools/misc/licensor/default.nix
@@ -16,10 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0kfyg06wa2v7swm7hs9kkazjg34mircd4nm4qmljyzjh2yh8icg3";
   })];
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "042dplm0cdxkv73m5qlkc61h0x9fpzxn2b0c8gjx2hwvigcia139";
+  cargoSha256 = "1z2r8nfizifj8sk1ghppyqk5r65sgmbk47fiq95pnwpadm5drvqa";
 
   meta = with lib; {
     description = "Write licenses to stdout";

From 10de850595f717a34e24bd9098ec8e254a6978b5 Mon Sep 17 00:00:00 2001
From: Dmitry Bogatov <KAction@debian.org>
Date: Tue, 5 Feb 2019 17:03:58 +0000
Subject: [PATCH 2726/4636] tinycdb: init at 0.7.8

---
 .../development/libraries/tinycdb/default.nix | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/libraries/tinycdb/default.nix

diff --git a/pkgs/development/libraries/tinycdb/default.nix b/pkgs/development/libraries/tinycdb/default.nix
new file mode 100644
index 000000000000..19b8640f8665
--- /dev/null
+++ b/pkgs/development/libraries/tinycdb/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, lib, fetchurl }:
+
+stdenv.mkDerivation rec {
+  pname = "tinycdb";
+  version = "0.78";
+  outputs = [ "out" "dev" "lib" "man" ];
+  separateDebugInfo = true;
+  makeFlags = [ "prefix=$(out)" "staticlib" "sharedlib" "cdb-shared" ];
+  postInstall = ''
+    mkdir -p $lib/lib $dev/lib $out/bin
+    cp libcdb.so* $lib/lib
+    cp cdb-shared $out/bin/cdb
+    mv $out/lib/libcdb.a $dev/lib
+    rmdir $out/lib
+  '';
+
+  src = fetchurl {
+    url = "http://www.corpit.ru/mjt/tinycdb/${pname}-${version}.tar.gz";
+    sha256 = "0g6n1rr3lvyqc85g6z44lw9ih58f2k1i3v18yxlqvnla5m1qyrsh";
+  };
+
+  meta = with lib; {
+
+    description = "utility to manipulate constant databases (cdb)";
+
+    longDescription = ''
+      tinycdb is a small, fast and reliable utility and subroutine
+      library for creating and reading constant databases. The database
+      structure is tuned for fast reading.
+      '';
+
+    homepage = https://www.corpit.ru/mjt/tinycdb.html;
+    license = licenses.publicDomain;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bfbcbf194151..6394955ed741 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14542,6 +14542,8 @@ in
 
   tidyp = callPackage ../development/libraries/tidyp { };
 
+  tinycdb = callPackage ../development/libraries/tinycdb { };
+
   tinyxml = tinyxml2;
 
   tinyxml2 = callPackage ../development/libraries/tinyxml/2.6.2.nix { };

From 8ff6ae68239e3afb0b57005c42e80d65c8ac3c08 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Sun, 12 Jan 2020 15:01:31 +0100
Subject: [PATCH 2727/4636] perlPackages.XMLTwig: install xml_grep tool

---
 pkgs/top-level/perl-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 316be1531529..5b093bc68f23 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -21056,6 +21056,10 @@ let
       url = mirror://cpan/authors/id/M/MI/MIROD/XML-Twig-3.52.tar.gz;
       sha256 = "1bc0hrz4jp6199hi29sdxmb9gyy45whla9hd19yqfasgq8k5ixzy";
     };
+    postInstall = ''
+      mkdir -p $out/bin
+      cp tools/xml_grep/xml_grep $out/bin
+    '';
     propagatedBuildInputs = [ XMLParser ];
     doCheck = false;  # requires lots of extra packages
   };

From acba458b7ed7f64336081dd2a29856be9cb8de00 Mon Sep 17 00:00:00 2001
From: Matt Snider <matt.snider@protonmail.com>
Date: Mon, 9 Mar 2020 22:08:44 +0100
Subject: [PATCH 2728/4636] nixos/ankisyncd: init at 2.1.0

---
 nixos/modules/module-list.nix             |  1 +
 nixos/modules/services/misc/ankisyncd.nix | 79 +++++++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 nixos/modules/services/misc/ankisyncd.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e70a853624bf..0c7b58c37fea 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -405,6 +405,7 @@
   ./services/mail/sympa.nix
   ./services/mail/nullmailer.nix
   ./services/misc/airsonic.nix
+  ./services/misc/ankisyncd.nix
   ./services/misc/apache-kafka.nix
   ./services/misc/autofs.nix
   ./services/misc/autorandr.nix
diff --git a/nixos/modules/services/misc/ankisyncd.nix b/nixos/modules/services/misc/ankisyncd.nix
new file mode 100644
index 000000000000..5fc19649d3d9
--- /dev/null
+++ b/nixos/modules/services/misc/ankisyncd.nix
@@ -0,0 +1,79 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.ankisyncd;
+
+  name = "ankisyncd";
+
+  stateDir = "/var/lib/${name}";
+
+  authDbPath = "${stateDir}/auth.db";
+
+  sessionDbPath = "${stateDir}/session.db";
+
+  configFile = pkgs.writeText "ankisyncd.conf" (lib.generators.toINI {} {
+    sync_app = {
+      host = cfg.host;
+      port = cfg.port;
+      data_root = stateDir;
+      auth_db_path = authDbPath;
+      session_db_path = sessionDbPath;
+
+      base_url = "/sync/";
+      base_media_url = "/msync/";
+    };
+  });
+in
+  {
+    options.services.ankisyncd = {
+      enable = mkEnableOption "ankisyncd";
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.ankisyncd;
+        defaultText = literalExample "pkgs.ankisyncd";
+        description = "The package to use for the ankisyncd command.";
+      };
+
+      host = mkOption {
+        type = types.str;
+        default = "localhost";
+        description = "ankisyncd host";
+      };
+
+      port = mkOption {
+        type = types.int;
+        default = 27701;
+        description = "ankisyncd port";
+      };
+
+      openFirewall = mkOption {
+        default = false;
+        type = types.bool;
+        description = "Whether to open the firewall for the specified port.";
+      };
+    };
+
+    config = mkIf cfg.enable {
+      networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];
+
+      environment.etc."ankisyncd/ankisyncd.conf".source = configFile;
+
+      systemd.services.ankisyncd = {
+        description = "ankisyncd - Anki sync server";
+        after = [ "network.target" ];
+        wantedBy = [ "multi-user.target" ];
+        path = [ cfg.package ];
+
+        serviceConfig = {
+          Type = "simple";
+          DynamicUser = true;
+          StateDirectory = name;
+          ExecStart = "${cfg.package}/bin/ankisyncd";
+          Restart = "always";
+        };
+      };
+    };
+  }

From d23e44893baded5354a0dd4fe976b7b96e64c5f4 Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Wed, 11 Mar 2020 00:58:32 +0300
Subject: [PATCH 2729/4636] btcdeb: init at 0.2.19

---
 .../blockchains/btcdeb/default.nix            | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/blockchains/btcdeb/default.nix

diff --git a/pkgs/applications/blockchains/btcdeb/default.nix b/pkgs/applications/blockchains/btcdeb/default.nix
new file mode 100644
index 000000000000..9a8db94401cd
--- /dev/null
+++ b/pkgs/applications/blockchains/btcdeb/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkgconfig
+, openssl
+}:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  pname = "btcdeb";
+  version = "0.2.19";
+
+  src = fetchFromGitHub {
+    owner = "kallewoof";
+    repo = pname;
+    rev = "fb2dace4cd115dc9529a81515cee855b8ce94784";
+    sha256 = "0l0niamcjxmgyvc6w0wiygfgwsjam3ypv8mvjglgsj50gyv1vnb3";
+  };
+
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  buildInputs = [ openssl ];
+
+  meta = {
+    description = "Bitcoin Script Debugger";
+    homepage = "https://github.com/kallewoof/btcdeb";
+    license = licenses.mit;
+    maintainers = with maintainers; [ akru ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71fb2a3134e2..6da50209d307 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26168,4 +26168,6 @@ in
   go-license-detector = callPackage ../development/tools/misc/go-license-detector { };
 
   fluxboxlauncher = callPackage ../applications/misc/fluxboxlauncher {};
+
+  btcdeb = callPackage ../applications/blockchains/btcdeb {};
 }

From b42babd16086e34b9eb328f0fe8a0c70d71f7ca7 Mon Sep 17 00:00:00 2001
From: Jesper Geertsen Jonsson <yesbox@users.noreply.github.com>
Date: Tue, 10 Mar 2020 23:03:11 +0100
Subject: [PATCH 2730/4636] nixos/netdata: add module package option

---
 nixos/modules/services/monitoring/netdata.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix
index f8225af20428..7589fd0e67b0 100644
--- a/nixos/modules/services/monitoring/netdata.nix
+++ b/nixos/modules/services/monitoring/netdata.nix
@@ -12,7 +12,7 @@ let
   '';
 
   plugins = [
-    "${pkgs.netdata}/libexec/netdata/plugins.d"
+    "${cfg.package}/libexec/netdata/plugins.d"
     "${wrappedPlugins}/libexec/netdata/plugins.d"
   ] ++ cfg.extraPluginPaths;
 
@@ -35,6 +35,13 @@ in {
     services.netdata = {
       enable = mkEnableOption "netdata";
 
+      package = mkOption {
+        type = types.package;
+        default = pkgs.netdata;
+        defaultText = "pkgs.netdata";
+        description = "Netdata package to use.";
+      };
+
       user = mkOption {
         type = types.str;
         default = "netdata";
@@ -141,8 +148,8 @@ in {
       path = (with pkgs; [ curl gawk which ]) ++ lib.optional cfg.python.enable
         (pkgs.python3.withPackages cfg.python.extraPackages);
       serviceConfig = {
-        Environment="PYTHONPATH=${pkgs.netdata}/libexec/netdata/python.d/python_modules";
-        ExecStart = "${pkgs.netdata}/bin/netdata -P /run/netdata/netdata.pid -D -c ${configFile}";
+        Environment="PYTHONPATH=${cfg.package}/libexec/netdata/python.d/python_modules";
+        ExecStart = "${cfg.package}/bin/netdata -P /run/netdata/netdata.pid -D -c ${configFile}";
         ExecReload = "${pkgs.utillinux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID";
         TimeoutStopSec = 60;
         # User and group
@@ -159,7 +166,7 @@ in {
     systemd.enableCgroupAccounting = true;
 
     security.wrappers."apps.plugin" = {
-      source = "${pkgs.netdata}/libexec/netdata/plugins.d/apps.plugin.org";
+      source = "${cfg.package}/libexec/netdata/plugins.d/apps.plugin.org";
       capabilities = "cap_dac_read_search,cap_sys_ptrace+ep";
       owner = cfg.user;
       group = cfg.group;
@@ -167,7 +174,7 @@ in {
     };
 
     security.wrappers."freeipmi.plugin" = {
-      source = "${pkgs.netdata}/libexec/netdata/plugins.d/freeipmi.plugin.org";
+      source = "${cfg.package}/libexec/netdata/plugins.d/freeipmi.plugin.org";
       capabilities = "cap_dac_override,cap_fowner+ep";
       owner = cfg.user;
       group = cfg.group;

From 669fdccf8b396f6659afd152ad88ddf458a8b95e Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Tue, 10 Mar 2020 14:43:05 -0700
Subject: [PATCH 2731/4636] cfdyndns: v0.0.1 -> v0.0.3

---
 .../networking/dyndns/cfdyndns/default.nix        | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix
index e5b3e1d52f43..e4612579e0fe 100644
--- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix
+++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix
@@ -1,23 +1,21 @@
-{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, openssl }:
+{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl }:
 
 with rustPlatform;
 
 buildRustPackage rec {
   pname = "cfdyndns";
-  version = "0.0.1";
+  version = "0.0.3";
   src = fetchFromGitHub {
     owner = "colemickens";
     repo = "cfdyndns";
     rev = "v${version}";
-    sha256 = "1mcdjykrgh0jq6k6y664lai8sbgzk6j7k0r944f43vg63d1jql5b";
+    sha256 = "1fba0w2979dmc2wyggqx4fj52rrl1s2vpjk6mkj1811a848l1hdi";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
+  cargoSha256 = "04ryin24z3pfxjxy4smngy66xs7k85g6gdzsl77cij8ifb29im99";
 
-  cargoSha256 = "1d7jpffkw2m2v37bfdqsl9sqwsl19cgglpa00lwy4ih09kzbc2n9";
-
-  buildInputs = [ makeWrapper openssl ];
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ openssl ];
 
   installPhase = ''
     mkdir -p $out/bin
@@ -30,6 +28,5 @@ buildRustPackage rec {
     license = stdenv.lib.licenses.mit;
     maintainers = with maintainers; [ colemickens ];
     platforms = with platforms; linux;
-    broken = true;
   };
 }

From ae297d52477b07b7f734ef65388b47301850a669 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Tue, 10 Mar 2020 22:46:25 +0100
Subject: [PATCH 2732/4636] kitty: install man page on Darwin

On Linux the man page is already being built with `setup.py linux-package` and later copied to the correct location.
---
 pkgs/applications/misc/kitty/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index f332512bb848..f5553cac6b59 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -2,6 +2,7 @@
   harfbuzz, fontconfig, pkgconfig, ncurses, imagemagick, xsel,
   libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor,
   libxkbcommon, libXi, libXext, wayland-protocols, wayland,
+  installShellFiles,
   which, dbus,
   Cocoa,
   CoreGraphics,
@@ -53,6 +54,7 @@ buildPythonApplication rec {
   ] ++ stdenv.lib.optionals stdenv.isDarwin [
     imagemagick
     libicns  # For the png2icns tool.
+    installShellFiles
   ];
 
   propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux libGL;
@@ -78,6 +80,7 @@ buildPythonApplication rec {
 
   buildPhase = if stdenv.isDarwin then ''
     ${python.interpreter} setup.py kitty.app --update-check-interval=0
+    make man
   '' else ''
     ${python.interpreter} setup.py linux-package --update-check-interval=0
   '';
@@ -90,6 +93,8 @@ buildPythonApplication rec {
     ln -s ../Applications/kitty.app/Contents/MacOS/kitty "$out/bin/kitty"
     mkdir "$out/Applications"
     cp -r kitty.app "$out/Applications/kitty.app"
+
+    installManPage 'docs/_build/man/kitty.1'
     '' else ''
     cp -r linux-package/{bin,share,lib} $out
     ''}

From 06ca7346e22209dea558f02632cabf9b4899608d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 28 Feb 2020 10:36:56 +0100
Subject: [PATCH 2733/4636] =?UTF-8?q?malcontent:=200.4.0=20=E2=86=92=200.6?=
 =?UTF-8?q?.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* https://gitlab.freedesktop.org/pwithnall/malcontent/-/tags/0.5.0
* https://gitlab.freedesktop.org/pwithnall/malcontent/-/tags/0.6.0
---
 .../libraries/malcontent/default.nix          | 14 ++++++-
 .../malcontent/installed-tests-path.patch     | 40 ++++++++++++++-----
 .../malcontent/use-system-dependencies.patch  | 11 +----
 3 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix
index 3a40be3c4edb..bd8988390c91 100644
--- a/pkgs/development/libraries/malcontent/default.nix
+++ b/pkgs/development/libraries/malcontent/default.nix
@@ -7,7 +7,12 @@
 , wrapGAppsHook
 , glib
 , coreutils
+, accountsservice
 , dbus
+, flatpak
+, gtk3
+, pam
+, desktop-file-utils
 , polkit
 , glib-testing
 , python3
@@ -16,7 +21,7 @@
 
 stdenv.mkDerivation rec {
   pname = "malcontent";
-  version = "0.4.0";
+  version = "0.6.0";
 
   outputs = [ "bin" "out" "dev" "man" "installedTests" ];
 
@@ -25,7 +30,7 @@ stdenv.mkDerivation rec {
     owner = "pwithnall";
     repo = pname;
     rev = version;
-    sha256 = "0d703r20djvrgy711jvn90i8dwbb0p7qj4j43z101afpkiizq810";
+    sha256 = "COh6N3CmLIcxx6tW4jcP0m6TZv0Z1YJUM/nlG0RzYHQ=";
   };
 
   patches = [
@@ -42,11 +47,16 @@ stdenv.mkDerivation rec {
     ninja
     pkgconfig
     gobject-introspection
+    desktop-file-utils
     wrapGAppsHook
   ];
 
   buildInputs = [
+    accountsservice
     dbus
+    flatpak
+    gtk3
+    pam
     polkit
     glib-testing
     (python3.withPackages (pp: with pp; [
diff --git a/pkgs/development/libraries/malcontent/installed-tests-path.patch b/pkgs/development/libraries/malcontent/installed-tests-path.patch
index f2e75c2a8546..ac87ddf6ccbe 100644
--- a/pkgs/development/libraries/malcontent/installed-tests-path.patch
+++ b/pkgs/development/libraries/malcontent/installed-tests-path.patch
@@ -1,8 +1,8 @@
 diff --git a/libmalcontent/tests/meson.build b/libmalcontent/tests/meson.build
-index a8a815a..0b1d242 100644
+index 610bc35..13e0713 100644
 --- a/libmalcontent/tests/meson.build
 +++ b/libmalcontent/tests/meson.build
-@@ -61,9 +61,9 @@ test_programs = [
+@@ -72,9 +72,9 @@ test_programs = [
    ], deps],
  ]
  
@@ -14,7 +14,7 @@ index a8a815a..0b1d242 100644
                                       'libmalcontent-' + libmalcontent_api_version)
  
  foreach program: test_programs
-@@ -94,4 +94,4 @@ foreach program: test_programs
+@@ -105,4 +105,4 @@ foreach program: test_programs
      env: envs,
      args: ['--tap'],
    )
@@ -22,14 +22,32 @@ index a8a815a..0b1d242 100644
 \ No newline at end of file
 +endforeach
 diff --git a/meson_options.txt b/meson_options.txt
-index 96a517d..7cb1ee8 100644
+index 06329d4..72aa505 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -3,4 +3,5 @@ option(
-   type: 'boolean',
-   value: false,
-   description: 'enable installed tests'
--)
-\ No newline at end of file
+@@ -9,3 +9,9 @@ option(
+   type: 'string',
+   description: 'directory for PAM modules'
+ )
++option(
++  'installed_test_prefix',
++  type: 'string',
++  value: '',
++  description: 'Prefix for installed tests'
 +)
-+option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests')
+diff --git a/pam/tests/meson.build b/pam/tests/meson.build
+index 0560dcb..a74dab2 100644
+--- a/pam/tests/meson.build
++++ b/pam/tests/meson.build
+@@ -12,9 +12,9 @@ test_programs = [
+   ['pam_malcontent', [], deps],
+ ]
+ 
+-installed_tests_metadir = join_paths(datadir, 'installed-tests',
++installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests',
+                                      'libmalcontent-' + libmalcontent_api_version)
+-installed_tests_execdir = join_paths(libexecdir, 'installed-tests',
++installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests',
+                                      'libmalcontent-' + libmalcontent_api_version)
+ 
+ foreach program: test_programs
diff --git a/pkgs/development/libraries/malcontent/use-system-dependencies.patch b/pkgs/development/libraries/malcontent/use-system-dependencies.patch
index 315bfe5ec109..8920b1f4a999 100644
--- a/pkgs/development/libraries/malcontent/use-system-dependencies.patch
+++ b/pkgs/development/libraries/malcontent/use-system-dependencies.patch
@@ -1,8 +1,8 @@
 diff --git a/meson.build b/meson.build
-index f4a05ba..dd31537 100644
+index 3575224..0abea63 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -33,9 +33,8 @@ polkit_gobject = dependency('polkit-gobject-1')
+@@ -40,9 +40,8 @@ polkit_gobject = dependency('polkit-gobject-1')
  polkitpolicydir = polkit_gobject.get_pkgconfig_variable('policydir',
    define_variable: ['prefix', prefix])
  
@@ -13,10 +13,3 @@ index f4a05ba..dd31537 100644
    fallback: ['libglib-testing', 'libglib_testing_dep'],
  )
  
-@@ -120,4 +119,4 @@ test_env = [
- 
- subdir('accounts-service')
- subdir('malcontent-client')
--subdir('libmalcontent')
-\ No newline at end of file
-+subdir('libmalcontent')

From 82fc5b2eedadfa1d2f59a8a2a5270d41c15674fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Fri, 21 Feb 2020 10:06:49 +0100
Subject: [PATCH 2734/4636] flatpak: prevent cycle with malcontent

The alternative is having malcontent depend on a flatpak without the
malcontent dependency.
---
 pkgs/development/libraries/flatpak/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index 205bcd7c600d..3788974e1244 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -36,7 +36,6 @@
 , desktop-file-utils
 , gtk3
 , fuse
-, malcontent
 , nixosTests
 , libsoup
 , lzma
@@ -140,7 +139,6 @@ stdenv.mkDerivation rec {
     systemd
     xorg.libXau
     fuse
-    malcontent
     gsettings-desktop-schemas
     glib-networking
     librsvg # for flatpak-validate-icon

From 31dd8332bc6f2dd0035f99feab95a82799183ae6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 10 Mar 2020 23:18:47 +0100
Subject: [PATCH 2735/4636] nixos/malcontent: init

---
 nixos/modules/module-list.nix                 |  1 +
 .../modules/services/desktops/malcontent.nix  | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 nixos/modules/services/desktops/malcontent.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e70a853624bf..917840fb9195 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -297,6 +297,7 @@
   ./services/desktops/geoclue2.nix
   ./services/desktops/gsignond.nix
   ./services/desktops/gvfs.nix
+  ./services/desktops/malcontent.nix
   ./services/desktops/pipewire.nix
   ./services/desktops/gnome3/at-spi2-core.nix
   ./services/desktops/gnome3/chrome-gnome-shell.nix
diff --git a/nixos/modules/services/desktops/malcontent.nix b/nixos/modules/services/desktops/malcontent.nix
new file mode 100644
index 000000000000..416464cbe08f
--- /dev/null
+++ b/nixos/modules/services/desktops/malcontent.nix
@@ -0,0 +1,32 @@
+# Malcontent daemon.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.malcontent = {
+
+      enable = mkEnableOption "Malcontent";
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf config.services.malcontent.enable {
+
+    environment.systemPackages = [ pkgs.malcontent ];
+
+    services.dbus.packages = [ pkgs.malcontent ];
+
+  };
+
+}

From 0aec2cdd0816e9cdf30f43c026db87e2792e1782 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Tue, 10 Mar 2020 23:35:15 +0100
Subject: [PATCH 2736/4636] nginxModules.fastcgi-cache-purge: 2.3 -> 2.5

switch to a fork that seems sort of alive
---
 pkgs/servers/http/nginx/modules.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index b5282d862af6..167829669440 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -80,10 +80,10 @@ in
 
   fastcgi-cache-purge = {
     src = fetchFromGitHub {
-      owner  = "FRiCKLE";
+      owner  = "nginx-modules";
       repo   = "ngx_cache_purge";
-      rev    = "2.3";
-      sha256 = "0ib2jrbjwrhvmihhnzkp4w87fxssbbmmmj6lfdwpm6ni8p9g60dw";
+      rev    = "2.5";
+      sha256 = "1f4kxagzvz10vqbcjwi57wink6xw3s1h7wlrrlrlpkmhfbf9704y";
     };
   };
 

From c16d5b6534321ee0495e1e42fcc1b7e0baa06b62 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 10 Mar 2020 20:19:24 +0100
Subject: [PATCH 2737/4636] suitesparse: do not build Mongoose & GraphBLAS

We already have package for them
---
 .../libraries/science/math/suitesparse/default.nix         | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index 5786ae49ee57..4eb3264b2af2 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -3,7 +3,6 @@
 , gfortran
 , openblas
 , metis
-, cmake
 , fixDarwinDylibNames
 , gnum4
 , enableCuda ? false
@@ -24,7 +23,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    cmake
     gnum4
   ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
@@ -34,13 +32,14 @@ stdenv.mkDerivation rec {
     gfortran.cc.lib
   ] ++ stdenv.lib.optional enableCuda cudatoolkit;
 
-  dontUseCmakeConfigure = true;
-
   preConfigure = ''
     mkdir -p $out/lib
     mkdir -p $dev/include
     mkdir -p $doc/share/doc/${pname}-${version}
 
+    # Mongoose and GraphBLAS are packaged separately
+    sed -i "Makefile" -e '/GraphBLAS\|Mongoose/d'
+
     sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
         -e '/CHOLMOD_CONFIG ?=/ s/$/ -DNPARTITION/'
   ''

From 9e0cfc5099653f8305d578343296d9765c36bc62 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Mar 2020 02:03:33 +0000
Subject: [PATCH 2738/4636] librelp: 1.4.0 -> 1.5.0

---
 pkgs/development/libraries/librelp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix
index bcc3e16dae89..17f9537e418a 100644
--- a/pkgs/development/libraries/librelp/default.nix
+++ b/pkgs/development/libraries/librelp/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "librelp";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "rsyslog";
     repo = "librelp";
     rev = "v${version}";
-    sha256 = "1q0k8zm7p6wpkri419kkpz734lp1hnxfqx1aa3xys4pj7zgx9jck";
+    sha256 = "1il8dany6y981ficrwnxjlc13v5lj6gqia5678p5pj6bcbq7l7lb";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];

From b552b84ae29628b2574da116b9736e90f12485df Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 11 Mar 2020 03:24:33 +0100
Subject: [PATCH 2739/4636] suitesparse: ultimate clean-up
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Switch to default buildPhase & installPhase
* In preConfigure
	* Do not add -DNPARTITION to CHOLMOD_CONFIG. That would disable the use of Metis but we already have that.
	* Do not remove -lrt on Darwin, Darwin compiler can handle that and the code no longer exists anyway.
	* With CUDA enabled
		* Do not replace CUDA_ROOT. It does not exist any more. Instead we are setting CUDA_PATH in makeFlags.
		* Do not replace GPU_BLAS_PATH, it defaults to CUDA_PATH so it will end up with the same value.
		* Do not add -DCHOLMOD_OMP_NUM_THREADS to GPU_CONFIG. Why would be having the library use the same number of threads as the builder a good idea?
		* Do not replace CUDA_PATH, we are setting it in makeFlags now.
		* Do not replace CUDART_LIB and CUBLAS_LIB. They were being replaced incorrectly (cuda libs are located in lib directory, not lib64). Instead set the correct paths in makeFlags.
		* Do not replace CUDA_INC_PATH. Its default looks like it will end up with the same value.
		* Do not replace NV20, NV30, NV35 – not used any more.
		* Do not replace NVCC, defaults to the same.
		* Do not replace NVCCFLAGS, we just used the default from SourceSparse 4.4.7 with -gencode=arch=compute_60,code=compute_60 tacked on top. Current upstream default looks much better.
* Stop adding -DNTIMER to CFLAGS on Darwin – clock_gettime is supported by macOS 10.12 SDK.
* In buildPhase
	* Move the make arguments to makeFlags and library to buildFlags, allowing us to drop the manual make call. I did not verify all of these are still needed.
	* Remove the creation of libsuitesparse.so. As far as I could tell it is some kind of remnant of our old expression – perhaps due to past deficiencies of the build scripts, we created the individual libraries as symlinks to libsuitesparse.so: https://github.com/NixOS/nixpkgs/commit/e36b3ec0a56c3b06152a205a46804733b88695d6 But since the build script can now build individual .so libraries, there should be no need for this abomination. No other distros do this either.
* In installPhase
	* No need to copy things manually, there is an install target. We just need to pass INSTALL=$out flag to make to let it know where to install the files.
	* I do not have means of verifying the darwin dylib name fix but it looks like it might be fixed in an upcoming release.
	* I dropped the rpath fixup as it does not seem to be needed any more (ldd does not report any unresolved libraries).
---
 .../science/math/suitesparse/default.nix      | 98 ++++---------------
 1 file changed, 21 insertions(+), 77 deletions(-)

diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index 4eb3264b2af2..f4adafd0f387 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -33,80 +33,33 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optional enableCuda cudatoolkit;
 
   preConfigure = ''
-    mkdir -p $out/lib
-    mkdir -p $dev/include
-    mkdir -p $doc/share/doc/${pname}-${version}
-
     # Mongoose and GraphBLAS are packaged separately
     sed -i "Makefile" -e '/GraphBLAS\|Mongoose/d'
-
-    sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
-        -e '/CHOLMOD_CONFIG ?=/ s/$/ -DNPARTITION/'
-  ''
-  + stdenv.lib.optionalString stdenv.isDarwin ''
-    sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
-        -e 's/^[[:space:]]*\(LIB = -lm\) -lrt/\1/'
-  ''
-  + stdenv.lib.optionalString enableCuda ''
-    sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
-        -e 's|^[[:space:]]*\(CUDA_ROOT     =\)|CUDA_ROOT = ${cudatoolkit}|' \
-        -e 's|^[[:space:]]*\(GPU_BLAS_PATH =\)|GPU_BLAS_PATH = $(CUDA_ROOT)|' \
-        -e 's|^[[:space:]]*\(GPU_CONFIG    =\)|GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS -DCHOLMOD_OMP_NUM_THREADS=$(NIX_BUILD_CORES) |' \
-        -e 's|^[[:space:]]*\(CUDA_PATH     =\)|CUDA_PATH = $(CUDA_ROOT)|' \
-        -e 's|^[[:space:]]*\(CUDART_LIB    =\)|CUDART_LIB = $(CUDA_ROOT)/lib64/libcudart.so|' \
-        -e 's|^[[:space:]]*\(CUBLAS_LIB    =\)|CUBLAS_LIB = $(CUDA_ROOT)/lib64/libcublas.so|' \
-        -e 's|^[[:space:]]*\(CUDA_INC_PATH =\)|CUDA_INC_PATH = $(CUDA_ROOT)/include/|' \
-        -e 's|^[[:space:]]*\(NV20          =\)|NV20 = -arch=sm_20 -Xcompiler -fPIC|' \
-        -e 's|^[[:space:]]*\(NV30          =\)|NV30 = -arch=sm_30 -Xcompiler -fPIC|' \
-        -e 's|^[[:space:]]*\(NV35          =\)|NV35 = -arch=sm_35 -Xcompiler -fPIC|' \
-        -e 's|^[[:space:]]*\(NVCC          =\) echo|NVCC = $(CUDA_ROOT)/bin/nvcc|' \
-        -e 's|^[[:space:]]*\(NVCCFLAGS     =\)|NVCCFLAGS = $(NV20) -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35 -gencode=arch=compute_60,code=sm_60|'
   '';
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-DNTIMER";
+  makeFlags = [
+    "INSTALL=${placeholder "out"}"
+    "INSTALL_INCLUDE=${placeholder "dev"}/include"
+    "JOBS=$(NIX_BUILD_CORES)"
+    "BLAS=-lopenblas"
+    "MY_METIS_LIB=-lmetis"
+    "LAPACK="
+  ] ++ stdenv.lib.optionals openblas.blas64 [
+    "CFLAGS=-DBLAS64"
+  ] ++ stdenv.lib.optionals enableCuda [
+    "CUDA_PATH=${cudatoolkit}"
+    "CUDART_LIB=${cudatoolkit.lib}/lib/libcudart.so"
+    "CUBLAS_LIB=${cudatoolkit}/lib/libcublas.so"
+  ];
 
-  buildPhase = ''
-    runHook preBuild
+  buildFlags = [
+    # Build individual shared libraries, not demos
+    "library"
+  ];
 
-    # Build individual shared libraries
-    make library        \
-        JOBS=$NIX_BUILD_CORES \
-        BLAS=-lopenblas \
-        MY_METIS_LIB=-lmetis \
-        LAPACK=""       \
-        ${stdenv.lib.optionalString openblas.blas64 "CFLAGS=-DBLAS64"}
-
-    # Build libsuitesparse.so which bundles all the individual libraries.
-    # Bundling is done by building the static libraries, extracting objects from
-    # them and combining the objects into one shared library.
-    mkdir -p static
-    make static JOBS=$NIX_BUILD_CORES \
-        MY_METIS_LIB=-lmetis \
-        AR_TARGET=$(pwd)/static/'$(LIBRARY).a'
-    (
-        cd static
-        for i in lib*.a; do
-          ar -x $i
-        done
-    )
-    ${if enableCuda then "${cudatoolkit}/bin/nvcc" else "${stdenv.cc.outPath}/bin/cc"} \
-        static/*.o                                                                     \
-        ${if stdenv.isDarwin then "-dynamiclib" else "--shared"}                       \
-        -o "lib/libsuitesparse${stdenv.hostPlatform.extensions.sharedLibrary}"         \
-        -lopenblas                                                                     \
-        ${stdenv.lib.optionalString enableCuda "-lcublas"}
-
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    cp -r lib $out/
-    cp -r include $dev/
-    cp -r share $doc/
-  ''
-  + stdenv.lib.optionalString stdenv.isDarwin ''
+  # Likely fixed after 5.7.1
+  # https://github.com/DrTimothyAldenDavis/SuiteSparse/commit/f6daae26ee391e475e2295e77c839aa7c1a8b784
+  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
     # The fixDarwinDylibNames in nixpkgs can't seem to fix all the libraries.
     # We manually fix them up here.
     fixDarwinDylibNames() {
@@ -125,15 +78,6 @@ stdenv.mkDerivation rec {
     }
 
     fixDarwinDylibNames $(find "$out" -name "*.dylib")
-  ''
-  + stdenv.lib.optionalString (!stdenv.isDarwin) ''
-    # Fix rpaths
-    cd $out
-    find -name \*.so\* -type f -exec \
-      patchelf --set-rpath "$out/lib:${stdenv.lib.makeLibraryPath buildInputs}" {} \;
-  ''
-  + ''
-    runHook postInstall
   '';
 
   meta = with stdenv.lib; {

From b310986a9eb6bc7bf16e18d6979fcf7d782e526f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Mar 2020 05:21:25 +0000
Subject: [PATCH 2740/4636] mkvtoolnix: 43.0.0 -> 44.0.0

---
 pkgs/applications/video/mkvtoolnix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 7ccf0e24762a..c5eafe94c787 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -13,13 +13,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "mkvtoolnix";
-  version = "43.0.0";
+  version = "44.0.0";
 
   src = fetchFromGitLab {
     owner  = "mbunkus";
     repo   = "mkvtoolnix";
     rev    = "release-${version}";
-    sha256 = "0ra9kgvhh5yhbr0hsia1va5lw45zr4kdwcdjhas5ljjyj75mlyxc";
+    sha256 = "072sw51svaizqi9f6kscic23wxcjarwgb7nv52yd5si5w8s0qh9r";
   };
 
   nativeBuildInputs = [

From e3e53adc35d1a45d3849d6246a3dc9c2ec296122 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Mar 2020 05:46:33 +0000
Subject: [PATCH 2741/4636] moodle: 3.8.1 -> 3.8.2

---
 pkgs/servers/web-apps/moodle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix
index 3de6005a3cf3..98bd8e0027f4 100644
--- a/pkgs/servers/web-apps/moodle/default.nix
+++ b/pkgs/servers/web-apps/moodle/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, writeText }:
 
 let
-  version = "3.8.1";
+  version = "3.8.2";
   stableVersion = builtins.substring 0 2 (builtins.replaceStrings ["."] [""] version);
 in
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz";
-    sha256 = "1xz2wq16blw9p2b6wlrn9lr524gddm5jyac5prka8kp6lrk0v0y1";
+    sha256 = "134vxsbslk7sfalmgcp744aygaxz2k080d14j8nkivk9zhplds53";
   };
 
   phpConfig = writeText "config.php" ''

From 5a93edc108d1761e4ebcb6d9089df89154ca8703 Mon Sep 17 00:00:00 2001
From: Stewart Mackenzie <sjm@fractalide.com>
Date: Wed, 11 Mar 2020 14:28:51 +0800
Subject: [PATCH 2742/4636] seabreeze: udev rules not installed

fixes #82229
---
 pkgs/development/python-modules/seabreeze/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix
index 8555c024c76a..7cf062765d3b 100644
--- a/pkgs/development/python-modules/seabreeze/default.nix
+++ b/pkgs/development/python-modules/seabreeze/default.nix
@@ -6,8 +6,9 @@
 }:
 
 ## Usage
-# In NixOS, simply add the `udev` multiple output to services.udev.packages:
-#   services.udev.packages = [ pkgs.python3Packages.seabreeze.udev ];
+# In NixOS, add the package to services.udev.packages for non-root plugdev
+# users to get device access permission:
+#    services.udev.packages = [ pkgs.python3Packages.seabreeze ];
 
 buildPythonPackage rec {
   pname = "seabreeze";
@@ -20,11 +21,9 @@ buildPythonPackage rec {
     sha256 = "0bc2s9ic77gz9m40w89snixphxlzib60xa4f49n4zasjrddfz1l8";
   };
 
-  outputs = [ "out" "udev" ];
-
   postInstall = ''
-    mkdir -p $udev/lib/udev/rules.d
-    cp misc/10-oceanoptics.rules $udev/lib/udev/rules.d/10-oceanoptics.rules
+    mkdir -p $out/etc/udev/rules.d
+    cp misc/10-oceanoptics.rules $out/etc/udev/rules.d/10-oceanoptics.rules
   '';
 
   # underlying c libraries are tested and fail

From f8bf6f087e4960d3b9c925bd2f6d9f96e621d7a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Wed, 11 Mar 2020 08:03:54 +0100
Subject: [PATCH 2743/4636] sqlite-analyzer: 3.31.0 -> 3.31.1

This was forgotten in PR #81648.
It's a small bump, so I just tested that it builds.
---
 pkgs/development/libraries/sqlite/analyzer.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix
index 2b287c7cc617..38eb1b158c89 100644
--- a/pkgs/development/libraries/sqlite/analyzer.nix
+++ b/pkgs/development/libraries/sqlite/analyzer.nix
@@ -6,11 +6,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "sqlite-analyzer";
-  version = "3.31.0";
+  version = "3.31.1";
 
   src = assert version == sqlite.version; fetchurl {
     url = "https://sqlite.org/2020/sqlite-src-${archiveVersion version}.zip";
-    sha256 = "1dz3s3q9gsxxfj9wp4lqndzpwd1hcvm42yqn02p0l0bs6bw0mp5l";
+    sha256 = "0n7f3w59gr80s6k4l5a9bp2s97dlfapfbhb3qdhak6axhn127p7j";
   };
 
   nativeBuildInputs = [ unzip ];

From 63a92927cb2c834d425d4c583ee82140b742ba66 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 11 Mar 2020 02:20:00 -0500
Subject: [PATCH 2744/4636] jetbrains-mono: 1.0.3 -> 1.0.4

Changelog: https://github.com/JetBrains/JetBrainsMono/releases/tag/v1.0.4
---
 pkgs/data/fonts/jetbrains-mono/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/jetbrains-mono/default.nix b/pkgs/data/fonts/jetbrains-mono/default.nix
index 258114715f3b..8a7e841df672 100644
--- a/pkgs/data/fonts/jetbrains-mono/default.nix
+++ b/pkgs/data/fonts/jetbrains-mono/default.nix
@@ -1,18 +1,19 @@
 { lib, fetchzip }:
 
 let
-  version = "1.0.3";
+  version = "1.0.4";
 in
 fetchzip rec {
   name = "JetBrainsMono-${version}";
 
   url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip";
 
-  sha256 = "16am5fxvda24jfl8lb9jf8mkcqfc97scj8hvwgd3m771db0dpflf";
+  sha256 = "1m6wppz6mrh7475d92yvwrjgbwkkcfq444v0im90f5c7fsf3dzbd";
 
   postFetch = ''
     mkdir -p $out/share/fonts
     unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
+    unzip -j $downloadedFile \*.eot -d $out/share/fonts/eot
     unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff
     unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2
   '';

From b450c025d11ee0efb474431b5ed18f7fd82f7bca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 23 Feb 2020 14:27:48 +0100
Subject: [PATCH 2745/4636] lightdm-tiny-greeter: init at 1.2

---
 .../lightdm-tiny-greeter/default.nix          | 46 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix

diff --git a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix
new file mode 100644
index 000000000000..323df7369368
--- /dev/null
+++ b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, linkFarm, lightdm-tiny-greeter, fetchFromGitHub
+, pkgconfig, lightdm, gtk3, glib, wrapGAppsHook, conf ? "" }:
+
+stdenv.mkDerivation rec {
+  pname = "lightdm-tiny-greeter";
+  version = "1.2";
+
+  src = fetchFromGitHub {
+    owner = "off-world";
+    repo = "lightdm-tiny-greeter";
+    rev = version;
+    sha256 = "08azpj7b5qgac9bgi1xvd6qy6x2nb7iapa0v40ggr3d1fabyhrg6";
+  };
+
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+  buildInputs = [ lightdm gtk3 glib ];
+
+  postUnpack = if conf != "" then ''
+    cp ${builtins.toFile "config.h" conf} source/config.h
+  '' else "";
+
+  buildPhase = ''
+    mkdir -p $out/bin $out/share/xgreeters
+    make ${pname}
+    mv ${pname} $out/bin/.
+    mv lightdm-tiny-greeter.desktop $out/share/xgreeters
+  '';
+
+  installPhase = ''
+    substituteInPlace "$out/share/xgreeters/lightdm-tiny-greeter.desktop" \
+      --replace "Exec=lightdm-tiny-greeter" "Exec=$out/bin/lightdm-tiny-greeter"
+  '';
+
+  passthru.xgreeters = linkFarm "lightdm-tiny-greeter-xgreeters" [{
+    path = "${lightdm-tiny-greeter}/share/xgreeters/lightdm-tiny-greeter.desktop";
+    name = "lightdm-tiny-greeter.desktop";
+  }];
+
+  meta = with stdenv.lib; {
+    description = "A tiny multi user lightdm greeter";
+    homepage = https://github.com/off-world/lightdm-tiny-greeter;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ edwtjo ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 531b8dc2d8a8..444b02e5513e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21616,6 +21616,10 @@ in
 
   lightdm-mini-greeter = callPackage ../applications/display-managers/lightdm-mini-greeter { };
 
+  lightdm-tiny-greeter = callPackage ../applications/display-managers/lightdm-tiny-greeter {
+    conf = config.lightdm-tiny-greeter.conf or "";
+  };
+
   ly = callPackage ../applications/display-managers/ly { };
 
   slic3r = callPackage ../applications/misc/slic3r { };

From b155a62dadb04d41cc8443d189d9168ccaba30af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 23 Feb 2020 14:27:49 +0100
Subject: [PATCH 2746/4636] nixos/lightdm-tiny-greeter: init module

---
 .../lightdm-greeters/tiny.nix                 | 92 +++++++++++++++++++
 .../services/x11/display-managers/lightdm.nix |  1 +
 2 files changed, 93 insertions(+)
 create mode 100644 nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix

diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix
new file mode 100644
index 000000000000..a9ba8e6280d6
--- /dev/null
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix
@@ -0,0 +1,92 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  dmcfg = config.services.xserver.displayManager;
+  ldmcfg = dmcfg.lightdm;
+  cfg = ldmcfg.greeters.tiny;
+
+in
+{
+  options = {
+
+    services.xserver.displayManager.lightdm.greeters.tiny = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable lightdm-tiny-greeter as the lightdm greeter.
+
+          Note that this greeter starts only the default X session.
+          You can configure the default X session using
+          <xref linkend="opt-services.xserver.displayManager.defaultSession"/>.
+        '';
+      };
+
+      label = {
+        user = mkOption {
+          type = types.str;
+          default = "Username";
+          description = ''
+            The string to represent the user_text label.
+          '';
+        };
+
+        pass = mkOption {
+          type = types.str;
+          default = "Password";
+          description = ''
+            The string to represent the pass_text label.
+          '';
+        };
+      };
+
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Section to describe style and ui.
+        '';
+      };
+
+    };
+
+  };
+
+  config = mkIf (ldmcfg.enable && cfg.enable) {
+
+    services.xserver.displayManager.lightdm.greeters.gtk.enable = false;
+
+    nixpkgs.config.lightdm-tiny-greeter.conf =
+    let
+      configHeader = ''
+        #include <gtk/gtk.h>
+        static const char *user_text = "${cfg.label.user}";
+        static const char *pass_text = "${cfg.label.pass}";
+        static const char *session = "${dmcfg.defaultSession}";
+      '';
+    in
+      optionalString (cfg.extraConfig != "")
+        (configHeader + cfg.extraConfig);
+
+    services.xserver.displayManager.lightdm.greeter =
+      mkDefault {
+        package = pkgs.lightdm-tiny-greeter.xgreeters;
+        name = "lightdm-tiny-greeter";
+      };
+
+    assertions = [
+      {
+        assertion = dmcfg.defaultSession != null;
+        message = ''
+          Please set: services.xserver.displayManager.defaultSession
+        '';
+      }
+    ];
+
+  };
+}
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index f7face0adb7e..cb7b5f959588 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -77,6 +77,7 @@ in
     ./lightdm-greeters/mini.nix
     ./lightdm-greeters/enso-os.nix
     ./lightdm-greeters/pantheon.nix
+    ./lightdm-greeters/tiny.nix
   ];
 
   options = {

From 1115959a8d4d73ad73341563dc8bbf52230a281e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= <felix@alternativebit.fr>
Date: Wed, 11 Mar 2020 08:59:02 +0100
Subject: [PATCH 2747/4636] tests/networking: remove pkgs.lib usages.

---
 nixos/tests/networking.nix | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 933a4451af92..9e07db18a7bf 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -5,11 +5,10 @@
 , networkd }:
 
 with import ../lib/testing-python.nix { inherit system pkgs; };
-with pkgs.lib;
 
 let
-  router = { config, pkgs, ... }:
-    with pkgs.lib;
+  router = { config, pkgs, lib, ... }:
+    with lib;
     let
       vlanIfs = range 1 (length config.virtualisation.vlans);
     in {
@@ -85,7 +84,7 @@ let
     static = {
       name = "Static";
       nodes.router = router;
-      nodes.client = { pkgs, ... }: with pkgs.lib; {
+      nodes.client = { pkgs, lib, ... }: with lib; {
         virtualisation.vlans = [ 1 2 ];
         networking = {
           useNetworkd = networkd;
@@ -137,7 +136,7 @@ let
     dhcpSimple = {
       name = "SimpleDHCP";
       nodes.router = router;
-      nodes.client = { pkgs, ... }: with pkgs.lib; {
+      nodes.client = { pkgs, lib, ... }: with lib; {
         virtualisation.vlans = [ 1 2 ];
         networking = {
           useNetworkd = networkd;
@@ -193,7 +192,7 @@ let
     dhcpOneIf = {
       name = "OneInterfaceDHCP";
       nodes.router = router;
-      nodes.client = { pkgs, ... }: with pkgs.lib; {
+      nodes.client = { pkgs, lib, ... }: with lib; {
         virtualisation.vlans = [ 1 2 ];
         networking = {
           useNetworkd = networkd;
@@ -232,7 +231,7 @@ let
         '';
     };
     bond = let
-      node = address: { pkgs, ... }: with pkgs.lib; {
+      node = address: { pkgs, lib, ... }: with lib; {
         virtualisation.vlans = [ 1 2 ];
         networking = {
           useNetworkd = networkd;
@@ -268,7 +267,7 @@ let
         '';
     };
     bridge = let
-      node = { address, vlan }: { pkgs, ... }: with pkgs.lib; {
+      node = { address, vlan }: { pkgs, lib, ... }: with lib; {
         virtualisation.vlans = [ vlan ];
         networking = {
           useNetworkd = networkd;
@@ -281,7 +280,7 @@ let
       name = "Bridge";
       nodes.client1 = node { address = "192.168.1.2"; vlan = 1; };
       nodes.client2 = node { address = "192.168.1.3"; vlan = 2; };
-      nodes.router = { pkgs, ... }: with pkgs.lib; {
+      nodes.router = { pkgs, lib, ... }: with lib; {
         virtualisation.vlans = [ 1 2 ];
         networking = {
           useNetworkd = networkd;
@@ -318,7 +317,7 @@ let
     macvlan = {
       name = "MACVLAN";
       nodes.router = router;
-      nodes.client = { pkgs, ... }: with pkgs.lib; {
+      nodes.client = { pkgs, lib, ... }: with lib; {
         environment.systemPackages = [ pkgs.iptables ]; # to debug firewall rules
         virtualisation.vlans = [ 1 ];
         networking = {
@@ -372,7 +371,7 @@ let
         '';
     };
     sit = let
-      node = { address4, remote, address6 }: { pkgs, ... }: with pkgs.lib; {
+      node = { address4, remote, address6 }: { pkgs, lib, ... }: with lib; {
         virtualisation.vlans = [ 1 ];
         networking = {
           useNetworkd = networkd;
@@ -414,7 +413,7 @@ let
         '';
     };
     vlan = let
-      node = address: { pkgs, ... }: with pkgs.lib; {
+      node = address: { pkgs, lib, ... }: with lib; {
         #virtualisation.vlans = [ 1 ];
         networking = {
           useNetworkd = networkd;
@@ -527,7 +526,7 @@ let
           '';
         };
       };
-      nodes.client_with_privacy = { pkgs, ... }: with pkgs.lib; {
+      nodes.client_with_privacy = { pkgs, lib, ... }: with lib; {
         virtualisation.vlans = [ 1 ];
         networking = {
           useNetworkd = networkd;
@@ -540,7 +539,7 @@ let
           };
         };
       };
-      nodes.client = { pkgs, ... }: with pkgs.lib; {
+      nodes.client = { pkgs, lib, ... }: with lib; {
         virtualisation.vlans = [ 1 ];
         networking = {
           useNetworkd = networkd;
@@ -603,9 +602,9 @@ let
 
       testScript = ''
         targetIPv4Table = """
-        10.0.0.0/16 proto static scope link mtu 1500 
-        192.168.1.0/24 proto kernel scope link src 192.168.1.2 
-        192.168.2.0/24 via 192.168.1.1 proto static 
+        10.0.0.0/16 proto static scope link mtu 1500
+        192.168.1.0/24 proto kernel scope link src 192.168.1.2
+        192.168.2.0/24 via 192.168.1.1 proto static
         """.strip()
 
         targetIPv6Table = """
@@ -657,6 +656,6 @@ let
     };
   };
 
-in mapAttrs (const (attrs: makeTest (attrs // {
+in pkgs.lib.mapAttrs (pkgs.lib.const (attrs: makeTest (attrs // {
   name = "${attrs.name}-Networking-${if networkd then "Networkd" else "Scripted"}";
 }))) testCases

From 36ef112a477034fc6d1d9170bf1bcda0140a8d1d Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 11 Mar 2020 00:24:50 +0100
Subject: [PATCH 2748/4636] nixos/networkd: respect systemd.network.links also
 with disabled systemd-networkd

This mirrors the behaviour of systemd - It's udev that parses `.link`
files, not `systemd-networkd`.
---
 nixos/doc/manual/release-notes/rl-2003.xml |  8 +++
 nixos/modules/system/boot/networkd.nix     | 79 +++++++++++++---------
 nixos/tests/networking.nix                 | 25 +++++++
 3 files changed, 79 insertions(+), 33 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index 918906d27e72..b77f67b664b5 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -712,6 +712,14 @@ auth required pam_succeed_if.so uid >= 1000 quiet
      For further reference, please read <link xlink:href="https://github.com/NixOS/nixpkgs/pull/68953">#68953</link> or the corresponding <link xlink:href="https://discourse.nixos.org/t/predictable-network-interface-names-in-initrd/4055">discourse thread</link>.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     The <link linkend="opt-systemd.network.links">systemd.network.links</link> option is now respected
+     even when <link linkend="opt-systemd.network.enable">systemd-networkd</command> is disabled.
+     This mirrors the behaviour of systemd - It's udev that parses <literal>.link</literal> files,
+     not <command>systemd-networkd</command>.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 6dfbe66fc647..3078f84f6e92 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -355,6 +355,14 @@ let
   };
 
   linkOptions = commonNetworkOptions // {
+    # overwrite enable option from above
+    enable = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to enable this .link unit. It's handled by udev no matter if <command>systemd-networkd</command> is enabled or not
+      '';
+    };
 
     linkConfig = mkOption {
       default = {};
@@ -1045,44 +1053,49 @@ in
 
   };
 
-  config = mkIf config.systemd.network.enable {
+  config = mkMerge [
+    # .link units are honored by udev, no matter if systemd-networkd is enabled or not.
+    {
+      systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links;
+      environment.etc = unitFiles;
+    }
 
-    users.users.systemd-network.group = "systemd-network";
+    (mkIf config.systemd.network.enable {
 
-    systemd.additionalUpstreamSystemUnits = [
-      "systemd-networkd.service" "systemd-networkd-wait-online.service"
-    ];
+      users.users.systemd-network.group = "systemd-network";
 
-    systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links
-      // mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs
-      // mapAttrs' (n: v: nameValuePair "${n}.network" (networkToUnit n v)) cfg.networks;
+      systemd.additionalUpstreamSystemUnits = [
+        "systemd-networkd.service" "systemd-networkd-wait-online.service"
+      ];
 
-    environment.etc = unitFiles;
+      systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs
+        // mapAttrs' (n: v: nameValuePair "${n}.network" (networkToUnit n v)) cfg.networks;
 
-    systemd.services.systemd-networkd = {
-      wantedBy = [ "multi-user.target" ];
-      restartTriggers = attrNames unitFiles;
-      # prevent race condition with interface renaming (#39069)
-      requires = [ "systemd-udev-settle.service" ];
-      after = [ "systemd-udev-settle.service" ];
-    };
-
-    systemd.services.systemd-networkd-wait-online = {
-      wantedBy = [ "network-online.target" ];
-    };
-
-    systemd.services."systemd-network-wait-online@" = {
-      description = "Wait for Network Interface %I to be Configured";
-      conflicts = [ "shutdown.target" ];
-      requisite = [ "systemd-networkd.service" ];
-      after = [ "systemd-networkd.service" ];
-      serviceConfig = {
-        Type = "oneshot";
-        RemainAfterExit = true;
-        ExecStart = "${config.systemd.package}/lib/systemd/systemd-networkd-wait-online -i %I";
+      systemd.services.systemd-networkd = {
+        wantedBy = [ "multi-user.target" ];
+        restartTriggers = attrNames unitFiles;
+        # prevent race condition with interface renaming (#39069)
+        requires = [ "systemd-udev-settle.service" ];
+        after = [ "systemd-udev-settle.service" ];
       };
-    };
 
-    services.resolved.enable = mkDefault true;
-  };
+      systemd.services.systemd-networkd-wait-online = {
+        wantedBy = [ "network-online.target" ];
+      };
+
+      systemd.services."systemd-network-wait-online@" = {
+        description = "Wait for Network Interface %I to be Configured";
+        conflicts = [ "shutdown.target" ];
+        requisite = [ "systemd-networkd.service" ];
+        after = [ "systemd-networkd.service" ];
+        serviceConfig = {
+          Type = "oneshot";
+          RemainAfterExit = true;
+          ExecStart = "${config.systemd.package}/lib/systemd/systemd-networkd-wait-online -i %I";
+        };
+      };
+
+      services.resolved.enable = mkDefault true;
+    })
+  ];
 }
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 9e07db18a7bf..a519ca065943 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -654,6 +654,31 @@ let
             ), "The IPv6 routing table has not been properly cleaned:\n{}".format(ipv6Residue)
       '';
     };
+    # even with disabled networkd, systemd.network.links should work
+    # (as it's handled by udev, not networkd)
+    link = {
+      name = "Link";
+      nodes.client = { pkgs, ... }: {
+        virtualisation.vlans = [ 1 ];
+        networking = {
+          useNetworkd = networkd;
+          useDHCP = false;
+        };
+        systemd.network.links."50-foo" = {
+          matchConfig = {
+            Name = "foo";
+            Driver = "dummy";
+          };
+          linkConfig.MTUBytes = "1442";
+        };
+      };
+      testScript = ''
+        print(client.succeed("ip l add name foo type dummy"))
+        print(client.succeed("stat /etc/systemd/network/50-foo.link"))
+        client.succeed("udevadm settle")
+        assert "mtu 1442" in client.succeed("ip l show dummy0")
+      '';
+    };
   };
 
 in pkgs.lib.mapAttrs (pkgs.lib.const (attrs: makeTest (attrs // {

From 3d1079a20dafd82fac7ac857e63c91e787f4eaaa Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 11 Mar 2020 00:26:51 +0100
Subject: [PATCH 2749/4636] nixos/zerotierone: switch from manually generating
 the .link file to use the module

Previously, systemd.network.links was only respected with networkd
enabled, but it's really udev taking care of links, no matter if
networkd is enabled or not.

With our module fixed, there's no need to manually manage the text file
anymore.
---
 .../modules/services/networking/zerotierone.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix
index 042c4d5adddd..cf39ed065a76 100644
--- a/nixos/modules/services/networking/zerotierone.nix
+++ b/nixos/modules/services/networking/zerotierone.nix
@@ -69,13 +69,14 @@ in
     environment.systemPackages = [ cfg.package ];
 
     # Prevent systemd from potentially changing the MAC address
-    environment.etc."systemd/network/50-zerotier.link".text = ''
-      [Match]
-      OriginalName=zt*
-
-      [Link]
-      AutoNegotiation=false
-      MACAddressPolicy=none
-    '';
+    systemd.network.links."50-zerotier" = {
+      matchConfig = {
+        OriginalName = "zt*";
+      };
+      linkConfig = {
+        AutoNegotiation = false;
+        MACAddressPolicy = "none";
+      };
+    };
   };
 }

From 5f77ff63849396c2b0dd243c0bb9fdae13c0fab6 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Wed, 11 Mar 2020 02:04:46 -0400
Subject: [PATCH 2750/4636] buildGoModule: passthru the modSha256 (#82027)

The builder does not technically need the modSha256 of the vendor dir, and even
though we pass it the entire vendor dir it makes sense not to risk having an
accidental dependency on that variable.

However, tools like [nixpkgs-update](https://github.com/ryantm/nixpkgs-update)
need to inspect the `modSha256` of a package in order to be able to update them,
and since this is a real part of the package (describes info about its
dependencies) let's add it to `passthru`.

Specifically, this allows us to run a cmd like `nix eval -f . tflint.modSha256`
to get the current value, which is how the bot finds it to replace with the new
version in the Rust ecosystem.
---
 pkgs/development/go-modules/generic/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 1bffb71e8f9d..1bf13c18821e 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -210,7 +210,7 @@ let
 
     disallowedReferences = lib.optional (!allowGoReference) go;
 
-    passthru = passthru // { inherit go go-modules; };
+    passthru = passthru // { inherit go go-modules modSha256; };
 
     meta = {
       # Add default meta information

From 8ec473fbc9d6616a3fd8048487164176b4968d96 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Mar 2020 10:48:17 +0000
Subject: [PATCH 2751/4636] pcsctools: 1.5.5 -> 1.5.6

---
 pkgs/tools/security/pcsctools/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix
index fa53b91a02f1..c9c677e64c02 100644
--- a/pkgs/tools/security/pcsctools/default.nix
+++ b/pkgs/tools/security/pcsctools/default.nix
@@ -5,11 +5,11 @@
 let deps = lib.makeBinPath [ wget coreutils ];
 
 in stdenv.mkDerivation rec {
-  name = "pcsc-tools-1.5.5";
+  name = "pcsc-tools-1.5.6";
 
   src = fetchurl {
     url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/${name}.tar.bz2";
-    sha256 = "01251m8hf7by8rw8fayhjxmcqvi6dp150680fpf89bqycha2vgqv";
+    sha256 = "1a2zd06c6s4sqlpm5801gj41gh5g62jb8srd7vhlcm70hg3l3nsy";
   };
 
   buildInputs = [ udev dbus perlPackages.perl pcsclite ];
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Tools used to test a PC/SC driver, card or reader";
-    homepage = http://ludovic.rousseau.free.fr/softwares/pcsc-tools/;
+    homepage = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ ];
     platforms = platforms.linux;

From 93a0ec6b594ebcf2ce317fbfdb71efa661b4dd1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 11 Mar 2020 10:49:33 +0000
Subject: [PATCH 2752/4636] home-assistant: fix parse-requirements.py for newer
 home-assistant versions

---
 pkgs/servers/home-assistant/parse-requirements.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py
index 65c2bcfbfd45..a5c6e9d09614 100755
--- a/pkgs/servers/home-assistant/parse-requirements.py
+++ b/pkgs/servers/home-assistant/parse-requirements.py
@@ -53,7 +53,7 @@ def get_version():
         return m.group(1)
 
 
-def parse_components(version="master"):
+def parse_components(version: str = "master"):
     components = {}
     with tempfile.TemporaryDirectory() as tmp:
         with urlopen(
@@ -61,14 +61,13 @@ def parse_components(version="master"):
         ) as response:
             tarfile.open(fileobj=BytesIO(response.read())).extractall(tmp)
         # Use part of a script from the Home Assistant codebase
-        sys.path.append(os.path.join(tmp, f"home-assistant-{version}"))
+        core_path = os.path.join(tmp, f"core-{version}")
+        sys.path.append(core_path)
         from script.hassfest.model import Integration
 
         integrations = Integration.load_dir(
             pathlib.Path(
-                os.path.join(
-                    tmp, f"home-assistant-{version}", "homeassistant/components"
-                )
+                os.path.join(core_path, "homeassistant/components")
             )
         )
         for domain in sorted(integrations):

From 3ed91d2f60b69be7a26be45a3b020ad14493a7a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 11 Mar 2020 10:51:33 +0000
Subject: [PATCH 2753/4636] homeassistant: 0.106.1 -> 0.106.6

---
 pkgs/servers/home-assistant/component-packages.nix | 3 ++-
 pkgs/servers/home-assistant/default.nix            | 4 ++--
 pkgs/servers/home-assistant/frontend.nix           | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 2b2bdabc6265..6b18dd30f308 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "0.106.1";
+  version = "0.106.6";
   components = {
     "abode" = ps: with ps; [ ]; # missing inputs: abodepy
     "acer_projector" = ps: with ps; [ pyserial];
@@ -124,6 +124,7 @@
     "configurator" = ps: with ps; [ ];
     "conversation" = ps: with ps; [ aiohttp-cors];
     "coolmaster" = ps: with ps; [ ]; # missing inputs: pycoolmasternet
+    "coronavirus" = ps: with ps; [ ]; # missing inputs: coronavirus
     "counter" = ps: with ps; [ ];
     "cover" = ps: with ps; [ ];
     "cppm_tracker" = ps: with ps; [ ]; # missing inputs: clearpasspy
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 9f7b3fed4a56..2b571fe96bfc 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -67,7 +67,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.106.1";
+  hassVersion = "0.106.6";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -84,7 +84,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "0i261hzjfhqnq7j8dwsnj2h2vmr4vnxkvk2ff910am1knzni3a2z";
+    sha256 = "11kv5lmm8nxp7yv3w43mzmgzkafddy0z6wl2878p96iyil1w7qhb";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index f297212442c3..1446518fbc5c 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -4,11 +4,11 @@ buildPythonPackage rec {
   # the frontend version corresponding to a specific home-assistant version can be found here
   # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
   pname = "home-assistant-frontend";
-  version = "20200220.4";
+  version = "20200220.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0cb8b6xizxz1q5r0qgwsqs53va9bxdqnp4vwf5lh8ppv9zy7hssc";
+    sha256 = "0nc44r5ybq0prsz2yid622i0xr7q0qrc4ymbk69bqg6jrmjpbdl1";
   };
 
   # no Python tests implemented

From 766f89de3a9ac5b2ee6ab625f798fe53d9f60982 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Wed, 11 Mar 2020 12:43:50 +0100
Subject: [PATCH 2754/4636] duplicity: 0.8.10 -> 0.8.11.1596

---
 pkgs/tools/backup/duplicity/default.nix | 26 ++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index 0d4e098129a6..e49d87c697cf 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -11,28 +11,25 @@
 , rsync
 , backblaze-b2
 , makeWrapper
+, gettext
 }:
-
+let
+  inherit (stdenv.lib.versions) majorMinor splitVersion;
+  majorMinorPatch = v: builtins.concatStringsSep "." (stdenv.lib.take 3 (splitVersion v));
+in
 pythonPackages.buildPythonApplication rec {
   pname = "duplicity";
-  version = "0.8.10";
+  version = "0.8.11.1596";
 
   src = fetchurl {
-    url = "https://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${pname}-${version}fin1558.tar.gz";
-    sha256 = "13apmavdc2cx3wxv2ymy97c575hc37xjhpa6b4sds8fkx2vrb0mh";
+    url = "https://code.launchpad.net/duplicity/${majorMinor version}-series/${majorMinorPatch version}/+download/duplicity-${version}.tar.gz";
+    sha256 = "1qdaaybwdc13nfwnwrqij4lc23iwy73lyqn5lb4iznq6axp6m0h9";
   };
 
   patches = [
     # We use the tar binary on all platforms.
     ./gnutar-in-test.patch
 
-    # Make test respect TMPDIR env var.
-    # https://bugs.launchpad.net/duplicity/+bug/1862672
-    (fetchurl {
-      url = "https://launchpadlibrarian.net/464404371/0001-Make-LogTest-respect-TMPDIR-env-variable.patch";
-      hash = "sha256-wdy8mMurLhBS0ZTXmlIGGrIkS2gGBDwTp7TRxTSXBGo=";
-    })
-
     # Our Python infrastructure runs test in installCheckPhase so we need
     # to make the testing code stop assuming it is run from the source directory.
     ./use-installed-scripts-in-test.patch
@@ -40,10 +37,13 @@ pythonPackages.buildPythonApplication rec {
     ./linux-disable-timezone-test.patch
   ];
 
+  nativeBuildInputs = [
+    makeWrapper
+    gettext
+    pythonPackages.wrapPython
+  ];
   buildInputs = [
     librsync
-    makeWrapper
-    pythonPackages.wrapPython
   ];
 
   propagatedBuildInputs = [

From 78b0222cb20c8d641433aded1b8408106e5b42e3 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Wed, 11 Mar 2020 07:42:22 -0400
Subject: [PATCH 2755/4636] tomcat7: 7.0.92 -> 7.0.100

---
 pkgs/servers/http/tomcat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 38b4974e1554..64843febdd6b 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -32,8 +32,8 @@ let
 in {
   tomcat7 = common {
     versionMajor = "7";
-    versionMinor = "0.92";
-    sha256 = "0j015mf15drl92kvgyi1ppzjziw0k1rwvfnih8r20h92ylk8mznk";
+    versionMinor = "0.100";
+    sha256 = "0wjjnvxjz0xbnsfgyp0xc7nlij4z093v54hg59vww2nmkz5mg01v";
   };
 
   tomcat8 = common {

From 22f24f785961a9db7399ca43136e8f57dfa94700 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Wed, 11 Mar 2020 07:48:13 -0400
Subject: [PATCH 2756/4636] tomcat8: 8.5.42 -> 8.5.51

---
 pkgs/servers/http/tomcat/default.nix | 10 ++--------
 pkgs/top-level/aliases.nix           |  1 +
 pkgs/top-level/all-packages.nix      |  1 -
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 64843febdd6b..8a8e4524c39f 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -38,14 +38,8 @@ in {
 
   tomcat8 = common {
     versionMajor = "8";
-    versionMinor = "0.53";
-    sha256 = "1ymp5n6xjqzpqjjlwql195v8r5fsmry7nfax46bafkjw8b24g80r";
-  };
-
-  tomcat85 = common {
-    versionMajor = "8";
-    versionMinor = "5.42";
-    sha256 = "1d90abwwvl0ghr0g0drk48j37wr2zgw74vws9z2rshyzrwgbvgp3";
+    versionMinor = "5.51";
+    sha256 = "1zmg0hi4nw4y5sknd0jgq9lb3bncjjscay5fdiiq3qh5cs0wsvl3";
   };
 
   tomcat9 = common {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3a504f20d944..8dcc12236b61 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -487,6 +487,7 @@ mapAliases ({
   tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03
   tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-04-03
   tftp_hpa = tftp-hpa; # added 2015-04-03
+  tomcat85 = tomcat8; # added 2020-03-11
   torbrowser = tor-browser-bundle-bin; # added 2017-04-05
   transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned.";
   trang = jing-trang; # added 2018-04-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 444b02e5513e..ac2fe5c4674c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16009,7 +16009,6 @@ in
   inherit (callPackages ../servers/http/tomcat { })
     tomcat7
     tomcat8
-    tomcat85
     tomcat9;
 
   tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { };

From 46e7580f247341130432bf710b43e938b01db0c8 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Wed, 11 Mar 2020 07:50:05 -0400
Subject: [PATCH 2757/4636] tomcat9: 9.0.21 -> 9.0.31

---
 pkgs/servers/http/tomcat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 8a8e4524c39f..3908db5ea71c 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -44,7 +44,7 @@ in {
 
   tomcat9 = common {
     versionMajor = "9";
-    versionMinor = "0.21";
-    sha256 = "0nsylbqvky4pf3wpsx3a29b85lvwk91ay37mljk9636qffjj1vjh";
+    versionMinor = "0.31";
+    sha256 = "0hybcy280qhhp9if58xw0rmyyqz1m1bzby7qnwz3y2wc1y4is48v";
   };
 }

From 063795f3f553f5718c037f6eada2c5a7e3c5a584 Mon Sep 17 00:00:00 2001
From: Thomaz Leite <thomaz@actor.com.br>
Date: Wed, 11 Mar 2020 09:03:28 -0300
Subject: [PATCH 2758/4636] maintainers: add thmzlt

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 574619b2b31f..aefc4c00389a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7253,6 +7253,12 @@
     githubId = 844343;
     name = "Thiago K. Okada";
   };
+  thmzlt = {
+    email = "git@thomazleite.com";
+    github = "thmzlt";
+    githubId = 7709;
+    name = "Thomaz Leite";
+  };
   ThomasMader = {
     email = "thomas.mader@gmail.com";
     github = "ThomasMader";

From 704e60443af4f58c3b3c1a4e5ce99dd971701e6c Mon Sep 17 00:00:00 2001
From: Thomaz Leite <thomaz@actor.com.br>
Date: Wed, 11 Mar 2020 09:03:55 -0300
Subject: [PATCH 2759/4636] hobbes: init at unstable-2020-03-10

---
 pkgs/development/tools/hobbes/default.nix | 39 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/tools/hobbes/default.nix

diff --git a/pkgs/development/tools/hobbes/default.nix b/pkgs/development/tools/hobbes/default.nix
new file mode 100644
index 000000000000..b480d673a691
--- /dev/null
+++ b/pkgs/development/tools/hobbes/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, cmake, llvm_6, ncurses, readline, zlib }:
+
+stdenv.mkDerivation {
+  name = "hobbes";
+  version = "unstable-2020-03-10";
+
+  src = fetchFromGitHub {
+    owner = "morgan-stanley";
+    repo = "hobbes";
+    rev = "ae956df9da3f3b24630bc1757dfaa2a8952db07a";
+    sha256 = "1a0lb87vb0qcp5wy6swk4jcc88l7vhy6iflsk7zplw547mbjhjsy";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    llvm_6 # LLVM 6 is latest currently supported. See https://git.io/JvK6w.
+    ncurses
+    readline
+    zlib
+  ];
+
+  doCheck = false; # Running tests in NixOS hangs. See https://git.io/JvK7R.
+  checkTarget = "test";
+
+  meta = with stdenv.lib; {
+    description = "A language and an embedded JIT compiler";
+    longDescription = ''
+      Hobbes is a a language, embedded compiler, and runtime for efficient
+      dynamic expression evaluation, data storage and analysis.
+    '';
+    homepage = "https://github.com/Morgan-Stanley/hobbes";
+    license = licenses.asl20;
+    maintainers = [ maintainers.thmzlt ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 531b8dc2d8a8..6c15f1c5e7ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -171,6 +171,8 @@ in
 
   deadcode = callPackage ../development/tools/deadcode { };
 
+  hobbes = callPackage ../development/tools/hobbes { stdenv = gcc6Stdenv; }; # GCC 6 is latest currently supported. See https://git.io/JvK6M.
+
   proto-contrib = callPackage ../development/tools/proto-contrib {};
 
   protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {};

From 9c4f24a63e7cfe574ccc5a74b7f7b1b4b2444e67 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 11 Mar 2020 13:53:15 +0100
Subject: [PATCH 2760/4636] meson: add jtojnar to maintainers

---
 pkgs/development/tools/build-managers/meson/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index f9f4c344e322..2930cc79374b 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -98,7 +98,7 @@ python3Packages.buildPythonApplication rec {
     homepage = https://mesonbuild.com;
     description = "SCons-like build system that use python as a front-end language and Ninja as a building backend";
     license = licenses.asl20;
-    maintainers = with maintainers; [ mbe rasendubi ];
+    maintainers = with maintainers; [ jtojnar mbe rasendubi ];
     platforms = platforms.all;
   };
 }

From 8b0c2cdfa95b7704b9e8e6c17f8579a35ddc2398 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Mar 2020 13:42:33 +0000
Subject: [PATCH 2761/4636] postman: 7.19.1 -> 7.20.0

---
 pkgs/development/web/postman/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix
index 647bdf6f3af9..aea451ff8ae4 100644
--- a/pkgs/development/web/postman/default.nix
+++ b/pkgs/development/web/postman/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "postman";
-  version = "7.19.1";
+  version = "7.20.0";
 
   src = fetchurl {
     url = "https://dl.pstmn.io/download/version/${version}/linux64";
-    sha256 = "1p3614lhyn0qwqj99iqclpg4xfd3x4n1m34ya79530phqrrmnsh7";
+    sha256 = "1al0kl2snbxzmprn13vbna4wyd72dya5lyfkhjgqabm4b7mign6c";
     name = "${pname}.tar.gz";
   };
 
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://www.getpostman.com;
+    homepage = "https://www.getpostman.com";
     description = "API Development Environment";
     license = licenses.postman;
     platforms = [ "x86_64-linux" ];

From e2212aee7ef3f7646f79035e91f67d5bd86afe9e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 10 Mar 2020 04:20:00 -0500
Subject: [PATCH 2762/4636] ocamlPackages.eigen: fix build on darwin

---
 pkgs/development/ocaml-modules/eigen/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/eigen/default.nix b/pkgs/development/ocaml-modules/eigen/default.nix
index 8f26213c23ae..3922b5cfec75 100644
--- a/pkgs/development/ocaml-modules/eigen/default.nix
+++ b/pkgs/development/ocaml-modules/eigen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildDune2Package, fetchFromGitHub, ctypes }:
+{ stdenv, buildDune2Package, fetchFromGitHub, ctypes, libcxx }:
 
 buildDune2Package rec {
   pname = "eigen";
@@ -13,6 +13,8 @@ buildDune2Package rec {
 
   minimumOCamlVersion = "4.02";
 
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
+
   propagatedBuildInputs = [ ctypes ];
 
   meta = with stdenv.lib; {

From d08ede042b74b8199dc748323768227b88efcf7c Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Wed, 11 Mar 2020 15:59:22 +0100
Subject: [PATCH 2763/4636] nixos: fix module paths in rename.nix

---
 nixos/modules/rename.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 2cc6c46e3581..410db8fd84e7 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -21,12 +21,12 @@ with lib;
     (mkRemovedOptionModule [ "services" "firefox" "syncserver" "group" ] "")
     (mkRemovedOptionModule [ "services" "winstone" ] "The corresponding package was removed from nixpkgs.")
     (mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.")
-    (mkRemovedOptionModule [ "environment.blcr.enable" ] "The BLCR module has been removed")
-    (mkRemovedOptionModule [ "services.beegfsEnable" ] "The BeeGFS module has been removed")
-    (mkRemovedOptionModule [ "services.beegfs" ] "The BeeGFS module has been removed")
-    (mkRemovedOptionModule [ "services.osquery" ] "The osquery module has been removed")
-    (mkRemovedOptionModule [ "services.fourStore" ] "The fourStore module has been removed")
-    (mkRemovedOptionModule [ "services.fourStoreEndpoint" ] "The fourStoreEndpoint module has been removed")
+    (mkRemovedOptionModule [ "environment" "blcr" "enable" ] "The BLCR module has been removed")
+    (mkRemovedOptionModule [ "services" "beegfsEnable" ] "The BeeGFS module has been removed")
+    (mkRemovedOptionModule [ "services" "beegfs" ] "The BeeGFS module has been removed")
+    (mkRemovedOptionModule [ "services" "osquery" ] "The osquery module has been removed")
+    (mkRemovedOptionModule [ "services" "fourStore" ] "The fourStore module has been removed")
+    (mkRemovedOptionModule [ "services" "fourStoreEndpoint" ] "The fourStoreEndpoint module has been removed")
     (mkRemovedOptionModule [ "programs" "way-cooler" ] ("way-cooler is abandoned by its author: " +
       "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"))
     (mkRemovedOptionModule [ "services" "xserver" "multitouch" ] ''

From 51dc1795352b460071121936de0cf97344da27bc Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 10 Mar 2020 04:20:00 -0500
Subject: [PATCH 2764/4636] lazygit: 0.15.7 -> 0.16.2

---
 pkgs/development/tools/lazygit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix
index 37c6396e2e3a..9a27c7d44e9c 100644
--- a/pkgs/development/tools/lazygit/default.nix
+++ b/pkgs/development/tools/lazygit/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "lazygit";
-  version = "0.15.7";
+  version = "0.16.2";
 
   goPackagePath = "github.com/jesseduffield/lazygit";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "jesseduffield";
     repo = pname;
     rev = "v${version}";
-    sha256 = "18scwla36bjpylha4fwis0aa333r14bavzd7xhx4677xgaz7l73j";
+    sha256 = "0lvhj4iz74h97lkylqg7hl18xcxcl9msxxvap7jqdj2mf2iwxi32";
   };
 
   meta = with stdenv.lib; {

From f88cd71e96147be7401d99a67f65247225402675 Mon Sep 17 00:00:00 2001
From: "eyjhbb@gmail.com" <eyjhbb@gmail.com>
Date: Wed, 11 Mar 2020 16:30:32 +0100
Subject: [PATCH 2765/4636] flexget: readd transmissionrpc

---
 pkgs/applications/networking/flexget/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 30665b240818..20ddc6c93d49 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -52,6 +52,8 @@ python3Packages.buildPythonApplication rec {
     sqlalchemy
     terminaltables
     zxcvbn
+    # plugins
+    transmissionrpc
   ];
 
   meta = with lib; {

From 5ac085c3cc690333885b1a142806c3de25f9ece2 Mon Sep 17 00:00:00 2001
From: xaverdh <xaverdh@users.noreply.github.com>
Date: Wed, 11 Mar 2020 16:07:53 +0000
Subject: [PATCH 2766/4636] wxmaxima: 18.02.0 -> 20.02.4 (#82323)

The commit description is 18.02.0 -> 20.02.4, because in the last version bump (1c6a193b3ed36dd08e35a7b0ea1d28b72133d6c6), the version string was changed, but the hash was not.

Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
---
 pkgs/applications/science/math/wxmaxima/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix
index 406d74c4cd34..4d6e4bea34e6 100644
--- a/pkgs/applications/science/math/wxmaxima/default.nix
+++ b/pkgs/applications/science/math/wxmaxima/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wxmaxima";
-  version = "19.03.0";
+  version = "20.02.4";
 
   src = fetchFromGitHub {
-    owner = "andrejv";
+    owner = "wxMaxima-developers";
     repo = "wxmaxima";
     rev = "Version-${version}";
-    sha256 = "0s7bdykc77slqix28cyaa6x8wvxrn8461mkdgxflvi2apwsl56aa";
+    sha256 = "106a7jrjwfmymzj70nsv44fm3jbxngr8pmkaghhpwy0ln38lhf54";
   };
 
   buildInputs = [ wxGTK maxima gnome3.adwaita-icon-theme ];
@@ -21,12 +21,10 @@ stdenv.mkDerivation rec {
     gappsWrapperArgs+=(--prefix PATH ":" ${maxima}/bin)
   '';
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     description = "Cross platform GUI for the computer algebra system Maxima";
     license = licenses.gpl2;
-    homepage = https://wxmaxima-developers.github.io/wxmaxima/;
+    homepage = "https://wxmaxima-developers.github.io/wxmaxima/";
     platforms = platforms.linux;
     maintainers = [ maintainers.peti ];
   };

From c9fc7a2a9cba048f84311efe11fd8cc849bc859b Mon Sep 17 00:00:00 2001
From: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Date: Sun, 8 Mar 2020 11:00:52 -0700
Subject: [PATCH 2767/4636] dune: 2.3.1 -> 2.4.0

---
 pkgs/development/tools/ocaml/dune/2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix
index 45a2a3123041..47e71c41568d 100644
--- a/pkgs/development/tools/ocaml/dune/2.nix
+++ b/pkgs/development/tools/ocaml/dune/2.nix
@@ -6,11 +6,11 @@ else
 
 stdenv.mkDerivation rec {
   pname = "dune";
-  version = "2.3.1";
+  version = "2.4.0";
 
   src = fetchurl {
     url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
-    sha256 = "1jzm29z58l34kpqll9jcz5dkkhh36lncba1yb32ghknkvyfdvcxj";
+    sha256 = "096wp6aawgh1ffhbnjfxgakwqd02kfkz2i6m6cc040w1g554iw98";
   };
 
   buildInputs = [ ocaml findlib ];

From cf210c082df58474913f1b371b96c0ba6a4df980 Mon Sep 17 00:00:00 2001
From: Cyril Cohen <cohen@crans.org>
Date: Tue, 10 Mar 2020 15:21:07 +0100
Subject: [PATCH 2768/4636] coqPackages.hierarchy-builder: init at 0.9.0

---
 .../coq-modules/hierarchy-builder/default.nix | 43 +++++++++++++++++++
 pkgs/top-level/coq-packages.nix               |  3 +-
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/coq-modules/hierarchy-builder/default.nix

diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix
new file mode 100644
index 000000000000..ee9c6cb75cff
--- /dev/null
+++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, which, coq, coq-elpi }:
+
+let
+  versions = {
+      "0.9.0" =  {
+        rev = "v0.9.0";
+        sha256 = "1yss9f732r7bjaswgn46vd1rr3688ir0vz37wxkmy598xhrnd2ak";
+      };
+  };
+  version = x: versions.${x} // {version = x;};
+  params = {
+   "8.10" = version "0.9.0";
+   "8.11" = version "0.9.0";
+  };
+  param = params.${coq.coq-version};
+in
+
+stdenv.mkDerivation rec {
+  name = "coq${coq.coq-version}-hierarchy-builder-${param.version}";
+
+  src = fetchFromGitHub {
+    owner = "math-comp";
+    repo = "hierarchy-builder";
+    inherit (param) rev sha256;
+  };
+
+  propagatedBuildInputs = [ coq-elpi ];
+  buildInputs = [ coq coq.ocaml coq.ocamlPackages.elpi ];
+
+  installPhase = ''make -f Makefile.coq VFILES=structures.v COQLIB=$out/lib/coq/${coq.coq-version}/ install'';
+
+  meta = {
+    description = "Coq plugin embedding ELPI.";
+    maintainers = [ stdenv.lib.maintainers.cohencyril ];
+    license = stdenv.lib.licenses.lgpl21;
+    inherit (coq.meta) platforms;
+    inherit (src.meta) homepage;
+  };
+
+  passthru = {
+    compatibleCoqVersions = stdenv.lib.flip builtins.hasAttr params;
+  };
+}
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 565410cc5f67..bc39a477a7a9 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -31,13 +31,14 @@ let
       flocq = callPackage ../development/coq-modules/flocq {};
       gappalib = callPackage ../development/coq-modules/gappalib {};
       heq = callPackage ../development/coq-modules/heq {};
+      hierarchy-builder = callPackage ../development/coq-modules/hierarchy-builder {};
       HoTT = callPackage ../development/coq-modules/HoTT {};
       interval = callPackage ../development/coq-modules/interval {};
       InfSeqExt = callPackage ../development/coq-modules/InfSeqExt {};
       iris = callPackage ../development/coq-modules/iris {};
       ltac2 = callPackage ../development/coq-modules/ltac2 {};
       math-classes = callPackage ../development/coq-modules/math-classes { };
-      inherit (callPackage ../development/coq-modules/mathcomp { })
+      inherit (callPackage ../development/coq-modules/mathcomp {})
         mathcompGen mathcompGenSingle ssreflect
 
         mathcompCorePkgs mathcomp

From 982b4da76d86fc70b9c652c8504614742e1b25ac Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 12 Mar 2020 02:25:05 +1000
Subject: [PATCH 2769/4636] gnomeExtensions.paperwm: init at 36.0 (#81785)

---
 .../gnome-3/extensions/paperwm/default.nix    | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/extensions/paperwm/default.nix

diff --git a/pkgs/desktops/gnome-3/extensions/paperwm/default.nix b/pkgs/desktops/gnome-3/extensions/paperwm/default.nix
new file mode 100644
index 000000000000..7a79b691a4df
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/paperwm/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "gnome-shell-extension-paperwm";
+  version = "36.0";
+
+  src = fetchFromGitHub {
+    owner = "paperwm";
+    repo = "PaperWM";
+    rev = version;
+    sha256 = "1ssnabwxrns36c61ppspjkr9i3qifv08pf2jpwl7cjv3pvyn4kly";
+  };
+
+  uuid = "paperwm@hedning:matrix.org";
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/share/gnome-shell/extensions/${uuid}
+    cp -r . $out/share/gnome-shell/extensions/${uuid}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Tiled scrollable window management for Gnome Shell";
+    homepage = "https://github.com/paperwm/PaperWM";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ hedning zowoq ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 444b02e5513e..3af9818fb4ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23881,6 +23881,7 @@ in
     mpris-indicator-button = callPackage ../desktops/gnome-3/extensions/mpris-indicator-button { };
     night-theme-switcher = callPackage ../desktops/gnome-3/extensions/night-theme-switcher { };
     no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { };
+    paperwm = callPackage ../desktops/gnome-3/extensions/paperwm { };
     pidgin-im-integration = callPackage ../desktops/gnome-3/extensions/pidgin-im-integration { };
     remove-dropdown-arrows = callPackage ../desktops/gnome-3/extensions/remove-dropdown-arrows { };
     sound-output-device-chooser = callPackage ../desktops/gnome-3/extensions/sound-output-device-chooser { };

From dcd85d0023cf9af7506c411efecf0f101f76787f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Mar 2020 16:29:45 +0000
Subject: [PATCH 2770/4636] python27Packages.gphoto2: 2.1.0 -> 2.2.1

---
 pkgs/development/python-modules/gphoto2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix
index 2c8a5a0106a7..1040a4be3f12 100644
--- a/pkgs/development/python-modules/gphoto2/default.nix
+++ b/pkgs/development/python-modules/gphoto2/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "gphoto2";
-  version = "2.1.0";
+  version = "2.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1fdmlyy3lbc6ggfn60fjizaz5icxd676y7gz9nzfy3l4id7mfyk4";
+    sha256 = "118zm25c8mlajfl0pzssnwz4b8lamj9dgymla9rn4nla7l244a0r";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 57f93c1df8f38a96bdfaf558c26509e12e838d29 Mon Sep 17 00:00:00 2001
From: Johannes Schleifenbaum <johannes@js-webcoding.de>
Date: Thu, 5 Mar 2020 10:25:11 +0100
Subject: [PATCH 2771/4636] pythonPackages.python-mpv-jsonipc: 1.1.6 -> 1.1.7

---
 .../development/python-modules/python-mpv-jsonipc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
index 18e73f56686d..8b46b105d69a 100644
--- a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
+++ b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
@@ -3,14 +3,14 @@
 
 buildPythonPackage rec {
   pname = "python-mpv-jsonipc";
-  version = "1.1.6";
+  version = "1.1.7";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "iwalton3";
     repo = "python-mpv-jsonipc";
     rev = "v${version}";
-    sha256 = "08bs6qrcf5fi72jijmr2w7zs6aa5976dwv04f11ajwhj6i8kfq35";
+    sha256 = "1a8lcvgwf7a19d4dj1wkkpxk44c2z9gsyz1xv4wpxi3gxlplcmcz";
   };
 
   # 'mpv-jsonipc' does not have any tests

From fc51ceec8af4b3c4a7ed43b2fed44f680d679acc Mon Sep 17 00:00:00 2001
From: Johannes Schleifenbaum <johannes@js-webcoding.de>
Date: Thu, 5 Mar 2020 10:25:37 +0100
Subject: [PATCH 2772/4636] pythonPackages.jellyfin-apiclient-python: init at
 1.4.0

---
 .../jellyfin-apiclient-python/default.nix     | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/python-modules/jellyfin-apiclient-python/default.nix

diff --git a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
new file mode 100644
index 000000000000..15aed1502b17
--- /dev/null
+++ b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchFromGitHub, requests
+, websocket_client, pythonOlder }:
+
+buildPythonPackage rec {
+  pname = "jellyfin-apiclient-python";
+  version = "1.4.0";
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "iwalton3";
+    repo = "jellyfin-apiclient-python";
+    rev = "v${version}";
+    sha256 = "0b4ij19xjwn0wm5076fx8n4phjbsfx84x9qdrwm8c2r3ld8w7hk4";
+  };
+
+  propagatedBuildInputs = [ requests websocket_client ];
+
+  pythonImportsCheck = [ "jellyfin_apiclient_python" ];
+
+  meta = with lib; {
+    homepage = "https://github.com/iwalton3/jellyfin-apiclient-python";
+    description = "Python API client for Jellyfin";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ jojosch ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7197787aafc9..b2e96c6c17ea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -812,6 +812,8 @@ in {
 
   jc = callPackage ../development/python-modules/jc { };
 
+  jellyfin-apiclient-python = callPackage ../development/python-modules/jellyfin-apiclient-python { };
+
   jira = callPackage ../development/python-modules/jira { };
 
   jsonpath = callPackage ../development/python-modules/jsonpath { };

From 004325edcef0cf16ce4f56d4de2a2ce2eac622c2 Mon Sep 17 00:00:00 2001
From: Johannes Schleifenbaum <johannes@js-webcoding.de>
Date: Fri, 6 Mar 2020 08:35:32 +0100
Subject: [PATCH 2773/4636] pythonPackages.pystray: init at 0.15.0

---
 .../python-modules/pystray/default.nix        | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/pystray/default.nix

diff --git a/pkgs/development/python-modules/pystray/default.nix b/pkgs/development/python-modules/pystray/default.nix
new file mode 100644
index 000000000000..a2652fe1edc3
--- /dev/null
+++ b/pkgs/development/python-modules/pystray/default.nix
@@ -0,0 +1,31 @@
+{ lib, buildPythonPackage, fetchFromGitHub
+, pillow, xlib, six, xvfb_run, sphinx }:
+
+buildPythonPackage rec {
+  pname = "pystray";
+  version = "0.15.0";
+
+  src = fetchFromGitHub {
+    owner = "moses-palmer";
+    repo = "pystray";
+    rev = "v${version}";
+    sha256 = "0m5raxahyix3lmmbjbrsfd9yhr4vdil8gcy155hh6lqm2b1fmmss";
+  };
+
+  propagatedBuildInputs = [ pillow xlib six ];
+  nativeBuildInputs = [ sphinx ];
+  checkInputs = [ xvfb_run ];
+
+  checkPhase = ''
+    rm tests/icon_tests.py # test needs user input
+
+    xvfb-run -s '-screen 0 800x600x24' python setup.py test
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/moses-palmer/pystray";
+    description = "This library allows you to create a system tray icon";
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ jojosch ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b2e96c6c17ea..13f9a5ea2d97 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1252,6 +1252,8 @@ in {
 
   pystache = callPackage ../development/python-modules/pystache { };
 
+  pystray = callPackage ../development/python-modules/pystray { };
+
   pytelegrambotapi = callPackage ../development/python-modules/pyTelegramBotAPI { };
 
   pytesseract = callPackage ../development/python-modules/pytesseract { };

From e0a0263d44d322e6fdc0a223d8e192a01f8d5def Mon Sep 17 00:00:00 2001
From: Johannes Schleifenbaum <johannes@js-webcoding.de>
Date: Tue, 10 Mar 2020 19:19:54 +0100
Subject: [PATCH 2774/4636] pythonPackages.pywebview: init at 3.2

---
 .../python-modules/pywebview/default.nix      | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/python-modules/pywebview/default.nix

diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix
new file mode 100644
index 000000000000..f12d943aad7c
--- /dev/null
+++ b/pkgs/development/python-modules/pywebview/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchFromGitHub }:
+
+buildPythonPackage rec {
+  pname = "pywebview";
+  version = "3.2";
+
+  src = fetchFromGitHub {
+    owner = "r0x0r";
+    repo = "pywebview";
+    rev = version;
+    sha256 = "0anwm6s0pp7xmgylr4m52v7lw825sdby7fajcl929l099n757gq7";
+  };
+
+  # disabled due to error in loading unittest
+  # don't know how to make test from: None
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = "https://github.com/r0x0r/pywebview";
+    description = "Lightweight cross-platform wrapper around a webview.";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ jojosch ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 13f9a5ea2d97..ee2eaffbb0bf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1354,6 +1354,8 @@ in {
 
   pywebpush = callPackage ../development/python-modules/pywebpush { };
 
+  pywebview = callPackage ../development/python-modules/pywebview { };
+
   pywick = callPackage ../development/python-modules/pywick { };
 
   pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml{ });

From aac3717ff4b96d7b253b4713b96f9d0ac2c8bc1a Mon Sep 17 00:00:00 2001
From: Johannes Schleifenbaum <johannes@js-webcoding.de>
Date: Thu, 5 Mar 2020 10:26:01 +0100
Subject: [PATCH 2775/4636] jellyfin-mpv-shim: init at 1.4.1

---
 .../video/jellyfin-mpv-shim/default.nix       | 49 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/applications/video/jellyfin-mpv-shim/default.nix

diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix
new file mode 100644
index 000000000000..7842c48a78a6
--- /dev/null
+++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, buildPythonApplication, fetchFromGitHub, fetchurl
+, mpv, python-mpv-jsonipc, jellyfin-apiclient-python
+, pillow, tkinter, pystray, jinja2, pywebview }:
+
+buildPythonApplication rec {
+  pname = "jellyfin-mpv-shim";
+  version = "1.4.1";
+
+  src = fetchFromGitHub {
+    owner = "iwalton3";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "195vplq4182pq62sn6ci0a8p57k6zv8pk1gmifmwdv69wzaph043";
+    fetchSubmodules = true; # needed for display_mirror css file
+  };
+
+  # override $HOME directory:
+  #   error: [Errno 13] Permission denied: '/homeless-shelter'
+  #
+  # remove jellyfin_mpv_shim/win_utils.py:
+  #   ModuleNotFoundError: No module named 'win32gui'
+  preCheck = ''
+    export HOME=$TMPDIR
+
+    rm jellyfin_mpv_shim/win_utils.py
+  '';
+
+  propagatedBuildInputs = [
+    jellyfin-apiclient-python
+    mpv
+    pillow
+    python-mpv-jsonipc
+
+    # gui dependencies
+    pystray
+    tkinter
+
+    # display_mirror dependencies
+    jinja2
+    pywebview
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/iwalton3/jellyfin-mpv-shim";
+    description = "Allows casting of videos to MPV via the jellyfin mobile and web app.";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ jojosch ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3af9818fb4ba..07e5c1df68cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1910,6 +1910,8 @@ in
 
   jellyfin = callPackage ../servers/jellyfin { ffmpeg = ffmpeg_4; };
 
+  jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { };
+
   jotta-cli = callPackage ../applications/misc/jotta-cli { };
 
   jwt-cli = callPackage ../tools/security/jwt-cli {

From 9caf1a87a125c337fd5d4ab22d6c85e905c69591 Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Wed, 11 Mar 2020 12:43:45 -0600
Subject: [PATCH 2776/4636] vimPlugins: Update

---
 pkgs/misc/vim-plugins/generated.nix | 420 ++++++++++++++--------------
 1 file changed, 210 insertions(+), 210 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 9d6a47e507db..e95e08ec6764 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -61,12 +61,12 @@ let
 
   ale = buildVimPluginFrom2Nix {
     pname = "ale";
-    version = "2020-02-25";
+    version = "2020-03-11";
     src = fetchFromGitHub {
       owner = "w0rp";
       repo = "ale";
-      rev = "634c81fd465269f59e3db878fe8405828e6d2da9";
-      sha256 = "1lcqyj0yjdhm2kdk0p6pr8avjnb7gm4hg0dygm6fpjz3f078n9py";
+      rev = "bbe5153fcb36dec9860ced33ae8ff0b5d76ac02a";
+      sha256 = "1xvmh66lgii98z6f4lk1mjs73ysrvs55xdlcmf224k3as822jmw0";
     };
   };
 
@@ -347,23 +347,23 @@ let
 
   coc-git = buildVimPluginFrom2Nix {
     pname = "coc-git";
-    version = "2020-02-27";
+    version = "2020-03-11";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-git";
-      rev = "fc720742d1f7fed7a0737ee92235d743f2a86a12";
-      sha256 = "0qx3wsdnjnfxi6dg3z9pdcqnj2rhwnprz3ypch6ysyshlbvbs9ag";
+      rev = "8a8517c44589cef8c7061e6d352f77627b5a79b4";
+      sha256 = "1qg3mk43wl8shx66nydykdr1vsfx4n5lmgngndwnjjkf1csppg9q";
     };
   };
 
   coc-go = buildVimPluginFrom2Nix {
     pname = "coc-go";
-    version = "2020-02-13";
+    version = "2020-03-10";
     src = fetchFromGitHub {
       owner = "josa42";
       repo = "coc-go";
-      rev = "fa76d5c34d048b97eb53cf5e13f6d9acf975c92e";
-      sha256 = "0wizc10g7jxrf2da15hdnjn471w0fgyaw13j9qf7gyhcsmdx1x5w";
+      rev = "587501a4445c1edb5d5e10927c5f8274f0e0ea52";
+      sha256 = "16cgdxn93zf0q5d80xb9c6khzgx02qvsjdaw3kf07qqsmdjvy4gj";
     };
   };
 
@@ -435,23 +435,23 @@ let
 
   coc-lists = buildVimPluginFrom2Nix {
     pname = "coc-lists";
-    version = "2020-02-10";
+    version = "2020-03-03";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-lists";
-      rev = "25c1f7661a9ce6898924228115b671469c958a1a";
-      sha256 = "1cqy6a9cs0ns5ifglxhrmd6lvfnlfx6ni44xq3gayh4lnyxdlc8p";
+      rev = "21761f5e9a48baf3dbb6540ff180f6071c1ed8c6";
+      sha256 = "101n3cmhvm4hxznk5w4n7lbk552cwsyf28axa1d5rr838r3zg5wi";
     };
   };
 
   coc-metals = buildVimPluginFrom2Nix {
     pname = "coc-metals";
-    version = "2020-02-27";
+    version = "2020-03-09";
     src = fetchFromGitHub {
       owner = "ckipp01";
       repo = "coc-metals";
-      rev = "4dd4685ef44f1a38ea20b373f2a20b82304d68e0";
-      sha256 = "1q165kh4k59ikivs9pwp6w9jla6li8hcln5zbpkxhis6sh9g3bn6";
+      rev = "11725273f6f5bb62836890a5df09831ac15a2f59";
+      sha256 = "16wy97jnw6i8f3nkac3abdi2sjnql4jkbb82hgd67i0lzjjvarzd";
     };
   };
 
@@ -468,12 +468,12 @@ let
 
   coc-pairs = buildVimPluginFrom2Nix {
     pname = "coc-pairs";
-    version = "2020-01-02";
+    version = "2020-03-09";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-pairs";
-      rev = "0203f18c66f8bb06a6845aef1fff26a56e4a7bbd";
-      sha256 = "08z0c0a1cizyv15h8d4mxb6casrgmfpdgj0w8g1v9zqra2rmkmv5";
+      rev = "79deeaabdc4f091c22f3dd67d439a0a336e8aa7e";
+      sha256 = "1w6p2dk7yj8ldxg1qxh9zpn9ypm6gn66gi0vbax33wf5c0dmp0v9";
     };
   };
 
@@ -534,12 +534,12 @@ let
 
   coc-snippets = buildVimPluginFrom2Nix {
     pname = "coc-snippets";
-    version = "2020-02-19";
+    version = "2020-03-10";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-snippets";
-      rev = "aaa059bb998418850ec2d7958a5df16e96e76d59";
-      sha256 = "1ardzqassj1kgfjp0vxsi0kimi7w61rxdhr8ng272nrkaxbxz25j";
+      rev = "e4f36338b3fd11277f9dd8021fdbfe8b1ed85f6f";
+      sha256 = "0a3a02yj7kfnz4hgz7ylmq5zl3id4kfmp1ynnl8wc1439m5hvi84";
     };
   };
 
@@ -600,12 +600,12 @@ let
 
   coc-tsserver = buildVimPluginFrom2Nix {
     pname = "coc-tsserver";
-    version = "2020-02-07";
+    version = "2020-03-09";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-tsserver";
-      rev = "89998609d4b117083738aa06cb138765810ac0e7";
-      sha256 = "118acn2vzb51mqxnx50lhibfqivzzfqsbyd5hy5qfl2p8gd67c0k";
+      rev = "dae0cc36b0245a601d4431ae8dd2319eaa919058";
+      sha256 = "1559c0hwyknz1j6vbigywg1fjads4wf8by59z0sri6aah9q77q2z";
     };
   };
 
@@ -644,12 +644,12 @@ let
 
   coc-yaml = buildVimPluginFrom2Nix {
     pname = "coc-yaml";
-    version = "2020-02-09";
+    version = "2020-03-06";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-yaml";
-      rev = "d9b2a7ec6275e25bb89e875f73d99ff8a3e58877";
-      sha256 = "05xgz3lhfzd93ldac0jw7i68f1s3p3ikg22gvl3v2va8r1rf01hh";
+      rev = "338192a2434b96b139fb8c07d260da00b3100997";
+      sha256 = "020jpsm9ss2v3x1g43m920w2yamv8khl7mg7wm4sx6qsl3rlfq4g";
     };
   };
 
@@ -766,12 +766,12 @@ let
 
   csv-vim = buildVimPluginFrom2Nix {
     pname = "csv-vim";
-    version = "2020-02-05";
+    version = "2020-03-10";
     src = fetchFromGitHub {
       owner = "chrisbra";
       repo = "csv.vim";
-      rev = "0663b09f9203cb38ef113254b461047c7e3c43e7";
-      sha256 = "14icc2a5hylknz8sigmbxwamf9ck4lsjjykyxjycrnwjrpasl8sv";
+      rev = "e7fb581122df54fe9770cc5e565bef450e7d2478";
+      sha256 = "1h15n1pdci34idks218r4kpwna1zb25hk8prsqzvjkj8mc6ch67y";
     };
   };
 
@@ -821,12 +821,12 @@ let
 
   dart-vim-plugin = buildVimPluginFrom2Nix {
     pname = "dart-vim-plugin";
-    version = "2019-12-03";
+    version = "2020-03-07";
     src = fetchFromGitHub {
       owner = "dart-lang";
       repo = "dart-vim-plugin";
-      rev = "ff468225ce2c8834b944ba6e040fe18a28a67cff";
-      sha256 = "1h4yw71dj67q57d7iiw22silcmji5ibp4bj18kgm0gvwa53hy7hh";
+      rev = "c16efc107e8bccd927f71bc2815d48f3bf94f1b8";
+      sha256 = "133yivm5wp4m7sx62mcjr0vy7br6gcrh0k25nszy3vpdnnyc1mh6";
     };
   };
 
@@ -887,34 +887,34 @@ let
 
   denite-git = buildVimPluginFrom2Nix {
     pname = "denite-git";
-    version = "2020-02-26";
+    version = "2020-03-02";
     src = fetchFromGitHub {
       owner = "chemzqm";
       repo = "denite-git";
-      rev = "0c7ffefa872ca19d61ecec6e014a797f0c25e98f";
-      sha256 = "11mz76x7pj2p3k3d8ycjvrwdjrabrdcssw5lr529r9dardkqchzl";
+      rev = "88b5323a6fc0ace197eed5205215d80f3b613f91";
+      sha256 = "0b687i64hr8hll7pv7r1xz906b46cl2q62zm18ipikhkpva6iv13";
     };
   };
 
   denite-nvim = buildVimPluginFrom2Nix {
     pname = "denite-nvim";
-    version = "2020-02-23";
+    version = "2020-03-08";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "e435b78c3fa878dba7bbb03ee7cd95df6ce7a836";
-      sha256 = "10lz16l34ran96i5902hw9zw3qbfdz712bdjkdwvaijmgnj464s5";
+      rev = "b6e2c7df9402f293bad1dc45f5d41b3dc5d8a9b1";
+      sha256 = "1rnxaj1ah7k5l2bcc2x7pdlqjb9fki5r732yanp4r3c4mlx28rvp";
     };
   };
 
   deol-nvim = buildVimPluginFrom2Nix {
     pname = "deol-nvim";
-    version = "2019-11-27";
+    version = "2020-03-08";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deol.nvim";
-      rev = "856041638e98fc3bf4d4de5d90dee525f3dfa9a5";
-      sha256 = "1y6kp56n26kabmp60nnyaw46yxv9nqv5bp15hzvfpwvzq7gvpm10";
+      rev = "cb0e2fdb75a2d37e75972933c25dd2781d8e6ebb";
+      sha256 = "13miw4z14fj11afs8x5yxcbpn4an8vhvx8k3rl3xrvn1hq5jhwqx";
     };
   };
 
@@ -999,12 +999,12 @@ let
 
   deoplete-jedi = buildVimPluginFrom2Nix {
     pname = "deoplete-jedi";
-    version = "2020-02-03";
+    version = "2020-03-10";
     src = fetchFromGitHub {
       owner = "deoplete-plugins";
       repo = "deoplete-jedi";
-      rev = "2d2ff2382fd67574c233d0ce48150b26eb7f6809";
-      sha256 = "1hwmf0hnyvznciysj3k0gcycmvl2mvv8krmc26bi430q89gxgq56";
+      rev = "29187f9d71ea415afa71e9e416ffcf32619aa65f";
+      sha256 = "1xlgfngaahbnwk6bfnmzv63jdz70w0lvqzpa5zbsyb5p52p4a58i";
       fetchSubmodules = true;
     };
   };
@@ -1033,12 +1033,12 @@ let
 
   deoplete-lsp = buildVimPluginFrom2Nix {
     pname = "deoplete-lsp";
-    version = "2020-01-10";
+    version = "2020-03-07";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete-lsp";
-      rev = "7a8c44f423bc4339c092a759abaad40131d2c98a";
-      sha256 = "1gg9j26xq668s4gbww0p2x8pkh3ssbzgyp2hxppk2ws7x8c2cihi";
+      rev = "6aa2bfd73a181fa6b55021264c4a8a83237ce558";
+      sha256 = "1bcvfbv046fk34vnc1ly8civ3sibqlzli8vm2548dfxc55wcwsys";
     };
   };
 
@@ -1110,12 +1110,12 @@ let
 
   deoplete-nvim = buildVimPluginFrom2Nix {
     pname = "deoplete-nvim";
-    version = "2020-02-27";
+    version = "2020-03-10";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "08582f7c52aa53d63f9a7a714fab9137d6ea48f0";
-      sha256 = "1bnz9q6rz95w8xw9vhzhfrfr6r8zdgf0ihylvjaa2kzxir7sngm2";
+      rev = "2538bd3d542ee6d89802ace15ab87aa783e8a1cb";
+      sha256 = "0pq6c9m64mgx7zyc9nng18w0xdyr9s36gxv1rkpd14srwgxw0ilf";
     };
   };
 
@@ -1154,12 +1154,12 @@ let
 
   echodoc-vim = buildVimPluginFrom2Nix {
     pname = "echodoc-vim";
-    version = "2020-02-27";
+    version = "2020-03-06";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "echodoc.vim";
-      rev = "577b7e7d083e37c0c15158cbd761de7cd831e682";
-      sha256 = "1cmp80s4k7sslj4vd919wwlinzmy0yghnczwzrwgk9yf0jclk4nv";
+      rev = "cd9beff92b52990d991a0b6a0f4d20aa600e570c";
+      sha256 = "14z9di1x0zbq1d4vvpn8pvnp3fscdv7iqyymaiavw096nvj3d1cc";
     };
   };
 
@@ -1188,12 +1188,12 @@ let
 
   emmet-vim = buildVimPluginFrom2Nix {
     pname = "emmet-vim";
-    version = "2019-10-08";
+    version = "2020-03-07";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "emmet-vim";
-      rev = "5f559fae12a8babf414376906197dbd751e11380";
-      sha256 = "0z9lny12hckc635zafh1mdh58pikz5k19kkhxj1m77h15rwwms7f";
+      rev = "c7643e5b616430f766528b225528a5228adb43df";
+      sha256 = "0wjxx648lp11nqzgrdcbqikjs85knpvk594b9l25hadhd5awgahv";
       fetchSubmodules = true;
     };
   };
@@ -1222,23 +1222,23 @@ let
 
   falcon = buildVimPluginFrom2Nix {
     pname = "falcon";
-    version = "2020-02-26";
+    version = "2020-03-02";
     src = fetchFromGitHub {
       owner = "fenetikm";
       repo = "falcon";
-      rev = "7128e3a6778347ff7848d9f8a423f63b94e6d9b9";
-      sha256 = "0s4sd982z3f8cppcz4hja788jgcm1gsh6qn8lw9535i6bmphn027";
+      rev = "b7ef5d0e1b15ce007ecf6adb94270c0d3468d90e";
+      sha256 = "1dcf6ic74r1lg0a3zqhfp1wk2f7j8nsykfvrk2d0j7waj2xsni4v";
     };
   };
 
   far-vim = buildVimPluginFrom2Nix {
     pname = "far-vim";
-    version = "2020-02-15";
+    version = "2020-03-09";
     src = fetchFromGitHub {
       owner = "brooth";
       repo = "far.vim";
-      rev = "f9d916497e2bf26e6e7072b0375f6c484170311a";
-      sha256 = "02ych1rrj8n6caczphnmvmir8x661p94kc0kh9bffmz7hjk6586q";
+      rev = "2a8a9c22237d224f2c24680901b61b6f9bffb061";
+      sha256 = "0hk2p10cx36dz6vf22v4hx3shkkhqhkmxp6s1l517kkchh98m4bg";
     };
   };
 
@@ -1289,12 +1289,12 @@ let
 
   float-preview-nvim = buildVimPluginFrom2Nix {
     pname = "float-preview-nvim";
-    version = "2019-04-07";
+    version = "2020-02-29";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "float-preview.nvim";
-      rev = "c5431b6d9bd4a8002f1a3eec42e9458ef4453ff3";
-      sha256 = "0ylrp0pmg822m7zp7dhyhmb05zbiy4gbq40l4whs249v0v4s9vyd";
+      rev = "cbc23a28e8ea92d7c8dc22e727a62d42ef65086a";
+      sha256 = "1qv05qv89sbh1cafl2597lj95yv8yxpxm3sxbbclrls1962f7hgy";
     };
   };
 
@@ -1333,12 +1333,12 @@ let
 
   fzf-vim = buildVimPluginFrom2Nix {
     pname = "fzf-vim";
-    version = "2020-02-19";
+    version = "2020-03-11";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
-      rev = "48a2d80a24d19bfaafd91005786653bc49303c62";
-      sha256 = "0p4ifdl70iwsdqsgpbs66lam7fzdc2jxa9hvzslwi0gllccpfsm5";
+      rev = "ed9d66c2a65333a0d49509a2d53098392683eec1";
+      sha256 = "0jb62nwfs2bv33b3rfk0pndia97wsi88rdixvarkkimdi09sa6cp";
     };
   };
 
@@ -1355,23 +1355,23 @@ let
 
   gentoo-syntax = buildVimPluginFrom2Nix {
     pname = "gentoo-syntax";
-    version = "2019-12-13";
+    version = "2020-03-08";
     src = fetchFromGitHub {
       owner = "gentoo";
       repo = "gentoo-syntax";
-      rev = "946aac94d5690e9ca1ca2db21a254fea56e45b2b";
-      sha256 = "1q1rq1rxxq5hyglz90d7vd1m6az12lr2wz9aafn6zir68n3ak0lj";
+      rev = "42163237b57c56de9a24fe6549e46c805fab2bb3";
+      sha256 = "1bg3ismjlp99drsfyrkjb137ypxmp0qpy8pp9ry9i8ljmnffbgal";
     };
   };
 
   ghcid = buildVimPluginFrom2Nix {
     pname = "ghcid";
-    version = "2020-01-27";
+    version = "2020-03-10";
     src = fetchFromGitHub {
       owner = "ndmitchell";
       repo = "ghcid";
-      rev = "dfa37af1baa37c1eb0a34d9bf303b5f2aa9fbc4c";
-      sha256 = "1cx0bj1c1ynzqqvjx0rrbkbhkql6zs11k6sbpbn7gdch4437cjzs";
+      rev = "3c4569cd8cf93545bedeaf692c5d50ef16ca0226";
+      sha256 = "1n96c5az0ls5hd9ahvskl3f6ygss7m6hmkj3ijlsh5hwga17zrhz";
     };
   };
 
@@ -1498,12 +1498,12 @@ let
 
   iceberg-vim = buildVimPluginFrom2Nix {
     pname = "iceberg-vim";
-    version = "2019-11-07";
+    version = "2020-03-06";
     src = fetchFromGitHub {
       owner = "cocopon";
       repo = "iceberg.vim";
-      rev = "dc4b4b5838d126c22c44229a3ee170f6ac79ba86";
-      sha256 = "1hicambipbgwf22fax782gpfmcndcpikj3bpf8v91wd5fxm7ik74";
+      rev = "1740235846c92666fe521e550a27fa47ebe5f5a3";
+      sha256 = "13zf899kgwjhrksznz2212ywml7nnqwq2dyam39nzywf8msg8va6";
     };
   };
 
@@ -1531,12 +1531,12 @@ let
 
   increment-activator = buildVimPluginFrom2Nix {
     pname = "increment-activator";
-    version = "2019-05-09";
+    version = "2020-03-09";
     src = fetchFromGitHub {
       owner = "nishigori";
       repo = "increment-activator";
-      rev = "f341baf93b172aee646c90ff2ce28de0f897561b";
-      sha256 = "0hda6h3qz6ynpl996rk1rm6xnxgkaz108v28qg0w6wm7qzynbmnv";
+      rev = "bff5516da9103fb093ffc0dc993b8d535eacbceb";
+      sha256 = "1swlv1mrck9s3n7fdg10c2nmlasf2fx8yfk01x3vii7l4aaa9w2y";
     };
   };
 
@@ -1564,12 +1564,12 @@ let
 
   indentLine = buildVimPluginFrom2Nix {
     pname = "indentLine";
-    version = "2019-10-26";
+    version = "2020-03-06";
     src = fetchFromGitHub {
       owner = "Yggdroot";
       repo = "indentLine";
-      rev = "bb548a975ebe4576073ca025eeb2743b4465ce1d";
-      sha256 = "0r3jppigc6i562par0l36z7g5zyk2djvjvbl61vjzi0jk1d0gvjn";
+      rev = "15aceda8c4eea621b66faa8673fca0b9fbe2f457";
+      sha256 = "1icb1h811lp86hg4w8y8mmmsfm4c80n7m8r1wi58lnm60mjasas4";
     };
   };
 
@@ -1619,12 +1619,12 @@ let
 
   jedi-vim = buildVimPluginFrom2Nix {
     pname = "jedi-vim";
-    version = "2020-02-27";
+    version = "2020-03-07";
     src = fetchFromGitHub {
       owner = "davidhalter";
       repo = "jedi-vim";
-      rev = "686f39ac002ca31acd663ae8749982144484ff95";
-      sha256 = "0ll0rnw00kl58a3dpvcx85dmd5j2figg6cc87qld2mn169qcx354";
+      rev = "e83112f9aab147ab485ee7af72e01d047c5206d3";
+      sha256 = "0yj1bsfn43crmfn0ylyzyz41z0vmvapl5cgm7k1rnbj96i7vifx7";
       fetchSubmodules = true;
     };
   };
@@ -1664,12 +1664,12 @@ let
 
   julia-vim = buildVimPluginFrom2Nix {
     pname = "julia-vim";
-    version = "2020-02-13";
+    version = "2020-03-02";
     src = fetchFromGitHub {
       owner = "JuliaEditorSupport";
       repo = "julia-vim";
-      rev = "8c0b9e8f87091ff17abbca752fa30e3a34ebb5a1";
-      sha256 = "013c0zgh0d0zanys38k3q0bxp9xd5xjz92kjsr3b0in371yc7wv1";
+      rev = "1db5eed71d7f5fe4b95b0dadfb3f798983485554";
+      sha256 = "1rrmapsaly4kinq8aab2kbnpxnrpibgyrp6ri9qqyk2wdrlgq9lk";
     };
   };
 
@@ -1774,23 +1774,23 @@ let
 
   lh-brackets = buildVimPluginFrom2Nix {
     pname = "lh-brackets";
-    version = "2020-02-02";
+    version = "2020-03-02";
     src = fetchFromGitHub {
       owner = "LucHermitte";
       repo = "lh-brackets";
-      rev = "05aaec7d82f15c135f97063d534332b3fd388474";
-      sha256 = "11vp244x912fipfp8h61v7m361kjs6jq6g843avwskpjb2b4b40f";
+      rev = "dc91bb1e8ef45a0810d9c1ad412863977c8c4baf";
+      sha256 = "1yjmykn92i54cajr5wrj7m0wvaigy106c3hm8ks30xn4zm970x03";
     };
   };
 
   lh-vim-lib = buildVimPluginFrom2Nix {
     pname = "lh-vim-lib";
-    version = "2020-02-19";
+    version = "2020-03-06";
     src = fetchFromGitHub {
       owner = "LucHermitte";
       repo = "lh-vim-lib";
-      rev = "3077a653988ff1f3d6483a2281650ac6da5b7559";
-      sha256 = "04g5rf1wcvxpkqbf3vkyjmkykqwi4dhp3l8i0mvng03gwpzfp0ym";
+      rev = "3a8383f2efbd7496c17a70bf4593773f6149435f";
+      sha256 = "0c6gnksyjyvsxqbp13q8bp9j4cg9x9m0kzrkx01p9k6wq297kpd9";
     };
   };
 
@@ -1884,12 +1884,12 @@ let
 
   ncm2 = buildVimPluginFrom2Nix {
     pname = "ncm2";
-    version = "2020-02-10";
+    version = "2020-03-05";
     src = fetchFromGitHub {
       owner = "ncm2";
       repo = "ncm2";
-      rev = "605ea0ddcec45b33ec7db69119822a9a5d538823";
-      sha256 = "1pjmxx3wxss25vdb5dqppr7ngkd9w52gzf6ani99flw3rzkmg9c5";
+      rev = "6596df4631ee1ee17351a78f382d4efd0b82c05e";
+      sha256 = "16276cjviij92ypqj9148828k4dhiywam0dz07v3rikknak11cra";
     };
   };
 
@@ -2016,12 +2016,12 @@ let
 
   neoformat = buildVimPluginFrom2Nix {
     pname = "neoformat";
-    version = "2020-01-05";
+    version = "2020-03-03";
     src = fetchFromGitHub {
       owner = "sbdchd";
       repo = "neoformat";
-      rev = "b7ccdb2a7f9d20a1bbb6a5e4774104eb06969bb9";
-      sha256 = "136qg04z92dnrgbwbjlc06qcd656sc004hznxdaic3pyq3lh25z4";
+      rev = "69140aedb7da5a5a0b25b82e7f756f91d08170ea";
+      sha256 = "132ksy20rb01xm18zwwl3lv5zapfhfvaf5zz6md8dnr5hvkvvrgx";
     };
   };
 
@@ -2038,12 +2038,12 @@ let
 
   neomake = buildVimPluginFrom2Nix {
     pname = "neomake";
-    version = "2020-02-20";
+    version = "2020-03-08";
     src = fetchFromGitHub {
       owner = "neomake";
       repo = "neomake";
-      rev = "76e5b2bad8e98e805ff4749068e6be6206bec2a0";
-      sha256 = "17713a1bd405c8k2qa0b7mgw2pj58r83qnz3qhjxvg877vybag6n";
+      rev = "1fe306e5feeb9423fd5c78b8623e38998bb149ae";
+      sha256 = "1bixsgdraf3kzn8h3fv4a4jw58kd5r09binhjsx8622sla3j3pzy";
     };
   };
 
@@ -2071,23 +2071,23 @@ let
 
   neosnippet-vim = buildVimPluginFrom2Nix {
     pname = "neosnippet-vim";
-    version = "2020-02-06";
+    version = "2020-03-07";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "neosnippet.vim";
-      rev = "caa9b82220237865a2fbb846b0fa63f4a6a9eb7a";
-      sha256 = "1rvc4za0vb5if144v07vj0aw7axq3mh1idhismyc4y31pfz59nap";
+      rev = "8870feb5ab31e1acf8d80a3619f4ce47abf51a54";
+      sha256 = "1q7sb4adpxkzdzyx7rlmkqzi612nsjkcs489m16j2jc20wsc2d9a";
     };
   };
 
   NeoSolarized = buildVimPluginFrom2Nix {
     pname = "NeoSolarized";
-    version = "2018-05-07";
+    version = "2020-03-10";
     src = fetchFromGitHub {
       owner = "icymind";
       repo = "NeoSolarized";
-      rev = "1af4bf6835f0fbf156c6391dc228cae6ea967053";
-      sha256 = "1l98yh3438anq33a094p5qrnhcm60nr28crs0v4nfah7lfdy5mc2";
+      rev = "70609c44215c8d2c43ad8c631296caae08a9c8d4";
+      sha256 = "0bxrm2vm3z1y37sm6m2hdn72g2sw31dx1xhmjvd0ng72cnp84d9k";
     };
   };
 
@@ -2225,12 +2225,12 @@ let
 
   nvim-gdb = buildVimPluginFrom2Nix {
     pname = "nvim-gdb";
-    version = "2020-02-13";
+    version = "2020-03-03";
     src = fetchFromGitHub {
       owner = "sakhnik";
       repo = "nvim-gdb";
-      rev = "64c471aa17ec1980a8f3304c11f00fa4174234bf";
-      sha256 = "0nc6rn1wvdhka23jc52r7kccq81qda1ilal5c1qp0x0hr9ada58l";
+      rev = "598a7ecd75bfe4ef32a09830f133afcf7b6d3927";
+      sha256 = "1l9dljzmyxlnd6pxx7ivxlzw1sis4igqdpkm05khljvn2n6asyvp";
     };
   };
 
@@ -2247,12 +2247,12 @@ let
 
   nvim-lsp = buildVimPluginFrom2Nix {
     pname = "nvim-lsp";
-    version = "2020-02-25";
+    version = "2020-03-09";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lsp";
-      rev = "1739274e24087565760b35a789a28bc217308ecf";
-      sha256 = "08lmpagkxqgn06375bib8z9k3hm7b6q139vbkzc2hxpbg3xd4jfs";
+      rev = "78b16eb3623c1c0d4433ca8e09c2cb661fa1a852";
+      sha256 = "0fgj2yhfcdvpqs7012nwcinlndpfhzfzq9ac7kk0cib4m4vg1zxm";
     };
   };
 
@@ -2313,12 +2313,12 @@ let
 
   open-browser-vim = buildVimPluginFrom2Nix {
     pname = "open-browser-vim";
-    version = "2020-02-20";
+    version = "2020-03-06";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "open-browser.vim";
-      rev = "a1091492328a57fac02e80641a86c9c64a95ebe1";
-      sha256 = "10pbad4ad3lslx0kl4a79z8rlg19xcqi7wicfldk1l003badw7cw";
+      rev = "57b894d0aa5f800220d25fdeeccf28d8a7f6ac89";
+      sha256 = "0q87hna0irl431kmd4knblzkahrmw3mrnvw1cq19indfky85516v";
     };
   };
 
@@ -2456,12 +2456,12 @@ let
 
   quick-scope = buildVimPluginFrom2Nix {
     pname = "quick-scope";
-    version = "2019-04-22";
+    version = "2020-03-09";
     src = fetchFromGitHub {
       owner = "unblevable";
       repo = "quick-scope";
-      rev = "994576d997a52b4c7828149e9f1325d1c4691ae2";
-      sha256 = "0lr27vwv2bzva9s7f9d856vvls10icwli0kwj5v5f1q8y83fa4zd";
+      rev = "2a12d429144cf083382a87743c1cb658cd314309";
+      sha256 = "16cf9jdjkf7igqvf40snq71n52kpszdi76ijhxk03dxgycj0hfkb";
     };
   };
 
@@ -2610,12 +2610,12 @@ let
 
   rust-vim = buildVimPluginFrom2Nix {
     pname = "rust-vim";
-    version = "2020-02-03";
+    version = "2020-03-06";
     src = fetchFromGitHub {
       owner = "rust-lang";
       repo = "rust.vim";
-      rev = "db0137dfad4690621e01dbae780fb4a2dd7dbf27";
-      sha256 = "1c5yynl6clq6rvr17ma49npfiw5ssarrn8hdz9vgqwkvf879icmd";
+      rev = "255a81f091a08786e004f215651227a2fef3a64c";
+      sha256 = "0kn0yhh2cmd6h5wwz5y8v9j3mqb8ywmzzmdhglr6wmdlr7bkk75g";
     };
   };
 
@@ -2720,12 +2720,12 @@ let
 
   SpaceCamp = buildVimPluginFrom2Nix {
     pname = "SpaceCamp";
-    version = "2020-02-23";
+    version = "2020-03-06";
     src = fetchFromGitHub {
       owner = "jaredgorski";
       repo = "SpaceCamp";
-      rev = "c35ee8509a9f690366b7d8c04cded9d9f07d8a86";
-      sha256 = "18y7z79469lkcn293zyly306hm7dr1sq9dvnl69nc4a82cdpaha8";
+      rev = "17b7f8cba9cc83ee684f72cc6f354f0677c0acf5";
+      sha256 = "0rb9dx0lvqvfqyiizfjf812zi0ladjiq5hxjc15rgiw13ivxix0d";
     };
   };
 
@@ -3018,12 +3018,12 @@ let
 
   tsuquyomi = buildVimPluginFrom2Nix {
     pname = "tsuquyomi";
-    version = "2020-01-21";
+    version = "2020-03-10";
     src = fetchFromGitHub {
       owner = "Quramy";
       repo = "tsuquyomi";
-      rev = "785af7476e0db2522372ef585c86947fc5625c81";
-      sha256 = "1grjd7zpds9vgllf4y7iymbkxi9kaks1dccgmhkp0vas8hlvpiy6";
+      rev = "85fffd5939c8fc5750b35a937b965af2ad5b0b15";
+      sha256 = "1j5wdh0xa5yld4fy2msyjf1qvj8zx0iccc1bw63zzbrcl6rs30gx";
     };
   };
 
@@ -3040,12 +3040,12 @@ let
 
   ultisnips = buildVimPluginFrom2Nix {
     pname = "ultisnips";
-    version = "2020-02-27";
+    version = "2020-03-02";
     src = fetchFromGitHub {
       owner = "SirVer";
       repo = "ultisnips";
-      rev = "129d33fc34a72ced857f3cfb72ff10caf10f0020";
-      sha256 = "1hf6d4rr2y4msjxqh0pjpdh6237992497wfj8jy0jalnp2j8icbx";
+      rev = "e910b4fb9e276d18ed140fc492f30967ef9ace59";
+      sha256 = "0fbrwmk4plg1zyz5vyay7jsj240l9p2ksjlp7yjs1g3l7qf71xxz";
     };
   };
 
@@ -3128,12 +3128,12 @@ let
 
   vim = buildVimPluginFrom2Nix {
     pname = "vim";
-    version = "2020-01-02";
+    version = "2020-03-03";
     src = fetchFromGitHub {
       owner = "dracula";
       repo = "vim";
-      rev = "5a633625615c79f87786d74ea925790ccdd82aba";
-      sha256 = "0ng2qnwccpbqkhqilm7nj61217rvczxfcgkhdsxj3h2v4fj5ryy5";
+      rev = "ed490ae07168ecd1636b9fe0998baeb770b87cd9";
+      sha256 = "0b23r37az36kzlzr3k483r1yy142nmz09hc9wkwchs2zns30bqky";
     };
   };
 
@@ -3359,12 +3359,12 @@ let
 
   vim-airline = buildVimPluginFrom2Nix {
     pname = "vim-airline";
-    version = "2020-02-27";
+    version = "2020-03-02";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "774cd8b08ff1569f86cba78e24ee06e448f86b4f";
-      sha256 = "09hhgsbg5nnmzdpz4wclwgjnkxg2l1rvizhmv0wd7g6sshs9i83w";
+      rev = "4e2546a2098954b74cbc612f573826f13d6fb88e";
+      sha256 = "1z1xnvkaz1yjjq87kdyplx0zh0il0qkmr5lzwfq33jcnwlafz6xw";
     };
   };
 
@@ -3425,12 +3425,12 @@ let
 
   vim-autoformat = buildVimPluginFrom2Nix {
     pname = "vim-autoformat";
-    version = "2020-02-21";
+    version = "2020-03-02";
     src = fetchFromGitHub {
       owner = "Chiel92";
       repo = "vim-autoformat";
-      rev = "db57d849f31cd81075c82d4827426a326de76dae";
-      sha256 = "057clz1p9lkb0nvrqxgdsmm760sksg8pwa2wny3vc69hi7m1wr9w";
+      rev = "b757f58c67908772a17300cf853ed0da653edeb2";
+      sha256 = "0cl858hk7gaaxlj22d61mqiaypv76q85srskjay9s3px0mm5fanc";
     };
   };
 
@@ -3678,12 +3678,12 @@ let
 
   vim-cursorword = buildVimPluginFrom2Nix {
     pname = "vim-cursorword";
-    version = "2020-02-01";
+    version = "2020-03-10";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "vim-cursorword";
-      rev = "80c4a28ad90a32fb40f01df44e6208bb7709753d";
-      sha256 = "1cn605aj3qa11df8arhdsd6x0rpkz83w1r6a3g21cwd5j37x6gkr";
+      rev = "8e859e4c54fda0728e8f0b5cc4f61c7ff193083f";
+      sha256 = "0nq7x957xwz6fibb4m4daq2xp74n922lm46117lfhvpa0ii2rz0i";
     };
   };
 
@@ -3711,12 +3711,12 @@ let
 
   vim-devicons = buildVimPluginFrom2Nix {
     pname = "vim-devicons";
-    version = "2020-02-08";
+    version = "2020-03-08";
     src = fetchFromGitHub {
       owner = "ryanoasis";
       repo = "vim-devicons";
-      rev = "b06f5418a434644f64ba9f218472b5aa86eb03a6";
-      sha256 = "0prfygwiwv6i59p45rrvk0d5s68fc25hw5r44z9a90n6f8xsn740";
+      rev = "ebaf80de4b4e12cc8ee068ad2f134f0b23ea039d";
+      sha256 = "1lq2fqhca2dm55pa0rlq9l7acfif8vlkjd04hagxjbpa9ja348kl";
     };
   };
 
@@ -3843,12 +3843,12 @@ let
 
   vim-elixir = buildVimPluginFrom2Nix {
     pname = "vim-elixir";
-    version = "2020-02-21";
+    version = "2020-03-11";
     src = fetchFromGitHub {
       owner = "elixir-lang";
       repo = "vim-elixir";
-      rev = "85afa5e0de0ba0d640898e9d232552795fc726d2";
-      sha256 = "1askl7ridl6np25ldf4mwqp7iavb9wj119qjqmjga8niylq80hnm";
+      rev = "088cfc407460dea7b81c10b29db23843f85e7919";
+      sha256 = "1w9w4arzlbjhd5kcvyv5fykq9djc4n4j1nc75qqlzsfggbjjwhbk";
     };
   };
 
@@ -4019,12 +4019,12 @@ let
 
   vim-fugitive = buildVimPluginFrom2Nix {
     pname = "vim-fugitive";
-    version = "2020-02-23";
+    version = "2020-03-10";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "c452181975761f8b055b88eb1c98f736323510fd";
-      sha256 = "0zx9p9y45h26imrzw9nm5balxw7dmv94ynd7cn8mvml29v0awv2g";
+      rev = "4a24804adc25f915520c57a5504c45ca70e590e6";
+      sha256 = "0rlyrljinnzp058cajchlzqr66fdnwrzznwfahj0y1wb1alfz45a";
     };
   };
 
@@ -4096,12 +4096,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2020-02-27";
+    version = "2020-03-05";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "1bf0d57e01f930ccc1db3dacb3c169d6dc78d2cb";
-      sha256 = "18imfrn948c20y7ymgh1xqsd82939dswj7hkf0b0fnsi0w9ydddk";
+      rev = "52b66c0b125e095bc5a1d54d9810c5a0c8141906";
+      sha256 = "05h3yz4f3zci5pdpxbgg9kmhfh65rc8kxq7l6mpk04v92b7pq6m9";
     };
   };
 
@@ -4206,12 +4206,12 @@ let
 
   vim-highlightedyank = buildVimPluginFrom2Nix {
     pname = "vim-highlightedyank";
-    version = "2020-01-30";
+    version = "2020-03-05";
     src = fetchFromGitHub {
       owner = "machakann";
       repo = "vim-highlightedyank";
-      rev = "3871624ec89c9e8257b20044fd48a1836c05cbfc";
-      sha256 = "0n99rva98m6qillax8anx9kby5n2826qql83wa4x3ibdjk1zng69";
+      rev = "931cc6bd53e4a1fdbe592751f0e13c0e401f0a49";
+      sha256 = "091qw0zlc80micn29wb6r8m4f7pplcv8bx1yfvbn3cba77qyj3nb";
     };
   };
 
@@ -4669,12 +4669,12 @@ let
 
   vim-monokai-pro = buildVimPluginFrom2Nix {
     pname = "vim-monokai-pro";
-    version = "2019-10-12";
+    version = "2020-03-03";
     src = fetchFromGitHub {
       owner = "phanviet";
       repo = "vim-monokai-pro";
-      rev = "d99c93733f3461466773b52b26392cf9b35717c0";
-      sha256 = "05vk9hgdldgmijawblslf4sly67lqxljx1y9qs4dl2cbvz8gw882";
+      rev = "c18f35725a5b0d569bfe6921fc4f56c029324828";
+      sha256 = "1nz8jnlhd6z9zqa9dfbxa9fabihpzz8ajlf4plkaxdy9137z1zqc";
     };
   };
 
@@ -4823,12 +4823,12 @@ let
 
   vim-orgmode = buildVimPluginFrom2Nix {
     pname = "vim-orgmode";
-    version = "2019-12-13";
+    version = "2020-03-03";
     src = fetchFromGitHub {
       owner = "jceb";
       repo = "vim-orgmode";
-      rev = "c6cd668ed13af85d8292b524f827e729bf70ea0f";
-      sha256 = "1239c0yc51jyp5shwpx2j7kbsb63qj6zp3k2lirppy8c2lls4nsv";
+      rev = "44faafa1d846691645b66e83f198f46afa755a6e";
+      sha256 = "1s649hksrwq70xyi8cvcd9bqcfyczga5c1g4fsas50rs107fcccn";
     };
   };
 
@@ -4966,12 +4966,12 @@ let
 
   vim-polyglot = buildVimPluginFrom2Nix {
     pname = "vim-polyglot";
-    version = "2020-01-25";
+    version = "2020-03-05";
     src = fetchFromGitHub {
       owner = "sheerun";
       repo = "vim-polyglot";
-      rev = "35ea4d2b9072594b6c0ccf87bde7978ed9f94755";
-      sha256 = "0r72q4wbja6qxk64lhqh6871xlndwi87w5cnxfq9bh7cnrx9dzhy";
+      rev = "e86e0ad36ef9501acbc3e8c63a1d4fab104e47cb";
+      sha256 = "0xr0fv26bxas315bvz0fkw11cg5j301vmy02a2aii90ljvyviv77";
     };
   };
 
@@ -5021,12 +5021,12 @@ let
 
   vim-ps1 = buildVimPluginFrom2Nix {
     pname = "vim-ps1";
-    version = "2020-02-17";
+    version = "2020-02-28";
     src = fetchFromGitHub {
       owner = "PProvost";
       repo = "vim-ps1";
-      rev = "72de10080dcb7a906a51ed4eba67611c400df142";
-      sha256 = "1ml521kkgiazjizpmn25p4kbmwdl46sc5mq6yzp9cskssbj2c416";
+      rev = "7283c6bb25bbd45d8f6019da34c4f7e48c7644a3";
+      sha256 = "0gfl5b5qnbgh9kdm6kfl7xn5jdkkgw1w78ckwvw6v6y72c0mhhhq";
     };
   };
 
@@ -5065,12 +5065,12 @@ let
 
   vim-racer = buildVimPluginFrom2Nix {
     pname = "vim-racer";
-    version = "2020-02-06";
+    version = "2020-03-06";
     src = fetchFromGitHub {
       owner = "racer-rust";
       repo = "vim-racer";
-      rev = "bbfc89cef6ceda1a1bad2ece124be323134b74a8";
-      sha256 = "1x6y95zps8bxdbcj5939yvw2nz65w1038rs60cjz0xjk0h6360zz";
+      rev = "950b78f36e568134f5dcabc9a146c61e0084d220";
+      sha256 = "0k62yybilh2052w6zfscw7daz7y1qnqv1311zngjim5z8xmp7j1l";
     };
   };
 
@@ -5307,12 +5307,12 @@ let
 
   vim-sneak = buildVimPluginFrom2Nix {
     pname = "vim-sneak";
-    version = "2020-01-05";
+    version = "2020-02-29";
     src = fetchFromGitHub {
       owner = "justinmk";
       repo = "vim-sneak";
-      rev = "7afd63b4552b0827622ae27ff4c9eca056dd3521";
-      sha256 = "0g9vsxbrsfcc0n7rq9m0331rcjyv35z0yc0d2cwkg939bzqw75qx";
+      rev = "98a5c946d6dc76528b9d9b044059b5ef1fab5a48";
+      sha256 = "0xcxr658i5vzdkxfssd7zx6n3ar9b6dg4b2ddaswgnwq75xphrh9";
     };
   };
 
@@ -5329,12 +5329,12 @@ let
 
   vim-snippets = buildVimPluginFrom2Nix {
     pname = "vim-snippets";
-    version = "2020-02-27";
+    version = "2020-03-11";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "66975121c7c824cb7c4fa8f2ea53f824e538e3cb";
-      sha256 = "0m1pw3iq29jpp439yzkaszjg1jiz5qkd16vfkskmk2kkg84y3kqn";
+      rev = "8eafafe246152c94b64149dd04d9e03b87527eac";
+      sha256 = "1mfw69283w3xk9kawn2ms160sjzmxpfdh4drdis27fg27i58yadd";
     };
   };
 
@@ -5461,12 +5461,12 @@ let
 
   vim-table-mode = buildVimPluginFrom2Nix {
     pname = "vim-table-mode";
-    version = "2019-12-17";
+    version = "2020-03-02";
     src = fetchFromGitHub {
       owner = "dhruvasagar";
       repo = "vim-table-mode";
-      rev = "0af25d72ebc0271648c8f91c0ce5c59174d2761b";
-      sha256 = "1wqfc8bilknz1j1spk3iag99hmz5f1w87v95rb3cyp46ymrf9dcv";
+      rev = "6412352b544bda764a9616c3090abb09729526bc";
+      sha256 = "1z5v849vjbk4mdgkxs73b2nnvmqx7l6h3ycdb16qdhp9kppwmbvv";
     };
   };
 
@@ -5494,23 +5494,23 @@ let
 
   vim-terraform = buildVimPluginFrom2Nix {
     pname = "vim-terraform";
-    version = "2020-02-27";
+    version = "2020-03-03";
     src = fetchFromGitHub {
       owner = "hashivim";
       repo = "vim-terraform";
-      rev = "a0046044670c412bcccc44aa80e5642785fb57a2";
-      sha256 = "0c1qzc3ds7gvsp2vk7cszy11x57angmjwq1skfsk1zz7vgzhcj2i";
+      rev = "89c47c6c68f6260ba34ee0733437d863046fbe95";
+      sha256 = "1gkr3akvx44802i8cv4zw8j3bk5qk0h0rgz5k9jgkfch2yc76gzg";
     };
   };
 
   vim-test = buildVimPluginFrom2Nix {
     pname = "vim-test";
-    version = "2020-02-24";
+    version = "2020-03-10";
     src = fetchFromGitHub {
       owner = "janko-m";
       repo = "vim-test";
-      rev = "1dba5d0328b2d632a418dfc7b417ae83455cc342";
-      sha256 = "0rm1ckriwajhskyybnq83m027lhki8p7c5cykzl5f05ax9rfiva6";
+      rev = "e5c7c57a28a2ce8cba4ef6ff567d051d9f13014e";
+      sha256 = "0iqv2mirwxmv3y194j64b317v34cbzljlfw2vhl993gccirfz960";
     };
   };
 
@@ -5582,12 +5582,12 @@ let
 
   vim-themis = buildVimPluginFrom2Nix {
     pname = "vim-themis";
-    version = "2020-02-16";
+    version = "2020-03-08";
     src = fetchFromGitHub {
       owner = "thinca";
       repo = "vim-themis";
-      rev = "734262315544ec4c78acdabd1ac9aae18644fcad";
-      sha256 = "0sh9kqnkbbbiqsl8qwqslygl72h3wi83iw9iy2aj4zmw7k2g3i8w";
+      rev = "2d10aee9c9982f4f5974e88351934759c69640e7";
+      sha256 = "06ab0kjamzpyql71qmc8qhvb72rx07x2g598aidk8nqkk36x87ai";
     };
   };
 
@@ -5923,12 +5923,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2020-02-27";
+    version = "2020-03-10";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "63593e05440bde5f1f4dbcd30447f410940f94c3";
-      sha256 = "19fxcqbvxx2b60cj03qcaawwi88b7y4wamw9fk278d7q64933h2z";
+      rev = "efa5d6e927fa47a1f48f85d34a4760a1447f2df8";
+      sha256 = "1d44ihgcdl0j942vgjg59rzib4m7jy94k583hcnv3v9z8np4g0zp";
     };
   };
 
@@ -5967,12 +5967,12 @@ let
 
   vista-vim = buildVimPluginFrom2Nix {
     pname = "vista-vim";
-    version = "2020-02-27";
+    version = "2020-03-11";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "vista.vim";
-      rev = "6c8173a10633541fe99d54cc693874806e08858c";
-      sha256 = "08p4xkrgzfb9b3r738lnsp4hrly9p5bbzcv446qcflbxmbmy3fw4";
+      rev = "7c5301d87236999a6029640ca1cf86bfecf3bc29";
+      sha256 = "1ghp69f4q365vvkq3081qhnasjgi00i3vfs97llnqachmqbwig2k";
     };
   };
 
@@ -5989,12 +5989,12 @@ let
 
   wal-vim = buildVimPluginFrom2Nix {
     pname = "wal-vim";
-    version = "2020-01-31";
+    version = "2020-03-06";
     src = fetchFromGitHub {
       owner = "dylanaraps";
       repo = "wal.vim";
-      rev = "4c880407bcb6a873e83f845168e8a4ce90dfa856";
-      sha256 = "1ms9v8zwijz15m0vj2pg1p1svbvh9ghd072hgiqlbwphi2a5g9gn";
+      rev = "10f228ce1e7947f62be412f916229131b7710239";
+      sha256 = "0aiwsrcqnazam56cvwmck4bf7w543cr219bkmq0ngqzna72h9735";
     };
   };
 
@@ -6077,24 +6077,24 @@ let
 
   yats-vim = buildVimPluginFrom2Nix {
     pname = "yats-vim";
-    version = "2020-02-20";
+    version = "2020-03-02";
     src = fetchFromGitHub {
       owner = "HerringtonDarkholme";
       repo = "yats.vim";
-      rev = "97f53f67097ddc87ab64bf8931c2798ea56e6184";
-      sha256 = "15g38zl0x0a9vn4xql4siwvshlnvlz404d7w2falqp72hr91zzmn";
+      rev = "68ef9623656fe9aaa53c1d9ab906f09c2c095f06";
+      sha256 = "0cn1k8lda71vm4gx14ly9gdvk1j17jds0axx9jvjp4w9jid6ksqk";
       fetchSubmodules = true;
     };
   };
 
   youcompleteme = buildVimPluginFrom2Nix {
     pname = "youcompleteme";
-    version = "2020-02-19";
+    version = "2020-03-10";
     src = fetchFromGitHub {
       owner = "valloric";
       repo = "youcompleteme";
-      rev = "dd4a583e06f64751ac1439c30a9a40d82cdb741d";
-      sha256 = "1imlp6sw6a2qgr6ih5fap1x83fzil5glq44lrs9d5an6wf1z8jzk";
+      rev = "4dda6a71d9df17d8b44c9694bcfcdd55aac5b01d";
+      sha256 = "0h8ywblhv8dhblsxpm431fqz6cy38a77hvvc0r6fsj7vlbcx1n2s";
       fetchSubmodules = true;
     };
   };

From bb7ad853fbcbd158ff32c12d2d93941343418715 Mon Sep 17 00:00:00 2001
From: talyz <kim.lindberger@gmail.com>
Date: Wed, 11 Mar 2020 19:52:37 +0100
Subject: [PATCH 2777/4636] nixos/haproxy: Revive the haproxy user and group

Running haproxy with "DynamicUser = true" doesn't really work, since
it prohibits specifying a TLS certificate bundle with limited
permissions. This revives the haproxy user and group, but makes them
dynamically allocated by NixOS, rather than statically allocated. It
also adds options to specify which user and group haproxy runs as.
---
 nixos/modules/misc/ids.nix                    |  4 +--
 nixos/modules/services/networking/haproxy.nix | 26 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 979cdc5d4ad4..85e5534e906f 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -133,7 +133,7 @@ in
       tcpcryptd = 93; # tcpcryptd uses a hard-coded uid. We patch it in Nixpkgs to match this choice.
       firebird = 95;
       #keys = 96; # unused
-      #haproxy = 97; # DynamicUser as of 2019-11-08
+      #haproxy = 97; # dynamically allocated as of 2020-03-11
       mongodb = 98;
       openldap = 99;
       #users = 100; # unused
@@ -448,7 +448,7 @@ in
       #tcpcryptd = 93; # unused
       firebird = 95;
       keys = 96;
-      #haproxy = 97; # DynamicUser as of 2019-11-08
+      #haproxy = 97; # dynamically allocated as of 2020-03-11
       #mongodb = 98; # unused
       openldap = 99;
       munin = 102;
diff --git a/nixos/modules/services/networking/haproxy.nix b/nixos/modules/services/networking/haproxy.nix
index aff71e5e97da..4678829986c6 100644
--- a/nixos/modules/services/networking/haproxy.nix
+++ b/nixos/modules/services/networking/haproxy.nix
@@ -26,6 +26,18 @@ with lib;
         '';
       };
 
+      user = mkOption {
+        type = types.str;
+        default = "haproxy";
+        description = "User account under which haproxy runs.";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "haproxy";
+        description = "Group account under which haproxy runs.";
+      };
+
       config = mkOption {
         type = types.nullOr types.lines;
         default = null;
@@ -49,7 +61,8 @@ with lib;
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
-        DynamicUser = true;
+        User = cfg.user;
+        Group = cfg.group;
         Type = "notify";
         # when running the config test, don't be quiet so we can see what goes wrong
         ExecStartPre = "${pkgs.haproxy}/sbin/haproxy -c -f ${haproxyCfg}";
@@ -60,5 +73,16 @@ with lib;
         AmbientCapabilities = "CAP_NET_BIND_SERVICE";
       };
     };
+
+    users.users = optionalAttrs (cfg.user == "haproxy") {
+      haproxy = {
+        group = cfg.group;
+        isSystemUser = true;
+      };
+    };
+
+    users.groups = optionalAttrs (cfg.group == "haproxy") {
+      haproxy = {};
+    };
   };
 }

From df49c1bdc191e4607996ab40e80f7c827d571850 Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Wed, 11 Mar 2020 12:53:06 -0600
Subject: [PATCH 2778/4636] vimPlugins.vim-automkdir: init at 2016-01-17

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index e95e08ec6764..a5ef9e6b7996 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -3434,6 +3434,17 @@ let
     };
   };
 
+  vim-automkdir = buildVimPluginFrom2Nix {
+    pname = "vim-automkdir";
+    version = "2016-01-17";
+    src = fetchFromGitHub {
+      owner = "benizi";
+      repo = "vim-automkdir";
+      rev = "dec143a8d9b266f73a42c63ede85bfc26280f79d";
+      sha256 = "00ix0y1ijbis8pj7pf6gv2g5z2s7kxwlr0viybwrs0li5acym6jp";
+    };
+  };
+
   vim-bazel = buildVimPluginFrom2Nix {
     pname = "vim-bazel";
     version = "2019-08-14";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 0dc770ea29ef..8defd658e534 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -21,6 +21,7 @@ ayu-theme/ayu-vim
 bazelbuild/vim-bazel
 bbchung/clighter8
 benmills/vimux
+benizi/vim-automkdir
 bhurlow/vim-parinfer
 bitc/vim-hdevtools
 bkad/camelcasemotion

From 8f4cb371161d8bff91e44ca17f7111c27dd5f8b7 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Wed, 11 Mar 2020 20:12:34 +0100
Subject: [PATCH 2779/4636] php73: 7.3.14 -> 7.3.15

Changelog: https://www.php.net/ChangeLog-7.php#7.3.15
---
 pkgs/development/interpreters/php/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 77d27dfd42aa..4057a5025d13 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -303,8 +303,8 @@ in {
   };
 
   php73 = generic' {
-    version = "7.3.14";
-    sha256 = "0wn2qsfrnch90l8nxbpcjd2q0ijzdiiyhvcpbycngki9r6xwppxr";
+    version = "7.3.15";
+    sha256 = "0g84hws15s8gh8iq4h6q747dyfazx47vh3da3whz8d80x83ibgld";
 
     # https://bugs.php.net/bug.php?id=76826
     extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch;

From 5bf47ab9bb7c9ad9ef520456c0ccc5f7d3621b7b Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Wed, 11 Mar 2020 20:13:56 +0100
Subject: [PATCH 2780/4636] php72: 7.2.27 -> 7.2.28

Changelog: https://www.php.net/ChangeLog-7.php#7.2.28
---
 pkgs/development/interpreters/php/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 4057a5025d13..b3a92893a6c2 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -295,8 +295,8 @@ let
 
 in {
   php72 = generic' {
-    version = "7.2.27";
-    sha256 = "0jbhc8x2i6xx6p7zc30ahg9xplsqlz334m1w13mhr1qv2xdnkh2v";
+    version = "7.2.28";
+    sha256 = "18sjvl67z5a2x5s2a36g6ls1r3m4hbrsw52hqr2qsgfvg5dkm5bw";
 
     # https://bugs.php.net/bug.php?id=76826
     extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch;

From a04010b64ac87ea35c214a93a7c9606d3da65b42 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Wed, 11 Mar 2020 20:17:13 +0100
Subject: [PATCH 2781/4636] php: 7.3.15 -> 7.4.3

---
 nixos/doc/manual/release-notes/rl-2009.xml |  5 +++++
 pkgs/top-level/all-packages.nix            | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 892208b01d7d..e236b230332f 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -23,6 +23,11 @@
      Support is planned until the end of April 2021, handing over to 21.03.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     PHP now defaults to PHP 7.4, updated from 7.3.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 07e5c1df68cb..144fb202596e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9293,8 +9293,8 @@ in
 
   pachyderm = callPackage ../applications/networking/cluster/pachyderm { };
 
-  php = php73;
-  phpPackages = php73Packages;
+  php = php74;
+  phpPackages = php74Packages;
 
   php72Packages = recurseIntoAttrs (callPackage ./php-packages.nix {
     php = php72;
@@ -9308,7 +9308,7 @@ in
     php = php74;
   });
 
-  phpPackages-unit = php72Packages-unit;
+  phpPackages-unit = php74Packages-unit;
 
   php72Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix {
     php = php72-unit;
@@ -9329,7 +9329,7 @@ in
     php73
     php72;
 
-  php-embed = php73-embed;
+  php-embed = php74-embed;
 
   php72-embed = php72.override {
     config.php.embed = true;
@@ -9346,7 +9346,7 @@ in
     config.php.apxs2 = false;
   };
 
-  php-unit = php73-unit;
+  php-unit = php74-unit;
 
   php72-unit = php72.override {
     config.php.embed = true;

From 7ab00c48d80c012e3bd10d896849fe0621575842 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Wed, 11 Mar 2020 21:15:47 +0100
Subject: [PATCH 2782/4636] nixos/vsftpd: fix missing default pam_service_name

9458ec4 removed the ftp pam service which was used by default by vsftpd
---
 nixos/modules/services/networking/vsftpd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix
index 47990dbb3772..b3e201844236 100644
--- a/nixos/modules/services/networking/vsftpd.nix
+++ b/nixos/modules/services/networking/vsftpd.nix
@@ -133,8 +133,8 @@ let
       ${optionalString cfg.enableVirtualUsers ''
         guest_enable=YES
         guest_username=vsftpd
-        pam_service_name=vsftpd
       ''}
+      pam_service_name=vsftpd
       ${cfg.extraConfig}
     '';
 

From 1cbef111ff15188984e9b876977cbd21ab0c9dd9 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 11 Mar 2020 20:22:16 +0000
Subject: [PATCH 2783/4636] firefox-devedition-bin: 74.0b7 -> 75.0b2

---
 .../firefox-bin/devedition_sources.nix        | 770 +++++++++---------
 1 file changed, 385 insertions(+), 385 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index 00c8ff548d27..e84a48660c69 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,965 +1,965 @@
 {
-  version = "74.0b7";
+  version = "75.0b2";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ach/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ach/firefox-75.0b2.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "2dca0c3b07364118aa4b7950769e94b75e932836ed139eee3c91168236d7e0f3bb4775a6463550e7a4b20ba57a75e62bf31c4db5ad1c46c47fb256dbaf78820d";
+      sha512 = "73f8521550149a0c62c841b23289371f945a94aafdab6752b6b4838594147c68dee1352608fdca2682251db3fed691ddf606e0a7874e2a35c905c30a2dedf4a3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/af/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/af/firefox-75.0b2.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "e39a8d3a8cce92984fe786d6e1d8272eea27ed049ae1fc1a6c9f5202665c84436fbbd48f04ea16b16a046521536f741c92f217c09db13d84483ed934091b3b83";
+      sha512 = "e6933f3de32fa91f4835553bb8aa48ad20ea45288087bda59920d6edb616809d12cbf9966c722040d0473a35f5a4aa0a7c17fe38d8a0c2eef5fbc5d7451ec709";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/an/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/an/firefox-75.0b2.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "75e5e95ce56a748d6c193374741f6f2c53503dcb0aa8ea33e2695b74937ade76ae723ca7b397157aecc46d04419be3de19e020427083e5002043438e1461154c";
+      sha512 = "186edc252065ea668412630d7ae37a6cc465d41104578886c6f01bd90d8a605afe6e023cb9d566d53b43d9fe411fc56a4322e2140983279521e1f73fdd2c251e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ar/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ar/firefox-75.0b2.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "fffbb5e730f1ca4925c0fca2597b29a359bb3835c5338024f15614c720a11087d36edb9a7eab4b99e42e75b3f622c80a709cc7ce08aee6acab23287f030f5683";
+      sha512 = "cc5c4cad6ffd695590264ef222fae56004c3b626c8e36cdb3b118daf62e84c912f112df7bc8471cb9c549f385cc878c12ed06b1ecbca164f12f26cda3213e7d7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ast/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ast/firefox-75.0b2.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "b820e187245a7c22f959600e52d386188c1f9a7fa914ff03a9da9a7901ed2c090b7a057967121ac0c061047099ba800a33944fb5c629b8a41ea3e789b3385203";
+      sha512 = "62ef8d3ff486543b45751f4aa43a3b009ebc9c909d1e0904622c212fd534bba14014ec8389ef5d21815fc3d5909757c7289a814f3a836d94188819b94ebe2640";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/az/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/az/firefox-75.0b2.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "69b5a0f326c9c9cdb2f98709e0400da6fdf05c4abe7bbf385dc0593daee61f1e4874ef6ec6f1fc12f5a1ef6b290b6b44664c8977b17496133f7bb95683937ad6";
+      sha512 = "c2161b2f4a3decc15ac5e780126b94a805d521bf8999379643f4ff8f9c1630fb07094528e37f2aea8c8789925acee7c77d0c6a179d4428b984ab329a973a5a0f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/be/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/be/firefox-75.0b2.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "2734e21739a5fd0fddc3ea52d85ae268aa12f45d83e2a3a2529d96657bf03396d84bf9549decba412988e637989014b88cba773c2586a1fb04a0dfc439d71caf";
+      sha512 = "9e49307c8bb04dbc83532414a5f09ce8cb202fcd68e145d2ef132a20ee47988d459ef1851ea610ddd527f335bb68a7f1fa04041914097fd65f6fd03ea6499ebb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/bg/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/bg/firefox-75.0b2.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "d67ad4c4f282db155b41368df5094d6cd614d4e4deccb348b2873f710c3522ecd30511da368df97c4b9eb53a0588c134c7af298bf9abab602014d18d7586ef74";
+      sha512 = "ee5fe8387cffa96d449d4dd5a2671558a6f36645b15cdd017ebdbe7316d3e0740f05efb6ca5175ca917a937f4483175c9a20cad2fd956bff5110cd7d641a12c0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/bn/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/bn/firefox-75.0b2.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha512 = "0d8b5dcaf19166878c8fdbc1dc2b1743398cbcf7506089098dba170a5999a205653a048ebfd2017c4a69da4b71c8202245b64fa0835db14d41879e8a9772a511";
+      sha512 = "4409a8d09e837a95fbfaaa5c8476fe25d50926c11be2927c0415b8a7e71f18ddc392a90ffcd5c142ce4c5847ad493f3a51680e802eb2f709aa8148375c9ccd30";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/br/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/br/firefox-75.0b2.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "9d26f9c77c6e723cf942d5a656282857db008542a451fd2db59911f07acc7387a8ccc874c1c9ee25bc8e20248dedc72d9e1289c36d1018487929bf0d53093924";
+      sha512 = "cf71b0554eb8058e3f2457518d473b7170f9fa654c2f5033db830f633e7cb8ee16f08f651c245f4146f85b537b30f3adf235786d66c625cca61438ed502d7ccd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/bs/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/bs/firefox-75.0b2.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "b7d973d03d5c25c08b2515510ccf3115ebe498c73a23823254e8955f47e065c8ca2ecfd651c1762d36d7841d48a15b76792fa2ce9282f5115fa9bfed8f411b40";
+      sha512 = "743b0b485eaab640a54c6777c8849356b847d7fb4ccb56318007dbb01480410fbc119e7721393afbe2886af59d51b9aeefeaf495e670562dd16a350e803fec74";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ca-valencia/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ca-valencia/firefox-75.0b2.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha512 = "94912a03c29f673de7e0bc1ea8af77ec5b28e3694f042573e3f44d0b1298d2a8520ee5c062697ba838532d2247662ff771426de00ac6cc50d011a0bff1bc0348";
+      sha512 = "547c80bf05a23023ede2d7268e0c023756e196c3a18f81ef084cac330ee0c7bb69021f33ff926162a2ca7afd2c0b4ff08107a4e18560382810b5d7110cef02ee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ca/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ca/firefox-75.0b2.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "6ff2ef52764e1bdd04861373cab88ed59bd4640e420a1e9567a974b1920957f14ac1e578bf32e1cb57297455aeca40cb84609d1adfab86a751306a0554008f70";
+      sha512 = "86648dfaa650d18bd934efd57c5de495c963728f45e375b6e6f4c71caa163fadbec2b5064ce370e981bd668445314fff64374e15a17d2c8c337cb1f088edc486";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/cak/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/cak/firefox-75.0b2.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "0a870236f57d9927361906b4098383dbc8430766b3b915e5a872ccd2c8b56b56d78edbe025aea8e8a120bf8a95c9159e26065fb24541d9e4a4860174b1d9b78f";
+      sha512 = "023afccafe29bb6f70657cb0c1b9e285a661127599f0b4e350f814370b4afd17a82157e836ccc394e8bb6b535a7e7341981f006363c03a46a723e4cb480c180a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/cs/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/cs/firefox-75.0b2.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "38dcb5650759007495e76bd62a18b95c63db7f63e77e5d0c488722d00b4f7ae00df3adcb771d7a73454655b8192e3008988e742733eb56f043481e40c357b847";
+      sha512 = "7d14b78faf8151ee01e8899a85fa8f9851c6958f4c3d7a99f7cd934fed8b704c40d2dfe53e24ac5b7a44bf67da2131eb7cd8161c315d4e0cf9bd7cdb1bc75446";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/cy/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/cy/firefox-75.0b2.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "d07b503f1cf8b4b11a94fd2adea08ad0c37474d779d2cf7590e6700464260c81b0221ce5344f17e19634e1e6cd5f0a5addf50dce2cd4eacb10b6ff3783ef2424";
+      sha512 = "5fec2412e904bc231c4203aeb40f3f7a6386c56476f83e80e94c2395c20f09436b6d2195c42861130606d101639eeb2fa2f710d5f5e23422cf39befcf46c840e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/da/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/da/firefox-75.0b2.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "5386f303e45ec533e7fefc75d29252c9612126ee1d1415745c9f3bb9d2f9c12ec1cf5f93d488f83dcb51177b17f26ded417b5c93d0ccf207749bce8f1dd9de63";
+      sha512 = "b78ba1e8748775d3655305b3cb925e13423cc11e4429c806902b029a195105cc1ec83c57245c97ee046149f94488c8b09bcc043a0220cba87809a98f20d34e42";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/de/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/de/firefox-75.0b2.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "26003755df79996a18fde1e1f0dc73178a3eda884be22a5848dca65d9d1b60677cd6dc67435e3e40100149d894185b0b3347e418f302b21bc056d1f982547de7";
+      sha512 = "e5afe83d665cae93e9c25827a9079953a55dc1523027bfa8e2e8ecd0b347465f48e190233e3c7e08dcd647211a5063172bf05d55efb567a4f29c5123485bc2c1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/dsb/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/dsb/firefox-75.0b2.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "a0512e2996326fd8bfa63a97509dfbae54ed8114af1ffd4e260e0389ea6e64207095cd5cd9fb4e5c4a2b98ab61a91498db2838d72e6d259a200c636bd9521eb5";
+      sha512 = "f9455b9cfc3b65b18960d870db977fa57ae03801fd42c6313aa114851897a14f1a64c02351a95f5a841476c41b55a39f6fc47bb5173e21b2a7da0f6536d73582";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/el/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/el/firefox-75.0b2.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "832df3733c81629f0d432ac7fbf0ba0523104532673f0b584525b5238c9a18eb30d2919ef47361a70b5a8dbd11742767a1b7f57030814dce05f07a9b54a17475";
+      sha512 = "d697998bcc27f468bce353b6f8a4bb0c01f0cbdbeda5a0ffa92054b590eb8f2255654740db2e31fc95513c7a6a4de703772ed35122e7c4e3e9b21ab3cd9e7626";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/en-CA/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/en-CA/firefox-75.0b2.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "e50ef2f8a7ef4defcb7aa151ca5a8140d28da1111dba92b1ef8a618a65dbe812345f3737f1945e0f0c31d14e3fbffa833ff8f50e0390efc004d81bd2eb5705b9";
+      sha512 = "362ce03dfe65b802b153360be1540cd1c760e81bea0d35e2a59af701fec1a489abf30d52b1b1b0f66acafbc91c2bba3bc60bbd1f2a05844b7f53b25696712066";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/en-GB/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/en-GB/firefox-75.0b2.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "127ecc18969dc3226ca7e8a0b75cd7bd5ae96ab4f325655a049d4f57fd5471ed3e83e8587edb96e3a2c4cff0b370871266cd4d7b468791ce2e28eeed7ed91286";
+      sha512 = "d674575f46fe24fc85af4dea8d0c18b2c1c8a0e92eaac76447a476c5532891d87247f6497663fcce546a85e92076f23fdf3890c8c8e3a902e3cd6a4eab6b84fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/en-US/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/en-US/firefox-75.0b2.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "c4f47f02ec25a34590159f3e04b8e49841aad1092156b54b342869a3330cb7b36317196f3c65f57e73e4ecc6cc53f4cb19168425930febc100c53f626631fb78";
+      sha512 = "092e13a53b18c2c09a4c79b2fe15d49468b60509bd6668bf5710f425a0cc0d4f89216e3bc1e252b7781186bd553cf015c53c5bced5aefe2cbe43666fd5337f3e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/eo/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/eo/firefox-75.0b2.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "07f5f34b74c768d8748a32103163fd6d0d390241e8cc7a1c7e0c90d627d822457ffa5406d06ff28b7b18ab1f9ec4cbe42a9712d56a5881351efa40ea6deb7dbd";
+      sha512 = "199ac2eb0253659dc0c862869a72879d1d90d5b2d7d01a68dcc674e0b0b815f04823edea1d9794626e86489120da08585ef10c0852a636f1897df23e363579f6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/es-AR/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/es-AR/firefox-75.0b2.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "6f3531ab56ed0dffa9a1e22c86dca8f7869cfdf9b9adf8ae3c7d5ed12a567c1033db7b5c15daf98edbbecf0b450ff5a064e48ede479ada4b72ccaf0c851932ca";
+      sha512 = "0faeb4ef0fc8033156f922bf25367351e389596ccad6b2b435678bafd563ac0624bae5f5a49183e442ea93f1d76e8ac8e53121c6d8dfbea1f254c84d7d323f46";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/es-CL/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/es-CL/firefox-75.0b2.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "c969ce949167600c414b9f0ab649a72cd9b9c12e766b6b92ddf36735939d4d5471bf8312e309db5b2b6e1f508b0af33ebe35b8e76b67af663b300893b539cc5c";
+      sha512 = "f0bb330857416097308928d8cafd09c3d1fec559f78ac94e2fd3624381074d511eb8d5e2764feb1f33494f09be6b9fd3cd63e182296a8ddca06b84c673e2b0bb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/es-ES/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/es-ES/firefox-75.0b2.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "e5060f9a575b6cb430265f214a554b21794673db9334665d6cb72c476bebd3c1b2797c8fb3447297c2a06f0e243a6da5da7f9d22a403472d81dc8f754eead226";
+      sha512 = "37b149761f68bc8b2326e0c4ec9eed789ee2d04edc0e42219b9faba420835c7b4a7f2cde76a02fc4f7bd452059572fd2b4551fe9d879fa74c34f066689ba2934";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/es-MX/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/es-MX/firefox-75.0b2.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "48048e589d5b57c75a5eb7e3048f541766129f5c63d7e3773d5d62fdefa5afb02338e14f76d44c6ca0c4ca0a688cf259fe98d0fe23759808b9c45414d5009389";
+      sha512 = "80ffc2ab7314fc8a435aef01926f159166f4bd7d88fe1b44061abb80feb606115ba976cd321a2ba1384f2152499a59481e9ac622f1ab57d096eaa05b73f92869";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/et/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/et/firefox-75.0b2.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "3f196d585242bc7387233223210f444bbff50309ed2638e16a19f42f48c06701af560e65f127addf861536151717e099f548fc837d5bcb7982831c0e20384055";
+      sha512 = "87f00de95bf58fd3bcf54569843973eaa8a435d7a4d861346f7bd08ffa475bac7c43a2ab178b1907b9614cc6fbbf7af611163fb5c13e685f7c748e3451d01110";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/eu/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/eu/firefox-75.0b2.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "9b831ad80c7e5234243607b3391d422015fdc5276e083291e75ec1b2074c69e824c49481bee0ca9f7d23ec31f02a9fb72540dcf0634afed2a8427ece7d4e0503";
+      sha512 = "551e2df324eaa2741619c3f2fa3a6b3d90e3f85d1b410ceeb372541bddf2b049aaeb165cd33f4b20a7164cd7fa5e8d201860f429e35adb071eac22e9ff87f4e7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/fa/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/fa/firefox-75.0b2.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "8318bd18537396c99f496ef5d43b1d70756cbf7ebd153c6dcc272c13eacc57737a48c186e055bb9fcd10936510b038560257ea03ae1bc8afd563df4e703b05a5";
+      sha512 = "15f7a4b78ed89634d7ce99c0ea68c8bd1251c8c88f6d789f8bbd0f3b37c5d5f651b973478679c05d29c1b04ec0c6b6f230363f444406f451d9422fbda7770df0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ff/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ff/firefox-75.0b2.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "d2c46c0569d98f96415f451d2956e0a86fb030b254852cc552c48b546e31f75c5a6bc54a97607f3653ab330f1b3ea5d988fc933f1d0654919f2abf4d1e7c396c";
+      sha512 = "4c01c5163f14c531e9eb864b7deda329ea9914ea023cb7efb64cf4f56d48fd13d08dd4057207c4543a6b60bc23037d9c343ac36901d6819c422cfc14ea75b38a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/fi/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/fi/firefox-75.0b2.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "8b1cac6cbb141bc7dbf8bd33f6cf8b0abc7b97f38df83181241948b8d376d67c77125795a24ff64506e9ee5f986508005120b7952bafcbcd76fe0e802c23bdba";
+      sha512 = "a5c1063a00ae0f9dde7e51556aa42846230a5c802c94c84c06d4bd91cbe767363c40962b8e9d940f1e99141e73267fdaf8b35c85122b3fceecaf57a939507273";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/fr/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/fr/firefox-75.0b2.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "41b55258d992c751aeb60ea8c9819f05fa5365d98a0d305c3129c989c46d1022e667edf654856b666c84e48eb799f3194acbe8c2a278baab8ca5984656317e54";
+      sha512 = "42015fa91befd39501ede0fc44ba98835703bf939e7dc4de9ca6c26390350c0e1196ace4eebd4f8d9e162c8f515249eb61a56ed370cf7279831a75c6abca570a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/fy-NL/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/fy-NL/firefox-75.0b2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "cb2368446de46f90a567c6a2d698e6fc0e48aca18093c7feff581b5b7fd15d5699e3d4bbf02254b3c54cb28acf95c29b1f86cf8e2fcd40b0759dfd068907ae6a";
+      sha512 = "c775dbaf216863c0dfc91bb1d26cd9ba9908684d981b7c9ac416fb0fe5f1dde7c64ebf13b8864bdb4c56e7051c3e33e677e757c225876a6e1f88955ebe01cc05";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ga-IE/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ga-IE/firefox-75.0b2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "0c55d65e2b1ebab4c2e976c76eff205c6232b0f9ddbdace008c9d27d9bf25773e91b516a2536b1e7f069b4c7b468703da22d1814cc2fdd3ac1eff798184147df";
+      sha512 = "958277939ca65eaae828ed5e9a0f76b612be6f803176ddf0cceb13d1e60baa35a051ff95ecf344c1ca2d5cb6474dcc446c272053141d49b8f4604dbd70df8793";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/gd/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/gd/firefox-75.0b2.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "4723a47718cf1dec08bd9b3d6e0e7a4f857b5ff16ebba926f26cc6bd2000bfd19c238d05df1362d602da57864578fc2fc14c9f9c6c49e6b430a5118b22636cf0";
+      sha512 = "db79dc9ab736973d08e6e180a4b7b10e903c7627eb0e0222c044d4b3f4d4d3edbb9f2f73d0e6f19d304e4fa75208db6395c0fad28d1e3875386036bb30086c41";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/gl/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/gl/firefox-75.0b2.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "69e719b5f65c0b8392f1515bd46ac0d22d763ac3911b082bd1201f7dd70db53862a60a0a43157f3e3cc468bd133eda0d5ef915b225159736d936e754237b711d";
+      sha512 = "212a697f1289dcf582201a2f0be56b739a71d2ddc0157c65b567c7dbcf6f51922ab2d0743dd979134b1127661addde43612d18f6a4b88b530578fdfccaee4063";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/gn/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/gn/firefox-75.0b2.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "cfcdc2deda122556e89f7b32b97e0cd5a9a01970babd11c3fcec205de1adb0744674dba06d0a5b725c379d2a98dee592724d5310f4c8ce55d9fb46e58dbf113c";
+      sha512 = "713022f28bac680227d1bd5e2bedd36aff2950c0c2e498ef1205a02d6b3ec0bb7dfd754d18a43e7b141b535ddfb71b1ca711b1b4dd955c66ff469f43db71a8ff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/gu-IN/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/gu-IN/firefox-75.0b2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "b2c9551e6cb5c047c6169e5bb1e3eaa6272391fe3905554762b21037b832e2db75497b3e3d680e886821390a5df1df8c28cef64022e4fea77e439c97b5608ba8";
+      sha512 = "f0c80568e5050cb4758f8269b951f622441799e0d8ae70d1e3cc1c3a7af0972f6323ade7844f3b3002f8a701a2a1b29af320ee95e72a349ba9d9903cc4aee012";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/he/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/he/firefox-75.0b2.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "ec076d4f9f178c3ad69f38e10796057e6650c4771002ae3ab06b7334634482db783ad1ff946e291e55d6112bcd1fd07e37cb8a475af268ddb6fc4541e4ba31fb";
+      sha512 = "5a5746afb795c4708559218d3de66042f220f6357d634e20c001d45a3b86df99fc6b277875837ad13138bf86f2d9577c27fc5573817c31e434de41d5f13a6dbc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/hi-IN/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/hi-IN/firefox-75.0b2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "3c7e6b5343c6bbce4aba4069f543a09fba4df38350e30bd792028209d1f3f6a862a5ad8b08ece57b0e10b49775d97a5846a0fe71872cb3b8e7de0ff11059eb23";
+      sha512 = "b03942c6d93f3baaf0944ebeb27aea39fa331806375135f91e9c8e45ad1ef62c9468d05d4c776f2c4766c0db31183fd23fa16a18f860ebd75dc0b79ff2abdf0d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/hr/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/hr/firefox-75.0b2.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "44b3186b2de73acc348b2114818c3361dc6e09b8a865f6ca81af5956a7a5bbf84932d39e2a970d8eb314524bff6c0b59923e50ddff203c3844a7e075b01d16f6";
+      sha512 = "c090bb4ed245ed043218fb202f00e227bdf8a5425f78a9a311b1684df0d1987c1f54904f89a46a8408c28726e06798da5755ca83c0b7383561f9035ed4b8c105";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/hsb/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/hsb/firefox-75.0b2.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "b367e8059e20aaabbb53bcdcf6b84d2687e748d832b1eba6fbc23ff097b5b8351d303fcfaf6cc12cb9921231072838c3c865ea1737e25ed533f523cf70cce194";
+      sha512 = "71155f0231fcaa744be1828967a1194b5ecfcd30b2ead3fa0294be46ee7ed3476636304862c3fd222359ac8fadfb5279882bd2f7965eadf39641cb611c12d6cc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/hu/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/hu/firefox-75.0b2.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "bdf99f29203f13973eb100e83827ae669bc0d42bd12488a3653caab92c1b73edeef5304db2678bf6ad59a86e40aa14c552518765468bacde63ec4b4b12da09a2";
+      sha512 = "f35a883d82dca691e4537fd9860d72c8f68127f4b91a7dc1641342eeb2207700fe31965750e6916e1633728ee022bb9c940fef37d3d973bb4b1f1689779a74cb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/hy-AM/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/hy-AM/firefox-75.0b2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "4677da96c94600d9becd6870acc2911e385093775969afde671c900700eaa56b25a4292862ebf3873a704897995c87bb249bc17d0da8394bca4d71d13bb85369";
+      sha512 = "b0c61c67db761c1c6833aebce55c02e17aaa7200150379ef9ba59d94d8a40ba61054863f80d0c6740a1fdab4abcf221b98407c4600507b0a1f363d4356fb1503";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ia/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ia/firefox-75.0b2.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "277cf81214b0cb0a41f9dce8704d387eee36e6d947e7f625239fd84bca25d850d6f43db92a88bf68b3aeb12bc6e2174421fe0a006b80b89bade5de949914bd71";
+      sha512 = "711ab43445da8d8f72411148fefcaddb346e253b191558ebe9fd363154bf6eb320a7bf5715e9c47bfa154623c2a4a96461aeecd69234155b130672bda1a991ce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/id/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/id/firefox-75.0b2.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "26b3e8b4d375e57bcc3c1b7a641f27240106a1c42fc97913eb3fe4cf5f51885ca9d004cd95df1a798270a7a16c5407ec519e2ceeef4626480e7a3440e45f237c";
+      sha512 = "a622c5f7a0e06eccd3f3a8da31b23837dc78ca1bfd3714c002ad551c6e12de8331e1ae12665395ddd174aaecf3b793f5190b51e34c33934f68636c5e49996a00";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/is/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/is/firefox-75.0b2.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "ad3bd0a308f8444ba01b84175b3bd72dec2c234edac61d5ad839644d4a09b89fbda61951229ac43b4f152c5ad8af7055477fac2fdaf71c2ff737ea73089339f3";
+      sha512 = "2ed96a3de14709ce8c03e86b12ae1b77b707bc17bbccb05b0462680f19c0579e458be29c48aa293d6eb841aeece5ae8acd7b38209716c8d3c769297741e283e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/it/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/it/firefox-75.0b2.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "a6c2ae689f748c8c306122057b267191e59e9b8bf273600beeff7181586c54c3c014b74aa88dc286132b8c998607b0246012a12255025899e7c44619a3940a9c";
+      sha512 = "302a12bedc6d20a568552da06c5a03cfae9f85d34cf8c6c5be1385025f3214affc23d1392fb237bd6f215ad12fcb0600230e87202ade6b9cc3ae5c13e0878f5d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ja/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ja/firefox-75.0b2.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "1418d6e286a20860d7b7073e5f3a15127545e27cc8692a50c178e7d5311948716823bb9ab713450f6bc3fe2d443165971a8e6ad2c8251ffbb2379d4953b37714";
+      sha512 = "76217b47ae6936673906c0d60e15a516a855aed316df646f50a05228c52e63c19da8463c779ad95008ad190139152efd9c94603c2e71d3eaf28128832a70965d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ka/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ka/firefox-75.0b2.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "039af653f9e75736027acec1f0e405c350ec66f4d343044297089601bae01fa76d6baae8a9b2eedfd31981d8022f4ff350817fb2505ad3f5e59aafce3441fde7";
+      sha512 = "f61d5547e24b91b03c876aeb63764b9d382061aabfc43373cd0bd72be1173296ac0470b78861bec755ed83b0336debee3b63c93fb7b8f2b58cbdb4098b43004b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/kab/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/kab/firefox-75.0b2.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "688930d5d2e67d03695abbcaad36880a052a4196fbe8ff406cbd7bfa0e540394836b15762e2ff64627a4f4e9abc16a58cbcd2d362624bf84db2efd6a4008c612";
+      sha512 = "79368f5f6a68586927cc8831a1b0ec5af4141e17326f919cda3f526c86fe210dcb80fb598a04441d23559016c99d2e090aebec2ce4fb34e45fdbb686db5a5466";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/kk/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/kk/firefox-75.0b2.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "1f794ac9678b81af8cfb8ebc6c379d9e0603f2da337c23df1161170d54dc3967d6f89411e7b550da0ad1a2b7cd5db11ed5040d4056b333ce5dc66c1cd4629534";
+      sha512 = "dc8ccef23f39f21b1d669968f72bbdb63ddad45b869b3ec0ac1a81c0f6b00bf5eb272426e4a44d002b51391bc86ca91b7271d48877824d094455ad059cb9b624";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/km/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/km/firefox-75.0b2.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "54057be25090fcfef69ab8ca2e4bacdfb96769f4e797fe83932bea198605a183e8bd8941484cf0e91c3e3a4fd4ffbc384be09894cf381b777649cbe340bfbb6e";
+      sha512 = "79ee964f99857f95d86a9d7ed45e52cbb19711a94aba236ab594a0bd98585f82957e113c02dcc0e094a23e5857107df2c8d3a88dbdda8fb9a04095b350155361";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/kn/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/kn/firefox-75.0b2.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "6e36f0aff051302132e5f83667638171b3bd7437b9d0fb3160d0f069b1131c617df6668d0de0a866e905073e57d6ac1990c9f00d59d6cfb179dd4eaff6384aa2";
+      sha512 = "47648e65c7ca94b8208d6465544ecaff521e03b7abe333954edcf62ae24d1f0e886cbf63c637eb8aa6c97d3af1fcda88e8b4dedc037469a7e25eee7ef55fb276";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ko/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ko/firefox-75.0b2.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "6be107f8f29914633196903bb687f7d23ecbfe70f4655247a5a260ef01a0841cd843600791867de64575caa63e0d3f09935eaa7ff154673d72fe044e5dce7c4e";
+      sha512 = "dff738fabdaadfd325701b5e070e755f8e30c69e954b3a51706d6cf10e8888e55641ed9ac1f1d3434bcbf453bc86b9e4755cb596fba2c6928aa1e10dcdbecea9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/lij/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/lij/firefox-75.0b2.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "7b2ce6efa438363584daec053c99a4f61133ecf151070c9fb7a44b340a60f3c132ab92b9df50ec7ffc8ae556951876d3a4a3ef32551fdba4a359d7fb80da13de";
+      sha512 = "64a5d2546d0c10e9007c947b7ebada5f779ea5447c371014cd06edc4d6ee4e2511b8d3b5b39c8498f879734e7dc65f375bf32cde445a0331cf81465d61c90df8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/lt/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/lt/firefox-75.0b2.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "723dbdbd1881f8f072a63ec43050855dbf147e811eedd983f568fa33516f150fae2af615c565689690b3e9effb119bb0b3934022c3a5800ee9d5eecad4e42c05";
+      sha512 = "0ecc945a159d80dd86a8b66061b9278a92a4b8f6f41dcd6f260202f1b57a8c0f582e7f92fbca675de8227893ed5f86a29a7dd79bbf95264dfbb2592fb499ca9a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/lv/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/lv/firefox-75.0b2.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "3da0b6dcb24bacee313a5c654ede55885f538d4c18385533ba92b32543da0e6a790c242c9b6cee92c4320292aa2c7a4975241feab89647d430fe0f7cefec350f";
+      sha512 = "d0bcb0a69c29be9ebbc103830c0c3aaf264e07c6de0716fbdf38eadaec70d7d2928f64256e66a7e5bf916e6306e3dbc1105be12129e26254f2e5c969d348345d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/mk/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/mk/firefox-75.0b2.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "e84a8051a9e8fdcf9e27084166e8da04898dc143045feae305c676a02c6381e3d0f3ef2cc4a74c6395075d9172fd75b4763ce262c42284669d542c56ff0056d9";
+      sha512 = "86924cb5f2215b84aa92e20db474ebcbaf9428692f1dadf92af5a84f6eabfdb8ba86f304671f5190b0241ad564b639fb6a3311145f989c9815caac588a5b652a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/mr/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/mr/firefox-75.0b2.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "23b8ce5221190e3d147752e8267d27edde8f4f2981e4c329a5e223063839881417204076335df8c5f50f9a0a754d4b391020ea7ba5222c64ad7ccfef3ef0da68";
+      sha512 = "c3eda294490d43f5d3565d17da214c8743f21016758c3892958abeded0acfafa01239c3b9921a8ace6d973252952ecd48c968f915ebb58632accd6ff378ccaf9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ms/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ms/firefox-75.0b2.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "6b9d37b331fc1f45cbf0ebfc005f47375a24cf0bbd7e68940c6804d9afaa82aac048ad4bdfd0a018c2ba4d275a145a2a64f3c62b1f46193b2d59f7a9f0ca8b5c";
+      sha512 = "a05273b907ef572864b90af5a1118feb52d47379c9e642c23be5767c6505b180f7a45575d9853e754d8ca7d0e73cc955980d29cf628b9a5cdf553a385822e9f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/my/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/my/firefox-75.0b2.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "bf2d1cec77a74608db287c5079db8a7681f18486ace763e59b59ba0833c2e1f61d10127fbe34678fcd15f4864b1e94be2160fcffd14a62612e7a543d8380661f";
+      sha512 = "2b566d3ec5ea31599f1ef580cb18c5e1b85a73f6ec186c00e64f11e668da3b7c8eed1f8fafbe4fc8e33ad51859b4b02ef1596af591e9c519bfdc798320d0e013";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/nb-NO/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/nb-NO/firefox-75.0b2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "2c93b5c1bbb1d629e9d3fe38170b610e8f2f4332a12ae841959955051e6e6f4d56c6162f7298b9ebba78c36c81c150dd28c10b18d194c3ba7116733df5bcf7da";
+      sha512 = "7608a9470683703efdda2fcc4168bcb4b77ee006fc1a94329de91676b9922d1540770a760dff84ca10b2c5a91e6f8b1adf96d9cf8d9b333427be373d5f4def3b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ne-NP/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ne-NP/firefox-75.0b2.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "e6443dedebdb4d11e3a07adccdf92d221f7ea05e257389792962331d9f3f8839d24509dc996b39843ae9079828a21975a026f6e0dc75e06296e2c392781f70e9";
+      sha512 = "17d488b5a8db722470fa0665f3985f9756a1e5f76a92f3770c4688b96148503697bef4ebee523071b7769ed859bb6cc70b5a4997f7126bf428da5433decd3d17";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/nl/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/nl/firefox-75.0b2.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "b6c0e5a0ef7af5cb1c9ff89e682e9aeb0b954ba754591dc54c8a73fa1de8e3f37f5f78f614e5aa82eca5289dfd62782f9128e984f79fc3d36486a2dbd4affc54";
+      sha512 = "e773852f0f9a9dc60fb2de5b85d33f281aefc6b32d0b6e4036af6d46dce0aabad88f0d772180a14f876c42112c65339a87177d53477f672f83f438ad933b3df7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/nn-NO/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/nn-NO/firefox-75.0b2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "9b2c0e29d4bc92685ef2c914c783dbbc663cd6bc9ea6f15e398ab8f8fb238159ad0dd84647c28b2c9e5991e75195fa2f305690d9f7f98360c8d40754c10d4bab";
+      sha512 = "e0dc703dbd18b1e08fe7e6b6d1d359389497aa4339bedb5bb3916de0c1bac40acbc0ef8bde51cfcd05167c98dd81c9b06e53bde773f4c2a0d51bcc9afd8317e5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/oc/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/oc/firefox-75.0b2.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "9a50ee9b626f3f96e9d08a5f5df174f8b89692ea2fc3b927f260e9579174273f78a9d11efbd1007b4165331dd52e52bbaed83a77ed458aef166b764a2bc5d559";
+      sha512 = "067eea40605f84011c9cb7cae951c5a4d3ba2952971a613148946f5f83a4dfe19576f6b9acde65dd2d266bf2bf5ab83ef94e4a169ec54a70091e89b6ce7ba8a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/pa-IN/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/pa-IN/firefox-75.0b2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "9f29ce7b0002e41a08c64129a08a0946dd622fe69e6dcc30747d432990bcf4fa209256e74b1a7ed51364fc142449e010f6dcd61606441f1c4cfaeb4440269ae8";
+      sha512 = "edbd11856f14a1c2e4dc430752a9dc78b3f5f6d6587208e936b436aff6e2384c8604e9dfb90f292690f7ab7952b2b6598b04635972640336a17b01a03b7d7c62";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/pl/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/pl/firefox-75.0b2.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "c8ae484055f3b0dbc81043355903f8f8b60c3c07f431b904d4a181488461a810b8912099cc0ac23adf026e377a71a2248ba216f840ad35193d774367d484a1cf";
+      sha512 = "78b9c89b93edec1e3a53697f3212c7084c714147e44437620b966f2a90b8b2c917bc219c3b8cba27b08bc327515e0993a7380b3316d2efb385be7af120e72de1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/pt-BR/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/pt-BR/firefox-75.0b2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "7708ab164dbffcec1a90a42b18bf6520e0d1657cc33a7e96a2b241b170649c2a3808b3877bd413af835d269c3ecadcdead912bf471c6f84f811a293612257087";
+      sha512 = "3ad8e83f2169ab552cb6e03f60d343762571824cef104f7884352583a5d77caa2a1e8c85c29793e43555dafd8761df684c8d6d11b733ff899d5da2b7d42822b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/pt-PT/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/pt-PT/firefox-75.0b2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "229d4ce0e510f178d08474dc663a598bddb85bcbf23db6a98aaa2179d9e8824be65da0b49313854dd96077abcbb401c1fbeb9a5e3fcff1fce457b52bf97112a6";
+      sha512 = "83f4200e1de395c37fdc626aa6dfd3ee35597743d5f4d32832c143e917983426a725b0ae3f73090a35abdb96fb2c7aa55fc4595668641ad868e9b596679ed2e4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/rm/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/rm/firefox-75.0b2.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "1ad93043f33239894c9d38b49347445fd0e462dce882bbaea39242be93d71233fdc621c2778980bcba089d5d72e60a751fba4df663b19c0cb061bbefac5ad637";
+      sha512 = "5c25da1ff0d73ecb7b77901341350c7f8caea4c8ee2d40740ad6f5ea70a7a83127df8efefeca2ef3b1f3240013540fc4f70208955c62c25e0ad9bc7c56763f92";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ro/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ro/firefox-75.0b2.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "4968c4a27122bac5f4bbbcf2f55064d6d42b35e7877da3a2cabc0c877e4bd70b1a5c9beb81edc4e13cd0bf34495332cc137b08a6dd223a52b8033e4a1cf10126";
+      sha512 = "fd60dbebfec4b2514ca7151fffc9516c94cddf4bfb75e337735e0025746d1d19ca90762c84b97ca15893e81e29a1f62fafb4c970fcf1ea8e191fe74238078537";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ru/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ru/firefox-75.0b2.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "5fe2e24d79d716822463a3aa89ea63a578819a028e1f4715a5852ea1f8b05cae906b4140dc21c6fe8a2f9a33c3d37363f254dd0cc38b4c480a7e80becd2fccd8";
+      sha512 = "db1015936799ed1ba14a4ae81adc5046e9b51b99fdf01d3e88e9925bdacd8367d97662278e2512cb15eadc4fe9fb40a6c4f66bdb6c7492dc6f411afa6e31b430";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/si/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/si/firefox-75.0b2.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "10e1023ff62b4e66244a8f0e9d937b338087934d12cd9ddbb1d5935612d47668bb2e704406662efe962eec89b2dd4ea53c2369c524cfcce0b38dbed01cc3fa1b";
+      sha512 = "16b685a3d27a94ea3bf1c35054d2b5c6b718e528598f0a749382470986adceeaa96e194090a4d0a0d3ddd3ae8b70b57f4a31307e81c1dc15dd7e30d4db8ea359";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/sk/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/sk/firefox-75.0b2.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "15fdb81e23eddf249eb5c2fd2f0f5ea824560a8a34f3080efa29ef484251379b9eb86afb66987311fc892c38021f81fc2664fc41d0f9eef6135e426188083a34";
+      sha512 = "60b18d7786cdee2789cab02ad9fb28754ea9cc5325fe780b46f3e0766ef37cf0a7ffeff4ec1c207db3b0e14bfedf2a1598fcd0adb4ba28c63ba6411d2c95c79c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/sl/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/sl/firefox-75.0b2.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "44cd71b632c0012133d68537aa4cfb5512f992ddf227901d35f9ac6034e38cf36190c4c75b95e0ab93ca172e0317922a62497e9458edb0b724d8b66ccbb06190";
+      sha512 = "55fa56427b0f6e6667ccc12f6b326111e7b19b88b231d084925d57a7d8c1528b81efb0be1dab5c0a857efdc112189d6d72f86736793264a866dae120ac28acbd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/son/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/son/firefox-75.0b2.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "419ee0cc45d6d0bef462f093b017856cbf33e1dbb190d822ea0b85bf91452f583244a876771e1680de1e68bcb0977039187dcef56b44b1cc14e4e5e2e7c3478d";
+      sha512 = "7a6aa2228a562910e1e1b0f358669d4da66112977373c7bb88e3138bcdcec8cce0c8c7530700b28872f5f38e6ac06a338c6740959b4ff7d75091f2c378c4a905";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/sq/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/sq/firefox-75.0b2.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "787ca501dcda265430e825fd890b6760b2295c812ae882bb7d07ce40f349ad2dcf4852bbfff0c6cdb56011f3948afafaf0dbe76842e0f011f9e4e15214e07b9a";
+      sha512 = "4a2eaec9124333ee83d461762ba1d8fd12c9c108b1bcb7203e4a6d437e510b26eeec2706f8338f85ce161292758e719798cc20c6b79a0466be22dbdfa0939f88";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/sr/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/sr/firefox-75.0b2.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "8bf08f9460852e66649d60b551d3d628f7507c2302f56d457f2649437d6523e74ea702115895fe2ab8ecd4a3994969b89d24094c0c41cf8ef81eca140c63f80b";
+      sha512 = "a6fe13a64012c7383313304da2c8b4dac691416ba50d364fd6a40679353449700e2e320103fb542d8a979509730de2c84728fefd4b1fb2ebb203f7c7fc52b808";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/sv-SE/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/sv-SE/firefox-75.0b2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "75f71a1c906d86ab92c0bfa6b2d07e54b3b411037614f27b463f7f97b39a73df920300ac3c227a7c35a062c99903fee84fa685050cb9eb25bcdbacc99650ad12";
+      sha512 = "54568bca3be19e5d9777a2d0cccccd936b2b3b559b238635c89dd392a1c7f72504aa2198413d6954cae18000ded74593147a11abd9000ef10f61071d531b0e28";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ta/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ta/firefox-75.0b2.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "cc147836101fd0b17d24f696fa0e5d4a4fdc2579f21deaf95757a3213d967e6e934691af5c7fa84bee9a5e0a3dab37067c8d44be821eb5f145fdbb5cd96c30dd";
+      sha512 = "a6b68224395e3ddba38740d283e1841ce43a28a1f4cbe6810ea71d6b7cd40001dfafe2fb053d212faa5133e2805366575566de2bea3bc8d3acaf7b782c3cdbaf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/te/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/te/firefox-75.0b2.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "f4ec0d17d604caad1b3eb37b413b9685bcd39517e680e1636ab007cc4cdb253e71a2643c85436be72de2fa62bda13dad6787e2e8fdda3689e421818d2bfa4fa5";
+      sha512 = "e20d28c7cd95bbbe5b1680301d94894bf0b8c60aad997515d73f792c7fdf17c3efa4314c210082886bc8957b00a7f919959815e15b994bb616bd7c0ed0d40100";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/th/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/th/firefox-75.0b2.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "f09b98036d5822d588a1afd3befeca14748d9f7938ff101f0555d740f5586462c07ebf76c90a3238636a3d37fe3f5a90b26fcae1de8658cc0db712e2ce3d2116";
+      sha512 = "11564e0ba2770f87549c272faecb746323e19f46d9c6e116ef44a977d571c4ab917d89d1c0cab702074242d36f544fa4a6810bedd2b1088af6d3e23cdd78a924";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/tl/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/tl/firefox-75.0b2.tar.bz2";
       locale = "tl";
       arch = "linux-x86_64";
-      sha512 = "28ff7d5cbd6a41ad2887dee8c04b4e129d588cd20758a2f2233cc69e6ea24cfe7013f5f21524be30139e243fd6bcae1193949b653360db65d8544e6cb654459c";
+      sha512 = "072602e5f2973d7412dc8d3e4d0aa4a76aeecd493e2a1444d9348e66ee9dbcff1d8c09f35ba676dbf2f056aa0e843e87c2da6d73c6f3efd38281fea7f60c5d12";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/tr/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/tr/firefox-75.0b2.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "2b676a0d0db8edb3f1af3174b7543f6cd704a61197ce9f505eecc53f7431c66c1b0853a0d5cf57c9ec601377bbf66efddbe648ec992b4e518e85bc83c8f052e1";
+      sha512 = "2b5ca4ee7ff322fbb986cf4946fcb65617606f8f317cdf357a81c2a9beb6492b3167286cce7a18083df5bc99a5782f98953ec79f6ed314d84b734f41c5b76254";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/trs/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/trs/firefox-75.0b2.tar.bz2";
       locale = "trs";
       arch = "linux-x86_64";
-      sha512 = "0a934e3106d9e99e6bc2d93d7f50d6a87e146f0a5d771a6a9f52a18db8cbc59ded661443d6bed42c148e6981e8d809f3449b27bce9194d584f6d457edab1b549";
+      sha512 = "10ed6b3cdef78a903ac32bf02dd767a016a33e7d59de0dbc9586d8afaf16ddf8bbceb557909753ca52e1c0fe1b24da5b72c3749bdb7a56986bfe30f49e2f6d9e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/uk/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/uk/firefox-75.0b2.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "3860b93570cb44849ba351b15318425c8a5a2e3dc82f6a229cfaba21d22245f74b56672ab82fc48d52c250c528b9bccf53d25b6d358e5b02493b6fdd82037f4d";
+      sha512 = "2e640904dc0e6735510ec50a2f735f3647fde090f2c4a48b34ae2d123e39ad2b71923e58101a646da86d54865dac69b2c5ec7d4d54d30cf9521008e9ad6c0f04";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/ur/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ur/firefox-75.0b2.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "89ff25d895fd5a484ea78ee6be21b7789998215847445d8aec7487966042fd88e5703938274245b940807d7f668f21b41b8eca5eff0d5ac715f3958ed8a32dce";
+      sha512 = "6aa743480ea70566a12f4486ed8bba83482c34387773f6ac7735ac4ed6a14a9e7e53fca77d5fd295c6cfeeb395fb309efa41af0bd00d77355e4b2a2da2575e2f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/uz/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/uz/firefox-75.0b2.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "60cb02c912f359915ceb6732a1b8c358177966bb24ac7849362b865b1570b31266e9a9f2790384eb2ba6c15298642e8e112ee85c9cae1da65b62eea5332f65a1";
+      sha512 = "3292332ce5efa59d889c0f32daab5279a37b342c98e6f4aa05e90a3db8c91f8517c26fe83a5cd59b17400e7bea0e256ae8a44b58f9b620e58497bf3fc0a52b96";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/vi/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/vi/firefox-75.0b2.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "b19c3a265bd2f218d1f7012397c081690f8c949d4146c0d504409858b323a9084c00e04e540904d82c31ebe586a47d1cadf3f9ed74be0d20544af7ab95583486";
+      sha512 = "8969ebe5a3148b85daf23f7a4299e755461c722b4696a700e2b6c66164ce14c60d2891691afb4093cc394021718c670ca6bd113bc8dbb7f6ae705299fc51f9f5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/xh/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/xh/firefox-75.0b2.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "d0e177251ee7c2f756083f1f19993d16c365d77f4be3811a11e6f93384cf58c23ae8579a9a65cf289264e0e45705226b4cd1365dda3f8731d95c2b0d20912066";
+      sha512 = "570a250b522b5061ee9b3fbfddecd9018c93baed7e813847ab9fd9426855ecc6bd940e15dd08b5bb0d3b34991245104ee95a5da4f74c7aca895fe086e0b66973";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/zh-CN/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/zh-CN/firefox-75.0b2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "30bf6bc54b91826ed9fa30988f069afa7b13e35d3ca0441f10107abb367c970080217123b22bf4ddf046db99394e9df46d825d91e5fd4ff717f3f025b3d54159";
+      sha512 = "b86320fe1ddbed83cf9ceba5d60c0d40e0e137f509a13b70be7b2024052bc5589fb3bc84ded1b3987bff6416dfca11a094f7e6fe881f04b35899fcce2854ce0e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-x86_64/zh-TW/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/zh-TW/firefox-75.0b2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "b10365171ba6fc4265f9684524d1270c7dbbc1890fe01154c7c4286335523a3ee7bc98fe8e86f874a584fdf30bd64746c9e3c62ffc48b55e97f9f728ec844910";
+      sha512 = "0d5cc478d801dc2a70bac8a38bde654311d32ba5059f0047d07e8fd321fa593ae56baf3b8c8f6e93dfc9c3ea4a9c5298079271220da0b92010e65eab2b7dd707";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ach/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ach/firefox-75.0b2.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "54cf3f1a2b73f95e6ebd276c5b9ca40ee598c67e8a8f308ca969a79532614a10c9dd4e06f0a5f2d580a514009938a493676d46c969a257c1d3d90ea20d588a4d";
+      sha512 = "f95b9ba5463a59a45fd34abceb5026c1f3834064cc318f91cf76aa118be5a796482b5fea14803f36b973c7a9f9f07af83561248feb7f92c82c1ec793471715c4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/af/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/af/firefox-75.0b2.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "dede24db1ca9c1064b8afa51e87187e9eddfe8f3f159bf268227e941c7d9edd08823927c10b6681eb79c335db567575c0e0a10eeb24561deff0e587d4d5d6f78";
+      sha512 = "4f68f211b7f2bd2e6c3f42f9698eba479b2c9dc60f8970cee1f0dad2f9a231ab8a1f093da4d1fca0589842e94bbda148ec79fc09290e1a85e7c505cb4f006020";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/an/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/an/firefox-75.0b2.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "841d9c1b70a1ec0a58939abfd7c5932c7db76ccf1b77f7950ef3e4a7541219120d638562d96159d9f6606ad9090db04796c7b5e1048192fadf5a490ee2489135";
+      sha512 = "744962dde4cacbe6d9ba67fe7dc01a4267fa16578127a48d7ef59a2ef6768dc70f681bfc73405e827a1cf1b0b7d217133663ac47601fd35ece900d851c7ff78e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ar/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ar/firefox-75.0b2.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "7e12b8cae568f82de67d8f4848a092ddab634fb8c3ef3caeba4f7bceacdb260a12cce70df7fd80c30ac3b227647755141fb367aafe692db31c0e58415a9fbf85";
+      sha512 = "f71b142c885ed61f78921fa058ff107cf4079c1a7f0c5fb67ed07a30188d878086cf4cc3b07c3ec2d6a7febf4f2126c739b3dd14f2462d2a8cca418ef4b26b2c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ast/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ast/firefox-75.0b2.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "c3b52dc3eb427e24e2566c383f8acc1119f6f6db5447ff6aeffccd65c97f370532252aca2bfc7bc83ae1c98824c8ee9e39b76a50ab3b5849669621ca9446e136";
+      sha512 = "3b30a05ccc6d10af86f7342d8b184f78e789275031ef317548acb051ca7f5e3b6e668f67087818a750999265674573cb55f2860690bb69a155d4e762bae59f52";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/az/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/az/firefox-75.0b2.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "7d61d36d5dddb26de5face1f53aa74104b3a451eed26a194d4918cfd5e1c8983007b2ec37c60327d1c733b6595521c88d327a2b71e3e237b0ba2b52f06d6c659";
+      sha512 = "a054387e9bbafa9c99013066627f028bca1bb59fe01168113957eb7b28aea6b367050bbaf73271ea332beb7d634f2374de0f7b29b5e72b37ccc65065efae0bd8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/be/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/be/firefox-75.0b2.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "233258a22818b7a3b6726dfa3fa8d3e702d3ee28440ff987676472e8b865bc23907adab61ce994648617a9e83fd530afce567f77536c3fcdb7434c9d1663ca5c";
+      sha512 = "e865a0721f0ac9d6ef36b511b241d869cb2b9d6b76897c7a3b6f96c66c38b00da032ba8ad94fed9cd65a9c56736742f56fc0073768e594374ef39abdfe36c8d9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/bg/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/bg/firefox-75.0b2.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "8a5170979d50e1e2546fbad96dcba9d5fbc1618b4c6faf770c417e44308dd22ee0aa27a5b18f5f073f7b555f064744c4b1b627e6648afc2c5a120093c747682c";
+      sha512 = "0da867e56f18f268abb91da626a4519546d6ac73fc8eba66c52cab33de81456117791126094f4ee95169d64cf046c6800006ca8b85250fd0e240f0280376b62e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/bn/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/bn/firefox-75.0b2.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha512 = "76a3a07092cf6d921b94031a2b3baa8e7d356df3b49dfa9e0d7310c87f020236d7b8525532e26a77156a465bc70bdc477f285223e4f3adba81dab63165023951";
+      sha512 = "2ecffd8e81e3c8d570b2931a0579cf30a111710703eef07c24358506f9ed9a2b09952bc481bda2632417af9993560ac0dbe1784b98ba34b21784c626429339ef";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/br/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/br/firefox-75.0b2.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "b64af8927deeda0460144e05ef1c8bf8eae4fa3932fdf8f1e0d23a9df417296e7e195946b2d5090c8986af0b5561a26a3098cd0b01b4dd1353ac8b55a192ae8a";
+      sha512 = "6ae78396927fc66c2a3a4097c6fa6f7f5e4c60757242e06e621ec0dc97b482425514a31a989de7aa2ce32c5e1caa99e77b9f8849d708f8f2af45a1004f919137";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/bs/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/bs/firefox-75.0b2.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "ec02811bdc0ee960fa05e676a1d5d92dac953e8db66919d2e1f2ec1f4ef426438b242bf34e0e1fe10d7735605e17da0efbc5b50a7caea2827cd41d0f2cc22e3d";
+      sha512 = "e40f191a49741e48b4dec8871f290ca2ef72b11a37f57956bfa57b24bc1c3983e949e13cf22fe11a878744f401e9bc6fb699a5d78edbf55620c6b7b4efda42fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ca-valencia/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ca-valencia/firefox-75.0b2.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha512 = "5d2191d153d02525a50667faf39f8454da9fd87154e205fc00d085bd2e8ffb4216f5b08716ef6464e0788ea100f4241bfe2d746f57a503e9098929fb5674f286";
+      sha512 = "bf57f081cc6bdf3d0305ebbb01e98311b5ba40bd23773d93dd568bdf214ff867e495da4ddc6201d8b398f53976270ce81658017f10fc2f225419c373e68813a6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ca/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ca/firefox-75.0b2.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "74ff21b0633a76c726bb3de02d6f148083e72e1db622ddf8f188e5181bff9808475db7d7f94a0384f6b17682ef74b0f531c1e00aed2ac572f5690ebf5cb8c6cf";
+      sha512 = "14ff3f4e17101054c64f408458d778771584581429a757f6d5d7bcaa31a51df1f2c0712b88a216b9792496ac92f6d3e56439660b56e2c1eb062094c74eb393ed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/cak/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/cak/firefox-75.0b2.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "3a303ff95a0ac27ed0c8b4993b858305e36c95d69e144af2b7ac9eb08de5527739f37c97f7cc762094ec9b68f86a2a676b1c59768b447ca95cb4f7674e86e579";
+      sha512 = "a600dc50aa7eb2c2fc5f3cc2f5ff31cf19f3aaaa680319599f77cbb615b6545c1fefbc1f75a3dfd455bfc0e7881d9793ae05b193842ce56bda5eb4c42da37c5d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/cs/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/cs/firefox-75.0b2.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "15e5a4c4c6a81c3c23ddca3deb09766c22525681075e3f488b0e4bf9c2dac5fdeb859aa41522d76eac5ae342b7cf9b962968d186bd86d1a5d942ba554bb7980a";
+      sha512 = "117f94c4f3b892070b071e16660e7b6dc62df90f62783fc456a220a3840917b5344379f88164a2b796cf7b9565025a5752498575ea7b68afc24a55dd2f975ed9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/cy/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/cy/firefox-75.0b2.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "3d8b06c9cbd823c331184c5372748881d91b6673f2bcb2c201bd052ca7bc6db36f502fb5b6d8b5880df34574ca860fee32f675c32157c9cc2fd022f1bb420672";
+      sha512 = "87ac39c6ce202d6eca6823a7d249ac122f36487c40b6386a179fb86657fb855baf149db5e73d4f9aa437de43bcb24f32b16772da29057e4a2e02044890dc314b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/da/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/da/firefox-75.0b2.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "8bf4415f1c2402767a7d7cb30fb32f5f7f3ebe8131790c4bc5d8520447b4970a4e55b7b102e532bb24ed8ca431027f7d407932cae0ea7b06f23415854910c677";
+      sha512 = "9d89aaebbe4e8110d12bc1ccb9c84b03b4f39eda2f542c15eb77befa6cb28fd8bc6f6bd1e91a115ab4c5ff2c12df48ae97c8dbc06860911995ab6687f7a36ee7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/de/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/de/firefox-75.0b2.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "8163578f08c87792a890c52fb1b7a5af1ed16b7065013593d72e7af6b8321467b2230eb5537e5443bf86c8a4eafd47710a9181e4fb3c22f5039dc40fd2f9fa84";
+      sha512 = "e1e6df8039fbdf1071606cb6146b5b7e8c7cc793e4495c845ee68d6245820bb8f4e41c42e4c7dc4135bb21a0489bf2366cdea47c99fc56e89a89f77215167c50";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/dsb/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/dsb/firefox-75.0b2.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "3c7fe1cd45fa52f5d0f385c2549f4b146291fafd8828ed4a5e68f8b79c5163ca81f052149222f80c48246da45bfc0ec35769dedccb4b3af66a1b35b983007ee1";
+      sha512 = "b3630e5ca8a4ff299717e8458d9d3f8cf6d06c470e634e557c675c89f4c861f6cdcb3ed6ae4c8af4e17bdc0c3e6ceb10584fa08e600ae1355dae8ebc1d20acd8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/el/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/el/firefox-75.0b2.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "a5319e5daaa3721e6b47fd7b338acb1ccc6f9f316d127d4fc83fe5be13411e68b0fa597f5ab5f44a290eeb848fd58b5db28fa25749ca4a8180cd32e765bcfbd8";
+      sha512 = "9d6a637eedec5d5d4a794384201309b1bc57848760ed1af3c0afd1fb2bd70cba465710cd618bdb610cbc171253f4b8b3270b004af10a5604e0bd373dd0eae420";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/en-CA/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/en-CA/firefox-75.0b2.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "bb9a61e88c9d847fb579b35e4fd603c7d1b18114de00b155cd7816bb72f4bfbb3f5988703f2c2333446fb9e0092c0656c5d6cddc41f84a0c004fce9f057787b9";
+      sha512 = "1658adcd506c209366efacbd730a0576c77591ba672a9d0714b6296b9ea24cd5f291a6a8003da6cb5d8667efb5c8db41dcbd0dbe83140ee45d8977f51882f4da";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/en-GB/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/en-GB/firefox-75.0b2.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "6e2afbf7ca225ce980928931073be020e9c4421d8780449a8ce5d46e3e1cd122d5be813054b2abf57c9e5f8f680ae1dc05ea733336e7e9479c3b04116a119f51";
+      sha512 = "61720522cce0fafc76173331fae77d293b952bb05c5b6fede29f1b3ab3ecaa2a546c9a16a16ef4f62ebd19c04f0925db232d4de5b3da172b5468f9657b0d59f7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/en-US/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/en-US/firefox-75.0b2.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "d0a72bac65daf49aba93e84c781830fb4f6fa365d8e5aa23571aa52fb0f0058465afe7b84b40330d6e5abd8403ca075fc787343af724664ce1d328a0d7523864";
+      sha512 = "a45899b9efdf8de1ecae76d19c5c8a081ddc81ac2b04991c5000a3d7379d13ceaf192419bbcc87fbbfb9dea50fc6b99ffd7845f11ba47e280dee51fd5d832edb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/eo/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/eo/firefox-75.0b2.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "3ccb3970b2623a31e741d7c88aa2e5f3c71bdca83ffded16508939fe9d2ed431b2b83d09deb00e2d5fadb0915b8d17c8a7e1073f5585167c28bbe41c9e03d94d";
+      sha512 = "97409a0943ac848f96c54dc6e7ca8c955b6ed2aeed078833f8a69e187e550bc588c3b5ec82d4f56061cbcb689e5548a8a9b7f9171e637d04a096b91b4d4421d9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/es-AR/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/es-AR/firefox-75.0b2.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "c59405042b68ef5f7e50428700440972c082436950d03e2988ff2187c28767d709ac4a4cda71241c3c2f619db2f9e5cad38e3c9631300fa86ada966d6659015c";
+      sha512 = "75c37f77ab57a1503de3ea27b55d4d77393d426b490413c4c35ff1072534da38bd31a2e78c5655bdc9b5d5f32ccc9517e83bca1be1a10fda7cbb3ba289e0ba3d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/es-CL/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/es-CL/firefox-75.0b2.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "12666d98f08d3de2385d47e6b864c548c9dbc95dc34a1dc52b2a893650859bd383586e7870cceb591471e3e9edb47027198896971e29d2e5eff4ec3bbab978f7";
+      sha512 = "d9c58844f4b241d749dc0cbd1d04a8e490a6296d0c3cd26da062b043060488794923728e29adfe171834b331ce9461465f14b71f6064e49a39d458256a99ac08";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/es-ES/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/es-ES/firefox-75.0b2.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "0af2573f041b1b7e4fa8b1698c221e986bf83389966f5937b66d13e68a544fb366871e1a5316b675a5af00db9992478b00a1569953c194754dd6bb449bda4da3";
+      sha512 = "9f4e74d5f01ce99e5bb9ee47f262b0442bc4ecfdf25a45e204bbc207a0bc49698b2e82bbb8ea8a80b5b912d6dbd4a3e0e42de75d3becb0a2fc2ebfb3c2bdabe9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/es-MX/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/es-MX/firefox-75.0b2.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "6eaa4cb7db3d5c129853a8457eff48fc619c8da16127bb4158633f001a8459578550f9feb3883bf1590857dd9ecfc99666372306ff86d6275d66523d2ea7f590";
+      sha512 = "612a5d746e31afd8d4f3be3b56c0bf28166474e68a16b237d6c65c974a6f5e1589c3c29165e52936117969c856ea1b5488649d22bdd08a4db05dee8a80142207";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/et/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/et/firefox-75.0b2.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "fb0fcef92df95bf3d9be3ff49a87bee5e98d123008d07455557fe2f282ca53a3763103ffcde2d63c395c45ffc24e994b4d182dc6b72f78118ed972ce007f5405";
+      sha512 = "cd59ba16ededf91c6abbe45d059822fdb1e7f450fcc4a7c90816ebcf4aa7d9bca86ca23c105b1fde01944b06e188b240f8622b7664207fd680d73063164df81b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/eu/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/eu/firefox-75.0b2.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "63528ff70397a343c23660b6e281924056c3d15581f9d090b1f546422074bbc4727732c763d03670bee0d7e58dcfc5753418a885b10a36b09c11c1ab3b55a643";
+      sha512 = "4a6d6c84ee790000a0e50b296d41956d9fb1708a20d55ab0d093147d823fb3b1d3b209cf83bea40c4a17ccd5f2fdfb898425ddc105bd11f7375fafdbe138d12f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/fa/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/fa/firefox-75.0b2.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "1a5416eb730a81ace3675542f7c870f1c0b083a86dfadc7b027244caa283a29486175c6a2cf1ffac3ed8d2e0a1600dad1e2d63216a91c6322164308cd1e590ce";
+      sha512 = "12f2a70b386a6dcb7184c0afcb28b6f01daa0e2a5df0cb83cd9407659086036a379cf3e87a4c00466b1e6d730811f1394d2fe870a33149915a9551571054bd38";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ff/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ff/firefox-75.0b2.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "29017cf396ad93e5c9ed098ee6324a0a49183965c1983935187d3de644cd3522c2fec34b61d12b4527d4cff307e0f2945b616711ac5ebfddaa982ec3467697e6";
+      sha512 = "de6af7697f9450035c4bd14daa319c020f53943521e9867e3784c6c68183192d5a4076e1f416bf062d76d16cb2ce113c3aa2a462a879b360c8641cfe49e7cae0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/fi/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/fi/firefox-75.0b2.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "653ec6123b84002602413e89c152d6cb406be55d9a9fa5ff72839c0b90d3bf1a87a32d2e113ae907721f53f85397621d7a06bf3e38a32bc274b89bf1a7487e98";
+      sha512 = "3b5a6b5ff92c79978dde410bade97b835bbc8159db7659557c6ce22675e33bb96c49478596ee3b3a8acfc67d8f4a24e02ddac18ee481a95250b975c174c4dab9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/fr/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/fr/firefox-75.0b2.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "7845a7c8c1e9f844e4f01414bd52f172bf397c6eb8bfa0033c0216c30f8c14ff7ccc5a213428d187f571e8fc4ff393dbe37180510da4a1b4154f63b2a4285e55";
+      sha512 = "1038cf04afdeb236ef0b12ad096d0431c8576105e861c09bcaecd1b27a2ee02f56834eb874b8007f50534bd43a92859c51dd0aa0150cd258cb22368337da1d71";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/fy-NL/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/fy-NL/firefox-75.0b2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "9cd9f134c4ce2b5d465c608f211acb45f50d9d3a0c200e9080fbbeba13f25f5faed6b6baa1a9149f88b3806f4027e72866e004e3934d0331f10e25673fb213cb";
+      sha512 = "c5139756c49eb6977f053003238df9b771fd61645d540482875775ab76157eac29be84869390d62261ddafc1b6005ce1df58bbfb7cbaf8d22ae4e98daf6d5d9a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ga-IE/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ga-IE/firefox-75.0b2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "2a75c341c77530075d8598efef163f245040c602a62380fa0792b32c746e455ffd2a1220fecdf321db665cb6ac0d1d7963a7750e733ca59f1c413449ec1df9e8";
+      sha512 = "d9a5baf26001f438f20cb7799a6da9086039743e184814914199c57a64cf7cc993bdfb477ea61bcee43e2f7db05ccc02edff99a093a1e2a1f41de0ba72cca2f2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/gd/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/gd/firefox-75.0b2.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "5bed7e36547adcfed70f68ffe5112029e5a03dd900f9f35efb7ac2d5c9e18e051bb26000ae9b157f9d2855db701122fdec826944e1ced7a67d78d257801c17e9";
+      sha512 = "d9c4f1ac7d5abb7c90b7cdb6aef437c5f3ba2f524db43a34cf65df3822b811293a5d4bc56707fe254cbb57f7a00cb0773a1619113f3b455ceac50c388fc8a2d7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/gl/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/gl/firefox-75.0b2.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "fa5c6453ba164c5c14c33bcdba3defe56bc19df2494a26f4666477d950606f69e69fe2d3d162b9dea506308b28b8728e0cfd31c343b0b1ffcd164c2f580246b8";
+      sha512 = "32b7e11e9f5c76b12c3012fcd90d5b0bc2ceed289780db6fe32e53ecb3dbe9fc31a83c5a684496aa35d3c51693c14265a24725131b9e0b6653c811dd2b60d933";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/gn/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/gn/firefox-75.0b2.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "29a584ba3ec860fb44b06bad43fa9ef02cabf5bb14ae65e54f732d195af11b9acd3dcca5be7939b3790126cdd4882109a645dd31cb0da41e8469f81edcc87b99";
+      sha512 = "89c763e8ddb051304e8b192a8071fde4c4dc4c0d1b233cde51faad5b2d8899609ba5c06399569203780959a70207041b59a0b8ebd0c1f08891afaa37a3e44a9f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/gu-IN/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/gu-IN/firefox-75.0b2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "553942bf2da825b5173b4076b534db357a56f180e77663c132cb1392a678ab2d42d532d073aa99c0de40e0f0ebb622d321c01fc0f2f20d2ec6ba426588219955";
+      sha512 = "4ed360cf1f16896f2bc7d9f90f66943ca4f8bf27336a4cce928760b820572b50bb4403137fbe9344c117e7a289cfaf70006d702e1aa6bc4eb15150fbb743119c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/he/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/he/firefox-75.0b2.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "7dcdb7443875614d0ef9820390c672b324a4742c4b3f50bcf0b42caaadd5c113777ae684406f5a5beed975c81d12e9d2df4e0211e4187dafe2cad351d23d5140";
+      sha512 = "f1aa69b9ecb760d4797dc15a15dc7237704e51575cb02ed7019652e81c0f862db3494b6aa5059a1e7c6b7159cd712666e7f279ec95466ef57af85e1ebe4dde85";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/hi-IN/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/hi-IN/firefox-75.0b2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "2267a22af52773bbd793ec9591ac0fe42db52b61d396a040bf2583ca58c8a97a651dac26922335aa35c830523f4d0074568d45c5e74c4aef7b541d0a76a08189";
+      sha512 = "fdc7f76be1affb5e93cb316844724ee8929e84d6fd629797d3c0e150144595b0d6d2b06763d7f6a63210622b3da9a4181e5f704d2ea2383664857561806c2cd6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/hr/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/hr/firefox-75.0b2.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "8b0cdf350f423fd695b291296a345cf8d5b194d0a762f99b6d0d066b723f9e374ea40f93e08657c9e6ca8d824ca6a5465c7fc935688c1c859a6c783a1b409cea";
+      sha512 = "dae36784f556cb0e4d371620b333b167b16e810eab97d4f4857320a9d61f14ae392a4b2a472fd43565a807ba2d75d4dd4848a25effe1e2e7747dbbc30d893cd6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/hsb/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/hsb/firefox-75.0b2.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "214d1b272b9d1c6aeae23c221ed76b0966e0d9d2b9c52f53b65f3eac6727e4d9e840f427ff62f37fb8a1103f2a81c2baff18f5f9ca6e3b776ccf00127a2796ed";
+      sha512 = "04c175a3ca68db0d848a6ed2eead84cedbd7078d741b43e725fb51f5a4124487c3e30f18c940eebb7702154061e67b9e63a53d7d219b8ba25121cc47de3a8049";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/hu/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/hu/firefox-75.0b2.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "37f1f312899525e83103062d1d51074303459ba845570781b0ed34702cff5779329615cb38846db9728f8ae242ead2c7ce7dc8207e8dfb8419c1f9146570f4b5";
+      sha512 = "d6503a482ff7c43cc136e23126524c22e5636a7c5c8210052f353cbafc5d4a040c31572fd3271972dfe116ce3ac0d924ab509f677f4d8217bde282f76820180d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/hy-AM/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/hy-AM/firefox-75.0b2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "64fd466a0d9d6e32cfda8a320f189f40bd8426c41e5401097936d1bc92cd760ea8ed2dd86366a914311a7994d904e55ef7310433cb91b7edfbb3b3a5248005b0";
+      sha512 = "4082fc2ef233e02b384cd576ec79bb2697bbbb8a04f469a1574f89fd9854ccf4138aed2569c2381697db2e073a471fe1e5a1b25b58b14a492d26d54229a1c6df";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ia/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ia/firefox-75.0b2.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "e13b02893891cae774fba02de7d2f15d57d0912f3985d2d5ec2d4c9299f54cdd0fb7d0f75a2e1643ff2be4e85944ab71df822b3dfa4e189b7728d4f97cbe3dd0";
+      sha512 = "f3e24a2778346cfe24a00f6cd966a2ba7b59906a0cf28e240313c72305ff9ad1a307b4db6846a6ff02b89deb72b3c9c4233f0f7c00e9e6f5f5dd949e04b12789";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/id/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/id/firefox-75.0b2.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "1aa455734b272e4b1d31c8c252604fd9d8a37def3fa6085cf6927815a661344c22d2b100c1c155b508d1b2a809dcaa68ba1090020a852699756c7f494ac1980b";
+      sha512 = "4728f20776da754eb696036f69b6a341d912856bd0d9c105954f56d1181abe6b3b71a125b836d86061dfb39ed6282c4eadc3c9a0a33f39c24e9b34ae8ce047fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/is/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/is/firefox-75.0b2.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "60a50ea36dfb707ce877074fd68ca8fe95d9367f57350e35af9a252c1235a34b05f4d8ec2d76daa2f4bdc1026086924c53ea1f75d130286a124425b3d6dc603b";
+      sha512 = "0eee6d75916bc89554bbd9cc6736a289c816cfcd76c61999fe546489f5907ee23d9240686cc2f85fc56b005b4519883692d17225ea2daab7165f6bf0023d6290";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/it/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/it/firefox-75.0b2.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "6d6119b936c957d54bc4c5dfcd2df3ee42543024a89e48ec5cb08645d7b7ce9f53a8437a92afcd2c4cf4395724324599f9bde922fd0c88e6ccd2ed76a1141359";
+      sha512 = "e61500f91e7351ea75b5fce63c0b3a258881449d16750cb84a8b91e65fdabae42cf2e8142ec06e408fc221c86e372a60a282a8635bdf103bfd65c097bf51d709";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ja/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ja/firefox-75.0b2.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "8f76e03d072e9d6c4bf9b6fda4425f29f4645e089886d8ed9a648ea82a7a602ee6296ff7c5c0e505195bbf9e051d758095d23c622cdb5b606a285b550b3b0488";
+      sha512 = "f4e8bcc5435864de90bf69820f18c8b2647fd8da250089e4940e752d36b2ecb5a437794874c3cfa5d3cd96ddeda4f6cbdf4c17725a31d57474e4d6330eafa801";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ka/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ka/firefox-75.0b2.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "f173d6bd7ced596da30f9c76366d1caec34548e08d676286bdacb1ae336f01174b391588eba9b725f25079271d9e8378f5248ab9896532dbe395f925912f1f56";
+      sha512 = "b516b2f8af0f306b78a67af63d9576b358f17f40f71520e82be35fc8dfab29b61ce5e4dd56cd52b6bed2e029597524db4a059fdc63f58ffa4013b1c6bed39cde";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/kab/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/kab/firefox-75.0b2.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "ae1633a7dc1ef1120f5922ac237020d54e1e3783f339948394d3811e87baff35a8fbfbc17fe1efd7b0c5ee0ef5fbd4b28f9ca734a3cf03e6c19255ae5ad9d2eb";
+      sha512 = "7a5c35f97deb3132f2575071eb81b5118f16403f37274f1f0d6677811de7b88059c2094aa3c35a7350a5a0f3308e904378e6095662af49188ad714b1bea920cf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/kk/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/kk/firefox-75.0b2.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "6389efbbb824b59a1817fff041b3529a1466b310b8b93229b2d8cacaf6b009210ceef136b579c154b232cd0b756e13676487fc8018a00ab22ba800eefb183e55";
+      sha512 = "f7a21230d6f2102d0ef34e3407339e289f3c426fbea1e22044653908dab9430422d85000ea5c30fc2b07905a10aa2afa3662904f6ca388031ba30c91de760d0d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/km/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/km/firefox-75.0b2.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "e57271974dac3818ad52838fc9db0e486eff210ce85a74ccad57a76072aae7a7eb46fb88b8080473098619279c515122a22d986b38c53c34b5cb6d80303f2220";
+      sha512 = "b2b66527be2330554a69380ad44b56fb2b1c297ad9aab118446e55bacc35b7958f704b5acb543b826919db6c36e91514cbccb4aff3856dd9ee58dea9bda43cbf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/kn/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/kn/firefox-75.0b2.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "49d5f860bba705238eebe7f94dc2efba3f05c69f3c1813a27479e514031ffc1f6ff0e1c6316424bd73f2c750f5bfceb07212486122c5b3575ffa7930690cf214";
+      sha512 = "b110a46b8c5d6f4e7a9cfcd126a80fee7ba95cc35082845ad8aeec0f6778dfcde805377ab395e70a5e9dce518c53449a5586d9ae6eb8c19dce0eed6b4757b8cf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ko/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ko/firefox-75.0b2.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "47f90c68de6663bd0ae774cda94c2a0a85a92e743834c74f667049f18faa4836e403da8abcbe04b8dfb5f12f6518925e672967fe23754dd045e37a26a3d8d285";
+      sha512 = "9a35c7a81cd8ee930f8164bb59e58c321f35aa47abe5f0e28faf320216b1555b89516aca94bd49a1b76c892abf29dace03a7055e571198bf981c4beeaf965973";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/lij/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/lij/firefox-75.0b2.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "5ccb1acea6a156d972854b6396a1a6d3c7d8bfc297113fd8354f9062d954bdebd5c0566ae4886453fdc4aca27dd3e1732c0d45d91d859fdcfda230f50e1bf826";
+      sha512 = "21a09cac09faa88963e185d2e1f732aacbe2dd8629a389a851bb149eb1b09e4aa21a78996021ac43f7861cd67646e6008e63420c690bd8072138bc707d937b04";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/lt/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/lt/firefox-75.0b2.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "1a877afa01166cf14116633aaf2d3fe3112c0adf5e45272bc71de9b6c56343da0c1c87a459529a318262cd80e5d0d3a436f92b79ec4cc5b92329dcc15fe11871";
+      sha512 = "67864e1188716ae7e93f8a824709d597124ecdd4d76dd61ffc6a1dcc7048429e17440c8d096475811c7a00db2c42c778477f3c32f26e2facfdf538f562fd580e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/lv/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/lv/firefox-75.0b2.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "37403fcda86c796c082941e8e8e14b621c0de2a7080b413b7868b79ebc0fa5ae6069a8127739a7d271de109e7a9fc8f7562fa5d342b03926f05e247d7d5299da";
+      sha512 = "de68b8cce2abe936bed8015c88a9dd998bd99d177b127ffcc205c975aafd3f51eff40b83d8b8e18cf66ce8dbb9931a9a9ca27684dcd2e2bdaaffd7b96607dc4d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/mk/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/mk/firefox-75.0b2.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "f87d35121c20aaccb8b344940d86114f3ba34878f9cba2c5031e10e54d29e7fc548ef1a58882cd5e8bcb97b170760581e6df787ba1ad05960d61c5f67e6aa878";
+      sha512 = "c5f0baa178293cf993fbfe73f54a7052a249dc070a3c1538df27949c38c14d1e3d486d7bac26a5c97bd744c051dbae265b4bea215b1bc96ac732fe57a7766439";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/mr/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/mr/firefox-75.0b2.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "07b5750823b4973c494b9b4f9c76d4269097489c7362630fb59eb995b12a58f3b69dc9931d802f40f3109e939ffa026402455afd57e487225564169cb14a198c";
+      sha512 = "61e9f28f0c8505d6a132195aad5ba56ef5c9c41caffb22b323b764029b1af0f92dc43cea70580246fd11bac75908023553f3bc2238d842ee1f6962ac6c059ae5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ms/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ms/firefox-75.0b2.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "c13597c3dceab6935def4c629b24a52fce3ff3406fc3fea395c68444993cd2d9ac25a10647a2d4818db49faa36a69faff61e5b648886b4c662caaf69e435158b";
+      sha512 = "4196f1eb297eca219ed58c58db77d691580f9a33158769f0559a2d1a815f4170c89d282bc01d4a94884b5dce6bf83fc6a6a687041eb02fd38f6dc0aaae78f555";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/my/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/my/firefox-75.0b2.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "1dd123936837ef7d806449df7458ee0879d3da33d16824587e55830a88f5c52dac9c66d4d4678e9cad35ea1456ccc6a9f282caf3e6b8888145729123aad33556";
+      sha512 = "4c1b2e13bbf33ae4d8c213e94a0d1d41fcdf1471304e9eede6ed74d28eab659be559f2a5ffcade436b624604e26255e37941afcb8d9f36cfdca2c3fb9031f758";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/nb-NO/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/nb-NO/firefox-75.0b2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "b9c4ddcc16a8403f82f1b2c9bbf390fdd94efbcf442a9010b8a127193826cd4c21258edadbb887dabe5cc5aa642842e371be01cc3fffd353ecf3c2815a2dee2e";
+      sha512 = "fc6d764124ae4182c01a96c12ba13ed807a7715d1ead7a7ae57c0c65d394166f0b80a18b12c351f87d8f28f894700d3e0892a42156cb6601fa34d173413ec121";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ne-NP/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ne-NP/firefox-75.0b2.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "1bdd91de19876c54223c43543b73df2d9c37d27a8986544d48707810f12657626c2491ba09313c0fc51733232c4b5008e0236148feecc415b9d3bcb52b126536";
+      sha512 = "f285ea0cf2e4e6cd5da9ea2e04c5a942de5a9ba639c0c6be32fe64cb2d4076b15a0b8478a6b8e25d0bb7555b8148fda33313e5c78d91c5397d3cb8af7a5ab09d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/nl/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/nl/firefox-75.0b2.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "6cfd830592b5342b18a0c0382b33be36fa060df7fa8892ae6aba2b7dac37f2578108491e2eeddeab73546336c354ef0456206c37be4638942ad28124c14a7792";
+      sha512 = "1e7e423cc24de27099375279a8f46572310a245709ab3b8450c7c1257ae28e219a1867477aaf50f68762eb1cb32b831ce3b73a1d4d7fcacef1fa4f6bc6a864f4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/nn-NO/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/nn-NO/firefox-75.0b2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "b092affa3674da00ead882e26b27fe61d3719b69ac0ceb5ece2e88225c26d78c066a47ddb642e539a77f01263ba85f503b7dbfe1bad0529f1cb68275cfef6ef4";
+      sha512 = "a1e70c2c4eac55f9f6ef46cf741fe421449e5ef1cdf1a125e07a86037c1d5ee7a329d0e2041338856ae8385778207ebb95163cce1a124da64a5ff334c73fb5dc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/oc/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/oc/firefox-75.0b2.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "44971c64acd96da8c144671c82be145ec46118f0f38bde69580c83d2e7a6b6f0d6bb1a9b6f21cd2e84b70725aea9c388ca2b4d6545061bd4a4f9f4f5eaf2d929";
+      sha512 = "ac4abba844e7d9bca5d10889ec5150c2fe357bc5e2fcc1a47cb4ae1489645ec884de70a0190b7cc7ea943f1233dae708e33be8c9e4453a39e10c89b418a05e32";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/pa-IN/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/pa-IN/firefox-75.0b2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "0583f4b15cce5c1c4fe70d0f9c9d446035510c158fee6da27a135b9efaeac7007177b4ded5983c8130f1d1e9c377990545318f5955a99737426424dad50e448a";
+      sha512 = "59e0ac652e3a619d5a9ba1d94014e583fe85118f4fe54779abb657e9ac5f59865483007bc6c254fce6f29270b24b74805ee6b9d227eca6ca61a651e051be6bd7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/pl/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/pl/firefox-75.0b2.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "75046f40fe1dd1950091f61e487c6b8c9f424db14f05872c528e602fdac0a0f00ff147194f953fae941cb3bb93b75367c7434c1db95d8a31e7961278fa820a27";
+      sha512 = "3ba13b4616bd7381268e618cf0c00ea4ed807c38ff81e1f1b45457f9ab780e6676bfc563cea62df8767bbfe6962d91b8f1d7de63fc101242d18d2b1bbc045a1d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/pt-BR/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/pt-BR/firefox-75.0b2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "25df8753b7363b4cfca6882fbd1941e8d4b532708f17ff7299f685c9ea2d15df61b12bd0ad293daa80e6b184d53ef2e36aafcbb4b2a7cd5b976bf81700d4c68a";
+      sha512 = "e115b3c9cbd88ea0fd43b58e9ba7996f3a95004269c5825b23244c9d30c75fb2f63abc4ebe6e645a91e21c798c4dfd7627604f44c0862547e156aa8f28e13d13";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/pt-PT/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/pt-PT/firefox-75.0b2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "f06faae5ecf8c873c8fd2c1999adf23b8b08c1b782f33e929bc97630d4094a098324454c87af9321332ab39f8543013bd827f10299237dda8d7decfaf29fb59b";
+      sha512 = "7f53c4ba63b41c1f69c3ce11d401464d685983a906f44911a4a984073193c75b64d4df3d295fac9df004b4c8858d586424381d5607228d24663d4a3114e80a2c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/rm/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/rm/firefox-75.0b2.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "9b026decebb2be032a7ebef1e5d7a18643bb3ebfd31baff4022d1fbed444edf93ba4db70c9df2f899de3d4f9c1fe8c0a218e0ec40015f0d46ee156c5181d1235";
+      sha512 = "a397e6373787d0614f77641a10658dd72484364549f39ce89599554ec41b883a1c32b3a6a8df26a0b9065664012fd88e1c88d04d493ad4b2b5b39745113f4e99";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ro/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ro/firefox-75.0b2.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "6977c73f7207944ba646cc6593aefbc5b24b94d8e63b95508412967b6da6c5076e6875827789330bebd02c50b0f6b9a1d40dd49e3c079e614ee0e273cf2a8c59";
+      sha512 = "7eea48885af4efae7083c92797039d940594a26762551a5ec91479005414a8bdd7e0b57ae7e7f64d9fe80ed5d1da9dfb9c5b04aa1f721a7edaebde2c3885f790";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ru/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ru/firefox-75.0b2.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "49c458fc0c307904c25e7d55dd1b4acf41020777ed559828cd01bf416585a1479c853909dbe29d2d90b1d52471f8628cabecbcd98918dad7eca7a0cf4096f1a7";
+      sha512 = "1362e789bb4890ce7791fb3c3d2e48428adab90ea5fa3f7644cf6fde6f6e0ad13ae01d318265013c48c8d0fb1d4bf67d2bf1001c6a49a2ab2fc0cc71813f6b3f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/si/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/si/firefox-75.0b2.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "54078ba7d22c1a280347d18ed30dbef9079adac167e8b79f3bec686693acebcca90bad4ba8747d173fc762499bfbbb6bf8fd23906666ed005f568ae8c5683392";
+      sha512 = "f0369e0f40aa26933cd34b3e34e25a4fd3dc0f28ab85f58e4c5973732e1dd0c9539c9b2e83c82f70524fc0cd2d735a977ae2c62043470f2a590d9cd6e1f35643";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/sk/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/sk/firefox-75.0b2.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "47fc04108bdebcefa46cb366d071adcc45508609530bf02eddc65eb6d13b34ca223b2a9e552563b475c2f8dfeda58101ed8af21312170330bc8c48ae79427a35";
+      sha512 = "2c24711825bdf49ec2cc5ac558ab1dee43c4282966cf9dc00f4ec5c0f20761c31e57a79640b7465a50010d65270c5f730c4ba08bf268e9b85d87e3e800e77bb1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/sl/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/sl/firefox-75.0b2.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "cba41a4178b971c136b3853d96568152a1583a00c9d859327e41dbdc278fa7bb31b2bde537551bbc5549c2d506cc09871bc53aa3da486018210b0f86634b3865";
+      sha512 = "b25e7a1c421d98455bb141a48d29e3f6b57974b1869b5950c898c56a285fabc6c10b1308a64e033fce77ce9376c580a3d877a42c1cf336d4c17f99dc8c375789";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/son/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/son/firefox-75.0b2.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "2a4fbdec227edeb83448ea9575b991b574e467d2e2ff14d75f000a1d912d3bac6cb6caa6cb7fa3c61236d2729decfa5f0aa9f0e756e503dcde076bc095ffb786";
+      sha512 = "10011f2340274dbf7bd6183bebbeacbfa41f45eb8a2b255ef996f9c7285781bd80f4ba5e3411093dcccd7431cf57936ab87c8fb27c4458e19a8f0a5489ddaecf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/sq/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/sq/firefox-75.0b2.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "c0743b88f8c33e8bfa934f0b63eb67a9ea55489b01167e5bdde91362f7217375d2e2834eccce5a7e61543ae81fbc45c296a7fa31126f61cd0f2dd8b04c807df4";
+      sha512 = "e65105f1d8bb2aedfff769c5dfc55426cb846008d1d4bcc639a45c1fc24a00b2bdb8d1a1072755e552c7878526b75bac33d4a9bef6eb4637bbdc5a0d97020cc3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/sr/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/sr/firefox-75.0b2.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "20faa1be8b168ca94c8c4a8a22c4ebb3f1aa3555358b0d8ae765a13ff5a185a7c16ed8bd9f9f1e137cd02cd3f5119acf912649e46d84a180e285c4f5f9b25f0d";
+      sha512 = "3d0bfadf39fbdd5b51c8187fac2ac6643bcceb06252365532b0369ca4beb0e09ef5116704f208d5fd66e23b321828a24dda7dd277c475967711128a6f8f3bdca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/sv-SE/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/sv-SE/firefox-75.0b2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "cf272cbb87e59751eb5f24c1d07b1a5926aef006d6c199b58c3cd90f853b9ebc78d11d03a2c7600c0cfefd07499c0946f26465e22c29cf69b74f6e0c8474a15e";
+      sha512 = "036773f6324a6c6872ed0fa312c7ee63a891fceef9ba51f402e135b1572bacfd31c7b137014118ac91f13607056430eedcf082aa4889c68af4f4249035bbf7ca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ta/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ta/firefox-75.0b2.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "8ea559be2b493eb925dcb01dc5091b7bf776ce7af47fc95dbc33e1e1038ddd5bbe31c85c19e616746e1c6fbac42f4476bd1f2b62df03850a144bfa880ac6c27b";
+      sha512 = "c9e4290b20655e9ad5e2f9bcf8982cfdb8c0492318ffdc716b0c257bd707b0d7db69bd6b48802e17026a3416cf1c78f6d10e782cdcdcaa0cc4a382517e1ea9e7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/te/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/te/firefox-75.0b2.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "10190b94faac8db9385119b21d8fa46b930eca4a4371dc53415995d132430a9aa83d7e6af4d406d96a831b4318ff160be1f301d7f91b02a082d90285f03b6ef0";
+      sha512 = "53a4c90bbd7854031dd180fddab6452f29c33f56111ba40d9bd634bb5e87584016581137e1b100ed247565557b8a556c6a473d2c46e1bd65f78fe5506420091a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/th/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/th/firefox-75.0b2.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "b95d95ce5bb0f42502aa88d24884a14f84af84133ab0702cc84c0c8c2e3b4ca1471133da971e85aee81f5979d99af575712366fe38f470e030275f73071c20f2";
+      sha512 = "f75d583ec397c57cac3bd1c384393c818020c3f46ed3b196060497fc2f09a36df3d31cb7b6637e3697a50e04c5222cde0c50fffafabf3415cb097552b67061f6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/tl/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/tl/firefox-75.0b2.tar.bz2";
       locale = "tl";
       arch = "linux-i686";
-      sha512 = "149891af8ad8016d33e7db3144a9c5167be895cd7bb098972a51f35a5f4f97ae03fb3349c7d0c2222217d7f133d483344a3a4796c1be89402f8843cd7cfa5cf4";
+      sha512 = "607e6371397bf29c10893b5a72ff706c6cab84024c93832aedd1e7a57c1431c47350023424614680350536a3e8c6909a3ad89392d15208bdbceb6d63e1a2d95d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/tr/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/tr/firefox-75.0b2.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "bb152289951ca25f42b227c8e851c5fc8cd6788d654d64478417760b4999e10103247ac21216ecdc6d4e3faa5e39bcb3ecd3b0f4c03cccb67ca546fa673de03f";
+      sha512 = "c28d89bcae7ffc6145a1d8393a7cf4e9e63025f09ec54c42a7d5d7e6a0584f02ab52fbd4346c74e54b116ff461dedf7c533a77f2b2175e34b53f7a2b725023bc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/trs/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/trs/firefox-75.0b2.tar.bz2";
       locale = "trs";
       arch = "linux-i686";
-      sha512 = "f1f47c635364e7da15a80ed33bb2c0841dbaf2734bb24fc21b33967e909e1cd047496c1c30fa83d3ba11802e46eccadedac14b033705a66f542b3b084b9e729d";
+      sha512 = "eb505f85d35dade14f853bfbf4086f3ce28faed1f497a35f612f30bcf35d49fab6ea32bf2b00e436d12d255ae37dce6ff1fbdb1eb3dd1743064181404bb28774";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/uk/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/uk/firefox-75.0b2.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "a5cae41b115e9ef41bc5f5bfe618dd7f317333083b83ec9c52a0a56e4962135cf3d644d136fb03b5b12d1e0609bb2c554cec87215a279ff42cd3b3a6b3a357a2";
+      sha512 = "5045d30636c9f3d893ffe5a90e87f22d91718e36e720962e4d6d505106922290bed710ccb9ba50897228836f5df6844de21384143275460ef50aee37ca175ad6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/ur/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ur/firefox-75.0b2.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "077667c2264347c301c3744a0f65fa2546e2168b8aeadf13b8b86a251bbcc16b65d10d0e91aa9368a4aecd86abe3f2b6685b16bdf8e2bc1b9003bb41fb4f0ef2";
+      sha512 = "78daf235a6cd6301b356a887bb0b8318e9a8f7785ace0c3a398fbd982e4131acd8c43f818addc516f0f14b56d41ae41d51ba07f2848c0630baa057b323a5f268";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/uz/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/uz/firefox-75.0b2.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "6b4aa50c39d355f9a8d55d1bc58e07b17a72bbdcd5e9b45816dd00e7f45105bad90e1ea0d38990af8d7c481a45f7de4f164cda6db2b35f85b1b903f403211c16";
+      sha512 = "ed6edd3f1c54e2675c650ff48e5102f54c258cc999506ace655a99f19dccfb9e3140e4c63d6bede4d72b6f84a6eb300ba485d932316b83922288d3ed6ac66e00";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/vi/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/vi/firefox-75.0b2.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "a2e91a40f0ff57f800ba2ebb6a6f7bf355b2780acb4e72d759cd01d1ddec134d0f7e33852cee2e15c1382ca6f432d58a7ff653e1885b21b9657a85b9c52f11f7";
+      sha512 = "125e68eb19e1f1fbfc8a8ac0809bfeac48ec37da172052921cb0710d8ddbcb031c72139c81c6349a4ef3946eb6d10e49d398e561e2b09c23752182ad979c932b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/xh/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/xh/firefox-75.0b2.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "d86daca8654c7b3ba1687ad6be2f00f42fa66caaf6086339045323b2f1c7d127b07f3e7c6104147402ab4aaf9265610b4514d8e6f7c73c1698711aedf0800ad0";
+      sha512 = "bdd6749ddbe15d1332a749a9f9d954b4f018c91c3975b61af2863509fb97169f2c1afe31bfcfb2b3ee68fb30a5b7cbe6fcb4e94ed751d5a1710c743b3a6bd9de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/zh-CN/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/zh-CN/firefox-75.0b2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "169e02a6bdc822547feea77359ac35932dade565c99d9b9cbff9d6d3a7a007b5dfe98d006f9b4b12d03e8fa0a96ba3fb2552c7c15196c5c269f07ae21fe9bd98";
+      sha512 = "2da359cbc166375462ce9f75f60ee802b2b63bfd21afa661d3bdce7ee41a3c76639c81f6700292d352739f8d3988de3a33e27464d7a8d7023e52440865e92c12";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/74.0b7/linux-i686/zh-TW/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/zh-TW/firefox-75.0b2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "3eb488a91dda4c3ab1b8eb421519e196da4bd78f66bc49716f1c743e961ef397f3d24cac2e30e7c21c8c898d8b96f84a34de8d0a0c85908a68fa8225978544b4";
+      sha512 = "99869cdc515c28505d025348013d7617a16ab79bc4b024240b893628e1884221fece1bee33013a62f800e2633bc1edbac256e74c411ea10b32b6802eac9e7855";
     }
     ];
 }

From af48019a81f00207fca7b35a12c1b17bb07e92e8 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 11 Mar 2020 20:23:48 +0000
Subject: [PATCH 2784/4636] firefox-beta-bin: 74.0b7 -> 75.0b2

---
 .../browsers/firefox-bin/beta_sources.nix     | 770 +++++++++---------
 1 file changed, 385 insertions(+), 385 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 67936928d297..f9356fc802e7 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,965 +1,965 @@
 {
-  version = "74.0b7";
+  version = "75.0b2";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ach/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ach/firefox-75.0b2.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "371391df688dab86c5126b1af61cdd94a05ffe5fd001c465406000f5d50eb66bbb24d0d18e4b4d4293f06f02913344ed6ab1241841441dbd9696e20ae806efc8";
+      sha512 = "159fc50feb7ea1d8f567b94756476b8325de2a2255aceaadb7975cebd763ff44cc74c621532b840f5aef7156024f605ffefc3fb1b3609a44925d7a280b63f183";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/af/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/af/firefox-75.0b2.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "8ae751f86a6cef220e586f64fe0253a9d86b69c90034665ea94bcaa9981b2a9e8844988a8940853f58837577c00a275b8f5c316bab51709c829b0135524e372a";
+      sha512 = "224a98e4028513e30897fe73de8dee67a90844990eb13564e7fc32c4aa9426730da7d4b528666ecd5a76a6ce68c0eb3d0564b09823e12721424c471fa7cfe191";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/an/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/an/firefox-75.0b2.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "a141d87b3e9d447174b34b8c835542d2287f88fda576171a86147251331b2dff62d1ac404566bf98348cf8d9ecd21c48be5b06fa989cfb276fe9ddca3aa35852";
+      sha512 = "7973ab3c94616e0eb1b2b36209836c3ed81c55927f26da9bfc672eeb5f6f36d8447bf9dac705219b38edd1d217c6b7d701ce11285f37d37219ddbc0340fbaf61";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ar/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ar/firefox-75.0b2.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "e964ce1088b8e129d66bdf815a0585ad1861b77c36106c088774f642f687b0097fbbc22cea7b8b7fac8598ea6e076ff74c41804333788ddbde2fa80d8e466e36";
+      sha512 = "11dfb7553ca61b7abe857ab7dc75db73e3a3002b9d4dce98f005d0c298ff119d29b64309fb8e5c62fafa08f9ff426c14f45956e5f6cfb7cb9af7dde41190bf43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ast/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ast/firefox-75.0b2.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "8833edd124f20d62213f8e22925caecad4b5cff3b6bdad997930c60a351da87dbd4d4516c441570a621314dc1d86666448c1de95bfa7a84ed1d0494088529a83";
+      sha512 = "23f00418b48d660c64c4480cd6c983da80fd8990f3ae055a0e4792f01b881b69251f4ec123ef3d961623b94dd7a968a82f27d29aa87731ca77e4ac4b1ec32464";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/az/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/az/firefox-75.0b2.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "04856c83309a1f1c0f8ac99e998495702fa70d0dc65f6adf7a21f81e96da016dcd9b4c8d3363bff03f0bedeedcadd9fc101c54500f3b319f5e1e09269a283997";
+      sha512 = "85e1c4ef9870c9aaf670d107b5810782b7e148f6edf61123c4326be0809b1103f9bc5a05e87d06771fb8faf405d9f648df364d99cae9be32ae2242d1c488b5c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/be/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/be/firefox-75.0b2.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "cbf7858cc233b87163fd985396367dd6459cbfdfbfdbd54d3bcf9419233f03934011f1df9381725c250d6b69bb02a5b7c4a752d1d282e358998494d74c6385bb";
+      sha512 = "34bb18b6f6ecd032ce0984513e590e422d01ed5b92b8960a7a4e64b2a5f5b2f19aeeaa6b7227a96cf6b6e97168674a34cc3332d019dc5d3257504c7188ab8418";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/bg/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/bg/firefox-75.0b2.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "4d142b7dc4ae68106a39196d79c92ed857354e1a4896ec30b94de26a764da07434b713faf7ddc74886e20735969b5b2dc316f9ac1b5a57b43545d9282a675441";
+      sha512 = "2481e01d1656a26458cca5f1f9eb7d7f101dc98e7aa7ee620889b630393a70a82132758323d4ec37c5ee640874419cdd2d5464d64e820876cb924679f03eba64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/bn/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/bn/firefox-75.0b2.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha512 = "916a3f4f76a944ffd13d26d630985e85bfea416d714ff95423a0761341e569a2100397ee06c32005c3f98f7926a1dba6cde817a1d94f638168edab2005c5ad63";
+      sha512 = "6dc0d391e179cc13465f60c98f9a6425f6fc4f28f2340928a35bc3abfb623c28decbd179012d162cff661dc807974f5df34427879d4838ab481ffa75c0957e77";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/br/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/br/firefox-75.0b2.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "d127065bfd273aae19cc9194a2f5df9a4ae797f9d1b2c8bf50df0fd177c4cc5651e5acc752ee45aeaf1b6bc419680de0a55d8c022df71fbcb6a2188b9fd99207";
+      sha512 = "6fce902e7e23277c8446df902349e626ae5dce2435ce56e57824c7a0b5729ae95b10878525f9b5251e9c91e1cbd97cc1ea7792136b271cf88626fc97cee5f4be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/bs/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/bs/firefox-75.0b2.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "0b4706f44d63070e2d0438c0fe43d9f157cc770c6777df17e71243a6c7a9ee694aca554de5a7857dc8f450acdcde93a5c75a874cdb7cfa46d16d39b3cd97d791";
+      sha512 = "cd46d5f1e8d68a7390b2bdd4338829db0e25e5dcf0a52d538db311b957809c33f7fc9cfef92a73357743ddb9b3ed0ce593c9c0cc8428f7f891edc3292c00d37d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ca-valencia/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ca-valencia/firefox-75.0b2.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha512 = "73103b02b91cf205d0cd69e0af10bf7c864062703f4b11a4c47beffeeb656aa8e73796f30edcb458382bd31c728b28ce2a122681aee5b41db666cb3c647e76ed";
+      sha512 = "e79af87bd369b75319565bc6301cf312022b85562ccf6cd2abd6fd59a26b1081a62f166c7efb4fbb6ad1ccb7befa8a8eec557addd9c4115f7da1594a633d243c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ca/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ca/firefox-75.0b2.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "6bef2c5a242d7cdbe511cdb4491fae34c5897900b5a61aaad34f6511916fdd937f39fe53c29249eb0309191a5f7c7ba3c2c6e44522bc3033c0adb6086967bcfc";
+      sha512 = "4241eae0654e5466a1c04aff0de003a676c775470329a973204a2413590fc4558aec96ac33e9e14cf1ab7eb52054ec34e7ebbb149648dd4e8d33cefe2b3c18c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/cak/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/cak/firefox-75.0b2.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "91893441b0ca1ad8d2887a52569374ec4fa51522bdff7b468fb2664414406b54ee6910c5c9fdc70b2b9ec502c999829594c24a20240acdf2f2fef7dda06e7e2e";
+      sha512 = "5bb2b8a2eeffdb7a06c16244458ad8f305725741f05c0fa367534da99d0bf0c4399e05453b64c505f441c4036f3e5e7a4e5729852a848b8ff4210d674ce7f065";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/cs/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/cs/firefox-75.0b2.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "dd1da900168651d2ed545f1084f2968f7678b462773f2547a11034360170d981ba9bd813d9392ade20755e72145eaf6c1e6d0b6e2d128d1f884f0d8756d49227";
+      sha512 = "50c6ba425d3be7e12667d80bd6e57907082bd3c155b8d3b6bedae64054046d3bb02d8894445cd5d27e3251507730c06bd3eddc96a11c36c4e9c7a3b9cdf796ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/cy/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/cy/firefox-75.0b2.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "a7a343140c7fb381278de6475fb5204ac4d38eb07bc3813b1d84f649e69aea3807336831cf364a4a90aa8c6c6d54a202da764f59ad70c8e5509866fcf3e8e1dc";
+      sha512 = "0dee8828858c2e0013788b680b8f907e6464e219fc6745af8d0e7d08575291e926f2be56ea7becb1b231f1fa0feb1827b5779b7f720606729a37847f7d8322db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/da/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/da/firefox-75.0b2.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "e0ed22aff77496deb13843e7907e8c02f86ff9b73aa97236aff4d1ea1c6127ceb69cf7722fad2dc8a3766d863b7f728fb0ae29f64cdfb0209bc41d9db9700ee3";
+      sha512 = "d69320ec8c0ffbead25906f9957d73ee9bee8c7ff922e7d2d2e3cca3487ded5e836d41b8faca42627f722c1f2d43fd918e6db6e9d93268155865f1ebfaf6a5e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/de/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/de/firefox-75.0b2.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "a8234fcd9d02f7ca55c99ad2bb8584f525196670111e9dc4fe8c28d3592030cf98a4619939408853f04f004828c15269ba1ab0b63b97fe04dcbf61f0318cf5b0";
+      sha512 = "a64fe63ef81c8ceca0c1baa0bf55f0aa34b662fd9d0417a262e7d539164ac2f0b32eae89bcc74cec4113356fdb1ecce890509877bbef9af2eb6f7e91c2c2ca33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/dsb/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/dsb/firefox-75.0b2.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "98933acc4e74a1d88e4fbf8bbcdcd0310eea9af7ce88d708146408a157529fd727104fd827fa445a139721c1e1f1523637b0cb6ccc20ae0267ea723928384155";
+      sha512 = "776c66f6421f250f22063cb77c5313df75b20b7b06a396c8124f7836b56e7a18fbf9ea996d9ebffb58a00ca0a27957199e4a53b777f5ed04281317926a95a84a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/el/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/el/firefox-75.0b2.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "a6656de1898fbaa3a67c1b7e0c7c45dd9f5a6f3117bf2b044bf266556750606b3eb0c00ace7e32f32ce37367d5196d28bc5bbec3a6ddb5f0fc7629f6a2156a90";
+      sha512 = "5daaea449ade4d15deb93864b0313f3b8f780b6f51e1ff63098a37fe83b39151bff5526d8685171fdcc2ff7ee874f697e689e47a60e37d01ffdf2a9d3efbc38f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/en-CA/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/en-CA/firefox-75.0b2.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "b1be0cbdc584520038e3df24607e8342ee71745f11c7e89f574d45270d2f024a4974d353549098ff3e5300a5c618f7274615f05858d2b9c5df090464d473387a";
+      sha512 = "2d3f4aaafd042888a2b192419fc5fd5e841a922a1b24ff8cc95d52343750e64ae8a0deda694faf3a1ec11e447f25d8303f5905b1f98349ba5f0e705eae4fd615";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/en-GB/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/en-GB/firefox-75.0b2.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "072c48287c0346c28bed4ccae0b71b984f4b656f917b0a6c6f20ac4fbffc9bc8248070fd584ea3444f40a65ac02202b09d26548c417d8a9abe8f54e385daa609";
+      sha512 = "e977d28c7f2a54793098e6557dbdba56a8a6b0069912188c59f246a004147d17454a338df4f4335144e9d4e5a52a510bc94076d3f38c8fb28797a08c59a903fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/en-US/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/en-US/firefox-75.0b2.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "70a350c3122e8565aabb3155bbf532f75958ea0ab83576f98b1f1a819fc54ccbffab6e0db3f5996814cd199b1a30aedf586b6bc3e6b2037c7374cbcf78fc3dea";
+      sha512 = "e30d89b9ea552e7758f550632b41c19a34dcd75291a71def8aeccb4a51ddc0a3da16e181a8c9d441da0d671a89d0f7a481e19599f4815beb96aaf7a95e10e078";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/eo/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/eo/firefox-75.0b2.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "35d35b253084fee933c828ff38b8219cb742ace5c36f407fe1235cd5aebd956b813111b9cb05306ce5f85ca42634d4ab903ad409c3055ee0ae4975c007e029fa";
+      sha512 = "5d086d6725cf99aa3894974d78cf0e337de0244163e3fe8507aeea9386233d14ae7a1f1550c563a5fb59f0cae51d579c4f0e578c9fb56ee48d39be6d644451d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/es-AR/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/es-AR/firefox-75.0b2.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "0448e25a909dc951812bf5b8ff3eb39e1ba0825900ad4a4d78b3c182830a37fe8c6f226128341178e0b6612b4c9ebbb826d2484505ffed4e23097ec1210e8238";
+      sha512 = "ff818af501719ec198d21b5a53d54603fd591d266a2028827283ddbf5bccfceb4382e7ee9ad1119936a2301b067882f91fb04a354426d4587134e065033b4028";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/es-CL/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/es-CL/firefox-75.0b2.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "703c9e4cfbf94522c1b4526bb68e7ea6941169fe1f45ef155f96587701064dd3d1c2056fb59a582fd14b4a41ff4d9b82094b40f4c95da6c8d5da66d96b012e80";
+      sha512 = "2bb98c8dbcdb4d2ff0eb660517e1adb99d7917e9cfc6429e870ed3ce168f4c2292feef353e870293bf76f7d9cea4095c6d22c59fb9ccaa9f336c93e9009f8d50";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/es-ES/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/es-ES/firefox-75.0b2.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "e4666af45ec236cf8f14b69ff0bbcaa4070ed9205a04cf5dd37823feb1230e66f726d980de97326c1ebc7b93c2b3b43cab61efbb1983d8882a78abba5eeab313";
+      sha512 = "4992db4b3e0d5273e73fd7f88e7284809a5922c2b700b695830da7ccc11c40a23954a03a602bf319678a432da218be8de825b15e2eb62b6eb62a0f34787ba0f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/es-MX/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/es-MX/firefox-75.0b2.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "1aba3fb4f7d34c55b433fe886eba74b0c71ff2a759a015fa31becc8c8a207b70b816d6cdd1ab648d3b8fa220268c8c95d19689fea65dd963de6750f1ea0f2905";
+      sha512 = "df8fd54ca32af5e0d579a2fdff569688248f4abfd30ed677d56a0ad850fd603ac14aef086fe8ac167d1819d0e7b354de77c948613a9ccc3e9c9adefbab99d077";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/et/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/et/firefox-75.0b2.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "485cf19a8bf5a8e877ddec241a98d580b8ebd187c0b92185b116fdfb3936d31cd379f10211241b591f8927a077d7482668abc411ba67c4d5b83ef5e47e0ce6ae";
+      sha512 = "ac96ffaac54039cab3b59063614ba8eb5e731ad0912e83f4b61f812c927f0f075d9d9a6123a3e1211bf96c886a925273f16fbd31d75709a195379b763e936fed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/eu/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/eu/firefox-75.0b2.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "4bb9b8f3a38379011240c4ee9d0d1db9457271c5bbcddf691e42d33e281e2a63d781e962375e8dd55860ca49c872922384ddcc1f1d9ead98fafa213d2095de32";
+      sha512 = "4ced029f5d52fdd172d9f25e8dd062278758b6987fae56554e657dc32c2323caa52ef89021564d9fcd4663e75e0a8163e925c32048d77acfc92a0db9ac171248";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/fa/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/fa/firefox-75.0b2.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "995e24fdcddf91ab5eb2d5809b84997506c8c3967fbc2735a120c11fc69cb87c02a2d1f0b6c477946a5406bb585c73ca6361110dad6a3927745b24fa509d5018";
+      sha512 = "c4f131631f72b98b9fc919596bfbfea8b605f2108b5094e9e265df84317a825de9a06cfc4ae52f7901138b429f9c7ffaa4b719b18e1485007c6ffe96d689f690";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ff/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ff/firefox-75.0b2.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "f504e9157265dabd9340b2974051ed9da7b4f8f56cf652c44d96fb949a3381dea16b9782a7d029f2c3e19793a9fb4aeab703f30773dbc1b9e70e937b00e4e77b";
+      sha512 = "c0f61fe82231d8a22f550d8399e05e7ece426fb2f1d15d36b6c43ba3c3872f07f76102a69759fab6533bf08a8248ca7dac3c59d723b3f54161e959d85c24348a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/fi/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/fi/firefox-75.0b2.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "f97ad7cc1c1e170bef9e2da7ea51df57b32445a3b13478372735af5336251cf4da6ac2955edfb70c1ff9fd9eb997eecdac6e63c867ae80e18f2391ecaab1406f";
+      sha512 = "39bab8b71d79b58157278d3f480353d637c54cd5f13e75323d9eb2ec95980bc004e828c612f080414f85838460e82f90a490dba51d312a5147788fa7fc5c5fd0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/fr/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/fr/firefox-75.0b2.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "aabf2b7b4d3e564a9aa250c3bdbc3c3f3ece0c69a6047f76bff316534637ddc00eb24d1e59c419ffb9b7c4193b7a151682cf75b4470c378ed5305c1cd9329843";
+      sha512 = "93a42248cddfd6d3c4151c6f53d2ab00f9200537056005998c7d9e5a3e8444a0f47c621d850829bc0e0f0b21cab9611c1ad5487f0bd8b2a3d41da7d1256119a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/fy-NL/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/fy-NL/firefox-75.0b2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "057bb572d45eef62599debed8390f45a53f5b9ed720ac37bf46c3a6f352235598f17a1627989f50c0e10a5f22d1882a8170024bb9583bc2fa7923cff32feef48";
+      sha512 = "23acca680d2d1a585103a26eb9aa1d8e84d35865fc3854d3a2055ec8337d42aac3d2bb0eac21930816577b60eb4bd6d47580fbce5f7a5e47791dbf798c50487f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ga-IE/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ga-IE/firefox-75.0b2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "9872d3692571fde83a8237a41c51c64e8a1c099174262b33032b281fc76b5f564b29f3ad1ccc7dc5ba4c8ef709810cc1a3ccdc34942361453ef15ede006b42a7";
+      sha512 = "05cfd56f53d033a70c1e1ec08e1355e281ef525f6389ce849c87b92bc6edbb4c953e054326eb094c5862dd74db64839e36ec31cf8ad3fc2248ce2ea309a40bac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/gd/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/gd/firefox-75.0b2.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "c3e5613572ecccc67989c5d3ac5f590092bb05fb43166b931ea49fdf7cd0cca150a6208970009ffc8063d7d87dd9e5b371a9d317af8b9094240ac9314eb8499c";
+      sha512 = "aab0c4ce13a418c9de0fc5655bb5d5269dcd07ac67e75bec66c419f06348043c2c69816704b770398e95ea0a65cea531600bf9322545bb40394b3c599b71cf58";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/gl/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/gl/firefox-75.0b2.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "766b0ce2b5b4a78e0470dd708a83423e8e756a7f44a6bb7e74ef06699e48bc848c2f1e5e452db090f1a8b8c33fe20036f1059500a14c878824516868056ac45a";
+      sha512 = "61f4b6e54d98939b361fdce716be0701a51fe789085db0df4dbeac5a64258fb3ef3dc30ee6cdc1539d9facce481cdff5076dc19bfffce31f459e6377f7fa6872";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/gn/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/gn/firefox-75.0b2.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "f6937fec4839c3a06fe36e78958b549cd1bb0ee6ce2490ba3f05716a6853807781a51c7ddd4eb8c5c10c38624818f9ee70a3115fe53e426b27c8d9162691e3d6";
+      sha512 = "fc77cb70f71f832ca7f9c6b6ac9e7e6e75737c669b229e3dd68c9061a0b5b239cd3e5d4c501a45b8b964c862230736c21a1431dffbee82dabcb4b9f7b95ed09f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/gu-IN/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/gu-IN/firefox-75.0b2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "005223824b6ec5e3ed8c404ac9fea73b1ca57412247ed625c667709e81be1727b04a0a1b0b59add46864601b04efaf01dcb592016b3e25c026204444a6c411a4";
+      sha512 = "c5e4d9e031b97c61b1026073fa3f772158b803c688c8bcf35fb6725b86daf9a3fa970788b8468f4e95303adf73c400ba7b72c52e008d0b6a835867c73a583164";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/he/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/he/firefox-75.0b2.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "29ff04367e36a3df0e5d93d69bcedc6c698692a42cc80fb2f51171b784c030de832593a617e35483bb6acd849b77b5d19340a31a0322e1421d5ccc07a1b90161";
+      sha512 = "49ab14bae6d4e7211904a8da54558e70276897fbde5252760bab17aabd845f6d961e79b79c775e338564b94534a4610742968fa8abf09a4bbd49cf7241b86f8f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/hi-IN/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/hi-IN/firefox-75.0b2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "6c78e91ed89ea3ccd7d67d46548993aae9375648ede8edd76cbbf6bcaa97ceb55f13506b8c9418b6fa94fcf15e0d4052196334f3f2b804439c3fa9db564e9b4e";
+      sha512 = "f7b89b02f01de7f9157160523c30388064cfd1c9bb2f24788e41d3f6eff706a76d50c562c7f270d3b1287d8d886988f42d0480f39694aa6d1be141bcd926c6a0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/hr/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/hr/firefox-75.0b2.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "0935d78afd0739eb510f24e0ca21d9007bf89c3d587b2661e0bca2383b0a7361071a529c67c213312b390ace44e79b07826d0ddba4ed5756bd800027ecfeaba2";
+      sha512 = "d8319df0d4ca8c3bb403fca56565fcd16916e1057470046173853fc9d299a04226eb2e00a1cd14206d9e576b73f64722ad65e7c0dc6c99de498bde7ea5b35f11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/hsb/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/hsb/firefox-75.0b2.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "1372280c8770db01aeb2fa5992a5ae702318b84e972c379752ca7c1a15e00dc44cc7a5e9fc212c928e987aa0599f240a73828c7296769064e41b8699bf4d1173";
+      sha512 = "bcff9cb8396e05dfe124fb3bcff48cd526322920ff38800988a1c82dc9adb6927b8df41ad52b9bd3cee18a72e6f065c8dee0239137b84581d555cb9a69e3ee78";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/hu/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/hu/firefox-75.0b2.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "6ad396d94908a40b4263866163c6de6ac3a414b27fc57a9b272df2db3b5bedb6f1a0fb31170bff456858fe8185761e58f44011a77295c41afc8dab1d7ab6550d";
+      sha512 = "a570bfc699c1e3e5e9bb733eb1b92a8d8d31313aed84d57039a20cf3c821b51de36523c17d03dc4e1f05d57e53b07ca1457317452170cba84bb5a98ebcd59c41";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/hy-AM/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/hy-AM/firefox-75.0b2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "c59a6adf717d489b9de000be2f9cd4c166f3b25217d2add4f790d6261cfd8395aafa5a40cf8f41a3596916b265df5734236e7ccb02e9d7958e90e6e96d616468";
+      sha512 = "72758745bc2fd3ff651d5df2ec3a7af7697f299f488da5096fe2b740dc2a3340ef29cc4ed107318533c4b1e7438688169f5bf2d103b307c615bbb9400a334091";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ia/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ia/firefox-75.0b2.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "c971f1eddfa61f0abb9053c106688eb42dbdcae9bf96ad3b4860280c7939d38599c9cc00f41056eb5297eacd6b90bea7efd2722ddd3f4b33284468837a8a0439";
+      sha512 = "9fb6659aad83d753c244e4efacf55e5918692964c84d6428f069e90710693da7b82a47ceedccbfda32eba6f3a8948e01ec32695c9261bc254c4b7e1b8f84eeb3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/id/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/id/firefox-75.0b2.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "7d161578a96265e1a3fca8efcb6f54b93b3831a1b7f1ecfb7dfb5717bf9859767a136a3182482bd06946bf8b50fb8fb4a118a7e4ecc16d3a3ccd9cef54303d5e";
+      sha512 = "c54aba052fe2f4d4e9eb08a69b0bcddcd4e3dc84ec6be643d34eeaa638e50d17658f530100577d5d6acc97dc7a5b4baa640bfd0329648390cbdb22713ef70911";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/is/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/is/firefox-75.0b2.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "aa462c1c49ccae93dfd16bb7f2fcaec55eb26b093332b24658a120349c9e2de233a6bf75585221c187b668f77b2bb675ac44ec9a1d5896f0845c91eeedf969fe";
+      sha512 = "01f552f0224e2ad316e84d3ac55051f1403cf2338d5c07767db463db05bc19728b7f096a3d30bc03cdf86bf81bc799a310241d33b8a4e7e5dbf3db61bfbde263";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/it/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/it/firefox-75.0b2.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "50a3d1a7dc05531cbed59ad0bb3289706c1e4558a2b160ec80f2762979ba13f84bb5ac689ffa21c58e1ee6cd3b60fc4bb96ece54aa0b2755adf28c10231dbeeb";
+      sha512 = "bbe8a2f64dfb54a3a4b13d7bb14a0746a28bd16be46608744696bb12aee1b6acd0ad4991e2ff7867e9679a3bc51c8d47690e08705b6c860cac1e27530aab24de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ja/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ja/firefox-75.0b2.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "255c6b9291a38d431210c014433ce8d986245e30dc3bafcf13c1dfcdcead06e1988a1e960a9f3a23d37f1d527635630e2e76c3aae4a81b0ae3edd9c6daf161d3";
+      sha512 = "437e74242ac37576dc01be92bf4fa57900d282b0919e4fac8a073bcfaf681ac2dfe58c2461ea18e912fcee85b97ff40df3f8f1c649ea442a557388544887f7b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ka/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ka/firefox-75.0b2.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "6cce90df66e85fa5d3fc96f9962d9140dad36f6fff840a5e80af608cca20c2557a79f5e01338d0fe64f6a0d1d6b15c72c883147cb3fe932a368ad04353b26ba3";
+      sha512 = "d7d4374c1f2ea6e2c2c40e3d425093065dcf624b50532116e576f60fad51b85251ed7284a63b4cc2cc368d1bd80eadce8d82a581789e02ca5249a2811fcccdb4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/kab/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/kab/firefox-75.0b2.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "3170509b386ae0d0390dbde71fbd9397ce587bec4a47e2328796ca04c9b379585a2311b28c373ee34672b549db6c1e69471fec65de581d11d177eae536407af4";
+      sha512 = "235f9ad96c86ac81ee8b7fe9ade89559751969ef48eab577276e0289cededc708bc05eaa413febae13ca4eede96772915ab4b6726dd8bd5bc6b7ee545971c791";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/kk/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/kk/firefox-75.0b2.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "71ef08a02731831cf6fc863012f58bca054017dc854f17ade9ef885c391c437b40bda9c89c1a06f9258047b1c9e74250f67ccf07fa8ed0c47d52a425b447e21b";
+      sha512 = "d443ac7f6ef50da01038c7bba9bf4a2eb12b53410a5201f64162eb2a287f5f4f16d3408715ddfa58471d53e0e58edf46778141118a9b67dea410af683540f82d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/km/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/km/firefox-75.0b2.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "a1411bbca99f8c45c5b7a3d3793df3496d653c61d022cb7bc5d223e3dfc4b6f27228a888e429656930c05442b8e8087bca6553848f01304760483e2486ef071d";
+      sha512 = "b3d35fb421b9dbef950fbea28e80b530c9433a9d51760d1d43043637a6b497a3e2a890de8b2eee9b911e60a95308669035298fb429648a21151e3f08dc6a32ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/kn/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/kn/firefox-75.0b2.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "a7d8e7349e65f21085b4fdf69284eeb70d0cafa528d034b5c2220cc2ba6aa2edcc846d736d288307115cb3e6139597dd47316b3d0a0a9e327b72b61f901c4eba";
+      sha512 = "65d0bd986874b9619caa455f9585d309a30a87b482d0375de27e46a70dc84b5ffc4d066202b7b597d1ac7b28e7be91550bccebb419c4a24a847180c62b7c46de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ko/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ko/firefox-75.0b2.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "e6afa5b7d32e641b5f4c04d4afdc91c7cd7422102658b932ca927daaf6652e035d8d9ce6348a9bbe07cd562f69f74bea7746df8c85aa292751b4cc3ec764600f";
+      sha512 = "bf43ec6311e6ba2259e802b1ba569516d5117207738ff4259b2346b97ff85b8048e5c1a6d2b4b3c27a91ebc40ad6a85eaba84250be79e41f4570294448a1dcde";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/lij/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/lij/firefox-75.0b2.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "4ae2955412987487c37d24f8a4a935b14a84048627e6fbfca15a8f4fb5eb4f4339ed3c32afc1be2e9c5725a7caf6d0894ba2fd80eb79150cbf364c3927ed80f5";
+      sha512 = "1af356fa06b39b9d638b13822e82f4961a237e3587f8b671baf5862a87898f440f564f9836284af6e2e3e8b1f3ec462af1e9c9621ae51289fd0b1bf827a2bf1e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/lt/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/lt/firefox-75.0b2.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "df9b514e06272fd0eb3f73e14d9a9ae9c22e5e3e7bf456a63a95054158f2c3fe81bb6750cbc6ed3a53d5a3f11f63a801b6c6d412df50bc08bc3ebde71028efc8";
+      sha512 = "a4ea24a874261b51032a1021878ed2c0102bbcddedbe887c8f5893f428c1d3fe6cd906b3dc53b5b51654c35e03245244aba8a2811deb7c3cd9f6d0e2dae3bdcb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/lv/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/lv/firefox-75.0b2.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "28471815ab78ba35fed8b77fc2722920e848eba3ee8cf9cda62dccecb055b8684e2ff5587f477b38b286a515899b1b9c23b38fd04a8f510a3dc4a48d05bd3c9e";
+      sha512 = "a8f385bb407d498ca291d088101adf0a4f93b8fcfb9abd3fc36311fd8e4e36424f888f5abcbc1662ec4f7dabba891ef765b10c4a9dd8364898e803fafb82f7a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/mk/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/mk/firefox-75.0b2.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "3cc80253d3dd1b5a55035a5b2ac0ba1b10b8cae71537fd277ed95c91fa5d88e75f0c95a4373a0a2c5f9d887709679cdbd154b1babbd1089f6c63cf2484a3176a";
+      sha512 = "453a3e2726115ff8aa057445bf05fbd9bf5c796fe8efad9590aa09ee8ef3d70cd6de3008503c336770ea3cd259d226962c1a6e198bf2519742e14cf3846b1975";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/mr/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/mr/firefox-75.0b2.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "e7d702978faac40984d1fc5ceb7b689ca6e5acb30c3b4e119431013a8efcd89421ff57ff74ae8283ed3c818cc171c1cbba461d17106e22f1cb7ebc1e1080d832";
+      sha512 = "91bde3db18f77850affe7c3b981b8d233febe8e95d8528443a80c0b569b587d2e605ae6109206463ab273c9a28ca8db51cd6920ac30664cbbde9148fcab6cd36";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ms/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ms/firefox-75.0b2.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "6912c3bf5b7dabffb89b9814c4d451aab946233a489a76ad2d456856b56d94c3403179436facb4aa344844fd130b550b7223113db7155084be2176c07c4b04e5";
+      sha512 = "8e758ecfbd281cf443dfff4950b1065337fa92b1c47c4a73f9e78f5ff1c19ef46e3d1ea1e9458646a9beb6367dde72062144a2d1d2a94a0e0ac1b40a2991fe3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/my/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/my/firefox-75.0b2.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "07a5cd6d3376b0e4b4dcc4db5801cf9e8cc17e2ba7269953c10c8620e597f837bdb29cbe4707da17f87e3778f42257b4ac71511dc8941b72c4a7b7e5e1f8373d";
+      sha512 = "1129e76bbd5ba3c96e8110b3b00eab0975fe38749da46846ddd37299f73840b987826ad80a3d3f2dfc4ad0ff38305fe45f736fa90c671162a3a9563eb1a1e755";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/nb-NO/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/nb-NO/firefox-75.0b2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "d974a6686d12df092f84aa6bf4519de0700565fe2c96b5a80b9b994bef08e1f2879d602019d8f9f42db771586558f2b50dc474478fe8880d08c95a3b17a800b7";
+      sha512 = "3aa4e29466e7d6e3e3d34a570d967d4c14b3fc3977912161d30a6845d75abe6ec745ed77d08716a11ad8a6d6e6656f1c5861453af27c10184795ec29bb22a386";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ne-NP/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ne-NP/firefox-75.0b2.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "832b0d811e6adf9f0539f359f3b13d3e0f8fa8583e3d862979e6c44d3da94b4375c5ccff27ba9dc23936dc666fba8cbf1e55dfd6b8bf563f9ba35dc46d600502";
+      sha512 = "4f9e880dc686e04249553c5be99fc9628105aeee67af7db88cd0662bc4a9fd37e8b9b18921b608e275d7e0b5f2c03923552705094e6749e0a3d0421e82a2bfa8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/nl/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/nl/firefox-75.0b2.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "436421d93e8daf719fbea0a0e5f71163f150091e00ccd2bf64f9eab9be8359247c57fa7b66d16786644f9d96738d57316b75feff4da1a2a75f5d4a302fc6cd08";
+      sha512 = "e271a6208e6b7fe662284f76f22482d854be8e700923c96b2426036588f02a52c9698ef05bbe8422dcbc4a899eac3bfe247f28146e2f64ebe0699669219051ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/nn-NO/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/nn-NO/firefox-75.0b2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "cb3cf186419c3303cacc92326d901a4f1b79991ec5054a8438047df06e052ed981eac7cad8a6bf5a360c673f232d623ad40af83537de962caa361e0e8839210c";
+      sha512 = "e7a2b1e038cae097babc40eca692da1a4066f01a18ad958378533ea03cdc49e917e13c18aae0fc40dfc99723e3f86b25b1ae35f2d400f83add63c4151a4807a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/oc/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/oc/firefox-75.0b2.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "28b65b10cda0c34ec99975d3612576619a897eb2bff5ed215068b133c3c32793810994cfc15877529fe1fcdd9abe48001a873ad929f1f6578a91dafb075375eb";
+      sha512 = "d9c3701024ac70fb83ccff3e2b843d224115608b7fad1d6db672af3716e9fe7a80efb8d92a366d085376dea51daf099299acca629113779622b39eb19750dfca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/pa-IN/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/pa-IN/firefox-75.0b2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "a4068e759d8af078c3e7f9cf58c00c2fbebe09fc2c204373d5850d195c9d6923721d43091aae2cd27430967254a16dc3f1dbad44da9eadd3974f5b38257a21bf";
+      sha512 = "68d13fab28380f7ea29898dc2ff91d6a2d591a2bccf0498023494466827b4b4eb7ca7769b93e042dc855994d590d770b80b9c5d1b636f6923534a595cf6d356d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/pl/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/pl/firefox-75.0b2.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "49e50aa82149d9c0bb06d6351326c43a08198e321cda4b8023b02a48d53931447dffe70c3fab55eeae979898749cf884b57a4b49bcdc223231ba9034ed9ce089";
+      sha512 = "69b5807c0cf3053f87e5a8b2fe51dfa40146685afbab623a7824f6fe6fbe786dbd17c683d697f6b61adf78f800b84c0c5a16e7caef54a6b3dc02d0ffd5ca89ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/pt-BR/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/pt-BR/firefox-75.0b2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "0c2b334dc66242cf7653665a66536b23be1bcf5b8e8278714b437b894f80a679f13bc92e409ff9674f60015c8046e97b9847f4d613eecb64787b766898bdf9e3";
+      sha512 = "f9ae02b7c9c72a97b8d28ef1e1196dfbbd5ae30acd82939c8b7fe37a1de0c73492ad286e4ff05c0b5f8c2784e0a1b2b68445b94bf765b501c062f33ad1ea8e61";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/pt-PT/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/pt-PT/firefox-75.0b2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "ecd47ca036187a034913b59510081d009b6932e8e7d328ff917aa99c717523da96468f843b25e5044dafa15d1858e8331d6558dd344e31263de27d0dfd76c2c3";
+      sha512 = "e89bada391d72440f6fb60933f33e78642a595dafb277d4d20768fd418c6049f6969cad8d1b95c76670cf7a033acdf438348e0a6efce9c699a7a2276d2b03f56";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/rm/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/rm/firefox-75.0b2.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "fd6d6db19134f494e72991f300e1990b78db9391b0a3a447eccc57add51ba7a1008a492532149d39afc561ee188a7836c3a0fc75c222c59400dbf60dc28080ae";
+      sha512 = "281ff5d841f3dcf7e2ef42a159a5a43426fca475bda02f70a34b7fce50a0e313f61cb11d25f0876314aca3f3c285504098c60f0e79385653f8b877994e5e5275";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ro/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ro/firefox-75.0b2.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "62ec3ba94ca44e2ca92fb0dc02834d39b91f7a1ce6446407531019332f1b9d129bdd8ef9de7c0cc26cd8857ae82d03539f7d0f2a51e5f755d4311fa3ae410eb5";
+      sha512 = "62bd91413af9017d6d4b70145f4c763fa7b35d78719ed14ca808ab3a38a4a3717eff3584a29b4c38de05c78365351cdc5a07bb3a56d46c65ee5447a3a0226276";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ru/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ru/firefox-75.0b2.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "2b89defde47592774464b8570b81636d94d77a891c22e353e5bafede7c370b4331aa8aa49b2701239ca58eb8d08d74a7525661a57374f1686a427346fc425f9f";
+      sha512 = "40e917d1a07ebe8a1cc6af2b399187f4f918ac3d509eeb8c6125147313b469847e34f8b9e705b400123d4327ad1b13f2b4de24f70e33236f7bd4260b4b13ca94";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/si/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/si/firefox-75.0b2.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "8a86deb917486f679316b9f8d2d7bc54ea175d87f972cd9697d1ddd3e1fc357059fb6383a777d409d5b3a110ae7f74505e327eace3593ec4b4fb35290edbc0d3";
+      sha512 = "58874b4198c1a7b374ed0d72cc223733889a3bad6f717151dbfe7e584df3059527d6a4ba055575d1c2dea74393f3d70705185e0c2cc589306c5f1e62a31aecfb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/sk/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/sk/firefox-75.0b2.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "ea15d6e49b8987f4c6136de6fec19a627d71434378f2839046a3fe443ee340a925773bcb09c5dfd3779cd1118aebdac808f54c5872245b11ab882564f81467aa";
+      sha512 = "6cc148e5f962006d2f5a5651c99e170b706c0e51ed82736aa51a3a15e8b254a67f6df6d7067e261d0a269e71995e1555de7fed81b02776885dab67881cd17cfd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/sl/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/sl/firefox-75.0b2.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "3dd20c0ee05318cc7f80a27d895af4952bb13b8ee3af1fd733a0bc03902f470fa31fd8b3231d608e76df3885c6036f27ddc5241bb889fbb43b09467d34fe77bd";
+      sha512 = "1abfd77e7ef638d1d1fe1e1d8b31631f0a93e982c22c6affc9fc9af77dacc81d53afa95f63fee1a1b444ea7db88826a4f6a851c87b6518f2c6a77329c4aa2c8d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/son/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/son/firefox-75.0b2.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "513c17a2d91d28f5ac958d45f872a931b3f3db198355a70b72e0238938811e2387fa5d15b0106feb3fcaaf455e19e7603c37b27dd39d8d81dff4106face87481";
+      sha512 = "80e7fd5e34fbf115b4462913449d58e8bdd725f45120d068b8ea6624293cc944ddc218e3854b7e6935675ee1640446f063858515c70bc1a7990a3c10ac812529";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/sq/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/sq/firefox-75.0b2.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "ce96e1f7f0f0152afc053d4f2ae2c8774cd79e12ee250de311fe39c22b933fdba701dddbc2430c5aaa3ddef8d4920c2a04d9373fe8e8aab7a3bab9a6863ba68c";
+      sha512 = "9e5088a05c22a448bb1212d2296d0b8690189d6bba8053661445e891b6e8c2716ef76a82e6659eda9c434f92a7f063e13845ce20944df571ff318eef764c2ef2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/sr/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/sr/firefox-75.0b2.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "67691bade82b21bffbe312b6dd3db5c7aab2bcc28ec59cd0ac378ede98d92c15d98b2c4ccdd6d7bcb77d88f760e7c8880d3db5d93286cf6a71a79816adcdb0ce";
+      sha512 = "18bfaaf378edb31b99bee33a60ffb06138dc6c7ff34c166de30255ffdfbcd7c2cda214678bfd0e11d4f5afc4a666d6c3ab7d1ffc92137abbd08c9e704f4d1d7a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/sv-SE/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/sv-SE/firefox-75.0b2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "5e890e03090c8d3317f8910c16602e9d26df02d91a05159d4610a3b8f0c3b8a026e6256c59406d40d979f93a20f162e1d344d6c430b33e86709dd66b211246ad";
+      sha512 = "f27fed18480927afae490b8f0c2c4c925045e56bb355404ef499289909e256fafc694cf51f030fd69ea395ad5b5e593f991ac428274af745bf39336d247e868d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ta/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ta/firefox-75.0b2.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "30a030bfb1e92f3375411c9bd38b8c75db01783ed45bd6d1b3919442bf386ffbabca7a3064ca22800e22b9255b81d415e8487f00a50e0641c9f8bff297d0a4c5";
+      sha512 = "200b41c6db82f1282155cdb348b8496bc61c9e248e6049e7dbaaec3732b4711f32b38b3ea349b47f1228bd8c712b15db3b9296babc177169795fe1819144ca93";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/te/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/te/firefox-75.0b2.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "bc2685e7a6e4e1e744367e01222b192cb35a5cbbc0e5e5f8e3c03e9ef8dd54b599f854bd045d03b02c2fadc36bd778b9f4c72e660357f96e7fe8e49a9b555331";
+      sha512 = "193a3b9cf98de69ab236f9efd59e23deee25eec41e409a93c9949789d242957f2b58bf724fe3effa28111595c9d1e49a657a5d7f6c1b77a285386b712bee67aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/th/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/th/firefox-75.0b2.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "8cb0fdf71183382c11d3d8244cca52dc9ab1d95a929809e016867ebfdfe1e9ff722a6a54d8e829cd659d218097df8ad503286fa2d60aeab0bc29d514cc1cb304";
+      sha512 = "3ab9a77fb25870271c9cc415c31f1ec0258a66b3f1855c761dac367cfb509b6c73630c88f022cae271cc553adce8ffe63fb1bbd489067b92772286fbcd765c16";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/tl/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/tl/firefox-75.0b2.tar.bz2";
       locale = "tl";
       arch = "linux-x86_64";
-      sha512 = "807581a2d4f4b87938058ba8173cfeb944cc54790c01d6477fe9a9b75848341f785768b4b011c33f3010ddc02fb1937cceea27a8260e3d53c386acbc21d7152e";
+      sha512 = "f386b2d32e2656ef8e9a0afe0050eb7c8d8a1a00b92badeb6b5c2c6d8e046a2ca7b038677af56e725d15ca4c6111a04e1c929cad0575a034745e2476497c2cdf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/tr/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/tr/firefox-75.0b2.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "089f764a47b35d5a96edb36f3f056fefd2a2e649036b713a28a482a5cf5a61f5ccadd5e8f20588a0c40bf707f556ae238688b605db189e9a1efc2dcb7d9ecdc4";
+      sha512 = "802c72564706b4e447f0cc2835046b44395519d0c2d7fcf6c8f8478540649362a49144dba942e1c1e33e69ff69708437a985665389ea2b1307f8c386690f9664";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/trs/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/trs/firefox-75.0b2.tar.bz2";
       locale = "trs";
       arch = "linux-x86_64";
-      sha512 = "35622a3df18be8710530531cf934b5d3c79b942e4f1024edc75b810bd71d45d52ce88ef051fd051083f45b50152602b76d854d2ae56bb64a38739be937884a87";
+      sha512 = "60f8f09625d8d2633ca7b08fa3f66573ce0d23035f16773a338fc96944c66e6bc77af36b128589634fc99f86009bb1016ee2d1ed503407c2ff085d20c5e2fb12";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/uk/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/uk/firefox-75.0b2.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "77a2383129c6f60f77458e3e17bc57015f91d8f58d9d0211dda918d075b57398d7cf80cc2409eef2c6053c843667e6b094733026533e5ae665845bc925a67f40";
+      sha512 = "d3b63163cacd6ba99e3f7dc9d5ac81e98155e77c0315ce9adc2e23cfce614f67b519ebc5ee8aa4f1aaf932c7f619f828487f41c6a712557c3f8289f9b3205f2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/ur/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ur/firefox-75.0b2.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "45d49bb2de384d12749c45f02cc726627123f9b50f920f144a2aebae694407226497df5c0273eda168f11f2adec22495cafc82c114f711c858b9b207d997e1f3";
+      sha512 = "ae76e9dfd1b22a7cdd15c4b4b8b2a508168359cbc6b15ec9b52e489f2670799e1056eb6d7fd6fd28680b721a4912bba982ab259a02b050834e31030960b2a8d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/uz/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/uz/firefox-75.0b2.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "14bdd8d672660b0cfa8099276870e54b725d1effdd7128666dc77e942c7295e466544806ea134d48b56e8c5b37518876c5a14c79419fa232f30e35cadc217948";
+      sha512 = "6216b85a6b4329f378d057d72418a283c4e9e1454f918636c7dd0845e63a00827259397e82c7875d1157bf05dba32d706cef94239cd9ef6ffe03fb02255659f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/vi/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/vi/firefox-75.0b2.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "3633f9e834c5ff0dd0a888a35f414d87ca35ff0acf63fa41ca4169531f20c21a7debc649c583ed2826b1217b209e42355625a7d822c8e354d4d973aeeb07c359";
+      sha512 = "ba8fff9fdeb195f42409a10d0fdcb6e8889a6cc49fd3c787013109b32692e19109b9029d69a8458b05b51d8df1dcf085c818a0c1ff5a48d32f68d251e41e9681";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/xh/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/xh/firefox-75.0b2.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "b49201efcbaa9254d94940d87529ea15c1ec18682098e46bb4c6df96d20396e6884538bd93ef79a0539d52bea808f9c9e621f4a157b0fa48310bc89ecc659052";
+      sha512 = "0493e6e0d685809ac5f757a829cc0ca0564d8d778dadec422698c369f9aecdccf94be594919273b9bdcd23677f0e8a760e01dd40439262c98c9ae5f17b7888cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/zh-CN/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/zh-CN/firefox-75.0b2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "5d00ab9e02db12e34a69d5a8301075f695e103c73bc5d3942e8aa6312010fd9bcbbfae2db19dffb12e369e4abcda0919842a839eae48e27b63a9a40a2d152943";
+      sha512 = "efe3823502fd81587460486dd7df33fbb878e8dc657c3d65d8e3f112374d3452abdfb797eb95ea7d4e3fd7003a2b906e78643ff1f344088e9a8a577f554affb2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-x86_64/zh-TW/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/zh-TW/firefox-75.0b2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "8b5c6e59a6a93c1e569ab0549deb0ed529ff7463b999c39e1f737805d71edab8553bed6bce5335aa75657c1356fb847d8389829f74e0d8977765fe6b5f7ae615";
+      sha512 = "d3561f2f043480c2c6bb2e0d455a752c2a00f800fd049a21c80cddd03ddf04d184f3bf352446dd3a858bcab5a42543992ebcc86246815205a455095b5884df75";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ach/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ach/firefox-75.0b2.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "4182a91809587cb00b5b15cf244385625dbd1043f64ec67719fd4532315f02983c605554fcec94e3ac9e152c5a69519b9f3cb274c4dfa4850b509669214ab970";
+      sha512 = "7b9cf2172a3e4a7e7bfea4ecec10adba14944dad36db06d3ed60c36a5d893c67a0c6eb9e65f612040e7c3e2b7a9e966c53be7c2d5faca60e37fad2c497194d44";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/af/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/af/firefox-75.0b2.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "37505dd57623b9b8ed5c9481b3c355790f4a83758629fecde8f286126455f83b4908f0dcafaa6b53a78ac2d1c0d77e8f8d3721d3677461729561b0460c0e3da5";
+      sha512 = "3dd2f4ac297e6e358657f90beaac9093816d339f84c21dbe3f87283c6712b1ab70c6fd9e70d05bc79a8997ba314711c37ace35c7c7e8a4140b9da99d953968f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/an/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/an/firefox-75.0b2.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "bdf45ce1f39caee0addced219c3702e888d749249c81082f0fd851375029557c995cad40bd3ead24aba1c52b96b440b3004b43994a4a9268c1bd041a7dd92e07";
+      sha512 = "e04e6875c8873fdeceae22c486b0a5f718085f35a5e46b4f3340ce4654709e4421060be73bccb315db4ac4a93991b5e844653b19518fc122150dd6c6ad84e89f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ar/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ar/firefox-75.0b2.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "c69b667ef5066064fffdbe8adce20784c23e0985e30490d4ab7905da6cebdbf49557ddc321221130e6e7af63753bc7b9bbd290960ce1b86591cccf0ec53fd171";
+      sha512 = "0c1728f66fc037ffef1ab0f68d5a7e5ca3207467ad03981c0681981c562b6f51df0026b8b323dc4f0e15ccfcca470c1705776353c0b2d4802aeb8879fe306548";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ast/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ast/firefox-75.0b2.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "a697e44af702f500d72e8142cd76230b886b893a310dad7136b583204f8201b0718b97f5b11cbe3af4baa0e95f46fe6f1e69ccf4b9ed42c34d782c320d6d2f19";
+      sha512 = "1b8fb16468b2db02e8e16d6f11d4924960f48dec2996ff087d94106d4b80c2250acc6e07f510ae4f7db65f590944df8a44eacede55deb915259fa719ad30514e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/az/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/az/firefox-75.0b2.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "ebe0786c3790da17fc1dd5ca0f10ab3fb854e90b08c3093aeb14d5df09b58d8ae0954b7bb99d159736f0cbb70391d81a47dcc9e229b02ed5fbb2b9ac7e19cda4";
+      sha512 = "500ea5cea770c8d8e5e89d367e9239fe4ad065f43ceb2c1ecb2ca997dc27989a489586b6f387149d6d97d204a2cedfef7ee3eb745bc91d140ee8ff162d6327be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/be/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/be/firefox-75.0b2.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "74003379f102a2c8c8079eab756afe16ab1037d985fbd266bfc80abaa5ce6dfe911b20ddcbe5dc228e87dcda4f0f7f874cf2dd762dff90c89c5e865c77304d1a";
+      sha512 = "5c258e46db0b6a22b6a658dbbb4a321226b54ca66fcbf8e41d345ace9c1fb36fcfb415d06dcbe0da14cb9ef9d952146f232ebe962b975d5a45df70b30e0b0b50";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/bg/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/bg/firefox-75.0b2.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "71ad6c25955e6c840e583ad8a7f83c5de21445f0784c36f2073e42a036a16e58ca768ba43468bf5432148ff6d254b5cc547341cc38dcf844c7f40c3225df21c1";
+      sha512 = "a970851cfb8c1231399d2fadd15390f7a7a9a317169b85543d262b7c1003c84e11140fa364312938271c0288e4a10804628f6ee286dd68d1bccf1cabf4c015d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/bn/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/bn/firefox-75.0b2.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha512 = "840e225c9112502bccdda79146dd5c9b920f1eed97afe7423e539f750f02a0b343bf3313ba8826145efdf318fdd17bbff5de142fcd3e1178334af55fecec67dc";
+      sha512 = "a8442613f7aefa8bb4ab963e2271612cddb102bb8274e09cc80436e85ad606fa3d4938188c85c0a10aa01479976dadc4c4d6c2a17835980191e9dfc4608a9482";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/br/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/br/firefox-75.0b2.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "6dfaa0af20e6b874fe675b879da9e7edb80b0486ef283d3e957be8d7804781c083f9ee12c9b5da758e9e38806cd35cc0ec78ea3aca3f7e2dd994e6c06c167abd";
+      sha512 = "a3d32c2ee9fc1abb86162f04ebc7d13d3bf03d1596874c2198e031e2f993d0140fdbdc47f22bb7c821ade80f2cf12471f9d8191c5b7f7c87849a5577e4638531";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/bs/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/bs/firefox-75.0b2.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "ee62dbead4c185915d72facdb7ddfd42f6e543d3dcb48ede83cb0026581e0b4236e3b29c89053c302441b51b13333d3cc46500eb389fc1c72c7d467da0f21d06";
+      sha512 = "a5d54761563e2a62d0aae4b946b39f2d04d57f2a1245266c11bb4bd872d73cf7738c3a9d7c2ad47ee4c13175bf4f142e45a3a7f62582bef03a946ae98b7c038f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ca-valencia/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ca-valencia/firefox-75.0b2.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha512 = "56ef6d6859e260058cdcca261452524eead1cd1f57811f64776f3703e16e44599c665c2071f1c29188fbb5f02481467d1bb569722460970f951f7c50ed44f2bd";
+      sha512 = "0b6d18b4f6cc77704997a7fa9d81dc58e70c1f4c08403164b93ab915683c7005410f5f90204a8e609a54dfba5cdaafdb268450d075182efdbc73701f07adc1ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ca/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ca/firefox-75.0b2.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "32249eeeeb5bfd1155d9a7e8ec13d5da92a49193ff6d3298df01f525ff08186ca2a6e7e14bbcba048abbffa1fcad3ca0ee3394f8ee548b6470f9c961a26a8276";
+      sha512 = "c65b0437b82cb4ea3b1eff84fc75ebcbf65cbaae22631471fbc8ccf4e2a6ff846adb88e4d93566fcfd394fd4ef4c4d15e63e41c11ded3678fe69032765dbd3d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/cak/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/cak/firefox-75.0b2.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "00b5766bc6b96dd85222d9a9e9ba58b22bd0f78d42c0ed929279242a3973efee0b7c6fbaa5b8796b3b6488a3c2883a06e221916201740c8352be134fa2f988ba";
+      sha512 = "2eb289a7c474279422dbd4fd6396f08946790e3ec98a6c5c40e217efc47a9099d16f01205027c995c0441e5787f48d95d6c40216ced393219eca3d55159a5459";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/cs/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/cs/firefox-75.0b2.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "2d6ffdbb0ac90d626f613942f3c1e474e39dd73c7f54ee9587882ef09006f78f5bc9e9738d25d63e55123c9e8652b4b5484e9881720e911f1f5e01d55209884d";
+      sha512 = "bf15d558e81ae3a766801b532b9cc2ac5511b2ca6eafaef012a4f9dc8fba06c6ae0e906541db01b59d566453b916bcad79749e1b036573c4a01a04a95a0dd60c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/cy/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/cy/firefox-75.0b2.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "867b673671dbe387069de42909aaccd04f4c164ee73cd1ae4170fc0333c54a48ba557b2d3956b60953f39463b86a6d6525b2a5e325e22c22cfa3c446f7fc3340";
+      sha512 = "66883ec6b398b6071b13c55027a3e3343e3e71b6de5ce7ea72c052c9991636a09737509d8127d2a27fb6550e0937ea21954c85d6daa8492c87c2287d542d73ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/da/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/da/firefox-75.0b2.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "d0cfbf8493cb53096d1667b2a453b569c1ea9fc3815f95de9128fe784416671ef770fc3e70701ba0a5a935563b3b055cf3db5cd849520ec2d75d52527111156b";
+      sha512 = "d496d35be0076336a5ce37097026959ff8ce391c07b7ecdaa543d45740af18e3d466470478c9639c4f3b8a5d6ea76dade7196f65e411bd90e5dad9ec1c10a258";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/de/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/de/firefox-75.0b2.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "c52ec2293b4f7d61ddf1860a63d76e01555023f203420bc6fb53bfb24e407aefb4276896b343bfea2517bed9674fb39431bf1a38124288b6376d480b9432a51f";
+      sha512 = "7df38aa573d796c23e00715ca333c7a1f90d560513c17ae35afa80ddf2783ed4f091cf2e0d8b25174186008ef818e5aabe993e2f013af7d9b61fb0ad0c954886";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/dsb/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/dsb/firefox-75.0b2.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "9ad7846365072c32a841f30e1c040c56144e95fe4d9f4cab9adb282ce9a5dbd481d498fc71b0330feadaa68f23a35ca512c1ebe3d07f7a4032567a6225c875c9";
+      sha512 = "d72d5940904da04577dd0ec0f90128bf4c89b8261f54ade9a265547957fa9ebb7687ade1503a0b8bfbffac094953cd0d1fcc836e26203545ad497221152a2847";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/el/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/el/firefox-75.0b2.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "526d4562e8b1e239b2e15ab89c90646fff6b85daa309a9388dfdc60c4be743ce39a03505af58f827e9549fa4b8e658bffa2a5a7f22921a94f54c1737b6df11b0";
+      sha512 = "d05716e457a5eb13a51b0bbfda6eba4f9ce775f567e4750831a1a3fe2d5d2beb8668d80dd7375e7b4db2603d589a6209634d6704ef34a851f1a8a750d1ec40db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/en-CA/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/en-CA/firefox-75.0b2.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "6a7c18c9581327c40f128acc56e8a9f4c7575b85472ebf120047d3f5abb220fdc03f78b5a182c9e3ac93970d24ecec3a57224cd02ca2537ab5b86e594cb7bc2f";
+      sha512 = "0821949d86082a2556ed163fa2c977e79293f45b6dfbf2517c3a01cb4ad5d50491e6db900106c4141a93461cb456d613c5be3aeb9afc8d4f502df0fae15c1b58";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/en-GB/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/en-GB/firefox-75.0b2.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "48cc9068571767366a5086f340a5d4566e1d8261e4bb715fa3463106db4c02a5af316b37775e4720344ae2068eb35fe004bf893ac1ebe923336f13978e2ac955";
+      sha512 = "df4bba4600e6100772a373c6bad0064c0ba3d04c7db50a2a8780bece46666e254402d3cfae20114b29a1cadf19d978d47127c0e39619d40876b0fa3df4b2a84b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/en-US/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/en-US/firefox-75.0b2.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "e50c0d061aba197a2f2e153731dc5169fab02416733669a593387338a1acfba1bbaa2d26aa0ffc75fc972524ad70ceabceec30912e06cb827a25036607acb7d8";
+      sha512 = "56f6fa58f059e2c757e564a3cc25121d816c2afc347bb47fcf2c5de23b384cdaadf291f02636aa179eab0e6ef185b3b79653f5bdccf6a92d825c3a7c2c9a11a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/eo/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/eo/firefox-75.0b2.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "23586c04536846ef9b0750fde66b04efa265f97a5d8c30c7f5e435010b80b0d6556caa9b6c579126080fd3d58abd957dabe5723779af1936ebe4c21c185d333a";
+      sha512 = "9ff03e25d258168238f0d6c2654ae4896fad897e0c9b797911716e7496846b853601e0dba92db5b1c86ae94476752d9dd5714242dce620cabb5ebddaeae062c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/es-AR/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/es-AR/firefox-75.0b2.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "6d2c87e248b8e4e395af916d6b91eba9451e1b6664b31d843409b06e4589daa044392a1f4f31cab9411350c753d21a817411cf7149dde4eaa87ec20ab724f63f";
+      sha512 = "05be15de79e1c2807427a927ca3d580d3bbdb5d4df0e4be06e23462a843d125df22471d5793be410a24b262b1796fbbaabcd27cdfa12cd0769b68967ebc9f5f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/es-CL/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/es-CL/firefox-75.0b2.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "b9576b60cb40716707c5037de36ce278c9d8410bdb68ea0e1bacab310e8c0679fe80d0a5ada111e9f605a4eb313a7d7519fde7dede3de43eed40cd88386f16ec";
+      sha512 = "22e4bb6047ed7ad134ed1c33880e44dc7067a2e1510452483004075763b30f91dd1221cf3ac0069e2f31cf0a360305bbcbd116e62133b56ad509ac3c4035bce6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/es-ES/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/es-ES/firefox-75.0b2.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "602e5a02e5a534650036067f87fb844ddc564aa54ee219ada4098ebd4e7c60635c59b0ec1435f2a7d963cf0fc35e0850e0a86007e4562155bc1bc07b78349e95";
+      sha512 = "0930851d3c29384c619347fe6098764119b1a994640c744ab57f2b727164f6596b7c2c160459e483a9947fbecc55d6a1781ebfe52e8b6ed28403f3464f56c98e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/es-MX/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/es-MX/firefox-75.0b2.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "0088acbde6764febe9b37b8485110d34bf72c20b1aa4fa9435712c3b58609ac082c7d1ea203157394ecd9d7609f35fa05e784e6fc5273f14d8c216a392d4ce9f";
+      sha512 = "ce7b0b898fdf70b6751ee95ca098e5b1bd6a8798313cb1cce0201d8457bb90b10faa2ed2bcba04113e10a76f92f3b3b0b8beab7771fefb9cf2cdcac3a4385041";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/et/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/et/firefox-75.0b2.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "a88ad46ba958dde4ce6589e05bb941707b894ac8b5289f7dc4763d5960a7a4754fbf5dc669ef8318867482a9fff61e711e2c13befc08dc1201ddf5c3273051c4";
+      sha512 = "0d8961cde7ca4bcdb16bcf579158ceebbff44f07565267765178ddbb9a5318e58d60b2f70bc1fe0a939d06d1705f986770b9fb17a8d22149feb1d66c44e89d38";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/eu/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/eu/firefox-75.0b2.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "c24c9ac1869ab82ea8ce162cf441e45356583e4e5466058460ddf925c25a88580bad7672ba82abad090faf29dc804e098abf0aba72f1cec18736bab1f3410c1d";
+      sha512 = "f77101548344ab87593ea80be86fcf6f27ef6db48f394db549815c1faed4fd439a28ba87321befcbf79f0c9dda93169abd1cf68649f626da694032fb291a0434";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/fa/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/fa/firefox-75.0b2.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "16e30c57680a2ad0c7557f4819a0aa28e4e066d3a7b39ef9e1b99fe69d0c8825120f086ad628f3cd0fb85c28d9059a9ead5f9dbc695777ad06bb7430857a966a";
+      sha512 = "c65ad5b2726dc17ae327ee02704ef1eddf29bdea9b27096ca571dfc4f12449a4f1a6cb8550e401d6ecb106a2ac0ffdbd536a12f41d6fb4944012f106adb0b72b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ff/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ff/firefox-75.0b2.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "e4b53574e12f35124c3fad67f53524b8788ed2625156fd5d73742414c179a71892732643cc9d29dae3e036820f1ce1701552a4ac29c2a9de0af89094e9dbd937";
+      sha512 = "09baa6e459175ca1042b489b63c0f6e8248e4039d6addb2d873dee777cc94b5e3e4b0c77f78f8462239f6886e74deeaff528c271a03433589caf4db6c2202c4a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/fi/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/fi/firefox-75.0b2.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "0005ff250d51f48dbac887e2a9c4d74253f4c01a8cd1f4fceceefd2596dc5290f24147f3ec7b7e4b487b7c6036c05a74025fc7f736daba943e599d93c9c5e789";
+      sha512 = "52d3945bb5f16874c28a37230c0b2a593d368842dea2aaca9cae6c017f182eaf165fb3658a6a1a0881d54c88fa5dd7ff42806f8eb95653095364f66f0598b26a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/fr/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/fr/firefox-75.0b2.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "419ed2989376b876c13851f98c4d278b79b81f9dd5be9c2121e2fc365681e7348e077f5e70013cfa8d271ce7d10cab487f1479c031d3a4d428885ae3614db2bb";
+      sha512 = "8bd4b0d20ca32693f34c8aba6f01fe1a2b0a3a7730ef1948de81dbe8944dba09ca6d24f87a131831d7276f9ecc44234778cedf4d1f814784e65607d13829990c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/fy-NL/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/fy-NL/firefox-75.0b2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "ebba32714ef12a12a7a1c1cc485cc5d0287c3d7657278a599f906cd5c214612bf1be0a786d2c8079b483406c4c1161fb96b50f046cd9c878bddae5f927453588";
+      sha512 = "851cb969a20e1927f06a6d33a0851f6e63ed14defea566de90ed2c98e592a00cfd1bf34de55c125449c2355002870b7cf5e3548d37055a5cc16a36192f9c92d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ga-IE/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ga-IE/firefox-75.0b2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "86d2d878625c230cb251f2f88dda89fcd82e6ab8535b1eb7476a11f023145c6d5b38f3615920b11079357e8af7ff17801326380543e6b0a5d9e4d9e1356a8ea8";
+      sha512 = "79ab060d152b810917803cffab7aef198670a98d8d72d9ebde1c3d3dfb6882ba19cc27e6454654d7a164dd712280d257b33e954f628ed7d59c8d3915031c2767";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/gd/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/gd/firefox-75.0b2.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "ed5cfc312da1b7c336f449301a37b8ff6f5c83c8ae0aee3ef83bae8f3e4accf56da7680694327a5ae6294df7015037f31afdc30a409678406fdc83c821aaf490";
+      sha512 = "4800e3ec3a0a53ef9a2cd605ec93d4609f862afe1f3c2e7bc7d64ebc5b5ca17ead6aa2027a5da7b28648d7e4db2059987872d74225ad765f68a4cc5c45f14a1f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/gl/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/gl/firefox-75.0b2.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "701fe5b9dee8b64314b3e1bfce55ae3d1d33aceb871650098c8e10826f5e88e6c734698937cbaf2f0fbe07e2e6c914270842a3df399cdbc82a3556b1ec048a45";
+      sha512 = "8fa1cd71b985fbac1f0e4d817a1c3c7c7ccef1a1e8c59fe14593f4ac09a6f6f55919c060adf25f3fee9aec706e5ae07a14ea3d7c945d6820129a712ea237b232";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/gn/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/gn/firefox-75.0b2.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "40be9288775e6411f7f682cac10ba9d5ca3618a7b8d64086278c4fe9e2766c6bb24b5c1444d344643adfa93a2751f1855107d66b4b2260e0da3f4f473b71d2b4";
+      sha512 = "8eb3a9b75d70ef358559414b39853177fc65bc7d7756f446ce65a5c9c94ece92d59f76d74c17dbdf877ffd977aa41cc2e52b3ab10122908e422566f12a016c6c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/gu-IN/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/gu-IN/firefox-75.0b2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "057941bb40197fca1069bf7eb787b2bafcf998d1cc83af1b64abee3c17cb5a0b5d2975f4183ed33dbbc2c056e3e316f29b8aaf21f2c711b7a474000dc159d5b5";
+      sha512 = "741004043f30eaf344a1bd6ad36f7de64d935f7b056dd9daa516df64dff3632dae02d300afc27ff1c0cdcc5208e64dadec64b1df8139098efdc05f7d95a066d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/he/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/he/firefox-75.0b2.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "f75b88b8de0aca5e31594a592b3827d2f0925d9c307200dbf8c2cf0ea04239d371412daabecc29a689ce5cd273ffdcfcd40fb03c2e91fe9162fe48bde5178a74";
+      sha512 = "b6afd8db87c18cc0b5cb7ba45386555ca45b27baa469272dba66ad4b3fe11db7e5c6c48742691febcbe7963729bf34c778dbb6248c01c1db3a685f38a17d6bfe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/hi-IN/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/hi-IN/firefox-75.0b2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "f4890834127bac76196e2b94461f28916b4467e35b43f40a6153e43ce90eee60903ac7d1d7cdbfc1eec8d27fa47e2cde6d2c95a1a996a5179b9d1cd9b160d927";
+      sha512 = "b73988b29f52012ed911bdc97e1978ad8e56e640666879358a1cb79f88c56676e25f578a64b449372522a27abcfd37c44071955e273f4291ccf15fccceedb645";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/hr/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/hr/firefox-75.0b2.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "ffd75c9101ebcea645f704c2fda287a7365f473a8d9efea75df889ad7a9d36c1c170690adafe20a1b2b09cd39014ea4913b440044d08b0e9c2f412dd17ed2ea4";
+      sha512 = "603ac12312015dc9f9f24d0ae48b50b55d8f109e31566823f387ffc17a1b99fa958d14f6214d7aa8efc4cb71e090901fdca2068e491218cb17acf914e3f8570c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/hsb/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/hsb/firefox-75.0b2.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "0c0912b483c984f6ea58e2a35f07a2932c3ea56e1e49324d979638ec8d6652d89c6690672f17dcf6ba4a751d8d2395b9a1e2a6503f3c8476f8e3a199e2ce3843";
+      sha512 = "a15a1c2a67ab12f2dc506e9138bcfde2740de9dddbcbe825300555b7c72be7b78ef15433eba60a132f8c8537cd1b42f05272eee399dc3f69e8defbe5ac696fa6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/hu/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/hu/firefox-75.0b2.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "716dc8e392758954849fc7928864bed6cd0fe40aaa51872f4dfdbccb28edeed138b1eed6f7d1c401bdb7b080c7c5fbd0e62c0133bff270c68421fb48579783eb";
+      sha512 = "829f16afa6bd4d1909633e3f4cd0134a4d397b32c1b85b1203f54217f23577da0eda8bb207b07a46a7c9c09bccd392f4dd89ade408d2460720ba5667842b9a4d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/hy-AM/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/hy-AM/firefox-75.0b2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "bf28485aa9ff76aa20db8be6020763e46151d87d3e4f8fbe8c8e72af9e81198ec645d47cfac29254fe802304269fa00addbd75aac6fc2928880b92feb87e11d3";
+      sha512 = "acca12ef2379c4c833b3cae7510fbc01f71edc3d6a9b6ca39dc560fd892b8ade2aa05eab318a79db5bac0e1d98af6c31599bac029ee7f58195c062d3bbdf3a23";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ia/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ia/firefox-75.0b2.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "1a3811dce3493851734afc5b955533edee0029783a5cabce62e72649a0cdadab52206dc72d414ae2b92f34b425f111bf5b399f07c15f7b5c81f7eec3ddfb82fa";
+      sha512 = "c33bf450f946110bf8c72023c1c6079287c944af445f63e4d8154de3fa5be8f6905c9b479d79aa82883aed95741f6d53776b87245e7d0d71af3988f54591f344";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/id/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/id/firefox-75.0b2.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "67b851f947407b7735d7335bc3d9fad5ea736e9bdf03cde7a28b3854b398263ca6956c2baef014bd6969b254d203d0784afc53127f66270ab8df1922ea8f1ca1";
+      sha512 = "f3c9aa62d4a35b43aa60d6d577ac6136d1646e5d577a0a1b7e02781dd33f7579fc5dca0c82c1ed0be226c0b3fb8fd1cbf1eac4d17a8cbde2fefef026e9e4518c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/is/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/is/firefox-75.0b2.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "5eea1c115b5725fefaad5be3cd401fbac96ea50886ec3bdfff586cfb08c48b2f5611a797f476f34f43706c0708ef460e7b0b75e104f87ad358369f07743a9b76";
+      sha512 = "e3fdd7ab88f947359973827320c4b27150c83ddf9c650d4358198d8466c7da92df2e50252a8988ea346c72ae491a6013558795b968ec947ab9215ae285416a40";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/it/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/it/firefox-75.0b2.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "0f44fdc04418f28d24638cc1893bb8aa6ca790e8afdf5d29da8b13e491f3acc53a0edc91c61679feef7eb4a2714308c36453f19a20c16d939dd7c248ba35dad3";
+      sha512 = "1d02f91f1612e3e94e9c39307fcca3ec90148a46c6289ab4b6509fa6dd5249e1fb3677980adfbd43166c104f265f5059ca732f56a37ca19bbe9937dbc0971113";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ja/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ja/firefox-75.0b2.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "e951694a4d8f1f9570a869cc5a0dcca733fa3d9c4089528ea55ee8ee70251dbc0e873530c87df293c2259dca59b8c92ae247897846c93b0f9e2b510643ccbdd3";
+      sha512 = "cdc66861781be3233ba9461aaac720ed2e0f1517b97dd76d002cba7ae5c9ca4f3fa11b69e0f87a284e52c96ca6274ec6386d8392ce47e433c65eecb20a5e9cd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ka/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ka/firefox-75.0b2.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "f4613efe42a9b2ac03d85e5d8164031d869d8e253c681f2d002e180eb2bf214a33671da7a39d9e0149ceef1ea27f783a5b69be7d2e02e0497c474b2149477f4e";
+      sha512 = "95e2d1276083f356d8c176ef2deee23b933f8dea4056d68e6befa45ed4848d985eecc2cb6024bb51fa9768ef9463b84cb66180fe1ca7da752a5828bd721a7344";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/kab/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/kab/firefox-75.0b2.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "e59813d89542a9fc68291a3a8cb75de567b247142596147f54e6a2e83170444d684003274e449649055225c0c8b882d96924a265b8d2de98711299e21776563d";
+      sha512 = "d9d7eca0eac6554d1917c750c9f6b3fd1a0f838e3dece2f1e6e7f3e943051978ddc430fda3b73bed8b21fe3b07a7c509f2fdc61e061e8ab227beb277b7e3388f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/kk/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/kk/firefox-75.0b2.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "b944ab903eb5b7075f3ea633e1ec40b4c688a2a97103f81ac80f6de77a3bfd4384de1314010b82937c986240e8e8dd40841a07c27e72c56b962a428aed24aa39";
+      sha512 = "a3b7c99fec93983aa18541b3b0ef11e57366f38da522ebb283bffeabc504e21672f4eee2b93e2f364dc6c2656b39fbdd4beb74880b86b6bfd88a09f6764b2c8e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/km/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/km/firefox-75.0b2.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "83eec772f2bb78198a955dad41ad6d68d9247006bb3430bc058da6da2d0d42c4a691ae20a4cee1a7b8c3495f6b07c15cb1487e7e3d4b30b3cf79ec42ab76dfae";
+      sha512 = "f5c35db5f9b64656b4cec5361587371374bf7577e7d5aabe329d34e9f02d4b4c27508ef8fe7743c8453c61e3534cd5b85178460778174eb7e19ad15260f9d682";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/kn/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/kn/firefox-75.0b2.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "f9f85e4a01b56b74c062b9b06a7a372426ab43ff2635fecf9b9eeb1c83d60682f17a19d1451e773593a0cefe15e39711a70e73ac3ce76a43b1274175faec06ad";
+      sha512 = "c94cae5a2bd8797bba6cdb689d885f106a94b34c06ceaec11798a1a3bbc36a64ebac4d2bfe978e92ddf5cd4c9aa23a4924def8e6b54c457ad54b25d4768b3b3a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ko/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ko/firefox-75.0b2.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "f0da90b5634db1db5576b8506f208a7e3810473d63c78228833eadffb512b202dd2866fab1964150a271c61c869589adef317c6be82978d5caeae148058dd819";
+      sha512 = "2ca35e7e02b4ac0188be48666636bc9adda6a3e98f0725c65ee8e5ac941837f056479697fbcbbd1f9f8f87d7f48f52fd8aefbfe3db5ba472cb38f9e33162c96c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/lij/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/lij/firefox-75.0b2.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "2d580111b1b20aade3eb7dfd607ecb7b7003b268dbad127eac13625d62396562c0e2d39f04597c1225f43ea84555307f9a3805df23743a1a5304175d5bd7a0c0";
+      sha512 = "6d1584249c1ba837d6be87f2bf57a52c4cc0dcacc3de82b26e57a55171db872de809773ee42a74017552b38718e5cd2fd9a57332730b303c379ea62b4047486c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/lt/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/lt/firefox-75.0b2.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "b786f7f6b5ec6910d994f48d625365a386ed461f86a4397cd9ab074b164ff30c2c88ab8d4edad93b55d082bc806f7648c048c4a76ec6a68dd18b5f65dc6c6e4e";
+      sha512 = "ceca1e4224cec7c4bb9eedcf5c5e563ec7592add530aef1d701d06023359ce519a3e4c885cf3e691aec7fb732705f8a8f9ef919495a6a55a4eb1324956a6dd7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/lv/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/lv/firefox-75.0b2.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "cfdf66bd7eef43a619cdf3cfa67fbc863a0bd886adde00d1d5286d17608f4e3c605001a0e5fff1b01fbba3f28b371cffca78b4ee82fe8f2c487e6df32c2d8ae6";
+      sha512 = "005ef32f152e7eb8021ee3872105c9915a647440a5302a951abb7a1967210719b38923c3355150c7dc76f2ce52dc508ac6defcf1d6f7ee834ed59b8ffa166122";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/mk/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/mk/firefox-75.0b2.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "d27d5ff71a465081b931ba2d3dbe8d69ff7e8532f630f541ffb24861808e43988e11f4fb3427809197cee3e7fc488dfa7bf0ea274b5aafd8e1bcf910b4e3e239";
+      sha512 = "98c87f7d897b9857955ca24f3bae177e9329010fd22445da16f71897e88f74cf641410c0cb77573bb74a51dc54943fe06082f6963b0594e1c1caf727a573961a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/mr/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/mr/firefox-75.0b2.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "b455f77ec2a081f4ce8f45e5bca6348c7b62a524e7d5439e1f79417ea57b33508aa97fa9fad149d207f59a8507dbf0be8fb18d19b72c822b030cf7061b0d5d20";
+      sha512 = "fdb22c0feec80297fe3339a9f08756e419b3439df2ed23c91d26eb6d870f55501785a11fb3eb98113df031aeb3d4f0462a790f16740862054fe90fc35878a8ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ms/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ms/firefox-75.0b2.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "a81696357fa5138622e5f2032ceb5c271749bf412d5e6e5b88087918397732727ccb57186193ff36e80f9109aa4b5c0313245c2bb62d73b6821e10f1ccaf64e0";
+      sha512 = "e6c5ada949b9950b218d189904ba050e476f6f9705b1b125ac5df974c25031d804e1fb1852d3d2bec1e87900b4757e5a62a793d97fc597fa3ff136939f9e733d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/my/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/my/firefox-75.0b2.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "1c280d2d0b608b5c718a7c829b6b8a10f806d6206ca88d7246b4401d9c60c9905dc4aad659b4ffdd183897a3b7f497ce5adc963f5813ec498d0db313a6597c25";
+      sha512 = "0666911bab682f27bc89b33ce186cb229ededa1637d7ffa9007c4de2fe74412a89b9774ceb04007052b85093b9752df3844403ce22f07481ad502145a2f34742";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/nb-NO/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/nb-NO/firefox-75.0b2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "425cf32bb16362a3a7270413ec6c95ef81a1f35c3fe18e21f55773ae68ceeb9d07c3ef309e8593e613a0238a5946e1b431b37dddf7ce44c336b35ecdc4115927";
+      sha512 = "46d4851f65d91e4585c24f7d89f271a18e92611431e2c4a6a5f369c066e7b4dbe07b7816e586668faa2b6d8d8f0eda04616fc48664287d08f7b17e84de26a96b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ne-NP/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ne-NP/firefox-75.0b2.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "91abdccdcdfb2af196d5ee78837143d515198649c4345c9d19d79a01b35381e6fb813f9c99e4b69ff5efadfafdd11deb53418190bf223122ca40d9449d3cdc80";
+      sha512 = "d2bb3f29f6939e36c66bd9a7e92a9c81784458ff75bcf570c6efbedba3e526a75ee797d9fb836e0d20e78d7bed5a64ed9d640ae71900f64a98c0a928809c40c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/nl/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/nl/firefox-75.0b2.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "61e31c484176e95852e02181f2a3f892603b3e2ee021d6f2a000016f76db99e9c82989792379f39520edf9374ee57f49b08ae4245d629a4aa8910add52b36725";
+      sha512 = "bc8acde71daf8794956c5014e35eae1fdf557b1b9de7bb955b8f8a457e81d043880b9978e3b14fda504a53efb2768c5745ffef32c89e1bbbde77469429d7f686";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/nn-NO/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/nn-NO/firefox-75.0b2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "cd51b29ff5c5815496974f80190dfe34e6ec6cd4eef605f94306e7576d332eceb1007edba11d2d0d072b1b02601efc7f2fa8f27ff5ab14a92dd75c29db25998e";
+      sha512 = "a5911405c58a400c332b697ade2c7756e416575dceb9b3a6f8ddde8759aa79e54454f53449688d080b7c6859f6595c7cd79b71ee88062158b95a4525b23e1076";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/oc/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/oc/firefox-75.0b2.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "f6a5f5f3ca08b6439d02e5a8fbdf5805374d10b2512b8cda0eb45e5b0d0c4001f40144f5984791ddd8c7c147d9e96d399dc466d0004da00f245d1251d24dda7a";
+      sha512 = "7b0323fbf64f9a6c693f85972b3c6999314bbf72a3291330e1fa7c9905d1d2a3c5783cd0ed0535363c197cd4a78a2ec7dd0a6c6bd48497a254f53eece2b35633";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/pa-IN/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/pa-IN/firefox-75.0b2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "42d4d089260373e5d16895c44b2f47610b96c0a01a0bb70c39876c376e70a58dca27efdc4a0d21996fd9479d0dd1255d6a7a448f6be8fe5d45fe675180d70d55";
+      sha512 = "20830ece0ef0129dc5ce188f55aa1c699052f12819e40cb4a0d9dd300f9c15a464f0957d060d61fd0db56aaf0081b6c8e587990e7b91989e880feccc8d22eed9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/pl/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/pl/firefox-75.0b2.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "cbe18d3fa35ec9c4f8a43e42bf4a5b5e38c8fb8b0624eb594a340ec866f0f8eee77093cb7fc3ad9cf85aa8c8177a43ddcc1d0f34933d34c414c4d7f6c74d5ff7";
+      sha512 = "3dc0c22bb4fba597fb225b98a1ed112759d9f3f83d5620a05fd7aa20cf2d0cf79802dc1455a346206376bb11ec325da4a043bde87f61226c043a935a7d975d23";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/pt-BR/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/pt-BR/firefox-75.0b2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "92e983cb0139204f51e97d4fe0510750f98cf93fe20f8a4b5bcd24874e266b7ebdff00170b25acdc492a7eff65f1c9c6aa1c44b29d8209c04fe5c6a43eb3ac5d";
+      sha512 = "b97e061bcbb1eb7593676d1b96f4601c130a64cfc1836e0f49fa058d18a6e9d935e02b58f4a65cd227cc3364e79add782d379cf729ae41e7a6544cfcf280a26a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/pt-PT/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/pt-PT/firefox-75.0b2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "1a576f343b3b93b786038ec5fe0dbcbb3df4eeacfb94c447d5242622e207dcf360500942957d0019c124c32698448c23e231b336b8681526d4d2cdd8ec78202f";
+      sha512 = "21f6d41bbef5b12aeab46aba2cc05797d4852dd7effcc00d5346604424dfbb5efcb673567b1933b4d723be80f9fdbcca98eb69cad8059d8e6f716675e2255ede";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/rm/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/rm/firefox-75.0b2.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "c5e1ca70aec643d00531d4a485e515d17bc7be7242bb66c7df5818ed68f69e33542e57719fc0cd8852e4efcc4d73d76bc2646dc75e428052c078e260d9c8d2b2";
+      sha512 = "fb13e69e606e4508a02221a1778a72e24524ba61f1683f5e076b4105e84fba03d8b27f29e2eb6ff3941da688b2ff5288a72af081db875ada83c6ae82149ab91b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ro/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ro/firefox-75.0b2.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "ddff96dc6073cfeb7462b160280e996335e3dbc48ca717ff3ab09d93d686d9b5697144fe0dad7be12bb293557e431522844f9265e71d3839ad6e070b75a213fc";
+      sha512 = "0d1f1df7d7516f10bc7c3f6144656936feeb7068839db29f97495697235ea9ab50a1587146bb069cc1e025b6a7345ccbba041043ec5b467bc9ce878403d8e7dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ru/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ru/firefox-75.0b2.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "c33ac5097ab81d90cbfbcadd38b9d9906f660559ef5cf0d8978f603680d3e30505f8c65b55edf5b83fa91db2643cb893a8ae1d8d7542316d082868e341a19294";
+      sha512 = "be89a374b149f4ae21b544b75146bcdd71a90c0a3be44e4abde75d3b0eae11afb9b7cc6447e33019aad216f0ff1ae46e80b612aaa0b8f27590d75ef9454098df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/si/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/si/firefox-75.0b2.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "f99a34d222b07758af6a49067f2993d49ba5099b8ea8987ebae00a5ad908ff71782aadc49086152d84f1f1698a55ab027362247a15e05f62fabfadb7f45fc2d2";
+      sha512 = "12693ba3b6fea7b54d8f128e37b0529f22b45e975c6a0b890a7fcad37db7679a85b0a79adeeb3a15737b6f5135d98e87506b51751a77e054553f67285a2ddcfe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/sk/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/sk/firefox-75.0b2.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "a18af4cc09828a567b9c6bf162a8800034f4b094bac20c15dbcad8a33b2a17792bd1470f77f75d8da8f954b69cee74929d8aa7ef4fd47a078f84b03824658a52";
+      sha512 = "94294db92a4053c209b7350d5979c3310e683da4292d4bbcf2eaf0e1729a15cc12773dfed0dd9a3e097807a3c889388fc95f28781ffa924e9128625a7fb888dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/sl/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/sl/firefox-75.0b2.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "401c261b1a523c90aecf1432bd01bfa151087d36a8331d0f4138330bc21272c4980c90dee46d2ba323a20825367bb54a15fc22ce14c7b3b91c8901d6e243f86b";
+      sha512 = "70d556713742972870b6cbe5805a5a9b55360ee501ce8162164abd809be3ddd0f4220b7f151aa5bfa5d67cb2307ddd3ec0d353c1a40d94692381ca5023b5a8e3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/son/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/son/firefox-75.0b2.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "63cc0aeb2b8b74166bdcb5db839ae7cb2befe7f444397337f73dd8b56bd763f7844283f72837b775ab923d70dc44797f8f99f3a155cec361cec9ba6e83ff6a7b";
+      sha512 = "886b2fdd7cd5ea376cf17ffd07f5ba3521fce40265a6e45fe9b586c6e57519648cd8cab57e0004288318de706a075ec5bd89b13bae3e34eaa3fc6861c9620a70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/sq/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/sq/firefox-75.0b2.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "04667fa706cbe244ee04c2e36dd7fc496899d3b09d0a251dbf15371c9e0ae00a999131642c2b137ce0f23ea1149da1d487753fa7cad96fca8de11c5225617001";
+      sha512 = "6a4f4b87286df05d4c5ee9f2810e7aa5d77fead041061223a21d51dd4705cef15bdc2060ed85ee1e2a4c54555698df6ab8880554b1a476d5d27947d95a13a31c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/sr/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/sr/firefox-75.0b2.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "8254f5af29e06e3a83ad2b9746e90fa9b9b9eb876b64a849bedbbd2375a01a2e5d369ad8f3686bf524504cf085f463171aa9b0acbaa823b8a50c123d19dd5bea";
+      sha512 = "ba5bdc0c0de9a1f773497fdd50a84eb4314ab6caeed3514e7ce63acea8ca1ffd7d9544ff4d3a12142dcedd19d0ec933ecf5ec522a3bd2943064fa39e0f84da34";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/sv-SE/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/sv-SE/firefox-75.0b2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "89a165c71ddccc04f8b6c86bd199267bd8fdcf274db601c68903868b67b5d3c3205c4b359076adef4ec48e95ad03f2034b7cae9fae981c584214a2cf4d607806";
+      sha512 = "30e581b784a7290f4a4238839afcf76948987cc1fe8f073a264d65c3adca97b243e1ae335e0104044f0e768ffaf0d9c3553f95ef4b7d53c5d06b656e23e5fae5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ta/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ta/firefox-75.0b2.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "0a8f218a94ebe7e667c62c0c2c2752fe0df57885abad3916dc9ecba186f1420c77c1011b05f9512c37b75eebf9062f345f0d7580b9c7dba36c8043b581965e43";
+      sha512 = "31c2f580cd9ad62413161b437fefd13ab793d94ed2532537c1ceac939ec57d84c82cff07d300a743dd6c7be08db7010320b78a9a70f96c0363add4a059f9a053";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/te/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/te/firefox-75.0b2.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "3a4cc3a66e8ed7a42a31c69c314ad6935fbdc3062d3a82c35e7f215f0a3e29e841c196e32f5368e2b24ce8a7abb71c65307004478269d156f68de78a945f3e1d";
+      sha512 = "52bd53f013d149df4ddf4026419293c7cf16f72eeebbe7db2167688e149ae8e4bba724ace2a56c93a6177908581bac163eb4db6d5f9a2ffa48f2665e2a80e35c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/th/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/th/firefox-75.0b2.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "fcd070aaec8d12509047fbc4cd3a7040830e9af6b5ece30ada6388cf458daf0a26e381db22515a440d6bfaad700a0d628c3036996dd9d6b3263b192b45da33aa";
+      sha512 = "f81c421dcedf9755836e8554bddac1394b94185f22b83b3628622023b325e7dcbbc8e008d082d6478546dc1a1f6bf7181fbd41f1d746986dbf8b273639e95fc1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/tl/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/tl/firefox-75.0b2.tar.bz2";
       locale = "tl";
       arch = "linux-i686";
-      sha512 = "cec3476e88d5d1551fe8a6e75416d0397001eada288d270273b004777a099bdfd2b63eaa5e2f81994bc86b0a720f35602308089a469adabfe457a48b8f11a88a";
+      sha512 = "6a29bbb380253caec23fc7493ef52bcac4688979292803c4063d6d318870346eb917d8f57b17279ab45171cf1554d7314e5f4f84bd94ff466b504db9e1461be4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/tr/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/tr/firefox-75.0b2.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "22e71e68ccfeb4774570a94033ad7de3d90c8f327886b7c3555082b03b46bea090eaf16d63208897cfaa47094d7eeb8ee89d1d43af78cf8af2753b669d0c1fa0";
+      sha512 = "346c02d8dd9e6330e83c9984d757d23ec8648172803f808cc096af6e8e7ca768b1bba36a8c35689644bcbc02e63b118d738471270180101eec8e00d7cbfced49";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/trs/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/trs/firefox-75.0b2.tar.bz2";
       locale = "trs";
       arch = "linux-i686";
-      sha512 = "a6d7673761a590e7d714f8e5949e9962a7f693bf35ac9e5425c84d1d9173b220d9af3e1468c9c83aa930f31cbd2df9844f65a1b749883ec35fd5ddd4ec310463";
+      sha512 = "c3201998646d7bf8b1449571597cd0fe2911a4bd74c265afb21b706161a5667bb5556d8e1be4dbfefa29e753bc6544adc26e966dfcb79acc38485e6c618bf282";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/uk/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/uk/firefox-75.0b2.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "2944b38a4b71702aa04d11c68cc5fc0253614015d8ee7b63f9138ccb90a2190c52131722477218f99e917260ae7beb0736f8d8fcf275093f423fe884e9370a67";
+      sha512 = "24b01dbd82c4cef9ffd8b88db4415eaf1bb9d83c7bd307663636bb372a1525789354ab15021b591e7aa697db511c71d078cf3fccf89024f13b19099925e9ed54";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/ur/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ur/firefox-75.0b2.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "e42728c0a24a131d831fd65c1b0006a28be594dd5011fe5a510f7b1b62c7937d06b1f0077a1ac2d454211e27f5d03c8d60f3fc725a58eebbe72f6064d875c6ee";
+      sha512 = "720d058c4e4d2cf4a08460ac4ed4616bf492704c8db10d28faa3117d6d3662a3325155f99414a7d61421eeee96be4d36ab11304e029751eed423fae3487cd2b7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/uz/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/uz/firefox-75.0b2.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "9f777b1fd31953b903123250250f7dc55d63513c49b69c3ba782702f8faf4a831b1fc84137e8554b4af6e23d1203a89ab2a61947a39f3f9a801acc1312a7ebe8";
+      sha512 = "59554a7a87b11e679487ecf9bd0ff6001f86bf14a0f73768b1984ca36cc2ee4774e99dacecc238d633556bb04816451ad82cb5ed2d26b2b811bddecee01e53eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/vi/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/vi/firefox-75.0b2.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "7023655042219b9e818fb921bd6da1941b7c75a22f7570559d06c2e10de2bb81191b266323fdd132c4c7ae881d932eae78c93dc6d8d5e20a6adf6325f87778a3";
+      sha512 = "030c10b2314545644b402d6b5b011c7b782c06be1f7460782f02e2071230cd9adb018558db7f98f8c2c64e7e7a6d835b38a14bb7080f1dbd160cbd113348b1f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/xh/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/xh/firefox-75.0b2.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "6475fa9eb12145e13a9433fc4f1d28a8e40bbab39e9c33337deafd7021982a22e64f795382c2cea09d767df2600b39824f8cbca948a2fc6ad24fb6a94b3737a5";
+      sha512 = "25bfbc493a66ecedbf1a625d96e3c98dd6c1d835823c2f2afede41329a1dadd146459e6b44d49a4f966d9eccec1e2e1d8046f00573ffa4ba8cb43c8a0802e18a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/zh-CN/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/zh-CN/firefox-75.0b2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "51bd5cacf3dbcd6df7c887226641464ebe723bec4952f071da9dcfde89d714217f8677b8819425a8f1f3ce272a4228b08b4eeebe9c3aa61fe473138b891f385a";
+      sha512 = "dea1bde6eaa34ce31d7775c3f86bdedf442bb67623a890549a470386e93e93bdcf7f50a7006a1230ea3880b0031a2ea7590b94862f1a098cebfb7664f9aa6380";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0b7/linux-i686/zh-TW/firefox-74.0b7.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/zh-TW/firefox-75.0b2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "741766345cb235586333866fcce8b33e80895b4e313306f26971f013e53189dfe4e119e1d9d6e94b09b334496cf8c49240a86c9ce1032d7ad5b5fada3e352767";
+      sha512 = "22224a9a06c8b528d0847e10a95003d19fbc7cdadddc605e1188da7de845d38f511319e73de6201b7daf9b2b3b59a2eb12a6ced03cafcc1bbcd86e51422a2497";
     }
     ];
 }

From a483b787cbfde5329563f7694db59abe9f46be28 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 11 Mar 2020 22:19:55 +0100
Subject: [PATCH 2785/4636] cargo-outdated: 0.9.5 -> 0.9.7

---
 .../0001-Fix-outdated-Cargo.lock.patch        | 25 +++++++++++++++++++
 .../cargo-outdated/default.nix                | 14 +++++------
 2 files changed, 32 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/tools/package-management/cargo-outdated/0001-Fix-outdated-Cargo.lock.patch

diff --git a/pkgs/tools/package-management/cargo-outdated/0001-Fix-outdated-Cargo.lock.patch b/pkgs/tools/package-management/cargo-outdated/0001-Fix-outdated-Cargo.lock.patch
new file mode 100644
index 000000000000..4b8bc874e676
--- /dev/null
+++ b/pkgs/tools/package-management/cargo-outdated/0001-Fix-outdated-Cargo.lock.patch
@@ -0,0 +1,25 @@
+From fd0ccac1b3d4f78faa4c642dc2a413dfb54200fd Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch <maximilian@mbosch.me>
+Date: Wed, 11 Mar 2020 22:27:23 +0100
+Subject: [PATCH] Fix outdated Cargo.lock
+
+---
+ Cargo.lock | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index 8458954..8083e81 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -171,7 +171,7 @@ dependencies = [
+ 
+ [[package]]
+ name = "cargo-outdated"
+-version = "0.9.6"
++version = "0.9.7"
+ dependencies = [
+  "cargo",
+  "docopt",
+-- 
+2.25.0
+
diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix
index 7fc7d93f927b..6f8a415c5cbc 100644
--- a/pkgs/tools/package-management/cargo-outdated/default.nix
+++ b/pkgs/tools/package-management/cargo-outdated/default.nix
@@ -2,19 +2,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-outdated";
-  version = "0.9.5";
+  version = "0.9.7";
 
   src = fetchFromGitHub {
     owner = "kbknapp";
     repo = pname;
-    # This is the git commit that produced 0.9.5, according to crates.io, but
-    # the tag is missing in git. See here for details:
-    # https://github.com/kbknapp/cargo-outdated/issues/206
-    rev = "7685da3265749bb7ae2b436a132f51d19b409bff";
-    sha256 = "08prksns7d3g7ha601z8p28p36rg44rjl5ph76vg6nriww96zzca";
+    rev = "v${version}";
+    sha256 = "0g91cfja4h9qhpxgnimczjna528ml645iz7hgpwl6yp0742qcal4";
   };
 
-  cargoSha256 = "0kxfavyd9slpp2kzxhjp47q1pzw9rlmn7yhxnjsg88sxbjxfzv95";
+  # Can be removed when updating to the next release.
+  cargoPatches = [ ./0001-Fix-outdated-Cargo.lock.patch ];
+
+  cargoSha256 = "0pr57g41lnn8srcbc11sb15qchf01zwqcb1802xdayj6wlc3g3dy";
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ openssl ]

From 24b6b8fd46d8d55ddfa2d07799a8e882692ee977 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 11 Mar 2020 22:20:10 +0100
Subject: [PATCH 2786/4636] python3Packages.tesseract: 0.3.2 -> 0.3.3

---
 pkgs/development/python-modules/pytesseract/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix
index 1b185070bf72..451ff9d0bca9 100644
--- a/pkgs/development/python-modules/pytesseract/default.nix
+++ b/pkgs/development/python-modules/pytesseract/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pytesseract";
-  version = "0.3.2";
+  version = "0.3.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1b6hmz9dqfn8il1g5vyz6izsxqjrbvrr2gs8gwwadyz8fx4vghx8";
+    sha256 = "0lml55jrvdzy9fm31zpw64fqc4d6p5djg1ax2kgnimzfscxghh8h";
   };
 
   patches = [

From b7cdb64ac2e65237c4257e69ac1a892f476e2d31 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 11 Mar 2020 22:20:26 +0100
Subject: [PATCH 2787/4636] treewide: remove myself from a few packages I don't
 use anymore

---
 nixos/modules/services/misc/autorandr.nix                       | 2 +-
 .../networking/irc/weechat/scripts/weechat-autosort/default.nix | 2 +-
 pkgs/development/python-modules/python-jenkins/default.nix      | 2 +-
 pkgs/development/tools/repository-managers/nexus/default.nix    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix
index 4708e16e2a6c..cf7fb5f78d3d 100644
--- a/nixos/modules/services/misc/autorandr.nix
+++ b/nixos/modules/services/misc/autorandr.nix
@@ -48,5 +48,5 @@ in {
 
   };
 
-  meta.maintainers = with maintainers; [ gnidorah ma27 ];
+  meta.maintainers = with maintainers; [ gnidorah ];
 }
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix
index c39b7fe15963..23a6996bcdd2 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     description = "Autosort is a weechat script to automatically or manually keep your buffers sorted";
     homepage = https://github.com/de-vri-es/weechat-autosort;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ma27 emily ];
+    maintainers = with maintainers; [ emily ];
   };
 }
diff --git a/pkgs/development/python-modules/python-jenkins/default.nix b/pkgs/development/python-modules/python-jenkins/default.nix
index 4de5e2910633..06a5d234ecf6 100644
--- a/pkgs/development/python-modules/python-jenkins/default.nix
+++ b/pkgs/development/python-modules/python-jenkins/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     description = "Python bindings for the remote Jenkins API";
     homepage = "https://pypi.python.org/pypi/python-jenkins";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ ma27 ];
+    maintainers = with maintainers; [ ];
   };
 
 }
diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix
index a727eebe0541..416dafe2872e 100644
--- a/pkgs/development/tools/repository-managers/nexus/default.nix
+++ b/pkgs/development/tools/repository-managers/nexus/default.nix
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.sonatype.org/nexus;
     license = licenses.epl10;
     platforms = platforms.all;
-    maintainers = with maintainers; [ aespinosa ironpinguin ma27 zaninime ];
+    maintainers = with maintainers; [ aespinosa ironpinguin zaninime ];
   };
 }

From c2524362ebb00f430c611433f047f283bc90309d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 11 Mar 2020 22:35:18 +0100
Subject: [PATCH 2788/4636] cargo-update: 2.5.0 -> 3.0.0

---
 ...ate-lockfile-for-cargo-update-v3.0.0.patch | 651 +++++++++++++++
 .../cargo-update/cargo-lock.patch             | 739 ------------------
 .../cargo-update/default.nix                  |   8 +-
 3 files changed, 655 insertions(+), 743 deletions(-)
 create mode 100644 pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v3.0.0.patch
 delete mode 100644 pkgs/tools/package-management/cargo-update/cargo-lock.patch

diff --git a/pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v3.0.0.patch b/pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v3.0.0.patch
new file mode 100644
index 000000000000..40cd310b643d
--- /dev/null
+++ b/pkgs/tools/package-management/cargo-update/0001-Generate-lockfile-for-cargo-update-v3.0.0.patch
@@ -0,0 +1,651 @@
+From 893ee8e76cc8b4096c84fe3a537e312304ce214b Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch <maximilian@mbosch.me>
+Date: Wed, 11 Mar 2020 22:32:47 +0100
+Subject: [PATCH] Generate lockfile for cargo-update v3.0.0
+
+---
+ Cargo.lock | 632 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 632 insertions(+)
+ create mode 100644 Cargo.lock
+
+diff --git a/Cargo.lock b/Cargo.lock
+new file mode 100644
+index 000000000..0b3a75632
+--- /dev/null
++++ b/Cargo.lock
+@@ -0,0 +1,632 @@
++# This file is automatically @generated by Cargo.
++# It is not intended for manual editing.
++[[package]]
++name = "aho-corasick"
++version = "0.7.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada"
++dependencies = [
++ "memchr",
++]
++
++[[package]]
++name = "ansi_term"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
++dependencies = [
++ "winapi",
++]
++
++[[package]]
++name = "array_tool"
++version = "1.0.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8f8cb5d814eb646a863c4f24978cff2880c4be96ad8cde2c0f0678732902e271"
++
++[[package]]
++name = "arrayref"
++version = "0.3.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
++
++[[package]]
++name = "arrayvec"
++version = "0.5.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
++
++[[package]]
++name = "atty"
++version = "0.2.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
++dependencies = [
++ "hermit-abi",
++ "libc",
++ "winapi",
++]
++
++[[package]]
++name = "autocfg"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
++
++[[package]]
++name = "base64"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
++
++[[package]]
++name = "bitflags"
++version = "1.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
++
++[[package]]
++name = "blake2b_simd"
++version = "0.5.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
++dependencies = [
++ "arrayref",
++ "arrayvec",
++ "constant_time_eq",
++]
++
++[[package]]
++name = "cargo-update"
++version = "3.0.0"
++dependencies = [
++ "array_tool",
++ "clap",
++ "dirs",
++ "embed-resource",
++ "git2",
++ "hex",
++ "json",
++ "lazy_static",
++ "lazysort",
++ "regex",
++ "semver",
++ "serde",
++ "serde_derive",
++ "tabwriter",
++ "toml",
++ "unicode-normalization",
++ "url",
++]
++
++[[package]]
++name = "cc"
++version = "1.0.50"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
++dependencies = [
++ "jobserver",
++]
++
++[[package]]
++name = "cfg-if"
++version = "0.1.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
++
++[[package]]
++name = "clap"
++version = "2.33.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
++dependencies = [
++ "ansi_term",
++ "atty",
++ "bitflags",
++ "strsim",
++ "textwrap",
++ "unicode-width",
++ "vec_map",
++]
++
++[[package]]
++name = "constant_time_eq"
++version = "0.1.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
++
++[[package]]
++name = "crossbeam-utils"
++version = "0.7.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
++dependencies = [
++ "autocfg",
++ "cfg-if",
++ "lazy_static",
++]
++
++[[package]]
++name = "dirs"
++version = "2.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
++dependencies = [
++ "cfg-if",
++ "dirs-sys",
++]
++
++[[package]]
++name = "dirs-sys"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
++dependencies = [
++ "cfg-if",
++ "libc",
++ "redox_users",
++ "winapi",
++]
++
++[[package]]
++name = "embed-resource"
++version = "1.3.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8398b939acbb266ade6939090e9f634147e7b426a33054a833d9ec935d814882"
++dependencies = [
++ "vswhom",
++ "winreg",
++]
++
++[[package]]
++name = "getrandom"
++version = "0.1.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
++dependencies = [
++ "cfg-if",
++ "libc",
++ "wasi",
++]
++
++[[package]]
++name = "git2"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "77519ef7c5beee314d0804d4534f01e0f9e8d9acdee2b7a48627e590b27e0ec4"
++dependencies = [
++ "bitflags",
++ "libc",
++ "libgit2-sys",
++ "log",
++ "openssl-probe",
++ "openssl-sys",
++ "url",
++]
++
++[[package]]
++name = "hermit-abi"
++version = "0.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1010591b26bbfe835e9faeabeb11866061cc7dcebffd56ad7d0942d0e61aefd8"
++dependencies = [
++ "libc",
++]
++
++[[package]]
++name = "hex"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35"
++
++[[package]]
++name = "idna"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
++dependencies = [
++ "matches",
++ "unicode-bidi",
++ "unicode-normalization",
++]
++
++[[package]]
++name = "jobserver"
++version = "0.1.21"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
++dependencies = [
++ "libc",
++]
++
++[[package]]
++name = "json"
++version = "0.11.15"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "92c245af8786f6ac35f95ca14feca9119e71339aaab41e878e7cdd655c97e9e5"
++
++[[package]]
++name = "lazy_static"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
++
++[[package]]
++name = "lazysort"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d0e22ff43b231e0e2f87d74984e53ebc73b90ae13397e041214fb07efc64168f"
++
++[[package]]
++name = "libc"
++version = "0.2.67"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "eb147597cdf94ed43ab7a9038716637d2d1bf2bc571da995d0028dec06bd3018"
++
++[[package]]
++name = "libgit2-sys"
++version = "0.10.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d9ec6bca50549d34a392611dde775123086acbd994e3fff64954777ce2dc2e51"
++dependencies = [
++ "cc",
++ "libc",
++ "libssh2-sys",
++ "libz-sys",
++ "openssl-sys",
++ "pkg-config",
++]
++
++[[package]]
++name = "libssh2-sys"
++version = "0.2.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7bb70f29dc7c31d32c97577f13f41221af981b31248083e347b7f2c39225a6bc"
++dependencies = [
++ "cc",
++ "libc",
++ "libz-sys",
++ "openssl-sys",
++ "pkg-config",
++ "vcpkg",
++]
++
++[[package]]
++name = "libz-sys"
++version = "1.0.25"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
++dependencies = [
++ "cc",
++ "libc",
++ "pkg-config",
++ "vcpkg",
++]
++
++[[package]]
++name = "log"
++version = "0.4.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
++dependencies = [
++ "cfg-if",
++]
++
++[[package]]
++name = "matches"
++version = "0.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
++
++[[package]]
++name = "maybe-uninit"
++version = "2.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
++
++[[package]]
++name = "memchr"
++version = "2.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
++
++[[package]]
++name = "openssl-probe"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
++
++[[package]]
++name = "openssl-sys"
++version = "0.9.54"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986"
++dependencies = [
++ "autocfg",
++ "cc",
++ "libc",
++ "pkg-config",
++ "vcpkg",
++]
++
++[[package]]
++name = "percent-encoding"
++version = "2.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
++
++[[package]]
++name = "pkg-config"
++version = "0.3.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
++
++[[package]]
++name = "proc-macro2"
++version = "1.0.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435"
++dependencies = [
++ "unicode-xid",
++]
++
++[[package]]
++name = "quote"
++version = "1.0.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"
++dependencies = [
++ "proc-macro2",
++]
++
++[[package]]
++name = "redox_syscall"
++version = "0.1.56"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
++
++[[package]]
++name = "redox_users"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431"
++dependencies = [
++ "getrandom",
++ "redox_syscall",
++ "rust-argon2",
++]
++
++[[package]]
++name = "regex"
++version = "1.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8"
++dependencies = [
++ "aho-corasick",
++ "memchr",
++ "regex-syntax",
++ "thread_local",
++]
++
++[[package]]
++name = "regex-syntax"
++version = "0.6.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1132f845907680735a84409c3bebc64d1364a5683ffbce899550cd09d5eaefc1"
++
++[[package]]
++name = "rust-argon2"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017"
++dependencies = [
++ "base64",
++ "blake2b_simd",
++ "constant_time_eq",
++ "crossbeam-utils",
++]
++
++[[package]]
++name = "semver"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
++dependencies = [
++ "semver-parser",
++ "serde",
++]
++
++[[package]]
++name = "semver-parser"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
++
++[[package]]
++name = "serde"
++version = "1.0.104"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
++
++[[package]]
++name = "serde_derive"
++version = "1.0.104"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
++
++[[package]]
++name = "smallvec"
++version = "0.6.13"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
++dependencies = [
++ "maybe-uninit",
++]
++
++[[package]]
++name = "strsim"
++version = "0.8.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
++
++[[package]]
++name = "syn"
++version = "1.0.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "123bd9499cfb380418d509322d7a6d52e5315f064fe4b3ad18a53d6b92c07859"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "unicode-xid",
++]
++
++[[package]]
++name = "tabwriter"
++version = "1.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "36205cfc997faadcc4b0b87aaef3fbedafe20d38d4959a7ca6ff803564051111"
++dependencies = [
++ "unicode-width",
++]
++
++[[package]]
++name = "textwrap"
++version = "0.11.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
++dependencies = [
++ "unicode-width",
++]
++
++[[package]]
++name = "thread_local"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
++dependencies = [
++ "lazy_static",
++]
++
++[[package]]
++name = "toml"
++version = "0.5.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
++dependencies = [
++ "serde",
++]
++
++[[package]]
++name = "unicode-bidi"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
++dependencies = [
++ "matches",
++]
++
++[[package]]
++name = "unicode-normalization"
++version = "0.1.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "09c8070a9942f5e7cfccd93f490fdebd230ee3c3c9f107cb25bad5351ef671cf"
++dependencies = [
++ "smallvec",
++]
++
++[[package]]
++name = "unicode-width"
++version = "0.1.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
++
++[[package]]
++name = "unicode-xid"
++version = "0.2.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
++
++[[package]]
++name = "url"
++version = "2.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
++dependencies = [
++ "idna",
++ "matches",
++ "percent-encoding",
++]
++
++[[package]]
++name = "vcpkg"
++version = "0.2.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
++
++[[package]]
++name = "vec_map"
++version = "0.8.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
++
++[[package]]
++name = "vswhom"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b"
++dependencies = [
++ "libc",
++ "vswhom-sys",
++]
++
++[[package]]
++name = "vswhom-sys"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fc2f5402d3d0e79a069714f7b48e3ecc60be7775a2c049cb839457457a239532"
++dependencies = [
++ "cc",
++ "libc",
++]
++
++[[package]]
++name = "wasi"
++version = "0.9.0+wasi-snapshot-preview1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
++
++[[package]]
++name = "winapi"
++version = "0.3.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
++dependencies = [
++ "winapi-i686-pc-windows-gnu",
++ "winapi-x86_64-pc-windows-gnu",
++]
++
++[[package]]
++name = "winapi-i686-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
++
++[[package]]
++name = "winapi-x86_64-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
++
++[[package]]
++name = "winreg"
++version = "0.6.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9"
++dependencies = [
++ "winapi",
++]
+-- 
+2.25.0
+
diff --git a/pkgs/tools/package-management/cargo-update/cargo-lock.patch b/pkgs/tools/package-management/cargo-update/cargo-lock.patch
deleted file mode 100644
index 7872a4bf18b8..000000000000
--- a/pkgs/tools/package-management/cargo-update/cargo-lock.patch
+++ /dev/null
@@ -1,739 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-new file mode 100644
-index 000000000..76f256f46
---- /dev/null
-+++ b/Cargo.lock
-@@ -0,0 +1,733 @@
-+# This file is automatically @generated by Cargo.
-+# It is not intended for manual editing.
-+[[package]]
-+name = "aho-corasick"
-+version = "0.7.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "ansi_term"
-+version = "0.11.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "array_tool"
-+version = "1.0.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "arrayref"
-+version = "0.3.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "arrayvec"
-+version = "0.5.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "atty"
-+version = "0.2.14"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "autocfg"
-+version = "0.1.7"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "backtrace"
-+version = "0.3.40"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "backtrace-sys"
-+version = "0.1.32"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "base64"
-+version = "0.10.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "bitflags"
-+version = "1.2.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "blake2b_simd"
-+version = "0.5.10"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "byteorder"
-+version = "1.3.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "cargo-update"
-+version = "2.5.0"
-+dependencies = [
-+ "array_tool 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "embed-resource 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "git2 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "json 0.11.15 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "tabwriter 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-normalization 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "cc"
-+version = "1.0.50"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "jobserver 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "cfg-if"
-+version = "0.1.10"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "clap"
-+version = "2.33.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "cloudabi"
-+version = "0.0.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "constant_time_eq"
-+version = "0.1.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "crossbeam-utils"
-+version = "0.6.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "dirs"
-+version = "2.0.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "dirs-sys"
-+version = "0.3.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "embed-resource"
-+version = "1.3.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "failure"
-+version = "0.1.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "failure_derive"
-+version = "0.1.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "fuchsia-cprng"
-+version = "0.1.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "git2"
-+version = "0.10.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libgit2-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "hermit-abi"
-+version = "0.1.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "idna"
-+version = "0.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-normalization 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "jobserver"
-+version = "0.1.18"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "json"
-+version = "0.11.15"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "lazy_static"
-+version = "1.4.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "lazysort"
-+version = "0.2.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "libc"
-+version = "0.2.66"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "libgit2-sys"
-+version = "0.9.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libssh2-sys 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "libssh2-sys"
-+version = "0.2.13"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "libz-sys"
-+version = "1.0.25"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "log"
-+version = "0.4.8"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "matches"
-+version = "0.1.8"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "maybe-uninit"
-+version = "2.0.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "memchr"
-+version = "2.2.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "openssl-probe"
-+version = "0.1.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "openssl-sys"
-+version = "0.9.53"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "percent-encoding"
-+version = "2.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "pkg-config"
-+version = "0.3.17"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "proc-macro2"
-+version = "1.0.7"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "quote"
-+version = "1.0.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "rand_core"
-+version = "0.3.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "rand_core"
-+version = "0.4.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "rand_os"
-+version = "0.1.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "rdrand"
-+version = "0.4.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "redox_syscall"
-+version = "0.1.56"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "redox_users"
-+version = "0.3.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "regex"
-+version = "1.3.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "regex-syntax"
-+version = "0.6.12"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "rust-argon2"
-+version = "0.5.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "rustc-demangle"
-+version = "0.1.16"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "semver"
-+version = "0.9.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "semver-parser"
-+version = "0.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "serde"
-+version = "1.0.104"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "serde_derive"
-+version = "1.0.104"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "smallvec"
-+version = "0.6.13"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "strsim"
-+version = "0.8.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "syn"
-+version = "1.0.13"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "synstructure"
-+version = "0.12.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "tabwriter"
-+version = "1.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "textwrap"
-+version = "0.11.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "thread_local"
-+version = "0.3.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "toml"
-+version = "0.5.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "unicode-bidi"
-+version = "0.3.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "unicode-normalization"
-+version = "0.1.9"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "unicode-width"
-+version = "0.1.7"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "unicode-xid"
-+version = "0.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "url"
-+version = "2.1.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "vcpkg"
-+version = "0.2.8"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "vec_map"
-+version = "0.8.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "vswhom"
-+version = "0.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "vswhom-sys"
-+version = "0.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "winapi"
-+version = "0.3.8"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "winapi-i686-pc-windows-gnu"
-+version = "0.4.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "winapi-x86_64-pc-windows-gnu"
-+version = "0.4.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "winreg"
-+version = "0.6.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[metadata]
-+"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
-+"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-+"checksum array_tool 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8f8cb5d814eb646a863c4f24978cff2880c4be96ad8cde2c0f0678732902e271"
-+"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee"
-+"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
-+"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-+"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
-+"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
-+"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
-+"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
-+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-+"checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
-+"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
-+"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
-+"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-+"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
-+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-+"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120"
-+"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
-+"checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
-+"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
-+"checksum embed-resource 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bbaba4684ab0af1cbb3ef0b1f540ddc4b57b31940c920ea594efe09ab86e2a6c"
-+"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9"
-+"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08"
-+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-+"checksum git2 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c1af51ea8a906616af45a4ce78eacf25860f7a13ae7bf8a814693f0f4037a26"
-+"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772"
-+"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
-+"checksum jobserver 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "230ae9adf468173aecd4176c7233bddc84a15871a586c5971ace9a55f881c075"
-+"checksum json 0.11.15 (registry+https://github.com/rust-lang/crates.io-index)" = "92c245af8786f6ac35f95ca14feca9119e71339aaab41e878e7cdd655c97e9e5"
-+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-+"checksum lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e22ff43b231e0e2f87d74984e53ebc73b90ae13397e041214fb07efc64168f"
-+"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
-+"checksum libgit2-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4870c781f6063efb83150cd22c1ddf6ecf58531419e7570cdcced46970f64a16"
-+"checksum libssh2-sys 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "5fcd5a428a31cbbfe059812d74f4b6cd3b9b7426c2bdaec56993c5365da1c328"
-+"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
-+"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
-+"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
-+"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
-+"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
-+"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
-+"checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f"
-+"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
-+"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
-+"checksum proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0319972dcae462681daf4da1adeeaa066e3ebd29c69be96c6abb1259d2ee2bcc"
-+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
-+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-+"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-+"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
-+"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-+"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
-+"checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d"
-+"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd"
-+"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
-+"checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf"
-+"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
-+"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-+"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
-+"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
-+"checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
-+"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-+"checksum syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4ff033220a41d1a57d8125eab57bf5263783dfdcc18688b1dacc6ce9651ef8"
-+"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
-+"checksum tabwriter 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9128e3a9149e51494cad59712a286e149fcb74e443d2298d69bd6eaa42cc4ebb"
-+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-+"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
-+"checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf"
-+"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-+"checksum unicode-normalization 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "09c8070a9942f5e7cfccd93f490fdebd230ee3c3c9f107cb25bad5351ef671cf"
-+"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
-+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
-+"checksum url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
-+"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
-+"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
-+"checksum vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b"
-+"checksum vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc2f5402d3d0e79a069714f7b48e3ecc60be7775a2c049cb839457457a239532"
-+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
-+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-+"checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9"
diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/tools/package-management/cargo-update/default.nix
index 241213b94096..c0a1e8edc0f4 100644
--- a/pkgs/tools/package-management/cargo-update/default.nix
+++ b/pkgs/tools/package-management/cargo-update/default.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-update";
-  version = "2.5.0";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "nabijaczleweli";
     repo = pname;
     rev = "v${version}";
-    sha256 = "143aczay7i3zbhbvv4cjf6hns5w8j52rfdaq8ff0r8v3qghd2972";
+    sha256 = "1jyfv8aa0gp67pvv8l2vkqq4j9rgjl4rq1wn4nqxb44gmvkg15l3";
   };
 
-  cargoPatches = [ ./cargo-lock.patch ];
-  cargoSha256 = "0mxc752hmd7r29camq4f4qzwx0w008rqlq07j2r26z4ygvlrkc3a";
+  cargoPatches = [ ./0001-Generate-lockfile-for-cargo-update-v3.0.0.patch ];
+  cargoSha256 = "034v1ql5k3n3rgi3aqszkybvv3vc80v263c9nlwxcwbswsh9jpp1";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ libgit2 libssh2 openssl pkg-config zlib ]

From cba60a5aa2e2cf7ff6fa426e998aeb8359bf3bea Mon Sep 17 00:00:00 2001
From: ysengrimm <ysengrimm@grimmbart.org>
Date: Wed, 11 Mar 2020 22:21:39 +0100
Subject: [PATCH 2789/4636] sbcl: 2.0.1 -> 2.0.2

---
 pkgs/development/compilers/sbcl/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 79173871095c..4517db4c3840 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "sbcl";
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2";
-    sha256 = "1s2nrq26czl7f8jpa9qjpmdqbzvldvf4c7c1z1c438v4f85xcl44";
+    sha256 = "07pyzdjnhcpqwvr3rrk4i18maqdywbq1qj93fnpx1h4b7dp08r28";
   };
 
   buildInputs = [texinfo];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 144fb202596e..055ed63d919c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8931,7 +8931,7 @@ in
   sagittarius-scheme = callPackage ../development/compilers/sagittarius-scheme {};
 
   sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {};
-  sbcl_2_0_1 = callPackage ../development/compilers/sbcl {};
+  sbcl_2_0_2 = callPackage ../development/compilers/sbcl {};
   sbcl = callPackage ../development/compilers/sbcl/2.0.0.nix {};
 
   scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { };

From c3fa56f3b416f1aca0feee28bca9a7c8a0ba8d0d Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 11 Mar 2020 23:08:34 +0100
Subject: [PATCH 2790/4636] home-manager: 2020-01-04 -> 2020-03-07

---
 pkgs/tools/package-management/home-manager/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix
index 21b2fad1caa4..3fb14f99faf6 100644
--- a/pkgs/tools/package-management/home-manager/default.nix
+++ b/pkgs/tools/package-management/home-manager/default.nix
@@ -6,13 +6,13 @@
 stdenv.mkDerivation rec {
 
   pname = "home-manager";
-  version = "2020-01-04";
+  version = "2020-03-07";
 
   src = fetchFromGitHub {
     owner = "rycee";
     repo = "home-manager";
-    rev = "1b7b1bc294e99ab1795fe7dad183c1d2ae58a099";
-    sha256 = "02kwym8n41d5ba9lccnl5q3y10sw35p1da5b66mxldfr6d930pbj";
+    rev = "5c1e7349bbd9b51fe41ea96b67c380feef996b90";
+    sha256 = "03lw5pq878zbkkwm5abr01p77radn2zgfyvwlra7fhywbl76l83x";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 70fe917d267467e3bce1864943076419bfc9cdf7 Mon Sep 17 00:00:00 2001
From: Tony Olagbaiye <me@fron.io>
Date: Sun, 23 Feb 2020 22:03:22 +0000
Subject: [PATCH 2791/4636] ripcord: init at 0.4.23

---
 .../instant-messengers/ripcord/default.nix    | 69 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 71 insertions(+)
 create mode 100755 pkgs/applications/networking/instant-messengers/ripcord/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix
new file mode 100755
index 000000000000..6efb900b3b57
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix
@@ -0,0 +1,69 @@
+{ lib, mkDerivation, fetchurl, makeFontsConf, appimageTools,
+  qtbase, qtsvg, qtmultimedia, qtwebsockets, qtimageformats,
+  autoPatchelfHook, desktop-file-utils, imagemagick, makeWrapper,
+  twemoji-color-font, xorg, libsodium, libopus, libGL, zlib, alsaLib }:
+
+mkDerivation rec {
+  pname = "ripcord";
+  version = "0.4.23";
+
+  src = let
+    appimage = fetchurl {
+      url = "https://cancel.fm/dl/Ripcord-${version}-x86_64.AppImage";
+      sha256 = "0395w0pwr1cz8ichcbyrsscmm2p7srgjk4vkqvqgwyx41prm0x2h";
+      name = "${pname}-${version}.AppImage";
+    };
+  in appimageTools.extract {
+    name = "${pname}-${version}";
+    src = appimage;
+  };
+
+  nativeBuildInputs = [ autoPatchelfHook desktop-file-utils imagemagick ];
+  buildInputs = [ libsodium libopus libGL alsaLib ] ++
+                [ qtbase qtsvg qtmultimedia qtwebsockets qtimageformats ] ++
+                (with xorg; [ libX11 libXScrnSaver libXcursor xkeyboardconfig ]);
+
+  fontsConf = makeFontsConf {
+    fontDirectories = [ twemoji-color-font ];
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out
+    cp -r ${src}/{qt.conf,translations,twemoji.ripdb} $out
+
+    for size in 16 32 48 64 72 96 128 192 256 512 1024; do
+      mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
+      convert -resize "$size"x"$size" ${src}/Ripcord_Icon.png $out/share/icons/hicolor/"$size"x"$size"/apps/ripcord.png
+    done
+
+    desktop-file-install --dir $out/share/applications \
+      --set-key Exec --set-value ripcord \
+      --set-key Icon --set-value ripcord \
+      --set-key Comment --set-value "${meta.description}" \
+      ${src}/Ripcord.desktop
+    mv $out/share/applications/Ripcord.desktop $out/share/applications/ripcord.desktop
+
+    install -Dm755 ${src}/Ripcord $out/Ripcord
+    patchelf --replace-needed libsodium.so.18 libsodium.so $out/Ripcord
+    makeQtWrapper $out/Ripcord $out/bin/ripcord \
+      --run "cd $out" \
+      --set FONTCONFIG_FILE "${fontsConf}" \
+      --prefix LD_LIBRARY_PATH ":" "${xorg.libXcursor}/lib" \
+      --prefix QT_XKB_CONFIG_ROOT ":" "${xorg.xkeyboardconfig}/share/X11/xkb"
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Desktop chat client for Slack and Discord";
+    homepage = "https://cancel.fm/ripcord/";
+
+    # See: https://cancel.fm/ripcord/shareware-redistribution/
+    license = licenses.unfreeRedistributable;
+
+    maintainers = with maintainers; [ infinisil ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5574d0cc76aa..188bf34ca17a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21373,6 +21373,8 @@ in
 
   ries = callPackage ../applications/science/math/ries { };
 
+  ripcord = qt5.callPackage ../applications/networking/instant-messengers/ripcord { };
+
   ripser = callPackage ../applications/science/math/ripser { };
 
   rkt = callPackage ../applications/virtualization/rkt { };

From bf9ebc42c15f16d2d9e8aeac2b3fef6882b2c035 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 11 Mar 2020 22:54:02 +0000
Subject: [PATCH 2792/4636] python27Packages.pony: 0.7.11 -> 0.7.12

---
 pkgs/development/python-modules/pony/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix
index ebda1976e2a2..22c14cc0dfb3 100644
--- a/pkgs/development/python-modules/pony/default.nix
+++ b/pkgs/development/python-modules/pony/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pony";
-  version = "0.7.11";
+  version = "0.7.12";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05vyvsbcb99vjjs7qpbwy8j4m854w74z8di6zqsv8p9wbm38s06i";
+    sha256 = "02njpqwfvzxj9icabil8ycmfx8avzih3g1kcdif290qgsy57a28r";
   };
 
   doCheck = true;

From daebb49035ce1ea551de469cbe9a089e1eb59cb2 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Thu, 12 Mar 2020 00:26:24 +0100
Subject: [PATCH 2793/4636] spotify: 1.1.10.546.ge08ef575-19 ->
 1.1.26.501.gbe11e53b-15

Works fine for me, although I did have to re-login.
---
 pkgs/applications/audio/spotify/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index b763e6e6122f..eb2055ec7c19 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -10,14 +10,14 @@ let
   # If an update breaks things, one of those might have valuable info:
   # https://aur.archlinux.org/packages/spotify/
   # https://community.spotify.com/t5/Desktop-Linux
-  version = "1.1.10.546.ge08ef575-19";
+  version = "1.1.26.501.gbe11e53b-15";
   # To get the latest stable revision:
   # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
   # To get general information:
   # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
   # More examples of api usage:
   # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
-  rev = "36";
+  rev = "41";
 
 
   deps = [
@@ -56,6 +56,8 @@ let
     xorg.libXScrnSaver
     xorg.libXtst
     xorg.libxcb
+    xorg.libSM
+    xorg.libICE
     zlib
   ];
 
@@ -75,7 +77,7 @@ stdenv.mkDerivation {
   # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
   src = fetchurl {
     url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
-    sha512 = "c49f1a86a9b737e64a475bbe62754a36f607669e908eb725a2395f0a0a6b95968e0c8ce27ab2c8b6c92fe8cbacb1ef58de11c79b92dc0f58c2c6d3a140706a1f";
+    sha512 = "41bc8d20388bab39058d0709d99b1c8e324ea37af217620797356b8bc0b24aedbe801eaaa6e00a93e94e26765602e5dc27ad423ce2e777b4bec1b92daf04f81e";
   };
 
   buildInputs = [ squashfsTools makeWrapper ];

From 193987b12642e535e8bd09fbe9a59db54fd46d9b Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 11 Mar 2020 23:42:25 +0000
Subject: [PATCH 2794/4636] elpa-packages: 2020-03-11

---
 .../editors/emacs-modes/elpa-generated.nix    | 62 ++++++++++++++-----
 1 file changed, 48 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 56624498aeac..61275d9da4ca 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -343,10 +343,10 @@
       elpaBuild {
         pname = "bnf-mode";
         ename = "bnf-mode";
-        version = "0.4.3";
+        version = "0.4.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/bnf-mode-0.4.3.tar";
-          sha256 = "1hdhk6kw50vsixprrri0jb5i1c2y94ihifipqgq6kil7y4blr614";
+          url = "https://elpa.gnu.org/packages/bnf-mode-0.4.4.tar";
+          sha256 = "0acr3x96zknxs90dc9mpnrwiaa81883h36lx5q1lxfn78vjfw14x";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -2007,6 +2007,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    modus-operandi-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "modus-operandi-theme";
+        ename = "modus-operandi-theme";
+        version = "0.6.0";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.6.0.el";
+          sha256 = "10smvzaxp90lsg0g61s2nzmfxwnlrxq9dv4rn771vlhra249y08v";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/modus-operandi-theme.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    modus-vivendi-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "modus-vivendi-theme";
+        ename = "modus-vivendi-theme";
+        version = "0.6.0";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.6.0.el";
+          sha256 = "1b7wkz779f020gpil4spbdzmg2fx6l48wk1138564cv9kx3nkkz2";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/modus-vivendi-theme.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     multishell = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "multishell";
@@ -2765,10 +2795,10 @@
       elpaBuild {
         pname = "relint";
         ename = "relint";
-        version = "1.14";
+        version = "1.15";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/relint-1.14.tar";
-          sha256 = "0hjzhxcygb2r2s3g2pk3z9x3appy1y8gkw8gpg9cpkl6lpwcsh2f";
+          url = "https://elpa.gnu.org/packages/relint-1.15.tar";
+          sha256 = "0sxmdsacj8my942k8j76m2y68nzab7190acv7cwgflc5n4f07yxa";
         };
         packageRequires = [ emacs xr ];
         meta = {
@@ -3041,10 +3071,10 @@
       elpaBuild {
         pname = "ssh-deploy";
         ename = "ssh-deploy";
-        version = "3.1.10";
+        version = "3.1.11";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.10.tar";
-          sha256 = "0gckc6yhgi8pn3s8vdyzz8x1s2d4wmsw6yjwsaqcr5nra50glbpg";
+          url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.11.tar";
+          sha256 = "1xd09kfn7lqw6jzfkrn0p5agdpcz1z9zbazqigylpqfcywr5snhk";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3157,7 +3187,11 @@
           license = lib.licenses.free;
         };
       }) {};
-    timerfunctions = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+    timerfunctions = callPackage ({ cl-lib ? null
+                                  , elpaBuild
+                                  , emacs
+                                  , fetchurl
+                                  , lib }:
       elpaBuild {
         pname = "timerfunctions";
         ename = "timerfunctions";
@@ -3166,7 +3200,7 @@
           url = "https://elpa.gnu.org/packages/timerfunctions-1.4.2.el";
           sha256 = "122q8nv08pz1mkgilvi9qfrs7rsnc5picr7jyz2jpnvpd9qw6jw5";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/timerfunctions.html";
           license = lib.licenses.free;
@@ -3675,10 +3709,10 @@
       elpaBuild {
         pname = "xr";
         ename = "xr";
-        version = "1.16";
+        version = "1.18";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/xr-1.16.tar";
-          sha256 = "1s6pkbr7gkan0r9gfmix75m587d8cg6l11722v70zzgf2z9w2xg9";
+          url = "https://elpa.gnu.org/packages/xr-1.18.tar";
+          sha256 = "1nq9pj47sxgpkw97c2xrkhgcwh3zsfd2a22qiqbl4i9zf2l9yy91";
         };
         packageRequires = [ emacs ];
         meta = {

From 3e754e6bf6df795203de33c3ad4bfba461026ccb Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 11 Mar 2020 23:43:02 +0000
Subject: [PATCH 2795/4636] melpa-packages: 2020-03-11

---
 .../emacs-modes/recipes-archive-melpa.json    | 2484 +++++++++--------
 1 file changed, 1323 insertions(+), 1161 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
index 338766b4ebe4..d86bc8a585b0 100644
--- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
@@ -1064,8 +1064,8 @@
     "auto-complete",
     "rtags"
    ],
-   "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a",
-   "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n"
+   "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5",
+   "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x"
   },
   "stable": {
    "version": [
@@ -1473,26 +1473,26 @@
   "repo": "abo-abo/ace-window",
   "unstable": {
    "version": [
-    20200201,
-    1753
+    20200311,
+    1025
    ],
    "deps": [
     "avy"
    ],
-   "commit": "a36c1472d0ee59c2c1e6fb3ad66304141b154ef5",
-   "sha256": "1mkf1zi8z435jfpdi239gbn8243lwwsf1mgr6qq60pxbxxw9g13d"
+   "commit": "7003c88cd9cad58dc35c7cd13ebc61c355fb5be7",
+   "sha256": "0f3r40d5yxp2pm2j0nn86s29nqj8py0jxjbj50v4ci3hsd92d8jl"
   },
   "stable": {
    "version": [
     0,
-    9,
+    10,
     0
    ],
    "deps": [
     "avy"
    ],
-   "commit": "eef897e590c4ce63c28fd29ebff3c97aec8a69ae",
-   "sha256": "07mcdzjmgrqdvjs94f2n5bkrf5vrq2fwzz256wbm3wzqxqkfy1q6"
+   "commit": "7003c88cd9cad58dc35c7cd13ebc61c355fb5be7",
+   "sha256": "0f3r40d5yxp2pm2j0nn86s29nqj8py0jxjbj50v4ci3hsd92d8jl"
   }
  },
  {
@@ -1873,17 +1873,17 @@
  },
  {
   "ename": "ahg",
-  "commit": "5b7972602399f9df9139cff177e38653bb0f43ed",
-  "sha256": "0kw138lfzwp54fmly3jzzml11y7fhcjp3w0irmwdzr68lc206lr4",
-  "fetcher": "bitbucket",
-  "repo": "agriggio/ahg",
+  "commit": "eb2493e54641d6ca54461f237d3b7d30067a639f",
+  "sha256": "1za0hsk6mz6h958mqh4wcv3jv02qdbwi28cwnk90fpkkn43grwdi",
+  "fetcher": "git",
+  "url": "https://bitbucket.org/agriggio/ahg",
   "unstable": {
    "version": [
-    20190903,
-    1349
+    20200304,
+    741
    ],
-   "commit": "c85d951d7376425156911e5f3cd7535b4ecfbfc3",
-   "sha256": "0j5h1yjhg7lj3zxznfzy7mqj2c2r4cwdg8xik3wlk2cnm27fhgz6"
+   "commit": "0ece48646ef7a8c813005934cc13f984b9998707",
+   "sha256": "0ypck79bmv4pa8l555kgij69jbpkv4fz9w91qs30lacjmrj0nha5"
   }
  },
  {
@@ -2051,8 +2051,8 @@
    "deps": [
     "f"
    ],
-   "commit": "43bfd15f0b1b90e0e99345f7c6c6e994d048a05c",
-   "sha256": "02y51gbbb9j448zifxgw53hprq77wsk8v6waafgpdbn84wljxkig"
+   "commit": "644f331071f8b09a898fae490541908b5054d2e6",
+   "sha256": "0yf2mikpxnfl673rv0w7xp1cvlkgvlmzgaixva3ppz6f0wg3vgz6"
   },
   "stable": {
    "version": [
@@ -2158,16 +2158,16 @@
   "repo": "jwiegley/alert",
   "unstable": {
    "version": [
-    20191126,
-    2032
+    20200303,
+    2118
    ],
    "deps": [
     "cl-lib",
     "gntp",
     "log4e"
    ],
-   "commit": "a73ede85c9cdd7d1a7593d4674cde8eec66c098b",
-   "sha256": "02p049xrbccb6hf7pc51mwwqqiks25dvz42smb1s7q03a0svrq6d"
+   "commit": "7046393272686c7a1a9b3e7f7b1d825d2e5250a6",
+   "sha256": "1s93ijkax0s78qn79c364ainmq7jq4gc95akl9wra642ql6hz3iq"
   },
   "stable": {
    "version": [
@@ -2272,14 +2272,14 @@
   "repo": "jtbm37/all-the-icons-dired",
   "unstable": {
    "version": [
-    20200229,
-    2225
+    20200301,
+    1346
    ],
    "deps": [
     "all-the-icons"
    ],
-   "commit": "9d535651412a20105ba58c0fceb3a807891c3606",
-   "sha256": "1w6rj619rx13jrhd5nvgm5j7ipazngm0sk66ll9c62lja43lmkwh"
+   "commit": "733e0b520562d1f78f757f21287547272cedcaef",
+   "sha256": "1ml9xzdaqjnpwb8rnqr0967n3zk7fb56xy531gc52k3pxj68zbcc"
   }
  },
  {
@@ -2315,20 +2315,20 @@
    "deps": [
     "all-the-icons"
    ],
-   "commit": "04578528f609ee837854f329cbf64ddd40f7a2ae",
-   "sha256": "0m5y18z2w3c0paq07papj1dc3m7cxhrrjyfav4gbbi5cpmh5sxnp"
+   "commit": "ee0409588ebaee1aada351f1a75abcdc999ac9e2",
+   "sha256": "0afq5wjh74ks8hrsb9m41h1m9gyc0hvp2qmy4b1ls9kffgnk7ri2"
   },
   "stable": {
    "version": [
     1,
-    1,
+    2,
     0
    ],
    "deps": [
     "all-the-icons"
    ],
-   "commit": "07a55895ded043fa317c61c3a7013736345e7a38",
-   "sha256": "14c5rbl48hfdnj186p9g9csf5xrzid2jv90x3n4p8r5nigy5j74m"
+   "commit": "ee0409588ebaee1aada351f1a75abcdc999ac9e2",
+   "sha256": "0afq5wjh74ks8hrsb9m41h1m9gyc0hvp2qmy4b1ls9kffgnk7ri2"
   }
  },
  {
@@ -2371,28 +2371,28 @@
   "repo": "seagle0128/all-the-icons-ivy-rich",
   "unstable": {
    "version": [
-    20200301,
-    656
+    20200310,
+    1551
    ],
    "deps": [
     "all-the-icons",
     "ivy-rich"
    ],
-   "commit": "b3dda7af490e606b85e1e0cd9806988ce301dac5",
-   "sha256": "0bj0m7gbjkgwyh87zhsx2vhbw6g6ncjc1r63ai726scz10h5y0a4"
+   "commit": "3e02da9a166df7ebea25aae476efd7b8d74d63e0",
+   "sha256": "0p91yvpqy7xjkz2mcpq6c8kjfxqfw9byxprqg2qqnzg421c5yv6x"
   },
   "stable": {
    "version": [
     1,
-    1,
+    2,
     0
    ],
    "deps": [
     "all-the-icons",
     "ivy-rich"
    ],
-   "commit": "7344a94182cca55d33f3c04e0d9c9e9e91db0637",
-   "sha256": "03pmfx528dhywas4j40h95r1v3dprn9n3ydhk13jsclmjy471cz9"
+   "commit": "3e02da9a166df7ebea25aae476efd7b8d74d63e0",
+   "sha256": "0p91yvpqy7xjkz2mcpq6c8kjfxqfw9byxprqg2qqnzg421c5yv6x"
   }
  },
  {
@@ -2815,8 +2815,8 @@
     "dash",
     "request"
    ],
-   "commit": "084ffad14fa700ad1ba95d8cbfe4a8f6052e2408",
-   "sha256": "0zjd5yid333shvjm4zy3p7zdpa09xcl96gc4wvi2paxjad6iqhwz"
+   "commit": "546774a453ef4617b1bcb0d1626e415c67cc88df",
+   "sha256": "1if610hq5j8rbjh1caw5bwbgnsn231awwxqbpwvrh966kdxzl4qf"
   }
  },
  {
@@ -2912,11 +2912,11 @@
   "repo": "bastibe/annotate.el",
   "unstable": {
    "version": [
-    20200219,
-    1558
+    20200306,
+    1547
    ],
-   "commit": "818f66f4a3d6a33ae90c4e5de12f8dce770e7875",
-   "sha256": "017yzg3jqf0x7zn7xhdgbr6m97zzcjv6icj5zl5q4zj0ksm9l82q"
+   "commit": "6cc6ac887220cd26b8e72f1ec95555517faf0e80",
+   "sha256": "0j2zcs9dya36k0k1sa1brdvnh537m15mmanbb3dlqqkfd7ig5ql0"
   },
   "stable": {
    "version": [
@@ -3065,26 +3065,26 @@
   "repo": "zellio/ansible-vault-mode",
   "unstable": {
    "version": [
-    20200130,
-    2300
+    20200305,
+    2240
    ],
    "deps": [
     "seq"
    ],
-   "commit": "5653e82a2706cc7e9f46d24c6319b00ba6eb7528",
-   "sha256": "02p970jh7vl2bx8arm04mk313rqgh2s48rm0mn8zbiam8s71m2bm"
+   "commit": "c4fe4b0af2ac7f9d32acee234716ab31fa824cef",
+   "sha256": "1xif6vv53rpc2k974pqckmzck55zhdhzyfl54kdp25w93xbs3js4"
   },
   "stable": {
    "version": [
     0,
     4,
-    0
+    1
    ],
    "deps": [
     "seq"
    ],
-   "commit": "898b0989f6054c813802e0ff0fb0c0094e3a71b5",
-   "sha256": "0qjjzmnx4pczv6jkafmji2kn2a0rqsxcm8g5jp8lq2cc6dx86ad4"
+   "commit": "9a50ed6b73222e9973c08d79b6955e57ed3b7d97",
+   "sha256": "1xif6vv53rpc2k974pqckmzck55zhdhzyfl54kdp25w93xbs3js4"
   }
  },
  {
@@ -3885,6 +3885,36 @@
    "sha256": "0wqc7bqx9rvk8r7fd3x84h8p01v97s6w2jf29nnjb59xakwp22i7"
   }
  },
+ {
+  "ename": "auctex-cluttex",
+  "commit": "d08e481ad618a44f9bfa38c68ca30e67a6727538",
+  "sha256": "05cbiihq0k9d13l8xgd67yanxmj57hajcm2x2v3ils3lfkphqm5w",
+  "fetcher": "github",
+  "repo": "tsuu32/auctex-cluttex",
+  "unstable": {
+   "version": [
+    20200311,
+    1453
+   ],
+   "deps": [
+    "auctex"
+   ],
+   "commit": "76a786a26e1ddf4a1ef2b0067639c32e7cee9d06",
+   "sha256": "1vvvfhr52q34bv5mhhvzdwkkvcff955xkdijlrfyr8n7p9csjpim"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    0
+   ],
+   "deps": [
+    "auctex"
+   ],
+   "commit": "e358f7148092d8ed64703641b5621e130cce458d",
+   "sha256": "1whzcp9wvpwn1c33n7mqxx8v6g4apg3cq5h2ffl74423ysymry71"
+  }
+ },
  {
   "ename": "auctex-latexmk",
   "commit": "3f48af615c56f093dff417a5d3b705f9993c518f",
@@ -4965,14 +4995,14 @@
   "repo": "abo-abo/avy",
   "unstable": {
    "version": [
-    20191106,
-    1234
+    20200311,
+    1106
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "cf95ba9582121a1c2249e3c5efdc51acd566d190",
-   "sha256": "0d7v04xzr385ybq0ai88d4h8ywl53q1ig197cbkrna2jl2s466bh"
+   "commit": "3bf83140fad4c28f2dc4c7107b9d8fef84d17cb9",
+   "sha256": "1zicf7xynvxdx0pvg0zshvllabmjprvprjgg54phcbqlilcrq0hk"
   },
   "stable": {
    "version": [
@@ -6735,6 +6765,30 @@
    "sha256": "1bpyhsjfdjfa1iw9kv7fsl30vz48qllqgjg1rsxdl3vcripcbc9z"
   }
  },
+ {
+  "ename": "blitzmax-mode",
+  "commit": "a1a59a8ac5bb12507e58cde85b09e7f19ce72a82",
+  "sha256": "1isqkmc6g412l7gbg0bmyfsl975wjv7fv753z1mi0bzr7ihv5ckz",
+  "fetcher": "github",
+  "repo": "Sodaware/blitzmax-mode",
+  "unstable": {
+   "version": [
+    20200211,
+    2205
+   ],
+   "commit": "4814c35007035f0e26e0fadc50fffc4ab6d298ad",
+   "sha256": "160jd2rn1lgwgnm1ygdcsz1z0yxg9f1ps9wxqkv30xnkbnnxq10c"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    0
+   ],
+   "commit": "d772deff2464d48d018bbe43b1e4b3745a4ac886",
+   "sha256": "0gzm2qzwbaqfmfi1vhcx23w9v1mcs6kx5kijncn9hbvhi0640j76"
+  }
+ },
  {
   "ename": "bln-mode",
   "commit": "ee12ef97df241b7405feee69c1e66b3c1a67204b",
@@ -6860,26 +6914,26 @@
   "repo": "sergeyklay/bnf-mode",
   "unstable": {
    "version": [
-    20200122,
-    2155
+    20200301,
+    2140
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "11b19fa77ab0a6bb2208c776ccd17887a0325b8c",
-   "sha256": "10sb8ixfhxnan2cs6xhpy21lniv8yqp5xy0q9dla3z8897clrnw7"
+   "commit": "4a7aff6a3a691826ea4add9f519c854b9611d780",
+   "sha256": "1hnkvwl0as2s4aayqahclqclsriigqv51h8yafx0za1xfh4snfzv"
   },
   "stable": {
    "version": [
     0,
     4,
-    3
+    4
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "fecc2a8fc9cfff9d75da8809c24ef56ca4985dde",
-   "sha256": "04wj1s483khi2qvnbjcyfihip150qjmizc8qnjsqg60nwcxjh5j5"
+   "commit": "4a7aff6a3a691826ea4add9f519c854b9611d780",
+   "sha256": "1hnkvwl0as2s4aayqahclqclsriigqv51h8yafx0za1xfh4snfzv"
   }
  },
  {
@@ -7291,21 +7345,21 @@
   "repo": "rmuslimov/browse-at-remote",
   "unstable": {
    "version": [
-    20200127,
-    145
+    20200308,
+    639
    ],
    "deps": [
     "cl-lib",
     "f",
     "s"
    ],
-   "commit": "aeee6bf38f78aaed5dd2efd6305f30a7594e3060",
-   "sha256": "1hp61vd5vxgyz61l8h59v9yvadpqzrc3ihsd731gl1k9siajg8q2"
+   "commit": "6aecae4b5d202e582425fc8aa2c9c2b6a4779f25",
+   "sha256": "0c93ilvxmfv28a05fs2lbdyc2q308anjw0xvbkg7dc0blg0fgb05"
   },
   "stable": {
    "version": [
     0,
-    10,
+    14,
     0
    ],
    "deps": [
@@ -7313,8 +7367,8 @@
     "f",
     "s"
    ],
-   "commit": "47bab994640f086939c30cc6416e770ad067e950",
-   "sha256": "0vhia7xmszcb3lxrb8wh93a3knjfzj48h8nhj4fh8zj1pjz6args"
+   "commit": "771a3079e27f397d2f5a9470b945980fa68ee048",
+   "sha256": "0bx4ns0jb0sqrjk1nsspvl3mhz3n12925azf7brlwb1vcgnji09v"
   }
  },
  {
@@ -7972,19 +8026,19 @@
   "repo": "jorgenschaefer/emacs-buttercup",
   "unstable": {
    "version": [
-    20200229,
-    620
+    20200308,
+    2200
    ],
-   "commit": "b2985171b8f745c8edab3d6fccf72d036519ca86",
-   "sha256": "129rxvd83i3jzivmqkx9a9lpq3g80716y9mc55hqf60l7wxg9787"
+   "commit": "b360e3501703d8829a7dfc2d141e8c7c32c9bcfe",
+   "sha256": "0b3xkykfw8888zdg5w45kzij0d547j67crpc62mizh0fnc5naqvr"
   },
   "stable": {
    "version": [
     1,
-    20
+    21
    ],
-   "commit": "adba24e575a07f4db3e9058953b441f390e8f2a2",
-   "sha256": "0143j6f271l19j41a4pgakxvslip8375jg8pwcvn22gz25s4g45w"
+   "commit": "0dbd474460e4c314bf8bc6e4d3dec647081538c9",
+   "sha256": "1ra5r56k539q6l98msxdn4vfd7k6jm00g8cdhs6hpwvb1blj8di2"
   }
  },
  {
@@ -8025,11 +8079,11 @@
   "repo": "rolandwalker/button-lock",
   "unstable": {
    "version": [
-    20150223,
-    1354
+    20200309,
+    1323
    ],
-   "commit": "f9082feb329432fcf2ac49a95e64bed9fda24d58",
-   "sha256": "06qjvybf65ffrcnhhbqs333lg51fawaxnva3jvdg7zbrsv4m9acl"
+   "commit": "9afe0f4d05910b0cccc94cb6d4d880119f3b0528",
+   "sha256": "1d893isxvchrqxw6iaknbv8l31rgalfc4hmppf0l87gxp5y9hxa2"
   },
   "stable": {
    "version": [
@@ -8887,8 +8941,8 @@
     20151205,
     1343
    ],
-   "commit": "f6abd9f4d4ec44edd04eeb75e23ec87988509d8b",
-   "sha256": "1vy653j7abbnvc03vy28y0vnvq8rzfd2zv0qbgp8zs70svfcnjxz"
+   "commit": "183c4fd3fe5fb7cb089bbfc7437815d426d08372",
+   "sha256": "1jgvs093w0llp0nxfdzfrlk7il0wj48qhnqsn61pvnma10m93zdl"
   }
  },
  {
@@ -8937,8 +8991,8 @@
     20200210,
     1326
    ],
-   "commit": "f6abd9f4d4ec44edd04eeb75e23ec87988509d8b",
-   "sha256": "1vy653j7abbnvc03vy28y0vnvq8rzfd2zv0qbgp8zs70svfcnjxz"
+   "commit": "183c4fd3fe5fb7cb089bbfc7437815d426d08372",
+   "sha256": "1jgvs093w0llp0nxfdzfrlk7il0wj48qhnqsn61pvnma10m93zdl"
   }
  },
  {
@@ -8949,11 +9003,11 @@
   "repo": "cdominik/cdlatex",
   "unstable": {
    "version": [
-    20191203,
-    646
+    20200305,
+    809
    ],
-   "commit": "b7af5a9884189412b4699a8fbffcb8fc17bdf617",
-   "sha256": "1ra5m51b9r0irp30bg8qm9wziaz5r4bi84b14s8ss5q3w950sdd5"
+   "commit": "a5cb624ef5f9e3d51fce6faa8dc153277f61043a",
+   "sha256": "0gicai05d21909mjjvfc6194ygrqg2pbff60pjh3w593c4l4jmcj"
   },
   "stable": {
    "version": [
@@ -9072,27 +9126,27 @@
   "repo": "ema2159/centaur-tabs",
   "unstable": {
    "version": [
-    20200214,
-    1651
+    20200309,
+    16
    ],
    "deps": [
     "cl-lib",
     "powerline"
    ],
-   "commit": "96b7c90bdcb6fe3d7c5146b579ab7b9794c2a17b",
-   "sha256": "01dik5v8b331vplvm3qclg04z2qdcfk0gfb12rz8p503s8y4xisi"
+   "commit": "af50f87d40697a4e5d6097e2042111fc4a930b40",
+   "sha256": "1c3szcv87gjlm2bndasrx9q46x699cxapmhfs2zs08yk6gc1yfji"
   },
   "stable": {
    "version": [
     3,
-    0
+    1
    ],
    "deps": [
     "cl-lib",
     "powerline"
    ],
-   "commit": "7d0d4e939d8089fc18b20a51a49de11b70947649",
-   "sha256": "19xm43f3p5klyiyycy3bp46j2mpqcf4jl5d34hvv0jynx4hxlk1f"
+   "commit": "af50f87d40697a4e5d6097e2042111fc4a930b40",
+   "sha256": "1c3szcv87gjlm2bndasrx9q46x699cxapmhfs2zs08yk6gc1yfji"
   }
  },
  {
@@ -9207,8 +9261,8 @@
     20171115,
     2108
    ],
-   "commit": "911033c7b88a5aa166cfabe36df3c9a2083caf8a",
-   "sha256": "1imbp99fxyq6zjkfnjmmhra68p0kgg3axhnx57k3xmlfqqw69hw9"
+   "commit": "b7135d2b898062aa9b1cc279062b8cbf48802d21",
+   "sha256": "1v4af4kblrq1bcfdzwqpq9inmyj83ppj5kwpnnvw6j92x0362nga"
   },
   "stable": {
    "version": [
@@ -9325,11 +9379,11 @@
   "repo": "emacsmirror/cg",
   "unstable": {
    "version": [
-    20190316,
-    2206
+    20200305,
+    1845
    ],
-   "commit": "9349600829ca1758306e703a649874f8c63955fa",
-   "sha256": "1s3s37g99x19zxnq0xbiy95kjhm2hb09saxic2basapcp0sdfbwh"
+   "commit": "b0e4cca3d8a28054b3af2f592b528903c7e7c111",
+   "sha256": "06ff0blmixn38z013pxj0a5qqn6aw09kv50zzyx5prdyzb57fx6h"
   }
  },
  {
@@ -9846,8 +9900,8 @@
   "repo": "clojure-emacs/cider",
   "unstable": {
    "version": [
-    20200227,
-    1414
+    20200308,
+    1030
    ],
    "deps": [
     "clojure-mode",
@@ -9858,8 +9912,8 @@
     "sesman",
     "spinner"
    ],
-   "commit": "1a33e62cc56c1d3f4e4c80604140bdef40e3cf57",
-   "sha256": "0i4kbkl6vck2pnk2p6ars9ifj5b7haigfrmaid9qq8qq2nslczrq"
+   "commit": "c027c4948562f736fd77e441dc10cb5d6bb355a1",
+   "sha256": "0p808ks2x9dg98v80icxldynvvvfwwsf2y89la40fsc572s8zqjw"
   },
   "stable": {
    "version": [
@@ -10110,8 +10164,8 @@
   "repo": "andras-simonyi/citeproc-el",
   "unstable": {
    "version": [
-    20190914,
-    613
+    20200305,
+    2126
    ],
    "deps": [
     "dash",
@@ -10121,8 +10175,8 @@
     "s",
     "string-inflection"
    ],
-   "commit": "fd2188e5d76ca78723567ae3b369ae542402e633",
-   "sha256": "0a924bpb15259dlv8ry5bhlq61yczy31fnsbvx2lhzf9r0i06vvc"
+   "commit": "1884b5c88ad4eb35450a7acf053594369ccb1b22",
+   "sha256": "0dr4fx14kmahg533ij92ycn1a8kagbadfml9iyziisllxypmjrzf"
   },
   "stable": {
    "version": [
@@ -10983,8 +11037,8 @@
     20190710,
     1319
    ],
-   "commit": "61596e1cc861f975ec822f72d34842674b388646",
-   "sha256": "04m4im5qaxybh9kir1kclljzql3qiadhi1g64byyilgbl81vx6nv"
+   "commit": "c7c6e103d1209f7e29cb2909cf342be75478f304",
+   "sha256": "0p4fi9yss2n9wdlhra035spj353q047mfyab1jgswyfjfghgmiks"
   },
   "stable": {
    "version": [
@@ -10992,10 +11046,10 @@
     17,
     0,
     -1,
-    1
+    2
    ],
-   "commit": "125f0451a9061c60036c5f92d104ee9fb3111a98",
-   "sha256": "15spvk8392ngnxxm5v919nnvakw8aw4h1g3i41mhr9fs901z9cis"
+   "commit": "d1cb554c99c73e1486fbf4e09125337a7c0e9ea3",
+   "sha256": "07qkp3wbmpx2p3jpzxhgf5y9j6yzaxnq4krbj2d5m1hbgxxqgxz5"
   }
  },
  {
@@ -11469,14 +11523,14 @@
   "repo": "purcell/color-theme-sanityinc-solarized",
   "unstable": {
    "version": [
-    20190206,
-    59
+    20200304,
+    2156
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "54daf1e5a0fbee6682cade1f59171daf185239e3",
-   "sha256": "0z9p9lbngrv8yx9asmz6x89183gw2v75l990hr8m0aydfbfn6gnz"
+   "commit": "c688337aaae9f47128a841479e4191858ac147f6",
+   "sha256": "0a16fn7h0yljlgg1scy82w5r6awd7gk6xf1qd83cx8kj2cg7k7vb"
   },
   "stable": {
    "version": [
@@ -11988,14 +12042,14 @@
   "repo": "krzysztof-magosa/company-ansible",
   "unstable": {
    "version": [
-    20200228,
-    2134
+    20200306,
+    1441
    ],
    "deps": [
     "company"
    ],
-   "commit": "0bbf6561d95fb6e1f34aa971e7db5203f22366b5",
-   "sha256": "0ygdhrqva1q6qll40bg9bpd4z023vibzzb0xkidjvwhaa40m33b7"
+   "commit": "79dd421b161efa49fbdffad57fa40edb41f484a3",
+   "sha256": "0b05n6m47vyhirxfqzapzl4gf179aks1296qsw1sw8v84kb5kl0x"
   },
   "stable": {
    "version": [
@@ -13248,8 +13302,8 @@
     "company",
     "rtags"
    ],
-   "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a",
-   "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n"
+   "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5",
+   "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x"
   },
   "stable": {
    "version": [
@@ -13662,11 +13716,11 @@
   "repo": "jjzmajic/compdef",
   "unstable": {
    "version": [
-    20200222,
-    338
+    20200304,
+    611
    ],
-   "commit": "79639b90e537058ab4de1961cee63a26c4ca2a10",
-   "sha256": "0rgf145x7v0y47knnkhx6dc1vflibs45daprc7wi8qlnjmjmr4vw"
+   "commit": "30fb5846ed851efee641ce8c5d8879ad36cd7ac6",
+   "sha256": "0qn99jynafjyxc6fy9z888h7j7drs2mz34acwq8yh22v314x2639"
   }
  },
  {
@@ -14274,14 +14328,14 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20200224,
-    2036
+    20200311,
+    1152
    ],
    "deps": [
     "swiper"
    ],
-   "commit": "fcf5dcfd5796637d64164fd17956c5bc54e25612",
-   "sha256": "1hx00axmjfgc14ixj16pg7029zj7rsx2i80sw6f2bvp543l2aicq"
+   "commit": "5f1d9ce04599c52818244c2cb8cb066a601610b8",
+   "sha256": "1gsyf210jq4ij5r47k5sajpjq3z0rgihz84g6y3647k12a00biap"
   },
   "stable": {
    "version": [
@@ -15817,8 +15871,8 @@
     20190111,
     2150
    ],
-   "commit": "f6bf6aa9c7d2414b54e7289639ae5f43b15ede05",
-   "sha256": "0sl9vz753np0qb6v5c3nf1kgyd7gyp4yslas5fwfs5j4f3981cdk"
+   "commit": "22213aa38cfb3460bbcd746910cea00eedea8a2c",
+   "sha256": "06x99iwby54d5za6py8g6bb1pblnqi8vs16ncr9brk23zswrg1ml"
   },
   "stable": {
    "version": [
@@ -16394,14 +16448,14 @@
   "repo": "emacs-dashboard/emacs-dashboard",
   "unstable": {
    "version": [
-    20200225,
-    745
+    20200306,
+    1344
    ],
    "deps": [
     "page-break-lines"
    ],
-   "commit": "b7857a361967a9f0f6370879b30854f1e2fd81ff",
-   "sha256": "1l6n707v77gc4lgrg5livl2isigv7j6dsrkfppkcyjz2xyvl0n3y"
+   "commit": "bf38867ae80902d58207974b4a2bba4249324599",
+   "sha256": "1ksa1rq6xmyxc4srj1n3l0rd66zcz9br8k2bp3pzriljqvk8l753"
   },
   "stable": {
    "version": [
@@ -16669,15 +16723,15 @@
   "repo": "skk-dev/ddskk",
   "unstable": {
    "version": [
-    20200301,
-    237
+    20200310,
+    2004
    ],
    "deps": [
     "ccc",
     "cdb"
    ],
-   "commit": "f6abd9f4d4ec44edd04eeb75e23ec87988509d8b",
-   "sha256": "1vy653j7abbnvc03vy28y0vnvq8rzfd2zv0qbgp8zs70svfcnjxz"
+   "commit": "183c4fd3fe5fb7cb089bbfc7437815d426d08372",
+   "sha256": "1jgvs093w0llp0nxfdzfrlk7il0wj48qhnqsn61pvnma10m93zdl"
   }
  },
  {
@@ -17742,20 +17796,20 @@
   "repo": "gonewest818/dimmer.el",
   "unstable": {
    "version": [
-    20200301,
-    43
+    20200308,
+    2331
    ],
-   "commit": "b9a35a236314e9afe173287a5aaf5ac7307f6067",
-   "sha256": "1a8aagg6087l9pi4pjk91k1liikbsp6mxbnpx3mzzcvylh2kis5f"
+   "commit": "2b8b639e55e0e79101f7197264f17429cdcf4669",
+   "sha256": "026qb0r289wkf4zpr3l4pwp7l2rxgfqd8vrj2z8zhyas0r0wwjzx"
   },
   "stable": {
    "version": [
     0,
     4,
-    1
+    2
    ],
-   "commit": "5c0d50439afb43362b06a249a40e1ee00ce837a8",
-   "sha256": "1ykzr7h96a55hnj0bwq9fds4fdwinzx48p3i3k2g6fy8qcn7ydlb"
+   "commit": "e45bf2d064a8ecdea2b4caf646ece2d0adc1d84e",
+   "sha256": "0dw0qh5hm1x76s5cqxvylvmjgy0jwy11xm258g6kmx6w1k6r1d2l"
   }
  },
  {
@@ -18278,11 +18332,11 @@
   "repo": "Vifon/dired-rifle.el",
   "unstable": {
    "version": [
-    20181012,
-    2131
+    20200308,
+    2358
    ],
-   "commit": "a4f7b1e798397688b9c00d3507fcd395ece17a40",
-   "sha256": "09jp54drbx1hb4fj6bzh8ava7nk56pp500xsa9712vscg1f38fpz"
+   "commit": "99e4110c80d65ca43e2b0ec078e3202995e392d7",
+   "sha256": "034qak8kdp7laz1ylqy9np5ajhwf741mdl0bj5kb7rrrsijxada6"
   }
  },
  {
@@ -18316,15 +18370,15 @@
   "repo": "stsquad/dired-rsync",
   "unstable": {
    "version": [
-    20200225,
-    1343
+    20200308,
+    1150
    ],
    "deps": [
     "dash",
     "s"
    ],
-   "commit": "276a313bd61096ad680769c8d419c1cf3d5981e9",
-   "sha256": "1s4cllfwyspp65f05f3jw449ijn6m96pbn3vjpil4b116hsxm1qb"
+   "commit": "bfd5c155be1cb6b71c83e5f41116c81b6532b6d5",
+   "sha256": "096lqsq4bh5fgxhfscvmscd5v8d4ji88wks2chi92h9v85sha3b6"
   },
   "stable": {
    "version": [
@@ -18377,11 +18431,11 @@
   "repo": "crocket/dired-single",
   "unstable": {
    "version": [
-    20180824,
-    312
+    20200303,
+    1144
    ],
-   "commit": "cfd463598175d89672a766a4f4a4a778836186e2",
-   "sha256": "0bpk4hqa9k702k0mcbg62wy29sx1n1dzrprkzp4x76ixgzfav3lj"
+   "commit": "90ade369ba478fdebf61957f837c0b10cef128b1",
+   "sha256": "08qm8s77kfx9yfhm10vivhq15jrndvd29azkv4y1wd9qsrh5ylk0"
   },
   "stable": {
    "version": [
@@ -18635,11 +18689,11 @@
   "repo": "purcell/disable-mouse",
   "unstable": {
    "version": [
-    20181225,
-    2206
+    20200304,
+    2159
    ],
-   "commit": "689ea9f3d702529a5b5ac2493e28eefca65c7abb",
-   "sha256": "0na9kkx2rjakgxq416cr2wjdggzf4ycki7jj7ywpra966zldf84s"
+   "commit": "a8318f5f21716316053cc092ab9abb43cb681fe0",
+   "sha256": "0z9749hd3x1z2sf3lyzx2rrcfarixmfg0hnc5xsckkgyb7gbn6hq"
   },
   "stable": {
    "version": [
@@ -19441,11 +19495,11 @@
   "repo": "progfolio/doct",
   "unstable": {
    "version": [
-    20200225,
-    2305
+    20200308,
+    1939
    ],
-   "commit": "671ff27f9ee97b4ca79edcad8626a0356732d0cc",
-   "sha256": "0ajvys20w8fp661x8y7j7f72kmw5ylwvcdxrhiplk6h6xhacjwdc"
+   "commit": "82387b252b2e9bcbc4aed0e9568cddcafbdbfac5",
+   "sha256": "0h24d2938qrk4aw778y9ll4j8m9p8w1q9cfyx5qw60sbdrcbrlmj"
   }
  },
  {
@@ -19560,16 +19614,16 @@
   "repo": "seagle0128/doom-modeline",
   "unstable": {
    "version": [
-    20200301,
-    657
+    20200311,
+    1726
    ],
    "deps": [
     "all-the-icons",
     "dash",
     "shrink-path"
    ],
-   "commit": "0df558598451c36714c0793283fecc064adaf786",
-   "sha256": "1gi3qcqnv0qs8f1921s0bs6ppc3z44sbb035qdlzm1lii7s2v4ll"
+   "commit": "06a79f5c5035b12c3110a7ab43b48e50217a2ae7",
+   "sha256": "0pgng5nqc3cj7bb57l0abqc2sr1542lgv7271i602k56sg7ak431"
   },
   "stable": {
    "version": [
@@ -19594,14 +19648,14 @@
   "repo": "hlissner/emacs-doom-themes",
   "unstable": {
    "version": [
-    20200225,
-    1641
+    20200302,
+    110
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "756cf15a6bfb3146f2a28a861c1d9e4e86605cdf",
-   "sha256": "01w67r9vms19mrz8nc8mbyq0gkvgbixpcl14xbb51mrvnssaf3qb"
+   "commit": "e53b83c9106c76e54996ba2d1b70a8288a379572",
+   "sha256": "1wwy7abxxpr0048y03g3nv0sw1w8s0pdnnffpxp7djlp55nvay29"
   },
   "stable": {
    "version": [
@@ -19809,8 +19863,8 @@
     20161021,
     1211
    ],
-   "commit": "4953f1c8a68472e157a0dcd0a7e35a4ec2577133",
-   "sha256": "1i7k7d2gnzd2izplhdmjbkcxvkwnc3y3y0hrcp2rq60bjpkcl1gv"
+   "commit": "a69e364532fffa451d1f12ade8fadb9cdbd8318c",
+   "sha256": "12pwfv0j54idvn061l3qxf0vrrl56085n517izh8x6jkgxjcx7k0"
   },
   "stable": {
    "version": [
@@ -19830,11 +19884,11 @@
   "repo": "dracula/emacs",
   "unstable": {
    "version": [
-    20200228,
-    1008
+    20200304,
+    1730
    ],
-   "commit": "f7cf1b23ae8f70aaf723552159213d143b92889a",
-   "sha256": "1lz24sbwc3d98ibjvqb160qb2jkknm53v0imdykw86bjqgplxvv7"
+   "commit": "ed2f68d85b637636a4f7b782f19ee4f8e9f6fa44",
+   "sha256": "19qvkrknnhkr77hkyv9x1dg6m4difwz59sy2mqzw50wfb6vsy17n"
   },
   "stable": {
    "version": [
@@ -20078,19 +20132,19 @@
   "repo": "jscheid/dtrt-indent",
   "unstable": {
    "version": [
-    20191019,
-    2141
+    20200306,
+    1054
    ],
-   "commit": "48221c928b72746d18c1e284c45748a0c2f1691f",
-   "sha256": "0jmlb54b0qrp2mr9cnbzki1vy7i0wv5y1h03ns8acwa2hmpjk30a"
+   "commit": "1569b712ea691a9b8df12af5ee8c8a4aa4853e45",
+   "sha256": "1149s9ym30nfdbb2ndk5ypl5wb984an6n37gycra15j3z15d60mh"
   },
   "stable": {
    "version": [
-    0,
-    9
+    1,
+    0
    ],
-   "commit": "48221c928b72746d18c1e284c45748a0c2f1691f",
-   "sha256": "0jmlb54b0qrp2mr9cnbzki1vy7i0wv5y1h03ns8acwa2hmpjk30a"
+   "commit": "1569b712ea691a9b8df12af5ee8c8a4aa4853e45",
+   "sha256": "1149s9ym30nfdbb2ndk5ypl5wb984an6n37gycra15j3z15d60mh"
   }
  },
  {
@@ -20160,8 +20214,8 @@
   "repo": "jacktasia/dumb-jump",
   "unstable": {
    "version": [
-    20200222,
-    2006
+    20200306,
+    513
    ],
    "deps": [
     "dash",
@@ -20169,8 +20223,8 @@
     "popup",
     "s"
    ],
-   "commit": "a0ec2f139325bf3b39664e2a85be042a06f63af8",
-   "sha256": "12agvqxx50sg0klz3q6rcgfx5m2dw7idn65vwwamb019fpr4q94p"
+   "commit": "e8e9b0c2d1eda594fd40db9c64e93a70b426641b",
+   "sha256": "0m8771bzz972zf2lhv7f4z2x0rnnfc0iidb5jpz072wr3v52kark"
   },
   "stable": {
    "version": [
@@ -20214,17 +20268,17 @@
     20191016,
     1241
    ],
-   "commit": "d90488a7e2c24ecc7136bbcb270bfb30d4f1ad4f",
-   "sha256": "0pqlwkz3j5kpghqgx29xns0s8a66mi48prarirgqq8knfd7vkvzs"
+   "commit": "cbb259a99ecb15bc714ee1023d1a643b7e6c996f",
+   "sha256": "0xi83prqla41bvjmj5y6qwsxxbb6jwznr9lw3z2ibk46djr9hdsx"
   },
   "stable": {
    "version": [
     2,
-    3,
-    1
+    4,
+    0
    ],
-   "commit": "4e9ca5de1bf9eb8cd3d2277634d418ba747be864",
-   "sha256": "124x7yh8mjmqrf3z962sdcakd1ka3js5kg2vx767ygw4q6w8cjdh"
+   "commit": "ccd447e41a711f8a52bc854d71dba8677c900c34",
+   "sha256": "0i8b84mi38r431z4a1yh4xnn9z5mnk1g3di0qz6h4lsxq8pg2m0v"
   }
  },
  {
@@ -20259,20 +20313,20 @@
  },
  {
   "ename": "dyalog-mode",
-  "commit": "e608f40d00a3b2a80a6997da00e7d04f76d8ef0d",
-  "sha256": "0w61inyfvxiyihx5z9fk1ckawcd3cr6xiradbbwzmn25k99gkbgr",
-  "fetcher": "bitbucket",
+  "commit": "1a8f86df54f1243fea71e1e73ed0b9fb049032bd",
+  "sha256": "00mbkl275g8x3w341nsi90ffm5cfalnrfzx8ww1hnxc86q5ldivw",
+  "fetcher": "github",
   "repo": "harsman/dyalog-mode",
   "unstable": {
    "version": [
-    20191002,
-    1352
+    20200301,
+    1149
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "4e214c1804eefde07b1dcd2ea07b8e41f33d7ee7",
-   "sha256": "1vq1fhn8x6i6wmccwiq482dbrdpn5cllkdn3v0ki0427a8gwkdal"
+   "commit": "5dceeefaed6fbedb680bb6cc9aba14fb5f890310",
+   "sha256": "137kgixsdkw2rqj1402gc31gd6hdbna7bx5j1xxhyiig2x2b3aqx"
   }
  },
  {
@@ -20883,25 +20937,26 @@
   "repo": "joostkremers/ebib",
   "unstable": {
    "version": [
-    20200229,
-    741
+    20200308,
+    2130
    ],
    "deps": [
     "parsebib"
    ],
-   "commit": "96dff9eacad70d2fbd3cc432c9235413569080f9",
-   "sha256": "044p78y48cgv9wyxpf6kd137ppbh96dmd5xyaykafk9jf75h47kz"
+   "commit": "cd37aaa9a11e3b2232b8aa12cfe9a8ae9b830b10",
+   "sha256": "0spiz5r2y4pdpyc4d3f9w228giq0j9rm8f5h5akzn5rwiq9pfkwz"
   },
   "stable": {
    "version": [
     2,
-    22
+    22,
+    1
    ],
    "deps": [
     "parsebib"
    ],
-   "commit": "f094f7741264ba5de14624b1b8da8a2ba678bfe7",
-   "sha256": "1hn11y09bpb10hxp0b7j72shivnnq1qyvw13lyjqlycr6rgvckb9"
+   "commit": "cd37aaa9a11e3b2232b8aa12cfe9a8ae9b830b10",
+   "sha256": "0spiz5r2y4pdpyc4d3f9w228giq0j9rm8f5h5akzn5rwiq9pfkwz"
   }
  },
  {
@@ -21562,14 +21617,14 @@
  },
  {
   "ename": "edts",
-  "commit": "782db7fba2713bfa17d9305ae15b0a9e1985445b",
-  "sha256": "0f0rbd0mqqwn743qmr1g5mmi1sbmlcglclww8jxvbvb61jq8vspr",
+  "commit": "92b0d3a2af833e0f11e6a935d54eba5e3879d690",
+  "sha256": "1363k9fh1z7r6hxccsqx2a1d688kldr4h6vp91hwph7ihk4868il",
   "fetcher": "github",
-  "repo": "tjarvstrand/edts",
+  "repo": "sebastiw/edts",
   "unstable": {
    "version": [
-    20200217,
-    801
+    20200304,
+    1709
    ],
    "deps": [
     "auto-complete",
@@ -21580,8 +21635,8 @@
     "popup",
     "s"
    ],
-   "commit": "299e4553551a88dc5f26921125bccbc3efc662ef",
-   "sha256": "0fsgnh7g1fignsvl5i0kbkqb6f4ffc9k0202xm8p3b41vxgzdky5"
+   "commit": "22eb59692a792c6769ae0b2b9f9a2583133764b8",
+   "sha256": "015irp4vd4s2j2iw4p0r98kb60xyjbrpvckj8iixsja3qj8b63rw"
   },
   "stable": {
    "version": [
@@ -21729,8 +21784,8 @@
     20200107,
     2333
    ],
-   "commit": "de8ccd81a8312634a3c8c7f06b6993105538d29f",
-   "sha256": "08wpwpyskx59k31bqakw3mzir0blqcqk8m7dmr5mvp9gji41mb2d"
+   "commit": "39d416a6ef2c1f863a9482e7ada59d5da6fb7883",
+   "sha256": "0f66fnzkwl37qp8rj3hhnnayx27l06c18n7x3422pvbgxc78c7i8"
   },
   "stable": {
    "version": [
@@ -21875,8 +21930,8 @@
   "repo": "millejoh/emacs-ipython-notebook",
   "unstable": {
    "version": [
-    20200301,
-    802
+    20200307,
+    2048
    ],
    "deps": [
     "anaphora",
@@ -21886,8 +21941,8 @@
     "request",
     "websocket"
    ],
-   "commit": "10d7f10179f05eec243de3e55addd533bc46ce31",
-   "sha256": "0w2vlsr6s79mdlis4vsad9svs4ywbrkbyg5wygpd89m10sclkqcy"
+   "commit": "b265205a5735f7727336f483001cd2bdb9fc7a4e",
+   "sha256": "1b2ydpp9kh3a64if2fz6dky4mz3ifd7am7gms5508aj0757mzy4m"
   },
   "stable": {
    "version": [
@@ -21961,8 +22016,8 @@
   "repo": "kostafey/ejc-sql",
   "unstable": {
    "version": [
-    20200212,
-    1038
+    20200308,
+    1421
    ],
    "deps": [
     "auto-complete",
@@ -21971,8 +22026,8 @@
     "direx",
     "spinner"
    ],
-   "commit": "af7a59dba2ee2e906cbe6d1686d639b65f8838b2",
-   "sha256": "1pvhb1i4xhic89hn9l27afinxrgs50s0lpln8daa6dci3z0i8xx8"
+   "commit": "046bffbaac2a78e440d39a1f1e2dd8055a39f3bd",
+   "sha256": "0ccww05ivqgsvvrhjlwlciv00213qar4sdzawzmxh85vxj3a045b"
   },
   "stable": {
    "version": [
@@ -22539,8 +22594,8 @@
     "inline-docs",
     "quick-peek"
    ],
-   "commit": "4dcd6644c7aee2565dd32c1f65e2d1fa4432ceb8",
-   "sha256": "0xnp937xpjvypz2cv0xsdc47g484qr7kbdjccdflgv2yn244dc37"
+   "commit": "3123b20f26d2f74033de6feb398fd36745c46e14",
+   "sha256": "16crwazyn28qyb9zax1jfz2favgw402z676yf67qchgzsf2jj43s"
   }
  },
  {
@@ -22750,28 +22805,28 @@
   "repo": "fasheng/elfeed-protocol",
   "unstable": {
    "version": [
-    20200301,
-    236
+    20200305,
+    230
    ],
    "deps": [
     "cl-lib",
     "elfeed"
    ],
-   "commit": "8f5cdb32c7d9f53427086fd8309c6c72d0bd9e79",
-   "sha256": "0brc185y8gb34xci5cv3g5i9s0gzrglkkbyxck5zk36icbh6wm3k"
+   "commit": "16daf009952fc020a2589ccf325a2b822403f7b6",
+   "sha256": "1lsxbr8b8gn33w6xrs9ghgv2xxvls2arlvq0fkp3vpb5ki8jzsqs"
   },
   "stable": {
    "version": [
     0,
     7,
-    3
+    5
    ],
    "deps": [
     "cl-lib",
     "elfeed"
    ],
-   "commit": "7048b8e3f55d6c8a9508d34b86f7a3434cda8e30",
-   "sha256": "0rg2nczzzbljmm3kkh5cnvj3ji0shrhwxw46lg3h93dp1nja9lzz"
+   "commit": "bffe74f0f7d7126691f6a9dd9eadf8714545dfe0",
+   "sha256": "16cmm59lwkgq0yj0pg9sn46afvqqjjx06xv5sc96vgwvn1n0lfi7"
   }
  },
  {
@@ -22924,11 +22979,11 @@
   "repo": "xuchunyang/elisp-demos",
   "unstable": {
    "version": [
-    20200219,
-    2102
+    20200306,
+    1620
    ],
-   "commit": "1d3b349f90dc6572a90d49ee247c43a4ba64252e",
-   "sha256": "0jvphz7ql4wbcj88w9igcgid4mjn7qysqgp8jmp7aqaf9zfpl2bd"
+   "commit": "bd9dfc8659096cf3102f50b9dc895c599d824732",
+   "sha256": "1gkywnajnv62s0r2mdkc70cbzdyxa1x9w8rlbnlkdx4js3brakiz"
   },
   "stable": {
    "version": [
@@ -23069,25 +23124,25 @@
   "repo": "purcell/elisp-slime-nav",
   "unstable": {
    "version": [
-    20200129,
-    2057
+    20200304,
+    2201
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "fea3bedf6383fea8370a9484a5610759c25055f9",
-   "sha256": "1mxs519gqax1fnaf5lirg69jrv4hj5a39hf7lzai7hyhcf9slzc1"
+   "commit": "9ab52362600af9f97f1590f05a295538025170b3",
+   "sha256": "08k4zlawjkb0ldn4lgrhih8nzln398x7dwzpipqfyrmp0xziywma"
   },
   "stable": {
    "version": [
     0,
-    9
+    10
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "0e96d9f1f0d334f09414b509d44d5c000b51f432",
-   "sha256": "11vyy0bvzbs1h1kggikrvhd658j7c730w0pdp6qkm60rigvfi1ih"
+   "commit": "9ab52362600af9f97f1590f05a295538025170b3",
+   "sha256": "08k4zlawjkb0ldn4lgrhih8nzln398x7dwzpipqfyrmp0xziywma"
   }
  },
  {
@@ -24554,15 +24609,15 @@
   "repo": "iqbalansari/emacs-emojify",
   "unstable": {
    "version": [
-    20191017,
-    420
+    20200309,
+    553
    ],
    "deps": [
     "ht",
     "seq"
    ],
-   "commit": "4c84ef9502988b52b1e296630bcee7f7c62cfc02",
-   "sha256": "11v7br4j1yx1hqqlv2phkxn3jx2qa3vrb4cq61ymfdx82v8j78jj"
+   "commit": "e05217ee668db3ffb537528408ce8004fadb75c0",
+   "sha256": "1blhvzrvjabh81si1h9iznldfp6mkchd31ig68byqfjvi6d34nxq"
   },
   "stable": {
    "version": [
@@ -24917,15 +24972,15 @@
   "repo": "emacscollective/epkg",
   "unstable": {
    "version": [
-    20191228,
-    2011
+    20200309,
+    546
    ],
    "deps": [
     "closql",
     "dash"
    ],
-   "commit": "075f6afa81f7a83a35088b699ed44d6029192198",
-   "sha256": "0g1ggna56w3c1qdqi3g1aq4gz6hdpacwc4hd31bqa03gydr8ghlg"
+   "commit": "edf8c009066360af61caedf67a2482eaa19481b0",
+   "sha256": "1ml5337wbw2zsf1vwv5svwvhd93jgl9sq79l1byiz32bnb0q5nhh"
   },
   "stable": {
    "version": [
@@ -25515,8 +25570,8 @@
     20200220,
     2206
    ],
-   "commit": "2839ecb8fc1ba424b863867b2086127fad839d28",
-   "sha256": "0r7cljx0f1c0mbzgvny7aka0zsyvmnryvzly9qfx0psgr06x8qfw"
+   "commit": "f9cbc2a6f6c03b529860857f94242ea80b30d3f3",
+   "sha256": "0xxq20k4al58yv4y1kj2d8hwpcwji0qwzqn06p5y1wzzyw22sz7h"
   },
   "stable": {
    "version": [
@@ -26048,11 +26103,11 @@
   "repo": "zwild/eshell-prompt-extras",
   "unstable": {
    "version": [
-    20191104,
-    1230
+    20200310,
+    809
    ],
-   "commit": "356a540f9365b2f37f8a8cfb9c0e0e1994d12f4a",
-   "sha256": "0gb07mns23dgqqr6qfy7d6ndizy15sqgbgfaig6k5xbjnwi02v9g"
+   "commit": "6a30813893e04ab8c0793757cdb2ff9873ab0c56",
+   "sha256": "0vk30sq0p3afpaw9phmfpglvhs01f97rhm3ygzwiv8h4smy9zgsj"
   },
   "stable": {
    "version": [
@@ -26316,14 +26371,14 @@
   "repo": "emacs-ess/ESS",
   "unstable": {
    "version": [
-    20200226,
-    2140
+    20200311,
+    102
    ],
    "deps": [
     "julia-mode"
    ],
-   "commit": "a2be8cb97c6fff13fc28170d6359f835b8b562a5",
-   "sha256": "1jj040lng03jmp8ddn5fi8cg2v6fwxxv9ikispx3n03va1mrzf7m"
+   "commit": "3b84933f58d23403ded5bb5b25b8b2f714824ce9",
+   "sha256": "074lpj12sg90qbv8409dp9008nwc9rmqrb1clnxapfacz12649nc"
   },
   "stable": {
    "version": [
@@ -26772,30 +26827,30 @@
   "repo": "emacs-evil/evil",
   "unstable": {
    "version": [
-    20200224,
-    914
+    20200304,
+    1421
    ],
    "deps": [
     "cl-lib",
     "goto-chg",
     "undo-tree"
    ],
-   "commit": "7c42ba4de086dc8f5b2d277c8d2806adc6b84279",
-   "sha256": "1pzznnibgk0x33m04064w2r0ksk26liynswa785nld4king70iq2"
+   "commit": "296932406a0b55474fe4b6cb8db8b7d5e05633aa",
+   "sha256": "1gvmvczdfgq07chj98gqg5j2zyfdrq3znl8l6a81mbrjbvsyvmd3"
   },
   "stable": {
    "version": [
     1,
-    12,
-    17
+    14,
+    0
    ],
    "deps": [
     "cl-lib",
     "goto-chg",
     "undo-tree"
    ],
-   "commit": "5b690258fcfc47ca1fed25f17e04356edc713925",
-   "sha256": "001ywnhjl0dmywc8vg8brsisx432kcfdgv6xksawbg1czw6j0y02"
+   "commit": "4dc63903d9688e2ce838a220b0e24d8f14a64c12",
+   "sha256": "17xrn3s6a4afmls8fw8nnxa1jq9dmj2qqrxa2vngh50hxpz8840p"
   }
  },
  {
@@ -27509,15 +27564,15 @@
   "repo": "emacs-evil/evil-magit",
   "unstable": {
    "version": [
-    20200226,
-    1347
+    20200302,
+    1611
    ],
    "deps": [
     "evil",
     "magit"
    ],
-   "commit": "ba0e59248f8d7f59de811ed2e1f2c565dd7da1ca",
-   "sha256": "1jy1nzjr8mxn4153qdcvk3s0cdy7xrim7jq2c6dzdqxjdprhj8nz"
+   "commit": "0b79aa33a478770865716dc0e09f95d91ec042a2",
+   "sha256": "0qxapq9nl1yr3ryg1q9n2ajffm308fai115mbvwmjl9sd6x2p3ly"
   },
   "stable": {
    "version": [
@@ -28187,8 +28242,8 @@
     "evil",
     "string-inflection"
    ],
-   "commit": "008b74a9b2994abfb4ff5b679b8a5a26fd45e98a",
-   "sha256": "0lwwrd9n0ha2xn5a053s8a1l05zya4smf61yc5c1s4fqv0xai9fj"
+   "commit": "6913de02a210487c063cd63ecf27b17a24797870",
+   "sha256": "1wyd903yvp8lxbhavsr4grn79hkxcsz71mcvy3hrvnf7ifhw514a"
   },
   "stable": {
    "version": [
@@ -28303,26 +28358,26 @@
   "repo": "emacs-evil/evil",
   "unstable": {
    "version": [
-    20200129,
-    815
+    20200304,
+    911
    ],
    "deps": [
     "evil"
    ],
-   "commit": "7c42ba4de086dc8f5b2d277c8d2806adc6b84279",
-   "sha256": "1pzznnibgk0x33m04064w2r0ksk26liynswa785nld4king70iq2"
+   "commit": "296932406a0b55474fe4b6cb8db8b7d5e05633aa",
+   "sha256": "1gvmvczdfgq07chj98gqg5j2zyfdrq3znl8l6a81mbrjbvsyvmd3"
   },
   "stable": {
    "version": [
     1,
-    12,
-    17
+    14,
+    0
    ],
    "deps": [
     "evil"
    ],
-   "commit": "5b690258fcfc47ca1fed25f17e04356edc713925",
-   "sha256": "001ywnhjl0dmywc8vg8brsisx432kcfdgv6xksawbg1czw6j0y02"
+   "commit": "4dc63903d9688e2ce838a220b0e24d8f14a64c12",
+   "sha256": "17xrn3s6a4afmls8fw8nnxa1jq9dmj2qqrxa2vngh50hxpz8840p"
   }
  },
  {
@@ -28678,11 +28733,11 @@
   "repo": "jjzmajic/ewal",
   "unstable": {
    "version": [
-    20200301,
-    823
+    20200305,
+    230
    ],
-   "commit": "732a2f4abb480f9f5a3249af822d8eb1e90324e3",
-   "sha256": "09dgs0g5hcf5hris8i1w6w7wxarzmsagyc3l50rflvxy3djhlbkd"
+   "commit": "4ecc355dae9c7d648cd2874e01a15dfa02b9350d",
+   "sha256": "1v444nfrzz0lkybrgfics5kc8gncbvvs23qlq1pkz7ann6q84ip0"
   },
   "stable": {
    "version": [
@@ -28694,6 +28749,38 @@
    "sha256": "09dgs0g5hcf5hris8i1w6w7wxarzmsagyc3l50rflvxy3djhlbkd"
   }
  },
+ {
+  "ename": "ewal-doom-themes",
+  "commit": "5f59228fa54a9733f549c1ba531cd90d4350fb62",
+  "sha256": "14blxk8dkr0hkhf1hd75xk0zzx6qxavynymhbwbvbf3m0mp64x6l",
+  "fetcher": "gitlab",
+  "repo": "jjzmajic/ewal",
+  "unstable": {
+   "version": [
+    20200301,
+    839
+   ],
+   "deps": [
+    "doom-themes",
+    "ewal"
+   ],
+   "commit": "4ecc355dae9c7d648cd2874e01a15dfa02b9350d",
+   "sha256": "1v444nfrzz0lkybrgfics5kc8gncbvvs23qlq1pkz7ann6q84ip0"
+  },
+  "stable": {
+   "version": [
+    0,
+    2,
+    1
+   ],
+   "deps": [
+    "doom-themes",
+    "ewal"
+   ],
+   "commit": "732a2f4abb480f9f5a3249af822d8eb1e90324e3",
+   "sha256": "09dgs0g5hcf5hris8i1w6w7wxarzmsagyc3l50rflvxy3djhlbkd"
+  }
+ },
  {
   "ename": "ewal-evil-cursors",
   "commit": "ee7f9833a1dda00e12bcf45c7194ebc38e26168b",
@@ -28708,8 +28795,8 @@
    "deps": [
     "ewal"
    ],
-   "commit": "732a2f4abb480f9f5a3249af822d8eb1e90324e3",
-   "sha256": "09dgs0g5hcf5hris8i1w6w7wxarzmsagyc3l50rflvxy3djhlbkd"
+   "commit": "4ecc355dae9c7d648cd2874e01a15dfa02b9350d",
+   "sha256": "1v444nfrzz0lkybrgfics5kc8gncbvvs23qlq1pkz7ann6q84ip0"
   },
   "stable": {
    "version": [
@@ -28739,8 +28826,8 @@
     "ewal",
     "spacemacs-theme"
    ],
-   "commit": "732a2f4abb480f9f5a3249af822d8eb1e90324e3",
-   "sha256": "09dgs0g5hcf5hris8i1w6w7wxarzmsagyc3l50rflvxy3djhlbkd"
+   "commit": "4ecc355dae9c7d648cd2874e01a15dfa02b9350d",
+   "sha256": "1v444nfrzz0lkybrgfics5kc8gncbvvs23qlq1pkz7ann6q84ip0"
   },
   "stable": {
    "version": [
@@ -28817,8 +28904,8 @@
    "deps": [
     "evil"
    ],
-   "commit": "88266fa7fcfbef704032f671b94f756f2f98bd4f",
-   "sha256": "0nmm7pvs81429a4zpal6aidfd1n58yavv3skscrav5r0wnlbz773"
+   "commit": "d5daea30176d48e74c9d063ac9bfc240ebeb97d0",
+   "sha256": "18mb7ik15yygfyjr5y2awbn5lrr3b9z1f31gnfslvrlav2nl1m7d"
   },
   "stable": {
    "version": [
@@ -28947,11 +29034,11 @@
   "repo": "magnars/expand-region.el",
   "unstable": {
    "version": [
-    20200224,
-    1501
+    20200304,
+    1839
    ],
-   "commit": "1603d01fbfbef0d73ac940f7847c7e0b9b978093",
-   "sha256": "0apwvqbv04pgl682ja96l6cchfflr83s2h4p7vzpjc05h8pc0znr"
+   "commit": "ea6b4cbb9985ddae532bd2faf9bb00570c9f2781",
+   "sha256": "1pc3nnyb6cy4x6xnm25kdhmjmfm2rar7cnxsfck2wg5nm11p0klm"
   },
   "stable": {
    "version": [
@@ -29152,8 +29239,8 @@
     "exwm",
     "exwm-firefox-core"
    ],
-   "commit": "9407977034baf5f8b1e43c07ed8728f8f42d70d8",
-   "sha256": "1fha5fxjylgylmbr6fn5cz9py9csh4na9h7vljvapkrazwkpvbsy"
+   "commit": "14643ee53a506ddcb5d2e06cb9f1be7310cd00b1",
+   "sha256": "12rhsy5f662maip1sma0vi364xb8swb7g59r4dmafjv3b52gxik8"
   }
  },
  {
@@ -29518,11 +29605,11 @@
   "repo": "WJCFerguson/emacs-faff-theme",
   "unstable": {
    "version": [
-    20191028,
-    1846
+    20200304,
+    1414
    ],
-   "commit": "a16c4b36ef50731a83a57c1c6341a49e9897d225",
-   "sha256": "10850175c6jll4grsdjl180hs3rd72yajq55x6fz3a8mm8v5fqk9"
+   "commit": "3a2f4b567de490ee7af32ecca46de741e7fd7d6a",
+   "sha256": "0h3i61md4w6zsjarqan0s3p3kxz5af6ic3fww4ly6s8q1nv57xsc"
   },
   "stable": {
    "version": [
@@ -29947,8 +30034,8 @@
     "f",
     "s"
    ],
-   "commit": "1f2199f653ebae152ab34ebd8ccd364ab96ae392",
-   "sha256": "1idpm3gbbvq4s0q5dk7gs3lycnfwi58nhg4vdss084kgckwfz62r"
+   "commit": "9a80e1d42a4b01879a7585485384af6431b34651",
+   "sha256": "129mfslbp15d9z83r38lcqxnfx3n5jldaja5qbdgrmlw14irgx0r"
   },
   "stable": {
    "version": [
@@ -30785,14 +30872,14 @@
   "repo": "wanderlust/flim",
   "unstable": {
    "version": [
-    20190526,
-    1034
+    20200303,
+    319
    ],
    "deps": [
     "apel"
    ],
-   "commit": "e4bd54fd7d335215b54f7ef27ed974c8cd68d472",
-   "sha256": "0sl3skyqqzanjrp34hd1rh8wvdgsj2cm7k7hx5kc5ipggp77720r"
+   "commit": "f303f2f6c124bc8635add96d3326a2209749437b",
+   "sha256": "08gxrpzxxfgbxznvpj00bjvh8l7afg2h2vaj6iasis9724f3mgl6"
   }
  },
  {
@@ -31965,25 +32052,25 @@
   "url": "https://git.deparis.io/flycheck-grammalecte/",
   "unstable": {
    "version": [
-    20191003,
-    1844
+    20200308,
+    1452
    ],
    "deps": [
     "flycheck"
    ],
-   "commit": "11cc5a0480dbdd4a9fa2bc12184b3fb56efc5cf3",
-   "sha256": "1x7y0sjq1p7idzsy2bdqhdll8vj2ci45cd5jn8qgzv02kms65djp"
+   "commit": "ca4b87d22474d3337db72e19f88105f557f44867",
+   "sha256": "0wj81xfy3wlgdlnhhyhz5lfkl6sfb2ajwb6s8f2y4bcvqa8gz3qj"
   },
   "stable": {
    "version": [
-    0,
-    9
+    1,
+    0
    ],
    "deps": [
     "flycheck"
    ],
-   "commit": "d1ca6d9d4d64aa343598018134506930434ac5e0",
-   "sha256": "0s7kbs764nhq4nlfbbilz5clvadcyz5bi0ksrbm9kczhagisxnjv"
+   "commit": "ca4b87d22474d3337db72e19f88105f557f44867",
+   "sha256": "0wj81xfy3wlgdlnhhyhz5lfkl6sfb2ajwb6s8f2y4bcvqa8gz3qj"
   }
  },
  {
@@ -32331,25 +32418,25 @@
   "repo": "purcell/flycheck-ledger",
   "unstable": {
    "version": [
-    20191128,
-    203
+    20200304,
+    2204
    ],
    "deps": [
     "flycheck"
    ],
-   "commit": "2065beab564c23e6ab380547d19bdb5a9b3b25fc",
-   "sha256": "16wq9l8q15iw7mdicrx2c28qrhndmd0fmg8f3yiyk2frmb8ack9h"
+   "commit": "628e25ba66604946085571652a94a54f4d1ad96f",
+   "sha256": "1djrj3is0dzrl2703bw7bclf33dp4xqmy144q7xj5pvpb9v3kf50"
   },
   "stable": {
    "version": [
     0,
-    4
+    5
    ],
    "deps": [
     "flycheck"
    ],
-   "commit": "9401b6c83f60bfd29edfc62fee76f75e17a3a41e",
-   "sha256": "1pdssw5k88ym5fczllfjv26sp4brlyrywnlzq5baha5pq91h9cb6"
+   "commit": "628e25ba66604946085571652a94a54f4d1ad96f",
+   "sha256": "1djrj3is0dzrl2703bw7bclf33dp4xqmy144q7xj5pvpb9v3kf50"
   }
  },
  {
@@ -32609,15 +32696,15 @@
   "repo": "purcell/flycheck-package",
   "unstable": {
    "version": [
-    20200222,
-    512
+    20200304,
+    2151
    ],
    "deps": [
     "flycheck",
     "package-lint"
    ],
-   "commit": "e867b83dc84f1f8870eea069a71fa2a24cbcd5c9",
-   "sha256": "1b7javiqbcfzh1xkrjld9f5xrmld69gvnjz72mqpqmzbilfvmdpq"
+   "commit": "caea75f77dc7668c7aa0ebcd48f677e3522b5d77",
+   "sha256": "1x63rwpyzcn99jzhyxh91l3hp2j55wspxdv5rhvnpbar5nlqlbz1"
   },
   "stable": {
    "version": [
@@ -32684,8 +32771,8 @@
     "flycheck",
     "phpstan"
    ],
-   "commit": "6744215d82ce9e82416d83e5b27fb9bac9e8d461",
-   "sha256": "0hbm881w84nm4g67085xzikz422vkb08y98hfk2n3kqmznvp8i51"
+   "commit": "a1c30ca634107551c20c846b5316ca5697adb06d",
+   "sha256": "0b7rnzk1zkrzh978bmh2dsy78f0sb4ia1w06khyqiby52m27q9k1"
   },
   "stable": {
    "version": [
@@ -32944,27 +33031,27 @@
   "repo": "purcell/flycheck-relint",
   "unstable": {
    "version": [
-    20200226,
-    508
+    20200304,
+    152
    ],
    "deps": [
     "flycheck",
     "relint"
    ],
-   "commit": "6dbd319a49d334653a3e4f9bff229f482bbb7ba4",
-   "sha256": "0rmnq0llmc96hmvhim451fknzafj80pjkd6qdb0x1bdr7iww1ilc"
+   "commit": "f498c130408411906bda81c1023a88b1498dcf18",
+   "sha256": "18sgnj6y9vsj9np58d8cr72jfady0kwdg6rdx667098lbznaw0da"
   },
   "stable": {
    "version": [
     0,
-    2
+    4
    ],
    "deps": [
     "flycheck",
     "relint"
    ],
-   "commit": "6dbd319a49d334653a3e4f9bff229f482bbb7ba4",
-   "sha256": "0rmnq0llmc96hmvhim451fknzafj80pjkd6qdb0x1bdr7iww1ilc"
+   "commit": "39ec5deabdd23afaf6e1e34e13edd14d910899d0",
+   "sha256": "0m46n91hmh6gml9ravd0d1i79jnl9vbr733na3w0kg87mixnjdy8"
   }
  },
  {
@@ -32982,8 +33069,8 @@
     "flycheck",
     "rtags"
    ],
-   "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a",
-   "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n"
+   "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5",
+   "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x"
   },
   "stable": {
    "version": [
@@ -34118,20 +34205,20 @@
   "repo": "karlotness/flymake-quickdef",
   "unstable": {
    "version": [
-    20190727,
-    2028
+    20200308,
+    2342
    ],
-   "commit": "5b3980a7c1763171e8cdb28ebfd5f4eaad32f9f9",
-   "sha256": "0rhg29jcpa4314ld9shhvf81m1ar8xp2853hxm94bxpnnza5d8x7"
+   "commit": "150c5839768a3d32f988f9dc08052978a68f2ad7",
+   "sha256": "19gfd539l97j8xbrq1fw83b54mxbcamlz9m896088d3p01zf8b0g"
   },
   "stable": {
    "version": [
-    0,
     1,
-    1
+    0,
+    0
    ],
-   "commit": "53bf206f1a71b2fc12f49741832a94f6498ae6a6",
-   "sha256": "0wqfn068ylb30f8988knrcd9v3r3xck5yb1fj9jnrw2bs6qxxc57"
+   "commit": "150c5839768a3d32f988f9dc08052978a68f2ad7",
+   "sha256": "19gfd539l97j8xbrq1fw83b54mxbcamlz9m896088d3p01zf8b0g"
   }
  },
  {
@@ -34980,8 +35067,8 @@
   "repo": "magit/forge",
   "unstable": {
    "version": [
-    20200228,
-    1527
+    20200309,
+    937
    ],
    "deps": [
     "closql",
@@ -34993,8 +35080,8 @@
     "markdown-mode",
     "transient"
    ],
-   "commit": "0ade907a469d7159d9f5b3290e2aebec4397c58a",
-   "sha256": "12pvnasc4nr3n4k91ch90zsvyc1rv1ghga8lx7xp78fc6b3y959r"
+   "commit": "2e2d26cf428012f0ece53a81cde02179e72648aa",
+   "sha256": "0mpim6699cda3ds8gv1f2y021gssjrw9rg7w9b8h1ifhrl54x0qn"
   },
   "stable": {
    "version": [
@@ -35194,14 +35281,14 @@
   "repo": "rnkn/fountain-mode",
   "unstable": {
    "version": [
-    20200218,
-    1249
+    20200307,
+    943
    ],
    "deps": [
     "seq"
    ],
-   "commit": "974c9df2c73cf52030dfe0c771d97d3d37bd08e4",
-   "sha256": "0103rnq9x07a11930jgcg04ayd7npri9wd2j2ghr510y7sm86p0d"
+   "commit": "c3f70903327659cd307f9a8225b5c4310cfc6e8e",
+   "sha256": "1zavkilkff9gbnl6i5ghc0z93b4k3kv604lyysqnc7mvvzf344vc"
   },
   "stable": {
    "version": [
@@ -35595,8 +35682,8 @@
   "repo": "FStarLang/fstar-mode.el",
   "unstable": {
    "version": [
-    20200131,
-    1622
+    20200305,
+    1654
    ],
    "deps": [
     "company",
@@ -35606,8 +35693,8 @@
     "quick-peek",
     "yasnippet"
    ],
-   "commit": "336b41ecd7ecb64fac869ec61e683e20a14d79d2",
-   "sha256": "1122m5l16sw3mi9xvsmkrxxsvx6895g0agd55w8wk5968323n01y"
+   "commit": "aaaf2568881d3e5e08f8cbd04a9add49912552ad",
+   "sha256": "1wqbfz8sbvfl7v31a1i6mc6c8p5fyp8yflj87lavpk1d0h5dl8ly"
   },
   "stable": {
    "version": [
@@ -35637,8 +35724,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "573e4ed198584f17126549f708bd8426e93058be",
-   "sha256": "0baqikbbgxb2a0jyqz8s9ibivh9q14bq2g2kngd89pssd74fv04k"
+   "commit": "85d15e865ab3beca4ab601b5741ed31b55e247bd",
+   "sha256": "16z3sgfjm49f7ll11lfw8pwrqgss6631frr5xxnh18x1p5n96gjc"
   },
   "stable": {
    "version": [
@@ -36244,6 +36331,38 @@
    "sha256": "08cw1fa25kbhbq2sp1cpn90bz38i9hjfdj93xf6wvki55b52s0nn"
   }
  },
+ {
+  "ename": "geolocation",
+  "commit": "fddc094aa08365c0e04f0d8f2f19a47908964f50",
+  "sha256": "03mxy8dfmy8db8rx9j7q1lvzy11grz0bd3054ckwgmlb6ng7d72q",
+  "fetcher": "github",
+  "repo": "gonewest818/geolocation.el",
+  "unstable": {
+   "version": [
+    20200308,
+    2324
+   ],
+   "deps": [
+    "deferred",
+    "request-deferred"
+   ],
+   "commit": "83ab28e64bc067016b5344dffe93e380e9807e9c",
+   "sha256": "0ns7pgi4gbpfb192n9fdhv12zflq74jdmqc518rgh7hqlyp26mf4"
+  },
+  "stable": {
+   "version": [
+    0,
+    2,
+    0
+   ],
+   "deps": [
+    "deferred",
+    "request-deferred"
+   ],
+   "commit": "83ab28e64bc067016b5344dffe93e380e9807e9c",
+   "sha256": "0ns7pgi4gbpfb192n9fdhv12zflq74jdmqc518rgh7hqlyp26mf4"
+  }
+ },
  {
   "ename": "german-holidays",
   "commit": "bf5b3807ff989b13f95e8d6fad2f26a42ff0643c",
@@ -36574,15 +36693,15 @@
   "repo": "magit/ghub",
   "unstable": {
    "version": [
-    20200228,
-    4
+    20200309,
+    936
    ],
    "deps": [
     "let-alist",
     "treepy"
    ],
-   "commit": "b0faadaf079542f81ac06a15a1bd225e2a7af1ec",
-   "sha256": "1fasnipic9mkhkm7km56f43s19cyzrrs1cd8nr81b9kxmp95ik3r"
+   "commit": "a8bf337534ec583906db77a3d56f7d1b84bda952",
+   "sha256": "0cpbz79k6q5ang47qw4j3i99qz093xc40k8lsc9j21g07fihxiv5"
   },
   "stable": {
    "version": [
@@ -36933,8 +37052,8 @@
     "transient",
     "with-editor"
    ],
-   "commit": "c8cd22e28d20b0d7ae74102df4e35d7c0c61ebe6",
-   "sha256": "134n9m2zrf60ljm867bv92qjgk61cmgns1a3cqpvj4wflpaahnbv"
+   "commit": "1916e83aa463fee86ac1c6bcfd80d780d0544901",
+   "sha256": "1bnykbb868dna4j91kp5jzi7ab4siiy1ni228x8i50cmfm4i91in"
   },
   "stable": {
    "version": [
@@ -37669,8 +37788,8 @@
     "ghub",
     "s"
    ],
-   "commit": "1de2d6d148e3604899270be36eb6b0385b837aac",
-   "sha256": "1g1j6c93aw9n9v7r20dzlnylkn4292vwi59l8hai49i1944hr00h"
+   "commit": "3fb7cc2a818c43f2b29ce17792efafd4f6b07765",
+   "sha256": "06bfwb7n700farbgc6lp6nqjx8sshc8r6lbhk3fqy92ahdpkz0wn"
   }
  },
  {
@@ -38218,11 +38337,11 @@
   "repo": "emacsorphanage/gnuplot",
   "unstable": {
    "version": [
-    20191212,
-    1801
+    20200310,
+    536
    ],
-   "commit": "a406143d52618638d908b6b0b1c1c90c045b83ee",
-   "sha256": "0vq7ha6z07x46pf7qig1f6p1rr8vyhj8vafrmq40h3gw5422vv8y"
+   "commit": "a080f79b6f7a6ca94d11cda0d341acfc6e76d0c5",
+   "sha256": "111n89p74iymxrla3mk387xffnqmkb11pixjfgiv61l9b35hx94g"
   },
   "stable": {
    "version": [
@@ -38706,8 +38825,8 @@
     "cl-lib",
     "go-mode"
    ],
-   "commit": "53c76cddf54638dea5e4cae99ce0181de28e1064",
-   "sha256": "0fpdschrcbx2fjx01x5z84gk7pmicssxv23q9p88k6d11nj80iqc"
+   "commit": "85a20dac6cee1e4bcfff554a665bcb7cd21dc0d9",
+   "sha256": "09xivjss1vlpqyp8cbv6652sgy3rxp00ml7f76prx22cwfpq67db"
   },
   "stable": {
    "version": [
@@ -38799,11 +38918,11 @@
   "repo": "dominikh/go-mode.el",
   "unstable": {
    "version": [
-    20200112,
-    2140
+    20200309,
+    303
    ],
-   "commit": "53c76cddf54638dea5e4cae99ce0181de28e1064",
-   "sha256": "0fpdschrcbx2fjx01x5z84gk7pmicssxv23q9p88k6d11nj80iqc"
+   "commit": "85a20dac6cee1e4bcfff554a665bcb7cd21dc0d9",
+   "sha256": "09xivjss1vlpqyp8cbv6652sgy3rxp00ml7f76prx22cwfpq67db"
   },
   "stable": {
    "version": [
@@ -38907,8 +39026,8 @@
    "deps": [
     "go-mode"
    ],
-   "commit": "53c76cddf54638dea5e4cae99ce0181de28e1064",
-   "sha256": "0fpdschrcbx2fjx01x5z84gk7pmicssxv23q9p88k6d11nj80iqc"
+   "commit": "85a20dac6cee1e4bcfff554a665bcb7cd21dc0d9",
+   "sha256": "09xivjss1vlpqyp8cbv6652sgy3rxp00ml7f76prx22cwfpq67db"
   },
   "stable": {
    "version": [
@@ -39155,8 +39274,8 @@
     20180221,
     2015
    ],
-   "commit": "910be7a94367618fd0fd25eaabbee4fdc0ac7092",
-   "sha256": "08gskshgfwxhmm9i4vgd4q7kqd5i7yihqh33v6r07br6kqd0g995"
+   "commit": "738671d3881b9731cc63024d5d88cf28db875626",
+   "sha256": "0jkiz4py59jjnkyxbxifpf7bsar11lbgmj5jiq2kic5k03shkn9c"
   }
  },
  {
@@ -39483,35 +39602,6 @@
    "sha256": "0kpalpssfrwcqrmp47i3j2x04m01fm7cspwsm6fks8pn71lagcwm"
   }
  },
- {
-  "ename": "goto-gem",
-  "commit": "a52b516b7b10bdada2f64499c8f43f85a236f254",
-  "sha256": "0i79z1isdbnqmz5rlqjjys68l27nl90m1gzks4f9d6dsgfryhgwx",
-  "fetcher": "gitlab",
-  "repo": "pidu/goto-gem",
-  "unstable": {
-   "version": [
-    20140729,
-    1845
-   ],
-   "deps": [
-    "s"
-   ],
-   "commit": "e3206f11f48bb7e798514a4ca2c2f60649613e5e",
-   "sha256": "0j2hdxqfsifm0d8ilwcw7np6mvn4xm58xglzh42gigj2fxv87g99"
-  },
-  "stable": {
-   "version": [
-    1,
-    2
-   ],
-   "deps": [
-    "s"
-   ],
-   "commit": "6f5bd405c096ef879fed1298c09d0daa0bae5dac",
-   "sha256": "188q7jr1y872as3w32m8lf6vwl2by1ibgdk6zk7dhpcjwd0ik7x7"
-  }
- },
  {
   "ename": "goto-last-change",
   "commit": "d68945f5845e5e44fb6c11726a56acd4dc56e101",
@@ -39592,8 +39682,8 @@
     "magit-popup",
     "s"
    ],
-   "commit": "5d909f3e947adbce0482a0a00ede8654499cd28b",
-   "sha256": "122r7clj081gwxgw03d162garrjw604ynfpyzhawix0wh8hwmg9z"
+   "commit": "5cc9f67181417bb4e7fa466e14e5daff0be2075f",
+   "sha256": "1l53m0kr0f9ng2723nmkncanvbcix2ccslqm2xrmqbl638h8pvkj"
   },
   "stable": {
    "version": [
@@ -39991,11 +40081,11 @@
   "repo": "ppareit/graphviz-dot-mode",
   "unstable": {
    "version": [
-    20200203,
-    1919
+    20200304,
+    432
    ],
-   "commit": "0a4197d1c2b440db37f3e77cba01fb2c00a1a88d",
-   "sha256": "0a2p4vnchb63275j0w9fhkq1x4dkyyvaxqpyhx41zlg2zfzvcpwh"
+   "commit": "3642a0a5f41a80c8ecef7c6143d514200b80e194",
+   "sha256": "16aq9zz4dnccngk9q1k2qa0mwd63cycwrzdkvzg4nn6ikq6w7wnp"
   },
   "stable": {
    "version": [
@@ -40231,21 +40321,6 @@
    "sha256": "14c09m9p6556rrf0qfad4zsv7qxa5flamzg6fa83cxh0qfg7wjbp"
   }
  },
- {
-  "ename": "grin",
-  "commit": "855ea20024b606314f8590129259747cac0bcc97",
-  "sha256": "0rak710fp9c7wx39qn4dc9d0xfjr5w7hwklxh99v1x1ihkla9378",
-  "fetcher": "bitbucket",
-  "repo": "dariusp686/emacs-grin",
-  "unstable": {
-   "version": [
-    20110806,
-    658
-   ],
-   "commit": "f541aa22da52b8ff2f7af79bc5e4b58b9f5db8be",
-   "sha256": "0rqpgc50z86j4waijfm6kw4zjmzqfii6nnvyix4rkd4y3ryny1x2"
-  }
- },
  {
   "ename": "grip-mode",
   "commit": "de97f1c15b3ab53ca5e314b679c289705302bb64",
@@ -40254,11 +40329,11 @@
   "repo": "seagle0128/grip-mode",
   "unstable": {
    "version": [
-    20200217,
-    1151
+    20200307,
+    1433
    ],
-   "commit": "061f78d0f1699288e7abc7eaa0dd13749524464a",
-   "sha256": "0dg4aq4x2wn7mwv04nydkz773ip3n3ps7j1kw4mcrvv65m62ks9y"
+   "commit": "b6fb07217afc618f2dc1fb3569c85ae3ca9d921f",
+   "sha256": "0v90n2rpc1v7apwwlryg0v3avr708iwd092i4jw19sdv6bs6mwc2"
   },
   "stable": {
    "version": [
@@ -40421,14 +40496,14 @@
   "repo": "greduan/emacs-theme-gruvbox",
   "unstable": {
    "version": [
-    20200216,
-    2257
+    20200307,
+    1522
    ],
    "deps": [
     "autothemer"
    ],
-   "commit": "d5218aec3283d21566cb2c5619a19268743fc07e",
-   "sha256": "1cp7imprwk5vvgsfskpvjzxypq06xf5pqjhicvnyg4386ckznfib"
+   "commit": "647796a42951a807ee1694a648442b3d83057e43",
+   "sha256": "0j0w6g0pr1p90wjyrwl21y0hlvjms8ba4yw90sd89lnzn7ncscm8"
   },
   "stable": {
    "version": [
@@ -40539,14 +40614,14 @@
   "repo": "tmalsburg/guess-language.el",
   "unstable": {
    "version": [
-    20190325,
-    1436
+    20200309,
+    707
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "e64d88f287a547198e4c96e2fff543e103f2b456",
-   "sha256": "0dmbr7gylnc1dsjaldfw51nmli66lizs1w5a8p1zacpf7w5kf7x2"
+   "commit": "a0bacb4e3659db5808056e6235abc9f00570cecd",
+   "sha256": "13hqqfjwd69ycmn85rzjpr9qdjv6jvnx7dl555c934xwdlnw9c2d"
   }
  },
  {
@@ -40819,30 +40894,6 @@
    "sha256": "1s06m8bam7wlhqw0gbc443lfrz51mj05pzvbmjzqadqn4240v4jw"
   }
  },
- {
-  "ename": "hack-time-mode",
-  "commit": "6481dc9f487c5677f2baf1bffdf8f2297185345e",
-  "sha256": "0vz72ykl679a69sb0r2h9ymcr3xms7bij1w6vxndlfw5v9hg3hk5",
-  "fetcher": "gitlab",
-  "repo": "marcowahl/hack-time-mode",
-  "unstable": {
-   "version": [
-    20190827,
-    956
-   ],
-   "commit": "74465859154314228482b4f41fcda726c82c71c9",
-   "sha256": "1q9k7r09y532fcvzjkgcqnk5hdms55hrshawgxhiz3qwxxc3svsi"
-  },
-  "stable": {
-   "version": [
-    0,
-    1,
-    1
-   ],
-   "commit": "df8e86ab04beb655bf5b3860f8bea41cf1fbc3eb",
-   "sha256": "1n4kirb65r4s8k2kiga857fk8zylk14ibq0k2vdx5b8axbz71ggh"
-  }
- },
  {
   "ename": "hacker-typer",
   "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4",
@@ -41615,8 +41666,8 @@
     "helm-core",
     "popup"
    ],
-   "commit": "21e778bc8858b082ed45e3d0bb287ca9d13e101b",
-   "sha256": "14rcgdmb7vlxzkfprps2svzk8r9198fzzkkrls8cafw9zg4fimxg"
+   "commit": "fd429c68e7a73e9d398f7fe620ae16b7d6e3b0a7",
+   "sha256": "1l627nvmypx3j3qp5vkdh8vk56js2kb26na6w021np7j1wn3cjk9"
   },
   "stable": {
    "version": [
@@ -42462,14 +42513,14 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20200207,
-    1836
+    20200306,
+    1417
    ],
    "deps": [
     "async"
    ],
-   "commit": "21e778bc8858b082ed45e3d0bb287ca9d13e101b",
-   "sha256": "14rcgdmb7vlxzkfprps2svzk8r9198fzzkkrls8cafw9zg4fimxg"
+   "commit": "fd429c68e7a73e9d398f7fe620ae16b7d6e3b0a7",
+   "sha256": "1l627nvmypx3j3qp5vkdh8vk56js2kb26na6w021np7j1wn3cjk9"
   },
   "stable": {
    "version": [
@@ -43075,15 +43126,15 @@
   "repo": "emacs-helm/helm-firefox",
   "unstable": {
    "version": [
-    20161202,
-    1317
+    20200306,
+    1408
    ],
    "deps": [
     "cl-lib",
     "helm"
    ],
-   "commit": "b290734807ee68e7a7aface2af781d86e1fd5950",
-   "sha256": "02m05fy5qf5xfd5dh402pibbzwzmcfgqymqigkbdfyjbfbljl3zx"
+   "commit": "7065e01188ed17b86a7b4f01b95ace575a15eef1",
+   "sha256": "0kk7d73hcrxcnsrq803zp5lh1hyk30nahb6wdlalqvkczksgpkml"
   },
   "stable": {
    "version": [
@@ -44462,14 +44513,14 @@
   "repo": "emacs-helm/helm-org",
   "unstable": {
    "version": [
-    20191229,
-    635
+    20200311,
+    633
    ],
    "deps": [
     "helm"
    ],
-   "commit": "8457e1e46227bf87726e05c42cec5a4b51c2ef7b",
-   "sha256": "0kcjhwwi492n9m2w894hvdavfvhj45zygy7bwvx103wvpay5h6h6"
+   "commit": "b7a18dfc17e8b933956d61d68c435eee03a96c24",
+   "sha256": "0sbk8c05v28xz7mdpzrlawn5iwf3hkkr1fj8lsi861l4fhjbmcap"
   },
   "stable": {
    "version": [
@@ -45202,8 +45253,8 @@
     "helm",
     "rtags"
    ],
-   "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a",
-   "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n"
+   "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5",
+   "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x"
   },
   "stable": {
    "version": [
@@ -47319,6 +47370,30 @@
    "sha256": "1zyd6350mbah7wjz7qrwyh9pr4jpk5i1v8p7cfmdlja92fpqj9rh"
   }
  },
+ {
+  "ename": "hover",
+  "commit": "0dea54ebe452094c141e99f724a5fbfffe9381f0",
+  "sha256": "1vnxga7bbv96la2jjvh3r71j3fgaz59v81q7z5yixgn7vxrcvvc9",
+  "fetcher": "github",
+  "repo": "ericdallo/hover.el",
+  "unstable": {
+   "version": [
+    20200309,
+    1550
+   ],
+   "commit": "5d94d07b0213b45fc3b2d57362fd9bcb86a2fbe8",
+   "sha256": "1fkzlp92lqkwnld3hnfk3qywy7ssyfy03vjxxrisryhnyam9r87d"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    3
+   ],
+   "commit": "5d94d07b0213b45fc3b2d57362fd9bcb86a2fbe8",
+   "sha256": "1fkzlp92lqkwnld3hnfk3qywy7ssyfy03vjxxrisryhnyam9r87d"
+  }
+ },
  {
   "ename": "howdoi",
   "commit": "d08f4d6c8bdf16f47d2474f92273fd214179cb18",
@@ -47702,11 +47777,11 @@
   "repo": "humanoid-colors/emacs-humanoid-themes",
   "unstable": {
    "version": [
-    20200209,
-    1402
+    20200310,
+    940
    ],
-   "commit": "80eeceadc595899a7b87abccf33099c3d4a14d0a",
-   "sha256": "0ji1wxlfyjdrwkfphkn6yl3y57701a0ywqzxpjbb9k762i20qycr"
+   "commit": "57d7db70904faeeba9ccd0151e4ebf889403a40d",
+   "sha256": "0vxfq6gycgkfypyk91mwf2jg1mkldxpkd2v39j2nmlgbbw1ldaka"
   }
  },
  {
@@ -47732,11 +47807,11 @@
   "repo": "nflath/hungry-delete",
   "unstable": {
    "version": [
-    20170412,
-    102
+    20200309,
+    209
    ],
-   "commit": "0434458d3f6b2b585f332271feaa054bf4ec96d7",
-   "sha256": "04g8gdfqpzdhxf5rnl2k49f2klmzxwys79aib7xs30i0n8c8qb7d"
+   "commit": "4a341cfa3a19185c5ecb687970e299082e1144e3",
+   "sha256": "1gwksvvizz3kdpfzgwp45l1idjbrn8kz4jf0zx4fva20mh6mjz01"
   },
   "stable": {
    "version": [
@@ -47867,15 +47942,15 @@
   "repo": "abo-abo/hydra",
   "unstable": {
    "version": [
-    20200228,
-    1830
+    20200306,
+    913
    ],
    "deps": [
     "cl-lib",
     "lv"
    ],
-   "commit": "d2b921d067d7c7ea2f087b4d8edfdc37bcdf4af8",
-   "sha256": "1zsm7qhqj17wnx611rz6f917lvvj4ifz4vg4x144y8a5740pkihi"
+   "commit": "16fa8d109ec5799931a793b2e866ea9d593bee84",
+   "sha256": "1l6pi5ldmdcgv5qyg3kk1x8sxb639brzbfj0iddy5752hmg08g3h"
   },
   "stable": {
    "version": [
@@ -48036,25 +48111,25 @@
   "repo": "purcell/ibuffer-projectile",
   "unstable": {
    "version": [
-    20181202,
-    352
+    20200304,
+    2205
    ],
    "deps": [
     "projectile"
    ],
-   "commit": "76496214144687cee0b5139be2e61b1e400cac87",
-   "sha256": "0vv9xwb1qd5x8zhqmmsn1nrpd11cql9hxb7483nsdhcfwl4apqav"
+   "commit": "504b0edaa0d937ce60ccc8fdf09f2dae0a90fbaf",
+   "sha256": "18cqxnwzzbkcj9jcaw89b210432yzhrl1dwsv48p0jbhfnr17k41"
   },
   "stable": {
    "version": [
     0,
-    2
+    3
    ],
    "deps": [
     "projectile"
    ],
-   "commit": "8b225dc779088ce65b81d8d86dc5d394baa53e2e",
-   "sha256": "1zcnp61c9cp2kvns3v499hifk072rxm4rhw4pvdv2mm966vcxzvc"
+   "commit": "504b0edaa0d937ce60ccc8fdf09f2dae0a90fbaf",
+   "sha256": "18cqxnwzzbkcj9jcaw89b210432yzhrl1dwsv48p0jbhfnr17k41"
   }
  },
  {
@@ -48122,25 +48197,25 @@
   "repo": "purcell/ibuffer-vc",
   "unstable": {
    "version": [
-    20181225,
-    2227
+    20200304,
+    2207
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "64cb03887bcae6127e80f0d9342c33206e21d2d2",
-   "sha256": "1ayqa7l5ny7g01pb3917w2phnsdfw69scw3lk6bpa773pq00n2vi"
+   "commit": "1249c1e30cf11badfe032ac3b1058f24ba510ace",
+   "sha256": "1mgn7b786j4hwq1ks012hxxgvrfn5rz90adi2j190gmjz60rc5g5"
   },
   "stable": {
    "version": [
     0,
-    10
+    11
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "b2bac7aa69335933ebb2e6f34259fa96d2c8d46a",
-   "sha256": "0bqdi5w120256g74k0j4jj81x804x1gcg4dxa74w3mb6fl5xlvs8"
+   "commit": "1249c1e30cf11badfe032ac3b1058f24ba510ace",
+   "sha256": "1mgn7b786j4hwq1ks012hxxgvrfn5rz90adi2j190gmjz60rc5g5"
   }
  },
  {
@@ -48380,16 +48455,16 @@
   "repo": "DarwinAwardWinner/ido-completing-read-plus",
   "unstable": {
    "version": [
-    20200215,
-    1841
+    20200310,
+    25
    ],
    "deps": [
     "cl-lib",
     "memoize",
     "seq"
    ],
-   "commit": "46202cf953139332ea79b8904bc30166a9cc6148",
-   "sha256": "06h437hni3lh90qnxq2a489h6f312b11wfvrcj21jwbn2zxak1hb"
+   "commit": "98d3a6e56b1d3652da7b47f49f76d77f82ea80ba",
+   "sha256": "0rmqyxb0cr3avm6lzz26r2d9fmja2csrh3whmky8h2giz79mjf7d"
   },
   "stable": {
    "version": [
@@ -49176,20 +49251,20 @@
   "repo": "petergardfjall/emacs-immaterial-theme",
   "unstable": {
    "version": [
-    20200217,
-    1302
+    20200308,
+    1330
    ],
-   "commit": "a0fd571723adcfc780fd31a3a4444e1d6edbb64d",
-   "sha256": "1xby0qsbv1maqs31lkaq6h8djm08cahsxkas8q0cvnlfvgxxim1d"
+   "commit": "19c46859e041a0c0e7f40a9157a6c4d0d660f441",
+   "sha256": "0nx1g7caypnkid7bzhm4gg44cmpikpz1qz1cp11y6rlq1lwrb1d9"
   },
   "stable": {
    "version": [
     0,
-    3,
-    10
+    4,
+    2
    ],
-   "commit": "1a18584252a79553dbc3bbfd3b6612235661bad3",
-   "sha256": "1dvl52innx742pg4lls1dgx8avpg2k3kqll7x04alxkc9wk6ms73"
+   "commit": "19c46859e041a0c0e7f40a9157a6c4d0d660f441",
+   "sha256": "0nx1g7caypnkid7bzhm4gg44cmpikpz1qz1cp11y6rlq1lwrb1d9"
   }
  },
  {
@@ -49622,11 +49697,11 @@
   "repo": "nonsequitur/inf-ruby",
   "unstable": {
    "version": [
-    20200228,
-    2320
+    20200303,
+    1736
    ],
-   "commit": "fe1ea9925c6a6cfa7620fe13ea7769e264494749",
-   "sha256": "0zk4w3fwgashql8vx4ihn6zdfzn6206gklf74wn2b3k4awb9mj8b"
+   "commit": "e4ae089218bda49eb87beb2ca3593260e2fa3748",
+   "sha256": "1a3r1piljsrn2sbzkqjl6ffgygx6xjh6c7a7p85br84kq2ca4mfq"
   },
   "stable": {
    "version": [
@@ -50740,11 +50815,11 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20200229,
-    2136
+    20200311,
+    1144
    ],
-   "commit": "fcf5dcfd5796637d64164fd17956c5bc54e25612",
-   "sha256": "1hx00axmjfgc14ixj16pg7029zj7rsx2i80sw6f2bvp543l2aicq"
+   "commit": "5f1d9ce04599c52818244c2cb8cb066a601610b8",
+   "sha256": "1gsyf210jq4ij5r47k5sajpjq3z0rgihz84g6y3647k12a00biap"
   },
   "stable": {
    "version": [
@@ -50806,8 +50881,8 @@
   "repo": "wpcarro/ivy-clipmenu.el",
   "unstable": {
    "version": [
-    20200217,
-    1656
+    20200302,
+    1419
    ],
    "deps": [
     "dash",
@@ -50815,8 +50890,8 @@
     "ivy",
     "s"
    ],
-   "commit": "305ff456e700621e96b552f8e4857a7edc664518",
-   "sha256": "06pi64375bmmdal3pdhsv9j35jfizxciks9zwbvwc90k9wbgvxrf"
+   "commit": "ef25acf3f058fe1ede3a29fae2e9cdac8b08cd17",
+   "sha256": "1yzvaf95pncfi1r3xj8h6393dfvx291q3ahdwpp7qn3jh71kjx6k"
   }
  },
  {
@@ -51040,8 +51115,8 @@
     "hydra",
     "ivy"
    ],
-   "commit": "fcf5dcfd5796637d64164fd17956c5bc54e25612",
-   "sha256": "1hx00axmjfgc14ixj16pg7029zj7rsx2i80sw6f2bvp543l2aicq"
+   "commit": "5f1d9ce04599c52818244c2cb8cb066a601610b8",
+   "sha256": "1gsyf210jq4ij5r47k5sajpjq3z0rgihz84g6y3647k12a00biap"
   },
   "stable": {
    "version": [
@@ -51286,14 +51361,14 @@
   "repo": "Yevgnen/ivy-rich",
   "unstable": {
    "version": [
-    20200214,
-    504
+    20200308,
+    331
    ],
    "deps": [
     "ivy"
    ],
-   "commit": "af43abad5c87b44a46ce74d57e54cad5112c22eb",
-   "sha256": "0qa6kj88dh4vrxiyxrd7jg231hkmw7mfk96jvxqyldvsagp5ybcc"
+   "commit": "0f22aff4c7d7d01bb11561578f5fcd7a2eaa7058",
+   "sha256": "0d8q58k5j0vzq8m2z7kc597ks93hq1x98svjkqzlvnak241yzkim"
   },
   "stable": {
    "version": [
@@ -51323,8 +51398,8 @@
     "ivy",
     "rtags"
    ],
-   "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a",
-   "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n"
+   "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5",
+   "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x"
   },
   "stable": {
    "version": [
@@ -53046,19 +53121,19 @@
   "repo": "JuliaEditorSupport/julia-emacs",
   "unstable": {
    "version": [
-    20191225,
-    858
+    20200310,
+    1429
    ],
-   "commit": "5238f9adb7dd1c161fd6130435ebf0ac3755f33c",
-   "sha256": "1482wx9vhxvs1msdqmcv7hv31q57r2pkwij39rvscc3s046x61vr"
+   "commit": "b800403fada2b83bc98d6006cfd370e0cfd7876f",
+   "sha256": "1ay4wm303qh48h6g75di66w2f2smg5dnlqv40dgx4nhkyi68wrvg"
   },
   "stable": {
    "version": [
     0,
-    3
+    4
    ],
-   "commit": "d21b83db56ae74d232dc2be2cd87810c5b8a6451",
-   "sha256": "0h4v227qdd7w0caigzbgjmjh6ddjlwgcd0g7s30ac45vdwr877lc"
+   "commit": "8bfc709716a257521cb386f20b8932e83db930a9",
+   "sha256": "1w131jb9mhvyjxa0p93iwfhzidgbcs6b8i6jg79yisqb9wchik99"
   }
  },
  {
@@ -53069,14 +53144,14 @@
   "repo": "tpapp/julia-repl",
   "unstable": {
    "version": [
-    20191209,
-    1051
+    20200310,
+    1145
    ],
    "deps": [
     "s"
    ],
-   "commit": "b11a5729709c5ca541db2b6472b6579166723060",
-   "sha256": "0vb464y21jvqdkswz8hm8lm345fs811i6ns1zbwx7rz7bav4zlw5"
+   "commit": "5fa04de4e76e10d5ee37d4244f48ddae4503faa1",
+   "sha256": "1xnb3r5999ipkkvh7fl2kr0yy0j3vmnw7a6n23m9ps4fvy6hpl9n"
   },
   "stable": {
    "version": [
@@ -53106,6 +53181,50 @@
    "sha256": "182r7x7w3xnx7c54izz3rlz0khcwh7v21m89qpq99f9dvcs6273k"
   }
  },
+ {
+  "ename": "julia-snail",
+  "commit": "4b80da8bdccaa0992deb07cef7ea4a582d9707ae",
+  "sha256": "0yljiqgamm5gjr1dbzjfqvnrijhgrpjd7gj8and1w33s1d2qh8gd",
+  "fetcher": "github",
+  "repo": "gcv/julia-snail",
+  "unstable": {
+   "version": [
+    20200310,
+    2223
+   ],
+   "deps": [
+    "cl-lib",
+    "dash",
+    "julia-mode",
+    "parsec",
+    "s",
+    "spinner",
+    "vterm"
+   ],
+   "commit": "41cf7c0d14b053f93387090844d0409824f9cd45",
+   "sha256": "07brz5866qasp1yag3c81x1va4y3ffk56ka3iwgbg2j65wa4n3i5"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    0,
+    -2,
+    5
+   ],
+   "deps": [
+    "cl-lib",
+    "dash",
+    "julia-mode",
+    "parsec",
+    "s",
+    "spinner",
+    "vterm"
+   ],
+   "commit": "a614471cad3a133a00f77a7855407d506d94ce65",
+   "sha256": "01wdly6l0xkzqmqab529mhjc7mnijpv3f78cjnx0w0ak13srva93"
+  }
+ },
  {
   "ename": "jumblr",
   "commit": "b47000c35a181c03263e85e8955eb4b4c9e69e4d",
@@ -53238,8 +53357,8 @@
   "repo": "dzop/emacs-jupyter",
   "unstable": {
    "version": [
-    20191019,
-    1519
+    20200311,
+    439
    ],
    "deps": [
     "cl-lib",
@@ -53247,8 +53366,8 @@
     "websocket",
     "zmq"
    ],
-   "commit": "9e3c1633586982e278f072dfaaabd115fa4d19f7",
-   "sha256": "08aig8b2xh9yr5dqj6jivv54vc93277xffmmd3q0k5ghf4087c8n"
+   "commit": "1546a72f570c7d3a6376d211d27002b2b11ddb40",
+   "sha256": "0jm4j45qr6np6qwnx9ffvcjvbsjz79d4s57vzvlajzfgl6c879vp"
   },
   "stable": {
    "version": [
@@ -54559,14 +54678,11 @@
   "repo": "abrochard/kubel",
   "unstable": {
    "version": [
-    20200211,
-    1819
+    20200310,
+    2009
    ],
-   "deps": [
-    "transient"
-   ],
-   "commit": "fe9f51e678a8b74e1116bffd662abc3d504fc857",
-   "sha256": "1dhhpjjpxl0j18nq4h0pmkz9l55cdzd7kaxhvkr0r0mvhpa7d04m"
+   "commit": "4ba0a5f579525a9199421827221dc3786d2cc754",
+   "sha256": "17y5bslh3483q1vmc0y7lxgm7aaqxiyshkv41j9ga0c6jjrmalvl"
   },
   "stable": {
    "version": [
@@ -54588,15 +54704,15 @@
   "repo": "abrochard/kubel",
   "unstable": {
    "version": [
-    20191231,
-    1429
+    20200310,
+    1832
    ],
    "deps": [
     "evil",
     "kubel"
    ],
-   "commit": "fe9f51e678a8b74e1116bffd662abc3d504fc857",
-   "sha256": "1dhhpjjpxl0j18nq4h0pmkz9l55cdzd7kaxhvkr0r0mvhpa7d04m"
+   "commit": "4ba0a5f579525a9199421827221dc3786d2cc754",
+   "sha256": "17y5bslh3483q1vmc0y7lxgm7aaqxiyshkv41j9ga0c6jjrmalvl"
   },
   "stable": {
    "version": [
@@ -54796,11 +54912,11 @@
   "repo": "ksjogo/labburn-theme",
   "unstable": {
    "version": [
-    20200206,
-    1213
+    20200309,
+    1556
    ],
-   "commit": "ae3dafe552ab6f9d5b0760ace44555317e6c90c6",
-   "sha256": "1lx7ci0j5havhsymjr4mb4nnh71ajmviysmanjbbm6wsg470ig7r"
+   "commit": "d11537a2060df7e992217ede8f65d6c11de49458",
+   "sha256": "0aqdl3hq76r315h2h75lxgbyb7hw3hdg49n72frm1wx7hj372d0g"
   },
   "stable": {
    "version": [
@@ -55410,14 +55526,14 @@
   "repo": "DamienCassou/ledger-import",
   "unstable": {
    "version": [
-    20191126,
-    2035
+    20200302,
+    943
    ],
    "deps": [
     "ledger-mode"
    ],
-   "commit": "e32c4dd5952e3e5daa65eda5a22d508e97683409",
-   "sha256": "1p6n5vgpjmm1z6xq8f4yxf9w0r8wczlf0pa8qdfv7jmc50l58a2y"
+   "commit": "955e915fef9d46c968ef9101f7770870e2d2d80f",
+   "sha256": "018f7k4j8q1ka36winv2higjp8vmm90vss7vwyck9hg4w708m85p"
   },
   "stable": {
    "version": [
@@ -55440,11 +55556,11 @@
   "repo": "ledger/ledger-mode",
   "unstable": {
    "version": [
-    20200229,
-    1453
+    20200302,
+    334
    ],
-   "commit": "6286366e6074e048d2a997d971d4d1c350f6bc63",
-   "sha256": "1bkfmvq7a6bq3b94495cfzzlxdxdiwyjar5rn5z2hsw1dljc7380"
+   "commit": "8af289082331e40fdb6123b0145504f1c162cf09",
+   "sha256": "0i58vfcw30ryznji3pyi5lj5aclwi0h42fx7hzadrysjbvw3qscg"
   },
   "stable": {
    "version": [
@@ -55931,8 +56047,8 @@
     20180219,
     1024
    ],
-   "commit": "8eacaf88ee7ef9445c767a032177a90711cb3ff7",
-   "sha256": "1334d09qsc5clcmkh1qi6mlph158ggf1p5kpsyl48vl1knj4ia9s"
+   "commit": "d083a9f0c74830bd77b794babb09fe0f0fdb3854",
+   "sha256": "1fgd2kfwh7gl4yxrmvv8yrv6wvvwy6y0nwibqqsy55698a1qb2fm"
   },
   "stable": {
    "version": [
@@ -56200,8 +56316,8 @@
   "repo": "abo-abo/lispy",
   "unstable": {
    "version": [
-    20200227,
-    1354
+    20200305,
+    1858
    ],
    "deps": [
     "ace-window",
@@ -56210,8 +56326,8 @@
     "iedit",
     "zoutline"
    ],
-   "commit": "c1286a2b41fa1f21c4f2ecdd5ba191805e04e268",
-   "sha256": "05vq28ziqamc0sysaa4zrljac4r0nq7j6a23m2vsf7nf8ymzff1c"
+   "commit": "c7e282ae06f654bf985466ae05dedc4efc87144d",
+   "sha256": "1gw03xwjwvgvp1m2nl3wmz3y6d2q6xqpawpdfw95kn4rpw1lsh4w"
   },
   "stable": {
    "version": [
@@ -56624,8 +56740,8 @@
     20200221,
     611
    ],
-   "commit": "0048b6c4b4f948f08786f3fb06935aa3ce227368",
-   "sha256": "0mfqxjn0hhrm0w8wf7hf85g1i8b9ihnavkw870rmyfj8y8nnp8qb"
+   "commit": "70cfd34877272f132235d5ba779b883b3935dd37",
+   "sha256": "03ma0naf4yp7z60szngcazx2sbvqxam66jflkq1d16i52r1hg4bb"
   },
   "stable": {
    "version": [
@@ -57196,15 +57312,15 @@
   "repo": "emacs-lsp/lsp-haskell",
   "unstable": {
    "version": [
-    20191230,
-    1847
+    20200309,
+    2144
    ],
    "deps": [
     "haskell-mode",
     "lsp-mode"
    ],
-   "commit": "6d481f97e62b0fd2455e8f7a36429981277445b1",
-   "sha256": "0ljflzdjzsafgqqq9fdajrcm0rk4xaki2h5gbsbkgn8z65a2xh6h"
+   "commit": "582fa27c8894db888c92b5e53527b8deec82ea7f",
+   "sha256": "1jrvd8gnd7hc9xksryb35a2qzwwv7q6ncpcsb2l9ryfl5xd26i0a"
   }
  },
  {
@@ -57266,8 +57382,8 @@
     "request",
     "treemacs"
    ],
-   "commit": "dbeeee9c74db25db217059011935b882f7ec1257",
-   "sha256": "1ra16rm61xwhp583ib1ran6bv0z353qs4aag75l809kyvq9szlyg"
+   "commit": "0cea6fd5e7b163766ddf47380d655771c1b070e5",
+   "sha256": "17d5xf2dzy1lnxm6cip0gmzrw37xv362fakn05nhkq5ygl7bhpz6"
   },
   "stable": {
    "version": [
@@ -57346,8 +57462,8 @@
   "repo": "emacs-lsp/lsp-mode",
   "unstable": {
    "version": [
-    20200229,
-    1850
+    20200311,
+    612
    ],
    "deps": [
     "dash",
@@ -57358,8 +57474,8 @@
     "markdown-mode",
     "spinner"
    ],
-   "commit": "db3f7f022b6d8c509b5f5d84ff437840dc0fdaa1",
-   "sha256": "0p0fkby3i87zjjilv7pzbi1bkvr1gnrqpc4rrly2nn9pcrg5l16w"
+   "commit": "9f2333b1d5213f651af643ec5f2876bd987d7ab1",
+   "sha256": "01qnrnm2rscdc9gyld6lf3yfdyzb86rsdvjghm58nks7wbw7zb04"
   },
   "stable": {
    "version": [
@@ -57568,8 +57684,8 @@
   "repo": "emacs-lsp/lsp-ui",
   "unstable": {
    "version": [
-    20200224,
-    743
+    20200311,
+    1837
    ],
    "deps": [
     "dash",
@@ -57577,8 +57693,8 @@
     "lsp-mode",
     "markdown-mode"
    ],
-   "commit": "bf3966e87c91c5d825c483ce0883f30dd2272b62",
-   "sha256": "0wapq3472cjdr1m47isv0lg61byanpb67k7cn9iyrlqp11y2xcjp"
+   "commit": "e91d52629c8c0934c9dfa924ea44aeaebe70097d",
+   "sha256": "0yq7768jnf5i68rla8sjyic5xihywyzfs8jxqbjlrrvz2m1mjr0r"
   },
   "stable": {
    "version": [
@@ -57688,8 +57804,8 @@
     20200227,
     1301
    ],
-   "commit": "d2b921d067d7c7ea2f087b4d8edfdc37bcdf4af8",
-   "sha256": "1zsm7qhqj17wnx611rz6f917lvvj4ifz4vg4x144y8a5740pkihi"
+   "commit": "16fa8d109ec5799931a793b2e866ea9d593bee84",
+   "sha256": "1l6pi5ldmdcgv5qyg3kk1x8sxb639brzbfj0iddy5752hmg08g3h"
   },
   "stable": {
    "version": [
@@ -58000,11 +58116,11 @@
   "repo": "roadrunner1776/magik",
   "unstable": {
    "version": [
-    20200217,
-    1213
+    20200304,
+    1323
    ],
-   "commit": "c42d7c084c1b928815cd665d1e42ea29b280853e",
-   "sha256": "0kgpynkqny8rj9ly6q72fgpv07sry92dda2v6wqhwd9nr84p1nkk"
+   "commit": "e54f934952cde3f96d6a131968295d993b3cf624",
+   "sha256": "1yivbgbcy5qvs55dn5lx08mbkmsd4mriymas9jgh7rn6hl14x8hj"
   },
   "stable": {
    "version": [
@@ -58024,8 +58140,8 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20200228,
-    1207
+    20200307,
+    319
    ],
    "deps": [
     "async",
@@ -58034,8 +58150,8 @@
     "transient",
     "with-editor"
    ],
-   "commit": "c8cd22e28d20b0d7ae74102df4e35d7c0c61ebe6",
-   "sha256": "134n9m2zrf60ljm867bv92qjgk61cmgns1a3cqpvj4wflpaahnbv"
+   "commit": "1916e83aa463fee86ac1c6bcfd80d780d0544901",
+   "sha256": "1bnykbb868dna4j91kp5jzi7ab4siiy1ni228x8i50cmfm4i91in"
   },
   "stable": {
    "version": [
@@ -58362,8 +58478,8 @@
     "libgit",
     "magit"
    ],
-   "commit": "c8cd22e28d20b0d7ae74102df4e35d7c0c61ebe6",
-   "sha256": "134n9m2zrf60ljm867bv92qjgk61cmgns1a3cqpvj4wflpaahnbv"
+   "commit": "1916e83aa463fee86ac1c6bcfd80d780d0544901",
+   "sha256": "1bnykbb868dna4j91kp5jzi7ab4siiy1ni228x8i50cmfm4i91in"
   }
  },
  {
@@ -58443,14 +58559,14 @@
   "repo": "magit/magit-popup",
   "unstable": {
    "version": [
-    20200102,
-    1811
+    20200306,
+    223
    ],
    "deps": [
     "dash"
    ],
-   "commit": "df9abf1a1bce3fadb5e0657eb8f4c7026efa3c69",
-   "sha256": "1ifhph1mj7wjar62d65fjx45qsjwsyslbj7liih3v0r4by5gyxmw"
+   "commit": "f316a085b9f66804692554df46c0f4f536a45b78",
+   "sha256": "1d650wny0201vh4hmkmx290rq0b2fnlwlb8ivys7mai9d380vlwi"
   },
   "stable": {
    "version": [
@@ -58517,8 +58633,8 @@
    "deps": [
     "dash"
    ],
-   "commit": "c8cd22e28d20b0d7ae74102df4e35d7c0c61ebe6",
-   "sha256": "134n9m2zrf60ljm867bv92qjgk61cmgns1a3cqpvj4wflpaahnbv"
+   "commit": "1916e83aa463fee86ac1c6bcfd80d780d0544901",
+   "sha256": "1bnykbb868dna4j91kp5jzi7ab4siiy1ni228x8i50cmfm4i91in"
   },
   "stable": {
    "version": [
@@ -58622,8 +58738,8 @@
   "repo": "alphapapa/magit-todos",
   "unstable": {
    "version": [
-    20200204,
-    823
+    20200310,
+    28
    ],
    "deps": [
     "async",
@@ -58634,14 +58750,14 @@
     "pcre2el",
     "s"
    ],
-   "commit": "ad5663aa26fad147f1afbd878cbe21a064ba5745",
-   "sha256": "1naqyl9qy15nkjz41l8pzqy79bkm7cp5ih63ji8ycq416400pia1"
+   "commit": "a0e5d1f3c7dfcb4f18c1b0d57f1746a4872df5c6",
+   "sha256": "0v11ngxwndaylmzqm5rrvch7hsfcm15xhih13ckm6kn2skqdzh40"
   },
   "stable": {
    "version": [
     1,
     5,
-    1
+    2
    ],
    "deps": [
     "async",
@@ -58652,8 +58768,8 @@
     "pcre2el",
     "s"
    ],
-   "commit": "ad5663aa26fad147f1afbd878cbe21a064ba5745",
-   "sha256": "1naqyl9qy15nkjz41l8pzqy79bkm7cp5ih63ji8ycq416400pia1"
+   "commit": "65db450bdb766f12e5aa31ae1cecbc0716e07218",
+   "sha256": "0a4ghad93nmk4i0aq25c3g5lwxi7z327v0z10zi8yyja5daipsdp"
   }
  },
  {
@@ -58764,16 +58880,16 @@
   "repo": "ThibautVerron/magma-mode",
   "unstable": {
    "version": [
-    20181205,
-    1708
+    20200305,
+    2108
    ],
    "deps": [
     "cl-lib",
     "dash",
     "f"
    ],
-   "commit": "9b734abbdf15fddecb58dc9eed1cbc39b78be2e1",
-   "sha256": "0nmakba9gszi251z962jlggw9mbsk8jxyynangsd1yj4bdfs6sgg"
+   "commit": "7cdfa21495b20cd9e2697ea1475ca3ec69fab0b4",
+   "sha256": "1brwlbbyfb357vf0l0wf30yk9s66fhl3l2ncg840p6xpw9kk0dnc"
   }
  },
  {
@@ -58818,15 +58934,15 @@
   "repo": "jerrypnz/major-mode-hydra.el",
   "unstable": {
    "version": [
-    20191014,
-    337
+    20191030,
+    2354
    ],
    "deps": [
     "dash",
     "pretty-hydra"
    ],
-   "commit": "fd362d2be7ed80889715ed8a30a61780a18ce6ea",
-   "sha256": "0vnmvpsm46izxlh0l0p89rhy6ifzzfpzk7j3kkf2608s6dy8hgcy"
+   "commit": "20362323f66883c1336ffe70be24f91509addf54",
+   "sha256": "16krmj2lnk7j5ygdjw4hl020qqxg11bnc8sz15yr4fpy1p7hq5cz"
   },
   "stable": {
    "version": [
@@ -59655,6 +59771,21 @@
    "sha256": "0r005yap50jf6b5jc7314ds17g1nn2irn1agidi74fbrwfbndxgm"
   }
  },
+ {
+  "ename": "masm-mode",
+  "commit": "3f1961f11a811045095db15d650eae7469d8670c",
+  "sha256": "0zlc8gc0xdqgzs1ywix236wh5nfnsmab9s9x1hpfpzkg6sjzv8wr",
+  "fetcher": "github",
+  "repo": "YiGeeker/masm-mode",
+  "unstable": {
+   "version": [
+    20200308,
+    1450
+   ],
+   "commit": "626b9255c2bb967a53d1d50be0b98a1bcae3250c",
+   "sha256": "1k6wcksddy0k02hrqfaifr61c09pg6kpcqpmfm9zkb444pdqjn17"
+  }
+ },
  {
   "ename": "mastodon",
   "commit": "809d963b69b154325faaf61e54ca87b94c1c9a90",
@@ -60066,11 +60197,11 @@
   "repo": "techquila/melancholy-theme",
   "unstable": {
    "version": [
-    20190620,
-    1001
+    20200305,
+    133
    ],
-   "commit": "3140860d0b310b6ff51b0df11de992cd65135692",
-   "sha256": "1hp2ndbiqlb1p86m437r34rvrzsy8ag0bzvkiz4zf5rgvm8y48sk"
+   "commit": "ffed56cb756f8acba93ce7edc664c950d75927d9",
+   "sha256": "1wcvd68dm453rvhjm89vv2faljgyszwyc4g95q7ydvhk3h1gck2p"
   }
  },
  {
@@ -60225,8 +60356,8 @@
     20191025,
     851
    ],
-   "commit": "077385b3f9f3050678963d47c56e18aecc9f8b28",
-   "sha256": "1p926jsajhn10679gbsj0lgmfvz8q5mxx0w326qni7y9mmrxvsni"
+   "commit": "a3eb8ce9a52d48cb521eb2c01297fd224ccf25ee",
+   "sha256": "0i8nxaqb2icw0arbjin23p1ah6p9v4dbvrdr7sak3fm7hxv1v7yi"
   },
   "stable": {
    "version": [
@@ -60403,17 +60534,17 @@
     20191018,
     242
    ],
-   "commit": "4fa095ff8416d1759ffd9cbd01d667cff386bbb5",
-   "sha256": "171fsvzk0msvz1052034g60prf40w6qdkglg560v73iika8x2k4s"
+   "commit": "0177fc4e7edd705db59b82c83a24db51dc405890",
+   "sha256": "1whl7kz4im2jmdz99336wfn152q0l3qwii4w7sn45rlsm2sijiw1"
   },
   "stable": {
    "version": [
     1,
     1,
-    5
+    8
    ],
-   "commit": "2e28cf362b7e4a8b6a5bbaf60983a72e19798c8b",
-   "sha256": "0lal6d4a4pbni1xl3g1gb3rnmyz2kym9r1mhb2n14awqqxxg7l3q"
+   "commit": "0177fc4e7edd705db59b82c83a24db51dc405890",
+   "sha256": "1whl7kz4im2jmdz99336wfn152q0l3qwii4w7sn45rlsm2sijiw1"
   }
  },
  {
@@ -60434,6 +60565,21 @@
    "sha256": "1jy07b1am1g4hwiwywmi9iyidv3yp933j2y4f9nmfhpb4yjs193y"
   }
  },
+ {
+  "ename": "metronome",
+  "commit": "2f77239fecb41487a6aa03e6fc219cba96dee18d",
+  "sha256": "1kkm7s6hiyk3h1bnf9pfnsikmfpp998041wg0bwqnpzhzzlq6fy4",
+  "fetcher": "gitlab",
+  "repo": "jagrg/metronome",
+  "unstable": {
+   "version": [
+    20200309,
+    1918
+   ],
+   "commit": "ab9478da0da3aadba26c65beba938c3928c823c3",
+   "sha256": "0qrjyn2qc5k5a6gz1m1izx315sy7dd0cdzgiyrwp8za39gkhgbl7"
+  }
+ },
  {
   "ename": "mew",
   "commit": "362dfc4d0fdb3e5cb39564160de62c3440ce182e",
@@ -60687,25 +60833,25 @@
   "repo": "kiennq/emacs-mini-modeline",
   "unstable": {
    "version": [
-    20200131,
-    312
+    20200309,
+    413
    ],
    "deps": [
     "dash"
    ],
-   "commit": "8762d2ec5de2994f05a2a11f505d0963eb28e59e",
-   "sha256": "0dc9frairj081g326b64mddr3knpxhwvmn19w7m1ckmxbv7lg0in"
+   "commit": "4d97bf35cf0f9d58b14d13a78172c15463820382",
+   "sha256": "0cqzqrc8wpxav08fx9n1ljpzf97hj3wdhizywj4avnyxj3g63zwi"
   },
   "stable": {
    "version": [
-    20200131,
-    312
+    20200308,
+    730
    ],
    "deps": [
     "dash"
    ],
-   "commit": "8762d2ec5de2994f05a2a11f505d0963eb28e59e",
-   "sha256": "0dc9frairj081g326b64mddr3knpxhwvmn19w7m1ckmxbv7lg0in"
+   "commit": "aece47d83b4fe24942eb9a3f748f60c3c0f69a56",
+   "sha256": "18inykf5wx767kkqjjc5bzdy8rqyqg0y7q2r6lxxmph06mbw1wva"
   }
  },
  {
@@ -60925,17 +61071,17 @@
  },
  {
   "ename": "minsk-theme",
-  "commit": "36546342769ce5b6487a9b9ca3ec48bc81b6c880",
-  "sha256": "0cxwrc8nw7kkpc3z2pa7qmkyamsbsnfs93ybflv3z1wzp6z9q1b8",
+  "commit": "2f78d25a094cfa5d5a6dad2f0c6d051138b8744b",
+  "sha256": "1sf93ycd6a1p4xf1bhgjbqd4y38v1b4qgf0mh6pag2xz93jr7lw5",
   "fetcher": "github",
   "repo": "jlpaca/minsk-theme",
   "unstable": {
    "version": [
-    20200102,
-    1829
+    20200306,
+    1220
    ],
-   "commit": "2ad8e88530fb0b66b5798ff8d692144691c93891",
-   "sha256": "16fyqw79vfdklzibqc0j78d6ws77naxz7yj1iahp3wcwqlwln545"
+   "commit": "d1e04ca03aadb942dc4bee82f44848c3ce52b25c",
+   "sha256": "1yrjmyh8a0xqijyg16v20iqh13s7j4pf410f0214a4m9lp07pxpx"
   }
  },
  {
@@ -60985,11 +61131,11 @@
   "repo": "jabranham/mixed-pitch",
   "unstable": {
    "version": [
-    20191023,
-    1025
+    20200310,
+    130
    ],
-   "commit": "fbc566ace3ed7508dab6bec90ba185f21c829aab",
-   "sha256": "0175w364alym0qvvqlsgmy0j100pzdx5j1ck07hif3k5bs69q22i"
+   "commit": "60907165f118648d658572c578f9fd642bd42beb",
+   "sha256": "0icflm968n89p6kayy8rxm5sll4pxqlnk5pfqq648y3zg273lfk6"
   },
   "stable": {
    "version": [
@@ -61384,20 +61530,20 @@
   "repo": "protesilaos/modus-themes",
   "unstable": {
    "version": [
-    20200228,
-    1019
+    20200311,
+    1733
    ],
-   "commit": "e1b2d0a6235c26ce9e8ca7085393eeff20408378",
-   "sha256": "0cjbvqnw2xhvrzihzywbb5x568vrmxwmrq2rzdm1bw2596ycrnd3"
+   "commit": "23c67bcb185951e3d9e4b90669e5c1ea4c80c7ba",
+   "sha256": "120v3m9ljcsznbmqdl4c5blv4ry3qckrqk2p917dk3z21zbll05q"
   },
   "stable": {
    "version": [
     0,
-    4,
+    6,
     0
    ],
-   "commit": "ed89fbe217fc1a754d9de5f3e6b22b43fca284af",
-   "sha256": "0c4y3y9mjf6x2b9087fk6nkxvgvm9f5l1p2vdwqny80vp4krsb8r"
+   "commit": "a9d1ae86522f158eea2410571ec992775e04b284",
+   "sha256": "15z6qq0b0npp7hscmh04i3mi10bynzdy52fv2b160nji264zvcwa"
   }
  },
  {
@@ -61408,20 +61554,20 @@
   "repo": "protesilaos/modus-themes",
   "unstable": {
    "version": [
-    20200228,
-    1019
+    20200311,
+    1733
    ],
-   "commit": "e1b2d0a6235c26ce9e8ca7085393eeff20408378",
-   "sha256": "0cjbvqnw2xhvrzihzywbb5x568vrmxwmrq2rzdm1bw2596ycrnd3"
+   "commit": "23c67bcb185951e3d9e4b90669e5c1ea4c80c7ba",
+   "sha256": "120v3m9ljcsznbmqdl4c5blv4ry3qckrqk2p917dk3z21zbll05q"
   },
   "stable": {
    "version": [
     0,
-    4,
+    6,
     0
    ],
-   "commit": "ed89fbe217fc1a754d9de5f3e6b22b43fca284af",
-   "sha256": "0c4y3y9mjf6x2b9087fk6nkxvgvm9f5l1p2vdwqny80vp4krsb8r"
+   "commit": "a9d1ae86522f158eea2410571ec992775e04b284",
+   "sha256": "15z6qq0b0npp7hscmh04i3mi10bynzdy52fv2b160nji264zvcwa"
   }
  },
  {
@@ -61918,11 +62064,11 @@
   "repo": "wyuenho/move-dup",
   "unstable": {
    "version": [
-    20190408,
-    1246
+    20200311,
+    1424
    ],
-   "commit": "19f1c075d939084279b190c38412b4cfda96840d",
-   "sha256": "0rb9x00dygf0v5xk6gljdn0lvkgzyl129b5i4jpxz0ylccckd0xn"
+   "commit": "7a384e0e0889e07a9a81d007d8ccc654c7c89bd2",
+   "sha256": "040xg9bbficz300zqrnvk68b76ljnif9sdiag03hp61xqpzxmacm"
   },
   "stable": {
    "version": [
@@ -62459,14 +62605,14 @@
   "repo": "agpchil/mu4e-maildirs-extension",
   "unstable": {
    "version": [
-    20180606,
-    812
+    20200302,
+    1228
    ],
    "deps": [
     "dash"
    ],
-   "commit": "3ef4c48516be66e73d24fe764aadbcfc126b7964",
-   "sha256": "04nf947sxkir3gni67jc5djhywkmay1l8cqkicayimrh3vd5cy05"
+   "commit": "bd81c3e1c1f690b124937960acd2a819e9a2483e",
+   "sha256": "0v6aih6gqzg631kpqrqgkj8nw6d7i5ih2qnmraf3i29m5y6gqync"
   },
   "stable": {
    "version": [
@@ -64093,8 +64239,8 @@
     20181024,
     1439
    ],
-   "commit": "2ca4c711f77d9cb95e3698de70d07823f4baa256",
-   "sha256": "1g53dfs7dycihh98lsril6b57v5mfkqhicy74d3jpkyny7zpshaz"
+   "commit": "1f3cc7b7207309c441ce5bf120b57081bbea0c18",
+   "sha256": "1y19f8qqd5bvkrpr3b8d18ff8qdi4j0fgha4dkb7zgjhi0rb9nb7"
   },
   "stable": {
    "version": [
@@ -64347,8 +64493,8 @@
   "repo": "dickmao/nnhackernews",
   "unstable": {
    "version": [
-    20200225,
-    1605
+    20200310,
+    855
    ],
    "deps": [
     "anaphora",
@@ -64356,8 +64502,8 @@
     "dash-functional",
     "request"
    ],
-   "commit": "2fbe9052d93fa7b8fca107aa0dfaebbdf734c95c",
-   "sha256": "0c09hdr79i701gjalav6vj9k7qp8w5ln4s3ji2hk6z03fqpf7g91"
+   "commit": "ac896a7becd1dcfded728a36ce13cf7dcd823e04",
+   "sha256": "02gv1kc46aa7sbalh02sphaq50kgi055803cnxjbjvlqhlmwc2cw"
   }
  },
  {
@@ -64383,8 +64529,8 @@
   "repo": "dickmao/nnreddit",
   "unstable": {
    "version": [
-    20200225,
-    1558
+    20200301,
+    1930
    ],
    "deps": [
     "anaphora",
@@ -64393,8 +64539,8 @@
     "request",
     "virtualenvwrapper"
    ],
-   "commit": "13c6bc1db743f047a952d023be6c2b982a0e95bf",
-   "sha256": "13qzgvpngja3cd9fkarx7scsvna97fz79snai3ap4qfy5d9gqyqh"
+   "commit": "a7e6a3b93949da0a1cf91318ce8bd8cf5cfb2216",
+   "sha256": "0mcj4bdzhin9ibp3m6rrhqh54a2n07ck25djka3apqyd16dvx2y2"
   }
  },
  {
@@ -64420,14 +64566,14 @@
   "repo": "emacscollective/no-littering",
   "unstable": {
    "version": [
-    20200123,
-    1753
+    20200309,
+    533
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "14ed8ed2a2d8ae700ce1889d76bc4588d22549b1",
-   "sha256": "0gdnvvlrakyi1xpvlxr55k0rjnb6fprrc7pwjzpl79j87srrj9k0"
+   "commit": "05ef102cffd2f32061eacf2d379663122257f5b1",
+   "sha256": "0c75arxqb8p3bp1nasfcwy32al4ys3jv68q48dnc2addvjmld42g"
   },
   "stable": {
    "version": [
@@ -66224,14 +66370,14 @@
   "repo": "clemera/objed",
   "unstable": {
    "version": [
-    20200107,
-    1319
+    20200311,
+    1229
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "8dc17701d1dc65b5d2113e7ca406136bf612bc9e",
-   "sha256": "1ly7lkv27n7dp8q25w5yk8a69vqzmxp72ln329j7ik13rjyhj1dc"
+   "commit": "31c5dedd265ac3cdb0636460325ea9f7e1a26f60",
+   "sha256": "0gb71fzycmrqg0gyl2ahf2w82gapazrb6ddbk6wvylsaaf5ml217"
   },
   "stable": {
    "version": [
@@ -66442,26 +66588,26 @@
   "repo": "oer/oer-reveal",
   "unstable": {
    "version": [
-    20200124,
-    1310
+    20200308,
+    1805
    ],
    "deps": [
     "org-re-reveal"
    ],
-   "commit": "64235b073c47baf7f1d7909706875c42a7f6da3d",
-   "sha256": "124f98q8bcd832wsdkmzm3rjmmhpqyf8z5ddx841j6p68ds8066r"
+   "commit": "9313251afc74536792f90423b3189180c632e1e4",
+   "sha256": "0dk151cy5fng75inknq4g24qvh9q0fzyak77qdkip3lsy670vlg1"
   },
   "stable": {
    "version": [
     2,
-    2,
-    0
+    4,
+    1
    ],
    "deps": [
     "org-re-reveal"
    ],
-   "commit": "64235b073c47baf7f1d7909706875c42a7f6da3d",
-   "sha256": "124f98q8bcd832wsdkmzm3rjmmhpqyf8z5ddx841j6p68ds8066r"
+   "commit": "9313251afc74536792f90423b3189180c632e1e4",
+   "sha256": "0dk151cy5fng75inknq4g24qvh9q0fzyak77qdkip3lsy670vlg1"
   }
  },
  {
@@ -66524,20 +66670,20 @@
   "repo": "rnkn/olivetti",
   "unstable": {
    "version": [
-    20200212,
-    1439
+    20200311,
+    527
    ],
-   "commit": "4b113151308c1214e8e70a7846558dad9c918859",
-   "sha256": "0cb06dy22897nx0wakar24frdhg5865icj25a2wb198br8r094ik"
+   "commit": "67e32a7754cda4c8d94227e80bfa708abb4e8e6d",
+   "sha256": "0928kn9yfwc2mhmja13y39iswlkk474xnszh9qza206j6r37h6p3"
   },
   "stable": {
    "version": [
     1,
     9,
-    2
+    3
    ],
-   "commit": "4b113151308c1214e8e70a7846558dad9c918859",
-   "sha256": "0cb06dy22897nx0wakar24frdhg5865icj25a2wb198br8r094ik"
+   "commit": "67e32a7754cda4c8d94227e80bfa708abb4e8e6d",
+   "sha256": "0928kn9yfwc2mhmja13y39iswlkk474xnszh9qza206j6r37h6p3"
   }
  },
  {
@@ -66587,30 +66733,30 @@
   "repo": "AdrieanKhisbe/omni-log.el",
   "unstable": {
    "version": [
-    20170930,
-    1235
+    20200304,
+    2229
    ],
    "deps": [
     "dash",
     "ht",
     "s"
    ],
-   "commit": "11e959473c1bd9415d0cda785940c36ba6ad44ab",
-   "sha256": "081vq3wzl8w9yz1356np6h27d7yi5j8i3va9sc2flfwylmw1y9gr"
+   "commit": "0a240660ccdd0b6588b4e3c322743b5ab1161338",
+   "sha256": "0xbrwj7zsqx91p28l3dknlhr3y5cj6lah6h5x1s9l9kmfz850dcp"
   },
   "stable": {
    "version": [
     0,
-    3,
-    6
+    4,
+    0
    ],
    "deps": [
     "dash",
     "ht",
     "s"
    ],
-   "commit": "20021eb788cbeec0371145468430b259686f519d",
-   "sha256": "1sf2zbhjaz5b9xmz6632338cga7d326ibgw8b8c6c6b4vk16yhqc"
+   "commit": "0a240660ccdd0b6588b4e3c322743b5ab1161338",
+   "sha256": "0xbrwj7zsqx91p28l3dknlhr3y5cj6lah6h5x1s9l9kmfz850dcp"
   }
  },
  {
@@ -66621,8 +66767,8 @@
   "repo": "AdrieanKhisbe/omni-quotes.el",
   "unstable": {
    "version": [
-    20170425,
-    1832
+    20200304,
+    2341
    ],
    "deps": [
     "dash",
@@ -66631,14 +66777,14 @@
     "omni-log",
     "s"
    ],
-   "commit": "454116c1dd6581baaeefd6b9310b1b6b7a5c36d0",
-   "sha256": "1h8lrpi5wizi5vncdz83cxlx7c71xw3sw89sfg462zfbz2sq8afl"
+   "commit": "cfc7b7f01628a5d57384820d1096de4541e67cdf",
+   "sha256": "1bv45gdyzycapi9q69h3339308qxwgjzj5rgr3f927vl4xm18kfb"
   },
   "stable": {
    "version": [
     0,
     5,
-    0
+    1
    ],
    "deps": [
     "dash",
@@ -66647,8 +66793,8 @@
     "omni-log",
     "s"
    ],
-   "commit": "454116c1dd6581baaeefd6b9310b1b6b7a5c36d0",
-   "sha256": "1h8lrpi5wizi5vncdz83cxlx7c71xw3sw89sfg462zfbz2sq8afl"
+   "commit": "cfc7b7f01628a5d57384820d1096de4541e67cdf",
+   "sha256": "1bv45gdyzycapi9q69h3339308qxwgjzj5rgr3f927vl4xm18kfb"
   }
  },
  {
@@ -67753,14 +67899,14 @@
   "repo": "abo-abo/org-download",
   "unstable": {
    "version": [
-    20200211,
-    1541
+    20200311,
+    1049
    ],
    "deps": [
     "async"
    ],
-   "commit": "3c4810279334d487c76fb5e23e6e6cd098ccd6ac",
-   "sha256": "1xc98xbkrj56gp3njmbqnkvkigbgqjqfyiacrnqf9fkznwvjhrrp"
+   "commit": "b96fd7ba02cbdae95cc37970ebcfae8afa8b25d2",
+   "sha256": "1fx621ll5kjw10n2xhba7h39m1cqvink61kyhb228p6h8cl63kss"
   },
   "stable": {
    "version": [
@@ -68252,11 +68398,11 @@
   "repo": "bastibe/org-journal",
   "unstable": {
    "version": [
-    20200227,
-    1830
+    20200311,
+    710
    ],
-   "commit": "271b99f5ec4fa45fdf546713a9c3f55543e9cbb9",
-   "sha256": "1ayqxcfbs3mcygwjyx93lclpp1dhqaq35v7bl8739d59i0drsyhq"
+   "commit": "664c08e12cde19ce7dca645ba9accecda7266c32",
+   "sha256": "02gla6cs8w08jg8czl5855vxvs1jyxq839rh9f95d40x4jgc1rwy"
   },
   "stable": {
    "version": [
@@ -68535,14 +68681,14 @@
   "repo": "jeremy-compostella/org-msg",
   "unstable": {
    "version": [
-    20200221,
-    25
+    20200303,
+    1716
    ],
    "deps": [
     "htmlize"
    ],
-   "commit": "4278cf11735a2890e22acf6d34c632dd64a2e5a4",
-   "sha256": "1fyr5z441bncgnazwgbpfk5bd4k5p9nh525sfdxzw6w8s26i8pnw"
+   "commit": "2f521a89b106750ebafa94503cdeb043a02c5ab5",
+   "sha256": "1wr8qdkf75swf4jfqbv0r2hw7d5bw73nyyv7xa0msbc1hyw33b6l"
   }
  },
  {
@@ -68945,11 +69091,11 @@
   "repo": "marcowahl/org-pretty-tags",
   "unstable": {
    "version": [
-    20200124,
-    2002
+    20200303,
+    2201
    ],
-   "commit": "f52744ab69a9077450c84b80475147d7c435f4bb",
-   "sha256": "1nycdawb065c8cakmlfpcqpkyij0kv1c940mi49ps2k58nz4554x"
+   "commit": "40fd72f3e701e31813f383fb429d30bb88cee769",
+   "sha256": "0d80cbkdq1d8cqc5nv732gzw4k6m2dpjjix3ycfyf27m4wkbwhmc"
   },
   "stable": {
    "version": [
@@ -69081,8 +69227,8 @@
   "repo": "alphapapa/org-ql",
   "unstable": {
    "version": [
-    20200228,
-    203
+    20200309,
+    2240
    ],
    "deps": [
     "dash",
@@ -69097,8 +69243,8 @@
     "transient",
     "ts"
    ],
-   "commit": "fc91bdd4836a026ae5b5df18ed133f85cf3ff138",
-   "sha256": "1li9x44zd63s4xvhhimvnq6nd995hyhdrzybcxhvyr1qbqgnga5i"
+   "commit": "1688774dddae45b7b77420d01c0eb56d76dd0c95",
+   "sha256": "12pwi4sd4lfrgbzrj91cq2d9kp5ql0c2nqda7x6x94x9z1h5xfh8"
   },
   "stable": {
    "version": [
@@ -69204,8 +69350,8 @@
     "htmlize",
     "org"
    ],
-   "commit": "14df7542f2a675f65501962e344e03d798cf0d39",
-   "sha256": "1mc01v257884pdsw37dghgddyyy6v6rd9cmnnpq45xvd5ibz1vaf"
+   "commit": "e4460a98b6bfa01720c287a171252f49c1949801",
+   "sha256": "0hhwc6yfy69qwiyxca8r12rdxvrj44vzdsnvdk0yc9szsfnmn4hz"
   },
   "stable": {
    "version": [
@@ -69316,8 +69462,8 @@
   "repo": "jkitchin/org-ref",
   "unstable": {
    "version": [
-    20200225,
-    246
+    20200309,
+    1231
    ],
    "deps": [
     "dash",
@@ -69331,8 +69477,8 @@
     "pdf-tools",
     "s"
    ],
-   "commit": "caca18f8eeae213c2719e628949df70910f7d3c7",
-   "sha256": "0w31xjyyn2122c7n3s3rs64wgmhb82q49hqsy48m7ynkm9x9a0jq"
+   "commit": "e3eb9215a540ba62a0b0253d003c704b7740deeb",
+   "sha256": "152wzlavx5b4ap9wdl3dql5idvsjl5zq6zjwcilp9pni6dn34w12"
   },
   "stable": {
    "version": [
@@ -69527,8 +69673,8 @@
   "repo": "alphapapa/org-sidebar",
   "unstable": {
    "version": [
-    20191012,
-    514
+    20200310,
+    35
    ],
    "deps": [
     "dash",
@@ -69538,13 +69684,13 @@
     "org-super-agenda",
     "s"
    ],
-   "commit": "b5eff7195718e6a70a42d36e48800632080aab0c",
-   "sha256": "138hbcmkxmmdcagdv438946cr4qkwklqqwf2b1khi8gimnnivsxm"
+   "commit": "41b914c7bdc5a12c9289b134822bdfea0889ac9e",
+   "sha256": "1mggpxbzprmmbkiv3xklw1saafsi153n4spr4l0m59lgm4gpymgj"
   },
   "stable": {
    "version": [
     0,
-    2
+    3
    ],
    "deps": [
     "dash",
@@ -69554,8 +69700,8 @@
     "org-super-agenda",
     "s"
    ],
-   "commit": "9634320a6f9ab919119e08a14853c31387f38ce3",
-   "sha256": "106h06vjfbqfj761vbxwymd6612ds8c6fk053yzgbrqzm3hn2c03"
+   "commit": "41b914c7bdc5a12c9289b134822bdfea0889ac9e",
+   "sha256": "1mggpxbzprmmbkiv3xklw1saafsi153n4spr4l0m59lgm4gpymgj"
   }
  },
  {
@@ -69726,8 +69872,8 @@
   "repo": "alphapapa/org-super-agenda",
   "unstable": {
    "version": [
-    20200129,
-    16
+    20200310,
+    1337
    ],
    "deps": [
     "dash",
@@ -69736,8 +69882,8 @@
     "s",
     "ts"
    ],
-   "commit": "ab9c335f9738853c52aae9b946f50e8b6c46a1e0",
-   "sha256": "1l1k7jbn1n1qp5q5h174sdwpqhh8l5zbg9flk1pwaxzq88103gy5"
+   "commit": "dd0d104c269fab9ebe5af7009bc1dd2a3a8f3c12",
+   "sha256": "0kx9sikk7c3j0zp3a31kj8zv2kjxqjhhl25n7c7nslf2fp5w2d8b"
   },
   "stable": {
    "version": [
@@ -69755,6 +69901,36 @@
    "sha256": "1ghwap34y4gvwssqv3sfqa8wn9jh6pawc7xnkhm1qxmvs53gxbg6"
   }
  },
+ {
+  "ename": "org-superstar",
+  "commit": "1e49a3cc1006f271ce53f03717b0484a4fd89957",
+  "sha256": "0rbmrdc7ghcwk5y4jkgf7axwknck85l4xl03kwbkmnac0w98zzlj",
+  "fetcher": "github",
+  "repo": "integral-dw/org-superstar-mode",
+  "unstable": {
+   "version": [
+    20200311,
+    1848
+   ],
+   "deps": [
+    "org"
+   ],
+   "commit": "715a9681d31968807df349280f96932f1a986f37",
+   "sha256": "0klq0khb59hmkwhay0dln5zhii8mbk3d7rn7rddixrrh5x5ghrlv"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    0
+   ],
+   "deps": [
+    "org"
+   ],
+   "commit": "2f9f9d6b21cb54c2ce6af15ab0e3c73e2b962d78",
+   "sha256": "0q6180qwjpha10zsiw0ni6lanyjwlj8141a6qivfcs8nwczz7nvz"
+  }
+ },
  {
   "ename": "org-sync",
   "commit": "923ddbaf1a158caac5e666a396a8dc66969d204a",
@@ -70332,8 +70508,8 @@
   "repo": "org2blog/org2blog",
   "unstable": {
    "version": [
-    20200301,
-    501
+    20200303,
+    418
    ],
    "deps": [
     "htmlize",
@@ -70341,14 +70517,14 @@
     "metaweblog",
     "xml-rpc"
    ],
-   "commit": "4fa095ff8416d1759ffd9cbd01d667cff386bbb5",
-   "sha256": "171fsvzk0msvz1052034g60prf40w6qdkglg560v73iika8x2k4s"
+   "commit": "0177fc4e7edd705db59b82c83a24db51dc405890",
+   "sha256": "1whl7kz4im2jmdz99336wfn152q0l3qwii4w7sn45rlsm2sijiw1"
   },
   "stable": {
    "version": [
     1,
     1,
-    5
+    8
    ],
    "deps": [
     "htmlize",
@@ -70356,8 +70532,8 @@
     "metaweblog",
     "xml-rpc"
    ],
-   "commit": "2e28cf362b7e4a8b6a5bbaf60983a72e19798c8b",
-   "sha256": "0lal6d4a4pbni1xl3g1gb3rnmyz2kym9r1mhb2n14awqqxxg7l3q"
+   "commit": "0177fc4e7edd705db59b82c83a24db51dc405890",
+   "sha256": "1whl7kz4im2jmdz99336wfn152q0l3qwii4w7sn45rlsm2sijiw1"
   }
  },
  {
@@ -70501,11 +70677,11 @@
   "repo": "kostafey/organic-green-theme",
   "unstable": {
    "version": [
-    20191125,
-    1630
+    20200301,
+    1916
    ],
-   "commit": "15746df5f3af5ee308cd4f546ef229eef2d825ac",
-   "sha256": "100axl6ajddfw23lr98k8b05zrd4hajcq68mi90vddqbn06mk577"
+   "commit": "9374259e1b22d68f30a1f5376052ab09dbad606d",
+   "sha256": "13jpfn4sjsw0lssrq0n75085j2g41ppmwky5mq0nyv8j0c0mmqpk"
   }
  },
  {
@@ -70896,11 +71072,11 @@
   "repo": "purcell/osx-location",
   "unstable": {
    "version": [
-    20150613,
-    917
+    20200304,
+    2209
    ],
-   "commit": "8bb3a94cc9f04b922d2d730fe08596cc6ee12bf2",
-   "sha256": "09hjcpmh0fxhsx63vcaz05w94xcc8q35vgffggjqaybs7hyzlx69"
+   "commit": "18fcc306caa575c5afdeaf091aa1a9b003daa52a",
+   "sha256": "0n59mf0qx78d4qb071qgbvd50vzkn3xffwgxjwjv90193h99qdnj"
   },
   "stable": {
    "version": [
@@ -71483,14 +71659,14 @@
   "repo": "kaushalmodi/ox-hugo",
   "unstable": {
    "version": [
-    20200122,
-    2049
+    20200305,
+    1413
    ],
    "deps": [
     "org"
    ],
-   "commit": "16f1b0c9a9e01bdc3582284f570be5fd70004e03",
-   "sha256": "0z6cz93kcr7h3yag36m58mmncp6klyalqprj4ifpk9wj3802yyyi"
+   "commit": "1c1e3ec46785d93f4de2e71fc32604bd7c0fed40",
+   "sha256": "1cgwpj9x10z6y9ykbma39xakzisly5jhp5pkdiwrc5zq5psr2ddx"
   },
   "stable": {
    "version": [
@@ -71794,14 +71970,14 @@
   "repo": "yjwen/org-reveal",
   "unstable": {
    "version": [
-    20200216,
-    1516
+    20200304,
+    937
    ],
    "deps": [
     "org"
    ],
-   "commit": "aafedfd8052d1ac4b0ddf946b3258a3b5ae5bbbe",
-   "sha256": "1hiidlagr7y3l22xwk4nd7m6c83j2vlhyijb0hmw89casfsdixbj"
+   "commit": "0d947cbce655cadb035e3b5da0fa2af8c228d69b",
+   "sha256": "1sf8qdih1fbzhsyvkf8grmfsglvrgim0ww14ww01w9xnr02fkb0g"
   }
  },
  {
@@ -71867,14 +72043,14 @@
   "repo": "balddotcat/ox-slimhtml",
   "unstable": {
    "version": [
-    20181219,
-    850
+    20200302,
+    728
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "a5070cb2c67425aa33da8503c83361e8814a86ec",
-   "sha256": "13adpcgsd4153yd0097iady2dy6pa9w02rp97whkl4hjmhdik71i"
+   "commit": "6f774398d189430593c93e503bf0f3cd0e8bcc25",
+   "sha256": "12axvwqadv0qlvnzrvbi85p94c10r5w6f3gixck0cbz7p8qz678r"
   },
   "stable": {
    "version": [
@@ -72226,15 +72402,15 @@
   "repo": "purcell/package-lint",
   "unstable": {
    "version": [
-    20200226,
-    2001
+    20200309,
+    1953
    ],
    "deps": [
     "cl-lib",
     "let-alist"
    ],
-   "commit": "78d0cdbe63d142801cbd046871353ae0455dad33",
-   "sha256": "0ghq8sg3jgidr1srdrl1cighsdvk314an3l2w56ak0ss99h6q28a"
+   "commit": "5cfa10041a467ca122f5bda31119a5904d574631",
+   "sha256": "0vnswz9dgzd0i2h6qs8i2nccrcd4pxnbqir4qnhz7nsbhdrvccj6"
   },
   "stable": {
    "version": [
@@ -72263,8 +72439,8 @@
    "deps": [
     "package-lint"
    ],
-   "commit": "78d0cdbe63d142801cbd046871353ae0455dad33",
-   "sha256": "0ghq8sg3jgidr1srdrl1cighsdvk314an3l2w56ak0ss99h6q28a"
+   "commit": "5cfa10041a467ca122f5bda31119a5904d574631",
+   "sha256": "0vnswz9dgzd0i2h6qs8i2nccrcd4pxnbqir4qnhz7nsbhdrvccj6"
   },
   "stable": {
    "version": [
@@ -72430,11 +72606,11 @@
   "repo": "purcell/page-break-lines",
   "unstable": {
    "version": [
-    20200121,
-    837
+    20200305,
+    244
    ],
-   "commit": "6fb993a42059b58d1a0219006f2d61ebd3b2c9e6",
-   "sha256": "09crppxqc0d2bdr1pb7k24mhbax5ibdcgd1mw7ybvifakgvfwbkf"
+   "commit": "314b397910b3d16bb7cbcc25098696348e678080",
+   "sha256": "106w2n01i9d6z2r43lwwrm7hlppi9bkf8g8nsqd91f0f06921plw"
   },
   "stable": {
    "version": [
@@ -72537,16 +72713,16 @@
   "repo": "abo-abo/pamparam",
   "unstable": {
    "version": [
-    20200228,
-    1902
+    20200309,
+    1703
    ],
    "deps": [
     "hydra",
     "lispy",
     "worf"
    ],
-   "commit": "21ceadbf95cc49202e2704ba9704a5784230efd8",
-   "sha256": "0n7ia4fpp3lgdmf7m0q1lqqnkbpw24bdk1apjvacwjlpy4gsqy2z"
+   "commit": "ed730f17074cb12a8fb9a0daa852d1abbfb34372",
+   "sha256": "0shzsgs5ds4lzw1fv13vdphbhxyqad5s7jwk5zqa5wg42sidxq3r"
   }
  },
  {
@@ -72619,15 +72795,15 @@
   "repo": "joostkremers/pandoc-mode",
   "unstable": {
    "version": [
-    20200219,
-    2243
+    20200303,
+    2322
    ],
    "deps": [
     "dash",
     "hydra"
    ],
-   "commit": "7e417a670cff080650f2c1153dd9c50fc4ac8a48",
-   "sha256": "0jd2avxzidfac5nz9xk405jpb3rba9bq2cw6acdz7wj37lnxxnh7"
+   "commit": "befd7be704d6dbe3dba69da761fc62e0609c9366",
+   "sha256": "0c621viqjss1ynzgcb81afck9rl1lwadzq68vas4gb2zjb5dd06h"
   },
   "stable": {
    "version": [
@@ -72745,14 +72921,14 @@
   "repo": "ajgrf/parchment",
   "unstable": {
    "version": [
-    20200221,
-    1702
+    20200308,
+    1727
    ],
    "deps": [
     "autothemer"
    ],
-   "commit": "206dfc8e459971b0d5795ef5da4f1f737020eeab",
-   "sha256": "097vs3792054jczsk8jy6dhwqqlfvfgfshg3bhlzyiwzcd5x98dw"
+   "commit": "1aa8cd5e3673c1c55941afa61cbf7a7a45474078",
+   "sha256": "1s95d2pzivq52ci4disnfr95knh0kdr0jqi0br8c8zaxys3p43c8"
   },
   "stable": {
    "version": [
@@ -73006,11 +73182,11 @@
   "repo": "joostkremers/parsebib",
   "unstable": {
    "version": [
-    20190126,
-    901
+    20200303,
+    2324
    ],
-   "commit": "1357cb0e5916dfe63477d92f16c863a4c5e67b0e",
-   "sha256": "09b24j074dwawfm3b379m948f9pv859qsnrmz8k9qx97ls4jjmbw"
+   "commit": "6537b4d2a8cf34455b769b95dfd65de6a4a0e1d3",
+   "sha256": "1gy5rqnfnyhfa44vxy7qqqh7xada1d1gg34msczcalhhy6lm59if"
   },
   "stable": {
    "version": [
@@ -73192,35 +73368,6 @@
    "sha256": "1jg2rs010fmw10ld0bfl6x7af3v9yqfy9ga5ixmam3qpilc8c4fw"
   }
  },
- {
-  "ename": "passthword",
-  "commit": "a52b516b7b10bdada2f64499c8f43f85a236f254",
-  "sha256": "19zv80kidb6a3985n3zij507hvffcxhcvlfxd01gwx64wvfc0c3c",
-  "fetcher": "gitlab",
-  "repo": "pidu/passthword",
-  "unstable": {
-   "version": [
-    20141201,
-    923
-   ],
-   "deps": [
-    "cl-lib"
-   ],
-   "commit": "30bace842eaaa6b48cb2251fb84868ebca0467d6",
-   "sha256": "0yckh61v9a798gpyk8x2z9990h3b61lwsw0kish571pygfyqhjkq"
-  },
-  "stable": {
-   "version": [
-    1,
-    4
-   ],
-   "deps": [
-    "cl-lib"
-   ],
-   "commit": "58a91defdbeec9014b4e46f909a7411b3a627285",
-   "sha256": "1g0mvg9i8f2qccb4b0m4d74zkjx9gjfv47x57by6cdaf9yywqryi"
-  }
- },
  {
   "ename": "password-generator",
   "commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -73833,11 +73980,11 @@
   "repo": "jeremy-compostella/pdfgrep",
   "unstable": {
    "version": [
-    20200124,
-    2236
+    20200306,
+    209
    ],
-   "commit": "e250376d97fc5240e07d81108bbca9b5a9ab50f4",
-   "sha256": "17yqvvgkgxmcl8nc0mb9yaz884zcdnz7dwvfi4mxjzp1l05fvwjk"
+   "commit": "1576fc98754d3bdaa40573a037a80f1973110756",
+   "sha256": "1c3p3vdhy6wibxwpc76bvvm0583zmjmxs9pa453z3msbq33kc7j8"
   }
  },
  {
@@ -74209,25 +74356,25 @@
   "repo": "nex3/perspective-el",
   "unstable": {
    "version": [
-    20200224,
-    2013
+    20200310,
+    1730
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "d415c154fa59f1a85c4f2812d21ba29bb39677b8",
-   "sha256": "07ncr5jmn5lrmxdc0c6dw92cqkasc8yivjn9q4ri0wy08zfh298i"
+   "commit": "21877375d718e57d5e10808f06f78ba0c4d420c8",
+   "sha256": "0a1s1ygxday0602xk5dg19v1wjmz8dm4ajiwiflvyhqas4wcv9j2"
   },
   "stable": {
    "version": [
     2,
-    3
+    5
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "1ba7e2ddc37df4f453e7d8cffccc13981af658b1",
-   "sha256": "0v13dljkspx01w88q7nb7dcjni1blp5682wpvlvpx3phnfyjqs5g"
+   "commit": "21877375d718e57d5e10808f06f78ba0c4d420c8",
+   "sha256": "0a1s1ygxday0602xk5dg19v1wjmz8dm4ajiwiflvyhqas4wcv9j2"
   }
  },
  {
@@ -74838,8 +74985,8 @@
     20200122,
     1256
    ],
-   "commit": "6744215d82ce9e82416d83e5b27fb9bac9e8d461",
-   "sha256": "0hbm881w84nm4g67085xzikz422vkb08y98hfk2n3kqmznvp8i51"
+   "commit": "a1c30ca634107551c20c846b5316ca5697adb06d",
+   "sha256": "0b7rnzk1zkrzh978bmh2dsy78f0sb4ia1w06khyqiby52m27q9k1"
   },
   "stable": {
    "version": [
@@ -76253,14 +76400,14 @@
   "repo": "polymode/poly-org",
   "unstable": {
    "version": [
-    20190605,
-    2103
+    20200304,
+    1057
    ],
    "deps": [
     "polymode"
    ],
-   "commit": "8b0de75b1f9b65c22f7e3fbc205c9408214c8a1f",
-   "sha256": "04x6apjad4kg30456z1j4ipp64yjgkcaim6hqr6bb0rmrianqhck"
+   "commit": "9f89c1f590f616e2cd93df4f441cd1e9818cc7ac",
+   "sha256": "0r5vlvz2kinblxnzpshxa6mww3al4kwj8gy19hzrq3gj9jpr4ymb"
   },
   "stable": {
    "version": [
@@ -76391,11 +76538,11 @@
   "repo": "polymode/polymode",
   "unstable": {
    "version": [
-    20191208,
-    1239
+    20200307,
+    1519
    ],
-   "commit": "9eb9dce9c9a1d8c92e837818f576463c5bcf8952",
-   "sha256": "1ygwcq435nb8ndw4flf220psgvz93gxypdqgvgbfd4s2ad9yx1vw"
+   "commit": "44601aace1e9cef9b89379cc7b4e2144cca60b6a",
+   "sha256": "0wl2lc5niq89axbxi2frls2iq0ns6pmdqdaknnppgrasvfjxfwj3"
   },
   "stable": {
    "version": [
@@ -76827,11 +76974,11 @@
   "repo": "tumashu/posframe",
   "unstable": {
    "version": [
-    20200226,
-    241
+    20200304,
+    631
    ],
-   "commit": "8a9af547e6fc63e9a1c4741349fabdf625f703c4",
-   "sha256": "03n5sbyh0acrmpwc69d834lrxxfybxgjn0lg7iphwfdv11xkf3g4"
+   "commit": "4ff106ed5c6e3dc9ddba7e158c7ae9085a43b0bc",
+   "sha256": "1468g9n1dxnsws31zvzm9y6sfcpxx24qj24jmsv7x6r4qk00bq29"
   },
   "stable": {
    "version": [
@@ -77198,7 +77345,7 @@
   "unstable": {
    "version": [
     20190930,
-    2105
+    2106
    ],
    "deps": [
     "dash",
@@ -77206,8 +77353,8 @@
     "hydra",
     "s"
    ],
-   "commit": "fd362d2be7ed80889715ed8a30a61780a18ce6ea",
-   "sha256": "0vnmvpsm46izxlh0l0p89rhy6ifzzfpzk7j3kkf2608s6dy8hgcy"
+   "commit": "20362323f66883c1336ffe70be24f91509addf54",
+   "sha256": "16krmj2lnk7j5ygdjw4hl020qqxg11bnc8sz15yr4fpy1p7hq5cz"
   },
   "stable": {
    "version": [
@@ -77293,8 +77440,8 @@
    "deps": [
     "dash"
    ],
-   "commit": "5782653a7e58fa2ba26feb3c1ea34a81761da7b0",
-   "sha256": "0cdqgnrqmwk4wm8xc3kppm8zvccv2qalckfi4k1w847s91q60zv5"
+   "commit": "a9bb7ec3dcf83b4352f2a68134b6fd1d4977b27f",
+   "sha256": "04awq9h795ji90bp7z1d9cmg9s2sjx32snbzyp81gb55z02abihd"
   },
   "stable": {
    "version": [
@@ -77700,14 +77847,14 @@
   "repo": "bbatsov/projectile",
   "unstable": {
    "version": [
-    20200206,
-    1749
+    20200307,
+    1701
    ],
    "deps": [
     "pkg-info"
    ],
-   "commit": "341150c0e77c63075f53e346dae87a4c60ea3b5b",
-   "sha256": "1kywmyckgf8swjbnzc2vcbpsqhrdnxcqaxwwwxwdkapy640nnslv"
+   "commit": "588692ad56395ed4fd072bac496b33992096bfe4",
+   "sha256": "1dysdh4nwxxz6yqimy65ssyvkyki0lk8j0v120csh9igb97ryy6v"
   },
   "stable": {
    "version": [
@@ -78152,11 +78299,11 @@
   "repo": "ProofGeneral/PG",
   "unstable": {
    "version": [
-    20200206,
-    1448
+    20200302,
+    1348
    ],
-   "commit": "2a17093f6a7b168fedabc623602edec35aef8d8a",
-   "sha256": "0pm7hv3c88mpmbi3xsmlqqffxvphnh2cslm2rpqbgffk5kp98ach"
+   "commit": "f737203ced2446ec54be7b31b21c47e731404e12",
+   "sha256": "1fg2siway0gz2b6sq9klijmi3pb6vg54s638d02yzs32340a2qsf"
   },
   "stable": {
    "version": [
@@ -78223,11 +78370,11 @@
   "repo": "ksjogo/proportional",
   "unstable": {
    "version": [
-    20200206,
-    1211
+    20200309,
+    1556
    ],
-   "commit": "4c20c876b93b9b5d82931dabb42396d5ff471f50",
-   "sha256": "1sck0kjzlr5rcbclj9whrwz7lxik7is9av7ai720hzrlv0yvqgmq"
+   "commit": "0e4537af7ba2bc9dbb449c38350bce012b382f51",
+   "sha256": "0k4kwmyja5nb6rmbbq71vzxw7nnxr0w8f9vzws14an28niwr4s8p"
   }
  },
  {
@@ -78259,8 +78406,8 @@
     20170526,
     1650
    ],
-   "commit": "4ff0fb841cfb8c6850613094d55bf51448dfd16b",
-   "sha256": "15wlrzz93wfpk7fkpl3n1vqvrlj8swxg9zjflja4dgn7sgy9f5bv"
+   "commit": "94b39efdf70de21bc757dc2aceaf5ed36c6535a3",
+   "sha256": "0mrkzh3cikcg2wddz9hla79pc5isjifcqx025radcc6m0jmg7hjv"
   },
   "stable": {
    "version": [
@@ -79083,8 +79230,8 @@
   "repo": "tumashu/pyim",
   "unstable": {
    "version": [
-    20200228,
-    645
+    20200311,
+    637
    ],
    "deps": [
     "async",
@@ -79092,8 +79239,8 @@
     "pyim-basedict",
     "xr"
    ],
-   "commit": "99e04546a5cc05b17866f83a7dd26163e3d7ee59",
-   "sha256": "0hx7qph91jxzip9n0xqfx2zc2f9mwmgkgp8jrj943dindcrbrfy0"
+   "commit": "61f33ac62bbfb8c5e4b757d6f880286fbced5bdf",
+   "sha256": "1pq83b67mwj4b1wyxkpqd66cw8w3wm0x6w030wxqz03qg94gdi3d"
   },
   "stable": {
    "version": [
@@ -79238,8 +79385,8 @@
     20170402,
     1255
    ],
-   "commit": "fb38afb55a6f27f17c113589c406b527dfa5c332",
-   "sha256": "04n9qyi1gnr6wfk6k2q8q6f0zz02lg9v9bbwrvr6jj976vaz4mfa"
+   "commit": "47ec7e7a2937c78136c560b458bc2467bee2acd9",
+   "sha256": "01sn57g8za6w89vyg7vyfh8v1jj32f329macfjlvgkamqrpmyj4q"
   }
  },
  {
@@ -79604,15 +79751,15 @@
   "repo": "pythonic-emacs/pythonic",
   "unstable": {
    "version": [
-    20191021,
-    811
+    20200304,
+    1901
    ],
    "deps": [
     "f",
     "s"
    ],
-   "commit": "ba9af8ce302579a2b2097b867a35a9fc0bc4bceb",
-   "sha256": "1q43ngd0nj5j9aca71qi0ss137kp46klr6xdlm8ghy55ppym2g5i"
+   "commit": "f577f155fb0c6e57b3ff82447ac25dcb3ca0080f",
+   "sha256": "10faqkfbr7n1zlbrs9c9slm2f7wr2liav8r367s00bw3vb2vm8nb"
   },
   "stable": {
    "version": [
@@ -79827,11 +79974,11 @@
   "repo": "quelpa/quelpa",
   "unstable": {
    "version": [
-    20200129,
-    743
+    20200304,
+    1835
    ],
-   "commit": "e7283c5e79197288ff4b875315816d49df6404e5",
-   "sha256": "0g1r03iaw0i803wlh3adicxb7p8lkl1hv1x7afp5fv7chmp0fp4i"
+   "commit": "497c281fce65c671aa2bfe780aea5dff4f097d13",
+   "sha256": "05k096qky4hn9m27gv3pri95mhn57m0vl8lp8phz5br9gm1isp9h"
   }
  },
  {
@@ -79842,15 +79989,15 @@
   "repo": "quelpa/quelpa-use-package",
   "unstable": {
    "version": [
-    20190210,
-    1838
+    20200307,
+    805
    ],
    "deps": [
     "quelpa",
     "use-package"
    ],
-   "commit": "207c285966382a1f33681f6ac2d7778d4b21cb21",
-   "sha256": "01hzxfy8l1aqlfyj01p0b6pdzlm2vbc5r00skamx6id3s6qg1d9i"
+   "commit": "00ce667293c7cd5dc79d4b6077785fcc57455775",
+   "sha256": "1xxvfd0ijcz01nsd143xgzsp815x3qpsrk6dmw6j1w3gbr2iqh9z"
   }
  },
  {
@@ -80740,8 +80887,8 @@
     "loc-changes",
     "test-simple"
    ],
-   "commit": "2cca776d28c4d6ebef033758ef01f2af2e9b3b96",
-   "sha256": "0jinap8v2491za6bxsdq0i68jifbnrwzrn8rcl3v861zdkax0sa7"
+   "commit": "94f283593304c2f673cb4940900197d9cb099faa",
+   "sha256": "00dzw6nqqsgdlcvpnq1zc2568l5hz7vynqx6vkvvbj3jafc6nwj7"
   },
   "stable": {
    "version": [
@@ -81433,11 +81580,11 @@
   "repo": "purcell/reformatter.el",
   "unstable": {
    "version": [
-    20191103,
-    357
+    20200304,
+    2250
    ],
-   "commit": "6c5e7f64c5ac1178dff5ca28d9809c08398fb3e6",
-   "sha256": "01qsd8fdwmxn2513jhhdg5jwh7wy0nchwnnz0k3srhjlk41qady1"
+   "commit": "af393979570b801263bd57d7f136dc5bfd1106d1",
+   "sha256": "04ikh7rmm2rs3wjzgl8b0jgpp49kwafffix942av3bmcd4dw3a4d"
   },
   "stable": {
    "version": [
@@ -81679,16 +81826,16 @@
   "repo": "mtekman/remind-bindings.el",
   "unstable": {
    "version": [
-    20200224,
-    1037
+    20200301,
+    2213
    ],
    "deps": [
     "map",
     "omni-quotes",
     "popwin"
    ],
-   "commit": "be4c34a52711d9f942994ec3fc0ee27e4aaa7c3f",
-   "sha256": "03gz7ca4486j58mrjr16akwwy9d9190fl3cv82hx849h48rabavf"
+   "commit": "730b6d7b30e397f8f11a6d3d5c269df21a33c450",
+   "sha256": "16fk0xnp5awsq45i0wpdkzy6hwccayvwwiag9kar8kmb6nqs2y17"
   }
  },
  {
@@ -82303,17 +82450,16 @@
   "repo": "dajva/rg.el",
   "unstable": {
    "version": [
-    20191230,
-    943
+    20200307,
+    1623
    ],
    "deps": [
-    "cl-lib",
     "s",
     "transient",
     "wgrep"
    ],
-   "commit": "ed638db439e5010d1968a6ce904b7c21383506e8",
-   "sha256": "1qm26d6ra5d30rk62rik56gsndi35xi01pmjdkm2afbs1n1707ix"
+   "commit": "e19c06f4c556bda6457da3d50c14b12cb97679d9",
+   "sha256": "0k9rz6as3867b23979lrmb0sn26rbl08n6n71pxqxr8s85nljlml"
   },
   "stable": {
    "version": [
@@ -82885,8 +83031,8 @@
     20200221,
     36
    ],
-   "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a",
-   "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n"
+   "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5",
+   "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x"
   },
   "stable": {
    "version": [
@@ -82905,14 +83051,14 @@
   "repo": "Andersbakken/rtags",
   "unstable": {
    "version": [
-    20200130,
-    1624
+    20200310,
+    1909
    ],
    "deps": [
     "rtags"
    ],
-   "commit": "3d025d9c97359442f7190ec42a63ff7e5fd85a9a",
-   "sha256": "1c8llhbhvrv5kwmci7rlsjqv3gr4gxi45g6c21fqrblyhas95s3n"
+   "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5",
+   "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x"
   },
   "stable": {
    "version": [
@@ -83146,11 +83292,11 @@
   "repo": "purcell/ruby-hash-syntax",
   "unstable": {
    "version": [
-    20190109,
-    2227
+    20200304,
+    2214
    ],
-   "commit": "577ab383c142e3a0697ce73480158a8b489038da",
-   "sha256": "06hm4pl3mzlyx4d3v94rm2w33q9wnwpdl7qas3fnks691d9apg7x"
+   "commit": "d64036278dcfb4fa0603e6697142e02c2876f634",
+   "sha256": "02s494r9iy47jd74cd0z1dz1igh8rw2jbyybahy9pivmcn7fnqkr"
   },
   "stable": {
    "version": [
@@ -83383,11 +83529,11 @@
   "repo": "rust-lang/rust-mode",
   "unstable": {
    "version": [
-    20200229,
-    1547
+    20200303,
+    932
    ],
-   "commit": "86650056717be0661feae32e294ff991c087ed4d",
-   "sha256": "0m7cribk9xfmgil103491mwi0z9ykg19pn3qifdg4i80bs0h8xhj"
+   "commit": "eb5270bc1cef48d30f33c2a312bff0638a9ff821",
+   "sha256": "1iip9qhcr3rzvpns71l44vwmm80n5ccldc8zw48xl2ghlxpk2r08"
   },
   "stable": {
    "version": [
@@ -83430,8 +83576,8 @@
   "repo": "brotzeit/rustic",
   "unstable": {
    "version": [
-    20200226,
-    1915
+    20200304,
+    2028
    ],
    "deps": [
     "dash",
@@ -83445,8 +83591,8 @@
     "spinner",
     "xterm-color"
    ],
-   "commit": "99396915c78556f4ad0da8caf9cb2a269582c39f",
-   "sha256": "0azr2kv77amr60ms64c2366sn9ak7959krz4whjl4wsdsd5rhqy4"
+   "commit": "61032eacf0b3b7579f627ce78bca2eddbfa31a10",
+   "sha256": "0mxrmgdhgjlixff1fm7fyn87yn3cakhyjk8vdhdr37k0qh339k0c"
   }
  },
  {
@@ -83890,8 +84036,8 @@
     20190413,
     1246
    ],
-   "commit": "5696d0703583d3d53b34683bbc59d3b1cb284a78",
-   "sha256": "1kkcqdnphvmiwvcvr2balqpszcf87bjy9la682w9b846g53pgmin"
+   "commit": "cc2dfa14eb3922d93c15f30734e8211c77ceada1",
+   "sha256": "11n26dksppjylg5jafxf4j859n6c1062v85qci8fx762wicz0bkf"
   }
  },
  {
@@ -85430,8 +85576,8 @@
     20190930,
     730
    ],
-   "commit": "6eda3828bb8530ecd69a3823bd5569a5f779c239",
-   "sha256": "0ij85i0zy9wi1cgm0j8cvqpv9802kfy7g4ffx381l7k28m35lqh2"
+   "commit": "03ea43b1f1c648968fe1109fb5c50febcf9e154d",
+   "sha256": "1v194qzgxq5r34xaqgky1ir2bikaphv8csnxlgwbkggzpxnlwqi0"
   }
  },
  {
@@ -85727,11 +85873,11 @@
   "repo": "riscy/shx-for-emacs",
   "unstable": {
    "version": [
-    20200203,
-    41
+    20200308,
+    2356
    ],
-   "commit": "e90dccf40320ee0df306cab3f94fdb79504698b5",
-   "sha256": "0g4w5w53pknphxr7i7kwksq1789qi8rk8yk9gp4s788iq1f0i6vr"
+   "commit": "0fec00c1eef75feeae0f71591762ba6a80bc2725",
+   "sha256": "0zl5lcy80m1pzwl4239lhcf0zb6px5jwbgjib136zh94l5k35wdb"
   },
   "stable": {
    "version": [
@@ -85781,20 +85927,20 @@
   "repo": "rnkn/side-notes",
   "unstable": {
    "version": [
-    20191217,
-    919
+    20200311,
+    547
    ],
-   "commit": "6f01a16919f3efadfe628cfd9405426b539bebad",
-   "sha256": "1m280zp44bxly1r1y217i9rx4j3hzgy7zqzy0p7afiyy26n6jl46"
+   "commit": "f78d7ba1173cf6056a95935add30cd30b7a7d347",
+   "sha256": "0fv1l3vrm50qbxs0dc1qyy1m3i08w46lh3z6nz8p32va5yjwfjmj"
   },
   "stable": {
    "version": [
     0,
-    2,
+    3,
     1
    ],
-   "commit": "96c4677ba4dc91c8100c93d3af6f165c21db3e05",
-   "sha256": "1gway2ljpi1ac0ssy9r11pvy50j6c5y10wfs4bizlqhzdpjfinh2"
+   "commit": "f78d7ba1173cf6056a95935add30cd30b7a7d347",
+   "sha256": "0fv1l3vrm50qbxs0dc1qyy1m3i08w46lh3z6nz8p32va5yjwfjmj"
   }
  },
  {
@@ -85839,21 +85985,6 @@
    "sha256": "1gzfdk3ks56h8q4xk69aaxkhkg9jhs55iqdicyvq7x9wmjn6b7xw"
   }
  },
- {
-  "ename": "signature",
-  "commit": "a52b516b7b10bdada2f64499c8f43f85a236f254",
-  "sha256": "0y5xspcsjap662n1gp882kjripiz90wwbhsq27c0qwl1zcx5rrkj",
-  "fetcher": "gitlab",
-  "repo": "pidu/signature",
-  "unstable": {
-   "version": [
-    20140730,
-    1949
-   ],
-   "commit": "c47df2e1189a84505f9224aa78e87b6c65d13d37",
-   "sha256": "1g4rr7hpy9r3y4vdpv48xpmy8kqvs4j64kvnhnj2rw2wv1grw78j"
-  }
- },
  {
   "ename": "silkworm-theme",
   "commit": "9451d247693c3e991f79315868c73808c0a664d4",
@@ -86213,15 +86344,15 @@
   "repo": "skeeto/skewer-mode",
   "unstable": {
    "version": [
-    20200103,
-    2247
+    20200304,
+    1142
    ],
    "deps": [
     "js2-mode",
     "simple-httpd"
    ],
-   "commit": "123215dd9bfa67ce5cc49cd52dd54c0ba7c7e02c",
-   "sha256": "0in27qfkshy84m0iyy2vfvvlapawxhxxpi2jzpqq6sps40kax4xh"
+   "commit": "e5bed351939c92a1f788f78398583c2f83f1bb3c",
+   "sha256": "07fv33arh77kdfglg6yv28gvryh0z7ddxylhdyr5plvvglpbwi88"
   },
   "stable": {
    "version": [
@@ -86411,15 +86542,15 @@
   "repo": "anwyn/slime-company",
   "unstable": {
    "version": [
-    20190117,
-    1538
+    20200304,
+    1107
    ],
    "deps": [
     "company",
     "slime"
    ],
-   "commit": "7290cbad711a62f76c28e5638d1a4d77197a358c",
-   "sha256": "0kslq8kq8dc192bpiaalyqisv3841h3dxy1wxk8hw3nyyww08mgx"
+   "commit": "e9153e42ec8f2089ea129ce24488dd3b5e0b9e47",
+   "sha256": "1dz8q9fjiip2xnw64cim0p5adbpc4lbljdiqjc5dq7bhwpff07jl"
   },
   "stable": {
    "version": [
@@ -86628,15 +86759,15 @@
   "repo": "mmgeorge/sly-asdf",
   "unstable": {
    "version": [
-    20200217,
-    2332
+    20200306,
+    433
    ],
    "deps": [
     "popup",
     "sly"
    ],
-   "commit": "feb25636fb729a08c92e8ba801fae5382f2668e3",
-   "sha256": "1j73s7xhlys97mwcnm4dpgfhdg7pf5nv2xqiz67fdbpdxwd4s6wj"
+   "commit": "32ce14994e8faee9321605cec36d156b02996c46",
+   "sha256": "09x8l37wwqw74xc2frwzbfdb1if8rb3szg5akdk3v2qhik4sm3dd"
   },
   "stable": {
    "version": [
@@ -87736,14 +87867,14 @@
   "repo": "bbatsov/solarized-emacs",
   "unstable": {
    "version": [
-    20200113,
-    37
+    20200309,
+    2116
    ],
    "deps": [
     "dash"
    ],
-   "commit": "b51d4f43fa5b814fd2de1f9348888c733af89b1c",
-   "sha256": "1jh6x447br0zdglazy58a6j1gbngi3x7750v6cwzzrrfiz9cb4h6"
+   "commit": "8de268144ab2171896906c8553be7763d5c45fa5",
+   "sha256": "1z19axaaipia56c9b4nvw4wlcr89wapnwza2gc3mdph3jkwwfjfl"
   },
   "stable": {
    "version": [
@@ -87815,6 +87946,26 @@
    "sha256": "06zqs7p22h1jkm3zs1i16wvch6rnzzb3m8d5r9r51clzpasf6zy8"
   }
  },
+ {
+  "ename": "somafm",
+  "commit": "6003d09cefb7da19baa39b6c4a96d265844abbce",
+  "sha256": "1p3ngn8rfbwvgfnpx4x6g5wspicxh9mmvlsrbax6a7whx0y1bg4f",
+  "fetcher": "github",
+  "repo": "artenator/somafm.el",
+  "unstable": {
+   "version": [
+    20200224,
+    48
+   ],
+   "deps": [
+    "cl-lib",
+    "dash",
+    "request"
+   ],
+   "commit": "b143b5c6161e3760f42a7a5405f5f7e97079e09a",
+   "sha256": "01ak3sr2hp2mmn81j1qdgyvrm9np979fpg2ngbnijnb8ai3gn30f"
+  }
+ },
  {
   "ename": "sonic-pi",
   "commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -88849,14 +89000,14 @@
   "repo": "purcell/sqlformat",
   "unstable": {
    "version": [
-    20190420,
-    2256
+    20200303,
+    802
    ],
    "deps": [
     "reformatter"
    ],
-   "commit": "f7f46be6f06b83642c312151f3b5276f8830d9d7",
-   "sha256": "00z60y08likwqfd27ibvzhy62qs29i4d4y4vq3p3slx43rfdgvxs"
+   "commit": "f18a0bb425a5052022af699df322ba90e6d65e20",
+   "sha256": "10sqq8k27p4fhhwrlq5p1283wrkykkx76fmp4806jiqh4617932f"
   },
   "stable": {
    "version": [
@@ -89089,11 +89240,11 @@
   "repo": "cjohansson/emacs-ssh-deploy",
   "unstable": {
    "version": [
-    20190917,
-    530
+    20200306,
+    1012
    ],
-   "commit": "93a0e189a06d49b03627c65fe77652bee9f129d4",
-   "sha256": "1ijmnn3f6ymm04fbp6xmsvc1nrxgcj0k90462ffyl6adbzv4f82a"
+   "commit": "1bb2f821d4a78d483c147759348a29531486cdc4",
+   "sha256": "1d79lgl7082fkawl08qlykc7x75whdikk899fv5shbbrwp7hq3l3"
   },
   "stable": {
    "version": [
@@ -89353,16 +89504,16 @@
     20171130,
     1559
    ],
-   "commit": "b505a5f524c9c92cf9f055a7038d19bb168bdfa8",
-   "sha256": "161mxajfl8rqik3cpapblngwwh7hwl8b6rym3rydcbya8i38015a"
+   "commit": "af37d392baa6f2e7445e9f714da743fd10153adf",
+   "sha256": "0bc34ri3d90fcjsin5nvli3ncqrh8x9iw8rhzdrwsbr9ildmr1ib"
   },
   "stable": {
    "version": [
     0,
-    21
+    22
    ],
-   "commit": "ce4e2a7493ce77f86d94afb1fbe9539baa337c02",
-   "sha256": "16gwdad18rc9bivyzrjccp83iccmqr45fp2zawycmrfp2ancffc7"
+   "commit": "9acc95666619699d4cdf0526305155407081d8de",
+   "sha256": "0rhdgakd4vc0549m6zjwcmsnvh2i3mbv5laks25wnfmsxr8dwqns"
   }
  },
  {
@@ -89942,14 +90093,14 @@
   "repo": "aaronbieber/sunshine.el",
   "unstable": {
    "version": [
-    20190905,
-    1832
+    20200306,
+    1711
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "5e57899b2201dd36ae7242aa13ca82efcded3b7c",
-   "sha256": "1l7mls11k9v524c2f4d2xk6b8gydl5mgrpjf7vnngwz63mdy263n"
+   "commit": "88256223539edcfe57017778a997a474c9c022f6",
+   "sha256": "01kgf0w9lqprkgi0ag5zmgd9s07yj51vdfj7jbz8sws60996x8xx"
   }
  },
  {
@@ -90315,14 +90466,14 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20200227,
-    1405
+    20200309,
+    2017
    ],
    "deps": [
     "ivy"
    ],
-   "commit": "fcf5dcfd5796637d64164fd17956c5bc54e25612",
-   "sha256": "1hx00axmjfgc14ixj16pg7029zj7rsx2i80sw6f2bvp543l2aicq"
+   "commit": "5f1d9ce04599c52818244c2cb8cb066a601610b8",
+   "sha256": "1gsyf210jq4ij5r47k5sajpjq3z0rgihz84g6y3647k12a00biap"
   },
   "stable": {
    "version": [
@@ -90865,11 +91016,11 @@
   "repo": "jabranham/system-packages",
   "unstable": {
    "version": [
-    20200227,
-    1741
+    20200310,
+    34
    ],
-   "commit": "c6fa6650202300265fbeb82db7d2223ab98951bc",
-   "sha256": "1b8ksr15bfmmmcq4d1vhpwd6sljsh1hpal21140z4hvplll35n1y"
+   "commit": "cf64fdbbb066b6ddfcbd91f778433125d8c16abc",
+   "sha256": "0ajp8zpml47anv1wdj2qx8l0paq5qsxvgmj2kiyhdh1qilxvfl3y"
   },
   "stable": {
    "version": [
@@ -91200,11 +91351,11 @@
   "repo": "11111000000/tao-theme-emacs",
   "unstable": {
    "version": [
-    20191120,
-    327
+    20200306,
+    1306
    ],
-   "commit": "d5b9693fcabf2281319acaf09e685e3eedf27e8f",
-   "sha256": "1spwnhff3mlhi5ffqfz7fyy8d5wq4qk7q57ba7p7wxq6i08mwbms"
+   "commit": "20d38a10b9d9cc49fdf99b99a39f2b03a1f077d6",
+   "sha256": "1g04j5j5w69qr59r9mlv50859bmfirrivlp01li14a0jy8jymcxv"
   },
   "stable": {
    "version": [
@@ -91424,14 +91575,14 @@
   "repo": "zevlg/telega.el",
   "unstable": {
    "version": [
-    20200226,
-    1557
+    20200311,
+    1602
    ],
    "deps": [
     "visual-fill-column"
    ],
-   "commit": "ee6f2a278b5f198cc6bf3d08b74e5ad2fffd6f05",
-   "sha256": "0q8x007p4888j1ljvh92wf012vdkiayawlqd43vhxmakl3zbgaq4"
+   "commit": "4697b363f3633e98528d7cfc1e237a9236feb106",
+   "sha256": "0dzf28w6ivrzfsy3wglq34mm44vs4148f5r0hjp695xdlz1hv7wa"
   },
   "stable": {
    "version": [
@@ -92434,18 +92585,18 @@
     20200212,
     1903
    ],
-   "commit": "9a0b5eebf6a21a1941b56d4b27c0c90f37626c8a",
-   "sha256": "0daj7c6bz286dc1gdgjh0zhb0qvzjxm4qsjscig447m61hjjjbzj"
+   "commit": "483ed864d69f307e9e3b9dadec048216100c0757",
+   "sha256": "024jm8xvnmi4z3a5801sd3kdvabfk9zk8kfqrxbp0n5jnrmbbm51"
   },
   "stable": {
    "version": [
     2020,
-    2,
-    24,
+    3,
+    9,
     0
    ],
-   "commit": "e67ec8ea5cb8c5e6213b0c00b12a242ac31db8f9",
-   "sha256": "15if11riz19vq33jnsc497ya99fflpksshp2zrf5q24l8pq9lz3g"
+   "commit": "2ece938967751345394c81381efeea4e3165570f",
+   "sha256": "15wzhpd1djzviq9r46srzbrwj8zdfmwg7ca9zjm86nff0asv6i01"
   }
  },
  {
@@ -92525,8 +92676,8 @@
   "repo": "ananthakumaran/tide",
   "unstable": {
    "version": [
-    20200111,
-    1236
+    20200308,
+    259
    ],
    "deps": [
     "cl-lib",
@@ -92535,8 +92686,8 @@
     "s",
     "typescript-mode"
    ],
-   "commit": "fd79540360dc8cc96f4a9cfc92d1d51f96fd2b28",
-   "sha256": "0zjs30gi0sqgr6qlvmzq5xcwjd4prni8zn38bd2qxr79r62s1sw7"
+   "commit": "10e5c19de798aba2d57fb1ec83ad3d1369e6547a",
+   "sha256": "137kkpsdg4mg2rxidnhzq0a6lqgfld3q1zv91j1k0s2m0q2pb3ck"
   },
   "stable": {
    "version": [
@@ -92783,11 +92934,11 @@
   "repo": "xuchunyang/tinypng.el",
   "unstable": {
    "version": [
-    20190620,
-    942
+    20200306,
+    911
    ],
-   "commit": "5910738ce129d93789c98f5722d33d1f40d15afc",
-   "sha256": "1mgq8hspkhq6iz84850s9rq0xkhla28dlvcjj0cip4s3npw5fdan"
+   "commit": "f7632e073ce13ef5ce30ae5584cb482a8bb9ffff",
+   "sha256": "1ywhj03j64pp2qmsp2g08xr7pq2qx3i0iwly2hl89hig87va0dpl"
   }
  },
  {
@@ -92831,14 +92982,14 @@
   "repo": "kuanyui/tldr.el",
   "unstable": {
    "version": [
-    20191006,
-    1059
+    20200302,
+    1744
    ],
    "deps": [
     "request"
    ],
-   "commit": "b7f3e3e2171eab5707a42641f4470b69777feaea",
-   "sha256": "0gy5vjffw0bqvhv0gsc654imvridmc7pg88b3nwlfxkrwzi48vxc"
+   "commit": "7203d1be3dcbf12131846ffe06601933fa874d74",
+   "sha256": "1bw6la463l2yfm7rp76ga4makfy4kpxgwi7ni5gxk31w11g26ryk"
   }
  },
  {
@@ -92886,8 +93037,8 @@
     20190902,
     1055
    ],
-   "commit": "379b457fcff091d2fa47223ade58f457fd6eed28",
-   "sha256": "1pbc4ni9sw99r6z9zm1khlyvf1sxy1813ilv73ai7q2619y6njja"
+   "commit": "5deaec41ed0e5c51715737d7f74c5ae1b3c00387",
+   "sha256": "041fpryiz9584m0sl31jz6bs86621mr7lk6pyhiml46n60iccfzp"
   },
   "stable": {
    "version": [
@@ -93125,10 +93276,13 @@
   "stable": {
    "version": [
     2,
-    0
+    2
    ],
-   "commit": "222d5b155dd544cb158b2f84be8ad304b0c69df1",
-   "sha256": "164mip0cibs3c8c4khnbzs8f2pmj57ng5q7hspzv7wk8nvc6d39i"
+   "deps": [
+    "duo"
+   ],
+   "commit": "2fa2c92bf2c66d87ddcd519277e469f67c6615a9",
+   "sha256": "1i5n2f6jdr9p5mdq0g5j0kf19b3kirj00n36qc6nww3kzldwc4c1"
   }
  },
  {
@@ -93453,6 +93607,15 @@
    ],
    "commit": "011f420c3496b69fc22d789f64cb8091834feba7",
    "sha256": "1nhbinwv1ld13c0b0lxlvfm9s6bvxcz2vgfccqg45ncg9rx70rsw"
+  },
+  "stable": {
+   "version": [
+    0,
+    2,
+    0
+   ],
+   "commit": "12e523d70ff78cc8868097b56120848befab5dbc",
+   "sha256": "01j4ci0c52r2c31hc9r4p7nsb6s8blmvg50g9n5v5h3afjl1c35v"
   }
  },
  {
@@ -93589,8 +93752,8 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20200301,
-    1232
+    20200309,
+    2057
    ],
    "deps": [
     "ace-window",
@@ -93602,8 +93765,8 @@
     "pfuture",
     "s"
    ],
-   "commit": "5f82d4414b8e89d45720fbd80acc18be073ff6d7",
-   "sha256": "1azk87gjclilk90fii9hjqr266015mwz58b7wm94zjp65dx1ig36"
+   "commit": "81b69d9ee26326178cef08d5aef2811df4f659ed",
+   "sha256": "138iw9sva5s6d2asl1ch0723q3q8zqlyllhxrac3phgmqzjdw68c"
   },
   "stable": {
    "version": [
@@ -93632,15 +93795,15 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20200114,
-    1715
+    20200302,
+    558
    ],
    "deps": [
     "evil",
     "treemacs"
    ],
-   "commit": "5f82d4414b8e89d45720fbd80acc18be073ff6d7",
-   "sha256": "1azk87gjclilk90fii9hjqr266015mwz58b7wm94zjp65dx1ig36"
+   "commit": "81b69d9ee26326178cef08d5aef2811df4f659ed",
+   "sha256": "138iw9sva5s6d2asl1ch0723q3q8zqlyllhxrac3phgmqzjdw68c"
   },
   "stable": {
    "version": [
@@ -93670,8 +93833,8 @@
     "cl-lib",
     "treemacs"
    ],
-   "commit": "5f82d4414b8e89d45720fbd80acc18be073ff6d7",
-   "sha256": "1azk87gjclilk90fii9hjqr266015mwz58b7wm94zjp65dx1ig36"
+   "commit": "81b69d9ee26326178cef08d5aef2811df4f659ed",
+   "sha256": "138iw9sva5s6d2asl1ch0723q3q8zqlyllhxrac3phgmqzjdw68c"
   },
   "stable": {
    "version": [
@@ -93694,16 +93857,16 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20200114,
-    1715
+    20200302,
+    553
    ],
    "deps": [
     "magit",
     "pfuture",
     "treemacs"
    ],
-   "commit": "5f82d4414b8e89d45720fbd80acc18be073ff6d7",
-   "sha256": "1azk87gjclilk90fii9hjqr266015mwz58b7wm94zjp65dx1ig36"
+   "commit": "81b69d9ee26326178cef08d5aef2811df4f659ed",
+   "sha256": "138iw9sva5s6d2asl1ch0723q3q8zqlyllhxrac3phgmqzjdw68c"
   },
   "stable": {
    "version": [
@@ -93727,16 +93890,16 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20200301,
-    1156
+    20200309,
+    2057
    ],
    "deps": [
     "dash",
     "persp-mode",
     "treemacs"
    ],
-   "commit": "5f82d4414b8e89d45720fbd80acc18be073ff6d7",
-   "sha256": "1azk87gjclilk90fii9hjqr266015mwz58b7wm94zjp65dx1ig36"
+   "commit": "81b69d9ee26326178cef08d5aef2811df4f659ed",
+   "sha256": "138iw9sva5s6d2asl1ch0723q3q8zqlyllhxrac3phgmqzjdw68c"
   }
  },
  {
@@ -93754,8 +93917,8 @@
     "projectile",
     "treemacs"
    ],
-   "commit": "5f82d4414b8e89d45720fbd80acc18be073ff6d7",
-   "sha256": "1azk87gjclilk90fii9hjqr266015mwz58b7wm94zjp65dx1ig36"
+   "commit": "81b69d9ee26326178cef08d5aef2811df4f659ed",
+   "sha256": "138iw9sva5s6d2asl1ch0723q3q8zqlyllhxrac3phgmqzjdw68c"
   },
   "stable": {
    "version": [
@@ -94281,11 +94444,11 @@
   "repo": "emacs-typescript/typescript.el",
   "unstable": {
    "version": [
-    20200221,
-    2312
+    20200309,
+    846
    ],
-   "commit": "a8b7e76e85c1f8b4e353498e3e2d52f1dbcfb6d9",
-   "sha256": "13s4jclbs5563vjxh44ynzxh5k5hq5h1l9icf33wxwwqwk8b93lj"
+   "commit": "1767de109515a992b965d275cb5550d336d957df",
+   "sha256": "0wzgxha155i2nb9idqv634rmxlkf4hd1sg53lipll0phzwd4s7k9"
   },
   "stable": {
    "version": [
@@ -94622,11 +94785,11 @@
   "repo": "ideasman42/emacs-undo-fu",
   "unstable": {
    "version": [
-    20200229,
-    2346
+    20200305,
+    28
    ],
-   "commit": "8b0b289bbd83fac489baee3f46be2225a868e0f4",
-   "sha256": "1d4chzmx248pyk8qaswxyw4gzyk8r844gzzxh08dnl48406zhcy2"
+   "commit": "aae7ec9784e8fab9b33adf25eac25e745653f19f",
+   "sha256": "02xlfjl9z822qixk9gxwv18n8ykdq793fd0qm9g0qsz0sn57mr8n"
   }
  },
  {
@@ -94697,11 +94860,11 @@
   "repo": "purcell/unfill",
   "unstable": {
    "version": [
-    20191227,
-    2026
+    20200304,
+    2218
    ],
-   "commit": "bb5755b2bb7a4d1fbfb525ab7bf9a36e4dede319",
-   "sha256": "0a9gyidkr2i2x9i7jxgdi82ygnb16nij7rrrqb4sslh4yv1hi0qy"
+   "commit": "02c36a04364bcb586477ab79d2b5e0d4e6ae6d47",
+   "sha256": "0pp9ywxkvvfay2pblbqcknf2c3q5izig552r5zksmxbac1rlsvcm"
   },
   "stable": {
    "version": [
@@ -96044,11 +96207,11 @@
   "repo": "federicotdn/verb",
   "unstable": {
    "version": [
-    20200225,
-    2133
+    20200310,
+    2338
    ],
-   "commit": "01555842722ee5ee3abfca1bffc60a188dd5d5ac",
-   "sha256": "1wa9jvz3yph0cxpda4s8lvnlpnlj4vpmvbvg5kvz6pi8kv39ajws"
+   "commit": "b5230c8482e82f652403000f24e1fecfb263f380",
+   "sha256": "16mrbsfkagrq7ng25lc4rs2c8fz63b5m9vfjmnpk5jf8kg0kknwq"
   },
   "stable": {
    "version": [
@@ -96483,11 +96646,11 @@
   "repo": "joostkremers/visual-fill-column",
   "unstable": {
    "version": [
-    20190422,
-    2154
+    20200303,
+    2318
    ],
-   "commit": "9a3a2ef3c7c76666a0c9271a821256eec9daab2a",
-   "sha256": "1z535rddy8q4gxdmsf7p1z3hm2vav0zcjh9kpxnq3v49scq1nd5j"
+   "commit": "a19fbe8bcfab678516ffcaa84b516527a0ce45cf",
+   "sha256": "157f8d302vv7ds03y21j4rz5jvqbkm4639ak25zfhshd5lyacxyj"
   },
   "stable": {
    "version": [
@@ -96746,11 +96909,11 @@
   "repo": "akermu/emacs-libvterm",
   "unstable": {
    "version": [
-    20200224,
-    307
+    20200309,
+    615
    ],
-   "commit": "b9bccf38dfeb495bfd93d55618b3791ebad24588",
-   "sha256": "053x5zpfsj0n0a8gdzra7awg3y3py2a2nxv14vn4g8r7hrhdwac0"
+   "commit": "03b8a06a0a531d13f18ef7f00ed4617eb4eaa1ad",
+   "sha256": "0485d07y12knsxisalv5824nmqw2gx08jrdgams7l3ra4z961lfj"
   }
  },
  {
@@ -96874,11 +97037,11 @@
   "repo": "emacs-w3m/emacs-w3m",
   "unstable": {
    "version": [
-    20200113,
-    2320
+    20200302,
+    2210
    ],
-   "commit": "6eda3828bb8530ecd69a3823bd5569a5f779c239",
-   "sha256": "0ij85i0zy9wi1cgm0j8cvqpv9802kfy7g4ffx381l7k28m35lqh2"
+   "commit": "03ea43b1f1c648968fe1109fb5c50febcf9e154d",
+   "sha256": "1v194qzgxq5r34xaqgky1ir2bikaphv8csnxlgwbkggzpxnlwqi0"
   }
  },
  {
@@ -97019,15 +97182,15 @@
   "repo": "cmpitg/wand",
   "unstable": {
    "version": [
-    20200211,
-    2238
+    20200302,
+    1536
    ],
    "deps": [
     "dash",
     "s"
    ],
-   "commit": "fe4bf7b35b61eda15437a212e96d08395d307f73",
-   "sha256": "1rfiyh2v28zpdv8sd6hjz5fgv3knyhgz1ymp9ycl9m4y93s78wbq"
+   "commit": "731b5ca33269fe563239bff16da6c41489432b80",
+   "sha256": "0r5mbslwf3x0mrndz65w4pp88xii019zg5p6x214zxpr87s75zdp"
   }
  },
  {
@@ -97070,14 +97233,14 @@
   "repo": "wanderlust/wanderlust",
   "unstable": {
    "version": [
-    20190919,
-    859
+    20200124,
+    858
    ],
    "deps": [
     "semi"
    ],
-   "commit": "7a919e422a48f5021576e68282703de430558879",
-   "sha256": "0k2jklkpqm33bimxy4vnssdc9xa7wfnvay3ng0av1bwxfgxfrmdr"
+   "commit": "7af0d582cd48a37469e0606ea35887740d78c8b5",
+   "sha256": "08gr4q5i4z1bs5qbfxmf9imjin1v1qvsk7x37qvr84p16kdr9vxn"
   }
  },
  {
@@ -97337,11 +97500,11 @@
   "repo": "fxbois/web-mode",
   "unstable": {
    "version": [
-    20200229,
-    1859
+    20200301,
+    1948
    ],
-   "commit": "f271e1b97989e7de8e33cb49a97a829ebec1911d",
-   "sha256": "192zkjlz3dm1p6lrivc0qqws7mfyv1nvbgcq71gfpm9x085rqyn4"
+   "commit": "b0bb4ab82ba64b6fa789212f03ad808bdaf77d68",
+   "sha256": "0v79xm0w8fr342jp27jlkph3av3kbzwdyip6djwykid4j6bcnv2i"
   },
   "stable": {
    "version": [
@@ -97911,11 +98074,11 @@
   "repo": "purcell/whitespace-cleanup-mode",
   "unstable": {
    "version": [
-    20190106,
-    2022
+    20200304,
+    2227
    ],
-   "commit": "121854747776df1b78d0ef89efb6d01c2c1e8c89",
-   "sha256": "1qli6vwdnm73jnv37lyf1xb5ykav322xjm1fqmgb1369k2fgkl44"
+   "commit": "5fac49636cd72a0043e2473c9a09a788cfd68d5f",
+   "sha256": "0myx8vayakmhb5hbrskk58rkb1f0jdw7kinvk8fvv73g050yk28d"
   },
   "stable": {
    "version": [
@@ -97981,20 +98144,19 @@
   "repo": "purcell/whole-line-or-region",
   "unstable": {
    "version": [
-    20190411,
-    215
+    20200305,
+    221
    ],
-   "commit": "15f17488f98868f1628a3f9d91a812b1f89bc73a",
-   "sha256": "18qzmpw41bqw2ymynya3hgn9skj13r5s6d2b14r78hvmv4bc9h9r"
+   "commit": "71f84725e2643b2ee74f27c60c4fd8b79c9c3c97",
+   "sha256": "1rs446cwbp6i79wi7srzaxg9hdahagcjkjill34j70hdy1r4xjas"
   },
   "stable": {
    "version": [
     1,
-    3,
-    1
+    6
    ],
-   "commit": "a60e022b30c2f4d3118bcaef1adb77b90e0ca941",
-   "sha256": "0ip0vkqb4dm88xqzgwc9yaxzf4sc4x006m6z73a3lbfmrncy2c1d"
+   "commit": "0d11174ba5e1145167000aa8f65c273a3d0db6b3",
+   "sha256": "1zw4aabadhsn81i3bwdl4717fq6a0njypavw2riyzbz465axd60i"
   }
  },
  {
@@ -98065,15 +98227,15 @@
   "repo": "rolandwalker/button-lock",
   "unstable": {
    "version": [
-    20150223,
-    1354
+    20200309,
+    1323
    ],
    "deps": [
     "button-lock",
     "nav-flash"
    ],
-   "commit": "f9082feb329432fcf2ac49a95e64bed9fda24d58",
-   "sha256": "06qjvybf65ffrcnhhbqs333lg51fawaxnva3jvdg7zbrsv4m9acl"
+   "commit": "9afe0f4d05910b0cccc94cb6d4d880119f3b0528",
+   "sha256": "1d893isxvchrqxw6iaknbv8l31rgalfc4hmppf0l87gxp5y9hxa2"
   },
   "stable": {
    "version": [
@@ -98553,14 +98715,14 @@
   "repo": "p3r7/with-shell-interpreter",
   "unstable": {
    "version": [
-    20200217,
-    1112
+    20200306,
+    1445
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "62c3b0bd16c6fc4a0ee42f4d6a2dd7f66beab7cc",
-   "sha256": "1hp3i9njipzppdlwl7a3xhdrvvmc0ynmh85nmj0csxzpnahyp12d"
+   "commit": "055b46755b7cbc324a8d92e092de671b9bc97098",
+   "sha256": "10xf2aqxkqdls0ym2a5dvwz96zzziw7v0y493krw2jchzpwkwryk"
   }
  },
  {
@@ -98985,14 +99147,14 @@
   "repo": "joostkremers/writeroom-mode",
   "unstable": {
    "version": [
-    20200225,
-    2011
+    20200303,
+    2331
    ],
    "deps": [
     "visual-fill-column"
    ],
-   "commit": "c806c41f7c2ecb3f945aef7f0c25e3e223ededc0",
-   "sha256": "0wi8l1nz4g8ygxvffpa525lm80l0jwj92argsa5i11sh7w6hjksv"
+   "commit": "20c761b80031f2b44b9d9fb476e044e477359016",
+   "sha256": "1kx2xhvi579vhajvgl4spf9jd597fqa2bjh16yqfx2nikissvkhy"
   },
   "stable": {
    "version": [
@@ -99215,11 +99377,11 @@
   "repo": "xahlee/xah-css-mode",
   "unstable": {
    "version": [
-    20190705,
-    750
+    20200309,
+    1750
    ],
-   "commit": "ada8513eadca5c5797a384040acca2fceced3e26",
-   "sha256": "0x9zbck87s4cfk99i2kq1a0rf5lvy5bms58d75fd8gn7xz42cf9x"
+   "commit": "43dbab2b8c35bd6892fe80bf064b41bd731545ff",
+   "sha256": "0m6l2k22pfcp6s3dadm3w1mr7ar590xl64zjsr0dl9d8spc6gbz1"
   }
  },
  {
@@ -99260,11 +99422,11 @@
   "repo": "xahlee/xah-fly-keys",
   "unstable": {
    "version": [
-    20200215,
-    124
+    20200311,
+    1947
    ],
-   "commit": "064cb19b1d3d133ea0f123e570f0c6c3351af9c7",
-   "sha256": "0vsm7lbv0sw0zxiprgq756fcl1hz8aj5v1lczwzd7v7sxzkcslv6"
+   "commit": "bdaf860b9e5ff9514890b991ddd45033513c4ac3",
+   "sha256": "0g2xb5mdg07ip1isvhzdwxvvxbjvv3xarkrfblgq0fai82f6yzpv"
   }
  },
  {
@@ -100504,11 +100666,11 @@
   "repo": "ryuslash/yoshi-theme",
   "unstable": {
    "version": [
-    20190505,
-    728
+    20200307,
+    704
    ],
-   "commit": "70365870ff823b954aa85972217d8f116c45d939",
-   "sha256": "1myrvw0brl6cn3gljbplgxj3mr3mzicfymg7sir8hrk4d5g498yn"
+   "commit": "25bde9dc4ca380941b6539757371aef91ca35968",
+   "sha256": "0p3qrp0wrqissbvz8bnpbrj67c2697mq1pni9c247fiijbcnl48j"
   },
   "stable": {
    "version": [
@@ -100655,11 +100817,11 @@
   "repo": "bbatsov/zenburn-emacs",
   "unstable": {
    "version": [
-    20200227,
-    751
+    20200305,
+    737
    ],
-   "commit": "f42847d617d4314d4b8e272f2b58007e479b964d",
-   "sha256": "1ydfkynfclx7djji1hjfvm1pf6ndfjy43y0piqk3v14n6mxz78al"
+   "commit": "7dd796840376342426f60018a6cf209228452f3e",
+   "sha256": "0zzg95sifg6ybh3ava67z688fycklqragkr3baxlhl2jfnwsps2l"
   },
   "stable": {
    "version": [

From 711a86973ff0ee8c95900b4cad3558338c7b994c Mon Sep 17 00:00:00 2001
From: jansol <jhs@psonet.com>
Date: Thu, 12 Mar 2020 01:45:19 +0200
Subject: [PATCH 2796/4636] renderdoc: 1.6 -> 1.7

Added libglvnd to fix replaying OpenGL captures with renderdoccmd
---
 pkgs/applications/graphics/renderdoc/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix
index 843801011f77..e345fcce01e3 100644
--- a/pkgs/applications/graphics/renderdoc/default.nix
+++ b/pkgs/applications/graphics/renderdoc/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, mkDerivation
 , qtbase, qtx11extras, qtsvg, makeWrapper
-, vulkan-loader, xorg, python3, python3Packages
+, vulkan-loader, libglvnd, xorg, python3, python3Packages
 , bison, pcre, automake, autoconf, addOpenGLRunpath
 }:
 let
@@ -13,14 +13,14 @@ let
   pythonPackages = python3Packages;
 in
 mkDerivation rec {
-  version = "1.6";
+  version = "1.7";
   pname = "renderdoc";
 
   src = fetchFromGitHub {
     owner = "baldurk";
     repo = "renderdoc";
     rev = "v${version}";
-    sha256 = "0b2f9m5azzvcjbmxkwcl1d7jvvp720b81zwn19rrskznfcc2r1i8";
+    sha256 = "0r0y0lx48hkyf39pgippsc9q8hdcf57bdva6gx7f35vlhicx5hlz";
   };
 
   buildInputs = [
@@ -52,8 +52,8 @@ mkDerivation rec {
 
   dontWrapQtApps = true;
   preFixup = ''
-    wrapQtApp $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : "$out/lib:${vulkan-loader}/lib"
-    wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : "$out/lib:${vulkan-loader}/lib"
+    wrapQtApp $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : "$out/lib:${vulkan-loader}/lib:${libglvnd}/lib"
+    wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : "$out/lib:${vulkan-loader}/lib:${libglvnd}/lib"
   '';
 
   # The only documentation for this so far is in pkgs/build-support/add-opengl-runpath/setup-hook.sh

From 130aef631cf178aab2c5904b359c27447db1d526 Mon Sep 17 00:00:00 2001
From: Yannik Sander <me@ysndr.de>
Date: Tue, 10 Mar 2020 22:48:38 +0100
Subject: [PATCH 2797/4636] zoxide: init at 0.2.0

---
 pkgs/tools/misc/zoxide/default.nix | 28 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  4 +++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/misc/zoxide/default.nix

diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix
new file mode 100644
index 000000000000..42436de096dd
--- /dev/null
+++ b/pkgs/tools/misc/zoxide/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, rustPlatform, fzf }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "zoxide";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "ajeetdsouza";
+    repo = "zoxide";
+    rev = "v${version}";
+    sha256 = "0s0zrkn48rgsf2fqpgsl0kix4l6w7k7pwssvdja6y3a4c097qmnm";
+  };
+
+  buildInputs = [
+    # Example Run-time Additional Dependencies
+    fzf
+  ];
+
+  cargoSha256 = "1p65ml2qj5dpc6nczfvf341fk7y4yi5ma1x6kfr3d32wnv6m4hgh";
+
+  meta = with stdenv.lib; {
+    description = "A fast cd command that learns your habits";
+    homepage = "https://github.com/ajeetdsouza/zoxide";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ ysndr ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c9b47f04cd9..79fa50cf6a1e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3080,6 +3080,8 @@ in
 
   zeek = callPackage ../applications/networking/ids/zeek { };
 
+  zoxide = callPackage ../tools/misc/zoxide { };
+
   zzuf = callPackage ../tools/security/zzuf { };
 
   ### DEVELOPMENT / EMSCRIPTEN
@@ -3500,7 +3502,7 @@ in
   fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { };
 
   fuse-overlayfs = callPackage ../tools/filesystems/fuse-overlayfs {};
-  
+
   fusee-interfacee-tk = callPackage ../applications/misc/fusee-interfacee-tk { };
 
   fusee-launcher = callPackage ../development/tools/fusee-launcher { };

From de892c2f073341c02f90e63c8dfbb5e6ac9f37ea Mon Sep 17 00:00:00 2001
From: Yannik Sander <me@ysndr.de>
Date: Wed, 11 Mar 2020 17:09:46 +0100
Subject: [PATCH 2798/4636] Remove unnecessary comment

Co-Authored-By: Cole Helbling <cole.e.helbling@outlook.com>
---
 pkgs/tools/misc/zoxide/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix
index 42436de096dd..33d6a8bbcaca 100644
--- a/pkgs/tools/misc/zoxide/default.nix
+++ b/pkgs/tools/misc/zoxide/default.nix
@@ -12,7 +12,6 @@ rustPlatform.buildRustPackage rec {
   };
 
   buildInputs = [
-    # Example Run-time Additional Dependencies
     fzf
   ];
 

From cd8c987fbc72beee00cfa0458f272eecfe6991ac Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Mon, 9 Mar 2020 17:57:39 -0400
Subject: [PATCH 2799/4636] rainicorn: remove broken package that has been
 abandoned upstream

The upstream project is dead, with the last commit being in 2016:
https://github.com/RustDT/Rainicorn

This no longer builds in NixPkgs, and has been marked as broken for a very long
time. Since the package is not maintained and is dead upstream, let's delete.
---
 .../tools/rust/rainicorn/default.nix          | 28 -------------------
 pkgs/top-level/all-packages.nix               |  1 -
 2 files changed, 29 deletions(-)
 delete mode 100644 pkgs/development/tools/rust/rainicorn/default.nix

diff --git a/pkgs/development/tools/rust/rainicorn/default.nix b/pkgs/development/tools/rust/rainicorn/default.nix
deleted file mode 100644
index 94ee2a773f26..000000000000
--- a/pkgs/development/tools/rust/rainicorn/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
-
-with rustPlatform;
-
-buildRustPackage rec {
-  pname = "rainicorn";
-  version = "1.0.0";
-
-  src = fetchFromGitHub {
-    owner = "RustDT";
-    repo = "Rainicorn";
-    rev = "0f8594079a7f302f4940cc4320f5e4f39f95cdc4";
-    sha256 = "07vh4g120sx569wkzclq91blkkd7q7z582pl8vz0li1l9ij8md01";
-  };
-
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "07zsj12g4ff0cdb9pwz302vxvajr8g6nl3bpz4vdyi84csfvmahz";
-
-  meta = with stdenv.lib; {
-    broken = true;
-    description = "Rust IDEs.  parse-analysis";
-    homepage = https://github.com/RustDT/Rainicorn;
-    license = with licenses; [ mit asl20 ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79fa50cf6a1e..d0c069663919 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8912,7 +8912,6 @@ in
   };
 
   maturin = callPackage ../development/tools/rust/maturin { };
-  rainicorn = callPackage ../development/tools/rust/rainicorn { };
   inherit (rustPackages) rls;
   rustfmt = rustPackages.rustfmt;
   rustracer = callPackage ../development/tools/rust/racer {

From d058d15f5ff6e2645c62e20e34208ad7b301b65d Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Mon, 9 Mar 2020 17:43:48 -0400
Subject: [PATCH 2800/4636] leftwm: 0.1.10 -> 0.2.2

General update, but also along for the ride:

- Upgrade cargo fetcher for https://github.com/NixOS/nixpkgs/issues/79975
- Quoted homepage for https://github.com/NixOS/rfcs/pull/45
- Switched to consistent 2-space indent
- Cleaned up the meta section
---
 .../window-managers/leftwm/default.nix        | 52 ++++++++-----------
 1 file changed, 23 insertions(+), 29 deletions(-)

diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix
index 25a219c2be42..ade3904b95c2 100644
--- a/pkgs/applications/window-managers/leftwm/default.nix
+++ b/pkgs/applications/window-managers/leftwm/default.nix
@@ -1,41 +1,35 @@
 { stdenv, fetchFromGitHub, rustPlatform, libX11, libXinerama, makeWrapper }:
 
-let 
+let
     rpath = stdenv.lib.makeLibraryPath [ libXinerama libX11 ];
 in
 
 rustPlatform.buildRustPackage rec {
-    pname = "leftwm";
-    version = "0.1.10";
+  pname = "leftwm";
+  version = "0.2.2";
 
-    src = fetchFromGitHub {
-        owner = "leftwm";
-        repo = "leftwm";
-        rev = version;
-        sha256 = "190lc48clkh9vzlsfg2a70w405k7xyyw7avnxwna1glfwmbyy2ag";
-    };
+  src = fetchFromGitHub {
+    owner = "leftwm";
+    repo = "leftwm";
+    rev = version;
+    sha256 = "0x8cqc7zay19jxy7cshayjjwwjrcblqpmqrxipm2g5hhyjghk6q0";
+  };
 
-    buildInputs = [ makeWrapper libX11 libXinerama ];
+  cargoSha256 = "1kphv3vnr8ij7raf0niwz3rwly986xi5fgwqg2ya0r46ifqkgvrc";
 
-    postInstall = ''
-        wrapProgram $out/bin/leftwm --prefix LD_LIBRARY_PATH : "${rpath}"
-        wrapProgram $out/bin/leftwm-state --prefix LD_LIBRARY_PATH : "${rpath}"
-        wrapProgram $out/bin/leftwm-worker --prefix LD_LIBRARY_PATH : "${rpath}"
-    '';
+  buildInputs = [ makeWrapper libX11 libXinerama ];
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
+  postInstall = ''
+    wrapProgram $out/bin/leftwm --prefix LD_LIBRARY_PATH : "${rpath}"
+    wrapProgram $out/bin/leftwm-state --prefix LD_LIBRARY_PATH : "${rpath}"
+    wrapProgram $out/bin/leftwm-worker --prefix LD_LIBRARY_PATH : "${rpath}"
+  '';
 
-    cargoSha256 = "0mpvfix7bvc84vanha474l4gaq97ac1zy5l77z83m9jg0246yxd6";
-
-    # patch wrong version in Cargo.lock
-    cargoPatches = [ ./cargo-lock.patch ];
-
-    meta = {
-        description = "Leftwm - A tiling window manager for the adventurer";
-        homepage = https://github.com/leftwm/leftwm;
-        license = stdenv.lib.licenses.mit;
-        platforms = stdenv.lib.platforms.linux;
-        maintainers = with stdenv.lib.maintainers; [ mschneider ];
-    };
+  meta = with stdenv.lib; {
+    description = "Leftwm - A tiling window manager for the adventurer";
+    homepage = "https://github.com/leftwm/leftwm";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ mschneider ];
+  };
 }

From 605640b294a20790555a747f51560e004d9b6bca Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 9 Mar 2020 14:02:28 +0100
Subject: [PATCH 2801/4636] guile: 2.2.6 -> 2.2.7

See https://lists.gnu.org/archive/html/info-gnu/2020-03/msg00004.html
for release information
---
 pkgs/development/interpreters/guile/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index fce94ecc846f..68df200835fa 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -12,11 +12,11 @@
 
 (rec {
   name = "guile-${version}";
-  version = "2.2.6";
+  version = "2.2.7";
 
   src = fetchurl {
     url = "mirror://gnu/guile/${name}.tar.xz";
-    sha256 = "1269ymxm56j1z1lvq1y42rm961f2n7rinm3k6l00p9k52hrpcddk";
+    sha256 = "013mydzhfswqci6xmyc1ajzd59pfbdak15i0b090nhr9bzm7dxyd";
   };
 
   outputs = [ "out" "dev" "info" ];
@@ -93,7 +93,7 @@
 
   meta = {
     description = "Embeddable Scheme implementation";
-    homepage    = https://www.gnu.org/software/guile/;
+    homepage    = "https://www.gnu.org/software/guile/";
     license     = stdenv.lib.licenses.lgpl3Plus;
     maintainers = with stdenv.lib.maintainers; [ ludo lovek323 vrthra ];
     platforms   = stdenv.lib.platforms.all;

From 8d08f4536828387c6a2ba03cb4a0c23637e83774 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 8 Mar 2020 07:02:20 +0000
Subject: [PATCH 2802/4636] dovecot: 2.3.9.3 -> 2.3.10

---
 pkgs/servers/mail/dovecot/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix
index 12da51f9f239..fd27d18b5035 100644
--- a/pkgs/servers/mail/dovecot/default.nix
+++ b/pkgs/servers/mail/dovecot/default.nix
@@ -9,7 +9,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "dovecot-2.3.9.3";
+  name = "dovecot-2.3.10";
 
   nativeBuildInputs = [ perl pkgconfig ];
   buildInputs =
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dovecot.org/releases/2.3/${name}.tar.gz";
-    sha256 = "0lcnqib63nv32xr3nr4s3x8k77mbgrhc13swjl2xqnzw4fabd7zq";
+    sha256 = "1ibiz3k2flablkcqbkvfzsjnq5b5kxximhcrplflsjl57mr88ca7";
   };
 
   enableParallelBuilding = true;
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
     ++ lib.optional withSQLite "--with-sqlite";
 
   meta = {
-    homepage = https://dovecot.org/;
+    homepage = "https://dovecot.org/";
     description = "Open source IMAP and POP3 email server written with security primarily in mind";
     maintainers = with stdenv.lib.maintainers; [ peti rickynils fpletz globin ];
     platforms = stdenv.lib.platforms.unix;

From 152dddaa8f3e63fc70eeef078d8aa24e39bd3c10 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 11 Mar 2020 16:20:27 +0100
Subject: [PATCH 2803/4636] glances: 3.1.3 -> 3.1.4

---
 pkgs/applications/system/glances/default.nix  | 20 ++++---------------
 .../system/glances/skip-failing-tests.patch   |  8 --------
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix
index 946cc1125863..a7dffd0bfab6 100644
--- a/pkgs/applications/system/glances/default.nix
+++ b/pkgs/applications/system/glances/default.nix
@@ -8,31 +8,18 @@
 
 buildPythonApplication rec {
   pname = "glances";
-  version = "3.1.3";
+  version = "3.1.4";
   disabled = isPyPy;
 
   src = fetchFromGitHub {
     owner = "nicolargo";
     repo = "glances";
     rev = "v${version}";
-    sha256 = "15yz8sbw3k3n0729g2zcwsxc5iyhkyrhqza6fnipxxpsskwgqbwp";
+    sha256 = "1lr186rc3fvldy2m2yx1hxzdlxll93pjabs01sxz48kkpsvbiydi";
   };
 
   # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):
-  patches = lib.optional (doCheck && stdenv.isLinux) ./skip-failing-tests.patch
-    ++ [
-      (fetchpatch {
-        # Correct unitest
-        url = "https://github.com/nicolargo/glances/commit/abf64ffde31113f5f46ef286703ff061fc57395f.patch";
-        sha256 = "00krahqq89jvbgrqx2359cndmvq5maffhpj163z10s1n7q80kxp1";
-      })
-
-      (fetchpatch {
-        # Fix IP plugin initialization issue
-        url = "https://github.com/nicolargo/glances/commit/48cb5ef8053d823302e7e53490fb22cec2fabb0f.patch";
-        sha256 = "1590qgcr8w3d9ddpgd9mk5j6q6aq29341vr8bi202yjwwiv2bia9";
-      })
-    ];
+  patches = lib.optional (doCheck && stdenv.isLinux) ./skip-failing-tests.patch;
 
   # On Darwin this package segfaults due to mismatch of pure and impure
   # CoreFoundation. This issues was solved for binaries but for interpreted
@@ -64,6 +51,7 @@ buildPythonApplication rec {
   meta = with lib; {
     homepage = "https://nicolargo.github.io/glances/";
     description = "Cross-platform curses-based monitoring tool";
+    changelog = "https://github.com/nicolargo/glances/releases/tag/v${version}";
     license = licenses.lgpl3;
     maintainers = with maintainers; [ jonringer primeos koral ];
   };
diff --git a/pkgs/applications/system/glances/skip-failing-tests.patch b/pkgs/applications/system/glances/skip-failing-tests.patch
index e3116af6a2c2..f47f1218aea5 100644
--- a/pkgs/applications/system/glances/skip-failing-tests.patch
+++ b/pkgs/applications/system/glances/skip-failing-tests.patch
@@ -50,11 +50,3 @@ diff --git a/unitest.py b/unitest.py
      def test_006_swap(self):
          """Check MEMSWAP plugin."""
          stats_to_check = ['used', 'free', 'total']
-@@ -191,6 +196,7 @@ class TestGlances(unittest.TestCase):
-         self.assertTrue(type(stats_grab) is list, msg='Folders stats is not a list')
-         print('INFO: Folders stats: %s' % stats_grab)
- 
-+    @unittest.skip("Fails on NixOS (TODO)")
-     def test_012_ip(self):
-         """Check IP plugin."""
-         print('INFO: [TEST_012] Check IP stats')

From 68a64b2afea20d1293289f3c2bbed15a0af3621b Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 7 Mar 2020 10:51:20 -0500
Subject: [PATCH 2804/4636] gitAndTools.git-dit: mark as broken

See inline comment; this does not build on Hydra and either requires custom
patching or a new release from upstream before it will build.

Note that we can still recompute the `cargoSha256` for #79975; the package
is broken in the identical way.
---
 .../version-management/git-and-tools/git-dit/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
index 571125ee1134..9ec4e2530424 100644
--- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
@@ -26,10 +26,7 @@ buildRustPackage rec {
     sha256 = "1sx6sc2dj3l61gbiqz8vfyhw5w4xjdyfzn1ixz0y8ipm579yc7a2";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "10852131aizfw9j1yl4gz180h4gd8y5ymx3wmf5v9cmqiqxy8bgy";
+  cargoSha256 = "1wjbwd3scx71l2fpxgvgwaw05lkpw13rm6d2i1x5crhs7py96ky6";
 
   nativeBuildInputs = [
     cmake
@@ -51,6 +48,10 @@ buildRustPackage rec {
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
     description = "Decentralized Issue Tracking for git";
+    # This has not had a release in years and its cargo vendored dependencies
+    # fail to compile. It also depends on an unsupported openssl:
+    # https://github.com/NixOS/nixpkgs/issues/77503
+    broken = true;
     license = licenses.gpl2;
     maintainers = with maintainers; [ Profpatsch matthiasbeyer ];
   };

From 9f35c5c5aa8a3c70bd237ba53a721897837d6c3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 11 Mar 2020 20:45:10 -0300
Subject: [PATCH 2805/4636] matcha: 2020-03-01 -> 2020-03-11

---
 pkgs/data/themes/matcha/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
index 152b08a960da..05292e97772f 100644
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "matcha";
-  version = "2020-03-01";
+  version = "2020-03-11";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    sha256 = "09nb6xsysfg477zcm9y49iaczxksxrd4zh3n8dp7rlzc2h2kicpn";
+    sha256 = "1np2964g5f0vwdvfmi8gidsk9jj7v43nkshiqnfdbvmwa85ldpfl";
   };
 
   buildInputs = [ gdk-pixbuf librsvg ];

From af576fc3b1fdc5fda49cd166a4582031594729d4 Mon Sep 17 00:00:00 2001
From: Dave Anderson <dave@natulte.net>
Date: Wed, 11 Mar 2020 17:39:03 -0700
Subject: [PATCH 2806/4636] bitcoinarmory: remove

The project has been abandoned upstream for 2 years. For its entire
lifetime in nixpkgs, the installed binaries segfault due to static
library linking that couldn't be undone due to proprietary changes
to said libraries. In addition, there are unpatched CVEs according
to #29956.

Fixes #29956.

Signed-off-by: David Anderson <dave@natulte.net>
---
 .../misc/bitcoinarmory/default.nix            | 92 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 94 deletions(-)
 delete mode 100644 pkgs/applications/misc/bitcoinarmory/default.nix

diff --git a/pkgs/applications/misc/bitcoinarmory/default.nix b/pkgs/applications/misc/bitcoinarmory/default.nix
deleted file mode 100644
index 090cb2f519e1..000000000000
--- a/pkgs/applications/misc/bitcoinarmory/default.nix
+++ /dev/null
@@ -1,92 +0,0 @@
-{ stdenv, fetchFromGitHub, pythonPackages
-, pkgconfig, autoreconfHook, rsync
-, swig, qt48Full, fcgi
-, bitcoin, procps, utillinux
-}:
-let
-
-  version = "0.96.1";
-  inherit (pythonPackages) buildPythonApplication pyqt4 psutil twisted;
-
-in buildPythonApplication {
-
-  pname = "bitcoinarmory";
-  inherit version;
-
-  src = fetchFromGitHub {
-    owner = "goatpig";
-    repo = "BitcoinArmory";
-    rev = "v${version}";
-    sha256 = "0pjk5qx16n3kvs9py62666qkwp2awkgd87by4karbj7vk6p1l14h"; fetchSubmodules = true;
-  };
-
-  format = "other";
-
-  # FIXME bitcoind doesn't die on shutdown. Need some sort of patch to fix that.
-  #patches = [ ./shutdown-fix.patch ];
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkgconfig
-    swig
-    pyqt4
-    qt48Full
-    rsync # used by silly install script (TODO patch upstream)
-  ];
-  buildInputs = [
-    qt48Full
-    fcgi
-  ];
-
-  propagatedBuildInputs = [
-    pyqt4
-    psutil
-    twisted
-  ];
-
-  makeFlags = [ "PREFIX=$(out)" ];
-
-  makeWrapperArgs = [
-    "--prefix            PATH : ${bitcoin}/bin"   # for `bitcoind`
-    "--prefix            PATH : ${procps}/bin"    # for `free`
-    "--prefix            PATH : ${utillinux}/bin" # for `whereis`
-    "--suffix LD_LIBRARY_PATH : $out/lib"         # for python bindings built as .so files
-    "--run    cd\\ $out/lib/armory"               # so that GUI resources can be loaded
-  ];
-
-  # auditTmpdir runs during fixupPhase, so patchelf before that
-  preFixup = ''
-    newRpath=$(patchelf --print-rpath $out/bin/ArmoryDB | sed -r 's|(.*)(/tmp/nix-build-.*libfcgi/.libs:?)(.*)|\1\3|')
-    patchelf --set-rpath $out/lib:$newRpath $out/bin/ArmoryDB
-  '';
-
-  # fixupPhase of mkPythonDerivation wraps $out/bin/*, so this needs to come after
-  postFixup = ''
-    wrapPythonProgramsIn $out/lib/armory "$out $pythonPath"
-    ln -sf $out/lib/armory/ArmoryQt.py $out/bin/armory
-  '';
-
-  meta = {
-    description = "Bitcoin wallet with cold storage and multi-signature support";
-    longDescription = ''
-      Armory is the most secure and full featured solution available for users
-      and institutions to generate and store Bitcoin private keys. This means
-      users never have to trust the Armory team and can use it with the Glacier
-      Protocol. Satoshi would be proud!
-
-      Users are empowered with multiple encrypted Bitcoin wallets and permanent
-      one-time ‘paper backups’. Armory pioneered cold storage and distributed
-      multi-signature. Bitcoin cold storage is a system for securely storing
-      Bitcoins on a completely air-gapped offline computer.
-
-      Maintainer's note: The original authors at https://bitcoinarmory.com/
-      discontinued development. I elected instead to package GitHub user
-      @goatpig's fork, as it's the most active, at time of this writing.
-    '';
-    homepage = https://github.com/goatpig/BitcoinArmory;
-    license = stdenv.lib.licenses.agpl3Plus;
-    maintainers = with stdenv.lib.maintainers; [ elitak ];
-    platforms = [ "i686-linux" "x86_64-linux" ];
-  };
-
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d0c069663919..74ab773c2393 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18440,8 +18440,6 @@ in
     glew = glew110;
   };
 
-  bitcoinarmory = callPackage ../applications/misc/bitcoinarmory { pythonPackages = python2Packages; };
-
   bitkeeper = callPackage ../applications/version-management/bitkeeper {
     gperf = gperf_3_0;
   };

From eacf018ea7ea982bd3d75155f1354aef3294c0d1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 11 Mar 2020 21:24:13 +0100
Subject: [PATCH 2807/4636] mysql-workbench: format with nixpkgs-fmt

---
 .../misc/mysql-workbench/default.nix          | 100 ++++++++++++++----
 1 file changed, 82 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index 531f8d851f1c..d0c2e45f3062 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -1,12 +1,43 @@
-{ stdenv, fetchurl, substituteAll, cmake, ninja, pkgconfig
-, glibc, gtk3, gtkmm3, pcre, swig, antlr4_7, sudo
-, mysql, libxml2, libmysqlconnectorcpp
-, vsqlite, gdal, libiodbc, libpthreadstubs
-, libXdmcp, libuuid, libzip, libsecret, libssh
-, python2, jre
-, boost, libsigcxx, libX11, openssl
-, proj, cairo, libxkbcommon, epoxy, wrapGAppsHook
-, at-spi2-core, dbus, bash, coreutils
+{ stdenv
+, fetchurl
+, substituteAll
+, cmake
+, ninja
+, pkgconfig
+, glibc
+, gtk3
+, gtkmm3
+, pcre
+, swig
+, antlr4_7
+, sudo
+, mysql
+, libxml2
+, libmysqlconnectorcpp
+, vsqlite
+, gdal
+, libiodbc
+, libpthreadstubs
+, libXdmcp
+, libuuid
+, libzip
+, libsecret
+, libssh
+, python2
+, jre
+, boost
+, libsigcxx
+, libX11
+, openssl
+, proj
+, cairo
+, libxkbcommon
+, epoxy
+, wrapGAppsHook
+, at-spi2-core
+, dbus
+, bash
+, coreutils
 }:
 
 let
@@ -22,6 +53,7 @@ in stdenv.mkDerivation rec {
 
   patches = [
     ./fix-gdal-includes.patch
+
     (substituteAll {
       src = ./hardcode-paths.patch;
       catchsegv = "${glibc.bin}/bin/catchsegv";
@@ -44,25 +76,57 @@ in stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    cmake ninja pkgconfig jre swig wrapGAppsHook
+    cmake
+    ninja
+    pkgconfig
+    jre
+    swig
+    wrapGAppsHook
   ];
 
   buildInputs = [
-    gtk3 gtkmm3 libX11 antlr4_7.runtime.cpp python2 mysql libxml2
-    libmysqlconnectorcpp vsqlite gdal boost libssh openssl
-    libiodbc pcre cairo libuuid libzip libsecret
-    libsigcxx proj
+    gtk3
+    gtkmm3
+    libX11
+    antlr4_7.runtime.cpp
+    python2
+    mysql
+    libxml2
+    libmysqlconnectorcpp
+    vsqlite
+    gdal
+    boost
+    libssh
+    openssl
+    libiodbc
+    pcre
+    cairo
+    libuuid
+    libzip
+    libsecret
+    libsigcxx
+    proj
+
     # python dependencies:
-    paramiko pycairo pyodbc # sqlanydb
+    paramiko
+    pycairo
+    pyodbc
+    # TODO: package sqlanydb and add it here
+
     # transitive dependencies:
-    libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core dbus
+    libpthreadstubs
+    libXdmcp
+    libxkbcommon
+    epoxy
+    at-spi2-core
+    dbus
   ];
 
   postPatch = ''
     patchShebangs tools/get_wb_version.sh
   '';
 
-    # error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated
+  # error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated
   NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
 
   cmakeFlags = [
@@ -104,7 +168,7 @@ in stdenv.mkDerivation rec {
       and execute SQL queries.
     '';
 
-    homepage = http://wb.mysql.com/;
+    homepage = "http://wb.mysql.com/";
     license = licenses.gpl2;
     maintainers = [ maintainers.kkallio ];
     platforms = platforms.linux;

From 23d69911f3ac79e58d380b5e7cec9ac1b5634aa6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 11 Mar 2020 21:39:12 +0100
Subject: [PATCH 2808/4636] =?UTF-8?q?libmysqlconnectorcpp:=201.1.9=20?=
 =?UTF-8?q?=E2=86=92=208.0.19?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This has been seriously outdated:

* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-1-1-10.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-1-1-11.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-1-1-12.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-1-1-13.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-2-0-1.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-2-0-2.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-2-0-3.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-2-0-4.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-5.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-6.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-7.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-8-through-10.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-11.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-12.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-13.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-14.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-15.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-16.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-17.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-18.html
* https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-19.html

Expression changes:

* Format with nixpkgs-fmt.
* Move cmake to nativeBuildInputs.
* Use OpenSSL from the system as using the bundled version is now optional.
* Use MysQL 8.0 since this is supposed to be used with that version.
* Explicitly enable the now legacy JDBC library used by mysql-workbench.
* Remove unnecessary MYSQL_LIB_DIR flag. MySQL will be found automatically.
    * We just need the build script know it is not a static library.
---
 .../libmysqlconnectorcpp/default.nix          | 33 +++++++++++++++----
 pkgs/top-level/all-packages.nix               |  4 +--
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
index 166ff2ef5a02..898c659d0f73 100644
--- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
+++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
@@ -1,20 +1,39 @@
-{ stdenv, fetchurl, cmake, boost, mysql }:
+{ stdenv
+, fetchurl
+, cmake
+, boost
+, openssl
+, mysql80
+}:
 
 stdenv.mkDerivation rec {
   pname = "libmysqlconnectorcpp";
-  version = "1.1.9";
+  version = "8.0.19";
 
   src = fetchurl {
-    url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}.tar.gz";
-    sha256 = "1r6j17sy5816a2ld759iis2k6igc2w9p70y4nw9w3rd4d5x88c9y";
+    url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz";
+    sha256 = "fDvXTOZKkwDn1IG3aziK2VAXpSSAxpi3VVea7GLUoh4=";
   };
 
-  buildInputs = [ cmake boost mysql ];
+  nativeBuildInputs = [
+    cmake
+  ];
 
-  cmakeFlags = [ "-DMYSQL_LIB_DIR=${mysql}/lib" ];
+  buildInputs = [
+    boost
+    openssl
+    mysql80
+  ];
+
+  cmakeFlags = [
+    # libmysqlclient is shared library
+    "-DMYSQLCLIENT_STATIC_LINKING=false"
+    # still needed for mysql-workbench
+    "-DWITH_JDBC=true"
+  ];
 
   meta = {
-    homepage = https://dev.mysql.com/downloads/connector/cpp/;
+    homepage = "https://dev.mysql.com/downloads/connector/cpp/";
     description = "C++ library for connecting to mysql servers.";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 269cfe4fe0d6..91d80d2405ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12767,9 +12767,7 @@ in
 
   libmysofa = callPackage ../development/libraries/audio/libmysofa { };
 
-  libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp {
-    mysql = mysql57;
-  };
+  libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp { };
 
   libnatpmp = callPackage ../development/libraries/libnatpmp { };
 

From d2061f024c5937ff11af454a4ae96688e74b1209 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 12 Mar 2020 02:56:48 +0100
Subject: [PATCH 2809/4636] gitlab: update script: unset GOROOT

or vgo2nix might not be able to resolve some dependencies.
---
 pkgs/applications/version-management/gitlab/update.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py
index dc2d1e29719d..a2a3a6d05b7e 100755
--- a/pkgs/applications/version-management/gitlab/update.py
+++ b/pkgs/applications/version-management/gitlab/update.py
@@ -175,6 +175,8 @@ def update_gitaly():
             f.write(repo.get_file(fn, f"v{gitaly_server_version}"))
 
     subprocess.check_output(['bundix'], cwd=gitaly_dir)
+
+    os.environ['GOROOT'] = ""
     subprocess.check_output(['vgo2nix'], cwd=gitaly_dir)
 
     for fn in ['go.mod', 'go.sum']:
@@ -197,6 +199,7 @@ def update_gitlab_shell():
         with open(gitlab_shell_dir / fn, 'w') as f:
             f.write(repo.get_file(fn, f"v{gitlab_shell_version}"))
 
+    os.environ['GOROOT'] = ""
     subprocess.check_output(['vgo2nix'], cwd=gitlab_shell_dir)
 
     for fn in ['go.mod', 'go.sum']:
@@ -217,6 +220,7 @@ def update_gitlab_workhorse():
         with open(gitlab_workhorse_dir / fn, 'w') as f:
             f.write(repo.get_file(fn, f"v{gitlab_workhorse_version}"))
 
+    os.environ['GOROOT'] = ""
     subprocess.check_output(['vgo2nix'], cwd=gitlab_workhorse_dir)
 
     for fn in ['go.mod', 'go.sum']:

From ab3b8363501805be5dadf0fb95164073aa96f510 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 12 Mar 2020 02:57:39 +0100
Subject: [PATCH 2810/4636] gitlab: 12.8.5 -> 12.8.6

https://about.gitlab.com/releases/2020/03/11/critical-security-release-gitlab-12-dot-8-dot-6-released/
---
 pkgs/applications/version-management/gitlab/data.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 07ec3a291447..ddad51dfb636 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,11 +1,11 @@
 {
-  "version": "12.8.5",
-  "repo_hash": "1y5606p793w1js39420jcd2bj42cripczgrdxgg2cq0r2kq8axk8",
+  "version": "12.8.6",
+  "repo_hash": "0plcigppmg6ckmq8myj3m9adshdvqj7czx8fms71bsa9zx060wib",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v12.8.5-ee",
+  "rev": "v12.8.6-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "12.8.5",
+    "GITALY_SERVER_VERSION": "12.8.6",
     "GITLAB_PAGES_VERSION": "1.16.0",
     "GITLAB_SHELL_VERSION": "11.0.0",
     "GITLAB_WORKHORSE_VERSION": "8.21.0"

From a2a0c9349d9a71d24fefa1adc368555c689443e3 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Wed, 11 Mar 2020 17:36:27 +0100
Subject: [PATCH 2811/4636] gummi: 0.6.6 -> 0.8.1

---
 pkgs/applications/misc/gummi/default.nix | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix
index d1daec284826..af121758c3cd 100644
--- a/pkgs/applications/misc/gummi/default.nix
+++ b/pkgs/applications/misc/gummi/default.nix
@@ -1,37 +1,33 @@
-{ stdenv, pkgs, makeWrapper, pango
-, glib, gnome2, gnome3, gtk2-x11, gtkspell2, poppler
+{ stdenv, pkgs
+, glib, gnome3, gtk3, gtksourceview3, gtkspell3, poppler, texlive
 , pkgconfig, intltool, autoreconfHook, wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.6.6";
+  version = "0.8.1";
   pname = "gummi";
 
   src = pkgs.fetchFromGitHub {
     owner = "alexandervdm";
     repo = "gummi";
     rev = version;
-    sha256 = "1vw8rhv8qj82l6l22kpysgm9mxilnki2kjmvxsnajbqcagr6s7cn";
+    sha256 = "0wxgmzazqiq77cw42i5fn2hc22hhxf5gbpl9g8y3zlnp21lw9y16";
   };
 
   nativeBuildInputs = [
-    pkgconfig intltool autoreconfHook makeWrapper wrapGAppsHook
+    pkgconfig intltool autoreconfHook wrapGAppsHook
   ];
   buildInputs = [
-    glib gnome2.gtksourceview pango gtk2-x11 gtkspell2 poppler
-    gnome3.adwaita-icon-theme
+    glib gtksourceview3 gtk3 gtkspell3 poppler
+    texlive.bin.core # needed for synctex
   ];
 
-  preConfigure = ''
-    gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${pkgs.gnome2.gtksourceview}/share")
-  '';
-
   postInstall = ''
     install -Dpm644 COPYING $out/share/licenses/$name/COPYING
   '';
 
   meta = {
-    homepage = http://gummi.midnightcoding.org/;
+    homepage = "https://gummi.app";
     description = "Simple LaTex editor for GTK users";
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ flokli ];

From 1d0c3f148b3bf4bd3bf6b5d66f9e6c766143c577 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Wed, 11 Mar 2020 21:06:06 -0700
Subject: [PATCH 2812/4636] docker: 19.03.7 -> 19.03.8

---
 pkgs/applications/virtualization/docker/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index e4093ea87e72..7f7b3a227e84 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -206,9 +206,9 @@ rec {
   };
 
   docker_19_03 = makeOverridable dockerGen {
-    version = "19.03.7";
-    rev = "7141c199a2edb2a90b778175f836f9dd2a22c95a";
-    sha256 = "1h1hrp6cw3ah2gaq2vfdd1d9vh7gyf7rs6bdxwpxk9ixc19fxsm4";
+    version = "19.03.8";
+    rev = "afacb8b7f0d8d4f9d2a8e8736e9c993e672b41f3";
+    sha256 = "15iq16rlnkw78lvapcfpbnsnxhdjbvfvgzg3xzxhpdg1dmq40b6j";
     runcRev = "dc9208a3303feef5b3839f4323d9beb36df0a9dd"; # v1.0.0-rc10
     runcSha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk";
     containerdRev = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; # v1.2.13

From ccb9995996d425e4fb637da84b689413987fa58d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 12 Mar 2020 00:00:00 -0500
Subject: [PATCH 2813/4636] nodejs-13_x: 13.10.1 -> 13.11.0

Changelog: https://github.com/nodejs/node/releases/tag/v13.11.0
---
 pkgs/development/web/nodejs/v13.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix
index affb86bece86..c5e3f7c4bdbf 100644
--- a/pkgs/development/web/nodejs/v13.nix
+++ b/pkgs/development/web/nodejs/v13.nix
@@ -5,6 +5,6 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "13.10.1";
-    sha256 = "14pvqwhilq210zn830zmh04a62rj3si0ijc4ihrhdf3dvghrx2c3";
+    version = "13.11.0";
+    sha256 = "07r9xwjmiip9zmgfq77f3av3p93adc5cphj07idph1l8ws1j2h75";
   }

From 070b49ed00b090b444f77d50d07acc34749ebe7c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 12 Mar 2020 01:08:10 +0100
Subject: [PATCH 2814/4636] =?UTF-8?q?mysql-workbench:=208.0.15=20=E2=86=92?=
 =?UTF-8?q?=208.0.19?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* https://dev.mysql.com/doc/relnotes/workbench/en/news-8-0-16.html
* https://dev.mysql.com/doc/relnotes/workbench/en/news-8-0-17.html
* https://dev.mysql.com/doc/relnotes/workbench/en/news-8-0-18.html
* https://dev.mysql.com/doc/relnotes/workbench/en/news-8-0-19.html

The release notes contain the following:

Important Note: MySQL Workbench 8.0.19 is unable to open a new connection to MySQL Server from the home screen if the server is not started and you cannot start a server by using the Workbench Administration feature. Administrative and SQL editing tasks require an online server for the duration of this issue. Feature tasks that you performed with an offline server in previous releases now return an error message indicating that the server is unreachable.

but it is clearly better than having it broken.
---
 .../misc/mysql-workbench/default.nix            | 17 +++++++++++++++--
 .../misc/mysql-workbench/fix-swig-build.patch   | 12 ++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/misc/mysql-workbench/fix-swig-build.patch

diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index d0c2e45f3062..03483a1a2b8a 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -29,6 +29,7 @@
 , libsigcxx
 , libX11
 , openssl
+, rapidjson
 , proj
 , cairo
 , libxkbcommon
@@ -44,11 +45,11 @@ let
   inherit (python2.pkgs) paramiko pycairo pyodbc;
 in stdenv.mkDerivation rec {
   pname = "mysql-workbench";
-  version = "8.0.15";
+  version = "8.0.19";
 
   src = fetchurl {
     url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";
-    sha256 = "0ca93azasya5xiw6j2map8drmxf445qqydpvrb512kjfqdiv67x6";
+    sha256 = "unrszSK+tKcARSHxRSAAos+jDtYxdDcSnFENixaDJsw=";
   };
 
   patches = [
@@ -67,6 +68,13 @@ in stdenv.mkDerivation rec {
       rmdir = "${coreutils}/bin/rmdir";
       sudo = "${sudo}/bin/sudo";
     })
+
+    # Fix swig not being able to find headers
+    # https://github.com/NixOS/nixpkgs/pull/82362#issuecomment-597948461
+    (substituteAll {
+      src = ./fix-swig-build.patch;
+      cairoDev = "${cairo.dev}";
+    })
   ];
 
   # have it look for 4.7.2 instead of 4.7.1
@@ -98,6 +106,7 @@ in stdenv.mkDerivation rec {
     boost
     libssh
     openssl
+    rapidjson
     libiodbc
     pcre
     cairo
@@ -133,6 +142,10 @@ in stdenv.mkDerivation rec {
     "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config"
     "-DIODBC_CONFIG_PATH=${libiodbc}/bin/iodbc-config"
     "-DWITH_ANTLR_JAR=${antlr4_7.jarLocation}"
+    # mysql-workbench 8.0.19 depends on libmysqlconnectorcpp 1.1.8.
+    # Newer versions of connector still provide the legacy library when enabled
+    # but the headers are in a different location.
+    "-DMySQLCppConn_INCLUDE_DIR=${libmysqlconnectorcpp}/include/jdbc"
   ];
 
   # There is already an executable and a wrapper in bindir
diff --git a/pkgs/applications/misc/mysql-workbench/fix-swig-build.patch b/pkgs/applications/misc/mysql-workbench/fix-swig-build.patch
new file mode 100644
index 000000000000..ace1e5add43f
--- /dev/null
+++ b/pkgs/applications/misc/mysql-workbench/fix-swig-build.patch
@@ -0,0 +1,12 @@
+--- a/library/forms/swig/CMakeLists.txt
++++ b/library/forms/swig/CMakeLists.txt
+@@ -57,7 +57,7 @@
+ 
+ set(CMAKE_SWIG_FLAGS -w312)
+ set_source_files_properties(cairo.i PROPERTIES CPLUSPLUS ON)
+-set_property(SOURCE cairo.i PROPERTY SWIG_FLAGS -DCAIRO_HAS_PNG_FUNCTIONS=1 -fcompact -DSWIG_PYTHON_LEGACY_BOOL -I/usr/include)
++set_property(SOURCE cairo.i PROPERTY SWIG_FLAGS -DCAIRO_HAS_PNG_FUNCTIONS=1 -fcompact -DSWIG_PYTHON_LEGACY_BOOL -I@cairoDev@/include)
+ if(CMAKE_VERSION VERSION_LESS 3.8)
+   swig_add_module(cairo python cairo.i)
+ else()
+

From 19fdac26c491d66525fd36d581aab48b3f7c1639 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Mar 2020 06:10:16 +0000
Subject: [PATCH 2815/4636] rust-bindgen: 0.53.1 -> 0.53.2

---
 pkgs/development/tools/rust/bindgen/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index c064ebc4e7e1..2ca4b8070aaa 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -3,7 +3,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rust-bindgen";
-  version = "0.53.1";
+  version = "0.53.2";
 
   RUSTFLAGS = "--cap-lints warn"; # probably OK to remove after update
 
@@ -11,10 +11,10 @@ rustPlatform.buildRustPackage rec {
     owner = "rust-lang";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0zxqryqks9in9q7az0lrw8fq9wnc5p4yf6b1fxnzy2j6qhlw2c5c";
+    sha256 = "01dkaa2akqrhpxxf0g2zyfdb3nx16y14qsg0a9d5n92c4yyvmwjg";
   };
 
-  cargoSha256 = "1fdgm83l9d469garfbgny6jk1fvwnwh32sybz9g7s2qzrvzzrx1d";
+  cargoSha256 = "0pm9kh3qrcv5jsbrr476982lg1j31fbvxpzs4gphxl0mv1qmp4zm";
 
   libclang = llvmPackages.libclang.lib; #for substituteAll
 
@@ -58,7 +58,7 @@ rustPlatform.buildRustPackage rec {
       As with most compiler related software, this will only work
       inside a nix-shell with the required libraries as buildInputs.
     '';
-    homepage = https://github.com/rust-lang/rust-bindgen;
+    homepage = "https://github.com/rust-lang/rust-bindgen";
     license = with licenses; [ bsd3 ];
     platforms = platforms.unix;
     maintainers = [ maintainers.ralith ];

From da13cdb56cb02553ac9f991ffaa6b1e36b25d7f5 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 12 Mar 2020 15:03:26 +1000
Subject: [PATCH 2816/4636] fzf: 0.20.0 -> 0.21.0

https://github.com/junegunn/fzf/blob/master/CHANGELOG.md#0210
---
 pkgs/tools/misc/fzf/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 0694d5931eff..740b600cdb3e 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -1,17 +1,17 @@
-{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, }:
+{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses }:
 
 buildGoModule rec {
   pname = "fzf";
-  version = "0.20.0";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "junegunn";
     repo = pname;
     rev = version;
-    sha256 = "02zy3c4k84rzqdkaf04idbj10v286hi0ix1xl2qsz1wrblh168w8";
+    sha256 = "0s52mq64r44dh7wwc4h96xhhbxf000dr96nim0g0dcmkmnm2p8gv";
   };
 
-  modSha256 = "12lnv8b96adpcg9qfizcyd9nxz590nxd82xch6ij719zlqyps143";
+  modSha256 = "16bb0a9z49jqhh9lmq8rvl7x9vh79mi4ygkb9sm04g41g5z6ag1s";
 
   outputs = [ "out" "man" ];
 

From be13a1f358dde598f8b9c50a4e06267ded686c8c Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 12 Mar 2020 10:43:26 +1000
Subject: [PATCH 2817/4636] podman: 1.8.0 -> 1.8.1

https://github.com/containers/libpod/releases/tag/v1.8.1
---
 pkgs/applications/virtualization/podman/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
index f4a810687812..7e557842bc8d 100644
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@@ -5,13 +5,13 @@
 
 buildGoPackage rec {
   pname = "podman";
-  version = "1.8.0";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner  = "containers";
     repo   = "libpod";
     rev    = "v${version}";
-    sha256 = "1rbapks11xg0vgl9m322mijirx0wm6c4yav8aw2y41wsr7qd7db4";
+    sha256 = "047nji6vbrdb1pm8ymxz4dv07xdnp5c624bq2cfy58m5l4f1dn75";
   };
 
   goPackagePath = "github.com/containers/libpod";
@@ -38,7 +38,7 @@ buildGoPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://podman.io/;
+    homepage = "https://podman.io/";
     description = "A program for managing pods, containers and container images";
     license = licenses.asl20;
     maintainers = with maintainers; [ vdemeester saschagrunert marsam ];

From 2f1859fd1d06a80ee93900cb55bf2eae91914604 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Wed, 11 Mar 2020 20:30:13 -0400
Subject: [PATCH 2818/4636] leftwm: remove unused patch file

As of the upgrade in https://github.com/NixOS/nixpkgs/pull/82188, we no longer
need the patch file; I meant to delete it in the previous PR but forgot.
---
 .../window-managers/leftwm/cargo-lock.patch         | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 pkgs/applications/window-managers/leftwm/cargo-lock.patch

diff --git a/pkgs/applications/window-managers/leftwm/cargo-lock.patch b/pkgs/applications/window-managers/leftwm/cargo-lock.patch
deleted file mode 100644
index 54b7e47cc075..000000000000
--- a/pkgs/applications/window-managers/leftwm/cargo-lock.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 915ab04..3d5956d 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -370,7 +370,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
-
- [[package]]
- name = "leftwm"
--version = "0.1.9"
-+version = "0.1.10"
- dependencies = [
-  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
-  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",

From ff7b4faeffee7b313f95677e75e2cd3a32aed111 Mon Sep 17 00:00:00 2001
From: Rhys <rimmington@gmail.com>
Date: Thu, 12 Mar 2020 13:59:56 +1100
Subject: [PATCH 2819/4636] terragrunt: 0.21.11 -> 0.23.2

---
 .../networking/cluster/terragrunt/default.nix |  4 +-
 .../networking/cluster/terragrunt/deps.nix    | 84 +++++++++++++++++--
 2 files changed, 80 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 49f55370bc42..1058b21d3e95 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "terragrunt";
-  version = "0.21.11";
+  version = "0.23.2";
 
   goPackagePath = "github.com/gruntwork-io/terragrunt";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner  = "gruntwork-io";
     repo   = "terragrunt";
     rev    = "v${version}";
-    sha256 = "1w64skk67i0sxjd2mkyqh3nglc32wc7schk7h8fwszpa1rw4dfcn";
+    sha256 = "1r3q7faxys0h147cr9154pcix1qgj36v41ja9hhbggm4c7vig4s1";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix
index 51cb455ce7c9..16105dbadcb9 100644
--- a/pkgs/applications/networking/cluster/terragrunt/deps.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix
@@ -5,8 +5,17 @@
     fetch = {
       type = "git";
       url = "https://code.googlesource.com/gocloud";
-      rev =  "28a4bc8c44b3acbcc482cff0cdf7de29a4688b61";
-      sha256 = "0j40msxm72m8gs87rpwkk19iagjj387r42xwxszmrna7il8g0sbl";
+      rev =  "d96ccb2ba7586bb79a416471882d347754a78ce5";
+      sha256 = "18f1l28665x1a8j8a5bh2i7wb2vrwj050d1g5qda50isgqaybixd";
+    };
+  }
+  {
+    goPackagePath  = "github.com/BurntSushi/toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/BurntSushi/toml";
+      rev =  "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005";
+      sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
     };
   }
   {
@@ -243,6 +252,15 @@
       sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz";
     };
   }
+  {
+    goPackagePath  = "github.com/jstemmer/go-junit-report";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jstemmer/go-junit-report";
+      rev =  "cc1f095d5cc5eca2844f5c5ea7bb37f6b9bf6cac";
+      sha256 = "1knip80yir1cdsjlb3rzy0a4w3kl4ljpiciaz6hjzwqlfhnv7bkw";
+    };
+  }
   {
     goPackagePath  = "github.com/mattn/go-colorable";
     fetch = {
@@ -378,6 +396,33 @@
       sha256 = "17g8fb9vy2sqq8vgz8jdvf6c6d2290gm2qs0i4yzsd86mgn4dlrg";
     };
   }
+  {
+    goPackagePath  = "golang.org/x/exp";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/exp";
+      rev =  "f17229e696bd4e065144fd6ae1313e41515abbdc";
+      sha256 = "0q1fij8izg7xcnx7wqh0zdnya11k3d9a5fqm0yb2r93jhlf3x128";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/lint";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/lint";
+      rev =  "910be7a94367618fd0fd25eaabbee4fdc0ac7092";
+      sha256 = "08gskshgfwxhmm9i4vgd4q7kqd5i7yihqh33v6r07br6kqd0g995";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/mod";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/mod";
+      rev =  "ed3ec21bb8e252814c380df79a80f366440ddb2d";
+      sha256 = "1fp6885dclq77mh73v7i54v2b9llpv4di193zc8vmsbbkkc483cl";
+    };
+  }
   {
     goPackagePath  = "golang.org/x/net";
     fetch = {
@@ -414,13 +459,31 @@
       sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
     };
   }
+  {
+    goPackagePath  = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev =  "49b8ac185c84c5092be0953fb92b7660db9b8162";
+      sha256 = "0ccsm8p9i83f0s0z5c7jwyzj7jgcg60zf20hzrmp705669wn5y67";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/xerrors";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/xerrors";
+      rev =  "9bdfabe68543c54f90421aeb9a60ef8061b5b544";
+      sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c";
+    };
+  }
   {
     goPackagePath  = "google.golang.org/api";
     fetch = {
       type = "git";
       url = "https://code.googlesource.com/google-api-go-client";
-      rev =  "890e5eb51fe205e56dc55eb68d63e82039730816";
-      sha256 = "05r2wsjnmszsz4y59w8q6qknc7zq1mc56kya61i2133dqxyc55ai";
+      rev =  "e9c39defab7fc4be8ec95d4ce422dbeae4070400";
+      sha256 = "01wjr07xnb9s32y2jc6d0rba3jxwccd2wydm6cql41yhyr3x84rd";
     };
   }
   {
@@ -446,8 +509,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/grpc/grpc-go";
-      rev =  "501c41df7f472c740d0674ff27122f3f48c80ce7";
-      sha256 = "0hla9rjvyi6wjak4cw39ic8jkdcd0lsymhrz9sa52bfybxsczf38";
+      rev =  "f495f5b15ae7ccda3b38c53a1bfcde4c1a58a2bc";
+      sha256 = "09phrrsafgq6hnbw8cawvx44bdpk1p584fys17x1bwn0j0451zzs";
+    };
+  }
+  {
+    goPackagePath  = "honnef.co/go/tools";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dominikh/go-tools";
+      rev =  "afd67930eec2a9ed3e9b19f684d17a062285f16a";
+      sha256 = "1rwwahmbs4dwxncwjj56likir1kps9937vm2id3rygxzzla40zal";
     };
   }
 ]
\ No newline at end of file

From b63f684b3d0b2e3d904ccc6348718adc7c6f93d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Wed, 4 Mar 2020 11:58:03 +0100
Subject: [PATCH 2820/4636] lib.callPackages(With): guard against a repeated
 mistake

For example see the parent commit.
---
 lib/customisation.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index ac234e3b8c6f..dc5dd7691976 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -131,7 +131,12 @@ rec {
       origArgs = auto // args;
       pkgs = f origArgs;
       mkAttrOverridable = name: _: makeOverridable (newArgs: (f newArgs).${name}) origArgs;
-    in lib.mapAttrs mkAttrOverridable pkgs;
+    in
+      if lib.isDerivation pkgs then throw
+        ("function `callPackages` was called on a *single* derivation "
+          + ''"${pkgs.name or "<unknown-name>"}";''
+          + " did you mean to use `callPackage` instead?")
+      else lib.mapAttrs mkAttrOverridable pkgs;
 
 
   /* Add attributes to each output of a derivation without changing

From 03fb78e80e8d56a2b90d328a7f54ab1c8f586fb8 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 12 Mar 2020 04:20:00 -0500
Subject: [PATCH 2821/4636] spotify-tui: 0.15.0 -> 0.16.0

Changelog: https://github.com/Rigellute/spotify-tui/releases/tag/v0.16.0
---
 pkgs/applications/audio/spotify-tui/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix
index 9613df6df0b7..94f08a5f7a82 100644
--- a/pkgs/applications/audio/spotify-tui/default.nix
+++ b/pkgs/applications/audio/spotify-tui/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "spotify-tui";
-  version = "0.15.0";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "Rigellute";
     repo = "spotify-tui";
     rev = "v${version}";
-    sha256 = "19mnnpsidwr5y6igs478gfp7rq76378f66nzfhj4mraqd2jc4nzj";
+    sha256 = "0fmj25zjg12v0kyanic343lrdhxkh290v88qiz6ac47g8bdy3c83";
   };
 
-  cargoSha256 = "1zhv3sla92z7pjdnf0r4x85n7z9spi70vgy4kw72rdc5v9bmj7q8";
+  cargoSha256 = "1n8aacy0hapjm10hmgqm07rb5c0ngmzr1s116pspsl7cdszza6xi";
 
   nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ];
   buildInputs = [ openssl ]

From f6914a589efd3869148ccc3e0013161da2c0ae81 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 12 Mar 2020 04:20:00 -0500
Subject: [PATCH 2822/4636] postgresqlPackages.pgroonga: 2.2.2 -> 2.2.5

---
 pkgs/servers/sql/postgresql/ext/pgroonga.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
index 866dd8021d0a..f57a6e8fa508 100644
--- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pgroonga";
-  version = "2.2.2";
+  version = "2.2.5";
 
   src = fetchurl {
     url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "0pdz2lpi7g1n9b5rg6kwhh6fr0bwf06zr642brmh53n6mp41186m";
+    sha256 = "0lwj99kdx9kfp4vfd7lfapj183mz235kj1vjfscfnkg5ypj656gz";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 6aae443d0a90bbc52b3ff67ed981fa16cb6ad0c7 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 12 Mar 2020 04:20:00 -0500
Subject: [PATCH 2823/4636] fselect: install manpage

---
 pkgs/tools/misc/fselect/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix
index 6486e3ca20e1..e508eb02ad09 100644
--- a/pkgs/tools/misc/fselect/default.nix
+++ b/pkgs/tools/misc/fselect/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
+{ stdenv, fetchFromGitHub, rustPlatform, installShellFiles }:
 
 rustPlatform.buildRustPackage rec {
   pname = "fselect";
@@ -13,6 +13,12 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "0mjd9nmaggsszf0kx68yrvy3fqbn35v34c7q3584fv50ipqn6drb";
 
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    installManPage docs/fselect.1
+  '';
+
   meta = with stdenv.lib; {
     description = "Find files with SQL-like queries";
     homepage = "https://github.com/jhspetersson/fselect";

From d3f05c2016021b4fcc1aa06c42fd7c9b3db40f2b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Mar 2020 09:43:39 +0000
Subject: [PATCH 2824/4636] thonny: 3.2.6 -> 3.2.7

---
 pkgs/applications/editors/thonny/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix
index 16f1ba4346e9..706d3fd71763 100644
--- a/pkgs/applications/editors/thonny/default.nix
+++ b/pkgs/applications/editors/thonny/default.nix
@@ -4,13 +4,13 @@ with python3.pkgs;
 
 buildPythonApplication rec {
   pname = "thonny";
-  version = "3.2.6";
+  version = "3.2.7";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "19krnxpp3i1n65zafazvdm9mvnjry5rml0y9imj4365q4bkj20g2";
+    sha256 = "0gzvdgg5l4j0wgkh7lp4wjabrpxvvs5m7mnpszqixxijdffjd4cj";
   };
 
   propagatedBuildInputs = with python3.pkgs; [
@@ -45,7 +45,7 @@ buildPythonApplication rec {
       evaluation, detailed visualization of the call stack and a mode
       for explaining the concepts of references and heap.
     '';
-    homepage = https://www.thonny.org/;
+    homepage = "https://www.thonny.org/";
     license = licenses.mit;
     maintainers = with maintainers; [ leenaars ];
     platforms = platforms.linux;

From 8899c72990261aa4042e928d41bd57a06568d1f6 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Tue, 10 Mar 2020 16:52:37 +0100
Subject: [PATCH 2825/4636] firefox-bin: 73.0 -> 74.0 (from PR #82257)

---
 .../browsers/firefox-bin/release_sources.nix  | 770 +++++++++---------
 1 file changed, 385 insertions(+), 385 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 9228dfebbdc7..02c90006f340 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,965 +1,965 @@
 {
-  version = "73.0";
+  version = "74.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ach/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ach/firefox-74.0.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "9b93c28d9236318f779df24675207e14976a3a303852f111e3e54f81fe24019f48d16c13c92dcf8301d2f7a40f127c75ca940adda251437d45edd1c11d961395";
+      sha512 = "e5d3f75026891916b44fe962b8a01bb76e434269c2e9c10c8815765a8fe3b5eadcd63ade57ac2b103a8b66fe26ea6715f6c6d1ef675390e339c4d82c7f6a2723";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/af/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/af/firefox-74.0.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "b6828a008030b775176d165082cfa9c6eecfe5857ab0702702c7298b4d946f0aced8338182c5dc84437b7b02e42a33c6df6c1d38b0b4da6cf0bebc3f364d7f96";
+      sha512 = "0a901248b2ebf5a8cf9755abda8bc170a295f65fca461e39d4957595295b61b7be91af3d5ce72c20fb1848a2d2bd017d6d6ce1e13415383d1087bb824a9e56ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/an/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/an/firefox-74.0.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "b1676964b0b9a935b4be440d82dca37c75362a4d47b227435d04d84ebde94eec469faf9fceff32235112bd816ae85f5290e776b9e983c9a3566b89205800ca06";
+      sha512 = "ce2ccb8f33acf35b58462573efe1ae5c37ba79c6174340b0e5391d90f826b2ba40aa1925d1aa247f15ab4f1272f552a15167019161f3ba53edcb6b994592d83d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ar/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ar/firefox-74.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "058be707b6348036150124d85010f9d8475efd2a6d910a3f4ed114d2b51cb63775b35e83e0799635755c5c016b21595efb20ec5c53a362280dfb424efffe0d54";
+      sha512 = "8f7e36ce99b292084528ff29f78a85808f9259d7c6f6b20aba1a1b20de97238a9efc5fc6aefb6ddd1137f98a27e1f6ce62db3f8bac0fb2d8a7659a6f1ffe7049";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ast/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ast/firefox-74.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "6e36766b939f42f6f8cf551e5ebafbf57a857ab584579797c84eccaf1a669e2f9daeb13b1a897b90153eb502c97f63a55ed7a2bab2de4feb92719e2aaf42ba52";
+      sha512 = "042d6eec61bbc6d4b98bae661ac3fe30120ad8c732ee450b363cc6ffc78ba8367eb72d42fcf6244b72822d6a333045d7cbd38498ef12901566d3b2576d34d181";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/az/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/az/firefox-74.0.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "f6c065ac0af3cb2ef1dca288810192b8ee5906f7fa03bab713a8abea4b811c78b4278340bc5226ddd4113851f9b753268965905e020f74875d2ef3d2c2ecafbd";
+      sha512 = "3ad861f357fb538d45388b9b2959043b157422144e426053e84b3094ac99a61af1bcbcd4697ba4da9bae70ce50915aaeea62b82f03e465669c54c9ddba4482a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/be/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/be/firefox-74.0.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "710c468adc051a5895ef429585f9d94f4f6ac533703f2674c9433c04011e411bde0827739c28d300a2e90cea13db0dac4bca1f37a711ff0bdf19d5c4853b7570";
+      sha512 = "cbaaf387a9cdd6918d0a8dfe81ce02c0c6de644d791bd4ffb26dc84679a2129abfea068569967389672d7097e03c73b8999466b816942b14739eaa9d4c7c8772";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/bg/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/bg/firefox-74.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "328586ac2b3182c455f3abab8b6177e97d7389c4150f8708807b52f632d84e88cf342358818514b93b5d8428c6c870b21f1138803e8a7256c95487f5dff5e9db";
+      sha512 = "7cce07ef87dd0d0c2a7040238c2a3f9f2d52eb2e13f1037031d5e8e1c9ffd4b64f018b2e6ca76dd3bf9556603da2454bd5e0ec86af9bf38b4001fa9cdc3f1707";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/bn/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/bn/firefox-74.0.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha512 = "c7730bc40976685b40161a6238d0982775ec02429923443265d5165d12adb8b863190c4e57c082c09c4c6ab3348be035e338f3c34d78503b521928f3722139eb";
+      sha512 = "3208c555544130df757d30a89769b9ed30a458712a109868d5d2d09212caba02b5c2200a30ae12546113c96b6ea32996367013aae11cfcfe358cbf60f2a26f87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/br/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/br/firefox-74.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "2083a6598a60dfae7093828fa8c47a149b2af18180b360817333de126077a067a81a1b7aa98aadbbba51cab5a8e66811a8a3513e68f5fb6e0320807cce782502";
+      sha512 = "2840bc7fda4e4713dbba8f09c0295b8c566de5aa86486db33be1f05b56ac02204227559b546b18c4531539e3a4beec13b8c61c2e9aa756bb38329a5dc2d6ab81";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/bs/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/bs/firefox-74.0.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "4e5f04c7ecd8b4707c5107bc0e862a9ea0f099ce070c6d271c4d5b034330a0595a07c3de2117b1199dd475492edda863e02d541eb2f7e507710e06665741d5c0";
+      sha512 = "c0155a15069791538342d767e36ded097deae8ba66b27f6ed34ee00b31ce045fba718e58452dda47b53fa4f26dbc44420b5d1c2d6b6610c5a57d3a58c63eaef0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ca-valencia/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ca-valencia/firefox-74.0.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha512 = "103ba1a390de36018e8ab834d7ae144dd8187e8211d94c18fe2d84935efdeec64093531f2e3dade16fbc123930549ac2282d1c5c915ecef38428726420915925";
+      sha512 = "29051c03f47f5c7d9c9b1ec62d4e94b3732f2e695f92300f1f035226cd81f308f3bdfe987bdbfbed19b15618e89bc1955be3086828a6f495488730d7cc76b014";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ca/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ca/firefox-74.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "90f2e9b575e390d57c6ac91f784e20cc740049096747bedeba1fe467e77a2b7b88e119f66e7be46d8f3261ec66aefa73a7ce11e3ea5b4520dcd1fc2467a7d169";
+      sha512 = "8cc5c4a3302cae8449fbb215c456073a03d86cc555737ef0481480b695ff6e72d59a4ec54d8205423eb588f4aa9273711a2a61722241335d68461aa6597ec4ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/cak/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/cak/firefox-74.0.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "fffd827c9b8b5d5e83eab130ac7c34cae00c166314757576f3fae5f978d090bb9bc6e793eb1265d91c34ee95f4321f1e02d579680990d383e385a346c16ac61c";
+      sha512 = "ba11aa53222ad1947a0a8d41b2a0d5e16afdf2857a0415e28c21fee8b27464741c0d10f8655182c5b2992362f040290aa6dfa720b3f76968f26407e9e9183ca6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/cs/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/cs/firefox-74.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "f544d707deced655448ce595ff700671d796180d3df9e5e651176a72daed9e203bf8d8bfe6fbd6c57907cefca7bab5e9beda2b785c7306a87e426df88335982d";
+      sha512 = "59c3c417a4a686ab3ef0073f8e153964f2e516c98f6772cb1be93e6f25ff9d34a830042043ef9ef7436445e9932f862f59ac1c00ee55cdf273f4c514473df1cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/cy/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/cy/firefox-74.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "a039a02f17483c4d9b7a5563af4fcc72a73c35ebe9d9d383b3e1ae8013e0dd5b9660ec650a6f11a21d4359605f6252faf1dd99fa8b9525edda5336a3f28138b6";
+      sha512 = "06225ca6ee4fa5e7b4c790b0904faac902ff260acfc52df60f87d0a146c6bb299b74ce0163ffa6c2dd951bb8a6abc79f99ceff03ddac1481c548eac7ab717708";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/da/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/da/firefox-74.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "f8829df5163a12e806ed29a640159cc220dd8a39eba48b51e03c5524f5976ff4452eb19064441b4e81fd0e30a8c3058117f5a022e2b7a8e76e5e8898eb4ab54a";
+      sha512 = "0e0f3db805b0d63182060cd94dd0611ddedd2bdb0e9dd41e29ab8ea5e14c31ada265c284000de07fb3315e83a5c49bae7ad5d7976bf6eaff819de80270a8eaea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/de/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/de/firefox-74.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "45c2ec4167c4f6cec18c306fb04c1eb0a430809220157c5757ca7565da3150ab82490c946afd7b255ebc75118fe2a2ee8228a31149545e5901b15b5c9fd113ca";
+      sha512 = "35a674acf20ac903d208bad89ff681ede7fb4c9ce2bfaa3ae0696ccdfe38e065c8e19cc9afbd711aa3ef0591a3fbb0f196e71e2bb2d3407d9084f12b297d0eab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/dsb/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/dsb/firefox-74.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "f67dc560d458660eb16eed78edce3157c31e195721cd350722c189fbd3936b13e9d230f00e5079a52fcf229bac352f7e6f88c5972c26b3797c470278b352d2e9";
+      sha512 = "7aa789662ef83d31d7bb68ec95405becf328df9127b02d128638b6726ace88038b75b94262ff12774c2f4538e789ac75d8447935b0160b7967b8b46b4f576d55";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/el/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/el/firefox-74.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "247eaa4b6bbbb34e809232f5f907d67e01e95c77397734a5fee7483a6215ab8492e138e1b593a9b1a4b647c7aadf662e14a51e6dfc2b4acb4151be61767393ed";
+      sha512 = "67bde03970d1e5ec54badb0964ff2080158e49c8f6a39243c58e7152d17d7908ecf79c6513e1e492f2816d5e5daa31bbb60631be6d56545b55a37bc36d3d1fa3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/en-CA/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/en-CA/firefox-74.0.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "d4705fcbccb47d765ed3a56ae7895b285d57486c2c95ac9e12e13b1b403e6cf713291960315808350d452c05ce7441ef3da4042e29d1e2e59ff50bfb3bf567f2";
+      sha512 = "322cda1175c9550d10317149761f7fe4bb0a518adb1a7d4cbb96801f9cf3ecd86ca23b30109ccb513b398c1de7e4c9d3f86571a97fd8b3904c81cab1f18bf45c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/en-GB/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/en-GB/firefox-74.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "3a27d69fdc1c1d4aa47a3181bf7d9842c0833da8ce1c132da7b289f6d49054e6b666184d1866506bc05f802c9e817e0ca659ac3ea228c91866b64df66ef7dc8b";
+      sha512 = "80200e9e82544cdc88d39d620be89c6794d9f9c094fede1f3b0dcc59ae782ae1335954a8ef230ed30bb4295c067ea9bb080bd1415fceda0acec1f7886c667d47";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/en-US/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/en-US/firefox-74.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "1acb3149e99d0e38eb624c98a6471b4d8e3fa6eedb13cc516f581aaa561f1de9d3238e6ec9364e937532d2beacd9aba2ccad72872f114013e7490412c56195c5";
+      sha512 = "6efa1ab5c884348ce011a5c3d370f04941ad37d14fbc36646f650ae877f2d3fa34960ab35368f8811132127d205c9d00bbca9d8d40f01a4d32f126bd20d9b0c1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/eo/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/eo/firefox-74.0.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "d8a598569daeda5e5fdc5c5fd2580e85f5933bb1ebec806373755442d3c660c5b0ad38b24bc41e0b05c734489fe27836f5d22718709d1447bd36b1480b2f02f4";
+      sha512 = "afb711b4f859997c26973bb0c76dc1f1b30c2fc2b3bd7bad29e7a804d20cbdec746678767fc906f18263fecb0d2199ee96d569f9d13d7a23070804f7b2dcc3e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/es-AR/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/es-AR/firefox-74.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "531eea7a2cb3d98b2a61226f72ac1cc33ac94844787f5db0db84a81655f1909a1f9633353b5b0aaa25aa892d15a1789ada008274b955ada991e5eea1c71ab168";
+      sha512 = "8411449eb3699f43d2c430791b31f76d65e446a171757a6f6a461966640e23ddd94bf94f832537b0b6bbc2f4618b7384856cbeb2a8a5e0130a40ce9362561ebc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/es-CL/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/es-CL/firefox-74.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "9901d90be922471ab32b5780ece1ea3f5756250229a8d30a336890823dc8dfadc96992f582c3671afef94802b2003d64a7f77ff469ba5a7ce104b34852f123ea";
+      sha512 = "20400f859333966edf138b391206595c8c57cdfd57803fcecec993d6149019662d02b31a9e7c82bbbd3a57a827f29940ed1b4112a73e4cf4be6a1f327e834265";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/es-ES/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/es-ES/firefox-74.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "5615f29da4d69a93b1b07f90f248aada987d56626fd61684ae2d0c4c2d7d2398d30e0de41ce9eb2a7e066b1f34ea07d06f50ccc91dee41dfa2427ed8f2ee8166";
+      sha512 = "b9017bc5587d16dd2cd5f1d3ac8ee6eda2768a4a6f15fbd05ecb437cb9cd341bf12a795a8dd110474abed874549855550af1f4d6836b13c4e020f6b66ef6f7f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/es-MX/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/es-MX/firefox-74.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "49453184964bb88329f6385afa382f440e2400333cf53e737491f248e43c5522e171bc85da86e3c2e5b6e2aca6c1136c529d91dec58cfade30ff67fc552d09c9";
+      sha512 = "ec482c757317556b4e77e46bf885d99824b4a48577e3efde0c89d7bcb9464199c005ac4aae380294049f5c72b1f792c41fcc6592bac97cf4b7961925e82a5f58";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/et/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/et/firefox-74.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "1e5e2f0bbed1e9dff29f646b8038fb27c46ef8cbf6a978e324efe9522c78983133ea3a675f077f837ffc53816c6120b7ff680fd1ba5a761de74162764aedbcfe";
+      sha512 = "afd3cf4f9384cccc079160f3bee5a87d0ced59387b1ee653200c73f541bfaf414f983110e29ef54bf45c869dc7b9e82f50baad2691c0bcbabf1f2f49283ba144";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/eu/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/eu/firefox-74.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "c99b22564d7d3d16aff4ec9749ce1699b61ddf271ebcd9b24934271b31bacc68936d11f166730f93b5346acbef3116ee67b336364c33bbe3fca1fa18d41c6c9c";
+      sha512 = "b09cd73ed933b56266955a82ebb2b6dc0f9f6ef372680172e5198f4ecc369e9bbeb98cf09a6278c4363c9a88c3367806453821da5293fbda18cf961c09cf94b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/fa/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/fa/firefox-74.0.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "91ca6ec0f36895609184a1be784848ca208534dffa9c554f7d271d16585e9d220cfef7da176ae23e4836f7e8d26493088f863f59dc9f6af5b58e7006d7e4a37c";
+      sha512 = "8661510591646f2b581866a2f2c1816eefafedaea05f7daffb7a4ba51423de1390f9f234b03021ecbc1a344a2537585ad1284d69efb5b0e314d53cdae09f194d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ff/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ff/firefox-74.0.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "07e0096e432fc7e95d26ae4af3cda0238f28272bda6239f54e891df28a50d414301da8218813ed36b959a2db004c55dfc6f1d3a5b1a31a321fed72d6cdc47f11";
+      sha512 = "b42acd23ac34c4998e1cf27a1b74d12fbb954dc65ce7351d7721f91c16338e30239c79660c8d6c07eedcd9601fff6d7b7c94b69f7e86dbaf8001341a9bad8b20";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/fi/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/fi/firefox-74.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "1199ed222e7092a852d3911e576057d52add578acd68a28ec334e377644aed48cf8ea0ca145f6996181bb006a067b3560112599d4bf9dd07528f31a0036d7fd0";
+      sha512 = "25ec4fa9f055d2929d400614442bf771941236d6b54741ba1961d6775c070612367d61a23fb21ff3a8773b55614960e722372287c98079947afcbea6dc65a0cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/fr/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/fr/firefox-74.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "9d287d14eedf1f32c6b5b8b0556191892541db4ef23e7a7a4aeec956ea26e0a5361f15560aac45970cd702909f654058549114cba98f7204adbc1decfe66c074";
+      sha512 = "2fe23f3c5b82b831f2cdc9b07381160078cf0ff92df5e464d249f896ab9467b8e4464d5415267014b9f620601e7bdeef884fd1eccfeffcd6c0df454df4c7853a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/fy-NL/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/fy-NL/firefox-74.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "db42296b84eb0a383728e79b024aff82fc3f5da1f35292b5b9a78ec65b8c7955dc502b2a2107ecb845b0816343cf05abeca075a4291bcee78ce8be8d4337b696";
+      sha512 = "3620d8f7e24f31a261c73fa6f34c88761148f5ddfd3341575e12e82e1889dd59d0cb21ee8bdbb43b92d9033d274bc4e98ae4a29adb95a750f07abe9e605a4f03";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ga-IE/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ga-IE/firefox-74.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "789b435790aaade6a52b9ce4aca30bfaf9d9e2899d2cc640b095227712ff06b503b36d64c3330a8c4ca7b867cbb4ee324e66a5f338ac3e01c85773955ff3c70f";
+      sha512 = "75362b8c7bf608a2049d217a442364d0cf3e7dc31419997e43cb25a821d8a31e1d923a2770f9b360cb32923e4338c16718697fab9b16c018a7670299d55da462";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/gd/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/gd/firefox-74.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "bb6aa1596ecc3b71562d4e83a0ab1e49d28a2c4de75b4f5056f8d38b83e65b79231e06ffdabc61ddccf358a79583be568db3374d748686379da2163ceb8494f6";
+      sha512 = "e888397bc7655e55c4c91376b7165a1dcbbd320e591cafddeef7726caf8c7eb5acca6fd82600ff05a22cf0e1514b9a2cecc8d34d8ae75142cf47a2134cd50407";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/gl/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/gl/firefox-74.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "1315eaedb0bb6336377fd61a3b02cb0391cb81441f1c6c4dc3935bb9bf707fb0d5b8b32ca6c9c6bbef77a5d5c0d4cd476234348f398acdaa24280437b0e0eac2";
+      sha512 = "66c695344af848e4d96c727abf72cfbe348dab0eb61cdd24feaeb462f90aadd55b6115c9e6ac6af7a3ec0691f2d8233008915eb51303da637a9b6167336347f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/gn/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/gn/firefox-74.0.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "6d810e69ad78fe5fc07c2f04c2b2ace6550183fcd9e1e9e3af863c219948999bd0c2c095a8f85806d6b8b6da0d6e88e59789aa55b3eedd821c0dc59e37114005";
+      sha512 = "c266adc6f166a57994ae92df8df47c9d6fd7a406b4d3b0f157a33196b31c04b8ad2fbf5c491b80b7fa200c98887b4b4a5ffd3750930984f18c8c86bf43d6b956";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/gu-IN/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/gu-IN/firefox-74.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "ed0574ba20986bae45a9ffde86d4b4568de296d4c8809f102c25c85f155ab0bed03f20ac7cfe3eef7225c77193343950ed7bc3714f5e56e709c47aaa02a823ca";
+      sha512 = "4924605c3be69db7639708e76cab66758c4bfd217f8a1bc1340b772db1d31f5df19099dc30ca3422db53a7bddf548c87e8338535e1454fd4d9ace57a24b71832";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/he/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/he/firefox-74.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "d4c1f23b270bfd827c4babdb24a7a7e97aad1620f886c27430ee4136ded392a4921395fc87fc031608e6e056ebafcc74766b028aebca787bc51025f38d2b0173";
+      sha512 = "faabb65699d0c83321178d845d7831c82078dd592d6a602a6b25eb56d5424c4c479345cd4ff331bda79e9dce616a06141973bfd7c221b20b3a8ebe899ffa2130";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/hi-IN/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/hi-IN/firefox-74.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "485ec6ddeeb2e6fe9f0a141a33f55491eedd3dfae5793802118ba8bac53322b1f2abc3f14e3eed3c8c9bf5b8beb9e53e3d80d0c2a05fbba850697aa262151298";
+      sha512 = "6d331d8ac6ba025785b49af71067bf2fdc406caf9f1c82fa90e26b4f56a1a2eaf4043fbf5ff6a477ac69836377cfa2205e029bd9125982b7c4076d90111bae1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/hr/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/hr/firefox-74.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "1d1ccb53fafdef570efe7991902413a6cdc005f5fafd3a395c0ea9d7d764357525429c5f34825a0437242b2e816c86d207c91c92c557bb0b0eafa9bbe86debb5";
+      sha512 = "8229ec61969f2378f02e49f5071b49417c871799986a8ff9a77b177aa1753d410e76eef80675facc76b4c55799ddc4a16984cea4e1a321a96090afc98e741abf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/hsb/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/hsb/firefox-74.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "79a71e0255cbaaf49afd0077f0a73a2d8f21037055b6f43a8a16ce6f512712b536fefcc911cbbd6c5ba4db493b1c9d0ecb23e99bfeeccf92a9159dec57328da0";
+      sha512 = "d78cd5a9dd7c5049e9b705412268a568b62e2a56602896659af9144ae9ae2ef0e25b7da6d470c7423bc2fec3fe14487b7d966ddeba69d5a451c6e3558808edcf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/hu/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/hu/firefox-74.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "0d5ef5c1589e184fa78ba6cb8bd86530f30dd94ce1e9f2e3a4116539d1f676d60672cb5fc20db3a9e513ec6e7e6fe4b98e340c457ecce583f73bbebf47913eb6";
+      sha512 = "e0da837fdb4071e88bc74de77fb57367eb2d69fc6f319b1672c32e3d051facfbacbc93806f5067674342898cf9adb44158a99882c66428b65427b952d53842e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/hy-AM/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/hy-AM/firefox-74.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "4198b61f6708feb15d6d20e0a447d8d9f9ae353c77565fbd5c185e74043d7c896ad8a0c5744e4ed4eee813761df9053b0ad578b8a34ce89ff475d477245e23b8";
+      sha512 = "6f9ad04f2f48830cdbb1c9fbd781f50199593fcd3da0b8853b305c6c61dc627eb7669968aa69beb1ab6c0c93ec15a942e85b2984d55cd40d0b9447e28db458e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ia/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ia/firefox-74.0.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "79f01a78363ce26e31d32c21aa8191db748be7f831aa5143bccdaa35912c23bd5ca3586796b931cb84f92cf28c495fe239b1bf7b6feeca9581bb0c8a94a9c1a6";
+      sha512 = "4e399cfa525c847a0aed0b1c46d85bd981af6a3a68b07ec63860d53cb0d0e9cd004402522e2b54ffe81d95a6b594fb16290d9a5e01cff5cbe7264bef5e12a6e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/id/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/id/firefox-74.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "afd876da8a8914f88c043f7ffaf8296e14278503e7ff1b94f8563cfc13c2ecf1e0ecf52c18b5c2c16799878de836056f403c67ffd9333a77d3ad3142f9236769";
+      sha512 = "50255eef2e33bb5737826a9864af5837e3b5e626e22361c5a3fae52a84afd0469d3de1db05317f1c8734f34c0a3e85e7853217660eb8fddb8cdaa0998535ebf8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/is/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/is/firefox-74.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "3d98244f97a7c0169f272de877ef3193d4c09392a92ec2ee931d95df610617e00529c1e2c86d31115b4df88dd1a15fee6b6d166a55535396e6203b9b104e0d14";
+      sha512 = "69e96b479069ef1bf07df49cf77e623ed56d71ddcb44417b5d8b7d410bcd93f18c2a49bbae6a128e16998bae99617aa2128aa2d13afa0987f3b3c98cb9f39a8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/it/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/it/firefox-74.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "22c2dad95a21743ff3350ac8765340fd96c006dcfcadc68c3fca1814d0b6669066d8f76136cc7c4fc6717929d41df0b0b5a01d40de36b9d1c4eeb8529ed1850d";
+      sha512 = "a240412ffb762df4063532b6c07b5e1bed86b9d77d31ae2ffa58b2e7aa596ce6ab906e03a416039cea1ced3904a152b225106690e2f793c4061f0858fb807f07";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ja/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ja/firefox-74.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "6297f970de4b35aa7e3ad43fc5112ac0a36bedc5b2431f143e65344cebae74ca36da7af3fa23e1c522e62ae13d2069ff2f1114867e0b0960f9f740904f18ae82";
+      sha512 = "dd419563541b90833e50f3a65d54638719df741e5cdbe53d6dcee39f7623745925cb6777ec07097e9c25dd69deb0c7a183ae26055e623869df6e7a65bc020c6e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ka/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ka/firefox-74.0.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "2e4ef3085f01d66e7d2b85b058f7be2a7122f1cfd53757494bc6e66a2fb9840013c2f3f68ef7bcd363f6d3f84926449650e8ff2e1f6641dae70893ff1dc00ff5";
+      sha512 = "a1ad0cdb38c4fe1e2d87bf076cf16fb463f9f6fbdc60173768807570b6b1d4b7ebef9826d59e8666aba4598282556787e808371de37935c83c870d1514b855ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/kab/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/kab/firefox-74.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "eda0492c8528bb4eb9ddda9f2d585aa63794ba34231b58b5ccf66dd9bc49feca36a837a786c1f0d182398fe5cf5cdc735c45bb56d1aa743554697b6c6a9d1b8f";
+      sha512 = "d7f80172e0ae8ca780ad2f83fce0f75f53dc9a86d14908f14bf12c36ce4beededad592db90f35981e8c86ceafd41075c561e7b9b45340a27aae4489fa6cd8cc4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/kk/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/kk/firefox-74.0.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "6d8b29ae3a21f952e7e0633bdee2f82d53d015e134812a24c2bec73e21b923add3fb7470097bd96a6ad41d7cb1488574475c51140db7616d66024178774282c3";
+      sha512 = "d7c42163e48e7612d819247300a06d99f474a68016d099626c7493d6a836b9f6a0b641f686a2e110fea76c1df2f91c9d1b768c90011f9001cf708c5c4f6e8d95";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/km/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/km/firefox-74.0.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "95773f7848250ad0c7f4e4a76ccd956e94dbe9994e451b349f862b3854cf2daa021de7b47c014b14e588189413bbabfb84bf3c2245550a4f824c56ab3964645a";
+      sha512 = "3d9e3e5d211260e5816419b77b9dcc8aa77bf967c795949f9483978ebcd588928b9c36cac637d7f7601239278cb72860a2f047e22c3cc9af8fa8ef56500c6fe7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/kn/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/kn/firefox-74.0.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "f1c66d17d7c8957ff804b77ef49e5389703506019bb3fe24e44f31f6958e65a83f90082f399a351e8bb3c869f2663c1737ee618cc6ee8732a753bcb50893140d";
+      sha512 = "ce3247275a30028580a0797838d7040e3f048bbee92684a39abe65a7d0425e883460aed711d4d7aa88295a5423a09872fddf51ac0d122fed50ca5d370fa27a84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ko/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ko/firefox-74.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "2661bfba5959c05752c818119ff29e22bdea6ffcd52eccf1f3dcb2f68c9c0f83ed900a9bf77e99de9e2fd1b4bd153339e5a212e5b7b4c365ea12b02f6fd75637";
+      sha512 = "a869918da7166a3de1918115c4fd080c0e17455bfcb54141332f5046fc546e4cfeb301640c5c1475b5b562d6cc7c29bb970423982bbdaeeb5da469b59262c6b7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/lij/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/lij/firefox-74.0.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "e1c6d44e2301ec9223798dfef54aa2bd1cf0553ea0691089f5c345ef7cf276727dd420261ae3a4b40855d58e241ea41af2e7856fecf334f534b6ff4459bc0155";
+      sha512 = "c5cace7eafa3fd6572bd00575c2e342ab1614b9647ba0fbe5b79faf65bc89c31deeca52fbc7618533dc48f6d60911a4af0020cd40fb28fc33f1c1538d3c3100f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/lt/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/lt/firefox-74.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "42316a0775d8cfb8a12545485762268feb74052c6d022b092644dec77048cc4e5f6a2e00288739f0a0b39b5530bc43f2946eaaa16711140bbf2ead3d1c28993b";
+      sha512 = "a53f8f6c7585d2301a8490a75ee7e90d3f47b1503e8521b1b80de49a062531749c2302b92a2332b5cab7f9a4453dcaddf623ad63c5f78dfef11ca190bb73e6b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/lv/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/lv/firefox-74.0.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "51118140b18c9f911e1ce9932d08cd5dc9e0a9f6cc31160e51c3e06f640322b3ffd28f74eae5fc7b5bc2a9423e820fbab8392b96f55770e8e4503dfd86cd6111";
+      sha512 = "26e7d07a0cfff802cd2a52e303af0df2227bd40616809acadcaf6787ed302e8ea5686de2a1cff800121f3899120c77de4df4eac246c9768b741b5e5e411e5d3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/mk/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/mk/firefox-74.0.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "96b5fefd5f1c7f37db059db505864210a872597e8d3f11247c6e68f30122eae15784d5eff7d94a48a38679ca6ea7338a82dc8b0cc65061d03be0c12aa570eefe";
+      sha512 = "e07991906c0c4d73a83205add07eeb7522ab51d32133f9d3601dc0e99479073f1f55e617913f7ab02f5022d898aa023d473652577d2e48e86f6c5d87635940dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/mr/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/mr/firefox-74.0.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "fc5a084fc9d71eaa4a31b4445390ebeea93f828ce0f492802dd38da3a2d5a71f865c5884efb9883545fdb3f2aeb374f93eea133de6c0809b75a924d14ae973a4";
+      sha512 = "ce1f14f12949f7bb6493d72878fe81642619fa00dcb35c7de6d818a25c6cf1349c983ccb3976b796673340adecfcfd344042ef59c0eeca159cd1c60bd59d18ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ms/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ms/firefox-74.0.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "c084b4c6e2e9ed3f646b18d14cd7d8f76e46ccd0152a74ee101b0fd532dc91acfef8f26d827e759c2bfd8828ff762a430cec3fc9d0b9e7423166951aaceb8b72";
+      sha512 = "a2f3a1a8152835045c944cd70dd86a8053ab5cbdde7097d6d2e3c06485717ef8efd762f97c81b88f8f2bbed5e6d3d14e6adf192b286eebe413529bb60326a742";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/my/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/my/firefox-74.0.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "8fed2a79499f57b0401da536a557809b152d65fccc91c76fcd2deacbab35b370dcc1c812c8e8217aa4b61e9a02fd41359b84080313fc572fec936ec3ab15935d";
+      sha512 = "e6280fa3a25bd44bfdfd80ae28b6909417731a81dc86bc728d70a3baa35f29d172c9495de43a87911b36e5bba187d4aba3d6680204ffd62b966bf0044ee7f6b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/nb-NO/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/nb-NO/firefox-74.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "d316c653e922c6f71d14bd9b6baae661a1d2d93a9ef2ec2c1ac368cdd5797df5896f927c909feef7ccd5323bc4290585ecf119f0bbc6eabe4c69c67127b82c98";
+      sha512 = "d0ea04c9f898eeef36ee46918b345f6a307877d6aee8f9ab958e1600c74494e3851563aadc8a34f0997d285cc0f2118052dac009a0efec3034d6c3eee72d119e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ne-NP/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ne-NP/firefox-74.0.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "1ecd87e201addeabc43050279bb175511bedbc5e2e1a541641e5bf6eeadd1edeabaae9e6d7a7cc53d6a4a46d84f256f0abf8bbe9d211dd6b7d8b3bb91b341443";
+      sha512 = "2baa7e1108390ca2baa28eb55afafecc7a67e746d3cf1a883fa515c623a9aaf996efcc4d54b6ba661f05f1ee00ad607ae75ed286847e7f9e74713e1a96df5cf7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/nl/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/nl/firefox-74.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "77d9e23944e5fdc8e08394b46811146d95560663e91a534c115986772b5c0b5c9c2e20dabde58ddbc643b3bf0f600c3b0b2f8f31045cf92ea8353610e0c78c67";
+      sha512 = "e6c2a98851617b9d6e0f2f2005b049de15cc6dc89793c977c0566be9ec1000041c5f2e423cfd5e71351913765c37ed37e62b4defaec4c59b7d2c5e698dada651";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/nn-NO/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/nn-NO/firefox-74.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "6923adac5fc7c616ad94ff4f45db0c5ba20c5c77cc23661196212b419437db8d1d8b9feab9f68556545b3553b6e22858c2f0c7a2afa81f7b4e914446e92fe418";
+      sha512 = "df2ae022d88000d677a487f5c409d57d1ea703ca5a91770863da62f74ffd3ebf7e58e463ab9e67d44514c630b7226b7b623797dd2e90185341afe532311ef039";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/oc/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/oc/firefox-74.0.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "eddd11c121dc1933272d1557d220a5590e5fe695cedb261e382d2a0e560646f1f4706dcc46f4bbf1b6c10df2f0b59e15d43398a32975c9505317aaf86bfc8a49";
+      sha512 = "8c52efdaab0e3b9eb2f4e99710c8c7cd9d1d1e894d4c38cd877fde81fd52f5d135f039c9b8619995c384dfe4aa44fda37121d9e0cb87003b8e9dc5eb013ec0cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/pa-IN/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/pa-IN/firefox-74.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "cd2eb4dd3b29299786d094699dbc162be2c073f25b6feda13e9f631f36530dc9abfde5f473c0276fa8b099010c66938f4e8bd9346a2d1761c59f63190944b553";
+      sha512 = "fdb7acfb49db508be8334685ce47216fe84976205bd83b159d5e573c004417d6adbb49f7d471af81edf026d417f2abfd5411d0e360ab36c1b591282d767873c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/pl/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/pl/firefox-74.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "e039394e335b13bd55a214a8345645e1d5640d2dbcf76234cdb5710c2ae0b81e568b8ff8456780edbb74fa2ab186eed004c1d54a04560406909702555a318db2";
+      sha512 = "ef4430578cb71488d0bae269610d962603f4da4a5e7e614acb90f700f4d487127faf8afff3000a9e46f81bb6a271fc2f6b40f06c881bad2096ce4a0de38dbd8e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/pt-BR/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/pt-BR/firefox-74.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "4649c45fdf1b8b3a93e8a5f88b88c47104b6d1781c89fba4cb9630a8998f3e4e28ad3aafa0265d04a3c10323916fce73d834cc95e5968a10b4a28a9ccf70aee1";
+      sha512 = "0987da83232c8319a890c8f0f62cf43dd9e0a8c82b8e06b3f1277cf83d6eb09e73df163b0a9faf420ac9db8924b1ad8ef84f1d0e81ea54682a831f941dd40700";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/pt-PT/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/pt-PT/firefox-74.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "44d65ac6e2df986638de77b01c7c544a846f92444de25208247c93ef2701d0398f77de10e9035c8fd383cc998adccbfe2dd76edebb646ba1f29a639786b61259";
+      sha512 = "4c052c11785da470cdad1a098ac1b1c8527a49e88a735319aa9385f4139c8f5f9e8fed496d1832cc502ff34be570dd5578c6b0d3af93731891753d842d3c07d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/rm/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/rm/firefox-74.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "6c9694d25cbe53e129148080e365b4964f5e683ede81d7a17fdc94045359480cf57cb8e4004b36645c6cc9c987845ac723e11407302eeca1e2e1fca9924eff2f";
+      sha512 = "462d3e3514141bc7e604fa9666800b30bb15a01757bdb8e1119cc0d97dc4d585a0998b94459ae92f9ecddbbaabf2f1aa342c13acb03135620b0706246f0f7e38";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ro/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ro/firefox-74.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "b1e98c052f5b51047ebb5c28f83e7c36a74b85d0aab3226438bdbc502619a2f9767cfee6f9a2f72653ab8102f058cdfe40dd7f6cf11f88652ea8f00a0985d9cf";
+      sha512 = "47bc24b33127efa652d2223fd6a624b6d8237911e10b8629f7b8ebba3320a4133f5751b9ec62f2acde9aaa45df0f0454e12a8b9defb366f8d2164db0356880ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ru/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ru/firefox-74.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "681214c7286392c8267cf73bfd4a57fe3cc9710992019aa645e052a8839234f4f65ccef2e98e6f4e8b4d099a0d2932c8d909291ad46cb581036930715a916565";
+      sha512 = "57f796bcf9d755e49639af0f4d7e38878d8f0fa0a4466f3c92fc8ea62c5fe365c10a81871017c3cc83915f80cd3db40669f470b53303bf3433c618c87c0c8502";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/si/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/si/firefox-74.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "daf1cbb9ae4e3892b138fe0f3aaab8aa11fe175c1bed70d374e5da7baf0c77a3d1e836647a8a0e36b1b2791c3fa638c63ca960a361751b7dbaac5d87a1e73e56";
+      sha512 = "d028506d4edeede079c14cc2f97d7d9cc665ff54f163a691ad84da2731250e119ecc8e69dc4351a7bb58e9d2402a1ccfb26d30a2fac8b3881ba149c71fdbb9a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/sk/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/sk/firefox-74.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "4d34b4c6eda6297461191388266d5d281be23b4e4390db9999832f384431bd5f5f323be80fa1cbc645b7d1bcb8bd6e80077ae2f0ba66239308eb3b72c062bb37";
+      sha512 = "f56f3c77fcb6c12539f1b264f565f371a7c4e5635fb644ec706b19bfb6cb10d546e217e06f04af0b5f96754c65f70f2c7008219e4428e7e17e76296f04f903f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/sl/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/sl/firefox-74.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "7ab8ea5037264ef3853376c000582b7a423ebf366d84e50fbb642f8510609cbfc7d8cff6b48eea499cf7dd14da3dfbda635871fa7b2990beb386b5e6b1db35f4";
+      sha512 = "e3e284a74f742939ec99ecae43240be1e4ae6ab3e600d08cc07aa3df41aa15d9685256f4b976eb83409884209b1e3bea8522d6e3855f75eb67b88a842715e5eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/son/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/son/firefox-74.0.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "afda3965d5934b4cbc3ce0c9df16d286cb3f2054c5bf5a174349691d12abed45d47e0c79a5b4e730cf6791a118daab6cc4e7438ee2e50529002fb9a99db4eb88";
+      sha512 = "baad547898d92d1c783463a8defccd2b87164773dccf45c8c3442da063a4e6379ccf75452e70993d7cff8654ee37bdacb281a608c5786f6baf31d2dfd5b0cce6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/sq/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/sq/firefox-74.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "6a1535b6440a805f60b5085f4e34e54453e36f01cd10536b169cfcd8cb67d61bf325469d33981e261855deb0ea158a68710b4606a912c1a2d8769f0c83ec33d4";
+      sha512 = "c38aa06a66a551d609a343528275f58c4a4f43b99066e5bb40f7653a0f2797d516819424164ff9d31d206598cea68e74db7c5023d05edb875dab8b7070d6b800";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/sr/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/sr/firefox-74.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "a5cf593a21ed3c2a825cfb4a7280b1b4a8d4905cf85cd69edcb36f733189ced40a9a5c6e86cbc9870cd9bc1442f4c7ef19621e43181335d0b9d7090a3d4b102e";
+      sha512 = "68d2d885f01e5bbd2e689752822e8562ea2825e806fac97e8c356ad98be05374f2feb2a329524128e67e26505b3ad8989260df3c9a9c12e55e936b19efa77d27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/sv-SE/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/sv-SE/firefox-74.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "bdf87d4f3a960ac38dfc39183d7a7a7ae68d45e52d4f356a47a122a1a93fcb6d49cac463c6173c87495c39f717c68533e0234f828c45071a9ab59b3b0dbb87af";
+      sha512 = "a7f612ccb43b4df144f48a635d0135967a1ecc27c61e637605b08f2e2d3edb038770df691ee07d1f734aef7044cd52a46973dd907ae988bc20da4937f0d51ec8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ta/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ta/firefox-74.0.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "808628662c860b996124c367ff3d9ae89fd622648b46a985da4c3be50baeecf5b5d4de7de0488b2f46810dd7e8d91dd6923397830c58d27fbbf847772ba42c74";
+      sha512 = "f172d687b513750551f2ae314a8d9676c3714fb9909a0a6ac1dda26dacdddc5cbb37c6123700bb43aaa25ed8d7dc725b92be36028d9abde9a1e27ddd1769affb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/te/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/te/firefox-74.0.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "22190521d45ad61965b5e863d877bf92da4633bfc7638f2f83825f478dda5ca5ad333707a874c0b992b2b9e8613c96f6e5f7144a9e51e696edce88cc36bd8c1c";
+      sha512 = "e7989468298980f55157554d8ea79a4d2f6089179eb813e66244489dc9744ba0c509bd45dde97c489e823ab3c3d7dc3dea0603228e025b998573001d6e51e786";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/th/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/th/firefox-74.0.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "0131790f8fc79abff771b28e4b3f4f894c680f790e9999be22ebb968a869b17dc18c4fb15f992bcc025863eaed5887662a3ccb98c4d3e85f385ec00c37f1b891";
+      sha512 = "914d4815daae91dc0c0a8322252e026172ee2f8de3e08f5dc9cb455565540985928ff5650c5a597acca7538b75668d249aa123bc5539595a346046e9ea68bb8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/tl/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/tl/firefox-74.0.tar.bz2";
       locale = "tl";
       arch = "linux-x86_64";
-      sha512 = "5c20780883b844c5f3206c4c2d7fb0d341afdfa5b30f87d0356445cf279b0be7396433e1f6ef7aa20c88016f540eb773a66aee172c678a172f378b7ffa28c2d6";
+      sha512 = "698c3404d574501c9acd61a38d778730ca7ce1b0003375ab2ce470530cec3a792ff5a6d9aed7788af293edc246c704f7ee96352bef792d2a43c14f56fc0ede41";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/tr/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/tr/firefox-74.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "211842a6177af5397be00b18d42e038c2a82a185305dc2bc36803713d16461321ec96838c21873a23816198bcd2d9e1b5298b2885afa60506702e8f07b803b7b";
+      sha512 = "bdd0aca34a6fdcec44af39a9db78e7d786586a782203bc98b6484f971dd09f45ab5976e5729a028a29adc4c05baafbfb5058773426dae329c7b09aa6fb2130d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/trs/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/trs/firefox-74.0.tar.bz2";
       locale = "trs";
       arch = "linux-x86_64";
-      sha512 = "3d1292229c645bbd3529763c4729be8ed044bb8081f0127b39f62a3b21c670889c915fd982866451ce494299438caf7380e4b72b971c4163a2e9e96575550439";
+      sha512 = "36e2c6bc099ec381565afcdf36fc69e8a01234a5dca7500fd2e0e642fbb294c819eb869ecdd57bdb1407c2de224db5b6a4e6b82a90daceb77346f561f99cf839";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/uk/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/uk/firefox-74.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "58da46b39c491278be85ff9a37eabe993166b9f950aabf6b5776634779d2427bd8c044e7b851462d59584051299c954fd5e35491a32a2c893678ca0fce0b4a8c";
+      sha512 = "cf7a6ae1535b09ccdd0d3354e682e5441324a914d7852fde12ddca3ab67e211860e6f2e87144185b6348d70a6243899c48d29be906f915ddc12a025a72b153bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/ur/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ur/firefox-74.0.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "c0f35fb5e3967fcefb7bd708e621abb138a3972b52d871ffd5f9e636c9d27e040e5f99313c72ae31cfa2313c9edc2ac9b64e9ec1710a5b1288bf7d1a7be80136";
+      sha512 = "976eb06f7b0de8abb1a512b3f142920ebc4d3b35ab719913d5d01201921ae3380b8c5da8dd3e18de3b96eb139deb69502684d6fd1d33e378325103204cfa4004";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/uz/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/uz/firefox-74.0.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "68d335c31ac07a2790c4fc142b3f17c527bcb289e0f6e19a228dce248062c89df18874fe22a73623f6d94309fe4089a072dcaab533bdcdc1855c539395222b45";
+      sha512 = "e0e750a921ac766d46726ea1c0073604dd4a17ba29713dae7ee42679a0b305c5723f6d3776603c79719e4100717a9cdc0b0016521a20ffee762b4f8cd614630e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/vi/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/vi/firefox-74.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "e7c846995285b3194a12b14a844c4cb01871012d1f7df241c3b9ad73191c567c04127a4d7a7aa2ed33ecf6deff8d483a92b2b3511ffe180e4f61cdb114a3285d";
+      sha512 = "12561e674ef47a5d1817dd535f050b027ce316c75cef5802a8e365a4568609e44ff85840d27b91e81b5c46e4595b7e52736e2a43ed495db63b74fb2e2df1b376";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/xh/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/xh/firefox-74.0.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "cc9b6e46fbfe9fae1be6e501069932e35b8e53a91bee226ed8b7179cff98e3092e984dfb194fdc0e4554b983bdf203b28e271ff40565bb30a140aff24bf88e02";
+      sha512 = "365fdd88ddf29ac41d5cf388ade3dfe08bcba361153d244e45cb1f451969044956ca2387bae7e5f783c8cf0862e89141a39f52af873533139f49d2539f9401ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/zh-CN/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/zh-CN/firefox-74.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "d967c3de22a110ed948a055d3d1e5f29ff473a8eebf1cc08d960135dac0bdb3a812c240cf46f789be8de5a5769bec2518d60dff5b31c8149275c0650b387053d";
+      sha512 = "29451eab0d61193258338fe19382c0fe2851bc02af668c4ab7e2702b782718ff80f5773622c7580a731214ae11a199e6158985f678f98e51cf18e0afdcd035cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-x86_64/zh-TW/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/zh-TW/firefox-74.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "3e9838ef076f360f09c30deb25298d23c7c067ee4956061b5d19c51eba91e28bacb9e22cf6fc6f7df929d1fd541f5aae383137aefeb3c0f2f0d41625875578e9";
+      sha512 = "7724fd993d38cc7169901b6f589868ef3e884ee25b9957cd05b30b06a3cd25f3fd7d7ecb500c6b286272aec6031e18b5df6e03c739d81d92b73de932d4029293";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ach/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ach/firefox-74.0.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "62f98561f7dc2b856474d5915ab1ce9f9939cfc4102d33532c2f933fc1887be5995abe4b16fa715647ee1b7b5a68e5fd9f263e928d05b6f6ae35ce924aaaea2b";
+      sha512 = "8c1773be02e8f9c40a77ff4078ee4e5d035b891e7de70f412d22cad305b0554f87c77ddad8663ff0d0dd36f621b58c7a143364ac3cd5c8ce5e2c87ea81fba400";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/af/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/af/firefox-74.0.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "cb203a3cddc9fd71178c1d158f31ca55b15f3388761c4347a3b2fdbde921effc335ea6f2b49b4fbda624b79621df9196b2e08bc42caeeab9feedac05a25aa04c";
+      sha512 = "678c058ecbd6bcf6bb749ec2677c0486b94af43b28a950dfada30516a70e8ec45fb2c76e4acc8c30125d07e5b4fe7c4387d73ab130e57bcb8592318225685356";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/an/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/an/firefox-74.0.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "77bec37a0584e2cb00dbbe6278f21f3814a73ffcd026b33c2c4ccf13e13561263e314aee2c39595d037a9a49e54510844db44d521d3c550a19f1c2bddb66be00";
+      sha512 = "7512f534594f36aebd9f9aa2524f568c35d55167fe89090313578aded6e87404fd8df3f34bb1da658349374537146cb02cc3119a87346f2eaf1c5cc38dec0cf5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ar/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ar/firefox-74.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "c84047c4267fd8f872876a87a809604a1d65245804b5cdf45ccbca764d9ec9b39cd6edb13e282a7ab0278bcd17111487d5a22a36d9cfb7c1544353111395216a";
+      sha512 = "51a65a604f8adbb07d1ec59a8013e3d0c2e0658b2691714c64971203e463f8934aaf9d2e71bc1685c255172eb474bea0823d1205d84cc3a530befe80ed257d01";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ast/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ast/firefox-74.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "8d87ec12eefa47af400d0c3da5c103587019d3f4584ccb5ff7fc02017451be0417673a3b539ce3191339f9afd8bf9e562aa962883bbabe3355cbfba2c7748cbe";
+      sha512 = "ed032607ca192adcbc20a03b5b5742641500ad36de0685524ce36b33e49f74f83e491b9b5c5278d8f62ac19f701a9e393470d608c4de0c855e3ff91127c472ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/az/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/az/firefox-74.0.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "0801cdd56ed2217f52bdde2f541112540853f79385d3488a2d01e9e95e5d8e8cd4f3d2433f9c272dc7309445f11ae36ab4edd0bc24ad343cce46ef3d74826261";
+      sha512 = "a8583b604f720549ac3ec92fc89174cf8ac56b68c230e69d718662e1a788aa2038101a2d76199b6030dfcedf27d66659b78eb4e361c2e74f5e66a49ca8ca256e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/be/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/be/firefox-74.0.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "34a7d7abb122fa4fe4d38cda591fc88a5b5e38bf0415a89a87cc04fe14216408c56b3c7a67a29eff8409cea95bb82df4ed885110e0b39a5606e8278ef30085d1";
+      sha512 = "3f917c28730d23e7d0c03053d0d86c8ef75c173e31529dc312d6d86a87852229c4a6d2727af2c2071959772a3deef5662b5075e52f37fa63b37c6cbed9cfa2e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/bg/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/bg/firefox-74.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "a1deaa04a797865ab9d62d1c820ed837c723bb66723397218d9afc114c4d1146c64f3c49ac558c69476938ef5c4f815b300bc25e53cedeef41c9022a6173e24f";
+      sha512 = "4f960a211d2838308000aed8f20465dee70768734d111b5208a04fdf71af00bf8d4bcfd352d5d5490345a9e21a05c13b8ca1a1102181f785f4710cc56e60d04d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/bn/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/bn/firefox-74.0.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha512 = "8fa4631d3a5c4aabb0ddd587f66a8802530864dbf99e1035d3a13efda65cba93a7824e72abfb6388ebdad045d981ac818368406ac345fa4bfb65b8560a9e1943";
+      sha512 = "7d8378c33447dc528937409dc1c0eec947ef7c147cf026bc7f0a78fe4e76ec692f0a7dfa964bd93fe5093b1c2caec39b42fbcebe92ac9771d9e3598bf00c2fc6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/br/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/br/firefox-74.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "c9de94ec51f4cb7bc77c5db2b5d359cfe24d60c76fd6c368907f6dfae8c2166b6b0a4954d791e808a52b145cc5acba1e2bf82237d63b357fb2920b1e4a057bcd";
+      sha512 = "59a4dba230c0a8e5c7754ead9088ef3407669a4d9340b2f3736fcf4a3d2049568b131ca929fd12b8167e08280b6cfc04f843f1dccbf06a1d7826bb264dac772f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/bs/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/bs/firefox-74.0.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "08bd5b8a337e0968c618903ba137d9340f83282bae27f286d4fd65f89c7ecdd36d771cf7a63767102e1885c7588d29645feab07e1c7c970c0ba9e5b8c38db7be";
+      sha512 = "65a44a974e5aa9b9e28a01de9e954dbb36f5acdbe2537ade59d9d956074dac9382dfe7ebdc7df2269d82fcd8b9fe5c73e49eff9dd2692c7a3690b1bc8e54ecc7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ca-valencia/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ca-valencia/firefox-74.0.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha512 = "5036cfd9bda8de708d90a3ba216bb74526a2a4b00bf16a435b8e346deeb713080049a3f39b2e9f5bc73799203c91eddce07df3bd0affa49135b3cea2d2c4081f";
+      sha512 = "6cd4cf9b69dc35f4f5bab782305b6b4fc5044b807a5409ed4a8b13836c551f1df233c77614b989767755ce5357d597b9cd24f0011e62ad298ee5521766931f1e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ca/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ca/firefox-74.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "1576e57936866754bcce40c8daa9fcbb7b8c4b86c44c66dd0288764a12cfb7b03c9274327d06e3d1e98808a720acb5c01fb1cbd83b1cc580208e29754cfb8864";
+      sha512 = "2bf061c948f012281468a0b7cf15bb8b806cef95b2e7b667b94825030ea134d110a261bee14717732fc176cad78988aa2c6d8acdcfba851dc8ea4122a1ad36b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/cak/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/cak/firefox-74.0.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "715ff756b1781ee74a12025163443ae22fa54891f8978356acb816db254f0e9ab999b8855e6b542329a42fae6a3f3bd319295b9b17953234c1107668f3414009";
+      sha512 = "c5e1c05b9649521470fcfd0eb89a4a7467c7cbe9e8f15916e6d5ac4ad88dde2e4eb62527e1436a2e48dd4d6d3aba7ea28ffdf6615ed31fc7d4b8dbbc729af515";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/cs/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/cs/firefox-74.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "835be53ef8be7772decc01e0ddc9115075c26f15bef7b4cc659022e2c7c6997bcdebd8ab4efa431e61af92c13b59734e4e9a433efd068ac2bc93fd79aa706f44";
+      sha512 = "1f0d647db99680521bdff74038fa31e9881a71789a2cb18f552bd770bfef25760231fd27436608fc393829c14b2018de211a10bff6890c931b8a78fb3af888e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/cy/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/cy/firefox-74.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "be5702229cad8438312ee14e24b3267bea91e131736bc8dd4796798285dacec2863843f844bcac47eb64dd9a2ebb6966f161a3530db7743dfb8ccb3b5cab9fe0";
+      sha512 = "b19948cfcb0f10978e7aeb859f3741b797a473163823232b20dd6327475df1a1a3c752769903cee00d048952ecca9f73c0de59300f596f10154dd150b58cde28";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/da/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/da/firefox-74.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "bda6c747c1eb8de22850aa418fcdf57f5a39d96546cccff3d82ffd1be93bd1be499abcce60f5e1b76595eddb1fdd4e3dee3855fb25fdb8c1f2ad82ba97a9d854";
+      sha512 = "7978f11614514d9aa7c18007729645af4a3a50a3d13ac500d0c23ddbd80bb50724d7b627f62c7a6c05a74c9e6182cc49243b6a0a1966b433335d22fa535eed73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/de/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/de/firefox-74.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "aa7510f2dc6846ace6a9754a4105197b238a22bcb034ea22453b7550aa00b3ad87d6aa9a7e909366daccf21427659802e7bc3eb285ceb4e38bb1c906cc782399";
+      sha512 = "819a4947a53ff27d421af3e09326c2f0451eefd9b0d95dc7427bf600780a9350c0ae84ff062816d5599eef1b44e2d4c742ef2c07ab83ed9cdc0b7382972706ee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/dsb/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/dsb/firefox-74.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "9a97a6b634685f02e3af6492378a3db600ccc80678ec9d9fb75e08ea123ae6d3016254a2fea5b4736530480671e7095fc21840e6c3db50bcc8343a800897b704";
+      sha512 = "2e688088ee0c3712a5de56d855b013ecae815c482584711a4a27273f6a17a692552b70b2dc9d9beb108693b2c095c2e7365e661e8fbb84404fe27736964d8b88";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/el/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/el/firefox-74.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "7b15f63414a9b08fe54ca249b99e80a9a2a62a0a9462911b31c4220c7941eea7e1f4d170d969770fa1a0bf76b25cf539ee0eb5c41106fab3200ed32ea580fe94";
+      sha512 = "5b703bd93ad3e43027d2f85ad9f2916b9103d69a1380ffa529800800188d3227837ca84f835a6007197231ddc9f93bd60f00bbf8954cca6f14702eb4ce101292";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/en-CA/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/en-CA/firefox-74.0.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "92c8f0132880dd0d3af36e1ee489ec87a7169ce76afda68367f977a3dba346aed727d04a9ada0aa96c1c26e6b029e27b2edaa266074f49399ba10f7cedc12bbe";
+      sha512 = "c94222ea766fb7d8131686d9ec3c2d3ac59e8a91c6d1e65366776eb717804120c4221f8568a3537fce247f12e2f8085a22df6d31a405a1b654a074727b4cc1ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/en-GB/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/en-GB/firefox-74.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "b4cc2106924be7ed68a96a97fe3410ddf6a0dd57861a6e93185f396ec92ad40dcf901de8785e9814a9e9499b5828c34c61910c88a257e1f45103f737030d7376";
+      sha512 = "24e91c045d36be25346e598af8d8ac187cf37b2c790957887a7d3fa42b102dacd05c236476ed1dff20e21d51c88aac2d5123352d868580704a0dff88747bd62b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/en-US/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/en-US/firefox-74.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "5b8bd3558e30d65d9368e86c79695c7cd5d5fca159a678394285bd5a72f74cd70775dadf176d22ee99dfc939333bb3c64225385e2e9330e04298a62718821cd0";
+      sha512 = "19e3bde2ad51783ca5aa492ffe9a097e91db66a5d18c28c6ea36f6cfca7e14e41172cfca9f9c223bf42632c2235fb5a942ffac470e2c210d1b7992c75c48beed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/eo/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/eo/firefox-74.0.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "e80c74cef34d4be438792e7436fa14e3008029c7ddba9884f3a5bd6f1a20ca51612e5f3a1e6c5939d69740921b0717b2ce5bf20c1a740ec6d167cd28809492c2";
+      sha512 = "160912a75ca11a38c360924f206ed7baf53e0e0be4d42440c10e3e7e3a9ced4f4884db329917954af23ec5bb01b70ea7f567310c85242073d3d13c4ba19629c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/es-AR/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/es-AR/firefox-74.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "2dfd113477eac29985af07c05a3d2c0574104f91e44e8625fe5ec51bc5debc262d2f812761edff5a63ebff408f2e560eaced510ce34256f497317e0af5066b49";
+      sha512 = "cfa240589014caf944d54971f7ed8f5b2f8656b03bffe7bc28628e07198f308406277b4ae8584a9b79d2e218f952f22c345982a264a47a7e2f129c297da134da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/es-CL/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/es-CL/firefox-74.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "7cd5fe37c8eefe0ef5488feb3a4c9640f8cc25e5c01c31d84e755a84d7c42e2b1ee89fcd78cd797b3bb34c465d06966ff5f994b7b6412008628646a987abac52";
+      sha512 = "228cda9199e333c030b43ed1fcc46d0f1d782f904e796f546092927597e661505477634219ea518972764049fce3a9db2e1e31ea766caea612a765d9532b5f50";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/es-ES/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/es-ES/firefox-74.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "7d2a3fec526f8e812597c1184a3a811c0a1f7d1545aea8f826ac934e1b694d35692aa8f47bb2a42f7a5c183075e620e29a77a927d99dea54326bc690110c575e";
+      sha512 = "569c63b7b4599afb94fc725242661ae33d01de58012dd6bf46c020b55fcf5fc1dea1a95371f36e68aad6ae89f7e674e99e96139553fff3839a60a6ec36c418cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/es-MX/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/es-MX/firefox-74.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "03df019ca336e8b6ae455b91058c5ffbdeeed6bec6f039962c00d8b8d83668783e072f91a82439092bcc4794c1be0e52dc6f88303147f97fd67d81feb14d58a1";
+      sha512 = "debb715bf2034640e573208b048c4f519a51a3b34c4500d27452f25f0f2d939f6812bf1f68856699a776ec8092696954e409381178b3328d417e97747f8ab720";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/et/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/et/firefox-74.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "85d6ef77f080e8617cf490d945d45f453d04a635e1b410fa1ad78c86afd5d43a9a39c8ef7be0b4676b057d7131168a1d8ad0dab5a4fbe230266f96d25baa8fee";
+      sha512 = "2ce02c48e6fc9407a09f89926e8452c385e8df739eb014f45d0d286d11d5c3f9c84220c99379ee7ce20f658617c3b28b8e59724c0a62a5fc961dcc47a1172cd8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/eu/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/eu/firefox-74.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "e20b16ff5539c00627bb44efc87fcbbc4017006d6a74e0a6e9421b91c297327b42405fd6b65e8b98d71028a8ca35323b7c55da9c4ab77fe7a511c2a75aec6f03";
+      sha512 = "25356e53f1334cbcba60d44739fcd69a03945d923a36dda4accbb2a471927df1977ed956f993d510d60df8fcace4dfb2fe773b49f3ebde6d227e1f474ec8483b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/fa/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/fa/firefox-74.0.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "ecb9935bd89a41128955005ce003700e15efb007a98f0653f88145cc21af2ed719a0edc342b4343712814a9bd16011322cb454f36e4236d0c73a5b5306d45035";
+      sha512 = "d680434838694f6666c8decfee363e2aa5de22ecfdf690895bc7c027bdc2466c67518e69444d48413f1538e7c3751cda716df8fb2cb83ad68beff6b0975d3dc1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ff/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ff/firefox-74.0.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "6bd4c591f7e6a7c0d08ccc64d7086f1863e1a2d8760c63b02a250a8b47e9c50a0f36191d7ef18d85ead4046678095cc101670511d9790962312ae1d6032ad9f0";
+      sha512 = "3b6f7bb0dd61c2872b8ae2e9dff50d9c6e21f2755d8dac5eeb44708af3441ecfe43ba5eeba31a2de09fdd246afdaaae8ab8ce10f2f83495588cef561446956cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/fi/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/fi/firefox-74.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "60237eaa42baefa008a1fe6fcfe30694c63e832df64a12175b34967a2358ad2bc0b08854a45ce698fdf9d4b2ef21dcf63e87cabd624254fc71dea5b9e1610b17";
+      sha512 = "0462288f84a7d4cc97758919cd8d6a2d275757ac91980752f538d0cc785813acf79f4e6908fda1eddbc34db2b574d5c381c03b8cef90c796f837706071a98044";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/fr/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/fr/firefox-74.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "6f7b38cea8b38d746623ed37fe2be83d5a3ab3c9ed2b6be88e78c0c28ccafea70ce0a11088e35a45427d3c5e3a84939c3c6c2be16b15e7270d4296088ba8c3fe";
+      sha512 = "9a40af49d33a5c391a084d181d74bf418e5fb24ccc4aac96959f719624913b7b7d11b6977e4673046c89dcb5935a1b496b82b8a0b9729595689b158a7a96adc8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/fy-NL/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/fy-NL/firefox-74.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "dc0eedb90ccbeb5a0de494c3a60c94704582d1b681e3281c3ab3b60fe3d1140bb5463d66e2ed36c8549a581a8e28d1b0a09ee1fef903baa6680a7c43c3d6b8fc";
+      sha512 = "97bc9a69879981a6f6ff32f534b31b986523a7d956644ad15de94913aa648af6b163a4a6125e6cb6869eb48d1d903773c3cd4f07a625da191b9fe34aa4b6dfa7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ga-IE/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ga-IE/firefox-74.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "9c64b6586f102dfe190c8a600474bcf4a32c7b268a7ba3cb60d673636aa340407d492a7fb377308d6f0b6759b76069f4e5f573499f36ad570905060d00d85d21";
+      sha512 = "72d3dbc9799be8c37880cae2603423e128040b99409148a8c316ef9400b259963078bcf9a86dbe3d69bd017276312ed9631512972dd718c6ffb0fa2f3d351a90";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/gd/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/gd/firefox-74.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "5f3e92b500a371e5228a2bd7c176e116e8eee7210f14dbe130ecb2a1f5f337e2a413702aec2685fec27245c281c97931bcc08c0fc7ca0cc4954c3e507e42fd16";
+      sha512 = "637f08600c79790df3f683c7aadd1a7597e09f387d6f1e929ab7eb6301cf462df85e2a68a1ef5480cde0afc716c63dccee08f173c96358d461f3b5798ca2d75b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/gl/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/gl/firefox-74.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "8fcb6890fc7664f11a833585e14e0d70f6d4f4d52b9a8cf4917a86b452d96f9b1ce76502a15bba116dec18b31b61976ccf8680949c67e53c93cec786373f2654";
+      sha512 = "964541eb0d5ae8a7cef59b17d2e4002bf34b2137beb72593c2fee6e578e4e02f06bc443effa7d958631d46d097f482119aedcab4862f3881a8c68527bb88a998";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/gn/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/gn/firefox-74.0.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "6729111f3c0e4511ae70afd2db2c9dbf9640d01c16b711cbbd1ce7c4ee689cdb844a03b2aaf93215aa85b91d3a519f135ee5fe895cb2f96c77e296ed8528b942";
+      sha512 = "8c808172327308ea1eb4eca12642ee2628a01e1461ab33d56e326c4e5f675f3294a563f83bb42bb3b4eaa15311f89ae59c6de65c0fc565464611b89ca03d9a6b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/gu-IN/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/gu-IN/firefox-74.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "9152dd76206762dfe6fbb4ede85d2aa606c1c5455945fd6cdb31aa65267042a292f99378a7ba51c793cf50753d51ec21e896938b58d6092eef032d5c2ca89d43";
+      sha512 = "9338b5d59f01b32d608a7e3202992e6e44e9f62f947bb8ab6aa64e539f8105dfd0e6436705276efde769a196e7de7a63190a98fd2d6664e2aa74365e0997fb7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/he/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/he/firefox-74.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "bdbf71a917eeb72a47fdca61253b5f7861ab8b20d05b61833e5d6359f808fd34c518f192c8eb55883530f0b82c56f0d289c78dc369badbb59050ab092f2d2794";
+      sha512 = "fbac46c204f656f07f1ed43fdab6cfe2b3db33a0c46030e23eb716eda26064329fbbf97ce0a07c031ee06d90c1b76c432dc4ab1b55b9b53b26fbcd8e640819e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/hi-IN/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/hi-IN/firefox-74.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "1cd239f79716e277518ad870bad8d01be7f558e60f1ef69d632a87e4fea570dae219fbf63d57ede37e2128888860f1899e2d702e24117071885d71e5a95061fc";
+      sha512 = "3b5bb0426fde394e9102d13af677974bf522a6635921071bf5dc453d76431a10279a8622c8aa6642385c0803e30275058575e1dd0e986726e4f9e4f2ef742ce0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/hr/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/hr/firefox-74.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "47e3c93ea8a5c7094d02840a0c4dfcd74d91cb81a718a42505284f29d7dc7ae779c21ce04413eb4889369a22867f4562afb132769430ebeefe2095c23352edc6";
+      sha512 = "cdc430d37f861e65248d95f29aa384ba4910e9e2fbaff9f3bf236cc9b93ee16c71c1128fea51c84772859002e00d3015ac2028a3103d13cde9ef2335f650095e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/hsb/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/hsb/firefox-74.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "dbf79eab22d233809bcaa8bf9464abc143bd120f6c9258b95d61538104cb18584208a9f55206f27be5a8b7f9b2ad7ed42f58562d37b14f86a61dca0b18fa4401";
+      sha512 = "07d4c85e8838022d4626ceac115b9d41a88db711107dced35a80967a359f72395b657219e92a7cf5e4f5a4e6c521a36101d4a219c58e56b63dfe0b25bc942155";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/hu/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/hu/firefox-74.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "d8878f168fd05f6334477078ef647f70ab1e89e144756238b12dc8da7b7b703fd56958cdb4119c66e66cf3f8c0260d2fe9ce65d9d9e094c52c775b1234e2a8d5";
+      sha512 = "cd2b6d36f7b6f12d77e43333f1741828804e0434e1394142a554ac7fe3e42d46dd66617c58921114a7472092b7714618247ec30d46abba5fc40b7306ce5f88ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/hy-AM/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/hy-AM/firefox-74.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "9348b29a96e8cacc331b544ef219049e1228ecfb4c282ea1e9a859eeb5f16d261d6ba48d6d6bf1d2cb9be6d7ca2f3f6ecfb5f58e42a54fe9eaa04742b3a42532";
+      sha512 = "ae4b468bfa3f03ebf5f7793acfb6f3785238bd4a6e78c0e7542c49627b5436d55d8e0108c7db0bb755009962020010e767e49105a8374087d1ca5d50eb7b7340";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ia/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ia/firefox-74.0.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "b8abbd7321a68fb1eb3418a8b8b871e4f27fcce07a26bed73d91482bc22030217599b515bdca16c4f409581ea3f73afca7dc506c85e4b19e0f4d9c27abd0a602";
+      sha512 = "87fdedb6b07be5709ff0c5de383eaa12707bbd64487559a5a75d475abe72a9b7877645fb61911d0a95b27616318cac2208a6344b90d4c1bfdaef6d11208fc62c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/id/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/id/firefox-74.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "b70c61f469f18b06baf12efecf1b4f9d617bb47721810d6069c7d3e1491cdc5701a4bce4f3c26a54825ea4ed48706a69aae731aa3514488fd90533bd128625eb";
+      sha512 = "b42fae3bdeaef76715c1698ed39f710e3932b39d7db67fa00c94e085c5ec23afea7bddfce99d444991126c67f3a9d81976362a3f32f99d7f24c81a0a70487bde";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/is/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/is/firefox-74.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "2fd9b1e7cd86c28dd43d6e0b39fb4bfafa82c05dfdeace15c792d5f2c21b80b67a664f2abe0c9f9d4dc3a1e4fc214e38428124d740aa7f63ebc4c82210e7d646";
+      sha512 = "0e9888e900536eee6199d7847f4b92cf6314c63b35877b08bc0f51f2f4877e1f965bf760a59a080a517a9ca1b8da814abe465a893b0816d3e5e00f1b02da67c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/it/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/it/firefox-74.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "44f2b7ca7f2e5f14107a243b1d711b487e8c71e73808f849756e65f3e61040917104836e912ba8c356754ee1b04986eabe85f4cfab10e1b49a5867dd33242648";
+      sha512 = "396e0b54e912317e3861c5eb25d32f7cbf3ea558bb115c7c6f0a7732a18b246c9a97dc8ca3172a1b21ed3238f5358a9a70c0976d83ffc7640f4d522adbe4317c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ja/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ja/firefox-74.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "86d5e55c23ec5077f32c290a4200d2b53e28184d2e01ead019a8d8d810724e692b9364cf28d7088c881bbd32cba55a6c649cae448fb92b7b1c9f309134b9ad1c";
+      sha512 = "0c8620750bcdc116ca0c9d26d8cda350afd1de3f8cab93f98df685c12a3f1551d537cde094f74675c8156a48e6c88d77ec077ae20f3bb0bc7b72d3ed023cc622";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ka/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ka/firefox-74.0.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "11b4a38f291728dfa67ce79c050cac6197e73f1de746991cb85906f648df14b72bc1d94c4e287e89575cef201a98cc91774df3872d974dfc1c3d644b596e7bbd";
+      sha512 = "2e91dc34ee5656cf39aeafab2c7648b9465fc56a3afed40ae5a9e391bf8c0a897551bf402409db0d265ea196bfb0abbf100290fbbb108c79979266f1e2b0dece";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/kab/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/kab/firefox-74.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "7d817167020b89bc460e3b5ac6bad95c32c62b2e7ac816d69a4e943fad80ee06dece53762cdc6b8dbac27958cc4b851e12d777eb08c84638f0c0234a9681053e";
+      sha512 = "fe91f60852d0c6922884b1954f753cc04db696d28ecfe91505fc3cb23d2fd0c23dc010c37e0326fc3b782672400cb65f887ff799b6f6b039783d5f80c7373367";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/kk/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/kk/firefox-74.0.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "998241399f8019c1385b2e005bf55f715ef734e0720ac3482726ac9bac82c0d656eb38511793ae96fadd810949c8ca084e4cd0810a7a0a1d0a07c9c88b69ffa8";
+      sha512 = "581a46df5cb334c8cfd0925c78752887e636388d4e76ff41687ab2193f1a26c87be848a02753e427f297fa5169e7e203767b66ad96fd0825276aaad527f1fb88";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/km/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/km/firefox-74.0.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "530210e9760266ae5680333cf94d8cdce20fcb2e8762503413b42e7bd593a163d0c9c37392aac6b89526a2109f6edfe3f6baa0ee1e0c8e85fb7938badfbd8d66";
+      sha512 = "8e53ba868d2d0a9dad832e68710c6958d55ccc70d75f16a138983bf5d1ec24ffda1e320d40fda0ea62bcad5e01419c81db52fd0b1eb3ef11cd90c4aa92b11be7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/kn/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/kn/firefox-74.0.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "43bc6d75ae2efdd31c9bc02e1808da3999ab5d1fe64df2194343bcbc9436adab4e530b67ff088727bd379c099911afd8733d6b3bd73872a6e9e5ceb14c2c7346";
+      sha512 = "ea0e3dcad9bee6b37b2de3178eec5c980b1f85ca38f47c4049f8f1d614dce581b8ed7ea7f8751443e737db62e09bc9888358f9d68690cd8c8d9ab16a4e62e727";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ko/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ko/firefox-74.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "08ac6c0704f13ac266adcdd8ba8eeb62e18ddf4c3e4633acef3df31f07b6a5d4608a15d4c3bfc25b3c16556ada6296843f1ef7115bd37515cd1d5110dbf85064";
+      sha512 = "a486e93785532f05f4004253f369d384d2949b86eff8fc88dc49cbb76def0214a35f4675d86728c2e3ab6d1786b90546d223d7fcb8f70092f35e7d117a20f76b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/lij/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/lij/firefox-74.0.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "7ed520a475ab533d33e392e7fb24f2444caf9fe5cb06aa5499740d36b8fbfc899af7c8f6495c46f9e363606d33fe067da9fa72a2d41a820731d764d698eeb075";
+      sha512 = "ae06bc4a21640d47034596522415c275faa16fd12866582aeab9b0b8cf8dac4b854bb22067f36419fc1c45810c499ac60f9319127199cd30f8dca1c1daa8e035";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/lt/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/lt/firefox-74.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "6e49543423ec6c0e968b85702fec46587c01fb5a35c28e1617f3e206512c5b072856a7bd455549ad31c2828d1f6baac40f5916b8e38c622c84b7a54a6468ce3b";
+      sha512 = "d79206839e72915a5ad36674d624974aa4c2e09fc9b24eb82b54648f5e86cc97ca9c65c1e5fc97aa80b0afeae4cbd06a36fbc5cc6f0b8e915a820fde6d330d1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/lv/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/lv/firefox-74.0.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "c8c7e30bde45f99026b3874ee70d4b9ac44d1a4921b448883faf54c9e1323066464d4eed3671b372a8e342e9bae9226ac64525a1ca285d7015f1854e5d4eda3a";
+      sha512 = "c7c1a9d6cab35e29492440a94c31514fd21ce9f6d6828e1f83addbc60b67ad83553913b102312ce3b4d9014f222f16d25cf510cf6a816c9212324fc4fe7baacf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/mk/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/mk/firefox-74.0.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "e22388afa540e7abe6575525663ac7365555d7d515ad49233bfb3de16db778a634dc166b8e9680f837978cf6662bf1f460f95ae40520116988822050de731a65";
+      sha512 = "59dbf4c86c78ec02db97900b0db1ecf6d2f94c34bb8c5c7bcd60f2a3e8748655873d5994a9e4bf7a8762cd9646a14e180d1e330cdb2464bc146a1d365a7f789d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/mr/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/mr/firefox-74.0.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "ad71b75a9b309c9166b72416ec06edc90a6621ff27fcaed07c16a42147664e3b116db8e3ffc9bdba8ddda862dbd29074b62feb9ffbebab6d36437bd5a50318d1";
+      sha512 = "d11f86f1b515d047cbb68fedf17b535776ffd42c20f7cb60c7c3dd39afaab6f07744ca0a4da0b9a40379bd24a9ff1699f901b8221e587f440faa2243088506b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ms/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ms/firefox-74.0.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "f4c3f8d93cfbf89b862929d74eacd3398531f43617288aefcdf7b0f4b5857e9a790802755791a202aab465349bd4f979d257d5925b45a8a28b4245ba10d5d0e3";
+      sha512 = "a8d2447ca79e9d66344a4f1ffee66ad7de50ed5c0e01c9f32303011324229d0fe414f39e8844b5e4a06732509e17a17dca9cc729c87e51cf8b2ecb925c194815";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/my/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/my/firefox-74.0.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "4ca9a42291faa8bb4c39a9efc0f8067407ee486e37a0b32576d2519a0189efd2c86ea45ea6c19f44d321d485ccf7479a58d9fc84bc3022fa211046adcd1cac8c";
+      sha512 = "9062c54b41a7bf1b7465cc649f90790a912576457ac1203aa6bbd14d927bdddaa41f31a9e7ddd7934c24d2db8357f8366d1b45a50a8f35462eb2b05028d673e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/nb-NO/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/nb-NO/firefox-74.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "fd54231a3888ae659df17b64d1f8150d112bc9191387f3621b0edf8a97571b90613d387c8fcd1944a263bc20c4c2f701bc4eac3765e6d2c4529c93c70cd07780";
+      sha512 = "fba107427926346ecac412016c7a6e58fd1e6652d13b6df632ccbbe3568ec34e8927771036394cd52a232b5aae975394061f6ace87958b84e6d8ca685930bc58";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ne-NP/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ne-NP/firefox-74.0.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "1530837c31b3f062ef0d13063d7ac071e0434a3bc9d44f53d17675cee3f6cec4f19305ce01a5ffba0c9be9d2661a6f563790d54449408eb95449c62a378e0217";
+      sha512 = "9b1b57700f22ee7827fdc7b391d05117b4286e0a27e90a45d25ec4afc7d9738a7d400f2720fcfdcaac311b6d6e4605c5a2e77ea2ae337cbd1acf5071b217c1f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/nl/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/nl/firefox-74.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "914ac5e5a1495d753ca9bbefc8fc57375252bcbdb35c6b92a37ac12bb3218edbfd7caf641a52bf1448950c3ba84bbc13b7396199ef0c6b1678090fa40d3ea26c";
+      sha512 = "f208d274f971c53db962b731226039e6cf0f33ef59ecb64614000be634daf40bbf89730c13affd5445986cef9c1f9a1d1c32f94c1cfd7133dd254f3e8a1cbac4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/nn-NO/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/nn-NO/firefox-74.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "3218d09d98d61d7c804d6ecd8be2ed48dee8f0fd9c2cea42e44a1c38485e3cb466955eb84e23ca308f1d724afdd33931d780d9f76b5d54ce942d00f0d31463b7";
+      sha512 = "126eed4ad3a922c0b2e4f2f575be874a739d37d97fc19f83fcec01b8a029fc79c0132790e69c61622ef811f8f7bd16ebb1f742a8991f6e0aad0dd7a52af3ab34";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/oc/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/oc/firefox-74.0.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "a7bf0def44278d66532b7e4edbc0deaafaa3a0be1a3ac41ba22848893c4ad8e651114e0d39e49eb49458dfb257280c32cf8bd6bb503c8f3198db1872324a7345";
+      sha512 = "f0bba67e75513aaea00371bd3b6eadfcc765b5bceb8712f82dc1a0432bf9360e979190ca569fb9c677faa23200a62766775536910d29689a51bb496c2d82cf38";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/pa-IN/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/pa-IN/firefox-74.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "d052c6d72e88a31492567d03097c3efba10ab0dc4d8fd0cd489ebbe45949896effb514a7af1fa30356f3cb97a0b08caa47472d0032558197e608b1ec130bd7bb";
+      sha512 = "2e60b06a677e21149ed55e9b1f2cc3a4555fcaf78df90dd81f7a6fe56140ba1cdb6eaf29141c123b46e21c27bc116e1e8b97feedd86391fdc564ba20df078059";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/pl/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/pl/firefox-74.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "a4dc584b9222558203be7dab78c58f5e7fb86dcba9ee565d2978ed7d8da1cdc2cc3c9bb8f93ccba8f1c5ccd9074bb642ee99d0225056a54522cb499575ce1e11";
+      sha512 = "a834560790d35559db67db2e6f826fbd8788eeef8ae47cfb48e0f3a8b7416b389e6c37150a8dda1d80e133d8a9219ff30e3d9a4422ce8d2de83ef6ef7f638049";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/pt-BR/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/pt-BR/firefox-74.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "5ecc7aa9752a373c511a208dad606774f589e36b5daa1434c8e7d76bbd835c8f2b9c6b20c176bee0ab6fc7b4355af1f25243563eb4d97d988059bf3d08e7d279";
+      sha512 = "ea8a2de3fc7f89ca15e118c9d4a2b75604fcb295c3ec1cb2b9b1961fe6a0abfc1bc9813f5fc7cc71e1ca10516d390cc7d36de03b57ef72e7fe7a45095fac8678";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/pt-PT/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/pt-PT/firefox-74.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "31c3585e7612f71b2d7369d477930aebafcc54ca8d21ed6f84ef0073144ca5fdfd1bc45e6f19b702c26ab5c6797c52420d8fa5451b889c7706f509b6c4dd5ad1";
+      sha512 = "b6eb4096e7cdc2823667a99c654004c95b526a495d0dd1f24ea45643c8135cc01403417e7cd4d2aeb5fd935d153d44bbae53c6a581d9601c245a320f8114fd9e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/rm/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/rm/firefox-74.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "eb82d612861e1a0434edc04dd79ce33e42d116e27b001139371b7fa2802b94a46c7035152be2248941cb7ae576484da743175491c63121be8651dfe9b74a0d82";
+      sha512 = "8de865c608b288feab89de6677974cbbb2897678514945907f421159049b2b63a332c9302a01e5ec4b355486085838930ef4b44ced7fdf78e5cd0a1f65186cf1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ro/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ro/firefox-74.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "c5229abd0b1fce59debd4d72af3d7bcf8a3f37c5abdf9f1a6b4851c19b7191492da42901683e57c9233efff16cd99bc1499d8e16ddf7a405807c7d00a41c205e";
+      sha512 = "848f4b90fdce6455a563bb38b097d9b4853aaee8e43ec0d9101f41a4046719527a714c0b5d2ad07461ac5dfb34e0cd10060b5169276004c6f7cee839e2b3d669";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ru/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ru/firefox-74.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "3b965b0cba404679e6c9756367dfa3dd8ecb028b440cc7bb949df353f5a27efdece0878eb44f950b3bfa7e8842483b929ff70ba1fd25bce5ed0a23d7b505c0cb";
+      sha512 = "9b624a07fccf6f2aa1707e8d4e04894e6a2d3f467dbde806bcd11eaa7ff3cf8cced1ee1ac237037c309472588db247d175151393001ab03ee9e281fcef91890f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/si/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/si/firefox-74.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "569f2910116f51cb3be82cc2d07f76d4f8b61cdb6ca96024290cd5e523c6711009106658a09305ebf2c596928de35eca1bdc578541a9eb14fe853fead902c7c3";
+      sha512 = "c6f2d9666b32e635d35ba7c94dbc2c68c497a44b1cf464038ceacc0278a7348f11150c8e879ea5814f43ab9e9fc5ab14b0bfb553e52cf6e26c826cd3da154572";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/sk/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/sk/firefox-74.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "109afe184afc873727c4c880280ce38f6577f0688c42c7a18b692d54a4eeb3f24dd8c5ca1a062df886bb171c50d30d6707125005baa29a1db9ec5091746164e9";
+      sha512 = "c89e44eebcbd0945b1c462f748a71286167739d75d9b0e65529be07793bfb20dfe01eaed8280b94047d2523e0a0592145eb7af524f4de630388ea3c2c1638aa5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/sl/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/sl/firefox-74.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "63af29eadaa34738b715aa23609a20decd0a805a252a80051ed54fb8a332f6ae7eb17f73159469a755eb736a1523b0552ac3dc01de5fe2a5903e21e0286c833c";
+      sha512 = "e93922b8a6e946e39febb8d690d251d01d69cd82f4f07546209f21cb89532c342e6f4e37319821fd6786bc5bf5f7927a28463e5f2d1bc8fe87bba1817af5af00";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/son/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/son/firefox-74.0.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "348898f1a01cbe5191c31c8a806547b74890762163a8aeee07b61aebc969a36567255f00bf8bda7f0dfb29b81396ab71ff39054dc1910c7b7a2ec225aaeb7ff9";
+      sha512 = "f7d2757cad117522d9964885d002d717772012b9952d1e03a53bce775967e927c7cba1358fcf6165f8732f761aeb148b393d32f7cd0e540d449605cadbc8a0f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/sq/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/sq/firefox-74.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "278e02254b09df8469c3ca0fd56e72b9b663be621e930a1f261276e58242c84ec9ce717a0924bfec01953e15a0a36c746a17ff43a30e98c6862697995e7f7fac";
+      sha512 = "b19f1832a460298e36509bd3e8a8dbcaf300373954ccbec9c4f402fe4e60bb9b24a79e52e62c63c0ac9cf5abbb32187215cf7690781dd88b3649eab1f4b60cf9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/sr/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/sr/firefox-74.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "1d7f2d1f341d2621500bc4eb0885c6e2709c4621d34fcf8c1f35d3054af17b0c0490acb92867841ab605b8a6b764d9689ccf7eb6325a136f00531068c2a83d29";
+      sha512 = "15a93a42b3d19d3d2da4e06ea0b071c05cbf82dd820d43f52e263900f233894112cd40132de93a85e544d7961ee7be11766be0e4c827b805025b0353bc4cdb7e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/sv-SE/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/sv-SE/firefox-74.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "38772f54d574a7b0dda06a535adf934e60e06d1753c4df4a9dd52dfe1cc08dc1fcdb1e0350e889facdfbdde95707cd70d705b9f7fc6f2d030ea92bf59de820ce";
+      sha512 = "c1c7cb83323e39d13bd04a65ab3bbacd9cca1ef90bf1870afd49ab72f0819bbcda8ef5c50db08537babd35e3ef117441915d87ee4b4dfd4548b023faf834adaa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ta/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ta/firefox-74.0.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "c75d17e579c45961c92d9a0c238276a9371f27d438182b366c8804d7d4899e9d4cb689455b5d1dfb6100165bd1b4fef1215059779eec7fd215e485fd26f4db33";
+      sha512 = "56ce445bdf12c7ab1bc31fd2f06f5ed3f63c0935e91d23e0e153a81362b1b44b1c874a3f36c2f3b7adf7821f1d08aa80aa55bc01594144fbd92da62e13ba8cc6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/te/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/te/firefox-74.0.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "5d791b6bb7ad154970646e83e77513e92e284d32169d9ec6f8ae66e252be3ab6618e927cf73693d81986a2bc10ed27dc2f46ef8b39065eae028828282153803b";
+      sha512 = "2381931f7fab5578e870d589975eae78c4b45f14d75497d1524b9500ce8305ded0aca89409371cdab866be0b32e714ebd1efeedf83d176c12b4518d07b096c6b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/th/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/th/firefox-74.0.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "6015ae88939f2bcaeb2f354ae0003695fb111e60ac0c137cd4d6cdfbb1ef27699b76bd1d02587af1996002a39955e7c1ed537f906328695b820b024c8b91ddd9";
+      sha512 = "0cc8606b5b15bd3cfc8e37f13c73eabf454c9997102c5bd4fb325b99f029c75bdbb6d48352c4dce40c3790c9446e6c2236885f2aa33ec171ff81a51b7277b780";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/tl/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/tl/firefox-74.0.tar.bz2";
       locale = "tl";
       arch = "linux-i686";
-      sha512 = "471e73795238f2f65550ffc73b604f1ef41b92470b811c440fee5d2cfe41b77c3fcc38be0d2ed85f7f86c005407095780a12e8ffad02fd5f435c6492feefb8bf";
+      sha512 = "5f7bcd704a3c960b2d89788e841dcac15eae1fa575205ce67bf75726a5477a0356c968e77146297ed96206e5f05083477155fc3db2c9ddef53bae373104d12cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/tr/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/tr/firefox-74.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "464f2df89fd62ee8649786516df21a10ad9bc0faf90f6970144dd2b3397c58643c1f7d1ada6f9f7d7710777b903de89e2bc04c7ab7b057e8fa07ec667bf62f9a";
+      sha512 = "8fdf1faad4615db6c2aa577391c7a9aa2600e486234d9d20ec0cc340552f98e199565ee391ec48d2c660fb347cbf3ff733c16d58350c4ed1a47076108d731a0e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/trs/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/trs/firefox-74.0.tar.bz2";
       locale = "trs";
       arch = "linux-i686";
-      sha512 = "d9462735ef137af2defa7d580567479e97d5527b8941880a27979f496a0d74da39cce10eb3503dda54b4a732433182d3725123ecf0b49ebb503bfd56fdf5a286";
+      sha512 = "1a08a191f34c3fe120d0d7915f872750f903e6692819c0ee1bf1341539346f8f816e89e79970a81e610fb78b0b1fd0327655e7a5db10c717c60a3ab425cc1b01";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/uk/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/uk/firefox-74.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "966b2fd86876b694c66e68f7e8c33e380e021be7e24196816f741ec491eddbbee33318f922b03eb8c66c5302e0d5eb582aaa1d341860b82d7c7a4a7949254bf3";
+      sha512 = "0e93003cc99f7251e6596b960a89eb4348e260fdebb348ed9356e850e5d5a589d1affe131bc94a3d370ba340062d3d8b59f18eaa0d446f677f767f3a4e26884d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/ur/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ur/firefox-74.0.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "03fa60920c5cbb89035fbd665135b2911bdeaa3d4387c38184aa6f7589369390ae8bfcc0ebca83749f5c2e811a8a74d0ad5dbb62a1befd009f674c7a21449fbe";
+      sha512 = "ab5c15ed6f63d6c7b38e592f28e57cc895e191aa60e2eec819129c684a73480315925965ca0c4b69612c873637e56262b2c3372a59d451c11d73bcc888c92194";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/uz/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/uz/firefox-74.0.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "e66657c54a7edaaa80d932f8447d9edffc2e7625c6241de6ad47272c77586b5eeacb299f3cb9f75a43791d145762883632ec409c1c2b5d32d8d81d42e54cf62b";
+      sha512 = "58a83c8ee2582112eb4bb04e875ebad5c3f31fb7f6be790cecaa4f599b2e2f2c3935df019578d5c79dc2df2e3f177796830dcd7b8d96e1435f0cc8cc338d4cf7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/vi/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/vi/firefox-74.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "2fc3f94a80262819d72525e5ddce77344d482d22ac33992931c79d15d4476d4c564be306a35468358b7b02c167d294510c197496894fb8107062fe897bcb049f";
+      sha512 = "70c26fa5f2922979919f30454ef5714f69b61089af76158e2f4c59204e9ca800e7af620d60cf8ac6208b791677e00d5337ded25b4bbd7a64dd46d353bb728d84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xh/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/xh/firefox-74.0.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "806db4368b5c5f248f3992140a23734451f9b8122caf249466c63cea69e063a1274b620009d7e6e8ea45bd43f29997995ff0d23580a8bd2376e950926e9807f4";
+      sha512 = "1dab6166eeb18ec291b7c96662c74583adeeed7fec56414cdf827b1d0d2976374d84437df6ebd131628fee9607b91307e074cfa0d3c4ea65423d37dde0951fa7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/zh-CN/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/zh-CN/firefox-74.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "b4ea2b4c2f54a7c3dc2f16754aa38555e81221062827c3339fac543528cc52062b9e9c910dc597b21f2ad1a267ca2cf1faa8362f3c9c78b52480169251b073da";
+      sha512 = "2f4c9461b178b646da63da07893fb3dc598ac2aa65e384ac4e0406eb748625bebb06b6e7d348b4324eddc794d0818e87958398d65a8d3354faec26854dfa7d07";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/zh-TW/firefox-73.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/zh-TW/firefox-74.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "ed2e55f3279472c9e3b2bc0b51762b797f61c4fdb3fe95c652e5d2243516ea17f2dadc1711bd19154389215ede42a97bac9a607aabc14ac24d5e43a2913420cb";
+      sha512 = "f1e0e92ba60358f3b5e1edc1f3fd2a58482a4723785ed9e8d914519b6550617f5d19468ce9b8a5a5f81a212ae0e387d3f39335755838e074cbbf765f2440027a";
     }
     ];
 }

From ff6e097af120409df95bc697cd931bde1f961082 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 12 Mar 2020 05:36:35 -0400
Subject: [PATCH 2826/4636] linux: 4.14.172 -> 4.14.173

---
 pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index dc961e116d76..363f8eb91746 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.172";
+  version = "4.14.173";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0yi13cky6jdswca7nrjgcrdxk8rnqdbhblhy6mws103mjfms2613";
+    sha256 = "0kxp3mgiags8hdax15masab9zr89xraqvl9ri7zwgksx8ixav0m2";
   };
 } // (args.argsOverride or {}))

From 24898ff826af71e963d37a1b2301dfa656955e8c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 12 Mar 2020 05:36:52 -0400
Subject: [PATCH 2827/4636] linux: 4.19.108 -> 4.19.109

---
 pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 8bbda7aa10be..ae5da9fe92f5 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.108";
+  version = "4.19.109";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "18shyy1z2s8r26qb4rcz7gwl43dnmycjjywp9gss5zlfn2jyrbh9";
+    sha256 = "0kwnlv5336vqdf38dzn077ic17zkb4rl5khxmc47syzd9zm4fhnh";
   };
 } // (args.argsOverride or {}))

From 3d12317a7e0a088f4a93076764286ff42d17287c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 12 Mar 2020 05:37:03 -0400
Subject: [PATCH 2828/4636] linux: 4.4.215 -> 4.4.216

---
 pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index a76f2fc7562b..27fcb5020d72 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.215";
+  version = "4.4.216";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "00zy6cxwb16pqziiqs25pz5llryx2v2nbk9vvzpzxa8x43ad7g18";
+    sha256 = "1hjgh9brvxzi6ypgfnk07l3j28xsxgz88sdshnz19vj96bn1w70q";
   };
 } // (args.argsOverride or {}))

From 930fc70bfcd01a4758a00579ab056e85e4735869 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 12 Mar 2020 05:37:18 -0400
Subject: [PATCH 2829/4636] linux: 4.9.215 -> 4.9.216

---
 pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index e065257af824..4d12bec7617d 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.215";
+  version = "4.9.216";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0j4z2al318654z40w4f8zhh73zwpgn8igjr5k4mz401phm3jyvr3";
+    sha256 = "0lgv5k8v5xz9z2z4k42566bh0akyk1gr0dx6s1m1rjrzsf9k86l6";
   };
 } // (args.argsOverride or {}))

From 85c46f5a5ab2f51865921a8bc23559d80f47679d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 12 Mar 2020 05:37:44 -0400
Subject: [PATCH 2830/4636] linux: 5.5.8 -> 5.5.9

---
 pkgs/os-specific/linux/kernel/linux-5.5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.5.nix b/pkgs/os-specific/linux/kernel/linux-5.5.nix
index 6f9305309ca9..bcd67b0af425 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.5.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.5.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.5.8";
+  version = "5.5.9";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "01pw0gfafbsds6vq26qynffwvqm4khs953k1b6rrz8wris9zddp5";
+    sha256 = "0y58gkzadjwfqfry5568g4w4p2mpx2sw50sk95i07s5va1ly2dd4";
   };
 } // (args.argsOverride or {}))

From cd167a02b809ec2ab6710106121465bc89a2cd80 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 12 Mar 2020 05:56:43 -0400
Subject: [PATCH 2831/4636] linux: 5.6-rc3 -> 5.6-rc5

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 77a4327e89f9..4098c30c744e 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.6-rc3";
+  version = "5.6-rc5";
   extraMeta.branch = "5.6";
 
   # modDirVersion needs to be x.y.z, will always add .0
@@ -11,7 +11,7 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "1w265k9rspg9rkmay6cy6r1rxy4javpj1f6ify4jc3zpwqmp4ymk";
+    sha256 = "0ys4wdv1rf9vshras1n6syy2pgg8kv50f27nprfzhrllni044whr";
   };
 
   # Should the testing kernels ever be built on Hydra?

From ed588cb31c97a09c7e27fb0e3404ea6a2c5f913a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Mar 2020 08:18:55 +0000
Subject: [PATCH 2832/4636] librepo: 1.11.2 -> 1.11.3

---
 pkgs/tools/package-management/librepo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix
index 69821ca51366..6914f1af5f14 100644
--- a/pkgs/tools/package-management/librepo/default.nix
+++ b/pkgs/tools/package-management/librepo/default.nix
@@ -13,7 +13,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.11.2";
+  version = "1.11.3";
   pname = "librepo";
 
   outputs = [ "out" "dev" "py" ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     owner = "rpm-software-management";
     repo = "librepo";
     rev = version;
-    sha256 = "0f04qky61dlh5h71xdmpngpy98cmlsfyp2pkyj5sbkplvrmh1wzw";
+    sha256 = "1kdv0xyrbd942if82yvm9ykcskziq2xhw5cpb3xv4wx32a9kc8yz";
   };
 
   nativeBuildInputs = [

From 73fa45693c4aa1149c165edae603da3f2343f35a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 12 Mar 2020 11:20:11 +0100
Subject: [PATCH 2833/4636] bepasty: use correct version of xstatic-bootstrap

---
 pkgs/tools/misc/bepasty/default.nix | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix
index 532d1155fbe0..cc63dab9645a 100644
--- a/pkgs/tools/misc/bepasty/default.nix
+++ b/pkgs/tools/misc/bepasty/default.nix
@@ -1,13 +1,25 @@
-{ python3Packages
+{ python3
 , lib
 }:
 
-with python3Packages;
+let
+  python = python3.override {
+    self = python;
+    packageOverrides = self: super : {
+      xstatic-bootstrap = super.xstatic-bootstrap.overridePythonAttrs(oldAttrs: rec {
+        version = "3.3.7.1";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "0cgihyjb9rg6r2ddpzbjm31y0901vyc8m9h3v0zrhxydx1w9x50c";
+        };
+      });
+    };
+  };
 
 #We need to use buildPythonPackage here to get the PYTHONPATH build correctly.
 #This is needed for services.bepasty
 #https://github.com/NixOS/nixpkgs/pull/38300
-buildPythonPackage rec {
+in with python.pkgs; buildPythonPackage rec {
   pname = "bepasty";
   version = "0.5.0";
 
@@ -36,6 +48,9 @@ buildPythonPackage rec {
     selenium
   ];
 
+  # No tests in sdist
+  doCheck = false;
+
   meta = {
     homepage = https://github.com/bepasty/bepasty-server;
     description = "Binary pastebin server";

From d8e27096f2d153bbff88460e7ddff17bee886d5c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 12 Mar 2020 02:46:52 +0100
Subject: [PATCH 2834/4636] gitstatus: Fix build of the internally used libgit2
 fork

In 6733ece `-DUSE_HTTP_PARSER=system` was introduced, which does not seem
to work with this fork. So instead fallback to the `builtin`.

Also sync with upstream cmake flags.
---
 .../git-and-tools/gitstatus/romkatv_libgit2.nix      | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
index 1279e5dd6c99..e4cd58bf0f02 100644
--- a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
@@ -2,13 +2,15 @@
 
 libgit2.overrideAttrs (oldAttrs: {
   cmakeFlags = oldAttrs.cmakeFlags ++ [
-    "-DUSE_BUNDLED_ZLIB=ON"
-    "-DUSE_ICONV=OFF"
     "-DBUILD_CLAR=OFF"
-    "-DUSE_SSH=OFF"
-    "-DUSE_HTTPS=OFF"
     "-DBUILD_SHARED_LIBS=OFF"
-    "-DUSE_EXT_HTTP_PARSER=OFF"
+    "-DREGEX_BACKEND=builtin"
+    "-DUSE_BUNDLED_ZLIB=ON"
+    "-DUSE_HTTPS=OFF"
+    "-DUSE_HTTP_PARSER=builtin"  # overwritten from libgit2
+    "-DUSE_ICONV=OFF"
+    "-DUSE_SSH=OFF"
+    "-DZERO_NSEC=ON"
   ];
   src = fetchFromGitHub {
     owner = "romkatv";

From be80721e747b3ea3d89b3a945cb85669f4f8ddce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 12 Mar 2020 11:52:53 +0100
Subject: [PATCH 2835/4636] vscode: fix build on darwin

---
 pkgs/applications/editors/vscode/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index ace4bbe9cdc7..a573c518b5d6 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -62,7 +62,7 @@ in
       else [ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages)
         ++ [ libsecret libXScrnSaver ];
 
-    runtimeDependencies = [ systemd.lib fontconfig.lib ];
+    runtimeDependencies = lib.optional (stdenv.isLinux) [ systemd.lib fontconfig.lib ];
 
     nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook;
 

From 2ac8f8faebc2be1aa4e01deb9268f5079635245b Mon Sep 17 00:00:00 2001
From: Thomaz Leite <thomaz@actor.com.br>
Date: Thu, 12 Mar 2020 08:10:38 -0300
Subject: [PATCH 2836/4636] hobbes: mark as broken on Darwin

---
 pkgs/development/tools/hobbes/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/hobbes/default.nix b/pkgs/development/tools/hobbes/default.nix
index b480d673a691..b56afc0a4351 100644
--- a/pkgs/development/tools/hobbes/default.nix
+++ b/pkgs/development/tools/hobbes/default.nix
@@ -35,5 +35,6 @@ stdenv.mkDerivation {
     license = licenses.asl20;
     maintainers = [ maintainers.thmzlt ];
     platforms = [ "x86_64-linux" "x86_64-darwin" ];
+    broken = stdenv.isDarwin;
   };
 }

From c4ab54144334723abbf73b9200ec50b132d65fe3 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 11 Mar 2020 12:23:46 +0100
Subject: [PATCH 2837/4636] pari: backport bug fix

https://trac.sagemath.org/ticket/29313#comment:4
---
 pkgs/applications/science/math/pari/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 8886a0c8a695..8f2f740f2483 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetchurl
+, fetchpatch
 , gmp
 , readline
 , libX11
@@ -19,6 +20,15 @@ stdenv.mkDerivation rec {
     sha256 = "1jd65h2psrmba2dx7rkf5qidf9ka0cwbsg20pd18k45ggr30l467";
   };
 
+  patches = [
+    # https://trac.sagemath.org/ticket/29313#comment:1
+    (fetchpatch {
+      name = "backport-bug-fix.patch";
+      url = "https://git.archlinux.org/svntogit/community.git/plain/repos/community-x86_64/c7a1d35f.patch?h=packages/pari&id=27893d227290dc3821d68aa25877d9765c204dad";
+      sha256 = "0vm0fwyzj66cr32imip6srksd47s2s2sjl1rb26ph8gpfi3nalii";
+    })
+  ];
+
   buildInputs = [
     gmp
     readline

From ba589e24c9729352fa24594f67741142b55e6548 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 11 Mar 2020 12:02:14 +0100
Subject: [PATCH 2838/4636] sage: patch for pari 2.11.3

---
 pkgs/applications/science/math/sage/sage-src.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 1cbea74edae9..cd465a8c413a 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -130,6 +130,13 @@ stdenv.mkDerivation rec {
       url = "https://git.sagemath.org/sage.git/patch/?h=c6d0308db15efd611211d26cfcbefbd180fc0831";
       sha256 = "0nwai2jr22h49km4hx3kwafs3mzsc5kwsv7mqwjf6ibwfx2bbgyq";
     })
+
+    # https://trac.sagemath.org/ticket/29313 (patch from ArchLinux)
+    (fetchpatch {
+      name = "pari-2.11.3.patch";
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/sagemath-pari-2.11.3.patch?h=sagemath-git&id=02e1d58bd1cd70935d69a4990469d18be6bd2c43";
+      sha256 = "0z07444zvijyw96d11q7j81pvg7ysd6ycf1bbbjr6za9y74hv7d2";
+    })
   ];
 
   patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;

From 281bd03242d5a07a68904a2e1a9498e513e5bd09 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 12 Mar 2020 02:58:02 +0100
Subject: [PATCH 2839/4636] gitaly: 12.8.5 -> 12.8.6

---
 .../applications/version-management/gitlab/gitaly/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 0dd60a6df208..9b3e4da20248 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -28,14 +28,14 @@ let
     };
   });
 in buildGoPackage rec {
-  version = "12.8.5";
+  version = "12.8.6";
   pname = "gitaly";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitaly";
     rev = "v${version}";
-    sha256 = "19pwffncihhywfac7ybry38vyj3pmdz66g5nqrvwn4xxw7ypvd24";
+    sha256 = "1rf9qmyjllkwkyi7la1dzyjh0z9sw21zdzihd7v9ngwqssfk5zfk";
   };
 
   # Fix a check which assumes that hook files are writeable by their

From 4d96cc82e1a5e3c59d68bd72ece5fa2e4612855c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Mar 2020 11:50:22 +0000
Subject: [PATCH 2840/4636] wcslib: 7.1 -> 7.2

---
 pkgs/development/libraries/wcslib/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix
index 8363f774c241..0b57d0993190 100644
--- a/pkgs/development/libraries/wcslib/default.nix
+++ b/pkgs/development/libraries/wcslib/default.nix
@@ -1,14 +1,14 @@
 { fetchurl,  stdenv, flex }:
 
 stdenv.mkDerivation rec {
-  version = "7.1";
+  version = "7.2";
   pname = "wcslib";
 
   buildInputs = [ flex ];
 
   src = fetchurl {
     url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2";
-    sha256 ="05ji2v4la8h6azprb8x2zh6wrswxsq8cqw9zml0layc4nfg79fzh";
+    sha256 ="0fbf6ypq7ag9dmjn65ja5vbfxswb6511bja8rbna25wmhns9x5b3";
   };
 
   prePatch = ''
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "World Coordinate System Library for Astronomy";
-    homepage = https://www.atnf.csiro.au/people/mcalabre/WCS/;
+    homepage = "https://www.atnf.csiro.au/people/mcalabre/WCS/";
 
     longDescription = ''Library for world coordinate systems for
     spherical geometries and their conversion to image coordinate

From 0d08c34be20fa662f773f2baf9bee08204b56538 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Thu, 12 Mar 2020 14:35:18 +0100
Subject: [PATCH 2841/4636] quorum: init at 2.5.0

---
 pkgs/applications/blockchains/quorum.nix | 34 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/applications/blockchains/quorum.nix

diff --git a/pkgs/applications/blockchains/quorum.nix b/pkgs/applications/blockchains/quorum.nix
new file mode 100644
index 000000000000..86bd3b11a17f
--- /dev/null
+++ b/pkgs/applications/blockchains/quorum.nix
@@ -0,0 +1,34 @@
+{ lib, fetchFromGitHub, buildGoPackage, git, which }:
+  
+buildGoPackage rec {
+  pname = "quorum";
+  version = "2.5.0";
+
+  goPackagePath = "github.com/jpmorganchase/quorum";
+
+  src = fetchFromGitHub {
+    owner = "jpmorganchase";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0xfdaqp9bj5dkw12gy19lxj73zh7w80j051xclsvnd41sfah86ll";
+  };
+
+  buildInputs = [ git which ];
+
+  buildPhase = ''
+    cd "go/src/$goPackagePath"
+    make geth bootnode swarm
+  '';
+
+  installPhase = ''
+    mkdir -pv $bin/bin
+    cp -v build/bin/geth build/bin/bootnode build/bin/swarm $bin/bin
+  '';
+
+  meta = {
+    description = "A permissioned implementation of Ethereum supporting data privacy";
+    homepage = "https://www.goquorum.com/";
+    license = lib.licenses.lgpl3;
+    maintainers = with lib.maintainers; [ mmahut ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 74ab773c2393..f86988b89b0d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22931,6 +22931,8 @@ in
 
   particl-core = callPackage ../applications/blockchains/particl/particl-core.nix { miniupnpc = miniupnpc_2; };
 
+  quorum = callPackage ../applications/blockchains/quorum.nix { };
+
   ### GAMES
 
   _2048-in-terminal = callPackage ../games/2048-in-terminal { };

From ea8362e315d108db9d6c95d81d7daa57f391150c Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Thu, 12 Mar 2020 14:47:56 +0100
Subject: [PATCH 2842/4636] firefox: 73.0.1 -> 74.0 (#82276)

https://www.mozilla.org/en-US/firefox/74.0/releasenotes/

Co-authored-by: Daniel Frank <git@danielfrank.net>
---
 pkgs/applications/networking/browsers/firefox/common.nix  | 8 +++-----
 .../applications/networking/browsers/firefox/packages.nix | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 7c58072d5af4..82f1c267e77c 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -94,11 +94,6 @@ stdenv.mkDerivation ({
   patches = [
     ./env_var_for_system_dir.patch
   ]
-  ++ lib.optional (lib.versionAtLeast ffversion "73") (fetchpatch {
-    # https://phabricator.services.mozilla.com/D60667
-    url = "https://hg.mozilla.org/mozilla-central/raw-rev/b3d8b08265b800165d684281d19ac845a8ff9a66";
-    sha256 = "0b4s75w7sl619rglcjmlyvyibpj2ar5cpy6pnywl1xpd9qzyb27p";
-  })
   ++ patches;
 
 
@@ -297,6 +292,9 @@ stdenv.mkDerivation ({
     inherit browserName;
   } // lib.optionalAttrs gtk3Support { inherit gtk3; };
 } //
+lib.optionalAttrs (lib.versionAtLeast ffversion "74") {
+  hardeningDisable = [ "format" ]; # -Werror=format-security
+} //
 # the build system verifies checksums of the bundled rust sources
 # ./third_party/rust is be patched by our libtool fixup code in stdenv
 # unfortunately we can't just set this to `false` when we do not want it.
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index d0d3f843152b..cf44639ad573 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -7,10 +7,10 @@ in
 rec {
   firefox = common rec {
     pname = "firefox";
-    ffversion = "73.0.1";
+    ffversion = "74.0";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
-      sha512 = "1vdz711v44xdiry5vm4rrg7fjkrlnyn5jjkaq0bcf98jwrn9bjklmgwblrrnvmpc9pjd2ff3m7354q7vy6gd6c3yh2jhbq91v2w5yl9";
+      sha512 = "245n2ilfgx3rd0xlxzpg4gcwddcy0cgaqnaf5pwixjx0n8py1imiylwlsbihf70s41cq5q8awckchs287yysr4v6pdfqqbj7s0f02ki";
     };
 
     patches = [

From b5f53a5b61599fd9e3389e9a2c9d18018d8c927c Mon Sep 17 00:00:00 2001
From: Milan <me@pbb.lc>
Date: Thu, 12 Mar 2020 15:04:33 +0100
Subject: [PATCH 2843/4636] jetbrains: update (#82349)

---
 .../editors/jetbrains/default.nix             | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 1db952cf1a5a..466d52236d0d 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -250,12 +250,12 @@ in
 
   clion = buildClion rec {
     name = "clion-${version}";
-    version = "2019.3.3"; /* updated by script */
+    version = "2019.3.4"; /* updated by script */
     description  = "C/C++ IDE. New. Intelligent. Cross-platform";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
-      sha256 = "1dvnb6mb8xgrgqzqxm2zirwm77w4pci6ibwsdh6wqpnzpqksh4iw"; /* updated by script */
+      sha256 = "0whd379ck79vhz14yh5g6vpl4cvgw4z9ag4mwgizmd8kbcfnvdxd"; /* updated by script */
     };
     wmClass = "jetbrains-clion";
     update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@@ -263,12 +263,12 @@ in
 
   datagrip = buildDataGrip rec {
     name = "datagrip-${version}";
-    version = "2019.3.2"; /* updated by script */
+    version = "2019.3.3"; /* updated by script */
     description = "Your Swiss Army Knife for Databases and SQL";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
-      sha256 = "1aypzs5q9zgggxbpaxfd8r5ds0ck31lb00csn62npndqxa3bj7z5"; /* updated by script */
+      sha256 = "0zbyiw60gqcqi5bbazmsbs4qzmmxx1q034hs36k1dryf2y02jyih"; /* updated by script */
     };
     wmClass = "jetbrains-datagrip";
     update-channel = "DataGrip RELEASE";
@@ -276,12 +276,12 @@ in
 
   goland = buildGoland rec {
     name = "goland-${version}";
-    version = "2019.3.2"; /* updated by script */
+    version = "2019.3.3"; /* updated by script */
     description = "Up and Coming Go IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/go/${name}.tar.gz";
-      sha256 = "0namvc8dfm562dgvs4mrv1c6lyi4j8yxw402fkw55l0xqv3ff0a9"; /* updated by script */
+      sha256 = "091ym7vyb0hxzz6a1jfb88x0lj499vjd04bq8swmw14m1akmk3lf"; /* updated by script */
     };
     wmClass = "jetbrains-goland";
     update-channel = "GoLand RELEASE";
@@ -315,12 +315,12 @@ in
 
   phpstorm = buildPhpStorm rec {
     name = "phpstorm-${version}";
-    version = "2019.3.2"; /* updated by script */
+    version = "2019.3.3"; /* updated by script */
     description = "Professional IDE for Web and PHP developers";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
-      sha256 = "02qnkcri49chbbpx2f338cfs5w2kg1l7zfn6fa7qrla82zpjsqlm"; /* updated by script */
+      sha256 = "03ag1a40l1k8sqlywcs7kjn02c65xm3l9riyimg4hx23yi17w18h"; /* updated by script */
     };
     wmClass = "jetbrains-phpstorm";
     update-channel = "PhpStorm RELEASE";
@@ -354,12 +354,12 @@ in
 
   rider = buildRider rec {
     name = "rider-${version}";
-    version = "2019.3.1"; /* updated by script */
+    version = "2019.3.4"; /* updated by script */
     description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
-      sha256 = "0cs8fc3h6d2m84ppiqjy0f3xklpc5gf0i6c4bzv04y8ngh0cwgl2"; /* updated by script */
+      sha256 = "17axv0v31dpmjcaij5qpqqm071mwhmf1ahy0y0h96limq8cw9872"; /* updated by script */
     };
     wmClass = "jetbrains-rider";
     update-channel = "Rider RELEASE";
@@ -367,12 +367,12 @@ in
 
   ruby-mine = buildRubyMine rec {
     name = "ruby-mine-${version}";
-    version = "2019.3.2"; /* updated by script */
+    version = "2019.3.3"; /* updated by script */
     description = "The Most Intelligent Ruby and Rails IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
-      sha256 = "0mwzhvrhvsyb8r7sjcigv9jazim1zyipb3ym4xsd2gyl3ans2vm9"; /* updated by script */
+      sha256 = "0lkzb3rifr7r23vijcz7rqcxjpykx7dkghiq5prk1zz83hzi4b2j"; /* updated by script */
     };
     wmClass = "jetbrains-rubymine";
     update-channel = "RubyMine RELEASE";
@@ -380,12 +380,12 @@ in
 
   webstorm = buildWebStorm rec {
     name = "webstorm-${version}";
-    version = "2019.3.2"; /* updated by script */
+    version = "2019.3.3"; /* updated by script */
     description = "Professional IDE for Web and JavaScript development";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
-      sha256 = "0mbfkwjqg2d1mkka0vajx41nv4f07y1w7chk6ii7sylaj7ypzi13"; /* updated by script */
+      sha256 = "1b7hwqpk96g4il5rbxb8cpqsizgc9k5kb8vkvkcc9xh7qqz02i85"; /* updated by script */
     };
     wmClass = "jetbrains-webstorm";
     update-channel = "WebStorm RELEASE";

From 74d9a1f228262b6baa35746e768c03fc03ed55a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc>
Date: Wed, 11 Mar 2020 23:20:34 +0100
Subject: [PATCH 2844/4636] jetbrains.jdk: build from source

---
 .../compilers/jetbrains-jdk/default.nix       | 70 +++++--------------
 1 file changed, 17 insertions(+), 53 deletions(-)

diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index e9b3ad151ca8..3ee12af5c06c 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -1,54 +1,15 @@
-{ stdenv, lib, fetchurl, file, glib, libxml2, libav_0_8, ffmpeg, libxslt
-, libGL , xorg, alsaLib, fontconfig, freetype, pango, gtk2, cairo
-, gdk-pixbuf, atk, zlib }:
-
-# TODO: Investigate building from source instead of patching binaries.
-# TODO: Binary patching for not just x86_64-linux but also x86_64-darwin i686-linux
-
-let drv = stdenv.mkDerivation rec {
-  pname = "jetbrainsjdk";
-  version = "520.38";
-
-  src = if stdenv.hostPlatform.system == "x86_64-linux" then
-    fetchurl {
-      url = "https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbrsdk-11_0_5-linux-x64-b${version}.tar.gz";
-      sha256 = "13hqp9ww9afkl70yrslyyx0z7fqcc8nrcqax69d6jaj587qfjqvz";
-    }
-  else if stdenv.hostPlatform.system == "x86_64-darwin" then
-    fetchurl {
-      url = "https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbrsdk-11_0_5-osx-x64-b${version}.tar.gz";
-      sha256 = "1qrw4rpyznx7pkcjlfhi889l3a7gydz9yrqp6phz1rszmklpyk07";
-    }
-  else
-    throw "unsupported system: ${stdenv.hostPlatform.system}";
-
-  nativeBuildInputs = [ file ];
-
-  unpackCmd = "mkdir jdk; pushd jdk; tar -xzf $src; popd";
-
-  installPhase = ''
-    cd ..
-
-    mv $sourceRoot/jbrsdk $out
-  '';
-
-  postFixup = lib.optionalString (!stdenv.isDarwin) ''
-    find $out -type f -perm -0100 \
-        -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath "$rpath" {} \;
-    find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
-  '';
-
-  rpath = lib.optionalString (!stdenv.isDarwin) (lib.makeLibraryPath ([
-    stdenv.cc.cc stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL
-    alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk zlib
-    (placeholder "out")
-  ] ++ (with xorg; [
-    libX11 libXext libXtst libXi libXp libXt libXrender libXxf86vm
-  ])) + ":${placeholder "out"}/lib/jli");
-
-  passthru.home = drv;
+{ stdenv, openjdk12, fetchFromGitHub, jetbrains }:
 
+openjdk12.overrideAttrs (oldAttrs: rec {
+  pname = "jetbrains-jdk";
+  version = "11.0.6-b774";
+  src = fetchFromGitHub {
+    owner = "JetBrains";
+    repo = "JetBrainsRuntime";
+    rev = "jb${stdenv.lib.replaceStrings ["."] ["_"] version}";
+    sha256 = "0lx3h74jwa14kr8ybwxbzc4jsjj6xnymvckdsrhqhvrciya7bxzw";
+  };
+  patches = [];
   meta = with stdenv.lib; {
     description = "An OpenJDK fork to better support Jetbrains's products.";
     longDescription = ''
@@ -64,7 +25,10 @@ let drv = stdenv.mkDerivation rec {
     '';
     homepage = "https://bintray.com/jetbrains/intellij-jdk/";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ edwtjo ];
-    platforms = with platforms; [ "x86_64-linux" "x86_64-darwin" ];
+    maintainers = with maintainers; [ edwtjo petabyteboy ];
+    platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
   };
-}; in drv
+  passthru = oldAttrs.passthru // {
+    home = "${jetbrains.jdk}/lib/openjdk";
+  };
+})

From bea7401be604ff1c099f8b1f053d2d014cb67f68 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Mar 2020 14:09:48 +0000
Subject: [PATCH 2845/4636] bitwarden: 1.16.6 -> 1.17.0

---
 pkgs/tools/security/bitwarden/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix
index fbef98df82d7..71f39eaf2ee9 100644
--- a/pkgs/tools/security/bitwarden/default.nix
+++ b/pkgs/tools/security/bitwarden/default.nix
@@ -16,11 +16,11 @@ let
   pname = "bitwarden";
 
   version = {
-    x86_64-linux = "1.16.6";
+    x86_64-linux = "1.17.0";
   }.${system} or "";
 
   sha256 = {
-    x86_64-linux = "074hqm4gjljc82nhn7h6wsd74567390018fi3v38g7jh7aph10jj";
+    x86_64-linux = "01azgz1wka32z2jjdnbdyzm8fbrb34ifwirmjbvfw37yia28sd72";
   }.${system} or "";
 
   meta = with stdenv.lib; {

From 0d6e2349f64c9a8627a2be2faa44436bcf6ae034 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Thu, 12 Mar 2020 15:18:33 +0100
Subject: [PATCH 2846/4636] quorum: remove aarch64-linux

---
 pkgs/applications/blockchains/quorum.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/blockchains/quorum.nix b/pkgs/applications/blockchains/quorum.nix
index 86bd3b11a17f..49bc0be108ff 100644
--- a/pkgs/applications/blockchains/quorum.nix
+++ b/pkgs/applications/blockchains/quorum.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildGoPackage, git, which }:
+{ stdenv, fetchFromGitHub, buildGoPackage, git, which }:
   
 buildGoPackage rec {
   pname = "quorum";
@@ -25,10 +25,11 @@ buildGoPackage rec {
     cp -v build/bin/geth build/bin/bootnode build/bin/swarm $bin/bin
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A permissioned implementation of Ethereum supporting data privacy";
     homepage = "https://www.goquorum.com/";
-    license = lib.licenses.lgpl3;
-    maintainers = with lib.maintainers; [ mmahut ];
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ mmahut ];
+    platforms = subtractLists ["aarch64-linux"] platforms.linux;
   };
 }

From 63c35a9c289f4b49d57b727eaea8d345448e8495 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Thu, 12 Mar 2020 14:12:48 +0000
Subject: [PATCH 2847/4636] services.ntpd: Add extraConfig parameter

---
 nixos/modules/services/networking/ntp/ntpd.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/nixos/modules/services/networking/ntp/ntpd.nix b/nixos/modules/services/networking/ntp/ntpd.nix
index b5403cb747d0..54ff054d84c7 100644
--- a/nixos/modules/services/networking/ntp/ntpd.nix
+++ b/nixos/modules/services/networking/ntp/ntpd.nix
@@ -23,6 +23,8 @@ let
     restrict -6 ::1
 
     ${toString (map (server: "server " + server + " iburst\n") cfg.servers)}
+
+    ${cfg.extraConfig}
   '';
 
   ntpFlags = "-c ${configFile} -u ${ntpUser}:nogroup ${toString cfg.extraFlags}";
@@ -81,6 +83,17 @@ in
         '';
       };
 
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        example = ''
+          fudge 127.127.1.0 stratum 10
+        '';
+        description = ''
+          Additional text appended to <filename>ntp.conf</filename>.
+        '';
+      };
+
       extraFlags = mkOption {
         type = types.listOf types.str;
         description = "Extra flags passed to the ntpd command.";

From d315674a899d0a7d4cc83773ee2c2f2e182205da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 12 Mar 2020 15:02:47 +0000
Subject: [PATCH 2848/4636] python3.pkgs.pyicloud: 0.9.2 -> 0.9.4

---
 pkgs/development/python-modules/pyicloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix
index 1c6fe286db5a..7bc52f74701c 100644
--- a/pkgs/development/python-modules/pyicloud/default.nix
+++ b/pkgs/development/python-modules/pyicloud/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "pyicloud";
-  version = "0.9.2";
+  version = "0.9.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1jjkzf7vwms6pymnmdr893830vrymxnq455xnqp21wqhjjiy2amd";
+    sha256 = "0r171wnq2g5bw7gd59vh6flm0104ix1a6s2vhdrf8s74hipw57si";
   };
 
   propagatedBuildInputs = [

From 25300d75be2336ad9e938bd5102ad8ba11149eb7 Mon Sep 17 00:00:00 2001
From: Harry Ying <lexugeyky@outlook.com>
Date: Fri, 13 Mar 2020 00:13:12 +0800
Subject: [PATCH 2849/4636] smartdns: init at 30

---
 pkgs/tools/networking/smartdns/default.nix | 38 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/tools/networking/smartdns/default.nix

diff --git a/pkgs/tools/networking/smartdns/default.nix b/pkgs/tools/networking/smartdns/default.nix
new file mode 100644
index 000000000000..62a9aaf216cc
--- /dev/null
+++ b/pkgs/tools/networking/smartdns/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, openssl }:
+
+stdenv.mkDerivation rec {
+  pname = "smartdns";
+  version =
+    "30"; # This would be used later in the next release as the FHS commit integrated into realse 31.
+
+  src = fetchFromGitHub {
+    owner = "pymumu";
+    repo = pname;
+    rev = "3ad7cd7f454eec2fbdf338c0eb0541da301f1e73";
+    sha256 = "1y9p8gxpj2k4a10maggkxg8l55jvr7x1wyxi69waxf56ggh2dvv0";
+  };
+
+  buildInputs = [ openssl ];
+
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "SYSTEMDSYSTEMUNITDIR=${placeholder "out"}/lib/systemd/system"
+    "RUNSTATEDIR=/run"
+  ];
+
+  installFlags = [ "SYSCONFDIR=${placeholder "out"}/etc" ];
+
+  meta = with stdenv.lib; {
+    description =
+      "A local DNS server to obtain the fastest website IP for the best Internet experience";
+    longDescription = ''
+      SmartDNS is a local DNS server. SmartDNS accepts DNS query requests from local clients, obtains DNS query results from multiple upstream DNS servers, and returns the fastest access results to clients.
+      Avoiding DNS pollution and improving network access speed, supports high-performance ad filtering.
+      Unlike dnsmasq's all-servers, smartdns returns the fastest access resolution.
+    '';
+    homepage = "https://github.com/pymumu/smartdns";
+    maintainers = [ maintainers.lexuge ];
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad0159345cdd..0a0f325e21f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6507,6 +6507,8 @@ in
     conf = config.slstatus.conf or null;
   };
 
+  smartdns = callPackage ../tools/networking/smartdns { };
+
   smartmontools = callPackage ../tools/system/smartmontools {
     inherit (darwin.apple_sdk.frameworks) IOKit ApplicationServices;
   };

From 6881eb96a94eaf5b99f970f9b7c6d070c6e99c08 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 12 Mar 2020 04:20:00 -0500
Subject: [PATCH 2850/4636] gitAndTools.hub: 2.14.1 -> 2.14.2

Changelog: https://github.com/github/hub/releases/tag/v2.14.2
---
 .../version-management/git-and-tools/hub/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index 1b67b933cb1c..f868c6b3c8fa 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "hub";
-  version = "2.14.1";
+  version = "2.14.2";
 
   goPackagePath = "github.com/github/hub";
 
@@ -13,7 +13,7 @@ buildGoPackage rec {
     owner = "github";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0b179sp8z2blzh4a0c2pjbbiya68x2i4cnmcci58r8k0mwrx6mw1";
+    sha256 = "1qjab3dpia1jdlszz3xxix76lqrm4zbmqzd9ymld7h06awzsg2vh";
   };
 
   nativeBuildInputs = [ groff utillinux ];

From 3432202c03f325ef53b287c5d8e2e1454b41ee4d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Mar 2020 16:38:47 +0000
Subject: [PATCH 2851/4636] i3lock-color: 2.12.c -> 2.12.c.1

---
 pkgs/applications/window-managers/i3/lock-color.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index 7895d8c124ab..062a8c4b8d87 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.12.c";
+  version = "2.12.c.1";
   pname = "i3lock-color";
 
   src = fetchFromGitHub {
     owner = "PandorasFox";
     repo = "i3lock-color";
     rev = version;
-    sha256 = "08fhnchf187b73h52xgzb86g6byzxz085zs9galsvl687g5zxk34";
+    sha256 = "1q09cfgkikqbrkk1kljg8dsgbs5nacixhdqaww18h94hmlnbbssc";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
         - clock: time/date with configurable format
         - keyboard-layout
     '';
-    homepage = https://github.com/PandorasFox/i3lock-color;
+    homepage = "https://github.com/PandorasFox/i3lock-color";
     maintainers = with maintainers; [ malyn ];
     license = licenses.bsd3;
 

From 98d134b253183e1827eea5171804e360e09d9db0 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 12 Mar 2020 17:52:53 +0100
Subject: [PATCH 2852/4636] cargo-release: 0.13.0 -> 0.13.1

---
 pkgs/tools/package-management/cargo-release/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix
index 9b7d915a3490..c85bcf5b66c3 100644
--- a/pkgs/tools/package-management/cargo-release/default.nix
+++ b/pkgs/tools/package-management/cargo-release/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-release";
-  version = "0.13.0";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "sunng87";
     repo = "cargo-release";
     rev = "v${version}";
-    sha256 = "1w9w43i5br94vg5m4idabh67p4ffsx2lmc2g0ak2k961vl46wr0q";
+    sha256 = "0w4p1v9ya6kai2sy4ic45s1m01ya3hlysxlc8ha698jfvzs8nnld";
   };
 
-  cargoSha256 = "1x54c6wk5cbnqcy1qpsff8lwqxs0d4qf0v71r7wl0kjp8mrmmhl4";
+  cargoSha256 = "02x268xbxd2nin9y1dm35mkk90vyx16zzp18fi4fwc8kpsdbjpai";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;

From 10fad30eaa9b030881e78b6aebce8fe147cb3c34 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 12 Mar 2020 04:20:00 -0500
Subject: [PATCH 2853/4636] nushell: 0.10.0 -> 0.11.0

Release notes: https://www.nushell.sh/blog/2020/03/10/nushell_0_11_0.html
---
 pkgs/shells/nushell/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index 811ef762f78a..9f3f0da75c9e 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -15,16 +15,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nushell";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "08zqvk8qkilynfivx1jnr2yqrav64p9cy9i30jjgcqrh2gsrb9dd";
+    sha256 = "06w1118cxr5x3l7cq2wc092xvsfkgga8b6kz1gcmhwq0gf7fqirz";
   };
 
-  cargoSha256 = "1gpg0jpd5pmmny9gzzbkph1h2kqmjlapdsw04jzx852yg89lls5v";
+  cargoSha256 = "1bpb4p4j7lwb70qjsssbr878mfalil4xh8r954aaa2rlcf97fmb7";
 
   nativeBuildInputs = [ pkg-config ]
     ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ];

From 76821e6f438c0f42352c657046c3fa9f0f8f65f9 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 12 Mar 2020 18:07:32 +0100
Subject: [PATCH 2854/4636] geogebra: 5-0-573-0 -> 5-0-574-0

---
 pkgs/applications/science/math/geogebra/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index de84d35c2e89..bba26610a079 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "geogebra";
-  version = "5-0-573-0";
+  version = "5-0-574-0";
 
   preferLocalBuild = true;
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
       "https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
       "http://web.archive.org/https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"
     ];
-    sha256 = "0lj0k49sjsjqs716n74xbq6a4gids5903f5s6fhqyahrwyldhzrj";
+    sha256 = "0jbci4spqkf33yb079lsnsc684y4mdf1p8lm9r0037av8jlsrgrc";
   };
 
   srcIcon = fetchurl {

From 1e8ddbb8b9d02510ff3134d3b715efd1e47d01c0 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 12 Mar 2020 18:08:44 +0100
Subject: [PATCH 2855/4636] howard-hinnant-date: 2020-01-24 -> 2020-03-09

---
 pkgs/development/libraries/howard-hinnant-date/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/howard-hinnant-date/default.nix b/pkgs/development/libraries/howard-hinnant-date/default.nix
index 185af3dff319..df6e43293887 100644
--- a/pkgs/development/libraries/howard-hinnant-date/default.nix
+++ b/pkgs/development/libraries/howard-hinnant-date/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "howard-hinnant-date-unstable";
-  version = "2020-01-24";
+  version = "2020-03-09";
 
   src = fetchFromGitHub {
     owner = "HowardHinnant";
     repo = "date";
-    rev = "9a0ee2542848ab8625984fc8cdbfb9b5414c0082";
-    sha256 = "0yxsn0hj22n61bjywysxqgfv7hj5xvsl6isma95fl8xrimpny083";
+    rev = "4c1968b8f038483037cadfdbad3215ce21d934bb";
+    sha256 = "0dywrf18v1znfnz0gdxgi2ydax466zq34gc1vvg2k7vq17a30wq3";
   };
 
   patches = [

From b5533631cebeee8173ba113acbe641866ca1adab Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Thu, 12 Mar 2020 10:31:51 -0700
Subject: [PATCH 2856/4636] vulkan-loader: use vulkan-headers include path in
 pkgconfig file

---
 pkgs/development/libraries/vulkan-loader/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index c12c3ca640ba..b1f2663e7f8f 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ];
   enableParallelBuilding = true;
 
+  preConfigure = ''
+    substituteInPlace loader/vulkan.pc.in --replace 'includedir=''${prefix}/include' 'includedir=${vulkan-headers}/include'
+  '';
+
   cmakeFlags = [
     "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share"
     "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}"

From 37b590dc453242638f8a04221e906c4a72a1213c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 12 Mar 2020 19:06:47 +0100
Subject: [PATCH 2857/4636] wasmer: 0.13.0 -> 0.16.2

---
 pkgs/development/interpreters/wasmer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix
index 37baf241db65..d3d9cf87207d 100644
--- a/pkgs/development/interpreters/wasmer/default.nix
+++ b/pkgs/development/interpreters/wasmer/default.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wasmer";
-  version = "0.13.0";
+  version = "0.16.2";
 
   src = fetchFromGitHub {
     owner = "wasmerio";
     repo = pname;
     rev = version;
-    sha256 = "1k9zd2vhrbvxlpkh21m39alk5lfhd3xa25k0awis27plfpv8fqcq";
+    sha256 = "124zq772kz9a7n3qpxgmp4awqj41l8mhhwc0y3r77i1q02i1sy7z";
     fetchSubmodules = true;
   };
 
-  cargoSha256 = "101y3zcnbl0w0zv2k0bhqk5d0xj8m2h6ww9r366j9b1y54cqj4b7";
+  cargoSha256 = "1qqysvcviimpm2zhzsbn8vhy91rxzaknh9hv75y38xd5ggnnh9m6";
 
   nativeBuildInputs = [ cmake pkg-config ];
 

From fd614a72e97dd5dc43f19709d086251e7aa9e1e4 Mon Sep 17 00:00:00 2001
From: Murray Campbell <murray@sonology.net>
Date: Thu, 12 Mar 2020 11:41:25 -0700
Subject: [PATCH 2858/4636] blender: use PYTHONPATH (#82341)

See [blender patch](https://developer.blender.org/D6598)
---
 pkgs/applications/misc/blender/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 75f5b8302e6f..f55e46a6dc7a 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -122,7 +122,8 @@ stdenv.mkDerivation rec {
   # --python-expr is used to workaround https://developer.blender.org/T74304
   postInstall = ''
     wrapProgram $blenderExecutable \
-      --add-flags '--python-expr "import sys; sys.path.append(\"${python3Packages.numpy}/${python.sitePackages}\")"'
+      --prefix PYTHONPATH : ${python3Packages.numpy}/${python.sitePackages} \
+      --add-flags '--python-use-system-env'
   '';
 
   # Set RUNPATH so that libcuda and libnvrtc in /run/opengl-driver(-32)/lib can be

From 5dbe01af5b32c19b5e5a6e2313f5062f05770d69 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Thu, 12 Mar 2020 20:29:10 +0300
Subject: [PATCH 2859/4636] unit: 1.15.0 -> 1.16.0

---
 pkgs/servers/http/unit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix
index 8b36e7de69fd..c56e994ed54e 100644
--- a/pkgs/servers/http/unit/default.nix
+++ b/pkgs/servers/http/unit/default.nix
@@ -17,14 +17,14 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "1.15.0";
+  version = "1.16.0";
   pname = "unit";
 
   src = fetchFromGitHub {
     owner = "nginx";
     repo = "unit";
     rev = version;
-    sha256 = "1dj21fcssrvbspppbhg8684vfcbn0m1abiy1r60h5fzb470k21jb";
+    sha256 = "19gclqhwccpi7y4386ap33ycwhylv4s4kwfc6ik8scmc4pw3sj9l";
   };
 
   patches = [

From 1926cafc72b9ac0efe4530d6500df52d615f0335 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 12 Mar 2020 04:20:00 -0500
Subject: [PATCH 2860/4636] heroku: 7.38.1 -> 7.39.0

---
 pkgs/development/tools/heroku/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix
index 1e2359f10033..1867f33bfa8b 100644
--- a/pkgs/development/tools/heroku/default.nix
+++ b/pkgs/development/tools/heroku/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "heroku";
-  version = "7.38.1";
+  version = "7.39.0";
 
   src = fetchurl {
     url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz";
-    sha256 = "1sa4ph4d5y48yz2n06aivqgl07ljlgwgf5ik431vnrz5smxl6ngr";
+    sha256 = "0jj5n1jw61scpli1a0115zyp8zsa3mmljzd72bm1n5c86ppdh8pa";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From f7d1c8384cff9e6ba77f1810af658e22b7deec19 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 12 Mar 2020 21:05:43 +0100
Subject: [PATCH 2861/4636] EmptyEpsilon: 2020.01.15 -> 2020.02.18

---
 pkgs/games/empty-epsilon/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix
index 6560db48cb34..29a789b4084b 100644
--- a/pkgs/games/empty-epsilon/default.nix
+++ b/pkgs/games/empty-epsilon/default.nix
@@ -3,8 +3,8 @@
 let
 
   major = "2020";
-  minor = "01";
-  patch = "15";
+  minor = "02";
+  patch = "18";
 
   version = "${major}.${minor}.${patch}";
 
@@ -16,7 +16,7 @@ let
       owner = "daid";
       repo = "SeriousProton";
       rev = "EE-${version}";
-      sha256 = "0isiy18dv22cpv7wdbvqss2afha719a7i76bvw4cs14vfsdx9s8w";
+      sha256 = "1cq32jm3p40h5mipb64i9b1kcid27bpc8g6j4k0v69cfqkjpha5c";
     };
 
     nativeBuildInputs = [ cmake ];
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
     owner = "daid";
     repo = "EmptyEpsilon";
     rev = "EE-${version}";
-    sha256 = "0jklfap9jd9ynhvwzr9q4icvx5yb4sqm457vcar4jads4pwsd0xk";
+    sha256 = "1hl3mbg6pw2r7ri042vm86pb2xv77jvh6pag1z96bxvx791zcnwk";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -60,7 +60,7 @@ stdenv.mkDerivation {
     description = "Open source bridge simulator based on Artemis";
     homepage = https://daid.github.io/EmptyEpsilon/;
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ fpletz lheckemann ];
+    maintainers = with maintainers; [ fpletz lheckemann ma27 ];
     platforms = platforms.linux;
   };
 }

From 9f877b97b84b4e621b48e01bcd8863d75654c13d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 12 Mar 2020 21:06:01 +0100
Subject: [PATCH 2862/4636] packer: 1.5.1 -> 1.5.4

---
 pkgs/development/tools/packer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index bfc330276b0e..1430f0fc2a34 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 buildGoPackage rec {
   pname = "packer";
-  version = "1.5.1";
+  version = "1.5.4";
 
   goPackagePath = "github.com/hashicorp/packer";
 
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "hashicorp";
     repo = "packer";
     rev = "v${version}";
-    sha256 = "0cj5nr2wjpw676wwx97pk4vfal4n13hm95bjl6600fj6m3491sh0";
+    sha256 = "06320crk5dldh7w3yi4pkx7hn3s0l8q1h9fqyzf56iw8sx7983g5";
   };
 
   meta = with stdenv.lib; {

From 3fa6cd14ce11263efa0a2bf3ee5706f5aeea5b4c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 12 Mar 2020 21:06:13 +0100
Subject: [PATCH 2863/4636] blueman: 2.1.1 -> 2.1.2

---
 pkgs/tools/bluetooth/blueman/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 1a7fb5c3a084..e351867ca1bf 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -9,11 +9,11 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "blueman";
-  version = "2.1.1";
+  version = "2.1.2";
 
   src = fetchurl {
     url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz";
-    sha256 = "1hyvc5x97j8b4kvwzh58zzlc454d0h0hk440zbg8f5as9qrv5spi";
+    sha256 = "0k49hgyglsrlszckjzrvlsdm9ysns3qgvczgcmwaz02vvwnb4zai";
   };
 
   nativeBuildInputs = [

From 7c078497ceab32f502919df793a16c94ab4d0f40 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 12 Mar 2020 21:07:24 +0100
Subject: [PATCH 2864/4636] r10k: 3.2.0 -> 3.4.1

---
 pkgs/tools/system/r10k/Gemfile.lock | 38 ++++++++++++-----------
 pkgs/tools/system/r10k/gemset.nix   | 48 ++++++++++++++---------------
 2 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/pkgs/tools/system/r10k/Gemfile.lock b/pkgs/tools/system/r10k/Gemfile.lock
index f399068b56ec..3ff9b6462156 100644
--- a/pkgs/tools/system/r10k/Gemfile.lock
+++ b/pkgs/tools/system/r10k/Gemfile.lock
@@ -1,38 +1,40 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    colored (1.2)
-    cri (2.15.5)
-    faraday (0.13.1)
+    colored2 (3.1.2)
+    cri (2.15.10)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.12.2)
+    faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
     fast_gettext (1.1.2)
     gettext (3.2.9)
       locale (>= 2.0.5)
       text (>= 1.3.0)
-    gettext-setup (0.30)
+    gettext-setup (0.34)
       fast_gettext (~> 1.1.0)
-      gettext (>= 3.0.2)
+      gettext (>= 3.0.2, < 3.3.0)
       locale
-    locale (2.1.2)
+    locale (2.1.3)
     log4r (1.1.10)
-    minitar (0.8)
-    multi_json (1.13.1)
-    multipart-post (2.0.0)
-    puppet_forge (2.2.9)
-      faraday (>= 0.9.0, < 0.14.0)
-      faraday_middleware (>= 0.9.0, < 0.13.0)
+    minitar (0.9)
+    multi_json (1.14.1)
+    multipart-post (2.1.1)
+    puppet_forge (2.3.3)
+      faraday (>= 0.9.0, < 0.18.0, != 0.13.1)
+      faraday_middleware (>= 0.9.0, < 0.14.0)
       gettext-setup (~> 0.11)
       minitar
       semantic_puppet (~> 1.0)
-    r10k (3.2.0)
-      colored (= 1.2)
-      cri (~> 2.15.1)
+    r10k (3.4.1)
+      colored2 (= 3.1.2)
+      cri (>= 2.15.10, < 3.0.0)
+      fast_gettext (~> 1.1.0)
+      gettext (>= 3.0.2, < 3.3.0)
       gettext-setup (~> 0.24)
       log4r (= 1.1.10)
       multi_json (~> 1.10)
-      puppet_forge (~> 2.2.8)
+      puppet_forge (~> 2.3.0)
     semantic_puppet (1.0.2)
     text (1.3.1)
 
@@ -43,4 +45,4 @@ DEPENDENCIES
   r10k
 
 BUNDLED WITH
-   1.17.2
+   1.17.3
diff --git a/pkgs/tools/system/r10k/gemset.nix b/pkgs/tools/system/r10k/gemset.nix
index b918fe788b59..d0e955d4cea9 100644
--- a/pkgs/tools/system/r10k/gemset.nix
+++ b/pkgs/tools/system/r10k/gemset.nix
@@ -1,23 +1,23 @@
 {
-  colored = {
+  colored2 = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0b0x5jmsyi0z69bm6sij1k89z7h0laag3cb4mdn7zkl9qmxb90lx";
+      sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i";
       type = "gem";
     };
-    version = "1.2";
+    version = "3.1.2";
   };
   cri = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0z1z1aj7a3gf16wv31kc0mr45snlxrjavcj762rx791ymalmxkbr";
+      sha256 = "1h45kw2s4bjwgbfsrncs30av0j4zjync3wmcc6lpdnzbcxs7yms2";
       type = "gem";
     };
-    version = "2.15.5";
+    version = "2.15.10";
   };
   faraday = {
     dependencies = ["multipart-post"];
@@ -25,10 +25,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1gyqsj7vlqynwvivf9485zwmcj04v1z7gq362z0b8zw2zf4ag0hw";
+      sha256 = "13aghksmni2sl15y7wfpx6k5l3lfd8j9gdyqi6cbw6jgc7bqyyn2";
       type = "gem";
     };
-    version = "0.13.1";
+    version = "0.17.3";
   };
   faraday_middleware = {
     dependencies = ["faraday"];
@@ -36,10 +36,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1p7icfl28nvl8qqdsngryz1snqic9l8x6bk0dxd7ygn230y0k41d";
+      sha256 = "1a93rs58bakqck7bcihasz66a1riy22h2zpwrpmb13gp8mw3wkmr";
       type = "gem";
     };
-    version = "0.12.2";
+    version = "0.13.1";
   };
   fast_gettext = {
     groups = ["default"];
@@ -68,20 +68,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04c243gwwlnh4m8rn1zx0w8mzhixjf9fvpfb65xcmgs5a19146j4";
+      sha256 = "1vfnayz20xd8q0sz27816kvgia9z2dpj9fy7z15da239wmmnz7ga";
       type = "gem";
     };
-    version = "0.30";
+    version = "0.34";
   };
   locale = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x";
+      sha256 = "0997465kxvpxm92fiwc2b16l49mngk7b68g5k35ify0m3q0yxpdn";
       type = "gem";
     };
-    version = "2.1.2";
+    version = "2.1.3";
   };
   log4r = {
     groups = ["default"];
@@ -98,30 +98,30 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1dfw1q83h6jxrmivd3fsg0dsbkdhv63qns0jc1a6kf1vmhd6ihwd";
+      sha256 = "126mq86x67d1p63acrfka4zx0cx2r0vc93884jggxnrmmnzbxh13";
       type = "gem";
     };
-    version = "0.8";
+    version = "0.9";
   };
   multi_json = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
+      sha256 = "0xy54mjf7xg41l8qrg1bqri75agdqmxap9z466fjismc1rn2jwfr";
       type = "gem";
     };
-    version = "1.13.1";
+    version = "1.14.1";
   };
   multipart-post = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
+      sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj";
       type = "gem";
     };
-    version = "2.0.0";
+    version = "2.1.1";
   };
   puppet_forge = {
     dependencies = ["faraday" "faraday_middleware" "gettext-setup" "minitar" "semantic_puppet"];
@@ -129,21 +129,21 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "00qma88kwg2f4nh5yid9w4pqfdbwlh8bz2mmgiiwji38s0pdahba";
+      sha256 = "1lyd10ai27lxylywjxpwyxikx5hblsdchid3chymrrv55x217cny";
       type = "gem";
     };
-    version = "2.2.9";
+    version = "2.3.3";
   };
   r10k = {
-    dependencies = ["colored" "cri" "gettext-setup" "log4r" "multi_json" "puppet_forge"];
+    dependencies = ["colored2" "cri" "fast_gettext" "gettext" "gettext-setup" "log4r" "multi_json" "puppet_forge"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0yjvklvdvx0wjgg6bhhaszdsk62cysjviwj0536z7ng25q3ci5kj";
+      sha256 = "0nlckw4yr2ph14i9h0blsdb5zmrzqh3aknkm0dg3hrcx8ygncai6";
       type = "gem";
     };
-    version = "3.2.0";
+    version = "3.4.1";
   };
   semantic_puppet = {
     groups = ["default"];

From 18281a28bdc05f6311a012f7551f2d430edd7d36 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Thu, 12 Mar 2020 21:37:00 +0530
Subject: [PATCH 2865/4636] yggdrasil: 0.3.12 -> 0.3.13

---
 pkgs/tools/networking/yggdrasil/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix
index ca10adae0e44..3bf3b97c2355 100644
--- a/pkgs/tools/networking/yggdrasil/default.nix
+++ b/pkgs/tools/networking/yggdrasil/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "yggdrasil";
-  version = "0.3.12";
+  version = "0.3.13";
 
   src = fetchFromGitHub {
     owner = "yggdrasil-network";
     repo = "yggdrasil-go";
     rev = "v${version}";
-    sha256 = "03ywxamjcnhcr20vm9pn3rq3hqq49i6rfdvx44czzr30h8xp8dhw";
+    sha256 = "1k3xxarrl33sxik1dqahfllrhd501xqq5q5mcn4y5wi9lwywsy50";
   };
 
-  modSha256 = "1vqk0jyqc1qcryi247r5pbvfjw3m48l028fb2mrq1xqqfkjqrr85";
+  modSha256 = "057yl3i29kwpd129aa2rb67s5rmz898fi2a7lxv3nfjp7018s9qw";
 
   # Change the default location of the management socket on Linux
   # systems so that the yggdrasil system service unit does not have to
@@ -28,10 +28,11 @@ buildGoModule rec {
   '';
 
   meta = with lib; {
-    description = "An experiment in scalable routing as an encrypted IPv6 overlay network";
+    description =
+      "An experiment in scalable routing as an encrypted IPv6 overlay network";
     homepage = "https://yggdrasil-network.github.io/";
     license = licenses.lgpl3;
     platforms = platforms.all;
-    maintainers = with maintainers; [ gazally lassulus ];
+    maintainers = with maintainers; [ ehmry gazally lassulus ];
   };
 }

From 68fbe8206ee8b9e76435876a8a2e0e7dd2811ed7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Mar 2020 21:04:25 +0000
Subject: [PATCH 2866/4636] simplenote: 1.14.0 -> 1.15.0

---
 pkgs/applications/misc/simplenote/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix
index b98b0eee2aa0..7ec72eae6fa9 100644
--- a/pkgs/applications/misc/simplenote/default.nix
+++ b/pkgs/applications/misc/simplenote/default.nix
@@ -16,10 +16,10 @@ let
 
   pname = "simplenote";
 
-  version = "1.14.0";
+  version = "1.15.0";
 
   sha256 = {
-    x86_64-linux = "1l61xf1i80fd8ymmnrb3plqn70jsxd8wyg0n6f69bz3k8s5g8cxi";
+    x86_64-linux = "08h3g2rw75k63ssd62c6jrb2dy9sz85y5jpfj5np64dvw70a1811";
   }.${system} or throwSystem;
 
   meta = with stdenv.lib; {

From fea40ecc1d33fc03f09e267553a8098b203c164b Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Thu, 12 Mar 2020 18:30:12 +0100
Subject: [PATCH 2867/4636] openjpeg: add patch for CVE-2020-6851

---
 pkgs/development/libraries/openjpeg/2.x.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/openjpeg/2.x.nix b/pkgs/development/libraries/openjpeg/2.x.nix
index 24f3752ef435..c9b22f50af18 100644
--- a/pkgs/development/libraries/openjpeg/2.x.nix
+++ b/pkgs/development/libraries/openjpeg/2.x.nix
@@ -23,5 +23,10 @@ callPackage ./generic.nix (args // rec {
       name = "CVE-2019-12973-2.patch";
       sha256 = "1jkkfw13l7nx4hxdhc7z17f4vfgqcaf09zpl235kypbxx1ygc7vq";
     })
+    (fetchpatch {
+      url = "https://github.com/uclouvain/openjpeg/commit/024b8407392cb0b82b04b58ed256094ed5799e04.patch";
+      name = "CVE-2020-6851.patch";
+      sha256 = "1lfwlzqxb69cwzjp8v9lijz4c2qhf3b8m6sq1khipqlgrb3l58xw";
+    })
   ];
 })

From 4bd3d4ab7981077302e6e8cde8707ba1785a8865 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Thu, 12 Mar 2020 18:37:41 +0100
Subject: [PATCH 2868/4636] openjpeg: add patch for CVE-2020-8112

---
 pkgs/development/libraries/openjpeg/2.x.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/openjpeg/2.x.nix b/pkgs/development/libraries/openjpeg/2.x.nix
index c9b22f50af18..fe0e5aeb6914 100644
--- a/pkgs/development/libraries/openjpeg/2.x.nix
+++ b/pkgs/development/libraries/openjpeg/2.x.nix
@@ -28,5 +28,10 @@ callPackage ./generic.nix (args // rec {
       name = "CVE-2020-6851.patch";
       sha256 = "1lfwlzqxb69cwzjp8v9lijz4c2qhf3b8m6sq1khipqlgrb3l58xw";
     })
+    (fetchpatch {
+      url = "https://github.com/uclouvain/openjpeg/commit/05f9b91e60debda0e83977e5e63b2e66486f7074.patch";
+      name = "CVE-2020-8112.patch";
+      sha256 = "16kykc8wbq9kx9w9kkf3i7snak82m184qrl9bpxvkjl7h0n9aw49";
+    })
   ];
 })

From dc34da0755b3c36469965659c0ee4a1337e81c05 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 12 Mar 2020 23:31:07 +0100
Subject: [PATCH 2869/4636] prometheus-pushgateway: 0.8.0 -> 1.2.0

---
 pkgs/servers/monitoring/prometheus/pushgateway.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix
index 48afc610c615..0a707519c64e 100644
--- a/pkgs/servers/monitoring/prometheus/pushgateway.nix
+++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "pushgateway";
-  version = "0.8.0";
+  version = "1.2.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/prometheus/pushgateway";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "prometheus";
     repo = "pushgateway";
-    sha256 = "1mzwkxnznv6wzy7dc8rksa8gr7z92plrzls8gb8rk432zfqcbv6a";
+    sha256 = "0q57pvdfapi1xx8mw7ykvxs64alypyqbxwvrqjcrgv2jidbcd1mm";
   };
 
   buildUser = "nix@nixpkgs";

From baa9bc9c0963b6fcc39a5f138fe36f537133aa8f Mon Sep 17 00:00:00 2001
From: GTrunsec <gtrunsec@hardenedlinux.org>
Date: Thu, 12 Mar 2020 15:48:13 -0700
Subject: [PATCH 2870/4636] fix zeek mirror address and update to 3.0.3

---
 pkgs/applications/networking/ids/zeek/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix
index 79cc390ec275..9d1df501369f 100644
--- a/pkgs/applications/networking/ids/zeek/default.nix
+++ b/pkgs/applications/networking/ids/zeek/default.nix
@@ -5,11 +5,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "zeek";
-  version = "3.0.2";
+  version = "3.0.3";
 
   src = fetchurl {
-    url = "https://www.zeek.org/downloads/zeek-${version}.tar.gz";
-    sha256 = "0d5agk6yc4xyx2lwfx6r1psks1373h53m0icyka1jf15b4zjg3m7";
+    url = "https://old.zeek.org/downloads/zeek-${version}.tar.gz";
+    sha256 = "0xlw5v83qbgy23wdcddmvan2pid28mw745g4fc1z5r18kp67i8a2";
   };
 
   nativeBuildInputs = [ cmake flex bison file ];

From ec4fa2f123ab68f7e98d0c73fb4212edfba28004 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Fri, 13 Mar 2020 00:39:54 +0100
Subject: [PATCH 2871/4636] maintainers: fix wrong capitalization of githubId
 (#82446)

---
 maintainers/maintainer-list.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f427fcab32f7..1d2881b28017 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1958,7 +1958,7 @@
   drewrisinger = {
     email = "drisinger+nixpkgs@gmail.com";
     github = "drewrisinger";
-    gitHubId = 10198051;
+    githubId = 10198051;
     name = "Drew Risinger";
   };
   dsferruzza = {
@@ -3099,7 +3099,7 @@
   illiusdope = {
     email = "mat@marini.ca";
     github = "illiusdope";
-    gitHubId = 61913481;
+    githubId = 61913481;
     name = "Mat Marini";
   };
   ilya-fedin = {
@@ -4890,7 +4890,7 @@
   mmilata = {
     email = "martin@martinmilata.cz";
     github = "mmilata";
-    gitHubId = 85857;
+    githubId = 85857;
     name = "Martin Milata";
   };
   mmlb = {

From 667c5c82411c4a7c5dc00d19825acc29261de876 Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Tue, 11 Feb 2020 10:45:37 +0100
Subject: [PATCH 2872/4636] trilium: 0.39.4 -> 0.40.3

---
 pkgs/applications/office/trilium/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix
index ee4940928841..1187b00a604d 100644
--- a/pkgs/applications/office/trilium/default.nix
+++ b/pkgs/applications/office/trilium/default.nix
@@ -19,7 +19,7 @@ let
     maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ];
   };
 
-  version = "0.39.4";
+  version = "0.40.3";
 
 in {
   
@@ -30,14 +30,14 @@ in {
 
     src = fetchurl {
       url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
-      sha256 = "18wrnm13k0gg6aljpf6k7c5zia81zzkqc0sa1pgz0yzczydsfaa9";
+      sha256 = "1z7dgr8v5yvl2wmvm41cckslnsl4agdzvqzv0zsr4knk94v16cjp";
     };
   
     # Fetch from source repo, no longer included in release.
     # (they did special-case icon.png but we want the scalable svg)
     # Use the version here to ensure we get any changes.
     trilium_svg = fetchurl {
-      url = "https://raw.githubusercontent.com/zadam/trilium/v${version}/src/public/images/trilium.svg";
+      url = "https://raw.githubusercontent.com/zadam/trilium/v${version}/images/trilium.svg";
       sha256 = "1rgj7pza20yndfp8n12k93jyprym02hqah36fkk2b3if3kcmwnfg";
     };
   
@@ -78,7 +78,7 @@ in {
 
     src = fetchurl {
       url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
-      sha256 = "06svdp25031p665pvlxdz10malvhxpczzrg90hpr1zymm6v8van3";
+      sha256 = "0vlrmi1x1nanaz1ay0f5x146qcvpz4x0ngzacih5gqslz3zy8y8g";
     };
 
     nativeBuildInputs = [

From 26a31f8c62710360f18e9ec223d49c687d567c12 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Mar 2020 23:54:52 +0000
Subject: [PATCH 2873/4636] atlassian-jira: 8.7.0 -> 8.7.1

---
 pkgs/servers/atlassian/jira.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix
index a4eed02af711..611db53d6458 100644
--- a/pkgs/servers/atlassian/jira.nix
+++ b/pkgs/servers/atlassian/jira.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "atlassian-jira";
-  version = "8.7.0";
+  version = "8.7.1";
 
   src = fetchurl {
     url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
-    sha256 = "0k3z4j5pp0xx8qq5clr3069449w5k43gzag60jv3dzq35586yvdi";
+    sha256 = "0f46j94xjb5a5f74fsykjif64s9w2yd9ccy9098yrzaa8lbwdgpz";
   };
 
   buildPhase = ''

From c924fe8b7eb5c988498493e5862447377454d426 Mon Sep 17 00:00:00 2001
From: Olli Helenius <liff@iki.fi>
Date: Thu, 6 Feb 2020 20:49:59 +0200
Subject: [PATCH 2874/4636] metals: 0.7.6 -> 0.8.1

---
 pkgs/development/tools/metals/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix
index 415479edc84d..6ac2d4404eb9 100644
--- a/pkgs/development/tools/metals/default.nix
+++ b/pkgs/development/tools/metals/default.nix
@@ -2,7 +2,7 @@
 
 let
   baseName = "metals";
-  version = "0.7.6";
+  version = "0.8.1";
   deps = stdenv.mkDerivation {
     name = "${baseName}-deps-${version}";
     buildCommand = ''
@@ -15,7 +15,7 @@ let
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "03vx8n77mndpqbvq14cy3k9r4jwgjacrv56v5n87da8rqiclx37j";
+    outputHash     = "0m1vly213cazylg1rmfh5qk3bq65aafa0rf1anfdb3ggymylwza0";
   };
 in
 stdenv.mkDerivation rec {

From 090ce1afd9c6eb350d29eb1db38fc65d242f6d25 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 6 Feb 2020 04:40:41 -0600
Subject: [PATCH 2875/4636] jost: 3.3 -> 3.5

https://github.com/indestructible-type/Jost/releases/tag/3.5
https://github.com/indestructible-type/Jost/releases/tag/3.4
---
 pkgs/data/fonts/jost/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/jost/default.nix b/pkgs/data/fonts/jost/default.nix
index ecada2eda7b7..3c1403da2639 100644
--- a/pkgs/data/fonts/jost/default.nix
+++ b/pkgs/data/fonts/jost/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchzip}:
 
 let
-  version = "3.3";
+  version = "3.5";
 in fetchzip {
   name = "jost-${version}";
   url = "https://github.com/indestructible-type/Jost/releases/download/${version}/Jost.zip";
@@ -11,7 +11,7 @@ in fetchzip {
     unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
   '';
 
-  sha256="00nrhs3aif2hc4yhjhbn9ywmydl2w0g0hv5m5is8gv7wx8yi2j9z";
+  sha256="0l78vhmbsyfmrva5wc76pskhxqryyg8q5xddpj9g5wqsddy525dq";
 
   meta = with stdenv.lib; {
     homepage = https://github.com/indestructible-type/Jost;

From ed1db0178512b32c4ef60ed91d64588ab820e145 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Thu, 6 Feb 2020 03:51:03 +0100
Subject: [PATCH 2876/4636] texstudio: 2.12.20 -> 2.12.22

also add myself as maintainer
---
 pkgs/applications/editors/texstudio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix
index 372d9508174a..d6db89e5c5e2 100644
--- a/pkgs/applications/editors/texstudio/default.nix
+++ b/pkgs/applications/editors/texstudio/default.nix
@@ -3,13 +3,13 @@
 
 mkDerivation rec {
   pname = "texstudio";
-  version = "2.12.20";
+  version = "2.12.22";
 
   src = fetchFromGitHub {
     owner = "${pname}-org";
     repo = pname;
     rev = version;
-    sha256 = "0hywx2knqdrslzmm4if476ryf4ma0aw5j8kdp6lyrz2jx7az2gqa";
+    sha256 = "037jvsfln8wav17qj9anxz2a7p51v7ky85wmhdj2hgwp40al651g";
   };
 
   nativeBuildInputs = [ qmake wrapQtAppsHook pkgconfig ];
@@ -27,6 +27,6 @@ mkDerivation rec {
     homepage = http://texstudio.sourceforge.net;
     license = licenses.gpl2Plus;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ cfouche ];
+    maintainers = with maintainers; [ ajs124 cfouche ];
   };
 }

From 6d14bac04845951be7d7231cd33edd8d47545635 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 13 Mar 2020 01:03:31 +0100
Subject: [PATCH 2877/4636] nixos/python-test-driver: allow single char as
 hostName and fix misleading error-message

In case of invalid chars, the error-message references "perl variables"
which is not the case here as the python-based framework is used.
---
 nixos/lib/testing-python.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix
index 6663864f1e56..3891adc10435 100644
--- a/nixos/lib/testing-python.nix
+++ b/nixos/lib/testing-python.nix
@@ -175,13 +175,13 @@ in rec {
 
       nodeNames = builtins.attrNames nodes;
       invalidNodeNames = lib.filter
-        (node: builtins.match "^[A-z_][A-z0-9_]+$" node == null) nodeNames;
+        (node: builtins.match "^[A-z_]([A-z0-9_]+)?$" node == null) nodeNames;
 
     in
       if lib.length invalidNodeNames > 0 then
         throw ''
           Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})!
-          All machines are referenced as perl variables in the testing framework which will break the
+          All machines are referenced as python variables in the testing framework which will break the
           script when special characters are used.
 
           Please stick to alphanumeric chars and underscores as separation.

From 179aa6ec04bedcf922088be4b07d9c526e90aa90 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 13 Mar 2020 10:34:32 +1000
Subject: [PATCH 2878/4636] fzf: 0.21.0 -> 0.21.0-1

---
 pkgs/tools/misc/fzf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 740b600cdb3e..d337731888fd 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "fzf";
-  version = "0.21.0";
+  version = "0.21.0-1";
 
   src = fetchFromGitHub {
     owner = "junegunn";
     repo = pname;
     rev = version;
-    sha256 = "0s52mq64r44dh7wwc4h96xhhbxf000dr96nim0g0dcmkmnm2p8gv";
+    sha256 = "1d4bwcmjirwkkv0m01sx9rxp01iik57iy54zxhdkkz842pxlr2xv";
   };
 
   modSha256 = "16bb0a9z49jqhh9lmq8rvl7x9vh79mi4ygkb9sm04g41g5z6ag1s";

From dbe59eca8402523b82d406a63eccb62d82d964ae Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Thu, 12 Mar 2020 10:58:50 -0400
Subject: [PATCH 2879/4636] nixos/sshd: add authorizedKeysCommand and
 authorizedKeysCommandUser options

---
 nixos/doc/manual/release-notes/rl-2009.xml    |  9 ++++++++
 nixos/modules/security/google_oslogin.nix     |  6 ++---
 nixos/modules/services/misc/sssd.nix          |  6 ++---
 .../modules/services/networking/ssh/sshd.nix  | 22 +++++++++++++++++++
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index e236b230332f..72474e5dbd4a 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -28,6 +28,15 @@
      PHP now defaults to PHP 7.4, updated from 7.3.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     Two new options, <link linkend="opt-services.openssh.authorizedKeysCommand">authorizedKeysCommand</link>
+     and <link linkend="opt-services.openssh.authorizedKeysCommandUser">authorizedKeysCommandUser</link>, have
+     been added to the <literal>openssh</literal> module. If you have <literal>AuthorizedKeysCommand</literal>
+     in your <link linkend="opt-services.openssh.extraConfig">services.openssh.extraConfig</link> you should
+     make use of these new options instead.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/security/google_oslogin.nix b/nixos/modules/security/google_oslogin.nix
index 246419b681af..6f9962e1d626 100644
--- a/nixos/modules/security/google_oslogin.nix
+++ b/nixos/modules/security/google_oslogin.nix
@@ -59,10 +59,8 @@ in
         exec ${package}/bin/google_authorized_keys "$@"
       '';
     };
-    services.openssh.extraConfig = ''
-      AuthorizedKeysCommand /etc/ssh/authorized_keys_command_google_oslogin %u
-      AuthorizedKeysCommandUser nobody
-    '';
+    services.openssh.authorizedKeysCommand = "/etc/ssh/authorized_keys_command_google_oslogin %u";
+    services.openssh.authorizedKeysCommandUser = "nobody";
   };
 
 }
diff --git a/nixos/modules/services/misc/sssd.nix b/nixos/modules/services/misc/sssd.nix
index 6b64045dde88..36008d257410 100644
--- a/nixos/modules/services/misc/sssd.nix
+++ b/nixos/modules/services/misc/sssd.nix
@@ -88,9 +88,7 @@ in {
         exec ${pkgs.sssd}/bin/sss_ssh_authorizedkeys "$@"
       '';
     };
-    services.openssh.extraConfig = ''
-      AuthorizedKeysCommand /etc/ssh/authorized_keys_command
-      AuthorizedKeysCommandUser nobody
-    '';
+    services.openssh.authorizedKeysCommand = "/etc/ssh/authorized_keys_command";
+    services.openssh.authorizedKeysCommandUser = "nobody";
   })];
 }
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index b0e2e303cbc0..2069ec178aa6 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -238,6 +238,26 @@ in
         description = "Files from which authorized keys are read.";
       };
 
+      authorizedKeysCommand = mkOption {
+        type = types.str;
+        default = "none";
+        description = ''
+          Specifies a program to be used to look up the user's public
+          keys. The program must be owned by root, not writable by group
+          or others and specified by an absolute path.
+        '';
+      };
+
+      authorizedKeysCommandUser = mkOption {
+        type = types.str;
+        default = "nobody";
+        description = ''
+          Specifies the user under whose account the AuthorizedKeysCommand
+          is run. It is recommended to use a dedicated user that has no
+          other role on the host than running authorized keys commands.
+        '';
+      };
+
       kexAlgorithms = mkOption {
         type = types.listOf types.str;
         default = [
@@ -485,6 +505,8 @@ in
         PrintMotd no # handled by pam_motd
 
         AuthorizedKeysFile ${toString cfg.authorizedKeysFiles}
+        AuthorizedKeysCommand ${cfg.authorizedKeysCommand}
+        AuthorizedKeysCommandUser ${cfg.authorizedKeysCommandUser}
 
         ${flip concatMapStrings cfg.hostKeys (k: ''
           HostKey ${k.path}

From 7e978ca3243ec32c9d130c6c232981ae3ff65240 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 13 Mar 2020 02:03:25 +0100
Subject: [PATCH 2880/4636] nixos/manual: fix build

---
 nixos/doc/manual/release-notes/rl-2003.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index b77f67b664b5..a123be2ccf4e 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -715,7 +715,7 @@ auth required pam_succeed_if.so uid >= 1000 quiet
    <listitem>
     <para>
      The <link linkend="opt-systemd.network.links">systemd.network.links</link> option is now respected
-     even when <link linkend="opt-systemd.network.enable">systemd-networkd</command> is disabled.
+     even when <link linkend="opt-systemd.network.enable">systemd-networkd</link> is disabled.
      This mirrors the behaviour of systemd - It's udev that parses <literal>.link</literal> files,
      not <command>systemd-networkd</command>.
     </para>

From 0521dc3f1933f8820b2a62f6e51a0aa6d6673e64 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 12 Mar 2020 20:20:20 -0500
Subject: [PATCH 2881/4636] terraform: fix build on darwin

---
 pkgs/top-level/all-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index afd3b2f5df89..1fce62cd0586 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25655,7 +25655,10 @@ in
     buildGoModule = buildGo112Module;
   };
 
-  inherit (callPackage ../applications/networking/cluster/terraform {})
+  inherit (callPackage ../applications/networking/cluster/terraform {
+    # terraform 0.12 crashes with go1.14 on darwin https://github.com/hashicorp/terraform/issues/24287
+    buildGoPackage = if stdenv.isDarwin then buildGo113Package else buildGoPackage;
+  })
     terraform_0_11
     terraform_0_11-full
     terraform_0_12

From a58d091d8daf9907a6b3eb898fcd729e4ca9142e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Mar 2020 11:23:12 +0000
Subject: [PATCH 2882/4636] verilator: 4.028 -> 4.030

---
 pkgs/applications/science/electronics/verilator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
index 7163c201dbfc..85f6ac42126d 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "verilator";
-  version = "4.028";
+  version = "4.030";
 
   src = fetchurl {
     url    = "https://www.veripool.org/ftp/${pname}-${version}.tgz";
-    sha256 = "1rl92jnayhc1j47gjxdz2zf1by9vzlawbyw9mf1d7d2y22dqak1l";
+    sha256 = "07ldkf7xkr31n1dmx82bmzam8bvc1vsp32k76vd7yzn7r853qyky";
   };
 
   enableParallelBuilding = true;

From 4481a2012f5eb7769918939ac67d6d6d9563d8da Mon Sep 17 00:00:00 2001
From: Dmitry Bogatov <KAction@disroot.org>
Date: Sun, 8 Dec 2019 02:03:26 -0500
Subject: [PATCH 2883/4636] maintainers: add KAction

---
 maintainers/maintainer-list.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 598616c3ba91..97e5c40f8eed 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3698,6 +3698,16 @@
     githubId = 66669;
     name = "Jeff Zellner";
   };
+  kaction = {
+    name  = "Dmitry Bogatov";
+    email = "KAction@disroot.org";
+    github = "kaction";
+    githubId = 44864956;
+    key = [{
+      longkeyid = "ed25519/0x749FD4DFA2E94236";
+      fingerprint = "3F87 0A7C A7B4 3731 2F13  6083 749F D4DF A2E9 4236";
+    }];
+  };
   kaiha = {
     email = "kai.harries@gmail.com";
     github = "kaiha";

From cce3d17bda613ed3120ada1352b31cb56dd515ec Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 12 Mar 2020 20:20:20 -0500
Subject: [PATCH 2884/4636] zola: 0.10.0 -> 0.10.1

---
 pkgs/applications/misc/zola/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix
index 201a3eda3cc7..6616f7e4294e 100644
--- a/pkgs/applications/misc/zola/default.nix
+++ b/pkgs/applications/misc/zola/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "zola";
-  version = "0.10.0";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "getzola";
     repo = pname;
     rev = "v${version}";
-    sha256 = "112aqv21gy1fbly5v2x3ph32pr82d1mwh0q57yfaaqygz2madypb";
+    sha256 = "07zg4ia983rgvgvmw4xbi347lr4rxlf1xv8rw72cflc74kyia67n";
   };
 
-  cargoSha256 = "0hqa60bx8pxhgad7x6r4zbwddrkcspnnp53bl94zbf3j47p10ggz";
+  cargoSha256 = "13lnl01h8k8xv2ls1kjskfnyjmmk8iyk2mvbk01p2wmhp5m876md";
 
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ openssl ]

From bf71875060fca2bed07d1ed32482985cd11ef094 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 12 Mar 2020 04:20:00 -0500
Subject: [PATCH 2885/4636] nfpm: 1.1.10 -> 1.2.0

---
 pkgs/tools/package-management/nfpm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix
index 60091742e0d0..0b5f5edf3992 100644
--- a/pkgs/tools/package-management/nfpm/default.nix
+++ b/pkgs/tools/package-management/nfpm/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "nfpm";
-  version = "1.1.10";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0qn9hybqnhyf1xb6n0m4qq2ac8h187i2pjkkik73qly1hmyq45j7";
+    sha256 = "0zl8xf74k5is8rxbirrqb5cnfgrlppr1gchfqm31305mnpicr92s";
   };
 
-  modSha256 = "037ihnvssgkzbg94yfw4lwqnhj02m187dfn1fm7i6yv13kf0gkpx";
+  modSha256 = "14izjwadl4ify0wrz0yinqvayar79h0pxxqj5n69a5dgbx09fp0l";
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 

From cc5665d223e96361468068ff3ab9788e96c38a75 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 11 Feb 2020 14:19:44 +0200
Subject: [PATCH 2886/4636] polybar: remove doing nothing postConfigure

---
 pkgs/applications/misc/polybar/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index e1045663a3bd..1fc0162f8d08 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -68,11 +68,6 @@ stdenv.mkDerivation rec {
       (if i3Support || i3GapsSupport then makeWrapper else null)
     ];
 
-    postConfigure = ''
-      substituteInPlace generated-sources/settings.hpp \
-        --replace "${stdenv.cc}" "${stdenv.cc.name}"
-    '';
-
     postInstall = if (i3Support || i3GapsSupport) then ''
       wrapProgram $out/bin/polybar \
         --prefix PATH : "${if i3Support then i3 else i3-gaps}/bin"

From 41547d11ecf4e231e42c332cf26d512d9f2b77fb Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sarah@qtr.dk>
Date: Mon, 3 Feb 2020 19:33:24 +0100
Subject: [PATCH 2887/4636] ceph: 14.2.6 -> 14.2.7

---
 pkgs/tools/filesystems/ceph/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index e3b1d7c661c7..abf6ed1361b9 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -93,7 +93,7 @@ let
   ]);
   sitePackages = ceph-python-env.python.sitePackages;
 
-  version = "14.2.6";
+  version = "14.2.7";
 in rec {
   ceph = stdenv.mkDerivation {
     pname = "ceph";
@@ -101,7 +101,7 @@ in rec {
 
     src = fetchurl {
       url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";
-      sha256 = "0qkyrb25r2a57n6k8ncb43x7hvhkmpi7abhfyi98mlz2lhmhzlm1";
+      sha256 = "0qiqhm6hvz299q54k3i4crnb5dhpq6xnn2yqih9pxn9van0dq1ln";
     };
 
     patches = [

From 65abd808d5e3193a1a9c411bf15a5a35113ad092 Mon Sep 17 00:00:00 2001
From: snicket2100 <57048005+snicket2100@users.noreply.github.com>
Date: Sun, 2 Feb 2020 19:21:26 +0100
Subject: [PATCH 2888/4636] firejail: system package on
 `programs.firejail.enable`

this way the man page etc. becomes available if we enable firejail with
`programs.firejail.enable = true`
---
 nixos/modules/programs/firejail.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/firejail.nix b/nixos/modules/programs/firejail.nix
index 0abdde5ddebd..5e53f7337943 100644
--- a/nixos/modules/programs/firejail.nix
+++ b/nixos/modules/programs/firejail.nix
@@ -47,7 +47,7 @@ in {
   config = mkIf cfg.enable {
     security.wrappers.firejail.source = "${lib.getBin pkgs.firejail}/bin/firejail";
 
-    environment.systemPackages = [ wrappedBins ];
+    environment.systemPackages = [ pkgs.firejail ] ++ [ wrappedBins ];
   };
 
   meta.maintainers = with maintainers; [ peterhoeg ];

From 0e0ea456a5278483dc9892ee8876ed84b37a3660 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sim=C3=A9on=20Marijon?= <simeon.marijon@minmaxmedical.com>
Date: Wed, 29 Jan 2020 22:07:34 +0100
Subject: [PATCH 2889/4636] i3ipc: 1.6.0 -> 2.1.1

---
 .../python-modules/i3ipc/default.nix          | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix
index 482a51a099ec..707a58ff85ef 100644
--- a/pkgs/development/python-modules/i3ipc/default.nix
+++ b/pkgs/development/python-modules/i3ipc/default.nix
@@ -1,24 +1,37 @@
 { stdenv, buildPythonPackage, fetchFromGitHub
 , enum-compat
-, xorgserver, pytest, i3, python
+, xorgserver, pytest, pytest-xvfb, pytest-asyncio, i3, python, xlib, xdpyinfo
+, makeFontsConf, coreutils
 }:
 
 buildPythonPackage rec {
   pname = "i3ipc";
-  version = "1.6.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner  = "acrisci";
     repo   = "i3ipc-python";
     rev    = "v${version}";
-    sha256 = "0sb525wvwcnikjaqzha94xr97r1gjys30csmaj17swlxgyczxvq5";
+    sha256 = "10zpbiw1gcndn439g1vxcdkxllwp02qcmaal4w7hi2rzgaw1xkdk";
   };
+  propagatedBuildInputs = [ enum-compat xlib ];
 
-  propagatedBuildInputs = [ enum-compat ];
+  fontsConf = makeFontsConf {
+    fontDirectories = [ ];
+  };
+  FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file
+  checkInputs = [ pytest xdpyinfo pytest-asyncio pytest-xvfb xorgserver i3 ];
 
-  checkInputs = [ xorgserver pytest i3 ];
+  postPatch = ''
+    substituteInPlace test/i3.config \
+      --replace /bin/true ${coreutils}/bin/true
+  '';
+
+  checkPhase = ''
+    py.test --ignore=test/aio/test_shutdown_event.py \
+            --ignore=test/test_shutdown_event.py
+  '';
 
-  checkPhase = ''${python.interpreter} run-tests.py'';
 
   meta = with stdenv.lib; {
     description = "An improved Python library to control i3wm and sway";

From da5e9d4ab92d00207133d2281bc83bb2a53d2557 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Mar 2020 03:37:40 +0000
Subject: [PATCH 2890/4636] dovecot_pigeonhole: 0.5.9 -> 0.5.10

---
 pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
index 71a5c20dea3d..6b51aea6512e 100644
--- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
+++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "dovecot-pigeonhole";
-  version = "0.5.9";
+  version = "0.5.10";
 
   src = fetchurl {
     url = "https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz";
-    sha256 = "01dxidrnmrr2gqggfsgkfxa6ynvyjyw13xw32gi86yqmwnm6inin";
+    sha256 = "0pk0579ifl3ymfzn505396bsjlg29ykwr7ag8prcbafayg4rrj28";
   };
 
   buildInputs = [ dovecot openssl ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://pigeonhole.dovecot.org/;
+    homepage = "http://pigeonhole.dovecot.org/";
     description = "A sieve plugin for the Dovecot IMAP server";
     license = licenses.lgpl21;
     maintainers = with maintainers; [ rickynils globin ];

From 78938530263f00d03ac4562fc46df752e2b5e587 Mon Sep 17 00:00:00 2001
From: snicket2100 <57048005+snicket2100@users.noreply.github.com>
Date: Sat, 18 Jan 2020 00:31:09 +0100
Subject: [PATCH 2891/4636] ums: 6.2.2 -> 9.1.0

Removing the packaged JRE so that `jre8` gets used.

Patchelf fails on `tsMuxeR` and `tsMuxeR-new`, but this doesn't make
it any worse comparing to 6.2.2 where is also failed, so I am assuming
fixing it is out of scope of this pr. The only difference is that the
new UMS version correctly identifies that `tsMuxeR` doesn't work,
comparing to the previous one.
---
 pkgs/servers/ums/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix
index 3fb2817277aa..503ff16caeeb 100644
--- a/pkgs/servers/ums/default.nix
+++ b/pkgs/servers/ums/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ums";
-  version = "6.2.2";
+  version = "9.1.0";
   
   src = fetchurl {
-    url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${pname}-${version}" + "-Java8.tgz";
-    sha256 = "1qa999la9hixy0pdj9phjvr6lwqycgdvm94nc1606vz0ivf95b15";
+    url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${pname}-${version}" + ".tgz";
+    sha256 = "07wprjpwqids96v5q5fhwcxqlg8jp1vy585vl2nqbfi1vf5v294s";
     name = "${pname}-${version}.tgz";
   };
 
@@ -19,6 +19,10 @@ stdenv.mkDerivation rec {
     mkdir $out/bin
     mv $out/documentation /$out/doc
 
+    # ums >= 9.0.0 ships its own JRE in the package. if we remove it, the `UMS.sh`
+    # script will correctly fall back to the JRE specified by JAVA_HOME
+    rm -rf $out/linux/jre-x64 $out/linux/jre-x86
+
     makeWrapper "$out/UMS.sh" "$out/bin/ums" \
       --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ libzen libmediainfo] }" \
       --set JAVA_HOME "${jre8}"

From f5140d1b1e92e8fac025b57226b7c26ca3fb6ffc Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Tue, 14 Jan 2020 00:46:00 -0500
Subject: [PATCH 2892/4636] boost: remove versions 1.62, 1.63, and 1.64

These are relatively old, expensive to compile/cache, and not used by any
packages in the distribution.
---
 pkgs/development/libraries/boost/1.62.nix | 12 ------------
 pkgs/development/libraries/boost/1.63.nix | 12 ------------
 pkgs/development/libraries/boost/1.64.nix | 12 ------------
 pkgs/top-level/all-packages.nix           |  3 ---
 4 files changed, 39 deletions(-)
 delete mode 100644 pkgs/development/libraries/boost/1.62.nix
 delete mode 100644 pkgs/development/libraries/boost/1.63.nix
 delete mode 100644 pkgs/development/libraries/boost/1.64.nix

diff --git a/pkgs/development/libraries/boost/1.62.nix b/pkgs/development/libraries/boost/1.62.nix
deleted file mode 100644
index a1b3c51d0e69..000000000000
--- a/pkgs/development/libraries/boost/1.62.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, callPackage, fetchurl, ... } @ args:
-
-callPackage ./generic.nix (args // {
-  version = "1.62.0";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/boost/boost_1_62_0.tar.bz2";
-    # long-form SHA256 from www.boost.org
-    sha256 = "36c96b0f6155c98404091d8ceb48319a28279ca0333fba1ad8611eb90afb2ca0";
-  };
-
-})
diff --git a/pkgs/development/libraries/boost/1.63.nix b/pkgs/development/libraries/boost/1.63.nix
deleted file mode 100644
index a8b459f4b12f..000000000000
--- a/pkgs/development/libraries/boost/1.63.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, callPackage, fetchurl, ... } @ args:
-
-callPackage ./generic.nix (args // {
-  version = "1.63.0";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/boost/boost_1_63_0.tar.bz2";
-    # SHA256 from http://www.boost.org/users/history/version_1_63_0.html
-    sha256 = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0";
-  };
-
-})
diff --git a/pkgs/development/libraries/boost/1.64.nix b/pkgs/development/libraries/boost/1.64.nix
deleted file mode 100644
index 32632f79d225..000000000000
--- a/pkgs/development/libraries/boost/1.64.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, callPackage, fetchurl, ... } @ args:
-
-callPackage ./generic.nix (args // {
-  version = "1.64.0";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/boost/boost_1_64_0.tar.bz2";
-    # SHA256 from http://www.boost.org/users/history/version_1_64_0.html
-    sha256 = "7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332";
-  };
-
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index afd3b2f5df89..d53c15f914bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11060,9 +11060,6 @@ in
   boost159 = callPackage ../development/libraries/boost/1.59.nix { };
   boost15x = boost159;
   boost160 = callPackage ../development/libraries/boost/1.60.nix { };
-  boost162 = callPackage ../development/libraries/boost/1.62.nix { };
-  boost163 = callPackage ../development/libraries/boost/1.63.nix { };
-  boost164 = callPackage ../development/libraries/boost/1.64.nix { };
   boost165 = callPackage ../development/libraries/boost/1.65.nix { };
   boost166 = callPackage ../development/libraries/boost/1.66.nix { };
   boost167 = callPackage ../development/libraries/boost/1.67.nix { };

From 7db5d94c368be676d28ef1717da6ddd45e267858 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Thu, 9 Jan 2020 18:59:00 +0100
Subject: [PATCH 2893/4636] opentimestamps-client: 0.6.0 -> 0.7.0

The extra git check input and the patch aren't needed anymore.
---
 pkgs/tools/misc/opentimestamps-client/default.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/misc/opentimestamps-client/default.nix b/pkgs/tools/misc/opentimestamps-client/default.nix
index 94984c57e49c..8cc5cd7f6f2b 100644
--- a/pkgs/tools/misc/opentimestamps-client/default.nix
+++ b/pkgs/tools/misc/opentimestamps-client/default.nix
@@ -4,7 +4,7 @@
 
 buildPythonApplication rec {
   pname = "opentimestamps-client";
-  version = "0.6.0";
+  version = "0.7.0";
   disabled = (!isPy3k);
 
   # We can't use the pypi source because it doesn't include README.md which is
@@ -13,18 +13,9 @@ buildPythonApplication rec {
     owner = "opentimestamps";
     repo = "opentimestamps-client";
     rev = "opentimestamps-client-v${version}";
-    sha256 = "05m8nllqad3k69mvby5q08y22i0wrj84gqifdgcldimrrn1i00xp";
+    sha256 = "1aiq9cwr40md54swzm7wkwj0h65psxmvj2japvw79s9x0pp8iwqs";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/opentimestamps/opentimestamps-client/commit/1b328269ceee66916e9a639e8d5d7d13cd70d5d8.patch";
-      sha256 = "0bd3yalyvk5n4sflw9zilpay5k653ybdgkkfppyrk7c8z3i81hbl";
-    })
-  ];
-
-  checkInputs = [ git ];
-
   propagatedBuildInputs = [ opentimestamps appdirs GitPython pysocks ];
 
   meta = {

From 2ab1a2db994fc4649af75027b1ea1c4a4178ad8a Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 13 Mar 2020 00:07:48 -0400
Subject: [PATCH 2894/4636] tflint: 0.15.0 -> 0.15.1

---
 pkgs/development/tools/analysis/tflint/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix
index c98eba0abe63..1b22cb2dc036 100644
--- a/pkgs/development/tools/analysis/tflint/default.nix
+++ b/pkgs/development/tools/analysis/tflint/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "tflint";
-  version = "0.15.0";
+  version = "0.15.1";
 
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0j1bx2180z6znfrg8k4sjwvm3cbvnklqjxdssbr2yd47h8kfwk3g";
+    sha256 = "12a1jg4vcp6w72j8nsxf162i616g303cs783wlsa9iwm4w0cpb2h";
   };
 
-  modSha256 = "1qa7qfxpc43n9xyyfcd24d17g4fdcffkd57ny078ja219x13kay3";
+  modSha256 = "1k26i01sdgx9yik5fnd8kv300d8llqpvj9qpvga7hsbk58s2g8mv";
 
   subPackages = [ "." ];
 

From 4f58c15ee64e91f5a8d8b4664d929741a77dcb97 Mon Sep 17 00:00:00 2001
From: wucke13 <wucke13@gmail.com>
Date: Sat, 15 Feb 2020 17:12:04 +0100
Subject: [PATCH 2895/4636] petsc: 3.8.4 -> 3.12.4

+ add cxx flag to configure, because getdp needs it
---
 .../libraries/science/math/petsc/default.nix  | 34 +++++++------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix
index c2eda9dac48b..492ad63f27b6 100644
--- a/pkgs/development/libraries/science/math/petsc/default.nix
+++ b/pkgs/development/libraries/science/math/petsc/default.nix
@@ -1,17 +1,12 @@
-{ stdenv
-, fetchurl
-, blas
-, gfortran
-, liblapack
-, python }:
+{ stdenv , fetchurl , blas , gfortran , liblapack , python }:
 
 stdenv.mkDerivation rec {
   pname = "petsc";
-  version = "3.8.4";
+  version = "3.12.4";
 
   src = fetchurl {
     url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz";
-    sha256 = "1iy49gagxncx09d88kxnwkj876p35683mpfk33x37165si6xqy4z";
+    sha256 = "1hw4f12v2xwrs37gjh83dbixhg0yxandqx7s7k5vlfx91l9l3aan";
   };
 
   nativeBuildInputs = [ blas gfortran.cc.lib liblapack python ];
@@ -26,7 +21,7 @@ stdenv.mkDerivation rec {
     configureFlagsArray=(
       $configureFlagsArray
       "--CC=$CC"
-      "--with-cxx=0"
+      "--with-cxx=g++"
       "--with-fc=0"
       "--with-mpi=0"
       "--with-blas-lib=[${blas}/lib/libblas.a,${gfortran.cc.lib}/lib/libgfortran.a]"
@@ -34,17 +29,14 @@ stdenv.mkDerivation rec {
     )
   '';
 
-  postInstall = ''
-    rm $out/bin/petscmpiexec
-    rm $out/bin/popup
-    rm $out/bin/uncrustify.cfg
-    rm -rf $out/bin/win32fe
-  '';
-
-  meta = {
-    description = "Library of linear algebra algorithms for solving partial differential equations";
-    homepage = https://www.mcs.anl.gov/petsc/index.html;
-    platforms = stdenv.lib.platforms.all;
-    license = stdenv.lib.licenses.bsd2;
+  meta = with stdenv.lib; {
+    description = ''
+      Library of linear algebra algorithms for solving partial differential
+      equations
+    '';
+    homepage = "https://www.mcs.anl.gov/petsc/index.html";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ wucke13 ];
+    platforms = platforms.all;
   };
 }

From c24b9a57c4b335a0e6cc549a3bba68ab08874cbb Mon Sep 17 00:00:00 2001
From: wucke13 <wucke13@gmail.com>
Date: Tue, 30 Apr 2019 12:15:15 +0200
Subject: [PATCH 2896/4636] getdp: 3.0.4 -> 3.3.0

---
 .../science/math/getdp/default.nix            | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/science/math/getdp/default.nix b/pkgs/applications/science/math/getdp/default.nix
index 3ccd89cf2c13..0ac2ea7d1b39 100644
--- a/pkgs/applications/science/math/getdp/default.nix
+++ b/pkgs/applications/science/math/getdp/default.nix
@@ -1,24 +1,27 @@
-{ stdenv, fetchurl, cmake, gfortran, openblas, openmpi, python3 }:
+{ stdenv, fetchurl, cmake, gfortran, openblas, openmpi, petsc, python3 }:
 
 stdenv.mkDerivation rec {
-  pname = "getdp";
-  version = "3.0.4";
+  name = "getdp-${version}";
+  version = "3.3.0";
   src = fetchurl {
     url = "http://getdp.info/src/getdp-${version}-source.tgz";
-    sha256 = "0v3hg03lzw4hz28hm45hpv0gyydqz0wav7xvb5n0v0jrm47mrspv";
+    sha256 = "1pfviy2bw8z5y6c15czvlvyjjg9pvpgrj9fr54xfi2gmvs7zkgpf";
   };
 
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ gfortran openblas openmpi python3 ];
+  nativeBuildInputs = [ cmake gfortran ];
+  buildInputs = [ openblas openmpi petsc python3 ];
 
   meta = with stdenv.lib; {
     description = "A General Environment for the Treatment of Discrete Problems";
     longDescription = ''
-      GetDP is a free finite element solver using mixed elements to discretize de Rham-type complexes in one, two and three dimensions.
-      The main feature of GetDP is the closeness between the input data defining discrete problems (written by the user in ASCII data files) and the symbolic mathematical expressions of these problems.
+      GetDP is a free finite element solver using mixed elements to discretize
+      de Rham-type complexes in one, two and three dimensions.  The main
+      feature of GetDP is the closeness between the input data defining
+      discrete problems (written by the user in ASCII data files) and the
+      symbolic mathematical expressions of these problems.
     '';
-    homepage = http://getdp.info/;
-    license = stdenv.lib.licenses.gpl2Plus;
+    homepage = "http://getdp.info/";
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ wucke13 ];
     platforms = platforms.linux;
   };

From ecc01102d5d96deb4c80871b737f480064cc23c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Fri, 6 Mar 2020 00:14:19 +0100
Subject: [PATCH 2897/4636] libksi: Bump openssl dependency for rsyslogd

---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d53c15f914bb..20016724d171 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12901,9 +12901,7 @@ in
 
   libksba = callPackage ../development/libraries/libksba { };
 
-  libksi = callPackage ../development/libraries/libksi {
-    openssl = openssl_1_0_2;
-  };
+  libksi = callPackage ../development/libraries/libksi { };
 
   liblinear = callPackage ../development/libraries/liblinear { };
 

From a0a16c7993864bd457e5c89bc7c476174129824f Mon Sep 17 00:00:00 2001
From: Renato Alves <alves.rjc@gmail.com>
Date: Thu, 27 Feb 2020 01:06:06 +0100
Subject: [PATCH 2898/4636] mnemosyne: add googletrans and gtts python
 dependencies

These python packages interface with Google Translate and their absence
causes mnemosyne to fail at launch.
---
 pkgs/games/mnemosyne/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix
index 2fb675359511..38763073ac8f 100644
--- a/pkgs/games/mnemosyne/default.nix
+++ b/pkgs/games/mnemosyne/default.nix
@@ -17,6 +17,8 @@ python.pkgs.buildPythonApplication rec {
   buildInputs = [ anki ];
 
   propagatedBuildInputs = with python.pkgs; [
+    googletrans
+    gtts
     pyqtwebengine
     pyqt5
     matplotlib

From ffebc623e90669810d5dce424cdbc65146eb810c Mon Sep 17 00:00:00 2001
From: Daniel Wheeler <daniel.wheeler2@gmail.com>
Date: Fri, 28 Feb 2020 11:17:48 -0500
Subject: [PATCH 2899/4636] python37Packages.starlette: 0.13.0 -> 0.12.9

 - Reverting the version of Starlette as FastAPI can not use anything
   greater than 0.12.12. FastAPI is Starlette's only dependent.

 - Use fetchurl instead of fetchPypi as this is now the preferred
   method. This also makes the tests pass and, thus, the build, which
   was failing.
---
 .../python-modules/starlette/default.nix       | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix
index a2170db1bd48..a6d93465ffc2 100644
--- a/pkgs/development/python-modules/starlette/default.nix
+++ b/pkgs/development/python-modules/starlette/default.nix
@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , aiofiles
 , graphene
 , itsdangerous
@@ -20,12 +20,20 @@
 
 buildPythonPackage rec {
   pname = "starlette";
-  version = "0.13.0";
+
+  # This is not the latest version of Starlette, however, later
+  # versions of Starlette break FastAPI due to
+  # https://github.com/tiangolo/fastapi/issues/683. Please update when
+  # possible. FastAPI is currently Starlette's only dependent.
+
+  version = "0.12.9";
   disabled = isPy27;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "6bd414152d40d000ccbf6aa40ed89718b40868366a0f69fb83034f416303acef";
+  src = fetchFromGitHub {
+    owner = "encode";
+    repo = pname;
+    rev = version;
+    sha256 = "0w44s8ynzy8w8dgm755c8jina9i4dd87vqkcv7jc1kwkg384w9i5";
   };
 
   propagatedBuildInputs = [

From 5634ef5d4718ff4fee416f448a4994e4f14efa85 Mon Sep 17 00:00:00 2001
From: Daniel Wheeler <daniel.wheeler2@gmail.com>
Date: Fri, 28 Feb 2020 11:36:20 -0500
Subject: [PATCH 2900/4636] python37Packages.fastapi: 0.45.0 -> 0.49.0

 - Add peewee to test environment as now required.

 - Remove pyproject.toml patching as no longer required.
---
 .../python-modules/fastapi/default.nix            | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix
index 75edf5dc424c..daec9218a1de 100644
--- a/pkgs/development/python-modules/fastapi/default.nix
+++ b/pkgs/development/python-modules/fastapi/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, fetchurl
 , uvicorn
 , starlette
 , pydantic
@@ -10,11 +11,12 @@
 , pyjwt
 , passlib
 , aiosqlite
+, peewee
 }:
 
 buildPythonPackage rec {
   pname = "fastapi";
-  version = "0.45.0";
+  version = "0.49.0";
   format = "flit";
   disabled = !isPy3k;
 
@@ -22,7 +24,7 @@ buildPythonPackage rec {
     owner = "tiangolo";
     repo = "fastapi";
     rev = version;
-    sha256 = "1qwh382ny6qa3zi64micdq4j7dc64zv4rfd8g91j0digd4rhs6i1";
+    sha256 = "1dw5f2xvn0fqqsy29ypba8v3444cy7dvc7gkpmnhshky0rmfni3n";
   };
 
   propagatedBuildInputs = [
@@ -37,16 +39,9 @@ buildPythonPackage rec {
     pyjwt
     passlib
     aiosqlite
+    peewee
   ];
 
-  # starlette pinning kept in place due to 0.12.9 being a hard
-  # dependency luckily fastapi is currently the only dependent on
-  # starlette. Please remove pinning when possible
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace "pydantic >=0.32.2,<=0.32.2" "pydantic"
-  '';
-
   checkPhase = ''
     pytest --ignore=tests/test_default_response_class.py
   '';

From 150164841019732a6f7b5a8f8a68c980892ca16a Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Mon, 9 Mar 2020 17:20:14 +0200
Subject: [PATCH 2901/4636] pythonPackages.pymeeus: init at 0.3.7

---
 .../python-modules/pymeeus/default.nix        | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/python-modules/pymeeus/default.nix

diff --git a/pkgs/development/python-modules/pymeeus/default.nix b/pkgs/development/python-modules/pymeeus/default.nix
new file mode 100644
index 000000000000..4c8097325bcc
--- /dev/null
+++ b/pkgs/development/python-modules/pymeeus/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, pytest }:
+
+buildPythonPackage rec {
+  pname = "PyMeeus";
+  version = "0.3.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0qjnk9sc65i4by2x4zm6w941a4i31fmhgwbkpbqkk87rwq4h4hsn";
+  };
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    pytest .
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/architest/pymeeus";
+    description = "Library of astronomical algorithms";
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f398c9de1bef..acb28f8bfe24 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1175,6 +1175,8 @@ in {
 
   pymavlink = callPackage ../development/python-modules/pymavlink { };
 
+  pymeeus = callPackage ../development/python-modules/pymeeus { };
+
   pymsgbox = callPackage ../development/python-modules/pymsgbox { };
 
   pynisher = callPackage ../development/python-modules/pynisher { };

From 6f263901203a9d7f48320490daeb543d55de3b0f Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Mon, 9 Mar 2020 17:20:54 +0200
Subject: [PATCH 2902/4636] pythonPackages.convertdate: init at 2.2.0

---
 .../python-modules/convertdate/default.nix    | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/python-modules/convertdate/default.nix

diff --git a/pkgs/development/python-modules/convertdate/default.nix b/pkgs/development/python-modules/convertdate/default.nix
new file mode 100644
index 000000000000..5a8608c5037f
--- /dev/null
+++ b/pkgs/development/python-modules/convertdate/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, pymeeus, pytz }:
+
+buildPythonPackage rec {
+  pname = "convertdate";
+  version = "2.2.0";
+
+  # Tests are not available in the PyPI tarball so use GitHub instead.
+  src = fetchFromGitHub {
+    owner = "fitnr";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "04j8k7a9qndmawy3m345py74y18hw7lb6gc0qp0mr8d68x99xjq0";
+  };
+
+  propagatedBuildInputs = [ pymeeus pytz ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/fitnr/convertdate";
+    description = "Utils for converting between date formats and calculating holidays";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index acb28f8bfe24..3af1a0eb27b1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -571,6 +571,8 @@ in {
 
   codespell = callPackage ../development/python-modules/codespell { };
 
+  convertdate = callPackage ../development/python-modules/convertdate { };
+
   crc32c = callPackage ../development/python-modules/crc32c { };
 
   curio = callPackage ../development/python-modules/curio { };

From b7cdf99f36b5663dac88d3f29c489a3dc579de69 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Mon, 9 Mar 2020 17:21:26 +0200
Subject: [PATCH 2903/4636] pythonPackages.holidays: 0.9.12 -> 0.10.1

---
 pkgs/development/python-modules/holidays/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix
index ebde21a48217..eeaf449971b8 100644
--- a/pkgs/development/python-modules/holidays/default.nix
+++ b/pkgs/development/python-modules/holidays/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, buildPythonPackage, fetchPypi , six, dateutil }:
+{ stdenv, buildPythonPackage, fetchPypi, six, dateutil, convertdate }:
 
 buildPythonPackage rec {
   pname = "holidays";
-  version = "0.9.12";
+  version = "0.10.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3182c4a6fef8d01a829468362ace9c3bba7645873610535fef53454dbb4ea092";
+    sha256 = "1dx39krafb6cdnd7h5vgwmw4y075s6k3d31a6vhwvqhmdig3294h";
   };
 
-  propagatedBuildInputs = [ six dateutil ];
+  propagatedBuildInputs = [ six dateutil convertdate ];
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/dr-prodigy/python-holidays;
+    homepage = "https://github.com/dr-prodigy/python-holidays";
     description = "Generate and work with holidays in Python";
     license = licenses.mit;
     maintainers = with maintainers; [ jluttine ];

From 913f4d312a020c7f05c87c9307c20eb608eb2f53 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Mar 2020 04:51:35 +0000
Subject: [PATCH 2904/4636] gitAndTools.git-standup: 2.3.1 -> 2.3.2

---
 .../version-management/git-and-tools/git-standup/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-standup/default.nix b/pkgs/applications/version-management/git-and-tools/git-standup/default.nix
index c7488e84d5d0..ceb734f0f67f 100644
--- a/pkgs/applications/version-management/git-and-tools/git-standup/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-standup/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "git-standup";
-  version = "2.3.1";
+  version = "2.3.2";
 
   src = fetchFromGitHub {
     owner = "kamranahmedse";
     repo = pname;
     rev = version;
-    sha256 = "0wx9ypyxhpjbrasl6264jmj9fjrpg3gn93dg00cakabz3r7yxxq3";
+    sha256 = "1xnn0jjha56v7l2vj45zzxncl6m5x2hq6nkffgc1bcikhp1pidn7";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 91c4571e4fe8c444da8b8f4e90dcf9f214b16f67 Mon Sep 17 00:00:00 2001
From: Rick van Schijndel <rol3517@gmail.com>
Date: Thu, 12 Mar 2020 15:15:31 +0100
Subject: [PATCH 2905/4636] rtl-sdr: fix cross compilation

This patch partially fixes #81985.
Cross-compiling rtl-sdr is possible using this patch.
Use nix build -f <nixpkgs-path> -A pkgsCross.raspberryPi.rtl-sdr to build rtl-sdr.

The error that occured when trying to do this before was as follows:

/nix/store/ldb2v2z0198abkp2minr9a9vz5np4mn4-cmake-3.16.4-armv6l-unknown-linux-gnueabihf/nix-support/setup-hook: line 107: cmake: command not found
---
 pkgs/applications/radio/rtl-sdr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix
index 4e9badaa6c51..69c568c3a1bb 100644
--- a/pkgs/applications/radio/rtl-sdr/default.nix
+++ b/pkgs/applications/radio/rtl-sdr/default.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "0lmvsnb4xw4hmz6zs0z5ilsah5hjz29g1s0050n59fllskqr3b8k";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake libusb1 ];
+  nativeBuildInputs = [ pkgconfig cmake ];
+  buildInputs = [ libusb1 ];
 
   # TODO: get these fixes upstream:
   # * Building with -DINSTALL_UDEV_RULES=ON tries to install udev rules to

From 68b922b10b730643ed3e56ff68bd84d10fe2600e Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Thu, 12 Mar 2020 21:56:29 -0700
Subject: [PATCH 2906/4636] helm: 3.1.1 -> 3.1.2

---
 pkgs/applications/networking/cluster/helm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 12e20e9c13b4..88ca9b3da947 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "helm";
-  version = "3.1.1";
+  version = "3.1.2";
 
   src = fetchFromGitHub {
     owner = "helm";
     repo = "helm";
     rev = "v${version}";
-    sha256 = "16hbwmgq14g28r9s0ipnpiqlppyh57yrcqcspmj05vrf9jsg5vwj";
+    sha256 = "0pg5cwgyfb4isy2fn233kj3bdn0i8qqp90yzix0khs5maalpnrk1";
   };
   modSha256 = "0618zzi4x37ahsrazsr82anghhfva8yaryzb3p5d737p3ixbiyv8";
 

From cfff8c7883050d8f5b74c00af628ed3d8fcd9160 Mon Sep 17 00:00:00 2001
From: Taran Lynn <taranlynn0@gmail.com>
Date: Wed, 5 Feb 2020 00:56:03 -0800
Subject: [PATCH 2907/4636] redeclipse: 1.6.0 -> 2.0.0

---
 pkgs/games/redeclipse/default.nix | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/pkgs/games/redeclipse/default.nix b/pkgs/games/redeclipse/default.nix
index 3002fc75e632..b9dd36903ae4 100644
--- a/pkgs/games/redeclipse/default.nix
+++ b/pkgs/games/redeclipse/default.nix
@@ -1,19 +1,19 @@
 { stdenv, fetchFromGitHub, fetchurl, fetchpatch
-, curl, ed, pkgconfig, zlib, libX11
+, curl, ed, pkgconfig, freetype, zlib, libX11
 , SDL2, SDL2_image, SDL2_mixer
 }:
 
 stdenv.mkDerivation rec {
   pname = "redeclipse";
-  version = "1.6.0";
+  version = "2.0.0";
 
   src = fetchurl {
     url = "https://github.com/redeclipse/base/releases/download/v${version}/redeclipse_${version}_nix.tar.bz2";
-    sha256 = "0j98zk7nivdsap4y50dlqnql17hdila1ikvps6vicwaqb3l4gaa8";
+    sha256 = "143i713ggbk607qr4n39pi0pn8d93x9x6fcbh8rc51jb9qhi8p5i";
   };
 
   buildInputs = [
-    libX11 zlib
+    libX11 freetype zlib
     SDL2 SDL2_image SDL2_mixer
   ];
 
@@ -23,15 +23,6 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "-C" "src/" "prefix=$(out)" ];
 
-  patches = [
-    # "remove gamma name hack" - Can't find `____gammaf128_r_finite` otherwise
-    # Is likely to be included in next release
-    (fetchpatch {
-       url = "https://github.com/red-eclipse/base/commit/b16b4963c1ad81bb9ef784bc4913a4c8ab5f1bb4.diff";
-       sha256 = "1bm07qrq60bbmbf5k9255qq115mcyfphfy2f7xl1yx40mb9ns65p";
-    })
-  ];
-
   enableParallelBuilding = true;
 
   installTargets = [ "system-install" ];
@@ -49,7 +40,7 @@ stdenv.mkDerivation rec {
       environments.
     '';
     homepage = "https://www.redeclipse.net";
-    license = with licenses; [ licenses.zlib cc-by-sa-30 ];
+    license = with licenses; [ zlib cc-by-sa-30 ];
     maintainers = with maintainers; [ lambda-11235 ];
     platforms = platforms.linux;
     hydraPlatforms = [];

From 5de1b169eaffe49027d31b066fa185db6fdcdba9 Mon Sep 17 00:00:00 2001
From: ymeister <47071325+ymeister@users.noreply.github.com>
Date: Sat, 7 Mar 2020 17:56:11 +0000
Subject: [PATCH 2908/4636] alsaequal: init at 0.6

Co-Authored-By: Doron Behar <doron.behar@gmail.com>
---
 pkgs/tools/audio/alsaequal/caps_9.x.patch    | 21 ++++++++++
 pkgs/tools/audio/alsaequal/default.nix       | 42 ++++++++++++++++++++
 pkgs/tools/audio/alsaequal/false_error.patch | 13 ++++++
 pkgs/tools/audio/alsaequal/makefile.patch    | 13 ++++++
 pkgs/top-level/all-packages.nix              |  2 +
 5 files changed, 91 insertions(+)
 create mode 100644 pkgs/tools/audio/alsaequal/caps_9.x.patch
 create mode 100644 pkgs/tools/audio/alsaequal/default.nix
 create mode 100644 pkgs/tools/audio/alsaequal/false_error.patch
 create mode 100644 pkgs/tools/audio/alsaequal/makefile.patch

diff --git a/pkgs/tools/audio/alsaequal/caps_9.x.patch b/pkgs/tools/audio/alsaequal/caps_9.x.patch
new file mode 100644
index 000000000000..282e04049747
--- /dev/null
+++ b/pkgs/tools/audio/alsaequal/caps_9.x.patch
@@ -0,0 +1,21 @@
+--- ./ctl_equal.c
++++ ./ctl_equal.c
+@@ -167,7 +167,7 @@
+ 	snd_ctl_equal_t *equal;
+ 	const char *controls = ".alsaequal.bin";
+ 	const char *library = "/usr/lib/ladspa/caps.so";
+-	const char *module = "Eq";
++	const char *module = "Eq10";
+ 	long channels = 2;
+ 	const char *sufix = " Playback Volume";
+ 	int err, i, index;
+--- ./pcm_equal.c
++++ ./pcm_equal.c
+@@ -151,7 +151,7 @@
+ 	snd_config_t *sconf = NULL;
+ 	const char *controls = ".alsaequal.bin";
+ 	const char *library = "/usr/lib/ladspa/caps.so";
+-	const char *module = "Eq";
++	const char *module = "Eq10";
+ 	long channels = 2;
+ 	int err;
diff --git a/pkgs/tools/audio/alsaequal/default.nix b/pkgs/tools/audio/alsaequal/default.nix
new file mode 100644
index 000000000000..fa11b665cd32
--- /dev/null
+++ b/pkgs/tools/audio/alsaequal/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl
+, alsaLib, caps
+}:
+
+stdenv.mkDerivation rec {
+  name = "alsaequal";
+  version = "0.6";
+
+  src = fetchurl {
+    url = "https://thedigitalmachine.net/tools/alsaequal-${version}.tar.bz2";
+    sha256 = "1w3g9q5z3nrn3mwdhaq6zsg0jila8d102dgwgrhj9vfx58apsvli";
+  };
+
+  buildInputs = [ alsaLib ];
+
+  makeFlags = [ "DESTDIR=$(out)" ];
+
+  # Borrowed from Arch Linux's AUR
+  patches = [
+    # Adds executable permissions to resulting libraries
+    # and changes their destination directory from "usr/lib/alsa-lib" to "lib/alsa-lib" to better align with nixpkgs filesystem hierarchy.
+    ./makefile.patch
+    # Fixes control port check, which resulted in false error.
+    ./false_error.patch
+    # Fixes name change of an "Eq" to "Eq10" method in version 9 of caps library.
+    ./caps_9.x.patch
+  ];
+
+  postPatch = ''
+    sed -i 's#/usr/lib/ladspa/caps\.so#${caps}/lib/ladspa/caps\.so#g' ctl_equal.c pcm_equal.c
+  '';
+
+  preInstall = ''
+    mkdir -p "$out/lib/alsa-lib"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Real-time adjustable equalizer plugin for ALSA";
+    homepage = "https://thedigitalmachine.net/alsaequal.html";
+    license = licenses.gpl2;
+  };
+}
diff --git a/pkgs/tools/audio/alsaequal/false_error.patch b/pkgs/tools/audio/alsaequal/false_error.patch
new file mode 100644
index 000000000000..1a8413da2741
--- /dev/null
+++ b/pkgs/tools/audio/alsaequal/false_error.patch
@@ -0,0 +1,13 @@
+--- ./ctl_equal.c
++++ ./ctl_equal.c
+@@ -263,8 +263,8 @@
+ 	for(i = 0; i < equal->num_input_controls; i++) {
+ 		if(equal->control_data->control[i].type == LADSPA_CNTRL_INPUT) {
+ 			index = equal->control_data->control[i].index;
+-			if(equal->klass->PortDescriptors[index] !=
+-					(LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL)) {
++			if(equal->klass->PortDescriptors[index] &
++					(LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL) == 0) {
+ 				SNDERR("Problem with control file %s, %d.", controls, index);
+ 				return -1;
+ 			}
diff --git a/pkgs/tools/audio/alsaequal/makefile.patch b/pkgs/tools/audio/alsaequal/makefile.patch
new file mode 100644
index 000000000000..ee8aa170d60b
--- /dev/null
+++ b/pkgs/tools/audio/alsaequal/makefile.patch
@@ -0,0 +1,13 @@
+--- ./Makefile
++++ ./Makefile
+@@ -45,8 +45,8 @@
+
+ install: all
+ 	@echo Installing...
+-	$(Q)install -m 644 $(SND_PCM_BIN) ${DESTDIR}/usr/lib/alsa-lib/
+-	$(Q)install -m 644 $(SND_CTL_BIN) ${DESTDIR}/usr/lib/alsa-lib/
++	$(Q)install -m 755 $(SND_PCM_BIN) ${DESTDIR}/lib/alsa-lib/
++	$(Q)install -m 755 $(SND_CTL_BIN) ${DESTDIR}/lib/alsa-lib/
+
+ uninstall:
+ 	@echo Un-installing...
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a00adec661d1..23d28b1bd4df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -521,6 +521,8 @@ in
   acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter {
     ffmpeg = ffmpeg_2;
   };
+  
+  alsaequal = callPackage ../tools/audio/alsaequal { };
 
   acpica-tools = callPackage ../tools/system/acpica-tools { };
 

From a0c9e953c7e03deb59c39990801db76e97f29a3a Mon Sep 17 00:00:00 2001
From: ymeister <47071325+ymeister@users.noreply.github.com>
Date: Sun, 8 Mar 2020 15:11:16 +0000
Subject: [PATCH 2909/4636] maintainers: add ymeister

---
 maintainers/maintainer-list.nix        | 6 ++++++
 pkgs/tools/audio/alsaequal/default.nix | 1 +
 2 files changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e4947f4c74cd..fb0df566f618 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8173,6 +8173,12 @@
     githubId = 474343;
     name = "Xavier Zwirtz";
   };
+  ymeister = {
+    name = "Yuri Meister";
+    email = "47071325+ymeister@users.noreply.github.com";
+    github = "ymeister";
+    githubId = 47071325;
+  };
 }
 
   
diff --git a/pkgs/tools/audio/alsaequal/default.nix b/pkgs/tools/audio/alsaequal/default.nix
index fa11b665cd32..9498baca991b 100644
--- a/pkgs/tools/audio/alsaequal/default.nix
+++ b/pkgs/tools/audio/alsaequal/default.nix
@@ -38,5 +38,6 @@ stdenv.mkDerivation rec {
     description = "Real-time adjustable equalizer plugin for ALSA";
     homepage = "https://thedigitalmachine.net/alsaequal.html";
     license = licenses.gpl2;
+    maintainers = with maintainers; [ ymeister ];
   };
 }

From 85aae79ca1dbdd592f631ce2d6719f648c35f0e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 13 Mar 2020 06:58:29 +0000
Subject: [PATCH 2910/4636] nixos/kvmgt: fix driver option

extraModprobeConfig could be applied too late i.e. if the driver has been
loaded in initrd, while the harddrive is still encrypted.
Using a kernelParams works in all cases however.
---
 nixos/modules/virtualisation/kvmgt.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/virtualisation/kvmgt.nix b/nixos/modules/virtualisation/kvmgt.nix
index 36ef6d17df69..355f4770c502 100644
--- a/nixos/modules/virtualisation/kvmgt.nix
+++ b/nixos/modules/virtualisation/kvmgt.nix
@@ -50,10 +50,7 @@ in {
     };
 
     boot.kernelModules = [ "kvmgt" ];
-
-    boot.extraModprobeConfig = ''
-      options i915 enable_gvt=1
-    '';
+    boot.kernelParams = [ "i915.enable_gvt=1" ];
 
     systemd.paths = mapAttrs' (name: value:
       nameValuePair "kvmgt-${name}" {

From 505d241ee3905166206d9a8a2f13a01b60659ed2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 13 Mar 2020 07:00:17 +0000
Subject: [PATCH 2911/4636] nixos/kvmgt: add udev rules for unprivileged access

---
 nixos/modules/virtualisation/kvmgt.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/virtualisation/kvmgt.nix b/nixos/modules/virtualisation/kvmgt.nix
index 355f4770c502..0902d2dc2cb0 100644
--- a/nixos/modules/virtualisation/kvmgt.nix
+++ b/nixos/modules/virtualisation/kvmgt.nix
@@ -19,7 +19,8 @@ in {
     virtualisation.kvmgt = {
       enable = mkEnableOption ''
         KVMGT (iGVT-g) VGPU support. Allows Qemu/KVM guests to share host's Intel integrated graphics card.
-        Currently only one graphical device can be shared
+        Currently only one graphical device can be shared. To allow users to access the device without root add them
+        to the kvm group: <literal>users.extraUsers.&lt;yourusername&gt;.extraGroups = [ "kvm" ];</literal>
       '';
       # multi GPU support is under the question
       device = mkOption {
@@ -35,9 +36,7 @@ in {
           and find info about device via <command>cat /sys/bus/pci/devices/*/mdev_supported_types/i915-GVTg_V5_4/description</command>
         '';
         example = {
-          i915-GVTg_V5_8 = {
-            uuid = "a297db4a-f4c2-11e6-90f6-d3b88d6c9525";
-          };
+          i915-GVTg_V5_8.uuid = "a297db4a-f4c2-11e6-90f6-d3b88d6c9525";
         };
       };
     };
@@ -62,6 +61,10 @@ in {
       }
     ) cfg.vgpus;
 
+    services.udev.extraRules = ''
+      SUBSYSTEM=="vfio", OWNER="root", GROUP="kvm"
+    '';
+
     systemd.services = mapAttrs' (name: value:
       nameValuePair "kvmgt-${name}" {
         description = "KVMGT VGPU ${name}";

From b6ae8193edd5fb5188565d6163c86e76a096a500 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 13 Mar 2020 08:34:50 +0100
Subject: [PATCH 2912/4636] gcc: minimal hacky fixup for our pkgsi686Linux.nix

This has been blocking nixos-unstable channel through i686 ISO:
Fixes #82435, closes #82436.
https://hydra.nixos.org/build/114512204
---
 pkgs/development/compilers/gcc/9/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix
index 7ff8d7529ca3..8dc93a8ae8f4 100644
--- a/pkgs/development/compilers/gcc/9/default.nix
+++ b/pkgs/development/compilers/gcc/9/default.nix
@@ -245,6 +245,12 @@ stdenv.mkDerivation ({
 
   inherit (stdenv) is64bit;
 
+  # In this particular combination it stopped creating lib output at all.
+  # TODO: perhaps find a better fix?  (ideally understand what's going on)
+  postFixup = if crossStageStatic && targetPlatform.isMusl && targetPlatform.isi686
+    then ''mkdir "$lib"''
+    else null;
+
   meta = {
     homepage = https://gcc.gnu.org/;
     license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+

From 688d14d478c15c2e0d5e9eb73a9a8f8da341b4c4 Mon Sep 17 00:00:00 2001
From: David Anderson <dave@natulte.net>
Date: Fri, 13 Mar 2020 01:47:16 -0700
Subject: [PATCH 2913/4636] vorbis-tools: bump debian patchseries from -6 to
 -11.

Fixes #57191, CVE-2014-9638, CVE-2014-9639, CVE-2015-6749,
CVE-2017-11331.

Signed-off-by: David Anderson <dave@natulte.net>
---
 pkgs/applications/audio/vorbis-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix
index f815ac02e6e5..44d322069fc2 100644
--- a/pkgs/applications/audio/vorbis-tools/default.nix
+++ b/pkgs/applications/audio/vorbis-tools/default.nix
@@ -3,8 +3,8 @@
 
 let
   debPatch = fetchzip {
-    url = "mirror://debian/pool/main/v/vorbis-tools/vorbis-tools_1.4.0-6.debian.tar.xz";
-    sha256 = "1xmmpdvxyr84lazlg23c6ck5ic97ga2rkiqabb1d98ix2zdzyqz5";
+    url = "mirror://debian/pool/main/v/vorbis-tools/vorbis-tools_1.4.0-11.debian.tar.xz";
+    sha256 = "0kvmd5nslyqplkdb7pnmqj47ir3y5lmaxd12wmrnqh679a8jhcyi";
   };
 in
 stdenv.mkDerivation {

From e4ecf6762ef3742874117fedb44693705a5353b8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Mar 2020 09:04:32 +0000
Subject: [PATCH 2914/4636] klaus: 1.5.1 -> 1.5.2

---
 pkgs/development/python-modules/klaus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/klaus/default.nix b/pkgs/development/python-modules/klaus/default.nix
index d1218ab49b74..a2d171fbb9a5 100644
--- a/pkgs/development/python-modules/klaus/default.nix
+++ b/pkgs/development/python-modules/klaus/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "klaus";
-  version = "1.5.1";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
     owner = "jonashaag";
     repo = pname;
     rev = version;
-    sha256 = "1432m3ki2g4ma10pfv310q1w4da46b0y2jklb8ajbz8a09ms6mfx";
+    sha256 = "12b96jgiv9y7zmkqqj3dh0fbbm3ps8gbqk925qrhh56zqjl66kx2";
   };
 
   prePatch = ''

From 93f690d64a5b5ba9150ec50de34456924597ba06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 13 Mar 2020 10:27:29 +0100
Subject: [PATCH 2915/4636] redeclipse: fix meta.license

It was referring to the zlib package, as `with` has always lower
precedence than explicitly bound identifiers.
---
 pkgs/games/redeclipse/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/redeclipse/default.nix b/pkgs/games/redeclipse/default.nix
index b9dd36903ae4..fc6f50ef97e4 100644
--- a/pkgs/games/redeclipse/default.nix
+++ b/pkgs/games/redeclipse/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       environments.
     '';
     homepage = "https://www.redeclipse.net";
-    license = with licenses; [ zlib cc-by-sa-30 ];
+    license = with licenses; [ licenses.zlib cc-by-sa-30 ];
     maintainers = with maintainers; [ lambda-11235 ];
     platforms = platforms.linux;
     hydraPlatforms = [];

From e0aab9923e19d3031d37668ebb5a7ddb0b187b89 Mon Sep 17 00:00:00 2001
From: wucke13 <wucke13@gmail.com>
Date: Sat, 4 Jan 2020 01:36:24 +0100
Subject: [PATCH 2916/4636] raft-canonical: 0.9.6 -> 0.9.17

---
 .../libraries/raft-canonical/default.nix         | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix
index 515fbc602d90..201c332dfdd4 100644
--- a/pkgs/development/libraries/raft-canonical/default.nix
+++ b/pkgs/development/libraries/raft-canonical/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "raft-canonical";
-  version = "0.9.6";
+  version = "0.9.17";
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "raft";
     rev = "v${version}";
-    sha256 = "083il7b5kw3pc7m5p9xjpb9dlvfarc51sni92mkgm9ckc32x9vpp";
+    sha256 = "0q444wd6wz85g4zjkdsrf8z7chkjq9rxzq8l6fh37mgf7c23hv09";
   };
 
   nativeBuildInputs = [ autoreconfHook file pkgconfig ];
@@ -18,12 +18,14 @@ stdenv.mkDerivation rec {
     substituteInPlace configure --replace /usr/bin/ " "
   '';
 
-  doCheck = false;
-  # Due to
-  #io_uv_recv/success/first                                    [ ERROR ]
-  #Error: test/lib/dir.c:97: No such file or directory
+  # test fails
+  #
+  #append/finalizeSegment                                      [ ERROR ]
+  #Error: test/integration/test_uv_append.c:264: assertion failed: test_dir_has_file(f->dir, "0000000000000001-0000000000000004") is not true
   #Error: child killed by signal 6 (Aborted)
 
+  doCheck = false;
+
   outputs = [ "dev" "out" ];
 
   meta = with stdenv.lib; {
@@ -39,6 +41,6 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/canonical/raft";
     license = licenses.asl20;
-    maintainers = [ maintainers.wucke13 ];
+    maintainers = with maintainers; [ wucke13 ];
   };
 }

From c4efd4ea552f5d093d8e61bdb9fbf71b4599b468 Mon Sep 17 00:00:00 2001
From: wucke13 <wucke13@gmail.com>
Date: Sat, 4 Jan 2020 01:48:32 +0100
Subject: [PATCH 2917/4636] dqlite: 1.0.0 -> 1.4.0

---
 pkgs/development/libraries/dqlite/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix
index 84b4b1bab77f..5f84440df45e 100644
--- a/pkgs/development/libraries/dqlite/default.nix
+++ b/pkgs/development/libraries/dqlite/default.nix
@@ -5,13 +5,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "dqlite";
-  version = "1.0.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0670c1c84lcf5vl3h6mlff00fz2fnm766bzlk526sjjzysx3zjya";
+    sha256 = "19snm6cicxagcw9ys2jmjf6fchzs6pwm7h4jmyr0pn6zks2yjf1i";
   };
 
   nativeBuildInputs = [ autoreconfHook file pkgconfig ];
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://github.com/CanonicalLtd/dqlite/;
     license = licenses.asl20;
-    maintainers = with maintainers; [ joko ];
+    maintainers = with maintainers; [ joko wucke13 ];
     platforms = platforms.unix;
   };
 }

From 5d21d99575cdf92d6c921105d150a14c70c8ec0e Mon Sep 17 00:00:00 2001
From: wucke13 <wucke13@gmail.com>
Date: Wed, 12 Feb 2020 02:00:33 +0100
Subject: [PATCH 2918/4636] lxd: 3.18 -> 3.22

---
 pkgs/tools/admin/lxd/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
index fd8ee9e04a3a..c7c2881a567a 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, pkgconfig, lxc, buildGoPackage, fetchurl
 , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq
 , squashfsTools, iproute, iptables, ebtables, libcap, libco-canonical, dqlite
-, raft-canonical, sqlite-replication
+, raft-canonical, sqlite-replication, udev
 , writeShellScriptBin, apparmor-profiles, apparmor-parser
 , criu
 , bash
@@ -9,13 +9,13 @@
 
 buildGoPackage rec {
   pname = "lxd";
-  version = "3.18";
+  version = "3.22";
 
   goPackagePath = "github.com/lxc/lxd";
 
   src = fetchurl {
     url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
-    sha256 = "1p8g2gbwgn3kln5rxddpc2fxk8bvf026wjiqip2b0vvpi7h3955h";
+    sha256 = "1j60xajcycqnnkasbghcvx3dvb5iadvvq2l3hh9i0sw3dk1wx4hn";
   };
 
   preBuild = ''
@@ -45,7 +45,7 @@ buildGoPackage rec {
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];
   buildInputs = [ lxc acl libcap libco-canonical.dev dqlite.dev
-                  raft-canonical.dev sqlite-replication ];
+                  raft-canonical.dev sqlite-replication udev.dev ];
 
   meta = with stdenv.lib; {
     description = "Daemon based on liblxc offering a REST API to manage containers";

From 601235d9ee8c893fe0baebf8d69a55c350d00af2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 13 Mar 2020 10:06:51 +0000
Subject: [PATCH 2919/4636] cheat: 3.0.3 -> 3.0.7

---
 pkgs/applications/misc/cheat/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix
index a86c1e8bc055..d4d0643bfdc2 100644
--- a/pkgs/applications/misc/cheat/default.nix
+++ b/pkgs/applications/misc/cheat/default.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "cheat";
-  version = "3.0.3";
+  version = "3.0.7";
 
   src = fetchFromGitHub {
     owner = "chrisallenlane";
     repo = "cheat";
     rev = version;
-    sha256 = "19w1admdcgld9vlc4fsyc5d9bi6rmwhr2x2ji43za2vjlk34hnnx";
+    sha256 = "0i5j85ciimk14kndb81qxny1ksr57sr9xdvjn7x1ibc7h6pikjn5";
   };
 
   subPackages = [ "cmd/cheat" ];
 
-  modSha256 = "189cqnfl403f4lk7g9v68mwk93ciglqli639dk4x9091lvn5gq5q";
+  modSha256 = "1v9hvxygwvqma2j5yz7r95g34xpwb0n29hm39i89vgmvl3hy67s0";
 
   meta = with stdenv.lib; {
     description = "Create and view interactive cheatsheets on the command-line";

From ea6e048c37eff63e057f767410acd8fc911ba078 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Thu, 12 Mar 2020 12:29:31 +0100
Subject: [PATCH 2920/4636] buildRustCrate: only link build deps into build
 script
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

According to the Cargo documentation:

> The build script does not have access to the dependencies listed in
> the dependencies or dev-dependencies section (they’re not built
> yet!). Also, build dependencies are not available to the package
> itself unless also explicitly added in the [dependencies] table.

https://doc.rust-lang.org/cargo/reference/build-scripts.html

This change separates linkage of regular dependencies and build
dependencies.
---
 .../rust/build-rust-crate/configure-crate.nix | 63 ++++++++++++++-----
 .../rust/build-rust-crate/lib.sh              |  1 +
 .../rust/build-rust-crate/test/default.nix    | 30 +++++++++
 3 files changed, 79 insertions(+), 15 deletions(-)

diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
index 013b99a77b4b..2f7d3b77f397 100644
--- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
@@ -56,32 +56,66 @@ in ''
     i=$1
     ln -s -f $i/lib/*.rlib $2 #*/
     ln -s -f $i/lib/*.so $i/lib/*.dylib $2 #*/
-    if [ -e "$i/lib/link" ]; then
-        cat $i/lib/link >> target/link
-        cat $i/lib/link >> target/link.final
-    fi
     if [ -e $i/env ]; then
         source $i/env
     fi
   }
 
+  # The following steps set up the dependencies of the crate. Two
+  # kinds of dependencies are distinguished: build dependencies
+  # (used by the build script) and crate dependencies. For each
+  # dependency we have to:
+  #
+  # - Make its Rust library available to rustc. This is done by
+  #   symlinking all library dependencies into a directory that
+  #   can be provided to rustc.
+  # - Accumulate linking flags. These flags are largely used for
+  #   linking native libraries.
+  #
+  # The crate link flags are added to the `link` and `link.final`
+  # files. The `link` file is used for linkage in the current
+  # crate. The `link.final` file will be copied to the output and can
+  # be used by downstream crates to get the linker flags of this
+  # crate.
+
   mkdir -p target/{deps,lib,build,buildDeps}
   chmod uga+w target -R
   echo ${extraLinkFlags} > target/link
   echo ${extraLinkFlags} > target/link.final
+
+  # Prepare crate dependencies
   for i in ${completeDepsDir}; do
     symlink_dependency $i target/deps
+    if [ -e "$i/lib/link" ]; then
+      cat $i/lib/link >> target/link
+      cat $i/lib/link >> target/link.final
+    fi
   done
+
+  # Prepare crate build dependencies that are used for the build script.
   for i in ${completeBuildDepsDir}; do
-     symlink_dependency $i target/buildDeps
+    symlink_dependency $i target/buildDeps
+    if [ -e "$i/lib/link" ]; then
+      cat $i/lib/link >> target/link.build
+    fi
   done
-  if [[ -e target/link ]]; then
-    sort -u target/link > target/link.sorted
-    mv target/link.sorted target/link
-    sort -u target/link.final > target/link.final.sorted
-    mv target/link.final.sorted target/link.final
-    tr '\n' ' ' < target/link > target/link_
+
+  # Remove duplicate linker flags from the build dependencies.
+  if [[ -e target/link.build ]]; then
+    sort -u target/link.build > target/link.build.sorted
+    mv target/link.build.sorted target/link.build
   fi
+
+  # Remove duplicate linker flags from the dependencies.
+  sort -u target/link > target/link.sorted
+  mv target/link.sorted target/link
+  tr '\n' ' ' < target/link > target/link_
+
+  # Remove duplicate linker flags from the that are written
+  # to the derivation's output.
+  sort -u target/link.final > target/link.final.sorted
+  mv target/link.final.sorted target/link.final
+
   EXTRA_BUILD=""
   BUILD_OUT_DIR=""
   export CARGO_PKG_NAME=${crateName}
@@ -120,15 +154,14 @@ in ''
   elif [[ -e "build.rs" ]]; then
      BUILD="build.rs"
   fi
+
+  # Compile and run the build script, when available.
   if [[ ! -z "$BUILD" ]] ; then
      echo_build_heading "$BUILD" ${libName}
      mkdir -p target/build/${crateName}
      EXTRA_BUILD_FLAGS=""
-     if [ -e target/link_ ]; then
-       EXTRA_BUILD_FLAGS=$(cat target/link_)
-     fi
      if [ -e target/link.build ]; then
-       EXTRA_BUILD_FLAGS="$EXTRA_BUILD_FLAGS $(cat target/link.build)"
+       EXTRA_BUILD_FLAGS="$EXTRA_BUILD_FLAGS $(tr '\n' ' ' < target/link.build)"
      fi
      noisily rustc --crate-name build_script_build $BUILD --crate-type bin ${rustcOpts} \
        ${crateFeatures} --out-dir target/build/${crateName} --emit=dep-info,link \
diff --git a/pkgs/build-support/rust/build-rust-crate/lib.sh b/pkgs/build-support/rust/build-rust-crate/lib.sh
index 0f08c133e557..5843ee98b0d5 100644
--- a/pkgs/build-support/rust/build-rust-crate/lib.sh
+++ b/pkgs/build-support/rust/build-rust-crate/lib.sh
@@ -79,6 +79,7 @@ build_bin_test_file() {
     build_bin_test "$derived_crate_name" "$file"
 }
 
+# Add additional link options that were provided by the build script.
 setup_link_paths() {
   EXTRA_LIB=""
   if [[ -e target/link_ ]]; then
diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix
index 710045664686..f24583c41fcb 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix
@@ -207,6 +207,36 @@ let
           })
         ];
       };
+      buildScriptDeps = let
+        depCrate = boolVal: mkCrate {
+          crateName = "bar";
+          src = mkFile "src/lib.rs" ''
+            pub const baz: bool = ${boolVal};
+          '';
+        };
+      in {
+        crateName = "foo";
+        src = symlinkJoin {
+          name = "build-script-and-main";
+          paths = [
+            (mkFile  "src/main.rs" ''
+              extern crate bar;
+              #[cfg(test)]
+              #[test]
+              fn baz_false() { assert!(!bar::baz); }
+              fn main() { }
+            '')
+            (mkFile  "build.rs" ''
+              extern crate bar;
+              fn main() { assert!(bar::baz); }
+            '')
+          ];
+        };
+        buildDependencies = [ (depCrate "true") ];
+        dependencies = [ (depCrate "false") ];
+        buildTests = true;
+        expectedTestOutputs = [ "test baz_false ... ok" ];
+      };
       # Regression test for https://github.com/NixOS/nixpkgs/issues/74071
       # Whenevever a build.rs file is generating files those should not be overlayed onto the actual source dir
       buildRsOutDirOverlay = {

From 412c72d20f067dfb45aaa041c2333fbdc82dca6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Fri, 13 Mar 2020 11:21:07 +0100
Subject: [PATCH 2921/4636] buildRustCrate: sort linker options in-place

---
 .../rust/build-rust-crate/configure-crate.nix            | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
index 2f7d3b77f397..61c39c6b21c0 100644
--- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
@@ -102,19 +102,16 @@ in ''
 
   # Remove duplicate linker flags from the build dependencies.
   if [[ -e target/link.build ]]; then
-    sort -u target/link.build > target/link.build.sorted
-    mv target/link.build.sorted target/link.build
+    sort -uo target/link.build target/link.build
   fi
 
   # Remove duplicate linker flags from the dependencies.
-  sort -u target/link > target/link.sorted
-  mv target/link.sorted target/link
+  sort -uo target/link target/link
   tr '\n' ' ' < target/link > target/link_
 
   # Remove duplicate linker flags from the that are written
   # to the derivation's output.
-  sort -u target/link.final > target/link.final.sorted
-  mv target/link.final.sorted target/link.final
+  sort -uo target/link.final target/link.final
 
   EXTRA_BUILD=""
   BUILD_OUT_DIR=""

From e1d58266d55a91477d57b0715e3328968419663e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 13 Mar 2020 12:27:02 +0100
Subject: [PATCH 2922/4636] gcc: tweak platform condition in the hack from
 b6ae8193

It was rightly noted that armv7l suffers from the same issue:
https://hydra.nixos.org/build/114263466#tabs-buildsteps
---
 pkgs/development/compilers/gcc/9/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix
index 8dc93a8ae8f4..f660a59a790a 100644
--- a/pkgs/development/compilers/gcc/9/default.nix
+++ b/pkgs/development/compilers/gcc/9/default.nix
@@ -247,7 +247,7 @@ stdenv.mkDerivation ({
 
   # In this particular combination it stopped creating lib output at all.
   # TODO: perhaps find a better fix?  (ideally understand what's going on)
-  postFixup = if crossStageStatic && targetPlatform.isMusl && targetPlatform.isi686
+  postFixup = if crossStageStatic && targetPlatform.isMusl && targetPlatform.is32bit
     then ''mkdir "$lib"''
     else null;
 

From 5f45d51c8b51fb6ba761ee49200a55e3af7d06e3 Mon Sep 17 00:00:00 2001
From: Yannik Sander <me@ysndr.de>
Date: Fri, 13 Mar 2020 12:46:08 +0100
Subject: [PATCH 2923/4636] act: 0.2.5 -> 0.2.6

---
 pkgs/development/tools/misc/act/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix
index 03bd2696cce5..de1cf939e6ae 100644
--- a/pkgs/development/tools/misc/act/default.nix
+++ b/pkgs/development/tools/misc/act/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "act";
-  version = "0.2.5";
+  version = "0.2.6";
 
   src = fetchFromGitHub {
     owner = "nektos";
     repo = pname;
     rev = "v${version}";
-    sha256 = "00clafq3izvfwxkb85hf6s40yfw2hpsfz3xg4da28pgh1wlqb9ps";
+    sha256 = "0l7id483006mnii4rlcff4p0ricd8a2n24sf74a9b387x0akpbsn";
   };
 
-  modSha256 = "0ghp61m8fxg1iwq2ypmp99cqv3n16c06v2xzg9v34299vmd89gi2";
+  modSha256 = "04s4p9j6j7gw1s4v271zwzvdny7dvjaazd2pihmyjfik95xmwx9r";
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 

From 54c34f74fc3672ce9161bcf5ca3823df62d6d4a5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Mar 2020 12:37:15 +0100
Subject: [PATCH 2924/4636] ndi: update from version 4.0 to 4.1.6 to fix the
 build

Closes https://github.com/NixOS/nixpkgs/issues/81329.

Needs back-porting to nixos-20.03.
---
 pkgs/development/libraries/ndi/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/ndi/default.nix b/pkgs/development/libraries/ndi/default.nix
index fcf9457c691c..7a4407a17f0d 100644
--- a/pkgs/development/libraries/ndi/default.nix
+++ b/pkgs/development/libraries/ndi/default.nix
@@ -2,21 +2,22 @@
 
 stdenv.mkDerivation rec {
   pname = "ndi";
-  version = "4";
+  fullVersion = "4.1.6";
+  version = builtins.head (builtins.splitVersion fullVersion);
 
   src = requireFile rec {
     name    = "InstallNDISDK_v${version}_Linux.tar.gz";
-    sha256  = "1hac5npyg8nifs9ipj34pkn0zjyx8774x3i3h8znhmijx2j2982p";
+    sha256  = "0hki805j3hlci6w5ca2cajm5q0y9yihgvpsykkn8dzx8chw4pmsk";
     message = ''
-      In order to use the NDI SDK, you need to comply with NewTek's license and
-      download the Linux version ${version} tarball from:
+      In order to use NDI SDK version ${fullVersion}, you need to comply with
+      NewTek's license and download the appropriate Linux tarball from:
 
-      ${meta.homepage}
+        ${meta.homepage}
 
       Once you have downloaded the file, please use the following command and
       re-run the installation:
 
-      nix-prefetch-url file://\$PWD/${name}
+        \$ nix-prefetch-url file://\$PWD/${name}
     '';
   };
 

From e46fd9239e8de4e6986aa19e17c48c4e87cccbad Mon Sep 17 00:00:00 2001
From: Kevin Cox <kevincox@kevincox.ca>
Date: Mon, 9 Mar 2020 12:21:41 -0400
Subject: [PATCH 2925/4636] mesos: Remove kevincox as maintainer.

kevincox no longer uses mesos so is not a suitable maintainer.
---
 pkgs/applications/networking/cluster/marathon/default.nix | 2 +-
 pkgs/applications/networking/cluster/mesos/default.nix    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix
index 72bd82be6c16..b7decc0c1413 100644
--- a/pkgs/applications/networking/cluster/marathon/default.nix
+++ b/pkgs/applications/networking/cluster/marathon/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     homepage = https://mesosphere.github.io/marathon;
     description = "Cluster-wide init and control system for services in cgroups or Docker containers";
     license = licenses.asl20;
-    maintainers = with maintainers; [ kamilchm kevincox pradeepchhetri ];
+    maintainers = with maintainers; [ kamilchm pradeepchhetri ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index 1ad30335b94d..ec152fdc4648 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -256,7 +256,7 @@ in stdenv.mkDerivation rec {
     homepage    = "http://mesos.apache.org";
     license     = licenses.asl20;
     description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks";
-    maintainers = with maintainers; [ cstrahan kevincox offline ];
+    maintainers = with maintainers; [ cstrahan offline ];
     platforms   = platforms.unix;
   };
 }

From dd0de727fc20114e5dd7ddc5421d999ba8cdd9ee Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 13 Mar 2020 11:40:54 +0000
Subject: [PATCH 2926/4636] lilypond-with-fonts: fix adding fonts

---
 pkgs/misc/lilypond/with-fonts.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix
index 36dbcf170dd5..1036f474b14d 100644
--- a/pkgs/misc/lilypond/with-fonts.nix
+++ b/pkgs/misc/lilypond/with-fonts.nix
@@ -5,7 +5,7 @@
 stdenv.lib.appendToName "with-fonts" (symlinkJoin {
   inherit (lilypond) meta name version ;
 
-  paths = [ lilypond ];
+  paths = [ lilypond ] ++ openlilylib-fonts.all;
 
   buildInputs = [ makeWrapper lndir ];
 

From b0d9764c721c3f998f685e87eaec2fc70e2778fb Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 13 Mar 2020 13:45:08 +0000
Subject: [PATCH 2927/4636] claws-mail-gtk3: init at 3.17.5

This branch currently seems an almost adequate replacement for gtk2 claws-mail,
except that clicking links in the web view opens them in the email window even
when "open links with external browser" is enabled.

Related: #75040
---
 .../mailreaders/claws-mail/default.nix        |   2 +-
 .../mailreaders/claws-mail/gtk3.nix           | 121 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   3 +
 3 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix

diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index ffe75eaac7c8..5f5e66597acc 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -107,6 +107,6 @@ stdenv.mkDerivation rec {
     homepage = "https://www.claws-mail.org/";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ fpletz globin ];
+    maintainers = with maintainers; [ fpletz globin orivej ];
   };
 }
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix b/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix
new file mode 100644
index 000000000000..1e1909e7109a
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix
@@ -0,0 +1,121 @@
+{ config, fetchgit, stdenv, wrapGAppsHook, autoreconfHook, bison, flex
+, curl, dbus, dbus-glib, enchant, gtk3, gnutls, gnupg, gpgme
+, libarchive, libcanberra-gtk3, libetpan, libnotify, libsoup, libxml2, networkmanager
+, openldap, perl, pkgconfig, poppler, python, shared-mime-info, webkitgtk
+, glib-networking, gsettings-desktop-schemas, libSM, libytnef, libical
+# Build options
+# TODO: A flag to build the manual.
+# TODO: Plugins that complain about their missing dependencies, even when
+#       provided:
+#         gdata requires libgdata
+#         geolocation requires libchamplain
+, enableLdap ? false
+, enableNetworkManager ? config.networking.networkmanager.enable or false
+, enablePgp ? true
+, enablePluginArchive ? false
+, enablePluginFancy ? true
+, enablePluginNotificationDialogs ? true
+, enablePluginNotificationSounds ? true
+, enablePluginPdf ? false
+, enablePluginPython ? false
+, enablePluginRavatar ? false
+, enablePluginRssyl ? false
+, enablePluginSmime ? false
+, enablePluginSpamassassin ? false
+, enablePluginSpamReport ? false
+, enablePluginVcalendar ? false
+, enableSpellcheck ? false
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  pname = "claws-mail-gtk3";
+  version = "3.17.5";
+
+  src = fetchgit {
+    url = "git://git.claws-mail.org/claws.git";
+    rev = "c1e1902323c2b5dfe82144328b7933dc857ef343"; # this commit is "for release 3.17.5"
+    sha256 = "0cqzlzcms6alvsdsbcc06bsdi1h349b16qngn2z1p8fz16x6s6cy";
+  };
+
+  outputs = [ "out" "dev" ];
+
+  patches = [ ./mime.patch ];
+
+  preConfigure = ''
+    # autotools check tries to dlopen libpython as a requirement for the python plugin
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${python}/lib
+    # generate version without .git
+    [ -e version ] || echo "echo ${version}" > version
+  '';
+
+  postPatch = ''
+    substituteInPlace src/procmime.c \
+        --subst-var-by MIMEROOTDIR ${shared-mime-info}/share
+  '';
+
+  nativeBuildInputs = [ autoreconfHook bison flex pkgconfig wrapGAppsHook python.pkgs.wrapPython ];
+  propagatedBuildInputs = with python.pkgs; [ python ] ++ optionals enablePluginPython [ pygtk pygobject2 ];
+
+  buildInputs =
+    [ curl dbus dbus-glib gtk3 gnutls gsettings-desktop-schemas
+      libetpan perl glib-networking libSM libytnef
+    ]
+    ++ optional enableSpellcheck enchant
+    ++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ]
+    ++ optional enablePluginArchive libarchive
+    ++ optional enablePluginNotificationSounds libcanberra-gtk3
+    ++ optional enablePluginNotificationDialogs libnotify
+    ++ optional enablePluginFancy libsoup
+    ++ optional enablePluginRssyl libxml2
+    ++ optional enableNetworkManager networkmanager
+    ++ optional enableLdap openldap
+    ++ optional enablePluginPdf poppler
+    ++ optional enablePluginFancy webkitgtk
+    ++ optional enablePluginVcalendar libical;
+
+  configureFlags =
+    optional (!enableLdap) "--disable-ldap"
+    ++ optional (!enableNetworkManager) "--disable-networkmanager"
+    ++ optionals (!enablePgp) [
+      "--disable-pgpcore-plugin"
+      "--disable-pgpinline-plugin"
+      "--disable-pgpmime-plugin"
+    ]
+    ++ optional (!enablePluginArchive) "--disable-archive-plugin"
+    ++ optional (!enablePluginFancy) "--disable-fancy-plugin"
+    ++ optional (!enablePluginPdf) "--disable-pdf_viewer-plugin"
+    ++ optional (!enablePluginPython) "--disable-python-plugin"
+    ++ optional (!enablePluginRavatar) "--disable-libravatar-plugin"
+    ++ optional (!enablePluginRssyl) "--disable-rssyl-plugin"
+    ++ optional (!enablePluginSmime) "--disable-smime-plugin"
+    ++ optional (!enablePluginSpamassassin) "--disable-spamassassin-plugin"
+    ++ optional (!enablePluginSpamReport) "--disable-spam_report-plugin"
+    ++ optional (!enablePluginVcalendar) "--disable-vcalendar-plugin"
+    ++ optional (!enableSpellcheck) "--disable-enchant";
+
+  enableParallelBuilding = true;
+
+  pythonPath = with python.pkgs; [ pygobject2 pygtk ];
+
+  preFixup = ''
+    buildPythonPath "$out $pythonPath"
+    gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share" --prefix PYTHONPATH : "$program_PYTHONPATH")
+  '';
+
+  postInstall = ''
+    mkdir -p $out/share/applications
+    cp claws-mail.desktop $out/share/applications
+  '';
+
+  NIX_CFLAGS_COMPILE = [ "-Wno-deprecated-declarations" ];
+
+  meta = {
+    description = "The user-friendly, lightweight, and fast email client";
+    homepage = "https://www.claws-mail.org/";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ fpletz globin orivej ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8343c6f2e2b8..ec4f61353a95 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18625,6 +18625,9 @@ in
   claws-mail = callPackage ../applications/networking/mailreaders/claws-mail {
     inherit (xorg) libSM;
   };
+  claws-mail-gtk3 = callPackage ../applications/networking/mailreaders/claws-mail/gtk3.nix {
+    inherit (xorg) libSM;
+  };
 
   clfswm = callPackage ../applications/window-managers/clfswm { };
 

From fb08fa0063cebdfa48f54b6fdefe3f6206c67d3e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Mar 2020 14:59:25 +0000
Subject: [PATCH 2928/4636] antibody: 4.2.0 -> 4.3.1

---
 pkgs/shells/zsh/antibody/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix
index e1bfc68dc4de..2793319c8942 100644
--- a/pkgs/shells/zsh/antibody/default.nix
+++ b/pkgs/shells/zsh/antibody/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "antibody";
-  version = "4.2.0";
+  version = "4.3.1";
 
   goPackagePath = "github.com/getantibody/antibody";
 
@@ -10,14 +10,14 @@ buildGoModule rec {
     owner = "getantibody";
     repo = "antibody";
     rev = "v${version}";
-    sha256 = "1vds7mxqxa7xlhvjvmnh1nr1ra3dciav0qlv45s1dmwn5qrcilci";
+    sha256 = "1cxg0173d3xnpyzbisj926vh3qql9rw3q4j1z900m34gw7cvsdpf";
   };
 
-  modSha256 = "1n9sgrm16iig600f4q1cmbwwk0822isjvbyazplylha843510b17";
+  modSha256 = "08k4mzqcva7yq1zmfxhlqnd8kk70zry6cfghxl1bgmhnfjqh61qr";
 
   meta = with lib; {
     description = "The fastest shell plugin manager";
-    homepage = https://github.com/getantibody/antibody;
+    homepage = "https://github.com/getantibody/antibody";
     license = licenses.mit;
     maintainers = with maintainers; [ filalex77 worldofpeace ];
   };

From ceee45c346a6801bbee6e62dfdb0cd93fe7e1bce Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Mar 2020 15:13:56 +0000
Subject: [PATCH 2929/4636] awsweeper: 0.4.1 -> 0.6.0

---
 pkgs/tools/admin/awsweeper/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/awsweeper/default.nix b/pkgs/tools/admin/awsweeper/default.nix
index 91ef7ee022e4..661747c2fd0d 100644
--- a/pkgs/tools/admin/awsweeper/default.nix
+++ b/pkgs/tools/admin/awsweeper/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "awsweeper";
-  version = "0.4.1";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "cloudetc";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0if2sfxd28m832zyiy40grwa4may45zq20h35yxf8bq0wxvp0q3f";
+    sha256 = "0sbd1jgzz3rxxwgbni885zvvcznfc51imaxwv7f064290iqlbrv4";
   };
 
-  modSha256 = "0nzc8ib2c3wlwk97qq45kgpnval69v8nbxhkfabcx0idipx3pbvk";
+  modSha256 = "14yvf0svh7xqpc2y7xr94pc6r7d3iv2nsr8qs3f5q29hdc5hv3fs";
 
   meta = with lib; {
     description = "A tool to clean out your AWS account";

From dda6dfed2603035f4819013bb0005f570150b07f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 13 Mar 2020 16:52:36 +0100
Subject: [PATCH 2930/4636] neomutt: 20191207 -> 20200313

https://github.com/neomutt/neomutt/releases/tag/20200313
---
 .../applications/networking/mailreaders/neomutt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index 274d9d4718e2..dc473eaaadd7 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "20191207";
+  version = "20200313";
   pname = "neomutt";
 
   src = fetchFromGitHub {
     owner  = "neomutt";
     repo   = "neomutt";
     rev    = version;
-    sha256 = "147yjpqnsbfy01fhsflxlixk0985r91a6bjmqq3cwmf7gka3sihm";
+    sha256 = "1k4k07l6h5krc3fx928qvdq3ssw9fxn95aj7k885xlckd2i1lnb5";
   };
 
   buildInputs = [
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     description = "A small but very powerful text-based mail client";
     homepage    = http://www.neomutt.org;
     license     = licenses.gpl2Plus;
-    maintainers = with maintainers; [ cstrahan erikryb jfrankenau vrthra ];
+    maintainers = with maintainers; [ cstrahan erikryb jfrankenau vrthra ma27 ];
     platforms   = platforms.unix;
   };
 }

From f167ba637dfeac6f5acfae01fad357fcdd218630 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 13 Mar 2020 11:54:07 -0400
Subject: [PATCH 2931/4636] lilypond: fix broken meta.homepage

The `src.meta` attribute does not exist, and even if it did the derivation does
not have a `rec` to reference it. This appears to be breaking all ofBorg meta
evaluation checks:

```
while evaluating the attribute 'homepage' at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/eval-0-gleber.ewr1.nix.ci/pkgs/misc/lilypond/fonts.nix:34:27:
undefined variable 'src' at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/eval-0-gleber.ewr1.nix.ci/pkgs/misc/lilypond/fonts.nix:34:18
```
https://gist.github.com/GrahamcOfBorg/cd87009bfee1a9c0d4f0d828b82ee09a
---
 pkgs/misc/lilypond/default.nix | 2 +-
 pkgs/misc/lilypond/fonts.nix   | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix
index e9f8d6984af9..a740323b47f3 100644
--- a/pkgs/misc/lilypond/default.nix
+++ b/pkgs/misc/lilypond/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Music typesetting system";
-    homepage = http://lilypond.org/;
+    homepage = "http://lilypond.org/";
     license = licenses.gpl3;
     maintainers = with maintainers; [ marcweber yurrriq ];
     platforms = platforms.all;
diff --git a/pkgs/misc/lilypond/fonts.nix b/pkgs/misc/lilypond/fonts.nix
index 00335eddce86..deeedf679954 100644
--- a/pkgs/misc/lilypond/fonts.nix
+++ b/pkgs/misc/lilypond/fonts.nix
@@ -7,7 +7,6 @@ let
       inherit version;
       pname = "openlilypond-font-${fontName}";
 
-
       src = fetchFromGitHub {
         inherit rev sha256;
         owner = "OpenLilyPondFonts";
@@ -31,8 +30,7 @@ let
       '';
 
       meta = with stdenv.lib; {
-        inherit (src.meta) homepage;
-        inherit (lilypond.meta) platforms;
+        inherit (lilypond.meta) homepage platforms;
         description = "${fontName} font for LilyPond";
         license = licenses.ofl;
         maintainers = with maintainers; [ yurrriq ];

From c106a4f926890deaa1709bec6f0866866a93e869 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Mar 2020 16:04:16 +0000
Subject: [PATCH 2932/4636] cargo-udeps: 0.1.7 -> 0.1.9

---
 pkgs/development/tools/rust/cargo-udeps/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix
index d37b578ced9c..d78274543d10 100644
--- a/pkgs/development/tools/rust/cargo-udeps/default.nix
+++ b/pkgs/development/tools/rust/cargo-udeps/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-udeps";
-  version = "0.1.7";
+  version = "0.1.9";
 
   src = fetchFromGitHub {
     owner = "est31";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1wh8w5p9rb9cqgpmclaywfsz3ckfi9mw38hhg31w7hkgjmqalyj9";
+    sha256 = "0rs8qsnv7j6car3h2dq9hc6bd13bcs31gm3haikyd16ciywldrps";
   };
 
-  cargoSha256 = "0g56rvan0p57hkl00warx4ig7a54g0qw6p2gkwn9yxi6p3p2wddj";
+  cargoSha256 = "181vvng5lm8rch2zs6lbxbrqr814dzaqb58k80znmz2bn8bnvq1l";
 
   nativeBuildInputs = [ pkgconfig ];
 

From 423a8b9b4a6e9e1deec219506740f89b3cf81343 Mon Sep 17 00:00:00 2001
From: taku0 <taku0@users.noreply.github.com>
Date: Sat, 14 Mar 2020 03:43:52 +0900
Subject: [PATCH 2933/4636] flashplayer: 32.0.0.330 -> 32.0.0.344 (#82322)

---
 .../networking/browsers/chromium/plugins.nix           |  4 ++--
 .../browsers/mozilla-plugins/flashplayer/default.nix   | 10 +++++-----
 .../mozilla-plugins/flashplayer/standalone.nix         |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index e600d134e9c0..434bd77b6d18 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -45,11 +45,11 @@ let
 
   flash = stdenv.mkDerivation rec {
     pname = "flashplayer-ppapi";
-    version = "32.0.0.330";
+    version = "32.0.0.344";
 
     src = fetchzip {
       url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 = "08gpx0fq0r1sz5smfdgv4fkfwq1hdijv4dw432d6jdz8lq09y1nk";
+      sha256 = "05ijlgsby9zxx0qs6f3vav1z0p6xr1cg6idl4akxvfmsl6hn6hkq";
       stripRoot = false;
     };
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 3d711f92d1c9..46a759cf27af 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -74,7 +74,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "flashplayer";
-  version = "32.0.0.330";
+  version = "32.0.0.344";
 
   src = fetchurl {
     url =
@@ -85,14 +85,14 @@ stdenv.mkDerivation rec {
     sha256 =
       if debug then
         if arch == "x86_64" then
-          "1k7h1p6g1vf96v31j1n8638jdxacap0729n0dnmh6l0h5q518k1b"
+          "1kkwijxlcs1rlqxr1vj51h95fwwrp5m0c9lngqpncgmmhh8v9dyr"
         else
-          "0gabgllx79s6rhv0zivfj6z79rcsdrzrdm94xdr19c11dsbqxd6b"
+          "0r47s19fw7gsph73rd5jb2zfsjwz7mjawm6c49rir9rsa0zxrsks"
       else
         if arch == "x86_64" then
-          "1pf3k1x8c2kbkc9pf9y5n4jilp3g41v8v0q5ng77sbnl92s35zsj"
+          "1ki3i7zw0q48xf01xjfm1mpizc5flk768p9hqxpg881r4h65dh6b"
         else
-          "1xibm6ffm09c553g100cgb6grnk21dfq8m81yy0jskph157vg962";
+          "1v527i60sljwyvv4l1kg9ml05skjgm3naynlswd35hsz258jnxl4";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index b003a1b3f5c0..5274d30e68aa 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -50,7 +50,7 @@
 
 stdenv.mkDerivation {
   pname = "flashplayer-standalone";
-  version = "32.0.0.330";
+  version = "32.0.0.344";
 
   src = fetchurl {
     url =
@@ -60,9 +60,9 @@ stdenv.mkDerivation {
         "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
     sha256 =
       if debug then
-        "0wrkg2in4c0bnbifm06m4rdggzs8zbaxwrh6z3mpbf4p3bl6xg84"
+        "1ymsk07xmnanyv86r58ar1l4wgjarlq0fc111ajc76pp8dsxnfx8"
       else
-        "08qxa3zanlgmn8sn7crz242adx10jqymd4gzf1m0zlczw20ar09c";
+        "0wiwpn4a0jxslw4ahalq74rksn82y0aqa3lrjr9qs7kdcak74vky";
   };
 
   nativeBuildInputs = [ unzip ];

From beeb24f1e939be7d85fdd64e31f13b8fe8238150 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 11 Mar 2020 22:40:22 +0100
Subject: [PATCH 2934/4636] LTS Haskell 15.3

---
 .../configuration-hackage2nix.yaml            | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 5c66ad9a3909..b712f3aaf1c6 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -76,7 +76,7 @@ default-package-overrides:
   # gi-gdkx11-4.x requires gtk-4.x, which is still under development and
   # not yet available in Nixpkgs
   - gi-gdkx11 < 4
-  # LTS Haskell 15.2
+  # LTS Haskell 15.3
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Angle ==1.0
@@ -361,7 +361,7 @@ default-package-overrides:
   - bytes ==0.17
   - byteset ==0.1.1.0
   - byteslice ==0.2.2.0
-  - bytesmith ==0.3.5.0
+  - bytesmith ==0.3.6.0
   - bytestring-builder ==0.10.8.2.0
   - bytestring-conversion ==0.3.1
   - bytestring-lexing ==0.5.0.2
@@ -407,7 +407,7 @@ default-package-overrides:
   - Chart-diagrams ==1.9.3
   - chaselev-deque ==0.5.0.5
   - ChasingBottoms ==1.3.1.7
-  - checkers ==0.5.2
+  - checkers ==0.5.4
   - checksum ==0.0
   - chimera ==0.3.0.0
   - choice ==0.2.2
@@ -444,7 +444,7 @@ default-package-overrides:
   - co-log ==0.4.0.0
   - co-log-core ==0.2.1.0
   - co-log-polysemy ==0.0.1.1
-  - Color ==0.1.3.1
+  - Color ==0.1.4
   - colorful-monoids ==0.2.1.2
   - colorize-haskell ==1.0.1
   - colour ==2.3.5
@@ -577,7 +577,7 @@ default-package-overrides:
   - data-tree-print ==0.1.0.2
   - dataurl ==0.1.0.0
   - DAV ==1.3.4
-  - dbus ==1.2.11
+  - dbus ==1.2.12
   - debian-build ==0.10.2.0
   - debug-trace-var ==0.2.0
   - dec ==0.0.3
@@ -707,7 +707,7 @@ default-package-overrides:
   - extended-reals ==0.2.3.0
   - extensible-effects ==5.0.0.1
   - extensible-exceptions ==0.1.1.4
-  - extra ==1.6.20
+  - extra ==1.6.21
   - extractable-singleton ==0.0.1
   - extrapolate ==0.4.1
   - fail ==4.9.0.0
@@ -785,12 +785,12 @@ default-package-overrides:
   - funcmp ==1.9
   - function-builder ==0.3.0.1
   - functor-classes-compat ==1
-  - fused-effects ==1.0.0.1
+  - fused-effects ==1.0.2.0
   - fusion-plugin ==0.1.1
   - fusion-plugin-types ==0.1.0
   - fuzzcheck ==0.1.1
   - fuzzy ==0.1.0.0
-  - fuzzy-dates ==0.1.1.1
+  - fuzzy-dates ==0.1.1.2
   - fuzzyset ==0.2.0
   - fuzzy-time ==0.1.0.0
   - gauge ==0.2.5
@@ -868,9 +868,9 @@ default-package-overrides:
   - gi-pango ==1.0.22
   - giphy-api ==0.7.0.0
   - githash ==0.1.3.3
-  - github-rest ==1.0.1
+  - github-rest ==1.0.2
   - github-types ==0.2.1
-  - gitlab-haskell ==0.1.5
+  - gitlab-haskell ==0.1.7
   - gitrev ==1.3.1
   - gi-xlib ==2.0.8
   - gl ==0.9
@@ -1059,8 +1059,8 @@ default-package-overrides:
   - hunit-dejafu ==2.0.0.1
   - hvect ==0.4.0.0
   - hvega ==0.5.0.0
-  - hw-balancedparens ==0.3.0.4
-  - hw-bits ==0.7.1.0
+  - hw-balancedparens ==0.3.0.5
+  - hw-bits ==0.7.1.2
   - hw-conduit ==0.2.0.6
   - hw-conduit-merges ==0.2.0.0
   - hw-diagnostics ==0.0.0.7
@@ -1287,7 +1287,7 @@ default-package-overrides:
   - markdown-unlit ==0.5.0
   - markov-chain ==0.0.3.4
   - massiv ==0.4.5.0
-  - massiv-io ==0.2.0.0
+  - massiv-io ==0.2.1.0
   - massiv-test ==0.1.2
   - mathexpr ==0.3.0.0
   - math-functions ==0.3.3.0
@@ -1331,9 +1331,9 @@ default-package-overrides:
   - mime-types ==0.1.0.9
   - mini-egison ==0.1.6
   - minimal-configuration ==0.1.4
-  - minimorph ==0.2.1.0
+  - minimorph ==0.2.2.0
   - minio-hs ==1.5.2
-  - miniutter ==0.5.0.0
+  - miniutter ==0.5.1.0
   - mintty ==0.1.2
   - miso ==1.4.0.0
   - missing-foreign ==0.1.1
@@ -1356,7 +1356,7 @@ default-package-overrides:
   - monad-extras ==0.6.0
   - monadic-arrays ==0.2.2
   - monad-journal ==0.8.1
-  - monad-logger ==0.3.31
+  - monad-logger ==0.3.32
   - monad-logger-json ==0.1.0.0
   - monad-logger-prefix ==0.1.11
   - monad-loops ==0.4.3
@@ -1551,7 +1551,7 @@ default-package-overrides:
   - persistent-sqlite ==2.10.6.2
   - persistent-template ==2.8.2.3
   - persistent-test ==2.0.3.1
-  - persistent-typed-db ==0.1.0.0
+  - persistent-typed-db ==0.1.0.1
   - pg-harness-client ==0.6.0
   - pgp-wordlist ==0.1.0.3
   - pg-transact ==0.3.1.1
@@ -1739,7 +1739,7 @@ default-package-overrides:
   - rerebase ==1.4.1
   - resolv ==0.1.1.3
   - resource-pool ==0.2.3.2
-  - resourcet ==1.2.2
+  - resourcet ==1.2.3
   - result ==0.2.6.0
   - rethinkdb-client-driver ==0.0.25
   - retry ==0.8.1.0
@@ -1747,7 +1747,7 @@ default-package-overrides:
   - rfc1751 ==0.1.2
   - rfc5051 ==0.1.0.4
   - rigel-viz ==0.2.0.0
-  - rio ==0.1.14.0
+  - rio ==0.1.14.1
   - rio-orphans ==0.1.1.0
   - rio-prettyprint ==0.1.0.0
   - roc-id ==0.1.0.0
@@ -1792,7 +1792,7 @@ default-package-overrides:
   - sdl2-gfx ==0.2
   - sdl2-image ==2.0.0
   - sdl2-mixer ==1.1.0
-  - sdl2-ttf ==2.1.0
+  - sdl2-ttf ==2.1.1
   - search-algorithms ==0.3.1
   - secp256k1-haskell ==0.1.8
   - securemem ==0.1.10
@@ -2178,7 +2178,7 @@ default-package-overrides:
   - unix-bytestring ==0.3.7.3
   - unix-compat ==0.5.2
   - unix-time ==0.4.7
-  - unliftio ==0.2.12
+  - unliftio ==0.2.12.1
   - unliftio-core ==0.1.2.0
   - unliftio-pool ==0.2.1.0
   - unlit ==0.4.0.0
@@ -2239,7 +2239,7 @@ default-package-overrides:
   - wai-app-static ==3.1.7.1
   - wai-conduit ==3.0.0.4
   - wai-cors ==0.2.7
-  - wai-enforce-https ==0.0.1
+  - wai-enforce-https ==0.0.2
   - wai-eventsource ==3.0.0
   - wai-extra ==3.0.29.1
   - wai-handler-launch ==3.0.3.1
@@ -2324,7 +2324,7 @@ default-package-overrides:
   - yesod-auth ==1.6.9
   - yesod-auth-hashdb ==1.7.1.2
   - yesod-bin ==1.6.0.4
-  - yesod-core ==1.6.17.2
+  - yesod-core ==1.6.17.3
   - yesod-form ==1.6.7
   - yesod-gitrev ==0.2.1
   - yesod-newsfeed ==1.7.0.0
@@ -2344,7 +2344,7 @@ default-package-overrides:
   - zeromq4-haskell ==0.8.0
   - zeromq4-patterns ==0.3.1.0
   - zim-parser ==0.2.1.0
-  - zip ==1.3.1
+  - zip ==1.3.2
   - zip-archive ==0.4.1
   - zippers ==0.3
   - zip-stream ==0.2.0.1

From 513fa25b1760b2773b92eb98faca83e7118eb7ea Mon Sep 17 00:00:00 2001
From: timds <timds_pub@icloud.com>
Date: Sat, 7 Mar 2020 15:35:21 +0100
Subject: [PATCH 2935/4636] zxcvbn-hs: unmark as broken

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index b712f3aaf1c6..ecea6586e7df 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -10963,4 +10963,3 @@ broken-packages:
   - zuramaru
   - Zwaluw
   - zxcvbn-dvorak
-  - zxcvbn-hs

From c2dcdea8c68631fc15ec837d0df7def2b66d0676 Mon Sep 17 00:00:00 2001
From: timds <timds_pub@icloud.com>
Date: Sat, 7 Mar 2020 15:38:11 +0100
Subject: [PATCH 2936/4636] zxcvbn-dvorak: unmark as broken

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index ecea6586e7df..c5f23ed60c7e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -10962,4 +10962,3 @@ broken-packages:
   - ztar
   - zuramaru
   - Zwaluw
-  - zxcvbn-dvorak

From 2645e1a1eb41742905394db9d7679a1bb3343eeb Mon Sep 17 00:00:00 2001
From: Georges Dubus <georges.dubus@gmail.com>
Date: Wed, 26 Feb 2020 15:26:14 +0100
Subject: [PATCH 2937/4636] cabal2nix: split into a lightweight version and a
 wrapper

Current, the `cabal2nix` derivation contains both the executable, and a wrapper
that adds `nix` and `nix-prefetch-scripts`, which are required for some
features.

However, when calling `callCabal2nix` to create a derivation from a cabal file
at evaluation time,
these features are not actually used, but the huge closure of
`nix-prefetch-scripts` (which includes multiple vcs, as well as python and perl)
still needs to be fetched.

This commit splits cabal2nix into a lightweight version that is a standalone
static binary (`cabal2nix-unwrapped`), and a wrapper that includes the proper
dependencies in the path for full usage of the command line
utility (`cabal2nix`).

This commit also switches to the default ghc, to reduce the likelyhood of
building a different ghc when calling `callCabal2nix`.
---
 .../haskell-modules/make-package-set.nix      |  2 +-
 pkgs/top-level/all-packages.nix               | 24 +++++++++----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 17fb1ab8ae85..1418cfef0574 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -124,7 +124,7 @@ let
       sha256Arg = if sha256 == null then "--sha256=" else ''--sha256="${sha256}"'';
     in buildPackages.stdenv.mkDerivation {
       name = "cabal2nix-${name}";
-      nativeBuildInputs = [ buildPackages.cabal2nix ];
+      nativeBuildInputs = [ buildPackages.cabal2nix-unwrapped ];
       preferLocalBuild = true;
       allowSubstitutes = false;
       phases = ["installPhase"];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bcf0a5871a42..16ace1102cc4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1342,19 +1342,17 @@ in
 
   cue2pops = callPackage ../tools/cd-dvd/cue2pops { };
 
-  cabal2nix = haskell.lib.overrideCabal (haskell.lib.generateOptparseApplicativeCompletion "cabal2nix" haskell.packages.ghc881.cabal2nix) (drv: {
-    isLibrary = false;
-    enableSharedExecutables = false;
-    executableToolDepends = (drv.executableToolDepends or []) ++ [ makeWrapper ];
-    postInstall = ''
-      exe=$out/libexec/${drv.pname}-${drv.version}/${drv.pname}
-      install -D $out/bin/${drv.pname} $exe
-      rm -rf $out/{bin,lib,share}
-      makeWrapper $exe $out/bin/${drv.pname} \
-        --prefix PATH ":" "${nix}/bin" \
-        --prefix PATH ":" "${nix-prefetch-scripts}/bin"
-    '' + (drv.postInstall or "");
-  });
+  cabal2nix-unwrapped = haskell.lib.justStaticExecutables (haskell.lib.generateOptparseApplicativeCompletion "cabal2nix" haskellPackages.cabal2nix);
+
+  cabal2nix = symlinkJoin {
+    inherit (cabal2nix-unwrapped) name meta;
+    nativeBuildInputs = [ makeWrapper ];
+    paths = [ cabal2nix-unwrapped ];
+    postBuild = ''
+      wrapProgram $out/bin/cabal2nix \
+        --prefix PATH ":" "${lib.makeBinPath [ nix nix-prefetch-scripts ]}"
+    '';
+  };
 
   stack2nix = with haskell.lib; overrideCabal (justStaticExecutables haskellPackages.stack2nix) (drv: {
     executableToolDepends = [ makeWrapper ];

From 14f213a0078815e83795eb1cc4a400853762ee24 Mon Sep 17 00:00:00 2001
From: Greg Hale <imalsogreg@gmail.com>
Date: Sat, 7 Mar 2020 22:40:29 -0500
Subject: [PATCH 2938/4636] Remove snap from broken packages list

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index c5f23ed60c7e..73bc8a2f54fd 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -9377,7 +9377,6 @@ broken-packages:
   - smuggler
   - snake
   - snake-game
-  - snap
   - snap-accept
   - snap-auth-cli
   - snap-blaze-clay

From 720d0c7803a488c55351d0030cc9563ed42b5704 Mon Sep 17 00:00:00 2001
From: timds <timds_pub@icloud.com>
Date: Sun, 8 Mar 2020 11:00:44 +0100
Subject: [PATCH 2939/4636] saltine: fix build by disabling tests

The tests fail to compile because of a missing module but would
otherwise be fine.
---
 pkgs/development/haskell-modules/configuration-common.nix       | 1 +
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3f28ebebd224..1fec29f20379 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -376,6 +376,7 @@ self: super: {
   Rlang-QQ = dontCheck super.Rlang-QQ;
   safecopy = dontCheck super.safecopy;
   sai-shape-syb = dontCheck super.sai-shape-syb;
+  saltine = dontCheck super.saltine; # https://github.com/tel/saltine/pull/56
   scp-streams = dontCheck super.scp-streams;
   sdl2 = dontCheck super.sdl2; # the test suite needs an x server
   sdl2-ttf = dontCheck super.sdl2-ttf; # as of version 0.2.1, the test suite requires user intervention
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 73bc8a2f54fd..d16555a168b0 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -8979,7 +8979,6 @@ broken-packages:
   - sajson
   - salak-toml
   - Salsa
-  - saltine
   - saltine-quickcheck
   - salvia
   - salvia-demo

From 7335de2dab15fe895d3f66c3fd50bfcbe9ee0c8f Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Tue, 3 Mar 2020 21:37:56 -0500
Subject: [PATCH 2940/4636] persistent-mysql: fix build

tests need a running mysql instance, so disable them
---
 pkgs/development/haskell-modules/configuration-common.nix       | 2 ++
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 pkgs/development/haskell-modules/hackage-packages.nix           | 2 --
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1fec29f20379..f113f5204453 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1468,4 +1468,6 @@ self: super: {
   # haskell-ci-0.8 needs cabal-install-parsers ==0.1, but we have 0.2.
   haskell-ci = doJailbreak super.haskell-ci;
 
+  persistent-mysql = dontCheck super.persistent-mysql;
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index d16555a168b0..d38bc1864404 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -8156,7 +8156,6 @@ broken-packages:
   - persistent-map
   - persistent-migration
   - persistent-mongoDB
-  - persistent-mysql
   - persistent-mysql-haskell
   - persistent-protobuf
   - persistent-ratelimit
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d2d3c3436821..8f98455bceae 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -185286,8 +185286,6 @@ self: {
        ];
        description = "Backend for the persistent library using MySQL database server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "persistent-mysql-haskell" = callPackage

From d0eb52f5cd5cfc069d5badea95171a64db08cd16 Mon Sep 17 00:00:00 2001
From: Poscat <poscat@mail.poscat.moe>
Date: Tue, 10 Mar 2020 09:55:21 +0800
Subject: [PATCH 2941/4636] ats-pkg: Unbreak by disabling tests

---
 pkgs/development/haskell-modules/configuration-common.nix       | 2 +-
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f113f5204453..0077d0e56d8c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1220,7 +1220,7 @@ self: super: {
   temporary-resourcet = doJailbreak super.temporary-resourcet;
 
   # Requires dhall >= 1.23.0
-  ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_29_0; };
+  ats-pkg = dontCheck (super.ats-pkg.override { dhall = self.dhall_1_29_0; });
 
   # Test suite doesn't work with current QuickCheck
   # https://github.com/pruvisto/heap/issues/11
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index d38bc1864404..6cd11524ac9e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2921,7 +2921,6 @@ broken-packages:
   - atomo
   - atp-haskell
   - ats-format
-  - ats-pkg
   - ats-setup
   - ats-storable
   - attempt

From ef65c6382d59e4de825eb9bcca5911e23c312ede Mon Sep 17 00:00:00 2001
From: Poscat <poscat@mail.poscat.moe>
Date: Tue, 10 Mar 2020 22:42:05 +0800
Subject: [PATCH 2942/4636] Unbreak ats-format

---
 pkgs/development/haskell-modules/configuration-common.nix   | 6 ++++++
 .../haskell-modules/configuration-hackage2nix.yaml          | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0077d0e56d8c..16ae6e040de5 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1222,6 +1222,12 @@ self: super: {
   # Requires dhall >= 1.23.0
   ats-pkg = dontCheck (super.ats-pkg.override { dhall = self.dhall_1_29_0; });
 
+  # fake a home dir and capture generated man page
+  ats-format = overrideCabal super.ats-format (old : {
+    preConfigure = "export HOME=$PWD";
+    postBuild = "mv .local/share $out";
+  });
+
   # Test suite doesn't work with current QuickCheck
   # https://github.com/pruvisto/heap/issues/11
   heap = dontCheck super.heap;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 6cd11524ac9e..0b585f824e4a 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2920,7 +2920,6 @@ broken-packages:
   - atomic-primops-vector
   - atomo
   - atp-haskell
-  - ats-format
   - ats-setup
   - ats-storable
   - attempt

From 838c7a80f7d7cfadfcbe01f55220f7ab26e0ecb1 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Wed, 11 Mar 2020 16:04:09 -0700
Subject: [PATCH 2943/4636] haskellPackages.EdisonCore: Unbreak

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 .../haskell-modules/configuration-common.nix  | 20 +++++++++++++++++++
 .../configuration-hackage2nix.yaml            |  2 --
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 16ae6e040de5..a89a704f99d5 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1476,4 +1476,24 @@ self: super: {
 
   persistent-mysql = dontCheck super.persistent-mysql;
 
+  # Fix EdisonAPI and EdisonCore for GHC 8.8:
+  # https://github.com/robdockins/edison/pull/16
+  EdisonAPI = appendPatch super.EdisonAPI (pkgs.fetchpatch {
+    url = "https://github.com/robdockins/edison/pull/16/commits/8da6c0f7d8666766e2f0693425c347c0adb492dc.patch";
+    postFetch = ''
+      ${pkgs.patchutils}/bin/filterdiff --include='a/edison-api/*' --strip=1 "$out" > "$tmpfile"
+      mv "$tmpfile" "$out"
+    '';
+    sha256 = "0yi5pz039lcm4pl9xnl6krqxyqq5rgb5b6m09w0sfy06x0n4x213";
+  });
+
+  EdisonCore = appendPatch super.EdisonCore (pkgs.fetchpatch {
+    url = "https://github.com/robdockins/edison/pull/16/commits/8da6c0f7d8666766e2f0693425c347c0adb492dc.patch";
+    postFetch = ''
+      ${pkgs.patchutils}/bin/filterdiff --include='a/edison-core/*' --strip=1 "$out" > "$tmpfile"
+      mv "$tmpfile" "$out"
+    '';
+    sha256 = "097wqn8hxsr50b9mhndg5pjim5jma2ym4ylpibakmmb5m98n17zp";
+  });
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 0b585f824e4a..7a0f798c8f0e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -4381,8 +4381,6 @@ broken-packages:
   - edentv
   - edge
   - edges
-  - EdisonAPI
-  - EdisonCore
   - edit
   - edit-lenses
   - editable

From 9bcd5eaa0d0d78fc8e2dd6e5c67c285956004c70 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Mar 2020 13:07:10 +0100
Subject: [PATCH 2944/4636] haskellPackages: update default compiler from GHC
 version 8.8.2 to 8.8.3

---
 .../configuration-hackage2nix.yaml             | 18 +++++++++---------
 pkgs/top-level/all-packages.nix                |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 7a0f798c8f0e..b734df2b5744 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -1,6 +1,6 @@
 # pkgs/development/haskell-modules/configuration-hackage2nix.yaml
 
-compiler: ghc-8.8.2
+compiler: ghc-8.8.3
 
 core-packages:
   - array-0.5.4.0
@@ -10,23 +10,23 @@ core-packages:
   - Cabal-3.0.1.0
   - containers-0.6.2.1
   - deepseq-1.4.4.0
-  - directory-1.3.4.0
+  - directory-1.3.6.0
   - filepath-1.4.2.1
-  - ghc-8.8.2
-  - ghc-boot-8.8.2
-  - ghc-boot-th-8.8.2
+  - ghc-8.8.3
+  - ghc-boot-8.8.3
+  - ghc-boot-th-8.8.3
   - ghc-compact-0.1.0.0
-  - ghc-heap-8.8.2
+  - ghc-heap-8.8.3
   - ghc-prim-0.5.3
-  - ghci-8.8.2
+  - ghci-8.8.3
   - haskeline-0.7.5.0
   - hpc-0.6.0.3
   - integer-gmp-1.0.2.0
-  - libiserv-8.8.2
+  - libiserv-8.8.3
   - mtl-2.2.2
   - parsec-3.1.14.0
   - pretty-1.1.3.6
-  - process-1.6.7.0
+  - process-1.6.8.0
   - rts-1.0
   - stm-2.5.0.0
   - template-haskell-2.15.0.0
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16ace1102cc4..57830fcea6f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8308,7 +8308,7 @@ in
 
   # Please update doc/languages-frameworks/haskell.section.md, “Our
   # current default compiler is”, if you bump this:
-  haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc882;
+  haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc883;
 
   inherit (haskellPackages) ghc;
 

From 68dba0d96b80d2033dfa4d25e1989ae9e6f57a5d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Mar 2020 20:13:15 +0100
Subject: [PATCH 2945/4636] hackage2nix: update list of broken packages to fix
 evaluation

---
 .../haskell-modules/configuration-hackage2nix.yaml            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index b734df2b5744..3c6845705336 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2847,6 +2847,7 @@ broken-packages:
   - arbor-monad-metric
   - arbor-monad-metric-datadog
   - arbtt
+  - archive-tar-bytestring
   - archiver
   - archlinux
   - archlinux-web
@@ -3177,6 +3178,8 @@ broken-packages:
   - bitcoin-rpc
   - bitcoin-script
   - bitcoin-tx
+  - bitcoind-regtest
+  - bitcoind-rpc
   - Bitly
   - bitly-cli
   - bitmaps
@@ -3425,6 +3428,7 @@ broken-packages:
   - carte
   - cartel
   - Cartesian
+  - cas-store
   - casa-abbreviations-and-acronyms
   - casadi-bindings
   - casadi-bindings-control

From eb8d57786b779a910b72b47abf569876a4cb973e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 7 Mar 2020 02:31:16 +0100
Subject: [PATCH 2946/4636] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.0-21-ga388e13 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/a1555380bac8dee0f6bf17758db5503186df370b.
---
 .../haskell-modules/hackage-packages.nix      | 1777 +++++++++++------
 1 file changed, 1142 insertions(+), 635 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 8f98455bceae..2caf04f479a1 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3291,26 +3291,6 @@ self: {
      }) {inherit (pkgs) libdevil;};
 
   "Color" = callPackage
-    ({ mkDerivation, base, Cabal, cabal-doctest, colour, criterion
-     , data-default-class, deepseq, doctest, hspec, HUnit, JuicyPixels
-     , massiv, massiv-test, QuickCheck, random, template-haskell, vector
-     }:
-     mkDerivation {
-       pname = "Color";
-       version = "0.1.3.1";
-       sha256 = "0a4ljaqb1a8v622v99n37abas7xhzlmykbz5lm1q9xjs596qx357";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [ base data-default-class deepseq vector ];
-       testHaskellDepends = [
-         base colour doctest hspec HUnit JuicyPixels massiv massiv-test
-         QuickCheck random template-haskell vector
-       ];
-       benchmarkHaskellDepends = [ base colour criterion deepseq random ];
-       description = "Color spaces and conversions between them";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Color_0_1_4" = callPackage
     ({ mkDerivation, base, Cabal, cabal-doctest, colour, criterion
      , data-default-class, deepseq, doctest, hspec, HUnit, JuicyPixels
      , massiv, massiv-test, QuickCheck, random, template-haskell, vector
@@ -3328,7 +3308,6 @@ self: {
        benchmarkHaskellDepends = [ base colour criterion deepseq random ];
        description = "Color spaces and conversions between them";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Combinatorrent" = callPackage
@@ -5118,8 +5097,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A library of efficient, purely-functional data structures (API)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "EdisonCore" = callPackage
@@ -5135,8 +5112,6 @@ self: {
        ];
        description = "A library of efficient, purely-functional data structures (Core Implementations)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "EditTimeReport" = callPackage
@@ -8891,8 +8866,8 @@ self: {
     ({ mkDerivation, base, bcm2835, bytestring }:
      mkDerivation {
        pname = "HPi";
-       version = "0.6.0";
-       sha256 = "1b0m6srghxbd3cjwffkajf1dnsw8nsgqyi4wiy7wsdsadqnv25z9";
+       version = "0.7.0";
+       sha256 = "094wdlnby4iqp5zvd3iimp3whn386w5h6x04izz5xxf43bzzbl2a";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ bcm2835 ];
        description = "GPIO, I2C and SPI functions for the Raspberry Pi";
@@ -18442,6 +18417,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Spintax_0_3_4" = callPackage
+    ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }:
+     mkDerivation {
+       pname = "Spintax";
+       version = "0.3.4";
+       sha256 = "008b83nnjgpzjr4c2dk1vambzb78dwx59c5cq4p0s8ghp6xl9sk3";
+       libraryHaskellDepends = [
+         attoparsec base extra mtl mwc-random text
+       ];
+       description = "Random text generation based on spintax";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Spock" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, containers
      , cryptonite, focus, hashable, hspec, hspec-wai, http-types, hvect
@@ -23553,8 +23542,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-combinators";
-       version = "0.0.1.1";
-       sha256 = "0dcdmmpsjs7lkyznyvazxy977niysb58pwjidc2pkv26xdrkm2nk";
+       version = "0.0.2.1";
+       sha256 = "1a087940jpbnc2rc7cs4xj6kq1wv7b5ibhaimj7f6jglrn9xjgf0";
        libraryHaskellDepends = [
          aeson base bytestring containers fail scientific text time
          time-compat unordered-containers uuid-types vector void
@@ -24120,8 +24109,8 @@ self: {
        pname = "aeson-schemas";
        version = "1.0.3";
        sha256 = "0fmhqibw6mw9shxh94riqq465njbgjsv539xb6sx7qpkhcck2csi";
-       revision = "2";
-       editedCabalFile = "0dydrwj8d7337c0qdxc7cxg8y2hb89ksli9692rvx7zfan41cpq7";
+       revision = "3";
+       editedCabalFile = "01vp89mjl7jl80mdl9hqmiz3vs7fjl5mf1p64d3g352xqak3mr7d";
        libraryHaskellDepends = [
          aeson base bytestring first-class-families megaparsec
          template-haskell text unordered-containers
@@ -24283,8 +24272,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-value-parser";
-       version = "0.17";
-       sha256 = "0xsvlwsql73g9lmd6izmgqfv8fvbbssmizkryaaphazym443hiw5";
+       version = "0.18";
+       sha256 = "1n288jb8ksjb6psgal4q6p7ad13sdak3llk54nc0gg5w2r20x634";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring hashable mtl scientific text
          transformers unordered-containers vector
@@ -31122,6 +31111,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "archive-tar-bytestring" = callPackage
+    ({ mkDerivation, base, bytestring, composition-prelude, cpphs
+     , tar-bytestring, text, unix
+     }:
+     mkDerivation {
+       pname = "archive-tar-bytestring";
+       version = "0.1.0.0";
+       sha256 = "0s1x4krnjdf1gq0f1krqdhxjkz4yanl5ayr0mdg6bcprlpzf3ib9";
+       libraryHaskellDepends = [
+         base bytestring composition-prelude tar-bytestring text unix
+       ];
+       libraryToolDepends = [ cpphs ];
+       description = "Common interface using the tar-bytestring package";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "archiver" = callPackage
     ({ mkDerivation, base, bytestring, containers, curl, HTTP, network
      , process, random
@@ -31484,8 +31491,8 @@ self: {
      }:
      mkDerivation {
        pname = "arithmetic";
-       version = "1.5";
-       sha256 = "0angjp341sfij8lqns74k6pwazdc679bd19fxphqab91cj9p9s56";
+       version = "1.6";
+       sha256 = "1k448bgs99i5lg87jvbfy63p4h1n2g6ldb4a0vig5ym7q5yhjkdc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -33374,8 +33381,6 @@ self: {
        ];
        description = "A source-code formatter for ATS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ats-pkg" = callPackage
@@ -33410,8 +33415,6 @@ self: {
        doHaddock = false;
        description = "A build tool for ATS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ats-setup" = callPackage
@@ -40700,6 +40703,49 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "bitcoind-regtest" = callPackage
+    ({ mkDerivation, base, bitcoind-rpc, cereal, containers
+     , haskoin-core, http-client, process, servant, servant-client
+     , tasty, tasty-hunit, temporary, text
+     }:
+     mkDerivation {
+       pname = "bitcoind-regtest";
+       version = "0.1.0.0";
+       sha256 = "078834ndl253d1s6f68a8cq1dc0hq3r3ic4a90wbr4msw9zn626q";
+       libraryHaskellDepends = [
+         base bitcoind-rpc cereal containers haskoin-core http-client
+         process servant servant-client temporary text
+       ];
+       testHaskellDepends = [
+         base bitcoind-rpc cereal haskoin-core http-client process servant
+         servant-client tasty tasty-hunit temporary text
+       ];
+       description = "A library for working with bitcoin-core regtest networks";
+       license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
+  "bitcoind-rpc" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cereal, haskoin-core
+     , http-client, scientific, servant, servant-client
+     , servant-jsonrpc-client, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "bitcoind-rpc";
+       version = "0.1.0.0";
+       sha256 = "1a3p49lzzsqd9m7ivisxksb6c7yc0dg5rps6ym85s4aasr1ln1j8";
+       libraryHaskellDepends = [
+         aeson base bytestring cereal haskoin-core http-client scientific
+         servant servant-client servant-jsonrpc-client text time
+         transformers
+       ];
+       description = "A streamlined interface to bitcoin core using Haskoin types and Servant";
+       license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "bitly-cli" = callPackage
     ({ mkDerivation, base, Bitly, directory, filepath, regexpr }:
      mkDerivation {
@@ -44980,6 +45026,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bytelog" = callPackage
+    ({ mkDerivation, base, bytebuild, byteslice, natural-arithmetic
+     , posix-api, primitive
+     }:
+     mkDerivation {
+       pname = "bytelog";
+       version = "0.1.0.0";
+       sha256 = "03acvb13q3bs77qyxsf91b9l2wv6f23lrghqnh2dacsdrg75dpfa";
+       libraryHaskellDepends = [
+         base bytebuild byteslice natural-arithmetic posix-api primitive
+       ];
+       description = "Fast logging";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "byteorder" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -45047,30 +45108,6 @@ self: {
      }) {};
 
   "bytesmith" = callPackage
-    ({ mkDerivation, base, byte-order, byteslice, bytestring
-     , contiguous, gauge, primitive, run-st, tasty, tasty-hunit
-     , tasty-quickcheck, text-short, wide-word
-     }:
-     mkDerivation {
-       pname = "bytesmith";
-       version = "0.3.5.0";
-       sha256 = "1axjb1p819cfpwrmilc8qakw7acipx47hdrilwj6ib0nn5agya8f";
-       libraryHaskellDepends = [
-         base byteslice bytestring contiguous primitive run-st text-short
-         wide-word
-       ];
-       testHaskellDepends = [
-         base byte-order byteslice primitive tasty tasty-hunit
-         tasty-quickcheck text-short wide-word
-       ];
-       benchmarkHaskellDepends = [
-         base byteslice bytestring gauge primitive
-       ];
-       description = "Nonresumable byte parser";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bytesmith_0_3_6_0" = callPackage
     ({ mkDerivation, base, byte-order, byteslice, bytestring
      , contiguous, gauge, primitive, run-st, tasty, tasty-hunit
      , tasty-quickcheck, text-short, wide-word
@@ -45092,7 +45129,6 @@ self: {
        ];
        description = "Nonresumable byte parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring_0_10_10_0" = callPackage
@@ -47280,8 +47316,8 @@ self: {
      }:
      mkDerivation {
        pname = "cachix";
-       version = "0.3.6";
-       sha256 = "14iz8ihzrcq075zk6cz8dmp2c9ygsfvi0ksa0969k8746hgwwxf9";
+       version = "0.3.7";
+       sha256 = "14rz8rncvnv8x9idfg69acck38bygnbnccdn7ghhz4ailiamf50b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -48407,6 +48443,68 @@ self: {
        broken = true;
      }) {};
 
+  "cas-hashable" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, clock, containers
+     , cryptonite, ghc-prim, hashable, integer-gmp, memory, path
+     , path-io, safe-exceptions, scientific, text, time, unix
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "cas-hashable";
+       version = "1.0.1";
+       sha256 = "13r3iiv882mq692yy24gy3kdfgg3lrk51909na5yx2hjlj47nyxd";
+       libraryHaskellDepends = [
+         aeson base bytestring clock containers cryptonite ghc-prim hashable
+         integer-gmp memory path path-io safe-exceptions scientific text
+         time unix unordered-containers vector
+       ];
+       description = "A hashing class for content-addressed storage";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "cas-hashable-s3" = callPackage
+    ({ mkDerivation, aeson, aws, base, cas-hashable, constraints
+     , http-conduit, reflection, resourcet
+     }:
+     mkDerivation {
+       pname = "cas-hashable-s3";
+       version = "1.0.0";
+       sha256 = "07sap2kx6vqhyszdnmnvamaqkfpqn3711phj0ig961n7h8p433dz";
+       libraryHaskellDepends = [
+         aeson aws base cas-hashable constraints http-conduit reflection
+         resourcet
+       ];
+       description = "ContentHashable instances for S3 objects";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "cas-store" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, cas-hashable
+     , containers, cryptonite, directory, filepath, hashable, hinotify
+     , hostname, lens, monad-control, path, path-io, random
+     , safe-exceptions, sqlite-simple, store, tar, tasty, tasty-hunit
+     , text, unix
+     }:
+     mkDerivation {
+       pname = "cas-store";
+       version = "1.0.1";
+       sha256 = "1ls0zsaf472ikpxddzr94cj7hbszlxm4jhdhl7syykypp867v2vi";
+       libraryHaskellDepends = [
+         aeson async base bytestring cas-hashable containers cryptonite
+         directory filepath hashable hinotify hostname lens monad-control
+         path path-io random safe-exceptions sqlite-simple store tar text
+         unix
+       ];
+       testHaskellDepends = [
+         async base cas-hashable containers path path-io safe-exceptions
+         tasty tasty-hunit unix
+       ];
+       description = "A content-addressed storage";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "casa-abbreviations-and-acronyms" = callPackage
     ({ mkDerivation, base, bytestring, containers, fuzzy, lens
      , monoid-subclasses, optparse-applicative, these, wreq
@@ -50194,8 +50292,8 @@ self: {
      }:
      mkDerivation {
        pname = "cgrep";
-       version = "6.6.30";
-       sha256 = "1ald0461mnd65g5czp3d8dzdvy8pmdxhzj35sghcnxi6qs18xp69";
+       version = "6.6.32";
+       sha256 = "0d1d81bkqd2wvcls5l1msli42cvcdrp0xy7i3s0yb10kfgd1y0qw";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -50755,19 +50853,6 @@ self: {
      }) {};
 
   "checkers" = callPackage
-    ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }:
-     mkDerivation {
-       pname = "checkers";
-       version = "0.5.2";
-       sha256 = "1mqfy6lrivc36kxbfr9zyp70pyq3k2xrmavkadznh999d54x11kq";
-       libraryHaskellDepends = [
-         array base QuickCheck random semigroupoids
-       ];
-       description = "Check properties on standard classes and data structures";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "checkers_0_5_4" = callPackage
     ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }:
      mkDerivation {
        pname = "checkers";
@@ -50778,7 +50863,6 @@ self: {
        ];
        description = "Check properties on standard classes and data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "checkmate" = callPackage
@@ -57222,6 +57306,18 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "concurrent-resource-map" = callPackage
+    ({ mkDerivation, base, containers, random, stm }:
+     mkDerivation {
+       pname = "concurrent-resource-map";
+       version = "0.1.0.0";
+       sha256 = "05zgjb2plrk35fiyskk07jfiydi4mlk6awbfjvhnsa3qi11pxdly";
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base random stm ];
+       description = "Concurrent resource map";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "concurrent-rpc" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -58042,12 +58138,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "conferer_0_3_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, directory
+     , hspec, text
+     }:
+     mkDerivation {
+       pname = "conferer";
+       version = "0.3.0.0";
+       sha256 = "0irbi1b5fwxcm68a8dbh6qhl2sin998qv8pazw574a3s4z38slv5";
+       libraryHaskellDepends = [
+         base bytestring containers directory text
+       ];
+       testHaskellDepends = [
+         base bytestring containers deepseq directory hspec text
+       ];
+       description = "Configuration management library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conferer-hedis" = callPackage
     ({ mkDerivation, base, conferer, hedis, hspec, text }:
      mkDerivation {
        pname = "conferer-hedis";
-       version = "0.2.0.0";
-       sha256 = "0h09lzjg8lhhql6zmr0c7mz8rlaskvkadmcl1xwj76cm1kg3hlwx";
+       version = "0.3.0.0";
+       sha256 = "1d5y15xlsmvj5vbfyp5hmx3zjrwyz58q08aq3w90ia4pi206sq1l";
        libraryHaskellDepends = [ base conferer hedis text ];
        testHaskellDepends = [ base conferer hedis hspec text ];
        description = "conferer's FromConfig instances for hedis settings";
@@ -58066,14 +58181,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "conferer-hspec_0_3_0_0" = callPackage
+    ({ mkDerivation, base, conferer, hspec, hspec-core, text }:
+     mkDerivation {
+       pname = "conferer-hspec";
+       version = "0.3.0.0";
+       sha256 = "0vgg0fadcd3xkjrjrvvwl6ybxp6sccr82rjdxswrr0x38c5q42xz";
+       libraryHaskellDepends = [ base conferer hspec-core text ];
+       testHaskellDepends = [ base conferer hspec hspec-core text ];
+       description = "conferer's FromConfig instances for hspec Config";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conferer-provider-dhall" = callPackage
     ({ mkDerivation, base, bytestring, conferer, conferer-provider-json
      , dhall, dhall-json, directory, hspec, text
      }:
      mkDerivation {
        pname = "conferer-provider-dhall";
-       version = "0.2.0.0";
-       sha256 = "0d0zwx4cqihvv09i45b6c7vhbxp9iiagqx417ikmhan9pki6ykq5";
+       version = "0.3.0.0";
+       sha256 = "0gdfc1np6p80sb2ddz2jzhqqzzw7jz0rkbhrvyd9k5bp7ivzhfk3";
        libraryHaskellDepends = [
          base bytestring conferer conferer-provider-json dhall dhall-json
          directory text
@@ -58106,14 +58234,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "conferer-provider-json_0_3_0_0" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, bytestring, conferer
+     , directory, hspec, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "conferer-provider-json";
+       version = "0.3.0.0";
+       sha256 = "0jrq1cpfhlyq9dvnf4kmx3wqjwz7x18g0hwbg4gkv12spjffpnc9";
+       libraryHaskellDepends = [
+         aeson base bytestring conferer directory text unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base bytestring conferer directory hspec text
+         unordered-containers vector
+       ];
+       description = "conferer's provider for reading json files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conferer-provider-yaml" = callPackage
     ({ mkDerivation, base, conferer, conferer-provider-json, hspec
      , yaml
      }:
      mkDerivation {
        pname = "conferer-provider-yaml";
-       version = "0.2.0.0";
-       sha256 = "19h18374jkcbhj90f0sbz5fq9h35b4pi6wx0hf4h2n46k0gffq12";
+       version = "0.3.0.0";
+       sha256 = "0w1niybl4qa3yv5yzyvybs3v1h0a0ay051cvcpzimwx7kg6vqjv6";
        libraryHaskellDepends = [
          base conferer conferer-provider-json yaml
        ];
@@ -58130,8 +58279,8 @@ self: {
      }:
      mkDerivation {
        pname = "conferer-snap";
-       version = "0.2.0.0";
-       sha256 = "0kvg31i2ffs9ppky8kqszqpq5xaf01zy7k09ifsywmnm96cri9g4";
+       version = "0.3.0.0";
+       sha256 = "19kw9g0f7znc7as6nhjvnx5kypd71ygr5ialhk4pfjva3bp121ij";
        libraryHaskellDepends = [
          base conferer snap-core snap-server text
        ];
@@ -58157,6 +58306,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "conferer-warp_0_3_0_0" = callPackage
+    ({ mkDerivation, base, conferer, hspec, http-types, text, wai, warp
+     }:
+     mkDerivation {
+       pname = "conferer-warp";
+       version = "0.3.0.0";
+       sha256 = "19rld3xl4mfzl08wyciwh9amfcadnbn0rgjxvdy2s0vgk3nj7677";
+       libraryHaskellDepends = [ base conferer http-types text wai warp ];
+       testHaskellDepends = [
+         base conferer hspec http-types text wai warp
+       ];
+       description = "conferer's FromConfig instances for warp settings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "confetti" = callPackage
     ({ mkDerivation, base, cmdargs, directory, filepath, MissingH
      , tasty, tasty-hunit, tasty-smallcheck, text, time, unix, yaml
@@ -58477,16 +58642,16 @@ self: {
      }) {};
 
   "configurator-pg" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, filepath
-     , HUnit, protolude, scientific, test-framework
+    ({ mkDerivation, base, bytestring, containers, filepath, HUnit
+     , megaparsec, protolude, scientific, test-framework
      , test-framework-hunit, text
      }:
      mkDerivation {
        pname = "configurator-pg";
-       version = "0.1.0.3";
-       sha256 = "0fc77ihnablff8v0kgr88pcc3rn41ca14bvfxr21jx807fn8g63p";
+       version = "0.2.1";
+       sha256 = "0hlzh1608gcz86sh0wg1qgfz2v805hdjwga9sib1hb5cpmfc9c4j";
        libraryHaskellDepends = [
-         attoparsec base containers protolude scientific text
+         base containers megaparsec protolude scientific text
        ];
        testHaskellDepends = [
          base bytestring filepath HUnit protolude test-framework
@@ -59053,8 +59218,8 @@ self: {
      }:
      mkDerivation {
        pname = "construct";
-       version = "0.2";
-       sha256 = "18ww9yij81js122gkp03kajkakqvkn370lcz03kfcmmc5inw0vzj";
+       version = "0.2.0.1";
+       sha256 = "1j2xc1j9f71shins5nnj0xg41k4vx2r1jgimnnlcdln2g24v71l2";
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
@@ -66981,8 +67146,8 @@ self: {
      }:
      mkDerivation {
        pname = "dbus";
-       version = "1.2.11";
-       sha256 = "150agli4ialryxcv6nd3y90pi5ikls8bn9my3fp2j5fwir27abns";
+       version = "1.2.12";
+       sha256 = "19gc1cmz8g5fmqks5rj5fwg9ihd5ras180jdv2wfgilrlrjxvx84";
        libraryHaskellDepends = [
          base bytestring cereal conduit containers deepseq exceptions
          filepath lens network parsec random split template-haskell text
@@ -69619,6 +69784,8 @@ self: {
        pname = "dhall-json";
        version = "1.6.2";
        sha256 = "044hq25h872rjlcp24fzf0nslxg4a6hmq8ylcljzk003lmq0c2xz";
+       revision = "1";
+       editedCabalFile = "0zljipb4nq0xmdfhqq7vr9c3966mpkd812g4z6xz7ngzrqn41s40";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -73303,20 +73470,22 @@ self: {
      }) {};
 
   "dobutokO2" = callPackage
-    ({ mkDerivation, base, directory, mmsyn3, mmsyn7s, mmsyn7ukr
-     , process, vector
+    ({ mkDerivation, base, directory, mmsyn2, mmsyn3, mmsyn6ukr
+     , mmsyn7s, mmsyn7ukr, process, vector
      }:
      mkDerivation {
        pname = "dobutokO2";
-       version = "0.3.1.1";
-       sha256 = "1fkyk57ckif0yk2fc1gjvla44bj2y9r5k1zms03ld001vpmkwbir";
+       version = "0.8.2.0";
+       sha256 = "1czji489jj0f18shcx4likz8l46zwvq9vabrn1wv1lyh19nnk1k8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base directory mmsyn3 mmsyn7s mmsyn7ukr process vector
+         base directory mmsyn2 mmsyn3 mmsyn6ukr mmsyn7s mmsyn7ukr process
+         vector
        ];
        executableHaskellDepends = [
-         base directory mmsyn3 mmsyn7s mmsyn7ukr process vector
+         base directory mmsyn2 mmsyn3 mmsyn6ukr mmsyn7s mmsyn7ukr process
+         vector
        ];
        description = "A program and a library to create experimental music from a mono audio and a Ukrainian text";
        license = stdenv.lib.licenses.mit;
@@ -76998,6 +77167,8 @@ self: {
        pname = "egison-pattern-src-th-mode";
        version = "0.2.1.0";
        sha256 = "0libfs39irdnqfvynmpji21p6nyk2s3zsxhlmsz763aya51ymxpy";
+       revision = "1";
+       editedCabalFile = "13k65z8jai64087ns3b99wznv0ain3z3bailk8fdpnsjf4s2a4qg";
        libraryHaskellDepends = [
          base egison-pattern-src haskell-src-exts haskell-src-meta mtl
          pretty template-haskell text
@@ -82537,28 +82708,30 @@ self: {
 
   "extra" = callPackage
     ({ mkDerivation, base, clock, directory, filepath, process
-     , QuickCheck, semigroups, time, unix
+     , QuickCheck, quickcheck-instances, semigroups, time, unix
      }:
      mkDerivation {
        pname = "extra";
-       version = "1.6.20";
-       sha256 = "0bx0km3sc3irgpvz1ky334pr1fr88y2mkkniadzpn2pcrb9lxshr";
+       version = "1.6.21";
+       sha256 = "1gjx98w4w61g043k6rzc8i34cbxpcigi8lb6i7pp1vwp8w8jm5vl";
        libraryHaskellDepends = [
          base clock directory filepath process semigroups time unix
        ];
-       testHaskellDepends = [ base directory filepath QuickCheck unix ];
+       testHaskellDepends = [
+         base directory filepath QuickCheck quickcheck-instances unix
+       ];
        description = "Extra functions I use";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "extra_1_7" = callPackage
+  "extra_1_7_1" = callPackage
     ({ mkDerivation, base, clock, directory, filepath, process
      , QuickCheck, quickcheck-instances, semigroups, time, unix
      }:
      mkDerivation {
        pname = "extra";
-       version = "1.7";
-       sha256 = "1mfhgbvyvrj0z9vpbcgm5dlrys51gd8fh2qwwihxixbw12vmqd86";
+       version = "1.7.1";
+       sha256 = "0zshxv9dnd8vksncmb8dj4wvq2wdybzwxyhmy2zp6a81icm4azx4";
        libraryHaskellDepends = [
          base clock directory filepath process semigroups time unix
        ];
@@ -82739,6 +82912,21 @@ self: {
        broken = true;
      }) {};
 
+  "factor" = callPackage
+    ({ mkDerivation, arithmetic, base, opentheory-primitive, random }:
+     mkDerivation {
+       pname = "factor";
+       version = "1.0";
+       sha256 = "02fy4lnajdj0dqkz3bfpj6qzk34kjmjz6c0vidwc7kqqivhxldvh";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         arithmetic base opentheory-primitive random
+       ];
+       description = "Factoring integers";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "factory" = callPackage
     ({ mkDerivation, array, base, Cabal, containers, data-default
      , deepseq, parallel, primes, QuickCheck, random, toolshed
@@ -83594,8 +83782,8 @@ self: {
      }:
      mkDerivation {
        pname = "fay";
-       version = "0.24.0.4";
-       sha256 = "1jpqc48a7h9x64wv77g7bdnhvfjgbabp4n3qcbqsfz9v92j46j0a";
+       version = "0.24.0.5";
+       sha256 = "05wm3zp41xgx0s9p0wmy9rqk9ii6wcxsr3jrcqqrnlpbp90dwfxx";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -83804,6 +83992,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fb_2_1_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit
+     , conduit-extra, containers, cryptonite, data-default, hspec
+     , http-client, http-conduit, http-types, HUnit, memory
+     , monad-logger, QuickCheck, resourcet, text, time, transformers
+     , transformers-base, unliftio, unliftio-core, unordered-containers
+     }:
+     mkDerivation {
+       pname = "fb";
+       version = "2.1.0";
+       sha256 = "18h16dkyh35q0wyjvri7z2q2j8rx4bb6ma2bf6h2cdm7jh6zdakq";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring conduit conduit-extra cryptonite
+         data-default http-client http-conduit http-types memory
+         monad-logger resourcet text time transformers transformers-base
+         unliftio unliftio-core unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring conduit containers data-default hspec
+         http-conduit HUnit QuickCheck resourcet text time transformers
+         unliftio
+       ];
+       description = "Bindings to Facebook's API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fb-persistent" = callPackage
     ({ mkDerivation, base, cereal, fb, persistent, text, time }:
      mkDerivation {
@@ -85910,6 +86125,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "first-class-families_0_8_0_0" = callPackage
+    ({ mkDerivation, base, doctest, Glob }:
+     mkDerivation {
+       pname = "first-class-families";
+       version = "0.8.0.0";
+       sha256 = "190jl3vs7glkbm8ap90x9yzlj01yzxd818s3i0w4pz21b6d6sxav";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest Glob ];
+       description = "First class type families";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "first-class-instances" = callPackage
     ({ mkDerivation, base, Cabal, containers, hspec, hspec-discover
      , template-haskell
@@ -90895,37 +91123,37 @@ self: {
      }) {};
 
   "funflow" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, clock, constraints
-     , containers, contravariant, cryptonite, data-default, directory
-     , exceptions, filepath, ghc-prim, Glob, hashable, hedis, hinotify
-     , hostname, integer-gmp, katip, lens, lifted-async, memory
-     , monad-control, mtl, network, optparse-applicative, path, path-io
-     , pretty, process, random, safe-exceptions, scientific
-     , sqlite-simple, stm, store, tar, tasty, tasty-hunit
-     , template-haskell, temporary, text, time, transformers, unix
-     , unordered-containers, vector, yaml
+    ({ mkDerivation, aeson, async, base, bytestring, cas-hashable
+     , cas-store, clock, constraints, containers, contravariant
+     , cryptonite, data-default, directory, exceptions, filepath
+     , ghc-prim, Glob, hashable, hedis, hostname, integer-gmp, katip
+     , lens, lifted-async, memory, monad-control, mtl, network
+     , optparse-applicative, path, path-io, pretty, process, profunctors
+     , random, safe-exceptions, scientific, sqlite-simple, stm, store
+     , tar, tasty, tasty-hunit, template-haskell, temporary, text, time
+     , transformers, unix, unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "funflow";
-       version = "1.5.0";
-       sha256 = "0mvv78jjiq3bglqpynl90155mwm7k8m7qv127cxi31n0xmzpw4ky";
+       version = "1.6.0";
+       sha256 = "0cwy4wiy5vr6wix5fjiw6dmy4nxyv9bbnj5w2wkhs8rdb0c34zim";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson async base bytestring clock constraints containers
-         contravariant cryptonite data-default directory exceptions filepath
-         ghc-prim Glob hashable hedis hinotify hostname integer-gmp katip
-         lens lifted-async memory monad-control mtl path path-io pretty
-         process random safe-exceptions scientific sqlite-simple stm store
-         tar template-haskell text time transformers unix
-         unordered-containers vector yaml
+         aeson async base bytestring cas-hashable cas-store clock
+         constraints containers contravariant cryptonite data-default
+         directory exceptions filepath ghc-prim Glob hashable hedis hostname
+         integer-gmp katip lens lifted-async memory monad-control mtl path
+         path-io pretty process profunctors random safe-exceptions
+         scientific sqlite-simple stm store tar template-haskell text time
+         transformers unix unordered-containers vector yaml
        ];
        executableHaskellDepends = [
-         base bytestring clock hedis network optparse-applicative path
-         safe-exceptions text unix
+         base bytestring cas-store clock hedis network optparse-applicative
+         path safe-exceptions text unix
        ];
        testHaskellDepends = [
-         async base containers data-default directory filepath hedis path
+         async base cas-store data-default directory filepath hedis path
          path-io process random safe-exceptions tasty tasty-hunit temporary
          text unix
        ];
@@ -91060,26 +91288,6 @@ self: {
      }) {};
 
   "fused-effects" = callPackage
-    ({ mkDerivation, base, containers, gauge, hedgehog, hedgehog-fn
-     , inspection-testing, markdown-unlit, mtl, tasty, tasty-hedgehog
-     , tasty-hunit, transformers
-     }:
-     mkDerivation {
-       pname = "fused-effects";
-       version = "1.0.0.1";
-       sha256 = "1v11m8i4ffadfiy3bxwgjcrx5z5gzxv4ciniqzv01b0jxajfkg9g";
-       libraryHaskellDepends = [ base transformers ];
-       testHaskellDepends = [
-         base containers hedgehog hedgehog-fn inspection-testing mtl tasty
-         tasty-hedgehog tasty-hunit transformers
-       ];
-       testToolDepends = [ markdown-unlit ];
-       benchmarkHaskellDepends = [ base gauge ];
-       description = "A fast, flexible, fused effect system";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fused-effects_1_0_2_0" = callPackage
     ({ mkDerivation, base, containers, gauge, hedgehog, hedgehog-fn
      , inspection-testing, markdown-unlit, mtl, tasty, tasty-hedgehog
      , tasty-hunit, transformers
@@ -91097,7 +91305,6 @@ self: {
        benchmarkHaskellDepends = [ base gauge ];
        description = "A fast, flexible, fused effect system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fused-effects-exceptions" = callPackage
@@ -91351,8 +91558,8 @@ self: {
     ({ mkDerivation, base, hourglass, hspec, lens, parsec }:
      mkDerivation {
        pname = "fuzzy-dates";
-       version = "0.1.1.1";
-       sha256 = "1hanmwzr1g11am4z3r9wrkzfycvk76a03cg9bqpifidv7y9hcd73";
+       version = "0.1.1.2";
+       sha256 = "12ga6d4kp6mk6cg781ibaxxmpq7kfh8i4yg8r4awiwp1ic8lrcd9";
        libraryHaskellDepends = [ base hourglass hspec lens parsec ];
        testHaskellDepends = [ base hourglass hspec lens parsec ];
        description = "Libary for parsing dates in strings in varied formats";
@@ -94771,6 +94978,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-lib-parser-ex_8_8_5_5" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, extra
+     , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit
+     , uniplate
+     }:
+     mkDerivation {
+       pname = "ghc-lib-parser-ex";
+       version = "8.8.5.5";
+       sha256 = "15rp1829zzppz3y014cac1ssmklssn5hsfvadqrzkzmnky2yr215";
+       libraryHaskellDepends = [
+         base bytestring containers extra ghc ghc-boot ghc-boot-th uniplate
+       ];
+       testHaskellDepends = [
+         base directory extra filepath ghc ghc-boot-th tasty tasty-hunit
+       ];
+       description = "Algorithms on GHC parse trees";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-make" = callPackage
     ({ mkDerivation, base, process, shake, unordered-containers }:
      mkDerivation {
@@ -95191,14 +95418,19 @@ self: {
 
   "ghc-tags-plugin" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
-     , directory, ghc, gitrev
+     , directory, filepath, ghc, lattices, QuickCheck
+     , quickcheck-instances, tasty, tasty-golden, tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "ghc-tags-plugin";
-       version = "0.1.1.0";
-       sha256 = "1bwv5sda0lihc0f0blxgs4j730kd31p9djk8wxyf8qiqdlsp2afa";
+       version = "0.1.4.0";
+       sha256 = "0ci82krwqiprh23p316n1k09z6ja962xscnx9ycqpsyywbgkcqk4";
        libraryHaskellDepends = [
-         attoparsec base bytestring containers directory ghc gitrev
+         attoparsec base bytestring containers directory filepath ghc text
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring lattices QuickCheck quickcheck-instances
+         tasty tasty-golden tasty-quickcheck text
        ];
        doHaddock = false;
        description = "A compiler plugin which generates tags file from GHC syntax tree";
@@ -95283,6 +95515,30 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "ghc-typelits-extra_0_4" = callPackage
+    ({ mkDerivation, base, containers, ghc, ghc-prim
+     , ghc-tcplugins-extra, ghc-typelits-knownnat
+     , ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit
+     , transformers
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-extra";
+       version = "0.4";
+       sha256 = "0511vpwn8hz1hvn58g49l95iqcgqr8l8bqy5qwijy2bzad2nhcbg";
+       libraryHaskellDepends = [
+         base containers ghc ghc-prim ghc-tcplugins-extra
+         ghc-typelits-knownnat ghc-typelits-natnormalise integer-gmp
+         transformers
+       ];
+       testHaskellDepends = [
+         base ghc-typelits-knownnat ghc-typelits-natnormalise tasty
+         tasty-hunit
+       ];
+       description = "Additional type-level operations on GHC.TypeLits.Nat";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-typelits-knownnat" = callPackage
     ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra
      , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
@@ -95321,6 +95577,25 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "ghc-typelits-natnormalise_0_7_2" = callPackage
+    ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra
+     , integer-gmp, syb, tasty, tasty-hunit, template-haskell
+     , transformers
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-natnormalise";
+       version = "0.7.2";
+       sha256 = "1hk2f2vqkpia7kv7pqwf942y1w9m7mvmikzabkrjp8f8gijcsk52";
+       libraryHaskellDepends = [
+         base containers ghc ghc-tcplugins-extra integer-gmp syb
+         transformers
+       ];
+       testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
+       description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-typelits-presburger" = callPackage
     ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra, mtl
      , pretty, reflection, syb, transformers
@@ -95581,6 +95856,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghcid_0_8_3" = callPackage
+    ({ mkDerivation, ansi-terminal, base, cmdargs, containers
+     , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit
+     , terminal-size, time, unix
+     }:
+     mkDerivation {
+       pname = "ghcid";
+       version = "0.8.3";
+       sha256 = "1b8a8mx6z2ridw79gijjv90b2jgk0qrncvg0sjbmvyyyajx1h5f7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal base cmdargs directory extra filepath process time
+       ];
+       executableHaskellDepends = [
+         ansi-terminal base cmdargs containers directory extra filepath
+         fsnotify process terminal-size time unix
+       ];
+       testHaskellDepends = [
+         ansi-terminal base cmdargs containers directory extra filepath
+         fsnotify process tasty tasty-hunit terminal-size time unix
+       ];
+       description = "GHCi based bare bones IDE";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghcide" = callPackage
     ({ mkDerivation, aeson, async, base, binary, bytestring, containers
      , data-default, deepseq, directory, extra, filepath, fuzzy, ghc
@@ -97277,8 +97579,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "8.20200226";
-       sha256 = "09v80ni1w9z1im79lzrnpz7xlivwna44zqpwq4axwyd17cffqi9m";
+       version = "8.20200309";
+       sha256 = "1yjb01jh5rccqg44nqh4iyxmbpkcpm6m82lnw7s0s2vizj8891p5";
        configureFlags = [
          "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
          "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser"
@@ -97905,29 +98207,6 @@ self: {
      }) {};
 
   "github-rest" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, bytestring, http-client
-     , http-client-tls, http-types, jwt, mtl, scientific, tasty
-     , tasty-golden, tasty-hunit, tasty-quickcheck, text, time
-     , transformers, unliftio, unliftio-core
-     }:
-     mkDerivation {
-       pname = "github-rest";
-       version = "1.0.1";
-       sha256 = "0dv959xmfpwbkjnjkisgxldkb89ln0wypz4cb65biijqfw0i4399";
-       libraryHaskellDepends = [
-         aeson base bytestring http-client http-client-tls http-types jwt
-         mtl scientific text time transformers unliftio unliftio-core
-       ];
-       testHaskellDepends = [
-         aeson aeson-qq base bytestring http-client http-client-tls
-         http-types jwt mtl scientific tasty tasty-golden tasty-hunit
-         tasty-quickcheck text time transformers unliftio unliftio-core
-       ];
-       description = "Query the GitHub REST API programmatically";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "github-rest_1_0_2" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, bytestring, http-client
      , http-client-tls, http-types, jwt, mtl, scientific, tasty
      , tasty-golden, tasty-hunit, tasty-quickcheck, text, time
@@ -97948,7 +98227,6 @@ self: {
        ];
        description = "Query the GitHub REST API programmatically";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github-tools" = callPackage
@@ -98167,22 +98445,6 @@ self: {
      }) {};
 
   "gitlab-haskell" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, connection, http-conduit
-     , http-types, text, time, transformers, unliftio, unliftio-core
-     }:
-     mkDerivation {
-       pname = "gitlab-haskell";
-       version = "0.1.5";
-       sha256 = "01wll1aik3x9bj5z29h12srj7skyqk6v1g4rvrd86zd9zvxqr6cw";
-       libraryHaskellDepends = [
-         aeson base bytestring connection http-conduit http-types text time
-         transformers unliftio unliftio-core
-       ];
-       description = "A Haskell library for the GitLab web API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "gitlab-haskell_0_1_7" = callPackage
     ({ mkDerivation, aeson, base, bytestring, connection, http-conduit
      , http-types, text, time, transformers, unliftio, unliftio-core
      }:
@@ -98196,7 +98458,6 @@ self: {
        ];
        description = "A Haskell library for the GitLab web API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitlib" = callPackage
@@ -98848,6 +99109,8 @@ self: {
        pname = "glirc";
        version = "2.35";
        sha256 = "093cqbvqijjy6xd0fzas13ldrsf9kg59jak88qzl5kks7z9djl0f";
+       revision = "1";
+       editedCabalFile = "14kgfgqyfw5vcm77n5iljxw5n28iclc1hpvi44x4vhrnmfpmq62v";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -107743,10 +108006,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll";
-       version = "4.13.1.0";
-       sha256 = "14l85n69zsczyw2fs8kjnnmkl4gk85xj3f4alfa7604nnmic9mvn";
-       revision = "1";
-       editedCabalFile = "0vbs0y4niirmwcc2r59pbzl33s4qzpdlslvigyb6adf6r79di1r9";
+       version = "4.13.2.0";
+       sha256 = "0g52lip9i6zanjja0v86v5sypjvnfpfwzzddrpj04pml733nsnfj";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -117398,6 +117659,8 @@ self: {
        pname = "hedn";
        version = "0.3.0.0";
        sha256 = "1gx8bw2l1qpb4jgh5d1zzgfm2rnwavg5shmp4wq2mqrih11r3f3y";
+       revision = "1";
+       editedCabalFile = "1bpd4dd8afccj2bakqqbimmd3ja9i21q9k98vmzw37ishbd3xync";
        libraryHaskellDepends = [
          base containers deepseq deriving-compat megaparsec
          parser-combinators prettyprinter scientific template-haskell text
@@ -119697,6 +119960,8 @@ self: {
        pname = "hie-bios";
        version = "0.4.0";
        sha256 = "1pa8wjj6sml39371f355z46304jzzwpcr62q0qzrpqq8w9017241";
+       revision = "1";
+       editedCabalFile = "12m0hy4lirnr02h0nh2a85cfm8jv7jgqh24fdn29jkc28gpspm72";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121484,8 +121749,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-flow";
-       version = "0.13.1.0";
-       sha256 = "1ixfsndl2has2pmq5vrf59z96j0pqaa8y8wk61rzjdh9cn62i3jj";
+       version = "0.13.2.0";
+       sha256 = "1zajlqbayr6vm45y3901xwgg6acjn8fwx73mm9bnbsbxfzxn4g7d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121922,8 +122187,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlrdb-core";
-       version = "0.1.5.0";
-       sha256 = "0aznzrwv021nppb5cxbpnr7hiajny4s40diz6kcmddsbml56xmk9";
+       version = "0.1.6.0";
+       sha256 = "13hb0657y5cqhbl2m27v28b6zl9mgcq17r983rds3l3bccn67ayv";
        libraryHaskellDepends = [
          base bytestring hashable hedis lens mtl profunctors random time
          unordered-containers
@@ -122750,18 +123015,19 @@ self: {
     ({ mkDerivation, base, base16-bytestring, base64-bytestring, binary
      , bytestring, containers, cryptohash-md5, cryptohash-sha1
      , cryptohash-sha256, directory, filepath, hashable, mtl, process
-     , regex-base, regex-tdfa-text, tasty, tasty-discover, tasty-hspec
-     , tasty-hunit, tasty-quickcheck, temporary, text, unix
-     , unordered-containers, vector
+     , regex-base, regex-tdfa, saltine, tasty, tasty-discover
+     , tasty-hspec, tasty-hunit, tasty-quickcheck, temporary, text, time
+     , unix, unordered-containers, vector
      }:
      mkDerivation {
        pname = "hnix-store-core";
-       version = "0.1.0.0";
-       sha256 = "1xrx3ly6qsh3j6naqxdv9v759fbmksd2yfdgnzppcnskrcfrm347";
+       version = "0.2.0.0";
+       sha256 = "1gy808dzaq2jjy1xdhf3vjxzprlzn9mmbxc554sa03v8f9hc0r7h";
        libraryHaskellDepends = [
          base base16-bytestring binary bytestring containers cryptohash-md5
          cryptohash-sha1 cryptohash-sha256 directory filepath hashable mtl
-         regex-base regex-tdfa-text text unix unordered-containers vector
+         regex-base regex-tdfa saltine text time unix unordered-containers
+         vector
        ];
        testHaskellDepends = [
          base base64-bytestring binary bytestring containers directory
@@ -123328,6 +123594,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "holmes" = callPackage
+    ({ mkDerivation, base, containers, hashable, hedgehog, hspec
+     , logict, markdown-unlit, mtl, primitive, relude, split, tasty
+     , tasty-discover, tasty-hedgehog, tasty-hspec, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "holmes";
+       version = "0.2.0.0";
+       sha256 = "13x48fvjfvh65c9cz3b81hk7ka43i0zz7gih7v3jpjwq0s7hqic8";
+       libraryHaskellDepends = [
+         base containers hashable hedgehog logict mtl primitive transformers
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         base containers hashable hedgehog hspec primitive relude split
+         tasty tasty-discover tasty-hedgehog tasty-hspec transformers
+         unordered-containers
+       ];
+       testToolDepends = [ markdown-unlit tasty-discover ];
+       description = "Tools and combinators for solving constraint problems";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "holy-project" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal
      , directory, filepath, hastache, http-conduit, HUnit, lens
@@ -129223,8 +129513,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-snap";
-       version = "1.0.1.0";
-       sha256 = "0r7isf3vi8mc6h50s6n8cbmvbdmklk3v8d7wwb1ikzjl4izhimkn";
+       version = "1.0.2.0";
+       sha256 = "1rqqyrnny5wk4xql1ddavq72qcvdhblm7ga8728i42v14n6z80i4";
        libraryHaskellDepends = [
          aeson base bytestring containers digestive-functors HandsomeSoup
          hspec hspec-core HUnit hxt lens mtl snap snap-core text
@@ -130257,15 +130547,15 @@ self: {
      }) {};
 
   "hsyslog-udp" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, hsyslog, network, text
-     , time, unix
+    ({ mkDerivation, base, bytestring, hspec, hsyslog, network
+     , network-bsd, text, time, unix
      }:
      mkDerivation {
        pname = "hsyslog-udp";
-       version = "0.2.4";
-       sha256 = "1xahxchr1il9naf8kdwdbh1sy5vv4afqkcxfy4993nsk5j7zs586";
+       version = "0.2.5";
+       sha256 = "02n2l9fl926di21w01qhqn3f39hnm6nqc7kn0af1f89qncpbxl5d";
        libraryHaskellDepends = [
-         base bytestring hsyslog network text time unix
+         base bytestring hsyslog network network-bsd text time unix
        ];
        testHaskellDepends = [ base hspec time ];
        description = "Log to syslog over a network via UDP";
@@ -131010,6 +131300,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "http-client_0_6_4_1" = callPackage
+    ({ mkDerivation, array, async, base, blaze-builder, bytestring
+     , case-insensitive, containers, cookie, deepseq, directory
+     , exceptions, filepath, ghc-prim, hspec, http-types, memory
+     , mime-types, monad-control, network, network-uri, random, stm
+     , streaming-commons, text, time, transformers, zlib
+     }:
+     mkDerivation {
+       pname = "http-client";
+       version = "0.6.4.1";
+       sha256 = "1y12xfh6xvsfvyapbssmgrpjz025rmyccprbnmzhs0y1cmlz6hjp";
+       libraryHaskellDepends = [
+         array base blaze-builder bytestring case-insensitive containers
+         cookie deepseq exceptions filepath ghc-prim http-types memory
+         mime-types network network-uri random stm streaming-commons text
+         time transformers
+       ];
+       testHaskellDepends = [
+         async base blaze-builder bytestring case-insensitive containers
+         deepseq directory hspec http-types monad-control network
+         network-uri streaming-commons text time transformers zlib
+       ];
+       doCheck = false;
+       description = "An HTTP client engine";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-client-auth" = callPackage
     ({ mkDerivation, base, base64-string, blaze-builder, bytestring
      , case-insensitive, conduit, crypto-conduit, http-client
@@ -131387,6 +131705,26 @@ self: {
        broken = true;
      }) {};
 
+  "http-directory_0_1_8" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, html-conduit, http-client
+     , http-client-tls, http-date, http-types, network-uri, text, time
+     , xml-conduit
+     }:
+     mkDerivation {
+       pname = "http-directory";
+       version = "0.1.8";
+       sha256 = "0sav7z5vdda6zq1xyhvrqwh3kdn1bnpmwlhiaxr3sb1npz3hjgcn";
+       libraryHaskellDepends = [
+         base bytestring html-conduit http-client http-client-tls http-date
+         http-types network-uri text time xml-conduit
+       ];
+       testHaskellDepends = [ base hspec text ];
+       description = "http directory listing library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "http-dispatch" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , case-insensitive, hspec, http-client, http-client-tls, http-types
@@ -133012,8 +133350,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-balancedparens";
-       version = "0.3.0.4";
-       sha256 = "1f25czr55c8fsb1l2ljfr93x2fp888g78ngf45xampnr6m3468j3";
+       version = "0.3.0.5";
+       sha256 = "0mc1qxng09891rpdw8g6cbx61b7pvvd7v4jm3ngzi5byamm0sbxp";
        libraryHaskellDepends = [
          base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-prim
          hw-rankselect-base vector
@@ -133032,29 +133370,6 @@ self: {
      }) {};
 
   "hw-bits" = callPackage
-    ({ mkDerivation, base, bitvec, bytestring, criterion, deepseq
-     , hedgehog, hspec, hspec-discover, hw-hspec-hedgehog, hw-int
-     , hw-prim, hw-string-parse, vector
-     }:
-     mkDerivation {
-       pname = "hw-bits";
-       version = "0.7.1.0";
-       sha256 = "0r4jinz2h5zkjap6f6qrjgfq6xhaz3j34fjwawv8qvgc4qgq7bil";
-       libraryHaskellDepends = [
-         base bitvec bytestring deepseq hw-int hw-prim hw-string-parse
-         vector
-       ];
-       testHaskellDepends = [
-         base bitvec bytestring hedgehog hspec hw-hspec-hedgehog hw-prim
-         vector
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [ base criterion vector ];
-       description = "Bit manipulation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-bits_0_7_1_2" = callPackage
     ({ mkDerivation, base, bitvec, bytestring, criterion, deepseq
      , doctest, doctest-discover, hedgehog, hspec, hspec-discover
      , hw-hspec-hedgehog, hw-int, hw-prim, hw-string-parse, vector
@@ -133075,6 +133390,29 @@ self: {
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "Bit manipulation";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "hw-bits_0_7_1_5" = callPackage
+    ({ mkDerivation, base, bitvec, bytestring, criterion, deepseq
+     , doctest, doctest-discover, hedgehog, hspec, hspec-discover
+     , hw-hspec-hedgehog, hw-int, hw-prim, hw-string-parse, vector
+     }:
+     mkDerivation {
+       pname = "hw-bits";
+       version = "0.7.1.5";
+       sha256 = "0gvbsnirlgsj58363zqg960j0ydx2bhgw4lwql71jf9kg7hd4kqb";
+       libraryHaskellDepends = [
+         base bitvec bytestring deepseq hw-int hw-prim hw-string-parse
+         vector
+       ];
+       testHaskellDepends = [
+         base bitvec bytestring doctest doctest-discover hedgehog hspec
+         hw-hspec-hedgehog hw-prim vector
+       ];
+       testToolDepends = [ doctest-discover hspec-discover ];
+       benchmarkHaskellDepends = [ base criterion vector ];
+       description = "Bit manipulation";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -133903,8 +134241,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-uri";
-       version = "0.2.0.1";
-       sha256 = "1i42l5jg06xlfbplibxx8104w1x61yixbv7w3l1fs0q06zzxaiqp";
+       version = "0.2.1.0";
+       sha256 = "1bwdzvms0n86k7gbkhk0jj3m1pcc9vbjk13kgpchqxpxm971srbs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -135492,8 +135830,8 @@ self: {
      }:
      mkDerivation {
        pname = "icepeak";
-       version = "0.7.1.0";
-       sha256 = "1mw6ydcmp7q3qqqv0s86h3vahvsh9nzfi8d0yfwf8ywp6lzwhxfv";
+       version = "0.7.2.0";
+       sha256 = "0vs2lfwqxss2f4ajzj4pqzr5mxk69hs0jl4kz7y2qn7161x4vcd2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -137349,6 +137687,29 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "incremental-parser_0_4_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
+     , monoid-subclasses, parsers, QuickCheck, rank2classes, tasty
+     , tasty-quickcheck, text, transformers
+     }:
+     mkDerivation {
+       pname = "incremental-parser";
+       version = "0.4.0.1";
+       sha256 = "1cghkzdsh8vjv1ggk5qjr5ny88wna5kbifbfsy1ld5n5k66536lf";
+       libraryHaskellDepends = [
+         base monoid-subclasses parsers rank2classes transformers
+       ];
+       testHaskellDepends = [
+         base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq monoid-subclasses text
+       ];
+       description = "Generic parser library capable of providing partial results from partial input";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "incremental-sat-solver" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -139199,6 +139560,8 @@ self: {
        pname = "intro";
        version = "0.6.0.1";
        sha256 = "1kka6dnlyqppjx9ykk3zixfyslr8cf4ja6sa2hgq6h69mmsicp67";
+       revision = "1";
+       editedCabalFile = "1jxd4agavzccgszniqzakgpb6b49qx5c20asr068rpvaf03msncx";
        libraryHaskellDepends = [
          base bytestring containers deepseq dlist extra hashable mtl safe
          text transformers unordered-containers writer-cps-mtl
@@ -151327,8 +151690,8 @@ self: {
      }:
      mkDerivation {
        pname = "libarchive";
-       version = "2.2.3.0";
-       sha256 = "0vnby3clfx3rqs6gw8l55nhdns47my0ihc9l4k5zmy1bvdhywy6y";
+       version = "2.2.4.0";
+       sha256 = "05d16ckk6iaj75zarqq6hjjmmb2xdd62hcyidfya3jfkw74zh1rp";
        setupHaskellDepends = [ base Cabal chs-cabal ];
        libraryHaskellDepends = [
          base bytestring composition-prelude deepseq dlist filepath mtl
@@ -153203,8 +153566,8 @@ self: {
      }:
      mkDerivation {
        pname = "lingo";
-       version = "0.3.1.0";
-       sha256 = "0bx3hf0lpi05w2ky0pkak39lhbpqyy8nahyk5j6z8ivi7fpm3p4s";
+       version = "0.3.2.0";
+       sha256 = "0qym6svpvxsxbhbppk0lkpp2zbqa13f0njkxnpyz5id581c3v8hx";
        setupHaskellDepends = [
          base bytestring Cabal containers directory filepath text yaml
        ];
@@ -157291,8 +157654,8 @@ self: {
      }:
      mkDerivation {
        pname = "lz4-bytes";
-       version = "0.1.0.0";
-       sha256 = "02lc1ka16vfwljsh1ybp4cn39rpgiwp38qj1ayr77ha3nhjzr9z0";
+       version = "0.1.0.2";
+       sha256 = "1h0rfc273jszv3c83izkr7v8x7zqikbayf20yhahj2fl129ar362";
        libraryHaskellDepends = [ base byteslice primitive run-st ];
        testHaskellDepends = [
          base byteslice primitive tasty tasty-quickcheck
@@ -157329,17 +157692,19 @@ self: {
      }) {};
 
   "lz4-hs" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, filepath, tasty
+    ({ mkDerivation, base, bytestring, c2hs, criterion, filepath, tasty
      , tasty-hunit, temporary
      }:
      mkDerivation {
        pname = "lz4-hs";
-       version = "0.1.1.0";
-       sha256 = "12wcjfqbzh4myyxbnwlf3kddis8h0cgar62gjw7srrfa2025vmc7";
+       version = "0.1.3.0";
+       sha256 = "0yx1njh0zwk2qk99ip1f2wlcy3ql35piqbvd6dppr2hwnm5bh1mk";
        libraryHaskellDepends = [ base bytestring ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base bytestring tasty tasty-hunit ];
-       benchmarkHaskellDepends = [ base bytestring filepath temporary ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion filepath temporary
+       ];
        description = "lz4 bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -157520,6 +157885,26 @@ self: {
        broken = true;
      }) {};
 
+  "macaroon-shop" = callPackage
+    ({ mkDerivation, base, bytes, bytestring, cereal, containers
+     , cryptonite, hedgehog, memory, saltine, transformers
+     }:
+     mkDerivation {
+       pname = "macaroon-shop";
+       version = "0.1.0.0";
+       sha256 = "087b83l3bdx1mk79bxqcwckbjdz7idi0m73dcrjiv5b4q5rjr8rs";
+       libraryHaskellDepends = [
+         base bytes bytestring cereal containers cryptonite memory saltine
+         transformers
+       ];
+       testHaskellDepends = [
+         base bytes bytestring cereal containers cryptonite hedgehog memory
+         saltine transformers
+       ];
+       description = "A toolkit for working with macaroons";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "macbeth-lib" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, conduit
      , conduit-extra, containers, directory, either-unwrap, filepath
@@ -159640,31 +160025,6 @@ self: {
      }) {};
 
   "massiv-io" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, Color
-     , data-default-class, deepseq, doctest, exceptions, filepath, hspec
-     , JuicyPixels, massiv, massiv-test, netpbm, QuickCheck, random
-     , template-haskell, unliftio, vector
-     }:
-     mkDerivation {
-       pname = "massiv-io";
-       version = "0.2.0.0";
-       sha256 = "1gypn2srqsnzmx1jd28632w34n7z4x5wadi4m7srxdhwk14vqg2m";
-       revision = "1";
-       editedCabalFile = "0kg2k84r5sxbg5pjjva639l0h1c4nhahmy1iakwmczkxjnzh6f8a";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base bytestring Color data-default-class deepseq exceptions
-         filepath JuicyPixels massiv netpbm unliftio vector
-       ];
-       testHaskellDepends = [
-         base bytestring doctest hspec JuicyPixels massiv massiv-test
-         QuickCheck random template-haskell
-       ];
-       description = "Import/export of Image files into massiv Arrays";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "massiv-io_0_2_1_0" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, Color
      , data-default-class, deepseq, doctest, exceptions, filepath, hspec
      , JuicyPixels, massiv, massiv-test, netpbm, QuickCheck, random
@@ -159685,7 +160045,6 @@ self: {
        ];
        description = "Import/export of Image files into massiv Arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "massiv-scheduler" = callPackage
@@ -160263,8 +160622,8 @@ self: {
      }:
      mkDerivation {
        pname = "matterhorn";
-       version = "50200.6.0";
-       sha256 = "0b8qsd2w324sxmp3cgnz7fzlbhk5nz6slw8qxxm5dpy0bs5v7xnb";
+       version = "50200.7.0";
+       sha256 = "08ynlxqdb2mr7si0q7747pd1x9v9s7jmq2q75bqhzl44rpjhh4dv";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -160300,8 +160659,8 @@ self: {
      }:
      mkDerivation {
        pname = "mattermost-api";
-       version = "50200.3.0";
-       sha256 = "1d5nxaf382lzsr05rcby9w8y726bsda29w46b96p89whfbq8s9h3";
+       version = "50200.4.0";
+       sha256 = "0nl3xsw90rg08hmipr0d80h7ss68mlyaawagkiv2gj4qjlb2lqcn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -160324,8 +160683,8 @@ self: {
      }:
      mkDerivation {
        pname = "mattermost-api-qc";
-       version = "50200.3.0";
-       sha256 = "14111sq1k7iw8yy050805x0m80i9mixgxaqkl15gm0pvm4ap5ycd";
+       version = "50200.4.0";
+       sha256 = "1lxr3xfvc4qg1n1wxqz1bv4ac12xiwnk79i53w2gx2xks6rdpibj";
        libraryHaskellDepends = [
          base containers mattermost-api QuickCheck text time
        ];
@@ -163178,8 +163537,8 @@ self: {
      }:
      mkDerivation {
        pname = "minilight";
-       version = "0.4.2";
-       sha256 = "0bs4ix1yazq660jn9yz3yyfxx6scj2dgy37n13461l7ax1y9xp7s";
+       version = "0.4.3";
+       sha256 = "1qsmrb6bfwrv302pmm26nkkfky10h0mdkflvj3lfjmnz0bv7aw4g";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -163214,22 +163573,6 @@ self: {
      }) {};
 
   "minimorph" = callPackage
-    ({ mkDerivation, base, HUnit, test-framework, test-framework-hunit
-     , text
-     }:
-     mkDerivation {
-       pname = "minimorph";
-       version = "0.2.1.0";
-       sha256 = "1phpsd0j8c987sw99p4hyywr4ydcxf5aq4h6xqdl3acwi0dv4zhj";
-       libraryHaskellDepends = [ base text ];
-       testHaskellDepends = [
-         base HUnit test-framework test-framework-hunit text
-       ];
-       description = "English spelling functions with an emphasis on simplicity";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "minimorph_0_2_2_0" = callPackage
     ({ mkDerivation, base, HUnit, test-framework, test-framework-hunit
      , text
      }:
@@ -163243,7 +163586,6 @@ self: {
        ];
        description = "English spelling functions with an emphasis on simplicity";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "minimung" = callPackage
@@ -163430,23 +163772,6 @@ self: {
      }) {};
 
   "miniutter" = callPackage
-    ({ mkDerivation, base, binary, containers, HUnit, minimorph
-     , test-framework, test-framework-hunit, text
-     }:
-     mkDerivation {
-       pname = "miniutter";
-       version = "0.5.0.0";
-       sha256 = "0hgsk54s07497rsgsck8lhpfbrxavx1chq90hsw14w3ggr1xnc7f";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [ base binary containers minimorph text ];
-       testHaskellDepends = [
-         base containers HUnit test-framework test-framework-hunit text
-       ];
-       description = "Simple English clause creation from arbitrary words";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "miniutter_0_5_1_0" = callPackage
     ({ mkDerivation, base, binary, containers, HUnit, minimorph
      , test-framework, test-framework-hunit, text
      }:
@@ -163461,7 +163786,6 @@ self: {
        ];
        description = "Simple English clause creation from arbitrary words";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "minlen" = callPackage
@@ -164192,8 +164516,8 @@ self: {
      }:
      mkDerivation {
        pname = "mmsyn7h";
-       version = "0.7.2.0";
-       sha256 = "10mmc9gaq4wg9ixs1fwi7ga41lpiih5xx2w278fv6nli0p7flx3j";
+       version = "0.7.5.0";
+       sha256 = "17haan991lzs5qs4gzywhk4vpn9dvgasdm9ff8hzs5h6a0604sfn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -164226,8 +164550,8 @@ self: {
     ({ mkDerivation, base, mmsyn2, mmsyn5, mmsyn6ukr, vector }:
      mkDerivation {
        pname = "mmsyn7s";
-       version = "0.6.5.1";
-       sha256 = "0n5d3a3sscvasssi38nlbflqibjca2s95b6xyfmdwqn1n95bs6cy";
+       version = "0.6.6.0";
+       sha256 = "0hmsf7l3p2b2zj5ydjzxzkgqsj53yjwn71vgw8qzhbxjihk5x6l2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mmsyn2 mmsyn5 mmsyn6ukr vector ];
@@ -165281,27 +165605,6 @@ self: {
      }) {};
 
   "monad-logger" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, conduit-extra
-     , exceptions, fast-logger, lifted-base, monad-control, monad-loops
-     , mtl, resourcet, stm, stm-chans, template-haskell, text
-     , transformers, transformers-base, transformers-compat
-     , unliftio-core
-     }:
-     mkDerivation {
-       pname = "monad-logger";
-       version = "0.3.31";
-       sha256 = "0awr06bh5d51kci2w2xsj34qvh98sb6dm48a4k05k8awv8hrrpmd";
-       libraryHaskellDepends = [
-         base bytestring conduit conduit-extra exceptions fast-logger
-         lifted-base monad-control monad-loops mtl resourcet stm stm-chans
-         template-haskell text transformers transformers-base
-         transformers-compat unliftio-core
-       ];
-       description = "A class of monads which can log messages";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "monad-logger_0_3_32" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
      , exceptions, fast-logger, lifted-base, monad-control, monad-loops
      , mtl, resourcet, stm, stm-chans, template-haskell, text
@@ -165320,7 +165623,6 @@ self: {
        ];
        description = "A class of monads which can log messages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-logger-json" = callPackage
@@ -173055,18 +173357,18 @@ self: {
     ({ mkDerivation, async, base, binary, binary-conduit, bytestring
      , conduit, conduit-extra, data-default-class
      , data-default-instances-base, data-msgpack, data-msgpack-types
-     , exceptions, hspec, MissingH, monad-control, mtl, network, tagged
-     , text
+     , exceptions, hspec, monad-control, mtl, network, tagged, text
+     , unliftio-core
      }:
      mkDerivation {
        pname = "network-msgpack-rpc";
-       version = "0.0.5";
-       sha256 = "0lrlq5amcgg84ja2wjxkqm9llsbpsj6n0zrk7vvfjcra144b39rq";
+       version = "0.0.6";
+       sha256 = "1rris7vsls5cxagx3gx8aa3np7fld4dqyhcqczc7dwxcnkzj3c78";
        libraryHaskellDepends = [
          base binary binary-conduit bytestring conduit conduit-extra
          data-default-class data-default-instances-base data-msgpack
-         data-msgpack-types exceptions MissingH monad-control mtl network
-         tagged text
+         data-msgpack-types exceptions monad-control mtl network tagged text
+         unliftio-core
        ];
        testHaskellDepends = [ async base bytestring hspec mtl network ];
        description = "A MessagePack-RPC Implementation";
@@ -176766,18 +177068,16 @@ self: {
      }) {};
 
   "objective" = callPackage
-    ({ mkDerivation, base, containers, exceptions, free, hashable
+    ({ mkDerivation, base, bifunctors, containers, exceptions, hashable
      , monad-skeleton, mtl, profunctors, template-haskell, transformers
      , transformers-compat, unordered-containers, void, witherable
      }:
      mkDerivation {
        pname = "objective";
-       version = "1.1.2";
-       sha256 = "0i36r3ygwpzb57ga0jjkp9rzikpsp15l777dclp7yi1zvqz2ikrg";
-       revision = "1";
-       editedCabalFile = "039j3xac9ish0yk4w04bmip6g9p6ndfd9ngh46ya125ms4nhmyj4";
+       version = "1.2";
+       sha256 = "0qbms1n31zafakhn6y0hdy1a3bv7l3z4gzfqc1iczbwnxamiiq0q";
        libraryHaskellDepends = [
-         base containers exceptions free hashable monad-skeleton mtl
+         base bifunctors containers exceptions hashable monad-skeleton mtl
          profunctors template-haskell transformers transformers-compat
          unordered-containers void witherable
        ];
@@ -177295,6 +177595,20 @@ self: {
        broken = true;
      }) {};
 
+  "om-fail" = callPackage
+    ({ mkDerivation, base, monad-logger, safe-exceptions, transformers
+     }:
+     mkDerivation {
+       pname = "om-fail";
+       version = "0.1.0.2";
+       sha256 = "0wv102jpyi69xij2rwzrz5pdlc7pxad0wqsf0zfj15sfl1cnwya6";
+       libraryHaskellDepends = [
+         base monad-logger safe-exceptions transformers
+       ];
+       description = "Monad transformer providing MonadFail";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "omaketex" = callPackage
     ({ mkDerivation, base, optparse-applicative, shakespeare-text
      , shelly, text
@@ -178386,15 +178700,15 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
-  "opentelemetry_0_1_0" = callPackage
+  "opentelemetry_0_2_0" = callPackage
     ({ mkDerivation, async, base, bytestring, clock, directory
      , exceptions, hashable, random, stm, tasty, tasty-discover
      , tasty-hunit, tasty-quickcheck, text, unordered-containers
      }:
      mkDerivation {
        pname = "opentelemetry";
-       version = "0.1.0";
-       sha256 = "032dx71zdgsi1qpj948s55j3da0vdqms292166yvdg9h8vl5ji53";
+       version = "0.2.0";
+       sha256 = "1nxkghxwjkgvdk6xhpssa7aifryn6rr0agbhyc0ybf2c76r1pr8b";
        libraryHaskellDepends = [
          base bytestring clock directory exceptions hashable random stm text
          unordered-containers
@@ -178408,6 +178722,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "opentelemetry-http-client" = callPackage
+    ({ mkDerivation, base, http-client, http-types, opentelemetry, text
+     }:
+     mkDerivation {
+       pname = "opentelemetry-http-client";
+       version = "0.2.0";
+       sha256 = "1z2fdlfc1hqzd9aypvrvyrc5547fvmfigh1wnsnbb9gswbckf6iy";
+       libraryHaskellDepends = [
+         base http-client http-types opentelemetry text
+       ];
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "opentelemetry-lightstep" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, exceptions
      , http-client, http-client-tls, http-types, network, opentelemetry
@@ -178415,8 +178742,8 @@ self: {
      }:
      mkDerivation {
        pname = "opentelemetry-lightstep";
-       version = "0.1.0";
-       sha256 = "01l463xfwn40j3jd54hvmbx0csgjg853j39r38clzwknxsfq60cb";
+       version = "0.2.0";
+       sha256 = "03fv2lgwkqngp26rdrk2fzvnccdgjc7xsv3sl3adb3xwzppkn0xh";
        libraryHaskellDepends = [
          aeson async base bytestring exceptions http-client http-client-tls
          http-types network opentelemetry scientific stm text
@@ -178428,6 +178755,16 @@ self: {
        broken = true;
      }) {};
 
+  "opentelemetry-wai" = callPackage
+    ({ mkDerivation, base, http-types, opentelemetry, text, wai }:
+     mkDerivation {
+       pname = "opentelemetry-wai";
+       version = "0.2.0";
+       sha256 = "1n27g8xjij05g7xxx8z50k39nmclhm707xs2pfqy830zdq1ldfl4";
+       libraryHaskellDepends = [ base http-types opentelemetry text wai ];
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "opentheory" = callPackage
     ({ mkDerivation, base, opentheory-primitive, QuickCheck }:
      mkDerivation {
@@ -179462,8 +179799,8 @@ self: {
     ({ mkDerivation, base, hashable, lucid, org-mode, text }:
      mkDerivation {
        pname = "org-mode-lucid";
-       version = "1.0.1";
-       sha256 = "102hn0r18nm6l9m976bl6qfqwrdj3vmn0f2j32vrxkkybwfjwdkh";
+       version = "1.1.0";
+       sha256 = "066mdm9a7dkz6yy9g2yhqalvxrxhak1mw0awag3ivswv6djf528q";
        libraryHaskellDepends = [ base hashable lucid org-mode text ];
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -181208,8 +181545,8 @@ self: {
     ({ mkDerivation }:
      mkDerivation {
        pname = "pandora";
-       version = "0.2.2";
-       sha256 = "16aisw2cafa25hm3si7g0xzai9j602gggd8yz8ixrrhly9jhw0cd";
+       version = "0.2.3";
+       sha256 = "1sk8hhw3ad0jb2ik787pqjgaprd78k7qc0m0chcji3z5bprxp1cw";
        description = "A box of patterns and paradigms";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -181427,8 +181764,8 @@ self: {
      }:
      mkDerivation {
        pname = "pantry";
-       version = "0.3.0.0";
-       sha256 = "0j4ryr3wz2wlfsn9qf0cjbk91iwas89rci3x55cnf8s8ppx159am";
+       version = "0.4.0.0";
+       sha256 = "11n0xrk5258inzzikbapsv7752396qsrgaaf5kimpzgb67cs9k5j";
        libraryHaskellDepends = [
          aeson ansi-terminal base bytestring Cabal casa-client casa-types
          conduit conduit-extra containers cryptonite cryptonite-conduit
@@ -182900,8 +183237,8 @@ self: {
      }:
      mkDerivation {
        pname = "partial-order";
-       version = "0.1.2.1";
-       sha256 = "15y3593fl5gabcf0qzyfql30v80sninv1f79dz4v2ll89dzwfzg3";
+       version = "0.2.0.0";
+       sha256 = "1j65vhgas602fzmrjzxg7fvkmqclzxdni8yn0699l7ni6miv8pxj";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [
          base containers HUnit test-framework test-framework-hunit
@@ -185677,32 +186014,6 @@ self: {
      }) {};
 
   "persistent-typed-db" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec
-     , http-api-data, monad-logger, path-pieces, persistent
-     , persistent-template, resource-pool, resourcet, template-haskell
-     , text, transformers
-     }:
-     mkDerivation {
-       pname = "persistent-typed-db";
-       version = "0.1.0.0";
-       sha256 = "0wlz2d6v4ks376amp26fxw5wj381kqaghp25mry073krc7yqz6yv";
-       libraryHaskellDepends = [
-         aeson base bytestring conduit http-api-data monad-logger
-         path-pieces persistent persistent-template resource-pool resourcet
-         template-haskell text transformers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring conduit esqueleto hspec http-api-data
-         monad-logger path-pieces persistent persistent-template
-         resource-pool resourcet template-haskell text transformers
-       ];
-       description = "Type safe access to multiple database schemata";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "persistent-typed-db_0_1_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec
      , http-api-data, monad-logger, path-pieces, persistent
      , persistent-template, resource-pool, resourcet, template-haskell
@@ -188466,6 +188777,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "plaid" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, casing, conduit
+     , conduit-extra, containers, either, errors, hspec, hspec-wai
+     , hspec-wai-json, http-client, http-client-tls, http-conduit
+     , http-types, microlens, microlens-th, mtl, network, pretty-simple
+     , QuickCheck, raw-strings-qq, safe-exceptions, text, time
+     , transformers, wai
+     }:
+     mkDerivation {
+       pname = "plaid";
+       version = "0.1.0.0";
+       sha256 = "125427rhy5xlaw3qinrazyyj39z4g0rbnhm2k4jrgp1jgba91lc3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring casing containers http-client-tls
+         http-conduit microlens microlens-th mtl network pretty-simple
+         raw-strings-qq safe-exceptions text time
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring conduit conduit-extra either http-client
+         http-client-tls microlens microlens-th mtl network pretty-simple
+         safe-exceptions text time transformers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers errors hspec hspec-wai
+         hspec-wai-json http-types microlens microlens-th pretty-simple
+         QuickCheck text time wai
+       ];
+       description = "Plaid.com api integration library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "plailude" = callPackage
     ({ mkDerivation, base, bytestring, mtl, time, unix }:
      mkDerivation {
@@ -189081,8 +189425,8 @@ self: {
      }:
      mkDerivation {
        pname = "plugins-multistage";
-       version = "0.6.2";
-       sha256 = "1cjy71s9whjkc8lrb29v5hbkak1jf36ng3xhqszdag887f2mk22b";
+       version = "0.6.3";
+       sha256 = "08m73a30alspw1dk33qvp5i0yqq7xlzkj2dsvs77myk9f1sp1ywx";
        libraryHaskellDepends = [
          base directory ghc ghci process template-haskell th-desugar
        ];
@@ -189841,6 +190185,8 @@ self: {
        pname = "polysemy";
        version = "1.3.0.0";
        sha256 = "0p5g1n5b0dfkadqpqf2ka25dblimwqhxwx5ax0mxwixb0jwd0pvb";
+       revision = "1";
+       editedCabalFile = "02fkrfdn7pwslc9yffgx3fis8ag36m3dhigw67ns1s16gsf5a7dz";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          async base containers first-class-families mtl QuickCheck stm syb
@@ -189965,8 +190311,8 @@ self: {
     ({ mkDerivation, base, containers, deepseq, polyparse, tagsoup }:
      mkDerivation {
        pname = "polysoup";
-       version = "0.6.3";
-       sha256 = "0j2gk5x3njgv7x86p80f0zrsvzxcsn7x9l78swmgwcfkfy4j5xls";
+       version = "0.6.4";
+       sha256 = "0kgagizdn47xdnvmkwn5h3c78mdsh95siq2cyp9bga22pqhj4sid";
        libraryHaskellDepends = [
          base containers deepseq polyparse tagsoup
        ];
@@ -190646,8 +190992,8 @@ self: {
      }:
      mkDerivation {
        pname = "posix-api";
-       version = "0.3.3.0";
-       sha256 = "0a4npmhgnpq7ya21zijsxhyndr9swlknh6v7rn6y9qbva4q3gjx7";
+       version = "0.3.4.0";
+       sha256 = "163bblw200jr2vghc7i9g9xls6vhihayxvb4am4lr3j047ifqbmb";
        libraryHaskellDepends = [
          base byteslice primitive primitive-addr primitive-offset
          primitive-unlifted
@@ -194273,8 +194619,8 @@ self: {
     ({ mkDerivation, base, comonad, lawz, profunctors }:
      mkDerivation {
        pname = "profunctor-arrows";
-       version = "0.0.0.3";
-       sha256 = "09hn8llfbwgj56mvwyiyk4n3myy0s4lixrzgi3sm4q1ypg4w0dz2";
+       version = "0.0.1";
+       sha256 = "136d594l4magjibq44fs64bqafvcdy8jm2gijs6x1whpab0vl44k";
        libraryHaskellDepends = [ base comonad lawz profunctors ];
        description = "Profunctor arrows";
        license = stdenv.lib.licenses.bsd3;
@@ -194322,31 +194668,27 @@ self: {
      }) {};
 
   "profunctor-optics" = callPackage
-    ({ mkDerivation, adjunctions, base, connections, containers
-     , distributive, doctest, hedgehog, ilist, keys, magmas, mtl
-     , newtype-generics, profunctor-arrows, profunctors, rings
-     , semigroupoids, tagged, transformers, unliftio-core
+    ({ mkDerivation, adjunctions, base, coapplicative, distributive
+     , doctest, lawz, mtl, newtype-generics, profunctors, rings
+     , semigroupoids, tagged, transformers
      }:
      mkDerivation {
        pname = "profunctor-optics";
-       version = "0.0.1";
-       sha256 = "12f8v0bv6ra8smpjbcj8qlzm1fq4hzn1f2807f2jkcjz5s9a6wf5";
+       version = "0.0.2";
+       sha256 = "0x9cq3z1ixxgc85xf0387f5rsdwrm53qwzmcfm0b0z8gj38qaa5r";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         adjunctions base connections distributive keys magmas mtl
-         newtype-generics profunctor-arrows profunctors rings semigroupoids
-         tagged transformers unliftio-core
+         adjunctions base coapplicative distributive lawz mtl
+         newtype-generics profunctors rings semigroupoids tagged
+         transformers
        ];
-       executableHaskellDepends = [
-         adjunctions base connections containers doctest ilist mtl
-       ];
-       testHaskellDepends = [ base connections hedgehog ];
-       description = "An optics library compatible with the typeclasses in 'profunctors'";
+       executableHaskellDepends = [ base doctest mtl ];
+       description = "A compact optics library compatible with the typeclasses in profunctors";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
-     }) {};
+     }) {coapplicative = null;};
 
   "profunctors" = callPackage
     ({ mkDerivation, base, base-orphans, bifunctors, comonad
@@ -196581,6 +196923,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "purescript-bridge_0_14_0_0" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath
+     , generic-deriving, hspec, hspec-expectations-pretty-diff, lens
+     , mtl, text, transformers
+     }:
+     mkDerivation {
+       pname = "purescript-bridge";
+       version = "0.14.0.0";
+       sha256 = "1gplvmkx2c8ksk25wdinhwwbmqa5czbd4nwdgn4sa9ci10f2i4a3";
+       libraryHaskellDepends = [
+         base containers directory filepath generic-deriving lens mtl text
+         transformers
+       ];
+       testHaskellDepends = [
+         base containers hspec hspec-expectations-pretty-diff text
+       ];
+       description = "Generate PureScript data types from Haskell data types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "purescript-bundle-fast" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , optparse-applicative, text, vector
@@ -200110,6 +200473,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rank2classes_1_4" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-doctest, distributive, doctest
+     , markdown-unlit, tasty, tasty-hunit, template-haskell
+     , transformers
+     }:
+     mkDerivation {
+       pname = "rank2classes";
+       version = "1.4";
+       sha256 = "0h8ysf32nw28aqhnnq2cckagwfrri4k44p3pzhhlp6lvhckvqnq1";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base distributive template-haskell transformers
+       ];
+       testHaskellDepends = [
+         base distributive doctest tasty tasty-hunit
+       ];
+       testToolDepends = [ markdown-unlit ];
+       description = "standard type constructor class hierarchy, only with methods of rank 2 types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rapid" = callPackage
     ({ mkDerivation, async, base, containers, foreign-store, stm }:
      mkDerivation {
@@ -200555,8 +200940,8 @@ self: {
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "9.0.7";
-       sha256 = "0kgg1qfhgjajzrw22yvcxmiim14pxr2gim1aak3ivnmhn4yff4fg";
+       version = "9.0.8";
+       sha256 = "1a98zy1n6dlxxyfdganqfcx8hw04i4hjwdj8ggdd4g0jky62jaz2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -205609,8 +205994,8 @@ self: {
      }:
      mkDerivation {
        pname = "require";
-       version = "0.4.3";
-       sha256 = "0j6dsyqx637b5p8jmk5h4b0qham0m8m74c8b8y1dywm0c5daayca";
+       version = "0.4.4";
+       sha256 = "1y7n1dyccwfy5fplinw72fsq1vjzp5nrngvr5g08yfqykaidpc8r";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -205635,6 +206020,30 @@ self: {
        broken = true;
      }) {};
 
+  "rere" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, clock
+     , containers, criterion, derp, fin, parsec, QuickCheck
+     , quickcheck-instances, tasty, tasty-quickcheck, transformers, vec
+     }:
+     mkDerivation {
+       pname = "rere";
+       version = "0.1";
+       sha256 = "0hskndalxqmlwscvacqmp7gbp8m75a8hnvbifw0hw7hhszlf0yac";
+       libraryHaskellDepends = [
+         base containers fin parsec QuickCheck transformers vec
+       ];
+       testHaskellDepends = [
+         base containers QuickCheck quickcheck-instances tasty
+         tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         aeson attoparsec base bytestring clock containers criterion derp
+         fin parsec vec
+       ];
+       description = "Regular-expressions extended with fixpoints for context-free powers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "rerebase" = callPackage
     ({ mkDerivation, rebase }:
      mkDerivation {
@@ -205950,24 +206359,6 @@ self: {
      }) {};
 
   "resourcet" = callPackage
-    ({ mkDerivation, base, containers, exceptions, hspec, mtl
-     , primitive, transformers, unliftio-core
-     }:
-     mkDerivation {
-       pname = "resourcet";
-       version = "1.2.2";
-       sha256 = "1rfbfcv3r1h29y0yqr3x6a1s04lbc3vzm3jqnfg4f9rqp9d448qk";
-       revision = "1";
-       editedCabalFile = "18v6frks5zr64hpq8dprbk6dxpq4ykijp1xg00ghp7qz060f1r0i";
-       libraryHaskellDepends = [
-         base containers exceptions mtl primitive transformers unliftio-core
-       ];
-       testHaskellDepends = [ base exceptions hspec transformers ];
-       description = "Deterministic allocation and freeing of scarce resources";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "resourcet_1_2_3" = callPackage
     ({ mkDerivation, base, containers, exceptions, hspec, mtl
      , primitive, transformers, unliftio-core
      }:
@@ -205981,7 +206372,6 @@ self: {
        testHaskellDepends = [ base exceptions hspec transformers ];
        description = "Deterministic allocation and freeing of scarce resources";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "respond" = callPackage
@@ -207266,45 +207656,21 @@ self: {
 
   "rings" = callPackage
     ({ mkDerivation, adjunctions, base, containers, distributive, lawz
-     , magmas, semigroupoids
+     , magmas, profunctors, semigroupoids
      }:
      mkDerivation {
        pname = "rings";
-       version = "0.1.2";
-       sha256 = "0rci487ycp44h3qqpnwz9z429xwhsj4andsvcdpisbns56mw6rqd";
+       version = "0.1.3";
+       sha256 = "0w0jvmj7x62fs0k5vah47mbdasiqjs9kphvrfbdma4i59899w5y1";
        libraryHaskellDepends = [
-         adjunctions base containers distributive lawz magmas semigroupoids
+         adjunctions base containers distributive lawz magmas profunctors
+         semigroupoids
        ];
        description = "Ring-like objects";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "rio" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, directory
-     , exceptions, filepath, hashable, hspec, microlens, mtl, primitive
-     , process, QuickCheck, text, time, typed-process, unix, unliftio
-     , unliftio-core, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "rio";
-       version = "0.1.14.0";
-       sha256 = "1ss0lbdrmiblxza8lv51kpdw51s7m5qaihxlvf1jp4qg4amdayxw";
-       libraryHaskellDepends = [
-         base bytestring containers deepseq directory exceptions filepath
-         hashable microlens mtl primitive process text time typed-process
-         unix unliftio unliftio-core unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers deepseq directory exceptions filepath
-         hashable hspec microlens mtl primitive process QuickCheck text time
-         typed-process unix unliftio unliftio-core unordered-containers
-         vector
-       ];
-       description = "A standard library for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "rio_0_1_14_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, directory
      , exceptions, filepath, hashable, hspec, microlens, mtl, primitive
      , process, QuickCheck, text, time, typed-process, unix, unliftio
@@ -207327,7 +207693,6 @@ self: {
        ];
        description = "A standard library for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rio-orphans" = callPackage
@@ -208283,24 +208648,24 @@ self: {
      }:
      mkDerivation {
        pname = "rose-trees";
-       version = "0.0.4.4";
-       sha256 = "1kbjkfknl2pyp30n5c6m6xavqlm8zg06w78b3x7iwvi854yi64r3";
+       version = "0.0.4.5";
+       sha256 = "0ql6wdsq1dpx0bbgs6798c6h4wyw9xcbr64shr7pvl9fwivdl6j7";
        libraryHaskellDepends = [
          base containers deepseq hashable mtl QuickCheck
          quickcheck-instances semigroupoids semigroups sets
          unordered-containers witherable
        ];
        testHaskellDepends = [
-         base containers deepseq hashable QuickCheck quickcheck-instances
-         semigroupoids semigroups sets tasty tasty-quickcheck
-         unordered-containers witherable
+         base containers deepseq hashable mtl QuickCheck
+         quickcheck-instances semigroupoids semigroups sets tasty
+         tasty-quickcheck unordered-containers witherable
        ];
        benchmarkHaskellDepends = [
          base containers criterion deepseq hashable mtl QuickCheck
          quickcheck-instances semigroupoids semigroups sets
          unordered-containers witherable
        ];
-       description = "A collection of rose tree structures";
+       description = "Various trie implementations in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -210175,8 +210540,6 @@ self: {
        ];
        description = "Cryptography that's easy to digest (NaCl/libsodium bindings)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {inherit (pkgs) libsodium;};
 
   "saltine-quickcheck" = callPackage
@@ -212591,25 +212954,6 @@ self: {
      }) {};
 
   "sdl2-ttf" = callPackage
-    ({ mkDerivation, base, bytestring, SDL2, sdl2, SDL2_ttf
-     , template-haskell, text, transformers
-     }:
-     mkDerivation {
-       pname = "sdl2-ttf";
-       version = "2.1.0";
-       sha256 = "1xw05jgv6x9xplahwf3jjdq6v3mha4s7bb27kn8x66764glnyrf7";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring sdl2 template-haskell text transformers
-       ];
-       libraryPkgconfigDepends = [ SDL2 SDL2_ttf ];
-       description = "Bindings to SDL2_ttf";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "i686-linux" "x86_64-linux" ];
-     }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;};
-
-  "sdl2-ttf_2_1_1" = callPackage
     ({ mkDerivation, base, bytestring, SDL2, sdl2, SDL2_ttf
      , template-haskell, text, transformers
      }:
@@ -212626,7 +212970,6 @@ self: {
        description = "Bindings to SDL2_ttf";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "i686-linux" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;};
 
   "sdnv" = callPackage
@@ -216480,8 +216823,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-snap";
-       version = "0.8.4.1";
-       sha256 = "1649s1n313rd8h409bfz2jkq2ch7ffw06y120j95rjcp6r8xgfv2";
+       version = "0.8.5";
+       sha256 = "12ihxmi6c6zypzx6ijj0yhl0mppk40zkyhkv3g3kx3mgx50qs5yq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -217119,6 +217462,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "serverless-haskell_0_10_2" = callPackage
+    ({ mkDerivation, aeson, aeson-casing, amazonka-core
+     , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive
+     , hspec, hspec-discover, http-types, iproute, lens, network
+     , network-simple, raw-strings-qq, text, time, unix
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "serverless-haskell";
+       version = "0.10.2";
+       sha256 = "1iy69394dqv38dlh71m8sarcfps9gaaq90zpc4f169vnhpr59wak";
+       libraryHaskellDepends = [
+         aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base
+         bytestring case-insensitive http-types iproute lens network
+         network-simple text time unix unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base
+         bytestring case-insensitive hspec hspec-discover http-types iproute
+         lens network network-simple raw-strings-qq text time unix
+         unordered-containers
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Deploying Haskell code onto AWS Lambda using Serverless";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "serversession" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , containers, data-default, hashable, hspec, nonce, path-pieces
@@ -217968,6 +218339,22 @@ self: {
        broken = true;
      }) {};
 
+  "sha1" = callPackage
+    ({ mkDerivation, base, bytebuild, byteslice, natural-arithmetic
+     , primitive, small-bytearray-builder
+     }:
+     mkDerivation {
+       pname = "sha1";
+       version = "0.1.0.2";
+       sha256 = "14jy1g6pm4vnq7rhg4z1yazazk9vfav7nn8saxkddxaflaax4llf";
+       libraryHaskellDepends = [ base bytebuild byteslice primitive ];
+       testHaskellDepends = [
+         base byteslice natural-arithmetic primitive small-bytearray-builder
+       ];
+       description = "SHA-1 Hash";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "shade" = callPackage
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
@@ -218124,6 +218511,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "shake-bindist" = callPackage
+    ({ mkDerivation, archive-sig, archive-tar, base, bytestring, bz2
+     , lzlib, shake, zlib, zstd
+     }:
+     mkDerivation {
+       pname = "shake-bindist";
+       version = "0.1.0.0";
+       sha256 = "0f2w7bbnnigfjpfywljl6k2gcz1rq99lfz7cig0076rbjg7aifii";
+       revision = "2";
+       editedCabalFile = "0bk1r9qn41xhhjisvahs0fdsfiv79rb1yk545ry0vw83d0af6kl8";
+       libraryHaskellDepends = [
+         archive-sig archive-tar base bytestring bz2 lzlib shake zlib zstd
+       ];
+       description = "Rules for binary distributions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "shake-c" = callPackage
     ({ mkDerivation, base, cdeps, composition-prelude, shake }:
      mkDerivation {
@@ -221625,6 +222029,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "skylighting-lucid" = callPackage
+    ({ mkDerivation, base, containers, lucid, skylighting-core, text }:
+     mkDerivation {
+       pname = "skylighting-lucid";
+       version = "1.0.0";
+       sha256 = "09wh0dh8glnb051hdbcf4q4v3nflikgc585acqin8kq7zny7ps72";
+       libraryHaskellDepends = [
+         base containers lucid skylighting-core text
+       ];
+       description = "Lucid support for Skylighting";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "skylighting-modding" = callPackage
     ({ mkDerivation, base, containers, skylighting-core, text }:
      mkDerivation {
@@ -222796,10 +223213,8 @@ self: {
      }:
      mkDerivation {
        pname = "snap";
-       version = "1.1.2.0";
-       sha256 = "05da0dg0p6djcsinycih50hjnircibmicarwg2vr14a7zbrhynps";
-       revision = "2";
-       editedCabalFile = "13hx2wghxrranxxv5qp8a5maqd203q15k3qg4fafjzhyh3wf6a67";
+       version = "1.1.3.0";
+       sha256 = "09iwyam3k9a90xm99pm54h74f8llfz2jm0i8rrdqwayjy5xq2w3i";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring cereal clientsession configurator
          containers directory directory-tree dlist fail filepath hashable
@@ -222819,8 +223234,6 @@ self: {
        ];
        description = "Top-level package for the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "snap-accept" = callPackage
@@ -224443,8 +224856,8 @@ self: {
        pname = "soap-openssl";
        version = "0.1.0.2";
        sha256 = "03w389yhybzvc06gpxigibqga9mr7m41rkg1ki3n686j9xzm8210";
-       revision = "1";
-       editedCabalFile = "1b3aivn9jfaax00id7x4cqvpmd6lgynslchlry0qsmq1lj466cdf";
+       revision = "2";
+       editedCabalFile = "0zhl8x57y35ymhpznrsn2yrgc3bigjn5mabwl4nvprpznb2x44vn";
        libraryHaskellDepends = [
          base configurator data-default HsOpenSSL http-client
          http-client-openssl soap text
@@ -226714,8 +227127,8 @@ self: {
      }:
      mkDerivation {
        pname = "sqlite-simple";
-       version = "0.4.17.0";
-       sha256 = "1bd1883kn2bvzglqg3l2yjcd94liv36181ib8g40k34zdm67wvbz";
+       version = "0.4.18.0";
+       sha256 = "00icsf8pgrcqcn5562lmn12yz1f16a2v2q6bl90iknvjyrk1hgzp";
        libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-textual bytestring containers
          direct-sqlite Only semigroups template-haskell text time
@@ -227287,6 +227700,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stache_2_1_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , deepseq, directory, file-embed, filepath, hspec, hspec-discover
+     , hspec-megaparsec, megaparsec, mtl, template-haskell, text
+     , unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "stache";
+       version = "2.1.1";
+       sha256 = "06pn7pm5vgk9f4bsh3m29cik514nv5w655ip04k7p5jv9xgmn4ld";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers deepseq directory filepath
+         megaparsec mtl template-haskell text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers file-embed hspec hspec-megaparsec
+         megaparsec template-haskell text yaml
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         aeson base criterion deepseq megaparsec text
+       ];
+       description = "Mustache templates for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stack" = callPackage
     ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array
      , async, attoparsec, base, base64-bytestring, bytestring, Cabal
@@ -229892,6 +230333,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stratosphere_0_50_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
+     , hashable, hspec, hspec-discover, lens, template-haskell, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "stratosphere";
+       version = "0.50.0";
+       sha256 = "0nxvrfi3jp0p874gkj25rdlfsb2rskp82bz58c0rply0s5rivlfl";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring containers hashable lens
+         template-haskell text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base bytestring containers hashable hspec
+         hspec-discover lens template-haskell text unordered-containers
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "EDSL for AWS CloudFormation";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stratum-tool" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, bytestring-builder
      , cmdargs, connection, containers, curl, curl-aeson, network, stm
@@ -235465,8 +235931,8 @@ self: {
      }:
      mkDerivation {
        pname = "tagsoup-navigate";
-       version = "0.1.0.4";
-       sha256 = "1mds95a0xz3iklidmvczjpmm9vjhzdrdvcj3dg0n3ivwwli672m9";
+       version = "0.1.0.7";
+       sha256 = "02qq2qc5xrsw6nf4hc02g9xkgdkx3ka7pack02dkhnbxj3jv03vw";
        libraryHaskellDepends = [
          base deriving-compat lens mmorph mtl semigroupoids semigroups
          tagsoup tagsoup-selection transformers
@@ -238938,6 +239404,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tex-join-bib" = callPackage
+    ({ mkDerivation, async, base, containers, foldl, optparse-generic
+     , system-filepath, text, turtle
+     }:
+     mkDerivation {
+       pname = "tex-join-bib";
+       version = "0.1.0.0";
+       sha256 = "1dlks58g9jfkcsdlcjyqw8rh27j1c66crb39s53ar7w6p08invk1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base containers foldl system-filepath text turtle
+       ];
+       executableHaskellDepends = [
+         base optparse-generic system-filepath text
+       ];
+       description = "Compile separate tex files with the same bibliography";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "tex2txt" = callPackage
     ({ mkDerivation, base, containers, deepseq, parsec }:
      mkDerivation {
@@ -245783,8 +246269,8 @@ self: {
      }:
      mkDerivation {
        pname = "tries";
-       version = "0.0.6";
-       sha256 = "0765my34c8fcd8ri9acrcymgpjfqqq7a98zr94z8czrnh5zsmzjv";
+       version = "0.0.6.1";
+       sha256 = "0sb4bj2dd88890hg8k3z0kpl1zk1d1r70sspviylzp6b26q3gyvm";
        libraryHaskellDepends = [
          base bytestring composition containers deepseq hashable keys
          QuickCheck quickcheck-instances rose-trees semigroups sets
@@ -246785,6 +247271,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "turtle_1_5_17" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
+     , containers, criterion, directory, doctest, exceptions, fail
+     , foldl, hostname, managed, optional-args, optparse-applicative
+     , process, semigroups, stm, streaming-commons, system-fileio
+     , system-filepath, temporary, text, time, transformers, unix
+     , unix-compat
+     }:
+     mkDerivation {
+       pname = "turtle";
+       version = "1.5.17";
+       sha256 = "0chj4issjbkdkj1jbcpi8v104784qnzvkq81a4wcdijk09biphq7";
+       libraryHaskellDepends = [
+         ansi-wl-pprint async base bytestring clock containers directory
+         exceptions foldl hostname managed optional-args
+         optparse-applicative process semigroups stm streaming-commons
+         system-fileio system-filepath temporary text time transformers unix
+         unix-compat
+       ];
+       testHaskellDepends = [
+         base doctest fail system-filepath temporary
+       ];
+       benchmarkHaskellDepends = [ base criterion text ];
+       description = "Shell programming, Haskell-style";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "turtle-options" = callPackage
     ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle
      }:
@@ -248663,8 +249177,8 @@ self: {
      }:
      mkDerivation {
        pname = "typesafe-precure";
-       version = "0.7.6.2";
-       sha256 = "0nhb8v17ycjjldcvhyjc1qk7r4hqhqdw6gw9fp0mbvn5cbpi0xrm";
+       version = "0.7.7.1";
+       sha256 = "0yjw4fm7n7qdb9rib7q5nirnw0cdvqy2g05lidxw5pkgdbi9np3m";
        libraryHaskellDepends = [
          aeson aeson-pretty autoexporter base bytestring dlist
          monad-skeleton template-haskell text th-data-compat
@@ -250318,13 +250832,13 @@ self: {
 
   "unity-testresult-parser" = callPackage
     ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers
-     , mtl, optparse-applicative, split, text, unordered-containers
-     , xml-conduit
+     , mtl, optparse-applicative, semigroups, split, text
+     , unordered-containers, xml-conduit
      }:
      mkDerivation {
        pname = "unity-testresult-parser";
-       version = "0.1.0.3";
-       sha256 = "1521dv3d7ssqzy8vf4y55dzg0w192667kqia0f0w76magnwhk8ic";
+       version = "0.1.0.10";
+       sha256 = "0mb7q5lqkn11s11s8w6a4anmbsf3z4c66bg78j1dnwkqivx02k0b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -250332,8 +250846,8 @@ self: {
          xml-conduit
        ];
        executableHaskellDepends = [
-         ansi-terminal ansi-wl-pprint base mtl optparse-applicative split
-         text
+         ansi-terminal ansi-wl-pprint base mtl optparse-applicative
+         semigroups split text
        ];
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -250777,31 +251291,6 @@ self: {
      }) {};
 
   "unliftio" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, deepseq
-     , directory, filepath, gauge, hspec, process, QuickCheck, stm, time
-     , transformers, unix, unliftio-core
-     }:
-     mkDerivation {
-       pname = "unliftio";
-       version = "0.2.12";
-       sha256 = "02gy1zrxgzg4xmzm8lafsf1nyr3as1q20r8ld73xg3q7rkag9acg";
-       libraryHaskellDepends = [
-         async base bytestring deepseq directory filepath process stm time
-         transformers unix unliftio-core
-       ];
-       testHaskellDepends = [
-         async base bytestring containers deepseq directory filepath hspec
-         process QuickCheck stm time transformers unix unliftio-core
-       ];
-       benchmarkHaskellDepends = [
-         async base bytestring deepseq directory filepath gauge process stm
-         time transformers unix unliftio-core
-       ];
-       description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "unliftio_0_2_12_1" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, deepseq
      , directory, filepath, gauge, hspec, process, QuickCheck, stm, time
      , transformers, unix, unliftio-core
@@ -250824,7 +251313,6 @@ self: {
        ];
        description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unliftio-core" = callPackage
@@ -255510,28 +255998,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "vty_5_27" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
-     , deepseq, directory, filepath, hashable, HUnit, microlens
-     , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
-     , quickcheck-assertions, random, smallcheck, stm, string-qq
-     , terminfo, test-framework, test-framework-hunit
-     , test-framework-smallcheck, text, transformers, unix, utf8-string
-     , vector
+  "vty_5_28_1" = callPackage
+    ({ mkDerivation, ansi-terminal, base, binary, blaze-builder
+     , bytestring, Cabal, containers, deepseq, directory, filepath
+     , hashable, HUnit, microlens, microlens-mtl, microlens-th, mtl
+     , parallel, parsec, QuickCheck, quickcheck-assertions, random
+     , smallcheck, stm, string-qq, terminfo, test-framework
+     , test-framework-hunit, test-framework-smallcheck, text
+     , transformers, unix, utf8-string, vector
      }:
      mkDerivation {
        pname = "vty";
-       version = "5.27";
-       sha256 = "1iif1lcf59bypxlamla085bzrp3bl23jq2rcfzrjy6a3grywdgdl";
+       version = "5.28.1";
+       sha256 = "0hshmpa3n6936527wimxf3vi5v6gddp09kxjjmcxjwq39h9a640y";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base blaze-builder bytestring containers deepseq directory filepath
-         hashable microlens microlens-mtl microlens-th mtl parallel parsec
-         stm terminfo text transformers unix utf8-string vector
+         ansi-terminal base binary blaze-builder bytestring containers
+         deepseq directory filepath hashable microlens microlens-mtl
+         microlens-th mtl parallel parsec stm terminfo text transformers
+         unix utf8-string vector
        ];
        executableHaskellDepends = [
-         base containers microlens microlens-mtl mtl
+         base containers directory filepath microlens microlens-mtl mtl
        ];
        testHaskellDepends = [
          base blaze-builder bytestring Cabal containers deepseq HUnit
@@ -255975,18 +256464,18 @@ self: {
 
   "wai-enforce-https" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, hspec
-     , http-types, network, text, wai, wai-extra, warp, warp-tls
+     , http-types, network, text, wai, wai-extra
      }:
      mkDerivation {
        pname = "wai-enforce-https";
-       version = "0.0.1";
-       sha256 = "0gm4n57abmbawpij3hsn6ia283b75sn40387dimpp573q5nnnwmv";
+       version = "0.0.2";
+       sha256 = "0p3j438knirr32j6dhqscws93h3ygk6lvw97r489h8i1dip9rqll";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring case-insensitive http-types network text wai
        ];
-       executableHaskellDepends = [ base http-types wai warp warp-tls ];
        testHaskellDepends = [
          base bytestring case-insensitive hspec http-types wai wai-extra
        ];
@@ -255994,14 +256483,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "wai-enforce-https_0_0_2" = callPackage
+  "wai-enforce-https_0_0_2_1" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, hspec
      , http-types, network, text, wai, wai-extra
      }:
      mkDerivation {
        pname = "wai-enforce-https";
-       version = "0.0.2";
-       sha256 = "0p3j438knirr32j6dhqscws93h3ygk6lvw97r489h8i1dip9rqll";
+       version = "0.0.2.1";
+       sha256 = "1mbhk50j1a47ydg5kd6bj3nbzqfq1abm1d1vcxc3smw4fgf39g5x";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -262079,6 +262568,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xeno_0_4_1" = callPackage
+    ({ mkDerivation, array, base, bytestring, bytestring-mmap, bzlib
+     , criterion, deepseq, filepath, ghc-prim, hexml, hexpat, hspec, mtl
+     , mutable-containers, time, vector, weigh, xml
+     }:
+     mkDerivation {
+       pname = "xeno";
+       version = "0.4.1";
+       sha256 = "0pnmbi6w4l1i8m5vjxgxpcx98b5rphm32ykzcvgdnvahv8mrqycy";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array base bytestring deepseq mtl mutable-containers vector
+       ];
+       executableHaskellDepends = [
+         base bytestring bytestring-mmap deepseq hexml time weigh
+       ];
+       testHaskellDepends = [ base bytestring hexml hspec ];
+       benchmarkHaskellDepends = [
+         base bytestring bzlib criterion deepseq filepath ghc-prim hexml
+         hexpat weigh xml
+       ];
+       description = "A fast event-based XML parser in pure Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xenstore" = callPackage
     ({ mkDerivation, base, bytestring, cereal, mtl, network }:
      mkDerivation {
@@ -264517,6 +265034,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "yaml_0_11_3_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
+     , conduit, containers, directory, filepath, hspec, HUnit, libyaml
+     , mockery, mtl, raw-strings-qq, resourcet, scientific
+     , template-haskell, temporary, text, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "yaml";
+       version = "0.11.3.0";
+       sha256 = "01lafh83rp0v49f052vyv4gcbdgzcf42cmg0iqlykk6c586ksvh4";
+       configureFlags = [ "-fsystem-libyaml" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring conduit containers directory
+         filepath libyaml mtl resourcet scientific template-haskell text
+         transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base base-compat bytestring conduit containers
+         directory filepath hspec HUnit libyaml mockery mtl raw-strings-qq
+         resourcet scientific template-haskell temporary text transformers
+         unordered-containers vector
+       ];
+       description = "Support for parsing and rendering YAML documents";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yaml-combinators" = callPackage
     ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop
      , scientific, tasty, tasty-hunit, text, transformers
@@ -265960,43 +266507,6 @@ self: {
      }) {};
 
   "yesod-core" = callPackage
-    ({ mkDerivation, aeson, async, auto-update, base, blaze-html
-     , blaze-markup, bytestring, case-insensitive, cereal, clientsession
-     , conduit, conduit-extra, containers, cookie, deepseq, fast-logger
-     , gauge, hspec, hspec-expectations, http-types, HUnit, memory
-     , monad-logger, mtl, network, parsec, path-pieces, primitive
-     , random, resourcet, shakespeare, streaming-commons
-     , template-haskell, text, time, transformers, unix-compat, unliftio
-     , unordered-containers, vector, wai, wai-extra, wai-logger, warp
-     , word8
-     }:
-     mkDerivation {
-       pname = "yesod-core";
-       version = "1.6.17.2";
-       sha256 = "0rcfksbxnwcpg5qh9vjkddv39q95mx4nxzgix51bbwa128hhzcwf";
-       libraryHaskellDepends = [
-         aeson auto-update base blaze-html blaze-markup bytestring
-         case-insensitive cereal clientsession conduit conduit-extra
-         containers cookie deepseq fast-logger http-types memory
-         monad-logger mtl parsec path-pieces primitive random resourcet
-         shakespeare template-haskell text time transformers unix-compat
-         unliftio unordered-containers vector wai wai-extra wai-logger warp
-         word8
-       ];
-       testHaskellDepends = [
-         async base bytestring clientsession conduit conduit-extra
-         containers cookie hspec hspec-expectations http-types HUnit network
-         path-pieces random resourcet shakespeare streaming-commons
-         template-haskell text transformers unliftio wai wai-extra warp
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-html bytestring gauge shakespeare text
-       ];
-       description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-core_1_6_17_3" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-html
      , blaze-markup, bytestring, case-insensitive, cereal, clientsession
      , conduit, conduit-extra, containers, cookie, deepseq, fast-logger
@@ -266031,7 +266541,6 @@ self: {
        ];
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-crud" = callPackage
@@ -266265,8 +266774,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-fb";
-       version = "0.5.2";
-       sha256 = "0srvdipwrmqi3wh8z51432dgr3kpgi5iw9ikbahv6swvhs5k8w41";
+       version = "0.6.0";
+       sha256 = "0anhnbwc9j11lm2sh8wi15p160vb9g0ng8lqc6g8am61jsxxw40x";
        libraryHaskellDepends = [
          aeson base bytestring conduit fb http-client-tls http-conduit
          memory text wai yesod-core
@@ -268629,6 +269138,8 @@ self: {
        pname = "zenhack-prelude";
        version = "0.1.1.0";
        sha256 = "07njs4zb976zxyiwg03ijvn1wvmx188ys49gckwybg1kl824x11f";
+       revision = "1";
+       editedCabalFile = "0sj45k2v33x3312yz1bdbck2bcv5q64mh7v7xy35ghp72ynw1z8z";
        libraryHaskellDepends = [ base ];
        description = "@zenhack's personal custom prelude";
        license = stdenv.lib.licenses.mit;
@@ -269118,8 +269629,8 @@ self: {
      }:
      mkDerivation {
        pname = "zip";
-       version = "1.3.1";
-       sha256 = "11dbbmwn81j6zmjnlxqz748jd9ywd18nhzr5pqkgk5kd3n27rd0j";
+       version = "1.3.2";
+       sha256 = "0nmqp34w82wzlkip9zk05dy4yjnwy8dc2k7n1kq0rrdsb9zsc360";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -269137,7 +269648,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "zip_1_3_2" = callPackage
+  "zip_1_4_0" = callPackage
     ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
      , cereal, conduit, conduit-extra, containers, digest, directory
      , dlist, exceptions, filepath, hspec, monad-control, mtl
@@ -269146,8 +269657,8 @@ self: {
      }:
      mkDerivation {
        pname = "zip";
-       version = "1.3.2";
-       sha256 = "0nmqp34w82wzlkip9zk05dy4yjnwy8dc2k7n1kq0rrdsb9zsc360";
+       version = "1.4.0";
+       sha256 = "07g17n6fr86c6c5yhs8ml53mk0g032060vja620bp32irfm00m2r";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -269854,8 +270365,6 @@ self: {
        ];
        description = "Password strength estimation based on zxcvbn";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "zxcvbn-hs" = callPackage
@@ -269894,8 +270403,6 @@ self: {
        ];
        description = "Password strength estimation based on zxcvbn";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
 }

From d02ac6c485fefd5f2cb94456c0ec1b96c1e7cf92 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 13 Mar 2020 12:40:53 +0100
Subject: [PATCH 2947/4636] git-annex: update sha256 hash for new version
 8.20200309

---
 .../haskell-modules/configuration-common.nix  |   4 +-
 .../git-annex-fix-build-with-ghc-8.8.x.patch  | 125 ------------------
 2 files changed, 2 insertions(+), 127 deletions(-)
 delete mode 100644 pkgs/development/haskell-modules/patches/git-annex-fix-build-with-ghc-8.8.x.patch

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a89a704f99d5..90819d64c339 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -81,12 +81,12 @@ self: super: {
 
   # The Hackage tarball is purposefully broken, because it's not intended to be, like, useful.
   # https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/
-  git-annex = (overrideSrc (appendPatch super.git-annex ./patches/git-annex-fix-build-with-ghc-8.8.x.patch) {
+  git-annex = (overrideSrc super.git-annex {
     src = pkgs.fetchgit {
       name = "git-annex-${super.git-annex.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "0pl0yip7zp4i78cj9jqkmm33wqaaaxjq3ggnfmv95y79yijd6yh4";
+      sha256 = "0y2qcjahi705c6nnypqpa5w3bzyzk4kqvbwfnpiaxzk5vna589gg";
     };
   }).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;
diff --git a/pkgs/development/haskell-modules/patches/git-annex-fix-build-with-ghc-8.8.x.patch b/pkgs/development/haskell-modules/patches/git-annex-fix-build-with-ghc-8.8.x.patch
deleted file mode 100644
index e28a1f5949ee..000000000000
--- a/pkgs/development/haskell-modules/patches/git-annex-fix-build-with-ghc-8.8.x.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From f8d8959e43abd88c5e977079f0948e45cf4c0b0c Mon Sep 17 00:00:00 2001
-From: Peter Simons <simons@cryp.to>
-Date: Fri, 28 Feb 2020 11:56:48 +0100
-Subject: [PATCH] Fix build with ghc-8.8.x.
-
-The 'fail' method has been moved to the 'MonadFail' class. I made the changes
-so that the code still compiles with previous versions of 'base' that don't
-have the new MonadFail class exported by Prelude yet.
----
- CmdLine/GitAnnex/Options.hs | 5 +++--
- Command/Expire.hs           | 5 +++--
- Command/Init.hs             | 7 ++++---
- Utility/HumanTime.hs        | 5 +++--
- 4 files changed, 13 insertions(+), 9 deletions(-)
-
-diff --git a/CmdLine/GitAnnex/Options.hs b/CmdLine/GitAnnex/Options.hs
-index 030c83dd5..a9a36d76f 100644
---- a/CmdLine/GitAnnex/Options.hs
-+++ b/CmdLine/GitAnnex/Options.hs
-@@ -9,6 +9,7 @@
- 
- module CmdLine.GitAnnex.Options where
- 
-+import Control.Monad.Fail as Fail ( MonadFail(..) )
- import Options.Applicative
- import qualified Data.Map as M
- 
-@@ -215,8 +216,8 @@ parseAllOption = flag' WantAllKeys
- 	<> help "operate on all versions of all files"
- 	)
- 
--parseKey :: Monad m => String -> m Key
--parseKey = maybe (fail "invalid key") return . deserializeKey
-+parseKey :: MonadFail m => String -> m Key
-+parseKey = maybe (Fail.fail "invalid key") return . deserializeKey
- 
- -- Options to match properties of annexed files.
- annexedMatchingOptions :: [GlobalOption]
-diff --git a/Command/Expire.hs b/Command/Expire.hs
-index 83c38e569..37dc33883 100644
---- a/Command/Expire.hs
-+++ b/Command/Expire.hs
-@@ -17,6 +17,7 @@ import Annex.VectorClock
- import qualified Remote
- import Utility.HumanTime
- 
-+import Control.Monad.Fail as Fail ( MonadFail(..) )
- import Data.Time.Clock.POSIX
- import qualified Data.Map as M
- 
-@@ -105,9 +106,9 @@ parseExpire ps = do
- 		Nothing -> giveup $ "bad expire time: " ++ s
- 		Just d -> Just (now - durationToPOSIXTime d)
- 
--parseActivity :: Monad m => String -> m Activity
-+parseActivity :: MonadFail m => String -> m Activity
- parseActivity s = case readish s of
--	Nothing -> fail $ "Unknown activity. Choose from: " ++ 
-+	Nothing -> Fail.fail $ "Unknown activity. Choose from: " ++ 
- 		unwords (map show [minBound..maxBound :: Activity])
- 	Just v -> return v
- 
-diff --git a/Command/Init.hs b/Command/Init.hs
-index db6cb14fb..879a1110f 100644
---- a/Command/Init.hs
-+++ b/Command/Init.hs
-@@ -13,6 +13,7 @@ import Annex.Version
- import Types.RepoVersion
- import qualified Annex.SpecialRemote
- 
-+import Control.Monad.Fail as Fail ( MonadFail(..) )
- import qualified Data.Map as M
- 	
- cmd :: Command
-@@ -33,14 +34,14 @@ optParser desc = InitOptions
- 		<> help "Override default annex.version"
- 		))
- 
--parseRepoVersion :: Monad m => String -> m RepoVersion
-+parseRepoVersion :: MonadFail m => String -> m RepoVersion
- parseRepoVersion s = case RepoVersion <$> readish s of
--	Nothing -> fail $ "version parse error"
-+	Nothing -> Fail.fail $ "version parse error"
- 	Just v
- 		| v `elem` supportedVersions -> return v
- 		| otherwise -> case M.lookup v autoUpgradeableVersions of
- 			Just v' -> return v'
--			Nothing -> fail $ s ++ " is not a currently supported repository version"
-+			Nothing -> Fail.fail $ s ++ " is not a currently supported repository version"
- 
- seek :: InitOptions -> CommandSeek
- seek = commandAction . start
-diff --git a/Utility/HumanTime.hs b/Utility/HumanTime.hs
-index 01fbeacfb..d2e70f332 100644
---- a/Utility/HumanTime.hs
-+++ b/Utility/HumanTime.hs
-@@ -19,6 +19,7 @@ module Utility.HumanTime (
- import Utility.PartialPrelude
- import Utility.QuickCheck
- 
-+import Control.Monad.Fail as Fail ( MonadFail(..) )
- import qualified Data.Map as M
- import Data.Time.Clock
- import Data.Time.Clock.POSIX (POSIXTime)
-@@ -44,7 +45,7 @@ daysToDuration :: Integer -> Duration
- daysToDuration i = Duration $ i * dsecs
- 
- {- Parses a human-input time duration, of the form "5h", "1m", "5h1m", etc -}
--parseDuration :: Monad m => String -> m Duration
-+parseDuration :: MonadFail m => String -> m Duration
- parseDuration = maybe parsefail (return . Duration) . go 0
-   where
- 	go n [] = return n
-@@ -55,7 +56,7 @@ parseDuration = maybe parsefail (return . Duration) . go 0
- 				u <- M.lookup c unitmap
- 				go (n + num * u) rest
- 			_ -> return $ n + num
--	parsefail = fail "duration parse error; expected eg \"5m\" or \"1h5m\""
-+	parsefail = Fail.fail "duration parse error; expected eg \"5m\" or \"1h5m\""
- 
- fromDuration :: Duration -> String
- fromDuration Duration { durationSeconds = d }
--- 
-2.25.1
-

From afa1dc69ca3fd2eead2ea0f1e6c37b906837cd58 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Mar 2020 15:05:41 +0000
Subject: [PATCH 2948/4636] atlantis: 0.10.1 -> 0.11.1

---
 pkgs/applications/networking/cluster/atlantis/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix
index 67e91870f1a1..cb846060a3de 100644
--- a/pkgs/applications/networking/cluster/atlantis/default.nix
+++ b/pkgs/applications/networking/cluster/atlantis/default.nix
@@ -2,21 +2,21 @@
 
 buildGoModule rec {
   pname = "atlantis";
-  version = "0.10.1";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "runatlantis";
     repo = "atlantis";
     rev = "v${version}";
-    sha256 = "08k2dgz6rph68647ah1rdp7hqa5h1ar4gdy7vdjy5kn7gz21gmri";
+    sha256 = "1ylk6n13ln6yaq4nc4n7fm00wfiyqi2x33sca5avzsvd1b387kk6";
   };
 
-  modSha256 = "1i4s3xcq2qc3zy00wk2l77935ilm6n5k1msilmdnj0061ia4860y";
+  modSha256 = "1bhplk3p780llpj9l0fwcyli74879968d6j582mvjwvf2winbqzq";
 
   subPackages = [ "." ];
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/runatlantis/atlantis;
+    homepage = "https://github.com/runatlantis/atlantis";
     description = "Terraform Pull Request Automation";
     platforms = platforms.all;
     license = licenses.asl20;

From fb2b3a37aaeb829b51fdd76a670f6aa481c0729a Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Fri, 13 Mar 2020 10:44:22 +0100
Subject: [PATCH 2949/4636] trilium: 0.40.3 -> 0.40.5

---
 pkgs/applications/office/trilium/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix
index 1187b00a604d..3794a676d4c4 100644
--- a/pkgs/applications/office/trilium/default.nix
+++ b/pkgs/applications/office/trilium/default.nix
@@ -19,7 +19,7 @@ let
     maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ];
   };
 
-  version = "0.40.3";
+  version = "0.40.5";
 
 in {
   
@@ -30,7 +30,7 @@ in {
 
     src = fetchurl {
       url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
-      sha256 = "1z7dgr8v5yvl2wmvm41cckslnsl4agdzvqzv0zsr4knk94v16cjp";
+      sha256 = "02hmfgv8viy1hn2ix4b0gdzbcj7piddsmjdnb0b5hpwahqrikiyi";
     };
   
     # Fetch from source repo, no longer included in release.
@@ -78,7 +78,7 @@ in {
 
     src = fetchurl {
       url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
-      sha256 = "0vlrmi1x1nanaz1ay0f5x146qcvpz4x0ngzacih5gqslz3zy8y8g";
+      sha256 = "00b7qx2h26qrdhw2a7y0irhbr442yynnzpm1pz55hi33zpckbrc7";
     };
 
     nativeBuildInputs = [

From 09dea9e30d19d675874a9640c2e10e3d94b8b548 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 13 Mar 2020 20:10:57 +0100
Subject: [PATCH 2950/4636] Nextcloud: 18.0.1 -> 18.0.2

---
 pkgs/servers/nextcloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 22fc4ebf39e4..9b23e9ac501f 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "nextcloud";
-  version = "18.0.1";
+  version = "18.0.2";
 
   src = fetchurl {
     url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2";
-    sha256 = "1h0rxpdssn1hc65k41zbvww9r4f79vbd9bixc9ri5n7hp0say3vp";
+    sha256 = "10fbdq0366iai2kpw6v6p78mnn9gz8x0xzsbqrp109yx4c4nccyh";
   };
 
   installPhase = ''

From b5d0ffcab105b55f8a54ca20e3dbc1a25a4053b3 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Fri, 13 Mar 2020 12:50:35 -0400
Subject: [PATCH 2951/4636] python3Packages.hickle: 3.4.5 -> 3.4.6

---
 pkgs/development/python-modules/hickle/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/hickle/default.nix b/pkgs/development/python-modules/hickle/default.nix
index 8d45970294c7..bc8c741ec2bd 100644
--- a/pkgs/development/python-modules/hickle/default.nix
+++ b/pkgs/development/python-modules/hickle/default.nix
@@ -6,20 +6,23 @@
 , astropy
 , scipy
 , pandas
+, codecov
 , pytest
 , pytestcov
 , pytestrunner
 , coveralls
+, twine
+, check-manifest
 , lib
 }:
 
 buildPythonPackage rec {
   pname   = "hickle";
-  version = "3.4.5";
+  version = "3.4.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1d1qj3yl7635lgkqacz9r8fyhv71396l748ww4wy05ibpignjm2x";
+    sha256 = "026r6yg3amsi8k8plzsbw5rnifym6sc17y011daqyvcpb7mfs94b";
   };
 
   postPatch = ''
@@ -28,7 +31,9 @@ buildPythonPackage rec {
   '';
 
   propagatedBuildInputs = [ h5py numpy dill ];
-  checkInputs = [ pytest pytestcov pytestrunner coveralls scipy pandas astropy ];
+  checkInputs = [
+    pytest pytestcov pytestrunner coveralls scipy pandas astropy twine check-manifest codecov
+  ];
 
   meta = {
     description = "Serialize Python data to HDF5";

From 0c35251af5317f8b75f631bc4350774f6106932c Mon Sep 17 00:00:00 2001
From: sohalt <sohalt@sohalt.net>
Date: Fri, 13 Mar 2020 18:38:46 +0100
Subject: [PATCH 2952/4636] mumble: remove unnecessary
 mumble-jack-support.patch

---
 .../networking/mumble/default.nix             |   1 -
 .../mumble/mumble-jack-support.patch          | 457 ------------------
 2 files changed, 458 deletions(-)
 delete mode 100644 pkgs/applications/networking/mumble/mumble-jack-support.patch

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index da7c5d4af741..4408994ba8f0 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -20,7 +20,6 @@ let
     version = source.version;
 
     patches = (source.patches or [])
-      ++ optional jackSupport ./mumble-jack-support.patch
       ++ [ ./fix-rnnoise-argument.patch ];
 
     nativeBuildInputs = [ pkgconfig python qt5.qmake ]
diff --git a/pkgs/applications/networking/mumble/mumble-jack-support.patch b/pkgs/applications/networking/mumble/mumble-jack-support.patch
deleted file mode 100644
index 7c18a33193df..000000000000
--- a/pkgs/applications/networking/mumble/mumble-jack-support.patch
+++ /dev/null
@@ -1,457 +0,0 @@
-The patch was created by Filipe Coelho (falkTX) of the KXStudio
-project. http://kxstudio.sourceforge.net
-
-diff -U 3 -H -d -r -N -- mumble-1.2.2.orig/src/mumble/JackAudio.cpp mumble-1.2.2/src/mumble/JackAudio.cpp
---- mumble-1.2.2.orig/src/mumble/JackAudio.cpp	1970-01-01 01:00:00.000000000 +0100
-+++ mumble-1.2.2/src/mumble/JackAudio.cpp	2011-01-26 06:02:00.000000000 +0000
-@@ -0,0 +1,314 @@
-+/* Copyright (C) 2011, Benjamin Jemlich <pcgod@users.sourceforge.net>
-+   Copyright (C) 2011, Filipe Coelho <falktx@gmail.com>
-+
-+   All rights reserved.
-+
-+   Redistribution and use in source and binary forms, with or without
-+   modification, are permitted provided that the following conditions
-+   are met:
-+
-+   - Redistributions of source code must retain the above copyright notice,
-+     this list of conditions and the following disclaimer.
-+   - Redistributions in binary form must reproduce the above copyright notice,
-+     this list of conditions and the following disclaimer in the documentation
-+     and/or other materials provided with the distribution.
-+   - Neither the name of the Mumble Developers nor the names of its
-+     contributors may be used to endorse or promote products derived from this
-+     software without specific prior written permission.
-+
-+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+*/
-+
-+#include "JackAudio.h"
-+#include "User.h"
-+#include "Global.h"
-+#include "MainWindow.h"
-+#include "Timer.h"
-+
-+#include <cstring>
-+
-+static JackAudioSystem *jasys = NULL;
-+
-+class JackAudioInputRegistrar : public AudioInputRegistrar {
-+        public:
-+                JackAudioInputRegistrar();
-+                virtual AudioInput *create();
-+                virtual const QList<audioDevice> getDeviceChoices();
-+                virtual void setDeviceChoice(const QVariant &, Settings &);
-+                virtual bool canEcho(const QString &) const;
-+};
-+
-+class JackAudioOutputRegistrar : public AudioOutputRegistrar {
-+        public:
-+                JackAudioOutputRegistrar();
-+                virtual AudioOutput *create();
-+                virtual const QList<audioDevice> getDeviceChoices();
-+                virtual void setDeviceChoice(const QVariant &, Settings &);
-+};
-+
-+class JackAudioInit : public DeferInit {
-+        public:
-+                JackAudioInputRegistrar *airJackAudio;
-+                JackAudioOutputRegistrar *aorJackAudio;
-+                void initialize() {
-+                        jasys = new JackAudioSystem();
-+                        jasys->init_jack();
-+                        jasys->qmWait.lock();
-+                        jasys->qwcWait.wait(&jasys->qmWait, 1000);
-+                        jasys->qmWait.unlock();
-+                        if (jasys->bJackIsGood) {
-+                                airJackAudio = new JackAudioInputRegistrar();
-+                                aorJackAudio = new JackAudioOutputRegistrar();
-+                        } else {
-+                                airJackAudio = NULL;
-+                                aorJackAudio = NULL;
-+                                delete jasys;
-+                                jasys = NULL;
-+                        }
-+                };
-+                void destroy() {
-+                        if (airJackAudio)
-+                                delete airJackAudio;
-+                        if (aorJackAudio)
-+                                delete aorJackAudio;
-+                        if (jasys) {
-+                                jasys->close_jack();
-+                                delete jasys;
-+                                jasys = NULL;
-+                        }
-+                };
-+};
-+
-+static JackAudioInit jackinit; //unused
-+
-+JackAudioSystem::JackAudioSystem() {
-+        bJackIsGood = false;
-+        iSampleRate = 0;
-+}
-+
-+JackAudioSystem::~JackAudioSystem() {
-+}
-+
-+void JackAudioSystem::init_jack()
-+{
-+        client = jack_client_open("mumble", JackNullOption, 0);
-+
-+        if (client) {
-+                in_port = jack_port_register(client, "input", JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0);
-+                out_port = jack_port_register(client, "output", JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
-+                jack_set_process_callback(client, process_callback, this);
-+                jack_set_sample_rate_callback(client, srate_callback, this);
-+                jack_on_shutdown(client, shutdown_callback, this);
-+
-+                iSampleRate = jack_get_sample_rate(client);
-+
-+                if (jack_activate(client) || in_port == NULL || out_port == NULL) {
-+                    client = NULL;
-+                    return;
-+                }
-+
-+                int port_flags;
-+                unsigned i = -1;
-+                const char** ports = jack_get_ports(client, 0, 0, JackPortIsPhysical);
-+
-+                if (ports) {
-+                    while (ports[++i])
-+                    {
-+                        jack_port_t* port = jack_port_by_name(client, ports[i]);
-+                        port_flags = jack_port_flags(port);
-+
-+                        if (port_flags & (JackPortIsPhysical|JackPortIsOutput) && strstr(jack_port_type(port), "audio")) {
-+                            jack_connect(client, ports[i], jack_port_name(in_port));
-+                        }
-+                        if (port_flags & (JackPortIsPhysical|JackPortIsInput) && strstr(jack_port_type(port), "audio")) {
-+                            jack_connect(client, jack_port_name(out_port), ports[i]);
-+                        }
-+                    }
-+                }
-+
-+                jack_free(ports);
-+
-+                // If we made it this far, then everything is okay
-+                qhInput.insert(QString(), tr("Hardware Ports"));
-+                qhOutput.insert(QString(), tr("Hardware Ports"));
-+                bJackIsGood = true;
-+
-+            } else {
-+                bJackIsGood = false;
-+                client = NULL;
-+            }
-+}
-+
-+void JackAudioSystem::close_jack()
-+{
-+        if (client) {
-+                jack_deactivate(client);
-+                jack_client_close(client);
-+                client = NULL;
-+        }
-+}
-+
-+int JackAudioSystem::process_callback(jack_nframes_t nframes, void *arg)
-+{
-+        JackAudioSystem *jas = (JackAudioSystem*)arg;
-+
-+        if (jas && jas->bJackIsGood) {
-+                AudioInputPtr ai = g.ai;
-+                AudioOutputPtr ao = g.ao;
-+                JackAudioInput *jai = (JackAudioInput*)(ai.get());
-+                JackAudioOutput *jao = (JackAudioOutput*)(ao.get());
-+
-+                if (jai && jai->bRunning && jai->iMicChannels > 0 && !jai->isFinished()) {
-+                        void* input = jack_port_get_buffer(jas->in_port, nframes);
-+                        if ((float*)input != 0)
-+                            jai->addMic(input, nframes);
-+                }
-+
-+                if (jao && jao->bRunning && jao->iChannels > 0 && !jao->isFinished()) {
-+                        jack_default_audio_sample_t* output = (jack_default_audio_sample_t*)jack_port_get_buffer(jas->out_port, nframes);
-+                        memset(output, 0, sizeof(jack_default_audio_sample_t)*nframes); //TEST
-+                        jao->mix(output, nframes);
-+                }
-+        }
-+
-+        return 0;
-+}
-+
-+int JackAudioSystem::srate_callback(jack_nframes_t frames, void *arg)
-+{
-+        JackAudioSystem *jas = (JackAudioSystem*)arg;
-+        jas->iSampleRate = frames;
-+        return 0;
-+}
-+
-+void JackAudioSystem::shutdown_callback(void *arg)
-+{
-+        JackAudioSystem *jas = (JackAudioSystem*)arg;
-+        jas->bJackIsGood = false;
-+}
-+
-+JackAudioInputRegistrar::JackAudioInputRegistrar() : AudioInputRegistrar(QLatin1String("JACK"), 10) {
-+}
-+
-+AudioInput *JackAudioInputRegistrar::create() {
-+        return new JackAudioInput();
-+}
-+
-+const QList<audioDevice> JackAudioInputRegistrar::getDeviceChoices() {
-+        QList<audioDevice> qlReturn;
-+
-+        QStringList qlInputDevs = jasys->qhInput.keys();
-+        qSort(qlInputDevs);
-+
-+        foreach(const QString &dev, qlInputDevs) {
-+                qlReturn << audioDevice(jasys->qhInput.value(dev), dev);
-+        }
-+
-+        return qlReturn;
-+}
-+
-+void JackAudioInputRegistrar::setDeviceChoice(const QVariant &choice, Settings &s) {
-+        Q_UNUSED(choice);
-+        Q_UNUSED(s);
-+}
-+
-+bool JackAudioInputRegistrar::canEcho(const QString &osys) const {
-+        Q_UNUSED(osys);
-+        return false;
-+}
-+
-+JackAudioOutputRegistrar::JackAudioOutputRegistrar() : AudioOutputRegistrar(QLatin1String("JACK"), 10) {
-+}
-+
-+AudioOutput *JackAudioOutputRegistrar::create() {
-+        return new JackAudioOutput();
-+}
-+
-+const QList<audioDevice> JackAudioOutputRegistrar::getDeviceChoices() {
-+        QList<audioDevice> qlReturn;
-+
-+        QStringList qlOutputDevs = jasys->qhOutput.keys();
-+        qSort(qlOutputDevs);
-+
-+        foreach(const QString &dev, qlOutputDevs) {
-+                qlReturn << audioDevice(jasys->qhOutput.value(dev), dev);
-+        }
-+
-+        return qlReturn;
-+}
-+
-+void JackAudioOutputRegistrar::setDeviceChoice(const QVariant &choice, Settings &s) {
-+        Q_UNUSED(choice);
-+        Q_UNUSED(s);
-+}
-+
-+JackAudioInput::JackAudioInput() {
-+        bRunning = true;
-+        iMicChannels = 0;
-+};
-+
-+JackAudioInput::~JackAudioInput() {
-+        bRunning = false;
-+        iMicChannels = 0;
-+        qmMutex.lock();
-+        qwcWait.wakeAll();
-+        qmMutex.unlock();
-+        wait();
-+}
-+
-+void JackAudioInput::run() {
-+        if (jasys && jasys->bJackIsGood) {
-+            iMicFreq = jasys->iSampleRate;
-+            iMicChannels = 1;
-+            eMicFormat = SampleFloat;
-+            initializeMixer();
-+        }
-+
-+        qmMutex.lock();
-+        while (bRunning)
-+                qwcWait.wait(&qmMutex);
-+        qmMutex.unlock();
-+}
-+
-+JackAudioOutput::JackAudioOutput() {
-+        bRunning = true;
-+        iChannels = 0;
-+}
-+
-+JackAudioOutput::~JackAudioOutput() {
-+        bRunning = false;
-+        iChannels = 0;
-+        qmMutex.lock();
-+        qwcWait.wakeAll();
-+        qmMutex.unlock();
-+        wait();
-+}
-+
-+void JackAudioOutput::run() {
-+        if (jasys && jasys->bJackIsGood) {
-+            unsigned int chanmasks[32];
-+
-+            chanmasks[0] = SPEAKER_FRONT_LEFT;
-+            chanmasks[1] = SPEAKER_FRONT_RIGHT;
-+
-+            eSampleFormat = SampleFloat;
-+            iMixerFreq = jasys->iSampleRate;
-+            iChannels = 1;
-+            initializeMixer(chanmasks);
-+        }
-+
-+        qmMutex.lock();
-+        while (bRunning)
-+                qwcWait.wait(&qmMutex);
-+        qmMutex.unlock();
-+}
-diff -U 3 -H -d -r -N -- mumble-1.2.2.orig/src/mumble/JackAudio.h mumble-1.2.2/src/mumble/JackAudio.h
---- mumble-1.2.2.orig/src/mumble/JackAudio.h	1970-01-01 01:00:00.000000000 +0100
-+++ mumble-1.2.2/src/mumble/JackAudio.h	2011-01-26 06:03:58.000000000 +0000
-@@ -0,0 +1,97 @@
-+/* Copyright (C) 2011, Benjamin Jemlich <pcgod@users.sourceforge.net>
-+   Copyright (C) 2011, Filipe Coelho <falktx@gmail.com>
-+
-+   All rights reserved.
-+
-+   Redistribution and use in source and binary forms, with or without
-+   modification, are permitted provided that the following conditions
-+   are met:
-+
-+   - Redistributions of source code must retain the above copyright notice,
-+     this list of conditions and the following disclaimer.
-+   - Redistributions in binary form must reproduce the above copyright notice,
-+     this list of conditions and the following disclaimer in the documentation
-+     and/or other materials provided with the distribution.
-+   - Neither the name of the Mumble Developers nor the names of its
-+     contributors may be used to endorse or promote products derived from this
-+     software without specific prior written permission.
-+
-+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+*/
-+
-+#ifndef _JACKAUDIO_H
-+#define _JACKAUDIO_H
-+
-+#include "AudioInput.h"
-+#include "AudioOutput.h"
-+#include <jack/jack.h>
-+
-+class JackAudioOutput;
-+class JackAudioInput;
-+
-+class JackAudioSystem : public QObject {
-+        private:
-+                Q_OBJECT
-+                Q_DISABLE_COPY(JackAudioSystem)
-+        protected:
-+                jack_client_t* client;
-+                jack_port_t* in_port;
-+                jack_port_t* out_port;
-+
-+                static int process_callback(jack_nframes_t nframes, void *arg);
-+                static int srate_callback(jack_nframes_t frames, void *arg);
-+                static void shutdown_callback(void *arg);
-+        public:
-+                QHash<QString, QString> qhInput;
-+                QHash<QString, QString> qhOutput;
-+                bool bJackIsGood;
-+                int iSampleRate;
-+                QMutex qmWait;
-+                QWaitCondition qwcWait;
-+
-+                void init_jack();
-+                void close_jack();
-+
-+                JackAudioSystem();
-+                ~JackAudioSystem();
-+};
-+
-+class JackAudioInput : public AudioInput {
-+                friend class JackAudioSystem;
-+        private:
-+                Q_OBJECT
-+                Q_DISABLE_COPY(JackAudioInput)
-+        protected:
-+                QMutex qmMutex;
-+                QWaitCondition qwcWait;
-+        public:
-+                JackAudioInput();
-+                ~JackAudioInput();
-+                void run();
-+};
-+
-+class JackAudioOutput : public AudioOutput {
-+                friend class JackAudioSystem;
-+        private:
-+                Q_OBJECT
-+                Q_DISABLE_COPY(JackAudioOutput)
-+        protected:
-+                QMutex qmMutex;
-+                QWaitCondition qwcWait;
-+        public:
-+                JackAudioOutput();
-+                ~JackAudioOutput();
-+                void run();
-+};
-+
-+#endif
-diff -U 3 -H -d -r -N -- mumble-1.2.2.orig/src/mumble/mumble.pro mumble-1.2.2/src/mumble/mumble.pro
---- mumble-1.2.2.orig/src/mumble/mumble.pro	2010-02-09 16:34:51.000000000 +0000
-+++ mumble-1.2.2/src/mumble/mumble.pro	2011-01-26 01:45:55.000000000 +0000
-@@ -93,11 +93,17 @@
- unix {
-   HAVE_PULSEAUDIO=$$system(pkg-config --modversion --silence-errors libpulse)
-   HAVE_PORTAUDIO=$$system(pkg-config --modversion --silence-errors portaudio-2.0)
-+  HAVE_JACKAUDIO=$$system(pkg-config --modversion --silence-errors jack)
- 
-   !isEmpty(HAVE_PORTAUDIO):!CONFIG(no-portaudio) {
-     CONFIG *= portaudio
-   }
- 
-+  !isEmpty(HAVE_JACKAUDIO):!CONFIG(no-jackaudio) {
-+    CONFIG -= portaudio
-+    CONFIG *= jackaudio
-+  }
-+
-   !isEmpty(HAVE_PULSEAUDIO):!CONFIG(no-pulseaudio) {
-     CONFIG -= portaudio
-     CONFIG *= pulseaudio
-@@ -110,6 +116,13 @@
-     QMAKE_CXXFLAGS_DEBUG *= -I../../speex/include -I../../speexbuild
-   }
- 
-+  jackaudio {
-+        DEFINES *= USE_JACKAUDIO
-+        PKGCONFIG *= jack
-+        HEADERS *= JackAudio.h
-+        SOURCES *= JackAudio.cpp
-+  }
-+
-   CONFIG *= link_pkgconfig
- 
-   PKGCONFIG *= openssl sndfile

From 5c066f9bfb2f1b07fb567ce2fe52f777e4c4bc9d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 13 Mar 2020 20:36:12 +0100
Subject: [PATCH 2953/4636] wireguard-go: 0.0.20191012 -> 0.0.20200121

---
 pkgs/tools/networking/wireguard-go/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix
index 8832560b3b10..a722a8016bc9 100644
--- a/pkgs/tools/networking/wireguard-go/default.nix
+++ b/pkgs/tools/networking/wireguard-go/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "wireguard-go";
-  version = "0.0.20191012";
+  version = "0.0.20200121";
 
   goPackagePath = "golang.zx2c4.com/wireguard";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz";
-    sha256 = "0s3hvqpz13n630yvi0476hfzrp3xcj8x61zc2hl5z70f8kvbay4i";
+    sha256 = "04ca1j8lcbyg1qg7ls23yy90s17k97i912ksxfpads0sdd3r2yc9";
   };
 
   patches = [ ./0001-Fix-darwin-build.patch ];

From 69d7cc55080a5bec0189fbfce5ac926c41f64a55 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 13 Mar 2020 20:37:43 +0100
Subject: [PATCH 2954/4636] inotify-tools: 3.20.1 -> 3.20.2.2

---
 .../tools/misc/inotify-tools/default.nix            | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix
index b04de1832abb..ead13e340d5e 100644
--- a/pkgs/development/tools/misc/inotify-tools/default.nix
+++ b/pkgs/development/tools/misc/inotify-tools/default.nix
@@ -1,16 +1,23 @@
-{ stdenv, autoreconfHook, fetchFromGitHub }:
+{ stdenv, autoreconfHook, fetchFromGitHub, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "inotify-tools";
-  version = "3.20.1";
+  version = "3.20.2.2";
 
   src = fetchFromGitHub {
     repo = "inotify-tools";
     owner = "rvoicilas";
     rev = version;
-    sha256 = "14dci1i4mhsd5sa33k8h3ayphk19kizynh5ql9ryibdpmcanfiyq";
+    sha256 = "1r12bglkb0bkqff6kgxjm81hk6z20nrxq3m7iv15d4nrqf9pm7s0";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/inotify-tools/inotify-tools/commit/7ddf45158af0c1e93b02181a45c5b65a0e5bed25.patch";
+      sha256 = "08imqancx8l0bg9q7xaiql1xlalmbfnpjfjshp495sjais0r6gy7";
+    })
+  ];
+
   nativeBuildInputs = [ autoreconfHook ];
 
   meta = with stdenv.lib; {

From c882314075b940cde585f291be5124ca810c4c8c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 13 Mar 2020 20:37:56 +0100
Subject: [PATCH 2955/4636] ipfs: 0.4.22 -> 0.4.23

---
 pkgs/applications/networking/ipfs/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix
index db325cf13877..4f71fcf3b745 100644
--- a/pkgs/applications/networking/ipfs/default.nix
+++ b/pkgs/applications/networking/ipfs/default.nix
@@ -2,17 +2,21 @@
 
 buildGoModule rec {
   pname = "ipfs";
-  version = "0.4.22";
+  version = "0.4.23";
   rev = "v${version}";
 
   src = fetchFromGitHub {
     owner = "ipfs";
     repo = "go-ipfs";
     inherit rev;
-    sha256 = "1drwkam2m1qdny51l7ja9vd33jffy8w0z0wbp28ajx4glp0kyra2";
+    sha256 = "19m1bhqf1jghdv2ngdnjdk1kvjcxbkgm1ccdkmkabv4ii43h8jwm";
   };
 
-  modSha256 = "0jbzkifn88myk2vpd390clyl835978vpcfz912y8cnl26s6q677n";
+  postPatch = ''
+    rm -rf test/dependencies
+  '';
+
+  modSha256 = "12m4ind1s8zaa6kssblc28z2cafy20w2jp80kzif39hg5ar9bijm";
 
   meta = with stdenv.lib; {
     description = "A global, versioned, peer-to-peer filesystem";

From 1505633e2f818c4dc9f0d36bffff2f2c3b31c987 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 13 Mar 2020 20:44:00 +0100
Subject: [PATCH 2956/4636] wikicurses: fix build

The package doesn't have a testsuite, but fails as the checkPhase is
missing appropriate locale configuration (usually taken from
`pkgs.glibcLocales`). Entirely disabling the `checkPhase` for now as
it's basically a no-op.

ZHF: #80379
See also https://hydra.nixos.org/build/114125176
---
 pkgs/applications/misc/wikicurses/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix
index d38383c30ecb..f59384dd7d95 100644
--- a/pkgs/applications/misc/wikicurses/default.nix
+++ b/pkgs/applications/misc/wikicurses/default.nix
@@ -13,6 +13,8 @@ pythonPackages.buildPythonApplication rec {
 
   propagatedBuildInputs = with pythonPackages; [ urwid beautifulsoup4 lxml ];
 
+  doCheck = false;
+
   meta = {
     description = "A simple curses interface for MediaWiki sites such as Wikipedia";
     homepage = https://github.com/ids1024/wikicurses/;

From 04ea9dc275aa07956b9a6cb2f1322d5c35b70bc2 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 13 Mar 2020 20:52:20 +0100
Subject: [PATCH 2957/4636] wikicurses: install man pages

---
 pkgs/applications/misc/wikicurses/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix
index f59384dd7d95..9b1e9f091e25 100644
--- a/pkgs/applications/misc/wikicurses/default.nix
+++ b/pkgs/applications/misc/wikicurses/default.nix
@@ -11,8 +11,16 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "0f14s4qx3q5pr5vn460c34b5mbz2xs62d8ljs3kic8gmdn8x2knm";
   };
 
+  outputs = [ "out" "man" ];
+
   propagatedBuildInputs = with pythonPackages; [ urwid beautifulsoup4 lxml ];
 
+  postInstall = ''
+    mkdir -p $man/share/man/man{1,5}
+    cp wikicurses.1 $man/share/man/man1/
+    cp wikicurses.conf.5 $man/share/man/man5/
+  '';
+
   doCheck = false;
 
   meta = {

From 820a690748d938bb6df0511355f6c9aa0389c2e3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Mar 2020 06:57:13 +0000
Subject: [PATCH 2958/4636] python37Packages.jupyterlab: 1.2.6 -> 2.0.0

---
 pkgs/development/python-modules/jupyterlab/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix
index 55ade7db9caa..3faa0a2edc39 100644
--- a/pkgs/development/python-modules/jupyterlab/default.nix
+++ b/pkgs/development/python-modules/jupyterlab/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "jupyterlab";
-  version = "1.2.6";
+  version = "2.0.0";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0mc3nrj7fc5q2ajr09m261j386jsp8qjljg8anghlh8czc9ln4s2";
+    sha256 = "17p8rpihid0103fyjndk2yvg18n3ypn3hxay92ckcv10vsbiys5b";
   };
 
   propagatedBuildInputs = [ jupyterlab_server notebook ];

From 8b04f2486e338ace0226143fdc6bee4f7ac57096 Mon Sep 17 00:00:00 2001
From: Klaas van Schelven <klaas@vanschelven.com>
Date: Fri, 17 May 2019 14:20:38 +0200
Subject: [PATCH 2959/4636] pythonPackages.bravado-core: init at 5.16.1

---
 .../python-modules/bravado-core/default.nix   | 52 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/python-modules/bravado-core/default.nix

diff --git a/pkgs/development/python-modules/bravado-core/default.nix b/pkgs/development/python-modules/bravado-core/default.nix
new file mode 100644
index 000000000000..55a12009a15c
--- /dev/null
+++ b/pkgs/development/python-modules/bravado-core/default.nix
@@ -0,0 +1,52 @@
+{ lib, buildPythonPackage, fetchFromGitHub, python-dateutil, jsonref, jsonschema,
+  pyyaml, simplejson, six, pytz, msgpack, swagger-spec-validator, rfc3987,
+  strict-rfc3339, webcolors, mypy-extensions, jsonpointer, idna, pytest, mock,
+  pytest-benchmark, isPy27, enum34 }:
+
+buildPythonPackage rec {
+  pname = "bravado-core";
+  version = "5.16.1";
+
+  src = fetchFromGitHub {
+    owner = "Yelp";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0r9gk5vkjbc407fjydms3ik3hnzajq54znyz58d8rm6pvqcvjjpl";
+  };
+
+  checkInputs = [
+    mypy-extensions
+    pytest
+    mock
+    pytest-benchmark
+  ];
+
+  checkPhase = ''pytest --benchmark-skip'';
+
+  propagatedBuildInputs = [
+    python-dateutil
+    jsonref
+    jsonschema
+    pyyaml
+    simplejson
+    six
+    pytz
+    msgpack
+    swagger-spec-validator
+
+    # the following 3 packages are included when jsonschema (3.2) is installed
+    # as jsonschema[format], which reflects what happens in setup.py
+    rfc3987
+    strict-rfc3339
+    webcolors
+    jsonpointer
+    idna
+  ] ++ lib.optionals isPy27 [ enum34 ];
+
+  meta = with lib; {
+    description = "Library for adding Swagger support to clients and servers";
+    homepage = "https://github.com/Yelp/bravado-core";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ vanschelven ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3af1a0eb27b1..7f9f28b45392 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -511,6 +511,8 @@ in {
 
   django-sesame = callPackage ../development/python-modules/django-sesame { };
 
+  bravado-core = callPackage ../development/python-modules/bravado-core { };
+
   breathe = callPackage ../development/python-modules/breathe { };
 
   brotli = callPackage ../development/python-modules/brotli { };

From 9d212f5be70b547f64e959f43e8c808e4a530590 Mon Sep 17 00:00:00 2001
From: Rick van Schijndel <rol3517@gmail.com>
Date: Fri, 13 Mar 2020 09:23:01 +0100
Subject: [PATCH 2960/4636] afl: Fix afl-qemu build by applying new patches

These patches are gathered from different sources,
such as https://patchwork.kernel.org/patch/10862231/ for the
`gettid` patch.
Another patch comes from the issue in the AFL repository.
The ultimate goal is to get these patches upstream as well,
so we don't keep these general patches only within nixos.

A PR is created against Google/AFL
https://github.com/google/AFL/pull/79,
but it might take a while before it's landed, considering the history
of the project (there are more PRs open).

ZHF: #80379

Fixes issue #82232
---
 .../afl/qemu-patches/syscall-glibc2_30.diff   | 51 +++++++++++++++++++
 pkgs/tools/security/afl/qemu.nix              |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/tools/security/afl/qemu-patches/syscall-glibc2_30.diff

diff --git a/pkgs/tools/security/afl/qemu-patches/syscall-glibc2_30.diff b/pkgs/tools/security/afl/qemu-patches/syscall-glibc2_30.diff
new file mode 100644
index 000000000000..aa2950bf157c
--- /dev/null
+++ b/pkgs/tools/security/afl/qemu-patches/syscall-glibc2_30.diff
@@ -0,0 +1,51 @@
+--- qemu-2.10.0-clean/linux-user/syscall.c	2020-03-12 18:47:47.898592169 +0100
++++ qemu-2.10.0/linux-user/syscall.c	2020-03-13 09:13:42.461809699 +0100
+@@ -34,6 +34,7 @@
+ #include <sys/resource.h>
+ #include <sys/swap.h>
+ #include <linux/capability.h>
++#include <linux/sockios.h> // https://lkml.org/lkml/2019/6/3/988
+ #include <sched.h>
+ #include <sys/timex.h>
+ #ifdef __ia64__
+@@ -256,7 +257,9 @@ static type name (type1 arg1,type2 arg2,
+ #endif
+ 
+ #ifdef __NR_gettid
+-_syscall0(int, gettid)
++// taken from https://patchwork.kernel.org/patch/10862231/
++#define __NR_sys_gettid __NR_gettid
++_syscall0(int, sys_gettid)
+ #else
+ /* This is a replacement for the host gettid() and must return a host
+    errno. */
+@@ -6219,7 +6222,7 @@ static void *clone_func(void *arg)
+     cpu = ENV_GET_CPU(env);
+     thread_cpu = cpu;
+     ts = (TaskState *)cpu->opaque;
+-    info->tid = gettid();
++    info->tid = sys_gettid();
+     task_settid(ts);
+     if (info->child_tidptr)
+         put_user_u32(info->tid, info->child_tidptr);
+@@ -6363,9 +6366,9 @@ static int do_fork(CPUArchState *env, un
+                mapping.  We can't repeat the spinlock hack used above because
+                the child process gets its own copy of the lock.  */
+             if (flags & CLONE_CHILD_SETTID)
+-                put_user_u32(gettid(), child_tidptr);
++                put_user_u32(sys_gettid(), child_tidptr);
+             if (flags & CLONE_PARENT_SETTID)
+-                put_user_u32(gettid(), parent_tidptr);
++                put_user_u32(sys_gettid(), parent_tidptr);
+             ts = (TaskState *)cpu->opaque;
+             if (flags & CLONE_SETTLS)
+                 cpu_set_tls (env, newtls);
+@@ -11402,7 +11405,7 @@ abi_long do_syscall(void *cpu_env, int n
+         break;
+ #endif
+     case TARGET_NR_gettid:
+-        ret = get_errno(gettid());
++        ret = get_errno(sys_gettid());
+         break;
+ #ifdef TARGET_NR_readahead
+     case TARGET_NR_readahead:
diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix
index 479de4b41850..b841ccb93d3c 100644
--- a/pkgs/tools/security/afl/qemu.nix
+++ b/pkgs/tools/security/afl/qemu.nix
@@ -52,6 +52,8 @@ stdenv.mkDerivation {
     "../${afl.src.name}/qemu_mode/patches/memfd.diff"
     # nix-specific patches to make installation more well-behaved
     ./qemu-patches/no-etc-install.patch
+    # patch for fixing qemu build on glibc >= 2.30
+    ./qemu-patches/syscall-glibc2_30.diff
   ];
 
   configureFlags =

From 506be57540a245b575ad72623769d36b398cdde2 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 13 Mar 2020 15:48:08 +0100
Subject: [PATCH 2961/4636] mailutils: 3.8 -> 3.9

This is a bugfix release.

See https://lists.gnu.org/archive/html/info-gnu/2020-03/msg00007.html
for details.
---
 pkgs/tools/networking/mailutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
index dcf377ca0c04..3e5300549db6 100644
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
@@ -5,11 +5,11 @@
 stdenv.mkDerivation rec {
   name = "${project}-${version}";
   project = "mailutils";
-  version = "3.8";
+  version = "3.9";
 
   src = fetchurl {
     url = "mirror://gnu/${project}/${name}.tar.xz";
-    sha256 = "1wkn9ch664477r4d8jk9153w5msljsbj99907k7zgzpmywbs6ba7";
+    sha256 = "1g1xf2lal04nsnf1iym9n9n0wxjpqbcr9nysxpm98v4pniinqwsz";
   };
 
   postPatch = ''

From 0729b8c55e0dfaf302af4c57546871d47a652048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 13 Mar 2020 21:47:07 +0100
Subject: [PATCH 2962/4636] Revert Merge #82310: nixos/systemd: apply .link

...even when networkd is disabled

This reverts commit ce78f3ac701017008aa7f1db387b871b7ae65e01, reversing
changes made to dc34da0755b3c36469965659c0ee4a1337e81c05.

I'm sorry; Hydra has been unable to evaluate, always returning
> error: unexpected EOF reading a line
and I've been unable to reproduce the problem locally.  Bisecting
pointed to this merge, but I still can't see what exactly was wrong.
---
 nixos/doc/manual/release-notes/rl-2003.xml    |  8 --
 .../services/networking/zerotierone.nix       | 17 ++--
 nixos/modules/system/boot/networkd.nix        | 79 ++++++++-----------
 nixos/tests/networking.nix                    | 60 +++++---------
 4 files changed, 59 insertions(+), 105 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index a123be2ccf4e..918906d27e72 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -712,14 +712,6 @@ auth required pam_succeed_if.so uid >= 1000 quiet
      For further reference, please read <link xlink:href="https://github.com/NixOS/nixpkgs/pull/68953">#68953</link> or the corresponding <link xlink:href="https://discourse.nixos.org/t/predictable-network-interface-names-in-initrd/4055">discourse thread</link>.
     </para>
    </listitem>
-   <listitem>
-    <para>
-     The <link linkend="opt-systemd.network.links">systemd.network.links</link> option is now respected
-     even when <link linkend="opt-systemd.network.enable">systemd-networkd</link> is disabled.
-     This mirrors the behaviour of systemd - It's udev that parses <literal>.link</literal> files,
-     not <command>systemd-networkd</command>.
-    </para>
-   </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix
index cf39ed065a76..042c4d5adddd 100644
--- a/nixos/modules/services/networking/zerotierone.nix
+++ b/nixos/modules/services/networking/zerotierone.nix
@@ -69,14 +69,13 @@ in
     environment.systemPackages = [ cfg.package ];
 
     # Prevent systemd from potentially changing the MAC address
-    systemd.network.links."50-zerotier" = {
-      matchConfig = {
-        OriginalName = "zt*";
-      };
-      linkConfig = {
-        AutoNegotiation = false;
-        MACAddressPolicy = "none";
-      };
-    };
+    environment.etc."systemd/network/50-zerotier.link".text = ''
+      [Match]
+      OriginalName=zt*
+
+      [Link]
+      AutoNegotiation=false
+      MACAddressPolicy=none
+    '';
   };
 }
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 3078f84f6e92..6dfbe66fc647 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -355,14 +355,6 @@ let
   };
 
   linkOptions = commonNetworkOptions // {
-    # overwrite enable option from above
-    enable = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to enable this .link unit. It's handled by udev no matter if <command>systemd-networkd</command> is enabled or not
-      '';
-    };
 
     linkConfig = mkOption {
       default = {};
@@ -1053,49 +1045,44 @@ in
 
   };
 
-  config = mkMerge [
-    # .link units are honored by udev, no matter if systemd-networkd is enabled or not.
-    {
-      systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links;
-      environment.etc = unitFiles;
-    }
+  config = mkIf config.systemd.network.enable {
 
-    (mkIf config.systemd.network.enable {
+    users.users.systemd-network.group = "systemd-network";
 
-      users.users.systemd-network.group = "systemd-network";
+    systemd.additionalUpstreamSystemUnits = [
+      "systemd-networkd.service" "systemd-networkd-wait-online.service"
+    ];
 
-      systemd.additionalUpstreamSystemUnits = [
-        "systemd-networkd.service" "systemd-networkd-wait-online.service"
-      ];
+    systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links
+      // mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs
+      // mapAttrs' (n: v: nameValuePair "${n}.network" (networkToUnit n v)) cfg.networks;
 
-      systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs
-        // mapAttrs' (n: v: nameValuePair "${n}.network" (networkToUnit n v)) cfg.networks;
+    environment.etc = unitFiles;
 
-      systemd.services.systemd-networkd = {
-        wantedBy = [ "multi-user.target" ];
-        restartTriggers = attrNames unitFiles;
-        # prevent race condition with interface renaming (#39069)
-        requires = [ "systemd-udev-settle.service" ];
-        after = [ "systemd-udev-settle.service" ];
+    systemd.services.systemd-networkd = {
+      wantedBy = [ "multi-user.target" ];
+      restartTriggers = attrNames unitFiles;
+      # prevent race condition with interface renaming (#39069)
+      requires = [ "systemd-udev-settle.service" ];
+      after = [ "systemd-udev-settle.service" ];
+    };
+
+    systemd.services.systemd-networkd-wait-online = {
+      wantedBy = [ "network-online.target" ];
+    };
+
+    systemd.services."systemd-network-wait-online@" = {
+      description = "Wait for Network Interface %I to be Configured";
+      conflicts = [ "shutdown.target" ];
+      requisite = [ "systemd-networkd.service" ];
+      after = [ "systemd-networkd.service" ];
+      serviceConfig = {
+        Type = "oneshot";
+        RemainAfterExit = true;
+        ExecStart = "${config.systemd.package}/lib/systemd/systemd-networkd-wait-online -i %I";
       };
+    };
 
-      systemd.services.systemd-networkd-wait-online = {
-        wantedBy = [ "network-online.target" ];
-      };
-
-      systemd.services."systemd-network-wait-online@" = {
-        description = "Wait for Network Interface %I to be Configured";
-        conflicts = [ "shutdown.target" ];
-        requisite = [ "systemd-networkd.service" ];
-        after = [ "systemd-networkd.service" ];
-        serviceConfig = {
-          Type = "oneshot";
-          RemainAfterExit = true;
-          ExecStart = "${config.systemd.package}/lib/systemd/systemd-networkd-wait-online -i %I";
-        };
-      };
-
-      services.resolved.enable = mkDefault true;
-    })
-  ];
+    services.resolved.enable = mkDefault true;
+  };
 }
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index a519ca065943..933a4451af92 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -5,10 +5,11 @@
 , networkd }:
 
 with import ../lib/testing-python.nix { inherit system pkgs; };
+with pkgs.lib;
 
 let
-  router = { config, pkgs, lib, ... }:
-    with lib;
+  router = { config, pkgs, ... }:
+    with pkgs.lib;
     let
       vlanIfs = range 1 (length config.virtualisation.vlans);
     in {
@@ -84,7 +85,7 @@ let
     static = {
       name = "Static";
       nodes.router = router;
-      nodes.client = { pkgs, lib, ... }: with lib; {
+      nodes.client = { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ 1 2 ];
         networking = {
           useNetworkd = networkd;
@@ -136,7 +137,7 @@ let
     dhcpSimple = {
       name = "SimpleDHCP";
       nodes.router = router;
-      nodes.client = { pkgs, lib, ... }: with lib; {
+      nodes.client = { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ 1 2 ];
         networking = {
           useNetworkd = networkd;
@@ -192,7 +193,7 @@ let
     dhcpOneIf = {
       name = "OneInterfaceDHCP";
       nodes.router = router;
-      nodes.client = { pkgs, lib, ... }: with lib; {
+      nodes.client = { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ 1 2 ];
         networking = {
           useNetworkd = networkd;
@@ -231,7 +232,7 @@ let
         '';
     };
     bond = let
-      node = address: { pkgs, lib, ... }: with lib; {
+      node = address: { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ 1 2 ];
         networking = {
           useNetworkd = networkd;
@@ -267,7 +268,7 @@ let
         '';
     };
     bridge = let
-      node = { address, vlan }: { pkgs, lib, ... }: with lib; {
+      node = { address, vlan }: { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ vlan ];
         networking = {
           useNetworkd = networkd;
@@ -280,7 +281,7 @@ let
       name = "Bridge";
       nodes.client1 = node { address = "192.168.1.2"; vlan = 1; };
       nodes.client2 = node { address = "192.168.1.3"; vlan = 2; };
-      nodes.router = { pkgs, lib, ... }: with lib; {
+      nodes.router = { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ 1 2 ];
         networking = {
           useNetworkd = networkd;
@@ -317,7 +318,7 @@ let
     macvlan = {
       name = "MACVLAN";
       nodes.router = router;
-      nodes.client = { pkgs, lib, ... }: with lib; {
+      nodes.client = { pkgs, ... }: with pkgs.lib; {
         environment.systemPackages = [ pkgs.iptables ]; # to debug firewall rules
         virtualisation.vlans = [ 1 ];
         networking = {
@@ -371,7 +372,7 @@ let
         '';
     };
     sit = let
-      node = { address4, remote, address6 }: { pkgs, lib, ... }: with lib; {
+      node = { address4, remote, address6 }: { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ 1 ];
         networking = {
           useNetworkd = networkd;
@@ -413,7 +414,7 @@ let
         '';
     };
     vlan = let
-      node = address: { pkgs, lib, ... }: with lib; {
+      node = address: { pkgs, ... }: with pkgs.lib; {
         #virtualisation.vlans = [ 1 ];
         networking = {
           useNetworkd = networkd;
@@ -526,7 +527,7 @@ let
           '';
         };
       };
-      nodes.client_with_privacy = { pkgs, lib, ... }: with lib; {
+      nodes.client_with_privacy = { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ 1 ];
         networking = {
           useNetworkd = networkd;
@@ -539,7 +540,7 @@ let
           };
         };
       };
-      nodes.client = { pkgs, lib, ... }: with lib; {
+      nodes.client = { pkgs, ... }: with pkgs.lib; {
         virtualisation.vlans = [ 1 ];
         networking = {
           useNetworkd = networkd;
@@ -602,9 +603,9 @@ let
 
       testScript = ''
         targetIPv4Table = """
-        10.0.0.0/16 proto static scope link mtu 1500
-        192.168.1.0/24 proto kernel scope link src 192.168.1.2
-        192.168.2.0/24 via 192.168.1.1 proto static
+        10.0.0.0/16 proto static scope link mtu 1500 
+        192.168.1.0/24 proto kernel scope link src 192.168.1.2 
+        192.168.2.0/24 via 192.168.1.1 proto static 
         """.strip()
 
         targetIPv6Table = """
@@ -654,33 +655,8 @@ let
             ), "The IPv6 routing table has not been properly cleaned:\n{}".format(ipv6Residue)
       '';
     };
-    # even with disabled networkd, systemd.network.links should work
-    # (as it's handled by udev, not networkd)
-    link = {
-      name = "Link";
-      nodes.client = { pkgs, ... }: {
-        virtualisation.vlans = [ 1 ];
-        networking = {
-          useNetworkd = networkd;
-          useDHCP = false;
-        };
-        systemd.network.links."50-foo" = {
-          matchConfig = {
-            Name = "foo";
-            Driver = "dummy";
-          };
-          linkConfig.MTUBytes = "1442";
-        };
-      };
-      testScript = ''
-        print(client.succeed("ip l add name foo type dummy"))
-        print(client.succeed("stat /etc/systemd/network/50-foo.link"))
-        client.succeed("udevadm settle")
-        assert "mtu 1442" in client.succeed("ip l show dummy0")
-      '';
-    };
   };
 
-in pkgs.lib.mapAttrs (pkgs.lib.const (attrs: makeTest (attrs // {
+in mapAttrs (const (attrs: makeTest (attrs // {
   name = "${attrs.name}-Networking-${if networkd then "Networkd" else "Scripted"}";
 }))) testCases

From e73a9e6b9526fe3ba2f1fae755fbe120e1c5240f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 8 Mar 2020 16:58:47 +0100
Subject: [PATCH 2963/4636] =?UTF-8?q?ocamlPackages.sedlex=5F2:=20fix=20bui?=
 =?UTF-8?q?ld=20with=20OCaml=20=E2=89=A5=204.08?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/sedlex/2.nix | 26 +++++++--------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/ocaml-modules/sedlex/2.nix b/pkgs/development/ocaml-modules/sedlex/2.nix
index 09390a27343f..26c35b983392 100644
--- a/pkgs/development/ocaml-modules/sedlex/2.nix
+++ b/pkgs/development/ocaml-modules/sedlex/2.nix
@@ -1,16 +1,15 @@
-{ stdenv
+{ lib
 , fetchFromGitHub
 , fetchurl
+, buildDunePackage
 , ocaml
-, dune
-, findlib
 , gen
 , ppx_tools_versioned
 , ocaml-migrate-parsetree
 , uchar
 }:
 
-if stdenv.lib.versionOlder ocaml.version "4.02.3"
+if lib.versionOlder ocaml.version "4.02.3"
 then throw "sedlex is not available for OCaml ${ocaml.version}"
 else
 
@@ -28,8 +27,8 @@ let
     sha256 = "0gsb1jpj3mnqbjgbavi4l95gl6g4agq58j82km22fdfg63j3w3fk";
   };
 in
-stdenv.mkDerivation rec {
-  name = "ocaml${ocaml.version}-sedlex-${version}";
+buildDunePackage rec {
+  pname = "sedlex";
   version = "2.1";
 
   src = fetchFromGitHub {
@@ -39,7 +38,7 @@ stdenv.mkDerivation rec {
     sha256 = "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26";
   };
 
-  buildInputs = [ ocaml findlib dune ppx_tools_versioned ocaml-migrate-parsetree ];
+  buildInputs = [ ppx_tools_versioned ocaml-migrate-parsetree ];
 
   propagatedBuildInputs = [ gen uchar ];
 
@@ -49,21 +48,14 @@ stdenv.mkDerivation rec {
     ln -s ${PropList} src/generator/data/PropList.txt
   '';
 
-  buildFlags = [ "build" ];
-
-  installPhase = ''
-    make INSTALL_ARGS="--prefix=$out --libdir=$OCAMLFIND_DESTDIR" install
-  '';
-
-  createFindlibDestdir = true;
+  doCheck = true;
 
   dontStrip = true;
 
   meta = {
     homepage = https://github.com/ocaml-community/sedlex;
     description = "An OCaml lexer generator for Unicode";
-    license = stdenv.lib.licenses.mit;
-    inherit (ocaml.meta) platforms;
-    maintainers = [ stdenv.lib.maintainers.marsam ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.marsam ];
   };
 }

From 4adfbe6c7be299b8be09ae04b2b18c33c1b2261b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 8 Mar 2020 16:58:51 +0100
Subject: [PATCH 2964/4636] unison: move out of ocamlPackages

---
 pkgs/applications/networking/sync/unison/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix                      | 5 ++++-
 pkgs/top-level/ocaml-packages.nix                    | 4 ----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix
index cada3f93f55a..c29bd3a486cc 100644
--- a/pkgs/applications/networking/sync/unison/default.nix
+++ b/pkgs/applications/networking/sync/unison/default.nix
@@ -1,6 +1,8 @@
-{stdenv, fetchFromGitHub, ocaml, lablgtk, fontschumachermisc, xset, makeWrapper, ncurses
+{stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses
 , enableX11 ? true}:
 
+let inherit (ocamlPackages) ocaml lablgtk; in
+
 stdenv.mkDerivation (rec {
 
   pname = "unison";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57830fcea6f4..db737c3e2a6e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22045,7 +22045,10 @@ in
 
   unigine-valley = callPackage ../applications/graphics/unigine-valley { };
 
-  inherit (ocaml-ng.ocamlPackages_4_05) unison;
+  unison = callPackage ../applications/networking/sync/unison {
+    enableX11 = config.unison.enableX11 or true;
+    ocamlPackages = ocaml-ng.ocamlPackages_4_05;
+  };
 
   unpaper = callPackage ../tools/graphics/unpaper { };
 
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 002e3bebbb2c..0a3cbc6f1c3a 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1198,10 +1198,6 @@ let
 
     google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { };
 
-    unison = callPackage ../applications/networking/sync/unison {
-      enableX11 = config.unison.enableX11 or true;
-    };
-
     hol_light = callPackage ../applications/science/logic/hol_light { };
 
   })).overrideScope' liftJaneStreet;

From bdcba831536204028faa9861b55ee7236cbce329 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 8 Mar 2020 16:58:54 +0100
Subject: [PATCH 2965/4636] =?UTF-8?q?ocamlPackages.earley:=20disable=20for?=
 =?UTF-8?q?=20OCaml=20=E2=89=A5=204.08?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/earley/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/earley/default.nix b/pkgs/development/ocaml-modules/earley/default.nix
index ab3011361e12..f47231a242e0 100644
--- a/pkgs/development/ocaml-modules/earley/default.nix
+++ b/pkgs/development/ocaml-modules/earley/default.nix
@@ -1,4 +1,8 @@
-{ lib, fetchurl, buildDunePackage }:
+{ lib, fetchurl, ocaml, buildDunePackage }:
+
+if lib.versionAtLeast ocaml.version "4.08"
+then throw "earley is not available for OCaml ${ocaml.version}"
+else
 
 buildDunePackage rec {
   version = "2.0.0";

From 4ada24a02ca53ab90337c52bb0ea95262a7a6a7a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 8 Mar 2020 16:58:58 +0100
Subject: [PATCH 2966/4636] =?UTF-8?q?ocamlPackages.earlybird:=20disable=20?=
 =?UTF-8?q?for=20OCaml=20=E2=89=A5=204.08?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/earlybird/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/earlybird/default.nix b/pkgs/development/ocaml-modules/earlybird/default.nix
index 1a98c748e456..decbb4117670 100644
--- a/pkgs/development/ocaml-modules/earlybird/default.nix
+++ b/pkgs/development/ocaml-modules/earlybird/default.nix
@@ -1,7 +1,11 @@
-{ lib, fetchurl, buildDunePackage, angstrom, angstrom-lwt-unix,
+{ lib, fetchurl, ocaml, buildDunePackage, angstrom, angstrom-lwt-unix,
   batteries, cmdliner, lwt_ppx, ocaml_lwt, ppx_deriving_yojson,
   ppx_tools_versioned, yojson }:
 
+if lib.versionAtLeast ocaml.version "4.08"
+then throw "earlybird is not available for OCaml ${ocaml.version}"
+else
+
 buildDunePackage rec {
   pname = "earlybird";
   version = "0.1.5";

From bab3588e4e0c09ecdc97735311b09467bba5bbc4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 8 Mar 2020 16:59:01 +0100
Subject: [PATCH 2967/4636] =?UTF-8?q?ocamlPackages.wasm:=20disable=20for?=
 =?UTF-8?q?=20OCaml=20=E2=89=A5=204.08?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/wasm/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix
index e10a67a50a0d..fe3d4ea0e863 100644
--- a/pkgs/development/ocaml-modules/wasm/default.nix
+++ b/pkgs/development/ocaml-modules/wasm/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
 
 if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+ || stdenv.lib.versionAtLeast ocaml.version "4.08"
 then throw "wasm is not available for OCaml ${ocaml.version}"
 else
 

From 4ce4db473c9d43d2ff42e643c800067a879f9f4f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 8 Mar 2020 16:59:04 +0100
Subject: [PATCH 2968/4636] =?UTF-8?q?ocamlPackages.ocf:=20disable=20for=20?=
 =?UTF-8?q?OCaml=20=E2=89=A5=204.08?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/ocf/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/pkgs/development/ocaml-modules/ocf/default.nix
index 0452b1b7dfe4..e90d13de3b39 100644
--- a/pkgs/development/ocaml-modules/ocf/default.nix
+++ b/pkgs/development/ocaml-modules/ocf/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ppx_tools, yojson }:
 
 if stdenv.lib.versionOlder ocaml.version "4.03"
+|| stdenv.lib.versionAtLeast ocaml.version "4.08"
 then throw "ocf not supported for ocaml ${ocaml.version}"
 else
 stdenv.mkDerivation rec {

From 7b33cbdbf5dea320836fae7918926322aa1c4132 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 8 Mar 2020 16:59:07 +0100
Subject: [PATCH 2969/4636] OCaml: default to version 4.08

---
 pkgs/top-level/all-packages.nix   | 20 +++++++++++++++-----
 pkgs/top-level/ocaml-packages.nix |  2 +-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db737c3e2a6e..8d10404e05f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4551,6 +4551,7 @@ in
 
   liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix {
     ffmpeg = ffmpeg-full;
+    ocamlPackages = ocaml-ng.ocamlPackages_4_07;
   };
 
   lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { };
@@ -8361,7 +8362,9 @@ in
 
   fsharp41 = callPackage ../development/compilers/fsharp41 { mono = mono6; };
 
-  fstar = callPackage ../development/compilers/fstar { };
+  fstar = callPackage ../development/compilers/fstar {
+    ocamlPackages = ocaml-ng.ocamlPackages_4_07;
+  };
 
   dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {});
 
@@ -10163,6 +10166,7 @@ in
   fffuu = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../tools/misc/fffuu { });
 
   flow = callPackage ../development/tools/analysis/flow {
+    ocamlPackages = ocaml-ng.ocamlPackages_4_07;
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
@@ -21722,7 +21726,7 @@ in
 
   stalonetray = callPackage ../applications/window-managers/stalonetray {};
 
-  inherit (ocamlPackages) stog;
+  inherit (ocaml-ng.ocamlPackages_4_07) stog;
 
   stp = callPackage ../applications/science/logic/stp { };
 
@@ -24409,7 +24413,9 @@ in
 
   abc-verifier = callPackage ../applications/science/logic/abc {};
 
-  abella = callPackage ../applications/science/logic/abella {};
+  abella = callPackage ../applications/science/logic/abella {
+    ocamlPackages = ocaml-ng.ocamlPackages_4_07;
+  };
 
   acgtk = callPackage ../applications/science/logic/acgtk {};
 
@@ -24417,7 +24423,9 @@ in
 
   aspino = callPackage ../applications/science/logic/aspino {};
 
-  beluga = callPackage ../applications/science/logic/beluga { };
+  beluga = callPackage ../applications/science/logic/beluga {
+    ocamlPackages = ocaml-ng.ocamlPackages_4_07;
+  };
 
   boogie = dotnetPackages.Boogie;
 
@@ -24765,7 +24773,9 @@ in
   golly = callPackage ../applications/science/misc/golly { wxGTK = wxGTK30; };
   golly-beta = callPackage ../applications/science/misc/golly/beta.nix { wxGTK = wxGTK30; };
 
-  megam = callPackage ../applications/science/misc/megam { };
+  megam = callPackage ../applications/science/misc/megam {
+    inherit (ocaml-ng.ocamlPackages_4_07) ocaml;
+  };
 
   netlogo = callPackage ../applications/science/misc/netlogo { };
 
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 0a3cbc6f1c3a..e8a6bc21035b 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1229,5 +1229,5 @@ in let inherit (pkgs) callPackage; in rec
 
   ocamlPackages_latest = ocamlPackages_4_10;
 
-  ocamlPackages = ocamlPackages_4_07;
+  ocamlPackages = ocamlPackages_4_08;
 }

From 29f7f3037ed8ec534eca6089e9245bf5d8a02a9b Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 12 Mar 2020 11:38:37 -0700
Subject: [PATCH 2970/4636] dwarf-therapist: 41.1.3 -> 41.1.5

---
 pkgs/games/dwarf-fortress/dwarf-therapist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index be0d57f45d9c..4485b3ae784a 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dwarf-therapist";
-  version = "41.1.3";
+  version = "41.1.5";
 
   src = fetchFromGitHub {
     owner = "Dwarf-Therapist";
     repo = "Dwarf-Therapist";
     rev = "v${version}";
-    sha256 = "15f6npbfgsxsr6pm2vxpali8f6nyyk80bcyhy9s77n064q0qg2nj";
+    sha256 = "0w1mwwf49vdmvmdfvlkn4m0hzvlj111rpl8hv4rw6v8nv6yfb2y4";
   };
 
   nativeBuildInputs = [ texlive cmake ninja ];

From c9f216d5d5854e8dcd8178be55cfe06558dfef2f Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 12 Mar 2020 11:40:32 -0700
Subject: [PATCH 2971/4636] dwarf-fortress: 0.47.02 -> 0.47.04

---
 pkgs/games/dwarf-fortress/default.nix        |  2 +-
 pkgs/games/dwarf-fortress/dfhack/default.nix |  6 ++++++
 pkgs/games/dwarf-fortress/game.json          | 14 ++++++++++++++
 pkgs/games/dwarf-fortress/twbt/default.nix   |  5 +++++
 pkgs/games/dwarf-fortress/unfuck.nix         |  4 ++++
 5 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index 4f88e36a2f6c..0664af117e1e 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -40,7 +40,7 @@ let
   # The latest Dwarf Fortress version. Maintainers: when a new version comes
   # out, ensure that (unfuck|dfhack|twbt) are all up to date before changing
   # this.
-  latestVersion = "0.47.02";
+  latestVersion = "0.47.04";
 
   # Converts a version to a package name.
   versionToName = version: "dwarf-fortress_${lib.replaceStrings ["."] ["_"] version}";
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index b27dc9c058c7..2467053cc1a6 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -52,6 +52,12 @@ let
       xmlRev = "23500e4e9bd1885365d0a2ef1746c321c1dd509a";
       prerelease = true;
     };
+    "0.47.04" = {
+      dfHackRelease = "0.47.04-alpha0";
+      sha256 = "07056k6717mqim9skwjprqplj8jmmli6g4p2c72c8000jwnn2hjy";
+      xmlRev = "23500e4e9bd1885365d0a2ef1746c321c1dd50aa";
+      prerelease = true;
+    };
   };
 
   release = if hasAttr dfVersion dfhack-releases
diff --git a/pkgs/games/dwarf-fortress/game.json b/pkgs/games/dwarf-fortress/game.json
index daef15575d51..f5f1f389904f 100644
--- a/pkgs/games/dwarf-fortress/game.json
+++ b/pkgs/games/dwarf-fortress/game.json
@@ -107,5 +107,19 @@
     "legacy_s": "1jxf52kaijf4crwxj30a4f6z7rzs6xa91y6vn5s8jr0cvbr5pz64",
     "legacy32": "0j7shqdv3gimacj03cil2y0fmr0j0fp57cwmdjwnxwx3m96k3xwm",
     "legacy32_s": "1wc7pcp9dwz0q1na3i5pbqknya595qdkmr7hsmgh2kk8rsp3g9g2"
+  },
+  "0.47.04": {
+    "linux": "1ri82c5hja6n0wv538srf2nbcyb8ip49w4l201m90cmcycmqgr8x",
+    "linux32": "00yz8gl75sbx15d7vl22ij0a5qd325kpc9mgm1lh5g7i065vgzn8",
+    "osx": "0c1g655bn5n4pbzxw3v83gmy54va5y87m7ksi6iryfal0m9lshhv",
+    "osx32": "1knfgqbwa7v9va1w6i8yzz6xp3dj633dbs50izx6ldszm0ra42pg",
+    "win": "0j7ixr3rf9900zzfw3nd3vg97kdkspm530cmf9dkwhf6klmpks7s",
+    "win_s": "11amw5gjhi753mvf17wifcjiyikjx0qwa16787gfhj9jfp0yw764",
+    "win32": "1xw9f49n85c31kbzkm5zh81kccjx9msjyy3xwr0klak5w398a59l",
+    "win32_s": "0s26hrgfk2b5wg4dvg90wgw1mvrrvbyjhmsys9f5fl7zn1pjbxxr",
+    "legacy": "103bcnn8gxi2rkpjmjfgv5a5kxmh1zd7vagrsscv55sppd7fcl7n",
+    "legacy_s": "19ai7lvxx0y3iha9qrbl5krric547rzs6vm4ibk8x61vv97jrbd8",
+    "legacy32": "0lli6s1g7yj3p3h26ajgq3h619n88qn6s7amyz6z8w7hyzfi7wij",
+    "legacy32_s": "1wzxbzgln9pmsk2nchrl94d2yd09xdgynmjl4qwcaqzkrnf3sfqc"
   }
 }
diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix
index 86ff8a6bc446..011284bcff5d 100644
--- a/pkgs/games/dwarf-fortress/twbt/default.nix
+++ b/pkgs/games/dwarf-fortress/twbt/default.nix
@@ -41,6 +41,11 @@ let
       sha256 = "07bqy9rkd64h033sxdpigp5zq4xrr0xd36wdr1b21g649mv8j6yw";
       prerelease = false;
     };
+    "0.47.04" = {
+      twbtRelease = "6.61";
+      sha256 = "07bqy9rkd64h033sxdpigp5zq4xrr0xd36wdr1b21g649mv8j6yw";
+      prerelease = false;
+    };
   };
 
   release = if hasAttr dfVersion twbt-releases
diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix
index e9d172f212df..ccf44ee5ca13 100644
--- a/pkgs/games/dwarf-fortress/unfuck.nix
+++ b/pkgs/games/dwarf-fortress/unfuck.nix
@@ -40,6 +40,10 @@ let
       unfuckRelease = "0.47.01";
       sha256 = "11xvb3qh4crdf59pwfwpi73rzm3ysd1r1xp2k1jp7527jmqapk4k";
     };
+    "0.47.04" = {
+      unfuckRelease = "0.47.04";
+      sha256 = "1wa990xbsyiiz7abq153xmafvvk1dmgz33rp907d005kzl1z86i9";
+    };
   };
 
   release = if hasAttr dfVersion unfuck-releases

From de36c3b073f99999a60fbbd50217e787b84e67b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Fri, 13 Mar 2020 23:12:34 +0100
Subject: [PATCH 2972/4636] python37Packages.vtk: Fix build (#82336)

---
 pkgs/development/libraries/vtk/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix
index 4acb2b38b81c..f79f79a62597 100644
--- a/pkgs/development/libraries/vtk/default.nix
+++ b/pkgs/development/libraries/vtk/default.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchurl, cmake, libGLU, libGL, libX11, xorgproto, libXt, libtiff
+, fetchpatch
 , qtLib ? null
 , enablePython ? false, python ? null
 # Darwin support
@@ -21,6 +22,13 @@ stdenv.mkDerivation rec {
     sha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://gitlab.kitware.com/vtk/vtk/-/commit/706f1b397df09a27ab8981ab9464547028d0c322.diff";
+      sha256 = "1q3pi5h40g05pzpbqp75xlgzvbfvyw8raza51svmi7d8dlslqybx";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [ libtiff ]
@@ -60,7 +68,7 @@ stdenv.mkDerivation rec {
     description = "Open source libraries for 3D computer graphics, image processing and visualization";
     homepage = http://www.vtk.org/;
     license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ ];
+    maintainers = with stdenv.lib.maintainers; [ knedlsepp ];
     platforms = with stdenv.lib.platforms; unix;
   };
 }

From 25b7ba9cdab3993b160798d06f7d332668c4857c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 13 Mar 2020 17:32:40 -0500
Subject: [PATCH 2973/4636] antibody: set version

---
 pkgs/shells/zsh/antibody/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix
index 2793319c8942..c0ae5e03e6c3 100644
--- a/pkgs/shells/zsh/antibody/default.nix
+++ b/pkgs/shells/zsh/antibody/default.nix
@@ -4,8 +4,6 @@ buildGoModule rec {
   pname = "antibody";
   version = "4.3.1";
 
-  goPackagePath = "github.com/getantibody/antibody";
-
   src = fetchFromGitHub {
     owner = "getantibody";
     repo = "antibody";
@@ -15,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "08k4mzqcva7yq1zmfxhlqnd8kk70zry6cfghxl1bgmhnfjqh61qr";
 
+  buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
+
   meta = with lib; {
     description = "The fastest shell plugin manager";
     homepage = "https://github.com/getantibody/antibody";

From 2b99b29136be560b733780565209ea9a8ae09cdf Mon Sep 17 00:00:00 2001
From: Matteo Scarlata <matteo@hjkl.space>
Date: Thu, 12 Mar 2020 21:24:46 +0100
Subject: [PATCH 2974/4636] virtualbox: 6.0.14 -> 6.1.4

Update Virtualbox to its latest version. This allows compilation against
kernel >= 5.4 to succeed without further patches (see #74260, build
would fail for linux-5.5.5 to 5.5.9).
---
 .../virtualization/virtualbox/default.nix     | 25 +-------
 .../virtualbox/extra_symbols.patch            | 21 ++++++
 .../virtualbox/guest-additions/default.nix    | 64 +------------------
 .../virtualization/virtualbox/hardened.patch  | 52 +++++++--------
 4 files changed, 53 insertions(+), 109 deletions(-)
 create mode 100644 pkgs/applications/virtualization/virtualbox/extra_symbols.patch

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 6c15b2ea2ced..5d3044bdbc71 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -21,8 +21,8 @@ let
   buildType = "release";
   # Remember to change the extpackRev and version in extpack.nix and
   # guest-additions/default.nix as well.
-  main = "036x2mvkk22lbg72cz6pik9z538j1ag6mmwjjmfikgrq1i7v24jy";
-  version = "6.0.14";
+  main = "59f8f5774473f593e3eb5940e2a337e0674bcd9854164b2578fd43f896260c99";
+  version = "6.1.4";
 
   iasl' = iasl.overrideAttrs (old: rec {
     inherit (old) pname;
@@ -89,6 +89,7 @@ in stdenv.mkDerivation {
 
   patches =
      optional enableHardening ./hardened.patch
+  ++ [ ./extra_symbols.patch ]
      # When hardening is enabled, we cannot use wrapQtApp to ensure that VirtualBoxVM sees
      # the correct environment variables needed for Qt to work, specifically QT_PLUGIN_PATH.
      # This is because VirtualBoxVM would detect that it is wrapped that and refuse to run,
@@ -102,26 +103,6 @@ in stdenv.mkDerivation {
     })
   ++ [
     ./qtx11extras.patch
-    # Kernel 5.4 fix, should be fixed with next upstream release
-    # https://www.virtualbox.org/ticket/18945
-    (fetchpatch {
-      name = "kernel-5.4-fix-1.patch";
-      url = "https://www.virtualbox.org/changeset/81586/vbox?format=diff";
-      sha256 = "0zbkc9v65pkdmjik53x29g39qyf7narkhpwpx5n1n1bfqnhf0k1r";
-      stripLen = 1;
-    })
-    (fetchpatch {
-      name = "kernel-5.4-fix-2.patch";
-      url = "https://www.virtualbox.org/changeset/81587/vbox?format=diff";
-      sha256 = "1j98cqxj8qlqwaqr4mvwwbkmchw8jmygjwgzz82gix7fj76j2y9c";
-      stripLen = 1;
-    })
-    (fetchpatch {
-      name = "kernel-5.4-fix-3.patch";
-      url = "https://www.virtualbox.org/changeset/81649/vbox?format=diff";
-      sha256 = "1d6p5k5dgzmjglqfkbcbvpn1x3wxila30q4gcbb7pxwfgclaw2hk";
-      stripLen = 1;
-    })
   ];
 
   postPatch = ''
diff --git a/pkgs/applications/virtualization/virtualbox/extra_symbols.patch b/pkgs/applications/virtualization/virtualbox/extra_symbols.patch
new file mode 100644
index 000000000000..174bb8d9e70c
--- /dev/null
+++ b/pkgs/applications/virtualization/virtualbox/extra_symbols.patch
@@ -0,0 +1,21 @@
+diff --git a/src/VBox/HostDrivers/linux/Makefile b/src/VBox/HostDrivers/linux/Makefile
+index 6e44129b..e68ce128 100644
+--- a/src/VBox/HostDrivers/linux/Makefile
++++ b/src/VBox/HostDrivers/linux/Makefile
+@@ -95,13 +95,13 @@ vboxpci: vboxdrv
+ install:
+ 	@$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxdrv install
+ 	@if [ -d vboxnetflt ]; then \
+-	    $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetflt install; \
++		$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxnetflt/Module.symvers) -C vboxnetflt install; \
+ 	fi
+ 	@if [ -d vboxnetadp ]; then \
+-	    $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetadp install; \
++	    $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxnetadp/Module.symvers) -C vboxnetadp install; \
+ 	fi
+ 	@if [ -d vboxpci ]; then \
+-	    $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxpci install; \
++	    $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxpci/Module.symvers) -C vboxpci install; \
+ 	fi
+ 
+ else
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 690b72f3eeb0..fdb393a94ebe 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper
-, zlib, xorg, dbus, virtualbox, dos2unix, fetchpatch, findutils, patchutils }:
+, zlib, xorg, dbus, virtualbox}:
 
 let
   version = virtualbox.version;
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "1c9ysx0fhxxginmp607b4fk74dvlr32n6w52gawm06prf4xg90nb";
+    sha256 = "e2846a7576cce1b92a7c0744f41eaac750248d6e31dfca5c45d5766648b394c7";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
@@ -43,67 +43,9 @@ in stdenv.mkDerivation rec {
   prePatch = ''
     substituteInPlace src/vboxguest-${version}/vboxvideo/vbox_ttm.c \
       --replace "<ttm/" "<drm/ttm/"
-    
-    echo ${lib.escapeShellArgs patches} | \
-      ${findutils}/bin/xargs -n1 ${patchutils}/bin/lsdiff --strip=1 --addprefix=src/vboxguest-${version}/ | \
-      ${findutils}/bin/xargs ${dos2unix}/bin/dos2unix
   '';
 
   patchFlags = [ "-p1" "-d" "src/vboxguest-${version}" ];
-  # Kernel 5.4 fix, should be fixed with next upstream release
-  # https://www.virtualbox.org/ticket/18945
-  patches = lib.concatLists (lib.mapAttrsToList (changeset: args:
-    map (arg:
-      fetchpatch ({
-        name = "kernel-5.4-fix-${changeset}.patch";
-        url = "https://www.virtualbox.org/changeset/${changeset}/vbox?format=diff";
-      } // arg)) args) {
-        "81586" = [{
-          sha256 = "126z67x6vy65w6jlqbh4z4f1cffxnycwb69vns0154bawbsbxsiw";
-          stripLen = 5;
-          extraPrefix = "vboxguest/";
-        }];
-        "81587" = [
-          {
-            sha256 = "0simzswnl0wvnc2i9gixz99rfc7lxk1nrnskksrlrrl9hqnh0lva";
-            stripLen = 5;
-            extraPrefix = "vboxsf/";
-            includes = [ "*/the-linux-kernel.h" ];
-          }
-          {
-            sha256 = "0a8r9h3x3lcjq2fykgqhdaykp00rnnkbxz8xnxg847zgvca15y02";
-            stripLen = 5;
-            extraPrefix = "vboxguest/";
-            includes = [ "*/the-linux-kernel.h" ];
-          }
-        ];
-        "81649" = [
-          {
-            sha256 = "1p1skxlvqigydxr4sk7w51lpk7nxg0d9lppq39sdnfmgi1z0h0sc";
-            stripLen = 2;
-            extraPrefix = "vboxguest/";
-            includes = [ "*/cdefs.h" ];
-          }
-          {
-            sha256 = "1j060ggdnndyjdhkfvs15306gl7g932sim9xjmx2mnx8gjdmg37f";
-            stripLen = 2;
-            extraPrefix = "vboxsf/";
-            includes = [ "*/cdefs.h" ];
-          }
-          {
-            sha256 = "060h3a5k2yklbvlg0hyg4x87xrg37cvv3rjb67xizlwvlyy6ykkg";
-            stripLen = 5;
-            extraPrefix = "vboxguest/";
-            includes = [ "*/thread2-r0drv-linux.c" ];
-          }
-          {
-            sha256 = "0cxlkf7cy751gl8dgzr7vkims1kmx5pgzsrxyk8w18zyp5nk9glw";
-            stripLen = 7;
-            extraPrefix = "vboxvideo/";
-            includes = [ "*/vbox_*.c" ];
-          }
-        ];
-      });
 
   unpackPhase = ''
     ${if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then ''
@@ -162,7 +104,7 @@ in stdenv.mkDerivation rec {
   installPhase = ''
     # Install kernel modules.
     cd src/vboxguest-${version}
-    make install INSTALL_MOD_PATH=$out
+    make install INSTALL_MOD_PATH=$out KBUILD_EXTRA_SYMBOLS=$PWD/vboxsf/Module.symvers
     cd ../..
 
     # Install binaries
diff --git a/pkgs/applications/virtualization/virtualbox/hardened.patch b/pkgs/applications/virtualization/virtualbox/hardened.patch
index 398100f3f398..180ea88461ef 100644
--- a/pkgs/applications/virtualization/virtualbox/hardened.patch
+++ b/pkgs/applications/virtualization/virtualbox/hardened.patch
@@ -75,32 +75,6 @@ index ce0f288..6193108 100644
              return supR3HardenedSetError3(VERR_SUPLIB_WRITE_NON_SYS_GROUP, pErrInfo,
                                            "An unknown (and thus untrusted) group has write access to '", pszPath,
                                            "' and we therefore cannot trust the directory content or that of any subdirectory");
-diff --git a/src/VBox/Main/src-server/MachineImpl.cpp b/src/VBox/Main/src-server/MachineImpl.cpp
-index 320c569..9bfe41f 100644
---- a/src/VBox/Main/src-server/MachineImpl.cpp
-+++ b/src/VBox/Main/src-server/MachineImpl.cpp
-@@ -7543,7 +7543,7 @@ HRESULT Machine::i_launchVMProcess(IInternalSessionControl *aControl,
-
-     /* get the path to the executable */
-     char szPath[RTPATH_MAX];
--    RTPathAppPrivateArch(szPath, sizeof(szPath) - 1);
-+    RTStrCopy(szPath, sizeof(szPath) - 1, "/run/wrappers/bin");
-     size_t cchBufLeft = strlen(szPath);
-     szPath[cchBufLeft++] = RTPATH_DELIMITER;
-     szPath[cchBufLeft] = 0;
-diff --git a/src/VBox/Main/src-server/NetworkServiceRunner.cpp b/src/VBox/Main/src-server/NetworkServiceRunner.cpp
-index 1e38d99..5e43dda 100644
---- a/src/VBox/Main/src-server/NetworkServiceRunner.cpp
-+++ b/src/VBox/Main/src-server/NetworkServiceRunner.cpp
-@@ -85,7 +85,7 @@ int NetworkServiceRunner::start(bool aKillProcOnStop)
-
-     /* get the path to the executable */
-     char exePathBuf[RTPATH_MAX];
--    const char *exePath = RTProcGetExecutablePath(exePathBuf, RTPATH_MAX);
-+    const char *exePath = RTProcGetSuidPath(exePathBuf, RTPATH_MAX);
-     char *substrSl = strrchr(exePathBuf, '/');
-     char *substrBs = strrchr(exePathBuf, '\\');
-     char *suffix = substrSl ? substrSl : substrBs;
 diff --git a/src/VBox/Main/src-server/generic/NetIf-generic.cpp b/src/VBox/Main/src-server/generic/NetIf-generic.cpp
 index 98dc91a..43a819f 100644
 --- a/src/VBox/Main/src-server/generic/NetIf-generic.cpp
@@ -180,3 +154,29 @@ index 2aab645..9795f21 100644
 
  RTR3DECL(const char *) RTProcShortName(void)
  {
+diff --git a/src/VBox/Main/src-server/NetworkServiceRunner.cpp b/src/VBox/Main/src-server/NetworkServiceRunner.cpp
+index 2e57690..3272c84 100644
+--- a/src/VBox/Main/src-server/NetworkServiceRunner.cpp
++++ b/src/VBox/Main/src-server/NetworkServiceRunner.cpp
+@@ -188,7 +188,7 @@ int NetworkServiceRunner::start(bool aKillProcessOnStop)
+      * ASSUME it is relative to the directory that holds VBoxSVC.
+      */
+     char szExePath[RTPATH_MAX];
+-    AssertReturn(RTProcGetExecutablePath(szExePath, RTPATH_MAX), VERR_FILENAME_TOO_LONG);
++    AssertReturn(RTProcGetSuidPath(szExePath, RTPATH_MAX), VERR_FILENAME_TOO_LONG);
+     RTPathStripFilename(szExePath);
+     int vrc = RTPathAppend(szExePath, sizeof(szExePath), m->pszProcName);
+     AssertLogRelRCReturn(vrc, vrc);
+diff --git a/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp b/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp
+index 2991d3a7..d042a08b 100644
+--- a/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp
++++ b/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp
+@@ -90,7 +90,7 @@ int MachineLaunchVMCommonWorker(const Utf8Str &aNameOrId,
+ 
+     /* Get the path to the executable directory w/ trailing slash: */
+     char szPath[RTPATH_MAX];
+-    int vrc = RTPathAppPrivateArch(szPath, sizeof(szPath));
++    int vrc = RTStrCopy(szPath, sizeof(szPath) - 1, "/run/wrappers/bin");
+     AssertRCReturn(vrc, vrc);
+     size_t cbBufLeft = RTPathEnsureTrailingSeparator(szPath, sizeof(szPath));
+     AssertReturn(cbBufLeft > 0, VERR_FILENAME_TOO_LONG);

From 833031704d7d6027345f5f1c2d909961e7535128 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 13 Mar 2020 03:12:17 +0900
Subject: [PATCH 2975/4636] thunderbird-bin: 68.5.0 -> 68.6.0

---
 .../thunderbird-bin/release_sources.nix       | 490 +++++++++---------
 1 file changed, 245 insertions(+), 245 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index f8d8c2627fec..e5ef55678006 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,615 +1,615 @@
 {
-  version = "68.5.0";
+  version = "68.6.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ar/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ar/thunderbird-68.6.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "dc71109c963e9b8e162437e33feec002268b392cba9ebbfb37714aa79e834143641b92488c3c923256b1d0058c92e6502caf4f022b17145d8e0f67fa7d77b7c1";
+      sha512 = "af46815cdcaa2f9d7819f9d38d9d924813e28784a94829717301fc603175a7e0c6d20b698f76125bc7a31be83753df65e155c36643c77e18eb48ac57257a4969";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ast/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ast/thunderbird-68.6.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "2768582e13905d162eacb051209a3ff5c7f704ff95efa3339cf8ecdfce3f892e76e79e65d11c4638a8f4529177a7b2efb12d7c6ac308c1d02b93da361bb9cd23";
+      sha512 = "484b7abf08bbbb5a6302d35f4d6f5b40ecbba900b40b11d1e40f46e613af4c51a17413844bc8d5792b55bc11f5585d1ec8956cef99c7c1c6b6255389a34e7256";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/be/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/be/thunderbird-68.6.0.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "dfb0806383acb8bbe817be30c4ad1ed34f21e68dea71e249226b07fdf4d1226c88690962f228b6d3f5d0205501be2dddf985b9f99b8eae37400362f1a0be1979";
+      sha512 = "32e26ea9effd43c50ca27c59e9e65dc2beb882fbb0df2d7ae7eca41fd736b740872c756a3722df69095bc6015657ffa314bf03d0ca6f8119ca861ac7835e8dde";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/bg/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/bg/thunderbird-68.6.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "194b1f645ca3b1607283d176e28e07e204abec90a96a85e9f2aeef0c1af8011c7dea3f0dfdc37402719380b26899c83800ecb79da194730e9c3fcfce1685778b";
+      sha512 = "cc19721c742e339e1c988759dc3cc6055e9c43b590075994774985158e366347a3bada182224a613e8f181491bcbee6a05712a63e0ee1d02de11e61442faea37";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/br/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/br/thunderbird-68.6.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "1b5513ea62c766d8dc7839fb9708dc63ab01e297a146a351d670aff3d6e7d6a842289da5da753fe649ff08a751b0fd0abee7a1fc71f7d0eebef375b72e929973";
+      sha512 = "590cffad2e7027a5b833462d752c3b4507c9ebc04af621013a745534091255ca1cfe6863d191200015057e6d1fe289691229c4e6242e8aa9047ca09b15d68ce4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ca/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ca/thunderbird-68.6.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "460c3b39881ab764fd7bedb10c27a2df5da6a907058010204d8849b87da42ce48f0038b05d0910b2c7df8339952dd781ea167687706494b92de2d0deebba8b81";
+      sha512 = "56f6a25c737d18da4662410710306d93290f9db851cf338d564d9088004f6169390797fde3afd720b376d642394ba4052bddbb5aeff100d6b9e97ef7d2a1ea19";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/cak/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/cak/thunderbird-68.6.0.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "f35ea0852f598285d86445d80839db0dac799760607bd83db528196ebaf3a77abf9f185a2b2f1044a7d5c0fd07383e8c0e020dcc7251817d6d3299d6cae63137";
+      sha512 = "45057e2f2b4cbcca5349f25c2396311ee8d5ed13fb329d471907dde9fad89810eeb72a5eac1adddcb86527c7a9bfc8dd190987d579f28ad5f6e1a9b2e0792ce8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/cs/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/cs/thunderbird-68.6.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "baac0a55a175fa4e9512c7ff2a82d986af049eadbde9e1136216ce1d5b384c4db3891ab8b5af420dc4a0635ba50a9d4908baed0f3a9f1ca0076596d20d5e15a0";
+      sha512 = "9c7452d7ff20c1c15f1f12cb06493ab65549aa934b86aa37ebd0be95e55f4156f155f5d3e7bbdaae79d02514292458ae7de14852072067f52715b0ba45ae99f6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/cy/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/cy/thunderbird-68.6.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "ef0b065b9d322772ec002d994140b2c9510f80d993c9c00aaa65d3314b9b4b7352ffdda6b84a916326deebfc8a12696d60a62d69f5aa13bbbacfbf9a5ccbe443";
+      sha512 = "6498688d0f18c1a307c19d3d738611993c35e56e67fae024d0676ec49dba6a752b883b539e2a83085c06f6065772ce393f4d0f9e0a898bf02a141e36ebbf523c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/da/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/da/thunderbird-68.6.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "1a9e3396d278cf9a02bb0bdc226036fd3cd6c86f47a4d9d00f4ca1031491a068b56c0b501799f75e385295ee50b013753376183b2bba73f0e95ae801507e0232";
+      sha512 = "ad306983ae608ce8fa6a706a6459d8047e00f156870e8dc2e6b0c6c07661d6a836e8599a590b2f166b819a8d5b0e75106be7e4db0e7746566cac9397b9c29f7f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/de/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/de/thunderbird-68.6.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "7b292fe10c09831c1b21141168aa136da9a2d78750bb5094633d2f58f85f3b4df69b6b638e00f097a1490050cf92f4bcc53cd4bef9a5539bb96cd2812971318d";
+      sha512 = "0449a38f90aff5e05a0b5382d108999c59049b8974592c3310fe2efaa8d0928e056fb3d81ad096975d6f9307adb79f9285853ef8339d3de88326b9d64bab086e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/dsb/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/dsb/thunderbird-68.6.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "3f26f768e5f400dc19d4069cb034878a3e0df059a5ec90cb70b06f138585ed976f58efb14ec54a3c0aac1e2fb8561c8e198f7a5822a40b37eff93a8e1c9ef3f2";
+      sha512 = "ea99eb1eab6e06da1bc62dfa8b1c203eb5b8d61027ae35f29cb38ec1c2753ae4d2d96ce93b39eba665c3a5c247dc4adf0654154bb19d5ecfcb0631dab9a38085";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/el/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/el/thunderbird-68.6.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "c6847200d45a169ef8a3bae3e2b7d45592d31429a205222e03f9d5365104e92be54dc4b07227b23c07abd425ee5383b5917d34362d4f37667b6f5addc9197514";
+      sha512 = "25241521666f05d2206188b8a7078d8db4585818511453f5359e19683305b5970d47636b37e4287d170c3a3d222dc8f3f6c81558e05be63679cce298f5321e17";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/en-GB/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/en-GB/thunderbird-68.6.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "bcc10a9daed5c4e68eb4a582cbfc8aa1c30b0d4cb92a714adbc695bba410e23d2f65e1194c0ed580976cda51d61fb95784b6296be95952aec1a2b51e711434d4";
+      sha512 = "f247725c614dca6e6ede4622802a8ad3c342046eab0b4fe57dda6a1ba8be601adea20b9906e2a8d99c243712a0e067a2821c1e1b3a7ad57efd1766a60354840b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/en-US/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/en-US/thunderbird-68.6.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "9500d9a22bb42a04fd2d7d24ff8fb7a69b205d6f889ab3b301405a22a51da731452fd18ce33c492f0733d72bddf6aa37b4d8899db4418e8e0155f2bb93af6b06";
+      sha512 = "0db0b36b095355d080d985df6547264a3df136d11ce828872dcc3b19c24a3156f521e1657c68059ba31de806f18a3d285275eaeecdb076344996bf8f6731bae6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/es-AR/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/es-AR/thunderbird-68.6.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "b193048a9c1a0d4c08c08cd12ae41c7a9cdfc8dba47c645d593675e08ac68f8158a578e645c8db32b862b0bb7174627534340a62aefa8ab9e38489b8b7687234";
+      sha512 = "5efa24ab3951d53828eb8a04bd34029428fb832f19284111192993fb66e2b7ca1d91e400180f1b989562f391281ff9a1c05c927a8ffc599b993c7192197b334e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/es-ES/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/es-ES/thunderbird-68.6.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "c1c5cd0b49e388260cc781e4bc7bc46530791467d4241defc31dae35c0ced85d8cc9e63734b0b8898eb23216065f388930d36227bd1484279ce135b20a70f041";
+      sha512 = "4d54f696793ca1264e7523ab7a3b64c64e57a8bf287257c21b5d06ea1eb51703cac251a2b9da7011942956bf110d1f09e661d28f5b7b861367d17cb299a740a2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/et/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/et/thunderbird-68.6.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "9cb03aa0214d8e8a0c0786b95d5716a761bb9b2f1fb430b552f09ad3942a277e0117d7b2d95cabc01fb63dfc7956aeabbc522d38515371af7e3a52b8514a32d8";
+      sha512 = "e6bd840cfa218b32b27315ee5c406db626a54597e6944426733e386a90b61cb0ad62c2b71f9d9bcaa8aa287e0778c3f89e3cb2ac589dc662da984d2b85748216";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/eu/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/eu/thunderbird-68.6.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "3c1da2c13f0b5ed58a1b11fcac24bb3ded8f1fd5dbb23fb8eaac529e5595bcca6adcfee0effa4c4e8a78e85d53b062113022e8e34ca936dc99cda5720a859b39";
+      sha512 = "c39144c970c5f95d25e0a3a8065dd97fad9171159564a12fbc1596132aa8522191cf0db67e83a19f49e60e5df4251c00f7a8b779dbaa576ba48c93f5f7db199a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/fi/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/fi/thunderbird-68.6.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "1d04c56fd080a52dc2c399339369ab54a7650ddd9d4f473b6ae40445c2889e05eb25c635d7add28e779df3c851fc9826c416419be22691c3424bd8ad01ab23d1";
+      sha512 = "038f4a2893f42db613135a9702430c312d9ffe42e17ca46512ce4a1cefff29f60727b615a1893d40e7169708627b4ecb4000eb05e146a0af48c8564e1c4fbedc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/fr/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/fr/thunderbird-68.6.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "a64c2a4c2f7da481995be93d03b6442a79c6a8ebeae3c2e1bd0efd8256f400bec3a416348ebee1753edd8a5911a80aa81843651e39a718607b3085494589210e";
+      sha512 = "79e3a612752694162d11ddf3a4c4514341d56d1efe9bfcf997914b9084b3944a87a0276ec6d97ce2145150a3aea61526dc4e252f79a0832d37d144286b36f933";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/fy-NL/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/fy-NL/thunderbird-68.6.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "4e51df5766540356dc86414063c98f47aaca94a57d2449c05c677513ce4477533638eb34b234696431b8beb4d241b0eb97db08cf9e27da891e95965c16ef21a3";
+      sha512 = "f54b56da0958198525c61d4c3b4b7f007cd28a3d621fa7a1fc2a85f020c5bf8e6fd66e4be9931543d19fd6b3d9cb0d69b36609c8dec71e0936d05cbbe91ae729";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ga-IE/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ga-IE/thunderbird-68.6.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "ec4f2667daeff8305feb8ac64304f42fbcda6b4c93a8bdfb1f4b45f1fc40163049f6a887f7208b41c49a21a5d94f06adf2f4446e784b8e2822c9f997d783eff2";
+      sha512 = "4e3c594578f7667e6f9ba8928a224e180830a9853b89ec60508554d11c9b7e2ca06fa7a9504fcfb3b0b8257bddd136ed8a15632beb7760a5d1ab5c43e30d565b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/gd/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/gd/thunderbird-68.6.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "09076ac19ec28a790b84c584856ffb60cbcb0db11fe52f1bd307515762fccf79e158a8805c6743eff287a4b25978f94c8ffcaf655b414fd267cd9db321ccbc41";
+      sha512 = "98c466383f136f8c104475a8a1d8098f8f0a047b358ecbc93fe4ad6c1e96bffc3de81c61a9026ad8dbfa8e95130b4bf8c82d5d08875dc4c012357291d483ab87";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/gl/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/gl/thunderbird-68.6.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "ad697320ba8f4e5a04a4e201e04490398cc09152b1cb1a31e325c06a30d8ca6f7209c35c9d9263e6087db41b4502e69c9ad6c35183872312dcde215ab1ba3e90";
+      sha512 = "649f1df44ab7289abc6038deb59fe38258fb31f8d20aa44fee6630d469560dbf212973fb9fd437fcef7456554223f7971a39a00de57b543e7e71d6f857ca0d34";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/he/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/he/thunderbird-68.6.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "7b367bd45c876e20a22e71b276d9ae9b7aec5fc58574647a5b8f99bdb52602eb41541f3397eea54a7395c5374a26277f1a312edb49c95eedfdc9ae06a6f5b9d3";
+      sha512 = "70e97215a9b91ddb832f85194e3c8c385a7fbda9edd31d2273f472f6bf7ab12d8055e9bd535aeea5fc822588aa0efa2dbe4e66425a8eed16f2c8e321da9e6223";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/hr/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/hr/thunderbird-68.6.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "8f8fc6fab45e45ee426426a28fd00deb52110f68f2aa29037db120fa81afd802681aabb1f390ab62e2f067ac178eaf7f2b1d4f0c4ac70492ce45ef1cd2545a92";
+      sha512 = "e44d1ea44dbcde82ac630bf6a34802adde9d4948f7036275a9ea424b70de44a2198d016db6d2ab860fa0bc6f74262db7b57d53cabb4ca03c6237fdd5cbfd584e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/hsb/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/hsb/thunderbird-68.6.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "870c925b327ff575b1cb6819864c5bb70b5531871e04a69ec3a456f83cd207bb2cd45defb4722f03586bb5e6569fe3d7e2c6e7937127269e9018a41039b6d83a";
+      sha512 = "326f0a15c4ef03243c89cffe8cf5092fe0f1714f43afb835bc0b9b9711fb597effcc488eca3eacbd2f3777c6f355469a2164a6bc0c850984d554949002484026";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/hu/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/hu/thunderbird-68.6.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "3bacd70e1bf4c07d1c625e835296d52d353546950178a92ad4ff1d29168b78928f985b3db99c7b5587aeb5a51e54c9f4cb5f0cf354df3ea853e8147ff969c288";
+      sha512 = "af5dc78b7e413c94aa3ef2a7e9a036d984c0519e762449178b3e404803ea375f0a1e92f0a24087d21cf2806d73100b5b161b67f587045e5f829f397d97143d14";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/hy-AM/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/hy-AM/thunderbird-68.6.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "46b9728709dd7866d6233e20c949dacccde3f62fce1558d2baadb87b94438833faf4d93e9449b0a5cddfbef8c3c9967258c606445c1fbf13aa74d776f61d844f";
+      sha512 = "ab274b064c3fdf65f96f65ae0f582013603093be63ea38ebdd85b325f7be0e517301e22e954968dac83e8460a8f348e3b9ac4165cebf8ef540b4ba4095b23707";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/id/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/id/thunderbird-68.6.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "11889847cd84dec9132eaa768251fe41dfcb7cb4682cb5c34160142791f75512b74b79d1caa2ce8cf205e521a244b168f89760782dcf1b453793122414903428";
+      sha512 = "1de1c0eeacb51814ca5de25b1b088072cb4c703068aef160534b339dcc0fa3a541400bc8a7c374595cd67c53708eefe2a264b3e8178a4ecca77b7da10b44524b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/is/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/is/thunderbird-68.6.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "e68fa0a96283013df42afa1fc7889d9dbfc906e508399d7dab6131b885ac73e5558c7acab1a5e8c13c6252e1612d43a1bc503b570c6f978c0460b121f2f37112";
+      sha512 = "ac72b529293288e938d5a0b0a594c9fd47b0ed5a3173299b22afe7d11c34c347adf9e5b715ea3654561f4fc13ee0f81b8ba1b9504c96be71bd04b9c7d1eb719d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/it/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/it/thunderbird-68.6.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "a55f5664274caabc43d64ac1abaf04f159c2b76c8389ecc00dcd213430d8c80836fe149bf4449cccc53184f2ded1ebcb85f8347de099aee47c32c899c5184a6c";
+      sha512 = "734c29ba833f05711bab8ae3548ce33a4633b48dedfddcc84ef6dbe4fd208eb6736f6f62f2ff74a8cb4864ceae1abde570b56669d199ae8162de5f02b79c44a6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ja/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ja/thunderbird-68.6.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "b3fb1bfaeb1509ee3392b11e18a2f80b6a84165e6f01c6caeb47f4b1e9dd8733d88ef724497f603352119412d9b5f88d7d37b21ccb1802e4f3930c6f499363e2";
+      sha512 = "922026013615642cb55a4bebe647b99d84386a04ae2c6b3f5996a060ed62ceb921818439cafedbbf25486181cc4e2fb57058a0ac5d276a7960c70f6214ca81b0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ka/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ka/thunderbird-68.6.0.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "1cf0b21bd0c1742a018675b8af830be7de163e567a2691b5c95cf91af9753b23d431ad5b67738d690220d1d8a57da7990cb01f89917f7c8ddad80b4ab056a83a";
+      sha512 = "4804caeacf6aa2dbf14c88ae36f670ef06382ee98c71be6e341a620c8230222c413784b0b640dabf01266271debfb1eb59d4c2b80e596b092995d2327eec839d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/kab/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/kab/thunderbird-68.6.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "8decdb91a1241f4d9495202965986d78598f5e8be603ed9c28bbd2a8cb405ce96a1206f1ade35a11e2f161bffbd8a034fd13b15abd16f4ec5a05442a6194fd1e";
+      sha512 = "f5cdfa7596ebd37cd0b4e7a31b5b2ad1d4e336c52681560a2183a3aae7dfd8be01312b5b342f1f0c1962cbfa13c8c2da188642dd16efcca30944bf30f71b7017";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/kk/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/kk/thunderbird-68.6.0.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "7a7e4d2c6dca6455c81456bb5a8eb3c8a085458ed9253c4a91b22a8cde9892fbba624be89c7ab1fea5875d902fa1198cf796bb309c3b6bd597bc05013d3f4687";
+      sha512 = "ca87066bb2f8e945299c984189a5e01a620d3ca04b1f96a85fe99fb629c7a9721b289f702299aecfa5a67515d3f45827f8930ead8fa4a9187e0610a55d64e790";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ko/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ko/thunderbird-68.6.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "cb037d1ab8dde1fcd61dfd446aa7587c7dcb24d239485e3b3c63db49097eb91bdc59fa9048b8871ce17da6b33bb0490e9f7a8f29f5f59a623f4eca522a04c287";
+      sha512 = "89869ca565d972065b8e87d6d8febfcdfd7269b158f7afcd5747933759c6345deb979235139aa86cecb021c2abad30b5683b76de9c606a1dcbfc7dbccede98c5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/lt/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/lt/thunderbird-68.6.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "898ad8b33435bafc361861a19887fa423eb2000acff87862543e4051722e1e1b4d6606eae057647bf7bee366296bfe5567ac1e7002fd62d28515a4d57c2466ad";
+      sha512 = "93a417401249b24d25000c05970cec3c1a5f6f292a944ab2cc306fa076052228c354d746d180ee7c4fc75baf70b241cc743ad7e3a2ad31ceccc44bdb1485bd26";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ms/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ms/thunderbird-68.6.0.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "c08d8ec6ff837eb03dc41fa5e8d9e7d8a142df489f47698f372808c0ddea88d1313abef999c00a0d4aaa6e0d5d4564845b001454d85ea8990cec072fea689e28";
+      sha512 = "f0c8dcb9431889bafeab7964a48e377a00e04acff18cfb2955b41845c765ffd1d9ab77b6d4ae8a87dc0a7b7f2dffe3c5502fb4b6fda5ca042aeac1e445ba85bb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/nb-NO/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/nb-NO/thunderbird-68.6.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "9e34bea73e2514f2c76a08a79752977d12c42726408be0d5d39405c2edd56f826ad453fdb1e20c4f8840070715fc0eb1211135e8c9b1f3ecac6c0e99ec0be029";
+      sha512 = "e3638c127d26636cfedd5c7024b58c04140b00da59c67afc3d93cdd7c359467b32113259af6fdedebb9d13d46005f50306a774731d90e65238f018fdf90adaa2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/nl/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/nl/thunderbird-68.6.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "3bd89bc0528d49a79ca93dcc6842f06102fd0799164d717ef7aeb15f283b44a7236148bd7a746ea7d713cf41b2bed7a5b7e66017b46b3398e4b6f035c7933a14";
+      sha512 = "0289e32a70c952288248f3b3c5bddf7fbd77927d944f5b1b08c8e0268d20aac4bcfa21e246fc04ec10f47134b4f40498c0bde6af419145822165898d5f972119";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/nn-NO/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/nn-NO/thunderbird-68.6.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "0cc4b9ac7dab3e879f6a691546fb414c4b43de166c5deb018634fe8d6583bff378d60937be4c8c30a1ffe68f5d715bb67414fa7359e061c766426666bdbbabc9";
+      sha512 = "ce1c64501cf2f3b599a7e0614d6845cdd3d3d37e876926ff0b5280c829f18b2746f0b4c43a46f1f0308d39f3a9fceda29a47374aa343ff4569d6af01c508ba08";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/pl/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/pl/thunderbird-68.6.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "48ceb0fe27e9dff3c09aaf05276aaa7c9c0d2d643236bf69af03974cd514bdd0d3bc816151887d3247907bb67853ed840e486e6f1bc721ac7283ea193152b723";
+      sha512 = "86cddfefab791d313f271f91f209be19f3475a7e92801da6163078b62531da345156a048ca6036f3b32a663de06cd3eb719fc9c07b19effe104d86b010ea7180";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/pt-BR/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/pt-BR/thunderbird-68.6.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "77a272f0553e2981d156b5c928a159ef754ca2220e8e48a06a6bd53bc67b6965a202e06ee98d15bd8d2f5fabc9768ea744eed8d88009f194b8a3f0097eb2b194";
+      sha512 = "613d75a4fb7affb990550d6a9a61af145a7bfa9dfe2b5385d6be06762a0624d78a3ef1ee7940d0d4b76fe9e5b728f55dd9b804d136ee3d16f71415d1597a733d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/pt-PT/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/pt-PT/thunderbird-68.6.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "bdbc148ab52ea519e2e5dc07655ffb687154a93420ac3d9b320349102436214ee26e558d94f4c8bcad1a94d611e7222f28c660e425385f3598c369332710066d";
+      sha512 = "1d2c2582ee452557ebd600fa61bd89c6162d78ccaf4884567557ac4efae43c604288ac401fdd0ef1c9aafc32c913593fd6d69795e215b762556478245150ecb1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/rm/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/rm/thunderbird-68.6.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "de01b86deacf5af7b44112147cbb13057137a70c77e4f3f0fd7b6f2286da3cfff14d11bed3d2e2501db51dae336e3fdeea0fca60b5af92b13de78d9dee98d46e";
+      sha512 = "c2c25f143b1421dd44180b55fe4263bc250c4f52b4748c133a38a9b7ecc7f491e492f2dd8e02ce7ff1a6cf61300eec939c0156740a2cb0ed2d37cca3a3570561";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ro/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ro/thunderbird-68.6.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "03a9eae26c2b1d989d8f74b8bbe5237265f89c6632568be7282e1e9253fad3062502e1d64402f3fb57b1755a2b52be0fad65c0a099aa55affd623b594083f303";
+      sha512 = "ef52beef9fa5de764fbc40c746fb6d95e5726174237432a5fe690d67c9e56a0138f6ed3fd0531a27fecc14c79e7d42ce84837e9cfd0df3db2a0134acb7460132";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/ru/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ru/thunderbird-68.6.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "a80a5cf3d34eb4e231c67182a17401783c75c5ccb0911fcc61a1cac8e007fca4e67004de02d9d10c5442dc2ad90837b6da562f37468dfbb84eef45981a6520aa";
+      sha512 = "7fece3278eea40b2f4dc9a369cbed40ea04c9d499a1a5c23ec38e57a452c9b4b81e2e18b369cee8abbe15832d9ee87346821164e1556e8b812f30475f90cc980";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/si/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/si/thunderbird-68.6.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "8cfaa054258a2b83fd140702bc59c3723495ff090f2dda06830d70548c425d47522cf574bbc9328887ba7621e3bb55e17bedcd314e54d5787d6ab9d00fd836ef";
+      sha512 = "564350c67c0b826a0e77c972774fb509b7a162d65cbe93873c1f0b62eb1a2c314ac09f3f9edc816ceb6b56d74fbaeaa576972ab7fb35f4dc5c9808a001b916f5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/sk/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/sk/thunderbird-68.6.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "c625263588f5b83e844c549aa182b996e7f99f3a2838c558d5a88ebfcb1cca966233c6f8f843c44651c001236d147d16b6ed3e26470c4d5c1b0b24c89472a46d";
+      sha512 = "a013c634324efc8f2dc2e3ac4c4df222d7bc37e99820fa87a89d66a1099208623550a54a8660ccb9161f6cee7d2a2f1e96bda5299c57aa6c31e0c9830ba40029";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/sl/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/sl/thunderbird-68.6.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "9654edc706571afe5e1ccc54b1ca0a0b7d9dd800278d0ddeaebfd483334353d87e1b2ee99da0e6242fa81e4778d3d10573db48462d8f681dc9ae68814c4e7be8";
+      sha512 = "855fca581e4b2caa41bd52c0f3a991e54ff8f038d0c757c0b3012c1c0cba0fe7b224b99a7ec9dc632a5e9d6c946cd2ebe871040129cbeb19ba260d47d3629935";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/sq/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/sq/thunderbird-68.6.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "d994da857c1e7c40c9df313f8135583885e728e93b80e0cdb0090bec49ddcf681b318a69dd553404f36c6ada6ecd4c70f4b7325ba092d700b60697941e855535";
+      sha512 = "96076bfe74dcf439c39445d22196e0b1a09bcf3a844db8c6054bf709f861b4f1f8365bf3c7bdc4f23fa94861590819041d5dbd9bd04f1c828715ffeac108d8d3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/sr/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/sr/thunderbird-68.6.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "d45178698af58c9496340739b658c3974c4f8ff1386c862bc5032598f7079193321a0752d01e8da74890069ed549285925529fbf84f10738c870ba6d0d1c6f19";
+      sha512 = "b88a2b84cb2d4d5e9a6682dbb9873b94b24dd89cb26480544d1982a5f3090d9d02345bf3b6ddbae7c5f41f32f81f0c40d32e496e03baec13efa661d258a55035";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/sv-SE/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/sv-SE/thunderbird-68.6.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "c79f1beb35445674b5c73914aa6379e415af42f90ae15afed18a748f5d7867be2ff6ade3e7ebee639954e65e5cc3d0abce158cf5cc0bf8740367f84067890751";
+      sha512 = "f5ac338a7a44492ce470c767df410a0f5c0cd80a20015cdf86fcf3c0da3ef3c88885cba7263e73bcd16bc989fc6ac99b8593b634c38743ad5748ff24afe1a16c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/tr/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/tr/thunderbird-68.6.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "a8d294506c9b255a6af29aa6df09bc87242db91b7d9e415a4f173564dc65f22cb3cc093a2e5b7c9b519aaacfdff99d855c00963bf3370cc8c4c8f0f8bc6b0328";
+      sha512 = "971e7505f57604b6073f8e1bfd7aada8c4a16cd52b003719dd6b3689734205361c9e9e5ab67a7fee21b6a6dcd52ff96bb2b801730a446ffc33798639e91a4a80";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/uk/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/uk/thunderbird-68.6.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "4c889e12d7855c5e57c01d894708577485d2ec0a50634160a682e517823780efe45968e1f2bfbc72f60fa5c690aad9d9bf9ff14686cff7f4696ca5704565f20d";
+      sha512 = "d1a7a2822a30a9542d055f530c13b172025cd50c4291bd2b70cb0da48872a1b24c684199daef47f39c669a76eea5eeaa5d975e05d5cd4b0b2783523c5417dcb7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/uz/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/uz/thunderbird-68.6.0.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "6a8253b9c1d9f07d932bf097c12d106c8b5993eacc4560ea3e7c55d58b754cc7ea09c0e86ce8937d14b400d6a095cd26c6794633243c4b53d7ece8bf9c1118f3";
+      sha512 = "53b0c0fed9a5c5efaef627a677c4a6b832e79391e265368928e9243091319cac7c1ce6756036385f8ce2fae9f12bdf14125b75230f17ec5cf9c56edc7d5c9908";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/vi/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/vi/thunderbird-68.6.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "ae4e2c35bc0a31422b5a2befa3b8bcd4835c535f6690a4ea11b21f0b3c33e38c2ff707ab70ac5aaec5153c4b38d44e67375aaf66b27af3b0316af35b9b5fa22b";
+      sha512 = "f5bb40ecaa0ada3f48020a18f64e02aacd31c216db0c02f426a8c4dda3cb9b7740cca00c63ddb179424e37fe29badc846b4e8f2e87751f98e15430bbf8aab96a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/zh-CN/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/zh-CN/thunderbird-68.6.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "da4aa6e899ac51ffb94674248d11d7ce072c27b9bd1aa4a5bf79c48e16d5b437b838f2b7f709e56fceba338ad9172252ae82c283bb88bb41a73fec1f876fc24a";
+      sha512 = "50f39f460f412412c5b97f3223f854d865fa526be05c5c5c60835ce8ac974dbfbe3b36abf5ac5f3698aed712560307e17ddf26606b09134360bde9e8c70fdeda";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-x86_64/zh-TW/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/zh-TW/thunderbird-68.6.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "47244d490e02d5d784e81b3641126b38307128d4d95096fce05717c8535318a0cd1567f20bd19b13922cf6c89ba3042350a8870360a25003a87d6ba6e3e0bccc";
+      sha512 = "eb463fe925431d9c5150eb0e3f6c6f907e96a547e02613b8a65803021761761011e3054dad8d18a93a1d0ae950846eefb9fd95c7744db86febbe60856562bed2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ar/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ar/thunderbird-68.6.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "6c9adce3d5e14ba5748dd8f60bafd72c5d910926de91810da7fbddb7054da822b79a79679b72125c483889383f19aa8a928d949de8785972a7067b0d23921072";
+      sha512 = "7e5a68cd2eb58dea99cf940ba8b212b7f6fcbd66e6ecfc9b476ea0aa33566f4ccb010d2056ca84000cedbb42072ce943fc955d4fd8a1cbb0b2faf30bb45f8867";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ast/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ast/thunderbird-68.6.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "ff0090a6370069ff7668d650d16f3d9d24fa2325c46aecf9a3b8fc536e1138793e751fc524b63a5dec3e07c10aa77dcf09d066d9137aed1f35dcce1eb9c368e3";
+      sha512 = "25a4fdae0021af4ce67560ef213b9dd18590d0850d0703f347b16206b4e48abd32b2f6f1bedb39812d0db04586169d095f104e82dbd4916a0f276b4f943d6fe5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/be/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/be/thunderbird-68.6.0.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "751527c55d73080fec112af6cd3f6161d848979b9b9f12f8cae4f4e28c2906f7aba5f6f2b02ad192f67f7b3b8713fbcaeba8960c53bc5bf1a9259e33f555fb94";
+      sha512 = "60ada0a93b1b9eab7e2aadb78ef8433487868f1e1f2e04a6a91996263dca0f034949858e8e0b8da1b35e0a812af689e31a6b3e2620a4177db9e19da155e43868";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/bg/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/bg/thunderbird-68.6.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "8b10b496a27a6bbe22e443213f69b0e3fdcb9bfd7fecbd509fc771ef1a22a66586febca2b303cb1a526b739ab303283086f14b314cd545fdd5f13bedb6d23fcb";
+      sha512 = "3cd159fdf5bd9d7b2ad021335b77326d234273e9f247be54d1c58b8dfc3cc2b855f1d5a31a096f8a93ec28c0255dc8b85d5c49e3b2928e170a78a68d7553a366";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/br/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/br/thunderbird-68.6.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "46ffb59df042c028366ae64c58c41a65c92d7aa4e50c24ebabe8141b2e78fdc6dbb5634574c7759ff0fd067cfe0ac7c9570bcd006d4c828a7dbdd00555178647";
+      sha512 = "59b6cd33c5db88ed0c9ece2d88091f5769848b582200f79ef7178071afa5631781044a6a1cf30c27f3f3d81ac215c9b2095cc186766878486898935ef24b93a4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ca/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ca/thunderbird-68.6.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "98bcdfdec73eba43ac67c571ecdda4622040b300b560f227ced55a197384d3462b89e844dca1fd310da7c326099fc072eb42adcc14d9519b8bb6b44647abd70c";
+      sha512 = "13e30705a506d0f34b95b1c22bc7770491f265268f9cbb6d7d4d7e4dc275ed81d46efa86d44f2acc8c475ab6b53589b6c4733067221d1ec604794bade2a9864e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/cak/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/cak/thunderbird-68.6.0.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "ca042a34871f95c82011e36ee700ebc60a3594229093ea2a38b28e6eeb6751c143227b9fc2dedac62608f42ffafe96aba4c600cd1e599794f2215adfa07e0270";
+      sha512 = "6db7346815bc9fd9adb7896291015794477b05379635ee2c3b4b475b393b594c806efd309d5f46d996aa9e95b58fd13f65a70facc4d2c8ec74be8e3443507a3d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/cs/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/cs/thunderbird-68.6.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "ab121a73e77c9976e1cc4373340fce96abd419d387775e31da07bb9b4293e70fb6b753cf9904f3ab44f330b911664327e0d5d187dad8e2b46f702b112737bc79";
+      sha512 = "aa407d20e7ec83e433d225dedb28d68eb8c9a1d295f2a37871048ea90930828c67674fe5059e8167fd9b0c573fc84d17fe3ce31ac7676a54b2786b38e10f58da";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/cy/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/cy/thunderbird-68.6.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "8c82689dfd9602a05b3daed5c778a29b755ac09d191765961c1e113f65dc398400bea7e32b8cdbf83b4ec02f13f473dcca759591a508d7f8d5c642db334cce33";
+      sha512 = "8e2e3136674041408daf6ec3dc194b5115aab6c254ca8da035b1f6900eb07d34ca57ab00f8776313f038a87acae3bfe454a6118f4b532e9f364ea411d685ca7e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/da/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/da/thunderbird-68.6.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "9d23be92c0574ae9dbbf27058fac97a92657bebff46ed9889c7987469e9a376c4800027aa371a039e294ad5be29d650b4d11e64c0130476638d87638e4db57ed";
+      sha512 = "22062cc37c2563b98516b16f9adb210528ffdb8791df39170bac66351d86a3e491c54787c3c6dd866f6ce806029694e11868a3d5c3b9b9ad4faa1bb621a89a08";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/de/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/de/thunderbird-68.6.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "1f7d247455dd540e81fa15d201491415e691ea6b66df9cf36716316625decb541d2046ac8aef5efd5435d5be4e1c44bc3dc8db9eb2023b5cff1446d678a764fe";
+      sha512 = "6228aca78b3577031aeae1f0c7ce7fe6eea41c232c46b8d6fc7ffdbbf4f0468a0e8c2ef77927bfe5c65380223d43cc67e6dcb0bcdeeb096f89794cbfee769a5b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/dsb/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/dsb/thunderbird-68.6.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "350b7378ba5b732e52af1234ce005c0ca0a5ffb286d4599c0f931dcf2c912740ea81bf6aa20c14960485be1360d1b9825ccb63c261836b389ac96088f3f77344";
+      sha512 = "43a51d0b294a53878c630de5da04f417b2d929036b8a689e93c7f72c6b738cecd4105f216d7955d2937e9a4998bf9a96ace66771c75ee46f9ac2e96fe6674fb5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/el/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/el/thunderbird-68.6.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "510ff7b9d4549b9daefd69f25ad92d97ae516f5f2d0bddf459d11c260ba11d6c4cb2574bf81c08cb4d8c720c7c8164355fc1c3bf5055e99ec31ea85cfb677f0b";
+      sha512 = "28b0aab8c2480d7deb48edd2c46468dda7489ba768a2293da43367d623464973527bf47ec6264443cf2febab667dcac39f1459117af97c3436100d8e9b3cb124";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/en-GB/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/en-GB/thunderbird-68.6.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "71cd61ffb1546dd8085c976d77c51d6231ad39afe9844d69ed697aa76e4c515780c264fdf2cc3644c9a22156054cbfad355b936f891465723ced665b14460604";
+      sha512 = "af4c726daeb0951552c55331f7c4d3aef54078b7fcfb98ab32293f39c945e58cb43ed224c5f50ab56bd804629b8db2a9719186749501d76c9f6d26aa6fe7bcf8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/en-US/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/en-US/thunderbird-68.6.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "dd2dbad0087646a87faac120d616d4b7a07f30fbbd95f657cf5ce4c08714c013522a1e05a55fb0a4f23302b02b63935b06e15e4c05f83fee18a0f482bccfaf79";
+      sha512 = "2a93646dfe69131d51d600511450f3cce267f11e51bcbba8a648baf1af1ebea57d43ae63c05cb138e74fac574cd76b55e07a86b98e7cb27e26575a777ad80934";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/es-AR/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/es-AR/thunderbird-68.6.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "dff461bfcf287a7fa38826a2b8f629913b1816d631b122042673677eed1636370ff50112ba0316047af0be4ffa869924c842ec17155ee422d52d40d2f7769184";
+      sha512 = "1750821128688b0bfc2cf005be120740b5ffe953daaad0cb6a1fc8821347324dd90ef0541676ac9613fde8b7026a1085449e14c4bd23414153bd415f4d860460";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/es-ES/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/es-ES/thunderbird-68.6.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "381f9d0aa2695a0acca17bfde5e3845a59ce233736ea49d24e7cdeecd557b6d7ca4544b709f80f6454bd518132f9d7bd0b85cd76d053107f6dd4eeb4fa30b4c5";
+      sha512 = "ecb1ec114a5728083773ae74cbcfb2488fbe902e2862dada06b9bbec3b1f6baf9d41bf78a12ffe803471a3b8d47feb7537ab9d80cdd02e720c55da22e2147b06";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/et/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/et/thunderbird-68.6.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "976f673e2ca991204df9134c8b3b1bbac00470b6bb5c20bb6ae5f886d611d250a509162f332e33523ef0cb103b70461dde8137449cf565d1be0f2ff0c08075a8";
+      sha512 = "388b8a7249a82aa9078e9aa07dd56bf683f3f98c114c48e856f29ac5cb49f6baf6f7aaa55c1af490c8da03190cd30896fb45e24c40fce5b58d4b4babd1f547f8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/eu/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/eu/thunderbird-68.6.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "8ecc9b36630e67dd2a7505103c2f2574fa1e27f6e7719d4b47e06359b8a41f2b7d97c88adc47acb6ce67205d15ec292570fb580166d963b1dd4a5bb0934c18eb";
+      sha512 = "c68a5024cad0b85d73534277099e4a4dc0ced6b9ae62b3e3c1ee50634d0a495685a393fe464b670a912b075dda072718316fc0bcc6e09956b655975ced31c13c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/fi/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/fi/thunderbird-68.6.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "54ef27d97d3712dab4616fa8a5d14392f39962bcf5113718d6de2f0fb8c6f801100c4e9d48f3129675ebbe7dc213486181ba28b96db56d4a23cc4e56ae68e276";
+      sha512 = "d005766665f6399e0e84a79a84f5220a0a29fd176c9a90e8b087c2be2dfee88f36c7cf08ce50c79798865c6bbf4818d4628ed384c53f555466b4a900fbbd776d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/fr/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/fr/thunderbird-68.6.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "becdddb3c175a2930bafb48a47227d8046c330ac22540662cc310bd734f89d09a693e1f355d49d00837ec9af43755c1eb7ea206e87cf550c25786086d1af5b1d";
+      sha512 = "f7a46c960bd9c07b6f48ede2b1940f5177029eed8afd03e520db019013dee74b87818b92d8a106a95f5522c4f06e76ce6aed3031e0e0596c9f8e3a30d221ed94";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/fy-NL/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/fy-NL/thunderbird-68.6.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "dc6d3c3ce455b315fdfc1dda46b79f9ae506af0c17d46b2d2d54a7e0f1f5281619acc861b73bd6caa23e2eedef88f0e7e9c279931584e3f4a1ddb1ba87c9d3d2";
+      sha512 = "25c3033f4bd890a6d8bca47114cf0bacb5aaa97c882e4aac306e790879516e26761615de2b73f2bf3229dfd36e86796a3c009daebd031b588595797a33ae55ee";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ga-IE/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ga-IE/thunderbird-68.6.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "875529e87597870478e2552f06677cbff98226efdac4fc3de007662e7c0b1d575888f2bb3f23d5f5b14191793f54361d8950c041b2b82ddea5a0283b7c98b26e";
+      sha512 = "6c8847f57225df57ec874879a9e62b0d16edee49419a69412a6710cd1a094570d0090cc2ddfa6a380d7c34623d5e6a7b740937cac43e9720640bd13d41ab5b75";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/gd/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/gd/thunderbird-68.6.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "47b7f5aea26aedaa3ba0ca52f53f86a339b51520d4f9150711cb37c72e6dbd2f1e0872d3eae8a9ddf821d3102025f82bdea7da5a9b077e817a80b31d345ed8b8";
+      sha512 = "1f846022be0400ea2f7bb0bd2c56286021692c152565311fb9b4cf439a1b1c06656efacddfbd68ae6669f9435afc89fd4aba47cec768e0d5025b289a58bdd088";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/gl/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/gl/thunderbird-68.6.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "22e9ab419e7a80e498c459a89ac3cf39451dc95fda545ec9a0c74067d971b9f66457a6948918fb2cfd3e43a471b0f23e54bc880298813111f4cc77c5a99708fc";
+      sha512 = "444ade430be00b1b60bbc937f693544402cdb626ece1a0706f274a3bc1b417a88a26eba3364c8d0faba34c6eeecdcbdf4b79225a286412425e2d4b8a183cb8b9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/he/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/he/thunderbird-68.6.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "7494ec5b2315748379a4b476add35cd6ce7f4afdd90a8503efd41188af189aa06b01345f21e5808720e2aeadc6729f7e65d4c5e16b5f301f04cf2646373a4712";
+      sha512 = "5432eed239fa34699504fddfb80c167bfc078d1d3e9e0aea18081d6898da3f966a475059de6aee013f312579e7c6a62a9ae388cf0b103c2fdf0f3a3f410585ac";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/hr/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/hr/thunderbird-68.6.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "e586ff015da79b357f5b3218a65ad13e861d5e73c32f6cf990aa100ca76c2f3519feb6592826271a9ffed3f3d51f40db373c2931c2dae169454710c7b5e36c07";
+      sha512 = "7c8a9a1e92db564b3eb2ab3b782d06798eb8a2c88502dba1965e5b6a1b004df4aa0423acd3244e56a507ae4b46bcd5012616973ed2d6196439f78e87c448d04e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/hsb/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/hsb/thunderbird-68.6.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "261970ba0021e09d4356284e52a8336db7448269a76714448ab5dc4f77dc91be8f2f8185915f4e1392912ca0464f4f699c754fdc2fe8080b1f68a3d210d085d6";
+      sha512 = "d95e899f19f599270cb45a8a90cf6c616bba9af6e62a889d4cd6ffdf3019bc455c3910271f95e2b463ffb3da2bd806843a4f335951e800fab49ea764a07fec90";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/hu/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/hu/thunderbird-68.6.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "ce329a1900b7ce6093e06d522e141b228090f20f3917e9c154a4ee95611316bc1117224f2bfe5fd0add40a5b31ba39fc87fccba4d28edea83d0be05df7b87e70";
+      sha512 = "b99171d4dbb965423fede825468ea740c4c86d666cb5efa457f71a79cbd226f01162b536aa53a6f19019e0ee14c9d3cb11957ca3ef453424eb3851393f1bc6e5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/hy-AM/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/hy-AM/thunderbird-68.6.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "756d4675e03753d1b3398b665247301997200e5f53215f9eabd17acb7502f282a1a5be3ea098ef8db4941ce7fd1a57165344c3036b786d3857b08b6613ba4088";
+      sha512 = "78df360fc50d4e80e73fffb3a39e109ea84a629edf6c7260eb1783ace5a93a460065da1e23d6cc201e918daa813db475cd2a4a38c0d4e9cb242b78f2e5a88952";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/id/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/id/thunderbird-68.6.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "61538042a75ab0d987fc9289fa1f6e7bc74ab67cda7c78ab34ed72894f6bf3cb3cd05e0a5519b44348d050319c137113508d6f8b4845d0fcc668560acea74eb9";
+      sha512 = "81a0c9ef733ceadb814e69bee0d748d211147ddcc559b5fcca200cf24d67308bf440b601d60ea99cf1a71b9cb090c489d424bfe6af545cdaf039fe6f10b1ee5f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/is/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/is/thunderbird-68.6.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "c292cf7d04f84f6819950115f4d821f0212d87b6a8587468bb4c3c8978a98decf7dcf6e00d8db6bc557cd5e3e0621814caad65d5b86c645d82e670929d2da525";
+      sha512 = "d25970c2c4ffac96252e4e5d8c33608f6147254fa8c9879a0e809b940aa4a0425477ce56456191ad24fe8c0bd94e68ccabbd70982a4665f4c9f09166c06510fc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/it/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/it/thunderbird-68.6.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "950f886bd49b8b90e8c26dd52352e13020ae752c0581d15666a512265270c39a406b2421832e3eb25eede3ff5a6129287f9c7f6849a99ba907190f257615a79c";
+      sha512 = "693bcd512a5ca343d389a3f3ca85c75a52df5fe101eef09ff6c68ed4a4a92c30b760969e2db54b8b87a50e9be28931dec0292dd5904e8526dc7aa8296036a03e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ja/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ja/thunderbird-68.6.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "9902c298bf470ef71d1d00372caf3d99a16ca61ca4ae448c838c936e6ddee674a2ca6359989c852d6de41ab550a7fdca9db829951740324eeda8dbb84fb51705";
+      sha512 = "d20d59d7abe85dcf660c89190c9761777bfad8b7276fdeaae74ef7a5eeb68f6aea6890aae53654849618459e74c58d5e46b07888c990b2ef6578ce6a96e5cfa1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ka/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ka/thunderbird-68.6.0.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "123cead4f30751e8422821690a436796d1b915e38c1b03aac8c2bb339df7f2d69d6794f4261971f73595add6db6a9887d0e5d4f0699459baeeec46cc687f1efa";
+      sha512 = "29aed1a98a6a4f2c30d98bd549461d32a229cd373145bc8f33426db3e518c4857b21446cd59cb03207eb60a432a69be6b0103df4467b33f49c3cb1097d96764c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/kab/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/kab/thunderbird-68.6.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "c9d3a9d368b8db85f7c6c83ff64bb5b3ab37faab2b2cdf29d23b444dc42ef394a951d3dc4c164eed3c5c278f12c9d42ef8a5f7abcc320ed6b6e181ec540873d9";
+      sha512 = "347334edc3a87face8cc2efb2096cf8e07feacd0d7cf8b1e501778d67385730362d4718ea26d85a768988e05296eccdc4bdb08d50030128123903bed3cb1f7c9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/kk/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/kk/thunderbird-68.6.0.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "2f3ba44e31fcacadf517de3d7e3c108335a75de4d54023de296d9329bba8cbb90d5989093e2d6afdfc8c7d2ce71db9e4bdfd72ff57d13bae281406cdb31a5670";
+      sha512 = "b2be10cc25f6d93113463b2f8614d00b2b52e9b376f9e939825f8c2b0a4976584b11a96022538496a242cc3e3d7cbbbb832fa1c698ef91cd30e28dbeebb6b3e5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ko/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ko/thunderbird-68.6.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "8a8bf9ad7f9f2d7132d8f8635ef9e924c1f488ca9963157ab2b40230a63c48de9223cd3076489a7249894c2bb9a369dc7b80a09c05387fbb93906a562868a96e";
+      sha512 = "2247b46fbcdac7067c03525374ac842a6f7699c6ba7bed4d16ae9f9e3717d5e8fd92cc9d1cc7c24dd2bd61a7f55ec68abd464fabe11e00f30778d9852c89698b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/lt/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/lt/thunderbird-68.6.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "79967b8b49ba9cc63fe379fa16395962e9fee3704c9513222934ff7bc6f89e3ea2dcae37f1f74c30bef962ddda450cac5fb9f9d0d6fdf65492aa8246f0334a02";
+      sha512 = "7435ac8db0c185c492ed30cb1310e67f8c30d1b9a3593f9b7c31f524b13e22d2c2d77ba66f5be99321f28c90fe7810f1e77d2714166e20728d968ab4cd69ae8c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ms/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ms/thunderbird-68.6.0.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "5f4c7d1a015aee2ab55a7387a621a793bd8c006740e2e97b2a0237c6947841cfe5cdc13a184614df58a082b0ab90fc581d84a31f98f0ef8c782a61326f027b1d";
+      sha512 = "2931092def64e4f6985b4a8d93c82843b0e90f3ed644dc0c7605709068d6b4bf01d30d2b55c45ef29197d5fc542932294e56e924d9d5db9b3efd04095581957c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/nb-NO/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/nb-NO/thunderbird-68.6.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "60679df9cc0898513b343955d8e99362ea106599f98ddf238c694c7b35e4a260b3fa3b8a80a438d3a9891bfe4f1fee504d868e293f9c9eadf8d9042c280d7f08";
+      sha512 = "ad2021b90d1a420661cb4d71fcfde6bbedb97c84a6f1a5d66e04c4fecfdf6836a1001bd6f4350b89d169b7fcf9c80230384063e1974bff53dfb11bad6fc1a49a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/nl/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/nl/thunderbird-68.6.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "ddc26e850a055a532107f7f6d329fc4385b0fbd68eea382574b8a3f2510d0b4c75587696b1994adc710ce286ddf41bc44f80cb42c8011171dcf813a4e3a992f1";
+      sha512 = "46f2507b16558151f46cae7cc88189ec581694ee50212fd0f8d2a9dd006d6685a8c49ad7d24e2117ae4a2bc55a88621ab900af7dfdbc5a08511e6374361241fc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/nn-NO/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/nn-NO/thunderbird-68.6.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "0ebef3051ad541cb042ca3512c145bf46b5807990b3643d42d3d21f4c9c01fdb69872967381ce9790c70e59948dd991d83286bf41404312e62074d814d70a1fa";
+      sha512 = "b6afb0adeb9ac4ad5ae0f7ba396ff8d9643d1341016d389947007e8ff40710e3fcb25e612ffff787d1fe8ba5424c17a2fbef96e10e288ad1bbb79ae337cbf505";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/pl/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/pl/thunderbird-68.6.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "3fab9ea4cf7c2e9ae5bb30059a2cd96c9cab281c87600927dba3b7a932e434f56c7359cc05e8f5c568232d53ba68fcf7d0164b59021a9ac2e502415129abc38e";
+      sha512 = "bd015ffab2e9fb6f416194d3d8cfa1181d220dffce30060e12a665918ec0ebbe7c78c4536dab8b5f67af790350a7675f733fda5e60e640a363c757ea26b6e88e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/pt-BR/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/pt-BR/thunderbird-68.6.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "7e5c5e2a1d5e8c940cdbb43fc394c75b97b5c1a3898e93647473b2dc751ac020225ba14ae812ddc1b0585fd4f6df747053d443d6538b21f96c7f8aab38521f37";
+      sha512 = "fdce0362b597a82692f95236d8ff29ff442e7e9565cb44cf5ce1e526c80ee1571ed0d670a9cfa199c716507af21e02c2bc3f9ea26041fec2187ecaff8b70a6fe";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/pt-PT/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/pt-PT/thunderbird-68.6.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "a02fe6bad1dc6479df27ebe62a13ef2dc0a8f52bead42e65bee89e76bfa117c975fe1db612d0a577f7d8de84bb3ee82f27a3af247675721e4cb2e54467ff300a";
+      sha512 = "9f0004b1f662945d35d8eec6800005116d40ca64575c66b471f2d09f8326ee359e9a429ee8684b28d4dafea9e5b708145831eadbbedcd44f0ce7a57390665a99";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/rm/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/rm/thunderbird-68.6.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "56967ecc02e1cfa91d9c942d31e5ce1c3f16319732344aee385acd0f0f40882e65f02e2134bd53483c5459039982eb261b8d0b97aed5388fdb2754f58d2eb80f";
+      sha512 = "f72bbb0d18193c1cc0296f1717d2d1652a0317aafe05f16bbf7bb944bf554b6d4333c3a6e6327957f146f5cbabd174967e7c7147e1dc1a11420fc0906a59cc75";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ro/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ro/thunderbird-68.6.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "20b6bc1e4fd8a595e42e468d94216aa0502aadb7de9cecd1a6da1fb14fc6008976551467ceb1e258fc87f98f4cfc485d91697817525a9a4ddb65626ccf6d989c";
+      sha512 = "8ebdf16bc98c261eeaa0845a88bf03782c340871c0bbfce1e404dac459bd465a9c25eecba6a3b040ae8f6422537f474f6842f722be2c7698a1f70920d20f2ff0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/ru/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ru/thunderbird-68.6.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "325649a3cb72ac2c3d8ef01caaf00123a2ffd5772ced16271cef8c08408e8828c9d96ca8ea81ca594f669b936b68f941d35adc1f00268447c782efca186a4a36";
+      sha512 = "92da68f204338f3dc5adfddf8a1332d4fb8e78901ed00eec00ff48b857861ffc98748755edb4b5580d46ffe25e183fdf1f29418104525b6edce201e273169cdc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/si/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/si/thunderbird-68.6.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "164e0588d563b49a5652a97f21eaf513cbbf9af7ff97f93446f7ab99800d0cbcb61714e72e53feccb407992386a02715413c26c70ca46c45dd15ca7357e185a2";
+      sha512 = "72887d5bc23331e228f91477dd71631f66021055c5c989abdd3ae7f35d27d67c48c3a6983eada438ba47982b1b82655de60cc6a11a3f87cad2edc59e5b4c8706";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/sk/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/sk/thunderbird-68.6.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "fc2e7881caed0943f773a687653e2fc301ace20f59e7afb1074350cda33a1f18998789410c10d1f0aa9cb4ceae7268ab251efd7b5ca02a6949da6b613cd88780";
+      sha512 = "844e533e41f87169d08176c9aa3f3ca355838837f9a8ee723991b65e1cd037cc7a7ccb03692394a63de91314117c6e158a48cef70b5ae803390fa99fbf7183d2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/sl/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/sl/thunderbird-68.6.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "4dd57628b1d8c4518b889424f457c8f3b83bfbf6aca2cb9be403fe97020c25d4ef95e5d473c5d2be67a9caf184aa657c6c13a549cc3b7a2e5e29199c990cda8d";
+      sha512 = "41b57fd7d7f2f7690dca2e22028f09c66fd93e4a7abed1a1b1d791b3953c4129d89737d918e47090631e543229e5e8bbd7f516e05d57781abba23a9379831d14";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/sq/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/sq/thunderbird-68.6.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "3cda84132453a2802738145fe38c9a36db162842bda1a1c2a125a1f8c4cfc6af2bbd4c629804e539f260af8964c34f5af77965d755ea0f327f7765cb43c525d2";
+      sha512 = "671b70e2a1c6d54841e84864bdefa8989954771780c0a5e8732baccae18ae261b349435adcdda58197354f60d89d1b205b0dd3b98ea020279160dc4b104c5d25";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/sr/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/sr/thunderbird-68.6.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "6d1a2da487b616716c680619528f9b70fc5ca9c4c34e3e66841ace9254cddae6fa63396bcb8dec6d961a29f0dc14aefc660e96f90a82c7801a1acb7b21275fe1";
+      sha512 = "5e9fc54b0abd21d2bc5ac4dd4895a5b2c961204f57175fa6051e0e23eee6b4af97ca00c9c595c8c64d29a3badbd7191baf364a9099db662aa2e6a3e7e0a570f0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/sv-SE/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/sv-SE/thunderbird-68.6.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "c2b3901a02f01123460816c566f62374ee954e18c411868059211d97d88b8d59c2452eb0fe1ecc940473b68f983dfb64f276a1f167178fba0d79a03235ac2758";
+      sha512 = "42a4a55209a94df2a2bf1c2c144b0db17a99cf63d2750f0e1bec8cfcccf8fccd38ae5742d7f3c037923311e4388d582801857c648ae9ebadf332edc26ecb7607";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/tr/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/tr/thunderbird-68.6.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "bdcfc20888bd896abdb2dd52ae5d4497a5a9706c01ae0193548707d326b74eb5af448db5d0e9e647c976024560e091305bc6d074ca8181886e27a2e201446204";
+      sha512 = "fb061df16bd3e44e1315797418c7568433ed24b0dc4dd91517c7562ab2ef999cc5e147a7aaa07d29446c5db09e5c76f3e96fe3d25453a4ef82d191d98903c785";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/uk/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/uk/thunderbird-68.6.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "e71a965b6d3c7f90b97361435027af0b0fe194233500f127b2b9c75fbc2cd2c4ecf4228b537081a8ef61131e97e09b348198d3f59db7587a2e40a75b0e90686e";
+      sha512 = "4e70211298c788f874f47c1ce1eb291bf16df1c1316f51dde833bb983032ab50aa725fdd4453bd360f4fddb93215f01ecb75b2922c28b7b7abbef4a3a19c87cb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/uz/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/uz/thunderbird-68.6.0.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "305c74f94e10565923073d157dbc6c62d03e6c1f5291cad5a0fcddf5cd158e99f8fd88b84c4c0e4a352139339398c80f84abebf486503030fa5a0dd4ac1d02ea";
+      sha512 = "7b6cedb38bc18da9902df19070cdb66c49d288591af3346e369c09b84dcc8803b6b06870165cb99e3faab33b95c9d115bdb648a1eb9be3ad28d17b84a69e35ee";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/vi/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/vi/thunderbird-68.6.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "5578e325a16c94acae412ba403abbd7920b2b78e8e469c16175d27e44bebcd257dcf9c5e4454276422ebbc7797049f927e0a131be54aa11ceac1878fa1ac6c13";
+      sha512 = "eaaaf5002ccd31685b1f96fff6b63c9ab17d4ed3ec4c88cc368e60935b794e08a1fb56626d772f579fe0381b1381f3335de4739eaaf5b0dcfb31833c593b093c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/zh-CN/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/zh-CN/thunderbird-68.6.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "a8f2a25bac4b312d2c61bf3e6a7fae6a98fb6ed43682005881157809083dbb1939afd6200b67236b3087148622978f5616d554202f586ffd60b5dadb65dad433";
+      sha512 = "89341195b5cd0d9833fee836acfea6091e9ebff3f675a02b74a2f6d6424df910d6ea4866f97832ba5bc798694d02b12d13c14c27bfff20df4ba967581c23ffcb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.5.0/linux-i686/zh-TW/thunderbird-68.5.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/zh-TW/thunderbird-68.6.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "9b463179ef67102ba10d440071b10a7e075c586c72cc352b2af05db9b048b46819a913547f5d0e0ca3a5c2e26110515d4a87db36f9765b59f64fd58f76662785";
+      sha512 = "3a63cf99d67f0a0e79692caa2ded310284fd876b1d150cdbdc3a2bc3b1266250a90f05117c00521c1b589beaf825b8a091b7e40627d8c2127faf1b06f4c6b746";
     }
     ];
 }

From 243cd9f754e9df5a6ff80d2222bb36ecf8eb49ee Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 13 Mar 2020 03:16:01 +0900
Subject: [PATCH 2976/4636] thunderbird: 68.5.0 -> 68.6.0

---
 .../networking/mailreaders/thunderbird/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 8d4fa98ef729..ef943518c773 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -72,13 +72,13 @@ assert waylandSupport -> gtk3Support == true;
 
 stdenv.mkDerivation rec {
   pname = "thunderbird";
-  version = "68.5.0";
+  version = "68.6.0";
 
   src = fetchurl {
     url =
       "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
     sha512 =
-      "15hi1193z6gp05dx6pqakxydyrxzls4xhfpvrk5qg458gxhdfj4qbgb33mcf944g7vf2hk5mk6nbgmdxlb9svw1n72ym2adyaca6n5v";
+      "0z2r93inj4k0sg4ghq8nz209ayklvh9dxgbsimg6dgil5ibcmyapks30gva7r9jxi07mzmb6i2mj4wazgkyi6i124svzvllnm1cq0im";
   };
 
   nativeBuildInputs = [

From 88ede5abd3efad07637bdb51a089788fe246c38d Mon Sep 17 00:00:00 2001
From: = <=>
Date: Fri, 13 Mar 2020 12:15:38 -0400
Subject: [PATCH 2977/4636] maintainers: add sjfloat

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1d2881b28017..088013d0050d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6701,6 +6701,12 @@
     githubId = 848812;
     name = "Stephan Jau";
   };
+  sjfloat = {
+    email = "steve+nixpkgs@jonescape.com";
+    github = "sjfloat";
+    githubId = 216167;
+    name = "Steve Jones";
+  };
   sjmackenzie = {
     email = "setori88@gmail.com";
     github = "sjmackenzie";

From 33746be61fb5b587fdecbb5a95b37667844a2d15 Mon Sep 17 00:00:00 2001
From: = <=>
Date: Fri, 13 Mar 2020 12:16:28 -0400
Subject: [PATCH 2978/4636] ams: init at 2.1.2

---
 pkgs/applications/audio/ams/default.nix | 48 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/applications/audio/ams/default.nix

diff --git a/pkgs/applications/audio/ams/default.nix b/pkgs/applications/audio/ams/default.nix
new file mode 100644
index 000000000000..e6c4fbe802e1
--- /dev/null
+++ b/pkgs/applications/audio/ams/default.nix
@@ -0,0 +1,48 @@
+{ stdenv
+, fetchgit
+, automake
+, alsaLib
+, ladspaH
+, libjack2
+, fftw
+, zita-alsa-pcmi
+, qt5
+, pkg-config
+, autoreconfHook
+}:
+
+stdenv.mkDerivation rec {
+  name = "ams";
+  version = "unstable-2019-04-27";
+
+  src = fetchgit {
+    url = "https://git.code.sf.net/p/alsamodular/ams.git";
+    sha256 = "0qdyz5llpa94f3qx1xi1mz97vl5jyrj1mqff28p5g9i5rxbbk8z9";
+    rev = "3250bbcfea331c4fcb9845305eebded80054973d";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    qt5.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    alsaLib
+    ladspaH
+    libjack2
+    fftw
+    zita-alsa-pcmi
+  ] ++ (with qt5; [
+    qtbase
+    qttools
+  ]);
+
+  meta = with stdenv.lib; {
+    description = "Realtime modular synthesizer for ALSA";
+    homepage = "http://alsamodular.sourceforge.net";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ sjfloat ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d10404e05f4..ae8abd0092ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -625,6 +625,8 @@ in
 
   amp = callPackage ../applications/editors/amp {};
 
+  ams = callPackage ../applications/audio/ams {};
+
   amtterm = callPackage ../tools/system/amtterm {};
 
   analog = callPackage ../tools/admin/analog {};

From 2e099c7e53a2f36a5d05bfb8f6b823b164ecff3a Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 13 Mar 2020 23:34:09 +0000
Subject: [PATCH 2979/4636] lilypond: 2.18.2 -> 2.20.0

---
 pkgs/misc/lilypond/default.nix  | 37 ++++++++++++++-------------------
 pkgs/misc/lilypond/unstable.nix |  6 ------
 pkgs/top-level/all-packages.nix |  8 ++-----
 3 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix
index a740323b47f3..9e76693ce8fd 100644
--- a/pkgs/misc/lilypond/default.nix
+++ b/pkgs/misc/lilypond/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, ghostscript, texinfo, imagemagick, texi2html, guile
+{ stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile
 , python2, gettext, flex, perl, bison, pkgconfig, autoreconfHook, dblatex
 , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff
 , makeWrapper, t1utils
@@ -7,22 +7,17 @@
   }
 }:
 
-let
-
-  version = "2.18.2";
-
-in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "lilypond";
-  inherit version;
+  version = "2.20.0";
 
-  src = fetchgit {
-    url = "https://git.savannah.gnu.org/r/lilypond.git";
-    rev = "release/${version}-1";
-    sha256 = "0fk045fmmb6fcv7jdvkbqr04qlwnxzwclr2gzx3gja714xy6a76x";
+  src = fetchurl {
+    url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";
+    sha256 = "0qd6pd4siss016ffmcyw5qc6pr2wihnvrgd4kh1x725w7wr02nar";
   };
 
+  patches = [ ./findlib.patch ];
+
   postInstall = ''
     for f in "$out/bin/"*; do
         # Override default argv[0] setting so LilyPond can find
@@ -35,7 +30,9 @@ stdenv.mkDerivation {
 
   configureFlags = [
     "--disable-documentation"
-    "--with-ncsb-dir=${ghostscript}/share/ghostscript/fonts"
+     # FIXME: these URW fonts are not OTF, configure reports "URW++ OTF files... no".
+    "--with-urwotf-dir=${ghostscript}/share/ghostscript/fonts"
+    "--with-texgyre-dir=${gyre-fonts}/share/fonts/truetype/"
   ];
 
   preConfigure = ''
@@ -43,25 +40,23 @@ stdenv.mkDerivation {
     export HOME=$TMPDIR/home
   '';
 
-  nativeBuildInputs = [ makeWrapper pkgconfig autoreconfHook ];
-
-  autoreconfPhase = "NOCONFIGURE=1 sh autogen.sh";
+  nativeBuildInputs = [ autoreconfHook bison flex makeWrapper pkgconfig ];
 
   buildInputs =
     [ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm
-      python2 gettext flex perl bison fontconfig freetype pango
+      python2 gettext perl fontconfig freetype pango
       fontforge help2man groff t1utils
     ];
 
+  autoreconfPhase = "NOCONFIGURE=1 sh autogen.sh";
+
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Music typesetting system";
     homepage = "http://lilypond.org/";
     license = licenses.gpl3;
     maintainers = with maintainers; [ marcweber yurrriq ];
     platforms = platforms.all;
   };
-
-  patches = [ ./findlib.patch ];
 }
diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix
index e2c0dccb2e17..68f48a2db64f 100644
--- a/pkgs/misc/lilypond/unstable.nix
+++ b/pkgs/misc/lilypond/unstable.nix
@@ -18,10 +18,4 @@ lilypond.overrideAttrs (oldAttrs: {
   meta = oldAttrs.meta // {
     broken = stdenv.isDarwin;
   };
-
-  configureFlags = [
-    "--disable-documentation"
-    "--with-urwotf-dir=${ghostscript}/share/ghostscript/fonts"
-    "--with-texgyre-dir=${gyre-fonts}/share/fonts/truetype/"
-  ];
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae8abd0092ea..59aa969983bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25159,13 +25159,9 @@ in
 
   lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { };
 
-  lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix {
-    lilypond = lilypond-unstable;
-  };
+  lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix { };
 
-  openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix {
-    lilypond = lilypond-unstable;
-  };
+  openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { };
 
   loop = callPackage ../tools/misc/loop { };
 

From 4d8cac34f79ed890b586a91a0c049cf0cfa307a6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 13 Mar 2020 17:12:28 -0700
Subject: [PATCH 2980/4636] blender: 2.82 -> 2.82a (#82450)

---
 pkgs/applications/misc/blender/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index f55e46a6dc7a..338a5249aebb 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -17,11 +17,11 @@ let python = python3Packages.python; in
 
 stdenv.mkDerivation rec {
   pname = "blender";
-  version = "2.82";
+  version = "2.82a";
 
   src = fetchurl {
     url = "https://download.blender.org/source/${pname}-${version}.tar.xz";
-    sha256 = "0rgw8nilvn6k6r7p28y2l1rwpami1cc8xz473jaahn7wa4ndyah0";
+    sha256 = "18zbdgas6qf2kmvvlimxgnq7y9kj7hdxcgixrs6fj50x40q01q2d";
   };
 
   patches = lib.optional stdenv.isDarwin ./darwin.patch;
@@ -137,7 +137,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "3D Creation/Animation/Publishing System";
-    homepage = https://www.blender.org;
+    homepage = "https://www.blender.org";
     # They comment two licenses: GPLv2 and Blender License, but they
     # say: "We've decided to cancel the BL offering for an indefinite period."
     license = licenses.gpl2Plus;

From 1bb17b50d249665781fe21ebc641028ed818d209 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 13 Mar 2020 05:30:00 -0500
Subject: [PATCH 2981/4636] broot: 0.13.2 -> 0.13.4

---
 pkgs/tools/misc/broot/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix
index 16aaabee6189..b7e2fb00a140 100644
--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "broot";
-  version = "0.13.2";
+  version = "0.13.4";
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0lrrbzs7s2dgifamp81g41fhg6274pvri4hr3xxr1swpvsinxwfn";
+    sha256 = "0xd7vsybv6w5llvb85g6bx6r33lr0ki077rwzdvwb9c8w64fvs2h";
   };
 
-  cargoSha256 = "1whnisc30f7qsd8xdr25s64sd1qlbcasd0b06f216sxsf6bmf8a1";
+  cargoSha256 = "16qad0m2vygwrbz40ww0mb0ba5wn2wna1n78bc8nxh60x0qiigi9";
 
   nativeBuildInputs = [ installShellFiles ];
 

From d580deacec3a8a5a0e3733bfa2cf310a1e168615 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 13 Mar 2020 04:20:00 -0500
Subject: [PATCH 2982/4636] procs: 0.9.18 -> 0.9.20

---
 pkgs/tools/admin/procs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix
index 7c2c66f9fbaa..db6f27a3010f 100644
--- a/pkgs/tools/admin/procs/default.nix
+++ b/pkgs/tools/admin/procs/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "procs";
-  version = "0.9.18";
+  version = "0.9.20";
 
   src = fetchFromGitHub {
     owner = "dalance";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0bqaj4a56h26sgiw2r453k6f252sy6lrb71ammr0ki3bqqqjhvdi";
+    sha256 = "00qqn8nwv791bs88n302hy67dpas5hcacnkakn7law567klnzxfz";
   };
 
-  cargoSha256 = "1rrwmi1wwjjql3chw996wki7mx0biaw9wc4v2xzv3vrxspvlvb5g";
+  cargoSha256 = "09ib1nlqhzq3mc5wc16mgqbyr652asrwdpbwaax54fm1gd334prl";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 

From fb594b816a8c99c6368c7906f90ae94c5867b8de Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Fri, 13 Mar 2020 20:47:14 -0400
Subject: [PATCH 2983/4636] refind: 0.11.5 -> 0.12

---
 pkgs/tools/bootloaders/refind/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix
index 81686a456d07..398641faf15e 100644
--- a/pkgs/tools/bootloaders/refind/default.nix
+++ b/pkgs/tools/bootloaders/refind/default.nix
@@ -14,12 +14,12 @@ in
 
 stdenv.mkDerivation rec {
   pname = "refind";
-  version = "0.11.5";
+  version = "0.12.0";
   srcName = "refind-src-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/refind/${version}/${srcName}.tar.gz";
-    sha256 = "0pphl37y1zfrcai821aab9k097yp669hn1j07cas1nppinafg78v";
+    sha256 = "1i5p3sir3mx4i2q5w78360xn2kbgsj8rmgrqvsvag1zzr5dm1f3v";
   };
 
   patches = [

From c935567de62647ebde651ff122ae464303fdc2c5 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 13 Mar 2020 04:20:00 -0500
Subject: [PATCH 2984/4636] lean: 3.6.1 -> 3.7.0

---
 pkgs/applications/science/logic/lean/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index ae8b0ada8062..ac65a72c94b9 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lean";
-  version = "3.6.1";
+  version = "3.7.0";
 
   src = fetchFromGitHub {
     owner  = "leanprover-community";
     repo   = "lean";
     rev    = "v${version}";
-    sha256 = "0crcpzbz75mdyi1vi4mygw3mj4lx73vff58fkic1gfxlpwrwgi20";
+    sha256 = "1khy41zv4bjbpy3949j7y7d4qal53w4679iqlhm2l8jxd7y46nvi";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Automatic and interactive theorem prover";
     homepage    = "https://leanprover.github.io/";
+    changelog   = "https://github.com/leanprover-community/lean/blob/v${version}/doc/changes.md";
     license     = licenses.asl20;
     platforms   = platforms.unix;
     maintainers = with maintainers; [ thoughtpolice gebner ];

From 386a50f729a6a1911c5767a1c02f4229efff6205 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 14 Mar 2020 02:00:27 +0100
Subject: [PATCH 2985/4636] binaryen: 89 -> 91, emscripten: 1.38.28 -> 1.39.1

---
 .../0001-Get-rid-of-git-dependency.patch      | 38 +++++++++++++++++++
 .../compilers/binaryen/default.nix            | 15 +++++---
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 49 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/compilers/binaryen/0001-Get-rid-of-git-dependency.patch

diff --git a/pkgs/development/compilers/binaryen/0001-Get-rid-of-git-dependency.patch b/pkgs/development/compilers/binaryen/0001-Get-rid-of-git-dependency.patch
new file mode 100644
index 000000000000..79b053592a95
--- /dev/null
+++ b/pkgs/development/compilers/binaryen/0001-Get-rid-of-git-dependency.patch
@@ -0,0 +1,38 @@
+From 1c6af6c68ba3f49ae9e942844c739e934339d3b9 Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch <maximilian@mbosch.me>
+Date: Sat, 14 Mar 2020 00:37:31 +0100
+Subject: [PATCH] Get rid of git dependency
+
+---
+ CMakeLists.txt | 15 +--------------
+ 1 file changed, 1 insertion(+), 14 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4acf703e1..4e9bd60b5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,20 +7,7 @@ IF(NOT CMAKE_BUILD_TYPE)
+   SET(CMAKE_BUILD_TYPE "Release")
+ ENDIF()
+ 
+-FIND_PACKAGE(Git QUIET REQUIRED)
+-EXECUTE_PROCESS(COMMAND
+-             "${GIT_EXECUTABLE}" --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git describe --tags
+-         RESULT_VARIABLE
+-             GIT_HASH_RESULT
+-         OUTPUT_VARIABLE
+-             GIT_HASH
+-         OUTPUT_STRIP_TRAILING_WHITESPACE)
+-IF(${GIT_HASH_RESULT})
+-  MESSAGE(WARNING "Error running git describe to determine version")
+-  SET(BINARYEN_VERSION_INFO "(unable to determine version)")
+-ELSE()
+-  SET(BINARYEN_VERSION_INFO "${GIT_HASH}")
+-ENDIF()
++SET(BINARYEN_VERSION_INFO "@emscriptenv@")
+ CONFIGURE_FILE(config.h.in config.h)
+ 
+ OPTION(BUILD_STATIC_LIB "Build as a static library" OFF)
+-- 
+2.25.0
+
diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix
index 664335c3dade..d37232437668 100644
--- a/pkgs/development/compilers/binaryen/default.nix
+++ b/pkgs/development/compilers/binaryen/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, cmake, python, fetchFromGitHub, emscriptenRev ? null }:
+{ stdenv, cmake, python3, fetchFromGitHub, emscriptenRev ? null, substituteAll }:
 
 let
-  defaultVersion = "89";
+  defaultVersion = "91";
 
   # Map from git revs to SHA256 hashes
   sha256s = {
-    version_89 = "0rh1dq33ilq54szfgi1ajaiaj7rbylai02rhp9zm9vpwp0rw8mij";
-    "1.38.28" = "172s7y5f38736ic8ri3mnbdqcrkadd40a26cxcfwbscc53phl11v";
+    version_91 = "1qsjqnzc5w9ny9v01bxkdvhh4kgbsia01x5vvac72m075v4mpgs4";
+    "1.39.1" = "0ygm9m5322h4vfpf3j63q32qxk2l26yk62hh7dkb49j51zwl1y3y";
   };
 in
 
@@ -29,7 +29,12 @@ stdenv.mkDerivation rec {
     inherit rev;
   };
 
-  nativeBuildInputs = [ cmake python ];
+  patches = stdenv.lib.optional (emscriptenRev != null) (substituteAll {
+    src = ./0001-Get-rid-of-git-dependency.patch;
+    emscriptenv = "1.39.1";
+  });
+
+  nativeBuildInputs = [ cmake python3 ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/WebAssembly/binaryen;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59aa969983bb..013d6d2559fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3094,7 +3094,7 @@ in
 
   cholmod-extra = callPackage ../development/libraries/science/math/cholmod-extra { };
 
-  emscriptenVersion = "1.38.28";
+  emscriptenVersion = "1.39.1";
 
   emscripten = callPackage ../development/compilers/emscripten { };
 

From 991bbef68351b4aa228f5f763c8d2ded2aeeb84e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 13 Mar 2020 04:20:00 -0500
Subject: [PATCH 2986/4636] cadvisor: 0.35.0 -> 0.36.0

---
 pkgs/servers/monitoring/cadvisor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix
index aa4db2239f0e..715a52ec99c2 100644
--- a/pkgs/servers/monitoring/cadvisor/default.nix
+++ b/pkgs/servers/monitoring/cadvisor/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "cadvisor";
-  version = "0.35.0";
+  version = "0.36.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "cadvisor";
     rev = "v${version}";
-    sha256 = "1652yf2a4ng9z0jq8q6jnzh6svj5nwar9j8q7sssgy36bi03ixqa";
+    sha256 = "12hk2l82i7hawzbvj6imcfwn6v8pcfv0dbjfn259yi4b0jrlx6l8";
   };
 
   goPackagePath = "github.com/google/cadvisor";

From 1b575dbd79682cb347140ac9b45996d1f3abe501 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 5 Oct 2019 18:32:22 +0200
Subject: [PATCH 2987/4636] nixos/firejail: use local runCommand

Also:

- use `runtimeShell`; and
- remove unused `makeWrapper` input; and
- `exec()` to shed wrapping shell
---
 nixos/modules/programs/firejail.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/programs/firejail.nix b/nixos/modules/programs/firejail.nix
index 5e53f7337943..484f9eb44406 100644
--- a/nixos/modules/programs/firejail.nix
+++ b/nixos/modules/programs/firejail.nix
@@ -5,20 +5,20 @@ with lib;
 let
   cfg = config.programs.firejail;
 
-  wrappedBins = pkgs.stdenv.mkDerivation {
-    name = "firejail-wrapped-binaries";
-    nativeBuildInputs = with pkgs; [ makeWrapper ];
-    buildCommand = ''
+  wrappedBins = pkgs.runCommand "firejail-wrapped-binaries"
+    { preferLocalBuild = true;
+      allowSubstitutes = false;
+    }
+    ''
       mkdir -p $out/bin
       ${lib.concatStringsSep "\n" (lib.mapAttrsToList (command: binary: ''
-      cat <<_EOF >$out/bin/${command}
-      #!${pkgs.stdenv.shell} -e
-      /run/wrappers/bin/firejail ${binary} "\$@"
-      _EOF
-      chmod 0755 $out/bin/${command}
+        cat <<_EOF >$out/bin/${command}
+        #! ${pkgs.runtimeShell} -e
+        exec /run/wrappers/bin/firejail ${binary} "\$@"
+        _EOF
+        chmod 0755 $out/bin/${command}
       '') cfg.wrappedBinaries)}
     '';
-  };
 
 in {
   options.programs.firejail = {

From 8b07500163819bcad8bedc37af52e700bf835405 Mon Sep 17 00:00:00 2001
From: florianjacob <projects+git@florianjacob.de>
Date: Sat, 14 Mar 2020 04:13:04 +0100
Subject: [PATCH 2988/4636] nixos/lib: use removePrefix in escapeSystemdPath

---
 nixos/lib/utils.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix
index a522834e4294..21f4c7c6988f 100644
--- a/nixos/lib/utils.nix
+++ b/nixos/lib/utils.nix
@@ -14,7 +14,7 @@ rec {
   # becomes dev-xyzzy.  FIXME: slow.
   escapeSystemdPath = s:
    replaceChars ["/" "-" " "] ["-" "\\x2d" "\\x20"]
-    (if hasPrefix "/" s then substring 1 (stringLength s) s else s);
+   (removePrefix "/" s);
 
   # Returns a system path for a given shell package
   toShellPath = shell:

From 3a8d05747b6d7a8036e1aafe9310a6321f3de78f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sun, 5 Jan 2020 23:41:37 +0100
Subject: [PATCH 2989/4636] qgroundcontrol: Fix build

This silences some warnings to not run into "Log limit exceeded" on
hydra.
---
 pkgs/applications/science/robotics/qgroundcontrol/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index cbf7f4db8c41..c17ffb001182 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
@@ -27,6 +27,8 @@ mkDerivation rec {
     cd build
   '';
 
+  NIX_CFLAGS_COMPILE = [ "-Wno-address-of-packed-member" ]; # Don't litter logs with these warnings
+
   qmakeFlags = [
     # Default install tries to copy Qt files into package
     "CONFIG+=QGC_DISABLE_BUILD_SETUP"

From b86030608bf6db834272d9729173a6109d1fbfbc Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 13 Mar 2020 20:20:20 -0500
Subject: [PATCH 2990/4636] pythonPackages.psutil: fix build on darwin

Disable tests because it segfaults on darwin
---
 pkgs/development/python-modules/psutil/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix
index 59dd94b30188..8e479dfaca25 100644
--- a/pkgs/development/python-modules/psutil/default.nix
+++ b/pkgs/development/python-modules/psutil/default.nix
@@ -15,7 +15,8 @@ buildPythonPackage rec {
   };
 
   # arch doesn't report frequency is the same way
-  doCheck = stdenv.isx86_64;
+  # tests segfaults on darwin https://github.com/giampaolo/psutil/issues/1715
+  doCheck = stdenv.isDarwin || stdenv.isx86_64;
   checkInputs = [ pytest ]
     ++ lib.optionals isPy27 [ mock ipaddress ];
   # out must be referenced as test import paths are relative

From 50c997c0009c2b69b8e2f23dd66d7821d0328efa Mon Sep 17 00:00:00 2001
From: Nathan Fish <lordcirth@gmail.com>
Date: Mon, 20 Jan 2020 16:55:18 -0500
Subject: [PATCH 2991/4636] ipfs-cluster: 0.11.0 -> 0.12.1

---
 pkgs/applications/networking/ipfs-cluster/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix
index 76cc393f26a3..a214f222d566 100644
--- a/pkgs/applications/networking/ipfs-cluster/default.nix
+++ b/pkgs/applications/networking/ipfs-cluster/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "ipfs-cluster";
-  version = "0.11.0";
+  version = "0.12.1";
   rev = "v${version}";
 
-  modSha256 = "03bqwg9nqh7w6j887gzxr2mcn14jc8f07z896b3swg5wzaz1i6hs";
+  modSha256 = "0bn47lcb9plzvl2vqqj7p33ishz6bbqpsgf2i6p34g13bwwpq647";
 
   src = fetchFromGitHub {
     owner = "ipfs";
     repo = "ipfs-cluster";
     inherit rev;
-    sha256 = "0q5lanm2zdwwhdwv05fssb34y4y4dha3dq7x1iaabbf70lpqv6yx";
+    sha256 = "1jh6ynj50jd4w79widaqrgm3h3yz5h03vq0lbsx717a8d9073blh";
   };
 
   meta = with stdenv.lib; {

From dd938aa1575aa7fccde823b58ed2b302940691e3 Mon Sep 17 00:00:00 2001
From: Nathan van Doorn <nathan@myrtlesoftware.com>
Date: Fri, 21 Feb 2020 09:47:14 +0000
Subject: [PATCH 2992/4636] metamath: 0.180 -> 0.181

---
 pkgs/development/interpreters/metamath/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix
index 423352955853..42b95f341ba9 100644
--- a/pkgs/development/interpreters/metamath/default.nix
+++ b/pkgs/development/interpreters/metamath/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation {
   pname = "metamath";
-  version = "0.180";
+  version = "0.181";
 
   buildInputs = [ autoreconfHook ];
 
   src = fetchFromGitHub {
     owner = "metamath";
     repo = "metamath-exe";
-    rev = "469e1b253f29be838411e2cc9c93d7704297059c";
-    sha256 = "0nazi7z8qrpn7nnmxk99ilwf8smkzh26jcvn17wyfnywxpdsb7wa";
+    rev = "67cbfa8468deb6f8ad5bedafc6399bee59064764";
+    sha256 = "1mk3g41qz26j38j68i9qmnl8khkd8jwrzj4vxkb855h4b819s000";
   };
 
   # the files necessary to build the DATA target are not in this distribution

From 38b77ca72faa873b08d1670e5ce015a1f4e6327a Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Tue, 3 Mar 2020 20:58:03 -0500
Subject: [PATCH 2993/4636] client-ip-echo: 0.1.0.4 -> 0.1.0.5

---
 pkgs/servers/misc/client-ip-echo/client-ip-echo.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix b/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix
index ec1f82507ce1..39adc6b78ee3 100644
--- a/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix
+++ b/pkgs/servers/misc/client-ip-echo/client-ip-echo.nix
@@ -1,12 +1,12 @@
 { mkDerivation, fetchFromGitHub, base, bytestring, network, stdenv }:
 mkDerivation {
   pname = "client-ip-echo";
-  version = "0.1.0.4";
+  version = "0.1.0.5";
   src = fetchFromGitHub {
     owner = "jerith666";
     repo = "client-ip-echo";
-    rev = "58d1bc627c21008236afb1af4c09ba8153c95dad";
-    sha256 = "153fab87qq080a819bqbdan925045icqwxldwj3ps40w2ssn7a53";
+    rev = "e81db98d04c13966b2ec114e01f82487962055a7";
+    sha256 = "02rzzbm1mdqh5zx5igd0s7pwkcsk64lx40rclxw3485348brc6ya";
   };
   isLibrary = false;
   isExecutable = true;

From 10132c6602b648aa73a1cbe9849d34a9acaec3e9 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 4 Mar 2020 19:33:50 +0100
Subject: [PATCH 2994/4636] ddrescue: 1.24 -> 1.25

See https://lists.gnu.org/archive/html/info-gnu/2020-03/msg00002.html
for release information
---
 pkgs/tools/system/ddrescue/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix
index c2d3b33c7490..8efcf22312fb 100644
--- a/pkgs/tools/system/ddrescue/default.nix
+++ b/pkgs/tools/system/ddrescue/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ddrescue-1.24";
+  name = "ddrescue-1.25";
 
   src = fetchurl {
     url = "mirror://gnu/ddrescue/${name}.tar.lz";
-    sha256 = "11qh0bbzf00mfb4yq35gnv5m260k4d7q9ixklry6bqvhvvp3ypab";
+    sha256 = "0qqh38izl5ppap9a5izf3hijh94k65s3zbfkczd4b7x04syqwlyf";
   };
 
   nativeBuildInputs = [ lzip ];
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
          second and successive copies.
       '';
 
-    homepage = https://www.gnu.org/software/ddrescue/ddrescue.html;
+    homepage = "https://www.gnu.org/software/ddrescue/ddrescue.html";
 
     license = licenses.gpl3Plus;
 

From fc5ba3109c1741175c8bbaa395464d825bb66839 Mon Sep 17 00:00:00 2001
From: Manuel Mendez <mmendez534@gmail.com>
Date: Tue, 24 Dec 2019 14:51:14 -0500
Subject: [PATCH 2995/4636] maintainers: format with nixfmt

Vim cleaned up white space issues on its own from a hook so I decided to
take a look after running through nixfmt. The end result looks pretty
good to me, very minimal changes where everyting but the top-level
comment seems good to keep. I decided to keep the top-level comment
anyway so that future nixfmts would be minimal.
---
 maintainers/maintainer-list.nix | 121 ++++++++++++++++----------------
 1 file changed, 62 insertions(+), 59 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 088013d0050d..52c420674b31 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1,5 +1,5 @@
 /* List of NixOS maintainers.
-
+    ```nix
     handle = {
       # Required
       name = "Your name";
@@ -13,32 +13,33 @@
         fingerprint = "AAAA BBBB CCCC DDDD EEEE  FFFF 0000 1111 2222 3333";
       }];
     };
+    ```
 
-  where
+    where
 
-  - `handle` is the handle you are going to use in nixpkgs expressions,
-  - `name` is your, preferably real, name,
-  - `email` is your maintainer email address, and
-  - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/<userhandle>`),
-  - `githubId` is your GitHub user ID, which can be found at `https://api.github.com/users/<userhandle>`,
-  - `keys` is a list of your PGP/GPG key IDs and fingerprints.
+    - `handle` is the handle you are going to use in nixpkgs expressions,
+    - `name` is your, preferably real, name,
+    - `email` is your maintainer email address, and
+    - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/<userhandle>`),
+    - `githubId` is your GitHub user ID, which can be found at `https://api.github.com/users/<userhandle>`,
+    - `keys` is a list of your PGP/GPG key IDs and fingerprints.
 
-  `handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient.
+    `handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient.
 
-  Add PGP/GPG keys only if you actually use them to sign commits and/or mail.
+    Add PGP/GPG keys only if you actually use them to sign commits and/or mail.
 
-  To get the required PGP/GPG values for a key run
-  ```shell
-  gpg --keyid-format 0xlong --fingerprint <email> | head -n 2
-  ```
+    To get the required PGP/GPG values for a key run
+    ```shell
+    gpg --keyid-format 0xlong --fingerprint <email> | head -n 2
+    ```
 
-  !!! Note that PGP/GPG values stored here are for informational purposes only, don't use this file as a source of truth.
+    !!! Note that PGP/GPG values stored here are for informational purposes only, don't use this file as a source of truth.
 
-  More fields may be added in the future.
+    More fields may be added in the future.
 
-  Please keep the list alphabetically sorted.
-  See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data.
-  */
+    Please keep the list alphabetically sorted.
+    See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data.
+*/
 {
   "0x4A6F" = {
     email = "0x4A6F@shackspace.de";
@@ -1572,10 +1573,12 @@
     githubId = 2217136;
     name = "Ștefan D. Mihăilă";
     keys = [
-      { longkeyid = "rsa4096/6E68A39BF16A3ECB";
+      {
+        longkeyid = "rsa4096/6E68A39BF16A3ECB";
         fingerprint = "CBC9 C7CC 51F0 4A61 3901 C723 6E68 A39B F16A 3ECB";
       }
-      { longkeyid = "rsa4096/6220AD7846220A52";
+      {
+        longkeyid = "rsa4096/6220AD7846220A52";
         fingerprint = "7EAB 1447 5BBA 7DDE 7092 7276 6220 AD78 4622 0A52";
       }
     ];
@@ -1792,7 +1795,7 @@
     name = "Didier J. Devroye";
   };
   devhell = {
-    email = "\"^\"@regexmail.net";
+    email = ''"^"@regexmail.net'';
     github = "devhell";
     githubId = 896182;
     name = "devhell";
@@ -2131,7 +2134,7 @@
   };
   ehmry = {
     email = "ehmry@posteo.net";
-    github= "ehmry";
+    github = "ehmry";
     githubId = 537775;
     name = "Emery Hemingway";
   };
@@ -2219,10 +2222,10 @@
     name = "Jack Kelly";
   };
   enorris = {
-      name = "Eric Norris";
-      email = "erictnorris@gmail.com";
-      github = "ericnorris";
-      githubId = 1906605;
+    name = "Eric Norris";
+    email = "erictnorris@gmail.com";
+    github = "ericnorris";
+    githubId = 1906605;
   };
   Enteee = {
     email = "nix@duckpond.ch";
@@ -2891,7 +2894,7 @@
     github = "hansjoergschurr";
     githubId = 9850776;
     name = "Hans-Jörg Schurr";
-    };
+  };
   HaoZeke = {
     email = "r95g10@gmail.com";
     github = "haozeke";
@@ -4224,10 +4227,10 @@
     }];
   };
   luis = {
-      email = "luis.nixos@gmail.com";
-      github = "Luis-Hebendanz";
-      githubId = 22085373;
-      name = "Luis Hebendanz";
+    email = "luis.nixos@gmail.com";
+    github = "Luis-Hebendanz";
+    githubId = 22085373;
+    name = "Luis Hebendanz";
   };
   lionello = {
     email = "lio@lunesu.com";
@@ -4470,12 +4473,12 @@
     githubId = 50230945;
     name = "Marcus Boyd";
   };
-	marenz = {
-		email = "marenz@arkom.men";
-		github = "marenz2569";
-		githubId = 12773269;
-		name = "Markus Schmidl";
-	};
+  marenz = {
+    email = "marenz@arkom.men";
+    github = "marenz2569";
+    githubId = 12773269;
+    name = "Markus Schmidl";
+  };
   markus1189 = {
     email = "markus1189@gmail.com";
     github = "markus1189";
@@ -4725,7 +4728,7 @@
     githubId = 668926;
     name = "Maximilian Güntner";
   };
-   mhaselsteiner = {
+  mhaselsteiner = {
     email = "magdalena.haselsteiner@gmx.at";
     github = "mhaselsteiner";
     githubId = 20536514;
@@ -5789,11 +5792,10 @@
     github = "pradyuman";
     githubId = 9904569;
     name = "Pradyuman Vig";
-    keys = [
-      { longkeyid = "rsa4096/4F74D5361C4CA31E";
-        fingerprint = "240B 57DE 4271 2480 7CE3  EAC8 4F74 D536 1C4C A31E";
-      }
-    ];
+    keys = [{
+      longkeyid = "rsa4096/4F74D5361C4CA31E";
+      fingerprint = "240B 57DE 4271 2480 7CE3  EAC8 4F74 D536 1C4C A31E";
+    }];
   };
   prikhi = {
     email = "pavan.rikhi@gmail.com";
@@ -5807,10 +5809,12 @@
     githubId = 7537109;
     name = "Michael Weiss";
     keys = [
-      { longkeyid = "ed25519/0x130826A6C2A389FD"; # Git only
+      {
+        longkeyid = "ed25519/0x130826A6C2A389FD"; # Git only
         fingerprint = "86A7 4A55 07D0 58D1 322E  37FD 1308 26A6 C2A3 89FD";
       }
-      { longkeyid = "rsa3072/0xBCA9943DD1DF4C04"; # Email, etc.
+      {
+        longkeyid = "rsa3072/0xBCA9943DD1DF4C04"; # Email, etc.
         fingerprint = "AF85 991C C950 49A2 4205  1933 BCA9 943D D1DF 4C04";
       }
     ];
@@ -6176,12 +6180,10 @@
     github = "rnhmjoj";
     githubId = 2817565;
     name = "Michele Guerini Rocco";
-    keys =
-    [
-      { longkeyid   = "ed25519/0xBFBAF4C975F76450";
-        fingerprint = "92B2 904F D293 C94D C4C9  3E6B BFBA F4C9 75F7 6450";
-      }
-    ];
+    keys = [{
+      longkeyid = "ed25519/0xBFBAF4C975F76450";
+      fingerprint = "92B2 904F D293 C94D C4C9  3E6B BFBA F4C9 75F7 6450";
+    }];
   };
   rob = {
     email = "rob.vermaas@gmail.com";
@@ -6386,10 +6388,10 @@
     }];
   };
   samrose = {
-   email = "samuel.rose@gmail.com";
-   github = "samrose";
-   githubId = 115821;
-   name = "Sam Rose";
+    email = "samuel.rose@gmail.com";
+    github = "samrose";
+    githubId = 115821;
+    name = "Sam Rose";
   };
   samueldr = {
     email = "samuel@dionne-riel.com";
@@ -7346,10 +7348,10 @@
     github = "tkerber";
     githubId = 5722198;
     name = "Thomas Kerber";
-    keys = [ {
+    keys = [{
       longkeyid = "rsa4096/0x8489B911F9ED617B";
       fingerprint = "556A 403F B0A2 D423 F656  3424 8489 B911 F9ED 617B";
-    } ];
+    }];
   };
   tmplt = {
     email = "tmplt@dragons.rocks";
@@ -7629,7 +7631,8 @@
   };
   vcunat = {
     name = "Vladimír Čunát";
-    email = "v@cunat.cz"; # vcunat@gmail.com predominated in commits before 2019/03
+    # vcunat@gmail.com predominated in commits before 2019/03
+    email = "v@cunat.cz";
     github = "vcunat";
     githubId = 1785925;
     keys = [{

From 78309be0f34f1e5e8072a0cd322021f817661291 Mon Sep 17 00:00:00 2001
From: Manuel Mendez <mmendez534@gmail.com>
Date: Tue, 24 Dec 2019 14:51:49 -0500
Subject: [PATCH 2996/4636] maintainers: update mmlb email

---
 maintainers/maintainer-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 52c420674b31..aa70b26d2040 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4897,7 +4897,7 @@
     name = "Martin Milata";
   };
   mmlb = {
-    email = "me.mmlb@mmlb.me";
+    email = "manny@peekaboo.mmlb.icu";
     github = "mmlb";
     name = "Manuel Mendez";
   };

From 362db40e0b8a888696329f07010972768726f638 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 13 Mar 2020 23:12:51 -0400
Subject: [PATCH 2997/4636] b3sum: remove non-existent attribute

The attribute `verifyCargoDeps` is no longer defined in the rustPlatform helper;
it is now the default and always on as part of the improvements in #79975
---
 pkgs/tools/security/b3sum/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/tools/security/b3sum/default.nix b/pkgs/tools/security/b3sum/default.nix
index 5dc4f1b81e67..6f783d07ced8 100644
--- a/pkgs/tools/security/b3sum/default.nix
+++ b/pkgs/tools/security/b3sum/default.nix
@@ -14,7 +14,6 @@ rustPlatform.buildRustPackage rec {
   sourceRoot = "source/b3sum";
 
   cargoSha256 = "1rqhz2r60603mylazn37mkm783qb7qhjcg8cqss0iy1g752f3f2i";
-  verifyCargoDeps = false;
 
   cargoPatches = [ ./add-cargo-lock.patch ];
 

From fda69ba6281115c8d47fbf89e351365bfb7e13c0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 04:11:16 +0000
Subject: [PATCH 2998/4636] circleci-cli: 0.1.6072 -> 0.1.6949

---
 pkgs/development/tools/misc/circleci-cli/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix
index f4bdd0c09af3..fde1c68d34d0 100644
--- a/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/pkgs/development/tools/misc/circleci-cli/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "circleci-cli";
-  version = "0.1.6072";
+  version = "0.1.6949";
 
   src = fetchFromGitHub {
     owner = "CircleCI-Public";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1sbzl6y7974sib14qr2qa6d20cs54h6a3mc1whbxifg87cw02qjn";
+    sha256 = "0r64m4lcm9w0rzi61rsi3sm719ydwiv5axxnikwhzmvkdz0rd7dq";
   };
 
-  modSha256 = "1pxqc2a1hb6bk67sd2c37zwg6n7h0jay3yqsjcs4jc0bqv48gzip";
+  modSha256 = "199ai38knp50mjjhddjd70qfwx63c69rf7ddw4hpzgx5cm5a04q2";
 
   buildFlagsArray = [ "-ldflags=-s -w -X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" ];
 
@@ -32,6 +32,6 @@ buildGoModule rec {
     '';
     maintainers = with maintainers; [ synthetica ];
     license = licenses.mit;
-    homepage = https://circleci.com/;
+    homepage = "https://circleci.com/";
   };
 }

From 7ed8a2c7f55d725f3eb590464f6659cea55e28ed Mon Sep 17 00:00:00 2001
From: rychale <alexey.a.rychkov@gmail.com>
Date: Wed, 14 Aug 2019 14:43:11 +0300
Subject: [PATCH 2999/4636] msgpack: 3.0.1 -> 3.2.0

---
 pkgs/development/libraries/msgpack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/msgpack/default.nix b/pkgs/development/libraries/msgpack/default.nix
index bf51f8954025..f94bd35c3019 100644
--- a/pkgs/development/libraries/msgpack/default.nix
+++ b/pkgs/development/libraries/msgpack/default.nix
@@ -1,12 +1,12 @@
 { callPackage, fetchFromGitHub, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.0.1";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
     owner  = "msgpack";
     repo   = "msgpack-c";
     rev    = "cpp-${version}";
-    sha256 = "0nr6y9v4xbvzv717j9w9lhmags1y2s5mq103v044qlyd2jkbg2p4";
+    sha256 = "07n0kdmdjn3amwfg7fqz3xac1yrrxh7d2l6p4pgc6as087pbm8pl";
   };
 })

From 5389e95ce0b053b33b95e4b67ebb63af18c39356 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 04:28:21 +0000
Subject: [PATCH 3000/4636] coredns: 1.6.6 -> 1.6.7

---
 pkgs/servers/dns/coredns/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix
index 2c8506ac9d28..017842f39dc1 100644
--- a/pkgs/servers/dns/coredns/default.nix
+++ b/pkgs/servers/dns/coredns/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "coredns";
-  version = "1.6.6";
+  version = "1.6.7";
 
   goPackagePath = "github.com/coredns/coredns";
 
@@ -10,10 +10,10 @@ buildGoModule rec {
     owner = "coredns";
     repo = "coredns";
     rev = "v${version}";
-    sha256 = "1x8sgchp0kkk5xdharjrq29qxgv1mdzrw3f12s2kchgqf1m6r0sx";
+    sha256 = "05r0dm8h23s5dafxisya48izc2ywpn5ywvhf9q6m20qkpwr8gd10";
   };
 
-  modSha256 = "10ljggg1g5x00gpgzc5m29n1k5akf0s0g3hkdh8adcbrcz0pgr5c";
+  modSha256 = "0wlffk6wkcyn2lphw2vmdsmzag0wxljcxrvm7sv3i124x2x3yvy4";
 
   meta = with stdenv.lib; {
     homepage = "https://coredns.io";

From 2c121f421551355d3ea61e4b83ea269df83f2027 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Sun, 17 Nov 2019 13:48:53 +0900
Subject: [PATCH 3001/4636] nixos/firewall: fix inverted assertion for reverse
 path filtering

Previously the assertion passed if the kernel had support OR the
filter was *enabled*. In the case of a kernel without support, the
`checkReversePath` option defaulted to false, and then failed the
assertion.
---
 nixos/modules/services/networking/firewall.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index 15aaf7410674..b0045ff795e3 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -546,7 +546,7 @@ in
       options nf_conntrack nf_conntrack_helper=1
     '';
 
-    assertions = [ { assertion = (cfg.checkReversePath != false) || kernelHasRPFilter;
+    assertions = [ { assertion = cfg.checkReversePath -> kernelHasRPFilter;
                      message = "This kernel does not support rpfilter"; }
                  ];
 

From e271476a4ebdfcf655c1d7d63d3bc81c79da7559 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Thu, 2 Jan 2020 18:11:33 +0900
Subject: [PATCH 3002/4636] openssl: fix platform detection on armv5tel-linux

---
 pkgs/development/libraries/openssl/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index d9028ddfbb5b..3c952d601654 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -45,6 +45,7 @@ let
     # TODO(@Ericson2314): Improve with mass rebuild
     configurePlatforms = [];
     configureScript = {
+        armv5tel-linux = "./Configure linux-armv4 -march=armv5te";
         armv6l-linux = "./Configure linux-armv4 -march=armv6";
         armv7l-linux = "./Configure linux-armv4 -march=armv7-a";
         x86_64-darwin  = "./Configure darwin64-x86_64-cc";

From ba957840f6a66e180ddd59c9fd26c011d217393b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 04:34:01 +0000
Subject: [PATCH 3003/4636] croc: 6.4.10 -> 8.0.3

---
 pkgs/tools/networking/croc/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix
index b7782267b38f..52f9ef9fade8 100644
--- a/pkgs/tools/networking/croc/default.nix
+++ b/pkgs/tools/networking/croc/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "croc";
-  version = "6.4.10";
+  version = "8.0.3";
 
   goPackagePath = "github.com/schollz/croc";
 
@@ -10,15 +10,15 @@ buildGoModule rec {
     owner = "schollz";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1w16k0h9zk4q6icyf79jw4zc1jy2h9yzw0bcmywq0pz0pqk6z4nw";
+    sha256 = "0jx6yxyxdnv4xzxsyfa7y1gm079rcsjqa1gmkh6bwkmhk6w5h1k9";
   };
 
-  modSha256 = "069n9593jfrlbrfnzr4mxvs1v1y4fvgnc9kawahh2a1rzh3cxrvq";
+  modSha256 = "0d4mm840fjsbcyl98zg6d3i7qp1lmjkx07mh91d56jyf9j082g99";
   subPackages = [ "." ];
 
   meta = with stdenv.lib; {
     description = "Easily and securely send things from one computer to another";
-    homepage = https://github.com/schollz/croc;
+    homepage = "https://github.com/schollz/croc";
     license = licenses.mit;
     maintainers = with maintainers; [ hugoreeves equirosa ];
 

From 01f03f30db5755349b857b6939100bbb4c32303e Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Sun, 17 Nov 2019 14:35:33 +0900
Subject: [PATCH 3004/4636] nixos/prometheus: add checkConfig

Workaround for https://github.com/prometheus/prometheus/issues/5222
---
 .../monitoring/prometheus/default.nix         | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix
index b67f697ca0de..6b1a4be44d1d 100644
--- a/nixos/modules/services/monitoring/prometheus/default.nix
+++ b/nixos/modules/services/monitoring/prometheus/default.nix
@@ -9,12 +9,13 @@ let
 
   # a wrapper that verifies that the configuration is valid
   promtoolCheck = what: name: file:
-    pkgs.runCommand
-      "${name}-${replaceStrings [" "] [""] what}-checked"
-      { buildInputs = [ cfg.package ]; } ''
-    ln -s ${file} $out
-    promtool ${what} $out
-  '';
+    if cfg.checkConfig then
+      pkgs.runCommand
+        "${name}-${replaceStrings [" "] [""] what}-checked"
+        { buildInputs = [ cfg.package ]; } ''
+      ln -s ${file} $out
+      promtool ${what} $out
+    '' else file;
 
   # Pretty-print JSON to a file
   writePrettyJSON = name: x:
@@ -601,6 +602,20 @@ in {
         if Prometheus is served via a reverse proxy).
       '';
     };
+
+    checkConfig = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Check configuration with <literal>promtool
+        check</literal>. The call to <literal>promtool</literal> is
+        subject to sandboxing by Nix. When credentials are stored in
+        external files (<literal>password_file</literal>,
+        <literal>bearer_token_file</literal>, etc), they will not be
+        visible to <literal>promtool</literal> and it will report
+        errors, despite a correct configuration.
+      '';
+    };
   };
 
   config = mkIf cfg.enable {

From 3a68a3313e96c063c2f0a84bc676de4fdec94ba0 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 14 Mar 2020 00:44:41 -0400
Subject: [PATCH 3005/4636] cdb: fix meta.homepage

Without the .html, the server returns access denied.
---
 pkgs/development/tools/database/cdb/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/database/cdb/default.nix b/pkgs/development/tools/database/cdb/default.nix
index 47f625736750..b9ebba554774 100644
--- a/pkgs/development/tools/database/cdb/default.nix
+++ b/pkgs/development/tools/database/cdb/default.nix
@@ -50,7 +50,7 @@ in stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "https://cr.yp.to/cdb";
+    homepage = "https://cr.yp.to/cdb.html";
     license = lib.licenses.publicDomain;
     maintainers = [ lib.maintainers.Profpatsch ];
     platforms = lib.platforms.unix;

From 5e2beafd022f886107ac3be5911c5bda4dc9676f Mon Sep 17 00:00:00 2001
From: ydlr <ydlr@ydlr.io>
Date: Fri, 13 Mar 2020 23:46:27 -0500
Subject: [PATCH 3006/4636] nix-generate-from-cpan: remove unkown license

Leave license empty when it is not provided. This prevents packages from
failing to build because the license is set to
`stdenv.lib.licenses.unkown`.

There will still be a warning about the unkown license.
---
 maintainers/scripts/nix-generate-from-cpan.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/scripts/nix-generate-from-cpan.pl b/maintainers/scripts/nix-generate-from-cpan.pl
index e04d3713e9a1..d258f4df8d8e 100755
--- a/maintainers/scripts/nix-generate-from-cpan.pl
+++ b/maintainers/scripts/nix-generate-from-cpan.pl
@@ -164,7 +164,7 @@ Readonly::Hash my %LICENSE_MAP => (
 
     # License not provided in metadata.
     unknown => {
-        licenses => [qw( unknown )],
+        licenses => [],
         amb      => 1
     }
 );

From 38d8eb254462c336ee7262116db43b07295eb647 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 04:51:44 +0000
Subject: [PATCH 3007/4636] dnsproxy: 0.20.0 -> 0.23.7

---
 pkgs/tools/networking/dnsproxy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix
index 6554dd465d4c..8296600cf3d3 100644
--- a/pkgs/tools/networking/dnsproxy/default.nix
+++ b/pkgs/tools/networking/dnsproxy/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "dnsproxy";
-  version = "0.20.0";
+  version = "0.23.7";
 
   src = fetchFromGitHub {
     owner = "AdguardTeam";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0yd3d90ssdzpbsdq068dvsi0r1z2rlv3wpbmpkhfgpxmwrvdanrq";
+    sha256 = "1sfl2nyzspqllbklc9wf62wqxs0k3ac7vzqz8kl5h9ch654g542a";
   };
 
-  modSha256 = "0cqwkmhajp3py3b5aj3qz9480qy2ws0vy1gk21bxjm56wqxl2gf0";
+  modSha256 = "0r5ybr4gpcdsldk12b0d4xiih6ckwnqkfwy89c97prv24v14zysv";
 
   meta = with stdenv.lib; {
     description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support";

From d95db5018ac81b5198de76a7c8c9dfd1394ea342 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 04:55:32 +0000
Subject: [PATCH 3008/4636] docui: 2.0.0 -> 2.0.4

---
 pkgs/tools/misc/docui/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix
index 66c0cfc82b1b..0329c1bc4a69 100644
--- a/pkgs/tools/misc/docui/default.nix
+++ b/pkgs/tools/misc/docui/default.nix
@@ -2,20 +2,20 @@
 
 buildGoModule rec {
   pname = "docui";
-  version = "2.0.0";
+  version = "2.0.4";
 
   src = fetchFromGitHub {
     owner = "skanehira";
     repo = "docui";
     rev = version;
-    sha256 = "0rizl4rxmb3brzvqxw5llbgvq3rncix3h60pgq50djdf0jjnn5hs";
+    sha256 = "0jya0wdp8scjmsr44krdbbb8q4gplf44gsng1nyn12a6ldqzayxl";
   };
 
-  modSha256 = "0asqz9nnx80g2wi7dzxrfmppcraywrwdqi9vzr66vaihwpfpfnwz";
+  modSha256 = "1wyx05kk4f41mgvwnvfc9xk7vd3x96cbn5xb5ph7p443f70ydnak";
 
   meta = with stdenv.lib; {
     description = "TUI Client for Docker";
-    homepage = https://github.com/skanehira/docui;
+    homepage = "https://github.com/skanehira/docui";
     license = licenses.mit;
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ aethelz ];

From ee2ccdaf2685b089a8bea311a5b4982e2d15b0ab Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 29 Feb 2020 05:29:01 +0000
Subject: [PATCH 3009/4636] jemalloc: 5.1.0 -> 5.2.1

---
 pkgs/development/libraries/jemalloc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix
index 7ea7bccd6b87..9324279ed100 100644
--- a/pkgs/development/libraries/jemalloc/default.nix
+++ b/pkgs/development/libraries/jemalloc/default.nix
@@ -1,4 +1,4 @@
 import ./common.nix {
-  version = "5.1.0";
-  sha256 = "0s3jpcyhzia8d4k0xyc67is78kg416p9yc3c2f9w6fhhqqffd5jk";
+  version = "5.2.1";
+  sha256 = "1xl7z0vwbn5iycg7amka9jd6hxd8nmfk7nahi4p9w2bnw9f0wcrl";
 }

From 406f983101cbf3891686cc13e979c63895a53c2e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 22 Oct 2019 10:50:24 -0700
Subject: [PATCH 3010/4636] munin: 2.0.49 -> 2.0.51

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/munin/versions
---
 pkgs/servers/monitoring/munin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index 46e1460d795e..22f768b94e1f 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.49";
+  version = "2.0.51";
   pname = "munin";
 
   src = fetchFromGitHub {
     owner = "munin-monitoring";
     repo = "munin";
     rev = version;
-    sha256 = "13m56wh5cq82pwvv4ngav1zyn2sajxxjigljrz8ycjriw0wvncsf";
+    sha256 = "1r018lbk1dncg6v3ai7wvnk1qr4ddsjc5g605dq086z0l0xg7ras";
   };
 
   buildInputs = [

From 6b6abb453cf11fa9fbaff9223730c4ecdd0c7499 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 14 Mar 2020 05:32:20 +0100
Subject: [PATCH 3011/4636] xonsh: 0.9.13 -> 0.9.14

Closes #81951

The PR unnecessarily removes the `patchShebangs .`-call, also the
non-deterministically failing testcase `test_pyghooks` isn't excluded
there.

Co-authored-by: Mario Rodas <marsam@users.noreply.github.com>
---
 pkgs/shells/xonsh/default.nix | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index 2bc65164d582..2a1688480dbc 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -5,28 +5,21 @@
 , glibcLocales
 , coreutils
 , git
+, python3
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "xonsh";
-  version = "0.9.13";
+  version = "0.9.14";
 
   # fetch from github because the pypi package ships incomplete tests
   src = fetchFromGitHub {
     owner  = "xonsh";
     repo   = "xonsh";
-    rev    = "refs/tags/${version}";
-    sha256 = "0nk6rjdkbxli510iwqspvray48kdxvbdmq1k8nxn14kqfpqzlbcv";
+    rev    = version;
+    sha256 = "03g8ilg4dxin3v3rzccdxx9zf8rvyqpxakn1dlpqbgsnwdwa19p4";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "fix-ptk-tests.patch";
-      url = "https://github.com/xonsh/xonsh/commit/ca7acecc968dcda7dd56c1f5d5b4df349c98d734.patch";
-      sha256 = "00nhbf9wzm6r86r9zq8mnhds30w6gdhkgsx5kpl0jppiz4ll96iw";
-    })
-  ];
-
   LC_ALL = "en_US.UTF-8";
   postPatch = ''
     sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py
@@ -34,6 +27,7 @@ python3Packages.buildPythonApplication rec {
 
     sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' tests/test_integrations.py
     sed -ie 's|/usr/bin/env|${coreutils}/bin/env|' scripts/xon.sh
+    find scripts -name 'xonsh*' -exec sed -i -e "s|env -S|env|" {} \;
     find -name "*.xsh" | xargs sed -ie 's|/usr/bin/env|${coreutils}/bin/env|'
     patchShebangs .
   '';
@@ -41,7 +35,7 @@ python3Packages.buildPythonApplication rec {
   doCheck = !stdenv.isDarwin;
 
   checkPhase = ''
-    HOME=$TMPDIR pytest -k 'not test_repath_backslash and not test_os and not test_man_completion and not test_builtins and not test_main and not test_ptk_highlight'
+    HOME=$TMPDIR pytest -k 'not test_repath_backslash and not test_os and not test_man_completion and not test_builtins and not test_main and not test_ptk_highlight and not test_pyghooks'
     HOME=$TMPDIR pytest -k 'test_builtins or test_main' --reruns 5
     HOME=$TMPDIR pytest -k 'test_ptk_highlight'
   '';

From cc989f0cc6a51044b0023dd0e5bae851dbe5ad5e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 14 Mar 2020 05:32:32 +0100
Subject: [PATCH 3012/4636] syncthing-gtk: 0.9.4 -> 0.9.4.4

---
 .../applications/networking/syncthing-gtk/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix
index 9317ccab4eab..3e2b7cf67f20 100644
--- a/pkgs/applications/networking/syncthing-gtk/default.nix
+++ b/pkgs/applications/networking/syncthing-gtk/default.nix
@@ -5,14 +5,14 @@
 , pango, gdk-pixbuf, atk }:
 
 buildPythonApplication rec {
-  version = "0.9.4";
+  version = "0.9.4.4";
   pname = "syncthing-gtk";
 
   src = fetchFromGitHub {
     owner = "syncthing";
     repo = "syncthing-gtk";
     rev = "v${version}";
-    sha256 = "0d3rjd1xjd7zravks9a2ph7gv1cm8wxaxkkvl1fvcx15v7f3hff9";
+    sha256 = "0nc0wd7qvyri7841c3dd9in5d7367hys0isyw8znv5fj4c0a6v1f";
   };
 
   nativeBuildInputs = [
@@ -34,10 +34,6 @@ buildPythonApplication rec {
   ];
 
   patches = [
-    (fetchpatch {
-      url = https://github.com/syncthing/syncthing-gtk/commit/b2535e5a9cdb31c4987ab7af37f62d58d38255b7.patch;
-      sha256 = "047v79wz2a9334gbzywlqwpacrk53s26ksvfqaddk06avv8742w7";
-    })
     (substituteAll {
       src = ./paths.patch;
       killall = "${killall}/bin/killall";
@@ -45,6 +41,9 @@ buildPythonApplication rec {
     })
   ];
 
+  # repo doesn't have any tests
+  doCheck = false;
+
   setupPyBuildFlags = [ "build_py" "--nofinddaemon" "--nostdownloader" ];
 
   postPatch = ''

From 1946fabf6a944b5a1928218646669fa6afa254bb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 05:01:03 +0000
Subject: [PATCH 3013/4636] dolt: 0.12.0 -> 0.15.0

---
 pkgs/servers/sql/dolt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix
index b9876fbc5eaa..dbface601f54 100644
--- a/pkgs/servers/sql/dolt/default.nix
+++ b/pkgs/servers/sql/dolt/default.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
     pname = "dolt";
-    version = "0.12.0";
+    version = "0.15.0";
 
     src = fetchFromGitHub {
         owner = "liquidata-inc";
         repo = "dolt";
         rev = "v${version}";
-        sha256 = "1sy8ia9j5aymjpf3k86fc8yw6384iy9ryd8cl72fr9cp70l7sx1q";
+        sha256 = "1zn5ws6x42niwq9rscn63ddpp0558k0lgncmf01p243jlkdnfsg3";
     };
 
     modRoot = "./go";
     subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
-    modSha256 = "0fagi529m1gf5jrqdlg9vxxq4yz9k9q8h92ch0gahp43kxfbgr4q";
+    modSha256 = "04bsj8mfamnbq3y2aqbx1605azi8v15nbdh1zk5grni0ihlal75a";
 
     meta = with lib; {
         description = "Relational database with version control and CLI a-la Git.";

From 9035381b11412bb5af34f92082ce7611118710f3 Mon Sep 17 00:00:00 2001
From: ydlr <ydlr@ydlr.io>
Date: Sat, 14 Mar 2020 00:25:33 -0500
Subject: [PATCH 3014/4636] nix-generate-from-cpan: use Module::CoreList to
 detect core modules

The previous way of detecting core modules failed to filter "if" and
possibly other core modules.
---
 maintainers/scripts/nix-generate-from-cpan.pl | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/maintainers/scripts/nix-generate-from-cpan.pl b/maintainers/scripts/nix-generate-from-cpan.pl
index d258f4df8d8e..f02af4ea6693 100755
--- a/maintainers/scripts/nix-generate-from-cpan.pl
+++ b/maintainers/scripts/nix-generate-from-cpan.pl
@@ -6,6 +6,7 @@ use warnings;
 
 use CPAN::Meta();
 use CPANPLUS::Backend();
+use Module::CoreList;
 use Getopt::Long::Descriptive qw( describe_options );
 use JSON::PP qw( encode_json );
 use Log::Log4perl qw(:easy);
@@ -278,14 +279,8 @@ sub get_deps {
     foreach my $n ( $deps->required_modules ) {
         next if $n eq "perl";
 
-        # Figure out whether the module is a core module by attempting
-        # to `use` the module in a pure Perl interpreter and checking
-        # whether it succeeded. Note, $^X is a magic variable holding
-        # the path to the running Perl interpreter.
-        if ( system("env -i $^X -M$n -e1 >/dev/null 2>&1") == 0 ) {
-            DEBUG("skipping Perl-builtin module $n");
-            next;
-        }
+        my @core = Module::CoreList->find_modules(qr/^$n$/);
+        next if (@core);
 
         my $pkg = module_to_pkg( $cb, $n );
 

From 1e769bdd2ad136c7be98652960b34e0d81967084 Mon Sep 17 00:00:00 2001
From: Dylan Simon <dylan@dylex.net>
Date: Wed, 4 Mar 2020 17:58:04 -0500
Subject: [PATCH 3015/4636] tensorflow: 1.15.1 -> 1.15.2

(cherry picked from commit 0a5ec494b574ccd3db3b234c7d6637d127bd16da)
---
 pkgs/development/python-modules/tensorflow/default.nix | 10 ++++------
 .../tensorflow/lift-gast-restriction.patch             |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 0cddbd5a0a49..ed685bc0c485 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -69,7 +69,7 @@ let
 
   tfFeature = x: if x then "1" else "0";
 
-  version = "1.15.1";
+  version = "1.15.2";
   variant = if cudaSupport then "-gpu" else "";
   pname = "tensorflow${variant}";
 
@@ -100,7 +100,7 @@ let
       owner = "tensorflow";
       repo = "tensorflow";
       rev = "v${version}";
-      sha256 = "1j8vysfblkyydrr67qr3i7kvaq5ygnjlx8hw9a9pc95ac462jq7i";
+      sha256 = "1q0848drjvnaaa38dgns8knmpmkj5plzsc98j20m5ybv68s55w78";
     };
 
     patches = [
@@ -294,12 +294,10 @@ let
       TF_SYSTEM_LIBS = null;
 
       # cudaSupport causes fetch of ncclArchive, resulting in different hashes
-      # FIXME: can't (re)produce this output with current bazel.
-      # FIXME: build log: https://gist.github.com/andir/eff3e9c8eda5b56c8ea84903aed9cc35
       sha256 = if cudaSupport then
-        "0bzkqjnw1crf0v91yb1frvy0l7kmjawbfwdhm89h73i8fqjab8jw"
+        "1qygfcvvn9vysap9nk6xccxi9mgmzyxiywz6k456f811l1v70p2c"
       else
-        "1d7czp43a3a4aksvdcskbdy7dgifily1amqbz9fa6d8mkhdj5if5";
+        "0kfjanw0mfbh30vi1ms2xlg8yp429cbyfriik6yxd5cla2pncg2j";
     };
 
     buildAttrs = {
diff --git a/pkgs/development/python-modules/tensorflow/lift-gast-restriction.patch b/pkgs/development/python-modules/tensorflow/lift-gast-restriction.patch
index 24cc118d8f33..30861d923417 100644
--- a/pkgs/development/python-modules/tensorflow/lift-gast-restriction.patch
+++ b/pkgs/development/python-modules/tensorflow/lift-gast-restriction.patch
@@ -3,9 +3,9 @@ index 992f2eae22..d9386f9b13 100644
 --- a/tensorflow/tools/pip_package/setup.py
 +++ b/tensorflow/tools/pip_package/setup.py
 @@ -54,7 +54,7 @@ REQUIRED_PACKAGES = [
-     'astor >= 0.6.0',
-     'backports.weakref >= 1.0rc1;python_version<"3.4"',
      'enum34 >= 1.1.6;python_version<"3.4"',
+     # functools comes with python3, need to install the backport for python2
+     'functools32 >= 3.2.3;python_version<"3"',
 -    'gast == 0.2.2',
 +    'gast >= 0.2.2',
      'google_pasta >= 0.1.6',

From 7f255ec99dc3545ff1c0b961521d33399bfbeb66 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 05:38:02 +0000
Subject: [PATCH 3016/4636] frp: 0.31.2 -> 0.32.0

---
 pkgs/tools/networking/frp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix
index 2ed70c9ef202..f44e2208646c 100644
--- a/pkgs/tools/networking/frp/default.nix
+++ b/pkgs/tools/networking/frp/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "frp";
-  version = "0.31.2";
+  version = "0.32.0";
 
   src = fetchFromGitHub {
     owner = "fatedier";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0947psq6qcr175xsgwr5k6idphs3s4vdv130ms738bcqf0h9snky";
+    sha256 = "1hj3xy7ihwl66hyxc1m8k3fwgz5jyx1bd32f80d7266klhjqf6nw";
   };
 
-  modSha256 = "1zbl0gfc99pbzdacxhfa1k3y6i7v13sb441wpbp9aygxhvwqrms9";
+  modSha256 = "1v90w5grc0vjpcp0m56d73zi0qnbswgz1rcvcwrjfa3rwqhigbal";
 
   subPackages = [ "cmd/frpc" "cmd/frps" ];
 

From d633f296087e321d6a561b86b8f189cfee0f2edd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 05:41:16 +0000
Subject: [PATCH 3017/4636] geoipupdate: 4.1.5 -> 4.2.2

---
 pkgs/applications/misc/geoipupdate/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix
index 57060179473f..b7b90448e4bc 100644
--- a/pkgs/applications/misc/geoipupdate/default.nix
+++ b/pkgs/applications/misc/geoipupdate/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "geoipupdate";
-  version = "4.1.5";
+  version = "4.2.2";
 
   src = fetchFromGitHub {
     owner = "maxmind";
     repo = "geoipupdate";
     rev = "v${version}";
-    sha256 = "1k0bmsqgw35sdmaafinlr4qd5910fi598i8irxrz11394d3c8giv";
+    sha256 = "057f9kp8g3wixjh9dm58g0qvzfcmhwbk1d573ldly4g5404r9bvf";
   };
 
-  modSha256 = "0mk6zp6byq3jc6wipx53bg5igry114klq5w8isc0z6r63zjsk6f6";
+  modSha256 = "1bypanvrkcqp8rk84cv2569671irgaf3cy27lcrknyina4pdvir5";
 
   meta = with stdenv.lib; {
     description = "Automatic GeoIP database updater";

From 0874bd8ef5645d7c9468622a21ea9a1f7655eee7 Mon Sep 17 00:00:00 2001
From: Rick van Schijndel <Mindavi@users.noreply.github.com>
Date: Sat, 14 Mar 2020 06:55:08 +0100
Subject: [PATCH 3018/4636] afl: Fix afl-qemu build by applying new patches

These patches are gathered from different sources,
such as https://patchwork.kernel.org/patch/10862231/ for the
`gettid` patch.
Another patch comes from the issue in the AFL repository.
The ultimate goal is to get these patches upstream as well,
so we don't keep these general patches only within nixos.

A PR is created against Google/AFL
https://github.com/google/AFL/pull/79,
but it might take a while before it's landed, considering the history
of the project (there are more PRs open).

ZHF: #80379

Fixes #82232

From 348bcc967882ee87bbed2837e4e78d04474fec0b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 05:56:58 +0000
Subject: [PATCH 3019/4636] gnss-sdr: 0.0.11 -> 0.0.12

---
 pkgs/applications/radio/gnss-sdr/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix
index ba37b7ecad22..005f83e0f54e 100644
--- a/pkgs/applications/radio/gnss-sdr/default.nix
+++ b/pkgs/applications/radio/gnss-sdr/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnss-sdr";
-  version = "0.0.11";
+  version = "0.0.12";
 
   src = fetchFromGitHub {
     owner = "gnss-sdr";
     repo = "gnss-sdr";
     rev = "v${version}";
-    sha256 = "0ajj0wx68yyzigppxxa1wag3hzkrjj8dqq8k28rj0jhp8a6bw2q7";
+    sha256 = "0i9cz85jc2m758pzy3bq4dk4vj9wv7k2z118lasb09xldx01dwsq";
   };
 
   buildInputs = [
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An open source Global Navigation Satellite Systems software-defined receiver";
-    homepage = https://gnss-sdr.org/;
+    homepage = "https://gnss-sdr.org/";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
   };

From 5ef871d24a00063254175453c7ede78613dc403e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Mar 2020 07:17:12 +0000
Subject: [PATCH 3020/4636] jflex: 1.7.0 -> 1.8.1

---
 pkgs/development/libraries/java/jflex/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/development/libraries/java/jflex/default.nix
index 744419dcd533..5eb7ef6c0765 100644
--- a/pkgs/development/libraries/java/jflex/default.nix
+++ b/pkgs/development/libraries/java/jflex/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, jre} :
 
 stdenv.mkDerivation rec {
-  name = "jflex-1.7.0";
+  name = "jflex-1.8.1";
 
   src = fetchurl {
     url = "http://jflex.de/release/${name}.tar.gz";
-    sha256 = "1k7bqw1mn569g9dxc0ia3yz1bzgzs5w52lh1xn3hgj7k5ymh54kk";
+    sha256 = "0hspw4z1i7wc1dnnyh4xx6ka7891nsw4hc66bf45510gjks6779x";
   };
 
   sourceRoot = name;
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = https://www.jflex.de/;
+    homepage = "https://www.jflex.de/";
     description = "Lexical analyzer generator for Java, written in Java";
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.unix;

From 39dcb59fbf6fef4e49de67b95308904b094df32d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Mar 2020 16:10:13 +0000
Subject: [PATCH 3021/4636] monetdb: 11.35.9 -> 11.35.19

---
 pkgs/servers/sql/monetdb/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix
index 298e771fa7a9..5a58a52210af 100644
--- a/pkgs/servers/sql/monetdb/default.nix
+++ b/pkgs/servers/sql/monetdb/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  version = "11.35.9";
+  version = "11.35.19";
 in stdenv.mkDerivation {
 
   pname = "monetdb";
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2";
-    sha256 = "0bs7z41vwm9aidxl1f40yx8r0qz3qranmxd0xzd4a1hahjq3j5rx";
+    sha256 = "1qfgsv1k23sn6jl7jbxmfh7w7hyzmh8r1cddl4kksqrw41q6h82q";
   };
 
   postPatch = ''
@@ -23,7 +23,7 @@ in stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "An open source database system";
-    homepage = https://www.monetdb.org/;
+    homepage = "https://www.monetdb.org/";
     license = licenses.mpl20;
     platforms = platforms.unix;
     maintainers = [ maintainers.StillerHarpo ];

From 6e132f0f3cf5517bf2aece3dc867847c9edeb49a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 06:04:25 +0000
Subject: [PATCH 3022/4636] go-ethereum: 1.9.10 -> 1.9.11

---
 pkgs/applications/blockchains/go-ethereum.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix
index f7f0aaf603ef..d8660967a4e0 100644
--- a/pkgs/applications/blockchains/go-ethereum.nix
+++ b/pkgs/applications/blockchains/go-ethereum.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "go-ethereum";
-  version = "1.9.10";
+  version = "1.9.11";
 
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0pm8gfr4g7rbax6vzxv6lklpx83mxghah7fyvpk3jqvm1mq299ln";
+    sha256 = "0xhkdxn5ajzi05252is5whqank81xy94jp1l5z2a44rajv8rh9vs";
   };
 
-  modSha256 = "0zar9nvx2nk6kyijp8df3y2rzxvg0mccj6b3skhzf8y9c27hvrsg";
+  modSha256 = "0jcj0knkhyndndyv1j9xhgbg5psagvyd27ailna3x9ikjlb8f7gg";
 
   subPackages = [
     "cmd/abigen"

From 41543d88ca5da01316623bcf312604231721144a Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sat, 14 Mar 2020 09:27:10 +0300
Subject: [PATCH 3023/4636] phodav: 2.3 -> 2.4

---
 pkgs/tools/networking/phodav/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/phodav/default.nix b/pkgs/tools/networking/phodav/default.nix
index 0d7b30ae1526..617eb0ec40ce 100644
--- a/pkgs/tools/networking/phodav/default.nix
+++ b/pkgs/tools/networking/phodav/default.nix
@@ -2,24 +2,27 @@
 , pkgconfig, libsoup, meson, ninja }:
 
 let
-  version = "2.3";
+  version = "2.4";
 in stdenv.mkDerivation rec {
   pname = "phodav";
   inherit version;
 
   src = fetchurl {
     url = "http://ftp.gnome.org/pub/GNOME/sources/phodav/${version}/${pname}-${version}.tar.xz";
-    sha256 = "0ndy5qva6bq7vhk06jq2d4nr5fp98xsdwypg42vjz91h9ii1xxkf";
+    sha256 = "1hxq8c5qfah3w7mxcyy3yhzdgswplll31a69p5mqdl04bsvw5pbx";
   };
 
   mesonFlags = [
     "-Davahi=disabled"
     "-Dsystemd=disabled"
     "-Dgtk_doc=disabled"
+    "-Dudev=disabled"
   ];
 
   nativeBuildInputs = [ libsoup pkgconfig meson ninja ];
 
+  outputs = [ "out" "dev" "lib" ];
+
   meta = with stdenv.lib; {
     description = "WebDav server implementation and library using libsoup";
     homepage = https://wiki.gnome.org/phodav;

From 5b8278737c982ea94f0ba43f9e40bf734e57d28c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 06:29:32 +0000
Subject: [PATCH 3024/4636] hcloud: 1.14.0 -> 1.16.1

---
 pkgs/development/tools/hcloud/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix
index 480456ff21d8..477a476dfe78 100644
--- a/pkgs/development/tools/hcloud/default.nix
+++ b/pkgs/development/tools/hcloud/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "hcloud";
-  version = "1.14.0";
+  version = "1.16.1";
 
   goPackagePath = "github.com/hetznercloud/cli";
 
@@ -10,10 +10,10 @@ buildGoModule rec {
     owner = "hetznercloud";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "167x64ni4xm0d9b02gy8zvc8knhsvb1c9jhysw7svi7iaw5f2ds5";
+    sha256 = "1d6qa21sq79hr84nnn3j7w0776mnq58g8g1krpnh4d6bv3kc3lq7";
   };
 
-  modSha256 = "1g81szkrkxmv51l78v0d39i8dvrrdhf8wh38rwxvnay3iajgrnqk";
+  modSha256 = "1zy41hi2qzrdmih3pkpng8im576lhkr64zm66w73p7jyvy0kf9sx";
 
   buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ];
 

From fb7e2cd5bc2c24a78d68ae45248dac4329d8cde9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 06:33:28 +0000
Subject: [PATCH 3025/4636] helmfile: 0.85.0 -> 0.102.0

---
 pkgs/applications/networking/cluster/helmfile/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index 6decad2f9fbe..ee7c4ab9cbdd 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -1,6 +1,6 @@
 { lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }:
 
-let version = "0.85.0"; in
+let version = "0.102.0"; in
 
 buildGoModule {
   pname = "helmfile";
@@ -10,12 +10,12 @@ buildGoModule {
     owner = "roboll";
     repo = "helmfile";
     rev = "v${version}";
-    sha256 = "0k1019ddzhhl8kn70ibqf6srlfv92jkc26m78pic5c7ibqyq5fds";
+    sha256 = "0v7mhsnhswiqd62wrmkcpzsg9nfi6wvkh9danngs5rqjiz1zffhy";
   };
 
   goPackagePath = "github.com/roboll/helmfile";
 
-  modSha256 = "1npjm3rs32c1rwx8xb9s03jhd156da6p66hpaqccm7b6zxsm32nv";
+  modSha256 = "0s7j7jbgr8gdc0s9dnl6zjwkpywqj05xyb7mkcank54kgrz0g5vq";
 
   nativeBuildInputs = [ makeWrapper ];
 
@@ -31,7 +31,7 @@ buildGoModule {
 
   meta = {
     description = "Deploy Kubernetes Helm charts";
-    homepage = https://github.com/roboll/helmfile;
+    homepage = "https://github.com/roboll/helmfile";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ pneumaticat yurrriq ];
     platforms = lib.platforms.unix;

From 112814dce830ee1a8f8ec7815a4d6a942b49f2a5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 06:36:24 +0000
Subject: [PATCH 3026/4636] hetzner-kube: 0.4.1 -> 0.5.1

---
 .../networking/cluster/hetzner-kube/default.nix           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix
index 4de0c3fbd7b6..1d9940c8f318 100644
--- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix
+++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "hetzner-kube";
-  version = "0.4.1";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "xetys";
     repo = "hetzner-kube";
     rev = version;
-    sha256 = "11202i3340vaz8xh59gwj5x0djcgbzq9jfy2214lcpml71qc85f0";
+    sha256 = "1iqgpmljqx6rhmvsir2675waj78amcfiw08knwvlmavjgpxx2ysw";
   };
 
-  modSha256 = "1j04xyjkz7jcqrs5p5z94jqagrzcxjr9m3lyp8i91c0ymxf5m2g3";
+  modSha256 = "0jjrk93wdi13wrb5gchhqk7rgwm74kcizrbqsibgkgs2dszwfazh";
 
   buildFlagsArray = ''
     -ldflags=
@@ -20,7 +20,7 @@ buildGoModule rec {
 
   meta = {
     description = "A CLI tool for provisioning Kubernetes clusters on Hetzner Cloud";
-    homepage = https://github.com/xetys/hetzner-kube;
+    homepage = "https://github.com/xetys/hetzner-kube";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ eliasp ];
     platforms = lib.platforms.unix;

From 96bfae7c5df8fe5a335dc4fb0378726dd815fea7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 07:29:00 +0000
Subject: [PATCH 3027/4636] gitAndTools.lefthook: 0.6.3 -> 0.7.1

---
 .../version-management/git-and-tools/lefthook/default.nix   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
index 04ba4c7c48fd..9fc89d520ae9 100644
--- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "lefthook";
-  version = "0.6.3";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "Arkweid";
     repo = "lefthook";
-    sha256 = "01zvlw2yyxjg92d1qag1b42kc2kd68h4fmrv9y6ar7z0rw3p9a5d";
+    sha256 = "14rcvbzzrx0m3xijl8qhw5l2h0q10hqzad2hqm3079g893f2qad0";
   };
 
-  modSha256 = "0mjhw778x40c2plmjlkiry4rwvr9xkz65b88a61j86liv2plbmq2";
+  modSha256 = "0ih11gw2y9dhv3zw1fzjmdfjln5h6zg1bj7sl68cglf6743siqnq";
 
   meta = with stdenv.lib; {
     description = "Fast and powerful Git hooks manager for any type of projects";

From 841b89cac85398ca49591bc7d7bc21655a8aaf83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 14 Mar 2020 07:28:34 +0000
Subject: [PATCH 3028/4636] mc: add autoreconfHook instead of /usr/bin/file
 patch

The error is still there but harmless.
It should be rather fixed in autoconf than in every package that
uses autotools.
---
 pkgs/tools/misc/mc/default.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index 42e155fcaf29..60bc153c83f8 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/pkgs/tools/misc/mc/default.nix
@@ -15,6 +15,7 @@
 , libssh2
 , openssl
 , coreutils
+, autoreconfHook
 }:
 
 stdenv.mkDerivation rec {
@@ -26,17 +27,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ikd2yql44p7nagmb08dmjqdwadclnvgr7ri9pmzc2s5f301r7w5";
   };
 
-  preConfigure = ''
-    for f in \
-      ./configure \
-      ./config/ltmain.sh \
-      ./m4/libtool.m4 \
-      ; do
-      substituteInPlace $f --replace /usr/bin/file ${file}/bin/file
-    done
-  '';
-
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
 
   buildInputs = [
     file

From 0ad2243c663fbd9b4482e47d4575b0cfaa5e6536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 14 Mar 2020 07:31:07 +0000
Subject: [PATCH 3029/4636] mc: quote urls

---
 pkgs/tools/misc/mc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index 60bc153c83f8..07c5f9b35174 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/pkgs/tools/misc/mc/default.nix
@@ -60,11 +60,11 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "File Manager and User Shell for the GNU Project";
     downloadPage = "https://www.midnight-commander.org/downloads/";
-    homepage = https://www.midnight-commander.org;
+    homepage = "https://www.midnight-commander.org";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ sander ];
     platforms = with platforms; linux ++ darwin;
-    repositories.git = git://github.com/MidnightCommander/mc.git;
+    repositories.git = "https://github.com/MidnightCommander/mc.git";
     updateWalker = true;
   };
 }

From 0cf9343f083ff1efc54daa6c9f432a932dd161c0 Mon Sep 17 00:00:00 2001
From: "S. Nordin Abouzahra" <abouzahra.9@wright.edu>
Date: Sat, 14 Mar 2020 03:32:47 -0400
Subject: [PATCH 3030/4636] abiword: 3.0.2 -> 3.0.4

Updates AbiWord to the latest version, patches it to support enchant2, and add
myself to the maintainers list.
---
 pkgs/applications/office/abiword/default.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix
index a2b14443c1a9..0b36b3266efc 100644
--- a/pkgs/applications/office/abiword/default.nix
+++ b/pkgs/applications/office/abiword/default.nix
@@ -5,23 +5,29 @@
 
 stdenv.mkDerivation rec {
   pname = "abiword";
-  version = "3.0.2";
+  version = "3.0.4";
 
   src = fetchurl {
     url = "https://www.abisource.com/downloads/abiword/${version}/source/${pname}-${version}.tar.gz";
-    sha256 = "08imry821g81apdwym3gcs4nss0l9j5blqk31j5rv602zmcd9gxg";
+    sha256 = "1mx5l716n0z5788i19qmad30cck4v9ggr071cafw2nrf375rcc79";
   };
 
   enableParallelBuilding = true;
 
   patches = [
-    # https://bugzilla.abisource.com/show_bug.cgi?id=13791
+    # Switch to using enchant2; note by the next update enchant2 should be
+    # default and this patch can be removed.
+    # https://github.com/NixOS/nixpkgs/issues/38506
     (fetchurl {
-      url = https://bugzilla.abisource.com/attachment.cgi?id=5860;
-      sha256 = "02p8kz02xm1197zcpzjs010mna9hxsbq5lwgxr8b7qhh9yxja7al";
+      url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/enchant-2.1.patch?h=packages/abiword";
+      sha256 = "444dc2aadea3c80310a509b690097541573f6d2652c573d04da66a0f385fcfb2";
     })
   ];
 
+  postPatch = ''
+    substituteInPlace configure --replace 'enchant >=' 'enchant-2 >='
+  '';
+
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
 
   buildInputs = [
@@ -34,6 +40,6 @@ stdenv.mkDerivation rec {
     homepage = https://www.abisource.com/;
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ pSub ylwghst ];
+    maintainers = with maintainers; [ pSub ylwghst sna ];
   };
 }

From 78e6e054570646801c787598590ea882399e0ed8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 08:33:09 +0000
Subject: [PATCH 3031/4636] magnetico: 0.9.0 -> 0.11.0

---
 pkgs/applications/networking/p2p/magnetico/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/pkgs/applications/networking/p2p/magnetico/default.nix
index 94720f35504b..5a2ece761529 100644
--- a/pkgs/applications/networking/p2p/magnetico/default.nix
+++ b/pkgs/applications/networking/p2p/magnetico/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "magnetico";
-  version = "0.9.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner  = "boramalper";
     repo   = "magnetico";
     rev    = "v${version}";
-    sha256 = "1flw7r8igc0hhm288p67lpy9aj1fnywva5b28yfknpw8g97c9r5x";
+    sha256 = "1622xcl5v67lrnkjwbg7g5b5ikrawx7p91jxbj3ixc1za2f3a3fn";
   };
 
-  modSha256 = "1h9fij8mxlxfw7kxix00n10fkhkvmf8529fxbk1n30cxc1bs2szf";
+  modSha256 = "193n323xaypm9xkpray68nqcgyf141x8qzpxzwjnrmsgfz8p6wgk";
 
   buildInputs = [ go-bindata ];
   buildPhase = ''

From 6bb795f8a98c6503f72fb5ff1884100fd1f8f171 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 08:39:09 +0000
Subject: [PATCH 3032/4636] matterbridge: 1.16.3 -> 1.16.5

---
 pkgs/servers/matterbridge/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix
index 2226d960581f..556625016f25 100644
--- a/pkgs/servers/matterbridge/default.nix
+++ b/pkgs/servers/matterbridge/default.nix
@@ -2,19 +2,19 @@
 
 buildGoModule rec {
   pname = "matterbridge";
-  version = "1.16.3";
+  version = "1.16.5";
 
   goPackagePath = "github.com/42wim/matterbridge";
-  modSha256 = "sha256-Q6R6AhAELirFijw5ntyjly46HCzFMpLGSJYfv864gt0=";
+  modSha256 = "0nnp9jxdsr2bs1pg00vd7wpv452iyxws8g3ljzypkb7hzlphcxqh";
 
   src = fetchurl {
     url = "https://github.com/42wim/matterbridge/archive/v${version}.tar.gz";
-    sha256 = "sha256-VAbZSXilmmd2z2bK4/UZzOrjohDVcJHah9t3DE1mtOE=";
+    sha256 = "15wgjzy9l3xlgih2zb56l4jmval4nhcs42wn9axvz2h7kqfbmw3d";
   };
 
   meta = with stdenv.lib; {
     description = "Simple bridge between Mattermost, IRC, XMPP, Gitter, Slack, Discord, Telegram, Rocket.Chat, Hipchat(via xmpp), Matrix and Steam";
-    homepage = https://github.com/42wim/matterbridge;
+    homepage = "https://github.com/42wim/matterbridge";
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ ryantm ];
     platforms = platforms.unix;

From 7c77278d316009d34f6b23d1096255d5edf0c90c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 08:51:26 +0000
Subject: [PATCH 3033/4636] minify: 2.5.0 -> 2.7.3

---
 pkgs/development/web/minify/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix
index 76434809cb52..3752519d0609 100644
--- a/pkgs/development/web/minify/default.nix
+++ b/pkgs/development/web/minify/default.nix
@@ -2,23 +2,22 @@
 
 buildGoModule rec {
   pname = "minify";
-  version = "2.5.0";
-
-  goPackagePath = "github.com/tdewolff/minify";
+  version = "2.7.3";
 
   src = fetchFromGitHub {
     owner = "tdewolff";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1ja26fs7klzggmfqvz5nzj9icaa8r8h4a91qg8rj4gx5cnvwx38d";
+    sha256 = "12jns7m9liyjg9wy8ynvji2d2g4k2z1ymp6k3610mivmvg159sy4";
   };
 
-  modSha256 = "0kff2nj66bifbfi8srcvcsipbddw43mvjdwlq0lz04qak524pbvr";
+  modSha256 = "09jk3mxf7n9wf1cgyiw9mhsr55fb12k399dmzhnib3vhd9xav15i";
+
+  buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ];
 
   meta = with lib; {
     description = "Minifiers for web formats";
     license = licenses.mit;
-    homepage = https://go.tacodewolff.nl/minify;
-    platforms = platforms.all;
+    homepage = "https://go.tacodewolff.nl/minify";
   };
 }

From 09ad2cffdc8db6cdc536c700a5054dc677fc8feb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 14 Mar 2020 08:53:04 +0000
Subject: [PATCH 3034/4636] radare2: 4.3.0 -> 4.3.1

---
 .../development/tools/analysis/radare2/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 8fe5f7a0cab1..fc5244f96449 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -110,17 +110,17 @@ in {
   #<generated>
   # DO NOT EDIT! Automatically generated by ./update.py
   radare2 = generic {
-    version_commit = "23881";
-    gittap = "4.3.0";
-    gittip = "bb78ef34573020a6e92a975d0dafcddff52e6892";
-    rev = "4.3.0";
-    version = "4.3.0";
-    sha256 = "19mj419shphcgsf6ndii5i45dcac0nwiwnzp83wccnivpyfhcpnv";
+    version_commit = "23963";
+    gittap = "4.3.1";
+    gittip = "e7f940d27b3b4eb2738afef78a6ea09ed770318c";
+    rev = "4.3.1";
+    version = "4.3.1";
+    sha256 = "0fiy6aj8xf9anpkk2vpkx8x0m2f26rhjb92nmg61xj13dmhchh30";
     cs_ver = "4.0.1";
     cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6";
   };
   r2-for-cutter = generic {
-    version_commit = "23881";
+    version_commit = "23963";
     gittap = "4.2.1";
     gittip = "08478fdd29d8ce2a6c61fbd7b207bffc10682938";
     rev = "08478fdd29d8ce2a6c61fbd7b207bffc10682938";

From f9fcf29ef2bcdd854f95ba2481606cab00b9d76b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 14 Mar 2020 04:35:21 -0400
Subject: [PATCH 3035/4636] linux: 5.4.24 -> 5.4.25

---
 pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 2dedc1592e88..5773b171f744 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.4.24";
+  version = "5.4.25";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1cvy3mxwzll4f9j8i3hfmi0i0zq75aiafq1jskp9n4kq9iwar83z";
+    sha256 = "09ay0adc3s3m7qk0nj5lkmrp5i0q76a9kax0xix8914d115rgvf0";
   };
 } // (args.argsOverride or {}))

From 16eb11b5d3d034f830d9a890f976608d455cade9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 14 Mar 2020 04:59:52 -0400
Subject: [PATCH 3036/4636] jenkins: 2.204.4 -> 2.204.5

---
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 3f6a7229b30f..0fe4de98f1d2 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jenkins";
-  version = "2.204.4";
+  version = "2.204.5";
 
   src = fetchurl {
     url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
-    sha256 = "0m4g0hm7cfmma5lrs9jsdy2gzp383hhh4k968s41krdms2pf5jhf";
+    sha256 = "17437wshci2fyvvaznzk738m2npqa61w16aw5jslw2ifnyjkziwl";
   };
 
   buildCommand = ''

From f30b8adc022558b0852c95a933bca5f559baba59 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 14 Mar 2020 05:01:39 -0400
Subject: [PATCH 3037/4636] oh-my-zsh: 2020-03-05 -> 2020-03-12

---
 pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 4943a92faa74..5a61cd2e90a7 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2020-03-05";
+  version = "2020-03-12";
   pname = "oh-my-zsh";
-  rev = "2eb3e9d57cf69f3c2fa557f9047e0a648d80b235";
+  rev = "07e3236bc5c8dbf9d818a4f0145f09bdb4bec6f0";
 
   src = fetchgit { inherit rev;
     url = "https://github.com/ohmyzsh/ohmyzsh";
-    sha256 = "025xd53j307wh3bly456b7y6r71wm2dzqn6xway0rsc6r5b70z4x";
+    sha256 = "1imjvig60r250ljbnajxq4zv4fgs3l3jrrda0dvlnax5v5psxb12";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];

From b8225d33c30c65214d48fa3faeb8b19412ec4399 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 09:09:15 +0000
Subject: [PATCH 3038/4636] mod: 0.2.0 -> 0.2.2

---
 pkgs/development/tools/mod/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix
index 60e948d593fa..67b829877b04 100644
--- a/pkgs/development/tools/mod/default.nix
+++ b/pkgs/development/tools/mod/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "mod";
-  version = "0.2.0";
+  version = "0.2.2";
 
   src = fetchFromGitHub {
     owner = "marwan-at-work";
     repo = "mod";
     rev = "v${version}";
-    sha256 = "1v7qy0q6fb9amcggwzdygl290zhr3w3zgmig2rm5zx91kw973sqc";
+    sha256 = "0aw6r90xf29wdhgnq580f837ga8yypzfhlzx1f2zj0kdhc58wbr5";
   };
 
-  modSha256 = "1s33i4kp1vzfp97909pyzdlvi69siw1i2lbi2kbp9yrn163w6928";
+  modSha256 = "0x7bdhvam9l23cbdqpna8kwg0v6yhgmw0hlbm48bbhjl27lg7svc";
 
   subPackages = [ "cmd/mod" ];
 
@@ -21,7 +21,7 @@ buildGoModule rec {
       Command line tool to upgrade/downgrade Semantic Import Versioning in Go
       Modules.
       '';
-    homepage = https://github.com/marwan-at-work/mod;
+    homepage = "https://github.com/marwan-at-work/mod";
     license = licenses.mit;
     maintainers = with maintainers; [ kalbasit ];
     platforms = platforms.linux ++ platforms.darwin;

From f47ec369704de43567736c50f68c39635a4974ea Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 11:48:34 +0000
Subject: [PATCH 3039/4636] pgmetrics: 1.7.1 -> 1.8.1

---
 pkgs/tools/misc/pgmetrics/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix
index bfacb7135672..b702ffc1703d 100644
--- a/pkgs/tools/misc/pgmetrics/default.nix
+++ b/pkgs/tools/misc/pgmetrics/default.nix
@@ -2,19 +2,21 @@
 
 buildGoModule rec {
   pname = "pgmetrics";
-  version = "1.7.1";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner  = "rapidloop";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "17rr6rjdxg8gdljf65zkn3bl1kmnlp2gkhiq7slxslh8n9iz4wjs";
+    sha256 = "06w2kqjq2yq9yypg6biywrybnmi4jlnnigd7az72hp7lzf2nhl62";
   };
 
-  modSha256 = "0llbx2sgcx95ym2q4l3334rdj3nkgr9z5jyp8406cp3k1ixi7gdb";
+  modSha256 = "0h375zk0ik06g0b5vmi00b1wn5q2c0r137f7qf6l8k8p886x41h6";
+
+  buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 
   meta = with stdenv.lib; {
-    homepage = https://pgmetrics.io/;
+    homepage = "https://pgmetrics.io/";
     description = "Collect and display information and stats from a running PostgreSQL server";
     license = licenses.asl20;
     maintainers = [ maintainers.marsam ];

From 1ff9df25fb6dea826b450eaadf6a3a57eb96a2e7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 12:17:01 +0000
Subject: [PATCH 3040/4636] qbec: 0.7.5 -> 0.10.5

---
 pkgs/applications/networking/cluster/qbec/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix
index 9e578b9b333a..4a8b2a2e6648 100644
--- a/pkgs/applications/networking/cluster/qbec/default.nix
+++ b/pkgs/applications/networking/cluster/qbec/default.nix
@@ -2,20 +2,20 @@
 
 buildGoModule rec {
   pname = "qbec";
-  version = "0.7.5";
+  version = "0.10.5";
 
   src = fetchFromGitHub {
     owner = "splunk";
     repo = "qbec";
     rev = "v${version}";
-    sha256 = "1q3rbxih4fn0zv8dni5dxb3pq840spplfy08x941najqfgflv9gb";
+    sha256 = "0j0ybbv4ix864scmghy1lvr3rs2fbj49cva6x48kbwli4y447758";
   };
 
-  modSha256 = "0s1brqvzm1ghhqb46aqfj0lpnaq76rav0hwwb82ccw8h7052y4jn";
+  modSha256 = "165zqmannlylkzaz9gkmcrlyx8rfhz70ahzhiks4ycgq1qxr0av9";
 
   meta = with lib; {
     description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io";
-    homepage = https://github.com/splunk/qbec;
+    homepage = "https://github.com/splunk/qbec";
     license = licenses.asl20;
     maintainers = with maintainers; [ groodt ];
   };

From 8ed7848e6787e2b7523c7a593ee07999a8e7c923 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 12:31:35 +0000
Subject: [PATCH 3041/4636] rar2fs: 1.28.0 -> 1.29.0

---
 pkgs/tools/filesystems/rar2fs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/rar2fs/default.nix b/pkgs/tools/filesystems/rar2fs/default.nix
index 996e3c52ec29..81cd1191b0bf 100644
--- a/pkgs/tools/filesystems/rar2fs/default.nix
+++ b/pkgs/tools/filesystems/rar2fs/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rar2fs";
-  version = "1.28.0";
+  version = "1.29.0";
 
   src = fetchFromGitHub {
     owner = "hasse69";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0fmdqrs5yvn89ngc26vj5ggnalpwrdm8pdcfszw1wflh78hvd8kb";
+    sha256 = "137hv2fhlbdca6qyf4vjv1sl87g02zn137ja0fdjbzcc9y1n96d3";
   };
 
   postPatch = ''
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "FUSE file system for reading RAR archives";
-    homepage = https://hasse69.github.io/rar2fs/;
+    homepage = "https://hasse69.github.io/rar2fs/";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ kraem ];
     platforms = with platforms; linux ++ freebsd;

From 9143a9d6fb028d590b2ffe7e1953af8b3bcde2db Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 12:41:23 +0000
Subject: [PATCH 3042/4636] renderizer: 2.0.5 -> 2.0.9

---
 pkgs/development/tools/renderizer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/renderizer/default.nix b/pkgs/development/tools/renderizer/default.nix
index f33cad8da7a2..93634f935d1d 100644
--- a/pkgs/development/tools/renderizer/default.nix
+++ b/pkgs/development/tools/renderizer/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "renderizer";
-  version = "2.0.5";
+  version = "2.0.9";
 
   src = fetchFromGitHub {
     owner = "gomatic";
     repo = pname;
     rev = version;
-    sha256 = "186wcfzw60z6i59yl37rkppw8w88z5kikvsi65k4r9kwpll2z6z4";
+    sha256 = "1bip12pcn8bqgph7vd7bzzadwbyqh80fx7gqciv9fchycwsj04rf";
   };
 
-  modSha256 = "1sxg9skd5hjpg2f4wyxh5hwjrplw3b3v32gn61a9yixfk3wvi05x";
+  modSha256 = "0ss5l2n1sl1i2hvxsdzy6p61mnnxmm6h256jvv0p0ajynx8g538q";
 
   meta = with stdenv.lib; {
     description = "CLI to render Go template text files";

From 8097fc060c818bdcee3ab66c25bae5ca59df455d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 12:51:22 +0000
Subject: [PATCH 3043/4636] sampler: 1.0.3 -> 1.1.0

---
 pkgs/applications/misc/sampler/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/sampler/default.nix b/pkgs/applications/misc/sampler/default.nix
index a04b0dcbba6a..0c5494f146f7 100644
--- a/pkgs/applications/misc/sampler/default.nix
+++ b/pkgs/applications/misc/sampler/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "sampler";
-  version = "1.0.3";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "sqshq";
     repo = pname;
     rev = "v${version}";
-    sha256 = "129vifb1y57vyqj9p23gq778jschndh2y2ingwvjz0a6lrm45vpf";
+    sha256 = "1lanighxhnn28dfzils7i55zgxbw2abd6y723mq7x9wg1aa2bd0z";
   };
 
-  modSha256 = "0wgwnn50lrg6ix5ll2jdwi421wgqgsv4y9xd5hfj81kya3dxcbw0";
+  modSha256 = "02ai193lpzsxdn1hpbndkfxdc88nyl4kcgbadhy122kgx13crcy8";
 
   subPackages = [ "." ];
 

From 6e8d817333e7154e74d2e6fa9d1fec4fb078a0c4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 7 Feb 2020 15:49:38 +0000
Subject: [PATCH 3044/4636] omnisharp-roslyn: 1.32.19 -> 1.34.11

---
 pkgs/development/tools/omnisharp-roslyn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix
index 784895845e52..310ef0be1517 100644
--- a/pkgs/development/tools/omnisharp-roslyn/default.nix
+++ b/pkgs/development/tools/omnisharp-roslyn/default.nix
@@ -7,11 +7,11 @@
 stdenv.mkDerivation rec {
 
   pname = "omnisharp-roslyn";
-  version = "1.32.19";
+  version = "1.34.11";
   
   src = fetchurl {
     url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz";
-    sha256 = "0flmijar7ih9wp2i585035zhgwpqymr2y778x841bpgv412kxgpz";
+    sha256 = "0j55jrji7ya0pm91hfmyd9s6lkl35xbybr81a1gka90mlyp0gx63";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 9ad2b5e69d933a5aa2b82965311f6c31eb60f90d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 7 Feb 2020 12:56:06 +0000
Subject: [PATCH 3045/4636] libmysofa: 0.9.1 -> 1.0

---
 pkgs/development/libraries/audio/libmysofa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix
index 94c454859ae0..a5cbb0794750 100644
--- a/pkgs/development/libraries/audio/libmysofa/default.nix
+++ b/pkgs/development/libraries/audio/libmysofa/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libmysofa";
-  version = "0.9.1";
+  version = "1.0";
 
   src = fetchFromGitHub {
     owner = "hoene";
     repo = "libmysofa";
     rev = "v${version}";
-    sha256 = "10pz9n99cl2j72m7bdj8xka5akyk0sjbysr7rlfdq0qfkiq5922v";
+    sha256 = "053inxfl2n6wdgvnn02kf63m92r48ch4wqix9mqf3rgcf1bfkyfa";
   };
 
   nativeBuildInputs = [ cmake ];

From 77d2408f7d0dd21acd4b06ae1cd132e4208c0a92 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2020 07:24:14 +0000
Subject: [PATCH 3046/4636] lightstep-tracer-cpp: 0.11.0 -> 0.12.0

---
 pkgs/development/libraries/lightstep-tracer-cpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
index 7fba3f3baa66..5f5ffef20260 100644
--- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
+++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix
@@ -9,13 +9,13 @@ assert enableGrpc -> c-ares != null;
 
 stdenv.mkDerivation rec {
   pname = "lightstep-tracer-cpp";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "lightstep";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1x7n3b5i9a0481azy3ymfybjfvr5z0i8wm17d964hsv7ryvnapj0";
+    sha256 = "0zwj5r0rmfk6cm5ikay4kh7na455vskylc5yrxkhisn4n850d1l4";
   };
 
   nativeBuildInputs = [

From 4e7d702bb92ee071e59631b34d1f7f0ca4e940c3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 26 Jan 2020 03:18:44 +0000
Subject: [PATCH 3047/4636] cli11: 1.8.0 -> 1.9.0

---
 pkgs/development/tools/misc/cli11/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix
index 6261ffc9b018..53356e53a78a 100644
--- a/pkgs/development/tools/misc/cli11/default.nix
+++ b/pkgs/development/tools/misc/cli11/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cli11";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "CLIUtils";
     repo = "CLI11";
     rev = "v${version}";
-    sha256 = "0i1x4ax5hal7jdsxw40ljwfv68h0ac85iyi35i8p52p9s5qsc71q";
+    sha256 = "1nqri8ahisi00nwh6cynhq5n9iq9iydkysnxj36r2y20yvbi4bxj";
   };
 
   nativeBuildInputs = [ cmake ];

From 21b8df10194469a1b73120458f346a7ddaba5496 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 8 Feb 2020 18:53:48 +0000
Subject: [PATCH 3048/4636] minizincide: 2.3.2 -> 2.4.2

---
 pkgs/development/tools/minizinc/ide.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix
index 3b1ac92a96e7..921ee3d158c8 100644
--- a/pkgs/development/tools/minizinc/ide.nix
+++ b/pkgs/development/tools/minizinc/ide.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, makeWrapper, minizinc }:
 let
-  version = "2.3.2";
+  version = "2.4.2";
 in
 stdenv.mkDerivation {
   pname = "minizinc-ide";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     owner = "MiniZinc";
     repo = "MiniZincIDE";
     rev = version;
-    sha256 = "0ym45fjfvxxrxp79sa5psrwg2p33l5h8qncx6agj9brml7d873c4";
+    sha256 = "1xqs27f14r79vcxf9bx72bbnhxc913lpr5d8cv31dacbq5fyxkw7";
   };
 
   sourceRoot = "source/MiniZincIDE";

From 0edcdfe140d83f34ff9e1c72a9a3db2ea78d7aa4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 8 Mar 2020 00:24:58 +0000
Subject: [PATCH 3049/4636] quilter: 2.1.1 -> 2.1.2

---
 pkgs/applications/editors/quilter/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix
index 2b4abb1f1625..338708e3f82e 100644
--- a/pkgs/applications/editors/quilter/default.nix
+++ b/pkgs/applications/editors/quilter/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "quilter";
-  version = "2.1.1";
+  version = "2.1.2";
 
   src = fetchFromGitHub {
     owner = "lainsce";
     repo = pname;
     rev = version;
-    sha256 = "1raba835kvqq4lfpk141vg81ll7sg3jyhwyr6758pdjmncncg0wr";
+    sha256 = "1nk6scn98kb43h056ajycpj71jkx7b9p5g05khgl6bwj9hvjvcbw";
   };
 
   nativeBuildInputs = [
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Focus on your writing - designed for elementary OS";
-    homepage = https://github.com/lainsce/quilter;
+    homepage = "https://github.com/lainsce/quilter";
     license = licenses.gpl2Plus;
     maintainers = pantheon.maintainers;
     platforms = platforms.linux;

From d88389048fc3dbac62391fb1401215152af0b57b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 6 Mar 2020 10:26:39 +0000
Subject: [PATCH 3050/4636] elisa: 19.12.2 -> 19.12.3

---
 pkgs/applications/audio/elisa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/elisa/default.nix b/pkgs/applications/audio/elisa/default.nix
index a159ca7f6855..1d56ce089d90 100644
--- a/pkgs/applications/audio/elisa/default.nix
+++ b/pkgs/applications/audio/elisa/default.nix
@@ -7,13 +7,13 @@
 
 mkDerivation rec {
   pname = "elisa";
-  version = "19.12.2";
+  version = "19.12.3";
 
   src = fetchFromGitHub {
     owner  = "KDE";
     repo   = "elisa";
     rev    = "v${version}";
-    sha256 = "0g6zj4ix97aa529w43v1z3n73b8l5di6gscs40hyx4sl1sb7fdh6";
+    sha256 = "0s1sixkrx4czckzg0llkrbp8rp397ljsq1c309z23m277jsmnnb6";
   };
 
   buildInputs = [ vlc ];

From 08c0568cd98ebd7ac7427e22fdf25f18167004cf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 23:31:59 +0000
Subject: [PATCH 3051/4636] frostwire-bin: 6.8.3 -> 6.8.4

---
 .../applications/networking/p2p/frostwire/frostwire-bin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
index 29961e9077f0..39ab0ee0efa9 100644
--- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
+++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
@@ -3,12 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "6.8.3";
+  version = "6.8.4";
   pname = "frostwire";
 
   src = fetchurl {
     url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz";
-    sha256 = "1fnrr96jmak2rf54cc0chbm7ls5rfav78vhw98sa7zy544l2sn88";
+    sha256 = "1qs0r5621ihb9sj4sqpmxj9smwf8a8k3n1qx2i0sz65qhjfc90zz";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://www.frostwire.com/;
+    homepage = "https://www.frostwire.com/";
     description = "BitTorrent Client and Cloud File Downloader";
     license = licenses.gpl2;
     maintainers = with maintainers; [ gavin ];

From 47b4e97cda771688035df78b10b236c58a111d20 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Mar 2020 17:09:14 +0000
Subject: [PATCH 3052/4636] opera: 66.0.3515.72 -> 67.0.3575.31

---
 pkgs/applications/networking/browsers/opera/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index f5eea57b483d..686ffee91488 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -47,11 +47,11 @@ let
 in stdenv.mkDerivation rec {
 
   pname = "opera";
-  version = "66.0.3515.72";
+  version = "67.0.3575.31";
 
   src = fetchurl {
     url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
-    sha256 = "1mw4sfjf9ijbgghkbkg45b6kzbd0qa0mxb88ajrjnxf4g26brhra";
+    sha256 = "1ghygin7xf5lwd77s8f6bag339di4alwlkqwjzlq20wzwx4lns4w";
   };
 
   unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";

From 742b61a9eb065f5f30876b593a2769a45f729f82 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Mar 2020 11:51:06 +0000
Subject: [PATCH 3053/4636] sickgear: 0.21.5 -> 0.21.17

---
 pkgs/servers/sickbeard/sickgear.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix
index 92cee87197d6..8df674111ad1 100644
--- a/pkgs/servers/sickbeard/sickgear.nix
+++ b/pkgs/servers/sickbeard/sickgear.nix
@@ -4,13 +4,13 @@ let
   pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]);
 in stdenv.mkDerivation rec {
   pname = "sickgear";
-  version = "0.21.5";
+  version = "0.21.17";
 
   src = fetchFromGitHub {
     owner = "SickGear";
     repo = "SickGear";
     rev = "release_${version}";
-    sha256 = "1wzfdf6300vabflsdbkizjg322in1rgksp7dk8gii38czja9y893";
+    sha256 = "0hyrsxaill7x9g4bp6mri9i3ll75y7j1xxc226gw2c817zc6ayms";
   };
 
   dontBuild = true;

From 4615b8b4c3024a8829ca5fc82af79b79c35456d3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 2 Mar 2020 17:57:40 +0000
Subject: [PATCH 3054/4636] osinfo-db: 20200203 -> 20200214

---
 pkgs/data/misc/osinfo-db/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix
index 96fd9ad33f16..9afe4a9e4001 100644
--- a/pkgs/data/misc/osinfo-db/default.nix
+++ b/pkgs/data/misc/osinfo-db/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "osinfo-db";
-  version = "20200203";
+  version = "20200214";
 
   src = fetchurl {
     url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
-    sha256 = "1zjq1dhlci00j17dij7s3l30hybzmaykpk5b6bd5xbllp745njn5";
+    sha256 = "1fpdb8r8kzwp1k5dc9xyy9jr2jr3haq7n9b6spamm599zvzf8nb6";
   };
 
   nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Osinfo database of information about operating systems for virtualization provisioning tools";
-    homepage = https://libosinfo.org/;
+    homepage = "https://libosinfo.org/";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];

From b577edfa8c8f638ff26cf8c1c26341d7f0c6ef76 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 7 Mar 2020 04:55:20 +0000
Subject: [PATCH 3055/4636] plata-theme: 0.9.2 -> 0.9.3

---
 pkgs/data/themes/plata/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix
index 0fb061519e6e..08f178b30e83 100644
--- a/pkgs/data/themes/plata/default.nix
+++ b/pkgs/data/themes/plata/default.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "plata-theme";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchFromGitLab {
     owner = "tista500";
     repo = "plata-theme";
     rev = version;
-    sha256 = "1z8kiac3gb4hsyq92p5dd8fyjv7bad55q65kbnjiskpm4ircg4ja";
+    sha256 = "183kas7b5vxm6l2m5c4yh8cnq05sfa82afcp9h6cfj2rh2iv6kqy";
   };
 
   preferLocalBuild = true;
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A GTK theme based on Material Design Refresh";
-    homepage = https://gitlab.com/tista500/plata-theme;
+    homepage = "https://gitlab.com/tista500/plata-theme";
     license = with licenses; [ gpl2 cc-by-sa-40 ];
     platforms = platforms.linux;
     maintainers = [ maintainers.tadfisher ];

From 63925c1cb99bae1db3e4279314e0f388554890a7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 8 Mar 2020 05:27:40 +0000
Subject: [PATCH 3056/4636] calibre: 4.11.2 -> 4.12.0

---
 pkgs/applications/misc/calibre/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 07612c96beef..e29a8ebfd19d 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -30,11 +30,11 @@ let
 in
 mkDerivation rec {
   pname = "calibre";
-  version = "4.11.2";
+  version = "4.12.0";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
-    sha256 = "0fxmpygc2ybx8skwhp9j6gnk9drlfiz2cl9g55h10zgxkfzqzqgv";
+    sha256 = "144vl5p0adcywcqaarrriq5zd8q5i934yfjg9himiq1vdp9vy4fi";
   };
 
   patches = [

From 79586e1b748e7a667574d6828214605fd294fa1c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Mar 2020 00:47:07 +0000
Subject: [PATCH 3057/4636] tomcat_connectors: 1.2.46 -> 1.2.48

---
 .../http/apache-modules/tomcat-connectors/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
index 138864aec7d0..0e07454bbc5e 100644
--- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
+++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, apacheHttpd, jdk }:
 
 stdenv.mkDerivation rec {
-  name = "tomcat-connectors-1.2.46";
+  name = "tomcat-connectors-1.2.48";
 
   src = fetchurl {
     url = "mirror://apache/tomcat/tomcat-connectors/jk/${name}-src.tar.gz";
-    sha256 = "1sfbcsmshjkj4wc969ngjcxhjyp4mbkjprbs111d1b0x3l7547by";
+    sha256 = "15wfj1mvad15j1fqw67qbpbpwrcz3rb0zdhrq6z2sax1l05kc6yb";
   };
 
   configureFlags = [
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Provides web server plugins to connect web servers with Tomcat";
-    homepage = https://tomcat.apache.org/download-connectors.cgi;
+    homepage = "https://tomcat.apache.org/download-connectors.cgi";
     license = licenses.asl20;
     platforms = platforms.unix;
   };

From 7cb9d8cf422eb319c94341461f1b77f3ab00c7da Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 9 Mar 2020 23:03:42 +0000
Subject: [PATCH 3058/4636] sunvox: 1.9.5c -> 1.9.5d

---
 pkgs/applications/audio/sunvox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix
index a7d61598f3e2..48ad9bc971c2 100644
--- a/pkgs/applications/audio/sunvox/default.nix
+++ b/pkgs/applications/audio/sunvox/default.nix
@@ -13,11 +13,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "SunVox";
-  version = "1.9.5c";
+  version = "1.9.5d";
 
   src = fetchurl {
     url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip";
-    sha256 = "19ilif221nw8lvw0fgpjqzawibyvxk16aaylizwygf7c4j40wayi";
+    sha256 = "15pyc3dk4dqlivgzki8sv7xpwg3bbn5xv9338g16a0dbn7s3kich";
   };
 
   buildInputs = [ unzip ];

From 08690436a8b7c7e4d0d2b5a8e74fe131e1329932 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Mar 2020 01:29:56 +0000
Subject: [PATCH 3059/4636] xbps: 0.58 -> 0.59

---
 pkgs/tools/package-management/xbps/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix
index 21000bf6353d..0322faa4c88b 100644
--- a/pkgs/tools/package-management/xbps/default.nix
+++ b/pkgs/tools/package-management/xbps/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xbps";
-  version = "0.58";
+  version = "0.59";
 
   src = fetchFromGitHub {
     owner = "void-linux";
     repo = "xbps";
     rev = version;
-    sha256 = "03zjbqz6fcp9h45ms93hsf96yd79r6hmbk6vixl5m34bf1z2qdn5";
+    sha256 = "0m00h1f004gsa998cr93b4zmsn4162983d360pzpd3hfi3qzan5d";
   };
 
   nativeBuildInputs = [ pkgconfig which ];
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/void-linux/xbps;
+    homepage = "https://github.com/void-linux/xbps";
     description = "The X Binary Package System";
     platforms = platforms.linux; # known to not work on Darwin, at least
     license = licenses.bsd2;

From 93144e0f4a5b21f561e4adda8a73d477d069b703 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Mar 2020 07:35:01 +0000
Subject: [PATCH 3060/4636] gitAndTools.stgit: 0.21 -> 0.22

---
 .../version-management/git-and-tools/stgit/default.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
index 3a354133e875..d356991815e7 100644
--- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
@@ -2,7 +2,7 @@
 
 let
   name = "stgit-${version}";
-  version = "0.21";
+  version = "0.22";
 in
 stdenv.mkDerivation {
   inherit name;
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     owner = "ctmarinas";
     repo = "stgit";
     rev = "v${version}";
-    sha256 = "16gwdad18rc9bivyzrjccp83iccmqr45fp2zawycmrfp2ancffc7";
+    sha256 = "0xpvs5fa50rrvl2c8naha1nblk5ip2mgg63a9srqqxfx6z8qmrfz";
   };
 
   buildInputs = [ python2 git ];
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "A patch manager implemented on top of Git";
-    homepage = http://procode.org/stgit/;
+    homepage = "http://procode.org/stgit/";
     license = licenses.gpl2;
     maintainers = with maintainers; [ the-kenny ];
     platforms = platforms.unix;

From 1b467f21f638b1566bfa4519c9b9a207cf15cee8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 13:44:06 +0000
Subject: [PATCH 3061/4636] thanos: 0.7.0 -> 0.11.0

---
 pkgs/servers/monitoring/thanos/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix
index 01068a909b9d..f307032f4141 100644
--- a/pkgs/servers/monitoring/thanos/default.nix
+++ b/pkgs/servers/monitoring/thanos/default.nix
@@ -1,16 +1,16 @@
 { stdenv, buildGoModule, fetchFromGitHub }:
 buildGoModule rec {
   pname = "thanos";
-  version = "0.7.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "thanos-io";
     repo = "thanos";
-    sha256 = "0yxa1wipab1n9bh95n237c9l1sx1nx7r8snsk4nzpmwr3y1b4nn8";
+    sha256 = "152ic9pga0wjg4r7b66hdnbsj9wrzfzbbps7wjas3rcbcv1f2i90";
   };
 
-  modSha256 = "0iz16yj41gahsyb6mxbmjs8mjhp5c96dmw75rg9bh5xdh8qh767m";
+  modSha256 = "1pdypyyy352l6wy5lr94fv8j890lh863h8zg2hxchiymrs5pgq1c";
 
   subPackages = "cmd/thanos";
 

From 096ab84b0d93d2a75d0cae5b3cd060176456f17e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 13:52:08 +0000
Subject: [PATCH 3062/4636] tinygo: 0.11.0 -> 0.12.0

---
 pkgs/development/compilers/tinygo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix
index 1c7363a83bb9..412dfa53feb1 100644
--- a/pkgs/development/compilers/tinygo/default.nix
+++ b/pkgs/development/compilers/tinygo/default.nix
@@ -3,16 +3,16 @@
 
 buildGoModule rec {
   pname = "tinygo";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "tinygo-org";
     repo = "tinygo";
     rev = "v${version}";
-    sha256 = "0cmg8x9hpvzlxp6hiy9hkh9nn7ig7b0x6k8a2c3bw19pfx9lxksf";
+    sha256 = "0dw3kxf55p617pb0bj3knsqcfvap5scxlvhh3a9g9ia92kann4v1";
   };
 
-  modSha256 = "0r3lfi1bj550sf3b7ysz62c2c33f8zfli8208xixj3jadycb6r3z";
+  modSha256 = "1bjq4vaf38hi204lr9w3r3wcy1rzj06ygi5gzfa7dl3kx10hw6p0";
   enableParallelBuilding = true;
   subPackages = [ "." ];
   buildInputs = [ llvm clang-unwrapped makeWrapper ];

From 13e7a3e11272159b9b1fc41ec67f53c1088412ff Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 14 Mar 2020 09:48:06 +0100
Subject: [PATCH 3063/4636] Python: introduce tests for interpreters

This adds tests to the passthru of all Python interpreters.
---
 .../interpreters/python/default.nix           |  4 ++
 .../development/interpreters/python/tests.nix | 63 +++++++++++++++++++
 .../interpreters/python/tests/test_python.py  | 50 +++++++++++++++
 3 files changed, 117 insertions(+)
 create mode 100644 pkgs/development/interpreters/python/tests.nix
 create mode 100644 pkgs/development/interpreters/python/tests/test_python.py

diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 3cc0eecb1b08..94f04b73f498 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -44,6 +44,10 @@ with pkgs;
         pythonAtLeast = lib.versionAtLeast pythonVersion;
         pythonOlder = lib.versionOlder pythonVersion;
         inherit hasDistutilsCxxPatch pythonForBuild;
+
+        tests = callPackage ./tests.nix {
+          python = self;
+        };
   };
 
 in {
diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix
new file mode 100644
index 000000000000..37fbe6701148
--- /dev/null
+++ b/pkgs/development/interpreters/python/tests.nix
@@ -0,0 +1,63 @@
+{ python
+, runCommand
+, substituteAll
+, lib
+}:
+
+let
+  envs = let
+    inherit python;
+    pythonEnv = python.withPackages(ps: with ps; [ ]);
+  in {
+    # Plain Python interpreter
+    plain = rec {
+      env = python;
+      interpreter = env.interpreter;
+      is_venv = "False";
+      is_nixenv = "False";
+    };
+  } // lib.optionalAttrs (python.implementation != "graal") {
+    # Python Nix environment (python.buildEnv)
+    nixenv = rec {
+      env = pythonEnv;
+      interpreter = env.interpreter;
+      is_venv = "False";
+      is_nixenv = "True";
+    };
+  } // lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec {
+    # Venv built using plain Python
+    # Python 2 does not support venv
+    # TODO: PyPy executable name is incorrect, it should be pypy-c or pypy-3c instead of pypy and pypy3.
+    plain-venv = rec {
+      env = runCommand "${python.name}-venv" {} ''
+        ${python.interpreter} -m venv $out
+      '';
+      interpreter = "${env}/bin/${python.executable}";
+      is_venv = "True";
+      is_nixenv = "False";
+    };
+    # Venv built using Python Nix environment (python.buildEnv)
+    # TODO: Cannot create venv from a  nix env
+    # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1.
+    # nixenv-venv = rec {
+    #   env = runCommand "${python.name}-venv" {} ''
+    #     ${pythonEnv.interpreter} -m venv $out
+    #   '';
+    #   interpreter = "${env}/bin/${pythonEnv.executable}";
+    #   is_venv = "True";
+    #   is_nixenv = "True";
+    # };
+  };
+
+  testfun = name: attrs: runCommand "${python.name}-tests-${name}" ({
+    inherit (python) pythonVersion;
+  } // attrs) ''
+    cp -r ${./tests} tests
+    chmod -R +w tests
+    substituteAllInPlace tests/test_python.py
+    ${attrs.interpreter} -m unittest discover --verbose tests #/test_python.py
+    mkdir $out
+    touch $out/success
+  '';
+
+in lib.mapAttrs testfun envs 
\ No newline at end of file
diff --git a/pkgs/development/interpreters/python/tests/test_python.py b/pkgs/development/interpreters/python/tests/test_python.py
new file mode 100644
index 000000000000..f631a172ccc6
--- /dev/null
+++ b/pkgs/development/interpreters/python/tests/test_python.py
@@ -0,0 +1,50 @@
+"""
+Python interpreter and environment tests.
+
+These need to be executed with the standard library unittest.
+Third party test runners such as pytest cannot be used because
+that would interfere with the tests.
+"""
+
+import platform
+import sys
+import unittest
+import site
+
+
+ENV = "@env@"
+INTERPRETER = "@interpreter@"
+PYTHON_VERSION = "@pythonVersion@"
+
+IS_VENV = @is_venv@
+IS_NIXENV = @is_nixenv@
+IS_PYPY = platform.python_implementation() == "PyPy"
+
+
+class TestCasePython(unittest.TestCase):
+
+    @unittest.skipIf(IS_PYPY, "Executable is incorrect and needs to be fixed.")
+    def test_interpreter(self):
+        self.assertEqual(sys.executable, INTERPRETER)
+
+    @unittest.skipIf(IS_NIXENV or IS_PYPY, "Prefix is incorrect and needs to be fixed.")
+    def test_prefix(self):
+        self.assertEqual(sys.prefix, ENV)
+        self.assertEqual(sys.prefix, sys.exec_prefix)
+
+    def test_site_prefix(self):
+        self.assertTrue(sys.prefix in site.PREFIXES)
+
+    @unittest.skipIf(sys.version_info.major==2, "Python 2 does not have base_prefix")
+    def test_base_prefix(self):
+        if IS_VENV:
+            self.assertNotEqual(sys.prefix, sys.base_prefix)
+        else:
+            self.assertEqual(sys.prefix, sys.base_prefix)
+
+    def test_python_version(self):
+        self.assertTrue(platform.python_version().startswith(PYTHON_VERSION))
+
+
+if __name__ == "__main__":
+    unittest.main()

From b1c71ebe2b6a195b70db9fbd55c7a4e4de69bc8b Mon Sep 17 00:00:00 2001
From: Dmitry Bogatov <KAction@disroot.org>
Date: Sun, 8 Dec 2019 02:08:33 -0500
Subject: [PATCH 3064/4636] mmh-unstable: init at 2019-09-08

---
 .../networking/mailreaders/mmh/default.nix    | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/applications/networking/mailreaders/mmh/default.nix

diff --git a/pkgs/applications/networking/mailreaders/mmh/default.nix b/pkgs/applications/networking/mailreaders/mmh/default.nix
new file mode 100644
index 000000000000..7d6254ed13cc
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/mmh/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, ncurses, autoreconfHook, flex }:
+let rev = "431604647f89d5aac7b199a7883e98e56e4ccf9e";
+in stdenv.mkDerivation rec {
+  pname = "mmh-unstable";
+  version = "2019-09-08";
+
+  src = fetchurl {
+    url = "http://git.marmaro.de/?p=mmh;a=snapshot;h=${rev};sf=tgz";
+    name = "mmh-${rev}.tgz";
+    sha256 = "1q97p4g3f1q2m567i2dbx7mm7ixw3g91ww2rymwj42cxk9iyizhv";
+  };
+
+  buildInputs = [ ncurses ];
+  nativeBuildInputs = [ autoreconfHook flex ];
+
+  meta = with stdenv.lib; {
+    description = "Set of electronic mail handling programs";
+    homepage = "http://marmaro.de/prog/mmh";
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+    broken = stdenv.isDarwin;
+    maintainers = with maintainers; [ kaction ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bfbcbf194151..c985e584a7a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20588,6 +20588,7 @@ in
     else
       libsForQt5.callPackage ../applications/audio/musescore { };
 
+  mmh = callPackage ../applications/networking/mailreaders/mmh { };
   mutt = callPackage ../applications/networking/mailreaders/mutt { };
   mutt-with-sidebar = mutt.override {
     withSidebar = true;

From 98aa4da995c2cd166bfb68ccb693621087735ed7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 15:54:07 +0000
Subject: [PATCH 3065/4636] berglas: 0.5.0 -> 0.5.1

---
 pkgs/tools/admin/berglas/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix
index aaca67baa165..c1c46da41b75 100644
--- a/pkgs/tools/admin/berglas/default.nix
+++ b/pkgs/tools/admin/berglas/default.nix
@@ -1,22 +1,21 @@
 { stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
-
-  name = "berglas-${version}";
-  version = "0.5.0";
+  pname = "berglas";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
-    repo = "berglas";
-    rev = "v0.5.0";
-    sha256 = "1y5w2czipwj069w4zxnyb9xqv5mx0yjjramykf3vm3q478bk3rm7";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0y393g36h35zzqyf5b10j6qq2jhvz83j17cmasnv6wbyrb3vnn0n";
   };
 
-  modSha256 = "0y4ajii3pv25s4gjazf6fl0b9wax17cmwhbmiybqhp61annca7kr";
+  modSha256 = "0m2bqx102lf6nihdjbl8a08xcwi80rawvh91j1cav0njm9w5vmmm";
 
   meta = with stdenv.lib; {
     description = "A tool for managing secrets on Google Cloud";
-    homepage = https://github.com/GoogleCloudPlatform/berglas;
+    homepage = "https://github.com/GoogleCloudPlatform/berglas";
     license = licenses.asl20;
     platforms = platforms.unix;
   };

From 1abca6627e42a7823b6b3bd09399b936a47ee824 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 16:15:12 +0000
Subject: [PATCH 3066/4636] bitwarden_rs: 1.13.1 -> 1.14

---
 pkgs/tools/security/bitwarden_rs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix
index ac8091a91045..cd71ea99fecb 100644
--- a/pkgs/tools/security/bitwarden_rs/default.nix
+++ b/pkgs/tools/security/bitwarden_rs/default.nix
@@ -8,13 +8,13 @@ let
 
 in rustPlatform.buildRustPackage rec {
   pname = "bitwarden_rs";
-  version = "1.13.1";
+  version = "1.14";
 
   src = fetchFromGitHub {
     owner = "dani-garcia";
     repo = pname;
     rev = version;
-    sha256 = "0af8cnpx86a096m59wmszcfyrfgf7adlqr39phbg647mgjfzwcrk";
+    sha256 = "1ck0l0167kw1i5fjn507g4d18x2krbpk2ks0lnw9vzg0bwnzzwwd";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -25,7 +25,7 @@ in rustPlatform.buildRustPackage rec {
 
   RUSTC_BOOTSTRAP = 1;
 
-  cargoSha256 = "1zzf71d2pr4mkc3xpm58z1apgskw2z8rklly7q23qxkzg5h4qasx";
+  cargoSha256 = "0cgk61dmc057p82g0apd4sx6a8vhvcipxikrdb0hds4frhqsr6i8";
   cargoBuildFlags = [ featuresFlag ];
 
   checkPhase = ''

From 281dd8bd4496a0ad26ecaa297dcd455ca57b70e7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Mar 2020 14:45:43 +0000
Subject: [PATCH 3067/4636] ntp: 4.2.8p13 -> 4.2.8p14

---
 pkgs/tools/networking/ntp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix
index b890e07845e7..0ce1c5a04292 100644
--- a/pkgs/tools/networking/ntp/default.nix
+++ b/pkgs/tools/networking/ntp/default.nix
@@ -8,11 +8,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "ntp-4.2.8p13";
+  name = "ntp-4.2.8p14";
 
   src = fetchurl {
     url = "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz";
-    sha256 = "0f1a4fya7v5s0426nim8ydvvlcashb8hicgs9xlm76ndrz7751r8";
+    sha256 = "1dsfbrad5adwjnm3k0y0ip8dzs7r2nmw66vjil8gvapnh7qf8q0r";
   };
 
   # The hardcoded list of allowed system calls for seccomp is
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.ntp.org/;
+    homepage = "http://www.ntp.org/";
     description = "An implementation of the Network Time Protocol";
     license = {
       # very close to isc and bsd2

From 3b2d9b3e4c1da430128d4c326aa34fa365e33538 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 14 Mar 2020 09:02:00 -0500
Subject: [PATCH 3068/4636] tflint: 0.15.1 -> 0.15.2

Changelog: https://github.com/terraform-linters/tflint/releases/tag/v0.15.2
---
 pkgs/development/tools/analysis/tflint/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix
index 1b22cb2dc036..8f370d2e0aa1 100644
--- a/pkgs/development/tools/analysis/tflint/default.nix
+++ b/pkgs/development/tools/analysis/tflint/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "tflint";
-  version = "0.15.1";
+  version = "0.15.2";
 
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = pname;
     rev = "v${version}";
-    sha256 = "12a1jg4vcp6w72j8nsxf162i616g303cs783wlsa9iwm4w0cpb2h";
+    sha256 = "1wwdnqb34l0ad6hlvs74acfh0744ir3ssm8wjwpxbsy0sxkrpxcf";
   };
 
-  modSha256 = "1k26i01sdgx9yik5fnd8kv300d8llqpvj9qpvga7hsbk58s2g8mv";
+  modSha256 = "1jbnsqa0ga372lhbgfnqvx8pdzrm0b2phzzwll4sgd0k1hzv2aqv";
 
   subPackages = [ "." ];
 

From 45cc3c986d0a8cc6523f6e1085536de1f6d02aca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= <hoe.dom@gmx.de>
Date: Fri, 13 Mar 2020 20:15:12 +0100
Subject: [PATCH 3069/4636] neomutt: configure with zlib to enable imap
 compression

---
 pkgs/applications/networking/mailreaders/neomutt/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index dc473eaaadd7..b4d7bd046d2e 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript
 , ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl
-, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap, runtimeShell, sqlite
+, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap, runtimeShell, sqlite, zlib
 }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which
+    docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib
   ];
 
   enableParallelBuilding = true;
@@ -61,6 +61,7 @@ stdenv.mkDerivation rec {
     "--with-mailpath="
     # Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail
     "ac_cv_path_SENDMAIL=sendmail"
+    "--zlib"
   ];
 
   # Fix missing libidn in mutt;

From 85f8014655185349990db8eead1a49ac24726cad Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Mon, 9 Mar 2020 12:27:22 +0100
Subject: [PATCH 3070/4636] minio: 2019-10-12 -> 2020-03-06

---
 pkgs/servers/minio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index e1f4d16b0b80..858f8899501d 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "minio";
-  version = "2019-10-12T01-39-57Z";
+  version = "2020-03-06T22-23-56Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "minio";
     rev = "RELEASE.${version}";
-    sha256 = "14rqwdhk2awdpcavkaqndf85c6aww5saarbfa2skc9z76ccq6114";
+    sha256 = "0h5zsdxm2b2by6lzqaa7jj0z773kjr89cl13gq9ddabml34f0kxh";
   };
 
-  modSha256 = "1cnccmmqb63l78rnjwh9bivyfr79ixjg106fbgcrn3pwghfag7ma";
+  modSha256 = "0ikid628v673f7lvp3psk05s3liqlyc3arppg33lfi2cmbaf8hmr";
 
   subPackages = [ "." ];
 

From 337b35707de719748307face5a382e4e7611f401 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Mon, 9 Mar 2020 12:27:51 +0100
Subject: [PATCH 3071/4636] minio-client: 2019-01-30 -> 2020-03-06

---
 pkgs/tools/networking/minio-client/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix
index 3c8d15346849..885ffbe91579 100644
--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/pkgs/tools/networking/minio-client/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "minio-client";
-  version = "2019-01-30T19-57-22Z";
+  version = "2020-03-06T23-29-45Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "mc";
     rev = "RELEASE.${version}";
-    sha256 = "1w0ig0daf0zxpkz449xq2hm7ajhzn8hlnnmpac6ip82qy53xnbm4";
+    sha256 = "1vqvp7mn841s5g9vvas3c8j4y9lp90maw5y49hdv7zcsqncqvzkv";
   };
 
-  goPackagePath = "github.com/minio/mc";
+  modSha256 = "1qjfsqmcc6i0nixwvdmm3vnnv19yvqaaza096cpdf5rl35knsp5i";
+
+  subPackages = [ "." ];
 
   preBuild = ''
     buildFlagsArray+=("-ldflags=-X github.com/minio/mc/cmd.Version=${version}")

From 6cea0daaa94856d12d2e62650f82f78db4770b19 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 14 Mar 2020 00:38:30 +0000
Subject: [PATCH 3072/4636] rustracerd: build with current rust

Fix taken from https://github.com/jwilm/racerd/pull/82.  It just
updates a dependency.
---
 pkgs/development/tools/rust/racerd/default.nix | 11 +++++++++--
 pkgs/top-level/all-packages.nix                |  1 -
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix
index c49ea2aaf128..02b32c6485e6 100644
--- a/pkgs/development/tools/rust/racerd/default.nix
+++ b/pkgs/development/tools/rust/racerd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper , Security }:
+{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, makeWrapper, Security }:
 
 rustPlatform.buildRustPackage rec {
   pname = "racerd";
@@ -11,7 +11,14 @@ rustPlatform.buildRustPackage rec {
     sha256 = "13jqdvjk4savcl03mrn2vzgdsd7vxv2racqbyavrxp2cm9h6cjln";
   };
 
-  cargoSha256 = "1nwjr7v8hkhsql93wbwk5gqqiq725gj5iwwsbd250my9g5kkfdbw";
+  cargoPatches = [
+    (fetchpatch {
+      url = "https://github.com/jwilm/racerd/commit/856f3656e160cd2909c5166e962f422c901720ee.patch";
+      sha256 = "1qq2k4bnwjz5qgn7s8yxd090smwn2wvdm8dd1rrlgpln0a5vxkpb";
+    })
+  ];
+
+  cargoSha256 = "1z0dh2j9ik66i6nww3z7z2gw7nhc0b061zxbjzamk1jybpc845lq";
 
   # a nightly compiler is required unless we use this cheat code.
   RUSTC_BOOTSTRAP=1;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c30bc270ad47..309cfde1fff5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8925,7 +8925,6 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
   rustracerd = callPackage ../development/tools/rust/racerd {
-    inherit (rustPackages_1_38_0) rustPlatform;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
   rust-bindgen = callPackage ../development/tools/rust/bindgen { };

From c4393d6ac48e8d6fc2be5b446b7c34f8baaab3de Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 14 Mar 2020 00:40:16 +0000
Subject: [PATCH 3073/4636] thunderbird: build with current rust

---
 pkgs/top-level/all-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 309cfde1fff5..9944c65cdd41 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21909,7 +21909,6 @@ in
 
   thunderbird = callPackage ../applications/networking/mailreaders/thunderbird {
     inherit (gnome2) libIDL;
-    inherit (rustPackages_1_38_0) cargo rustc;
     libpng = libpng_apng;
     gtk3Support = true;
   };

From dcb43197ea775a62220b54c1c58e66a2e1fbaa6a Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 14 Mar 2020 00:40:32 +0000
Subject: [PATCH 3074/4636] rust_1_38_0: drop

---
 pkgs/development/compilers/rust/1_38_0.nix | 22 ----------------------
 pkgs/top-level/all-packages.nix            |  4 ----
 2 files changed, 26 deletions(-)
 delete mode 100644 pkgs/development/compilers/rust/1_38_0.nix

diff --git a/pkgs/development/compilers/rust/1_38_0.nix b/pkgs/development/compilers/rust/1_38_0.nix
deleted file mode 100644
index 13d2139bffdc..000000000000
--- a/pkgs/development/compilers/rust/1_38_0.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-import ./default.nix {
-  rustcVersion = "1.38.0";
-  rustcSha256 = "101dlpsfkq67p0hbwx4acqq6n90dj4bbprndizpgh1kigk566hk4";
-  enableRustcDev = false;
-
-  # Note: the version MUST be one version prior to the version we're
-  # building
-  bootstrapVersion = "1.37.0";
-
-  # fetch hashes by running `print-hashes.sh 1.37.0`
-  bootstrapHashes = {
-    i686-unknown-linux-gnu = "74510e0e52a55e65a9f716673c2cda4d2bd427e2453541c6993c77c3ec04acf9";
-    x86_64-unknown-linux-gnu = "cb573229bfd32928177c3835fdeb62d52da64806b844bc1095c6225b0665a1cb";
-    arm-unknown-linux-gnueabihf = "272739fbb23cf6c2040c1813af9c8c7f386cac37d9de638f22a1816eb96bc0ae";
-    armv7-unknown-linux-gnueabihf = "5b87b877f0ed20c6a09ce26e7a15d8c61b26b62484b97e78a51099d0efefec98";
-    aarch64-unknown-linux-gnu = "263ef98fa3a6b2911b56f89c06615cdebf6ef676eb9b2493ad1539602f79b6ba";
-    i686-apple-darwin = "e45d0c4d882fc6c404ffa6fe790294f4ea96384a2b48804adbf723f3635477a8";
-    x86_64-apple-darwin = "b2310c97ffb964f253c4088c8d29865f876a49da2a45305493af5b5c7a3ca73d";
-  };
-
-  selectRustPackage = pkgs: pkgs.rust_1_38_0;
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9944c65cdd41..dff5b6bd374b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8835,13 +8835,9 @@ in
   rust_1_41_0 = callPackage ../development/compilers/rust/1_41_0.nix {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
   };
-  rust_1_38_0 = callPackage ../development/compilers/rust/1_38_0.nix {
-    inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
-  };
   rust = rust_1_41_0;
 
   rustPackages_1_41_0 = rust_1_41_0.packages.stable;
-  rustPackages_1_38_0 = rust_1_38_0.packages.stable;
   rustPackages = rustPackages_1_41_0;
 
   inherit (rustPackages) cargo clippy rustc rustPlatform;

From e3e86f1b1294ee0f3db8add9d631324b2a5f193b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 11:04:13 -0700
Subject: [PATCH 3075/4636] caddy: 1.0.4 -> 1.0.5 (#82601)

---
 pkgs/servers/caddy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index 2eca465bfd25..bcd4b7065b58 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "caddy";
-  version = "1.0.4";
+  version = "1.0.5";
 
   goPackagePath = "github.com/caddyserver/caddy";
 
@@ -12,9 +12,9 @@ buildGoModule rec {
     owner = "caddyserver";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0mqbaa9cshrqm5fggm5l5nzcnv8c9dvylcc4z7qj3322vl5cpfdc";
+    sha256 = "0jrhwmr6gggppskg5h450wybzkv17iq69dgw36hd1dp56q002i7g";
   };
-  modSha256 = "0f08smcnzmrj3v43v0qgyd11qwdbymbl86c9prais6sykgh1ld97";
+  modSha256 = "1gc0xvsihr4zp7hkrdfrplvzkaphz1y4q53rgwn2jhd8s98l57an";
 
   preBuild = ''
     cat << EOF > caddy/main.go

From c6c753668dd80b38f42ae5355371b28e43af5649 Mon Sep 17 00:00:00 2001
From: Tom Hall <tahall256@protonmail.ch>
Date: Sat, 14 Mar 2020 12:13:19 +0000
Subject: [PATCH 3076/4636] openblas: disable optimisation pending fix

See https://github.com/xianyi/OpenBLAS/issues/2496
---
 ...mised-aarch64-dgemm_beta-pending-fix.patch | 26 +++++++++++++++++++
 .../science/math/openblas/default.nix         |  6 +++++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/libraries/science/math/openblas/0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch

diff --git a/pkgs/development/libraries/science/math/openblas/0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch b/pkgs/development/libraries/science/math/openblas/0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch
new file mode 100644
index 000000000000..1da1f3fb3190
--- /dev/null
+++ b/pkgs/development/libraries/science/math/openblas/0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch
@@ -0,0 +1,26 @@
+From 6cb9aa7c69c20a677ca9fb1bc5fa1580e3236fbd Mon Sep 17 00:00:00 2001
+From: Tom Hall <tahall256@protonmail.ch>
+Date: Sat, 14 Mar 2020 11:55:45 +0000
+Subject: [PATCH] Disable optimised aarch64 dgemm_beta pending fix
+
+Identified as source of https://github.com/xianyi/OpenBLAS/issues/2496,
+but not yet fixed.
+---
+ kernel/arm64/KERNEL.ARMV8 | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/kernel/arm64/KERNEL.ARMV8 b/kernel/arm64/KERNEL.ARMV8
+index fe32d313..33d12f94 100644
+--- a/kernel/arm64/KERNEL.ARMV8
++++ b/kernel/arm64/KERNEL.ARMV8
+@@ -102,7 +102,6 @@ CDOTKERNEL     = zdot.S
+ ZDOTKERNEL     = zdot.S
+ DSDOTKERNEL    = dot.S
+ 
+-DGEMM_BETA     = dgemm_beta.S
+ SGEMM_BETA     = sgemm_beta.S
+ 
+ SGEMMKERNEL    =  sgemm_kernel_$(SGEMM_UNROLL_M)x$(SGEMM_UNROLL_N).S
+-- 
+2.24.1
+
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 9c411234357a..38ad31cc6257 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -123,6 +123,12 @@ stdenv.mkDerivation rec {
     buildPackages.stdenv.cc
   ];
 
+  # Disable an optimisation which seems to cause issues, pending an
+  # upstream fix: https://github.com/xianyi/OpenBLAS/issues/2496
+  patches = stdenv.lib.optionals stdenv.hostPlatform.isAarch64 [
+    ./0001-Disable-optimised-aarch64-dgemm_beta-pending-fix.patch
+  ];
+
   makeFlags = mkMakeFlagsFromConfig (config // {
     FC = "${stdenv.cc.targetPrefix}gfortran";
     CC = "${stdenv.cc.targetPrefix}${if stdenv.cc.isClang then "clang" else "cc"}";

From 9d8580fe4c4ee5e23f09b58f5476a54d90bced13 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Sat, 14 Mar 2020 18:59:09 +0200
Subject: [PATCH 3077/4636] miniserve: 0.5.0 -> 0.6.0

---
 pkgs/tools/misc/miniserve/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix
index 603e24916d60..9add75acee20 100644
--- a/pkgs/tools/misc/miniserve/default.nix
+++ b/pkgs/tools/misc/miniserve/default.nix
@@ -1,26 +1,26 @@
-{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib, openssl }:
+{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkg-config, zlib, openssl }:
 
 rustPlatform.buildRustPackage rec {
   pname = "miniserve";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner  = "svenstaro";
     repo   = "miniserve";
     rev    = "v${version}";
-    sha256 = "06cxkkf3sf84prba65dymr1hg7mwizmsax0dlljh0lcmvlcpzi08";
+    sha256 = "0ybxnxjg0vqm4q60z4zjl3hfls0s2rvy44m6jgyhlj1p6cr3dbyw";
   };
 
-  cargoSha256 = "1v4rvk6h78797wshw3m0qabb7g4i4mbj1vs5d41izgb0swnzk4vy";
+  cargoSha256 = "0ypxv9wqcnjxjdrvdparddpssrarnifr43dq7kcr4l3fd1anl40a";
 
   RUSTC_BOOTSTRAP = 1;
 
-  nativeBuildInputs = [ cmake pkgconfig zlib ];
+  nativeBuildInputs = [ cmake pkg-config zlib ];
   buildInputs = [ openssl ];
 
   meta = with stdenv.lib; {
     description = "For when you really just want to serve some files over HTTP right now!";
-    homepage    = https://github.com/svenstaro/miniserve;
+    homepage    = "https://github.com/svenstaro/miniserve";
     license     = with licenses; [ mit ];
     maintainers = with maintainers; [ nequissimus ];
     platforms   = platforms.linux;

From 2d2de743d0ece3931c01a04043c218b76dfc5cf6 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 14 Mar 2020 19:28:24 +0100
Subject: [PATCH 3078/4636] emacs: improve setup hook

- Add packages installed in a sub-directory of site-lisp, such as
  mu4e, to EMACSLOADPATH.

- Add ELPA packages to EMACSLOADPATH.

- Add each package only once to EMACSLOADPATH. Before, each package
  would typically be added twice for each transitive dependency
  leading to a huge variable for a package having many dependencies.

Fixed #78680
---
 pkgs/build-support/emacs/setup-hook.sh | 30 ++++++++++++++++++--------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/pkgs/build-support/emacs/setup-hook.sh b/pkgs/build-support/emacs/setup-hook.sh
index b210511d670d..8f074e0b406c 100644
--- a/pkgs/build-support/emacs/setup-hook.sh
+++ b/pkgs/build-support/emacs/setup-hook.sh
@@ -1,13 +1,25 @@
 addEmacsVars () {
-  if test -d $1/share/emacs/site-lisp; then
-      # it turns out, that the trailing : is actually required
+  for lispDir in \
+      "$1/share/emacs/site-lisp" \
+      "$1/share/emacs/site-lisp/"* \
+      "$1/share/emacs/site-lisp/elpa/"*; do
+    # Add the path to the Emacs load path if it is a directory
+    # containing .el files and it has not already been added to the
+    # load path.
+    if [[ -d $lispDir && "$(echo "$lispDir"/*.el)" && ${EMACSLOADPATH-} != *"$lispDir":* ]] ; then
+      # It turns out, that the trailing : is actually required
       # see https://www.gnu.org/software/emacs/manual/html_node/elisp/Library-Search.html
-      export EMACSLOADPATH="$1/share/emacs/site-lisp:${EMACSLOADPATH-}"
-  fi
+      export EMACSLOADPATH="$lispDir:${EMACSLOADPATH-}"
+    fi
+  done
 }
 
-# If this is for a wrapper derivation, emacs and the dependencies are all
-# run-time dependencies. If this is for precompiling packages into bytecode,
-# emacs is a compile-time dependency of the package.
-addEnvHooks "$hostOffset" addEmacsVars
-addEnvHooks "$targetOffset" addEmacsVars
+if [[ ! -v emacsHookDone ]]; then
+  emacsHookDone=1
+
+  # If this is for a wrapper derivation, emacs and the dependencies are all
+  # run-time dependencies. If this is for precompiling packages into bytecode,
+  # emacs is a compile-time dependency of the package.
+  addEnvHooks "$hostOffset" addEmacsVars
+  addEnvHooks "$targetOffset" addEmacsVars
+fi

From b2933434f5a899d851705f652909cbdb78e1029b Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Wed, 11 Mar 2020 21:35:53 +0100
Subject: [PATCH 3079/4636] phpPackages: Initial work for building
 phpExtensions separately

---
 pkgs/top-level/php-packages.nix | 55 ++++++++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 5ef8e7226207..a2b4434aedee 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -1,4 +1,4 @@
-{ pkgs, fetchgit, php }:
+{ stdenv, lib, pkgs, fetchgit, php, autoconf, pkgconfig, re2c }:
 
 let
   self = with self; {
@@ -693,4 +693,57 @@ let
 
     nativeBuildInputs = [ pkgs.pkgconfig ];
   };
+
+  exts = let
+    # Function to build a single php extension based on the php version.
+    #
+    # Name passed is the name of the extension and is automatically used
+    # to add the configureFlag "--enable-${name}", which can be overriden.
+    #
+    # Build inputs is used for extra deps that may be needed.
+    mkExtension = {
+      name
+      , configureFlags ? [ "--enable-${name}" ]
+      , buildInputs ? []
+      , ...
+    }: stdenv.mkDerivation {
+      pname = "php-ext-${name}";
+
+      inherit (php) version src;
+      sourceRoot = "php-${php.version}/ext/${name}";
+
+      enableParallelBuilding = true;
+      nativeBuildInputs = [ php autoconf pkgconfig re2c ];
+      inherit configureFlags buildInputs;
+
+      preConfigure = "phpize";
+
+      installPhase = ''
+        mkdir -p $out/lib/php/extensions
+        cp modules/${name}.so $out/lib/php/extensions/ext-${name}.so
+      '';
+    };
+
+    # This list contains build instructions for different modules that one may
+    # want to build.
+    #
+    # These will be passed as arguments to mkExtension above.
+    extensionData = [
+    ];
+
+    # Convert the list of attrs:
+    # [ { name = <name>; ... } ... ]
+    # to a list of
+    # [ { name = <name>; value = <extension drv>; } ... ]
+    #
+    # which we later use listToAttrs to make all attrs available by name.
+    #
+    # Also filter out extensions based on the enable property.
+    namedExtensions = builtins.map (drv: {
+      name = drv.name;
+      value = mkExtension drv;
+    }) (builtins.filter (i: i.enable or true) extensionData);
+
+    # Produce the final attribute set of all extensions defined.
+  in builtins.listToAttrs namedExtensions;
 }; in self

From 387d52106a0f3835b80a6759c5d0d9400a960916 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sat, 14 Mar 2020 08:48:41 +0100
Subject: [PATCH 3080/4636] phpPackages.exts: Add alias so we have the right
 pcre lib

---
 pkgs/top-level/php-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index a2b4434aedee..0e044fb04e9d 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -728,7 +728,9 @@ let
     # want to build.
     #
     # These will be passed as arguments to mkExtension above.
-    extensionData = [
+    extensionData = let
+      pcre' = if (lib.versionAtLeast php.version "7.3") then pcre2 else pcre;
+    in [
     ];
 
     # Convert the list of attrs:

From b6fe12b1cc699376eb8cb9281362215290be8a90 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 14 Mar 2020 20:51:44 +0100
Subject: [PATCH 3081/4636] cryptpad: 3.0.1 -> 3.13.0 (#82602)

---
 pkgs/development/node-packages/node-env.nix   |   2 +-
 .../web-apps/cryptpad/bower-packages.nix      |  19 +--
 .../cryptpad/node-packages-generated.nix      | 112 +++++++++++-------
 .../web-apps/cryptpad/node-packages.json      |   2 +-
 .../web-apps/cryptpad/node-packages.nix       |   2 +-
 5 files changed, 81 insertions(+), 56 deletions(-)

diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index 7cc212c41bd6..670556bf271a 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -363,7 +363,7 @@ let
 
         npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
 
-        if [ "''${dontNpmInstall-}" != "1" ]
+        if [ "$dontNpmInstall" != "1" ]
         then
             # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
             rm -f npm-shrinkwrap.json
diff --git a/pkgs/servers/web-apps/cryptpad/bower-packages.nix b/pkgs/servers/web-apps/cryptpad/bower-packages.nix
index 9b87924e0b96..0321f7458334 100644
--- a/pkgs/servers/web-apps/cryptpad/bower-packages.nix
+++ b/pkgs/servers/web-apps/cryptpad/bower-packages.nix
@@ -1,39 +1,40 @@
 # Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix)
 { fetchbower, buildEnv }:
 buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
-  (fetchbower "jquery" "2.1.4" "~2.1.3" "1ywrpk2xsr6ghkm3j9gfnl9r3jn6xarfamp99b0bcm57kq9fm2k0")
+  (fetchbower "jquery" "2.1.0" "~2.1.0" "sha256-mVqtu4tv66a4WT9mztU5UAKqxm9An2sxCPv+PdLffAo=")
+  (fetchbower "jquery" "2.2.4" "2.2.4" "0kaln93pzjlr4vqf2zvsm9dwgjkrii9xlsqg48hc1vs16cl109rn")
   (fetchbower "tweetnacl" "0.12.2" "0.12.2" "1lfzbfrdaly3zyzbcp1p53yhxlrx56k8x04q924kg7l52gblm65g")
   (fetchbower "components-font-awesome" "4.7.0" "^4.6.3" "1w27im6ayjrbgjqa0i49ml5d3wy4ld40h9b29hz9myv77bpx4lg1")
   (fetchbower "ckeditor" "4.7.3" "4.7.3" "02bism1gc0pccdxsp361hsrn9p4jh24dnxh40rv3xikr3g91b414")
-  (fetchbower "codemirror" "5.48.4" "^5.19.0" "1066jrf11dygdr8v7xv2nyzrq4ks7sc6j8wdqvrwl689pw3ycypf")
+  (fetchbower "codemirror" "5.52.0" "^5.19.0" "0yc9qyfp7g800mgbaxc5zyy6bp5q257rj7l8i1bp0667h1wvfchp")
   (fetchbower "requirejs" "2.3.5" "2.3.5" "05lyvgz914h2w08r24rk0vkk3yxmqrvlg7j3i5av9ffkg9lpzsli")
   (fetchbower "marked" "0.5.0" "0.5.0" "00lclh9xfbhbjzzbbfjnfpr949hmqmr04jx2hq7mdc9f74xinj1r")
   (fetchbower "rangy" "rangy-release#1.3.0" "rangy-release#~1.3.0" "13x3wci003p8jyv2ncir0k23bxckx99b3555r0zvgmlwycg7w0zv")
   (fetchbower "json.sortify" "2.1.0" "~2.1.0" "1rz9xz0gnm4ak31n10vhslqsw8fw493gjylwj8xsy3bxqq1ygpnh")
   (fetchbower "secure-fabric.js" "secure-v1.7.9" "secure-v1.7.9" "1l56mk7hbnsm9cdg5zdcmg95p7a9w96dq0bbl8fp11vs0awjil7a")
   (fetchbower "hyperjson" "1.4.0" "~1.4.0" "1n68ls3x4lyhg1yy8i4q3xkgh5xqpyakf45sny4x91mkr68x4bd9")
-  (fetchbower "chainpad-crypto" "0.2.2" "^0.2.0" "1zmhc24zgg7jkb6c7r5syhxmlk61vmcsa2l0ip37dk52ygl6yfg5")
-  (fetchbower "chainpad-listmap" "0.7.0" "^0.7.0" "141hk4x7kwzgiazsghyg4h4df519m72qh3xfb3lzwy245c2nh1ak")
-  (fetchbower "chainpad" "5.1.2" "^5.1.0" "1qzdbaf15vaz2573dzm4sxi28m56hi1gi2z00f5ilayxshrbdrlc")
+  (fetchbower "chainpad-crypto" "0.2.4" "^0.2.0" "0sqqc2j0pc34ig6319n18i85j03hibqkhz3cbr70vbd8x43vfzby")
+  (fetchbower "chainpad-listmap" "0.8.1" "^0.8.1" "04q1mb9cr510y0xzybd51j8x16vmjb8v7jv3vik0cx7kzqf4rh0f")
+  (fetchbower "chainpad" "5.1.3" "^5.1.0" "1la0zrh0i1h264jacn436w85hzq3l0d4whwxd2sslja9xbwgfaa0")
   (fetchbower "file-saver" "1.3.1" "1.3.1" "065nzkvdiicxnw06z1sjz1sbp9nyis8z839hv6ng1fk25dc5kvkg")
   (fetchbower "alertifyjs" "1.0.11" "1.0.11" "0v7323bzq90k35shm3h6azj4wd9la3kbi1va1pw4qyvndkwma69l")
   (fetchbower "scrypt-async" "1.2.0" "1.2.0" "0d076ax708p9b8hcmk4f82j925nlnm0hmp0ni45ql37g7iirfpyv")
   (fetchbower "require-css" "0.1.10" "0.1.10" "106gz9i76v71q9zx2pnqkkj342m630lvssnw54023a0ljc0gqcwq")
   (fetchbower "less" "3.7.1" "3.7.1" "1n7ps4xlbrc9m63b3q62mg3p6i7d5hwchhpjshb0drzj5crvz556")
-  (fetchbower "bootstrap" "4.3.1" "^v4.0.0" "081xw746bshhy8m14x7y8y6ryl38jz3l5545v62vjzr6b4609xd9")
+  (fetchbower "bootstrap" "3.1.1" "~3.1.1" "sha256-IaC09U2JVjflgcZQ3GbmNnwCUGv+TTnyXb+eixSXcBk=")
+  (fetchbower "bootstrap" "4.4.1" "^v4.0.0" "0a3y5s6236jjw0ppzwdysf5mn87308ndadw1rgwgwswr9cgkz2ak")
   (fetchbower "diff-dom" "2.1.1" "2.1.1" "0nrn6xqlhp0p5ixjxdk8qg3939crkggh1l8swd20d7bsz186l5f1")
   (fetchbower "nthen" "0.1.7" "0.1.7" "03yap5ildigaw4rwxmxs37pcwhq415iham8w39zd56ka98gpfxa5")
   (fetchbower "open-sans-fontface" "1.4.2" "^1.4.2" "0ksav1fcq640fmdz49ra4prwsrrfj35y2p4shx1jh1j7zxd044nf")
   (fetchbower "bootstrap-tokenfield" "0.12.1" "^0.12.1" "0ib1v5k8h360sp19yiy7q92rfaz2554fvwwg2ixmxn01ydqlprw6")
-  (fetchbower "bootstrap" "3.1.1" "~3.1.1" "06bhjwa8p7mzbpr3jkgydd804z1nwrkdql66h7jkfml99psv9811")
   (fetchbower "localforage" "1.7.3" "^1.5.2" "0q1a996j4dn246xp55zldfh07s9m9skhnf9i0g1w4ngwsnqx23rw")
   (fetchbower "html2canvas" "0.4.1" "^0.4.1" "0yg7y90nav068q0i5afc2c221zkddpf28hi0hwc46cawx4180c69")
   (fetchbower "croppie" "2.6.4" "^2.5.0" "1lcdsjdc4xz7a3sii836g40wx15223sxng53mnf3g7h7s5y84h1x")
-  (fetchbower "sortablejs" "1.9.0" "^1.6.0" "12gncd70fi3craqqpb3la12hg7pm2wf4y01l1r2vvmnzmb5apdan")
+  (fetchbower "sortablejs" "1.10.2" "^1.6.0" "10q4gyblhjy7w51clr0k9j7h722l4ybzn5535givwpmp6xagv11v")
   (fetchbower "saferphore" "0.0.1" "^0.0.1" "1wfr9wpbm3lswmvy2p0247ydb108h4qh5s286py89k871qh6jwdi")
   (fetchbower "jszip" "Stuk/jszip#3.2.2" "Stuk/jszip#^3.1.5" "1k0va2ps2x29d1virg51n5s5rdjk21zfh7h14nnljcfnvxvk3rpp")
   (fetchbower "requirejs-plugins" "1.0.3" "^1.0.3" "00s3sdz1ykygx5shldwhhhybwgw7c99vkqd94i5i5x0gl97ifxf5")
-  (fetchbower "chainpad-netflux" "0.9.0" "^0.9.0" "0qx9ihnpmcrmg2lwkpm330bhj8zsp1gdxxrbsd05bwd8pm2x11av")
+  (fetchbower "chainpad-netflux" "0.10.3" "^0.10.0" "0k8nf34bxwr070jjn4hc7ikiysnv22mix1mdg633j67b5ca0bm30")
   (fetchbower "netflux-websocket" "0.1.20" "^0.1.20" "1xwqq7nw7fmhglndbplarkdzxfmkq831aqs8nm6qj0hz2ggbibhz")
   (fetchbower "es6-promise" "3.3.1" "^3.2.2" "0ai6z5admfs84fdx6663ips49kqgz4x68ays78cic0xfb7pp6vcz")
 ]; }
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
index 9fb93c020854..03207d7ab027 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
+++ b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
@@ -49,13 +49,22 @@ let
         sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048";
       };
     };
-    "chainpad-server-3.0.5" = {
+    "chainpad-crypto-0.2.4" = {
+      name = "chainpad-crypto";
+      packageName = "chainpad-crypto";
+      version = "0.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chainpad-crypto/-/chainpad-crypto-0.2.4.tgz";
+        sha512 = "fWbVyeAv35vf/dkkQaefASlJcEfpEvfRI23Mtn+/TBBry7+LYNuJMXJiovVY35pfyw2+trKh1Py5Asg9vrmaVg==";
+      };
+    };
+    "chainpad-server-4.0.5" = {
       name = "chainpad-server";
       packageName = "chainpad-server";
-      version = "3.0.5";
+      version = "4.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chainpad-server/-/chainpad-server-3.0.5.tgz";
-        sha512 = "USKOMSHsNjnme81Qy3nQ+ji9eCkBPokYH4T82LVHAI0aayTSCXcTPUDLVGDBCRqe8NsXU4io1WPXn1KiZwB8fA==";
+        url = "https://registry.npmjs.org/chainpad-server/-/chainpad-server-4.0.5.tgz";
+        sha512 = "vHOKQIyd7Jz3dspS6p3nmrFLNNByQJyHwlfZiAjnNykpKC6ncNamjBokT6+ZHE9MHHNWOPflv3sg3PMDyZohQw==";
       };
     };
     "content-disposition-0.5.2" = {
@@ -220,13 +229,13 @@ let
         sha512 = "+CEb+GDCM7tkOS2wdMKTn9vU7DgnKUTuDlehkNJKNSovdCOVxs14OfKCk4cvSaR3za4gj+OBdl9opPN9xrJ0zA==";
       };
     };
-    "graceful-fs-4.2.2" = {
+    "graceful-fs-4.2.3" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.2.2";
+      version = "4.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz";
-        sha512 = "IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz";
+        sha512 = "a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==";
       };
     };
     "http-errors-1.6.3" = {
@@ -256,13 +265,13 @@ let
         sha1 = "633c2c83e3da42a502f52466022480f4208261de";
       };
     };
-    "ipaddr.js-1.9.0" = {
+    "ipaddr.js-1.9.1" = {
       name = "ipaddr.js";
       packageName = "ipaddr.js";
-      version = "1.9.0";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz";
-        sha512 = "M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==";
+        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz";
+        sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==";
       };
     };
     "jsonfile-4.0.0" = {
@@ -328,22 +337,22 @@ let
         sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==";
       };
     };
-    "mime-db-1.40.0" = {
+    "mime-db-1.43.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.40.0";
+      version = "1.43.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz";
-        sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz";
+        sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==";
       };
     };
-    "mime-types-2.1.24" = {
+    "mime-types-2.1.26" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.24";
+      version = "2.1.26";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz";
-        sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz";
+        sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==";
       };
     };
     "ms-2.0.0" = {
@@ -364,6 +373,15 @@ let
         sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
       };
     };
+    "netflux-websocket-0.1.20" = {
+      name = "netflux-websocket";
+      packageName = "netflux-websocket";
+      version = "0.1.20";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/netflux-websocket/-/netflux-websocket-0.1.20.tgz";
+        sha512 = "svFkw4ol4gmkcXKnx5kF/8tR9mmtTCDzUlLy4mSlcNl/4iWlbDmgwp/+aJ3nqtv8fg12m+DAFGX2+fbC0//dcg==";
+      };
+    };
     "nthen-0.1.8" = {
       name = "nthen";
       packageName = "nthen";
@@ -400,13 +418,13 @@ let
         sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
       };
     };
-    "proxy-addr-2.0.5" = {
+    "proxy-addr-2.0.6" = {
       name = "proxy-addr";
       packageName = "proxy-addr";
-      version = "2.0.5";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz";
-        sha512 = "t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==";
+        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz";
+        sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==";
       };
     };
     "pull-stream-3.6.14" = {
@@ -445,15 +463,6 @@ let
         sha512 = "9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==";
       };
     };
-    "replify-1.2.0" = {
-      name = "replify";
-      packageName = "replify";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/replify/-/replify-1.2.0.tgz";
-        sha1 = "940166d207d10e98614fe49253ad2f0ac019f7e1";
-      };
-    };
     "safe-buffer-5.1.2" = {
       name = "safe-buffer";
       packageName = "safe-buffer";
@@ -553,6 +562,16 @@ let
         sha1 = "bd59f890507856fb0a1136acc3a8b44547e29ddb";
       };
     };
+    "tweetnacl-git://github.com/dchest/tweetnacl-js.git#v0.12.2" = {
+      name = "tweetnacl";
+      packageName = "tweetnacl";
+      version = "0.12.2";
+      src = fetchgit {
+        url = "git://github.com/dchest/tweetnacl-js.git";
+        rev = "8a21381d696acdc4e99c9f706f1ad23285795f79";
+        sha256 = "10f27b673944107995b3f6dcd65caecd705acdae9c37b7e79b810a8a72a40a31";
+      };
+    };
     "type-is-1.6.18" = {
       name = "type-is";
       packageName = "type-is";
@@ -619,14 +638,14 @@ let
   };
 in
 {
-  "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#3.0.1" = nodeEnv.buildNodePackage {
+  "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#3.13.0" = nodeEnv.buildNodePackage {
     name = "cryptpad";
     packageName = "cryptpad";
-    version = "3.0.1";
+    version = "3.13.0";
     src = fetchgit {
       url = "https://github.com/xwiki-labs/cryptpad.git";
-      rev = "4e5f6edac4f9a3a7a4756eb543d29dc9d1eef32a";
-      sha256 = "f32a93316b717246d1563baec70f9e1e7e5ec1be4f325a473cc37e656afa13cd";
+      rev = "6b657c47ceba50c85275981f45895341370d3d66";
+      sha256 = "d7b56930962fe5217d2051fb718954fd7aef96c9503e27d32148ea9b4a8dc098";
     };
     dependencies = [
       sources."accepts-1.3.7"
@@ -634,7 +653,12 @@ in
       sources."async-limiter-1.0.1"
       sources."body-parser-1.18.3"
       sources."bytes-3.0.0"
-      sources."chainpad-server-3.0.5"
+      (sources."chainpad-crypto-0.2.4" // {
+        dependencies = [
+          sources."tweetnacl-git://github.com/dchest/tweetnacl-js.git#v0.12.2"
+        ];
+      })
+      sources."chainpad-server-4.0.5"
       sources."content-disposition-0.5.2"
       sources."content-type-1.0.4"
       sources."cookie-0.3.1"
@@ -653,11 +677,11 @@ in
       sources."fs-extra-7.0.1"
       sources."gar-1.0.4"
       sources."get-folder-size-2.0.1"
-      sources."graceful-fs-4.2.2"
+      sources."graceful-fs-4.2.3"
       sources."http-errors-1.6.3"
       sources."iconv-lite-0.4.23"
       sources."inherits-2.0.3"
-      sources."ipaddr.js-1.9.0"
+      sources."ipaddr.js-1.9.1"
       sources."jsonfile-4.0.0"
       sources."lex-1.7.9"
       sources."looper-3.0.0"
@@ -665,20 +689,20 @@ in
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."mime-1.4.1"
-      sources."mime-db-1.40.0"
-      sources."mime-types-2.1.24"
+      sources."mime-db-1.43.0"
+      sources."mime-types-2.1.26"
       sources."ms-2.0.0"
       sources."negotiator-0.6.2"
+      sources."netflux-websocket-0.1.20"
       sources."nthen-0.1.8"
       sources."on-finished-2.3.0"
       sources."parseurl-1.3.3"
       sources."path-to-regexp-0.1.7"
-      sources."proxy-addr-2.0.5"
+      sources."proxy-addr-2.0.6"
       sources."pull-stream-3.6.14"
       sources."qs-6.5.2"
       sources."range-parser-1.2.1"
       sources."raw-body-2.3.3"
-      sources."replify-1.2.0"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."saferphore-0.0.1"
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.json b/pkgs/servers/web-apps/cryptpad/node-packages.json
index c0c86f9848a6..3d068f6a4496 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages.json
+++ b/pkgs/servers/web-apps/cryptpad/node-packages.json
@@ -1,3 +1,3 @@
 [
-  { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#3.0.1" }
+  { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#3.13.0" }
 ]
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix
index 82739d484f28..cae300a53f40 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages.nix
+++ b/pkgs/servers/web-apps/cryptpad/node-packages.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-6_x}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {

From 001be890f78f04df86938f44c0761676e299ceac Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 9 Mar 2020 23:07:37 +0100
Subject: [PATCH 3082/4636] folding@home: 6.02 -> 7.5.1

The v7 series is very different.

This commit introduces the 3 packages: fahclient, fahcontrol and
fahviewer. It also rebuilds the NixOS module to map better with the new
client.
---
 nixos/modules/module-list.nix                 |  6 +-
 .../computing/foldingathome/client.nix        | 81 +++++++++++++++++++
 .../modules/services/misc/folding-at-home.nix | 67 ---------------
 .../science/misc/foldingathome/client.nix     | 59 ++++++++++++++
 .../science/misc/foldingathome/control.nix    | 58 +++++++++++++
 .../science/misc/foldingathome/viewer.nix     | 55 +++++++++++++
 pkgs/misc/foldingathome/default.nix           | 36 ---------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  4 +-
 9 files changed, 260 insertions(+), 107 deletions(-)
 create mode 100644 nixos/modules/services/computing/foldingathome/client.nix
 delete mode 100644 nixos/modules/services/misc/folding-at-home.nix
 create mode 100644 pkgs/applications/science/misc/foldingathome/client.nix
 create mode 100644 pkgs/applications/science/misc/foldingathome/control.nix
 create mode 100644 pkgs/applications/science/misc/foldingathome/viewer.nix
 delete mode 100644 pkgs/misc/foldingathome/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index dba2593bbef5..771d7e128ea1 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -247,9 +247,10 @@
   ./services/cluster/kubernetes/proxy.nix
   ./services/cluster/kubernetes/scheduler.nix
   ./services/computing/boinc/client.nix
-  ./services/computing/torque/server.nix
-  ./services/computing/torque/mom.nix
+  ./services/computing/foldingathome/client.nix
   ./services/computing/slurm/slurm.nix
+  ./services/computing/torque/mom.nix
+  ./services/computing/torque/server.nix
   ./services/continuous-integration/buildbot/master.nix
   ./services/continuous-integration/buildbot/worker.nix
   ./services/continuous-integration/buildkite-agents.nix
@@ -432,7 +433,6 @@
   ./services/misc/ethminer.nix
   ./services/misc/exhibitor.nix
   ./services/misc/felix.nix
-  ./services/misc/folding-at-home.nix
   ./services/misc/freeswitch.nix
   ./services/misc/fstrim.nix
   ./services/misc/gammu-smsd.nix
diff --git a/nixos/modules/services/computing/foldingathome/client.nix b/nixos/modules/services/computing/foldingathome/client.nix
new file mode 100644
index 000000000000..9f99af48c48a
--- /dev/null
+++ b/nixos/modules/services/computing/foldingathome/client.nix
@@ -0,0 +1,81 @@
+{ config, lib, pkgs, ... }:
+with lib;
+let
+  cfg = config.services.foldingathome;
+
+  args =
+    ["--team" "${toString cfg.team}"]
+    ++ lib.optionals (cfg.user != null) ["--user" cfg.user]
+    ++ cfg.extraArgs
+    ;
+in
+{
+  imports = [
+    (mkRenamedOptionModule [ "services" "foldingAtHome" ] [ "services" "foldingathome" ])
+    (mkRenamedOptionModule [ "services" "foldingathome" "nickname" ] [ "services" "foldingathome" "user" ])
+    (mkRemovedOptionModule [ "services" "foldingathome" "config" ] ''
+      Use <literal>services.foldingathome.extraArgs instead<literal>
+    '')
+  ];
+  options.services.foldingathome = {
+    enable = mkEnableOption "Enable the Folding@home client";
+
+    package = mkOption {
+      type = types.package;
+      default = pkgs.fahclient;
+      defaultText = "pkgs.fahclient";
+      description = ''
+        Which Folding@home client to use.
+      '';
+    };
+
+    user = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+        The user associated with the reported computation results. This will
+        be used in the ranking statistics.
+      '';
+    };
+
+    team = mkOption {
+      type = types.int;
+      default = 236565;
+      description = ''
+        The team ID associated with the reported computation results. This
+        will be used in the ranking statistics.
+
+        By default, use the NixOS folding@home team ID is being used.
+      '';
+    };
+
+    extraArgs = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      description = ''
+        Extra startup options for the FAHClient. Run
+        <literal>FAHClient --help</literal> to find all the available options.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.foldingathome = {
+      description = "Folding@home client";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      script = ''
+        exec ${cfg.package}/bin/FAHClient ${lib.escapeShellArgs args}
+      '';
+      serviceConfig = {
+        DynamicUser = true;
+        StateDirectory = "foldingathome";
+        WorkingDirectory = "%S/foldingathome";
+      };
+    };
+  };
+
+  meta = {
+    maintainers = with lib.maintainers; [ zimbatm ];
+  };
+}
diff --git a/nixos/modules/services/misc/folding-at-home.nix b/nixos/modules/services/misc/folding-at-home.nix
deleted file mode 100644
index fd2ea3948f64..000000000000
--- a/nixos/modules/services/misc/folding-at-home.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{ config, lib, pkgs, ... }:
-with lib;
-let
-  stateDir = "/var/lib/foldingathome";
-  cfg = config.services.foldingAtHome;
-  fahUser = "foldingathome";
-in {
-
-  ###### interface
-
-  options = {
-
-    services.foldingAtHome = {
-
-      enable = mkOption {
-        default = false;
-        description = ''
-          Whether to enable the Folding@Home to use idle CPU time.
-        '';
-      };
-
-      nickname = mkOption {
-        default = "Anonymous";
-        description = ''
-          A unique handle for statistics.
-        '';
-      };
-
-      config = mkOption {
-        default = "";
-        description = ''
-          Extra configuration. Contents will be added verbatim to the
-          configuration file.
-        '';
-      };
-
-    };
-
-  };
-
-  ###### implementation
-
-  config = mkIf cfg.enable {
-
-    users.users.${fahUser} =
-      { uid = config.ids.uids.foldingathome;
-        description = "Folding@Home user";
-        home = stateDir;
-      };
-
-    systemd.services.foldingathome = {
-      after = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-      preStart = ''
-        mkdir -m 0755 -p ${stateDir}
-        chown ${fahUser} ${stateDir}
-        cp -f ${pkgs.writeText "client.cfg" cfg.config} ${stateDir}/client.cfg
-      '';
-      script = "${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${fahUser} -c 'cd ${stateDir}; ${pkgs.foldingathome}/bin/fah6'";
-    };
-
-    services.foldingAtHome.config = ''
-        [settings]
-        username=${cfg.nickname}
-    '';
-  };
-}
diff --git a/pkgs/applications/science/misc/foldingathome/client.nix b/pkgs/applications/science/misc/foldingathome/client.nix
new file mode 100644
index 000000000000..9a29fde0a438
--- /dev/null
+++ b/pkgs/applications/science/misc/foldingathome/client.nix
@@ -0,0 +1,59 @@
+{ stdenv
+, autoPatchelfHook
+, buildFHSUserEnv
+, dpkg
+, fetchurl
+, gcc-unwrapped
+, ocl-icd
+, zlib
+, extraPkgs ? []
+}:
+let
+  majMin = stdenv.lib.versions.majorMinor version;
+  version = "7.5.1";
+
+  fahclient = stdenv.mkDerivation rec {
+    inherit version;
+    pname = "fahclient";
+
+    src = fetchurl {
+      url = "https://download.foldingathome.org/releases/public/release/fahclient/debian-stable-64bit/v${majMin}/fahclient_${version}_amd64.deb";
+      hash = "sha256-7+RwYdMoZnJZwYFbmLxsN9ozk2P7jpOGZz9qlvTTfSY=";
+    };
+
+    nativeBuildInputs = [
+      autoPatchelfHook
+      dpkg
+    ];
+
+    buildInputs = [
+      gcc-unwrapped.lib
+      zlib
+    ];
+
+    unpackPhase = "dpkg-deb -x ${src} ./";
+    installPhase = "cp -ar usr $out";
+  };
+in
+buildFHSUserEnv {
+  name = fahclient.name;
+
+  targetPkgs = pkgs': [
+    fahclient
+    ocl-icd
+  ] ++ extraPkgs;
+
+  runScript = "/bin/FAHClient";
+
+  extraInstallCommands = ''
+    mv $out/bin/$name $out/bin/FAHClient
+  '';
+
+  meta = {
+    description = "Folding@home client";
+    homepage = "https://foldingathome.org/";
+    license = stdenv.lib.licenses.unfree;
+    maintainers = [ stdenv.lib.maintainers.zimbatm ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/applications/science/misc/foldingathome/control.nix b/pkgs/applications/science/misc/foldingathome/control.nix
new file mode 100644
index 000000000000..be400ffe5f95
--- /dev/null
+++ b/pkgs/applications/science/misc/foldingathome/control.nix
@@ -0,0 +1,58 @@
+{ stdenv
+, autoPatchelfHook
+, dpkg
+, fetchurl
+, makeWrapper
+, python2
+}:
+let
+  majMin = stdenv.lib.versions.majorMinor version;
+  version = "7.5.1";
+
+  python = python2.withPackages
+    (
+      ps: [
+        ps.pycairo
+        ps.pygobject2
+        ps.pygtk
+      ]
+    );
+in
+stdenv.mkDerivation rec {
+  inherit version;
+  pname = "fahcontrol";
+
+  src = fetchurl {
+    url = "https://download.foldingathome.org/releases/public/release/fahcontrol/debian-stable-64bit/v${majMin}/fahcontrol_${version}-1_all.deb";
+    hash = "sha256-ydN4I6vmZpI9kD+/TXxgWc+AQqIIlUvABEycWmY1tNg=";
+  };
+
+  nativeBuildInputs = [
+    dpkg
+    makeWrapper
+  ];
+
+  buildInputs = [ python ];
+
+  doBuild = false;
+
+  unpackPhase = ''
+    dpkg-deb -x ${src} ./
+  '';
+
+  installPhase = "cp -ar usr $out";
+
+  postFixup = ''
+    sed -e 's|/usr/bin|$out/bin|g' -i $out/share/applications/FAHControl.desktop
+    wrapProgram "$out/bin/FAHControl" \
+      --set PYTHONPATH "$out/lib/python2.7/dist-packages"
+  '';
+
+  meta = {
+    description = "Folding@home control";
+    homepage = "https://foldingathome.org/";
+    license = stdenv.lib.licenses.unfree;
+    maintainers = [ stdenv.lib.maintainers.zimbatm ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/applications/science/misc/foldingathome/viewer.nix b/pkgs/applications/science/misc/foldingathome/viewer.nix
new file mode 100644
index 000000000000..03fa54cd7338
--- /dev/null
+++ b/pkgs/applications/science/misc/foldingathome/viewer.nix
@@ -0,0 +1,55 @@
+{ stdenv
+, autoPatchelfHook
+, dpkg
+, fetchurl
+, freeglut
+, gcc-unwrapped
+, libGL
+, libGLU
+, makeWrapper
+, zlib
+}:
+let
+  majMin = stdenv.lib.versions.majorMinor version;
+  version = "7.5.1";
+in
+stdenv.mkDerivation rec {
+  inherit version;
+  pname = "fahviewer";
+
+  src = fetchurl {
+    url = "https://download.foldingathome.org/releases/public/release/fahviewer/debian-stable-64bit/v${majMin}/fahviewer_${version}_amd64.deb";
+    hash = "sha256-yH0zGjX8aNBEJ5lq7wWydcpp2rO+9Ah++q9eJ+ldeyk=";
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    dpkg
+    makeWrapper
+  ];
+
+  buildInputs = [
+    freeglut
+    gcc-unwrapped.lib
+    libGL
+    libGLU
+    zlib
+  ];
+
+  unpackPhase = ''
+    dpkg-deb -x ${src} ./
+    sed -e 's|/usr/bin|$out/bin|g' -i usr/share/applications/FAHViewer.desktop
+  '';
+
+  installPhase = ''
+    cp -ar usr $out
+  '';
+
+  meta = {
+    description = "Folding@home viewer";
+    homepage = "https://foldingathome.org/";
+    license = stdenv.lib.licenses.unfree;
+    maintainers = [ stdenv.lib.maintainers.zimbatm ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/misc/foldingathome/default.nix b/pkgs/misc/foldingathome/default.nix
deleted file mode 100644
index 1aae47e603b5..000000000000
--- a/pkgs/misc/foldingathome/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "folding-at-home-6.02";
-
-  src = fetchurl {
-    url = http://www.stanford.edu/group/pandegroup/folding/release/FAH6.02-Linux.tgz;
-    sha256 = "01nwi0lb4vv0xg4k04i2fbf5v5qgabl70jm5cgvw1ibgqjz03910";
-  };
-
-  unpackPhase = "tar xvzf $src";
-
-  # Otherwise it doesn't work at all, even ldd thinks it's not a dynamic executable
-  dontStrip = true;
-
-  # This program, to run with '-smp', wants to execute the program mpiexec
-  # as "./mpiexec", although it also expects to write the data files into "."
-  # I suggest, if someone wants to run it, in the data directory set a link
-  # to the store for 'mpiexec', so './mpiexec' will work. That link better
-  # be considered a gcroot.
-  installPhase = ''
-    BINFILES="fah6 mpiexec";
-    for a in $BINFILES; do
-      patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $a
-    done
-    mkdir -p $out/bin
-    cp $BINFILES $out/bin
-  '';
-
-  meta = {
-    homepage = http://folding.stanford.edu/;
-    description = "Folding@home distributed computing client";
-    license = stdenv.lib.licenses.unfree;
-    platforms = [ "i686-linux" ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3a504f20d944..d815983e1262 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -132,6 +132,7 @@ mapAliases ({
 
   firestr = throw "firestr has been removed."; # added 2019-12-08
   flameGraph = flamegraph; # added 2018-04-25
+  foldingathome = fahclient; # added 2020-09-03
   font-awesome-ttf = font-awesome; # 2018-02-25
   # 2019-10-31
   fontconfig-ultimate = throw ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index febee38ef087..b80334ae6128 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25033,7 +25033,9 @@ in
 
   flockit = callPackage ../tools/backup/flockit { };
 
-  foldingathome = callPackage ../misc/foldingathome { };
+  fahclient = callPackage ../applications/science/misc/foldingathome/client.nix {};
+  fahcontrol = callPackage ../applications/science/misc/foldingathome/control.nix {};
+  fahviewer = callPackage ../applications/science/misc/foldingathome/viewer.nix {};
 
   foo2zjs = callPackage ../misc/drivers/foo2zjs {};
 

From bafbfc5a06c19769b0852477197cb100a7c7a771 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 20:19:26 +0000
Subject: [PATCH 3083/4636] eagle: 9.5.2 -> 9.6.0

---
 pkgs/applications/science/electronics/eagle/eagle.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix
index 68f4fafa887c..7c5942d825a9 100644
--- a/pkgs/applications/science/electronics/eagle/eagle.nix
+++ b/pkgs/applications/science/electronics/eagle/eagle.nix
@@ -13,11 +13,11 @@ let
   in
   mkDerivation rec {
     pname = "eagle";
-    version = "9.5.2";
+    version = "9.6.0";
 
     src = fetchurl {
       url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz";
-      sha256 = "0k707pyh0g2r6sgyran59sznq0nlh0i16la2gxqj3c5da1vb58y5";
+      sha256 = "1crkyc7ws2zz5dfs00h6rj4z2hyqb97kp6r4hxhmcgg5647ij4z8";
     };
 
     desktopItem = makeDesktopItem {
@@ -72,7 +72,7 @@ let
 
     meta = with stdenv.lib; {
       description = "Schematic editor and PCB layout tool from Autodesk (formerly CadSoft)";
-      homepage = https://www.autodesk.com/products/eagle/overview;
+      homepage = "https://www.autodesk.com/products/eagle/overview";
       license = licenses.unfree;
       platforms = [ "x86_64-linux" ];
       maintainers = [ maintainers.rittelle ];

From 20ef86ed52f30ae3c6a6c51599c344bb3df3fedc Mon Sep 17 00:00:00 2001
From: "EEva (JPotier)" <jpo.contributes.to.nixos@marvid.fr>
Date: Sat, 14 Mar 2020 12:26:29 +0200
Subject: [PATCH 3084/4636] bitlbee-mastodon: 1.4.2 -> 1.4.3

---
 .../instant-messengers/bitlbee-mastodon/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix
index ecd76977eb2b..155ea5edc4d7 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix
@@ -3,12 +3,12 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "bitlbee-mastodon";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchgit {
     url = "https://alexschroeder.ch/cgit/bitlbee-mastodon";
     rev = "v${version}";
-    sha256 = "04rakgr1pfsg1vhfwlfbggbzw249j7dmk88xrsnf3n84c5ccdyas";
+    sha256 = "1k9j4403w6x93f4ls3xj8nrabz8ynjby6sigqdmhb7cqv26l987p";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From e0b1b9d556321d9361452ad8b7e3abf7e2de57d9 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Wed, 11 Mar 2020 21:54:53 +0100
Subject: [PATCH 3085/4636] phpPackages.exts: Add extensions

---
 pkgs/top-level/php-packages.nix | 162 +++++++++++++++++++++++++++++++-
 1 file changed, 161 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 0e044fb04e9d..167ed5273966 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -1,4 +1,8 @@
-{ stdenv, lib, pkgs, fetchgit, php, autoconf, pkgconfig, re2c }:
+{ stdenv, lib, pkgs, fetchgit, php, autoconf, pkgconfig, re2c
+, bzip2, curl, libxml2, openssl, gmp5, icu, oniguruma, libsodium, html-tidy
+, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl, uwimap
+, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng, freetype
+, libffi, freetds, postgresql, sqlite, recode, net-snmp }:
 
 let
   self = with self; {
@@ -731,6 +735,162 @@ let
     extensionData = let
       pcre' = if (lib.versionAtLeast php.version "7.3") then pcre2 else pcre;
     in [
+      { name = "bcmath"; }
+      { name = "bz2"; buildInputs = [ bzip2 ]; configureFlags = [ "--with-bz2=${bzip2.dev}" ]; }
+      { name = "calendar"; }
+      { name = "ctype"; }
+      { name = "curl"; buildInputs = [ curl ]; configureFlags = [ "--with-curl=${curl.dev}" ]; }
+      { name = "dba"; }
+      { name = "dom";
+        buildInputs = [ libxml2 ];
+        configureFlags = [ "--enable-dom" ]
+          # Required to build on darwin.
+          ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
+      { name = "enchant";
+        buildInputs = [ enchant1 ];
+        configureFlags = [ "--with-enchant=${enchant1}" ];
+        # enchant1 doesn't build on darwin.
+        enable = (!stdenv.isDarwin); }
+      { name = "exif"; }
+      { name = "ffi"; buildInputs = [ libffi ]; enable = lib.versionAtLeast php.version "7.4"; }
+      { name = "fileinfo"; buildInputs = [ pcre' ]; }
+      { name = "filter"; buildInputs = [ pcre' ]; }
+      { name = "ftp"; buildInputs = [ openssl ]; }
+      { name = "gd";
+        buildInputs = [ zlib gd ];
+        configureFlags = [
+          "--enable-gd"
+          "--with-external-gd=${gd.dev}"
+          "--enable-gd-jis-conv"
+        ];
+        enable = lib.versionAtLeast php.version "7.4"; }
+      { name = "gd";
+        buildInputs = [ zlib gd libXpm ];
+        configureFlags = [
+          "--with-gd=${gd.dev}"
+          "--with-freetype-dir=${freetype.dev}"
+          "--with-jpeg-dir=${libjpeg.dev}"
+          "--with-png-dir=${libpng.dev}"
+          "--with-webp-dir=${libwebp}"
+          "--with-xpm-dir=${libXpm.dev}"
+          "--with-zlib-dir=${zlib.dev}"
+          "--enable-gd-jis-conv"
+        ];
+        enable = lib.versionOlder php.version "7.4"; }
+      ## gettext (7.2, 7.3, 7.4) -- configure: error: Cannot locate header file libintl.h
+      #{ name = "gettext";
+      #  buildInputs = [ gettext ];
+      #  configureFlags = "--with-gettext=${gettext}"; }
+      { name = "gmp";
+        buildInputs = [ gmp5 ];
+        configureFlags = [ "--with-gmp=${gmp5.dev}" ];
+        # gmp5 doesn't build on darwin.
+        enable = (!stdenv.isDarwin); }
+      { name = "hash"; enable = lib.versionOlder php.version "7.4"; }
+      { name = "iconv"; configureFlags = if stdenv.isDarwin then
+                           [ "--with-iconv=${libiconv}" ]
+                         else
+                           [ "--with-iconv" ]; }
+      { name = "imap";
+        buildInputs = [ uwimap openssl pam pcre' ];
+        configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" ];
+        # uwimap doesn't build on darwin.
+        enable = (!stdenv.isDarwin); }
+      # interbase (7.3, 7.2)
+      { name = "intl"; buildInputs = [ icu ]; }
+      { name = "json"; }
+      { name = "ldap";
+        buildInputs = [ openldap cyrus_sasl ];
+        configureFlags = [
+          "--with-ldap"
+          "LDAP_DIR=${openldap.dev}"
+          "LDAP_INCDIR=${openldap.dev}/include"
+          "LDAP_LIBDIR=${openldap.out}/lib"
+        ] ++ lib.optional stdenv.isLinux "--with-ldap-sasl=${cyrus_sasl.dev}"; }
+      { name = "mbstring"; buildInputs = [ oniguruma ]; }
+      { name = "mysqli"; configureFlags = [ "--with-mysqli=mysqlnd" "--with-mysql-sock=/run/mysqld/mysqld.sock" ]; }
+      # oci8 (7.4, 7.3, 7.2)
+      # odbc (7.4, 7.3, 7.2)
+      { name = "opcache"; buildInputs = [ pcre' ]; }
+      { name = "pcntl"; }
+      { name = "pdo"; }
+      { name = "pdo_dblib";
+        configureFlags = [ "--with-pdo-dblib=${freetds}" ];
+        # Doesn't seem to work on darwin.
+        enable = (!stdenv.isDarwin); }
+      # pdo_firebird (7.4, 7.3, 7.2)
+      { name = "pdo_mysql"; configureFlags = [ "--with-pdo-mysql=mysqlnd" ]; }
+      # pdo_oci (7.4, 7.3, 7.2)
+      # pdo_odbc (7.4, 7.3, 7.2)
+      { name = "pdo_pgsql"; configureFlags = [ "--with-pdo-pgsql=${postgresql}" ]; }
+      { name = "pdo_sqlite"; buildInputs = [ sqlite ]; configureFlags = [ "--with-pdo-sqlite=${sqlite.dev}" ]; }
+      { name = "pgsql"; buildInputs = [ pcre' ]; configureFlags = [ "--with-pgsql=${postgresql}" ]; }
+      { name = "phar"; buildInputs = [ pcre' openssl ]; }
+      { name = "posix"; }
+      { name = "pspell"; configureFlags = [ "--with-pspell=${aspell}" ]; }
+      ## readline (7.4, 7.3, 7.2) -- configure: error: Please reinstall libedit - I cannot find readline.h
+      #{ name = "readline";
+      #  buildInputs = [ libedit readline ];
+      #  configureFlags = [ "--with-readline=${readline.dev}" ]; }
+      { name = "recode";
+        configureFlags = [ "--with-recode=${recode}" ];
+        # Removed in php 7.4.
+        enable = lib.versionOlder php.version "7.4"; }
+      { name = "session"; }
+      { name = "shmop"; }
+      { name = "simplexml";
+        buildInputs = [ libxml2 pcre' ];
+        configureFlags = [ "--enable-simplexml" ]
+          # Required to build on darwin.
+          ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
+      { name = "snmp";
+        buildInputs = [ net-snmp openssl ];
+        configureFlags = [ "--with-snmp" ];
+        # net-snmp doesn't build on darwin.
+        enable = (!stdenv.isDarwin); }
+      { name = "soap";
+        buildInputs = [ libxml2 ];
+        configureFlags = [ "--enable-soap" ]
+          # Required to build on darwin.
+          ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
+      { name = "sockets"; }
+      { name = "sodium"; buildInputs = [ libsodium ]; }
+      { name = "sysvmsg"; }
+      { name = "sysvsem"; }
+      { name = "sysvshm"; }
+      { name = "tidy"; configureFlags = [ "--with-tidy=${html-tidy}" ]; }
+      { name = "tokenizer"; }
+      { name = "wddx";
+        buildInputs = [ libxml2 ];
+        configureFlags = [ "--enable-wddx" "--with-libxml-dir=${libxml2.dev}" ];
+        # Removed in php 7.4.
+        enable = lib.versionOlder php.version "7.4"; }
+      { name = "xml";
+        buildInputs = [ libxml2 ];
+        configureFlags = [ "--enable-xml" ]
+          # Required to build on darwin.
+          ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
+      { name = "xmlreader";
+        buildInputs = [ libxml2 ];
+        configureFlags = [ "--enable-xmlreader CFLAGS=-I../.." ]
+          # Required to build on darwin.
+          ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
+      { name = "xmlrpc";
+        buildInputs = [ libxml2 libiconv ];
+        configureFlags = [ "--with-xmlrpc" ]
+          # Required to build on darwin.
+          ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
+      { name = "xmlwriter";
+        buildInputs = [ libxml2 ];
+        configureFlags = [ "--enable-xmlwriter" ]
+          # Required to build on darwin.
+          ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
+      { name = "xsl"; buildInputs = [ libxslt libxml2 ]; configureFlags = [ "--with-xsl=${libxslt.dev}" ]; }
+      { name = "zend_test"; }
+      { name = "zip"; buildInputs = [ libzip pcre' ];
+        configureFlags = [ "--with-zip" ]
+          ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-zlib-dir=${zlib.dev}" ]
+          ++ lib.optional (lib.versionOlder php.version "7.3") [ "--with-libzip" ]; }
     ];
 
     # Convert the list of attrs:

From 175f9ef4f88401be74564086bfa5d65cc76a7925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Sat, 14 Mar 2020 22:04:38 +0100
Subject: [PATCH 3086/4636] xfce4-12: remove alias

---
 nixos/doc/manual/release-notes/rl-2003.xml | 8 ++++----
 pkgs/desktops/xfce/core/xfwm4/default.nix  | 2 +-
 pkgs/top-level/aliases.nix                 | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index 31f08d9da341..39338904ee52 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -196,10 +196,10 @@ services.xserver.displayManager.defaultSession = "xfce+icewm";
    </listitem>
    <listitem>
     <para>
-     There is now only one Xfce package-set and module. This means attributes, <literal>xfce4-14</literal>
-     <literal>xfce4-12</literal>, and <literal>xfceUnstable</literal> all now point to the latest Xfce 4.14
-     packages. And in future NixOS releases will be the latest released version of Xfce available at the
-     time during the releases development (if viable).
+     There is now only one Xfce package-set and module. This means that attributes <literal>xfce4-14</literal>
+     and <literal>xfceUnstable</literal> all now point to the latest Xfce 4.14
+     packages. And in the future NixOS releases will be the latest released version of Xfce available at the
+     time of the release's development (if viable).
     </para>
    </listitem>
    <listitem>
diff --git a/pkgs/desktops/xfce/core/xfwm4/default.nix b/pkgs/desktops/xfce/core/xfwm4/default.nix
index 2dff3302617c..ed77699f191e 100644
--- a/pkgs/desktops/xfce/core/xfwm4/default.nix
+++ b/pkgs/desktops/xfce/core/xfwm4/default.nix
@@ -5,7 +5,7 @@
 mkXfceDerivation {
   category = "xfce";
   pname = "xfwm4";
-  version = "4.14.0";
+  version = "4.14.0"; # TODO: remove xfce4-14 alias when this gets bumped
 
   sha256 = "1z5aqij2d8n9wnha88b0qzkvss54jvqs8w1w5m3mzjl4c9mn9n8m";
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 42478f38b84d..667f2f0ca431 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -497,7 +497,7 @@ mapAliases ({
   morituri = whipper; # added 2018-09-13
   xfceUnstable = xfce4-14; # added 2019-09-17
   xfce4-14 = xfce;
-  xfce4-12 = xfce;
+  xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # added 2020-03-14
   x11 = xlibsWrapper; # added 2015-09
   xbmc = kodi; # added 2018-04-25
   xbmcPlain = kodiPlain; # added 2018-04-25

From dece4b99fa8096c90e0caa1dc1d2cccbf1531733 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Mar 2020 09:23:24 +0000
Subject: [PATCH 3087/4636] tautulli: 2.1.44 -> 2.2.0

---
 pkgs/servers/tautulli/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix
index e088c319d406..32102dd48b5a 100644
--- a/pkgs/servers/tautulli/default.nix
+++ b/pkgs/servers/tautulli/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, python }:
 
 stdenv.mkDerivation rec {
-  version = "2.1.44";
+  version = "2.2.0";
   pname = "Tautulli";
 
   pythonPath = [ python.pkgs.setuptools ];
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     owner = "Tautulli";
     repo = pname;
     rev = "v${version}";
-    sha256 = "07nbxz30v8rkvd3xyzc124gv3dpz6bllw6xl6kql0q5gqn05w96s";
+    sha256 = "10ahmgm4pr7lz39qcmgjqzlp435i2dasd6y47zpi1c5fy62jq4is";
   };
 
   buildPhase = ":";
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
 
   meta  = with stdenv.lib; {
     description = "A Python based monitoring and tracking tool for Plex Media Server.";
-    homepage = https://tautulli.com/;
+    homepage = "https://tautulli.com/";
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ csingley ];

From 892827c0ebe68f7bade976018fa10c7f3a4fc00b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 07:32:22 +0000
Subject: [PATCH 3088/4636] lego: 3.3.0 -> 3.4.0

---
 pkgs/tools/admin/lego/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix
index 48daaa418bb4..3a0d9491d157 100644
--- a/pkgs/tools/admin/lego/default.nix
+++ b/pkgs/tools/admin/lego/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "lego";
-  version = "3.3.0";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "go-acme";
     repo = pname;
     rev = "v${version}";
-    sha256 = "135zz5gp5vqqwmz3701n5xfvz9yxzm4m53q3dbj9vfc8xkcxn44n";
+    sha256 = "198nc0rpkxyjms2lvv7g0rzy8cczzs662ncywzmcqsd1qs67zvif";
   };
 
-  modSha256 = "0jirpfd427317px0fd630bmi3li6zc5vihydwmwbj0qsfvhn4qm4";
+  modSha256 = "09w2lsn1zbn750m77084x886k4lx264dgl80d9g7kxjnsqgsmzig";
   subPackages = [ "cmd/lego" ];
 
   buildFlagsArray = [

From fd9a2e7e38e48676fc05d119d2d59166f20851a9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 07:15:49 +0000
Subject: [PATCH 3089/4636] k9s: 0.13.8 -> 0.17.7

---
 pkgs/applications/networking/cluster/k9s/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix
index 40acd423925f..99326a20bfa0 100644
--- a/pkgs/applications/networking/cluster/k9s/default.nix
+++ b/pkgs/applications/networking/cluster/k9s/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "k9s";
-  version = "0.13.8";
+  version = "0.17.7";
   # rev is the release commit, mainly for version command output
   rev = "8fedc42304ce33df314664eb0c4ac73be59065af";
 
@@ -10,7 +10,7 @@ buildGoModule rec {
     owner  = "derailed";
     repo   = "k9s";
     rev    = "v${version}";
-    sha256 = "0xkxvgqzzhz5bhbqwgyw9w238kadqccr1fbvrxjcjr32xlbs56z2";
+    sha256 = "0bqx1ckk89vzmk6fmqmv03cbdvw0agwrqzywzw35b4n0di37x0nv";
   };
 
   buildFlagsArray = ''
@@ -20,11 +20,11 @@ buildGoModule rec {
       -X github.com/derailed/k9s/cmd.commit=${rev}
   '';
 
-  modSha256 = "04k1wfhyignxy84pvq09fxvvk7pxdswbrzxvxc50dz8n8y7wcnjf";
+  modSha256 = "06m4xgl29zx6zpqx630m9cm52wmljms9cvly5f4pqdb4zicq7n86";
 
   meta = with stdenv.lib; {
     description = "Kubernetes CLI To Manage Your Clusters In Style.";
-    homepage = https://github.com/derailed/k9s;
+    homepage = "https://github.com/derailed/k9s";
     license = licenses.asl20;
     maintainers = with maintainers; [ Gonzih ];
   };

From 73d7dbf272b672c31509ad981bfe1435e7ab7739 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 05:31:12 +0000
Subject: [PATCH 3090/4636] fluxctl: 1.17.1 -> 1.18.0

---
 pkgs/applications/networking/cluster/fluxctl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix
index 16472b98fddc..982add3d517f 100644
--- a/pkgs/applications/networking/cluster/fluxctl/default.nix
+++ b/pkgs/applications/networking/cluster/fluxctl/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "fluxctl";
-  version = "1.17.1";
+  version = "1.18.0";
 
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = "flux";
     rev = version;
-    sha256 = "0kp4xk1b8vxajl3cl6any9gmf3412gsahm5fvkyaclnj20yvq807";
+    sha256 = "1sk82cnrj5ngcaml54rhh7ak8dg80r25623c4s8p7ybrj1m7krqj";
   };
 
-  modSha256 = "0fnlnavw4l3425c9nwjkd98xihrgxi9n5yc9yv15j5xzg47qnqav";
+  modSha256 = "0ij5q31a0818nmqsdql1ii6rhq6nb0liplnw509qih8py7dk5xkg";
 
   subPackages = [ "cmd/fluxctl" ];
 

From 380ce1fc4f050eeac728e24f4580e8d5e6fcc91a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= <felix@alternativebit.fr>
Date: Wed, 11 Mar 2020 10:22:57 +0100
Subject: [PATCH 3091/4636] ssb-patchwork: 3.17.5 -> 3.17.6

---
 pkgs/applications/networking/ssb/patchwork/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/pkgs/applications/networking/ssb/patchwork/default.nix
index 2b4618b05b35..c7766889f502 100644
--- a/pkgs/applications/networking/ssb/patchwork/default.nix
+++ b/pkgs/applications/networking/ssb/patchwork/default.nix
@@ -2,12 +2,12 @@
 
 let
   pname = "ssb-patchwork";
-  version = "3.17.5";
+  version = "3.17.6";
   name = "Patchwork-${version}";
 
   src = fetchurl {
     url = "https://github.com/ssbc/patchwork/releases/download/v${version}/${name}.AppImage";
-    sha256 = "0zmi6d9v92icbkln69n50648xbaz6jih5sal1fm5a8kw5is8qg4s";
+    sha256 = "0bq4pi0rmfsyiiapnhkkhikg2a2jzqlna4gvk6gw7wl0r8a111cs";
   };
 
   binary = appimageTools.wrapType2 {

From b58cd1b2e9973fa0490f755ba6caef31457ee6a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Fri, 13 Mar 2020 15:05:41 +0100
Subject: [PATCH 3092/4636] python3Packages.srsly: 1.0.1 -> 1.0.2

---
 pkgs/development/python-modules/srsly/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix
index 42d3da93c90e..028378ad32d6 100644
--- a/pkgs/development/python-modules/srsly/default.nix
+++ b/pkgs/development/python-modules/srsly/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "srsly";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0d49a90gsfyxwp8g14mvvw1kjm77qgx86zg4812kcmlz9ycb80hi";
+    sha256 = "1n0f9kbbz5akpbiqqz4j3p7zqai3zasw8cqai9zj1pv7sn0qn9ar";
   };
 
   propagatedBuildInputs = lib.optional (pythonOlder "3.4") pathlib;

From 8dc3bb0af814d4275680a6241a4a3d2332435a30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Fri, 13 Mar 2020 15:06:22 +0100
Subject: [PATCH 3093/4636] python3Packages.thinc: 7.3.1 -> 7.4.0

Remove old stale propagatedBuildInputs.
---
 .../python-modules/thinc/default.nix          | 48 ++++++++-----------
 1 file changed, 19 insertions(+), 29 deletions(-)

diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix
index c8a6b5efe844..c12a00c011ff 100644
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@@ -4,35 +4,30 @@
 , fetchPypi
 , pythonOlder
 , pytest
-, cython
-, cymem
-, darwin
-, msgpack-numpy
-, msgpack
-, preshed
-, numpy
-, murmurhash
-, pathlib
-, hypothesis
-, tqdm
-, cytoolz
-, plac
-, six
-, mock
-, wrapt
-, dill
 , blis
+, catalogue
+, cymem
+, cython
+, darwin
+, hypothesis
+, mock
+, murmurhash
+, numpy
+, pathlib
+, plac
+, preshed
 , srsly
+, tqdm
 , wasabi
 }:
 
 buildPythonPackage rec {
   pname = "thinc";
-  version = "7.3.1";
+  version = "7.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1f9bg7iyhwnk8jfras8d4wzq0ypn5na0bdbwkl7y2mr06yrdd0ff";
+    sha256 = "1f2qpjb8nfdklqp3vf6m36bklydlnr8y8v207p8d2gmapzhrngjj";
   };
 
   buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
@@ -41,20 +36,15 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
    blis
-   cython
+   catalogue
    cymem
-   msgpack-numpy
-   msgpack
-   preshed
-   numpy
+   cython
    murmurhash
-   tqdm
-   cytoolz
+   numpy
    plac
-   six
+   preshed
    srsly
-   wrapt
-   dill
+   tqdm
    wasabi
   ] ++ lib.optional (pythonOlder "3.4") pathlib;
 

From 80d85b68a37216b1a35d201eeef0e2afb1ee4d19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Fri, 13 Mar 2020 15:40:50 +0100
Subject: [PATCH 3094/4636] python3Packages.spacy: 2.2.3 -> 2.2.4

Changelog:

https://github.com/explosion/spaCy/releases/tag/v2.2.4

Also remove some unused propagatedBuildInputs.
---
 .../python-modules/spacy/default.nix          | 58 ++++++++-----------
 1 file changed, 23 insertions(+), 35 deletions(-)

diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index e35ea517bf13..beee4a186c9e 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -3,57 +3,45 @@
 , fetchPypi
 , pythonOlder
 , pytest
-, preshed
-, ftfy
-, numpy
-, murmurhash
-, plac
-, ujson
-, dill
-, requests
-, thinc
-, regex
-, cymem
-, pathlib
-, msgpack
-, msgpack-numpy
-, jsonschema
 , blis
-, wasabi
-, srsly
 , catalogue
+, cymem
+, jsonschema
+, murmurhash
+, numpy
+, pathlib
+, plac
+, preshed
+, requests
 , setuptools
+, srsly
+, thinc
+, wasabi
 }:
 
 buildPythonPackage rec {
   pname = "spacy";
-  version = "2.2.3";
+  version = "2.2.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0shfjk6nhm6gzp5p88pz5k7bkg5dr3x9yvandkayqb2vsvkwj50x";
+    sha256 = "1fgm1zlw8mjhmk64skxs79ymhcningml13y9c9fy7rj1b1yadwzh";
   };
 
   propagatedBuildInputs = [
-   numpy
-   murmurhash
-   cymem
-   preshed
-   thinc
-   plac
-   ujson
-   dill
-   requests
-   regex
-   ftfy
-   msgpack
-   msgpack-numpy
-   jsonschema
    blis
-   wasabi
-   srsly
    catalogue
+   cymem
+   jsonschema
+   murmurhash
+   numpy
+   plac
+   preshed
+   requests
    setuptools
+   srsly
+   thinc
+   wasabi
   ] ++ lib.optional (pythonOlder "3.4") pathlib;
 
   checkInputs = [

From 2643e4163bf70635b585c22fba1ae17632ccbd34 Mon Sep 17 00:00:00 2001
From: Evan Stoll <evanjsx@gmail.com>
Date: Wed, 11 Mar 2020 14:51:26 -0400
Subject: [PATCH 3095/4636] gitkraken: 6.5.3 -> 6.5.4

---
 pkgs/applications/version-management/gitkraken/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index b14d183705c6..d83c646be208 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -13,11 +13,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "gitkraken";
-  version = "6.5.3";
+  version = "6.5.4";
 
   src = fetchzip {
     url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
-    sha256 = "0pw39cxh6p49h8gxxqfn1a2qf3gpxr5naz2cffd7dz0gwslgia2d";
+    sha256 = "0hrxkhxp6kp82jg1pkcl6vxa5mjpgncx0k353bcnm4986ysizhj4";
   };
 
   dontBuild = true;

From 510419ff5d54217ed53a7efe0fa9532a755c6319 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Thu, 20 Feb 2020 09:16:24 +0100
Subject: [PATCH 3096/4636] pt2-clone: init at 1.06

---
 pkgs/applications/audio/pt2-clone/default.nix | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/audio/pt2-clone/default.nix

diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix
new file mode 100644
index 000000000000..f659d20f463e
--- /dev/null
+++ b/pkgs/applications/audio/pt2-clone/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+, alsaLib
+, SDL2
+}:
+
+stdenv.mkDerivation rec {
+  pname = "pt2-clone";
+  version = "1.06";
+
+  src = fetchFromGitHub {
+    owner = "8bitbubsy";
+    repo = "pt2-clone";
+    rev = "v${version}";
+    sha256 = "00zifwiprd3i60z4pf4471jxbc33vh9p30ib0lnzwpgjz5pnxqnr";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ SDL2 ] ++ stdenv.lib.optional stdenv.isLinux alsaLib;
+
+  meta = with stdenv.lib; {
+    description = "A highly accurate clone of the classic ProTracker 2.3D software for Amiga";
+    homepage = "https://16-bits.org/pt2.php";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ fgaz ];
+    platforms = platforms.all;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b2cdf0a1e33..d99b2a9cf005 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21184,6 +21184,8 @@ in
 
   pstree = callPackage ../applications/misc/pstree { };
 
+  pt2-clone = callPackage ../applications/audio/pt2-clone { };
+
   ptask = callPackage ../applications/misc/ptask { };
 
   pulseaudio-ctl = callPackage ../applications/audio/pulseaudio-ctl { };

From f9e13566cc798983875e8993177d4dff0ffce267 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Thu, 20 Feb 2020 09:37:33 +0100
Subject: [PATCH 3097/4636] ft2-clone: init at 1.09

---
 pkgs/applications/audio/ft2-clone/default.nix | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/audio/ft2-clone/default.nix

diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix
new file mode 100644
index 000000000000..5bebf1c667c3
--- /dev/null
+++ b/pkgs/applications/audio/ft2-clone/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+, alsaLib
+, SDL2
+}:
+
+stdenv.mkDerivation rec {
+  pname = "ft2-clone";
+  version = "1.09";
+
+  src = fetchFromGitHub {
+    owner = "8bitbubsy";
+    repo = "ft2-clone";
+    rev = "v${version}";
+    sha256 = "18my7fywaf66rq8phsly8lglxzpglran8rj27fvwgpni8098ic7d";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ SDL2 ] ++ stdenv.lib.optional stdenv.isLinux alsaLib;
+
+  meta = with stdenv.lib; {
+    description = "A highly accurate clone of the classic Fasttracker II software for MS-DOS";
+    homepage = "https://16-bits.org/ft2.php";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ fgaz ];
+    platforms = platforms.all;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d99b2a9cf005..9e93e1e65b35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19148,6 +19148,8 @@ in
 
   fsv = callPackage ../applications/misc/fsv { };
 
+  ft2-clone = callPackage ../applications/audio/ft2-clone { };
+
   fvwm = callPackage ../applications/window-managers/fvwm { };
 
   ganttproject-bin = callPackage ../applications/misc/ganttproject-bin { };

From 45d01095128f2ed908ec40c87cca6ee09b43ce88 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Wed, 4 Mar 2020 11:59:20 -0500
Subject: [PATCH 3098/4636] python3Packages.threadpoolctl: init at 2.0.0

---
 .../python-modules/threadpoolctl/default.nix  | 38 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/python-modules/threadpoolctl/default.nix

diff --git a/pkgs/development/python-modules/threadpoolctl/default.nix b/pkgs/development/python-modules/threadpoolctl/default.nix
new file mode 100644
index 000000000000..e57b5c3b1567
--- /dev/null
+++ b/pkgs/development/python-modules/threadpoolctl/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, isPy27
+, fetchFromGitHub
+, flit
+, pytest
+, pytestcov
+, numpy
+, scipy
+}:
+
+buildPythonPackage rec {
+  pname = "threadpoolctl";
+  version = "2.0.0";
+
+  disabled = isPy27;
+  format = "flit";
+
+  src = fetchFromGitHub {
+    owner = "joblib";
+    repo = pname;
+    rev = version;
+    sha256 = "16z4n82f004i4l1jw6qrzazda1m6v2yjnpqlp71ipa8mzy9kw7dw";
+  };
+
+  checkInputs = [ pytest pytestcov numpy scipy ];
+
+  checkPhase = "pytest tests -k 'not test_nested_prange_blas'";
+  # cython doesn't get run on the tests when added to nativeBuildInputs, breaking this test
+
+  meta = with lib; {
+    homepage = "https://github.com/joblib/threadpoolctl";
+    description = "Helpers to limit number of threads used in native libraries";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ bcdarwin ];
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7f9f28b45392..e1ea2c9d1e09 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6729,6 +6729,8 @@ in {
 
   threadpool = callPackage ../development/python-modules/threadpool { };
 
+  threadpoolctl = callPackage ../development/python-modules/threadpoolctl { };
+
   rocket-errbot = callPackage ../development/python-modules/rocket-errbot {  };
 
   Yapsy = callPackage ../development/python-modules/yapsy { };

From 61b61ed08765eb6ef8e64281ff38d13345a55687 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Wed, 4 Mar 2020 17:01:18 -0500
Subject: [PATCH 3099/4636] python3Packages.batchgenerators: init at 0.19.7

---
 .../batchgenerators/default.nix               | 38 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/python-modules/batchgenerators/default.nix

diff --git a/pkgs/development/python-modules/batchgenerators/default.nix b/pkgs/development/python-modules/batchgenerators/default.nix
new file mode 100644
index 000000000000..001c3cc19a5e
--- /dev/null
+++ b/pkgs/development/python-modules/batchgenerators/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, isPy27
+, fetchPypi
+, pytest
+, unittest2
+, future
+, numpy
+, scipy
+, scikitlearn
+, scikitimage
+, threadpoolctl
+}:
+
+
+buildPythonPackage rec {
+  pname = "batchgenerators";
+  version = "0.19.7";
+
+  disabled = isPy27;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0qqzwqf5r0q6jh8avz4f9kf8x96crvdnkznhf24pbm0faf8yk67q";
+  };
+
+  propagatedBuildInputs = [ future numpy scipy scikitlearn scikitimage threadpoolctl ];
+  checkInputs = [ pytest unittest2 ];
+
+  checkPhase = "pytest tests";
+
+  meta = {
+    description = "2D and 3D image data augmentation for deep learning";
+    homepage = "https://github.com/MIC-DKFZ/batchgenerators";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ bcdarwin ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e1ea2c9d1e09..7c51a3feedbc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1803,6 +1803,8 @@ in {
 
   base58 = callPackage ../development/python-modules/base58 {};
 
+  batchgenerators = callPackage ../development/python-modules/batchgenerators { };
+
   batinfo = callPackage ../development/python-modules/batinfo {};
 
   bcdoc = callPackage ../development/python-modules/bcdoc {};

From e539eb93f8376193083f69a1dcf55b8b8b9a9d61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Fri, 28 Feb 2020 11:30:50 +0100
Subject: [PATCH 3100/4636] python3Packages.somajo: init at 2.0.4

---
 .../python-modules/somajo/default.nix         | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/python-modules/somajo/default.nix

diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix
new file mode 100644
index 000000000000..f052da2bf7b0
--- /dev/null
+++ b/pkgs/development/python-modules/somajo/default.nix
@@ -0,0 +1,23 @@
+{ pkgs, stdenv, fetchFromGitHub, buildPythonPackage, isPy3k, regex }:
+
+buildPythonPackage rec {
+  pname = "SoMaJo";
+  version = "2.0.4";
+  disabled = !isPy3k;
+
+  src = fetchFromGitHub {
+    owner = "tsproisl";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "126jaslg8cfap2is3sy3v13xpl9drb80yc5lfsm1nw5s2xcxklqw";
+  };
+
+  propagatedBuildInputs = [ regex ];
+
+  meta = with stdenv.lib; {
+    description = "Tokenizer and sentence splitter for German and English web texts";
+    homepage = "https://github.com/tsproisl/SoMaJo";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ danieldk ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7c51a3feedbc..fcb2cf9e4aa6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6938,6 +6938,8 @@ in {
 
   yahooweather = callPackage ../development/python-modules/yahooweather { };
 
+  somajo = callPackage ../development/python-modules/somajo { };
+
   spacy = callPackage ../development/python-modules/spacy { };
 
   spacy_models = callPackage ../development/python-modules/spacy/models.nix { };

From 51fa3d374ac38b1587407764f9317fe85af4a172 Mon Sep 17 00:00:00 2001
From: Benedict Aas <x+g@shou.io>
Date: Wed, 16 Oct 2019 20:58:57 +0100
Subject: [PATCH 3101/4636] obinskit: init at 1.1.1

This is the configuration software for the enthusiast Anne Pro mechanical
keyboard, used to update the firmware, change keyboard settings, clear
Bluetooth connections from the device, set up backlighting colours, and so
forth.
---
 pkgs/applications/misc/obinskit/default.nix | 83 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 85 insertions(+)
 create mode 100644 pkgs/applications/misc/obinskit/default.nix

diff --git a/pkgs/applications/misc/obinskit/default.nix b/pkgs/applications/misc/obinskit/default.nix
new file mode 100644
index 000000000000..ff09500c43a5
--- /dev/null
+++ b/pkgs/applications/misc/obinskit/default.nix
@@ -0,0 +1,83 @@
+{ lib
+, stdenv
+, fetchurl
+, xorg
+, libxkbcommon
+, systemd
+, gcc-unwrapped
+, electron_3
+, wrapGAppsHook
+, makeDesktopItem
+}:
+
+let
+  libPath = lib.makeLibraryPath [
+    libxkbcommon
+    xorg.libXt
+    systemd.lib
+    stdenv.cc.cc.lib
+  ];
+
+  desktopItem = makeDesktopItem rec {
+    name = "Obinskit";
+    exec = "obinskit";
+    icon = "obinskit.png";
+    desktopName = "Obinskit";
+    genericName = "Obinskit keyboard configurator";
+    categories = "Utility";
+  };
+
+in stdenv.mkDerivation rec {
+  pname = "obinskit";
+  version = "1.1.1";
+
+  src = fetchurl {
+    url = "http://releases.obins.net/occ/linux/tar/ObinsKit_${version}_x64.tar.gz";
+    sha256 = "0052m4msslc4k9g3i5vl933cz5q2n1affxhnm433w4apajr8h28h";
+  };
+
+  unpackPhase = "tar -xzf $src";
+
+  sourceRoot = "ObinsKit_${version}_x64";
+
+  nativeBuildInputs = [ wrapGAppsHook ];
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/opt/obinskit
+    install icudtl.dat $out/opt/obinskit/
+    install natives_blob.bin $out/opt/obinskit/
+    install v8_context_snapshot.bin $out/opt/obinskit/
+    install blink_image_resources_200_percent.pak $out/opt/obinskit/
+    install content_resources_200_percent.pak $out/opt/obinskit/
+    install content_shell.pak $out/opt/obinskit/
+    install ui_resources_200_percent.pak $out/opt/obinskit/
+    install views_resources_200_percent.pak $out/opt/obinskit/
+    cp -r resources $out/opt/obinskit/
+    cp -r locales $out/opt/obinskit/
+
+    mkdir -p $out/bin
+    ln -s ${electron_3}/bin/electron $out/bin/obinskit
+
+    mkdir -p $out/share/{applications,pixmaps}
+    install resources/icons/tray-darwin@2x.png $out/share/pixmaps/obinskit.png
+    ln -s ${desktopItem}/share/applications/* $out/share/applications
+  '';
+
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --add-flags $out/opt/obinskit/resources/app.asar
+      --prefix LD_LIBRARY_PATH : "${libPath}"
+    )
+  '';
+
+  meta = with lib; {
+    description = "Graphical configurator for Anne Pro and Anne Pro II keyboards";
+    homepage = "http://en.obins.net/obinskit/";
+    license = licenses.unfree;
+    maintainers = [ maintainers.shou ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e93e1e65b35..79fe6d381248 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2058,6 +2058,8 @@ in
 
   optar = callPackage ../tools/graphics/optar {};
 
+  obinskit = callPackage ../applications/misc/obinskit {};
+
   pastel = callPackage ../applications/misc/pastel {
     inherit (darwin.apple_sdk.frameworks) Security;
   };

From d7ef824b7bb3fbdc9751cb7db22fe22681bc77bc Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Wed, 27 Nov 2019 18:51:33 +0200
Subject: [PATCH 3102/4636] pythonPackages.sphinxcontrib-fulltoc: init at 1.2.0

---
 .../sphinxcontrib-fulltoc/default.nix         | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix

diff --git a/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix b/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix
new file mode 100644
index 000000000000..57535c6f137c
--- /dev/null
+++ b/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix
@@ -0,0 +1,30 @@
+{ lib, buildPythonPackage, fetchPypi, pythonOlder, sphinx, pbr }:
+
+buildPythonPackage rec {
+  pname = "sphinxcontrib-fulltoc";
+  version = "1.2.0";
+
+  # pkgutil namespaces are broken in nixpkgs (because they can't scan multiple
+  # directories). But python2 is EOL, so not supporting it, should be ok.
+  disabled = pythonOlder "3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1nbwflv9szyh37yr075xhck8b4gg2c7g3sa38mfi7wv7qhpxcif8";
+  };
+
+  nativeBuildInputs = [ pbr ];
+  propagatedBuildInputs = [ sphinx ];
+
+  # There are no unit tests
+  doCheck = false;
+  # Ensure package importing works
+  pythonImportsCheck = [ "sphinxcontrib.fulltoc" ];
+
+  meta = with lib; {
+    description = "Include a full table of contents in your Sphinx HTML sidebar";
+    homepage = "https://sphinxcontrib-fulltoc.readthedocs.org/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fcb2cf9e4aa6..6d2d72aad3b5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5647,6 +5647,8 @@ in {
 
   sphinxcontrib-devhelp = callPackage ../development/python-modules/sphinxcontrib-devhelp {};
 
+  sphinxcontrib-fulltoc = callPackage ../development/python-modules/sphinxcontrib-fulltoc { };
+
   sphinxcontrib-htmlhelp = callPackage ../development/python-modules/sphinxcontrib-htmlhelp {};
 
   sphinxcontrib-jsmath = callPackage ../development/python-modules/sphinxcontrib-jsmath {};

From 24219f69a3671f58795e58c49415e5de73d43470 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Wed, 27 Nov 2019 18:44:20 +0200
Subject: [PATCH 3103/4636] pythonPackages.sphinxcontrib-katex: init at 0.5.1

---
 .../sphinxcontrib-katex/default.nix           | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/sphinxcontrib-katex/default.nix

diff --git a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix
new file mode 100644
index 000000000000..2c3aed60b59f
--- /dev/null
+++ b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildPythonPackage, fetchPypi, pythonOlder, sphinx }:
+
+buildPythonPackage rec {
+  pname = "sphinxcontrib-katex";
+  version = "0.5.1";
+
+  # pkgutil namespaces are broken in nixpkgs (because they can't scan multiple
+  # directories). But python2 is EOL, so not supporting it should be ok.
+  disabled = pythonOlder "3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0qssq2qc12rnwb6yhw3xj69cwij3jp3sqzwb6n85qp36g4vxrkb6";
+  };
+
+  propagatedBuildInputs = [ sphinx ];
+
+  # There are no unit tests
+  doCheck = false;
+  pythonImportsCheck = [ "sphinxcontrib.katex" ];
+
+  meta = with lib; {
+    description = "Sphinx extension using KaTeX to render math in HTML";
+    homepage = "https://github.com/hagenw/sphinxcontrib-katex";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6d2d72aad3b5..7bfd27ea3e40 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5653,6 +5653,8 @@ in {
 
   sphinxcontrib-jsmath = callPackage ../development/python-modules/sphinxcontrib-jsmath {};
 
+  sphinxcontrib-katex = callPackage ../development/python-modules/sphinxcontrib-katex { };
+
   sphinxcontrib-qthelp = callPackage ../development/python-modules/sphinxcontrib-qthelp {};
 
   sphinxcontrib-serializinghtml = callPackage ../development/python-modules/sphinxcontrib-serializinghtml {};

From 27d0c5a07eabd4fa6dde8844bb50e2c6dc162254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Tue, 25 Feb 2020 16:06:24 +0100
Subject: [PATCH 3104/4636] sentencepiece: split into multiple outputs,
 optional gperftools

I am using sentencepiece in a downstream application where I want to
minimize the resulting closures. This commit makes changes to make
sentencepiece a leaner dependency:

- Split the outputs, so that the binaries/headers do not end up in the
  transitive closure in a library dependency.

- Add the `withGPerfTools` option, which is enabled by default, to
  make it possible to disable the gperftools dependency. According to
  the sentencepiece README, this dependency gives a 10-40% performance
  improvement. But in many cases this is overshadowed by the neural
  networks that use piece identifiers as input anyway.
---
 pkgs/development/libraries/sentencepiece/default.nix     | 9 ++++++---
 .../development/python-modules/sentencepiece/default.nix | 7 +++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/development/libraries/sentencepiece/default.nix
index 05c641fab891..f825de549121 100644
--- a/pkgs/development/libraries/sentencepiece/default.nix
+++ b/pkgs/development/libraries/sentencepiece/default.nix
@@ -1,9 +1,10 @@
-{ config
+{ lib
 , fetchFromGitHub
 , stdenv
-, lib
 , cmake
 , gperftools
+
+, withGPerfTools ? true
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +18,9 @@ stdenv.mkDerivation rec {
     sha256 = "1ncvyw9ar0z7nd47cysxg5xrjm01y1shdlhp8l2pdpx059p3yx3w";
   };
 
-  nativeBuildInputs = [ cmake gperftools ];
+  nativeBuildInputs = [ cmake ] ++ lib.optional withGPerfTools gperftools;
+
+  outputs = [ "bin" "dev" "out" ];
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/google/sentencepiece";
diff --git a/pkgs/development/python-modules/sentencepiece/default.nix b/pkgs/development/python-modules/sentencepiece/default.nix
index ab7a5387c024..430e61399b2f 100644
--- a/pkgs/development/python-modules/sentencepiece/default.nix
+++ b/pkgs/development/python-modules/sentencepiece/default.nix
@@ -6,10 +6,13 @@
 
 buildPythonPackage rec {
   pname = "sentencepiece";
-  inherit (sentencepiece) version src meta;
+  inherit (sentencepiece) version src;
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ sentencepiece ];
+  buildInputs = [ sentencepiece.dev ];
 
   sourceRoot = "source/python";
+
+  # sentencepiece installs 'bin' output.
+  meta = builtins.removeAttrs sentencepiece.meta [ "outputsToInstall" ];
 }

From 7b3802dfd11bac3b107702bda0b81be5f12ca396 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Mon, 9 Mar 2020 12:55:48 +0100
Subject: [PATCH 3105/4636] sentencepiece: add myself as a maintainer

---
 pkgs/development/libraries/sentencepiece/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/development/libraries/sentencepiece/default.nix
index f825de549121..1c74ced309df 100644
--- a/pkgs/development/libraries/sentencepiece/default.nix
+++ b/pkgs/development/libraries/sentencepiece/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     description = "Unsupervised text tokenizer for Neural Network-based text generation";
     license = licenses.asl20;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ pashashocky ];
+    maintainers = with maintainers; [ danieldk pashashocky ];
   };
 }

From 1e5a151ac5b1c832d131b7be30cee78fa3039553 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Sat, 14 Mar 2020 21:24:46 +0100
Subject: [PATCH 3106/4636] cargo-udeps: 0.1.9 -> 0.1.10

---
 pkgs/development/tools/rust/cargo-udeps/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix
index d78274543d10..ca347ca22dee 100644
--- a/pkgs/development/tools/rust/cargo-udeps/default.nix
+++ b/pkgs/development/tools/rust/cargo-udeps/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-udeps";
-  version = "0.1.9";
+  version = "0.1.10";
 
   src = fetchFromGitHub {
     owner = "est31";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0rs8qsnv7j6car3h2dq9hc6bd13bcs31gm3haikyd16ciywldrps";
+    sha256 = "1xmlpn4j5lhbzd9icb3nga5irfknmxfml9sn677d9z6fwfjfpa0l";
   };
 
-  cargoSha256 = "181vvng5lm8rch2zs6lbxbrqr814dzaqb58k80znmz2bn8bnvq1l";
+  cargoSha256 = "1si95pdhbi6pa94gh9vip95n37im6kcfsgslpnibck2157pg4la6";
 
   nativeBuildInputs = [ pkgconfig ];
 

From 8e868a44d56fbd2999f1b7b4c19327edbc03ed57 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 21:49:48 +0000
Subject: [PATCH 3107/4636] fio: 3.18 -> 3.19

---
 pkgs/tools/system/fio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index 5ebe8fab889c..3cf9e9763983 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fio";
-  version = "3.18";
+  version = "3.19";
 
   src = fetchFromGitHub {
     owner  = "axboe";
     repo   = "fio";
     rev    = "fio-${version}";
-    sha256 = "0p2w1pyjh7vjxqxibjawi7waqb7n0lwnx21qj0z75g8zhb629l0w";
+    sha256 = "1gr62mzv5rk6mbhll2c0fxgb46anx375cm2ym10mj2rvabcrhnqq";
   };
 
   buildInputs = [ python zlib ]

From 68db99ad97afa8eb392ddfaac1f905b63eb65dbe Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sat, 14 Mar 2020 16:59:46 -0400
Subject: [PATCH 3108/4636] snakemake: 5.9.1 -> 5.10.0

---
 pkgs/applications/science/misc/snakemake/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix
index c82a89e739ce..27bf47e890a9 100644
--- a/pkgs/applications/science/misc/snakemake/default.nix
+++ b/pkgs/applications/science/misc/snakemake/default.nix
@@ -2,7 +2,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "snakemake";
-  version = "5.9.1";
+  version = "5.10.0";
 
   propagatedBuildInputs = with python3Packages; [
     appdirs
@@ -11,16 +11,18 @@ python3Packages.buildPythonApplication rec {
     docutils
     GitPython
     jsonschema
+    nbformat
     psutil
     pyyaml
     ratelimiter
     requests
+    toposort
     wrapt
   ];
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "0s3y5pz9vqxpj5bx8y7ymh3zmsiyrk7sp8zwqwpva3mli7ky81pz";
+    sha256 = "0n8d5c8sc90kfdw740ad9ffbkg1ic3k1pmlnk68qr4w4vc98pym3";
   };
 
   doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json
@@ -36,6 +38,6 @@ python3Packages.buildPythonApplication rec {
       workflows are essentially Python scripts extended by declarative code to define
       rules. Rules describe how to create output files from input files.
     '';
-    maintainers = with maintainers; [ helkafen renatoGarcia ];
+    maintainers = with maintainers; [ helkafen renatoGarcia veprbl ];
   };
 }

From e789990fb6b457f35c785890e52d1220efaafd11 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sat, 14 Mar 2020 17:00:10 +0100
Subject: [PATCH 3109/4636] python.pkgs.gitdb: 0.6.4 -> 4.0.2

---
 pkgs/development/python-modules/gitdb/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/gitdb/default.nix b/pkgs/development/python-modules/gitdb/default.nix
index ceca6e3719b4..880fc543fb68 100644
--- a/pkgs/development/python-modules/gitdb/default.nix
+++ b/pkgs/development/python-modules/gitdb/default.nix
@@ -1,12 +1,18 @@
-{ lib, buildPythonPackage, fetchPypi, smmap }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, smmap
+, isPy3k
+}:
 
 buildPythonPackage rec {
   pname = "gitdb";
-  version = "0.6.4";
+  version = "4.0.2";
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0n4n2c7rxph9vs2l6xlafyda5x1mdr8xy16r9s3jwnh3pqkvrsx3";
+    sha256 = "0l113fphn6msjl3cl3kyf332b6lal7daxdd0nfma0x9ipfb013jr";
   };
 
   propagatedBuildInputs = [ smmap ];

From 6db65f8d0263112d31f9d69be327ae123d3b43b2 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sat, 14 Mar 2020 17:00:41 +0100
Subject: [PATCH 3110/4636] python.pkgs.gitdb2: remove

The two are now the same:
https://github.com/gitpython-developers/gitdb/issues/59
---
 .../python-modules/GitPython/default.nix      |  4 ++--
 .../python-modules/gitdb2/default.nix         | 23 -------------------
 pkgs/top-level/python-packages.nix            |  2 +-
 3 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/development/python-modules/gitdb2/default.nix

diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix
index be2526ffcd43..59ceeaf90638 100644
--- a/pkgs/development/python-modules/GitPython/default.nix
+++ b/pkgs/development/python-modules/GitPython/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb2, mock, nose, ddt }:
+{ lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb, mock, nose, ddt }:
 
 buildPythonPackage rec {
   version = "3.0.5";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [ nose ] ++ lib.optional isPy27 mock;
-  propagatedBuildInputs = [ gitdb2 ddt ];
+  propagatedBuildInputs = [ gitdb ddt ];
 
   # Tests require a git repo
   doCheck = false;
diff --git a/pkgs/development/python-modules/gitdb2/default.nix b/pkgs/development/python-modules/gitdb2/default.nix
deleted file mode 100644
index ff4cc913f034..000000000000
--- a/pkgs/development/python-modules/gitdb2/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi, smmap2 }:
-
-buildPythonPackage rec {
-  pname = "gitdb2";
-  version = "2.0.6";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1b6df1433567a51a4a9c1a5a0de977aa351a405cc56d7d35f3388bad1f630350";
-  };
-
-  propagatedBuildInputs = [ smmap2 ];
-
-  # Bunch of tests fail because they need an actual git repo
-  doCheck = false;
-
-  meta = {
-    description = "Git Object Database";
-    maintainers = [ ];
-    homepage = https://github.com/gitpython-developers/gitdb;
-    license = lib.licenses.bsd3;
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7bfd27ea3e40..15b45c7bffe8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2770,7 +2770,7 @@ in {
 
   gitdb = callPackage ../development/python-modules/gitdb { };
 
-  gitdb2 = callPackage ../development/python-modules/gitdb2 { };
+  gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14
 
   GitPython = callPackage ../development/python-modules/GitPython { };
 

From 8eacb87061902624caf97d63d75d523471c5942c Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sat, 14 Mar 2020 17:02:40 +0100
Subject: [PATCH 3111/4636] python.pkgs.GitPython: 3.0.5 -> 3.1.0

---
 pkgs/development/python-modules/GitPython/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix
index 59ceeaf90638..0487b2045811 100644
--- a/pkgs/development/python-modules/GitPython/default.nix
+++ b/pkgs/development/python-modules/GitPython/default.nix
@@ -1,13 +1,13 @@
 { lib, buildPythonPackage, fetchPypi, isPy27, substituteAll, git, gitdb, mock, nose, ddt }:
 
 buildPythonPackage rec {
-  version = "3.0.5";
+  version = "3.1.0";
   pname = "GitPython";
   disabled = isPy27; # no longer supported
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9c2398ffc3dcb3c40b27324b316f08a4f93ad646d5a6328cafbb871aa79f5e42";
+    sha256 = "1jzllsy9lwc9yibccgv7h9naxisazx2n3zmpy21c8n5xhysw69p4";
   };
 
   patches = [

From 6c0fa331f0699953c2c83e50dcfd5e66c670babd Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sat, 14 Mar 2020 17:21:15 +0100
Subject: [PATCH 3112/4636] python.pkgs.smmap2: remove

They were recently merged back together and smmap is the canonical
version:

https://github.com/gitpython-developers/smmap/issues/44
---
 .../python-modules/smmap2/default.nix         | 20 -------------------
 pkgs/top-level/python-packages.nix            |  2 +-
 2 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 pkgs/development/python-modules/smmap2/default.nix

diff --git a/pkgs/development/python-modules/smmap2/default.nix b/pkgs/development/python-modules/smmap2/default.nix
deleted file mode 100644
index cf0b76d1a87b..000000000000
--- a/pkgs/development/python-modules/smmap2/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ lib, fetchPypi, buildPythonPackage, nosexcover }:
-
-buildPythonPackage rec {
-  pname = "smmap2";
-  version = "2.0.5";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "29a9ffa0497e7f2be94ca0ed1ca1aa3cd4cf25a1f6b4f5f87f74b46ed91d609a";
-  };
-
-  checkInputs = [ nosexcover ];
-
-  meta = {
-    description = "A pure python implementation of a sliding window memory map manager";
-    homepage = https://pypi.org/project/smmap2;
-    maintainers = [ ];
-    license = lib.licenses.bsd3;
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 15b45c7bffe8..0773a1984ab5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5754,7 +5754,7 @@ in {
 
   smmap = callPackage ../development/python-modules/smmap { };
 
-  smmap2 = callPackage ../development/python-modules/smmap2 { };
+  smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14
 
   transaction = callPackage ../development/python-modules/transaction { };
 

From 6f3e387b0c99f77735a038e4c8a2c0483e1011eb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 16:19:06 +0000
Subject: [PATCH 3113/4636] archiver: 3.2.0 -> 3.3.0

---
 pkgs/applications/misc/archiver/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/applications/misc/archiver/default.nix
index 03f534e1a4da..64b592b78714 100644
--- a/pkgs/applications/misc/archiver/default.nix
+++ b/pkgs/applications/misc/archiver/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "archiver";
-  version = "3.2.0";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "mholt";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1kq2cyhbniwdabk426j493cs8d4nj35vmznm9031rrdd9ln5h9gl";
+    sha256 = "1yr2jhidqvbwh1y08lpqaidwpr5yx3bhvznm5fc9pk64s7z5kq3h";
   };
 
-  modSha256 = "13vwgqpw7ypq6mrvwmnl8n38x0h89ymryrrzkf7ya478fp00vclj";
+  modSha256 = "1mrfqhd0zb78rlqlj2ncb0srwjfl7rzhy2p9mwa82pgysvlp08gv";
 
   meta = with lib; {
     description = "Easily create & extract archives, and compress & decompress files of various formats";

From 626d6b5d082d3feb4defd94af43deed7be53197e Mon Sep 17 00:00:00 2001
From: Andrei Lapshin <alapshin@fastmail.com>
Date: Sat, 14 Mar 2020 19:14:26 +0300
Subject: [PATCH 3114/4636] androidStudioPackages.beta: 4.0.0.10 -> 4.0.0.11

---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index bc9944932920..8354a04b2c58 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,9 +13,9 @@ let
     sha256Hash = "1mwzk18224bl8hbw9cdxwzgj5cfain4y70q64cpj4p0snffxqm77";
   };
   betaVersion = {
-    version = "4.0.0.10"; # "Android Studio 4.0 Beta 1"
-    build = "193.6220182";
-    sha256Hash = "0ibp54wcss4ihm454hbavv1bhar6cd4alp5b0z248ryjr5w9mixf";
+    version = "4.0.0.11"; # "Android Studio 4.0 Beta 2"
+    build = "193.6254973";
+    sha256Hash = "0i4n5kxnfxnz3y44ba0x2j8nkmss4gchrzcdnb9wf6xc1jqrjwcm";
   };
   latestVersion = { # canary & dev
     version = "4.1.0.2"; # "Android Studio 4.1 Canary 2"

From c6dd8929d6902d921afe99077896a76f1c3292a0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 19:37:56 +0000
Subject: [PATCH 3115/4636] eksctl: 0.13.0 -> 0.15.0

---
 pkgs/tools/admin/eksctl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix
index 89c8e2866e49..4c01383f8986 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/pkgs/tools/admin/eksctl/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "eksctl";
-  version = "0.13.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = pname;
     rev = version;
-    sha256 = "13kxilsy0fdzg1phzcsxfg53flzx3xk6c5jyygggajp45aysbyra";
+    sha256 = "1193i30k2m7cibn79xw51i2lxg90f5i97h8sbjiv0hr9g502r2qf";
   };
 
-  modSha256 = "0g5alqhwna9sd6dp50waqa87af2z3n5pj5mwnb9i2y65g2kclaha";
+  modSha256 = "0f8dlcp3q84fa5dnnzx4347ngb1raw1mxkcqpz2s3zq6d1kv0nvf";
 
   subPackages = [ "cmd/eksctl" ];
 

From 41742c85ec108ce9c89a315d16e6494bc3885542 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 19:05:40 +0000
Subject: [PATCH 3116/4636] clash: 0.17.1 -> 0.18.0

---
 pkgs/tools/networking/clash/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix
index f3d0a584593b..234fd0b31afa 100644
--- a/pkgs/tools/networking/clash/default.nix
+++ b/pkgs/tools/networking/clash/default.nix
@@ -2,17 +2,17 @@
 
 buildGoModule rec {
   pname = "clash";
-  version = "0.17.1";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "Dreamacro";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0zhbaw9jzl9wqc7yx8yxqlb6fwkss4pqkv26069qg6nsk584ndnf";
+    sha256 = "150zpjchldm1632z6gkydgqhx2a612lpwf5lqngd2if99nas54kk";
   };
 
   goPackagePath = "github.com/Dreamacro/clash";
-  modSha256 = "0vyd61bin7hmpdqrmrikc776mgif9v25627n8hzi65kiycv40kgx";
+  modSha256 = "02bki2iq99lc9iq1mjf9rbxwspalrj7hjlk1h384w3d4s4x4fyxy";
 
   buildFlagsArray = [
     "-ldflags="

From f5951f520c6b832be55917d8a69b9126c7e28f5b Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 14 Mar 2020 19:37:30 -0400
Subject: [PATCH 3117/4636] nixos/ssh: silence ssh-keygen during configuration
 validation

---
 nixos/modules/services/networking/ssh/sshd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 2069ec178aa6..f5b7741a5cf5 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -17,7 +17,7 @@ let
     ${cfg.extraConfig}
     EOL
 
-    ssh-keygen -f mock-hostkey -N ""
+    ssh-keygen -q -f mock-hostkey -N ""
     sshd -t -f $out -h mock-hostkey
   '';
 

From f383fa344ee4067a1bcbe1f6db4eb21c89fc6ca4 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 14 Mar 2020 19:50:11 -0400
Subject: [PATCH 3118/4636] nixos/sshd: only include AuthorizedKeysCommand and
 AuthorizedKeysCommandUser options if explicitly set

---
 nixos/modules/services/networking/ssh/sshd.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 2069ec178aa6..0664b5540d94 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -505,8 +505,10 @@ in
         PrintMotd no # handled by pam_motd
 
         AuthorizedKeysFile ${toString cfg.authorizedKeysFiles}
-        AuthorizedKeysCommand ${cfg.authorizedKeysCommand}
-        AuthorizedKeysCommandUser ${cfg.authorizedKeysCommandUser}
+        ${optionalString (cfg.authorizedKeysCommand != "none") ''
+          AuthorizedKeysCommand ${cfg.authorizedKeysCommand}
+          AuthorizedKeysCommandUser ${cfg.authorizedKeysCommandUser}
+        ''}
 
         ${flip concatMapStrings cfg.hostKeys (k: ''
           HostKey ${k.path}

From 49e769d6589d084642d1e7f3a1a3320c60737ba4 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 13 Mar 2020 19:49:38 -0400
Subject: [PATCH 3119/4636] opentx: 2.2.1 -> 2.3.5, fix build

---
 pkgs/applications/misc/opentx/default.nix | 45 ++++++++---------------
 pkgs/top-level/all-packages.nix           |  5 +--
 2 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix
index 370f88d7b479..53d6e398cf0d 100644
--- a/pkgs/applications/misc/opentx/default.nix
+++ b/pkgs/applications/misc/opentx/default.nix
@@ -1,50 +1,38 @@
-{ stdenv, fetchFromGitHub
-, cmake, gcc-arm-embedded, binutils-arm-embedded, python
-, qt5, SDL, gtest
+{ stdenv, mkDerivation, fetchFromGitHub
+, cmake, gcc-arm-embedded, python3Packages
+, qtbase, qtmultimedia, qttranslations, SDL, gtest
 , dfu-util, avrdude
 }:
 
-let
-
-  version = "2.2.1";
-
-in stdenv.mkDerivation {
-
+mkDerivation rec {
   pname = "opentx";
-  inherit version;
+  version = "2.3.5";
 
   src = fetchFromGitHub {
     owner = "opentx";
     repo = "opentx";
     rev = version;
-    sha256 = "01lnnkrxach21aivnx1k1iqhih02nixh8c4nk6rpw408p13him9g";
+    sha256 = "18iv3c74y9fpp1045s2l7l2dqfn9riyagrwmfwp2mmf2ccsrwz2g";
   };
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [
-    cmake
-    gcc-arm-embedded binutils-arm-embedded
-  ];
+  nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ];
 
-  buildInputs = with qt5; [
-    python python.pkgs.pyqt4
-    qtbase qtmultimedia qttranslations
-    SDL
-  ];
+  buildInputs = [ qtbase qtmultimedia qttranslations SDL ];
 
   postPatch = ''
-    sed -i companion/src/burnconfigdialog.cpp -e 's|/usr/.*bin/dfu-util|${dfu-util}/bin/dfu-util|'
-    sed -i companion/src/burnconfigdialog.cpp -e 's|/usr/.*bin/avrdude|${avrdude}/bin/avrdude|'
+    sed -i companion/src/burnconfigdialog.cpp \
+      -e 's|/usr/.*bin/dfu-util|${dfu-util}/bin/dfu-util|' \
+      -e 's|/usr/.*bin/avrdude|${avrdude}/bin/avrdude|'
   '';
 
   cmakeFlags = [
     "-DGTEST_ROOT=${gtest.src}/googletest"
-    "-DQT_TRANSLATIONS_DIR=${qt5.qttranslations}/translations"
+    "-DQT_TRANSLATIONS_DIR=${qttranslations}/translations"
     # XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed.
     #"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util"
     #"-DAVRDUDE_PATH=${avrdude}/bin/avrdude"
-    "-DNANO=NO"
   ];
 
   meta = with stdenv.lib; {
@@ -54,11 +42,10 @@ in stdenv.mkDerivation {
       firmware to the radio, backing up model settings, editing settings and
       running radio simulators.
     '';
-    homepage = https://open-tx.org/;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = [ "i686-linux" "x86_64-linux" ];
-    maintainers = with maintainers; [ elitak ];
-    broken = true;
+    homepage = "https://www.open-tx.org/";
+    license = licenses.gpl2;
+    platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
+    maintainers = with maintainers; [ elitak lopsided98 ];
   };
 
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57830fcea6f4..b51e77a16b06 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20930,10 +20930,7 @@ in
 
   opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {};
 
-  opentx = callPackage ../applications/misc/opentx {
-    gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc;
-    binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
-  };
+  opentx = libsForQt5.callPackage ../applications/misc/opentx { };
 
   opera = callPackage ../applications/networking/browsers/opera {};
 

From ca84a48d7d1144e55bfb4611779e319f3ecc2b1b Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 21:19:24 -0400
Subject: [PATCH 3120/4636] ledger: remove old version 2.6.3

Version 2.6.3 was released > 5 years ago and has been marked as broken for some
time. It is time to remove it.

This also documents why ledger3 cannot yet build with boost >= 1.67
---
 pkgs/applications/office/ledger/2.6.3.nix | 41 -----------------------
 pkgs/top-level/all-packages.nix           |  7 ++--
 2 files changed, 4 insertions(+), 44 deletions(-)
 delete mode 100644 pkgs/applications/office/ledger/2.6.3.nix

diff --git a/pkgs/applications/office/ledger/2.6.3.nix b/pkgs/applications/office/ledger/2.6.3.nix
deleted file mode 100644
index 60fff1d0131b..000000000000
--- a/pkgs/applications/office/ledger/2.6.3.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, emacs, gmp, pcre, expat }:
-
-stdenv.mkDerivation rec {
-  name = "ledger2-2.6.3";
-
-  src = fetchurl {
-    url = "https://github.com/downloads/ledger/ledger/${name}.tar.gz";
-    sha256 = "05zpnypcwgck7lwk00pbdlcwa347xsqifxh4zsbbn01m98bx1v5k";
-  };
-
-  buildInputs = [ emacs gmp pcre expat ];
-
-  configureFlags = [
-    "CPPFLAGS=-DNDEBUG"
-    "CFLAGS=-O3"
-    "CXXFLAGS=-O3"
-  ];
-
-  doCheck = true;
-
-  # Patchelf breaks the hard-coded rpath to ledger's libamounts.0.so and
-  # libledger-2.6.3.so. Fortunately, libtool chooses proper rpaths to
-  # begin with, so we can just disable patchelf to avoid the issue.
-  dontPatchELF = true;
-
-  meta = {
-    homepage = https://ledger-cli.org/;
-    description = "A double-entry accounting system with a command-line reporting interface";
-    license = "BSD";
-
-    longDescription = ''
-      Ledger is a powerful, double-entry accounting system that is accessed
-      from the UNIX command-line. This may put off some users, as there is
-      no flashy UI, but for those who want unparalleled reporting access to
-      their data, there really is no alternative.
-    '';
-
-    platforms = stdenv.lib.platforms.all;
-    broken = true; # https://hydra.nixos.org/build/59124559/nixlog/1
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79fe6d381248..583482ad8b74 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20228,11 +20228,12 @@ in
 
   linuxband = callPackage ../applications/audio/linuxband { };
 
-  ledger2 = callPackage ../applications/office/ledger/2.6.3.nix { };
-  ledger3 = callPackage ../applications/office/ledger {
+  ledger = callPackage ../applications/office/ledger {
+    # Boost >= 1.67 changed the name of boost python; ledger's cmake build needs
+    # an update to find it:
+    # https://www.boost.org/doc/libs/1_68_0/libs/python/doc/html/rn.html
     boost = boost15x;
   };
-  ledger = ledger3;
 
   ledger-autosync = callPackage  ../applications/office/ledger-autosync { };
 

From 12858367563aa42a2198ef610d8f4d7e3d1ac87b Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 14 Mar 2020 17:48:04 -0400
Subject: [PATCH 3121/4636] rdedup: fix broken build

In the Rust platform builder, the attribute `cargoPatches` must be used if we
want to consistently apply a patch to the `Cargo.lock` in the vendored
`cargoDeps` and to the `Cargo.lock` in the `src` attribute.

This fixes the build by applying that patch consistently, so the coherency
checker in the newer Rust cargo builder passes.
---
 pkgs/tools/backup/rdedup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix
index b3cf971970a5..1ed5bfd9ef87 100644
--- a/pkgs/tools/backup/rdedup/default.nix
+++ b/pkgs/tools/backup/rdedup/default.nix
@@ -13,9 +13,9 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0y34a3mpghdmcb2rx4z62q0s351bfmy1287d75mm07ryfgglgsd7";
   };
 
-  cargoSha256 = "1zvg68ilgpnd95b36jvna9h1jr5d72x1a0g6flw2x6sd0msc0mdw";
+  cargoSha256 = "0akwb7ak4h1i1zk4wcn27zyqjz6mrchs47014xbzw22rj8h8dx92";
 
-  patches = [
+  cargoPatches = [
     ./v3.1.1-fix-Cargo.lock.patch
   ];
 

From 931dd07712cb19d4e40abe722f98d2c80ef216fe Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sat, 14 Mar 2020 17:54:45 +0100
Subject: [PATCH 3122/4636] ffmpeg-normalize: init at 1.15.7

---
 .../video/ffmpeg-normalize/default.nix        | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/applications/video/ffmpeg-normalize/default.nix

diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix
new file mode 100644
index 000000000000..d992e42ebffd
--- /dev/null
+++ b/pkgs/applications/video/ffmpeg-normalize/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildPythonApplication
+, fetchPypi
+, ffmpeg
+, tqdm
+}:
+
+buildPythonApplication rec {
+  pname = "ffmpeg-normalize";
+  version = "1.15.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0161939f864e973b11d50170c657baf3e1433147f46c74a74ed5025a822e9a2d";
+  };
+
+  propagatedBuildInputs = [ ffmpeg tqdm ];
+
+  checkPhase = ''
+    $out/bin/ffmpeg-normalize --help > /dev/null
+  '';
+
+  meta = with lib; {
+    description = "Normalize audio via ffmpeg";
+    homepage = "https://github.com/slhck/ffmpeg-normalize";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ prusnak ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 583482ad8b74..e2bc8a135ebb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11446,6 +11446,8 @@ in
 
   ffmpeg-sixel = callPackage ../development/libraries/ffmpeg-sixel { };
 
+  ffmpeg-normalize = python3Packages.callPackage ../applications/video/ffmpeg-normalize { };
+
   ffms = callPackage ../development/libraries/ffms { };
 
   fftw = callPackage ../development/libraries/fftw { };

From 629d3bab18f1369fc9b535dde98bf920eff4b30b Mon Sep 17 00:00:00 2001
From: Harry Ying <lexugeyky@outlook.com>
Date: Sun, 15 Mar 2020 08:53:20 +0800
Subject: [PATCH 3123/4636] nixos/smartdns: init first generation config

---
 nixos/modules/module-list.nix                 |  1 +
 .../modules/services/networking/smartdns.nix  | 61 +++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 nixos/modules/services/networking/smartdns.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6734929b9d4e..afa9d9cc8019 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -706,6 +706,7 @@
   ./services/networking/shorewall6.nix
   ./services/networking/shout.nix
   ./services/networking/sniproxy.nix
+  ./services/networking/smartdns.nix
   ./services/networking/smokeping.nix
   ./services/networking/softether.nix
   ./services/networking/spacecookie.nix
diff --git a/nixos/modules/services/networking/smartdns.nix b/nixos/modules/services/networking/smartdns.nix
new file mode 100644
index 000000000000..f1888af70416
--- /dev/null
+++ b/nixos/modules/services/networking/smartdns.nix
@@ -0,0 +1,61 @@
+{ lib, pkgs, config, ... }:
+
+with lib;
+
+let
+  inherit (lib.types) attrsOf coercedTo listOf oneOf str int bool;
+  cfg = config.services.smartdns;
+
+  confFile = pkgs.writeText "smartdns.conf" (with generators;
+    toKeyValue {
+      mkKeyValue = mkKeyValueDefault {
+        mkValueString = v:
+          if isBool v then
+            if v then "yes" else "no"
+          else
+            mkValueStringDefault { } v;
+      } " ";
+      listsAsDuplicateKeys =
+        true; # Allowing duplications because we need to deal with multiple entries with the same key.
+    } cfg.settings);
+in {
+  options.services.smartdns = {
+    enable = mkEnableOption "SmartDNS DNS server";
+
+    bindPort = mkOption {
+      type = types.port;
+      default = 53;
+      description = "DNS listening port number.";
+    };
+
+    settings = mkOption {
+      type =
+      let atom = oneOf [ str int bool ];
+      in attrsOf (coercedTo atom toList (listOf atom));
+      example = literalExample ''
+        {
+          bind = ":5353 -no-rule -group example";
+          cache-size = 4096;
+          server-tls = [ "8.8.8.8:853" "1.1.1.1:853" ];
+          server-https = "https://cloudflare-dns.com/dns-query -exclude-default-group";
+          prefetch-domain = true;
+          speed-check-mode = "ping,tcp:80";
+        };
+      '';
+      description = ''
+        A set that will be generated into configuration file, see the <link xlink:href="https://github.com/pymumu/smartdns/blob/master/ReadMe_en.md#configuration-parameter">SmartDNS README</link> for details of configuration parameters.
+        You could override the options here like <option>services.smartdns.bindPort</option> by writing <literal>settings.bind = ":5353 -no-rule -group example";</literal>.
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.smartdns.settings.bind = mkDefault ":${toString cfg.bindPort}";
+
+    systemd.packages = [ pkgs.smartdns ];
+    systemd.services.smartdns.wantedBy = [ "multi-user.target" ];
+    environment.etc."smartdns/smartdns.conf".source = confFile;
+    environment.etc."default/smartdns".source =
+      "${pkgs.smartdns}/etc/default/smartdns";
+  };
+}

From cf719bf9a8f8ef8323d6e4052762c95219091bb1 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 15 Mar 2020 01:03:40 +0000
Subject: [PATCH 3124/4636] emacs: Add adisbladis as maintainer

---
 pkgs/applications/editors/emacs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index 98653517b5e7..1ab22a73c635 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -134,7 +134,7 @@ stdenv.mkDerivation rec {
     description = "The extensible, customizable GNU text editor";
     homepage    = https://www.gnu.org/software/emacs/;
     license     = licenses.gpl3Plus;
-    maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley ];
+    maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley adisbladis ];
     platforms   = platforms.all;
 
     longDescription = ''

From ea8efb20a75b56284ecb8bc0d1d4cb9acc202620 Mon Sep 17 00:00:00 2001
From: Ryan Fitzsimon <ryanfitzsimon@outlook.com>
Date: Sun, 15 Mar 2020 12:02:42 +1000
Subject: [PATCH 3125/4636] ckb-next: Disable built-in updater

---
 pkgs/tools/misc/ckb-next/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix
index 738430f561bd..12c7f91f5abe 100644
--- a/pkgs/tools/misc/ckb-next/default.nix
+++ b/pkgs/tools/misc/ckb-next/default.nix
@@ -27,6 +27,7 @@ mkDerivation rec {
     "-DINSTALL_DIR_ANIMATIONS=libexec"
     "-DUDEV_RULE_DIRECTORY=lib/udev/rules.d"
     "-DFORCE_INIT_SYSTEM=systemd"
+    "-DDISABLE_UPDATER=1"
   ];
 
   patches = [

From be768d1ef384a71415e670f87c950f1451349263 Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Sat, 14 Mar 2020 16:33:54 +0100
Subject: [PATCH 3126/4636] caprice32: 4.5.0 -> 4.6.0

---
 pkgs/misc/emulators/caprice32/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/misc/emulators/caprice32/default.nix b/pkgs/misc/emulators/caprice32/default.nix
index a8068e9b47b6..8d336b0ba3da 100644
--- a/pkgs/misc/emulators/caprice32/default.nix
+++ b/pkgs/misc/emulators/caprice32/default.nix
@@ -3,27 +3,30 @@
 stdenv.mkDerivation rec {
 
   pname = "caprice32";
-  version = "4.5.0";
+  version = "4.6.0";
 
   src = fetchFromGitHub {
     repo = "caprice32";
     rev = "v${version}";
     owner = "ColinPitrat";
-    sha256 = "056vrf5yq1574g93ix8hnjqqbdqza3qcjv0f8rvpsslqcbizma9y";
+    sha256 = "0hng5krwgc1h9bz1xlkp2hwnvas965nd7sb3z9mb2m6x9ghxlacz";
   };
 
-  postPatch = "substituteInPlace cap32.cfg --replace /usr/local $out";
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libpng SDL freetype zlib ];
 
-  #fix GIT_HASH avoid depend on git 
-  makeFlags = [ "GIT_HASH=${src.rev}" "DESTDIR=$(out)" "prefix=/"];
+  makeFlags = [
+    "APP_PATH=${placeholder "out"}/share/caprice32"
+    "RELEASE=1"
+    "DESTDIR=${placeholder "out"}"
+    "prefix=/"
+  ];
 
   meta = with stdenv.lib; {
     description = "A complete emulation of CPC464, CPC664 and CPC6128";
-    homepage = https://github.com/ColinPitrat/caprice32 ;
+    homepage = "https://github.com/ColinPitrat/caprice32";
     license = licenses.gpl2;
     maintainers = [ maintainers.genesis ];
     platforms = platforms.linux;
-  };  
+  };
 }

From 5fbf8635e3e53720f5883227bbd6d4e1c4f43240 Mon Sep 17 00:00:00 2001
From: Bignaux Ronan <ronan@aimao.org>
Date: Sat, 14 Mar 2020 17:43:39 +0100
Subject: [PATCH 3127/4636] caprice32: enable freedesktop entries

---
 pkgs/misc/emulators/caprice32/default.nix | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/caprice32/default.nix b/pkgs/misc/emulators/caprice32/default.nix
index 8d336b0ba3da..8694d4d2d5ae 100644
--- a/pkgs/misc/emulators/caprice32/default.nix
+++ b/pkgs/misc/emulators/caprice32/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, libpng, pkgconfig, SDL, freetype, zlib }:
+{ stdenv, fetchFromGitHub, desktop-file-utils, libpng
+, pkgconfig, SDL, freetype, zlib }:
 
 stdenv.mkDerivation rec {
 
@@ -12,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0hng5krwgc1h9bz1xlkp2hwnvas965nd7sb3z9mb2m6x9ghxlacz";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ desktop-file-utils pkgconfig ];
   buildInputs = [ libpng SDL freetype zlib ];
 
   makeFlags = [
@@ -22,6 +23,20 @@ stdenv.mkDerivation rec {
     "prefix=/"
   ];
 
+  postInstall = ''
+    mkdir -p $out/share/icons/
+    mv $out/share/caprice32/resources/freedesktop/caprice32.png $out/share/icons/
+    mv $out/share/caprice32/resources/freedesktop/emulators.png $out/share/icons/
+
+    desktop-file-install --dir $out/share/applications \
+      $out/share/caprice32/resources/freedesktop/caprice32.desktop
+
+    desktop-file-install --dir $out/share/desktop-directories \
+      $out/share/caprice32/resources/freedesktop/Emulators.directory
+
+    install -Dm644 $out/share/caprice32/resources/freedesktop/caprice32.menu -t $out/etc/xdg/menus/applications-merged/
+  '';
+
   meta = with stdenv.lib; {
     description = "A complete emulation of CPC464, CPC664 and CPC6128";
     homepage = "https://github.com/ColinPitrat/caprice32";

From 24c8d758746d82e7cd6b4a691f19dbe3d20596ff Mon Sep 17 00:00:00 2001
From: wedens <wedens@eldis.ru>
Date: Thu, 27 Feb 2020 12:53:31 +0700
Subject: [PATCH 3128/4636] libvirt: 5.4.0 -> 6.0.0

---
 pkgs/development/libraries/libvirt/5.4.0.nix  | 160 ++++++++++++++++++
 .../development/libraries/libvirt/default.nix |  45 ++---
 .../python-modules/libvirt/5.4.0.nix          |  27 +++
 .../python-modules/libvirt/default.nix        |   4 +-
 pkgs/top-level/all-packages.nix               |   1 +
 pkgs/top-level/perl-packages.nix              |   4 +-
 pkgs/top-level/python-packages.nix            |   7 +-
 7 files changed, 208 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/development/libraries/libvirt/5.4.0.nix
 create mode 100644 pkgs/development/python-modules/libvirt/5.4.0.nix

diff --git a/pkgs/development/libraries/libvirt/5.4.0.nix b/pkgs/development/libraries/libvirt/5.4.0.nix
new file mode 100644
index 000000000000..dd0a88974d06
--- /dev/null
+++ b/pkgs/development/libraries/libvirt/5.4.0.nix
@@ -0,0 +1,160 @@
+{ stdenv, fetchurl, fetchgit
+, pkgconfig, makeWrapper, libtool, autoconf, automake, fetchpatch
+, coreutils, libxml2, gnutls, perl, python2, attr
+, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
+, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
+, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
+, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode
+, enableXen ? false, xen ? null
+, enableIscsi ? false, openiscsi
+, enableCeph ? false, ceph
+}:
+
+with stdenv.lib;
+
+# if you update, also bump <nixpkgs/pkgs/development/python-modules/libvirt/default.nix> and SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
+let
+  buildFromTarball = stdenv.isDarwin;
+in stdenv.mkDerivation rec {
+  pname = "libvirt";
+  version = "5.4.0";
+
+  src =
+    if buildFromTarball then
+      fetchurl {
+        url = "http://libvirt.org/sources/${pname}-${version}.tar.xz";
+        sha256 = "0ywf8m9yz2hxnic7fylzlmgy4m353r4vv5zsvp89zq5yh4h81yhw";
+      }
+    else
+      fetchgit {
+        url = git://libvirt.org/libvirt.git;
+        rev = "v${version}";
+        sha256 = "1dja1mf295w0sl83zag62c4j55cfbzzfbhdxpkyv2zm3zv0mwdyc";
+        fetchSubmodules = true;
+      };
+
+  patches = optionals (!stdenv.isDarwin) [
+    (fetchpatch {
+      name = "5.4.0-CVE-2019-10161.patch";
+      url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=aed6a032cead4386472afb24b16196579e239580";
+      sha256 = "19k9z9xx68nf03igbgy1imxnlp5ppj7cgdbq9kri3s834hkjcygs";
+    })
+  ] ++ [
+    (fetchpatch {
+      name = "5.4.0-CVE-2019-10166.patch";
+      url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=db0b78457f183e4c7ac45bc94de86044a1e2056a";
+      sha256 = "17pd1rab2mxj4q0vg30vi2gh78mf52ik1p5l12wrghb0wjf7swml";
+    })
+    (fetchpatch {
+      name = "5.4.0-CVE-2019-10167.patch";
+      url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=8afa68bac0cf99d1f8aaa6566685c43c22622f26";
+      sha256 = "0hgbwk0y2n6ihzjk8vqabhw914axjqgzcb7c5xx893r86c54c0ml";
+    })
+    (fetchpatch {
+      name = "5.4.0-CVE-2019-10168.patch";
+      url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=bf6c2830b6c338b1f5699b095df36f374777b291";
+      sha256 = "0s4hc3hsjncx1852ndjas1nng9v23pxf4mi1jxcajsqvhw89la0g";
+    })
+  ];
+
+  nativeBuildInputs = [ makeWrapper pkgconfig ];
+  buildInputs = [
+    libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
+    libxslt xhtml1 perlPackages.XMLXPath curl libpcap
+  ] ++ optionals (!buildFromTarball) [
+    libtool autoconf automake
+  ] ++ optionals stdenv.isLinux [
+    libpciaccess lvm2 utillinux systemd libnl numad zfs
+    libapparmor libcap_ng numactl attr parted
+  ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [
+    xen
+  ] ++ optionals enableIscsi [
+    openiscsi
+  ] ++ optionals enableCeph [
+    ceph
+  ] ++ optionals stdenv.isDarwin [
+    libiconv gmp
+  ];
+
+  preConfigure = ''
+    ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" }
+    PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH
+    # the path to qemu-kvm will be stored in VM's .xml and .save files
+    # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations
+    substituteInPlace src/lxc/lxc_conf.c \
+      --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",'
+    patchShebangs . # fixes /usr/bin/python references
+  '';
+
+  configureFlags = [
+    "--localstatedir=/var"
+    "--sysconfdir=/var/lib"
+    "--with-libpcap"
+    "--with-qemu"
+    "--with-vmware"
+    "--with-vbox"
+    "--with-test"
+    "--with-esx"
+    "--with-remote"
+  ] ++ optionals stdenv.isLinux [
+    "QEMU_BRIDGE_HELPER=/run/wrappers/bin/qemu-bridge-helper"
+    "QEMU_PR_HELPER=/run/libvirt/nix-helpers/qemu-pr-helper"
+    "EBTABLES_PATH=${ebtables}/bin/ebtables-legacy"
+    "--with-attr"
+    "--with-apparmor"
+    "--with-secdriver-apparmor"
+    "--with-numad"
+    "--with-macvtap"
+    "--with-virtualport"
+    "--with-storage-disk"
+  ] ++ optionals (stdenv.isLinux && zfs != null) [
+    "--with-storage-zfs"
+  ] ++ optionals enableIscsi [
+    "--with-storage-iscsi"
+  ] ++ optionals enableCeph [
+    "--with-storage-rbd"
+  ] ++ optionals stdenv.isDarwin [
+    "--with-init-script=none"
+  ];
+
+  installFlags = [
+    "localstatedir=$(TMPDIR)/var"
+    "sysconfdir=$(out)/var/lib"
+  ];
+
+
+  postInstall = let
+    binPath = [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ];
+  in ''
+    substituteInPlace $out/libexec/libvirt-guests.sh \
+      --replace 'ON_BOOT=start'       'ON_BOOT=''${ON_BOOT:-start}' \
+      --replace 'ON_SHUTDOWN=suspend' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \
+      --replace "$out/bin"            '${gettext}/bin' \
+      --replace 'lock/subsys'         'lock' \
+      --replace 'gettext.sh'          'gettext.sh
+  # Added in nixpkgs:
+  gettext() { "${gettext}/bin/gettext" "$@"; }
+  '
+  '' + optionalString stdenv.isLinux ''
+    substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill
+    rm $out/lib/systemd/system/{virtlockd,virtlogd}.*
+    wrapProgram $out/sbin/libvirtd \
+      --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath binPath}
+  '';
+
+  enableParallelBuilding = true;
+
+  NIX_CFLAGS_COMPILE = "-fno-stack-protector";
+
+  meta = {
+    homepage = http://libvirt.org/;
+    repositories.git = git://libvirt.org/libvirt.git;
+    description = ''
+      A toolkit to interact with the virtualization capabilities of recent
+      versions of Linux (and other OSes)
+    '';
+    license = licenses.lgpl2Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ fpletz globin ];
+  };
+}
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 44cdd9edf523..9f547198ab61 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchgit
 , pkgconfig, makeWrapper, libtool, autoconf, automake, fetchpatch
-, coreutils, libxml2, gnutls, perl, python2, attr
+, coreutils, libxml2, gnutls, perl, python2, attr, glib, docutils
 , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
 , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
 , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
@@ -17,50 +17,26 @@ let
   buildFromTarball = stdenv.isDarwin;
 in stdenv.mkDerivation rec {
   pname = "libvirt";
-  version = "5.4.0";
+  version = "6.0.0";
 
   src =
     if buildFromTarball then
       fetchurl {
         url = "http://libvirt.org/sources/${pname}-${version}.tar.xz";
-        sha256 = "0ywf8m9yz2hxnic7fylzlmgy4m353r4vv5zsvp89zq5yh4h81yhw";
+        sha256 = "0xkz6n6pyv7k4jj7762v65jdsj8pkcpbnas65hjy7b5vi4in9fz6";
       }
     else
       fetchgit {
         url = git://libvirt.org/libvirt.git;
         rev = "v${version}";
-        sha256 = "1dja1mf295w0sl83zag62c4j55cfbzzfbhdxpkyv2zm3zv0mwdyc";
+        sha256 = "0j0rvymxaqavak03w7gblm8ingvbcwczpwfk8s0iqvsgfgk9974p";
         fetchSubmodules = true;
       };
 
-  patches = optionals (!stdenv.isDarwin) [
-    (fetchpatch {
-      name = "5.4.0-CVE-2019-10161.patch";
-      url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=aed6a032cead4386472afb24b16196579e239580";
-      sha256 = "19k9z9xx68nf03igbgy1imxnlp5ppj7cgdbq9kri3s834hkjcygs";
-    })
-  ] ++ [
-    (fetchpatch {
-      name = "5.4.0-CVE-2019-10166.patch";
-      url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=db0b78457f183e4c7ac45bc94de86044a1e2056a";
-      sha256 = "17pd1rab2mxj4q0vg30vi2gh78mf52ik1p5l12wrghb0wjf7swml";
-    })
-    (fetchpatch {
-      name = "5.4.0-CVE-2019-10167.patch";
-      url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=8afa68bac0cf99d1f8aaa6566685c43c22622f26";
-      sha256 = "0hgbwk0y2n6ihzjk8vqabhw914axjqgzcb7c5xx893r86c54c0ml";
-    })
-    (fetchpatch {
-      name = "5.4.0-CVE-2019-10168.patch";
-      url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=bf6c2830b6c338b1f5699b095df36f374777b291";
-      sha256 = "0s4hc3hsjncx1852ndjas1nng9v23pxf4mi1jxcajsqvhw89la0g";
-    })
-  ];
-
-  nativeBuildInputs = [ makeWrapper pkgconfig ];
+  nativeBuildInputs = [ makeWrapper pkgconfig docutils ];
   buildInputs = [
     libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
-    libxslt xhtml1 perlPackages.XMLXPath curl libpcap
+    libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib
   ] ++ optionals (!buildFromTarball) [
     libtool autoconf automake
   ] ++ optionals stdenv.isLinux [
@@ -78,17 +54,19 @@ in stdenv.mkDerivation rec {
 
   preConfigure = ''
     ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" }
-
     PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH
-
     # the path to qemu-kvm will be stored in VM's .xml and .save files
     # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations
     substituteInPlace src/lxc/lxc_conf.c \
       --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",'
-
     patchShebangs . # fixes /usr/bin/python references
+    mkdir -p build && cd build
   '';
 
+  configureScript = "../configure";
+
+  dontAddDisableDepTrack = true;
+
   configureFlags = [
     "--localstatedir=/var"
     "--sysconfdir=/var/lib"
@@ -125,7 +103,6 @@ in stdenv.mkDerivation rec {
     "sysconfdir=$(out)/var/lib"
   ];
 
-
   postInstall = let
     binPath = [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ];
   in ''
diff --git a/pkgs/development/python-modules/libvirt/5.4.0.nix b/pkgs/development/python-modules/libvirt/5.4.0.nix
new file mode 100644
index 000000000000..46d8a990f537
--- /dev/null
+++ b/pkgs/development/python-modules/libvirt/5.4.0.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchgit, pkgconfig, lxml, libvirt, nose }:
+
+buildPythonPackage rec {
+  pname = "libvirt";
+  version = "5.4.0";
+
+  src = fetchgit {
+    url = git://libvirt.org/libvirt-python.git;
+    rev = "v${version}";
+    sha256 = "0ja35z90i3m7vsjfpzfm7awkmja3h0150376i5pzmf2q8vp61fi5";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libvirt lxml ];
+
+  checkInputs = [ nose ];
+  checkPhase = ''
+    nosetests
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.libvirt.org/;
+    description = "libvirt Python bindings";
+    license = licenses.lgpl2;
+    maintainers = [ maintainers.fpletz ];
+  };
+}
diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix
index f4a07b9635f0..556acda4459a 100644
--- a/pkgs/development/python-modules/libvirt/default.nix
+++ b/pkgs/development/python-modules/libvirt/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "libvirt";
-  version = "5.4.0";
+  version = "6.0.0";
 
   src = assert version == libvirt.version; fetchgit {
     url = git://libvirt.org/libvirt-python.git;
     rev = "v${version}";
-    sha256 = "0ja35z90i3m7vsjfpzfm7awkmja3h0150376i5pzmf2q8vp61fi5";
+    sha256 = "0p6a8mlqf1kb0pg1avygg6ymlfvqsk7qisyhmyaxkj4pn8q87cxy";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2bc8a135ebb..c74dee307d91 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13241,6 +13241,7 @@ in
   libversion = callPackage ../development/libraries/libversion { };
 
   libvirt = callPackage ../development/libraries/libvirt { };
+  libvirt_5_4_0 = callPackage ../development/libraries/libvirt/5.4.0.nix { };
 
   libvirt-glib = callPackage ../development/libraries/libvirt-glib { };
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1a4fd0da81ab..edb6da9dd152 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -17282,11 +17282,11 @@ let
 
   SysVirt = buildPerlModule rec {
     pname = "Sys-Virt";
-    version = "5.4.0";
+    version = "6.0.0";
     src = assert version == pkgs.libvirt.version; pkgs.fetchgit {
       url = git://libvirt.org/libvirt-perl.git;
       rev = "v${version}";
-      sha256 = "0csg10mydcif2l0qf16nlphq6ih5378nk6dk1vznf5bspws2ch7a";
+      sha256 = "06r333bc52x0g511lw3nwp5w5q9d7mwxrbx5ihiv7shwyxn7dh93";
     };
     nativeBuildInputs = [ pkgs.pkgconfig ];
     buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0773a1984ab5..c4ea9dc6ac13 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6412,9 +6412,12 @@ in {
     inherit (pkgs) libversion pkgconfig;
   };
 
-  libvirt = callPackage ../development/python-modules/libvirt {
+  libvirt = if isPy3k then (callPackage ../development/python-modules/libvirt {
     inherit (pkgs) libvirt pkgconfig;
-  };
+  }) else (callPackage ../development/python-modules/libvirt/5.4.0.nix {
+    inherit (pkgs) pkgconfig;
+    libvirt = pkgs.libvirt_5_4_0;
+  });
 
   rpdb = callPackage ../development/python-modules/rpdb { };
 

From d8664c78b13161e366cfaa31efb32c187b95ba6c Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Mon, 9 Mar 2020 06:29:46 +0000
Subject: [PATCH 3129/4636] libvirt: 6.0.0 -> 6.1.0, fix module

---
 nixos/modules/virtualisation/libvirtd.nix           | 11 +++++++----
 pkgs/development/libraries/libvirt/default.nix      | 13 +++++--------
 pkgs/development/python-modules/libvirt/default.nix |  4 ++--
 pkgs/top-level/perl-packages.nix                    |  6 +++---
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 9f7bac480e38..eeaec8e35f11 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -214,14 +214,14 @@ in {
     };
 
     systemd.services.libvirtd = {
-      description = "Libvirt Virtual Machine Management Daemon";
-
-      wantedBy = [ "multi-user.target" ];
       requires = [ "libvirtd-config.service" ];
       after = [ "systemd-udev-settle.service" "libvirtd-config.service" ]
               ++ optional vswitch.enable "ovs-vswitchd.service";
 
-      environment.LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}'';
+      environment.LIBVIRTD_ARGS = concatMapStringsSep " " escapeShellArg (
+        [ "--config" configFile
+          "--timeout" "120"     # from ${libvirt}/var/lib/sysconfig/libvirtd
+        ] ++ cfg.extraOptions);
 
       path = [ cfg.qemuPackage ] # libvirtd requires qemu-img to manage disk images
              ++ optional vswitch.enable vswitch.package;
@@ -266,5 +266,8 @@ in {
       serviceConfig.ExecStart = "@${pkgs.libvirt}/sbin/virtlockd virtlockd";
       restartIfChanged = false;
     };
+
+    systemd.sockets.libvirtd    .wantedBy = [ "sockets.target" ];
+    systemd.sockets.libvirtd-tcp.wantedBy = [ "sockets.target" ];
   };
 }
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 9f547198ab61..17e6fce33cd2 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchgit
-, pkgconfig, makeWrapper, libtool, autoconf, automake, fetchpatch
+, pkgconfig, makeWrapper, autoreconfHook, fetchpatch
 , coreutils, libxml2, gnutls, perl, python2, attr, glib, docutils
 , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
 , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
@@ -17,28 +17,26 @@ let
   buildFromTarball = stdenv.isDarwin;
 in stdenv.mkDerivation rec {
   pname = "libvirt";
-  version = "6.0.0";
+  version = "6.1.0";
 
   src =
     if buildFromTarball then
       fetchurl {
         url = "http://libvirt.org/sources/${pname}-${version}.tar.xz";
-        sha256 = "0xkz6n6pyv7k4jj7762v65jdsj8pkcpbnas65hjy7b5vi4in9fz6";
+        sha256 = "1h7bmd7zgl64mwnxx4ji8l0mqmcbfxsx6kp1scyyfq2mwidihz0n";
       }
     else
       fetchgit {
         url = git://libvirt.org/libvirt.git;
         rev = "v${version}";
-        sha256 = "0j0rvymxaqavak03w7gblm8ingvbcwczpwfk8s0iqvsgfgk9974p";
+        sha256 = "18sr3jvpxn45c4vrjzpa4qgnnfxxh95v6l6qk31zka3siv8rrwqx";
         fetchSubmodules = true;
       };
 
-  nativeBuildInputs = [ makeWrapper pkgconfig docutils ];
+  nativeBuildInputs = [ makeWrapper pkgconfig docutils ] ++ optionals (!buildFromTarball) [ autoreconfHook ];
   buildInputs = [
     libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
     libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib
-  ] ++ optionals (!buildFromTarball) [
-    libtool autoconf automake
   ] ++ optionals stdenv.isLinux [
     libpciaccess lvm2 utillinux systemd libnl numad zfs
     libapparmor libcap_ng numactl attr parted
@@ -53,7 +51,6 @@ in stdenv.mkDerivation rec {
   ];
 
   preConfigure = ''
-    ${ optionalString (!buildFromTarball) "./bootstrap --no-git --gnulib-srcdir=$(pwd)/.gnulib" }
     PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH
     # the path to qemu-kvm will be stored in VM's .xml and .save files
     # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations
diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix
index 556acda4459a..62058ea62c3b 100644
--- a/pkgs/development/python-modules/libvirt/default.nix
+++ b/pkgs/development/python-modules/libvirt/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "libvirt";
-  version = "6.0.0";
+  version = "6.1.0";
 
   src = assert version == libvirt.version; fetchgit {
     url = git://libvirt.org/libvirt-python.git;
     rev = "v${version}";
-    sha256 = "0p6a8mlqf1kb0pg1avygg6ymlfvqsk7qisyhmyaxkj4pn8q87cxy";
+    sha256 = "0h3w1p5y4kg2hdbhxmg4lphcnmr7979iwi0m750f8vzbfccsrp7k";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index edb6da9dd152..d514f5bb4cc9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -17282,11 +17282,11 @@ let
 
   SysVirt = buildPerlModule rec {
     pname = "Sys-Virt";
-    version = "6.0.0";
+    version = "6.1.0";
     src = assert version == pkgs.libvirt.version; pkgs.fetchgit {
       url = git://libvirt.org/libvirt-perl.git;
-      rev = "v${version}";
-      sha256 = "06r333bc52x0g511lw3nwp5w5q9d7mwxrbx5ihiv7shwyxn7dh93";
+      rev = "299f3ba34ae4daea966bf1cb07d90f4151da895f"; # there is no "v6.1.0" tag
+      sha256 = "0k18spb6r8fym5v4rsnma1fspnzqf1mgr2wkvb8s4cwn915sccp4";
     };
     nativeBuildInputs = [ pkgs.pkgconfig ];
     buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];

From 687aa06c70d75a5df9f9cccc1d77dcec75fdac2f Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Mon, 9 Mar 2020 09:05:13 +0000
Subject: [PATCH 3130/4636] nixos/scripted-networking: fix bridge setup when
 libvirtd uses socket activation

---
 .../tasks/network-interfaces-scripted.nix      | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index 4d25137c5dfc..98bae444df0d 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -291,13 +291,19 @@ let
 
               ${optionalString config.virtualisation.libvirtd.enable ''
                   # Enslave dynamically added interfaces which may be lost on nixos-rebuild
-                  for uri in qemu:///system lxc:///; do
-                    for dom in $(${pkgs.libvirt}/bin/virsh -c $uri list --name); do
-                      ${pkgs.libvirt}/bin/virsh -c $uri dumpxml "$dom" | \
-                      ${pkgs.xmlstarlet}/bin/xmlstarlet sel -t -m "//domain/devices/interface[@type='bridge'][source/@bridge='${n}'][target/@dev]" -v "concat('ip link set ',target/@dev,' master ',source/@bridge,';')" | \
-                      ${pkgs.bash}/bin/bash
+                  #
+                  # if `libvirtd.service` is not running, do not use `virsh` which would try activate it via 'libvirtd.socket' and thus start it out-of-order.
+                  # `libvirtd.service` will set up bridge interfaces when it will start normally.
+                  #
+                  if ${pkgs.systemd}/bin/systemctl --quiet is-active 'libvirtd.service'; then
+                    for uri in qemu:///system lxc:///; do
+                      for dom in $(${pkgs.libvirt}/bin/virsh -c $uri list --name); do
+                        ${pkgs.libvirt}/bin/virsh -c $uri dumpxml "$dom" | \
+                        ${pkgs.xmlstarlet}/bin/xmlstarlet sel -t -m "//domain/devices/interface[@type='bridge'][source/@bridge='${n}'][target/@dev]" -v "concat('ip link set ',target/@dev,' master ',source/@bridge,';')" | \
+                        ${pkgs.bash}/bin/bash
+                      done
                     done
-                  done
+                  fi
                 ''}
 
               # Enable stp on the interface

From ddbac2e18514cb459b2da5af46cfb576b3cc43dd Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Tue, 10 Mar 2020 21:51:31 +0000
Subject: [PATCH 3131/4636] perlPackages.SysVirt: use upstream tag

---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d514f5bb4cc9..6db90bbe6a5d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -17285,8 +17285,8 @@ let
     version = "6.1.0";
     src = assert version == pkgs.libvirt.version; pkgs.fetchgit {
       url = git://libvirt.org/libvirt-perl.git;
-      rev = "299f3ba34ae4daea966bf1cb07d90f4151da895f"; # there is no "v6.1.0" tag
-      sha256 = "0k18spb6r8fym5v4rsnma1fspnzqf1mgr2wkvb8s4cwn915sccp4";
+      rev = "v${version}";
+      sha256 = "00w4fmki7ff7i9bi39w2w15mvv38b5ifwk3zib90ny536r3n63sb";
     };
     nativeBuildInputs = [ pkgs.pkgconfig ];
     buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];

From e2b8f9f54aaa560f3759b3dc38c3d0f51cb04823 Mon Sep 17 00:00:00 2001
From: Kolby Crouch <kjc.devel@gmail.com>
Date: Sun, 15 Mar 2020 00:48:14 -0500
Subject: [PATCH 3132/4636] retroarch: 1.8.1 -> 1.8.4

---
 maintainers/maintainer-list.nix           |   5 +
 pkgs/misc/emulators/retroarch/cores.nix   | 714 +++++++++++++++-------
 pkgs/misc/emulators/retroarch/default.nix |   8 +-
 pkgs/top-level/all-packages.nix           |  29 +-
 4 files changed, 509 insertions(+), 247 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5fc08c92e990..9a684309dc6a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3924,6 +3924,11 @@
     githubId = 13721712;
     name = "Konrad Langenberg";
   };
+  kolbycrouch = {
+    email = "kjc.devel@gmail.com";
+    github = "kolbycrouch";
+    name = "Kolby Crouch";
+  };
   konimex = {
     email = "herdiansyah@netc.eu";
     github = "konimex";
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 2176d53628fa..4062b39d7620 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -1,17 +1,19 @@
 { stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, cmake, pkgconfig, makeWrapper, python27, python37, retroarch
-, alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, libGL
-, ffmpeg, pcre, libevdev, libpng, libjpeg, udev, libvorbis
-, miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost }:
+, alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL
+, ffmpeg, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump
+, miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl }:
 
 let
 
   d2u = stdenv.lib.replaceChars ["-"] ["_"];
 
+  jobs = "$NIX_BUILD_CORES";
+
   mkLibRetroCore = ({ core, src, description, license, broken ? false, ... }@a:
   stdenv.lib.makeOverridable stdenv.mkDerivation rec {
 
     name = "libretro-${core}-${version}";
-    version = "2019-09-29";
+    version = "2020-03-06";
     inherit src;
 
     buildInputs = [ makeWrapper retroarch zlib ] ++ a.extraBuildInputs or [];
@@ -54,46 +56,33 @@ in with stdenv.lib.licenses;
 
 {
 
-  _4do = (mkLibRetroCore rec {
-    core = "4do";
-    src = fetchRetro {
-      repo = core + "-libretro";
-      rev = "b6ad4bc8548f2f3792cd929ccf26d9078b73a1c0";
-      sha256 = "0j2bd9cnnd5k99l9qr4wd5q9b4ciplia6ywp90xg6422s1im2iw0";
-    };
-    description = "Port of 4DO/libfreedo to libretro";
-    license = "Non-commercial";
-  }).override {
-    makefile = "Makefile";
-    buildPhase = "make";
-  };
-
   atari800 = (mkLibRetroCore rec {
     core = "atari800";
     src = fetchRetro {
       repo = "libretro-" + core;
-      rev = "efc0bc71e3cb8a4f957d07fe808cc002ed9c13b9";
-      sha256 = "150hmazi4p5p18gpjmkrn1k9j719cd9gy7jn0jiy3jbk2cxxsjn6";
+      rev = "f9bf53b864344b8bbe8d425ed2f3c628eb10519c";
+      sha256 = "0sgk93zs423pwiqzvj0x1gfwcn9gacnlrrdq53ps395k64lig6lk";
     };
     description = "Port of Atari800 to libretro";
     license = gpl2;
   }).override {
+    dontConfigure = true;
     makefile = "Makefile";
-    buildPhase = "make";
+    patchPhase = "substituteInPlace libretro/libretro-core.c --replace \" GIT_VERSION;\" \";\"";
   };
 
   beetle-snes = (mkLibRetroCore rec {
     core = "mednafen-snes";
     src = fetchRetro {
       repo = "beetle-bsnes-libretro";
-      rev = "6aee84d454570bb17dff5975df28febdbcb72938";
-      sha256 = "0nk9xlypg3jhpbwd9z5bjbgzlkz842hy9rq14k1nwn0qz6d88kld";
+      rev = "de22d8420ea606f1b2f72afd4dda34619cf2cc20";
+      sha256 = "1nd4f8frmlhp1lyxz9zpxvwwz70x0i0rrp560cn9qlm1jzdv3xvf";
     };
     description = "Port of Mednafen's SNES core to libretro";
     license = gpl2;
   }).override {
     makefile = "Makefile";
-    buildPhase = "make";
+    dontConfigure = true;
   };
 
   beetle-gba = (mkLibRetroCore rec {
@@ -107,49 +96,49 @@ in with stdenv.lib.licenses;
     license = gpl2;
   }).override {
     makefile = "Makefile";
-    buildPhase = "make";
+    dontConfigure = true;
   };
 
   beetle-lynx = (mkLibRetroCore rec {
     core = "mednafen-lynx";
     src = fetchRetro {
       repo = "beetle-lynx-libretro";
-      rev = "928f7cf5b39f0363e55667572ff455e37489998e";
-      sha256 = "0f03wzdr6f0fpy889i9a2834jg5lvcriyl98pajp75m7whm9r9cc";
+      rev = "74dde204c0ec6c4bc4cd7821c14548387fbd9ce8";
+      sha256 = "05kwibjr30laalqzazswvmn9smm3mwqsz1i0z1s0pj7idfdhjfw0";
     };
     description = "Port of Mednafen's Lynx core to libretro";
     license = gpl2;
   }).override {
     makefile = "Makefile";
-    buildPhase = "make";
+    dontConfigure = true;
   };
 
   beetle-ngp = (mkLibRetroCore rec {
     core = "mednafen-ngp";
     src = fetchRetro {
       repo = "beetle-ngp-libretro";
-      rev = "6130e4057c3d8f9172f0c49bb9b6c61bd1a572d5";
-      sha256 = "10k7spjrhggjgzb370bwv7fgk0nb6xri9ym6cm4qvnrkcwxm7i9p";
+      rev = "6f15532b6ad17a2d5eb9dc8241d6af62416e796b";
+      sha256 = "05r8mk9rc19nzs3gpfsjr6i7pm6xx3gn3b4xs8ab7v4vcmfg4cn2";
     };
     description = "Port of Mednafen's NeoGeo Pocket core to libretro";
     license = gpl2;
   }).override {
     makefile = "Makefile";
-    buildPhase = "make";
+    dontConfigure = true;
   };
 
   beetle-pce-fast = let der = (mkLibRetroCore {
     core = "mednafen-pce-fast";
     src = fetchRetro {
       repo = "beetle-pce-fast-libretro";
-      rev = "7bbbdf111c1ce52ab4a97e911ebdaa6836ee881a";
-      sha256 = "1p0kk5a2yi05yl0hspzv9q0n96yx9riaaacbmnq76li0i3ihkf6l";
+      rev = "40a42b7f43f029760c92bf0b2097e7d4b90ed29c";
+      sha256 = "1gr6wg4bd4chm4c39w0c1b5zfzr05zd7234vvlmr1imk0v6m0wj6";
     };
     description = "Port of Mednafen's PC Engine core to libretro";
     license = gpl2;
   }); in der.override {
     makefile = "Makefile";
-    buildPhase = "make";
+    dontConfigure = true;
     name = "beetle-pce-fast-${der.version}";
   };
 
@@ -157,43 +146,80 @@ in with stdenv.lib.licenses;
     core = "mednafen-pcfx";
     src = fetchRetro {
       repo = "beetle-pcfx-libretro";
-      rev = "e04f695202a7295e4b6f2122ae947279ac9df007";
-      sha256 = "0pdlz05pjqxp19da13dr3wd20hgxw8z5swhflyf7ksjgvz5rxb4r";
+      rev = "7bba6699d6f903bd701b0aa525d845de8427fee6";
+      sha256 = "1lh7dh96fyi005fcg3xaf7r4ssgkq840p6anldlqy52vfwmglw3p";
     };
     description = "Port of Mednafen's PCFX core to libretro";
     license = gpl2;
   }).override {
     makefile = "Makefile";
-    buildPhase = "make";
+    dontConfigure = true;
   };
 
   beetle-psx = let der = (mkLibRetroCore {
     core = "mednafen-psx";
     src = fetchRetro {
       repo = "beetle-psx-libretro";
-      rev = "f55db8655408104a6e20af667657423f08566c85";
-      sha256 = "17iz8r2wy8zqh63j78ijwxasdnmg8dh9mmqn1qr4hvf4fj53ckk8";
+      rev = "0f1e7e60827cad49ebba628abdc83ad97652ab89";
+      sha256 = "1j92jgddyl970v775d6gyb50l8md6yfym2fpqhfxcr4gj1b4ivwq";
     };
     description = "Port of Mednafen's PSX Engine core to libretro";
     license = gpl2;
   }); in der.override {
     makefile = "Makefile";
-    buildPhase = "make";
+    dontConfigure = true;
+    makeFlags = [ "HAVE_HW=0" "HAVE_LIGHTREC=1" ];
     name = "beetle-psx-${der.version}";
   };
 
+  beetle-psx-hw = let der = (mkLibRetroCore {
+    core = "mednafen-psx-hw";
+    src = fetchRetro {
+      repo = "beetle-psx-libretro";
+      rev = "0f1e7e60827cad49ebba628abdc83ad97652ab89";
+      sha256 = "1j92jgddyl970v775d6gyb50l8md6yfym2fpqhfxcr4gj1b4ivwq";
+    };
+    description = "Port of Mednafen's PSX Engine (with HW accel) core to libretro";
+    license = gpl2;
+    extraBuildInputs = [ libGL libGLU ];
+  }); in der.override {
+    makefile = "Makefile";
+    dontConfigure = true;
+    makeFlags = [ "HAVE_VULKAN=1" "HAVE_OPENGL=1" "HAVE_HW=1" "HAVE_LIGHTREC=1" ];
+    name = "beetle-psx-hw-${der.version}";
+  };
+
   beetle-saturn = let der = (mkLibRetroCore {
     core = "mednafen-saturn";
     src = fetchRetro {
       repo = "beetle-saturn-libretro";
-      rev = "3313cc6760c14cffa9226e0cfd41debc11df8bdd";
-      sha256 = "1z2zfn5cpsr3x6bvr562vqvmp4pjjhv5a6jcp09gfsy2gkyispr2";
+      rev = "8a65943bb7bbc3183eeb0d57c4ac3e663f1bcc11";
+      sha256 = "1f0cd9wmvarsmf4jw0p6h3lbzs6515aja7krrwapja7i4xmgbrnh";
     };
     description = "Port of Mednafen's Saturn core to libretro";
     license = gpl2;
   }); in der.override {
     makefile = "Makefile";
-    buildPhase = "make";
+    dontConfigure = true;
+    makeFlags = [ "HAVE_HW=0" ];
+    name = "beetle-saturn-${der.version}";
+    meta.platforms = [ "x86_64-linux" "aarch64-linux" ];
+  };
+
+  beetle-saturn-hw = let der = (mkLibRetroCore {
+    core = "mednafen-saturn-hw";
+    src = fetchRetro {
+      repo = "beetle-saturn-libretro";
+      rev = "8a65943bb7bbc3183eeb0d57c4ac3e663f1bcc11";
+      sha256 = "1f0cd9wmvarsmf4jw0p6h3lbzs6515aja7krrwapja7i4xmgbrnh";
+    };
+    description = "Port of Mednafen's Saturn core to libretro";
+    license = gpl2;
+    extraBuildInputs = [ libGL libGLU ];
+  }); in der.override {
+    makefile = "Makefile";
+    dontConfigure = true;
+    makeFlags = [ "HAVE_OPENGL=1" "HAVE_HW=1" ];
     name = "beetle-saturn-${der.version}";
     meta.platforms = [ "x86_64-linux" "aarch64-linux" ];
   };
@@ -202,55 +228,55 @@ in with stdenv.lib.licenses;
     core = "mednafen-supergrafx";
     src = fetchRetro {
       repo = "beetle-supergrafx-libretro";
-      rev = "857e41146e3b0a51def3baea49d2eec80f18102b";
-      sha256 = "0r3v4qy4rx4mnr7w4s779f6f2bjyp69m42blimacl1l9f6hmcv5h";
+      rev = "fadef23d59fa5ec17bc99e1e722cfd9e10535695";
+      sha256 = "15rm7p5q38qy3xpyvamhphjnna8h91fsbcqnl9vhzx9cmjg0wf54";
     };
     description = "Port of Mednafen's SuperGrafx core to libretro";
     license = gpl2;
   }).override {
     makefile = "Makefile";
-    buildPhase = "make";
+    dontConfigure = true;
   };
 
   beetle-wswan = (mkLibRetroCore rec {
     core = "mednafen-wswan";
     src = fetchRetro {
       repo = "beetle-wswan-libretro";
-      rev = "925cb8c77af1678ceab24f04c2790cb95389def1";
-      sha256 = "0kqsqn655z6nnr2s1xdbf37ds99gyhqfd7dx0wmx3sy1fshjg5wm";
+      rev = "5b03d1b09f70dc208387d3c8b59e12e1f0d2692f";
+      sha256 = "1sm6ww3y9m85lhp74dpxbs05yxdhhqqmj2022j9s0m235z29iygc";
     };
     description = "Port of Mednafen's WonderSwan core to libretro";
     license = gpl2;
   }).override {
     makefile = "Makefile";
-    buildPhase = "make";
+    dontConfigure = true;
   };
 
   beetle-vb = (mkLibRetroCore rec {
     core = "mednafen-vb";
     src = fetchRetro {
       repo = "beetle-vb-libretro";
-      rev = "9066cdafa29ac054243a679baded49212661f47b";
-      sha256 = "0gsniz5kk4xdiprcfyqjcss2vkrphi48wbr29gqvpf7l8gpnwx8p";
+      rev = "9a4e604a7320a3c6ed30601989fe0bc417fa9ad3";
+      sha256 = "1gallwbqxn5qbmwxr1vxb41nncksai4rxc739a7vqvp65k5kl0qp";
     };
     description = "Port of Mednafen's VirtualBoy core to libretro";
     license = gpl2;
   }).override {
     makefile = "Makefile";
-    buildPhase = "make";
+    dontConfigure = true;
   };
 
   bluemsx = (mkLibRetroCore rec {
     core = "bluemsx";
     src = fetchRetro {
       repo = core + "-libretro";
-      rev = "ddd89ff1fa534816e48521bd930b721f2d39975a";
-      sha256 = "0hiqhc1ckj3ydy0q1v8hwjkkyh2564f7wlqypmshjcc47n296xyf";
+      rev = "7a1d40e750860580ab7cc21fbc244b5bc6db6586";
+      sha256 = "05hnkyr47djccspr8v438zimdfsgym7v0jn1hwpkqc4i5zf70981";
     };
     description = "Port of BlueMSX to libretro";
     license = gpl2;
   }).override {
-    buildPhase = "make";
+    dontConfigure = true;
   };
 
   bsnes-mercury = let bname = "bsnes-mercury"; in (mkLibRetroCore {
@@ -264,7 +290,36 @@ in with stdenv.lib.licenses;
     license = gpl3;
   }).override {
     makefile = "Makefile";
-    buildPhase = "make && cd out";
+    dontConfigure = true;
+    postBuild = "cd out";
+  };
+
+  citra = (mkLibRetroCore rec {
+    core = "citra";
+    src = fetchgit {
+      url = "https://github.com/libretro/citra.git";
+      rev = "84f31e95160b029e6d614053705054ed6a34bb38";
+      sha256 = "0gkgxpwrh0q098cpx56hprvmazi5qi448c23svwa8ar1myh8p248";
+      fetchSubmodules = true;
+      deepClone = true;
+    };
+    description = "Port of Citra to libretro";
+    license = gpl2Plus;
+    extraBuildInputs = [
+      cmake curl libGLU libGL pkgconfig boost
+    ];
+  }).override {
+    makefile = "Makefile";
+    cmakeFlags = [
+      "-DCMAKE_BUILD_TYPE=Release"
+      "-DENABLE_LIBRETRO=ON"
+      "-DENABLE_QT=OFF"
+      "-DENABLE_SDL2=OFF"
+      "-DENABLE_WEB_SERVICE=OFF"
+      "-DENABLE_DISCORD_PRESENCE=OFF"
+    ];
+    preConfigure = "sed -e '77d' -i externals/cmake-modules/GetGitRevisionDescription.cmake";
+    postBuild = "cd src/citra_libretro";
   };
 
   desmume = (mkLibRetroCore rec {
@@ -278,37 +333,36 @@ in with stdenv.lib.licenses;
     license = gpl2;
     extraBuildInputs = [ libpcap libGLU libGL xorg.libX11 ];
   }).override {
-    makefile = "desmume/src/frontend/libretro/Makefile.libretro";
+    makefile = "Makefile.libretro";
     configurePhase = "cd desmume/src/frontend/libretro";
-    buildPhase = "make";
+    makeFlags = stdenv.lib.optionals stdenv.isAarch64 [ "DESMUME_JIT=0" ];
   };
 
   desmume2015 = (mkLibRetroCore rec {
     core = "desmume2015";
     src = fetchRetro {
       repo = core;
-      rev = "c27bb71aa28250f6da1576e069b4b8cc61986beb";
-      sha256 = "1m7g1wwpnnprmki3rixknggjmxbp7d4hwxgkqr041shmrm0rhafd";
+      rev = "93d5789d60f82436e20ccad05ce9cb43c6e3656e";
+      sha256 = "12nii2pbnqgh7f7jkphbwjpr2hiy2mzbwpas3xyhpf9wpy3qiasg";
     };
     description = "libretro wrapper for desmume NDS emulator from 2015";
     license = gpl2;
     extraBuildInputs = [ libpcap libGLU libGL xorg.libX11 ];
   }).override {
-    makefile = "desmume/Makefile.libretro";
+    makefile = "Makefile.libretro";
     configurePhase = "cd desmume";
-    buildPhase = "make";
+    makeFlags = stdenv.lib.optionals stdenv.isAarch64 [ "DESMUME_JIT=0" ];
   };
 
   dolphin = (mkLibRetroCore {
     core = "dolphin";
     src = fetchRetro {
       repo = "dolphin";
-      rev = "11a7ed402c7178da1d9d57c6e5e5a05a4dc6a2c8";
-      sha256 = "11jrcczkbyns01rvxb5rd22fbkbfn2h81f6pfxbhi13fl4ljim9x";
+      rev = "1fbd59911d1b718c142d6448dee3ede98152e395";
+      sha256 = "1rymsvs034l1hbxc3w8zi9lhmgka2qaj3jynjy152dccd480nnd4";
     };
     description = "Port of Dolphin to libretro";
     license = gpl2Plus;
-    broken = true;
 
     extraBuildInputs = [
       cmake curl libGLU libGL pcre pkgconfig sfml
@@ -316,6 +370,7 @@ in with stdenv.lib.licenses;
       libevdev udev
     ] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil libXext libXrandr libXinerama libXxf86vm ]);
   }).override {
+    makefile = "Makefile";
     cmakeFlags = [
       "-DCMAKE_BUILD_TYPE=Release"
       "-DLIBRETRO=ON"
@@ -326,7 +381,6 @@ in with stdenv.lib.licenses;
       "-DUSE_DISCORD_PRESENCE=OFF"
     ];
     dontUseCmakeBuildDir = "yes";
-    buildPhase = "make";
   };
 
   dosbox = (mkLibRetroCore rec {
@@ -339,101 +393,178 @@ in with stdenv.lib.licenses;
     description = "Port of DOSBox to libretro";
     license = gpl2;
   }).override {
-    buildPhase = "make";
+    dontConfigure = true;
   };
 
-  fba = (mkLibRetroCore rec {
-    core = "fba";
+  eightyone = (mkLibRetroCore rec {
+    core = "81";
     src = fetchRetro {
       repo = core + "-libretro";
-      rev = "89245384c7d181e286d6f34995253419f946becb";
-      sha256 = "1pg351qhbq5x8qmaq6c30v8ynic8jv3gbxy2kq5iknka80g1lkck";
+      rev = "4352130bd2363954262a804b086f86b9d13d97f9";
+      sha256 = "057ynnv85imjqhgixrx7p28wn42v88vsm3fc1lp3mpcfi2bk266h";
     };
-    description = "Port of Final Burn Alpha to libretro";
-    license = "Non-commercial";
+    description = "Port of EightyOne to libretro";
+    license = gpl3;
   }).override {
-    makefile = "svn-current/trunk/makefile.libretro";
-    buildPhase = ''
-      cd svn-current/trunk \
-      && make -f makefile.libretro \
-      && mv fbalpha2012_libretro${stdenv.hostPlatform.extensions.sharedLibrary} fba_libretro${stdenv.hostPlatform.extensions.sharedLibrary}
-    '';
+    dontConfigure = true;
   };
 
-  fceumm = mkLibRetroCore rec {
+  fbalpha2012 = (mkLibRetroCore rec {
+    core = "fbalpha2012";
+    src = fetchRetro {
+      repo = core;
+      rev = "fa97cd2784a337f8ac774c2ce8a136aee69b5f43";
+      sha256 = "1i75k0r6838hl77bjjmzvan33ka5qjrdpirmclzj20g5j97lmas7";
+    };
+    description = "Port of Final Burn Alpha ~2012 to libretro";
+    license = "Non-commercial";
+  }).override {
+    makefile = "makefile.libretro";
+    configurePhase = "cd svn-current/trunk";
+  };
+
+  fbneo = (mkLibRetroCore rec {
+    core = "fbneo";
+    src = fetchRetro {
+      repo = core;
+      rev = "cf43fdb1755f9f5c886266e86ba40d339bc8f5d7";
+      sha256 = "13g3c6mbwhcf0rp95ga4klszh8dab2d4ahh2vzzlmd57r69lf2lv";
+    };
+    description = "Port of FBNeo to libretro";
+    license = "Non-commercial";
+  }).override {
+    makefile = "Makefile";
+    postPatch = ''
+      sed -i -e 's:-Wall:-Wall -Wno-format-security:g' src/burner/libretro/Makefile
+    '';
+    preConfigure = "cd src/burner/libretro";
+    makeFlags = [ "USE_EXPERIMENTAL_FLAGS=1" ];
+  };
+
+  fceumm = (mkLibRetroCore rec {
     core = "fceumm";
     src = fetchRetro {
       repo = "libretro-" + core;
-      rev = "0e315e0ca0093ebda06a97835cec6ad4af81db7a";
-      sha256 = "12bvvxmvafjvrvwxl5gzr583g48s0isx2fgvjgkrx175vk2amaf4";
+      rev = "9ed22e5a9a1360a7f599a64283af9fe24b858e3d";
+      sha256 = "0rz6iy281jpybmsz5rh06k5xvmd9id9w2q2gd0qdv9a2ylwv7s2j";
     };
     description = "FCEUmm libretro port";
     license = gpl2;
+  }).override {
+    dontConfigure = true;
   };
 
   flycast = (mkLibRetroCore rec {
     core = "flycast";
     src = fetchRetro {
       repo = core;
-      rev = "45a15205dfc05cfc4df2488cad7c2b4988c5aa0f";
-      sha256 = "18glxd57kddq6p2bwq0qknyq6bv8dxklqks4w2jy2yccvwxdxy2i";
+      rev = "b12f3726d9093acb4e441b1cdcf6cd11403c8644";
+      sha256 = "0nczjhdqr7svq9aflczf7rwz64bih1wqy9q0gyglb55xlslf5jqc";
     };
     description = "Flycast libretro port";
     license = gpl2;
     extraBuildInputs = [ libGL libGLU ];
   }).override {
     makefile = "Makefile";
-    buildPhase = "make";
+    dontConfigure = true;
+    makeFlags = [ "HAVE_GL2=1" "HAVE_VULKAN=1" ] ++ stdenv.lib.optionals stdenv.isAarch64 [ "platform=arm64" ];
+    meta.platforms = [ "aarch64-linux" "x86_64-linux" ];
   };
 
-  gambatte = mkLibRetroCore rec {
+  fmsx = (mkLibRetroCore rec {
+    core = "fmsx";
+    src = fetchRetro {
+      repo = core + "-libretro";
+      rev = "3de916bbf15062de1ab322432d38a1fee29d5e68";
+      sha256 = "1krr4lmdiv0d7bxk37fqz5y412znb5bmxapv9g7ci6fp87sr69jq";
+    };
+    description = "FMSX libretro port";
+    license = "Non-Commercial";
+  }).override {
+    makefile = "Makefile";
+    dontConfigure = true;
+  };
+
+  freeintv = (mkLibRetroCore rec {
+    core = "freeintv";
+    src = fetchRetro {
+      repo = core;
+      rev = "45030e10cc1a50cf7a80c5d921aa8cba0aeaca91";
+      sha256 = "10lngk3p012bgrg752426701hfzsiy359h8i0vzsa64pgyjbqlag";
+    };
+    description = "FreeIntv libretro port";
+    license = gpl3;
+  }).override {
+    makefile = "Makefile";
+    dontConfigure = true;
+  };
+
+  gambatte = (mkLibRetroCore rec {
     core = "gambatte";
     src = fetchRetro {
       repo = core + "-libretro";
-      rev = "4d9ad7b29946ec0a914b2d6a735b6c2704ed1f23";
-      sha256 = "156pvvlch5izbgbw4ddxhiwgzpp52irr3nqaz813i5f02fiq5wya";
+      rev = "132f36e990dfc6effdafa6cf261373432464f9bf";
+      sha256 = "19w5k9yc1cl99c5hiqbp6j54g6z06xcblpvd3x6nmhxij81yqxy7";
     };
     description = "Gambatte libretro port";
     license = gpl2;
+  }).override {
+    dontConfigure = true;
   };
 
-  genesis-plus-gx = mkLibRetroCore {
+  genesis-plus-gx = (mkLibRetroCore {
     core = "genesis-plus-gx";
     src = fetchRetro {
       repo = "Genesis-Plus-GX";
-      rev = "0e4357bd64533d7fd93b5f01620b92595025fab5";
-      sha256 = "1nryy00844h3ra97j40g38lj7036ibm2l8002qid7r5r9kggclqx";
+      rev = "50551066f71f8a5ea782ea3747891fd6d24ebe67";
+      sha256 = "150lgdrv7idcq7jbd1jj7902rcsyixd7kfjs2m5xdinjvl22kihr";
     };
     description = "Enhanced Genesis Plus libretro port";
     license = "Non-commercial";
+  }).override {
+    dontConfigure = true;
   };
 
   gpsp = (mkLibRetroCore rec {
     core = "gpsp";
     src = fetchRetro {
       repo = core;
-      rev = "24af89596e6484ff5a7a08efecfa8288cfbc02f3";
-      sha256 = "1jc5i70cab5f23yc9sfv8iyvmwmc4sb33f413il2vlhsfdxklyk7";
+      rev = "3f2f57c982ffead643957db5b26931df4913596f";
+      sha256 = "09fa1c623rmy1w9zx85r75viv8q1vknhbs8fn6xbss9rhpxhivwg";
     };
     description = "Port of gpSP to libretro";
     license = gpl2;
   }).override {
     makefile = "Makefile";
-    buildPhase = "make";
+    dontConfigure = true;
+  };
+
+  gw = (mkLibRetroCore rec {
+    core = "gw";
+    src = fetchRetro {
+      repo = core + "-libretro";
+      rev = "819b1dde560013003eeac86c2069c5be7af25c6d";
+      sha256 = "1jhgfys8hiipvbwq3gc48d7v6wq645d10rbr4w5m6px0fk6csshk";
+    };
+    description = "Port of Game and Watch to libretro";
+    license = zlib;
+  }).override {
+    makefile = "Makefile";
+    dontConfigure = true;
   };
 
   handy = (mkLibRetroCore rec {
     core = "handy";
     src = fetchRetro {
       repo = "libretro-" + core;
-      rev = "6b19a4fad1b394f6a1351c88f60991d4878ff05b";
-      sha256 = "0lhkrwh3rirdidxb8kfcg8wk9gjsc7g6qpkv74h6f09rb4y75w1y";
+      rev = "c9fe65d1a2df454ee11404ac27bdc9be319dd9a2";
+      sha256 = "1l1gi8z68mv2cpdy7a6wvhd86q55khj3mv3drf43ak4kj2ij8cvq";
     };
     description = "Port of Handy to libretro";
     license = "Handy-License";
   }).override {
     makefile = "Makefile";
-    buildPhase = "make";
+    dontConfigure = true;
   };
 
   hatari = (mkLibRetroCore rec {
@@ -445,35 +576,24 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Hatari to libretro";
     license = gpl2;
-    extraBuildInputs = [ cmake SDL ];
+    extraBuildInputs = [ SDL ];
   }).override {
+    patchPhase = ''
+      rm configure \
+      && rm CMakeLists.txt \
+      && cp -v libretro/libretro.h src/ \
+      && substituteInPlace src/midi.c --replace "<libretro.h>" "\"../libretro/libretro.h\""
+    '';
+    dontConfigure = true;
     makefile = "Makefile.libretro";
-    buildPhase = "make";
-  };
-
-  higan-sfc = (mkLibRetroCore {
-    core = "higan-sfc";
-    src = fetchFromGitLab {
-      owner = "higan";
-      repo = "higan";
-      rev = "d3f592013a27cb78f17d84f90a6be6cf6f6af1d1";
-      sha256 = "19d4cbwg8d085xq5lmql4v5l4ckgwqzc59ha5yfgv3w4qfp4dmij";
-    };
-    description = "Accurate SNES / Super Famicom emulator";
-    license = gpl3;
-    broken = true;
-
-  }).override {
-    makefile = "GNUmakefile";
-    buildPhase = "cd higan && make compiler=g++ target=libretro binary=library && cd out";
   };
 
   mame = (mkLibRetroCore {
     core = "mame";
     src = fetchRetro {
       repo = "mame";
-      rev = "f4aac49f3d56fbd653628ac456c23ac9a6b857ae";
-      sha256 = "1pjpnwdj73319hgcjhganzrcz2zn4fnjydah989haqh3id5j3zam";
+      rev = "ed987ad07964a938351ff3cc1ad42e02ffd2af6d";
+      sha256 = "0qc66mvraffx6ws972skx3wgblich17q6z42798qn13q1a264p4j";
     };
     description = "Port of MAME to libretro";
     license = gpl2Plus;
@@ -485,97 +605,101 @@ in with stdenv.lib.licenses;
       # make -C 3rdparty/genie/build/gmake.linux -f genie.make obj/Release/src/host/lua-5.3.0/src/lgc.o
       mkdir -p 3rdparty/genie/build/gmake.linux/obj/Release/src/host/lua-5.3.0/src
     '';
-    buildPhase = "make -f Makefile.libretro";
+    makefile = "Makefile.libretro";
+    dontConfigure = true;
   };
 
   mame2000 = (mkLibRetroCore rec {
     core = "mame2000";
     src = fetchRetro {
       repo = core + "-libretro";
-      rev = "0a8a174f5e755cdd476895207003c5d07cfa6af2";
-      sha256 = "03k0cfgd4wfl31dv5xb6xjd4h7sh0k0qw6wbspwi0lgswmhz97bb";
+      rev = "e5d4a934c60adc6d42a3f87319312aad89595a15";
+      sha256 = "1zn63yqyrsnsk196v5f3nm7cx41mvsm3icpis1yxbma2r3dk3f89";
     };
     description = "Port of MAME ~2000 to libretro";
     license = gpl2Plus;
   }).override {
     makefile = "Makefile";
-    buildPhase = "make";
+    dontConfigure = true;
+    makeFlags = stdenv.lib.optionals stdenv.isAarch64 [ "ARM=0" "IS_X86=0" ];
   };
 
   mame2003 = (mkLibRetroCore rec {
     core = "mame2003";
     src = fetchRetro {
       repo = core + "-libretro";
-      rev = "170d5b6490953d40edc39defe69945d005f8ec03";
-      sha256 = "0slsf59sn5lijr1mrx5ffc9z81ra1wcw7810mb52djqyvm15r9zl";
+      rev = "82596014905ad38c80c9eb322ab08c625d1d92cd";
+      sha256 = "17dp2rz6p7q7nr0lajn3vhk9ghngxz16f7c6c87r6wgsy4y3xw0m";
     };
     description = "Port of MAME ~2003 to libretro";
     license = gpl2Plus;
   }).override {
     makefile = "Makefile";
-    buildPhase = "make";
+    dontConfigure = true;
   };
 
   mame2003-plus = (mkLibRetroCore rec {
     core = "mame2003-plus";
     src = fetchRetro {
       repo = core + "-libretro";
-      rev = "d9a56a3af908ae9100b4c9feebff4b918363f241";
-      sha256 = "1c16chfs4b2j1x1bmrklh8ssqki850k787qwq7b95dyxksj2bpx1";
+      rev = "0134c428b75882aa474f78dbbf2c6ecde49b97b7";
+      sha256 = "0jln2ys6v9hrsrkhqd87jfslwvkca425f40mf7866g6b4pz56mwc";
     };
     description = "Port of MAME ~2003+ to libretro";
     license = gpl2Plus;
   }).override {
     makefile = "Makefile";
-    buildPhase = "make";
+    dontConfigure = true;
   };
 
   mame2010 = (mkLibRetroCore rec {
     core = "mame2010";
     src = fetchRetro {
       repo = core + "-libretro";
-      rev = "4ced2c31f1100eefc7f4483b474b8a680a3b3f2b";
-      sha256 = "1a8ijj0sixr6xrqfgimna0ipfj2bb2kvj4mb45hb8a18mwn6y0mc";
+      rev = "d3151837758eade73c85c28c20e7d2a8706f30c6";
+      sha256 = "0hj0yhc8zs32fkzn8j341ybhvrsknv0k6x0z2fv3l9ic7swgb93i";
     };
     description = "Port of MAME ~2010 to libretro";
     license = gpl2Plus;
   }).override {
     makefile = "Makefile";
-    buildPhase = "make";
+    dontConfigure = true;
+    makeFlags = [ "PTR64=1" "ARM_ENABLED=1" "X86_SH2DRC=0" "FORCE_DRC_C_BACKEND=1" ];
   };
 
   mame2015 = (mkLibRetroCore rec {
     core = "mame2015";
     src = fetchRetro {
       repo = core + "-libretro";
-      rev = "e3a28398f54cd6b2c24b7165d215b046b79c10f5";
-      sha256 = "1fgwi37zgp2s92bkz03gch3ivgyjgdi3xycrd8z7x87gi20a79x9";
+      rev = "37333ed6fda4c798a1d6b055fe4708f9f0dcf5a7";
+      sha256 = "1asldlj1ywgmhabbhaagagg5hn0359122al07802q3l57ns41l64";
     };
     description = "Port of MAME ~2015 to libretro";
     license = gpl2Plus;
     extraBuildInputs = [ python27 alsaLib ];
   }).override {
     makefile = "Makefile";
-    buildPhase = "make";
+    dontConfigure = true;
   };
 
   mame2016 = (mkLibRetroCore rec {
     core = "mame2016";
     src = fetchRetro {
       repo = core + "-libretro";
-      rev = "ea4c1ffa75eb3fb0096158b71706b8b84d86d12c";
-      sha256 = "1qyvdymmjv5q0k3najgfdxzf1yr6bnysnsl19v753yj29xs4hwzp";
+      rev = "02987af9b81a9c3294af8fb9d5a34f9826a2cf4d";
+      sha256 = "0gl7irmn5d8lk7kf484vgw6kb325fq4ghwsni3il4nm5n2a8yglh";
     };
     description = "Port of MAME ~2016 to libretro";
     license = gpl2Plus;
     extraBuildInputs = [ python27 alsaLib ];
   }).override {
+    makefile = "Makefile.libretro";
     postPatch = ''
       # Prevent the failure during the parallel building of:
       # make -C 3rdparty/genie/build/gmake.linux -f genie.make obj/Release/src/host/lua-5.3.0/src/lgc.o
       mkdir -p 3rdparty/genie/build/gmake.linux/obj/Release/src/host/lua-5.3.0/src
     '';
-    buildPhase = "make -f Makefile.libretro";
+    dontConfigure = true;
   };
 
   mesen = (mkLibRetroCore rec {
@@ -583,22 +707,36 @@ in with stdenv.lib.licenses;
     src = fetchFromGitHub {
       owner = "SourMesen";
       repo = core;
-      rev = "942633dd3dbb73cc3abd748f6d5440c78abbea09";
-      sha256 = "0a95wd64vnblksacapxwxla9j2iw8a5hbdm111cldrni12q87iq2";
+      rev = "cfc5bf6976f62ebd42ea30d5a803c138fc357509";
+      sha256 = "0ihlgvzvni1yqcyi5yxdvg36q20fsqd6n67zavwfb2ph09cqv7kz";
     };
     description = "Port of Mesen to libretro";
     license = gpl3;
   }).override {
-    makefile = "Libretro/Makefile";
-    buildPhase = "cd Libretro && make";
+    makefile = "Makefile";
+    configurePhase = "cd Libretro";
+  };
+
+  meteor = (mkLibRetroCore rec {
+    core = "meteor";
+    src = fetchRetro {
+      repo = core + "-libretro";
+      rev = "3d21e3b5a7596918bee0fcaca5752ae76624c05e";
+      sha256 = "0fghnxxbdrkdz6zswkd06w2r3dvr4ikvcp8jbr7nb9fc5yzn0avw";
+    };
+    description = "Port of Meteor to libretro";
+    license = gpl3;
+  }).override {
+    makefile = "Makefile";
+    preConfigure = "cd libretro";
   };
 
   mgba = mkLibRetroCore rec {
     core = "mgba";
     src = fetchRetro {
       repo = core;
-      rev = "4865aaabc2a46c635f218f7b51f8fc5cc2c4c8ac";
-      sha256 = "1mdzwcsl5bafmgqfh0a1bgfgilisffxsygcby0igsq2bgkal47mm";
+      rev = "f87f9ef6cb38537e07dcaedeb82aecac6537d42e";
+      sha256 = "0yixvnzgk7qvcfz12r5y8i85czqxbxx6bvl1c7yms8riqn9ssvb7";
     };
     description = "Port of mGBA to libretro";
     license = mpl20;
@@ -607,9 +745,9 @@ in with stdenv.lib.licenses;
   mupen64plus = (mkLibRetroCore rec {
     core = "mupen64plus-next";
     src = fetchRetro {
-      repo = "mupen64plus-libretro-nx"; # + "-libretro-nx";
-      rev = "f77c16f9f1dd911fd2254becc8a28adcdafe8aa1";
-      sha256 = "0j6vrkwch9lwmlhyz7fp1ha0bby54gvbwk91hwbv35f6dvs0aw0d";
+      repo = "mupen64plus-libretro-nx";
+      rev = "81a58df0263c90b10b7fc11b6deee04d47e3aa40";
+      sha256 = "1brqyrsdzdq53a68q7ph01q2bx5y4m8b3ymvpp25229imm88lgkn";
     };
     description = "Libretro port of Mupen64 Plus, GL only";
     license = gpl2;
@@ -617,96 +755,130 @@ in with stdenv.lib.licenses;
     extraBuildInputs = [ libGLU libGL libpng nasm xorg.libX11 ];
   }).override {
     makefile = "Makefile";
-    buildPhase = "make";
+    dontConfigure = true;
+  };
+
+  neocd = (mkLibRetroCore rec {
+    core = "neocd";
+    src = fetchRetro {
+      repo = core + "_libretro";
+      rev = "3825848fe7dd7e0ef859729eefcb29e2ea2956b7";
+      sha256 = "018vfmjsx62zk45yx3pwisp4j133yxjbm7fnwwr244gnyms57711";
+    };
+    description = "NeoCD libretro port";
+    license = gpl3;
+  }).override {
+    makefile = "Makefile";
+    dontConfigure = true;
   };
 
   nestopia = (mkLibRetroCore rec {
     core = "nestopia";
     src = fetchRetro {
       repo = core;
-      rev = "7f48c211c281880d122981da119a4455a9bebbde";
-      sha256 = "05p3a559633dzw222rs1fh48v657mdyirl1qfqzkhqiar9rxf31g";
+      rev = "70c53f08c0cc92e90d095d6558ab737ce20431ac";
+      sha256 = "1hlfqml66wy6fn40f1iiy892vq9y9fj20vv3ynd2s3b3qxhwfx73";
     };
-    description = "nestopia undead libretro port";
+    description = "Nestopia libretro port";
     license = gpl2;
   }).override {
-    makefile = "libretro/Makefile";
-    buildPhase = "cd libretro && make";
+    makefile = "Makefile";
+    configurePhase = "cd libretro";
   };
 
   o2em = (mkLibRetroCore rec {
     core = "o2em";
     src = fetchRetro {
       repo = "libretro-" + core;
-      rev = "d6731b9b2592654ce4f1b64c1b1da17b32e7c94c";
-      sha256 = "0809qw16y7ablxfayf0lbzvq7wqdmjp0afdb0vcgv193vvhhp58q";
+      rev = "b23a796dd3490e979ff43710317df6d43bd661e1";
+      sha256 = "1pkbq7nig394zdjdic0mzdsvx8xhzamsh53xh2hzznipyj46b7z0";
     };
     description = "Port of O2EM to libretro";
     license = artistic1;
   }).override {
     makefile = "Makefile";
-    buildPhase = "make";
+    dontConfigure = true;
+  };
+
+  opera = (mkLibRetroCore rec {
+    core = "opera";
+    src = fetchRetro {
+      repo = core + "-libretro";
+      rev = "27bc2653ed469072a6a95102a8212a35fbb1e590";
+      sha256 = "10cxjpsd35rb4fjc5ycs1h00gvshpn2mxxvwb6xzrfrzva0kjw1l";
+    };
+    description = "Opera is a port of 4DO/libfreedo to libretro";
+    license = "Non-commercial";
+  }).override {
+    makefile = "Makefile";
+    dontConfigure = true;
   };
 
   parallel-n64 = (mkLibRetroCore rec {
     core = "parallel-n64";
     src = fetchRetro {
       repo = core;
-      rev = "30f4fd3c2456145763eb76aead7485a1b86ba6bd";
-      sha256 = "0kbyzmscmfi6f842clzaff4k6xcb5410fwhv8n6vv42xk6ljfvgh";
+      rev = "8fe07c62a364d0af1e22b7f75e839d42872dae7f";
+      sha256 = "0p3fpldw6w4n4l60bv55c17vhqwq4q39fp36h8iqmnj7c32c61kf";
     };
     description = "Parallel Mupen64plus rewrite for libretro.";
     license = gpl2;
-
     extraBuildInputs = [ libGLU libGL libpng ];
   }).override {
     makefile = "Makefile";
-    buildPhase = "make";
+    dontConfigure = true;
+    postPatch = stdenv.lib.optionals stdenv.isAarch64 ''
+      sed -i -e '1 i\CPUFLAGS += -DARM_FIX -DNO_ASM -DARM_ASM -DDONT_WANT_ARM_OPTIMIZATIONS -DARM64' Makefile \
+      && sed -i -e 's,CPUFLAGS  :=,,g' Makefile
+    '';
+    makeFlags = stdenv.lib.optionals stdenv.isAarch64 [ "WITH_DYNAREC=aarch64" ];
   };
 
   pcsx_rearmed = (mkLibRetroCore rec {
     core = "pcsx_rearmed";
     src = fetchRetro {
       repo = core;
-      rev = "eb6943ee04b0f30a6f1cebfe399a94bacd1dfb45";
-      sha256 = "0xikdirvjal4mdr5y9dl9gcxhdilqzq43f909b0z8vc069vj1wjz";
+      rev = "8fda5dd0e28fe46621fb1ab57781c316143017da";
+      sha256 = "0k371d0xqzqwy8ishvxssgasm36q83qj7ksn2av110n879n4knwb";
     };
-    description = "Port of PCSX ReARMed to libretro";
+    description = "Port of PCSX ReARMed with GNU lightning to libretro";
     license = gpl2;
   }).override {
-    configurePhase = "rm configure";
-    buildPhase = "make -f Makefile.libretro";
+    makefile = "Makefile.libretro";
+    dontConfigure = true;
+    makeFlags = [ "DYNAREC=lightrec" ];
   };
 
   picodrive = (mkLibRetroCore rec {
     core = "picodrive";
     src = fetchRetro {
       repo = core;
-      rev = "28dcfd6f43434e6828ee647223a0576bfe858c24";
-      sha256 = "19a1b6q8fhf7wxzyf690va1ixzlxlzyslv1zxm0ll5pfsqf2y3gx";
+      rev = "600894ec6eb657586a972a9ecd268f50907a279c";
+      sha256 = "1bxphwnq4b80ssmairy8sfc5cp4m6jyvrcjcj63q1vk7cs6qls7p";
     };
     description = "Fast MegaDrive/MegaCD/32X emulator";
     license = "MAME";
 
     extraBuildInputs = [ libpng SDL ];
   }).override {
-    patchPhase = "sed -i -e 's,SDL_CONFIG=\".*\",SDL_CONFIG=\"${SDL.dev}/bin/sdl-config\",' configure";
-    configurePhase = "./configure";
+    dontConfigure = true;
+    makeFlags = stdenv.lib.optionals stdenv.isAarch64 [ "platform=aarch64" ];
   };
 
   play = (mkLibRetroCore rec {
     core = "play";
     src = fetchRetro {
       repo = "play-";
-      rev = "fedc1e1c2918a7490a881cdb4ec951a828c19671";
-      sha256 = "0hwxx7h61gd29a2gagwjbvxk2hgwdk1wxg4nx90zrizb8nczwnl6";
+      rev = "884ae3b96c631f235cd18b2643d1f318fa6951fb";
+      sha256 = "0m9pk20jh4y02visgzfw64bpbw93bzs15x3a3bnd19yivm34dbfc";
     };
     description = "Port of Play! to libretro";
     license = bsd2;
-    extraBuildInputs = [ cmake boost ];
+    extraBuildInputs = [ cmake boost openssl curl icu libGL libGLU xorg.libX11 ];
   }).override {
+    makefile = "Makefile";
     cmakeFlags = [ "-DBUILD_PLAY=OFF -DBUILD_LIBRETRO_CORE=ON" ];
-    buildPhase = "make";
+    postBuild = "mv Source/ui_libretro/play_libretro${stdenv.hostPlatform.extensions.sharedLibrary} play_libretro${stdenv.hostPlatform.extensions.sharedLibrary}";
   };
 
   ppsspp = (mkLibRetroCore rec {
@@ -718,70 +890,97 @@ in with stdenv.lib.licenses;
     };
     description = "ppsspp libretro port";
     license = gpl2;
-    extraBuildInputs = [ cmake libGLU libGL ffmpeg python37 xorg.libX11 ];
+    extraBuildInputs = [ cmake libGLU libGL libzip ffmpeg pkgconfig python37 snappy xorg.libX11 ];
   }).override {
-    cmakeFlags = [ "-DLIBRETRO=ON" ];
     makefile = "Makefile";
-    buildPhase = ''
-      make \
-      && mv lib/ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary} ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary}
-    '';
+    cmakeFlags = [ "-DLIBRETRO=ON -DUSE_SYSTEM_FFMPEG=ON -DUSE_SYSTEM_SNAPPY=ON -DUSE_SYSTEM_LIBZIP=ON -DOpenGL_GL_PREFERENCE=GLVND" ];
+    postBuild = "mv lib/ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary} ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary}";
   };
 
   prboom = (mkLibRetroCore rec {
     core = "prboom";
     src = fetchRetro {
       repo = "libretro-" + core;
-      rev = "4c690eb6b569a276c5b2a87680718f715477eae2";
-      sha256 = "02vkl3y5dmyzifsviphspqv03a2rdyf36zpjpgfg7x0s226f56ja";
+      rev = "991016b3c7a9c8b0e49b2bc9c72f68c60800fc7b";
+      sha256 = "1abv9qgfvh3x84shgyl3y90bjz77mjj17vibag7bg6i8hgjikjgq";
     };
     description = "Prboom libretro port";
     license = gpl2;
   }).override {
-    buildPhase = "make";
+    makefile = "Makefile";
+    dontConfigure = true;
   };
 
   prosystem = (mkLibRetroCore rec {
     core = "prosystem";
     src = fetchRetro {
       repo = core + "-libretro";
-      rev = "cb4aa3ee72f98b0891a7bac5c9dac458cdba4d34";
-      sha256 = "0yvzmks9zz1hf7mv6cd2qin1p3yx00dbrcxlm0yysy5q5jiigblg";
+      rev = "6f7e34aea89db5ba2fbf674e5ff0ad6fc68a198e";
+      sha256 = "0pqkb0f51s8ma0l4m9xk2y85z2kh3fgay9g4g8fingbgqq1klvzs";
     };
     description = "Port of ProSystem to libretro";
     license = gpl2;
   }).override {
     makefile = "Makefile";
-    buildPhase = "make";
+    dontConfigure = true;
   };
 
   quicknes = (mkLibRetroCore rec {
     core = "quicknes";
     src = fetchRetro {
       repo = "QuickNES_Core";
-      rev = "cd302d998d102c9461a924b81817e48b9ea1518f";
-      sha256 = "1sczs1jqcbhpkb5xpcqqdcnxlz7bqmanm4gdnnc12c19snl7999b";
+      rev = "31654810b9ebf8b07f9c4dc27197af7714364ea7";
+      sha256 = "15fr5a9hv7wgndb0fpmr6ws969him41jidzir2ix9xkb0mmvcm86";
     };
     description = "QuickNES libretro port";
     license = lgpl21Plus;
   }).override {
     makefile = "Makefile";
-    buildPhase = "make";
+    dontConfigure = true;
+  };
+
+  sameboy = (mkLibRetroCore rec {
+    core = "sameboy";
+    src = fetchRetro {
+      repo = "sameboy";
+      rev = "c9e547c1063fd62c40a4b7a86e7db99dc9089051";
+      sha256 = "0bff6gicm24d7h270aqvgd8il6mi7j689nj5zl9ij0wc77hrrpmq";
+    };
+    description = "SameBoy libretro port";
+    license = mit;
+    extraBuildInputs = [ which hexdump ];
+  }).override {
+    makefile = "Makefile";
+    configurePhase = "cd libretro";
+    makeFlags = [ "GIT_VERSION=$version" ];
   };
 
   scummvm = (mkLibRetroCore rec {
     core = "scummvm";
     src = fetchRetro {
       repo = core;
-      rev = "e07a6ede61c364fb87630fa7507a4f8482d882e0";
-      sha256 = "0i88z53q28lwzmadxincab4m66qbzcbmasgildybj8db0z2z8jm0";
+      rev = "de91bf9bcbf4449f91e2f50fde173496a2b52ee0";
+      sha256 = "06h9xaf2b1cjk85nbslpjj0fm9iy9b2lxr1wf3i09hgs4sh6x464";
     };
     description = "Libretro port of ScummVM";
     license = gpl2;
     extraBuildInputs = [ fluidsynth libjpeg libvorbis libGLU libGL SDL ];
   }).override {
-    makefile = "backends/platform/libretro/build/Makefile";
-    buildPhase = "cd backends/platform/libretro/build && make";
+    makefile = "Makefile";
+    configurePhase = "cd backends/platform/libretro/build";    
+  };
+
+  smsplus-gx = (mkLibRetroCore rec {
+    core = "smsplus";
+    src = fetchRetro {
+      repo = core + "-gx";
+      rev = "36c82768c03d889f1cf4b66369edac2297acba32";
+      sha256 = "1f9waikyp7kp2abb76wlv9hmf2jpc76zjmfqyc7wk2pc70ljm3l4";
+    };
+    description = "SMS Plus GX libretro port";
+    license = gpl2Plus;
+  }).override {
+    dontConfigure = true;
   };
 
   snes9x = (mkLibRetroCore rec {
@@ -789,85 +988,134 @@ in with stdenv.lib.licenses;
     src = fetchFromGitHub {
       owner = "snes9xgit";
       repo = core;
-      rev = "04692e1ee45cc647423774ee17c63208c2713638";
-      sha256 = "09p9m85fxwrrrapjb08rcxknpgq5d6a87arrm1jn94r56glxlcfa";
+      rev = "6db918cfe32b157239da44096091c212fdfb3b60";
+      sha256 = "0y3jhy50qdhhfglybys9m0fgk9r24ksdcgv5iqpyxy5a4cjvhv8j";
     };
     description = "Port of SNES9x git to libretro";
     license = "Non-commercial";
   }).override {
-    makefile = "libretro/Makefile";
-    buildPhase = "cd libretro && make";
+    makefile = "Makefile";
+    configurePhase = "cd libretro";
   };
 
   snes9x2002 = (mkLibRetroCore rec {
     core = "snes9x2002";
     src = fetchRetro {
       repo = core;
-      rev = "354bcb5acea0aa45b56ae553e0b2b4f10792dfeb";
-      sha256 = "05gvjjxy6ci5pax3frd9g8k9mkqskab5g6rvfjab7cc4zrxrg23f";
+      rev = "a869da7f22c63ee1cb316f79c6dd7691a369da3e";
+      sha256 = "11lcwscnxg6sk9as2xlr4nai051qhidbsymyis4nz3r4dmgzf8j8";
     };
     description = "Optimized port/rewrite of SNES9x 1.39 to Libretro";
     license = "Non-commercial";
   }).override {
     makefile = "Makefile";
-    buildPhase = "make";
+    dontConfigure = true;
   };
 
   snes9x2005 = (mkLibRetroCore rec {
     core = "snes9x2005";
     src = fetchRetro {
       repo = core;
-      rev = "e5cadd2f21fb64e8c7194ad006b39e6f555c4a5b";
-      sha256 = "1q0xrw3f8zm2k19sva8cz28yx815w8a6y1xsl0i6bb3cai3q1hyx";
+      rev = "c216559b9e0dc3d7f059dcf31b813402ad47fea5";
+      sha256 = "19b2rpj6i32c34ryvlna4yca84y5ypza78w4x9l17qlhp021h9pv";
     };
     description = "Optimized port/rewrite of SNES9x 1.43 to Libretro";
     license = "Non-commercial";
   }).override {
     makefile = "Makefile";
-    buildPhase = ''
-      make USE_BLARGG_APU=1 \
-      && mv snes9x2005_plus_libretro${stdenv.hostPlatform.extensions.sharedLibrary} snes9x2005_libretro${stdenv.hostPlatform.extensions.sharedLibrary}
-    '';
+    dontConfigure = true;
+    makeFlags = [ "USE_BLARGG_APU=1" ];
+    postBuild = "mv snes9x2005_plus_libretro${stdenv.hostPlatform.extensions.sharedLibrary} snes9x2005_libretro${stdenv.hostPlatform.extensions.sharedLibrary}";
   };
 
   snes9x2010 = (mkLibRetroCore rec {
     core = "snes9x2010";
     src = fetchRetro {
       repo = core;
-      rev = "e945cbae0f8c472e1567a319817c9228b775dd71";
-      sha256 = "1pj5p4a2hy7hk90bzy4vnkz3b6nc8n1niqibgwhyfsc22xlxqsfr";
+      rev = "ba9f2240360f8db270fb6ba5465c79c317070560";
+      sha256 = "00y53sjrsp8sccpp1qqw88iawsz30g6d370cbqcxs4ya1r6awn5x";
     };
     description = "Optimized port/rewrite of SNES9x 1.52+ to Libretro";
     license = "Non-commercial";
   }).override {
-    buildPhase = ''
-      make -f Makefile.libretro
-    '';
+    makefile = "Makefile.libretro";
+    dontConfigure = true;
   };
 
   stella = (mkLibRetroCore rec {
     core = "stella";
+    src = fetchFromGitHub {
+      owner = "stella-emu";
+      repo = core;
+      rev = "506bb0bd0618e676b1959931dcc00a9d0f5f0f3d";
+      sha256 = "09nclx0ksixngnxkkjjcyhf3d0vl4ykm8fx7m307lvag8nxj7z03";
+    };
+    description = "Port of Stella to libretro";
+    license = gpl2;
+    extraBuildInputs = [ libpng pkgconfig SDL ];
+  }).override {
+    makefile = "Makefile";
+    configurePhase = "cd src/libretro";
+    makeFlags = [ "LTO=" ];    
+  };
+
+  stella2014 = (mkLibRetroCore rec {
+    core = "stella2014";
     src = fetchRetro {
-      repo = core + "2014-libretro";
-      rev = "6d74ad9a0fd779145108cf1213229798d409ed37";
-      sha256 = "0b1nsk92rr64xxj8jc9vpjqgrmm3554096zl031ymr94j5cc87q9";
+      repo = core + "-libretro";
+      rev = "fc87f2c78d3b177f4b9b19698557dce452ac3ce7";
+      sha256 = "0yqzavk1w0d0ngpls32c4wlihii97fz2g6zsgadhm48apwjvn3xx";
     };
     description = "Port of Stella to libretro";
     license = gpl2;
   }).override {
     makefile = "Makefile";
-    buildPhase = ''
-      make \
-      && mv stella2014_libretro${stdenv.hostPlatform.extensions.sharedLibrary} stella_libretro${stdenv.hostPlatform.extensions.sharedLibrary}
-    '';
+    dontConfigure = true;
+  };
+
+  tgbdual = (mkLibRetroCore rec {
+    core = "tgbdual";
+    src = fetchRetro {
+      repo = core + "-libretro";
+      rev = "9be31d373224cbf288db404afc785df41e61b213";
+      sha256 = "19m3f3hj3jyg711z1xq8qn1hgsr593krl6s6hi0r6vf8p5x0zbzw";
+    };
+    description = "Port of TGBDual to libretro";
+    license = gpl2;
+  }).override {
+    makefile = "Makefile";
+    dontConfigure = true;
+  };
+
+  tic80 = (mkLibRetroCore rec {
+    core = "tic80";
+    src = fetchRetro {
+      repo = "tic-80";
+      rev = "f43bad908d5f05f2a66d5cd1d6f21b234d4abd2c";
+      sha256 = "0bp34r8qqyw52alws1z4ib9j7bs4d641q6nvqszd07snp9lpvwym";
+    };
+    description = "Port of TIC-80 to libretro";
+    license = mit;
+    extraBuildInputs = [ cmake pkgconfig ];
+  }).override {
+    makefile = "Makefile";
+    cmakeFlags = [
+      "-DBUILD_LIBRETRO=ON"
+      "-DBUILD_DEMO_CARTS=OFF"
+      "-DBUILD_PRO=OFF"
+      "-DBUILD_PLAYER=OFF"
+      "-DBUILD_SDL=OFF"
+      "-DBUILD_SOKOL=OFF"
+    ];
+    postBuild = "cd lib";
   };
 
   vba-next = mkLibRetroCore rec {
     core = "vba-next";
     src = fetchRetro {
       repo = core;
-      rev = "3580ae6acb1a90c4e982e57597458da07eca4f41";
-      sha256 = "0fz8z04kf9g1i5x5slyvx5kb07garzxvhcqnwmqn5j574xh1lc6d";
+      rev = "019132daf41e33a9529036b8728891a221a8ce2e";
+      sha256 = "0hab4rhvvcg30jifd9h9jq5q2vqk2hz5i1q456w6v2d10hl1lf15";
     };
     description = "VBA-M libretro port with modifications for speed";
     license = gpl2;
@@ -877,55 +1125,57 @@ in with stdenv.lib.licenses;
     core = "vbam";
     src = fetchRetro {
       repo = core + "-libretro";
-      rev = "9ccdeac3aa9db00720bb80eff5c9924362144efa";
-      sha256 = "0rq89i9f483j93shhp2p3vqsnb2abpwz6wdnsycfwxgblczmi22y";
+      rev = "7d88e045a2fe44e56b3f84846beec446b4c4b2d9";
+      sha256 = "04f8adg99a36qkqhij54vkw5z18m5ld33p78lbmv8cxk7k7g7yhy";
     };
     description = "vanilla VBA-M libretro port";
     license = gpl2;
   }).override {
-    makefile = "src/libretro/Makefile";
-    buildPhase = "cd src/libretro && make";
+    makefile = "Makefile";
+    configurePhase = "cd src/libretro";
   };
 
   vecx = (mkLibRetroCore rec {
     core = "vecx";
     src = fetchRetro {
       repo = "libretro-" + core;
-      rev = "26585ee701499550e484c11f005db18e926827d9";
-      sha256 = "0vz2aksc8mqnw55f2bvvawj21mxf60fp93r0sr55hdccn9h7355k";
+      rev = "321205271b1c6be5dbdb8d309097a5b5c2032dbd";
+      sha256 = "1w54394yhf2yqmq1b8wi5y7lvixc5hpjxpyiancrdbjd0af7pdvd";
     };
     description = "Port of Vecx to libretro";
     license = gpl3;
   }).override {
-    buildPhase = "make";
+    dontConfigure = true;
   };
 
   virtualjaguar = (mkLibRetroCore rec {
     core = "virtualjaguar";
     src = fetchRetro {
       repo = core + "-libretro";
-      rev = "7bdd8658880b53bf2bcbae0741323fe18f9041f5";
-      sha256 = "0zbrsfhvx293ijazy1w19qha19hprsi0zv8295sa0gq8kyh0xhyw";
+      rev = "a162fb75926f5509f187e9bfc69958bced40b0a6";
+      sha256 = "06k8xpn5y9rzmi2lwfw0v9v9pz4wvmpalycc608bw9cl39lmz10h";
     };
     description = "Port of VirtualJaguar to libretro";
     license = gpl3;
   }).override {
     makefile = "Makefile";
-    buildPhase = "make";
+    dontConfigure = true;
   };
 
   yabause = (mkLibRetroCore rec {
     core = "yabause";
     src = fetchRetro {
       repo = core;
-      rev = "08d09cb88a69ee4c2986693fb813e0eb58d71481";
-      sha256 = "0z55yam1l7m21kbjwn44sp4md9g7p95b27vcxr7i0v08gnkwwvv1";
+      rev = "9be109f9032afa793d2a79b837c4cc232cea5929";
+      sha256 = "0aj862bs4dmnldy62wdssj5l63ibfkbzqvkxcqa3wyvdz4i367jc";
     };
     description = "Port of Yabause to libretro";
     license = gpl2;
   }).override {
-    makefile = "yabause/src/libretro/Makefile";
-    buildPhase = "cd yabause/src/libretro && make";
+    makefile = "Makefile";
+    configurePhase = "cd yabause/src/libretro";
+    # Disable SSE for non-x86. DYNAREC doesn't build on either Aarch64 or x86_64.
+    makeFlags = [ "HAVE_SSE=0" "DYNAREC=0" ];
   };
 
 }
diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
index 3f14258b0c01..a04bc22194fd 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -29,12 +29,12 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "retroarch-bare";
-  version = "1.8.1";
+  version = "1.8.4";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "RetroArch";
-    sha256 = "0y7rcpz7psf8k3agsrq277jdm651vbnn9xpqvmj2in1a786idya7";
+    sha256 = "0zs86s6rg6c87hry52mjri5ff3lpc79wdiq4wr3rmkv7bzqrd9ca";
     rev = "v${version}";
   };
 
@@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  configureFlags = if stdenv.isLinux then [ "--enable-kms" ] else "";
+  configureFlags = stdenv.lib.optionals stdenv.isLinux [ "--enable-kms" "--enable-egl" ];
 
   postInstall = optionalString withVulkan ''
     wrapProgram $out/bin/retroarch --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib
@@ -86,6 +86,6 @@ in stdenv.mkDerivation rec {
     description = "Multi-platform emulator frontend for libretro cores";
     license = licenses.gpl3;
     platforms = platforms.all;
-    maintainers = with maintainers; [ MP2E edwtjo matthewbauer ];
+    maintainers = with maintainers; [ MP2E edwtjo matthewbauer kolbycrouch ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2bc8a135ebb..34053ff5358d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22388,7 +22388,6 @@ in
       inherit (lib) optional;
     in with libretro;
       ([ ]
-      ++ optional (cfg.enable4do or false) _4do
       ++ optional (cfg.enableAtari800 or false) atari800
       ++ optional (cfg.enableBeetleGBA or false) beetle-gba
       ++ optional (cfg.enableBeetleLynx or false) beetle-lynx
@@ -22396,26 +22395,33 @@ in
       ++ optional (cfg.enableBeetlePCEFast or false) beetle-pce-fast
       ++ optional (cfg.enableBeetlePCFX or false) beetle-pcfx
       ++ optional (cfg.enableBeetlePSX or false) beetle-psx
+      ++ optional (cfg.enableBeetlePSXHW or false) beetle-psx-hw
       ++ optional (cfg.enableBeetleSaturn or false) beetle-saturn
+      ++ optional (cfg.enableBeetleSaturnHW or false) beetle-saturn-hw
       ++ optional (cfg.enableBeetleSNES or false) beetle-snes
       ++ optional (cfg.enableBeetleSuperGrafx or false) beetle-supergrafx
       ++ optional (cfg.enableBeetleWswan or false) beetle-wswan
       ++ optional (cfg.enableBeetleVB or false) beetle-vb
       ++ optional (cfg.enableBlueMSX or false) bluemsx
       ++ optional (cfg.enableBsnesMercury or false) bsnes-mercury
-      ++ optional (cfg.enableDOSBox or false) dosbox
+      ++ optional (cfg.enableCitra or false) citra
       ++ optional (cfg.enableDesmume or false) desmume
       ++ optional (cfg.enableDesmume2015 or false) desmume2015
       ++ optional (cfg.enableDolphin or false) dolphin
-      ++ optional (cfg.enableFBA or false) fba
+      ++ optional (cfg.enableDOSBox or false) dosbox
+      ++ optional (cfg.enableEightyOne or false) eightyone
+      ++ optional (cfg.enableFBAlpha2012 or false) fbalpha2012
+      ++ optional (cfg.enableFBNeo or false) fbneo
       ++ optional (cfg.enableFceumm or false) fceumm
       ++ optional (cfg.enableFlycast or false) flycast
+      ++ optional (cfg.enableFMSX or false) fmsx
+      ++ optional (cfg.enableFreeIntv or false) freeintv
       ++ optional (cfg.enableGambatte or false) gambatte
       ++ optional (cfg.enableGenesisPlusGX or false) genesis-plus-gx
       ++ optional (cfg.enableGpsp or false) gpsp
+      ++ optional (cfg.enableGW or false) gw
       ++ optional (cfg.enableHandy or false) handy
       ++ optional (cfg.enableHatari or false) hatari
-      ++ optional (cfg.enableHiganSFC or false) higan-sfc
       ++ optional (cfg.enableMAME or false) mame
       ++ optional (cfg.enableMAME2000 or false) mame2000
       ++ optional (cfg.enableMAME2003 or false) mame2003
@@ -22424,10 +22430,13 @@ in
       ++ optional (cfg.enableMAME2015 or false) mame2015
       ++ optional (cfg.enableMAME2016 or false) mame2016
       ++ optional (cfg.enableMesen or false) mesen
+      ++ optional (cfg.enableMeteor or false) meteor
       ++ optional (cfg.enableMGBA or false) mgba
       ++ optional (cfg.enableMupen64Plus or false) mupen64plus
+      ++ optional (cfg.enableNeoCD or false) neocd
       ++ optional (cfg.enableNestopia or false) nestopia
       ++ optional (cfg.enableO2EM or false) o2em
+      ++ optional (cfg.enableOpera or false) opera
       ++ optional (cfg.enableParallelN64 or false) parallel-n64
       ++ optional (cfg.enablePCSXRearmed or false) pcsx_rearmed
       ++ optional (cfg.enablePicodrive or false) picodrive
@@ -22436,24 +22445,22 @@ in
       ++ optional (cfg.enablePrboom or false) prboom
       ++ optional (cfg.enableProSystem or false) prosystem
       ++ optional (cfg.enableQuickNES or false) quicknes
+      ++ optional (cfg.enableSameBoy or false) sameboy
       ++ optional (cfg.enableScummVM or false) scummvm
+      ++ optional (cfg.enableSMSPlusGX or false) smsplus-gx
       ++ optional (cfg.enableSnes9x or false) snes9x
       ++ optional (cfg.enableSnes9x2002 or false) snes9x2002
       ++ optional (cfg.enableSnes9x2005 or false) snes9x2005
       ++ optional (cfg.enableSnes9x2010 or false) snes9x2010
       ++ optional (cfg.enableStella or false) stella
+      ++ optional (cfg.enableStella2014 or false) stella2014
+      ++ optional (cfg.enableTGBDual or false) tgbdual
+      ++ optional (cfg.enableTIC80 or false) tic80
       ++ optional (cfg.enableVbaNext or false) vba-next
       ++ optional (cfg.enableVbaM or false) vba-m
       ++ optional (cfg.enableVecx or false) vecx
       ++ optional (cfg.enableVirtualJaguar or false) virtualjaguar
       ++ optional (cfg.enableYabause or false) yabause
-      # added on 2017-02-25 due #23163
-      ++ optional (cfg.enableMednafenPCEFast or false)
-          (throw "nix config option enableMednafenPCEFast has been renamed to enableBeetlePCEFast")
-      ++ optional (cfg.enableMednafenPSX or false)
-          (throw "nix config option enableMednafenPSX has been renamed to enableBeetlePSX")
-      ++ optional (cfg.enableMednafenSaturn or false)
-          (throw "nix config option enableMednafenSaturn has been renamed to enableBeetleSaturn")
       );
 
   wrapRetroArch = { retroarch }: callPackage ../misc/emulators/retroarch/wrapper.nix {

From c91bb59b727aebf6cd83d0666cba02a2eacb2de8 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Sun, 15 Mar 2020 00:32:43 -0700
Subject: [PATCH 3133/4636] ripcord: 0.4.23 -> 0.4.24

---
 .../networking/instant-messengers/ripcord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix
index 6efb900b3b57..16cf7f5fc779 100755
--- a/pkgs/applications/networking/instant-messengers/ripcord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix
@@ -5,12 +5,12 @@
 
 mkDerivation rec {
   pname = "ripcord";
-  version = "0.4.23";
+  version = "0.4.24";
 
   src = let
     appimage = fetchurl {
       url = "https://cancel.fm/dl/Ripcord-${version}-x86_64.AppImage";
-      sha256 = "0395w0pwr1cz8ichcbyrsscmm2p7srgjk4vkqvqgwyx41prm0x2h";
+      sha256 = "0rscmnwxvbdl0vfx1pz7x5gxs9qsjk905zmcad4f330j5l5m227z";
       name = "${pname}-${version}.AppImage";
     };
   in appimageTools.extract {

From cfb57680ee4c568571fb879f57721e627ba3b4cb Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Sun, 15 Mar 2020 10:43:24 +0300
Subject: [PATCH 3134/4636] openorienteering-mapper: 0.9.1 -> 0.9.2

---
 pkgs/applications/gis/openorienteering-mapper/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix
index 21d16282edcb..2fc118597f92 100644
--- a/pkgs/applications/gis/openorienteering-mapper/default.nix
+++ b/pkgs/applications/gis/openorienteering-mapper/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   pname = "OpenOrienteering-Mapper";
-  version = "0.9.1";
+  version = "0.9.2";
 
   buildInputs = [ gdal qtbase qttools qtlocation qtimageformats
                   qtsensors clipper zlib proj doxygen cups];
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     owner = "OpenOrienteering";
     repo = "mapper";
     rev = "v${version}";
-    sha256 = "1fyhvf2y89hj7wj89kxccx3dqcja6ndy3w4rx1vmzrp246jpz7wb";
+    sha256 = "1787f2agjzcyizk2m60icb44yv9dlwv6irw3k53fqfmwkhkd2h5p";
   };
 
   cmakeFlags =
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
       OpenOrienteering Mapper is an orienteering mapmaking program
       and provides a free alternative to the existing proprietary solution.
     '';
-    homepage = https://www.openorienteering.org/apps/mapper/;
+    homepage = "https://www.openorienteering.org/apps/mapper/";
     license = licenses.gpl3;
     platforms = with platforms; linux ++ darwin;
     maintainers = with maintainers; [ mpickering sikmir ];

From 9336b15a88c01892278bd179907a08a3d11c21d6 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Fri, 6 Mar 2020 12:16:33 +0300
Subject: [PATCH 3135/4636] libvirt: 5.4.0 -> 5.9.0

---
 .../libvirt/{5.4.0.nix => 5.9.0.nix}          | 34 +++----------------
 .../libvirt/{5.4.0.nix => 5.9.0.nix}          |  4 +--
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-packages.nix            |  4 +--
 4 files changed, 10 insertions(+), 34 deletions(-)
 rename pkgs/development/libraries/libvirt/{5.4.0.nix => 5.9.0.nix} (77%)
 rename pkgs/development/python-modules/libvirt/{5.4.0.nix => 5.9.0.nix} (85%)

diff --git a/pkgs/development/libraries/libvirt/5.4.0.nix b/pkgs/development/libraries/libvirt/5.9.0.nix
similarity index 77%
rename from pkgs/development/libraries/libvirt/5.4.0.nix
rename to pkgs/development/libraries/libvirt/5.9.0.nix
index dd0a88974d06..3a57a91a22ae 100644
--- a/pkgs/development/libraries/libvirt/5.4.0.nix
+++ b/pkgs/development/libraries/libvirt/5.9.0.nix
@@ -4,7 +4,7 @@
 , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
 , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
 , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
-, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode
+, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, glib
 , enableXen ? false, xen ? null
 , enableIscsi ? false, openiscsi
 , enableCeph ? false, ceph
@@ -17,50 +17,26 @@ let
   buildFromTarball = stdenv.isDarwin;
 in stdenv.mkDerivation rec {
   pname = "libvirt";
-  version = "5.4.0";
+  version = "5.9.0";
 
   src =
     if buildFromTarball then
       fetchurl {
         url = "http://libvirt.org/sources/${pname}-${version}.tar.xz";
-        sha256 = "0ywf8m9yz2hxnic7fylzlmgy4m353r4vv5zsvp89zq5yh4h81yhw";
+        sha256 = "0fc9jxw3v6x5hc10bkd7bbcayn24hbld5adj2gh5s648v7hx55il";
       }
     else
       fetchgit {
         url = git://libvirt.org/libvirt.git;
         rev = "v${version}";
-        sha256 = "1dja1mf295w0sl83zag62c4j55cfbzzfbhdxpkyv2zm3zv0mwdyc";
+        sha256 = "0smm77ag8bg24xkbhl4akqikjrsq2pd3wk31nj0hk1avqnl00gmk";
         fetchSubmodules = true;
       };
 
-  patches = optionals (!stdenv.isDarwin) [
-    (fetchpatch {
-      name = "5.4.0-CVE-2019-10161.patch";
-      url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=aed6a032cead4386472afb24b16196579e239580";
-      sha256 = "19k9z9xx68nf03igbgy1imxnlp5ppj7cgdbq9kri3s834hkjcygs";
-    })
-  ] ++ [
-    (fetchpatch {
-      name = "5.4.0-CVE-2019-10166.patch";
-      url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=db0b78457f183e4c7ac45bc94de86044a1e2056a";
-      sha256 = "17pd1rab2mxj4q0vg30vi2gh78mf52ik1p5l12wrghb0wjf7swml";
-    })
-    (fetchpatch {
-      name = "5.4.0-CVE-2019-10167.patch";
-      url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=8afa68bac0cf99d1f8aaa6566685c43c22622f26";
-      sha256 = "0hgbwk0y2n6ihzjk8vqabhw914axjqgzcb7c5xx893r86c54c0ml";
-    })
-    (fetchpatch {
-      name = "5.4.0-CVE-2019-10168.patch";
-      url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=bf6c2830b6c338b1f5699b095df36f374777b291";
-      sha256 = "0s4hc3hsjncx1852ndjas1nng9v23pxf4mi1jxcajsqvhw89la0g";
-    })
-  ];
-
   nativeBuildInputs = [ makeWrapper pkgconfig ];
   buildInputs = [
     libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
-    libxslt xhtml1 perlPackages.XMLXPath curl libpcap
+    libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib
   ] ++ optionals (!buildFromTarball) [
     libtool autoconf automake
   ] ++ optionals stdenv.isLinux [
diff --git a/pkgs/development/python-modules/libvirt/5.4.0.nix b/pkgs/development/python-modules/libvirt/5.9.0.nix
similarity index 85%
rename from pkgs/development/python-modules/libvirt/5.4.0.nix
rename to pkgs/development/python-modules/libvirt/5.9.0.nix
index 46d8a990f537..ef5da737e08c 100644
--- a/pkgs/development/python-modules/libvirt/5.4.0.nix
+++ b/pkgs/development/python-modules/libvirt/5.9.0.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "libvirt";
-  version = "5.4.0";
+  version = "5.9.0";
 
   src = fetchgit {
     url = git://libvirt.org/libvirt-python.git;
     rev = "v${version}";
-    sha256 = "0ja35z90i3m7vsjfpzfm7awkmja3h0150376i5pzmf2q8vp61fi5";
+    sha256 = "0qvr0s7yasswy1s5cvkm91iifk33pb8s7nbb38zznc46706b358r";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c74dee307d91..81985fb6b4e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13241,7 +13241,7 @@ in
   libversion = callPackage ../development/libraries/libversion { };
 
   libvirt = callPackage ../development/libraries/libvirt { };
-  libvirt_5_4_0 = callPackage ../development/libraries/libvirt/5.4.0.nix { };
+  libvirt_5_9_0 = callPackage ../development/libraries/libvirt/5.9.0.nix { };
 
   libvirt-glib = callPackage ../development/libraries/libvirt-glib { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c4ea9dc6ac13..1af1e4207fc3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6414,9 +6414,9 @@ in {
 
   libvirt = if isPy3k then (callPackage ../development/python-modules/libvirt {
     inherit (pkgs) libvirt pkgconfig;
-  }) else (callPackage ../development/python-modules/libvirt/5.4.0.nix {
+  }) else (callPackage ../development/python-modules/libvirt/5.9.0.nix {
     inherit (pkgs) pkgconfig;
-    libvirt = pkgs.libvirt_5_4_0;
+    libvirt = pkgs.libvirt_5_9_0;
   });
 
   rpdb = callPackage ../development/python-modules/rpdb { };

From 47f61c9d7f116701ad9ca0d4b894ebb5f36ef5cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 15 Mar 2020 09:09:49 +0100
Subject: [PATCH 3136/4636] bind: 9.14.10 -> 9.14.11 (small bugfix)

I see just a single small bugfix in the news:
https://downloads.isc.org/isc/bind9/9.14.11/RELEASE-NOTES-bind-9.14.11.html
---
 pkgs/servers/dns/bind/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 9cfd7514621e..bdbff4c00f78 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -10,11 +10,11 @@ assert enablePython -> python3 != null;
 
 stdenv.mkDerivation rec {
   pname = "bind";
-  version = "9.14.10";
+  version = "9.14.11";
 
   src = fetchurl {
     url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0nkkc2phkkzwgl922xg41gx5pc5f4safabqslaw3880hwdf8vfaa";
+    sha256 = "1v4y9308w0gd98gjzni4cgxmh8g1s37lbnnkyhsn70xs3xki5b4c";
   };
 
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

From da3384a25d52a3a907e95d3c21b406caac688d76 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sun, 15 Mar 2020 10:27:37 +0100
Subject: [PATCH 3137/4636] php: Re-indent main derivation

---
 pkgs/development/interpreters/php/default.nix | 231 +++++++++---------
 1 file changed, 112 insertions(+), 119 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index b3a92893a6c2..286dea5d930c 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -67,58 +67,52 @@ let
   , ipv6Support ? config.php.ipv6 or true
   , pearSupport ? (config.php.pear or true) && (libxml2Support)
   }:
+  let
+    libmcrypt' = libmcrypt.override { disablePosixThreads = true; };
+  in stdenv.mkDerivation {
+    pname = "php";
 
-    let
-      libmcrypt' = libmcrypt.override { disablePosixThreads = true; };
-    in stdenv.mkDerivation {
+    inherit version;
 
-      inherit version;
+    enableParallelBuilding = true;
 
-      pname = "php";
+    nativeBuildInputs = [ autoconf automake bison file flex libtool pkgconfig re2c ];
 
-      enableParallelBuilding = true;
+    buildInputs = [ ]
+      ++ optional (versionOlder version "7.3") pcre
+      ++ optional (versionAtLeast version "7.3") pcre2
+      ++ optional (versionAtLeast version "7.4") oniguruma
+      ++ optional withSystemd systemd
+      ++ optionals imapSupport [ uwimap openssl pam ]
+      ++ optionals curlSupport [ curl openssl ]
+      ++ optionals ldapSupport [ openldap openssl ]
+      ++ optionals gdSupport [ gd freetype libXpm libjpeg libpng libwebp ]
+      ++ optionals opensslSupport [ openssl openssl.dev ]
+      ++ optional apxs2Support apacheHttpd
+      ++ optional (ldapSupport && stdenv.isLinux) cyrus_sasl
+      ++ optional mhashSupport libmhash
+      ++ optional zlibSupport zlib
+      ++ optional libxml2Support libxml2
+      ++ optional readlineSupport readline
+      ++ optional sqliteSupport sqlite
+      ++ optional postgresqlSupport postgresql
+      ++ optional pdo_odbcSupport unixODBC
+      ++ optional pdo_pgsqlSupport postgresql
+      ++ optional gmpSupport gmp
+      ++ optional gettextSupport gettext
+      ++ optional intlSupport icu
+      ++ optional xslSupport libxslt
+      ++ optional mcryptSupport libmcrypt'
+      ++ optional bz2Support bzip2
+      ++ optional sodiumSupport libsodium
+      ++ optional tidySupport html-tidy
+      ++ optional argon2Support libargon2
+      ++ optional libzipSupport libzip
+      ++ optional valgrindSupport valgrind;
 
-      nativeBuildInputs = [
-        autoconf automake bison file flex libtool pkgconfig re2c
-      ];
+    CXXFLAGS = optionalString stdenv.cc.isClang "-std=c++11";
 
-      buildInputs = [ ]
-        ++ optional (versionOlder version "7.3") pcre
-        ++ optional (versionAtLeast version "7.3") pcre2
-        ++ optional (versionAtLeast version "7.4") oniguruma
-        ++ optional withSystemd systemd
-        ++ optionals imapSupport [ uwimap openssl pam ]
-        ++ optionals curlSupport [ curl openssl ]
-        ++ optionals ldapSupport [ openldap openssl ]
-        ++ optionals gdSupport [ gd freetype libXpm libjpeg libpng libwebp ]
-        ++ optionals opensslSupport [ openssl openssl.dev ]
-        ++ optional apxs2Support apacheHttpd
-        ++ optional (ldapSupport && stdenv.isLinux) cyrus_sasl
-        ++ optional mhashSupport libmhash
-        ++ optional zlibSupport zlib
-        ++ optional libxml2Support libxml2
-        ++ optional readlineSupport readline
-        ++ optional sqliteSupport sqlite
-        ++ optional postgresqlSupport postgresql
-        ++ optional pdo_odbcSupport unixODBC
-        ++ optional pdo_pgsqlSupport postgresql
-        ++ optional gmpSupport gmp
-        ++ optional gettextSupport gettext
-        ++ optional intlSupport icu
-        ++ optional xslSupport libxslt
-        ++ optional mcryptSupport libmcrypt'
-        ++ optional bz2Support bzip2
-        ++ optional sodiumSupport libsodium
-        ++ optional tidySupport html-tidy
-        ++ optional argon2Support libargon2
-        ++ optional libzipSupport libzip
-        ++ optional valgrindSupport valgrind;
-
-      CXXFLAGS = optionalString stdenv.cc.isClang "-std=c++11";
-
-      configureFlags = [
-        "--with-config-file-scan-dir=/etc/php.d"
-      ]
+    configureFlags = [ "--with-config-file-scan-dir=/etc/php.d" ]
       ++ optionals (versionOlder version "7.3") [ "--with-pcre-regex=${pcre.dev}" "PCRE_LIBDIR=${pcre}" ]
       ++ optionals (versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre2.dev}" "PCRE_LIBDIR=${pcre2}" ]
       ++ optionals (versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" "PCRE_LIBDIR=${pcre2}" ]
@@ -209,89 +203,88 @@ let
       ++ optional (!ipv6Support) "--disable-ipv6"
       ++ optional (pearSupport && libxml2Support) "--with-pear=$(out)/lib/php/pear";
 
-      hardeningDisable = [ "bindnow" ];
+    hardeningDisable = [ "bindnow" ];
 
-      preConfigure = ''
-        # Don't record the configure flags since this causes unnecessary
-        # runtime dependencies
-        for i in main/build-defs.h.in scripts/php-config.in; do
-          substituteInPlace $i \
-            --replace '@CONFIGURE_COMMAND@' '(omitted)' \
-            --replace '@CONFIGURE_OPTIONS@' "" \
-            --replace '@PHP_LDFLAGS@' ""
-        done
+    preConfigure = ''
+      # Don't record the configure flags since this causes unnecessary
+      # runtime dependencies
+      for i in main/build-defs.h.in scripts/php-config.in; do
+        substituteInPlace $i \
+          --replace '@CONFIGURE_COMMAND@' '(omitted)' \
+          --replace '@CONFIGURE_OPTIONS@' "" \
+          --replace '@PHP_LDFLAGS@' ""
+      done
 
-        substituteInPlace ./build/libtool.m4 --replace /usr/bin/file ${file}/bin/file
+      substituteInPlace ./build/libtool.m4 --replace /usr/bin/file ${file}/bin/file
 
-        export EXTENSION_DIR=$out/lib/php/extensions
+      export EXTENSION_DIR=$out/lib/php/extensions
 
-        ./buildconf --copy --force
+      ./buildconf --copy --force
 
-        if test -f $src/genfiles; then
-          ./genfiles
-        fi
-      '' + optionalString stdenv.isDarwin ''
-        substituteInPlace configure --replace "-lstdc++" "-lc++"
-      '';
+      if test -f $src/genfiles; then
+        ./genfiles
+      fi
+    '' + optionalString stdenv.isDarwin ''
+      substituteInPlace configure --replace "-lstdc++" "-lc++"
+    '';
 
-      postInstall = ''
-        test -d $out/etc || mkdir $out/etc
-        cp php.ini-production $out/etc/php.ini
-      '';
+    postInstall = ''
+      test -d $out/etc || mkdir $out/etc
+      cp php.ini-production $out/etc/php.ini
+    '';
 
-      postFixup = ''
-        mkdir -p $dev/bin $dev/share/man/man1
-        mv $out/bin/phpize $out/bin/php-config $dev/bin/
-        mv $out/share/man/man1/phpize.1.gz \
-           $out/share/man/man1/php-config.1.gz \
-           $dev/share/man/man1/
-      '';
-
-      src = fetchurl {
-        url = "https://www.php.net/distributions/php-${version}.tar.bz2";
-        inherit sha256;
-      };
-
-      meta = with stdenv.lib; {
-        description = "An HTML-embedded scripting language";
-        homepage = https://www.php.net/;
-        license = licenses.php301;
-        maintainers = with maintainers; [ globin etu ma27 ];
-        platforms = platforms.all;
-        outputsToInstall = [ "out" "dev" ];
-      };
-
-      patches = [ ./fix-paths-php7.patch ] ++ extraPatches;
-
-      stripDebugList = "bin sbin lib modules";
-
-      outputs = [ "out" "dev" ];
+    postFixup = ''
+      mkdir -p $dev/bin $dev/share/man/man1
+      mv $out/bin/phpize $out/bin/php-config $dev/bin/
+      mv $out/share/man/man1/phpize.1.gz \
+         $out/share/man/man1/php-config.1.gz \
+         $dev/share/man/man1/
+    '';
 
+    src = fetchurl {
+      url = "https://www.php.net/distributions/php-${version}.tar.bz2";
+      inherit sha256;
     };
 
-    generic' = { version, sha256, ... }@args: let php = generic args; in php.overrideAttrs (_: {
-      passthru.buildEnv = { exts ? (_: []), extraConfig ? "" }: let
-        extraInit = writeText "custom-php.ini" ''
-          ${extraConfig}
-          ${concatMapStringsSep "\n" (ext: let
-            extName = lib.removePrefix "php-" (builtins.parseDrvName ext.name).name;
-            type = "${lib.optionalString (ext.zendExtension or false) "zend_"}extension";
-          in ''
-            ${type}=${ext}/lib/php/extensions/${extName}.so
-          '') (exts (callPackage ../../../top-level/php-packages.nix { inherit php; }))}
-        '';
-      in symlinkJoin {
-        name = "php-custom-${version}";
-        nativeBuildInputs = [ makeWrapper ];
-        paths = [ php ];
-        postBuild = ''
-          wrapProgram $out/bin/php \
-            --add-flags "-c ${extraInit}"
-          wrapProgram $out/bin/php-fpm \
-            --add-flags "-c ${extraInit}"
-        '';
-      };
-    });
+    meta = with stdenv.lib; {
+      description = "An HTML-embedded scripting language";
+      homepage = https://www.php.net/;
+      license = licenses.php301;
+      maintainers = with maintainers; [ globin etu ma27 ];
+      platforms = platforms.all;
+      outputsToInstall = [ "out" "dev" ];
+    };
+
+    patches = [ ./fix-paths-php7.patch ] ++ extraPatches;
+
+    stripDebugList = "bin sbin lib modules";
+
+    outputs = [ "out" "dev" ];
+  };
+
+  generic' = { version, sha256, ... }@args: let php = generic args; in php.overrideAttrs (_: {
+    passthru.buildEnv = { exts ? (_: []), extraConfig ? "" }: let
+      extraInit = writeText "custom-php.ini" ''
+        ${extraConfig}
+        ${concatMapStringsSep "\n" (ext: let
+          extName = lib.removePrefix "php-" (builtins.parseDrvName ext.name).name;
+          type = "${lib.optionalString (ext.zendExtension or false) "zend_"}extension";
+        in ''
+          ${type}=${ext}/lib/php/extensions/${extName}.so
+        '') (exts (callPackage ../../../top-level/php-packages.nix { inherit php; }))}
+      '';
+    in symlinkJoin {
+      name = "php-custom-${version}";
+      nativeBuildInputs = [ makeWrapper ];
+      paths = [ php ];
+      postBuild = ''
+        wrapProgram $out/bin/php \
+          --add-flags "-c ${extraInit}"
+        wrapProgram $out/bin/php-fpm \
+          --add-flags "-c ${extraInit}"
+      '';
+    };
+  });
 
 in {
   php72 = generic' {

From ac106521aeed910fbc21c061bc31ba48347f7689 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Sun, 15 Mar 2020 12:49:34 +0200
Subject: [PATCH 3138/4636] rx: 0.3.2 -> 0.4.0

---
 pkgs/applications/graphics/rx/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/graphics/rx/default.nix b/pkgs/applications/graphics/rx/default.nix
index b4338d8f3cda..53e8109fef51 100644
--- a/pkgs/applications/graphics/rx/default.nix
+++ b/pkgs/applications/graphics/rx/default.nix
@@ -1,5 +1,5 @@
 { stdenv, rustPlatform, fetchFromGitHub, makeWrapper
-, cmake, pkgconfig
+, cmake, pkg-config
 , xorg ? null
 , libGL ? null }:
 
@@ -7,18 +7,18 @@ with stdenv.lib;
 
 rustPlatform.buildRustPackage rec {
   pname = "rx";
-  version = "0.3.2";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "cloudhead";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1n5s7v2z13550gkqz7w6dw62jdy60wdi8w1lfa23609b4yhg4w94";
+    sha256 = "1pln65pqy39ijrld11d06klwzfhhzmrgdaxijpx9q7w9z66zmqb8";
   };
 
-  cargoSha256 = "077cs9bf7f3h5aschcv7pbbnpaq1rg79j7f6pnyrzkmn7gxzicg3";
+  cargoSha256 = "143a5x61s7ywk0ljqd10jkfvs6lrhlibkm2a9lw41wq13mgzb78j";
 
-  nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
+  nativeBuildInputs = [ cmake pkg-config makeWrapper ];
 
   buildInputs = optionals stdenv.isLinux
   (with xorg; [
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = {
     description = "Modern and extensible pixel editor implemented in Rust";
-    homepage = "https://cloudhead.io/rx/";
+    homepage = "https://rx.cloudhead.io/";
     license = licenses.gpl3;
     maintainers = with maintainers; [ minijackson filalex77 ];
     platforms = [ "x86_64-linux" ];

From e5642d405ee784d97ab031472e72824756b97bcc Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sun, 15 Mar 2020 11:57:57 +0100
Subject: [PATCH 3139/4636] retdec: fix build

The build was broken by the gcc9 update. Pinning to gcc8 for now.
---
 pkgs/development/tools/analysis/retdec/default.nix | 1 +
 pkgs/top-level/all-packages.nix                    | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix
index 475d1950bb2a..848dfca5ce6d 100644
--- a/pkgs/development/tools/analysis/retdec/default.nix
+++ b/pkgs/development/tools/analysis/retdec/default.nix
@@ -130,6 +130,7 @@ in stdenv.mkDerivation rec {
   # itself and trying to build it. The build should fail and tell you which dependencies you have to upgrade to which versions.
   # I've notified upstream about this problem here:
   # https://github.com/avast-tl/retdec/issues/412
+  # gcc is pinned to gcc8 in all-packages.nix. That should probably be re-evaluated on update.
   version = "3.2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79fe6d381248..a845f5d38b87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10616,7 +10616,9 @@ in
 
   remake = callPackage ../development/tools/build-managers/remake { };
 
-  retdec = callPackage ../development/tools/analysis/retdec { };
+  retdec = callPackage ../development/tools/analysis/retdec {
+    stdenv = gcc8Stdenv;
+  };
   retdec-full = retdec.override {
     withPEPatterns = true;
   };

From 156b879c2e5884bfdc6b28b93067e3f68512fb8e Mon Sep 17 00:00:00 2001
From: Leon Schuermann <leon@is.currently.online>
Date: Sat, 26 Oct 2019 17:22:40 +0200
Subject: [PATCH 3140/4636] nixos/tpm2: init

This commit adds udev rules, the userspace resource manager and
PKCS#11 module support.
---
 nixos/modules/module-list.nix   |   1 +
 nixos/modules/security/tpm2.nix | 185 ++++++++++++++++++++++++++++++++
 2 files changed, 186 insertions(+)
 create mode 100644 nixos/modules/security/tpm2.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6734929b9d4e..39102d283858 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -200,6 +200,7 @@
   ./security/wrappers/default.nix
   ./security/sudo.nix
   ./security/systemd-confinement.nix
+  ./security/tpm2.nix
   ./services/admin/oxidized.nix
   ./services/admin/salt/master.nix
   ./services/admin/salt/minion.nix
diff --git a/nixos/modules/security/tpm2.nix b/nixos/modules/security/tpm2.nix
new file mode 100644
index 000000000000..13804fb82cba
--- /dev/null
+++ b/nixos/modules/security/tpm2.nix
@@ -0,0 +1,185 @@
+{ lib, pkgs, config, ... }:
+let
+  cfg = config.security.tpm2;
+
+  # This snippet is taken from tpm2-tss/dist/tpm-udev.rules, but modified to allow custom user/groups
+  # The idea is that the tssUser is allowed to acess the TPM and kernel TPM resource manager, while
+  # the tssGroup is only allowed to access the kernel resource manager
+  # Therefore, if either of the two are null, the respective part isn't generated
+  udevRules = tssUser: tssGroup: ''
+    ${lib.optionalString (tssUser != null) ''KERNEL=="tpm[0-9]*", MODE="0660", OWNER="${tssUser}"''}
+    ${lib.optionalString (tssUser != null || tssGroup != null)
+      ''KERNEL=="tpmrm[0-9]*", MODE="0660"''
+      + lib.optionalString (tssUser != null) '', OWNER="${tssUser}"''
+      + lib.optionalString (tssGroup != null) '', GROUP="${tssGroup}"''
+     }
+  '';
+
+in {
+  options.security.tpm2 = {
+    enable = lib.mkEnableOption "Trusted Platform Module 2 support";
+
+    tssUser = lib.mkOption {
+      description = ''
+        Name of the tpm device-owner and service user, set if applyUdevRules is
+        set.
+      '';
+      type = lib.types.nullOr lib.types.str;
+      default = if cfg.abrmd.enable then "tss" else "root";
+      defaultText = ''"tss" when using the userspace resource manager,'' +
+                    ''"root" otherwise'';
+    };
+
+    tssGroup = lib.mkOption {
+      description = ''
+        Group of the tpm kernel resource manager (tpmrm) device-group, set if
+        applyUdevRules is set.
+      '';
+      type = lib.types.nullOr lib.types.str;
+      default = "tss";
+    };
+
+    applyUdevRules = lib.mkOption {
+      description = ''
+        Whether to make the /dev/tpm[0-9] devices accessible by the tssUser, or
+        the /dev/tpmrm[0-9] by tssGroup respectively
+      '';
+      type = lib.types.bool;
+      default = true;
+    };
+
+    abrmd = {
+      enable = lib.mkEnableOption ''
+        Trusted Platform 2 userspace resource manager daemon
+      '';
+
+      package = lib.mkOption {
+        description = "tpm2-abrmd package to use";
+        type = lib.types.package;
+        default = pkgs.tpm2-abrmd;
+        defaultText = "pkgs.tpm2-abrmd";
+      };
+    };
+
+    pkcs11 = {
+      enable = lib.mkEnableOption ''
+        TPM2 PKCS#11 tool and shared library in system path
+        (<literal>/run/current-system/sw/lib/libtpm2_pkcs11.so</literal>)
+      '';
+
+      package = lib.mkOption {
+        description = "tpm2-pkcs11 package to use";
+        type = lib.types.package;
+        default = pkgs.tpm2-pkcs11;
+        defaultText = "pkgs.tpm2-pkcs11";
+      };
+    };
+
+    tctiEnvironment = {
+      enable = lib.mkOption {
+        description = ''
+          Set common TCTI environment variables to the specified value.
+          The variables are
+          <itemizedlist>
+            <listitem>
+              <para>
+                <literal>TPM2TOOLS_TCTI</literal>
+              </para>
+            </listitem>
+            <listitem>
+              <para>
+                <literal>TPM2_PKCS11_TCTI</literal>
+              </para>
+            </listitem>
+          </itemizedlist>
+        '';
+        type = lib.types.bool;
+        default = false;
+      };
+
+      interface = lib.mkOption {
+        description = ''
+          The name of the TPM command transmission interface (TCTI) library to
+          use.
+        '';
+        type = lib.types.enum [ "tabrmd" "device" ];
+        default = "device";
+      };
+
+      deviceConf = lib.mkOption {
+        description = ''
+          Configuration part of the device TCTI, e.g. the path to the TPM device.
+          Applies if interface is set to "device".
+          The format is specified in the
+          <link xlink:href="https://github.com/tpm2-software/tpm2-tools/blob/master/man/common/tcti.md#tcti-options">
+          tpm2-tools repository</link>.
+        '';
+        type = lib.types.str;
+        default = "/dev/tpmrm0";
+      };
+
+      tabrmdConf = lib.mkOption {
+        description = ''
+          Configuration part of the tabrmd TCTI, like the D-Bus bus name.
+          Applies if interface is set to "tabrmd".
+          The format is specified in the
+          <link xlink:href="https://github.com/tpm2-software/tpm2-tools/blob/master/man/common/tcti.md#tcti-options">
+          tpm2-tools repository</link>.
+        '';
+        type = lib.types.str;
+        default = "bus_name=com.intel.tss2.Tabrmd";
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable (lib.mkMerge [
+    {
+      # PKCS11 tools and library
+      environment.systemPackages = lib.mkIf cfg.pkcs11.enable [
+        (lib.getBin cfg.pkcs11.package)
+        (lib.getLib cfg.pkcs11.package)
+      ];
+
+      services.udev.extraRules = lib.mkIf cfg.applyUdevRules
+        (udevRules cfg.tssUser cfg.tssGroup);
+
+      # Create the tss user and group only if the default value is used
+      users.users.${cfg.tssUser} = lib.mkIf (cfg.tssUser == "tss") {
+        isSystemUser = true;
+      };
+      users.groups.${cfg.tssGroup} = lib.mkIf (cfg.tssGroup == "tss") {};
+
+      environment.variables = lib.mkIf cfg.tctiEnvironment.enable (
+        lib.attrsets.genAttrs [
+          "TPM2TOOLS_TCTI"
+          "TPM2_PKCS11_TCTI"
+        ] (_: ''${cfg.tctiEnvironment.interface}:${
+          if cfg.tctiEnvironment.interface == "tabrmd" then
+            cfg.tctiEnvironment.tabrmdConf
+          else
+            cfg.tctiEnvironment.deviceConf
+        }'')
+      );
+    }
+
+    (lib.mkIf cfg.abrmd.enable {
+      systemd.services."tpm2-abrmd" = {
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          Type = "dbus";
+          Restart = "always";
+          RestartSec = 30;
+          BusName = "com.intel.tss2.Tabrmd";
+          StandardOutput = "syslog";
+          ExecStart = "${cfg.abrmd.package}/bin/tpm2-abrmd";
+          User = "tss";
+          Group = "nogroup";
+        };
+      };
+
+      services.dbus.packages = lib.singleton cfg.abrmd.package;
+    })
+  ]);
+
+  meta.maintainers = with lib.maintainers; [ lschuermann ];
+}

From 4b8d66aa7266ab55f08d53271df36832d9c055d2 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 15 Mar 2020 13:35:37 +0100
Subject: [PATCH 3141/4636] mariadb: remove withoutClient

When used as a global override, it breaks most of the options in the
mysql module, such as ensureDatabases, ensureUsers, initialDatabases,
initialScript.

We could use `.client` there, but if the reasoning behind this was
closure size reduction, we now end up with the same (or a bigger)
runtime closure and more complexity.

Apart from the options exposed by the mysql module, the client is also
likely to be required for local backups or DBA tasks anyways.

Instead of dealing with all the increased complexity of this for no
arguable benefit, let's just remove the `withoutClient` argument.
Storage space on mysql servers shouldn't be that much of an issue.

Closes #82428.
---
 .../sql/mariadb/cmake-without-client.patch        | 15 ---------------
 pkgs/servers/sql/mariadb/default.nix              | 15 +--------------
 2 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 pkgs/servers/sql/mariadb/cmake-without-client.patch

diff --git a/pkgs/servers/sql/mariadb/cmake-without-client.patch b/pkgs/servers/sql/mariadb/cmake-without-client.patch
deleted file mode 100644
index ce36d036b6d0..000000000000
--- a/pkgs/servers/sql/mariadb/cmake-without-client.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1ea7c1df..b0face0d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -176,6 +176,10 @@ ELSE()
-   SET (SKIP_COMPONENTS "N-O-N-E")
- ENDIF()
- 
-+IF (WITHOUT_CLIENT)
-+  SET (SKIP_COMPONENTS "Client|ClientPlugins|ManPagesClient")
-+ENDIF()
-+
- OPTION(NOT_FOR_DISTRIBUTION "Allow linking with GPLv2-incompatible system libraries. Only set it you never plan to distribute the resulting binaries" OFF)
- 
- INCLUDE(check_compiler_flag)
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 51181c4d2ae5..2b287c8f6ffd 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -4,7 +4,6 @@
 , fixDarwinDylibNames, cctools, CoreServices, less
 , numactl # NUMA Support
 , withStorageMroonga ? true, kytea, msgpack, zeromq
-, withoutClient ? false
 }:
 
 with stdenv.lib;
@@ -149,9 +148,7 @@ server = stdenv.mkDerivation (common // {
     ++ optional stdenv.hostPlatform.isLinux linux-pam
     ++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv;
 
-  patches = common.patches ++ [
-    ./cmake-without-client.patch
-  ] ++ optionals stdenv.hostPlatform.isDarwin [
+  patches = common.patches ++ optionals stdenv.hostPlatform.isDarwin [
     ./cmake-without-plugin-auth-pam.patch
   ];
 
@@ -170,8 +167,6 @@ server = stdenv.mkDerivation (common // {
     "-DWITH_NUMA=ON"
   ] ++ optional (!withStorageMroonga) [
     "-DWITHOUT_MROONGA=ON"
-  ] ++ optionals withoutClient [
-    "-DWITHOUT_CLIENT=ON"
   ] ++ optionals stdenv.hostPlatform.isDarwin [
     "-DWITHOUT_OQGRAPH=1"
     "-DWITHOUT_TOKUDB=1"
@@ -185,14 +180,6 @@ server = stdenv.mkDerivation (common // {
     chmod +x "$out"/bin/wsrep_sst_common
     rm "$out"/bin/{mysql_client_test,mysqltest}
     rm -r "$out"/data # Don't need testing data
-  '' + optionalString withoutClient ''
-    ${ # We don't build with GSSAPI on Darwin
-      optionalString (!stdenv.hostPlatform.isDarwin) ''
-        rm "$out"/lib/mysql/plugin/auth_gssapi_client.so
-      ''
-    }
-    rm "$out"/lib/mysql/plugin/client_ed25519.so
-    rm "$out"/lib/{libmysqlclient${libExt},libmysqlclient_r${libExt}}
   '' + optionalString withStorageMroonga ''
     mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql
   '' + optionalString (!stdenv.hostPlatform.isDarwin) ''

From 47069c019fdeaa2ace12eedb1be210cb82e9365d Mon Sep 17 00:00:00 2001
From: Ersin Akinci <me@ersinakinci.com>
Date: Fri, 21 Feb 2020 18:30:05 +0000
Subject: [PATCH 3142/4636] nodePackages.coc-prettier: init

---
 pkgs/development/node-packages/node-packages-v10.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json
index f8e7c3f3441b..d65d97d45672 100644
--- a/pkgs/development/node-packages/node-packages-v10.json
+++ b/pkgs/development/node-packages/node-packages-v10.json
@@ -17,6 +17,7 @@
 , "browserify"
 , "castnow"
 , "clean-css"
+, "coc-prettier"
 , "coffee-script"
 , "coinmon"
 , "configurable-http-proxy"

From 347479b6e0a25dd8c2b67ebc3516293850d7026f Mon Sep 17 00:00:00 2001
From: Ersin Akinci <me@ersinakinci.com>
Date: Sat, 2 Nov 2019 00:34:38 +0000
Subject: [PATCH 3143/4636] vimPlugins.overrides: add coc-prettier

---
 pkgs/misc/vim-plugins/overrides.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 9729d223e857..079bcb7c34ad 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -10,6 +10,7 @@
 , languagetool
 , Cocoa, CoreFoundation, CoreServices
 , buildVimPluginFrom2Nix
+, nodePackages
 
 # coc-go dependency
 , go
@@ -138,6 +139,12 @@ self: super: {
     };
   };
 
+  coc-prettier = buildVimPluginFrom2Nix {
+    pname = "coc-prettier";
+    version = nodePackages.coc-prettier.version;
+    src = "${nodePackages.coc-prettier}/lib/node_modules/coc-prettier";
+  };
+
   command-t = super.command-t.overrideAttrs(old: {
     buildInputs = [ ruby rake ];
     buildPhase = ''

From 588ca6e31077e3b7e691a57a948e77909d2efa18 Mon Sep 17 00:00:00 2001
From: Ersin Akinci <me@ersinakinci.com>
Date: Fri, 21 Feb 2020 18:01:37 +0000
Subject: [PATCH 3144/4636] neovim: use TMPDIR as home during initilizaiton

---
 pkgs/applications/editors/neovim/wrapper.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
index c0b976677579..c7d5f7649783 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -95,6 +95,16 @@ let
       '' + optionalString (configure != {}) ''
         echo "Generating remote plugin manifest"
         export NVIM_RPLUGIN_MANIFEST=$out/rplugin.vim
+        # Some plugins assume that the home directory is accessible for
+        # initializing caches, temporary files, etc. Even if the plugin isn't
+        # actively used, it may throw an error as soon as Neovim is launched
+        # (e.g., inside an autoload script), causing manifest generation to
+        # fail. Therefore, let's create a fake home directory before generating
+        # the manifest, just to satisfy the needs of these plugins.
+        #
+        # See https://github.com/Yggdroot/LeaderF/blob/v1.21/autoload/lfMru.vim#L10
+        # for an example of this behavior.
+        export HOME="$(mktemp -d)"
         # Launch neovim with a vimrc file containing only the generated plugin
         # code. Pass various flags to disable temp file generation
         # (swap/viminfo) and redirect errors to stderr.

From 79ca23ba68c2897aa3e13e1a5c488958385168ad Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 14 Mar 2020 14:34:20 +0000
Subject: [PATCH 3145/4636] nodePackages: regenerate set

---
 .../node-packages/composition-v10.nix         |    2 +-
 .../node-packages/composition-v12.nix         |    2 +-
 .../node-packages/composition-v13.nix         |    4 +-
 .../node-packages/node-packages-v10.nix       | 6654 ++++++++++-------
 .../node-packages/node-packages-v12.nix       |   40 +-
 .../node-packages/node-packages-v13.nix       |   10 +-
 .../node-packages/shell-generate.nix          |    3 +-
 7 files changed, 4149 insertions(+), 2566 deletions(-)

diff --git a/pkgs/development/node-packages/composition-v10.nix b/pkgs/development/node-packages/composition-v10.nix
index fa4b4c3be568..8707a76203e6 100644
--- a/pkgs/development/node-packages/composition-v10.nix
+++ b/pkgs/development/node-packages/composition-v10.nix
@@ -14,4 +14,4 @@ in
 import ./node-packages-v10.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/node-packages/composition-v12.nix b/pkgs/development/node-packages/composition-v12.nix
index 880d72efd359..56f4d02c23b1 100644
--- a/pkgs/development/node-packages/composition-v12.nix
+++ b/pkgs/development/node-packages/composition-v12.nix
@@ -14,4 +14,4 @@ in
 import ./node-packages-v12.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/node-packages/composition-v13.nix b/pkgs/development/node-packages/composition-v13.nix
index c79053e020ea..54672905bc1c 100644
--- a/pkgs/development/node-packages/composition-v13.nix
+++ b/pkgs/development/node-packages/composition-v13.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-13_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
 
 let
   nodeEnv = import ./node-env.nix {
@@ -14,4 +14,4 @@ in
 import ./node-packages-v13.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
index a87b6d30a380..5a84edbe7157 100644
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -22,31 +22,31 @@ let
         sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ==";
       };
     };
-    "@angular-devkit/architect-0.900.3" = {
+    "@angular-devkit/architect-0.900.6" = {
       name = "_at_angular-devkit_slash_architect";
       packageName = "@angular-devkit/architect";
-      version = "0.900.3";
+      version = "0.900.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.900.3.tgz";
-        sha512 = "4UHc58Dlc5XHY3eiYSX9gytLyPNYixGSRwLcc/LRwuPgrmUFKPzCN3nwgB+9kc03/HN89CsJ1rS1scid6N6vxQ==";
+        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.900.6.tgz";
+        sha512 = "WK8e09DgNP1NHP1gqVQ9w+9rlRMVDJxAh4qZGJRjZBXd3LY7y84WWRmTpfuhOSu+82fR3/n76+urxraU3ZVphw==";
       };
     };
-    "@angular-devkit/core-9.0.3" = {
+    "@angular-devkit/core-9.0.6" = {
       name = "_at_angular-devkit_slash_core";
       packageName = "@angular-devkit/core";
-      version = "9.0.3";
+      version = "9.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.0.3.tgz";
-        sha512 = "3+abmv9K9d+BVgUAolYgoOqlGAA2Jb1pWo2biapSDG6KjUZHUCJdnsKigLtLorCdv0SrjTp56FFplkcqKsFQgA==";
+        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.0.6.tgz";
+        sha512 = "hCZJbnqLEm1F5Bx+ILcdd3LPgQTn4WFWpfUqMEGGj7UirRInWcz+6UpYotKGTJw85/mV01LrIbtWIkAUXbkkhg==";
       };
     };
-    "@angular-devkit/schematics-9.0.3" = {
+    "@angular-devkit/schematics-9.0.6" = {
       name = "_at_angular-devkit_slash_schematics";
       packageName = "@angular-devkit/schematics";
-      version = "9.0.3";
+      version = "9.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.0.3.tgz";
-        sha512 = "BQnZtFQPLZZOijhuEndtzL6cOnhaE8nNxupkRHavWohOMStnLsRyvVJj6JVDkf37wvT5koqTNjHhbdMxcCRc6A==";
+        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.0.6.tgz";
+        sha512 = "X7qZDJVrFcPUn+jNUeOH7Bx1D7YTpTFr0d3DBIsQzseReSGu7ugWziQPS4gc5Xm5K0nb8vx6DYtyW0FaIvX0ZA==";
       };
     };
     "@antora/asciidoc-loader-2.2.0" = {
@@ -157,13 +157,13 @@ let
         sha512 = "3d6SqtknM3PiLRw2wLtcMVVfmyHtfNuWo8+ZBRmUrZs8HfhGteV8/s4vpiOJZmLYhW4KLFgIgG09lFdD5t78Ow==";
       };
     };
-    "@apollo/federation-0.12.1" = {
+    "@apollo/federation-0.13.2" = {
       name = "_at_apollo_slash_federation";
       packageName = "@apollo/federation";
-      version = "0.12.1";
+      version = "0.13.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.12.1.tgz";
-        sha512 = "ZzTHtZH9b0JXtP55hicN42/+qX99qomN2MhTnTkM7jrcAWzE1V5spX/60GHTAeEQGf0zbmAOwzKCgIQS2AU6Bw==";
+        url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.13.2.tgz";
+        sha512 = "62uXIIHxHXG71gSwROFt8yxtYeUZ2BaIgAkxZ1H82GB4+s1gt4xwizcmmCWqQhK3KBy4LbPOfI1YyHW4Wv5ZpQ==";
       };
     };
     "@apollo/protobufjs-1.0.3" = {
@@ -175,13 +175,13 @@ let
         sha512 = "gqeT810Ect9WIqsrgfUvr+ljSB5m1PyBae9HGdrRyQ3HjHjTcjVvxpsMYXlUk4rUHnrfUqyoGvLSy2yLlRGEOw==";
       };
     };
-    "@apollographql/apollo-tools-0.4.3" = {
+    "@apollographql/apollo-tools-0.4.4" = {
       name = "_at_apollographql_slash_apollo-tools";
       packageName = "@apollographql/apollo-tools";
-      version = "0.4.3";
+      version = "0.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.3.tgz";
-        sha512 = "CtC1bmohB1owdGMT2ZZKacI94LcPAZDN2WvCe+4ZXT5d7xO5PHOAb70EP/LcFbvnS8QI+pkYRSCGFQnUcv9efg==";
+        url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.4.tgz";
+        sha512 = "kldvB9c+vzimel4yEktlkB08gaJ5DQn9ZuIfFf1kpAw+++5hFwYRWTyKgOhF9LbOWNWGropesYC7WwLja2erhQ==";
       };
     };
     "@apollographql/graphql-language-service-interface-2.0.2" = {
@@ -256,22 +256,22 @@ let
         sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==";
       };
     };
-    "@babel/compat-data-7.8.5" = {
+    "@babel/compat-data-7.8.6" = {
       name = "_at_babel_slash_compat-data";
       packageName = "@babel/compat-data";
-      version = "7.8.5";
+      version = "7.8.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.8.5.tgz";
-        sha512 = "jWYUqQX/ObOhG1UiEkbH5SANsE/8oKXiQWjj7p7xgj9Zmnt//aUvyz4dBkK0HNsS8/cbyC5NmmH87VekW+mXFg==";
+        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.8.6.tgz";
+        sha512 = "CurCIKPTkS25Mb8mz267vU95vy+TyUpnctEX2lV33xWNmHAfjruztgiPBbXZRh3xZZy1CYvGx6XfxyTVS+sk7Q==";
       };
     };
-    "@babel/core-7.8.4" = {
+    "@babel/core-7.8.7" = {
       name = "_at_babel_slash_core";
       packageName = "@babel/core";
-      version = "7.8.4";
+      version = "7.8.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/core/-/core-7.8.4.tgz";
-        sha512 = "0LiLrB2PwrVI+a2/IEskBopDYSd8BCb3rOvH7D5tzoWd696TBEduBvuLVm4Nx6rltrLZqvI3MCalB2K2aVzQjA==";
+        url = "https://registry.npmjs.org/@babel/core/-/core-7.8.7.tgz";
+        sha512 = "rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA==";
       };
     };
     "@babel/generator-7.0.0-beta.38" = {
@@ -283,22 +283,22 @@ let
         sha512 = "aOHQPhsEyaB6p2n+AK981+onHoc+Ork9rcAQVSUJR33wUkGiWRpu6/C685knRyIZVsKeSdG5Q4xMiYeFUhuLzA==";
       };
     };
-    "@babel/generator-7.8.3" = {
+    "@babel/generator-7.8.6" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
-      version = "7.8.3";
+      version = "7.8.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.8.3.tgz";
-        sha512 = "WjoPk8hRpDRqqzRpvaR8/gDUPkrnOOeuT2m8cNICJtZH6mwaCo3v0OKMI7Y6SM1pBtyijnLtAL0HDi41pf41ug==";
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.8.6.tgz";
+        sha512 = "4bpOR5ZBz+wWcMeVtcf7FbjcFzCp+817z2/gHNncIRcM9MmKzUhtWCYAq27RAfUrAFwb+OCG1s9WEaVxfi6cjg==";
       };
     };
-    "@babel/generator-7.8.4" = {
+    "@babel/generator-7.8.8" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
-      version = "7.8.4";
+      version = "7.8.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.8.4.tgz";
-        sha512 = "PwhclGdRpNAf3IxZb0YVuITPZmmrXz9zf6fH8lT4XbrmfQKr6ryBzhv593P5C6poJRciFCL/eHGW2NuGrgEyxA==";
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.8.8.tgz";
+        sha512 = "HKyUVu69cZoclptr8t8U5b6sx6zoWjh8jiUhnuj3MpZuKT2dJ8zPTuiy31luq32swhI0SpwItCIlU8XW7BZeJg==";
       };
     };
     "@babel/helper-annotate-as-pure-7.8.3" = {
@@ -328,40 +328,40 @@ let
         sha512 = "JT8mfnpTkKNCboTqZsQTdGo3l3Ik3l7QIt9hh0O9DYiwVel37VoJpILKM4YFbP2euF32nkQSb+F9cUk9b7DDXQ==";
       };
     };
-    "@babel/helper-call-delegate-7.8.3" = {
+    "@babel/helper-call-delegate-7.8.7" = {
       name = "_at_babel_slash_helper-call-delegate";
       packageName = "@babel/helper-call-delegate";
-      version = "7.8.3";
+      version = "7.8.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.8.3.tgz";
-        sha512 = "6Q05px0Eb+N4/GTyKPPvnkig7Lylw+QzihMpws9iiZQv7ZImf84ZsZpQH7QoWN4n4tm81SnSzPgHw2qtO0Zf3A==";
+        url = "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.8.7.tgz";
+        sha512 = "doAA5LAKhsFCR0LAFIf+r2RSMmC+m8f/oQ+URnUET/rWeEzC0yTRmAGyWkD4sSu3xwbS7MYQ2u+xlt1V5R56KQ==";
       };
     };
-    "@babel/helper-compilation-targets-7.8.4" = {
+    "@babel/helper-compilation-targets-7.8.7" = {
       name = "_at_babel_slash_helper-compilation-targets";
       packageName = "@babel/helper-compilation-targets";
-      version = "7.8.4";
+      version = "7.8.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.4.tgz";
-        sha512 = "3k3BsKMvPp5bjxgMdrFyq0UaEO48HciVrOVF0+lon8pp95cyJ2ujAh0TrBHNMnJGT2rr0iKOJPFFbSqjDyf/Pg==";
+        url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz";
+        sha512 = "4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw==";
       };
     };
-    "@babel/helper-create-class-features-plugin-7.8.3" = {
+    "@babel/helper-create-class-features-plugin-7.8.6" = {
       name = "_at_babel_slash_helper-create-class-features-plugin";
       packageName = "@babel/helper-create-class-features-plugin";
-      version = "7.8.3";
+      version = "7.8.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.3.tgz";
-        sha512 = "qmp4pD7zeTxsv0JNecSBsEmG1ei2MqwJq4YQcK3ZWm/0t07QstWfvuV/vm3Qt5xNMFETn2SZqpMx2MQzbtq+KA==";
+        url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.6.tgz";
+        sha512 = "klTBDdsr+VFFqaDHm5rR69OpEQtO2Qv8ECxHS1mNhJJvaHArR6a1xTf5K/eZW7eZpJbhCx3NW1Yt/sKsLXLblg==";
       };
     };
-    "@babel/helper-create-regexp-features-plugin-7.8.3" = {
+    "@babel/helper-create-regexp-features-plugin-7.8.8" = {
       name = "_at_babel_slash_helper-create-regexp-features-plugin";
       packageName = "@babel/helper-create-regexp-features-plugin";
-      version = "7.8.3";
+      version = "7.8.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.3.tgz";
-        sha512 = "Gcsm1OHCUr9o9TcJln57xhWHtdXbA2pgQ58S0Lxlks0WMGNXuki4+GLfX0p+L2ZkINUGZvfkz8rzoqJQSthI+Q==";
+        url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz";
+        sha512 = "LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==";
       };
     };
     "@babel/helper-define-map-7.8.3" = {
@@ -427,13 +427,13 @@ let
         sha512 = "R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==";
       };
     };
-    "@babel/helper-module-transforms-7.8.3" = {
+    "@babel/helper-module-transforms-7.8.6" = {
       name = "_at_babel_slash_helper-module-transforms";
       packageName = "@babel/helper-module-transforms";
-      version = "7.8.3";
+      version = "7.8.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.8.3.tgz";
-        sha512 = "C7NG6B7vfBa/pwCOshpMbOYUmrYQDfCpVL/JCRu0ek8B5p8kue1+BCXpg2vOYs7w5ACB9GTOBYQ5U6NwrMg+3Q==";
+        url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.8.6.tgz";
+        sha512 = "RDnGJSR5EFBJjG3deY0NiL0K9TO8SXxS9n/MPsbPK/s9LbQymuLNtlzvDiNS7IpecuL45cMeLVkA+HfmlrnkRg==";
       };
     };
     "@babel/helper-optimise-call-expression-7.8.3" = {
@@ -472,13 +472,13 @@ let
         sha512 = "kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==";
       };
     };
-    "@babel/helper-replace-supers-7.8.3" = {
+    "@babel/helper-replace-supers-7.8.6" = {
       name = "_at_babel_slash_helper-replace-supers";
       packageName = "@babel/helper-replace-supers";
-      version = "7.8.3";
+      version = "7.8.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.3.tgz";
-        sha512 = "xOUssL6ho41U81etpLoT2RTdvdus4VfHamCuAm4AHxGr+0it5fnwoVdwUJ7GFEqCsQYzJUhcbsN9wB9apcYKFA==";
+        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz";
+        sha512 = "PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==";
       };
     };
     "@babel/helper-simple-access-7.8.3" = {
@@ -526,13 +526,13 @@ let
         sha512 = "PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==";
       };
     };
-    "@babel/parser-7.8.4" = {
+    "@babel/parser-7.8.8" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
-      version = "7.8.4";
+      version = "7.8.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.8.4.tgz";
-        sha512 = "0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==";
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.8.8.tgz";
+        sha512 = "mO5GWzBPsPf6865iIbzNE0AvkKF3NE+2S3eRUpE+FE07BOAkXh6G+GW/Pj01hhXjve1WScbaIO4UlY1JKeqCcA==";
       };
     };
     "@babel/plugin-external-helpers-7.8.3" = {
@@ -616,13 +616,13 @@ let
         sha512 = "QIoIR9abkVn+seDE3OjA08jWcs3eZ9+wJCKSRgo3WdEU2csFYgdScb+8qHB3+WXsGJD55u+5hWCISI7ejXS+kg==";
       };
     };
-    "@babel/plugin-proposal-unicode-property-regex-7.8.3" = {
+    "@babel/plugin-proposal-unicode-property-regex-7.8.8" = {
       name = "_at_babel_slash_plugin-proposal-unicode-property-regex";
       packageName = "@babel/plugin-proposal-unicode-property-regex";
-      version = "7.8.3";
+      version = "7.8.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.3.tgz";
-        sha512 = "1/1/rEZv2XGweRwwSkLpY+s60za9OZ1hJs4YDqFHCw0kYWYwL5IFljVY1MYBL+weT1l9pokDO2uhSTLVxzoHkQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz";
+        sha512 = "EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==";
       };
     };
     "@babel/plugin-syntax-async-generators-7.8.4" = {
@@ -769,13 +769,13 @@ let
         sha512 = "pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==";
       };
     };
-    "@babel/plugin-transform-classes-7.8.3" = {
+    "@babel/plugin-transform-classes-7.8.6" = {
       name = "_at_babel_slash_plugin-transform-classes";
       packageName = "@babel/plugin-transform-classes";
-      version = "7.8.3";
+      version = "7.8.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.3.tgz";
-        sha512 = "SjT0cwFJ+7Rbr1vQsvphAHwUHvSUPmMjMU/0P59G8U2HLFqSa082JO7zkbDNWs9kH/IUqpHI6xWNesGf8haF1w==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.6.tgz";
+        sha512 = "k9r8qRay/R6v5aWZkrEclEhKO6mc1CCQr2dLsVHBmOQiMpN6I2bpjX3vgnldUWeEI1GHVNByULVxZ4BdP4Hmdg==";
       };
     };
     "@babel/plugin-transform-computed-properties-7.8.3" = {
@@ -787,13 +787,13 @@ let
         sha512 = "O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==";
       };
     };
-    "@babel/plugin-transform-destructuring-7.8.3" = {
+    "@babel/plugin-transform-destructuring-7.8.8" = {
       name = "_at_babel_slash_plugin-transform-destructuring";
       packageName = "@babel/plugin-transform-destructuring";
-      version = "7.8.3";
+      version = "7.8.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.3.tgz";
-        sha512 = "H4X646nCkiEcHZUZaRkhE2XVsoz0J/1x3VVujnn96pSoGCtKPA99ZZA+va+gK+92Zycd6OBKCD8tDb/731bhgQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.8.tgz";
+        sha512 = "eRJu4Vs2rmttFCdhPUM3bV0Yo/xPSdPw6ML9KHs/bjB4bLA5HXlbvYXPOD5yASodGod+krjYx21xm1QmL8dCJQ==";
       };
     };
     "@babel/plugin-transform-dotall-regex-7.8.3" = {
@@ -832,13 +832,13 @@ let
         sha512 = "g/6WTWG/xbdd2exBBzMfygjX/zw4eyNC4X8pRaq7aRHRoDUCzAIu3kGYIXviOv8BjCuWm8vDBwjHcjiRNgXrPA==";
       };
     };
-    "@babel/plugin-transform-for-of-7.8.4" = {
+    "@babel/plugin-transform-for-of-7.8.6" = {
       name = "_at_babel_slash_plugin-transform-for-of";
       packageName = "@babel/plugin-transform-for-of";
-      version = "7.8.4";
+      version = "7.8.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.4.tgz";
-        sha512 = "iAXNlOWvcYUYoV8YIxwS7TxGRJcxyl8eQCfT+A5j8sKUzRFvJdcyjp97jL2IghWSRDaL2PU2O2tX8Cu9dTBq5A==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.6.tgz";
+        sha512 = "M0pw4/1/KI5WAxPsdcUL/w2LJ7o89YHN3yLkzNjg7Yl15GlVGgzHyCU+FMeAxevHGsLVmUqbirlUIKTafPmzdw==";
       };
     };
     "@babel/plugin-transform-function-name-7.8.3" = {
@@ -931,13 +931,13 @@ let
         sha512 = "57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==";
       };
     };
-    "@babel/plugin-transform-parameters-7.8.4" = {
+    "@babel/plugin-transform-parameters-7.8.8" = {
       name = "_at_babel_slash_plugin-transform-parameters";
       packageName = "@babel/plugin-transform-parameters";
-      version = "7.8.4";
+      version = "7.8.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.4.tgz";
-        sha512 = "IsS3oTxeTsZlE5KqzTbcC2sV0P9pXdec53SU+Yxv7o/6dvGM5AkTotQKhoSffhNgZ/dftsSiOoxy7evCYJXzVA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.8.tgz";
+        sha512 = "hC4Ld/Ulpf1psQciWWwdnUspQoQco2bMzSrwU6TmzRlvoYQe4rQFy9vnCZDTlVeCQj0JPfL+1RX0V8hCJvkgBA==";
       };
     };
     "@babel/plugin-transform-property-literals-7.8.3" = {
@@ -958,13 +958,13 @@ let
         sha512 = "r0h+mUiyL595ikykci+fbwm9YzmuOrUBi0b+FDIKmi3fPQyFokWVEMJnRWHJPPQEjyFJyna9WZC6Viv6UHSv1g==";
       };
     };
-    "@babel/plugin-transform-regenerator-7.8.3" = {
+    "@babel/plugin-transform-regenerator-7.8.7" = {
       name = "_at_babel_slash_plugin-transform-regenerator";
       packageName = "@babel/plugin-transform-regenerator";
-      version = "7.8.3";
+      version = "7.8.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.3.tgz";
-        sha512 = "qt/kcur/FxrQrzFR432FGZznkVAjiyFtCOANjkAKwCbt465L6ZCiUQh2oMYGU3Wo8LRFJxNDFwWn106S5wVUNA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz";
+        sha512 = "TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==";
       };
     };
     "@babel/plugin-transform-reserved-words-7.8.3" = {
@@ -1030,13 +1030,13 @@ let
         sha512 = "2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==";
       };
     };
-    "@babel/plugin-transform-typescript-7.8.3" = {
+    "@babel/plugin-transform-typescript-7.8.7" = {
       name = "_at_babel_slash_plugin-transform-typescript";
       packageName = "@babel/plugin-transform-typescript";
-      version = "7.8.3";
+      version = "7.8.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.8.3.tgz";
-        sha512 = "Ebj230AxcrKGZPKIp4g4TdQLrqX95TobLUWKd/CwG7X1XHUH1ZpkpFvXuXqWbtGRWb7uuEWNlrl681wsOArAdQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.8.7.tgz";
+        sha512 = "7O0UsPQVNKqpHeHLpfvOG4uXmlw+MOxYvUv6Otc9uH5SYMIxvF6eBdjkWvC3f9G+VXe0RsNExyAQBeTRug/wqQ==";
       };
     };
     "@babel/plugin-transform-unicode-regex-7.8.3" = {
@@ -1057,13 +1057,13 @@ let
         sha512 = "/TS23MVvo34dFmf8mwCisCbWGrfhbiWZSwBo6HkADTBhUa2Q/jWltyY/tpofz/b6/RIhqaqQcquptCirqIhOaQ==";
       };
     };
-    "@babel/preset-env-7.8.4" = {
+    "@babel/preset-env-7.8.7" = {
       name = "_at_babel_slash_preset-env";
       packageName = "@babel/preset-env";
-      version = "7.8.4";
+      version = "7.8.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.8.4.tgz";
-        sha512 = "HihCgpr45AnSOHRbS5cWNTINs0TwaR8BS8xIIH+QwiW8cKL0llV91njQMpeMReEPVs+1Ao0x3RLEBLtt1hOq4w==";
+        url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.8.7.tgz";
+        sha512 = "BYftCVOdAYJk5ASsznKAUl53EMhfBbr8CJ1X+AJLfGPscQkwJFiaV/Wn9DPH/7fzm2v6iRYJKYHSqyynTGw0nw==";
       };
     };
     "@babel/preset-flow-7.8.3" = {
@@ -1093,13 +1093,13 @@ let
         sha512 = "qee5LgPGui9zQ0jR1TeU5/fP9L+ovoArklEqY12ek8P/wV5ZeM/VYSQYwICeoT6FfpJTekG9Ilay5PhwsOpMHA==";
       };
     };
-    "@babel/register-7.8.3" = {
+    "@babel/register-7.8.6" = {
       name = "_at_babel_slash_register";
       packageName = "@babel/register";
-      version = "7.8.3";
+      version = "7.8.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/register/-/register-7.8.3.tgz";
-        sha512 = "t7UqebaWwo9nXWClIPLPloa5pN33A2leVs8Hf0e9g9YwUP8/H9NeR7DJU+4CXo23QtjChQv5a3DjEtT83ih1rg==";
+        url = "https://registry.npmjs.org/@babel/register/-/register-7.8.6.tgz";
+        sha512 = "7IDO93fuRsbyml7bAafBQb3RcBGlCpU4hh5wADA2LJEEcYk92WkwFZ0pHyIi2fb5Auoz1714abETdZKCOxN0CQ==";
       };
     };
     "@babel/runtime-7.7.7" = {
@@ -1111,40 +1111,40 @@ let
         sha512 = "uCnC2JEVAu8AKB5do1WRIsvrdJ0flYx/A/9f/6chdacnEZ7LmavjdsDXr5ksYBegxtuTPR5Va9/+13QF/kFkCA==";
       };
     };
-    "@babel/runtime-7.8.4" = {
+    "@babel/runtime-7.8.7" = {
       name = "_at_babel_slash_runtime";
       packageName = "@babel/runtime";
-      version = "7.8.4";
+      version = "7.8.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz";
-        sha512 = "neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==";
+        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz";
+        sha512 = "+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==";
       };
     };
-    "@babel/runtime-corejs3-7.8.4" = {
+    "@babel/runtime-corejs3-7.8.7" = {
       name = "_at_babel_slash_runtime-corejs3";
       packageName = "@babel/runtime-corejs3";
-      version = "7.8.4";
+      version = "7.8.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.8.4.tgz";
-        sha512 = "+wpLqy5+fbQhvbllvlJEVRIpYj+COUWnnsm+I4jZlA8Lo7/MJmBhGTCHyk1/RWfOqBRJ2MbadddG6QltTKTlrg==";
+        url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.8.7.tgz";
+        sha512 = "sc7A+H4I8kTd7S61dgB9RomXu/C+F4IrRr4Ytze4dnfx7AXEpCrejSNpjx7vq6y/Bak9S6Kbk65a/WgMLtg43Q==";
       };
     };
-    "@babel/template-7.8.3" = {
+    "@babel/template-7.8.6" = {
       name = "_at_babel_slash_template";
       packageName = "@babel/template";
-      version = "7.8.3";
+      version = "7.8.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz";
-        sha512 = "04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==";
+        url = "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz";
+        sha512 = "zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==";
       };
     };
-    "@babel/traverse-7.8.4" = {
+    "@babel/traverse-7.8.6" = {
       name = "_at_babel_slash_traverse";
       packageName = "@babel/traverse";
-      version = "7.8.4";
+      version = "7.8.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.4.tgz";
-        sha512 = "NGLJPZwnVEyBPLI+bl9y9aSnxMhsKz42so7ApAv9D+b4vAFPpY013FTS9LdKxcABoIYFU52HcYga1pPlx454mg==";
+        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.6.tgz";
+        sha512 = "2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A==";
       };
     };
     "@babel/types-7.0.0-beta.38" = {
@@ -1156,13 +1156,22 @@ let
         sha512 = "SAtyEjmA7KiEoL2eAOAUM6M9arQJGWxJKK0S9x0WyPOosHS420RXoxPhn57u/8orRnK8Kxm0nHQQNTX203cP1Q==";
       };
     };
-    "@babel/types-7.8.3" = {
+    "@babel/types-7.8.6" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
-      version = "7.8.3";
+      version = "7.8.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz";
-        sha512 = "jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==";
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.8.6.tgz";
+        sha512 = "wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==";
+      };
+    };
+    "@babel/types-7.8.7" = {
+      name = "_at_babel_slash_types";
+      packageName = "@babel/types";
+      version = "7.8.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz";
+        sha512 = "k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==";
       };
     };
     "@cliqz-oss/firefox-client-0.3.1" = {
@@ -2074,67 +2083,76 @@ let
         sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==";
       };
     };
-    "@msgpack/msgpack-1.11.0" = {
+    "@msgpack/msgpack-1.12.0" = {
       name = "_at_msgpack_slash_msgpack";
       packageName = "@msgpack/msgpack";
-      version = "1.11.0";
+      version = "1.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-1.11.0.tgz";
-        sha512 = "gR/NgUeQGARNabGVAjS59lagyxsCgD0zd4F5oKf9uKt8XNLu4awFBNO/Nstr2q1Iu1UPC5EeJeLZSNdP30m7zQ==";
+        url = "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-1.12.0.tgz";
+        sha512 = "7X4+Mt/TAmxhIR+Hryz0ykxnE9YC3sRH+HhcJ//1l7Z0aJD6YFCkD8UpFzXgpWBlAmybG4cnNVdd2GO6Gh8Pbg==";
       };
     };
-    "@node-red/editor-api-1.0.3" = {
+    "@node-red/editor-api-1.0.4" = {
       name = "_at_node-red_slash_editor-api";
       packageName = "@node-red/editor-api";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.0.3.tgz";
-        sha512 = "q/AFIIo7oORS5D3Tf94FniTNxRlPtdy4W/bp58UDzPpKamsgNbqdTFU0XG8vm87zDrYZeW3ZSuHQaYR6qMpxKQ==";
+        url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.0.4.tgz";
+        sha512 = "Bs37Jz/eLNy2qqQXbAX6ix/zvfvZEyZgvWE19PPCoF0BkVn290fkIK48ccdkALjKwmJRErpGEyzERcTWQks4BA==";
       };
     };
-    "@node-red/editor-client-1.0.3" = {
+    "@node-red/editor-client-1.0.4" = {
       name = "_at_node-red_slash_editor-client";
       packageName = "@node-red/editor-client";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.0.3.tgz";
-        sha512 = "qCMDsyL5rKzw7vjwUUw53zBEnfzk0mOFufLVb3eEICuXRzFfQ9nNGr4r3W/ed29eLNZSAXOqOF4NZXeGdh3cbA==";
+        url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.0.4.tgz";
+        sha512 = "BGjsNvvfEYPJIeoP8/8IwLbZeFqYUeEIWBcJ8PTCKPSb5H6Ettwpl6sgLNgSDbHbWHGg3avm7Y94qBnLFICKJg==";
       };
     };
-    "@node-red/nodes-1.0.3" = {
+    "@node-red/nodes-1.0.4" = {
       name = "_at_node-red_slash_nodes";
       packageName = "@node-red/nodes";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.0.3.tgz";
-        sha512 = "vSyeQCKKeX1lmlsseF3KmQVW/vP+kvWJa1l07F/26dCAKmfD85P06Bw+H8coBtmEjh/oMoecW1SSO9pfan6AWg==";
+        url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.0.4.tgz";
+        sha512 = "l64ZDLDBCgjdJrRVderJ83Sq24F8/rMhhv1Hmo7w4QCDX0Ki7sHWWQVa0BuS5u4n+jewiOLGs93RWWAzHccWRQ==";
       };
     };
-    "@node-red/registry-1.0.3" = {
+    "@node-red/registry-1.0.4" = {
       name = "_at_node-red_slash_registry";
       packageName = "@node-red/registry";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.0.3.tgz";
-        sha512 = "zSlW8lnS6Bgez8Sbr+1XPVI4NG0LuQj+IQ2Ra0WU805nDNjwzcfLPOx2fjSXeKIgGjT3pU/K63oeNuzkcMfnEg==";
+        url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.0.4.tgz";
+        sha512 = "vPKxglgpm1ZDxQd7385iYmZZ6VRZ+1v69fllGZDkhOZi5CVL/GwZ/G93fWyuO8g51fWHOu2qjGgaf7IfJ0iHhA==";
       };
     };
-    "@node-red/runtime-1.0.3" = {
+    "@node-red/runtime-1.0.4" = {
       name = "_at_node-red_slash_runtime";
       packageName = "@node-red/runtime";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.0.3.tgz";
-        sha512 = "wpFbylDo6ekIY48CptoYq5q55Ota4CjbvIaE7XNX/jF0D3YakzxLsAe0z7RGXI6NiFVfhmnhzWK6fIEFlm6ZRA==";
+        url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.0.4.tgz";
+        sha512 = "cbi5hd+LPERQpo0BuHYf67YPY+Z3hu+tDmRkEFfvDEgTz6qgiXg6FteMcWNx9a1dpt+30HuNhVPFAE8oa+L/Ug==";
       };
     };
-    "@node-red/util-1.0.3" = {
+    "@node-red/util-1.0.4" = {
       name = "_at_node-red_slash_util";
       packageName = "@node-red/util";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/util/-/util-1.0.3.tgz";
-        sha512 = "55NKHIU6l1Rl6GtZus/rtcgdLJmXN40cXqNuj6JV1JyMz6t/K0FEQwHRhjIpoxFVznctAL+vt3UmgeU+MpnYWg==";
+        url = "https://registry.npmjs.org/@node-red/util/-/util-1.0.4.tgz";
+        sha512 = "/+aj0C71TtoD2NwOU/J69Lw7skNk0mJp7LgpRfiMPoLuPASNuZdGbMZ2NjO7cvMfTtVvOG1APHnqT9dDyR3umg==";
+      };
+    };
+    "@nodelib/fs.scandir-2.1.3" = {
+      name = "_at_nodelib_slash_fs.scandir";
+      packageName = "@nodelib/fs.scandir";
+      version = "2.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz";
+        sha512 = "eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==";
       };
     };
     "@nodelib/fs.stat-1.1.3" = {
@@ -2146,6 +2164,24 @@ let
         sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==";
       };
     };
+    "@nodelib/fs.stat-2.0.3" = {
+      name = "_at_nodelib_slash_fs.stat";
+      packageName = "@nodelib/fs.stat";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz";
+        sha512 = "bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==";
+      };
+    };
+    "@nodelib/fs.walk-1.2.4" = {
+      name = "_at_nodelib_slash_fs.walk";
+      packageName = "@nodelib/fs.walk";
+      version = "1.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz";
+        sha512 = "1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==";
+      };
+    };
     "@npmcli/ci-detect-1.2.0" = {
       name = "_at_npmcli_slash_ci-detect";
       packageName = "@npmcli/ci-detect";
@@ -2155,6 +2191,15 @@ let
         sha512 = "JtktVH7ASBVIWsQTFlFpeOzhBJskvoBCTfeeRhhZy7ybATcUvwiwotZ8j5rkqUUyB69lIy/AvboiiiGBjYBKBA==";
       };
     };
+    "@npmcli/git-2.0.1" = {
+      name = "_at_npmcli_slash_git";
+      packageName = "@npmcli/git";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.1.tgz";
+        sha512 = "hVatexiBtx71F01Ars38Hr5AFUGmJgHAfQtRlO5fJlnAawRGSXwEFgjB5i3XdUUmElZU/RXy7fefN02dZKxgPw==";
+      };
+    };
     "@npmcli/installed-package-contents-1.0.5" = {
       name = "_at_npmcli_slash_installed-package-contents";
       packageName = "@npmcli/installed-package-contents";
@@ -2164,6 +2209,15 @@ let
         sha512 = "aKIwguaaqb6ViwSOFytniGvLPb9SMCUm39TgM3SfUo7n0TxUMbwoXfpwyvQ4blm10lzbAwTsvjr7QZ85LvTi4A==";
       };
     };
+    "@npmcli/promise-spawn-1.1.0" = {
+      name = "_at_npmcli_slash_promise-spawn";
+      packageName = "@npmcli/promise-spawn";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-1.1.0.tgz";
+        sha512 = "FwbuYN9KXBkloLeIR3xRgI8dyOdfK/KzaJlChszNuwmUXD1lHXfLlSeo4n4KrKt2udIK9K9/TzlnyCA3ubM2fA==";
+      };
+    };
     "@oclif/color-0.0.0" = {
       name = "_at_oclif_slash_color";
       packageName = "@oclif/color";
@@ -2353,13 +2407,13 @@ let
         sha512 = "gfFKwRT/wFxq5qlNjnW2dh+qh74XgTQ2B179UX5K1HYCluioWj8Ndbgqw2PVqa1NnVJkGHp2ovMpVn/DImlmkw==";
       };
     };
-    "@octokit/types-2.2.0" = {
+    "@octokit/types-2.5.0" = {
       name = "_at_octokit_slash_types";
       packageName = "@octokit/types";
-      version = "2.2.0";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/types/-/types-2.2.0.tgz";
-        sha512 = "iEeW3XlkxeM/CObeoYvbUv24Oe+DldGofY+3QyeJ5XKKA6B+V94ePk14EDCarseWdMs6afKZPv3dFq8C+SY5lw==";
+        url = "https://registry.npmjs.org/@octokit/types/-/types-2.5.0.tgz";
+        sha512 = "KEnLwOfdXzxPNL34fj508bhi9Z9cStyN7qY1kOfVahmqtAfrWw6Oq3P4R+dtsg0lYtZdWBpUrS/Ixmd5YILSww==";
       };
     };
     "@parcel/fs-1.11.0" = {
@@ -2524,22 +2578,22 @@ let
         sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==";
       };
     };
-    "@schematics/angular-9.0.3" = {
+    "@schematics/angular-9.0.6" = {
       name = "_at_schematics_slash_angular";
       packageName = "@schematics/angular";
-      version = "9.0.3";
+      version = "9.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.0.3.tgz";
-        sha512 = "6XSnPW4G7aoKXccg0FTpZ02y/yi9y/bj7swnSL9Z4RRPIvPVapDjB7uJPg8sm8+PTIpcMhEFQrchIqM3LXW4zA==";
+        url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.0.6.tgz";
+        sha512 = "oYIfSJF9ISAJWJjIiUnj8Rp1m4t9T3oqKl1FzkMWXvUmR1BfkO2S2/Moi2RQ0aHG6D9Oz4CJjrsQRmjaqBpEZw==";
       };
     };
-    "@schematics/update-0.900.3" = {
+    "@schematics/update-0.900.6" = {
       name = "_at_schematics_slash_update";
       packageName = "@schematics/update";
-      version = "0.900.3";
+      version = "0.900.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/update/-/update-0.900.3.tgz";
-        sha512 = "mlRsm3/HM1f/10Wdz4xMYA+mpW3EDCB+whlV5cJ7PGMhjUMaxA9DuWvoP06h05le6XmgnjIEoxL6NJ7CgesHcA==";
+        url = "https://registry.npmjs.org/@schematics/update/-/update-0.900.6.tgz";
+        sha512 = "54Xi3FIJQWFBM91vxD9ciKkTlNWaIV7wsjKSImg53h2m2/l2VPPHyIZWI4j79dWXlfJVTNeaqPNYGzJlRvaEmA==";
       };
     };
     "@serverless/cli-1.4.0" = {
@@ -2560,6 +2614,15 @@ let
         sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang==";
       };
     };
+    "@serverless/components-2.22.3" = {
+      name = "_at_serverless_slash_components";
+      packageName = "@serverless/components";
+      version = "2.22.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@serverless/components/-/components-2.22.3.tgz";
+        sha512 = "RXRKt1RAi+zdvzBkwdrl2viOEo0mjMXOXMk2wayIT6NQ5hNUbptkFIhldXK4Q3n7f4xEHf6ufrax4YGhMHBR3Q==";
+      };
+    };
     "@serverless/core-1.1.2" = {
       name = "_at_serverless_slash_core";
       packageName = "@serverless/core";
@@ -2569,13 +2632,13 @@ let
         sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ==";
       };
     };
-    "@serverless/enterprise-plugin-3.4.1" = {
+    "@serverless/enterprise-plugin-3.5.0" = {
       name = "_at_serverless_slash_enterprise-plugin";
       packageName = "@serverless/enterprise-plugin";
-      version = "3.4.1";
+      version = "3.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.4.1.tgz";
-        sha512 = "xo887e8GdumWY4iUxlgm3vrIZqVxFXvYk/fGORS+uTa4QG5t6iiJlPy7P0S8KKr90UBWE3eSg9w4tGAgVw2fIg==";
+        url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.5.0.tgz";
+        sha512 = "AyY7ADtUItSQFQjNRaXZ5ZgMVeeUJZ05UJHxN3WbO9c3fY6/6TxAQRlrDB2O5hfSPkBDfqhUOSp2xbBwIVg/Tw==";
       };
     };
     "@serverless/event-mocks-1.1.1" = {
@@ -2587,6 +2650,15 @@ let
         sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A==";
       };
     };
+    "@serverless/platform-client-0.24.0" = {
+      name = "_at_serverless_slash_platform-client";
+      packageName = "@serverless/platform-client";
+      version = "0.24.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-0.24.0.tgz";
+        sha512 = "ppxR5wONzzxNSmt/9agfSzC0F4yrkHZWAR5IPLm4yj+dMxb+768XrbqBU6vnOfCcmjb89OX5Bk0GvyQh+T5gLw==";
+      };
+    };
     "@serverless/platform-sdk-2.3.0" = {
       name = "_at_serverless_slash_platform-sdk";
       packageName = "@serverless/platform-sdk";
@@ -2623,13 +2695,13 @@ let
         sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==";
       };
     };
-    "@sindresorhus/is-1.2.0" = {
+    "@sindresorhus/is-2.1.0" = {
       name = "_at_sindresorhus_slash_is";
       packageName = "@sindresorhus/is";
-      version = "1.2.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sindresorhus/is/-/is-1.2.0.tgz";
-        sha512 = "mwhXGkRV5dlvQc4EgPDxDxO6WuMBVymGFd1CA+2Y+z5dG9MNspoQ+AWjl/Ld1MnpCL8AKbosZlDVohqcIwuWsw==";
+        url = "https://registry.npmjs.org/@sindresorhus/is/-/is-2.1.0.tgz";
+        sha512 = "lXKXfypKo644k4Da4yXkPCrwcvn6SlUW2X2zFbuflKHNjf0w9htru01bo26uMhleMXsDmnZ12eJLdrAZa9MANg==";
       };
     };
     "@slack/client-3.16.0" = {
@@ -2713,13 +2785,13 @@ let
         sha512 = "CV3QggFY8BY3u8PdSSlUGLibqbqCG1zJRmGM2DhnhcxQDRRPTGTP//l7vJphOVsUP1Oe23+UQsj7KRWpRUZiqg==";
       };
     };
-    "@snyk/dep-graph-1.13.1" = {
+    "@snyk/dep-graph-1.16.1" = {
       name = "_at_snyk_slash_dep-graph";
       packageName = "@snyk/dep-graph";
-      version = "1.13.1";
+      version = "1.16.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.13.1.tgz";
-        sha512 = "Ww2xvm5UQgrq9eV0SdTBCh+w/4oI2rCx5vn1IOSeypaR0CO4p+do1vm3IDZ2ugg4jLSfHP8+LiD6ORESZMkQ2w==";
+        url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.16.1.tgz";
+        sha512 = "2RbstN/z5A3iTmgDQr0vfpWpqsjcJY54PXXP0gVXTf137QLdvgPEsZikjlofF4qoNO1io5t1VGvf69v9E8UrOw==";
       };
     };
     "@snyk/gemfile-1.2.0" = {
@@ -2731,13 +2803,13 @@ let
         sha512 = "nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA==";
       };
     };
-    "@snyk/ruby-semver-2.0.4" = {
+    "@snyk/ruby-semver-2.1.0" = {
       name = "_at_snyk_slash_ruby-semver";
       packageName = "@snyk/ruby-semver";
-      version = "2.0.4";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@snyk/ruby-semver/-/ruby-semver-2.0.4.tgz";
-        sha512 = "ceMD4CBS3qtAg+O0BUvkKdsheUNCqi+/+Rju243Ul8PsUgZnXmGiqfk/2z7DCprRQnxUTra4+IyeDQT7wAheCQ==";
+        url = "https://registry.npmjs.org/@snyk/ruby-semver/-/ruby-semver-2.1.0.tgz";
+        sha512 = "u8ez8kWyqge+N+FxRDx/uPBmcHzY7BMfODvzEVeoTOeoD0CHPymEaVlkEKA8ZHtxzXjUzPIl2I8f2siZEzLjYg==";
       };
     };
     "@snyk/snyk-cocoapods-plugin-2.0.1" = {
@@ -2857,13 +2929,13 @@ let
         sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==";
       };
     };
-    "@szmarczak/http-timer-3.1.1" = {
+    "@szmarczak/http-timer-4.0.5" = {
       name = "_at_szmarczak_slash_http-timer";
       packageName = "@szmarczak/http-timer";
-      version = "3.1.1";
+      version = "4.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-3.1.1.tgz";
-        sha512 = "F7vS53bV9NXT+mmYFeSBr2nXaOI1h6qxdlLDVP+4CPG/c60MMStT7aaqYD2TSNWob1DA3GH9ikFY0UW31bUsWA==";
+        url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.5.tgz";
+        sha512 = "PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ==";
       };
     };
     "@textlint/ast-node-types-4.2.5" = {
@@ -2992,6 +3064,24 @@ let
         sha512 = "6oGaBKXYpg5Ooph5p32OFdp1dXDUC1z5mpHg2gmQbx6QZjmP4QX+ygBQdNoCq15d1w88+We6koJl0n0WXjItYw==";
       };
     };
+    "@tokenizer/token-0.1.1" = {
+      name = "_at_tokenizer_slash_token";
+      packageName = "@tokenizer/token";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@tokenizer/token/-/token-0.1.1.tgz";
+        sha512 = "XO6INPbZCxdprl+9qa/AAbFFOMzzwqYxpjPgLICrMD6C2FCw6qfJOPcBk6JqqPLSaZ/Qx87qn4rpPmPMwaAK6w==";
+      };
+    };
+    "@tootallnate/once-1.0.0" = {
+      name = "_at_tootallnate_slash_once";
+      packageName = "@tootallnate/once";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@tootallnate/once/-/once-1.0.0.tgz";
+        sha512 = "KYyTT/T6ALPkIRd2Ge080X/BsXvy9O0hcWTtMWkPvwAwF99+vn6Dv4GzrFT/Nn1LePr+FFDbRXXlqmsy9lw2zA==";
+      };
+    };
     "@types/accepts-1.3.5" = {
       name = "_at_types_slash_accepts";
       packageName = "@types/accepts";
@@ -3064,13 +3154,13 @@ let
         sha512 = "xH2e58elpj1X4ynnKp9qSnWlsRTIs6n3tgLGNfwAGHwePw0mulHQllV34n0T25uYSu1k0hRKkWXF890B1yS47w==";
       };
     };
-    "@types/body-parser-1.17.1" = {
+    "@types/body-parser-1.19.0" = {
       name = "_at_types_slash_body-parser";
       packageName = "@types/body-parser";
-      version = "1.17.1";
+      version = "1.19.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.1.tgz";
-        sha512 = "RoX2EZjMiFMjZh9lmYrwgoP9RTpAjSHiJxdp4oidAQVO02T7HER3xj9UKue5534ULWeqVEkujhWcyvUce+d68w==";
+        url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz";
+        sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==";
       };
     };
     "@types/bunyan-1.8.6" = {
@@ -3145,6 +3235,15 @@ let
         sha512 = "Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==";
       };
     };
+    "@types/eslint-visitor-keys-1.0.0" = {
+      name = "_at_types_slash_eslint-visitor-keys";
+      packageName = "@types/eslint-visitor-keys";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz";
+        sha512 = "OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==";
+      };
+    };
     "@types/estree-0.0.39" = {
       name = "_at_types_slash_estree";
       packageName = "@types/estree";
@@ -3280,6 +3379,15 @@ let
         sha512 = "0CFu/g4mDSNkodVwWijdlr8jH7RoplRWNgovjFLEZeT+QEbbZXjBmCe3HwaWheAlCbHwomTwzZoSedeOycABug==";
       };
     };
+    "@types/json-schema-7.0.4" = {
+      name = "_at_types_slash_json-schema";
+      packageName = "@types/json-schema";
+      version = "7.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.4.tgz";
+        sha512 = "8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==";
+      };
+    };
     "@types/keygrip-1.0.2" = {
       name = "_at_types_slash_keygrip";
       packageName = "@types/keygrip";
@@ -3361,22 +3469,22 @@ let
         sha1 = "69a23a3ad29caf0097f06eda59b361ee2f0639f6";
       };
     };
-    "@types/node-10.17.16" = {
+    "@types/node-10.17.17" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "10.17.16";
+      version = "10.17.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-10.17.16.tgz";
-        sha512 = "A4283YSA1OmnIivcpy/4nN86YlnKRiQp8PYwI2KdPCONEBN093QTb0gCtERtkLyVNGKKIGazTZ2nAmVzQU51zA==";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.17.17.tgz";
+        sha512 = "gpNnRnZP3VWzzj5k3qrpRC6Rk3H/uclhAVo1aIvwzK5p5cOrs9yEyQ8H/HBsBY0u5rrWxXEiVPQ0dEB6pkjE8Q==";
       };
     };
-    "@types/node-13.7.5" = {
+    "@types/node-13.9.1" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "13.7.5";
+      version = "13.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-13.7.5.tgz";
-        sha512 = "PfSBCTQhAQg6QBP4UhXgrZ/wQ3pjfwBr4sA7Aul+pC9XwGgm9ezrJF7OiC/I4Kf+7VPu/5ThKngAruqxyctZfA==";
+        url = "https://registry.npmjs.org/@types/node/-/node-13.9.1.tgz";
+        sha512 = "E6M6N0blf/jiZx8Q3nb0vNaswQeEyn0XlupO+xN6DtJ6r6IT4nXrTry7zhIfYvFCl3/8Cu6WIysmUBKiqV0bqQ==";
       };
     };
     "@types/node-6.14.9" = {
@@ -3388,13 +3496,13 @@ let
         sha512 = "leP/gxHunuazPdZaCvsCefPQxinqUDsCxCR5xaDUrY2MkYxQRFZZwU5e7GojyYsGB7QVtCi7iVEl/hoFXQYc+w==";
       };
     };
-    "@types/node-fetch-2.5.4" = {
+    "@types/node-fetch-2.5.5" = {
       name = "_at_types_slash_node-fetch";
       packageName = "@types/node-fetch";
-      version = "2.5.4";
+      version = "2.5.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.4.tgz";
-        sha512 = "Oz6id++2qAOFuOlE1j0ouk1dzl3mmI1+qINPNBhi9nt/gVOz0G+13Ao6qjhdF0Ys+eOkhu6JnFmt38bR3H0POQ==";
+        url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.5.tgz";
+        sha512 = "IWwjsyYjGw+em3xTvWVQi5MgYKbRs0du57klfTaZkv/B24AEQ/p/IopNeqIYNy3EsfHOpg8ieQSDomPcsYMHpA==";
       };
     };
     "@types/normalize-package-data-2.4.0" = {
@@ -3559,40 +3667,67 @@ let
         sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==";
       };
     };
-    "@vue/cli-shared-utils-4.2.2" = {
+    "@typescript-eslint/experimental-utils-1.13.0" = {
+      name = "_at_typescript-eslint_slash_experimental-utils";
+      packageName = "@typescript-eslint/experimental-utils";
+      version = "1.13.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-1.13.0.tgz";
+        sha512 = "zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg==";
+      };
+    };
+    "@typescript-eslint/parser-1.13.0" = {
+      name = "_at_typescript-eslint_slash_parser";
+      packageName = "@typescript-eslint/parser";
+      version = "1.13.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-1.13.0.tgz";
+        sha512 = "ITMBs52PCPgLb2nGPoeT4iU3HdQZHcPaZVw+7CsFagRJHUhyeTgorEwHXhFf3e7Evzi8oujKNpHc8TONth8AdQ==";
+      };
+    };
+    "@typescript-eslint/typescript-estree-1.13.0" = {
+      name = "_at_typescript-eslint_slash_typescript-estree";
+      packageName = "@typescript-eslint/typescript-estree";
+      version = "1.13.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-1.13.0.tgz";
+        sha512 = "b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw==";
+      };
+    };
+    "@vue/cli-shared-utils-4.2.3" = {
       name = "_at_vue_slash_cli-shared-utils";
       packageName = "@vue/cli-shared-utils";
-      version = "4.2.2";
+      version = "4.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.2.2.tgz";
-        sha512 = "EK5wcxgjadqUpSzfh6Bnxd46Zx+SAaHusygqV11UZKHr4EObc/SjCpq7c7drmFkBjRqmVvrHs4jRnJJo5VgCgQ==";
+        url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.2.3.tgz";
+        sha512 = "GCoTB6vMZsi9z/Bmn8/C9IlnUw8eeHONOGE+48TJkZyulftVFhlwVWjTFp5GuDAlwpTWarHchW9IoVu3pIIGfA==";
       };
     };
-    "@vue/cli-ui-4.2.2" = {
+    "@vue/cli-ui-4.2.3" = {
       name = "_at_vue_slash_cli-ui";
       packageName = "@vue/cli-ui";
-      version = "4.2.2";
+      version = "4.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.2.2.tgz";
-        sha512 = "JWbAWIxjMIL8Svgveqd7cxIpLGxX2vXizVtjoWNsxcnEGrWFOzbb2uKQwlf/3v4m4ERNP+eKGFagqWEn7SUFiw==";
+        url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.2.3.tgz";
+        sha512 = "Jk400/8tujs+gPg/a505R1YaANkzCHJh+zixoxj+BUZB+VDYVQl+ypQLm75KNuakN7BZeMJU51kKRAv7fI6/YQ==";
       };
     };
-    "@vue/cli-ui-addon-webpack-4.2.2" = {
+    "@vue/cli-ui-addon-webpack-4.2.3" = {
       name = "_at_vue_slash_cli-ui-addon-webpack";
       packageName = "@vue/cli-ui-addon-webpack";
-      version = "4.2.2";
+      version = "4.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.2.2.tgz";
-        sha512 = "d5LpntzWGJGLD9EXEZPosCrgMosds9Mik/tSbs0tOrCkiBRgC2feUOeL87JnPWS2wEQA34Vujz7+2WeTM40GUw==";
+        url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.2.3.tgz";
+        sha512 = "K4qJ02W8B4C6tTn4O88SOZS6JTRgXxlygKHFg1Z/bb/X6J7AXfKbafjxF6s6WNiL1yJdTJMlT5Ow23I//Uu9Lg==";
       };
     };
-    "@vue/cli-ui-addon-widgets-4.2.2" = {
+    "@vue/cli-ui-addon-widgets-4.2.3" = {
       name = "_at_vue_slash_cli-ui-addon-widgets";
       packageName = "@vue/cli-ui-addon-widgets";
-      version = "4.2.2";
+      version = "4.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.2.2.tgz";
-        sha512 = "c3NNO3eXU2H1ISk12UVXbRg0cKes2IxPiaT4URDTxUVTXzQJpCg2bQ3V8w11IcvC6rykonzrFsXRrhUPD+tD8A==";
+        url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.2.3.tgz";
+        sha512 = "HuJ/KEpRObKyKWu1Z89AwwwB06cffOmJs6Y6xutuyDjjnaGk/BdwTk+NaTGC0wMlam6Jm9Yw36ikAnr2XUGITw==";
       };
     };
     "@webassemblyjs/ast-1.8.1" = {
@@ -4324,31 +4459,31 @@ let
         sha1 = "105495ae5361d697bd195c825192e1ad7f253787";
       };
     };
-    "acorn-5.7.3" = {
+    "acorn-5.7.4" = {
       name = "acorn";
       packageName = "acorn";
-      version = "5.7.3";
+      version = "5.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz";
-        sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==";
+        url = "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz";
+        sha512 = "1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==";
       };
     };
-    "acorn-6.4.0" = {
+    "acorn-6.4.1" = {
       name = "acorn";
       packageName = "acorn";
-      version = "6.4.0";
+      version = "6.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz";
-        sha512 = "gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==";
+        url = "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz";
+        sha512 = "ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==";
       };
     };
-    "acorn-7.1.0" = {
+    "acorn-7.1.1" = {
       name = "acorn";
       packageName = "acorn";
-      version = "7.1.0";
+      version = "7.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz";
-        sha512 = "kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==";
+        url = "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz";
+        sha512 = "add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==";
       };
     };
     "acorn-globals-1.0.9" = {
@@ -4387,13 +4522,13 @@ let
         sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b";
       };
     };
-    "acorn-jsx-5.1.0" = {
+    "acorn-jsx-5.2.0" = {
       name = "acorn-jsx";
       packageName = "acorn-jsx";
-      version = "5.1.0";
+      version = "5.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz";
-        sha512 = "tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==";
+        url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz";
+        sha512 = "HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==";
       };
     };
     "acorn-loose-6.1.0" = {
@@ -4576,6 +4711,15 @@ let
         sha512 = "TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==";
       };
     };
+    "agent-base-6.0.0" = {
+      name = "agent-base";
+      packageName = "agent-base";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.0.tgz";
+        sha512 = "j1Q7cSCqN+AwrmDd+pzgqc0/NpC655x2bUf5ZjRIO77DcNBFmh+OgRNzF6OKdCC9RSCb19fGd99+bhXFdkRNqw==";
+      };
+    };
     "agentkeepalive-3.5.2" = {
       name = "agentkeepalive";
       packageName = "agentkeepalive";
@@ -4900,13 +5044,13 @@ let
         sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==";
       };
     };
-    "ansi-escapes-4.3.0" = {
+    "ansi-escapes-4.3.1" = {
       name = "ansi-escapes";
       packageName = "ansi-escapes";
-      version = "4.3.0";
+      version = "4.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.0.tgz";
-        sha512 = "EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg==";
+        url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz";
+        sha512 = "JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==";
       };
     };
     "ansi-gray-0.1.1" = {
@@ -5071,15 +5215,6 @@ let
         sha1 = "a82250ddb0015e9a27ca82e82ea603bbfa45efaf";
       };
     };
-    "ansicolors-0.2.1" = {
-      name = "ansicolors";
-      packageName = "ansicolors";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansicolors/-/ansicolors-0.2.1.tgz";
-        sha1 = "be089599097b74a5c9c4a84a0cdbcdb62bd87aef";
-      };
-    };
     "ansicolors-0.3.2" = {
       name = "ansicolors";
       packageName = "ansicolors";
@@ -5161,13 +5296,13 @@ let
         sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw==";
       };
     };
-    "apollo-2.23.0" = {
+    "apollo-2.25.0" = {
       name = "apollo";
       packageName = "apollo";
-      version = "2.23.0";
+      version = "2.25.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo/-/apollo-2.23.0.tgz";
-        sha512 = "X6BKom6trsIOpn0AuH811HWMi2DyL/KvQ09yd5h2V726SD09jhzaNrR/1m/3RI7bVRTFHK4xncn1V3Z8KKRduQ==";
+        url = "https://registry.npmjs.org/apollo/-/apollo-2.25.0.tgz";
+        sha512 = "+y/V2HtuSQBjupTJDS30nn/3urml1YE1sAKRK/bkwJLWAkGxNk2M/2vrbSnuASWv40F+K+NaLkveMoNaBL5L3A==";
       };
     };
     "apollo-cache-1.3.4" = {
@@ -5179,13 +5314,13 @@ let
         sha512 = "7X5aGbqaOWYG+SSkCzJNHTz2ZKDcyRwtmvW4mGVLRqdQs+HxfXS4dUS2CcwrAj449se6tZ6NLUMnjko4KMt3KA==";
       };
     };
-    "apollo-cache-control-0.8.11" = {
+    "apollo-cache-control-0.9.0" = {
       name = "apollo-cache-control";
       packageName = "apollo-cache-control";
-      version = "0.8.11";
+      version = "0.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.8.11.tgz";
-        sha512 = "8yz4qbRBIFDWRHdT8uPh0HHh+VbQXxoFGJQRAG8hyMRvR+EuURXX1ltXYkn5J3YJ3MKEqgsvwGaq60dFZq63UQ==";
+        url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.9.0.tgz";
+        sha512 = "iLT6IT4Ul5cMfBcJAvhpk3a7AD6fXqvFxNmJEPVapVJHbSKYIjra4PTis13sOyN5Y3WQS6a+NRFxAW8+hL3q3Q==";
       };
     };
     "apollo-cache-inmemory-1.6.5" = {
@@ -5224,13 +5359,13 @@ let
         sha512 = "sanUIqXWyyDpxY3fYOVU+Hsxwxdj5fmn3Zcy6CcMGnWmh9o7tautQAuod2a63wrDs1jcNQcFq3EKIpeB+2xECw==";
       };
     };
-    "apollo-codegen-core-0.36.2" = {
+    "apollo-codegen-core-0.36.4" = {
       name = "apollo-codegen-core";
       packageName = "apollo-codegen-core";
-      version = "0.36.2";
+      version = "0.36.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.36.2.tgz";
-        sha512 = "XQMOg4eUlEBEGCLTaqwu89gP/BdHwBMKUQPeo+voWhRI3D0ZxP4CfmCZ5khf0M4peh1OiTDG30hSn4DPzSOloA==";
+        url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.36.4.tgz";
+        sha512 = "+wgqwuI1TIfK490gFa1I+cqTaXARCiOJ6LDt2XODyW78yhnhhkgwj2ATSG3lggMbi25orM5AuHPytJCvrpYoTA==";
       };
     };
     "apollo-codegen-flow-0.20.0" = {
@@ -5242,13 +5377,13 @@ let
         sha512 = "XgKE19B0Q74PBLVqHP/77NcCFrcvrN9wi3CcotH+FV8BeHTjvpHlilTsQMmd2STPt19cCvY2Qtz0EOeLXTUQ2Q==";
       };
     };
-    "apollo-codegen-flow-0.34.2" = {
+    "apollo-codegen-flow-0.34.4" = {
       name = "apollo-codegen-flow";
       packageName = "apollo-codegen-flow";
-      version = "0.34.2";
+      version = "0.34.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.34.2.tgz";
-        sha512 = "gba1iSDAetw+c+/Ip/zYKoUsO7mGcTGJCgzoH+Q0Ww6KpKiIvg5PppBVhsg2sleomgL7gnGx2juqx6dAj1iSTg==";
+        url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.34.4.tgz";
+        sha512 = "85LK4hpBv2auzFFPs+5YkI1T1HIr1n1cj9K+5gQGuAOtl+LuNF14saYEWNDMZS7xKs5TyS/wbxA6PdOlF7gKqg==";
       };
     };
     "apollo-codegen-flow-legacy-0.20.0" = {
@@ -5269,13 +5404,13 @@ let
         sha512 = "NbnMOfUXXovlTGRj4mIZGXB9HvidQhwKfAmdYHox5peHPkjjsqEzxGCIuWCSnubWiCF2uHZnQoIkg4sXWf0KLw==";
       };
     };
-    "apollo-codegen-scala-0.35.2" = {
+    "apollo-codegen-scala-0.35.4" = {
       name = "apollo-codegen-scala";
       packageName = "apollo-codegen-scala";
-      version = "0.35.2";
+      version = "0.35.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.35.2.tgz";
-        sha512 = "Wq+WF8p1SGEqgkWJuTDsGMX16VzWxsJE/Nsy/BystG0Ys9RuhG4lPmpEpLYqsMX0O4OyWet+Yvio/H4xzOZQIA==";
+        url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.35.4.tgz";
+        sha512 = "rmzUHfCWNpBw8sED8jyCZMesX2XMv9U/KYnOwbbQadK+ez70LIL89WoPLsTIZi+XqagyhqiJDw8bjyqcfE3qgA==";
       };
     };
     "apollo-codegen-swift-0.20.0" = {
@@ -5287,13 +5422,13 @@ let
         sha512 = "L9Y4StbXw0t/nuF+miz0ybSt/io6tsLc063Yeh1A8GCvhFFQyXE/yK0Rf3nO1Bl5Z9UZ5o8Aae9kK4GSWYIGNQ==";
       };
     };
-    "apollo-codegen-swift-0.36.2" = {
+    "apollo-codegen-swift-0.36.4" = {
       name = "apollo-codegen-swift";
       packageName = "apollo-codegen-swift";
-      version = "0.36.2";
+      version = "0.36.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.36.2.tgz";
-        sha512 = "fzoMb9YIk9z2IPyf7hPFyooQfbEtSl/EOKjILsqRIO7HTD7B0Vup/Jbu7W5GrwYZAsZH3MU1IpdULRfVNoIOhw==";
+        url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.36.4.tgz";
+        sha512 = "0wCjtCaHMYxieezx3eJS4Csc+289hsEJF+QxUea88oB32PyIcv8H5B/erJMlEiTm4fAVZyBta3XxN9474ii0OQ==";
       };
     };
     "apollo-codegen-typescript-0.20.0" = {
@@ -5305,13 +5440,13 @@ let
         sha512 = "mzlIJXz+5WPwzeALqRHHR9aPPEf6IlhSrjCawpUHmFU1NK9hgwbguYCEYZv9mKkYBUUgDY+9cGFK1cafJX70AQ==";
       };
     };
-    "apollo-codegen-typescript-0.36.2" = {
+    "apollo-codegen-typescript-0.36.4" = {
       name = "apollo-codegen-typescript";
       packageName = "apollo-codegen-typescript";
-      version = "0.36.2";
+      version = "0.36.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.36.2.tgz";
-        sha512 = "DuoDVP8DiiucXCT17rkP8fUPGF+oqCwNt3/PdywVc7pokQfYMHhJJPxVNzIWJZ7Pqs4eD25VoJCp40DLIkLAfA==";
+        url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.36.4.tgz";
+        sha512 = "2+PIx8jkm1klD16bW3+eMcuKm0OWI1/VNdREwMPz5CZ+cecaFeIpl0uuNAf+G9IyOm9AThgXNBqxRDa9XhNw5A==";
       };
     };
     "apollo-codegen-typescript-legacy-0.20.0" = {
@@ -5332,13 +5467,13 @@ let
         sha512 = "Yja12BgNQhzuFGG/5Nw2MQe0hkuQy2+9er09HxeEyAf2rUDIPnhPrn1MDoZTB8MU7UGfjwITC+1ofzKkkrZobA==";
       };
     };
-    "apollo-engine-reporting-1.6.0" = {
+    "apollo-engine-reporting-1.7.0" = {
       name = "apollo-engine-reporting";
       packageName = "apollo-engine-reporting";
-      version = "1.6.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.6.0.tgz";
-        sha512 = "prA17Tp/WYBJdCd4ey1CnGX8d4Xis1n9PsFmT7x8PV/oNpxG21/x3yNw5kPBZuKAoKz8yEggYtHhkYie1ZBjPQ==";
+        url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.7.0.tgz";
+        sha512 = "jsjSnoHrRmk4XXK4aFU17YSJILmWsilKRwIeN74QJsSxjn5SCVF4EI/ebf/MNrTHpft8EhShx+wdkAcOD9ivqA==";
       };
     };
     "apollo-engine-reporting-protobuf-0.4.4" = {
@@ -5350,31 +5485,31 @@ let
         sha512 = "SGrIkUR7Q/VjU8YG98xcvo340C4DaNUhg/TXOtGsMlfiJDzHwVau/Bv6zifAzBafp2lj0XND6Daj5kyT/eSI/w==";
       };
     };
-    "apollo-env-0.6.1" = {
+    "apollo-env-0.6.2" = {
       name = "apollo-env";
       packageName = "apollo-env";
-      version = "0.6.1";
+      version = "0.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.1.tgz";
-        sha512 = "B9BgpQGR1ndeDtb4Gtor0J4CITQ+OPACZrVW6lgStnljKEe9ZB76DZ1dAd3OCeizAswW6Lo9uvfK8jhVS5nBhQ==";
+        url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.2.tgz";
+        sha512 = "Vb/doL1ZbzkNDJCQ6kYGOrphRx63rMERYo3MT2pzm2pNEdm6AK60InMgJaeh3RLK3cjGllOXFAgP8IY+m+TaEg==";
       };
     };
-    "apollo-graphql-0.4.0" = {
+    "apollo-graphql-0.4.1" = {
       name = "apollo-graphql";
       packageName = "apollo-graphql";
-      version = "0.4.0";
+      version = "0.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.4.0.tgz";
-        sha512 = "abCHcKln1EGbzSItW087EjBI5wnluikyUqEn4VsdeWHCtdENWpHCn/MnM0+jJa1prNasxN7tCukp4nMpJYYVqg==";
+        url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.4.1.tgz";
+        sha512 = "dz2wtGeCqUDAKAj4KXLKLZiFY791aoXduul3KcLo8/6SwqWlsuZiPe0oB8mENHZZc/EchCpTMTJZX2ZENsOt2A==";
       };
     };
-    "apollo-language-server-1.19.2" = {
+    "apollo-language-server-1.20.1" = {
       name = "apollo-language-server";
       packageName = "apollo-language-server";
-      version = "1.19.2";
+      version = "1.20.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.19.2.tgz";
-        sha512 = "ZPMlqwVaAN96LGZiliW1ALbGFkZ6N0jYowhvM9SMlqNzKzIKCVi3mUjNAcIB0CIP4YvgLjUfL0IqUE7qw/ZOHw==";
+        url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.20.1.tgz";
+        sha512 = "UML94ZUe1SISp0alx7as/hl2gbk0qw1j8EBDb6YlB/ggjk4WuBNlROMSeHlLdrSpq3tghnBy2hwSkQKLLQsMpw==";
       };
     };
     "apollo-link-1.2.13" = {
@@ -5458,13 +5593,13 @@ let
         sha512 = "L7LHZ3k9Ao5OSf2WStvQhxdsNVplRQi7kCAPfqf9Z3GBEnQ2uaL0EgO0hSmtVHfXTbk5CTRziMT1Pe87bXrFIw==";
       };
     };
-    "apollo-server-core-2.10.1" = {
+    "apollo-server-core-2.11.0" = {
       name = "apollo-server-core";
       packageName = "apollo-server-core";
-      version = "2.10.1";
+      version = "2.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.10.1.tgz";
-        sha512 = "BVITSJRMnj+CWFkjt7FMcaoqg/Ni9gfyVE9iu8bUc1IebBfFDcQj652Iolr7dTqyUziN2jbf0wfcybKYJLQHQQ==";
+        url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.11.0.tgz";
+        sha512 = "jHLOqwTRlyWzqWNRlwr2M/xfrt+lw2pHtKYyxUGRjWFo8EM5TX1gDcTKtbtvx9p5m+ZBDAhcWp/rpq0vSz4tqg==";
       };
     };
     "apollo-server-env-2.4.3" = {
@@ -5476,49 +5611,49 @@ let
         sha512 = "23R5Xo9OMYX0iyTu2/qT0EUb+AULCBriA9w8HDfMoChB8M+lFClqUkYtaTTHDfp6eoARLW8kDBhPOBavsvKAjA==";
       };
     };
-    "apollo-server-errors-2.3.4" = {
+    "apollo-server-errors-2.4.0" = {
       name = "apollo-server-errors";
       packageName = "apollo-server-errors";
-      version = "2.3.4";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.3.4.tgz";
-        sha512 = "Y0PKQvkrb2Kd18d1NPlHdSqmlr8TgqJ7JQcNIfhNDgdb45CnqZlxL1abuIRhr8tiw8OhVOcFxz2KyglBi8TKdA==";
+        url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.4.0.tgz";
+        sha512 = "ZouZfr2sGavvI18rgdRcyY2ausRAlVtWNOax9zca8ZG2io86dM59jXBmUVSNlVZSmBsIh45YxYC0eRvr2vmRdg==";
       };
     };
-    "apollo-server-express-2.10.1" = {
+    "apollo-server-express-2.11.0" = {
       name = "apollo-server-express";
       packageName = "apollo-server-express";
-      version = "2.10.1";
+      version = "2.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.10.1.tgz";
-        sha512 = "NkuWGBOCTiju/aDjfvDImm+4yzfrM0dwiRxu9fKwwh2h1oYBUKJNqjQ1mzJRi0ks6Sn1egwl/fQkTBTkWwGx7Q==";
+        url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.11.0.tgz";
+        sha512 = "9bbiD+zFAx+xyurc9lxYmNa9y79k/gsA1vEyPFVcv7jxzCFC5wc0tcbV7NPX2qi1Nn7K76fxo2fPNYbPFX/y0g==";
       };
     };
-    "apollo-server-plugin-base-0.6.10" = {
+    "apollo-server-plugin-base-0.7.0" = {
       name = "apollo-server-plugin-base";
       packageName = "apollo-server-plugin-base";
-      version = "0.6.10";
+      version = "0.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.6.10.tgz";
-        sha512 = "/xT7UT/tbCDIoTQ4lcEQsJ0ACh7h7QG0BDmeSlDXjwDuENRI50bQ2QoluCMPitZXGe+FCQfLhvzFgzbsZGT0IA==";
+        url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.7.0.tgz";
+        sha512 = "//xgYrBYLQSr92W0z3mYsFGoVz3wxKNsv3KcOUBhbOCGTbjZgP7vHOE1vhHhRcpZKKXmjXTVONdrnNJ+XVGi6A==";
       };
     };
-    "apollo-server-types-0.2.10" = {
+    "apollo-server-types-0.3.0" = {
       name = "apollo-server-types";
       packageName = "apollo-server-types";
-      version = "0.2.10";
+      version = "0.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.2.10.tgz";
-        sha512 = "ke9ViPEWfW+2XLe66CaKGVZdS7duSLbamSKSprmmeMBd8s6tmjf0FumUVxV7X4quxPZi0OPo8x0LoLU7GWsmaA==";
+        url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.3.0.tgz";
+        sha512 = "FMo7kbTkhph9dfIQ3xDbRLObqmdQH9mwSjxhGsX+JxGMRPPXgd3+GZvCeVKOi/udxh//w1otSeAqItjvbj0tfQ==";
       };
     };
-    "apollo-tracing-0.8.11" = {
+    "apollo-tracing-0.9.0" = {
       name = "apollo-tracing";
       packageName = "apollo-tracing";
-      version = "0.8.11";
+      version = "0.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.8.11.tgz";
-        sha512 = "Z0wDZ5QOBmpGoajB74ZKGTM7GzG6rqZRzAph4kxud6axcyNqUDKiKZ3Eere+NSLwvvt8M3qnPW4UJSUy/wwOXg==";
+        url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.9.0.tgz";
+        sha512 = "oqspTrf4BLGbKkIk1vF+I31C2v7PPJmF36TFpT/+zJxNvJw54ji4ZMhtytgVqbVldQEintJmdHQIidYBGKmu+g==";
       };
     };
     "apollo-upload-client-11.0.0" = {
@@ -6583,6 +6718,15 @@ let
         sha512 = "9JCWojeLDF8UhEv2UJlLlPGsLEs+EBnfB+kOhsvmFI2QilVrnIsAwr7YnF8lLEVuxB+HxFhvGK+ax0Y8Eh/BKA==";
       };
     };
+    "atomic-sleep-1.0.0" = {
+      name = "atomic-sleep";
+      packageName = "atomic-sleep";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/atomic-sleep/-/atomic-sleep-1.0.0.tgz";
+        sha512 = "kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==";
+      };
+    };
     "attach-ware-1.1.1" = {
       name = "attach-ware";
       packageName = "attach-ware";
@@ -6592,13 +6736,13 @@ let
         sha1 = "28f51393dd8bb8bdaad972342519bf09621a35a3";
       };
     };
-    "auto-bind-1.2.1" = {
+    "auto-bind-4.0.0" = {
       name = "auto-bind";
       packageName = "auto-bind";
-      version = "1.2.1";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/auto-bind/-/auto-bind-1.2.1.tgz";
-        sha512 = "/W9yj1yKmBLwpexwAujeD9YHwYmRuWFGV8HWE7smQab797VeHa4/cnE2NFeDhA+E+5e/OGBI8763EhLjfZ/MXA==";
+        url = "https://registry.npmjs.org/auto-bind/-/auto-bind-4.0.0.tgz";
+        sha512 = "Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ==";
       };
     };
     "autocast-0.0.4" = {
@@ -6610,6 +6754,15 @@ let
         sha1 = "ece7d92527ca37ea502f99e8f41fe44daf00dbce";
       };
     };
+    "autoprefixer-7.2.6" = {
+      name = "autoprefixer";
+      packageName = "autoprefixer";
+      version = "7.2.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz";
+        sha512 = "Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==";
+      };
+    };
     "await-to-js-2.1.1" = {
       name = "await-to-js";
       packageName = "await-to-js";
@@ -6628,13 +6781,13 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.626.0" = {
+    "aws-sdk-2.639.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.626.0";
+      version = "2.639.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.626.0.tgz";
-        sha512 = "1D5slT34OI1NseXLszpWwZ+N/Jla8BsY+XsGDH/4yNDDN8Cf+8zKb1AqqSw4T4onz9xhoTHWCTWqTLDL+8XAnw==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.639.0.tgz";
+        sha512 = "cbH69oV0ObZ4tapbjDqu0j3I779uscQNhRaewjIJY5O5At4RULtd7us24n72FtT4HIwM9cwORzVxA9rK6DHKOA==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -6673,6 +6826,15 @@ let
         sha1 = "2d8e3e5d0bdbd7327f91bc814f5c57660f81824d";
       };
     };
+    "axios-0.19.2" = {
+      name = "axios";
+      packageName = "axios";
+      version = "0.19.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz";
+        sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==";
+      };
+    };
     "babel-code-frame-6.26.0" = {
       name = "babel-code-frame";
       packageName = "babel-code-frame";
@@ -6682,15 +6844,6 @@ let
         sha1 = "63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b";
       };
     };
-    "babel-core-6.26.3" = {
-      name = "babel-core";
-      packageName = "babel-core";
-      version = "6.26.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz";
-        sha512 = "6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==";
-      };
-    };
     "babel-core-7.0.0-bridge.0" = {
       name = "babel-core";
       packageName = "babel-core";
@@ -6709,24 +6862,6 @@ let
         sha512 = "z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA==";
       };
     };
-    "babel-generator-6.26.1" = {
-      name = "babel-generator";
-      packageName = "babel-generator";
-      version = "6.26.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz";
-        sha512 = "HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==";
-      };
-    };
-    "babel-helper-builder-react-jsx-6.26.0" = {
-      name = "babel-helper-builder-react-jsx";
-      packageName = "babel-helper-builder-react-jsx";
-      version = "6.26.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz";
-        sha1 = "39ff8313b75c8b65dceff1f31d383e0ff2a408a0";
-      };
-    };
     "babel-helper-evaluate-path-0.5.0" = {
       name = "babel-helper-evaluate-path";
       packageName = "babel-helper-evaluate-path";
@@ -6790,15 +6925,6 @@ let
         sha512 = "m2CvfDW4+1qfDdsrtf4dwOslQC3yhbgyBFptncp4wvtdrDHqueW7slsYv4gArie056phvQFhT2nRcGS4bnm6mA==";
       };
     };
-    "babel-helpers-6.24.1" = {
-      name = "babel-helpers";
-      packageName = "babel-helpers";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz";
-        sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2";
-      };
-    };
     "babel-jest-25.1.0" = {
       name = "babel-jest";
       packageName = "babel-jest";
@@ -6817,15 +6943,6 @@ let
         sha512 = "4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==";
       };
     };
-    "babel-messages-6.23.0" = {
-      name = "babel-messages";
-      packageName = "babel-messages";
-      version = "6.23.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz";
-        sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e";
-      };
-    };
     "babel-plugin-dynamic-import-node-2.3.0" = {
       name = "babel-plugin-dynamic-import-node";
       packageName = "babel-plugin-dynamic-import-node";
@@ -6961,33 +7078,6 @@ let
         sha1 = "4c3ab20a2af26aa20cd25995c398c4eb70310c8d";
       };
     };
-    "babel-plugin-syntax-jsx-6.18.0" = {
-      name = "babel-plugin-syntax-jsx";
-      packageName = "babel-plugin-syntax-jsx";
-      version = "6.18.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz";
-        sha1 = "0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946";
-      };
-    };
-    "babel-plugin-syntax-object-rest-spread-6.13.0" = {
-      name = "babel-plugin-syntax-object-rest-spread";
-      packageName = "babel-plugin-syntax-object-rest-spread";
-      version = "6.13.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz";
-        sha1 = "fd6536f2bce13836ffa3a5458c4903a597bb3bf5";
-      };
-    };
-    "babel-plugin-transform-es2015-destructuring-6.23.0" = {
-      name = "babel-plugin-transform-es2015-destructuring";
-      packageName = "babel-plugin-transform-es2015-destructuring";
-      version = "6.23.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz";
-        sha1 = "997bb1f1ab967f682d2b0876fe358d60e765c56d";
-      };
-    };
     "babel-plugin-transform-flow-strip-types-6.22.0" = {
       name = "babel-plugin-transform-flow-strip-types";
       packageName = "babel-plugin-transform-flow-strip-types";
@@ -7033,15 +7123,6 @@ let
         sha1 = "acbb3e56a3555dd23928e4b582d285162dd2b198";
       };
     };
-    "babel-plugin-transform-object-rest-spread-6.26.0" = {
-      name = "babel-plugin-transform-object-rest-spread";
-      packageName = "babel-plugin-transform-object-rest-spread";
-      version = "6.26.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz";
-        sha1 = "0f36692d50fef6b7e2d4b3ac1478137a963b7b06";
-      };
-    };
     "babel-plugin-transform-property-literals-6.9.4" = {
       name = "babel-plugin-transform-property-literals";
       packageName = "babel-plugin-transform-property-literals";
@@ -7051,15 +7132,6 @@ let
         sha1 = "98c1d21e255736573f93ece54459f6ce24985d39";
       };
     };
-    "babel-plugin-transform-react-jsx-6.24.1" = {
-      name = "babel-plugin-transform-react-jsx";
-      packageName = "babel-plugin-transform-react-jsx";
-      version = "6.24.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz";
-        sha1 = "840a028e7df460dfc3a2d29f0c0d91f6376e66a3";
-      };
-    };
     "babel-plugin-transform-regexp-constructors-0.4.3" = {
       name = "babel-plugin-transform-regexp-constructors";
       packageName = "babel-plugin-transform-regexp-constructors";
@@ -7141,15 +7213,6 @@ let
         sha512 = "1IajDumYOAPYImkHbrKeiN5AKKP9iOmRoO2IPbIuVp0j2iuCcj0n7P260z38siKMZZ+85d3mJZdtW8IgOv+Tzg==";
       };
     };
-    "babel-register-6.26.0" = {
-      name = "babel-register";
-      packageName = "babel-register";
-      version = "6.26.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz";
-        sha1 = "6ed021173e2fcb486d7acb45c6009a856f647071";
-      };
-    };
     "babel-runtime-6.26.0" = {
       name = "babel-runtime";
       packageName = "babel-runtime";
@@ -7159,24 +7222,6 @@ let
         sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe";
       };
     };
-    "babel-template-6.26.0" = {
-      name = "babel-template";
-      packageName = "babel-template";
-      version = "6.26.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz";
-        sha1 = "de03e2d16396b069f46dd9fff8521fb1a0e35e02";
-      };
-    };
-    "babel-traverse-6.26.0" = {
-      name = "babel-traverse";
-      packageName = "babel-traverse";
-      version = "6.26.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz";
-        sha1 = "46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee";
-      };
-    };
     "babel-types-6.26.0" = {
       name = "babel-types";
       packageName = "babel-types";
@@ -7348,6 +7393,15 @@ let
         sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==";
       };
     };
+    "base64-stream-1.0.0" = {
+      name = "base64-stream";
+      packageName = "base64-stream";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64-stream/-/base64-stream-1.0.0.tgz";
+        sha512 = "BQQZftaO48FcE1Kof9CmXMFaAdqkcNorgc8CxesZv9nMbbTF1EFyQe89UOuh//QMmdtfUDXyO8rgUalemL5ODA==";
+      };
+    };
     "base64-url-2.3.3" = {
       name = "base64-url";
       packageName = "base64-url";
@@ -7771,22 +7825,13 @@ let
         sha512 = "e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==";
       };
     };
-    "bl-3.0.0" = {
+    "bl-4.0.1" = {
       name = "bl";
       packageName = "bl";
-      version = "3.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bl/-/bl-3.0.0.tgz";
-        sha512 = "EUAyP5UHU5hxF8BPT0LKW8gjYLhq1DQIcneOX/pL/m2Alo+OYDQAJlHq+yseMP50Os2nHXOSic6Ss3vSQeyf4A==";
-      };
-    };
-    "bl-4.0.0" = {
-      name = "bl";
-      packageName = "bl";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bl/-/bl-4.0.0.tgz";
-        sha512 = "QwQvAZZA1Bw1FWnhNj2X5lu+sPxxB2ITH3mqEqYyahN6JZR13ONjk+XiTnBaGEzMPUrAgOkaD68pBH1rvPRPsw==";
+        url = "https://registry.npmjs.org/bl/-/bl-4.0.1.tgz";
+        sha512 = "FL/TdvchukRCuWVxT0YMO/7+L5TNeNrVFvRU2IY63aUyv9mpt8splf2NEr6qXtPo5fya5a66YohQKvGNmLrWNA==";
       };
     };
     "blake2b-2.1.3" = {
@@ -7825,13 +7870,13 @@ let
         sha1 = "f962d687ec2c369570ae71af843256e6d0ca1129";
       };
     };
-    "blessed-contrib-4.8.18" = {
+    "blessed-contrib-4.8.19" = {
       name = "blessed-contrib";
       packageName = "blessed-contrib";
-      version = "4.8.18";
+      version = "4.8.19";
       src = fetchurl {
-        url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.18.tgz";
-        sha512 = "l0XXpwbxp1NIYMkhTplbi6siZZvVH3JRHy+NPNznPvlD6uBUWVd/wQx4pmo1NCZQMN4MYRjICjedDGp34p/MUQ==";
+        url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.19.tgz";
+        sha512 = "g2EVkuCd8r46XVI+pgGuTYK0MGKOn30slJTUlV4m/1d/THIb4lUbY2S+yAtqiJ1q3IFu5TfwURb9/eAKZtJLNQ==";
       };
     };
     "blob-0.0.2" = {
@@ -7924,15 +7969,6 @@ let
         sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3";
       };
     };
-    "bluebird-3.5.5" = {
-      name = "bluebird";
-      packageName = "bluebird";
-      version = "3.5.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz";
-        sha512 = "5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==";
-      };
-    };
     "bluebird-3.7.2" = {
       name = "bluebird";
       packageName = "bluebird";
@@ -7942,13 +7978,13 @@ let
         sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==";
       };
     };
-    "blueimp-md5-2.10.0" = {
+    "blueimp-md5-2.12.0" = {
       name = "blueimp-md5";
       packageName = "blueimp-md5";
-      version = "2.10.0";
+      version = "2.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.10.0.tgz";
-        sha512 = "EkNUOi7tpV68TqjpiUz9D9NcT8um2+qtgntmMbi5UKssVX2m/2PLqotcric0RE63pB3HPN/fjf3cKHN2ufGSUQ==";
+        url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.12.0.tgz";
+        sha512 = "zo+HIdIhzojv6F1siQPqPFROyVy7C50KzHv/k/Iz+BtvtVzSHXiMXOpq2wCfNkeBqdCv+V8XOV96tsEt2W/3rQ==";
       };
     };
     "bn.js-4.11.8" = {
@@ -8005,15 +8041,6 @@ let
         sha1 = "090700c4ba28862a8520ef378395fdee5f61c229";
       };
     };
-    "body-parser-1.18.3" = {
-      name = "body-parser";
-      packageName = "body-parser";
-      version = "1.18.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz";
-        sha1 = "5b292198ffdd553b3a0f20ded0592b956955c8b4";
-      };
-    };
     "body-parser-1.19.0" = {
       name = "body-parser";
       packageName = "body-parser";
@@ -8275,13 +8302,13 @@ let
         sha512 = "erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==";
       };
     };
-    "browser-process-hrtime-0.1.3" = {
+    "browser-process-hrtime-1.0.0" = {
       name = "browser-process-hrtime";
       packageName = "browser-process-hrtime";
-      version = "0.1.3";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz";
-        sha512 = "bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==";
+        url = "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz";
+        sha512 = "9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==";
       };
     };
     "browser-resolve-1.11.3" = {
@@ -8401,13 +8428,22 @@ let
         sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==";
       };
     };
-    "browserslist-4.8.7" = {
+    "browserslist-2.11.3" = {
       name = "browserslist";
       packageName = "browserslist";
-      version = "4.8.7";
+      version = "2.11.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.8.7.tgz";
-        sha512 = "gFOnZNYBHrEyUML0xr5NJ6edFaaKbTFX9S9kQHlYfCP0Rit/boRIz4G+Avq6/4haEKJXdGGUnoolx+5MWW2BoA==";
+        url = "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz";
+        sha512 = "yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==";
+      };
+    };
+    "browserslist-4.9.1" = {
+      name = "browserslist";
+      packageName = "browserslist";
+      version = "4.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.9.1.tgz";
+        sha512 = "Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw==";
       };
     };
     "bser-2.1.1" = {
@@ -8473,13 +8509,13 @@ let
         sha512 = "xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==";
       };
     };
-    "buffer-5.4.3" = {
+    "buffer-5.5.0" = {
       name = "buffer";
       packageName = "buffer";
-      version = "5.4.3";
+      version = "5.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-5.4.3.tgz";
-        sha512 = "zvj65TkFeIt3i6aj5bIvJDzjjQQGs4o/sNoezg1F1kYap9Nu2jcUdpwzRSJTHMMzG0H7bZkn4rNQpImhuxWX2A==";
+        url = "https://registry.npmjs.org/buffer/-/buffer-5.5.0.tgz";
+        sha512 = "9FTEDjLjwoAkEwyMGDjYJQN2gfRgOKBKRfiglhvibGbpeeU/pQn1bJxQqm32OD/AIeEuHxU9roxXxg34Byp/Ww==";
       };
     };
     "buffer-alloc-1.2.0" = {
@@ -8869,13 +8905,13 @@ let
         sha512 = "kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==";
       };
     };
-    "cacache-14.0.0" = {
+    "cacache-15.0.0" = {
       name = "cacache";
       packageName = "cacache";
-      version = "14.0.0";
+      version = "15.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cacache/-/cacache-14.0.0.tgz";
-        sha512 = "+Nr/BnA/tjAUXza9gH8F+FSP+1HvWqCKt4c95dQr4EDVJVafbzmPZpLKCkLYexs6vSd2B/1TOXrAoNnqVPfvRA==";
+        url = "https://registry.npmjs.org/cacache/-/cacache-15.0.0.tgz";
+        sha512 = "L0JpXHhplbJSiDGzyJJnJCTL7er7NzbBgxzVqLswEb4bO91Zbv17OUMuUeu/q0ZwKn3V+1HM4wb9tO4eVE/K8g==";
       };
     };
     "cache-base-1.0.1" = {
@@ -8896,13 +8932,13 @@ let
         sha512 = "7YKEapH+2Uikde8hySyfobXBqPKULDyHNl/lhKm7cKf/GJFdG/tU/WpLrOg2y9aUrQrWUilYqawFIiGJPS6gDA==";
       };
     };
-    "cacheable-lookup-0.2.2" = {
+    "cacheable-lookup-2.0.0" = {
       name = "cacheable-lookup";
       packageName = "cacheable-lookup";
-      version = "0.2.2";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-0.2.2.tgz";
-        sha512 = "+XR+sYSw3gWyyL/4em004eP3RzisWDaGnBPbGpXl4GFSJSiliomxBU9AvStC6W9ivFuDbEcHwuWCEoSqBrK8Ww==";
+        url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-2.0.0.tgz";
+        sha512 = "s2piO6LvA7xnL1AR03wuEdSx3BZT3tIJpZ56/lcJwzO/6DTJZlTs7X3lrvPxk6d1PlDe6PrVe2TjlUIZNFglAQ==";
       };
     };
     "cacheable-request-2.1.4" = {
@@ -9121,6 +9157,15 @@ let
         sha512 = "QfFrU0CIw2oltVvpndW32kuJ/9YOJwUnmWrjlXt1nnJZHCaS9i6bfOpg9R4Lw8aZjStkJWM+jc0cdXjWBgVJSw==";
       };
     };
+    "camelcase-keys-6.2.1" = {
+      name = "camelcase-keys";
+      packageName = "camelcase-keys";
+      version = "6.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.1.tgz";
+        sha512 = "BPCNVH56RVIxQQIXskp5tLQXUNGQ6sXr7iCv1FHDt81xBOQ/1r6H8SPxf19InVP6DexWar4s87q9thfuk8X9HA==";
+      };
+    };
     "caniuse-api-3.0.0" = {
       name = "caniuse-api";
       packageName = "caniuse-api";
@@ -9130,13 +9175,13 @@ let
         sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
       };
     };
-    "caniuse-lite-1.0.30001030" = {
+    "caniuse-lite-1.0.30001035" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001030";
+      version = "1.0.30001035";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001030.tgz";
-        sha512 = "QGK0W4Ft/Ac+zTjEiRJfwDNATvS3fodDczBXrH42784kcfqcDKpEPfN08N0HQjrAp8He/Jw8QiSS9QRn7XAbUw==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz";
+        sha512 = "C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ==";
       };
     };
     "capture-exit-2.0.0" = {
@@ -9157,15 +9202,6 @@ let
         sha512 = "mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==";
       };
     };
-    "cardinal-1.0.0" = {
-      name = "cardinal";
-      packageName = "cardinal";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cardinal/-/cardinal-1.0.0.tgz";
-        sha1 = "50e21c1b0aa37729f9377def196b5a9cec932ee9";
-      };
-    };
     "cardinal-2.1.1" = {
       name = "cardinal";
       packageName = "cardinal";
@@ -9949,15 +9985,6 @@ let
         sha1 = "7e673ee0dd39a611a486476e53f3c6b3941cb582";
       };
     };
-    "cli-progress-3.6.0" = {
-      name = "cli-progress";
-      packageName = "cli-progress";
-      version = "3.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.6.0.tgz";
-        sha512 = "elg6jkiDedYrvwqWSae2FGvtbMo37Lo04oI9jJ5cI43Ge3jrDPWzeL3axv7MgBLYHDY/kGio/CXa49m4MWMrNw==";
-      };
-    };
     "cli-spinner-0.2.10" = {
       name = "cli-spinner";
       packageName = "cli-spinner";
@@ -10039,13 +10066,13 @@ let
         sha512 = "/1owvF0SZ5Gn54cgrikJ0QskgTzeg30HGjkmjFoaHDJzAqFpuX1DBpFR8aLvsE1J5s9MgeYRENQK4BFwOag5VA==";
       };
     };
-    "cli-ux-5.4.4" = {
+    "cli-ux-5.2.1" = {
       name = "cli-ux";
       packageName = "cli-ux";
-      version = "5.4.4";
+      version = "5.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.4.4.tgz";
-        sha512 = "e7h613CIvIbuZk30T4F7jHQTmG7MMjp2V9BARWktOGMKWXr7DJXakG2JeeYPjRhmVqUSQP3xEJZAVoTwVKDZqw==";
+        url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.2.1.tgz";
+        sha512 = "zG1012o7U4ZsCuIST1t2yrHPADv16J81RAGYjY9X1yABEFK40oyjRchD5ffVZaG44BjizmLvu677zbVIypRuxw==";
       };
     };
     "cli-width-1.1.1" = {
@@ -10093,13 +10120,13 @@ let
         sha1 = "a211e09c6a3de3ba1af27d049d301250d18812bc";
       };
     };
-    "clipboard-2.0.4" = {
+    "clipboard-2.0.6" = {
       name = "clipboard";
       packageName = "clipboard";
-      version = "2.0.4";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clipboard/-/clipboard-2.0.4.tgz";
-        sha512 = "Vw26VSLRpJfBofiVaFb/I8PVfdI1OxKcYShe6fm0sP/DtmiWQNCjhM/okTvdCo0G+lMMm1rMYbk4IK4x1X+kgQ==";
+        url = "https://registry.npmjs.org/clipboard/-/clipboard-2.0.6.tgz";
+        sha512 = "g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg==";
       };
     };
     "clipboardy-1.2.3" = {
@@ -10111,6 +10138,15 @@ let
         sha512 = "2WNImOvCRe6r63Gk9pShfkwXsVtKCroMAevIbiae021mS850UkWPbevxsBz3tnvjZIEGvlwaqCPsw+4ulzNgJA==";
       };
     };
+    "clipboardy-2.2.0" = {
+      name = "clipboardy";
+      packageName = "clipboardy";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clipboardy/-/clipboardy-2.2.0.tgz";
+        sha512 = "9ry9nC3VFULNmoEIqvuRwCIQ9M7wjnm4O+yvk7xkmhR+7FAUWaeX751oeYJbORg0h0zmqW1EVDoZK8f7yapwbg==";
+      };
+    };
     "clipper-lib-1.0.0" = {
       name = "clipper-lib";
       packageName = "clipper-lib";
@@ -10831,15 +10867,6 @@ let
         sha512 = "Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==";
       };
     };
-    "commander-4.0.1" = {
-      name = "commander";
-      packageName = "commander";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-4.0.1.tgz";
-        sha512 = "IPF4ouhCP+qdlcmCedhxX4xiGBPyigb8v5NeUp+0LyhwLgxMqyp3S0vl7TAPfS/hiP7FC3caI/PB9lTmP8r1NA==";
-      };
-    };
     "commander-4.1.0" = {
       name = "commander";
       packageName = "commander";
@@ -10858,6 +10885,15 @@ let
         sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==";
       };
     };
+    "commander-5.0.0" = {
+      name = "commander";
+      packageName = "commander";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-5.0.0.tgz";
+        sha512 = "JrDGPAKjMGSP1G0DUoaceEJ3DZgAfr/q6X7FVk4+U5KxUSKviYGM2k6zWkfyyBHy5rAtzgYJFa1ro2O9PtoxwQ==";
+      };
+    };
     "commist-1.1.0" = {
       name = "commist";
       packageName = "commist";
@@ -11786,6 +11822,15 @@ let
         sha1 = "11a45bc47ab30c54d00bb869ea1802fbcd9a09d0";
       };
     };
+    "cosmiconfig-3.1.0" = {
+      name = "cosmiconfig";
+      packageName = "cosmiconfig";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-3.1.0.tgz";
+        sha512 = "zedsBhLSbPBms+kE7AH4vHg6JsKDz6epSv2/+5XHs8ILHlgDciSJfSWf8sX9aQ52Jb7KI7VswUTsLpR/G0cr2Q==";
+      };
+    };
     "cosmiconfig-5.2.1" = {
       name = "cosmiconfig";
       packageName = "cosmiconfig";
@@ -11822,13 +11867,13 @@ let
         sha512 = "0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw==";
       };
     };
-    "cpy-8.0.1" = {
+    "cpy-8.1.0" = {
       name = "cpy";
       packageName = "cpy";
-      version = "8.0.1";
+      version = "8.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cpy/-/cpy-8.0.1.tgz";
-        sha512 = "XplonbFkGld3KST+wKFutU+Al3srtT9RaeLTJeRY47QzzLDlA5kpK4s+o0DdgRx7W0cdkifOehGnCBCGIFfdeg==";
+        url = "https://registry.npmjs.org/cpy/-/cpy-8.1.0.tgz";
+        sha512 = "XwlImkjPxMr01qXqC564VD4rfcDQ2eKtYmFlCy0ixsLRJ1cwYVUBh+v47jsQTO1IrmvdjqO813VpDQ0JiTuOdA==";
       };
     };
     "crc-0.2.0" = {
@@ -11939,13 +11984,13 @@ let
         sha512 = "FIliDIw0V3V0lWR+pVmGh45rJSemv4EBr46SNvafpxu8UJKUovEaeP5c19jSe/4m2DOEVnBeA5zcEjo1koMolg==";
       };
     };
-    "cron-1.7.2" = {
+    "cron-1.8.2" = {
       name = "cron";
       packageName = "cron";
-      version = "1.7.2";
+      version = "1.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cron/-/cron-1.7.2.tgz";
-        sha512 = "+SaJ2OfeRvfQqwXQ2kgr0Y5pzBR/lijf5OpnnaruwWnmI799JfWr2jN2ItOV9s3A/+TFOt6mxvKzQq5F0Jp6VQ==";
+        url = "https://registry.npmjs.org/cron/-/cron-1.8.2.tgz";
+        sha512 = "Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg==";
       };
     };
     "cross-env-6.0.3" = {
@@ -12173,13 +12218,13 @@ let
         sha512 = "jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==";
       };
     };
-    "css-selector-tokenizer-0.7.1" = {
+    "css-selector-tokenizer-0.7.2" = {
       name = "css-selector-tokenizer";
       packageName = "css-selector-tokenizer";
-      version = "0.7.1";
+      version = "0.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz";
-        sha512 = "xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==";
+        url = "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.2.tgz";
+        sha512 = "yj856NGuAymN6r8bn8/Jl46pR+OC3eEvAhfGYDUe7YPtTPAYrSSw4oAniZ9Y8T5B92hjhwTBLUen0/vKPxf6pw==";
       };
     };
     "css-tree-1.0.0-alpha.37" = {
@@ -12218,15 +12263,6 @@ let
         sha1 = "a6602dff7e04a8306dc0db9a551e92e8b5662ad8";
       };
     };
-    "cssesc-0.1.0" = {
-      name = "cssesc";
-      packageName = "cssesc";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz";
-        sha1 = "c814903e45623371a0477b40109aaafbeeaddbb4";
-      };
-    };
     "cssesc-3.0.0" = {
       name = "cssesc";
       packageName = "cssesc";
@@ -12416,15 +12452,6 @@ let
         sha512 = "uit68jymdI8Z6m+kJ5YnJPeHf5IdYXt2j52l5xLwgpcLBQRhCvr1peV9UODaCN5nLnRN9nqh1qaw4iNp1rTpvQ==";
       };
     };
-    "cuint-0.2.2" = {
-      name = "cuint";
-      packageName = "cuint";
-      version = "0.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz";
-        sha1 = "408086d409550c2631155619e9fa7bcadc3b991b";
-      };
-    };
     "currently-unhandled-0.4.1" = {
       name = "currently-unhandled";
       packageName = "currently-unhandled";
@@ -12740,13 +12767,13 @@ let
         sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==";
       };
     };
-    "dayjs-1.8.20" = {
+    "dayjs-1.8.22" = {
       name = "dayjs";
       packageName = "dayjs";
-      version = "1.8.20";
+      version = "1.8.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.20.tgz";
-        sha512 = "mH0MCDxw6UCGJYxVN78h8ugWycZAO8thkj3bW6vApL5tS0hQplIDdAQcmbvl7n35H0AKdCJQaArTrIQw2xt4Qg==";
+        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.22.tgz";
+        sha512 = "N8IXfxBD62Y9cKTuuuSoOlCXRnnzaTj1vu91r855iq6FbY5cZqOZnW/95nUn6kJiR+W9PHHrLykEoQOe6fUKxQ==";
       };
     };
     "de-indent-1.0.2" = {
@@ -13253,6 +13280,15 @@ let
         sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==";
       };
     };
+    "defer-to-connect-2.0.0" = {
+      name = "defer-to-connect";
+      packageName = "defer-to-connect";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.0.tgz";
+        sha512 = "bYL2d05vOSf1JEZNx5vSAtPuBMkX8K9EUutg7zlKvTqKXHt7RhWJFbmd7qakVuf13i+IkGmp6FwSsONOf6VYIg==";
+      };
+    };
     "deferred-0.7.11" = {
       name = "deferred";
       packageName = "deferred";
@@ -13532,15 +13568,6 @@ let
         sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7";
       };
     };
-    "detect-indent-4.0.0" = {
-      name = "detect-indent";
-      packageName = "detect-indent";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz";
-        sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208";
-      };
-    };
     "detect-indent-5.0.0" = {
       name = "detect-indent";
       packageName = "detect-indent";
@@ -13658,15 +13685,6 @@ let
         sha512 = "MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA==";
       };
     };
-    "didyoumean-1.2.1" = {
-      name = "didyoumean";
-      packageName = "didyoumean";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.1.tgz";
-        sha1 = "e92edfdada6537d484d73c0172fd1eba0c4976ff";
-      };
-    };
     "diff-1.4.0" = {
       name = "diff";
       packageName = "diff";
@@ -13712,13 +13730,13 @@ let
         sha512 = "Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg==";
       };
     };
-    "diff2html-3.1.2" = {
+    "diff2html-3.1.4" = {
       name = "diff2html";
       packageName = "diff2html";
-      version = "3.1.2";
+      version = "3.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff2html/-/diff2html-3.1.2.tgz";
-        sha512 = "yn4SXS6Em3Ml9ejsj8cWBcjWwSFOFwOd4Qd3U7pJHpyM3agY2lU+gxU2WedLxAgCMXffsublB96gG26efheCxQ==";
+        url = "https://registry.npmjs.org/diff2html/-/diff2html-3.1.4.tgz";
+        sha512 = "D5tXQhUav5v/JIYl0RDnXl8NlSxx1RHuLFIsvdaXUqdWQb5k6NlQMbix2FqrmpERf0gpY62JPe+o79jqR1D92A==";
       };
     };
     "diff3-0.0.3" = {
@@ -13775,6 +13793,15 @@ let
         sha512 = "f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==";
       };
     };
+    "dir-glob-3.0.1" = {
+      name = "dir-glob";
+      packageName = "dir-glob";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz";
+        sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==";
+      };
+    };
     "director-1.2.7" = {
       name = "director";
       packageName = "director";
@@ -13802,13 +13829,13 @@ let
         sha1 = "e38331f0844bba49b9a9cb71c771585aab1bc65a";
       };
     };
-    "discord.js-11.5.1" = {
+    "discord.js-11.6.2" = {
       name = "discord.js";
       packageName = "discord.js";
-      version = "11.5.1";
+      version = "11.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/discord.js/-/discord.js-11.5.1.tgz";
-        sha512 = "tGhV5xaZXE3Z+4uXJb3hYM6gQ1NmnSxp9PClcsSAYFVRzH6AJH74040mO3afPDMWEAlj8XsoPXXTJHTxesqcGw==";
+        url = "https://registry.npmjs.org/discord.js/-/discord.js-11.6.2.tgz";
+        sha512 = "QwN7RBb705qqvxletW41aw8ScZJh4LUVWtGNdLA1/N4od1pf8pueDWdnKLqw9pAud6cg9AADcCkm8os1YHWESg==";
       };
     };
     "discovery-channel-5.5.1" = {
@@ -14162,6 +14189,15 @@ let
         sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==";
       };
     };
+    "domhandler-3.0.0" = {
+      name = "domhandler";
+      packageName = "domhandler";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domhandler/-/domhandler-3.0.0.tgz";
+        sha512 = "eKLdI5v9m67kbXQbJSNn1zjh0SDzvzWVWtX+qEI3eMjZw8daH9k8rlj1FZY9memPwjiskQFbe7vHVVJIAqoEhw==";
+      };
+    };
     "domino-2.1.4" = {
       name = "domino";
       packageName = "domino";
@@ -14198,6 +14234,15 @@ let
         sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==";
       };
     };
+    "domutils-2.0.0" = {
+      name = "domutils";
+      packageName = "domutils";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domutils/-/domutils-2.0.0.tgz";
+        sha512 = "n5SelJ1axbO636c2yUtOGia/IcJtVtlhQbFiVDBZHKV5ReJO1ViX7sFEemtuyoAnBxk5meNSYgA8V4s0271efg==";
+      };
+    };
     "dot-case-2.1.1" = {
       name = "dot-case";
       packageName = "dot-case";
@@ -14477,15 +14522,6 @@ let
         sha512 = "vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==";
       };
     };
-    "eachr-3.3.0" = {
-      name = "eachr";
-      packageName = "eachr";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eachr/-/eachr-3.3.0.tgz";
-        sha512 = "yKWuGwOE283CTgbEuvqXXusLH4VBXnY2nZbDkeWev+cpAXY6zCIADSPLdvfkAROc0t8S4l07U1fateCdEDuuvg==";
-      };
-    };
     "easy-stack-1.0.0" = {
       name = "easy-stack";
       packageName = "easy-stack";
@@ -14540,15 +14576,6 @@ let
         sha1 = "94a44248bb87da35db0eff7af0aa576168117f59";
       };
     };
-    "editions-2.3.0" = {
-      name = "editions";
-      packageName = "editions";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/editions/-/editions-2.3.0.tgz";
-        sha512 = "jeXYwHPKbitU1l14dWlsl5Nm+b1Hsm7VX73BsrQ4RVwEcAQQIPFHTZAbVtuIGxZBrpdT2FXd8lbtrNBrzZxIsA==";
-      };
-    };
     "editor-1.0.0" = {
       name = "editor";
       packageName = "editor";
@@ -14612,13 +14639,13 @@ let
         sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==";
       };
     };
-    "electron-to-chromium-1.3.360" = {
+    "electron-to-chromium-1.3.376" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.360";
+      version = "1.3.376";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.360.tgz";
-        sha512 = "RE1pv2sjQiDRRN1nI0fJ0eQHZ9le4oobu16OArnwEUV5ycAU5SNjFyvzjZ1gPUAqBa2Ud1XagtW8j3ZXfHuQHA==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.376.tgz";
+        sha512 = "cv/PYVz5szeMz192ngilmezyPNFkUjuynuL2vNdiqIrio440nfTDdc0JJU0TS2KHLSVCs9gBbt4CFqM+HcBnjw==";
       };
     };
     "elegant-spinner-1.0.1" = {
@@ -14730,6 +14757,15 @@ let
         sha1 = "d063cfee9af118cc5aeefbc2e9b3dd5085815c63";
       };
     };
+    "emojilib-2.4.0" = {
+      name = "emojilib";
+      packageName = "emojilib";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/emojilib/-/emojilib-2.4.0.tgz";
+        sha512 = "5U0rVMU5Y2n2+ykNLQqMoqklN9ICBT/KsvC1Gz6vqHbz2AXXGkG+Pm5rMWk/8Vjrr/mY9985Hi8DYzn1F09Nyw==";
+      };
+    };
     "emojis-list-2.1.0" = {
       name = "emojis-list";
       packageName = "emojis-list";
@@ -14883,15 +14919,6 @@ let
         sha512 = "+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==";
       };
     };
-    "engine.io-3.3.2" = {
-      name = "engine.io";
-      packageName = "engine.io";
-      version = "3.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-3.3.2.tgz";
-        sha512 = "AsaA9KG7cWPXWHp5FvHdDWY3AMWeZ8x+2pUVLcn71qE5AtAzgGbxuclOytygskw8XGmiQafTmnI9Bix3uihu2w==";
-      };
-    };
     "engine.io-3.4.0" = {
       name = "engine.io";
       packageName = "engine.io";
@@ -14919,15 +14946,6 @@ let
         sha512 = "y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==";
       };
     };
-    "engine.io-client-3.3.2" = {
-      name = "engine.io-client";
-      packageName = "engine.io-client";
-      version = "3.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.3.2.tgz";
-        sha512 = "y0CPINnhMvPuwtqXfsGuWE8BB66+B6wTtCofQDRecMQPYX3MYUZXFNKDhdrSe3EVjgOu4V3rxdeqN/Tr91IgbQ==";
-      };
-    };
     "engine.io-client-3.4.0" = {
       name = "engine.io-client";
       packageName = "engine.io-client";
@@ -15099,15 +15117,6 @@ let
         sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960";
       };
     };
-    "errlop-2.0.0" = {
-      name = "errlop";
-      packageName = "errlop";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/errlop/-/errlop-2.0.0.tgz";
-        sha512 = "z00WIrQhtOMUnjdTG0O4f6hMG64EVccVDBy2WwgjcF8S4UB1exGYuc2OFwmdQmsJwLQVEIHWHPCz/omXXgAZHw==";
-      };
-    };
     "errno-0.1.7" = {
       name = "errno";
       packageName = "errno";
@@ -15486,13 +15495,13 @@ let
         sha1 = "7d02878c8e9bf7916b88836d5ac122b42f151932";
       };
     };
-    "eslint-plugin-vue-6.2.1" = {
+    "eslint-plugin-vue-6.2.2" = {
       name = "eslint-plugin-vue";
       packageName = "eslint-plugin-vue";
-      version = "6.2.1";
+      version = "6.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-6.2.1.tgz";
-        sha512 = "MiIDOotoWseIfLIfGeDzF6sDvHkVvGd2JgkvjyHtN3q4RoxdAXrAMuI3SXTOKatljgacKwpNAYShmcKZa4yZzw==";
+        url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-6.2.2.tgz";
+        sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ==";
       };
     };
     "eslint-scope-3.7.3" = {
@@ -15594,6 +15603,15 @@ let
         sha512 = "2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==";
       };
     };
+    "espree-6.2.1" = {
+      name = "espree";
+      packageName = "espree";
+      version = "6.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz";
+        sha512 = "ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==";
+      };
+    };
     "esprima-1.1.1" = {
       name = "esprima";
       packageName = "esprima";
@@ -15612,15 +15630,6 @@ let
         sha1 = "609ac5c2667eae5433b41eb9ecece2331b41498f";
       };
     };
-    "esprima-3.0.0" = {
-      name = "esprima";
-      packageName = "esprima";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-3.0.0.tgz";
-        sha1 = "53cf247acda77313e551c3aa2e73342d3fb4f7d9";
-      };
-    };
     "esprima-3.1.3" = {
       name = "esprima";
       packageName = "esprima";
@@ -16188,15 +16197,6 @@ let
         sha1 = "8df3d5a9ac848585f00a0777601823faecd3b148";
       };
     };
-    "express-4.16.4" = {
-      name = "express";
-      packageName = "express";
-      version = "4.16.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-4.16.4.tgz";
-        sha512 = "j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==";
-      };
-    };
     "express-4.17.1" = {
       name = "express";
       packageName = "express";
@@ -16233,15 +16233,6 @@ let
         sha512 = "0Dzn6LQG0ohd2S+zJVMhsntwcDakEzm/uKJSZxH7B66ZBvTsB5LU/HvfO1dHG+RRiKuCg0aWfUa66PljnDjEdw==";
       };
     };
-    "express-session-1.16.2" = {
-      name = "express-session";
-      packageName = "express-session";
-      version = "1.16.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express-session/-/express-session-1.16.2.tgz";
-        sha512 = "oy0sRsdw6n93E9wpCNWKRnSsxYnSDX9Dnr9mhZgqUEEorzcq5nshGYSZ4ZReHFhKQ80WI5iVUUSPW7u3GaKauw==";
-      };
-    };
     "express-session-1.17.0" = {
       name = "express-session";
       packageName = "express-session";
@@ -16422,15 +16413,6 @@ let
         sha512 = "qRW6y9eKF0VbCyOoOEtFhzJ3uykAw8GKwQVXyAIqwocyEWW4m+v+evec34RwtUkkxxHh7NKBLJ6AnXM8W4dH5w==";
       };
     };
-    "extract-opts-3.4.0" = {
-      name = "extract-opts";
-      packageName = "extract-opts";
-      version = "3.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/extract-opts/-/extract-opts-3.4.0.tgz";
-        sha512 = "M7Y+1cJDkzOWqvGH5F/V2qgkD6+uitW3NV9rQGl+pLSVuXZ4IDDQgxxMeLPKcWUyfypBWczIILiroSuhXG7Ytg==";
-      };
-    };
     "extract-stack-1.0.0" = {
       name = "extract-stack";
       packageName = "extract-stack";
@@ -16512,13 +16494,13 @@ let
         sha1 = "0f908faf4e6ec02524e54a57e432c5c013e08c9f";
       };
     };
-    "falafel-2.1.0" = {
+    "falafel-2.2.4" = {
       name = "falafel";
       packageName = "falafel";
-      version = "2.1.0";
+      version = "2.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/falafel/-/falafel-2.1.0.tgz";
-        sha1 = "96bb17761daba94f46d001738b3cedf3a67fe06c";
+        url = "https://registry.npmjs.org/falafel/-/falafel-2.2.4.tgz";
+        sha512 = "0HXjo8XASWRmsS0X1EkhwEMZaD3Qvp7FfURwjLKjG1ghfRm/MGZl2r4cWUTv41KdNghTw4OUMmVtdGQp3+H+uQ==";
       };
     };
     "fancy-log-1.3.3" = {
@@ -16584,6 +16566,15 @@ let
         sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==";
       };
     };
+    "fast-glob-3.2.2" = {
+      name = "fast-glob";
+      packageName = "fast-glob";
+      version = "3.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz";
+        sha512 = "UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==";
+      };
+    };
     "fast-json-parse-1.0.3" = {
       name = "fast-json-parse";
       packageName = "fast-json-parse";
@@ -16665,13 +16656,13 @@ let
         sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==";
       };
     };
-    "fast-text-encoding-1.0.0" = {
+    "fast-text-encoding-1.0.1" = {
       name = "fast-text-encoding";
       packageName = "fast-text-encoding";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.0.tgz";
-        sha512 = "R9bHCvweUxxwkDwhjav5vxpFvdPGlVngtqmx4pIZfSUhM/Q4NiIUHB456BAf+Q1Nwu3HEZYONtu+Rya+af4jiQ==";
+        url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.1.tgz";
+        sha512 = "x4FEgaz3zNRtJfLFqJmHWxkMDDvXVtaznj2V9jiP8ACUJrUgist4bP9FmDL2Vew2Y9mEQI/tG4GqabaitYp9CQ==";
       };
     };
     "fast-url-parser-1.1.3" = {
@@ -16692,6 +16683,15 @@ let
         sha512 = "483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==";
       };
     };
+    "fastq-1.6.1" = {
+      name = "fastq";
+      packageName = "fastq";
+      version = "1.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fastq/-/fastq-1.6.1.tgz";
+        sha512 = "mpIH5sKYueh3YyeJwqtVo8sORi0CgtmkVbK6kZStpQlZBYQuTzG2CZ7idSiJuA7bY0SFCWUc5WIs+oYumGCQNw==";
+      };
+    };
     "fault-1.0.4" = {
       name = "fault";
       packageName = "fault";
@@ -16854,13 +16854,13 @@ let
         sha512 = "uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw==";
       };
     };
-    "file-type-12.4.2" = {
+    "file-type-14.1.3" = {
       name = "file-type";
       packageName = "file-type";
-      version = "12.4.2";
+      version = "14.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/file-type/-/file-type-12.4.2.tgz";
-        sha512 = "UssQP5ZgIOKelfsaB5CuGAL+Y+q7EmONuiwF3N5HAH0t27rvrttgi6Ra9k/+DVaY9UF6+ybxu5pOXLUdA8N7Vg==";
+        url = "https://registry.npmjs.org/file-type/-/file-type-14.1.3.tgz";
+        sha512 = "fTTNfpY1QxlpKCrA5bRxZL/6f7+6jUCJkOCCzFkAI+tmLu5lfX+4Zo22GG1orRhVH7Dx0fHtMFXq0++NDjKn/w==";
       };
     };
     "file-type-3.9.0" = {
@@ -17025,15 +17025,6 @@ let
         sha1 = "b1a09aa1e6a607b3541669b09bcb727f460cd426";
       };
     };
-    "finalhandler-1.1.1" = {
-      name = "finalhandler";
-      packageName = "finalhandler";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz";
-        sha512 = "Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==";
-      };
-    };
     "finalhandler-1.1.2" = {
       name = "finalhandler";
       packageName = "finalhandler";
@@ -17124,6 +17115,15 @@ let
         sha1 = "2ad90d490f6828c1aa40292cf709ac3318210c3c";
       };
     };
+    "find-yarn-workspace-root-1.2.1" = {
+      name = "find-yarn-workspace-root";
+      packageName = "find-yarn-workspace-root";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz";
+        sha512 = "dVtfb0WuQG+8Ag2uWkbG79hOUzEsRrhBzgfn86g2sJPkzmcpGdghbNTfUKGTxymFrY/tLIodDzLoW9nOJ4FY8Q==";
+      };
+    };
     "findit-1.2.0" = {
       name = "findit";
       packageName = "findit";
@@ -17331,13 +17331,13 @@ let
         sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg==";
       };
     };
-    "flow-parser-0.119.1" = {
+    "flow-parser-0.120.1" = {
       name = "flow-parser";
       packageName = "flow-parser";
-      version = "0.119.1";
+      version = "0.120.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.119.1.tgz";
-        sha512 = "yFd4z6ZBXq//TJo/gtSzGKhz6wEVeI2m+6JB25JzXuRAOhM5Ze4xFkc3FSIStbYjrAx4H1IUiUTI/yy30oKp8A==";
+        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.120.1.tgz";
+        sha512 = "t5y9QoOegJuY+LCIjh0p6SGF7ItsxG5ycQApTSqWloutUZQ2gC0f6wMu91dab0/SSj2vH41bu5pDTLuvtP49ng==";
       };
     };
     "fluent-ffmpeg-2.1.2" = {
@@ -17466,6 +17466,15 @@ let
         sha512 = "4eyLK6s6lH32nOvLLwlIOnr9zrL8Sm+OvW4pVTJNoXeGzYIkHVf+pADQi+OJ0E67hiuSLezPVPyBcIZO50TmmQ==";
       };
     };
+    "follow-redirects-1.5.10" = {
+      name = "follow-redirects";
+      packageName = "follow-redirects";
+      version = "1.5.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz";
+        sha512 = "0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==";
+      };
+    };
     "font-awesome-filetypes-2.1.0" = {
       name = "font-awesome-filetypes";
       packageName = "font-awesome-filetypes";
@@ -17619,6 +17628,15 @@ let
         sha512 = "m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==";
       };
     };
+    "form-data-3.0.0" = {
+      name = "form-data";
+      packageName = "form-data";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz";
+        sha512 = "CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==";
+      };
+    };
     "format-0.2.2" = {
       name = "format";
       packageName = "format";
@@ -18069,13 +18087,22 @@ let
         sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327";
       };
     };
-    "fuse.js-3.4.6" = {
+    "fuse.js-3.6.1" = {
       name = "fuse.js";
       packageName = "fuse.js";
-      version = "3.4.6";
+      version = "3.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fuse.js/-/fuse.js-3.4.6.tgz";
-        sha512 = "H6aJY4UpLFwxj1+5nAvufom5b2BT2v45P1MkPvdGIK8fWjQx/7o6tTT1+ALV0yawQvbmvCF0ufl2et8eJ7v7Cg==";
+        url = "https://registry.npmjs.org/fuse.js/-/fuse.js-3.6.1.tgz";
+        sha512 = "hT9yh/tiinkmirKrlv4KWOjztdoZo1mx9Qh4KvWqC7isoXwdUY3PNWUxceF4/qO9R6riA2C29jdTOeQOIROjgw==";
+      };
+    };
+    "fuzzy-search-3.2.1" = {
+      name = "fuzzy-search";
+      packageName = "fuzzy-search";
+      version = "3.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fuzzy-search/-/fuzzy-search-3.2.1.tgz";
+        sha512 = "vAcPiyomt1ioKAsAL2uxSABHJ4Ju/e4UeDM+g1OlR0vV4YhLGMNsdLNvZTpEDY4JCSt0E4hASCNM5t2ETtsbyg==";
       };
     };
     "fuzzyset.js-0.0.1" = {
@@ -18384,13 +18411,13 @@ let
         sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28";
       };
     };
-    "getmac-1.4.6" = {
+    "getmac-5.1.0" = {
       name = "getmac";
       packageName = "getmac";
-      version = "1.4.6";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/getmac/-/getmac-1.4.6.tgz";
-        sha512 = "3JPwiIr4P6Sgr6y6SVXX0+l2mrB6pyf4Cdyua7rvEV7SveWQkAp11vrkNym8wvRxzLrBenKRcwe93asdghuwWg==";
+        url = "https://registry.npmjs.org/getmac/-/getmac-5.1.0.tgz";
+        sha512 = "hpZnhRQa2O2YbIPO1bX6vv7Zy7DyQXNH6tDpX/yfjhFl0AsAgEZZ1FqQ6e32CE+oKMykjp1yRJ5BQKMNEX5McQ==";
       };
     };
     "getpass-0.1.6" = {
@@ -18492,15 +18519,6 @@ let
         sha1 = "7f51b804924d6c603fc142e3302998d4e0b4d906";
       };
     };
-    "git-rev-sync-1.12.0" = {
-      name = "git-rev-sync";
-      packageName = "git-rev-sync";
-      version = "1.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/git-rev-sync/-/git-rev-sync-1.12.0.tgz";
-        sha1 = "4468406c7e6c3ba4cf4587999e1adb28d9d1af55";
-      };
-    };
     "git-rev-sync-2.0.0" = {
       name = "git-rev-sync";
       packageName = "git-rev-sync";
@@ -18898,13 +18916,13 @@ let
         sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==";
       };
     };
-    "globals-12.3.0" = {
+    "globals-12.4.0" = {
       name = "globals";
       packageName = "globals";
-      version = "12.3.0";
+      version = "12.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/globals/-/globals-12.3.0.tgz";
-        sha512 = "wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw==";
+        url = "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz";
+        sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==";
       };
     };
     "globals-9.18.0" = {
@@ -18934,6 +18952,15 @@ let
         sha512 = "LeguVWaxgHN0MNbWC6YljNMzHkrCny9fzjmEUdnF1kQ7wATFD1RHFRqA1qxaX2tgxGENlcxjOflopBwj3YZiXA==";
       };
     };
+    "globby-10.0.2" = {
+      name = "globby";
+      packageName = "globby";
+      version = "10.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz";
+        sha512 = "7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==";
+      };
+    };
     "globby-4.1.0" = {
       name = "globby";
       packageName = "globby";
@@ -18979,6 +19006,15 @@ let
         sha512 = "ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==";
       };
     };
+    "globjoin-0.1.4" = {
+      name = "globjoin";
+      packageName = "globjoin";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz";
+        sha1 = "2f4494ac8919e3767c5cbb691e9f463324285d43";
+      };
+    };
     "globrex-0.1.2" = {
       name = "globrex";
       packageName = "globrex";
@@ -19024,6 +19060,15 @@ let
         sha1 = "2edeeb958084d0f8ea7988e5d995b1c7dfc14777";
       };
     };
+    "gonzales-pe-4.2.4" = {
+      name = "gonzales-pe";
+      packageName = "gonzales-pe";
+      version = "4.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.2.4.tgz";
+        sha512 = "v0Ts/8IsSbh9n1OJRnSfa7Nlxi4AkXIsWB6vPept8FDbL4bXn3FNuxjYtO/nmBGu7GDkL9MFeGebeSu6l55EPQ==";
+      };
+    };
     "good-listener-1.2.2" = {
       name = "good-listener";
       packageName = "good-listener";
@@ -19060,13 +19105,13 @@ let
         sha1 = "d9430ba32f6a30218243884418767340aafc0400";
       };
     };
-    "got-10.1.0" = {
+    "got-10.6.0" = {
       name = "got";
       packageName = "got";
-      version = "10.1.0";
+      version = "10.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-10.1.0.tgz";
-        sha512 = "7tFtiOkTc47O9PyQ8or0urxjs8XF+4K7CfZMRM9RiZAm4kbllG3D8tGlA04PloiFDA2e178mS8yiLSZut1C6Zw==";
+        url = "https://registry.npmjs.org/got/-/got-10.6.0.tgz";
+        sha512 = "3LIdJNTdCFbbJc+h/EH0V5lpNpbJ6Bfwykk21lcQvQsEcrzdi/ltCyQehFHLzJ/ka0UMH4Slg0hkYvAZN9qUDg==";
       };
     };
     "got-6.7.1" = {
@@ -19132,15 +19177,6 @@ let
         sha512 = "J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==";
       };
     };
-    "graceful-fs-4.1.11" = {
-      name = "graceful-fs";
-      packageName = "graceful-fs";
-      version = "4.1.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz";
-        sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
-      };
-    };
     "graceful-fs-4.1.15" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
@@ -19276,13 +19312,13 @@ let
         sha512 = "bOufkkog0cSfHJ9gVD3Wy+KHmkSTHWcFfPaV/NVpIvfJx15gU0/CzuC6lcTjioWmn+UGzYdoqmP7OrJAWT57sw==";
       };
     };
-    "graphql-extensions-0.10.10" = {
+    "graphql-extensions-0.11.0" = {
       name = "graphql-extensions";
       packageName = "graphql-extensions";
-      version = "0.10.10";
+      version = "0.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.10.10.tgz";
-        sha512 = "pNb1DmUk6vsGtCjCRecpKoXadKNMyKxyLyE9IX65N9aKSmLL+AF7dJOOc4MWhdaAXlzxaDDhe54GpaOfoH7AOw==";
+        url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.11.0.tgz";
+        sha512 = "zd4qfUiJoYBx2MwJusM36SEJ+YmJ1ki8YF8nlm9mgaPDUzsnmFq4lxULxUfhLAXFwZw7MbEN2vV4V6WiNgSJLg==";
       };
     };
     "graphql-import-0.4.5" = {
@@ -19357,15 +19393,6 @@ let
         sha512 = "6WzlBFC0lWmXJbIVE8OgFgXIP4RJi3OQgTPa0DVMsDXdpRDjTsM1K9wfl5HSYX7R87QAGlvcv2Y4BIZa/ItonA==";
       };
     };
-    "graphql-tag-2.10.1" = {
-      name = "graphql-tag";
-      packageName = "graphql-tag";
-      version = "2.10.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.1.tgz";
-        sha512 = "jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg==";
-      };
-    };
     "graphql-tag-2.10.3" = {
       name = "graphql-tag";
       packageName = "graphql-tag";
@@ -19681,15 +19708,6 @@ let
         sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
       };
     };
-    "has-ansi-3.0.0" = {
-      name = "has-ansi";
-      packageName = "has-ansi";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-ansi/-/has-ansi-3.0.0.tgz";
-        sha1 = "36077ef1d15f333484aa7fa77a28606f1c655b37";
-      };
-    };
     "has-binary-data-0.1.1" = {
       name = "has-binary-data";
       packageName = "has-binary-data";
@@ -19942,22 +19960,22 @@ let
         sha512 = "0cMsjjIC8I+D3M44pOQdsy0OHXGLVz6Z0beRuufhKa0KfaD2wGwAev6jILzXsd3/vpnNQJmWyZtIILqM1N+n5A==";
       };
     };
-    "hast-util-embedded-1.0.4" = {
+    "hast-util-embedded-1.0.5" = {
       name = "hast-util-embedded";
       packageName = "hast-util-embedded";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hast-util-embedded/-/hast-util-embedded-1.0.4.tgz";
-        sha512 = "kfCMiRzYPWx9I6KYdW5DCS+WM6xRmAtfrPd2yEG+5cuwquEh0Qh2sV7CX0tbdes/nmm2lBTGLURh0GmRb2txgQ==";
+        url = "https://registry.npmjs.org/hast-util-embedded/-/hast-util-embedded-1.0.5.tgz";
+        sha512 = "0FfLHmfArWOizbdwjL+Rc9QIBzqP80juicNl4S4NEPq5OYWBCgYrtYDPUDoSyQQ9IQlBn9W7++fpYQNzZSq/wQ==";
       };
     };
-    "hast-util-has-property-1.0.3" = {
+    "hast-util-has-property-1.0.4" = {
       name = "hast-util-has-property";
       packageName = "hast-util-has-property";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hast-util-has-property/-/hast-util-has-property-1.0.3.tgz";
-        sha512 = "tT3ffSnrBu38RKnjn27n9vi+h/CUEXCQP5O2mriji4NNI2QNnhAqefjOg5ORAyvVfJItn0SC2Sx4CHReZSYh3g==";
+        url = "https://registry.npmjs.org/hast-util-has-property/-/hast-util-has-property-1.0.4.tgz";
+        sha512 = "ghHup2voGfgFoHMGnaLHOjbYFACKrRh9KFttdCzMCbFoBMJXiNi2+XTrPP8+q6cDJM/RSqlCfVWrjp1H201rZg==";
       };
     };
     "hast-util-is-body-ok-link-1.0.2" = {
@@ -19969,22 +19987,22 @@ let
         sha512 = "eSxO9rgtb7dfKxNa8NAFS3VEYWHXnJWVsoH/Z4jSsq1J2i4H1GkdJ43kXv++xuambrtI5XQwcAx6jeZVMjoBMQ==";
       };
     };
-    "hast-util-is-element-1.0.3" = {
+    "hast-util-is-element-1.0.4" = {
       name = "hast-util-is-element";
       packageName = "hast-util-is-element";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-1.0.3.tgz";
-        sha512 = "C62CVn7jbjp89yOhhy7vrkSaB7Vk906Gtcw/Ihd+Iufnq+2pwOZjdPmpzpKLWJXPJBMDX3wXg4FqmdOayPcewA==";
+        url = "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-1.0.4.tgz";
+        sha512 = "NFR6ljJRvDcyPP5SbV7MyPBgF47X3BsskLnmw1U34yL+X6YC0MoBx9EyMg8Jtx4FzGH95jw8+c1VPLHaRA0wDQ==";
       };
     };
-    "hast-util-parse-selector-2.2.3" = {
+    "hast-util-parse-selector-2.2.4" = {
       name = "hast-util-parse-selector";
       packageName = "hast-util-parse-selector";
-      version = "2.2.3";
+      version = "2.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.3.tgz";
-        sha512 = "nxbeqjQNxsvo/uYYAw9kij6td05YVUlf1qti09rVfbWSLT5H6wo3c+USIwX6nzXWk5kFZzXnEqO82856r0aM2Q==";
+        url = "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.4.tgz";
+        sha512 = "gW3sxfynIvZApL4L07wryYF4+C9VvH3AUi7LAnVXV4MneGEgwOByXvFo18BgmTWnm7oHAe874jKbIB1YhHSIzA==";
       };
     };
     "hast-util-to-string-1.0.2" = {
@@ -19996,13 +20014,13 @@ let
         sha512 = "fQNr0n5KJmZW1TmBfXbc4DO0ucZmseUw3T6K4PDsUUTMtTGGLZMUYRB8mOKgPgtw7rtICdxxpRQZmWwo8KxlOA==";
       };
     };
-    "hast-util-whitespace-1.0.3" = {
+    "hast-util-whitespace-1.0.4" = {
       name = "hast-util-whitespace";
       packageName = "hast-util-whitespace";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-1.0.3.tgz";
-        sha512 = "AlkYiLTTwPOyxZ8axq2/bCwRUPjIPBfrHkXuCR92B38b3lSdU22R5F/Z4DL6a2kxWpekWq1w6Nj48tWat6GeRA==";
+        url = "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-1.0.4.tgz";
+        sha512 = "I5GTdSfhYfAPNztx2xJRQpG8cuDSNt599/7YUn7Gx/WxNMsG+a835k97TDkFgk123cwjfwINaZknkKkphx/f2A==";
       };
     };
     "hat-0.0.3" = {
@@ -20194,15 +20212,6 @@ let
         sha1 = "4cd9e1abd4294146e7679e41d7898732b02c7bfd";
       };
     };
-    "home-or-tmp-2.0.0" = {
-      name = "home-or-tmp";
-      packageName = "home-or-tmp";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz";
-        sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8";
-      };
-    };
     "homedir-polyfill-1.0.3" = {
       name = "homedir-polyfill";
       packageName = "homedir-polyfill";
@@ -20221,22 +20230,22 @@ let
         sha1 = "08a74d9272a9cc83ae8e6bbe0303f0ee76432094";
       };
     };
-    "hosted-git-info-2.8.6" = {
+    "hosted-git-info-2.8.8" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
-      version = "2.8.6";
+      version = "2.8.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.6.tgz";
-        sha512 = "Kp6rShEsCHhF5dD3EWKdkgVA8ix90oSUJ0VY4g9goxxa0+f4lx63muTftn0mlJ/+8IESGWyKnP//V2D7S4ZbIQ==";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz";
+        sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==";
       };
     };
-    "hosted-git-info-3.0.3" = {
+    "hosted-git-info-3.0.4" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
-      version = "3.0.3";
+      version = "3.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.3.tgz";
-        sha512 = "1ZStA49Bj7WGT+GF2ee50gWMkltL+04v+FgXs20OQbe/usWm9Vh6El9UViiGvD/CEYvsej3AMzABmKmd9DYwnw==";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.4.tgz";
+        sha512 = "4oT62d2jwSDBbLLFLZE+1vPuQ1h8p9wjrJ8Mqx5TjsyWmBMV5B13eJqn8pvluqubLf3cJPTfiYCIwNwDNmzScQ==";
       };
     };
     "hot-shots-6.8.7" = {
@@ -20320,6 +20329,15 @@ let
         sha1 = "c78de65b5663aa597989dd2b7ab49200d7e4db98";
       };
     };
+    "html-tags-2.0.0" = {
+      name = "html-tags";
+      packageName = "html-tags";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz";
+        sha1 = "10b30a386085f43cede353cc8fa7cb0deeea668b";
+      };
+    };
     "html-void-elements-1.0.5" = {
       name = "html-void-elements";
       packageName = "html-void-elements";
@@ -20383,6 +20401,15 @@ let
         sha1 = "996c28b191516a8be86501a7d79757e5c70c1068";
       };
     };
+    "htmlparser2-4.1.0" = {
+      name = "htmlparser2";
+      packageName = "htmlparser2";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz";
+        sha512 = "4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==";
+      };
+    };
     "http-auth-2.0.7" = {
       name = "http-auth";
       packageName = "http-auth";
@@ -20410,13 +20437,13 @@ let
         sha512 = "5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==";
       };
     };
-    "http-cache-semantics-4.0.4" = {
+    "http-cache-semantics-4.1.0" = {
       name = "http-cache-semantics";
       packageName = "http-cache-semantics";
-      version = "4.0.4";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz";
-        sha512 = "Z2EICWNJou7Tr9Bd2M2UqDJq3A9F2ePG9w3lIpjoyuSyXFP9QbniJVu3XQYytuw5ebmG7dXSXO9PgAjJG8DDKA==";
+        url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz";
+        sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==";
       };
     };
     "http-call-5.3.0" = {
@@ -20528,13 +20555,13 @@ let
         sha512 = "qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==";
       };
     };
-    "http-proxy-agent-3.0.0" = {
+    "http-proxy-agent-4.0.1" = {
       name = "http-proxy-agent";
       packageName = "http-proxy-agent";
-      version = "3.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-3.0.0.tgz";
-        sha512 = "uGuJaBWQWDQCJI5ip0d/VTYZW0nRrlLWXA4A7P1jrsa+f77rW2yXz315oBt6zGCF6l8C2tlMxY7ffULCj+5FhA==";
+        url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz";
+        sha512 = "k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==";
       };
     };
     "http-proxy-middleware-0.19.1" = {
@@ -20609,15 +20636,6 @@ let
         sha1 = "35f7da6c48ce4ddbfa264891ac593ee5ff8671e6";
       };
     };
-    "https-proxy-agent-2.2.1" = {
-      name = "https-proxy-agent";
-      packageName = "https-proxy-agent";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz";
-        sha512 = "HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==";
-      };
-    };
     "https-proxy-agent-2.2.4" = {
       name = "https-proxy-agent";
       packageName = "https-proxy-agent";
@@ -20645,6 +20663,15 @@ let
         sha512 = "zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==";
       };
     };
+    "https-proxy-agent-5.0.0" = {
+      name = "https-proxy-agent";
+      packageName = "https-proxy-agent";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz";
+        sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==";
+      };
+    };
     "hue-sdk-0.1.0" = {
       name = "hue-sdk";
       packageName = "hue-sdk";
@@ -20789,15 +20816,6 @@ let
         sha512 = "98ELn/dqep00DQ/v1E1gpM21HNN6nqU3mS85mYKd9P7lXrhfUcuysPaa3HviKSFb3WPdjf7avuAST3P0dhNp/A==";
       };
     };
-    "iconv-lite-0.4.23" = {
-      name = "iconv-lite";
-      packageName = "iconv-lite";
-      version = "0.4.23";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz";
-        sha512 = "neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==";
-      };
-    };
     "iconv-lite-0.4.24" = {
       name = "iconv-lite";
       packageName = "iconv-lite";
@@ -20816,13 +20834,13 @@ let
         sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20";
       };
     };
-    "iconv-lite-0.5.0" = {
+    "iconv-lite-0.5.1" = {
       name = "iconv-lite";
       packageName = "iconv-lite";
-      version = "0.5.0";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.0.tgz";
-        sha512 = "NnEhI9hIEKHOzJ4f697DMz9IQEXr/MMJ5w64vN2/4Ai+wRnvV7SBrL0KLoRlwaKVghOc7LQ5YkPLuX146b6Ydw==";
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.1.tgz";
+        sha512 = "ONHr16SQvKZNSqjQT9gy5z24Jw+uqfO02/ngBSBoqChZ+W8qXX7GPRa1RoUnzGADw8K63R1BXUMzarCVQBpY8Q==";
       };
     };
     "icss-replace-symbols-1.1.0" = {
@@ -21005,13 +21023,13 @@ let
         sha1 = "97b38fd444114eec16824a935f8da575b57aa1ce";
       };
     };
-    "import-jsx-1.3.2" = {
+    "import-jsx-3.1.0" = {
       name = "import-jsx";
       packageName = "import-jsx";
-      version = "1.3.2";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/import-jsx/-/import-jsx-1.3.2.tgz";
-        sha512 = "9y2DexZ7+6XqcaJljFcLDAP7kwlfDQb+KhgfwWyWACAbNIXykB7YI21Kz/17oOqkPH9RS/YEf3f4YCFGXH8gmw==";
+        url = "https://registry.npmjs.org/import-jsx/-/import-jsx-3.1.0.tgz";
+        sha512 = "lTuMdQ/mRXC+xQSGPDvAg1VkODlX78j5hZv2tneJ+zuo7GH/XhUF/YVKoeF382a4jO4GYw9jgganbMhEcxwb0g==";
       };
     };
     "import-lazy-2.1.0" = {
@@ -21023,6 +21041,15 @@ let
         sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43";
       };
     };
+    "import-local-0.1.1" = {
+      name = "import-local";
+      packageName = "import-local";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/import-local/-/import-local-0.1.1.tgz";
+        sha1 = "b1179572aacdc11c6a91009fb430dbcab5f668a8";
+      };
+    };
     "import-local-2.0.0" = {
       name = "import-local";
       packageName = "import-local";
@@ -21203,22 +21230,22 @@ let
         sha512 = "zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw==";
       };
     };
-    "ink-0.3.1" = {
+    "ink-2.7.1" = {
       name = "ink";
       packageName = "ink";
-      version = "0.3.1";
+      version = "2.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ink/-/ink-0.3.1.tgz";
-        sha512 = "e3JOOBLE6cDO2aWWkIYXXT7qhb9HN4mBHSiOj2Hv94VAMDiDb0J50koYtxY0tZBq9N117QENGoURmL+tunxQJw==";
+        url = "https://registry.npmjs.org/ink/-/ink-2.7.1.tgz";
+        sha512 = "s7lJuQDJEdjqtaIWhp3KYHl6WV3J04U9zoQ6wVc+Xoa06XM27SXUY57qC5DO46xkF0CfgXMKkKNcgvSu/SAEpA==";
       };
     };
-    "ink-text-input-1.1.1" = {
+    "ink-text-input-3.2.2" = {
       name = "ink-text-input";
       packageName = "ink-text-input";
-      version = "1.1.1";
+      version = "3.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-1.1.1.tgz";
-        sha512 = "bOblvdmbXFC/UYbBj0WsKGkVhQaiZXK8A/O0e7/eh8HVr0DAbuZgQKatPzZ2ySsrpmcaMUGSVPbeuJOPO53X/g==";
+        url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-3.2.2.tgz";
+        sha512 = "h4EEJYOO88uK16U1mhgmJBMYeEy8ZmkrdV6gybyluCbAOQtAyND/WuRQVIKhe7D2dtYd2wwYTC648nuAxwltPQ==";
       };
     };
     "inline-source-map-0.6.2" = {
@@ -21329,6 +21356,15 @@ let
         sha512 = "Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ==";
       };
     };
+    "inquirer-7.1.0" = {
+      name = "inquirer";
+      packageName = "inquirer";
+      version = "7.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz";
+        sha512 = "5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==";
+      };
+    };
     "inquirer-autocomplete-prompt-1.0.2" = {
       name = "inquirer-autocomplete-prompt";
       packageName = "inquirer-autocomplete-prompt";
@@ -21617,13 +21653,13 @@ let
         sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==";
       };
     };
-    "irc-framework-4.6.0" = {
+    "irc-framework-4.7.0" = {
       name = "irc-framework";
       packageName = "irc-framework";
-      version = "4.6.0";
+      version = "4.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/irc-framework/-/irc-framework-4.6.0.tgz";
-        sha512 = "I/5QLe5BfK/4bgDRAaVec9l+8VYVEHOPYvjcNV5SshgCPssrFwjgCJ48oDYFf8J3HMAIbGTjqV+aOXCM/3r30A==";
+        url = "https://registry.npmjs.org/irc-framework/-/irc-framework-4.7.0.tgz";
+        sha512 = "XKXQ8RDr6BpJb4xGIUxzkaeOApkaJCLfAuawAieBg4skD7EP2Ag2C1P/hPAJgLrIAVRKZqTpiWnQDx9gIzdLsA==";
       };
     };
     "irc-replies-2.0.1" = {
@@ -21725,6 +21761,15 @@ let
         sha512 = "DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==";
       };
     };
+    "is-alphanumeric-1.0.0" = {
+      name = "is-alphanumeric";
+      packageName = "is-alphanumeric";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz";
+        sha1 = "4a9cef71daf4c001c1d81d63d140cf53fd6889f4";
+      };
+    };
     "is-alphanumerical-1.0.4" = {
       name = "is-alphanumerical";
       packageName = "is-alphanumerical";
@@ -22760,13 +22805,13 @@ let
         sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72";
       };
     };
-    "is-valid-domain-0.0.11" = {
+    "is-valid-domain-0.0.14" = {
       name = "is-valid-domain";
       packageName = "is-valid-domain";
-      version = "0.0.11";
+      version = "0.0.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.0.11.tgz";
-        sha512 = "N+XmAifLwbpAf6d5GM5DliNOZZrq2wnmdsAuhM2gyVaKAoJQIBz4emiPC4cnh4cIGiIqg0QvAa7sCpvGkN4WCg==";
+        url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.0.14.tgz";
+        sha512 = "MTUz/3y25zTtutAfwrLyFK+1l2IL4bcq2iHVdYHIPQbvBJLunlYu9dsQdtLwD9HKPDyxCDlKnSbGcRwvjVeCxA==";
       };
     };
     "is-valid-glob-1.0.0" = {
@@ -23021,6 +23066,15 @@ let
         sha512 = "676hESgHullDdHDsj469hr+7t3i/neBKU9J7q1T4RHaWwLAsaQnywC0D1dIUId0YZ+JtVrShzuBk1soo0+GVcQ==";
       };
     };
+    "isomorphic-ws-4.0.1" = {
+      name = "isomorphic-ws";
+      packageName = "isomorphic-ws";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz";
+        sha512 = "BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==";
+      };
+    };
     "isstream-0.1.2" = {
       name = "isstream";
       packageName = "isstream";
@@ -23228,13 +23282,13 @@ let
         sha1 = "06d4912255093419477d425633606e0e90782967";
       };
     };
-    "joplin-turndown-4.0.22" = {
+    "joplin-turndown-4.0.23" = {
       name = "joplin-turndown";
       packageName = "joplin-turndown";
-      version = "4.0.22";
+      version = "4.0.23";
       src = fetchurl {
-        url = "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.22.tgz";
-        sha512 = "jg3jo2tDwEzSErujU755iyO50IOLSzcEC8fq5CChbpzBMOp6GdPzphVcxFROClhFoZggJAyx2JerJ7LBRhpfgQ==";
+        url = "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.23.tgz";
+        sha512 = "Dh93R7G/S/KRbOu4/+FIxoUcUDcoUL4QDsqGhperOi/cUxUeg8fngrmEzdP8kEpQzqm5+8jkq9Cc1w6695owpQ==";
       };
     };
     "joplin-turndown-plugin-gfm-1.0.12" = {
@@ -23471,15 +23525,6 @@ let
         sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d";
       };
     };
-    "jsesc-1.3.0" = {
-      name = "jsesc";
-      packageName = "jsesc";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz";
-        sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b";
-      };
-    };
     "jsesc-2.5.2" = {
       name = "jsesc";
       packageName = "jsesc";
@@ -23552,13 +23597,13 @@ let
         sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==";
       };
     };
-    "json-parse-even-better-errors-2.0.1" = {
+    "json-parse-even-better-errors-2.2.0" = {
       name = "json-parse-even-better-errors";
       packageName = "json-parse-even-better-errors";
-      version = "2.0.1";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.0.1.tgz";
-        sha512 = "XFY2Mbnmg+8r7MRsxfArVkZcfjxGlF/NjM3LsPXVeCX/GBF/1FTCv+idHBYC4qLPtK7q8HC8bapLoWqnhP/bXw==";
+        url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.2.0.tgz";
+        sha512 = "2tLgY7LRNZ9Hd6gmCuBG5/OjRHQpSgJQqJoYyLLOhUgn8LdOYrjaZLcxkWnDads+AD/haWWioPNziXQcgvQJ/g==";
       };
     };
     "json-parse-helpfulerror-1.0.3" = {
@@ -23723,15 +23768,6 @@ let
         sha512 = "c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==";
       };
     };
-    "json5-0.5.1" = {
-      name = "json5";
-      packageName = "json5";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz";
-        sha1 = "1eade7acc012034ad84e2396767ead9fa5495821";
-      };
-    };
     "json5-1.0.1" = {
       name = "json5";
       packageName = "json5";
@@ -23759,15 +23795,6 @@ let
         sha512 = "l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==";
       };
     };
-    "jsonata-1.7.0" = {
-      name = "jsonata";
-      packageName = "jsonata";
-      version = "1.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonata/-/jsonata-1.7.0.tgz";
-        sha512 = "W1qxnGXtbaboFFA8DMLL2GZgiWoeFuMo0Yf3J23o03omzIuW9a9hgowgfUChQq8bfMfh/zmQJpwn/gQirn46ew==";
-      };
-    };
     "jsonata-1.8.1" = {
       name = "jsonata";
       packageName = "jsonata";
@@ -24319,6 +24346,15 @@ let
         sha512 = "0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==";
       };
     };
+    "klaw-sync-6.0.0" = {
+      name = "klaw-sync";
+      packageName = "klaw-sync";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz";
+        sha512 = "nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==";
+      };
+    };
     "kleur-3.0.3" = {
       name = "kleur";
       packageName = "kleur";
@@ -24337,6 +24373,15 @@ let
         sha512 = "wRJ9I4az0QcsH7A4v4l0enUpkS++MBx0BnL/68KaLzJg7x1qmbjSlwEoCNol7KTYZ+pmtI7Eh2J0Nu6/2Z5J/Q==";
       };
     };
+    "known-css-properties-0.5.0" = {
+      name = "known-css-properties";
+      packageName = "known-css-properties";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.5.0.tgz";
+        sha512 = "LOS0CoS8zcZnB1EjLw4LLqDXw8nvt3AGH5dXLQP3D9O1nLLA+9GC5GnPl5mmF+JiQAtSX4VyZC7KvEtcA4kUtA==";
+      };
+    };
     "kuler-1.0.1" = {
       name = "kuler";
       packageName = "kuler";
@@ -25615,15 +25660,6 @@ let
         sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f";
       };
     };
-    "lodash.flattendeep-4.4.0" = {
-      name = "lodash.flattendeep";
-      packageName = "lodash.flattendeep";
-      version = "4.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz";
-        sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2";
-      };
-    };
     "lodash.foreach-2.4.1" = {
       name = "lodash.foreach";
       packageName = "lodash.foreach";
@@ -26290,6 +26326,15 @@ let
         sha1 = "d06597c4d4c31b52ccb1f5d8f8fe7148eafd6965";
       };
     };
+    "longest-streak-2.0.4" = {
+      name = "longest-streak";
+      packageName = "longest-streak";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz";
+        sha512 = "vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==";
+      };
+    };
     "looper-2.0.0" = {
       name = "looper";
       packageName = "looper";
@@ -26614,13 +26659,13 @@ let
         sha512 = "oycWO9nEVAP2RVPbIoDoA4Y7LFIJ3xRYov93gAyJhZkET1tNuB0u7uWkZS2LpBWTJUWnmau/To8ECWRC+jKNfw==";
       };
     };
-    "magic-string-0.25.6" = {
+    "magic-string-0.25.7" = {
       name = "magic-string";
       packageName = "magic-string";
-      version = "0.25.6";
+      version = "0.25.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/magic-string/-/magic-string-0.25.6.tgz";
-        sha512 = "3a5LOMSGoCTH5rbqobC2HuDNRtE2glHZ8J7pK+QZYppyWA36yuNpsX994rIY2nCuyP7CZYy7lQq/X2jygiZ89g==";
+        url = "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz";
+        sha512 = "4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==";
       };
     };
     "magicli-0.0.5" = {
@@ -26722,13 +26767,13 @@ let
         sha512 = "07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==";
       };
     };
-    "make-fetch-happen-7.1.1" = {
+    "make-fetch-happen-8.0.4" = {
       name = "make-fetch-happen";
       packageName = "make-fetch-happen";
-      version = "7.1.1";
+      version = "8.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-7.1.1.tgz";
-        sha512 = "7fNjiOXNZhNGQzG5P15nU97aZQtzPU2GVgVd7pnqnl5gnpLzMAD8bAe5YG4iW2s0PTqaZy9xGv4Wfqe872kRNQ==";
+        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.4.tgz";
+        sha512 = "hIFoqGq1db0QMiy/Atr/pI1Rs4rDV+ZdGSey2SQyF3KK3u1z4aj9mS5UdNnZkdQpA+H3pGn0J3KlEwsi2x4EqA==";
       };
     };
     "make-iterator-1.0.1" = {
@@ -27055,6 +27100,15 @@ let
         sha1 = "890c2c1b3bfe83fb00e4129b8e4cfe645270f9d1";
       };
     };
+    "markdown-table-1.1.3" = {
+      name = "markdown-table";
+      packageName = "markdown-table";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.3.tgz";
+        sha512 = "1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q==";
+      };
+    };
     "marked-0.3.19" = {
       name = "marked";
       packageName = "marked";
@@ -27073,13 +27127,13 @@ let
         sha512 = "c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==";
       };
     };
-    "marked-terminal-1.7.0" = {
+    "marked-terminal-4.0.0" = {
       name = "marked-terminal";
       packageName = "marked-terminal";
-      version = "1.7.0";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/marked-terminal/-/marked-terminal-1.7.0.tgz";
-        sha1 = "c8c460881c772c7604b64367007ee5f77f125904";
+        url = "https://registry.npmjs.org/marked-terminal/-/marked-terminal-4.0.0.tgz";
+        sha512 = "mzU3VD7aVz12FfGoKFAceijehA6Ocjfg3rVimvJbFAB/NOYCsuzRVtq3PSFdPmWI5mhdGeEh3/aMJ5DSxAz94Q==";
       };
     };
     "marky-1.2.1" = {
@@ -27163,6 +27217,15 @@ let
         sha512 = "ySjg30BC3dYjQm73ILZtwcWzFJde0VU6otkXW/57IjjuYRa3Qaf0Kb8pydEuBZYtqW2OxreAtsricrAmOj3jIw==";
       };
     };
+    "mathml-tag-names-2.1.3" = {
+      name = "mathml-tag-names";
+      packageName = "mathml-tag-names";
+      version = "2.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz";
+        sha512 = "APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==";
+      };
+    };
     "md5-2.2.1" = {
       name = "md5";
       packageName = "md5";
@@ -27199,6 +27262,15 @@ let
         sha512 = "vTFXtmbbF3rgnTh3Zl3irso4LtvwUq/jaDvT2D1JqTGAwaipcS7RpTxzi6KjoRqI9n2yuAhzLDAC8xVTF3XYVQ==";
       };
     };
+    "mdast-util-compact-1.0.4" = {
+      name = "mdast-util-compact";
+      packageName = "mdast-util-compact";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-1.0.4.tgz";
+        sha512 = "3YDMQHI5vRiS2uygEFYaqckibpJtKq5Sj2c8JioeOQBU6INpKbdWzfyLqFFnDwEcEnRFIdMsguzs5pC1Jp4Isg==";
+      };
+    };
     "mdast-util-to-nlcst-3.2.3" = {
       name = "mdast-util-to-nlcst";
       packageName = "mdast-util-to-nlcst";
@@ -27352,6 +27424,15 @@ let
         sha512 = "qvwipnozMohxLXG1pOqoLiZKNkC4r4qqRucSoDwXowsNGDSULiqFTRUF05vcZWnwJSG22qTsynQhxbaMtnX9gw==";
       };
     };
+    "mem-6.0.1" = {
+      name = "mem";
+      packageName = "mem";
+      version = "6.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mem/-/mem-6.0.1.tgz";
+        sha512 = "uIRYASflIsXqvKe+7aXbLrydaRzz4qiK6amqZDQI++eRtW3UoKtnDcGeCAOREgll7YMxO5E4VB9+3B0LFmy96g==";
+      };
+    };
     "mem-fs-1.1.3" = {
       name = "mem-fs";
       packageName = "mem-fs";
@@ -27433,15 +27514,6 @@ let
         sha512 = "qVQ/CjkMyMInPaaRMrwWNDvf6boRZXaT/DbQeMYcCWuXPEBf1v8qChOc9OlEVQp2uOvRXa1Qu30fLmKhY6NipA==";
       };
     };
-    "memorystore-1.6.1" = {
-      name = "memorystore";
-      packageName = "memorystore";
-      version = "1.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/memorystore/-/memorystore-1.6.1.tgz";
-        sha512 = "rYRjVukgBR9sptGI3IfpAjZc4SkupddhAenUhPTGprnqM8Qh863PxfXxXWlfvHpMIAkJCok28Bm7ZlOKB4U+MA==";
-      };
-    };
     "memorystore-1.6.2" = {
       name = "memorystore";
       packageName = "memorystore";
@@ -27730,15 +27802,6 @@ let
         sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53";
       };
     };
-    "mime-1.4.1" = {
-      name = "mime";
-      packageName = "mime";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz";
-        sha512 = "KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==";
-      };
-    };
     "mime-1.6.0" = {
       name = "mime";
       packageName = "mime";
@@ -27775,15 +27838,6 @@ let
         sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==";
       };
     };
-    "mime-db-1.42.0" = {
-      name = "mime-db";
-      packageName = "mime-db";
-      version = "1.42.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz";
-        sha512 = "UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==";
-      };
-    };
     "mime-db-1.43.0" = {
       name = "mime-db";
       packageName = "mime-db";
@@ -27811,15 +27865,6 @@ let
         sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==";
       };
     };
-    "mime-types-2.1.25" = {
-      name = "mime-types";
-      packageName = "mime-types";
-      version = "2.1.25";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz";
-        sha512 = "5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==";
-      };
-    };
     "mime-types-2.1.26" = {
       name = "mime-types";
       packageName = "mime-types";
@@ -27847,6 +27892,15 @@ let
         sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==";
       };
     };
+    "mimic-fn-3.0.0" = {
+      name = "mimic-fn";
+      packageName = "mimic-fn";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.0.0.tgz";
+        sha512 = "PiVO95TKvhiwgSwg1IdLYlCTdul38yZxZMIcnDSFIBUm4BNZha2qpQ4GpJ++15bHoKDtrW2D69lMfFwdFYtNZQ==";
+      };
+    };
     "mimic-response-1.0.1" = {
       name = "mimic-response";
       packageName = "mimic-response";
@@ -27982,13 +28036,22 @@ let
         sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
-    "minimist-1.2.0" = {
+    "minimist-1.1.3" = {
       name = "minimist";
       packageName = "minimist";
-      version = "1.2.0";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
-        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+        url = "https://registry.npmjs.org/minimist/-/minimist-1.1.3.tgz";
+        sha1 = "3bedfd91a92d39016fcfaa1c681e8faa1a1efda8";
+      };
+    };
+    "minimist-1.2.5" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "1.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
+        sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
       };
     };
     "minimist-options-3.0.2" = {
@@ -28657,13 +28720,13 @@ let
         sha512 = "KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ==";
       };
     };
-    "mustache-3.0.2" = {
+    "mustache-4.0.0" = {
       name = "mustache";
       packageName = "mustache";
-      version = "3.0.2";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mustache/-/mustache-3.0.2.tgz";
-        sha512 = "64neoEgmozb8e/ecGBOSE+RfnevLSFzCI0UKPcrWmjv953/8fXhYO9+EQFtfbi6hwoFxcTA+Fp5mRiOiI9eTuA==";
+        url = "https://registry.npmjs.org/mustache/-/mustache-4.0.0.tgz";
+        sha512 = "FJgjyX/IVkbXBXYUwH+OYwQKqWpFPLaLVESd70yHjSDunwzV2hZOoTBvPf4KLoxesUzzyfTH6F784Uqd7Wm5yA==";
       };
     };
     "mutate.js-0.2.0" = {
@@ -28918,13 +28981,13 @@ let
         sha512 = "l3lC7v/PfOuRWQa8vV29Jo6TG10wHtnthLElFXs4Te4Aas57Fo4n1Q8LH9n+NDh9riOzTVvb2QNBhTS4JUKNjw==";
       };
     };
-    "napi-build-utils-1.0.1" = {
+    "napi-build-utils-1.0.2" = {
       name = "napi-build-utils";
       packageName = "napi-build-utils";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.1.tgz";
-        sha512 = "boQj1WFgQH3v4clhu3mTNfP+vOBxorDlE8EKiMjUlLG3C4qAESnn9AxIOkFgTR2c9LtzNjPrjS60cT27ZKBhaA==";
+        url = "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz";
+        sha512 = "ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==";
       };
     };
     "napi-macros-1.8.2" = {
@@ -29147,13 +29210,13 @@ let
         sha1 = "06f58360c4c3b955bd467ddc85ae4511a3907a4c";
       };
     };
-    "neat-input-1.10.0" = {
+    "neat-input-1.11.0" = {
       name = "neat-input";
       packageName = "neat-input";
-      version = "1.10.0";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/neat-input/-/neat-input-1.10.0.tgz";
-        sha512 = "02JoPLCBocjslsujmMjNb12Fz2Ap4oCmCYWBSUmea4YN2EG7siBMZSQtpBjijpw65l3uR5NoSn/w7iumCjAONg==";
+        url = "https://registry.npmjs.org/neat-input/-/neat-input-1.11.0.tgz";
+        sha512 = "B7VCdE3tMC8RnKGGHatjwcR0TsHB7SiDHmYXyZ7m9YzQRdOAOF9oSwWO/WP4DLqdCma22EXWuxzEGFD80JjBeA==";
       };
     };
     "neat-log-2.4.0" = {
@@ -29481,13 +29544,13 @@ let
         sha1 = "180eac7003e0c707618ef31368f62f84b2a69091";
       };
     };
-    "node-cache-4.2.1" = {
+    "node-cache-5.1.0" = {
       name = "node-cache";
       packageName = "node-cache";
-      version = "4.2.1";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-cache/-/node-cache-4.2.1.tgz";
-        sha512 = "BOb67bWg2dTyax5kdef5WfU3X8xu4wPg+zHzkvls0Q/QpYycIFRLEEIdAx9Wma43DxG6Qzn4illdZoYseKWa4A==";
+        url = "https://registry.npmjs.org/node-cache/-/node-cache-5.1.0.tgz";
+        sha512 = "gFQwYdoOztBuPlwg6DKQEf50G+gkK69aqLnw4djkmlHCzeVrLJfwvg9xl4RCAGviTIMUVoqcyoZ/V/wPEu/VVg==";
       };
     };
     "node-color-readline-1.0.1" = {
@@ -29572,13 +29635,13 @@ let
         sha512 = "8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==";
       };
     };
-    "node-fetch-npm-2.0.2" = {
+    "node-fetch-npm-2.0.3" = {
       name = "node-fetch-npm";
       packageName = "node-fetch-npm";
-      version = "2.0.2";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz";
-        sha512 = "nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==";
+        url = "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.3.tgz";
+        sha512 = "DgwoKEsqLnFZtk3ap7GWBHcHwnUhsNmQqEDcdjfQ8GofLEFJ081NAd4Uin3R7RFZBWVJCwHISw1oaEqPgSLloA==";
       };
     };
     "node-forge-0.2.24" = {
@@ -29653,13 +29716,13 @@ let
         sha512 = "dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ==";
       };
     };
-    "node-gyp-build-4.2.0" = {
+    "node-gyp-build-4.2.1" = {
       name = "node-gyp-build";
       packageName = "node-gyp-build";
-      version = "4.2.0";
+      version = "4.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.0.tgz";
-        sha512 = "4oiumOLhCDU9Rronz8PZ5S4IvT39H5+JEv/hps9V8s7RSLhsac0TCP78ulnHXOo8X1wdpPiTayGlM1jr4IbnaQ==";
+        url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.1.tgz";
+        sha512 = "XyCKXsqZfLqHep1hhsMncoXuUNt/cXCjg1+8CLbu69V1TKuPiOeSGbL9n+k/ByKH8UT0p4rdIX8XkTRZV0i7Sw==";
       };
     };
     "node-int64-0.4.0" = {
@@ -29770,22 +29833,22 @@ let
         sha512 = "v2pZOn/raE87JLB86l5fH2JkU7uthqzV3lLI9WcL+fA+vDlg5iN2p/eQfhUy1DhgEmqmGrLu03h5efv+Sly5Vg==";
       };
     };
-    "node-red-node-tail-0.0.3" = {
+    "node-red-node-tail-0.1.1" = {
       name = "node-red-node-tail";
       packageName = "node-red-node-tail";
-      version = "0.0.3";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-tail/-/node-red-node-tail-0.0.3.tgz";
-        sha512 = "wEiT7bSeU9oVHPK7S+mHb3cR6cIf9l205wTiHzhnUAuoDJS+IdwQkkpFgKTYmkL4Py2LvqCU90h85YpQul7QFQ==";
+        url = "https://registry.npmjs.org/node-red-node-tail/-/node-red-node-tail-0.1.1.tgz";
+        sha512 = "j1g/VtSCI2tBrBnCD+u8iSo9tH0nvn70k1O1SxkHk3+qx7tHUyOKQc7wNc4rUs9J1PkGngUC3qEDd5cL7Z/klg==";
       };
     };
-    "node-releases-1.1.50" = {
+    "node-releases-1.1.52" = {
       name = "node-releases";
       packageName = "node-releases";
-      version = "1.1.50";
+      version = "1.1.52";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.50.tgz";
-        sha512 = "lgAmPv9eYZ0bGwUYAKlr8MG6K4CvWliWqnkcT2P8mMAgVrH3lqfBPorFlxiG1pHQnqmavJZ9vbMXUTNyMLbrgQ==";
+        url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.52.tgz";
+        sha512 = "snSiT1UypkgGt2wxPqS6ImEUICbNCMb31yaxWrOLXjhlt2z2/IBpaOxzONExqSm4y5oLnAqjjRWu+wsDzK5yNQ==";
       };
     };
     "node-request-by-swagger-1.1.4" = {
@@ -29977,6 +30040,15 @@ let
         sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
       };
     };
+    "nopt-4.0.3" = {
+      name = "nopt";
+      packageName = "nopt";
+      version = "4.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz";
+        sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==";
+      };
+    };
     "normalize-html-whitespace-1.0.0" = {
       name = "normalize-html-whitespace";
       packageName = "normalize-html-whitespace";
@@ -30013,6 +30085,24 @@ let
         sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==";
       };
     };
+    "normalize-range-0.1.2" = {
+      name = "normalize-range";
+      packageName = "normalize-range";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz";
+        sha1 = "2d10c06bdfd312ea9777695a4d28439456b75942";
+      };
+    };
+    "normalize-selector-0.2.0" = {
+      name = "normalize-selector";
+      packageName = "normalize-selector";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz";
+        sha1 = "d0b145eb691189c63a78d201dc4fdb1293ef0c03";
+      };
+    };
     "normalize-uri-1.1.3" = {
       name = "normalize-uri";
       packageName = "normalize-uri";
@@ -30085,6 +30175,15 @@ let
         sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==";
       };
     };
+    "npm-install-checks-4.0.0" = {
+      name = "npm-install-checks";
+      packageName = "npm-install-checks";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-4.0.0.tgz";
+        sha512 = "09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==";
+      };
+    };
     "npm-keyword-5.0.0" = {
       name = "npm-keyword";
       packageName = "npm-keyword";
@@ -30130,13 +30229,13 @@ let
         sha512 = "xXxr8y5U0kl8dVkz2oK7yZjPBvqM2fwaO5l3Yg13p03v8+E3qQcD0JNhHzjL1vyGgxcKkD0cco+NLR72iuPk3g==";
       };
     };
-    "npm-package-arg-8.0.0" = {
+    "npm-package-arg-8.0.1" = {
       name = "npm-package-arg";
       packageName = "npm-package-arg";
-      version = "8.0.0";
+      version = "8.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.0.0.tgz";
-        sha512 = "JgqZHCEUKvhX7EehLNdySiuB227a0QYra9wpZOkW+jvwsRYKkce7y5Rv2axkxScJU1EP+L32jT2PLhQz7IWHlw==";
+        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.0.1.tgz";
+        sha512 = "/h5Fm6a/exByzFSTm7jAyHbgOqErl9qSNJDQF32Si/ZzgwT2TERVxRxn3Jurw1wflgyVVAxnFR4fRHPM7y1ClQ==";
       };
     };
     "npm-packlist-1.4.8" = {
@@ -30148,13 +30247,13 @@ let
         sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==";
       };
     };
-    "npm-packlist-2.1.0" = {
+    "npm-packlist-2.1.1" = {
       name = "npm-packlist";
       packageName = "npm-packlist";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.1.0.tgz";
-        sha512 = "XXqrT4WXVc8M1cdL7LCOUflEdyvCu9lKmM5j5mFwXAK8hUMRxzClNml8ox2d8YIDhS7p51AP6zYWNsgNiWuSLQ==";
+        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.1.1.tgz";
+        sha512 = "95TSDvGwujIhqfSpIiRRLodEF+y6mJMopuZdahoGzqtRDFZXGav46S0p6ngeWaiAkb5R72w6eVARhzej0HvZeQ==";
       };
     };
     "npm-path-2.0.4" = {
@@ -30184,13 +30283,13 @@ let
         sha512 = "wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==";
       };
     };
-    "npm-pick-manifest-5.0.0" = {
+    "npm-pick-manifest-6.0.0" = {
       name = "npm-pick-manifest";
       packageName = "npm-pick-manifest";
-      version = "5.0.0";
+      version = "6.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-5.0.0.tgz";
-        sha512 = "YUW9xObM7Y1OkQ/gSmU5VQyI3vCkG5lwOrdycw0dpj9/3dE8h9CKY8tVyHTIp50+mV8jOAGH4m4Lts7zz2rN4Q==";
+        url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.0.0.tgz";
+        sha512 = "PdJpXMvjqt4nftNEDpCgjBUF8yI3Q3MyuAmVB9nemnnCg32F4BPL/JFBfdj8DubgHCYUFQhtLWmBPvdsFtjWMg==";
       };
     };
     "npm-prefix-1.2.0" = {
@@ -30229,13 +30328,13 @@ let
         sha512 = "WGvUx0lkKFhu9MbiGFuT9nG2NpfQ+4dCJwRwwtK2HK5izJEvwDxMeUyqbuMS7N/OkpVCqDorV6rO5E4V9F8lJw==";
       };
     };
-    "npm-registry-fetch-6.0.2" = {
+    "npm-registry-fetch-8.0.0" = {
       name = "npm-registry-fetch";
       packageName = "npm-registry-fetch";
-      version = "6.0.2";
+      version = "8.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-6.0.2.tgz";
-        sha512 = "fffWUYR6J5u11URMuCSOsrr35YO3lNa41ckzIj1XPaznsRTFemIcLCU59A347xQcliUFSB2CJJeQVy5OiIVBcg==";
+        url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.0.0.tgz";
+        sha512 = "975WwLvZjX97y9UWWQ8nAyr7bw02s9xKPHqvEm5T900LQsB1HXb8Gb9ebYtCBLSX+K8gSOrO5KS/9yV/naLZmQ==";
       };
     };
     "npm-run-4.1.2" = {
@@ -30355,6 +30454,15 @@ let
         sha512 = "tqzBd1/b4CPp94zlhOmWDEZ9kUue6Kmg6CpRp7RKJPZQKjNve8Ui3DkqOeZCIlmGrAzJDpdZP9ZEANC4EqYPsw==";
       };
     };
+    "num2fraction-1.2.2" = {
+      name = "num2fraction";
+      packageName = "num2fraction";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz";
+        sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede";
+      };
+    };
     "number-is-nan-1.0.1" = {
       name = "number-is-nan";
       packageName = "number-is-nan";
@@ -30518,6 +30626,15 @@ let
         sha512 = "OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==";
       };
     };
+    "object-hash-2.0.3" = {
+      name = "object-hash";
+      packageName = "object-hash";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-hash/-/object-hash-2.0.3.tgz";
+        sha512 = "JPKn0GMu+Fa3zt3Bmr66JhokJU5BaNBIh4ZeTlaCBzrBsOeXzwcKKAK1tbLiPKgvwmPXsDvvLHoWh5Bm7ofIYg==";
+      };
+    };
     "object-inspect-1.4.1" = {
       name = "object-inspect";
       packageName = "object-inspect";
@@ -30896,15 +31013,6 @@ let
         sha1 = "42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc";
       };
     };
-    "open-6.1.0" = {
-      name = "open";
-      packageName = "open";
-      version = "6.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/open/-/open-6.1.0.tgz";
-        sha512 = "Vqch7NFb/WsMujhqfq+B3u0xkssRjZlxh+NSsBSphpcgaFD7gfB0SUBfR91E9ygBlyNGNogXR2cUB8rRfoo2kQ==";
-      };
-    };
     "open-6.4.0" = {
       name = "open";
       packageName = "open";
@@ -30923,13 +31031,13 @@ let
         sha512 = "K6EKzYqnwQzk+/dzJAQSBORub3xlBTxMz+ntpZpH/LyCa1o6KjXhuN+2npAaI9jaSmU3R1Q8NWf4KUWcyytGsQ==";
       };
     };
-    "open-7.0.2" = {
+    "open-7.0.3" = {
       name = "open";
       packageName = "open";
-      version = "7.0.2";
+      version = "7.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/open/-/open-7.0.2.tgz";
-        sha512 = "70E/pFTPr7nZ9nLDPNTcj3IVqnNvKuP4VsBmoKV9YGTnChe0mlS3C4qM7qKarhZ8rGaHKLfo+vBTHXDp6ZSyLQ==";
+        url = "https://registry.npmjs.org/open/-/open-7.0.3.tgz";
+        sha512 = "sP2ru2v0P290WFfv49Ap8MF6PkzGNnGlAwHweB4WR4mr5d2d0woiCluUeJ218w7/+PmoBy9JmYgD5A4mLcWOFA==";
       };
     };
     "opencollective-postinstall-2.0.2" = {
@@ -31373,6 +31481,15 @@ let
         sha512 = "4vAd06GCsgflX4wHN1JqrMzBh/8QZ4j+rzp0cd2scXRwuBEv+QR3wrVA5aLhWDLw4y2WgDKvzWF3CCLmVM1UgA==";
       };
     };
+    "p-filter-2.1.0" = {
+      name = "p-filter";
+      packageName = "p-filter";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-filter/-/p-filter-2.1.0.tgz";
+        sha512 = "ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw==";
+      };
+    };
     "p-finally-1.0.0" = {
       name = "p-finally";
       packageName = "p-finally";
@@ -31661,13 +31778,13 @@ let
         sha1 = "79b302fc144cdfbb4ab6feba7040e6a5d99c79c7";
       };
     };
-    "pacote-10.3.2" = {
+    "pacote-11.1.4" = {
       name = "pacote";
       packageName = "pacote";
-      version = "10.3.2";
+      version = "11.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pacote/-/pacote-10.3.2.tgz";
-        sha512 = "Hem2RkLAHhNaJSbhjouhbCAXlinNsv9W75s6JNxv9GypIjFkHtxCBoV6+GYBPttVOpZqnTAHmYRLs8yc2X2Dnw==";
+        url = "https://registry.npmjs.org/pacote/-/pacote-11.1.4.tgz";
+        sha512 = "eUGJvSSpWFZKn3z8gig/HgnBmUl6gIWByIIaHzSyEr3tOWX0w8tFEADXtpu8HGv5E0ShCeTP6enRq8iHKCHSvw==";
       };
     };
     "pacote-9.5.8" = {
@@ -31877,6 +31994,15 @@ let
         sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9";
       };
     };
+    "parse-json-3.0.0" = {
+      name = "parse-json";
+      packageName = "parse-json";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-json/-/parse-json-3.0.0.tgz";
+        sha1 = "fa6f47b18e23826ead32f263e744d0e1e847fb13";
+      };
+    };
     "parse-json-4.0.0" = {
       name = "parse-json";
       packageName = "parse-json";
@@ -32120,15 +32246,6 @@ let
         sha1 = "9dd009f915e8fe095b0124a01b8f82da07510102";
       };
     };
-    "passport-0.4.0" = {
-      name = "passport";
-      packageName = "passport";
-      version = "0.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/passport/-/passport-0.4.0.tgz";
-        sha1 = "c5095691347bd5ad3b5e180238c3914d16f05811";
-      };
-    };
     "passport-0.4.1" = {
       name = "passport";
       packageName = "passport";
@@ -32210,6 +32327,15 @@ let
         sha512 = "bpuBhROdrhuN3E7G/koAju0WjVw9/uQOG5Co5mokNj0MiOSBVZS1JTwM4zl55hu0WFmIEFvO9cU9sJQiBIYeIA==";
       };
     };
+    "patch-package-6.2.1" = {
+      name = "patch-package";
+      packageName = "patch-package";
+      version = "6.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/patch-package/-/patch-package-6.2.1.tgz";
+        sha512 = "dfCtQor63PPij6DDYtCzBRoO5nNAcMSg7Cmh+DLhR+s3t0OLQBdvFxJksZHBe1J2MjsSWDjTF4+oQKFbdkssIg==";
+      };
+    };
     "patel-0.33.1" = {
       name = "patel";
       packageName = "patel";
@@ -32444,6 +32570,15 @@ let
         sha512 = "T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==";
       };
     };
+    "path-type-4.0.0" = {
+      name = "path-type";
+      packageName = "path-type";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz";
+        sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==";
+      };
+    };
     "pathval-1.1.0" = {
       name = "pathval";
       packageName = "pathval";
@@ -32498,6 +32633,15 @@ let
         sha512 = "U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==";
       };
     };
+    "peek-readable-3.1.0" = {
+      name = "peek-readable";
+      packageName = "peek-readable";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.0.tgz";
+        sha512 = "KGuODSTV6hcgdZvDrIDBUkN0utcAVj1LL7FfGbM0viKTtCHmtZcuEJ+lGqsp0fTFkGqesdtemV2yUSMeyy3ddA==";
+      };
+    };
     "peek-stream-1.1.3" = {
       name = "peek-stream";
       packageName = "peek-stream";
@@ -32741,6 +32885,15 @@ let
         sha1 = "378e56d6fd13e88bfb6f4a25df7a83faabddba5b";
       };
     };
+    "pkg-dir-2.0.0" = {
+      name = "pkg-dir";
+      packageName = "pkg-dir";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz";
+        sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b";
+      };
+    };
     "pkg-dir-3.0.0" = {
       name = "pkg-dir";
       packageName = "pkg-dir";
@@ -32967,6 +33120,15 @@ let
         sha256 = "0092766ac49279342f7d17677359880b44b245ad9d32237a11a5ea45cb0d03fa";
       };
     };
+    "postcss-5.2.18" = {
+      name = "postcss";
+      packageName = "postcss";
+      version = "5.2.18";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz";
+        sha512 = "zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==";
+      };
+    };
     "postcss-6.0.1" = {
       name = "postcss";
       packageName = "postcss";
@@ -33066,6 +33228,33 @@ let
         sha512 = "IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==";
       };
     };
+    "postcss-html-0.12.0" = {
+      name = "postcss-html";
+      packageName = "postcss-html";
+      version = "0.12.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-html/-/postcss-html-0.12.0.tgz";
+        sha512 = "KxKUpj7AY7nlCbLcTOYxdfJnGE7QFAfU2n95ADj1Q90RM/pOLdz8k3n4avOyRFs7MDQHcRzJQWM1dehCwJxisQ==";
+      };
+    };
+    "postcss-less-1.1.5" = {
+      name = "postcss-less";
+      packageName = "postcss-less";
+      version = "1.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-less/-/postcss-less-1.1.5.tgz";
+        sha512 = "QQIiIqgEjNnquc0d4b6HDOSFZxbFQoy4MPpli2lSLpKhMyBkKwwca2HFqu4xzxlKID/F2fxSOowwtKpgczhF7A==";
+      };
+    };
+    "postcss-media-query-parser-0.2.3" = {
+      name = "postcss-media-query-parser";
+      packageName = "postcss-media-query-parser";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz";
+        sha1 = "27b39c6f4d94f81b1a73b8f76351c609e5cef244";
+      };
+    };
     "postcss-merge-longhand-4.0.11" = {
       name = "postcss-merge-longhand";
       packageName = "postcss-merge-longhand";
@@ -33264,6 +33453,51 @@ let
         sha512 = "EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==";
       };
     };
+    "postcss-reporter-5.0.0" = {
+      name = "postcss-reporter";
+      packageName = "postcss-reporter";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-5.0.0.tgz";
+        sha512 = "rBkDbaHAu5uywbCR2XE8a25tats3xSOsGNx6mppK6Q9kSFGKc/FyAzfci+fWM2l+K402p1D0pNcfDGxeje5IKg==";
+      };
+    };
+    "postcss-resolve-nested-selector-0.1.1" = {
+      name = "postcss-resolve-nested-selector";
+      packageName = "postcss-resolve-nested-selector";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz";
+        sha1 = "29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e";
+      };
+    };
+    "postcss-safe-parser-3.0.1" = {
+      name = "postcss-safe-parser";
+      packageName = "postcss-safe-parser";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-3.0.1.tgz";
+        sha1 = "b753eff6c7c0aea5e8375fbe4cde8bf9063ff142";
+      };
+    };
+    "postcss-sass-0.2.0" = {
+      name = "postcss-sass";
+      packageName = "postcss-sass";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.2.0.tgz";
+        sha512 = "cUmYzkP747fPCQE6d+CH2l1L4VSyIlAzZsok3HPjb5Gzsq3jE+VjpAdGlPsnQ310WKWI42sw+ar0UNN59/f3hg==";
+      };
+    };
+    "postcss-scss-1.0.6" = {
+      name = "postcss-scss";
+      packageName = "postcss-scss";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-scss/-/postcss-scss-1.0.6.tgz";
+        sha512 = "4EFYGHcEw+H3E06PT/pQQri06u/1VIIPjeJQaM8skB80vZuXMhp4cSNV5azmdNkontnOID/XYWEvEEELLFB1ww==";
+      };
+    };
     "postcss-selector-parser-3.1.2" = {
       name = "postcss-selector-parser";
       packageName = "postcss-selector-parser";
@@ -33435,6 +33669,24 @@ let
         sha512 = "2UzApPuxi2yRoyMlXMazgR6UcH9DKJhNgCviIwY3ixZ9THWSSrUww5vkiZ3C48WvpFl1M1y/oU63deSy1puWEA==";
       };
     };
+    "prettier-eslint-9.0.1" = {
+      name = "prettier-eslint";
+      packageName = "prettier-eslint";
+      version = "9.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/prettier-eslint/-/prettier-eslint-9.0.1.tgz";
+        sha512 = "KZT65QTosSAqBBqmrC+RpXbsMRe7Os2YSR9cAfFbDlyPAopzA/S5bioiZ3rpziNQNSJaOxmtXSx07EQ+o2Dlug==";
+      };
+    };
+    "prettier-stylelint-0.4.2" = {
+      name = "prettier-stylelint";
+      packageName = "prettier-stylelint";
+      version = "0.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/prettier-stylelint/-/prettier-stylelint-0.4.2.tgz";
+        sha512 = "CmatjDsW8xKMtWg/Tc6/W02wC59p50kkItrXmkgbhR4b2EKMU5Pm55x1WuCahkkZeZoNVReWRxA8VL/s69mkBg==";
+      };
+    };
     "prettier-tslint-0.4.2" = {
       name = "prettier-tslint";
       packageName = "prettier-tslint";
@@ -33525,13 +33777,13 @@ let
         sha512 = "zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==";
       };
     };
-    "prism-media-0.0.3" = {
+    "prism-media-0.0.4" = {
       name = "prism-media";
       packageName = "prism-media";
-      version = "0.0.3";
+      version = "0.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prism-media/-/prism-media-0.0.3.tgz";
-        sha512 = "c9KkNifSMU/iXT8FFTaBwBMr+rdVcN+H/uNv1o+CuFeTThNZNTOrQ+RgXA1yL/DeLk098duAeRPP3QNPNbhxYQ==";
+        url = "https://registry.npmjs.org/prism-media/-/prism-media-0.0.4.tgz";
+        sha512 = "dG2w7WtovUa4SiYTdWn9H8Bd4JNdei2djtkP/Bk9fXq81j5Q15ZPHYSwhUVvBRbp5zMkGtu0Yk62HuMcly0pRw==";
       };
     };
     "prisma-json-schema-0.1.3" = {
@@ -33696,13 +33948,13 @@ let
         sha512 = "nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==";
       };
     };
-    "promise-8.0.3" = {
+    "promise-8.1.0" = {
       name = "promise";
       packageName = "promise";
-      version = "8.0.3";
+      version = "8.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/promise/-/promise-8.0.3.tgz";
-        sha512 = "HeRDUL1RJiLhyA0/grn+PTShlBAcLuh/1BJGtrvjwbvRDCTLLMEz9rOGCV+R3vHY4MixIuoMEd9Yq/XvsTPcjw==";
+        url = "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz";
+        sha512 = "W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q==";
       };
     };
     "promise-inflight-1.0.1" = {
@@ -33867,13 +34119,13 @@ let
         sha1 = "bc826e34c3af4697e8d0af7a669e4d612aedcd17";
       };
     };
-    "protobufjs-6.8.8" = {
+    "protobufjs-6.8.9" = {
       name = "protobufjs";
       packageName = "protobufjs";
-      version = "6.8.8";
+      version = "6.8.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.8.tgz";
-        sha512 = "AAmHtD5pXgZfi7GMpllpO3q1Xw1OYldr+dMUlAnffGTAhqkg72WdmSY71uKBF/JuyiKs8psYbtKrhi0ASCD8qw==";
+        url = "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.9.tgz";
+        sha512 = "j2JlRdUeL/f4Z6x4aU4gj9I2LECglC+5qR2TrWb193Tla1qfdaNQTZ8I27Pt7K0Ajmvjjpft7O3KWTGciz4gpw==";
       };
     };
     "protochain-1.0.5" = {
@@ -33948,13 +34200,13 @@ let
         sha512 = "WudaR0eTsDx33O3EJE16PjBRZWcX8GqCEeERw1W3hZJgH/F2a46g7jty6UGty6NeJ4CKQy8ds2CJPMiyeqaTvw==";
       };
     };
-    "proxy-from-env-1.0.0" = {
+    "proxy-from-env-1.1.0" = {
       name = "proxy-from-env";
       packageName = "proxy-from-env";
-      version = "1.0.0";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz";
-        sha1 = "33c50398f70ea7eb96d21f7b817630a55791c7ee";
+        url = "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz";
+        sha512 = "D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==";
       };
     };
     "proxy-middleware-0.15.0" = {
@@ -35127,13 +35379,13 @@ let
         sha512 = "Qy1MliJDozZ1A6Hx3UbEnm8PPCfkiG/8CArbnhrxXMx1YRJPWipgPTB9qyhn4Z7WlLvCEqPb6Bd98OayyVuwrA==";
       };
     };
-    "random-access-storage-1.4.0" = {
+    "random-access-storage-1.4.1" = {
       name = "random-access-storage";
       packageName = "random-access-storage";
-      version = "1.4.0";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.4.0.tgz";
-        sha512 = "7oszloM/+PdqWp/oFGyL6SeI14liqo8AAisHAZQGkWdHISyAnngKjNPL0JYIazeLxbHPY6oed2yUffowdq/o6A==";
+        url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.4.1.tgz";
+        sha512 = "DbCc2TIzOxPaHF6KCbr8zLtiYOJQQQCBHUVNHV/SckUQobCBB2YkDtbLdxGnPwPNpJfEyMWxDAm36A2xkbxxtw==";
       };
     };
     "random-bytes-1.0.0" = {
@@ -35262,15 +35514,6 @@ let
         sha1 = "a2c2f98c8531cee99c63d8d238b7de97bb659fca";
       };
     };
-    "raw-body-2.3.3" = {
-      name = "raw-body";
-      packageName = "raw-body";
-      version = "2.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz";
-        sha512 = "9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==";
-      };
-    };
     "raw-body-2.4.0" = {
       name = "raw-body";
       packageName = "raw-body";
@@ -35325,13 +35568,31 @@ let
         sha512 = "C0SIXdXDSus2yqqvV7qifnb4NoWP7mEBXJq3axci301mXHCZb8Djwm4hrEZo4UeXRaEnfjH98uQ8EBppk2oNWA==";
       };
     };
-    "react-is-16.12.0" = {
+    "react-16.13.0" = {
+      name = "react";
+      packageName = "react";
+      version = "16.13.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/react/-/react-16.13.0.tgz";
+        sha512 = "TSavZz2iSLkq5/oiE7gnFzmURKZMltmi193rm5HEoUDAXpzT9Kzw6oNZnGoai/4+fUnm7FqS5dwgUL34TujcWQ==";
+      };
+    };
+    "react-is-16.13.0" = {
       name = "react-is";
       packageName = "react-is";
-      version = "16.12.0";
+      version = "16.13.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/react-is/-/react-is-16.12.0.tgz";
-        sha512 = "rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==";
+        url = "https://registry.npmjs.org/react-is/-/react-is-16.13.0.tgz";
+        sha512 = "GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA==";
+      };
+    };
+    "react-reconciler-0.24.0" = {
+      name = "react-reconciler";
+      packageName = "react-reconciler";
+      version = "0.24.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/react-reconciler/-/react-reconciler-0.24.0.tgz";
+        sha512 = "gAGnwWkf+NOTig9oOowqid9O0HjTDC+XVGBCAmJYYJ2A2cN/O4gDdIuuUQjv8A4v6GDwVfJkagpBBLW5OW9HSw==";
       };
     };
     "read-1.0.7" = {
@@ -35559,6 +35820,15 @@ let
         sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==";
       };
     };
+    "readable-web-to-node-stream-2.0.0" = {
+      name = "readable-web-to-node-stream";
+      packageName = "readable-web-to-node-stream";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-2.0.0.tgz";
+        sha512 = "+oZJurc4hXpaaqsN68GoZGQAQIA3qr09Or4fqEsargABnbe5Aau8hFn6ISVleT3cpY/0n/8drn7huyyEvTbghA==";
+      };
+    };
     "readdir-scoped-modules-1.1.0" = {
       name = "readdir-scoped-modules";
       packageName = "readdir-scoped-modules";
@@ -35703,15 +35973,6 @@ let
         sha512 = "6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==";
       };
     };
-    "redeyed-1.0.1" = {
-      name = "redeyed";
-      packageName = "redeyed";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/redeyed/-/redeyed-1.0.1.tgz";
-        sha1 = "e96c193b40c0816b00aec842698e61185e55498a";
-      };
-    };
     "redeyed-2.1.1" = {
       name = "redeyed";
       packageName = "redeyed";
@@ -35766,13 +36027,13 @@ let
         sha512 = "1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==";
       };
     };
-    "regenerate-unicode-properties-8.1.0" = {
+    "regenerate-unicode-properties-8.2.0" = {
       name = "regenerate-unicode-properties";
       packageName = "regenerate-unicode-properties";
-      version = "8.1.0";
+      version = "8.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz";
-        sha512 = "LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==";
+        url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz";
+        sha512 = "F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==";
       };
     };
     "regenerator-runtime-0.10.5" = {
@@ -35802,22 +36063,22 @@ let
         sha512 = "naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==";
       };
     };
-    "regenerator-runtime-0.13.4" = {
+    "regenerator-runtime-0.13.5" = {
       name = "regenerator-runtime";
       packageName = "regenerator-runtime";
-      version = "0.13.4";
+      version = "0.13.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz";
-        sha512 = "plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==";
+        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz";
+        sha512 = "ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==";
       };
     };
-    "regenerator-transform-0.14.2" = {
+    "regenerator-transform-0.14.3" = {
       name = "regenerator-transform";
       packageName = "regenerator-transform";
-      version = "0.14.2";
+      version = "0.14.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.2.tgz";
-        sha512 = "V4+lGplCM/ikqi5/mkkpJ06e9Bujq1NFmNLvsCs56zg3ZbzrnUzAtizZ24TXxtRX/W2jcdScwQCnbL0CICTFkQ==";
+        url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.3.tgz";
+        sha512 = "zXHNKJspmONxBViAb3ZUmFoFPnTBs3zFhCEZJiwp/gkNzxVbTqNJVjYKx6Qk1tQ1P4XLf4TbH9+KBB7wGoAaUw==";
       };
     };
     "regex-cache-0.4.4" = {
@@ -35865,22 +36126,13 @@ let
         sha512 = "lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==";
       };
     };
-    "regexpu-core-1.0.0" = {
+    "regexpu-core-4.7.0" = {
       name = "regexpu-core";
       packageName = "regexpu-core";
-      version = "1.0.0";
+      version = "4.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz";
-        sha1 = "86a763f58ee4d7c2f6b102e4764050de7ed90c6b";
-      };
-    };
-    "regexpu-core-4.6.0" = {
-      name = "regexpu-core";
-      packageName = "regexpu-core";
-      version = "4.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.6.0.tgz";
-        sha512 = "YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==";
+        url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz";
+        sha512 = "TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==";
       };
     };
     "registry-auth-token-3.3.2" = {
@@ -35928,15 +36180,6 @@ let
         sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==";
       };
     };
-    "regjsgen-0.2.0" = {
-      name = "regjsgen";
-      packageName = "regjsgen";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz";
-        sha1 = "6c016adeac554f75823fe37ac05b92d5a4edb1f7";
-      };
-    };
     "regjsgen-0.5.1" = {
       name = "regjsgen";
       packageName = "regjsgen";
@@ -35946,22 +36189,13 @@ let
         sha512 = "5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==";
       };
     };
-    "regjsparser-0.1.5" = {
+    "regjsparser-0.6.4" = {
       name = "regjsparser";
       packageName = "regjsparser";
-      version = "0.1.5";
+      version = "0.6.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz";
-        sha1 = "7ee8f84dc6fa792d3fd0ae228d24bd949ead205c";
-      };
-    };
-    "regjsparser-0.6.3" = {
-      name = "regjsparser";
-      packageName = "regjsparser";
-      version = "0.6.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.3.tgz";
-        sha512 = "8uZvYbnfAtEm9Ab8NTb3hdLwL4g/LQzEYP7Xs27T96abJCCE2d6r3cPZPQEsLKy0vRSGVNG+/zVGtLr86HQduA==";
+        url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz";
+        sha512 = "64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==";
       };
     };
     "rehype-sort-attribute-values-2.0.1" = {
@@ -36027,6 +36261,15 @@ let
         sha1 = "cb463bd3dbcb4b99794935eee1cf71d7a8e3068c";
       };
     };
+    "remark-8.0.0" = {
+      name = "remark";
+      packageName = "remark";
+      version = "8.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/remark/-/remark-8.0.0.tgz";
+        sha512 = "K0PTsaZvJlXTl9DN6qYlvjTkqSZBFELhROZMrblm2rB+085flN84nz4g/BscKRMqDvhzlK1oQ/xnWQumdeNZYw==";
+      };
+    };
     "remark-frontmatter-1.3.2" = {
       name = "remark-frontmatter";
       packageName = "remark-frontmatter";
@@ -36099,6 +36342,15 @@ let
         sha1 = "a7105e25b9ee2bf9a49b75d2c423f11b06ae2092";
       };
     };
+    "remark-stringify-4.0.0" = {
+      name = "remark-stringify";
+      packageName = "remark-stringify";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-4.0.0.tgz";
+        sha512 = "xLuyKTnuQer3ke9hkU38SUYLiTmS078QOnoFavztmbt/pAJtNSkNtFgR0U//uCcmG0qnyxao+PDuatQav46F1w==";
+      };
+    };
     "remove-array-items-1.1.1" = {
       name = "remove-array-items";
       packageName = "remove-array-items";
@@ -36324,15 +36576,6 @@ let
         sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
       };
     };
-    "require-from-string-1.2.1" = {
-      name = "require-from-string";
-      packageName = "require-from-string";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz";
-        sha1 = "529c9ccef27380adfec9a2f965b649bbee636418";
-      };
-    };
     "require-from-string-2.0.2" = {
       name = "require-from-string";
       packageName = "require-from-string";
@@ -36423,15 +36666,6 @@ let
         sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
       };
     };
-    "resolve-1.14.2" = {
-      name = "resolve";
-      packageName = "resolve";
-      version = "1.14.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.14.2.tgz";
-        sha512 = "EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ==";
-      };
-    };
     "resolve-1.15.1" = {
       name = "resolve";
       packageName = "resolve";
@@ -36720,6 +36954,15 @@ let
         sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d";
       };
     };
+    "reusify-1.0.4" = {
+      name = "reusify";
+      packageName = "reusify";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz";
+        sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==";
+      };
+    };
     "revalidator-0.1.8" = {
       name = "revalidator";
       packageName = "revalidator";
@@ -36891,22 +37134,22 @@ let
         sha512 = "jmaDhK9CO4YbQAV8zzCnq9vjAqeO489MS5ehZ+rXmFiPFFE6B+S9KYO6prjmLJ5A0zY3QxVlQdrIya7E/azz/Q==";
       };
     };
-    "rollup-1.31.1" = {
+    "rollup-1.32.1" = {
       name = "rollup";
       packageName = "rollup";
-      version = "1.31.1";
+      version = "1.32.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rollup/-/rollup-1.31.1.tgz";
-        sha512 = "2JREN1YdrS/kpPzEd33ZjtuNbOuBC3ePfuZBdKEybvqcEcszW1ckyVqzcEiEe0nE8sqHK+pbJg+PsAgRJ8+1dg==";
+        url = "https://registry.npmjs.org/rollup/-/rollup-1.32.1.tgz";
+        sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==";
       };
     };
-    "rollup-plugin-babel-4.3.3" = {
+    "rollup-plugin-babel-4.4.0" = {
       name = "rollup-plugin-babel";
       packageName = "rollup-plugin-babel";
-      version = "4.3.3";
+      version = "4.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.3.3.tgz";
-        sha512 = "tKzWOCmIJD/6aKNz0H1GMM+lW1q9KyFubbWzGiOG540zxPPifnEAHTZwjo0g991Y+DyOZcLqBgqOdqazYE5fkw==";
+        url = "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.4.0.tgz";
+        sha512 = "Lek/TYp1+7g7I+uMfJnnSJ7YWoD58ajo6Oarhlex7lvUce+RCKRuGRSgztDO3/MF/PuGKmUL5iTHKf208UNszw==";
       };
     };
     "rollup-plugin-babel-minify-9.1.1" = {
@@ -37035,13 +37278,13 @@ let
         sha1 = "c8ad4a5e110661e402a7d21b530e009f25f8e389";
       };
     };
-    "run-async-2.3.0" = {
+    "run-async-2.4.0" = {
       name = "run-async";
       packageName = "run-async";
-      version = "2.3.0";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz";
-        sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0";
+        url = "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz";
+        sha512 = "xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==";
       };
     };
     "run-parallel-1.1.9" = {
@@ -37341,6 +37584,15 @@ let
         sha512 = "Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==";
       };
     };
+    "scheduler-0.18.0" = {
+      name = "scheduler";
+      packageName = "scheduler";
+      version = "0.18.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/scheduler/-/scheduler-0.18.0.tgz";
+        sha512 = "agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ==";
+      };
+    };
     "schema-utils-1.0.0" = {
       name = "schema-utils";
       packageName = "schema-utils";
@@ -37566,15 +37818,6 @@ let
         sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
       };
     };
-    "semver-6.0.0" = {
-      name = "semver";
-      packageName = "semver";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz";
-        sha512 = "0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==";
-      };
-    };
     "semver-6.1.3" = {
       name = "semver";
       packageName = "semver";
@@ -37719,15 +37962,6 @@ let
         sha1 = "1beabfd42f9e2709f99028af3078ac12b47092d5";
       };
     };
-    "send-0.16.2" = {
-      name = "send";
-      packageName = "send";
-      version = "0.16.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.16.2.tgz";
-        sha512 = "E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==";
-      };
-    };
     "send-0.17.1" = {
       name = "send";
       packageName = "send";
@@ -37845,15 +38079,6 @@ let
         sha1 = "d3768d69b1e7d82e5ce050fff5b453bea12a9239";
       };
     };
-    "serve-static-1.13.2" = {
-      name = "serve-static";
-      packageName = "serve-static";
-      version = "1.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz";
-        sha512 = "p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==";
-      };
-    };
     "serve-static-1.14.1" = {
       name = "serve-static";
       packageName = "serve-static";
@@ -37953,13 +38178,13 @@ let
         sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==";
       };
     };
-    "seventh-0.7.34" = {
+    "seventh-0.7.35" = {
       name = "seventh";
       packageName = "seventh";
-      version = "0.7.34";
+      version = "0.7.35";
       src = fetchurl {
-        url = "https://registry.npmjs.org/seventh/-/seventh-0.7.34.tgz";
-        sha512 = "9YR6YjZIckltwsfomtsUuyHEGSx7gNHdXDX+hPmvVeHJLiGpFnLRm3izKWCVjb70cYZYUfdlA9osUEqtH/J6uQ==";
+        url = "https://registry.npmjs.org/seventh/-/seventh-0.7.35.tgz";
+        sha512 = "8uGsybZk/XBSv7BvyjbSeK+R8vpWh2jkZJq0UIMVlJTr9CZsCLTfGWKtcBxmHzMUbzSPxa134prhvZA8GuIx/w==";
       };
     };
     "sha.js-2.4.11" = {
@@ -38232,13 +38457,13 @@ let
         sha512 = "bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==";
       };
     };
-    "simple-git-1.131.0" = {
+    "simple-git-1.132.0" = {
       name = "simple-git";
       packageName = "simple-git";
-      version = "1.131.0";
+      version = "1.132.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.131.0.tgz";
-        sha512 = "z/art7YYtmPnnLItT/j+nKwJt6ap6nHZ4D8sYo9PdCKK/ug56SN6m/evfxJk7uDV3e9JuCa8qIyDU2P3cxmiNQ==";
+        url = "https://registry.npmjs.org/simple-git/-/simple-git-1.132.0.tgz";
+        sha512 = "xauHm1YqCTom1sC9eOjfq3/9RKiUA9iPnxBbrY2DdL8l4ADMu0jjM5l5lphQP5YWNqAL2aXC/OeuQ76vHtW5fg==";
       };
     };
     "simple-markdown-0.4.4" = {
@@ -38592,13 +38817,13 @@ let
         sha512 = "9NjxHVMd1U1LFw66Lya4LXgrsFUiuRiL4opxfTFo0LmMNzUoU5Bk/p0zDdg3FE5Wg61r4fP2D8w+QTl6M8CGiw==";
       };
     };
-    "snyk-docker-plugin-2.2.0" = {
+    "snyk-docker-plugin-2.2.2" = {
       name = "snyk-docker-plugin";
       packageName = "snyk-docker-plugin";
-      version = "2.2.0";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-2.2.0.tgz";
-        sha512 = "adoerkNsYNNZFKnvtjJLJeEgjUf2js0hnG32aUJSRtbDN1Ejgbj88a0UYc90C+s2xZJaulJgImy9/5IsG5/omg==";
+        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-2.2.2.tgz";
+        sha512 = "ufeACGqtypUJ3AV5+bQw/mZLo40MC9tVHdRxpBw95w0F0Oa1MT5DATQj/K8RHpkEy8X6rlMmnxH8swyryFgRhg==";
       };
     };
     "snyk-go-parser-1.4.0" = {
@@ -38763,15 +38988,6 @@ let
         sha512 = "rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==";
       };
     };
-    "socket.io-2.2.0" = {
-      name = "socket.io";
-      packageName = "socket.io";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-2.2.0.tgz";
-        sha512 = "wxXrIuZ8AILcn+f1B4ez4hJTPG24iNgxBBDaJfT6MsyOhVYiTXWexGoPkd87ktJG8kQEcL/NBvRi64+9k4Kc0w==";
-      };
-    };
     "socket.io-2.3.0" = {
       name = "socket.io";
       packageName = "socket.io";
@@ -38817,15 +39033,6 @@ let
         sha512 = "jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==";
       };
     };
-    "socket.io-client-2.2.0" = {
-      name = "socket.io-client";
-      packageName = "socket.io-client";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.2.0.tgz";
-        sha512 = "56ZrkTDbdTLmBIyfFYesgOxsjcLnwAKoN4CiPyTVkMQj3zTUh0QAx3GbvIvLpFEOvQWu92yyWICxB0u7wkVbYA==";
-      };
-    };
     "socket.io-client-2.3.0" = {
       name = "socket.io-client";
       packageName = "socket.io-client";
@@ -38916,6 +39123,15 @@ let
         sha512 = "NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==";
       };
     };
+    "socks-proxy-agent-5.0.0" = {
+      name = "socks-proxy-agent";
+      packageName = "socks-proxy-agent";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz";
+        sha512 = "lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==";
+      };
+    };
     "socks5-client-1.2.8" = {
       name = "socks5-client";
       packageName = "socks5-client";
@@ -38979,13 +39195,13 @@ let
         sha512 = "8AVzr9VHueXqfzfkzUA0aXe/Q4XG3UTmhlP6Pt+HQc5bbAPIJFo7ZIMh9tvn+99QuiMcyDJdYumegGAczl0N+g==";
       };
     };
-    "sodium-javascript-0.5.5" = {
+    "sodium-javascript-0.5.6" = {
       name = "sodium-javascript";
       packageName = "sodium-javascript";
-      version = "0.5.5";
+      version = "0.5.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.5.tgz";
-        sha512 = "UMmCHovws/sxIBZsIRhIl8uRPou/RFDD0vVop81T1hG106NLLgqajKKuHAOtAP6hflnZ0UrVA2VFwddTd/NQyA==";
+        url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.5.6.tgz";
+        sha512 = "Uk+JpqHEbzsEmiMxwL7TB/ndhMEpc52KdReYXXSIX2oRFPaI7ZDlDImF8KbkFWbYl9BJRtc82AZ/kNf4/0n9KA==";
       };
     };
     "sodium-native-2.4.9" = {
@@ -39006,13 +39222,13 @@ let
         sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg==";
       };
     };
-    "sonic-boom-0.7.6" = {
+    "sonic-boom-0.7.7" = {
       name = "sonic-boom";
       packageName = "sonic-boom";
-      version = "0.7.6";
+      version = "0.7.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.7.6.tgz";
-        sha512 = "k9E2QQ4zxuVRLDW+ZW6ISzJs3wlEorVdmM7ApDgor7wsGKSDG5YGHsGmgLY4XYh4DMlr/2ap2BWAE7yTFJtWnQ==";
+        url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.7.7.tgz";
+        sha512 = "Ei5YOo5J64GKClHIL/5evJPgASXFVpfVYbJV9PILZQytTK6/LCwHvsZJW2Ig4p9FMC2OrBrMnXKgRN/OEoAWfg==";
       };
     };
     "sorcery-0.10.0" = {
@@ -39339,6 +39555,15 @@ let
         sha512 = "hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==";
       };
     };
+    "specificity-0.3.2" = {
+      name = "specificity";
+      packageName = "specificity";
+      version = "0.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/specificity/-/specificity-0.3.2.tgz";
+        sha512 = "Nc/QN/A425Qog7j9aHmwOrlwX2e7pNI47ciwxwy4jOlvbbMHkNNJchit+FX+UjF3IAdiaaV5BKeWuDUnws6G1A==";
+      };
+    };
     "speedometer-0.1.4" = {
       name = "speedometer";
       packageName = "speedometer";
@@ -39906,13 +40131,13 @@ let
         sha512 = "3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==";
       };
     };
-    "ssri-7.1.0" = {
+    "ssri-8.0.0" = {
       name = "ssri";
       packageName = "ssri";
-      version = "7.1.0";
+      version = "8.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ssri/-/ssri-7.1.0.tgz";
-        sha512 = "77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g==";
+        url = "https://registry.npmjs.org/ssri/-/ssri-8.0.0.tgz";
+        sha512 = "aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA==";
       };
     };
     "stable-0.1.8" = {
@@ -39978,13 +40203,13 @@ let
         sha512 = "d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ==";
       };
     };
-    "static-eval-2.0.3" = {
+    "static-eval-2.0.5" = {
       name = "static-eval";
       packageName = "static-eval";
-      version = "2.0.3";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/static-eval/-/static-eval-2.0.3.tgz";
-        sha512 = "zsxDGucfAh8T339sSKgpFbvg15Fms2IVaJGC+jqp0bVsxhcpM+iMeAI8weNo8dmf4OblgifTBUoyk1vGVtYw2w==";
+        url = "https://registry.npmjs.org/static-eval/-/static-eval-2.0.5.tgz";
+        sha512 = "nNbV6LbGtMBgv7e9LFkt5JV8RVlRsyJrphfAt9tOtBBW/SfnzZDf2KnS72an8e434A+9e/BmJuTxeGPvrAK7KA==";
       };
     };
     "static-extend-0.1.2" = {
@@ -40023,15 +40248,6 @@ let
         sha1 = "cbd243953cc42effd548b5d22388ed689ec639bd";
       };
     };
-    "statuses-1.4.0" = {
-      name = "statuses";
-      packageName = "statuses";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz";
-        sha512 = "zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==";
-      };
-    };
     "statuses-1.5.0" = {
       name = "statuses";
       packageName = "statuses";
@@ -40401,6 +40617,15 @@ let
         sha1 = "d40dbb686a3ace960c1cffca562bf2c45f8363ed";
       };
     };
+    "string-length-3.1.0" = {
+      name = "string-length";
+      packageName = "string-length";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-length/-/string-length-3.1.0.tgz";
+        sha512 = "Ttp5YvkGm5v9Ijagtaz1BnN+k9ObpvS0eIBblPMp2YWL8FBmi9qblQ9fexc2k/CXFgrTIteU3jAw3payCnwSTA==";
+      };
+    };
     "string-padding-1.0.2" = {
       name = "string-padding";
       packageName = "string-padding";
@@ -40860,6 +41085,15 @@ let
         sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa";
       };
     };
+    "strtok3-6.0.0" = {
+      name = "strtok3";
+      packageName = "strtok3";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.0.tgz";
+        sha512 = "ZXlmE22LZnIBvEU3n/kZGdh770fYFie65u5+2hLK9s74DoFtpkQIdBZVeYEzlolpGa+52G5IkzjUWn+iXynOEQ==";
+      };
+    };
     "structured-source-3.0.2" = {
       name = "structured-source";
       packageName = "structured-source";
@@ -40869,6 +41103,15 @@ let
         sha1 = "dd802425e0f53dc4a6e7aca3752901a1ccda7af5";
       };
     };
+    "style-search-0.1.0" = {
+      name = "style-search";
+      packageName = "style-search";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz";
+        sha1 = "7958c793e47e32e07d2b5cafe5c0bf8e12e77902";
+      };
+    };
     "stylehacks-4.0.3" = {
       name = "stylehacks";
       packageName = "stylehacks";
@@ -40878,6 +41121,15 @@ let
         sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==";
       };
     };
+    "stylelint-8.4.0" = {
+      name = "stylelint";
+      packageName = "stylelint";
+      version = "8.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stylelint/-/stylelint-8.4.0.tgz";
+        sha512 = "56hPH5mTFnk8LzlEuTWq0epa34fHuS54UFYQidBOFt563RJBNi1nz1F2HK2MoT1X1waq47milvRsRahFCCJs/Q==";
+      };
+    };
     "stylint-1.5.9" = {
       name = "stylint";
       packageName = "stylint";
@@ -40941,6 +41193,15 @@ let
         sha1 = "cc539bf8191624d4f507d83eeb45b4cea27f3463";
       };
     };
+    "sugarss-1.0.1" = {
+      name = "sugarss";
+      packageName = "sugarss";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sugarss/-/sugarss-1.0.1.tgz";
+        sha512 = "3qgLZytikQQEVn1/FrhY7B68gPUUGY3R1Q1vTiD5xT+Ti1DP/8iZuwFet9ONs5+bmL8pZoDQ6JrQHVgrNlK6mA==";
+      };
+    };
     "superagent-0.21.0" = {
       name = "superagent";
       packageName = "superagent";
@@ -40977,13 +41238,13 @@ let
         sha512 = "FT3QLMasz0YyCd4uIi5HNe+3t/onxMyEho7C3PSqmti3Twgy2rXT4fmkTz6wRL6bTF4uzPcfkUCa8u4JWHw8Ag==";
       };
     };
-    "superagent-5.0.9" = {
+    "superagent-5.2.2" = {
       name = "superagent";
       packageName = "superagent";
-      version = "5.0.9";
+      version = "5.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/superagent/-/superagent-5.0.9.tgz";
-        sha512 = "aOBxh0xN3nCcaG0oot9apJe77FzzCOsg469l06Nw0gW7p9q0mfyAOhSiCLzHCFxKKCNtTx8cxymqoY2cGUfV8g==";
+        url = "https://registry.npmjs.org/superagent/-/superagent-5.2.2.tgz";
+        sha512 = "pMWBUnIllK4ZTw7p/UaobiQPwAO5w/1NRRTDpV0FTVNmECztsxKspj3ZWEordVEaqpZtmOQJJna4yTLyC/q7PQ==";
       };
     };
     "superagent-proxy-2.0.0" = {
@@ -41094,6 +41355,15 @@ let
         sha512 = "HHi5kVSefKaJkGYXbDuKbUGRVxqnWGn3J2e39CYcNJEfWciGq2zYtOhXLTlvrOZW1QU7VX67w7fMmWafHX9Pfw==";
       };
     };
+    "supports-hyperlinks-2.1.0" = {
+      name = "supports-hyperlinks";
+      packageName = "supports-hyperlinks";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz";
+        sha512 = "zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==";
+      };
+    };
     "sver-compat-1.5.0" = {
       name = "sver-compat";
       packageName = "sver-compat";
@@ -41103,6 +41373,15 @@ let
         sha1 = "3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8";
       };
     };
+    "svg-tags-1.0.0" = {
+      name = "svg-tags";
+      packageName = "svg-tags";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz";
+        sha1 = "58f71cee3bd519b59d4b2a843b6c7de64ac04764";
+      };
+    };
     "svgo-1.3.2" = {
       name = "svgo";
       packageName = "svgo";
@@ -41283,13 +41562,13 @@ let
         sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==";
       };
     };
-    "systeminformation-4.22.3" = {
+    "systeminformation-4.23.1" = {
       name = "systeminformation";
       packageName = "systeminformation";
-      version = "4.22.3";
+      version = "4.23.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.22.3.tgz";
-        sha512 = "wsIXxaR6dbLrOp8/KwyiEdXsQVFPOayIhNWI6WwMJg/G6oPX2NIZ4jo8MePMXrTb5VkA7Rihl5343eVqiL+jlg==";
+        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.23.1.tgz";
+        sha512 = "gtqfvz5jUIMqWn0kkdkV4G8uiLmJckQ+z6aKy1uyE0OPU/6tStubahtZDiF0ajSRVJht+Vd4pX5DDwQLhAapww==";
       };
     };
     "syswide-cas-5.3.0" = {
@@ -41319,6 +41598,15 @@ let
         sha512 = "UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==";
       };
     };
+    "table-4.0.3" = {
+      name = "table";
+      packageName = "table";
+      version = "4.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/table/-/table-4.0.3.tgz";
+        sha512 = "S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==";
+      };
+    };
     "table-5.4.6" = {
       name = "table";
       packageName = "table";
@@ -41428,13 +41716,13 @@ let
         sha1 = "2e7ce0a31df09f8d6851664a71842e0ca5057af7";
       };
     };
-    "tape-4.13.0" = {
+    "tape-4.13.2" = {
       name = "tape";
       packageName = "tape";
-      version = "4.13.0";
+      version = "4.13.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tape/-/tape-4.13.0.tgz";
-        sha512 = "J/hvA+GJnuWJ0Sj8Z0dmu3JgMNU+MmusvkCT7+SN4/2TklW18FNCp/UuHIEhPZwHfy4sXfKYgC7kypKg4umbOw==";
+        url = "https://registry.npmjs.org/tape/-/tape-4.13.2.tgz";
+        sha512 = "waWwC/OqYVE9TS6r1IynlP2sEdk4Lfo6jazlgkuNkPTHIbuG2BTABIaKdlQWwPeB6Oo4ksZ1j33Yt0NTOAlYMQ==";
       };
     };
     "tar-0.1.17" = {
@@ -41509,13 +41797,13 @@ let
         sha512 = "rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==";
       };
     };
-    "tar-stream-2.1.0" = {
+    "tar-stream-2.1.2" = {
       name = "tar-stream";
       packageName = "tar-stream";
-      version = "2.1.0";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.0.tgz";
-        sha512 = "+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw==";
+        url = "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.2.tgz";
+        sha512 = "UaF6FoJ32WqALZGOIAApXx+OdxhekNMChu6axLJR85zMMjXKWFGjbIRe+J6P4UnRGg9rAwWvbTT0oI7hD/Un7Q==";
       };
     };
     "taskkill-3.1.0" = {
@@ -41671,13 +41959,13 @@ let
         sha512 = "a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==";
       };
     };
-    "terminal-kit-1.33.15" = {
+    "terminal-kit-1.35.1" = {
       name = "terminal-kit";
       packageName = "terminal-kit";
-      version = "1.33.15";
+      version = "1.35.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.33.15.tgz";
-        sha512 = "zGZpZRXXAKJw/fyWxY7k8rOzo56OBzzhfPQGloPBP4irhQs6cv4VWMOoVFHze8o7L4YzwtijBotfI479xA4QxQ==";
+        url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.35.1.tgz";
+        sha512 = "36q0frqenTb1kWuq+vJU+xbGB8KPX1+05kxnbVZxeu9cXDL68qR5w2NzsliogHweplRI7XP0Zc/FITMMA8/BHA==";
       };
     };
     "terser-3.17.0" = {
@@ -41689,13 +41977,13 @@ let
         sha512 = "/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==";
       };
     };
-    "terser-4.6.4" = {
+    "terser-4.6.6" = {
       name = "terser";
       packageName = "terser";
-      version = "4.6.4";
+      version = "4.6.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terser/-/terser-4.6.4.tgz";
-        sha512 = "5fqgBPLgVHZ/fVvqRhhUp9YUiGXhFJ9ZkrZWD9vQtFBR4QIGTnbsb+/kKqSqfgp3WnBwGWAFnedGTtmX1YTn0w==";
+        url = "https://registry.npmjs.org/terser/-/terser-4.6.6.tgz";
+        sha512 = "4lYPyeNmstjIIESr/ysHg2vUPRGf2tzF9z2yYwnowXVuVzLEamPN1Gfrz7f8I9uEPuHcbFlW4PLIAsJoxXyJ1g==";
       };
     };
     "terser-webpack-plugin-1.4.3" = {
@@ -42157,15 +42445,6 @@ let
         sha512 = "NQPUaywaVC2hzWkBBsTX3sV2XfxU0mc409rJyrA7iCu5DSTjMLUqI+U4KJVSy/Ltp0zgbWMWua471R7zMql9Pw==";
       };
     };
-    "tmp-promise-1.1.0" = {
-      name = "tmp-promise";
-      packageName = "tmp-promise";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tmp-promise/-/tmp-promise-1.1.0.tgz";
-        sha512 = "8+Ah9aB1IRXCnIOxXZ0uFozV1nMU5xiu7hhFVUSxZ3bYu+psD4TzagCzVbexUCgNNGJnsmNDQlS4nG3mTyoNkw==";
-      };
-    };
     "tmpl-1.0.4" = {
       name = "tmpl";
       packageName = "tmpl";
@@ -42373,13 +42652,13 @@ let
         sha512 = "Y7EDM+uoU8TZxF5ej2mUR0dLO4qbuuNRnJKxEht2QJWEq2421pyG1D1x8YxPKmyTc6nHh7Td/jLGFxYo+9vkLA==";
       };
     };
-    "to-vfile-6.0.0" = {
+    "to-vfile-6.1.0" = {
       name = "to-vfile";
       packageName = "to-vfile";
-      version = "6.0.0";
+      version = "6.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/to-vfile/-/to-vfile-6.0.0.tgz";
-        sha512 = "i9fwXXSsHLu7mzgixc1WjgnqSe6pGpjnzCYoFmrASvEueLfyKf09QAe+XQYu8OAJ62aFqHpe2EKXojeRVvEzqA==";
+        url = "https://registry.npmjs.org/to-vfile/-/to-vfile-6.1.0.tgz";
+        sha512 = "BxX8EkCxOAZe+D/ToHdDsJcVI4HqQfmw0tCkp31zf3dNP/XWIAjU4CmeuSwsSoOzOTqHPOL0KUzyZqJplkD0Qw==";
       };
     };
     "toidentifier-1.0.0" = {
@@ -42409,6 +42688,15 @@ let
         sha1 = "ceeefc717a76c4316f126d0b9dbaa55d7e7df01a";
       };
     };
+    "token-types-2.0.0" = {
+      name = "token-types";
+      packageName = "token-types";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/token-types/-/token-types-2.0.0.tgz";
+        sha512 = "WWvu8sGK8/ZmGusekZJJ5NM6rRVTTDO7/bahz4NGiSDb/XsmdYBn6a1N/bymUHuWYTWeuLUg98wUzvE4jPdCZw==";
+      };
+    };
     "toml-2.3.6" = {
       name = "toml";
       packageName = "toml";
@@ -42796,13 +43084,13 @@ let
         sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA==";
       };
     };
-    "ts-node-8.6.2" = {
+    "ts-node-8.7.0" = {
       name = "ts-node";
       packageName = "ts-node";
-      version = "8.6.2";
+      version = "8.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ts-node/-/ts-node-8.6.2.tgz";
-        sha512 = "4mZEbofxGqLL2RImpe3zMJukvEvcO1XP8bj8ozBPySdCUXEcU5cIRwR0aM3R+VoZq7iXc8N86NC0FspGRqP4gg==";
+        url = "https://registry.npmjs.org/ts-node/-/ts-node-8.7.0.tgz";
+        sha512 = "s659CsHrsxaRVDEleuOkGvbsA0rWHtszUNEt1r0CgAFN5ZZTQtDzpsluS7W5pOGJIa1xZE8R/zK4dEs+ldFezg==";
       };
     };
     "ts-process-promises-1.0.2" = {
@@ -42814,13 +43102,13 @@ let
         sha512 = "6qWWz2HdFbD2uAfgS5t65Dd6HQKYjfra+YXQzKzxIG+RKTpoeDi+x+TW85SEF3cWUI2UecrOXJobvD+04MiTZg==";
       };
     };
-    "tslib-1.11.0" = {
+    "tslib-1.11.1" = {
       name = "tslib";
       packageName = "tslib";
-      version = "1.11.0";
+      version = "1.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-1.11.0.tgz";
-        sha512 = "BmndXUtiTn/VDDrJzQE7Mm22Ix3PxgLltW9bSNLoeCY31gnG2OPx0QqJnuc9oMIKioYrz487i6K9o4Pdn0j+Kg==";
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz";
+        sha512 = "aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==";
       };
     };
     "tslib-1.9.3" = {
@@ -43030,6 +43318,24 @@ let
         sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==";
       };
     };
+    "type-fest-0.10.0" = {
+      name = "type-fest";
+      packageName = "type-fest";
+      version = "0.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/type-fest/-/type-fest-0.10.0.tgz";
+        sha512 = "EUV9jo4sffrwlg8s0zDhP0T2WD3pru5Xi0+HTE3zTUmBaZNhfkite9PdSJwdXLwPVW0jnAHT56pZHIOYckPEiw==";
+      };
+    };
+    "type-fest-0.11.0" = {
+      name = "type-fest";
+      packageName = "type-fest";
+      version = "0.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz";
+        sha512 = "OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==";
+      };
+    };
     "type-fest-0.3.1" = {
       name = "type-fest";
       packageName = "type-fest";
@@ -43075,15 +43381,6 @@ let
         sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==";
       };
     };
-    "typechecker-4.11.0" = {
-      name = "typechecker";
-      packageName = "typechecker";
-      version = "4.11.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typechecker/-/typechecker-4.11.0.tgz";
-        sha512 = "lz39Mc/d1UBcF/uQFL5P8L+oWdIn/stvkUgHf0tPRW4aEwGGErewNXo2Nb6We2WslWifn00rhcHbbRWRcTGhuw==";
-      };
-    };
     "typed-function-1.1.0" = {
       name = "typed-function";
       packageName = "typed-function";
@@ -43138,13 +43435,13 @@ let
         sha512 = "/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==";
       };
     };
-    "typescript-3.8.2" = {
+    "typescript-3.8.3" = {
       name = "typescript";
       packageName = "typescript";
-      version = "3.8.2";
+      version = "3.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-3.8.2.tgz";
-        sha512 = "EgOVgL/4xfVrCMbhYKUQTdF37SQn4Iw73H5BgCrF1Abdun7Kwy/QZsE/ssAy0y4LxBbvua3PIbFsbRczWWnDdQ==";
+        url = "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz";
+        sha512 = "MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==";
       };
     };
     "typescript-eslint-parser-16.0.1" = {
@@ -43237,15 +43534,6 @@ let
         sha512 = "Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==";
       };
     };
-    "uglify-js-3.6.9" = {
-      name = "uglify-js";
-      packageName = "uglify-js";
-      version = "3.6.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.9.tgz";
-        sha512 = "pcnnhaoG6RtrvHJ1dFncAe8Od6Nuy30oaJ82ts6//sGSXOP5UjBMEthiProjXmMNHOfd93sqlkztifFMcb+4yw==";
-      };
-    };
     "uglify-js-3.8.0" = {
       name = "uglify-js";
       packageName = "uglify-js";
@@ -43516,22 +43804,22 @@ let
         sha512 = "L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==";
       };
     };
-    "unicode-match-property-value-ecmascript-1.1.0" = {
+    "unicode-match-property-value-ecmascript-1.2.0" = {
       name = "unicode-match-property-value-ecmascript";
       packageName = "unicode-match-property-value-ecmascript";
-      version = "1.1.0";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz";
-        sha512 = "hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==";
+        url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz";
+        sha512 = "wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==";
       };
     };
-    "unicode-property-aliases-ecmascript-1.0.5" = {
+    "unicode-property-aliases-ecmascript-1.1.0" = {
       name = "unicode-property-aliases-ecmascript";
       packageName = "unicode-property-aliases-ecmascript";
-      version = "1.0.5";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz";
-        sha512 = "L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==";
+        url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz";
+        sha512 = "PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==";
       };
     };
     "unicode-trie-0.3.1" = {
@@ -43732,6 +44020,15 @@ let
         sha1 = "1062bbb6928c7a97c6adc89b53745d4c46c222a2";
       };
     };
+    "unist-util-find-all-after-1.0.5" = {
+      name = "unist-util-find-all-after";
+      packageName = "unist-util-find-all-after";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-1.0.5.tgz";
+        sha512 = "lWgIc3rrTMTlK1Y0hEuL+k+ApzFk78h+lsaa2gHf63Gp5Ww+mt11huDniuaoq1H+XMK2lIIjjPkncxXcDp3QDw==";
+      };
+    };
     "unist-util-inspect-4.1.4" = {
       name = "unist-util-inspect";
       packageName = "unist-util-inspect";
@@ -43813,13 +44110,13 @@ let
         sha512 = "pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ==";
       };
     };
-    "unist-util-stringify-position-2.0.2" = {
+    "unist-util-stringify-position-2.0.3" = {
       name = "unist-util-stringify-position";
       packageName = "unist-util-stringify-position";
-      version = "2.0.2";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.2.tgz";
-        sha512 = "nK5n8OGhZ7ZgUwoUbL8uiVRwAbZyzBsB/Ddrlbu6jwwubFza4oe15KlyEaLNMXQW1svOQq4xesUeqA85YrIUQA==";
+        url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz";
+        sha512 = "3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==";
       };
     };
     "unist-util-visit-1.4.1" = {
@@ -44587,6 +44884,15 @@ let
         sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==";
       };
     };
+    "uuid-7.0.1" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "7.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-7.0.1.tgz";
+        sha512 = "yqjRXZzSJm9Dbl84H2VDHpM3zMjzSJQ+hn6C4zqd5ilW+7P4ZmLEEqwho9LjP+tGuZlF4xrHQXT0h9QZUS/pWA==";
+      };
+    };
     "v8-compile-cache-2.0.3" = {
       name = "v8-compile-cache";
       packageName = "v8-compile-cache";
@@ -44911,13 +45217,13 @@ let
         sha512 = "y7Y3gH9BsUSdD4KzHsuMaCzRjglXN0W2EcMf0gpvu6+SbsGhMje7xDc8AEoeXy6mIwCKMI6BkjMsRjzQbhMEjQ==";
       };
     };
-    "vfile-4.0.2" = {
+    "vfile-4.0.3" = {
       name = "vfile";
       packageName = "vfile";
-      version = "4.0.2";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vfile/-/vfile-4.0.2.tgz";
-        sha512 = "yhoTU5cDMSsaeaMfJ5g0bUKYkYmZhAh9fn9TZicxqn+Cw4Z439il2v3oT9S0yjlpqlI74aFOQCt3nOV+pxzlkw==";
+        url = "https://registry.npmjs.org/vfile/-/vfile-4.0.3.tgz";
+        sha512 = "lREgT5sF05TQk68LO6APy0In+TkFGnFEgKChK2+PHIaTrFQ9oHCKXznZ7VILwgYVBcl0gv4lGATFZBLhi2kVQg==";
       };
     };
     "vfile-find-down-1.0.0" = {
@@ -44965,13 +45271,13 @@ let
         sha512 = "1WmsopSGhWt5laNir+633LszXvZ+Z/lxveBf6yhGsqnQIhlhzooZae7zV6YVM1Sdkw68dtAW3ow0pOdPANugvA==";
       };
     };
-    "vfile-message-2.0.2" = {
+    "vfile-message-2.0.3" = {
       name = "vfile-message";
       packageName = "vfile-message";
-      version = "2.0.2";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.2.tgz";
-        sha512 = "gNV2Y2fDvDOOqq8bEe7cF3DXU6QgV4uA9zMR2P8tix11l1r7zju3zry3wZ8sx+BEfuO6WQ7z2QzfWTvqHQiwsA==";
+        url = "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.3.tgz";
+        sha512 = "qQg/2z8qnnBHL0psXyF72kCjb9YioIynvyltuNKFaUhRtqTIcIMP3xnBaPzirVZNuBrUe1qwFciSx2yApa4byw==";
       };
     };
     "vfile-reporter-1.5.0" = {
@@ -45001,13 +45307,13 @@ let
         sha512 = "b15sTuss1wOPWVlyWOvu+n6wGJ/eTYngz3uqMLimQvxZ+Q5oFQGYZZP1o3dR9sk58G5+wej0UPCZSwQBX/mzrQ==";
       };
     };
-    "vfile-reporter-6.0.0" = {
+    "vfile-reporter-6.0.1" = {
       name = "vfile-reporter";
       packageName = "vfile-reporter";
-      version = "6.0.0";
+      version = "6.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-6.0.0.tgz";
-        sha512 = "8Is0XxFxWJUhPJdOg3CyZTqd3ICCWg6r304PuBl818ZG91h4FMS3Q+lrOPS+cs5/DZK3H0+AkJdH0J8JEwKtDA==";
+        url = "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-6.0.1.tgz";
+        sha512 = "0OppK9mo8G2XUpv+hIKLVSDsoxJrXnOy73+vIm0jQUOUFYRduqpFHX+QqAQfvRHyX9B0UFiRuNJnBOjQCIsw1g==";
       };
     };
     "vfile-sort-1.0.0" = {
@@ -45019,22 +45325,22 @@ let
         sha1 = "17ee491ba43e8951bb22913fcff32a7dc4d234d4";
       };
     };
-    "vfile-sort-2.2.1" = {
+    "vfile-sort-2.2.2" = {
       name = "vfile-sort";
       packageName = "vfile-sort";
-      version = "2.2.1";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vfile-sort/-/vfile-sort-2.2.1.tgz";
-        sha512 = "5dt7xEhC44h0uRQKhbM2JAe0z/naHphIZlMOygtMBM9Nn0pZdaX5fshhwWit9wvsuP8t/wp43nTDRRErO1WK8g==";
+        url = "https://registry.npmjs.org/vfile-sort/-/vfile-sort-2.2.2.tgz";
+        sha512 = "tAyUqD2R1l/7Rn7ixdGkhXLD3zsg+XLAeUDUhXearjfIcpL1Hcsj5hHpCoy/gvfK/Ws61+e972fm0F7up7hfYA==";
       };
     };
-    "vfile-statistics-1.1.3" = {
+    "vfile-statistics-1.1.4" = {
       name = "vfile-statistics";
       packageName = "vfile-statistics";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-1.1.3.tgz";
-        sha512 = "CstaK/ebTz1W3Qp41Bt9Lj/2DmumFsCwC2sKahDNSPh0mPh7/UyMLCoU8ZBX34CRU0d61B4W41yIFsV0NKMZeA==";
+        url = "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-1.1.4.tgz";
+        sha512 = "lXhElVO0Rq3frgPvFBwahmed3X03vjPF8OcjKMy8+F1xU/3Q3QU3tKEDp743SFtb74PdF0UWpxPvtOP0GCLheA==";
       };
     };
     "videostream-3.2.1" = {
@@ -45181,13 +45487,13 @@ let
         sha512 = "RWkO/c/A7iXhHEy3OuEqkCqavDjpD4NF2Ca8vjai+ZtEYNeHrm1ybTnBYLP4Ft1uXvvaaVtYA9HrDjD6+CUONg==";
       };
     };
-    "vscode-css-languageservice-4.1.0" = {
+    "vscode-css-languageservice-4.1.1" = {
       name = "vscode-css-languageservice";
       packageName = "vscode-css-languageservice";
-      version = "4.1.0";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.1.0.tgz";
-        sha512 = "iTX3dTp0Y0RFWhIux5jasI8r9swdiWVB1Z3OrZ10iDHxzkETjVPxAQ5BEQU4ag0Awc8TTg1C7sJriHQY2LO14g==";
+        url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.1.1.tgz";
+        sha512 = "2r2bYbhscivRu1zqh5kNe8aYpFnfksMYC7wTpKX2HqFsSzSJYXk0sCqPaWsP5ptqz0OFBTXnzx2JlE+Nb5Edgw==";
       };
     };
     "vscode-emmet-helper-1.2.17" = {
@@ -45442,6 +45748,15 @@ let
         sha1 = "13587190f34e72ba7a07ebbaa7e70ac147b1fb7d";
       };
     };
+    "vue-2.6.11" = {
+      name = "vue";
+      packageName = "vue";
+      version = "2.6.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz";
+        sha512 = "VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==";
+      };
+    };
     "vue-cli-plugin-apollo-0.21.3" = {
       name = "vue-cli-plugin-apollo";
       packageName = "vue-cli-plugin-apollo";
@@ -45514,13 +45829,13 @@ let
         sha512 = "KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA==";
       };
     };
-    "w3c-hr-time-1.0.1" = {
+    "w3c-hr-time-1.0.2" = {
       name = "w3c-hr-time";
       packageName = "w3c-hr-time";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz";
-        sha1 = "82ac2bff63d950ea9e3189a58a65625fedf19045";
+        url = "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz";
+        sha512 = "z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==";
       };
     };
     "w3c-xmlserializer-1.1.2" = {
@@ -45631,13 +45946,13 @@ let
         sha512 = "nt/hRSlfRDTwvem//7jle1+cy62lBoxFshad8ai2Q4SlHZS00oHnrw5Dul3jSWXR+bOcnZkwnRs3tW+daNTuyA==";
       };
     };
-    "web-tree-sitter-0.15.11" = {
+    "web-tree-sitter-0.16.2" = {
       name = "web-tree-sitter";
       packageName = "web-tree-sitter";
-      version = "0.15.11";
+      version = "0.16.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.15.11.tgz";
-        sha512 = "7Sr26MV8bPPvKU+4VMpOoLYwaAFBsCsxRGtxYPSxClWIaR2KIciqg6zUeG14W9QrdlpBt7VHHzhd1CBb0e6i8w==";
+        url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.16.2.tgz";
+        sha512 = "vxZHqu4nItCARmE+oGvTgjFBrMbhEuGI9PWYSgF4ET/nLuW3K11KQQIVhAsoGtYvTI9jdbjc/THj38P7nhYwow==";
       };
     };
     "webassemblyjs-1.9.0" = {
@@ -45676,13 +45991,13 @@ let
         sha512 = "VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==";
       };
     };
-    "webpack-4.41.6" = {
+    "webpack-4.42.0" = {
       name = "webpack";
       packageName = "webpack";
-      version = "4.41.6";
+      version = "4.42.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack/-/webpack-4.41.6.tgz";
-        sha512 = "yxXfV0Zv9WMGRD+QexkZzmGIh54bsvEs+9aRWxnN8erLWEOehAKUTeNBoUbA6HPEZPlRo7KDi2ZcNveoZgK9MA==";
+        url = "https://registry.npmjs.org/webpack/-/webpack-4.42.0.tgz";
+        sha512 = "EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w==";
       };
     };
     "webpack-cli-3.3.11" = {
@@ -45748,13 +46063,13 @@ let
         sha512 = "nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==";
       };
     };
-    "websocket-stream-5.5.0" = {
+    "websocket-stream-5.5.2" = {
       name = "websocket-stream";
       packageName = "websocket-stream";
-      version = "5.5.0";
+      version = "5.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.5.0.tgz";
-        sha512 = "EXy/zXb9kNHI07TIMz1oIUIrPZxQRA8aeJ5XYg5ihV8K4kD1DuA+FY6R96HfdIHzlSzS8HiISAfrm+vVQkZBug==";
+        url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.5.2.tgz";
+        sha512 = "8z49MKIHbGk3C4HtuHWDtYX8mYej1wWabjthC/RupM9ngeukU4IWoM46dgth1UOS/T4/IqgEdCDJuMe2039OQQ==";
       };
     };
     "webtorrent-0.107.17" = {
@@ -46108,15 +46423,6 @@ let
         sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e";
       };
     };
-    "winston-2.4.0" = {
-      name = "winston";
-      packageName = "winston";
-      version = "2.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-2.4.0.tgz";
-        sha1 = "808050b93d52661ed9fb6c26b3f0c826708b0aee";
-      };
-    };
     "winston-2.4.4" = {
       name = "winston";
       packageName = "winston";
@@ -46423,6 +46729,15 @@ let
         sha512 = "sucePNSafamSKoOqoNfBd8V0StlkzJKL2ZAhGQinCfNQ+oacw+Pk7lcdAElecBF2VkLNZRiIb5Oi1Q5lVUVt2A==";
       };
     };
+    "ws-7.2.3" = {
+      name = "ws";
+      packageName = "ws";
+      version = "7.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz";
+        sha512 = "HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==";
+      };
+    };
     "x-default-browser-0.3.1" = {
       name = "x-default-browser";
       packageName = "x-default-browser";
@@ -46594,15 +46909,6 @@ let
         sha512 = "esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==";
       };
     };
-    "xml2js-0.4.22" = {
-      name = "xml2js";
-      packageName = "xml2js";
-      version = "0.4.22";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.22.tgz";
-        sha512 = "MWTbxAQqclRSTnehWWe5nMKzI3VmJ8ltiJEco8akcC6j3miOhjjfzKum5sId+CWhfxdOs/1xauYr8/ZDBtQiRw==";
-      };
-    };
     "xml2js-0.4.23" = {
       name = "xml2js";
       packageName = "xml2js";
@@ -47000,13 +47306,22 @@ let
         sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==";
       };
     };
-    "yargs-14.2.2" = {
+    "yargs-13.3.2" = {
       name = "yargs";
       packageName = "yargs";
-      version = "14.2.2";
+      version = "13.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-14.2.2.tgz";
-        sha512 = "/4ld+4VV5RnrynMhPZJ/ZpOCGSCeghMykZ3BhdFBDa9Wy/RH6uEGNWDJog+aUlq+9OM1CFTgtYRW5Is1Po9NOA==";
+        url = "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz";
+        sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==";
+      };
+    };
+    "yargs-14.2.3" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "14.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz";
+        sha512 = "ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==";
       };
     };
     "yargs-15.1.0" = {
@@ -47018,6 +47333,15 @@ let
         sha512 = "T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==";
       };
     };
+    "yargs-15.3.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "15.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-15.3.0.tgz";
+        sha512 = "g/QCnmjgOl1YJjGsnUg2SatC7NUYEiLXJqxNOQU9qSpjzGtGXda9b+OKccr1kLTy8BN9yqEyqfq5lxlwdc13TA==";
+      };
+    };
     "yargs-3.10.0" = {
       name = "yargs";
       packageName = "yargs";
@@ -47108,13 +47432,22 @@ let
         sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==";
       };
     };
-    "yargs-parser-15.0.0" = {
+    "yargs-parser-13.1.2" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
-      version = "15.0.0";
+      version = "13.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.0.tgz";
-        sha512 = "xLTUnCMc4JhxrPEPUYD5IBR1mWCK/aT6+RJ/K29JY2y1vD+FhtgKK0AXRWvI262q3QSffAQuTouFIKUuHX89wQ==";
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz";
+        sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==";
+      };
+    };
+    "yargs-parser-15.0.1" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "15.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.1.tgz";
+        sha512 = "0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==";
       };
     };
     "yargs-parser-16.1.0" = {
@@ -47126,6 +47459,15 @@ let
         sha512 = "H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg==";
       };
     };
+    "yargs-parser-18.1.0" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "18.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.0.tgz";
+        sha512 = "o/Jr6JBOv6Yx3pL+5naWSoIA2jJ+ZkMYQG/ie9qFbukBe4uzmBatlXFOiu/tNKRWEtyf+n5w7jc/O16ufqOTdQ==";
+      };
+    };
     "yargs-parser-2.4.1" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -47189,15 +47531,6 @@ let
         sha512 = "W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==";
       };
     };
-    "yarn-1.21.1" = {
-      name = "yarn";
-      packageName = "yarn";
-      version = "1.21.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yarn/-/yarn-1.21.1.tgz";
-        sha512 = "dQgmJv676X/NQczpbiDtc2hsE/pppGDJAzwlRiADMTvFzYbdxPj2WO4PcNyriSt2c4jsCMpt8UFRKHUozt21GQ==";
-      };
-    };
     "yarn-1.22.0" = {
       name = "yarn";
       packageName = "yarn";
@@ -47207,6 +47540,15 @@ let
         sha512 = "KMHP/Jq53jZKTY9iTUt3dIVl/be6UPs2INo96+BnZHLKxYNTfwMmlgHTaMWyGZoO74RI4AIFvnWhYrXq2USJkg==";
       };
     };
+    "yarn-1.22.4" = {
+      name = "yarn";
+      packageName = "yarn";
+      version = "1.22.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yarn/-/yarn-1.22.4.tgz";
+        sha512 = "oYM7hi/lIWm9bCoDMEWgffW8aiNZXCWeZ1/tGy0DWrN6vmzjCXIKu2Y21o8DYVBUtiktwKcNoxyGl/2iKLUNGA==";
+      };
+    };
     "yauzl-2.10.0" = {
       name = "yauzl";
       packageName = "yauzl";
@@ -47261,13 +47603,13 @@ let
         sha512 = "CP0fwGk5Y+jel+A0AQbyqnIFZRRpkKOeYUibiTSmlgV9PcgNFFVwn86VcUIpDLOqVjF+9v+O9FWQMo+IUcV2mA==";
       };
     };
-    "yeoman-environment-2.8.0" = {
+    "yeoman-environment-2.8.1" = {
       name = "yeoman-environment";
       packageName = "yeoman-environment";
-      version = "2.8.0";
+      version = "2.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.8.0.tgz";
-        sha512 = "BbJeEna23Qx90fBiJt1awcZ9okfPY/rP3xZYsk1rD3x8LuQgpo4BfegPvQT1sqqh2+gYVZmYZMv5pS8+Muyr9Q==";
+        url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.8.1.tgz";
+        sha512 = "MV6yeJfnSsZBv/VuWvw82bN6hF6KIXRUwhEPaO+RHJAWeNCQAF+iYfBNsJOo4tx5Puch300h+DF9QZceKkbzQg==";
       };
     };
     "yn-3.1.1" = {
@@ -47279,6 +47621,15 @@ let
         sha512 = "Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==";
       };
     };
+    "yoga-layout-prebuilt-1.9.3" = {
+      name = "yoga-layout-prebuilt";
+      packageName = "yoga-layout-prebuilt";
+      version = "1.9.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yoga-layout-prebuilt/-/yoga-layout-prebuilt-1.9.3.tgz";
+        sha512 = "9SNQpwuEh2NucU83i2KMZnONVudZ86YNcFk9tq74YaqrQfgJWO3yB9uzH1tAg8iqh5c9F5j0wuyJ2z72wcum2w==";
+      };
+    };
     "yosay-2.0.2" = {
       name = "yosay";
       packageName = "yosay";
@@ -47384,17 +47735,17 @@ in
   "@angular/cli" = nodeEnv.buildNodePackage {
     name = "_at_angular_slash_cli";
     packageName = "@angular/cli";
-    version = "9.0.3";
+    version = "9.0.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@angular/cli/-/cli-9.0.3.tgz";
-      sha512 = "DYa2k6ihYmvfKgv2SE/OqP76D8EEHkIFcJ3ZgVdnxEyCmUXUD4zqOVDzDIK794BdditLF88g4Mezz142bn6XUA==";
+      url = "https://registry.npmjs.org/@angular/cli/-/cli-9.0.6.tgz";
+      sha512 = "uDXhkPcHhE4G4FlY7+LJWhXErHnkn63V8lqkKD7juivs+Epmx8oXCOVObEQTbbtw7sF6s0dM8uTzHKgoefTlaA==";
     };
     dependencies = [
-      sources."@angular-devkit/architect-0.900.3"
-      sources."@angular-devkit/core-9.0.3"
-      sources."@angular-devkit/schematics-9.0.3"
-      sources."@schematics/angular-9.0.3"
-      (sources."@schematics/update-0.900.3" // {
+      sources."@angular-devkit/architect-0.900.6"
+      sources."@angular-devkit/core-9.0.6"
+      sources."@angular-devkit/schematics-9.0.6"
+      sources."@schematics/angular-9.0.6"
+      (sources."@schematics/update-0.900.6" // {
         dependencies = [
           (sources."npm-package-arg-7.0.0" // {
             dependencies = [
@@ -47409,7 +47760,7 @@ in
       sources."agentkeepalive-3.5.2"
       sources."ajv-6.10.2"
       sources."ansi-colors-4.1.1"
-      sources."ansi-escapes-4.3.0"
+      sources."ansi-escapes-4.3.1"
       sources."ansi-regex-4.1.0"
       sources."ansi-styles-3.2.1"
       sources."aproba-1.2.0"
@@ -47493,7 +47844,7 @@ in
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
       sources."has-symbols-1.0.1"
-      sources."hosted-git-info-3.0.3"
+      sources."hosted-git-info-3.0.4"
       sources."http-cache-semantics-3.8.1"
       (sources."http-proxy-agent-2.1.0" // {
         dependencies = [
@@ -47558,10 +47909,10 @@ in
       })
       sources."ms-2.1.2"
       sources."mute-stream-0.0.8"
-      sources."node-fetch-npm-2.0.2"
+      sources."node-fetch-npm-2.0.3"
       (sources."normalize-package-data-2.5.0" // {
         dependencies = [
-          sources."hosted-git-info-2.8.6"
+          sources."hosted-git-info-2.8.8"
           sources."semver-5.7.1"
         ];
       })
@@ -47569,7 +47920,7 @@ in
       sources."npm-normalize-package-bin-1.0.1"
       (sources."npm-package-arg-6.1.1" // {
         dependencies = [
-          sources."hosted-git-info-2.8.6"
+          sources."hosted-git-info-2.8.8"
           sources."semver-5.7.1"
         ];
       })
@@ -47628,7 +47979,7 @@ in
       sources."restore-cursor-3.1.0"
       sources."retry-0.10.1"
       sources."rimraf-3.0.0"
-      sources."run-async-2.3.0"
+      sources."run-async-2.4.0"
       sources."run-queue-1.0.3"
       sources."rxjs-6.5.3"
       sources."safe-buffer-5.2.0"
@@ -47678,10 +48029,10 @@ in
       sources."through2-2.0.5"
       sources."tmp-0.0.33"
       sources."tough-cookie-2.5.0"
-      sources."tslib-1.11.0"
+      sources."tslib-1.11.1"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."type-fest-0.8.1"
+      sources."type-fest-0.11.0"
       sources."typedarray-0.0.6"
       sources."unique-filename-1.1.1"
       sources."unique-slug-2.0.2"
@@ -47741,7 +48092,7 @@ in
       sources."json5-2.1.1"
       sources."lodash.clonedeep-4.5.0"
       sources."map-obj-4.1.0"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."moment-2.24.0"
       sources."quick-lru-4.0.1"
       sources."sprintf-js-1.0.3"
@@ -47788,7 +48139,7 @@ in
       sources."async-lock-1.2.2"
       sources."balanced-match-1.0.0"
       sources."base64-js-0.0.2"
-      sources."bl-4.0.0"
+      sources."bl-4.0.1"
       sources."bops-0.0.7"
       sources."brace-expansion-1.1.11"
       sources."buffer-crc32-0.2.13"
@@ -47909,7 +48260,7 @@ in
       })
       sources."handlebars-4.5.3"
       sources."has-symbols-1.0.1"
-      sources."http-cache-semantics-4.0.4"
+      sources."http-cache-semantics-4.1.0"
       sources."ignore-5.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -47951,7 +48302,7 @@ in
       sources."mimic-response-2.1.0"
       sources."minimatch-3.0.4"
       sources."minimatch-all-1.1.0"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."minimisted-2.0.0"
       sources."moment-2.24.0"
       sources."multi-progress-2.0.0"
@@ -48084,17 +48435,17 @@ in
   "@bitwarden/cli" = nodeEnv.buildNodePackage {
     name = "_at_bitwarden_slash_cli";
     packageName = "@bitwarden/cli";
-    version = "1.8.0";
+    version = "1.9.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.8.0.tgz";
-      sha512 = "w0galFGHK7Ea9nVQs3+ct+qTiPqR9PXQEL2kxIEwjDIyKjGY104+twWpLiSOMih2NAS2kuf3egekdEKs8xR8wQ==";
+      url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.9.1.tgz";
+      sha512 = "M/6JQyL9s0xVFhRNTdSShifja5ZTDtgjyR3byAg0/KiIjmrCdTonl3CM85JcJtjJVqnsbJLhU4kOxL/XA458Wg==";
     };
     dependencies = [
       sources."abab-2.0.3"
-      sources."acorn-6.4.0"
+      sources."acorn-6.4.1"
       sources."acorn-globals-4.3.4"
       sources."acorn-walk-6.2.0"
-      sources."agent-base-4.3.0"
+      sources."agent-base-5.1.1"
       sources."ajv-6.12.0"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-3.0.0"
@@ -48108,7 +48459,7 @@ in
       sources."aws4-1.9.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."big-integer-1.6.36"
-      sources."browser-process-hrtime-0.1.3"
+      sources."browser-process-hrtime-1.0.0"
       sources."caseless-0.12.0"
       sources."chalk-2.4.1"
       sources."chardet-0.7.0"
@@ -48123,13 +48474,11 @@ in
       sources."cssstyle-1.4.0"
       sources."dashdash-1.14.1"
       sources."data-urls-1.1.0"
-      sources."debug-3.2.6"
+      sources."debug-4.1.1"
       sources."deep-is-0.1.3"
       sources."delayed-stream-1.0.0"
       sources."domexception-1.0.1"
       sources."ecc-jsbn-0.1.2"
-      sources."es6-promise-4.2.8"
-      sources."es6-promisify-5.0.0"
       sources."escape-string-regexp-1.0.5"
       sources."escodegen-1.14.1"
       sources."esprima-4.0.1"
@@ -48151,7 +48500,7 @@ in
       sources."has-flag-3.0.0"
       sources."html-encoding-sniffer-1.0.2"
       sources."http-signature-1.2.0"
-      sources."https-proxy-agent-2.2.1"
+      sources."https-proxy-agent-4.0.0"
       sources."iconv-lite-0.4.24"
       sources."inquirer-6.2.0"
       sources."is-fullwidth-code-point-2.0.0"
@@ -48194,7 +48543,7 @@ in
       sources."request-promise-core-1.1.3"
       sources."request-promise-native-1.0.8"
       sources."restore-cursor-2.0.0"
-      sources."run-async-2.3.0"
+      sources."run-async-2.4.0"
       sources."rxjs-6.5.4"
       sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
@@ -48217,14 +48566,14 @@ in
       sources."tmp-0.0.33"
       sources."tough-cookie-2.5.0"
       sources."tr46-1.0.1"
-      sources."tslib-1.11.0"
+      sources."tslib-1.11.1"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
       sources."uri-js-4.2.2"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
-      sources."w3c-hr-time-1.0.1"
+      sources."w3c-hr-time-1.0.2"
       sources."w3c-xmlserializer-1.1.2"
       sources."webidl-conversions-4.0.2"
       sources."whatwg-encoding-1.0.5"
@@ -48249,48 +48598,53 @@ in
   "@vue/cli" = nodeEnv.buildNodePackage {
     name = "_at_vue_slash_cli";
     packageName = "@vue/cli";
-    version = "4.2.2";
+    version = "4.2.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@vue/cli/-/cli-4.2.2.tgz";
-      sha512 = "9HNfmFG3WYcQVE5+bBOf+zDlMLk6cBwpXZYjqLZXBWWRxOcpRdCzXcJMoLQqJrMbpLnrD2QMkgncPNCZELqT5Q==";
+      url = "https://registry.npmjs.org/@vue/cli/-/cli-4.2.3.tgz";
+      sha512 = "kZcbYECSlTIAyrQ1v5zYz3NXmMe+poxUOf5PW8wj7Gp1265rrOeEh6z1FsB1gbJ/AVGvCtVuat7PF1odgE2FZQ==";
     };
     dependencies = [
       sources."@akryum/winattr-3.0.0"
-      sources."@apollo/federation-0.12.1"
+      sources."@apollo/federation-0.13.2"
       (sources."@apollo/protobufjs-1.0.3" // {
         dependencies = [
-          sources."@types/node-10.17.16"
+          sources."@types/node-10.17.17"
         ];
       })
-      sources."@apollographql/apollo-tools-0.4.3"
+      sources."@apollographql/apollo-tools-0.4.4"
       sources."@apollographql/graphql-language-service-interface-2.0.2"
       sources."@apollographql/graphql-language-service-parser-2.0.2"
       sources."@apollographql/graphql-language-service-types-2.0.2"
       sources."@apollographql/graphql-language-service-utils-2.0.2"
       sources."@apollographql/graphql-playground-html-1.6.24"
       sources."@babel/code-frame-7.8.3"
-      (sources."@babel/compat-data-7.8.5" // {
+      (sources."@babel/compat-data-7.8.6" // {
         dependencies = [
           sources."semver-5.7.1"
         ];
       })
-      (sources."@babel/core-7.8.4" // {
+      (sources."@babel/core-7.8.7" // {
         dependencies = [
-          sources."@babel/generator-7.8.4"
+          sources."@babel/generator-7.8.8"
+          sources."@babel/types-7.8.7"
           sources."semver-5.7.1"
         ];
       })
-      sources."@babel/generator-7.8.3"
+      sources."@babel/generator-7.8.6"
       sources."@babel/helper-annotate-as-pure-7.8.3"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3"
-      sources."@babel/helper-call-delegate-7.8.3"
-      (sources."@babel/helper-compilation-targets-7.8.4" // {
+      (sources."@babel/helper-call-delegate-7.8.7" // {
+        dependencies = [
+          sources."@babel/types-7.8.7"
+        ];
+      })
+      (sources."@babel/helper-compilation-targets-7.8.7" // {
         dependencies = [
           sources."semver-5.7.1"
         ];
       })
-      sources."@babel/helper-create-class-features-plugin-7.8.3"
-      sources."@babel/helper-create-regexp-features-plugin-7.8.3"
+      sources."@babel/helper-create-class-features-plugin-7.8.6"
+      sources."@babel/helper-create-regexp-features-plugin-7.8.8"
       sources."@babel/helper-define-map-7.8.3"
       sources."@babel/helper-explode-assignable-expression-7.8.3"
       sources."@babel/helper-function-name-7.8.3"
@@ -48298,18 +48652,18 @@ in
       sources."@babel/helper-hoist-variables-7.8.3"
       sources."@babel/helper-member-expression-to-functions-7.8.3"
       sources."@babel/helper-module-imports-7.8.3"
-      sources."@babel/helper-module-transforms-7.8.3"
+      sources."@babel/helper-module-transforms-7.8.6"
       sources."@babel/helper-optimise-call-expression-7.8.3"
       sources."@babel/helper-plugin-utils-7.8.3"
       sources."@babel/helper-regex-7.8.3"
       sources."@babel/helper-remap-async-to-generator-7.8.3"
-      sources."@babel/helper-replace-supers-7.8.3"
+      sources."@babel/helper-replace-supers-7.8.6"
       sources."@babel/helper-simple-access-7.8.3"
       sources."@babel/helper-split-export-declaration-7.8.3"
       sources."@babel/helper-wrap-function-7.8.3"
       sources."@babel/helpers-7.8.4"
       sources."@babel/highlight-7.8.3"
-      sources."@babel/parser-7.8.4"
+      sources."@babel/parser-7.8.8"
       sources."@babel/plugin-proposal-async-generator-functions-7.8.3"
       sources."@babel/plugin-proposal-class-properties-7.8.3"
       sources."@babel/plugin-proposal-dynamic-import-7.8.3"
@@ -48318,7 +48672,7 @@ in
       sources."@babel/plugin-proposal-object-rest-spread-7.8.3"
       sources."@babel/plugin-proposal-optional-catch-binding-7.8.3"
       sources."@babel/plugin-proposal-optional-chaining-7.8.3"
-      sources."@babel/plugin-proposal-unicode-property-regex-7.8.3"
+      sources."@babel/plugin-proposal-unicode-property-regex-7.8.8"
       sources."@babel/plugin-syntax-async-generators-7.8.4"
       sources."@babel/plugin-syntax-dynamic-import-7.8.3"
       sources."@babel/plugin-syntax-flow-7.8.3"
@@ -48333,14 +48687,14 @@ in
       sources."@babel/plugin-transform-async-to-generator-7.8.3"
       sources."@babel/plugin-transform-block-scoped-functions-7.8.3"
       sources."@babel/plugin-transform-block-scoping-7.8.3"
-      sources."@babel/plugin-transform-classes-7.8.3"
+      sources."@babel/plugin-transform-classes-7.8.6"
       sources."@babel/plugin-transform-computed-properties-7.8.3"
-      sources."@babel/plugin-transform-destructuring-7.8.3"
+      sources."@babel/plugin-transform-destructuring-7.8.8"
       sources."@babel/plugin-transform-dotall-regex-7.8.3"
       sources."@babel/plugin-transform-duplicate-keys-7.8.3"
       sources."@babel/plugin-transform-exponentiation-operator-7.8.3"
       sources."@babel/plugin-transform-flow-strip-types-7.8.3"
-      sources."@babel/plugin-transform-for-of-7.8.4"
+      sources."@babel/plugin-transform-for-of-7.8.6"
       sources."@babel/plugin-transform-function-name-7.8.3"
       sources."@babel/plugin-transform-literals-7.8.3"
       sources."@babel/plugin-transform-member-expression-literals-7.8.3"
@@ -48351,43 +48705,40 @@ in
       sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3"
       sources."@babel/plugin-transform-new-target-7.8.3"
       sources."@babel/plugin-transform-object-super-7.8.3"
-      sources."@babel/plugin-transform-parameters-7.8.4"
+      sources."@babel/plugin-transform-parameters-7.8.8"
       sources."@babel/plugin-transform-property-literals-7.8.3"
-      sources."@babel/plugin-transform-regenerator-7.8.3"
+      sources."@babel/plugin-transform-regenerator-7.8.7"
       sources."@babel/plugin-transform-reserved-words-7.8.3"
       sources."@babel/plugin-transform-shorthand-properties-7.8.3"
       sources."@babel/plugin-transform-spread-7.8.3"
       sources."@babel/plugin-transform-sticky-regex-7.8.3"
       sources."@babel/plugin-transform-template-literals-7.8.3"
       sources."@babel/plugin-transform-typeof-symbol-7.8.4"
-      sources."@babel/plugin-transform-typescript-7.8.3"
+      sources."@babel/plugin-transform-typescript-7.8.7"
       sources."@babel/plugin-transform-unicode-regex-7.8.3"
-      (sources."@babel/preset-env-7.8.4" // {
+      (sources."@babel/preset-env-7.8.7" // {
         dependencies = [
+          sources."@babel/types-7.8.7"
           sources."semver-5.7.1"
         ];
       })
       sources."@babel/preset-flow-7.8.3"
       sources."@babel/preset-typescript-7.8.3"
-      (sources."@babel/register-7.8.3" // {
+      (sources."@babel/register-7.8.6" // {
         dependencies = [
           sources."make-dir-2.1.0"
           sources."pify-4.0.1"
           sources."semver-5.7.1"
         ];
       })
-      (sources."@babel/runtime-7.8.4" // {
+      (sources."@babel/runtime-7.8.7" // {
         dependencies = [
-          sources."regenerator-runtime-0.13.4"
+          sources."regenerator-runtime-0.13.5"
         ];
       })
-      sources."@babel/template-7.8.3"
-      (sources."@babel/traverse-7.8.4" // {
-        dependencies = [
-          sources."@babel/generator-7.8.4"
-        ];
-      })
-      sources."@babel/types-7.8.3"
+      sources."@babel/template-7.8.6"
+      sources."@babel/traverse-7.8.6"
+      sources."@babel/types-7.8.6"
       sources."@endemolshinegroup/cosmiconfig-typescript-loader-1.0.1"
       sources."@hapi/address-2.1.4"
       sources."@hapi/bourne-1.3.2"
@@ -48414,9 +48765,17 @@ in
       sources."@oclif/parser-3.8.4"
       (sources."@oclif/plugin-autocomplete-0.1.5" // {
         dependencies = [
+          (sources."cli-ux-4.9.3" // {
+            dependencies = [
+              sources."fs-extra-7.0.1"
+            ];
+          })
           sources."debug-3.2.6"
           sources."fs-extra-6.0.1"
+          sources."indent-string-3.2.0"
           sources."ms-2.1.2"
+          sources."semver-5.7.1"
+          sources."strip-ansi-5.2.0"
         ];
       })
       (sources."@oclif/plugin-help-2.2.3" // {
@@ -48425,15 +48784,19 @@ in
           sources."strip-ansi-5.2.0"
         ];
       })
-      sources."@oclif/plugin-not-found-1.2.3"
+      (sources."@oclif/plugin-not-found-1.2.3" // {
+        dependencies = [
+          sources."cli-ux-4.9.3"
+          sources."indent-string-3.2.0"
+          sources."semver-5.7.1"
+          sources."strip-ansi-5.2.0"
+        ];
+      })
       (sources."@oclif/plugin-plugins-1.7.9" // {
         dependencies = [
-          sources."cli-ux-5.4.4"
           sources."npm-run-path-3.1.0"
           sources."path-key-3.1.1"
           sources."semver-5.7.1"
-          sources."string-width-3.1.0"
-          sources."strip-ansi-5.2.0"
         ];
       })
       (sources."@oclif/plugin-warn-if-update-available-1.7.0" // {
@@ -48454,7 +48817,7 @@ in
       sources."@protobufjs/utf8-1.1.0"
       sources."@samverschueren/stream-to-observable-0.3.0"
       sources."@types/accepts-1.3.5"
-      sources."@types/body-parser-1.17.1"
+      sources."@types/body-parser-1.19.0"
       sources."@types/color-name-1.1.1"
       sources."@types/connect-3.4.33"
       sources."@types/cookies-0.7.4"
@@ -48472,21 +48835,25 @@ in
       sources."@types/long-4.0.1"
       sources."@types/mime-2.0.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.5"
-      sources."@types/node-fetch-2.5.4"
+      sources."@types/node-13.9.1"
+      (sources."@types/node-fetch-2.5.5" // {
+        dependencies = [
+          sources."form-data-3.0.0"
+        ];
+      })
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/range-parser-1.2.3"
       sources."@types/serve-static-1.13.3"
       sources."@types/ws-6.0.4"
       sources."@types/zen-observable-0.8.0"
-      sources."@vue/cli-shared-utils-4.2.2"
-      (sources."@vue/cli-ui-4.2.2" // {
+      sources."@vue/cli-shared-utils-4.2.3"
+      (sources."@vue/cli-ui-4.2.3" // {
         dependencies = [
           sources."clone-2.1.2"
         ];
       })
-      sources."@vue/cli-ui-addon-webpack-4.2.2"
-      sources."@vue/cli-ui-addon-widgets-4.2.2"
+      sources."@vue/cli-ui-addon-webpack-4.2.3"
+      sources."@vue/cli-ui-addon-widgets-4.2.3"
       sources."@wry/context-0.4.4"
       sources."@wry/equality-0.1.9"
       sources."abbrev-1.1.1"
@@ -48504,28 +48871,27 @@ in
           sources."normalize-path-2.1.1"
         ];
       })
-      (sources."apollo-2.23.0" // {
+      (sources."apollo-2.25.0" // {
         dependencies = [
-          sources."graphql-tag-2.10.1"
           sources."mkdirp-1.0.3"
           sources."strip-ansi-5.2.0"
         ];
       })
       sources."apollo-cache-1.3.4"
-      sources."apollo-cache-control-0.8.11"
+      sources."apollo-cache-control-0.9.0"
       sources."apollo-cache-inmemory-1.6.5"
       sources."apollo-client-2.6.8"
-      sources."apollo-codegen-core-0.36.2"
-      sources."apollo-codegen-flow-0.34.2"
-      sources."apollo-codegen-scala-0.35.2"
-      sources."apollo-codegen-swift-0.36.2"
-      sources."apollo-codegen-typescript-0.36.2"
+      sources."apollo-codegen-core-0.36.4"
+      sources."apollo-codegen-flow-0.34.4"
+      sources."apollo-codegen-scala-0.35.4"
+      sources."apollo-codegen-swift-0.36.4"
+      sources."apollo-codegen-typescript-0.36.4"
       sources."apollo-datasource-0.7.0"
-      sources."apollo-engine-reporting-1.6.0"
+      sources."apollo-engine-reporting-1.7.0"
       sources."apollo-engine-reporting-protobuf-0.4.4"
-      sources."apollo-env-0.6.1"
-      sources."apollo-graphql-0.4.0"
-      sources."apollo-language-server-1.19.2"
+      sources."apollo-env-0.6.2"
+      sources."apollo-graphql-0.4.1"
+      sources."apollo-language-server-1.20.1"
       sources."apollo-link-1.2.13"
       sources."apollo-link-context-1.0.19"
       sources."apollo-link-error-1.1.12"
@@ -48535,13 +48901,13 @@ in
       sources."apollo-link-state-0.4.2"
       sources."apollo-link-ws-1.0.19"
       sources."apollo-server-caching-0.5.1"
-      sources."apollo-server-core-2.10.1"
+      sources."apollo-server-core-2.11.0"
       sources."apollo-server-env-2.4.3"
-      sources."apollo-server-errors-2.3.4"
-      sources."apollo-server-express-2.10.1"
-      sources."apollo-server-plugin-base-0.6.10"
-      sources."apollo-server-types-0.2.10"
-      sources."apollo-tracing-0.8.11"
+      sources."apollo-server-errors-2.4.0"
+      sources."apollo-server-express-2.11.0"
+      sources."apollo-server-plugin-base-0.7.0"
+      sources."apollo-server-types-0.3.0"
+      sources."apollo-tracing-0.9.0"
       sources."apollo-upload-client-11.0.0"
       sources."apollo-utilities-1.3.3"
       sources."arg-4.1.3"
@@ -48633,8 +48999,8 @@ in
       })
       sources."brace-expansion-1.1.11"
       sources."braces-2.3.2"
-      sources."browserslist-4.8.7"
-      sources."buffer-5.4.3"
+      sources."browserslist-4.9.1"
+      sources."buffer-5.5.0"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
@@ -48651,7 +49017,7 @@ in
       sources."callsites-2.0.0"
       sources."camel-case-3.0.0"
       sources."camelcase-4.1.0"
-      sources."caniuse-lite-1.0.30001030"
+      sources."caniuse-lite-1.0.30001035"
       sources."capture-stack-trace-1.0.1"
       sources."cardinal-2.1.1"
       sources."caseless-0.12.0"
@@ -48682,7 +49048,6 @@ in
       sources."clean-stack-2.2.0"
       sources."cli-boxes-1.0.0"
       sources."cli-cursor-2.1.0"
-      sources."cli-progress-3.6.0"
       sources."cli-spinners-2.2.0"
       (sources."cli-truncate-0.2.1" // {
         dependencies = [
@@ -48692,15 +49057,16 @@ in
           sources."strip-ansi-3.0.1"
         ];
       })
-      (sources."cli-ux-4.9.3" // {
+      (sources."cli-ux-5.2.1" // {
         dependencies = [
           sources."indent-string-3.2.0"
           sources."semver-5.7.1"
+          sources."string-width-3.1.0"
           sources."strip-ansi-5.2.0"
         ];
       })
       sources."cli-width-2.2.0"
-      sources."clipboard-2.0.4"
+      sources."clipboard-2.0.6"
       sources."clone-1.0.4"
       sources."cmd-shim-3.0.3"
       sources."code-point-at-1.1.0"
@@ -48794,7 +49160,6 @@ in
       sources."destroy-1.0.4"
       sources."detect-indent-6.0.0"
       sources."dicer-0.3.0"
-      sources."didyoumean-1.2.1"
       sources."diff-4.0.2"
       sources."dir-glob-2.2.2"
       sources."dom-serializer-0.1.1"
@@ -48816,7 +49181,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.3.360"
+      sources."electron-to-chromium-1.3.376"
       sources."elegant-spinner-1.0.1"
       sources."emoji-regex-7.0.3"
       sources."encodeurl-1.0.2"
@@ -48900,7 +49265,7 @@ in
       })
       sources."find-up-3.0.0"
       sources."fkill-6.2.0"
-      sources."flow-parser-0.119.1"
+      sources."flow-parser-0.120.1"
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
@@ -48931,9 +49296,9 @@ in
           sources."util.promisify-1.0.0"
         ];
       })
-      (sources."git-rev-sync-1.12.0" // {
+      (sources."git-rev-sync-2.0.0" // {
         dependencies = [
-          sources."graceful-fs-4.1.11"
+          sources."graceful-fs-4.1.15"
         ];
       })
       sources."glob-7.1.5"
@@ -48966,7 +49331,7 @@ in
           sources."ts-invariant-0.3.3"
         ];
       })
-      sources."graphql-extensions-0.10.10"
+      sources."graphql-extensions-0.11.0"
       sources."graphql-subscriptions-1.1.0"
       sources."graphql-tag-2.10.3"
       sources."graphql-tools-4.0.7"
@@ -48995,7 +49360,7 @@ in
       sources."he-1.2.0"
       sources."header-case-1.0.1"
       sources."homedir-polyfill-1.0.3"
-      sources."hosted-git-info-2.8.6"
+      sources."hosted-git-info-2.8.8"
       (sources."htmlparser2-3.10.1" // {
         dependencies = [
           sources."readable-stream-3.6.0"
@@ -49181,7 +49546,7 @@ in
       sources."mimic-fn-1.2.0"
       sources."minimalistic-assert-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       (sources."mixin-deep-1.3.2" // {
         dependencies = [
           sources."is-extendable-1.0.1"
@@ -49223,7 +49588,7 @@ in
           sources."is-wsl-2.1.1"
         ];
       })
-      sources."node-releases-1.1.50"
+      sources."node-releases-1.1.52"
       (sources."nodemon-1.19.4" // {
         dependencies = [
           sources."debug-3.2.6"
@@ -49362,20 +49727,20 @@ in
       sources."rechoir-0.6.2"
       sources."redeyed-2.1.1"
       sources."regenerate-1.4.0"
-      sources."regenerate-unicode-properties-8.1.0"
+      sources."regenerate-unicode-properties-8.2.0"
       sources."regenerator-runtime-0.10.5"
-      sources."regenerator-transform-0.14.2"
+      sources."regenerator-transform-0.14.3"
       (sources."regex-not-1.0.2" // {
         dependencies = [
           sources."extend-shallow-3.0.2"
           sources."is-extendable-1.0.1"
         ];
       })
-      sources."regexpu-core-4.6.0"
+      sources."regexpu-core-4.7.0"
       sources."registry-auth-token-3.4.0"
       sources."registry-url-3.1.0"
       sources."regjsgen-0.5.1"
-      (sources."regjsparser-0.6.3" // {
+      (sources."regjsparser-0.6.4" // {
         dependencies = [
           sources."jsesc-0.5.0"
         ];
@@ -49394,7 +49759,7 @@ in
       sources."retry-0.12.0"
       sources."rimraf-2.7.1"
       sources."rss-parser-3.7.5"
-      sources."run-async-2.3.0"
+      sources."run-async-2.4.0"
       sources."rxjs-6.5.4"
       sources."safe-buffer-5.2.0"
       sources."safe-regex-1.1.0"
@@ -49613,8 +49978,8 @@ in
       sources."treeify-1.1.0"
       sources."trim-repeated-1.0.0"
       sources."ts-invariant-0.4.4"
-      sources."ts-node-8.6.2"
-      sources."tslib-1.11.0"
+      sources."ts-node-8.7.0"
+      sources."tslib-1.11.1"
       sources."tty-1.0.1"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
@@ -49629,8 +49994,8 @@ in
       })
       sources."unicode-canonical-property-names-ecmascript-1.0.4"
       sources."unicode-match-property-ecmascript-1.0.4"
-      sources."unicode-match-property-value-ecmascript-1.1.0"
-      sources."unicode-property-aliases-ecmascript-1.0.5"
+      sources."unicode-match-property-value-ecmascript-1.2.0"
+      sources."unicode-property-aliases-ecmascript-1.1.0"
       sources."union-value-1.0.1"
       sources."unique-string-1.0.0"
       sources."universalify-0.1.2"
@@ -49672,6 +50037,7 @@ in
       sources."vscode-languageserver-protocol-3.14.1"
       sources."vscode-languageserver-types-3.14.0"
       sources."vscode-uri-1.0.6"
+      sources."vue-2.6.11"
       (sources."vue-cli-plugin-apollo-0.21.3" // {
         dependencies = [
           sources."cross-spawn-7.0.1"
@@ -49719,7 +50085,7 @@ in
           sources."commander-1.0.0"
         ];
       })
-      sources."yarn-1.22.0"
+      sources."yarn-1.22.4"
       sources."yauzl-2.10.0"
       sources."yn-3.1.1"
       sources."zen-observable-0.8.15"
@@ -49860,11 +50226,11 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.8.3"
-      sources."@babel/generator-7.8.4"
+      sources."@babel/generator-7.8.8"
       sources."@babel/highlight-7.8.3"
-      sources."@babel/parser-7.8.4"
-      sources."@babel/template-7.8.3"
-      sources."@babel/types-7.8.3"
+      sources."@babel/parser-7.8.8"
+      sources."@babel/template-7.8.6"
+      sources."@babel/types-7.8.7"
       sources."@webassemblyjs/ast-1.9.0"
       sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
       sources."@webassemblyjs/helper-api-error-1.9.0"
@@ -49945,12 +50311,12 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.8.3"
-      (sources."@babel/core-7.8.4" // {
+      (sources."@babel/core-7.8.7" // {
         dependencies = [
           sources."source-map-0.5.7"
         ];
       })
-      (sources."@babel/generator-7.8.4" // {
+      (sources."@babel/generator-7.8.8" // {
         dependencies = [
           sources."source-map-0.5.7"
         ];
@@ -49960,10 +50326,10 @@ in
       sources."@babel/helper-split-export-declaration-7.8.3"
       sources."@babel/helpers-7.8.4"
       sources."@babel/highlight-7.8.3"
-      sources."@babel/parser-7.8.4"
-      sources."@babel/template-7.8.3"
-      sources."@babel/traverse-7.8.4"
-      sources."@babel/types-7.8.3"
+      sources."@babel/parser-7.8.8"
+      sources."@babel/template-7.8.6"
+      sources."@babel/traverse-7.8.6"
+      sources."@babel/types-7.8.7"
       sources."JSV-4.0.2"
       sources."ansi-styles-3.2.1"
       sources."array-unique-0.3.2"
@@ -50015,7 +50381,7 @@ in
       sources."lodash-4.17.15"
       sources."matcher-collection-1.1.2"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."moment-2.20.1"
       sources."ms-2.1.2"
       sources."node.extend-2.0.2"
@@ -50057,35 +50423,28 @@ in
   asar = nodeEnv.buildNodePackage {
     name = "asar";
     packageName = "asar";
-    version = "2.1.0";
+    version = "3.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/asar/-/asar-2.1.0.tgz";
-      sha512 = "d2Ovma+bfqNpvBzY/KU8oPY67ZworixTpkjSx0PCXnQi67c2cXmssaTxpFDUM0ttopXoGx/KRxNg/GDThYbXQA==";
+      url = "https://registry.npmjs.org/asar/-/asar-3.0.1.tgz";
+      sha512 = "43sVUKSX0VLNfavair0OLzPoVX5rRdqAxcUUhtwKLGkKQPs2ePreOG7zpp3gZOLvZGhZxixD9JZBxWKgqH8r1g==";
     };
     dependencies = [
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.5"
+      sources."@types/node-13.9.1"
       sources."balanced-match-1.0.0"
-      sources."bluebird-3.7.2"
       sources."brace-expansion-1.1.11"
       sources."chromium-pickle-js-0.2.0"
-      sources."commander-2.20.3"
+      sources."commander-4.1.1"
       sources."concat-map-0.0.1"
-      sources."cuint-0.2.2"
       sources."fs.realpath-1.0.0"
       sources."glob-7.1.6"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
-      sources."rimraf-2.7.1"
-      sources."tmp-0.1.0"
-      sources."tmp-promise-1.1.0"
       sources."wrappy-1.0.2"
     ];
     buildInputs = globalBuildInputs;
@@ -50101,17 +50460,17 @@ in
   bash-language-server = nodeEnv.buildNodePackage {
     name = "bash-language-server";
     packageName = "bash-language-server";
-    version = "1.7.0";
+    version = "1.11.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-1.7.0.tgz";
-      sha512 = "7LoZPq2jYPov87LDnoYY5/3KdwTjjUQbQAim9zvRvjV2DI6sku5CKLGmoqaivOyx0Ah8mUWwnvHg/1R+H5N9qg==";
+      url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-1.11.1.tgz";
+      sha512 = "1fF8RVa/y3yKvMAeorLbapFtRQx85c51V2P+P25U6Cl6HyDzh1IezgmdW6Rau4jg2hDWVN1hCpce36UGjCGE2g==";
     };
     dependencies = [
       sources."abab-2.0.3"
-      sources."acorn-5.7.3"
+      sources."acorn-5.7.4"
       (sources."acorn-globals-4.3.4" // {
         dependencies = [
-          sources."acorn-6.4.0"
+          sources."acorn-6.4.1"
         ];
       })
       sources."acorn-walk-6.2.0"
@@ -50126,7 +50485,7 @@ in
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
       sources."brace-expansion-1.1.11"
-      sources."browser-process-hrtime-0.1.3"
+      sources."browser-process-hrtime-1.0.0"
       sources."caseless-0.12.0"
       sources."combined-stream-1.0.8"
       sources."concat-map-0.0.1"
@@ -50155,6 +50514,7 @@ in
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
       sources."fs.realpath-1.0.0"
+      sources."fuzzy-search-3.2.1"
       sources."getpass-0.1.7"
       sources."glob-7.1.6"
       sources."har-schema-2.0.0"
@@ -50216,8 +50576,8 @@ in
       sources."vscode-languageserver-protocol-3.14.1"
       sources."vscode-languageserver-types-3.14.0"
       sources."vscode-uri-1.0.8"
-      sources."w3c-hr-time-1.0.1"
-      sources."web-tree-sitter-0.15.11"
+      sources."w3c-hr-time-1.0.2"
+      sources."web-tree-sitter-0.16.2"
       sources."webidl-conversions-4.0.2"
       sources."whatwg-encoding-1.0.5"
       sources."whatwg-mimetype-2.3.0"
@@ -50230,7 +50590,7 @@ in
     buildInputs = globalBuildInputs;
     meta = {
       description = "A language server for Bash";
-      homepage = "https://github.com/mads-hartmann/bash-language-server#readme";
+      homepage = "https://github.com/bash-lsp/bash-language-server#readme";
       license = "MIT";
     };
     production = true;
@@ -50293,7 +50653,7 @@ in
       sources."get-stdin-4.0.1"
       sources."glob-6.0.4"
       sources."graceful-fs-3.0.12"
-      sources."hosted-git-info-2.8.6"
+      sources."hosted-git-info-2.8.8"
       sources."indent-string-2.1.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -50323,7 +50683,7 @@ in
       sources."meow-3.7.0"
       sources."mime-db-1.43.0"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -50399,7 +50759,7 @@ in
     };
     dependencies = [
       sources."JSONStream-1.3.5"
-      sources."acorn-7.1.0"
+      sources."acorn-7.1.1"
       sources."acorn-node-1.8.2"
       sources."acorn-walk-7.1.1"
       sources."asn1.js-4.10.1"
@@ -50426,7 +50786,7 @@ in
       sources."browserify-rsa-4.0.1"
       sources."browserify-sign-4.0.4"
       sources."browserify-zlib-0.2.0"
-      sources."buffer-5.4.3"
+      sources."buffer-5.5.0"
       sources."buffer-from-1.1.1"
       sources."buffer-xor-1.0.3"
       sources."builtin-status-codes-3.0.0"
@@ -50449,7 +50809,7 @@ in
       sources."des.js-1.0.1"
       (sources."detective-5.2.0" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
         ];
       })
       sources."diffie-hellman-5.0.3"
@@ -50535,7 +50895,7 @@ in
       sources."string_decoder-1.3.0"
       (sources."subarg-1.0.0" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
         ];
       })
       sources."syntax-error-1.4.0"
@@ -50591,7 +50951,7 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-10.17.16"
+      sources."@types/node-10.17.17"
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.2.16"
       sources."ajv-6.12.0"
@@ -50652,7 +51012,7 @@ in
       sources."co-3.1.0"
       sources."codepage-1.4.0"
       sources."combined-stream-1.0.8"
-      sources."commander-4.1.1"
+      sources."commander-5.0.0"
       sources."compact2string-1.4.1"
       sources."concat-map-0.0.1"
       (sources."concat-stream-2.0.0" // {
@@ -50718,7 +51078,7 @@ in
       sources."har-validator-5.1.3"
       sources."has-ansi-1.0.3"
       sources."hat-0.0.3"
-      sources."hosted-git-info-2.8.6"
+      sources."hosted-git-info-2.8.8"
       sources."http-signature-1.2.0"
       sources."immediate-chunk-store-1.0.8"
       sources."indent-string-2.1.0"
@@ -50773,7 +51133,7 @@ in
       sources."mime-types-2.1.26"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."mkdirp-0.3.5"
       sources."ms-2.1.2"
       sources."multicast-dns-4.0.1"
@@ -50832,7 +51192,7 @@ in
       sources."plist-3.0.1"
       sources."process-nextick-args-2.0.1"
       sources."promiscuous-0.6.0"
-      sources."protobufjs-6.8.8"
+      sources."protobufjs-6.8.9"
       sources."psl-1.7.0"
       (sources."pump-0.3.5" // {
         dependencies = [
@@ -50849,7 +51209,7 @@ in
           sources."mkdirp-0.5.1"
         ];
       })
-      sources."random-access-storage-1.4.0"
+      sources."random-access-storage-1.4.1"
       sources."random-iterate-1.0.1"
       sources."randombytes-2.1.0"
       sources."range-parser-1.2.1"
@@ -51011,6 +51371,878 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  coc-prettier = nodeEnv.buildNodePackage {
+    name = "coc-prettier";
+    packageName = "coc-prettier";
+    version = "1.1.11";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.11.tgz";
+      sha512 = "fMo21nZXORQuA1bwXp5k5QzsGRKI8ioebp4JoZaxX6E1Y6O7IexQJ27hNfNeL+CAkIlmAZunMUH1bK9eLe8WPg==";
+    };
+    dependencies = [
+      sources."@babel/code-frame-7.8.3"
+      sources."@babel/highlight-7.8.3"
+      sources."@mrmlnc/readdir-enhanced-2.2.1"
+      sources."@nodelib/fs.stat-1.1.3"
+      sources."@types/eslint-visitor-keys-1.0.0"
+      sources."@types/json-schema-7.0.4"
+      sources."@typescript-eslint/experimental-utils-1.13.0"
+      sources."@typescript-eslint/parser-1.13.0"
+      sources."@typescript-eslint/typescript-estree-1.13.0"
+      sources."acorn-6.4.1"
+      sources."acorn-jsx-5.2.0"
+      sources."ajv-6.12.0"
+      sources."ajv-keywords-3.4.1"
+      sources."ansi-align-2.0.0"
+      sources."ansi-escapes-3.2.0"
+      sources."ansi-regex-4.1.0"
+      sources."ansi-styles-3.2.1"
+      sources."argparse-1.0.10"
+      sources."arr-diff-2.0.0"
+      sources."arr-flatten-1.1.0"
+      sources."arr-union-3.1.0"
+      sources."array-find-index-1.0.2"
+      sources."array-union-1.0.2"
+      sources."array-uniq-1.0.3"
+      sources."array-unique-0.2.1"
+      sources."arrify-1.0.1"
+      sources."assign-symbols-1.0.0"
+      sources."astral-regex-1.0.0"
+      sources."atob-2.1.2"
+      sources."autoprefixer-7.2.6"
+      sources."bail-1.0.5"
+      sources."balanced-match-1.0.0"
+      (sources."base-0.11.2" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."isobject-3.0.1"
+        ];
+      })
+      (sources."boxen-1.3.0" // {
+        dependencies = [
+          sources."camelcase-4.1.0"
+        ];
+      })
+      sources."brace-expansion-1.1.11"
+      sources."braces-1.8.5"
+      sources."browserslist-2.11.3"
+      sources."builtin-modules-1.1.1"
+      (sources."cache-base-1.0.1" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
+      sources."call-me-maybe-1.0.1"
+      sources."callsites-3.1.0"
+      sources."camelcase-2.1.1"
+      sources."camelcase-keys-2.1.0"
+      sources."caniuse-lite-1.0.30001035"
+      sources."capture-stack-trace-1.0.1"
+      sources."ccount-1.0.5"
+      sources."chalk-2.4.2"
+      sources."character-entities-1.2.4"
+      sources."character-entities-html4-1.1.4"
+      sources."character-entities-legacy-1.1.4"
+      sources."character-reference-invalid-1.1.4"
+      sources."chardet-0.7.0"
+      sources."ci-info-1.6.0"
+      sources."circular-json-0.3.3"
+      (sources."class-utils-0.3.6" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."isobject-3.0.1"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      sources."cli-boxes-1.0.0"
+      sources."cli-cursor-2.1.0"
+      sources."cli-width-2.2.0"
+      sources."cliui-4.1.0"
+      sources."clone-regexp-1.0.1"
+      sources."code-point-at-1.1.0"
+      sources."collapse-white-space-1.0.6"
+      sources."collection-visit-1.0.0"
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
+      sources."commander-2.20.3"
+      sources."common-tags-1.8.0"
+      sources."component-emitter-1.3.0"
+      sources."concat-map-0.0.1"
+      (sources."configstore-3.1.2" // {
+        dependencies = [
+          sources."dot-prop-4.2.0"
+          sources."is-obj-1.0.1"
+        ];
+      })
+      sources."copy-descriptor-0.1.1"
+      sources."core-js-3.6.4"
+      sources."cosmiconfig-3.1.0"
+      sources."create-error-class-3.0.2"
+      sources."cross-spawn-6.0.5"
+      sources."crypto-random-string-1.0.0"
+      sources."currently-unhandled-0.4.1"
+      sources."debug-4.1.1"
+      sources."decamelize-1.2.0"
+      sources."decamelize-keys-1.1.0"
+      sources."decode-uri-component-0.2.0"
+      sources."deep-extend-0.6.0"
+      sources."deep-is-0.1.3"
+      (sources."define-property-2.0.2" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
+      sources."diff-4.0.2"
+      (sources."dir-glob-2.2.2" // {
+        dependencies = [
+          sources."path-type-3.0.0"
+        ];
+      })
+      sources."dlv-1.1.3"
+      sources."doctrine-3.0.0"
+      (sources."dom-serializer-0.2.2" // {
+        dependencies = [
+          sources."domelementtype-2.0.1"
+          sources."entities-2.0.0"
+        ];
+      })
+      sources."domelementtype-1.3.1"
+      sources."domhandler-2.4.2"
+      sources."domutils-1.7.0"
+      sources."dot-prop-5.2.0"
+      sources."duplexer3-0.1.4"
+      sources."electron-to-chromium-1.3.376"
+      sources."emoji-regex-7.0.3"
+      sources."end-of-stream-1.4.4"
+      sources."entities-1.1.2"
+      sources."error-ex-1.3.2"
+      sources."escape-string-regexp-1.0.5"
+      (sources."eslint-5.16.0" // {
+        dependencies = [
+          sources."semver-5.7.1"
+        ];
+      })
+      sources."eslint-scope-4.0.3"
+      sources."eslint-utils-1.4.3"
+      sources."eslint-visitor-keys-1.1.0"
+      sources."espree-5.0.1"
+      sources."esprima-4.0.1"
+      sources."esquery-1.1.0"
+      sources."esrecurse-4.2.1"
+      sources."estraverse-4.3.0"
+      sources."esutils-2.0.3"
+      (sources."execa-0.7.0" // {
+        dependencies = [
+          sources."cross-spawn-5.1.0"
+        ];
+      })
+      sources."execall-1.0.0"
+      sources."expand-brackets-0.1.5"
+      sources."expand-range-1.8.2"
+      sources."extend-3.0.2"
+      (sources."extend-shallow-3.0.2" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
+      sources."external-editor-3.1.0"
+      sources."extglob-0.3.2"
+      sources."fast-deep-equal-3.1.1"
+      (sources."fast-glob-2.2.7" // {
+        dependencies = [
+          sources."arr-diff-4.0.0"
+          sources."array-unique-0.3.2"
+          (sources."braces-2.3.2" // {
+            dependencies = [
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          sources."debug-2.6.9"
+          (sources."expand-brackets-2.1.4" // {
+            dependencies = [
+              sources."define-property-0.2.5"
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          (sources."extglob-2.0.4" // {
+            dependencies = [
+              sources."define-property-1.0.0"
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          (sources."fill-range-4.0.0" // {
+            dependencies = [
+              sources."extend-shallow-2.0.1"
+            ];
+          })
+          (sources."glob-parent-3.1.0" // {
+            dependencies = [
+              sources."is-glob-3.1.0"
+            ];
+          })
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          sources."is-extglob-2.1.1"
+          sources."is-glob-4.0.1"
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."isobject-3.0.1"
+          sources."kind-of-6.0.3"
+          sources."micromatch-3.1.10"
+          sources."ms-2.0.0"
+        ];
+      })
+      sources."fast-json-stable-stringify-2.1.0"
+      sources."fast-levenshtein-2.0.6"
+      sources."figures-2.0.0"
+      sources."file-entry-cache-5.0.1"
+      sources."filename-regex-2.0.1"
+      sources."fill-range-2.2.4"
+      sources."find-up-2.1.0"
+      sources."flat-cache-2.0.1"
+      sources."flatted-2.0.1"
+      sources."for-in-1.0.2"
+      sources."for-own-0.1.5"
+      sources."fragment-cache-0.2.1"
+      sources."fs.realpath-1.0.0"
+      sources."functional-red-black-tree-1.0.1"
+      sources."get-caller-file-1.0.3"
+      sources."get-stdin-5.0.1"
+      sources."get-stream-3.0.0"
+      sources."get-value-2.0.6"
+      sources."glob-7.1.6"
+      sources."glob-base-0.3.0"
+      sources."glob-parent-2.0.0"
+      sources."glob-to-regexp-0.3.0"
+      sources."global-dirs-0.1.1"
+      sources."globals-11.12.0"
+      (sources."globby-6.1.0" // {
+        dependencies = [
+          sources."pify-2.3.0"
+        ];
+      })
+      sources."globjoin-0.1.4"
+      (sources."gonzales-pe-4.2.4" // {
+        dependencies = [
+          sources."minimist-1.1.3"
+        ];
+      })
+      sources."got-6.7.1"
+      sources."graceful-fs-4.2.3"
+      (sources."has-ansi-2.0.0" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+        ];
+      })
+      sources."has-flag-3.0.0"
+      (sources."has-value-1.0.0" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
+      (sources."has-values-1.0.0" // {
+        dependencies = [
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."kind-of-4.0.0"
+        ];
+      })
+      sources."hosted-git-info-2.8.8"
+      sources."html-tags-2.0.0"
+      sources."htmlparser2-3.10.1"
+      sources."iconv-lite-0.4.24"
+      sources."ignore-4.0.6"
+      sources."import-fresh-3.2.1"
+      sources."import-lazy-2.1.0"
+      sources."import-local-0.1.1"
+      sources."imurmurhash-0.1.4"
+      sources."indent-string-4.0.0"
+      sources."indexes-of-1.0.1"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
+      sources."ini-1.3.5"
+      (sources."inquirer-6.5.2" // {
+        dependencies = [
+          sources."strip-ansi-5.2.0"
+        ];
+      })
+      sources."invert-kv-2.0.0"
+      (sources."is-accessor-descriptor-1.0.0" // {
+        dependencies = [
+          sources."kind-of-6.0.3"
+        ];
+      })
+      sources."is-alphabetical-1.0.4"
+      sources."is-alphanumeric-1.0.0"
+      sources."is-alphanumerical-1.0.4"
+      sources."is-arrayish-0.2.1"
+      sources."is-buffer-1.1.6"
+      sources."is-ci-1.2.1"
+      (sources."is-data-descriptor-1.0.0" // {
+        dependencies = [
+          sources."kind-of-6.0.3"
+        ];
+      })
+      sources."is-decimal-1.0.4"
+      (sources."is-descriptor-1.0.2" // {
+        dependencies = [
+          sources."kind-of-6.0.3"
+        ];
+      })
+      sources."is-directory-0.3.1"
+      sources."is-dotfile-1.0.3"
+      sources."is-equal-shallow-0.1.3"
+      sources."is-extendable-0.1.1"
+      sources."is-extglob-1.0.0"
+      sources."is-finite-1.1.0"
+      sources."is-fullwidth-code-point-2.0.0"
+      sources."is-glob-2.0.1"
+      sources."is-hexadecimal-1.0.4"
+      sources."is-installed-globally-0.1.0"
+      sources."is-npm-1.0.0"
+      sources."is-number-2.1.0"
+      sources."is-obj-2.0.0"
+      sources."is-path-inside-1.0.1"
+      sources."is-plain-obj-1.1.0"
+      (sources."is-plain-object-2.0.4" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
+      sources."is-posix-bracket-0.1.1"
+      sources."is-primitive-2.0.0"
+      sources."is-promise-2.1.0"
+      sources."is-redirect-1.0.0"
+      sources."is-regexp-1.0.0"
+      sources."is-retry-allowed-1.2.0"
+      sources."is-stream-1.1.0"
+      sources."is-supported-regexp-flag-1.0.1"
+      sources."is-utf8-0.2.1"
+      sources."is-whitespace-character-1.0.4"
+      sources."is-windows-1.0.2"
+      sources."is-word-character-1.0.4"
+      sources."isarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."isobject-2.1.0"
+      sources."js-base64-2.5.2"
+      sources."js-tokens-4.0.0"
+      sources."js-yaml-3.13.1"
+      sources."json-parse-better-errors-1.0.2"
+      sources."json-schema-traverse-0.4.1"
+      sources."json-stable-stringify-without-jsonify-1.0.1"
+      sources."kind-of-3.2.2"
+      sources."known-css-properties-0.5.0"
+      sources."latest-version-3.1.0"
+      sources."lcid-2.0.0"
+      sources."levn-0.3.0"
+      (sources."load-json-file-1.1.0" // {
+        dependencies = [
+          sources."parse-json-2.2.0"
+          sources."pify-2.3.0"
+        ];
+      })
+      sources."locate-path-2.0.0"
+      sources."lodash-4.17.15"
+      sources."lodash.merge-4.6.2"
+      sources."lodash.unescape-4.0.1"
+      sources."log-symbols-2.2.0"
+      sources."loglevel-1.6.7"
+      (sources."loglevel-colored-level-prefix-1.0.0" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+          sources."ansi-styles-2.2.1"
+          sources."chalk-1.1.3"
+          sources."strip-ansi-3.0.1"
+          sources."supports-color-2.0.0"
+        ];
+      })
+      sources."longest-streak-2.0.4"
+      sources."loud-rejection-1.6.0"
+      sources."lowercase-keys-1.0.1"
+      sources."lru-cache-4.1.5"
+      sources."make-dir-1.3.0"
+      sources."map-age-cleaner-0.1.3"
+      sources."map-cache-0.2.2"
+      sources."map-obj-1.0.1"
+      sources."map-visit-1.0.0"
+      sources."markdown-escapes-1.0.4"
+      sources."markdown-table-1.1.3"
+      sources."math-random-1.0.4"
+      sources."mathml-tag-names-2.1.3"
+      sources."mdast-util-compact-1.0.4"
+      (sources."mem-4.3.0" // {
+        dependencies = [
+          sources."mimic-fn-2.1.0"
+        ];
+      })
+      (sources."meow-3.7.0" // {
+        dependencies = [
+          sources."minimist-1.2.5"
+        ];
+      })
+      sources."merge2-1.3.0"
+      sources."micromatch-2.3.11"
+      sources."mimic-fn-1.2.0"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."minimist-options-3.0.2"
+      (sources."mixin-deep-1.3.2" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
+      sources."mkdirp-0.5.1"
+      sources."ms-2.1.2"
+      sources."mute-stream-0.0.7"
+      (sources."nanomatch-1.2.13" // {
+        dependencies = [
+          sources."arr-diff-4.0.0"
+          sources."array-unique-0.3.2"
+          sources."kind-of-6.0.3"
+        ];
+      })
+      sources."natural-compare-1.4.0"
+      sources."nice-try-1.0.5"
+      sources."normalize-package-data-2.5.0"
+      sources."normalize-path-2.1.1"
+      sources."normalize-range-0.1.2"
+      sources."normalize-selector-0.2.0"
+      sources."npm-run-path-2.0.2"
+      sources."num2fraction-1.2.2"
+      sources."number-is-nan-1.0.1"
+      sources."object-assign-4.1.1"
+      (sources."object-copy-0.1.0" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+        ];
+      })
+      (sources."object-visit-1.0.1" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
+      sources."object.omit-2.0.1"
+      (sources."object.pick-1.3.0" // {
+        dependencies = [
+          sources."isobject-3.0.1"
+        ];
+      })
+      sources."once-1.4.0"
+      sources."onetime-2.0.1"
+      sources."optionator-0.8.3"
+      (sources."os-locale-3.1.0" // {
+        dependencies = [
+          sources."execa-1.0.0"
+          sources."get-stream-4.1.0"
+        ];
+      })
+      sources."os-tmpdir-1.0.2"
+      sources."p-defer-1.0.0"
+      sources."p-finally-1.0.0"
+      sources."p-is-promise-2.1.0"
+      sources."p-limit-1.3.0"
+      sources."p-locate-2.0.0"
+      sources."p-try-1.0.0"
+      sources."package-json-4.0.1"
+      sources."parent-module-1.0.1"
+      sources."parse-entities-1.2.2"
+      sources."parse-glob-3.0.4"
+      sources."parse-json-3.0.0"
+      sources."pascalcase-0.1.1"
+      sources."path-dirname-1.0.2"
+      sources."path-exists-3.0.0"
+      sources."path-is-absolute-1.0.1"
+      sources."path-is-inside-1.0.2"
+      sources."path-key-2.0.1"
+      sources."path-parse-1.0.6"
+      (sources."path-type-1.1.0" // {
+        dependencies = [
+          sources."pify-2.3.0"
+        ];
+      })
+      sources."pify-3.0.0"
+      sources."pinkie-2.0.4"
+      sources."pinkie-promise-2.0.1"
+      sources."pkg-dir-2.0.0"
+      sources."posix-character-classes-0.1.1"
+      sources."postcss-6.0.23"
+      sources."postcss-html-0.12.0"
+      (sources."postcss-less-1.1.5" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+          sources."ansi-styles-2.2.1"
+          (sources."chalk-1.1.3" // {
+            dependencies = [
+              sources."supports-color-2.0.0"
+            ];
+          })
+          sources."has-flag-1.0.0"
+          sources."postcss-5.2.18"
+          sources."source-map-0.5.7"
+          sources."strip-ansi-3.0.1"
+          sources."supports-color-3.2.3"
+        ];
+      })
+      sources."postcss-media-query-parser-0.2.3"
+      sources."postcss-reporter-5.0.0"
+      sources."postcss-resolve-nested-selector-0.1.1"
+      sources."postcss-safe-parser-3.0.1"
+      sources."postcss-sass-0.2.0"
+      sources."postcss-scss-1.0.6"
+      sources."postcss-selector-parser-3.1.2"
+      sources."postcss-value-parser-3.3.1"
+      sources."prelude-ls-1.1.2"
+      sources."prepend-http-1.0.4"
+      sources."preserve-0.2.0"
+      sources."prettier-1.19.1"
+      sources."prettier-eslint-9.0.1"
+      (sources."prettier-stylelint-0.4.2" // {
+        dependencies = [
+          sources."debug-3.2.6"
+          sources."ignore-3.3.10"
+        ];
+      })
+      (sources."prettier-tslint-0.4.2" // {
+        dependencies = [
+          sources."dir-glob-2.0.0"
+          sources."globby-8.0.2"
+          sources."ignore-3.3.10"
+          sources."path-type-3.0.0"
+        ];
+      })
+      (sources."pretty-format-23.6.0" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+        ];
+      })
+      sources."progress-2.0.3"
+      sources."pseudomap-1.0.2"
+      sources."pump-3.0.0"
+      sources."punycode-2.1.1"
+      sources."quick-lru-1.1.0"
+      (sources."randomatic-3.1.1" // {
+        dependencies = [
+          sources."is-number-4.0.0"
+          sources."kind-of-6.0.3"
+        ];
+      })
+      (sources."rc-1.2.8" // {
+        dependencies = [
+          sources."minimist-1.2.5"
+        ];
+      })
+      sources."read-pkg-1.1.0"
+      (sources."read-pkg-up-1.0.1" // {
+        dependencies = [
+          sources."find-up-1.1.2"
+          sources."path-exists-2.1.0"
+        ];
+      })
+      sources."readable-stream-3.6.0"
+      (sources."redent-1.0.0" // {
+        dependencies = [
+          sources."indent-string-2.1.0"
+        ];
+      })
+      sources."regex-cache-0.4.4"
+      sources."regex-not-1.0.2"
+      sources."regexpp-2.0.1"
+      sources."registry-auth-token-3.4.0"
+      sources."registry-url-3.1.0"
+      sources."remark-8.0.0"
+      sources."remark-parse-4.0.0"
+      sources."remark-stringify-4.0.0"
+      sources."remove-trailing-separator-1.1.0"
+      sources."repeat-element-1.1.3"
+      sources."repeat-string-1.6.1"
+      sources."repeating-2.0.1"
+      sources."replace-ext-1.0.0"
+      sources."require-directory-2.1.1"
+      sources."require-from-string-2.0.2"
+      sources."require-main-filename-1.0.1"
+      sources."require-relative-0.8.7"
+      sources."resolve-1.15.1"
+      (sources."resolve-cwd-2.0.0" // {
+        dependencies = [
+          sources."resolve-from-3.0.0"
+        ];
+      })
+      sources."resolve-from-4.0.0"
+      sources."resolve-url-0.2.1"
+      sources."restore-cursor-2.0.0"
+      sources."ret-0.1.15"
+      sources."rimraf-2.6.3"
+      sources."run-async-2.4.0"
+      sources."rxjs-6.5.4"
+      sources."safe-buffer-5.2.0"
+      sources."safe-regex-1.1.0"
+      sources."safer-buffer-2.1.2"
+      sources."semver-5.5.0"
+      sources."semver-diff-2.1.0"
+      sources."set-blocking-2.0.0"
+      (sources."set-value-2.0.1" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
+      sources."signal-exit-3.0.2"
+      sources."slash-1.0.0"
+      sources."slice-ansi-2.1.0"
+      (sources."snapdragon-0.8.2" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+          sources."ms-2.0.0"
+          sources."source-map-0.5.7"
+        ];
+      })
+      (sources."snapdragon-node-2.1.1" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."isobject-3.0.1"
+        ];
+      })
+      sources."snapdragon-util-3.0.1"
+      sources."source-map-0.6.1"
+      sources."source-map-resolve-0.5.3"
+      sources."source-map-url-0.4.0"
+      sources."spdx-correct-3.1.0"
+      sources."spdx-exceptions-2.2.0"
+      sources."spdx-expression-parse-3.0.0"
+      sources."spdx-license-ids-3.0.5"
+      sources."specificity-0.3.2"
+      sources."split-string-3.1.0"
+      sources."sprintf-js-1.0.3"
+      sources."state-toggle-1.0.3"
+      (sources."static-extend-0.1.2" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      sources."string-width-2.1.1"
+      sources."string_decoder-1.3.0"
+      sources."stringify-entities-1.3.2"
+      (sources."strip-ansi-4.0.0" // {
+        dependencies = [
+          sources."ansi-regex-3.0.0"
+        ];
+      })
+      sources."strip-bom-2.0.0"
+      sources."strip-eof-1.0.0"
+      (sources."strip-indent-1.0.1" // {
+        dependencies = [
+          sources."get-stdin-4.0.1"
+        ];
+      })
+      sources."strip-json-comments-2.0.1"
+      sources."style-search-0.1.0"
+      (sources."stylelint-8.4.0" // {
+        dependencies = [
+          sources."camelcase-4.1.0"
+          sources."camelcase-keys-4.2.0"
+          sources."debug-3.2.6"
+          sources."file-entry-cache-2.0.0"
+          sources."flat-cache-1.3.4"
+          sources."globby-7.1.1"
+          sources."ignore-3.3.10"
+          sources."indent-string-3.2.0"
+          sources."load-json-file-4.0.0"
+          sources."map-obj-2.0.0"
+          sources."meow-4.0.1"
+          sources."minimist-1.2.5"
+          sources."parse-json-4.0.0"
+          sources."path-type-3.0.0"
+          sources."read-pkg-3.0.0"
+          sources."read-pkg-up-3.0.0"
+          sources."redent-2.0.0"
+          sources."slice-ansi-1.0.0"
+          sources."strip-bom-3.0.0"
+          sources."strip-indent-2.0.0"
+          sources."table-4.0.3"
+          sources."trim-newlines-2.0.0"
+          sources."write-0.2.1"
+        ];
+      })
+      sources."sugarss-1.0.1"
+      sources."supports-color-5.5.0"
+      sources."svg-tags-1.0.0"
+      (sources."table-5.4.6" // {
+        dependencies = [
+          sources."string-width-3.1.0"
+          sources."strip-ansi-5.2.0"
+        ];
+      })
+      sources."temp-dir-1.0.0"
+      sources."temp-write-3.4.0"
+      sources."tempy-0.2.1"
+      sources."term-size-1.2.0"
+      sources."text-table-0.2.0"
+      sources."through-2.3.8"
+      sources."timed-out-4.0.1"
+      sources."tmp-0.0.33"
+      sources."to-object-path-0.3.0"
+      sources."to-regex-3.0.2"
+      (sources."to-regex-range-2.1.1" // {
+        dependencies = [
+          sources."is-number-3.0.0"
+        ];
+      })
+      sources."trim-0.0.1"
+      sources."trim-newlines-1.0.0"
+      sources."trim-trailing-lines-1.1.3"
+      sources."trough-1.0.5"
+      sources."tslib-1.11.1"
+      sources."tslint-5.20.1"
+      sources."tsutils-2.29.0"
+      sources."type-check-0.3.2"
+      sources."typescript-3.8.3"
+      sources."unherit-1.1.3"
+      sources."unified-6.2.0"
+      sources."union-value-1.0.1"
+      sources."uniq-1.0.1"
+      sources."unique-string-1.0.0"
+      sources."unist-util-find-all-after-1.0.5"
+      sources."unist-util-is-3.0.0"
+      sources."unist-util-remove-position-1.1.4"
+      sources."unist-util-stringify-position-1.1.2"
+      sources."unist-util-visit-1.4.1"
+      sources."unist-util-visit-parents-2.1.2"
+      (sources."unset-value-1.0.0" // {
+        dependencies = [
+          (sources."has-value-0.3.1" // {
+            dependencies = [
+              sources."isobject-2.1.0"
+            ];
+          })
+          sources."has-values-0.1.4"
+          sources."isobject-3.0.1"
+        ];
+      })
+      sources."unzip-response-2.0.1"
+      sources."update-notifier-2.5.0"
+      sources."uri-js-4.2.2"
+      sources."urix-0.1.0"
+      sources."url-parse-lax-1.0.0"
+      sources."use-3.1.1"
+      sources."util-deprecate-1.0.2"
+      sources."uuid-3.4.0"
+      sources."validate-npm-package-license-3.0.4"
+      sources."vfile-2.3.0"
+      sources."vfile-location-2.0.6"
+      sources."vfile-message-1.1.1"
+      (sources."vue-eslint-parser-2.0.3" // {
+        dependencies = [
+          sources."acorn-5.7.4"
+          (sources."acorn-jsx-3.0.1" // {
+            dependencies = [
+              sources."acorn-3.3.0"
+            ];
+          })
+          sources."debug-3.2.6"
+          sources."eslint-scope-3.7.3"
+          sources."espree-3.5.4"
+        ];
+      })
+      sources."which-1.3.1"
+      sources."which-module-2.0.0"
+      sources."widest-line-2.0.1"
+      sources."word-wrap-1.2.3"
+      (sources."wrap-ansi-2.1.0" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+          sources."is-fullwidth-code-point-1.0.0"
+          sources."string-width-1.0.2"
+          sources."strip-ansi-3.0.1"
+        ];
+      })
+      sources."wrappy-1.0.2"
+      sources."write-1.0.3"
+      sources."write-file-atomic-2.4.3"
+      sources."x-is-string-0.1.0"
+      sources."xdg-basedir-3.0.0"
+      sources."xtend-4.0.2"
+      sources."y18n-3.2.1"
+      sources."yallist-2.1.2"
+      sources."yargs-11.1.1"
+      (sources."yargs-parser-9.0.2" // {
+        dependencies = [
+          sources."camelcase-4.1.0"
+        ];
+      })
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "prettier extension for coc.nvim";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   coffee-script = nodeEnv.buildNodePackage {
     name = "coffee-script";
     packageName = "coffee-script";
@@ -51083,10 +52315,10 @@ in
   configurable-http-proxy = nodeEnv.buildNodePackage {
     name = "configurable-http-proxy";
     packageName = "configurable-http-proxy";
-    version = "4.2.0";
+    version = "4.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.2.0.tgz";
-      sha512 = "6rlW+nPl22mxAvQB67DkatkSfUNr5qEAmKyn0TJtSEy49kJ3W7v4oiHH9Y0Au6F7ACjAB2nOCZpP885MYwfuoQ==";
+      url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.2.1.tgz";
+      sha512 = "43JESj3abbSnIu1B3pdyTxX2pfMT+wUgVSuCRItBq9HHops0anoxWOnbV1vRk6myeuHElB41wX4Q6QF+d/r8PQ==";
     };
     dependencies = [
       sources."async-2.6.3"
@@ -51097,7 +52329,7 @@ in
       sources."colornames-1.1.1"
       sources."colors-1.4.0"
       sources."colorspace-1.1.2"
-      sources."commander-4.0.1"
+      sources."commander-4.1.1"
       sources."core-util-is-1.0.2"
       sources."debug-3.2.6"
       sources."diagnostics-1.1.1"
@@ -51164,7 +52396,7 @@ in
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.5"
+      sources."@types/node-13.9.1"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       sources."ajv-6.12.0"
@@ -51395,7 +52627,7 @@ in
           sources."kind-of-4.0.0"
         ];
       })
-      sources."hosted-git-info-2.8.6"
+      sources."hosted-git-info-2.8.8"
       (sources."http-errors-1.7.2" // {
         dependencies = [
           sources."inherits-2.0.3"
@@ -51481,7 +52713,7 @@ in
       sources."mime-types-2.1.26"
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       (sources."mixin-deep-1.3.2" // {
         dependencies = [
           sources."is-extendable-1.0.1"
@@ -51492,7 +52724,7 @@ in
       sources."nanomatch-1.2.13"
       sources."negotiator-0.6.2"
       sources."nice-try-1.0.5"
-      sources."nopt-4.0.1"
+      sources."nopt-4.0.3"
       sources."normalize-package-data-2.5.0"
       sources."npm-normalize-package-bin-1.0.1"
       sources."npm-package-arg-6.1.1"
@@ -51587,7 +52819,7 @@ in
       sources."resolve-url-0.2.1"
       sources."restore-cursor-2.0.0"
       sources."ret-0.1.15"
-      sources."run-async-2.3.0"
+      sources."run-async-2.4.0"
       sources."rxjs-6.5.4"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
@@ -51699,7 +52931,7 @@ in
       sources."to-regex-range-2.1.1"
       sources."toidentifier-1.0.0"
       sources."tough-cookie-3.0.1"
-      sources."tslib-1.11.0"
+      sources."tslib-1.11.1"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.18"
@@ -51774,7 +53006,8 @@ in
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.5"
+      sources."@types/node-13.9.1"
+      sources."aggregate-error-3.0.1"
       sources."arr-diff-4.0.0"
       sources."arr-flatten-1.1.0"
       sources."arr-union-3.1.0"
@@ -51818,12 +53051,13 @@ in
           sources."kind-of-5.1.0"
         ];
       })
+      sources."clean-stack-2.2.0"
       sources."collection-visit-1.0.0"
       sources."component-emitter-1.3.0"
       sources."concat-map-0.0.1"
       sources."copy-descriptor-0.1.1"
       sources."cp-file-7.0.0"
-      sources."cpy-8.0.1"
+      sources."cpy-8.1.0"
       sources."currently-unhandled-0.4.1"
       sources."debug-2.6.9"
       sources."decamelize-1.2.0"
@@ -51896,9 +53130,9 @@ in
           sources."kind-of-4.0.0"
         ];
       })
-      sources."hosted-git-info-2.8.6"
+      sources."hosted-git-info-2.8.8"
       sources."ignore-4.0.6"
-      sources."indent-string-3.2.0"
+      sources."indent-string-4.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."is-accessor-descriptor-1.0.0"
@@ -51971,12 +53205,21 @@ in
       sources."object-visit-1.0.1"
       sources."object.pick-1.3.0"
       sources."once-1.4.0"
-      sources."p-all-2.1.0"
+      (sources."p-all-2.1.0" // {
+        dependencies = [
+          sources."p-map-2.1.0"
+        ];
+      })
       sources."p-event-4.1.0"
+      (sources."p-filter-2.1.0" // {
+        dependencies = [
+          sources."p-map-2.1.0"
+        ];
+      })
       sources."p-finally-1.0.0"
       sources."p-limit-1.3.0"
       sources."p-locate-2.0.0"
-      sources."p-map-2.1.0"
+      sources."p-map-3.0.0"
       sources."p-timeout-2.0.1"
       sources."p-try-1.0.0"
       sources."parse-json-4.0.0"
@@ -51995,7 +53238,11 @@ in
       sources."quick-lru-1.1.0"
       sources."read-pkg-3.0.0"
       sources."read-pkg-up-3.0.0"
-      sources."redent-2.0.0"
+      (sources."redent-2.0.0" // {
+        dependencies = [
+          sources."indent-string-3.2.0"
+        ];
+      })
       sources."regex-not-1.0.2"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
@@ -52120,7 +53367,7 @@ in
       sources."@cycle/run-3.4.0"
       sources."@cycle/time-0.10.1"
       sources."@types/cookiejar-2.1.1"
-      sources."@types/node-13.7.5"
+      sources."@types/node-13.9.1"
       sources."@types/superagent-3.8.2"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-2.1.1"
@@ -52198,7 +53445,7 @@ in
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
       sources."mimic-fn-1.2.0"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."ms-2.1.2"
       sources."mute-stream-0.0.7"
       sources."next-tick-1.0.0"
@@ -52213,7 +53460,7 @@ in
       sources."raf-3.3.2"
       sources."readable-stream-2.3.7"
       sources."restore-cursor-2.0.0"
-      sources."run-async-2.3.0"
+      sources."run-async-2.4.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
       sources."safe-buffer-5.1.2"
@@ -52269,7 +53516,7 @@ in
     };
     dependencies = [
       sources."@types/color-name-1.1.1"
-      sources."ansi-escapes-4.3.0"
+      sources."ansi-escapes-4.3.1"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.2.1"
       sources."balanced-match-1.0.0"
@@ -52340,7 +53587,7 @@ in
       sources."readable-stream-1.1.14"
       sources."restore-cursor-3.1.0"
       sources."rimraf-2.7.1"
-      sources."run-async-2.3.0"
+      sources."run-async-2.4.0"
       sources."rxjs-6.5.4"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
@@ -52375,8 +53622,8 @@ in
         ];
       })
       sources."tmp-0.1.0"
-      sources."tslib-1.11.0"
-      sources."type-fest-0.8.1"
+      sources."tslib-1.11.1"
+      sources."type-fest-0.11.0"
       sources."uid-number-0.0.6"
       sources."universalify-0.1.2"
       sources."util-deprecate-1.0.2"
@@ -52418,7 +53665,7 @@ in
       sources."isexe-2.0.0"
       sources."jsonfile-4.0.0"
       sources."lru-cache-4.1.5"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."path-exists-3.0.0"
       sources."pseudomap-1.0.2"
       sources."regenerator-runtime-0.11.1"
@@ -52814,7 +54061,7 @@ in
       sources."mimic-response-2.1.0"
       sources."min-document-2.19.0"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."mirror-folder-3.0.0"
       (sources."mixin-deep-1.3.2" // {
         dependencies = [
@@ -52841,7 +54088,7 @@ in
       sources."nanotiming-7.3.1"
       sources."napi-macros-2.0.0"
       sources."ncp-1.0.1"
-      sources."neat-input-1.10.0"
+      sources."neat-input-1.11.0"
       sources."neat-log-3.1.0"
       sources."neat-spinner-1.0.0"
       sources."neat-tasks-1.1.1"
@@ -52898,7 +54145,7 @@ in
       sources."qs-6.5.2"
       sources."random-access-file-2.1.3"
       sources."random-access-memory-3.1.1"
-      sources."random-access-storage-1.4.0"
+      sources."random-access-storage-1.4.1"
       sources."randombytes-2.1.0"
       sources."range-parser-1.2.1"
       sources."rc-1.2.8"
@@ -52976,10 +54223,10 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."sodium-javascript-0.5.5"
+      sources."sodium-javascript-0.5.6"
       (sources."sodium-native-2.4.9" // {
         dependencies = [
-          sources."node-gyp-build-4.2.0"
+          sources."node-gyp-build-4.2.1"
         ];
       })
       sources."sodium-universal-2.0.0"
@@ -53087,7 +54334,7 @@ in
       sources."utile-0.3.0"
       (sources."utp-native-2.1.7" // {
         dependencies = [
-          sources."node-gyp-build-4.2.0"
+          sources."node-gyp-build-4.2.1"
           sources."readable-stream-3.6.0"
           sources."unordered-set-2.0.1"
         ];
@@ -53131,7 +54378,7 @@ in
       sha512 = "VqsWI0zHgX+i4rDmqXqqDv3T++z21osaOencXrMVwlF8P75tKlEnZ72WlONNE1UAxtAvlPIG2zmGMoa7guqDyw==";
     };
     dependencies = [
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -53331,10 +54578,10 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "6.22.0";
+    version = "6.23.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.22.0.tgz";
-      sha512 = "ZoZzAb8kwldRgdr1cSbdyQwmIGUI8V89NhCR0+t9sEmgALHYB9BclcslAZPmjrZ9T7iN7LX63gnwp0wMBcgkig==";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.23.0.tgz";
+      sha512 = "Nj/zXibNz0WzPexc8rx9QU7Y28pQSSAadmD2bZbSY+N4axvb8IYyCq6pN+2R+QhxdejKZ408EuLRr+37DmEnjw==";
     };
     dependencies = [
       sources."JSONStream-1.3.5"
@@ -53343,7 +54590,7 @@ in
       sources."assert-plus-1.0.0"
       sources."async-2.6.3"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.626.0"
+      sources."aws-sdk-2.639.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.9.1"
       sources."base64-js-1.3.1"
@@ -53419,7 +54666,7 @@ in
       sources."s3signed-0.1.0"
       (sources."s3urls-1.5.2" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
         ];
       })
       sources."safe-buffer-5.2.0"
@@ -53489,233 +54736,305 @@ in
   emoj = nodeEnv.buildNodePackage {
     name = "emoj";
     packageName = "emoj";
-    version = "2.0.0";
+    version = "3.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/emoj/-/emoj-2.0.0.tgz";
-      sha512 = "f+jc5ZC+EAqRK84plziuC4sfKspUcnnxwZzxLFSFsH0MZn9VbU0iQh5qTONewYXsoRaacNioMOLxYV637MLBDQ==";
+      url = "https://registry.npmjs.org/emoj/-/emoj-3.0.1.tgz";
+      sha512 = "ZZfCT5/+XXomHI7O+frUJfKeqEnxXYq8SL45s0uR6KMRZpFlckzMlLpyBFKVUNd+VWjgVwmc9d/fe/YhU1N5Ng==";
     };
     dependencies = [
-      sources."ansi-escapes-3.2.0"
-      sources."ansi-regex-3.0.0"
-      sources."ansi-styles-2.2.1"
+      sources."@babel/code-frame-7.8.3"
+      sources."@babel/core-7.8.7"
+      sources."@babel/generator-7.8.8"
+      sources."@babel/helper-builder-react-jsx-7.8.3"
+      sources."@babel/helper-function-name-7.8.3"
+      sources."@babel/helper-get-function-arity-7.8.3"
+      sources."@babel/helper-plugin-utils-7.8.3"
+      sources."@babel/helper-split-export-declaration-7.8.3"
+      sources."@babel/helpers-7.8.4"
+      sources."@babel/highlight-7.8.3"
+      sources."@babel/parser-7.8.8"
+      sources."@babel/plugin-proposal-object-rest-spread-7.8.3"
+      sources."@babel/plugin-syntax-jsx-7.8.3"
+      sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
+      sources."@babel/plugin-transform-destructuring-7.8.8"
+      sources."@babel/plugin-transform-react-jsx-7.8.3"
+      sources."@babel/template-7.8.6"
+      sources."@babel/traverse-7.8.6"
+      sources."@babel/types-7.8.7"
+      sources."@sindresorhus/is-2.1.0"
+      sources."@szmarczak/http-timer-4.0.5"
+      sources."@types/cacheable-request-6.0.1"
+      sources."@types/color-name-1.1.1"
+      sources."@types/http-cache-semantics-4.0.0"
+      sources."@types/keyv-3.1.1"
+      sources."@types/minimist-1.2.0"
+      sources."@types/node-13.9.1"
+      sources."@types/normalize-package-data-2.4.0"
+      sources."@types/responselike-1.0.0"
+      sources."ajv-6.12.0"
+      (sources."ansi-escapes-4.3.1" // {
+        dependencies = [
+          sources."type-fest-0.11.0"
+        ];
+      })
+      sources."ansi-regex-5.0.0"
+      sources."ansi-styles-3.2.1"
       sources."arch-2.1.1"
-      sources."array-find-index-1.0.2"
-      sources."arrify-1.0.1"
-      sources."auto-bind-1.2.1"
-      sources."babel-code-frame-6.26.0"
-      sources."babel-core-6.26.3"
-      sources."babel-generator-6.26.1"
-      sources."babel-helper-builder-react-jsx-6.26.0"
-      sources."babel-helpers-6.24.1"
-      sources."babel-messages-6.23.0"
-      sources."babel-plugin-syntax-jsx-6.18.0"
-      sources."babel-plugin-syntax-object-rest-spread-6.13.0"
-      sources."babel-plugin-transform-es2015-destructuring-6.23.0"
-      sources."babel-plugin-transform-object-rest-spread-6.26.0"
-      sources."babel-plugin-transform-react-jsx-6.24.1"
-      sources."babel-register-6.26.0"
-      sources."babel-runtime-6.26.0"
-      sources."babel-template-6.26.0"
-      sources."babel-traverse-6.26.0"
-      sources."babel-types-6.26.0"
-      sources."babylon-6.18.0"
-      sources."balanced-match-1.0.0"
-      sources."brace-expansion-1.1.11"
+      sources."arrify-2.0.1"
+      sources."astral-regex-2.0.0"
+      sources."auto-bind-4.0.0"
+      sources."cacheable-lookup-2.0.0"
+      (sources."cacheable-request-7.0.1" // {
+        dependencies = [
+          sources."get-stream-5.1.0"
+        ];
+      })
       sources."caller-callsite-2.0.0"
       sources."caller-path-2.0.0"
       sources."callsites-2.0.0"
-      sources."camelcase-2.1.1"
-      sources."camelcase-keys-2.1.0"
-      (sources."chalk-1.1.3" // {
+      sources."camelcase-5.3.1"
+      sources."camelcase-keys-6.2.1"
+      sources."chalk-2.4.2"
+      sources."ci-info-2.0.0"
+      sources."cli-cursor-3.1.0"
+      sources."cli-truncate-2.1.0"
+      sources."clipboardy-2.2.0"
+      (sources."clone-response-1.0.2" // {
         dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."has-ansi-2.0.0"
+          sources."mimic-response-1.0.1"
         ];
       })
-      sources."cli-cursor-2.1.0"
-      sources."clipboardy-1.2.3"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."concat-map-0.0.1"
-      sources."conf-1.4.0"
-      (sources."convert-source-map-1.7.0" // {
+      (sources."conf-6.2.1" // {
         dependencies = [
-          sources."safe-buffer-5.1.2"
+          sources."semver-6.3.0"
         ];
       })
-      sources."core-js-2.6.11"
-      sources."cross-spawn-5.1.0"
-      sources."currently-unhandled-0.4.1"
-      sources."debug-2.6.9"
+      sources."convert-source-map-1.7.0"
+      sources."cross-spawn-6.0.5"
+      sources."debounce-fn-3.0.1"
+      sources."debug-4.1.1"
       sources."decamelize-1.2.0"
-      sources."decompress-response-3.3.0"
-      sources."detect-indent-4.0.0"
-      sources."dot-prop-4.2.0"
+      (sources."decamelize-keys-1.1.0" // {
+        dependencies = [
+          sources."map-obj-1.0.1"
+        ];
+      })
+      sources."decompress-response-5.0.0"
+      sources."defer-to-connect-2.0.0"
+      sources."dot-prop-5.2.0"
       sources."duplexer3-0.1.4"
-      sources."env-paths-1.0.0"
+      sources."emoji-regex-8.0.0"
+      sources."emojilib-2.4.0"
+      sources."end-of-stream-1.4.4"
+      sources."env-paths-2.2.0"
       sources."error-ex-1.3.2"
       sources."escape-string-regexp-1.0.5"
       sources."esutils-2.0.3"
-      sources."execa-0.8.0"
-      sources."find-up-2.1.0"
-      sources."get-stdin-4.0.1"
-      sources."get-stream-3.0.0"
-      sources."globals-9.18.0"
-      sources."got-7.1.0"
-      sources."graceful-fs-4.2.3"
-      sources."has-ansi-3.0.0"
+      sources."execa-1.0.0"
+      sources."fast-deep-equal-3.1.1"
+      sources."fast-json-stable-stringify-2.1.0"
+      sources."find-up-3.0.0"
+      sources."gensync-1.0.0-beta.1"
+      sources."get-stream-4.1.0"
+      sources."globals-11.12.0"
+      (sources."got-10.6.0" // {
+        dependencies = [
+          sources."get-stream-5.1.0"
+        ];
+      })
+      sources."hard-rejection-2.1.0"
       sources."has-flag-3.0.0"
-      sources."has-symbol-support-x-1.4.2"
-      sources."has-to-string-tag-x-1.4.1"
-      sources."home-or-tmp-2.0.0"
-      sources."hosted-git-info-2.8.6"
-      sources."import-jsx-1.3.2"
+      sources."hosted-git-info-2.8.8"
+      sources."http-cache-semantics-4.1.0"
+      sources."import-jsx-3.1.0"
       sources."imurmurhash-0.1.4"
-      sources."indent-string-3.2.0"
-      (sources."ink-0.3.1" // {
+      sources."indent-string-4.0.0"
+      (sources."ink-2.7.1" // {
         dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.2"
-          sources."supports-color-5.5.0"
+          sources."ansi-styles-4.2.1"
+          sources."chalk-3.0.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+          sources."has-flag-4.0.0"
+          sources."supports-color-7.1.0"
+        ];
+      })
+      (sources."ink-text-input-3.2.2" // {
+        dependencies = [
+          sources."ansi-styles-4.2.1"
+          sources."chalk-3.0.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+          sources."has-flag-4.0.0"
+          sources."supports-color-7.1.0"
         ];
       })
-      sources."ink-text-input-1.1.1"
-      sources."invariant-2.2.4"
       sources."is-arrayish-0.2.1"
-      sources."is-finite-1.1.0"
-      sources."is-fullwidth-code-point-2.0.0"
-      sources."is-obj-1.0.1"
-      sources."is-object-1.0.1"
+      sources."is-ci-2.0.0"
+      sources."is-fullwidth-code-point-3.0.0"
+      sources."is-obj-2.0.0"
       sources."is-plain-obj-1.1.0"
-      sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
-      sources."is-utf8-0.2.1"
+      sources."is-typedarray-1.0.0"
+      sources."is-wsl-2.1.1"
       sources."isexe-2.0.0"
-      sources."isurl-1.0.0"
-      sources."js-tokens-3.0.2"
-      sources."jsesc-1.3.0"
-      sources."json5-0.5.1"
-      (sources."load-json-file-1.1.0" // {
-        dependencies = [
-          sources."pify-2.3.0"
-        ];
-      })
-      sources."locate-path-2.0.0"
+      sources."js-tokens-4.0.0"
+      sources."jsesc-2.5.2"
+      sources."json-buffer-3.0.1"
+      sources."json-parse-better-errors-1.0.2"
+      sources."json-schema-traverse-0.4.1"
+      sources."json-schema-typed-7.0.3"
+      sources."json5-2.1.1"
+      sources."keyv-4.0.0"
+      sources."lines-and-columns-1.1.6"
+      sources."locate-path-3.0.0"
       sources."lodash-4.17.15"
       sources."lodash.debounce-4.0.8"
-      sources."lodash.flattendeep-4.4.0"
-      sources."lodash.isequal-4.5.0"
-      sources."log-update-2.3.0"
-      sources."loose-envify-1.4.0"
-      sources."loud-rejection-1.6.0"
-      sources."lowercase-keys-1.0.1"
-      sources."lru-cache-4.1.5"
-      sources."make-dir-1.3.0"
-      sources."map-obj-1.0.1"
-      sources."mem-1.1.0"
-      (sources."meow-3.7.0" // {
+      sources."lodash.throttle-4.1.1"
+      (sources."log-update-3.4.0" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."ansi-escapes-3.2.0"
+          sources."ansi-regex-4.1.0"
+          sources."cli-cursor-2.1.0"
+          sources."emoji-regex-7.0.3"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."mimic-fn-1.2.0"
+          sources."onetime-2.0.1"
+          sources."restore-cursor-2.0.0"
+          sources."string-width-3.1.0"
+          sources."strip-ansi-5.2.0"
+          sources."wrap-ansi-5.1.0"
         ];
       })
-      sources."mimic-fn-1.2.0"
-      sources."mimic-response-1.0.1"
-      sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
-      sources."ms-2.0.0"
+      sources."loose-envify-1.4.0"
+      sources."lowercase-keys-2.0.0"
+      (sources."make-dir-3.0.2" // {
+        dependencies = [
+          sources."semver-6.3.0"
+        ];
+      })
+      sources."map-age-cleaner-0.1.3"
+      sources."map-obj-4.1.0"
+      (sources."mem-6.0.1" // {
+        dependencies = [
+          sources."mimic-fn-3.0.0"
+        ];
+      })
+      (sources."meow-6.0.1" // {
+        dependencies = [
+          sources."type-fest-0.8.1"
+        ];
+      })
+      sources."mimic-fn-2.1.0"
+      sources."mimic-response-2.1.0"
+      sources."min-indent-1.0.0"
+      sources."minimist-1.2.5"
+      (sources."minimist-options-4.0.2" // {
+        dependencies = [
+          sources."arrify-1.0.1"
+        ];
+      })
+      sources."ms-2.1.2"
+      sources."nice-try-1.0.5"
       sources."normalize-package-data-2.5.0"
+      sources."normalize-url-4.5.0"
       sources."npm-run-path-2.0.2"
       sources."object-assign-4.1.1"
-      sources."onetime-2.0.1"
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
-      sources."p-cancelable-0.3.0"
+      sources."once-1.4.0"
+      sources."onetime-5.1.0"
+      sources."p-cancelable-2.0.0"
+      sources."p-defer-1.0.0"
+      sources."p-event-4.1.0"
       sources."p-finally-1.0.0"
-      sources."p-limit-1.3.0"
-      sources."p-locate-2.0.0"
-      sources."p-timeout-1.2.1"
-      sources."p-try-1.0.0"
-      sources."parse-json-2.2.0"
+      sources."p-limit-2.2.2"
+      sources."p-locate-3.0.0"
+      sources."p-timeout-2.0.1"
+      sources."p-try-2.2.0"
+      sources."parse-json-5.0.0"
       sources."path-exists-3.0.0"
-      sources."path-is-absolute-1.0.1"
       sources."path-key-2.0.1"
       sources."path-parse-1.0.6"
-      (sources."path-type-1.1.0" // {
-        dependencies = [
-          sources."pify-2.3.0"
-        ];
-      })
-      sources."pify-3.0.0"
-      sources."pinkie-2.0.4"
-      sources."pinkie-promise-2.0.1"
-      sources."pkg-up-2.0.0"
-      sources."prepend-http-1.0.4"
-      sources."private-0.1.8"
+      sources."pkg-up-3.1.0"
       sources."prop-types-15.7.2"
-      sources."pseudomap-1.0.2"
-      sources."react-is-16.12.0"
-      sources."read-pkg-1.1.0"
-      (sources."read-pkg-up-1.0.1" // {
+      sources."pump-3.0.0"
+      sources."punycode-2.1.1"
+      sources."quick-lru-4.0.1"
+      sources."react-16.13.0"
+      sources."react-is-16.13.0"
+      sources."react-reconciler-0.24.0"
+      (sources."read-pkg-5.2.0" // {
         dependencies = [
-          sources."find-up-1.1.2"
-          sources."path-exists-2.1.0"
+          sources."type-fest-0.6.0"
         ];
       })
-      (sources."redent-1.0.0" // {
+      (sources."read-pkg-up-7.0.1" // {
         dependencies = [
-          sources."indent-string-2.1.0"
+          sources."find-up-4.1.0"
+          sources."locate-path-5.0.0"
+          sources."p-locate-4.1.0"
+          sources."path-exists-4.0.0"
+          sources."type-fest-0.8.1"
         ];
       })
-      sources."regenerator-runtime-0.11.1"
-      sources."repeating-2.0.1"
-      sources."require-from-string-1.2.1"
+      sources."redent-3.0.0"
       sources."resolve-1.15.1"
       sources."resolve-from-3.0.0"
-      sources."restore-cursor-2.0.0"
-      sources."safe-buffer-5.2.0"
+      sources."responselike-2.0.0"
+      sources."restore-cursor-3.1.0"
+      sources."safe-buffer-5.1.2"
+      sources."scheduler-0.18.0"
       sources."semver-5.7.1"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
       sources."skin-tone-1.0.0"
-      sources."slash-1.0.0"
+      (sources."slice-ansi-3.0.0" // {
+        dependencies = [
+          sources."ansi-styles-4.2.1"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+        ];
+      })
       sources."source-map-0.5.7"
-      sources."source-map-support-0.4.18"
       sources."spdx-correct-3.1.0"
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.5"
-      (sources."string-width-2.1.1" // {
+      (sources."string-length-3.1.0" // {
         dependencies = [
-          sources."strip-ansi-4.0.0"
+          sources."ansi-regex-4.1.0"
+          sources."astral-regex-1.0.0"
+          sources."strip-ansi-5.2.0"
         ];
       })
-      (sources."strip-ansi-3.0.1" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-        ];
-      })
-      sources."strip-bom-2.0.0"
+      sources."string-width-4.2.0"
+      sources."strip-ansi-6.0.0"
       sources."strip-eof-1.0.0"
-      sources."strip-indent-1.0.1"
-      sources."supports-color-2.0.0"
-      sources."timed-out-4.0.1"
-      sources."to-fast-properties-1.0.3"
-      sources."trim-newlines-1.0.0"
-      sources."trim-right-1.0.1"
+      sources."strip-indent-3.0.0"
+      sources."supports-color-5.5.0"
+      sources."to-fast-properties-2.0.0"
+      sources."to-readable-stream-2.1.0"
+      sources."trim-newlines-3.0.0"
+      sources."type-fest-0.10.0"
+      sources."typedarray-to-buffer-3.1.5"
       sources."unicode-emoji-modifier-base-1.0.0"
-      sources."url-parse-lax-1.0.0"
-      sources."url-to-options-1.0.1"
+      sources."uri-js-4.2.2"
       sources."validate-npm-package-license-3.0.4"
       sources."which-1.3.1"
-      (sources."wrap-ansi-3.0.1" // {
+      sources."widest-line-3.1.0"
+      (sources."wrap-ansi-6.2.0" // {
         dependencies = [
-          sources."strip-ansi-4.0.0"
+          sources."ansi-styles-4.2.1"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
         ];
       })
-      sources."write-file-atomic-2.4.3"
-      sources."yallist-2.1.2"
+      sources."wrappy-1.0.2"
+      sources."write-file-atomic-3.0.3"
+      sources."yargs-parser-16.1.0"
+      sources."yoga-layout-prebuilt-1.9.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -53755,10 +55074,15 @@ in
     dependencies = [
       sources."@babel/code-frame-7.8.3"
       sources."@babel/highlight-7.8.3"
-      sources."acorn-7.1.0"
-      sources."acorn-jsx-5.1.0"
+      sources."@types/color-name-1.1.1"
+      sources."acorn-7.1.1"
+      sources."acorn-jsx-5.2.0"
       sources."ajv-6.12.0"
-      sources."ansi-escapes-4.3.0"
+      (sources."ansi-escapes-4.3.1" // {
+        dependencies = [
+          sources."type-fest-0.11.0"
+        ];
+      })
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-3.2.1"
       sources."argparse-1.0.10"
@@ -53786,7 +55110,7 @@ in
       sources."eslint-scope-5.0.0"
       sources."eslint-utils-1.4.3"
       sources."eslint-visitor-keys-1.1.0"
-      sources."espree-6.1.2"
+      sources."espree-6.2.1"
       sources."esprima-4.0.1"
       sources."esquery-1.1.0"
       sources."esrecurse-4.2.1"
@@ -53804,7 +55128,7 @@ in
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.6"
       sources."glob-parent-5.1.0"
-      sources."globals-12.3.0"
+      sources."globals-12.4.0"
       sources."has-flag-3.0.0"
       sources."iconv-lite-0.4.24"
       sources."ignore-4.0.6"
@@ -53812,7 +55136,17 @@ in
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."inquirer-7.0.4"
+      (sources."inquirer-7.1.0" // {
+        dependencies = [
+          sources."ansi-styles-4.2.1"
+          sources."chalk-3.0.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+          sources."has-flag-4.0.0"
+          sources."strip-ansi-6.0.0"
+          sources."supports-color-7.1.0"
+        ];
+      })
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-glob-4.0.1"
@@ -53846,7 +55180,7 @@ in
       sources."resolve-from-4.0.0"
       sources."restore-cursor-3.1.0"
       sources."rimraf-2.6.3"
-      sources."run-async-2.3.0"
+      sources."run-async-2.4.0"
       sources."rxjs-6.5.4"
       sources."safer-buffer-2.1.2"
       sources."semver-6.3.0"
@@ -53881,7 +55215,7 @@ in
       sources."text-table-0.2.0"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
-      sources."tslib-1.11.0"
+      sources."tslib-1.11.1"
       sources."type-check-0.3.2"
       sources."type-fest-0.8.1"
       sources."uri-js-4.2.2"
@@ -53912,10 +55246,15 @@ in
     dependencies = [
       sources."@babel/code-frame-7.8.3"
       sources."@babel/highlight-7.8.3"
-      sources."acorn-7.1.0"
-      sources."acorn-jsx-5.1.0"
+      sources."@types/color-name-1.1.1"
+      sources."acorn-7.1.1"
+      sources."acorn-jsx-5.2.0"
       sources."ajv-6.12.0"
-      sources."ansi-escapes-4.3.0"
+      (sources."ansi-escapes-4.3.1" // {
+        dependencies = [
+          sources."type-fest-0.11.0"
+        ];
+      })
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-3.2.1"
       sources."argparse-1.0.10"
@@ -53945,7 +55284,7 @@ in
       sources."eslint-scope-5.0.0"
       sources."eslint-utils-1.4.3"
       sources."eslint-visitor-keys-1.1.0"
-      sources."espree-6.1.2"
+      sources."espree-6.2.1"
       sources."esprima-4.0.1"
       sources."esquery-1.1.0"
       sources."esrecurse-4.2.1"
@@ -53963,7 +55302,7 @@ in
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.6"
       sources."glob-parent-5.1.0"
-      sources."globals-12.3.0"
+      sources."globals-12.4.0"
       sources."has-flag-3.0.0"
       sources."iconv-lite-0.4.24"
       sources."ignore-4.0.6"
@@ -53971,7 +55310,17 @@ in
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."inquirer-7.0.4"
+      (sources."inquirer-7.1.0" // {
+        dependencies = [
+          sources."ansi-styles-4.2.1"
+          sources."chalk-3.0.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+          sources."has-flag-4.0.0"
+          sources."strip-ansi-6.0.0"
+          sources."supports-color-7.1.0"
+        ];
+      })
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-glob-4.0.1"
@@ -54008,7 +55357,7 @@ in
       sources."resolve-from-4.0.0"
       sources."restore-cursor-3.1.0"
       sources."rimraf-2.6.3"
-      sources."run-async-2.3.0"
+      sources."run-async-2.4.0"
       sources."rxjs-6.5.4"
       sources."safer-buffer-2.1.2"
       sources."semver-6.3.0"
@@ -54043,7 +55392,7 @@ in
       sources."text-table-0.2.0"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
-      sources."tslib-1.11.0"
+      sources."tslib-1.11.1"
       sources."type-check-0.3.2"
       sources."type-fest-0.8.1"
       sources."uri-js-4.2.2"
@@ -54124,7 +55473,7 @@ in
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
       sources."hasha-2.2.0"
-      sources."hosted-git-info-2.8.6"
+      sources."hosted-git-info-2.8.8"
       sources."http-signature-1.2.0"
       sources."indent-string-2.1.0"
       sources."inherits-2.0.4"
@@ -54159,7 +55508,7 @@ in
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
       sources."mimic-fn-1.2.0"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -54251,10 +55600,10 @@ in
   fkill-cli = nodeEnv.buildNodePackage {
     name = "fkill-cli";
     packageName = "fkill-cli";
-    version = "6.0.0";
+    version = "6.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/fkill-cli/-/fkill-cli-6.0.0.tgz";
-      sha512 = "YlxeZ1Oid9No7mUMVAuHX1hHhzaydXihUNM2s52y/EkCyVAbQyrSt7+E/Ij+jLO3houXG2k4d2pz4vev0jVqlQ==";
+      url = "https://registry.npmjs.org/fkill-cli/-/fkill-cli-6.0.1.tgz";
+      sha512 = "eJdNdyHofekXmSGI76E2A4GBJ7FAvuAgLV7rAgL6uZXV9+ZKwNoBjt/2hxHWmDZZ9x0EEWM3wHb2b0J7UNGbBw==";
     };
     dependencies = [
       sources."@babel/code-frame-7.8.3"
@@ -54272,13 +55621,13 @@ in
       sources."@types/minimist-1.2.0"
       sources."@types/normalize-package-data-2.4.0"
       sources."aggregate-error-3.0.1"
-      sources."ansi-escapes-4.3.0"
+      sources."ansi-escapes-4.3.1"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.2.1"
       sources."arrify-2.0.1"
       sources."astral-regex-2.0.0"
       sources."camelcase-5.3.1"
-      sources."camelcase-keys-6.1.2"
+      sources."camelcase-keys-6.2.1"
       sources."chalk-3.0.0"
       sources."chardet-0.7.0"
       sources."clean-stack-2.2.0"
@@ -54312,22 +55661,11 @@ in
       sources."get-stream-5.1.0"
       sources."hard-rejection-2.1.0"
       sources."has-flag-4.0.0"
-      sources."hosted-git-info-2.8.6"
+      sources."hosted-git-info-2.8.8"
       sources."human-signals-1.1.1"
       sources."iconv-lite-0.4.24"
       sources."indent-string-4.0.0"
-      (sources."inquirer-7.0.4" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.2"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."has-flag-3.0.0"
-          sources."strip-ansi-5.2.0"
-          sources."supports-color-5.5.0"
-        ];
-      })
+      sources."inquirer-7.1.0"
       (sources."inquirer-autocomplete-prompt-1.0.2" // {
         dependencies = [
           sources."ansi-escapes-3.2.0"
@@ -54353,7 +55691,11 @@ in
       sources."lodash-4.17.15"
       sources."lru-cache-4.1.5"
       sources."map-obj-4.1.0"
-      sources."meow-6.0.1"
+      (sources."meow-6.0.1" // {
+        dependencies = [
+          sources."type-fest-0.8.1"
+        ];
+      })
       sources."merge-stream-2.0.0"
       sources."mimic-fn-2.1.0"
       sources."min-indent-1.0.0"
@@ -54401,11 +55743,15 @@ in
           sources."type-fest-0.6.0"
         ];
       })
-      sources."read-pkg-up-7.0.1"
+      (sources."read-pkg-up-7.0.1" // {
+        dependencies = [
+          sources."type-fest-0.8.1"
+        ];
+      })
       sources."redent-3.0.0"
       sources."resolve-1.15.1"
       sources."restore-cursor-3.1.0"
-      sources."run-async-2.3.0"
+      sources."run-async-2.4.0"
       sources."rxjs-6.5.4"
       sources."safer-buffer-2.1.2"
       sources."semver-5.7.1"
@@ -54431,8 +55777,8 @@ in
       sources."through-2.3.8"
       sources."tmp-0.0.33"
       sources."trim-newlines-3.0.0"
-      sources."tslib-1.11.0"
-      sources."type-fest-0.8.1"
+      sources."tslib-1.11.1"
+      sources."type-fest-0.11.0"
       sources."validate-npm-package-license-3.0.4"
       sources."which-2.0.2"
       sources."wrappy-1.0.2"
@@ -54712,7 +56058,7 @@ in
       (sources."prettyjson-1.2.1" // {
         dependencies = [
           sources."colors-1.4.0"
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
         ];
       })
       sources."process-nextick-args-2.0.1"
@@ -54888,7 +56234,7 @@ in
       sources."microee-0.0.6"
       sources."minilog-3.1.0"
       sources."ms-2.1.2"
-      sources."simple-git-1.131.0"
+      sources."simple-git-1.132.0"
       sources."tabtab-git+https://github.com/mixu/node-tabtab.git"
     ];
     buildInputs = globalBuildInputs;
@@ -54937,7 +56283,7 @@ in
       sources."is-my-ip-valid-1.0.0"
       sources."is-my-json-valid-2.20.0"
       sources."is-property-1.0.2"
-      sources."is-valid-domain-0.0.11"
+      sources."is-valid-domain-0.0.14"
       sources."json-buffer-2.0.11"
       sources."jsonpointer-4.0.1"
       sources."kvgraph-0.1.0"
@@ -54949,7 +56295,7 @@ in
       sources."lrucache-1.0.3"
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -54965,7 +56311,7 @@ in
       sources."muxrpc-6.5.0"
       sources."nan-2.14.0"
       sources."nearley-2.19.1"
-      sources."node-gyp-build-4.2.0"
+      sources."node-gyp-build-4.2.1"
       sources."node-polyglot-1.0.0"
       sources."non-private-ip-1.4.4"
       sources."options-0.0.6"
@@ -55112,10 +56458,10 @@ in
   gitmoji-cli = nodeEnv.buildNodePackage {
     name = "gitmoji-cli";
     packageName = "gitmoji-cli";
-    version = "3.2.1";
+    version = "3.2.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.2.1.tgz";
-      sha512 = "nPsJ9wmpzKhUQY5FiJQx5sVLAr6kyDLIBlyLWGbZi56ICqGa7CiK9setsj0FfJrBgI7H68e5kkXjH9kEl+IkkQ==";
+      url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.2.3.tgz";
+      sha512 = "xUNP+b2CUzMIURcnEVXNgQo51ShKjjjfAO1U4a0A9KzathisjtGrsrrDUnXJlqojGOBYm/z2sAq/h0GfO6DX8A==";
     };
     dependencies = [
       sources."@babel/code-frame-7.8.3"
@@ -55137,23 +56483,29 @@ in
       sources."ajv-6.12.0"
       (sources."ansi-align-3.0.0" // {
         dependencies = [
+          sources."ansi-regex-4.1.0"
           sources."emoji-regex-7.0.3"
           sources."is-fullwidth-code-point-2.0.0"
           sources."string-width-3.1.0"
+          sources."strip-ansi-5.2.0"
         ];
       })
-      sources."ansi-escapes-4.3.0"
+      sources."ansi-escapes-4.3.1"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.2.1"
       sources."arrify-1.0.1"
-      sources."boxen-4.2.0"
+      (sources."boxen-4.2.0" // {
+        dependencies = [
+          sources."type-fest-0.8.1"
+        ];
+      })
       (sources."cacheable-request-6.1.0" // {
         dependencies = [
           sources."lowercase-keys-2.0.0"
         ];
       })
       sources."camelcase-5.3.1"
-      sources."camelcase-keys-6.1.2"
+      sources."camelcase-keys-6.2.1"
       sources."chalk-3.0.0"
       sources."chardet-0.7.0"
       sources."ci-info-2.0.0"
@@ -55195,7 +56547,7 @@ in
       sources."fast-json-stable-stringify-2.1.0"
       sources."figures-3.2.0"
       sources."find-up-3.0.0"
-      sources."fuse.js-3.4.6"
+      sources."fuse.js-3.6.1"
       sources."get-stream-5.1.0"
       sources."global-dirs-2.0.1"
       (sources."got-9.6.0" // {
@@ -55207,24 +56559,15 @@ in
       sources."hard-rejection-2.1.0"
       sources."has-flag-4.0.0"
       sources."has-yarn-2.1.0"
-      sources."hosted-git-info-2.8.6"
-      sources."http-cache-semantics-4.0.4"
+      sources."hosted-git-info-2.8.8"
+      sources."http-cache-semantics-4.1.0"
       sources."human-signals-1.1.1"
       sources."iconv-lite-0.4.24"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
       sources."indent-string-4.0.0"
       sources."ini-1.3.5"
-      (sources."inquirer-7.0.4" // {
-        dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.2"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."has-flag-3.0.0"
-          sources."supports-color-5.5.0"
-        ];
-      })
+      sources."inquirer-7.1.0"
       (sources."inquirer-autocomplete-prompt-1.0.2" // {
         dependencies = [
           sources."ansi-escapes-3.2.0"
@@ -55274,12 +56617,16 @@ in
       sources."lowercase-keys-1.0.1"
       sources."make-dir-3.0.2"
       sources."map-obj-4.1.0"
-      sources."meow-6.0.1"
+      (sources."meow-6.0.1" // {
+        dependencies = [
+          sources."type-fest-0.8.1"
+        ];
+      })
       sources."merge-stream-2.0.0"
       sources."mimic-fn-2.1.0"
       sources."mimic-response-1.0.1"
       sources."min-indent-1.0.0"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."minimist-options-4.0.2"
       sources."mute-stream-0.0.8"
       sources."node-fetch-2.6.0"
@@ -55292,11 +56639,7 @@ in
       sources."npm-run-path-4.0.1"
       sources."once-1.4.0"
       sources."onetime-5.1.0"
-      (sources."ora-4.0.3" // {
-        dependencies = [
-          sources."strip-ansi-6.0.0"
-        ];
-      })
+      sources."ora-4.0.3"
       sources."os-tmpdir-1.0.2"
       sources."p-cancelable-1.1.0"
       sources."p-limit-2.2.2"
@@ -55325,6 +56668,7 @@ in
           sources."locate-path-5.0.0"
           sources."p-locate-4.1.0"
           sources."path-exists-4.0.0"
+          sources."type-fest-0.8.1"
         ];
       })
       sources."redent-3.0.0"
@@ -55333,7 +56677,7 @@ in
       sources."resolve-1.15.1"
       sources."responselike-1.0.2"
       sources."restore-cursor-3.1.0"
-      sources."run-async-2.3.0"
+      sources."run-async-2.4.0"
       sources."rxjs-6.5.4"
       sources."safer-buffer-2.1.2"
       sources."semver-6.3.0"
@@ -55345,16 +56689,8 @@ in
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.5"
-      (sources."string-width-4.2.0" // {
-        dependencies = [
-          sources."strip-ansi-6.0.0"
-        ];
-      })
-      (sources."strip-ansi-5.2.0" // {
-        dependencies = [
-          sources."ansi-regex-4.1.0"
-        ];
-      })
+      sources."string-width-4.2.0"
+      sources."strip-ansi-6.0.0"
       sources."strip-final-newline-2.0.0"
       sources."strip-indent-3.0.0"
       sources."strip-json-comments-2.0.1"
@@ -55364,8 +56700,8 @@ in
       sources."tmp-0.0.33"
       sources."to-readable-stream-1.0.0"
       sources."trim-newlines-3.0.0"
-      sources."tslib-1.11.0"
-      sources."type-fest-0.8.1"
+      sources."tslib-1.11.1"
+      sources."type-fest-0.11.0"
       sources."typedarray-to-buffer-3.1.5"
       sources."unique-string-2.0.0"
       sources."update-notifier-4.1.0"
@@ -55426,7 +56762,7 @@ in
           sources."strip-ansi-5.2.0"
         ];
       })
-      sources."ansi-escapes-4.3.0"
+      sources."ansi-escapes-4.3.1"
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
       (sources."apollo-codegen-0.20.2" // {
@@ -55537,24 +56873,19 @@ in
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
           sources."has-flag-4.0.0"
-          sources."inquirer-7.0.4"
+          (sources."inquirer-7.1.0" // {
+            dependencies = [
+              sources."chalk-3.0.0"
+            ];
+          })
           sources."is-fullwidth-code-point-3.0.0"
           (sources."ora-4.0.3" // {
             dependencies = [
               sources."chalk-3.0.0"
-              sources."strip-ansi-6.0.0"
-            ];
-          })
-          (sources."string-width-4.2.0" // {
-            dependencies = [
-              sources."strip-ansi-6.0.0"
-            ];
-          })
-          (sources."strip-ansi-5.2.0" // {
-            dependencies = [
-              sources."ansi-regex-4.1.0"
             ];
           })
+          sources."string-width-4.2.0"
+          sources."strip-ansi-6.0.0"
           sources."supports-color-7.1.0"
           sources."update-notifier-3.0.1"
         ];
@@ -55703,8 +57034,8 @@ in
       sources."has-yarn-2.1.0"
       sources."header-case-1.0.1"
       sources."homedir-polyfill-1.0.3"
-      sources."hosted-git-info-2.8.6"
-      sources."http-cache-semantics-4.0.4"
+      sources."hosted-git-info-2.8.8"
+      sources."http-cache-semantics-4.1.0"
       (sources."http-errors-1.7.2" // {
         dependencies = [
           sources."inherits-2.0.3"
@@ -55840,7 +57171,7 @@ in
       sources."mimic-fn-1.2.0"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       (sources."minipass-3.1.1" // {
         dependencies = [
           sources."yallist-4.0.0"
@@ -55978,7 +57309,7 @@ in
       sources."responselike-1.0.2"
       sources."restore-cursor-3.1.0"
       sources."rimraf-2.7.1"
-      sources."run-async-2.3.0"
+      sources."run-async-2.4.0"
       sources."rxjs-6.5.4"
       sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
@@ -56054,10 +57385,10 @@ in
       sources."tough-cookie-2.5.0"
       sources."traverse-chain-0.1.0"
       sources."trim-right-1.0.1"
-      sources."tslib-1.11.0"
+      sources."tslib-1.11.1"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."type-fest-0.8.1"
+      sources."type-fest-0.11.0"
       sources."type-is-1.6.18"
       sources."unique-string-1.0.0"
       sources."universalify-0.1.2"
@@ -56286,7 +57617,7 @@ in
       })
       sources."ms-2.0.0"
       sources."nanomatch-1.2.13"
-      sources."nopt-4.0.1"
+      sources."nopt-4.0.3"
       (sources."object-copy-0.1.0" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -56420,25 +57751,29 @@ in
       sha512 = "Dn/8Kt57CsFLHd9vJIqWuhzXETpm+J86tD444rOz04uUu0kQBUTEBXmwu7zOVntb+TRr4EuyRxBo2tecJAPFmA==";
     };
     dependencies = [
+      sources."@types/color-name-1.1.1"
       sources."abbrev-1.1.1"
+      sources."ansi-escapes-4.3.1"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
       sources."ansi-term-0.0.2"
-      sources."ansicolors-0.2.1"
+      sources."ansicolors-0.3.2"
       sources."blessed-0.1.81"
-      sources."blessed-contrib-4.8.18"
+      sources."blessed-contrib-4.8.19"
       sources."bresenham-0.0.3"
       sources."buffers-0.1.1"
-      sources."cardinal-1.0.0"
+      sources."cardinal-2.1.1"
       sources."chalk-1.1.3"
       sources."charm-0.1.2"
       sources."cli-table-0.3.1"
+      sources."color-convert-2.0.1"
+      sources."color-name-1.1.4"
       sources."colors-1.0.3"
       sources."core-util-is-1.0.2"
       sources."drawille-blessed-contrib-1.0.0"
       sources."drawille-canvas-blessed-contrib-0.1.3"
       sources."escape-string-regexp-1.0.5"
-      sources."esprima-3.0.0"
+      sources."esprima-4.0.1"
       (sources."event-stream-0.9.8" // {
         dependencies = [
           sources."optimist-0.2.8"
@@ -56446,15 +57781,21 @@ in
       })
       sources."gl-matrix-2.8.1"
       sources."has-ansi-2.0.0"
+      sources."has-flag-4.0.0"
       sources."here-0.0.2"
       sources."inherits-2.0.4"
       sources."isarray-0.0.1"
       sources."lodash-4.17.15"
-      sources."lodash.assign-4.2.0"
       sources."lodash.toarray-4.4.0"
       sources."map-canvas-0.1.5"
       sources."marked-0.7.0"
-      sources."marked-terminal-1.7.0"
+      (sources."marked-terminal-4.0.0" // {
+        dependencies = [
+          sources."ansi-styles-4.2.1"
+          sources."chalk-3.0.0"
+          sources."supports-color-7.1.0"
+        ];
+      })
       sources."memory-streams-0.1.3"
       sources."memorystream-0.3.1"
       sources."node-emoji-1.10.0"
@@ -56463,14 +57804,20 @@ in
       sources."picture-tuber-1.0.2"
       sources."png-js-0.1.1"
       sources."readable-stream-1.0.34"
-      sources."redeyed-1.0.1"
+      sources."redeyed-2.1.1"
       sources."sax-1.2.4"
       sources."sparkline-0.1.2"
       sources."string_decoder-0.10.31"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
-      sources."systeminformation-4.22.3"
+      (sources."supports-hyperlinks-2.1.0" // {
+        dependencies = [
+          sources."supports-color-7.1.0"
+        ];
+      })
+      sources."systeminformation-4.23.1"
       sources."term-canvas-0.0.5"
+      sources."type-fest-0.11.0"
       sources."wordwrap-0.0.3"
       sources."x256-0.0.2"
       sources."xml2js-0.4.23"
@@ -56687,7 +58034,7 @@ in
         ];
       })
       sources."homedir-polyfill-1.0.3"
-      sources."hosted-git-info-2.8.6"
+      sources."hosted-git-info-2.8.8"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
@@ -57067,7 +58414,7 @@ in
         ];
       })
       sources."homedir-polyfill-1.0.3"
-      sources."hosted-git-info-2.8.6"
+      sources."hosted-git-info-2.8.8"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
       sources."interpret-1.2.0"
@@ -57465,7 +58812,7 @@ in
       sources."http-proxy-1.18.0"
       sources."lodash-4.17.15"
       sources."mime-1.6.0"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -57655,7 +59002,7 @@ in
       sources."@types/sizzle-2.3.2"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
-      sources."clipboard-2.0.4"
+      sources."clipboard-2.0.6"
       sources."clone-1.0.4"
       sources."concat-map-0.0.1"
       sources."decimal.js-7.5.1"
@@ -57732,8 +59079,6 @@ in
           sources."ansi-styles-4.2.1"
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
-          sources."has-flag-4.0.0"
-          sources."supports-color-7.1.0"
         ];
       })
       sources."chardet-0.7.0"
@@ -57816,7 +59161,7 @@ in
       })
       sources."glob-7.1.6"
       sources."graceful-fs-4.2.3"
-      sources."has-flag-3.0.0"
+      sources."has-flag-4.0.0"
       sources."http-errors-1.7.3"
       (sources."http-proxy-agent-2.1.0" // {
         dependencies = [
@@ -57833,15 +59178,13 @@ in
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      (sources."inquirer-7.0.4" // {
+      (sources."inquirer-7.1.0" // {
         dependencies = [
-          sources."ansi-escapes-4.3.0"
-          sources."chalk-2.4.2"
+          sources."ansi-escapes-4.3.1"
           sources."cli-cursor-3.1.0"
           sources."mimic-fn-2.1.0"
           sources."onetime-5.1.0"
           sources."restore-cursor-3.1.0"
-          sources."strip-ansi-5.2.0"
         ];
       })
       sources."ip-1.1.5"
@@ -57888,7 +59231,7 @@ in
       sources."mime-types-2.1.26"
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."minipass-2.9.0"
       sources."minizlib-1.3.3"
       (sources."mkdirp-0.5.1" // {
@@ -57907,7 +59250,7 @@ in
       })
       sources."once-1.4.0"
       sources."onetime-2.0.1"
-      sources."open-7.0.2"
+      sources."open-7.0.3"
       sources."optionator-0.8.3"
       sources."os-name-3.1.0"
       sources."os-tmpdir-1.0.2"
@@ -57919,7 +59262,7 @@ in
       sources."prelude-ls-1.1.2"
       sources."process-nextick-args-2.0.1"
       sources."proxy-agent-3.1.1"
-      sources."proxy-from-env-1.0.0"
+      sources."proxy-from-env-1.1.0"
       sources."pump-3.0.0"
       sources."qs-6.9.1"
       sources."raw-body-2.4.1"
@@ -57927,7 +59270,7 @@ in
       sources."restore-cursor-2.0.0"
       sources."rimraf-3.0.2"
       sources."rsvp-3.6.2"
-      sources."run-async-2.3.0"
+      sources."run-async-2.4.0"
       sources."rxjs-6.5.4"
       sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
@@ -57982,7 +59325,7 @@ in
           sources."debug-3.2.6"
         ];
       })
-      sources."supports-color-5.5.0"
+      sources."supports-color-7.1.0"
       sources."tar-4.4.13"
       sources."through-2.3.8"
       sources."through2-3.0.1"
@@ -57990,9 +59333,9 @@ in
       sources."tmp-0.0.33"
       sources."toidentifier-1.0.0"
       sources."tree-kill-1.2.2"
-      sources."tslib-1.11.0"
+      sources."tslib-1.11.1"
       sources."type-check-0.3.2"
-      sources."type-fest-0.8.1"
+      sources."type-fest-0.11.0"
       sources."typedarray-to-buffer-3.1.5"
       sources."universalify-0.1.2"
       sources."unpipe-1.0.0"
@@ -58011,7 +59354,7 @@ in
       })
       sources."wrappy-1.0.2"
       sources."write-file-atomic-3.0.3"
-      sources."ws-7.2.1"
+      sources."ws-7.2.3"
       sources."xregexp-2.0.0"
       sources."yallist-3.1.1"
     ];
@@ -58171,7 +59514,7 @@ in
       sources."har-validator-5.1.3"
       sources."has-flag-3.0.0"
       sources."has-unicode-2.0.1"
-      sources."hosted-git-info-2.8.6"
+      sources."hosted-git-info-2.8.8"
       sources."http-signature-1.2.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -58412,7 +59755,7 @@ in
       sources."wrappy-1.0.2"
       sources."y18n-3.2.1"
       sources."yallist-2.1.2"
-      (sources."yargs-14.2.2" // {
+      (sources."yargs-14.2.3" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
           sources."camelcase-5.3.1"
@@ -58429,7 +59772,7 @@ in
           sources."strip-ansi-5.2.0"
           sources."wrap-ansi-5.1.0"
           sources."y18n-4.0.0"
-          sources."yargs-parser-15.0.0"
+          sources."yargs-parser-15.0.1"
         ];
       })
       sources."yargs-parser-7.0.0"
@@ -58524,7 +59867,7 @@ in
       sources."lodash-4.17.15"
       sources."long-2.4.0"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."mz-2.7.0"
       sources."node-int64-0.4.0"
       sources."object-assign-4.1.1"
@@ -58572,19 +59915,20 @@ in
   joplin = nodeEnv.buildNodePackage {
     name = "joplin";
     packageName = "joplin";
-    version = "1.0.155";
+    version = "1.0.161";
     src = fetchurl {
-      url = "https://registry.npmjs.org/joplin/-/joplin-1.0.155.tgz";
-      sha512 = "KgaE+pkLK8ku98UmQ+mxt8Y/xXwby+FgUPRNsDu00NO2+4vLyZK9RCBej+OeGFSYj3Zia28ICojfZ+bU4unxsA==";
+      url = "https://registry.npmjs.org/joplin/-/joplin-1.0.161.tgz";
+      sha512 = "QjiWOqh8s9nkR2Gsf05mTl6eiQx74JtQF/4mcJnX9eUbMgJT5wof6vLP6AjFE6D67YN3iZl2zoQRhx96aP8VRg==";
     };
     dependencies = [
       sources."@cronvel/get-pixels-3.3.1"
+      sources."@yarnpkg/lockfile-1.1.0"
       sources."abab-2.0.3"
       sources."abbrev-1.1.1"
-      sources."acorn-5.7.3"
+      sources."acorn-5.7.4"
       (sources."acorn-globals-4.3.4" // {
         dependencies = [
-          sources."acorn-6.4.0"
+          sources."acorn-6.4.1"
         ];
       })
       sources."acorn-walk-6.2.0"
@@ -58610,11 +59954,16 @@ in
           sources."sprintf-js-1.0.3"
         ];
       })
+      sources."arr-diff-4.0.0"
+      sources."arr-flatten-1.1.0"
+      sources."arr-union-3.1.0"
       sources."array-back-2.0.0"
       sources."array-equal-1.0.0"
+      sources."array-unique-0.3.2"
       sources."asap-2.0.6"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
+      sources."assign-symbols-1.0.0"
       sources."async-limiter-1.0.1"
       sources."async-mutex-0.1.4"
       sources."asynckit-0.4.0"
@@ -58622,11 +59971,23 @@ in
       sources."aws-sign2-0.7.0"
       sources."aws4-1.9.1"
       sources."balanced-match-1.0.0"
+      (sources."base-0.11.2" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+        ];
+      })
       sources."base-64-0.1.0"
+      sources."base64-stream-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
-      sources."bl-3.0.0"
+      sources."bl-4.0.1"
       sources."brace-expansion-1.1.11"
-      sources."browser-process-hrtime-0.1.3"
+      (sources."braces-2.3.2" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
+      sources."browser-process-hrtime-1.0.0"
+      sources."cache-base-1.0.1"
       sources."camel-case-3.0.0"
       sources."camelcase-4.1.0"
       sources."caseless-0.12.0"
@@ -58634,10 +59995,33 @@ in
       sources."charenc-0.0.2"
       sources."chownr-1.1.4"
       sources."chroma-js-2.1.0"
+      sources."ci-info-2.0.0"
+      (sources."class-utils-0.3.6" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
       sources."clean-css-4.2.3"
-      sources."clean-html-1.5.0"
+      (sources."clean-html-1.5.0" // {
+        dependencies = [
+          sources."htmlparser2-3.10.1"
+        ];
+      })
       sources."cliss-0.0.2"
       sources."code-point-at-1.1.0"
+      sources."collection-visit-1.0.0"
       sources."color-3.1.2"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
@@ -58646,11 +60030,21 @@ in
       sources."command-line-usage-4.1.0"
       sources."commander-2.17.1"
       sources."compare-version-0.1.2"
+      sources."component-emitter-1.3.0"
       sources."concat-map-0.0.1"
       sources."console-control-strings-1.1.0"
+      sources."copy-descriptor-0.1.1"
       sources."core-util-is-1.0.2"
-      sources."cross-env-6.0.3"
-      sources."cross-spawn-7.0.1"
+      (sources."cross-env-6.0.3" // {
+        dependencies = [
+          sources."cross-spawn-7.0.1"
+          sources."path-key-3.1.1"
+          sources."shebang-command-2.0.0"
+          sources."shebang-regex-3.0.0"
+          sources."which-2.0.2"
+        ];
+      })
+      sources."cross-spawn-6.0.5"
       sources."crypt-0.0.2"
       sources."css-2.2.4"
       sources."cssom-0.3.8"
@@ -58668,6 +60062,7 @@ in
       sources."deep-extend-0.6.0"
       sources."deep-is-0.1.3"
       sources."deepmerge-2.2.1"
+      sources."define-property-2.0.2"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
       sources."depd-1.1.2"
@@ -58703,8 +60098,39 @@ in
       sources."esprima-4.0.1"
       sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
+      (sources."expand-brackets-2.1.4" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+          sources."ms-2.0.0"
+        ];
+      })
       sources."expand-template-2.0.3"
       sources."extend-3.0.2"
+      (sources."extend-shallow-3.0.2" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
+      (sources."extglob-2.0.4" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."extend-shallow-2.0.1"
+        ];
+      })
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.1"
       sources."fast-json-stable-stringify-2.1.0"
@@ -58713,14 +60139,26 @@ in
       sources."fd-slicer-1.1.0"
       sources."file-type-10.11.0"
       sources."file-uri-to-path-1.0.0"
+      (sources."fill-range-4.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
       sources."find-up-2.1.0"
+      (sources."find-yarn-workspace-root-1.2.1" // {
+        dependencies = [
+          sources."fs-extra-4.0.3"
+        ];
+      })
       sources."follow-redirects-1.10.0"
       sources."font-awesome-filetypes-2.1.0"
       sources."for-each-property-0.0.4"
       sources."for-each-property-deep-0.0.3"
+      sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.5.1"
       sources."format-0.2.2"
+      sources."fragment-cache-0.2.1"
       sources."fs-constants-1.0.0"
       sources."fs-extra-5.0.0"
       sources."fs-minipass-2.1.0"
@@ -58732,6 +60170,7 @@ in
       })
       sources."get-prototype-chain-1.0.1"
       sources."get-stdin-5.0.1"
+      sources."get-value-2.0.6"
       sources."getpass-0.1.7"
       sources."github-from-package-0.0.0"
       sources."glob-7.1.6"
@@ -58741,12 +60180,25 @@ in
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
       sources."has-unicode-2.0.1"
+      sources."has-value-1.0.0"
+      (sources."has-values-1.0.0" // {
+        dependencies = [
+          sources."kind-of-4.0.0"
+        ];
+      })
       sources."he-1.2.0"
       sources."highlight.js-9.18.1"
       sources."html-encoding-sniffer-1.0.2"
       sources."html-entities-1.2.1"
       sources."html-minifier-3.5.21"
-      sources."htmlparser2-3.10.1"
+      (sources."htmlparser2-4.1.0" // {
+        dependencies = [
+          sources."domelementtype-2.0.1"
+          sources."domhandler-3.0.0"
+          sources."domutils-2.0.0"
+          sources."entities-2.0.0"
+        ];
+      })
       sources."http-errors-1.7.3"
       sources."http-signature-1.2.0"
       sources."iconv-lite-0.4.24"
@@ -58789,9 +60241,20 @@ in
       })
       sources."iota-array-1.0.0"
       sources."is-absolute-0.2.6"
+      sources."is-accessor-descriptor-1.0.0"
       sources."is-arrayish-0.3.2"
       sources."is-buffer-1.1.6"
+      sources."is-ci-2.0.0"
+      sources."is-data-descriptor-1.0.0"
+      sources."is-descriptor-1.0.2"
+      sources."is-extendable-0.1.1"
       sources."is-fullwidth-code-point-1.0.0"
+      (sources."is-number-3.0.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."is-plain-object-2.0.4"
       sources."is-relative-0.2.1"
       sources."is-stream-1.1.0"
       sources."is-typedarray-1.0.0"
@@ -58804,8 +60267,9 @@ in
       })
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
+      sources."isobject-3.0.1"
       sources."isstream-0.1.2"
-      sources."joplin-turndown-4.0.22"
+      sources."joplin-turndown-4.0.23"
       sources."joplin-turndown-plugin-gfm-1.0.12"
       sources."jpeg-js-0.1.2"
       sources."js-tokens-4.0.0"
@@ -58822,7 +60286,9 @@ in
           sources."commander-2.20.3"
         ];
       })
+      sources."kind-of-6.0.3"
       sources."klaw-1.3.1"
+      sources."klaw-sync-6.0.0"
       sources."lazyness-1.1.1"
       sources."left-pad-1.3.0"
       sources."levenshtein-1.0.5"
@@ -58843,6 +60309,8 @@ in
         ];
       })
       sources."magicli-0.0.8"
+      sources."map-cache-0.2.2"
+      sources."map-visit-1.0.0"
       (sources."markdown-it-10.0.0" // {
         dependencies = [
           sources."entities-2.0.0"
@@ -58865,15 +60333,23 @@ in
       sources."markdown-it-sup-1.0.0"
       sources."markdown-it-toc-done-right-4.1.0"
       sources."md5-2.2.1"
+      sources."md5-file-4.0.0"
       sources."mdurl-1.0.1"
+      sources."memory-cache-0.2.0"
+      sources."micromatch-3.1.10"
       sources."mime-2.4.4"
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
       sources."mimic-response-2.1.0"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."minipass-3.1.1"
       sources."minizlib-2.1.0"
+      (sources."mixin-deep-1.3.2" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -58887,28 +60363,26 @@ in
         ];
       })
       sources."nan-2.14.0"
-      sources."napi-build-utils-1.0.1"
+      (sources."nanomatch-1.2.13" // {
+        dependencies = [
+          sources."is-windows-1.0.2"
+        ];
+      })
+      sources."napi-build-utils-1.0.2"
       sources."ndarray-1.0.19"
       sources."ndarray-pack-1.2.1"
       sources."needle-2.4.0"
       sources."nextgen-events-1.3.0"
+      sources."nice-try-1.0.5"
       sources."no-case-2.3.2"
-      (sources."node-abi-2.15.0" // {
-        dependencies = [
-          sources."semver-5.7.1"
-        ];
-      })
+      sources."node-abi-2.15.0"
       sources."node-bitmap-0.0.1"
       sources."node-emoji-1.10.0"
       sources."node-fetch-1.7.3"
       sources."node-persist-2.1.0"
-      (sources."node-pre-gyp-0.11.0" // {
-        dependencies = [
-          sources."semver-5.7.1"
-        ];
-      })
+      sources."node-pre-gyp-0.11.0"
       sources."noop-logger-0.1.1"
-      sources."nopt-4.0.1"
+      sources."nopt-4.0.3"
       sources."npm-bundled-1.1.1"
       sources."npm-normalize-package-bin-1.0.1"
       sources."npm-packlist-1.4.8"
@@ -58917,12 +60391,27 @@ in
       sources."nwsapi-2.2.0"
       sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
+      (sources."object-copy-0.1.0" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          sources."kind-of-3.2.2"
+        ];
+      })
       (sources."object-to-arguments-0.0.8" // {
         dependencies = [
           sources."inspect-parameters-declaration-0.0.10"
           sources."magicli-0.0.5"
         ];
       })
+      sources."object-visit-1.0.1"
+      sources."object.pick-1.3.0"
       sources."omggif-1.0.10"
       sources."once-1.4.0"
       sources."optionator-0.8.3"
@@ -58934,15 +60423,22 @@ in
       sources."p-try-1.0.0"
       sources."param-case-2.1.1"
       sources."parse5-4.0.0"
+      sources."pascalcase-0.1.1"
+      (sources."patch-package-6.2.1" // {
+        dependencies = [
+          sources."fs-extra-7.0.1"
+        ];
+      })
       sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
-      sources."path-key-3.1.1"
+      sources."path-key-2.0.1"
       sources."pend-1.2.0"
       sources."performance-now-2.1.0"
       sources."pify-3.0.0"
       sources."pipe-functions-1.3.0"
       sources."pn-1.1.0"
       sources."pngjs-2.3.1"
+      sources."posix-character-classes-0.1.1"
       sources."prebuild-install-5.3.3"
       sources."prelude-ls-1.1.2"
       sources."process-nextick-args-2.0.1"
@@ -58961,7 +60457,10 @@ in
       sources."readable-stream-3.6.0"
       sources."reduce-flatten-1.0.1"
       sources."redux-3.7.2"
+      sources."regex-not-1.0.2"
       sources."relateurl-0.2.7"
+      sources."repeat-element-1.1.3"
+      sources."repeat-string-1.6.1"
       (sources."request-2.88.2" // {
         dependencies = [
           sources."form-data-2.3.3"
@@ -58971,40 +60470,98 @@ in
       sources."request-promise-native-1.0.8"
       sources."requires-port-1.0.0"
       sources."resolve-url-0.2.1"
+      sources."ret-0.1.15"
       sources."retry-0.10.1"
       sources."rimraf-2.7.1"
       sources."safe-buffer-5.2.0"
+      sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
-      sources."semver-6.3.0"
+      sources."semver-5.7.1"
       sources."server-destroy-1.0.1"
       sources."set-blocking-2.0.0"
+      (sources."set-value-2.0.1" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
       sources."setimmediate-1.0.5"
       sources."setprototypeof-1.1.1"
-      sources."seventh-0.7.34"
+      sources."seventh-0.7.35"
       (sources."sharp-0.23.4" // {
         dependencies = [
+          sources."semver-6.3.0"
           sources."tar-5.0.5"
         ];
       })
-      sources."shebang-command-2.0.0"
-      sources."shebang-regex-3.0.0"
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
       sources."simple-concat-1.0.0"
       sources."simple-get-3.1.0"
       sources."simple-swizzle-0.2.2"
+      sources."slash-2.0.0"
       (sources."slice-ansi-1.0.0" // {
         dependencies = [
           sources."is-fullwidth-code-point-2.0.0"
         ];
       })
+      (sources."snapdragon-0.8.2" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+          sources."ms-2.0.0"
+          sources."source-map-0.5.7"
+        ];
+      })
+      (sources."snapdragon-node-2.1.1" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+        ];
+      })
+      (sources."snapdragon-util-3.0.1" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."source-map-0.6.1"
       sources."source-map-resolve-0.5.3"
       sources."source-map-url-0.4.0"
       sources."split-skip-0.0.2"
+      sources."split-string-3.1.0"
       sources."sprintf-js-1.1.2"
       sources."sqlite3-4.1.1"
       sources."sshpk-1.16.1"
+      (sources."static-extend-0.1.2" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
       sources."statuses-1.5.0"
       sources."stealthy-require-1.1.1"
       sources."strict-uri-encode-1.1.0"
@@ -59048,14 +60605,14 @@ in
         ];
       })
       sources."tar-fs-2.0.0"
-      sources."tar-stream-2.1.0"
+      sources."tar-stream-2.1.2"
       (sources."tcp-port-used-0.1.2" // {
         dependencies = [
           sources."debug-0.7.4"
           sources."q-0.9.7"
         ];
       })
-      sources."terminal-kit-1.33.15"
+      sources."terminal-kit-1.35.1"
       (sources."tkwidgets-0.5.26" // {
         dependencies = [
           sources."is-fullwidth-code-point-2.0.0"
@@ -59063,6 +60620,14 @@ in
           sources."string-width-2.1.1"
         ];
       })
+      sources."tmp-0.0.33"
+      (sources."to-object-path-0.3.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."to-regex-3.0.2"
+      sources."to-regex-range-2.1.1"
       sources."toidentifier-1.0.0"
       sources."tough-cookie-2.5.0"
       sources."tr46-1.0.1"
@@ -59079,25 +60644,37 @@ in
       })
       sources."uid-safe-2.1.5"
       sources."unc-path-regex-0.1.2"
+      sources."union-value-1.0.1"
       sources."uniq-1.0.1"
       sources."universalify-0.1.2"
       sources."unorm-1.6.0"
       sources."unpack-string-0.0.2"
+      (sources."unset-value-1.0.0" // {
+        dependencies = [
+          (sources."has-value-0.3.1" // {
+            dependencies = [
+              sources."isobject-2.1.0"
+            ];
+          })
+          sources."has-values-0.1.4"
+        ];
+      })
       sources."upper-case-1.1.3"
       sources."uri-js-4.2.2"
       sources."urix-0.1.0"
       sources."url-parse-1.4.7"
+      sources."use-3.1.1"
       sources."uslug-1.0.4"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
       sources."valid-url-1.0.9"
       sources."verror-1.10.0"
-      sources."w3c-hr-time-1.0.1"
+      sources."w3c-hr-time-1.0.2"
       sources."webidl-conversions-4.0.2"
       sources."whatwg-encoding-1.0.5"
       sources."whatwg-mimetype-2.3.0"
       sources."whatwg-url-6.5.0"
-      sources."which-2.0.2"
+      sources."which-1.3.1"
       sources."which-pm-runs-1.0.0"
       sources."wide-align-1.1.3"
       sources."word-wrap-1.2.3"
@@ -59151,7 +60728,7 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
-      sources."nopt-4.0.1"
+      sources."nopt-4.0.3"
       sources."once-1.4.0"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
@@ -59206,7 +60783,7 @@ in
       sha512 = "Yf1ZKA3r9nvtMWHO1kEuMZTlHOF8uoQ0vyo5eH7SQy5YeIiHM+B0DgKnn+X6y6KDYZcF7G2SPkKF+JORCXWE/A==";
     };
     dependencies = [
-      sources."@babel/parser-7.8.4"
+      sources."@babel/parser-7.8.8"
       sources."argparse-1.0.10"
       sources."bluebird-3.7.2"
       sources."catharsis-0.8.11"
@@ -59339,10 +60916,10 @@ in
   json-refs = nodeEnv.buildNodePackage {
     name = "json-refs";
     packageName = "json-refs";
-    version = "3.0.14";
+    version = "3.0.15";
     src = fetchurl {
-      url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.14.tgz";
-      sha512 = "+4j+3FzUO3EjQA3QJX5LIMakunOIGQ7nnQsOFwYj2hZQWrPZdmlvwQPnmjcdJ7bHdPju2u/s7jM7WAF+0alXTg==";
+      url = "https://registry.npmjs.org/json-refs/-/json-refs-3.0.15.tgz";
+      sha512 = "0vOQd9eLNBL18EGl5yYaO44GhixmImes2wiYn9Z3sag3QnehWrYWlB9AFtMxCL2Bj3fyxgDYkxGFEU/chlYssw==";
     };
     dependencies = [
       sources."argparse-1.0.10"
@@ -59506,7 +61083,7 @@ in
       sources."har-validator-5.1.3"
       sources."has-flag-4.0.0"
       sources."has-yarn-2.1.0"
-      sources."http-cache-semantics-4.0.4"
+      sources."http-cache-semantics-4.1.0"
       sources."http-errors-1.7.2"
       sources."http-signature-1.2.0"
       sources."iconv-lite-0.4.24"
@@ -59554,7 +61131,7 @@ in
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
       sources."mimic-response-1.0.1"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."morgan-1.9.1"
       sources."ms-2.0.0"
       sources."nanoid-2.1.11"
@@ -59656,8 +61233,8 @@ in
       sources."write-file-atomic-3.0.3"
       sources."xdg-basedir-4.0.0"
       sources."y18n-4.0.0"
-      sources."yargs-15.1.0"
-      sources."yargs-parser-16.1.0"
+      sources."yargs-15.3.0"
+      sources."yargs-parser-18.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -60358,11 +61935,11 @@ in
       })
       sources."@octokit/request-error-1.2.1"
       sources."@octokit/rest-16.43.1"
-      sources."@octokit/types-2.2.0"
+      sources."@octokit/types-2.5.0"
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.5"
+      sources."@types/node-13.9.1"
       sources."@zkochan/cmd-shim-3.1.0"
       sources."JSONStream-1.3.5"
       sources."abbrev-1.1.1"
@@ -60499,7 +62076,7 @@ in
         dependencies = [
           sources."concat-stream-2.0.0"
           sources."meow-4.0.1"
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
           sources."readable-stream-3.6.0"
         ];
       })
@@ -60640,7 +62217,7 @@ in
           sources."load-json-file-1.1.0"
           sources."map-obj-1.0.1"
           sources."meow-3.7.0"
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
           sources."parse-json-2.2.0"
           sources."path-exists-2.1.0"
           sources."path-type-1.1.0"
@@ -60661,7 +62238,7 @@ in
       (sources."git-raw-commits-2.0.0" // {
         dependencies = [
           sources."meow-4.0.1"
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
         ];
       })
       (sources."git-remote-origin-url-2.0.0" // {
@@ -60672,7 +62249,7 @@ in
       (sources."git-semver-tags-2.0.3" // {
         dependencies = [
           sources."meow-4.0.1"
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
         ];
       })
       sources."git-up-4.0.1"
@@ -60704,7 +62281,7 @@ in
           sources."kind-of-4.0.0"
         ];
       })
-      sources."hosted-git-info-2.8.6"
+      sources."hosted-git-info-2.8.8"
       sources."http-cache-semantics-3.8.1"
       sources."http-proxy-agent-2.1.0"
       sources."http-signature-1.2.0"
@@ -60841,13 +62418,13 @@ in
       sources."neo-async-2.6.1"
       sources."nice-try-1.0.5"
       sources."node-fetch-2.6.0"
-      sources."node-fetch-npm-2.0.2"
+      sources."node-fetch-npm-2.0.3"
       (sources."node-gyp-5.1.0" // {
         dependencies = [
           sources."semver-5.7.1"
         ];
       })
-      sources."nopt-4.0.1"
+      sources."nopt-4.0.3"
       (sources."normalize-package-data-2.5.0" // {
         dependencies = [
           sources."semver-5.7.1"
@@ -60990,7 +62567,7 @@ in
       sources."ret-0.1.15"
       sources."retry-0.10.1"
       sources."rimraf-2.7.1"
-      sources."run-async-2.3.0"
+      sources."run-async-2.4.0"
       sources."run-queue-1.0.3"
       sources."rxjs-6.5.4"
       sources."safe-buffer-5.2.0"
@@ -61098,7 +62675,7 @@ in
       sources."strip-indent-2.0.0"
       (sources."strong-log-transformer-2.1.0" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
         ];
       })
       sources."supports-color-5.5.0"
@@ -61122,7 +62699,7 @@ in
       sources."tr46-1.0.1"
       sources."trim-newlines-2.0.0"
       sources."trim-off-newlines-1.0.1"
-      sources."tslib-1.11.0"
+      sources."tslib-1.11.1"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-fest-0.3.1"
@@ -61191,14 +62768,14 @@ in
       sources."xtend-4.0.2"
       sources."y18n-4.0.0"
       sources."yallist-3.1.1"
-      (sources."yargs-14.2.2" // {
+      (sources."yargs-14.2.3" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
           sources."string-width-3.1.0"
           sources."strip-ansi-5.2.0"
         ];
       })
-      sources."yargs-parser-15.0.0"
+      sources."yargs-parser-15.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -61272,7 +62849,7 @@ in
       sources."source-map-0.6.1"
       sources."sshpk-1.16.1"
       sources."tough-cookie-2.5.0"
-      sources."tslib-1.11.0"
+      sources."tslib-1.11.1"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."uri-js-4.2.2"
@@ -61875,7 +63452,7 @@ in
       sources."mime-1.6.0"
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       (sources."mixin-deep-1.3.2" // {
         dependencies = [
           sources."is-extendable-1.0.1"
@@ -62135,7 +63712,7 @@ in
       sources."uuid-3.4.0"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
-      sources."ws-7.2.1"
+      sources."ws-7.2.3"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."yeast-0.1.2"
     ];
@@ -62153,18 +63730,18 @@ in
     name = "lumo-build-deps";
     packageName = "lumo-build-deps";
     version = "1.10.1";
-    src = ../interpreters/clojurescript/lumo;
+    src = ../../development/interpreters/clojurescript/lumo;
     dependencies = [
       sources."@babel/code-frame-7.8.3"
-      sources."@babel/compat-data-7.8.5"
-      sources."@babel/core-7.8.4"
-      sources."@babel/generator-7.8.4"
+      sources."@babel/compat-data-7.8.6"
+      sources."@babel/core-7.8.7"
+      sources."@babel/generator-7.8.8"
       sources."@babel/helper-annotate-as-pure-7.8.3"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3"
-      sources."@babel/helper-call-delegate-7.8.3"
-      sources."@babel/helper-compilation-targets-7.8.4"
-      sources."@babel/helper-create-class-features-plugin-7.8.3"
-      sources."@babel/helper-create-regexp-features-plugin-7.8.3"
+      sources."@babel/helper-call-delegate-7.8.7"
+      sources."@babel/helper-compilation-targets-7.8.7"
+      sources."@babel/helper-create-class-features-plugin-7.8.6"
+      sources."@babel/helper-create-regexp-features-plugin-7.8.8"
       sources."@babel/helper-define-map-7.8.3"
       sources."@babel/helper-explode-assignable-expression-7.8.3"
       sources."@babel/helper-function-name-7.8.3"
@@ -62172,12 +63749,12 @@ in
       sources."@babel/helper-hoist-variables-7.8.3"
       sources."@babel/helper-member-expression-to-functions-7.8.3"
       sources."@babel/helper-module-imports-7.8.3"
-      sources."@babel/helper-module-transforms-7.8.3"
+      sources."@babel/helper-module-transforms-7.8.6"
       sources."@babel/helper-optimise-call-expression-7.8.3"
       sources."@babel/helper-plugin-utils-7.8.3"
       sources."@babel/helper-regex-7.8.3"
       sources."@babel/helper-remap-async-to-generator-7.8.3"
-      sources."@babel/helper-replace-supers-7.8.3"
+      sources."@babel/helper-replace-supers-7.8.6"
       sources."@babel/helper-simple-access-7.8.3"
       sources."@babel/helper-split-export-declaration-7.8.3"
       sources."@babel/helper-wrap-function-7.8.3"
@@ -62187,7 +63764,7 @@ in
           sources."chalk-2.4.2"
         ];
       })
-      sources."@babel/parser-7.8.4"
+      sources."@babel/parser-7.8.8"
       sources."@babel/plugin-external-helpers-7.8.3"
       sources."@babel/plugin-proposal-async-generator-functions-7.8.3"
       sources."@babel/plugin-proposal-class-properties-7.8.3"
@@ -62197,7 +63774,7 @@ in
       sources."@babel/plugin-proposal-object-rest-spread-7.8.3"
       sources."@babel/plugin-proposal-optional-catch-binding-7.8.3"
       sources."@babel/plugin-proposal-optional-chaining-7.8.3"
-      sources."@babel/plugin-proposal-unicode-property-regex-7.8.3"
+      sources."@babel/plugin-proposal-unicode-property-regex-7.8.8"
       sources."@babel/plugin-syntax-async-generators-7.8.4"
       sources."@babel/plugin-syntax-bigint-7.8.3"
       sources."@babel/plugin-syntax-dynamic-import-7.8.3"
@@ -62211,13 +63788,13 @@ in
       sources."@babel/plugin-transform-async-to-generator-7.8.3"
       sources."@babel/plugin-transform-block-scoped-functions-7.8.3"
       sources."@babel/plugin-transform-block-scoping-7.8.3"
-      sources."@babel/plugin-transform-classes-7.8.3"
+      sources."@babel/plugin-transform-classes-7.8.6"
       sources."@babel/plugin-transform-computed-properties-7.8.3"
-      sources."@babel/plugin-transform-destructuring-7.8.3"
+      sources."@babel/plugin-transform-destructuring-7.8.8"
       sources."@babel/plugin-transform-dotall-regex-7.8.3"
       sources."@babel/plugin-transform-duplicate-keys-7.8.3"
       sources."@babel/plugin-transform-exponentiation-operator-7.8.3"
-      sources."@babel/plugin-transform-for-of-7.8.4"
+      sources."@babel/plugin-transform-for-of-7.8.6"
       sources."@babel/plugin-transform-function-name-7.8.3"
       sources."@babel/plugin-transform-literals-7.8.3"
       sources."@babel/plugin-transform-member-expression-literals-7.8.3"
@@ -62228,9 +63805,9 @@ in
       sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3"
       sources."@babel/plugin-transform-new-target-7.8.3"
       sources."@babel/plugin-transform-object-super-7.8.3"
-      sources."@babel/plugin-transform-parameters-7.8.4"
+      sources."@babel/plugin-transform-parameters-7.8.8"
       sources."@babel/plugin-transform-property-literals-7.8.3"
-      sources."@babel/plugin-transform-regenerator-7.8.3"
+      sources."@babel/plugin-transform-regenerator-7.8.7"
       sources."@babel/plugin-transform-reserved-words-7.8.3"
       sources."@babel/plugin-transform-runtime-7.8.3"
       sources."@babel/plugin-transform-shorthand-properties-7.8.3"
@@ -62239,12 +63816,12 @@ in
       sources."@babel/plugin-transform-template-literals-7.8.3"
       sources."@babel/plugin-transform-typeof-symbol-7.8.4"
       sources."@babel/plugin-transform-unicode-regex-7.8.3"
-      sources."@babel/preset-env-7.8.4"
+      sources."@babel/preset-env-7.8.7"
       sources."@babel/preset-stage-2-7.8.3"
-      sources."@babel/runtime-7.8.4"
-      sources."@babel/template-7.8.3"
-      sources."@babel/traverse-7.8.4"
-      sources."@babel/types-7.8.3"
+      sources."@babel/runtime-7.8.7"
+      sources."@babel/template-7.8.6"
+      sources."@babel/traverse-7.8.6"
+      sources."@babel/types-7.8.7"
       sources."@cnakazawa/watch-1.0.4"
       sources."@comandeer/babel-plugin-banner-5.0.0"
       sources."@istanbuljs/load-nyc-config-1.0.0"
@@ -62264,7 +63841,7 @@ in
       sources."@types/istanbul-lib-coverage-2.0.1"
       sources."@types/istanbul-lib-report-3.0.0"
       sources."@types/istanbul-reports-1.1.1"
-      sources."@types/node-13.7.5"
+      sources."@types/node-13.9.1"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/resolve-0.0.8"
       sources."@types/yargs-15.0.4"
@@ -62291,7 +63868,7 @@ in
       sources."@xtuc/long-4.2.2"
       sources."JSONStream-1.3.5"
       sources."ace.improved-0.2.1"
-      sources."acorn-7.1.0"
+      sources."acorn-7.1.1"
       sources."acorn-node-1.8.2"
       sources."acorn-walk-7.1.1"
       sources."ajv-6.12.0"
@@ -62385,7 +63962,7 @@ in
       sources."big.js-5.2.2"
       sources."binary-extensions-1.13.1"
       sources."bindings-1.5.0"
-      (sources."bl-3.0.0" // {
+      (sources."bl-4.0.1" // {
         dependencies = [
           sources."readable-stream-3.6.0"
         ];
@@ -62417,9 +63994,9 @@ in
       sources."browserify-rsa-4.0.1"
       sources."browserify-sign-4.0.4"
       sources."browserify-zlib-0.2.0"
-      sources."browserslist-4.8.7"
+      sources."browserslist-4.9.1"
       sources."bser-2.1.1"
-      sources."buffer-5.4.3"
+      sources."buffer-5.5.0"
       sources."buffer-from-1.1.1"
       sources."buffer-xor-1.0.3"
       sources."builtin-modules-3.1.0"
@@ -62433,7 +64010,7 @@ in
       sources."cache-base-1.0.1"
       sources."cached-path-relative-1.0.2"
       sources."camelcase-5.3.1"
-      sources."caniuse-lite-1.0.30001030"
+      sources."caniuse-lite-1.0.30001035"
       sources."capture-exit-2.0.0"
       sources."caseless-0.12.0"
       (sources."chalk-3.0.0" // {
@@ -62548,7 +64125,7 @@ in
       sources."duplexer2-0.1.4"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.3.360"
+      sources."electron-to-chromium-1.3.376"
       sources."elliptic-6.5.2"
       sources."emoji-regex-7.0.3"
       sources."emojis-list-3.0.0"
@@ -62680,7 +64257,7 @@ in
       sources."hash.js-1.1.7"
       sources."hmac-drbg-1.0.1"
       sources."homedir-polyfill-1.0.3"
-      sources."hosted-git-info-2.8.6"
+      sources."hosted-git-info-2.8.8"
       sources."htmlescape-1.1.1"
       sources."http-signature-1.2.0"
       sources."https-browserify-1.0.0"
@@ -62786,7 +64363,7 @@ in
       sources."lodash.memoize-3.0.4"
       sources."loose-envify-1.4.0"
       sources."lru-cache-5.1.1"
-      sources."magic-string-0.25.6"
+      sources."magic-string-0.25.7"
       sources."make-dir-2.1.0"
       sources."makeerror-1.0.11"
       sources."mamacro-0.0.3"
@@ -62812,7 +64389,7 @@ in
       sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."mississippi-3.0.0"
       (sources."mixin-deep-1.3.2" // {
         dependencies = [
@@ -62847,7 +64424,7 @@ in
         ];
       })
       sources."node-modules-regexp-1.0.0"
-      (sources."node-releases-1.1.50" // {
+      (sources."node-releases-1.1.52" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
@@ -62953,13 +64530,13 @@ in
       })
       sources."realpath-native-1.1.0"
       sources."regenerate-1.4.0"
-      sources."regenerate-unicode-properties-8.1.0"
-      sources."regenerator-runtime-0.13.4"
-      sources."regenerator-transform-0.14.2"
+      sources."regenerate-unicode-properties-8.2.0"
+      sources."regenerator-runtime-0.13.5"
+      sources."regenerator-transform-0.14.3"
       sources."regex-not-1.0.2"
-      sources."regexpu-core-4.6.0"
+      sources."regexpu-core-4.7.0"
       sources."regjsgen-0.5.1"
-      (sources."regjsparser-0.6.3" // {
+      (sources."regjsparser-0.6.4" // {
         dependencies = [
           sources."jsesc-0.5.0"
         ];
@@ -62988,8 +64565,8 @@ in
       sources."retry-0.12.0"
       sources."rimraf-2.7.1"
       sources."ripemd160-2.0.2"
-      sources."rollup-1.31.1"
-      sources."rollup-plugin-babel-4.3.3"
+      sources."rollup-1.32.1"
+      sources."rollup-plugin-babel-4.4.0"
       sources."rollup-plugin-babel-minify-9.1.1"
       sources."rollup-plugin-commonjs-10.1.0"
       sources."rollup-plugin-node-resolve-5.2.0"
@@ -63115,12 +64692,12 @@ in
       sources."supports-color-5.5.0"
       sources."syntax-error-1.4.0"
       sources."tapable-1.1.3"
-      (sources."tar-stream-2.1.0" // {
+      (sources."tar-stream-2.1.2" // {
         dependencies = [
           sources."readable-stream-3.6.0"
         ];
       })
-      (sources."terser-4.6.4" // {
+      (sources."terser-4.6.6" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -63149,7 +64726,7 @@ in
           sources."punycode-2.1.1"
         ];
       })
-      sources."tslib-1.11.0"
+      sources."tslib-1.11.1"
       sources."tty-browserify-0.0.1"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
@@ -63160,8 +64737,8 @@ in
       sources."undeclared-identifiers-1.1.3"
       sources."unicode-canonical-property-names-ecmascript-1.0.4"
       sources."unicode-match-property-ecmascript-1.0.4"
-      sources."unicode-match-property-value-ecmascript-1.1.0"
-      sources."unicode-property-aliases-ecmascript-1.0.5"
+      sources."unicode-match-property-value-ecmascript-1.2.0"
+      sources."unicode-property-aliases-ecmascript-1.1.0"
       sources."union-value-1.0.1"
       sources."unique-filename-1.1.1"
       sources."unique-slug-2.0.2"
@@ -63203,9 +64780,9 @@ in
       sources."vm-browserify-1.1.2"
       sources."walker-1.0.7"
       sources."watchpack-1.6.0"
-      (sources."webpack-4.41.6" // {
+      (sources."webpack-4.42.0" // {
         dependencies = [
-          sources."acorn-6.4.0"
+          sources."acorn-6.4.1"
           sources."micromatch-3.1.10"
           sources."minimist-0.0.8"
           sources."mkdirp-0.5.1"
@@ -63258,7 +64835,7 @@ in
           sources."path-exists-3.0.0"
         ];
       })
-      sources."yargs-parser-13.1.1"
+      sources."yargs-parser-13.1.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -63270,15 +64847,27 @@ in
   madoko = nodeEnv.buildNodePackage {
     name = "madoko";
     packageName = "madoko";
-    version = "1.2.0";
+    version = "1.2.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/madoko/-/madoko-1.2.0.tgz";
-      sha512 = "MTpclhNPFArohFqLNqA+3/6JycVgwiFD8d6i7zuELvs1BDKQv8m4fw2SOSnkFddFnU/FcYLl0P0UkIe0YZ4GZA==";
+      url = "https://registry.npmjs.org/madoko/-/madoko-1.2.3.tgz";
+      sha512 = "ZcLE8T+KRVkbYigQQeOazhWrb8XGMZCvKZlhiuheOujekDTrpnLWGGW5JqM6fflU6tWHyzECEa7xLQ6f/9o/Hg==";
     };
     dependencies = [
       sources."amdefine-1.0.1"
+      sources."balanced-match-1.0.0"
+      sources."brace-expansion-1.1.11"
+      sources."concat-map-0.0.1"
+      sources."fs.realpath-1.0.0"
+      sources."glob-7.1.6"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
+      sources."minimatch-3.0.4"
       sources."mkdirp-0.3.5"
+      sources."once-1.4.0"
+      sources."path-is-absolute-1.0.1"
       sources."requirejs-2.3.6"
+      sources."rimraf-3.0.2"
+      sources."wrappy-1.0.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -63461,7 +65050,7 @@ in
           sources."uglify-js-2.8.29"
         ];
       })
-      sources."acorn-5.7.3"
+      sources."acorn-5.7.4"
       sources."ajv-4.11.8"
       (sources."align-text-0.1.4" // {
         dependencies = [
@@ -63889,7 +65478,7 @@ in
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
       sources."minimatch-2.0.10"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       (sources."mixin-deep-1.3.2" // {
         dependencies = [
           sources."is-extendable-1.0.1"
@@ -64091,7 +65680,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-1.2.0"
-      sources."typescript-3.8.2"
+      sources."typescript-3.8.3"
       (sources."uglify-js-3.8.0" // {
         dependencies = [
           sources."source-map-0.6.1"
@@ -64159,10 +65748,10 @@ in
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
     packageName = "mocha";
-    version = "7.0.1";
+    version = "7.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-7.0.1.tgz";
-      sha512 = "9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg==";
+      url = "https://registry.npmjs.org/mocha/-/mocha-7.1.0.tgz";
+      sha512 = "MymHK8UkU0K15Q/zX7uflZgVoRWiTjy0fXE/QjKts6mowUvGxOdPhZ2qj3b0iZdUrNZlW9LAIMFHB4IW+2b3EQ==";
     };
     dependencies = [
       sources."ansi-colors-3.2.3"
@@ -64231,7 +65820,7 @@ in
       sources."js-yaml-3.13.1"
       sources."locate-path-3.0.0"
       sources."lodash-4.17.15"
-      sources."log-symbols-2.2.0"
+      sources."log-symbols-3.0.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
@@ -64363,7 +65952,7 @@ in
       sha512 = "gGiVq/r9iIrp2XCdDXb3fBEW4e3H6zMLxgTGuG5e6MaxiLzLnUZj2ersr4r+Ij8qnbRFxCqCrOw5d7lyrGPcWg==";
     };
     dependencies = [
-      sources."@msgpack/msgpack-1.11.0"
+      sources."@msgpack/msgpack-1.12.0"
       sources."async-2.6.3"
       sources."color-3.0.0"
       sources."color-convert-1.9.3"
@@ -64509,7 +66098,7 @@ in
       sources."minipass-2.9.0"
       sources."minizlib-1.3.3"
       sources."mkdirp-0.5.1"
-      sources."nopt-4.0.1"
+      sources."nopt-4.0.3"
       sources."npmlog-4.1.2"
       sources."number-is-nan-1.0.1"
       sources."oauth-sign-0.9.0"
@@ -64562,10 +66151,10 @@ in
   node-gyp-build = nodeEnv.buildNodePackage {
     name = "node-gyp-build";
     packageName = "node-gyp-build";
-    version = "4.2.0";
+    version = "4.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.0.tgz";
-      sha512 = "4oiumOLhCDU9Rronz8PZ5S4IvT39H5+JEv/hps9V8s7RSLhsac0TCP78ulnHXOo8X1wdpPiTayGlM1jr4IbnaQ==";
+      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.1.tgz";
+      sha512 = "XyCKXsqZfLqHep1hhsMncoXuUNt/cXCjg1+8CLbu69V1TKuPiOeSGbL9n+k/ByKH8UT0p4rdIX8XkTRZV0i7Sw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -64676,7 +66265,7 @@ in
       sources."hawk-3.1.3"
       sources."headless-0.1.7"
       sources."hoek-2.16.3"
-      sources."hosted-git-info-2.8.6"
+      sources."hosted-git-info-2.8.8"
       sources."http-errors-1.7.2"
       sources."http-signature-1.1.1"
       sources."iconv-lite-0.4.24"
@@ -64717,7 +66306,7 @@ in
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -64733,7 +66322,7 @@ in
           sources."semver-5.7.1"
         ];
       })
-      sources."nopt-4.0.1"
+      sources."nopt-4.0.3"
       sources."normalize-package-data-2.5.0"
       sources."npmlog-4.1.2"
       sources."number-is-nan-1.0.1"
@@ -64919,7 +66508,7 @@ in
       sources."mkdirp-0.5.1"
       sources."ms-2.1.2"
       sources."needle-2.4.0"
-      sources."nopt-4.0.1"
+      sources."nopt-4.0.3"
       sources."npm-bundled-1.1.1"
       sources."npm-normalize-package-bin-1.0.1"
       sources."npm-packlist-1.4.8"
@@ -64934,7 +66523,7 @@ in
       sources."process-nextick-args-2.0.1"
       (sources."rc-1.2.8" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
         ];
       })
       sources."readable-stream-2.3.7"
@@ -64968,19 +66557,19 @@ in
   node-red = nodeEnv.buildNodePackage {
     name = "node-red";
     packageName = "node-red";
-    version = "1.0.3";
+    version = "1.0.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-red/-/node-red-1.0.3.tgz";
-      sha512 = "UoTPT7jTApgoVm9lah7Ri10S5w1boQeLIKWFxUq1yfLJ7AYhKmVT46z5HRQt4vAUBLze7cl+aFjEt67LDujXmg==";
+      url = "https://registry.npmjs.org/node-red/-/node-red-1.0.4.tgz";
+      sha512 = "7cRGr69ibl7vnEMWEO2qHhO4L6ft2XsySoE+mMSW7h2tODNTNECelCQtTA+kYfX1wlFS3axu52Y2Br0AV5D+ww==";
     };
     dependencies = [
-      sources."@babel/runtime-7.8.4"
-      sources."@node-red/editor-api-1.0.3"
-      sources."@node-red/editor-client-1.0.3"
-      (sources."@node-red/nodes-1.0.3" // {
+      sources."@babel/runtime-7.8.7"
+      sources."@node-red/editor-api-1.0.4"
+      sources."@node-red/editor-client-1.0.4"
+      (sources."@node-red/nodes-1.0.4" // {
         dependencies = [
           sources."http-errors-1.7.3"
-          sources."iconv-lite-0.5.0"
+          sources."iconv-lite-0.5.1"
           sources."inherits-2.0.4"
           sources."media-typer-1.1.0"
           (sources."raw-body-2.4.1" // {
@@ -64990,13 +66579,18 @@ in
           })
         ];
       })
-      sources."@node-red/registry-1.0.3"
-      sources."@node-red/runtime-1.0.3"
-      sources."@node-red/util-1.0.3"
+      sources."@node-red/registry-1.0.4"
+      sources."@node-red/runtime-1.0.4"
+      sources."@node-red/util-1.0.4"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
-      sources."agent-base-4.3.0"
-      sources."ajv-6.10.2"
+      (sources."agent-base-6.0.0" // {
+        dependencies = [
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
+        ];
+      })
+      sources."ajv-6.12.0"
       sources."ansi-regex-2.1.1"
       sources."append-field-1.0.0"
       sources."aproba-1.2.0"
@@ -65090,14 +66684,13 @@ in
       sources."cookie-signature-1.0.6"
       sources."core-util-is-1.0.2"
       sources."cors-2.8.5"
-      sources."cron-1.7.2"
+      sources."cron-1.8.2"
       sources."css-select-1.2.0"
       sources."css-what-2.1.3"
       sources."d-1.0.1"
       sources."dashdash-1.14.1"
       sources."debug-2.6.9"
       sources."deep-extend-0.6.0"
-      sources."define-properties-1.1.3"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
       sources."denque-1.4.1"
@@ -65127,13 +66720,9 @@ in
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
       sources."entities-1.1.2"
-      sources."es-abstract-1.17.4"
-      sources."es-to-primitive-1.2.1"
       sources."es5-ext-0.10.53"
       sources."es6-iterator-2.0.3"
       sources."es6-map-0.1.5"
-      sources."es6-promise-4.2.8"
-      sources."es6-promisify-5.0.0"
       (sources."es6-set-0.1.5" // {
         dependencies = [
           sources."es6-symbol-3.1.1"
@@ -65161,7 +66750,7 @@ in
       })
       sources."extend-3.0.2"
       sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-2.0.1"
+      sources."fast-deep-equal-3.1.1"
       sources."fast-json-stable-stringify-2.1.0"
       sources."finalhandler-1.1.2"
       sources."forever-agent-0.6.1"
@@ -65172,7 +66761,6 @@ in
       sources."fs-minipass-1.2.7"
       sources."fs.notify-0.0.4"
       sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.1"
       sources."gauge-2.7.4"
       sources."getpass-0.1.7"
       sources."glob-7.1.6"
@@ -65187,17 +66775,15 @@ in
       sources."graceful-fs-4.2.3"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
-      sources."has-1.0.3"
-      sources."has-symbols-1.0.1"
       sources."has-unicode-2.0.1"
       sources."hash-sum-2.0.0"
       sources."help-me-1.1.0"
       sources."htmlparser2-3.10.1"
       sources."http-errors-1.7.2"
       sources."http-signature-1.2.0"
-      (sources."https-proxy-agent-2.2.4" // {
+      (sources."https-proxy-agent-5.0.0" // {
         dependencies = [
-          sources."debug-3.2.6"
+          sources."debug-4.1.1"
           sources."ms-2.1.2"
         ];
       })
@@ -65209,15 +66795,11 @@ in
       sources."ini-1.3.5"
       sources."ipaddr.js-1.9.1"
       sources."is-absolute-1.0.0"
-      sources."is-callable-1.1.5"
-      sources."is-date-object-1.0.2"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-glob-3.1.0"
       sources."is-negated-glob-1.0.0"
-      sources."is-regex-1.0.5"
       sources."is-relative-1.0.0"
-      sources."is-symbol-1.0.3"
       sources."is-typedarray-1.0.0"
       sources."is-unc-path-1.0.0"
       sources."is-utf8-0.2.1"
@@ -65230,7 +66812,7 @@ in
       sources."json-schema-traverse-0.4.1"
       sources."json-stable-stringify-without-jsonify-1.0.1"
       sources."json-stringify-safe-5.0.1"
-      sources."jsonata-1.7.0"
+      sources."jsonata-1.8.1"
       sources."jsonfile-4.0.0"
       sources."jsprim-1.4.1"
       sources."leven-2.1.0"
@@ -65248,7 +66830,7 @@ in
       sources."lodash.some-4.6.0"
       sources."lru-cache-4.1.5"
       sources."media-typer-0.3.0"
-      (sources."memorystore-1.6.1" // {
+      (sources."memorystore-1.6.2" // {
         dependencies = [
           sources."debug-3.1.0"
         ];
@@ -65259,7 +66841,7 @@ in
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       (sources."minipass-2.9.0" // {
         dependencies = [
           sources."yallist-3.1.1"
@@ -65283,7 +66865,7 @@ in
       sources."mqtt-packet-5.6.1"
       sources."ms-2.0.0"
       sources."multer-1.4.2"
-      sources."mustache-3.0.2"
+      sources."mustache-4.0.0"
       sources."nan-2.13.2"
       (sources."needle-2.4.0" // {
         dependencies = [
@@ -65299,7 +66881,7 @@ in
         ];
       })
       sources."node-red-node-rbe-0.2.8"
-      sources."node-red-node-tail-0.0.3"
+      sources."node-red-node-tail-0.1.1"
       sources."nopt-4.0.1"
       sources."npm-bundled-1.1.1"
       sources."npm-normalize-package-bin-1.0.1"
@@ -65310,10 +66892,6 @@ in
       sources."oauth-sign-0.9.0"
       sources."oauth2orize-1.11.0"
       sources."object-assign-4.1.1"
-      sources."object-inspect-1.7.0"
-      sources."object-keys-1.1.1"
-      sources."object.assign-4.1.0"
-      sources."object.getownpropertydescriptors-2.1.0"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
@@ -65328,7 +66906,7 @@ in
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
       sources."parseurl-1.3.3"
-      sources."passport-0.4.0"
+      sources."passport-0.4.1"
       sources."passport-http-bearer-1.0.1"
       sources."passport-oauth2-client-password-0.1.2"
       sources."passport-strategy-1.0.0"
@@ -65354,7 +66932,7 @@ in
       sources."raw-body-2.4.0"
       sources."rc-1.2.8"
       sources."readable-stream-3.6.0"
-      sources."regenerator-runtime-0.13.4"
+      sources."regenerator-runtime-0.13.5"
       sources."reinterval-1.1.0"
       sources."remove-trailing-separator-1.1.0"
       (sources."request-2.88.0" // {
@@ -65386,8 +66964,6 @@ in
       sources."stream-shift-1.0.1"
       sources."streamsearch-0.1.2"
       sources."string-width-1.0.2"
-      sources."string.prototype.trimleft-2.1.1"
-      sources."string.prototype.trimright-2.1.1"
       sources."string_decoder-1.3.0"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
@@ -65417,7 +66993,7 @@ in
       sources."type-1.2.0"
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
-      sources."uglify-js-3.6.9"
+      sources."uglify-js-3.8.0"
       sources."uid-safe-2.1.5"
       sources."uid2-0.0.3"
       sources."ultron-1.1.1"
@@ -65427,12 +67003,11 @@ in
       sources."unpipe-1.0.0"
       sources."uri-js-4.2.2"
       sources."util-deprecate-1.0.2"
-      sources."util.promisify-1.0.1"
       sources."utils-merge-1.0.1"
       sources."uuid-3.4.0"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
-      (sources."websocket-stream-5.5.0" // {
+      (sources."websocket-stream-5.5.2" // {
         dependencies = [
           (sources."readable-stream-2.3.7" // {
             dependencies = [
@@ -65455,7 +67030,7 @@ in
       sources."wide-align-1.1.3"
       sources."wrappy-1.0.2"
       sources."ws-6.2.1"
-      sources."xml2js-0.4.22"
+      sources."xml2js-0.4.23"
       sources."xmlbuilder-11.0.1"
       sources."xtend-4.0.2"
       sources."yallist-2.1.2"
@@ -65536,7 +67111,7 @@ in
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       sources."has-unicode-2.0.1"
-      sources."hosted-git-info-2.8.6"
+      sources."hosted-git-info-2.8.8"
       sources."http-signature-1.2.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -65725,7 +67300,7 @@ in
       sources."lru-cache-4.1.5"
       sources."make-dir-1.3.0"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."ms-2.1.2"
       sources."nopt-1.0.10"
       sources."normalize-path-3.0.0"
@@ -65787,10 +67362,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "6.14.0";
+    version = "6.14.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-6.14.0.tgz";
-      sha512 = "OgfdLadz7j6dikbpaimmLzMxwLKbXthQXHiJwtegorwtBVnhecfUeYkHopwd5ICaiClQnqlYQCHERXDiYK3Jcw==";
+      url = "https://registry.npmjs.org/npm/-/npm-6.14.2.tgz";
+      sha512 = "eBVjzvGJ9v2/jRJZFtIkvUVKmJ0sCJNNwc9Z1gI6llwaT7EBYWJe5o61Ipc1QR0FaDCKM3l1GizI09Ro3STJEw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -65805,40 +67380,40 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "4.0.1";
+    version = "4.0.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-4.0.1.tgz";
-      sha512 = "rDrKAqhQuTYq2EkndroPMZGA9N6tpTotOVOIJoxRa3ZKnb/mOcq2TZv4A4LLSM8+9kZlP+sBwE+XAGh8wWZw/w==";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-4.0.4.tgz";
+      sha512 = "o1Db+kfi8Vvs345Xxpn+3WSUJtLa85F2hMF6v6kYfQuvTulsphvDzgbiVkp4vEKC8+BQETCag730XPJudYf4mA==";
     };
     dependencies = [
       sources."@npmcli/ci-detect-1.2.0"
+      sources."@npmcli/git-2.0.1"
       sources."@npmcli/installed-package-contents-1.0.5"
+      sources."@npmcli/promise-spawn-1.1.0"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
+      sources."@tootallnate/once-1.0.0"
       sources."@types/color-name-1.1.1"
-      sources."agent-base-5.1.1"
+      sources."agent-base-6.0.0"
       sources."agentkeepalive-4.1.0"
       sources."aggregate-error-3.0.1"
-      sources."ansi-align-3.0.0"
+      (sources."ansi-align-3.0.0" // {
+        dependencies = [
+          sources."ansi-regex-4.1.0"
+          sources."string-width-3.1.0"
+          sources."strip-ansi-5.2.0"
+        ];
+      })
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-4.2.1"
       sources."aproba-1.2.0"
       sources."argparse-1.0.10"
       sources."asap-2.0.6"
       sources."balanced-match-1.0.0"
-      (sources."boxen-3.2.0" // {
-        dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.2"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."has-flag-3.0.0"
-          sources."supports-color-5.5.0"
-        ];
-      })
+      sources."boxen-4.2.0"
       sources."brace-expansion-1.1.11"
       sources."builtins-1.0.3"
-      sources."cacache-14.0.0"
+      sources."cacache-15.0.0"
       (sources."cacheable-request-6.1.0" // {
         dependencies = [
           sources."get-stream-5.1.0"
@@ -65859,21 +67434,14 @@ in
       sources."colors-1.0.3"
       sources."commander-4.1.1"
       sources."concat-map-0.0.1"
-      sources."configstore-4.0.0"
+      sources."configstore-5.0.1"
       (sources."copy-concurrently-1.0.5" // {
         dependencies = [
           sources."mkdirp-0.5.1"
         ];
       })
       sources."core-util-is-1.0.2"
-      (sources."cross-spawn-5.1.0" // {
-        dependencies = [
-          sources."lru-cache-4.1.5"
-          sources."which-1.3.1"
-          sources."yallist-2.1.2"
-        ];
-      })
-      sources."crypto-random-string-1.0.0"
+      sources."crypto-random-string-2.0.0"
       sources."debug-4.1.1"
       sources."debuglog-1.0.1"
       sources."decompress-response-3.3.0"
@@ -65881,17 +67449,15 @@ in
       sources."defer-to-connect-1.1.3"
       sources."depd-1.1.2"
       sources."dezalgo-1.0.3"
-      sources."dot-prop-4.2.0"
+      sources."dot-prop-5.2.0"
       sources."duplexer3-0.1.4"
       sources."emoji-regex-7.0.3"
       sources."encoding-0.1.12"
       sources."end-of-stream-1.4.4"
       sources."err-code-1.1.2"
-      sources."es6-promise-4.2.8"
-      sources."es6-promisify-5.0.0"
+      sources."escape-goat-2.1.1"
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
-      sources."execa-0.7.0"
       sources."fast-diff-1.2.0"
       sources."figgy-pudding-3.5.1"
       sources."find-up-4.1.0"
@@ -65899,22 +67465,18 @@ in
       sources."fs-write-stream-atomic-1.0.10"
       sources."fs.realpath-1.0.0"
       sources."get-stdin-7.0.0"
-      sources."get-stream-3.0.0"
+      sources."get-stream-4.1.0"
       sources."glob-7.1.6"
-      sources."global-dirs-0.1.1"
-      (sources."got-9.6.0" // {
-        dependencies = [
-          sources."get-stream-4.1.0"
-        ];
-      })
+      sources."global-dirs-2.0.1"
+      sources."got-9.6.0"
       sources."graceful-fs-4.2.3"
       sources."has-ansi-2.0.0"
       sources."has-flag-4.0.0"
       sources."has-yarn-2.1.0"
-      sources."hosted-git-info-3.0.3"
-      sources."http-cache-semantics-4.0.4"
-      sources."http-proxy-agent-3.0.0"
-      sources."https-proxy-agent-4.0.0"
+      sources."hosted-git-info-3.0.4"
+      sources."http-cache-semantics-4.1.0"
+      sources."http-proxy-agent-4.0.1"
+      sources."https-proxy-agent-5.0.0"
       sources."humanize-ms-1.2.1"
       sources."iconv-lite-0.4.24"
       sources."iferr-0.1.5"
@@ -65929,23 +67491,23 @@ in
       sources."ip-1.1.5"
       sources."is-ci-2.0.0"
       sources."is-fullwidth-code-point-2.0.0"
-      sources."is-installed-globally-0.1.0"
+      sources."is-installed-globally-0.3.1"
       sources."is-lambda-1.0.1"
-      sources."is-npm-3.0.0"
-      sources."is-obj-1.0.1"
-      sources."is-path-inside-1.0.1"
-      sources."is-stream-1.1.0"
+      sources."is-npm-4.0.0"
+      sources."is-obj-2.0.0"
+      sources."is-path-inside-3.0.2"
+      sources."is-typedarray-1.0.0"
       sources."is-yarn-global-0.3.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
       sources."jju-1.4.0"
       sources."js-yaml-3.13.1"
       sources."json-buffer-3.0.0"
-      sources."json-parse-even-better-errors-2.0.1"
+      sources."json-parse-even-better-errors-2.2.0"
       sources."json-parse-helpfulerror-1.0.3"
       (sources."json5-2.1.1" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
         ];
       })
       sources."jsonparse-1.3.1"
@@ -65964,8 +67526,12 @@ in
       sources."lodash-4.17.15"
       sources."lowercase-keys-1.0.1"
       sources."lru-cache-5.1.1"
-      sources."make-dir-1.3.0"
-      sources."make-fetch-happen-7.1.1"
+      (sources."make-dir-3.0.2" // {
+        dependencies = [
+          sources."semver-6.3.0"
+        ];
+      })
+      sources."make-fetch-happen-8.0.4"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
@@ -66002,58 +67568,38 @@ in
       })
       sources."normalize-url-4.5.0"
       sources."npm-bundled-1.1.1"
+      sources."npm-install-checks-4.0.0"
       sources."npm-normalize-package-bin-1.0.1"
-      (sources."npm-package-arg-8.0.0" // {
-        dependencies = [
-          sources."semver-7.1.3"
-        ];
-      })
-      sources."npm-packlist-2.1.0"
-      (sources."npm-pick-manifest-5.0.0" // {
-        dependencies = [
-          sources."semver-7.1.3"
-        ];
-      })
-      (sources."npm-registry-fetch-6.0.2" // {
-        dependencies = [
-          sources."safe-buffer-5.2.0"
-          sources."semver-7.1.3"
-        ];
-      })
-      sources."npm-run-path-2.0.2"
+      sources."npm-package-arg-8.0.1"
+      sources."npm-packlist-2.1.1"
+      sources."npm-pick-manifest-6.0.0"
+      sources."npm-registry-fetch-8.0.0"
       sources."once-1.4.0"
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
-      sources."osenv-0.1.5"
       sources."p-cancelable-1.1.0"
-      sources."p-finally-1.0.0"
       sources."p-limit-2.2.2"
       sources."p-locate-4.1.0"
       sources."p-map-3.0.0"
       sources."p-try-2.2.0"
-      sources."package-json-6.5.0"
-      (sources."pacote-10.3.2" // {
+      (sources."package-json-6.5.0" // {
         dependencies = [
-          sources."semver-7.1.3"
+          sources."semver-6.3.0"
         ];
       })
+      sources."pacote-11.1.4"
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
-      sources."path-is-inside-1.0.2"
-      sources."path-key-2.0.1"
       sources."path-parse-1.0.6"
-      sources."pify-3.0.0"
       sources."prepend-http-2.0.0"
       sources."process-nextick-args-2.0.1"
       sources."progress-2.0.3"
       sources."promise-inflight-1.0.1"
       sources."promise-retry-1.1.1"
       sources."prompts-2.3.1"
-      sources."pseudomap-1.0.2"
       sources."pump-3.0.0"
+      sources."pupa-2.0.1"
       (sources."rc-1.2.8" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
         ];
       })
       sources."rc-config-loader-3.0.0"
@@ -66071,36 +67617,31 @@ in
       sources."run-queue-1.0.3"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
-      sources."semver-6.3.0"
-      (sources."semver-diff-2.1.0" // {
+      sources."semver-7.1.3"
+      (sources."semver-diff-3.1.1" // {
         dependencies = [
-          sources."semver-5.7.1"
+          sources."semver-6.3.0"
         ];
       })
       sources."semver-utils-1.1.4"
-      sources."shebang-command-1.2.0"
-      sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
       sources."sisteransi-1.0.4"
       sources."smart-buffer-4.1.0"
       sources."socks-2.3.3"
-      (sources."socks-proxy-agent-4.0.2" // {
-        dependencies = [
-          sources."agent-base-4.2.1"
-        ];
-      })
+      sources."socks-proxy-agent-5.0.0"
       sources."spawn-please-0.3.0"
       sources."sprintf-js-1.0.3"
-      sources."ssri-7.1.0"
-      (sources."string-width-3.1.0" // {
+      sources."ssri-8.0.0"
+      (sources."string-width-4.2.0" // {
         dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."strip-ansi-5.2.0"
+          sources."ansi-regex-5.0.0"
+          sources."emoji-regex-8.0.0"
+          sources."is-fullwidth-code-point-3.0.0"
+          sources."strip-ansi-6.0.0"
         ];
       })
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
-      sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-7.1.0"
       (sources."tar-6.0.1" // {
@@ -66108,36 +67649,22 @@ in
           sources."yallist-4.0.0"
         ];
       })
-      sources."term-size-1.2.0"
+      sources."term-size-2.2.0"
       sources."to-readable-stream-1.0.0"
-      sources."type-fest-0.3.1"
+      sources."type-fest-0.8.1"
+      sources."typedarray-to-buffer-3.1.5"
       sources."unique-filename-1.1.1"
       sources."unique-slug-2.0.2"
-      sources."unique-string-1.0.0"
-      (sources."update-notifier-3.0.1" // {
-        dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.2"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."has-flag-3.0.0"
-          sources."supports-color-5.5.0"
-        ];
-      })
+      sources."unique-string-2.0.0"
+      sources."update-notifier-4.1.0"
       sources."url-parse-lax-3.0.0"
       sources."util-deprecate-1.0.2"
       sources."validate-npm-package-name-3.0.0"
       sources."which-2.0.2"
-      (sources."widest-line-2.0.1" // {
-        dependencies = [
-          sources."ansi-regex-3.0.0"
-          sources."string-width-2.1.1"
-          sources."strip-ansi-4.0.0"
-        ];
-      })
+      sources."widest-line-3.1.0"
       sources."wrappy-1.0.2"
-      sources."write-file-atomic-2.4.3"
-      sources."xdg-basedir-3.0.0"
+      sources."write-file-atomic-3.0.3"
+      sources."xdg-basedir-4.0.0"
       sources."yallist-3.1.1"
     ];
     buildInputs = globalBuildInputs;
@@ -66375,14 +67902,14 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.8.3"
-      sources."@babel/compat-data-7.8.5"
-      (sources."@babel/core-7.8.4" // {
+      sources."@babel/compat-data-7.8.6"
+      (sources."@babel/core-7.8.7" // {
         dependencies = [
           sources."json5-2.1.1"
           sources."source-map-0.5.7"
         ];
       })
-      (sources."@babel/generator-7.8.4" // {
+      (sources."@babel/generator-7.8.8" // {
         dependencies = [
           sources."source-map-0.5.7"
         ];
@@ -66390,9 +67917,9 @@ in
       sources."@babel/helper-annotate-as-pure-7.8.3"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3"
       sources."@babel/helper-builder-react-jsx-7.8.3"
-      sources."@babel/helper-call-delegate-7.8.3"
-      sources."@babel/helper-compilation-targets-7.8.4"
-      sources."@babel/helper-create-regexp-features-plugin-7.8.3"
+      sources."@babel/helper-call-delegate-7.8.7"
+      sources."@babel/helper-compilation-targets-7.8.7"
+      sources."@babel/helper-create-regexp-features-plugin-7.8.8"
       sources."@babel/helper-define-map-7.8.3"
       sources."@babel/helper-explode-assignable-expression-7.8.3"
       sources."@babel/helper-function-name-7.8.3"
@@ -66400,18 +67927,18 @@ in
       sources."@babel/helper-hoist-variables-7.8.3"
       sources."@babel/helper-member-expression-to-functions-7.8.3"
       sources."@babel/helper-module-imports-7.8.3"
-      sources."@babel/helper-module-transforms-7.8.3"
+      sources."@babel/helper-module-transforms-7.8.6"
       sources."@babel/helper-optimise-call-expression-7.8.3"
       sources."@babel/helper-plugin-utils-7.8.3"
       sources."@babel/helper-regex-7.8.3"
       sources."@babel/helper-remap-async-to-generator-7.8.3"
-      sources."@babel/helper-replace-supers-7.8.3"
+      sources."@babel/helper-replace-supers-7.8.6"
       sources."@babel/helper-simple-access-7.8.3"
       sources."@babel/helper-split-export-declaration-7.8.3"
       sources."@babel/helper-wrap-function-7.8.3"
       sources."@babel/helpers-7.8.4"
       sources."@babel/highlight-7.8.3"
-      sources."@babel/parser-7.8.4"
+      sources."@babel/parser-7.8.8"
       sources."@babel/plugin-proposal-async-generator-functions-7.8.3"
       sources."@babel/plugin-proposal-dynamic-import-7.8.3"
       sources."@babel/plugin-proposal-json-strings-7.8.3"
@@ -66419,7 +67946,7 @@ in
       sources."@babel/plugin-proposal-object-rest-spread-7.8.3"
       sources."@babel/plugin-proposal-optional-catch-binding-7.8.3"
       sources."@babel/plugin-proposal-optional-chaining-7.8.3"
-      sources."@babel/plugin-proposal-unicode-property-regex-7.8.3"
+      sources."@babel/plugin-proposal-unicode-property-regex-7.8.8"
       sources."@babel/plugin-syntax-async-generators-7.8.4"
       sources."@babel/plugin-syntax-dynamic-import-7.8.3"
       sources."@babel/plugin-syntax-flow-7.8.3"
@@ -66434,14 +67961,14 @@ in
       sources."@babel/plugin-transform-async-to-generator-7.8.3"
       sources."@babel/plugin-transform-block-scoped-functions-7.8.3"
       sources."@babel/plugin-transform-block-scoping-7.8.3"
-      sources."@babel/plugin-transform-classes-7.8.3"
+      sources."@babel/plugin-transform-classes-7.8.6"
       sources."@babel/plugin-transform-computed-properties-7.8.3"
-      sources."@babel/plugin-transform-destructuring-7.8.3"
+      sources."@babel/plugin-transform-destructuring-7.8.8"
       sources."@babel/plugin-transform-dotall-regex-7.8.3"
       sources."@babel/plugin-transform-duplicate-keys-7.8.3"
       sources."@babel/plugin-transform-exponentiation-operator-7.8.3"
       sources."@babel/plugin-transform-flow-strip-types-7.8.3"
-      sources."@babel/plugin-transform-for-of-7.8.4"
+      sources."@babel/plugin-transform-for-of-7.8.6"
       sources."@babel/plugin-transform-function-name-7.8.3"
       sources."@babel/plugin-transform-literals-7.8.3"
       sources."@babel/plugin-transform-member-expression-literals-7.8.3"
@@ -66452,10 +67979,10 @@ in
       sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3"
       sources."@babel/plugin-transform-new-target-7.8.3"
       sources."@babel/plugin-transform-object-super-7.8.3"
-      sources."@babel/plugin-transform-parameters-7.8.4"
+      sources."@babel/plugin-transform-parameters-7.8.8"
       sources."@babel/plugin-transform-property-literals-7.8.3"
       sources."@babel/plugin-transform-react-jsx-7.8.3"
-      sources."@babel/plugin-transform-regenerator-7.8.3"
+      sources."@babel/plugin-transform-regenerator-7.8.7"
       sources."@babel/plugin-transform-reserved-words-7.8.3"
       sources."@babel/plugin-transform-shorthand-properties-7.8.3"
       sources."@babel/plugin-transform-spread-7.8.3"
@@ -66463,11 +67990,11 @@ in
       sources."@babel/plugin-transform-template-literals-7.8.3"
       sources."@babel/plugin-transform-typeof-symbol-7.8.4"
       sources."@babel/plugin-transform-unicode-regex-7.8.3"
-      sources."@babel/preset-env-7.8.4"
-      sources."@babel/runtime-7.8.4"
-      sources."@babel/template-7.8.3"
-      sources."@babel/traverse-7.8.4"
-      sources."@babel/types-7.8.3"
+      sources."@babel/preset-env-7.8.7"
+      sources."@babel/runtime-7.8.7"
+      sources."@babel/template-7.8.6"
+      sources."@babel/traverse-7.8.6"
+      sources."@babel/types-7.8.7"
       sources."@iarna/toml-2.2.3"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.3"
@@ -66478,10 +68005,10 @@ in
       sources."@parcel/workers-1.11.0"
       sources."@types/q-1.5.2"
       sources."abab-2.0.3"
-      sources."acorn-5.7.3"
+      sources."acorn-7.1.1"
       (sources."acorn-globals-4.3.4" // {
         dependencies = [
-          sources."acorn-6.4.0"
+          sources."acorn-6.4.1"
         ];
       })
       sources."acorn-walk-6.2.0"
@@ -66545,7 +68072,7 @@ in
       sources."braces-2.3.2"
       sources."brfs-1.6.1"
       sources."brorand-1.1.0"
-      sources."browser-process-hrtime-0.1.3"
+      sources."browser-process-hrtime-1.0.0"
       sources."browserify-aes-1.2.0"
       sources."browserify-cipher-1.0.1"
       sources."browserify-des-1.0.2"
@@ -66556,7 +68083,7 @@ in
           sources."pako-1.0.11"
         ];
       })
-      sources."browserslist-4.8.7"
+      sources."browserslist-4.9.1"
       (sources."buffer-4.9.2" // {
         dependencies = [
           sources."isarray-1.0.0"
@@ -66573,7 +68100,7 @@ in
       sources."callsites-2.0.0"
       sources."camelcase-5.3.1"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001030"
+      sources."caniuse-lite-1.0.30001035"
       sources."caseless-0.12.0"
       sources."chalk-2.4.2"
       sources."chokidar-2.1.8"
@@ -66637,17 +68164,10 @@ in
       })
       sources."css-select-2.1.0"
       sources."css-select-base-adapter-0.1.1"
-      (sources."css-selector-tokenizer-0.7.1" // {
-        dependencies = [
-          sources."jsesc-0.5.0"
-          sources."regexpu-core-1.0.0"
-          sources."regjsgen-0.2.0"
-          sources."regjsparser-0.1.5"
-        ];
-      })
+      sources."css-selector-tokenizer-0.7.2"
       sources."css-tree-1.0.0-alpha.37"
       sources."css-what-3.2.1"
-      sources."cssesc-0.1.0"
+      sources."cssesc-3.0.0"
       sources."cssnano-4.1.10"
       sources."cssnano-preset-default-4.0.7"
       sources."cssnano-util-get-arguments-4.0.0"
@@ -66708,7 +68228,7 @@ in
       sources."duplexer2-0.1.4"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.360"
+      sources."electron-to-chromium-1.3.376"
       sources."elliptic-6.5.2"
       sources."emoji-regex-7.0.3"
       sources."encodeurl-1.0.2"
@@ -66744,7 +68264,7 @@ in
         ];
       })
       sources."extsprintf-1.3.0"
-      sources."falafel-2.1.0"
+      sources."falafel-2.2.4"
       sources."fast-deep-equal-3.1.1"
       sources."fast-glob-2.2.7"
       sources."fast-json-stable-stringify-2.1.0"
@@ -66806,7 +68326,7 @@ in
       (sources."htmlnano-0.2.5" // {
         dependencies = [
           sources."posthtml-0.12.0"
-          sources."terser-4.6.4"
+          sources."terser-4.6.6"
         ];
       })
       (sources."htmlparser2-3.10.1" // {
@@ -66864,7 +68384,7 @@ in
       sources."is-url-1.2.4"
       sources."is-windows-1.0.2"
       sources."is-wsl-1.1.0"
-      sources."isarray-0.0.1"
+      sources."isarray-2.0.5"
       sources."isexe-2.0.0"
       sources."isobject-3.0.1"
       sources."isstream-0.1.2"
@@ -66877,7 +68397,7 @@ in
       sources."jsbn-0.1.1"
       (sources."jsdom-14.1.0" // {
         dependencies = [
-          sources."acorn-6.4.0"
+          sources."acorn-6.4.1"
           sources."escodegen-1.14.1"
           sources."esprima-4.0.1"
           sources."ws-6.2.1"
@@ -66929,7 +68449,7 @@ in
       sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       (sources."mixin-deep-1.3.2" // {
         dependencies = [
           sources."is-extendable-1.0.1"
@@ -66958,7 +68478,7 @@ in
           sources."punycode-1.4.1"
         ];
       })
-      (sources."node-releases-1.1.50" // {
+      (sources."node-releases-1.1.52" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
@@ -67067,11 +68587,7 @@ in
       sources."postcss-ordered-values-4.1.2"
       sources."postcss-reduce-initial-4.0.3"
       sources."postcss-reduce-transforms-4.0.2"
-      (sources."postcss-selector-parser-6.0.2" // {
-        dependencies = [
-          sources."cssesc-3.0.0"
-        ];
-      })
+      sources."postcss-selector-parser-6.0.2"
       sources."postcss-svgo-4.0.2"
       sources."postcss-unique-selectors-4.0.1"
       sources."postcss-value-parser-3.3.1"
@@ -67101,18 +68617,18 @@ in
       })
       sources."readdirp-2.2.1"
       sources."regenerate-1.4.0"
-      sources."regenerate-unicode-properties-8.1.0"
-      sources."regenerator-runtime-0.13.4"
-      sources."regenerator-transform-0.14.2"
+      sources."regenerate-unicode-properties-8.2.0"
+      sources."regenerator-runtime-0.13.5"
+      sources."regenerator-transform-0.14.3"
       (sources."regex-not-1.0.2" // {
         dependencies = [
           sources."extend-shallow-3.0.2"
           sources."is-extendable-1.0.1"
         ];
       })
-      sources."regexpu-core-4.6.0"
+      sources."regexpu-core-4.7.0"
       sources."regjsgen-0.5.1"
-      (sources."regjsparser-0.6.3" // {
+      (sources."regjsparser-0.6.4" // {
         dependencies = [
           sources."jsesc-0.5.0"
         ];
@@ -67192,7 +68708,7 @@ in
       sources."sprintf-js-1.0.3"
       sources."sshpk-1.16.1"
       sources."stable-0.1.8"
-      (sources."static-eval-2.0.3" // {
+      (sources."static-eval-2.0.5" // {
         dependencies = [
           sources."escodegen-1.14.1"
           sources."esprima-4.0.1"
@@ -67253,8 +68769,8 @@ in
       })
       sources."unicode-canonical-property-names-ecmascript-1.0.4"
       sources."unicode-match-property-ecmascript-1.0.4"
-      sources."unicode-match-property-value-ecmascript-1.1.0"
-      sources."unicode-property-aliases-ecmascript-1.0.5"
+      sources."unicode-match-property-value-ecmascript-1.2.0"
+      sources."unicode-property-aliases-ecmascript-1.1.0"
       sources."unicode-trie-0.3.1"
       sources."union-value-1.0.1"
       sources."uniq-1.0.1"
@@ -67293,7 +68809,7 @@ in
       sources."verror-1.10.0"
       sources."vlq-0.2.3"
       sources."vm-browserify-1.1.2"
-      sources."w3c-hr-time-1.0.1"
+      sources."w3c-hr-time-1.0.2"
       sources."w3c-xmlserializer-1.1.2"
       sources."wcwidth-1.0.1"
       sources."webidl-conversions-4.0.2"
@@ -67315,8 +68831,8 @@ in
       sources."xmlchars-2.2.0"
       sources."xtend-4.0.2"
       sources."y18n-4.0.0"
-      sources."yargs-14.2.2"
-      sources."yargs-parser-15.0.0"
+      sources."yargs-14.2.3"
+      sources."yargs-parser-15.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -67514,7 +69030,7 @@ in
       sources."pn-1.1.0"
       sources."prfun-2.1.5"
       sources."process-nextick-args-2.0.1"
-      sources."promise-8.0.3"
+      sources."promise-8.1.0"
       sources."proxy-addr-2.0.6"
       sources."prr-1.0.1"
       sources."psl-1.7.0"
@@ -67558,7 +69074,7 @@ in
       (sources."service-runner-2.7.6" // {
         dependencies = [
           sources."semver-7.1.3"
-          sources."yargs-14.2.2"
+          sources."yargs-14.2.3"
         ];
       })
       sources."set-blocking-2.0.0"
@@ -67594,12 +69110,12 @@ in
       sources."wrap-ansi-5.1.0"
       sources."wrappy-1.0.2"
       sources."y18n-4.0.0"
-      (sources."yargs-13.3.0" // {
+      (sources."yargs-13.3.2" // {
         dependencies = [
-          sources."yargs-parser-13.1.1"
+          sources."yargs-parser-13.1.2"
         ];
       })
-      sources."yargs-parser-15.0.0"
+      sources."yargs-parser-15.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -67719,7 +69235,7 @@ in
       sources."has-flag-3.0.0"
       sources."has-symbols-1.0.1"
       sources."hat-0.0.3"
-      sources."hosted-git-info-2.8.6"
+      sources."hosted-git-info-2.8.8"
       sources."http-headers-3.0.2"
       sources."iconv-lite-0.4.24"
       sources."immediate-chunk-store-1.0.8"
@@ -67773,7 +69289,7 @@ in
       sources."mimic-fn-1.2.0"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."mkdirp-0.3.5"
       sources."ms-2.0.0"
       sources."multicast-dns-6.2.3"
@@ -67835,7 +69351,7 @@ in
           sources."mkdirp-0.5.1"
         ];
       })
-      sources."random-access-storage-1.4.0"
+      sources."random-access-storage-1.4.1"
       sources."random-iterate-1.0.1"
       sources."randombytes-2.1.0"
       sources."range-parser-1.2.1"
@@ -67851,7 +69367,7 @@ in
       sources."restore-cursor-2.0.0"
       sources."reverse-http-1.3.0"
       sources."rimraf-2.7.1"
-      sources."run-async-2.3.0"
+      sources."run-async-2.4.0"
       sources."run-parallel-1.1.9"
       sources."run-series-1.1.8"
       sources."rusha-0.8.13"
@@ -67975,18 +69491,18 @@ in
       (sources."bittorrent-tracker-7.7.0" // {
         dependencies = [
           sources."bencode-0.8.0"
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
           sources."ultron-1.0.2"
           sources."ws-1.1.5"
         ];
       })
-      sources."bl-3.0.0"
+      sources."bl-4.0.1"
       sources."blob-0.0.5"
       sources."bn.js-4.11.8"
       sources."bncode-0.5.3"
       sources."body-parser-1.19.0"
       sources."brace-expansion-1.1.11"
-      sources."buffer-5.4.3"
+      sources."buffer-5.5.0"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
@@ -68179,7 +69695,7 @@ in
       sources."punycode-2.1.1"
       sources."qs-6.7.0"
       sources."random-access-file-2.1.3"
-      sources."random-access-storage-1.4.0"
+      sources."random-access-storage-1.4.1"
       sources."random-bytes-1.0.0"
       sources."random-iterate-1.0.1"
       sources."randombytes-2.1.0"
@@ -68253,7 +69769,7 @@ in
       sources."statuses-1.5.0"
       sources."string2compact-1.3.0"
       sources."string_decoder-1.1.1"
-      sources."tar-stream-2.1.0"
+      sources."tar-stream-2.1.2"
       sources."thirty-two-0.0.2"
       sources."thunky-1.1.0"
       sources."to-array-0.1.4"
@@ -68284,7 +69800,7 @@ in
       sources."verror-1.10.0"
       sources."which-1.3.1"
       sources."wrappy-1.0.2"
-      sources."ws-7.2.1"
+      sources."ws-7.2.3"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."xtend-4.0.2"
       sources."yeast-0.1.2"
@@ -68303,10 +69819,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "4.9.3";
+    version = "4.11.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-4.9.3.tgz";
-      sha512 = "VMfcMBPfBL5jQoby3qSkYtSEDemIygc8quQu6mJprL3gWORHWcHFyuCgvT1C4ZRvqoU6rHu1XmlVVEan1ooM2g==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-4.11.5.tgz";
+      sha512 = "Be5bDGBQADZ6IVj0v9XLS6VP4UOeVyZTbYhWAgcb7EvSRlm0xGVetg0fRLLYdCNfLT+SkUNReAMy/pXS0XyMCw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -68339,10 +69855,10 @@ in
   pscid = nodeEnv.buildNodePackage {
     name = "pscid";
     packageName = "pscid";
-    version = "2.8.5";
+    version = "2.9.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pscid/-/pscid-2.8.5.tgz";
-      sha512 = "I+Obl5HqXpXeGEn7BMhzZN57h48laWh0HX3D84UsABiKqYuhuc+kn8S65idvjcWKiHz1MomXz+ovE+wzV4QMxw==";
+      url = "https://registry.npmjs.org/pscid/-/pscid-2.9.0.tgz";
+      sha512 = "YktAYj/QmnJ12jh3smI/XkhBJyYF8wNjdLRdR3FcU8MRQE0ryrYM23vri9hTIBoA5Fv3AXt3l2bcpAZ8Ota3aA==";
     };
     dependencies = [
       sources."balanced-match-1.0.0"
@@ -68360,7 +69876,7 @@ in
       sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
-      sources."which-1.3.1"
+      sources."which-2.0.2"
       sources."wrappy-1.0.2"
     ];
     buildInputs = globalBuildInputs;
@@ -68383,7 +69899,7 @@ in
     };
     dependencies = [
       sources."JSONStream-1.3.5"
-      sources."acorn-7.1.0"
+      sources."acorn-7.1.1"
       sources."acorn-node-1.8.2"
       sources."acorn-walk-7.1.1"
       sources."asn1.js-4.10.1"
@@ -68423,7 +69939,7 @@ in
       sources."browserify-rsa-4.0.1"
       sources."browserify-sign-4.0.4"
       sources."browserify-zlib-0.2.0"
-      sources."buffer-5.4.3"
+      sources."buffer-5.5.0"
       sources."buffer-crc32-0.2.13"
       sources."buffer-from-1.1.1"
       sources."buffer-xor-1.0.3"
@@ -68452,7 +69968,7 @@ in
       sources."des.js-1.0.1"
       (sources."detective-5.2.0" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
         ];
       })
       sources."diffie-hellman-5.0.3"
@@ -68558,7 +70074,7 @@ in
       sources."simple-concat-1.0.0"
       (sources."sorcery-0.10.0" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
         ];
       })
       sources."source-map-0.5.7"
@@ -68574,7 +70090,7 @@ in
       sources."string_decoder-1.3.0"
       (sources."subarg-1.0.0" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
         ];
       })
       sources."syntax-error-1.4.0"
@@ -68686,7 +70202,7 @@ in
       sources."isarray-2.0.5"
       sources."isstream-0.1.2"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -68742,7 +70258,7 @@ in
       sha1 = "da6ac7d4d7777a59a5e951cf46e72fd4b6b40a2c";
     };
     dependencies = [
-      sources."acorn-5.7.3"
+      sources."acorn-5.7.4"
       sources."amdefine-1.0.1"
       sources."ast-types-0.9.6"
       sources."balanced-match-1.0.0"
@@ -69013,7 +70529,7 @@ in
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."ms-2.0.0"
       sources."negotiator-0.6.2"
       sources."npm-run-path-2.0.2"
@@ -69064,26 +70580,36 @@ in
   serverless = nodeEnv.buildNodePackage {
     name = "serverless";
     packageName = "serverless";
-    version = "1.64.0";
+    version = "1.66.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/serverless/-/serverless-1.64.0.tgz";
-      sha512 = "N1Ls4ecV1++ZYqZ6RRVUOqMrHZrwBW/nvy/P1N7FCfJX1k9LQMtUe6wa4X5+q0kiFdhIHYYCteHcpSGJbyOwTw==";
+      url = "https://registry.npmjs.org/serverless/-/serverless-1.66.0.tgz";
+      sha512 = "Syl/WikZfx+g6mIKb7XgwJO8S00XBYQCLJnrYxfM2VYRsp4dMx202n+/1XBgKXLeViLRx0ofEe/Xjn9GxRpSUQ==";
     };
     dependencies = [
       sources."2-thenable-1.0.0"
+      sources."@nodelib/fs.scandir-2.1.3"
+      sources."@nodelib/fs.stat-2.0.3"
+      sources."@nodelib/fs.walk-1.2.4"
       sources."@serverless/cli-1.4.0"
       (sources."@serverless/component-metrics-1.0.8" // {
         dependencies = [
           sources."node-fetch-2.6.0"
         ];
       })
+      (sources."@serverless/components-2.22.3" // {
+        dependencies = [
+          sources."fs-extra-8.1.0"
+          sources."globby-10.0.2"
+          sources."uuid-3.4.0"
+        ];
+      })
       (sources."@serverless/core-1.1.2" // {
         dependencies = [
           sources."fs-extra-7.0.1"
           sources."semver-6.3.0"
         ];
       })
-      (sources."@serverless/enterprise-plugin-3.4.1" // {
+      (sources."@serverless/enterprise-plugin-3.5.0" // {
         dependencies = [
           sources."fs-extra-8.1.0"
           sources."node-fetch-2.6.0"
@@ -69092,19 +70618,30 @@ in
         ];
       })
       sources."@serverless/event-mocks-1.1.1"
+      (sources."@serverless/platform-client-0.24.0" // {
+        dependencies = [
+          sources."https-proxy-agent-5.0.0"
+        ];
+      })
       (sources."@serverless/platform-sdk-2.3.0" // {
         dependencies = [
           sources."ramda-0.25.0"
           sources."uuid-3.4.0"
+          sources."ws-6.2.1"
         ];
       })
       sources."@serverless/template-1.1.3"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
+      sources."@types/events-3.0.0"
+      sources."@types/glob-7.1.1"
       sources."@types/lodash-4.14.149"
-      sources."agent-base-5.1.1"
+      sources."@types/minimatch-3.0.3"
+      sources."@types/node-13.9.1"
+      sources."adm-zip-0.4.14"
+      sources."agent-base-6.0.0"
       sources."ansi-align-3.0.0"
-      sources."ansi-escapes-4.3.0"
+      sources."ansi-escapes-4.3.1"
       sources."ansi-regex-4.1.0"
       sources."ansi-styles-3.2.1"
       sources."anymatch-3.1.1"
@@ -69126,7 +70663,7 @@ in
       sources."argparse-1.0.10"
       sources."arr-diff-4.0.0"
       sources."arr-union-3.1.0"
-      sources."array-union-1.0.2"
+      sources."array-union-2.1.0"
       sources."array-uniq-1.0.3"
       sources."array-unique-0.3.2"
       sources."assign-symbols-1.0.0"
@@ -69134,12 +70671,13 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.626.0" // {
+      (sources."aws-sdk-2.639.0" // {
         dependencies = [
           sources."buffer-4.9.1"
           sources."uuid-3.3.2"
         ];
       })
+      sources."axios-0.19.2"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
@@ -69157,7 +70695,7 @@ in
       })
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."buffer-5.4.3"
+      sources."buffer-5.5.0"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
@@ -69241,7 +70779,7 @@ in
           sources."type-1.2.0"
         ];
       })
-      sources."dayjs-1.8.20"
+      sources."dayjs-1.8.22"
       sources."debug-4.1.1"
       sources."decamelize-1.2.0"
       sources."decode-uri-component-0.2.0"
@@ -69265,6 +70803,7 @@ in
       sources."deferred-0.7.11"
       sources."define-property-2.0.2"
       sources."delayed-stream-1.0.0"
+      sources."dir-glob-3.0.1"
       sources."dot-prop-4.2.0"
       sources."dotenv-8.2.0"
       (sources."download-7.1.0" // {
@@ -69315,7 +70854,9 @@ in
       sources."extend-3.0.2"
       sources."extend-shallow-3.0.2"
       sources."external-editor-3.1.0"
+      sources."fast-glob-3.2.2"
       sources."fast-levenshtein-2.0.6"
+      sources."fastq-1.6.1"
       sources."fd-slicer-1.1.0"
       sources."figures-3.2.0"
       sources."file-type-5.2.0"
@@ -69325,6 +70866,12 @@ in
       sources."fill-range-7.0.1"
       sources."find-requires-1.0.0"
       sources."flat-5.0.0"
+      (sources."follow-redirects-1.5.10" // {
+        dependencies = [
+          sources."debug-3.1.0"
+          sources."ms-2.0.0"
+        ];
+      })
       sources."for-in-1.0.2"
       sources."form-data-2.5.1"
       sources."formidable-1.2.2"
@@ -69350,7 +70897,11 @@ in
       sources."glob-7.1.6"
       sources."glob-parent-5.1.0"
       sources."global-dirs-0.1.1"
-      sources."globby-6.1.0"
+      (sources."globby-6.1.0" // {
+        dependencies = [
+          sources."array-union-1.0.2"
+        ];
+      })
       sources."got-9.6.0"
       sources."graceful-fs-4.2.3"
       sources."graceful-readlink-1.0.1"
@@ -69370,8 +70921,12 @@ in
           sources."kind-of-4.0.0"
         ];
       })
-      sources."http-cache-semantics-4.0.4"
-      sources."https-proxy-agent-4.0.0"
+      sources."http-cache-semantics-4.1.0"
+      (sources."https-proxy-agent-4.0.0" // {
+        dependencies = [
+          sources."agent-base-5.1.1"
+        ];
+      })
       sources."iconv-lite-0.4.24"
       sources."ieee754-1.1.13"
       sources."ignore-5.1.4"
@@ -69425,12 +70980,17 @@ in
       sources."iso8601-duration-1.2.0"
       sources."isobject-3.0.1"
       sources."isomorphic-fetch-2.2.1"
+      sources."isomorphic-ws-4.0.1"
       sources."isurl-1.0.0"
       sources."jmespath-0.15.0"
       sources."js-yaml-3.13.1"
       sources."json-buffer-3.0.0"
       sources."json-cycle-1.3.0"
-      sources."json-refs-2.1.7"
+      (sources."json-refs-2.1.7" // {
+        dependencies = [
+          sources."slash-1.0.0"
+        ];
+      })
       sources."json-stringify-safe-5.0.1"
       sources."jsonata-1.8.1"
       sources."jsonfile-4.0.0"
@@ -69470,14 +71030,16 @@ in
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       sources."memoizee-0.4.14"
+      sources."merge2-1.3.0"
       sources."methods-1.1.2"
+      sources."micromatch-4.0.2"
       sources."mime-1.6.0"
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
       sources."mimic-fn-1.2.0"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."mixin-deep-1.3.2"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
@@ -69518,7 +71080,7 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."object-hash-1.3.1"
+      sources."object-hash-2.0.3"
       sources."object-visit-1.0.1"
       sources."object.pick-1.3.0"
       sources."once-1.4.0"
@@ -69547,6 +71109,7 @@ in
       sources."path-is-inside-1.0.2"
       sources."path-key-2.0.1"
       sources."path-loader-1.0.10"
+      sources."path-type-4.0.0"
       sources."pend-1.2.0"
       sources."picomatch-2.2.1"
       sources."pify-2.3.0"
@@ -69572,7 +71135,7 @@ in
       sources."rc-1.2.8"
       sources."readable-stream-2.3.7"
       sources."readdirp-3.3.0"
-      sources."regenerator-runtime-0.13.4"
+      sources."regenerator-runtime-0.13.5"
       sources."regex-not-1.0.2"
       sources."registry-auth-token-4.1.1"
       sources."registry-url-5.1.0"
@@ -69582,8 +71145,10 @@ in
       sources."responselike-1.0.2"
       sources."restore-cursor-2.0.0"
       sources."ret-0.1.15"
+      sources."reusify-1.0.4"
       sources."rimraf-2.7.1"
-      sources."run-async-2.3.0"
+      sources."run-async-2.4.0"
+      sources."run-parallel-1.1.9"
       sources."rxjs-6.5.4"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
@@ -69608,8 +71173,8 @@ in
       sources."shebang-regex-1.0.0"
       sources."shortid-2.2.15"
       sources."signal-exit-3.0.2"
-      sources."simple-git-1.131.0"
-      sources."slash-1.0.0"
+      sources."simple-git-1.132.0"
+      sources."slash-3.0.0"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -69700,10 +71265,10 @@ in
       sources."to-regex-range-5.0.1"
       sources."traverse-0.6.6"
       sources."trim-repeated-1.0.0"
-      sources."tslib-1.11.0"
+      sources."tslib-1.11.1"
       sources."tunnel-agent-0.6.0"
       sources."type-2.0.0"
-      sources."type-fest-0.8.1"
+      sources."type-fest-0.11.0"
       sources."unbzip2-stream-1.3.3"
       (sources."union-value-1.0.1" // {
         dependencies = [
@@ -69759,7 +71324,7 @@ in
       })
       sources."wrappy-1.0.2"
       sources."write-file-atomic-2.4.3"
-      sources."ws-6.2.1"
+      sources."ws-7.2.3"
       sources."xdg-basedir-3.0.0"
       sources."xml2js-0.4.19"
       sources."xmlbuilder-9.0.7"
@@ -70408,19 +71973,19 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.297.1";
+    version = "1.298.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.297.1.tgz";
-      sha512 = "o+BfGFrgEdko8TWbZUPc6LZXB6Ma0frL7A82uz0SoE5/dMHYNj8ko9cJ8AUf3kDZ9JoMuuQDVn4UPHAfffUkNA==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.298.1.tgz";
+      sha512 = "HTpycsQ4uLAGoPAt9HjX+eLTdHRXOcTzBAzjSIav1UvXzkyPD6kvP8EJJ5PlL/6MHFmoUpn9Io1+OKEUmPtpVA==";
     };
     dependencies = [
       sources."@snyk/cli-interface-2.3.2"
       sources."@snyk/cocoapods-lockfile-parser-3.0.0"
       sources."@snyk/composer-lockfile-parser-1.2.0"
       sources."@snyk/configstore-3.2.0-rc1"
-      sources."@snyk/dep-graph-1.13.1"
+      sources."@snyk/dep-graph-1.16.1"
       sources."@snyk/gemfile-1.2.0"
-      sources."@snyk/ruby-semver-2.0.4"
+      sources."@snyk/ruby-semver-2.1.0"
       (sources."@snyk/snyk-cocoapods-plugin-2.0.1" // {
         dependencies = [
           sources."@snyk/cli-interface-1.5.0"
@@ -70432,7 +71997,7 @@ in
       sources."@types/debug-4.1.5"
       sources."@types/events-3.0.0"
       sources."@types/js-yaml-3.12.2"
-      sources."@types/node-13.7.5"
+      sources."@types/node-13.9.1"
       sources."@types/restify-4.3.6"
       sources."@types/semver-5.5.0"
       sources."@types/xml2js-0.4.3"
@@ -70450,7 +72015,7 @@ in
       sources."ast-types-0.13.2"
       sources."async-1.5.2"
       sources."balanced-match-1.0.0"
-      (sources."bl-3.0.0" // {
+      (sources."bl-4.0.1" // {
         dependencies = [
           sources."readable-stream-3.6.0"
           sources."string_decoder-1.3.0"
@@ -70547,7 +72112,7 @@ in
       sources."graceful-fs-4.2.3"
       sources."graphlib-2.1.8"
       sources."has-flag-3.0.0"
-      sources."hosted-git-info-2.8.6"
+      sources."hosted-git-info-2.8.8"
       sources."http-errors-1.7.3"
       (sources."http-proxy-agent-2.1.0" // {
         dependencies = [
@@ -70600,7 +72165,7 @@ in
       sources."make-dir-1.3.0"
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."ms-2.1.2"
       sources."mute-stream-0.0.7"
       sources."nconf-0.10.0"
@@ -70650,7 +72215,7 @@ in
           sources."yallist-3.1.1"
         ];
       })
-      sources."proxy-from-env-1.0.0"
+      sources."proxy-from-env-1.1.0"
       sources."pseudomap-1.0.2"
       sources."pump-3.0.0"
       sources."raw-body-2.4.1"
@@ -70666,7 +72231,7 @@ in
       sources."registry-url-3.1.0"
       sources."restore-cursor-2.0.0"
       sources."rimraf-2.7.1"
-      sources."run-async-2.3.0"
+      sources."run-async-2.4.0"
       sources."rxjs-6.5.4"
       sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
@@ -70685,7 +72250,7 @@ in
       sources."signal-exit-3.0.2"
       sources."smart-buffer-4.1.0"
       sources."snyk-config-2.2.3"
-      (sources."snyk-docker-plugin-2.2.0" // {
+      (sources."snyk-docker-plugin-2.2.2" // {
         dependencies = [
           sources."debug-4.1.1"
         ];
@@ -70762,7 +72327,7 @@ in
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-5.5.0"
-      (sources."tar-stream-2.1.0" // {
+      (sources."tar-stream-2.1.2" // {
         dependencies = [
           sources."readable-stream-3.6.0"
           sources."string_decoder-1.3.0"
@@ -70779,7 +72344,7 @@ in
       sources."toidentifier-1.0.0"
       sources."toml-3.0.0"
       sources."tree-kill-1.2.2"
-      sources."tslib-1.11.0"
+      sources."tslib-1.11.1"
       sources."type-check-0.3.2"
       sources."unique-string-1.0.0"
       sources."unpipe-1.0.0"
@@ -70892,7 +72457,7 @@ in
       })
       sources."socket.io-parser-3.4.0"
       sources."to-array-0.1.4"
-      sources."ws-7.2.1"
+      sources."ws-7.2.3"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."yeast-0.1.2"
     ];
@@ -70962,7 +72527,7 @@ in
       sources."got-6.7.1"
       sources."graceful-fs-4.2.3"
       sources."has-flag-3.0.0"
-      sources."hosted-git-info-2.8.6"
+      sources."hosted-git-info-2.8.8"
       sources."http-proxy-agent-2.1.0"
       sources."https-proxy-agent-3.0.1"
       sources."import-lazy-2.1.0"
@@ -70994,7 +72559,7 @@ in
       sources."map-obj-2.0.0"
       sources."meow-5.0.0"
       sources."mimic-fn-1.2.0"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."minimist-options-3.0.2"
       sources."ms-2.0.0"
       sources."normalize-package-data-2.5.0"
@@ -71358,7 +72923,7 @@ in
       sources."is-regex-1.0.5"
       sources."is-symbol-1.0.3"
       sources."is-typedarray-1.0.0"
-      sources."is-valid-domain-0.0.11"
+      sources."is-valid-domain-0.0.14"
       sources."is-windows-1.0.2"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
@@ -71426,7 +72991,7 @@ in
       sources."mdmanifest-1.0.8"
       sources."micromatch-2.3.11"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       (sources."mixin-deep-1.3.2" // {
         dependencies = [
           sources."is-extendable-1.0.1"
@@ -71467,7 +73032,7 @@ in
       sources."ncp-2.0.0"
       sources."nearley-2.19.1"
       sources."nice-try-1.0.5"
-      sources."node-gyp-build-4.2.0"
+      sources."node-gyp-build-4.2.1"
       sources."non-private-ip-1.4.4"
       sources."normalize-path-2.1.1"
       sources."normalize-uri-1.1.3"
@@ -71664,7 +73229,7 @@ in
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
-      sources."resolve-1.14.2"
+      sources."resolve-1.15.1"
       sources."resolve-url-0.2.1"
       sources."restore-cursor-1.0.1"
       sources."resumer-0.0.0"
@@ -71803,7 +73368,7 @@ in
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-2.0.0"
-      (sources."tape-4.13.0" // {
+      (sources."tape-4.13.2" // {
         dependencies = [
           sources."glob-7.1.6"
         ];
@@ -71965,7 +73530,7 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      (sources."aws-sdk-2.626.0" // {
+      (sources."aws-sdk-2.639.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -72105,7 +73670,7 @@ in
         dependencies = [
           sources."cookie-0.3.1"
           sources."debug-4.1.1"
-          sources."ws-7.2.1"
+          sources."ws-7.2.3"
         ];
       })
       (sources."engine.io-client-3.4.0" // {
@@ -72196,7 +73761,7 @@ in
         ];
       })
       sources."hoek-2.16.3"
-      sources."hosted-git-info-2.8.6"
+      sources."hosted-git-info-2.8.8"
       (sources."http-errors-1.7.2" // {
         dependencies = [
           sources."inherits-2.0.3"
@@ -72256,7 +73821,7 @@ in
       sources."json-stringify-safe-5.0.1"
       (sources."json5-1.0.1" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
         ];
       })
       sources."jsonpointer-4.0.1"
@@ -73233,7 +74798,7 @@ in
       })
       (sources."rc-1.2.8" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
         ];
       })
       sources."readable-stream-2.3.7"
@@ -73456,7 +75021,7 @@ in
       sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b";
     };
     dependencies = [
-      sources."@types/node-13.7.5"
+      sources."@types/node-13.9.1"
       sources."ajv-6.12.0"
       sources."ansi-regex-4.1.0"
       sources."ansi-styles-3.2.1"
@@ -73483,7 +75048,7 @@ in
       sources."debug-4.1.1"
       sources."decamelize-1.2.0"
       sources."delayed-stream-1.0.0"
-      sources."discord.js-11.5.1"
+      sources."discord.js-11.6.2"
       sources."ecc-jsbn-0.1.2"
       sources."emoji-regex-7.0.3"
       sources."esprima-4.0.1"
@@ -73513,7 +75078,7 @@ in
       sources."mime-2.4.4"
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."module-alias-2.2.2"
       sources."moment-2.24.0"
       sources."ms-2.1.2"
@@ -73524,7 +75089,7 @@ in
       sources."p-try-2.2.0"
       sources."path-exists-3.0.0"
       sources."performance-now-2.1.0"
-      sources."prism-media-0.0.3"
+      sources."prism-media-0.0.4"
       sources."psl-1.7.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
@@ -73558,8 +75123,8 @@ in
       sources."wrap-ansi-5.1.0"
       sources."ws-6.2.1"
       sources."y18n-4.0.0"
-      sources."yargs-13.3.0"
-      sources."yargs-parser-13.1.1"
+      sources."yargs-13.3.2"
+      sources."yargs-parser-13.1.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -73579,7 +75144,7 @@ in
       sha512 = "Z8uvtdWIlFn1GWy0HW5FhZ8VDryZwoJUdnjZU25C7/PBOltLIn1uv+WF3rVq6S1761YbsmbZYRP/l0ZJBCkvrw==";
     };
     dependencies = [
-      sources."acorn-6.4.0"
+      sources."acorn-6.4.1"
       sources."acorn-loose-6.1.0"
       sources."acorn-walk-6.2.0"
       sources."balanced-match-1.0.0"
@@ -73696,7 +75261,7 @@ in
       sources."has-1.0.3"
       sources."has-ansi-2.0.0"
       sources."has-symbols-1.0.1"
-      sources."hosted-git-info-2.8.6"
+      sources."hosted-git-info-2.8.8"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."is-alphabetical-1.0.4"
@@ -73722,7 +75287,7 @@ in
       sources."json-stable-stringify-1.0.1"
       (sources."json5-2.1.1" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
         ];
       })
       sources."jsonify-0.0.0"
@@ -74000,7 +75565,7 @@ in
       sources."got-6.7.1"
       sources."graceful-fs-4.2.3"
       sources."has-flag-3.0.0"
-      sources."hosted-git-info-2.8.6"
+      sources."hosted-git-info-2.8.8"
       sources."ignore-3.3.10"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
@@ -74055,7 +75620,7 @@ in
       sources."mdast-util-to-nlcst-3.2.3"
       sources."meow-3.7.0"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."ms-2.1.2"
       sources."nlcst-is-literal-1.2.1"
       sources."nlcst-normalize-2.1.4"
@@ -74206,8 +75771,8 @@ in
           sources."supports-color-4.5.0"
         ];
       })
-      sources."vfile-sort-2.2.1"
-      sources."vfile-statistics-1.1.3"
+      sources."vfile-sort-2.2.2"
+      sources."vfile-statistics-1.1.4"
       sources."which-1.3.1"
       sources."widest-line-2.0.1"
       sources."wrappy-1.0.2"
@@ -74445,10 +76010,10 @@ in
   textlint-rule-stop-words = nodeEnv.buildNodePackage {
     name = "textlint-rule-stop-words";
     packageName = "textlint-rule-stop-words";
-    version = "2.0.2";
+    version = "2.0.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.2.tgz";
-      sha512 = "Z96YepMqs2iS3shN8BxegxLQg0g6CQdmvooJ6MA/pmJPZyD+EMuBHqXOkE52GRuz2Z73m3vnh3/BLaryzsMNtw==";
+      url = "https://registry.npmjs.org/textlint-rule-stop-words/-/textlint-rule-stop-words-2.0.3.tgz";
+      sha512 = "IcTe7w+j5w/7+EKyKOUABDnXvF5qpmceMPmsE8dsrkHJsRZ9vZILMQRLElTHsB7mWoAI8R3fXelQY1w517VTCQ==";
     };
     dependencies = [
       sources."@textlint/ast-node-types-4.2.5"
@@ -74583,19 +76148,21 @@ in
   thelounge = nodeEnv.buildNodePackage {
     name = "thelounge";
     packageName = "thelounge";
-    version = "4.0.0";
+    version = "4.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/thelounge/-/thelounge-4.0.0.tgz";
-      sha512 = "qwUaC7A1Cq1gHu181tLT2cCATBSFyl2ThtWrYf5AU842+I7TX9sXhFq/c2CMqqInPisM2kWIKPMviwPDlf+njw==";
+      url = "https://registry.npmjs.org/thelounge/-/thelounge-4.1.0.tgz";
+      sha512 = "ozjuU9/DaxT5r7ivckvdrzTLRoMCOiUlNbEAxldoHD3jzbbCEm561rHkEw0Caek31tOL4y0yqHiFuRBRoGbmiQ==";
     };
     dependencies = [
-      sources."@sindresorhus/is-1.2.0"
-      sources."@szmarczak/http-timer-3.1.1"
+      sources."@sindresorhus/is-2.1.0"
+      sources."@szmarczak/http-timer-4.0.5"
+      sources."@tokenizer/token-0.1.1"
       sources."@types/cacheable-request-6.0.1"
       sources."@types/color-name-1.1.1"
+      sources."@types/debug-4.1.5"
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-13.7.5"
+      sources."@types/node-13.9.1"
       sources."@types/responselike-1.0.0"
       sources."abbrev-1.1.1"
       sources."abstract-logging-1.0.0"
@@ -74639,7 +76206,7 @@ in
       sources."buffer-equal-constant-time-1.0.1"
       sources."busboy-0.3.1"
       sources."bytes-3.1.0"
-      sources."cacheable-lookup-0.2.2"
+      sources."cacheable-lookup-2.0.0"
       sources."cacheable-request-7.0.1"
       sources."callsite-1.0.0"
       sources."caseless-0.12.0"
@@ -74655,7 +76222,7 @@ in
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
       sources."combined-stream-1.0.8"
-      sources."commander-4.0.1"
+      sources."commander-4.1.0"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.2.1"
       sources."component-inherit-0.0.3"
@@ -74677,7 +76244,7 @@ in
       sources."debug-2.6.9"
       sources."decompress-response-5.0.0"
       sources."deep-extend-0.6.0"
-      sources."defer-to-connect-1.1.3"
+      sources."defer-to-connect-2.0.0"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
       sources."depd-1.1.2"
@@ -74725,8 +76292,8 @@ in
       sources."extsprintf-1.4.0"
       sources."fast-deep-equal-3.1.1"
       sources."fast-json-stable-stringify-2.1.0"
-      sources."fast-text-encoding-1.0.0"
-      sources."file-type-12.4.2"
+      sources."fast-text-encoding-1.0.1"
+      sources."file-type-14.1.3"
       sources."filename-reserved-regex-2.0.0"
       sources."filenamify-4.1.0"
       sources."finalhandler-1.1.2"
@@ -74741,7 +76308,7 @@ in
       sources."get-stream-5.1.0"
       sources."getpass-0.1.7"
       sources."glob-7.1.6"
-      sources."got-10.1.0"
+      sources."got-10.6.0"
       sources."graceful-fs-4.2.3"
       sources."grapheme-splitter-1.0.4"
       sources."har-schema-2.0.0"
@@ -74751,7 +76318,7 @@ in
       sources."has-flag-4.0.0"
       sources."has-unicode-2.0.1"
       sources."htmlparser2-3.10.1"
-      sources."http-cache-semantics-4.0.4"
+      sources."http-cache-semantics-4.1.0"
       (sources."http-errors-1.7.2" // {
         dependencies = [
           sources."inherits-2.0.3"
@@ -74766,13 +76333,14 @@ in
         ];
       })
       sources."iconv-lite-0.4.24"
+      sources."ieee754-1.1.13"
       sources."ignore-walk-3.0.3"
       sources."indexof-0.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
       sources."ipaddr.js-1.9.1"
-      sources."irc-framework-4.6.0"
+      sources."irc-framework-4.7.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-typedarray-1.0.0"
       sources."is-utf8-0.2.1"
@@ -74803,12 +76371,12 @@ in
       sources."methods-1.1.2"
       sources."middleware-handler-0.2.0"
       sources."mime-1.6.0"
-      sources."mime-db-1.42.0"
-      sources."mime-types-2.1.25"
+      sources."mime-db-1.43.0"
+      sources."mime-types-2.1.26"
       sources."mimic-response-2.1.0"
       sources."minimalistic-assert-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."minipass-2.9.0"
       sources."minizlib-1.3.3"
       (sources."mkdirp-0.5.1" // {
@@ -74831,7 +76399,7 @@ in
           sources."semver-5.7.1"
         ];
       })
-      sources."nopt-4.0.1"
+      sources."nopt-4.0.3"
       sources."normalize-url-4.5.0"
       sources."npm-bundled-1.1.1"
       sources."npm-normalize-package-bin-1.0.1"
@@ -74848,7 +76416,9 @@ in
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
       sources."p-cancelable-2.0.0"
+      sources."p-event-4.1.0"
       sources."p-finally-1.0.0"
+      sources."p-timeout-2.0.1"
       sources."p-try-2.2.0"
       (sources."package-json-6.5.0" // {
         dependencies = [
@@ -74861,6 +76431,7 @@ in
             ];
           })
           sources."decompress-response-3.3.0"
+          sources."defer-to-connect-1.1.3"
           sources."get-stream-4.1.0"
           sources."got-9.6.0"
           sources."json-buffer-3.0.0"
@@ -74879,6 +76450,7 @@ in
       sources."parseurl-1.3.3"
       sources."path-is-absolute-1.0.1"
       sources."path-to-regexp-0.1.7"
+      sources."peek-readable-3.1.0"
       sources."performance-now-2.1.0"
       sources."pify-4.0.1"
       sources."precond-0.2.3"
@@ -74895,12 +76467,14 @@ in
       sources."read-1.0.7"
       sources."read-chunk-3.2.0"
       sources."readable-stream-3.6.0"
-      sources."regenerator-runtime-0.13.4"
+      sources."readable-web-to-node-stream-2.0.0"
+      sources."regenerator-runtime-0.13.5"
       sources."registry-auth-token-4.1.1"
       sources."registry-url-5.1.0"
       (sources."request-2.88.2" // {
         dependencies = [
           sources."qs-6.5.2"
+          sources."uuid-3.4.0"
         ];
       })
       sources."responselike-2.0.0"
@@ -74908,7 +76482,7 @@ in
       sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
-      sources."semver-7.1.1"
+      sources."semver-7.1.3"
       (sources."send-0.17.1" // {
         dependencies = [
           sources."ms-2.1.1"
@@ -74957,18 +76531,26 @@ in
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
       sources."strip-outer-1.0.1"
+      (sources."strtok3-6.0.0" // {
+        dependencies = [
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
+        ];
+      })
       sources."supports-color-7.1.0"
       sources."tar-4.4.13"
       sources."tlds-1.207.0"
       sources."to-array-0.1.4"
       sources."to-readable-stream-2.1.0"
       sources."toidentifier-1.0.0"
+      sources."token-types-2.0.0"
       sources."tough-cookie-2.5.0"
       sources."trim-repeated-1.0.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."type-fest-0.8.1"
+      sources."type-fest-0.10.0"
       sources."type-is-1.6.18"
+      sources."typedarray-to-buffer-3.1.5"
       sources."ua-parser-js-0.7.21"
       sources."uc.micro-1.0.6"
       sources."universalify-0.1.2"
@@ -74978,7 +76560,7 @@ in
       sources."urlsafe-base64-1.0.0"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.3.3"
+      sources."uuid-7.0.1"
       sources."vary-1.1.2"
       sources."vasync-2.2.0"
       sources."verror-1.10.0"
@@ -74986,10 +76568,10 @@ in
       sources."wide-align-1.1.3"
       sources."with-open-file-0.1.7"
       sources."wrappy-1.0.2"
-      sources."ws-7.2.1"
+      sources."ws-7.2.3"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."yallist-3.1.1"
-      sources."yarn-1.21.1"
+      sources."yarn-1.22.0"
       sources."yeast-0.1.2"
     ];
     buildInputs = globalBuildInputs;
@@ -75005,10 +76587,10 @@ in
   three = nodeEnv.buildNodePackage {
     name = "three";
     packageName = "three";
-    version = "0.113.2";
+    version = "0.114.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/three/-/three-0.113.2.tgz";
-      sha512 = "x3vrKW41/UtbWbWduWKGlfIc043SvHWr3YltehYq+UGb9YglQ2oztNGvl2eut05JtNSmP11Mh3t6Xak5/0e+Fg==";
+      url = "https://registry.npmjs.org/three/-/three-0.114.0.tgz";
+      sha512 = "3av45FxJeqYm7Rl02dfGBoqTaf2a934oUB4zMNrN8xjmASoSGeeykYoAr35+UntTdJDY/STw6CY3KuXFBWETig==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -75391,7 +76973,7 @@ in
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
       sources."temp-0.8.4"
-      sources."tslib-1.11.0"
+      sources."tslib-1.11.1"
       sources."wordwrap-0.0.3"
       sources."wrappy-1.0.2"
     ];
@@ -75431,10 +77013,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "3.8.2";
+    version = "3.8.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-3.8.2.tgz";
-      sha512 = "EgOVgL/4xfVrCMbhYKUQTdF37SQn4Iw73H5BgCrF1Abdun7Kwy/QZsE/ssAy0y4LxBbvua3PIbFsbRczWWnDdQ==";
+      url = "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz";
+      sha512 = "MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -75507,33 +77089,40 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.5.4";
+    version = "1.5.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.5.4.tgz";
-      sha512 = "jSqAjax1FKpzcyvpsvMyJHF1k/QW2MetI2fq7FOwU2NDRL9sa5jWqTUSsgNBYHe0I+fSAoj2OAZStEByUpHo4A==";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.5.5.tgz";
+      sha512 = "2oP133ynKIZp+w9dqI9lQAq8W8UPWSF3zLlwPCtRETxe3Mz8jHw/PCczsxwjP+roMU/Of8o9GQF4ckkznASiyQ==";
     };
     dependencies = [
       sources."@primer/octicons-9.4.0"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
+      sources."@types/color-name-1.1.1"
+      sources."@types/node-13.9.1"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       sources."after-0.8.2"
-      sources."ansi-regex-4.1.0"
-      sources."ansi-styles-3.2.1"
+      sources."ansi-regex-5.0.0"
+      (sources."ansi-styles-4.2.1" // {
+        dependencies = [
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+        ];
+      })
       sources."array-flatten-1.1.1"
       sources."arraybuffer.slice-0.0.7"
-      sources."async-1.0.0"
+      sources."async-2.6.3"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."backo2-1.0.2"
       sources."balanced-match-1.0.0"
       sources."base64-arraybuffer-0.1.5"
-      sources."base64id-1.0.0"
+      sources."base64id-2.0.0"
       sources."better-assert-1.0.2"
       sources."blob-0.0.5"
-      sources."bluebird-3.5.5"
-      sources."blueimp-md5-2.10.0"
+      sources."bluebird-3.7.2"
+      sources."blueimp-md5-2.12.0"
       sources."body-parser-1.19.0"
       sources."brace-expansion-1.1.11"
       sources."bytes-3.1.0"
@@ -75545,32 +77134,33 @@ in
       })
       sources."callsite-1.0.0"
       sources."camelcase-5.3.1"
-      sources."cliui-5.0.0"
+      sources."cliui-6.0.0"
       sources."clone-2.1.2"
       sources."clone-response-1.0.2"
       sources."color-3.1.2"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."color-string-1.5.3"
-      sources."colors-1.0.3"
+      sources."colornames-1.1.1"
+      sources."colors-1.4.0"
+      (sources."colorspace-1.1.2" // {
+        dependencies = [
+          sources."color-3.0.0"
+        ];
+      })
       sources."combined-stream-1.0.8"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.2.1"
       sources."component-inherit-0.0.3"
       sources."concat-map-0.0.1"
-      sources."content-disposition-0.5.2"
+      sources."content-disposition-0.5.3"
       sources."content-type-1.0.4"
       sources."cookie-0.3.1"
       sources."cookie-parser-1.4.4"
       sources."cookie-signature-1.0.6"
       sources."cookiejar-2.1.2"
-      (sources."cross-spawn-6.0.5" // {
-        dependencies = [
-          sources."semver-5.7.1"
-        ];
-      })
+      sources."core-util-is-1.0.2"
       sources."crossroads-0.12.2"
-      sources."cycle-1.0.3"
       sources."debug-2.6.9"
       sources."decamelize-1.2.0"
       sources."decompress-response-3.3.0"
@@ -75580,70 +77170,58 @@ in
       sources."delayed-stream-1.0.0"
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
+      sources."diagnostics-1.1.1"
       sources."diff-4.0.2"
-      sources."diff2html-3.1.2"
+      sources."diff2html-3.1.4"
       sources."dnd-page-scroll-0.0.4"
       sources."duplexer3-0.1.4"
-      sources."eachr-3.3.0"
-      (sources."editions-2.3.0" // {
-        dependencies = [
-          sources."semver-6.3.0"
-        ];
-      })
       sources."ee-first-1.1.1"
-      sources."emoji-regex-7.0.3"
+      sources."emoji-regex-8.0.0"
+      sources."enabled-1.0.2"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
-      (sources."engine.io-3.3.2" // {
+      (sources."engine.io-3.4.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
         ];
       })
-      (sources."engine.io-client-3.3.2" // {
+      (sources."engine.io-client-3.4.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
+          sources."ws-6.1.4"
         ];
       })
-      sources."engine.io-parser-2.1.3"
-      sources."errlop-2.0.0"
+      sources."engine.io-parser-2.2.0"
+      sources."env-variable-0.0.6"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
       sources."eve-0.5.4"
-      sources."execa-1.0.0"
-      (sources."express-4.16.4" // {
+      (sources."express-4.17.1" // {
         dependencies = [
-          sources."body-parser-1.18.3"
-          sources."bytes-3.0.0"
-          sources."http-errors-1.6.3"
-          sources."iconv-lite-0.4.23"
-          sources."qs-6.5.2"
-          sources."raw-body-2.3.3"
-          sources."setprototypeof-1.1.0"
-          sources."statuses-1.4.0"
+          sources."cookie-0.4.0"
         ];
       })
-      (sources."express-session-1.16.2" // {
+      (sources."express-session-1.17.0" // {
         dependencies = [
+          sources."cookie-0.4.0"
           sources."depd-2.0.0"
+          sources."safe-buffer-5.2.0"
         ];
       })
-      sources."extract-opts-3.4.0"
-      sources."eyes-0.1.8"
       sources."fast-safe-stringify-2.0.7"
-      (sources."finalhandler-1.1.1" // {
-        dependencies = [
-          sources."statuses-1.4.0"
-        ];
-      })
-      sources."find-up-3.0.0"
-      sources."form-data-2.5.1"
+      sources."fecha-2.3.3"
+      sources."finalhandler-1.1.2"
+      sources."find-up-4.1.0"
+      sources."form-data-3.0.0"
       sources."formidable-1.2.2"
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
       sources."fs.realpath-1.0.0"
       sources."get-caller-file-2.0.5"
       sources."get-stream-4.1.0"
-      sources."getmac-1.4.6"
+      sources."getmac-5.1.0"
       sources."glob-7.1.6"
       sources."got-9.6.0"
       sources."has-binary2-1.0.3"
@@ -75654,7 +77232,7 @@ in
           sources."mkdirp-0.3.0"
         ];
       })
-      sources."http-cache-semantics-4.0.4"
+      sources."http-cache-semantics-4.1.0"
       sources."http-errors-1.7.2"
       sources."iconv-lite-0.4.24"
       sources."ignore-5.1.4"
@@ -75662,31 +77240,32 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
-      sources."invert-kv-2.0.0"
       sources."ipaddr.js-1.9.1"
       sources."is-arrayish-0.3.2"
-      sources."is-fullwidth-code-point-2.0.0"
+      sources."is-docker-2.0.0"
+      sources."is-fullwidth-code-point-3.0.0"
       sources."is-stream-1.1.0"
-      sources."is-wsl-1.1.0"
+      sources."is-wsl-2.1.1"
       sources."isarray-2.0.1"
-      sources."isexe-2.0.0"
-      sources."isstream-0.1.2"
       sources."jquery-3.4.1"
       sources."jquery-ui-bundle-1.12.1"
       sources."json-buffer-3.0.0"
       sources."just-detect-adblock-1.0.0"
       sources."keyv-3.1.0"
       sources."knockout-3.5.1"
+      sources."kuler-1.0.1"
       sources."latest-version-5.1.0"
-      sources."lcid-2.0.0"
-      sources."locate-path-3.0.0"
+      sources."locate-path-5.0.0"
       sources."locks-0.2.2"
       sources."lodash-4.17.15"
+      (sources."logform-2.1.2" // {
+        dependencies = [
+          sources."ms-2.1.2"
+        ];
+      })
       sources."lowercase-keys-1.0.1"
       sources."lru-cache-4.1.5"
-      sources."map-age-cleaner-0.1.3"
       sources."media-typer-0.3.0"
-      sources."mem-4.3.0"
       (sources."memorystore-1.6.2" // {
         dependencies = [
           sources."debug-3.1.0"
@@ -75694,36 +77273,30 @@ in
       })
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
-      sources."mime-1.4.1"
+      sources."mime-1.6.0"
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
-      sources."mimic-fn-2.1.0"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
+      sources."minimist-1.2.5"
+      sources."mkdirp-1.0.3"
       sources."moment-2.24.0"
       sources."ms-2.0.0"
       sources."negotiator-0.6.2"
-      sources."nice-try-1.0.5"
-      sources."node-cache-4.2.1"
+      sources."node-cache-5.1.0"
       sources."nopt-1.0.10"
       sources."normalize-url-4.5.0"
-      sources."npm-run-path-2.0.2"
       sources."nprogress-0.2.0"
       sources."object-assign-4.1.1"
       sources."object-component-0.0.3"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
-      sources."open-6.1.0"
-      sources."os-locale-3.1.0"
+      sources."one-time-0.0.4"
+      sources."open-7.0.3"
       sources."p-cancelable-1.1.0"
-      sources."p-defer-1.0.0"
-      sources."p-finally-1.0.0"
-      sources."p-is-promise-2.1.0"
       sources."p-limit-2.2.2"
-      sources."p-locate-3.0.0"
+      sources."p-locate-4.1.0"
       sources."p-try-2.2.0"
       (sources."package-json-6.5.0" // {
         dependencies = [
@@ -75736,12 +77309,12 @@ in
       sources."passport-0.4.1"
       sources."passport-local-1.0.0"
       sources."passport-strategy-1.0.0"
-      sources."path-exists-3.0.0"
+      sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
-      sources."path-key-2.0.1"
       sources."path-to-regexp-0.1.7"
       sources."pause-0.0.1"
       sources."prepend-http-2.0.0"
+      sources."process-nextick-args-2.0.1"
       sources."proxy-addr-2.0.6"
       sources."pseudomap-1.0.2"
       sources."pump-3.0.0"
@@ -75750,97 +77323,107 @@ in
       sources."range-parser-1.2.1"
       sources."raven-js-3.27.2"
       sources."raw-body-2.4.0"
-      (sources."rc-1.2.8" // {
-        dependencies = [
-          sources."minimist-1.2.0"
-        ];
-      })
+      sources."rc-1.2.8"
       sources."readable-stream-3.6.0"
       sources."registry-auth-token-4.1.1"
       sources."registry-url-5.1.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
       sources."responselike-1.0.2"
-      sources."rimraf-2.6.3"
+      sources."rimraf-3.0.2"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
-      sources."semver-6.0.0"
-      (sources."send-0.16.2" // {
+      sources."semver-7.1.3"
+      (sources."send-0.17.1" // {
         dependencies = [
-          sources."http-errors-1.6.3"
-          sources."setprototypeof-1.1.0"
-          sources."statuses-1.4.0"
+          sources."ms-2.1.1"
         ];
       })
-      sources."serve-static-1.13.2"
+      sources."serve-static-1.14.1"
       sources."set-blocking-2.0.0"
       sources."setprototypeof-1.1.1"
-      sources."shebang-command-1.2.0"
-      sources."shebang-regex-1.0.0"
-      sources."signal-exit-3.0.2"
       sources."signals-1.0.0"
       sources."simple-swizzle-0.2.2"
       sources."snapsvg-0.5.1"
-      (sources."socket.io-2.2.0" // {
+      (sources."socket.io-2.3.0" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
         ];
       })
       sources."socket.io-adapter-1.1.2"
-      (sources."socket.io-client-2.2.0" // {
+      (sources."socket.io-client-2.3.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
+          (sources."socket.io-parser-3.3.0" // {
+            dependencies = [
+              sources."debug-3.1.0"
+              sources."ms-2.0.0"
+            ];
+          })
         ];
       })
-      (sources."socket.io-parser-3.3.0" // {
+      (sources."socket.io-parser-3.4.0" // {
         dependencies = [
-          sources."debug-3.1.0"
+          sources."debug-4.1.1"
+          sources."ms-2.1.2"
         ];
       })
       sources."stack-trace-0.0.10"
       sources."statuses-1.5.0"
-      sources."string-width-3.1.0"
+      sources."string-width-4.2.0"
       (sources."string_decoder-1.3.0" // {
         dependencies = [
           sources."safe-buffer-5.2.0"
         ];
       })
-      sources."strip-ansi-5.2.0"
-      sources."strip-eof-1.0.0"
+      sources."strip-ansi-6.0.0"
       sources."strip-json-comments-2.0.1"
-      (sources."superagent-5.0.9" // {
+      (sources."superagent-5.2.2" // {
         dependencies = [
           sources."component-emitter-1.3.0"
           sources."debug-4.1.1"
           sources."mime-2.4.4"
           sources."ms-2.1.2"
+          sources."qs-6.9.1"
           sources."semver-6.3.0"
         ];
       })
-      sources."temp-0.9.1"
+      (sources."temp-0.9.1" // {
+        dependencies = [
+          sources."rimraf-2.6.3"
+        ];
+      })
+      sources."text-hex-1.0.0"
       sources."to-array-0.1.4"
       sources."to-readable-stream-1.0.0"
       sources."toidentifier-1.0.0"
+      sources."triple-beam-1.3.0"
       sources."type-is-1.6.18"
-      sources."typechecker-4.11.0"
       sources."uid-safe-2.1.5"
       sources."unpipe-1.0.0"
       sources."url-parse-lax-3.0.0"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
       sources."vary-1.1.2"
-      sources."which-1.3.1"
       sources."which-module-2.0.0"
-      sources."winston-2.4.0"
-      sources."wrap-ansi-5.1.0"
+      sources."winston-3.2.1"
+      (sources."winston-transport-4.3.0" // {
+        dependencies = [
+          sources."isarray-1.0.0"
+          sources."readable-stream-2.3.7"
+          sources."string_decoder-1.1.1"
+        ];
+      })
+      sources."wrap-ansi-6.2.0"
       sources."wrappy-1.0.2"
-      sources."ws-6.1.4"
+      sources."ws-7.2.3"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."y18n-4.0.0"
       sources."yallist-2.1.2"
-      sources."yargs-13.2.4"
-      sources."yargs-parser-13.1.1"
+      sources."yargs-15.1.0"
+      sources."yargs-parser-16.1.0"
       sources."yeast-0.1.2"
     ];
     buildInputs = globalBuildInputs;
@@ -75952,7 +77535,7 @@ in
       sources."bl-1.2.2"
       sources."bluebird-3.7.2"
       sources."brace-expansion-1.1.11"
-      sources."buffer-5.4.3"
+      sources."buffer-5.5.0"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
@@ -76132,7 +77715,7 @@ in
       sources."request-2.88.2"
       sources."restore-cursor-2.0.0"
       sources."rimraf-2.7.1"
-      sources."run-async-2.3.0"
+      sources."run-async-2.4.0"
       sources."rxjs-6.5.4"
       sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
@@ -76176,7 +77759,7 @@ in
       sources."toml-2.3.6"
       sources."tough-cookie-2.5.0"
       sources."trim-repeated-1.0.0"
-      sources."tslib-1.11.0"
+      sources."tslib-1.11.1"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."uglify-js-3.8.0"
@@ -76237,13 +77820,13 @@ in
       sources."@starptech/rehype-webparser-0.10.0"
       sources."@starptech/webparser-0.10.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-13.7.5"
+      sources."@types/node-13.9.1"
       sources."@types/unist-2.0.3"
       sources."@types/vfile-3.0.2"
       sources."@types/vfile-message-2.0.0"
       sources."abbrev-1.1.1"
-      sources."acorn-6.4.0"
-      sources."acorn-jsx-5.1.0"
+      sources."acorn-6.4.1"
+      sources."acorn-jsx-5.2.0"
       sources."ajv-6.12.0"
       sources."ajv-keywords-2.1.1"
       (sources."ansi-align-3.0.0" // {
@@ -76444,12 +78027,12 @@ in
           sources."ignore-4.0.6"
         ];
       })
-      (sources."eslint-plugin-vue-6.2.1" // {
+      (sources."eslint-plugin-vue-6.2.2" // {
         dependencies = [
-          sources."acorn-7.1.0"
+          sources."acorn-7.1.1"
           sources."debug-4.1.1"
           sources."eslint-scope-5.0.0"
-          sources."espree-6.1.2"
+          sources."espree-6.2.1"
           sources."vue-eslint-parser-7.0.0"
         ];
       })
@@ -76574,17 +78157,17 @@ in
         ];
       })
       sources."has-yarn-2.1.0"
-      sources."hast-util-embedded-1.0.4"
-      sources."hast-util-has-property-1.0.3"
+      sources."hast-util-embedded-1.0.5"
+      sources."hast-util-has-property-1.0.4"
       sources."hast-util-is-body-ok-link-1.0.2"
-      sources."hast-util-is-element-1.0.3"
-      sources."hast-util-parse-selector-2.2.3"
+      sources."hast-util-is-element-1.0.4"
+      sources."hast-util-parse-selector-2.2.4"
       sources."hast-util-to-string-1.0.2"
-      sources."hast-util-whitespace-1.0.3"
-      sources."hosted-git-info-2.8.6"
+      sources."hast-util-whitespace-1.0.4"
+      sources."hosted-git-info-2.8.8"
       sources."html-void-elements-1.0.5"
       sources."html-whitespace-sensitive-tag-names-1.0.1"
-      sources."http-cache-semantics-4.0.4"
+      sources."http-cache-semantics-4.1.0"
       sources."iconv-lite-0.4.24"
       sources."ignore-3.3.10"
       (sources."import-fresh-3.2.1" // {
@@ -76709,7 +78292,7 @@ in
       sources."mimic-fn-1.2.0"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."minimist-options-3.0.2"
       (sources."mixin-deep-1.3.2" // {
         dependencies = [
@@ -76728,7 +78311,7 @@ in
       sources."nanomatch-1.2.13"
       sources."natural-compare-1.4.0"
       sources."nice-try-1.0.5"
-      sources."nopt-4.0.1"
+      sources."nopt-4.0.3"
       sources."normalize-package-data-2.5.0"
       sources."normalize-path-2.1.1"
       sources."normalize-url-4.5.0"
@@ -76818,7 +78401,7 @@ in
       sources."prettier-1.19.1"
       (sources."prettier-eslint-8.8.2" // {
         dependencies = [
-          sources."acorn-5.7.3"
+          sources."acorn-5.7.4"
           (sources."acorn-jsx-3.0.1" // {
             dependencies = [
               sources."acorn-3.3.0"
@@ -76911,7 +78494,7 @@ in
       sources."restore-cursor-2.0.0"
       sources."ret-0.1.15"
       sources."rimraf-2.6.3"
-      sources."run-async-2.3.0"
+      sources."run-async-2.4.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
       sources."rxjs-6.5.4"
@@ -77064,18 +78647,18 @@ in
       sources."to-readable-stream-1.0.0"
       sources."to-regex-3.0.2"
       sources."to-regex-range-2.1.1"
-      sources."to-vfile-6.0.0"
+      sources."to-vfile-6.1.0"
       sources."trim-0.0.1"
       sources."trim-newlines-2.0.0"
       sources."trim-trailing-lines-1.1.3"
       sources."trough-1.0.5"
-      sources."tslib-1.11.0"
+      sources."tslib-1.11.1"
       sources."tslint-5.20.1"
       sources."tsutils-2.29.0"
       sources."type-check-0.3.2"
       sources."type-fest-0.3.1"
       sources."typedarray-0.0.6"
-      sources."typescript-3.8.2"
+      sources."typescript-3.8.3"
       (sources."typescript-eslint-parser-16.0.1" // {
         dependencies = [
           sources."semver-5.5.0"
@@ -77097,7 +78680,7 @@ in
           sources."vfile-message-1.1.1"
           (sources."vfile-reporter-5.1.2" // {
             dependencies = [
-              sources."unist-util-stringify-position-2.0.2"
+              sources."unist-util-stringify-position-2.0.3"
             ];
           })
         ];
@@ -77109,7 +78692,7 @@ in
       sources."unist-util-is-2.1.3"
       sources."unist-util-modify-children-1.1.6"
       sources."unist-util-remove-position-1.1.4"
-      sources."unist-util-stringify-position-2.0.2"
+      sources."unist-util-stringify-position-2.0.3"
       sources."unist-util-visit-1.4.1"
       (sources."unist-util-visit-parents-2.1.2" // {
         dependencies = [
@@ -77135,10 +78718,10 @@ in
       sources."user-home-2.0.0"
       sources."util-deprecate-1.0.2"
       sources."validate-npm-package-license-3.0.4"
-      sources."vfile-4.0.2"
+      sources."vfile-4.0.3"
       sources."vfile-location-2.0.6"
-      sources."vfile-message-2.0.2"
-      (sources."vfile-reporter-6.0.0" // {
+      sources."vfile-message-2.0.3"
+      (sources."vfile-reporter-6.0.1" // {
         dependencies = [
           sources."ansi-regex-5.0.0"
           sources."emoji-regex-8.0.0"
@@ -77148,9 +78731,9 @@ in
           sources."supports-color-6.1.0"
         ];
       })
-      sources."vfile-sort-2.2.1"
-      sources."vfile-statistics-1.1.3"
-      (sources."vscode-css-languageservice-4.1.0" // {
+      sources."vfile-sort-2.2.2"
+      sources."vfile-statistics-1.1.4"
+      (sources."vscode-css-languageservice-4.1.1" // {
         dependencies = [
           sources."vscode-uri-2.1.1"
         ];
@@ -77232,17 +78815,17 @@ in
       })
       sources."@babel/polyfill-7.7.0"
       sources."@babel/runtime-7.7.7"
-      sources."@babel/runtime-corejs3-7.8.4"
+      sources."@babel/runtime-corejs3-7.8.7"
       sources."@cliqz-oss/firefox-client-0.3.1"
       sources."@cliqz-oss/node-firefox-connect-1.2.1"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@types/color-name-1.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.5"
+      sources."@types/node-13.9.1"
       sources."JSONSelect-0.2.1"
-      sources."acorn-6.4.0"
-      sources."acorn-jsx-5.1.0"
+      sources."acorn-6.4.1"
+      sources."acorn-jsx-5.2.0"
       sources."adbkit-2.11.1"
       sources."adbkit-logcat-1.1.0"
       sources."adbkit-monkey-1.0.1"
@@ -77301,6 +78884,7 @@ in
       sources."async-each-1.0.3"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
+      sources."atomic-sleep-1.0.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.9.1"
       (sources."babel-code-frame-6.26.0" // {
@@ -77353,7 +78937,7 @@ in
           sources."is-extendable-0.1.1"
         ];
       })
-      sources."buffer-5.4.3"
+      sources."buffer-5.5.0"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-crc32-0.2.13"
@@ -77534,7 +79118,7 @@ in
       })
       (sources."eslint-plugin-no-unsafe-innerhtml-1.0.16" // {
         dependencies = [
-          sources."acorn-5.7.3"
+          sources."acorn-5.7.4"
           (sources."acorn-jsx-3.0.1" // {
             dependencies = [
               sources."acorn-3.3.0"
@@ -77580,7 +79164,7 @@ in
       sources."eslint-visitor-keys-1.1.0"
       (sources."espree-6.1.2" // {
         dependencies = [
-          sources."acorn-7.1.0"
+          sources."acorn-7.1.1"
         ];
       })
       sources."esprima-4.0.1"
@@ -77713,7 +79297,7 @@ in
       })
       sources."has-yarn-2.1.0"
       sources."htmlparser2-3.10.1"
-      sources."http-cache-semantics-4.0.4"
+      sources."http-cache-semantics-4.1.0"
       sources."http-signature-1.2.0"
       sources."iconv-lite-0.4.24"
       sources."ieee754-1.1.13"
@@ -77859,7 +79443,7 @@ in
       sources."mimic-fn-1.2.0"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."mixin-deep-1.3.2"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
@@ -78002,7 +79586,7 @@ in
         ];
       })
       sources."rechoir-0.6.2"
-      sources."regenerator-runtime-0.13.4"
+      sources."regenerator-runtime-0.13.5"
       sources."regex-not-1.0.2"
       sources."regexp.prototype.flags-1.3.0"
       sources."regexpp-2.0.1"
@@ -78032,7 +79616,7 @@ in
       sources."restore-cursor-2.0.0"
       sources."ret-0.1.15"
       sources."rimraf-2.6.3"
-      sources."run-async-2.3.0"
+      sources."run-async-2.4.0"
       sources."rx-lite-3.1.2"
       sources."rxjs-6.5.4"
       sources."safe-buffer-5.2.0"
@@ -78105,7 +79689,7 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."sonic-boom-0.7.6"
+      sources."sonic-boom-0.7.7"
       sources."source-map-0.6.1"
       sources."source-map-resolve-0.5.3"
       sources."source-map-support-0.5.16"
@@ -78189,7 +79773,7 @@ in
       sources."tough-cookie-2.5.0"
       sources."tr46-2.0.2"
       sources."traverse-0.4.6"
-      sources."tslib-1.11.0"
+      sources."tslib-1.11.1"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-1.2.0"
@@ -78304,10 +79888,10 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "4.41.6";
+    version = "4.42.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-4.41.6.tgz";
-      sha512 = "yxXfV0Zv9WMGRD+QexkZzmGIh54bsvEs+9aRWxnN8erLWEOehAKUTeNBoUbA6HPEZPlRo7KDi2ZcNveoZgK9MA==";
+      url = "https://registry.npmjs.org/webpack/-/webpack-4.42.0.tgz";
+      sha512 = "EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w==";
     };
     dependencies = [
       sources."@webassemblyjs/ast-1.8.5"
@@ -78330,7 +79914,7 @@ in
       sources."@webassemblyjs/wast-printer-1.8.5"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
-      sources."acorn-6.4.0"
+      sources."acorn-6.4.1"
       sources."ajv-6.12.0"
       sources."ajv-errors-1.0.1"
       sources."ajv-keywords-3.4.1"
@@ -78551,7 +80135,7 @@ in
       sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."mississippi-3.0.0"
       (sources."mixin-deep-1.3.2" // {
         dependencies = [
@@ -78708,7 +80292,7 @@ in
       sources."stream-shift-1.0.1"
       sources."string_decoder-1.1.1"
       sources."tapable-1.1.3"
-      (sources."terser-4.6.4" // {
+      (sources."terser-4.6.6" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -78728,7 +80312,7 @@ in
       })
       sources."to-regex-3.0.2"
       sources."to-regex-range-2.1.1"
-      sources."tslib-1.11.0"
+      sources."tslib-1.11.1"
       sources."tty-browserify-0.0.0"
       sources."typedarray-0.0.6"
       sources."union-value-1.0.1"
@@ -78947,7 +80531,7 @@ in
       sources."memory-fs-0.4.1"
       sources."micromatch-3.1.10"
       sources."mimic-fn-2.1.0"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       (sources."mixin-deep-1.3.2" // {
         dependencies = [
           sources."is-extendable-1.0.1"
@@ -79099,7 +80683,7 @@ in
       sources."wrappy-1.0.2"
       sources."y18n-4.0.0"
       sources."yargs-13.2.4"
-      sources."yargs-parser-13.1.1"
+      sources."yargs-parser-13.1.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -79123,7 +80707,7 @@ in
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.7.5"
+      sources."@types/node-13.9.1"
       sources."accepts-1.3.7"
       sources."ajv-6.12.0"
       sources."ajv-errors-1.0.1"
@@ -79777,7 +81361,7 @@ in
       sources."json-schema-traverse-0.4.1"
       (sources."json5-1.0.1" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
         ];
       })
       sources."loader-utils-1.4.0"
@@ -79869,7 +81453,7 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-10.17.16"
+      sources."@types/node-10.17.17"
       sources."addr-to-ip-port-1.5.1"
       sources."airplay-js-0.3.0"
       sources."balanced-match-1.0.0"
@@ -80002,7 +81586,7 @@ in
       sources."mime-2.4.4"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -80026,7 +81610,7 @@ in
       sources."nodebmc-0.0.7"
       sources."on-finished-2.3.0"
       sources."once-1.4.0"
-      sources."open-7.0.2"
+      sources."open-7.0.3"
       sources."package-json-versionify-1.0.4"
       sources."parse-numeric-range-0.0.2"
       (sources."parse-torrent-7.0.1" // {
@@ -80046,12 +81630,12 @@ in
       })
       sources."prettier-bytes-1.0.4"
       sources."process-nextick-args-2.0.1"
-      sources."protobufjs-6.8.8"
+      sources."protobufjs-6.8.9"
       sources."pump-3.0.0"
       sources."qap-3.3.1"
       sources."queue-microtask-1.1.2"
       sources."random-access-file-2.1.3"
-      sources."random-access-storage-1.4.0"
+      sources."random-access-storage-1.4.1"
       sources."random-iterate-1.0.1"
       sources."randombytes-2.1.0"
       sources."range-parser-1.2.1"
@@ -80135,7 +81719,7 @@ in
       })
       sources."winreg-1.2.4"
       sources."wrappy-1.0.2"
-      sources."ws-7.2.1"
+      sources."ws-7.2.3"
       sources."xml2js-0.4.23"
       sources."xmlbuilder-11.0.1"
       sources."xmldom-0.1.31"
@@ -80249,10 +81833,10 @@ in
   yarn = nodeEnv.buildNodePackage {
     name = "yarn";
     packageName = "yarn";
-    version = "1.22.0";
+    version = "1.22.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/yarn/-/yarn-1.22.0.tgz";
-      sha512 = "KMHP/Jq53jZKTY9iTUt3dIVl/be6UPs2INo96+BnZHLKxYNTfwMmlgHTaMWyGZoO74RI4AIFvnWhYrXq2USJkg==";
+      url = "https://registry.npmjs.org/yarn/-/yarn-1.22.4.tgz";
+      sha512 = "oYM7hi/lIWm9bCoDMEWgffW8aiNZXCWeZ1/tGy0DWrN6vmzjCXIKu2Y21o8DYVBUtiktwKcNoxyGl/2iKLUNGA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -80273,7 +81857,7 @@ in
       sha512 = "GFg4QC1xi3gkbHGGUFme8/8XPg3kDISu/qJfx56X207yuv1FSevGY/eKuym7kh0bniCB4n3rseWW+QZXPH8LIw==";
     };
     dependencies = [
-      sources."@babel/runtime-7.8.4"
+      sources."@babel/runtime-7.8.7"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.3"
       sources."@sindresorhus/is-0.7.0"
@@ -80519,7 +82103,7 @@ in
           sources."kind-of-4.0.0"
         ];
       })
-      sources."hosted-git-info-2.8.6"
+      sources."hosted-git-info-2.8.8"
       sources."http-cache-semantics-3.8.1"
       sources."http-signature-1.2.0"
       sources."humanize-string-1.0.2"
@@ -80641,7 +82225,7 @@ in
       sources."mimic-fn-2.1.0"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       (sources."mixin-deep-1.3.2" // {
         dependencies = [
           sources."is-extendable-1.0.1"
@@ -80769,7 +82353,7 @@ in
           sources."indent-string-2.1.0"
         ];
       })
-      sources."regenerator-runtime-0.13.4"
+      sources."regenerator-runtime-0.13.5"
       sources."regex-not-1.0.2"
       sources."registry-auth-token-3.4.0"
       sources."registry-url-3.1.0"
@@ -80789,7 +82373,7 @@ in
       sources."ret-0.1.15"
       sources."roarr-2.15.2"
       sources."root-check-1.0.0"
-      sources."run-async-2.3.0"
+      sources."run-async-2.4.0"
       sources."rx-4.1.0"
       sources."rxjs-6.5.4"
       sources."safe-buffer-5.2.0"
@@ -80952,7 +82536,7 @@ in
       sources."to-regex-range-2.1.1"
       sources."tough-cookie-3.0.1"
       sources."trim-newlines-1.0.0"
-      sources."tslib-1.11.0"
+      sources."tslib-1.11.1"
       sources."tunnel-0.0.6"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
@@ -81014,7 +82598,7 @@ in
         ];
       })
       sources."yeoman-doctor-4.0.0"
-      (sources."yeoman-environment-2.8.0" // {
+      (sources."yeoman-environment-2.8.1" // {
         dependencies = [
           sources."debug-3.2.6"
           sources."ms-2.1.2"
@@ -81044,4 +82628,4 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix
index 910e9284ebc9..dcf88b7388e3 100644
--- a/pkgs/development/node-packages/node-packages-v12.nix
+++ b/pkgs/development/node-packages/node-packages-v12.nix
@@ -850,13 +850,13 @@ let
         sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==";
       };
     };
-    "hosted-git-info-2.8.5" = {
+    "hosted-git-info-2.8.8" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
-      version = "2.8.5";
+      version = "2.8.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz";
-        sha512 = "kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz";
+        sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==";
       };
     };
     "http-signature-1.2.0" = {
@@ -1309,13 +1309,13 @@ let
         sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
-    "minimist-1.2.0" = {
+    "minimist-1.2.5" = {
       name = "minimist";
       packageName = "minimist";
-      version = "1.2.0";
+      version = "1.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
-        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
+        sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
       };
     };
     "minipass-2.9.0" = {
@@ -1426,13 +1426,13 @@ let
         sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9";
       };
     };
-    "nopt-4.0.1" = {
+    "nopt-4.0.3" = {
       name = "nopt";
       packageName = "nopt";
-      version = "4.0.1";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz";
-        sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
+        url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz";
+        sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==";
       };
     };
     "normalize-package-data-2.5.0" = {
@@ -2578,7 +2578,7 @@ in
       })
       sources."ms-2.0.0"
       sources."nanomatch-1.2.13"
-      sources."nopt-4.0.1"
+      sources."nopt-4.0.3"
       (sources."object-copy-0.1.0" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -2791,7 +2791,7 @@ in
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       sources."has-unicode-2.0.1"
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.8"
       sources."http-signature-1.2.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -2980,7 +2980,7 @@ in
       sources."minipass-2.9.0"
       sources."minizlib-1.3.3"
       sources."mkdirp-0.5.1"
-      sources."nopt-4.0.1"
+      sources."nopt-4.0.3"
       sources."npmlog-4.1.2"
       sources."number-is-nan-1.0.1"
       sources."oauth-sign-0.9.0"
@@ -3033,10 +3033,10 @@ in
   node-gyp-build = nodeEnv.buildNodePackage {
     name = "node-gyp-build";
     packageName = "node-gyp-build";
-    version = "4.2.0";
+    version = "4.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.0.tgz";
-      sha512 = "4oiumOLhCDU9Rronz8PZ5S4IvT39H5+JEv/hps9V8s7RSLhsac0TCP78ulnHXOo8X1wdpPiTayGlM1jr4IbnaQ==";
+      url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.1.tgz";
+      sha512 = "XyCKXsqZfLqHep1hhsMncoXuUNt/cXCjg1+8CLbu69V1TKuPiOeSGbL9n+k/ByKH8UT0p4rdIX8XkTRZV0i7Sw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -3091,7 +3091,7 @@ in
       sources."mkdirp-0.5.1"
       sources."ms-2.1.2"
       sources."needle-2.4.0"
-      sources."nopt-4.0.1"
+      sources."nopt-4.0.3"
       sources."npm-bundled-1.1.1"
       sources."npm-normalize-package-bin-1.0.1"
       sources."npm-packlist-1.4.8"
@@ -3106,7 +3106,7 @@ in
       sources."process-nextick-args-2.0.1"
       (sources."rc-1.2.8" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
         ];
       })
       sources."readable-stream-2.3.7"
diff --git a/pkgs/development/node-packages/node-packages-v13.nix b/pkgs/development/node-packages/node-packages-v13.nix
index a18a73523110..c250155ef419 100644
--- a/pkgs/development/node-packages/node-packages-v13.nix
+++ b/pkgs/development/node-packages/node-packages-v13.nix
@@ -436,13 +436,13 @@ let
         sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9";
       };
     };
-    "hosted-git-info-2.8.5" = {
+    "hosted-git-info-2.8.8" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
-      version = "2.8.5";
+      version = "2.8.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz";
-        sha512 = "kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz";
+        sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==";
       };
     };
     "http-signature-1.2.0" = {
@@ -1315,7 +1315,7 @@ in
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       sources."has-unicode-2.0.1"
-      sources."hosted-git-info-2.8.5"
+      sources."hosted-git-info-2.8.8"
       sources."http-signature-1.2.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
diff --git a/pkgs/development/node-packages/shell-generate.nix b/pkgs/development/node-packages/shell-generate.nix
index 0ca5d494e564..f839d81133dd 100644
--- a/pkgs/development/node-packages/shell-generate.nix
+++ b/pkgs/development/node-packages/shell-generate.nix
@@ -4,6 +4,5 @@ mkShell {
   buildInputs = [
     bash nodePackages.node2nix
   ];
-  NODE_NIXPKGS_PATH = toString ./.;
+  NODE_NIXPKGS_PATH = ./.;
 }
-

From efae295453e52aa3c7638182d72184e60110136f Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Sun, 15 Mar 2020 15:01:22 +0100
Subject: [PATCH 3146/4636] sfxr-qt: 1.2.0 -> 1.3.0

---
 pkgs/applications/audio/sfxr-qt/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/sfxr-qt/default.nix b/pkgs/applications/audio/sfxr-qt/default.nix
index 615a8a8c6604..165f8446c763 100644
--- a/pkgs/applications/audio/sfxr-qt/default.nix
+++ b/pkgs/applications/audio/sfxr-qt/default.nix
@@ -10,12 +10,12 @@
 
 mkDerivation rec {
   pname = "sfxr-qt";
-  version = "1.2.0";
+  version = "1.3.0";
   src = fetchFromGitHub {
     owner = "agateau";
     repo = "sfxr-qt";
     rev = version;
-    sha256 = "1ndw1dcmzvkrc6gnb0y057zb4lqlhwrv18jlbx26w3s4xrbxqr41";
+    sha256 = "15yjgjl1c5k816mnpc09104zq0ack2a3mjsxmhcik7cmjkfiipr5";
     fetchSubmodules = true;
   };
   nativeBuildInputs = [
@@ -27,10 +27,9 @@ mkDerivation rec {
     qtquickcontrols2
     SDL
   ];
-  configurePhase = "cmake . -DCMAKE_INSTALL_PREFIX=$out";
 
   meta = with lib; {
-    homepage = https://github.com/agateau/sfxr-qt;
+    homepage = "https://github.com/agateau/sfxr-qt";
     description = "A sound effect generator, QtQuick port of sfxr";
     license = licenses.gpl2;
     maintainers = with maintainers; [ fgaz ];

From 008362a0b5b3ba39a51946f58caf8ca6b7a433a3 Mon Sep 17 00:00:00 2001
From: geistesk <github.jyf300hj@0x21.biz>
Date: Sun, 15 Mar 2020 16:19:22 +0100
Subject: [PATCH 3147/4636] golangci-lint: 1.23.8 -> 1.24.0

---
 pkgs/development/tools/golangci-lint/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix
index 36c3bde97afc..14311b0c7a51 100644
--- a/pkgs/development/tools/golangci-lint/default.nix
+++ b/pkgs/development/tools/golangci-lint/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "golangci-lint";
-  version = "1.23.8";
+  version = "1.24.0";
 
   src = fetchFromGitHub {
     owner = "golangci";
     repo = "golangci-lint";
     rev = "v${version}";
-    sha256 = "166pwgf86lkd277dq98vjry0ad0avrz12zxb9rfgbhl1z4ccwi1g";
+    sha256 = "0m7mcppbgpx2kyl5f9nk61x521v49h18az5l4ads1f3jkkyiya6s";
   };
 
-  modSha256 = "0sckz298bvkf4p4fdmsmza0zrj2s2pvc86qwg6i76vdh9yzvq5gx";
+  modSha256 = "0ab1s8pqkpss15rd9brin39lzx2fqkvq2v3nhk8kfrgpari2addk";
   subPackages = [ "cmd/golangci-lint" ];
 
   meta = with lib; {

From 798ab51bc7ec46fb7f9033713b18dbbbc7c3b8c0 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Sun, 15 Mar 2020 16:36:51 +0100
Subject: [PATCH 3148/4636] nodePackages: regenerate with node2nix 1.8.0

---
 .../node-packages/composition-v10.nix         |  4 +-
 .../node-packages/composition-v12.nix         |  4 +-
 .../node-packages/composition-v13.nix         |  6 +-
 pkgs/development/node-packages/node-env.nix   | 10 ++-
 .../node-packages/node-packages-v10.nix       | 90 +++++++++----------
 .../node-packages/node-packages-v12.nix       | 86 +++++++++++++++---
 .../node-packages/node-packages-v13.nix       | 81 ++++++++++-------
 7 files changed, 177 insertions(+), 104 deletions(-)

diff --git a/pkgs/development/node-packages/composition-v10.nix b/pkgs/development/node-packages/composition-v10.nix
index 8707a76203e6..ecb9e5413237 100644
--- a/pkgs/development/node-packages/composition-v10.nix
+++ b/pkgs/development/node-packages/composition-v10.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -14,4 +14,4 @@ in
 import ./node-packages-v10.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
+}
\ No newline at end of file
diff --git a/pkgs/development/node-packages/composition-v12.nix b/pkgs/development/node-packages/composition-v12.nix
index 56f4d02c23b1..a3a7bc256772 100644
--- a/pkgs/development/node-packages/composition-v12.nix
+++ b/pkgs/development/node-packages/composition-v12.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
@@ -14,4 +14,4 @@ in
 import ./node-packages-v12.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
+}
\ No newline at end of file
diff --git a/pkgs/development/node-packages/composition-v13.nix b/pkgs/development/node-packages/composition-v13.nix
index 54672905bc1c..6eddeb468dbb 100644
--- a/pkgs/development/node-packages/composition-v13.nix
+++ b/pkgs/development/node-packages/composition-v13.nix
@@ -1,8 +1,8 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-13_x"}:
 
 let
   nodeEnv = import ./node-env.nix {
@@ -14,4 +14,4 @@ in
 import ./node-packages-v13.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
+}
\ No newline at end of file
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index 670556bf271a..e1abf5304935 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -57,7 +57,7 @@ let
 
   # Recursively composes the dependencies of a package
   composePackage = { name, packageName, src, dependencies ? [], ... }@args:
-    ''
+    builtins.addErrorContext "while evaluating node package '${packageName}'" ''
       DIR=$(pwd)
       cd $TMPDIR
 
@@ -363,7 +363,7 @@ let
 
         npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild
 
-        if [ "$dontNpmInstall" != "1" ]
+        if [ "''${dontNpmInstall-}" != "1" ]
         then
             # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
             rm -f npm-shrinkwrap.json
@@ -400,6 +400,8 @@ let
         ++ stdenv.lib.optional (stdenv.isDarwin) libtool
         ++ buildInputs;
 
+      inherit nodejs;
+
       inherit dontStrip; # Stripping may fail a build for some package deployments
       inherit dontNpmInstall preRebuild unpackPhase buildPhase;
 
@@ -528,8 +530,8 @@ let
       # Provide the dependencies in a development shell through the NODE_PATH environment variable
       inherit nodeDependencies;
       shellHook = stdenv.lib.optionalString (dependencies != []) ''
-        export NODE_PATH=$nodeDependencies/lib/node_modules
-        export PATH="$nodeDependencies/bin:$PATH"
+        export NODE_PATH=${nodeDependencies}/lib/node_modules
+        export PATH="${nodeDependencies}/bin:$PATH"
       '';
     };
 in
diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
index 5a84edbe7157..7cfd359a479d 100644
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -11588,6 +11588,15 @@ let
         sha512 = "lo13tqF3JEtFO7FyA49CqbhaFkskRJ0u/UAiINgrIXeRCY41c88/zxtrECl8AKH3B0hj9q10+h3Kt8I7KlW4tw==";
       };
     };
+    "cookie-parser-1.4.5" = {
+      name = "cookie-parser";
+      packageName = "cookie-parser";
+      version = "1.4.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.5.tgz";
+        sha512 = "f13bPUj/gG/5mDr+xLmSxxDsB9DQiTIfhJS/sqjrmfAWiAN+x2O4i/XguTL9yDZ+/IFDanJ+5x7hC4CXT9Tdzw==";
+      };
+    };
     "cookie-session-2.0.0-rc.1" = {
       name = "cookie-session";
       packageName = "cookie-session";
@@ -13730,13 +13739,13 @@ let
         sha512 = "Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg==";
       };
     };
-    "diff2html-3.1.4" = {
+    "diff2html-3.1.6" = {
       name = "diff2html";
       packageName = "diff2html";
-      version = "3.1.4";
+      version = "3.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff2html/-/diff2html-3.1.4.tgz";
-        sha512 = "D5tXQhUav5v/JIYl0RDnXl8NlSxx1RHuLFIsvdaXUqdWQb5k6NlQMbix2FqrmpERf0gpY62JPe+o79jqR1D92A==";
+        url = "https://registry.npmjs.org/diff2html/-/diff2html-3.1.6.tgz";
+        sha512 = "XWceXI/tvT6YIHpO1kUY8y/fEDUdV3Du//0McAuK2/Fikc/MU2cyoFS5PXVuOFA5DO5otvPyeJmFan2iNUWkVg==";
       };
     };
     "diff3-0.0.3" = {
@@ -23336,13 +23345,13 @@ let
         sha1 = "d6be2e4c377494e2378b1cae2920a91d1182d8c4";
       };
     };
-    "jquery.terminal-2.14.1" = {
+    "jquery.terminal-2.15.0" = {
       name = "jquery.terminal";
       packageName = "jquery.terminal";
-      version = "2.14.1";
+      version = "2.15.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.14.1.tgz";
-        sha512 = "cYHjjJb4W29WhHP12n40MZ1ljBhB5IHK5VpBYQzzK9KV5ImlO5vLEAr+vcEEZhZ26UXPLVenOMXB0xIZTAxPKA==";
+        url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.15.0.tgz";
+        sha512 = "Dp8ahqK1lcphpmx9veb+S/ZxEt5mk4rHcVTbslCgngIiqH4LX7VtnSIQ2Lm5O0y/lp4eMPaNSTgPniCziF6ACQ==";
       };
     };
     "js-base64-2.5.2" = {
@@ -37818,15 +37827,6 @@ let
         sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
       };
     };
-    "semver-6.1.3" = {
-      name = "semver";
-      packageName = "semver";
-      version = "6.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-6.1.3.tgz";
-        sha512 = "aymF+56WJJMyXQHcd4hlK4N75rwj5RQpfW8ePlQnJsTYOBLlLbcIErR/G1s9SkIvKBqOudR3KAx4wEqP+F1hNQ==";
-      };
-    };
     "semver-6.3.0" = {
       name = "semver";
       packageName = "semver";
@@ -59017,7 +59017,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."jquery-3.4.1"
-      sources."jquery.terminal-2.14.1"
+      sources."jquery.terminal-2.15.0"
       sources."jsonfile-2.4.0"
       sources."keyboardevent-key-polyfill-1.1.0"
       sources."line-reader-0.4.0"
@@ -63730,7 +63730,7 @@ in
     name = "lumo-build-deps";
     packageName = "lumo-build-deps";
     version = "1.10.1";
-    src = ../../development/interpreters/clojurescript/lumo;
+    src = ../interpreters/clojurescript/lumo;
     dependencies = [
       sources."@babel/code-frame-7.8.3"
       sources."@babel/compat-data-7.8.6"
@@ -67048,10 +67048,10 @@ in
   node2nix = nodeEnv.buildNodePackage {
     name = "node2nix";
     packageName = "node2nix";
-    version = "1.7.0";
+    version = "1.8.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node2nix/-/node2nix-1.7.0.tgz";
-      sha512 = "p9lcFtr02Ryoo0FqNNGJ7lklDzVCT1vHHQ0Qg81SdbSQ+Ib4DwzAItJSy8EMwUvDdim1o9K3wMQljURxApvItg==";
+      url = "https://registry.npmjs.org/node2nix/-/node2nix-1.8.0.tgz";
+      sha512 = "v5QBcH6KxWVVRftbXdpGPIo3s0nPRcTJ56vLLbnmk0f1+32efqpI5t+fYekRys5yJPKFlXDRJCo6o8qnw581gQ==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -67097,7 +67097,7 @@ in
           sources."rimraf-2.2.8"
         ];
       })
-      sources."fs-minipass-1.2.7"
+      sources."fs-minipass-2.1.0"
       (sources."fs.extra-1.3.2" // {
         dependencies = [
           sources."mkdirp-0.3.5"
@@ -67130,8 +67130,8 @@ in
       sources."mime-types-2.1.26"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.9.0"
-      sources."minizlib-1.3.3"
+      sources."minipass-3.1.1"
+      sources."minizlib-2.1.0"
       sources."mkdirp-0.5.1"
       sources."ncp-0.4.2"
       sources."nijs-0.0.25"
@@ -67185,7 +67185,7 @@ in
       sources."rimraf-2.6.3"
       sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
-      sources."semver-6.1.3"
+      sources."semver-7.1.3"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
       sources."slasp-0.0.4"
@@ -67203,7 +67203,11 @@ in
         ];
       })
       sources."strip-ansi-3.0.1"
-      sources."tar-4.4.13"
+      (sources."tar-6.0.1" // {
+        dependencies = [
+          sources."mkdirp-1.0.3"
+        ];
+      })
       sources."temp-0.9.1"
       sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
@@ -67219,7 +67223,7 @@ in
       sources."walk-2.3.14"
       sources."wide-align-1.1.3"
       sources."wrappy-1.0.2"
-      sources."yallist-3.1.1"
+      sources."yallist-4.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -69819,10 +69823,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "4.11.5";
+    version = "4.11.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-4.11.5.tgz";
-      sha512 = "Be5bDGBQADZ6IVj0v9XLS6VP4UOeVyZTbYhWAgcb7EvSRlm0xGVetg0fRLLYdCNfLT+SkUNReAMy/pXS0XyMCw==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-4.11.6.tgz";
+      sha512 = "SJkYVP7BRVR/Q+J13RmB1/WC9dQDOTU6H9uTOmIFE5hbkdh83HqqvOBs7SjT+bUObqMicZ9csfreKxuZhGVvKw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -71973,10 +71977,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.298.1";
+    version = "1.299.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.298.1.tgz";
-      sha512 = "HTpycsQ4uLAGoPAt9HjX+eLTdHRXOcTzBAzjSIav1UvXzkyPD6kvP8EJJ5PlL/6MHFmoUpn9Io1+OKEUmPtpVA==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.299.0.tgz";
+      sha512 = "K2dlmwlmJpD7CZE8B8GguwIJmjOWdXzQ7UlcFIscg8y0tP8OT9a1gouLgBaU4uyS5J5wByipGNX1Cpwi6WRt5w==";
     };
     dependencies = [
       sources."@snyk/cli-interface-2.3.2"
@@ -77155,8 +77159,8 @@ in
       sources."concat-map-0.0.1"
       sources."content-disposition-0.5.3"
       sources."content-type-1.0.4"
-      sources."cookie-0.3.1"
-      sources."cookie-parser-1.4.4"
+      sources."cookie-0.4.0"
+      sources."cookie-parser-1.4.5"
       sources."cookie-signature-1.0.6"
       sources."cookiejar-2.1.2"
       sources."core-util-is-1.0.2"
@@ -77172,7 +77176,7 @@ in
       sources."destroy-1.0.4"
       sources."diagnostics-1.1.1"
       sources."diff-4.0.2"
-      sources."diff2html-3.1.4"
+      sources."diff2html-3.1.6"
       sources."dnd-page-scroll-0.0.4"
       sources."duplexer3-0.1.4"
       sources."ee-first-1.1.1"
@@ -77182,6 +77186,7 @@ in
       sources."end-of-stream-1.4.4"
       (sources."engine.io-3.4.0" // {
         dependencies = [
+          sources."cookie-0.3.1"
           sources."debug-4.1.1"
           sources."ms-2.1.2"
         ];
@@ -77198,14 +77203,9 @@ in
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
       sources."eve-0.5.4"
-      (sources."express-4.17.1" // {
-        dependencies = [
-          sources."cookie-0.4.0"
-        ];
-      })
+      sources."express-4.17.1"
       (sources."express-session-1.17.0" // {
         dependencies = [
-          sources."cookie-0.4.0"
           sources."depd-2.0.0"
           sources."safe-buffer-5.2.0"
         ];
@@ -82628,4 +82628,4 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-}
+}
\ No newline at end of file
diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix
index dcf88b7388e3..faf2cd7d21f6 100644
--- a/pkgs/development/node-packages/node-packages-v12.nix
+++ b/pkgs/development/node-packages/node-packages-v12.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -688,6 +688,15 @@ let
         sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==";
       };
     };
+    "fs-minipass-2.1.0" = {
+      name = "fs-minipass";
+      packageName = "fs-minipass";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz";
+        sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==";
+      };
+    };
     "fs.extra-1.3.2" = {
       name = "fs.extra";
       packageName = "fs.extra";
@@ -1327,6 +1336,15 @@ let
         sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==";
       };
     };
+    "minipass-3.1.1" = {
+      name = "minipass";
+      packageName = "minipass";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz";
+        sha512 = "UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==";
+      };
+    };
     "minizlib-1.3.3" = {
       name = "minizlib";
       packageName = "minizlib";
@@ -1336,6 +1354,15 @@ let
         sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==";
       };
     };
+    "minizlib-2.1.0" = {
+      name = "minizlib";
+      packageName = "minizlib";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minizlib/-/minizlib-2.1.0.tgz";
+        sha512 = "EzTZN/fjSvifSX0SlqUERCN39o6T40AMarPbv0MrarSFtIITCBh7bi+dU8nxGFHuqs9jdIAeoYoKuQAAASsPPA==";
+      };
+    };
     "mixin-deep-1.3.2" = {
       name = "mixin-deep";
       packageName = "mixin-deep";
@@ -1363,6 +1390,15 @@ let
         sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
       };
     };
+    "mkdirp-1.0.3" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.3.tgz";
+        sha512 = "6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g==";
+      };
+    };
     "ms-2.0.0" = {
       name = "ms";
       packageName = "ms";
@@ -1957,13 +1993,13 @@ let
         sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
       };
     };
-    "semver-6.1.3" = {
+    "semver-7.1.3" = {
       name = "semver";
       packageName = "semver";
-      version = "6.1.3";
+      version = "7.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-6.1.3.tgz";
-        sha512 = "aymF+56WJJMyXQHcd4hlK4N75rwj5RQpfW8ePlQnJsTYOBLlLbcIErR/G1s9SkIvKBqOudR3KAx4wEqP+F1hNQ==";
+        url = "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz";
+        sha512 = "ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==";
       };
     };
     "set-blocking-2.0.0" = {
@@ -2182,6 +2218,15 @@ let
         sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==";
       };
     };
+    "tar-6.0.1" = {
+      name = "tar";
+      packageName = "tar";
+      version = "6.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tar/-/tar-6.0.1.tgz";
+        sha512 = "bKhKrrz2FJJj5s7wynxy/fyxpE0CmCjmOQ1KV4KkgXFWOgoIT/NbTMnB1n+LFNrNk0SSBVGGxcK5AGsyC+pW5Q==";
+      };
+    };
     "temp-0.9.1" = {
       name = "temp";
       packageName = "temp";
@@ -2416,6 +2461,15 @@ let
         sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==";
       };
     };
+    "yallist-4.0.0" = {
+      name = "yallist";
+      packageName = "yallist";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz";
+        sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==";
+      };
+    };
   };
 in
 {
@@ -2728,10 +2782,10 @@ in
   node2nix = nodeEnv.buildNodePackage {
     name = "node2nix";
     packageName = "node2nix";
-    version = "1.7.0";
+    version = "1.8.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node2nix/-/node2nix-1.7.0.tgz";
-      sha512 = "p9lcFtr02Ryoo0FqNNGJ7lklDzVCT1vHHQ0Qg81SdbSQ+Ib4DwzAItJSy8EMwUvDdim1o9K3wMQljURxApvItg==";
+      url = "https://registry.npmjs.org/node2nix/-/node2nix-1.8.0.tgz";
+      sha512 = "v5QBcH6KxWVVRftbXdpGPIo3s0nPRcTJ56vLLbnmk0f1+32efqpI5t+fYekRys5yJPKFlXDRJCo6o8qnw581gQ==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -2777,7 +2831,7 @@ in
           sources."rimraf-2.2.8"
         ];
       })
-      sources."fs-minipass-1.2.7"
+      sources."fs-minipass-2.1.0"
       (sources."fs.extra-1.3.2" // {
         dependencies = [
           sources."mkdirp-0.3.5"
@@ -2810,8 +2864,8 @@ in
       sources."mime-types-2.1.26"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.9.0"
-      sources."minizlib-1.3.3"
+      sources."minipass-3.1.1"
+      sources."minizlib-2.1.0"
       sources."mkdirp-0.5.1"
       sources."ncp-0.4.2"
       sources."nijs-0.0.25"
@@ -2865,7 +2919,7 @@ in
       sources."rimraf-2.6.3"
       sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
-      sources."semver-6.1.3"
+      sources."semver-7.1.3"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
       sources."slasp-0.0.4"
@@ -2883,7 +2937,11 @@ in
         ];
       })
       sources."strip-ansi-3.0.1"
-      sources."tar-4.4.13"
+      (sources."tar-6.0.1" // {
+        dependencies = [
+          sources."mkdirp-1.0.3"
+        ];
+      })
       sources."temp-0.9.1"
       sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
@@ -2899,7 +2957,7 @@ in
       sources."walk-2.3.14"
       sources."wide-align-1.1.3"
       sources."wrappy-1.0.2"
-      sources."yallist-3.1.1"
+      sources."yallist-4.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
diff --git a/pkgs/development/node-packages/node-packages-v13.nix b/pkgs/development/node-packages/node-packages-v13.nix
index c250155ef419..e83aa90962c1 100644
--- a/pkgs/development/node-packages/node-packages-v13.nix
+++ b/pkgs/development/node-packages/node-packages-v13.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -346,13 +346,13 @@ let
         sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15";
       };
     };
-    "fs-minipass-1.2.7" = {
+    "fs-minipass-2.1.0" = {
       name = "fs-minipass";
       packageName = "fs-minipass";
-      version = "1.2.7";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz";
-        sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==";
+        url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz";
+        sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==";
       };
     };
     "fs.extra-1.3.2" = {
@@ -607,22 +607,22 @@ let
         sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
-    "minipass-2.9.0" = {
+    "minipass-3.1.1" = {
       name = "minipass";
       packageName = "minipass";
-      version = "2.9.0";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz";
-        sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==";
+        url = "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz";
+        sha512 = "UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==";
       };
     };
-    "minizlib-1.3.3" = {
+    "minizlib-2.1.0" = {
       name = "minizlib";
       packageName = "minizlib";
-      version = "1.3.3";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz";
-        sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==";
+        url = "https://registry.npmjs.org/minizlib/-/minizlib-2.1.0.tgz";
+        sha512 = "EzTZN/fjSvifSX0SlqUERCN39o6T40AMarPbv0MrarSFtIITCBh7bi+dU8nxGFHuqs9jdIAeoYoKuQAAASsPPA==";
       };
     };
     "mkdirp-0.3.5" = {
@@ -643,6 +643,15 @@ let
         sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
       };
     };
+    "mkdirp-1.0.3" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.3.tgz";
+        sha512 = "6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g==";
+      };
+    };
     "ncp-0.4.2" = {
       name = "ncp";
       packageName = "ncp";
@@ -967,13 +976,13 @@ let
         sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
       };
     };
-    "semver-6.1.3" = {
+    "semver-7.1.3" = {
       name = "semver";
       packageName = "semver";
-      version = "6.1.3";
+      version = "7.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-6.1.3.tgz";
-        sha512 = "aymF+56WJJMyXQHcd4hlK4N75rwj5RQpfW8ePlQnJsTYOBLlLbcIErR/G1s9SkIvKBqOudR3KAx4wEqP+F1hNQ==";
+        url = "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz";
+        sha512 = "ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==";
       };
     };
     "set-blocking-2.0.0" = {
@@ -1093,13 +1102,13 @@ let
         sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
       };
     };
-    "tar-4.4.13" = {
+    "tar-6.0.1" = {
       name = "tar";
       packageName = "tar";
-      version = "4.4.13";
+      version = "6.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz";
-        sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==";
+        url = "https://registry.npmjs.org/tar/-/tar-6.0.1.tgz";
+        sha512 = "bKhKrrz2FJJj5s7wynxy/fyxpE0CmCjmOQ1KV4KkgXFWOgoIT/NbTMnB1n+LFNrNk0SSBVGGxcK5AGsyC+pW5Q==";
       };
     };
     "temp-0.9.1" = {
@@ -1237,13 +1246,13 @@ let
         sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
       };
     };
-    "yallist-3.1.1" = {
+    "yallist-4.0.0" = {
       name = "yallist";
       packageName = "yallist";
-      version = "3.1.1";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz";
-        sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==";
+        url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz";
+        sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==";
       };
     };
   };
@@ -1252,10 +1261,10 @@ in
   node2nix = nodeEnv.buildNodePackage {
     name = "node2nix";
     packageName = "node2nix";
-    version = "1.7.0";
+    version = "1.8.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node2nix/-/node2nix-1.7.0.tgz";
-      sha512 = "p9lcFtr02Ryoo0FqNNGJ7lklDzVCT1vHHQ0Qg81SdbSQ+Ib4DwzAItJSy8EMwUvDdim1o9K3wMQljURxApvItg==";
+      url = "https://registry.npmjs.org/node2nix/-/node2nix-1.8.0.tgz";
+      sha512 = "v5QBcH6KxWVVRftbXdpGPIo3s0nPRcTJ56vLLbnmk0f1+32efqpI5t+fYekRys5yJPKFlXDRJCo6o8qnw581gQ==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -1301,7 +1310,7 @@ in
           sources."rimraf-2.2.8"
         ];
       })
-      sources."fs-minipass-1.2.7"
+      sources."fs-minipass-2.1.0"
       (sources."fs.extra-1.3.2" // {
         dependencies = [
           sources."mkdirp-0.3.5"
@@ -1334,8 +1343,8 @@ in
       sources."mime-types-2.1.26"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.9.0"
-      sources."minizlib-1.3.3"
+      sources."minipass-3.1.1"
+      sources."minizlib-2.1.0"
       sources."mkdirp-0.5.1"
       sources."ncp-0.4.2"
       sources."nijs-0.0.25"
@@ -1389,7 +1398,7 @@ in
       sources."rimraf-2.6.3"
       sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
-      sources."semver-6.1.3"
+      sources."semver-7.1.3"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
       sources."slasp-0.0.4"
@@ -1407,7 +1416,11 @@ in
         ];
       })
       sources."strip-ansi-3.0.1"
-      sources."tar-4.4.13"
+      (sources."tar-6.0.1" // {
+        dependencies = [
+          sources."mkdirp-1.0.3"
+        ];
+      })
       sources."temp-0.9.1"
       sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
@@ -1423,7 +1436,7 @@ in
       sources."walk-2.3.14"
       sources."wide-align-1.1.3"
       sources."wrappy-1.0.2"
-      sources."yallist-3.1.1"
+      sources."yallist-4.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {

From 875bcef98ba6dc224d49e8cf39aad4aa19219983 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Sun, 15 Mar 2020 16:37:47 +0100
Subject: [PATCH 3149/4636] base16-builder: regenerate with node2nix 1.8.0, add
 supplement.json with node-pre-gyp to fix build

---
 .../cluster/spacegun/node-composition.nix     |    2 +-
 .../cluster/spacegun/node-packages.nix        | 1783 +++++++++--------
 .../elm/packages/node-composition.nix         |    2 +-
 .../compilers/elm/packages/node-packages.nix  |  573 +++---
 .../misc/google-clasp/google-clasp.nix        |    4 +-
 .../misc/google-clasp/node-packages.nix       |  790 ++++----
 pkgs/development/web/remarkjs/generate.sh     |    2 +-
 .../web/remarkjs/node-packages.nix            | 1482 +++++++-------
 pkgs/development/web/remarkjs/nodepkgs.nix    |    4 +-
 pkgs/misc/base16-builder/generate.sh          |    3 +-
 .../node-packages-generated.nix               |  554 ++++-
 pkgs/misc/base16-builder/node-packages.nix    |   10 +-
 pkgs/misc/base16-builder/supplement.json      |    3 +
 pkgs/misc/base16-builder/supplement.nix       |  693 +++++++
 .../node-composition.nix                      |    2 +-
 .../matrix-appservice-slack/node-packages.nix |  571 +++---
 pkgs/servers/web-apps/cryptpad/generate.sh    |    2 +-
 .../cryptpad/node-packages-generated.nix      |    2 +-
 .../web-apps/cryptpad/node-packages.nix       |    4 +-
 pkgs/tools/networking/airfield/deps.sh        |    2 +-
 .../networking/airfield/node-packages.nix     |  218 +-
 pkgs/tools/networking/airfield/node.nix       |    4 +-
 .../package-management/nixui/generate.sh      |    2 +-
 pkgs/tools/package-management/nixui/nixui.nix |    4 +-
 .../nixui/node-packages.nix                   |   12 +-
 25 files changed, 3962 insertions(+), 2766 deletions(-)
 create mode 100644 pkgs/misc/base16-builder/supplement.json
 create mode 100644 pkgs/misc/base16-builder/supplement.nix

diff --git a/pkgs/applications/networking/cluster/spacegun/node-composition.nix b/pkgs/applications/networking/cluster/spacegun/node-composition.nix
index 6a5283528fca..47cdb6942cec 100644
--- a/pkgs/applications/networking/cluster/spacegun/node-composition.nix
+++ b/pkgs/applications/networking/cluster/spacegun/node-composition.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
diff --git a/pkgs/applications/networking/cluster/spacegun/node-packages.nix b/pkgs/applications/networking/cluster/spacegun/node-packages.nix
index a69352a9c21c..ece04f6621bb 100644
--- a/pkgs/applications/networking/cluster/spacegun/node-packages.nix
+++ b/pkgs/applications/networking/cluster/spacegun/node-packages.nix
@@ -1,142 +1,142 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
-    "@babel/code-frame-7.5.5" = {
+    "@babel/code-frame-7.8.3" = {
       name = "_at_babel_slash_code-frame";
       packageName = "@babel/code-frame";
-      version = "7.5.5";
+      version = "7.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz";
-        sha512 = "27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==";
+        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz";
+        sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==";
       };
     };
-    "@babel/core-7.6.2" = {
+    "@babel/core-7.8.7" = {
       name = "_at_babel_slash_core";
       packageName = "@babel/core";
-      version = "7.6.2";
+      version = "7.8.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/core/-/core-7.6.2.tgz";
-        sha512 = "l8zto/fuoZIbncm+01p8zPSDZu/VuuJhAfA7d/AbzM09WR7iVhavvfNDYCNpo1VvLk6E6xgAoP9P+/EMJHuRkQ==";
+        url = "https://registry.npmjs.org/@babel/core/-/core-7.8.7.tgz";
+        sha512 = "rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA==";
       };
     };
-    "@babel/generator-7.6.2" = {
+    "@babel/generator-7.8.8" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
-      version = "7.6.2";
+      version = "7.8.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.6.2.tgz";
-        sha512 = "j8iHaIW4gGPnViaIHI7e9t/Hl8qLjERI6DcV9kEpAIDJsAOrcnXqRS7t+QbhL76pwbtqP+QCQLL0z1CyVmtjjQ==";
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.8.8.tgz";
+        sha512 = "HKyUVu69cZoclptr8t8U5b6sx6zoWjh8jiUhnuj3MpZuKT2dJ8zPTuiy31luq32swhI0SpwItCIlU8XW7BZeJg==";
       };
     };
-    "@babel/helper-function-name-7.1.0" = {
+    "@babel/helper-function-name-7.8.3" = {
       name = "_at_babel_slash_helper-function-name";
       packageName = "@babel/helper-function-name";
-      version = "7.1.0";
+      version = "7.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz";
-        sha512 = "A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==";
+        url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz";
+        sha512 = "BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==";
       };
     };
-    "@babel/helper-get-function-arity-7.0.0" = {
+    "@babel/helper-get-function-arity-7.8.3" = {
       name = "_at_babel_slash_helper-get-function-arity";
       packageName = "@babel/helper-get-function-arity";
-      version = "7.0.0";
+      version = "7.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz";
-        sha512 = "r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==";
+        url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz";
+        sha512 = "FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==";
       };
     };
-    "@babel/helper-plugin-utils-7.0.0" = {
+    "@babel/helper-plugin-utils-7.8.3" = {
       name = "_at_babel_slash_helper-plugin-utils";
       packageName = "@babel/helper-plugin-utils";
-      version = "7.0.0";
+      version = "7.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz";
-        sha512 = "CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==";
+        url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz";
+        sha512 = "j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==";
       };
     };
-    "@babel/helper-split-export-declaration-7.4.4" = {
+    "@babel/helper-split-export-declaration-7.8.3" = {
       name = "_at_babel_slash_helper-split-export-declaration";
       packageName = "@babel/helper-split-export-declaration";
-      version = "7.4.4";
+      version = "7.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz";
-        sha512 = "Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==";
+        url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz";
+        sha512 = "3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==";
       };
     };
-    "@babel/helpers-7.6.2" = {
+    "@babel/helpers-7.8.4" = {
       name = "_at_babel_slash_helpers";
       packageName = "@babel/helpers";
-      version = "7.6.2";
+      version = "7.8.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.6.2.tgz";
-        sha512 = "3/bAUL8zZxYs1cdX2ilEE0WobqbCmKWr/889lf2SS0PpDcpEIY8pb1CCyz0pEcX3pEb+MCbks1jIokz2xLtGTA==";
+        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.8.4.tgz";
+        sha512 = "VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w==";
       };
     };
-    "@babel/highlight-7.5.0" = {
+    "@babel/highlight-7.8.3" = {
       name = "_at_babel_slash_highlight";
       packageName = "@babel/highlight";
-      version = "7.5.0";
+      version = "7.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz";
-        sha512 = "7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==";
+        url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz";
+        sha512 = "PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==";
       };
     };
-    "@babel/parser-7.6.2" = {
+    "@babel/parser-7.8.8" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
-      version = "7.6.2";
+      version = "7.8.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.6.2.tgz";
-        sha512 = "mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg==";
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.8.8.tgz";
+        sha512 = "mO5GWzBPsPf6865iIbzNE0AvkKF3NE+2S3eRUpE+FE07BOAkXh6G+GW/Pj01hhXjve1WScbaIO4UlY1JKeqCcA==";
       };
     };
-    "@babel/plugin-syntax-object-rest-spread-7.2.0" = {
+    "@babel/plugin-syntax-object-rest-spread-7.8.3" = {
       name = "_at_babel_slash_plugin-syntax-object-rest-spread";
       packageName = "@babel/plugin-syntax-object-rest-spread";
-      version = "7.2.0";
+      version = "7.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz";
-        sha512 = "t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==";
+        url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz";
+        sha512 = "XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==";
       };
     };
-    "@babel/template-7.6.0" = {
+    "@babel/template-7.8.6" = {
       name = "_at_babel_slash_template";
       packageName = "@babel/template";
-      version = "7.6.0";
+      version = "7.8.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/template/-/template-7.6.0.tgz";
-        sha512 = "5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ==";
+        url = "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz";
+        sha512 = "zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==";
       };
     };
-    "@babel/traverse-7.6.2" = {
+    "@babel/traverse-7.8.6" = {
       name = "_at_babel_slash_traverse";
       packageName = "@babel/traverse";
-      version = "7.6.2";
+      version = "7.8.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.6.2.tgz";
-        sha512 = "8fRE76xNwNttVEF2TwxJDGBLWthUkHWSldmfuBzVRmEDWOtu4XdINTgN7TDWzuLg4bbeIMLvfMFD9we5YcWkRQ==";
+        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.6.tgz";
+        sha512 = "2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A==";
       };
     };
-    "@babel/types-7.6.1" = {
+    "@babel/types-7.8.7" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
-      version = "7.6.1";
+      version = "7.8.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.6.1.tgz";
-        sha512 = "X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==";
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz";
+        sha512 = "k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==";
       };
     };
-    "@cnakazawa/watch-1.0.3" = {
+    "@cnakazawa/watch-1.0.4" = {
       name = "_at_cnakazawa_slash_watch";
       packageName = "@cnakazawa/watch";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.3.tgz";
-        sha512 = "r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==";
+        url = "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz";
+        sha512 = "v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==";
       };
     };
     "@jest/console-24.9.0" = {
@@ -274,22 +274,22 @@ let
         sha512 = "dBtBbrc+qTHy1WdfHYjBwRln4+LWqASWakLHsWHR2NWHIFkv4W3O070IGoGLEBrJBvct3r0L1BUPuvURi7kYUQ==";
       };
     };
-    "@types/babel__core-7.1.3" = {
+    "@types/babel__core-7.1.6" = {
       name = "_at_types_slash_babel__core";
       packageName = "@types/babel__core";
-      version = "7.1.3";
+      version = "7.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.3.tgz";
-        sha512 = "8fBo0UR2CcwWxeX7WIIgJ7lXjasFxoYgRnFHUj+hRvKkpiBJbxhdAPTCY6/ZKM0uxANFVzt4yObSLuTiTnazDA==";
+        url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.6.tgz";
+        sha512 = "tTnhWszAqvXnhW7m5jQU9PomXSiKXk2sFxpahXvI20SZKu9ylPi8WtIxueZ6ehDWikPT0jeFujMj3X4ZHuf3Tg==";
       };
     };
-    "@types/babel__generator-7.6.0" = {
+    "@types/babel__generator-7.6.1" = {
       name = "_at_types_slash_babel__generator";
       packageName = "@types/babel__generator";
-      version = "7.6.0";
+      version = "7.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.0.tgz";
-        sha512 = "c1mZUu4up5cp9KROs/QAw0gTeHrw/x7m52LcnvMxxOZ03DmLwPV0MlGmlgzV3cnSdjhJOZsj7E7FHeioai+egw==";
+        url = "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.1.tgz";
+        sha512 = "bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew==";
       };
     };
     "@types/babel__template-7.0.2" = {
@@ -301,13 +301,13 @@ let
         sha512 = "/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==";
       };
     };
-    "@types/babel__traverse-7.0.7" = {
+    "@types/babel__traverse-7.0.9" = {
       name = "_at_types_slash_babel__traverse";
       packageName = "@types/babel__traverse";
-      version = "7.0.7";
+      version = "7.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.7.tgz";
-        sha512 = "CeBpmX1J8kWLcDEnI3Cl2Eo6RfbGvzUctA+CjZUhOKDFbLfcr7fc4usEqLNWetrlJd7RhAkyYe2czXop4fICpw==";
+        url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.9.tgz";
+        sha512 = "jEFQ8L1tuvPjOI8lnpaf73oCJe+aoxL6ygqSy6c8LcW98zaC+4mzWuQIRCEvKeCOu+lbqdXcg4Uqmm1S8AP1tw==";
       };
     };
     "@types/babylon-6.16.5" = {
@@ -319,13 +319,13 @@ let
         sha512 = "xH2e58elpj1X4ynnKp9qSnWlsRTIs6n3tgLGNfwAGHwePw0mulHQllV34n0T25uYSu1k0hRKkWXF890B1yS47w==";
       };
     };
-    "@types/body-parser-1.17.1" = {
+    "@types/body-parser-1.19.0" = {
       name = "_at_types_slash_body-parser";
       packageName = "@types/body-parser";
-      version = "1.17.1";
+      version = "1.19.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.1.tgz";
-        sha512 = "RoX2EZjMiFMjZh9lmYrwgoP9RTpAjSHiJxdp4oidAQVO02T7HER3xj9UKue5534ULWeqVEkujhWcyvUce+d68w==";
+        url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz";
+        sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==";
       };
     };
     "@types/caseless-0.12.2" = {
@@ -346,13 +346,13 @@ let
         sha512 = "4eOPXyn5DmP64MCMF8ePDvdlvlzt2a+F8ZaVjqmh2yFCpGjc1kI3kGnCFYX9SCsGTjQcWIyVZ86IHCEyjy/MNg==";
       };
     };
-    "@types/connect-3.4.32" = {
+    "@types/connect-3.4.33" = {
       name = "_at_types_slash_connect";
       packageName = "@types/connect";
-      version = "3.4.32";
+      version = "3.4.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.32.tgz";
-        sha512 = "4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg==";
+        url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz";
+        sha512 = "2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==";
       };
     };
     "@types/cookies-0.7.4" = {
@@ -364,13 +364,13 @@ let
         sha512 = "oTGtMzZZAVuEjTwCjIh8T8FrC8n/uwy+PG0yTvQcdZ7etoel7C7/3MSd7qrukENTgQtotG7gvBlBojuVs7X5rw==";
       };
     };
-    "@types/cron-1.7.1" = {
+    "@types/cron-1.7.2" = {
       name = "_at_types_slash_cron";
       packageName = "@types/cron";
-      version = "1.7.1";
+      version = "1.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/cron/-/cron-1.7.1.tgz";
-        sha512 = "48brwgU18DqA0mQX1As5OcJEo1yNjaXMM6Mk4r8K1dOzLJRQ37FE/kCivKx7ClKEHfhX2FdcxKzJ1B744a+V3A==";
+        url = "https://registry.npmjs.org/@types/cron/-/cron-1.7.2.tgz";
+        sha512 = "AEpNLRcsVSc5AdseJKNHpz0d4e8+ow+abTaC0fKDbAU86rF1evoFF0oC2fV9FdqtfVXkG2LKshpLTJCFOpyvTg==";
       };
     };
     "@types/events-3.0.0" = {
@@ -382,22 +382,22 @@ let
         sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==";
       };
     };
-    "@types/express-4.17.1" = {
+    "@types/express-4.17.3" = {
       name = "_at_types_slash_express";
       packageName = "@types/express";
-      version = "4.17.1";
+      version = "4.17.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express/-/express-4.17.1.tgz";
-        sha512 = "VfH/XCP0QbQk5B5puLqTLEeFgR8lfCJHZJKkInZ9mkYd+u8byX0kztXEQxEk4wZXJs8HI+7km2ALXjn4YKcX9w==";
+        url = "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz";
+        sha512 = "I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg==";
       };
     };
-    "@types/express-serve-static-core-4.16.9" = {
+    "@types/express-serve-static-core-4.17.2" = {
       name = "_at_types_slash_express-serve-static-core";
       packageName = "@types/express-serve-static-core";
-      version = "4.16.9";
+      version = "4.17.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.9.tgz";
-        sha512 = "GqpaVWR0DM8FnRUJYKlWgyARoBUAVfRIeVDZQKOttLFp5SmhhF9YFIYeTPwMd/AXfxlP7xVO2dj1fGu0Q+krKQ==";
+        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.2.tgz";
+        sha512 = "El9yMpctM6tORDAiBwZVLMcxoTMcqqRO9dVyYcn7ycLWbvR8klrDn8CAOwRfZujZtWD7yS/mshTdz43jMOejbg==";
       };
     };
     "@types/formidable-1.0.31" = {
@@ -436,13 +436,13 @@ let
         sha512 = "hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==";
       };
     };
-    "@types/istanbul-lib-report-1.1.1" = {
+    "@types/istanbul-lib-report-3.0.0" = {
       name = "_at_types_slash_istanbul-lib-report";
       packageName = "@types/istanbul-lib-report";
-      version = "1.1.1";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz";
-        sha512 = "3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg==";
+        url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz";
+        sha512 = "plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==";
       };
     };
     "@types/istanbul-reports-1.1.1" = {
@@ -454,67 +454,58 @@ let
         sha512 = "UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==";
       };
     };
-    "@types/jest-24.0.18" = {
+    "@types/jest-24.9.1" = {
       name = "_at_types_slash_jest";
       packageName = "@types/jest";
-      version = "24.0.18";
+      version = "24.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/jest/-/jest-24.0.18.tgz";
-        sha512 = "jcDDXdjTcrQzdN06+TSVsPPqxvsZA/5QkYfIZlq1JMw7FdP5AZylbOc+6B/cuDurctRe+MziUMtQ3xQdrbjqyQ==";
+        url = "https://registry.npmjs.org/@types/jest/-/jest-24.9.1.tgz";
+        sha512 = "Fb38HkXSVA4L8fGKEZ6le5bB8r6MRWlOCZbVuWZcmOMSCd2wCYOwN1ibj8daIoV9naq7aaOZjrLCoCMptKU/4Q==";
       };
     };
-    "@types/jest-diff-20.0.1" = {
-      name = "_at_types_slash_jest-diff";
-      packageName = "@types/jest-diff";
-      version = "20.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/jest-diff/-/jest-diff-20.0.1.tgz";
-        sha512 = "yALhelO3i0hqZwhjtcr6dYyaLoCHbAMshwtj6cGxTvHZAKXHsYGdff6E8EPw3xLKY0ELUTQ69Q1rQiJENnccMA==";
-      };
-    };
-    "@types/js-yaml-3.12.1" = {
+    "@types/js-yaml-3.12.2" = {
       name = "_at_types_slash_js-yaml";
       packageName = "@types/js-yaml";
-      version = "3.12.1";
+      version = "3.12.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.1.tgz";
-        sha512 = "SGGAhXLHDx+PK4YLNcNGa6goPf9XRWQNAUUbffkwVGGXIxmDKWyGGL4inzq2sPmExu431Ekb9aEMn9BkPqEYFA==";
+        url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.2.tgz";
+        sha512 = "0CFu/g4mDSNkodVwWijdlr8jH7RoplRWNgovjFLEZeT+QEbbZXjBmCe3HwaWheAlCbHwomTwzZoSedeOycABug==";
       };
     };
-    "@types/keygrip-1.0.1" = {
+    "@types/keygrip-1.0.2" = {
       name = "_at_types_slash_keygrip";
       packageName = "@types/keygrip";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/keygrip/-/keygrip-1.0.1.tgz";
-        sha1 = "ff540462d2fb4d0a88441ceaf27d287b01c3d878";
+        url = "https://registry.npmjs.org/@types/keygrip/-/keygrip-1.0.2.tgz";
+        sha512 = "GJhpTepz2udxGexqos8wgaBx4I/zWIDPh/KOGEwAqtuGDkOUJu5eFvwmdBX4AmB8Odsr+9pHCQqiAqDL/yKMKw==";
       };
     };
-    "@types/koa-2.0.50" = {
+    "@types/koa-2.11.2" = {
       name = "_at_types_slash_koa";
       packageName = "@types/koa";
-      version = "2.0.50";
+      version = "2.11.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/koa/-/koa-2.0.50.tgz";
-        sha512 = "TcgOD2lh0EISSadAk1DOBYw7kNoY9XdeB3vEMOKiDDaTMYm+V54nyPsU7Ulb/htb5OBIR79RgTeCWntCcophLw==";
+        url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.2.tgz";
+        sha512 = "2UPelagNNW6bnc1I5kIzluCaheXRA9S+NyOdXEFFj9Az7jc15ek5V03kb8OTbb3tdZ5i2BIJObe86PhHvpMolg==";
       };
     };
-    "@types/koa-compose-3.2.4" = {
+    "@types/koa-compose-3.2.5" = {
       name = "_at_types_slash_koa-compose";
       packageName = "@types/koa-compose";
-      version = "3.2.4";
+      version = "3.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/koa-compose/-/koa-compose-3.2.4.tgz";
-        sha512 = "ioou0rxkuWL+yBQYsHUQAzRTfVxAg8Y2VfMftU+Y3RA03/MzuFL0x/M2sXXj3PkfnENbHsjeHR1aMdezLYpTeA==";
+        url = "https://registry.npmjs.org/@types/koa-compose/-/koa-compose-3.2.5.tgz";
+        sha512 = "B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ==";
       };
     };
-    "@types/koa-router-7.0.42" = {
+    "@types/koa-router-7.4.0" = {
       name = "_at_types_slash_koa-router";
       packageName = "@types/koa-router";
-      version = "7.0.42";
+      version = "7.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/koa-router/-/koa-router-7.0.42.tgz";
-        sha512 = "mggrNY7Ywwjt7QjaMAlbb1ixE+v7AFskOeyKdmZT/NvPVEAo48gYUxIcF8ILlMc3eg1bo6SxNoUcbxhTv7edrA==";
+        url = "https://registry.npmjs.org/@types/koa-router/-/koa-router-7.4.0.tgz";
+        sha512 = "CkNyhGOCJ6rpBEG0rlSQhwHsHNwMzGLE49tV3jE5f0TvMzy/SmoCAIlHWdOLs8Mro+BqtKFH6e/lDaibWkydag==";
       };
     };
     "@types/koa-send-4.1.2" = {
@@ -535,22 +526,22 @@ let
         sha512 = "SSpct5fEcAeRkBHa3RiwCIRfDHcD1cZRhwRF///ZfvRt8KhoqRrhK6wpDlYPk/vWHVFE9hPGqh68bhzsHkir4w==";
       };
     };
-    "@types/koa-views-2.0.3" = {
+    "@types/koa-views-2.0.4" = {
       name = "_at_types_slash_koa-views";
       packageName = "@types/koa-views";
-      version = "2.0.3";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/koa-views/-/koa-views-2.0.3.tgz";
-        sha512 = "XLn//7qUUz2U9ZKXyHPwVIcQbZcW3phYTFXHGa1eW5BN88bi8n2fegvwJ+TokL2jRmRqBWwMB5p7Aab9iq1sZw==";
+        url = "https://registry.npmjs.org/@types/koa-views/-/koa-views-2.0.4.tgz";
+        sha512 = "aGFBVLiPC7FkXTqHLhnmjKhx3COV+GeJHO9OkLX/p/iAQTgDB5bbnsddx3XgrS6aACWyxR3BpQJVDdSqCNY1lw==";
       };
     };
-    "@types/lodash-4.14.141" = {
+    "@types/lodash-4.14.149" = {
       name = "_at_types_slash_lodash";
       packageName = "@types/lodash";
-      version = "4.14.141";
+      version = "4.14.149";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.141.tgz";
-        sha512 = "v5NYIi9qEbFEUpCyikmnOYe4YlP8BMUdTcNCAquAKzu+FA7rZ1onj9x80mbnDdOW/K5bFf3Tv5kJplP33+gAbQ==";
+        url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.149.tgz";
+        sha512 = "ijGqzZt/b7BfzcK9vTrS6MFljQRPn5BFWOx8oE0GYxribu6uV+aA9zZuXI1zc/etK9E8nrgdoF2+LgUw7+9tJQ==";
       };
     };
     "@types/lodash.clonedeep-4.5.6" = {
@@ -589,22 +580,22 @@ let
         sha512 = "U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg==";
       };
     };
-    "@types/node-10.14.20" = {
+    "@types/node-10.17.17" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "10.14.20";
+      version = "10.17.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-10.14.20.tgz";
-        sha512 = "An+MXSV8CGXz/BO9C1KKsoJ/8WDrvlNUaRMsm2h+IHZuSyQkM8U5bJJkb8ItLKA73VePG/nUK+t+EuW2IWuhsQ==";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.17.17.tgz";
+        sha512 = "gpNnRnZP3VWzzj5k3qrpRC6Rk3H/uclhAVo1aIvwzK5p5cOrs9yEyQ8H/HBsBY0u5rrWxXEiVPQ0dEB6pkjE8Q==";
       };
     };
-    "@types/node-12.7.11" = {
+    "@types/node-12.12.30" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "12.7.11";
+      version = "12.12.30";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-12.7.11.tgz";
-        sha512 = "Otxmr2rrZLKRYIybtdG/sgeO+tHY20GxeDjcGmUnmmlCWyEnv2a2x1ZXBo3BTec4OiTXMQCiazB8NMBf0iRlFw==";
+        url = "https://registry.npmjs.org/@types/node/-/node-12.12.30.tgz";
+        sha512 = "sz9MF/zk6qVr3pAnM0BSQvYIBK44tS75QC5N+VbWSE4DjCV/pJ+UzCW/F+vVnl7TkOPcuwQureKNtSSwjBTaMg==";
       };
     };
     "@types/ora-3.2.0" = {
@@ -625,13 +616,13 @@ let
         sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==";
       };
     };
-    "@types/request-2.48.3" = {
+    "@types/request-2.48.4" = {
       name = "_at_types_slash_request";
       packageName = "@types/request";
-      version = "2.48.3";
+      version = "2.48.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/request/-/request-2.48.3.tgz";
-        sha512 = "3Wo2jNYwqgXcIz/rrq18AdOZUQB8cQ34CXZo+LUwPJNpvRAL86+Kc2wwI8mqpz9Cr1V+enIox5v+WZhy/p3h8w==";
+        url = "https://registry.npmjs.org/@types/request/-/request-2.48.4.tgz";
+        sha512 = "W1t1MTKYR8PxICH+A4HgEIPuAC3sbljoEVfyZbeFJJDbr30guDspJri2XOaM2E+Un7ZjrihaDi7cf6fPa2tbgw==";
       };
     };
     "@types/serve-static-1.13.3" = {
@@ -652,22 +643,22 @@ let
         sha512 = "l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==";
       };
     };
-    "@types/tough-cookie-2.3.5" = {
+    "@types/tough-cookie-2.3.6" = {
       name = "_at_types_slash_tough-cookie";
       packageName = "@types/tough-cookie";
-      version = "2.3.5";
+      version = "2.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.5.tgz";
-        sha512 = "SCcK7mvGi3+ZNz833RRjFIxrn4gI1PPR3NtuIS+6vMkvmsGjosqTJwRt5bAEFLRz+wtJMWv8+uOnZf2hi2QXTg==";
+        url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.6.tgz";
+        sha512 = "wHNBMnkoEBiRAd3s8KTKwIuO9biFtTf0LehITzBhSco+HQI0xkXZbLOD55SW3Aqw3oUkHstkm5SPv58yaAdFPQ==";
       };
     };
-    "@types/underscore-1.9.3" = {
+    "@types/underscore-1.9.4" = {
       name = "_at_types_slash_underscore";
       packageName = "@types/underscore";
-      version = "1.9.3";
+      version = "1.9.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/underscore/-/underscore-1.9.3.tgz";
-        sha512 = "SwbHKB2DPIDlvYqtK5O+0LFtZAyrUSw4c0q+HWwmH1Ve3KMQ0/5PlV3RX97+3dP7yMrnNQ8/bCWWvQpPl03Mug==";
+        url = "https://registry.npmjs.org/@types/underscore/-/underscore-1.9.4.tgz";
+        sha512 = "CjHWEMECc2/UxOZh0kpiz3lEyX2Px3rQS9HzD20lxMvx571ivOBQKeLnqEjxUY0BMgp6WJWo/pQLRBwMW5v4WQ==";
       };
     };
     "@types/websocket-0.0.40" = {
@@ -679,31 +670,31 @@ let
         sha512 = "ldteZwWIgl9cOy7FyvYn+39Ah4+PfpVE72eYKw75iy2L0zTbhbcwvzeJ5IOu6DQP93bjfXq0NGHY6FYtmYoqFQ==";
       };
     };
-    "@types/ws-6.0.3" = {
+    "@types/ws-6.0.4" = {
       name = "_at_types_slash_ws";
       packageName = "@types/ws";
-      version = "6.0.3";
+      version = "6.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.3.tgz";
-        sha512 = "yBTM0P05Tx9iXGq00BbJPo37ox68R5vaGTXivs6RGh/BQ6QP5zqZDGWdAO6JbRE/iR1l80xeGAwCQS2nMV9S/w==";
+        url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.4.tgz";
+        sha512 = "PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg==";
       };
     };
-    "@types/yargs-13.0.3" = {
+    "@types/yargs-13.0.8" = {
       name = "_at_types_slash_yargs";
       packageName = "@types/yargs";
-      version = "13.0.3";
+      version = "13.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.3.tgz";
-        sha512 = "K8/LfZq2duW33XW/tFwEAfnZlqIfVsoyRB3kfXdPXYhl0nfM8mmh7GS0jg7WrX2Dgq/0Ha/pR1PaR+BvmWwjiQ==";
+        url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.8.tgz";
+        sha512 = "XAvHLwG7UQ+8M4caKIH0ZozIOYay5fQkAgyIXegXT9jPtdIGdhga+sUEdAr1CiG46aB+c64xQEYyEzlwWVTNzA==";
       };
     };
-    "@types/yargs-parser-13.1.0" = {
+    "@types/yargs-parser-15.0.0" = {
       name = "_at_types_slash_yargs-parser";
       packageName = "@types/yargs-parser";
-      version = "13.1.0";
+      version = "15.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-13.1.0.tgz";
-        sha512 = "gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg==";
+        url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz";
+        sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==";
       };
     };
     "@webassemblyjs/ast-1.8.5" = {
@@ -886,13 +877,13 @@ let
         sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==";
       };
     };
-    "abab-2.0.2" = {
+    "abab-2.0.3" = {
       name = "abab";
       packageName = "abab";
-      version = "2.0.2";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/abab/-/abab-2.0.2.tgz";
-        sha512 = "2scffjvioEmNz0OyDSLGWDfKCVwaKc6l9Pm9kOIREU13ClXZvHpg/nRL5xyjSSSLhOnXqft2HpsAzNEEA8cFFg==";
+        url = "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz";
+        sha512 = "tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==";
       };
     };
     "abbrev-1.1.1" = {
@@ -931,22 +922,31 @@ let
         sha1 = "105495ae5361d697bd195c825192e1ad7f253787";
       };
     };
-    "acorn-5.7.3" = {
+    "acorn-5.7.4" = {
       name = "acorn";
       packageName = "acorn";
-      version = "5.7.3";
+      version = "5.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz";
-        sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==";
+        url = "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz";
+        sha512 = "1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==";
       };
     };
-    "acorn-6.3.0" = {
+    "acorn-6.4.1" = {
       name = "acorn";
       packageName = "acorn";
-      version = "6.3.0";
+      version = "6.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz";
-        sha512 = "/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==";
+        url = "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz";
+        sha512 = "ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==";
+      };
+    };
+    "acorn-7.1.1" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "7.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz";
+        sha512 = "add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==";
       };
     };
     "acorn-globals-3.1.0" = {
@@ -976,6 +976,15 @@ let
         sha512 = "7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==";
       };
     };
+    "acorn-walk-7.1.1" = {
+      name = "acorn-walk";
+      packageName = "acorn-walk";
+      version = "7.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz";
+        sha512 = "wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==";
+      };
+    };
     "aggregate-error-1.0.0" = {
       name = "aggregate-error";
       packageName = "aggregate-error";
@@ -985,13 +994,13 @@ let
         sha1 = "888344dad0220a72e3af50906117f48771925fac";
       };
     };
-    "ajv-6.10.2" = {
+    "ajv-6.12.0" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.10.2";
+      version = "6.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz";
-        sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==";
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz";
+        sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==";
       };
     };
     "ajv-errors-1.0.1" = {
@@ -1282,13 +1291,13 @@ let
         sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==";
       };
     };
-    "async-1.5.2" = {
+    "async-2.6.3" = {
       name = "async";
       packageName = "async";
-      version = "1.5.2";
+      version = "2.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz";
-        sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a";
+        url = "https://registry.npmjs.org/async/-/async-2.6.3.tgz";
+        sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==";
       };
     };
     "async-each-1.0.3" = {
@@ -1345,22 +1354,22 @@ let
         sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
       };
     };
-    "aws4-1.8.0" = {
+    "aws4-1.9.1" = {
       name = "aws4";
       packageName = "aws4";
-      version = "1.8.0";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz";
-        sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==";
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz";
+        sha512 = "wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==";
       };
     };
-    "axios-0.19.0" = {
+    "axios-0.19.2" = {
       name = "axios";
       packageName = "axios";
-      version = "0.19.0";
+      version = "0.19.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz";
-        sha512 = "1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==";
+        url = "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz";
+        sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==";
       };
     };
     "babel-6.23.0" = {
@@ -1966,13 +1975,22 @@ let
         sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==";
       };
     };
-    "bluebird-3.7.0" = {
+    "bindings-1.5.0" = {
+      name = "bindings";
+      packageName = "bindings";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz";
+        sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==";
+      };
+    };
+    "bluebird-3.7.2" = {
       name = "bluebird";
       packageName = "bluebird";
-      version = "3.7.0";
+      version = "3.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.0.tgz";
-        sha512 = "aBQ1FxIa7kSWCcmKHlcHFlT2jt6J/l4FzC7KcPELkOJOsPOb/bccdhmIrKDfXhwFrmc7vDoDrrepFvGqjyXGJg==";
+        url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz";
+        sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==";
       };
     };
     "bn.js-4.11.8" = {
@@ -2029,13 +2047,13 @@ let
         sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f";
       };
     };
-    "browser-process-hrtime-0.1.3" = {
+    "browser-process-hrtime-1.0.0" = {
       name = "browser-process-hrtime";
       packageName = "browser-process-hrtime";
-      version = "0.1.3";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz";
-        sha512 = "bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==";
+        url = "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz";
+        sha512 = "9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==";
       };
     };
     "browser-resolve-1.11.3" = {
@@ -2119,22 +2137,22 @@ let
         sha512 = "pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==";
       };
     };
-    "bser-2.1.0" = {
+    "bser-2.1.1" = {
       name = "bser";
       packageName = "bser";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bser/-/bser-2.1.0.tgz";
-        sha512 = "8zsjWrQkkBoLK6uxASk1nJ2SKv97ltiGDo6A3wA0/yRPz+CwmEyDo0hUrhIuukG2JHpAl3bvFIixw2/3Hi0DOg==";
+        url = "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz";
+        sha512 = "gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==";
       };
     };
-    "buffer-4.9.1" = {
+    "buffer-4.9.2" = {
       name = "buffer";
       packageName = "buffer";
-      version = "4.9.1";
+      version = "4.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz";
-        sha1 = "6d1bb601b07a4efced97094132093027c95bc298";
+        url = "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz";
+        sha512 = "xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==";
       };
     };
     "buffer-from-1.1.1" = {
@@ -2281,13 +2299,13 @@ let
         sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==";
       };
     };
-    "caniuse-lite-1.0.30000999" = {
+    "caniuse-lite-1.0.30001035" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30000999";
+      version = "1.0.30001035";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000999.tgz";
-        sha512 = "1CUyKyecPeksKwXZvYw0tEoaMCo/RwBlXmEtN5vVnabvO0KPd9RQLcaAuR9/1F+KDMv6esmOFWlsXuzDk+8rxg==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz";
+        sha512 = "C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ==";
       };
     };
     "capture-exit-2.0.0" = {
@@ -2362,13 +2380,13 @@ let
         sha512 = "ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==";
       };
     };
-    "chownr-1.1.3" = {
+    "chownr-1.1.4" = {
       name = "chownr";
       packageName = "chownr";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz";
-        sha512 = "i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==";
+        url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz";
+        sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==";
       };
     };
     "chrome-trace-event-1.0.2" = {
@@ -2407,13 +2425,13 @@ let
         sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==";
       };
     };
-    "clean-css-4.2.1" = {
+    "clean-css-4.2.3" = {
       name = "clean-css";
       packageName = "clean-css";
-      version = "4.2.1";
+      version = "4.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz";
-        sha512 = "4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==";
+        url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz";
+        sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==";
       };
     };
     "clean-stack-1.3.0" = {
@@ -2560,13 +2578,13 @@ let
         sha512 = "hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg==";
       };
     };
-    "commander-2.20.1" = {
+    "commander-2.20.3" = {
       name = "commander";
       packageName = "commander";
-      version = "2.20.1";
+      version = "2.20.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.20.1.tgz";
-        sha512 = "cCuLsMhJeWQ/ZpsFTbE765kvVfoeSddc4nU3up4fV+fDBcfUXnbITJ+JzhkdjzOqhURjZgujxaioam4RM9yGUg==";
+        url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz";
+        sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==";
       };
     };
     "commondir-1.0.1" = {
@@ -2587,13 +2605,13 @@ let
         sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==";
       };
     };
-    "compressible-2.0.17" = {
+    "compressible-2.0.18" = {
       name = "compressible";
       packageName = "compressible";
-      version = "2.0.17";
+      version = "2.0.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz";
-        sha512 = "BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==";
+        url = "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz";
+        sha512 = "AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==";
       };
     };
     "compression-1.7.4" = {
@@ -2650,13 +2668,13 @@ let
         sha512 = "e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==";
       };
     };
-    "console-browserify-1.1.0" = {
+    "console-browserify-1.2.0" = {
       name = "console-browserify";
       packageName = "console-browserify";
-      version = "1.1.0";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz";
-        sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10";
+        url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz";
+        sha512 = "ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==";
       };
     };
     "consolidate-0.15.1" = {
@@ -2704,13 +2722,13 @@ let
         sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==";
       };
     };
-    "convert-source-map-1.6.0" = {
+    "convert-source-map-1.7.0" = {
       name = "convert-source-map";
       packageName = "convert-source-map";
-      version = "1.6.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz";
-        sha512 = "eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==";
+        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz";
+        sha512 = "4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==";
       };
     };
     "cookie-0.4.0" = {
@@ -2731,13 +2749,13 @@ let
         sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
       };
     };
-    "cookies-0.7.3" = {
+    "cookies-0.8.0" = {
       name = "cookies";
       packageName = "cookies";
-      version = "0.7.3";
+      version = "0.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookies/-/cookies-0.7.3.tgz";
-        sha512 = "+gixgxYSgQLTaTIilDHAdlNPZDENDQernEMiIcZpYYP14zgHsCt4Ce1FEjFtcp6GefhozebB6orvhAAWx/IS0A==";
+        url = "https://registry.npmjs.org/cookies/-/cookies-0.8.0.tgz";
+        sha512 = "8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow==";
       };
     };
     "copy-concurrently-1.0.5" = {
@@ -2767,13 +2785,13 @@ let
         sha512 = "Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==";
       };
     };
-    "core-js-2.6.9" = {
+    "core-js-2.6.11" = {
       name = "core-js";
       packageName = "core-js";
-      version = "2.6.9";
+      version = "2.6.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz";
-        sha512 = "HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==";
+        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz";
+        sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==";
       };
     };
     "core-util-is-1.0.2" = {
@@ -2812,13 +2830,13 @@ let
         sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==";
       };
     };
-    "cron-1.7.2" = {
+    "cron-1.8.2" = {
       name = "cron";
       packageName = "cron";
-      version = "1.7.2";
+      version = "1.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cron/-/cron-1.7.2.tgz";
-        sha512 = "+SaJ2OfeRvfQqwXQ2kgr0Y5pzBR/lijf5OpnnaruwWnmI799JfWr2jN2ItOV9s3A/+TFOt6mxvKzQq5F0Jp6VQ==";
+        url = "https://registry.npmjs.org/cron/-/cron-1.8.2.tgz";
+        sha512 = "Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg==";
       };
     };
     "cross-spawn-6.0.5" = {
@@ -2893,15 +2911,6 @@ let
         sha512 = "YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==";
       };
     };
-    "date-now-0.1.4" = {
-      name = "date-now";
-      packageName = "date-now";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz";
-        sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b";
-      };
-    };
     "debug-2.6.9" = {
       name = "debug";
       packageName = "debug";
@@ -3073,13 +3082,22 @@ let
         sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9";
       };
     };
-    "des.js-1.0.0" = {
+    "depd-2.0.0" = {
+      name = "depd";
+      packageName = "depd";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz";
+        sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==";
+      };
+    };
+    "des.js-1.0.1" = {
       name = "des.js";
       packageName = "des.js";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz";
-        sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc";
+        url = "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz";
+        sha512 = "Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==";
       };
     };
     "destroy-1.0.4" = {
@@ -3262,31 +3280,31 @@ let
         sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
       };
     };
-    "ejs-2.7.1" = {
+    "ejs-2.7.4" = {
       name = "ejs";
       packageName = "ejs";
-      version = "2.7.1";
+      version = "2.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ejs/-/ejs-2.7.1.tgz";
-        sha512 = "kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ==";
+        url = "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz";
+        sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==";
       };
     };
-    "electron-to-chromium-1.3.275" = {
+    "electron-to-chromium-1.3.376" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.275";
+      version = "1.3.376";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.275.tgz";
-        sha512 = "/YWtW/VapMnuYA1lNOaa1F4GhR1LBf+CUTp60lzDPEEh0XOzyOAyULyYZVF9vziZ3qSbTqCwmKwsyRXp66STbw==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.376.tgz";
+        sha512 = "cv/PYVz5szeMz192ngilmezyPNFkUjuynuL2vNdiqIrio440nfTDdc0JJU0TS2KHLSVCs9gBbt4CFqM+HcBnjw==";
       };
     };
-    "elliptic-6.5.1" = {
+    "elliptic-6.5.2" = {
       name = "elliptic";
       packageName = "elliptic";
-      version = "6.5.1";
+      version = "6.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz";
-        sha512 = "xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==";
+        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz";
+        sha512 = "f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==";
       };
     };
     "emoji-regex-7.0.3" = {
@@ -3307,6 +3325,15 @@ let
         sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389";
       };
     };
+    "emojis-list-3.0.0" = {
+      name = "emojis-list";
+      packageName = "emojis-list";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz";
+        sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==";
+      };
+    };
     "encodeurl-1.0.2" = {
       name = "encodeurl";
       packageName = "encodeurl";
@@ -3334,6 +3361,15 @@ let
         sha512 = "F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==";
       };
     };
+    "enhanced-resolve-4.1.1" = {
+      name = "enhanced-resolve";
+      packageName = "enhanced-resolve";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz";
+        sha512 = "98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==";
+      };
+    };
     "errno-0.1.7" = {
       name = "errno";
       packageName = "errno";
@@ -3361,31 +3397,31 @@ let
         sha1 = "e2b3d91b54aed672f309d950d154850fa11d4f37";
       };
     };
-    "es-abstract-1.15.0" = {
+    "es-abstract-1.17.4" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.15.0";
+      version = "1.17.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.15.0.tgz";
-        sha512 = "bhkEqWJ2t2lMeaJDuk7okMkJWI/yqgH/EoGwpcvv0XW9RWQsRspI4wt6xuyuvMvvQE3gg/D9HXppgk21w78GyQ==";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz";
+        sha512 = "Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==";
       };
     };
-    "es-to-primitive-1.2.0" = {
+    "es-to-primitive-1.2.1" = {
       name = "es-to-primitive";
       packageName = "es-to-primitive";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz";
-        sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==";
+        url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz";
+        sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==";
       };
     };
-    "es5-ext-0.10.51" = {
+    "es5-ext-0.10.53" = {
       name = "es5-ext";
       packageName = "es5-ext";
-      version = "0.10.51";
+      version = "0.10.53";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.51.tgz";
-        sha512 = "oRpWzM2WcLHVKpnrcyB7OW8j/s67Ba04JCm0WnNv3RiABSvs7mrQlutB8DBv793gKcp0XENR8Il8WxGTlZ73gQ==";
+        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz";
+        sha512 = "Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==";
       };
     };
     "es6-iterator-2.0.3" = {
@@ -3406,13 +3442,13 @@ let
         sha512 = "HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==";
       };
     };
-    "es6-symbol-3.1.2" = {
+    "es6-symbol-3.1.3" = {
       name = "es6-symbol";
       packageName = "es6-symbol";
-      version = "3.1.2";
+      version = "3.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.2.tgz";
-        sha512 = "/ZypxQsArlv+KHpGvng52/Iz8by3EQPxhmbuz8yFG89N/caTFBSbcXONDw0aMjy827gQg26XAjP4uXFvnfINmQ==";
+        url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz";
+        sha512 = "NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==";
       };
     };
     "escape-html-1.0.3" = {
@@ -3433,13 +3469,13 @@ let
         sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
       };
     };
-    "escodegen-1.12.0" = {
+    "escodegen-1.14.1" = {
       name = "escodegen";
       packageName = "escodegen";
-      version = "1.12.0";
+      version = "1.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz";
-        sha512 = "TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==";
+        url = "https://registry.npmjs.org/escodegen/-/escodegen-1.14.1.tgz";
+        sha512 = "Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==";
       };
     };
     "eslint-scope-4.0.3" = {
@@ -3451,15 +3487,6 @@ let
         sha512 = "p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==";
       };
     };
-    "esprima-3.1.3" = {
-      name = "esprima";
-      packageName = "esprima";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
-        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
-      };
-    };
     "esprima-4.0.1" = {
       name = "esprima";
       packageName = "esprima";
@@ -3514,13 +3541,13 @@ let
         sha512 = "qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==";
       };
     };
-    "events-3.0.0" = {
+    "events-3.1.0" = {
       name = "events";
       packageName = "events";
-      version = "3.0.0";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/events/-/events-3.0.0.tgz";
-        sha512 = "Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==";
+        url = "https://registry.npmjs.org/events/-/events-3.1.0.tgz";
+        sha512 = "Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==";
       };
     };
     "eventsource-1.0.7" = {
@@ -3541,13 +3568,13 @@ let
         sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==";
       };
     };
-    "exec-sh-0.3.2" = {
+    "exec-sh-0.3.4" = {
       name = "exec-sh";
       packageName = "exec-sh";
-      version = "0.3.2";
+      version = "0.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.2.tgz";
-        sha512 = "9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==";
+        url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz";
+        sha512 = "sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==";
       };
     };
     "execa-1.0.0" = {
@@ -3604,6 +3631,15 @@ let
         sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==";
       };
     };
+    "ext-1.4.0" = {
+      name = "ext";
+      packageName = "ext";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz";
+        sha512 = "Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==";
+      };
+    };
     "extend-3.0.2" = {
       name = "extend";
       packageName = "extend";
@@ -3649,22 +3685,22 @@ let
         sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
       };
     };
-    "fast-deep-equal-2.0.1" = {
+    "fast-deep-equal-3.1.1" = {
       name = "fast-deep-equal";
       packageName = "fast-deep-equal";
-      version = "2.0.1";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz";
-        sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
+        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz";
+        sha512 = "8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==";
       };
     };
-    "fast-json-stable-stringify-2.0.0" = {
+    "fast-json-stable-stringify-2.1.0" = {
       name = "fast-json-stable-stringify";
       packageName = "fast-json-stable-stringify";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz";
-        sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
+        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz";
+        sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==";
       };
     };
     "fast-levenshtein-2.0.6" = {
@@ -3694,13 +3730,13 @@ let
         sha512 = "D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==";
       };
     };
-    "fb-watchman-2.0.0" = {
+    "fb-watchman-2.0.1" = {
       name = "fb-watchman";
       packageName = "fb-watchman";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz";
-        sha1 = "54e9abf7dfa2f26cd9b1636c588c1afc05de5d58";
+        url = "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz";
+        sha512 = "DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==";
       };
     };
     "figgy-pudding-3.5.1" = {
@@ -3712,6 +3748,15 @@ let
         sha512 = "vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==";
       };
     };
+    "file-uri-to-path-1.0.0" = {
+      name = "file-uri-to-path";
+      packageName = "file-uri-to-path";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz";
+        sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==";
+      };
+    };
     "filesize-3.6.1" = {
       name = "filesize";
       packageName = "filesize";
@@ -3847,13 +3892,13 @@ let
         sha512 = "m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==";
       };
     };
-    "formidable-1.2.1" = {
+    "formidable-1.2.2" = {
       name = "formidable";
       packageName = "formidable";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz";
-        sha512 = "Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==";
+        url = "https://registry.npmjs.org/formidable/-/formidable-1.2.2.tgz";
+        sha512 = "V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q==";
       };
     };
     "forwarded-0.1.2" = {
@@ -3910,13 +3955,13 @@ let
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
-    "fsevents-1.2.9" = {
+    "fsevents-1.2.11" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "1.2.9";
+      version = "1.2.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz";
-        sha512 = "oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz";
+        sha512 = "+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==";
       };
     };
     "function-bind-1.1.1" = {
@@ -3928,6 +3973,15 @@ let
         sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==";
       };
     };
+    "gensync-1.0.0-beta.1" = {
+      name = "gensync";
+      packageName = "gensync";
+      version = "1.0.0-beta.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz";
+        sha512 = "r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==";
+      };
+    };
     "get-caller-file-1.0.3" = {
       name = "get-caller-file";
       packageName = "get-caller-file";
@@ -3991,13 +4045,13 @@ let
         sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
       };
     };
-    "glob-7.1.4" = {
+    "glob-7.1.6" = {
       name = "glob";
       packageName = "glob";
-      version = "7.1.4";
+      version = "7.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz";
-        sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==";
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz";
+        sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==";
       };
     };
     "glob-parent-3.1.0" = {
@@ -4090,13 +4144,13 @@ let
         sha512 = "qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==";
       };
     };
-    "graceful-fs-4.2.2" = {
+    "graceful-fs-4.2.3" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.2.2";
+      version = "4.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz";
-        sha512 = "IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz";
+        sha512 = "a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==";
       };
     };
     "growly-1.3.0" = {
@@ -4126,15 +4180,6 @@ let
         sha512 = "d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==";
       };
     };
-    "handlebars-4.4.2" = {
-      name = "handlebars";
-      packageName = "handlebars";
-      version = "4.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/handlebars/-/handlebars-4.4.2.tgz";
-        sha512 = "cIv17+GhL8pHHnRJzGu2wwcthL5sb8uDKBHvZ2Dtu5s1YNt0ljbzKbamnc+gr69y7bzwQiBdr5+hOpRd5pnOdg==";
-      };
-    };
     "har-schema-2.0.0" = {
       name = "har-schema";
       packageName = "har-schema";
@@ -4189,13 +4234,13 @@ let
         sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==";
       };
     };
-    "has-symbols-1.0.0" = {
+    "has-symbols-1.0.1" = {
       name = "has-symbols";
       packageName = "has-symbols";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz";
-        sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44";
+        url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz";
+        sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==";
       };
     };
     "has-to-string-tag-x-1.4.1" = {
@@ -4297,13 +4342,13 @@ let
         sha512 = "HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==";
       };
     };
-    "hosted-git-info-2.8.4" = {
+    "hosted-git-info-2.8.8" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
-      version = "2.8.4";
+      version = "2.8.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz";
-        sha512 = "pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz";
+        sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==";
       };
     };
     "hpack.js-2.1.6" = {
@@ -4333,6 +4378,15 @@ let
         sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f";
       };
     };
+    "html-escaper-2.0.0" = {
+      name = "html-escaper";
+      packageName = "html-escaper";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.0.tgz";
+        sha512 = "a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig==";
+      };
+    };
     "http-assert-1.4.1" = {
       name = "http-assert";
       packageName = "http-assert";
@@ -4621,13 +4675,13 @@ let
         sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9";
       };
     };
-    "ipaddr.js-1.9.0" = {
+    "ipaddr.js-1.9.1" = {
       name = "ipaddr.js";
       packageName = "ipaddr.js";
-      version = "1.9.0";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz";
-        sha512 = "M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==";
+        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz";
+        sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==";
       };
     };
     "is-absolute-url-3.0.3" = {
@@ -4684,22 +4738,13 @@ let
         sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==";
       };
     };
-    "is-buffer-2.0.4" = {
-      name = "is-buffer";
-      packageName = "is-buffer";
-      version = "2.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz";
-        sha512 = "Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==";
-      };
-    };
-    "is-callable-1.1.4" = {
+    "is-callable-1.1.5" = {
       name = "is-callable";
       packageName = "is-callable";
-      version = "1.1.4";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz";
-        sha512 = "r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==";
+        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz";
+        sha512 = "ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==";
       };
     };
     "is-ci-2.0.0" = {
@@ -4729,13 +4774,13 @@ let
         sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==";
       };
     };
-    "is-date-object-1.0.1" = {
+    "is-date-object-1.0.2" = {
       name = "is-date-object";
       packageName = "is-date-object";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz";
-        sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16";
+        url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz";
+        sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==";
       };
     };
     "is-descriptor-0.1.6" = {
@@ -4792,13 +4837,13 @@ let
         sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
       };
     };
-    "is-finite-1.0.2" = {
+    "is-finite-1.1.0" = {
       name = "is-finite";
       packageName = "is-finite";
-      version = "1.0.2";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz";
-        sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
+        url = "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz";
+        sha512 = "cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==";
       };
     };
     "is-fullwidth-code-point-1.0.0" = {
@@ -4927,13 +4972,13 @@ let
         sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
       };
     };
-    "is-regex-1.0.4" = {
+    "is-regex-1.0.5" = {
       name = "is-regex";
       packageName = "is-regex";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz";
-        sha1 = "5517489b547091b0930e095654ced25ee97e9491";
+        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz";
+        sha512 = "vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==";
       };
     };
     "is-retry-allowed-1.2.0" = {
@@ -4954,13 +4999,13 @@ let
         sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
       };
     };
-    "is-symbol-1.0.2" = {
+    "is-symbol-1.0.3" = {
       name = "is-symbol";
       packageName = "is-symbol";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz";
-        sha512 = "HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==";
+        url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz";
+        sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==";
       };
     };
     "is-typedarray-1.0.0" = {
@@ -5098,13 +5143,13 @@ let
         sha512 = "R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==";
       };
     };
-    "istanbul-reports-2.2.6" = {
+    "istanbul-reports-2.2.7" = {
       name = "istanbul-reports";
       packageName = "istanbul-reports";
-      version = "2.2.6";
+      version = "2.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.6.tgz";
-        sha512 = "SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==";
+        url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.7.tgz";
+        sha512 = "uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==";
       };
     };
     "isurl-1.0.0" = {
@@ -5368,13 +5413,13 @@ let
         sha512 = "51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==";
       };
     };
-    "js-beautify-1.10.2" = {
+    "js-beautify-1.10.3" = {
       name = "js-beautify";
       packageName = "js-beautify";
-      version = "1.10.2";
+      version = "1.10.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.2.tgz";
-        sha512 = "ZtBYyNUYJIsBWERnQP0rPN9KjkrDfJcMjuVGcvXOUJrD1zmOGwhRwQ4msG+HJ+Ni/FA7+sRQEMYVzdTQDvnzvQ==";
+        url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.3.tgz";
+        sha512 = "wfk/IAWobz1TfApSdivH5PJ0miIHgDoYb1ugSqHcODPmaYu46rYe5FVuIEkhjg8IQiv6rDNPyhsqbsohI/C2vQ==";
       };
     };
     "js-stringify-1.0.2" = {
@@ -5566,13 +5611,13 @@ let
         sha1 = "ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3";
       };
     };
-    "keygrip-1.0.3" = {
+    "keygrip-1.1.0" = {
       name = "keygrip";
       packageName = "keygrip";
-      version = "1.0.3";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/keygrip/-/keygrip-1.0.3.tgz";
-        sha512 = "/PpesirAIfaklxUzp4Yb7xBper9MwP6hNRA6BGGUFCgbJ+BM5CKBtsoxinNXkLHAr+GXS1/lSlF2rP7cv5Fl+g==";
+        url = "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz";
+        sha512 = "iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==";
       };
     };
     "keyv-3.0.0" = {
@@ -5620,13 +5665,13 @@ let
         sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==";
       };
     };
-    "kind-of-6.0.2" = {
+    "kind-of-6.0.3" = {
       name = "kind-of";
       packageName = "kind-of";
-      version = "6.0.2";
+      version = "6.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz";
-        sha512 = "s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==";
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz";
+        sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==";
       };
     };
     "kleur-3.0.3" = {
@@ -5638,13 +5683,13 @@ let
         sha512 = "eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==";
       };
     };
-    "koa-2.8.2" = {
+    "koa-2.11.0" = {
       name = "koa";
       packageName = "koa";
-      version = "2.8.2";
+      version = "2.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/koa/-/koa-2.8.2.tgz";
-        sha512 = "q1uZOgpl3wjr5FS/tjbABJ8lA5+NeKa9eq7QyBP5xxgOBwJN4iBrMEgO3LroE51lrIw3BsO0WZZ0Yi6giSiMDw==";
+        url = "https://registry.npmjs.org/koa/-/koa-2.11.0.tgz";
+        sha512 = "EpR9dElBTDlaDgyhDMiLkXrPwp6ZqgAIBvhhmxQ9XN4TFgW+gEz6tkcsNI6BnUbUftrKDjVFj4lW2/J2aNBMMA==";
       };
     };
     "koa-body-4.1.1" = {
@@ -5683,15 +5728,6 @@ let
         sha1 = "da40875df49de0539098d1700b50820cebcd21d0";
       };
     };
-    "koa-is-json-1.0.0" = {
-      name = "koa-is-json";
-      packageName = "koa-is-json";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/koa-is-json/-/koa-is-json-1.0.0.tgz";
-        sha1 = "273c07edcdcb8df6a2c1ab7d59ee76491451ec14";
-      };
-    };
     "koa-router-7.4.0" = {
       name = "koa-router";
       packageName = "koa-router";
@@ -5800,6 +5836,15 @@ let
         sha512 = "fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==";
       };
     };
+    "loader-utils-1.4.0" = {
+      name = "loader-utils";
+      packageName = "loader-utils";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz";
+        sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==";
+      };
+    };
     "locate-path-2.0.0" = {
       name = "locate-path";
       packageName = "locate-path";
@@ -5872,13 +5917,13 @@ let
         sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==";
       };
     };
-    "loglevel-1.6.4" = {
+    "loglevel-1.6.7" = {
       name = "loglevel";
       packageName = "loglevel";
-      version = "1.6.4";
+      version = "1.6.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.4.tgz";
-        sha512 = "p0b6mOGKcGa+7nnmKbpzR6qloPbrgLcnio++E+14Vo/XffOGwZtRpUhr8dTH/x2oCMmEoIU0Zwm3ZauhvYD17g==";
+        url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz";
+        sha512 = "cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A==";
       };
     };
     "loglevelnext-1.0.5" = {
@@ -5971,13 +6016,13 @@ let
         sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==";
       };
     };
-    "make-error-1.3.5" = {
+    "make-error-1.3.6" = {
       name = "make-error";
       packageName = "make-error";
-      version = "1.3.5";
+      version = "1.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz";
-        sha512 = "c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==";
+        url = "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz";
+        sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==";
       };
     };
     "makeerror-1.0.11" = {
@@ -6061,6 +6106,15 @@ let
         sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552";
       };
     };
+    "memory-fs-0.5.0" = {
+      name = "memory-fs";
+      packageName = "memory-fs";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz";
+        sha512 = "jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==";
+      };
+    };
     "merge-descriptors-1.0.1" = {
       name = "merge-descriptors";
       packageName = "merge-descriptors";
@@ -6124,22 +6178,22 @@ let
         sha512 = "LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==";
       };
     };
-    "mime-db-1.40.0" = {
+    "mime-db-1.43.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.40.0";
+      version = "1.43.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz";
-        sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz";
+        sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==";
       };
     };
-    "mime-types-2.1.24" = {
+    "mime-types-2.1.26" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.24";
+      version = "2.1.26";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz";
-        sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz";
+        sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==";
       };
     };
     "mimic-fn-1.2.0" = {
@@ -6205,13 +6259,13 @@ let
         sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
-    "minimist-1.2.0" = {
+    "minimist-1.2.5" = {
       name = "minimist";
       packageName = "minimist";
-      version = "1.2.0";
+      version = "1.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
-        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
+        sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
       };
     };
     "mississippi-2.0.0" = {
@@ -6259,13 +6313,13 @@ let
         sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==";
       };
     };
-    "moment-timezone-0.5.26" = {
+    "moment-timezone-0.5.28" = {
       name = "moment-timezone";
       packageName = "moment-timezone";
-      version = "0.5.26";
+      version = "0.5.28";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.26.tgz";
-        sha512 = "sFP4cgEKTCymBBKgoxZjYzlSovC20Y6J7y3nanDc5RoBIXKlZhoYwBoZGe3flwU6A372AcRwScH8KiwV6zjy1g==";
+        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.28.tgz";
+        sha512 = "TDJkZvAyKIVWg5EtVqRzU97w0Rb0YVbfpqyjgu6GwXCAohVRqwZjf4fOzDE6p1Ch98Sro/8hQQi65WDXW5STPw==";
       };
     };
     "move-concurrently-1.0.1" = {
@@ -6457,13 +6511,13 @@ let
         sha512 = "M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==";
       };
     };
-    "nopt-4.0.1" = {
+    "nopt-4.0.3" = {
       name = "nopt";
       packageName = "nopt";
-      version = "4.0.1";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz";
-        sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d";
+        url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz";
+        sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==";
       };
     };
     "normalize-package-data-2.5.0" = {
@@ -6520,13 +6574,13 @@ let
         sha1 = "097b602b53422a522c1afb8790318336941a011d";
       };
     };
-    "nwsapi-2.1.4" = {
+    "nwsapi-2.2.0" = {
       name = "nwsapi";
       packageName = "nwsapi";
-      version = "2.1.4";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.4.tgz";
-        sha512 = "iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw==";
+        url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz";
+        sha512 = "h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==";
       };
     };
     "oauth-sign-0.9.0" = {
@@ -6565,13 +6619,13 @@ let
         sha512 = "OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==";
       };
     };
-    "object-inspect-1.6.0" = {
+    "object-inspect-1.7.0" = {
       name = "object-inspect";
       packageName = "object-inspect";
-      version = "1.6.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz";
-        sha512 = "GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==";
+        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz";
+        sha512 = "a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==";
       };
     };
     "object-keys-1.1.1" = {
@@ -6601,13 +6655,13 @@ let
         sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==";
       };
     };
-    "object.getownpropertydescriptors-2.0.3" = {
+    "object.getownpropertydescriptors-2.1.0" = {
       name = "object.getownpropertydescriptors";
       packageName = "object.getownpropertydescriptors";
-      version = "2.0.3";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz";
-        sha1 = "8758c846f5b407adab0f236e0986f14b051caa16";
+        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz";
+        sha512 = "Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==";
       };
     };
     "object.pick-1.3.0" = {
@@ -6709,22 +6763,13 @@ let
         sha512 = "PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==";
       };
     };
-    "optimist-0.6.1" = {
-      name = "optimist";
-      packageName = "optimist";
-      version = "0.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz";
-        sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
-      };
-    };
-    "optionator-0.8.2" = {
+    "optionator-0.8.3" = {
       name = "optionator";
       packageName = "optionator";
-      version = "0.8.2";
+      version = "0.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz";
-        sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64";
+        url = "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz";
+        sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==";
       };
     };
     "ora-3.4.0" = {
@@ -6862,13 +6907,13 @@ let
         sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==";
       };
     };
-    "p-limit-2.2.1" = {
+    "p-limit-2.2.2" = {
       name = "p-limit";
       packageName = "p-limit";
-      version = "2.2.1";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz";
-        sha512 = "85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==";
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz";
+        sha512 = "WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==";
       };
     };
     "p-locate-2.0.0" = {
@@ -6952,13 +6997,13 @@ let
         sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==";
       };
     };
-    "pako-1.0.10" = {
+    "pako-1.0.11" = {
       name = "pako";
       packageName = "pako";
-      version = "1.0.10";
+      version = "1.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz";
-        sha512 = "0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==";
+        url = "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz";
+        sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==";
       };
     };
     "parallel-transform-1.2.0" = {
@@ -7096,13 +7141,13 @@ let
         sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
       };
     };
-    "path-to-regexp-1.7.0" = {
+    "path-to-regexp-1.8.0" = {
       name = "path-to-regexp";
       packageName = "path-to-regexp";
-      version = "1.7.0";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz";
-        sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d";
+        url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz";
+        sha512 = "n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==";
       };
     };
     "path-type-3.0.0" = {
@@ -7213,13 +7258,13 @@ let
         sha512 = "2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==";
       };
     };
-    "portfinder-1.0.24" = {
+    "portfinder-1.0.25" = {
       name = "portfinder";
       packageName = "portfinder";
-      version = "1.0.24";
+      version = "1.0.25";
       src = fetchurl {
-        url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.24.tgz";
-        sha512 = "ekRl7zD2qxYndYflwiryJwMioBI7LI7rVXg3EnLK3sjkouT5eOuhS3gS255XxBksa30VG8UPZYZCdgfGOfkSUg==";
+        url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz";
+        sha512 = "6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==";
       };
     };
     "posix-character-classes-0.1.1" = {
@@ -7249,13 +7294,13 @@ let
         sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897";
       };
     };
-    "prettier-1.18.2" = {
+    "prettier-1.19.1" = {
       name = "prettier";
       packageName = "prettier";
-      version = "1.18.2";
+      version = "1.19.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prettier/-/prettier-1.18.2.tgz";
-        sha512 = "OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==";
+        url = "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz";
+        sha512 = "s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==";
       };
     };
     "pretty-2.0.0" = {
@@ -7321,13 +7366,13 @@ let
         sha1 = "98472870bf228132fcbdd868129bad12c3c029e3";
       };
     };
-    "prompts-2.2.1" = {
+    "prompts-2.3.1" = {
       name = "prompts";
       packageName = "prompts";
-      version = "2.2.1";
+      version = "2.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prompts/-/prompts-2.2.1.tgz";
-        sha512 = "VObPvJiWPhpZI6C5m60XOzTfnYg/xc/an+r9VYymj9WJW3B/DIH+REzjpAACPf8brwPeP+7vz3bIim3S+AaMjw==";
+        url = "https://registry.npmjs.org/prompts/-/prompts-2.3.1.tgz";
+        sha512 = "qIP2lQyCwYbdzcqHIUi2HAxiWixhoM9OdLCWf8txXsapC/X9YdsCoeyRIXE/GP+Q0J37Q7+XN/MFqbUa7IzXNA==";
       };
     };
     "proto-list-1.2.4" = {
@@ -7339,13 +7384,13 @@ let
         sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
       };
     };
-    "proxy-addr-2.0.5" = {
+    "proxy-addr-2.0.6" = {
       name = "proxy-addr";
       packageName = "proxy-addr";
-      version = "2.0.5";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz";
-        sha512 = "t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==";
+        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz";
+        sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==";
       };
     };
     "prr-1.0.1" = {
@@ -7366,13 +7411,13 @@ let
         sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
       };
     };
-    "psl-1.4.0" = {
+    "psl-1.7.0" = {
       name = "psl";
       packageName = "psl";
-      version = "1.4.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz";
-        sha512 = "HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==";
+        url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz";
+        sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==";
       };
     };
     "public-encrypt-4.0.3" = {
@@ -7645,13 +7690,13 @@ let
         sha512 = "9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA==";
       };
     };
-    "react-is-16.10.2" = {
+    "react-is-16.13.0" = {
       name = "react-is";
       packageName = "react-is";
-      version = "16.10.2";
+      version = "16.13.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/react-is/-/react-is-16.10.2.tgz";
-        sha512 = "INBT1QEgtcCCgvccr5/86CfD71fw9EPmDxgiJX4I2Ddr6ZsV6iFXsuby+qWJPtmNuMY0zByTsG4468P7nHuNWA==";
+        url = "https://registry.npmjs.org/react-is/-/react-is-16.13.0.tgz";
+        sha512 = "GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA==";
       };
     };
     "read-pkg-3.0.0" = {
@@ -7672,22 +7717,22 @@ let
         sha512 = "6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==";
       };
     };
-    "readable-stream-2.3.6" = {
+    "readable-stream-2.3.7" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.3.6";
+      version = "2.3.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
-        sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz";
+        sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==";
       };
     };
-    "readable-stream-3.4.0" = {
+    "readable-stream-3.6.0" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "3.4.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz";
-        sha512 = "jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz";
+        sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==";
       };
     };
     "readdirp-2.2.1" = {
@@ -7816,31 +7861,31 @@ let
         sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
       };
     };
-    "request-2.88.0" = {
+    "request-2.88.2" = {
       name = "request";
       packageName = "request";
-      version = "2.88.0";
+      version = "2.88.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz";
-        sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==";
+        url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz";
+        sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==";
       };
     };
-    "request-promise-core-1.1.2" = {
+    "request-promise-core-1.1.3" = {
       name = "request-promise-core";
       packageName = "request-promise-core";
-      version = "1.1.2";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz";
-        sha512 = "UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==";
+        url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz";
+        sha512 = "QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==";
       };
     };
-    "request-promise-native-1.0.7" = {
+    "request-promise-native-1.0.8" = {
       name = "request-promise-native";
       packageName = "request-promise-native";
-      version = "1.0.7";
+      version = "1.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz";
-        sha512 = "rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==";
+        url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz";
+        sha512 = "dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==";
       };
     };
     "require-directory-2.1.1" = {
@@ -7888,13 +7933,13 @@ let
         sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
       };
     };
-    "resolve-1.12.0" = {
+    "resolve-1.15.1" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.12.0";
+      version = "1.15.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz";
-        sha512 = "B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz";
+        sha512 = "84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==";
       };
     };
     "resolve-cwd-2.0.0" = {
@@ -8023,13 +8068,13 @@ let
         sha1 = "e848396f057d223f24386924618e25694161ec47";
       };
     };
-    "rxjs-6.5.3" = {
+    "rxjs-6.5.4" = {
       name = "rxjs";
       packageName = "rxjs";
-      version = "6.5.3";
+      version = "6.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz";
-        sha512 = "wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==";
+        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz";
+        sha512 = "naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==";
       };
     };
     "safe-buffer-5.1.2" = {
@@ -8149,6 +8194,15 @@ let
         sha512 = "0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==";
       };
     };
+    "serialize-javascript-2.1.2" = {
+      name = "serialize-javascript";
+      packageName = "serialize-javascript";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz";
+        sha512 = "rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==";
+      };
+    };
     "serve-index-1.9.1" = {
       name = "serve-index";
       packageName = "serve-index";
@@ -8284,13 +8338,13 @@ let
         sha512 = "+gXuzJFpGtK9zCa7rPMMNs8AF2weWMsB0Vlyym5VkFX2VGQ3VBzKhnxPN//PWrGuPFGQ/u0F1yL6rZoPhj/KPQ==";
       };
     };
-    "sisteransi-1.0.3" = {
+    "sisteransi-1.0.4" = {
       name = "sisteransi";
       packageName = "sisteransi";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.3.tgz";
-        sha512 = "SbEG75TzH8G7eVXFSN5f9EExILKfly7SUvVY5DhhYLvfhKqhDFY0OzevWa/zwak0RLRfWS5AvfMWpd9gJvr5Yg==";
+        url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.4.tgz";
+        sha512 = "/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig==";
       };
     };
     "slash-1.0.0" = {
@@ -8392,13 +8446,13 @@ let
         sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==";
       };
     };
-    "source-map-resolve-0.5.2" = {
+    "source-map-resolve-0.5.3" = {
       name = "source-map-resolve";
       packageName = "source-map-resolve";
-      version = "0.5.2";
+      version = "0.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz";
-        sha512 = "MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==";
+        url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz";
+        sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==";
       };
     };
     "source-map-support-0.4.18" = {
@@ -8410,13 +8464,13 @@ let
         sha512 = "try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==";
       };
     };
-    "source-map-support-0.5.13" = {
+    "source-map-support-0.5.16" = {
       name = "source-map-support";
       packageName = "source-map-support";
-      version = "0.5.13";
+      version = "0.5.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz";
-        sha512 = "SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==";
+        url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz";
+        sha512 = "efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==";
       };
     };
     "source-map-url-0.4.0" = {
@@ -8590,13 +8644,13 @@ let
         sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==";
       };
     };
-    "stream-shift-1.0.0" = {
+    "stream-shift-1.0.1" = {
       name = "stream-shift";
       packageName = "stream-shift";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz";
-        sha1 = "d5c752825e5367e786f78e18e445ea223a155952";
+        url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz";
+        sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==";
       };
     };
     "strict-uri-encode-1.1.0" = {
@@ -8644,22 +8698,22 @@ let
         sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==";
       };
     };
-    "string.prototype.trimleft-2.1.0" = {
+    "string.prototype.trimleft-2.1.1" = {
       name = "string.prototype.trimleft";
       packageName = "string.prototype.trimleft";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz";
-        sha512 = "FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==";
+        url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz";
+        sha512 = "iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==";
       };
     };
-    "string.prototype.trimright-2.1.0" = {
+    "string.prototype.trimright-2.1.1" = {
       name = "string.prototype.trimright";
       packageName = "string.prototype.trimright";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz";
-        sha512 = "fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==";
+        url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz";
+        sha512 = "qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==";
       };
     };
     "string_decoder-1.1.1" = {
@@ -8761,22 +8815,22 @@ let
         sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==";
       };
     };
-    "terser-4.3.8" = {
+    "terser-4.6.6" = {
       name = "terser";
       packageName = "terser";
-      version = "4.3.8";
+      version = "4.6.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terser/-/terser-4.3.8.tgz";
-        sha512 = "otmIRlRVmLChAWsnSFNO0Bfk6YySuBp6G9qrHiJwlLDd4mxe2ta4sjI7TzIR+W1nBMjilzrMcPOz9pSusgx3hQ==";
+        url = "https://registry.npmjs.org/terser/-/terser-4.6.6.tgz";
+        sha512 = "4lYPyeNmstjIIESr/ysHg2vUPRGf2tzF9z2yYwnowXVuVzLEamPN1Gfrz7f8I9uEPuHcbFlW4PLIAsJoxXyJ1g==";
       };
     };
-    "terser-webpack-plugin-1.4.1" = {
+    "terser-webpack-plugin-1.4.3" = {
       name = "terser-webpack-plugin";
       packageName = "terser-webpack-plugin";
-      version = "1.4.1";
+      version = "1.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz";
-        sha512 = "ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==";
+        url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz";
+        sha512 = "QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==";
       };
     };
     "test-exclude-5.2.3" = {
@@ -8824,13 +8878,13 @@ let
         sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==";
       };
     };
-    "thunky-1.0.3" = {
+    "thunky-1.1.0" = {
       name = "thunky";
       packageName = "thunky";
-      version = "1.0.3";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz";
-        sha512 = "YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==";
+        url = "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz";
+        sha512 = "eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==";
       };
     };
     "timed-out-4.0.1" = {
@@ -8932,13 +8986,13 @@ let
         sha1 = "ceeefc717a76c4316f126d0b9dbaa55d7e7df01a";
       };
     };
-    "tough-cookie-2.4.3" = {
+    "tough-cookie-2.5.0" = {
       name = "tough-cookie";
       packageName = "tough-cookie";
-      version = "2.4.3";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz";
-        sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==";
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz";
+        sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==";
       };
     };
     "tr46-1.0.1" = {
@@ -8968,22 +9022,31 @@ let
         sha512 = "c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==";
       };
     };
-    "ts-jest-24.1.0" = {
+    "ts-jest-24.3.0" = {
       name = "ts-jest";
       packageName = "ts-jest";
-      version = "24.1.0";
+      version = "24.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ts-jest/-/ts-jest-24.1.0.tgz";
-        sha512 = "HEGfrIEAZKfu1pkaxB9au17b1d9b56YZSqz5eCVE8mX68+5reOvlM93xGOzzCREIov9mdH7JBG+s0UyNAqr0tQ==";
+        url = "https://registry.npmjs.org/ts-jest/-/ts-jest-24.3.0.tgz";
+        sha512 = "Hb94C/+QRIgjVZlJyiWwouYUF+siNJHJHknyspaOcZ+OQAIdFG/UrdQVXw/0B8Z3No34xkUXZJpOTy9alOWdVQ==";
       };
     };
-    "tslib-1.10.0" = {
+    "tslib-1.11.1" = {
       name = "tslib";
       packageName = "tslib";
-      version = "1.10.0";
+      version = "1.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz";
-        sha512 = "qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==";
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz";
+        sha512 = "aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==";
+      };
+    };
+    "tsscmp-1.0.6" = {
+      name = "tsscmp";
+      packageName = "tsscmp";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz";
+        sha512 = "LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==";
       };
     };
     "tty-browserify-0.0.0" = {
@@ -9022,6 +9085,15 @@ let
         sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==";
       };
     };
+    "type-2.0.0" = {
+      name = "type";
+      packageName = "type";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/type/-/type-2.0.0.tgz";
+        sha512 = "KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==";
+      };
+    };
     "type-check-0.3.2" = {
       name = "type-check";
       packageName = "type-check";
@@ -9058,13 +9130,13 @@ let
         sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==";
       };
     };
-    "typescript-3.6.3" = {
+    "typescript-3.8.3" = {
       name = "typescript";
       packageName = "typescript";
-      version = "3.6.3";
+      version = "3.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-3.6.3.tgz";
-        sha512 = "N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw==";
+        url = "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz";
+        sha512 = "MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==";
       };
     };
     "typical-4.0.0" = {
@@ -9085,15 +9157,6 @@ let
         sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
       };
     };
-    "uglify-js-3.6.0" = {
-      name = "uglify-js";
-      packageName = "uglify-js";
-      version = "3.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz";
-        sha512 = "W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==";
-      };
-    };
     "uglify-to-browserify-1.0.2" = {
       name = "uglify-to-browserify";
       packageName = "uglify-to-browserify";
@@ -9103,13 +9166,13 @@ let
         sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
       };
     };
-    "underscore-1.9.1" = {
+    "underscore-1.9.2" = {
       name = "underscore";
       packageName = "underscore";
-      version = "1.9.1";
+      version = "1.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz";
-        sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==";
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.9.2.tgz";
+        sha512 = "D39qtimx0c1fI3ya1Lnhk3E9nONswSKhnffBI0gME9C99fYOkNi04xs8K6pePLhvl1frbDemkaBQ5ikWllR2HQ==";
       };
     };
     "union-value-1.0.1" = {
@@ -9175,13 +9238,13 @@ let
         sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==";
       };
     };
-    "urijs-1.19.1" = {
+    "urijs-1.19.2" = {
       name = "urijs";
       packageName = "urijs";
-      version = "1.19.1";
+      version = "1.19.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/urijs/-/urijs-1.19.1.tgz";
-        sha512 = "xVrGVi94ueCJNrBSTjWqjvtgvl3cyOTThp2zaMaFNGp3F542TR6sM3f2o8RqZl+AwteClSVmoCyt0ka4RjQOQg==";
+        url = "https://registry.npmjs.org/urijs/-/urijs-1.19.2.tgz";
+        sha512 = "s/UIq9ap4JPZ7H1EB5ULo/aOUbWqfDi7FKzMC2Nz+0Si8GiT1rIEaprt8hy3Vy2Ex2aJPpOQv4P4DuOZ+K1c6w==";
       };
     };
     "urix-0.1.0" = {
@@ -9265,13 +9328,13 @@ let
         sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
       };
     };
-    "util.promisify-1.0.0" = {
+    "util.promisify-1.0.1" = {
       name = "util.promisify";
       packageName = "util.promisify";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz";
-        sha512 = "i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==";
+        url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz";
+        sha512 = "g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==";
       };
     };
     "utils-merge-1.0.1" = {
@@ -9283,13 +9346,13 @@ let
         sha1 = "9f95710f50a267947b2ccc124741c1028427e713";
       };
     };
-    "uuid-3.3.3" = {
+    "uuid-3.4.0" = {
       name = "uuid";
       packageName = "uuid";
-      version = "3.3.3";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz";
-        sha512 = "pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz";
+        sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==";
       };
     };
     "v8-compile-cache-2.0.3" = {
@@ -9328,13 +9391,13 @@ let
         sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
       };
     };
-    "vm-browserify-1.1.0" = {
+    "vm-browserify-1.1.2" = {
       name = "vm-browserify";
       packageName = "vm-browserify";
-      version = "1.1.0";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz";
-        sha512 = "iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==";
+        url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz";
+        sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==";
       };
     };
     "void-elements-2.0.1" = {
@@ -9346,13 +9409,13 @@ let
         sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec";
       };
     };
-    "w3c-hr-time-1.0.1" = {
+    "w3c-hr-time-1.0.2" = {
       name = "w3c-hr-time";
       packageName = "w3c-hr-time";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz";
-        sha1 = "82ac2bff63d950ea9e3189a58a65625fedf19045";
+        url = "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz";
+        sha512 = "z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==";
       };
     };
     "walker-1.0.7" = {
@@ -9400,31 +9463,31 @@ let
         sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==";
       };
     };
-    "webpack-4.41.0" = {
+    "webpack-4.42.0" = {
       name = "webpack";
       packageName = "webpack";
-      version = "4.41.0";
+      version = "4.42.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack/-/webpack-4.41.0.tgz";
-        sha512 = "yNV98U4r7wX1VJAj5kyMsu36T8RPPQntcb5fJLOsMz/pt/WrKC0Vp1bAlqPLkA1LegSwQwf6P+kAbyhRKVQ72g==";
+        url = "https://registry.npmjs.org/webpack/-/webpack-4.42.0.tgz";
+        sha512 = "EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w==";
       };
     };
-    "webpack-bundle-analyzer-3.5.2" = {
+    "webpack-bundle-analyzer-3.6.1" = {
       name = "webpack-bundle-analyzer";
       packageName = "webpack-bundle-analyzer";
-      version = "3.5.2";
+      version = "3.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.5.2.tgz";
-        sha512 = "g9spCNe25QYUVqHRDkwG414GTok2m7pTTP0wr6l0J50Z3YLS04+BGodTqqoVBL7QfU/U/9p/oiI5XFOyfZ7S/A==";
+        url = "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.6.1.tgz";
+        sha512 = "Nfd8HDwfSx1xBwC+P8QMGvHAOITxNBSvu/J/mCJvOwv+G4VWkU7zir9SSenTtyCi0LnVtmsc7G5SZo1uV+bxRw==";
       };
     };
-    "webpack-cli-3.3.9" = {
+    "webpack-cli-3.3.11" = {
       name = "webpack-cli";
       packageName = "webpack-cli";
-      version = "3.3.9";
+      version = "3.3.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.9.tgz";
-        sha512 = "xwnSxWl8nZtBl/AFJCOn9pG7s5CYUYdZxmmukv+fAHLcBIHM36dImfpQg3WfShZXeArkWlf6QRw24Klcsv8a5A==";
+        url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.11.tgz";
+        sha512 = "dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g==";
       };
     };
     "webpack-dev-middleware-3.7.2" = {
@@ -9436,13 +9499,13 @@ let
         sha512 = "1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==";
       };
     };
-    "webpack-dev-server-3.8.2" = {
+    "webpack-dev-server-3.10.3" = {
       name = "webpack-dev-server";
       packageName = "webpack-dev-server";
-      version = "3.8.2";
+      version = "3.10.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.8.2.tgz";
-        sha512 = "0xxogS7n5jHDQWy0WST0q6Ykp7UGj4YvWh+HVN71JoE7BwPxMZrwgraBvmdEMbDVMBzF0u+mEzn8TQzBm5NYJQ==";
+        url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz";
+        sha512 = "e4nWev8YzEVNdOMcNzNeCN947sWJNd43E5XvsJzbAL08kGc2frm1tQ32hTJslRS+H65LCb/AaUCYU7fjHCpDeQ==";
       };
     };
     "webpack-log-1.2.0" = {
@@ -9472,13 +9535,13 @@ let
         sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==";
       };
     };
-    "websocket-1.0.30" = {
+    "websocket-1.0.31" = {
       name = "websocket";
       packageName = "websocket";
-      version = "1.0.30";
+      version = "1.0.31";
       src = fetchurl {
-        url = "https://registry.npmjs.org/websocket/-/websocket-1.0.30.tgz";
-        sha512 = "aO6klgaTdSMkhfl5VVJzD5fm+Srhh5jLYbS15+OiI1sN6h/RU/XW6WN9J1uVIpUKNmsTvT3Hs35XAFjn9NMfOw==";
+        url = "https://registry.npmjs.org/websocket/-/websocket-1.0.31.tgz";
+        sha512 = "VAouplvGKPiKFDTeCCO65vYHsyay8DqoBSlzIO3fayrfOgU94lQN5a1uWVnFrMLceTJw/+fQXR5PGbUVRaHshQ==";
       };
     };
     "websocket-driver-0.7.3" = {
@@ -9526,13 +9589,13 @@ let
         sha512 = "rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==";
       };
     };
-    "whatwg-url-7.0.0" = {
+    "whatwg-url-7.1.0" = {
       name = "whatwg-url";
       packageName = "whatwg-url";
-      version = "7.0.0";
+      version = "7.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz";
-        sha512 = "37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==";
+        url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz";
+        sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==";
       };
     };
     "which-1.3.1" = {
@@ -9571,6 +9634,15 @@ let
         sha1 = "fa4daa92daf32c4ea94ed453c81f04686b575dfe";
       };
     };
+    "word-wrap-1.2.3" = {
+      name = "word-wrap";
+      packageName = "word-wrap";
+      version = "1.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz";
+        sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==";
+      };
+    };
     "wordwrap-0.0.2" = {
       name = "wordwrap";
       packageName = "wordwrap";
@@ -9580,15 +9652,6 @@ let
         sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
       };
     };
-    "wordwrap-1.0.0" = {
-      name = "wordwrap";
-      packageName = "wordwrap";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz";
-        sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
-      };
-    };
     "worker-farm-1.7.0" = {
       name = "worker-farm";
       packageName = "worker-farm";
@@ -9724,13 +9787,13 @@ let
         sha512 = "HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==";
       };
     };
-    "yargs-13.3.0" = {
+    "yargs-13.3.2" = {
       name = "yargs";
       packageName = "yargs";
-      version = "13.3.0";
+      version = "13.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz";
-        sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==";
+        url = "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz";
+        sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==";
       };
     };
     "yargs-3.10.0" = {
@@ -9760,13 +9823,13 @@ let
         sha512 = "C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==";
       };
     };
-    "yargs-parser-13.1.1" = {
+    "yargs-parser-13.1.2" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
-      version = "13.1.1";
+      version = "13.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz";
-        sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==";
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz";
+        sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==";
       };
     };
     "ylru-1.2.1" = {
@@ -9791,50 +9854,50 @@ in
       sha256 = "589bfc9e3e26af38989144e8551547cbeb5ffc9a0b668a7a4cb211a2ebf7a931";
     };
     dependencies = [
-      sources."@babel/code-frame-7.5.5"
-      (sources."@babel/core-7.6.2" // {
+      sources."@babel/code-frame-7.8.3"
+      (sources."@babel/core-7.8.7" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."json5-2.1.1"
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
           sources."ms-2.1.2"
           sources."source-map-0.5.7"
         ];
       })
-      (sources."@babel/generator-7.6.2" // {
+      (sources."@babel/generator-7.8.8" // {
         dependencies = [
           sources."jsesc-2.5.2"
           sources."source-map-0.5.7"
         ];
       })
-      sources."@babel/helper-function-name-7.1.0"
-      sources."@babel/helper-get-function-arity-7.0.0"
-      sources."@babel/helper-plugin-utils-7.0.0"
-      sources."@babel/helper-split-export-declaration-7.4.4"
-      sources."@babel/helpers-7.6.2"
-      (sources."@babel/highlight-7.5.0" // {
+      sources."@babel/helper-function-name-7.8.3"
+      sources."@babel/helper-get-function-arity-7.8.3"
+      sources."@babel/helper-plugin-utils-7.8.3"
+      sources."@babel/helper-split-export-declaration-7.8.3"
+      sources."@babel/helpers-7.8.4"
+      (sources."@babel/highlight-7.8.3" // {
         dependencies = [
           sources."js-tokens-4.0.0"
         ];
       })
-      sources."@babel/parser-7.6.2"
-      sources."@babel/plugin-syntax-object-rest-spread-7.2.0"
-      sources."@babel/template-7.6.0"
-      (sources."@babel/traverse-7.6.2" // {
+      sources."@babel/parser-7.8.8"
+      sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
+      sources."@babel/template-7.8.6"
+      (sources."@babel/traverse-7.8.6" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."globals-11.12.0"
           sources."ms-2.1.2"
         ];
       })
-      (sources."@babel/types-7.6.1" // {
+      (sources."@babel/types-7.8.7" // {
         dependencies = [
           sources."to-fast-properties-2.0.0"
         ];
       })
-      (sources."@cnakazawa/watch-1.0.3" // {
+      (sources."@cnakazawa/watch-1.0.4" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
         ];
       })
       (sources."@jest/console-24.9.0" // {
@@ -9865,64 +9928,63 @@ in
       sources."@jest/types-24.9.0"
       (sources."@kubernetes/client-node-0.10.3" // {
         dependencies = [
-          sources."@types/node-10.14.20"
+          sources."@types/node-10.17.17"
         ];
       })
       sources."@sindresorhus/is-0.7.0"
       sources."@types/accepts-1.3.5"
       sources."@types/axios-0.14.0"
       sources."@types/babel-types-7.0.7"
-      sources."@types/babel__core-7.1.3"
-      sources."@types/babel__generator-7.6.0"
+      sources."@types/babel__core-7.1.6"
+      sources."@types/babel__generator-7.6.1"
       sources."@types/babel__template-7.0.2"
-      sources."@types/babel__traverse-7.0.7"
+      sources."@types/babel__traverse-7.0.9"
       sources."@types/babylon-6.16.5"
-      sources."@types/body-parser-1.17.1"
+      sources."@types/body-parser-1.19.0"
       sources."@types/caseless-0.12.2"
       sources."@types/command-line-args-5.0.0"
-      sources."@types/connect-3.4.32"
+      sources."@types/connect-3.4.33"
       sources."@types/cookies-0.7.4"
-      sources."@types/cron-1.7.1"
+      sources."@types/cron-1.7.2"
       sources."@types/events-3.0.0"
-      sources."@types/express-4.17.1"
-      sources."@types/express-serve-static-core-4.16.9"
+      sources."@types/express-4.17.3"
+      sources."@types/express-serve-static-core-4.17.2"
       sources."@types/formidable-1.0.31"
       sources."@types/glob-7.1.1"
       sources."@types/http-assert-1.5.1"
       sources."@types/istanbul-lib-coverage-2.0.1"
-      sources."@types/istanbul-lib-report-1.1.1"
+      sources."@types/istanbul-lib-report-3.0.0"
       sources."@types/istanbul-reports-1.1.1"
-      sources."@types/jest-24.0.18"
-      sources."@types/jest-diff-20.0.1"
-      sources."@types/js-yaml-3.12.1"
-      sources."@types/keygrip-1.0.1"
-      sources."@types/koa-2.0.50"
-      sources."@types/koa-compose-3.2.4"
-      sources."@types/koa-router-7.0.42"
+      sources."@types/jest-24.9.1"
+      sources."@types/js-yaml-3.12.2"
+      sources."@types/keygrip-1.0.2"
+      sources."@types/koa-2.11.2"
+      sources."@types/koa-compose-3.2.5"
+      sources."@types/koa-router-7.4.0"
       sources."@types/koa-send-4.1.2"
       sources."@types/koa-static-4.0.1"
-      sources."@types/koa-views-2.0.3"
-      sources."@types/lodash-4.14.141"
+      sources."@types/koa-views-2.0.4"
+      sources."@types/lodash-4.14.149"
       sources."@types/lodash.clonedeep-4.5.6"
       sources."@types/mime-2.0.1"
       sources."@types/minimatch-3.0.3"
       sources."@types/mkdirp-0.5.2"
-      sources."@types/node-12.7.11"
+      sources."@types/node-12.12.30"
       sources."@types/ora-3.2.0"
       sources."@types/range-parser-1.2.3"
-      (sources."@types/request-2.48.3" // {
+      (sources."@types/request-2.48.4" // {
         dependencies = [
           sources."form-data-2.5.1"
         ];
       })
       sources."@types/serve-static-1.13.3"
       sources."@types/stack-utils-1.0.1"
-      sources."@types/tough-cookie-2.3.5"
-      sources."@types/underscore-1.9.3"
+      sources."@types/tough-cookie-2.3.6"
+      sources."@types/underscore-1.9.4"
       sources."@types/websocket-0.0.40"
-      sources."@types/ws-6.0.3"
-      sources."@types/yargs-13.0.3"
-      sources."@types/yargs-parser-13.1.0"
+      sources."@types/ws-6.0.4"
+      sources."@types/yargs-13.0.8"
+      sources."@types/yargs-parser-15.0.0"
       sources."@webassemblyjs/ast-1.8.5"
       sources."@webassemblyjs/floating-point-hex-parser-1.8.5"
       sources."@webassemblyjs/helper-api-error-1.8.5"
@@ -9943,7 +10005,7 @@ in
       sources."@webassemblyjs/wast-printer-1.8.5"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
-      sources."abab-2.0.2"
+      sources."abab-2.0.3"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       sources."acorn-3.3.0"
@@ -9954,7 +10016,7 @@ in
       })
       sources."acorn-walk-6.2.0"
       sources."aggregate-error-1.0.0"
-      sources."ajv-6.10.2"
+      sources."ajv-6.12.0"
       sources."ajv-errors-1.0.1"
       sources."ajv-keywords-3.4.1"
       sources."align-text-0.1.4"
@@ -9988,15 +10050,15 @@ in
       sources."assert-plus-1.0.0"
       sources."assign-symbols-1.0.0"
       sources."astral-regex-1.0.0"
-      sources."async-1.5.2"
+      sources."async-2.6.3"
       sources."async-each-1.0.3"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
       sources."awesome-typescript-loader-5.2.1"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.8.0"
-      sources."axios-0.19.0"
+      sources."aws4-1.9.1"
+      sources."axios-0.19.2"
       sources."babel-6.23.0"
       (sources."babel-code-frame-6.26.0" // {
         dependencies = [
@@ -10099,7 +10161,8 @@ in
       sources."bfj-6.1.2"
       sources."big.js-5.2.2"
       sources."binary-extensions-1.13.1"
-      sources."bluebird-3.7.0"
+      sources."bindings-1.5.0"
+      sources."bluebird-3.7.2"
       sources."bn.js-4.11.8"
       (sources."body-parser-1.19.0" // {
         dependencies = [
@@ -10118,7 +10181,7 @@ in
       sources."brace-expansion-1.1.11"
       sources."braces-2.3.2"
       sources."brorand-1.1.0"
-      sources."browser-process-hrtime-0.1.3"
+      sources."browser-process-hrtime-1.0.0"
       (sources."browser-resolve-1.11.3" // {
         dependencies = [
           sources."resolve-1.1.7"
@@ -10132,8 +10195,8 @@ in
       sources."browserify-zlib-0.2.0"
       sources."browserslist-3.2.8"
       sources."bs-logger-0.2.6"
-      sources."bser-2.1.0"
-      sources."buffer-4.9.1"
+      sources."bser-2.1.1"
+      sources."buffer-4.9.2"
       sources."buffer-from-1.1.1"
       sources."buffer-indexof-1.1.1"
       sources."buffer-xor-1.0.3"
@@ -10156,7 +10219,7 @@ in
       })
       sources."callsites-3.1.0"
       sources."camelcase-1.2.1"
-      sources."caniuse-lite-1.0.30000999"
+      sources."caniuse-lite-1.0.30001035"
       sources."capture-exit-2.0.0"
       sources."caseless-0.12.0"
       sources."center-align-0.1.3"
@@ -10168,7 +10231,7 @@ in
           sources."normalize-path-3.0.0"
         ];
       })
-      sources."chownr-1.1.3"
+      sources."chownr-1.1.4"
       sources."chrome-trace-event-1.0.2"
       sources."ci-info-2.0.0"
       sources."cipher-base-1.0.4"
@@ -10180,7 +10243,6 @@ in
               sources."kind-of-3.2.2"
             ];
           })
-          sources."is-buffer-1.1.6"
           (sources."is-data-descriptor-0.1.4" // {
             dependencies = [
               sources."kind-of-3.2.2"
@@ -10190,7 +10252,7 @@ in
           sources."kind-of-5.1.0"
         ];
       })
-      sources."clean-css-4.2.1"
+      sources."clean-css-4.2.3"
       sources."clean-stack-1.3.0"
       sources."cli-cursor-2.1.0"
       sources."cli-spinners-2.2.0"
@@ -10205,10 +10267,10 @@ in
       sources."color-name-1.1.3"
       sources."combined-stream-1.0.8"
       sources."command-line-args-5.1.1"
-      sources."commander-2.20.1"
+      sources."commander-2.20.3"
       sources."commondir-1.0.1"
       sources."component-emitter-1.3.0"
-      sources."compressible-2.0.17"
+      sources."compressible-2.0.18"
       (sources."compression-1.7.4" // {
         dependencies = [
           sources."bytes-3.0.0"
@@ -10221,7 +10283,7 @@ in
       sources."condense-newlines-0.2.1"
       sources."config-chain-1.1.12"
       sources."connect-history-api-fallback-1.6.0"
-      sources."console-browserify-1.1.0"
+      sources."console-browserify-1.2.0"
       sources."consolidate-0.15.1"
       sources."constantinople-3.1.2"
       sources."constants-browserify-1.0.0"
@@ -10231,14 +10293,18 @@ in
         ];
       })
       sources."content-type-1.0.4"
-      (sources."convert-source-map-1.6.0" // {
+      (sources."convert-source-map-1.7.0" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
         ];
       })
       sources."cookie-0.4.0"
       sources."cookie-signature-1.0.6"
-      sources."cookies-0.7.3"
+      (sources."cookies-0.8.0" // {
+        dependencies = [
+          sources."depd-2.0.0"
+        ];
+      })
       sources."copy-concurrently-1.0.5"
       sources."copy-descriptor-0.1.1"
       (sources."copy-webpack-plugin-4.6.0" // {
@@ -10247,12 +10313,12 @@ in
           sources."p-try-1.0.0"
         ];
       })
-      sources."core-js-2.6.9"
+      sources."core-js-2.6.11"
       sources."core-util-is-1.0.2"
       sources."create-ecdh-4.0.3"
       sources."create-hash-1.2.0"
       sources."create-hmac-1.1.7"
-      sources."cron-1.7.2"
+      sources."cron-1.8.2"
       sources."cross-spawn-6.0.5"
       sources."crypto-browserify-3.12.0"
       sources."cssom-0.3.8"
@@ -10262,10 +10328,9 @@ in
       sources."dashdash-1.14.1"
       (sources."data-urls-1.1.0" // {
         dependencies = [
-          sources."whatwg-url-7.0.0"
+          sources."whatwg-url-7.1.0"
         ];
       })
-      sources."date-now-0.1.4"
       sources."debug-3.1.0"
       sources."decamelize-1.2.0"
       sources."decode-uri-component-0.2.0"
@@ -10289,7 +10354,7 @@ in
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
       sources."depd-1.1.2"
-      sources."des.js-1.0.0"
+      sources."des.js-1.0.1"
       sources."destroy-1.0.4"
       sources."detect-file-1.0.0"
       sources."detect-indent-4.0.0"
@@ -10315,37 +10380,37 @@ in
         ];
       })
       sources."ee-first-1.1.1"
-      sources."ejs-2.7.1"
-      sources."electron-to-chromium-1.3.275"
-      sources."elliptic-6.5.1"
+      sources."ejs-2.7.4"
+      sources."electron-to-chromium-1.3.376"
+      sources."elliptic-6.5.2"
       sources."emoji-regex-7.0.3"
-      sources."emojis-list-2.1.0"
+      sources."emojis-list-3.0.0"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
-      sources."enhanced-resolve-4.1.0"
+      sources."enhanced-resolve-4.1.1"
       sources."errno-0.1.7"
       sources."error-ex-1.3.2"
       sources."error-inject-1.0.0"
-      sources."es-abstract-1.15.0"
-      sources."es-to-primitive-1.2.0"
-      sources."es5-ext-0.10.51"
+      sources."es-abstract-1.17.4"
+      sources."es-to-primitive-1.2.1"
+      sources."es5-ext-0.10.53"
       sources."es6-iterator-2.0.3"
       sources."es6-promise-4.2.8"
-      sources."es6-symbol-3.1.2"
+      sources."es6-symbol-3.1.3"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
-      sources."escodegen-1.12.0"
+      sources."escodegen-1.14.1"
       sources."eslint-scope-4.0.3"
-      sources."esprima-3.1.3"
+      sources."esprima-4.0.1"
       sources."esrecurse-4.2.1"
       sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
       sources."etag-1.8.1"
       sources."eventemitter3-4.0.0"
-      sources."events-3.0.0"
+      sources."events-3.1.0"
       sources."eventsource-1.0.7"
       sources."evp_bytestokey-1.0.3"
-      sources."exec-sh-0.3.2"
+      sources."exec-sh-0.3.4"
       sources."execa-1.0.0"
       sources."exit-0.1.2"
       (sources."expand-brackets-2.1.4" // {
@@ -10357,7 +10422,6 @@ in
               sources."kind-of-3.2.2"
             ];
           })
-          sources."is-buffer-1.1.6"
           (sources."is-data-descriptor-0.1.4" // {
             dependencies = [
               sources."kind-of-3.2.2"
@@ -10377,6 +10441,11 @@ in
           sources."safe-buffer-5.1.2"
         ];
       })
+      (sources."ext-1.4.0" // {
+        dependencies = [
+          sources."type-2.0.0"
+        ];
+      })
       sources."extend-3.0.2"
       sources."extend-shallow-2.0.1"
       (sources."extglob-2.0.4" // {
@@ -10385,12 +10454,13 @@ in
         ];
       })
       sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-2.0.1"
-      sources."fast-json-stable-stringify-2.0.0"
+      sources."fast-deep-equal-3.1.1"
+      sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-2.0.6"
       sources."faye-websocket-0.10.0"
-      sources."fb-watchman-2.0.0"
+      sources."fb-watchman-2.0.1"
       sources."figgy-pudding-3.5.1"
+      sources."file-uri-to-path-1.0.0"
       sources."filesize-3.6.1"
       sources."fill-range-4.0.0"
       (sources."finalhandler-1.1.2" // {
@@ -10407,15 +10477,16 @@ in
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
-      sources."formidable-1.2.1"
+      sources."formidable-1.2.2"
       sources."forwarded-0.1.2"
       sources."fragment-cache-0.2.1"
       sources."fresh-0.5.2"
       sources."from2-2.3.0"
       sources."fs-write-stream-atomic-1.0.10"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.2.9"
+      sources."fsevents-1.2.11"
       sources."function-bind-1.1.1"
+      sources."gensync-1.0.0-beta.1"
       sources."get-caller-file-2.0.5"
       (sources."get-paths-0.0.7" // {
         dependencies = [
@@ -10425,7 +10496,7 @@ in
       sources."get-stream-4.1.0"
       sources."get-value-2.0.6"
       sources."getpass-0.1.7"
-      sources."glob-7.1.4"
+      sources."glob-7.1.6"
       (sources."glob-parent-3.1.0" // {
         dependencies = [
           sources."is-glob-3.1.0"
@@ -10434,7 +10505,7 @@ in
       (sources."global-modules-2.0.0" // {
         dependencies = [
           sources."global-prefix-3.0.0"
-          sources."kind-of-6.0.2"
+          sources."kind-of-6.0.3"
         ];
       })
       sources."global-prefix-1.0.2"
@@ -10445,7 +10516,7 @@ in
           sources."get-stream-3.0.0"
         ];
       })
-      sources."graceful-fs-4.2.2"
+      sources."graceful-fs-4.2.3"
       sources."growly-1.3.0"
       (sources."gzip-size-5.1.1" // {
         dependencies = [
@@ -10453,11 +10524,6 @@ in
         ];
       })
       sources."handle-thing-2.0.0"
-      (sources."handlebars-4.4.2" // {
-        dependencies = [
-          sources."uglify-js-3.6.0"
-        ];
-      })
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       sources."has-1.0.3"
@@ -10468,12 +10534,11 @@ in
       })
       sources."has-flag-3.0.0"
       sources."has-symbol-support-x-1.4.2"
-      sources."has-symbols-1.0.0"
+      sources."has-symbols-1.0.1"
       sources."has-to-string-tag-x-1.4.1"
       sources."has-value-1.0.0"
       (sources."has-values-1.0.0" // {
         dependencies = [
-          sources."is-buffer-1.1.6"
           sources."kind-of-4.0.0"
         ];
       })
@@ -10483,10 +10548,11 @@ in
       sources."home-or-tmp-2.0.0"
       sources."homedir-polyfill-1.0.3"
       sources."hoopy-0.1.4"
-      sources."hosted-git-info-2.8.4"
+      sources."hosted-git-info-2.8.8"
       sources."hpack.js-2.1.6"
       sources."html-encoding-sniffer-1.0.2"
       sources."html-entities-1.2.1"
+      sources."html-escaper-2.0.0"
       sources."http-assert-1.4.1"
       sources."http-cache-semantics-3.8.1"
       sources."http-deceiver-1.2.7"
@@ -10519,27 +10585,27 @@ in
       sources."invert-kv-2.0.0"
       sources."ip-1.1.5"
       sources."ip-regex-2.1.0"
-      sources."ipaddr.js-1.9.0"
+      sources."ipaddr.js-1.9.1"
       sources."is-absolute-url-3.0.3"
       (sources."is-accessor-descriptor-1.0.0" // {
         dependencies = [
-          sources."kind-of-6.0.2"
+          sources."kind-of-6.0.3"
         ];
       })
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-1.0.1"
-      sources."is-buffer-2.0.4"
-      sources."is-callable-1.1.4"
+      sources."is-buffer-1.1.6"
+      sources."is-callable-1.1.5"
       sources."is-ci-2.0.0"
       (sources."is-data-descriptor-1.0.0" // {
         dependencies = [
-          sources."kind-of-6.0.2"
+          sources."kind-of-6.0.3"
         ];
       })
-      sources."is-date-object-1.0.1"
+      sources."is-date-object-1.0.2"
       (sources."is-descriptor-1.0.2" // {
         dependencies = [
-          sources."kind-of-6.0.2"
+          sources."kind-of-6.0.3"
         ];
       })
       (sources."is-expression-3.0.0" // {
@@ -10549,7 +10615,7 @@ in
       })
       sources."is-extendable-0.1.1"
       sources."is-extglob-2.1.1"
-      sources."is-finite-1.0.2"
+      sources."is-finite-1.1.0"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-generator-fn-2.1.0"
       sources."is-generator-function-1.0.7"
@@ -10562,10 +10628,10 @@ in
       sources."is-plain-obj-1.1.0"
       sources."is-plain-object-2.0.4"
       sources."is-promise-2.1.0"
-      sources."is-regex-1.0.4"
+      sources."is-regex-1.0.5"
       sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
-      sources."is-symbol-1.0.2"
+      sources."is-symbol-1.0.3"
       sources."is-typedarray-1.0.0"
       sources."is-whitespace-0.3.0"
       sources."is-windows-1.0.2"
@@ -10596,14 +10662,14 @@ in
           sources."pify-4.0.1"
         ];
       })
-      sources."istanbul-reports-2.2.6"
+      sources."istanbul-reports-2.2.7"
       sources."isurl-1.0.0"
       sources."jest-24.9.0"
       sources."jest-changed-files-24.9.0"
       (sources."jest-cli-24.9.0" // {
         dependencies = [
           sources."cliui-5.0.0"
-          sources."yargs-13.3.0"
+          sources."yargs-13.3.2"
         ];
       })
       sources."jest-config-24.9.0"
@@ -10632,7 +10698,7 @@ in
         dependencies = [
           sources."cliui-5.0.0"
           sources."slash-2.0.0"
-          sources."yargs-13.3.0"
+          sources."yargs-13.3.2"
         ];
       })
       sources."jest-serializer-24.9.0"
@@ -10657,21 +10723,17 @@ in
           sources."supports-color-6.1.0"
         ];
       })
-      sources."js-beautify-1.10.2"
+      sources."js-beautify-1.10.3"
       sources."js-stringify-1.0.2"
       sources."js-tokens-3.0.2"
-      (sources."js-yaml-3.13.1" // {
-        dependencies = [
-          sources."esprima-4.0.1"
-        ];
-      })
+      sources."js-yaml-3.13.1"
       sources."jsbn-0.1.1"
       (sources."jsdom-11.12.0" // {
         dependencies = [
-          sources."acorn-5.7.3"
+          sources."acorn-5.7.4"
           (sources."acorn-globals-4.3.4" // {
             dependencies = [
-              sources."acorn-6.3.0"
+              sources."acorn-6.4.1"
             ];
           })
           sources."ws-5.2.2"
@@ -10686,22 +10748,18 @@ in
       sources."json3-3.3.3"
       (sources."json5-1.0.1" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
         ];
       })
       sources."jsonpath-plus-0.19.0"
       sources."jsprim-1.4.1"
       sources."jstransformer-1.0.0"
-      sources."keygrip-1.0.3"
+      sources."keygrip-1.1.0"
       sources."keyv-3.0.0"
       sources."killable-1.0.1"
-      (sources."kind-of-3.2.2" // {
-        dependencies = [
-          sources."is-buffer-1.1.6"
-        ];
-      })
+      sources."kind-of-3.2.2"
       sources."kleur-3.0.3"
-      sources."koa-2.8.2"
+      sources."koa-2.11.0"
       sources."koa-body-4.1.1"
       sources."koa-compose-4.1.0"
       (sources."koa-convert-1.2.0" // {
@@ -10709,7 +10767,6 @@ in
           sources."koa-compose-3.2.1"
         ];
       })
-      sources."koa-is-json-1.0.0"
       (sources."koa-router-7.4.0" // {
         dependencies = [
           sources."koa-compose-3.2.1"
@@ -10730,7 +10787,7 @@ in
       sources."levn-0.3.0"
       sources."load-json-file-4.0.0"
       sources."loader-runner-2.4.0"
-      sources."loader-utils-1.2.3"
+      sources."loader-utils-1.4.0"
       sources."locate-path-3.0.0"
       sources."lodash-4.17.15"
       sources."lodash.camelcase-4.3.0"
@@ -10738,7 +10795,7 @@ in
       sources."lodash.memoize-4.1.2"
       sources."lodash.sortby-4.7.0"
       sources."log-symbols-2.2.0"
-      sources."loglevel-1.6.4"
+      sources."loglevel-1.6.7"
       sources."loglevelnext-1.0.5"
       sources."long-4.0.0"
       sources."longest-1.0.1"
@@ -10746,7 +10803,7 @@ in
       sources."lowercase-keys-1.0.1"
       sources."lru-cache-5.1.1"
       sources."make-dir-1.3.0"
-      sources."make-error-1.3.5"
+      sources."make-error-1.3.6"
       sources."makeerror-1.0.11"
       sources."mamacro-0.0.3"
       sources."map-age-cleaner-0.1.3"
@@ -10760,7 +10817,7 @@ in
           sources."p-is-promise-2.1.0"
         ];
       })
-      sources."memory-fs-0.4.1"
+      sources."memory-fs-0.5.0"
       sources."merge-descriptors-1.0.1"
       sources."merge-stream-2.0.0"
       sources."methods-1.1.2"
@@ -10768,13 +10825,13 @@ in
         dependencies = [
           sources."extend-shallow-3.0.2"
           sources."is-extendable-1.0.1"
-          sources."kind-of-6.0.2"
+          sources."kind-of-6.0.3"
         ];
       })
       sources."miller-rabin-4.0.1"
       sources."mime-1.6.0"
-      sources."mime-db-1.40.0"
-      sources."mime-types-2.1.24"
+      sources."mime-db-1.43.0"
+      sources."mime-types-2.1.26"
       sources."mimic-fn-1.2.0"
       sources."mimic-response-1.0.1"
       sources."minimalistic-assert-1.0.1"
@@ -10793,7 +10850,7 @@ in
       })
       sources."mkdirp-0.5.1"
       sources."moment-2.24.0"
-      sources."moment-timezone-0.5.26"
+      sources."moment-timezone-0.5.28"
       sources."move-concurrently-1.0.1"
       sources."ms-2.0.0"
       sources."multicast-dns-6.2.3"
@@ -10804,7 +10861,7 @@ in
         dependencies = [
           sources."extend-shallow-3.0.2"
           sources."is-extendable-1.0.1"
-          sources."kind-of-6.0.2"
+          sources."kind-of-6.0.3"
         ];
       })
       sources."natural-compare-1.4.0"
@@ -10822,13 +10879,13 @@ in
       })
       sources."node-modules-regexp-1.0.0"
       sources."node-notifier-5.4.3"
-      sources."nopt-4.0.1"
+      sources."nopt-4.0.3"
       sources."normalize-package-data-2.5.0"
       sources."normalize-path-2.1.1"
       sources."normalize-url-2.0.1"
       sources."npm-run-path-2.0.2"
       sources."number-is-nan-1.0.1"
-      sources."nwsapi-2.1.4"
+      sources."nwsapi-2.2.0"
       sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
       (sources."object-copy-0.1.0" // {
@@ -10844,11 +10901,11 @@ in
         ];
       })
       sources."object-hash-1.3.1"
-      sources."object-inspect-1.6.0"
+      sources."object-inspect-1.7.0"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
       sources."object.assign-4.1.0"
-      sources."object.getownpropertydescriptors-2.0.3"
+      sources."object.getownpropertydescriptors-2.1.0"
       sources."object.pick-1.3.0"
       sources."obuf-1.1.2"
       sources."oidc-token-hash-3.0.2"
@@ -10860,12 +10917,7 @@ in
       sources."opener-1.5.1"
       sources."openid-client-2.5.0"
       sources."opn-5.5.0"
-      sources."optimist-0.6.1"
-      (sources."optionator-0.8.2" // {
-        dependencies = [
-          sources."wordwrap-1.0.0"
-        ];
-      })
+      sources."optionator-0.8.3"
       sources."ora-3.4.0"
       sources."original-1.0.2"
       sources."os-browserify-0.3.0"
@@ -10879,7 +10931,7 @@ in
       sources."p-each-series-1.0.0"
       sources."p-finally-1.0.0"
       sources."p-is-promise-1.1.0"
-      sources."p-limit-2.2.1"
+      sources."p-limit-2.2.2"
       sources."p-locate-3.0.0"
       sources."p-map-2.1.0"
       sources."p-reduce-1.0.0"
@@ -10887,7 +10939,7 @@ in
       sources."p-some-2.0.1"
       sources."p-timeout-2.0.1"
       sources."p-try-2.2.0"
-      sources."pako-1.0.10"
+      sources."pako-1.0.11"
       sources."parallel-transform-1.2.0"
       sources."parse-asn1-5.1.5"
       sources."parse-json-4.0.0"
@@ -10902,7 +10954,7 @@ in
       sources."path-is-inside-1.0.2"
       sources."path-key-2.0.1"
       sources."path-parse-1.0.6"
-      (sources."path-to-regexp-1.7.0" // {
+      (sources."path-to-regexp-1.8.0" // {
         dependencies = [
           sources."isarray-0.0.1"
         ];
@@ -10924,15 +10976,16 @@ in
         ];
       })
       sources."pn-1.1.0"
-      (sources."portfinder-1.0.24" // {
+      (sources."portfinder-1.0.25" // {
         dependencies = [
-          sources."debug-2.6.9"
+          sources."debug-3.2.6"
+          sources."ms-2.1.2"
         ];
       })
       sources."posix-character-classes-0.1.1"
       sources."prelude-ls-1.1.2"
       sources."prepend-http-2.0.0"
-      sources."prettier-1.18.2"
+      sources."prettier-1.19.1"
       sources."pretty-2.0.0"
       sources."pretty-format-24.9.0"
       sources."private-0.1.8"
@@ -10940,12 +10993,12 @@ in
       sources."process-nextick-args-2.0.1"
       sources."promise-7.3.1"
       sources."promise-inflight-1.0.1"
-      sources."prompts-2.2.1"
+      sources."prompts-2.3.1"
       sources."proto-list-1.2.4"
-      sources."proxy-addr-2.0.5"
+      sources."proxy-addr-2.0.6"
       sources."prr-1.0.1"
       sources."pseudomap-1.0.2"
-      sources."psl-1.4.0"
+      sources."psl-1.7.0"
       sources."public-encrypt-4.0.3"
       sources."pug-2.0.4"
       sources."pug-attrs-2.0.4"
@@ -10975,10 +11028,10 @@ in
       sources."randomfill-1.0.4"
       sources."range-parser-1.2.1"
       sources."raw-body-2.4.1"
-      sources."react-is-16.10.2"
+      sources."react-is-16.13.0"
       sources."read-pkg-3.0.0"
       sources."read-pkg-up-4.0.0"
-      (sources."readable-stream-2.3.6" // {
+      (sources."readable-stream-2.3.7" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
         ];
@@ -11006,13 +11059,13 @@ in
       sources."repeat-element-1.1.3"
       sources."repeat-string-1.6.1"
       sources."repeating-2.0.1"
-      sources."request-2.88.0"
-      sources."request-promise-core-1.1.2"
-      sources."request-promise-native-1.0.7"
+      sources."request-2.88.2"
+      sources."request-promise-core-1.1.3"
+      sources."request-promise-native-1.0.8"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
       sources."requires-port-1.0.0"
-      sources."resolve-1.12.0"
+      sources."resolve-1.15.1"
       sources."resolve-cwd-2.0.0"
       (sources."resolve-dir-1.0.1" // {
         dependencies = [
@@ -11037,13 +11090,13 @@ in
       sources."ripemd160-2.0.2"
       sources."rsvp-4.8.5"
       sources."run-queue-1.0.3"
-      sources."rxjs-6.5.3"
+      sources."rxjs-6.5.4"
       sources."safe-buffer-5.2.0"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
       (sources."sane-4.1.0" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
         ];
       })
       sources."sax-1.2.4"
@@ -11087,7 +11140,7 @@ in
       sources."sigmund-1.0.1"
       sources."signal-exit-3.0.2"
       sources."simple-git-1.96.0"
-      sources."sisteransi-1.0.3"
+      sources."sisteransi-1.0.4"
       sources."slash-1.0.0"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
@@ -11098,7 +11151,6 @@ in
               sources."kind-of-3.2.2"
             ];
           })
-          sources."is-buffer-1.1.6"
           (sources."is-data-descriptor-0.1.4" // {
             dependencies = [
               sources."kind-of-3.2.2"
@@ -11126,8 +11178,8 @@ in
       sources."sort-keys-2.0.0"
       sources."source-list-map-2.0.1"
       sources."source-map-0.6.1"
-      sources."source-map-resolve-0.5.2"
-      sources."source-map-support-0.5.13"
+      sources."source-map-resolve-0.5.3"
+      sources."source-map-support-0.5.16"
       sources."source-map-url-0.4.0"
       sources."spdx-correct-3.1.0"
       sources."spdx-exceptions-2.2.0"
@@ -11143,7 +11195,7 @@ in
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.2"
-          sources."readable-stream-3.4.0"
+          sources."readable-stream-3.6.0"
         ];
       })
       (sources."split-string-3.1.0" // {
@@ -11164,7 +11216,6 @@ in
               sources."kind-of-3.2.2"
             ];
           })
-          sources."is-buffer-1.1.6"
           (sources."is-data-descriptor-0.1.4" // {
             dependencies = [
               sources."kind-of-3.2.2"
@@ -11179,7 +11230,7 @@ in
       sources."stream-browserify-2.0.2"
       sources."stream-each-1.2.3"
       sources."stream-http-2.8.3"
-      sources."stream-shift-1.0.0"
+      sources."stream-shift-1.0.1"
       sources."strict-uri-encode-1.1.0"
       (sources."string-length-2.0.0" // {
         dependencies = [
@@ -11188,8 +11239,8 @@ in
         ];
       })
       sources."string-width-3.1.0"
-      sources."string.prototype.trimleft-2.1.0"
-      sources."string.prototype.trimright-2.1.0"
+      sources."string.prototype.trimleft-2.1.1"
+      sources."string.prototype.trimright-2.1.1"
       (sources."string_decoder-1.1.1" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
@@ -11201,8 +11252,8 @@ in
       sources."supports-color-5.5.0"
       sources."symbol-tree-3.2.4"
       sources."tapable-1.1.3"
-      sources."terser-4.3.8"
-      (sources."terser-webpack-plugin-1.4.1" // {
+      sources."terser-4.6.6"
+      (sources."terser-webpack-plugin-1.4.3" // {
         dependencies = [
           sources."cacache-12.0.3"
           sources."find-cache-dir-2.1.0"
@@ -11210,6 +11261,7 @@ in
           sources."mississippi-3.0.0"
           sources."pify-4.0.1"
           sources."pkg-dir-3.0.0"
+          sources."serialize-javascript-2.1.2"
           sources."ssri-6.0.1"
         ];
       })
@@ -11218,7 +11270,7 @@ in
       sources."thenify-all-1.6.0"
       sources."throat-4.1.0"
       sources."through2-2.0.5"
-      sources."thunky-1.0.3"
+      sources."thunky-1.1.0"
       sources."timed-out-4.0.1"
       sources."timers-browserify-2.0.11"
       sources."tmpl-1.0.4"
@@ -11234,23 +11286,20 @@ in
       sources."to-regex-range-2.1.1"
       sources."toidentifier-1.0.0"
       sources."token-stream-0.0.1"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."tr46-1.0.1"
       sources."trim-right-1.0.1"
       sources."tryer-1.0.1"
-      (sources."ts-jest-24.1.0" // {
+      (sources."ts-jest-24.3.0" // {
         dependencies = [
           sources."camelcase-4.1.0"
           sources."json5-2.1.1"
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
           sources."yargs-parser-10.1.0"
         ];
       })
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.1"
+      sources."tsscmp-1.0.6"
       sources."tty-browserify-0.0.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
@@ -11259,7 +11308,7 @@ in
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
       sources."typedarray-to-buffer-3.1.5"
-      sources."typescript-3.6.3"
+      sources."typescript-3.8.3"
       sources."typical-4.0.0"
       (sources."uglify-js-2.8.29" // {
         dependencies = [
@@ -11267,7 +11316,7 @@ in
         ];
       })
       sources."uglify-to-browserify-1.0.2"
-      sources."underscore-1.9.1"
+      sources."underscore-1.9.2"
       sources."union-value-1.0.1"
       sources."unique-filename-1.1.1"
       sources."unique-slug-2.0.2"
@@ -11284,7 +11333,7 @@ in
       })
       sources."upath-1.2.0"
       sources."uri-js-4.2.2"
-      sources."urijs-1.19.1"
+      sources."urijs-1.19.2"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
@@ -11301,45 +11350,52 @@ in
         ];
       })
       sources."util-deprecate-1.0.2"
-      sources."util.promisify-1.0.0"
+      sources."util.promisify-1.0.1"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.3.3"
+      sources."uuid-3.4.0"
       sources."v8-compile-cache-2.0.3"
       sources."validate-npm-package-license-3.0.4"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
-      sources."vm-browserify-1.1.0"
+      sources."vm-browserify-1.1.2"
       sources."void-elements-2.0.1"
-      sources."w3c-hr-time-1.0.1"
+      sources."w3c-hr-time-1.0.2"
       sources."walker-1.0.7"
       sources."watchpack-1.6.0"
       sources."wbuf-1.7.3"
       sources."wcwidth-1.0.1"
       sources."webidl-conversions-4.0.2"
-      (sources."webpack-4.41.0" // {
+      (sources."webpack-4.42.0" // {
         dependencies = [
-          sources."acorn-6.3.0"
+          sources."acorn-6.4.1"
+          sources."memory-fs-0.4.1"
         ];
       })
-      (sources."webpack-bundle-analyzer-3.5.2" // {
+      (sources."webpack-bundle-analyzer-3.6.1" // {
         dependencies = [
-          sources."acorn-6.3.0"
+          sources."acorn-7.1.1"
+          sources."acorn-walk-7.1.1"
         ];
       })
-      (sources."webpack-cli-3.3.9" // {
+      (sources."webpack-cli-3.3.11" // {
         dependencies = [
           sources."cliui-5.0.0"
+          sources."emojis-list-2.1.0"
+          sources."enhanced-resolve-4.1.0"
+          sources."loader-utils-1.2.3"
+          sources."memory-fs-0.4.1"
           sources."supports-color-6.1.0"
           sources."yargs-13.2.4"
         ];
       })
       (sources."webpack-dev-middleware-3.7.2" // {
         dependencies = [
+          sources."memory-fs-0.4.1"
           sources."mime-2.4.4"
           sources."webpack-log-2.0.0"
         ];
       })
-      (sources."webpack-dev-server-3.8.2" // {
+      (sources."webpack-dev-server-3.10.3" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
           sources."camelcase-5.3.1"
@@ -11376,7 +11432,7 @@ in
       })
       sources."webpack-log-1.2.0"
       sources."webpack-sources-1.4.3"
-      (sources."websocket-1.0.30" // {
+      (sources."websocket-1.0.31" // {
         dependencies = [
           sources."debug-2.6.9"
         ];
@@ -11390,6 +11446,7 @@ in
       sources."which-module-2.0.0"
       sources."window-size-0.1.0"
       sources."with-5.1.1"
+      sources."word-wrap-1.2.3"
       sources."wordwrap-0.0.2"
       sources."worker-farm-1.7.0"
       sources."wrap-ansi-5.1.0"
@@ -11402,7 +11459,7 @@ in
       sources."yaeti-0.0.6"
       sources."yallist-3.1.1"
       sources."yargs-3.10.0"
-      (sources."yargs-parser-13.1.1" // {
+      (sources."yargs-parser-13.1.2" // {
         dependencies = [
           sources."camelcase-5.3.1"
         ];
diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix
index 1ffd758ac82e..4add754b5999 100644
--- a/pkgs/development/compilers/elm/packages/node-composition.nix
+++ b/pkgs/development/compilers/elm/packages/node-composition.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix
index 60aa8e0b5719..70aa04987c68 100644
--- a/pkgs/development/compilers/elm/packages/node-packages.nix
+++ b/pkgs/development/compilers/elm/packages/node-packages.nix
@@ -1,16 +1,16 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
-    "@cnakazawa/watch-1.0.3" = {
+    "@cnakazawa/watch-1.0.4" = {
       name = "_at_cnakazawa_slash_watch";
       packageName = "@cnakazawa/watch";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.3.tgz";
-        sha512 = "r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==";
+        url = "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz";
+        sha512 = "v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==";
       };
     };
     "@nodelib/fs.scandir-2.1.3" = {
@@ -40,15 +40,6 @@ let
         sha512 = "1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==";
       };
     };
-    "@sindresorhus/is-0.14.0" = {
-      name = "_at_sindresorhus_slash_is";
-      packageName = "@sindresorhus/is";
-      version = "0.14.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz";
-        sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==";
-      };
-    };
     "@sindresorhus/is-0.7.0" = {
       name = "_at_sindresorhus_slash_is";
       packageName = "@sindresorhus/is";
@@ -58,13 +49,31 @@ let
         sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==";
       };
     };
-    "@szmarczak/http-timer-1.1.2" = {
+    "@sindresorhus/is-2.1.0" = {
+      name = "_at_sindresorhus_slash_is";
+      packageName = "@sindresorhus/is";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@sindresorhus/is/-/is-2.1.0.tgz";
+        sha512 = "lXKXfypKo644k4Da4yXkPCrwcvn6SlUW2X2zFbuflKHNjf0w9htru01bo26uMhleMXsDmnZ12eJLdrAZa9MANg==";
+      };
+    };
+    "@szmarczak/http-timer-4.0.5" = {
       name = "_at_szmarczak_slash_http-timer";
       packageName = "@szmarczak/http-timer";
-      version = "1.1.2";
+      version = "4.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz";
-        sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==";
+        url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.5.tgz";
+        sha512 = "PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ==";
+      };
+    };
+    "@types/cacheable-request-6.0.1" = {
+      name = "_at_types_slash_cacheable-request";
+      packageName = "@types/cacheable-request";
+      version = "6.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.1.tgz";
+        sha512 = "ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ==";
       };
     };
     "@types/color-name-1.1.1" = {
@@ -76,6 +85,42 @@ let
         sha512 = "rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==";
       };
     };
+    "@types/http-cache-semantics-4.0.0" = {
+      name = "_at_types_slash_http-cache-semantics";
+      packageName = "@types/http-cache-semantics";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz";
+        sha512 = "c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A==";
+      };
+    };
+    "@types/keyv-3.1.1" = {
+      name = "_at_types_slash_keyv";
+      packageName = "@types/keyv";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.1.tgz";
+        sha512 = "MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw==";
+      };
+    };
+    "@types/node-13.9.1" = {
+      name = "_at_types_slash_node";
+      packageName = "@types/node";
+      version = "13.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node/-/node-13.9.1.tgz";
+        sha512 = "E6M6N0blf/jiZx8Q3nb0vNaswQeEyn0XlupO+xN6DtJ6r6IT4nXrTry7zhIfYvFCl3/8Cu6WIysmUBKiqV0bqQ==";
+      };
+    };
+    "@types/responselike-1.0.0" = {
+      name = "_at_types_slash_responselike";
+      packageName = "@types/responselike";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz";
+        sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==";
+      };
+    };
     "accepts-1.3.7" = {
       name = "accepts";
       packageName = "accepts";
@@ -85,13 +130,13 @@ let
         sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==";
       };
     };
-    "ajv-6.11.0" = {
+    "ajv-6.12.0" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.11.0";
+      version = "6.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz";
-        sha512 = "nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==";
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz";
+        sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==";
       };
     };
     "ansi-regex-2.1.1" = {
@@ -454,6 +499,15 @@ let
         sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==";
       };
     };
+    "cacheable-lookup-2.0.0" = {
+      name = "cacheable-lookup";
+      packageName = "cacheable-lookup";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-2.0.0.tgz";
+        sha512 = "s2piO6LvA7xnL1AR03wuEdSx3BZT3tIJpZ56/lcJwzO/6DTJZlTs7X3lrvPxk6d1PlDe6PrVe2TjlUIZNFglAQ==";
+      };
+    };
     "cacheable-request-2.1.4" = {
       name = "cacheable-request";
       packageName = "cacheable-request";
@@ -463,13 +517,13 @@ let
         sha1 = "0d808801b6342ad33c91df9d0b44dc09b91e5c3d";
       };
     };
-    "cacheable-request-6.1.0" = {
+    "cacheable-request-7.0.1" = {
       name = "cacheable-request";
       packageName = "cacheable-request";
-      version = "6.1.0";
+      version = "7.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz";
-        sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==";
+        url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.1.tgz";
+        sha512 = "lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw==";
       };
     };
     "camelcase-5.3.1" = {
@@ -580,13 +634,13 @@ let
         sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==";
       };
     };
-    "chownr-1.1.3" = {
+    "chownr-1.1.4" = {
       name = "chownr";
       packageName = "chownr";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz";
-        sha512 = "i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==";
+        url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz";
+        sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==";
       };
     };
     "class-utils-0.3.6" = {
@@ -688,13 +742,13 @@ let
         sha512 = "Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==";
       };
     };
-    "compare-versions-3.5.1" = {
+    "compare-versions-3.6.0" = {
       name = "compare-versions";
       packageName = "compare-versions";
-      version = "3.5.1";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/compare-versions/-/compare-versions-3.5.1.tgz";
-        sha512 = "9fGPIB7C6AyM18CJJBHt5EnCZDG3oiTJYy0NjfIAGjKpzv0tkxWko7TNQHF5ymqm7IH03tqmeuBxtvD+Izh6mg==";
+        url = "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz";
+        sha512 = "W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==";
       };
     };
     "component-emitter-1.3.0" = {
@@ -931,6 +985,15 @@ let
         sha1 = "80a4dd323748384bfa248083622aedec982adff3";
       };
     };
+    "decompress-response-5.0.0" = {
+      name = "decompress-response";
+      packageName = "decompress-response";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decompress-response/-/decompress-response-5.0.0.tgz";
+        sha512 = "TLZWWybuxWgoW7Lykv+gq9xvzOsUjQ9tF09Tj6NSTYGMTCHNXzrPnD6Hi+TgZq19PyTAGH4Ll/NIM/eTGglnMw==";
+      };
+    };
     "deep-extend-0.6.0" = {
       name = "deep-extend";
       packageName = "deep-extend";
@@ -949,13 +1012,13 @@ let
         sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==";
       };
     };
-    "defer-to-connect-1.1.3" = {
+    "defer-to-connect-2.0.0" = {
       name = "defer-to-connect";
       packageName = "defer-to-connect";
-      version = "1.1.3";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz";
-        sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==";
+        url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.0.tgz";
+        sha512 = "bYL2d05vOSf1JEZNx5vSAtPuBMkX8K9EUutg7zlKvTqKXHt7RhWJFbmd7qakVuf13i+IkGmp6FwSsONOf6VYIg==";
       };
     };
     "define-properties-1.1.3" = {
@@ -1076,13 +1139,13 @@ let
         sha256 = "a442bce37ae37a65c1488c66e477c404da1c7f137a6668d89c4b09de845ca374";
       };
     };
-    "elm-hot-1.1.1" = {
+    "elm-hot-1.1.4" = {
       name = "elm-hot";
       packageName = "elm-hot";
-      version = "1.1.1";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/elm-hot/-/elm-hot-1.1.1.tgz";
-        sha512 = "ZHjoHd2Ev6riNXNQirj3J+GKKXXwedAUikfFBYzlVL/+3CdGs96cpZ7nhAk4c5l//Qa9ymltrqX36mOlr0pPFA==";
+        url = "https://registry.npmjs.org/elm-hot/-/elm-hot-1.1.4.tgz";
+        sha512 = "qPDP/o/Fkifriaxaf3E7hHFB5L6Ijihyg8is4A6xna6/h/zebUiNssbQrxywI2oxNUkr6W/leEu/WlIC1tmVnw==";
       };
     };
     "elm-test-0.19.1" = {
@@ -1337,13 +1400,13 @@ let
         sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==";
       };
     };
-    "fast-glob-3.1.1" = {
+    "fast-glob-3.2.2" = {
       name = "fast-glob";
       packageName = "fast-glob";
-      version = "3.1.1";
+      version = "3.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.1.1.tgz";
-        sha512 = "nTCREpBY8w8r+boyFYAx21iL6faSsQynliPHM4Uf56SbkyohCNxpVPEH9xrF5TXKy+IsjkPUHDKiUkzBVRXn9g==";
+        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz";
+        sha512 = "UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==";
       };
     };
     "fast-json-stable-stringify-2.1.0" = {
@@ -1355,13 +1418,13 @@ let
         sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==";
       };
     };
-    "fastq-1.6.0" = {
+    "fastq-1.6.1" = {
       name = "fastq";
       packageName = "fastq";
-      version = "1.6.0";
+      version = "1.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fastq/-/fastq-1.6.0.tgz";
-        sha512 = "jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA==";
+        url = "https://registry.npmjs.org/fastq/-/fastq-1.6.1.tgz";
+        sha512 = "mpIH5sKYueh3YyeJwqtVo8sORi0CgtmkVbK6kZStpQlZBYQuTzG2CZ7idSiJuA7bY0SFCWUc5WIs+oYumGCQNw==";
       };
     };
     "fb-watchman-2.0.1" = {
@@ -1706,6 +1769,15 @@ let
         sha512 = "iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg==";
       };
     };
+    "got-10.6.0" = {
+      name = "got";
+      packageName = "got";
+      version = "10.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/got/-/got-10.6.0.tgz";
+        sha512 = "3LIdJNTdCFbbJc+h/EH0V5lpNpbJ6Bfwykk21lcQvQsEcrzdi/ltCyQehFHLzJ/ka0UMH4Slg0hkYvAZN9qUDg==";
+      };
+    };
     "got-8.3.2" = {
       name = "got";
       packageName = "got";
@@ -1715,15 +1787,6 @@ let
         sha512 = "qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==";
       };
     };
-    "got-9.6.0" = {
-      name = "got";
-      packageName = "got";
-      version = "9.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-9.6.0.tgz";
-        sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==";
-      };
-    };
     "graceful-fs-4.2.3" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
@@ -1859,13 +1922,13 @@ let
         sha512 = "5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==";
       };
     };
-    "http-cache-semantics-4.0.3" = {
+    "http-cache-semantics-4.1.0" = {
       name = "http-cache-semantics";
       packageName = "http-cache-semantics";
-      version = "4.0.3";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz";
-        sha512 = "TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew==";
+        url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz";
+        sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==";
       };
     };
     "http-errors-1.6.2" = {
@@ -2021,15 +2084,6 @@ let
         sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9";
       };
     };
-    "ipaddr.js-1.9.0" = {
-      name = "ipaddr.js";
-      packageName = "ipaddr.js";
-      version = "1.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz";
-        sha512 = "M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==";
-      };
-    };
     "ipaddr.js-1.9.1" = {
       name = "ipaddr.js";
       packageName = "ipaddr.js";
@@ -2363,6 +2417,15 @@ let
         sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898";
       };
     };
+    "json-buffer-3.0.1" = {
+      name = "json-buffer";
+      packageName = "json-buffer";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz";
+        sha512 = "4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==";
+      };
+    };
     "json-schema-0.2.3" = {
       name = "json-schema";
       packageName = "json-schema";
@@ -2426,13 +2489,13 @@ let
         sha512 = "eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==";
       };
     };
-    "keyv-3.1.0" = {
+    "keyv-4.0.0" = {
       name = "keyv";
       packageName = "keyv";
-      version = "3.1.0";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz";
-        sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==";
+        url = "https://registry.npmjs.org/keyv/-/keyv-4.0.0.tgz";
+        sha512 = "U7ioE8AimvRVLfw4LffyOIRhL2xVgmE8T22L6i0BucSnBUyv4w+I7VN/zVZwRKHOI6ZRUcdMdWHQ8KSUvGpEog==";
       };
     };
     "kind-of-3.2.2" = {
@@ -2705,6 +2768,15 @@ let
         sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==";
       };
     };
+    "mimic-response-2.1.0" = {
+      name = "mimic-response";
+      packageName = "mimic-response";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz";
+        sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==";
+      };
+    };
     "minimatch-3.0.4" = {
       name = "minimatch";
       packageName = "minimatch";
@@ -2732,6 +2804,15 @@ let
         sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
       };
     };
+    "minimist-1.2.5" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "1.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
+        sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
+      };
+    };
     "minipass-2.9.0" = {
       name = "minipass";
       packageName = "minipass";
@@ -3101,13 +3182,22 @@ let
         sha512 = "HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==";
       };
     };
-    "p-cancelable-1.1.0" = {
+    "p-cancelable-2.0.0" = {
       name = "p-cancelable";
       packageName = "p-cancelable";
-      version = "1.1.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz";
-        sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==";
+        url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.0.0.tgz";
+        sha512 = "wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg==";
+      };
+    };
+    "p-event-4.1.0" = {
+      name = "p-event";
+      packageName = "p-event";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-event/-/p-event-4.1.0.tgz";
+        sha512 = "4vAd06GCsgflX4wHN1JqrMzBh/8QZ4j+rzp0cd2scXRwuBEv+QR3wrVA5aLhWDLw4y2WgDKvzWF3CCLmVM1UgA==";
       };
     };
     "p-finally-1.0.0" = {
@@ -3335,13 +3425,13 @@ let
         sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
       };
     };
-    "proxy-addr-2.0.5" = {
+    "proxy-addr-2.0.6" = {
       name = "proxy-addr";
       packageName = "proxy-addr";
-      version = "2.0.5";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz";
-        sha512 = "t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==";
+        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz";
+        sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==";
       };
     };
     "pseudomap-1.0.2" = {
@@ -3578,6 +3668,15 @@ let
         sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==";
       };
     };
+    "request-2.88.2" = {
+      name = "request";
+      packageName = "request";
+      version = "2.88.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz";
+        sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==";
+      };
+    };
     "request-promise-4.2.5" = {
       name = "request-promise";
       packageName = "request-promise";
@@ -3641,6 +3740,15 @@ let
         sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7";
       };
     };
+    "responselike-2.0.0" = {
+      name = "responselike";
+      packageName = "responselike";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz";
+        sha512 = "xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==";
+      };
+    };
     "ret-0.1.15" = {
       name = "ret";
       packageName = "ret";
@@ -3785,6 +3893,15 @@ let
         sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==";
       };
     };
+    "semver-7.1.3" = {
+      name = "semver";
+      packageName = "semver";
+      version = "7.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz";
+        sha512 = "ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==";
+      };
+    };
     "semver-regex-1.0.0" = {
       name = "semver-regex";
       packageName = "semver-regex";
@@ -4307,13 +4424,13 @@ let
         sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af";
       };
     };
-    "to-readable-stream-1.0.0" = {
+    "to-readable-stream-2.1.0" = {
       name = "to-readable-stream";
       packageName = "to-readable-stream";
-      version = "1.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz";
-        sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==";
+        url = "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-2.1.0.tgz";
+        sha512 = "o3Qa6DGg1CEXshSdvWNX2sN4QHqg03SPq7U6jPXRahlQdl5dK8oXjkU/2/sGrnOZKeGV1zLSO8qPwyKklPPE7w==";
       };
     };
     "to-regex-3.0.2" = {
@@ -4361,6 +4478,15 @@ let
         sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==";
       };
     };
+    "tough-cookie-2.5.0" = {
+      name = "tough-cookie";
+      packageName = "tough-cookie";
+      version = "2.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz";
+        sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==";
+      };
+    };
     "traverse-0.3.9" = {
       name = "traverse";
       packageName = "traverse";
@@ -4379,13 +4505,13 @@ let
         sha1 = "61dbc2d53b69ff6091a12a168fd7d433107e40f1";
       };
     };
-    "tslib-1.10.0" = {
+    "tslib-1.11.1" = {
       name = "tslib";
       packageName = "tslib";
-      version = "1.10.0";
+      version = "1.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz";
-        sha512 = "qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==";
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz";
+        sha512 = "aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==";
       };
     };
     "tunnel-agent-0.6.0" = {
@@ -4406,6 +4532,15 @@ let
         sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
       };
     };
+    "type-fest-0.10.0" = {
+      name = "type-fest";
+      packageName = "type-fest";
+      version = "0.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/type-fest/-/type-fest-0.10.0.tgz";
+        sha512 = "EUV9jo4sffrwlg8s0zDhP0T2WD3pru5Xi0+HTE3zTUmBaZNhfkite9PdSJwdXLwPVW0jnAHT56pZHIOYckPEiw==";
+      };
+    };
     "type-is-1.6.18" = {
       name = "type-is";
       packageName = "type-is";
@@ -4586,49 +4721,49 @@ let
         sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
       };
     };
-    "vscode-jsonrpc-4.0.0" = {
+    "vscode-jsonrpc-5.0.1" = {
       name = "vscode-jsonrpc";
       packageName = "vscode-jsonrpc";
-      version = "4.0.0";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz";
-        sha512 = "perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==";
+        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz";
+        sha512 = "JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A==";
       };
     };
-    "vscode-languageserver-5.2.1" = {
+    "vscode-languageserver-6.1.1" = {
       name = "vscode-languageserver";
       packageName = "vscode-languageserver";
-      version = "5.2.1";
+      version = "6.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz";
-        sha512 = "GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A==";
+        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.1.1.tgz";
+        sha512 = "DueEpkUAkD5XTR4MLYNr6bQIp/UFR0/IPApgXU3YfCBCB08u2sm9hRCs6DxYZELkk++STPjpcjksR2H8qI3cDQ==";
       };
     };
-    "vscode-languageserver-protocol-3.14.1" = {
+    "vscode-languageserver-protocol-3.15.3" = {
       name = "vscode-languageserver-protocol";
       packageName = "vscode-languageserver-protocol";
-      version = "3.14.1";
+      version = "3.15.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz";
-        sha512 = "IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==";
+        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz";
+        sha512 = "zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==";
       };
     };
-    "vscode-languageserver-types-3.14.0" = {
+    "vscode-languageserver-textdocument-1.0.1" = {
+      name = "vscode-languageserver-textdocument";
+      packageName = "vscode-languageserver-textdocument";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz";
+        sha512 = "UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA==";
+      };
+    };
+    "vscode-languageserver-types-3.15.1" = {
       name = "vscode-languageserver-types";
       packageName = "vscode-languageserver-types";
-      version = "3.14.0";
+      version = "3.15.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz";
-        sha512 = "lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==";
-      };
-    };
-    "vscode-uri-1.0.8" = {
-      name = "vscode-uri";
-      packageName = "vscode-uri";
-      version = "1.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.8.tgz";
-        sha512 = "obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ==";
+        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz";
+        sha512 = "+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ==";
       };
     };
     "vscode-uri-2.1.1" = {
@@ -4649,13 +4784,13 @@ let
         sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb";
       };
     };
-    "web-tree-sitter-0.16.0" = {
+    "web-tree-sitter-0.16.2" = {
       name = "web-tree-sitter";
       packageName = "web-tree-sitter";
-      version = "0.16.0";
+      version = "0.16.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.16.0.tgz";
-        sha512 = "ETAt+Nf9KUc6bvE8waKVpEJir9F+L80//IUyOd5/nvF+1HLb+3QoZpyOW2R1ywEaXMGOer7tOtTZfyCIR2qGzA==";
+        url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.16.2.tgz";
+        sha512 = "vxZHqu4nItCARmE+oGvTgjFBrMbhEuGI9PWYSgF4ET/nLuW3K11KQQIVhAsoGtYvTI9jdbjc/THj38P7nhYwow==";
       };
     };
     "which-1.3.1" = {
@@ -4757,15 +4892,6 @@ let
         sha512 = "o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A==";
       };
     };
-    "ws-7.2.1" = {
-      name = "ws";
-      packageName = "ws";
-      version = "7.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-7.2.1.tgz";
-        sha512 = "sucePNSafamSKoOqoNfBd8V0StlkzJKL2ZAhGQinCfNQ+oacw+Pk7lcdAElecBF2VkLNZRiIb5Oi1Q5lVUVt2A==";
-      };
-    };
     "xmlbuilder-13.0.2" = {
       name = "xmlbuilder";
       packageName = "xmlbuilder";
@@ -4811,31 +4937,31 @@ let
         sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==";
       };
     };
-    "yargs-13.3.0" = {
+    "yargs-13.3.2" = {
       name = "yargs";
       packageName = "yargs";
-      version = "13.3.0";
+      version = "13.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz";
-        sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==";
+        url = "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz";
+        sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==";
       };
     };
-    "yargs-parser-13.1.1" = {
+    "yargs-parser-13.1.2" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
-      version = "13.1.1";
+      version = "13.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz";
-        sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==";
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz";
+        sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==";
       };
     };
-    "yn-3.1.1" = {
+    "yn-4.0.0" = {
       name = "yn";
       packageName = "yn";
-      version = "3.1.1";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz";
-        sha512 = "Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==";
+        url = "https://registry.npmjs.org/yn/-/yn-4.0.0.tgz";
+        sha512 = "huWiiCS4TxKc4SfgmTwW1K7JmXPPAmuXWYy4j9qjQo4+27Kni8mGhAAi1cloRWmBe2EqcLgt3IGqQoRL/MtPgg==";
       };
     };
   };
@@ -4851,7 +4977,7 @@ in
     };
     dependencies = [
       sources."@types/color-name-1.1.1"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ansi-styles-4.2.1"
       sources."anymatch-3.1.1"
       sources."asn1-0.2.4"
@@ -4872,7 +4998,7 @@ in
       sources."chainsaw-0.1.0"
       sources."chalk-3.0.0"
       sources."chokidar-3.3.0"
-      sources."chownr-1.1.3"
+      sources."chownr-1.1.4"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
       sources."combined-stream-1.0.8"
@@ -4928,7 +5054,7 @@ in
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."minipass-2.9.0"
       sources."minizlib-1.3.3"
       (sources."mkdirp-0.5.1" // {
@@ -4959,7 +5085,7 @@ in
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."readdirp-3.2.0"
-      sources."request-2.88.0"
+      sources."request-2.88.2"
       sources."request-promise-4.2.5"
       sources."request-promise-core-1.1.3"
       sources."rimraf-2.6.3"
@@ -4976,11 +5102,7 @@ in
       sources."temp-0.9.1"
       sources."through-2.3.8"
       sources."to-regex-range-5.0.1"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."traverse-0.3.9"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
@@ -5013,7 +5135,7 @@ in
       sha512 = "dAOv+U9hXZ0IRGx19mkpCAdf5rUwoJWlzFmcR2gvOzE/QjZUSlPh3e0IIDAfGUuEF8DjfE5CTe31fNtIkkd2rQ==";
     };
     dependencies = [
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."ansi-regex-4.1.0"
       sources."ansi-styles-3.2.1"
       sources."anymatch-3.1.1"
@@ -5036,7 +5158,7 @@ in
       sources."chainsaw-0.1.0"
       sources."chalk-2.4.2"
       sources."chokidar-3.2.1"
-      sources."chownr-1.1.3"
+      sources."chownr-1.1.4"
       sources."cliui-5.0.0"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
@@ -5111,7 +5233,7 @@ in
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."minipass-2.9.0"
       sources."minizlib-1.3.3"
       (sources."mkdirp-0.5.1" // {
@@ -5144,7 +5266,7 @@ in
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."readdirp-3.1.3"
-      sources."request-2.88.0"
+      sources."request-2.88.2"
       sources."request-promise-4.2.5"
       sources."request-promise-core-1.1.3"
       sources."require-directory-2.1.1"
@@ -5170,11 +5292,7 @@ in
       })
       sources."through-2.3.8"
       sources."to-regex-range-5.0.1"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."traverse-0.3.9"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
@@ -5190,8 +5308,8 @@ in
       sources."xmlbuilder-13.0.2"
       sources."y18n-4.0.0"
       sources."yallist-3.1.1"
-      sources."yargs-13.3.0"
-      sources."yargs-parser-13.1.1"
+      sources."yargs-13.3.2"
+      sources."yargs-parser-13.1.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -5211,7 +5329,7 @@ in
       sha512 = "tLobB4Kv4X/T+mkL4Tc5G1fqnBzvCqV7Pqx/f2sJIQtSTsJcktwI01U8poiBPoo8VwE7ZRuBmApSkl6XTzrymA==";
     };
     dependencies = [
-      sources."@cnakazawa/watch-1.0.3"
+      sources."@cnakazawa/watch-1.0.4"
       sources."@sindresorhus/is-0.7.0"
       sources."accepts-1.3.7"
       sources."ansi-styles-3.2.1"
@@ -5374,7 +5492,7 @@ in
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
       sources."into-stream-3.1.0"
-      sources."ipaddr.js-1.9.0"
+      sources."ipaddr.js-1.9.1"
       sources."is-accessor-descriptor-1.0.0"
       sources."is-buffer-1.1.6"
       sources."is-callable-1.1.5"
@@ -5417,7 +5535,7 @@ in
       sources."mime-types-2.1.26"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       (sources."mixin-deep-1.3.2" // {
         dependencies = [
           sources."is-extendable-1.0.1"
@@ -5468,7 +5586,7 @@ in
       sources."posix-character-classes-0.1.1"
       sources."prepend-http-2.0.0"
       sources."process-nextick-args-2.0.1"
-      sources."proxy-addr-2.0.5"
+      sources."proxy-addr-2.0.6"
       sources."pump-3.0.0"
       sources."qs-6.7.0"
       sources."query-string-5.1.1"
@@ -5621,64 +5739,71 @@ in
   elm-upgrade = nodeEnv.buildNodePackage {
     name = "elm-upgrade";
     packageName = "elm-upgrade";
-    version = "0.19.7";
+    version = "0.19.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elm-upgrade/-/elm-upgrade-0.19.7.tgz";
-      sha512 = "/BFMWGJ0SmoFzsYb7QwKUZ7kfdimllVkRO51NokYCj9ehAts5TnuG+GLHsmVCJh1mGL4Qc0D4cgeleEwDgoCAQ==";
+      url = "https://registry.npmjs.org/elm-upgrade/-/elm-upgrade-0.19.8.tgz";
+      sha512 = "SwNzV40wu9IEe35TWR9b7F8WctIRUkpl6F3lzF0AqmYnCcKjbzrxbW6G7DYfA9ICUYjuSLcyYJKm5c86oMiH8w==";
     };
     dependencies = [
-      sources."@sindresorhus/is-0.14.0"
-      sources."@szmarczak/http-timer-1.1.2"
-      (sources."cacheable-request-6.1.0" // {
+      sources."@sindresorhus/is-2.1.0"
+      sources."@szmarczak/http-timer-4.0.5"
+      sources."@types/cacheable-request-6.0.1"
+      sources."@types/http-cache-semantics-4.0.0"
+      sources."@types/keyv-3.1.1"
+      sources."@types/node-13.9.1"
+      sources."@types/responselike-1.0.0"
+      sources."cacheable-lookup-2.0.0"
+      sources."cacheable-request-7.0.1"
+      sources."caw-2.0.1"
+      (sources."clone-response-1.0.2" // {
         dependencies = [
-          sources."get-stream-5.1.0"
-          sources."lowercase-keys-2.0.0"
+          sources."mimic-response-1.0.1"
         ];
       })
-      sources."caw-2.0.1"
-      sources."clone-response-1.0.2"
       sources."config-chain-1.1.12"
-      sources."decompress-response-3.3.0"
-      sources."defer-to-connect-1.1.3"
+      sources."decompress-response-5.0.0"
+      sources."defer-to-connect-2.0.0"
       sources."duplexer3-0.1.4"
       sources."end-of-stream-1.4.4"
       sources."fs-extra-8.1.0"
       sources."get-proxy-2.1.0"
-      sources."get-stream-4.1.0"
-      sources."got-9.6.0"
+      sources."get-stream-5.1.0"
+      sources."got-10.6.0"
       sources."graceful-fs-4.2.3"
       sources."has-symbol-support-x-1.4.2"
       sources."has-to-string-tag-x-1.4.1"
-      sources."http-cache-semantics-4.0.3"
+      sources."http-cache-semantics-4.1.0"
       sources."ini-1.3.5"
       sources."is-object-1.0.1"
       sources."isexe-2.0.0"
       sources."isurl-1.0.0"
-      sources."json-buffer-3.0.0"
+      sources."json-buffer-3.0.1"
       sources."jsonfile-4.0.0"
-      sources."keyv-3.1.0"
-      sources."lowercase-keys-1.0.1"
-      sources."mimic-response-1.0.1"
+      sources."keyv-4.0.0"
+      sources."lowercase-keys-2.0.0"
+      sources."mimic-response-2.1.0"
       sources."normalize-url-4.5.0"
       sources."npm-conf-1.1.3"
       sources."once-1.4.0"
-      sources."p-cancelable-1.1.0"
+      sources."p-cancelable-2.0.0"
+      sources."p-event-4.1.0"
+      sources."p-finally-1.0.0"
+      sources."p-timeout-2.0.1"
       sources."pify-3.0.0"
-      sources."prepend-http-2.0.0"
       sources."proto-list-1.2.4"
       sources."pump-3.0.0"
-      sources."responselike-1.0.2"
+      sources."responselike-2.0.0"
       sources."safe-buffer-5.2.0"
       sources."safename-1.0.2"
-      sources."semver-6.3.0"
-      sources."to-readable-stream-1.0.0"
+      sources."semver-7.1.3"
+      sources."to-readable-stream-2.1.0"
       sources."tunnel-agent-0.6.0"
+      sources."type-fest-0.10.0"
       sources."universalify-0.1.2"
-      sources."url-parse-lax-3.0.0"
       sources."url-to-options-1.0.1"
       sources."which-2.0.2"
       sources."wrappy-1.0.2"
-      sources."yn-3.1.1"
+      sources."yn-4.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -5700,7 +5825,7 @@ in
     };
     dependencies = [
       sources."accepts-1.3.7"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."array-flatten-1.1.1"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
@@ -5777,7 +5902,7 @@ in
       sources."http-signature-1.2.0"
       sources."iconv-lite-0.4.24"
       sources."inherits-2.0.3"
-      sources."ipaddr.js-1.9.0"
+      sources."ipaddr.js-1.9.1"
       sources."is-stream-1.1.0"
       sources."is-typedarray-1.0.0"
       sources."is-wsl-1.1.0"
@@ -5810,7 +5935,7 @@ in
       sources."path-to-regexp-0.1.7"
       sources."performance-now-2.1.0"
       sources."process-nextick-args-1.0.7"
-      sources."proxy-addr-2.0.5"
+      sources."proxy-addr-2.0.6"
       sources."psl-1.7.0"
       sources."punycode-2.1.1"
       sources."qs-6.7.0"
@@ -5879,10 +6004,10 @@ in
   elm-live = nodeEnv.buildNodePackage {
     name = "elm-live";
     packageName = "elm-live";
-    version = "4.0.1";
+    version = "4.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elm-live/-/elm-live-4.0.1.tgz";
-      sha512 = "IlonaC1pO/QoXlOrwwrJaxyvpJAT8QDSfzenkChbhU1PC1fJetkj2TwZfki+y1ZxpSMTnMSomMraOdWA6DO3VQ==";
+      url = "https://registry.npmjs.org/elm-live/-/elm-live-4.0.2.tgz";
+      sha512 = "4I3UvJxF6MubC14VsgtV11B0zBxaaKtdKKsWquoaa5a3UHBIGW83qgTnt/NxOj4omOLfupaftmDaE4yRMTgTcw==";
     };
     dependencies = [
       sources."ansi-regex-2.1.1"
@@ -5903,7 +6028,7 @@ in
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
       sources."ee-first-1.1.1"
-      sources."elm-hot-1.1.1"
+      sources."elm-hot-1.1.4"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
       sources."es6-promisify-6.0.2"
@@ -6008,7 +6133,7 @@ in
     };
     dependencies = [
       sources."bluebird-3.7.2"
-      sources."compare-versions-3.5.1"
+      sources."compare-versions-3.6.0"
       sources."core-util-is-1.0.2"
       sources."fs-extra-6.0.1"
       sources."graceful-fs-4.2.3"
@@ -6016,7 +6141,7 @@ in
       sources."isarray-1.0.0"
       sources."jsonfile-4.0.0"
       sources."klaw-2.1.1"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       sources."process-nextick-args-2.0.1"
       sources."readable-stream-2.3.7"
       sources."safe-buffer-5.1.2"
@@ -6046,17 +6171,17 @@ in
   "@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage {
     name = "_at_elm-tooling_slash_elm-language-server";
     packageName = "@elm-tooling/elm-language-server";
-    version = "1.5.0";
+    version = "1.6.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.5.0.tgz";
-      sha512 = "xyO0Su4pAL4jAM09Hn8YEx8D3xqxUHvyLtTxSLos+bgmKXQd4gSbXi76En3EUfRIEQlgtzB/ywvCZe3zJApNxw==";
+      url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.6.3.tgz";
+      sha512 = "8liKU5tfKrldgNtE8GNGEUlZM+o7Qfjycn3gnyzzKqWEBCjkxeuU6VwWaIozw5k/xfJqHcIDb5nFPsqEadO5Ig==";
     };
     dependencies = [
       sources."@nodelib/fs.scandir-2.1.3"
       sources."@nodelib/fs.stat-2.0.3"
       sources."@nodelib/fs.walk-1.2.4"
       sources."accepts-1.3.7"
-      sources."ajv-6.11.0"
+      sources."ajv-6.12.0"
       sources."array-flatten-1.1.1"
       sources."array-union-2.1.0"
       sources."asn1-0.2.4"
@@ -6088,12 +6213,7 @@ in
       sources."dir-glob-3.0.1"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      (sources."elm-analyse-git://github.com/elm-tooling/elm-analyse#1a665a6e540d7d11b29b3c5e3c52089704325d9c" // {
-        dependencies = [
-          sources."ultron-1.1.1"
-          sources."ws-3.3.1"
-        ];
-      })
+      sources."elm-analyse-git://github.com/elm-tooling/elm-analyse#1a665a6e540d7d11b29b3c5e3c52089704325d9c"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
       sources."escape-html-1.0.3"
@@ -6130,9 +6250,9 @@ in
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.1"
       sources."fast-diff-1.2.0"
-      sources."fast-glob-3.1.1"
+      sources."fast-glob-3.2.2"
       sources."fast-json-stable-stringify-2.1.0"
-      sources."fastq-1.6.0"
+      sources."fastq-1.6.1"
       sources."fill-range-7.0.1"
       (sources."finalhandler-1.1.1" // {
         dependencies = [
@@ -6158,7 +6278,7 @@ in
       sources."iconv-lite-0.4.24"
       sources."ignore-5.1.4"
       sources."inherits-2.0.3"
-      sources."ipaddr.js-1.9.0"
+      sources."ipaddr.js-1.9.1"
       sources."is-extglob-2.1.1"
       sources."is-glob-4.0.1"
       sources."is-number-7.0.0"
@@ -6206,7 +6326,7 @@ in
       sources."picomatch-2.2.1"
       sources."pjson-1.0.9"
       sources."process-nextick-args-1.0.7"
-      sources."proxy-addr-2.0.5"
+      sources."proxy-addr-2.0.6"
       sources."psl-1.7.0"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
@@ -6254,7 +6374,7 @@ in
         ];
       })
       sources."traverse-chain-0.1.0"
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.1"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.18"
@@ -6267,19 +6387,20 @@ in
       sources."uuid-3.4.0"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
-      sources."vscode-jsonrpc-4.0.0"
-      (sources."vscode-languageserver-5.2.1" // {
-        dependencies = [
-          sources."vscode-uri-1.0.8"
-        ];
-      })
-      sources."vscode-languageserver-protocol-3.14.1"
-      sources."vscode-languageserver-types-3.14.0"
+      sources."vscode-jsonrpc-5.0.1"
+      sources."vscode-languageserver-6.1.1"
+      sources."vscode-languageserver-protocol-3.15.3"
+      sources."vscode-languageserver-textdocument-1.0.1"
+      sources."vscode-languageserver-types-3.15.1"
       sources."vscode-uri-2.1.1"
-      sources."web-tree-sitter-0.16.0"
+      sources."web-tree-sitter-0.16.2"
       sources."which-2.0.2"
       sources."wrappy-1.0.2"
-      sources."ws-7.2.1"
+      (sources."ws-3.3.1" // {
+        dependencies = [
+          sources."ultron-1.1.1"
+        ];
+      })
       sources."xtend-4.0.2"
     ];
     buildInputs = globalBuildInputs;
diff --git a/pkgs/development/misc/google-clasp/google-clasp.nix b/pkgs/development/misc/google-clasp/google-clasp.nix
index c2a2412d3d76..a527491777bc 100644
--- a/pkgs/development/misc/google-clasp/google-clasp.nix
+++ b/pkgs/development/misc/google-clasp/google-clasp.nix
@@ -1,8 +1,8 @@
-# This file has been generated by node2nix 1.6.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
 
 let
   nodeEnv = import ../../node-packages/node-env.nix {
diff --git a/pkgs/development/misc/google-clasp/node-packages.nix b/pkgs/development/misc/google-clasp/node-packages.nix
index 6c51318c9ebf..646729032cd3 100644
--- a/pkgs/development/misc/google-clasp/node-packages.nix
+++ b/pkgs/development/misc/google-clasp/node-packages.nix
@@ -1,34 +1,34 @@
-# This file has been generated by node2nix 1.6.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
-    "@nodelib/fs.scandir-2.1.1" = {
+    "@nodelib/fs.scandir-2.1.3" = {
       name = "_at_nodelib_slash_fs.scandir";
       packageName = "@nodelib/fs.scandir";
-      version = "2.1.1";
+      version = "2.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.1.tgz";
-        sha512 = "NT/skIZjgotDSiXs0WqYhgcuBKhUMgfekCmCGtkUAiLqZdOnrdjmZr9wRl3ll64J9NF79uZ4fk16Dx0yMc/Xbg==";
+        url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz";
+        sha512 = "eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==";
       };
     };
-    "@nodelib/fs.stat-2.0.1" = {
+    "@nodelib/fs.stat-2.0.3" = {
       name = "_at_nodelib_slash_fs.stat";
       packageName = "@nodelib/fs.stat";
-      version = "2.0.1";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.1.tgz";
-        sha512 = "+RqhBlLn6YRBGOIoVYthsG0J9dfpO79eJyN7BYBkZJtfqrBwf2KK+rD/M/yjZR6WBmIhAgOV7S60eCgaSWtbFw==";
+        url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz";
+        sha512 = "bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==";
       };
     };
-    "@nodelib/fs.walk-1.2.2" = {
+    "@nodelib/fs.walk-1.2.4" = {
       name = "_at_nodelib_slash_fs.walk";
       packageName = "@nodelib/fs.walk";
-      version = "1.2.2";
+      version = "1.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.2.tgz";
-        sha512 = "J/DR3+W12uCzAJkw7niXDcqcKBg6+5G5Q/ZpThpGNzAUz70eOR6RV4XnnSN01qHZiVl0eavoxJsBypQoKsV2QQ==";
+        url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz";
+        sha512 = "1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==";
       };
     };
     "@sindresorhus/is-0.14.0" = {
@@ -76,13 +76,13 @@ let
         sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==";
       };
     };
-    "@types/node-12.7.2" = {
+    "@types/node-13.9.1" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "12.7.2";
+      version = "13.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-12.7.2.tgz";
-        sha512 = "dyYO+f6ihZEtNPDcWNR1fkoTDf3zAK3lAABDze3mz6POyIercH0lEUawUFXlG8xaQZmm1yEBON/4TsYv/laDYg==";
+        url = "https://registry.npmjs.org/@types/node/-/node-13.9.1.tgz";
+        sha512 = "E6M6N0blf/jiZx8Q3nb0vNaswQeEyn0XlupO+xN6DtJ6r6IT4nXrTry7zhIfYvFCl3/8Cu6WIysmUBKiqV0bqQ==";
       };
     };
     "abort-controller-3.0.0" = {
@@ -94,22 +94,22 @@ let
         sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==";
       };
     };
-    "agent-base-4.3.0" = {
+    "agent-base-6.0.0" = {
       name = "agent-base";
       packageName = "agent-base";
-      version = "4.3.0";
+      version = "6.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz";
-        sha512 = "salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==";
+        url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.0.tgz";
+        sha512 = "j1Q7cSCqN+AwrmDd+pzgqc0/NpC655x2bUf5ZjRIO77DcNBFmh+OgRNzF6OKdCC9RSCb19fGd99+bhXFdkRNqw==";
       };
     };
-    "aggregate-error-3.0.0" = {
+    "aggregate-error-3.0.1" = {
       name = "aggregate-error";
       packageName = "aggregate-error";
-      version = "3.0.0";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.0.tgz";
-        sha512 = "yKD9kEoJIR+2IFqhMwayIBgheLYbB3PS2OBhWae1L/ODTd/JF/30cW0bc9TqzRL3k4U41Dieu3BF4I29p8xesA==";
+        url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz";
+        sha512 = "quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==";
       };
     };
     "ansi-escapes-3.2.0" = {
@@ -121,13 +121,13 @@ let
         sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==";
       };
     };
-    "ansi-escapes-4.2.1" = {
-      name = "ansi-escapes";
-      packageName = "ansi-escapes";
-      version = "4.2.1";
+    "ansi-regex-3.0.0" = {
+      name = "ansi-regex";
+      packageName = "ansi-regex";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.2.1.tgz";
-        sha512 = "Cg3ymMAdN10wOk/VYfLV7KCQyv7EDirJ64500sU7n9UlmioEtDuU5Gd+hj73hXSU/ex7tHJSssmyftDdkMLO8Q==";
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz";
+        sha1 = "ed0317c322064f79466c02966bddb605ab37d998";
       };
     };
     "ansi-regex-4.1.0" = {
@@ -265,13 +265,13 @@ let
         sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==";
       };
     };
-    "cli-cursor-3.1.0" = {
+    "cli-cursor-2.1.0" = {
       name = "cli-cursor";
       packageName = "cli-cursor";
-      version = "3.1.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz";
-        sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==";
+        url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz";
+        sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5";
       };
     };
     "cli-spinner-0.2.10" = {
@@ -319,13 +319,13 @@ let
         sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25";
       };
     };
-    "commander-2.20.0" = {
+    "commander-2.20.3" = {
       name = "commander";
       packageName = "commander";
-      version = "2.20.0";
+      version = "2.20.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz";
-        sha512 = "7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==";
+        url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz";
+        sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==";
       };
     };
     "concat-map-0.0.1" = {
@@ -337,13 +337,13 @@ let
         sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
       };
     };
-    "debug-3.2.6" = {
+    "debug-4.1.1" = {
       name = "debug";
       packageName = "debug";
-      version = "3.2.6";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz";
-        sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==";
+        url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz";
+        sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==";
       };
     };
     "decompress-response-3.3.0" = {
@@ -355,13 +355,13 @@ let
         sha1 = "80a4dd323748384bfa248083622aedec982adff3";
       };
     };
-    "defer-to-connect-1.0.2" = {
+    "defer-to-connect-1.1.3" = {
       name = "defer-to-connect";
       packageName = "defer-to-connect";
-      version = "1.0.2";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.0.2.tgz";
-        sha512 = "k09hcQcTDY+cwgiwa6PYKLm3jlagNzQ+RSvhjzESOGOx+MNOuXkxTfEvPrO1IOQ81tArCFYQgi631clB70RpQw==";
+        url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz";
+        sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==";
       };
     };
     "define-properties-1.1.3" = {
@@ -373,13 +373,13 @@ let
         sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==";
       };
     };
-    "del-5.0.0" = {
+    "del-5.1.0" = {
       name = "del";
       packageName = "del";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/del/-/del-5.0.0.tgz";
-        sha512 = "TfU3nUY0WDIhN18eq+pgpbLY9AfL5RfiE9czKaTSolc6aK7qASXfDErvYgjV1UqCR4sNXDoxO0/idPmhDUt2Sg==";
+        url = "https://registry.npmjs.org/del/-/del-5.1.0.tgz";
+        sha512 = "wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==";
       };
     };
     "dir-glob-3.0.1" = {
@@ -409,13 +409,13 @@ let
         sha512 = "4XuD3z28jht3jvHbiom6fAipgG5LkjYeDLrX5OH8cbl0AtzTyUUAxGckcW8T7z0pLfBBV5qOiuC4wUEohk6FrQ==";
       };
     };
-    "dotf-1.4.0" = {
+    "dotf-1.5.0" = {
       name = "dotf";
       packageName = "dotf";
-      version = "1.4.0";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dotf/-/dotf-1.4.0.tgz";
-        sha512 = "9qGysIs00RzHk4px5KyUCBgiz1z3UNl60rFa1i1a9ROoC6Tk3enraAmrwgYZxCgcnZBjMQdGuu1bvxKnciNp7w==";
+        url = "https://registry.npmjs.org/dotf/-/dotf-1.5.0.tgz";
+        sha512 = "t0RzzkjSrc1jDxUde8cbD0q0mB9xk0Hdgt1joeMUwXcWiP9V+Ydw7gHjoeeuBN8aiJbnXAaCiM5/U1C2aN1F1g==";
       };
     };
     "duplexer3-0.1.4" = {
@@ -445,58 +445,31 @@ let
         sha1 = "9d43682d44b91ad16ebd84268ac103170a6553f8";
       };
     };
-    "emoji-regex-8.0.0" = {
-      name = "emoji-regex";
-      packageName = "emoji-regex";
-      version = "8.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz";
-        sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==";
-      };
-    };
-    "end-of-stream-1.4.1" = {
+    "end-of-stream-1.4.4" = {
       name = "end-of-stream";
       packageName = "end-of-stream";
-      version = "1.4.1";
+      version = "1.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz";
-        sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==";
+        url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz";
+        sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==";
       };
     };
-    "es-abstract-1.13.0" = {
+    "es-abstract-1.17.4" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.13.0";
+      version = "1.17.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz";
-        sha512 = "vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz";
+        sha512 = "Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==";
       };
     };
-    "es-to-primitive-1.2.0" = {
+    "es-to-primitive-1.2.1" = {
       name = "es-to-primitive";
       packageName = "es-to-primitive";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz";
-        sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==";
-      };
-    };
-    "es6-promise-4.2.8" = {
-      name = "es6-promise";
-      packageName = "es6-promise";
-      version = "4.2.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz";
-        sha512 = "HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==";
-      };
-    };
-    "es6-promisify-5.0.0" = {
-      name = "es6-promisify";
-      packageName = "es6-promisify";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz";
-        sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203";
+        url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz";
+        sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==";
       };
     };
     "escape-string-regexp-1.0.5" = {
@@ -544,31 +517,31 @@ let
         sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==";
       };
     };
-    "fast-glob-3.0.4" = {
+    "fast-glob-3.2.2" = {
       name = "fast-glob";
       packageName = "fast-glob";
-      version = "3.0.4";
+      version = "3.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.0.4.tgz";
-        sha512 = "wkIbV6qg37xTJwqSsdnIphL1e+LaGz4AIQqr00mIubMaEhv1/HEmJ0uuCGZRNRUkZZmOB5mJKO0ZUTVq+SxMQg==";
+        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz";
+        sha512 = "UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==";
       };
     };
-    "fast-text-encoding-1.0.0" = {
+    "fast-text-encoding-1.0.1" = {
       name = "fast-text-encoding";
       packageName = "fast-text-encoding";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.0.tgz";
-        sha512 = "R9bHCvweUxxwkDwhjav5vxpFvdPGlVngtqmx4pIZfSUhM/Q4NiIUHB456BAf+Q1Nwu3HEZYONtu+Rya+af4jiQ==";
+        url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.1.tgz";
+        sha512 = "x4FEgaz3zNRtJfLFqJmHWxkMDDvXVtaznj2V9jiP8ACUJrUgist4bP9FmDL2Vew2Y9mEQI/tG4GqabaitYp9CQ==";
       };
     };
-    "fastq-1.6.0" = {
+    "fastq-1.6.1" = {
       name = "fastq";
       packageName = "fastq";
-      version = "1.6.0";
+      version = "1.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fastq/-/fastq-1.6.0.tgz";
-        sha512 = "jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA==";
+        url = "https://registry.npmjs.org/fastq/-/fastq-1.6.1.tgz";
+        sha512 = "mpIH5sKYueh3YyeJwqtVo8sORi0CgtmkVbK6kZStpQlZBYQuTzG2CZ7idSiJuA7bY0SFCWUc5WIs+oYumGCQNw==";
       };
     };
     "figures-2.0.0" = {
@@ -580,15 +553,6 @@ let
         sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962";
       };
     };
-    "figures-3.0.0" = {
-      name = "figures";
-      packageName = "figures";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/figures/-/figures-3.0.0.tgz";
-        sha512 = "HKri+WoWoUgr83pehn/SIgLOMZ9nAWC6dcGj26RY2R4F50u4+RTUz0RCrUlOV3nKRAICW1UGzyb+kcX2qK1S/g==";
-      };
-    };
     "fill-range-7.0.1" = {
       name = "fill-range";
       packageName = "fill-range";
@@ -643,22 +607,22 @@ let
         sha1 = "4c76ec2ff0ac1a36a9dccf9a00df8623078d4ed8";
       };
     };
-    "gaxios-2.0.1" = {
+    "gaxios-2.3.2" = {
       name = "gaxios";
       packageName = "gaxios";
-      version = "2.0.1";
+      version = "2.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gaxios/-/gaxios-2.0.1.tgz";
-        sha512 = "c1NXovTxkgRJTIgB2FrFmOFg4YIV6N/bAa4f/FZ4jIw13Ql9ya/82x69CswvotJhbV3DiGnlTZwoq2NVXk2Irg==";
+        url = "https://registry.npmjs.org/gaxios/-/gaxios-2.3.2.tgz";
+        sha512 = "K/+py7UvKRDaEwEKlLiRKrFr+wjGjsMz5qH7Vs549QJS7cpSCOT/BbWL7pzqECflc46FcNPipjSfB+V1m8PAhw==";
       };
     };
-    "gcp-metadata-2.0.1" = {
+    "gcp-metadata-2.0.4" = {
       name = "gcp-metadata";
       packageName = "gcp-metadata";
-      version = "2.0.1";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-2.0.1.tgz";
-        sha512 = "nrbLj5O1MurvpLC/doFwzdTfKnmYGDYXlY/v7eQ4tJNVIvQXbOK672J9UFbradbtmuTkyHzjpzD8HD0Djz0LWw==";
+        url = "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-2.0.4.tgz";
+        sha512 = "p1lXhJvcKvJHWfQXhkd4Za1kyXRsGZA0JH7Cjs07W9hrg84d/j5tqQhbGewlSLx9gNyuQUid69uLux48YbggLg==";
       };
     };
     "get-stream-4.1.0" = {
@@ -679,31 +643,31 @@ let
         sha512 = "EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==";
       };
     };
-    "glob-7.1.4" = {
+    "glob-7.1.6" = {
       name = "glob";
       packageName = "glob";
-      version = "7.1.4";
+      version = "7.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz";
-        sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==";
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz";
+        sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==";
       };
     };
-    "glob-parent-5.0.0" = {
+    "glob-parent-5.1.0" = {
       name = "glob-parent";
       packageName = "glob-parent";
-      version = "5.0.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz";
-        sha512 = "Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==";
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz";
+        sha512 = "qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==";
       };
     };
-    "globby-10.0.1" = {
+    "globby-10.0.2" = {
       name = "globby";
       packageName = "globby";
-      version = "10.0.1";
+      version = "10.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz";
-        sha512 = "sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==";
+        url = "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz";
+        sha512 = "7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==";
       };
     };
     "google-auth-library-4.2.6" = {
@@ -715,13 +679,13 @@ let
         sha512 = "oJ6tCA9rbsYeIVY+mcLPFHa2hatz3XO6idYIrlI/KhhlMxZrO3tKyU8O2Pxu5KnSBBP7Wj4HtbM1LLKngNFaFw==";
       };
     };
-    "google-p12-pem-2.0.1" = {
+    "google-p12-pem-2.0.4" = {
       name = "google-p12-pem";
       packageName = "google-p12-pem";
-      version = "2.0.1";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-2.0.1.tgz";
-        sha512 = "6h6x+eBX3k+IDSe/c8dVYmn8Mzr1mUcmKC9MdUSwaBkFAXlqBEnwFWmSFgGC+tcqtsLn73BDP/vUNWEehf1Rww==";
+        url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-2.0.4.tgz";
+        sha512 = "S4blHBQWZRnEW44OcR7TL9WR+QCqByRvhNDZ/uuQfpxywfupikf/miba8js1jZi6ZOGv5slgSuoshCWh6EMDzg==";
       };
     };
     "googleapis-40.0.1" = {
@@ -751,13 +715,13 @@ let
         sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==";
       };
     };
-    "graceful-fs-4.2.2" = {
+    "graceful-fs-4.2.3" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.2.2";
+      version = "4.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz";
-        sha512 = "IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz";
+        sha512 = "a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==";
       };
     };
     "gtoken-3.0.2" = {
@@ -787,31 +751,31 @@ let
         sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd";
       };
     };
-    "has-symbols-1.0.0" = {
+    "has-symbols-1.0.1" = {
       name = "has-symbols";
       packageName = "has-symbols";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz";
-        sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44";
+        url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz";
+        sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==";
       };
     };
-    "http-cache-semantics-4.0.3" = {
+    "http-cache-semantics-4.1.0" = {
       name = "http-cache-semantics";
       packageName = "http-cache-semantics";
-      version = "4.0.3";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz";
-        sha512 = "TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew==";
+        url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz";
+        sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==";
       };
     };
-    "https-proxy-agent-2.2.2" = {
+    "https-proxy-agent-5.0.0" = {
       name = "https-proxy-agent";
       packageName = "https-proxy-agent";
-      version = "2.2.2";
+      version = "5.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz";
-        sha512 = "c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==";
+        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz";
+        sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==";
       };
     };
     "iconv-lite-0.4.24" = {
@@ -832,13 +796,13 @@ let
         sha512 = "MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==";
       };
     };
-    "indent-string-3.2.0" = {
+    "indent-string-4.0.0" = {
       name = "indent-string";
       packageName = "indent-string";
-      version = "3.2.0";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz";
-        sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289";
+        url = "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz";
+        sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==";
       };
     };
     "inflight-1.0.6" = {
@@ -868,13 +832,13 @@ let
         sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
       };
     };
-    "inquirer-6.5.1" = {
+    "inquirer-6.5.2" = {
       name = "inquirer";
       packageName = "inquirer";
-      version = "6.5.1";
+      version = "6.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-6.5.1.tgz";
-        sha512 = "uxNHBeQhRXIoHWTSNYUFhQVrHYFThIt6IVo2fFmSe8aBwdR3/w6b58hJpiL/fMukFkvGzjg+hSxFtwvVmKZmXw==";
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz";
+        sha512 = "cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==";
       };
     };
     "inquirer-autocomplete-prompt-1.0.1" = {
@@ -904,22 +868,22 @@ let
         sha512 = "pKnZpbgCTfH/1NLIlOduP/V+WRXzC2MOz3Qo8xmxk8C5GudJLgK5QyLVXOSWy3ParAH7Eemurl3xjv/WXYFvMA==";
       };
     };
-    "is-callable-1.1.4" = {
+    "is-callable-1.1.5" = {
       name = "is-callable";
       packageName = "is-callable";
-      version = "1.1.4";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz";
-        sha512 = "r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==";
+        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz";
+        sha512 = "ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==";
       };
     };
-    "is-date-object-1.0.1" = {
+    "is-date-object-1.0.2" = {
       name = "is-date-object";
       packageName = "is-date-object";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz";
-        sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16";
+        url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz";
+        sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==";
       };
     };
     "is-extglob-2.1.1" = {
@@ -931,13 +895,13 @@ let
         sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
       };
     };
-    "is-fullwidth-code-point-3.0.0" = {
+    "is-fullwidth-code-point-2.0.0" = {
       name = "is-fullwidth-code-point";
       packageName = "is-fullwidth-code-point";
-      version = "3.0.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz";
-        sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==";
+        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz";
+        sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
       };
     };
     "is-glob-4.0.1" = {
@@ -967,13 +931,13 @@ let
         sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==";
       };
     };
-    "is-online-8.2.0" = {
+    "is-online-8.2.1" = {
       name = "is-online";
       packageName = "is-online";
-      version = "8.2.0";
+      version = "8.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-online/-/is-online-8.2.0.tgz";
-        sha512 = "dvTrzRlziHPdl+uazMK+9ypLlwOA3szkaGfAWqI/MKuUutgNxOFBl2gfu2BTkV8C7A2YcYHNlVcsxHzZik3wUQ==";
+        url = "https://registry.npmjs.org/is-online/-/is-online-8.2.1.tgz";
+        sha512 = "853p45I2b//EDV7n1Rbk60f/fy1KQlp1IkTjV/K2EyAD/h8qXrIAxwIbZ8c4K5p5yDsQlTWUrxocgW/aBtNfYQ==";
       };
     };
     "is-path-cwd-2.2.0" = {
@@ -985,22 +949,13 @@ let
         sha512 = "w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==";
       };
     };
-    "is-path-in-cwd-2.1.0" = {
-      name = "is-path-in-cwd";
-      packageName = "is-path-in-cwd";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz";
-        sha512 = "rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==";
-      };
-    };
-    "is-path-inside-2.1.0" = {
+    "is-path-inside-3.0.2" = {
       name = "is-path-inside";
       packageName = "is-path-inside";
-      version = "2.1.0";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz";
-        sha512 = "wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==";
+        url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz";
+        sha512 = "/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==";
       };
     };
     "is-promise-2.1.0" = {
@@ -1012,22 +967,31 @@ let
         sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
       };
     };
-    "is-regex-1.0.4" = {
+    "is-regex-1.0.5" = {
       name = "is-regex";
       packageName = "is-regex";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz";
-        sha1 = "5517489b547091b0930e095654ced25ee97e9491";
+        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz";
+        sha512 = "vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==";
       };
     };
-    "is-symbol-1.0.2" = {
+    "is-stream-2.0.0" = {
+      name = "is-stream";
+      packageName = "is-stream";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz";
+        sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==";
+      };
+    };
+    "is-symbol-1.0.3" = {
       name = "is-symbol";
       packageName = "is-symbol";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz";
-        sha512 = "HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==";
+        url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz";
+        sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==";
       };
     };
     "is-wsl-1.1.0" = {
@@ -1066,13 +1030,13 @@ let
         sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb";
       };
     };
-    "jsonfile-5.0.0" = {
+    "jsonfile-6.0.1" = {
       name = "jsonfile";
       packageName = "jsonfile";
-      version = "5.0.0";
+      version = "6.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-5.0.0.tgz";
-        sha512 = "NQRZ5CRo74MhMMC3/3r5g2k4fjodJ/wh8MxjFbCViWKFjxrnudWSY5vomh+23ZaXzAS7J3fBZIR2dV6WbmfM0w==";
+        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz";
+        sha512 = "jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==";
       };
     };
     "jwa-1.4.1" = {
@@ -1156,13 +1120,13 @@ let
         sha512 = "VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==";
       };
     };
-    "merge2-1.2.4" = {
+    "merge2-1.3.0" = {
       name = "merge2";
       packageName = "merge2";
-      version = "1.2.4";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/merge2/-/merge2-1.2.4.tgz";
-        sha512 = "FYE8xI+6pjFOhokZu0We3S5NKCirLbCzSh2Usf3qEyr4X8U+0jNg9P8RZ4qz+V2UoECLVwSyzU3LxXBaLGtD3A==";
+        url = "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz";
+        sha512 = "2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==";
       };
     };
     "micromatch-4.0.2" = {
@@ -1183,13 +1147,13 @@ let
         sha512 = "LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==";
       };
     };
-    "mimic-fn-2.1.0" = {
+    "mimic-fn-1.2.0" = {
       name = "mimic-fn";
       packageName = "mimic-fn";
-      version = "2.1.0";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz";
-        sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==";
+        url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz";
+        sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==";
       };
     };
     "mimic-response-1.0.1" = {
@@ -1219,13 +1183,13 @@ let
         sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
-    "minimist-1.2.0" = {
+    "minimist-1.2.5" = {
       name = "minimist";
       packageName = "minimist";
-      version = "1.2.0";
+      version = "1.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
-        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
+        sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
       };
     };
     "mkdirp-0.5.1" = {
@@ -1255,13 +1219,13 @@ let
         sha512 = "lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ==";
       };
     };
-    "mute-stream-0.0.8" = {
+    "mute-stream-0.0.7" = {
       name = "mute-stream";
       packageName = "mute-stream";
-      version = "0.0.8";
+      version = "0.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz";
-        sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==";
+        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz";
+        sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab";
       };
     };
     "node-fetch-2.6.0" = {
@@ -1273,22 +1237,31 @@ let
         sha512 = "8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==";
       };
     };
-    "node-forge-0.8.5" = {
+    "node-forge-0.9.1" = {
       name = "node-forge";
       packageName = "node-forge";
-      version = "0.8.5";
+      version = "0.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-forge/-/node-forge-0.8.5.tgz";
-        sha512 = "vFMQIWt+J/7FLNyKouZ9TazT74PRV3wgv9UT4cRjC8BffxFbKXkgIWR42URCPSnHm/QDz6BOlb2Q0U4+VQT67Q==";
+        url = "https://registry.npmjs.org/node-forge/-/node-forge-0.9.1.tgz";
+        sha512 = "G6RlQt5Sb4GMBzXvhfkeFmbqR6MzhtnT7VTHuLadjkii3rdYHNdw0m8zA4BTxVIh68FicCQ2NSUANpsqkr9jvQ==";
       };
     };
-    "normalize-url-4.3.0" = {
+    "normalize-url-4.5.0" = {
       name = "normalize-url";
       packageName = "normalize-url";
-      version = "4.3.0";
+      version = "4.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.3.0.tgz";
-        sha512 = "0NLtR71o4k6GLP+mr6Ty34c5GA6CMoEsncKJxvQd8NzPxaHRJNnb5gZE8R1XF4CPIS7QPHLJ74IFszwtNVAHVQ==";
+        url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz";
+        sha512 = "2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==";
+      };
+    };
+    "object-inspect-1.7.0" = {
+      name = "object-inspect";
+      packageName = "object-inspect";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz";
+        sha512 = "a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==";
       };
     };
     "object-keys-1.1.1" = {
@@ -1300,6 +1273,15 @@ let
         sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==";
       };
     };
+    "object.assign-4.1.0" = {
+      name = "object.assign";
+      packageName = "object.assign";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz";
+        sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==";
+      };
+    };
     "once-1.4.0" = {
       name = "once";
       packageName = "once";
@@ -1309,13 +1291,13 @@ let
         sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
       };
     };
-    "onetime-5.1.0" = {
+    "onetime-2.0.1" = {
       name = "onetime";
       packageName = "onetime";
-      version = "5.1.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz";
-        sha512 = "5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==";
+        url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz";
+        sha1 = "067428230fd67443b2794b22bba528b6867962d4";
       };
     };
     "open-6.4.0" = {
@@ -1372,13 +1354,13 @@ let
         sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
       };
     };
-    "p-limit-2.2.0" = {
+    "p-limit-2.2.2" = {
       name = "p-limit";
       packageName = "p-limit";
-      version = "2.2.0";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz";
-        sha512 = "pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==";
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz";
+        sha512 = "WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==";
       };
     };
     "p-locate-4.1.0" = {
@@ -1390,13 +1372,13 @@ let
         sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==";
       };
     };
-    "p-map-2.1.0" = {
+    "p-map-3.0.0" = {
       name = "p-map";
       packageName = "p-map";
-      version = "2.1.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz";
-        sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==";
+        url = "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz";
+        sha512 = "d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==";
       };
     };
     "p-some-4.1.0" = {
@@ -1408,13 +1390,13 @@ let
         sha512 = "MF/HIbq6GeBqTrTIl5OJubzkGU+qfFhAFi0gnTAK6rgEIJIknEiABHOTtQu4e6JiXjIwuMPMUFQzyHh5QjCl1g==";
       };
     };
-    "p-timeout-3.1.0" = {
+    "p-timeout-3.2.0" = {
       name = "p-timeout";
       packageName = "p-timeout";
-      version = "3.1.0";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.1.0.tgz";
-        sha512 = "C27DYI+tCroT8J8cTEyySGydl2B7FlxrGNF5/wmMbl1V+jeehUCzEE/BVgzRebdm2K3ZitKOKx8YbdFumDyYmw==";
+        url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz";
+        sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==";
       };
     };
     "p-try-2.2.0" = {
@@ -1453,15 +1435,6 @@ let
         sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
       };
     };
-    "path-is-inside-1.0.2" = {
-      name = "path-is-inside";
-      packageName = "path-is-inside";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz";
-        sha1 = "365417dede44430d1c11af61027facf074bdfc53";
-      };
-    };
     "path-type-4.0.0" = {
       name = "path-type";
       packageName = "path-type";
@@ -1471,13 +1444,13 @@ let
         sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==";
       };
     };
-    "picomatch-2.0.7" = {
+    "picomatch-2.2.1" = {
       name = "picomatch";
       packageName = "picomatch";
-      version = "2.0.7";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/picomatch/-/picomatch-2.0.7.tgz";
-        sha512 = "oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==";
+        url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz";
+        sha512 = "ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==";
       };
     };
     "pluralize-8.0.0" = {
@@ -1525,13 +1498,13 @@ let
         sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==";
       };
     };
-    "qs-6.8.0" = {
+    "qs-6.9.1" = {
       name = "qs";
       packageName = "qs";
-      version = "6.8.0";
+      version = "6.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.8.0.tgz";
-        sha512 = "tPSkj8y92PfZVbinY1n84i1Qdx75lZjMQYx9WZhnkofyxzw2r7Ho39G3/aEvSUdebxpnnM4LZJCtvE/Aq3+s9w==";
+        url = "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz";
+        sha512 = "Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA==";
       };
     };
     "recursive-readdir-2.2.2" = {
@@ -1552,13 +1525,13 @@ let
         sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7";
       };
     };
-    "restore-cursor-3.1.0" = {
+    "restore-cursor-2.0.0" = {
       name = "restore-cursor";
       packageName = "restore-cursor";
-      version = "3.1.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz";
-        sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==";
+        url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz";
+        sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf";
       };
     };
     "reusify-1.0.4" = {
@@ -1570,22 +1543,22 @@ let
         sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==";
       };
     };
-    "rimraf-2.7.1" = {
+    "rimraf-3.0.2" = {
       name = "rimraf";
       packageName = "rimraf";
-      version = "2.7.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz";
-        sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==";
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz";
+        sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==";
       };
     };
-    "run-async-2.3.0" = {
+    "run-async-2.4.0" = {
       name = "run-async";
       packageName = "run-async";
-      version = "2.3.0";
+      version = "2.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz";
-        sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0";
+        url = "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz";
+        sha512 = "xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==";
       };
     };
     "run-parallel-1.1.9" = {
@@ -1597,13 +1570,13 @@ let
         sha512 = "DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==";
       };
     };
-    "rxjs-6.5.2" = {
+    "rxjs-6.5.4" = {
       name = "rxjs";
       packageName = "rxjs";
-      version = "6.5.2";
+      version = "6.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz";
-        sha512 = "HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==";
+        url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz";
+        sha512 = "naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==";
       };
     };
     "safe-buffer-5.2.0" = {
@@ -1651,22 +1624,49 @@ let
         sha512 = "gaIdhbqxkB5/VflPXsJwZvEzh/kdwiRPF9iqpkxX4us+lzB8INedFwjCyo6vwuz5x2Ddlnav2zh270CEjCG8mA==";
       };
     };
-    "string-width-4.1.0" = {
+    "string-width-2.1.1" = {
       name = "string-width";
       packageName = "string-width";
-      version = "4.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-4.1.0.tgz";
-        sha512 = "NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==";
+        url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz";
+        sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==";
       };
     };
-    "string.prototype.padend-3.0.0" = {
+    "string.prototype.padend-3.1.0" = {
       name = "string.prototype.padend";
       packageName = "string.prototype.padend";
-      version = "3.0.0";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz";
-        sha1 = "f3aaef7c1719f170c5eab1c32bf780d96e21f2f0";
+        url = "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.0.tgz";
+        sha512 = "3aIv8Ffdp8EZj8iLwREGpQaUZiPyrWrpzMBHvkiSW/bK/EGve9np07Vwy7IJ5waydpGXzQZu/F8Oze2/IWkBaA==";
+      };
+    };
+    "string.prototype.trimleft-2.1.1" = {
+      name = "string.prototype.trimleft";
+      packageName = "string.prototype.trimleft";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz";
+        sha512 = "iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==";
+      };
+    };
+    "string.prototype.trimright-2.1.1" = {
+      name = "string.prototype.trimright";
+      packageName = "string.prototype.trimright";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz";
+        sha512 = "qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==";
+      };
+    };
+    "strip-ansi-4.0.0" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz";
+        sha1 = "a8479022eb1ac368a871389b635262c505ee368f";
       };
     };
     "strip-ansi-5.2.0" = {
@@ -1732,22 +1732,22 @@ let
         sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==";
       };
     };
-    "ts2gas-3.4.4" = {
+    "ts2gas-3.6.1" = {
       name = "ts2gas";
       packageName = "ts2gas";
-      version = "3.4.4";
+      version = "3.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ts2gas/-/ts2gas-3.4.4.tgz";
-        sha512 = "u49TaxHUn+y88XqAJSyun488Yc7oqjZUCi/swOT1OP3qiHa/wJTeUH68842US+3OXxKk/As5SRmUHfChTcG3Ng==";
+        url = "https://registry.npmjs.org/ts2gas/-/ts2gas-3.6.1.tgz";
+        sha512 = "B/4OZJKslQytpAtRE0Q0MoZ0h8fyXzJDmMu1CIPdP6q3iEAQJHxCFTxUsrZWOCNQMIuFlxsEX/PHn41g8TVSvg==";
       };
     };
-    "tslib-1.10.0" = {
+    "tslib-1.11.1" = {
       name = "tslib";
       packageName = "tslib";
-      version = "1.10.0";
+      version = "1.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz";
-        sha512 = "qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==";
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz";
+        sha512 = "aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==";
       };
     };
     "type-fest-0.3.1" = {
@@ -1759,22 +1759,13 @@ let
         sha512 = "cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==";
       };
     };
-    "type-fest-0.5.2" = {
-      name = "type-fest";
-      packageName = "type-fest";
-      version = "0.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz";
-        sha512 = "DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw==";
-      };
-    };
-    "typescript-3.5.3" = {
+    "typescript-3.8.3" = {
       name = "typescript";
       packageName = "typescript";
-      version = "3.5.3";
+      version = "3.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz";
-        sha512 = "ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==";
+        url = "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz";
+        sha512 = "MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==";
       };
     };
     "universalify-0.1.2" = {
@@ -1786,6 +1777,15 @@ let
         sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==";
       };
     };
+    "universalify-1.0.0" = {
+      name = "universalify";
+      packageName = "universalify";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz";
+        sha512 = "rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==";
+      };
+    };
     "url-parse-lax-3.0.0" = {
       name = "url-parse-lax";
       packageName = "url-parse-lax";
@@ -1813,13 +1813,13 @@ let
         sha512 = "0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==";
       };
     };
-    "uuid-3.3.2" = {
+    "uuid-3.4.0" = {
       name = "uuid";
       packageName = "uuid";
-      version = "3.3.2";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz";
-        sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz";
+        sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==";
       };
     };
     "watch-1.0.2" = {
@@ -1840,13 +1840,13 @@ let
         sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
       };
     };
-    "yallist-3.0.3" = {
+    "yallist-3.1.1" = {
       name = "yallist";
       packageName = "yallist";
-      version = "3.0.3";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz";
-        sha512 = "S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==";
+        url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz";
+        sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==";
       };
     };
   };
@@ -1861,20 +1861,20 @@ in
       sha512 = "dUdEBfwOuC1d95o1ntZ+4a60M65q2vwvHvgD22bPCx+OU0m+ZUBs5rZSloh/IGDjEVqFbDsHU6SLgM0x3MOhgA==";
     };
     dependencies = [
-      sources."@nodelib/fs.scandir-2.1.1"
-      sources."@nodelib/fs.stat-2.0.1"
-      sources."@nodelib/fs.walk-1.2.2"
+      sources."@nodelib/fs.scandir-2.1.3"
+      sources."@nodelib/fs.stat-2.0.3"
+      sources."@nodelib/fs.walk-1.2.4"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-12.7.2"
+      sources."@types/node-13.9.1"
       sources."abort-controller-3.0.0"
-      sources."agent-base-4.3.0"
-      sources."aggregate-error-3.0.0"
-      sources."ansi-escapes-4.2.1"
-      sources."ansi-regex-4.1.0"
+      sources."agent-base-6.0.0"
+      sources."aggregate-error-3.0.1"
+      sources."ansi-escapes-3.2.0"
+      sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
       sources."array-differ-3.0.0"
       sources."array-union-2.1.0"
@@ -1894,101 +1894,94 @@ in
       sources."chalk-2.4.2"
       sources."chardet-0.7.0"
       sources."clean-stack-2.2.0"
-      sources."cli-cursor-3.1.0"
+      sources."cli-cursor-2.1.0"
       sources."cli-spinner-0.2.10"
       sources."cli-width-2.2.0"
       sources."clone-response-1.0.2"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
-      sources."commander-2.20.0"
+      sources."commander-2.20.3"
       sources."concat-map-0.0.1"
-      sources."debug-3.2.6"
+      sources."debug-4.1.1"
       sources."decompress-response-3.3.0"
-      sources."defer-to-connect-1.0.2"
+      sources."defer-to-connect-1.1.3"
       sources."define-properties-1.1.3"
-      sources."del-5.0.0"
+      sources."del-5.1.0"
       sources."dir-glob-3.0.1"
       sources."dns-packet-5.2.1"
       sources."dns-socket-4.2.0"
-      sources."dotf-1.4.0"
+      sources."dotf-1.5.0"
       sources."duplexer3-0.1.4"
       sources."ecdsa-sig-formatter-1.0.11"
       sources."ellipsize-0.1.0"
-      sources."emoji-regex-8.0.0"
-      sources."end-of-stream-1.4.1"
-      sources."es-abstract-1.13.0"
-      sources."es-to-primitive-1.2.0"
-      sources."es6-promise-4.2.8"
-      sources."es6-promisify-5.0.0"
+      sources."end-of-stream-1.4.4"
+      sources."es-abstract-1.17.4"
+      sources."es-to-primitive-1.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."event-target-shim-5.0.1"
       sources."exec-sh-0.2.2"
       sources."extend-3.0.2"
       sources."external-editor-3.1.0"
-      sources."fast-glob-3.0.4"
-      sources."fast-text-encoding-1.0.0"
-      sources."fastq-1.6.0"
-      sources."figures-3.0.0"
+      sources."fast-glob-3.2.2"
+      sources."fast-text-encoding-1.0.1"
+      sources."fastq-1.6.1"
+      sources."figures-2.0.0"
       sources."fill-range-7.0.1"
       sources."find-up-4.1.0"
       (sources."fs-extra-8.1.0" // {
         dependencies = [
           sources."jsonfile-4.0.0"
+          sources."universalify-0.1.2"
         ];
       })
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
       sources."fuzzy-0.1.3"
-      sources."gaxios-2.0.1"
-      sources."gcp-metadata-2.0.1"
+      sources."gaxios-2.3.2"
+      sources."gcp-metadata-2.0.4"
       sources."get-stream-4.1.0"
-      sources."glob-7.1.4"
-      sources."glob-parent-5.0.0"
-      sources."globby-10.0.1"
+      sources."glob-7.1.6"
+      sources."glob-parent-5.1.0"
+      sources."globby-10.0.2"
       sources."google-auth-library-4.2.6"
-      sources."google-p12-pem-2.0.1"
+      sources."google-p12-pem-2.0.4"
       sources."googleapis-40.0.1"
       sources."googleapis-common-2.0.4"
       sources."got-9.6.0"
-      sources."graceful-fs-4.2.2"
+      sources."graceful-fs-4.2.3"
       sources."gtoken-3.0.2"
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
-      sources."has-symbols-1.0.0"
-      sources."http-cache-semantics-4.0.3"
-      sources."https-proxy-agent-2.2.2"
+      sources."has-symbols-1.0.1"
+      sources."http-cache-semantics-4.1.0"
+      sources."https-proxy-agent-5.0.0"
       sources."iconv-lite-0.4.24"
       sources."ignore-5.1.4"
-      sources."indent-string-3.2.0"
+      sources."indent-string-4.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."inquirer-6.5.1"
-      (sources."inquirer-autocomplete-prompt-1.0.1" // {
-        dependencies = [
-          sources."ansi-escapes-3.2.0"
-          sources."figures-2.0.0"
-        ];
-      })
+      sources."inquirer-6.5.2"
+      sources."inquirer-autocomplete-prompt-1.0.1"
       sources."ip-1.1.5"
       sources."ip-regex-4.1.0"
-      sources."is-callable-1.1.4"
-      sources."is-date-object-1.0.1"
+      sources."is-callable-1.1.5"
+      sources."is-date-object-1.0.2"
       sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-3.0.0"
+      sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.1"
       sources."is-ip-3.1.0"
       sources."is-number-7.0.0"
-      sources."is-online-8.2.0"
+      sources."is-online-8.2.1"
       sources."is-path-cwd-2.2.0"
-      sources."is-path-in-cwd-2.1.0"
-      sources."is-path-inside-2.1.0"
+      sources."is-path-inside-3.0.2"
       sources."is-promise-2.1.0"
-      sources."is-regex-1.0.4"
-      sources."is-symbol-1.0.2"
+      sources."is-regex-1.0.5"
+      sources."is-stream-2.0.0"
+      sources."is-symbol-1.0.3"
       sources."is-wsl-1.1.0"
       sources."json-bigint-0.3.0"
       sources."json-buffer-3.0.0"
-      sources."jsonfile-5.0.0"
+      sources."jsonfile-6.0.1"
       sources."jwa-1.4.1"
       sources."jws-3.2.2"
       sources."keyv-3.1.0"
@@ -1997,82 +1990,92 @@ in
       sources."lowercase-keys-1.0.1"
       sources."lru-cache-5.1.1"
       sources."merge-1.2.1"
-      sources."merge2-1.2.4"
+      sources."merge2-1.3.0"
       sources."micromatch-4.0.2"
       sources."mime-2.4.4"
-      sources."mimic-fn-2.1.0"
+      sources."mimic-fn-1.2.0"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
       sources."ms-2.1.2"
       sources."multimatch-4.0.0"
-      sources."mute-stream-0.0.8"
+      sources."mute-stream-0.0.7"
       sources."node-fetch-2.6.0"
-      sources."node-forge-0.8.5"
-      sources."normalize-url-4.3.0"
+      sources."node-forge-0.9.1"
+      sources."normalize-url-4.5.0"
+      sources."object-inspect-1.7.0"
       sources."object-keys-1.1.1"
+      sources."object.assign-4.1.0"
       sources."once-1.4.0"
-      sources."onetime-5.1.0"
+      sources."onetime-2.0.1"
       sources."open-6.4.0"
       sources."os-tmpdir-1.0.2"
       (sources."p-any-2.1.0" // {
         dependencies = [
           sources."p-cancelable-2.0.0"
-          sources."type-fest-0.3.1"
         ];
       })
       sources."p-cancelable-1.1.0"
       sources."p-finally-1.0.0"
-      sources."p-limit-2.2.0"
+      sources."p-limit-2.2.2"
       sources."p-locate-4.1.0"
-      sources."p-map-2.1.0"
+      sources."p-map-3.0.0"
       (sources."p-some-4.1.0" // {
         dependencies = [
           sources."p-cancelable-2.0.0"
         ];
       })
-      sources."p-timeout-3.1.0"
+      sources."p-timeout-3.2.0"
       sources."p-try-2.2.0"
       sources."path-0.12.7"
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
-      sources."path-is-inside-1.0.2"
       sources."path-type-4.0.0"
-      sources."picomatch-2.0.7"
+      sources."picomatch-2.2.1"
       sources."pluralize-8.0.0"
       sources."prepend-http-2.0.0"
       sources."process-0.11.10"
       sources."public-ip-3.2.0"
       sources."pump-3.0.0"
-      sources."qs-6.8.0"
+      sources."qs-6.9.1"
       sources."recursive-readdir-2.2.2"
       sources."responselike-1.0.2"
-      sources."restore-cursor-3.1.0"
+      sources."restore-cursor-2.0.0"
       sources."reusify-1.0.4"
-      sources."rimraf-2.7.1"
-      sources."run-async-2.3.0"
+      sources."rimraf-3.0.2"
+      sources."run-async-2.4.0"
       sources."run-parallel-1.1.9"
-      sources."rxjs-6.5.2"
+      sources."rxjs-6.5.4"
       sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
       sources."signal-exit-3.0.2"
       sources."slash-3.0.0"
       sources."split-lines-2.0.0"
-      sources."string-width-4.1.0"
-      sources."string.prototype.padend-3.0.0"
-      sources."strip-ansi-5.2.0"
+      (sources."string-width-2.1.1" // {
+        dependencies = [
+          sources."strip-ansi-4.0.0"
+        ];
+      })
+      sources."string.prototype.padend-3.1.0"
+      sources."string.prototype.trimleft-2.1.1"
+      sources."string.prototype.trimright-2.1.1"
+      (sources."strip-ansi-5.2.0" // {
+        dependencies = [
+          sources."ansi-regex-4.1.0"
+        ];
+      })
       sources."strip-bom-4.0.0"
       sources."supports-color-5.5.0"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
       sources."to-readable-stream-1.0.0"
       sources."to-regex-range-5.0.1"
-      sources."ts2gas-3.4.4"
-      sources."tslib-1.10.0"
-      sources."type-fest-0.5.2"
-      sources."typescript-3.5.3"
-      sources."universalify-0.1.2"
+      sources."ts2gas-3.6.1"
+      sources."tslib-1.11.1"
+      sources."type-fest-0.3.1"
+      sources."typescript-3.8.3"
+      sources."universalify-1.0.0"
       sources."url-parse-lax-3.0.0"
       sources."url-template-2.0.8"
       (sources."util-0.10.4" // {
@@ -2080,14 +2083,14 @@ in
           sources."inherits-2.0.3"
         ];
       })
-      sources."uuid-3.3.2"
+      sources."uuid-3.4.0"
       (sources."watch-1.0.2" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
         ];
       })
       sources."wrappy-1.0.2"
-      sources."yallist-3.0.3"
+      sources."yallist-3.1.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -2097,5 +2100,6 @@ in
     };
     production = true;
     bypassCache = true;
+    reconstructLock = true;
   };
 }
\ No newline at end of file
diff --git a/pkgs/development/web/remarkjs/generate.sh b/pkgs/development/web/remarkjs/generate.sh
index 59542101812f..00393494c238 100644
--- a/pkgs/development/web/remarkjs/generate.sh
+++ b/pkgs/development/web/remarkjs/generate.sh
@@ -1,3 +1,3 @@
 #!/bin/sh -e
 
-node2nix -8 -i pkgs.json -c nodepkgs.nix -e ../../node-packages/node-env.nix
+node2nix --nodejs-10 -i pkgs.json -c nodepkgs.nix -e ../../node-packages/node-env.nix
diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/pkgs/development/web/remarkjs/node-packages.nix
index 12282d4ea3ac..796f73dd6836 100644
--- a/pkgs/development/web/remarkjs/node-packages.nix
+++ b/pkgs/development/web/remarkjs/node-packages.nix
@@ -1,34 +1,43 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
-    "@sinonjs/commons-1.4.0" = {
+    "@sinonjs/commons-1.7.1" = {
       name = "_at_sinonjs_slash_commons";
       packageName = "@sinonjs/commons";
-      version = "1.4.0";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.4.0.tgz";
-        sha512 = "9jHK3YF/8HtJ9wCAbG+j8cD0i0+ATS9A7gXFqS36TblLPNy6rEEc+SB0imo91eCboGaBYGV/MT1/br/J+EE7Tw==";
+        url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.7.1.tgz";
+        sha512 = "Debi3Baff1Qu1Unc3mjJ96MgpbwTn43S1+9yJ0llWygPwDNu2aaWBD6yc9y/Z8XDRNhx7U+u2UDg2OGQXkclUQ==";
       };
     };
-    "@sinonjs/formatio-3.2.1" = {
+    "@sinonjs/fake-timers-6.0.0" = {
+      name = "_at_sinonjs_slash_fake-timers";
+      packageName = "@sinonjs/fake-timers";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.0.tgz";
+        sha512 = "atR1J/jRXvQAb47gfzSK8zavXy7BcpnYq21ALon0U99etu99vsir0trzIO3wpeLtW+LLVY6X7EkfVTbjGSH8Ww==";
+      };
+    };
+    "@sinonjs/formatio-5.0.1" = {
       name = "_at_sinonjs_slash_formatio";
       packageName = "@sinonjs/formatio";
-      version = "3.2.1";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.2.1.tgz";
-        sha512 = "tsHvOB24rvyvV2+zKMmPkZ7dXX6LSLKZ7aOtXY6Edklp0uRcgGpOsQTTGTcWViFyx4uhWc6GV8QdnALbIbIdeQ==";
+        url = "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-5.0.1.tgz";
+        sha512 = "KaiQ5pBf1MpS09MuA0kp6KBQt2JUOQycqVG1NZXvzeaXe5LGFqAKueIS0bw4w0P9r7KuBSVdUk5QjXsUdu2CxQ==";
       };
     };
-    "@sinonjs/samsam-3.3.1" = {
+    "@sinonjs/samsam-5.0.3" = {
       name = "_at_sinonjs_slash_samsam";
       packageName = "@sinonjs/samsam";
-      version = "3.3.1";
+      version = "5.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.1.tgz";
-        sha512 = "wRSfmyd81swH0hA1bxJZJ57xr22kC07a1N4zuIL47yTS04bDk6AoCkczcqHEjcRPmJ+FruGJ9WBQiJwMtIElFw==";
+        url = "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.0.3.tgz";
+        sha512 = "QucHkc2uMJ0pFGjJUDP3F9dq5dx8QIaqISl9QgwLOh6P9yv877uONPGXh/OH/0zmM3tW1JjuJltAZV2l7zU+uQ==";
       };
     };
     "@sinonjs/text-encoding-0.7.1" = {
@@ -58,40 +67,31 @@ let
         sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
       };
     };
-    "acorn-6.1.1" = {
+    "acorn-7.1.1" = {
       name = "acorn";
       packageName = "acorn";
-      version = "6.1.1";
+      version = "7.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz";
-        sha512 = "jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==";
+        url = "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz";
+        sha512 = "add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==";
       };
     };
-    "acorn-dynamic-import-4.0.0" = {
-      name = "acorn-dynamic-import";
-      packageName = "acorn-dynamic-import";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz";
-        sha512 = "d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==";
-      };
-    };
-    "acorn-node-1.7.0" = {
+    "acorn-node-1.8.2" = {
       name = "acorn-node";
       packageName = "acorn-node";
-      version = "1.7.0";
+      version = "1.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.7.0.tgz";
-        sha512 = "XhahLSsCB6X6CJbe+uNu3Mn9sJBNFxtBN9NLgAOQovfS6Kh0lDUtmlclhjn9CvEK7A7YyRU13PXlNcpSiLI9Yw==";
+        url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz";
+        sha512 = "8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==";
       };
     };
-    "acorn-walk-6.1.1" = {
+    "acorn-walk-7.1.1" = {
       name = "acorn-walk";
       packageName = "acorn-walk";
-      version = "6.1.1";
+      version = "7.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz";
-        sha512 = "OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==";
+        url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz";
+        sha512 = "wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==";
       };
     };
     "adm-zip-0.2.1" = {
@@ -103,13 +103,13 @@ let
         sha1 = "e801cedeb5bd9a4e98d699c5c0f4239e2731dcbf";
       };
     };
-    "ajv-6.10.0" = {
+    "ajv-6.12.0" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.10.0";
+      version = "6.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz";
-        sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==";
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz";
+        sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==";
       };
     };
     "ansi-colors-3.2.3" = {
@@ -121,15 +121,6 @@ let
         sha512 = "LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==";
       };
     };
-    "ansi-regex-2.1.1" = {
-      name = "ansi-regex";
-      packageName = "ansi-regex";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
-        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
-      };
-    };
     "ansi-regex-3.0.0" = {
       name = "ansi-regex";
       packageName = "ansi-regex";
@@ -157,6 +148,15 @@ let
         sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
       };
     };
+    "anymatch-3.1.1" = {
+      name = "anymatch";
+      packageName = "anymatch";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz";
+        sha512 = "mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==";
+      };
+    };
     "argparse-1.0.10" = {
       name = "argparse";
       packageName = "argparse";
@@ -166,42 +166,6 @@ let
         sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==";
       };
     };
-    "array-filter-0.0.1" = {
-      name = "array-filter";
-      packageName = "array-filter";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz";
-        sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec";
-      };
-    };
-    "array-from-2.1.1" = {
-      name = "array-from";
-      packageName = "array-from";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz";
-        sha1 = "cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195";
-      };
-    };
-    "array-map-0.0.0" = {
-      name = "array-map";
-      packageName = "array-map";
-      version = "0.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz";
-        sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662";
-      };
-    };
-    "array-reduce-0.0.0" = {
-      name = "array-reduce";
-      packageName = "array-reduce";
-      version = "0.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz";
-        sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b";
-      };
-    };
     "asap-2.0.6" = {
       name = "asap";
       packageName = "asap";
@@ -301,13 +265,13 @@ let
         sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
       };
     };
-    "aws4-1.8.0" = {
+    "aws4-1.9.1" = {
       name = "aws4";
       packageName = "aws4";
-      version = "1.8.0";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz";
-        sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==";
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz";
+        sha512 = "wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==";
       };
     };
     "balanced-match-1.0.0" = {
@@ -319,13 +283,13 @@ let
         sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
       };
     };
-    "base64-js-1.3.0" = {
+    "base64-js-1.3.1" = {
       name = "base64-js";
       packageName = "base64-js";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz";
-        sha512 = "ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==";
+        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz";
+        sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==";
       };
     };
     "bcrypt-pbkdf-1.0.2" = {
@@ -337,6 +301,15 @@ let
         sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
       };
     };
+    "binary-extensions-2.0.0" = {
+      name = "binary-extensions";
+      packageName = "binary-extensions";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz";
+        sha512 = "Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==";
+      };
+    };
     "bn.js-4.11.8" = {
       name = "bn.js";
       packageName = "bn.js";
@@ -364,6 +337,15 @@ let
         sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
       };
     };
+    "braces-3.0.2" = {
+      name = "braces";
+      packageName = "braces";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz";
+        sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==";
+      };
+    };
     "brorand-1.1.0" = {
       name = "brorand";
       packageName = "brorand";
@@ -454,13 +436,13 @@ let
         sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==";
       };
     };
-    "buffer-5.2.1" = {
+    "buffer-5.5.0" = {
       name = "buffer";
       packageName = "buffer";
-      version = "5.2.1";
+      version = "5.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz";
-        sha512 = "c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==";
+        url = "https://registry.npmjs.org/buffer/-/buffer-5.5.0.tgz";
+        sha512 = "9FTEDjLjwoAkEwyMGDjYJQN2gfRgOKBKRfiglhvibGbpeeU/pQn1bJxQqm32OD/AIeEuHxU9roxXxg34Byp/Ww==";
       };
     };
     "buffer-from-1.1.1" = {
@@ -526,6 +508,15 @@ let
         sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==";
       };
     };
+    "chokidar-3.3.0" = {
+      name = "chokidar";
+      packageName = "chokidar";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz";
+        sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==";
+      };
+    };
     "cipher-base-1.0.4" = {
       name = "cipher-base";
       packageName = "cipher-base";
@@ -544,13 +535,13 @@ let
         sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14";
       };
     };
-    "cliui-4.1.0" = {
+    "cliui-5.0.0" = {
       name = "cliui";
       packageName = "cliui";
-      version = "4.1.0";
+      version = "5.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz";
-        sha512 = "4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==";
+        url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz";
+        sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==";
       };
     };
     "clone-2.1.2" = {
@@ -562,15 +553,6 @@ let
         sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f";
       };
     };
-    "code-point-at-1.1.0" = {
-      name = "code-point-at";
-      packageName = "code-point-at";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz";
-        sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
-      };
-    };
     "color-convert-1.9.3" = {
       name = "color-convert";
       packageName = "color-convert";
@@ -616,13 +598,13 @@ let
         sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==";
       };
     };
-    "commander-2.20.0" = {
+    "commander-2.20.3" = {
       name = "commander";
       packageName = "commander";
-      version = "2.20.0";
+      version = "2.20.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz";
-        sha512 = "7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==";
+        url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz";
+        sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==";
       };
     };
     "concat-map-0.0.1" = {
@@ -661,6 +643,15 @@ let
         sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10";
       };
     };
+    "console-browserify-1.2.0" = {
+      name = "console-browserify";
+      packageName = "console-browserify";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz";
+        sha512 = "ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==";
+      };
+    };
     "constants-browserify-1.0.0" = {
       name = "constants-browserify";
       packageName = "constants-browserify";
@@ -715,15 +706,6 @@ let
         sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==";
       };
     };
-    "cross-spawn-6.0.5" = {
-      name = "cross-spawn";
-      packageName = "cross-spawn";
-      version = "6.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz";
-        sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==";
-      };
-    };
     "cryptiles-0.2.2" = {
       name = "cryptiles";
       packageName = "cryptiles";
@@ -832,22 +814,22 @@ let
         sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
       };
     };
-    "deps-sort-2.0.0" = {
+    "deps-sort-2.0.1" = {
       name = "deps-sort";
       packageName = "deps-sort";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz";
-        sha1 = "091724902e84658260eb910748cccd1af6e21fb5";
+        url = "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.1.tgz";
+        sha512 = "1orqXQr5po+3KI6kQb9A4jnXT1PBwggGl2d7Sq2xsnOeI9GPcE/tGcF9UiSZtZBM7MukY4cAh7MemS6tZYipfw==";
       };
     };
-    "des.js-1.0.0" = {
+    "des.js-1.0.1" = {
       name = "des.js";
       packageName = "des.js";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz";
-        sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc";
+        url = "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz";
+        sha512 = "Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==";
       };
     };
     "detective-5.2.0" = {
@@ -868,6 +850,15 @@ let
         sha512 = "A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==";
       };
     };
+    "diff-4.0.2" = {
+      name = "diff";
+      packageName = "diff";
+      version = "4.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz";
+        sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==";
+      };
+    };
     "diffie-hellman-5.0.3" = {
       name = "diffie-hellman";
       packageName = "diffie-hellman";
@@ -877,13 +868,13 @@ let
         sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==";
       };
     };
-    "dom-serializer-0.1.1" = {
+    "dom-serializer-0.2.2" = {
       name = "dom-serializer";
       packageName = "dom-serializer";
-      version = "0.1.1";
+      version = "0.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz";
-        sha512 = "l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==";
+        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz";
+        sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==";
       };
     };
     "domain-browser-1.2.0" = {
@@ -904,6 +895,15 @@ let
         sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==";
       };
     };
+    "domelementtype-2.0.1" = {
+      name = "domelementtype";
+      packageName = "domelementtype";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz";
+        sha512 = "5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==";
+      };
+    };
     "domhandler-2.3.0" = {
       name = "domhandler";
       packageName = "domhandler";
@@ -940,13 +940,13 @@ let
         sha1 = "3a83a904e54353287874c564b7549386849a98c9";
       };
     };
-    "elliptic-6.4.1" = {
+    "elliptic-6.5.2" = {
       name = "elliptic";
       packageName = "elliptic";
-      version = "6.4.1";
+      version = "6.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz";
-        sha512 = "BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==";
+        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz";
+        sha512 = "f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==";
       };
     };
     "emoji-regex-7.0.3" = {
@@ -958,15 +958,6 @@ let
         sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==";
       };
     };
-    "end-of-stream-1.4.1" = {
-      name = "end-of-stream";
-      packageName = "end-of-stream";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz";
-        sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==";
-      };
-    };
     "entities-1.0.0" = {
       name = "entities";
       packageName = "entities";
@@ -976,13 +967,13 @@ let
         sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26";
       };
     };
-    "entities-1.1.2" = {
+    "entities-2.0.0" = {
       name = "entities";
       packageName = "entities";
-      version = "1.1.2";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz";
-        sha512 = "f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==";
+        url = "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz";
+        sha512 = "D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==";
       };
     };
     "errno-0.1.7" = {
@@ -994,22 +985,22 @@ let
         sha512 = "MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==";
       };
     };
-    "es-abstract-1.13.0" = {
+    "es-abstract-1.17.4" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.13.0";
+      version = "1.17.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz";
-        sha512 = "vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz";
+        sha512 = "Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==";
       };
     };
-    "es-to-primitive-1.2.0" = {
+    "es-to-primitive-1.2.1" = {
       name = "es-to-primitive";
       packageName = "es-to-primitive";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz";
-        sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==";
+        url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz";
+        sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==";
       };
     };
     "escape-string-regexp-1.0.5" = {
@@ -1048,15 +1039,6 @@ let
         sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==";
       };
     };
-    "execa-1.0.0" = {
-      name = "execa";
-      packageName = "execa";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz";
-        sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==";
-      };
-    };
     "exit-0.1.2" = {
       name = "exit";
       packageName = "exit";
@@ -1084,22 +1066,40 @@ let
         sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
       };
     };
-    "fast-deep-equal-2.0.1" = {
+    "fast-deep-equal-3.1.1" = {
       name = "fast-deep-equal";
       packageName = "fast-deep-equal";
-      version = "2.0.1";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz";
-        sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
+        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz";
+        sha512 = "8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==";
       };
     };
-    "fast-json-stable-stringify-2.0.0" = {
+    "fast-json-stable-stringify-2.1.0" = {
       name = "fast-json-stable-stringify";
       packageName = "fast-json-stable-stringify";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz";
-        sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
+        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz";
+        sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==";
+      };
+    };
+    "fast-safe-stringify-2.0.7" = {
+      name = "fast-safe-stringify";
+      packageName = "fast-safe-stringify";
+      version = "2.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz";
+        sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==";
+      };
+    };
+    "fill-range-7.0.1" = {
+      name = "fill-range";
+      packageName = "fill-range";
+      version = "7.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz";
+        sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==";
       };
     };
     "find-up-3.0.0" = {
@@ -1165,6 +1165,15 @@ let
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
+    "fsevents-2.1.2" = {
+      name = "fsevents";
+      packageName = "fsevents";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz";
+        sha512 = "R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==";
+      };
+    };
     "function-bind-1.1.1" = {
       name = "function-bind";
       packageName = "function-bind";
@@ -1183,15 +1192,6 @@ let
         sha512 = "mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==";
       };
     };
-    "get-caller-file-1.0.3" = {
-      name = "get-caller-file";
-      packageName = "get-caller-file";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz";
-        sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==";
-      };
-    };
     "get-caller-file-2.0.5" = {
       name = "get-caller-file";
       packageName = "get-caller-file";
@@ -1201,15 +1201,6 @@ let
         sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==";
       };
     };
-    "get-stream-4.1.0" = {
-      name = "get-stream";
-      packageName = "get-stream";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz";
-        sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==";
-      };
-    };
     "getpass-0.1.7" = {
       name = "getpass";
       packageName = "getpass";
@@ -1228,22 +1219,31 @@ let
         sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==";
       };
     };
-    "glob-7.1.4" = {
+    "glob-7.1.6" = {
       name = "glob";
       packageName = "glob";
-      version = "7.1.4";
+      version = "7.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz";
-        sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==";
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz";
+        sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==";
       };
     };
-    "graceful-fs-4.1.15" = {
+    "glob-parent-5.1.0" = {
+      name = "glob-parent";
+      packageName = "glob-parent";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz";
+        sha512 = "qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==";
+      };
+    };
+    "graceful-fs-4.2.3" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.1.15";
+      version = "4.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz";
-        sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz";
+        sha512 = "a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==";
       };
     };
     "growl-1.10.5" = {
@@ -1291,13 +1291,22 @@ let
         sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd";
       };
     };
-    "has-symbols-1.0.0" = {
+    "has-flag-4.0.0" = {
+      name = "has-flag";
+      packageName = "has-flag";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz";
+        sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==";
+      };
+    };
+    "has-symbols-1.0.1" = {
       name = "has-symbols";
       packageName = "has-symbols";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz";
-        sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44";
+        url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz";
+        sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==";
       };
     };
     "hash-base-3.0.4" = {
@@ -1453,6 +1462,15 @@ let
         sha1 = "633c2c83e3da42a502f52466022480f4208261de";
       };
     };
+    "inherits-2.0.4" = {
+      name = "inherits";
+      packageName = "inherits";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz";
+        sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
+      };
+    };
     "ini-1.1.0" = {
       name = "ini";
       packageName = "ini";
@@ -1498,15 +1516,6 @@ let
         sha512 = "mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==";
       };
     };
-    "invert-kv-2.0.0" = {
-      name = "invert-kv";
-      packageName = "invert-kv";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz";
-        sha512 = "wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==";
-      };
-    };
     "ip-regex-2.1.0" = {
       name = "ip-regex";
       packageName = "ip-regex";
@@ -1516,6 +1525,15 @@ let
         sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9";
       };
     };
+    "is-binary-path-2.1.0" = {
+      name = "is-binary-path";
+      packageName = "is-binary-path";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz";
+        sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==";
+      };
+    };
     "is-buffer-1.1.6" = {
       name = "is-buffer";
       packageName = "is-buffer";
@@ -1525,40 +1543,40 @@ let
         sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==";
       };
     };
-    "is-buffer-2.0.3" = {
+    "is-buffer-2.0.4" = {
       name = "is-buffer";
       packageName = "is-buffer";
-      version = "2.0.3";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz";
-        sha512 = "U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==";
+        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz";
+        sha512 = "Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==";
       };
     };
-    "is-callable-1.1.4" = {
+    "is-callable-1.1.5" = {
       name = "is-callable";
       packageName = "is-callable";
-      version = "1.1.4";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz";
-        sha512 = "r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==";
+        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz";
+        sha512 = "ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==";
       };
     };
-    "is-date-object-1.0.1" = {
+    "is-date-object-1.0.2" = {
       name = "is-date-object";
       packageName = "is-date-object";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz";
-        sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16";
+        url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz";
+        sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==";
       };
     };
-    "is-fullwidth-code-point-1.0.0" = {
-      name = "is-fullwidth-code-point";
-      packageName = "is-fullwidth-code-point";
-      version = "1.0.0";
+    "is-extglob-2.1.1" = {
+      name = "is-extglob";
+      packageName = "is-extglob";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";
-        sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb";
+        url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz";
+        sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2";
       };
     };
     "is-fullwidth-code-point-2.0.0" = {
@@ -1570,31 +1588,40 @@ let
         sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
       };
     };
-    "is-regex-1.0.4" = {
+    "is-glob-4.0.1" = {
+      name = "is-glob";
+      packageName = "is-glob";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz";
+        sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==";
+      };
+    };
+    "is-number-7.0.0" = {
+      name = "is-number";
+      packageName = "is-number";
+      version = "7.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz";
+        sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==";
+      };
+    };
+    "is-regex-1.0.5" = {
       name = "is-regex";
       packageName = "is-regex";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz";
-        sha1 = "5517489b547091b0930e095654ced25ee97e9491";
+        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz";
+        sha512 = "vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==";
       };
     };
-    "is-stream-1.1.0" = {
-      name = "is-stream";
-      packageName = "is-stream";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz";
-        sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44";
-      };
-    };
-    "is-symbol-1.0.2" = {
+    "is-symbol-1.0.3" = {
       name = "is-symbol";
       packageName = "is-symbol";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz";
-        sha512 = "HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==";
+        url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz";
+        sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==";
       };
     };
     "is-typedarray-1.0.0" = {
@@ -1723,13 +1750,13 @@ let
         sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
       };
     };
-    "just-extend-4.0.2" = {
+    "just-extend-4.1.0" = {
       name = "just-extend";
       packageName = "just-extend";
-      version = "4.0.2";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/just-extend/-/just-extend-4.0.2.tgz";
-        sha512 = "FrLwOgm+iXrPV+5zDU6Jqu4gCRXbWEQg2O3SKONsWE4w7AXFRkryS53bpWdaL9cNol+AmR3AEYz6kn+o0fCPnw==";
+        url = "https://registry.npmjs.org/just-extend/-/just-extend-4.1.0.tgz";
+        sha512 = "ApcjaOdVTJ7y4r08xI5wIqpvwS48Q0PBG4DJROcEkH1f8MdAiNFyFxz3xoL0LWAVwjrwPYZdVHHxhRHcx/uGLA==";
       };
     };
     "kew-0.1.7" = {
@@ -1750,15 +1777,6 @@ let
         sha512 = "Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw==";
       };
     };
-    "lcid-2.0.0" = {
-      name = "lcid";
-      packageName = "lcid";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz";
-        sha512 = "avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==";
-      };
-    };
     "locate-path-3.0.0" = {
       name = "locate-path";
       packageName = "locate-path";
@@ -1768,13 +1786,22 @@ let
         sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==";
       };
     };
-    "lodash-4.17.11" = {
+    "lodash-4.17.15" = {
       name = "lodash";
       packageName = "lodash";
-      version = "4.17.11";
+      version = "4.17.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz";
-        sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==";
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz";
+        sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==";
+      };
+    };
+    "lodash.get-4.4.2" = {
+      name = "lodash.get";
+      packageName = "lodash.get";
+      version = "4.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz";
+        sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99";
       };
     };
     "lodash.memoize-3.0.4" = {
@@ -1786,31 +1813,13 @@ let
         sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f";
       };
     };
-    "log-symbols-2.2.0" = {
+    "log-symbols-3.0.0" = {
       name = "log-symbols";
       packageName = "log-symbols";
-      version = "2.2.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz";
-        sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==";
-      };
-    };
-    "lolex-4.1.0" = {
-      name = "lolex";
-      packageName = "lolex";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lolex/-/lolex-4.1.0.tgz";
-        sha512 = "BYxIEXiVq5lGIXeVHnsFzqa1TxN5acnKnPCdlZSpzm8viNEOhiigupA4vTQ9HEFQ6nLTQ9wQOgBknJgzUYQ9Aw==";
-      };
-    };
-    "map-age-cleaner-0.1.3" = {
-      name = "map-age-cleaner";
-      packageName = "map-age-cleaner";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz";
-        sha512 = "bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==";
+        url = "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz";
+        sha512 = "dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==";
       };
     };
     "md5.js-1.3.5" = {
@@ -1822,15 +1831,6 @@ let
         sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==";
       };
     };
-    "mem-4.3.0" = {
-      name = "mem";
-      packageName = "mem";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz";
-        sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==";
-      };
-    };
     "miller-rabin-4.0.1" = {
       name = "miller-rabin";
       packageName = "miller-rabin";
@@ -1858,31 +1858,22 @@ let
         sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
       };
     };
-    "mime-db-1.40.0" = {
+    "mime-db-1.43.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.40.0";
+      version = "1.43.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz";
-        sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz";
+        sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==";
       };
     };
-    "mime-types-2.1.24" = {
+    "mime-types-2.1.26" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.24";
+      version = "2.1.26";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz";
-        sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==";
-      };
-    };
-    "mimic-fn-2.1.0" = {
-      name = "mimic-fn";
-      packageName = "mimic-fn";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz";
-        sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz";
+        sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==";
       };
     };
     "minimalistic-assert-1.0.1" = {
@@ -1921,13 +1912,13 @@ let
         sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
-    "minimist-1.2.0" = {
+    "minimist-1.2.5" = {
       name = "minimist";
       packageName = "minimist";
-      version = "1.2.0";
+      version = "1.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
-        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
+        sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
       };
     };
     "mkdirp-0.3.5" = {
@@ -1957,13 +1948,13 @@ let
         sha1 = "586538c8d71fa8de90c41a46acc0481c1fb83e18";
       };
     };
-    "module-deps-6.2.1" = {
+    "module-deps-6.2.2" = {
       name = "module-deps";
       packageName = "module-deps";
-      version = "6.2.1";
+      version = "6.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/module-deps/-/module-deps-6.2.1.tgz";
-        sha512 = "UnEn6Ah36Tu4jFiBbJVUtt0h+iXqxpLqDvPS8nllbw5RZFmNJ1+Mz5BjYnM9ieH80zyxHkARGLnMIHlPK5bu6A==";
+        url = "https://registry.npmjs.org/module-deps/-/module-deps-6.2.2.tgz";
+        sha512 = "a9y6yDv5u5I4A+IPHTnqFxcaKr4p50/zxTjcQJaX2ws9tN/W6J6YXnEKhqRyPhl494dkcxx951onSKVezmI+3w==";
       };
     };
     "ms-2.1.1" = {
@@ -1984,31 +1975,22 @@ let
         sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574";
       };
     };
-    "nice-try-1.0.5" = {
-      name = "nice-try";
-      packageName = "nice-try";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz";
-        sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==";
-      };
-    };
-    "nise-1.5.0" = {
+    "nise-4.0.3" = {
       name = "nise";
       packageName = "nise";
-      version = "1.5.0";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nise/-/nise-1.5.0.tgz";
-        sha512 = "Z3sfYEkLFzFmL8KY6xnSJLRxwQwYBjOXi/24lb62ZnZiGA0JUzGGTI6TBIgfCSMIDl9Jlu8SRmHNACLTemDHww==";
+        url = "https://registry.npmjs.org/nise/-/nise-4.0.3.tgz";
+        sha512 = "EGlhjm7/4KvmmE6B/UFsKh7eHykRl9VH+au8dduHLCyWUO/hr7+N+WtTvDUwc9zHuM1IaIJs/0lQ6Ag1jDkQSg==";
       };
     };
-    "node-environment-flags-1.0.5" = {
+    "node-environment-flags-1.0.6" = {
       name = "node-environment-flags";
       packageName = "node-environment-flags";
-      version = "1.0.5";
+      version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz";
-        sha512 = "VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==";
+        url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz";
+        sha512 = "5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==";
       };
     };
     "node-uuid-1.4.8" = {
@@ -2029,13 +2011,13 @@ let
         sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7";
       };
     };
-    "npm-run-path-2.0.2" = {
-      name = "npm-run-path";
-      packageName = "npm-run-path";
-      version = "2.0.2";
+    "normalize-path-3.0.0" = {
+      name = "normalize-path";
+      packageName = "normalize-path";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz";
-        sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f";
+        url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz";
+        sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==";
       };
     };
     "npmconf-0.0.24" = {
@@ -2047,15 +2029,6 @@ let
         sha1 = "b78875b088ccc3c0afa3eceb3ce3244b1b52390c";
       };
     };
-    "number-is-nan-1.0.1" = {
-      name = "number-is-nan";
-      packageName = "number-is-nan";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
-        sha1 = "097b602b53422a522c1afb8790318336941a011d";
-      };
-    };
     "oauth-sign-0.3.0" = {
       name = "oauth-sign";
       packageName = "oauth-sign";
@@ -2083,6 +2056,15 @@ let
         sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
       };
     };
+    "object-inspect-1.7.0" = {
+      name = "object-inspect";
+      packageName = "object-inspect";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz";
+        sha512 = "a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==";
+      };
+    };
     "object-keys-1.1.1" = {
       name = "object-keys";
       packageName = "object-keys";
@@ -2101,13 +2083,13 @@ let
         sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==";
       };
     };
-    "object.getownpropertydescriptors-2.0.3" = {
+    "object.getownpropertydescriptors-2.1.0" = {
       name = "object.getownpropertydescriptors";
       packageName = "object.getownpropertydescriptors";
-      version = "2.0.3";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz";
-        sha1 = "8758c846f5b407adab0f236e0986f14b051caa16";
+        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz";
+        sha512 = "Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==";
       };
     };
     "once-1.1.1" = {
@@ -2137,15 +2119,6 @@ let
         sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27";
       };
     };
-    "os-locale-3.1.0" = {
-      name = "os-locale";
-      packageName = "os-locale";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz";
-        sha512 = "Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==";
-      };
-    };
     "osenv-0.0.3" = {
       name = "osenv";
       packageName = "osenv";
@@ -2155,40 +2128,13 @@ let
         sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6";
       };
     };
-    "p-defer-1.0.0" = {
-      name = "p-defer";
-      packageName = "p-defer";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz";
-        sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c";
-      };
-    };
-    "p-finally-1.0.0" = {
-      name = "p-finally";
-      packageName = "p-finally";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz";
-        sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
-      };
-    };
-    "p-is-promise-2.1.0" = {
-      name = "p-is-promise";
-      packageName = "p-is-promise";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz";
-        sha512 = "Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==";
-      };
-    };
-    "p-limit-2.2.0" = {
+    "p-limit-2.2.2" = {
       name = "p-limit";
       packageName = "p-limit";
-      version = "2.2.0";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz";
-        sha512 = "pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==";
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz";
+        sha512 = "WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==";
       };
     };
     "p-locate-3.0.0" = {
@@ -2209,13 +2155,13 @@ let
         sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==";
       };
     };
-    "pako-1.0.10" = {
+    "pako-1.0.11" = {
       name = "pako";
       packageName = "pako";
-      version = "1.0.10";
+      version = "1.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz";
-        sha512 = "0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==";
+        url = "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz";
+        sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==";
       };
     };
     "parents-1.0.1" = {
@@ -2227,13 +2173,13 @@ let
         sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751";
       };
     };
-    "parse-asn1-5.1.4" = {
+    "parse-asn1-5.1.5" = {
       name = "parse-asn1";
       packageName = "parse-asn1";
-      version = "5.1.4";
+      version = "5.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz";
-        sha512 = "Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==";
+        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz";
+        sha512 = "jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==";
       };
     };
     "path-browserify-0.0.1" = {
@@ -2263,15 +2209,6 @@ let
         sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
       };
     };
-    "path-key-2.0.1" = {
-      name = "path-key";
-      packageName = "path-key";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz";
-        sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
-      };
-    };
     "path-parse-1.0.6" = {
       name = "path-parse";
       packageName = "path-parse";
@@ -2290,13 +2227,13 @@ let
         sha1 = "e864217f74c36850f0852b78dc7bf7d4a5721bf2";
       };
     };
-    "path-to-regexp-1.7.0" = {
+    "path-to-regexp-1.8.0" = {
       name = "path-to-regexp";
       packageName = "path-to-regexp";
-      version = "1.7.0";
+      version = "1.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz";
-        sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d";
+        url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz";
+        sha512 = "n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==";
       };
     };
     "pbkdf2-3.0.17" = {
@@ -2326,6 +2263,15 @@ let
         sha1 = "0b3a7ce630486a83be91ff4e832eee20e971115b";
       };
     };
+    "picomatch-2.2.1" = {
+      name = "picomatch";
+      packageName = "picomatch";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz";
+        sha512 = "ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==";
+      };
+    };
     "process-0.11.10" = {
       name = "process";
       packageName = "process";
@@ -2335,13 +2281,13 @@ let
         sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182";
       };
     };
-    "process-nextick-args-2.0.0" = {
+    "process-nextick-args-2.0.1" = {
       name = "process-nextick-args";
       packageName = "process-nextick-args";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz";
-        sha512 = "MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==";
+        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
+        sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==";
       };
     };
     "progress-1.1.8" = {
@@ -2380,13 +2326,13 @@ let
         sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476";
       };
     };
-    "psl-1.1.32" = {
+    "psl-1.7.0" = {
       name = "psl";
       packageName = "psl";
-      version = "1.1.32";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz";
-        sha512 = "MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g==";
+        url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz";
+        sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==";
       };
     };
     "public-encrypt-4.0.3" = {
@@ -2398,15 +2344,6 @@ let
         sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==";
       };
     };
-    "pump-3.0.0" = {
-      name = "pump";
-      packageName = "pump";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz";
-        sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==";
-      };
-    };
     "punycode-1.3.2" = {
       name = "punycode";
       packageName = "punycode";
@@ -2506,13 +2443,31 @@ let
         sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9";
       };
     };
-    "readable-stream-2.3.6" = {
+    "readable-stream-2.3.7" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.3.6";
+      version = "2.3.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
-        sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz";
+        sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==";
+      };
+    };
+    "readable-stream-3.6.0" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "3.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz";
+        sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==";
+      };
+    };
+    "readdirp-3.2.0" = {
+      name = "readdirp";
+      packageName = "readdirp";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz";
+        sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==";
       };
     };
     "rechoir-0.6.2" = {
@@ -2533,13 +2488,13 @@ let
         sha1 = "28c6c04262c7b9ffdd21b9255374517ee6d943f5";
       };
     };
-    "request-2.88.0" = {
+    "request-2.88.2" = {
       name = "request";
       packageName = "request";
-      version = "2.88.0";
+      version = "2.88.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz";
-        sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==";
+        url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz";
+        sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==";
       };
     };
     "request-progress-0.3.1" = {
@@ -2560,15 +2515,6 @@ let
         sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42";
       };
     };
-    "require-main-filename-1.0.1" = {
-      name = "require-main-filename";
-      packageName = "require-main-filename";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
-        sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1";
-      };
-    };
     "require-main-filename-2.0.0" = {
       name = "require-main-filename";
       packageName = "require-main-filename";
@@ -2587,13 +2533,13 @@ let
         sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
       };
     };
-    "resolve-1.11.1" = {
+    "resolve-1.15.1" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.11.1";
+      version = "1.15.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz";
-        sha512 = "vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz";
+        sha512 = "84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==";
       };
     };
     "rimraf-2.2.8" = {
@@ -2623,6 +2569,15 @@ let
         sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
       };
     };
+    "safe-buffer-5.2.0" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz";
+        sha512 = "fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==";
+      };
+    };
     "safer-buffer-2.1.2" = {
       name = "safer-buffer";
       packageName = "safer-buffer";
@@ -2641,13 +2596,13 @@ let
         sha1 = "2e5a4e72bab03472cc97f72753b4508912ef5540";
       };
     };
-    "semver-5.7.0" = {
+    "semver-5.7.1" = {
       name = "semver";
       packageName = "semver";
-      version = "5.7.0";
+      version = "5.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz";
-        sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==";
+        url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
+        sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
       };
     };
     "set-blocking-2.0.0" = {
@@ -2677,31 +2632,22 @@ let
         sha1 = "e7012310d8f417f4deb5712150e5678b87ae565f";
       };
     };
-    "shebang-command-1.2.0" = {
-      name = "shebang-command";
-      packageName = "shebang-command";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz";
-        sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea";
-      };
-    };
-    "shebang-regex-1.0.0" = {
-      name = "shebang-regex";
-      packageName = "shebang-regex";
+    "shasum-object-1.0.0" = {
+      name = "shasum-object";
+      packageName = "shasum-object";
       version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz";
-        sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3";
+        url = "https://registry.npmjs.org/shasum-object/-/shasum-object-1.0.0.tgz";
+        sha512 = "Iqo5rp/3xVi6M4YheapzZhhGPVs0yZwHj7wvwQ1B9z8H6zk+FEnI7y3Teq7qwnekfEhu8WmG2z0z4iWZaxLWVg==";
       };
     };
-    "shell-quote-1.6.1" = {
+    "shell-quote-1.7.2" = {
       name = "shell-quote";
       packageName = "shell-quote";
-      version = "1.6.1";
+      version = "1.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz";
-        sha1 = "f4781949cce402697127430ea3b3c5476f481767";
+        url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz";
+        sha512 = "mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==";
       };
     };
     "shelljs-0.3.0" = {
@@ -2749,22 +2695,13 @@ let
         sha512 = "JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==";
       };
     };
-    "should-util-1.0.0" = {
+    "should-util-1.0.1" = {
       name = "should-util";
       packageName = "should-util";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/should-util/-/should-util-1.0.0.tgz";
-        sha1 = "c98cda374aa6b190df8ba87c9889c2b4db620063";
-      };
-    };
-    "signal-exit-3.0.2" = {
-      name = "signal-exit";
-      packageName = "signal-exit";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
-        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
+        url = "https://registry.npmjs.org/should-util/-/should-util-1.0.1.tgz";
+        sha512 = "oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g==";
       };
     };
     "simple-concat-1.0.0" = {
@@ -2839,13 +2776,13 @@ let
         sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe";
       };
     };
-    "stream-http-2.8.3" = {
+    "stream-http-3.1.0" = {
       name = "stream-http";
       packageName = "stream-http";
-      version = "2.8.3";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz";
-        sha512 = "+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==";
+        url = "https://registry.npmjs.org/stream-http/-/stream-http-3.1.0.tgz";
+        sha512 = "cuB6RgO7BqC4FBYzmnvhob5Do3wIdIsXAgGycHJnW+981gHqoYcYz9lqjJrk8WXRddbwPuqPYRl+bag6mYv4lw==";
       };
     };
     "stream-splicer-2.0.1" = {
@@ -2857,15 +2794,6 @@ let
         sha512 = "Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg==";
       };
     };
-    "string-width-1.0.2" = {
-      name = "string-width";
-      packageName = "string-width";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";
-        sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
-      };
-    };
     "string-width-2.1.1" = {
       name = "string-width";
       packageName = "string-width";
@@ -2884,6 +2812,24 @@ let
         sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==";
       };
     };
+    "string.prototype.trimleft-2.1.1" = {
+      name = "string.prototype.trimleft";
+      packageName = "string.prototype.trimleft";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz";
+        sha512 = "iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==";
+      };
+    };
+    "string.prototype.trimright-2.1.1" = {
+      name = "string.prototype.trimright";
+      packageName = "string.prototype.trimright";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz";
+        sha512 = "qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==";
+      };
+    };
     "string_decoder-0.10.31" = {
       name = "string_decoder";
       packageName = "string_decoder";
@@ -2902,22 +2848,13 @@ let
         sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
       };
     };
-    "string_decoder-1.2.0" = {
+    "string_decoder-1.3.0" = {
       name = "string_decoder";
       packageName = "string_decoder";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz";
-        sha512 = "6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==";
-      };
-    };
-    "strip-ansi-3.0.1" = {
-      name = "strip-ansi";
-      packageName = "strip-ansi";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
-        sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz";
+        sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==";
       };
     };
     "strip-ansi-4.0.0" = {
@@ -2938,15 +2875,6 @@ let
         sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==";
       };
     };
-    "strip-eof-1.0.0" = {
-      name = "strip-eof";
-      packageName = "strip-eof";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz";
-        sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf";
-      };
-    };
     "strip-json-comments-1.0.4" = {
       name = "strip-json-comments";
       packageName = "strip-json-comments";
@@ -2992,6 +2920,15 @@ let
         sha512 = "on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==";
       };
     };
+    "supports-color-7.1.0" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "7.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz";
+        sha512 = "oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==";
+      };
+    };
     "syntax-error-1.4.0" = {
       name = "syntax-error";
       packageName = "syntax-error";
@@ -3037,22 +2974,22 @@ let
         sha1 = "c9c58b575be8407375cb5e2462dacee74359f41d";
       };
     };
-    "to-arraybuffer-1.0.1" = {
-      name = "to-arraybuffer";
-      packageName = "to-arraybuffer";
-      version = "1.0.1";
+    "to-regex-range-5.0.1" = {
+      name = "to-regex-range";
+      packageName = "to-regex-range";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz";
-        sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43";
+        url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz";
+        sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==";
       };
     };
-    "tough-cookie-2.4.3" = {
+    "tough-cookie-2.5.0" = {
       name = "tough-cookie";
       packageName = "tough-cookie";
-      version = "2.4.3";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz";
-        sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==";
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz";
+        sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==";
       };
     };
     "tough-cookie-3.0.1" = {
@@ -3064,6 +3001,15 @@ let
         sha512 = "yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==";
       };
     };
+    "tslib-1.11.1" = {
+      name = "tslib";
+      packageName = "tslib";
+      version = "1.11.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz";
+        sha512 = "aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==";
+      };
+    };
     "tty-browserify-0.0.1" = {
       name = "tty-browserify";
       packageName = "tty-browserify";
@@ -3181,13 +3127,13 @@ let
         sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
       };
     };
-    "uuid-3.3.2" = {
+    "uuid-3.4.0" = {
       name = "uuid";
       packageName = "uuid";
-      version = "3.3.2";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz";
-        sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz";
+        sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==";
       };
     };
     "verror-1.10.0" = {
@@ -3199,13 +3145,13 @@ let
         sha1 = "3a105ca17053af55d6e270c1f8288682e18da400";
       };
     };
-    "vm-browserify-1.1.0" = {
+    "vm-browserify-1.1.2" = {
       name = "vm-browserify";
       packageName = "vm-browserify";
-      version = "1.1.0";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz";
-        sha512 = "iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==";
+        url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz";
+        sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==";
       };
     };
     "which-1.0.9" = {
@@ -3244,13 +3190,13 @@ let
         sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==";
       };
     };
-    "wrap-ansi-2.1.0" = {
+    "wrap-ansi-5.1.0" = {
       name = "wrap-ansi";
       packageName = "wrap-ansi";
-      version = "2.1.0";
+      version = "5.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
-        sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
+        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz";
+        sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==";
       };
     };
     "wrappy-1.0.2" = {
@@ -3262,13 +3208,13 @@ let
         sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
       };
     };
-    "xtend-4.0.1" = {
+    "xtend-4.0.2" = {
       name = "xtend";
       packageName = "xtend";
-      version = "4.0.1";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz";
-        sha1 = "a5c6d532be656e23db820efb943a1f04998d63af";
+        url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz";
+        sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==";
       };
     };
     "y18n-4.0.0" = {
@@ -3280,49 +3226,31 @@ let
         sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==";
       };
     };
-    "yargs-12.0.5" = {
+    "yargs-13.3.0" = {
       name = "yargs";
       packageName = "yargs";
-      version = "12.0.5";
+      version = "13.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz";
-        sha512 = "Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==";
+        url = "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz";
+        sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==";
       };
     };
-    "yargs-13.2.2" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "13.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-13.2.2.tgz";
-        sha512 = "WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==";
-      };
-    };
-    "yargs-parser-11.1.1" = {
+    "yargs-parser-13.1.1" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
-      version = "11.1.1";
+      version = "13.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz";
-        sha512 = "C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==";
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz";
+        sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==";
       };
     };
-    "yargs-parser-13.0.0" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "13.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.0.0.tgz";
-        sha512 = "w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==";
-      };
-    };
-    "yargs-unparser-1.5.0" = {
+    "yargs-unparser-1.6.0" = {
       name = "yargs-unparser";
       packageName = "yargs-unparser";
-      version = "1.5.0";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.5.0.tgz";
-        sha512 = "HK25qidFTCVuj/D1VfNiEndpLIeJN78aqgR23nL3y4N0U/91cOAzqfHlF8n2BvoNDcZmJKin3ddNSvOxSr8flw==";
+        url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz";
+        sha512 = "W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==";
       };
     };
   };
@@ -3331,10 +3259,10 @@ in
   marked = nodeEnv.buildNodePackage {
     name = "marked";
     packageName = "marked";
-    version = "0.6.2";
+    version = "0.8.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/marked/-/marked-0.6.2.tgz";
-      sha512 = "LqxwVH3P/rqKX4EKGz7+c2G9r98WeM/SW34ybhgNGhUQNKtf1GmmSkJ6cDGJ/t6tiyae49qRkpyTw2B9HOrgUA==";
+      url = "https://registry.npmjs.org/marked/-/marked-0.8.0.tgz";
+      sha512 = "MyUe+T/Pw4TZufHkzAfDj6HarCBWia2y27/bhuYkTaiUnfDYFnCP3KUN+9oM7Wi6JA2rymtVYbQu3spE0GCmxQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -3349,20 +3277,16 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "16.2.3";
+    version = "16.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-16.2.3.tgz";
-      sha512 = "zQt/Gd1+W+IY+h/xX2NYMW4orQWhqSwyV+xsblycTtpOuB27h1fZhhNQuipJ4t79ohw4P4mMem0jp/ZkISQtjQ==";
+      url = "https://registry.npmjs.org/browserify/-/browserify-16.5.0.tgz";
+      sha512 = "6bfI3cl76YLAnCZ75AGu/XPOsqUhRyc0F/olGIJeCxtfxF2HvPKEcmjU9M8oAPxl4uBY1U7Nry33Q6koV3f2iw==";
     };
     dependencies = [
       sources."JSONStream-1.3.5"
-      sources."acorn-6.1.1"
-      sources."acorn-dynamic-import-4.0.0"
-      sources."acorn-node-1.7.0"
-      sources."acorn-walk-6.1.1"
-      sources."array-filter-0.0.1"
-      sources."array-map-0.0.0"
-      sources."array-reduce-0.0.0"
+      sources."acorn-7.1.1"
+      sources."acorn-node-1.8.2"
+      sources."acorn-walk-7.1.1"
       sources."asn1.js-4.10.1"
       (sources."assert-1.5.0" // {
         dependencies = [
@@ -3371,7 +3295,7 @@ in
         ];
       })
       sources."balanced-match-1.0.0"
-      sources."base64-js-1.3.0"
+      sources."base64-js-1.3.1"
       sources."bn.js-4.11.8"
       sources."brace-expansion-1.1.11"
       sources."brorand-1.1.0"
@@ -3387,7 +3311,7 @@ in
       sources."browserify-rsa-4.0.1"
       sources."browserify-sign-4.0.4"
       sources."browserify-zlib-0.2.0"
-      sources."buffer-5.2.1"
+      sources."buffer-5.5.0"
       sources."buffer-from-1.1.1"
       sources."buffer-xor-1.0.3"
       sources."builtin-status-codes-3.0.0"
@@ -3396,7 +3320,7 @@ in
       sources."combine-source-map-0.8.0"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
-      sources."console-browserify-1.1.0"
+      sources."console-browserify-1.2.0"
       sources."constants-browserify-1.0.0"
       sources."convert-source-map-1.1.3"
       sources."core-util-is-1.0.2"
@@ -3405,25 +3329,25 @@ in
       sources."create-hmac-1.1.7"
       sources."crypto-browserify-3.12.0"
       sources."dash-ast-1.0.0"
-      sources."date-now-0.1.4"
       sources."defined-1.0.0"
-      sources."deps-sort-2.0.0"
-      sources."des.js-1.0.0"
+      sources."deps-sort-2.0.1"
+      sources."des.js-1.0.1"
       (sources."detective-5.2.0" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
         ];
       })
       sources."diffie-hellman-5.0.3"
       sources."domain-browser-1.2.0"
       sources."duplexer2-0.1.4"
-      sources."elliptic-6.4.1"
+      sources."elliptic-6.5.2"
       sources."events-2.1.0"
       sources."evp_bytestokey-1.0.3"
+      sources."fast-safe-stringify-2.0.7"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
       sources."get-assigned-identifiers-1.2.0"
-      sources."glob-7.1.4"
+      sources."glob-7.1.6"
       sources."has-1.0.3"
       sources."hash-base-3.0.4"
       sources."hash.js-1.1.7"
@@ -3432,7 +3356,7 @@ in
       sources."https-browserify-1.0.0"
       sources."ieee754-1.1.13"
       sources."inflight-1.0.6"
-      sources."inherits-2.0.3"
+      sources."inherits-2.0.4"
       sources."inline-source-map-0.6.2"
       sources."insert-module-globals-7.2.0"
       sources."is-buffer-1.1.6"
@@ -3449,20 +3373,20 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
-      sources."module-deps-6.2.1"
+      sources."module-deps-6.2.2"
       sources."object-assign-4.1.1"
       sources."once-1.4.0"
       sources."os-browserify-0.3.0"
-      sources."pako-1.0.10"
+      sources."pako-1.0.11"
       sources."parents-1.0.1"
-      sources."parse-asn1-5.1.4"
+      sources."parse-asn1-5.1.5"
       sources."path-browserify-0.0.1"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
       sources."path-platform-0.11.15"
       sources."pbkdf2-3.0.17"
       sources."process-0.11.10"
-      sources."process-nextick-args-2.0.0"
+      sources."process-nextick-args-2.0.1"
       sources."public-encrypt-4.0.3"
       sources."punycode-1.4.1"
       sources."querystring-0.2.0"
@@ -3470,34 +3394,39 @@ in
       sources."randombytes-2.1.0"
       sources."randomfill-1.0.4"
       sources."read-only-stream-2.0.0"
-      (sources."readable-stream-2.3.6" // {
+      (sources."readable-stream-2.3.7" // {
         dependencies = [
+          sources."safe-buffer-5.1.2"
           sources."string_decoder-1.1.1"
         ];
       })
-      sources."resolve-1.11.1"
+      sources."resolve-1.15.1"
       sources."ripemd160-2.0.2"
-      sources."safe-buffer-5.1.2"
+      sources."safe-buffer-5.2.0"
       sources."sha.js-2.4.11"
       sources."shasum-1.0.2"
-      sources."shell-quote-1.6.1"
+      sources."shasum-object-1.0.0"
+      sources."shell-quote-1.7.2"
       sources."simple-concat-1.0.0"
       sources."source-map-0.5.7"
       sources."stream-browserify-2.0.2"
       sources."stream-combiner2-1.1.1"
-      sources."stream-http-2.8.3"
+      (sources."stream-http-3.1.0" // {
+        dependencies = [
+          sources."readable-stream-3.6.0"
+        ];
+      })
       sources."stream-splicer-2.0.1"
-      sources."string_decoder-1.2.0"
+      sources."string_decoder-1.3.0"
       (sources."subarg-1.0.0" // {
         dependencies = [
-          sources."minimist-1.2.0"
+          sources."minimist-1.2.5"
         ];
       })
       sources."syntax-error-1.4.0"
       sources."through-2.3.8"
       sources."through2-2.0.5"
       sources."timers-browserify-1.4.2"
-      sources."to-arraybuffer-1.0.1"
       sources."tty-browserify-0.0.1"
       sources."typedarray-0.0.6"
       sources."umd-3.0.3"
@@ -3507,11 +3436,15 @@ in
           sources."punycode-1.3.2"
         ];
       })
-      sources."util-0.10.4"
+      (sources."util-0.10.4" // {
+        dependencies = [
+          sources."inherits-2.0.3"
+        ];
+      })
       sources."util-deprecate-1.0.2"
-      sources."vm-browserify-1.1.0"
+      sources."vm-browserify-1.1.2"
       sources."wrappy-1.0.2"
-      sources."xtend-4.0.1"
+      sources."xtend-4.0.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -3526,13 +3459,13 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.6.0";
+    version = "3.8.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz";
-      sha512 = "W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.0.tgz";
+      sha512 = "ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ==";
     };
     dependencies = [
-      sources."commander-2.20.0"
+      sources."commander-2.20.3"
       sources."source-map-0.6.1"
     ];
     buildInputs = globalBuildInputs;
@@ -3548,19 +3481,19 @@ in
   less = nodeEnv.buildNodePackage {
     name = "less";
     packageName = "less";
-    version = "3.9.0";
+    version = "3.11.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/less/-/less-3.9.0.tgz";
-      sha512 = "31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==";
+      url = "https://registry.npmjs.org/less/-/less-3.11.1.tgz";
+      sha512 = "tlWX341RECuTOvoDIvtFqXsKj072hm3+9ymRBe76/mD6O5ZZecnlAOVDlWAleF2+aohFrxNidXhv2773f6kY7g==";
     };
     dependencies = [
-      sources."ajv-6.10.0"
+      sources."ajv-6.12.0"
       sources."asap-2.0.6"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.8.0"
+      sources."aws4-1.9.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."caseless-0.12.0"
       sources."clone-2.1.2"
@@ -3572,12 +3505,12 @@ in
       sources."errno-0.1.7"
       sources."extend-3.0.2"
       sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-2.0.1"
-      sources."fast-json-stable-stringify-2.0.0"
+      sources."fast-deep-equal-3.1.1"
+      sources."fast-json-stable-stringify-2.1.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
       sources."getpass-0.1.7"
-      sources."graceful-fs-4.1.15"
+      sources."graceful-fs-4.2.3"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
       sources."http-signature-1.2.0"
@@ -3590,31 +3523,28 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."jsprim-1.4.1"
       sources."mime-1.6.0"
-      sources."mime-db-1.40.0"
-      sources."mime-types-2.1.24"
+      sources."mime-db-1.43.0"
+      sources."mime-types-2.1.26"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
       sources."oauth-sign-0.9.0"
       sources."performance-now-2.1.0"
       sources."promise-7.3.1"
       sources."prr-1.0.1"
-      sources."psl-1.1.32"
+      sources."psl-1.7.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
-      sources."request-2.88.0"
-      sources."safe-buffer-5.1.2"
+      sources."request-2.88.2"
+      sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
       sources."source-map-0.6.1"
       sources."sshpk-1.16.1"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
+      sources."tslib-1.11.1"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."uri-js-4.2.2"
-      sources."uuid-3.3.2"
+      sources."uuid-3.4.0"
       sources."verror-1.10.0"
     ];
     buildInputs = globalBuildInputs;
@@ -3630,18 +3560,21 @@ in
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
     packageName = "mocha";
-    version = "6.1.4";
+    version = "7.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-6.1.4.tgz";
-      sha512 = "PN8CIy4RXsIoxoFJzS4QNnCH4psUCPWc4/rPrst/ecSJJbLBkubMiyGCP2Kj/9YnWbotFqAoeXyXMucj7gwCFg==";
+      url = "https://registry.npmjs.org/mocha/-/mocha-7.1.0.tgz";
+      sha512 = "MymHK8UkU0K15Q/zX7uflZgVoRWiTjy0fXE/QjKts6mowUvGxOdPhZ2qj3b0iZdUrNZlW9LAIMFHB4IW+2b3EQ==";
     };
     dependencies = [
       sources."ansi-colors-3.2.3"
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
+      sources."anymatch-3.1.1"
       sources."argparse-1.0.10"
       sources."balanced-match-1.0.0"
+      sources."binary-extensions-2.0.0"
       sources."brace-expansion-1.1.11"
+      sources."braces-3.0.2"
       sources."browser-stdout-1.3.1"
       sources."camelcase-5.3.1"
       (sources."chalk-2.4.2" // {
@@ -3649,119 +3582,108 @@ in
           sources."supports-color-5.5.0"
         ];
       })
-      sources."cliui-4.1.0"
-      sources."code-point-at-1.1.0"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
-      sources."concat-map-0.0.1"
-      sources."cross-spawn-6.0.5"
-      sources."debug-3.2.6"
-      sources."decamelize-1.2.0"
-      sources."define-properties-1.1.3"
-      sources."diff-3.5.0"
-      sources."emoji-regex-7.0.3"
-      sources."end-of-stream-1.4.1"
-      sources."es-abstract-1.13.0"
-      sources."es-to-primitive-1.2.0"
-      sources."escape-string-regexp-1.0.5"
-      sources."esprima-4.0.1"
-      sources."execa-1.0.0"
-      sources."find-up-3.0.0"
-      sources."flat-4.1.0"
-      sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.1"
-      sources."get-caller-file-2.0.5"
-      sources."get-stream-4.1.0"
-      sources."glob-7.1.3"
-      sources."growl-1.10.5"
-      sources."has-1.0.3"
-      sources."has-flag-3.0.0"
-      sources."has-symbols-1.0.0"
-      sources."he-1.2.0"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.3"
-      sources."invert-kv-2.0.0"
-      sources."is-buffer-2.0.3"
-      sources."is-callable-1.1.4"
-      sources."is-date-object-1.0.1"
-      sources."is-fullwidth-code-point-2.0.0"
-      sources."is-regex-1.0.4"
-      sources."is-stream-1.1.0"
-      sources."is-symbol-1.0.2"
-      sources."isexe-2.0.0"
-      sources."js-yaml-3.13.1"
-      sources."lcid-2.0.0"
-      sources."locate-path-3.0.0"
-      sources."lodash-4.17.11"
-      sources."log-symbols-2.2.0"
-      sources."map-age-cleaner-0.1.3"
-      sources."mem-4.3.0"
-      sources."mimic-fn-2.1.0"
-      sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
-      sources."ms-2.1.1"
-      sources."nice-try-1.0.5"
-      sources."node-environment-flags-1.0.5"
-      sources."npm-run-path-2.0.2"
-      sources."number-is-nan-1.0.1"
-      sources."object-keys-1.1.1"
-      sources."object.assign-4.1.0"
-      sources."object.getownpropertydescriptors-2.0.3"
-      sources."once-1.4.0"
-      sources."os-locale-3.1.0"
-      sources."p-defer-1.0.0"
-      sources."p-finally-1.0.0"
-      sources."p-is-promise-2.1.0"
-      sources."p-limit-2.2.0"
-      sources."p-locate-3.0.0"
-      sources."p-try-2.2.0"
-      sources."path-exists-3.0.0"
-      sources."path-is-absolute-1.0.1"
-      sources."path-key-2.0.1"
-      sources."pump-3.0.0"
-      sources."require-directory-2.1.1"
-      sources."require-main-filename-2.0.0"
-      sources."semver-5.7.0"
-      sources."set-blocking-2.0.0"
-      sources."shebang-command-1.2.0"
-      sources."shebang-regex-1.0.0"
-      sources."signal-exit-3.0.2"
-      sources."sprintf-js-1.0.3"
-      sources."string-width-2.1.1"
-      sources."strip-ansi-4.0.0"
-      sources."strip-eof-1.0.0"
-      sources."strip-json-comments-2.0.1"
-      sources."supports-color-6.0.0"
-      sources."which-1.3.1"
-      sources."which-module-2.0.0"
-      sources."wide-align-1.1.3"
-      (sources."wrap-ansi-2.1.0" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."is-fullwidth-code-point-1.0.0"
-          sources."string-width-1.0.2"
-          sources."strip-ansi-3.0.1"
-        ];
-      })
-      sources."wrappy-1.0.2"
-      sources."y18n-4.0.0"
-      (sources."yargs-13.2.2" // {
+      sources."chokidar-3.3.0"
+      (sources."cliui-5.0.0" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
           sources."string-width-3.1.0"
           sources."strip-ansi-5.2.0"
         ];
       })
-      sources."yargs-parser-13.0.0"
-      (sources."yargs-unparser-1.5.0" // {
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
+      sources."concat-map-0.0.1"
+      sources."debug-3.2.6"
+      sources."decamelize-1.2.0"
+      sources."define-properties-1.1.3"
+      sources."diff-3.5.0"
+      sources."emoji-regex-7.0.3"
+      sources."es-abstract-1.17.4"
+      sources."es-to-primitive-1.2.1"
+      sources."escape-string-regexp-1.0.5"
+      sources."esprima-4.0.1"
+      sources."fill-range-7.0.1"
+      sources."find-up-3.0.0"
+      sources."flat-4.1.0"
+      sources."fs.realpath-1.0.0"
+      sources."fsevents-2.1.2"
+      sources."function-bind-1.1.1"
+      sources."get-caller-file-2.0.5"
+      sources."glob-7.1.3"
+      sources."glob-parent-5.1.0"
+      sources."growl-1.10.5"
+      sources."has-1.0.3"
+      sources."has-flag-3.0.0"
+      sources."has-symbols-1.0.1"
+      sources."he-1.2.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
+      sources."is-binary-path-2.1.0"
+      sources."is-buffer-2.0.4"
+      sources."is-callable-1.1.5"
+      sources."is-date-object-1.0.2"
+      sources."is-extglob-2.1.1"
+      sources."is-fullwidth-code-point-2.0.0"
+      sources."is-glob-4.0.1"
+      sources."is-number-7.0.0"
+      sources."is-regex-1.0.5"
+      sources."is-symbol-1.0.3"
+      sources."isexe-2.0.0"
+      sources."js-yaml-3.13.1"
+      sources."locate-path-3.0.0"
+      sources."lodash-4.17.15"
+      sources."log-symbols-3.0.0"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."ms-2.1.1"
+      sources."node-environment-flags-1.0.6"
+      sources."normalize-path-3.0.0"
+      sources."object-inspect-1.7.0"
+      sources."object-keys-1.1.1"
+      sources."object.assign-4.1.0"
+      sources."object.getownpropertydescriptors-2.1.0"
+      sources."once-1.4.0"
+      sources."p-limit-2.2.2"
+      sources."p-locate-3.0.0"
+      sources."p-try-2.2.0"
+      sources."path-exists-3.0.0"
+      sources."path-is-absolute-1.0.1"
+      sources."picomatch-2.2.1"
+      sources."readdirp-3.2.0"
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-2.0.0"
+      sources."semver-5.7.1"
+      sources."set-blocking-2.0.0"
+      sources."sprintf-js-1.0.3"
+      sources."string-width-2.1.1"
+      sources."string.prototype.trimleft-2.1.1"
+      sources."string.prototype.trimright-2.1.1"
+      sources."strip-ansi-4.0.0"
+      sources."strip-json-comments-2.0.1"
+      sources."supports-color-6.0.0"
+      sources."to-regex-range-5.0.1"
+      sources."which-1.3.1"
+      sources."which-module-2.0.0"
+      sources."wide-align-1.1.3"
+      (sources."wrap-ansi-5.1.0" // {
         dependencies = [
-          sources."get-caller-file-1.0.3"
-          sources."require-main-filename-1.0.1"
-          sources."yargs-12.0.5"
-          sources."yargs-parser-11.1.1"
+          sources."ansi-regex-4.1.0"
+          sources."string-width-3.1.0"
+          sources."strip-ansi-5.2.0"
         ];
       })
+      sources."wrappy-1.0.2"
+      sources."y18n-4.0.0"
+      (sources."yargs-13.3.0" // {
+        dependencies = [
+          sources."ansi-regex-4.1.0"
+          sources."string-width-3.1.0"
+          sources."strip-ansi-5.2.0"
+        ];
+      })
+      sources."yargs-parser-13.1.1"
+      sources."yargs-unparser-1.6.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -3790,7 +3712,7 @@ in
       sources."aws-sign2-0.5.0"
       sources."boom-0.4.2"
       sources."combined-stream-0.0.7"
-      sources."commander-2.20.0"
+      sources."commander-2.20.3"
       (sources."config-chain-1.1.12" // {
         dependencies = [
           sources."ini-1.3.5"
@@ -3822,7 +3744,7 @@ in
       sources."phantomjs-1.9.7-15"
       sources."progress-1.1.8"
       sources."proto-list-1.2.4"
-      sources."psl-1.1.32"
+      sources."psl-1.7.0"
       sources."punycode-2.1.1"
       sources."qs-0.6.6"
       sources."request-2.36.0"
@@ -3857,7 +3779,7 @@ in
       sources."should-format-3.0.3"
       sources."should-type-1.4.0"
       sources."should-type-adaptors-1.1.0"
-      sources."should-util-1.0.0"
+      sources."should-util-1.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -3872,26 +3794,25 @@ in
   sinon = nodeEnv.buildNodePackage {
     name = "sinon";
     packageName = "sinon";
-    version = "7.3.2";
+    version = "9.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/sinon/-/sinon-7.3.2.tgz";
-      sha512 = "thErC1z64BeyGiPvF8aoSg0LEnptSaWE7YhdWWbWXgelOyThent7uKOnnEh9zBxDbKixtr5dEko+ws1sZMuFMA==";
+      url = "https://registry.npmjs.org/sinon/-/sinon-9.0.1.tgz";
+      sha512 = "iTTyiQo5T94jrOx7X7QLBZyucUJ2WvL9J13+96HMfm2CGoJYbIPqRfl6wgNcqmzk0DI28jeGx5bUTXizkrqBmg==";
     };
     dependencies = [
-      sources."@sinonjs/commons-1.4.0"
-      sources."@sinonjs/formatio-3.2.1"
-      sources."@sinonjs/samsam-3.3.1"
+      sources."@sinonjs/commons-1.7.1"
+      sources."@sinonjs/fake-timers-6.0.0"
+      sources."@sinonjs/formatio-5.0.1"
+      sources."@sinonjs/samsam-5.0.3"
       sources."@sinonjs/text-encoding-0.7.1"
-      sources."array-from-2.1.1"
-      sources."diff-3.5.0"
-      sources."has-flag-3.0.0"
+      sources."diff-4.0.2"
+      sources."has-flag-4.0.0"
       sources."isarray-0.0.1"
-      sources."just-extend-4.0.2"
-      sources."lodash-4.17.11"
-      sources."lolex-4.1.0"
-      sources."nise-1.5.0"
-      sources."path-to-regexp-1.7.0"
-      sources."supports-color-5.5.0"
+      sources."just-extend-4.1.0"
+      sources."lodash.get-4.4.2"
+      sources."nise-4.0.3"
+      sources."path-to-regexp-1.8.0"
+      sources."supports-color-7.1.0"
       sources."type-detect-4.0.8"
     ];
     buildInputs = globalBuildInputs;
@@ -3907,10 +3828,10 @@ in
   jshint = nodeEnv.buildNodePackage {
     name = "jshint";
     packageName = "jshint";
-    version = "2.10.2";
+    version = "2.11.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/jshint/-/jshint-2.10.2.tgz";
-      sha512 = "e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA==";
+      url = "https://registry.npmjs.org/jshint/-/jshint-2.11.0.tgz";
+      sha512 = "ooaD/hrBPhu35xXW4gn+o3SOuzht73gdBuffgJzrZBJZPGgGiiTvJEgTyxFvBO2nz0+X1G6etF8SzUODTlLY6Q==";
     };
     dependencies = [
       sources."balanced-match-1.0.0"
@@ -3920,9 +3841,10 @@ in
       sources."console-browserify-1.1.0"
       sources."core-util-is-1.0.2"
       sources."date-now-0.1.4"
-      (sources."dom-serializer-0.1.1" // {
+      (sources."dom-serializer-0.2.2" // {
         dependencies = [
-          sources."entities-1.1.2"
+          sources."domelementtype-2.0.1"
+          sources."entities-2.0.0"
         ];
       })
       sources."domelementtype-1.3.1"
@@ -3931,12 +3853,12 @@ in
       sources."entities-1.0.0"
       sources."exit-0.1.2"
       sources."fs.realpath-1.0.0"
-      sources."glob-7.1.4"
+      sources."glob-7.1.6"
       sources."htmlparser2-3.8.3"
       sources."inflight-1.0.6"
-      sources."inherits-2.0.3"
+      sources."inherits-2.0.4"
       sources."isarray-0.0.1"
-      sources."lodash-4.17.11"
+      sources."lodash-4.17.15"
       sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
@@ -3969,16 +3891,16 @@ in
       sources."brace-expansion-1.1.11"
       sources."concat-map-0.0.1"
       sources."fs.realpath-1.0.0"
-      sources."glob-7.1.4"
+      sources."glob-7.1.6"
       sources."inflight-1.0.6"
-      sources."inherits-2.0.3"
+      sources."inherits-2.0.4"
       sources."interpret-1.2.0"
       sources."minimatch-3.0.4"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
       sources."rechoir-0.6.2"
-      sources."resolve-1.11.1"
+      sources."resolve-1.15.1"
       sources."wrappy-1.0.2"
     ];
     buildInputs = globalBuildInputs;
diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix
index bbdaeb5d2926..a527491777bc 100644
--- a/pkgs/development/web/remarkjs/nodepkgs.nix
+++ b/pkgs/development/web/remarkjs/nodepkgs.nix
@@ -1,8 +1,8 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
 
 let
   nodeEnv = import ../../node-packages/node-env.nix {
diff --git a/pkgs/misc/base16-builder/generate.sh b/pkgs/misc/base16-builder/generate.sh
index e1e436010b4b..3fcfb5bcbc06 100755
--- a/pkgs/misc/base16-builder/generate.sh
+++ b/pkgs/misc/base16-builder/generate.sh
@@ -1,7 +1,8 @@
 #!/usr/bin/env nix-shell
 #! nix-shell -i bash -p nodePackages.node2nix
-exec node2nix -8 \
+exec node2nix --nodejs-10 \
      --input node-packages.json \
      --output node-packages-generated.nix \
+     --supplement-input supplement.json \
      --composition node-packages.nix \
      --node-env ./../../development/node-packages/node-env.nix \
diff --git a/pkgs/misc/base16-builder/node-packages-generated.nix b/pkgs/misc/base16-builder/node-packages-generated.nix
index f13c62f04a98..bbbe6e3b20a6 100644
--- a/pkgs/misc/base16-builder/node-packages-generated.nix
+++ b/pkgs/misc/base16-builder/node-packages-generated.nix
@@ -1,9 +1,18 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
+    "abbrev-1.1.1" = {
+      name = "abbrev";
+      packageName = "abbrev";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
+        sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
+      };
+    };
     "ansi-regex-2.1.1" = {
       name = "ansi-regex";
       packageName = "ansi-regex";
@@ -31,6 +40,24 @@ let
         sha1 = "830b680aa7e56f33451d4b049f3bd8044498ee27";
       };
     };
+    "aproba-1.2.0" = {
+      name = "aproba";
+      packageName = "aproba";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";
+        sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==";
+      };
+    };
+    "are-we-there-yet-1.1.5" = {
+      name = "are-we-there-yet";
+      packageName = "are-we-there-yet";
+      version = "1.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz";
+        sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==";
+      };
+    };
     "argparse-1.0.10" = {
       name = "argparse";
       packageName = "argparse";
@@ -49,6 +76,15 @@ let
         sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1";
       };
     };
+    "balanced-match-1.0.0" = {
+      name = "balanced-match";
+      packageName = "balanced-match";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
+        sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
+      };
+    };
     "boxen-0.3.1" = {
       name = "boxen";
       packageName = "boxen";
@@ -58,6 +94,15 @@ let
         sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b";
       };
     };
+    "brace-expansion-1.1.11" = {
+      name = "brace-expansion";
+      packageName = "brace-expansion";
+      version = "1.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
+        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
+      };
+    };
     "bulk-replace-0.0.1" = {
       name = "bulk-replace";
       packageName = "bulk-replace";
@@ -103,6 +148,15 @@ let
         sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
       };
     };
+    "chownr-1.1.4" = {
+      name = "chownr";
+      packageName = "chownr";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz";
+        sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==";
+      };
+    };
     "code-point-at-1.1.0" = {
       name = "code-point-at";
       packageName = "code-point-at";
@@ -121,6 +175,15 @@ let
         sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041";
       };
     };
+    "concat-map-0.0.1" = {
+      name = "concat-map";
+      packageName = "concat-map";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
+        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
+      };
+    };
     "configstore-2.1.0" = {
       name = "configstore";
       packageName = "configstore";
@@ -130,6 +193,15 @@ let
         sha1 = "737a3a7036e9886102aa6099e47bb33ab1aba1a1";
       };
     };
+    "console-control-strings-1.1.0" = {
+      name = "console-control-strings";
+      packageName = "console-control-strings";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz";
+        sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
+      };
+    };
     "core-util-is-1.0.2" = {
       name = "core-util-is";
       packageName = "core-util-is";
@@ -157,6 +229,15 @@ let
         sha1 = "988df33feab191ef799a61369dd76c17adf957ea";
       };
     };
+    "debug-3.2.6" = {
+      name = "debug";
+      packageName = "debug";
+      version = "3.2.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz";
+        sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==";
+      };
+    };
     "decamelize-1.2.0" = {
       name = "decamelize";
       packageName = "decamelize";
@@ -175,6 +256,24 @@ let
         sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==";
       };
     };
+    "delegates-1.0.0" = {
+      name = "delegates";
+      packageName = "delegates";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz";
+        sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a";
+      };
+    };
+    "detect-libc-1.0.3" = {
+      name = "detect-libc";
+      packageName = "detect-libc";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz";
+        sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b";
+      };
+    };
     "dot-prop-3.0.0" = {
       name = "dot-prop";
       packageName = "dot-prop";
@@ -193,13 +292,13 @@ let
         sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1";
       };
     };
-    "ejs-2.6.1" = {
+    "ejs-2.7.4" = {
       name = "ejs";
       packageName = "ejs";
-      version = "2.6.1";
+      version = "2.7.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ejs/-/ejs-2.6.1.tgz";
-        sha512 = "0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==";
+        url = "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz";
+        sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==";
       };
     };
     "error-ex-1.3.2" = {
@@ -247,6 +346,15 @@ let
         sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f";
       };
     };
+    "fs-minipass-1.2.7" = {
+      name = "fs-minipass";
+      packageName = "fs-minipass";
+      version = "1.2.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz";
+        sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==";
+      };
+    };
     "fs-promise-0.3.1" = {
       name = "fs-promise";
       packageName = "fs-promise";
@@ -256,6 +364,24 @@ let
         sha1 = "bf34050368f24d6dc9dfc6688ab5cead8f86842a";
       };
     };
+    "fs.realpath-1.0.0" = {
+      name = "fs.realpath";
+      packageName = "fs.realpath";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
+        sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
+      };
+    };
+    "gauge-2.7.4" = {
+      name = "gauge";
+      packageName = "gauge";
+      version = "2.7.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz";
+        sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7";
+      };
+    };
     "get-stdin-4.0.1" = {
       name = "get-stdin";
       packageName = "get-stdin";
@@ -265,6 +391,15 @@ let
         sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe";
       };
     };
+    "glob-7.1.6" = {
+      name = "glob";
+      packageName = "glob";
+      version = "7.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz";
+        sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==";
+      };
+    };
     "got-5.7.1" = {
       name = "got";
       packageName = "got";
@@ -274,13 +409,13 @@ let
         sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35";
       };
     };
-    "graceful-fs-4.1.15" = {
+    "graceful-fs-4.2.3" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.1.15";
+      version = "4.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz";
-        sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz";
+        sha512 = "a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==";
       };
     };
     "has-ansi-2.0.0" = {
@@ -292,6 +427,15 @@ let
         sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
       };
     };
+    "has-unicode-2.0.1" = {
+      name = "has-unicode";
+      packageName = "has-unicode";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz";
+        sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9";
+      };
+    };
     "hepburn-1.1.1" = {
       name = "hepburn";
       packageName = "hepburn";
@@ -301,13 +445,31 @@ let
         sha512 = "Ok3ZmMJN3ek4WFAL4f5t8k+BmrDRlS5qGjI4um+3cHH0SrYVzJgUTYwIfGvU8s/eWqOEY+gsINwjJSoaBG3A9g==";
       };
     };
-    "hosted-git-info-2.7.1" = {
+    "hosted-git-info-2.8.8" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
-      version = "2.7.1";
+      version = "2.8.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz";
-        sha512 = "7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz";
+        sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==";
+      };
+    };
+    "iconv-lite-0.4.24" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.24";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz";
+        sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
+      };
+    };
+    "ignore-walk-3.0.3" = {
+      name = "ignore-walk";
+      packageName = "ignore-walk";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz";
+        sha512 = "m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==";
       };
     };
     "imurmurhash-0.1.4" = {
@@ -328,13 +490,22 @@ let
         sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80";
       };
     };
-    "inherits-2.0.3" = {
+    "inflight-1.0.6" = {
+      name = "inflight";
+      packageName = "inflight";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
+        sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
+      };
+    };
+    "inherits-2.0.4" = {
       name = "inherits";
       packageName = "inherits";
-      version = "2.0.3";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
-        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz";
+        sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
       };
     };
     "ini-1.3.5" = {
@@ -355,13 +526,13 @@ let
         sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d";
       };
     };
-    "is-finite-1.0.2" = {
+    "is-finite-1.1.0" = {
       name = "is-finite";
       packageName = "is-finite";
-      version = "1.0.2";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz";
-        sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa";
+        url = "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz";
+        sha512 = "cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==";
       };
     };
     "is-fullwidth-code-point-1.0.0" = {
@@ -400,13 +571,13 @@ let
         sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24";
       };
     };
-    "is-retry-allowed-1.1.0" = {
+    "is-retry-allowed-1.2.0" = {
       name = "is-retry-allowed";
       packageName = "is-retry-allowed";
-      version = "1.1.0";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz";
-        sha1 = "11a060568b67339444033d0125a61a20d564fb34";
+        url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz";
+        sha512 = "RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==";
       };
     };
     "is-stream-1.1.0" = {
@@ -517,6 +688,15 @@ let
         sha1 = "72cb668b425228290abbfa856892587308a801fb";
       };
     };
+    "minimatch-3.0.4" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
+        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
+      };
+    };
     "minimist-0.0.8" = {
       name = "minimist";
       packageName = "minimist";
@@ -526,13 +706,31 @@ let
         sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
-    "minimist-1.2.0" = {
+    "minimist-1.2.5" = {
       name = "minimist";
       packageName = "minimist";
-      version = "1.2.0";
+      version = "1.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
-        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
+        sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
+      };
+    };
+    "minipass-2.9.0" = {
+      name = "minipass";
+      packageName = "minipass";
+      version = "2.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz";
+        sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==";
+      };
+    };
+    "minizlib-1.3.3" = {
+      name = "minizlib";
+      packageName = "minizlib";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz";
+        sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==";
       };
     };
     "mkdirp-0.5.1" = {
@@ -544,13 +742,40 @@ let
         sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
       };
     };
-    "nan-2.10.0" = {
+    "ms-2.1.2" = {
+      name = "ms";
+      packageName = "ms";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
+        sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
+      };
+    };
+    "nan-2.14.0" = {
       name = "nan";
       packageName = "nan";
-      version = "2.10.0";
+      version = "2.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz";
-        sha512 = "bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==";
+        url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz";
+        sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==";
+      };
+    };
+    "needle-2.4.0" = {
+      name = "needle";
+      packageName = "needle";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz";
+        sha512 = "4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==";
+      };
+    };
+    "node-pre-gyp-0.14.0" = {
+      name = "node-pre-gyp";
+      packageName = "node-pre-gyp";
+      version = "0.14.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz";
+        sha512 = "+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==";
       };
     };
     "node-status-codes-1.0.0" = {
@@ -562,13 +787,22 @@ let
         sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f";
       };
     };
-    "nodejieba-2.3.0" = {
+    "nodejieba-2.4.1" = {
       name = "nodejieba";
       packageName = "nodejieba";
-      version = "2.3.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.3.0.tgz";
-        sha512 = "ZzLsVuNDlrmcBQa/b8G/yegdXje2iFmktYmPksk6qLha1brKEANYqg4XPiBspF1D0y7Npho91KTmvKFcDr0UdA==";
+        url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.4.1.tgz";
+        sha512 = "fxlVloaO5baDBmpnQ2egDCe6FT9SJdfbFak7tK7dKH16d7SxA5bLdv47EdTwtKS9DRbnXnMlyX5Wc33XAnaQuA==";
+      };
+    };
+    "nopt-4.0.3" = {
+      name = "nopt";
+      packageName = "nopt";
+      version = "4.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz";
+        sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==";
       };
     };
     "normalize-package-data-2.5.0" = {
@@ -580,6 +814,42 @@ let
         sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==";
       };
     };
+    "npm-bundled-1.1.1" = {
+      name = "npm-bundled";
+      packageName = "npm-bundled";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz";
+        sha512 = "gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==";
+      };
+    };
+    "npm-normalize-package-bin-1.0.1" = {
+      name = "npm-normalize-package-bin";
+      packageName = "npm-normalize-package-bin";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz";
+        sha512 = "EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==";
+      };
+    };
+    "npm-packlist-1.4.8" = {
+      name = "npm-packlist";
+      packageName = "npm-packlist";
+      version = "1.4.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz";
+        sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==";
+      };
+    };
+    "npmlog-4.1.2" = {
+      name = "npmlog";
+      packageName = "npmlog";
+      version = "4.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
+        sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==";
+      };
+    };
     "number-is-nan-1.0.1" = {
       name = "number-is-nan";
       packageName = "number-is-nan";
@@ -598,6 +868,15 @@ let
         sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
       };
     };
+    "once-1.4.0" = {
+      name = "once";
+      packageName = "once";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
+        sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
+      };
+    };
     "open-0.0.5" = {
       name = "open";
       packageName = "open";
@@ -661,6 +940,15 @@ let
         sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b";
       };
     };
+    "path-is-absolute-1.0.1" = {
+      name = "path-is-absolute";
+      packageName = "path-is-absolute";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
+        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
+      };
+    };
     "path-parse-1.0.6" = {
       name = "path-parse";
       packageName = "path-parse";
@@ -724,13 +1012,13 @@ let
         sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc";
       };
     };
-    "process-nextick-args-2.0.0" = {
+    "process-nextick-args-2.0.1" = {
       name = "process-nextick-args";
       packageName = "process-nextick-args";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz";
-        sha512 = "MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==";
+        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
+        sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==";
       };
     };
     "rc-1.2.8" = {
@@ -769,13 +1057,13 @@ let
         sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02";
       };
     };
-    "readable-stream-2.3.6" = {
+    "readable-stream-2.3.7" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.3.6";
+      version = "2.3.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
-        sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz";
+        sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==";
       };
     };
     "redent-1.0.0" = {
@@ -814,13 +1102,22 @@ let
         sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
       };
     };
-    "resolve-1.11.1" = {
+    "resolve-1.15.1" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.11.1";
+      version = "1.15.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz";
-        sha512 = "vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz";
+        sha512 = "84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==";
+      };
+    };
+    "rimraf-2.7.1" = {
+      name = "rimraf";
+      packageName = "rimraf";
+      version = "2.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz";
+        sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==";
       };
     };
     "safe-buffer-5.1.2" = {
@@ -832,13 +1129,31 @@ let
         sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
       };
     };
-    "semver-5.7.0" = {
+    "safer-buffer-2.1.2" = {
+      name = "safer-buffer";
+      packageName = "safer-buffer";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
+        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
+      };
+    };
+    "sax-1.2.4" = {
+      name = "sax";
+      packageName = "sax";
+      version = "1.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";
+        sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==";
+      };
+    };
+    "semver-5.7.1" = {
       name = "semver";
       packageName = "semver";
-      version = "5.7.0";
+      version = "5.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz";
-        sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==";
+        url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
+        sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
       };
     };
     "semver-diff-2.1.0" = {
@@ -850,6 +1165,15 @@ let
         sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36";
       };
     };
+    "set-blocking-2.0.0" = {
+      name = "set-blocking";
+      packageName = "set-blocking";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz";
+        sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
+      };
+    };
     "signal-exit-3.0.2" = {
       name = "signal-exit";
       packageName = "signal-exit";
@@ -895,13 +1219,13 @@ let
         sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==";
       };
     };
-    "spdx-license-ids-3.0.4" = {
+    "spdx-license-ids-3.0.5" = {
       name = "spdx-license-ids";
       packageName = "spdx-license-ids";
-      version = "3.0.4";
+      version = "3.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz";
-        sha512 = "7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==";
+        url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz";
+        sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==";
       };
     };
     "speakingurl-14.0.1" = {
@@ -985,6 +1309,15 @@ let
         sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
       };
     };
+    "tar-4.4.13" = {
+      name = "tar";
+      packageName = "tar";
+      version = "4.4.13";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz";
+        sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==";
+      };
+    };
     "timed-out-3.1.3" = {
       name = "timed-out";
       packageName = "timed-out";
@@ -1057,6 +1390,15 @@ let
         sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==";
       };
     };
+    "wide-align-1.1.3" = {
+      name = "wide-align";
+      packageName = "wide-align";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz";
+        sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==";
+      };
+    };
     "widest-line-1.0.0" = {
       name = "widest-line";
       packageName = "widest-line";
@@ -1066,6 +1408,15 @@ let
         sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c";
       };
     };
+    "wrappy-1.0.2" = {
+      name = "wrappy";
+      packageName = "wrappy";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
+        sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
+      };
+    };
     "write-file-atomic-1.3.4" = {
       name = "write-file-atomic";
       packageName = "write-file-atomic";
@@ -1084,6 +1435,15 @@ let
         sha1 = "edbc903cc385fc04523d966a335504b5504d1bd2";
       };
     };
+    "yallist-3.1.1" = {
+      name = "yallist";
+      packageName = "yallist";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz";
+        sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==";
+      };
+    };
   };
 in
 {
@@ -1096,51 +1456,70 @@ in
       sha1 = "320eafea9333a8ea2bc8e04bda8db2537c52d23f";
     };
     dependencies = [
+      sources."abbrev-1.1.1"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
       sources."any-promise-0.1.0"
+      sources."aproba-1.2.0"
+      sources."are-we-there-yet-1.1.5"
       sources."argparse-1.0.10"
       sources."array-find-index-1.0.2"
+      sources."balanced-match-1.0.0"
       sources."boxen-0.3.1"
+      sources."brace-expansion-1.1.11"
       sources."bulk-replace-0.0.1"
       sources."camelcase-2.1.1"
       sources."camelcase-keys-2.1.0"
       sources."capture-stack-trace-1.0.1"
       sources."chalk-1.1.3"
+      sources."chownr-1.1.4"
       sources."code-point-at-1.1.0"
       sources."commander-1.1.1"
+      sources."concat-map-0.0.1"
       sources."configstore-2.1.0"
+      sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
       sources."create-error-class-3.0.2"
       sources."currently-unhandled-0.4.1"
+      sources."debug-3.2.6"
       sources."decamelize-1.2.0"
       sources."deep-extend-0.6.0"
+      sources."delegates-1.0.0"
+      sources."detect-libc-1.0.3"
       sources."dot-prop-3.0.0"
       sources."duplexer2-0.1.4"
-      sources."ejs-2.6.1"
+      sources."ejs-2.7.4"
       sources."error-ex-1.3.2"
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
       sources."filled-array-1.1.0"
       sources."find-up-1.1.2"
+      sources."fs-minipass-1.2.7"
       sources."fs-promise-0.3.1"
+      sources."fs.realpath-1.0.0"
+      sources."gauge-2.7.4"
       sources."get-stdin-4.0.1"
+      sources."glob-7.1.6"
       sources."got-5.7.1"
-      sources."graceful-fs-4.1.15"
+      sources."graceful-fs-4.2.3"
       sources."has-ansi-2.0.0"
+      sources."has-unicode-2.0.1"
       sources."hepburn-1.1.1"
-      sources."hosted-git-info-2.7.1"
+      sources."hosted-git-info-2.8.8"
+      sources."iconv-lite-0.4.24"
+      sources."ignore-walk-3.0.3"
       sources."imurmurhash-0.1.4"
       sources."indent-string-2.1.0"
-      sources."inherits-2.0.3"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
       sources."ini-1.3.5"
       sources."is-arrayish-0.2.1"
-      sources."is-finite-1.0.2"
+      sources."is-finite-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-npm-1.0.0"
       sources."is-obj-1.0.1"
       sources."is-redirect-1.0.0"
-      sources."is-retry-allowed-1.1.0"
+      sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
       sources."is-utf8-0.2.1"
       sources."isarray-1.0.0"
@@ -1152,19 +1531,31 @@ in
       sources."loud-rejection-1.6.0"
       sources."lowercase-keys-1.0.1"
       sources."map-obj-1.0.1"
-      sources."meow-3.7.0"
-      sources."minimist-1.2.0"
-      (sources."mkdirp-0.5.1" // {
+      (sources."meow-3.7.0" // {
         dependencies = [
-          sources."minimist-0.0.8"
+          sources."minimist-1.2.5"
         ];
       })
-      sources."nan-2.10.0"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."minipass-2.9.0"
+      sources."minizlib-1.3.3"
+      sources."mkdirp-0.5.1"
+      sources."ms-2.1.2"
+      sources."nan-2.14.0"
+      sources."needle-2.4.0"
+      sources."node-pre-gyp-0.14.0"
       sources."node-status-codes-1.0.0"
-      sources."nodejieba-2.3.0"
+      sources."nodejieba-2.4.1"
+      sources."nopt-4.0.3"
       sources."normalize-package-data-2.5.0"
+      sources."npm-bundled-1.1.1"
+      sources."npm-normalize-package-bin-1.0.1"
+      sources."npm-packlist-1.4.8"
+      sources."npmlog-4.1.2"
       sources."number-is-nan-1.0.1"
       sources."object-assign-4.1.1"
+      sources."once-1.4.0"
       sources."open-0.0.5"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
@@ -1172,6 +1563,7 @@ in
       sources."package-json-2.4.0"
       sources."parse-json-2.2.0"
       sources."path-exists-2.1.0"
+      sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
       sources."path-type-1.1.0"
       sources."pify-2.3.0"
@@ -1179,26 +1571,34 @@ in
       sources."pinkie-promise-2.0.1"
       sources."pinyin-2.9.0"
       sources."prepend-http-1.0.4"
-      sources."process-nextick-args-2.0.0"
-      sources."rc-1.2.8"
+      sources."process-nextick-args-2.0.1"
+      (sources."rc-1.2.8" // {
+        dependencies = [
+          sources."minimist-1.2.5"
+        ];
+      })
       sources."read-all-stream-3.1.0"
       sources."read-pkg-1.1.0"
       sources."read-pkg-up-1.0.1"
-      sources."readable-stream-2.3.6"
+      sources."readable-stream-2.3.7"
       sources."redent-1.0.0"
       sources."registry-auth-token-3.4.0"
       sources."registry-url-3.1.0"
       sources."repeating-2.0.1"
-      sources."resolve-1.11.1"
+      sources."resolve-1.15.1"
+      sources."rimraf-2.7.1"
       sources."safe-buffer-5.1.2"
-      sources."semver-5.7.0"
+      sources."safer-buffer-2.1.2"
+      sources."sax-1.2.4"
+      sources."semver-5.7.1"
       sources."semver-diff-2.1.0"
+      sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
       sources."slide-1.1.6"
       sources."spdx-correct-3.1.0"
       sources."spdx-exceptions-2.2.0"
       sources."spdx-expression-parse-3.0.0"
-      sources."spdx-license-ids-3.0.4"
+      sources."spdx-license-ids-3.0.5"
       sources."speakingurl-14.0.1"
       sources."sprintf-js-1.0.3"
       sources."string-width-1.0.2"
@@ -1208,6 +1608,7 @@ in
       sources."strip-indent-1.0.1"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-2.0.0"
+      sources."tar-4.4.13"
       sources."timed-out-3.1.3"
       sources."trim-newlines-1.0.0"
       sources."unzip-response-1.0.2"
@@ -1216,9 +1617,12 @@ in
       sources."util-deprecate-1.0.2"
       sources."uuid-2.0.3"
       sources."validate-npm-package-license-3.0.4"
+      sources."wide-align-1.1.3"
       sources."widest-line-1.0.0"
+      sources."wrappy-1.0.2"
       sources."write-file-atomic-1.3.4"
       sources."xdg-basedir-2.0.0"
+      sources."yallist-3.1.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix
index 735ea6232471..052339d11ea0 100644
--- a/pkgs/misc/base16-builder/node-packages.nix
+++ b/pkgs/misc/base16-builder/node-packages.nix
@@ -1,10 +1,14 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
 
 let
+  globalBuildInputs = pkgs.lib.attrValues (import ./supplement.nix {
+    inherit nodeEnv;
+    inherit (pkgs) fetchurl fetchgit;
+  });
   nodeEnv = import ../../development/node-packages/node-env.nix {
     inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
     inherit nodejs;
@@ -13,5 +17,5 @@ let
 in
 import ./node-packages-generated.nix {
   inherit (pkgs) fetchurl fetchgit;
-  inherit nodeEnv;
+  inherit nodeEnv globalBuildInputs;
 }
\ No newline at end of file
diff --git a/pkgs/misc/base16-builder/supplement.json b/pkgs/misc/base16-builder/supplement.json
new file mode 100644
index 000000000000..2838e627165f
--- /dev/null
+++ b/pkgs/misc/base16-builder/supplement.json
@@ -0,0 +1,3 @@
+[
+  "node-pre-gyp"
+]
diff --git a/pkgs/misc/base16-builder/supplement.nix b/pkgs/misc/base16-builder/supplement.nix
new file mode 100644
index 000000000000..05fd5e70207f
--- /dev/null
+++ b/pkgs/misc/base16-builder/supplement.nix
@@ -0,0 +1,693 @@
+# This file has been generated by node2nix 1.8.0. Do not edit!
+
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+
+let
+  sources = {
+    "abbrev-1.1.1" = {
+      name = "abbrev";
+      packageName = "abbrev";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
+        sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
+      };
+    };
+    "ansi-regex-2.1.1" = {
+      name = "ansi-regex";
+      packageName = "ansi-regex";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
+        sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
+      };
+    };
+    "aproba-1.2.0" = {
+      name = "aproba";
+      packageName = "aproba";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";
+        sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==";
+      };
+    };
+    "are-we-there-yet-1.1.5" = {
+      name = "are-we-there-yet";
+      packageName = "are-we-there-yet";
+      version = "1.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz";
+        sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==";
+      };
+    };
+    "balanced-match-1.0.0" = {
+      name = "balanced-match";
+      packageName = "balanced-match";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
+        sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
+      };
+    };
+    "brace-expansion-1.1.11" = {
+      name = "brace-expansion";
+      packageName = "brace-expansion";
+      version = "1.1.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
+        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
+      };
+    };
+    "chownr-1.1.4" = {
+      name = "chownr";
+      packageName = "chownr";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz";
+        sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==";
+      };
+    };
+    "code-point-at-1.1.0" = {
+      name = "code-point-at";
+      packageName = "code-point-at";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz";
+        sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77";
+      };
+    };
+    "concat-map-0.0.1" = {
+      name = "concat-map";
+      packageName = "concat-map";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
+        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
+      };
+    };
+    "console-control-strings-1.1.0" = {
+      name = "console-control-strings";
+      packageName = "console-control-strings";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz";
+        sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
+      };
+    };
+    "core-util-is-1.0.2" = {
+      name = "core-util-is";
+      packageName = "core-util-is";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
+        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+      };
+    };
+    "debug-3.2.6" = {
+      name = "debug";
+      packageName = "debug";
+      version = "3.2.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz";
+        sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==";
+      };
+    };
+    "deep-extend-0.6.0" = {
+      name = "deep-extend";
+      packageName = "deep-extend";
+      version = "0.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz";
+        sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==";
+      };
+    };
+    "delegates-1.0.0" = {
+      name = "delegates";
+      packageName = "delegates";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz";
+        sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a";
+      };
+    };
+    "detect-libc-1.0.3" = {
+      name = "detect-libc";
+      packageName = "detect-libc";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz";
+        sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b";
+      };
+    };
+    "fs-minipass-1.2.7" = {
+      name = "fs-minipass";
+      packageName = "fs-minipass";
+      version = "1.2.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz";
+        sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==";
+      };
+    };
+    "fs.realpath-1.0.0" = {
+      name = "fs.realpath";
+      packageName = "fs.realpath";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
+        sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
+      };
+    };
+    "gauge-2.7.4" = {
+      name = "gauge";
+      packageName = "gauge";
+      version = "2.7.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz";
+        sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7";
+      };
+    };
+    "glob-7.1.6" = {
+      name = "glob";
+      packageName = "glob";
+      version = "7.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz";
+        sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==";
+      };
+    };
+    "has-unicode-2.0.1" = {
+      name = "has-unicode";
+      packageName = "has-unicode";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz";
+        sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9";
+      };
+    };
+    "iconv-lite-0.4.24" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.24";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz";
+        sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
+      };
+    };
+    "ignore-walk-3.0.3" = {
+      name = "ignore-walk";
+      packageName = "ignore-walk";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz";
+        sha512 = "m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==";
+      };
+    };
+    "inflight-1.0.6" = {
+      name = "inflight";
+      packageName = "inflight";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
+        sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
+      };
+    };
+    "inherits-2.0.4" = {
+      name = "inherits";
+      packageName = "inherits";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz";
+        sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==";
+      };
+    };
+    "ini-1.3.5" = {
+      name = "ini";
+      packageName = "ini";
+      version = "1.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz";
+        sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==";
+      };
+    };
+    "is-fullwidth-code-point-1.0.0" = {
+      name = "is-fullwidth-code-point";
+      packageName = "is-fullwidth-code-point";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";
+        sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb";
+      };
+    };
+    "isarray-1.0.0" = {
+      name = "isarray";
+      packageName = "isarray";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
+        sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
+      };
+    };
+    "minimatch-3.0.4" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
+        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
+      };
+    };
+    "minimist-0.0.8" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "0.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+      };
+    };
+    "minimist-1.2.5" = {
+      name = "minimist";
+      packageName = "minimist";
+      version = "1.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
+        sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
+      };
+    };
+    "minipass-2.9.0" = {
+      name = "minipass";
+      packageName = "minipass";
+      version = "2.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz";
+        sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==";
+      };
+    };
+    "minizlib-1.3.3" = {
+      name = "minizlib";
+      packageName = "minizlib";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz";
+        sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==";
+      };
+    };
+    "mkdirp-0.5.1" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+      };
+    };
+    "ms-2.1.2" = {
+      name = "ms";
+      packageName = "ms";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
+        sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
+      };
+    };
+    "needle-2.4.0" = {
+      name = "needle";
+      packageName = "needle";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz";
+        sha512 = "4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==";
+      };
+    };
+    "nopt-4.0.3" = {
+      name = "nopt";
+      packageName = "nopt";
+      version = "4.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz";
+        sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==";
+      };
+    };
+    "npm-bundled-1.1.1" = {
+      name = "npm-bundled";
+      packageName = "npm-bundled";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz";
+        sha512 = "gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==";
+      };
+    };
+    "npm-normalize-package-bin-1.0.1" = {
+      name = "npm-normalize-package-bin";
+      packageName = "npm-normalize-package-bin";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz";
+        sha512 = "EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==";
+      };
+    };
+    "npm-packlist-1.4.8" = {
+      name = "npm-packlist";
+      packageName = "npm-packlist";
+      version = "1.4.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz";
+        sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==";
+      };
+    };
+    "npmlog-4.1.2" = {
+      name = "npmlog";
+      packageName = "npmlog";
+      version = "4.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz";
+        sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==";
+      };
+    };
+    "number-is-nan-1.0.1" = {
+      name = "number-is-nan";
+      packageName = "number-is-nan";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz";
+        sha1 = "097b602b53422a522c1afb8790318336941a011d";
+      };
+    };
+    "object-assign-4.1.1" = {
+      name = "object-assign";
+      packageName = "object-assign";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz";
+        sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
+      };
+    };
+    "once-1.4.0" = {
+      name = "once";
+      packageName = "once";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
+        sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
+      };
+    };
+    "os-homedir-1.0.2" = {
+      name = "os-homedir";
+      packageName = "os-homedir";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz";
+        sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3";
+      };
+    };
+    "os-tmpdir-1.0.2" = {
+      name = "os-tmpdir";
+      packageName = "os-tmpdir";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz";
+        sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274";
+      };
+    };
+    "osenv-0.1.5" = {
+      name = "osenv";
+      packageName = "osenv";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz";
+        sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
+      };
+    };
+    "path-is-absolute-1.0.1" = {
+      name = "path-is-absolute";
+      packageName = "path-is-absolute";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
+        sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
+      };
+    };
+    "process-nextick-args-2.0.1" = {
+      name = "process-nextick-args";
+      packageName = "process-nextick-args";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz";
+        sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==";
+      };
+    };
+    "rc-1.2.8" = {
+      name = "rc";
+      packageName = "rc";
+      version = "1.2.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz";
+        sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==";
+      };
+    };
+    "readable-stream-2.3.7" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "2.3.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz";
+        sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==";
+      };
+    };
+    "rimraf-2.7.1" = {
+      name = "rimraf";
+      packageName = "rimraf";
+      version = "2.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz";
+        sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==";
+      };
+    };
+    "safe-buffer-5.1.2" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
+        sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
+      };
+    };
+    "safer-buffer-2.1.2" = {
+      name = "safer-buffer";
+      packageName = "safer-buffer";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
+        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
+      };
+    };
+    "sax-1.2.4" = {
+      name = "sax";
+      packageName = "sax";
+      version = "1.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz";
+        sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==";
+      };
+    };
+    "semver-5.7.1" = {
+      name = "semver";
+      packageName = "semver";
+      version = "5.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
+        sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
+      };
+    };
+    "set-blocking-2.0.0" = {
+      name = "set-blocking";
+      packageName = "set-blocking";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz";
+        sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
+      };
+    };
+    "signal-exit-3.0.2" = {
+      name = "signal-exit";
+      packageName = "signal-exit";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
+        sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
+      };
+    };
+    "string-width-1.0.2" = {
+      name = "string-width";
+      packageName = "string-width";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz";
+        sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3";
+      };
+    };
+    "string_decoder-1.1.1" = {
+      name = "string_decoder";
+      packageName = "string_decoder";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz";
+        sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==";
+      };
+    };
+    "strip-ansi-3.0.1" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
+        sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
+      };
+    };
+    "strip-json-comments-2.0.1" = {
+      name = "strip-json-comments";
+      packageName = "strip-json-comments";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz";
+        sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
+      };
+    };
+    "tar-4.4.13" = {
+      name = "tar";
+      packageName = "tar";
+      version = "4.4.13";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz";
+        sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==";
+      };
+    };
+    "util-deprecate-1.0.2" = {
+      name = "util-deprecate";
+      packageName = "util-deprecate";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
+        sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
+      };
+    };
+    "wide-align-1.1.3" = {
+      name = "wide-align";
+      packageName = "wide-align";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz";
+        sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==";
+      };
+    };
+    "wrappy-1.0.2" = {
+      name = "wrappy";
+      packageName = "wrappy";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
+        sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
+      };
+    };
+    "yallist-3.1.1" = {
+      name = "yallist";
+      packageName = "yallist";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz";
+        sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==";
+      };
+    };
+  };
+in
+{
+  node-pre-gyp = nodeEnv.buildNodePackage {
+    name = "node-pre-gyp";
+    packageName = "node-pre-gyp";
+    version = "0.14.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz";
+      sha512 = "+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==";
+    };
+    dependencies = [
+      sources."abbrev-1.1.1"
+      sources."ansi-regex-2.1.1"
+      sources."aproba-1.2.0"
+      sources."are-we-there-yet-1.1.5"
+      sources."balanced-match-1.0.0"
+      sources."brace-expansion-1.1.11"
+      sources."chownr-1.1.4"
+      sources."code-point-at-1.1.0"
+      sources."concat-map-0.0.1"
+      sources."console-control-strings-1.1.0"
+      sources."core-util-is-1.0.2"
+      sources."debug-3.2.6"
+      sources."deep-extend-0.6.0"
+      sources."delegates-1.0.0"
+      sources."detect-libc-1.0.3"
+      sources."fs-minipass-1.2.7"
+      sources."fs.realpath-1.0.0"
+      sources."gauge-2.7.4"
+      sources."glob-7.1.6"
+      sources."has-unicode-2.0.1"
+      sources."iconv-lite-0.4.24"
+      sources."ignore-walk-3.0.3"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
+      sources."ini-1.3.5"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."isarray-1.0.0"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."minipass-2.9.0"
+      sources."minizlib-1.3.3"
+      sources."mkdirp-0.5.1"
+      sources."ms-2.1.2"
+      sources."needle-2.4.0"
+      sources."nopt-4.0.3"
+      sources."npm-bundled-1.1.1"
+      sources."npm-normalize-package-bin-1.0.1"
+      sources."npm-packlist-1.4.8"
+      sources."npmlog-4.1.2"
+      sources."number-is-nan-1.0.1"
+      sources."object-assign-4.1.1"
+      sources."once-1.4.0"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."osenv-0.1.5"
+      sources."path-is-absolute-1.0.1"
+      sources."process-nextick-args-2.0.1"
+      (sources."rc-1.2.8" // {
+        dependencies = [
+          sources."minimist-1.2.5"
+        ];
+      })
+      sources."readable-stream-2.3.7"
+      sources."rimraf-2.7.1"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      sources."sax-1.2.4"
+      sources."semver-5.7.1"
+      sources."set-blocking-2.0.0"
+      sources."signal-exit-3.0.2"
+      sources."string-width-1.0.2"
+      sources."string_decoder-1.1.1"
+      sources."strip-ansi-3.0.1"
+      sources."strip-json-comments-2.0.1"
+      sources."tar-4.4.13"
+      sources."util-deprecate-1.0.2"
+      sources."wide-align-1.1.3"
+      sources."wrappy-1.0.2"
+      sources."yallist-3.1.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Node.js native addon binary install tool";
+      homepage = "https://github.com/mapbox/node-pre-gyp#readme";
+      license = "BSD-3-Clause";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
index 8fe405e1b3e9..e306e49c8498 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix
index d46e3d75f028..cc14fb2852f3 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix
@@ -1,25 +1,25 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
-    "@babel/code-frame-7.5.5" = {
+    "@babel/code-frame-7.8.3" = {
       name = "_at_babel_slash_code-frame";
       packageName = "@babel/code-frame";
-      version = "7.5.5";
+      version = "7.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz";
-        sha512 = "27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==";
+        url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz";
+        sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==";
       };
     };
-    "@babel/highlight-7.5.0" = {
+    "@babel/highlight-7.8.3" = {
       name = "_at_babel_slash_highlight";
       packageName = "@babel/highlight";
-      version = "7.5.0";
+      version = "7.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz";
-        sha512 = "7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==";
+        url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz";
+        sha512 = "PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==";
       };
     };
     "@slack/logger-1.1.1" = {
@@ -40,31 +40,31 @@ let
         sha512 = "rzNIFst8iuVYyHdE7e3KSrbAtIA7sfS4Pth9ObKUm5KDemX0zyI7YfAijO1kgr1EMriQkjlpKBhlNq9Y+aQr6g==";
       };
     };
-    "@slack/types-1.3.0" = {
+    "@slack/types-1.4.0" = {
       name = "_at_slack_slash_types";
       packageName = "@slack/types";
-      version = "1.3.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@slack/types/-/types-1.3.0.tgz";
-        sha512 = "3AjHsDJjJKT3q0hQzFHQN7piYIh99LuN7Po56W/R6P/uscqZqwS5xm1U1cTYGIzk8fmsuW7TvWVg0W85hKY/MQ==";
+        url = "https://registry.npmjs.org/@slack/types/-/types-1.4.0.tgz";
+        sha512 = "G5u2gCl7oci0k4E9KIX33nmA4YPp1pXYwS/It7ct9dOglCcj63Ee5GRCgtplzOBS+2++DMdp6l3ZCq+VeAMrfw==";
       };
     };
-    "@slack/web-api-5.6.0" = {
+    "@slack/web-api-5.8.0" = {
       name = "_at_slack_slash_web-api";
       packageName = "@slack/web-api";
-      version = "5.6.0";
+      version = "5.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@slack/web-api/-/web-api-5.6.0.tgz";
-        sha512 = "/HxTI9/4fMk3su1UAa7oN0n8fGSZLHXGUne3WJ+vjxGek2rvvzazqL6yTRWWWcpttPtsNyjk4KI9FkPq+6yLNg==";
+        url = "https://registry.npmjs.org/@slack/web-api/-/web-api-5.8.0.tgz";
+        sha512 = "lUMFM9jtdn+9Q0kHLegf5RjIgQlmb1PGWwWdTsc9mQ8PJu2BogI5ZttG8/tA6r2bX/C4bgXhd0JJ4syUR0AAhQ==";
       };
     };
-    "@types/body-parser-1.17.1" = {
+    "@types/body-parser-1.19.0" = {
       name = "_at_types_slash_body-parser";
       packageName = "@types/body-parser";
-      version = "1.17.1";
+      version = "1.19.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.1.tgz";
-        sha512 = "RoX2EZjMiFMjZh9lmYrwgoP9RTpAjSHiJxdp4oidAQVO02T7HER3xj9UKue5534ULWeqVEkujhWcyvUce+d68w==";
+        url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz";
+        sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==";
       };
     };
     "@types/caseless-0.12.2" = {
@@ -76,22 +76,22 @@ let
         sha512 = "6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==";
       };
     };
-    "@types/chai-4.2.6" = {
+    "@types/chai-4.2.11" = {
       name = "_at_types_slash_chai";
       packageName = "@types/chai";
-      version = "4.2.6";
+      version = "4.2.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/chai/-/chai-4.2.6.tgz";
-        sha512 = "HF8faEUA4JurIm+68VaA2KedtZf5LYdXpQEAbIAN79DwWQbO82BNTksZgCH3UMqbZHXex9C6TrBfg7OUInRISQ==";
+        url = "https://registry.npmjs.org/@types/chai/-/chai-4.2.11.tgz";
+        sha512 = "t7uW6eFafjO+qJ3BIV2gGUyZs27egcNRkUdalkud+Qa3+kg//f129iuOFivHDXQ+vnU3fDXuwgv0cqMCbcE8sw==";
       };
     };
-    "@types/connect-3.4.32" = {
+    "@types/connect-3.4.33" = {
       name = "_at_types_slash_connect";
       packageName = "@types/connect";
-      version = "3.4.32";
+      version = "3.4.33";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.32.tgz";
-        sha512 = "4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg==";
+        url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz";
+        sha512 = "2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==";
       };
     };
     "@types/events-3.0.0" = {
@@ -103,22 +103,22 @@ let
         sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==";
       };
     };
-    "@types/express-4.17.2" = {
+    "@types/express-4.17.3" = {
       name = "_at_types_slash_express";
       packageName = "@types/express";
-      version = "4.17.2";
+      version = "4.17.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express/-/express-4.17.2.tgz";
-        sha512 = "5mHFNyavtLoJmnusB8OKJ5bshSzw+qkMIBAobLrIM48HJvunFva9mOa6aBwh64lBFyNwBbs0xiEFuj4eU/NjCA==";
+        url = "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz";
+        sha512 = "I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg==";
       };
     };
-    "@types/express-serve-static-core-4.17.0" = {
+    "@types/express-serve-static-core-4.17.2" = {
       name = "_at_types_slash_express-serve-static-core";
       packageName = "@types/express-serve-static-core";
-      version = "4.17.0";
+      version = "4.17.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.0.tgz";
-        sha512 = "Xnub7w57uvcBqFdIGoRg1KhNOeEj0vB6ykUM7uFWyxvbdE89GFyqgmUcanAriMr4YOxNFZBAWkfcWIb4WBPt3g==";
+        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.2.tgz";
+        sha512 = "El9yMpctM6tORDAiBwZVLMcxoTMcqqRO9dVyYcn7ycLWbvR8klrDn8CAOwRfZujZtWD7yS/mshTdz43jMOejbg==";
       };
     };
     "@types/is-stream-1.1.0" = {
@@ -157,13 +157,13 @@ let
         sha512 = "w9Tl3DQCkdT0Ghes+PKhe+3/pZppBXuFFpSCjPJbb2KE3DjYmUpEyCYzjrAYlT9Y1TndnbbnChzkax2h/JorVQ==";
       };
     };
-    "@types/node-12.12.14" = {
+    "@types/node-12.12.30" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "12.12.14";
+      version = "12.12.30";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-12.12.14.tgz";
-        sha512 = "u/SJDyXwuihpwjXy7hOOghagLEV1KdAST6syfnOk6QZAMzZuWZqXy5aYYZbh8Jdpd4escVFP0MvftHNDb9pruA==";
+        url = "https://registry.npmjs.org/@types/node/-/node-12.12.30.tgz";
+        sha512 = "sz9MF/zk6qVr3pAnM0BSQvYIBK44tS75QC5N+VbWSE4DjCV/pJ+UzCW/F+vVnl7TkOPcuwQureKNtSSwjBTaMg==";
       };
     };
     "@types/node-emoji-1.8.1" = {
@@ -202,13 +202,13 @@ let
         sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==";
       };
     };
-    "@types/request-2.48.3" = {
+    "@types/request-2.48.4" = {
       name = "_at_types_slash_request";
       packageName = "@types/request";
-      version = "2.48.3";
+      version = "2.48.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/request/-/request-2.48.3.tgz";
-        sha512 = "3Wo2jNYwqgXcIz/rrq18AdOZUQB8cQ34CXZo+LUwPJNpvRAL86+Kc2wwI8mqpz9Cr1V+enIox5v+WZhy/p3h8w==";
+        url = "https://registry.npmjs.org/@types/request/-/request-2.48.4.tgz";
+        sha512 = "W1t1MTKYR8PxICH+A4HgEIPuAC3sbljoEVfyZbeFJJDbr30guDspJri2XOaM2E+Un7ZjrihaDi7cf6fPa2tbgw==";
       };
     };
     "@types/request-promise-native-1.0.17" = {
@@ -247,13 +247,13 @@ let
         sha512 = "wHNBMnkoEBiRAd3s8KTKwIuO9biFtTf0LehITzBhSco+HQI0xkXZbLOD55SW3Aqw3oUkHstkm5SPv58yaAdFPQ==";
       };
     };
-    "@types/uuid-3.4.6" = {
+    "@types/uuid-3.4.8" = {
       name = "_at_types_slash_uuid";
       packageName = "@types/uuid";
-      version = "3.4.6";
+      version = "3.4.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.6.tgz";
-        sha512 = "cCdlC/1kGEZdEglzOieLDYBxHsvEOIg7kp/2FYyVR9Pxakq+Qf/inL3RKQ+PA8gOlI/NnL+fXmQH12nwcGzsHw==";
+        url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.8.tgz";
+        sha512 = "zHWce3allXWSmRx6/AGXKCtSOA7JjeWd2L3t4aHfysNk8mouQnWCocveaT7a4IEIlPVHp81jzlnknqTgCjCLXA==";
       };
     };
     "@types/ws-5.1.2" = {
@@ -265,13 +265,13 @@ let
         sha512 = "NkTXUKTYdXdnPE2aUUbGOXE1XfMK527SCvU/9bj86kyFF6kZ9ZnOQ3mK5jADn98Y2vEUD/7wKDgZa7Qst2wYOg==";
       };
     };
-    "@types/yargs-13.0.3" = {
+    "@types/yargs-13.0.8" = {
       name = "_at_types_slash_yargs";
       packageName = "@types/yargs";
-      version = "13.0.3";
+      version = "13.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.3.tgz";
-        sha512 = "K8/LfZq2duW33XW/tFwEAfnZlqIfVsoyRB3kfXdPXYhl0nfM8mmh7GS0jg7WrX2Dgq/0Ha/pR1PaR+BvmWwjiQ==";
+        url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.8.tgz";
+        sha512 = "XAvHLwG7UQ+8M4caKIH0ZozIOYay5fQkAgyIXegXT9jPtdIGdhga+sUEdAr1CiG46aB+c64xQEYyEzlwWVTNzA==";
       };
     };
     "@types/yargs-parser-13.1.0" = {
@@ -311,13 +311,13 @@ let
         sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==";
       };
     };
-    "ajv-6.10.2" = {
+    "ajv-6.12.0" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.10.2";
+      version = "6.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz";
-        sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==";
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz";
+        sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==";
       };
     };
     "another-json-0.2.0" = {
@@ -365,13 +365,13 @@ let
         sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==";
       };
     };
-    "arg-4.1.2" = {
+    "arg-4.1.3" = {
       name = "arg";
       packageName = "arg";
-      version = "4.1.2";
+      version = "4.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/arg/-/arg-4.1.2.tgz";
-        sha512 = "+ytCkGcBtHZ3V2r2Z06AncYO8jz46UEamcspGoU8lHcEbpn6J77QK0vdWvChsclg/tM5XIJC5tnjmPp7Eq6Obg==";
+        url = "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz";
+        sha512 = "58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==";
       };
     };
     "argparse-1.0.10" = {
@@ -482,22 +482,22 @@ let
         sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
       };
     };
-    "aws4-1.9.0" = {
+    "aws4-1.9.1" = {
       name = "aws4";
       packageName = "aws4";
-      version = "1.9.0";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.9.0.tgz";
-        sha512 = "Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A==";
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz";
+        sha512 = "wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==";
       };
     };
-    "axios-0.18.1" = {
+    "axios-0.19.2" = {
       name = "axios";
       packageName = "axios";
-      version = "0.18.1";
+      version = "0.19.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz";
-        sha512 = "0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==";
+        url = "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz";
+        sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==";
       };
     };
     "babel-runtime-6.26.0" = {
@@ -518,13 +518,13 @@ let
         sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
       };
     };
-    "base-x-3.0.7" = {
+    "base-x-3.0.8" = {
       name = "base-x";
       packageName = "base-x";
-      version = "3.0.7";
+      version = "3.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base-x/-/base-x-3.0.7.tgz";
-        sha512 = "zAKJGuQPihXW22fkrfOclUUZXM2g92z5GzlSMHxhO6r6Qj+Nm0ccaGNBzDZojzwOMkpjAv4J0fOv1U4go+a4iw==";
+        url = "https://registry.npmjs.org/base-x/-/base-x-3.0.8.tgz";
+        sha512 = "Rl/1AWP4J/zRrk54hhlxH4drNxPJXYUaKffODVI53/dAsV4t9fBxyxYKAVPU1XBHxYwOWP9h9H0hM2MVw4YfJA==";
       };
     };
     "basic-auth-2.0.1" = {
@@ -842,13 +842,13 @@ let
         sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
       };
     };
-    "core-js-2.6.10" = {
+    "core-js-2.6.11" = {
       name = "core-js";
       packageName = "core-js";
-      version = "2.6.10";
+      version = "2.6.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.10.tgz";
-        sha512 = "I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==";
+        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz";
+        sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==";
       };
     };
     "core-util-is-1.0.2" = {
@@ -977,13 +977,13 @@ let
         sha512 = "A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==";
       };
     };
-    "diff-4.0.1" = {
+    "diff-4.0.2" = {
       name = "diff";
       packageName = "diff";
-      version = "4.0.1";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz";
-        sha512 = "s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==";
+        url = "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz";
+        sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==";
       };
     };
     "ecc-jsbn-0.1.2" = {
@@ -1031,22 +1031,22 @@ let
         sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59";
       };
     };
-    "env-variable-0.0.5" = {
+    "env-variable-0.0.6" = {
       name = "env-variable";
       packageName = "env-variable";
-      version = "0.0.5";
+      version = "0.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/env-variable/-/env-variable-0.0.5.tgz";
-        sha512 = "zoB603vQReOFvTg5xMl9I1P2PnHsHQQKTEowsKKD7nseUfJq6UWzK+4YtlWUO1nhiQUxe6XMkk+JleSZD1NZFA==";
+        url = "https://registry.npmjs.org/env-variable/-/env-variable-0.0.6.tgz";
+        sha512 = "bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg==";
       };
     };
-    "es-abstract-1.16.3" = {
+    "es-abstract-1.17.4" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.16.3";
+      version = "1.17.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.16.3.tgz";
-        sha512 = "WtY7Fx5LiOnSYgF5eg/1T+GONaGmpvpPdCpSnYij+U2gDTL0UPfWrhDw7b2IYb+9NQJsYpCA0wOQvZfsd6YwRw==";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz";
+        sha512 = "Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==";
       };
     };
     "es-to-primitive-1.2.1" = {
@@ -1157,22 +1157,22 @@ let
         sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
       };
     };
-    "fast-deep-equal-2.0.1" = {
+    "fast-deep-equal-3.1.1" = {
       name = "fast-deep-equal";
       packageName = "fast-deep-equal";
-      version = "2.0.1";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz";
-        sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
+        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz";
+        sha512 = "8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==";
       };
     };
-    "fast-json-stable-stringify-2.0.0" = {
+    "fast-json-stable-stringify-2.1.0" = {
       name = "fast-json-stable-stringify";
       packageName = "fast-json-stable-stringify";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz";
-        sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
+        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz";
+        sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==";
       };
     };
     "fast-safe-stringify-2.0.7" = {
@@ -1481,13 +1481,13 @@ let
         sha1 = "633c2c83e3da42a502f52466022480f4208261de";
       };
     };
-    "ipaddr.js-1.9.0" = {
+    "ipaddr.js-1.9.1" = {
       name = "ipaddr.js";
       packageName = "ipaddr.js";
-      version = "1.9.0";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz";
-        sha512 = "M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==";
+        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz";
+        sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==";
       };
     };
     "is-arrayish-0.3.2" = {
@@ -1508,22 +1508,22 @@ let
         sha512 = "Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==";
       };
     };
-    "is-callable-1.1.4" = {
+    "is-callable-1.1.5" = {
       name = "is-callable";
       packageName = "is-callable";
-      version = "1.1.4";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz";
-        sha512 = "r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==";
+        url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz";
+        sha512 = "ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==";
       };
     };
-    "is-date-object-1.0.1" = {
+    "is-date-object-1.0.2" = {
       name = "is-date-object";
       packageName = "is-date-object";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz";
-        sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16";
+        url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz";
+        sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==";
       };
     };
     "is-fullwidth-code-point-2.0.0" = {
@@ -1562,13 +1562,13 @@ let
         sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84";
       };
     };
-    "is-regex-1.0.4" = {
+    "is-regex-1.0.5" = {
       name = "is-regex";
       packageName = "is-regex";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz";
-        sha1 = "5517489b547091b0930e095654ced25ee97e9491";
+        url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz";
+        sha512 = "vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==";
       };
     };
     "is-stream-1.1.0" = {
@@ -1778,22 +1778,22 @@ let
         sha512 = "+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ==";
       };
     };
-    "loglevel-1.6.6" = {
+    "loglevel-1.6.7" = {
       name = "loglevel";
       packageName = "loglevel";
-      version = "1.6.6";
+      version = "1.6.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.6.tgz";
-        sha512 = "Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ==";
+        url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz";
+        sha512 = "cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A==";
       };
     };
-    "make-error-1.3.5" = {
+    "make-error-1.3.6" = {
       name = "make-error";
       packageName = "make-error";
-      version = "1.3.5";
+      version = "1.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz";
-        sha512 = "c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==";
+        url = "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz";
+        sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==";
       };
     };
     "manakin-0.5.2" = {
@@ -1823,13 +1823,13 @@ let
         sha512 = "xrtjxScBIx33HRkiK/5G6wkUxZ9jxF9GqTiKzM/Fn7CgMZoHVDIms3sTc7ybZKA6RHAqH68bg4Eg4JbGCtUrhw==";
       };
     };
-    "matrix-js-sdk-2.4.5" = {
+    "matrix-js-sdk-2.4.6" = {
       name = "matrix-js-sdk";
       packageName = "matrix-js-sdk";
-      version = "2.4.5";
+      version = "2.4.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-2.4.5.tgz";
-        sha512 = "Mh0fPoiqyXRksFNYS4/2s20xAklmYVIgSms3qFvLhno32LN43NizUoAMBYYGtyjt8BQi+U77lbNL0s5f2V7gPQ==";
+        url = "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-2.4.6.tgz";
+        sha512 = "ydU64WwAYFjaTJ7JTv/JM3HmSY7leHWm3x3j0J4KWVhDDxsLoQ/v8Tc6FwlVom9/B9VvGTk+AG3aY0zgNk8LQg==";
       };
     };
     "media-typer-0.3.0" = {
@@ -1868,22 +1868,22 @@ let
         sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
       };
     };
-    "mime-db-1.42.0" = {
+    "mime-db-1.43.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.42.0";
+      version = "1.43.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz";
-        sha512 = "UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz";
+        sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==";
       };
     };
-    "mime-types-2.1.25" = {
+    "mime-types-2.1.26" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.25";
+      version = "2.1.26";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz";
-        sha512 = "5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz";
+        sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==";
       };
     };
     "minimatch-3.0.4" = {
@@ -1904,13 +1904,13 @@ let
         sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
-    "minimist-1.2.0" = {
+    "minimist-1.2.5" = {
       name = "minimist";
       packageName = "minimist";
-      version = "1.2.0";
+      version = "1.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
-        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
+        sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
       };
     };
     "mkdirp-0.5.1" = {
@@ -2066,13 +2066,13 @@ let
         sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==";
       };
     };
-    "object.getownpropertydescriptors-2.0.3" = {
+    "object.getownpropertydescriptors-2.1.0" = {
       name = "object.getownpropertydescriptors";
       packageName = "object.getownpropertydescriptors";
-      version = "2.0.3";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz";
-        sha1 = "8758c846f5b407adab0f236e0986f14b051caa16";
+        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz";
+        sha512 = "Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==";
       };
     };
     "on-finished-2.3.0" = {
@@ -2129,13 +2129,13 @@ let
         sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae";
       };
     };
-    "p-limit-2.2.1" = {
+    "p-limit-2.2.2" = {
       name = "p-limit";
       packageName = "p-limit";
-      version = "2.2.1";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz";
-        sha512 = "85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==";
+        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz";
+        sha512 = "WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==";
       };
     };
     "p-locate-3.0.0" = {
@@ -2156,13 +2156,13 @@ let
         sha512 = "n8/y+yDJwBjoLQe1GSJbbaYQLTI7QHNZI2+rpmCDbe++WLf9HC3gf6iqj5yfPAV71W4UF3ql5W1+UBPXoXTxng==";
       };
     };
-    "p-queue-6.2.1" = {
+    "p-queue-6.3.0" = {
       name = "p-queue";
       packageName = "p-queue";
-      version = "6.2.1";
+      version = "6.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/p-queue/-/p-queue-6.2.1.tgz";
-        sha512 = "wV8yC/rkuWpgu9LGKJIb48OynYSrE6lVl2Bx6r8WjbyVKrFAzzQ/QevAvwnDjlD+mLt8xy0LTDOU1freOvMTCg==";
+        url = "https://registry.npmjs.org/p-queue/-/p-queue-6.3.0.tgz";
+        sha512 = "fg5dJlFpd5+3CgG3/0ogpVZUeJbjiyXFg0nu53hrOYsybqSiDyxyOpad0Rm6tAiGjgztAwkyvhlYHC53OiAJOA==";
       };
     };
     "p-retry-4.2.0" = {
@@ -2300,13 +2300,13 @@ let
         sha512 = "nqUTo8y9T0VhiJoWC0sK0+2S8hYDiu7CdH0Z9ijPi2iikiQ44mfcAFxEJxfvF8H3h/bDBvXthtOQPIB3pLWIow==";
       };
     };
-    "pg-pool-2.0.7" = {
+    "pg-pool-2.0.10" = {
       name = "pg-pool";
       packageName = "pg-pool";
-      version = "2.0.7";
+      version = "2.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pg-pool/-/pg-pool-2.0.7.tgz";
-        sha512 = "UiJyO5B9zZpu32GSlP0tXy8J2NsJ9EFGFfz5v6PSbdz/1hBLX1rNiiy5+mAm5iJJYwfCv4A0EBcQLGWwjbpzZw==";
+        url = "https://registry.npmjs.org/pg-pool/-/pg-pool-2.0.10.tgz";
+        sha512 = "qdwzY92bHf3nwzIUcj+zJ0Qo5lpG/YxchahxIN8+ZVmXqkahKXsnl2aiJPHLYN9o5mB/leG+Xh6XKxtP7e0sjg==";
       };
     };
     "pg-promise-9.3.6" = {
@@ -2390,31 +2390,22 @@ let
         sha512 = "iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q==";
       };
     };
-    "proxy-addr-2.0.5" = {
+    "proxy-addr-2.0.6" = {
       name = "proxy-addr";
       packageName = "proxy-addr";
-      version = "2.0.5";
+      version = "2.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz";
-        sha512 = "t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==";
+        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz";
+        sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==";
       };
     };
-    "psl-1.6.0" = {
+    "psl-1.7.0" = {
       name = "psl";
       packageName = "psl";
-      version = "1.6.0";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/psl/-/psl-1.6.0.tgz";
-        sha512 = "SYKKmVel98NCOYXpkwUqZqh0ahZeeKfmisiLIcEZdsb+WbLv02g/dI5BUmZnIyOe7RzZtLax81nnb2HbvC2tzA==";
-      };
-    };
-    "punycode-1.4.1" = {
-      name = "punycode";
-      packageName = "punycode";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
-        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
+        url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz";
+        sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==";
       };
     };
     "punycode-2.1.1" = {
@@ -2480,22 +2471,22 @@ let
         sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==";
       };
     };
-    "readable-stream-2.3.6" = {
+    "readable-stream-2.3.7" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.3.6";
+      version = "2.3.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz";
-        sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz";
+        sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==";
       };
     };
-    "readable-stream-3.4.0" = {
+    "readable-stream-3.6.0" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "3.4.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz";
-        sha512 = "jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==";
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz";
+        sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==";
       };
     };
     "regenerator-runtime-0.11.1" = {
@@ -2507,13 +2498,13 @@ let
         sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==";
       };
     };
-    "request-2.88.0" = {
+    "request-2.88.2" = {
       name = "request";
       packageName = "request";
-      version = "2.88.0";
+      version = "2.88.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz";
-        sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==";
+        url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz";
+        sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==";
       };
     };
     "request-promise-core-1.1.3" = {
@@ -2552,13 +2543,13 @@ let
         sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==";
       };
     };
-    "resolve-1.13.1" = {
+    "resolve-1.15.1" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.13.1";
+      version = "1.15.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.13.1.tgz";
-        sha512 = "CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz";
+        sha512 = "84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==";
       };
     };
     "retry-0.12.0" = {
@@ -2768,22 +2759,22 @@ let
         sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==";
       };
     };
-    "string.prototype.trimleft-2.1.0" = {
+    "string.prototype.trimleft-2.1.1" = {
       name = "string.prototype.trimleft";
       packageName = "string.prototype.trimleft";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz";
-        sha512 = "FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==";
+        url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz";
+        sha512 = "iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==";
       };
     };
-    "string.prototype.trimright-2.1.0" = {
+    "string.prototype.trimright-2.1.1" = {
       name = "string.prototype.trimright";
       packageName = "string.prototype.trimright";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz";
-        sha512 = "fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==";
+        url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz";
+        sha512 = "qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==";
       };
     };
     "string_decoder-1.1.1" = {
@@ -2885,13 +2876,13 @@ let
         sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==";
       };
     };
-    "tough-cookie-2.4.3" = {
+    "tough-cookie-2.5.0" = {
       name = "tough-cookie";
       packageName = "tough-cookie";
-      version = "2.4.3";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz";
-        sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==";
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz";
+        sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==";
       };
     };
     "triple-beam-1.3.0" = {
@@ -2903,22 +2894,22 @@ let
         sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==";
       };
     };
-    "ts-node-8.5.4" = {
+    "ts-node-8.7.0" = {
       name = "ts-node";
       packageName = "ts-node";
-      version = "8.5.4";
+      version = "8.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ts-node/-/ts-node-8.5.4.tgz";
-        sha512 = "izbVCRV68EasEPQ8MSIGBNK9dc/4sYJJKYA+IarMQct1RtEot6Xp0bXuClsbUSnKpg50ho+aOAx8en5c+y4OFw==";
+        url = "https://registry.npmjs.org/ts-node/-/ts-node-8.7.0.tgz";
+        sha512 = "s659CsHrsxaRVDEleuOkGvbsA0rWHtszUNEt1r0CgAFN5ZZTQtDzpsluS7W5pOGJIa1xZE8R/zK4dEs+ldFezg==";
       };
     };
-    "tslib-1.10.0" = {
+    "tslib-1.11.1" = {
       name = "tslib";
       packageName = "tslib";
-      version = "1.10.0";
+      version = "1.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz";
-        sha512 = "qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==";
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz";
+        sha512 = "aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==";
       };
     };
     "tslint-5.20.1" = {
@@ -2975,13 +2966,13 @@ let
         sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==";
       };
     };
-    "typescript-3.7.3" = {
+    "typescript-3.8.3" = {
       name = "typescript";
       packageName = "typescript";
-      version = "3.7.3";
+      version = "3.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-3.7.3.tgz";
-        sha512 = "Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw==";
+        url = "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz";
+        sha512 = "MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==";
       };
     };
     "underscore-1.4.4" = {
@@ -2993,13 +2984,13 @@ let
         sha1 = "61a6a32010622afa07963bf325203cf12239d604";
       };
     };
-    "unhomoglyph-1.0.3" = {
+    "unhomoglyph-1.0.5" = {
       name = "unhomoglyph";
       packageName = "unhomoglyph";
-      version = "1.0.3";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unhomoglyph/-/unhomoglyph-1.0.3.tgz";
-        sha512 = "PC/OAHE8aiTK0Gfmy0PxOlePazRn+BeCM1r4kFtkHgEnkJZgJoI7yD2yUEjsfSdLXKU1FSt/EcIZvNoKazYUTw==";
+        url = "https://registry.npmjs.org/unhomoglyph/-/unhomoglyph-1.0.5.tgz";
+        sha512 = "rNAw2rGogjq4BVhsCX8K6qXrCcHmUaMCHETlUG0ujGZ3OHwnzJHwdMyzy3n/c9Y7lvlbckOd9nkW33grUVE3bg==";
       };
     };
     "unpipe-1.0.0" = {
@@ -3038,13 +3029,13 @@ let
         sha1 = "9f95710f50a267947b2ccc124741c1028427e713";
       };
     };
-    "uuid-3.3.3" = {
+    "uuid-3.4.0" = {
       name = "uuid";
       packageName = "uuid";
-      version = "3.3.3";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz";
-        sha512 = "pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz";
+        sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==";
       };
     };
     "vary-1.1.2" = {
@@ -3101,13 +3092,13 @@ let
         sha512 = "zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw==";
       };
     };
-    "winston-compat-0.1.4" = {
+    "winston-compat-0.1.5" = {
       name = "winston-compat";
       packageName = "winston-compat";
-      version = "0.1.4";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston-compat/-/winston-compat-0.1.4.tgz";
-        sha512 = "mMEfFsSm6GmkFF+f4/0UJtG4N1vSaczGmXLVJYmS/+u2zUaIPcw2ZRuwUg2TvVBjswgiraN+vNnAG8z4fRUZ4w==";
+        url = "https://registry.npmjs.org/winston-compat/-/winston-compat-0.1.5.tgz";
+        sha512 = "EPvPcHT604AV3Ji6d3+vX8ENKIml9VSxMRnPQ+cuK/FX6f3hvPP2hxyoeeCOCFvDrJEujalfcKWlWPvAnFyS9g==";
       };
     };
     "winston-daily-rotate-file-3.10.0" = {
@@ -3182,6 +3173,15 @@ let
         sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==";
       };
     };
+    "yargs-13.3.2" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "13.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz";
+        sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==";
+      };
+    };
     "yargs-parser-13.1.1" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -3191,6 +3191,15 @@ let
         sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==";
       };
     };
+    "yargs-parser-13.1.2" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "13.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz";
+        sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==";
+      };
+    };
     "yargs-unparser-1.6.0" = {
       name = "yargs-unparser";
       packageName = "yargs-unparser";
@@ -3222,54 +3231,54 @@ in
       sha256 = "b419d34771f4f4be56fe66ba4cbf690fb5a337e317a927e70e65be3f1ddd55ef";
     };
     dependencies = [
-      sources."@babel/code-frame-7.5.5"
-      sources."@babel/highlight-7.5.0"
+      sources."@babel/code-frame-7.8.3"
+      sources."@babel/highlight-7.8.3"
       sources."@slack/logger-1.1.1"
       (sources."@slack/rtm-api-5.0.3" // {
         dependencies = [
           sources."p-queue-2.4.2"
         ];
       })
-      sources."@slack/types-1.3.0"
-      (sources."@slack/web-api-5.6.0" // {
+      sources."@slack/types-1.4.0"
+      (sources."@slack/web-api-5.8.0" // {
         dependencies = [
           sources."p-queue-2.4.2"
         ];
       })
-      sources."@types/body-parser-1.17.1"
+      sources."@types/body-parser-1.19.0"
       sources."@types/caseless-0.12.2"
-      sources."@types/chai-4.2.6"
-      sources."@types/connect-3.4.32"
+      sources."@types/chai-4.2.11"
+      sources."@types/connect-3.4.33"
       sources."@types/events-3.0.0"
-      sources."@types/express-4.17.2"
-      sources."@types/express-serve-static-core-4.17.0"
+      sources."@types/express-4.17.3"
+      sources."@types/express-serve-static-core-4.17.2"
       sources."@types/is-stream-1.1.0"
       sources."@types/mime-2.0.1"
       sources."@types/mocha-5.2.7"
       sources."@types/nedb-1.8.9"
-      sources."@types/node-12.12.14"
+      sources."@types/node-12.12.30"
       sources."@types/node-emoji-1.8.1"
       sources."@types/p-queue-2.3.2"
       sources."@types/randomstring-1.1.6"
       sources."@types/range-parser-1.2.3"
-      sources."@types/request-2.48.3"
+      sources."@types/request-2.48.4"
       sources."@types/request-promise-native-1.0.17"
       sources."@types/retry-0.12.0"
       sources."@types/serve-static-1.13.3"
       sources."@types/tough-cookie-2.3.6"
-      sources."@types/uuid-3.4.6"
+      sources."@types/uuid-3.4.8"
       sources."@types/ws-5.1.2"
-      sources."@types/yargs-13.0.3"
+      sources."@types/yargs-13.0.8"
       sources."@types/yargs-parser-13.1.0"
       sources."Slackdown-git://github.com/Half-Shot/slackdown#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
-      sources."ajv-6.10.2"
+      sources."ajv-6.12.0"
       sources."another-json-0.2.0"
       sources."ansi-colors-3.2.3"
       sources."ansi-regex-4.1.0"
       sources."ansi-styles-3.2.1"
-      sources."arg-4.1.2"
+      sources."arg-4.1.3"
       sources."argparse-1.0.10"
       sources."array-flatten-1.1.1"
       sources."array-uniq-1.0.2"
@@ -3281,11 +3290,11 @@ in
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.9.0"
-      sources."axios-0.18.1"
+      sources."aws4-1.9.1"
+      sources."axios-0.19.2"
       sources."babel-runtime-6.26.0"
       sources."balanced-match-1.0.0"
-      sources."base-x-3.0.7"
+      sources."base-x-3.0.8"
       sources."basic-auth-2.0.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."binary-search-tree-0.2.5"
@@ -3328,7 +3337,7 @@ in
       sources."content-type-1.0.4"
       sources."cookie-0.4.0"
       sources."cookie-signature-1.0.6"
-      sources."core-js-2.6.10"
+      sources."core-js-2.6.11"
       sources."core-util-is-1.0.2"
       sources."cycle-1.0.3"
       sources."dashdash-1.14.1"
@@ -3346,8 +3355,8 @@ in
       sources."emoji-regex-7.0.3"
       sources."enabled-1.0.2"
       sources."encodeurl-1.0.2"
-      sources."env-variable-0.0.5"
-      sources."es-abstract-1.16.3"
+      sources."env-variable-0.0.6"
+      sources."es-abstract-1.17.4"
       sources."es-to-primitive-1.2.1"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-2.0.0"
@@ -3362,8 +3371,8 @@ in
       })
       sources."extend-3.0.2"
       sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-2.0.1"
-      sources."fast-json-stable-stringify-2.0.0"
+      sources."fast-deep-equal-3.1.1"
+      sources."fast-json-stable-stringify-2.1.0"
       sources."fast-safe-stringify-2.0.7"
       sources."fecha-2.3.3"
       sources."file-stream-rotator-0.4.1"
@@ -3401,16 +3410,16 @@ in
       sources."immediate-3.0.6"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
-      sources."ipaddr.js-1.9.0"
+      sources."ipaddr.js-1.9.1"
       sources."is-arrayish-0.3.2"
       sources."is-buffer-2.0.4"
-      sources."is-callable-1.1.4"
-      sources."is-date-object-1.0.1"
+      sources."is-callable-1.1.5"
+      sources."is-date-object-1.0.2"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-my-ip-valid-1.0.0"
       sources."is-my-json-valid-2.20.0"
       sources."is-property-1.0.2"
-      sources."is-regex-1.0.4"
+      sources."is-regex-1.0.5"
       sources."is-stream-1.1.0"
       sources."is-symbol-1.0.3"
       sources."is-typedarray-1.0.0"
@@ -3437,12 +3446,12 @@ in
           sources."ms-2.1.2"
         ];
       })
-      sources."loglevel-1.6.6"
-      sources."make-error-1.3.5"
+      sources."loglevel-1.6.7"
+      sources."make-error-1.3.6"
       sources."manakin-0.5.2"
       sources."matrix-appservice-0.4.1"
       sources."matrix-appservice-bridge-1.11.1"
-      (sources."matrix-js-sdk-2.4.5" // {
+      (sources."matrix-js-sdk-2.4.6" // {
         dependencies = [
           sources."bluebird-3.5.5"
         ];
@@ -3451,10 +3460,10 @@ in
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."mime-1.6.0"
-      sources."mime-db-1.42.0"
-      sources."mime-types-2.1.25"
+      sources."mime-db-1.43.0"
+      sources."mime-types-2.1.26"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-1.2.5"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -3466,6 +3475,8 @@ in
           sources."escape-string-regexp-1.0.5"
           sources."ms-2.1.1"
           sources."supports-color-6.0.0"
+          sources."yargs-13.3.0"
+          sources."yargs-parser-13.1.1"
         ];
       })
       sources."moment-2.24.0"
@@ -3489,16 +3500,16 @@ in
       sources."object-inspect-1.7.0"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.0"
-      sources."object.getownpropertydescriptors-2.0.3"
+      sources."object.getownpropertydescriptors-2.1.0"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."one-time-0.0.4"
       sources."p-cancelable-1.1.0"
       sources."p-finally-1.0.0"
-      sources."p-limit-2.2.1"
+      sources."p-limit-2.2.2"
       sources."p-locate-3.0.0"
-      (sources."p-queue-6.2.1" // {
+      (sources."p-queue-6.3.0" // {
         dependencies = [
           sources."eventemitter3-4.0.0"
         ];
@@ -3518,7 +3529,7 @@ in
       sources."pg-connection-string-0.1.3"
       sources."pg-int8-1.0.1"
       sources."pg-minify-1.5.1"
-      sources."pg-pool-2.0.7"
+      sources."pg-pool-2.0.10"
       sources."pg-promise-9.3.6"
       sources."pg-types-2.2.0"
       sources."pgpass-1.0.2"
@@ -3528,17 +3539,17 @@ in
       sources."postgres-interval-1.2.0"
       sources."process-nextick-args-2.0.1"
       sources."prom-client-11.5.3"
-      sources."proxy-addr-2.0.5"
-      sources."psl-1.6.0"
+      sources."proxy-addr-2.0.6"
+      sources."psl-1.7.0"
       sources."punycode-2.1.1"
       sources."qs-6.7.0"
       sources."quick-lru-4.0.1"
       sources."randomstring-1.1.5"
       sources."range-parser-1.2.1"
       sources."raw-body-2.4.0"
-      sources."readable-stream-3.4.0"
+      sources."readable-stream-3.6.0"
       sources."regenerator-runtime-0.11.1"
-      (sources."request-2.88.0" // {
+      (sources."request-2.88.2" // {
         dependencies = [
           sources."form-data-2.3.3"
           sources."qs-6.5.2"
@@ -3548,7 +3559,7 @@ in
       sources."request-promise-native-1.0.8"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
-      sources."resolve-1.13.1"
+      sources."resolve-1.15.1"
       sources."retry-0.12.0"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
@@ -3577,8 +3588,8 @@ in
       sources."statuses-1.5.0"
       sources."stealthy-require-1.1.1"
       sources."string-width-3.1.0"
-      sources."string.prototype.trimleft-2.1.0"
-      sources."string.prototype.trimright-2.1.0"
+      sources."string.prototype.trimleft-2.1.1"
+      sources."string.prototype.trimright-2.1.1"
       (sources."string_decoder-1.3.0" // {
         dependencies = [
           sources."safe-buffer-5.2.0"
@@ -3591,21 +3602,17 @@ in
       sources."text-hex-1.0.0"
       sources."through-2.3.8"
       sources."toidentifier-1.0.0"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."triple-beam-1.3.0"
-      (sources."ts-node-8.5.4" // {
+      (sources."ts-node-8.7.0" // {
         dependencies = [
-          sources."diff-4.0.1"
+          sources."diff-4.0.2"
         ];
       })
-      sources."tslib-1.10.0"
+      sources."tslib-1.11.1"
       (sources."tslint-5.20.1" // {
         dependencies = [
-          sources."diff-4.0.1"
+          sources."diff-4.0.2"
           sources."semver-5.7.1"
         ];
       })
@@ -3614,14 +3621,14 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-detect-4.0.8"
       sources."type-is-1.6.18"
-      sources."typescript-3.7.3"
+      sources."typescript-3.8.3"
       sources."underscore-1.4.4"
-      sources."unhomoglyph-1.0.3"
+      sources."unhomoglyph-1.0.5"
       sources."unpipe-1.0.0"
       sources."uri-js-4.2.2"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
-      sources."uuid-3.3.3"
+      sources."uuid-3.4.0"
       sources."vary-1.1.2"
       sources."verror-1.10.0"
       sources."which-1.3.1"
@@ -3638,7 +3645,7 @@ in
           sources."async-2.6.3"
         ];
       })
-      (sources."winston-compat-0.1.4" // {
+      (sources."winston-compat-0.1.5" // {
         dependencies = [
           sources."logform-1.10.0"
           sources."ms-2.1.2"
@@ -3651,7 +3658,7 @@ in
       })
       (sources."winston-transport-4.3.0" // {
         dependencies = [
-          sources."readable-stream-2.3.6"
+          sources."readable-stream-2.3.7"
           sources."string_decoder-1.1.1"
         ];
       })
@@ -3660,8 +3667,8 @@ in
       sources."ws-5.2.2"
       sources."xtend-4.0.2"
       sources."y18n-4.0.0"
-      sources."yargs-13.3.0"
-      sources."yargs-parser-13.1.1"
+      sources."yargs-13.3.2"
+      sources."yargs-parser-13.1.2"
       sources."yargs-unparser-1.6.0"
       sources."yn-3.1.1"
     ];
diff --git a/pkgs/servers/web-apps/cryptpad/generate.sh b/pkgs/servers/web-apps/cryptpad/generate.sh
index 8abf47409d4e..2fe4099efa4f 100755
--- a/pkgs/servers/web-apps/cryptpad/generate.sh
+++ b/pkgs/servers/web-apps/cryptpad/generate.sh
@@ -2,7 +2,7 @@
 #! nix-shell -i bash  -I nixpkgs=../../../.. -p nodePackages.node2nix nodePackages.bower2nix
 set -euo pipefail
 
-node2nix -6 \
+node2nix --nodejs-10 \
      --input node-packages.json \
      --output node-packages-generated.nix \
      --composition node-packages.nix \
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
index 03207d7ab027..8581f7095cc0 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
+++ b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix
index cae300a53f40..3eecf3c90999 100644
--- a/pkgs/servers/web-apps/cryptpad/node-packages.nix
+++ b/pkgs/servers/web-apps/cryptpad/node-packages.nix
@@ -1,8 +1,8 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
diff --git a/pkgs/tools/networking/airfield/deps.sh b/pkgs/tools/networking/airfield/deps.sh
index 77648e2fbfbc..f33ec8e2ab56 100755
--- a/pkgs/tools/networking/airfield/deps.sh
+++ b/pkgs/tools/networking/airfield/deps.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env nix-shell
 #! nix-shell -i bash -p nodePackages.node2nix
 
-node2nix -8 -i deps.json \
+node2nix --nodejs-10 -i deps.json \
   --no-copy-node-env \
   -e ../../../development/node-packages/node-env.nix -c node.nix
diff --git a/pkgs/tools/networking/airfield/node-packages.nix b/pkgs/tools/networking/airfield/node-packages.nix
index 1febe36898b2..fe93f449b037 100644
--- a/pkgs/tools/networking/airfield/node-packages.nix
+++ b/pkgs/tools/networking/airfield/node-packages.nix
@@ -1,16 +1,16 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
 let
   sources = {
-    "ajv-6.10.0" = {
+    "ajv-6.12.0" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.10.0";
+      version = "6.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz";
-        sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==";
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz";
+        sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==";
       };
     };
     "asn1-0.2.4" = {
@@ -49,13 +49,13 @@ let
         sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
       };
     };
-    "aws4-1.8.0" = {
+    "aws4-1.9.1" = {
       name = "aws4";
       packageName = "aws4";
-      version = "1.8.0";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz";
-        sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==";
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz";
+        sha512 = "wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==";
       };
     };
     "bcrypt-pbkdf-1.0.2" = {
@@ -184,13 +184,13 @@ let
         sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
       };
     };
-    "double-ended-queue-2.1.0-0" = {
-      name = "double-ended-queue";
-      packageName = "double-ended-queue";
-      version = "2.1.0-0";
+    "denque-1.4.1" = {
+      name = "denque";
+      packageName = "denque";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz";
-        sha1 = "103d3527fd31528f40188130c841efdd78264e5c";
+        url = "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz";
+        sha512 = "OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ==";
       };
     };
     "ecc-jsbn-0.1.2" = {
@@ -220,22 +220,22 @@ let
         sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
       };
     };
-    "fast-deep-equal-2.0.1" = {
+    "fast-deep-equal-3.1.1" = {
       name = "fast-deep-equal";
       packageName = "fast-deep-equal";
-      version = "2.0.1";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz";
-        sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
+        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz";
+        sha512 = "8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==";
       };
     };
-    "fast-json-stable-stringify-2.0.0" = {
+    "fast-json-stable-stringify-2.1.0" = {
       name = "fast-json-stable-stringify";
       packageName = "fast-json-stable-stringify";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz";
-        sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2";
+        url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz";
+        sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==";
       };
     };
     "forever-agent-0.6.1" = {
@@ -391,22 +391,22 @@ let
         sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365";
       };
     };
-    "mime-db-1.40.0" = {
+    "mime-db-1.43.0" = {
       name = "mime-db";
       packageName = "mime-db";
-      version = "1.40.0";
+      version = "1.43.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz";
-        sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz";
+        sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==";
       };
     };
-    "mime-types-2.1.24" = {
+    "mime-types-2.1.26" = {
       name = "mime-types";
       packageName = "mime-types";
-      version = "2.1.24";
+      version = "2.1.26";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz";
-        sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz";
+        sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==";
       };
     };
     "mkdirp-0.3.3" = {
@@ -418,13 +418,13 @@ let
         sha1 = "595e251c1370c3a68bab2136d0e348b8105adf13";
       };
     };
-    "ms-2.1.1" = {
+    "ms-2.1.2" = {
       name = "ms";
       packageName = "ms";
-      version = "2.1.1";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz";
-        sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==";
+        url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz";
+        sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
       };
     };
     "oauth-sign-0.9.0" = {
@@ -454,22 +454,13 @@ let
         sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
       };
     };
-    "psl-1.1.32" = {
+    "psl-1.7.0" = {
       name = "psl";
       packageName = "psl";
-      version = "1.1.32";
+      version = "1.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz";
-        sha512 = "MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g==";
-      };
-    };
-    "punycode-1.4.1" = {
-      name = "punycode";
-      packageName = "punycode";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
-        sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
+        url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz";
+        sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==";
       };
     };
     "punycode-2.1.1" = {
@@ -508,15 +499,6 @@ let
         sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b";
       };
     };
-    "redis-2.8.0" = {
-      name = "redis";
-      packageName = "redis";
-      version = "2.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz";
-        sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A==";
-      };
-    };
     "redis-commands-1.5.0" = {
       name = "redis-commands";
       packageName = "redis-commands";
@@ -526,22 +508,31 @@ let
         sha512 = "6KxamqpZ468MeQC3bkWmCB1fp56XL64D4Kf0zJSwDZbVLLm7KFkoIcHrgRvQ+sk8dnhySs7+yBg94yIkAK7aJg==";
       };
     };
-    "redis-parser-2.6.0" = {
-      name = "redis-parser";
-      packageName = "redis-parser";
-      version = "2.6.0";
+    "redis-errors-1.2.0" = {
+      name = "redis-errors";
+      packageName = "redis-errors";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/redis-parser/-/redis-parser-2.6.0.tgz";
-        sha1 = "52ed09dacac108f1a631c07e9b69941e7a19504b";
+        url = "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz";
+        sha1 = "eb62d2adb15e4eaf4610c04afe1529384250abad";
       };
     };
-    "safe-buffer-5.1.2" = {
+    "redis-parser-3.0.0" = {
+      name = "redis-parser";
+      packageName = "redis-parser";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz";
+        sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4";
+      };
+    };
+    "safe-buffer-5.2.0" = {
       name = "safe-buffer";
       packageName = "safe-buffer";
-      version = "5.1.2";
+      version = "5.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
-        sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz";
+        sha512 = "fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==";
       };
     };
     "safer-buffer-2.1.2" = {
@@ -571,13 +562,13 @@ let
         sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==";
       };
     };
-    "tough-cookie-2.4.3" = {
+    "tough-cookie-2.5.0" = {
       name = "tough-cookie";
       packageName = "tough-cookie";
-      version = "2.4.3";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz";
-        sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==";
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz";
+        sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==";
       };
     };
     "tunnel-agent-0.6.0" = {
@@ -598,13 +589,13 @@ let
         sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64";
       };
     };
-    "underscore-1.9.1" = {
+    "underscore-1.9.2" = {
       name = "underscore";
       packageName = "underscore";
-      version = "1.9.1";
+      version = "1.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz";
-        sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==";
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.9.2.tgz";
+        sha512 = "D39qtimx0c1fI3ya1Lnhk3E9nONswSKhnffBI0gME9C99fYOkNi04xs8K6pePLhvl1frbDemkaBQ5ikWllR2HQ==";
       };
     };
     "uri-js-4.2.2" = {
@@ -616,13 +607,13 @@ let
         sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==";
       };
     };
-    "uuid-3.3.2" = {
+    "uuid-3.4.0" = {
       name = "uuid";
       packageName = "uuid";
-      version = "3.3.2";
+      version = "3.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz";
-        sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz";
+        sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==";
       };
     };
     "verror-1.10.0" = {
@@ -659,7 +650,7 @@ in
       sources."methods-0.0.1"
       sources."mime-1.2.6"
       sources."mkdirp-0.3.3"
-      sources."ms-2.1.1"
+      sources."ms-2.1.2"
       sources."pause-0.0.1"
       sources."qs-0.5.1"
       sources."range-parser-0.0.4"
@@ -682,7 +673,7 @@ in
       sha1 = "544bfb3bd837608873eed6a72c672a28cb1f1b3f";
     };
     dependencies = [
-      sources."underscore-1.9.1"
+      sources."underscore-1.9.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -712,20 +703,21 @@ in
   redis = nodeEnv.buildNodePackage {
     name = "redis";
     packageName = "redis";
-    version = "2.8.0";
+    version = "3.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz";
-      sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A==";
+      url = "https://registry.npmjs.org/redis/-/redis-3.0.2.tgz";
+      sha512 = "PNhLCrjU6vKVuMOyFu7oSP296mwBkcE6lrAjruBYG5LgdSqtRBoVQIylrMyVZD/lkF24RSNNatzvYag6HRBHjQ==";
     };
     dependencies = [
-      sources."double-ended-queue-2.1.0-0"
+      sources."denque-1.4.1"
       sources."redis-commands-1.5.0"
-      sources."redis-parser-2.6.0"
+      sources."redis-errors-1.2.0"
+      sources."redis-parser-3.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
-      description = "Redis client library";
-      homepage = https://github.com/NodeRedis/node_redis;
+      description = "A high performance Redis client.";
+      homepage = https://github.com/NodeRedis/node-redis;
       license = "MIT";
     };
     production = true;
@@ -735,19 +727,11 @@ in
   connect-redis = nodeEnv.buildNodePackage {
     name = "connect-redis";
     packageName = "connect-redis";
-    version = "3.4.1";
+    version = "4.0.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/connect-redis/-/connect-redis-3.4.1.tgz";
-      sha512 = "oXNcpLg/PJ6G4gbhyGwrQK9mUQTKYa2aEnOH9kWIxbNUjIFPqUmzz75RdLp5JTPSjrBVcz+9ll4sSxfvlW0ZLA==";
+      url = "https://registry.npmjs.org/connect-redis/-/connect-redis-4.0.4.tgz";
+      sha512 = "aXk7btMlG0J5LqtPNRpFKa5fglzlTzukYNx+Fq8cghbUIQHN/gyK9c3+b0XEROMwiSxMoZDADqjp9tdpUoZLAg==";
     };
-    dependencies = [
-      sources."debug-4.1.1"
-      sources."double-ended-queue-2.1.0-0"
-      sources."ms-2.1.1"
-      sources."redis-2.8.0"
-      sources."redis-commands-1.5.0"
-      sources."redis-parser-2.6.0"
-    ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "Redis session store for Connect";
@@ -761,10 +745,10 @@ in
   async = nodeEnv.buildNodePackage {
     name = "async";
     packageName = "async";
-    version = "3.0.1";
+    version = "3.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/async/-/async-3.0.1.tgz";
-      sha512 = "ZswD8vwPtmBZzbn9xyi8XBQWXH3AvOQ43Za1KWYq7JeycrZuUYzx01KvHcVbXltjqH4y0MWrQ33008uLTqXuDw==";
+      url = "https://registry.npmjs.org/async/-/async-3.2.0.tgz";
+      sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -779,18 +763,18 @@ in
   request = nodeEnv.buildNodePackage {
     name = "request";
     packageName = "request";
-    version = "2.88.0";
+    version = "2.88.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz";
-      sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==";
+      url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz";
+      sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==";
     };
     dependencies = [
-      sources."ajv-6.10.0"
+      sources."ajv-6.12.0"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
-      sources."aws4-1.8.0"
+      sources."aws4-1.9.1"
       sources."bcrypt-pbkdf-1.0.2"
       sources."caseless-0.12.0"
       sources."combined-stream-1.0.8"
@@ -800,8 +784,8 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."extend-3.0.2"
       sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-2.0.1"
-      sources."fast-json-stable-stringify-2.0.0"
+      sources."fast-deep-equal-3.1.1"
+      sources."fast-json-stable-stringify-2.1.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
       sources."getpass-0.1.7"
@@ -815,25 +799,21 @@ in
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
       sources."jsprim-1.4.1"
-      sources."mime-db-1.40.0"
-      sources."mime-types-2.1.24"
+      sources."mime-db-1.43.0"
+      sources."mime-types-2.1.26"
       sources."oauth-sign-0.9.0"
       sources."performance-now-2.1.0"
-      sources."psl-1.1.32"
+      sources."psl-1.7.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
-      sources."safe-buffer-5.1.2"
+      sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
       sources."sshpk-1.16.1"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."uri-js-4.2.2"
-      sources."uuid-3.3.2"
+      sources."uuid-3.4.0"
       sources."verror-1.10.0"
     ];
     buildInputs = globalBuildInputs;
diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix
index 4377681e20d8..e306e49c8498 100644
--- a/pkgs/tools/networking/airfield/node.nix
+++ b/pkgs/tools/networking/airfield/node.nix
@@ -1,8 +1,8 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
diff --git a/pkgs/tools/package-management/nixui/generate.sh b/pkgs/tools/package-management/nixui/generate.sh
index 334edb4a027a..fcb610c9d3b1 100755
--- a/pkgs/tools/package-management/nixui/generate.sh
+++ b/pkgs/tools/package-management/nixui/generate.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env nix-shell
 #! nix-shell -i bash -p nodePackages.node2nix
 
-exec node2nix -8 -i pkg.json -c nixui.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env
+exec node2nix --nodejs-10 -i pkg.json -c nixui.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env
diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix
index 4377681e20d8..e306e49c8498 100644
--- a/pkgs/tools/package-management/nixui/nixui.nix
+++ b/pkgs/tools/package-management/nixui/nixui.nix
@@ -1,8 +1,8 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix
index 07e3cd896f63..25eaac8f2b7d 100644
--- a/pkgs/tools/package-management/nixui/node-packages.nix
+++ b/pkgs/tools/package-management/nixui/node-packages.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -58,13 +58,13 @@ let
         sha1 = "61a6a32010622afa07963bf325203cf12239d604";
       };
     };
-    "underscore-1.9.1" = {
+    "underscore-1.9.2" = {
       name = "underscore";
       packageName = "underscore";
-      version = "1.9.1";
+      version = "1.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz";
-        sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==";
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.9.2.tgz";
+        sha512 = "D39qtimx0c1fI3ya1Lnhk3E9nONswSKhnffBI0gME9C99fYOkNi04xs8K6pePLhvl1frbDemkaBQ5ikWllR2HQ==";
       };
     };
   };
@@ -93,7 +93,7 @@ in
           sources."underscore-1.4.4"
         ];
       })
-      sources."underscore-1.9.1"
+      sources."underscore-1.9.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {

From 069f62de77c5e1887159f560cee0ebab05e752c1 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 11 Mar 2020 23:54:47 +0100
Subject: [PATCH 3150/4636] python3Packages.google_api_python_client: 1.7.11 ->
 1.7.12

---
 .../google-api-python-client/default.nix          | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix
index e81f82740869..06ee032cdb7d 100644
--- a/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/pkgs/development/python-modules/google-api-python-client/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "google-api-python-client";
-  version = "1.7.11";
+  version = "1.7.12";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "137vwb9544vjxkwnbr98x0f4p6ri5i678wxxxgbsx4kdyrs83a58";
+    sha256 = "02blmm32xfwjjcxds6ym9nnz29wzyiahd64shrsrkrdm6aqagmlz";
   };
 
   # No tests included in archive
@@ -16,8 +16,15 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ httplib2 google_auth google-auth-httplib2 six uritemplate oauth2client ];
 
   meta = with lib; {
-    description = "The core Python library for accessing Google APIs";
-    homepage = https://github.com/google/google-api-python-client;
+    description = "The official Python client library for Google's discovery based APIs";
+    longDescription = ''
+      These client libraries are officially supported by Google. However, the
+      libraries are considered complete and are in maintenance mode. This means
+      that we will address critical bugs and security issues but will not add
+      any new features.
+    '';
+    homepage = "https://github.com/google/google-api-python-client";
+    changelog = "https://github.com/googleapis/google-api-python-client/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ primeos ];
   };

From 7a1c9d8eb77c6304b3c8d787492fd24b8a8b6a25 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 15 Mar 2020 11:29:08 +0100
Subject: [PATCH 3151/4636] python3Packages.google_api_python_client: 1.7.12 ->
 1.8.0

This version doesn't depend on
https://github.com/NixOS/nixpkgs/pull/82355 anymore.
---
 .../google-api-python-client/default.nix             | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix
index 06ee032cdb7d..2d7ae43f7f1e 100644
--- a/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/pkgs/development/python-modules/google-api-python-client/default.nix
@@ -1,19 +1,23 @@
 { lib, buildPythonPackage, fetchPypi
-, httplib2, google_auth, google-auth-httplib2, six, uritemplate, oauth2client }:
+, google_auth, google-auth-httplib2, google_api_core
+, httplib2, six, uritemplate, oauth2client }:
 
 buildPythonPackage rec {
   pname = "google-api-python-client";
-  version = "1.7.12";
+  version = "1.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "02blmm32xfwjjcxds6ym9nnz29wzyiahd64shrsrkrdm6aqagmlz";
+    sha256 = "003rgr15r9j080f3n5y2x6ymxsfv652m3r7j83p7sbrd9shl4nqg";
   };
 
   # No tests included in archive
   doCheck = false;
 
-  propagatedBuildInputs = [ httplib2 google_auth google-auth-httplib2 six uritemplate oauth2client ];
+  propagatedBuildInputs = [
+    google_auth google-auth-httplib2 google_api_core
+    httplib2 six uritemplate oauth2client
+  ];
 
   meta = with lib; {
     description = "The official Python client library for Google's discovery based APIs";

From 43f245d6d93ec64704f0b84e47cf39192cad6e9f Mon Sep 17 00:00:00 2001
From: toonn <toonn@toonn.io>
Date: Sun, 15 Mar 2020 16:59:15 +0100
Subject: [PATCH 3152/4636] wire-desktop: mac 3.12.3490 -> 3.15.3621

---
 .../networking/instant-messengers/wire-desktop/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index c04851d586b4..07542a017bd3 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -20,12 +20,12 @@ let
   pname = "wire-desktop";
 
   version = {
-    x86_64-darwin = "3.12.3490";
+    x86_64-darwin = "3.15.3621";
     x86_64-linux = "3.12.2916";
   }.${system} or throwSystem;
 
   sha256 = {
-    x86_64-darwin = "0xvhx3r99fl1v1cdqj6sk46kzxv9qi7j754amkhv7knrpmgyp55z";
+    x86_64-darwin = "13sgakb3zjlvqv6d6b264fc9x99swpl7s1dmnrgc5v3pgyaklr01";
     x86_64-linux = "0xx03cpy6kapbjpygwranxjg1a0p8s1xq3cpapvi55rnkbk0qvjw";
   }.${system} or throwSystem;
 
@@ -121,7 +121,7 @@ let
 
     src = fetchurl {
       url = "https://github.com/wireapp/wire-desktop/releases/download/"
-      + "macos%2F${version}/Wire.pkg";
+      + "wrapper_macos_production%2F${version}/Wire.pkg";
       inherit sha256;
     };
 

From 5c207933b7076130058e143173a2a314b8bb37b4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Mar 2020 16:09:15 +0000
Subject: [PATCH 3153/4636] postfix: 3.4.9 -> 3.4.10

---
 pkgs/servers/mail/postfix/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index f0153382b548..0386bcf2394b 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -26,11 +26,11 @@ in stdenv.mkDerivation rec {
 
   pname = "postfix";
 
-  version = "3.4.9";
+  version = "3.4.10";
 
   src = fetchurl {
     url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${pname}-${version}.tar.gz";
-    sha256 = "19rdb92q77japw6gy7niiyj1h3nqfdakkcsq2avn9l160vxrqw54";
+    sha256 = "0m36wn5grm4cf8nnvlgsgwsm6v09xz01n7jnx13h0yjk73y6d2lh";
   };
 
   nativeBuildInputs = [ makeWrapper m4 ];
@@ -98,7 +98,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    homepage = http://www.postfix.org/;
+    homepage = "http://www.postfix.org/";
     description = "A fast, easy to administer, and secure mail server";
     license = with licenses; [ ipl10 epl20 ];
     platforms = platforms.linux;

From 500375e338098e26f23f962f41ad10f4b317a50f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 18 Feb 2020 15:26:12 +0100
Subject: [PATCH 3154/4636] python3Packages.signedjson: 1.0.0 -> 1.1.0

---
 pkgs/development/python-modules/signedjson/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/signedjson/default.nix b/pkgs/development/python-modules/signedjson/default.nix
index 33a615fefd46..1214730dad87 100644
--- a/pkgs/development/python-modules/signedjson/default.nix
+++ b/pkgs/development/python-modules/signedjson/default.nix
@@ -4,19 +4,20 @@
 , canonicaljson
 , unpaddedbase64
 , pynacl
+, typing-extensions
 }:
 
 buildPythonPackage rec {
   pname = "signedjson";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchgit {
     url = "https://github.com/matrix-org/python-signedjson.git";
     rev = "refs/tags/v${version}";
-    sha256 = "0b8xxhc3npd4567kqapfp4gs7m0h057xam3an7424az262ind82n";
+    sha256 = "18s388hm3babnvakbbgfqk0jzq25nnznvhygywd3azp9b4yzmd5c";
   };
 
-  propagatedBuildInputs = [ canonicaljson unpaddedbase64 pynacl ];
+  propagatedBuildInputs = [ canonicaljson unpaddedbase64 pynacl typing-extensions ];
 
   meta = with stdenv.lib; {
     homepage = https://pypi.org/project/signedjson/;

From 8be61f7a36f403c15e1a242e129be7375aafaa85 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 18 Feb 2020 14:50:19 +0100
Subject: [PATCH 3155/4636] matrix-synapse: 1.9.1 -> 1.11.1

https://github.com/matrix-org/synapse/releases/tag/v1.10.0
https://github.com/matrix-org/synapse/releases/tag/v1.10.1
https://github.com/matrix-org/synapse/releases/tag/v1.11.0
https://github.com/matrix-org/synapse/releases/tag/v1.11.1
---
 nixos/doc/manual/release-notes/rl-2003.xml    | 60 +++++++++++++++++++
 .../modules/services/misc/matrix-synapse.nix  | 44 ++++++++------
 nixos/tests/matrix-synapse.nix                | 21 ++++++-
 pkgs/servers/matrix-synapse/default.nix       |  4 +-
 4 files changed, 109 insertions(+), 20 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index b629c460f4cd..18cb1e4c314e 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -712,6 +712,66 @@ auth required pam_succeed_if.so uid >= 1000 quiet
      For further reference, please read <link xlink:href="https://github.com/NixOS/nixpkgs/pull/68953">#68953</link> or the corresponding <link xlink:href="https://discourse.nixos.org/t/predictable-network-interface-names-in-initrd/4055">discourse thread</link>.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     The <package>matrix-synapse</package>-package has been updated to
+     <link xlink:href="https://github.com/matrix-org/synapse/releases/tag/v1.11.1">v1.11.1</link>.
+     Due to <link xlink:href="https://github.com/matrix-org/synapse/releases/tag/v1.10.0rc1">stricter requirements</link>
+     for database configuration when using <package>postgresql</package>, the automated database setup
+     of the module has been removed to avoid any further edge-cases.
+    </para>
+    <para>
+     <package>matrix-synapse</package> expects <literal>postgresql</literal>-databases to have the options
+     <literal>LC_COLLATE</literal> and <literal>LC_CTYPE</literal> set to
+     <link xlink:href="https://www.postgresql.org/docs/12/locale.html"><literal>'C'</literal></link> which basically
+     instructs <literal>postgresql</literal> to ignore any locale-based preferences.
+    </para>
+    <para>
+     Depending on your setup, you need to incorporate one of the following changes in your setup to
+     upgrade to 20.03:
+     <itemizedlist>
+      <listitem><para>If you use <literal>sqlite3</literal> you don't need to do anything.</para></listitem>
+      <listitem><para>If you use <literal>postgresql</literal> on a different server, you don't need
+       to change anything as well since this module was never designed to configure remote databases.
+      </para></listitem>
+      <listitem><para>If you use <literal>postgresql</literal> and configured your synapse initially on
+       <literal>19.09</literal> or older, you simply need to enable <package>postgresql</package>-support
+        explicitly:
+<programlisting>{ ... }: {
+  services.matrix-synapse = {
+    <link linkend="opt-services.matrix-synapse.enable">enable</link> = true;
+    /* and all the other config you've defined here */
+  };
+  <link linkend="opt-services.postgresql.enable">services.postgresql.enable</link> = true;
+}</programlisting>
+      </para></listitem>
+      <listitem><para>If you deploy a fresh <package>matrix-synapse</package>, you need to configure
+       the database yourself. An example for this can be found in <literal>&lt;nixpkgs/nixos/tests/matrix-synapse.nix&gt;</literal>:
+<programlisting>{ ... }: {
+  services.matrix-synapse = {
+   <link linkend="opt-services.matrix-synapse.enable">enable</link> = true;
+   /* and all the other config you've defined here */
+  };
+  <link linkend="opt-services.postgresql.enable">services.postgresql.enable</link> = true;
+  <link linkend="opt-services.postgresql.initialScript">services.postgresql.initialScript</link> = ''
+    CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse';
+    CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse"
+      TEMPLATE template0
+      LC_COLLATE = "C"
+      LC_CTYPE = "C";
+  '';
+}</programlisting>
+      </para></listitem>
+      <listitem><para>If you initially deployed your <package>matrix-synapse</package> on
+       <literal>nixos-unstable</literal> <emphasis>after</emphasis> the <literal>19.09</literal>-release,
+       your database is misconfigured due to a regression in NixOS. For now, <package>matrix-synapse</package> will
+       startup with a warning, but it's recommended to reconfigure the database to set the values
+       <literal>LC_COLLATE</literal> and <literal>LC_CTYPE</literal> to
+       <link xlink:href="https://www.postgresql.org/docs/12/locale.html"><literal>'C'</literal></link>.
+      </para></listitem>
+     </itemizedlist>
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix
index 750f4a292fb4..52b917a73a06 100644
--- a/nixos/modules/services/misc/matrix-synapse.nix
+++ b/nixos/modules/services/misc/matrix-synapse.nix
@@ -111,6 +111,9 @@ app_service_config_files: ${builtins.toJSON cfg.app_service_config_files}
 
 ${cfg.extraConfig}
 '';
+
+  hasLocalPostgresDB = let args = cfg.database_args; in
+    usePostgresql && (!(args ? host) || (elem args.host [ "localhost" "127.0.0.1" ]));
 in {
   options = {
     services.matrix-synapse = {
@@ -354,13 +357,6 @@ in {
           The database engine name. Can be sqlite or psycopg2.
         '';
       };
-      create_local_database = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          Whether to create a local database automatically.
-        '';
-      };
       database_name = mkOption {
         type = types.str;
         default = "matrix-synapse";
@@ -657,6 +653,25 @@ in {
   };
 
   config = mkIf cfg.enable {
+    assertions = [
+      { assertion = hasLocalPostgresDB -> config.services.postgresql.enable;
+        message = ''
+          Cannot deploy matrix-synapse with a configuration for a local postgresql database
+            and a missing postgresql service. Since 20.03 it's mandatory to manually configure the
+            database (please read the thread in https://github.com/NixOS/nixpkgs/pull/80447 for
+            further reference).
+
+            If you
+            - try to deploy a fresh synapse, you need to configure the database yourself. An example
+              for this can be found in <nixpkgs/nixos/tests/matrix-synapse.nix>
+            - update your existing matrix-synapse instance, you simply need to add `services.postgresql.enable = true`
+              to your configuration.
+
+          For further information about this update, please read the release-notes of 20.03 carefully.
+        '';
+      }
+    ];
+
     users.users.matrix-synapse = { 
         group = "matrix-synapse";
         home = cfg.dataDir;
@@ -669,18 +684,9 @@ in {
       gid = config.ids.gids.matrix-synapse;
     };
 
-    services.postgresql = mkIf (usePostgresql && cfg.create_local_database) {
-      enable = mkDefault true;
-      ensureDatabases = [ cfg.database_name ];
-      ensureUsers = [{
-        name = cfg.database_user;
-        ensurePermissions = { "DATABASE \"${cfg.database_name}\"" = "ALL PRIVILEGES"; };
-      }];
-    };
-
     systemd.services.matrix-synapse = {
       description = "Synapse Matrix homeserver";
-      after = [ "network.target" ] ++ lib.optional config.services.postgresql.enable "postgresql.service" ;
+      after = [ "network.target" ] ++ optional hasLocalPostgresDB "postgresql.service";
       wantedBy = [ "multi-user.target" ];
       preStart = ''
         ${cfg.package}/bin/homeserver \
@@ -709,6 +715,10 @@ in {
       The `trusted_third_party_id_servers` option as been removed in `matrix-synapse` v1.4.0
       as the behavior is now obsolete.
     '')
+    (mkRemovedOptionModule [ "services" "matrix-synapse" "create_local_database" ] ''
+      Database configuration must be done manually. An exemplary setup is demonstrated in
+      <nixpkgs/nixos/tests/matrix-synapse.nix>
+    '')
   ];
 
 }
diff --git a/nixos/tests/matrix-synapse.nix b/nixos/tests/matrix-synapse.nix
index fca53009083a..f3623aa3c094 100644
--- a/nixos/tests/matrix-synapse.nix
+++ b/nixos/tests/matrix-synapse.nix
@@ -35,12 +35,31 @@ in {
 
   nodes = {
     # Since 0.33.0, matrix-synapse doesn't allow underscores in server names
-    serverpostgres = args: {
+    serverpostgres = { pkgs, ... }: {
       services.matrix-synapse = {
         enable = true;
         database_type = "psycopg2";
         tls_certificate_path = "${cert}";
         tls_private_key_path = "${key}";
+        database_args = {
+          password = "synapse";
+        };
+      };
+      services.postgresql = {
+        enable = true;
+
+        # The database name and user are configured by the following options:
+        #   - services.matrix-synapse.database_name
+        #   - services.matrix-synapse.database_user
+        #
+        # The values used here represent the default values of the module.
+        initialScript = pkgs.writeText "synapse-init.sql" ''
+          CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse';
+          CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse"
+            TEMPLATE template0
+            LC_COLLATE = "C"
+            LC_CTYPE = "C";
+        '';
       };
     };
 
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 295881b03a33..8da5d4676d68 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -23,11 +23,11 @@ let
 
 in buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.9.1";
+  version = "1.11.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "13csf18dchm75vw251a7h57diag94vw6rhg8kkkbpi35cibn0cz2";
+    sha256 = "0xd4bxsmk67r6pfj5lh0hn36r8z51mxsl39fjfrfdidvl1qqbxnk";
   };
 
   patches = [

From e7f2ad0db9d9fc281539e8104f1799fd7eb7a511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Sun, 15 Mar 2020 16:23:23 +0100
Subject: [PATCH 3156/4636] wireshark: use relative cmake LIBDIR

`wireshark` expects `CMAKE_INSTALL_LIBDIR` to be relative and prefixes
it with `CMAKE_INSTALL_PREFIX` in some places to make it absolute.
This results in duplicate absolute paths being accessed, which don't exist.

Making `CMAKE_INSTALL_LIBDIR` relative fixes this issue.
---
 pkgs/applications/networking/sniffers/wireshark/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 1dbc49512c6e..fe84787c21a7 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -26,6 +26,8 @@ in stdenv.mkDerivation {
   cmakeFlags = [
     "-DBUILD_wireshark=${if withQt then "ON" else "OFF"}"
     "-DENABLE_APPLICATION_BUNDLE=${if withQt && stdenv.isDarwin then "ON" else "OFF"}"
+    # Fix `extcap` and `plugins` paths. See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16444
+    "-DCMAKE_INSTALL_LIBDIR=lib"
   ];
 
   nativeBuildInputs = [

From 39b39690faa44f9f65a920326085e559fe17b4c9 Mon Sep 17 00:00:00 2001
From: toonn <toonn@toonn.io>
Date: Sun, 15 Mar 2020 17:18:18 +0100
Subject: [PATCH 3157/4636] wire-desktop: linux 3.12.2916 -> 3.15.2922

---
 .../networking/instant-messengers/wire-desktop/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index 07542a017bd3..c8372e2ea09e 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -21,12 +21,12 @@ let
 
   version = {
     x86_64-darwin = "3.15.3621";
-    x86_64-linux = "3.12.2916";
+    x86_64-linux = "3.15.2922";
   }.${system} or throwSystem;
 
   sha256 = {
     x86_64-darwin = "13sgakb3zjlvqv6d6b264fc9x99swpl7s1dmnrgc5v3pgyaklr01";
-    x86_64-linux = "0xx03cpy6kapbjpygwranxjg1a0p8s1xq3cpapvi55rnkbk0qvjw";
+    x86_64-linux = "03116fi8bmfpgalr36nxvmr8z4rw65qr3l4a89n0d40gawrk793q";
   }.${system} or throwSystem;
 
   meta = with stdenv.lib; {

From 80a3dbcdd28033a5f7581b8180add7598372b687 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 8 Mar 2020 21:11:51 -0400
Subject: [PATCH 3158/4636] geckodriver: upgrade cargo fetcher and cargoSha256

---
 pkgs/development/tools/geckodriver/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix
index 1120d5dc68da..44e98d8d1860 100644
--- a/pkgs/development/tools/geckodriver/default.nix
+++ b/pkgs/development/tools/geckodriver/default.nix
@@ -21,10 +21,7 @@ rustPlatform.buildRustPackage {
   });
 
   cargoPatches = [ ./cargo-lock.patch ];
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "07w5lmvm5w6id0qikcs968n0c69bb6fav63l66bskxcjva67d6dy";
+  cargoSha256 = "1dv8vcjy8r9z19grj4gms05bhaafyr42y3q69h3azwq6dmacfd3y";
 
   buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 

From 6100ac4ab217050a0caf7055ef48654572991227 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sun, 15 Mar 2020 10:33:30 +0100
Subject: [PATCH 3159/4636] php: remove unsupported options

 - mcrypt was removed in 7.2
 - mhash was integrated into hash in 7.0
---
 pkgs/development/interpreters/php/default.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 286dea5d930c..dc395abc796d 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -3,7 +3,7 @@
 , autoconf, automake, bison, file, flex, libtool, pkgconfig, re2c
 , libxml2, readline, zlib, curl, postgresql, gettext
 , openssl, pcre, pcre2, sqlite
-, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC
+, libxslt, bzip2, icu, openldap, cyrus_sasl, unixODBC
 , uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2
 , gd, freetype, libXpm, libjpeg, libpng, libwebp
 , libzip, valgrind, oniguruma, symlinkJoin, writeText
@@ -20,7 +20,6 @@ let
   , withSystemd ? config.php.systemd or stdenv.isLinux
   , imapSupport ? config.php.imap or (!stdenv.isDarwin)
   , ldapSupport ? config.php.ldap or true
-  , mhashSupport ? config.php.mhash or false
   , mysqlndSupport ? config.php.mysqlnd or true
   , mysqliSupport ? (config.php.mysqli or true) && (mysqlndSupport)
   , pdo_mysqlSupport ? (config.php.pdo_mysql or true) && (mysqlndSupport)
@@ -45,7 +44,6 @@ let
   , intlSupport ? config.php.intl or true
   , exifSupport ? config.php.exif or true
   , xslSupport ? config.php.xsl or false
-  , mcryptSupport ? (config.php.mcrypt or true) && (versionOlder version "7.2")
   , bz2Support ? config.php.bz2 or false
   , zipSupport ? config.php.zip or true
   , ftpSupport ? config.php.ftp or true
@@ -66,10 +64,7 @@ let
   , valgrindSupport ? (config.php.valgrind or true) && (versionAtLeast version "7.2")
   , ipv6Support ? config.php.ipv6 or true
   , pearSupport ? (config.php.pear or true) && (libxml2Support)
-  }:
-  let
-    libmcrypt' = libmcrypt.override { disablePosixThreads = true; };
-  in stdenv.mkDerivation {
+  }: stdenv.mkDerivation {
     pname = "php";
 
     inherit version;
@@ -90,7 +85,6 @@ let
       ++ optionals opensslSupport [ openssl openssl.dev ]
       ++ optional apxs2Support apacheHttpd
       ++ optional (ldapSupport && stdenv.isLinux) cyrus_sasl
-      ++ optional mhashSupport libmhash
       ++ optional zlibSupport zlib
       ++ optional libxml2Support libxml2
       ++ optional readlineSupport readline
@@ -102,7 +96,6 @@ let
       ++ optional gettextSupport gettext
       ++ optional intlSupport icu
       ++ optional xslSupport libxslt
-      ++ optional mcryptSupport libmcrypt'
       ++ optional bz2Support bzip2
       ++ optional sodiumSupport libsodium
       ++ optional tidySupport html-tidy
@@ -131,7 +124,6 @@ let
       ++ optional (ldapSupport && stdenv.isLinux) "--with-ldap-sasl=${cyrus_sasl.dev}"
       ++ optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs"
       ++ optional embedSupport "--enable-embed"
-      ++ optional mhashSupport "--with-mhash"
       ++ optional curlSupport "--with-curl=${curl.dev}"
       ++ optional zlibSupport "--with-zlib=${zlib.dev}"
       ++ optional (libxml2Support && (versionOlder version "7.4")) "--with-libxml-dir=${libxml2.dev}"
@@ -180,7 +172,6 @@ let
       ++ optional intlSupport "--enable-intl"
       ++ optional exifSupport "--enable-exif"
       ++ optional xslSupport "--with-xsl=${libxslt.dev}"
-      ++ optional mcryptSupport "--with-mcrypt=${libmcrypt'}"
       ++ optional bz2Support "--with-bz2=${bzip2.dev}"
       ++ optional (zipSupport && (versionOlder version "7.4")) "--enable-zip"
       ++ optional (zipSupport && (versionAtLeast version "7.4")) "--with-zip"

From f1dfb6e0f508f2165a9ebde84956132c6461a29f Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sun, 15 Mar 2020 17:51:28 +0100
Subject: [PATCH 3160/4636] php: get rid of `with lib;` used on entire file

---
 pkgs/development/interpreters/php/default.nix | 192 +++++++++---------
 1 file changed, 95 insertions(+), 97 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index dc395abc796d..497a1d87f557 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -10,8 +10,6 @@
 , makeWrapper, callPackage
 }:
 
-with lib;
-
 let
   generic =
   { version
@@ -51,17 +49,17 @@ let
   , gmpSupport ? config.php.gmp or true
   , ztsSupport ? (config.php.zts or false) || (apxs2Support)
   , calendarSupport ? config.php.calendar or true
-  , sodiumSupport ? (config.php.sodium or true) && (versionAtLeast version "7.2")
+  , sodiumSupport ? (config.php.sodium or true) && (lib.versionAtLeast version "7.2")
   , tidySupport ? (config.php.tidy or false)
-  , argon2Support ? (config.php.argon2 or true) && (versionAtLeast version "7.2")
-  , libzipSupport ? (config.php.libzip or true) && (versionAtLeast version "7.2")
+  , argon2Support ? (config.php.argon2 or true) && (lib.versionAtLeast version "7.2")
+  , libzipSupport ? (config.php.libzip or true) && (lib.versionAtLeast version "7.2")
   , phpdbgSupport ? config.php.phpdbg or true
   , cgiSupport ? config.php.cgi or true
   , cliSupport ? config.php.cli or true
   , pharSupport ? config.php.phar or true
   , xmlrpcSupport ? (config.php.xmlrpc or false) && (libxml2Support)
   , cgotoSupport ? config.php.cgoto or false
-  , valgrindSupport ? (config.php.valgrind or true) && (versionAtLeast version "7.2")
+  , valgrindSupport ? (config.php.valgrind or true) && (lib.versionAtLeast version "7.2")
   , ipv6Support ? config.php.ipv6 or true
   , pearSupport ? (config.php.pear or true) && (libxml2Support)
   }: stdenv.mkDerivation {
@@ -74,79 +72,79 @@ let
     nativeBuildInputs = [ autoconf automake bison file flex libtool pkgconfig re2c ];
 
     buildInputs = [ ]
-      ++ optional (versionOlder version "7.3") pcre
-      ++ optional (versionAtLeast version "7.3") pcre2
-      ++ optional (versionAtLeast version "7.4") oniguruma
-      ++ optional withSystemd systemd
-      ++ optionals imapSupport [ uwimap openssl pam ]
-      ++ optionals curlSupport [ curl openssl ]
-      ++ optionals ldapSupport [ openldap openssl ]
-      ++ optionals gdSupport [ gd freetype libXpm libjpeg libpng libwebp ]
-      ++ optionals opensslSupport [ openssl openssl.dev ]
-      ++ optional apxs2Support apacheHttpd
-      ++ optional (ldapSupport && stdenv.isLinux) cyrus_sasl
-      ++ optional zlibSupport zlib
-      ++ optional libxml2Support libxml2
-      ++ optional readlineSupport readline
-      ++ optional sqliteSupport sqlite
-      ++ optional postgresqlSupport postgresql
-      ++ optional pdo_odbcSupport unixODBC
-      ++ optional pdo_pgsqlSupport postgresql
-      ++ optional gmpSupport gmp
-      ++ optional gettextSupport gettext
-      ++ optional intlSupport icu
-      ++ optional xslSupport libxslt
-      ++ optional bz2Support bzip2
-      ++ optional sodiumSupport libsodium
-      ++ optional tidySupport html-tidy
-      ++ optional argon2Support libargon2
-      ++ optional libzipSupport libzip
-      ++ optional valgrindSupport valgrind;
+      ++ lib.optional (lib.versionOlder version "7.3") pcre
+      ++ lib.optional (lib.versionAtLeast version "7.3") pcre2
+      ++ lib.optional (lib.versionAtLeast version "7.4") oniguruma
+      ++ lib.optional withSystemd systemd
+      ++ lib.optionals imapSupport [ uwimap openssl pam ]
+      ++ lib.optionals curlSupport [ curl openssl ]
+      ++ lib.optionals ldapSupport [ openldap openssl ]
+      ++ lib.optionals gdSupport [ gd freetype libXpm libjpeg libpng libwebp ]
+      ++ lib.optionals opensslSupport [ openssl openssl.dev ]
+      ++ lib.optional apxs2Support apacheHttpd
+      ++ lib.optional (ldapSupport && stdenv.isLinux) cyrus_sasl
+      ++ lib.optional zlibSupport zlib
+      ++ lib.optional libxml2Support libxml2
+      ++ lib.optional readlineSupport readline
+      ++ lib.optional sqliteSupport sqlite
+      ++ lib.optional postgresqlSupport postgresql
+      ++ lib.optional pdo_odbcSupport unixODBC
+      ++ lib.optional pdo_pgsqlSupport postgresql
+      ++ lib.optional gmpSupport gmp
+      ++ lib.optional gettextSupport gettext
+      ++ lib.optional intlSupport icu
+      ++ lib.optional xslSupport libxslt
+      ++ lib.optional bz2Support bzip2
+      ++ lib.optional sodiumSupport libsodium
+      ++ lib.optional tidySupport html-tidy
+      ++ lib.optional argon2Support libargon2
+      ++ lib.optional libzipSupport libzip
+      ++ lib.optional valgrindSupport valgrind;
 
-    CXXFLAGS = optionalString stdenv.cc.isClang "-std=c++11";
+    CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
 
     configureFlags = [ "--with-config-file-scan-dir=/etc/php.d" ]
-      ++ optionals (versionOlder version "7.3") [ "--with-pcre-regex=${pcre.dev}" "PCRE_LIBDIR=${pcre}" ]
-      ++ optionals (versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre2.dev}" "PCRE_LIBDIR=${pcre2}" ]
-      ++ optionals (versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" "PCRE_LIBDIR=${pcre2}" ]
-      ++ optional stdenv.isDarwin "--with-iconv=${libiconv}"
-      ++ optional withSystemd "--with-fpm-systemd"
-      ++ optionals imapSupport [
+      ++ lib.optionals (lib.versionOlder version "7.3") [ "--with-pcre-regex=${pcre.dev}" "PCRE_LIBDIR=${pcre}" ]
+      ++ lib.optionals (lib.versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre2.dev}" "PCRE_LIBDIR=${pcre2}" ]
+      ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" "PCRE_LIBDIR=${pcre2}" ]
+      ++ lib.optional stdenv.isDarwin "--with-iconv=${libiconv}"
+      ++ lib.optional withSystemd "--with-fpm-systemd"
+      ++ lib.optionals imapSupport [
         "--with-imap=${uwimap}"
         "--with-imap-ssl"
       ]
-      ++ optionals ldapSupport [
+      ++ lib.optionals ldapSupport [
         "--with-ldap=/invalid/path"
         "LDAP_DIR=${openldap.dev}"
         "LDAP_INCDIR=${openldap.dev}/include"
         "LDAP_LIBDIR=${openldap.out}/lib"
       ]
-      ++ optional (ldapSupport && stdenv.isLinux) "--with-ldap-sasl=${cyrus_sasl.dev}"
-      ++ optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs"
-      ++ optional embedSupport "--enable-embed"
-      ++ optional curlSupport "--with-curl=${curl.dev}"
-      ++ optional zlibSupport "--with-zlib=${zlib.dev}"
-      ++ optional (libxml2Support && (versionOlder version "7.4")) "--with-libxml-dir=${libxml2.dev}"
-      ++ optional (!libxml2Support) [
+      ++ lib.optional (ldapSupport && stdenv.isLinux) "--with-ldap-sasl=${cyrus_sasl.dev}"
+      ++ lib.optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs"
+      ++ lib.optional embedSupport "--enable-embed"
+      ++ lib.optional curlSupport "--with-curl=${curl.dev}"
+      ++ lib.optional zlibSupport "--with-zlib=${zlib.dev}"
+      ++ lib.optional (libxml2Support && (lib.versionOlder version "7.4")) "--with-libxml-dir=${libxml2.dev}"
+      ++ lib.optional (!libxml2Support) [
         "--disable-dom"
-        (if (versionOlder version "7.4") then "--disable-libxml" else "--without-libxml")
+        (if (lib.versionOlder version "7.4") then "--disable-libxml" else "--without-libxml")
         "--disable-simplexml"
         "--disable-xml"
         "--disable-xmlreader"
         "--disable-xmlwriter"
         "--without-pear"
       ]
-      ++ optional pcntlSupport "--enable-pcntl"
-      ++ optional readlineSupport "--with-readline=${readline.dev}"
-      ++ optional sqliteSupport "--with-pdo-sqlite=${sqlite.dev}"
-      ++ optional postgresqlSupport "--with-pgsql=${postgresql}"
-      ++ optional pdo_odbcSupport "--with-pdo-odbc=unixODBC,${unixODBC}"
-      ++ optional pdo_pgsqlSupport "--with-pdo-pgsql=${postgresql}"
-      ++ optional (pdo_mysqlSupport && mysqlndSupport) "--with-pdo-mysql=mysqlnd"
-      ++ optional (mysqliSupport && mysqlndSupport) "--with-mysqli=mysqlnd"
-      ++ optional (pdo_mysqlSupport || mysqliSupport) "--with-mysql-sock=/run/mysqld/mysqld.sock"
-      ++ optional bcmathSupport "--enable-bcmath"
-      ++ optionals (gdSupport && versionAtLeast version "7.4") [
+      ++ lib.optional pcntlSupport "--enable-pcntl"
+      ++ lib.optional readlineSupport "--with-readline=${readline.dev}"
+      ++ lib.optional sqliteSupport "--with-pdo-sqlite=${sqlite.dev}"
+      ++ lib.optional postgresqlSupport "--with-pgsql=${postgresql}"
+      ++ lib.optional pdo_odbcSupport "--with-pdo-odbc=unixODBC,${unixODBC}"
+      ++ lib.optional pdo_pgsqlSupport "--with-pdo-pgsql=${postgresql}"
+      ++ lib.optional (pdo_mysqlSupport && mysqlndSupport) "--with-pdo-mysql=mysqlnd"
+      ++ lib.optional (mysqliSupport && mysqlndSupport) "--with-mysqli=mysqlnd"
+      ++ lib.optional (pdo_mysqlSupport || mysqliSupport) "--with-mysql-sock=/run/mysqld/mysqld.sock"
+      ++ lib.optional bcmathSupport "--enable-bcmath"
+      ++ lib.optionals (gdSupport && lib.versionAtLeast version "7.4") [
         "--enable-gd"
         "--with-external-gd=${gd.dev}"
         "--with-webp=${libwebp}"
@@ -154,7 +152,7 @@ let
         "--with-xpm=${libXpm.dev}"
         "--with-freetype=${freetype.dev}"
         "--enable-gd-jis-conv"
-      ] ++ optionals (gdSupport && versionOlder version "7.4") [
+      ] ++ lib.optionals (gdSupport && lib.versionOlder version "7.4") [
         "--with-gd=${gd.dev}"
         "--with-webp-dir=${libwebp}"
         "--with-jpeg-dir=${libjpeg.dev}"
@@ -163,36 +161,36 @@ let
         "--with-xpm-dir=${libXpm.dev}"
         "--enable-gd-jis-conv"
       ]
-      ++ optional gmpSupport "--with-gmp=${gmp.dev}"
-      ++ optional soapSupport "--enable-soap"
-      ++ optional socketsSupport "--enable-sockets"
-      ++ optional opensslSupport "--with-openssl"
-      ++ optional mbstringSupport "--enable-mbstring"
-      ++ optional gettextSupport "--with-gettext=${gettext}"
-      ++ optional intlSupport "--enable-intl"
-      ++ optional exifSupport "--enable-exif"
-      ++ optional xslSupport "--with-xsl=${libxslt.dev}"
-      ++ optional bz2Support "--with-bz2=${bzip2.dev}"
-      ++ optional (zipSupport && (versionOlder version "7.4")) "--enable-zip"
-      ++ optional (zipSupport && (versionAtLeast version "7.4")) "--with-zip"
-      ++ optional ftpSupport "--enable-ftp"
-      ++ optional fpmSupport "--enable-fpm"
-      ++ optional ztsSupport "--enable-maintainer-zts"
-      ++ optional calendarSupport "--enable-calendar"
-      ++ optional sodiumSupport "--with-sodium=${libsodium.dev}"
-      ++ optional tidySupport "--with-tidy=${html-tidy}"
-      ++ optional argon2Support "--with-password-argon2=${libargon2}"
-      ++ optional (libzipSupport && (versionOlder version "7.4")) "--with-libzip=${libzip.dev}"
-      ++ optional phpdbgSupport "--enable-phpdbg"
-      ++ optional (!phpdbgSupport) "--disable-phpdbg"
-      ++ optional (!cgiSupport) "--disable-cgi"
-      ++ optional (!cliSupport) "--disable-cli"
-      ++ optional (!pharSupport) "--disable-phar"
-      ++ optional xmlrpcSupport "--with-xmlrpc"
-      ++ optional cgotoSupport "--enable-re2c-cgoto"
-      ++ optional valgrindSupport "--with-valgrind=${valgrind.dev}"
-      ++ optional (!ipv6Support) "--disable-ipv6"
-      ++ optional (pearSupport && libxml2Support) "--with-pear=$(out)/lib/php/pear";
+      ++ lib.optional gmpSupport "--with-gmp=${gmp.dev}"
+      ++ lib.optional soapSupport "--enable-soap"
+      ++ lib.optional socketsSupport "--enable-sockets"
+      ++ lib.optional opensslSupport "--with-openssl"
+      ++ lib.optional mbstringSupport "--enable-mbstring"
+      ++ lib.optional gettextSupport "--with-gettext=${gettext}"
+      ++ lib.optional intlSupport "--enable-intl"
+      ++ lib.optional exifSupport "--enable-exif"
+      ++ lib.optional xslSupport "--with-xsl=${libxslt.dev}"
+      ++ lib.optional bz2Support "--with-bz2=${bzip2.dev}"
+      ++ lib.optional (zipSupport && (lib.versionOlder version "7.4")) "--enable-zip"
+      ++ lib.optional (zipSupport && (lib.versionAtLeast version "7.4")) "--with-zip"
+      ++ lib.optional ftpSupport "--enable-ftp"
+      ++ lib.optional fpmSupport "--enable-fpm"
+      ++ lib.optional ztsSupport "--enable-maintainer-zts"
+      ++ lib.optional calendarSupport "--enable-calendar"
+      ++ lib.optional sodiumSupport "--with-sodium=${libsodium.dev}"
+      ++ lib.optional tidySupport "--with-tidy=${html-tidy}"
+      ++ lib.optional argon2Support "--with-password-argon2=${libargon2}"
+      ++ lib.optional (libzipSupport && (lib.versionOlder version "7.4")) "--with-libzip=${libzip.dev}"
+      ++ lib.optional phpdbgSupport "--enable-phpdbg"
+      ++ lib.optional (!phpdbgSupport) "--disable-phpdbg"
+      ++ lib.optional (!cgiSupport) "--disable-cgi"
+      ++ lib.optional (!cliSupport) "--disable-cli"
+      ++ lib.optional (!pharSupport) "--disable-phar"
+      ++ lib.optional xmlrpcSupport "--with-xmlrpc"
+      ++ lib.optional cgotoSupport "--enable-re2c-cgoto"
+      ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}"
+      ++ lib.optional (!ipv6Support) "--disable-ipv6"
+      ++ lib.optional (pearSupport && libxml2Support) "--with-pear=$(out)/lib/php/pear";
 
     hardeningDisable = [ "bindnow" ];
 
@@ -215,7 +213,7 @@ let
       if test -f $src/genfiles; then
         ./genfiles
       fi
-    '' + optionalString stdenv.isDarwin ''
+    '' + lib.optionalString stdenv.isDarwin ''
       substituteInPlace configure --replace "-lstdc++" "-lc++"
     '';
 
@@ -239,7 +237,7 @@ let
 
     meta = with stdenv.lib; {
       description = "An HTML-embedded scripting language";
-      homepage = https://www.php.net/;
+      homepage = "https://www.php.net/";
       license = licenses.php301;
       maintainers = with maintainers; [ globin etu ma27 ];
       platforms = platforms.all;
@@ -257,7 +255,7 @@ let
     passthru.buildEnv = { exts ? (_: []), extraConfig ? "" }: let
       extraInit = writeText "custom-php.ini" ''
         ${extraConfig}
-        ${concatMapStringsSep "\n" (ext: let
+        ${lib.concatMapStringsSep "\n" (ext: let
           extName = lib.removePrefix "php-" (builtins.parseDrvName ext.name).name;
           type = "${lib.optionalString (ext.zendExtension or false) "zend_"}extension";
         in ''
@@ -283,7 +281,7 @@ in {
     sha256 = "18sjvl67z5a2x5s2a36g6ls1r3m4hbrsw52hqr2qsgfvg5dkm5bw";
 
     # https://bugs.php.net/bug.php?id=76826
-    extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
+    extraPatches = lib.optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
   };
 
   php73 = generic' {
@@ -291,7 +289,7 @@ in {
     sha256 = "0g84hws15s8gh8iq4h6q747dyfazx47vh3da3whz8d80x83ibgld";
 
     # https://bugs.php.net/bug.php?id=76826
-    extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
+    extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
   };
 
   php74 = generic' {

From d8b41ad219f3a7cc2cee5eaf4465ff426cdcafdb Mon Sep 17 00:00:00 2001
From: "eyjhbb@gmail.com" <eyjhbb@gmail.com>
Date: Sat, 14 Mar 2020 13:56:12 +0100
Subject: [PATCH 3161/4636] vimPlugins.coc-*: add npm dependencies

---
 .../node-packages/node-packages-v10.json      |  30 +++
 pkgs/misc/vim-plugins/overrides.nix           | 174 ++++++++++++++++++
 2 files changed, 204 insertions(+)

diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json
index d65d97d45672..56a15f7ebf65 100644
--- a/pkgs/development/node-packages/node-packages-v10.json
+++ b/pkgs/development/node-packages/node-packages-v10.json
@@ -17,7 +17,37 @@
 , "browserify"
 , "castnow"
 , "clean-css"
+, "coc-css"
+, "coc-emmet"
+, "coc-eslint"
+, "coc-git"
+, "coc-go"
+, "coc-highlight"
+, "coc-html"
+, "coc-imselect"
+, "coc-java"
+, "coc-jest"
+, "coc-json"
+, "coc-lists"
+, "coc-metals"
+, "coc-pairs"
 , "coc-prettier"
+, "coc-python"
+, "coc-r-lsp"
+, "coc-rls"
+, "coc-smartf"
+, "coc-snippets"
+, "coc-solargraph"
+, "coc-stylelint"
+, "coc-tabnine"
+, "coc-tslint"
+, "coc-tslint-plugin"
+, "coc-tsserver"
+, "coc-vetur"
+, "coc-vimtex"
+, "coc-wxml"
+, "coc-yaml"
+, "coc-yank"
 , "coffee-script"
 , "coinmon"
 , "configurable-http-proxy"
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 079bcb7c34ad..e4710e27193c 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -126,6 +126,78 @@ self: super: {
     '';
   });
 
+  coc-css = buildVimPluginFrom2Nix {
+    pname = "coc-css";
+    version = nodePackages.coc-css.version;
+    src = "${nodePackages.coc-css}/lib/node_modules/coc-css";
+  };
+
+  coc-emmet = buildVimPluginFrom2Nix {
+    pname = "coc-emmet";
+    version = nodePackages.coc-emmet.version;
+    src = "${nodePackages.coc-emmet}/lib/node_modules/coc-emmet";
+  };
+
+  coc-eslint = buildVimPluginFrom2Nix {
+    pname = "coc-eslint";
+    version = nodePackages.coc-eslint.version;
+    src = "${nodePackages.coc-eslint}/lib/node_modules/coc-eslint";
+  };
+
+  coc-git = buildVimPluginFrom2Nix {
+    pname = "coc-git";
+    version = nodePackages.coc-git.version;
+    src = "${nodePackages.coc-git}/lib/node_modules/coc-git";
+  };
+
+  coc-highlight = buildVimPluginFrom2Nix {
+    pname = "coc-highlight";
+    version = nodePackages.coc-highlight.version;
+    src = "${nodePackages.coc-highlight}/lib/node_modules/coc-highlight";
+  };
+
+  coc-html = buildVimPluginFrom2Nix {
+    pname = "coc-html";
+    version = nodePackages.coc-html.version;
+    src = "${nodePackages.coc-html}/lib/node_modules/coc-html";
+  };
+
+  coc-imselect = buildVimPluginFrom2Nix {
+    pname = "coc-imselect";
+    version = nodePackages.coc-imselect.version;
+    src = "${nodePackages.coc-imselect}/lib/node_modules/coc-imselect";
+  };
+
+  coc-java = buildVimPluginFrom2Nix {
+    pname = "coc-java";
+    version = nodePackages.coc-java.version;
+    src = "${nodePackages.coc-java}/lib/node_modules/coc-java";
+  };
+
+  coc-jest = buildVimPluginFrom2Nix {
+    pname = "coc-jest";
+    version = nodePackages.coc-jest.version;
+    src = "${nodePackages.coc-jest}/lib/node_modules/coc-jest";
+  };
+
+  coc-json = buildVimPluginFrom2Nix {
+    pname = "coc-json";
+    version = nodePackages.coc-json.version;
+    src = "${nodePackages.coc-json}/lib/node_modules/coc-json";
+  };
+
+  coc-lists = buildVimPluginFrom2Nix {
+    pname = "coc-lists";
+    version = nodePackages.coc-lists.version;
+    src = "${nodePackages.coc-lists}/lib/node_modules/coc-lists";
+  };
+
+  coc-metals = buildVimPluginFrom2Nix {
+    pname = "coc-metals";
+    version = nodePackages.coc-metals.version;
+    src = "${nodePackages.coc-metals}/lib/node_modules/coc-metals";
+  };
+
   # Only official releases contains the required index.js file
   # NB: Make sure you pick a rev from the release branch!
   coc-nvim = buildVimPluginFrom2Nix rec {
@@ -139,12 +211,114 @@ self: super: {
     };
   };
 
+  coc-pairs = buildVimPluginFrom2Nix {
+    pname = "coc-pairs";
+    version = nodePackages.coc-pairs.version;
+    src = "${nodePackages.coc-pairs}/lib/node_modules/coc-pairs";
+  };
+
   coc-prettier = buildVimPluginFrom2Nix {
     pname = "coc-prettier";
     version = nodePackages.coc-prettier.version;
     src = "${nodePackages.coc-prettier}/lib/node_modules/coc-prettier";
   };
 
+  coc-python = buildVimPluginFrom2Nix {
+    pname = "coc-python";
+    version = nodePackages.coc-python.version;
+    src = "${nodePackages.coc-python}/lib/node_modules/coc-python";
+  };
+
+  coc-r-lsp = buildVimPluginFrom2Nix {
+    pname = "coc-r-lsp";
+    version = nodePackages.coc-r-lsp.version;
+    src = "${nodePackages.coc-r-lsp}/lib/node_modules/coc-r-lsp";
+  };
+
+  coc-rls = buildVimPluginFrom2Nix {
+    pname = "coc-rls";
+    version = nodePackages.coc-rls.version;
+    src = "${nodePackages.coc-rls}/lib/node_modules/coc-rls";
+  };
+
+  coc-smartf = buildVimPluginFrom2Nix {
+    pname = "coc-smartf";
+    version = nodePackages.coc-smartf.version;
+    src = "${nodePackages.coc-smartf}/lib/node_modules/coc-smartf";
+  };
+
+  coc-snippets = buildVimPluginFrom2Nix {
+    pname = "coc-snippets";
+    version = nodePackages.coc-snippets.version;
+    src = "${nodePackages.coc-snippets}/lib/node_modules/coc-snippets";
+  };
+
+  coc-solargraph = buildVimPluginFrom2Nix {
+    pname = "coc-solargraph";
+    version = nodePackages.coc-solargraph.version;
+    src = "${nodePackages.coc-solargraph}/lib/node_modules/coc-solargraph";
+  };
+
+  coc-stylelint = buildVimPluginFrom2Nix {
+    pname = "coc-stylelint";
+    version = nodePackages.coc-stylelint.version;
+    src = "${nodePackages.coc-stylelint}/lib/node_modules/coc-stylelint";
+  };
+
+  coc-tabnine = buildVimPluginFrom2Nix {
+    pname = "coc-tabnine";
+    version = nodePackages.coc-tabnine.version;
+    src = "${nodePackages.coc-tabnine}/lib/node_modules/coc-tabnine";
+  };
+
+  coc-tslint = buildVimPluginFrom2Nix {
+    pname = "coc-tslint";
+    version = nodePackages.coc-tslint.version;
+    src = "${nodePackages.coc-tslint}/lib/node_modules/coc-tslint";
+  };
+
+  coc-tslint-plugin = buildVimPluginFrom2Nix {
+    pname = "coc-tslint-plugin";
+    version = nodePackages.coc-tslint-plugin.version;
+    src = "${nodePackages.coc-tslint-plugin}/lib/node_modules/coc-tslint-plugin";
+  };
+
+  coc-tsserver = buildVimPluginFrom2Nix {
+    pname = "coc-tsserver";
+    version = nodePackages.coc-tsserver.version;
+    src = "${nodePackages.coc-tsserver}/lib/node_modules/coc-tsserver";
+  };
+
+  coc-vetur = buildVimPluginFrom2Nix {
+    pname = "coc-vetur";
+    version = nodePackages.coc-vetur.version;
+    src = "${nodePackages.coc-vetur}/lib/node_modules/coc-vetur";
+  };
+
+  coc-vimtex = buildVimPluginFrom2Nix {
+    pname = "coc-vimtex";
+    version = nodePackages.coc-vimtex.version;
+    src = "${nodePackages.coc-vimtex}/lib/node_modules/coc-vimtex";
+  };
+
+  coc-wxml = buildVimPluginFrom2Nix {
+    pname = "coc-wxml";
+    version = nodePackages.coc-wxml.version;
+    src = "${nodePackages.coc-wxml}/lib/node_modules/coc-wxml";
+  };
+
+  coc-yaml = buildVimPluginFrom2Nix {
+    pname = "coc-yaml";
+    version = nodePackages.coc-yaml.version;
+    src = "${nodePackages.coc-yaml}/lib/node_modules/coc-yaml";
+  };
+
+  coc-yank = buildVimPluginFrom2Nix {
+    pname = "coc-yank";
+    version = nodePackages.coc-yank.version;
+    src = "${nodePackages.coc-yank}/lib/node_modules/coc-yank";
+  };
+
   command-t = super.command-t.overrideAttrs(old: {
     buildInputs = [ ruby rake ];
     buildPhase = ''

From f37e7adb7bf8cf014cf34d63e2d7397fd56f7319 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 15 Mar 2020 16:17:36 +0000
Subject: [PATCH 3162/4636] nodePackages: Fix NODE_NIXPKGS_PATH in
 shell-generate.nix

---
 pkgs/development/node-packages/shell-generate.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/node-packages/shell-generate.nix b/pkgs/development/node-packages/shell-generate.nix
index f839d81133dd..aa635b2a81e3 100644
--- a/pkgs/development/node-packages/shell-generate.nix
+++ b/pkgs/development/node-packages/shell-generate.nix
@@ -4,5 +4,5 @@ mkShell {
   buildInputs = [
     bash nodePackages.node2nix
   ];
-  NODE_NIXPKGS_PATH = ./.;
+  NODE_NIXPKGS_PATH = builtins.toString ../../../.;
 }

From af9b839a8918493cdb7d6b886d2a31519f35f24f Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 15 Mar 2020 17:27:44 +0000
Subject: [PATCH 3163/4636] nodePackages: regenerate sets

---
 .../node-packages/composition-v10.nix         |    2 +-
 .../node-packages/composition-v12.nix         |    2 +-
 .../node-packages/composition-v13.nix         |    2 +-
 .../node-packages/node-packages-v10.nix       | 2818 ++++++++++++++++-
 4 files changed, 2818 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/node-packages/composition-v10.nix b/pkgs/development/node-packages/composition-v10.nix
index ecb9e5413237..534f42e37d7c 100644
--- a/pkgs/development/node-packages/composition-v10.nix
+++ b/pkgs/development/node-packages/composition-v10.nix
@@ -14,4 +14,4 @@ in
 import ./node-packages-v10.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/node-packages/composition-v12.nix b/pkgs/development/node-packages/composition-v12.nix
index a3a7bc256772..3f4fbb7f7cb5 100644
--- a/pkgs/development/node-packages/composition-v12.nix
+++ b/pkgs/development/node-packages/composition-v12.nix
@@ -14,4 +14,4 @@ in
 import ./node-packages-v12.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/node-packages/composition-v13.nix b/pkgs/development/node-packages/composition-v13.nix
index 6eddeb468dbb..7100e8d74742 100644
--- a/pkgs/development/node-packages/composition-v13.nix
+++ b/pkgs/development/node-packages/composition-v13.nix
@@ -14,4 +14,4 @@ in
 import ./node-packages-v13.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
index 7cfd359a479d..9c812bf9a733 100644
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -1174,6 +1174,15 @@ let
         sha512 = "k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==";
       };
     };
+    "@chemzqm/neovim-5.1.9" = {
+      name = "_at_chemzqm_slash_neovim";
+      packageName = "@chemzqm/neovim";
+      version = "5.1.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.1.9.tgz";
+        sha512 = "lV60tnl2jcJZj3Hb+IDg6uz2zsjsB2hIGAiaW5a452SlVeLmuUoDsy2WaqRbFqcIHZKG5GTP3ttnOlB+ltHWhg==";
+      };
+    };
     "@cliqz-oss/firefox-client-0.3.1" = {
       name = "_at_cliqz-oss_slash_firefox-client";
       packageName = "@cliqz-oss/firefox-client";
@@ -2839,6 +2848,15 @@ let
         sha512 = "HcNE5lqbBd0CNMArErVboWZ9PyJ8Hqp0VGnLJXkA3e38r6/VjhFa2pcsoJQGQiiuHj6napSMr3s+Gc34WUGhzw==";
       };
     };
+    "@starptech/expression-parser-0.9.0" = {
+      name = "_at_starptech_slash_expression-parser";
+      packageName = "@starptech/expression-parser";
+      version = "0.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@starptech/expression-parser/-/expression-parser-0.9.0.tgz";
+        sha512 = "a4CFSYZ3klnflR/rkvN87T2r/n+RxfMhDaZlrWYBaCHcbPhX+2THWyKAn82vT6Ari3SPp3XOsTqUZK4Vx2qcTA==";
+      };
+    };
     "@starptech/hast-util-from-webparser-0.10.0" = {
       name = "_at_starptech_slash_hast-util-from-webparser";
       packageName = "@starptech/hast-util-from-webparser";
@@ -2848,6 +2866,15 @@ let
         sha512 = "ebBrqxnkk4uhOkYXi0EMsHLrUrpGUjAMGz++04HPZmZYfpEZjaHxF3VmhfTWnS6u8SGUtsDPMQ+RxHSvrsNxZg==";
       };
     };
+    "@starptech/hast-util-from-webparser-0.9.0" = {
+      name = "_at_starptech_slash_hast-util-from-webparser";
+      packageName = "@starptech/hast-util-from-webparser";
+      version = "0.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@starptech/hast-util-from-webparser/-/hast-util-from-webparser-0.9.0.tgz";
+        sha512 = "evqGr0KOXB27vu/KiNv6gmd/ggygzwYvINVsCWF6GAd1SFQNS4Vz2wv4tmiktX6rcr6Qq+jBwVXvVwe60d5Z3g==";
+      };
+    };
     "@starptech/prettyhtml-0.10.0" = {
       name = "_at_starptech_slash_prettyhtml";
       packageName = "@starptech/prettyhtml";
@@ -2857,6 +2884,15 @@ let
         sha512 = "d79qc81gX5oyiv0Ioz82NEMnO/waltC7HAOlZ8r/es/zPuRilWMRo5ZCV00/80ZsQ0MiCIuhAnvUcg7rVzFDLg==";
       };
     };
+    "@starptech/prettyhtml-0.9.0" = {
+      name = "_at_starptech_slash_prettyhtml";
+      packageName = "@starptech/prettyhtml";
+      version = "0.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@starptech/prettyhtml/-/prettyhtml-0.9.0.tgz";
+        sha512 = "GekZtpBSdlFo732AxrpO7W8ue1dEZdpMK0kNHD/NVDBNU/50/D0NJ72FD2HKLh0Aune9uK+x8b+9MbBFJ2JT9A==";
+      };
+    };
     "@starptech/prettyhtml-formatter-0.10.0" = {
       name = "_at_starptech_slash_prettyhtml-formatter";
       packageName = "@starptech/prettyhtml-formatter";
@@ -2866,6 +2902,15 @@ let
         sha512 = "AEpBQTRHhgB9NmQZNXINo/ObavGLATEvS41MgiJljsiSHzfUX3ltOPLI2fy9VfDB3E76mjUqIfmEQ/v5lJ5Cfw==";
       };
     };
+    "@starptech/prettyhtml-formatter-0.9.0" = {
+      name = "_at_starptech_slash_prettyhtml-formatter";
+      packageName = "@starptech/prettyhtml-formatter";
+      version = "0.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@starptech/prettyhtml-formatter/-/prettyhtml-formatter-0.9.0.tgz";
+        sha512 = "uyG90dzyERExzQg7VTYJm3uBs6hIW81MDvqACgiFgmaafTrveKebJxAZpkbkAgTesvNmApM2I0b5Tu4OKHmaKQ==";
+      };
+    };
     "@starptech/prettyhtml-hast-to-html-0.10.0" = {
       name = "_at_starptech_slash_prettyhtml-hast-to-html";
       packageName = "@starptech/prettyhtml-hast-to-html";
@@ -2875,6 +2920,15 @@ let
         sha512 = "TAbm1q6bCBl13i8FbY/1eHMnTHWr/kLM5RcOD1S6F3T12DwhMwcqagMzqPQc4tT1DmyLzGWY8SA/p3HrB0iPcg==";
       };
     };
+    "@starptech/prettyhtml-hast-to-html-0.9.0" = {
+      name = "_at_starptech_slash_prettyhtml-hast-to-html";
+      packageName = "@starptech/prettyhtml-hast-to-html";
+      version = "0.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@starptech/prettyhtml-hast-to-html/-/prettyhtml-hast-to-html-0.9.0.tgz";
+        sha512 = "PcMRqtwXBDsliBC6nesNlDaO0a4uqC2uwfqbz/1VRaFVEInudMQ00fbRjv3Fql5C2YZ1MObMwre/+W7UDuzcIw==";
+      };
+    };
     "@starptech/prettyhtml-hastscript-0.10.0" = {
       name = "_at_starptech_slash_prettyhtml-hastscript";
       packageName = "@starptech/prettyhtml-hastscript";
@@ -2884,6 +2938,15 @@ let
         sha512 = "oSZB/CXRagbJ1UAGihSsdDcvHIGa+ivdVVmljWtJDqO5+FfFn9utzCw/QI9NAV3m9cgFWRdW/6TkXwbdPrIQ4A==";
       };
     };
+    "@starptech/prettyhtml-hastscript-0.9.0" = {
+      name = "_at_starptech_slash_prettyhtml-hastscript";
+      packageName = "@starptech/prettyhtml-hastscript";
+      version = "0.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@starptech/prettyhtml-hastscript/-/prettyhtml-hastscript-0.9.0.tgz";
+        sha512 = "ifXB3oqZl5LMMaFuQvfUYF0e+XdGDeQoIzFQYdA59cJ+RgjGdsjgFMmvkW+kxZwMWRYyAsLsYuJ19UfIWO8ymQ==";
+      };
+    };
     "@starptech/prettyhtml-sort-attributes-0.10.0" = {
       name = "_at_starptech_slash_prettyhtml-sort-attributes";
       packageName = "@starptech/prettyhtml-sort-attributes";
@@ -2893,6 +2956,15 @@ let
         sha512 = "ctsjmEEsxzW4dzMOIwYRWQvqfilgdGFaZn+lIxiNuPJIL4V4ZpgQhT96Us5BQcalHYQqQsKF+nRelCWFhd67IQ==";
       };
     };
+    "@starptech/prettyhtml-sort-attributes-0.9.0" = {
+      name = "_at_starptech_slash_prettyhtml-sort-attributes";
+      packageName = "@starptech/prettyhtml-sort-attributes";
+      version = "0.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@starptech/prettyhtml-sort-attributes/-/prettyhtml-sort-attributes-0.9.0.tgz";
+        sha512 = "jj4btXkDU0dnY8llM6Cv+6arqVIjfaHhrfLnaaiVdLLb02f1eazMIr8+4jfK0Dol4Bfg3AC3RIYAyu2Kd7FF6g==";
+      };
+    };
     "@starptech/rehype-minify-whitespace-0.10.0" = {
       name = "_at_starptech_slash_rehype-minify-whitespace";
       packageName = "@starptech/rehype-minify-whitespace";
@@ -2902,6 +2974,15 @@ let
         sha512 = "11k2dW0ju2hMuSfQ9znXqeCjyBtkfY7BRoyPjDLiVCsGIlqM2JpZhx46sFTF3JJOsJz9pr2HQ8Cvf4oTt9hgvg==";
       };
     };
+    "@starptech/rehype-minify-whitespace-0.9.0" = {
+      name = "_at_starptech_slash_rehype-minify-whitespace";
+      packageName = "@starptech/rehype-minify-whitespace";
+      version = "0.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@starptech/rehype-minify-whitespace/-/rehype-minify-whitespace-0.9.0.tgz";
+        sha512 = "z4CL6TCdHyXVZGU6I632Un5g2MmIsYhnsYVerAW4DKf3Zyc5Nam2U+wVdbE2nLqTInDUpUr4vmzksD8tHsY9Ew==";
+      };
+    };
     "@starptech/rehype-webparser-0.10.0" = {
       name = "_at_starptech_slash_rehype-webparser";
       packageName = "@starptech/rehype-webparser";
@@ -2911,6 +2992,15 @@ let
         sha512 = "1CPMVKrgXjKnehAouQBa2wWkikR6jD+BZ+8/v1RDH1S1a293fOzItU63W3VIx4zv3n0iMgrTWeeyfpk/9cT4LQ==";
       };
     };
+    "@starptech/rehype-webparser-0.9.0" = {
+      name = "_at_starptech_slash_rehype-webparser";
+      packageName = "@starptech/rehype-webparser";
+      version = "0.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@starptech/rehype-webparser/-/rehype-webparser-0.9.0.tgz";
+        sha512 = "Ndv/excuCjdRIUWtzD5YQMvuZudMvjtYmNhLllzYEzMq6+nkPrhaORuUNihDG1SYZI260CXV1khDTGqPc581Yg==";
+      };
+    };
     "@starptech/webparser-0.10.0" = {
       name = "_at_starptech_slash_webparser";
       packageName = "@starptech/webparser";
@@ -2920,6 +3010,15 @@ let
         sha512 = "vA/p1LTVfuK8dP+EhBglMS7ll3dZahBjnvjwUiJ8NNUCqH5pSAj3tcRtOG3k7k1Wx1hWHJpGgZVj0VNQIo99bA==";
       };
     };
+    "@starptech/webparser-0.9.0" = {
+      name = "_at_starptech_slash_webparser";
+      packageName = "@starptech/webparser";
+      version = "0.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@starptech/webparser/-/webparser-0.9.0.tgz";
+        sha512 = "QEC1yjpsOtj3leNCWZGirAyVCN7WJDH+rUhfMVGQuLEfoJNKK66t/UWAOrXeGxR2jdU5IffAGnqZIHbFMX6SNw==";
+      };
+    };
     "@szmarczak/http-timer-1.1.2" = {
       name = "_at_szmarczak_slash_http-timer";
       packageName = "@szmarczak/http-timer";
@@ -6196,6 +6295,33 @@ let
         sha512 = "ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==";
       };
     };
+    "array-to-error-1.1.1" = {
+      name = "array-to-error";
+      packageName = "array-to-error";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-to-error/-/array-to-error-1.1.1.tgz";
+        sha1 = "d68812926d14097a205579a667eeaf1856a44c07";
+      };
+    };
+    "array-to-sentence-1.1.0" = {
+      name = "array-to-sentence";
+      packageName = "array-to-sentence";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-to-sentence/-/array-to-sentence-1.1.0.tgz";
+        sha1 = "c804956dafa53232495b205a9452753a258d39fc";
+      };
+    };
+    "array-to-sentence-2.0.0" = {
+      name = "array-to-sentence";
+      packageName = "array-to-sentence";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-to-sentence/-/array-to-sentence-2.0.0.tgz";
+        sha512 = "rflEVg2oIxO0XgL5erRPr8GlInIORqIXrep6+b9RyrvztFcrawqIOxbWR5hYy1v7KzNvTWsSdHe8D9/XZ/rbMw==";
+      };
+    };
     "array-union-1.0.2" = {
       name = "array-union";
       packageName = "array-union";
@@ -6763,6 +6889,24 @@ let
         sha512 = "Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==";
       };
     };
+    "autoprefixer-9.7.4" = {
+      name = "autoprefixer";
+      packageName = "autoprefixer";
+      version = "9.7.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.4.tgz";
+        sha512 = "g0Ya30YrMBAEZk60lp+qfX5YQllG+S5W3GYCFvyHTvhOki0AEQJLPEcIuGRsqVwLi8FvXPVtwTGhfr38hVpm0g==";
+      };
+    };
+    "await-semaphore-0.1.3" = {
+      name = "await-semaphore";
+      packageName = "await-semaphore";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/await-semaphore/-/await-semaphore-0.1.3.tgz";
+        sha512 = "d1W2aNSYcz/sxYO4pMGX9vq65qOTu0P800epMud+6cYYX0QcT7zyqcxec3VWzpgvdXo57UWmVbZpLMjX2m1I7Q==";
+      };
+    };
     "await-to-js-2.1.1" = {
       name = "await-to-js";
       packageName = "await-to-js";
@@ -10300,6 +10444,15 @@ let
         sha512 = "Fcij9IwRW27XedRIJnSOEupS7RVcXtObJXbcUOX93UCLqqOdRpkvzKywOOSizmEK/Is3S/RHX9dLdfo6R1Q1mw==";
       };
     };
+    "clone-regexp-2.2.0" = {
+      name = "clone-regexp";
+      packageName = "clone-regexp";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz";
+        sha512 = "beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==";
+      };
+    };
     "clone-response-1.0.2" = {
       name = "clone-response";
       packageName = "clone-response";
@@ -10426,6 +10579,15 @@ let
         sha512 = "q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==";
       };
     };
+    "coc.nvim-0.0.76" = {
+      name = "coc.nvim";
+      packageName = "coc.nvim";
+      version = "0.0.76";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/coc.nvim/-/coc.nvim-0.0.76.tgz";
+        sha512 = "URa4r4dXcvotXJDKwgzHgMk9+vRFjO7tePKnznKF7XK+ApewV4aoibQ3NzC4xMWuDGto5RWWlHlWWOd5orDiOQ==";
+      };
+    };
     "code-point-at-1.1.0" = {
       name = "code-point-at";
       packageName = "code-point-at";
@@ -15504,6 +15666,15 @@ let
         sha1 = "7d02878c8e9bf7916b88836d5ac122b42f151932";
       };
     };
+    "eslint-plugin-vue-5.2.3" = {
+      name = "eslint-plugin-vue";
+      packageName = "eslint-plugin-vue";
+      version = "5.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-5.2.3.tgz";
+        sha512 = "mGwMqbbJf0+VvpGR5Lllq0PMxvTdrZ/ZPjmhkacrCHbubJeJOt+T6E3HUzAifa2Mxi7RSdJfC9HFpOeSYVMMIw==";
+      };
+    };
     "eslint-plugin-vue-6.2.2" = {
       name = "eslint-plugin-vue";
       packageName = "eslint-plugin-vue";
@@ -15594,6 +15765,15 @@ let
         sha512 = "yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==";
       };
     };
+    "espree-4.1.0" = {
+      name = "espree";
+      packageName = "espree";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/espree/-/espree-4.1.0.tgz";
+        sha512 = "I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w==";
+      };
+    };
     "espree-5.0.1" = {
       name = "espree";
       packageName = "espree";
@@ -15801,6 +15981,15 @@ let
         sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39";
       };
     };
+    "event-lite-0.1.2" = {
+      name = "event-lite";
+      packageName = "event-lite";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/event-lite/-/event-lite-0.1.2.tgz";
+        sha512 = "HnSYx1BsJ87/p6swwzv+2v6B4X+uxUteoDfRxsAb1S1BePzQqOLevVmkdA15GHJVd9A9Ok6wygUR18Hu0YeV9g==";
+      };
+    };
     "event-loop-spinner-1.1.0" = {
       name = "event-loop-spinner";
       packageName = "event-loop-spinner";
@@ -16089,6 +16278,15 @@ let
         sha1 = "73d0904e395b3cab0658b08d09ec25307f29bb73";
       };
     };
+    "execall-2.0.0" = {
+      name = "execall";
+      packageName = "execall";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz";
+        sha512 = "0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==";
+      };
+    };
     "executable-4.1.1" = {
       name = "executable";
       packageName = "executable";
@@ -17709,6 +17907,15 @@ let
         sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84";
       };
     };
+    "fp-ts-2.5.3" = {
+      name = "fp-ts";
+      packageName = "fp-ts";
+      version = "2.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.5.3.tgz";
+        sha512 = "lQd+hahLd8cygNoXbEHDjH/cbF6XVWlEPb8h5GXXlozjCSDxWgclvkpOoTRfBA0P+r69l9VvW1nEsSGIJRQpWw==";
+      };
+    };
     "fraction.js-4.0.12" = {
       name = "fraction.js";
       packageName = "fraction.js";
@@ -20347,6 +20554,15 @@ let
         sha1 = "10b30a386085f43cede353cc8fa7cb0deeea668b";
       };
     };
+    "html-tags-3.1.0" = {
+      name = "html-tags";
+      packageName = "html-tags";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz";
+        sha512 = "1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==";
+      };
+    };
     "html-void-elements-1.0.5" = {
       name = "html-void-elements";
       packageName = "html-void-elements";
@@ -21050,6 +21266,15 @@ let
         sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43";
       };
     };
+    "import-lazy-4.0.0" = {
+      name = "import-lazy";
+      packageName = "import-lazy";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz";
+        sha512 = "rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==";
+      };
+    };
     "import-local-0.1.1" = {
       name = "import-local";
       packageName = "import-local";
@@ -21464,6 +21689,15 @@ let
         sha512 = "LgjHkRl9W6bj2n+kWrAOgvCYPTYt+LanE4rtd/vKNq6yEb+SvVV7UTLzoSPpDX6/U1cAz7VfqPr+lPAIz7wHaQ==";
       };
     };
+    "inspect-with-kind-1.0.5" = {
+      name = "inspect-with-kind";
+      packageName = "inspect-with-kind";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inspect-with-kind/-/inspect-with-kind-1.0.5.tgz";
+        sha512 = "MAQUJuIo7Xqk8EVNP+6d3CKq9c80hi4tjIbIAT6lmGW9W6WzlHiu9PS8uSuUYU+Do+j1baiFp3H25XEVxDIG2g==";
+      };
+    };
     "int53-1.0.0" = {
       name = "int53";
       packageName = "int53";
@@ -21473,6 +21707,15 @@ let
         sha512 = "u8BMiMa05OPBgd32CKTead0CVTsFVgwFk23nNXo1teKPF6Sxcu0lXxEzP//zTcaKzXbGgPDXGmj/woyv+I4C5w==";
       };
     };
+    "int64-buffer-0.1.10" = {
+      name = "int64-buffer";
+      packageName = "int64-buffer";
+      version = "0.1.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/int64-buffer/-/int64-buffer-0.1.10.tgz";
+        sha1 = "277b228a87d95ad777d07c13832022406a473423";
+      };
+    };
     "internal-ip-1.2.0" = {
       name = "internal-ip";
       packageName = "internal-ip";
@@ -22598,6 +22841,15 @@ let
         sha1 = "fd2d883545c46bac5a633e7b9a09e87fa2cb5069";
       };
     };
+    "is-regexp-2.1.0" = {
+      name = "is-regexp";
+      packageName = "is-regexp";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz";
+        sha512 = "OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==";
+      };
+    };
     "is-relative-0.1.3" = {
       name = "is-relative";
       packageName = "is-relative";
@@ -23111,6 +23363,15 @@ let
         sha512 = "imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==";
       };
     };
+    "isuri-2.0.3" = {
+      name = "isuri";
+      packageName = "isuri";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/isuri/-/isuri-2.0.3.tgz";
+        sha1 = "3437121db2fe65af0ba080b7e1a8636f632cca91";
+      };
+    };
     "isurl-1.0.0" = {
       name = "isurl";
       packageName = "isurl";
@@ -24382,6 +24643,15 @@ let
         sha512 = "wRJ9I4az0QcsH7A4v4l0enUpkS++MBx0BnL/68KaLzJg7x1qmbjSlwEoCNol7KTYZ+pmtI7Eh2J0Nu6/2Z5J/Q==";
       };
     };
+    "known-css-properties-0.14.0" = {
+      name = "known-css-properties";
+      packageName = "known-css-properties";
+      version = "0.14.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.14.0.tgz";
+        sha512 = "P+0a/gBzLgVlCnK8I7VcD0yuYJscmWn66wH9tlKsQnmVdg689tLEmziwB9PuazZYLkcm07fvWOKCJJqI55sD5Q==";
+      };
+    };
     "known-css-properties-0.5.0" = {
       name = "known-css-properties";
       packageName = "known-css-properties";
@@ -25075,6 +25345,15 @@ let
         sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==";
       };
     };
+    "locate-java-home-1.1.2" = {
+      name = "locate-java-home";
+      packageName = "locate-java-home";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/locate-java-home/-/locate-java-home-1.1.2.tgz";
+        sha512 = "cyylBBX0lBYYOpWGb5pJED40PZvFVru315HUaArT842bC5681AxOxbuQu0AlcNA+WCUBB+n0OQ21FaCKg9Jx5Q==";
+      };
+    };
     "locate-path-2.0.0" = {
       name = "locate-path";
       packageName = "locate-path";
@@ -26254,6 +26533,15 @@ let
         sha512 = "EEEgFcE9bLgaYUKuozyFfytQM2wDHtXn4tAN41pkaxpNjAykv11GVdeI4tHtmPWW4Xrgh9R/2d7XYghDVjbKKw==";
       };
     };
+    "log4js-5.3.0" = {
+      name = "log4js";
+      packageName = "log4js";
+      version = "5.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/log4js/-/log4js-5.3.0.tgz";
+        sha512 = "PZHXaXJKMKEscvQxSnTjM4UosQalSDlNpMw63eCKW+/DiAFKIZPW1jGyIPXZDjiEYFusMfiI7zzvnxeGozUcAw==";
+      };
+    };
     "logform-2.1.2" = {
       name = "logform";
       packageName = "logform";
@@ -27658,6 +27946,15 @@ let
         sha1 = "401fdec7ec21cdb9e03cd3d3021398da21b27085";
       };
     };
+    "metals-languageclient-0.1.20" = {
+      name = "metals-languageclient";
+      packageName = "metals-languageclient";
+      version = "0.1.20";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/metals-languageclient/-/metals-languageclient-0.1.20.tgz";
+        sha512 = "Ok3/i1ckdd7b3K+PM9dsK21kRwXrAlfpZrXV5tgAo8I+QWSQTPa0E5uciNT/wOCKgCaRuC7Zu0vmYgLA4hbOiQ==";
+      };
+    };
     "metalsmith-2.3.0" = {
       name = "metalsmith";
       packageName = "metalsmith";
@@ -28297,6 +28594,15 @@ let
         sha1 = "161be5bdeb496771eb9b35745050b622b5aefc58";
       };
     };
+    "mock-require-3.0.3" = {
+      name = "mock-require";
+      packageName = "mock-require";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mock-require/-/mock-require-3.0.3.tgz";
+        sha512 = "lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg==";
+      };
+    };
     "modify-values-1.0.1" = {
       name = "modify-values";
       packageName = "modify-values";
@@ -28522,6 +28828,15 @@ let
         sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
       };
     };
+    "msgpack-lite-0.1.26" = {
+      name = "msgpack-lite";
+      packageName = "msgpack-lite";
+      version = "0.1.26";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/msgpack-lite/-/msgpack-lite-0.1.26.tgz";
+        sha1 = "dd3c50b26f059f25e7edee3644418358e2a9ad89";
+      };
+    };
     "msgpack5-3.6.0" = {
       name = "msgpack5";
       packageName = "msgpack5";
@@ -33246,6 +33561,24 @@ let
         sha512 = "KxKUpj7AY7nlCbLcTOYxdfJnGE7QFAfU2n95ADj1Q90RM/pOLdz8k3n4avOyRFs7MDQHcRzJQWM1dehCwJxisQ==";
       };
     };
+    "postcss-html-0.36.0" = {
+      name = "postcss-html";
+      packageName = "postcss-html";
+      version = "0.36.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-html/-/postcss-html-0.36.0.tgz";
+        sha512 = "HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==";
+      };
+    };
+    "postcss-jsx-0.36.4" = {
+      name = "postcss-jsx";
+      packageName = "postcss-jsx";
+      version = "0.36.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-jsx/-/postcss-jsx-0.36.4.tgz";
+        sha512 = "jwO/7qWUvYuWYnpOb0+4bIIgJt7003pgU3P6nETBLaOyBXuTD55ho21xnals5nBrlpTIFodyd3/jBi6UO3dHvA==";
+      };
+    };
     "postcss-less-1.1.5" = {
       name = "postcss-less";
       packageName = "postcss-less";
@@ -33255,6 +33588,24 @@ let
         sha512 = "QQIiIqgEjNnquc0d4b6HDOSFZxbFQoy4MPpli2lSLpKhMyBkKwwca2HFqu4xzxlKID/F2fxSOowwtKpgczhF7A==";
       };
     };
+    "postcss-less-3.1.4" = {
+      name = "postcss-less";
+      packageName = "postcss-less";
+      version = "3.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-less/-/postcss-less-3.1.4.tgz";
+        sha512 = "7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==";
+      };
+    };
+    "postcss-markdown-0.36.0" = {
+      name = "postcss-markdown";
+      packageName = "postcss-markdown";
+      version = "0.36.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-markdown/-/postcss-markdown-0.36.0.tgz";
+        sha512 = "rl7fs1r/LNSB2bWRhyZ+lM/0bwKv9fhl38/06gF6mKMo/NPnp55+K1dSTosSVjFZc0e1ppBlu+WT91ba0PMBfQ==";
+      };
+    };
     "postcss-media-query-parser-0.2.3" = {
       name = "postcss-media-query-parser";
       packageName = "postcss-media-query-parser";
@@ -33471,6 +33822,15 @@ let
         sha512 = "rBkDbaHAu5uywbCR2XE8a25tats3xSOsGNx6mppK6Q9kSFGKc/FyAzfci+fWM2l+K402p1D0pNcfDGxeje5IKg==";
       };
     };
+    "postcss-reporter-6.0.1" = {
+      name = "postcss-reporter";
+      packageName = "postcss-reporter";
+      version = "6.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-6.0.1.tgz";
+        sha512 = "LpmQjfRWyabc+fRygxZjpRxfhRf9u/fdlKf4VHG4TSPbV2XNsuISzYW1KL+1aQzx53CAppa1bKG4APIB/DOXXw==";
+      };
+    };
     "postcss-resolve-nested-selector-0.1.1" = {
       name = "postcss-resolve-nested-selector";
       packageName = "postcss-resolve-nested-selector";
@@ -33489,6 +33849,15 @@ let
         sha1 = "b753eff6c7c0aea5e8375fbe4cde8bf9063ff142";
       };
     };
+    "postcss-safe-parser-4.0.2" = {
+      name = "postcss-safe-parser";
+      packageName = "postcss-safe-parser";
+      version = "4.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz";
+        sha512 = "Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==";
+      };
+    };
     "postcss-sass-0.2.0" = {
       name = "postcss-sass";
       packageName = "postcss-sass";
@@ -33498,6 +33867,15 @@ let
         sha512 = "cUmYzkP747fPCQE6d+CH2l1L4VSyIlAzZsok3HPjb5Gzsq3jE+VjpAdGlPsnQ310WKWI42sw+ar0UNN59/f3hg==";
       };
     };
+    "postcss-sass-0.3.5" = {
+      name = "postcss-sass";
+      packageName = "postcss-sass";
+      version = "0.3.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.3.5.tgz";
+        sha512 = "B5z2Kob4xBxFjcufFnhQ2HqJQ2y/Zs/ic5EZbCywCkxKd756Q40cIQ/veRDwSrw1BF6+4wUgmpm0sBASqVi65A==";
+      };
+    };
     "postcss-scss-1.0.6" = {
       name = "postcss-scss";
       packageName = "postcss-scss";
@@ -33507,6 +33885,15 @@ let
         sha512 = "4EFYGHcEw+H3E06PT/pQQri06u/1VIIPjeJQaM8skB80vZuXMhp4cSNV5azmdNkontnOID/XYWEvEEELLFB1ww==";
       };
     };
+    "postcss-scss-2.0.0" = {
+      name = "postcss-scss";
+      packageName = "postcss-scss";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.0.0.tgz";
+        sha512 = "um9zdGKaDZirMm+kZFKKVsnKPF7zF7qBAtIfTSnZXD1jZ0JNZIxdB6TxQOjCnlSzLRInVl2v3YdBh/M881C4ug==";
+      };
+    };
     "postcss-selector-parser-3.1.2" = {
       name = "postcss-selector-parser";
       packageName = "postcss-selector-parser";
@@ -33534,6 +33921,15 @@ let
         sha512 = "C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==";
       };
     };
+    "postcss-syntax-0.36.2" = {
+      name = "postcss-syntax";
+      packageName = "postcss-syntax";
+      version = "0.36.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-syntax/-/postcss-syntax-0.36.2.tgz";
+        sha512 = "nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==";
+      };
+    };
     "postcss-unique-selectors-4.0.1" = {
       name = "postcss-unique-selectors";
       packageName = "postcss-unique-selectors";
@@ -34020,6 +34416,15 @@ let
         sha1 = "5f8a704ccdf5f2ac23996fcafe2b301bc2a8d0eb";
       };
     };
+    "promisify-child-process-3.1.3" = {
+      name = "promisify-child-process";
+      packageName = "promisify-child-process";
+      version = "3.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promisify-child-process/-/promisify-child-process-3.1.3.tgz";
+        sha512 = "qVox3vW2hqbktVw+IN7YZ/kgGA+u426ekmiZxiofNe9O4GSewjROwRQ4MQ6IbvhpeYSLqiLS0kMn+FWCz6ENlg==";
+      };
+    };
     "promisize-1.1.2" = {
       name = "promisize";
       packageName = "promisize";
@@ -36252,6 +36657,15 @@ let
         sha512 = "b7wGPo7o2KE/g7SqkJDDbav6zmrEeP4TK2VpITU72J/M949TLe/23y/ZHJo+pskcGM52xIfFoT9hydwmgr1AEg==";
       };
     };
+    "remark-10.0.1" = {
+      name = "remark";
+      packageName = "remark";
+      version = "10.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/remark/-/remark-10.0.1.tgz";
+        sha512 = "E6lMuoLIy2TyiokHprMjcWNJ5UxfGQjaMSMhV+f4idM625UjjK4j798+gPs5mfjzDE6vL0oFKVeZM6gZVSVrzQ==";
+      };
+    };
     "remark-3.2.3" = {
       name = "remark";
       packageName = "remark";
@@ -36333,6 +36747,15 @@ let
         sha512 = "b3iXszZLH1TLoyUzrATcTQUZrwNl1rE70rVdSruJFlDaJ9z5aMkhrG43Pp68OgfHndL/ADz6V69Zow8cTQu+JA==";
       };
     };
+    "remark-parse-6.0.3" = {
+      name = "remark-parse";
+      packageName = "remark-parse";
+      version = "6.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/remark-parse/-/remark-parse-6.0.3.tgz";
+        sha512 = "QbDXWN4HfKTUC0hHa4teU463KclLAnwpn/FBn87j9cKYJWWawbiLgMfP2Q4XwhxxuuuOxHlw+pSN0OKuJwyVvg==";
+      };
+    };
     "remark-retext-3.1.3" = {
       name = "remark-retext";
       packageName = "remark-retext";
@@ -36360,6 +36783,15 @@ let
         sha512 = "xLuyKTnuQer3ke9hkU38SUYLiTmS078QOnoFavztmbt/pAJtNSkNtFgR0U//uCcmG0qnyxao+PDuatQav46F1w==";
       };
     };
+    "remark-stringify-6.0.4" = {
+      name = "remark-stringify";
+      packageName = "remark-stringify";
+      version = "6.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-6.0.4.tgz";
+        sha512 = "eRWGdEPMVudijE/psbIDNcnJLRVx3xhfuEsTDGgH4GsFF91dVhw5nhmnBppafJ7+NWINW6C7ZwWbi30ImJzqWg==";
+      };
+    };
     "remove-array-items-1.1.1" = {
       name = "remove-array-items";
       packageName = "remove-array-items";
@@ -36990,6 +37422,15 @@ let
         sha1 = "61a9644bdea483aa281ffb62706e642f1a73a239";
       };
     };
+    "rfc-3986-1.0.1" = {
+      name = "rfc-3986";
+      packageName = "rfc-3986";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rfc-3986/-/rfc-3986-1.0.1.tgz";
+        sha1 = "eeeb88342fadbe8027c0f36ada921a13e6f96206";
+      };
+    };
     "rfdc-1.1.4" = {
       name = "rfdc";
       packageName = "rfdc";
@@ -39564,6 +40005,15 @@ let
         sha512 = "Nc/QN/A425Qog7j9aHmwOrlwX2e7pNI47ciwxwy4jOlvbbMHkNNJchit+FX+UjF3IAdiaaV5BKeWuDUnws6G1A==";
       };
     };
+    "specificity-0.4.1" = {
+      name = "specificity";
+      packageName = "specificity";
+      version = "0.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz";
+        sha512 = "1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==";
+      };
+    };
     "speedometer-0.1.4" = {
       name = "speedometer";
       packageName = "speedometer";
@@ -40545,6 +40995,15 @@ let
         sha512 = "3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==";
       };
     };
+    "streamroller-2.2.3" = {
+      name = "streamroller";
+      packageName = "streamroller";
+      version = "2.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/streamroller/-/streamroller-2.2.3.tgz";
+        sha512 = "AegmvQsscTRhHVO46PhCDerjIpxi7E+d2GxgUDu+nzw/HuLnUdxHWr6WQ+mVn/4iJgMKKFFdiUwFcFRDvcjCtw==";
+      };
+    };
     "streamsearch-0.1.2" = {
       name = "streamsearch";
       packageName = "streamsearch";
@@ -41121,6 +41580,15 @@ let
         sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==";
       };
     };
+    "stylelint-10.1.0" = {
+      name = "stylelint";
+      packageName = "stylelint";
+      version = "10.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stylelint/-/stylelint-10.1.0.tgz";
+        sha512 = "OmlUXrgzEMLQYj1JPTpyZPR9G4bl0StidfHnGJEMpdiQ0JyTq0MPg1xkHk1/xVJ2rTPESyJCDWjG8Kbpoo7Kuw==";
+      };
+    };
     "stylelint-8.4.0" = {
       name = "stylelint";
       packageName = "stylelint";
@@ -41130,6 +41598,24 @@ let
         sha512 = "56hPH5mTFnk8LzlEuTWq0epa34fHuS54UFYQidBOFt563RJBNi1nz1F2HK2MoT1X1waq47milvRsRahFCCJs/Q==";
       };
     };
+    "stylelint-vscode-7.0.0-21" = {
+      name = "stylelint-vscode";
+      packageName = "stylelint-vscode";
+      version = "7.0.0-21";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stylelint-vscode/-/stylelint-vscode-7.0.0-21.tgz";
+        sha512 = "M7tnqBendVqPAAR3CWSJswMRV6/ZRypW3iQz4S4gxUTkmrBS/+8QW3bJ4ltKAJif7u89CYVG12hBqY0kGacFCw==";
+      };
+    };
+    "stylelint-warning-to-vscode-diagnostic-1.0.1" = {
+      name = "stylelint-warning-to-vscode-diagnostic";
+      packageName = "stylelint-warning-to-vscode-diagnostic";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stylelint-warning-to-vscode-diagnostic/-/stylelint-warning-to-vscode-diagnostic-1.0.1.tgz";
+        sha512 = "Lqze501k5gMdCJg/InZV+TU7MgJyxu+gHLBQjQcTluoZRtMoWyJ4ywPCRpZdaHA2LAI1OCqJCEl93FMuZhA1/A==";
+      };
+    };
     "stylint-1.5.9" = {
       name = "stylint";
       packageName = "stylint";
@@ -41202,6 +41688,15 @@ let
         sha512 = "3qgLZytikQQEVn1/FrhY7B68gPUUGY3R1Q1vTiD5xT+Ti1DP/8iZuwFet9ONs5+bmL8pZoDQ6JrQHVgrNlK6mA==";
       };
     };
+    "sugarss-2.0.0" = {
+      name = "sugarss";
+      packageName = "sugarss";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz";
+        sha512 = "WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==";
+      };
+    };
     "superagent-0.21.0" = {
       name = "superagent";
       packageName = "superagent";
@@ -42652,6 +43147,15 @@ let
         sha512 = "Y7EDM+uoU8TZxF5ej2mUR0dLO4qbuuNRnJKxEht2QJWEq2421pyG1D1x8YxPKmyTc6nHh7Td/jLGFxYo+9vkLA==";
       };
     };
+    "to-vfile-5.0.3" = {
+      name = "to-vfile";
+      packageName = "to-vfile";
+      version = "5.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-vfile/-/to-vfile-5.0.3.tgz";
+        sha512 = "z1Lfx60yAMDMmr+f426Y4yECsHdl8GVEAE+LymjRF5oOIZ7T4N20IxWNAxXLMRzP9jSSll38Z0fKVAhVLsdLOw==";
+      };
+    };
     "to-vfile-6.1.0" = {
       name = "to-vfile";
       packageName = "to-vfile";
@@ -43426,6 +43930,15 @@ let
         sha512 = "kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg==";
       };
     };
+    "typescript-3.7.3" = {
+      name = "typescript";
+      packageName = "typescript";
+      version = "3.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typescript/-/typescript-3.7.3.tgz";
+        sha512 = "Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw==";
+      };
+    };
     "typescript-3.7.5" = {
       name = "typescript";
       packageName = "typescript";
@@ -43453,6 +43966,15 @@ let
         sha512 = "IKawLTu4A2xN3aN/cPLxvZ0bhxZHILGDKTZWvWNJ3sLNhJ3PjfMEDQmR2VMpdRPrmWOadgWXRwjLBzSA8AGsaQ==";
       };
     };
+    "typescript-tslint-plugin-0.5.4" = {
+      name = "typescript-tslint-plugin";
+      packageName = "typescript-tslint-plugin";
+      version = "0.5.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typescript-tslint-plugin/-/typescript-tslint-plugin-0.5.4.tgz";
+        sha512 = "CQEfGC+p0SoBARI4N2LrGsWJsp4/OE+uKZ68xsWYKHWqMFq4DFQHqOVlK0deEricSN01NmDTqjap63Pw/DHieg==";
+      };
+    };
     "typewise-1.0.3" = {
       name = "typewise";
       packageName = "typewise";
@@ -45541,6 +46063,15 @@ let
         sha512 = "perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==";
       };
     };
+    "vscode-jsonrpc-4.1.0-next.3" = {
+      name = "vscode-jsonrpc";
+      packageName = "vscode-jsonrpc";
+      version = "4.1.0-next.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.1.0-next.3.tgz";
+        sha512 = "Z6oxBiMks2+UADV1QHXVooSakjyhI+eHTnXzDyVvVMmegvSfkXk2w6mPEdSkaNHFBdtWW7n20H1yw2nA3A17mg==";
+      };
+    };
     "vscode-jsonrpc-5.0.1" = {
       name = "vscode-jsonrpc";
       packageName = "vscode-jsonrpc";
@@ -45613,6 +46144,15 @@ let
         sha512 = "IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==";
       };
     };
+    "vscode-languageserver-protocol-3.15.0-next.6" = {
+      name = "vscode-languageserver-protocol";
+      packageName = "vscode-languageserver-protocol";
+      version = "3.15.0-next.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.6.tgz";
+        sha512 = "/yDpYlWyNs26mM23mT73xmOFsh1iRfgZfBdHmfAxwDKwpQKLoOSqVidtYfxlK/pD3IEKGcAVnT4WXTsguxxAMQ==";
+      };
+    };
     "vscode-languageserver-protocol-3.15.3" = {
       name = "vscode-languageserver-protocol";
       packageName = "vscode-languageserver-protocol";
@@ -45775,6 +46315,15 @@ let
         sha512 = "ZezcU71Owm84xVF6gfurBQUGg8WQ+WZGxgDEQu1IHFBZNx7BFZg3L1yHxrCBNNwbwFtE1GuvfJKMtb6Xuwc/Bw==";
       };
     };
+    "vue-eslint-parser-5.0.0" = {
+      name = "vue-eslint-parser";
+      packageName = "vue-eslint-parser";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-5.0.0.tgz";
+        sha512 = "JlHVZwBBTNVvzmifwjpZYn0oPWH2SgWv5dojlZBsrhablDu95VFD+hriB1rQGwbD+bms6g+rAFhQHk6+NyiS6g==";
+      };
+    };
     "vue-eslint-parser-6.0.5" = {
       name = "vue-eslint-parser";
       packageName = "vue-eslint-parser";
@@ -45802,6 +46351,15 @@ let
         sha512 = "RXv0lrDG2CAx3yAQCoD9beU8nAoT3rhh/fgb+xlYM0Qlm+cpkWSLTdfOt1x2j2wHI08uEsi0q7x6rjhn54EbNA==";
       };
     };
+    "vue-language-server-0.0.62" = {
+      name = "vue-language-server";
+      packageName = "vue-language-server";
+      version = "0.0.62";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vue-language-server/-/vue-language-server-0.0.62.tgz";
+        sha512 = "Q/nwAVlBfLKz4CSA4vkA14jJcXElP1Vf+O5GZhG7sPlNKMEy91rdVwYc7IfMRZV/SCAZRak9/oo0Zy4+39dwrg==";
+      };
+    };
     "vue-onsenui-helper-json-1.0.2" = {
       name = "vue-onsenui-helper-json";
       packageName = "vue-onsenui-helper-json";
@@ -47234,6 +47792,15 @@ let
         sha1 = "87cfa5a9613f48e26005420d6a8ee0da6fe8daec";
       };
     };
+    "yaml-language-server-0.7.2" = {
+      name = "yaml-language-server";
+      packageName = "yaml-language-server";
+      version = "0.7.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.7.2.tgz";
+        sha512 = "3jBsYrtnlaI5H6psW+0qzVh9LoQ21fuvC8KIupjPbQURb6cAMUGH5aElKREAevSSpgs7VIoqU1ZMCglIHm32OA==";
+      };
+    };
     "yamljs-0.3.0" = {
       name = "yamljs";
       packageName = "yamljs";
@@ -51371,6 +51938,372 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  coc-css = nodeEnv.buildNodePackage {
+    name = "coc-css";
+    packageName = "coc-css";
+    version = "1.2.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-css/-/coc-css-1.2.2.tgz";
+      sha512 = "JvZnKZZJZemS70o972OEjfnMGGO2sLpJA3iX1OT3CXmaymPb8CmufboyCVnzGMDMbFL/qHgfjbdw9kOg5ZtzzQ==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Css extension for coc";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-emmet = nodeEnv.buildNodePackage {
+    name = "coc-emmet";
+    packageName = "coc-emmet";
+    version = "1.1.4";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-emmet/-/coc-emmet-1.1.4.tgz";
+      sha512 = "hxpldh4WYgq7JOQeAynEy+uM2M12RnxTlmY3cCDpZrkCJGZwz4BRYseXhuwieaFiut0OzqBEtWIcZLLrzROKMA==";
+    };
+    dependencies = [
+      sources."@emmetio/extract-abbreviation-0.1.6"
+      sources."jsonc-parser-1.0.3"
+      sources."vscode-emmet-helper-1.2.17"
+      sources."vscode-languageserver-types-3.15.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "emmet extension for coc";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-eslint = nodeEnv.buildNodePackage {
+    name = "coc-eslint";
+    packageName = "coc-eslint";
+    version = "1.2.6";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.2.6.tgz";
+      sha512 = "2vOL35E7kIig1evMUj/bIij9AjtEdTI35sshaf1VeLSqTnFc9Owbd4glHVeY4q76t0EsTyLkuqm7Q1QsGR/7iw==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "eslint extension for coc";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-git = nodeEnv.buildNodePackage {
+    name = "coc-git";
+    packageName = "coc-git";
+    version = "1.7.7";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-git/-/coc-git-1.7.7.tgz";
+      sha512 = "7/lIG6RoAp9KCdmcySD/Oa06UO6Nvah0Ra/4j7I1I/S79XVxZDbRry3nhHjD1F5/zfV4zk9UpB2gGRIveF8FEA==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Git extension for coc.nvim";
+      homepage = "https://github.com/neoclide/coc-git#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-go = nodeEnv.buildNodePackage {
+    name = "coc-go";
+    packageName = "coc-go";
+    version = "0.7.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-go/-/coc-go-0.7.0.tgz";
+      sha512 = "ntDgRtLshBtxUuUXkkxH2S+xUWZW86ptrLO0pe74MzeS6m/Z744QvwSor+abHUTHO370nrUEUtGaQDUEh9p2BA==";
+    };
+    dependencies = [
+      sources."isexe-2.0.0"
+      sources."tslib-1.11.1"
+      sources."which-2.0.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "gopls extension for coc";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-highlight = nodeEnv.buildNodePackage {
+    name = "coc-highlight";
+    packageName = "coc-highlight";
+    version = "1.2.5";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-highlight/-/coc-highlight-1.2.5.tgz";
+      sha512 = "fGWz30toD5ORdRpH7WOSbMvNOqzdorCSClTfwIdcb3vJoKPA31wOxFzEMfzR7jlXvusjBaUr1GvTQyu3eOKomw==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Highlight extension for coc.nvim";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-html = nodeEnv.buildNodePackage {
+    name = "coc-html";
+    packageName = "coc-html";
+    version = "1.2.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-html/-/coc-html-1.2.3.tgz";
+      sha512 = "8VAdVGQ6eiXOIvh+RBNep1fREpv9JzmjkF3DTls2s9sqQ9B62d3ixe5RM2DLjPawva3v1ttHpBB8RN1QBEwsKQ==";
+    };
+    dependencies = [
+      sources."typescript-3.8.3"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Html extension for coc";
+      homepage = "https://github.com/neoclide/coc-html#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-imselect = nodeEnv.buildNodePackage {
+    name = "coc-imselect";
+    packageName = "coc-imselect";
+    version = "0.0.12";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-imselect/-/coc-imselect-0.0.12.tgz";
+      sha512 = "X8TBe8UTwNd01HrWBXy93jQ1PShGtTa4bm2aH2bQwx9EH9FW7ufRlw7euPKkR2kzilshwb3UbJnLET2vFdZjJw==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Input method extension for coc.nvim on mac.";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-java = nodeEnv.buildNodePackage {
+    name = "coc-java";
+    packageName = "coc-java";
+    version = "1.4.8";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-java/-/coc-java-1.4.8.tgz";
+      sha512 = "q/GKl4gKhn10+F5pwWm6IiLuf5SnGL5Yps2Nz8Ztprbs7Q0EFvzFW4rJx+L0itKgo3H3p/84mUTYZLdRf5NPBw==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Java langauage extension for coc.nvim";
+      homepage = "https://github.com/neoclide/coc-java#readme";
+      license = "EPL-1.0";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-jest = nodeEnv.buildNodePackage {
+    name = "coc-jest";
+    packageName = "coc-jest";
+    version = "1.0.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-jest/-/coc-jest-1.0.3.tgz";
+      sha512 = "ZxgOP00URYcmIUnl1yjxonxbwb4QHEk2JJxxcYyCHo2wJPCVQWB+WYVYzHb0pzrZdDcsj5hk6wXWnLXM5EkRjA==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "jest extension for coc.nvim";
+      homepage = "https://github.com/neoclide/coc-jest#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-json = nodeEnv.buildNodePackage {
+    name = "coc-json";
+    packageName = "coc-json";
+    version = "1.2.5";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-json/-/coc-json-1.2.5.tgz";
+      sha512 = "j8EAdxXxKxc5zHwCzdGAcnXzDXjtfbL6fNb9QIlBi2CkMIoARFyU4uZsIkMoROTMPaffHDFyzyAW2UJpbIJ0WQ==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Json extension for coc.nvim";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-lists = nodeEnv.buildNodePackage {
+    name = "coc-lists";
+    packageName = "coc-lists";
+    version = "1.3.7";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.7.tgz";
+      sha512 = "b+BTZviGOZc7S5cyp9FHn7C/RD65YayWbIA6Oxws/uNwIi6U+T2jrHM4iNS+0g473wmNBdInGyVu1Bz6B1zYbg==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Basic list sources for coc.nvim";
+      homepage = "https://github.com/neoclide/coc-lists#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-metals = nodeEnv.buildNodePackage {
+    name = "coc-metals";
+    packageName = "coc-metals";
+    version = "0.7.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.7.2.tgz";
+      sha512 = "j0pzvL9swPwN4sW/abHRAtm1Pc0TNMT7YwItkA8F90kaUxdfF0JQaR3AvDe1/YxFUlNHU92F2R0g2VAdcSzWEg==";
+    };
+    dependencies = [
+      sources."@babel/runtime-7.8.7"
+      sources."@chemzqm/neovim-5.1.9"
+      sources."async-2.6.3"
+      sources."await-semaphore-0.1.3"
+      sources."balanced-match-1.0.0"
+      sources."brace-expansion-1.1.11"
+      sources."bser-2.1.1"
+      sources."chownr-1.1.4"
+      sources."coc.nvim-0.0.76"
+      sources."concat-map-0.0.1"
+      sources."date-format-2.1.0"
+      sources."debounce-1.2.0"
+      sources."debug-3.2.6"
+      sources."deep-extend-0.6.0"
+      sources."event-lite-0.1.2"
+      sources."fast-diff-1.2.0"
+      sources."fb-watchman-2.0.1"
+      sources."flatted-2.0.1"
+      sources."follow-redirects-1.10.0"
+      sources."fp-ts-2.5.3"
+      sources."fs-extra-8.1.0"
+      sources."fs-minipass-1.2.7"
+      sources."fs.realpath-1.0.0"
+      sources."glob-7.1.6"
+      sources."graceful-fs-4.2.3"
+      sources."ieee754-1.1.13"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
+      sources."ini-1.3.5"
+      sources."int64-buffer-0.1.10"
+      sources."isarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."isuri-2.0.3"
+      sources."jsonc-parser-2.2.1"
+      sources."jsonfile-4.0.0"
+      (sources."locate-java-home-1.1.2" // {
+        dependencies = [
+          sources."semver-5.7.1"
+        ];
+      })
+      sources."lodash-4.17.15"
+      (sources."log4js-5.3.0" // {
+        dependencies = [
+          sources."debug-4.1.1"
+        ];
+      })
+      (sources."metals-languageclient-0.1.20" // {
+        dependencies = [
+          sources."mkdirp-1.0.3"
+          sources."semver-7.1.3"
+          sources."vscode-languageserver-protocol-3.15.0-next.6"
+        ];
+      })
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."minipass-2.9.0"
+      sources."minizlib-1.3.3"
+      sources."mkdirp-0.5.1"
+      sources."ms-2.1.2"
+      sources."msgpack-lite-0.1.26"
+      (sources."mv-2.1.1" // {
+        dependencies = [
+          sources."glob-6.0.4"
+          sources."rimraf-2.4.5"
+        ];
+      })
+      sources."ncp-2.0.0"
+      sources."node-fetch-2.6.0"
+      sources."node-int64-0.4.0"
+      sources."once-1.4.0"
+      sources."path-is-absolute-1.0.1"
+      sources."promisify-child-process-3.1.3"
+      (sources."rc-1.2.8" // {
+        dependencies = [
+          sources."minimist-1.2.5"
+        ];
+      })
+      sources."regenerator-runtime-0.13.5"
+      sources."rfc-3986-1.0.1"
+      sources."rfdc-1.1.4"
+      sources."rimraf-3.0.2"
+      sources."safe-buffer-5.2.0"
+      sources."semver-6.3.0"
+      sources."shell-quote-1.7.2"
+      (sources."streamroller-2.2.3" // {
+        dependencies = [
+          sources."debug-4.1.1"
+        ];
+      })
+      sources."strip-json-comments-2.0.1"
+      sources."tar-4.4.13"
+      sources."tslib-1.11.1"
+      sources."tunnel-0.0.6"
+      sources."universalify-0.1.2"
+      sources."uuid-3.4.0"
+      sources."vscode-jsonrpc-4.1.0-next.3"
+      (sources."vscode-languageserver-protocol-3.15.3" // {
+        dependencies = [
+          sources."vscode-jsonrpc-5.0.1"
+        ];
+      })
+      sources."vscode-languageserver-types-3.15.1"
+      sources."vscode-uri-2.1.1"
+      sources."which-1.3.1"
+      sources."wrappy-1.0.2"
+      sources."yallist-3.1.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "coc.nvim extension for Metals, the Scala language server";
+      license = "Apache-2.0";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-pairs = nodeEnv.buildNodePackage {
+    name = "coc-pairs";
+    packageName = "coc-pairs";
+    version = "1.2.21";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.2.21.tgz";
+      sha512 = "QTrzPCgk+zNVSnDjCbm3cvzb6c6rIwYMowrGhVb4XGnc8ooMXDBSfMoPYUtVgEJ+Qcu3++93OWr+m2VOHwHxag==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Auto pair extension for coc.nvim";
+      homepage = "https://github.com/neoclide/coc-pairs#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   coc-prettier = nodeEnv.buildNodePackage {
     name = "coc-prettier";
     packageName = "coc-prettier";
@@ -52243,6 +53176,1885 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  coc-python = nodeEnv.buildNodePackage {
+    name = "coc-python";
+    packageName = "coc-python";
+    version = "1.2.9";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-python/-/coc-python-1.2.9.tgz";
+      sha512 = "ouwZI3MZnCsO/sa5O1rQYzBgPjZ8h3OkJbBYm3DzaX+x49Gp3ARHpvSF4BMphOE16HUD/bHt+RnE+HSSweGFlg==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Python extension for coc.nvim, forked from vscode-python.";
+      homepage = "https://github.com/neoclide/coc-python#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-r-lsp = nodeEnv.buildNodePackage {
+    name = "coc-r-lsp";
+    packageName = "coc-r-lsp";
+    version = "1.1.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-r-lsp/-/coc-r-lsp-1.1.1.tgz";
+      sha512 = "y/6SBQhGAXEHqfb/EPuRZBPpXNMwXXF7lCU6f/J0WjxwGOzip8StuiRc3Vhr3JXvP/QSO37tunkaAJX+z8rRTg==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "R language server extension for coc.nvim";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-rls = nodeEnv.buildNodePackage {
+    name = "coc-rls";
+    packageName = "coc-rls";
+    version = "1.1.4";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-rls/-/coc-rls-1.1.4.tgz";
+      sha512 = "UcQCBSp/Mzt5SR2mS4Qukvn7mBoh86cB1Fb1/oD88+sn1RHRl67eTrdlbswzdrXyd6WotQi62okCuIhyVoqAig==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Rust language support - code completion, Intellisense, refactoring, reformatting, errors, snippets. A client for the Rust Language Server, built by the RLS team.";
+      homepage = "https://github.com/neoclide/coc-rls#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-smartf = nodeEnv.buildNodePackage {
+    name = "coc-smartf";
+    packageName = "coc-smartf";
+    version = "1.1.10";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-smartf/-/coc-smartf-1.1.10.tgz";
+      sha512 = "xjRDR+1qPw3KclL67v7y8D5l8mrUyYvCGWaLegZ3iLjYpRMwGI5oZKi4sHfRk8kFqrmVbHfvh6yDHiIUnTJWyA==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Smart find extension for coc.nvim";
+      homepage = "https://github.com/neoclide/coc-smartf#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-snippets = nodeEnv.buildNodePackage {
+    name = "coc-snippets";
+    packageName = "coc-snippets";
+    version = "2.1.22";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.1.22.tgz";
+      sha512 = "4YXCzFFVc92yr31+cq8CrHEdR63rvaPgGzeFtXH0fU0TpbcZa6sh/hY5HU9Pd0RgNingsJDIg5fE3+cUav88PA==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Snippets extension for coc.nvim";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-solargraph = nodeEnv.buildNodePackage {
+    name = "coc-solargraph";
+    packageName = "coc-solargraph";
+    version = "1.1.6";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-solargraph/-/coc-solargraph-1.1.6.tgz";
+      sha512 = "Vkl4IYCgexGQ038betmYJ4Ht2OqbVJDFrQn8h+OCvVUHAEGsQTYj8sIIq3qohW/FuJJXvUdRoGEYQUZCtw96OQ==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Ruby languageserver extension for coc.nvim, using solargraph";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-stylelint = nodeEnv.buildNodePackage {
+    name = "coc-stylelint";
+    packageName = "coc-stylelint";
+    version = "1.1.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-stylelint/-/coc-stylelint-1.1.0.tgz";
+      sha512 = "+dVV5p9OBXyBGKFPQAS5a1SFvikSbYtYXyzPCkvYqYAqDiJlmFVEyi1aP+FI17Y/094u7mFeDQJlSd7IXVgO7w==";
+    };
+    dependencies = [
+      sources."@babel/code-frame-7.8.3"
+      (sources."@babel/core-7.8.7" // {
+        dependencies = [
+          sources."semver-5.7.1"
+        ];
+      })
+      sources."@babel/generator-7.8.8"
+      sources."@babel/helper-function-name-7.8.3"
+      sources."@babel/helper-get-function-arity-7.8.3"
+      sources."@babel/helper-split-export-declaration-7.8.3"
+      sources."@babel/helpers-7.8.4"
+      sources."@babel/highlight-7.8.3"
+      sources."@babel/parser-7.8.8"
+      sources."@babel/template-7.8.6"
+      sources."@babel/traverse-7.8.6"
+      sources."@babel/types-7.8.7"
+      sources."@mrmlnc/readdir-enhanced-2.2.1"
+      sources."@nodelib/fs.stat-1.1.3"
+      sources."@types/events-3.0.0"
+      sources."@types/glob-7.1.1"
+      sources."@types/minimatch-3.0.3"
+      sources."@types/node-13.9.1"
+      sources."@types/unist-2.0.3"
+      sources."@types/vfile-3.0.2"
+      sources."@types/vfile-message-2.0.0"
+      sources."ajv-6.12.0"
+      sources."ansi-regex-5.0.0"
+      sources."ansi-styles-3.2.1"
+      sources."argparse-1.0.10"
+      sources."arr-diff-4.0.0"
+      sources."arr-flatten-1.1.0"
+      sources."arr-union-3.1.0"
+      sources."array-find-index-1.0.2"
+      (sources."array-to-error-1.1.1" // {
+        dependencies = [
+          sources."array-to-sentence-1.1.0"
+        ];
+      })
+      sources."array-to-sentence-2.0.0"
+      sources."array-union-1.0.2"
+      sources."array-uniq-1.0.3"
+      sources."array-unique-0.3.2"
+      sources."arrify-1.0.1"
+      sources."assign-symbols-1.0.0"
+      sources."astral-regex-1.0.0"
+      sources."atob-2.1.2"
+      (sources."autoprefixer-9.7.4" // {
+        dependencies = [
+          sources."postcss-value-parser-4.0.3"
+        ];
+      })
+      sources."bail-1.0.5"
+      sources."balanced-match-1.0.0"
+      (sources."base-0.11.2" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+        ];
+      })
+      sources."brace-expansion-1.1.11"
+      (sources."braces-2.3.2" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
+      sources."browserslist-4.9.1"
+      sources."cache-base-1.0.1"
+      sources."call-me-maybe-1.0.1"
+      sources."caller-callsite-2.0.0"
+      sources."caller-path-2.0.0"
+      sources."callsites-2.0.0"
+      sources."camelcase-4.1.0"
+      sources."camelcase-keys-4.2.0"
+      sources."caniuse-lite-1.0.30001035"
+      sources."ccount-1.0.5"
+      sources."chalk-2.4.2"
+      sources."character-entities-1.2.4"
+      sources."character-entities-html4-1.1.4"
+      sources."character-entities-legacy-1.1.4"
+      sources."character-reference-invalid-1.1.4"
+      (sources."class-utils-0.3.6" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      sources."clone-regexp-2.2.0"
+      sources."collapse-white-space-1.0.6"
+      sources."collection-visit-1.0.0"
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
+      sources."component-emitter-1.3.0"
+      sources."concat-map-0.0.1"
+      (sources."convert-source-map-1.7.0" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
+      sources."copy-descriptor-0.1.1"
+      sources."cosmiconfig-5.2.1"
+      sources."currently-unhandled-0.4.1"
+      sources."debug-4.1.1"
+      sources."decamelize-1.2.0"
+      (sources."decamelize-keys-1.1.0" // {
+        dependencies = [
+          sources."map-obj-1.0.1"
+        ];
+      })
+      sources."decode-uri-component-0.2.0"
+      sources."define-property-2.0.2"
+      sources."dir-glob-2.2.2"
+      (sources."dom-serializer-0.2.2" // {
+        dependencies = [
+          sources."domelementtype-2.0.1"
+          sources."entities-2.0.0"
+        ];
+      })
+      sources."domelementtype-1.3.1"
+      sources."domhandler-2.4.2"
+      sources."domutils-1.7.0"
+      sources."dot-prop-5.2.0"
+      sources."electron-to-chromium-1.3.376"
+      sources."emoji-regex-8.0.0"
+      sources."entities-1.1.2"
+      sources."error-ex-1.3.2"
+      sources."escape-string-regexp-1.0.5"
+      sources."esprima-4.0.1"
+      sources."esutils-2.0.3"
+      sources."execall-2.0.0"
+      (sources."expand-brackets-2.1.4" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+          sources."ms-2.0.0"
+        ];
+      })
+      sources."extend-3.0.2"
+      (sources."extend-shallow-3.0.2" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
+      (sources."extglob-2.0.4" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."extend-shallow-2.0.1"
+        ];
+      })
+      sources."fast-deep-equal-3.1.1"
+      (sources."fast-glob-2.2.7" // {
+        dependencies = [
+          sources."micromatch-3.1.10"
+        ];
+      })
+      sources."fast-json-stable-stringify-2.1.0"
+      sources."file-entry-cache-5.0.1"
+      (sources."fill-range-4.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
+      sources."find-up-2.1.0"
+      sources."flat-cache-2.0.1"
+      sources."flatted-2.0.1"
+      sources."for-in-1.0.2"
+      sources."fragment-cache-0.2.1"
+      sources."fs.realpath-1.0.0"
+      sources."gensync-1.0.0-beta.1"
+      sources."get-stdin-7.0.0"
+      sources."get-value-2.0.6"
+      sources."glob-7.1.6"
+      (sources."glob-parent-3.1.0" // {
+        dependencies = [
+          sources."is-glob-3.1.0"
+        ];
+      })
+      sources."glob-to-regexp-0.3.0"
+      sources."global-modules-2.0.0"
+      sources."global-prefix-3.0.0"
+      sources."globals-11.12.0"
+      (sources."globby-9.2.0" // {
+        dependencies = [
+          sources."ignore-4.0.6"
+          sources."slash-2.0.0"
+        ];
+      })
+      sources."globjoin-0.1.4"
+      (sources."gonzales-pe-4.2.4" // {
+        dependencies = [
+          sources."minimist-1.1.3"
+        ];
+      })
+      sources."graceful-fs-4.2.3"
+      sources."has-flag-3.0.0"
+      sources."has-value-1.0.0"
+      (sources."has-values-1.0.0" // {
+        dependencies = [
+          sources."kind-of-4.0.0"
+        ];
+      })
+      sources."hosted-git-info-2.8.8"
+      sources."html-tags-3.1.0"
+      sources."htmlparser2-3.10.1"
+      sources."ignore-5.1.4"
+      (sources."import-fresh-2.0.0" // {
+        dependencies = [
+          sources."resolve-from-3.0.0"
+        ];
+      })
+      sources."import-lazy-4.0.0"
+      sources."imurmurhash-0.1.4"
+      sources."indent-string-3.2.0"
+      sources."indexes-of-1.0.1"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
+      sources."ini-1.3.5"
+      sources."inspect-with-kind-1.0.5"
+      sources."is-accessor-descriptor-1.0.0"
+      sources."is-alphabetical-1.0.4"
+      sources."is-alphanumeric-1.0.0"
+      sources."is-alphanumerical-1.0.4"
+      sources."is-arrayish-0.2.1"
+      sources."is-buffer-1.1.6"
+      sources."is-data-descriptor-1.0.0"
+      sources."is-decimal-1.0.4"
+      sources."is-descriptor-1.0.2"
+      sources."is-directory-0.3.1"
+      sources."is-extendable-0.1.1"
+      sources."is-extglob-2.1.1"
+      sources."is-fullwidth-code-point-3.0.0"
+      sources."is-glob-4.0.1"
+      sources."is-hexadecimal-1.0.4"
+      (sources."is-number-3.0.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."is-obj-2.0.0"
+      sources."is-plain-obj-1.1.0"
+      sources."is-plain-object-2.0.4"
+      sources."is-regexp-2.1.0"
+      sources."is-whitespace-character-1.0.4"
+      sources."is-windows-1.0.2"
+      sources."is-word-character-1.0.4"
+      sources."isarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."isobject-3.0.1"
+      sources."js-tokens-4.0.0"
+      sources."js-yaml-3.13.1"
+      sources."jsesc-2.5.2"
+      sources."json-parse-better-errors-1.0.2"
+      sources."json-schema-traverse-0.4.1"
+      (sources."json5-2.1.1" // {
+        dependencies = [
+          sources."minimist-1.2.5"
+        ];
+      })
+      sources."kind-of-6.0.3"
+      sources."known-css-properties-0.14.0"
+      sources."leven-3.1.0"
+      (sources."load-json-file-4.0.0" // {
+        dependencies = [
+          sources."pify-3.0.0"
+        ];
+      })
+      sources."locate-path-2.0.0"
+      sources."lodash-4.17.15"
+      sources."log-symbols-3.0.0"
+      sources."longest-streak-2.0.4"
+      sources."loud-rejection-1.6.0"
+      sources."map-cache-0.2.2"
+      sources."map-obj-2.0.0"
+      sources."map-visit-1.0.0"
+      sources."markdown-escapes-1.0.4"
+      sources."markdown-table-1.1.3"
+      sources."mathml-tag-names-2.1.3"
+      sources."mdast-util-compact-1.0.4"
+      sources."meow-5.0.0"
+      sources."merge2-1.3.0"
+      (sources."micromatch-4.0.2" // {
+        dependencies = [
+          sources."braces-3.0.2"
+          sources."fill-range-7.0.1"
+          sources."is-number-7.0.0"
+          sources."to-regex-range-5.0.1"
+        ];
+      })
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."minimist-options-3.0.2"
+      (sources."mixin-deep-1.3.2" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
+      sources."mkdirp-0.5.1"
+      sources."ms-2.1.2"
+      sources."nanomatch-1.2.13"
+      sources."node-releases-1.1.52"
+      (sources."normalize-package-data-2.5.0" // {
+        dependencies = [
+          sources."semver-5.7.1"
+        ];
+      })
+      sources."normalize-range-0.1.2"
+      sources."normalize-selector-0.2.0"
+      sources."num2fraction-1.2.2"
+      (sources."object-copy-0.1.0" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-data-descriptor-0.1.4"
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."object-visit-1.0.1"
+      sources."object.pick-1.3.0"
+      sources."once-1.4.0"
+      sources."p-limit-1.3.0"
+      sources."p-locate-2.0.0"
+      sources."p-try-1.0.0"
+      sources."parse-entities-1.2.2"
+      sources."parse-json-4.0.0"
+      sources."pascalcase-0.1.1"
+      sources."path-dirname-1.0.2"
+      sources."path-exists-3.0.0"
+      sources."path-is-absolute-1.0.1"
+      sources."path-parse-1.0.6"
+      (sources."path-type-3.0.0" // {
+        dependencies = [
+          sources."pify-3.0.0"
+        ];
+      })
+      sources."picomatch-2.2.1"
+      sources."pify-4.0.1"
+      sources."posix-character-classes-0.1.1"
+      (sources."postcss-7.0.27" // {
+        dependencies = [
+          sources."source-map-0.6.1"
+          sources."supports-color-6.1.0"
+        ];
+      })
+      sources."postcss-html-0.36.0"
+      sources."postcss-jsx-0.36.4"
+      sources."postcss-less-3.1.4"
+      sources."postcss-markdown-0.36.0"
+      sources."postcss-media-query-parser-0.2.3"
+      (sources."postcss-reporter-6.0.1" // {
+        dependencies = [
+          sources."log-symbols-2.2.0"
+        ];
+      })
+      sources."postcss-resolve-nested-selector-0.1.1"
+      sources."postcss-safe-parser-4.0.2"
+      sources."postcss-sass-0.3.5"
+      sources."postcss-scss-2.0.0"
+      sources."postcss-selector-parser-3.1.2"
+      sources."postcss-syntax-0.36.2"
+      sources."postcss-value-parser-3.3.1"
+      sources."punycode-2.1.1"
+      sources."quick-lru-1.1.0"
+      sources."read-pkg-3.0.0"
+      sources."read-pkg-up-3.0.0"
+      sources."readable-stream-3.6.0"
+      sources."redent-2.0.0"
+      sources."regex-not-1.0.2"
+      sources."remark-10.0.1"
+      sources."remark-parse-6.0.3"
+      sources."remark-stringify-6.0.4"
+      sources."repeat-element-1.1.3"
+      sources."repeat-string-1.6.1"
+      sources."replace-ext-1.0.0"
+      sources."resolve-1.15.1"
+      sources."resolve-from-5.0.0"
+      sources."resolve-url-0.2.1"
+      sources."ret-0.1.15"
+      sources."rimraf-2.6.3"
+      sources."safe-buffer-5.2.0"
+      sources."safe-regex-1.1.0"
+      sources."semver-6.3.0"
+      (sources."set-value-2.0.1" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
+      sources."signal-exit-3.0.2"
+      sources."slash-3.0.0"
+      (sources."slice-ansi-2.1.0" // {
+        dependencies = [
+          sources."is-fullwidth-code-point-2.0.0"
+        ];
+      })
+      (sources."snapdragon-0.8.2" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+          sources."ms-2.0.0"
+        ];
+      })
+      (sources."snapdragon-node-2.1.1" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+        ];
+      })
+      (sources."snapdragon-util-3.0.1" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."source-map-0.5.7"
+      sources."source-map-resolve-0.5.3"
+      sources."source-map-url-0.4.0"
+      sources."spdx-correct-3.1.0"
+      sources."spdx-exceptions-2.2.0"
+      sources."spdx-expression-parse-3.0.0"
+      sources."spdx-license-ids-3.0.5"
+      sources."specificity-0.4.1"
+      sources."split-string-3.1.0"
+      sources."sprintf-js-1.0.3"
+      sources."state-toggle-1.0.3"
+      (sources."static-extend-0.1.2" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      (sources."string-width-4.2.0" // {
+        dependencies = [
+          sources."strip-ansi-6.0.0"
+        ];
+      })
+      sources."string_decoder-1.3.0"
+      sources."stringify-entities-1.3.2"
+      (sources."strip-ansi-5.2.0" // {
+        dependencies = [
+          sources."ansi-regex-4.1.0"
+        ];
+      })
+      sources."strip-bom-3.0.0"
+      sources."strip-indent-2.0.0"
+      sources."style-search-0.1.0"
+      sources."stylelint-10.1.0"
+      sources."stylelint-vscode-7.0.0-21"
+      sources."stylelint-warning-to-vscode-diagnostic-1.0.1"
+      sources."sugarss-2.0.0"
+      sources."supports-color-5.5.0"
+      sources."svg-tags-1.0.0"
+      (sources."table-5.4.6" // {
+        dependencies = [
+          sources."emoji-regex-7.0.3"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."string-width-3.1.0"
+        ];
+      })
+      sources."to-fast-properties-2.0.0"
+      (sources."to-object-path-0.3.0" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."to-regex-3.0.2"
+      sources."to-regex-range-2.1.1"
+      sources."trim-0.0.1"
+      sources."trim-newlines-2.0.0"
+      sources."trim-trailing-lines-1.1.3"
+      sources."trough-1.0.5"
+      sources."unherit-1.1.3"
+      sources."unified-7.1.0"
+      sources."union-value-1.0.1"
+      sources."uniq-1.0.1"
+      sources."unist-util-find-all-after-1.0.5"
+      sources."unist-util-is-3.0.0"
+      sources."unist-util-remove-position-1.1.4"
+      sources."unist-util-stringify-position-2.0.3"
+      sources."unist-util-visit-1.4.1"
+      sources."unist-util-visit-parents-2.1.2"
+      (sources."unset-value-1.0.0" // {
+        dependencies = [
+          (sources."has-value-0.3.1" // {
+            dependencies = [
+              sources."isobject-2.1.0"
+            ];
+          })
+          sources."has-values-0.1.4"
+        ];
+      })
+      sources."uri-js-4.2.2"
+      sources."urix-0.1.0"
+      sources."use-3.1.1"
+      sources."util-deprecate-1.0.2"
+      sources."validate-npm-package-license-3.0.4"
+      (sources."vfile-3.0.1" // {
+        dependencies = [
+          sources."is-buffer-2.0.4"
+          sources."unist-util-stringify-position-1.1.2"
+          sources."vfile-message-1.1.1"
+        ];
+      })
+      sources."vfile-location-2.0.6"
+      sources."vfile-message-2.0.3"
+      sources."vscode-jsonrpc-4.0.0"
+      sources."vscode-languageserver-5.2.1"
+      (sources."vscode-languageserver-protocol-3.14.1" // {
+        dependencies = [
+          sources."vscode-languageserver-types-3.14.0"
+        ];
+      })
+      sources."vscode-languageserver-types-3.15.1"
+      sources."vscode-uri-1.0.8"
+      sources."which-1.3.1"
+      sources."wrappy-1.0.2"
+      sources."write-1.0.3"
+      sources."x-is-string-0.1.0"
+      sources."xtend-4.0.2"
+      sources."yargs-parser-10.1.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "stylelint extension for coc.nvim";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-tabnine = nodeEnv.buildNodePackage {
+    name = "coc-tabnine";
+    packageName = "coc-tabnine";
+    version = "1.2.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-tabnine/-/coc-tabnine-1.2.2.tgz";
+      sha512 = "uxhcuQyjCmXse9ERkvyKpo7mEqC8wKGwREzbyFW92KAb+fB4YRBzmhrs7ws50cxSsYb6NPkfPrGsWqP4i0yEjg==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "tabnine extension for coc.nvim";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-tslint = nodeEnv.buildNodePackage {
+    name = "coc-tslint";
+    packageName = "coc-tslint";
+    version = "1.0.17";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-tslint/-/coc-tslint-1.0.17.tgz";
+      sha512 = "5Zxv2Adtb6Mlpv2YdKErhf8ntxiBl1UyrbEqo7gR9nFIAfi3o0Ue6TJTpZfOhQViFQxLjJAS65IQVRaNlbhkxw==";
+    };
+    dependencies = [
+      sources."@babel/code-frame-7.8.3"
+      sources."@babel/highlight-7.8.3"
+      sources."ansi-styles-3.2.1"
+      sources."argparse-1.0.10"
+      sources."balanced-match-1.0.0"
+      sources."brace-expansion-1.1.11"
+      sources."builtin-modules-1.1.1"
+      sources."chalk-2.4.2"
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
+      sources."commander-2.20.3"
+      sources."concat-map-0.0.1"
+      sources."diff-4.0.2"
+      sources."escape-string-regexp-1.0.5"
+      sources."esprima-4.0.1"
+      sources."esutils-2.0.3"
+      sources."fs.realpath-1.0.0"
+      sources."glob-7.1.6"
+      sources."has-flag-3.0.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
+      sources."js-tokens-4.0.0"
+      sources."js-yaml-3.13.1"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.8"
+      sources."mkdirp-0.5.1"
+      sources."once-1.4.0"
+      sources."path-is-absolute-1.0.1"
+      sources."path-parse-1.0.6"
+      sources."resolve-1.15.1"
+      sources."semver-5.7.1"
+      sources."sprintf-js-1.0.3"
+      sources."supports-color-5.5.0"
+      sources."tslib-1.11.1"
+      sources."tslint-5.20.1"
+      sources."tsutils-2.29.0"
+      sources."typescript-3.8.3"
+      sources."wrappy-1.0.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "tslint extension for coc.nvim";
+      homepage = "https://github.com/neoclide/coc-tslint#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-tslint-plugin = nodeEnv.buildNodePackage {
+    name = "coc-tslint-plugin";
+    packageName = "coc-tslint-plugin";
+    version = "1.1.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-tslint-plugin/-/coc-tslint-plugin-1.1.1.tgz";
+      sha512 = "eU3YvpRXEGavuzrPSBsmTnFAh/z3ty6ybSn6o762YNKxwGgF88fCpziIZxmsUDE4tsH+dNzrQCX9je9MqR6K6A==";
+    };
+    dependencies = [
+      sources."balanced-match-1.0.0"
+      sources."brace-expansion-1.1.11"
+      sources."concat-map-0.0.1"
+      sources."get-caller-file-1.0.3"
+      sources."minimatch-3.0.4"
+      sources."mock-require-3.0.3"
+      sources."normalize-path-2.1.1"
+      sources."remove-trailing-separator-1.1.0"
+      sources."typescript-tslint-plugin-0.5.4"
+      sources."vscode-jsonrpc-4.0.0"
+      sources."vscode-languageserver-5.2.1"
+      sources."vscode-languageserver-protocol-3.14.1"
+      sources."vscode-languageserver-types-3.14.0"
+      sources."vscode-uri-1.0.8"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "TSLint extension for coc.nvim as tsserver plugin";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-tsserver = nodeEnv.buildNodePackage {
+    name = "coc-tsserver";
+    packageName = "coc-tsserver";
+    version = "1.4.11";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.4.11.tgz";
+      sha512 = "BMqtvulotRQwgQ/UkpGDz7b+tXXQGbxYJLo3SdmFeDeVkWLBGl/oP1ythlT3aY5K3kuCv0JnDgqpoAc175CERg==";
+    };
+    dependencies = [
+      sources."typescript-3.7.3"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "tsserver extension for coc.nvim";
+      homepage = "https://github.com/neoclide/coc-tsserver#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-vetur = nodeEnv.buildNodePackage {
+    name = "coc-vetur";
+    packageName = "coc-vetur";
+    version = "1.1.7";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.1.7.tgz";
+      sha512 = "QhVgqvOAMR/ehil8o+FezjRO6D0j8t/f5Uhn3bBY4dkAoJ0LbYHz+YNT+N0JPRYVgAJQFfRjHVdymWXRuf16wA==";
+    };
+    dependencies = [
+      sources."@babel/code-frame-7.8.3"
+      sources."@babel/highlight-7.8.3"
+      sources."@emmetio/extract-abbreviation-0.1.6"
+      sources."@mrmlnc/readdir-enhanced-2.2.1"
+      sources."@nodelib/fs.stat-1.1.3"
+      sources."@starptech/expression-parser-0.9.0"
+      sources."@starptech/hast-util-from-webparser-0.9.0"
+      sources."@starptech/prettyhtml-0.9.0"
+      sources."@starptech/prettyhtml-formatter-0.9.0"
+      sources."@starptech/prettyhtml-hast-to-html-0.9.0"
+      sources."@starptech/prettyhtml-hastscript-0.9.0"
+      sources."@starptech/prettyhtml-sort-attributes-0.9.0"
+      sources."@starptech/rehype-minify-whitespace-0.9.0"
+      sources."@starptech/rehype-webparser-0.9.0"
+      sources."@starptech/webparser-0.9.0"
+      sources."@types/node-13.9.1"
+      sources."@types/unist-2.0.3"
+      sources."@types/vfile-3.0.2"
+      sources."@types/vfile-message-2.0.0"
+      sources."abbrev-1.1.1"
+      sources."acorn-6.4.1"
+      sources."acorn-jsx-5.2.0"
+      sources."ajv-6.12.0"
+      sources."ajv-keywords-2.1.1"
+      sources."ansi-align-2.0.0"
+      sources."ansi-escapes-3.2.0"
+      sources."ansi-regex-3.0.0"
+      sources."ansi-styles-3.2.1"
+      (sources."anymatch-1.3.2" // {
+        dependencies = [
+          sources."arr-diff-2.0.0"
+          sources."array-unique-0.2.1"
+          sources."braces-1.8.5"
+          sources."expand-brackets-0.1.5"
+          sources."extglob-0.3.2"
+          sources."is-buffer-1.1.6"
+          sources."is-extglob-1.0.0"
+          sources."is-glob-2.0.1"
+          sources."kind-of-3.2.2"
+          sources."micromatch-2.3.11"
+        ];
+      })
+      sources."argparse-1.0.10"
+      sources."arr-diff-4.0.0"
+      sources."arr-flatten-1.1.0"
+      sources."arr-union-3.1.0"
+      sources."array-find-index-1.0.2"
+      sources."array-iterate-1.1.4"
+      sources."array-union-1.0.2"
+      sources."array-uniq-1.0.3"
+      sources."array-unique-0.3.2"
+      sources."arrify-1.0.1"
+      sources."assign-symbols-1.0.0"
+      sources."astral-regex-1.0.0"
+      sources."async-1.5.2"
+      sources."async-each-1.0.3"
+      sources."atob-2.1.2"
+      (sources."babel-code-frame-6.26.0" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+          sources."ansi-styles-2.2.1"
+          sources."chalk-1.1.3"
+          sources."js-tokens-3.0.2"
+          sources."strip-ansi-3.0.1"
+          sources."supports-color-2.0.0"
+        ];
+      })
+      sources."babel-runtime-6.26.0"
+      sources."bail-1.0.5"
+      sources."balanced-match-1.0.0"
+      (sources."base-0.11.2" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+        ];
+      })
+      sources."binary-extensions-1.13.1"
+      sources."bindings-1.5.0"
+      sources."bootstrap-vue-helper-json-1.1.1"
+      sources."boxen-1.3.0"
+      sources."brace-expansion-1.1.11"
+      (sources."braces-2.3.2" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
+      sources."buefy-helper-json-1.0.3"
+      sources."buffer-from-1.1.1"
+      sources."builtin-modules-1.1.1"
+      sources."cache-base-1.0.1"
+      sources."call-me-maybe-1.0.1"
+      (sources."caller-path-0.1.0" // {
+        dependencies = [
+          sources."callsites-0.2.0"
+        ];
+      })
+      sources."callsites-3.1.0"
+      sources."camelcase-4.1.0"
+      sources."camelcase-keys-4.2.0"
+      sources."capture-stack-trace-1.0.1"
+      sources."ccount-1.0.5"
+      sources."chalk-2.4.2"
+      sources."character-entities-1.2.4"
+      sources."character-entities-html4-1.1.4"
+      sources."character-entities-legacy-1.1.4"
+      sources."character-reference-invalid-1.1.4"
+      sources."chardet-0.7.0"
+      (sources."chokidar-1.5.2" // {
+        dependencies = [
+          sources."glob-parent-2.0.0"
+          sources."is-extglob-1.0.0"
+          sources."is-glob-2.0.1"
+        ];
+      })
+      sources."ci-info-1.6.0"
+      sources."circular-json-0.3.3"
+      (sources."class-utils-0.3.6" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-buffer-1.1.6"
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      sources."cli-boxes-1.0.0"
+      sources."cli-cursor-2.1.0"
+      sources."cli-width-2.2.0"
+      sources."cliui-4.1.0"
+      sources."clone-1.0.4"
+      sources."co-4.6.0"
+      sources."code-point-at-1.1.0"
+      sources."collapse-white-space-1.0.6"
+      sources."collection-visit-1.0.0"
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
+      (sources."columnify-1.5.4" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+          sources."strip-ansi-3.0.1"
+        ];
+      })
+      sources."comma-separated-tokens-1.0.8"
+      sources."commander-2.20.3"
+      sources."common-tags-1.8.0"
+      sources."component-emitter-1.3.0"
+      sources."concat-map-0.0.1"
+      sources."concat-stream-1.6.2"
+      sources."config-chain-1.1.12"
+      sources."configstore-3.1.2"
+      sources."copy-descriptor-0.1.1"
+      sources."core-js-2.6.11"
+      sources."core-util-is-1.0.2"
+      sources."create-error-class-3.0.2"
+      sources."cross-spawn-5.1.0"
+      sources."crypto-random-string-1.0.0"
+      (sources."css-2.2.4" // {
+        dependencies = [
+          sources."source-map-0.6.1"
+        ];
+      })
+      sources."css-parse-2.0.0"
+      sources."currently-unhandled-0.4.1"
+      sources."debug-3.2.6"
+      sources."decamelize-1.2.0"
+      (sources."decamelize-keys-1.1.0" // {
+        dependencies = [
+          sources."map-obj-1.0.1"
+        ];
+      })
+      sources."decode-uri-component-0.2.0"
+      sources."deep-extend-0.6.0"
+      sources."deep-is-0.1.3"
+      sources."defaults-1.0.3"
+      sources."define-property-2.0.2"
+      sources."diff-4.0.2"
+      sources."dir-glob-2.0.0"
+      sources."dlv-1.1.3"
+      sources."doctrine-3.0.0"
+      sources."dot-prop-4.2.0"
+      sources."duplexer3-0.1.4"
+      sources."editorconfig-0.15.3"
+      sources."element-helper-json-2.0.6"
+      sources."emoji-regex-7.0.3"
+      sources."end-of-stream-1.4.4"
+      sources."error-ex-1.3.2"
+      sources."escape-string-regexp-1.0.5"
+      (sources."eslint-5.16.0" // {
+        dependencies = [
+          sources."cross-spawn-6.0.5"
+          sources."debug-4.1.1"
+          sources."ignore-4.0.6"
+        ];
+      })
+      (sources."eslint-plugin-vue-5.2.3" // {
+        dependencies = [
+          sources."debug-4.1.1"
+          sources."espree-4.1.0"
+          sources."vue-eslint-parser-5.0.0"
+        ];
+      })
+      sources."eslint-scope-4.0.3"
+      sources."eslint-utils-1.4.3"
+      sources."eslint-visitor-keys-1.1.0"
+      sources."espree-5.0.1"
+      sources."esprima-4.0.1"
+      sources."esquery-1.1.0"
+      sources."esrecurse-4.2.1"
+      sources."estraverse-4.3.0"
+      sources."esutils-2.0.3"
+      sources."execa-0.7.0"
+      (sources."expand-brackets-2.1.4" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-buffer-1.1.6"
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+          sources."ms-2.0.0"
+        ];
+      })
+      (sources."expand-range-1.8.2" // {
+        dependencies = [
+          sources."fill-range-2.2.4"
+          sources."is-buffer-1.1.6"
+          sources."is-number-2.1.0"
+          sources."isobject-2.1.0"
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."extend-3.0.2"
+      (sources."extend-shallow-3.0.2" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
+      sources."external-editor-3.1.0"
+      (sources."extglob-2.0.4" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."extend-shallow-2.0.1"
+        ];
+      })
+      sources."fast-deep-equal-3.1.1"
+      sources."fast-glob-2.2.7"
+      sources."fast-json-stable-stringify-2.1.0"
+      sources."fast-levenshtein-2.0.6"
+      sources."fault-1.0.4"
+      sources."figures-2.0.0"
+      sources."file-entry-cache-5.0.1"
+      sources."file-uri-to-path-1.0.0"
+      sources."filename-regex-2.0.1"
+      (sources."fill-range-4.0.0" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
+      sources."find-up-2.1.0"
+      sources."flat-cache-2.0.1"
+      sources."flatted-2.0.1"
+      sources."fn-name-2.0.1"
+      sources."for-in-1.0.2"
+      sources."for-own-0.1.5"
+      sources."format-0.2.2"
+      sources."fragment-cache-0.2.1"
+      sources."fs.realpath-1.0.0"
+      sources."fsevents-1.2.11"
+      sources."function-bind-1.1.1"
+      sources."functional-red-black-tree-1.0.1"
+      sources."get-caller-file-1.0.3"
+      sources."get-stream-3.0.0"
+      sources."get-value-2.0.6"
+      sources."glob-7.1.6"
+      (sources."glob-base-0.3.0" // {
+        dependencies = [
+          sources."glob-parent-2.0.0"
+          sources."is-extglob-1.0.0"
+          sources."is-glob-2.0.1"
+        ];
+      })
+      (sources."glob-parent-3.1.0" // {
+        dependencies = [
+          sources."is-glob-3.1.0"
+        ];
+      })
+      sources."glob-to-regexp-0.3.0"
+      sources."global-dirs-0.1.1"
+      sources."globals-11.12.0"
+      sources."globby-8.0.2"
+      sources."got-6.7.1"
+      sources."graceful-fs-4.2.3"
+      sources."gridsome-helper-json-1.0.3"
+      sources."has-1.0.3"
+      (sources."has-ansi-2.0.0" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+        ];
+      })
+      sources."has-flag-3.0.0"
+      sources."has-value-1.0.0"
+      (sources."has-values-1.0.0" // {
+        dependencies = [
+          sources."is-buffer-1.1.6"
+          sources."kind-of-4.0.0"
+        ];
+      })
+      sources."hast-util-embedded-1.0.5"
+      sources."hast-util-has-property-1.0.4"
+      sources."hast-util-is-body-ok-link-1.0.2"
+      sources."hast-util-is-element-1.0.4"
+      sources."hast-util-parse-selector-2.2.4"
+      sources."hast-util-to-string-1.0.2"
+      sources."hast-util-whitespace-1.0.4"
+      sources."hosted-git-info-2.8.8"
+      sources."html-void-elements-1.0.5"
+      sources."html-whitespace-sensitive-tag-names-1.0.1"
+      sources."iconv-lite-0.4.24"
+      sources."ignore-3.3.10"
+      (sources."import-fresh-3.2.1" // {
+        dependencies = [
+          sources."resolve-from-4.0.0"
+        ];
+      })
+      sources."import-lazy-2.1.0"
+      sources."imurmurhash-0.1.4"
+      sources."indent-string-3.2.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
+      sources."ini-1.3.5"
+      (sources."inquirer-6.5.2" // {
+        dependencies = [
+          sources."ansi-regex-4.1.0"
+          sources."strip-ansi-5.2.0"
+        ];
+      })
+      sources."invert-kv-2.0.0"
+      sources."is-accessor-descriptor-1.0.0"
+      sources."is-alphabetical-1.0.4"
+      sources."is-alphanumerical-1.0.4"
+      sources."is-arrayish-0.2.1"
+      sources."is-binary-path-1.0.1"
+      sources."is-buffer-2.0.4"
+      sources."is-ci-1.2.1"
+      sources."is-data-descriptor-1.0.0"
+      sources."is-decimal-1.0.4"
+      sources."is-descriptor-1.0.2"
+      sources."is-dotfile-1.0.3"
+      sources."is-empty-1.2.0"
+      sources."is-equal-shallow-0.1.3"
+      sources."is-extendable-0.1.1"
+      sources."is-extglob-2.1.1"
+      sources."is-fullwidth-code-point-2.0.0"
+      sources."is-glob-4.0.1"
+      sources."is-hexadecimal-1.0.4"
+      sources."is-hidden-1.1.3"
+      sources."is-installed-globally-0.1.0"
+      sources."is-npm-1.0.0"
+      (sources."is-number-3.0.0" // {
+        dependencies = [
+          sources."is-buffer-1.1.6"
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."is-obj-1.0.1"
+      sources."is-object-1.0.1"
+      sources."is-path-inside-1.0.1"
+      sources."is-plain-obj-1.1.0"
+      sources."is-plain-object-2.0.4"
+      sources."is-posix-bracket-0.1.1"
+      sources."is-primitive-2.0.0"
+      sources."is-promise-2.1.0"
+      sources."is-redirect-1.0.0"
+      sources."is-resolvable-1.1.0"
+      sources."is-retry-allowed-1.2.0"
+      sources."is-stream-1.1.0"
+      sources."is-utf8-0.2.1"
+      sources."is-windows-1.0.2"
+      sources."isarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."isobject-3.0.1"
+      sources."js-beautify-1.10.3"
+      sources."js-tokens-4.0.0"
+      sources."js-yaml-3.13.1"
+      sources."json-parse-better-errors-1.0.2"
+      sources."json-schema-traverse-0.4.1"
+      sources."json-stable-stringify-without-jsonify-1.0.1"
+      sources."json5-2.1.1"
+      sources."jsonc-parser-1.0.3"
+      sources."kind-of-6.0.3"
+      sources."latest-version-3.1.0"
+      sources."lcid-2.0.0"
+      sources."levn-0.3.0"
+      sources."load-json-file-4.0.0"
+      sources."load-plugin-2.3.1"
+      sources."locate-path-2.0.0"
+      sources."lodash-4.17.15"
+      sources."lodash.assign-4.2.0"
+      sources."lodash.assigninwith-4.2.0"
+      sources."lodash.defaults-4.0.1"
+      sources."lodash.iteratee-4.7.0"
+      sources."lodash.merge-4.6.2"
+      sources."lodash.rest-4.0.5"
+      sources."lodash.unescape-4.0.1"
+      sources."loglevel-1.6.7"
+      (sources."loglevel-colored-level-prefix-1.0.0" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+          sources."ansi-styles-2.2.1"
+          sources."chalk-1.1.3"
+          sources."strip-ansi-3.0.1"
+          sources."supports-color-2.0.0"
+        ];
+      })
+      sources."longest-streak-1.0.0"
+      sources."loud-rejection-1.6.0"
+      sources."lowercase-keys-1.0.1"
+      sources."lru-cache-4.1.5"
+      sources."make-dir-1.3.0"
+      sources."map-age-cleaner-0.1.3"
+      sources."map-cache-0.2.2"
+      sources."map-obj-2.0.0"
+      sources."map-visit-1.0.0"
+      sources."markdown-table-0.4.0"
+      sources."math-random-1.0.4"
+      (sources."mem-4.3.0" // {
+        dependencies = [
+          sources."mimic-fn-2.1.0"
+        ];
+      })
+      (sources."meow-5.0.0" // {
+        dependencies = [
+          sources."read-pkg-up-3.0.0"
+        ];
+      })
+      sources."merge2-1.3.0"
+      sources."micromatch-3.1.10"
+      sources."mimic-fn-1.2.0"
+      sources."minimatch-3.0.4"
+      sources."minimist-1.2.5"
+      sources."minimist-options-3.0.2"
+      (sources."mixin-deep-1.3.2" // {
+        dependencies = [
+          sources."is-extendable-1.0.1"
+        ];
+      })
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      sources."mout-0.5.0"
+      sources."ms-2.1.2"
+      sources."mute-stream-0.0.7"
+      sources."nan-2.14.0"
+      sources."nanomatch-1.2.13"
+      sources."natural-compare-1.4.0"
+      sources."nice-try-1.0.5"
+      sources."nopt-4.0.3"
+      sources."normalize-package-data-2.5.0"
+      sources."normalize-path-2.1.1"
+      sources."npm-prefix-1.2.0"
+      sources."npm-run-path-2.0.2"
+      sources."number-is-nan-1.0.1"
+      sources."nuxt-helper-json-1.0.0"
+      sources."object-assign-4.1.1"
+      (sources."object-copy-0.1.0" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          sources."is-accessor-descriptor-0.1.6"
+          sources."is-buffer-1.1.6"
+          sources."is-data-descriptor-0.1.4"
+          (sources."is-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."object-visit-1.0.1"
+      sources."object.omit-2.0.1"
+      sources."object.pick-1.3.0"
+      sources."once-1.4.0"
+      sources."onetime-2.0.1"
+      sources."optionator-0.8.3"
+      sources."os-homedir-1.0.2"
+      (sources."os-locale-3.1.0" // {
+        dependencies = [
+          sources."cross-spawn-6.0.5"
+          sources."execa-1.0.0"
+          sources."get-stream-4.1.0"
+        ];
+      })
+      sources."os-tmpdir-1.0.2"
+      sources."osenv-0.1.5"
+      sources."p-defer-1.0.0"
+      sources."p-finally-1.0.0"
+      sources."p-is-promise-2.1.0"
+      sources."p-limit-1.3.0"
+      sources."p-locate-2.0.0"
+      sources."p-try-1.0.0"
+      sources."package-json-4.0.1"
+      sources."parent-module-1.0.1"
+      sources."parse-entities-1.2.2"
+      sources."parse-gitignore-1.0.1"
+      (sources."parse-glob-3.0.4" // {
+        dependencies = [
+          sources."is-extglob-1.0.0"
+          sources."is-glob-2.0.1"
+        ];
+      })
+      sources."parse-json-4.0.0"
+      sources."pascalcase-0.1.1"
+      sources."path-dirname-1.0.2"
+      sources."path-exists-3.0.0"
+      sources."path-is-absolute-1.0.1"
+      sources."path-is-inside-1.0.2"
+      sources."path-key-2.0.1"
+      sources."path-parse-1.0.6"
+      sources."path-type-3.0.0"
+      sources."pify-3.0.0"
+      sources."pinkie-2.0.4"
+      sources."pinkie-promise-2.0.1"
+      (sources."pkg-conf-1.1.3" // {
+        dependencies = [
+          sources."find-up-1.1.2"
+          sources."load-json-file-1.1.0"
+          sources."parse-json-2.2.0"
+          sources."path-exists-2.1.0"
+          sources."pify-2.3.0"
+          sources."strip-bom-2.0.0"
+        ];
+      })
+      sources."pluralize-7.0.0"
+      sources."posix-character-classes-0.1.1"
+      sources."prelude-ls-1.1.2"
+      sources."prepend-http-1.0.4"
+      sources."preserve-0.2.0"
+      sources."prettier-1.19.1"
+      (sources."prettier-eslint-8.8.2" // {
+        dependencies = [
+          sources."acorn-5.7.4"
+          (sources."acorn-jsx-3.0.1" // {
+            dependencies = [
+              sources."acorn-3.3.0"
+            ];
+          })
+          sources."ajv-5.5.2"
+          sources."chardet-0.4.2"
+          sources."doctrine-2.1.0"
+          sources."eslint-4.19.1"
+          sources."eslint-scope-3.7.3"
+          sources."espree-3.5.4"
+          sources."external-editor-2.2.0"
+          sources."fast-deep-equal-1.1.0"
+          sources."file-entry-cache-2.0.0"
+          sources."flat-cache-1.3.4"
+          sources."inquirer-3.3.0"
+          sources."json-schema-traverse-0.3.1"
+          sources."regexpp-1.1.0"
+          sources."slice-ansi-1.0.0"
+          sources."table-4.0.2"
+          sources."typescript-2.9.2"
+          sources."vue-eslint-parser-2.0.3"
+          sources."write-0.2.1"
+        ];
+      })
+      sources."prettier-tslint-0.4.2"
+      sources."pretty-format-23.6.0"
+      sources."process-nextick-args-2.0.1"
+      sources."progress-2.0.3"
+      sources."property-information-5.4.0"
+      sources."proto-list-1.2.4"
+      sources."pseudomap-1.0.2"
+      sources."pump-3.0.0"
+      sources."punycode-2.1.1"
+      sources."quick-lru-1.1.0"
+      (sources."randomatic-3.1.1" // {
+        dependencies = [
+          sources."is-number-4.0.0"
+        ];
+      })
+      sources."rc-1.2.8"
+      sources."read-pkg-3.0.0"
+      (sources."read-pkg-up-4.0.0" // {
+        dependencies = [
+          sources."find-up-3.0.0"
+          sources."locate-path-3.0.0"
+          sources."p-limit-2.2.2"
+          sources."p-locate-3.0.0"
+          sources."p-try-2.2.0"
+        ];
+      })
+      sources."readable-stream-2.3.7"
+      sources."readdirp-2.2.1"
+      sources."redent-2.0.0"
+      sources."regenerator-runtime-0.11.1"
+      sources."regex-cache-0.4.4"
+      sources."regex-not-1.0.2"
+      sources."regexpp-2.0.1"
+      sources."registry-auth-token-3.4.0"
+      sources."registry-url-3.1.0"
+      sources."rehype-sort-attribute-values-2.0.1"
+      (sources."remark-5.1.0" // {
+        dependencies = [
+          sources."unified-4.2.1"
+          sources."vfile-1.4.0"
+        ];
+      })
+      sources."remark-parse-1.1.0"
+      (sources."remark-stringify-1.1.0" // {
+        dependencies = [
+          sources."stringify-entities-1.3.2"
+        ];
+      })
+      sources."remove-trailing-separator-1.1.0"
+      sources."repeat-element-1.1.3"
+      sources."repeat-string-1.6.1"
+      sources."replace-ext-1.0.0"
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-1.0.1"
+      sources."require-relative-0.8.7"
+      (sources."require-uncached-1.0.3" // {
+        dependencies = [
+          sources."resolve-from-1.0.1"
+        ];
+      })
+      sources."resolve-1.15.1"
+      sources."resolve-from-5.0.0"
+      sources."resolve-url-0.2.1"
+      sources."restore-cursor-2.0.0"
+      sources."ret-0.1.15"
+      sources."rimraf-2.6.3"
+      sources."run-async-2.4.0"
+      sources."rx-lite-4.0.8"
+      sources."rx-lite-aggregates-4.0.8"
+      sources."rxjs-6.5.4"
+      sources."safe-buffer-5.1.2"
+      sources."safe-regex-1.1.0"
+      sources."safer-buffer-2.1.2"
+      sources."sax-1.2.4"
+      sources."semver-5.7.1"
+      sources."semver-diff-2.1.0"
+      sources."set-blocking-2.0.0"
+      (sources."set-value-2.0.1" // {
+        dependencies = [
+          sources."extend-shallow-2.0.1"
+        ];
+      })
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
+      sources."shellsubstitute-1.2.0"
+      sources."sigmund-1.0.1"
+      sources."signal-exit-3.0.2"
+      sources."slash-1.0.0"
+      sources."slice-ansi-2.1.0"
+      (sources."snapdragon-0.8.2" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."define-property-0.2.5"
+          sources."extend-shallow-2.0.1"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-buffer-1.1.6"
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+          sources."ms-2.0.0"
+        ];
+      })
+      (sources."snapdragon-node-2.1.1" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+        ];
+      })
+      (sources."snapdragon-util-3.0.1" // {
+        dependencies = [
+          sources."is-buffer-1.1.6"
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."source-map-0.5.7"
+      sources."source-map-resolve-0.5.3"
+      sources."source-map-url-0.4.0"
+      sources."space-separated-tokens-1.1.5"
+      sources."spdx-correct-3.1.0"
+      sources."spdx-exceptions-2.2.0"
+      sources."spdx-expression-parse-3.0.0"
+      sources."spdx-license-ids-3.0.5"
+      sources."split-string-3.1.0"
+      sources."sprintf-js-1.0.3"
+      sources."stampit-1.2.0"
+      (sources."static-extend-0.1.2" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-buffer-1.1.6"
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      sources."string-width-2.1.1"
+      sources."string_decoder-1.1.1"
+      sources."stringify-entities-2.0.0"
+      sources."strip-ansi-4.0.0"
+      sources."strip-bom-3.0.0"
+      sources."strip-eof-1.0.0"
+      sources."strip-indent-2.0.0"
+      sources."strip-json-comments-2.0.1"
+      (sources."stylint-1.5.9" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+          sources."ansi-styles-2.2.1"
+          sources."camelcase-3.0.0"
+          sources."chalk-1.1.3"
+          sources."cliui-3.2.0"
+          sources."find-up-1.1.2"
+          sources."glob-7.0.4"
+          sources."invert-kv-1.0.0"
+          sources."is-fullwidth-code-point-1.0.0"
+          sources."lcid-1.0.0"
+          sources."load-json-file-1.1.0"
+          sources."os-locale-1.4.0"
+          sources."parse-json-2.2.0"
+          sources."path-exists-2.1.0"
+          sources."path-is-absolute-1.0.0"
+          sources."path-type-1.1.0"
+          sources."pify-2.3.0"
+          sources."read-pkg-1.1.0"
+          sources."read-pkg-up-1.0.1"
+          sources."set-blocking-1.0.0"
+          sources."string-width-1.0.2"
+          sources."strip-ansi-3.0.1"
+          sources."strip-bom-2.0.0"
+          sources."supports-color-2.0.0"
+          sources."yargs-4.7.1"
+          sources."yargs-parser-2.4.1"
+        ];
+      })
+      (sources."stylus-0.54.7" // {
+        dependencies = [
+          sources."debug-3.1.0"
+          sources."ms-2.0.0"
+          sources."semver-6.3.0"
+          sources."source-map-0.7.3"
+        ];
+      })
+      sources."stylus-supremacy-2.14.0"
+      sources."supports-color-5.5.0"
+      sources."symbol-0.2.3"
+      (sources."table-5.4.6" // {
+        dependencies = [
+          sources."ansi-regex-4.1.0"
+          sources."string-width-3.1.0"
+          sources."strip-ansi-5.2.0"
+        ];
+      })
+      sources."term-size-1.2.0"
+      sources."text-table-0.2.0"
+      sources."through-2.3.8"
+      sources."timed-out-4.0.1"
+      sources."tmp-0.0.33"
+      (sources."to-object-path-0.3.0" // {
+        dependencies = [
+          sources."is-buffer-1.1.6"
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."to-regex-3.0.2"
+      sources."to-regex-range-2.1.1"
+      (sources."to-vfile-5.0.3" // {
+        dependencies = [
+          sources."vfile-3.0.1"
+        ];
+      })
+      sources."trim-0.0.1"
+      sources."trim-newlines-2.0.0"
+      sources."trim-trailing-lines-1.1.3"
+      sources."trough-1.0.5"
+      sources."tslib-1.11.1"
+      sources."tslint-5.20.1"
+      sources."tsutils-2.29.0"
+      sources."type-check-0.3.2"
+      sources."typedarray-0.0.6"
+      sources."typescript-3.8.3"
+      (sources."typescript-eslint-parser-16.0.1" // {
+        dependencies = [
+          sources."semver-5.5.0"
+        ];
+      })
+      sources."unherit-1.1.3"
+      (sources."unified-7.1.0" // {
+        dependencies = [
+          sources."vfile-3.0.1"
+        ];
+      })
+      (sources."unified-engine-6.0.1" // {
+        dependencies = [
+          sources."to-vfile-4.0.0"
+          sources."vfile-3.0.1"
+        ];
+      })
+      sources."union-value-1.0.1"
+      sources."unique-string-1.0.0"
+      sources."unist-util-find-1.0.1"
+      sources."unist-util-inspect-4.1.4"
+      sources."unist-util-is-2.1.3"
+      sources."unist-util-modify-children-1.1.6"
+      sources."unist-util-remove-position-1.1.4"
+      sources."unist-util-stringify-position-1.1.2"
+      sources."unist-util-visit-1.4.1"
+      (sources."unist-util-visit-parents-2.1.2" // {
+        dependencies = [
+          sources."unist-util-is-3.0.0"
+        ];
+      })
+      (sources."unset-value-1.0.0" // {
+        dependencies = [
+          (sources."has-value-0.3.1" // {
+            dependencies = [
+              sources."isobject-2.1.0"
+            ];
+          })
+          sources."has-values-0.1.4"
+        ];
+      })
+      sources."untildify-2.1.0"
+      sources."unzip-response-2.0.1"
+      sources."update-notifier-2.5.0"
+      sources."uri-js-4.2.2"
+      sources."urix-0.1.0"
+      sources."url-parse-lax-1.0.0"
+      sources."use-3.1.1"
+      sources."user-home-2.0.0"
+      sources."util-deprecate-1.0.2"
+      sources."validate-npm-package-license-3.0.4"
+      (sources."vfile-4.0.3" // {
+        dependencies = [
+          sources."unist-util-stringify-position-2.0.3"
+          sources."vfile-message-2.0.3"
+        ];
+      })
+      sources."vfile-location-2.0.6"
+      sources."vfile-message-1.1.1"
+      (sources."vfile-reporter-5.1.2" // {
+        dependencies = [
+          sources."unist-util-stringify-position-2.0.3"
+        ];
+      })
+      sources."vfile-sort-2.2.2"
+      sources."vfile-statistics-1.1.4"
+      (sources."vscode-css-languageservice-4.1.1" // {
+        dependencies = [
+          sources."vscode-uri-2.1.1"
+        ];
+      })
+      sources."vscode-emmet-helper-1.2.17"
+      sources."vscode-jsonrpc-5.0.1"
+      sources."vscode-languageserver-5.3.0-next.10"
+      sources."vscode-languageserver-protocol-3.15.3"
+      sources."vscode-languageserver-textdocument-1.0.1"
+      sources."vscode-languageserver-types-3.15.1"
+      sources."vscode-nls-4.1.1"
+      sources."vscode-textbuffer-1.0.0"
+      sources."vscode-uri-1.0.8"
+      (sources."vue-eslint-parser-6.0.5" // {
+        dependencies = [
+          sources."debug-4.1.1"
+        ];
+      })
+      sources."vue-language-server-0.0.62"
+      sources."vue-onsenui-helper-json-1.0.2"
+      sources."wcwidth-1.0.1"
+      sources."which-1.3.1"
+      sources."which-module-2.0.0"
+      sources."widest-line-2.0.1"
+      sources."window-size-0.2.0"
+      sources."word-wrap-1.2.3"
+      (sources."wrap-ansi-2.1.0" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+          sources."is-fullwidth-code-point-1.0.0"
+          sources."string-width-1.0.2"
+          sources."strip-ansi-3.0.1"
+        ];
+      })
+      sources."wrappy-1.0.2"
+      sources."write-1.0.3"
+      sources."write-file-atomic-2.4.3"
+      sources."x-is-array-0.1.0"
+      sources."x-is-string-0.1.0"
+      sources."xdg-basedir-3.0.0"
+      sources."xtend-4.0.2"
+      sources."y18n-3.2.1"
+      sources."yallist-2.1.2"
+      (sources."yargs-11.1.1" // {
+        dependencies = [
+          sources."yargs-parser-9.0.2"
+        ];
+      })
+      sources."yargs-parser-10.1.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Vue language server extension for coc.nvim using vetur";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-vimtex = nodeEnv.buildNodePackage {
+    name = "coc-vimtex";
+    packageName = "coc-vimtex";
+    version = "1.0.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-vimtex/-/coc-vimtex-1.0.2.tgz";
+      sha512 = "C1wz2WSEFEfKWdqxrGVup4hDcinswVuPY+3a47tZZ3RYO8cepRs8wzc2rDX9FYITMckAEWWS581WsRS54jTCWw==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "vimtex integration for coc.nvim";
+      homepage = "https://github.com/neoclide/coc-vimtex#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-wxml = nodeEnv.buildNodePackage {
+    name = "coc-wxml";
+    packageName = "coc-wxml";
+    version = "1.0.8";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-wxml/-/coc-wxml-1.0.8.tgz";
+      sha512 = "MN8UM7KsaBXy56dQe16ei18BZXzvQu5ReDeHUvAgfNc+8K6tnTp9fSwpG1gxe9JaukL5zYbkkl1qsQjsFBUx9w==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "wxml language server extension for coc.nvim";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-yaml = nodeEnv.buildNodePackage {
+    name = "coc-yaml";
+    packageName = "coc-yaml";
+    version = "1.0.4";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.0.4.tgz";
+      sha512 = "ChwFqLSF0C/c/LIhJR6ycOc7JZreFkGeNOol/+oPw+OFvY5Zgz8vjdDzmwXZlKwQMIuZAnDUFZOJaYUyCRJzsw==";
+    };
+    dependencies = [
+      sources."agent-base-4.3.0"
+      sources."argparse-1.0.10"
+      sources."debug-3.1.0"
+      sources."es6-promise-4.2.8"
+      sources."es6-promisify-5.0.0"
+      sources."esprima-4.0.1"
+      sources."http-proxy-agent-2.1.0"
+      sources."https-proxy-agent-2.2.4"
+      sources."js-yaml-3.13.1"
+      sources."jsonc-parser-2.2.1"
+      sources."ms-2.0.0"
+      sources."prettier-1.19.1"
+      sources."request-light-0.2.5"
+      sources."sprintf-js-1.0.3"
+      sources."vscode-json-languageservice-3.5.1"
+      sources."vscode-jsonrpc-4.0.0"
+      (sources."vscode-languageserver-5.2.1" // {
+        dependencies = [
+          sources."vscode-uri-1.0.8"
+        ];
+      })
+      (sources."vscode-languageserver-protocol-3.14.1" // {
+        dependencies = [
+          sources."vscode-languageserver-types-3.14.0"
+        ];
+      })
+      sources."vscode-languageserver-textdocument-1.0.1"
+      sources."vscode-languageserver-types-3.15.1"
+      sources."vscode-nls-4.1.1"
+      sources."vscode-uri-2.1.1"
+      sources."yaml-ast-parser-custom-tags-0.0.43"
+      sources."yaml-language-server-0.7.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "yaml extension for coc.nvim";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  coc-yank = nodeEnv.buildNodePackage {
+    name = "coc-yank";
+    packageName = "coc-yank";
+    version = "1.1.3";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/coc-yank/-/coc-yank-1.1.3.tgz";
+      sha512 = "m+hjR2e1Pc4CikJCh1u+XiyeWK7O9aBWWqk6nSkJp22wC8moIVgRa1PYbGpzKAAXem+Ts0BzVw2IRF5EES0MQg==";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Yank extension for coc.nvim";
+      homepage = "https://github.com/neoclide/coc-yank#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   coffee-script = nodeEnv.buildNodePackage {
     name = "coffee-script";
     packageName = "coffee-script";
@@ -59390,7 +62202,7 @@ in
     name = "iosevka-build-deps";
     packageName = "iosevka-build-deps";
     version = "2.3.3";
-    src = ../../data/fonts/iosevka;
+    src = ../../../pkgs/data/fonts/iosevka;
     dependencies = [
       sources."JSONStream-1.3.5"
       sources."abbrev-1.1.1"
@@ -63730,7 +66542,7 @@ in
     name = "lumo-build-deps";
     packageName = "lumo-build-deps";
     version = "1.10.1";
-    src = ../interpreters/clojurescript/lumo;
+    src = ../../../pkgs/development/interpreters/clojurescript/lumo;
     dependencies = [
       sources."@babel/code-frame-7.8.3"
       sources."@babel/compat-data-7.8.6"
@@ -82628,4 +85440,4 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-}
\ No newline at end of file
+}

From 79ee5bc8223fd20fcaf51592a3b6596a79a32b65 Mon Sep 17 00:00:00 2001
From: Silje Enge Kristensen <i.am@sil.je>
Date: Sat, 14 Mar 2020 10:52:03 +0100
Subject: [PATCH 3164/4636] vimPlugins: Update

---
 pkgs/misc/vim-plugins/generated.nix | 132 ++++++++++++++--------------
 1 file changed, 66 insertions(+), 66 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index a5ef9e6b7996..49ce75913754 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -160,12 +160,12 @@ let
 
   awesome-vim-colorschemes = buildVimPluginFrom2Nix {
     pname = "awesome-vim-colorschemes";
-    version = "2020-02-27";
+    version = "2020-03-13";
     src = fetchFromGitHub {
       owner = "rafi";
       repo = "awesome-vim-colorschemes";
-      rev = "b8bdaca805a059eed03a4f439578d373798c6d74";
-      sha256 = "1gmip6fggm5scbry9r1ggaq2fiy5xhwsj6ql24fa5jylyf1gfm26";
+      rev = "fa05cbe493224dc132eb623025e94a5e29fdcccd";
+      sha256 = "062pi6dqxg3dfbb4qw5fg9d9jh6zpbrznkg1sim2j1c8g67mlpfl";
     };
   };
 
@@ -424,12 +424,12 @@ let
 
   coc-json = buildVimPluginFrom2Nix {
     pname = "coc-json";
-    version = "2019-11-11";
+    version = "2020-03-13";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-json";
-      rev = "13c8b482662f964af89e167a438f06493f347617";
-      sha256 = "19sqv2bflr4aw8hkq9rh8r2b9llx4dbirp5755jbvd62bvizab2d";
+      rev = "33ca64c00ee5c0d759a6f537b23971476b85f8e3";
+      sha256 = "07mblxxvl95kfy0wwm5r75j6y3v8fvyh6cwiza5rg1z9dlw1xddw";
     };
   };
 
@@ -446,12 +446,12 @@ let
 
   coc-metals = buildVimPluginFrom2Nix {
     pname = "coc-metals";
-    version = "2020-03-09";
+    version = "2020-03-14";
     src = fetchFromGitHub {
       owner = "ckipp01";
       repo = "coc-metals";
-      rev = "11725273f6f5bb62836890a5df09831ac15a2f59";
-      sha256 = "16wy97jnw6i8f3nkac3abdi2sjnql4jkbb82hgd67i0lzjjvarzd";
+      rev = "5b25ccfbb628d6645a20c27dd161b0eae30cf7c8";
+      sha256 = "1l62lia82yzx9crlby71i84zp48xjfpkan14va72mg482fl7akfs";
     };
   };
 
@@ -534,12 +534,12 @@ let
 
   coc-snippets = buildVimPluginFrom2Nix {
     pname = "coc-snippets";
-    version = "2020-03-10";
+    version = "2020-03-13";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-snippets";
-      rev = "e4f36338b3fd11277f9dd8021fdbfe8b1ed85f6f";
-      sha256 = "0a3a02yj7kfnz4hgz7ylmq5zl3id4kfmp1ynnl8wc1439m5hvi84";
+      rev = "725167224850eed7e792c8fad667b1fb780d8385";
+      sha256 = "07crnlh71ycdp1p3xlkmgwq83k12kprain8yhvfzas068f8080hg";
     };
   };
 
@@ -722,12 +722,12 @@ let
 
   context_filetype-vim = buildVimPluginFrom2Nix {
     pname = "context_filetype-vim";
-    version = "2020-01-08";
+    version = "2020-03-13";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "context_filetype.vim";
-      rev = "cbe3c0069e6a13bd9bfcd9739c0770f7fd4b4ef4";
-      sha256 = "07mnch8vi7snx8jfz32hkg4v4ml2ywb8yn0jycshn317j253fbmj";
+      rev = "f200fe69939089da9e61bd9a3ff75b4ef7adc708";
+      sha256 = "06pclan83yww5qf26fmqhby8iks0rzlxgpk254vxmkihbypvpa51";
     };
   };
 
@@ -1110,12 +1110,12 @@ let
 
   deoplete-nvim = buildVimPluginFrom2Nix {
     pname = "deoplete-nvim";
-    version = "2020-03-10";
+    version = "2020-03-11";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "2538bd3d542ee6d89802ace15ab87aa783e8a1cb";
-      sha256 = "0pq6c9m64mgx7zyc9nng18w0xdyr9s36gxv1rkpd14srwgxw0ilf";
+      rev = "494fcd8f311fb394d81921b63797e963c7d642a3";
+      sha256 = "101y83y8gq81rijnsmx8z6aznxczjpm1k8iahix606jvsg7znxgf";
     };
   };
 
@@ -1333,12 +1333,12 @@ let
 
   fzf-vim = buildVimPluginFrom2Nix {
     pname = "fzf-vim";
-    version = "2020-03-11";
+    version = "2020-03-15";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
-      rev = "ed9d66c2a65333a0d49509a2d53098392683eec1";
-      sha256 = "0jb62nwfs2bv33b3rfk0pndia97wsi88rdixvarkkimdi09sa6cp";
+      rev = "d16ddcf58dd5d99671474ab9a815c5599e377f4c";
+      sha256 = "1ca0fpp55qa1gk6ljfm98042fyz9xpmk2dhqn0pd5iz93kfgn0gy";
     };
   };
 
@@ -1366,12 +1366,12 @@ let
 
   ghcid = buildVimPluginFrom2Nix {
     pname = "ghcid";
-    version = "2020-03-10";
+    version = "2020-03-15";
     src = fetchFromGitHub {
       owner = "ndmitchell";
       repo = "ghcid";
-      rev = "3c4569cd8cf93545bedeaf692c5d50ef16ca0226";
-      sha256 = "1n96c5az0ls5hd9ahvskl3f6ygss7m6hmkj3ijlsh5hwga17zrhz";
+      rev = "67a947821e3742eb1b4a2267d4d59adbf74ecb02";
+      sha256 = "05ch1mxwhjd9ln49sp8xp5f6fgc19i2a9262lfi1kny7i1zrxmg1";
     };
   };
 
@@ -1664,12 +1664,12 @@ let
 
   julia-vim = buildVimPluginFrom2Nix {
     pname = "julia-vim";
-    version = "2020-03-02";
+    version = "2020-03-11";
     src = fetchFromGitHub {
       owner = "JuliaEditorSupport";
       repo = "julia-vim";
-      rev = "1db5eed71d7f5fe4b95b0dadfb3f798983485554";
-      sha256 = "1rrmapsaly4kinq8aab2kbnpxnrpibgyrp6ri9qqyk2wdrlgq9lk";
+      rev = "8ea33c2e5c3dd5cc82b2a86a9f7c97b8219aeb9c";
+      sha256 = "0i7n5fs0a717il71yny8dsrvyyskj9cahg1wnx8nrkyn3x06myhh";
     };
   };
 
@@ -2225,12 +2225,12 @@ let
 
   nvim-gdb = buildVimPluginFrom2Nix {
     pname = "nvim-gdb";
-    version = "2020-03-03";
+    version = "2020-03-12";
     src = fetchFromGitHub {
       owner = "sakhnik";
       repo = "nvim-gdb";
-      rev = "598a7ecd75bfe4ef32a09830f133afcf7b6d3927";
-      sha256 = "1l9dljzmyxlnd6pxx7ivxlzw1sis4igqdpkm05khljvn2n6asyvp";
+      rev = "2388fd4a673ac26608c5db570950f3e4edf71ad4";
+      sha256 = "0a86l5yn120rn8kz6pfq4j9k9ix3cibysfp2d8rqjz6lndg56cmk";
     };
   };
 
@@ -2654,12 +2654,12 @@ let
 
   seoul256-vim = buildVimPluginFrom2Nix {
     pname = "seoul256-vim";
-    version = "2020-02-25";
+    version = "2020-03-14";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "seoul256.vim";
-      rev = "fb0607ff91ac3b2fb2fa226be12bec1ccef4f1e1";
-      sha256 = "1d2rsxb8ag42ba0bqj9g7ax56v36vch6x2q768q73plagiwr4jzy";
+      rev = "cfc0167e546a40eb26ec2a0a0f1c141a8c1bcaf1";
+      sha256 = "1z980hsmf6gcvd16ja67az131mrgv5fv6v0ivsh0ga8hwc4f9l6q";
     };
   };
 
@@ -2907,12 +2907,12 @@ let
 
   tcomment_vim = buildVimPluginFrom2Nix {
     pname = "tcomment_vim";
-    version = "2020-02-21";
+    version = "2020-03-15";
     src = fetchFromGitHub {
       owner = "tomtom";
       repo = "tcomment_vim";
-      rev = "20e85e8c2346bd1f60f1ef55c5e32bb54a7a22fc";
-      sha256 = "0k8w924gyrx71kifj6cdgxbzlv5v4cp9gdy5bhc53cgn9nfjgapw";
+      rev = "b9a075e36e9d8817b15e2edcdb8b6bf51a8d479c";
+      sha256 = "1vyg2n7s8981km05zpfhzcvb1adwc26l034w9w1bjil72fywdad0";
     };
   };
 
@@ -4030,12 +4030,12 @@ let
 
   vim-fugitive = buildVimPluginFrom2Nix {
     pname = "vim-fugitive";
-    version = "2020-03-10";
+    version = "2020-03-12";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "4a24804adc25f915520c57a5504c45ca70e590e6";
-      sha256 = "0rlyrljinnzp058cajchlzqr66fdnwrzznwfahj0y1wb1alfz45a";
+      rev = "9a4d730270882f9d39a411eb126143eda4d46963";
+      sha256 = "098fz3lmfysv6gr5cjwgqsdzxjxygwc0x4ak1sxj3h6djys5x66b";
     };
   };
 
@@ -4074,12 +4074,12 @@ let
 
   vim-gitgutter = buildVimPluginFrom2Nix {
     pname = "vim-gitgutter";
-    version = "2020-02-24";
+    version = "2020-03-12";
     src = fetchFromGitHub {
       owner = "airblade";
       repo = "vim-gitgutter";
-      rev = "c337eef1b735906411577f488e977be69506ef08";
-      sha256 = "10sz744djns1qn9lh7npzvnmkqbr34zgk78cag6ss45bnczqx1h7";
+      rev = "0e509fb0ac56b24203800a1fab35162c8da9c9b4";
+      sha256 = "0m1vqbgsch4vxs5y8kk03mys2qdzsfik5n0gxp1hl8a7fb3dlqsm";
     };
   };
 
@@ -4107,12 +4107,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2020-03-05";
+    version = "2020-03-15";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "52b66c0b125e095bc5a1d54d9810c5a0c8141906";
-      sha256 = "05h3yz4f3zci5pdpxbgg9kmhfh65rc8kxq7l6mpk04v92b7pq6m9";
+      rev = "14382b346ea03615bfb03115679c8a48bbf03af2";
+      sha256 = "0ni9kjqb78jf98v1xwmg6r7inm7qifpf21hnp1n2i65mvnrc4afm";
     };
   };
 
@@ -4482,12 +4482,12 @@ let
 
   vim-jsx-pretty = buildVimPluginFrom2Nix {
     pname = "vim-jsx-pretty";
-    version = "2019-12-21";
+    version = "2020-03-14";
     src = fetchFromGitHub {
       owner = "MaxMEllon";
       repo = "vim-jsx-pretty";
-      rev = "838cfce82df8cf99df5e3a200ad23f6c0f027550";
-      sha256 = "0305q9vf454h3hzkax5lpwzfwr9d573kqpsrlfsny69wgkrkvcax";
+      rev = "05f9953fcaccc18a8f5c1ee9db06ac2b26662347";
+      sha256 = "1l9rpymz6xb9x0kd8p90hyl4yjn59sf590kmi18cvr4piaqa796y";
     };
   };
 
@@ -4856,12 +4856,12 @@ let
 
   vim-pandoc = buildVimPluginFrom2Nix {
     pname = "vim-pandoc";
-    version = "2020-01-31";
+    version = "2020-03-13";
     src = fetchFromGitHub {
       owner = "vim-pandoc";
       repo = "vim-pandoc";
-      rev = "2bbb80576a62f58417e05d8600bb5647868bedf7";
-      sha256 = "0b90dfngcssjxmvmjdrlzs0xkly5dhn8rldzzmj75x7z7r1dxchl";
+      rev = "9c12affb112cf5bdbc74f6492f019dec539756ee";
+      sha256 = "199mr1b740vd4rqjkpgwx539flyaqm7bi05fknzkyxizn8180xzw";
     };
   };
 
@@ -5032,12 +5032,12 @@ let
 
   vim-ps1 = buildVimPluginFrom2Nix {
     pname = "vim-ps1";
-    version = "2020-02-28";
+    version = "2020-03-12";
     src = fetchFromGitHub {
       owner = "PProvost";
       repo = "vim-ps1";
-      rev = "7283c6bb25bbd45d8f6019da34c4f7e48c7644a3";
-      sha256 = "0gfl5b5qnbgh9kdm6kfl7xn5jdkkgw1w78ckwvw6v6y72c0mhhhq";
+      rev = "2008b24c1d740543041d1de9fa4036a35cd21e16";
+      sha256 = "0q5njcfc4zlb2z5bzr5jsmqfqnp96c83pwwayfcms8sqczj2w13v";
     };
   };
 
@@ -5516,12 +5516,12 @@ let
 
   vim-test = buildVimPluginFrom2Nix {
     pname = "vim-test";
-    version = "2020-03-10";
+    version = "2020-03-14";
     src = fetchFromGitHub {
       owner = "janko-m";
       repo = "vim-test";
-      rev = "e5c7c57a28a2ce8cba4ef6ff567d051d9f13014e";
-      sha256 = "0iqv2mirwxmv3y194j64b317v34cbzljlfw2vhl993gccirfz960";
+      rev = "2e3516833137ffcf6f291854551cfe70c17b1752";
+      sha256 = "1hfksbai45c5ql9gvm1fqdfhakm2fvas59jyf71iddsfiha5vv2k";
     };
   };
 
@@ -5934,12 +5934,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2020-03-10";
+    version = "2020-03-15";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "efa5d6e927fa47a1f48f85d34a4760a1447f2df8";
-      sha256 = "1d44ihgcdl0j942vgjg59rzib4m7jy94k583hcnv3v9z8np4g0zp";
+      rev = "51797cde25904e595da62513b818ab3abc9acd9e";
+      sha256 = "0dpcxqrv9jn7d0f2wnnqyj3069wfqg4h70qqqnlq07n4p8yj2rw1";
     };
   };
 
@@ -5978,12 +5978,12 @@ let
 
   vista-vim = buildVimPluginFrom2Nix {
     pname = "vista-vim";
-    version = "2020-03-11";
+    version = "2020-03-15";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "vista.vim";
-      rev = "7c5301d87236999a6029640ca1cf86bfecf3bc29";
-      sha256 = "1ghp69f4q365vvkq3081qhnasjgi00i3vfs97llnqachmqbwig2k";
+      rev = "a1e19503ce2f27a98fd6c03202d0651891aadecf";
+      sha256 = "19xy5qxizhpnyaqvjayxpmc5hdfixdf84g4ilhagq7isd5l4a1cs";
     };
   };
 
@@ -6100,12 +6100,12 @@ let
 
   youcompleteme = buildVimPluginFrom2Nix {
     pname = "youcompleteme";
-    version = "2020-03-10";
+    version = "2020-03-14";
     src = fetchFromGitHub {
       owner = "valloric";
       repo = "youcompleteme";
-      rev = "4dda6a71d9df17d8b44c9694bcfcdd55aac5b01d";
-      sha256 = "0h8ywblhv8dhblsxpm431fqz6cy38a77hvvc0r6fsj7vlbcx1n2s";
+      rev = "3108b9bd4408b2af891eea179108bc9704e7263d";
+      sha256 = "0913d0mixhm24mhqgf3cca3p4hglsj23f85m4n4npksiqw91swla";
       fetchSubmodules = true;
     };
   };

From 0adf77f7460625b787080fe1f762fdc5c349bf70 Mon Sep 17 00:00:00 2001
From: Silje Enge Kristensen <i.am@sil.je>
Date: Sat, 14 Mar 2020 11:10:11 +0100
Subject: [PATCH 3165/4636] vimPlugins.coc-spell-checker: init at 2020-02-19"

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 49ce75913754..1ce4cf0b7a33 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -554,6 +554,17 @@ let
     };
   };
 
+  coc-spell-checker = buildVimPluginFrom2Nix {
+    pname = "coc-spell-checker";
+    version = "2020-02-19";
+    src = fetchFromGitHub {
+      owner = "iamcco";
+      repo = "coc-spell-checker";
+      rev = "c956e288a4d0ffff85e920970776d89dc9c65099";
+      sha256 = "00xavbkdx019f6xm6bwf3xqgyvbp3sz7ddnjxfvgah97gwy0q7xs";
+    };
+  };
+
   coc-stylelint = buildVimPluginFrom2Nix {
     pname = "coc-stylelint";
     version = "2019-08-20";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 8defd658e534..874b2471d5c4 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -133,6 +133,7 @@ honza/vim-snippets
 hotwatermorning/auto-git-diff
 hsanson/vim-android
 hsitz/VimOrganizer
+iamcco/coc-spell-checker
 ianks/vim-tsx
 icymind/NeoSolarized
 idris-hackers/idris-vim

From 9dbe706576da8cc020743e4f866c4bb5cec53dc2 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 15 Mar 2020 18:02:15 +0000
Subject: [PATCH 3166/4636] elpa-packages: 2020-03-15

---
 .../editors/emacs-modes/elpa-generated.nix    | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 61275d9da4ca..aa0f625124f0 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -1070,10 +1070,10 @@
       elpaBuild {
         pname = "elisp-benchmarks";
         ename = "elisp-benchmarks";
-        version = "1.2";
+        version = "1.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.2.tar";
-          sha256 = "0grm4qw3aaf3hzrfg0vdgb5q67haappbc77qjgsy4jip85z7njmj";
+          url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.3.tar";
+          sha256 = "05a891mwbz50q3a44irbf2w4wlp5dm2yxwcvxqrckvpjm1amndmf";
         };
         packageRequires = [];
         meta = {
@@ -3365,6 +3365,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    vcard = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "vcard";
+        ename = "vcard";
+        version = "0.1";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/vcard-0.1.tar";
+          sha256 = "1awcm2s292r2nkyz5bwjaga46jsh5rn92469wrg1ag843mlyxbd0";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/vcard.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     vcl-mode = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "vcl-mode";

From ad81f84d1f070e370955ffbe87cc21ae1b41215b Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 15 Mar 2020 18:02:50 +0000
Subject: [PATCH 3167/4636] melpa-packages: 2020-03-15

---
 .../emacs-modes/recipes-archive-melpa.json    | 1181 ++++++++++-------
 1 file changed, 718 insertions(+), 463 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
index d86bc8a585b0..d1cd10180273 100644
--- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
@@ -31,20 +31,20 @@
   "url": "https://git.sr.ht/~zge/nullpointer-emacs",
   "unstable": {
    "version": [
-    20200222,
-    948
+    20200313,
+    1542
    ],
-   "commit": "265b7d65e1bc54d84435e9d79379bc808e9a488b",
-   "sha256": "1nk2kqv7blahfiihz5vdvsb1j5bji1w5w9zz3lwzrv8i7pdbh34w"
+   "commit": "1d29192a3c28ba088d93410bfcdd4bee0abb6610",
+   "sha256": "02kmfzkrl35y599w5yal5d7rjb3xi02zhvb8q0m3iw4mbm16sw28"
   },
   "stable": {
    "version": [
     0,
-    2,
-    1
+    3,
+    0
    ],
-   "commit": "ae55ae0397ff3cf28a3ea52111bfc053dffb126d",
-   "sha256": "179snc2z047afw2h5jqbwdc64vxdngjmg4zca46wap114c4alrm1"
+   "commit": "1d29192a3c28ba088d93410bfcdd4bee0abb6610",
+   "sha256": "02kmfzkrl35y599w5yal5d7rjb3xi02zhvb8q0m3iw4mbm16sw28"
   }
  },
  {
@@ -2224,14 +2224,14 @@
   "repo": "rubikitch/all-ext",
   "unstable": {
    "version": [
-    20170115,
-    205
+    20200315,
+    1443
    ],
    "deps": [
     "all"
    ],
-   "commit": "9f4ef84a147cf4e0af6ef45826d6cb3558db6b88",
-   "sha256": "0gdrsi9n9i1ibijkgk5kyjdjdmnsccfbpifpv679371glap9f68b"
+   "commit": "c865c62506af2c9edc7705a7c24dc8b70d5d4de2",
+   "sha256": "16r0ll7wsfsrymwm78gnnrfawafan9gbwiymqfmij3m9riqss7y0"
   }
  },
  {
@@ -2309,14 +2309,14 @@
   "repo": "seagle0128/all-the-icons-ibuffer",
   "unstable": {
    "version": [
-    20200301,
-    654
+    20200315,
+    1244
    ],
    "deps": [
     "all-the-icons"
    ],
-   "commit": "ee0409588ebaee1aada351f1a75abcdc999ac9e2",
-   "sha256": "0afq5wjh74ks8hrsb9m41h1m9gyc0hvp2qmy4b1ls9kffgnk7ri2"
+   "commit": "8f8a09e0443738df5c659c1d85c714fc7c111a2d",
+   "sha256": "0rpjrfprpddhp1wymwrx798x09wp6hrjl8131wgkpsnpi3bxcaz5"
   },
   "stable": {
    "version": [
@@ -2371,15 +2371,15 @@
   "repo": "seagle0128/all-the-icons-ivy-rich",
   "unstable": {
    "version": [
-    20200310,
-    1551
+    20200315,
+    1225
    ],
    "deps": [
     "all-the-icons",
     "ivy-rich"
    ],
-   "commit": "3e02da9a166df7ebea25aae476efd7b8d74d63e0",
-   "sha256": "0p91yvpqy7xjkz2mcpq6c8kjfxqfw9byxprqg2qqnzg421c5yv6x"
+   "commit": "a12e39b9f343b28a1868112eafce7661aaf883ef",
+   "sha256": "0bdwb5diplzygn768aqmayy276i9cy5qg8dam3bs3vqkmm0is4q1"
   },
   "stable": {
    "version": [
@@ -2587,6 +2587,24 @@
    "sha256": "18z9jl5d19a132k6g1dvwqfbbdh5cx66b2qxlcjsfiqxlxglc2sa"
   }
  },
+ {
+  "ename": "amread-mode",
+  "commit": "2155dbd9bdf7b1f6f500c11ad1796c2ba2ddadec",
+  "sha256": "19wafb0aszphdmx9ayiazvq2avj9kqhanszh714n397810ak7k0v",
+  "fetcher": "github",
+  "repo": "stardiviner/amread-mode",
+  "unstable": {
+   "version": [
+    20200315,
+    323
+   ],
+   "deps": [
+    "cl-lib"
+   ],
+   "commit": "b0c9ec7e8c55e89a565361712dff11dc7b74845f",
+   "sha256": "0bc2p8n5mr06w0jww3snlq15qd125c17qv5fpih3lr7n76zqfcdv"
+  }
+ },
  {
   "ename": "amx",
   "commit": "c55bfad05343b2b0f3150fd2b4adb07a1768c1c0",
@@ -2912,11 +2930,11 @@
   "repo": "bastibe/annotate.el",
   "unstable": {
    "version": [
-    20200306,
-    1547
+    20200312,
+    1352
    ],
-   "commit": "6cc6ac887220cd26b8e72f1ec95555517faf0e80",
-   "sha256": "0j2zcs9dya36k0k1sa1brdvnh537m15mmanbb3dlqqkfd7ig5ql0"
+   "commit": "b8fd76f712042c210b2139448e53d5f9923ba5f0",
+   "sha256": "179nhb2f2lq2q5pwq6l10n1cgjyr300083g7nsxn4z72la9m5gh4"
   },
   "stable": {
    "version": [
@@ -3413,6 +3431,25 @@
    "sha256": "1svicgmiibnim47fhlik3fgs0d6427and5h61s3rhvfj3352d9li"
   }
  },
+ {
+  "ename": "aqi",
+  "commit": "4218547747cdbe33aab3c59338cd2dc9da869cda",
+  "sha256": "1dzvf3i648ssavrdy4v1ckvf2gkywa3cc4zgddb8dj4ihpivm6bc",
+  "fetcher": "github",
+  "repo": "zzkt/aqi",
+  "unstable": {
+   "version": [
+    20200215,
+    1334
+   ],
+   "deps": [
+    "let-alist",
+    "request"
+   ],
+   "commit": "265ab11044b527ca70762fc5d633227001dd4da6",
+   "sha256": "09xww9vz7jjlrya8cyayh79x4inlhi6y7sdgg3xrbaxi9avflcs8"
+  }
+ },
  {
   "ename": "arc-dark-theme",
   "commit": "f8c9060669b262f0588643bd8758edac578834bc",
@@ -3899,8 +3936,8 @@
    "deps": [
     "auctex"
    ],
-   "commit": "76a786a26e1ddf4a1ef2b0067639c32e7cee9d06",
-   "sha256": "1vvvfhr52q34bv5mhhvzdwkkvcff955xkdijlrfyr8n7p9csjpim"
+   "commit": "24270d9452c0b4ae974648cdbcdbad4401f4b1b5",
+   "sha256": "0la88z6g5vf2jq0gk8qfv83mgld1i10q84vn1ihhmnd9sqv99j5s"
   },
   "stable": {
    "version": [
@@ -6914,14 +6951,14 @@
   "repo": "sergeyklay/bnf-mode",
   "unstable": {
    "version": [
-    20200301,
-    2140
+    20200313,
+    2245
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "4a7aff6a3a691826ea4add9f519c854b9611d780",
-   "sha256": "1hnkvwl0as2s4aayqahclqclsriigqv51h8yafx0za1xfh4snfzv"
+   "commit": "9c8c27e38cce6ba4d059a052ee0e0ece103e0684",
+   "sha256": "0daiv5ac7xnmprqmmc2d8gw83qyvsa8h9wnzh2ak1xs9hpar2nkw"
   },
   "stable": {
    "version": [
@@ -8938,11 +8975,11 @@
   "repo": "skk-dev/ddskk",
   "unstable": {
    "version": [
-    20151205,
-    1343
+    20200314,
+    1557
    ],
-   "commit": "183c4fd3fe5fb7cb089bbfc7437815d426d08372",
-   "sha256": "1jgvs093w0llp0nxfdzfrlk7il0wj48qhnqsn61pvnma10m93zdl"
+   "commit": "2dcd552b314bc64daa40fd7ac09937439e447548",
+   "sha256": "1scixb6s795hjmkpkljccxg8ja2lqkja905gg5lmp09vykf8x5ir"
   }
  },
  {
@@ -8988,11 +9025,11 @@
   "repo": "skk-dev/ddskk",
   "unstable": {
    "version": [
-    20200210,
-    1326
+    20200314,
+    1557
    ],
-   "commit": "183c4fd3fe5fb7cb089bbfc7437815d426d08372",
-   "sha256": "1jgvs093w0llp0nxfdzfrlk7il0wj48qhnqsn61pvnma10m93zdl"
+   "commit": "2dcd552b314bc64daa40fd7ac09937439e447548",
+   "sha256": "1scixb6s795hjmkpkljccxg8ja2lqkja905gg5lmp09vykf8x5ir"
   }
  },
  {
@@ -9126,15 +9163,15 @@
   "repo": "ema2159/centaur-tabs",
   "unstable": {
    "version": [
-    20200309,
-    16
+    20200312,
+    1817
    ],
    "deps": [
     "cl-lib",
     "powerline"
    ],
-   "commit": "af50f87d40697a4e5d6097e2042111fc4a930b40",
-   "sha256": "1c3szcv87gjlm2bndasrx9q46x699cxapmhfs2zs08yk6gc1yfji"
+   "commit": "69fc454d86eaf279b93efed7b0ee9df67c8a25a2",
+   "sha256": "1jfj6jfz74ia2sdhxy5vp4svsvvqpxlwydfcj3vc65ic7hzh39nd"
   },
   "stable": {
    "version": [
@@ -9261,8 +9298,8 @@
     20171115,
     2108
    ],
-   "commit": "b7135d2b898062aa9b1cc279062b8cbf48802d21",
-   "sha256": "1v4af4kblrq1bcfdzwqpq9inmyj83ppj5kwpnnvw6j92x0362nga"
+   "commit": "b1d6dca276e44e220be69052e7db1fc09cda6fc7",
+   "sha256": "0d5ngarandq3jagpjag7z99ma52wm6nbi46xp4zhx0m2ligq4v2m"
   },
   "stable": {
    "version": [
@@ -10203,11 +10240,11 @@
   "repo": "equwal/cl-font-lock",
   "unstable": {
    "version": [
-    20191230,
-    2341
+    20200315,
+    649
    ],
-   "commit": "fa0f762cf55d42251b23b3096ab69ed32cd97c14",
-   "sha256": "1z4kplbnld62f396lh1hggdpvhlzk5fll7lcjz0dsh96m4cmx907"
+   "commit": "9520969b67a42aa577cee2e46f16518fef248dc4",
+   "sha256": "05w6yy4jgar0p4b2715gp7armhfsbw84zyvm5c9j9qawlrjfxr1d"
   }
  },
  {
@@ -11037,8 +11074,8 @@
     20190710,
     1319
    ],
-   "commit": "c7c6e103d1209f7e29cb2909cf342be75478f304",
-   "sha256": "0p4fi9yss2n9wdlhra035spj353q047mfyab1jgswyfjfghgmiks"
+   "commit": "a6d95f57cc8934813ba273e1016d03bb190c44c0",
+   "sha256": "0m2bg4s4ldm5jmjnhgb82l3dm45pjkrsppkdh31x9clh6gvscvw5"
   },
   "stable": {
    "version": [
@@ -11046,10 +11083,10 @@
     17,
     0,
     -1,
-    2
+    3
    ],
-   "commit": "d1cb554c99c73e1486fbf4e09125337a7c0e9ea3",
-   "sha256": "07qkp3wbmpx2p3jpzxhgf5y9j6yzaxnq4krbj2d5m1hbgxxqgxz5"
+   "commit": "1ec72e09471287630cf142d8587a9b8d9abad629",
+   "sha256": "1r0cqv2vfyswzhbh1ydq6g0vkhkhyz3mwhm0irlc22sfxj2dy56y"
   }
  },
  {
@@ -11328,11 +11365,11 @@
   "repo": "defunkt/coffee-mode",
   "unstable": {
    "version": [
-    20170324,
-    940
+    20200315,
+    1133
    ],
-   "commit": "86ab8aae8662e8eff54d3013010b9c693b16eac5",
-   "sha256": "0hf06wp6cpsm7fivwkph6xvc2r39xww8q3aibp4nprlrwcmmv2al"
+   "commit": "35a41c7d8233eac0b267d9593e67fb8b6235e134",
+   "sha256": "11jppi95j9229qmj1747kfa602640kjz1xf5254ph3nhljxb0nsv"
   },
   "stable": {
    "version": [
@@ -11499,11 +11536,11 @@
   "repo": "emacs-jp/replace-colorthemes",
   "unstable": {
    "version": [
-    20161219,
-    1144
+    20200315,
+    929
    ],
-   "commit": "4f7da6f955f7c584c5dfab2dc170f9a3debd80f8",
-   "sha256": "08wmllq3smg7cp7jspmvd67z5vzmxvi136c6j87r1gsgprhgmhw4"
+   "commit": "6c25e4f29e1c75dabd350e04c190e81f7bca3cc3",
+   "sha256": "0fi0w7mjardvblqwvii9grgfzd11mjr2c35vzbq5dx01ydfib387"
   },
   "stable": {
    "version": [
@@ -12224,8 +12261,8 @@
   "repo": "cpitclaudel/company-coq",
   "unstable": {
    "version": [
-    20191025,
-    2219
+    20200130,
+    2058
    ],
    "deps": [
     "cl-lib",
@@ -12234,8 +12271,8 @@
     "dash",
     "yasnippet"
    ],
-   "commit": "6e8bc2e367e8184079b7f4b4ab359b64ab884d7c",
-   "sha256": "192vvz77yik0lx2g4yfjwx2himzzq4zhrc9mlyhdpwsmzwx7bf4r"
+   "commit": "f9dba9ddff7da99a93d8a6e26d9b1d813bc96b2f",
+   "sha256": "1hl8gr8afx2i5bia7vq3vn4shbaz8fps3h30ldvq141kfvmcp8jm"
   },
   "stable": {
    "version": [
@@ -13106,15 +13143,15 @@
   "repo": "tumashu/company-posframe",
   "unstable": {
    "version": [
-    20200225,
-    454
+    20200315,
+    815
    ],
    "deps": [
     "company",
     "posframe"
    ],
-   "commit": "483ca5225681da5fa64ecc219604dc3acbab1059",
-   "sha256": "1jid82hvhdvvgcwy7ql5dd00bd9j3wgxrim15imjb22vwsq00qj3"
+   "commit": "37a1f136f61bed4050dbeb182767c7e51cb73e1b",
+   "sha256": "09vryzs42lvwsv9sid5fqnyy8cvmpnf89kb30jjqy71ia8ijqx7l"
   },
   "stable": {
    "version": [
@@ -13212,6 +13249,38 @@
    "sha256": "08ccsfvwdpzpj0gai3xrdb2bv1nl6myjkxsc5774pbvlq9nkfdvr"
   }
  },
+ {
+  "ename": "company-quickhelp-terminal",
+  "commit": "f5fa4121cd4e2a49adfd23929c73f385cf7d1264",
+  "sha256": "13pig4bkfhwvpak78v85dzmrv7hwqd3pz4s5y8cb7xa033i1v78s",
+  "fetcher": "github",
+  "repo": "jcs-elpa/company-quickhelp-terminal",
+  "unstable": {
+   "version": [
+    20200309,
+    245
+   ],
+   "deps": [
+    "company-quickhelp",
+    "popup"
+   ],
+   "commit": "0a7c86258b3069adbeb0889e21c6977390d00f4f",
+   "sha256": "0zbzbm4hchp1a8m0bdcp9d97i0yx3kkhp5vbs0m5pr2h13xdc7vj"
+  },
+  "stable": {
+   "version": [
+    0,
+    0,
+    2
+   ],
+   "deps": [
+    "company-quickhelp",
+    "popup"
+   ],
+   "commit": "344e30202fb38e1947b8b17f403bb7b2208936fe",
+   "sha256": "1gzmx8zz93261m9kks2hdgdhfs9vz8gsdxx5xkldbnz4g1wbmh2a"
+  }
+ },
  {
   "ename": "company-racer",
   "commit": "c4671a674dbc1620a41e0ff99508892a25eec2ad",
@@ -14328,14 +14397,14 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20200311,
-    1152
+    20200314,
+    2005
    ],
    "deps": [
     "swiper"
    ],
-   "commit": "5f1d9ce04599c52818244c2cb8cb066a601610b8",
-   "sha256": "1gsyf210jq4ij5r47k5sajpjq3z0rgihz84g6y3647k12a00biap"
+   "commit": "8fae568daafdc79d4990ad739bac42ee230d3234",
+   "sha256": "18ppxzafz9f8dn7wwdb9vab3c91n20csvn9kjr3djkjgngz6qjd1"
   },
   "stable": {
    "version": [
@@ -14710,14 +14779,14 @@
   "repo": "Lautaro-Garcia/counsel-spotify",
   "unstable": {
    "version": [
-    20200119,
-    1340
+    20200315,
+    156
    ],
    "deps": [
     "ivy"
    ],
-   "commit": "d70bdd7e92a138195234e0c002252c8972807e08",
-   "sha256": "1q94cgx86fi6xxys9a5j31mg10sg5ds2s8xljp71a3g1hcwk7vkw"
+   "commit": "51315644440c648b5aada68d5461a5c0b3b58797",
+   "sha256": "1xnzwbn4bf6id8mr804y367rms7g00dlw100kapmwiqmyzshgvb8"
   }
  },
  {
@@ -14769,6 +14838,25 @@
    "sha256": "18qlwyjqxap2qfbz14ma6yqp4p3v4q2y8idc355s4szjdd2as2lr"
   }
  },
+ {
+  "ename": "counsel-web",
+  "commit": "0dc010d5e4de5c5830ffac3ec0565faac4da7c19",
+  "sha256": "0phrna7bm20vmbnnxrri90i7qnbwcwkxrmycbaxkai5l2rk0ijy8",
+  "fetcher": "github",
+  "repo": "mnewt/counsel-web",
+  "unstable": {
+   "version": [
+    20200313,
+    5
+   ],
+   "deps": [
+    "counsel",
+    "request"
+   ],
+   "commit": "3fadfa55f8e78b4a26f75fed6e972a83688bea7d",
+   "sha256": "0sficf1q881k3vr7yvdcc5gxnac27dp1na9b458fx2mam0892sz7"
+  }
+ },
  {
   "ename": "counsel-world-clock",
   "commit": "7d9da8c45e7d06647f9591d80e83f851a7f3af85",
@@ -15871,8 +15959,8 @@
     20190111,
     2150
    ],
-   "commit": "22213aa38cfb3460bbcd746910cea00eedea8a2c",
-   "sha256": "06x99iwby54d5za6py8g6bb1pblnqi8vs16ncr9brk23zswrg1ml"
+   "commit": "bd990e4a3a3f821b395b58e6d68b0bbd8f406241",
+   "sha256": "0bn1c1iw6598zpfhmrj35hyqj8ylj84gwsn59kk62bf8hqvrwabf"
   },
   "stable": {
    "version": [
@@ -16723,15 +16811,15 @@
   "repo": "skk-dev/ddskk",
   "unstable": {
    "version": [
-    20200310,
-    2004
+    20200314,
+    2116
    ],
    "deps": [
     "ccc",
     "cdb"
    ],
-   "commit": "183c4fd3fe5fb7cb089bbfc7437815d426d08372",
-   "sha256": "1jgvs093w0llp0nxfdzfrlk7il0wj48qhnqsn61pvnma10m93zdl"
+   "commit": "2dcd552b314bc64daa40fd7ac09937439e447548",
+   "sha256": "1scixb6s795hjmkpkljccxg8ja2lqkja905gg5lmp09vykf8x5ir"
   }
  },
  {
@@ -17799,8 +17887,8 @@
     20200308,
     2331
    ],
-   "commit": "2b8b639e55e0e79101f7197264f17429cdcf4669",
-   "sha256": "026qb0r289wkf4zpr3l4pwp7l2rxgfqd8vrj2z8zhyas0r0wwjzx"
+   "commit": "e13541621e6fa82510fd5cb6ff029c1a134d0bfc",
+   "sha256": "13l33z9ydsh7m2d91dh2m2hin051k9ydbnbww40mpmsimmc90pxi"
   },
   "stable": {
    "version": [
@@ -18174,11 +18262,11 @@
   "repo": "syohex/emacs-dired-k",
   "unstable": {
    "version": [
-    20170313,
-    1503
+    20200315,
+    1214
    ],
-   "commit": "c50e8f73358060a448bff66db2d330b52bbeffc1",
-   "sha256": "14yvsv7cvfviszii0bj0qf094rmnwzssinrqrkpxg4jil2n4bb9d"
+   "commit": "256a73b170dfb16e4d7355ce5e9d9caacff2acd9",
+   "sha256": "1b464mr56azv5xmmfs9y5bzn1z3gicgz9g8ayvbbq1f293zxzd44"
   },
   "stable": {
    "version": [
@@ -19495,11 +19583,11 @@
   "repo": "progfolio/doct",
   "unstable": {
    "version": [
-    20200308,
-    1939
+    20200313,
+    1851
    ],
-   "commit": "82387b252b2e9bcbc4aed0e9568cddcafbdbfac5",
-   "sha256": "0h24d2938qrk4aw778y9ll4j8m9p8w1q9cfyx5qw60sbdrcbrlmj"
+   "commit": "2850e2401c214db0bf0fa7e4773ef4f44ac6df86",
+   "sha256": "1lcw2s6yzvqxhgwv75q8ibmdm4j0z68j10j19jiir56x5bw426g1"
   }
  },
  {
@@ -19648,14 +19736,14 @@
   "repo": "hlissner/emacs-doom-themes",
   "unstable": {
    "version": [
-    20200302,
-    110
+    20200313,
+    1948
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "e53b83c9106c76e54996ba2d1b70a8288a379572",
-   "sha256": "1wwy7abxxpr0048y03g3nv0sw1w8s0pdnnffpxp7djlp55nvay29"
+   "commit": "b51ab8f35cbbdec137a1b84cd9b07df6735d3d0e",
+   "sha256": "1yj0c7lx1rg31245yrrjza82m64bwk2686ydijkrd6j4pn9ksmck"
   },
   "stable": {
    "version": [
@@ -20096,8 +20184,8 @@
   "repo": "dtk01/dtk",
   "unstable": {
    "version": [
-    20200215,
-    554
+    20200314,
+    247
    ],
    "deps": [
     "cl-lib",
@@ -20105,8 +20193,8 @@
     "s",
     "seq"
    ],
-   "commit": "eb153de123af04fa7ce10ba4ce77f0cf764bc2de",
-   "sha256": "0prk6fl76dl5ay27ncfqr06spiv2fqr7hc8dad5dqw70w9d29vji"
+   "commit": "230ef5ca2fb0de3d4977942e19ba0c1f65bd5dad",
+   "sha256": "1x2bnammsbz9d2mz8nspzaa4wqda4s4v8p93g2i4ykwd4c2w00fl"
   }
  },
  {
@@ -20268,8 +20356,8 @@
     20191016,
     1241
    ],
-   "commit": "cbb259a99ecb15bc714ee1023d1a643b7e6c996f",
-   "sha256": "0xi83prqla41bvjmj5y6qwsxxbb6jwznr9lw3z2ibk46djr9hdsx"
+   "commit": "d9c34d1dc421850544ab7f33a23322a7748c2db4",
+   "sha256": "1wjdm7vk4r580lnyxy9h92xq1f3wfklbqrnnv8s94fjfj623bx6b"
   },
   "stable": {
    "version": [
@@ -21773,6 +21861,21 @@
    "sha256": "1ak23v9gqj6x104mzgihn0hi7w0kr76q1sl929wmbb9h8s3a54q8"
   }
  },
+ {
+  "ename": "egg-timer",
+  "commit": "a8fbafbeec955fb9bb421519de1e3d09d9812c66",
+  "sha256": "1q3l8hxymk3vxa0nf8pydy4k9qnbzzzpgkp86c9d744smal5xn3v",
+  "fetcher": "github",
+  "repo": "wpcarro/egg-timer.el",
+  "unstable": {
+   "version": [
+    20200217,
+    1650
+   ],
+   "commit": "e3542aeb80905956b94373a222a9cbac04e6497e",
+   "sha256": "0pq6ni2kvdps7j8pdlv16cka198sv29axp9xrp7c755k82pydhk4"
+  }
+ },
  {
   "ename": "egison-mode",
   "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4",
@@ -21930,8 +22033,8 @@
   "repo": "millejoh/emacs-ipython-notebook",
   "unstable": {
    "version": [
-    20200307,
-    2048
+    20200314,
+    443
    ],
    "deps": [
     "anaphora",
@@ -21941,8 +22044,8 @@
     "request",
     "websocket"
    ],
-   "commit": "b265205a5735f7727336f483001cd2bdb9fc7a4e",
-   "sha256": "1b2ydpp9kh3a64if2fz6dky4mz3ifd7am7gms5508aj0757mzy4m"
+   "commit": "a0943af912bdda3bbe5a5cb2b49cb529a20a5a6a",
+   "sha256": "15713bv8aqsfh8zf80qsys7sd81hs0bx691jwmrdfhvdi1nyp8qj"
   },
   "stable": {
    "version": [
@@ -22305,15 +22408,15 @@
   "repo": "eschulte/el-sprunge",
   "unstable": {
    "version": [
-    20140107,
-    139
+    20200312,
+    1212
    ],
    "deps": [
     "htmlize",
     "web-server"
    ],
-   "commit": "37855ec60aeb4d565c49a4d711edc7341e9a22cb",
-   "sha256": "04k1fz0ypmfzgwamncp2vz0lq54bq6y7c8k9nm39csp2564vmbbc"
+   "commit": "e4365ea0bdf60969817619376bdcc98003fec33d",
+   "sha256": "13d2dr5r9nv97ma3abcnhqgq86rqwqlwvq64z3hm0qibsxxajdhq"
   }
  },
  {
@@ -22501,11 +22604,11 @@
   "repo": "doublep/eldev",
   "unstable": {
    "version": [
-    20200221,
-    2047
+    20200315,
+    1527
    ],
-   "commit": "a533ea3add577bb50a96ba24cee26f7e3e79a13f",
-   "sha256": "0wfpy5ib0f54lj394jmd45835iks8mvzxhnn0ii3qcsyjfs1jdnj"
+   "commit": "98fc3206c36bf6384bf333f93b4ae3d9382f5c57",
+   "sha256": "0a6a20n4nwfnzh0fbndpf3f77mchax4sdc2bwhn66yncm9kikjyh"
   },
   "stable": {
    "version": [
@@ -22805,15 +22908,15 @@
   "repo": "fasheng/elfeed-protocol",
   "unstable": {
    "version": [
-    20200305,
-    230
+    20200307,
+    1242
    ],
    "deps": [
     "cl-lib",
     "elfeed"
    ],
-   "commit": "16daf009952fc020a2589ccf325a2b822403f7b6",
-   "sha256": "1lsxbr8b8gn33w6xrs9ghgv2xxvls2arlvq0fkp3vpb5ki8jzsqs"
+   "commit": "328dcf40def951ddc193f3d6ccb01cb58f9fc1cd",
+   "sha256": "0zqgkx6s9dcy6la62vlv4c12wx5a505pc1hhxiwhhpp93r61bh1z"
   },
   "stable": {
    "version": [
@@ -22979,11 +23082,11 @@
   "repo": "xuchunyang/elisp-demos",
   "unstable": {
    "version": [
-    20200306,
-    1620
+    20200312,
+    2343
    ],
-   "commit": "bd9dfc8659096cf3102f50b9dc895c599d824732",
-   "sha256": "1gkywnajnv62s0r2mdkc70cbzdyxa1x9w8rlbnlkdx4js3brakiz"
+   "commit": "0d74766f0c081f8db1292a61889e625bb9a8a758",
+   "sha256": "0j72w9bjgywiwrgw4hfjhgzmlzy68v4wfpsaa78f3vlnkjca82is"
   },
   "stable": {
    "version": [
@@ -24102,11 +24205,11 @@
   "repo": "syohex/emacs-emamux",
   "unstable": {
    "version": [
-    20170227,
-    337
+    20200315,
+    1220
    ],
-   "commit": "39f57786b2cdd3844888df42d71c7bd251f07158",
-   "sha256": "184669qynz1m93s9nv5pdc8m4bnvqa56wz472nsq4xhixz44jjsv"
+   "commit": "6172131d78038f0b1490e24bac60534bf4ad3b30",
+   "sha256": "1cv9b15lj2663aik9s0s2bj05vv4zfzz2w7wjbj6s5vlnf5byfnl"
   },
   "stable": {
    "version": [
@@ -25567,11 +25670,11 @@
   "repo": "erlang/otp",
   "unstable": {
    "version": [
-    20200220,
-    2206
+    20200313,
+    1030
    ],
-   "commit": "f9cbc2a6f6c03b529860857f94242ea80b30d3f3",
-   "sha256": "0xxq20k4al58yv4y1kj2d8hwpcwji0qwzqn06p5y1wzzyw22sz7h"
+   "commit": "bd554119dd80e0e0f71e2e948e69eaff5ff6a88f",
+   "sha256": "00qp7jp4zmdklilj8vjmrd1s4wy6kzcmcdv3klb89whiymc7jxiq"
   },
   "stable": {
    "version": [
@@ -26227,8 +26330,8 @@
    "deps": [
     "dash"
    ],
-   "commit": "98c669e3653bf94c236c54946c6faba7f782ef0d",
-   "sha256": "1v4s3srn6cc4rbb8hg3wri8c3vnijkyz582qmpyf1vd44mldfq4x"
+   "commit": "0c431141be9a408c28aead152ea454df0804364f",
+   "sha256": "0yyssbgfi3fg3dbfrzsy9sms42z87apk6amql8pijwzb3b735jc2"
   },
   "stable": {
    "version": [
@@ -26371,14 +26474,14 @@
   "repo": "emacs-ess/ESS",
   "unstable": {
    "version": [
-    20200311,
-    102
+    20200314,
+    1134
    ],
    "deps": [
     "julia-mode"
    ],
-   "commit": "3b84933f58d23403ded5bb5b25b8b2f714824ce9",
-   "sha256": "074lpj12sg90qbv8409dp9008nwc9rmqrb1clnxapfacz12649nc"
+   "commit": "a2fb8ff841b08c70b1c401724b92afc0c2b496c4",
+   "sha256": "14arrqjji44kw2mizz6rnsnjzbjiv4fca5632f8lwplgsr63j8nk"
   },
   "stable": {
    "version": [
@@ -29118,11 +29221,11 @@
   "repo": "extemporelang/extempore-emacs-mode",
   "unstable": {
    "version": [
-    20200213,
-    1249
+    20200312,
+    224
    ],
-   "commit": "d73c1af831584311d8ad8b45b2ec14cac6eb6edb",
-   "sha256": "1wm4qavrf9b76309cmmw0jf5hg7j3cym5m5syjhv9lh2hlyl358q"
+   "commit": "9f370d6cba7f115896579b634c7550923503a4ab",
+   "sha256": "11qm9f850zm8l26q75j9mlbl5ydiyw7alan47h4nyfihpl4498qz"
   }
  },
  {
@@ -30557,6 +30660,30 @@
    "sha256": "1s961nhwxpb9xyc26rxpn6hvwn63sng452l03mm2ply32b247f9p"
   }
  },
+ {
+  "ename": "fit-text-scale",
+  "commit": "5ccb1803a5783834685c4bdf40e6b1e876ea3ea4",
+  "sha256": "0w4wg7zl9082q558dyj1hk021ry1sig5w5abnn90plvjc65xs72q",
+  "fetcher": "gitlab",
+  "repo": "marcowahl/fit-text-scale",
+  "unstable": {
+   "version": [
+    20200218,
+    1057
+   ],
+   "commit": "cc570af6b8bda346028d070482f4cb30d438b867",
+   "sha256": "143mamvmgn4qyax3faknz77hgmkik0lbc48506kdvcg5mgcbzgn8"
+  },
+  "stable": {
+   "version": [
+    1,
+    1,
+    3
+   ],
+   "commit": "75f74aa14bb38ab00f184ae0a51262eaab07a27c",
+   "sha256": "1nc1p4qbpvnqq2vi7pck3zygahhippvy2xgqmha4lpq5f996lmyx"
+  }
+ },
  {
   "ename": "fix-input",
   "commit": "7d31f907997d1d07ec794a4f09824f43818f035c",
@@ -33930,14 +34057,14 @@
   "repo": "beetleman/flymake-joker",
   "unstable": {
    "version": [
-    20200118,
-    1937
+    20200315,
+    1429
    ],
    "deps": [
     "flymake-quickdef"
    ],
-   "commit": "c4350eb9198fb6fe1ebfb356e3c9c37dd6b0f171",
-   "sha256": "0c25nzainwcy5wxh2q1r98fvbnvgylyp6s41sh4zdpzid34rf1vz"
+   "commit": "fc132beedac9e6f415b72e578e77318fd13af9ee",
+   "sha256": "1pqi6d1kgn5s6bkabi8jxk26ffwqq7g3rl3xgas49rn9vgqwqmq1"
   }
  },
  {
@@ -35281,14 +35408,14 @@
   "repo": "rnkn/fountain-mode",
   "unstable": {
    "version": [
-    20200307,
-    943
+    20200312,
+    1315
    ],
    "deps": [
     "seq"
    ],
-   "commit": "c3f70903327659cd307f9a8225b5c4310cfc6e8e",
-   "sha256": "1zavkilkff9gbnl6i5ghc0z93b4k3kv604lyysqnc7mvvzf344vc"
+   "commit": "92fdd9c8a5e405cd77ee6f338351b9ebc8976038",
+   "sha256": "0wa28wdd3kgxwaaiay0mha4w87x2p8z01vfn93y1256awx8kgg78"
   },
   "stable": {
    "version": [
@@ -35724,8 +35851,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "85d15e865ab3beca4ab601b5741ed31b55e247bd",
-   "sha256": "16z3sgfjm49f7ll11lfw8pwrqgss6631frr5xxnh18x1p5n96gjc"
+   "commit": "426d8f09b2d62d29a5b89a53492890ce2a49158a",
+   "sha256": "04nwx43xh68nqh84fbrcvnyh57yricr7l7k7shyqdv7922km947a"
   },
   "stable": {
    "version": [
@@ -36154,11 +36281,11 @@
   "repo": "koral/gcmh",
   "unstable": {
    "version": [
-    20200213,
-    944
+    20200315,
+    950
    ],
-   "commit": "8867533a736f2098917904c26fd833feca2310a5",
-   "sha256": "0fwbxh0ywy6prjvgl91xdxfmcca4cnnn2cy2zndj5mdl0zx5k3a2"
+   "commit": "9e241e0a9f921b04407050a0f0fada3d0c3b254a",
+   "sha256": "0k2qwkj0lacdb5kmvx2ip17wn7bg01y5166bi9lk9zzk3jbh70d3"
   }
  },
  {
@@ -36285,14 +36412,14 @@
   "repo": "noctuid/general.el",
   "unstable": {
    "version": [
-    20191031,
-    2024
+    20200226,
+    101
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "f6e928622d78d927c7043da904782ed7160ea803",
-   "sha256": "1l541isnwhcg3y8h709zw6nskhkgwnkbdbl1zv702mgfsbl5am62"
+   "commit": "7fdb13e9f90600968d15704851df9c45b5df8ca5",
+   "sha256": "1l8766p9svzjhwglah3ffl93rij106d2gz7sdwx8r30s6p01q2mf"
   }
  },
  {
@@ -37052,8 +37179,8 @@
     "transient",
     "with-editor"
    ],
-   "commit": "1916e83aa463fee86ac1c6bcfd80d780d0544901",
-   "sha256": "1bnykbb868dna4j91kp5jzi7ab4siiy1ni228x8i50cmfm4i91in"
+   "commit": "e293416cee73dc47a6dc7f0bc2f4624d69625634",
+   "sha256": "0kshzx82ics43x6z8i7wcl5866li8ai05mzkri14l6jrcarz9fjz"
   },
   "stable": {
    "version": [
@@ -37131,11 +37258,11 @@
   "repo": "syohex/emacs-git-gutter",
   "unstable": {
    "version": [
-    20161105,
-    1356
+    20200315,
+    752
    ],
-   "commit": "00c05264af046b5ce248e5b0bc42f117d9c27a09",
-   "sha256": "1c7byzv27sqcal0z7113s1897prxhynk6y89mq1fjlxmr0g20vzb"
+   "commit": "219f845ccb13f4da44293f12649e6b51178fea3e",
+   "sha256": "0ap4j00anmkbjpmf55k8rv4s0yfnylmc6sh3rdx495zb6nfj9ky9"
   },
   "stable": {
    "version": [
@@ -37348,14 +37475,14 @@
   "repo": "syohex/emacs-git-messenger",
   "unstable": {
    "version": [
-    20170102,
-    440
+    20200315,
+    1050
    ],
    "deps": [
     "popup"
    ],
-   "commit": "83815915eb8c1cb47443ff34bca3fecf7d2edf3a",
-   "sha256": "1jkfzcn8gl3s5y2hwqkac7lm88q80hgcp66zvy7vnylka1scb6lz"
+   "commit": "321fcdaca8bc63a1a6d54ab3532891dbd6822e18",
+   "sha256": "1xcn7c4ck21p5s149rjp879l05qqhxhc8wj4s4a1b1x1a5scqni2"
   },
   "stable": {
    "version": [
@@ -37780,16 +37907,17 @@
   "repo": "charignon/github-review",
   "unstable": {
    "version": [
-    20200123,
-    523
+    20200314,
+    438
    ],
    "deps": [
     "dash",
+    "deferred",
     "ghub",
     "s"
    ],
-   "commit": "3fb7cc2a818c43f2b29ce17792efafd4f6b07765",
-   "sha256": "06bfwb7n700farbgc6lp6nqjx8sshc8r6lbhk3fqy92ahdpkz0wn"
+   "commit": "50c6bcc7cf4d7193577b3f74eea4dd72f2b7795b",
+   "sha256": "0khsxsqzx81y5krj06i8v84qsb3z86b1z17knyr1xizrd2lmraqp"
   }
  },
  {
@@ -39682,8 +39810,8 @@
     "magit-popup",
     "s"
    ],
-   "commit": "5cc9f67181417bb4e7fa466e14e5daff0be2075f",
-   "sha256": "1l53m0kr0f9ng2723nmkncanvbcix2ccslqm2xrmqbl638h8pvkj"
+   "commit": "41e33d1f83b19662fc1a894f362c00f25c53e797",
+   "sha256": "1mkdxa51d4nhbfknchg0p9sx2pa0n7fdh88xv5rq282myh2zaxm8"
   },
   "stable": {
    "version": [
@@ -40329,20 +40457,20 @@
   "repo": "seagle0128/grip-mode",
   "unstable": {
    "version": [
-    20200307,
-    1433
+    20200312,
+    1136
    ],
-   "commit": "b6fb07217afc618f2dc1fb3569c85ae3ca9d921f",
-   "sha256": "0v90n2rpc1v7apwwlryg0v3avr708iwd092i4jw19sdv6bs6mwc2"
+   "commit": "9615c4774727a719d38313a679d70f2a2c6aca68",
+   "sha256": "01imyi1l33ng78m6c5g4pma5gy4j7jy7dwmqwsqgwbws08qdbwgr"
   },
   "stable": {
    "version": [
     2,
     2,
-    0
+    1
    ],
-   "commit": "25650c9412df8b57c6546ffecfa5a9f6c0c362c8",
-   "sha256": "06xjr34srrmbbxaml45y3f6cq1n1q6a0rfjd54zq30fwanplklqk"
+   "commit": "9615c4774727a719d38313a679d70f2a2c6aca68",
+   "sha256": "01imyi1l33ng78m6c5g4pma5gy4j7jy7dwmqwsqgwbws08qdbwgr"
   }
  },
  {
@@ -41324,11 +41452,11 @@
   "repo": "haskell/haskell-mode",
   "unstable": {
    "version": [
-    20200221,
-    1959
+    20200315,
+    140
    ],
-   "commit": "35363a98445e27dad532d134d3ce863f8d95dd91",
-   "sha256": "1m3mhvaj5b7vavv507x92mzhm7r4clqs1via8zsza4v3ccbsgjws"
+   "commit": "7032966ee76b23520001af916d9184b4a2d7a689",
+   "sha256": "0mk2fw33j1k8m6w0b6p15n7zl52kbwjda0p2zzvxbhlk3cvqmgd0"
   },
   "stable": {
    "version": [
@@ -41658,16 +41786,16 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20200227,
-    923
+    20200314,
+    1003
    ],
    "deps": [
     "async",
     "helm-core",
     "popup"
    ],
-   "commit": "fd429c68e7a73e9d398f7fe620ae16b7d6e3b0a7",
-   "sha256": "1l627nvmypx3j3qp5vkdh8vk56js2kb26na6w021np7j1wn3cjk9"
+   "commit": "b38c9d1b098310262f331e191a9baaaba789fc25",
+   "sha256": "1rnmdg65r54g2r96j1pq6sz9akjgrpnl5q3la2rrn9pr22mjv0q7"
   },
   "stable": {
    "version": [
@@ -41781,14 +41909,14 @@
   "repo": "syohex/emacs-helm-ag",
   "unstable": {
    "version": [
-    20170209,
-    1545
+    20200315,
+    1231
    ],
    "deps": [
     "helm"
    ],
-   "commit": "2fc02c4ead29bf0db06fd70740cc7c364cb650ac",
-   "sha256": "1gnn0byywbld6afcq1vp92cjvy4wlag9d1wgymnqn86c3b1bcf21"
+   "commit": "e24fb378c8d61e7c2bf12d99a41712126f9878cf",
+   "sha256": "1k5ldnjpcgskn71jrg3mcph8z1rdrdyysl5vbi3bpfx61hw4z2ij"
   },
   "stable": {
    "version": [
@@ -42519,8 +42647,8 @@
    "deps": [
     "async"
    ],
-   "commit": "fd429c68e7a73e9d398f7fe620ae16b7d6e3b0a7",
-   "sha256": "1l627nvmypx3j3qp5vkdh8vk56js2kb26na6w021np7j1wn3cjk9"
+   "commit": "b38c9d1b098310262f331e191a9baaaba789fc25",
+   "sha256": "1rnmdg65r54g2r96j1pq6sz9akjgrpnl5q3la2rrn9pr22mjv0q7"
   },
   "stable": {
    "version": [
@@ -50818,8 +50946,8 @@
     20200311,
     1144
    ],
-   "commit": "5f1d9ce04599c52818244c2cb8cb066a601610b8",
-   "sha256": "1gsyf210jq4ij5r47k5sajpjq3z0rgihz84g6y3647k12a00biap"
+   "commit": "8fae568daafdc79d4990ad739bac42ee230d3234",
+   "sha256": "18ppxzafz9f8dn7wwdb9vab3c91n20csvn9kjr3djkjgngz6qjd1"
   },
   "stable": {
    "version": [
@@ -51115,8 +51243,8 @@
     "hydra",
     "ivy"
    ],
-   "commit": "5f1d9ce04599c52818244c2cb8cb066a601610b8",
-   "sha256": "1gsyf210jq4ij5r47k5sajpjq3z0rgihz84g6y3647k12a00biap"
+   "commit": "8fae568daafdc79d4990ad739bac42ee230d3234",
+   "sha256": "18ppxzafz9f8dn7wwdb9vab3c91n20csvn9kjr3djkjgngz6qjd1"
   },
   "stable": {
    "version": [
@@ -52467,11 +52595,11 @@
   "repo": "ljos/jq-mode",
   "unstable": {
    "version": [
-    20190718,
-    913
+    20200312,
+    1315
    ],
-   "commit": "a439bd395e0ad6b6110789b8f10d0efbe1fe889d",
-   "sha256": "18r9igkxy7ymj5xran806f6cy099gb19mg8minchs98jsjjmka9g"
+   "commit": "b1a4137b30c3d50feb70eb00d8d2e41fa999763c",
+   "sha256": "0bdwfn3frq00sb14fmrsll9jg2p446gg4z7w0czmfqfay6av0hla"
   },
   "stable": {
    "version": [
@@ -52528,8 +52656,8 @@
     20180807,
     1352
    ],
-   "commit": "0ea56bf620105af71d2575f62f9527773b6e3d68",
-   "sha256": "1zdp9r97bd85ylb9km27129pxxf5mvmhr4fqvphzb57j7yml3z0h"
+   "commit": "306abcfb9f6e46962061a34b68d4f6baa8c7aba4",
+   "sha256": "1pifplr4qr9667bbbqgqg39v8dyglvg6ljglkjga0d2n39am7r2q"
   },
   "stable": {
    "version": [
@@ -53189,8 +53317,8 @@
   "repo": "gcv/julia-snail",
   "unstable": {
    "version": [
-    20200310,
-    2223
+    20200315,
+    529
    ],
    "deps": [
     "cl-lib",
@@ -53201,8 +53329,8 @@
     "spinner",
     "vterm"
    ],
-   "commit": "41cf7c0d14b053f93387090844d0409824f9cd45",
-   "sha256": "07brz5866qasp1yag3c81x1va4y3ffk56ka3iwgbg2j65wa4n3i5"
+   "commit": "13ddf77079d07326291a1f9ea87d33521d49537d",
+   "sha256": "18p9wm27yhpxa1cai79abiawh9arwn523lk4iy26rbpp0h64vy6f"
   },
   "stable": {
    "version": [
@@ -53357,8 +53485,8 @@
   "repo": "dzop/emacs-jupyter",
   "unstable": {
    "version": [
-    20200311,
-    439
+    20200314,
+    1939
    ],
    "deps": [
     "cl-lib",
@@ -53366,8 +53494,8 @@
     "websocket",
     "zmq"
    ],
-   "commit": "1546a72f570c7d3a6376d211d27002b2b11ddb40",
-   "sha256": "0jm4j45qr6np6qwnx9ffvcjvbsjz79d4s57vzvlajzfgl6c879vp"
+   "commit": "045f2b8b429fd6dc3ecb4f7baf2bd3012e0887b0",
+   "sha256": "0v78ara8277k92w4qirvk4fh6ljvzp75gfllcag57kzljfvxm17p"
   },
   "stable": {
    "version": [
@@ -53684,15 +53812,15 @@
   "repo": "ogdenwebb/emacs-kaolin-themes",
   "unstable": {
    "version": [
-    20200210,
-    237
+    20200314,
+    1600
    ],
    "deps": [
     "autothemer",
     "cl-lib"
    ],
-   "commit": "0afcaff33ceff03420635feca835d760915e4c08",
-   "sha256": "0rw7dgd4dv8gk4n5xjl6mlvgyxm29vnzk8zlk7b07k264kxqr7c7"
+   "commit": "a523c0a535b8022bfe63aeb592a5c8a744d60d4d",
+   "sha256": "0ai28v2dcdz31qa1hdg4i21pklfx59zglwampwlnjlakmrra879g"
   },
   "stable": {
    "version": [
@@ -54390,8 +54518,8 @@
     20180702,
     2029
    ],
-   "commit": "9398c8d5d260c9f4d5dd0aadc7de5001bddaf984",
-   "sha256": "1hps804r3pwnkndwr797ayg002i857ck3lvknvzz7j04xvs7g5s3"
+   "commit": "84e7bceb79e0324e0150f7f92421f2b7799d1d58",
+   "sha256": "17z8cw6b8pff8kqr62w5hvzajfv7w8l8jwbwnxic9m5aqcvxs8k6"
   },
   "stable": {
    "version": [
@@ -54413,15 +54541,15 @@
   "repo": "stardiviner/kiwix.el",
   "unstable": {
    "version": [
-    20200301,
-    307
+    20200315,
+    332
    ],
    "deps": [
     "cl-lib",
     "request"
    ],
-   "commit": "f11e8fb9955b89a14db7092e48baa0b69667834e",
-   "sha256": "1ipkgnlvbdmgxh92hsrvqmyg8hxv4165kr0305hz2cr88wp8zsm1"
+   "commit": "d5e5780f3c933f873e1a19458c1ea269e9a57afe",
+   "sha256": "1p7fqw1j1kphvqb09c8s5lyqkxi7fd0gfpvyp0g0v0shdxydb9ix"
   },
   "stable": {
    "version": [
@@ -54678,22 +54806,24 @@
   "repo": "abrochard/kubel",
   "unstable": {
    "version": [
-    20200310,
-    2009
+    20200314,
+    1655
    ],
-   "commit": "4ba0a5f579525a9199421827221dc3786d2cc754",
-   "sha256": "17y5bslh3483q1vmc0y7lxgm7aaqxiyshkv41j9ga0c6jjrmalvl"
+   "deps": [
+    "dash",
+    "s",
+    "transient"
+   ],
+   "commit": "5f8fefa60d17a11f00d1652ef5278b2fc11da136",
+   "sha256": "055x4cv843k2lk1rwy2dbq42cn1cvcpgcyhs88gh9vhb0wvp5jwf"
   },
   "stable": {
    "version": [
-    1,
+    2,
     0
    ],
-   "deps": [
-    "transient"
-   ],
-   "commit": "fe9f51e678a8b74e1116bffd662abc3d504fc857",
-   "sha256": "1dhhpjjpxl0j18nq4h0pmkz9l55cdzd7kaxhvkr0r0mvhpa7d04m"
+   "commit": "6fafe9c2b8edcb9df96965a315474c83a90b1809",
+   "sha256": "1q1wkwsx9dyjw1b6cxnz1w0xi8r75x7n6iq18v038ny2k110m6g9"
   }
  },
  {
@@ -54704,27 +54834,27 @@
   "repo": "abrochard/kubel",
   "unstable": {
    "version": [
-    20200310,
-    1832
+    20200312,
+    1349
    ],
    "deps": [
     "evil",
     "kubel"
    ],
-   "commit": "4ba0a5f579525a9199421827221dc3786d2cc754",
-   "sha256": "17y5bslh3483q1vmc0y7lxgm7aaqxiyshkv41j9ga0c6jjrmalvl"
+   "commit": "5f8fefa60d17a11f00d1652ef5278b2fc11da136",
+   "sha256": "055x4cv843k2lk1rwy2dbq42cn1cvcpgcyhs88gh9vhb0wvp5jwf"
   },
   "stable": {
    "version": [
-    1,
+    2,
     0
    ],
    "deps": [
     "evil",
     "kubel"
    ],
-   "commit": "fe9f51e678a8b74e1116bffd662abc3d504fc857",
-   "sha256": "1dhhpjjpxl0j18nq4h0pmkz9l55cdzd7kaxhvkr0r0mvhpa7d04m"
+   "commit": "6fafe9c2b8edcb9df96965a315474c83a90b1809",
+   "sha256": "1q1wkwsx9dyjw1b6cxnz1w0xi8r75x7n6iq18v038ny2k110m6g9"
   }
  },
  {
@@ -55556,11 +55686,11 @@
   "repo": "ledger/ledger-mode",
   "unstable": {
    "version": [
-    20200302,
-    334
+    20200312,
+    2023
    ],
-   "commit": "8af289082331e40fdb6123b0145504f1c162cf09",
-   "sha256": "0i58vfcw30ryznji3pyi5lj5aclwi0h42fx7hzadrysjbvw3qscg"
+   "commit": "0ec6c5a74d636b9ec649c1cae26acecf84d1a830",
+   "sha256": "147k8l9mmkq6hhyh9dhqi7cv3l3s2sk0qbqlbx0y4plzbi1v0yay"
   },
   "stable": {
    "version": [
@@ -56740,8 +56870,8 @@
     20200221,
     611
    ],
-   "commit": "70cfd34877272f132235d5ba779b883b3935dd37",
-   "sha256": "03ma0naf4yp7z60szngcazx2sbvqxam66jflkq1d16i52r1hg4bb"
+   "commit": "b4ede4811d82063b1439bbc0523587c993bcb17e",
+   "sha256": "10j4ih5vp3bic2hjqwvd90sr1dbza9k2490l6k7m0sfy1pqlqy07"
   },
   "stable": {
    "version": [
@@ -57462,8 +57592,8 @@
   "repo": "emacs-lsp/lsp-mode",
   "unstable": {
    "version": [
-    20200311,
-    612
+    20200315,
+    950
    ],
    "deps": [
     "dash",
@@ -57474,8 +57604,8 @@
     "markdown-mode",
     "spinner"
    ],
-   "commit": "9f2333b1d5213f651af643ec5f2876bd987d7ab1",
-   "sha256": "01qnrnm2rscdc9gyld6lf3yfdyzb86rsdvjghm58nks7wbw7zb04"
+   "commit": "6113e321b107915375e7f3fa8e9f85242f7fc874",
+   "sha256": "1vkicqf7p9dkp526svkk331pvb51zq1m26jbdvqvcs17zv8si3xr"
   },
   "stable": {
    "version": [
@@ -57693,8 +57823,8 @@
     "lsp-mode",
     "markdown-mode"
    ],
-   "commit": "e91d52629c8c0934c9dfa924ea44aeaebe70097d",
-   "sha256": "0yq7768jnf5i68rla8sjyic5xihywyzfs8jxqbjlrrvz2m1mjr0r"
+   "commit": "134d9b725d21f8889f3dc72dddc418c6c6561f0e",
+   "sha256": "1ajza32nj4l5m0x9kghlwc2plavd507wajna6cdk5z276lyrn38a"
   },
   "stable": {
    "version": [
@@ -58140,8 +58270,8 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20200307,
-    319
+    20200313,
+    1657
    ],
    "deps": [
     "async",
@@ -58150,8 +58280,8 @@
     "transient",
     "with-editor"
    ],
-   "commit": "1916e83aa463fee86ac1c6bcfd80d780d0544901",
-   "sha256": "1bnykbb868dna4j91kp5jzi7ab4siiy1ni228x8i50cmfm4i91in"
+   "commit": "e293416cee73dc47a6dc7f0bc2f4624d69625634",
+   "sha256": "0kshzx82ics43x6z8i7wcl5866li8ai05mzkri14l6jrcarz9fjz"
   },
   "stable": {
    "version": [
@@ -58478,8 +58608,8 @@
     "libgit",
     "magit"
    ],
-   "commit": "1916e83aa463fee86ac1c6bcfd80d780d0544901",
-   "sha256": "1bnykbb868dna4j91kp5jzi7ab4siiy1ni228x8i50cmfm4i91in"
+   "commit": "e293416cee73dc47a6dc7f0bc2f4624d69625634",
+   "sha256": "0kshzx82ics43x6z8i7wcl5866li8ai05mzkri14l6jrcarz9fjz"
   }
  },
  {
@@ -58627,14 +58757,14 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20200226,
-    1251
+    20200313,
+    314
    ],
    "deps": [
     "dash"
    ],
-   "commit": "1916e83aa463fee86ac1c6bcfd80d780d0544901",
-   "sha256": "1bnykbb868dna4j91kp5jzi7ab4siiy1ni228x8i50cmfm4i91in"
+   "commit": "e293416cee73dc47a6dc7f0bc2f4624d69625634",
+   "sha256": "0kshzx82ics43x6z8i7wcl5866li8ai05mzkri14l6jrcarz9fjz"
   },
   "stable": {
    "version": [
@@ -58880,16 +59010,16 @@
   "repo": "ThibautVerron/magma-mode",
   "unstable": {
    "version": [
-    20200305,
-    2108
+    20200312,
+    1306
    ],
    "deps": [
     "cl-lib",
     "dash",
     "f"
    ],
-   "commit": "7cdfa21495b20cd9e2697ea1475ca3ec69fab0b4",
-   "sha256": "1brwlbbyfb357vf0l0wf30yk9s66fhl3l2ncg840p6xpw9kk0dnc"
+   "commit": "0d810239be625b3f8a82f4e27ffd311fc2e1841e",
+   "sha256": "0ibr94vlpa6hnycgssbm5fip0zvrw8rx24mvmq36a4qgd6qi7g4j"
   }
  },
  {
@@ -59210,6 +59340,36 @@
    "sha256": "074bm7kfvslfl06zjrp7h0plbx6aqagzppczgnpslqa41373b8jx"
   }
  },
+ {
+  "ename": "manage-minor-mode-table",
+  "commit": "5171175442458748f355bf2eba51dde77a6cd480",
+  "sha256": "1mbjsd8av94r9qkb6xwpvyhkgm35cpbqm7j1mi1msc3mz3mzx7mz",
+  "fetcher": "github",
+  "repo": "jcs-elpa/manage-minor-mode-table",
+  "unstable": {
+   "version": [
+    20200302,
+    1517
+   ],
+   "deps": [
+    "manage-minor-mode"
+   ],
+   "commit": "e68d979a8a508a86a35eb37a0282d53c1159dfb1",
+   "sha256": "1a10fyqfakrr1a9bp53l1h9m77jn92k6gqpxdldnjjjnv5xfkra4"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    1
+   ],
+   "deps": [
+    "manage-minor-mode"
+   ],
+   "commit": "0636f376d9bc169bd1bd20c5847eb9f029b9467c",
+   "sha256": "1n4a9msfzspk0dfkr1i515ibrwg5yk3hyap2kym05yqpn4wq5xwp"
+  }
+ },
  {
   "ename": "mandm-theme",
   "commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -60618,6 +60778,36 @@
    "sha256": "09b0292d87xm5mrhfhv7j11ljl4j9hv8h5dibzrrlh1b3vsg2xkj"
   }
  },
+ {
+  "ename": "meyvn",
+  "commit": "b7ff8ac12f51e775228a7c916126830802038cf0",
+  "sha256": "1yq90c7s8kb0w25w49wjia84sjhbgjdvjxsl98cdhcf9h6adls6p",
+  "fetcher": "github",
+  "repo": "danielsz/meyvn-el",
+  "unstable": {
+   "version": [
+    20200311,
+    2209
+   ],
+   "deps": [
+    "cider",
+    "dash",
+    "parseedn",
+    "projectile",
+    "s"
+   ],
+   "commit": "4501d996767caa9bc9592105113c9743b20b7bc0",
+   "sha256": "1xz5yzgjz2i3bdv6vqij527z5hxxsmm4ga033rdyphfip8ls55ji"
+  },
+  "stable": {
+   "version": [
+    1,
+    0
+   ],
+   "commit": "3119214ff45db630789f9371f956d5ac06229b1d",
+   "sha256": "0mnvc3f56x4icrqmc4kx6bzc9vac40f020npimdgiylbmyxj97vn"
+  }
+ },
  {
   "ename": "mgmtconfig-mode",
   "commit": "4cf3dd70ae73c2b049e201a3547bbeb9bb117983",
@@ -60844,14 +61034,14 @@
   },
   "stable": {
    "version": [
-    20200308,
-    730
+    20200309,
+    413
    ],
    "deps": [
     "dash"
    ],
-   "commit": "aece47d83b4fe24942eb9a3f748f60c3c0f69a56",
-   "sha256": "18inykf5wx767kkqjjc5bzdy8rqyqg0y7q2r6lxxmph06mbw1wva"
+   "commit": "4d97bf35cf0f9d58b14d13a78172c15463820382",
+   "sha256": "0cqzqrc8wpxav08fx9n1ljpzf97hj3wdhizywj4avnyxj3g63zwi"
   }
  },
  {
@@ -61530,11 +61720,11 @@
   "repo": "protesilaos/modus-themes",
   "unstable": {
    "version": [
-    20200311,
-    1733
+    20200315,
+    841
    ],
-   "commit": "23c67bcb185951e3d9e4b90669e5c1ea4c80c7ba",
-   "sha256": "120v3m9ljcsznbmqdl4c5blv4ry3qckrqk2p917dk3z21zbll05q"
+   "commit": "856626de1662986d582b7d264f5415c10657463b",
+   "sha256": "1ynj2ay0r99rjxnh1fmz81gygfi5kxfgflvd1x1rb2lapb8p7k8k"
   },
   "stable": {
    "version": [
@@ -61554,11 +61744,11 @@
   "repo": "protesilaos/modus-themes",
   "unstable": {
    "version": [
-    20200311,
-    1733
+    20200315,
+    841
    ],
-   "commit": "23c67bcb185951e3d9e4b90669e5c1ea4c80c7ba",
-   "sha256": "120v3m9ljcsznbmqdl4c5blv4ry3qckrqk2p917dk3z21zbll05q"
+   "commit": "856626de1662986d582b7d264f5415c10657463b",
+   "sha256": "1ynj2ay0r99rjxnh1fmz81gygfi5kxfgflvd1x1rb2lapb8p7k8k"
   },
   "stable": {
    "version": [
@@ -64485,6 +64675,28 @@
    "sha256": "1skbjmyikzyiic470sngskggs05r35m8vzm69wbmrjapczginnak"
   }
  },
+ {
+  "ename": "nndiscourse",
+  "commit": "1d6a236cd3ff51f2d4cfca114b2791c8ac7411e8",
+  "sha256": "03kfb8c7knnd1n5sxxpldmscbwi5lrnsyh6w2ji4pvaq5xhmrlxb",
+  "fetcher": "github",
+  "repo": "dickmao/nndiscourse",
+  "unstable": {
+   "version": [
+    20200309,
+    242
+   ],
+   "deps": [
+    "anaphora",
+    "dash",
+    "dash-functional",
+    "json-rpc",
+    "rbenv"
+   ],
+   "commit": "6cf4c73e8144b5eb6708fd5f35245f81389e7859",
+   "sha256": "0l16ql64741m6wkhf691639d17066gizq02s8vnpxqif10zsgaap"
+  }
+ },
  {
   "ename": "nnhackernews",
   "commit": "40fec106c676f8207ec9c4553c3ec16c626b098c",
@@ -65161,11 +65373,19 @@
   "repo": "joostkremers/nswbuff",
   "unstable": {
    "version": [
-    20191210,
-    815
+    20200312,
+    2050
    ],
-   "commit": "484ef531f67df358923dd5fef015233095928f8a",
-   "sha256": "10imnf6fq8bxbkzpnz47b55wjpf4mcr24ibnjrpy0z8rkf4i8gq3"
+   "commit": "a601855cc96e303e38051d0d1af3402721dbb969",
+   "sha256": "0xbh5max7wbsw3iaa5ai9l5brky3mykyzn77a4w5r1m1f4a67y97"
+  },
+  "stable": {
+   "version": [
+    1,
+    1
+   ],
+   "commit": "a601855cc96e303e38051d0d1af3402721dbb969",
+   "sha256": "0xbh5max7wbsw3iaa5ai9l5brky3mykyzn77a4w5r1m1f4a67y97"
   }
  },
  {
@@ -65956,11 +66176,11 @@
   "repo": "arnm/ob-mermaid",
   "unstable": {
    "version": [
-    20191208,
-    2346
+    20200311,
+    2111
    ],
-   "commit": "8dcbfab869829b586ce9992897a2ebe2bb52b770",
-   "sha256": "0h0aig17hsjisa2dyz6y7x748fwmb6908dc4sr043hq2hlv60bj7"
+   "commit": "06ca38e963475542dbf48e416a820c21e1441f28",
+   "sha256": "12g221bcw04gzq7w60j2i2yhqxpy783b5zp38xdyqg34hnk0p1ji"
   }
  },
  {
@@ -66370,14 +66590,14 @@
   "repo": "clemera/objed",
   "unstable": {
    "version": [
-    20200311,
-    1229
+    20200312,
+    1817
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "31c5dedd265ac3cdb0636460325ea9f7e1a26f60",
-   "sha256": "0gb71fzycmrqg0gyl2ahf2w82gapazrb6ddbk6wvylsaaf5ml217"
+   "commit": "9bb351313799bf4fb39f1b680cdf0a7ddccccbb4",
+   "sha256": "0lp7j4s2w3qmk288nnmh92ad58340srxq20nqiybgrijc0kxkx5a"
   },
   "stable": {
    "version": [
@@ -66588,26 +66808,26 @@
   "repo": "oer/oer-reveal",
   "unstable": {
    "version": [
-    20200308,
-    1805
+    20200313,
+    842
    ],
    "deps": [
     "org-re-reveal"
    ],
-   "commit": "9313251afc74536792f90423b3189180c632e1e4",
-   "sha256": "0dk151cy5fng75inknq4g24qvh9q0fzyak77qdkip3lsy670vlg1"
+   "commit": "8351748a2f79fbf67cea1f1f6a245c4bfef12c9b",
+   "sha256": "1sfjrpd0vn1dgnjgkhg48wvfwr5nfiavddws2jxj6nrzj2jdga6l"
   },
   "stable": {
    "version": [
     2,
-    4,
-    1
+    5,
+    0
    ],
    "deps": [
     "org-re-reveal"
    ],
-   "commit": "9313251afc74536792f90423b3189180c632e1e4",
-   "sha256": "0dk151cy5fng75inknq4g24qvh9q0fzyak77qdkip3lsy670vlg1"
+   "commit": "8351748a2f79fbf67cea1f1f6a245c4bfef12c9b",
+   "sha256": "1sfjrpd0vn1dgnjgkhg48wvfwr5nfiavddws2jxj6nrzj2jdga6l"
   }
  },
  {
@@ -68319,20 +68539,20 @@
   "repo": "marcIhm/org-index",
   "unstable": {
    "version": [
-    20190920,
-    356
+    20200314,
+    1732
    ],
-   "commit": "aba9b1ea49e83c541c544e4030fcc2e0a55c908b",
-   "sha256": "1rpbas9svwni6nz5jywvxxvan0lgrqi100aby1aivi3prsmh6jhy"
+   "commit": "6de86372d46ca9639f22fe05eaadc0cbec58f5bc",
+   "sha256": "1h4lh9cfz6808wmmhq5xad6a37i145i5ifb84gygcpdx6g7xzjha"
   },
   "stable": {
    "version": [
-    5,
-    12,
-    0
+    6,
+    1,
+    1
    ],
-   "commit": "fc9635edd4bf394059e53a1fa16cdd8ab5b7b468",
-   "sha256": "0qzqlfnrc2x4mm40wrsmpbh61129ww2a2sk4s1px49fi8552vqyq"
+   "commit": "6de86372d46ca9639f22fe05eaadc0cbec58f5bc",
+   "sha256": "1h4lh9cfz6808wmmhq5xad6a37i145i5ifb84gygcpdx6g7xzjha"
   }
  },
  {
@@ -69227,8 +69447,8 @@
   "repo": "alphapapa/org-ql",
   "unstable": {
    "version": [
-    20200309,
-    2240
+    20200314,
+    1908
    ],
    "deps": [
     "dash",
@@ -69243,14 +69463,14 @@
     "transient",
     "ts"
    ],
-   "commit": "1688774dddae45b7b77420d01c0eb56d76dd0c95",
-   "sha256": "12pwi4sd4lfrgbzrj91cq2d9kp5ql0c2nqda7x6x94x9z1h5xfh8"
+   "commit": "5bc4a4a825f5961d1a47b6f35bd3e458bb2546e2",
+   "sha256": "1drn82ajcdzjzaa3qsqp6y5f0ynanb7xcpa57lpw01j4isja5zkw"
   },
   "stable": {
    "version": [
     0,
     4,
-    1
+    3
    ],
    "deps": [
     "dash",
@@ -69263,8 +69483,8 @@
     "s",
     "ts"
    ],
-   "commit": "32c68d7f249e1780a7e1a0b1155db3f36d535e1c",
-   "sha256": "0bw4568vx3swxc3khnnz28288h70z473pvw2m38ygjq7kyqnrq9b"
+   "commit": "ba7d4a2e82f134b8bb9976c81227ec795dde00d4",
+   "sha256": "01qgnasab82aakx1p2iyjc60qhs6wahlhhmyacwa4s41ki0nlha1"
   }
  },
  {
@@ -69384,6 +69604,19 @@
    ],
    "commit": "1f56a1fc9a52f3815bb2115ebeca3c355688d722",
    "sha256": "1xrswpkr7hgsb9pj991z4m0820f1nksfad184x0j7kir2xcx0myg"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    0
+   ],
+   "deps": [
+    "org-re-reveal",
+    "org-ref"
+   ],
+   "commit": "abcd622e4edaa5e4480bcd1e7e4953f67c90e036",
+   "sha256": "08ia6gn0x0yydl28dhghifyxz0mrn0asllqg4s449gaz729cxqkd"
   }
  },
  {
@@ -69673,8 +69906,8 @@
   "repo": "alphapapa/org-sidebar",
   "unstable": {
    "version": [
-    20200310,
-    35
+    20200313,
+    1551
    ],
    "deps": [
     "dash",
@@ -69684,8 +69917,8 @@
     "org-super-agenda",
     "s"
    ],
-   "commit": "41b914c7bdc5a12c9289b134822bdfea0889ac9e",
-   "sha256": "1mggpxbzprmmbkiv3xklw1saafsi153n4spr4l0m59lgm4gpymgj"
+   "commit": "d6ddec21fd6f356dc7b77c0a61a633606965a0bf",
+   "sha256": "137a462cl66jldsw877jgn0jph4zsv036mhvd9rpp6pw6jsw50sy"
   },
   "stable": {
    "version": [
@@ -70955,14 +71188,14 @@
   "repo": "vyorkin/ormolu.el",
   "unstable": {
    "version": [
-    20200207,
-    2111
+    20200313,
+    1631
    ],
    "deps": [
     "reformatter"
    ],
-   "commit": "f6f2ea12ae158a400525857a82eb05bf2b7e88f3",
-   "sha256": "0v3ci5wyydpj14r2lvw7fn9yp7ra8nhz8z2c68521dydhblbry7b"
+   "commit": "7b1905787de919e671cbd44360688678025c8395",
+   "sha256": "1l2wz4zk9x66cgnl5c6x3ajhz0cmmjmxvwzl1p3bnykygkndiwj6"
   }
  },
  {
@@ -72358,14 +72591,14 @@
   "repo": "melpa/package-build",
   "unstable": {
    "version": [
-    20200125,
-    1707
+    20200313,
+    2359
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "f0ded6bf6532f475fdf62a62ef432604d6dddbe3",
-   "sha256": "0wg5xsj6x101ng0fxdzqbkf307igxr9vcja4gnhgcbrvkzsn7ydc"
+   "commit": "90e514432661f750f2a0c9fe17f09cdcc8e4e82b",
+   "sha256": "0p2vzsad8biczhj80y5bif5p0agcg8id4qngvi0lmxvx8i8wvky0"
   },
   "stable": {
    "version": [
@@ -72402,15 +72635,15 @@
   "repo": "purcell/package-lint",
   "unstable": {
    "version": [
-    20200309,
-    1953
+    20200313,
+    2338
    ],
    "deps": [
     "cl-lib",
     "let-alist"
    ],
-   "commit": "5cfa10041a467ca122f5bda31119a5904d574631",
-   "sha256": "0vnswz9dgzd0i2h6qs8i2nccrcd4pxnbqir4qnhz7nsbhdrvccj6"
+   "commit": "0e27abf2e65340dc1523b27b923650b863472a5a",
+   "sha256": "1vrnriijm4c8129ndcimcai2x1mfybp2arkb1x3jpb9ak83ck9px"
   },
   "stable": {
    "version": [
@@ -72439,8 +72672,8 @@
    "deps": [
     "package-lint"
    ],
-   "commit": "5cfa10041a467ca122f5bda31119a5904d574631",
-   "sha256": "0vnswz9dgzd0i2h6qs8i2nccrcd4pxnbqir4qnhz7nsbhdrvccj6"
+   "commit": "0e27abf2e65340dc1523b27b923650b863472a5a",
+   "sha256": "1vrnriijm4c8129ndcimcai2x1mfybp2arkb1x3jpb9ak83ck9px"
   },
   "stable": {
    "version": [
@@ -74356,14 +74589,14 @@
   "repo": "nex3/perspective-el",
   "unstable": {
    "version": [
-    20200310,
-    1730
+    20200313,
+    1842
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "21877375d718e57d5e10808f06f78ba0c4d420c8",
-   "sha256": "0a1s1ygxday0602xk5dg19v1wjmz8dm4ajiwiflvyhqas4wcv9j2"
+   "commit": "0debeeb542b2b449ad6c2a7e36eeb8691f27ed5b",
+   "sha256": "11jfm3sxnvpwn69y8y3cayq9svpfm21ch01nv58fd5padshagz5n"
   },
   "stable": {
    "version": [
@@ -74779,27 +75012,25 @@
   "repo": "OVYA/php-cs-fixer",
   "unstable": {
    "version": [
-    20190207,
-    1126
+    20200312,
+    1309
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "6540006710daf2b2d47576968ea826a83a40a6bf",
-   "sha256": "089x26akvkfm772v8n3x3l5wpkhvlgad2byrcbh0a1vyhnjb2fvd"
+   "commit": "95eace9bc0ace128d5166e303c76df2b778c4ddb",
+   "sha256": "1pl6zw1m8n3ir48h58gaq2f474w9j20a6gk4r0cq5vgvzxx25f0h"
   },
   "stable": {
    "version": [
     1,
-    0,
-    -2,
-    4
+    0
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "ca2c075a22ad156c336d2aa093fb6394c9f6c112",
-   "sha256": "1axjfsfasg7xyq5ax2bx7rh2mgf8caw5bh858hhp1gk9xvi21qhx"
+   "commit": "95eace9bc0ace128d5166e303c76df2b778c4ddb",
+   "sha256": "1pl6zw1m8n3ir48h58gaq2f474w9j20a6gk4r0cq5vgvzxx25f0h"
   }
  },
  {
@@ -77184,11 +77415,11 @@
   "repo": "conao3/ppp.el",
   "unstable": {
    "version": [
-    20200224,
-    1320
+    20200313,
+    437
    ],
-   "commit": "a4eaec44216b189108164b42381abf35d0031200",
-   "sha256": "1gvzgx9nq6gqdgb5m6pdp14w96fd6j7b9bgc0pric0aw04i2bzp6"
+   "commit": "7504b1e4f3aa7063f15ba683e0e8e65bc1312ab0",
+   "sha256": "1jsliv29h4vz8np8l6vclly5n4i8w1v7kf3d2iq66spr36csdilq"
   },
   "stable": {
    "version": [
@@ -78299,11 +78530,11 @@
   "repo": "ProofGeneral/PG",
   "unstable": {
    "version": [
-    20200302,
-    1348
+    20200313,
+    907
    ],
-   "commit": "f737203ced2446ec54be7b31b21c47e731404e12",
-   "sha256": "1fg2siway0gz2b6sq9klijmi3pb6vg54s638d02yzs32340a2qsf"
+   "commit": "23d1199c24927cf5dc6fa53f082291b6e181cd13",
+   "sha256": "1c1rz3n3bli4ggnkp3zk0j5df1s8hsrsygdjn5nqs50gprb683dp"
   },
   "stable": {
    "version": [
@@ -78406,8 +78637,8 @@
     20170526,
     1650
    ],
-   "commit": "94b39efdf70de21bc757dc2aceaf5ed36c6535a3",
-   "sha256": "0mrkzh3cikcg2wddz9hla79pc5isjifcqx025radcc6m0jmg7hjv"
+   "commit": "422053f3bcb39cac483d2769e936c473e7c8bcdb",
+   "sha256": "0hlyxvriivk0fydqjx0862v53rynlh50sci9h5m3j5b7y3nsykry"
   },
   "stable": {
    "version": [
@@ -78618,8 +78849,8 @@
   "repo": "fvdbeek/emacs-pubmed",
   "unstable": {
    "version": [
-    20200221,
-    1013
+    20200312,
+    1930
    ],
    "deps": [
     "deferred",
@@ -78627,14 +78858,14 @@
     "s",
     "unidecode"
    ],
-   "commit": "de005c16750dfd925cd528b265fea133bb1cf342",
-   "sha256": "00fbks0f8kcmsazncrpkmi7w0ygd9ph1js6z1dwbdkjzwb161xv7"
+   "commit": "b801f7480401e6f3207f150cd945fc5abd96f884",
+   "sha256": "1w9hxh94zkgnsw26hqrs5gdnb8xi7cnavjby9dy71l9n6js7bdb1"
   },
   "stable": {
    "version": [
     0,
-    3,
-    3
+    4,
+    1
    ],
    "deps": [
     "deferred",
@@ -78642,8 +78873,8 @@
     "s",
     "unidecode"
    ],
-   "commit": "de005c16750dfd925cd528b265fea133bb1cf342",
-   "sha256": "00fbks0f8kcmsazncrpkmi7w0ygd9ph1js6z1dwbdkjzwb161xv7"
+   "commit": "b801f7480401e6f3207f150cd945fc5abd96f884",
+   "sha256": "1w9hxh94zkgnsw26hqrs5gdnb8xi7cnavjby9dy71l9n6js7bdb1"
   }
  },
  {
@@ -79230,8 +79461,8 @@
   "repo": "tumashu/pyim",
   "unstable": {
    "version": [
-    20200311,
-    637
+    20200315,
+    735
    ],
    "deps": [
     "async",
@@ -79239,8 +79470,8 @@
     "pyim-basedict",
     "xr"
    ],
-   "commit": "61f33ac62bbfb8c5e4b757d6f880286fbced5bdf",
-   "sha256": "1pq83b67mwj4b1wyxkpqd66cw8w3wm0x6w030wxqz03qg94gdi3d"
+   "commit": "92af8c283531f08aebf23fb6a0efd452fcc58d42",
+   "sha256": "0nzhg4hl1wv7yz1rbwm6j3vw9lgpg7rl2al1xbxliqkrfv9lh1mi"
   },
   "stable": {
    "version": [
@@ -79385,8 +79616,8 @@
     20170402,
     1255
    ],
-   "commit": "47ec7e7a2937c78136c560b458bc2467bee2acd9",
-   "sha256": "01sn57g8za6w89vyg7vyfh8v1jj32f329macfjlvgkamqrpmyj4q"
+   "commit": "16ed52ec500388aff2277a7144fc8138afb6f796",
+   "sha256": "01xh11991bwijhq44sp4xbmwsmfgj10c3ip9icns143c878svany"
   }
  },
  {
@@ -79537,11 +79768,11 @@
   "repo": "thisch/python-cell.el",
   "unstable": {
    "version": [
-    20190217,
-    1823
+    20200314,
+    1147
    ],
-   "commit": "665725446b194dbaaff9645dd880524368dd710a",
-   "sha256": "1rjh16jacp98i0l78ij5lfp5f0b42qhfzms2x8zwr9j2aj1csy2h"
+   "commit": "4f0778b05bfb936861449bcb998ed620cd9b31ad",
+   "sha256": "0fjqy8wkxm8m94xfvvj12fpx8ybaln8x4ss9b0iaz9y9jvfwzg21"
   }
  },
  {
@@ -80087,11 +80318,11 @@
   "repo": "syohex/emacs-quickrun",
   "unstable": {
    "version": [
-    20170223,
-    115
+    20200315,
+    1029
    ],
-   "commit": "55bbe5d54b80206ea5a60bf2f58eb6368b2c8201",
-   "sha256": "1skbd5q99d9rwfi954r9p7b7nhwcfijq30z0fpdhbi1iiabf7vqz"
+   "commit": "50e07e769848b1e1780054fab2e221adc474777b",
+   "sha256": "15jj9w0z3yfxaikxi8qaxhr8ipi1jc85zckbri2gdbbdy928ypiq"
   },
   "stable": {
    "version": [
@@ -85155,11 +85386,11 @@
   "repo": "sfztools/emacs-sfz-mode",
   "unstable": {
    "version": [
-    20200105,
-    316
+    20200312,
+    1153
    ],
-   "commit": "614506bac2795c531ab118840ba010ee378e96d4",
-   "sha256": "042ci8kbhlmhwyx3kiwf8gnr9f1f85faviinv0g7yn80g3shxyp1"
+   "commit": "4d8ccde889b112896c7299cad9f1e9305bde8cb3",
+   "sha256": "1ccqb05xmnxpwxl9vdvkb3f8211kbj5rsb73xv1ghyx3i40qjmzm"
   }
  },
  {
@@ -85353,14 +85584,14 @@
   "repo": "kyagi/shell-pop-el",
   "unstable": {
    "version": [
-    20170304,
-    1416
+    20200315,
+    1139
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "4a3a9d093ad1add792bba764c601aa28de302b34",
-   "sha256": "1ybvg048jvijcg9jjfrbllf59pswmp0fd5zwq5x6nwg5wmggplzd"
+   "commit": "4b4394037940a890a313d715d203d9ead2d156a6",
+   "sha256": "0s77n6b9iw1x3dv91ybkpgy3zvqd12si7zw3lg0m2b6j1akrawsg"
   },
   "stable": {
    "version": [
@@ -85576,8 +85807,8 @@
     20190930,
     730
    ],
-   "commit": "03ea43b1f1c648968fe1109fb5c50febcf9e154d",
-   "sha256": "1v194qzgxq5r34xaqgky1ir2bikaphv8csnxlgwbkggzpxnlwqi0"
+   "commit": "cf30c23a119ef50d1c3ae3fa19ba3c1d07800466",
+   "sha256": "1d94qrb4kvvz75pgqci10akr1cg5knss66mix6sdfmcvg2q8l3zh"
   }
  },
  {
@@ -86438,8 +86669,8 @@
   "repo": "yuya373/emacs-slack",
   "unstable": {
    "version": [
-    20200221,
-    417
+    20200315,
+    743
    ],
    "deps": [
     "alert",
@@ -86449,8 +86680,8 @@
     "request",
     "websocket"
    ],
-   "commit": "b7b9eada0bf62d40dfe764b00f55913a2d3d742e",
-   "sha256": "0cqr7jnfxzb0z2wy79pdwpv9cvmawjif1kin3zbp8q7zhwrq09v0"
+   "commit": "c1baa8f57895cc7093dcd156bd268c5a0b3ab68c",
+   "sha256": "1fklwbj1cgl2r0mqnw0yd62xqyfnmh11n4dmmsvvcjscw7n82p60"
   }
  },
  {
@@ -86511,15 +86742,15 @@
   "repo": "slime/slime",
   "unstable": {
    "version": [
-    20200228,
-    1656
+    20200314,
+    1241
    ],
    "deps": [
     "cl-lib",
     "macrostep"
    ],
-   "commit": "cd8cc3c95c3391b1f1cffa9e100336250a4509a7",
-   "sha256": "11b9747y43cia8s8dlgxsx3l326pjgsr20qmv5rs9ziby38502mq"
+   "commit": "9add8d167cee8ecec0e0ce0f2afa2505499000a2",
+   "sha256": "09c9zpsbgg8c219hxrmw85w43qb0xdqq3skqpzig29yzbn4y0pvl"
   },
   "stable": {
    "version": [
@@ -86736,11 +86967,11 @@
   "repo": "joaotavora/sly",
   "unstable": {
    "version": [
-    20200228,
-    1350
+    20200314,
+    55
    ],
-   "commit": "86a63df73360be51529806c7ed9b775b3f02284d",
-   "sha256": "0sx6fdckcfcld41db0695svvlvllnfaazwx513686gnykwfd209n"
+   "commit": "c3a0e8b0480416f73aca253fe9c24724fbe6a603",
+   "sha256": "1wm18sqyhh9hgn8icn6bqjfp3jkfyr9f8vfvhcs4cfv3av032pnc"
   },
   "stable": {
    "version": [
@@ -88223,11 +88454,11 @@
   "repo": "syohex/emacs-sourcemap",
   "unstable": {
    "version": [
-    20161216,
-    540
+    20200315,
+    1037
    ],
-   "commit": "64c89d296186f48d9135fb8aad501de19f64bceb",
-   "sha256": "115g2mfpbfywp8xnag4gsb50klfvplqfh928a5mabb5s8v4a3582"
+   "commit": "bb2a56b2feb62b0c77d7f03ef2acd94f91be6b3f",
+   "sha256": "1qr5syl2wm7z1gkgafdhch6n7fg3qc09k8dhv983kq4vg5kp36ml"
   },
   "stable": {
    "version": [
@@ -89088,11 +89319,11 @@
   "repo": "srcery-colors/srcery-emacs",
   "unstable": {
    "version": [
-    20200205,
-    1729
+    20200313,
+    1310
    ],
-   "commit": "5ce86917ad50d64c460eea6b6fa16bdcf88cc8f5",
-   "sha256": "16317yy64qcx7mi194xp9kbxpisjfz976yf637s6zabmk6xmmpcl"
+   "commit": "465a458e8c1629baa980988d43e441c4fdb92151",
+   "sha256": "04bncx9y1jqc6pzzl5c7dgdvzq012ymsp6ilkifg19xnz3bdmhm6"
   },
   "stable": {
    "version": [
@@ -90466,14 +90697,14 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20200309,
-    2017
+    20200314,
+    1959
    ],
    "deps": [
     "ivy"
    ],
-   "commit": "5f1d9ce04599c52818244c2cb8cb066a601610b8",
-   "sha256": "1gsyf210jq4ij5r47k5sajpjq3z0rgihz84g6y3647k12a00biap"
+   "commit": "8fae568daafdc79d4990ad739bac42ee230d3234",
+   "sha256": "18ppxzafz9f8dn7wwdb9vab3c91n20csvn9kjr3djkjgngz6qjd1"
   },
   "stable": {
    "version": [
@@ -91017,10 +91248,10 @@
   "unstable": {
    "version": [
     20200310,
-    34
+    1510
    ],
-   "commit": "cf64fdbbb066b6ddfcbd91f778433125d8c16abc",
-   "sha256": "0ajp8zpml47anv1wdj2qx8l0paq5qsxvgmj2kiyhdh1qilxvfl3y"
+   "commit": "449dcdf4fe22874c9d91ee8d929ebb8a41b1bac6",
+   "sha256": "105s1kr8xapp93za9z9kq7s0rqccqissavacjfg6cvfx6gqrr8gy"
   },
   "stable": {
    "version": [
@@ -91575,14 +91806,14 @@
   "repo": "zevlg/telega.el",
   "unstable": {
    "version": [
-    20200311,
-    1602
+    20200314,
+    1914
    ],
    "deps": [
     "visual-fill-column"
    ],
-   "commit": "4697b363f3633e98528d7cfc1e237a9236feb106",
-   "sha256": "0dzf28w6ivrzfsy3wglq34mm44vs4148f5r0hjp695xdlz1hv7wa"
+   "commit": "b7c0b2438cb3152929824bc672ee39e82c67e93a",
+   "sha256": "1lcimnpg3z4gbwryhkqhmmg3896all2kjb5rhv7prw3794hjpf38"
   },
   "stable": {
    "version": [
@@ -92139,8 +92370,8 @@
    "deps": [
     "hcl-mode"
    ],
-   "commit": "6973d1acaba2835dfdf174f5a5e27de6366002e1",
-   "sha256": "12ww36g7mz4p4nslajcsdcm8xk6blwjwqjwhyp0n10ym6ssbh820"
+   "commit": "2967e7bdc05d15617e121052f6e43c61439b9070",
+   "sha256": "0f8p3ns0xw1p64jm22q4pf0ajmb5vp2ppl4qvgxvyna6cvcmw4k5"
   },
   "stable": {
    "version": [
@@ -92585,8 +92816,8 @@
     20200212,
     1903
    ],
-   "commit": "483ed864d69f307e9e3b9dadec048216100c0757",
-   "sha256": "024jm8xvnmi4z3a5801sd3kdvabfk9zk8kfqrxbp0n5jnrmbbm51"
+   "commit": "e2b274cab473f85ffa8136942664211ed64ff742",
+   "sha256": "18z50i08y4fg4ygaz3fqyh5rf07jpah2w2y9zhmkpgqkigdwp3sl"
   },
   "stable": {
    "version": [
@@ -92652,8 +92883,8 @@
    "deps": [
     "haskell-mode"
    ],
-   "commit": "b28951be9abee7dc234c318849169bb578db3c49",
-   "sha256": "0absv56yqrqf3mzgs064q88lh6k28a7knzqrgdmf4100gf32np4j"
+   "commit": "d9c6b84d8cfadcb5111e291c17c1a2a01a984820",
+   "sha256": "13xyx6bb15g7kay1n1cfpfvjkya5i9r4r0182cvpdvcig8l3ii84"
   },
   "stable": {
    "version": [
@@ -93602,11 +93833,11 @@
   "repo": "emacsorphanage/transpose-frame",
   "unstable": {
    "version": [
-    20151126,
-    1426
+    20200307,
+    2119
    ],
-   "commit": "011f420c3496b69fc22d789f64cb8091834feba7",
-   "sha256": "1nhbinwv1ld13c0b0lxlvfm9s6bvxcz2vgfccqg45ncg9rx70rsw"
+   "commit": "12e523d70ff78cc8868097b56120848befab5dbc",
+   "sha256": "01j4ci0c52r2c31hc9r4p7nsb6s8blmvg50g9n5v5h3afjl1c35v"
   },
   "stable": {
    "version": [
@@ -94444,11 +94675,11 @@
   "repo": "emacs-typescript/typescript.el",
   "unstable": {
    "version": [
-    20200309,
-    846
+    20200312,
+    2235
    ],
-   "commit": "1767de109515a992b965d275cb5550d336d957df",
-   "sha256": "0wzgxha155i2nb9idqv634rmxlkf4hd1sg53lipll0phzwd4s7k9"
+   "commit": "102587e458d48ece6335cd708300647f22ec8b8d",
+   "sha256": "0i3zpg21l5id0sfpxyn496wy83mpr66afx71lrnipsy1fqwd2j5x"
   },
   "stable": {
    "version": [
@@ -96207,20 +96438,20 @@
   "repo": "federicotdn/verb",
   "unstable": {
    "version": [
-    20200310,
-    2338
+    20200313,
+    1956
    ],
-   "commit": "b5230c8482e82f652403000f24e1fecfb263f380",
-   "sha256": "16mrbsfkagrq7ng25lc4rs2c8fz63b5m9vfjmnpk5jf8kg0kknwq"
+   "commit": "b2570e4809fc0c97add33b4f2e05e5361750c877",
+   "sha256": "02ikvwcqgma8nzpx13nzdjw3y8dmk2y0d5b3g882i9rp04xs0y1l"
   },
   "stable": {
    "version": [
     2,
     8,
-    0
+    1
    ],
-   "commit": "f9199768e55849cbe5a879a530b33bce88ac4c2c",
-   "sha256": "1zpsvjsr5mvi0l0mgfwirxg5bkhkp305h85fbv5g3hr4g0vnr448"
+   "commit": "b2570e4809fc0c97add33b4f2e05e5361750c877",
+   "sha256": "02ikvwcqgma8nzpx13nzdjw3y8dmk2y0d5b3g882i9rp04xs0y1l"
   }
  },
  {
@@ -96260,6 +96491,30 @@
    "sha256": "1y6vjw5qzaxr37spg5d4nxffmhiipzsrd7mvh8bs3jcfrsg3080n"
   }
  },
+ {
+  "ename": "versuri",
+  "commit": "056daa8d5563dd6ffb9c93630f9b357f73c1e58a",
+  "sha256": "0nidgn9gdrrvqzbfjwvhs9bycbj3l9jbcablnbs2yxf903zlgn9b",
+  "fetcher": "github",
+  "repo": "mihaiolteanu/versuri",
+  "unstable": {
+   "version": [
+    20200309,
+    737
+   ],
+   "deps": [
+    "anaphora",
+    "dash",
+    "esqlite",
+    "esxml",
+    "ivy",
+    "request",
+    "s"
+   ],
+   "commit": "9cae9900e01cb41064209762ca289ca6da8bb196",
+   "sha256": "04r4qg9a1p6igg1j6praa2kxxg5rlc25s0s6gvl56gxb9s1qchh1"
+  }
+ },
  {
   "ename": "vertica",
   "commit": "f98a06b794ef0936db953f63679a63232295a849",
@@ -96909,11 +97164,11 @@
   "repo": "akermu/emacs-libvterm",
   "unstable": {
    "version": [
-    20200309,
-    615
+    20200315,
+    1353
    ],
-   "commit": "03b8a06a0a531d13f18ef7f00ed4617eb4eaa1ad",
-   "sha256": "0485d07y12knsxisalv5824nmqw2gx08jrdgams7l3ra4z961lfj"
+   "commit": "186914a3f3666b92a5c52fc77063953974a96c47",
+   "sha256": "06d51aqri06lxbnki0hag9g641amgbcnb64arj33wv4cf495q595"
   }
  },
  {
@@ -97037,11 +97292,11 @@
   "repo": "emacs-w3m/emacs-w3m",
   "unstable": {
    "version": [
-    20200302,
-    2210
+    20200313,
+    0
    ],
-   "commit": "03ea43b1f1c648968fe1109fb5c50febcf9e154d",
-   "sha256": "1v194qzgxq5r34xaqgky1ir2bikaphv8csnxlgwbkggzpxnlwqi0"
+   "commit": "cf30c23a119ef50d1c3ae3fa19ba3c1d07800466",
+   "sha256": "1d94qrb4kvvz75pgqci10akr1cg5knss66mix6sdfmcvg2q8l3zh"
   }
  },
  {
@@ -97593,11 +97848,11 @@
   "repo": "eschulte/emacs-web-server",
   "unstable": {
    "version": [
-    20200216,
-    1126
+    20200312,
+    1154
    ],
-   "commit": "33afdb46e1cd61251736816d965495525b36c9cd",
-   "sha256": "109gxdk7xznxm85fvlvccj01bznali98wzywypzy73l8zxs2yj74"
+   "commit": "b49ba259cc7e490e8acdecd28e66063f5ad1325e",
+   "sha256": "0b5mhgzbf1xy07g1yl0nb45hr0n18h6zxvw07zvahj2x1px9s6yc"
   }
  },
  {
@@ -99423,10 +99678,10 @@
   "unstable": {
    "version": [
     20200311,
-    1947
+    1951
    ],
-   "commit": "bdaf860b9e5ff9514890b991ddd45033513c4ac3",
-   "sha256": "0g2xb5mdg07ip1isvhzdwxvvxbjvv3xarkrfblgq0fai82f6yzpv"
+   "commit": "691a2bac50db70fc3bda5aa836952c4d3c3aed6f",
+   "sha256": "1cwl2jz0iwkr53b9l2vpj6yik4bghwqd2kcjpp7dpqx29i3sppyw"
   }
  },
  {
@@ -100409,14 +100664,14 @@
   "repo": "AndreaCrotti/yasnippet-snippets",
   "unstable": {
    "version": [
-    20200122,
-    1140
+    20200314,
+    1030
    ],
    "deps": [
     "yasnippet"
    ],
-   "commit": "612be838d2e50c3601c349d7842702d95e17682a",
-   "sha256": "1m7iyg7zw1jwv4sq788sv84269nydn7c6xbhvhip8hkddyn03pcl"
+   "commit": "d9a9ec282c6eb1156b06dd1362e018404221087d",
+   "sha256": "0kvpp1w02mr713lz9jnq0xwbl14f879g7f1icns3n6ilf8kgb104"
   },
   "stable": {
    "version": [
@@ -100972,14 +101227,14 @@
   "repo": "efls/zetteldeft",
   "unstable": {
    "version": [
-    20200214,
-    2052
+    20200314,
+    1814
    ],
    "deps": [
     "deft"
    ],
-   "commit": "301adcf54205a3780aed2988c58420da3feaeb43",
-   "sha256": "1mhxnmbmxj40774hvazp7n2yhwh9ikhmss4phk3y85gls30lqbyx"
+   "commit": "4871425426ee1d283b1147d0cf6daa7598fa8e70",
+   "sha256": "0l6s8psp98h8jch6g1pbqb25zzqjz352h4m3kpgdlxf68cq9iary"
   }
  },
  {

From c61d907f812abb0f3de738cbaa4a37fc7f96cbc9 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sun, 15 Mar 2020 11:03:15 +0100
Subject: [PATCH 3168/4636] phpPackages.exts.pdo_odbc: init for all versions of
 php

---
 pkgs/top-level/php-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 167ed5273966..a43e44417d90 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -2,7 +2,7 @@
 , bzip2, curl, libxml2, openssl, gmp5, icu, oniguruma, libsodium, html-tidy
 , libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl, uwimap
 , pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng, freetype
-, libffi, freetds, postgresql, sqlite, recode, net-snmp }:
+, libffi, freetds, postgresql, sqlite, recode, net-snmp, unixODBC }:
 
 let
   self = with self; {
@@ -821,7 +821,7 @@ let
       # pdo_firebird (7.4, 7.3, 7.2)
       { name = "pdo_mysql"; configureFlags = [ "--with-pdo-mysql=mysqlnd" ]; }
       # pdo_oci (7.4, 7.3, 7.2)
-      # pdo_odbc (7.4, 7.3, 7.2)
+      { name = "pdo_odbc"; configureFlags = [ "--with-pdo-odbc=unixODBC,${unixODBC}" ]; }
       { name = "pdo_pgsql"; configureFlags = [ "--with-pdo-pgsql=${postgresql}" ]; }
       { name = "pdo_sqlite"; buildInputs = [ sqlite ]; configureFlags = [ "--with-pdo-sqlite=${sqlite.dev}" ]; }
       { name = "pgsql"; buildInputs = [ pcre' ]; configureFlags = [ "--with-pgsql=${postgresql}" ]; }

From 1f5af3c60608b69bc62f9789850e8280a4d53034 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sun, 15 Mar 2020 19:34:28 +0100
Subject: [PATCH 3169/4636] phpPackages.exts: Mark if extensions are zend
 extensions or not

---
 pkgs/top-level/php-packages.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index a43e44417d90..cc830fa34986 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -704,11 +704,13 @@ let
     # Name passed is the name of the extension and is automatically used
     # to add the configureFlag "--enable-${name}", which can be overriden.
     #
-    # Build inputs is used for extra deps that may be needed.
+    # Build inputs is used for extra deps that may be needed. And zendExtension
+    # will mark the extension as a zend extension or not.
     mkExtension = {
       name
       , configureFlags ? [ "--enable-${name}" ]
       , buildInputs ? []
+      , zendExtension ? false
       , ...
     }: stdenv.mkDerivation {
       pname = "php-ext-${name}";
@@ -718,7 +720,7 @@ let
 
       enableParallelBuilding = true;
       nativeBuildInputs = [ php autoconf pkgconfig re2c ];
-      inherit configureFlags buildInputs;
+      inherit configureFlags buildInputs zendExtension;
 
       preConfigure = "phpize";
 
@@ -811,7 +813,7 @@ let
       { name = "mysqli"; configureFlags = [ "--with-mysqli=mysqlnd" "--with-mysql-sock=/run/mysqld/mysqld.sock" ]; }
       # oci8 (7.4, 7.3, 7.2)
       # odbc (7.4, 7.3, 7.2)
-      { name = "opcache"; buildInputs = [ pcre' ]; }
+      { name = "opcache"; buildInputs = [ pcre' ]; zendExtension = true; }
       { name = "pcntl"; }
       { name = "pdo"; }
       { name = "pdo_dblib";

From ce8674dc0ff2fec73024214a0b2f0cf36be3aeb2 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Sun, 15 Mar 2020 11:52:18 -0700
Subject: [PATCH 3170/4636] zoxide: 0.2.0 -> 0.2.1

With this release, you can now migrate entries from your `z` database!
---
 pkgs/tools/misc/zoxide/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix
index 33d6a8bbcaca..4ce1be83b557 100644
--- a/pkgs/tools/misc/zoxide/default.nix
+++ b/pkgs/tools/misc/zoxide/default.nix
@@ -2,20 +2,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "zoxide";
-  version = "0.2.0";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "ajeetdsouza";
     repo = "zoxide";
     rev = "v${version}";
-    sha256 = "0s0zrkn48rgsf2fqpgsl0kix4l6w7k7pwssvdja6y3a4c097qmnm";
+    sha256 = "0ldqhzkpbqjc1in0d0f7b06b8gim4sbh292qcbwhf5abyrhbm3m8";
   };
 
   buildInputs = [
     fzf
   ];
 
-  cargoSha256 = "1p65ml2qj5dpc6nczfvf341fk7y4yi5ma1x6kfr3d32wnv6m4hgh";
+  cargoSha256 = "1grrqbdy37p3r857gz956h0ls922ma5fz6f8fb3vx7wc98rap621";
 
   meta = with stdenv.lib; {
     description = "A fast cd command that learns your habits";

From d9fb53ddd63e61233a255565430a01df7f443709 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 9 Mar 2020 17:18:43 -0400
Subject: [PATCH 3171/4636] texlive: reimplement fixHashes.sh in GNU Awk

The shell script doesn't work very well in non-GNU environments like
darwin. This provides an implementation that uses just a single GNU tool
- gawk, thus reduces number of points of failure.
---
 .../typesetting/tex/texlive/UPGRADING.md      |  5 ++--
 .../typesetting/tex/texlive/fixHashes.awk     | 24 +++++++++++++++++++
 .../typesetting/tex/texlive/fixHashes.sh      | 10 --------
 3 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100755 pkgs/tools/typesetting/tex/texlive/fixHashes.awk
 delete mode 100755 pkgs/tools/typesetting/tex/texlive/fixHashes.sh

diff --git a/pkgs/tools/typesetting/tex/texlive/UPGRADING.md b/pkgs/tools/typesetting/tex/texlive/UPGRADING.md
index 3f37184e5d3f..71c42917394f 100644
--- a/pkgs/tools/typesetting/tex/texlive/UPGRADING.md
+++ b/pkgs/tools/typesetting/tex/texlive/UPGRADING.md
@@ -58,10 +58,9 @@ mv fixedHashes.nix fixedHashes-old.nix
 # start with empty fixedHashes
 echo '{}' > fixedHashes.nix
 
-nix-build ../../../../.. -Q --no-out-link -A texlive.scheme-full.pkgs | ./fixHashes.sh > ./fixedHashes-new.nix
+nix-build ../../../../.. -Q --no-out-link -A texlive.scheme-full.pkgs | ./fixHashes.awk > ./fixedHashes-new.nix
 
-# The script wrongly includes the nix store path to `biber`, which is a separate nixpkgs package
-grep -v -F '/nix/store/' fixedHashes-new.nix > fixedHashes.nix
+mv fixedHashes-new.nix fixedHashes.nix
 ```
 
 ### Commit changes
diff --git a/pkgs/tools/typesetting/tex/texlive/fixHashes.awk b/pkgs/tools/typesetting/tex/texlive/fixHashes.awk
new file mode 100755
index 000000000000..88ba0bc15289
--- /dev/null
+++ b/pkgs/tools/typesetting/tex/texlive/fixHashes.awk
@@ -0,0 +1,24 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i "gawk -f" -p gawk
+
+BEGIN {
+  print "{"
+}
+
+/-texlive-/ && !/\.bin/ {
+  if (match($0, /-texlive-([^\/]*)/, m) == 0) {
+    print "No match for \""$0"\"" > "/dev/stderr"
+    exit 1
+  }
+  cmd="nix-hash --type sha1 --base32 "$0
+  if (( cmd | getline hash ) <= 0) {
+    print "Error executing nix-hash" > "/dev/stderr"
+    exit 1
+  }
+  close(cmd)
+  printf("\"%s\"=\"%s\";\n", m[1], hash)
+}
+
+END {
+  print "}"
+}
diff --git a/pkgs/tools/typesetting/tex/texlive/fixHashes.sh b/pkgs/tools/typesetting/tex/texlive/fixHashes.sh
deleted file mode 100755
index 439660682e2e..000000000000
--- a/pkgs/tools/typesetting/tex/texlive/fixHashes.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-echo "{"
-grep -v -F '.bin-' | while read path; do
-    hash=`nix-hash --type sha1 --base32 "$path"`
-    echo -n "$path" | sed -E 's/[^-]*-texlive-(.*)/"\1"/'
-    echo "=\"$hash\";"
-done
-echo "}"
-

From 9752593eb093313d428249fb58480d07c5c3f6db Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 9 Mar 2020 19:13:25 -0400
Subject: [PATCH 3172/4636] texlive: 2019 -> 2019-final

The biber package is now at 2.14, but TextBibTeX is still required.

Few changes were needed for newly introduced scripts-extra path. This
broke some of our old tricks which were relying on having writable
script directories. The changes to the script locations made buildEnv
create symlinks to the script directories instead of directories of
symlinks to scripts. The changes to texlinks.sh and texlive/TeXLive
perl path were made because of this.
---
 pkgs/tools/typesetting/biber/default.nix      |    3 +-
 pkgs/tools/typesetting/tex/texlive/bin.nix    |   21 +
 .../tools/typesetting/tex/texlive/combine.nix |   22 +-
 .../tools/typesetting/tex/texlive/default.nix |   13 +-
 .../typesetting/tex/texlive/fixedHashes.nix   | 2161 +++++----
 pkgs/tools/typesetting/tex/texlive/pkgs.nix   | 3882 +++++++++++------
 6 files changed, 3753 insertions(+), 2349 deletions(-)

diff --git a/pkgs/tools/typesetting/biber/default.nix b/pkgs/tools/typesetting/biber/default.nix
index e42681dbd831..449208e9d5d1 100644
--- a/pkgs/tools/typesetting/biber/default.nix
+++ b/pkgs/tools/typesetting/biber/default.nix
@@ -10,13 +10,12 @@ perlPackages.buildPerlModule {
 
   src = "${biberSource}/source/bibtex/biber/biblatex-biber.tar.gz";
 
-  # TODO: remove TextBibTeX for biber 2.14: https://github.com/plk/biber/blob/dev/Changes
   buildInputs = with perlPackages; [
     autovivification BusinessISBN BusinessISMN BusinessISSN ConfigAutoConf
     DataCompare DataDump DateSimple EncodeEUCJPASCII EncodeHanExtra EncodeJIS2K
     DateTime DateTimeFormatBuilder DateTimeCalendarJulian
     ExtUtilsLibBuilder FileSlurper FileWhich IPCRun3 LogLog4perl LWPProtocolHttps ListAllUtils
-    ListMoreUtils MozillaCA IOString ReadonlyXS RegexpCommon TextBibTeX
+    ListMoreUtils MozillaCA ParseRecDescent IOString ReadonlyXS RegexpCommon TextBibTeX
     UnicodeLineBreak URI XMLLibXMLSimple XMLLibXSLT XMLWriter
     ClassAccessor TextCSV TextCSV_XS TextRoman DataUniqid LinguaTranslit SortKey
     TestDifferences
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 03394e1eb4c4..6054ea5c6e92 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -399,6 +399,27 @@ pygmentex = python2Packages.buildPythonApplication rec {
 };
 
 
+texlinks = stdenv.mkDerivation rec {
+  name = "texlinks.sh";
+
+  src = stdenv.lib.head (builtins.filter (p: p.tlType == "run") texlive.texlive-scripts-extra.pkgs);
+
+  dontBuild = true;
+  doCheck = false;
+
+  installPhase = ''
+    runHook preInstall
+
+    # Patch texlinks.sh back to 2015 version;
+    # otherwise some bin/ links break, e.g. xe(la)tex.
+    patch --verbose -R scripts/texlive-extra/texlinks.sh < '${./texlinks.diff}'
+    install -Dm555 scripts/texlive-extra/texlinks.sh "$out"
+
+    runHook postInstall
+  '';
+};
+
+
 inherit biber;
 bibtexu = bibtex8;
 bibtex8 = stdenv.mkDerivation {
diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix
index a4b0fb99f3e9..cb4bc14927de 100644
--- a/pkgs/tools/typesetting/tex/texlive/combine.nix
+++ b/pkgs/tools/typesetting/tex/texlive/combine.nix
@@ -68,24 +68,13 @@ in buildEnv {
       '')
       pkgList.bin
     +
-
-    # Patch texlinks.sh back to 2015 version;
-    # otherwise some bin/ links break, e.g. xe(la)tex.
-  ''
-    (
-      cd "$out/share/texmf/scripts/texlive"
-      local target="$(readlink texlinks.sh)"
-      rm texlinks.sh && cp "$target" texlinks.sh
-      patch --verbose -R texlinks.sh < '${./texlinks.diff}'
-    )
-  '' +
   ''
     export PATH="$out/bin:$out/share/texmf/scripts/texlive:${perl}/bin:$PATH"
     export TEXMFCNF="$out/share/texmf/web2c"
     export TEXMFDIST="$out/share/texmf"
     export TEXMFSYSCONFIG="$out/share/texmf-config"
     export TEXMFSYSVAR="$out/share/texmf-var"
-    export PERL5LIB="$out/share/texmf/scripts/texlive"
+    export PERL5LIB="$out/share/texmf/scripts/texlive:${bin.core.out}/share/texmf-dist/scripts/texlive"
   '' +
     # patch texmf-dist  -> $out/share/texmf
     # patch texmf-local -> $out/share/texmf-local
@@ -164,7 +153,7 @@ in buildEnv {
       rm "$link"
       makeWrapper "$target" "$link" \
         --prefix PATH : "$out/bin:${perl}/bin" \
-        --prefix PERL5LIB : "$out/share/texmf/scripts/texlive"
+        --prefix PERL5LIB : "$PERL5LIB"
 
       # avoid using non-nix shebang in $target by calling interpreter
       if [[ "$(head -c 2 "$target")" = "#!" ]]; then
@@ -194,9 +183,6 @@ in buildEnv {
   '' +
   # texlive post-install actions
   ''
-    mkdir -p "$out/share/texmf/scripts/texlive/"
-    ln -s '${bin.core.out}/share/texmf-dist/scripts/texlive/TeXLive' "$out/share/texmf/scripts/texlive/"
-
     for tool in updmap; do
       ln -sf "$out/share/texmf/scripts/texlive/$tool."* "$out/bin/$tool"
     done
@@ -209,9 +195,9 @@ in buildEnv {
     ln -sf fmtutil "$out/bin/mktexfmt"
 
     perl `type -P mktexlsr.pl` ./share/texmf
-    texlinks.sh "$out/bin" && wrapBin
+    ${bin.texlinks} "$out/bin" && wrapBin
     (perl `type -P fmtutil.pl` --sys --all || true) | grep '^fmtutil' # too verbose
-    #texlinks.sh "$out/bin" && wrapBin # do we need to regenerate format links?
+    #${bin.texlinks} "$out/bin" && wrapBin # do we need to regenerate format links?
 
     # Disable unavailable map files
     echo y | perl `type -P updmap.pl` --sys --syncwithtrees --force
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 44dc45fdfb2c..7b208e05593a 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -106,15 +106,12 @@ let
       # should be switching to the tlnet-final versions
       # (https://tug.org/historic/).
       urlPrefixes = args.urlPrefixes or [
-        # Snapshots hosted by one of the texlive release managers
-        https://texlive.info/tlnet-archive/2019/10/19/tlnet/archive
+        # tlnet-final snapshot
+        http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2019/tlnet-final/archive
+        ftp://tug.org/texlive/historic/2019/tlnet-final/archive
 
-        # Mirror hosted by @veprbl
-        http://146.185.144.154/texlive-2019
-
-        # TODO: Upgrade to the final snapshot of the packages before 20.03
-        #http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2019/tlnet-final/archive
-        #ftp://tug.org/texlive/historic/2019/tlnet-final/archive
+        # Daily snapshots hosted by one of the texlive release managers
+        #https://texlive.info/tlnet-archive/2019/10/19/tlnet/archive
       ];
 
       src = fetchurl { inherit urls sha512; };
diff --git a/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix b/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix
index f6cd70c0aa39..e7ea017ac162 100644
--- a/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix
+++ b/pkgs/tools/typesetting/tex/texlive/fixedHashes.nix
@@ -4,17 +4,19 @@
 "amsfonts.source-3.04"="vjiw3vdxv44nl4yvaxqfy4b78girpjs7";
 "bibtex-0.99d"="ybimfc49fzmgpy88wagy0z55sdsshr50";
 "bibtex.doc-0.99d"="z85q61ajdnn1h1rljqf3cmz76j7wk7ch";
-"kpathsea-2019"="pxadnxm342pbnkx16swvqkh3h4i0dm01";
-"kpathsea.doc-2019"="riqk53rhn7kpqlsiygpbxb2pdqpxw0sm";
+"kpathsea-2019"="3dwfnpn4fjynpbiqpyz789jagrpd0jn6";
+"kpathsea.doc-2019"="kg6w07wj29r4xzyhi36jkph8rf07rvyi";
 "cm-2019"="5xrqls79s3drpagj8j3ihqzkll10605w";
 "cm.doc-2019"="36wag31jc0lrgncaxhcspiaqpwnw7xvy";
 "colorprofiles-20181105"="9rs3wkarffy7hf7c9kymzacy20znvcqf";
 "colorprofiles.doc-20181105"="v1asppz0kqvfg85skaiisphh2z4y6mbh";
-"dvipdfmx-2019"="ijnr5k9wvwq8lnd22qjrrjmm962la5f4";
-"dvipdfmx.doc-2019"="rg5skprlg10ac8xyxkbsja5mgyncx3x0";
+"dvipdfmx-2019"="riw7c3haw76xk10jsncph76s5lvdwvra";
+"dvipdfmx.doc-2019"="svzp1hjzcz10d3z68bnmgxg0pr7vlvpq";
 "glyphlist-2019"="i4nay4q38l3367hlc93rhkgxvrkcmyjb";
 "dvips-2019"="92wx71n0k4ia02l5m44xkmw5z1q22pbg";
-"dvips.doc-2019"="6sb1q07cc45fhk8vzgnlk2q5zrbn3haa";
+"dvips.doc-2019"="7l2814ciknicz1fr7z5xagym05v38sn2";
+"ec-1.0"="kjq23jms9m9h5af2ri4bxd65w82lli3v";
+"ec.doc-1.0"="a8mvwdx6s8swxhagcc1p36dsy335fhby";
 "enctex-2019"="j6lf040j733q0aj90wvx2vwq0x61zwdm";
 "enctex.doc-2019"="p2pad1ncy8izfag44p0pndyvgckfngvv";
 "etex-2019"="mdrs8yrrjf03pcndsr5azzxz7lvk08jp";
@@ -24,111 +26,124 @@
 "graphics-def-2019"="yvcmr3xc5jflyh8fhaw0hgm68h3x5sk7";
 "graphics-def.doc-2019"="vykac1brcska9rhk2kni4krgjqwmcb7j";
 "gsftopk-1.19.2"="s7f70s4jyd5rnif4gwrli43k0pmfhhw9";
-"gsftopk.doc-1.19.2"="ygqc2yjbjw4mcjbj38pj8ar6x172xq9r";
+"gsftopk.doc-1.19.2"="k2s28hx5mq78ikd8383v0s8gvcbav9f5";
 "hyph-utf8-2019"="2p5nhs05nj1wkihyf08yfvvhj5w2l91v";
 "hyph-utf8.doc-2019"="gnsa3x6b0vnzxm27xplvmxxvhghp41l6";
 "hyph-utf8.source-2019"="jqzgwpvs62p4j2i2rr7hi9ai38gx1x70";
-"hyphen-base-2019"="dxji64yb6fkmvqnf1vs0mca9zymr4xs3";
+"hyphen-base-2019"="zxb1681z3wrg8waaq8nkwimlydv603wy";
 "hyphenex-2019"="1ak1ymbmsfx7z8kh09jzkr3a4dvkrfjw";
 "hyphenex.source-2019"="n4rvv61jcw6s91mydy65qq90clva5zrs";
-"ifluatex-1.4"="ccsyxfkf1qb03cxnkfs6gy7iinz89dwc";
-"ifluatex.doc-1.4"="g4dzj6fi4rmlz468v3ivq00gkbs0v363";
-"ifluatex.source-1.4"="q4pdan6i8fdhyr4h029ci1qv6nfrff3h";
 "ifplatform-0.4a"="sfnfrx7iqg6kikiqd44yx8004l2mqkza";
 "ifplatform.doc-0.4a"="sab580hpgp0nw6gq5li9vvv3x5gxp50b";
 "ifplatform.source-0.4a"="nkwc32c56f1s585rr18r54ib1xa9hn4z";
-"ifxetex-0.6"="llq1x3f5fykh5mg6avzb1a21x1vh2mxz";
-"ifxetex.doc-0.6"="1iy2bgx7adrh6dbbrhraskqggr65f7f2";
-"ifxetex.source-0.6"="dl81ang1gw395giysn3vk6lv4v5h9xr2";
+"iftex-1.0c"="v7pwnklpnllkwc86nxsl55h27kxnvh5q";
+"iftex.doc-1.0c"="vz4qalfr34r2pqqiz7grp7ayqxxbsp2c";
 "knuth-lib-2019"="cvjgvw8rwhmr98sz0y3azsyawzswcv3n";
 "knuth-local-2019"="g5vihblw8w8p8k8s14nakk959vpdgnh4";
 "lua-alt-getopt-0.7.0"="s2qkgq8dv65ib6chsah4xcargxh26bml";
 "lua-alt-getopt.doc-0.7.0"="xv8zqch612n2ww2pnpfranafcf7jhl96";
 "luatex-2019"="cyv130m5b93raz9qyqb23g2069cvfqz6";
-"luatex.doc-2019"="rli7lcyjk0igxdwxzz5g4vd8pizsfs41";
+"luatex.doc-2019"="swr1fbr2ndjrmq1yma7xh5q35g6fvpy9";
 "plain-3.141592653"="my32apfgd55b14vf8bsldaqwdd931gcg";
 "tex-ini-files-2019"="831h7dslin8dnan7llz8mki6zibqfglj";
 "tex-ini-files.doc-2019"="pqfrqdqmlbhmcpjycpf644v4vg0qw7ic";
-"unicode-data-1.10"="rdgsyc2626nybhwiwanp6zrmc3xgq61s";
-"unicode-data.doc-1.10"="hj4y19lylzpyqd3z58cr7al485ymgnpn";
+"unicode-data-1.11"="6w4q13ps09d7z12jk8dxjmpp1xz9s9xn";
+"unicode-data.doc-1.11"="22b5gc53qq2szb0774dvn1np24crsc6b";
 "makeindex-2019"="yzy90d3n087yrdsawabd0bn7iwz3m1i6";
-"makeindex.doc-2019"="9x9r1qc16jdij986xvyz13ipzqvc7ard";
+"makeindex.doc-2019"="ygvhwf55z6f9ix5jny8im72qwva5w560";
 "mflogo-2.0"="mnn3p5gn5h9yi4inkllswxn142j31mz4";
 "mflogo.doc-2.0"="rdirf33m53y719b35aby2d98v1i0jhh5";
 "mflogo.source-2.0"="hl5rzcmk83lpc5rxcvy31kzm6qbwx3g5";
 "mfware-2019"="7mwvvyrb9cz2d3k5jl8r1fl238m3gl6n";
 "mfware.doc-2019"="px98kdlpy9a8j5wwr41bj26sy7v0ydhj";
+"modes-4.1"="ymnjslxj4y3c9kv1bqjbmrvhf1395jd0";
+"modes.doc-4.1"="14qd1hvm8v18ald1cifwmvjs864qbpqb";
 "pdftex-2019"="jlscd5nj9rdhdhczjah0vmarhrqdv9z2";
-"pdftex.doc-2019"="y0hg5pllb0nl8q2cf7cka9y2s783ml4f";
+"pdftex.doc-2019"="0sa1yfhh85q63d1jrisvj7fcqha1r6g2";
 "dehyph-2019"="dwnq2aajr29sdydc45056na079ph8gc6";
-"tetex-3.0"="1av633anrh1362bd0jdjzmxccdihmkdc";
-"tetex.doc-3.0"="kkk61vzd79mpq8yzj26c88v9hz5iia7c";
-"tex.doc-3.14159265"="p071mch50kkp8fv3jppqz8wpixi6638s";
+"tex.doc-3.14159265"="d5y0rralm0m78rzsdhhsyc6qc3dhgf1a";
 "texlive-common.doc-2019"="amx0fzzmrb3p1cd6ianbl8vync5kl47m";
-"texlive-docindex-2019"="5j5z0j2qwdlg2v7wxwz8ndmbwql2s0vk";
 "texlive-docindex.doc-2019"="bw11wjaqjjahs4x0hnakfvmvrjmjckkb";
-"texlive-en.doc-2019"="xjar2iksr9zvpd8sa19nz94d27zwlx2i";
-"texlive-scripts-2019"="4slnm2lcj74cbda5ilf6qspc66zw2f7s";
-"texlive-scripts.doc-2019"="i65h4yvfw765smdvzlhm15fw38s2yjz3";
-"tlshell-2019"="533phr4487bjy6756yndli62gvbwh85i";
+"texlive-en.doc-2019"="y88n496gb2lbbwp2qxnyz7pcvcxf7mf3";
+"texlive-scripts-2019"="bfrfpyq7vslyai013v3ddyzlib90bg3n";
+"texlive-scripts.doc-2019"="dwcx7ga1fyh2xl8rg79n05kd49ndhmav";
+"tlshell-2019"="4zdv4d320b19sicsn86b25pgncsfqqh0";
 "tlshell.doc-2019"="yps67a47kr5r3ljhd18kq35bhn2qjj3y";
-"updmap-map-2019"="vs5lh5y6140dsd49w12gyvgvpwjg8nsv";
+"updmap-map-2019"="blygk27vcmpm0n1hn848a9zjxg62ynnx";
+"aaai-named-2019"="3lh28gvljcszn9vhzgsb6fp93m7n4d1d";
 "aichej-2019"="rmm8q17dvb470lyarcvgbpgip24a4fxb";
 "ajl-2019"="j0z05x267dbbw5r8s0ybvlj0hwky6sg5";
 "amsrefs-2.14"="crmn3pm2zy2fcr5d82dwwwxjm42na6j3";
 "amsrefs.doc-2.14"="r45n92fihia786v5nsab5vgjvwgmij6d";
 "amsrefs.source-2.14"="k1rzn2d509i2nkfwclpbpir3q6a41ya9";
+"annotate-2019"="ialyl5d9w1gip0k9n3kjf83w6991bdcc";
 "apacite-6.03"="sj9k6bnr8qhfddlzk7wd0daf12458yi9";
 "apacite.doc-6.03"="cbhyw6lwyg7mnx8h421y0hxf3h5m6n4y";
 "apacite.source-6.03"="cby7n3f9rzm83736nm4rn1m77km3lr9y";
 "apalike2-2019"="vf25kvilm8g379d8c5mkzv749nd9p8ap";
-"archaeologie-2.4.2"="fj7j1agf9h442pqf3qhr4rh456jhc077";
-"archaeologie.doc-2.4.2"="m7fgm0v0hqqnb2hnnsabpvf21wj9w2h1";
-"archaeologie.source-2.4.2"="mh92z13ri04fpgybdkl5xq59cff3jdbj";
-"beebe-2019"="vlf2az2sjd14kkyzc1wfhr9sq0mqsms0";
+"archaeologie-2.4.4"="jbgj35snc3xs2wincdpmj0gjnbk2lmd9";
+"archaeologie.doc-2.4.4"="1wpp72bvsgvg48zgnk500a6jxiq85b2v";
+"archaeologie.source-2.4.4"="s711i7khx26mjkzaiy0ki990yab4nx69";
+"authordate-2019"="d2bswrn2prjx106g6qyxs0sdhxxr0wfh";
+"authordate.doc-2019"="0p505jmjdgvy26acbbgmkw9cp008kzl1";
+"beebe-2019"="h8z9if6vab76a9aa0a5z920j2mvcz6hp";
 "besjournals-2019"="n3ljrkamca5v9w0rk3m38nqw86s1izc8";
 "besjournals.doc-2019"="3swy1ix6cxbp87hjlaf3x4ws4kg8sz77";
 "bestpapers-1.0"="15nq2m32h0giv41k6dslrw28han015aq";
 "bestpapers.doc-1.0"="mmlnsl83sil5zbdhwq16b6025sxdh9s6";
-"bib2gls-1.9"="20vrj8bvv3sxy871sxmbx1fbpvcfk6ka";
-"bib2gls.doc-1.9"="x4rsjfm3x052b6fmf609l07xj35y4d36";
-"bib2gls.source-1.9"="gg417lsy2grri0fd71nakl97bna20d21";
+"bib2gls-2.1"="vfm4vn7h93awqnr1fqpq0g63i5xk9ash";
+"bib2gls.doc-2.1"="6csr6s6isja89hbh6cybb58jscgqhpsy";
+"bib2gls.source-2.1"="5iawp2yg5swj36mb87x5h89hc6rrm47x";
 "bibarts-2.2"="w813f5qw2kbsmlhcwxsg62na06bp0p0r";
 "bibarts.doc-2.2"="xrv6r5iwpdyrjzqzanvgw2dy07xgkgb0";
 "bibarts.source-2.2"="c4js97f9wx1ndh8isk3fgg6lp1rhrrmb";
-"biber.doc-2.13"="p5ki8hv1wymby7l19ampq1d8i5bd9j9d";
-"biber.source-2.13"="3c1mnm03rb2m9rbp2ka9d8k7z97zwqjd";
+"biber.doc-2.14"="dh15vwnvr1a3x2qkg3inkj6v7mr54sd6";
+"biber.source-2.14"="gq0k1xk380k1sl6q9878xg7rxl9vywac";
 "bibexport-3.03"="gxzcd5xddarag47glbq02fmxgpn5ndw3";
 "bibexport.doc-3.03"="mvqlfzqzyhbnqw8xixa01qdfgrlm5xln";
 "bibexport.source-3.03"="q41ipwczv79cxnl2420cvcj5q9c6l57l";
 "bibhtml-2.0.2"="b0klmx8rd09znlxg7wz5m8b1f8qpxsjv";
 "bibhtml.doc-2.0.2"="snqyqvgwdwpkyfqfj69zwd478z96mcj4";
-"biblatex-3.13a"="6l70zbayjarzsri0vdxyx5hwcxg92lhm";
-"biblatex.doc-3.13a"="mr59rpjlcqpkziy1q4kl2pf5r930h9c2";
+"biblatex-3.14"="3miz9jhhbv5scw2jmrah14y7rwn11jf4";
+"biblatex.doc-3.14"="rf2d8iiwsilsf56lfpi39xg36439114a";
+"etoolbox-2.5h"="vkv8mqbzjsyh51cqk0d40gl48cj1zcmf";
+"etoolbox.doc-2.5h"="9rj773kv9ia8v5brs2aw8f4xrgg6r053";
+"kvoptions-3.13"="jnr335l6nr52608i08zza9z1qi7drnnx";
+"kvoptions.doc-3.13"="w77jdi8gdsjzlhzwscnjvhpp0l27dh06";
+"kvoptions.source-3.13"="ab0dw2aayx34kgshcjv0k4hx4zr9ar72";
+"logreq-1.0"="4kl4g8kjy4zch0rdn8aj2mr5yxpssdc0";
+"logreq.doc-1.0"="8s7ly9p9m270mhhh16gv5p71r10cpnzv";
+"pdftexcmds-0.31"="hxac5ylr8zlwlaq0ap8dbly3rz892z6d";
+"pdftexcmds.doc-0.31"="69mrbhhvrq1q69ap9vad2f0hjy7mf9c3";
+"pdftexcmds.source-0.31"="v1c5nbfzz7g72ryj030sbnk7f3y7igg7";
+"url-3.4"="vf34zjwlv43kcw53sdla9052x7x0kn7y";
+"url.doc-3.4"="ii3z3l7xkmrkxb8dkgk6lcqyb34niirc";
 "biblatex-abnt-3.4"="ryrk1n85x197ff723jla7vrcv4jkb2fv";
 "biblatex-abnt.doc-3.4"="i1b7mjmy8din75dzaqb407n5byavjwzy";
 "biblatex-anonymous-2.6.2"="yv83qimx8n31f00csmlxxlmymxsq1ngf";
 "biblatex-anonymous.doc-2.6.2"="s3g5ndv0alcpi8jmslrashcg4slb96hz";
-"biblatex-apa-8.0"="3grx9ci8fpg4x673kb74xyy4vwfwrv8x";
-"biblatex-apa.doc-8.0"="7rvsh97frkac4cr9622if48bhj9myk65";
-"biblatex-archaeology-2.1"="fwk746qhhpvx6cdwnlpr9lsk4fz2p6k5";
-"biblatex-archaeology.doc-2.1"="ci6qj0qllffk6xbdwddhdv7i3fq0jip2";
-"biblatex-archaeology.source-2.1"="g4xg5j30gj6qjr5diqxw4j6wn2p7y3xk";
+"biblatex-apa-9.6"="2g68sdqx9psqbkcbn9zy2xbjk33sjppn";
+"biblatex-apa.doc-9.6"="ldllah271jz816nccaybyg9k6p2v3j4w";
+"biblatex-apa6-8.3"="df6vxwgcky269dr65v1xi4a4ycxxrppx";
+"biblatex-apa6.doc-8.3"="bmrj18hdb2ls5s7n52148g95fi25v9n7";
+"biblatex-archaeology-2.2"="4f3a6ma209x4902fw43xhhs9wkk741hn";
+"biblatex-archaeology.doc-2.2"="n8377bbiwq09fszgq2lq7i3qkzr32jbi";
+"biblatex-archaeology.source-2.2"="c6316rahqfyxqkb546gpljvqj8jncccx";
 "biblatex-arthistory-bonn-1.2"="298lp84p62rlsin8y7spz0ig2g8wla3b";
 "biblatex-arthistory-bonn.doc-1.2"="bkssng4czmqvimlv8f2bdh4sxdrag13i";
-"biblatex-bath-3.1"="yqsh8dki8m1vqfsgp581sg1603dia6wr";
-"biblatex-bath.doc-3.1"="m2brk51j4svs62zligpih1cmbmqbx9f9";
-"biblatex-bath.source-3.1"="ph4vmzn2q8a4g5bla9jqh46yrq9awql3";
+"biblatex-bath-3.2"="lphjk5j7fyqqhni5ddh7l2s5qm81x5kp";
+"biblatex-bath.doc-3.2"="i06vx63xdykw9z20hyfnv358i5fywybq";
+"biblatex-bath.source-3.2"="rz1ckg5cqcxdyi4928r5fxbm47aiqgsj";
 "biblatex-bookinarticle-1.3.1a"="bnx6iravlnrkkyqb3ah21p0ikq00ab57";
 "biblatex-bookinarticle.doc-1.3.1a"="6shjhb1lajkivsh3mrr2whli5hcsb8b4";
-"biblatex-bookinother-2.3.1"="r1bfwp8rzwmkbn47yi7m5lv5z4q439ch";
-"biblatex-bookinother.doc-2.3.1"="98cz0hzxvjs7qvc25hj4snm2cy6xqw9f";
+"biblatex-bookinother-2.3.2"="88v9r4l153lzbkz6ss0r1nfbhh45yqgf";
+"biblatex-bookinother.doc-2.3.2"="pbxlk3azrd21zcsnc7f1sfqpq44632qv";
 "biblatex-bwl-0.02"="0a11hlav9gsavdisyjckvnrxkkb4134w";
 "biblatex-bwl.doc-0.02"="b7ddxvcabp9qd88mzb6dxvw7sz8dnqfq";
-"biblatex-caspervector-0.3.3"="lpdqh2pgsaz1rm3zkpm07pgrac1hqxpn";
-"biblatex-caspervector.doc-0.3.3"="3c2lhsgv6ywx3q48iw2wc39ib9c4rgaf";
-"biblatex-chem-1.1x"="83hmyr4xgjn1g1zfnxhlzjlhgicd6j0j";
-"biblatex-chem.doc-1.1x"="dnhi32pmha9nzzngd4dqx4mmxdb3an0x";
+"biblatex-caspervector-0.3.4"="5rgdqdckgrl9pbk2d3q4cr0g6j2gb0mf";
+"biblatex-caspervector.doc-0.3.4"="2n8fhy903ydzz24kqc491qd7x0hrypjv";
+"biblatex-chem-1.1y"="fizmglf8yy4zn0kqbng2d5c7i9migvjs";
+"biblatex-chem.doc-1.1y"="xl7fq05fa16ayzpxpjjqjdkkdxb0jj6x";
 "biblatex-chicago-1.0rc5"="0m7wf9glvcqm20cfn6xgpciz6nvg8vib";
 "biblatex-chicago.doc-1.0rc5"="zr7fqjvzg0i8nmzldwsidq8r58xcbhlx";
 "biblatex-claves-1.2.1"="yq5s9plvimz4w9san81swl08g2v6pa6q";
@@ -137,30 +152,32 @@
 "biblatex-dw.doc-1.7"="ppry56vc44c86m47r1z8mq9s7fg77n8m";
 "biblatex-enc-1.0"="ccc2f3rnf7kyavb3r2hmah6pcfl1xivg";
 "biblatex-enc.doc-1.0"="b54x1g0296ln6lkw1zvlbmshhr93vg7y";
-"biblatex-ext-0.8"="nz7zmq8xw0s63rvg6qz7y3mbxybfzlnj";
-"biblatex-ext.doc-0.8"="y8q3dr3l9ld521s9q748pd3qf22kki2l";
+"biblatex-ext-0.8c"="7m6l4jagryik9vfbsgblvg8c7ivzbcln";
+"biblatex-ext.doc-0.8c"="7i5s76fxxnc6l5zrfbdm2kb26xl8rf67";
 "biblatex-fiwi-1.7"="xwb00mw95l90bba4fc31kw62p43cxjz1";
 "biblatex-fiwi.doc-1.7"="y5hpi0gwp2s7hgqir2qw2yam9l3aqzdw";
 "biblatex-gb7714-2015-1.0s"="349q48k7k21nwy0fkkha7jjgjkyygcqa";
 "biblatex-gb7714-2015.doc-1.0s"="x5gybphqsrbydy3lp2vkdfzcfacxjlwn";
-"biblatex-gost-1.17"="db6rrz6vh7bhn8mi21lqii2r0ha8ii26";
-"biblatex-gost.doc-1.17"="2n6ghdccgmqgpd0rj53zhaja1p4dimd8";
+"biblatex-gost-1.18"="xp5b370133fs6dsr8xzw9xfnyxf1hxfa";
+"biblatex-gost.doc-1.18"="jldlsx5faynps1m7zfc94asbcd7473x2";
 "biblatex-historian-0.4"="xp6r6a37ibm9fhdc95b2v3x5kgyz26c8";
 "biblatex-historian.doc-0.4"="6280kicfk2n0hwp03pyhl29ljdg911hb";
-"biblatex-ieee-1.3"="sm3ssfjjdkvmnbak50dk3rs1pzh12dba";
-"biblatex-ieee.doc-1.3"="pv4yx2prl0xzk7bbnj03i3blc5n7mpkv";
+"biblatex-ieee-1.3b"="c9xvvwp0csvicxg2lv7lfsyszza26r0q";
+"biblatex-ieee.doc-1.3b"="8426p4jfhm4kswblmmc20s131sdlprp5";
 "biblatex-ijsra-0.1"="179hh36v47xfagjwp5vj3hczc18jkrgf";
 "biblatex-ijsra.doc-0.1"="x3js5mb545xapavsqq4phml7zqiswiki";
-"biblatex-iso690-0.3.2"="y5032mfrc8djxnwsawcpa611rpdhmas3";
-"biblatex-iso690.doc-0.3.2"="rsv82pgp6f8prdw2yqw6zw7q94wk1sax";
+"biblatex-iso690-0.3.3"="sxgb0zhcib9kgk12p3dph0w5915b5vag";
+"biblatex-iso690.doc-0.3.3"="x2fp9x7nyyk09ck9dqaigjdqvh4qchpn";
+"biblatex-jura2-0.3"="rp45sjnc0n79x8qkigpjajc7crfxcnvg";
+"biblatex-jura2.doc-0.3"="wss54malzwr4b6scmd8a5ij3dmkbgdwx";
 "biblatex-juradiss-0.1g"="0smwgi3vg97aiy6w8ya68zmaz711drlp";
 "biblatex-juradiss.doc-0.1g"="d4dp9hld95b70k8b5qxlmvcgcsxpv0g8";
 "biblatex-lni-0.5"="hqp4whkb7d4h71kdc8gvqjrrr12f6dda";
 "biblatex-lni.doc-0.5"="z9pj0sxkl3ld3hq89bnlllx1522rv3kn";
 "biblatex-luh-ipw-0.3"="83gar343q3h1h96h8lzs2bmsp1ba82n0";
 "biblatex-luh-ipw.doc-0.3"="yxcknwckw9s58qhrbdd70jz5yrpnyip2";
-"biblatex-manuscripts-philology-2.1.1"="z6sn2zg9ahldf95jh3kpzbagzg6szynj";
-"biblatex-manuscripts-philology.doc-2.1.1"="8fv3b9xphj57awnyfjpz2prn1lr9i5jb";
+"biblatex-manuscripts-philology-2.1.2"="j14fgf20nw86id6f508kyf2ki91yr24p";
+"biblatex-manuscripts-philology.doc-2.1.2"="196869iqggbx5kbhpmqx0kn9v474ny5p";
 "biblatex-mla-1.9"="1m10jmh42x7qahq16bzi2rwvv7j7biq5";
 "biblatex-mla.doc-1.9"="f6b9nj6xj93vikp4agvkrjddrrgfvjc2";
 "biblatex-morenames-1.3.1"="vbcnaicg2pa0jrqd170cs31wim08yk07";
@@ -178,14 +195,14 @@
 "biblatex-nottsclassic.doc-0.1"="mswi2valgb31i1whlspd2mxvfcs1szdh";
 "biblatex-opcit-booktitle-1.9.0"="3aspv5b3a0lpif4wksanjq3fqclqkdij";
 "biblatex-opcit-booktitle.doc-1.9.0"="sz4gb2ahn58y76cl92hpap7xxg0mg0y5";
-"biblatex-oxref-2.0"="50cq5z924lx7l5i6p5di5qy42m0x6sm5";
-"biblatex-oxref.doc-2.0"="vsrcdc86gwn1iy74117lmdxs730f8ijj";
-"biblatex-oxref.source-2.0"="hxsvlk8vqcv7m52lycq6gcg5v7kay5vn";
+"biblatex-oxref-2.0.1"="nlc115k2ciss7450vlbksrav7y3wrvqm";
+"biblatex-oxref.doc-2.0.1"="2q3cb51zp8iaaps2m2m7lw1ffzm0jzlz";
+"biblatex-oxref.source-2.0.1"="dyyjar6l7fzw2glggr3xzszcmmigbkpl";
 "biblatex-philosophy-1.9.8a"="kha09gq8n5db4fxh2w6s5690vms39hlw";
 "biblatex-philosophy.doc-1.9.8a"="3m8nl72q1q3hfv3xxdj978pmxjvn43s2";
 "biblatex-philosophy.source-1.9.8a"="3102fdih2bxplhadmwvi09lns9agflcz";
-"biblatex-phys-1.1a"="02hwhka1l116g9dzzj8yypq6ym4x8jb1";
-"biblatex-phys.doc-1.1a"="ys5z5v2rwqq0y2rs9n9hkgcsqc31cfar";
+"biblatex-phys-1.1b"="w0pxnyvy531qn79ahihx1iim8snhlyn7";
+"biblatex-phys.doc-1.1b"="jxa3qi102kdamzn9yc0bqrck650wib7b";
 "biblatex-publist-1.16"="jz1rnnnqx61jc88ksl536sldn2sc066j";
 "biblatex-publist.doc-1.16"="yikna45mkm4k222s7kpgs827q28al3vf";
 "biblatex-realauthor-2.7.1a"="6qb576bh9x616f02msiq3xz83xzaa047";
@@ -238,6 +255,7 @@
 "chicago-2019"="k9y76g5a4nfy88igklw08n27zvnnap2b";
 "chicago-annote-2019"="nyasy7sal5vikd1jysdvhg0ym7hs6q0p";
 "chicago-annote.doc-2019"="8qhd3kj016s9laavhg1wvimy4325zz0g";
+"chicagoa-2019"="7ka9kkyvy1w4s0xipgr6f49lajd78nzn";
 "chscite-2.9999"="yc7v9v66md3dy5k2gjswzh58xzxdhwp4";
 "chscite.doc-2.9999"="fbcykh46rifs4kvn728sav04fnshr6br";
 "chscite.source-2.9999"="vsii846cdlrd9fdmf4npwy8jxh0fcafb";
@@ -251,72 +269,156 @@
 "amscls-2.20.4"="hjr4w21h3fp0y6m5gb30p6f54ybv0l0j";
 "amscls.doc-2.20.4"="zyf0gsqks7yvszlngwzjbjiigc0943cd";
 "amscls.source-2.20.4"="8lgim0r54srk961ys2q7v80dq5w04i9b";
-"amsmath-2019-10-01_PL1"="56ydwy656jmvlrqnksw6v0v56xvkwlmd";
-"amsmath.doc-2019-10-01_PL1"="4g50843qsxgdyhg4f9iwz2v46332p0bm";
-"amsmath.source-2019-10-01_PL1"="n2gqxbxbnjrrlgwqsalzkg701xg29lxd";
-"babel-3.34"="wadnjmg9fbalgj65app4588ky6bv5yr8";
-"babel.doc-3.34"="adhzabyv276nc6df3xrid4kb7ra478x0";
-"babel.source-3.34"="03jmz4d3836jrhrbrgzbkbl7a5yhghsb";
+"amsmath-2019"="v9xa953rly8mc854mfq4zzavwpvswkid";
+"amsmath.doc-2019"="1ql51mqama6f0r7q58npmcy8zns5nk81";
+"amsmath.source-2019"="2crzrkgbi131v1db2zz8ysfbgjminxc5";
+"atbegshi-1.19"="rd12v7qnwk6mig4vcr1xziqrji613i8m";
+"atbegshi.doc-1.19"="qpmwwvq8lzm95iipc1bqmff8z1fjwr20";
+"atbegshi.source-1.19"="h4ah2l0qz9yh9y4sj51ai95n5ynd65bd";
+"atveryend-1.11"="j6dsf39s82bqanyknzzfj6mkbj11alyp";
+"atveryend.doc-1.11"="bb83sv1dyy4dmk0qripn9i08myb3vjr1";
+"atveryend.source-1.11"="h1pvzqx2qna6kzhfxrl81f1r83sp543l";
+"auxhook-1.6"="xac68wvfhmds8251pc9ii7rjlak9ya27";
+"auxhook.doc-1.6"="gmg6905gsw51mvqwpksajw3p8yjag16c";
+"auxhook.source-1.6"="d0f1ia58xllmkg796dvky2b4mv86p7yd";
+"babel-3.41"="sirs099z46wsbmc4lq8xwc8anxkz0klq";
+"babel.doc-3.41"="6dj92yi6jjfl0yaxylzz89q1v5n2c0lb";
+"babel.source-3.41"="g6sdds3bcvw4v2nd97p5n2dldvrs30b8";
 "babel-english-3.3r"="lrsz299wwvr17sshfjvsvrzs0s9y2acs";
 "babel-english.doc-3.3r"="y7rp46lrpxsp8z1ridc6msxnbb008k0c";
 "babel-english.source-3.3r"="5sxvprjfcqhw6xb3mv3b0smp2gsckjs9";
 "babelbib-1.32"="0jpv3d5s8inkpg1nyz1b8m80aq6simwa";
 "babelbib.doc-1.32"="cixpp9aiajyjxj23gzvxw94zydsxd3az";
+"bigintcalc-1.5"="3ivnkj1qyviffssxymdjy0nagrkh95yp";
+"bigintcalc.doc-1.5"="hmfcvfzcyal8sz74ywhcqx3ydhmywgnm";
+"bigintcalc.source-1.5"="jlaf6n169xxpipzg2d83dclk05v72h74";
+"bitset-1.3"="nw1h1rrc82r2saka495mncrd6vn54dj6";
+"bitset.doc-1.3"="srlljjm4s7sfkclndy4ziwcgm3r6mpjb";
+"bitset.source-1.3"="1fc9dp30lpgicd4c3cj0vkqy4j01lzkq";
+"bookmark-1.28"="bpz7mvymqhww5nimmwnsmyfr39374cm9";
+"bookmark.doc-1.28"="briagq8yzmxjx9ridrrwql99a1pk6lv7";
+"bookmark.source-1.28"="2h3yqzjr5z2jfy53r45403cfli8ch6g1";
 "carlisle-2019"="wlkxgqdq20dlbinabdia2n1af9nhz5vm";
 "carlisle.doc-2019"="i2mg4zqlcsipqcz4wa9y9p89nnfzvavf";
 "carlisle.source-2019"="bvla3z6fd0m46k365s2fsbpb5ypvb3rv";
-"colortbl-1.0d"="4lw5iwy35py4w2arbznxb3r9yd443z68";
-"colortbl.doc-1.0d"="45mzaihfjzwfv33k6c01d1nwdyp0agsc";
-"colortbl.source-1.0d"="9val9i06wbmvv4xaqp79ci1nqckswcbp";
+"colortbl-1.0e"="v55k9b9db0gy7fhqp0lg3isy4v9slphm";
+"colortbl.doc-1.0e"="445wygx49bhlsyqm9czmp4npksgxxs01";
+"colortbl.source-1.0e"="jbxzz8nx1gxm642yr63am3nz9f3sqq5b";
+"epstopdf-pkg-2.11"="zv5klqnzp6iwpllzly6rhxqk5c5bb21k";
+"epstopdf-pkg.doc-2.11"="j34mjnq5zirwy9bb3gjfkrxzwh8svxrl";
+"epstopdf-pkg.source-2.11"="a8yniblkh6p3lcqdlmp7xdyv0glp9ivm";
+"etexcmds-1.7"="5ihd653q0sbq1q40hd9pvwxj73j099iq";
+"etexcmds.doc-1.7"="h35i02fn3bim95f50bvq50pwiymjdpag";
+"etexcmds.source-1.7"="dkiaxggiyzx1w07brj8zgqn7f1s4vs4h";
 "fancyhdr-3.10"="0jn1ivsf29hmmclhxbl1fc2gmglgwcq8";
 "fancyhdr.doc-3.10"="dndsyllh1bb96p5acr7dics7831g4pax";
 "fancyhdr.source-3.10"="xg41mjxhd1vajr1n1s8vzvggkf4zi9lz";
 "fix2col-0.04"="4lr11c6qqbsmm3jixayn7jlyikh65b83";
 "fix2col.doc-0.04"="k9hlwbz12vqc446y1ydy045j7c29yzng";
 "fix2col.source-0.04"="524zn5yfy3zwy70m11vch4ri5xwrgi0p";
-"geometry-5.8"="3xdzw74y7vizrlzxrcb5xbqzs67v8g02";
-"geometry.doc-5.8"="w0ldwyyv86y0d8ghpg9x603ldmqa33gw";
-"geometry.source-5.8"="x0dgg7kpn2apxabf2clw02ba8ci83pvk";
-"graphics-2019-10-01_PL1"="2ba5bkbsx0cr555yc2fdg8nya9y915kv";
-"graphics.doc-2019-10-01_PL1"="yibgggcnv294s7f6lqyvby1psd6v15ry";
-"graphics.source-2019-10-01_PL1"="25rd6d1klffzzih3anv4jm49xz72p9g0";
+"geometry-5.9"="lh2ipfx1nhgq622jg0d63h34pcmf9w62";
+"geometry.doc-5.9"="lbicfnq1a337hyqqv9a8gka58d9na7pf";
+"geometry.source-5.9"="7clx1fs5q3w4qy58x4iicybgjm0985hw";
+"graphics-2019"="a3v0hbvmdjv6g6q5261gp2bpfqcqsmy9";
+"graphics.doc-2019"="d6rkw4xhxq19s8yvxxdn20kvvgg187iz";
+"graphics.source-2019"="0gxgf08csyxj8zjlkvlq8kp7jp1rc6z3";
 "graphics-cfg-2019"="j73na78ajl4n50wn2is5wvw7mf27da86";
 "graphics-cfg.doc-2019"="nzdjyk00lx0xhflm04d2kmyn5ya2v487";
-"hyperref-7.00a"="jbr8bq1504pmig2vd31bckicwm5p3g0z";
-"hyperref.doc-7.00a"="d177im8cpmc0hm6084lrims8zysbchlq";
-"hyperref.source-7.00a"="acwybgz16b0h3b9arhxrqlgg28phizfs";
-"latex-2019-10-01_PL1"="pjjiksxcbbrg4fwsqzj7xxy1g75ma8wk";
-"latex.doc-2019-10-01_PL1"="ibfpbbkvvk682gczxcfl3586kc11wyp1";
-"latex.source-2019-10-01_PL1"="a0x0c407wv20dx8dw2hgwzwl89mh8p4n";
+"gettitlestring-1.6"="a4i7kyl19gyxdjkmmmrq7cwsjz92mapc";
+"gettitlestring.doc-1.6"="hrn7918v2qlw7xlcsslms56w33wcfag1";
+"gettitlestring.source-1.6"="lskbp47gqwb0gydcbq2dva1wskr9isjp";
+"grfext-1.3"="ds9vw8yvxaazr9jwfx7s4pldwpqkmynn";
+"grfext.doc-1.3"="zdbrsf2a9y0g128nl2j124b2qyn9japz";
+"grfext.source-1.3"="zig714i8cp2ibvchcigj4h7pvls2xw4v";
+"hycolor-1.10"="fpks9kvhjvqs20wq3ay8i5fhy9vf0r15";
+"hycolor.doc-1.10"="fmls09bj0wgl6bx5djbyimqd7dhyfcjs";
+"hycolor.source-1.10"="pdsx5dzxqw064s62bllxw2r27102p689";
+"hyperref-7.00d"="h93ya61rcia87phjmq8g7zgfbb6sf3mf";
+"hyperref.doc-7.00d"="d14njcv06hr30b01g0cbxypzwjfp6jny";
+"hyperref.source-7.00d"="9ppj94hdgr47v99fb1b8yd5h964wqix2";
+"intcalc-1.3"="3qbzf5d01w7jk4ffnn3h254vf0n4qqhj";
+"intcalc.doc-1.3"="g6yv27w5qs315nywq85qmicvawyp6wp4";
+"intcalc.source-1.3"="mz1j4jmq5i376ldqik3c9ayl94d78cyc";
+"kvdefinekeys-1.6"="fldkjwcdqbhd7i17cfgq0vdfbvzig8l0";
+"kvdefinekeys.doc-1.6"="wmqgxhq2mivr2xkkwld1fl9hvnfdadv6";
+"kvdefinekeys.source-1.6"="77gvvb7rbdbpllgrf7nmzpwccjhyaccb";
+"kvsetkeys-1.18"="a9h084zz8smpw0x7n6yk11rflljgvzds";
+"kvsetkeys.doc-1.18"="74m2j2fayy0s6bn3s2ard83jbz8wvvh6";
+"kvsetkeys.source-1.18"="wbj79prrl1h2f8csxp4js2kjzixlxpip";
+"letltxmacro-1.6"="1hik240za8h6rs8yz8x6f5vnzanmr79x";
+"letltxmacro.doc-1.6"="yjy1hvgprhi7n60dpgm847k65zz91v5m";
+"letltxmacro.source-1.6"="m8q4jdw8fxwff5yrdg4rq3kmf0a05zg9";
+"ltxcmds-1.24"="aw3bpld6wq939h9b4a57xsi82nv7y0jg";
+"ltxcmds.doc-1.24"="yw90x0ni4sjf3i0f0f6dza0rxy4xqlq0";
+"ltxcmds.source-1.24"="gvwjdbmvdsvzn18gs8br619ndfjfg059";
+"pdfescape-1.15"="4150ga4j3q8q8g73k2f263arfdav6mpd";
+"pdfescape.doc-1.15"="rdc2ws2iy75nympsdis3y6wfillzn8rd";
+"pdfescape.source-1.15"="dji9isdc78x365cg06il8pmi7cl985yr";
+"refcount-3.6"="kkajyqzfl96l97d9bxf6rv73b352i80n";
+"refcount.doc-3.6"="pz7hz3r7fb1wfc6hn3nns9lki50b0vja";
+"refcount.source-3.6"="bxx3kybs3z4psj5an2zi5mm7s06byc4s";
+"rerunfilecheck-1.9"="2ad5yfj4lzqpa7ryfq6f1j8fk6z60zb4";
+"rerunfilecheck.doc-1.9"="1cxpz0mniq4fblfwh9yr0w050wwmkkc4";
+"rerunfilecheck.source-1.9"="rgh8xfwx2j1m99adrj9s5gjmk6kg7zz0";
+"uniquecounter-1.4"="mk6m54q43qz49g046bh3ijlqbjm0im3f";
+"uniquecounter.doc-1.4"="s5cssk7vhkxpas18fgr0d7wdmg6kchs2";
+"uniquecounter.source-1.4"="3kqrkl3sgz2dgwsh6x0027xzhil5rigp";
+"stringenc-1.12"="mmjk31qhflv57x6gpwdipcxz2i2x8fx1";
+"stringenc.doc-1.12"="7cnk13y2ilryc5pccp0l0aj6gd1386n8";
+"stringenc.source-1.12"="x2qlpjnp9jaygakbvw30wlg9sh8xyr08";
+"l3backend-2019"="z6wh5cqir7icbih4kni4259m6sib8kyy";
+"l3backend.doc-2019"="j59ndgc7d7y9mdh6fwdxlqgj9a1dg8if";
+"l3backend.source-2019"="y2jdzx8mfir676arj2qwb3yqnc8ghlcg";
+"l3kernel-2019"="8fyf0y5q84vxzwa2k0g7npig0z51c40j";
+"l3kernel.doc-2019"="snvn093p1vv9s2qawdx2py071cz1gmrc";
+"l3kernel.source-2019"="dzkgibl62dlyf31q5qz353drqal9j0md";
+"latex-2020-02-02-PL5"="zk5q743mvp8bqq11y72g0h29ff9wjc4v";
+"latex.doc-2020-02-02-PL5"="l8f0d3bzyqlxv7q9abp39s1r1w0lql13";
+"latex.source-2020-02-02-PL5"="g4va39aywmz200pnvnl55699js6bzkkl";
 "latex-fonts-2019"="pw97wy7b4hhzm28r0wl44lacn7nx41ia";
 "latex-fonts.doc-2019"="mv9ivpdxgyjj92fq9141bsw5s306mg83";
-"latexconfig-2019"="4vggm9mgi3pyfk3rqqfmwhdcp9hcva4z";
-"latex-bin.doc-2019"="sklvy72k0l7x05rnj2hc4dwgjqq5jf5v";
+"latexconfig-2019"="p0p0bmn0xa6pny05y862pnviafrjhr7i";
+"latex-bin.doc-2019"="wcsdzg8gg1f2c5j5n73pj109ah474jr9";
+"lm-2.004"="ci5dpznkzlal3bkn0dcd2m5i05aws66g";
+"lm.doc-2.004"="w3g5xn4pfqhri4glpbh66rs8d6nbrd02";
+"lm.source-2.004"="bw69srvx8mprnj8d5f48bq3mg1ysfk1n";
+"luaotfload-3.12"="ackv6b8wkvqxpsiihkal9cqand8hii8w";
+"luaotfload.doc-3.12"="wxi9k0jcksi4vaf6xxhdblbmcql8y06c";
+"luaotfload.source-3.12"="6gn5jrfg8f082s56abjw86ss54x1lg13";
+"lualibs-2.70"="m5gqykaxhmj5g03x8wrkr0klind62ymp";
+"lualibs.doc-2.70"="vg9ab9js8xywziah3qv2v9zxg75ck0hx";
+"lualibs.source-2.70"="5z8xq8kwx7sd9pva0y3mmgxgxq7n5wp8";
 "ltxmisc-2019"="lf6x6jbl1d3i77wb0dg7lmy26qxk7h8x";
 "mfnfss-2019"="52p8xnxca0ypcxbbjakx42mljjwv5jjj";
 "mfnfss.doc-2019"="0c2hn0h964j1c0kzn0aq19cvff0n87hs";
 "mfnfss.source-2019"="829y6cng0z45bdsb2vdrs4wkq2pp0cxz";
-"mptopdf-2019"="ppsa0jcj7d7gi35cp2y5pbw6kqgkzfac";
-"mptopdf.doc-2019"="0v8v04k9s2i5yxdl77l3rnjhg0k628bz";
+"mptopdf-2019"="s1gykljbmzqqpdhipyxnsz4cmmpxmm96";
+"mptopdf.doc-2019"="1ykld5gmmg25mr3i0bbf0piscpd5v4xv";
 "natbib-8.31b"="c4fyqph06vxqm37z88r31q84xz5imcnj";
 "natbib.doc-8.31b"="fsg1kcjvbp5hfn9h8lwhygnil9wr7awg";
 "natbib.source-8.31b"="c4b7bqivps74v8286lf4j36p551jhnzj";
-"oberdiek-2019"="jjyf8yvabnnn9qq9p5984803gb1s1wc6";
-"oberdiek.doc-2019"="qzviygm5dqka4fphpj2s6pxsrllr37a4";
-"oberdiek.source-2019"="3jha5akdwhi1998gvg0hk5kbk0f5mp6b";
+"oberdiek-2019"="ys692jj87xpwi8wccf894rl1cddag1qg";
+"oberdiek.doc-2019"="8gvg7cd988yszmbc6y4n9427hzxmi4q3";
+"oberdiek.source-2019"="2j2ybm3kipln69ar01hw0zjwj8ihy26j";
+"grffile-2.1"="syj6z9xmjbkjwn9fvk88bh5z0jsxqhfh";
+"grffile.doc-2.1"="lbm6cjskdpf47d9imp0ina431wagj5aw";
+"grffile.source-2.1"="a5pp25fmbhj3zb33hx18pcfc2i14gjcm";
+"infwarerr-1.5"="75sarxc1v1ycj4rj6hikd7i0wx6b2w65";
+"infwarerr.doc-1.5"="s0g9m590r3jq0r9d3lidi6pd8paydimk";
+"infwarerr.source-1.5"="idalazzzcx2mh2b23q9sk7amwsk3f1wr";
 "pslatex-2019"="7apd53ad70mr9pf8ja87iz4cfm41qs9p";
 "pslatex.source-2019"="cqc3yah7p9cgbbsj6var19b4xzyqj01l";
 "psnfss-9.2a"="a4gfps30ywrjdah9m5dknsv5yl80h0gz";
 "psnfss.doc-9.2a"="pbiaqsf1gqrwic9pf499k89aw757wr9m";
 "psnfss.source-9.2a"="vi285d52bbvq01x4yan9md3cck4dc1lh";
+"symbol-2019"="3w7a6aib8mdrap257pxjw8x39lck4nyc";
+"zapfding-2019"="6prjnqim0yrvzj1ary8i5761byqi0ca9";
 "pspicture-2019"="siqi85kfmyg91cf7nggs71jh38g2aicl";
 "pspicture.doc-2019"="h26v6akzzgg6hn4ay096fvg2qw6l2ww8";
 "pspicture.source-2019"="fclpkng5q7dhd1vfzv2031r4l3f3vh5y";
-"tools-2019"="c9058cqv0a32gnz32nf5gy3998jcj181";
-"tools.doc-2019"="pysraqwxj1869p6dhlwj72a5vkxlvr10";
-"tools.source-2019"="q75n910y7g8q55w5z5zpizzvphnkrk9n";
-"url-3.4"="vf34zjwlv43kcw53sdla9052x7x0kn7y";
-"url.doc-3.4"="ii3z3l7xkmrkxb8dkgk6lcqyb34niirc";
+"tools-2019"="3xlv7ifks3rvkdcwmldwnb8bh8xci852";
+"tools.doc-2019"="qrxixpd7fch0l0d17qwp7x3v44klsvsd";
+"tools.source-2019"="4s2cd0zvswd0k9lhplfp325pmax11svc";
 "collref-2.0c"="xxcnjj8qnbb06zkmh5kqysdm6k5yf4z4";
 "collref.doc-2.0c"="5a9ns23lv1n780ll3kp969dhi0mx93gb";
 "collref.source-2.0c"="7msfby8bxs89i87jiibpbnp97byjs6p5";
@@ -336,8 +438,8 @@
 "doipubmed.source-1.01"="mz2ld43x7sp8np0qmcs86p5lc09nl4dr";
 "ecobiblatex-1.0"="ikxp3jlzlsnc7jh7vcxcfq8wvpd5r8ll";
 "ecobiblatex.doc-1.0"="y5hifg3r0xkgv6zklw7l9j7shl87fnf0";
-"econ-bst-2.5"="dfb5v9f83gkb7h53xd3iig951ay2aw6y";
-"econ-bst.doc-2.5"="px5fik2wrgkc67v6ddja3c2f5hrl0wlx";
+"econ-bst-2.7"="nwrbh3mhghbh8iljj66yanpv2r5wyfpf";
+"econ-bst.doc-2.7"="kxndjrjizaqcr2z76cq8irmyipndxmwc";
 "economic-2019"="xw85nd7v6i1d2ma0airnc7bwf1fdsipp";
 "economic.doc-2019"="pv3irnv3gj70q22ac3kr858hac50vrbz";
 "fbs-2019"="h6ghp5i14cqy46hzp9i481c8gvk2ddza";
@@ -348,9 +450,9 @@
 "footbib.source-2.0.7"="xj3agjgzfnwnfzzbzk4xjfk90fr1a6fm";
 "francais-bst-1.1"="zz8wcr2ymwd7m721qr94l1k799mi9cia";
 "francais-bst.doc-1.1"="qmq30903zrvvw6bprngklx5pwq9c1cqd";
-"gbt7714-1.1.1"="m93b7kdmx9qwas372saxfydrnh2cz21c";
-"gbt7714.doc-1.1.1"="2wxs8msr5n51ai13g23ly82ilrgv28w4";
-"gbt7714.source-1.1.1"="iz3wimzdq8cp06fjzbfjf08a3ygrcah7";
+"gbt7714-1.1.2"="64nmdcypvq55k0allph65jnybivny2jh";
+"gbt7714.doc-1.1.2"="0vxkd2xl3ldv1vw06bclcm037m995hb6";
+"gbt7714.source-1.1.2"="fcb1x2zz5pb21xnnq9bl450wz4gygqfa";
 "geschichtsfrkl-1.4"="94vlnvvfy0py3ig3mjjizxbnp3xcnpv6";
 "geschichtsfrkl.doc-1.4"="212pcrypha38lk3nri43fvj12fgjlqzm";
 "geschichtsfrkl.source-1.4"="ak3n8j6n1wx9pgawvyr4diklq9971wx1";
@@ -371,6 +473,10 @@
 "inlinebib.doc-2019"="bpfx7h4w0zqr7xdxn51glllzf20qj24y";
 "iopart-num-2.1"="92jbzj605pi9chj3ymfxm9ii2dh62haz";
 "iopart-num.doc-2.1"="smix69mc1n89q45nw3rl18lasn2c2kwa";
+"is-bst-2.03"="cyhqhj4jmhm2f1wv24dvv2nvh3xag114";
+"is-bst.doc-2.03"="y2s834n5j3la07m240diyldjajy2jwzy";
+"jbact-1.30"="x7l9mlgzq1x9hyi7pb6g4ygg2fm4qmiv";
+"jmb-1.21"="cxj2552g8qzak7hkidh855amhaggp4bh";
 "jneurosci-1.00"="r5k91lza98jn52s8fmgrbclslb6zps08";
 "jneurosci.doc-1.00"="z01ga0ccmahx9i6p2bvvl7mr8676ki7p";
 "jurabib-0.6"="xlxc8i2x6ddydrb6n8myqkh0j5acn9y1";
@@ -380,8 +486,6 @@
 "listbib-2.2"="h7sl4g92wc0h56k7a13crhnj9g0xlb3g";
 "listbib.doc-2.2"="jgdniqxy4x1awiyls70z9lsycy61fb0l";
 "listbib.source-2.2"="266hzszszrdwa0x6hk5xrz9gjs1srsb8";
-"logreq-1.0"="4kl4g8kjy4zch0rdn8aj2mr5yxpssdc0";
-"logreq.doc-1.0"="8s7ly9p9m270mhhh16gv5p71r10cpnzv";
 "ltb2bib-0.01"="mid475rg33jg29rxq0ci49vq4y81j4ng";
 "ltb2bib.doc-0.01"="7k2q8zzzhf5zf71fw0yinyghlb1kwqy7";
 "ltb2bib.source-0.01"="8py2zhz04b0hals44ypv67m2c71b1j0p";
@@ -411,6 +515,7 @@
 "oscola.doc-1.6"="cg73zf6fnga143mk6yjxpxmv77kv76lz";
 "perception-2019"="xpljy8xycf22akdj5dzzzmcb34zx8d1z";
 "perception.doc-2019"="sn4m1gc1s04h1crw3gbaahbxa6b76npy";
+"plainyr-2019"="nxim123jmj05q71s0mhf06djsn36damc";
 "pnas2009-1.0"="k4xy9dabg8i4mf18317wf8mp3hrlpmqy";
 "rsc-3.1f"="4hhv7zw4v3w8sslxwj14pk4azil1cdhh";
 "rsc.doc-3.1f"="d20wkd2qw8dabh30gdpasxqacn193f1b";
@@ -438,13 +543,13 @@
 "vak.doc-2019"="sr1gi7csll74iw13j24r1hdwn3gql9ak";
 "windycity-2019"="d4xmbwf69spcn35mjmccdq37gszl3nyc";
 "windycity.doc-2019"="0vshfrxbpfndxsljkd1qghkinvxhyli6";
-"xcite-1.0"="fpgsqqg3rliap6chn99xzlj676ll25hd";
-"xcite.doc-1.0"="wvhx1d2wkws7fcrplh55v9fsq1r8a3hw";
-"xcite.source-1.0"="8n5kfjr7xfjicd1hw6hlhcrn8dzicp5q";
+"xcite-16383.99998"="wvb8mc5cp8s32hvi76gby25nk3n887jd";
+"xcite.doc-16383.99998"="h07vrlm1107k8a8mjv4f8p0s69k5d08p";
+"xcite.source-16383.99998"="kllh0w903i2jybhciiy925rs186klrh2";
 "zootaxa-bst-1.0"="78lffb7mvla2yryr0lmljd5w4pmakggp";
 "zootaxa-bst.doc-1.0"="bx9v8rj2nlbdapknqk8wigrq9jdfjggn";
-"a2ping-2.83p"="6m6vil4rjfwnkgaw4apxfda97n2nx6g4";
-"a2ping.doc-2.83p"="v6k8vhfmq1f1k71qn8651v86mid1z4dk";
+"a2ping-2.84p"="6lndjb87fbdxxvs14s9plg6p0avxnsf7";
+"a2ping.doc-2.84p"="i79dh9x0k85xl1cn33j110g62mh4a297";
 "adhocfilelist-2019"="l8ayz7mqaa5lma2bvqb2brc879y0viij";
 "adhocfilelist.doc-2019"="gm20nhwq88s1cmch3pcgkqnyahb5gnri";
 "adhocfilelist.source-2019"="3qx23im0z07cnk2bd5vrskl153zxy6ff";
@@ -454,20 +559,22 @@
 "asymptote-2.49"="ka921kxzvyq3hi5frln4hh7qg1kfgch7";
 "asymptote.doc-2.49"="b1bh1i57rh28a4mdjx9bcplhb1qgd5cg";
 "bibtex8-3.71"="sri58vnydvfpv947gmlxd1s3c2056fp1";
-"bibtex8.doc-3.71"="cffvi0y0lv801yj5d8v9cr2d4x8gr0wa";
-"bibtexu.doc-2019"="lkrsyq73l14mmcviv2qwa3hrwp0nm793";
+"bibtex8.doc-3.71"="d5gk5h3a5milfx9lb1bcyzc6y5pz3d2c";
+"bibtexu.doc-2019"="djmr91p0ig74imwgym82lpm81jp3csgb";
 "bundledoc-3.4"="3r6cx7n6wy995jd9hpg2n4qkbhwmnyfi";
 "bundledoc.doc-3.4"="cd59kzd2v9pq2d058jx5pxkcjhbvbrr1";
 "checklistings-1.0"="a2gvh85pcmrc82wq4h6n9ycqj86z9f8d";
 "checklistings.doc-1.0"="ymkplhp7331fs0kq4qcpmh9la0wxj5lq";
 "checklistings.source-1.0"="8ya9yd2by50zppk7rrqjkc34ans6ffb0";
+"chklref-3.1.2"="xybaxh2l6c61hkkjqhx64hivq08wz2pa";
+"chklref.doc-3.1.2"="f8vcn1hnn9hp9kd92v2m2qpd0my6p0pd";
 "chktex-1.7.6"="4khiza97qvhdbzdlz7pacnr16zmi9b9d";
-"chktex.doc-1.7.6"="dmr9yb4fygjxk0sznghrfjq2yx441378";
+"chktex.doc-1.7.6"="k3rrz1fss7mhkh1g45vq0glhcl75z6lh";
 "clojure-pamphlet-1.3"="czmy129a09h3r5ssnlhaxgz932vmqx6g";
 "clojure-pamphlet.doc-1.3"="cha12zds1j3adykqd9d697izik89i3xh";
 "clojure-pamphlet.source-1.3"="flbrsg215hp85fn6hrpygjmdggrzx6rs";
-"cluttex-0.4"="6kz3s0g8c6jmv2izivbhvrkyz9knrmpf";
-"cluttex.doc-0.4"="mghq29dal4f8lchx76jb7jnm4qfjv4j3";
+"cluttex-0.5"="g36i3ravfqcpaxag2iyggc4wqs9n9mqw";
+"cluttex.doc-0.5"="ykigfq6hmh4zb0h8n8q2id4cm2b9arwv";
 "ctan-o-mat-1.2"="jcmhpw3irmr4hix6j1n1wk1g4wgc0nm7";
 "ctan-o-mat.doc-1.2"="f43qd3ynl7x47g4wwfnd1icsrzxj3sgp";
 "ctan_chk.doc-1.0"="m4i1vj19h48zyk9pxadfq1qrwmvqy3i1";
@@ -478,26 +585,26 @@
 "ctanupload-1.2c"="jmvh3rrdy0hyvdxz55gydlgsh7xzp4vv";
 "ctanupload.doc-1.2c"="38wlhcxvvpbk01sj6vhwjs9mccw1xs14";
 "ctie.doc-1.1"="zz696bci66pc2p1pkwa0ddrh7fn7q6gp";
-"cweb-3.64b"="rq96m12nzl8qip0zvafdssa1nsglq42z";
-"cweb.doc-3.64b"="2nyvzqjz5xg4hfyf1z2qjbhr1gj1pjg3";
+"cweb-3.64c"="7c0j5c5lz6yw8l1qwijkbwmp8qyhg0i6";
+"cweb.doc-3.64c"="6cqyvsghj3jl5gl3fzvs1npblvr8x0ha";
 "de-macro-1.3"="mscrdz5y4zdxszz37dnh6kw4hmwm185q";
 "de-macro.doc-1.3"="hdmn9ds4kiqsalhx5r2l4adv19ijf5f2";
-"detex.doc-2019"="95vhzy5wyc21v8n1xjvmfbbxhw7hg912";
-"dtl.doc-0.6.1"="cb9x8v43asvzq5cppgvni86lxlmy8ny7";
+"detex.doc-2019"="31rk8b2n2f655y674w1ghp1gp0ba9r3g";
+"dtl.doc-0.6.1"="8jshhykhf7smf4s9ngv2jlhbih126xwz";
 "dtxgen-1.08"="n3cwjwkf92c5zgbs7hmc9fgrwjvwky9i";
 "dtxgen.doc-1.08"="87sb4lz077jgnzpya1y1qyzakwd5j00x";
-"dvi2tty.doc-6.0.0"="9n1fws5f6glys7wwsz1ax16145wb103r";
-"dviasm-2019"="j2wkfisw3hlackcz0f498zx59z24yk0n";
-"dviasm.doc-2019"="wj8a3skfwd5i6d1hb8v3dghijlgmbmdc";
+"dvi2tty.doc-6.0.0"="zrffg69y6ix300909k1zpjp2s9kl2d15";
+"dviasm-2019"="h75pj818zxcgsi92grzfzrd63wz0rg8y";
+"dviasm.doc-2019"="1f7bcls1cz8z6k22b8l3hh6v0dfn3b6v";
 "dvicopy.doc-1.5"="szvfihzbpfvz66w6v96nygkf7pnfa38v";
-"dvidvi.doc-2019"="hdnm6xayhr5smgch1qly5lc29wig7svc";
+"dvidvi.doc-2019"="hz3ynxfbxw3w8ravgb3hhw3yglb0gxzh";
 "dviinfox-1.04"="zjbfw4kzwfqnvlwzvjibsgim855fc30c";
 "dviinfox.doc-1.04"="1n52la52nchv27j82lisrh8q7wygx6lp";
-"dviljk.doc-2019"="xjwvp52cq4895gsxlbv5r6048b87h779";
-"dviout-util.doc-2019"="hjmdykwbfg32ki7s27y4y8xffb4kck1g";
-"dvipng.doc-1.15"="zvsvnhcy54qj7i16j719shjx8ihhx621";
-"dvipos.doc-2019"="bb5388riin59hqxrrfnbflpvgjdass0g";
-"dvisvgm.doc-2.6.1"="vl2jk25bnzpwh16msfr5j21lv2ygvg2l";
+"dviljk.doc-2019"="sj8yggxdk8a4y3k1ssr1szzb1m91050q";
+"dviout-util.doc-2019"="g20rq0qgf4va4icrg830k9r9h2by1cj9";
+"dvipng.doc-1.15"="8pjhad23qghwyvp5l8qcd6d07dx9zjj4";
+"dvipos.doc-2019"="6m8fym7ky0a7xy6pmn0aklh5jg0ppbzx";
+"dvisvgm.doc-2.8.1"="a97bmkml7sl4pvz4ma2ajbq5kfpbnb4i";
 "findhyph-3.4"="4kc8qj2hs4hf7h25xb031fy5m9j8jygv";
 "findhyph.doc-3.4"="ivpfnjybcl80xzda2jlrplaglqhf9adc";
 "fragmaster-1.6"="r6wbba0qjxr5shfrf5ia8984dcrijpir";
@@ -505,13 +612,13 @@
 "hook-pre-commit-pkg.doc-1.1.2"="0rf4zqwdix7npi9g6nlcpp95mdpxana5";
 "installfont-1.7"="ds2zbs2f6kasda98jn1k8i0ym5168ax8";
 "installfont.doc-1.7"="jmwwjkliwr7wl1gyx8fzpyslscsnlqlx";
-"ketcindy-20190927.0"="pi0hx1f1ma795z77fkjigfxxvkinxwly";
-"ketcindy.doc-20190927.0"="l2xhr32r5qfpk31qb2k2qbdss533kk8q";
+"ketcindy-20191225.0"="c4wr13x0p4gzbzdnjbq9l4jlalxayzn6";
+"ketcindy.doc-20191225.0"="q4sbjwwvkc9cdvwgsn1m5m6wil99z1md";
 "lacheck.doc-2019"="bnhws6g9ddrf6pf76i8p4r3razpiylp1";
-"latex-git-log-0.9"="samiv870lgj4smwh80l5ck8q6q8m1yqm";
-"latex-git-log.doc-0.9"="1hjp3dx0d0yhj2c3n02cdk4fdg6iv6nc";
-"latex-papersize-1.62"="c2qx25bgknw9350pi7vr5hdnnj3i2ak6";
-"latex-papersize.doc-1.62"="8w0cczb884w53zzv3dwra31zcvjh4jzf";
+"latex-git-log-1.0.0"="qj0jib59wmz1l6gpk7q0zb5b29fpqk51";
+"latex-git-log.doc-1.0.0"="76p2fx8gzajsjbrv24dzy7znwv3ybahp";
+"latex-papersize-1.63"="qiqs3ayqsaivrqcm5mi68jrnbr0f9j8i";
+"latex-papersize.doc-1.63"="8w0cczb884w53zzv3dwra31zcvjh4jzf";
 "latex2man-1.29"="0c6w2zmys7mpnc5lvaix37bcksk19wq3";
 "latex2man.doc-1.29"="wclw51af38i0m17pclqpc46163wq3z6b";
 "latex2nemeth-1.0.1"="isj2xl6s5liv6q12knhl4dsyihc9j593";
@@ -522,11 +629,11 @@
 "latexfileversion.doc-0.3"="c6n7z8c3lzrhk2g1fn4v05l2y6299sr8";
 "latexindent-3.7.1"="q4ir39azl49h758n2nrnfnpwv4jyj41g";
 "latexindent.doc-3.7.1"="vzf97xlc626l1r171k8753m5xv5493cw";
-"latexmk-4.64a"="3375f05ip87vzvr9fcy9pnhzqm6bfwg0";
-"latexmk.doc-4.64a"="9dqh7i2fpg4nx5xrfj6vca77zh7aws6b";
-"latexmk.source-4.64a"="m32pbzkr0my5gv38jw54bancbk66r15c";
-"latexpand-1.5"="4w2x5njn2fc3pp9h2qd7lxifh7xswwxh";
-"latexpand.doc-1.5"="96q0sv1v5zn8hwaan17wd8k0gakwh9xj";
+"latexmk-4.67"="afwh2sz4hxms5x88hii02n3xg2r6sz9x";
+"latexmk.doc-4.67"="iirnda6pw7hnz1zshb50f5lfkb78r0rg";
+"latexmk.source-4.67"="m32pbzkr0my5gv38jw54bancbk66r15c";
+"latexpand-1.6"="did3i2gjfqllqckvnb09n9n8iy16yrmh";
+"latexpand.doc-1.6"="4mrnh6mqwv6f3is1cz5f6pp710amqnx7";
 "listings-ext-67"="zbinp0czaglig761svs0s13np81qpsr6";
 "listings-ext.doc-67"="slcbwzsy505nhjriszn993pgqlmdlfib";
 "listings-ext.source-67"="95y2zv6bcfkvqmwf6cpa4piaydlkjwz5";
@@ -535,31 +642,31 @@
 "ltximg-1.7"="8hijfmwbnd6cjgk2zi3ik7flixy0xp09";
 "ltximg.doc-1.7"="kgggjbx84f62niwjkydqxxs7szkakczf";
 "ltximg.source-1.7"="akx09az4qpcrfp4011bpi6k52x1177vd";
-"make4ht-0.2g"="d9l9wfgfcnb67xaj1fb2k39r5g7yg2mv";
-"make4ht.doc-0.2g"="yichzrf0sy7cp9dnhscr6m2kcqfvz6bi";
+"luajittex.doc-2019"="9qdg6g1m69rfylrs7h0x017kry5qx9y8";
+"make4ht-0.3d"="3l79g21iwl5abdqzd2vah2n5yzz1ywpm";
+"make4ht.doc-0.3d"="7gqgh0na3ilglahk2l5cmn4vybr2swl6";
 "match_parens-1.43"="hahwx0ca506ykknc9plsnrfg6fsb5rs4";
 "match_parens.doc-1.43"="1h445p7nl5n70rskvq4d10b15kb8058k";
 "mflua-2019"="zicmiqdsbqz7ddgmbwjcay8q5q4jyzqj";
-"metafont-2.7182818"="sxdr5v17hpv8g1562g06lhn26c1wbs8f";
-"metafont.doc-2.7182818"="wfy96iw7g8v6mcfmlnbbx1hix9zxhac4";
+"metafont-2.7182818"="51bwj1md9dckcakmb2icmb3f5pyxx3rq";
+"metafont.doc-2.7182818"="xsxkdw4d44gm0x20g7dfpvh64yr438cx";
 "mkjobtexmf-0.8"="raq7ql17c3fdqqpaqbd53r0dg7kjrvh2";
 "mkjobtexmf.doc-0.8"="3cgxbgxpha9139jfz4v3478ny7yv3xm1";
 "mkjobtexmf.source-0.8"="dky5rv3xrbjqj7pg8spdjsllggpq61k9";
 "patgen.doc-2.3"="1p6bnifmajisixh6m0mar8lmzr3rd7s6";
-"pdfbook2-1.3"="j72jmp7cx48gmh9r9qadi5mqzvm8f7mc";
-"pdfbook2.doc-1.3"="yhv6d7m5b5ys1z6pzc893k62calf9s9x";
+"pdfbook2-1.4"="5d9ygxiff1hlzjb4lp55f6611x0939lq";
+"pdfbook2.doc-1.4"="ic3xl30b2qprsxyx892bd10smcz7nq7y";
 "pdfcrop-1.37"="mr2zg2ji7gqm14zq5xsf8wk081fbdwdn";
 "pdfcrop.doc-1.37"="28jgvjwk6v7dvldqgqd4ry32ccd8avgn";
-"pdfjam-2.02"="p9l1q18vqf1yjaxxdyizz9b9rgr1kv4w";
-"pdfjam.doc-2.02"="c6aawcwvnijzmjakmlnlzbnhq0yx2vmx";
+"pdfjam-3.03"="8vh7hia6anrhmp5w2aibq12yd0p3y6fp";
+"pdfjam.doc-3.03"="5q7wazmr6rz1mnjln28ryakv7x0q40nb";
 "pdflatexpicscale-0.32"="sc7xcy0agdg458w49n72q6sd8sk8zqn4";
 "pdflatexpicscale.doc-0.32"="ria6cfi0nvviddn0gmylwcjw53v6ryqy";
 "pdftex-quiet-1.1.0"="3cx8zd0q9z19d1xhhc8rd640ifwsrjxc";
 "pdftex-quiet.doc-1.1.0"="84mb3zp9h3jnl179kc6svsd52pmx13pd";
-"pdftools-0.86"="a8nv2mqs26gb1dinymxa9kwk4baqch7l";
-"pdftools.doc-0.86"="lhw8aadv99w7zl6hqnpwpmbl9z4l426z";
-"pdfxup-1.30"="r29ka6pw53vdscrpxbaar5g8x171c0l2";
-"pdfxup.doc-1.30"="kc5qc6a8q4f8yn2xa7cbabidk9gxg6sh";
+"pdftosrc.doc-2019"="36xyfv7hir7g1w680042p7cgdw1hg9jj";
+"pdfxup-1.51"="xjnx4dmxnaq1x174slm9ara0xpx75yqf";
+"pdfxup.doc-1.51"="zk3vwjjvvxazyfa9868hj3xamvqdahvh";
 "pfarrei-r36"="n351xhnwd12vvy4b4zv2r9cqx1crd435";
 "pfarrei.doc-r36"="bi4wqwx32x2498kr0k1rmkmslyz134x0";
 "pfarrei.source-r36"="zrdbqakfqkm5kwbpwpy5d1pqp4w5sz42";
@@ -572,14 +679,14 @@
 "pythontex-0.17"="1gza81rq8sz3172y81zkm5lvg8193spd";
 "pythontex.doc-0.17"="4z6bswby7179xqx47n89qfzcd7sxvxg9";
 "pythontex.source-0.17"="pnzqd2k0q1nng61d2ral344q8211vfma";
-"seetexk.doc-2019"="4cw2dn59pzvn6rmhnaj5sa97vnn4qh9q";
+"seetexk.doc-2019"="wcnxmbn8wqi39abb356wmhgwrpmxvidm";
 "srcredact-1.0"="dzxdwnn9l06gngyvaarf10h6ws8aa73y";
 "srcredact.doc-1.0"="m028dd5fqv2x9xcxq7vhdsaz2xcyxwl1";
 "sty2dtx-2.3"="irvwyxk3ggfbc8p4b8s70v5704lqmsib";
 "sty2dtx.doc-2.3"="s9qzsp01129wgi8qfh0ljxkaj9jvdr65";
-"synctex.doc-2019"="g88kvc6r9ga4mq0mgv298n29l705jx93";
-"tex4ebook-0.2c"="79p9z5smzw75qxkqv8lzaihni3fr3kp4";
-"tex4ebook.doc-0.2c"="fvyvgvr7vhz551k497y8zd3vhzf2nsaz";
+"synctex.doc-2019"="wk9fbvv3gdqzyh12gxa05zbd88l5zh65";
+"tex4ebook-0.3a"="cycqa4cwssq4nxy4k6nplfq4y2p38r0a";
+"tex4ebook.doc-0.3a"="ksyz5aca4fb6jikxy49kpcjq8ralwqrk";
 "texcount-3.1.1"="spfdnfgbcy8y8c7191pd973wmdnrgp8j";
 "texcount.doc-3.1.1"="idd45zpjjy6cgibnndxygdmljw28gyq4";
 "texdef-1.8a"="iyiqbv4h91h6qchgcddj251sas6ayf93";
@@ -589,37 +696,40 @@
 "texdiff.doc-0.4"="r9wsmivjyiwdnav7qc35kydk9b8pbcz8";
 "texdirflatten-1.3"="135358h2mb608wg3ni93rrsvvqgxm4ya";
 "texdirflatten.doc-1.3"="n9jxdwjiylvwy6n55vgci9a32qi10xhl";
-"texdoc-3.1"="3zs9kxqd47nlrg8z7frq4h8kjz7a98r8";
-"texdoc.doc-3.1"="10xjlhy57y2knrws7bq5x01byjvzzi6f";
+"texdoc-3.2.1"="kwb7sxrxq7fn56flnsfama9y1ndd4g60";
+"texdoc.doc-3.2.1"="rw85cxx84pqccx87rpxcy9mj9am41agf";
 "texdoctk-0.6.0"="48ix4zaj1k1v3i997rvl1kg0mc8a9g5s";
-"texdoctk.doc-0.6.0"="5h3azns62pa78gwr7gl07fj7ydpb1330";
+"texdoctk.doc-0.6.0"="xfl4g9m6d9nbn4f9hgxj58jg9g4laa7l";
 "texfot-1.38"="3qdqa7pywvk3f5rgdhn9806bfcfgr9dk";
 "texfot.doc-1.38"="06n4pipdm912xri2cpbv8vdlqja8fzk1";
+"texlive-scripts-extra-2019"="prm2z9007xv13q0ny18rcq11f73c8vxi";
+"texlive-scripts-extra.doc-2019"="3qjmdf6iw8b5jfn7rls97pf1mpbjz1kg";
 "texliveonfly-2019"="8csnp69s8i4bs18r18qqr2cmkqhgx437";
 "texliveonfly.doc-2019"="ic6vdfmbvl34zjqrn0lvp59armsin54n";
 "texloganalyser-0.9"="8dlsnkjvsic0xyaxjwixrgm4pf40snpz";
 "texloganalyser.doc-0.9"="yh3y429s0fbkjai3kmh3z1q4f1pja6g3";
-"texosquery-1.6"="8f8lapbim73bxwfmzgi07jl5qg5d0n6g";
-"texosquery.doc-1.6"="rph058iy26cxdk6n0i7kbgxv43rkmfx7";
-"texosquery.source-1.6"="6r8grnnhqr2jcmns2vrcxq6gai939nhb";
+"texosquery-1.7"="bls961qcx9s6fwhhjqsx20wczk10qhbz";
+"texosquery.doc-1.7"="8dr8ayinwjayi9vynaw0m6q9rrk31nas";
+"texosquery.source-1.7"="bpv9sr00x6vv90zclfjsl838kd6zcb76";
+"texplate-1.0.2"="971i0gazlyzkhxmic7zxzcjsdf8qypds";
+"texplate.doc-1.0.2"="g40znzhxn766zchxk2mhy1xy7hrsbfh4";
+"texplate.source-1.0.2"="crzcqnd6sn914bzkqkjp4d4dgic4lg0d";
 "texware.doc-2019"="qy1dmjyam2slw0b2qcpq02jvr82bq25b";
 "tie.doc-2.4"="s7h7c6wbmzbsp0ixcm64jq8gskjjwwpb";
 "tlcockpit-1.1"="3cpabpc7kq0j0rfx217i3sh1lz825791";
 "tlcockpit.doc-1.1"="l7w6h4na36nfhky0w0jn53v4lx48yi1x";
 "tlcockpit.source-1.1"="dqgari1h9a0ny1jkjqqk3yx2rs59v0kc";
-"tpic2pdftex.doc-2019"="g21w28jq3l00jpg4k6ff7aajl2yla9c6";
+"tpic2pdftex.doc-2019"="s255ics89hxsf04fkcz1ahfz130q9y3x";
 "typeoutfileinfo-0.31"="vjs333wmdxb9s1vd215af0vryplvb8hl";
 "typeoutfileinfo.doc-0.31"="qdrwm9hi7qk7hxzcz0grv7cfl4r9k4v6";
 "web.doc-4.5"="sdmcsfyc18z4ldyiajpv5fqhfbb1gzgq";
-"xindex-0.16"="c9j47127l5yjkj0v2k3r2nbr2kysmazs";
-"xindex.doc-0.16"="2wm9d48w71s5mah2jz4bygcl153s0cva";
+"xindex-0.20"="3q02wc79c03aig5dic70s09c9hjvj3va";
+"xindex.doc-0.20"="b1czyhbjxmfz1lshjgqdmjs73f4nvv0m";
 "xindy-2.5.1"="rp60v85lrsbllzkwvhhz5sprxalf6kxp";
 "xindy.doc-2.5.1"="akx5bx8m387zsaxd7v6xh97nglbzd9k6";
+"xpdfopen.doc-0.86"="p7h2jmrh1c2n964pv2gfqqi36paf7c1d";
 "context-2019"="1a004zz4xs83m9jgy16k6q552lpn9dr6";
 "context.doc-2019"="zc8knfsrllnfggxxsgyijjzx59vjdscm";
-"lm-2.004"="ci5dpznkzlal3bkn0dcd2m5i05aws66g";
-"lm.doc-2.004"="w3g5xn4pfqhri4glpbh66rs8d6nbrd02";
-"lm.source-2.004"="bw69srvx8mprnj8d5f48bq3mg1ysfk1n";
 "lm-math-1.959"="j995x0y357lac8mn1kzn9v8p3v995bz7";
 "lm-math.doc-1.959"="bgfq2c4l1shm9453822cnmq7yq6hlknq";
 "manfnt-font-2019"="isk7hkf6lfg41mjli9sgn77kvn6fkl96";
@@ -632,9 +742,6 @@
 "stmaryrd.source-2019"="ch2gj89jxrqysjsl24s40za3y5z03yan";
 "xetex-2019"="5mai30qjzqsc5hdmzavbsgchlarv6gfh";
 "xetex.doc-2019"="dv515mqnylhpsi5v7xsnv662041lmva8";
-"latex-base-dev-2019-10-01_pre-release_3"="g5lvvym5jk74zznlz170020dmsr9fq0i";
-"latex-base-dev.doc-2019-10-01_pre-release_3"="160hg8dhji6chzni7blcbicyfzkpp0cn";
-"latex-base-dev.source-2019-10-01_pre-release_3"="is6g4w5blf79pqvwnwyg52iqkhdrrbmr";
 "xetexconfig-2019"="2wjm3wl2975pd1d3ql2qd3yhhdh3gvmp";
 "context-account-2019"="85lpl8g1by9mvqnmxy6v9iasvgmjnazr";
 "context-account.doc-2019"="lms208c3s9clga2ymi1j2i5whyz2dffy";
@@ -678,8 +785,8 @@
 "context-inifile.doc-2019"="acx93f08cc2z4x4jwwchd8njnkil3bfq";
 "context-layout-2019"="438mv86y37wbxdv9js2s3clnkl7866ff";
 "context-layout.doc-2019"="adh7d3hmcjqqgh69nr8agxznzwijkggk";
-"context-letter-2019"="y43dmsc49337n5mn0axqsa5rln68zg6r";
-"context-letter.doc-2019"="knw1pz7vdmqjf82aiznpqb2hc5y198i4";
+"context-letter-2019"="pj34rsrf7mpqp86w4ngfnrm02z6as5db";
+"context-letter.doc-2019"="04r700y20myaazp6pm52438lcdgxhir0";
 "context-lettrine-2019"="wmfy4c9c13jj525hmrf742kzkiqqmwgk";
 "context-lettrine.doc-2019"="xf4mr1w0z7ybcas306959nmgxih59082";
 "context-mathsets-2019"="5gxx8rbkp1znjh8ycd0k8nflhjcm25kw";
@@ -722,8 +829,8 @@
 "aecc.doc-1.0"="mn7j1f7j3z5d6pnss9mlhvbw4ahn94ka";
 "alegreya-2019"="g97xv22dfmdfhyn4yqz67rj42mkp35qj";
 "alegreya.doc-2019"="ds3p6fvf6bdrzf9clxksrcl9r3lbbknx";
-"algolrevived-1.03"="99wnibyx8h3x1rf2hnxmnb3gk4lh4yvg";
-"algolrevived.doc-1.03"="8w567kzfdgjxfsdbfyf8rr89wdrrm0xv";
+"algolrevived-1.041"="y8m0is3cmjrc0mnkpih70nf48mw4y2bd";
+"algolrevived.doc-1.041"="339ipcjms83912r3n1ix70106c1ndvwk";
 "allrunes-2.1.1"="yxijvmvgjl2q05v667fmqisbyd7xsjpr";
 "allrunes.doc-2.1.1"="b0sc4d9kla5sg792zvwqjzszz17w19iv";
 "allrunes.source-2.1.1"="n986ppx466mparm30mlv7cn5mmjh74sy";
@@ -772,10 +879,10 @@
 "baskervald-1.016"="igfnj3pwvb6443c531va9kzylizxm9vs";
 "baskervald.doc-1.016"="mq8ms68crhv6afh9ld6scyx2xn2ik6jk";
 "baskervald.source-1.016"="7y8d5vqbd1bp3gri0rhzk3cb12cwchr1";
-"baskervaldx-1.072"="jjwb2m99l3vwzcpr7dzd8z360cv4qib6";
-"baskervaldx.doc-1.072"="bprkagqwmczadxymgadg1d98d6g2l4xq";
-"baskervillef-1.047"="0b8hb8q8ddq07j40c39rxwpxa3m9jbk6";
-"baskervillef.doc-1.047"="1gwvmy6yqilz5z1v1jg928n5qwj0nckc";
+"baskervaldx-1.073"="gc777hl6iqpxp64ynh81bcwx0bg2c2i2";
+"baskervaldx.doc-1.073"="cjcy5fzwj9b6ry8w5ym1s67hxibghxzg";
+"baskervillef-1.050"="z4a0v222vfjwsp7saanxscc8dhi1xg4x";
+"baskervillef.doc-1.050"="hmkjfv0rz8anmwb86ccn5yr7fkgfvvhp";
 "bbding-1.01"="8kh5c0chlw1f2pqzh9pc7zx8y2jcgh0g";
 "bbding.doc-1.01"="zjngi582jrb99j6w1amwbyvjmfvsk40d";
 "bbding.source-1.01"="axvp8f0zag6bkr9v3fg22j4h5gcbcgzx";
@@ -817,8 +924,8 @@
 "braille.doc-2019"="00dv14s64fm8g5jy8b30dx813a304nlh";
 "brushscr-2019"="342p5p6h8v377mnbrv1f56kicbbjfcdx";
 "brushscr.doc-2019"="hikb5s9iv60pfq2kjdbfiq1216d3rabk";
-"cabin-2019"="q0p67y7vxsy5j6nswhapbiyjnrvxdn1d";
-"cabin.doc-2019"="ijqxxnz4fip9lfbwm2kxa02c3n2dp405";
+"cabin-2019"="vh9wbjwwqbw8rckikpr08ngglq96va6r";
+"cabin.doc-2019"="x3gjf38wb2g121iiz5f753vsfpnsnxgg";
 "caladea-2019"="1rb8sq2yh4hizlcjp8zd68ayb7cx6275";
 "caladea.doc-2019"="9qr79slzxmnnvvh2iy310ypqj9g11s4b";
 "calligra-2019"="cisw7fvdys863szqvsxzm164vina8al3";
@@ -846,8 +953,10 @@
 "chivo.source-2.1"="mqwg3ryb1lfam2ii20dn6m6j7pahqqxr";
 "cinzel-2019"="g6w1yxjm4bb49qdhgwrrmnj535za01kp";
 "cinzel.doc-2019"="4kj5zj40jq8dm7br7xb9vr2nwwqjl530";
-"clearsans-2019"="f47wzjm2yacf2mmpy3vpld01x2l42fdw";
-"clearsans.doc-2019"="zbx3h5xxcin47ql221mjwlwsnfz01hl7";
+"clara-2019"="z7c5lggc4dy39dczhiql9sl48n6v5wjq";
+"clara.doc-2019"="r7x0a5q7l021a6i6skr34f1s5000ggz3";
+"clearsans-2019"="zp2572jdcnzq8b32pxzsmlyqxvsmj0mn";
+"clearsans.doc-2019"="6f9lri3fq95h9hgbady7fbgfk9msy7s5";
 "cm-lgc-0.5"="wnmmrhnlldps15r2v360bdvlfyjd1fpn";
 "cm-lgc.doc-0.5"="wb18g3w86wfb7fv2iaaxm0j2amrws9yf";
 "cm-mf-extra-bold-2019"="87n4wnhy5wylwl1qw8i0nq4jj7jfr5fs";
@@ -867,10 +976,12 @@
 "cmsrb.doc-3.1"="4d4jcwqpmklpyc3c60wmn6xnjw5kss11";
 "cmtiup-2.1"="k6sk5isdzms460hm17lkx5b6p6p9wz1g";
 "cmtiup.doc-2.1"="ycj4il7cxfnigs8sxxwga045g9v8rv8h";
-"cochineal-1.055"="9dnbrqsxf5g3jirv5kv6xwbpkbnzi28n";
-"cochineal.doc-1.055"="wf9xv0l5h2z177sky4fyiwgb0z9yl605";
-"coelacanth-0.005"="0na6wjl5p6fjp3wljqsyd0klna5sid85";
-"coelacanth.doc-0.005"="lkzvg1p9c6vksdgmxsxp1af6gvvd1hmy";
+"cmupint-1.0"="xd29mvn7b5zjhc0c4gcxd4jyly8z26k8";
+"cmupint.doc-1.0"="10c0xi5bx5bgphjnnmrn98msgkpsn90v";
+"cochineal-1.060"="751kycpxzxwiymcfriw76saip30bvrzi";
+"cochineal.doc-1.060"="fcsv271lx4fz17ls2axs716lz0b30rdw";
+"coelacanth-0.005"="hxkgs2wa2r2vvdh2gh93j5qzjwqvr2yf";
+"coelacanth.doc-0.005"="wkqrbq8j6ibzvw8fjig7s7v8bhhblpp1";
 "comfortaa-3.2"="r9sis4ra19lgzsl56h3xp8s56awhlbrq";
 "comfortaa.doc-3.2"="jqsyn47waavk5a34d7cin4fc2z4pc9z6";
 "comicneue-1.1"="zsv445k74adkzqnas2g8p3i6c49bccqf";
@@ -880,16 +991,16 @@
 "cookingsymbols-1.1"="qhjzkivpxbk3rk6pricxsxpdk7c40rxc";
 "cookingsymbols.doc-1.1"="8l7yii9vvmaxfnf0h2snis7476k18mlc";
 "cookingsymbols.source-1.1"="z7r8n2lhgaqzgpx0jz8xq4sd4zzigbs9";
-"cormorantgaramond-3.00"="52jsmiiw30hrj3501y6rxy798903xqaf";
-"cormorantgaramond.doc-3.00"="zs9669ryf0v4nrm8q40g18vz60m5sl0k";
+"cormorantgaramond-3.601"="vbg959xc9v03xkb6yymi6vkr0qq8lkai";
+"cormorantgaramond.doc-3.601"="jvvyll846n42py13zb3c832brfcbq9nm";
 "countriesofeurope-0.23"="12hskf06qcaaq2ngadchixzg58sq1v55";
 "countriesofeurope.doc-0.23"="z2rmvqi92b23rwk5msp5zyqa27x8x70n";
 "courier-scaled-2019"="qrm6a468azlw2s89v7j992wxs2mkqfv9";
 "courier-scaled.doc-2019"="1bwlrdxpl1fj4f9ml688ybimig5ylxwv";
 "crimson-2019"="wwvxgknvkd3ycswpp9wnlp9dlkilj7wz";
 "crimson.doc-2019"="wnxfzc5llkk38ky7bf8hkn7zsdawpr2x";
-"crimsonpro-2019"="232xj0064ymrjjzbx1c31hmmx2mf0idv";
-"crimsonpro.doc-2019"="ifc4l8cz8mqk2jll5cfwl5225fvllpci";
+"crimsonpro-2019"="hw8fac0b3762dbrc71xnzwys5429ih5x";
+"crimsonpro.doc-2019"="1vxxf4zr3rmknnxjq51myq954s2w8mab";
 "cryst-2019"="56jlp0hk9vrfxbhlfjnpim398ggxccjg";
 "cryst.doc-2019"="qazhz2hzgpqlghbg67fnmf8adba1wl5d";
 "cuprum-2019"="lb84z2x4ab6q22wj6vh0m2rqnfqr5cgm";
@@ -910,6 +1021,8 @@
 "dingbat-1.0"="9yc0zy6qlxi9zmpyi3wd5irgq89shanr";
 "dingbat.doc-1.0"="z4km9f9xrw1n44ylh16872lzq8r4zvy4";
 "dingbat.source-1.0"="rq7v2cny05d4f8bkxbs2z6kj36q5bwfd";
+"domitian-1.0c"="5x9pl6afi69x5qwxx6ydbgxcz04d2ady";
+"domitian.doc-1.0c"="17nr4x6h43zbkja2cdbs43di23hmrylf";
 "doublestroke-1.111"="z58ah73655dsas48b432ahkkags5n8wv";
 "doublestroke.doc-1.111"="403diym6rx34bwmrh63zaka3xdhzs2dp";
 "dozenal-7.2"="6d1mbaf4l9yk7admwg05a6ix98cq5h97";
@@ -920,9 +1033,9 @@
 "drm.source-4.4"="g1n0k02ma60mrb12cdq20qfw8khgdpmm";
 "droid-3.2"="9r4y9qywb92m9jsc2wq0x9gpj13l1qdk";
 "droid.doc-3.2"="7imljgs9xh8zavab0kh5bj0fdgvf8pq1";
-"dsserif-1.00"="8iq2vinr2pnpasv54rih1fy8majnq0x6";
-"dsserif.doc-1.00"="0a4vccbhpq9amjcc005v1z3ilipr2d9g";
-"dsserif.source-1.00"="yawadjy2742rvvkp232zadkjsij8ja3m";
+"dsserif-1.01"="n3yxb7dh1amaxgyxlhlyyvg23hjdns2n";
+"dsserif.doc-1.01"="84pcbmflmwkfzclm3ygbdrm817l4dbdp";
+"dsserif.source-1.01"="yawadjy2742rvvkp232zadkjsij8ja3m";
 "duerer-2019"="vbldf1vbzs3if3mp2lcl65afgiqa54j4";
 "duerer.doc-2019"="75dd80vmi5wx804zkrq48z12y3alihqc";
 "duerer-latex-1.1"="nwigxc3gb4phmv584bma819dcrrafsmx";
@@ -931,8 +1044,8 @@
 "dutchcal.doc-1.0"="s0m4n06xg8h0jmlj31w27la569vkl1im";
 "ean-2019"="m0gkapni85n6zw1armbn1y770n8aj0rm";
 "ean.doc-2019"="1b7rkp30r8k0dgk9clz71jp8dlsvhrqc";
-"ebgaramond-2019"="albamgmnphchg44q9yzqf6ggm37kqji2";
-"ebgaramond.doc-2019"="1q1pmanzxdjnzqicpin5rfb5jnhad649";
+"ebgaramond-2019"="xdx1sm7ckl1rlq2cmbz26c1zh0rsjjy7";
+"ebgaramond.doc-2019"="c31jlfc5qvkxv4acz5cx7is5db7kgknf";
 "ebgaramond-maths-1.2"="7xa6g5hnnl2ry0v3gf0s33p6l3qqn3ds";
 "ebgaramond-maths.doc-1.2"="2l73rdm7kwy43k9z4fwnxlvd7prca25a";
 "ecc-2019"="0g013kqml9jfkqq94v7zi46mhrwdzdck";
@@ -955,8 +1068,10 @@
 "epsdice-2.1"="xbz7jkdzzsqrskdi4vhb0ra7m62hk9q1";
 "epsdice.doc-2.1"="7lc7wwfxwxnjfgf13br3wa6n8j25ml6w";
 "epsdice.source-2.1"="6px6gazxv7pr9cagfrg7mzx1w3z2nxn3";
-"erewhon-1.093"="fq4wkxfwqd9nma3zql6pilga4rfxcff4";
-"erewhon.doc-1.093"="jlj4fyri1h8hfqxs1f65ri5vgblvxpzj";
+"erewhon-1.102"="kzzq304wj0n0sb75g9hfvsx5bs4bfivl";
+"erewhon.doc-1.102"="l2kxka3aavzs0kfr0r9v2vcz9fwwg43l";
+"erewhon-math-0.41"="vmm8kk4pi2j79vfszgvmg38bnsp5b0pd";
+"erewhon-math.doc-0.41"="58m32lqczivydwphh9v8yc8k16h02cw2";
 "esrelation-2019"="zhs9fa75r0wr060cfsk4gmmvn06mywmy";
 "esrelation.doc-2019"="08i1bczpz8sccj5lf32axfl3c5ix1sri";
 "esrelation.source-2019"="r1ylhybcbbxjkyvs07m6csmqgz14rrcv";
@@ -965,6 +1080,8 @@
 "esvect-1.3"="dd9wb3zgs99s93z0jig2z5pwccxh3vvk";
 "esvect.doc-1.3"="c9x8najv8ihx22n1kfd9hbqba40ilz3x";
 "esvect.source-1.3"="170376cm3v7mzlh5909qyzw6y18m5rjm";
+"etbb-1.001"="11jkhz4x2y4f26ccv5x8vs4612q7axrp";
+"etbb.doc-1.001"="jpijr3bpib9bh4fyq8fw89fgfvbqqfdj";
 "eulervm-4.0"="ica20j8a3ljzxrmp03k60y6f4kpcbiy2";
 "eulervm.doc-4.0"="g5fxzw7dvnff2w9ys2gpgnvr2x8dabx6";
 "eulervm.source-4.0"="ifvn5n0dvcr4qpcv1yp4xvnx9lj26krg";
@@ -985,8 +1102,8 @@
 "fge.source-1.25"="ak2gj4nk82ya7dfbi2vwp60lvnqlvnzl";
 "fira-4.3"="szqwp685dh828hs8w032cq48p8inaar6";
 "fira.doc-4.3"="6yfabm4jjy7fyvzm8gkw61crj0b5h7vq";
-"firamath-0.3.2"="04mhb3w3kymxi51100l1nxsv5pl9y6fh";
-"firamath.doc-0.3.2"="9xldfkq7q07rs5y64aj2zbngj31s65pc";
+"firamath-0.3.3"="fl4cbr4kka8yvq31dl7iiqylp5s8kqvm";
+"firamath.doc-0.3.3"="9higy6zhahbmfaa9w6js7958kqf6v085";
 "firamath-otf-0.02a"="8va0xil2r5i2bjmmv7xj39jbk9j8l9d8";
 "firamath-otf.doc-0.02a"="0i3j6rfpa5jahxipwa5ibfkh4x7vhz48";
 "foekfont-2019"="wha0shrvr3lv9ll9d3gv60mcav605vcc";
@@ -995,17 +1112,16 @@
 "fonetika.doc-2019"="ahz61pg6qnn2dpi3c9iz2kh2f4fvywbl";
 "fontawesome-4.6.3.2"="0n13dha58d0w511pzzckcq51fal6zxgl";
 "fontawesome.doc-4.6.3.2"="x7hzlyxv5k2zjz5lk8hy15pnvbhhhijj";
-"fontawesome5-5.9.0"="xm37wzc60g5rdg16srmq5g7miprlqq5b";
-"fontawesome5.doc-5.9.0"="25mnrvnak9dr7j142lk77ycrl72jhqnk";
+"fontawesome5-5.12.0.1"="0pkgqsb8ygiyiiqnjbv5zykzrxl162ly";
+"fontawesome5.doc-5.12.0.1"="9d4c1rzxmxqhs084r3kqrx1r19gavpsc";
 "fontmfizz-2019"="rkf93c9imj2wd7aps85m6450zbd9p3yl";
 "fontmfizz.doc-2019"="y70dshapwj7xp7h9b6sbjipv6v9k02wg";
 "fonts-churchslavonic-1.1"="3d67nxsgrrv480997rlbrzz5siyb2gvj";
 "fonts-churchslavonic.doc-1.1"="arcilr5n1w0rg97zkxy162kx21ygns31";
-"forum-2019"="nk35nrq1d7yilp3jps95zdrajxzb2kdh";
-"forum.doc-2019"="ba7bz482qb17yxxciawg01il4798v185";
-"fourier-1.3"="rl6alzjlkyyhhk0gbra08b99fb3aax85";
-"fourier.doc-1.3"="6b2bnjvp45lqxmjbp0pj5yd4m39kgg6y";
-"fourier.source-1.3"="dcl6cw6vfsd0xjpic29161iswkv52gm4";
+"forum-2019"="px3s2xc2djz1r9vlpb9w6yvs1lzbjvmi";
+"forum.doc-2019"="g6n07nh8q33w9l3ljb1gklabd35fbl28";
+"fourier-2.1"="b736sz2f40q7f1nnj55d62wkgzg229hl";
+"fourier.doc-2.1"="jm2f857hz9q4n80a6w6a3lygnlxdi99y";
 "fouriernc-2019"="9pxp21fllg7yh9jfa8nzpy6ifa3w6y18";
 "fouriernc.doc-2019"="dn9wfy53asfp1bbxnfa9nxvnfy3z9nn1";
 "frcursive-2019"="fs9aw12gfd5gs55fhqxg2p06c50i9s1v";
@@ -1014,8 +1130,8 @@
 "frederika2016.doc-1.000_2016_initial_release"="ncd2plzgwdwcv1many94alkvbjh7xjf6";
 "garamond-libre-1.1"="rcbndbzsxxs01mibalvyclkrgvp8saqh";
 "garamond-libre.doc-1.1"="hacrmaazg60scpg4wx7387xr3bi1gam8";
-"garamond-math-2019"="dgxryvlk911pqsy6j7yycqhmbllmnhbm";
-"garamond-math.doc-2019"="dmk1l4fnkqlvx4ff3wd45aray4s374fn";
+"garamond-math-2019"="mr7aafbkhy8z5iy5qc0l7pmpqbvnzq4n";
+"garamond-math.doc-2019"="agb1azq7b7c5gpvz4nwxb29lg7pzqg9y";
 "genealogy-2019"="hdl046d3paihjmlkh2q3crfj1n88fsyv";
 "genealogy.doc-2019"="7115cwa2l6nsnyijcdik7kw513q3a41h";
 "gentium-tug-1.1.1"="gdd212mv253371hvn1bxlr2q863qzy3m";
@@ -1029,10 +1145,12 @@
 "gfscomplutum.doc-1.0"="ddz279xl7glgi201dizr2gdkcgiy77qz";
 "gfsdidot-2019"="j0mg1pn4n9dfy9hdia5v88hds4j2h2d2";
 "gfsdidot.doc-2019"="xrnlqx0gkb79g50mwzsmi9g6ib1pa92y";
+"gfsdidotclassic-001.001"="mv8li5kjf7gd779h7ap57qm6wz7m69mf";
+"gfsdidotclassic.doc-001.001"="1z68ixilpnx61pjs5spbmay6861sqc8z";
 "gfsneohellenic-2019"="az5rq4d44zysnvcqlky0hr5qb7bh3nza";
 "gfsneohellenic.doc-2019"="04y313wjm59sgg4xlnili0kfw3dwljp9";
-"gfsneohellenicmath-1.0"="l1san6zqbd1r2r2j0zp81i723jpqyqzf";
-"gfsneohellenicmath.doc-1.0"="pj6lv282l62rz9yb4mlk6w07n0ncz0vn";
+"gfsneohellenicmath-1.0.1"="w946ahij7k25dk2dhvwpcrlcxpdndsl2";
+"gfsneohellenicmath.doc-1.0.1"="djwb6m03rymqc84dcgv531lq4wx8qx5n";
 "gfssolomos-1.0"="wq24prphxxnn94n0nd4xmrf23f5yqchp";
 "gfssolomos.doc-1.0"="rq87k1bymgyb837k103ps50w9krmxca8";
 "gillcm-1.1"="42vc5sx8shjzqkc10qv7gyq9689bzlgq";
@@ -1079,8 +1197,8 @@
 "jablantile.doc-2019"="yml29hq7xcawh3zkd6b32dbsk0aj024q";
 "jamtimes-1.12"="mdyyd5fy4hhi74rpc5hb7bmrxwdsk9k9";
 "jamtimes.doc-1.12"="c9849k8v23lrfrchf00yvrvq5q7g1gq0";
-"junicode-0.7.7"="s9grb6y7k5mxsfaxxyp1aj8c289cdb2r";
-"junicode.doc-0.7.7"="b66ag5n2apfdkwlhqsvg6aq1p8pdbiyn";
+"junicode-1.0.2"="2vg9bfcpawwij52yxai93fb276v351wy";
+"junicode.doc-1.0.2"="49dyn91fjdhs7yzc6j7y9ihnxkc9wpml";
 "kixfont-2019"="b9z3zajxsqs84zh5k15rx3jgkwwgwa40";
 "kixfont.doc-2019"="xp8ai67z856fmkzcssavksidg7n7j2yj";
 "kpfonts-3.33"="rsl5v8zsm8pblyjryw3f14svxjzhnchm";
@@ -1090,42 +1208,52 @@
 "kurier.doc-0.995b"="a4hw3w7qg492qnf4kivjsdfxqyrq669b";
 "lato-3.3"="5cl837pwnp1zd7h8w5j7cwqpvf6pmik6";
 "lato.doc-3.3"="fjxgmfdin3rrl6dn338f9ss9729napxr";
+"lexend-1.0.2"="yxc49nzfvzm0nxpckvd11ka2d2pq8gaa";
+"lexend.doc-1.0.2"="pynssyl75a7i5ri8qfqrp8y9j962bvvp";
 "lfb-1.0"="kqspj6w9i4bzbxcngqdfk8rnw33j0yyd";
 "lfb.doc-1.0"="ikbhi6ahzxlplvizphmpimf9ah2ninqg";
-"libertine-5.3.0"="9p4n4dm4l1vra87kfhipy4a9cvl1vcg7";
-"libertine.doc-5.3.0"="yp3dchk8j3vkmj4rfvvmc43r8sard2pg";
+"libertine-5.3.0"="m2qrzjjvix37zk9fzmr9drjk9y9rcz15";
+"libertine.doc-5.3.0"="6wajsgwacz6j2hf134gpd31dnplbqngk";
+"fontaxes-1.0d"="aaqzfxbcd9fdggw8lmj6syc1ff00m43p";
+"fontaxes.doc-1.0d"="q1qsz0gigyg3x462k337crqng7njvakk";
+"fontaxes.source-1.0d"="6xacssljffql809gpbhl8qdrs944v6cs";
+"mweights-2019"="6rwqdlv6x82pskdga8yzzz61yfxgvzpq";
+"mweights.doc-2019"="zkki0s268s1a23zm962ymbxl3gi7mzix";
+"xkeyval-2.7a"="nznhb9srbfg7ifdi2mlkqbdcsq6329a4";
+"xkeyval.doc-2.7a"="k84lpc1h5d71qcb2k5rm5fnn04pv8czc";
+"xkeyval.source-2.7a"="9g5vvb4y71qryhdbjwjyxhh2w86cch0f";
 "libertinegc-1.01"="jmz5hjyld04g175sgg322lrlazcbmbz7";
 "libertinegc.doc-1.01"="qf8q9c30ljq44kqh8l855xdkq9i4w857";
 "libertinus-0.01"="q8ddwlppxzzmwfb6lzdcsix9kb4i61vr";
 "libertinus.doc-0.01"="y5didmz6809s0cfa8lnhhqfmbdshy9v6";
 "libertinus-fonts-6.9"="mgg77ljqyvp9sx78pfjfyr875qz52h48";
 "libertinus-fonts.doc-6.9"="msqi6clqw8rxg5jzzysbs1nr9ivsqar3";
-"libertinus-otf-0.20"="6jkvz7v959d0gyvvd62f3mr0z0cckq6j";
-"libertinus-otf.doc-0.20"="lmdc9rj9620j7m0d1dh22jzibb07ymfz";
-"libertinus-type1-2019"="ji91vwfsyg1qgh8k96c9qh8ha8136dzw";
-"libertinus-type1.doc-2019"="g284knxnq9i7rm4cmqjfisv51cr7wqsw";
+"libertinus-otf-0.24"="7damv0p9n249i4xsrvkm0p6zpsrbha5f";
+"libertinus-otf.doc-0.24"="d8v43mn6h7xq0x1c8y7gr7r2m7mbqfl3";
+"libertinus-type1-2019"="ikagqjrlcp82q9ym2hvknz8l0rm13jpx";
+"libertinus-type1.doc-2019"="zvg1ciy3pyjwknyi1s6j2c9zgsf1d5aj";
 "libertinust1math-1.1.9"="afqrfb41ndii7pm2ry6ydhhxbakr6k86";
 "libertinust1math.doc-1.1.9"="w485wvhpf2v60racrip2wysr21rgdaqy";
 "librebaskerville-2019"="2dc8cilcgmmp0wrla8ayyyh4khhh7lfl";
 "librebaskerville.doc-2019"="5yargvzlnq9sckyy629jzsmi17gb8h7n";
 "librebodoni-2019"="1znd7g37rmm1qsv35dd9kvkmkfj4d3w5";
 "librebodoni.doc-2019"="hzihx71p9ggdp2pxrjvck7lhx2mrgdmj";
-"librecaslon-2019"="1m4qqdc9s66mlzrh3zlnlf29rkm8qkhv";
-"librecaslon.doc-2019"="1xy6qdg2ca7lkqr3rnyxdwgijr5pg1s6";
-"librefranklin-2019"="f59w30bwjk8swggjwvnl3ba91gxdlnjs";
-"librefranklin.doc-2019"="g3ywhprd6x6lx2ym0869l6xrs8d7qd8q";
+"librecaslon-2019"="3xd6aiixdpfjq96q9yf0jrdamyhng7is";
+"librecaslon.doc-2019"="88agnbh5q6f3l4pl78hk2l56w84gqqqp";
+"librefranklin-2019"="rb1fxs903zc5nnvhkza1dy8wn3j5j9ik";
+"librefranklin.doc-2019"="25nnnvx6gqjkbfl8bp0fiqdkr74dqb61";
 "libris-1.007"="fi5cn5ag6zgprgc0iqgk4iln6kb8knv8";
 "libris.doc-1.007"="82p29lh7cbavrshdx4s0pvqpgbvb21d4";
 "libris.source-1.007"="gd4aiv3pxy5as8cwfy9m1f4a8jp7v6d1";
 "linearA-2019"="fs5s95s31qczmlr0m3dk16c7gl4kpn3z";
 "linearA.doc-2019"="6b5jz6pfmv5f88gkwj5642jvd35ga3gm";
 "linearA.source-2019"="zdfpl9gwgrxwvs9ymj3vngfxdc23vv0q";
-"linguisticspro-2019"="7g6x7p9w5fx3dg01c9xqzlrn7zvxyf82";
-"linguisticspro.doc-2019"="db4pdcspfhvjlydnhfqp157n6v3sd307";
+"linguisticspro-2019"="034xndbaadw3kssnpam8sxmh3cx38c7z";
+"linguisticspro.doc-2019"="pc4glvhi0xsy43qx70c91byyc7f3m1n4";
 "lobster2-2019"="lx95j46k68gz8jbcxam8a3xy4jgxy9jk";
 "lobster2.doc-2019"="psr2bid2fjynzfvwb4s86biamv1r6q9l";
-"logix-1.01"="qr4r6n9rdr30ym97iv0rxn639xh4hpiq";
-"logix.doc-1.01"="ycvsbj23n717ffbdx3b775b66kja9cwy";
+"logix-1.02"="gkv9as6m4zddjpb56kf4v2kzd6966lrs";
+"logix.doc-1.02"="f89pvvnz7zxk8j9yl0b1hx5qkix0fc56";
 "lxfonts-2.0b"="3s303f06r7561x3x38sy3c9nr80x8gdq";
 "lxfonts.doc-2.0b"="swgvazf325j99kjrcb94r8611fs6jmqv";
 "lxfonts.source-2.0b"="sxn1hl96bsg6ai8fafskxj8palg8vpk7";
@@ -1156,30 +1284,36 @@
 "mnsymbol-1.4"="gmjs2ra3yb01bxw90gjdri3p6n7kbc6l";
 "mnsymbol.doc-1.4"="7ngazrr147x9gdadm651fv9hjr1f87i2";
 "mnsymbol.source-1.4"="7bf82bljx9w783jg3kibc5rn2l9j0ym2";
-"montserrat-1.01"="69sgwbg4w8kxgl2sixbx2p5l8x09m95i";
-"montserrat.doc-1.01"="qs93cxc3d97zzny9702zm5gydz9p45f9";
-"mweights-2019"="6rwqdlv6x82pskdga8yzzz61yfxgvzpq";
-"mweights.doc-2019"="w719n3h6cg10izpzgcqd4n0i5gbm644a";
-"newpx-1.403"="kdm5i09f3qwvp0hl1frivfnirqnm2ghb";
-"newpx.doc-1.403"="zb2i33rif9gb4p9b33fqcrwcx6189qx9";
-"newtx-1.604"="5r6iq9rp4hri3z3aziwing41k795zy04";
-"newtx.doc-1.604"="lls627k613jbd6yw5q2qig6dx1czdcfv";
+"montserrat-1.03"="0jfqmisw57gkaz06kv0iq8ncfn9cj5hw";
+"montserrat.doc-1.03"="0hb2s3xrsawiza8qn21hwkji1sxxi4xz";
+"mpfonts-2019"="ar90vvz924ppxyfbqa3g7j7q9l4ddah2";
+"mpfonts.doc-2019"="kyij6dba277ysdwyd74bfybqi2bgm436";
+"newcomputermodern-1.001"="f9dpjcd93y7wmjs04w3n59a6aqirc6x0";
+"newcomputermodern.doc-1.001"="i1sg20z95l87fkxh5338lpdvzacl15nv";
+"newpx-1.410"="c6i4d9bdcv9j67pzsmwanv6jyc5vlgyv";
+"newpx.doc-1.410"="y8k4lqn8v37l9xfkbcflgkq9wqgfjrab";
+"newtx-1.624"="lm25bm9qazk8kxs1hsgl891pc0dfr1w6";
+"newtx.doc-1.624"="pq7ffhhw4ya9mqakrxrscjv79l0pi445";
 "kastrup-2019"="qdr5cacl37ans3zd5jlzwr2356xxgswy";
 "kastrup.doc-2019"="mvq3abnsjmzb3kv4c2z116apbzgfh2dw";
 "kastrup.source-2019"="13vj32k48f0ahs5694zrsvk953kxjrwc";
 "newtxsf-1.051"="k228m8b49w8pxij91bgw6xb8ikwa5q6b";
 "newtxsf.doc-1.051"="4mn23hq7waqwd7n1b6p67pjgbck0vlaa";
-"newtxtt-1.055"="7v1rd11ryiynfmwzrmwywd2m9qc5i3fh";
-"newtxtt.doc-1.055"="zblj8j85biikhm989slz2hwbvkhq5yf2";
+"newtxtt-1.056"="chh34kv4xssw395m003j4pdnmw62b63v";
+"newtxtt.doc-1.056"="k4bq1vqqb394n6yx35qapgx846cp54lg";
 "niceframe-type1-2019"="0kr9sg5vnawjrd2aw8vbf8mg975sifl1";
 "niceframe-type1.doc-2019"="12bn96xfs68zy9sfxi5q67mnaqkl1v2a";
-"nimbus15-1.011"="b2vqxi65978p1bxnacgmd2z9jqlbfz8g";
-"nimbus15.doc-1.011"="gx3ij2574891g2s1b4i37dj294ccnpaa";
+"nimbus15-1.013"="9k2ck6b5lj3n5fjlpmwxs589mf9ph02y";
+"nimbus15.doc-1.013"="pb7vyh76yjs5ywb1hcwpxid9gzdq082q";
+"fontools-2019"="pfxfsgr6xjhxn0pbbssrsizibxmc8n23";
+"fontools.doc-2019"="6mbjf48hhn84gsdrg2wns8z45h60kk47";
 "nkarta-0.2"="g55hn51ys8zd7in6c6z46mwva577s6qd";
 "nkarta.doc-0.2"="59na8icxp6l11jk6nsp53c1y5gqyjsff";
 "nkarta.source-0.2"="jqh4ghyi8ry5w9x909w3kscg9p6m1279";
-"noto-2019"="cwbxgh84c1a2vm9n2rxcc0jmh0mpa5p1";
-"noto.doc-2019"="izii3yn2m788xyn3bs65542ij801psip";
+"noto-2019"="sx5x2lf2y4c0rxhzrqc6l8hdk29agykq";
+"noto.doc-2019"="ws089havhd1gi0rs7mvdh6nb0f1npbxl";
+"noto-emoji-2019-11-19-unicode12"="4hgmkcwhy0air6pw59331ydfxbjj0fxv";
+"noto-emoji.doc-2019-11-19-unicode12"="viyj6daza3fqvdsj101l75v32v9xkv8x";
 "obnov-0.11"="49j5a74f298hw84np3ih4xd0hnh6r1wh";
 "obnov.doc-0.11"="m9c4z3ckj08ai2cdb3hhiv040y6n1bfl";
 "ocherokee-2019"="1fg65c5gpjsx8vv9vsdg8szagf1xmg6a";
@@ -1198,8 +1332,8 @@
 "old-arrows.doc-2.0"="n9ly98pmz304gymkiafs3fncs9qq29mb";
 "oldlatin-1.00"="dw53za52apri5agrh2jpxrw0qvnk1mbd";
 "oldlatin.doc-1.00"="ngf614psg11qa2gmda30c6an4f371lda";
-"oldstandard-2.4a"="y4af7d3f3d1k8c8k26cq3j0vyz8h4n1y";
-"oldstandard.doc-2.4a"="189m5n4hb7hq50fpj0401mpfib738g2p";
+"oldstandard-2.5"="mlwzzs29s5bf8hym5748wsldj2w092rd";
+"oldstandard.doc-2.5"="27gcl81jba7gyi9m28jcyxnphk8ivjdl";
 "opensans-2.2"="a68ghfiy4iiv9n6z78s956grswbdyf4k";
 "opensans.doc-2.2"="c70nwprgs35f2a7bvabdbsnmkayxyvd3";
 "orkhun-2019"="fmazxvhmc0r0m96ms6a234wj139g00iy";
@@ -1220,8 +1354,8 @@
 "pigpen.doc-0.2"="gqnp68lkhnnyh1ib0sa34cxjg52jj0rs";
 "playfair-2019"="70y4jv653pcwv0s6rnmjz271saz179vn";
 "playfair.doc-2019"="v7jcyickh5fflqx8h2b7s307sx9zcg2l";
-"plex-2019"="wg42rjzqd27999sw5rg3xslysq0h262y";
-"plex.doc-2019"="1sh7f2g0q9idrp5df1qbbh0k9ifm1n2y";
+"plex-2019"="clbqiqsl3i6y337mlkrda8nk0wf15nsq";
+"plex.doc-2019"="yf6z2wd095cln6lcg885b8qx6grnkr1z";
 "plex-otf-0.07a"="2k3j1snsf3d414k4pjq56d9b1vn2vh1x";
 "plex-otf.doc-0.07a"="z6clw20q3nfwzn087f3c3ifc4g2yr4kp";
 "poiretone-2019"="isnd3cmsm0ps7dh40sjqiwa9vrpc1d19";
@@ -1238,14 +1372,16 @@
 "punknova.doc-1.003"="hjlldk6yr4hjh4chwcxmzq761h1ygwnq";
 "pxtxalfa-1"="rapvsla1cgyinabn1w9cshpm3y5af13r";
 "pxtxalfa.doc-1"="fg8arijrsm7gc3liyf3036pj014w0243";
+"qualitype-2019"="g25g7rmvwsrn41da05wmx9r1qbzh2xaj";
+"qualitype.doc-2019"="nm2vc0k5x3h5vks67zqak7p1i0qd6bqi";
 "quattrocento-2019"="isv4srm4yxgrn89hsx8if1224x6mbmai";
 "quattrocento.doc-2019"="qcz3715r89gpj53jcy69rzimbcqlzw2z";
 "raleway-1.4"="qyqkxw2r0kjdc5ccq6ixlsjgv75gcmhv";
 "raleway.doc-1.4"="kw13y1533fwj7lgjc986ydb97plij1vh";
 "recycle-2019"="4fgfdk09nzljd5a6vz52nvv8b23xk8rw";
 "recycle.doc-2019"="3wazkwncn9gh1lpcax4hb8x38jr6ynxd";
-"roboto-2019"="l8rcqx70vnwm438x3h6mh7ziglqw2c5x";
-"roboto.doc-2019"="dr5a7g26r4znmzy8j6fphky5dswdna8b";
+"roboto-2019"="whybwc6p6bzqhwdafwnjkvn8grf2yrq4";
+"roboto.doc-2019"="85mmkpnfgwann7dxrzphg39hswnlpnqn";
 "romande-1.008-v7-sc"="v5sf9cqkvd7wmbrrb48dffi59m048kal";
 "romande.doc-1.008-v7-sc"="bf5a3jzcqr74l7qp2im80r9x73rk3asy";
 "romande.source-1.008-v7-sc"="g2p0didwlqqf9gsdzrhmh0f9543wdwwz";
@@ -1254,14 +1390,16 @@
 "rosario.source-2.1"="pyzgnc976vz8grb6dx3cwzkgxv2i11i8";
 "rsfso-1.02"="3n75qwpji7z995wb2r3dqwrszkw6m61m";
 "rsfso.doc-1.02"="vga3jyv3s730mgx97mqw92igvvypbyb4";
-"sansmathaccent-2019"="i74c6yiwx5g1ilgjw2i0wsf2ip5ym9dp";
-"sansmathaccent.doc-2019"="dxbr7vs0j710wz9ym4n7wb3930kcrccj";
+"sansmathaccent-2019"="s26h8qfkc1qkh8afc3wj5wg8rxqzbc1w";
+"sansmathaccent.doc-2019"="4rvf51yh5fg1sfkr1arxqbdyf81i9ln7";
 "sansmathfonts-2019"="90f8gdxlqiqx6aw1nx0hfbmkrs6aw331";
 "sansmathfonts.doc-2019"="wcnhx85h99brrisdz8yb0m34mv5qsvd9";
 "sauter-2.4"="flw49y2l5355jpvq7f3q3vannwcfni3f";
 "sauterfonts-2019"="kciqmij0w173na214ix5yhngc18likch";
 "sauterfonts.doc-2019"="x2lc53r2wnwrjfainmngafdsg39zyf48";
 "sauterfonts.source-2019"="kfi5301zd7pwmnr1fhqc6kfni0nr5d4m";
+"scholax-1.021"="3y176kc0bywnpmfkm8m90r04bj845cl3";
+"scholax.doc-1.021"="48xfsicb5fmwn4bj6nfwp0ldpzfqqgyx";
 "schulschriften-4"="3g5c3l5mnpp3a6472ayj0iykriini807";
 "schulschriften.doc-4"="ad6v7vnksqfglwb18via23p45xm2hr81";
 "semaphor-2019"="rb37ln7zq51ck9k6g0wj1cx1q02x2i35";
@@ -1281,8 +1419,8 @@
 "staves-2019"="9vcnfl7q4czfhyl3zxadig3nzdxg900r";
 "staves.doc-2019"="rn25a0syl0d0n89jp09906y30679mr7v";
 "staves.source-2019"="2vby0srv43ikzb1br9wgnsyxmgqpfrv3";
-"step-2.0.1"="w2cbwwjf32bwlhlzpw09zi6zh3fwgqm5";
-"step.doc-2.0.1"="lsxp4rg609djqlz54izp8j2pgy5dyn8f";
+"step-2.0.3"="v0amk44nny3vi305zpbwl0w16sfcafr6";
+"step.doc-2.0.3"="ahh0r2mdrkavizsw1wqb2npfy6vfjrf3";
 "stickstoo-1.033"="k0kj2930hby7wkrxlal4wr7ajagm9lnd";
 "stickstoo.doc-1.033"="mn4pm8hwyl39h1v7xkvhd8dghkbnwlk3";
 "stix-1.1.3"="sxfvkk30xb94rfby1kli4xny57xsbqv8";
@@ -1322,9 +1460,11 @@
 "trajan-1.1"="j8dsrxip2s58sgw90hl98v2w9r106cz6";
 "trajan.doc-1.1"="kwiwf13cr6c6v10vd1irq5srl82kvl58";
 "trajan.source-1.1"="nm5fpl91wscxri9bgcvfhmyfqrryvdil";
-"txfontsb-1.1"="lspmvs805a2sjf5my3py4dkai740n05k";
-"txfontsb.doc-1.1"="cgi4jnv4ks21p7m4y4ry4wajzcgkws8g";
-"txfontsb.source-1.1"="4zypgg4dchni1zh8sx4wh4sb5fdh8x98";
+"twemoji-colr-0.5.0"="addwkmmr7gywrzsrk5xclaiqz9215ml0";
+"twemoji-colr.doc-0.5.0"="k2374m9pp0xsc1vb2jrdym961ch9g6ns";
+"txfontsb-1.1.1"="f8012p25mf8n4zj4nkmgpvgf54jb9i52";
+"txfontsb.doc-1.1.1"="r3xzad7mqh97g9firmqvb57bn44xa8cf";
+"txfontsb.source-1.1.1"="4zypgg4dchni1zh8sx4wh4sb5fdh8x98";
 "txuprcal-1.00"="8yk9lvdxj1ap0lcnywllxhzdz8hplk78";
 "txuprcal.doc-1.00"="pmlz2hhjd7a2q3bdbz01yd61w3hf2i79";
 "typicons-2.0.7"="0mmcwr2xcx7hdb4yllndrzq7bxava3yb";
@@ -1344,8 +1484,8 @@
 "venturisadf.source-1.005"="6yz4vcq9mzzm52ca19kcvgj8fg7js28g";
 "wsuipa-2019"="h05k2wwr89dak3ifgvjgjw0zyvlkyyjz";
 "wsuipa.doc-2019"="nrlpxbqgccmccncqa3xx8l3zlbalkcvm";
-"xcharter-1.201"="am3f3s0j1f89sln67zdv9fmaz7cyr5rl";
-"xcharter.doc-1.201"="v3vglfka075ws52w9fw1zn3r9awr6lxp";
+"xcharter-1.205"="aafczy0cy4hzlm2vp6a4z13n81c3xdpy";
+"xcharter.doc-1.205"="f47pl0h1yqqibd5fqkyripdhp5fd2d5x";
 "xits-1.301"="p6p15xy3v136llbzrxhiyiqqjxjx9gzz";
 "xits.doc-1.301"="3qdj5y0g77l89xp1nijqr8kckm0257lg";
 "yfonts-1.4"="i2aacxlhsnkbgfb9i8p0sdwb57qv6gb6";
@@ -1365,8 +1505,6 @@
 "cm-super.doc-2019"="246p6vn62gq68n7bnxh1iz258gn3wi85";
 "cmextra-2019"="kqywbrwmg5w0xj0r0qffh1y9z9hlvlaf";
 "courier-2019"="f3rhv0jy01gfhn1rdnai7693y2xy90d4";
-"ec-1.0"="kjq23jms9m9h5af2ri4bxd65w82lli3v";
-"ec.doc-1.0"="a8mvwdx6s8swxhagcc1p36dsy335fhby";
 "euro-1.1"="mpzw5yyqlyb864cqx4wczdnbln4sv4b2";
 "euro.doc-1.1"="82srlwf5vlsmfpwn0l7c7j4wd9fmvbqa";
 "euro.source-1.1"="v5w06s1hfni20mg1flnwgpkr5m49vqvf";
@@ -1384,13 +1522,12 @@
 "mathpazo-1.003"="d950j9d7ywwx0air9b1awwxr0a7486qz";
 "mathpazo.doc-1.003"="zna30q1bzd255h9yjnf35ldaiql0b142";
 "mathpazo.source-1.003"="0ly3fqq1s2sf0zva0jx3llbwkqjm0jv4";
-"ncntrsbk-2019"="r2sgybivplsnj8iqwd62wr0ixhlc8x13";
 "palatino-2019"="xp5kg58y1lzsqba3bv9dz4f8rqi3xysd";
+"ncntrsbk-2019"="r2sgybivplsnj8iqwd62wr0ixhlc8x13";
 "pxfonts-2019"="9lxhr2mzcx8qkbhqgqx3y8a4pyhfad5a";
 "pxfonts.doc-2019"="q0zqikbb5d4d8wma6xspga1k20bjx8dz";
 "rsfs-2019"="c6wq6zd58x1dqi2l6p4ljkj3p30lfh1y";
 "rsfs.doc-2019"="2rq51dizzivym4mjl4x7lhw7mg6xmcgy";
-"symbol-2019"="3w7a6aib8mdrap257pxjw8x39lck4nyc";
 "tex-gyre-2.501"="bh1inc34f90vb7wh0r9drdjalhwa71cw";
 "tex-gyre.doc-2.501"="8mvblk061marhxqwf21jssgpn9mgvqs2";
 "tex-gyre.source-2.501"="lqv1gkn02k8yr5n4c3h80sq30f9iggxf";
@@ -1404,44 +1541,41 @@
 "txfonts.doc-2019"="80fli8zzv88yh6rbv99dzsihxbrhmxkp";
 "utopia-2019"="cq5h07i2v6n1d5l4x2gjb0qn7594w5f9";
 "utopia.doc-2019"="sla3qhf9ks0020wq82iv1d3mivpbx79v";
-"wasy-2019"="m5fy0m7fkc0rb3alrvy7hv72659szlsi";
-"wasy.doc-2019"="ig05zmll75wy50l3cwpz51cl8p6prpba";
-"wasy2-ps-2019"="rfx65vba7w8kqvmf0ld02ydr7flyl17f";
-"wasy2-ps.doc-2019"="1ac408160y6br39063cswn8ahp2c9rq4";
-"wasysym-2.0"="zmiwhd64zrf8fa9v2iqch0ksj81q5r1n";
-"wasysym.doc-2.0"="a1qr9h6d7s46a074ckxygm9iwyycbyw9";
-"wasysym.source-2.0"="r9iq0wx65zmc2kp7880hw3ws73xb63xf";
+"wasy-2.5"="04vral6cxg9d9yqvm6b1hypgybrasbpc";
+"wasy.doc-2.5"="04z8v3n1qqsig0yg0qnisbrly6zkf2gw";
+"wasy-type1-001.002"="9nrxjm30l4lw800p9vq7kzw7fiviybsv";
+"wasy-type1.doc-001.002"="zbifgs1xxa0nkggrf3yk25pkyxa82hdf";
+"wasysym-2.4"="s0vrrk3zl383akayli6rnqma3r3xbqih";
+"wasysym.doc-2.4"="pvkpxwgdwjhqilk6lnvkzwhf8srbnyhl";
+"wasysym.source-2.4"="y43dlzdnavkbazaq47hcm1dympkwqiya";
 "zapfchan-2019"="4saylq91v4il4ch3cp3lw7dv8x6sf296";
-"zapfding-2019"="6prjnqim0yrvzj1ary8i5761byqi0ca9";
 "accfonts-0.25"="vnff63f9g4z5bsgrila75lr6lhdl3jhn";
 "accfonts.doc-0.25"="5v97adjwkwxpy4dgw6qiankxfrlz67ab";
 "afm2pl-2019"="vpay128xrpp8jkhyz6kjah0r4vgm2d4y";
-"afm2pl.doc-2019"="4cvj0qi3h4d4ria1xig0i0v1dpplivrn";
+"afm2pl.doc-2019"="4kms0bi8801giwdiyk5d0l7q0rdsvqi0";
 "dosepsbin-1.2"="f00pl9rcgapb03h76g4578za2p0awqh9";
 "dosepsbin.doc-1.2"="41pqpdppqi9658cacc0zhg72cp1pa00x";
 "dosepsbin.source-1.2"="0g1nbmyry93ikcgqhcyg48agnabnzpsk";
 "dvipsconfig-1.6"="llmyk9rhvxs90j3jbjrqz76dxxvzdyp4";
 "epstopdf-2.28"="45cbq50lfbqnlmfp19v43ipzk8pv1jrg";
 "epstopdf.doc-2.28"="ffp11ppmlcb9ri1jdmfjwnaf226j4icd";
-"fontinst-1.933"="ynk1l44cw00x0cxmfxvn0kwixgnaah4d";
-"fontinst.doc-1.933"="dfb4pk5y5kp6ycfsvaxf07bg7h7v0czq";
+"fontinst-1.933"="4ybgkvxvi1xy6jyw9cc8w3c51kmsmbd6";
+"fontinst.doc-1.933"="az11s0n9q3s68v02y4h2hx00fx8r5hxd";
 "fontinst.source-1.933"="cvbp2ml5kiq35qjnyzbpi8p7h1n5m2l6";
-"fontools-2019"="cih36jq7ysk05hyfm34xn1mgyji95i5b";
-"fontools.doc-2019"="6q07zyw9h8lmrgibp9assa4aiqzilahl";
 "fontware.doc-2019"="2lq4pwncc80f0lh0x7s2a2c9kz9wjprn";
-"lcdftypetools.doc-2019"="z21jpfjpy1ckqk93fszqvwhig9l4a482";
+"lcdftypetools.doc-2019"="c6agyhm6yaqg7gfnahfy124cdkln32cl";
 "metatype1.source-0.56"="infq9kahz9ljr5kk338xbww0g4ifg8cq";
 "mf2pt1-2.5a"="d57jv2y04fsln3q3znw2qi16j7dfq3ap";
 "mf2pt1.doc-2.5a"="gc2i9fp30877ycz5l3wgphwlg9kpfqp7";
-"ps2pk.doc-2019"="z5mvym7cids0yzvjpcc6s4zb04rspj0f";
-"pstools-1.68"="pqsq3y183pf9330bk78l7v42jxiywkga";
-"pstools.doc-1.68"="fxydcv5k21rfmwpbbhrv2c9fxf7966sd";
+"ps2eps-1.68"="ja294cdv9aagllqxjbckv50b13swxlvj";
+"ps2eps.doc-1.68"="00q5228fgcsw6rbadprynz6zdjc6y2j6";
+"ps2pk.doc-2019"="k23d42q6071yrh1jnzxdw7yx19nbk5ac";
 "psutils-p17"="g8ci3q98i9cvpw1s7l3mqsv39wqx3gac";
-"psutils.doc-p17"="7dd0cf0q58xxr7mal5c30yalmhxya72h";
-"t1utils.doc-2019"="55a5hkn4ns0qyw961pklpk4jblsn9si6";
+"psutils.doc-p17"="6zkafw71fx43y9y5ywycmclwldd3skiw";
+"t1utils.doc-2019"="7qnzwx98z6pjw9k3zrjk5pmix9amlhs7";
 "ttfutils-2019"="hzj3dljvfr9ypzpjgpwxadxf225yi8zj";
-"ttfutils.doc-2019"="vsw2vdd372ll9fjmyc5hj04rnjjfbhp2";
-"aleph.doc-2019"="j2hsggqpjkn1g67g2klps5gn8sc6a21s";
+"ttfutils.doc-2019"="nwcnj5ss2fnxspr2q7jka8himc2v5rzi";
+"aleph.doc-2019"="p1zcyzl5na5ladrrh54m8q3926kwdw6l";
 "antomega-0.8"="jxriw18jifvf24fz8nqql5izp67p8z5a";
 "antomega.doc-0.8"="q9jb5ks7gfxg5gjhkpng5bl0wwbwp2ph";
 "antomega.source-0.8"="l2gs7sapppwxiy712i8vkwfmmc96ch1s";
@@ -1460,18 +1594,18 @@
 "cyrillic-2019"="zax5fp5a3p2zd3bhbpng70sydjxm9i1p";
 "cyrillic.doc-2019"="3risjsh9kgr6pk9d0f082a5ipq1827f9";
 "cyrillic.source-2019"="cmq6669b4zjhvhxn0lxq35h4b606yhkb";
-"cyrillic-bin-2019"="h64b7gacxv96hbs0mjxx0s65s4z5znrh";
-"cyrillic-bin.doc-2019"="zz9w85h992lmsvnqh7yq8a0az8ls2759";
+"cyrillic-bin-2019"="5mgqkf2kgqwx6fpdcvc8v99y6lc2cc2x";
+"cyrillic-bin.doc-2019"="hc8x4l1yd2cjqzvjdhsg3jbz8xnmq1gc";
 "passivetex-2019"="arr43134jllipw1jl9cbrgnnk1gav4d9";
-"ulem-2019"="cissyhv0gisjf9lpwzxm18ffwxmlnndy";
-"ulem.doc-2019"="b2hvc7p6b57q1qqn44pfrchxrb5ybzas";
+"ulem-2019"="d8shv0p8kmjd0rii3qljds7bd4jia6c1";
+"ulem.doc-2019"="3sdwrmm0gj0h8qq3ynarqf6vmk46v623";
 "lollipop-1.07"="c71n12rvjhafkq26bca7q7hxjy5b9xdv";
 "lollipop.doc-1.07"="18wdsl5kq7xwsqhr6v6ldwz66b8xk60z";
 "mltex-2.2"="kkc5ssb6rd3f4kig16sc30npjayw4ab2";
 "mltex.doc-2.2"="qqr7ia4wp66zgasb8sm0bd0qclw6zn7l";
 "mxedruli-3.3c"="f866q8w776cr7k7mxll72va7zb0avsl3";
 "mxedruli.doc-3.3c"="vhcvl3k5lzb1f0g0ghz1rf3cnsy0cp58";
-"omegaware.doc-2019"="hl3ciw90gj71dz23lwn2c2bzcgd20qls";
+"omegaware.doc-2019"="y9lv0rasy872n5vbaqlq5adcjfnalcfz";
 "otibet-2019"="66pn5bmsfw3d7l1prcr8p5v6w93lqfrm";
 "otibet.doc-2019"="i308lrxhgqi1gpsh5b5961xisbb9i3si";
 "otibet.source-2019"="hspwgiv9bs4ncmy1yi02jw8ghw2lxcpm";
@@ -1490,9 +1624,9 @@
 "bartel-chess-fonts.doc-2019"="xj41i6y3ssxdpqy3j60pdx2scsf3qx35";
 "chess-1.2"="j9hxdp5kz4dv6wwgy6azrw6yjhdq7384";
 "chess.doc-1.2"="n9xxs3zgzz1vhl7y1d8qxk4cj8fglhpx";
-"chess-problem-diagrams-1.12"="l704rprn6ybj2x2gn469z8zj1kyw8gas";
-"chess-problem-diagrams.doc-1.12"="k3dg6fjx2zmxcj29whrj41awvpmyb7qy";
-"chess-problem-diagrams.source-1.12"="k1kqz5gdj6k6pkbajmpj0qha6lm1gapq";
+"chess-problem-diagrams-1.15"="yiqgdwhfqypmf5i21s0r48614jzl16gi";
+"chess-problem-diagrams.doc-1.15"="aw911cwfw6nix4s2597w1nxa5sb7gf1j";
+"chess-problem-diagrams.source-1.15"="4jflmd6p2dxlh63dmc4d96c0qga3hcgk";
 "chessboard-1.8"="mpdarc678ndb3qhx72fbkfr5di3mp05f";
 "chessboard.doc-1.8"="9s4g0f3q9dbv521rqxgwf6v4sk9l1mrl";
 "chessboard.source-1.8"="hkh4fq04v2zmw4fwjnkcswhiq46pn3wh";
@@ -1532,9 +1666,9 @@
 "logicpuzzle.doc-2.5"="snzhcidhpnkjwbrb25lb9g18bc13bl5w";
 "musikui-1"="888sbpw1xvg39606w7xl7qy1f32n9vpc";
 "musikui.doc-1"="v9fa4l7bl6d4dcvcqz6nbpmz3js0jbvm";
-"onedown-1.3"="xkr543whv98k5ni9hrqi00pa8slzqiym";
-"onedown.doc-1.3"="92iyvy5819cbz5nxxphgzlbg0vl132lh";
-"onedown.source-1.3"="zkwm17wpwxvy1d0mnr8ass20nridywvv";
+"onedown-1.4"="v4434vhkwq56himsgwymcjjm3812cn94";
+"onedown.doc-1.4"="sbz59m5fjy7gbgk8fgp3j2f8pj5dkq4j";
+"onedown.source-1.4"="a57mbsn5qc5qx4swvysy5m82qvnzcdyh";
 "othello-2019"="fp9s19jk73qrplyhjnicv8q066a98jli";
 "othello.doc-2019"="q1dqp0zdi9ixxchxnlk60zwfyszbx0ry";
 "othelloboard-1.2"="ymadc4vpkzc0lkl2ws340jf5vzjiq1i9";
@@ -1547,9 +1681,9 @@
 "rubik-5.0"="9wi8kxm1rfbqdmgd08bkfmmcrxh6qglv";
 "rubik.doc-5.0"="byp3r482d99yvd7wj0gw7sy8azki6srs";
 "rubik.source-5.0"="p25x3gpqgyq4hsvgksdspy16w6h593kr";
-"schwalbe-chess-2.3"="2kv49bmr069v1xqlmmq1mag9y76w3jx7";
-"schwalbe-chess.doc-2.3"="f0f7m5nisr4ksa99f4qcxzb707wgbl7q";
-"schwalbe-chess.source-2.3"="lhs87rqjxv2bvxi4shr49aicl2zzx1vs";
+"schwalbe-chess-2.7"="dp5z6xiwac5gf56wv8f8jiapm8izw3qi";
+"schwalbe-chess.doc-2.7"="dgv1y4nyn5xc01xxkda7g7294sim7xs6";
+"schwalbe-chess.source-2.7"="pbjki3lq6xnn4aw0snggasankh18yi0d";
 "sgame-2.15"="36xmv070y7wzwj8qj24y5q063v2c1l7f";
 "sgame.doc-2.15"="pm7psgqwg5prx0qfj6wh234raqw849wa";
 "skak-1.5.3"="0wa6kcvgwqz6cnjrf64x03hlbd7yppax";
@@ -1572,9 +1706,9 @@
 "xskak.source-1.5"="5z0q23fhwbxrz4jkfpc9ishdjnxn9k4m";
 "adtrees-1.1"="252iwghr89frhrnm3njrz1l0i1qsjq3q";
 "adtrees.doc-1.1"="4x26n2q1pwdxmwd1v15jp6mbrwwl9l7z";
-"bibleref-1.23"="8cf12j1yzl2g2fwqd9igpy9ir251y704";
-"bibleref.doc-1.23"="s9hihhiwli9r8n43nav5ag2ivg6m82h5";
-"bibleref.source-1.23"="fq7w8mvqsba7sd3826jvn38l40d207wi";
+"bibleref-1.24"="nrzlxpr6dhr68yv7cxjpwidj0qmq8inr";
+"bibleref.doc-1.24"="30vxl5hvjx1bryz1y6wqpswngpwl89x7";
+"bibleref.source-1.24"="chcdsv415crk4h65vkycifd76n6d5srk";
 "bibleref-lds-1.0"="adlzl3qk74vn1z0zdqn9cm6xqbwd8j6x";
 "bibleref-lds.doc-1.0"="cxvgzvgkicpnam43l53vfw9za8gigszv";
 "bibleref-lds.source-1.0"="8ndhf2vnjjii0xywr848janqh7xzdhn3";
@@ -1583,8 +1717,8 @@
 "bibleref-mouth.source-1.0"="drlwpv0xvyrb259ipq71p68929cmp6ka";
 "bibleref-parse-1.1"="ddxzanvw07cnj984ylsmjybwvyl41sg3";
 "bibleref-parse.doc-1.1"="jcsy831ih2d4scdsydj4m9mzlyahqlip";
-"covington-2.3"="a5f2hzdc6fpm677d2dgllpa1jr5lwl8p";
-"covington.doc-2.3"="basski8kn3kk6i9jxxc9p5xy8lfxcp8i";
+"covington-2.4"="l51kr389xhpiqw96kc6zhljb905y61qf";
+"covington.doc-2.4"="61xskdysxqxfyfsvjsc4s3vl08wczlmh";
 "diadia-1.1"="p95dkjaf17pn4qm3syrd2wm4680qxa86";
 "diadia.doc-1.1"="s8q9nnwajrravg7418bldainfxpm874j";
 "dramatist-1.2e"="r8ldaql5igwpsv1bm35jgcgpnlr817m1";
@@ -1657,12 +1791,12 @@
 "play-2019"="r6ryb6v6svlfv9i9j6r2a7ciks2k53bv";
 "play.doc-2019"="b5kjgd2gvgz5228m98l3lhaawmdfp40h";
 "play.source-2019"="jk04llsraw9d9gl5grvr019rjnkha1h3";
-"poemscol-3.14"="5qyj9w5bi9j4shvvyj7gb84hz2dm7zs8";
-"poemscol.doc-3.14"="f8gcghy84zwpp04id30687hp7hfddba1";
-"poemscol.source-3.14"="rxfy4b92d8275dkis2kjncc6ilmlmknn";
-"poetry-2.0"="f4597yvh6j4qrnzmvrpsc1bmaai5g7k2";
-"poetry.doc-2.0"="9vgmd2rvp38lp2xka75my5i5227j2nhk";
-"poetry.source-2.0"="waq7n2xpvy3fqvqb0x2akzasz1dgl2jc";
+"poemscol-3.141"="c8c6v3qgn0c4j1nr01xjljwnv8zaabxi";
+"poemscol.doc-3.141"="xxm7iqr2w99whqkai71da46m4avhbm03";
+"poemscol.source-3.141"="2p6xg20ig5z9w6g9ccvzybhn6z00ni8z";
+"poetry-2.2"="2wypw6n5s3x2ml6dkk9khlp2672ipn21";
+"poetry.doc-2.2"="fslir5ibkqqdqlk4qsy094w3gz8dgj9j";
+"poetry.source-2.2"="jwly1fzi8kzgkvlnfc23yyy5bajd4rcz";
 "poetrytex-3.0.1"="a7a68naj2vngygl078qcy6qpyvgjqp87";
 "poetrytex.doc-3.0.1"="d7vp6y5vm8sw1vq3j723ksvivdk3v2a2";
 "poetrytex.source-3.0.1"="v4ynl1n0sgg2n5g0ya2ncm7k1fibfmgg";
@@ -1670,9 +1804,9 @@
 "qobitree.doc-2019"="xi15qg62q42sgh4115gp2mcnv7nriwiz";
 "qtree-3.1b"="d2wip0zniiihfnm77v0rzd95f4zvf9dp";
 "qtree.doc-3.1b"="pzpwi4bdw8sxhmyyx16g59nmi0zj8ijg";
-"reledmac-2.32.1"="b8ci6sz2f1fb11fylb9f7y69lsib5wad";
-"reledmac.doc-2.32.1"="vf2q7rkl8pggivj052yx5svy0f5m9466";
-"reledmac.source-2.32.1"="1lgdnmcbyyd3b8x25hz9mms891ldkw15";
+"reledmac-2.32.4"="5z5b3fqgyqhzf5gnv04ix9bn5y0b95l0";
+"reledmac.doc-2.32.4"="91g8qsqb3z1qslb6mp19ra1fz4pgj63s";
+"reledmac.source-2.32.4"="ybawm599f3j9plsyqrpk09y7qpx2gffd";
 "rrgtrees-1.1"="gijgmkpg84730ywfcangcf301kff14n5";
 "rrgtrees.doc-1.1"="l557gafpfn0vm4ajcaynvqf14axn1rrq";
 "rrgtrees.source-1.1"="al765qzv8rz1gd9dw672j29q1i27gf2y";
@@ -1685,8 +1819,9 @@
 "screenplay-pkg.doc-1.1"="gvd3ma5bmmcpiq1jpi8081lcvk6zpfgi";
 "sides-2019"="4by0j8k8xj6baip7kdvjr5x3srvz4wbf";
 "sides.doc-2019"="7kcin18x8z42axnrmlqldkzqqbvsjzvl";
-"stage-1.00"="bi5p7sggcnkfmzmjj4535qbraan5yfdm";
-"stage.doc-1.00"="hwjzdlnzybkv0jvgbldansab25ixggnj";
+"stage-1.01"="jl9zysnd3ji20yn23nifnqp8db9dcpvk";
+"stage.doc-1.01"="ffsgwdyyz5p24vd5lpb7sz2l8xzn98mk";
+"stage.source-1.01"="qf4hhfzpws1friwg89vq0sg25xp3jfwh";
 "textglos-1.0"="lfdr25rxphjmck47gv10zr6dwiwyczla";
 "textglos.doc-1.0"="k8945zjmlx6n8szzighhs4fa1z8zc340";
 "textglos.source-1.0"="mvxkgnsda7v23v765zh7mzg1fzcn0hdn";
@@ -1716,9 +1851,9 @@
 "arabluatex.source-1.17"="0yzrckqik3jydhay3ab79gvmgj9chg53";
 "arabtex-3.17"="fr7avfkwpdbx619kq7h1y31bx4nmkp5v";
 "arabtex.doc-3.17"="b5ng3w5g40m9c3x87nih862msx5nw292";
-"bidi-35.9"="b5dxbd8dlxw33palhswzplasbiipf44a";
-"bidi.doc-35.9"="sl3k8nkrwpw7s36c0db47apalwzhvxcd";
-"bidi.source-35.9"="7vqc2v0cfcpblf94nl6lw7nzzr89k2vf";
+"bidi-35.11"="i591q2r2gn7f5bxac3jnv1zpdv3igdwb";
+"bidi.doc-35.11"="g7iqspvwb11j1vdr4grv522lqhnz65yr";
+"bidi.source-35.11"="fj13w1zcvygq3zrwkd89y7la1nvw5b10";
 "bidihl-0.1c"="kwa5li9yi8wb452g12y2h0ar6lpqdmmr";
 "bidihl.doc-0.1c"="558l7z4b7giwqqzj5496r7nkzv1wrnqq";
 "dad-1.2"="ivwjd7fhzgk4kl0iwzs49jvhqsb44ysr";
@@ -1732,8 +1867,8 @@
 "kurdishlipsum-1.1"="8frakqhm5sfw4f9j514zh63la69nwnnr";
 "kurdishlipsum.doc-1.1"="1spiraw1mpli2hyyxdh43r72dkr0446a";
 "lshort-persian.doc-5.01"="hba2q0ni1c873gpg2qp835csinw78yi8";
-"luabidi-0.4"="wczrrkgbm40ba2cy5yfb8w0ah6q9s0jy";
-"luabidi.doc-0.4"="319i8wapmdv1gyx5sqy19sql5pkf5p8v";
+"luabidi-0.5"="ni9007yf03ddfzvmab1bp3ki9j4zk1ls";
+"luabidi.doc-0.5"="71wyc3gjz241an8jjavy4q4bsxxjn934";
 "na-box-1.0"="vfrchq5jqb5s18zgngk2qsb0svmnc7p9";
 "na-box.doc-1.0"="7s4wcsg6khlv2lgakqgph9livd38fil9";
 "persian-bib-0.9"="sakc18mdqnzymfvgkwsxvrjd9b5a7dqm";
@@ -1744,9 +1879,9 @@
 "simurgh.doc-0.01b"="z3qq4jx25qyxqmnfbpsdsayi59fkaff6";
 "tram-0.2"="7wcas9syxfvm8pc7wnp817zd9y4q941l";
 "tram.doc-0.2"="ppbq1g4k1swjv7y9qkqhcr0m25knssk5";
-"xepersian-22.7"="cvkpfxxrlx7sqjdflg2rsrh3h6n9ahln";
-"xepersian.doc-22.7"="7axbpnxr09imnpyl0c0qd5m9806a9814";
-"xepersian.source-22.7"="pbpwh6rqh6c3qj8q4l43smbhc3a5kxy5";
+"xepersian-22.8"="yszbfqn23qc4fhfxaryil11hq9hqkm1k";
+"xepersian.doc-22.8"="nrbarrbknnwjhij7p1g4qd3qv955241f";
+"xepersian.source-22.8"="n0mh6d4lxkfs1y8ln205jfpp9kwkcsak";
 "arphic-2019"="zfax00567h7mdlfkpxihy379cwqmy8ng";
 "arphic.doc-2019"="55lcjk7s78qa39dqd0wj0za5f6hcnkxd";
 "arphic-ttf-2019"="s5kckgwzz84bm3px9cmnw2zgvmaq27yh";
@@ -1774,14 +1909,14 @@
 "uhc.doc-2019"="hp3z13z2yxkrgr7z3qa8pyf4d98rd37z";
 "wadalab-2019"="cpc689ywzaqil8xz78nkzwx30qmqixh5";
 "wadalab.doc-2019"="9gjsw3c2hlxnc1wxvky9mmqi6dyq4i9j";
-"cjk-gs-integrate-20190816.0"="ppc68sldmkv22bjr2zs8czj1s8jgdifd";
-"cjk-gs-integrate.doc-20190816.0"="qm5clja7hsdcivm6ql2xg6l6xdrgy2b1";
-"cjk-gs-integrate.source-20190816.0"="3dzd7xb4bbps69c79dpw7zr4j9h8azka";
+"cjk-gs-integrate-20200115.0"="baj3qgypvxrqvv1jba83h9rk91k3m0pg";
+"cjk-gs-integrate.doc-20200115.0"="n0sp50qg0p14df2qi4brl2cjv07lnggj";
+"cjk-gs-integrate.source-20200115.0"="scgfp18nqkcghsvw99khhw5x11zv693p";
 "cjkpunct-4.8.4"="8hwj54qw1xrvs5bn8bncdynich00d0ss";
 "cjkpunct.doc-4.8.4"="c8wmkh6h45an46jqph2s9ljbgfyw1mf9";
 "cjkpunct.source-4.8.4"="0qfm89f4l8jfmgimhrh8vvskca0d866k";
 "cjkutils-4.8.4"="8w069zvnnpkr2qcmsqxh6p64db57b82g";
-"cjkutils.doc-4.8.4"="khlrbsmdr6gadq98xa4mwxc3h2320d4i";
+"cjkutils.doc-4.8.4"="grwdzh1216qgniky55qv2r62r0rd65jg";
 "dnp-2019"="jf1zsbg60d074ksrz0xk9ihybbabda1f";
 "fixjfm-0.8"="r24s5c53wvxaacm4fmnmp10nl8096nlf";
 "fixjfm.doc-0.8"="inhixa1d1hr6s2473qp0hfchvcn84y45";
@@ -1792,11 +1927,17 @@
 "xcjk2uni-0.8"="sy7lqifnwc11sf0rzfj208rmlzmv9v2x";
 "xcjk2uni.doc-0.8"="03y9sam560xbp0px56glih05gagz050m";
 "xcjk2uni.source-0.8"="f9g23l42ry05xb3b73hf0vnbi6yg9wyr";
-"zxjafont-0.5"="w83bi9vv8zl9py0jva0khxlbbbdvqllf";
-"zxjafont.doc-0.5"="c8g15pphrd6980ixqk16zcw3z1qmjv1v";
+"zxjafont-1.2"="jpj2xg53gz5k86p1aqc0czgbi2pp8yab";
+"zxjafont.doc-1.2"="8z7k507pgb7g4998rw2l53a1kydmp3xk";
 "ctex-2.4.16"="6g9cw6bbdrzpi6mq8is84qn3pwqc6dsn";
 "ctex.doc-2.4.16"="s7dcd31263b08w2yj86k24k68hbnv1lk";
 "ctex.source-2.4.16"="9cnkch1830v3n2fi6p5n8rjzi390yblc";
+"ms-2019"="1pl0q5d2rmp29raq2icpn03lfa7hynv9";
+"ms.doc-2019"="xwl23v3xbp7kahsh1d5lgjazbbbn91hm";
+"ms.source-2019"="9bmd1famkcmas9g2bb9mi0z6yjrlrqh7";
+"zhnumber-2.7"="p4mgbi2yl3p41xz7hxx2hdp1h4bvqym3";
+"zhnumber.doc-2.7"="7d4ff3ir4qp94ym2636463a369h29b0p";
+"zhnumber.source-2.7"="x2w9f8g02id3g450vhpqwp5nlphnsypj";
 "ctex-faq.doc-2019"="vjxcdrg7i6p9fgrgzfvykibjghpigrz3";
 "fandol-0.3"="lxnjp8m4fcj3pv2hnhib6gjdh90q1ncz";
 "fandol.doc-0.3"="fm0ac37apm0dh1073lp1frja9xbsrv4l";
@@ -1833,9 +1974,6 @@
 "zhmetrics.source-r206"="ls3gazkf44sdal0f0k8n46ml2fgigfsm";
 "zhmetrics-uptex-1.0"="d3r2n6ndjd8zsmlq4hgm1x3gvyvrfnc1";
 "zhmetrics-uptex.doc-1.0"="qqzvr4mf5fg5r8bg6j87yk94nznhrscl";
-"zhnumber-2.7"="p4mgbi2yl3p41xz7hxx2hdp1h4bvqym3";
-"zhnumber.doc-2.7"="7d4ff3ir4qp94ym2636463a369h29b0p";
-"zhnumber.source-2.7"="x2w9f8g02id3g450vhpqwp5nlphnsypj";
 "zhspacing-2019"="p7w7cisgid16ndk1mipdmpn5v7nc1kzf";
 "zhspacing.doc-2019"="kjnyalnxmb2f0kj8w52nvm97a9m1dfsa";
 "babel-belarusian-1.5"="dky0w9qw4j6mbsmx6kbcgqn8p9grbbmj";
@@ -1847,19 +1985,17 @@
 "babel-russian-1.3j"="chw7lj98rp10jkin4l03d1gx12a8ki5h";
 "babel-russian.doc-1.3j"="i56cj5h3h40ml8an2sbbj8dzyazacwd9";
 "babel-russian.source-1.3j"="cnwygpq3mb5y2araady6kr86wl2bbgdn";
-"babel-serbian-2.0"="nw8spfg8l705baa9x1n61jv87988x81n";
-"babel-serbian.doc-2.0"="ggnbzl98wjm1zak4v1cj6i22c6hmm5iy";
-"babel-serbian.source-2.0"="mlwg9g1nsm1cg0n1x7bpagbssb6hny5s";
-"babel-serbianc-3.0"="xmd8wqwb2fnq360si9ahpr4acrhj6rvv";
-"babel-serbianc.doc-3.0"="8kn5ngjaq927k1xb6lhmpm62p0h7w5r8";
-"babel-serbianc.source-3.0"="n1lsr7mvbi0pn612hg8kr6bbr3bgny8d";
+"babel-serbian-2.0a"="qz0klmzp380x2sn97v6ca1hjpir9fxmk";
+"babel-serbian.doc-2.0a"="5s29smlmhqrx68ra2k6mqvw5lffclbb7";
+"babel-serbian.source-2.0a"="6gp84lpbncbd2775nfac1zg86034a7i9";
+"babel-serbianc-3.0a"="rxrc15zajz0g5gzczw5k7kid3g3fisxm";
+"babel-serbianc.doc-3.0a"="bid4np071hjbaplxq8pvxggwifky0y8d";
+"babel-serbianc.source-3.0a"="wa836abk9b2z4r5zxfzyj6z3d6wzfvjm";
 "babel-ukrainian-1.4c"="zkrzqv0a32c8dm30bin1axbkd1i7fxlm";
 "babel-ukrainian.doc-1.4c"="vj7acrkzm3cdby2aczcancag1y6swvl0";
 "babel-ukrainian.source-1.4c"="yh5qaricqrn5lmvrz9vdycbr5y2lpmr2";
 "churchslavonic-0.2.1"="5pgxy858w0nr769mn4g6832fc0687vfp";
 "churchslavonic.doc-0.2.1"="pz4wqhar8vfzyy8aw4szas78hqs018lw";
-"etoolbox-2.5h"="vkv8mqbzjsyh51cqk0d40gl48cj1zcmf";
-"etoolbox.doc-2.5h"="9rj773kv9ia8v5brs2aw8f4xrgg6r053";
 "hyphen-churchslavonic-2019"="ya6jp4d0krjnwh0qf9lspcnsqrrrwy9f";
 "xcolor-2.12"="d4hv07lqr1p36mkph8s45w93ykk2i0jg";
 "xcolor.doc-2.12"="50k9wrkrb7gaf8dhpq4gbsbyfpbm6dz6";
@@ -1922,12 +2058,15 @@
 "serbian-date-lat.doc-2019"="pa9rvzpbczmfm4w0977xx05c5sbl6mxg";
 "serbian-def-cyr-2019"="k46ahhqbdg23mx4ld0953dnsws1imhwm";
 "serbian-def-cyr.doc-2019"="zl8x855zmhry6n754l5x9fz8hjn27bls";
-"serbian-lig-2019"="63mjkszwsr22mki4cd6qcskdkk1bg3fq";
-"serbian-lig.doc-2019"="q07af05smgmj1k3a4mba75brqrxxhx3i";
+"serbian-lig-2019"="ma7sgiv7vs6hn079dja88y9mxlqvqz3l";
+"serbian-lig.doc-2019"="5g0vzcvnixv1l624fkwny623ylcd1lx5";
 "t2-2019"="ihwn58py69fx1fx2bjqwyg8caiwwlpy6";
 "t2.doc-2019"="gsqrf898i59wsxcm8b06qfrasfw335r4";
 "texlive-ru.doc-2019"="rqajnqrdlq0n42kkkgp49c8si4bsfgd4";
-"texlive-sr.doc-2019"="r7mj30njj30ymq22hhwmdvz145qbkz25";
+"texlive-sr.doc-2019"="2igvdhhhfksk0360cl4vmx1z27xbn8fh";
+"xecyrmongolian-1.0"="4rvsdnk1gbf9vrchlibyj93dzpdv1idn";
+"xecyrmongolian.doc-1.0"="c7pwfb8v7gv115m3igbsr233ms6cyvp3";
+"xecyrmongolian.source-1.0"="f3wj75g0zwivr3xld918hmpcyl6vs6j8";
 "babel-czech-3.1a"="gdcs2xpcgblb3v0m6jf3ppx643s3cj6r";
 "babel-czech.doc-3.1a"="g2km6r7d90d3f60mfhw4a7m9s0090sg5";
 "babel-czech.source-3.1a"="5s1n9fykrbzppgb36pvybjn9jmj7cxxf";
@@ -1942,17 +2081,17 @@
 "cslatex-2019"="4gf3lz23hvrqgqbvpnq2wc3bwrb2jdkh";
 "cslatex.doc-2019"="7wlgcn2v488xfjnz27rmxb85zlhnb9by";
 "cslatex.source-2019"="fmrx0y2xnxcdczhbqyrh7w70wh7mrccq";
-"csplain-2019"="71mbj1sp6i5n6lhibjlkj7aqb5qzdc5h";
+"csplain-2019"="jmvm7398s7cspfy1xhv4p4dwy9igb5g9";
 "luatex85-1.4"="ka3px4aiyi8gq487i085s31y9l95jzp1";
 "luatex85.doc-1.4"="ac2agmy9dkavln2vnd63fmavv7xnkdrw";
 "luatex85.source-1.4"="wpm4dw7j6fikz3dqa4zk3r5avg4isxr8";
-"cstex.doc-2019"="ncjagy0ifn8mw4v4nr30dgzif1jrsrqk";
+"cstex.doc-2019"="j79hy3j4ycqdplybfzyvn96g94gds3mw";
 "hyphen-czech-2019"="qkh3d1nadwn280p26vx73lw1mm04hyag";
 "hyphen-slovak-2019"="hd7bxmv96ilfpaccvm8fn9rhllriv1h0";
 "lshort-czech.doc-4.27"="2z8dygvm9ilvahsx005zb7z5ss8hxbsf";
 "lshort-slovak.doc-2019"="qnj433q5hfg9cpy0z281zq17z7dr5vh9";
 "texlive-cz.doc-2019"="4pfpprl68pd6cdfb3lzmxjn8d74lpgz2";
-"vlna.doc-2019"="bx04hcv9681ry7h6bx01z23ciwyl02qj";
+"vlna.doc-2019"="f3wz8jy4vbrb3bhk9ly7fdkipwfqixbc";
 "MemoirChapStyles.doc-1.7e"="r54d4g3nh30k5x99nfphvzg7k1jxrijn";
 "Type1fonts.doc-2.14"="jgjs1127jqdrrgnkv3r8p1wirc8lb2gl";
 "amscls-doc.doc-2019"="4hsr68pmd3v06fnxiynmp4xpgik6v8g2";
@@ -1971,7 +2110,7 @@
 "guide-to-latex.doc-2019"="8lw0kcinfq2yd6vkbd531zakby60k2wf";
 "happy4th.doc-20120102"="svmy37c032cvip73n4b98c8kh4hvnh9g";
 "hyphen-english-2019"="9hjwbxk2jphca1g8b561gpfhqm9g95s4";
-"impatient.doc-2019"="172g4hvk6d4z4013h44nr5may3a51gb4";
+"impatient.doc-2019"="k5gz1ihjchagbwmr4g3l0rbdm470nn42";
 "intro-scientific.doc-5th_edition"="qx170vpq4ahipljnmhkvbrxv1xdbbii6";
 "knuth.doc-2019"="2w5hzwaxcl1i2pp3ms0kshmza0p5nqi6";
 "knuth.source-2019"="6dr6qqw0ih676vxc0rj6qgjc0zpac89p";
@@ -2019,7 +2158,7 @@
 "undergradmath.doc-2019"="kp1xxp209mbvyhpmh62yp53c6q8ppnwk";
 "visualfaq.doc-2019"="mdskjr2m6y0ljhczhqmfm50xsv8x4k1m";
 "webguide.doc-2019"="xbp0q21rqfq5gmckdfkc671kbr6gj1n8";
-"xetexref.doc-2019"="w87pmm9ra94xil6mm6n2fciavvpl3dpq";
+"xetexref.doc-2019"="4ljbfwhzmwq71nfgqfkijqa27hsd3y2i";
 "armtex-3.0-beta3"="vg6qlgg6nzci26mnphkbcpc8vak9jwbq";
 "armtex.doc-3.0-beta3"="fam9bkmfjn2v54v3f2xjxjarbrf3adhz";
 "babel-albanian-1.0c"="1dasgklnjx05y74bk0pcwn1ivghswmvs";
@@ -2103,7 +2242,6 @@
 "babel-welsh.doc-1.1a"="5p0mqvs4npnz3g6a08hqkf03n2w4pdc1";
 "babel-welsh.source-1.1a"="9fx2i5lxyf8qc0brlrgas2ajzf013m6j";
 "finbib-2019"="aja1ihjvva3aa86xi1f8d563xvlcj5mb";
-"gloss-occitan-0.1"="sha467dmibkfwwdnwrq5da744vfz3p5g";
 "gloss-occitan.doc-0.1"="8wfn7as272hvm7nxz0i5m48bf94b5m0z";
 "gloss-occitan.source-0.1"="qv9zd6r6rmjbfsndm7qgsz7x6xkr14ms";
 "hrlatex-0.23"="7dr0g80mp71nmvrnwahpshawi44s2s9x";
@@ -2159,9 +2297,9 @@
 "babel-basque-1.0f"="dasllbbd2k1yhqdwm41i38870lzp9caa";
 "babel-basque.doc-1.0f"="av6dd29g89fsq2hgva9fj4h2myj95jxk";
 "babel-basque.source-1.0f"="mvvhhqj4jd107zicv0gv8yhgjkjhxl33";
-"babel-french-3.5f"="0ppxkaqkqmm37n1m7q34fnjjhdb2s3sr";
-"babel-french.doc-3.5f"="gn6cbcp59q2f4xjls8sc4b81d9l85can";
-"babel-french.source-3.5f"="dv9ryaq0sppxgmd33pyp47g07hb08m7r";
+"babel-french-3.5g"="mph80ppj24amr2jb3ki5lb0q0ny3j83g";
+"babel-french.doc-3.5g"="7slh9h3z1rbhixxgc5d3kvm9s30f9jqf";
+"babel-french.source-3.5g"="i2cadr2nn2i72r1a8cbvvx5fbhq2xqbq";
 "basque-book-1.20"="6gmya3w1jnv20p9zyn3b8b095csb45cj";
 "basque-book.doc-1.20"="njw9j7s7mlx35ckjg0z404fizyxpn74n";
 "basque-book.source-1.20"="wydda9ij2ibwnhd8b0pg48bf2f1g969f";
@@ -2170,9 +2308,9 @@
 "basque-date.source-1.05"="j1ad62kaxq7yf7bm1l4vgzzwjswhrxj2";
 "bib-fr-1.5"="d2v9lhayizx8carld94ica03ig34mjsi";
 "bib-fr.doc-1.5"="21c1p7mka1a4y2qc5b8wqj25h4il9pjs";
-"bibleref-french-2.3.2"="id805cd5csnkr92r0xry4nc08xg6a0mr";
-"bibleref-french.doc-2.3.2"="97ib4izl1pf181kh4wns6s1bpff9bmvn";
-"bibleref-french.source-2.3.2"="6siqpf7gsybc0pzra1kwkrbnnkb7ka41";
+"bibleref-french-2.3.3"="2svzj11s46m1hiwfdd2flgyf5yhavc1i";
+"bibleref-french.doc-2.3.3"="2rq73q3xdd9fxpj6nancvh4whbj7c3r6";
+"bibleref-french.source-2.3.3"="93vrfm7va8s917dln2x27j7qqvhf8y7k";
 "booktabs-fr.doc-1.00"="8nmky9zjr4s9s8kikir9l4w6y69yk1vr";
 "droit-fr-1.2"="kqd2m29if8y21y5l72z5k0f6dafm95sj";
 "droit-fr.doc-1.2"="ss2xw9f26frzv9m2xvwbmvgagdhabc69";
@@ -2235,7 +2373,6 @@
 "etoolbox-de.doc-1"="z53x50c71bvipgvgklp42n1yb50fq8gx";
 "fifinddo-info.doc-1.1b"="d7l7nsb4aj2b7nin8whkif0m5pcv11py";
 "fifinddo-info.source-1.1b"="dpl4j9iigb7q8dqi5srykpkr1syvcnpm";
-"geometry-de.doc-1.1"="ncrm0zcrf2mmv3nynzydvd0vb4zbdv84";
 "german-2.5e"="mwin3zb743v74c97aizyiy86zj1pmdi2";
 "german.doc-2.5e"="invdh78rq8chiirzdlvijssdah8hsyk2";
 "german.source-2.5e"="zs1qxbd8r3bfyq77vaak9srxjxxn213v";
@@ -2263,6 +2400,8 @@
 "presentations.doc-2019"="rczfpy5ayw0h07xlqhw4k2isp080g2ar";
 "r_und_s-1.3i"="8vn7cjc42dvny30pkgp768yy87z9d2b8";
 "r_und_s.doc-1.3i"="pk63m1jl1yzz2xqiwynpph3nrlri1hkl";
+"schulmathematik-1.0"="pcp55pv0qb3x102ln1j2b4skpf57imrg";
+"schulmathematik.doc-1.0"="5kcizhqbdl9s696rzcdmdfbbg3yvxvpz";
 "templates-fenn.doc-2019"="yy9rn7m9r0paxvya3icnbqwccpjkkbij";
 "templates-sommer.doc-2019"="6n6saza6xd8mjys1ckfy0362sdya4616";
 "termcal-de-2.0"="pql7q4dqaqgg0arqgg7l8iz4hwxrxd7x";
@@ -2287,9 +2426,9 @@
 "umlaute.doc-2.1"="hkjv5ym6954i5l2qxv3jm3p1prbn55h9";
 "umlaute.source-2.1"="p6217bas6hm8kksip8jkb2bhdpa9p91w";
 "voss-mathcol.doc-0.1"="f15dshkczyv9r9a6vzps3ls1cz95sk8v";
-"babel-greek-1.9h"="jpp35w9yqg8hza1hc4m5mrf2l9vm9v3c";
-"babel-greek.doc-1.9h"="xphz8d4rvcmxx9iwj0mz70xgyh7kpgm4";
-"babel-greek.source-1.9h"="w3ykv1fis8rxkyq501lmrisb7bmr5qlq";
+"babel-greek-1.9i"="mj3i3mi693lhnbn85nd05mvxj8ad8y8q";
+"babel-greek.doc-1.9i"="lj68xjlmlyz970j3siiqjj3d20vwlqw0";
+"babel-greek.source-1.9i"="vnk8wla7j3q5b94n1cqdgn07l8m6jzb3";
 "begingreek-1.5"="7v94fdb2kxzwgvcsjfd5gnqpjhsrgp9i";
 "begingreek.doc-1.5"="rgiglmyfkxghz1w9g67lyx28rvk2bwgc";
 "begingreek.source-1.5"="jscz6nq9n7aq1l3j86xyvki200ja40p5";
@@ -2301,8 +2440,9 @@
 "gfsbaskerville.doc-1.0"="7sx91lqgpn4w4xgbdbpsk41i5mxixqf2";
 "gfsporson-1.01"="k6gimiba8zfbnf4wc4zjrmwwc7ggnxkg";
 "gfsporson.doc-1.01"="6i47g0k5ys9q394g6q0a3686q4h75gz3";
-"greek-fontenc-0.13.4"="9hvk62x7gyl6r4m0ndzj3as3hxjf193a";
-"greek-fontenc.doc-0.13.4"="mc5jx7gysvhk5kygzga6vcmmm0kl7hjr";
+"greek-fontenc-0.14"="xp10w6afjjg4yk14yygm42f9f88q25pr";
+"greek-fontenc.doc-0.14"="8642xbsipyvv2i7gkmy6va7zwanbw4kr";
+"greek-fontenc.source-0.14"="8vlvm5a6b1s1p7qwf9x6zwf6ya3lpvdn";
 "greek-inputenc-1.7"="4fwqx35kx5yqpbg8hy83pgpm45gm1q6d";
 "greek-inputenc.doc-1.7"="1fwpw7k0xwbfgp38dxr9vw4hds93jbhm";
 "greekdates-1.0"="zm8cfpsxp12s6n38n7lgzha482124m7v";
@@ -2320,8 +2460,8 @@
 "ibycus-babel.source-3.0"="samw380w28p4621z2f9fav06i9dzj3b0";
 "ibygrk-4.5"="3xwia8yqznfai0wjz7rc63dizdfc3n94";
 "ibygrk.doc-4.5"="ydy3swiwjr9r1j40fhkwhd2d7z614ipa";
-"kerkis-2019"="ydv39ycvib03pkw5pvvnv6mjyvrij0rc";
-"kerkis.doc-2019"="admp7blm0nd44qcnqqxd0bpwxskz7dqm";
+"kerkis-1.1"="h3xb4hv0wvvx2v94v6v01mzmgmd0prak";
+"kerkis.doc-1.1"="ydgx0hcbc49n9zpba234mf9wnfb28iac";
 "levy-2019"="isfhykz3fkajjygnpl7psd2n9n9lzfwy";
 "levy.doc-2019"="y92455xr0yq62ppxd650vvxaknkb5qym";
 "lgreek-2019"="64pdy6vj1q7sg23xg31pw0mfznahcvzw";
@@ -2339,9 +2479,9 @@
 "amsldoc-it.doc-2019"="3xqg4bjhsk0r27g7absrq84nwy6zy265";
 "amsmath-it.doc-2019"="mrz7iav2jpify9h3vz703x863km3vb9r";
 "amsthdoc-it.doc-2019"="bpi907wji0gimbc22s86vg3fwv6fkpsq";
-"babel-italian-1.4.01"="06yw3wwnbx72006dxyr7lcym51qxnsdv";
-"babel-italian.doc-1.4.01"="45s0vhvdr1ji95jf9ryvyxpgixcb9q3m";
-"babel-italian.source-1.4.01"="milncc712c5mh0lmpvvap7bzc4rbniln";
+"babel-italian-1.4.03"="a9w6f2zp1ql8987c0pak294xnn6ihlfb";
+"babel-italian.doc-1.4.03"="vgbc4bbxy99nsa6c27hq12hdysx6qw8h";
+"babel-italian.source-1.4.03"="5zh6p0aylh4qgz168h9yzk951f7mdx46";
 "codicefiscaleitaliano-1.2"="gqzlc6agkwysk75lzdxbkz4azawzyrjh";
 "codicefiscaleitaliano.doc-1.2"="c7spaihgf2fdimihsg5cf7xn5bczkw97";
 "codicefiscaleitaliano.source-1.2"="vxi0halq6yx9gwd0vkcmjx6am7dnjjg1";
@@ -2364,9 +2504,12 @@
 "lshort-italian.doc-2019"="n79a6mw3xc3ar3adan0l1xpr4xg8wrid";
 "psfrag-italian.doc-2019"="xb8qlcz7f0za963yybhjvbyjq37z516f";
 "texlive-it.doc-2019"="nsbjkzxjwlrbbrciv2qdy6lrfn4ddk66";
-"ascmac-2.0h"="vg8n2gvl9s08xkmhj2jf617fc18b3mzw";
-"ascmac.doc-2.0h"="xi9mjz1aip4x366d3dj71x7bjsznbxk3";
-"ascmac.source-2.0h"="7v01dn2p724l7qh0xhqi7gflxrrcd561";
+"verifica-1.2"="dwgpgq7r4r6s6glysghbd8b2s3gazjmm";
+"verifica.doc-1.2"="73f23nps62hryhdl9q6gndblnc3vvbw9";
+"verifica.source-1.2"="glz0p5kfvk6h83icf4dbvg67pkg6k2xp";
+"ascmac-2.1"="5fiwx48hj22yr2f0x9q37jgwpvr7ixrm";
+"ascmac.doc-2.1"="nmfb4d9b21bsr7nqg5bgprxakj82ryy3";
+"ascmac.source-2.1"="9d6l1w7c7g8g88vfxxflrqhvmnf0miad";
 "babel-japanese-2.2"="s8sj89mjl5fxb2cr87qn9ix0fyy7if6m";
 "babel-japanese.doc-2.2"="rxwigd9cjla62cw4sgg3j4wvz9f0q8gr";
 "babel-japanese.source-2.2"="01qb909xr4k1kcjk8dz2dpiqwfx5awdx";
@@ -2374,17 +2517,19 @@
 "bxbase.doc-1.1"="icyayz4cr8p3zgbby8zaypclximpiyqf";
 "bxcjkjatype-0.3"="94n8gv2433510cq05vl97zrna0gyya1z";
 "bxcjkjatype.doc-0.3"="z6rarps2vgxp061w0q8amki68j51yqlx";
-"bxghost-0.2.0"="b0lc2wxk3fvsfrg2xg602bz6vi7igdrw";
-"bxghost.doc-0.2.0"="f8wg3ynqd7gpkiym9v6yr9q5fafxk81w";
+"bxghost-0.3.0"="fmg8agh5563jny9106kxzn6ac0y9ypcc";
+"bxghost.doc-0.3.0"="ybrg38lhjrc3jfadkn3h9vacy2zwhycb";
 "bxjaholiday-1.0.0"="w9mdw9zrcrrf988z2vd314bn0dqr4pd0";
 "bxjaholiday.doc-1.0.0"="yq903l1in5hwp20wj9i2kz4qmx3y0aqs";
 "bxjalipsum-0.3a"="d6svafibkkjc5p3hjzrc8ibb2fwmm05c";
 "bxjalipsum.doc-0.3a"="srwc07mapyqn9hq6hy26gxaj6khy9ffh";
 "bxjaprnind-0.3b"="8pfq18sbkvqzb2may5j4n8xadgjb8a9l";
 "bxjaprnind.doc-0.3b"="1vsxn97w48hn05il79byfms5w6749xpc";
-"bxjscls-1.9h"="mbijcs5l9pp7yrgxyp6bdm76311j4mg7";
-"bxjscls.doc-1.9h"="ad3ghzb8yk72vb12kkknkxwdwpsdydjg";
-"bxjscls.source-1.9h"="9wnggpzky4wb4xrq1nays7id0ipp4c65";
+"bxjatoucs-0.2"="hmb6rpwihwgfi7sq1zpf7yw12ibr17kw";
+"bxjatoucs.doc-0.2"="4nkg3si0bwryyyh0wpqnvkrmxmbnlin3";
+"bxjscls-1.9k"="vzkpvjj8xgrakz1ymlx9463lr4grryxp";
+"bxjscls.doc-1.9k"="0xkh21275na2fpapv6yy97f805y3zbxm";
+"bxjscls.source-1.9k"="6a7zjg0ysczcrq9893984rqbl0cp5b9l";
 "bxorigcapt-0.3"="lbrfjjqsjm4n5b7byyrhm1akbmxxap6d";
 "bxorigcapt.doc-0.3"="grspvjmbrcjq91wgi6l3a73y5l7nnl4m";
 "bxwareki-0.6"="rgw2day3m4vr0k6d2mbhrpy8anmzklc1";
@@ -2396,8 +2541,12 @@
 "gentombow-2019"="zw6yd6x0kz3kv5s46ka0f27vyib714jn";
 "gentombow.doc-2019"="qpxjmhszws8x3zk749dj0dakqv6qskhk";
 "gentombow.source-2019"="wccfbmzqqpls622zq1xlqybl7vkyjryg";
-"ifptex-1.2c"="g067kqkal711mapnw2lfqspj557ddr9j";
-"ifptex.doc-1.2c"="x22bmp95nh3g718b8b9ls535vv1nkzck";
+"haranoaji-20200215"="31jqnd042v9gxvfvqrkziz3y4gc2nnj1";
+"haranoaji.doc-20200215"="1sprh04p4sy5qm33bv4izf2zm4jkhibp";
+"haranoaji-extra-20200215"="w9bbr0p06n3s1cq8ac5rd20gvz5r2r7a";
+"haranoaji-extra.doc-20200215"="c5clkk0895208ksssx4cprq91kh9z0ax";
+"ifptex-2.0"="vd33lyik4nfippj7dax3k8rbkpacc3c3";
+"ifptex.doc-2.0"="ii033xhz4lx24hwzmkqgff5w13q38fny";
 "ifxptex-0.2"="db7waqqfn8nrn8b3z4dh7dy846f2zxad";
 "ifxptex.doc-0.2"="y1039vpyrh9k2dyi1xws45a1gj3b6dv1";
 "ipaex-2019"="pxy5kyyznzddkci3pzdb7fla8gsfsqm5";
@@ -2408,15 +2557,22 @@
 "japanese-otf-uptex-0.24"="nwq1y9kihylj9y2f0clmy5nrmhiwr9q1";
 "japanese-otf-uptex.doc-0.24"="kr9fwl8hz0dmrs0a1pzkd1g51a4p3qrn";
 "japanese-otf-uptex.source-0.24"="yz6zz6i07i2d1cf1wp80n44nnh77bqly";
-"jlreq-2019"="msjg3lk1b16bcniavl9qddrwv1g9vzm4";
-"jlreq.doc-2019"="5pyv4k244lvdsw92cxivajw8v9s14msi";
-"jsclasses-2019"="j7pgchywpy98am8wa34clkzv5qh9m6gq";
-"jsclasses.doc-2019"="k1mk1j86p2nm0c3943msf8vyd1hjnmwl";
-"jsclasses.source-2019"="8p0j6pfmfv2wxgyk8x2yfn1h9ir1kz0d";
+"jlreq-2019"="xc8g9s8mryypwm9ikz0y131h2fqmgnhf";
+"jlreq.doc-2019"="s50ldmnqi8rjrckwwm5c3arvkyxdy2i1";
+"jlreq.source-2019"="ha1jdqcvb80wgmvrigbi4bz2clapl2qm";
+"jsclasses-2019"="qvvp434pbrxy75sr38xbja21gk23rjc8";
+"jsclasses.doc-2019"="bxlfrfg24hsj5dybpzgplpcm8wyar72m";
+"jsclasses.source-2019"="r5s5kdcj8z7z3kkdj1qiiym1dmv73qzf";
 "lshort-japanese.doc-2019"="5b8svqq4w1ipn3737s73pk969s8yv63d";
-"luatexja-20190926.0"="191dbfq87cajs74dfy0fnrlw6pmi27l1";
-"luatexja.doc-20190926.0"="ygs2lvpk15iq5q780f480n69gxc0wym9";
-"luatexja.source-20190926.0"="p6r0392sp05x607pi2zyacqd18h52hv6";
+"luatexja-20200301.0"="n3b2sc32fp1y92wadshbskcsc9fxf5n8";
+"luatexja.doc-20200301.0"="mwhy39lvgd24i46pa9nffc5nm21lqw1g";
+"luatexja.source-20200301.0"="7ig9a56yvvyl03p32n5gfq4fkldic8m1";
+"luatexbase-1.3"="hjzprkfxz8i905ffdzfad0myg2ym4vg4";
+"luatexbase.doc-1.3"="3rnbzrql8m9ss0pk1yydy4v9acrk3qq0";
+"luatexbase.source-1.3"="v5x5csbgplvah43m8lbjky2nmfk2s3fp";
+"ctablestack-1.0"="cavlzn944q3fhha3i4kf8bgvm2y5zpdh";
+"ctablestack.doc-1.0"="g2d4fq9nl422i3i0skmlrydx6d3ks8cq";
+"ctablestack.source-1.0"="bqrksg21vxxki14v7sadnh35070f2vdy";
 "mendex-doc.doc-2019"="vp31541i0l4rfkijbng5zj0q4cmbdz19";
 "mendex-doc.source-2019"="2w1ibgiylpczrzp9xhl7lidn8y2yhnn6";
 "morisawa-2019"="41dcbs61zpdhqnc6qbzcfkq0nrfgfirl";
@@ -2424,10 +2580,13 @@
 "morisawa.source-2019"="jhdr4xfya5m21376a8cmnzz4xfr8qh9i";
 "pbibtex-base-2019"="nix33k8m51bymsgnmfz69mwpllkk9rhq";
 "pbibtex-base.doc-2019"="vgmw5w68b5y2rhwsjssm3bx4dn96ix7n";
-"platex-2019"="kgcfk8b8x506aik95228jp3gbv7zmgxy";
-"platex.doc-2019"="015z4v7vdhcv9s1jiszgff5px1wsfn7l";
-"platex.source-2019"="0hc8zw5cx0xzhmzy1ivlk75m48h0krhd";
-"ptex.doc-2019"="fr812pq9d33lksqmm6bdij5jr89arp9l";
+"platex-2019"="acazzn4mp15ki3sf28pqvhwnk6z6ind8";
+"platex.doc-2019"="s5dg3nmj99mh7xdjl79mp6zyzj0fnhgb";
+"platex.source-2019"="6bm05n38ja00h5hrsx7aml6xb68yi4af";
+"latex-base-dev-2020-10-01_pre-release_4"="sn2xhnjjdv9lp5f118ngwqfw76x03sw0";
+"latex-base-dev.doc-2020-10-01_pre-release_4"="76lrb1brgggjxr9fp8mmsfk92vkh2qfd";
+"latex-base-dev.source-2020-10-01_pre-release_4"="5p66bw1szjlyasb7l1bjib53f5s33fkr";
+"ptex.doc-2019"="zy4jrdz4ji2jf4457nx4j48r7g8g2bzl";
 "ptex-base-2019"="yd073fy3fw3cpkph1cpy3w1l148mdjrh";
 "ptex-base.doc-2019"="rjh99cygdmfychyv8gvqg5fd73fwmkda";
 "ptex-base.source-2019"="bli2wy35rgyx2vkfkqk1ajyk73gpnwqm";
@@ -2436,38 +2595,36 @@
 "platex-tools-2019"="lc1vqkviqpr8rhvgsnw2k3sm3hdyq7xb";
 "platex-tools.doc-2019"="6if0avj38q2lwia7sh5qs8rrsk77g27g";
 "platexcheat.doc-3.1"="khwx5x4r6aydzhd5rkv7h9lf58l27494";
-"plautopatch-0.9d"="s732qg4g3y1y3s6sd4s0dc5wwcs9a58w";
-"plautopatch.doc-0.9d"="65lrl1g1p4fv2g1fv6zxw99havdai8d9";
-"plautopatch.source-0.9d"="708dq291a6igjdkm39lcv1wrna1s9f1j";
-"ptex-fontmaps-20190506.0"="afvr6rnd39cdr0rs1pmvbzbc4478hgzf";
-"ptex-fontmaps.doc-20190506.0"="48yrfn623ch7il5i7w593i0g7hlmf9s4";
-"ptex-fontmaps.source-20190506.0"="9ihj3bwyp0ngy115ylcc2dbp7xp40xgq";
+"plautopatch-0.9e"="1qdfzh5x094y9kkn4wd035yqkqkd6smw";
+"plautopatch.doc-0.9e"="j1j509az6sm5fi61h136ml3d0aivb6mq";
+"ptex-fontmaps-20200217.0"="xi0xpizlahvb5ingkq4d4qazkh1lp1k6";
+"ptex-fontmaps.doc-20200217.0"="c2asq6r15z67wy364zsadjxlhznxykyz";
+"ptex-fontmaps.source-20200217.0"="9ihj3bwyp0ngy115ylcc2dbp7xp40xgq";
 "baekmuk-2.2"="5rhc42dabpd99i92hkdmkjzgr3jqhg16";
 "baekmuk.doc-2.2"="4syhh948m1jw14xlhq6dbpdw5p5p198h";
-"ptex-manual.doc-2019"="d12ipdv5isvbrkf7caps8lrj9i97r0aw";
-"ptex-manual.source-2019"="kap9xs1a3bdn0vh176sgc8nm949pvbsm";
-"ptex2pdf-20181212.0"="lpdchib5gv48nqwq0gax6qrslmqa5vmn";
-"ptex2pdf.doc-20181212.0"="f34l71b1l1fky9jyg3qr6nlk6620rqpd";
+"ptex-manual.doc-2019"="hqb15pmvw7m12wj9557mjgvi9idgkm69";
+"ptex2pdf-20200119.0"="nvz64jf5zmlmrnv1h985qlzhxxi2420v";
+"ptex2pdf.doc-20200119.0"="6vgrh59xk6xzjjxvyd58by4q4il9fq13";
 "pxbase-1.1b"="92jsnxmiqmpy56dhdjaark80zsbb5vxa";
 "pxbase.doc-1.1b"="n5ns9b3vpa52b78hhgbvg0114faw0dgi";
-"pxchfon-1.6"="lwcg0b8ibkgb1njxrrwl8awpkyjfjxzr";
-"pxchfon.doc-1.6"="i37blsgfm91wka45ian6p9ld9iq6lacw";
+"pxchfon-1.7b"="8yvw30119hdpafxm7d2rwbcj4z4dz1sa";
+"pxchfon.doc-1.7b"="h57si3wyz2pnlp7rsdwmc86y8smw5571";
 "pxcjkcat-1.1"="i368i8r85baiimnwh2rfqd0hfrklw8hs";
 "pxcjkcat.doc-1.1"="hcxxg9rg6d64hwysf6nlvfhv8h360168";
-"pxjahyper-0.3e"="fl6plbak539i8l2i5wbyssyr6hx5gyfw";
-"pxjahyper.doc-0.3e"="3jwqknfgjp9q33hddmrmgfjlihrlgrds";
+"pxjahyper-0.4a"="wc6kv0s8glnfn95k1bb5l2lihm6400xp";
+"pxjahyper.doc-0.4a"="1xzxscgsl9y9ajvd9kq8d37lpmqb02vv";
 "pxjodel-0.2a"="wrzn5vf0h8di7zyzw15fqmnjrn8y0569";
 "pxjodel.doc-0.2a"="hihxv3km086xxnwbxfpg6a455r1g1snm";
 "pxrubrica-1.3c"="p6ych4fz68bzhg7nmb0456jr32qhg20g";
 "pxrubrica.doc-1.3c"="mn4xnfbybrmq49w2r11q18k8q4q7mark";
 "pxrubrica.source-1.3c"="5w4m8vac151lxkp76llm5ycvi7818vps";
-"pxufont-0.5"="wh4763by62qf9q7h7ph1ccs0zz528h9r";
-"pxufont.doc-0.5"="d408szf08v8r97kc1k8s7w33i425qy07";
+"pxufont-0.6"="88rvij6qa4d901vnmhahn1dmik47xjr2";
+"pxufont.doc-0.6"="vvrjjns1nfgk36wlywiayk6v02a0h8q0";
 "texlive-ja.doc-2019"="c9x1ai4v27mnmwkxbc4963a00i1qsjfg";
-"uplatex-2019"="q69iw8hxgnihgqdag00xbxarlws2d1r4";
-"uplatex.doc-2019"="rjgbvzw0raq96sb92vkkls16n5ag6lri";
-"uplatex.source-2019"="r88kywjipg3vfib5z3g5ii7y8y328qz7";
-"uptex.doc-1.20"="rmq7yjynfv7mj33kpgrsv39xflfpz7qw";
+"uplatex-2019"="ikvhcfp3hyvygch7yx9hj2wn1bhvdjrp";
+"uplatex.doc-2019"="2xzxvkb9qv7wcy0mwm82nijdbfqdch6x";
+"uplatex.source-2019"="wjfimibwb9xhriya2161vxxgwngsy79b";
+"uptex.doc-1.20"="r3zb6b4yszgz9p9w6kwzf9kvb35pcc8g";
 "uptex-base-2019"="dhh84zlmy5qh9848mx5yylmps2x5dhfj";
 "uptex-base.doc-2019"="02jcxdjr8w76l067z88n0dybw5mqik1p";
 "uptex-base.source-2019"="dv52z5ilfxmcrb9420sbw6b8gl2av9x3";
@@ -2475,17 +2632,17 @@
 "uptex-fonts.doc-2019"="ji8zv1haadkqgrsvnvyp71xx01nhlvql";
 "zxjafbfont-0.2"="gqmmwcbw81z91mwqf731jk0mgdfiw8d5";
 "zxjafbfont.doc-0.2"="0901rpw6rd2wivh0fsqnna6gywc6j8hh";
-"zxjatype-0.6c"="8hllbrldhybkwhnzzvawmn9r6clr85nn";
-"zxjatype.doc-0.6c"="ycymhyq31rb8jph0pwmns5bm5lxm7c2w";
+"zxjatype-0.7"="8wfcvfci8mj8ikqpfa1s4km4c46i3hb5";
+"zxjatype.doc-0.7"="qp9vrpjyjxma8bi3yhkdbbxv0db2l0mr";
 "cjk-ko-1.8"="bzihr3wa6c0rp7jrj89483w2xlapj6jv";
 "cjk-ko.doc-1.8"="avb0cwq3p97yj94gsfwj29bwdixv2lyg";
 "kotex-oblivoir-2.1.8"="wq598w1jbvbczmznn97basmrybz42zxq";
 "kotex-oblivoir.doc-2.1.8"="inqj292cqra8rxpa11vwkpjx7wcpx3zr";
 "kotex-utf-2.1.2"="x3j8gcy8ylvgpiwyrwrgl8wjj9gdrp63";
 "kotex-utf.doc-2.1.2"="r61iwnwwvwh1999l4ylczvz0d6l9ff1f";
-"memoir-3.7h"="9fvizn4bjfz0j1n6xh2kza9jwv1lhb0p";
-"memoir.doc-3.7h"="6nvxwsa35a72fmxirnz1by47vnbd6kvr";
-"memoir.source-3.7h"="vmysmkv4ddmcw3yj16b3km4yhxxi8y2n";
+"memoir-3.7j"="bx30l6xwv8mzaaa1jv6fsh70zyriwsak";
+"memoir.doc-3.7j"="65m20g7z8qlsmx9nk1wa1420sq2jv2bn";
+"memoir.source-3.7j"="3iy8whms1mm43kd5yp358mfbjp3f7d5r";
 "kotex-plain-2.1.1a"="wa5ifv962vi96ikyv53b6x7wg1fi67c5";
 "kotex-plain.doc-2.1.1a"="drkcvf3nb3kkvp63mw3xdz80lvn92w0j";
 "kotex-utils-2.1.0"="gvq7vg419f2wqzl6xp9mcffclvh65hs6";
@@ -2493,6 +2650,8 @@
 "lshort-korean.doc-2019"="vgmq1j9h0789hhank5mjmag1yq2h2gsw";
 "nanumtype1-3.0"="b1wscjlknaslwhpaxxfi8w2drxg1m770";
 "nanumtype1.doc-3.0"="4jpi6pmfq42sbcfzl403niskxg6qnxfp";
+"pmhanguljamo-0.3.2"="b3iyzkvlc77xnzsi4w9bh9jsimwqvxk5";
+"pmhanguljamo.doc-0.3.2"="vv53qjsfpcv461yf0z1j5y88zp73mv14";
 "unfonts-core-2019"="grx8hl97r9gx2abhhwlwpa425yww7w0k";
 "unfonts-core.doc-2019"="icc501j6sh5ix6v72v7lpb0him7viih3";
 "unfonts-extra-2019"="ib9sxr60ylsw9vyvr3wxya8xhq6hv0ix";
@@ -2570,6 +2729,8 @@
 "latex-mr.doc-1.0"="vwb062hbn3371czg99plccbvxw1a7gjh";
 "latexbangla-0.2"="6ix7rfgj51z585jry3i1g68x4wvm4xxz";
 "latexbangla.doc-0.2"="iw79gb4sk4hys6xbc8j86lpzyji8h7r9";
+"latino-sine-flexione-1.2"="ya3fg8hbwiakjw05hymfw704l1nkc01f";
+"latino-sine-flexione.doc-1.2"="hnb3gr9lz8wfqgz3g1shzb9s85r4dn9h";
 "lshort-thai.doc-1.32"="iwmnm7z7b3r8km4i3afq8hz0f2vy9dl2";
 "lshort-vietnamese.doc-4.00"="2y25jrim204g4q916rf1hhkavl7fi6vx";
 "ntheorem-vn.doc-1.203"="ys9g749d9f2nbq55ckyrjrr4mg9yywni";
@@ -2589,7 +2750,7 @@
 "unicode-alphabets-2019"="j7c2skki2c2k13y2pky182pmw86lzxfy";
 "unicode-alphabets.doc-2019"="2y89zg9f1wzd43n8lfh16y8lilvx7w0w";
 "velthuis-2.17.1"="x0zig7csm0nnq7m2n1qqdys57jz38b9h";
-"velthuis.doc-2.17.1"="x703qnfan6yajcqxybmsr274zir3v0ch";
+"velthuis.doc-2.17.1"="mcclyvyb9d4hrak5naw2d76a8g9lhqak";
 "xetex-devanagari-0.5"="v4gi0agfvxz808s3mapzf2ylxhv5n8a7";
 "xetex-devanagari.doc-0.5"="b3kz558m6h9avjwalwpw1nnr68q47sjr";
 "vntex-3.2"="vzdcn6z7knkzsj8gxwj8zda00dq6w8is";
@@ -2641,7 +2802,7 @@
 "feupphdteses-4.0"="696my85w1ngcar81vacyj8nr7m4dn0wd";
 "feupphdteses.doc-4.0"="9nm4793nyfp5v2rjd5297sbyw2b29bqi";
 "hyphen-portuguese-2019"="b29y4gyjll5mvaf2mh5i51qrfkqsxiyi";
-"latex-via-exemplos.doc-0.5.5"="fabr1glc3bvd4cakj73yd2p4ng0bcjgq";
+"latex-via-exemplos.doc-0.5.6"="qv730qmznff38z28bcdpzmirvzngpg3p";
 "latexcheat-ptbr.doc-1.13"="qzgl6v54k07i6lc3ps84s9mj11j1qqqf";
 "lshort-portuguese.doc-5.01.0"="m3r2gbq4v09p9svs0mxsw3s3yc7has5y";
 "numberpt-1.0"="dmp1db9kaskcy2cxxp53sjxr9sl3c7pq";
@@ -2701,17 +2862,23 @@
 "abstract-1.2a"="qd0czw54z49h3mxnxlk6drblpbl47sln";
 "abstract.doc-1.2a"="qd4dggpq9076j7cma12mkhy238ni4w3z";
 "abstract.source-1.2a"="819fv5rryh634fmqic8fqagdfi9h04wj";
-"accessibility-2019"="pdngb4qicmfvh9ksw6mhvjc9hfl79462";
-"accessibility.doc-2019"="8cf3wr6abm4p0dr1s11vqhqi7bwvjziv";
-"accessibility.source-2019"="xal33psm9wgyivkfk8qaaa136xm4w1jx";
+"accessibility-2.0.3"="j58xnav2fh0rjiyr17y23l6fbqc2l9jp";
+"accessibility.doc-2.0.3"="3gl15pw6k1ssb3q3104xxqaly35qic0q";
+"accessibility.source-2.0.3"="kax6wagw3w7psf3x94h8p7yd01a95rmx";
+"accsupp-0.6"="i0h4pn8qqkckrhmlfhyvk1caz2l68sc6";
+"accsupp.doc-0.6"="2p2rh18j02n4jk2g08fryx42r9kvm2bp";
+"accsupp.source-0.6"="zkcpasgn0nv8i285fwrb1y954s2n1yxv";
 "achemso-3.12a"="3psjpzbhsk0ynd3xiq0pqf4spk7klxl8";
 "achemso.doc-3.12a"="iqshwkgnwnj0p62g1aggpr2ydyzfpkf0";
 "achemso.source-3.12a"="v0v78aapbda91dcb71k5q2ld26x5ybci";
-"acro-2.10c"="1v9qgz21hbabizc78lc3rc3322qfjv98";
-"acro.doc-2.10c"="2xl0nmrwc4slk8y0vwpi3lhanzwnb1pr";
-"acronym-1.41"="2spcw1vwwm6mwpl2dvv7wybxvndbsqn5";
-"acronym.doc-1.41"="izmrdd0rscib9xa10xm33vvh7bvgzdly";
-"acronym.source-1.41"="1l7ca4pd0nx499pv45sv1092bilsxfkg";
+"acro-2.11c"="5vaxlf3kd5221fbfm6zjl8iqkxaiiajg";
+"acro.doc-2.11c"="lc0m63ljlbw2bv0s361v20477mrmhgm8";
+"l3packages-2019"="vw1xghbhhfz1p59wf02w27fzj5wyp0f4";
+"l3packages.doc-2019"="3ghr4k7mdmxbbx3pnsxmyd6zmicj7gif";
+"l3packages.source-2019"="mh6211xd88np3cjb10q66lwvdnwm0dp0";
+"acronym-1.42"="38ldvv9il1973xdcc1rzk0ps7cgp6j21";
+"acronym.doc-1.42"="wskc0pdzcdh5h6vp23f0sdywq9i50y1x";
+"acronym.source-1.42"="1badmd32yvmr8g7m0i3fws1b2l6x6zrq";
 "acroterm-0.1"="04m91cky6cj3jv546mdf6461bdg6sfkk";
 "acroterm.doc-0.1"="jnxcd65y58xrqg0cfg7y0m8yslbj7xi8";
 "acroterm.source-0.1"="w99kkypzq7c73rx4rv4m917c68vnan00";
@@ -2747,6 +2914,9 @@
 "alnumsec-0.03"="wmcb661yih7nnlwpshx0ahp45hg2b2qj";
 "alnumsec.doc-0.03"="q89lqn201amhxmpqfznyv7vsp40a8az7";
 "alnumsec.source-0.03"="zin3hkq6fr67rz2df7qqfnki4kar8k1n";
+"alphalph-2.6"="8bavlk3mbi1c7k1nh3hy1j5icrq8chfj";
+"alphalph.doc-2.6"="3lqasr06fpc44cd88c3y7xq9v8fs8p61";
+"alphalph.source-2.6"="1f1c5lq8nhn6liff0iwh4wh9cqi498wb";
 "alterqcm-4.1"="m92dax7znhdwsqis19im7bvmniy7490s";
 "alterqcm.doc-4.1"="14bwfsq021x3h708jqgm9iqray0jzxaf";
 "altfont-1.1"="cickjccw7xjpa3q2hpm1cyzs2jvkx1wy";
@@ -2755,9 +2925,9 @@
 "amsaddr-1.1"="6sf35pmlda97q2dhi5h7cwan25gi9nij";
 "amsaddr.doc-1.1"="m5wxpa9vd09pja40i6lzzrlw62ml5zvm";
 "amsaddr.source-1.1"="b66925k432cw6rqwqapcg1h8gjgnvry7";
-"animate-2019"="jwwbvyfclhk58hklh3l55q19g67n5r8i";
-"animate.doc-2019"="pwj7v93v1dd3mmjz5zqbdjwwpmymm4gj";
-"animate.source-2019"="0fqzq26k1d0lndah94719bbsn4772ni0";
+"animate-2019"="zkpbk2n7sisma690gb6ysdij6c3b726s";
+"animate.doc-2019"="nq6wxg5l8yd3kf4n91b2qnzyrjqnlbnj";
+"animate.source-2019"="2f4dqy5fj9p81skb8b10xl767399k03y";
 "anonchap-1.1a"="qpazykls2jy7nqpqkaqvyi35c2ajz0qg";
 "anonchap.doc-1.1a"="3xy9r4p9f22fjdvznba1jjp09gbkvvlr";
 "answers-2.16"="isadn9v17ma5krfq4hm304nrdc8kx7dd";
@@ -2765,9 +2935,9 @@
 "answers.source-2.16"="7w1nvr73ndj7c545xps8h969q4z58gji";
 "anyfontsize-2019"="z7d08jdfvq55ls4va5f5iyixxyp6xjv6";
 "anyfontsize.doc-2019"="fxvax04n8dj9haksiqx0jddi47mb8q1n";
-"appendix-1.2b"="vv6787vrvnmwm8mg85aq1bii0lgprzc3";
-"appendix.doc-1.2b"="095s7b98s2n14xsf2ffv9v6fvsdvl6zz";
-"appendix.source-1.2b"="5ivln5wysazp8nllz5k3z5vh9ivzwwl0";
+"appendix-1.2c"="50wvmi5y3wgka55dnb2h9gmr70y48srs";
+"appendix.doc-1.2c"="b2xkv7kzx6vkhhr0figba931ma6q455b";
+"appendix.source-1.2c"="8xs50dfynih6q9zgydgp9p4vr67ad3p5";
 "appendixnumberbeamer-1.2"="zrx31sicdmcv1mvv2jsmqb49ykwgxdgd";
 "appendixnumberbeamer.doc-1.2"="ql9zi0i3r3jcc788qx6zrbgfgmrv4pj6";
 "apptools-1.0"="v2ag8kbf87fm4rf66z1a3z93pfs1j6gj";
@@ -2792,10 +2962,16 @@
 "asciilist-2.2b"="fvd111ywjyrwy897z4bmcby9ymnxcvcc";
 "asciilist.doc-2.2b"="i501s6jaq79nj93ckccihgkv4ca5pn7i";
 "asciilist.source-2.2b"="zqmygnlbfyz70y446mcdwpd9a3bszhl2";
+"askinclude-2.6"="6dvhdz8cczxzlimmlm96d88q2s03ang6";
+"askinclude.doc-2.6"="yqkskb8x60xpjm6n00igr54lk39hqmc3";
+"askinclude.source-2.6"="f3mwswcypj7vnj8cr42wcvry40qzyqmv";
 "assignment-2019"="f5a0sprx94bby245g2cfycrrazgp00k7";
 "assignment.doc-2019"="0d0cafwd56gqn5dacsq4fdgzz8jqks19";
 "assoccnt-0.8"="6bikcn3hf37rs2wp84f9h8nf81z86hr6";
 "assoccnt.doc-0.8"="xb17k2w0skjxh3cw3hag91m5cjxj1vz9";
+"atenddvi-1.4"="6ygnmbsi6bqj2z0vawx65snrkqlmbidg";
+"atenddvi.doc-1.4"="7hhrbjji7ibzcy65qp9xgxg2i87kar32";
+"atenddvi.source-1.4"="n8zj2xfx23h8n8bfs92kxkmdpl1drq0z";
 "attachfile-1.9"="vmyp7ywfqli6yzs89419885jac9x0yql";
 "attachfile.doc-1.9"="f076ljz64r8ck1l9cz5g7xypm92jb9qs";
 "attachfile.source-1.9"="j93ivs0jy4n52a18gw0icmh0ffsnm1j4";
@@ -2816,6 +2992,9 @@
 "avremu-0.1"="xk59ssazl5122hy7cw9h8l8ky47ac58m";
 "avremu.doc-0.1"="sp38mldllwslwxq2rvizcx1dcpfaava7";
 "avremu.source-0.1"="inwrrgrds8ympmhzgrk3m82x544x8nhi";
+"axessibility-3.0"="a43649gdk2b6sxv4vkrvk8lmw9vmcijy";
+"axessibility.doc-3.0"="wys2qwwj4aiwhxpgllayv7kw6pb32jnd";
+"axessibility.source-3.0"="g8jxfyvj67bx306vkyryhfml2v535959";
 "background-2.1"="akcsb7n8iyy4zlcgfp0ikwb5awzdnh9d";
 "background.doc-2.1"="inm76hq9brwc39n6bhp9782766mmgwpx";
 "background.source-2.1"="54l8p1yj06wlcwxrrmjqjhgmxai9l9s2";
@@ -2853,8 +3032,8 @@
 "beamertheme-detlevcm.doc-1.02"="5yh3kypxg8cjr8vqy04k1ad1agnlq047";
 "beamertheme-epyt-1.0"="1g3593pcp0b4k9lacp4c0afs7jzffa9b";
 "beamertheme-epyt.doc-1.0"="al12nh23v6l4lfa4616zzivldc5jfkjy";
-"beamertheme-focus-2.4"="nd44fakdvmm37ln2rf0b7v16g3b3835i";
-"beamertheme-focus.doc-2.4"="p7d93zq0psphws9blc0avgd893a0lrq7";
+"beamertheme-focus-2.5"="fdc828c1rqx6dv1qdsnswlrbg8hv1s5y";
+"beamertheme-focus.doc-2.5"="gbbsmdhrpw8bxdmwj088hs5dk0gkjrzi";
 "beamertheme-light-1.0"="9vz0g593s4ykwasfky58jqq6h7a95p12";
 "beamertheme-light.doc-1.0"="dvyzvi4hl69xvvgbhdbp5ax2l3z68nck";
 "beamertheme-metropolis-1.2"="g062nnxl4v5951xq2xa4smkdjq6v2xpk";
@@ -2872,6 +3051,9 @@
 "beamerthemejltree-1.1"="iqjiwv4v9vp84a3cjjmv5gxygyclw5c5";
 "beamerthemenirma-0.1"="jix18byykz4n2mqcipf60pskfjlj3ini";
 "beamerthemenirma.doc-0.1"="llvppchvbd0zz9cl3lpswghs8hjm78rq";
+"bearwear-0.1"="v7iz5bjra8gshp9bv350kxkjj462r9cj";
+"bearwear.doc-0.1"="hzh2n85cajkb3saa3hjvl3xhbml0xvwd";
+"bearwear.source-0.1"="kfg81v58wgfnahrlh6srs7fj6ycgr5ch";
 "beton-2019"="0psc07yssk92pgrf4c9zvyr4k3ibbz3j";
 "beton.doc-2019"="9jpvnkmri3w4m9ik5d4l7mnlfpwxacg5";
 "beton.source-2019"="znwrdd877gdwmsiaxc9v8pczdw21wrb8";
@@ -2946,8 +3128,8 @@
 "bullcntr-0.04"="w4fxp9fvpbg882yb855sl4b6w8fypiyy";
 "bullcntr.doc-0.04"="l1p8zz226qbnzmx4n78xhjsrc26z7jxw";
 "bullcntr.source-0.04"="6lw02qi8iyp3qph7yaycfm5p1q6l71r3";
-"bxcalc-1.0a"="2rp7llfsbmsq521zm6kg9y0adrg5vq0b";
-"bxcalc.doc-1.0a"="8ha2i73lx8zhzgwb94wk3y30y6s1c393";
+"bxcalc-1.0b"="87gn179ih5gfhbdig83kipyhaww8mhx0";
+"bxcalc.doc-1.0b"="9zpmdfhd3bp9iydcszn5pj79l5rpv342";
 "bxdpx-beamer-0.3"="q07kpnmln2v70w83z91vsk53c0i63x02";
 "bxdpx-beamer.doc-0.3"="8ynjsgbyifkvz27qp8j4nrfk3pryphdf";
 "bxdvidriver-0.2a"="f6ndmagn10ax4hpmlia649f7c14hjkgx";
@@ -2975,8 +3157,8 @@
 "cals-2.4.2"="0xq2pylhs1gl542s86wm23nynnfzk188";
 "cals.doc-2.4.2"="yq4wig26r1cadd3kxg5bfraig4axvyvd";
 "cals.source-2.4.2"="fshbdf6ljfy0c7kdcvz5kyinysplcj86";
-"calxxxx-yyyy-20.19a"="pd3hd9l4a6ys8bls1h7wfhqck3jf2mxx";
-"calxxxx-yyyy.doc-20.19a"="vj6d8ssipxx79dyi72xvv65izrfdqlf2";
+"calxxxx-yyyy-20.20a"="77wp5sxr7a9z2lhxa4cc3f20a3lc5fdz";
+"calxxxx-yyyy.doc-20.20a"="qpasnrbn64r5ha4sxkgrdfrljqjprjvf";
 "cancel-2.2"="gq061h1xf31ivc5zz1wqk7c457m33amn";
 "cancel.doc-2.2"="24zhq0iz9iqwm1lnyd6zgzc7dsg9b1gf";
 "canoniclayout-0.4"="hk30976j3lql00w0rj481p8j6z5v69yk";
@@ -2992,10 +3174,13 @@
 "captdef.doc-2019"="fykmdpzxx24x66iph3rrzj0sc755y4nh";
 "carbohydrates-0.1"="x4rj3x70sfcdgq8sd8yv2486khxip4wz";
 "carbohydrates.doc-0.1"="lp5y1sx5s74px1x03366lpn676vhl6c9";
-"cases-2.5"="jlc3flcfb7ckwr4320n9gxmv2y7l4d2f";
-"cases.doc-2.5"="rx6wbfbbkrx0gjx1dnpfx836wk9r9jdx";
+"cases-2019"="5w83n62yi8pdchdqy0zkp1kv6vqv6ck0";
+"cases.doc-2019"="b9lgwvqfdznf98956xm0d3xgb434v8b7";
 "casyl-2.0"="4px818jfrl4q6fs2p7sabq1pihzvnsw9";
 "casyl.doc-2.0"="dcw7gljkwgkgsv1l6g6680mawm0x8sby";
+"catchfile-1.8"="d5yb62s7q2pbznla8nifhaih623myzrs";
+"catchfile.doc-1.8"="fhnirlpgckkkdc3705hrw4j62dmlvsgr";
+"catchfile.source-1.8"="h5jpwqvz3schhwfa4ds0v8icpy4yhiin";
 "catchfilebetweentags-1.1"="4yhcz4rv10s3si8vrbn4ac1yikmvgamk";
 "catchfilebetweentags.doc-1.1"="w4zpyb3a2gwlws0as6ifmi0wcnladgi4";
 "catchfilebetweentags.source-1.1"="819f4z3q4hnbng7hbifk1kd4m88xgfnj";
@@ -3040,9 +3225,9 @@
 "changepage-1.0c"="s3dd0v3z0g8v74i6cnasyaa70wnqiimk";
 "changepage.doc-1.0c"="g63jqnyrkc74dd9ksi0s7pbxq7s4dzwb";
 "changepage.source-1.0c"="0ck3lyl2kzvm1182hmw88ni48paff7aq";
-"changes-3.1.3"="qcqmdxmn4djw537y28wxgnir6r750maq";
-"changes.doc-3.1.3"="cs00bm7sb9bqvwpzvg2qz9w03b5b41hf";
-"changes.source-3.1.3"="qkr4g9ajlzy5fhjgh4b7y6mwy5q44iwi";
+"changes-3.2.1"="9cah9p1jvfmqmjgm5m72i3ahy4kaacpq";
+"changes.doc-3.2.1"="z7rc4i3ivf72bqd42jlg7r7aqrh7502z";
+"changes.source-3.2.1"="6pizd4vc5c9kb6639q9cq24yks4d5x4j";
 "chappg-2.1b"="231kpsvxwdnmakq4mkca0nisqdl622n2";
 "chappg.doc-2.1b"="nhh2f6k2z5gh449b91fmxnvh359n9adw";
 "chappg.source-2.1b"="74f8nr6m6ssdqxynrxl2y4za3rmj9sd2";
@@ -3074,8 +3259,10 @@
 "circ-1.1"="i0wnc7sxhx96v3jnnsv5l6i5nzvp94jv";
 "circ.doc-1.1"="v5g8hhvdn9xhqp9r1k9xahrnc0yd2a3l";
 "circ.source-1.1"="j3hksz3r2pa1y4m7kw2qwzm11j7a4za3";
-"classics-0.1"="kpskmb202fj06y3glw5f7m625q6zp4c2";
-"classics.doc-0.1"="ysdwq12pmmxanivxl1j5nxbfh1aw0vz2";
+"circledsteps-1.3"="4li81ffd5m91k5sk741x4alkwbj1i45c";
+"circledsteps.doc-1.3"="b4q2r072dkzgfd75mj7av60a5v6fah1v";
+"classics-0.1a"="as59hrjhv6vnw9dr4pghhx8w7kmab8kf";
+"classics.doc-0.1a"="2gbi1lmx3chdd848ib2wbsx8bcmzg44a";
 "classpack-0.77"="dybfkvi6ykzw4s03xgz8r7n88xir9zzb";
 "classpack.doc-0.77"="390v2v6vabq679gr2yqvmyq26x6l6lz0";
 "classpack.source-0.77"="mr188ykwygc0gsznl43vlbx33wa2imyd";
@@ -3095,9 +3282,9 @@
 "clrdblpg-1.0"="rw9bphdh47x4kpwzil4pxvlpks1s4hz0";
 "clrdblpg.doc-1.0"="0brjv2dy10l0gy3sx6vjw3f5xq9h67bw";
 "clrdblpg.source-1.0"="7pcjrddv97fdsljj752n5gh9mygyl1ph";
-"clrstrip-2019"="162pb7zzvbjq7pyfs383bjzhzbq4x6c5";
-"clrstrip.doc-2019"="piilqaxr9l6ffjv89lry3wqjv60v9gr0";
-"clrstrip.source-2019"="8h0sa1m29abmxxsdjzsr6iph09wc0174";
+"clrstrip-2019"="pi8803gja6wyaq33syigff4s9zgrszph";
+"clrstrip.doc-2019"="y5j0z26acrhmfbrl2xln47zfynqvrfck";
+"clrstrip.source-2019"="whsy1grs9pgfbz2glsl4hb7vda69cnib";
 "cmdstring-1.1"="mzw3hf7xhy01j9irvvlba90hb0065p1r";
 "cmdstring.doc-1.1"="l2hjd47d6wmd07rnciadrbir01887nd0";
 "cmdtrack-2019"="1jw2c4hx9xmalis8lkz7lr4b38h6srlq";
@@ -3105,8 +3292,8 @@
 "cmdtrack.source-2019"="hlqnd8ar2w2wyjr7rxi6qbi3mw2ppgsn";
 "cmsd-2019"="4b40ccv8788hg71xh6sv12gnzyy2q4rb";
 "cmsd.doc-2019"="j3bvhldqzjqf1snv9pbg7k39sbwl2ccj";
-"cnltx-0.13"="i7agvf6p3zbmpp0yy54jcz30yk5wgndb";
-"cnltx.doc-0.13"="bfzwcspv6kaizp2cngdbgps61w40a61l";
+"cnltx-0.15"="adx1n60b5dg15r60pr87nj8i979l23sy";
+"cnltx.doc-0.15"="603b8mxzm4cwj03wxgx5j1byhydv96qp";
 "cntformats-0.7"="v6xl1mkldlf6265h96m2q0bylifxhl33";
 "cntformats.doc-0.7"="rdam48ljhih6v72gaa3394zlg8cwsb50";
 "cntperchap-0.3"="xgdrhbyll67dbw0xabqmrl2livxcfsbx";
@@ -3127,23 +3314,23 @@
 "collectbox.source-0.4b"="szy9gprjqnkx357dca60120lvaiyyy8f";
 "anysize-2019"="0phqi21d8qz3ifadzfzyfb04v10xc46n";
 "anysize.doc-2019"="4as0n5cw5g21j1wy094gdrbw8pzdm460";
+"attachfile2-2.11"="dc3b9mx6z10cv95vwi6a61cvlk5ca101";
+"attachfile2.doc-2.11"="wcw202snsfgf6g607h8xga4lsq41gg1y";
+"attachfile2.source-2.11"="0cp1pzdkn692vyav1p969v2snpc3dsw0";
 "beamer-3.57"="p5nvgliaj010mp3ll25al5i59jsl465i";
 "beamer.doc-3.57"="810mwi012vlailxyqh88fqq5znnvlccx";
-"pgf-3.1.4b"="0vkablyicyimw0jbrgm29lhw9gfmd6ni";
-"pgf.doc-3.1.4b"="68jw3j17r06gclfyzlsdajgqbbikzrx1";
-"pgf.source-3.1.4b"="axqhmadpaw4srzqcj65lg69dxjr0m45y";
-"ms-2019"="1pl0q5d2rmp29raq2icpn03lfa7hynv9";
-"ms.doc-2019"="xwl23v3xbp7kahsh1d5lgjazbbbn91hm";
-"ms.source-2019"="9bmd1famkcmas9g2bb9mi0z6yjrlrqh7";
-"booktabs-1.6180339"="9fj9ar022akcyx1ymdf6i82j9na7xvvm";
-"booktabs.doc-1.6180339"="pv9qaxxlllqspd1a0i57d5m1lmfaz9nz";
-"booktabs.source-1.6180339"="wvlspksj5nlw9z1y8rmyaiky10wbnjk7";
-"breqn-0.98f"="9xpl65xypy6hgwc5dw3vvy7qqm638bvy";
-"breqn.doc-0.98f"="vppflv79a07m77bfzg1c5qv4521qsv44";
-"breqn.source-0.98f"="h5iqm33kqjrq9yf22grm4lds2hvcyz4j";
-"caption-2019"="8wlk0iizpz7x507gy3jn0s08anylfna7";
-"caption.doc-2019"="0n2msprhml7mdg7gdjrbq152lgaf7rrw";
-"caption.source-2019"="3ac4030rz58az0l1049pq5qfwll47hqv";
+"pgf-3.1.5b"="2050mqhy0yr879p6g0jhq4a3fi9yawr1";
+"pgf.doc-3.1.5b"="32l3zdg4k2i8l8wbwxqhgm7csd4ml7yq";
+"pgf.source-3.1.5b"="axqhmadpaw4srzqcj65lg69dxjr0m45y";
+"booktabs-1.61803398"="4hkipcli3lx2rfz6nyk95vzhrli76nfx";
+"booktabs.doc-1.61803398"="41kkvglc6cpp7rkyrc4957rw9viwwlc9";
+"booktabs.source-1.61803398"="fn9dc22vsdrrw19a8p47h0ysla6j6w22";
+"breqn-0.98i"="pzakmaixv1adgk3jhqgbw7d1jkcqmxpm";
+"breqn.doc-0.98i"="4qjc9b2kn0n74dsykirgb886w3hgyq96";
+"breqn.source-0.98i"="b0wb1y40jbhfx3ha7pifik5fpz6lxk3c";
+"caption-2019"="ank9flrryargxl9pj0959qnzklm9fniq";
+"caption.doc-2019"="02s6kp8h9hi5chbx03iim3p1bsq9hng8";
+"caption.source-2019"="xnshivm17p1gk3bb0r8mhib95j6mcywm";
 "cite-5.5"="7vzh6m2dnlxwkiw62ifbyn9hx82jpgyj";
 "cite.doc-5.5"="d20p75a21nvifkj1f61fd9ah5580n2bx";
 "cmap-1.0h"="bky8rw1a9f00x6fzx611hgfcyf7d115f";
@@ -3170,44 +3357,36 @@
 "fancyref-0.9c"="0417hndq96cnldfbpc3hc1f7pyfqlscw";
 "fancyref.doc-0.9c"="wr3q5g6hjznnfcr9l5lvl8z07ixm1m8i";
 "fancyref.source-0.9c"="54cyla9pjr00km1djk4jc0h8ly50c8d0";
-"fancyvrb-3.2a"="61ndr9r25hh660320x2mblk2ya0zl1z2";
-"fancyvrb.doc-3.2a"="64pdccdhvxjxvyj7l5g8hmd0hr5mdsm1";
-"filehook-0.6"="srkyqmn87cndcbv0g0czlx47y23w1cxm";
-"filehook.doc-0.6"="gpqb7rw6990yrr748mn172k6fhfkkx0w";
-"filehook.source-0.6"="mpr60zx7c07v8x2hkdkvr2mkmw02xry5";
+"fancyvrb-3.5"="yva2c85f3kn51pnys6c25hb4ji9qnh7s";
+"fancyvrb.doc-3.5"="l7m134pqsqawzg76rb9dsp6hhvp89aji";
+"filehook-0.7"="8r8bqk7iabghr1qdna5ywa4r9f1ild5v";
+"filehook.doc-0.7"="1vilzkf0ymv1lkl5qgxkfpqvfxrkg31z";
+"filehook.source-0.7"="s6kwdhi9xv129ficzbhaiyn6f85b7g68";
 "float-1.3d"="dqksfsgqpc0vprkhfc6c9vfxlbrnn8sw";
 "float.doc-1.3d"="88hpzqh1011kwvwwm5bppb2gx6c9qqrv";
 "float.source-1.3d"="j1vp24g1lvwniahnd9vlw32c61cjswn9";
-"fontspec-2.7c"="2842bpfa18b5bgcj9as9ps7hzf2ja1pf";
-"fontspec.doc-2.7c"="z707r1gckqx62pz0a7y77ssv052975cx";
-"fontspec.source-2.7c"="v7dghy4rzkypkvhkk673iyjv8dvynv4y";
-"iftex-0.2"="3amzn5jjz9l90w90rhrrq75shl1v731z";
-"iftex.doc-0.2"="n514jbc0x2jxsk39lhayr74xpzfgqvn1";
-"l3kernel-2019"="3ayz6qzmm29wi7vnjffls8kydc9sy8y1";
-"l3kernel.doc-2019"="8mzh11mvpbl7a2ggvg516330azr7534l";
-"l3kernel.source-2019"="p1f2dsmql6xzbx2x3czv4pfwvv0x1mpw";
-"l3backend-2019"="z55f8pgpikxdkj3pyafq7icrzn1cvk8x";
-"l3backend.doc-2019"="plqmv9h1sl8lxvj2mib0dalcdlbc66m4";
-"l3backend.source-2019"="i97xnksvscihnk10ih2fa066x55aisgj";
-"l3packages-2019"="ms46khqwjk804yk95hilf7dbsp789nz1";
-"l3packages.doc-2019"="xbmww23xqpj8rmmfrw64cs3k7q3pklr0";
-"l3packages.source-2019"="i74rqdvagwb54zrrnff2h0i3j06g6bxa";
+"fontspec-2.7i"="vhqnyrgqlsg46f6wjpx5q1i4iisfgfnp";
+"fontspec.doc-2.7i"="9wl29gf9zhxp2bq6wvjl7sx4v5vdvfqy";
+"fontspec.source-2.7i"="yrl2big2r8zvflzawy8myggn8ahavz57";
 "xunicode-0.981"="ybvkdgz4sdl4nixzgz2rbmqfz7hwajv4";
 "xunicode.doc-0.981"="lydvg50dcpp0lk3m9niwdyf1vra61mgf";
-"footnotehyper-1.1"="3rx9cwmnz90z60lh97lafxidphh5hivv";
-"footnotehyper.doc-1.1"="y1n4fhq1gk9fcdbhl0qdk7qfrbpsm5f6";
-"footnotehyper.source-1.1"="nsq8cwpdz3fljgq6hn1flag38g2fbpv7";
+"footnotehyper-1.1a"="4hypxh0wdrybr4l8l491xx96v5f2mhiz";
+"footnotehyper.doc-1.1a"="l4ixap6zsq62fb63nm5hv9njmc0p3vmb";
+"footnotehyper.source-1.1a"="k3jhll47ppf1zi2rhxhsfnbhi092vm5v";
 "fp-2.1d"="lxyxf8jkbgrkk43qbnr2s3ns19ihgmw5";
 "fp.doc-2.1d"="ih2kq6xp1nd5gs9bc9vhd34qa7jcj093";
+"hologo-1.14"="3sz5m55pgy5adawf1qsnihw0mqf94hbk";
+"hologo.doc-1.14"="h7szzyb4hsbsa1inbyinazfvg87kn1da";
+"hologo.source-1.14"="8ijn8yd831dvsff40ksd8ak7fas85mgq";
 "index-4.1beta"="qbh9vs69mrp2czw492icb71wbx4nzshx";
 "index.doc-4.1beta"="l3476by3qz0r0cn3lcbw006ay5p11naz";
 "index.source-4.1beta"="0i38dyjh6278hxgkdzy0wvlcbn2w0k7n";
 "jknapltx-2019"="cvwv1bfgf5s8rnahghpy2pbb7kgwzqwp";
 "jknapltx.doc-2019"="cxdmxr63vm4sm8rv6bp9n3yyw5gqc7y3";
-"koma-script-3.27"="9ksv30m8h1g20wxvh61wj3sfv01cja5i";
-"l3experimental-2019"="5m3d2shrmk7njn1jd7bxswaq5wdp41ba";
-"l3experimental.doc-2019"="c1nqvxyj7yfchgr85p8wbz5x0zm5wf5n";
-"l3experimental.source-2019"="fhav9zik3s03qry2x0krn1g7yiffihiw";
+"koma-script-3.29"="cm6r96yhwmmwcxg9q0xa8pchhxz10wn2";
+"l3experimental-2019"="8zl15x29f592faif8gm224085j5w7ljz";
+"l3experimental.doc-2019"="c6c7v530ak5h8qs11m9rbsr06pdkqwng";
+"l3experimental.source-2019"="2l7rzmdwzags9f30y9vi7s38a49w9qzg";
 "latexbug-1.0g"="fjk32p2lbq0bj54snnajz4j21x4dbqsr";
 "latexbug.doc-1.0g"="1s1j51jphz3wphi8idq8jpvi935ag683";
 "latexbug.source-1.0g"="lnghssyyyrc9y2nca730pchkyvjmbk40";
@@ -3217,41 +3396,44 @@
 "listings-1.8c"="2asfcbjg5w9zxjfq2v9bdfnvyx6p1cmq";
 "listings.doc-1.8c"="xmczlyi7bqi8wy7247p9h08jhabkkq0z";
 "listings.source-1.8c"="9l0i48d1grilpgkna68abx3xbh7pb598";
-"lwarp-0.76"="8r1cpc8d7a09mx8g3k2xclr0wkyxkr6z";
-"lwarp.doc-0.76"="l65xk9wmi5s3qy4p9zm3f167p4fif9is";
-"lwarp.source-0.76"="2bya1h32g31g5ki7ajgib3g1iwkprxp5";
+"lwarp-0.80"="qcmm9glcclflqf353cyj0hvymy9k81yp";
+"lwarp.doc-0.80"="7xp41iacs2w6b7x9mkkzw2692k575zis";
+"lwarp.source-0.80"="lpsg5x6jsszwlg2xvizsnj6cdlsw3jvq";
 "mathspec-0.2b"="kwvx81d4nlxj7vbr2n5zvgnfvkasg4y0";
 "mathspec.doc-0.2b"="rqykkdkfahnnnphcns26p19z9mr2mlgh";
-"mathtools-1.22"="jz5mji21zr6wna5dqnl5g9mvkf4z07aa";
-"mathtools.doc-1.22"="zy0nszbmq9jdpdxxin8fyc2rz2307nrn";
-"mathtools.source-1.22"="zjlqphmbjr8hqkv8ail9j83yy2cwl3mb";
+"mathtools-1.23"="sz6g5312qbq958v9sw4jcdyazqia53ka";
+"mathtools.doc-1.23"="cfavniflyk7hmkbkhccvyq5jhpjhwnm3";
+"mathtools.source-1.23"="6vly7yb9gcgjb3qfibgihfr4s2g5cbd2";
 "mdwtools-1.05.4"="fbp8vrgdzc2g4i27m9f4qcsr8yjlbzg3";
 "mdwtools.doc-1.05.4"="jb5r95gmlqj1bx19gbkvcm372ina3bdy";
 "mdwtools.source-1.05.4"="kcm853bwwv69vb5zcmikd1gmpcnhz9pw";
 "metalogo-0.12"="hamja3bdw70llmwnabjq9vsdni1w77qv";
 "metalogo.doc-0.12"="mi09m2hdx668xm2v9igsq25z504n4vrh";
 "metalogo.source-0.12"="4xddwk98vl0xdff6j49jjanzvqbw6yzm";
-"microtype-2.7c"="kb96fykrpc13hn3s0vg6zb33dyx1cdi6";
-"microtype.doc-2.7c"="kr2m34rdkf2a62h8m9zsk0yqpi1g6i5k";
-"microtype.source-2.7c"="ysd9892wj8zi2hi4qzk6pfpknsv9xz73";
-"ntgclass-2.1a"="z5fz8hxig5gp5ii9780b8filsbk7qxyq";
-"ntgclass.doc-2.1a"="900yw3bcc4mdycknaspf867wm8fc3g7b";
-"ntgclass.source-2.1a"="rqd773gdvwmrz54igqz6qz54z4irajvg";
-"parskip-2.0c"="1vbvla6bsakgvv9f17ni5dxlh88xy4jh";
-"parskip.doc-2.0c"="2zm0jh7i14djl8xj2ww657f0qiwgqhn1";
-"parskip.source-2.0c"="1nnnvrl2jshgbwjjzmaw2w5qmczifnm6";
-"pdfpages-0.5n"="a50qjswa0drdgin6zsyz0m005mby2sgi";
-"pdfpages.doc-0.5n"="6j0mvrgzc4vxnc4f5xv2n9zmbshmyb61";
-"pdfpages.source-0.5n"="mbdklw49b4wqb9ir8f3cq105csjlaw57";
-"polyglossia-1.44"="jaqzsrm9qm1ly20a73hj0cjcj92fhqgh";
-"polyglossia.doc-1.44"="pwl89hlpg6b3v9vwwl0jafg9d4x8d6hl";
-"polyglossia.source-1.44"="r9wdjpi1jhr3daxl9wsz4mgc4v0cbgpp";
+"microtype-2.7d"="b41abl38422cr5brjfy0630iq9x9mj8z";
+"microtype.doc-2.7d"="9sl8bgxi48cda1kln3qqy9xpf6lfw2d2";
+"microtype.source-2.7d"="39b3miq2ypis8brg4q2wjjrw4jzggcy3";
+"newfloat-1.1l"="lbxyrzkqg5j3hgwjaw9gdm2h1cf381vz";
+"newfloat.doc-1.1l"="fkbi9h381inng5z9qdgnig25z0fxsb4p";
+"newfloat.source-1.1l"="p8lpx95dawyhvyd36nkppgilrflb79v1";
+"ntgclass-2.1d"="y8cgcs422bvbz798jxiliyzv0sllld5w";
+"ntgclass.doc-2.1d"="7s1fk4p4zhm9x4gph5zmd9vqjwj6zynp";
+"ntgclass.source-2.1d"="3m8mi9ms4mjnl5yk6ygk15a3751yhi0a";
+"parskip-2.0d"="ymzl3d3jfpqwr0xxqp8k2ixm1mbg0kaf";
+"parskip.doc-2.0d"="sp1wmxz801dnrc7yl46kpfn3w8c1jilv";
+"parskip.source-2.0d"="wvksyjs0yivnv2v1ydlq2bfg7rg5h7np";
+"pdflscape-0.12"="xhyfdrzcx5agnsmlgrr1hibq0pkzmmsz";
+"pdflscape.doc-0.12"="7z59wsjf9k7m6d47bclgf6iimhrhlrfl";
+"pdflscape.source-0.12"="9dmgmza1qbbr95mdi9k27vkr772g2w2s";
+"pdfpages-0.5q"="1bdik391lsmp7dz6d8arq1hdawj4qraf";
+"pdfpages.doc-0.5q"="9jdi9zs7hycixbdxld0m95b8935f4cqw";
+"pdfpages.source-0.5q"="f8nglq0jzz4n3lky57q6mmm2pdrydxf9";
+"polyglossia-1.47"="ybzl0dq2rxk033mm304m3lmi3s66v40c";
+"polyglossia.doc-1.47"="y0qqjsyamjmc9b1zd6lr4ba6xj7fpi2l";
+"polyglossia.source-1.47"="pjlhlizha6zyz9iv4wvpk5l6y9z9x88s";
 "makecmds-2019"="anpaqglvl5rmcy8r2q0ap8m117nsx89q";
 "makecmds.doc-2019"="39zxaxxqlmps1wd4rjy42a1hk027n06v";
 "makecmds.source-2019"="j4g888p0hniq7p6b30q1fb4qfw3qp7i6";
-"xkeyval-2.7a"="nznhb9srbfg7ifdi2mlkqbdcsq6329a4";
-"xkeyval.doc-2.7a"="k84lpc1h5d71qcb2k5rm5fnn04pv8czc";
-"xkeyval.source-2.7a"="9g5vvb4y71qryhdbjwjyxhh2w86cch0f";
 "psfrag-3.04"="k8qyr0l3fsc4insyy1r6q596dq4gf23a";
 "psfrag.doc-3.04"="ybb4r3w20w1pcjwzaw0srpkx5c19rqg7";
 "psfrag.source-3.04"="xk135sb77fk6l9wz6fzifsjvchcqyj0f";
@@ -3289,9 +3471,9 @@
 "ucharcat.source-0.03"="kh9cnzg1pn8c51bbph2amp5y1j85q38h";
 "underscore-2019"="b7kwk1zddr5a19mcw3yxrp9pffc604x0";
 "underscore.doc-2019"="gwqnbwqn6vjizs1xqnmbv8fmcrs274fr";
-"unicode-math-0.8p"="f2f8bm0png538nm7jydkm9l6qf10vjpz";
-"unicode-math.doc-0.8p"="62rpcr8civdwkdd1gk7fg2mf441h64pl";
-"unicode-math.source-0.8p"="dgv0nciqxh74dr6mxlcpljy5qchvan9w";
+"unicode-math-0.8q"="p35257s5ldld4ya0xkvsxx11jrwxhg66";
+"unicode-math.doc-0.8q"="m9sy94l2v9qq966wlphf2ic8xfxdx81k";
+"unicode-math.source-0.8q"="1sydxxbljd69ds018c5hr8rk3cvb22qd";
 "xltxtra-0.7"="k32hfwrcbhp144n8rplwjgxmz89pw9zm";
 "xltxtra.doc-0.7"="vkw5vjdd8n7qxi8plhjb4xygh97pfj5d";
 "xltxtra.source-0.7"="y27f01j6zgm06nmsgcp5kl05p637wvj9";
@@ -3312,9 +3494,9 @@
 "autoarea.doc-0.3a"="zh69glasmj251qwrw6pjrshprd6x4hsh";
 "bardiag-0.4a"="vh54valkzncvzlx8y58gzs3k5jq66s69";
 "bardiag.doc-0.4a"="576s5nnqvq13rjnnn4l2d1g1rnd64vvn";
-"beamerswitch-1.6"="l759yh5xzqdxswf8hvbxpgsvpdbql82a";
-"beamerswitch.doc-1.6"="pixyxdhyci4j613cijcsm2bg20z9q8i9";
-"beamerswitch.source-1.6"="hnq47sdb3cqvxa1z0w1q3pwf838iga4q";
+"beamerswitch-1.6.1"="7x0sr2v96b3bz02f99j3chcqwmadwyqa";
+"beamerswitch.doc-1.6.1"="yckpqwfm27h050ai4fkvcdbb2777r71d";
+"beamerswitch.source-1.6.1"="my4k810d0pxh52d2c09dhkcbp1lihsgc";
 "binarytree-1.01"="xl1rqgn286y7hpv69bwja6c5rrbx29g9";
 "binarytree.doc-1.01"="7ihijqc33m3ydk77aw0qqqhf94yyrz21";
 "binarytree.source-1.01"="lk7v0gr502ck4z0d605z6mwkswqpmfyk";
@@ -3347,19 +3529,19 @@
 "celtic.source-1.1"="z25a01arypma6jfyj2f16n36hqyicffd";
 "chemfig-1.41"="159wgzbnmda73q0s1lgn3jbfm5hywyn2";
 "chemfig.doc-1.41"="h86pl1g5w2fli361za5783pv7w62kkww";
-"circuit-macros-9.1"="9mnl36vzk80ci01283pn05rg6jl83xf8";
-"circuit-macros.doc-9.1"="rdzhyx1inmh6rnqzdbs830xnknvlc7d4";
-"circuitikz-0.9.5"="3z1x5j6p6maapmxgkl4gngn9mhszr0hj";
-"circuitikz.doc-0.9.5"="5psr4l9hdgm6766qh4dhx0sgspx8yjh7";
+"circuit-macros-9.2"="af9csy1vch1pkpb5y0f3bqn26dh3fbgj";
+"circuit-macros.doc-9.2"="4b6r3b3iaf3y9bczs0yjli745pn4rrml";
+"circuitikz-1.0.1"="qgwgimjvm5h4y851sdk1hbpypkblix9x";
+"circuitikz.doc-1.0.1"="wra7lhr1667d2vgyx9acsdl57aan09gs";
 "combinedgraphics-0.2.2"="hr8cvhw9ng0nx1v0v34bx5yppzhw8r3a";
 "combinedgraphics.doc-0.2.2"="2s219mqf373sb1rp3dwjd9kdasjl9fdg";
 "combinedgraphics.source-0.2.2"="4q5n4m14613bv27dc7n3z1m8w2sfiv0q";
 "curve-1.16"="w4a3qv419x68y5ydvi1dk6pnm6ni82ci";
 "curve.doc-1.16"="f4n85j7dlkp12vm17vqac8d4hzm1jvd9";
 "curve.source-1.16"="gkfbyzhsaknlrhm3ni81jxswdjv5z9ij";
-"curve2e-2.0.1"="bgzyk69v782swwlc8jj677lqcgc0bglw";
-"curve2e.doc-2.0.1"="bx6bxwa82k1ms94qxr5czhfcgr7qals2";
-"curve2e.source-2.0.1"="29fd9y77g6ijz70qdjnlv5jn4if9hvn9";
+"curve2e-2.2.3"="0cglzcp85pn8k4xskblxjhcyask22srz";
+"curve2e.doc-2.2.3"="sw3iq90vbk761fpzg58ng6s2hv7ppzg8";
+"curve2e.source-2.2.3"="sc5ckkw72cg5gw26qfjqn45k005vbp4x";
 "curves-1.55"="2cyy1kwxbvxpvxpvvsbh7nvh5q5l7n7b";
 "curves.doc-1.55"="jk4ma0hcrdg6lwy4l5238b9xzsb8lfrv";
 "curves.source-1.55"="q9l5hcsi0n14kkcim30yk6i6sxc5cmvw";
@@ -3381,8 +3563,8 @@
 "drs.doc-1.1b"="aq84i4xdklf4wcripj60cc9fd4w3zhhc";
 "duotenzor-1.00"="fx9ljkzzp09x8iajbwjlrzcjxf382k9x";
 "duotenzor.doc-1.00"="x6y62df7hjrp64r4w1qvdikqdg6ph8l2";
-"dynkin-diagrams-3.141592"="j4vi8xr90ll5y6i9a5kg5v0ig52cf6pq";
-"dynkin-diagrams.doc-3.141592"="ycb3hbyg2gxky7ki6cq8xnarv0gc5xjp";
+"dynkin-diagrams-3.14159265358"="w0hkvn6lwjj4g8s78z96r3mbk7sg3h4d";
+"dynkin-diagrams.doc-3.14159265358"="jbi0ig2hhxmyidxbc63q6iwm93vzd4ab";
 "ecgdraw-0.1"="py3xjb8hz3mdsh42hnjww7i4ndxgkwnc";
 "ecgdraw.doc-0.1"="a9ggi8ivc4wcnqv9gd28lhdw56w4zg8a";
 "ecgdraw.source-0.1"="77vlnnhs178s19gaa4n7wa82lcvyp0s1";
@@ -3393,8 +3575,8 @@
 "ellipse.source-1.0"="25xhi22s1cvkyzbjwchd50ixsx6awfk5";
 "endofproofwd-2019"="xn4xfhhr3k5cq53ab6rkjwvxqs877kq8";
 "endofproofwd.doc-2019"="q8zg1zy1909bsif59caj8rmmjj4g3v4i";
-"epspdf-0.6.4"="h50y3g5yrpqgsm0w913lf1pv0fnfl83v";
-"epspdf.doc-0.6.4"="g7jxwc3n9qjnj5fby3v84hlwz02lvr2g";
+"epspdf-0.6.5"="06n9z5fw1f71x4kb07na5bkr48fd5s5x";
+"epspdf.doc-0.6.5"="xc2psspim5kmyzwr4sksf81g16pcslq2";
 "epspdfconversion-0.61"="4dsfb50v8zqbx8nqlzlj712jiq9hchwz";
 "epspdfconversion.doc-0.61"="bxc42asj3as5dx1qq4axdvfs30lfm24b";
 "esk-1.0"="1hsqxgyh6nbwdw4fl5lsivg6wh1v2s1r";
@@ -3426,9 +3608,9 @@
 "gincltex-0.3"="sqimpp1pb3c7mqcm4jnd40jlahpcnr30";
 "gincltex.doc-0.3"="mpr0nv6ldvvc7wgq35qh34csxhxnknmf";
 "gincltex.source-0.3"="s0dq3s33c04fqmzi9q9wp09vgfm7qh9h";
-"gnuplottex-0.9.3"="r27hfr5pf31ihjv6nyyv3gwpb52pix26";
-"gnuplottex.doc-0.9.3"="5fd22z8bg4wd67sg5dzrmdb6bhv997l5";
-"gnuplottex.source-0.9.3"="1lan5zdflfhb2rvm65zdmcp56izp6khv";
+"gnuplottex-0.9.4"="0c1rl12r5h50ib3f62brpbs5g0m0swps";
+"gnuplottex.doc-0.9.4"="rklykx57diia7siy7692488q7dmh54ss";
+"gnuplottex.source-0.9.4"="h3c4nmwn9x3c4srljd03y1vpfvbngzmi";
 "gradientframe-0.2"="x80zlqzx72n55qpazclikrafwzny8ss5";
 "gradientframe.doc-0.2"="pgy0vrx4nvys3wki3202r377nryd0r1h";
 "gradientframe.source-0.2"="10dx55zpi0j7xzdkry3dh41ax873mmmk";
@@ -3495,8 +3677,8 @@
 "miniplot.doc-2019"="hi57wciv475ix91zl4rh30lv5pffns1p";
 "mkpic-1.02"="m0rzxyzpyjzial8vvd5nm2rny449ka5b";
 "mkpic.doc-1.02"="m0v80hkyq699sbmdbv5ydp75ccdh5yd3";
-"modiagram-0.2g"="g2syxjg96d46hkn75ym5p3pszq92kn9y";
-"modiagram.doc-0.2g"="4jdcw6fidn5kds9b31y3nq9czmw42sxd";
+"modiagram-0.3"="sbc0gqy5h9g3vvay1hg8nd8c8za52ns7";
+"modiagram.doc-0.3"="nxgyiv2d5sh787nmp4kjn0qlv88j77lm";
 "neuralnetwork-1.0"="3scaqj2kvqri7x23chqymfkg534298ik";
 "neuralnetwork.doc-1.0"="xxsvv8bh5174ihqmaxgy5072z92glvhd";
 "numericplots-2.0.2"="c6kqacnf4qlhx7lkbnrp4xji5xg9nzib";
@@ -3511,9 +3693,9 @@
 "pgf-blur-1.02"="30lr14qkrz1ah9kvgadknb9a7yyhv625";
 "pgf-blur.doc-1.02"="x4phrny12czndwvsrml45i6a5ymfncf0";
 "pgf-blur.source-1.02"="hdg79rv84byqmnyahvi65v3ca3h3j14r";
-"pgf-cmykshadings-1.1a"="3q5v126d7na5pj2bvyf6mqz9xd3h3ypl";
-"pgf-cmykshadings.doc-1.1a"="b5cv1lvwc8bwsddm1dxzl22ii1kfgk9b";
-"pgf-cmykshadings.source-1.1a"="yg8shb3ms5gxhv4f779g6ibccw66sk6p";
+"pgf-cmykshadings-1.2"="jpaxyzfgw5vgjhfpgqy7v4ddpq6nhks8";
+"pgf-cmykshadings.doc-1.2"="mk9nyxpnv0bbcg84i7ngz2vvf88dib77";
+"pgf-cmykshadings.source-1.2"="zd27bjqz9rxg1sdrzbbky56z2fdhhgv8";
 "pgf-soroban-1.1"="1l6ifq09crmg68d174y2ms66jjhgklql";
 "pgf-soroban.doc-1.1"="ajlhmwd0fgmamsgnnzr3s15z6irx579s";
 "pgf-spectra-1.0"="w2w6z4fj2g5z77i72q7l5fzrz3hbrb0p";
@@ -3558,8 +3740,8 @@
 "postage-1.0"="7n4w4vhx3ck8pvfp69l95yn45f7qbmpp";
 "postage.doc-1.0"="h40jv63ikgmcd83xmvkz3vdc700j5myy";
 "postage.source-1.0"="x0f20a02h113a5z6cppvhrqcq2lmlh8c";
-"prerex-a"="kzqmlwvyiz4gcqfl6jf7gafgxnbz7jf7";
-"prerex.doc-a"="p0c5qjq63scw8bfk0f9v5jid1bnijp5m";
+"prerex-2019"="3m8z29a8bizcdk7k3xipr9x7bzac9ybn";
+"prerex.doc-2019"="d176668n20nwvh0i5r6y37zjlg0k6ic6";
 "productbox-1.1"="7l9nqp2nxybrl35q1slpz9jhn70las0b";
 "productbox.doc-1.1"="j713za0sjbr7plb4xdis6zwvi7bg1n1q";
 "productbox.source-1.1"="aqhyalz52l2nz9v46bi0jn21vqw68w6g";
@@ -3581,9 +3763,9 @@
 "randomwalk-0.6"="91mjhj7f7d66khry7iy6y3v5wawg4y0b";
 "randomwalk.doc-0.6"="j5n0mc0grinrafdzb5cvqk3g1m9ir44r";
 "randomwalk.source-0.6"="ksq2jax3pbyqhkg5nk1jdhbzwgynhnyd";
-"realhats-3.0"="wk3pwrbv3mipr4hkdl09x0ysqfkp54qk";
-"realhats.doc-3.0"="6g2lyz0rp1gkjx41jln6mblfdadjd22d";
-"realhats.source-3.0"="kdyds9szcmvmlacgx8ngwnjcqyxjx4rc";
+"realhats-5.0"="hd7xxhd92vczk8qdq05v1q6bv16gifj2";
+"realhats.doc-5.0"="c82j1vakdfa87w0vjfp9jfs5x17m3738";
+"realhats.source-5.0"="c1df016h7zxjfizqdqjvfpvns0ap8sqh";
 "reotex-1.1"="yzydkc30vf6csv388xyf4lm9mn894781";
 "reotex.doc-1.1"="63p2w1vjpannypp8izsn8qis0f7zcngg";
 "rviewport-1.0"="c1flf8nck97sgi4994izzh0vwh8np9z2";
@@ -3641,8 +3823,8 @@
 "tikz-imagelabels.source-0.2"="rvmig94wa47dlj17d6qvwvdyp57blxff";
 "tikz-inet-0.1"="mkhy91a9633a5hbqcckgppy43ri13wy0";
 "tikz-inet.doc-0.1"="c62lz4nmz4cw48rjmfl3vn913smpxzcb";
-"tikz-kalender-0.4e"="nnszylg8x712g1kvxmk8cbl7iv2w0x2z";
-"tikz-kalender.doc-0.4e"="ihvfz01yv386i6rhd329p8c5dpgd8j5b";
+"tikz-kalender-0.4f"="x4mkhmbx5ccdhsyvw2qks74p0b0md7bn";
+"tikz-kalender.doc-0.4f"="ivn3jic885c1132lg7qmrxnspkn2rfwv";
 "tikz-karnaugh-1.2"="szdj3jvq9704zzzrmmm7kr67f9scc5vs";
 "tikz-karnaugh.doc-1.2"="4v7jmjk6kczigziblmaphpxl1xkr2ylp";
 "tikz-ladder-1.1"="ika5n5wsldxr4fk6qfjr6p9i94iydplp";
@@ -3674,13 +3856,15 @@
 "svn-prov-3.1862"="d5py1m0kjdzdx371fpvi66l80p92xp4i";
 "svn-prov.doc-3.1862"="kz3zma1cmbi2kxvn560vzl71n0pj5bvj";
 "svn-prov.source-3.1862"="xz3g6ljh9fk8vfla8c3asbzraqymnca4";
+"tikz-trackschematic-0.5.1"="b8a2ljq13a1yg0dsa9icngsa2iiyanw0";
+"tikz-trackschematic.doc-0.5.1"="cif4841w92syf5xxwlw9njb7zlqdd0gr";
 "tikz-truchet-2019"="h8p45wr3xhjslajpyyzr8zha6x52jyci";
 "tikz-truchet.doc-2019"="6nyandwvh9qj5z6pzh20417kl3gd3q68";
 "tikz-truchet.source-2019"="r5gpj9cmqj4njzzx820v7ka0v7chxy24";
 "tikzcodeblocks-0.12"="1g5p5x26xi87pgk6wsmrc8jfr5zbai1z";
 "tikzcodeblocks.doc-0.12"="anwa5r1dzd81pryrgy79cgcnyhr0p6ri";
-"tikzducks-1.1"="rpv9c4xm44kj4p1wg7vc9z0wdmks0ax9";
-"tikzducks.doc-1.1"="77q72vyqavlicgn2y7l9ygln0dvy9lvk";
+"tikzducks-1.3"="b8aksqlfbkwm3fv278plpnrarhh8hvqb";
+"tikzducks.doc-1.3"="4n92qi1wmbk02fsmrfp6vzpx4s2fj45h";
 "tikzinclude-1.0"="hh3h2srdlz39dv69wdwcrmjr1pps271a";
 "tikzinclude.doc-1.0"="qdzw00zvqp206krl9ph782lvrmvjphm9";
 "tikzinclude.source-1.0"="bznb6w85hk7nzsmnglz01qvi4mp64bqf";
@@ -3714,16 +3898,16 @@
 "timing-diagrams.doc-2019"="r8xz0yb362glmkcaadipa5v8jsf3w5py";
 "tipfr-1.5"="dd5jgd6y7rzspj6shr5mbqcbbzyncv2b";
 "tipfr.doc-1.5"="w5mslbn2d53wzdkaynxigaw4344psp9j";
-"tkz-base-1.16d"="w03w3abbr404mmxvgvpb6jvzdkbj40d1";
-"tkz-base.doc-1.16d"="2v2w7n3cwq5h20f3hxyqj1dijyvzkipd";
+"tkz-base-3.02c"="rn3wqrrmhrqd3sylby0dj279zkpxw1p9";
+"tkz-base.doc-3.02c"="k2ad8vfxnf6fylix77hi3ssfirk9nldn";
 "tkz-berge-1.00c"="jgkikvl8nnvmhqkkqivl57zc175cp2kk";
 "tkz-berge.doc-1.00c"="dk8ip06kr5rijf38ljwz8ik46zfkg083";
-"tkz-doc-1.1d"="md52c9wdgszfqpnsm8hgm0mhcq4gjqgq";
-"tkz-doc.doc-1.1d"="ic4vldvxdlq9zqx7disw9m872zv28mwq";
-"tkz-euclide-1.16c"="a7aldarmq49sd3kv5glmiwk7j5knzcdc";
-"tkz-euclide.doc-1.16c"="vj3mr7y6s5nyzy7akbn8f8iqbpaxs1r8";
-"tkz-fct-1.16c"="6nf7cazsna57aariv60jf2gcx321wkmm";
-"tkz-fct.doc-1.16c"="dawp55i6vgfhssqn9bs0h3amvh7bzasa";
+"tkz-doc-1.2c"="c3g1qykgrrsbl8yv1yb82fqlcfac86rx";
+"tkz-doc.doc-1.2c"="fda97y84cy38jndp32gj3yl1yv3dl0yl";
+"tkz-euclide-3.02c"="94ryxqd8hrhh64dhwr0292nbgrgli70a";
+"tkz-euclide.doc-3.02c"="i3kzk9df4sqa4k8lcfy1h0jd8hkrdwsi";
+"tkz-fct-1.2"="vk9mpsg0jvr9m7bz9ir7fkw864xq0ls0";
+"tkz-fct.doc-1.2"="dwwhwxzxb2019z9lin41ggw2ij9pp13g";
 "tkz-graph-1.00_d"="bhjvlldz48jx4glwmbqlzsca5ngw72sz";
 "tkz-graph.doc-1.00_d"="cj8h2qaphxpgf1p40vzfwdvxqylh8hjd";
 "tkz-kiviat-0.1b"="1w9f137a433521ihdb8qdp3d3k8qpjy3";
@@ -3824,9 +4008,9 @@
 "cooking-0.9b"="sp0gxpgc190gn2wngw7nqzay88hykl4x";
 "cooking.doc-0.9b"="15mncbdsswn8q6914ijlhzlg5ch6schl";
 "cooking.source-0.9b"="n6pvjf2lx012s5y29qc5mjkiz8dinkjr";
-"cooking-units-1.45"="nj1z7da10kvmxv8gp6hlxs449fsm5fhm";
-"cooking-units.doc-1.45"="qq7bsxi1r9n06v2grv0qknv2a0z6aq4h";
-"cooking-units.source-1.45"="26g0kx9w1hkg0yhsm90dc629adgf9k3g";
+"cooking-units-1.46"="lfac22p0a7f92v51zkh01mqvh58s85c0";
+"cooking-units.doc-1.46"="l15n9dvykpw95rai682ql7cv1h7z6xg4";
+"cooking-units.source-1.46"="kjmc2xbnmsdm0xxpbk1k7vavhy9im6q9";
 "cool-1.35"="djbl4kj33wlqqnj6sl31f57viw5sacvf";
 "cool.doc-1.35"="3l8iy5landcaybfhvb1inj773r55k7hw";
 "cool.source-1.35"="hfd759pc6m30sxnmchmv59nl8xr3hwrm";
@@ -3872,8 +4056,8 @@
 "crossreference.source-2019"="pmqnkrcxkwjdsz7pfwmqpjgc2kykv9s6";
 "crossreftools-0.9"="vgcy207mpng8cgp6a7vpy8frjakpfxp0";
 "crossreftools.doc-0.9"="fzfbdclk2h75vzllslywskqlly2pd2sa";
-"csquotes-5.2e"="06561kz86p7isj3bx68b4hrcjsq3qkpg";
-"csquotes.doc-5.2e"="scw57pm13ry5kvk76gk1f2hmvvb3xgzc";
+"csquotes-5.2j"="a8ii20nagxkr6657vwz3py2jjbqwa0lg";
+"csquotes.doc-5.2j"="928657z95scss0zv6bz8j8p79q63gz23";
 "css-colors-1.02"="5ybcj58dl55v53z40fvb3mgc8hl93z8x";
 "css-colors.doc-1.02"="kyz6mh1pkrjvz4za7x7sgmig7zrrxk8b";
 "csvmerge-1.0"="r2srdy1zz8m0dkbpg1gaml9ln23q9rgy";
@@ -3914,14 +4098,19 @@
 "dashrule-1.3"="bqc33kv2bljifdybb0qn7wvx48rb9xgs";
 "dashrule.doc-1.3"="vxa8hx7khicjjdjd8p5frwrv4b41fv1x";
 "dashrule.source-1.3"="94ga7n7xpk7wm3j37gp8innc0c0irdz5";
-"dashundergaps-2.0d"="v0dbl8bnxc3vkshq9n6j7ycwqhi6464l";
-"dashundergaps.doc-2.0d"="g06a3biwzfkbamjkc8hwsmdh4vb70c00";
-"dashundergaps.source-2.0d"="3y92cxw29ks64dd44mihrcm2sxgng0pg";
+"dashundergaps-2.0g"="kvz9k92wfnc0z23l5rlsc2zzq49mz388";
+"dashundergaps.doc-2.0g"="il06w6m1rwz6fzgidwaq4qqnp19173np";
+"dashundergaps.source-2.0g"="6fsdvdm16b0dpchccnrbr8r8s7msqd4f";
 "dataref-0.6"="s46my6g3mkk7d5g7fm90xxpn2d1h4gmv";
 "dataref.doc-0.6"="ap8c1b9ljp1zg3wpzfbp827kwqcjdp0j";
 "datatool-2.32"="hdkdqrf0g5jbi0ryk0bgiv71k3x98kl3";
 "datatool.doc-2.32"="9garxgrw5k7lxf0c7m5d70wwl3zf76ny";
 "datatool.source-2.32"="1cpr7jgy98fpqjaw58pla1nwgywfyqq7";
+"substr-1.2"="qahdkj07s8nl7fnbqgwhsni6w8bn69ch";
+"substr.doc-1.2"="nvjl7r3a8r697gn8p3n81yaamr8jrfs5";
+"xfor-1.05"="x2bs3y606v8f42ds7xp2kmllq0vmrnms";
+"xfor.doc-1.05"="lbgdf0qia743jdvlxqf7vm4w1pc77kar";
+"xfor.source-1.05"="pafv6fqj0nd5xm0wgmwavkmg97rw7dnm";
 "dateiliste-0.6"="s50fmah2lasy1vfkgkybbaynspnh0wb6";
 "dateiliste.doc-0.6"="frs8z7x6yf2l78g94dxx0w5nxchx7kdx";
 "dateiliste.source-0.6"="idazlpxank1dw1mjym4vcdlq0970i5gy";
@@ -3931,18 +4120,18 @@
 "datetime-2.60"="59y83sl151h396xz62kp975q9vplg195";
 "datetime.doc-2.60"="dzj8ihkcdv1hcxxi5vrqbv8ga05mx6l1";
 "datetime.source-2.60"="b5x1cfqxg3rlbmdzc1g18i76rk7m1323";
-"datetime2-1.5.3"="1q7rz88d9g4cpi9r1c42mq8wdnxhv8b9";
-"datetime2.doc-1.5.3"="yydvpzhqm5a4yl5cxbr872xhzj10b3gl";
-"datetime2.source-1.5.3"="pkdwwms3zv1dll96nfbb7hj348wiyc5y";
+"datetime2-1.5.5"="s48m4my1y6kfj43zyi7hm2v6y82j2b6q";
+"datetime2.doc-1.5.5"="bafnlgqaydnswir2sq6x8xqi7llil4vn";
+"datetime2.source-1.5.5"="idj2pmch8h2sfdqg7hg3rcc7b3dc1mc1";
 "datetime2-bahasai-1.01"="avsk4v66gfbscliygrhgk7jvfrv5vyrq";
 "datetime2-bahasai.doc-1.01"="km12sq45cjy831csfq3j0gvy6458j86h";
 "datetime2-bahasai.source-1.01"="y87vz4sib2zw70643lm50cfsknzxnydm";
 "datetime2-basque-1.2a"="hd28pvhxgxxdv9swsnkxvk0d0kmaklxp";
 "datetime2-basque.doc-1.2a"="4ad1pps70dfj98vara5i40fxhk7wsdbc";
 "datetime2-basque.source-1.2a"="8k9957zfg160fs11y3in9js5sabnv0nv";
-"datetime2-breton-1.1"="qr562jcbrvfb4dg45bvxhwng6np7afj8";
-"datetime2-breton.doc-1.1"="x87alkc8bcclzw83f2wxkijms2bi511q";
-"datetime2-breton.source-1.1"="ljrz1n10pl21j7psza4wrvq3qsyvm4cz";
+"datetime2-breton-1.2"="b1yidszps95zz5kdkqnm64rd707n6vjs";
+"datetime2-breton.doc-1.2"="6vv1srxl0r9isl3wkr4hfix09bqwrc7g";
+"datetime2-breton.source-1.2"="jxa7cwmnmb8c6w0qa3vp4zqhlc00f0y1";
 "datetime2-bulgarian-1.1"="2mlgshnfxai3cpyfy841gm5r07549b9n";
 "datetime2-bulgarian.doc-1.1"="9bnrpw5xshwk7ab59i6argivzd6rnajs";
 "datetime2-bulgarian.source-1.1"="q3jlh85lc1gvp5bxrgh157q88qd56dz1";
@@ -3964,9 +4153,9 @@
 "datetime2-en-fulltext-1.0"="j2vw6akprfz3kwsjy5rnb6qnlnmxp9ws";
 "datetime2-en-fulltext.doc-1.0"="q954riws1f9b7ij9c8h0kg3n8zqdhgk8";
 "datetime2-en-fulltext.source-1.0"="54ky0fywkli0nld3ydyqm4k2nnvzl280";
-"datetime2-english-1.04"="g7v24hvkfxnqb43y0vz7v69nkivf3v9g";
-"datetime2-english.doc-1.04"="n6pvkr88fwq9pbhi4lzf2757mrb2dpfn";
-"datetime2-english.source-1.04"="b16bvzwmpqq5z9vgbcsijs1xj4q2hjgg";
+"datetime2-english-1.05"="49xamcmmpgkf06k87wifshsm6yxj4lwv";
+"datetime2-english.doc-1.05"="4argq3r0d0pshr8nj5ssfljzz9ympky8";
+"datetime2-english.source-1.05"="gdl6ac2ikwga7h6il5638z4c4vnhxvnv";
 "datetime2-esperanto-1.1"="sf619gxrxm602kjrlslmzd271v5aynw2";
 "datetime2-esperanto.doc-1.1"="pn0jcv342fvczyn2lq6kyi1pbvk689d4";
 "datetime2-esperanto.source-1.1"="91kz15x4skcwsis3c0qjr751vyvdsmpd";
@@ -3982,9 +4171,9 @@
 "datetime2-galician-1.0"="jdzbi8dkc958r8fvpb5xqjmz7i5iiffz";
 "datetime2-galician.doc-1.0"="kanyn2kcrxp309crnj0wg3v34w93jndg";
 "datetime2-galician.source-1.0"="qjnph2vad7hl5d3jzzn58mz90jyvpgw2";
-"datetime2-german-2.1"="g1wcr457pvxv9ld9qq6b6av5z25dnrsl";
-"datetime2-german.doc-2.1"="6nmwahh375c3hw4jizqh4igdv4k0gfvj";
-"datetime2-german.source-2.1"="x3g3i850vj5zkp3103rjzniwrqy750zs";
+"datetime2-german-3.0"="qsk640z3jsi7hq1h6hfz3b6xic20sn37";
+"datetime2-german.doc-3.0"="86lpy6y6svzx89mc162iqba6gz1aj63w";
+"datetime2-german.source-3.0"="2501fydmjp8wybz0sr6ri4vplvigp1m3";
 "datetime2-greek-1.1"="0yigs9ycc8ncyyjwzs1vhxgmvzr93rqk";
 "datetime2-greek.doc-1.1"="4w2gjy95fh4m73w46fm86gq8iqrrxwxn";
 "datetime2-greek.source-1.1"="fclkgy9d60pz0m6pfmirgrw0bdb2dwqk";
@@ -4033,9 +4222,9 @@
 "datetime2-scottish-1.1"="0fw3v8db79rxc1363h70fgaswhzwhm4j";
 "datetime2-scottish.doc-1.1"="078mzhk1a0pd4qvvznp9aqjzhk1419j1";
 "datetime2-scottish.source-1.1"="mfw7dpm3mgh3wdmk4in6ysnnd6awij6w";
-"datetime2-serbian-1.1"="dbcf5c0qaigja5r4k03975vccybbkpxa";
-"datetime2-serbian.doc-1.1"="ajir9076mw38a6di9fjf0f977iq3a4wv";
-"datetime2-serbian.source-1.1"="b8xcnry7snnfwah7kibw3z6wyj7js88k";
+"datetime2-serbian-2.1.0"="4g4ih0c1yrk5a39gkdb7r4wsxnfhyjlj";
+"datetime2-serbian.doc-2.1.0"="s8rf7s640n219a6phy64jidmf04y715b";
+"datetime2-serbian.source-2.1.0"="c85jqss5f5wcbsjy9b6lah1vq7xyr10s";
 "datetime2-slovak-1.1"="s6drl7indhw6r88bpzzva2jhxrpmjg70";
 "datetime2-slovak.doc-1.1"="z5navvjmgvgxjihffyx9p43p4y3plg8k";
 "datetime2-slovak.source-1.1"="2g2jfgg91mfh572l3bh78sin351788k3";
@@ -4057,9 +4246,9 @@
 "datetime2-usorbian-1.1"="pm6w3h37qzfbca1p3j5hxrfdn02l84qp";
 "datetime2-usorbian.doc-1.1"="zn6pc9djwh8jjhf1p97ah3n5kiyzidyk";
 "datetime2-usorbian.source-1.1"="qy8g9fi20q25cl1nd0v057bvyp8mi6fn";
-"datetime2-welsh-1.0"="csy75jcm6aqad69jxhm7m01j04802pff";
-"datetime2-welsh.doc-1.0"="5qfzf2lglwj0399cj5y81f8a1y3rdv33";
-"datetime2-welsh.source-1.0"="2a3pn8nifx6bc81zk45cg8p0vdnwhfw4";
+"datetime2-welsh-1.1"="jpj8dg205zh62h4cy1ccnh4j2p5cdpcd";
+"datetime2-welsh.doc-1.1"="994x84jlypdbnlnx0jf5zg6x0np88s7k";
+"datetime2-welsh.source-1.1"="95qmsn3rm7bsavz4kg4xf0ygdmf70kqg";
 "dblfloatfix-1.0a"="d1796nn206cs1jsas8kc05p0bfcb80rm";
 "dblfloatfix.doc-1.0a"="2rgw8lakmgyv5abzbpcngs9g1lrfdps1";
 "decimal-2019"="a7xks9vjp0pa09i5dbwz78n28a8fg83d";
@@ -4074,9 +4263,9 @@
 "denisbdoc-0.7"="fxcj67mah72g8w5xmrwb10vm1hxmciix";
 "denisbdoc.doc-0.7"="k4qq3apgqk0xgxgmrmqpl039hwzb478p";
 "denisbdoc.source-0.7"="45fl1pbbkiwk3b5cwl9ylcs1vxpdz8m5";
-"diagbox-2.2"="mcmg51aism26pvqhs198yngx4sq7hpcs";
-"diagbox.doc-2.2"="p1vln62lkw76jldxxcgr0wkraidcd3fr";
-"diagbox.source-2.2"="a6m49qkh7w30xgg342dd4vs7kpcf8kkx";
+"diagbox-2.3"="wnh1cc0hvk7lyh896mmsxcjsn24pi97w";
+"diagbox.doc-2.3"="3n73xzb7mla1rk8ri0ia9xg17q13r22y";
+"diagbox.source-2.3"="iczs18l4qfijgpb7fjqjj7w86m6smpn8";
 "diagnose-0.2"="dbkvix4h3jhwq9pd2g9ydknc87z3zlr3";
 "diagnose.doc-0.2"="0b0ajzf5gvv3901szcwnkb7938sgqqr9";
 "dialogl-2019"="qn4qmw5yrhvim6fdl2gff1vl0ca4dfs2";
@@ -4144,15 +4333,15 @@
 "draftwatermark-1.2"="r78p4n8jbzjvx8p7gx1fj7fp4h56x4xq";
 "draftwatermark.doc-1.2"="6mzqbw0grmivgby8vqiqf04i9dnvvimb";
 "draftwatermark.source-1.2"="6p47ci9wfjq7svn09df09p4jxwvyfzxa";
-"dtk-2.08c"="3615adj9zkvi51d9xcn8sk6fyk0xahyh";
-"dtk.doc-2.08c"="8pmrd68qj6z09ivscvd5q07ni6wbf8lr";
+"dtk-2.08f"="4v50smdv44x4fp57sjdjk4sl0jd8hmnc";
+"dtk.doc-2.08f"="3gr8dvcl3553c4i8z04666lscw69llyr";
 "dtxdescribe-1.02"="2bhwnkb5id2raigd4iywhf7da7c772zr";
 "dtxdescribe.doc-1.02"="2ygyzgrllyq4fa2xbf8fyrfk810w2ja9";
 "dtxdescribe.source-1.02"="39inl1ksgzd28sszdfjyyq80gscdc6xs";
 "dtxgallery.doc-1"="bpsakwyq6ihcw2ziqpjv8qh2a90s5mw9";
-"ducksay-2.4.1"="42iy8cbp5yrff5ka5cljvb59wbwywwwb";
-"ducksay.doc-2.4.1"="zl0sz8xb5yhwhaail9kfnx9lg7a204zk";
-"ducksay.source-2.4.1"="lkqqhv6igq38kh8jx8wy131zrqdd3mr3";
+"ducksay-2.5"="dyhjn1zfasgd7yzx1shbxcswj1zqz9md";
+"ducksay.doc-2.5"="8j27sx7khqa6jas9hnxvvm7hawvafiaz";
+"ducksay.source-2.5"="nd5z7dlyn7svr6msmc6hxhydnrrjv2r5";
 "duckuments-0.5"="vdc247rsaliycjf37gn8lwihycrpgksp";
 "duckuments.doc-0.5"="7ia6rdsdhhnvf2jdxynz780virwl48p7";
 "duckuments.source-0.5"="ndcajqs2y2vmk0fzd25ayc4i9yq03qz2";
@@ -4205,10 +4394,10 @@
 "egplot.source-1.02a"="lpd8c8hpz0vpln7hq4ck2xm896hhkjz5";
 "ehhline-1.0"="0ayan5v26fd54c0nrvs590ny44pwamg4";
 "ehhline.doc-1.0"="f4gk0s21pnnvjf753z83vyprvhcsvrs2";
-"elegantbook-3.09"="p64inp9fb54g2lkdc8b6z1c0qvnxihd6";
-"elegantbook.doc-3.09"="bzfd025rnz0ha3m7xp5f8gvw5lrrk5sh";
-"elegantnote-2.10"="m6lz4p899gmvmd2939an2amnvj6fhix2";
-"elegantnote.doc-2.10"="ckdxix1rmk6ixxx3nvyh12f3mr325z5s";
+"elegantbook-3.10"="wz7jz9gjfv6qlfqg9c6j4ljsr86464bw";
+"elegantbook.doc-3.10"="yqyynhw3dpbzmr3zval1xwdgifg87cnd";
+"elegantnote-2.20"="mhbycimafrwq4kqnm83mgil533z1f4vf";
+"elegantnote.doc-2.20"="ln51l8wlqqyrg9p01kanpf2ahzxyrr2g";
 "elegantpaper-0.08"="wccij61cpjzcyw006hzhgdvv7i4kxfpk";
 "elegantpaper.doc-0.08"="mngv13z3srw192zl58fy7vrqn6i31sjg";
 "elements-0.3"="5jhgr3w0l71k6yyah71sns2cyib3w6rs";
@@ -4230,8 +4419,11 @@
 "embedall-2.0"="bkkkbm42s039l4hsy7a06fba7y76pcdh";
 "embedall.doc-2.0"="xifjdsbhrdr372svi21sq1wwl6jin2as";
 "embedall.source-2.0"="kmanpw0yvlllsc52f4wfhh7dpby80bnc";
-"embrac-0.8"="5l14aa7s3k4kiw4lalzr2sx6r6xv4ak3";
-"embrac.doc-0.8"="r07azs58bn2ik5g0y5ybxbxc1q1dgac2";
+"embedfile-2.9"="qx8sz5b4h94g73qrwqxfdzq8prlhghsl";
+"embedfile.doc-2.9"="afjnsnmjbzkpsn8la5w1vgmpshm076q3";
+"embedfile.source-2.9"="l98vd4zxhb171kin1n23yay14vy5arzn";
+"embrac-0.9"="s9j4hhy7akf4c9w38igwkgw2vm7ilwm9";
+"embrac.doc-0.9"="qvh1i7n8g5l9xzvl8sh8wnl63ki1kpsc";
 "emptypage-1.2"="lbjvj1gf2jiy15yj86d6jxlhrk66zmrm";
 "emptypage.doc-1.2"="07fnrxjidk9b42610wx6696cah8p1zdi";
 "emptypage.source-1.2"="svha86185zhrvab827x8nbn02vlp027l";
@@ -4243,16 +4435,16 @@
 "endheads-1.6"="0gjn1xldvixl6lh9n2g9gyly9va84sp4";
 "endheads.doc-1.6"="y0phz9mfklcq56h6mwkx2jd535v94r72";
 "endheads.source-1.6"="x01kj0pd2b1ljs3457l1b7880vp8amdx";
-"endnotes-2019"="mwf7b44kh21vis4mjglri12m2ji0fkyq";
-"endnotes.doc-2019"="ksik52m1c5n390015awpj4hszf621ih7";
+"endnotes-2019"="h3pqrcr0w5lgxgyw0glmjshyz4jpi08k";
+"endnotes.doc-2019"="fdkg195aiaccnys9dnjyiklrsvkvmx4m";
 "engpron-2"="d0k5j6bdrzm418x90n8858cyw85i439m";
 "engpron.doc-2"="4mhw0220r7x85dshmar87b3jydn2jxdd";
 "engpron.source-2"="3rdxi48m3h33kn1z81md9izji6my7sdk";
 "engrec-1.1"="8wc4zbqvp2lgs3qgvhks8fhy0gcafddy";
 "engrec.doc-1.1"="3rvil27vakyv0c56wykmhb499a3xfbjk";
 "engrec.source-1.1"="3rj7ij1f8rvyb80iaxx0fw8br06w8kgp";
-"enotez-0.10a"="d7wl58rba9810bqn5v1rg1sn6pgpb9xi";
-"enotez.doc-0.10a"="1y5kkfl7j6bi5gbk04xmqf8hx644x90h";
+"enotez-0.10b"="14hjscgb5k0pr21jg2bz75k7ys1ycgzz";
+"enotez.doc-0.10b"="x60vbpi6c6n6b0v3gmbq2sa3h6cml1sh";
 "enumitem-3.9"="cddx7nd076jvg59bdkqaxnmk4rdlg94a";
 "enumitem.doc-3.9"="nraf0fvdrdn61w2dxiaqcd6xzlywq9pc";
 "enumitem-zref-1.8"="hj60650qiwzxhdk9f9pix1wgvphgqxj4";
@@ -4266,9 +4458,9 @@
 "envlab-1.2"="iqf24bqqcnpp7kiysfb5dy4ksw2ni0pn";
 "envlab.doc-1.2"="5xscix7j6x6fbscw6hk22r4qz864y654";
 "envlab.source-1.2"="ndl09cfzl24rbp7rw71lcv2q6dn9pdih";
-"epigraph-1.5c"="6fjixgh32n7mlygm6dz3xdiv4bzd1p70";
-"epigraph.doc-1.5c"="mmk8d73w2mkhya560hvdz56nvw8l5vz2";
-"epigraph.source-1.5c"="6zj62nlmzvi5pagymipk9611glql8pnx";
+"epigraph-1.5e"="hhz8zdnr7k77gpqvk82mbq7v1gmcq6ig";
+"epigraph.doc-1.5e"="xkmp3p36yicjy9f8ywy7s39i5spwwf78";
+"epigraph.source-1.5e"="s20xxdnwi3pc9d6sl5md0fyh7w8vnhbd";
 "epiolmec-2019"="hpmg6yy63c52078mqmp861418xi07rgk";
 "epiolmec.doc-2019"="vl11cbnw0avwvjf8ad01fziya1dzrbh8";
 "epiolmec.source-2019"="1b7as37h0ncqjvsypwc9wdzzjhs0sfhs";
@@ -4287,9 +4479,9 @@
 "errata-0.3"="kgx1zy8j3g12czpg8hhnjq6dwa3m8xqn";
 "errata.doc-0.3"="518rdbnh3w5jsk4vlfp93cnag3kaiwmy";
 "errata.source-0.3"="p27pa3b4plzwhxl8vpr7qigbnr8aqv11";
-"erw-l3-0.1.3"="481cp6s0xfl52mrsalwrx2k3vzl4xl9h";
-"erw-l3.doc-0.1.3"="axjq9h5zgjvnnx2ccncf2sczgq73m315";
-"erw-l3.source-0.1.3"="2z3s0cf7f2nqjk12sgirrdrg3ajj4d3h";
+"erw-l3-0.1.6"="kxphzlkm7yayqy1yf263c9bk85zz9hgi";
+"erw-l3.doc-0.1.6"="b7pk72671bq9gv3mjbf934nbp3lqcaby";
+"erw-l3.source-0.1.6"="6nbfzgfb9w00f52rg5pq03kvnm8ynnik";
 "esami-2.5"="8b9bvz0jsn56nq9d27l05kfmwhggm6sw";
 "esami.doc-2.5"="y2n8zs9pk1a3zn1ag5sw4sm0kbaclqr2";
 "esdiff-1.2"="q26sgf5s4ans9qv984p9s04pginqby9z";
@@ -4308,9 +4500,9 @@
 "etextools-3.1415926"="w78v5hb43si3j8p38simfzscyh6lglsm";
 "etextools.doc-3.1415926"="16fq8y3c226wsf57dkny9484440i61zv";
 "etextools.source-3.1415926"="ch6lsyh0nlzkdrwzsxgf87srsb40x56k";
-"etoc-1.09"="c4gl9kikkhpjig7nzq621ihbx56ij309";
-"etoc.doc-1.09"="79790h8winia72jc9vxq50816nwigckk";
-"etoc.source-1.09"="6cl0xm9j4faq58l1fwh9vmr6vr6cqsxm";
+"etoc-1.09b"="ayn6dsc7550qxa7rxcqcp019nbfdsnfa";
+"etoc.doc-1.09b"="7if33hyz1027q1w1jfr2hi170map9d3d";
+"etoc.source-1.09b"="q1ivnwnc5dgz72fck2lzmdz6y18dgvpk";
 "eukdate-1.04"="5lql99zq8izsri87dhqf28nnchrjkyhq";
 "eukdate.doc-1.04"="f3xl3nllsr8299rjnxnhpksv7rz8pdq0";
 "eukdate.source-1.04"="scjqaadvah0kf1rxj9r2nphvffk86cis";
@@ -4318,8 +4510,8 @@
 "eulerpx.doc-0.2.1"="8jybcgzjn8c3qyagdmaxmmy0fx89sj93";
 "europasscv-2019"="l85dmsidqdd33pivkp8q5bl50mxynhhd";
 "europasscv.doc-2019"="vm9plycg2pppcnqv2mzhnxf09adzr2ff";
-"europecv-2019"="hiyv06bv9v7dxykzabh410lkxc57xgas";
-"europecv.doc-2019"="dx6iy85q63v4k48yq6dc8fx54x7mwryv";
+"europecv-2019"="fmf2rbqmvglyydrw34ksz35dg3ya7v36";
+"europecv.doc-2019"="3pwjj21avp8rw3sfr8hr1gnz2blb4fzh";
 "everyhook-1.2"="ndig4g0nsbqla2i2p1n6skjjxsr3qjhv";
 "everyhook.doc-1.2"="690qpw68wri4cr4ahv1xfqibm3flc5mr";
 "everyhook.source-1.2"="rvh60i8j1gbyal0pjpdgld9l5g20zilf";
@@ -4353,9 +4545,9 @@
 "exercises-1.0"="hghjlb5lksvs5nwqdipf0sbfxblqkr8n";
 "exercises.doc-1.0"="2xwg0g0li01d2h27alvm667nz56cz2r1";
 "exercises.source-1.0"="fbq0d5cp7lmgikxgrizj3vs75gxdg4qz";
-"exframe-3.3"="1yxv7ckh5ravavzydcvryykk94k83bbc";
-"exframe.doc-3.3"="afd27v4df5anpviwvv4k87rwr5z4hywz";
-"exframe.source-3.3"="1mcln0ril87yvl3bypnw6qp442i8mp1f";
+"exframe-3.4"="4ylpslzc9xy1anmf3955qv9c2qf6a2j8";
+"exframe.doc-3.4"="nnvszhbdyp6xc6kscdlsdrr1xzp60pjw";
+"exframe.source-3.4"="01lnli0q7sbbax9kzz5wil7gx6578h6d";
 "exp-testopt-0.3"="rz188mfdr0hfnrcndv0ncany2g20hv34";
 "exp-testopt.doc-0.3"="icxvqjnip0g92k1hngpvas7f7ii895pa";
 "exp-testopt.source-0.3"="9gq43v996qrrrxjgi28fqf9c8qval8ln";
@@ -4398,22 +4590,25 @@
 "fancytooltips-1.8"="92mbrk8gn6np54fx90qzcgkps3v6k54y";
 "fancytooltips.doc-1.8"="v90g2vxn8yqy9lvibqhldwm23cpvv53j";
 "fancytooltips.source-1.8"="cgj7harpp7wxh1fvh1wfx3pc0c34nhd5";
-"fbox-0.01"="avsffl90axfyd4pliavp0ckwxrm9w3f5";
-"fbox.doc-0.01"="ip8s6059f06097xzz36v0ad9r5j970rd";
+"fbox-0.04"="jh3qscq1a545idv7l37yfvma12ww4fy0";
+"fbox.doc-0.04"="a76rv2z51nryzn49hq9hcwrk2vblfssc";
 "fcolumn-1.2"="7gnf966fnvfcw5m4gfcxlxhixarf8v2l";
 "fcolumn.doc-1.2"="w9hp3iibs2fzympchad93fwrjzz3mn15";
 "fcolumn.source-1.2"="cx5wmvjqckiw10xd2xi66mwvq85nhmmx";
 "fetchcls-1.0"="hjmchh00z9pl5bhdxdb491f4grb4hvri";
 "fetchcls.doc-1.0"="2p0k1bx3y1b9b8lw2j25ybcaz1gwyyfa";
 "fetchcls.source-1.0"="xzc8psnl98xfsj7hy37f1qgln8hx25pn";
+"fewerfloatpages-1.0a"="f18hhill9s3ab3vrmcvvpzyl5jqxdxpi";
+"fewerfloatpages.doc-1.0a"="d6g966l36wbsyaqw26cpq3bzjln9vsvi";
+"fewerfloatpages.source-1.0a"="88x4v7p9yc5skms1zms5j3cx06lay8gm";
 "ffslides-2019"="v88vqphgndyc8bznnkpc17pcgc4f429f";
 "ffslides.doc-2019"="1378bj25gqxr8mhdwf99rw2q61kbakqd";
 "fgruler-1.0"="z5k7w4nncv381nbznr8c7bwq0a9k9l5m";
 "fgruler.doc-1.0"="rm6g865195d2lm97v9pbaim7jrgsnjyz";
 "fgruler.source-1.0"="67chz0f0pjn70xrxzmw7jvzgskjl9vlv";
-"fibeamer-1.1.7"="39kjk30dpdvclh0zy23x12jiycik3xgn";
-"fibeamer.doc-1.1.7"="qcvd0xn9h1j3dgjdk4kdyh6iy0q0kvl9";
-"fibeamer.source-1.1.7"="kzw9lj7jxl4kp2qqk8lcvbjhsdl3qnrf";
+"fibeamer-1.1.8"="9vdqi8fyrg6ixnia4qh18dyzbg1y0pdd";
+"fibeamer.doc-1.1.8"="blp94av9rfbpawsvgrlwq5p2ycgwz3bm";
+"fibeamer.source-1.1.8"="6s017bq2ca3g3ml50br5dwn14i9q3986";
 "fifo-stack-1.0"="dfyb5qmw70jy72ass9iy0k89criyybwh";
 "fifo-stack.doc-1.0"="a5qh0b6zcxnfplc2xf0dy4384rvb8ggf";
 "fifo-stack.source-1.0"="67n2h94p29l1j6dar7s1q8gz1cxg1zxh";
@@ -4454,7 +4649,7 @@
 "fixmetodonotes.doc-0.2.2"="kwvshr4l5r8zgjia62ac04bpc7cy5n8w";
 "fixmetodonotes.source-0.2.2"="c3v82mnqbxnz0b2yy1g5l9yfxh1y41vd";
 "fjodor-2019"="c6ya1a7zfddfil9y5f30af7d0jm8ikij";
-"fjodor.doc-2019"="ba4cxg0czxij6lwkl9w1kzmrcli6s3jm";
+"fjodor.doc-2019"="2d9qhg8icr3q3ljp18wpy0wphq2rhdsi";
 "flabels-1.0"="pphsynfbbj4vxl9g3rklfj0igp6pzliy";
 "flabels.doc-1.0"="hpsnqln41r0ybmv2vjycd0zrxi6mwrcx";
 "flabels.source-1.0"="2x4jjggfjxvqby3yv13k0y1cgcrd0jcq";
@@ -4485,9 +4680,9 @@
 "fmp-2019"="3m6zqb7jl5rn5zgy0dbys5r8y1sp20x5";
 "fmp.doc-2019"="3hvfiw6yizjkxnx5h7xlzfig11diglpm";
 "fmp.source-2019"="44cqcijnqc5235rjqsmkj4vhmrs9j7hq";
-"fmtcount-3.05"="lgf2i3g3dqna8nf2apjmim4dsrgr4v1c";
-"fmtcount.doc-3.05"="1cxr7nbb8wc3gyiy8h6vb3lcnlq56cxg";
-"fmtcount.source-3.05"="bsypsb0pa2wjvacpyi0jri32j3y99vfa";
+"fmtcount-3.07"="zhm87ydajmphfm6hp2acvf0dbknldyvr";
+"fmtcount.doc-3.07"="9md72p30182mf6yp6x8c1jjrar73j9cg";
+"fmtcount.source-3.07"="hwq1ghmccx21k6f3sv5vyv8ikv6bxl4a";
 "fn2end-1.1"="qw34b3ki30fqs4dj4fkj6f46aygw0ylw";
 "fn2end.doc-1.1"="anwhkba91c48wl5p1ch35iplw974sdiq";
 "fnbreak-1.30"="aiwqr078mw2127lbphc0lhmh90m5ddgg";
@@ -4507,9 +4702,11 @@
 "foilhtml-1.2"="78dmna552hnh9i11v9zgg6l68hmla7bc";
 "foilhtml.doc-1.2"="a2bsh99xh1lfpssggzxhiz9ipwz6bijd";
 "foilhtml.source-1.2"="lrjc6lj49c8knfh4bh9jx7vzpddxsh71";
-"fontaxes-1.0d"="aaqzfxbcd9fdggw8lmj6syc1ff00m43p";
-"fontaxes.doc-1.0d"="q1qsz0gigyg3x462k337crqng7njvakk";
-"fontaxes.source-1.0d"="6xacssljffql809gpbhl8qdrs944v6cs";
+"fontsetup-1.002"="8nkvghhfrxfaca7iw88r4460z5fvlpkc";
+"fontsetup.doc-1.002"="s2l113cxvbbrpcsb2ympa7jivlm14a4s";
+"fontsize-0.1"="0an9sggd8hdginlv1cxs9489770q1j45";
+"fontsize.doc-0.1"="scl06w7gj8gkhds45xk96mdkgs0gpdkd";
+"fontsize.source-0.1"="4pvk1b0ryv7rnf2k6ncsj6c5rwhsw7wc";
 "fonttable-1.6c"="bljjiigal2igv0y004hwa9i1yc9i4b3d";
 "fonttable.doc-1.6c"="jssz79rldva4rmrziamjqi1krl4yijan";
 "fonttable.source-1.6c"="h3g6s458yvqsrlf0h7d8046ngi10698y";
@@ -4521,9 +4718,9 @@
 "footmisx.source-20161201"="m3510nfdmbc96v66r54ikzkfcfffrxfg";
 "footnotebackref-1.0"="8c8gdjzn36nfxjmpn521548334gbn86h";
 "footnotebackref.doc-1.0"="fzjm17j06la934js2q0sn92l5d8g5z1i";
-"footnoterange-1.0b"="rwxkjfzlwnkci6wxhkb0fppkqc8sb226";
-"footnoterange.doc-1.0b"="c5nd33ha0bbyw53d9d7pqx68l4xl691m";
-"footnoterange.source-1.0b"="hsn4s3qzy592w2d27z8hkzpxy9j8cz1q";
+"footnoterange-1.0c"="488i0ahfgp8myja7i0z7cxn61wlqdb52";
+"footnoterange.doc-1.0c"="lvi0razyvdr1cll474cb4mkdyk62nz91";
+"footnoterange.source-1.0c"="6z89fiq5iffpdapn50jqagmcrgl10jby";
 "footnpag-2019"="ym18m0gmmk7800dd1c4vrar53q66hm7g";
 "footnpag.doc-2019"="8kar3xxxjlrsjascd28122y5rckyv5lf";
 "footnpag.source-2019"="51nmvyy96mjbr46ar058jb7jhpsqz17q";
@@ -4624,9 +4821,9 @@
 "globalvals.doc-1.1"="2pdq5ik88cr3z5x9j5jvqz1k6abkllm4";
 "gloss-1.5.2"="xacfn3b2z30pnj9lwh6mximrbsfvarfs";
 "gloss.doc-1.5.2"="4qial5a0p7ip784xgpqgkl6cmabd9hlq";
-"glossaries-4.43"="5v3d0s2n7hn1pvp5ip40j077kywjaxkf";
-"glossaries.doc-4.43"="kdz8v10i2x358dxnsx0n2bb2q6ajv024";
-"glossaries.source-4.43"="dvidpd8v5920dr7j81m12v0k2xiq80f9";
+"glossaries-4.45"="nw8b7c7zzrkxjwrgxn38xgwf3fkxl223";
+"glossaries.doc-4.45"="h6h684jjcjppk0k7jh6vnw9jkj16qi8b";
+"glossaries.source-4.45"="d1w2xfn501p0kyrdimrhj39fx0ms2g7p";
 "glossaries-danish-1.0"="hmaay0viwacnrz7bfz6xlpb03cmsphcc";
 "glossaries-danish.doc-1.0"="mxgh9b6vc63llhmfildmhkhjxd1s9kbq";
 "glossaries-danish.source-1.0"="s5ayfh10z40cpi9amn2d1wwpnby0qgaw";
@@ -4639,9 +4836,9 @@
 "glossaries-estonian-1.0"="3flqr7abc4hqy63p0bdl0bz0y04mq07s";
 "glossaries-estonian.doc-1.0"="dd2rrp43ix2hcwnrgcidfr8z0shsgdds";
 "glossaries-estonian.source-1.0"="8y8x5qqydmnvjf8nbbj8qj550kbvddg5";
-"glossaries-extra-1.41"="i1lsazwr25z6x51xmxccc5bx8gjvis6s";
-"glossaries-extra.doc-1.41"="qjbl4kpgkxylq5zvki1zi3z4xkfmhx60";
-"glossaries-extra.source-1.41"="0ymb9lrspig48ahj6a9qsapl1rnz5fxy";
+"glossaries-extra-1.43"="8c52kxd6al3blj6wyh2n0yl99zzv23bz";
+"glossaries-extra.doc-1.43"="5n435fcxbysbmwbqpj7dx0rp9iib4y5r";
+"glossaries-extra.source-1.43"="pjx2fh7klcy7si8lra3fjbnzmvmq1il9";
 "glossaries-finnish-1.0"="rq7ymhc4ispv4j1zpv5iy6mbn66wr3j4";
 "glossaries-finnish.doc-1.0"="f8rj41dbpqrdxbl7h94rxnbiqm77xcj4";
 "glossaries-finnish.source-1.0"="gnj8dlxpzapvi9yvzy04rhmrs5z7hmid";
@@ -4708,9 +4905,9 @@
 "grid.source-1.0"="pr4xl73p825jibzhj2h8i4f6f0lbrv2y";
 "grid-system-0.3.0"="a2b7690j7d03zk4d4yzdr2nwjm6bm7sw";
 "grid-system.doc-0.3.0"="qddlxnpnyjjjv1z1irzch3ypv2amlb9y";
-"gridset-0.1"="3cnrwcpmlby1i8b2zxx8hwjrqjs0ylbg";
-"gridset.doc-0.1"="yhwrqdv5rcbxm0j9lanm6x5g38mw8amc";
-"gridset.source-0.1"="bb1kbccwzc806sc9sp7b3dgp0flfamrb";
+"gridset-0.3"="9rs8ssnws7hv6ppyizsqgxip36yj3yp9";
+"gridset.doc-0.3"="l8z8l00qhabaxbrq979yrrkkvy5dxnwv";
+"gridset.source-0.3"="8rwfg7mylrv2cq277769k5h4al2mqz8l";
 "gridslides-0.1.1"="r9lxxzf51dpfaprn6kvv3n1j9hf54xa8";
 "gridslides.doc-0.1.1"="jkri2k8k8nzvchpk11pgig98kw327c3m";
 "guitlogo-1.0.0-alpha.3"="g0knkg1x7mlgc938ydvdk93hcr95nfqk";
@@ -4718,9 +4915,9 @@
 "guitlogo.source-1.0.0-alpha.3"="ckrba60qg0xhgrp3jdvpgywx224m83vd";
 "hackthefootline-2019"="kih3c9nczylrh74x0vc4m7g4bzahps5v";
 "hackthefootline.doc-2019"="vp6qn8s2g5d34v44anyr2jd5c0l5b4nb";
-"halloweenmath-0.10a"="mr8nvi7ynzngvgxp0i74wjkxwp77i7p0";
-"halloweenmath.doc-0.10a"="xamcznycdz08kgvbph8pi64h2v9j9j25";
-"halloweenmath.source-0.10a"="hr249rdkmmkm1v7z4cf7ymdwrshz0by3";
+"halloweenmath-0.11"="mz0f21y810b3vfcpm6z8fwcjbqwdapha";
+"halloweenmath.doc-0.11"="124kqyc9ls79pm11w1cjp1705p84l4pn";
+"halloweenmath.source-0.11"="j0ld7v0za7pvrl5qwarilnjwa8lw9r2b";
 "handin-0.1.1"="gdn6by4gg87043wdz597h9mxr9rzj4jn";
 "handin.doc-0.1.1"="xybg0ai1im3595s07039sklcjbqjdfnz";
 "handout-1.6.0"="jz5qp5n1dij11nyrgmb3x4rl41mnggyl";
@@ -4752,6 +4949,8 @@
 "hitec.doc-0.0beta"="c635j2194izgji0aqily4ha7slkzghkl";
 "hletter-4.2"="mq30k7g1v6cwmcfyizfzy3hmbxa74p5g";
 "hletter.doc-4.2"="rz2hrha5xf10050hfnm05r6f4b3mx53z";
+"hobsub-2019"="cx2wdj7vb13012mibaxf3f9q8vxws8n5";
+"hobsub.doc-2019"="2fc3l968q2awmd9974h07c98f9r5hkdk";
 "hpsdiss-1.0"="9hca9lq9r7zs3frqj6lk6hybkpgcdfmb";
 "hpsdiss.doc-1.0"="2mxarcx6cm2v2bsab8gr7ks1mj5danvl";
 "hpsdiss.source-1.0"="k3k828ddx8vv2sr8lw644ny3z5kcl59h";
@@ -4760,8 +4959,10 @@
 "hrefhide.source-1.0f"="42s1cx0nwj58cfhb2d22nsdqzidknwpv";
 "hvindex-0.04"="90sdf5j0a5qr2xp8qzryrvhnsvaz4fs7";
 "hvindex.doc-0.04"="9r6a8mfj7y9kyc2dbc79vf86aw73n6l0";
+"hvqrurl-0.01a"="sjv5nl58p4f2dmcgrfdlka2z64ddljwd";
+"hvqrurl.doc-0.01a"="1hyqmdrglg2m72285vpszfx2v5mg4zby";
 "hypdvips-3.03"="vpmmrcrilqybs4ifvd927jlkn5ip28c2";
-"hypdvips.doc-3.03"="85viqi36j6kdsbnpvhf6a4wj2vjks42c";
+"hypdvips.doc-3.03"="flvlp7a268z3pzwh0jpl185k3yifzap0";
 "hyper-4.2d"="xpwylfxrx74x9aw96ridad40im7xanw1";
 "hyper.doc-4.2d"="fcllxx04lprzhbna8rk4ycwbw0w6xnq1";
 "hyper.source-4.2d"="v03bmxbg7hqjpl8vfp0l8z81mi2db2hz";
@@ -4804,8 +5005,8 @@
 "imakeidx-1.3e"="vgspaw7w4kjbm38vzdga08j12aaqf3ad";
 "imakeidx.doc-1.3e"="p39pl4z0xkr2029czqq9nkaxz3dwdypx";
 "imakeidx.source-1.3e"="cn51y6d129cc0kzw3yx3ybziwmxy9mbs";
-"import-5.1"="7i3h4z647jmm3scb0nringfljzk9vv6z";
-"import.doc-5.1"="0sl784aip6r53fdas8xyqhjz5vcs6xpd";
+"import-6.0"="r52gkgjh1szydkybvydkb8khl71nxbng";
+"import.doc-6.0"="klm57iym1w8n6w205bpljzavmrzijp1w";
 "incgraph-1.12"="n14gyn5g1am9dyfqvxyxrqsfxdkg39xv";
 "incgraph.doc-1.12"="sp235w68gh5k1d4xg2cxv7dadyjwqyiv";
 "indextools-1.5.1"="sb2fdlrh7xlfhd61g9n3h3s9if9n6wm0";
@@ -4816,6 +5017,9 @@
 "inlinedef-1.0"="x9ayxzl60mwgv8w3ispv1xc3qxwylij4";
 "inlinedef.doc-1.0"="g5fqhrp1vf6pky2wq3bq1hd2h0jrml8w";
 "inlinedef.source-1.0"="c5qr2b5029bkpgqhahv4licfp89l0k9v";
+"inputenx-1.12"="8whv0r3zbj4ay09z2xr2dvcam8lm64x1";
+"inputenx.doc-1.12"="3pmxvaqzq3hgl7fr8m5g04lsjnrzkl47";
+"inputenx.source-1.12"="r7k27qlwzr1mnbirkgih5x4rcbyyi4fd";
 "inputtrc-0.3"="vmk80jzg9sllpw28csmhsyjd13amp567";
 "inputtrc.doc-0.3"="dl0qs37bjj4aam7ijfdg64fpl135k7b4";
 "inputtrc.source-0.3"="1nx2jv4m63gc83iy3qp46gxr3v6wyw6h";
@@ -4866,8 +5070,8 @@
 "iwhdp.doc-0.50"="wphgycl74db9mxr5gjc2m80rbzkcqk3l";
 "jlabels-2019"="fw5il0bzwm10lj1ly8fjic2hjiqxnr7d";
 "jlabels.doc-2019"="fndgg419y1rp47d5qifv0k304b5iymab";
-"jslectureplanner-1.8"="il4ypbggr4s3kmmkk8rl3r9vjii1vq5i";
-"jslectureplanner.doc-1.8"="45ngl247v51dy6ikl597xj27rsmys39r";
+"jslectureplanner-1.9"="f94sm4q6an81qf3a91z7mlylkijag3l7";
+"jslectureplanner.doc-1.9"="f3gx2fmbmvzhwcpbl1yp735l3zs69mvg";
 "jumplines-0.2"="acxl8nhlznvcwq20n01b41kamc5xmqdr";
 "jumplines.doc-0.2"="hjfl57a9hwdyf6lxl6ah0k7937r03jil";
 "jvlisting-0.7"="fi23ykvl6kw34qri5nz2k4mvgjqgbbyl";
@@ -4897,14 +5101,14 @@
 "keystroke.doc-1.6"="rlm1i14lgk00yj7hn6mp2njdmjanh1q0";
 "keyval2e-0.0.2"="cbm4pby81d33ldf01h348daihf05hwd6";
 "keyval2e.doc-0.0.2"="7d1mpnzh474k9pc293lh8v94fmy5x6gv";
-"keyvaltable-2.0"="mzz0z6wwf1z2xqf1lpa6fnqr8zff2km5";
-"keyvaltable.doc-2.0"="8n9am1ijk6rjgq4yjn1zk1ijg7n1djdk";
-"keyvaltable.source-2.0"="milc53qz2f6bs1q71w1sd399sc2hzgf4";
+"keyvaltable-2.1"="xkfix0sk2nnjq7nr5x4vj1jxyav5hyg1";
+"keyvaltable.doc-2.1"="jjjgxbjwsadsdhd38nz22ky9dzz95yki";
+"keyvaltable.source-2.1"="kp7rzgg6p0mh8f8xwdgw60dppb7xyjcm";
 "kix-2019"="lzdrca007a0r5rsm8f14ljx6v8yyg8xz";
 "kix.doc-2019"="jallvk311vqcjc3wrkxqv03ckbc9k1gi";
-"knowledge-1.17"="jzaf04vppnpbyv7qm5wi2nbbbinzpidd";
-"knowledge.doc-1.17"="s9nfwj0hsd89pff5fck07415nmwjrw49";
-"knowledge.source-1.17"="nm6k8ka3b31n1s5qpfb345glvckh4zi5";
+"knowledge-1.21"="1x9mi6w3mb3lzshkwkmxw3nh1y5brz5v";
+"knowledge.doc-1.21"="raaxfqi8bkbj1j3xawl7x9d1j7wrckj5";
+"knowledge.source-1.21"="11dhy195bi5q8lbp40kw0dp0lw90b2k5";
 "koma-moderncvclassic-0.5"="s33qvgji09s9glq93mdxzs3smnzlamv5";
 "koma-moderncvclassic.doc-0.5"="dvzcb032fmh5xs804d9mbx6q0afm25r0";
 "koma-script-sfs-1.0"="s9dryf4f0zgcij3v5v93zppqs876p2nq";
@@ -4918,9 +5122,9 @@
 "ktv-texdata-05.34"="fdwnms9v43cjsjypsnlq6rw1j3c6zz93";
 "ktv-texdata.doc-05.34"="896wnbqpxncc640x8rsi6gia2wh5njxg";
 "ktv-texdata.source-05.34"="7wq3pi1mm3r1g209vq31im4n4ib21zv2";
-"l3build-2019"="8wc83ggd24fk8v0bz9i9ivsqm4qi3gyc";
-"l3build.doc-2019"="6616ck8x996xzyzglkb19yxlpcwhz277";
-"l3build.source-2019"="3r6xmyyxx377qaymni53x9my9jlil96p";
+"l3build-2019"="nymjvw7lg984ks8xfp166554k9ddpjdk";
+"l3build.doc-2019"="w423ibyr9z6sqc60inh1sx01qb5k03qg";
+"l3build.source-2019"="q9y8dmsd4lvr69qwlm6nks2wwivb5xh3";
 "labbook-2019"="x7i28cyfski7ssm9hv28zrlac3inky0c";
 "labbook.doc-2019"="5qs95wc8ms4162nwd7q4lvh7rc62s2h4";
 "labbook.source-2019"="rrybnds4laxyariqq5c2sh1zm9jzvk7f";
@@ -4938,18 +5142,19 @@
 "lastpage-1.2m"="i37ji3jp95j287rx34q4yajih7w1riy4";
 "lastpage.doc-1.2m"="jc40pwdbysv03k1wx113f2q0j8xf54dr";
 "lastpage.source-1.2m"="gika2qk64lahh4l6c6pn76r5l57rspf8";
-"latex-amsmath-dev-2019-10-01_pre-release_3"="w0zy9ffcyvsy57nxzljs8sbvpg81nyrj";
-"latex-amsmath-dev.doc-2019-10-01_pre-release_3"="rns9wjinm96w81jqws8vm8vh01gbcgxc";
-"latex-amsmath-dev.source-2019-10-01_pre-release_3"="vkxw7zkbaxm8ckhivs6x7s6k67janhla";
-"latex-bin-dev.doc-2019"="p4hj5yxinc2kx0b2nxr0k6ilp2ff68m3";
-"latex-graphics-dev-2019-10-01_pre-release_3"="cr3l1n4pzgpnasvww1fsjrwkys9vbi5s";
-"latex-graphics-dev.doc-2019-10-01_pre-release_3"="by2x3v4sj3q3x7d6ikh4qjcnbg08ijpb";
-"latex-graphics-dev.source-2019-10-01_pre-release_3"="pcgrxh27rqadh06cmkb93km85pni9vi7";
+"latex-amsmath-dev-2020-02-01_pre-release_1"="9xjsd2xrwrsb9773gcyhbdx6iy848f88";
+"latex-amsmath-dev.doc-2020-02-01_pre-release_1"="hhz4qwg94jm0z4dwz4fdzgwdz9wfzc7w";
+"latex-amsmath-dev.source-2020-02-01_pre-release_1"="1vbdbglb2n7b1xjsy23c4mk083r5vzdg";
+"latex-bin-dev.doc-2019"="82mrm2257yhmsfy0azcraw0b33w6z33h";
+"latex-graphics-dev-2020-10-01_pre-release_0"="isbv5gplj6ygqfm0l34f7am4l53ifv4j";
+"latex-graphics-dev.doc-2020-10-01_pre-release_0"="yz0v1q4w3blh3gf0pp573qq3wqkjb2sq";
+"latex-graphics-dev.source-2020-10-01_pre-release_0"="3j1xwzxszbxbvagi240vp12k2zpaaawz";
+"luahbtex.doc-2019"="008csxdvdaaqygzb7rvrhj6vwhwsx4lh";
 "latex-tds.doc-2019"="m38f5gncr9c56sg2cjs0mfgd57wik7pd";
 "latex-tds.source-2019"="xdigsidx76bs121jl0m42wavzf4y88qj";
-"latex-tools-dev-2019-10-01_pre-release_3"="v5mx5x2aaira12nv4kr81sjnjfkc5hzi";
-"latex-tools-dev.doc-2019-10-01_pre-release_3"="1k8s4liivw1mgrvkvf0jbmcj2kcd2p97";
-"latex-tools-dev.source-2019-10-01_pre-release_3"="r6rm1vjpnfxpzpqvq89flj6lnmf34z63";
+"latex-tools-dev-2020-10-01_pre-release_2"="ajsd6fzsaqrw326bn22v641b0ypy9cq6";
+"latex-tools-dev.doc-2020-10-01_pre-release_2"="r8a8zw5cnr46sjqzvz8qixmpib27a3d1";
+"latex-tools-dev.source-2020-10-01_pre-release_2"="mq8c5yhgxrcx52d65ac4mpxcm6agpjzy";
 "latex-uni8-0.03"="kh4gfpkynq6f2aqg9r3wfp4b75wd3zaz";
 "latex-uni8.doc-0.03"="qany361f2byfy4p1jsbwr4za45x5j74a";
 "latexcolors-0.1a"="0izwkzw8h2rqlgnl9dsn2zwm0z2wczch";
@@ -4981,14 +5186,14 @@
 "leaflet-1.1b"="jaqjjxvh2wb6bg7c608cn6rg9d67pkv4";
 "leaflet.doc-1.1b"="5vgkqz1bw0qlxzz5fczsqf873dqsq50g";
 "leaflet.source-1.1b"="l8g4n75f5d85dj4mfwbrc19bh87jzr81";
-"lectures-1.0.2"="gxziq0f4bcy0q1r02gqc3z63z918mqz9";
-"lectures.doc-1.0.2"="93h48qv5h0c9g3v4ga95d3cmcml595qr";
+"lectures-1.0.5"="vxrkqjn0y0lqgxp2c2ms8xxwhv8y7dmw";
+"lectures.doc-1.0.5"="93h48qv5h0c9g3v4ga95d3cmcml595qr";
 "leftidx-2019"="d2q1jibnbyjk72phsf6yj7nxj9l37fvh";
 "leftidx.doc-2019"="db75s45b0v3lqkw9dx09m7zs7zhmng7y";
 "leftidx.source-2019"="whmdclngd2dpahpsmz5s3rahk1bvf7sq";
-"leipzig-2.2"="d4y64gbg2q9mjk2jqz46gqci27vci5lv";
-"leipzig.doc-2.2"="k6ba3ddz4vbnpv99g8nvfia1gj12rib7";
-"leipzig.source-2.2"="ld4r216825mz68j1yz211xlrmzfgblpy";
+"leipzig-2.3"="id8f54infbs9shqwa8hskvy7ddlhih4m";
+"leipzig.doc-2.3"="qgavhs4pkjnqngv80fap4kla1bn4jlvc";
+"leipzig.source-2.3"="9byfkxnccdl5yab8p64f72b16gyqi2vx";
 "lengthconvert-1.0a"="7rfvx4n625g3rwinbxci25b0xpxrb2sk";
 "lengthconvert.doc-1.0a"="ngl9jfvcplmd9z7kwzfd90m45jp9lbpc";
 "lengthconvert.source-1.0a"="r2lh184znd42l741g816y2ljrsrbncha";
@@ -5020,6 +5225,9 @@
 "lisp-on-tex.doc-2.0"="ppwjpd8djndd49xh2faspmpial9qy8b9";
 "listing-1.2"="y8ymrx2bxzhz1l0lkjb2nhk6j97q9v09";
 "listing.doc-1.2"="i5bgnc303kwqnzkxr7yn0938y0h2nwpl";
+"listingsutf8-1.5"="6ayxygaxw5vyifsbcgraq4mrnv76nznr";
+"listingsutf8.doc-1.5"="m3qzlkyaswr9pkc5p63is3f7ipncdrq2";
+"listingsutf8.source-1.5"="cf2xbkbjpryr1bljm761g7ppy2bb90kg";
 "listlbls-1.03"="hmdaqr5466rlpkkrq78d4p5rfzm4fyxa";
 "listlbls.doc-1.03"="gmdiwdbadf66b6cchmxv1swlngdw6y5g";
 "listlbls.source-1.03"="8l3lzr022qmx9pw4jgp1n2fkacyl94vb";
@@ -5087,14 +5295,17 @@
 "ltxtools.doc-0.0.1a"="hdmpfrkdycgs0qh3mcxgydcscilacfr0";
 "lua-check-hyphen-0.7a"="9lmqby4bc5pcfbfib7f45742x7jcxjmx";
 "lua-check-hyphen.doc-0.7a"="36n5ni2jzkydxwi4x4akv21109y0qmsy";
-"luatodonotes-0.4"="pn42k5rx83hibk0aayaydb2z0zkfi1al";
-"luatodonotes.doc-0.4"="9615fx7r9nlvlld7jn47jlgb380jmrxf";
-"luatodonotes.source-0.4"="k8919986lx5jwq3qmwyjpg62qjjpa9gw";
+"luatodonotes-0.5"="wxsysgg9ss4jqddkxbff6apfbd2840i1";
+"luatodonotes.doc-0.5"="w6d1nala52b88rhchzay618gd64nf2jf";
+"luatodonotes.source-0.5"="0i7332g3mmg7cpk3g6i6432xpq2jcivz";
 "macroswap-1.1"="19xdcyrfd1z77ld3isdzxjhvsijifmk3";
 "macroswap.doc-1.1"="dkpw0kw0a0d8cwp237xy5c1a9ab0s0p3";
 "macroswap.source-1.1"="wirvpfkv8zjyqghlabclnvnmb4w8i2rh";
 "magaz-0.4"="zd02izsnb56wz1wcfqfj6p9p7pycwd3g";
 "magaz.doc-0.4"="cdylbzidxq2abda3np8ia16m3lbga9w3";
+"magicnum-1.7"="9i8z8xih80aipni912f8ya9xsd52br84";
+"magicnum.doc-1.7"="q6m07x41lq3agmgb16y0q4kz8bx015l2";
+"magicnum.source-1.7"="gy4vhdgvbz1cwgxj8frx2zf825avg3sq";
 "mailing-2019"="4v4vxr5i84yphwj7ff6s3vi0n2wx1jaj";
 "mailing.doc-2019"="fw87jd6gkc88g5a5z17gm7fw3nk6pana";
 "mailing.source-2019"="1zmcm4sg1p3vlgb76yf7gz0ds1958s6b";
@@ -5120,6 +5331,8 @@
 "makedtx.source-1.2"="blsivri3lnfa4grmk46wxlr2yz87djb4";
 "makeglos-2019"="6bgdfjbhxvfj2my954iinjp1xcxnyq4s";
 "makeglos.doc-2019"="g4w2560v1pxm38dj5dsb3irgijzh221g";
+"makerobust-2.0"="hx1305cr58cjaasg8l3z9p9d3pc49wv1";
+"makerobust.doc-2.0"="p6bmljy05xlknijnbfbyqz8v0af7m1wv";
 "mandi-2.7.5"="bgfn2zpydmyjpm0n2j78szn4nkkqnksh";
 "mandi.doc-2.7.5"="72r085a0f5nrashgm2xjf5p6ba35c9cd";
 "mandi.source-2.7.5"="baa7wn0s0z61x610jb45s48l31bf49cv";
@@ -5144,17 +5357,17 @@
 "markdown.source-2.8.1"="33k7j1wd4xa734dirk10hnr1mnic27m4";
 "mathalpha-1.13"="wig82v4kfp76z48x8ipcl3i6p97j41j4";
 "mathalpha.doc-1.13"="8zibbm7ga8nk6dcbdvgp3f4xw13r19ml";
-"mathastext-1.3v"="161mdckabl225lz8zx3brlmqj6cil7fw";
-"mathastext.doc-1.3v"="vhrz7s8n2j5hibbi7vhvfccgd3n0jblc";
-"mathastext.source-1.3v"="x3xdyvnjld16m2whcxicd5xgisgwjnnc";
+"mathastext-1.3w"="ni9zvlwrjncws3485ix1qpdiywnnqmpr";
+"mathastext.doc-1.3w"="1afwhd8wyzxs9i0w6n2vzwx1ahfkxkdk";
+"mathastext.source-1.3w"="91l6mmy7hhlf79zc4bq69vgsrlm7wf4m";
 "mathexam-1.00"="4rhl11na8mqzbl9l7wjk53fdhdpzbgih";
 "mathexam.doc-1.00"="7bhcdnalaakml3rx50sgb0799b9883cp";
 "mathexam.source-1.00"="mcs3csvr3ayvjijs6sh67mk0mrp5zawc";
-"mathfam256-0.3"="287n8w4s9f9mhsk4p0cqr37kyqnf1p7c";
-"mathfam256.doc-0.3"="7sw3j4828k471777g3d0k6yqdikb0kmv";
-"mathfont-1.5"="a3lyw4n90ss5ylg91al5xxzk329nssh5";
-"mathfont.doc-1.5"="vkq2r9ayv1w3jdg7nd84v7v9mj1irg2b";
-"mathfont.source-1.5"="w5ggsvnqi8gmdc39163066p9kzd7ra33";
+"mathfam256-0.5"="r9fkq651jjvlx222cpdhfz6p8a6vw959";
+"mathfam256.doc-0.5"="19v892aw7w93x0fcbnirvg3d3z35p51y";
+"mathfont-1.6"="nyjwlfahrkds5qlvgvmvr5xljhd0m6zc";
+"mathfont.doc-1.6"="4rx7sqkjhp31hysc8bz9nmiah1a4bsc5";
+"mathfont.source-1.6"="cw0bm3f3ykacs3mcxhdwnl6dj13qyaps";
 "maybemath-2019"="b7n8bgmz0vizghas19svaf1asi7633ck";
 "maybemath.doc-2019"="7scmh5q3xpjd6gdlq07kf59sn5bbflxc";
 "mcaption-3.0"="bxgcc1lkr9p5ghd80mh2ixnc1g4g49f5";
@@ -5172,9 +5385,9 @@
 "mdframed-1.9b"="kc60c77k0qwqhdmpbk3r777k4q857jx1";
 "mdframed.doc-1.9b"="pr5d7iqc4akn0arxjl7ynqsl6dlh64sy";
 "mdframed.source-1.9b"="xnqih0l0zng5bmrjfrprr43k6l645kvi";
-"media9-1.03"="zkpx9kzlnm5bq9xahz8wi7iyfvbdc9ai";
-"media9.doc-1.03"="i4kyv3rsv14mh2irq1rk67c9b18a0br9";
-"media9.source-1.03"="mimlnbnnii15jzfyj0lc7qlvqh1yhd7a";
+"media9-1.05"="mv201h1h0cxm5lq3xlms4i191zqkllbh";
+"media9.doc-1.05"="jx37gfxihxmc7lgq9acsi7fjz7dlza1c";
+"media9.source-1.05"="5gsdjfrriq5c76pwmzwappghcbx0asnv";
 "medstarbeamer-2019"="vplzcqcrgag8dvin3yj0prlcm9gsb2yh";
 "medstarbeamer.doc-2019"="7i4skhq9pj4k3aswbzbpjqqgdj0s69gd";
 "meetingmins-1.6"="d5x8znpkqcghi9lv4gby2l97smw6kddb";
@@ -5196,6 +5409,9 @@
 "metalogox-1.00"="4xl37x2ng2chj7ds59rjkapvmk3fza5q";
 "metalogox.doc-1.00"="wk7qd75laf3wm5wqil70vsrcg1ch6q4n";
 "metalogox.source-1.00"="8yal3yny31s95vd72p10mybmkx7n11xy";
+"metastr-1.0"="zgxnrz7iw3zpmnzq0p046smwh2vn956q";
+"metastr.doc-1.0"="az3sfd2bg56l6ga0wzdbmzpb1c82b9ig";
+"metastr.source-1.0"="mjvy5i08fl91g6vg8i2wkhjwxi783qng";
 "method-2.0b"="6lpy1619i1m75cvsi9c2vzjxbcs9ia5a";
 "method.doc-2.0b"="c54snw0hl1agj2fs4r3jqnk9gblxpvhp";
 "method.source-2.0b"="y3rnwdcn8d1zs9s74nsza1zscmfbskq5";
@@ -5237,6 +5453,9 @@
 "minutes.source-1.8f"="w4skq6nprvgxhvqrf4xa2afccr1hsz6g";
 "mla-paper-2019"="7rh7dh7mzybc5wzzbibh1lc10kyc99p8";
 "mla-paper.doc-2019"="3csgrsb6bh3sbqdzfx6y84i7ph8lwnhc";
+"mleftright-1.2"="djj8n1rrxi3iyj5zxm4y5lwnbrzq3vb9";
+"mleftright.doc-1.2"="krkpm7kc85q5hgb0vzvvx8gxznpr79d5";
+"mleftright.source-1.2"="mfllc0rhh6x67pg9qxr5wpbhazzg75l9";
 "mlist-0.6a"="5yh180f4d4dsrfzin6cjmshad8w7fi6g";
 "mlist.doc-0.6a"="wqscsdlyx7zqyq1g5hcfcp0cs5w5dxxc";
 "mlist.source-0.6a"="hlnmvms7n3csa2v0ixwz82wp2dlc7jy1";
@@ -5345,9 +5564,9 @@
 "nag-0.7"="zvdfnz7z0rgwmf5vpj3dg7l0p8xwaxl0";
 "nag.doc-0.7"="r9gmc719q62qdim96mzw2sm98vwxsdip";
 "nag.source-0.7"="rybplddhj3wzplms9knly5b4fpkny05d";
-"nameauth-3.2"="8mchkgj0v2f3qcvrya80vbx2c55gwjcq";
-"nameauth.doc-3.2"="hq4wywajcb2h28zy4alj8di8ap12c3r0";
-"nameauth.source-3.2"="g1p0ddh1x8g4w2qwc5kvj3p92g8s3js6";
+"nameauth-3.4"="7vf14i5aid38msdp6kxfmpczkbza48qa";
+"nameauth.doc-3.4"="b5hybqfylxwszjll75c651a8k5235kpx";
+"nameauth.source-3.4"="bb0bbr0635mpaiarr54dwmaaavfbk63h";
 "namespc-2019"="6f7x6ldx008l8w5ziahgwl42hb5bws4k";
 "namespc.doc-2019"="6aqpn007i8s488j4qi8xhbx9zsyvafbs";
 "namespc.source-2019"="s5ws2rny22j23bqy5cn2mz23qn91ssfj";
@@ -5393,8 +5612,8 @@
 "nidanfloat-2019"="f9691yflmmv0ziyfj4a65b186gj0ppn3";
 "nidanfloat.doc-2019"="h468vsrcmc06awhvkg8f3bgmc7dwsgy1";
 "nidanfloat.source-2019"="x92x0jk3ab50yd3gyjgqyb21iq0v7g6h";
-"nlctdoc-1.06"="2k3r9a400asfix3n8j3f7lgghr57imrb";
-"nlctdoc.doc-1.06"="3axalhgmiz8f9rikjwbkhckw0hshnpyk";
+"nlctdoc-1.07"="z0azj8lyhdf45sa4vy172qlzck58vvic";
+"nlctdoc.doc-1.07"="3axalhgmiz8f9rikjwbkhckw0hshnpyk";
 "noconflict-1.0"="df9gs1xx7gymaadn2ji4dzir36z6r897";
 "noconflict.doc-1.0"="irvdqh1iyghgs73l3lv2jnrs2gj9jxcd";
 "noindentafter-0.2.2"="w1kg4gv0dpfak1s7xshs04ariccpnx0q";
@@ -5404,9 +5623,9 @@
 "noitcrul.source-0.2"="b8s8g15qwdsxm7ywvgj9g6307ws3hg0d";
 "nolbreaks-1.2"="1603r89wi8sninjv541na8k2islfk4sc";
 "nolbreaks.doc-1.2"="g0nm3i09kzxqqcrycrz2cak05d8qlvqs";
-"nomencl-5.2"="lad6j1wj5z0wibwn8bk1b8sy9hxrb06s";
-"nomencl.doc-5.2"="v9xv6v28mgs3nm7lhxa4xpyq4fkg2zza";
-"nomencl.source-5.2"="g5x54n8biskic2bwiwbwxpb45grxvkrs";
+"nomencl-5.3"="n794jld9gxx4y47csqh974qbkg92g6db";
+"nomencl.doc-5.3"="lbagmc6yigwvnprjivdkbz4h3jq33li7";
+"nomencl.source-5.3"="0fg5mm5yzmyaba8fffi0fff4drzyinlb";
 "nomentbl-0.4"="k74vk3a9kl3sbrkmpyav1snh0cd16np9";
 "nomentbl.doc-0.4"="k2ggwchfqa253i96whp2lh4s3p8vbysk";
 "nomentbl.source-0.4"="al9s24x1ivpw91bbnn9sqrjp3rb5h0ni";
@@ -5453,8 +5672,8 @@
 "ocgx-0.5"="28p11v602hf9w9q1vynbf8fyhivbawl5";
 "ocgx.doc-0.5"="6vx8iiz0zfipwj45xrk1gv9cvifv4y1r";
 "ocgx.source-0.5"="5bm25s1rgsky2qc14nrgg6v3n0ywwcb6";
-"ocgx2-0.46"="sq7aihaxiwh0p6dpqay07a4li1sjm6fb";
-"ocgx2.doc-0.46"="mz25ry3c14482d7j33nwsxlx152fyaww";
+"ocgx2-0.48"="7634zxbbk43ci8in9jjm1705har1kxbq";
+"ocgx2.doc-0.48"="qcq15rj8ma0ixmk22f1iv9mhbn7cravs";
 "ocr-latex-2019"="7mi6izsnwk6dksgmscyn45w72n1bgk2h";
 "ocr-latex.doc-2019"="9cz06542a64k4ns92qgkx1hzm5sd275w";
 "octavo-1.2"="fpv1fcrym9gplxjs0zsrrv4iziizqzxy";
@@ -5486,9 +5705,9 @@
 "outlining.source-0.1"="miidkl85jpy5y6a7n71vilxaissip8c0";
 "overlays-2.10"="gywmsz5lbrp1jz4lp21gdb1s01ggsdxf";
 "overlays.doc-2.10"="vyz8aa3j0hgh7yjw78y8ng5xnsy4qczz";
-"overpic-1.2"="67w43jhskjyniifmjd1xk822zvwxh1pl";
-"overpic.doc-1.2"="3fhl4fi2gaj1jkpjps0s2py83bm8lcg6";
-"overpic.source-1.2"="6cbdphc1ly03k3wmqjkyzjm2px233c8a";
+"overpic-1.3"="jh264pgfn17jgbmy06g3wb6vhqgifqik";
+"overpic.doc-1.3"="0158l132my7sn1nmgwxnzfkp2gxpnzm7";
+"overpic.source-1.3"="v5d34dvqfy5s3m77q444rc5naav55rig";
 "padcount-1.0"="am7s242sajkic0xz62kd1blgvbssgymr";
 "padcount.doc-1.0"="790smfw5i39mn1i8kfgd1dq14mgc3v7w";
 "padcount.source-1.0"="1p1pl9s3cdjjd519w8djbx7wnnl6sszd";
@@ -5528,6 +5747,8 @@
 "paresse.source-4.1"="ydzd3zya07nc2kpvq3w1bjg5nbq4l37z";
 "parnotes-3b"="42sal99phkqbw05k2d9x6by27iy7sc7j";
 "parnotes.doc-3b"="3hlfpf75qjahy1qzc8l3dl1n8pj323pm";
+"parsa-1.1"="xidmymf9dpzagbip87vik9svm11zbahq";
+"parsa.doc-1.1"="gf1lxfyl2p6m9jx30dyarhx1cqgs4jn9";
 "parselines-1.4"="krgfsp0vcnpgwgw70aw8iwbi9r9fnwsm";
 "parselines.doc-1.4"="ahspn4rw6wdwlk9sgd8f2jajb2cbm33n";
 "parselines.source-1.4"="n652xalrpp0s7yy0dvcdz24khybsm1cw";
@@ -5559,6 +5780,8 @@
 "pdf14-0.1"="nc5xwg94y7na253fjpk9wv8n9qvsk7b0";
 "pdf14.doc-0.1"="lr3ls4m5rz8fwf37j5zw6prrn5kd4dkf";
 "pdf14.source-0.1"="0y28fgs01xpfadwxc3bfq8y42vh87jkf";
+"pdfcolmk-2.0"="6m1aap8lggxx6116q606mbs6frlghycp";
+"pdfcolmk.doc-2.0"="zp4v32b6s8g1myj9kkh0iz2h8j1pb8zc";
 "pdfcomment-2.4a"="g8bnzph5s7ihl4h1y5s9bkrkgj82yi96";
 "pdfcomment.doc-2.4a"="9x3yh17abc7inrf6nb45gk1cvg78gw5m";
 "pdfcprot-1.7a"="qsbfyac2h2qqbk805q72v4v8vpzn3myp";
@@ -5566,11 +5789,14 @@
 "pdfcprot.source-1.7a"="95cr49yywd59mcyj7qvqkfc9bhj63hxh";
 "pdfmarginpar-0.92"="pra0y1df005b6br3n93zpi7wrvgk2h6d";
 "pdfmarginpar.doc-0.92"="0kc0dgfq3mmnwy3xs79gjmxkkmmfl5l4";
-"pdfoverlay-1.0"="chlr6244jp83vwz6parhh39js451ia65";
-"pdfoverlay.doc-1.0"="jvhhg2ajy75g3qxa2npmqrgsa1f77ddk";
-"pdfoverlay.source-1.0"="d0j8n61jvqpzrcycv4mczhp7wxvzirgd";
+"pdfoverlay-1.1"="y3y3cilmgla5nd49s5vhy8jsyfy79dk0";
+"pdfoverlay.doc-1.1"="0lrr1prxgpwa5zf8xp9ypa6ipw8mjkxk";
+"pdfoverlay.source-1.1"="7zk1x6k04drra2hwdawf9f8948aimr4v";
 "pdfpagediff-1.4"="3nj0fki5pqm0i50fzacdvnnzhhf2b5a5";
 "pdfpagediff.doc-1.4"="8h093sqzw62ivh2csz6fhkbbkdg1na2h";
+"pdfpc-0.2"="v5jrbnn4lagxwj4lgw9g3znnp0a1q8rp";
+"pdfpc.doc-0.2"="2lc4z235rgzjxha7dqhnmn3bhs9x3947";
+"pdfpc.source-0.2"="083ybyfdwjkfzj85jials202mdhhv9n2";
 "pdfpc-movie-1.0"="la1blfvhk9kwfy2q0sp6x1ybw5c2i7jh";
 "pdfpc-movie.doc-1.0"="5qc0gdmlgspl5696zvng96nbhgr0j0m4";
 "pdfpc-movie.source-1.0"="2d4v3bwnsws65w57arhbs2j5gvm3w5f4";
@@ -5628,6 +5854,9 @@
 "photo-2019"="d2rv82rm7jyd2fvgzs545kz32nb7fn6l";
 "photo.doc-2019"="1gn03gddjcbfmidsn9snhbr9nsmlbsmq";
 "photo.source-2019"="70n1vi9qla3kl592hgay45af9m078l58";
+"picture-1.5"="shfq20nv42wnpxdlmswka854qrgz5adp";
+"picture.doc-1.5"="mlhqxdlb1lq569jbkgkdmscahhbwrxmv";
+"picture.source-1.5"="s40j42wx4qnb6znx96ss2fsjg00gw880";
 "piff-2019"="xz2idyqgwg5y7r9ac0bykvfx533rd29p";
 "piff.doc-2019"="xwlsyrk4mczbchklsx5x8ip08zc5jk6a";
 "pkgloader-0.7.0"="15p6m1152qc334ljqhnzdagic2ylvpgs";
@@ -5639,6 +5868,9 @@
 "plweb-3.0"="9d5dh5afrcjlcx279s7hkrsi0xja0fg0";
 "plweb.doc-3.0"="519cpfwspp2kxprill50lqhzimdi26jc";
 "plweb.source-3.0"="2ikq5nka9npdkr8gqkj8lyi1hqmxihzr";
+"pmboxdraw-1.4"="nq604ycr2pv9c1wyv271rzyc0jjchjhj";
+"pmboxdraw.doc-1.4"="h3pskixylkzqf692514rd7p4k69z97g4";
+"pmboxdraw.source-1.4"="lz2chby0wx4yxl7lz5qhavzjmgshp760";
 "polynom-0.19"="lhl6cw071xb7ivyzhdylq48ja6dqq377";
 "polynom.doc-0.19"="6sj89ph1gnbd0xa2f8sp457ip6v8sadb";
 "polynom.source-0.19"="9z3hzyf19ksy521v28p47h1dxh3c9n67";
@@ -5669,9 +5901,9 @@
 "prettyref-3.0"="a75q522ix098qzsnhxg9w12kwp62xgk2";
 "prettyref.doc-3.0"="vlnivj6n4wc0cf9l53352ph04wijswv7";
 "prettyref.source-3.0"="wm5367872id8pf7v2k6wbbqvbh5ysrv0";
-"preview-11.91"="hw31xlmv5xplpnz3gjcmdf4vbmhvy87a";
-"preview.doc-11.91"="zmkw5whmxh98mrc705lcmqw7wj6k5h04";
-"preview.source-11.91"="67s0y9mv40fs0dgvm6zlkfs4ivhh9vrm";
+"preview-12.2"="j0hgpgmxn5cxfq5zs2q5a8915in16zy9";
+"preview.doc-12.2"="bygh3nzzr1v84dqldp6qhjmyqcbpx4r3";
+"preview.source-12.2"="c4pwp5f3x2dzfmbd8dp33ls800rniq5z";
 "printlen-1.1a"="fg8vfmr64nm31r8hycy81iqvqf6l9rim";
 "printlen.doc-1.1a"="95icr7kk7bkg56m6sy8g24if35pfhhwv";
 "probsoln-3.05"="qxvjb9csxhrh20qfk4xh264q4pvb5ghl";
@@ -5731,9 +5963,9 @@
 "quotmark-1.0"="8inn8x79cps7g1iw3pfmc7lyky20vyxx";
 "quotmark.doc-1.0"="nkjdi0xl5yvvscs63kjdy7pk3dcvgvxs";
 "quotmark.source-1.0"="nhinvh37dw0n8wk1gvpqnp5l3fmaq3v5";
-"ran_toks-1.1"="075bz1afn45n2klczxlj38jzl27ihxk2";
-"ran_toks.doc-1.1"="av9qzf5q7524xncg54dqiq5skgvqxdbk";
-"ran_toks.source-1.1"="qzsgi73xl8kkccb4rmv8hmhq3l83c8gq";
+"ran_toks-1.2"="wy1mkhb2d8fw1m9qnpxjvw104lh36rks";
+"ran_toks.doc-1.2"="w6g0w4da3lg7725bh13wph47qzfsippi";
+"ran_toks.source-1.2"="qm4h2n67hia3av9hch4941664b4r27gr";
 "randtext-2019"="bnb1sk549kzmljwjyb9gc45xr2ndckcz";
 "randtext.doc-2019"="9mpim50akqiqp54x6kpz8w4wdv9d12dp";
 "rccol-1.2c"="31w19kr365k8wkvkx91qqcw46fnl0sbk";
@@ -5796,9 +6028,9 @@
 "repltext.source-1.0"="rnsd3hg4mcyqj903igcsalp56pvg6g32";
 "returntogrid-0.2"="qvyji03hqf95f50pkv4jj773a8ryv694";
 "returntogrid.doc-0.2"="8s3dy7s20sl37qhayb7vz949k3nsz2k4";
-"rgltxdoc-1.2"="897zfnrkkfzxzbl2gpdj4d4xaqjkyimg";
-"rgltxdoc.doc-1.2"="173dav41zc8h3j5idwhpjr8x7pw504qb";
-"rgltxdoc.source-1.2"="mdv38hd0wxkigcn2h94wwamr4qi11p4r";
+"rgltxdoc-1.3"="li2cq0q31dicm59lrnz5vkgxd4m2lksx";
+"rgltxdoc.doc-1.3"="58sky0650lfq667lgfcb6cpyn966rn99";
+"rgltxdoc.source-1.3"="in8bvs6alfwi0ah6pdigvpflp7aggl6f";
 "rjlparshap-1.0"="584zbnkzrqjydg9hz42ayl9r806sd4cw";
 "rjlparshap.doc-1.0"="g4bkg84j236faakga1kl593bjw1p9wq6";
 "rjlparshap.source-1.0"="gys3kddji7j89c63a2kzz7z8xjdakpg5";
@@ -5841,8 +6073,8 @@
 "rulercompass.source-1"="9l57jpav5vpsvsg42gw79mym778q7623";
 "rvwrite-1.2"="fmxfnps659r2swx7gr9bdxcij2s7vdn5";
 "rvwrite.doc-1.2"="c1wrdxjnjn345siv4xivjxcw8gd5fi8p";
-"sanitize-umlaut-1.00"="fwbjpppg156xfnph18fyhjwg9k6y5dfd";
-"sanitize-umlaut.doc-1.00"="xs52mf005x6v04141qlan3wb314m8dxx";
+"sanitize-umlaut-1.10"="nfavxvmfn7klbszd9zxvlbma32dmvmym";
+"sanitize-umlaut.doc-1.10"="wfqd5y198r0gcl38fqnwi758cqyp3dck";
 "savefnmark-1.0"="jb8wz370wj5gci7mp809d60qwn441cb8";
 "savefnmark.doc-1.0"="lzip7g8z26c8vgfni9n058dk9jvskkck";
 "savefnmark.source-1.0"="sv58x02n2rd7gv7mkd6hjym7sqbxlfsx";
@@ -5863,15 +6095,21 @@
 "schedule-1.20"="h730zhbkd5wwb6jmvjwaaifdn4sia6bj";
 "schedule.doc-1.20"="m45jrx0nks1q26j75h9s9f3zacdc433q";
 "schedule.source-1.20"="gsclgm1vyfv8gnb5lcrgjz35ipvi4wv8";
-"scontents-1.4"="n7xm5mldbpk0kkyhda1kdramgi8d2v12";
-"scontents.doc-1.4"="8nv7r4i98w7bvw8fbi511d3nbcbkg8a5";
-"scontents.source-1.4"="shzh9ipvvkp6qb524qcx58x14xa9q2p0";
+"scontents-1.9"="hh97r1s523a6v2ay9b704cqv744iny10";
+"scontents.doc-1.9"="34jdskkym5x8vmhwjkbfnvwdvk7x98pv";
+"scontents.source-1.9"="jx3mw5l964zggyczpxl8x30g8xcbbg21";
 "scrlttr2copy-0.1d"="jw87bnb7phfp7nmvp4gvbi6nhfwifqph";
 "scrlttr2copy.doc-0.1d"="6pfnhhnjm97ap2zbi5bjj011wqbr2yg4";
+"sdaps-1.9.8"="22qmi8xlyg3h67sw4w5dhspk0pfiyl8s";
+"sdaps.doc-1.9.8"="265rp59fr7b1ws33d3pc597rn480d1qm";
+"sdaps.source-1.9.8"="4h7km9vs0m0va5k8msmjwhxnqcl2lyca";
 "sdrt-1.0"="2pcbwfywj14n08187899xjdhrjr3zzlr";
 "sdrt.doc-1.0"="85y00dj8k3xd2dkd42rzwscq70rhhxny";
 "secdot-1.0"="xb2kkwqh8dwdly3pcd20k3w2y68avkg9";
 "secdot.doc-1.0"="ngfan1hhwcnppgfpvkm0y0a3bjab1fz3";
+"secnum-2019"="v0d0340lzkywygf6p9sfl31cyczf6dcd";
+"secnum.doc-2019"="4zxhvxfwiihagwp6pjg9mmim8k1n772h";
+"secnum.source-2019"="1kadpq20yaj2l8pljjy42scsj5hn1mpx";
 "sectionbox-1.01"="mxhi294c4y7knbwiz1i0h4akmlgi0v6d";
 "sectionbox.doc-1.01"="2gapb7fvm8l7m021gp281j5vdq61s1if";
 "sectionbreak-0.1d"="gpda9n0rg3clldz9yck9fqxhz7gkcvjj";
@@ -5884,11 +6122,14 @@
 "seealso.source-1.2"="511kb0ka070b9q0973c1khain6yslqmq";
 "selectp-1.0"="fp7iiqkb6xqw55v28rs80in6p47li70c";
 "selectp.doc-1.0"="wy83q63fdm33il8rvia43y1kq51rkc07";
+"selinput-1.6"="f4xcvq61azvc95rvijmiij8mhjq2ams8";
+"selinput.doc-1.6"="6pwfj1pn035vm2jb19sz1qjc523zirqm";
+"selinput.source-1.6"="hv4gdy52gpza79867li3img657779zq9";
 "semantic-2.0"="ky4ggvzl5171nda0329151c9vbaxs7gp";
 "semantic.doc-2.0"="b1hyb592d0xx35p5dqppyfgykg37xx4s";
 "semantic.source-2.0"="4fwjw0axn8d3ychsqmmdy6x73ckciv9p";
-"semantic-markup-2019"="iclw8kk8b8y3hz5j1jq8n4daa5fpnzh9";
-"semantic-markup.doc-2019"="1g78rz3l215812hr2xvbxf804lzq0id4";
+"semantic-markup-2019"="8x44h8x0qlwz95gh7wmgcq59ldwx59s3";
+"semantic-markup.doc-2019"="24d8xyxdibsx9k7jqdcsidpssfbvi7qn";
 "semioneside-0.41"="62v5zs95qqi1i0xpm2jmhcx9pa24jymn";
 "semioneside.doc-0.41"="2z2azzz07gj105jrarifhx3ldjc9v09a";
 "semioneside.source-0.41"="31d1fggm0km56jv6qr5yjv7da6y0ifsv";
@@ -5911,7 +6152,7 @@
 "sffms.source-2.0"="h5sazi91347l3qdkn6ghw6ywyp5ddryh";
 "sfmath-0.8"="mkmjhc5jg8ylbjdzx3yal2r3spxv3npz";
 "shadethm-2019"="6d2vr8xkis6ah0032nrbpbh3rs29xh2r";
-"shadethm.doc-2019"="ddw9pngafxfcx4cl0fh4dmnaqcfqnyfn";
+"shadethm.doc-2019"="iv5jbkrj3gc4iajykq4bm6g1lvpvjk76";
 "shadow-2019"="xifs7y18wdkg1kj656swlvx7cpswmgma";
 "shadow.doc-2019"="ppc90h7d8qm8382lp2vzn5piy0mb7d4x";
 "shadowtext-0.3"="m2qsn137ij2l4lq4h0s5mpw1vvic0k4l";
@@ -5994,6 +6235,9 @@
 "soul.source-2.4"="9w0g3y2pqkzsbg8jdr1vkmn4wlrx1b2i";
 "soulpos-1.1"="908fbjhq1zkq0p3qg4ihs62zxd18988i";
 "soulpos.doc-1.1"="7l3pl7mbjmkpr9fwkrdcyjkhqvw2jfdn";
+"soulutf8-1.2"="90gd4zgr0nsq5ccx27cj32b84rnbk7vf";
+"soulutf8.doc-1.2"="0hlg0wmni0qswpm7l3yzga6lc6wl2pkr";
+"soulutf8.source-1.2"="pspazx53c9dn73absjhpv43wiycncbgb";
 "spacingtricks-1.2"="84f9wq44xbh1qsy3q6dnihgdfsdrax09";
 "spacingtricks.doc-1.2"="n9f1q4ph131jk4wfw5nk0991667j2403";
 "spacingtricks.source-1.2"="8a4sl2svxhs1wpwy5mz4iylzl701mfb6";
@@ -6030,6 +6274,8 @@
 "stack.source-1.00"="x3hkdwa9hip4zp8paipd8yjjz10pysn6";
 "stackengine-4.01"="nivan4carz07sqpiymvlkjxswkqa9mjd";
 "stackengine.doc-4.01"="1xfhqhhl578sbpgp0s3d2nhddv85dlwl";
+"listofitems-1.63"="kjbscx4fcjbfc502w6k03s466y7xnz34";
+"listofitems.doc-1.63"="h85gl0r28ig6fzm0rh972bxfs48ali56";
 "standalone-1.3a"="clgfqy3aqzn2pcalpfpmi70awz221pbl";
 "standalone.doc-1.3a"="q20i0dkgyfksm7npkiflphr7h2apzqc9";
 "standalone.source-1.3a"="lmqvfd3km9l0gbk05inz2ap09k5v8g0w";
@@ -6076,22 +6322,20 @@
 "subfigure-2.1.5"="rnd1mc9gr078d2vna7vwnhv420mnndch";
 "subfigure.doc-2.1.5"="zpsn8d5b6h8s9cwbl4fd9iv6w7hypmc4";
 "subfigure.source-2.1.5"="10lv7vivb3hggcyv8hkygjhhly6ixxlf";
-"subfiles-1.2"="l6qiqpx5avdd2hvfair8kcl88kambnq9";
-"subfiles.doc-1.2"="18d3d5illkyarf90hhsbv62426gp32qh";
-"subfiles.source-1.2"="2pn71xj9k0493xdcgv2f88kw9hxvr09s";
+"subfiles-1.6"="6420jdqcvjxvwqb9zlqw8yla8hh4gpkc";
+"subfiles.doc-1.6"="8qc5kwvsddpnz32zvrkbjnlxvw7xq4cd";
+"subfiles.source-1.6"="viinb1ny5z1p6zgxwh5dgzlsv12hwhw5";
 "subfloat-2.14"="l7d8iz54q7zfi5764jfl8v786wihisw3";
 "subfloat.doc-2.14"="rx97nj1mh981n89pby4prni2wfmqisj9";
 "subfloat.source-2.14"="3a8hj83wyvwrsfk0v6ibzmz4ahzvbkv7";
 "substitutefont-0.1.4"="rga587cq7pkf8b6w35pz76ifpb9h674i";
 "substitutefont.doc-0.1.4"="scmkff0sh6wypcq03sz2prsj7qx362ak";
-"substr-1.2"="qahdkj07s8nl7fnbqgwhsni6w8bn69ch";
-"substr.doc-1.2"="nvjl7r3a8r697gn8p3n81yaamr8jrfs5";
-"supertabular-4.1e"="51mc5fbbk13mmpya5n8lrx5yyk4k1167";
-"supertabular.doc-4.1e"="jmm0dxfps5p36r6ds1fpx00spx10rrv5";
-"supertabular.source-4.1e"="0wa3rcn787hn4707zbdm0jdfflp0dyf7";
-"svg-2.02c"="krfz6gsvr8kx2797caw886znzq4vzhjm";
-"svg.doc-2.02c"="irsvz87m3xqfvz3pvagl5xh0fgfx9pz5";
-"svg.source-2.02c"="wcjj10nzrk6qlmp2402ppl5k2j1nd522";
+"supertabular-4.1g"="2rh3aa8ch5jm9yc4iaj349cd339wabw6";
+"supertabular.doc-4.1g"="5n3nyqcxgn9fszv2njl59rgadnbg2n45";
+"supertabular.source-4.1g"="vi7q7isd5xw019q888apkp0rdqjzzi76";
+"svg-2.02e"="7rqzw5zqz1wqpgflzwxw3pvda053fw0k";
+"svg.doc-2.02e"="4cz9v0v46z9qzyiwjbxngmxs7ypra6fb";
+"svg.source-2.02e"="q95l5si7948jcilizjrrf2lix1d95wim";
 "svgcolor-1.0"="ld3wccj2cxdhv0xyz7qmxcvr6saab2s2";
 "svgcolor.doc-1.0"="nj7w6bihmr8hmvcykya9nkxlkhmlcw6r";
 "svn-43"="hv7xk90h5qb4ilx7f4a6zybijnhba9ic";
@@ -6162,13 +6406,13 @@
 "talk.source-1.1"="mvqbaz1vwya42g0idhhp948dxmb5z0q8";
 "tamefloats-0.42"="biipxghplzwd03drjpiisijhdzr4i04i";
 "tamefloats.doc-0.42"="mnmrchq7k8n04dx35r1plzxcw46hx4cj";
-"tasks-1.0c"="26ax537zl8bnki6rgzv9glgismvljdlr";
-"tasks.doc-1.0c"="pjf8b495x5rl68wiia2g7dhy4x651wcm";
+"tasks-1.1a"="sbvg3nzjsmzwcr0366sin8q76zavhqq9";
+"tasks.doc-1.1a"="ahmrq90xd8cpi8067jl9p22cm6aicvwi";
 "tcldoc-2.40"="r9i94qmf78q9j3adkzfly43riv2bzdmr";
 "tcldoc.doc-2.40"="fh6a7m41gxn4988pwr90ph25gg26ky40";
 "tcldoc.source-2.40"="p007ccff6w6d3nlpsp3q476vg9m4rjq9";
-"tcolorbox-4.21"="2w7jrqw2ryfdzidirnxcj8n05dy7j3px";
-"tcolorbox.doc-4.21"="lq2kg4ks9amfj0cm8z87v3izi8s202cx";
+"tcolorbox-4.22"="q9drs71lw7ri3b1qw7yj784z3kmd94rk";
+"tcolorbox.doc-4.22"="4fzbrllkiy8ck4f02hca47l8my5mx5sc";
 "tdclock-2.5"="dzb2gj8y1dv7qm5mn7xfgzdq9aydqjk8";
 "tdclock.doc-2.5"="sgdpiwcnkifms1lx7xicl3xj194lfhbg";
 "technics-1.0"="cav50vxgp01465wa07bmza4blgsv49wh";
@@ -6229,9 +6473,9 @@
 "theoremref.doc-2019"="846wd88w325ganigw2g9rvhcs9is6ziv";
 "thinsp-0.2"="flil5f3fr9ghxa0bffvqy7wackrg7q27";
 "thinsp.doc-0.2"="pk93sirkywa7hmqggnapklyz0bqy04c2";
-"thmtools-67"="9hby99z4aghnf12c5rdgk7vihj40i2cx";
-"thmtools.doc-67"="y5461jls5a09p7q2ndgdn94ss286jc6j";
-"thmtools.source-67"="v96bsmdp8n9g899sprc0divhd43svw8h";
+"thmtools-68"="r18kybkrcn6j2dj4k8g0wv1z9d0bdv5m";
+"thmtools.doc-68"="b08ppips1cylxm86x66qmwwx8zcvbihq";
+"thmtools.source-68"="q1plsdxk38jp54s26aqw79rlsxgrgmlx";
 "threadcol-1.0"="jwbi62xbc0cmzv65spvx1i6dijg34w6n";
 "threadcol.doc-1.0"="j6v3gi6c2cnhs8z5pm0j1cwg7ayi4hxj";
 "threadcol.source-1.0"="0irgk3ajakrjf1bgbfd71qvpy35fklmb";
@@ -6267,9 +6511,9 @@
 "tocdata-2.03"="k4q3rr13qywdl798lg7rx8zgqyhgc0cf";
 "tocdata.doc-2.03"="11pgqzlzvx5hxgw2fizyjrq670d1154d";
 "tocdata.source-2.03"="adp7jfmqm6p1l7gn7p07j7d18jzg7i63";
-"tocloft-2.3i"="yjmv81gig4vic5qsvg5mlnzgksspjgyj";
-"tocloft.doc-2.3i"="nh0fvc66rrd9ckyxv9gyackd180kikni";
-"tocloft.source-2.3i"="3mcnwnx824kls2j5ln3b80hcvdk8ch51";
+"tocloft-2.3j"="i855nlns30831ls5lgzc0blbnjg3v4rh";
+"tocloft.doc-2.3j"="svwwfcyppadikp7jq1mfp5f24nrpv3m4";
+"tocloft.source-2.3j"="pqry1z1zpr1309fnah8frcz1mkx2iqk7";
 "tocvsec2-1.3a"="xwl43cb8m7y9vf9bbkc1lb198mh0yg9k";
 "tocvsec2.doc-1.3a"="pqvg5ky3w445h7i4hf1v1mcq5mpl3znm";
 "tocvsec2.source-1.3a"="8q0df51x5bbj1xphln6skb4cjdicfynm";
@@ -6279,8 +6523,8 @@
 "todonotes-1.1.2"="k9dcrj6jpppwhp1hkibcdpwnpm3fmx32";
 "todonotes.doc-1.1.2"="6lwri4ybslcrfphvg8cah3fsw1lv5liz";
 "todonotes.source-1.1.2"="xyjg7n8m9aq7ykawy9lsa677jpylz730";
-"tokcycle-1.1"="8gd2yggcky1ag3p84z3cm7bprv58qxp9";
-"tokcycle.doc-1.1"="p0r03jvr9r58sr16pb1ihhnjqpmb5s6d";
+"tokcycle-1.12"="1ar98zdmgr3c5n4nwk70l3ypd01badjk";
+"tokcycle.doc-1.12"="a5m1mcpm0q2jx91m9ki19rpc25rdj29g";
 "tokenizer-1.1.0"="k1ixh9ndc7r9cna3q86cccz4ibja32cs";
 "tokenizer.doc-1.1.0"="yvz9x41xdnf5449k2ixpbwrpgyhwpr5y";
 "toolbox-5.1"="czvh3swrgna1q4bf7dvbi6vqvaaja1z4";
@@ -6296,8 +6540,11 @@
 "totpages-2.00"="5lxvigm3prx6djwih6imgxf27d57sw2f";
 "totpages.doc-2.00"="9kxxf13pfksp7whw0rkx554qn9dbbbhj";
 "totpages.source-2.00"="y4d9lbpab1xlfdd69q2558c5d0ka5mrj";
-"translations-1.7a"="lf9q67l2kyl24hbhr3ir66rq078dydrj";
-"translations.doc-1.7a"="adqaxzgjhsjn0hcryjgbib4f1n6yii0f";
+"translations-1.8"="5i5sn9yv3zr4am821m5hsf94x5v69xb2";
+"translations.doc-1.8"="m0fb1phz8al5rjw4fsb0ni287335chcd";
+"transparent-1.4"="dmcm4nfjmkxj8ycc0y7lgzklbfafm5cg";
+"transparent.doc-1.4"="w7vkf495ybi15ir7vpdv9n85wlarlfl3";
+"transparent.source-1.4"="hxayqrkm3ann09p5ffqq8i7vhn89k86z";
 "trfsigns-1.01"="5q6ajydw6n8k0b6rfflyp0bh973n4lqa";
 "trfsigns.doc-1.01"="bapnr3mrhxw22p78cg2y7gjbwfqirg7f";
 "trfsigns.source-1.01"="mmk5v5g9xidmfki3jnik1m7rmwcp0xf8";
@@ -6359,9 +6606,9 @@
 "units-0.9b"="b92vh3z7cr8q1lp5cqzkiw2dhfbla7cg";
 "units.doc-0.9b"="3c1a9x0y99lb2qw8scb0x70jzbh5kjkl";
 "units.source-0.9b"="ha3bz0p0xanqznz0nyfsa02j32wjdl88";
-"unravel-0.2g"="36q5f8m3v8cg5bg7g2b75wvdr05l6mg5";
-"unravel.doc-0.2g"="421v7md0nqgk4h33dnrixpvi67fi0fp3";
-"unravel.source-0.2g"="9v979jli0094ikbpf7dfyfizd7xlx6sy";
+"unravel-0.2h"="6ngqd1mpj3akcrf6r25g5y32w18r4cym";
+"unravel.doc-0.2h"="l75wvabv32isssh3lsma3h3ziir74yay";
+"unravel.source-0.2h"="lzscffmk9ychmzcbwqanqzv7qr2rzxwn";
 "upmethodology-20190928"="kx48p4k7pcw622vsw0r4d2mhkvg3kiyv";
 "upmethodology.doc-20190928"="h5vqrk88hfxaqp86r93jkg59hhsjvsgg";
 "upquote-1.3"="3pr0j9wkyd8fzk026qk6vzsv5hlyccy7";
@@ -6441,16 +6688,16 @@
 "was.source-2019"="cwqcmdh86sm58073zm929dxibw3flc02";
 "webquiz-5.2"="9qq4an9pcpirgzrfa7jx1mc74zz5y55q";
 "webquiz.doc-5.2"="36ykfxg7dqx2wzn5k15f85s9wm99c4xd";
-"widetable-2.0"="7dx6njx3r6i0ia40n1rv0j7badl9hkdr";
-"widetable.doc-2.0"="bk5a40zf9a8ylg7zf8sbr3z62607dhd3";
-"widetable.source-2.0"="w0djy8q8m45lvhp53gl3x44h5f0nckag";
-"widows-and-orphans-1.0b"="nra2vcwdz65ab9v2l5j51ly2psp39kz1";
-"widows-and-orphans.doc-1.0b"="s6m3rdja96wpyyq98yirb6y2213264lf";
-"widows-and-orphans.source-1.0b"="b0h0rfg9v872qa5javafixkkjwp518jr";
+"widetable-2.1"="sv2di7hvsz6ivzb6a0s7dccrqwi2d0xz";
+"widetable.doc-2.1"="ilp88f761vxixsa37agrqbmqhbfyynq9";
+"widetable.source-2.1"="qwjaf2v8bgpgfir6vy5j87hwrkr4jcw7";
+"widows-and-orphans-1.0c"="ywmnrcjhxsc2s072xqpqgsf2842ykbw8";
+"widows-and-orphans.doc-1.0c"="rcn8xvbawa9gvr1gsk3gnw4kcs6q3rla";
+"widows-and-orphans.source-1.0c"="4x1cfnpi3ff1vpf09d2i2iz1w9asn1kb";
 "williams-2019"="9xzcvf4nblyp6vl0vhnwi6lbbmp4lagm";
 "williams.doc-2019"="0fr8h1zsj1h1cf3qpjvdkg3yz4fcjdsk";
-"withargs-0.2.0"="ahb75dczlyy8shzql034xqjq72ll0yvx";
-"withargs.doc-0.2.0"="6sr29bzbhwzcf77pjzhqb21fsp0541dj";
+"withargs-0.3.1"="scpyc35ch6zjsdi10iqajg7fs2i9g4gz";
+"withargs.doc-0.3.1"="wsagxy5bb8psai9zilrqxvw1hdbvkn94";
 "wordcount-1.7"="wn4d84kxf5phfn6f5imv91draca4wxap";
 "wordcount.doc-1.7"="hsddvb5521vmj65yns8f9d69nnwhh6iq";
 "wordlike-1.2b"="l4ma5j7ga4b3r6f627vf1vwcb872n3jr";
@@ -6467,9 +6714,9 @@
 "xargs.source-1.1"="zvlns27k99jmi1iy7nyc03kyyy8kaycs";
 "xassoccnt-1.7"="9gjhxbaxdfqadbywhka6kqnyyw9wl5ls";
 "xassoccnt.doc-1.7"="38p065jjmz5c8mjc0lbvz0jg793nlr53";
-"xbmks-2019"="3rzl0pi5vajgj80rlwj9s5hxx1lwfq6c";
-"xbmks.doc-2019"="nfcmv5k07kdhily4m4iivg3i3ln7d294";
-"xbmks.source-2019"="xswwxiw3ksa35mism6ib1mqpr8vrisl6";
+"xbmks-2019"="apn51ljhxljrg6m2wrx9fgq9cvw7plh3";
+"xbmks.doc-2019"="pw86h72c5alcqi96l6i3f04yzv8m040h";
+"xbmks.source-2019"="1gqf2i24lbvbnbyybyqmmm4zx103xw8f";
 "xcntperchap-0.5"="qbrmbcwfdhy1as9i732naj5xnqd8zl7r";
 "xcntperchap.doc-0.5"="ql3z0qizhd2nxxjb5i4hhxvb43951rs1";
 "xcolor-material-0.1"="08zazp49lpmm92ang9i2q34kvx7v4rli";
@@ -6492,16 +6739,15 @@
 "xellipsis-2.0"="x7m9da1658cxs5896bhn8cjdj0va03xr";
 "xellipsis.doc-2.0"="332vcqlqjbpm5hsqbcfq23avmmgjl837";
 "xellipsis.source-2.0"="3r007qgvxxcfvnd7942yafsznza0jdk0";
-"xfakebold-0.05"="q2dn5s98jir5swsh67d6xaq8cnhxhjwv";
-"xfakebold.doc-0.05"="5gbp1hiqsrsfv3jh8f6rifsllsc6m3iq";
-"xfor-1.05"="x2bs3y606v8f42ds7xp2kmllq0vmrnms";
-"xfor.doc-1.05"="lbgdf0qia743jdvlxqf7vm4w1pc77kar";
-"xfor.source-1.05"="pafv6fqj0nd5xm0wgmwavkmg97rw7dnm";
+"xfakebold-0.06"="yc4gyj4m6z1bg1wy4z3ag4zqdwl9230s";
+"xfakebold.doc-0.06"="z85af4igv97150qh2bcay8kz42s76107";
 "xhfill-1.01"="6c09h61nlwbviwc1vfvmr4jhbrw2fs24";
 "xhfill.doc-1.01"="cw2rx4v66138fsh1vwxhq9smyai1xlr4";
-"xint-1.3f"="ahh09z32y79k5d8rzpw019gkhhf1j70v";
-"xint.doc-1.3f"="pjgafg558x3lw05chxic52xygraxx509";
-"xint.source-1.3f"="f332r3gsqj8d7fi1s62kn0jvf298xfzp";
+"xint-1.4b"="iri239wyn7wyc0pcin97syrgxc8a4z0h";
+"xint.doc-1.4b"="kkybxb7klqbrbcnwvmrxsbviin9838kb";
+"xint.source-1.4b"="nws3kzv8aadv37kyvrh5hjc6halqvflz";
+"xkcdcolors-1.0.1"="2g1glnkhcq4709y8hkkn3f6b3a4wh5dl";
+"xkcdcolors.doc-1.0.1"="ni52wb9gdcxdwzwdl78988anxhj5ay61";
 "xltabular-0.2b"="rgv3ixm0aynqzfmf8s1682n52ga5mcm6";
 "xltabular.doc-0.2b"="0d48lsksnxlyhaxrhcc497f95k4xjcvl";
 "xmpincl-2.2"="wjg1lw656zbn3h41pxqzwwag9mgrk3h6";
@@ -6522,18 +6768,18 @@
 "xpunctuate-1.0"="n3mxrha0440l5ngic93idrqw2agmisah";
 "xpunctuate.doc-1.0"="lrvqrndq151vfz34ycvjnh3sw77v58lz";
 "xpunctuate.source-1.0"="cmmzrijia2ir3mrhcq4s531la5kx18fj";
-"xsavebox-0.14"="b36qamf4wfpbrkg6gj6n8adi7rjy5gzg";
-"xsavebox.doc-0.14"="19flrbjci9i7xficp822h2x2ni9g4ccv";
-"xsavebox.source-0.14"="3n19vz70bwxcgx02q77gw062z7vr0n98";
-"xsim-0.14"="xj8gby6dkfn8b2xigg921klx1h0jccm4";
-"xsim.doc-0.14"="23760q0xpivdrxwyr3sqfjnb54347pnf";
+"xsavebox-0.15"="dw7n10mr7nflbhg6lb1g6jd78acxy40k";
+"xsavebox.doc-0.15"="f2g3w356y1fm145pvl61rb4jfvmmf5aj";
+"xsavebox.source-0.15"="3n19vz70bwxcgx02q77gw062z7vr0n98";
+"xsim-0.18"="s3cidc8j651m0zdg80mg6wg47dkjicms";
+"xsim.doc-0.18"="cxk9nkfkhrfsq6d0v0lxlv4zf7038yfw";
 "xstring-1.83"="imwhw4cc68bs6q4f9a00sp7f4y6kvg6v";
 "xstring.doc-1.83"="5ad5zk5vvbk6wpgssvzs905b6nq6x8fx";
 "xtab-2.3f"="zqrxzgk3pn3kw19jm28bvg0lch9lc7sm";
 "xtab.doc-2.3f"="pmhfig6nmfimb0didacw2sja2kc1nik7";
 "xtab.source-2.3f"="78m8pqm3r7jhxy1p5cvqy7p0clpzwi6q";
-"xurl-0.07"="1kkihd0ypf2krj0bnby474r6mk6z4bz2";
-"xurl.doc-0.07"="parcxwnyadx2a2z91xjjc1rs23hqjqx7";
+"xurl-0.09"="r9jl4qmmbmybr18x273477yjb5dkfqm5";
+"xurl.doc-0.09"="pzg8fxxawhrhp4n0svxkwg221j817f4m";
 "xwatermark-1.5.2d"="5c0z0yvlrs562482lkz70w6n7i80mkqi";
 "xwatermark.doc-1.5.2d"="1ixadba47dckfx4r1hhzfd8q1wivygpj";
 "xytree-1.5"="2kq4h083zj1zi2zvrhsnqz5wjyl0dkxf";
@@ -6561,14 +6807,19 @@
 "zed-csp.doc-2019"="5p8s701yk431qyngw010qws6b9shx588";
 "ziffer-2.1"="jv9y39n2mj1csaixb3pdfp0qggc16b04";
 "ziffer.doc-2.1"="3ys31swbmm03zmnlvfm155aii3nrd2sm";
+"zref-2.28"="yblpvj047hrkv6raf86rz0k511vgnv8c";
+"zref.doc-2.28"="img48xnnmlbbla4ahhmrmzv4ib61g7ns";
+"zref.source-2.28"="lg2fm4z4njavllw9lqsgivp64icmzn3f";
 "zwgetfdate-2019"="ibagqadgb3nbq8y72lzhrbamv5xcipk1";
 "zwgetfdate.doc-2019"="idw9limrda31c7h0xd3j6v23xqbd2nn3";
-"zwpagelayout-1.4d"="6wskn5h4bxigry3bjdf90ibdfrkinln3";
-"zwpagelayout.doc-1.4d"="rr3q6ypq18rkaa77ikr0j2sd80pp322j";
+"zwpagelayout-1.4d"="h3kdf67z95ghbzw3fjm7rq9jra2qwnkg";
+"zwpagelayout.doc-1.4d"="12l7jzz3ab176z5rgrjv69fsmli003ii";
 "addliga-1.0"="v46mqcn3yabd6lliclwabya62hvmvpgs";
 "addliga.doc-1.0"="lrmkg7awc61rkjf6n8xn1hhcvrsiz12n";
 "auto-pst-pdf-lua-0.03"="s0l3pyb7y4pr3l67yp3yksd0j2fc212p";
 "auto-pst-pdf-lua.doc-0.03"="784dxagzkrphn2nby5lk4b79s074824y";
+"barracuda-0.0.10"="wk371cfiiy15swgvci0nqwi6493ggfa4";
+"barracuda.doc-0.0.10"="njyqsbr5sbihpm6392a3alh26alxd67s";
 "bezierplot-1.4"="y1vm9s8h8v75k0q73q8089gnr0647ir2";
 "bezierplot.doc-1.4"="crzlgln3g39kmqdba5dffqdx3p9fffzh";
 "checkcites-2.4"="2vzqckrpid1lxi5awbc3s1179j0yw9rm";
@@ -6580,9 +6831,8 @@
 "combofont.doc-0.3"="99h3xmx3jv5il99g6wc10csqkmpm5mg6";
 "cstypo-0.03"="4iqsrwnw7pnzhzzspr686pf6y4img6zp";
 "cstypo.doc-0.03"="3s9dsniw0yz2j7iffbsycsgrycfbjlg9";
-"ctablestack-1.0"="cavlzn944q3fhha3i4kf8bgvm2y5zpdh";
-"ctablestack.doc-1.0"="g2d4fq9nl422i3i0skmlrydx6d3ks8cq";
-"ctablestack.source-1.0"="bqrksg21vxxki14v7sadnh35070f2vdy";
+"emoji-0.1"="vgrs6i9qrl2yr9gclszjlqlzcjhhfqnz";
+"emoji.doc-0.1"="14p0pnprlp4nkqzyb9433qdr5xryz72x";
 "enigma-0.1"="1d9g45cwjgz5imk677zrza79fhwvz3cz";
 "enigma.doc-0.1"="57pmvf7xx9hp23jxaj4sfam0526y652q";
 "interpreter-1.2"="pk1rbxzpaf3gida3dcshcgl5c12rgxzi";
@@ -6596,6 +6846,9 @@
 "luacode-1.2a"="8ckzckz94cdkygfjyh2dfldhr1pwa8dl";
 "luacode.doc-1.2a"="2xzk8133632231pnn3v0afb003xhl33f";
 "luacode.source-1.2a"="dw3p52gn6g103qkp5v8vmgxpj2b4cwb7";
+"luacolor-1.15"="bk11q7qiq9dkqcqxjky0id8p27azjw9w";
+"luacolor.doc-1.15"="4f0mpmk3n3zxvirmvxkijdbb0ddsff4d";
+"luacolor.source-1.15"="v6j6i0311iz8cjw9rs787fjlh4n45ljm";
 "luahyphenrules-1.0"="lpkklcbarmvfm4y9d5zgm9is55y66f56";
 "luahyphenrules.doc-1.0"="ch7vc8skad88crgb1blh85ig9sn97l3f";
 "luaimageembed-0.1"="0cc3hfkj5jqldnv95ifz4j6ls9vj44dj";
@@ -6615,29 +6868,20 @@
 "lualatex-truncate-1.1"="imd10qn2sh19fdz4zp8qz57rqs0kh2n9";
 "lualatex-truncate.doc-1.1"="xfanw53qhm8qhqg45ykvvf213j3q5dy9";
 "lualatex-truncate.source-1.1"="sv3j09xlab2gfqn670wd41xgdk3rjc84";
-"lualibs-2.67"="fvd8pm6k0nkvh1a9hglfbv7iscm87wjm";
-"lualibs.doc-2.67"="5bx73a0xfyvbj73jb0hp3f22khlqk0gy";
-"lualibs.source-2.67"="xn36i7xkkxg8hv4xjdk4pklcs1qikp6c";
-"luamplib-2.20.2"="hbd2ihzk4m3vph5vf5mjmabada2jwfiz";
-"luamplib.doc-2.20.2"="64fz107a010l9b92a2yffkmmni0il0nm";
-"luamplib.source-2.20.2"="y4cv3h54lh1brx576dya2b73vxzv0mza";
-"luaotfload-3.00"="zxc0q7cpk1a4lcp1g459cmli5igkfcrf";
-"luaotfload.doc-3.00"="98w4h05g5wy5m7b5359x2x0lsv61cpq1";
-"luaotfload.source-3.00"="6gn5jrfg8f082s56abjw86ss54x1lg13";
-"luapackageloader-0.1"="rc85q0c3lyjd3c4mhjjbqlcywycwxcgj";
-"luapackageloader.doc-0.1"="dkccp3n7nwkwv9scga2xa1aqqplsird6";
+"luamplib-2.20.5"="d59kbn85512qqzby49rkmhdfq9vq9xnk";
+"luamplib.doc-2.20.5"="xh4ybk8z6frhvvjd3ybivrlnkr3ydzxl";
+"luamplib.source-2.20.5"="sk5w1r0bb36gbr304ck9px0xf568rlrf";
+"luapackageloader-0.2"="gmc8hizbl18cka1iq0xhy8bp65yrl4gw";
+"luapackageloader.doc-0.2"="ilsqrigd8gvczbfkcbr0ci54qlryhyhg";
 "luarandom-0.01"="cj3pzwmgrh4d477fv551rlp7afxrsj0a";
 "luarandom.doc-0.01"="zfvmr0649ca85n06y0rdxx7plxrsk6q0";
-"luatexbase-1.3"="hjzprkfxz8i905ffdzfad0myg2ym4vg4";
-"luatexbase.doc-1.3"="3rnbzrql8m9ss0pk1yydy4v9acrk3qq0";
-"luatexbase.source-1.3"="v5x5csbgplvah43m8lbjky2nmfk2s3fp";
-"luatexko-2.4"="s5jl317zwy5l1n1f5pmhidprnds8l4bh";
-"luatexko.doc-2.4"="c65dp9snya3hsl1jd2lma27ghhrh032k";
+"luatexko-2.6"="bjcchrap58z6g7ymqfs0p13m94l0j5dl";
+"luatexko.doc-2.6"="lbzs38ags03z2zbcn7lh0wz2lnwpc2qi";
 "luatextra-1.0.1"="xb3dbgfnm7ww87n60ydpilkwqczj77lz";
 "luatextra.doc-1.0.1"="4pfnnxaynvw166pp1ivb5pjp061n2bvi";
 "luatextra.source-1.0.1"="3ajlrmqc27xyxlkn4vbprh6zzlqpf0xd";
-"luavlna-0.1c"="hdk6is2n47zfn5489f8brncr9v8cpb16";
-"luavlna.doc-0.1c"="k1m38wapbfrkbfi2v70m3g5vbqdddw4c";
+"luavlna-0.1f"="2wzwpzgr9gkdzdsbj8i9sz7x878plhyv";
+"luavlna.doc-0.1f"="flc13baab7rhg9lqsrcxg81rpyw70q3g";
 "luaxml-0.1l"="z1abf6izw5yakycwjiyc13bivpmi0bmc";
 "luaxml.doc-0.1l"="0lmrd1fxl26m4cs49qm571ds05fx1njq";
 "nodetree-1.2"="7x6x6xjd3aqhvz1nchhxckfhzjllfr21";
@@ -6645,6 +6889,8 @@
 "nodetree.source-1.2"="877wmvyrnhma4v3qdlq4r1pbk1bldlv0";
 "odsfile-0.6"="1h0vzwknsi9w3vpk008mdk87l3c33ffl";
 "odsfile.doc-0.6"="4wvljjvknahcyfnwkpnpbmzg26zaa9bp";
+"optex-0.05"="hqwhqns2kgb4s8x8dfli8vpf02fd5x2s";
+"optex.doc-0.05"="v13g2ml81y8njwg5a95l015yahxl95ry";
 "pdfarticle-1.0"="gp3238h9g1kcamcamvhndgs1h9wav9ld";
 "pdfarticle.doc-1.0"="zh97mill1idcik9zhb8cp6wyq32lm7i4";
 "placeat-0.1d1"="rkzxsay49qp6qpiy3wpd6r3byzrm4hgy";
@@ -6682,6 +6928,9 @@
 "algorithms-0.1"="s07h59vabig8jdk2d7r98hdnxpyq52sm";
 "algorithms.doc-0.1"="vwq0lnznxpwi4zpp4hjaljdfc3c2h6yw";
 "algorithms.source-0.1"="cskf3mpv2rk435przyidljaijx46fiy9";
+"algxpar-0.9"="v12ss83spk41rl0jxdcbrfh5xlkcdrxb";
+"algxpar.doc-0.9"="kv6r18qlkqq398cwplsivg1a57i905k9";
+"algxpar.source-0.9"="nygqf7d258b95q5abzhp0w225dc7c7bf";
 "aligned-overset-0.1.0"="ghkj6baw3sppp8vi9msny8ffaf3f0mb9";
 "aligned-overset.doc-0.1.0"="falszy2yd14yzy1gzscp7d3arsb02pv1";
 "aligned-overset.source-0.1.0"="gcapvfxcx8s1qgzcf8f52l4w0dd33b5q";
@@ -6697,7 +6946,7 @@
 "autobreak.doc-0.3"="lzi2q6g0mrv5l8kb3b9yg0ykiiwimyfv";
 "autobreak.source-0.3"="62cm1l24gp51a8jnag36y8gm1bwya7la";
 "axodraw2-2.1.1b"="g9vd6wfm1v77c7rsl2y7cpa9rl1921zn";
-"axodraw2.doc-2.1.1b"="rhvxvww141sazlyzpwazcdhvsd8p350w";
+"axodraw2.doc-2.1.1b"="f3xsbsqdmlax1m27khgh3imji3iij2f1";
 "axodraw2.source-2.1.1b"="jfcj5zj3b003mslj4h6iwjbdqvj1hmyr";
 "backnaur-3.1"="y970wq88dx80mbdsaadw18lckbiwgrx4";
 "backnaur.doc-3.1"="426dp81fwq04wqhng79sy1zj4d8igpgh";
@@ -6752,14 +7001,16 @@
 "chemcono.doc-1.3"="r527psyb3zf91x0xd6ywiv429b0rmicp";
 "chemexec-1.0"="szl9xw9iiql9yi7la6hwcwx8frhdxkck";
 "chemexec.doc-1.0"="q7rkw9ny7g93m4xm5jvs17v8x4nwb2p1";
-"chemformula-4.15h"="lmksnb4kzdxspa4dlzzid4w1izprk7jh";
-"chemformula.doc-4.15h"="1ykwrpbvy6r8h0fl79xrr34mpzvy69k5";
-"chemgreek-1.1"="6yfyrii5xkc1nz5bniqn134rqa2cdv6a";
-"chemgreek.doc-1.1"="x15bq2wwjyplpwpbj8hpz21zhzwjwryk";
-"chemmacros-5.8f"="fm173p1rcx5isykp7q0hmckmi1rq0f88";
-"chemmacros.doc-5.8f"="abc7v31l9nj6yljy6012dshny4mzwgjm";
+"chemformula-4.15i"="smd02jfgais94bg4j28449m280z269pm";
+"chemformula.doc-4.15i"="cmg2grv69x7f9sdsgpxkx0yavrylfmvd";
+"chemgreek-1.1a"="9jhyby4636bybvzq4ppvrjp7md499vp3";
+"chemgreek.doc-1.1a"="1v4wdq6k5yjcyi8v976la6ldskmh061a";
+"chemmacros-5.10"="xlpd68407z76kvvrx1c07slrxyi9jk6y";
+"chemmacros.doc-5.10"="y53bdf8l2m100wwb8933fl9zj8k0jk8l";
 "chemnum-1.2c"="4az4s50lwaray904pnfc9z6i2gqi7a5x";
 "chemnum.doc-1.2c"="wbikxk89zq84klsqq67a5ds50jaf28nx";
+"chemplants-0.9.8"="mnsmsmh4gsllxqd8a8590sggv7844k03";
+"chemplants.doc-0.9.8"="j6zlbg0gpb3360953q726g008br0zs7b";
 "chemschemex-1.2"="w3v5w049p0g28v8wx70ah804wp3map2v";
 "chemschemex.doc-1.2"="gg19d9gs2fc97f7rh9vs586v6i744a6n";
 "chemschemex.source-1.2"="czw2fh4251yhq1i703zf1nnkd0pjr74x";
@@ -6803,10 +7054,10 @@
 "delimset-1.1"="ag5z8f5h7gf5c824v8rj2xxfz6fbm3lz";
 "delimset.doc-1.1"="40vxv4mmpij621v80ly8mb4rz71r98n8";
 "delimset.source-1.1"="r4j60mdx3nivydxja9mnacqh1s071l93";
-"derivative-0.95b"="ilpzmy1qspsfmryc2vnag2w2lqhpnwan";
-"derivative.doc-0.95b"="b2lm5h2lqsmrbwql4qyqcni65i0vg25f";
-"diffcoeff-3.1"="x9987adk154mqdz3lil1qa86nsls4ns3";
-"diffcoeff.doc-3.1"="n46rn91dvm23pqmagng4v65n2b52d76a";
+"derivative-0.97"="pj119sspi9zgy3mjfgx1q9mrd0laqx0a";
+"derivative.doc-0.97"="6jld9fkhbl19ngv8p5h5xnwkc1djcwmn";
+"diffcoeff-3.2"="s6hqlww5wgs4y66ibvy476hf3cgl6day";
+"diffcoeff.doc-3.2"="mkg33h04jif3fzpyikfi6gymdj2cb1zz";
 "digiconfigs-0.5"="r2ph2xkdaslj50qk54n7a1xx37n8pq19";
 "digiconfigs.doc-0.5"="vignfzc0zrhrx0jgybwmfcgyfcgaqhim";
 "dijkstra-0.11"="25p95xl60c29w1b8z1ggvys4fs3szv9q";
@@ -6838,6 +7089,9 @@
 "eqnarray.source-1.3"="bwkjz77mw47z33bwbgsx81wbw9i4n2n5";
 "eqnnumwarn-1.0"="vz6kiciv5zhrh16ddisfrik5y9g2qr8h";
 "eqnnumwarn.doc-1.0"="py5m5187p7i643k6wgsm7zyznh6awp4s";
+"euclideangeometry-0.1.5"="h2z76n33d8x8z5ajp3rzw0g400nc9ssd";
+"euclideangeometry.doc-0.1.5"="jfv5aqq2b0lrfif14hr267bjpkpns4cc";
+"euclideangeometry.source-0.1.5"="ags2akra36889zl66yirlnzmhhjmjlby";
 "extarrows-1.0b"="6fa3hrvqa3qf7wqahhb7k168sz6pzmqd";
 "extarrows.doc-1.0b"="dxnpkgk5iirpmzhznidklfk0xy1y5l3v";
 "extpfeil-0.4"="0yaa2siwn8yvcsd1xy6q3shswdzfzq8j";
@@ -6864,8 +7118,8 @@
 "gastex.doc-2.8"="y3ybpis1prha863r0486c1wr24wfy0y8";
 "gene-logic-1.4"="w7b16bvypbh9l3kiwbgha3dyh4dlqpq4";
 "gene-logic.doc-1.4"="nzraabszgvj8b0j503f7h892grbqjjrp";
-"ghsystem-4.8a"="jsdc3b1x3hicf5w2kd4qi1q7chgam7ic";
-"ghsystem.doc-4.8a"="5ydr6q8ib2y9dbf9ms0pdf8r2i6cfvad";
+"ghsystem-4.8c"="dmzs6zybhwyirv48xcj7k34f5zx1n0jz";
+"ghsystem.doc-4.8c"="rzhffv3xxgyyb8rcl1ibqa6zw8zjk9s6";
 "glosmathtools-0.5.1"="k54clj6x7h0zz6b5r6q3v49vld7fqsv8";
 "glosmathtools.doc-0.5.1"="fdyfp8145xg7fc5j377bhk5p2nbc1h89";
 "gotoh-1.1"="lmsc2xb42i0w7ysmq1b7v69798xz6061";
@@ -6905,9 +7159,14 @@
 "karnaughmap-2.0"="52mx0flzri3z9y5fc1rgg665z2rpk01n";
 "karnaughmap.doc-2.0"="8m2xi7580kgrxq9v5dkcfcxhn757i7zm";
 "karnaughmap.source-2.0"="47f879r3821kwn8pwpyhh5874adx6f3i";
-"kvmap-0.3.1"="d71q1ji0yh69xkjbl99ssha9jk62l1id";
-"kvmap.doc-0.3.1"="6l4vg5g8zj833grmj03f8blmm2gz6q09";
-"kvmap.source-0.3.1"="m4nhvphc9fm2ivnr17byhp14acz4gdgl";
+"kvmap-0.3.2"="76wq1id92vsrxsp2y26zgy7zy93fsp0p";
+"kvmap.doc-0.3.2"="ak4vf9nhr2hyj8q42vb9bvi5yfcqkip2";
+"kvmap.source-0.3.2"="4a84i6amh66v4xmjpm823wlysnpvrwj0";
+"letterswitharrows-2019"="x7210si2h45zzxpdlgnlwhb73chi3n8s";
+"letterswitharrows.doc-2019"="gbb4284mb5q7nyavj0azf9ac8bbjk71g";
+"letterswitharrows.source-2019"="ai6h99xsyx7519rx4zqfyvf2hgb7h0rc";
+"lie-hasse-1.0"="qdqlw1r3r8dvzlm38bg09gvwfqwskrk7";
+"lie-hasse.doc-1.0"="6w441bchfvv1ga31aikz881qj97845jk";
 "logicproof-2019"="24sbq01252ij7ldzb8achg4m73fakhas";
 "logicproof.doc-2019"="ldn1c2fdmnikc8fzklp5vzwkx73d91jc";
 "logicproof.source-2019"="745pxgmypzv7a1vf8gjm6r28khxk0s3k";
@@ -6921,9 +7180,9 @@
 "lstbayes-2019"="7lfk7lrqr07my6v1qqni2rz39j5wwgpm";
 "lstbayes.doc-2019"="y00fm320wqy608v16idmzc27n8z4q4p0";
 "lstbayes.source-2019"="kzi9c2z11zpwb4lgy87vwyi0qjlmbyr3";
-"mathcommand-1.02"="rpn20gwpp62f33x0r1pfk1aha4jlrqv6";
-"mathcommand.doc-1.02"="p04g245ibp3cy6q4s8d15hlpb2w4m1ad";
-"mathcommand.source-1.02"="x4krsszrqh57w2srbp8i283yjp74696i";
+"mathcommand-1.03"="6i9g221942874w40gb7wy3h86qmwnjns";
+"mathcommand.doc-1.03"="zkx78ghaz6kf1b4w1h1j63spijrlsshz";
+"mathcommand.source-1.03"="0ypyz0612ys99ig6g2c93zs86awfiib3";
 "mathcomp-0.1f"="rjxadz6409wc6g4ffb2jw40rw52rpwml";
 "mathcomp.doc-0.1f"="098xybrmriwyh7dl5vsxxxy4v7nf4bdj";
 "mathcomp.source-0.1f"="m3y8gisljqfy405d7cffqkda0mlz8rkc";
@@ -6955,9 +7214,9 @@
 "miller-1.2"="vgpbb05dlbyp2phs7cpwrl9l8v7yczdb";
 "miller.doc-1.2"="fj6s0x2rzvldwm2lrmjx0f3hy9l4ih51";
 "miller.source-1.2"="9n5iljgqg52bzz39i2ailg3wjgfvgvx3";
-"mismath-1.6"="ll7dwvfkg82z544cpqjnb4x015wr1lsd";
-"mismath.doc-1.6"="x3c0lilkwlh6r4s2d96nm3b0mv217bbz";
-"mismath.source-1.6"="bqz0jb26j2ry8zphlpahy27dn6bpl5sg";
+"mismath-1.7"="v2s1vq1j6rkk1bz7xiad62a8ns123bpp";
+"mismath.doc-1.7"="711hsvwqxxbwr1y6lzcac1ax76n20hcl";
+"mismath.source-1.7"="f7w52yr2xq8d352z21zka6kb6zx004kd";
 "multiobjective-1.0"="g6fgsq3fzl30yd4hrw2l6v73ldm957gz";
 "multiobjective.doc-1.0"="187syyaknws2i7i84xxzsnl9mj22z731";
 "multiobjective.source-1.0"="qhsg6vg0djg5h279gbs2lbally9vbrj6";
@@ -6967,9 +7226,9 @@
 "natded.doc-0.1"="bkhf1ldr1hzsyc06bcp7rld2dbf7p4rk";
 "nath-2019"="7x3cdih5q3i8dg25h6737vaphmrdxvbp";
 "nath.doc-2019"="ilxg3pmmz0pf1xp6i3g5rfwgvrjprzbg";
-"nicematrix-3.5"="zwxkicravgah5qajr495qgsc8l6hjwps";
-"nicematrix.doc-3.5"="5axjlm44yg4x6cy0jbr5p8lj3xcnz8xi";
-"nicematrix.source-3.5"="1fi36fy741374h8ajjy98476i2xih4dq";
+"nicematrix-3.11"="xbl0z3fcz31h3vdzhh52al7xnq11kmga";
+"nicematrix.doc-3.11"="nk082y0mr776zi8q0zw684cpmhgmkbdb";
+"nicematrix.source-3.11"="n1ybg6r8dcf9jbykrk2fcgswgn5awq6j";
 "nuc-0.1"="4mmxcaippf5kwp6sgcwbcf55m4j415ma";
 "nuc.doc-0.1"="b0pkc17fxlgygmfvr84gq1gf58w95a30";
 "nucleardata-1.1"="b76hnd5fpl3f1hfh8pwgrsnqkadqi2zn";
@@ -6986,13 +7245,21 @@
 "oubraces.doc-2019"="yfvkv4vgc6ycvsd2sixyph039nm4gzvl";
 "perfectcut-2.3"="ca48sxakrgh4g53i30xa7n9288r9wr51";
 "perfectcut.doc-2.3"="iry7v9xajbzxyn4bbq0pr7qah8a1iy8n";
+"physconst-1.1.0"="dqlks7fba3zf4h8xw8bgjss2l8nkglnw";
+"physconst.doc-1.1.0"="56iad44dpmb3aw4yba13xv655c7irj3d";
+"physconst.source-1.1.0"="ykx51slabggwsficfjx9l8q17ii0s6iq";
 "physics-1.3"="y7b93d3qrc6674j33cy58v5c6fhlg3dy";
 "physics.doc-1.3"="ksf5jd2gfrq4dj2p1x2iwpgik5vb4pl6";
+"physunits-1.0.3"="4cx804ybcb52z4p6gavkcsrcx6pbcs4b";
+"physunits.doc-1.0.3"="m43hy3mb9g9zm8hkwgis87m8c9jwkzm4";
+"physunits.source-1.0.3"="8y3f9vhp6158qasfv4y8q7fqda66gwig";
+"pinoutikz-1.1.1"="b7l6pih6074b4981v5k3ik7cqpl4v1w8";
+"pinoutikz.doc-1.1.1"="rvsnqganf7x394vsisl9fl5n06c4qrsn";
 "pm-isomath-1.0.04"="a768qpbak06xs38g804s8rr4lc9ad4kq";
 "pm-isomath.doc-1.0.04"="3ahd6gy58lc04pirlz20fvyhpd5qw4nd";
 "pm-isomath.source-1.0.04"="d2mkfbifgmjm56i9vbrhwkvhyn2pj6bm";
-"polexpr-0.7.4"="1bc4pj1za2mcn97kkby4m5p5md08gm4k";
-"polexpr.doc-0.7.4"="hn2kmfk7gmp53n5r37dlrb2ljrfwpp17";
+"polexpr-0.7.5"="20yvnhmb8dy7p1jwlimayaflwm3sw2q6";
+"polexpr.doc-0.7.5"="3zbnfkrlxphvikk3w1jrd21dzrsnkad7";
 "prftree-1.5"="jwghbxhmr9lnai4rh4gnrrd5i98vqi1j";
 "prftree.doc-1.5"="7a0lrs2rak9c45ayjfmn8ghx89zab2pg";
 "proba-2019"="k6j2r5kacbcl25i7zwb71a2mlyn17dap";
@@ -7003,8 +7270,8 @@
 "proof-at-the-end.source-2019"="nk3sbcnk3176zk76yf9nzj05q94ab006";
 "prooftrees-0.7_svn_8641"="rfmxpnzn1lkxx7b9ylvpnwmk1rag2nda";
 "prooftrees.doc-0.7_svn_8641"="zx19hnafp63xl2vas9frf6blm8974b94";
-"pseudo-1.1.2"="c84fsxf6k7a53jsahws62fmnfkmlq7y3";
-"pseudo.doc-1.1.2"="wmnkvbd0cw3zgy825h5k2x8pv7g4hsyv";
+"pseudo-1.1.3"="cxzf3j22aj491bs9k23rqlfbia9r15b7";
+"pseudo.doc-1.1.3"="scpzmw6ssq40wmxm9fmyybjxwc31kxjr";
 "pseudocode-2019"="bmn68g4pm7wga21yf97mrnmwc588gn6h";
 "pseudocode.doc-2019"="1hm6d3af5zjrpvx9h5ihd6qqyg2384xl";
 "pythonhighlight-2019"="wyvy6ms2blns0nffsf2lzjs4gwivgh97";
@@ -7041,14 +7308,16 @@
 "shuffle-1.0"="zg1rq9yihzpl9l7xjlc7djqfg2s3mn2a";
 "shuffle.doc-1.0"="dqra8x226wdqh5baz25qqg905r3xbcld";
 "shuffle.source-1.0"="3r5607h5jsaibvmyvwm1v1scm0yrbfrm";
+"simplebnf-0.1.0"="gy1fdjkxfirryqcspyqn3xh19h5ab9sj";
+"simplebnf.doc-0.1.0"="fff34d89r4aiw5qcy9px8ksh4190rcql";
 "simpler-wick-1.0.0"="pmjzl9cnwrzxhjiwbrjxfd66lamrhvj3";
 "simpler-wick.doc-1.0.0"="pg2id6jpail1iiz92xdr1bvi2725lj8z";
 "simplewick-1.2a"="hfv61gj0g68m17iiimvp1zqzi7ri2z67";
 "simplewick.doc-1.2a"="kxfipc2w97479is7sdd9fmahrbwfk2l7";
 "simplewick.source-1.2a"="48db2ywp9dg6nd5xbclw2w85id3mf97r";
-"siunitx-2.7t"="fd73bsz8nnv9b6zb1q4aqbw6f1qsnqrh";
-"siunitx.doc-2.7t"="98zp3wpjzjsd5vz8370267kxjqq9a372";
-"siunitx.source-2.7t"="50k08510bwm05ag510i76wfxcd5yhnbs";
+"siunitx-2.8b"="8qh918d0870q2qmf57hnqm81lyyyrw9y";
+"siunitx.doc-2.8b"="hpwpql22ypcccq4mly75jb29n8a3d76m";
+"siunitx.source-2.8b"="wmpxyz75g3r8vhp09j5chdjqs84ysk85";
 "skmath-0.5a"="b9bxkvgrx8566jfqh62vxl9912llffqv";
 "skmath.doc-0.5a"="kpdr4vz3z7k8my710n5772vkbd7jwisb";
 "skmath.source-0.5a"="iks3azv4hmv59laiywdsqjqdsln0a1kc";
@@ -7123,9 +7392,9 @@
 "unitsdef.source-0.2"="rpwd7p723jsqcmcl28kkfg3fg9dmyfxa";
 "venn-2019"="vxgbc1jmchjsq3aq1wklgla50p1smqnz";
 "venn.doc-2019"="3z1kgbyilhajm6przv2a1rbdl55fzhqj";
-"witharrows-2.0"="2pd1kgflbhjcdy8n61a7dn90g8092llw";
-"witharrows.doc-2.0"="3ddq9k76s9jascnv0xklzs312ygn7bsp";
-"witharrows.source-2.0"="c2spayi9ibic8ci7gklmp0b2pcdxxpv5";
+"witharrows-2.3"="bw8ywli9cayfdnwb9px15swidxd5jfg4";
+"witharrows.doc-2.3"="z0hfhxl5c90q7p3qgbw9p7kx0vd1nbzw";
+"witharrows.source-2.3"="8jvhy950w2icgzbdgicr00qhicxnxpc2";
 "xymtex-5.06"="lh5pr87m1xhyaj74pmwc8vx3an7gppxw";
 "xymtex.doc-5.06"="bbknma6166kqvxhj3523p85lq7qn1ydc";
 "xymtex.source-5.06"="is60w9mjif26y9s3vv8c0v26z16m97g3";
@@ -7179,8 +7448,8 @@
 "gmp.source-1.0"="an64d733yq3h8fy347lppy46yklczrsg";
 "latexmp-1.2.1"="x2plwjlw7cdim8lxh530zf5v2zjsfaxb";
 "latexmp.doc-1.2.1"="d9q1zwyad9p1nkk08mq4lard5rv291rf";
-"mcf2graph-4.45"="v44h4p3gc11sj4cmzpyy0frfmp79pfld";
-"mcf2graph.doc-4.45"="63nlb7vhm682gdwimvhl2ipbs4x828gy";
+"mcf2graph-4.48"="j0v1s2iih3v5vminzs0m3icrxp54x504";
+"mcf2graph.doc-4.48"="w241y08nz9qnxw6gysxaj58r3plk3c5g";
 "metago-0.9"="4gzbngrpwjbfq5d7jcfavhsmvfwnb77z";
 "metago.doc-0.9"="nn86x3g4dv9y5mbr83r8camfxg0xkv1g";
 "metaobj-0.93"="83hf8awwak3msfmran6q2ylgcs6720lb";
@@ -7237,7 +7506,7 @@
 "abc-2.0b"="pmaw58frrdbnj81n21mg15yiz7sp0rci";
 "abc.doc-2.0b"="gild9nm8zph2kr6mj9w0sans8r1jz114";
 "abc.source-2.0b"="g8a921yi51lvw6mqj1hxmkwqqh9fkl03";
-"autosp.doc-2019"="3pp981hsw8czivz0sv8bf5cak4008y4b";
+"autosp.doc-2019"="h3rkc7nri062hjia5nfx5rdhv6baw808";
 "bagpipe-3.02"="z9akwcd2fdwzps3bws9vamik64pyyl73";
 "bagpipe.doc-3.02"="6ssnq5756qnhlbyn08pncriz5la8hpzy";
 "chordbars-1.1"="vdmircid5yrvvywih6m0nf5c6b59mz5r";
@@ -7272,9 +7541,9 @@
 "lyluatex-1.0f"="zgh2b7q3w9p0dic23cwddhhx5cqsdqm7";
 "lyluatex.doc-1.0f"="c8739z6r5mpk001ra6if93kfw799rphi";
 "m-tx-0.63c"="jjs536dwc3qbi72s4d7qr8v3b0rxd41g";
-"m-tx.doc-0.63c"="74xm6cv0ja6h6qcgv1v7mkak90l5qsxh";
-"musicography-2019"="rgdiagjsc1b03pp5056lsgz1ad74ngfw";
-"musicography.doc-2019"="rnpwpnrjlqcyrmnpkfj497752f2bdfdn";
+"m-tx.doc-0.63c"="ji5fl4sdm5mdhkkg4qf33gzaaqnw8yg1";
+"musicography-2019"="95nsr792xkvyq2kp95yw9z99j40c9dsv";
+"musicography.doc-2019"="z63rsy6v54c4p1l844ck0b6hc9fwr96x";
 "musixguit-1.2.2"="29kbldyqlcf8xs5yh5gsx0m7liwbnqg1";
 "musixguit.doc-1.2.2"="pam1limbbmc1jvhznsvrwslmlr86y7vf";
 "musixtex-1.29"="si9nrmj1g186af47kyfsrv41h3p3irsf";
@@ -7343,6 +7612,12 @@
 "epsf.doc-2.7.4"="b78n5gm14qk3brywpz4prglkqnpx9fpg";
 "epsf-dvipdfmx-2014"="qvf8n367wnjahzv8bgh7rmqqgnwraa0p";
 "epsf-dvipdfmx.doc-2014"="b290mp5xqfqzzxa92s9j798qyycaph9a";
+"expkv-0.5a"="xnl73p0bmq99hqa4fppvq3an3k1p979m";
+"expkv.doc-0.5a"="n7wyvph311yln9rxfzwsslv55lbyyh7m";
+"expkv.source-0.5a"="qg7k550dwjlhhhi1nslni2kg3238znis";
+"expkv-def-0.1"="ikyjr44zb8r02pr84pvhs7dh3xfly5b8";
+"expkv-def.doc-0.1"="h950kj1mhnm016d8vn9jr8iss4kbis8a";
+"expkv-def.source-0.1"="zn84yaddaaia0169cjjsrp70y7dq2mr7";
 "fenixpar-0.92"="61jkr83g6i0bqmp0qg4w09gj7gwcdn96";
 "fenixpar.doc-0.92"="95h02nbzq72mmblzawgqsk8530wi1dpb";
 "figflow-2019"="166qngk7yy25v0rbjavi53m0sazk90gn";
@@ -7357,7 +7632,7 @@
 "font-change.doc-2015.2"="14ck6s61lx6gyqmf6i9659lvwd3zh6hs";
 "fontch-2.2"="0h81qy37h3jb2m6g18969189a1jbi73a";
 "fontch.doc-2.2"="csygimfjbm36zfm403jz4kw39zv23zzb";
-"fontname-2019"="p97hi0yx6kka7s80j9cazhpxvhfnf8v2";
+"fontname-2019"="mgggfwq9ds3bc2mblkx5rday7dgmq1i7";
 "fontname.doc-2019"="vg79z64v459vl42ba50sar4dhafwr1f0";
 "gates-0.2"="awaxppd6dhv239x03vpwy2hn2zwldmna";
 "gates.doc-0.2"="qqmjk1276kdv0rvsv86gi7ysl3warg95";
@@ -7378,9 +7653,6 @@
 "hlist.doc-0.11"="0k1ysa58wbhw02564py59gcwzhlaiffr";
 "hyplain-1.0"="cdn3m5p0va7v16wfr2hxi7sbbkvai0h4";
 "hyplain.doc-1.0"="37fvn4xi8ibli2622n1adyzgnnhrs05n";
-"ifetex-1.2a"="rf6dcxybcj2iaza71yrrl4rhqzgq5jcg";
-"ifetex.doc-1.2a"="cv3s6q4cjv23fi31wavygv6l0f0r1y5l";
-"ifetex.source-1.2a"="17yyam712knw6h46kd7q44gzkbbg9r5p";
 "insbox-2.2"="n1wbssqq7h2g00jmvy1g9cx2pb8lp8n3";
 "insbox.doc-2.2"="i5c06kh17g5ghsjivlxsipgkd0ab05x9";
 "js-misc-2019"="shwn2dwi83plybk71sjp3i1drw7xxd18";
@@ -7394,8 +7666,6 @@
 "lecturer.doc-2019"="avsvzihsa6jn0abvd4122k358w5sf4y0";
 "librarian-1.0"="5siy7c2xclp1c305vqiayp0n5dzil1gh";
 "librarian.doc-1.0"="8nxz7ac5hdp9820nsfkvhvv0bn55idq2";
-"listofitems-1.63"="kjbscx4fcjbfc502w6k03s466y7xnz34";
-"listofitems.doc-1.63"="h85gl0r28ig6fzm0rh972bxfs48ali56";
 "mathdots-0.9"="6avfq6dlhbqw1i3jrjgcdbdzx2a0w5nq";
 "mathdots.doc-0.9"="syy0i8rjssr81sy26xcx43jbripqx9d9";
 "mathdots.source-0.9"="zpl4xjhcq4hs18hqiyljy3lfyx9xbng3";
@@ -7459,18 +7729,18 @@
 "termmenu.source-2019"="xygav2l9gll238dyqa8126sn9hc1n1w2";
 "tex-ps-2019"="jnzaqr3pc6a2bfh7jlsysc8hy30cq4xp";
 "tex-ps.doc-2019"="g377qq7n63mqil18vlfgimfd589pa1qm";
-"tex4ht-2019"="wn3xdb0z68g4wirfnfs4smmk13zq5s15";
+"tex4ht-2019"="0apbz4mw90ykzhkdhd2z8gldg4x2ll1n";
 "tex4ht.doc-2019"="hi6p91idcncr8n8hiz6vb4fpwggm1d78";
 "texapi-1.04"="4ysk0vfpgxfdkpaag4982k7ni4qkksjd";
 "texapi.doc-1.04"="l2753w2z702418c8shbami8hzdsyz4lx";
 "texdate-2.0"="vi2h6c5c56i63vhzn64x7qvn11733z70";
 "texdate.doc-2.0"="3yzkfs7q2v20ykcz7754r48p0hb2l09s";
 "texdate.source-2.0"="zwkrw8y0m074w5fpjnaabbv7kk293g80";
-"texinfo-5.1"="6h73zydsfkdmqaly5xfj9j7z591vfgmf";
+"texinfo-5.1"="60l0xkiidy5zi772vzalavb32ynxfbjw";
 "timetable-2019"="ca6qybasxlgqhmlqyjr1dw3n3j2455wb";
-"tracklang-1.3.8"="zs5wi6r2aakidly56h47fkaqr7kwcbn1";
-"tracklang.doc-1.3.8"="hx2yns14r8vzv27lbaq46a6r5hr7wja0";
-"tracklang.source-1.3.8"="b5rc9wdfy91xdg18d94adfc2s4zhly9i";
+"tracklang-1.4"="78qby69fz9hs5brl0050mwy0xgzjms47";
+"tracklang.doc-1.4"="r8caivpz3lhzlvh5kqv18k5cnvkf58qx";
+"tracklang.source-1.4"="xbjjgq4h1qqa4j2abcf1p61lxgiiahxz";
 "treetex-2019"="gkvpkgqggl2s86h7rmad9z3ax6wrq3hk";
 "treetex.doc-2019"="5r9rz97y0r280vn642x65xgcffb073gx";
 "trigonometry-2019"="ji2axcciqhac3aaly221w3bja28yb2nw";
@@ -7480,7 +7750,7 @@
 "varisize-2019"="h0jdsw1dapsq7ml9hibgg9571da7lipy";
 "varisize.doc-2019"="af8xf6nzd3h9fm52gn6xpa886lzdpz8h";
 "xdvi-22.87"="g5irfc0gf7bra3vngv6kdbkhbyicdz84";
-"xdvi.doc-22.87"="i85gwkaj04296ysrkn1lprjf1xlzva9k";
+"xdvi.doc-22.87"="wqamm31mzzm4xw5y4fyrlzr6rm05v1xv";
 "xii.doc-2019"="p1ijdgk0mch86gs858rvkjzjh2yn35d8";
 "xii-lat.doc-2019"="8ilsp524wb5anl3shmdhbnn1nl2c8sav";
 "xlop-0.26"="vjjxxxwsq6pshgia7z796rwmhc5sjqnn";
@@ -7565,8 +7835,8 @@
 "pst-eps-1.0"="djkk1cq45fzh2q1pvl23aiqi8b2znqrk";
 "pst-eps.doc-1.0"="i903x3p9wwb1jjf5al8azqr3iasmxkyk";
 "pst-eps.source-1.0"="r6jcjqy0f5mnkkahzqf9qnfrgwqh52h8";
-"pst-eucl-1.65"="xjmdnvp20hs9qqin055pxqd39qx50r95";
-"pst-eucl.doc-1.65"="xmry09gzi0kh9lbnjas5pxb68smfs4ml";
+"pst-eucl-1.71"="1g5fkgd7ahplfj08ibkvlhgil0v02l81";
+"pst-eucl.doc-1.71"="3slnpqk8120b4pkxls25bp149vp3nw1y";
 "pst-exa-0.06"="1jqv019148d2s5n7cmlclldqd3mzk08w";
 "pst-exa.doc-0.06"="v45ljmsk7y4p256vikzyk7w0z1vnybqz";
 "pst-feyn-0.01"="k5fpn50px7b2i9bq48qd2xwcdqdfwrnp";
@@ -7651,9 +7921,9 @@
 "pst-pad-0.3b"="x3762zh9c5shzl02r9ssykd2a0rqpk7k";
 "pst-pad.doc-0.3b"="ymjpw81y22mbmf62735kqi80yhylvazg";
 "pst-pad.source-0.3b"="7cqccc3ps8qdhbykgc6yyygjds46p5av";
-"pst-pdf-1.2d"="av5rd425773zxnzlwdk4x5sf8wp9w7in";
-"pst-pdf.doc-1.2d"="k2zssqg4qf151a5iiw2nvk8lyrlh7md7";
-"pst-pdf.source-1.2d"="1lswqfmczya2gdhxi28czpznic888yf5";
+"pst-pdf-1.2e"="xjrjc29wwwlmk93x6i8ai8faazrvh636";
+"pst-pdf.doc-1.2e"="mj3572ny8nxvx5v4yrsn2dwy8x8pl9ln";
+"pst-pdf.source-1.2e"="v7byw0kwvl3ahlc63sjm0vas058bxbd5";
 "pst-pdgr-0.4"="cijfx5hq5ygnchsgdw7ly5a43a5v6cqb";
 "pst-pdgr.doc-0.4"="s94gqhws251skwh2ap0b3hlvpp818y0z";
 "pst-pdgr.source-0.4"="s2zbikk5v94207zmrmnlpr5bx3jjzc5i";
@@ -7664,8 +7934,8 @@
 "pst-platon.source-0.01"="bs136jlsz9yxiw062dlck6km6fsapgjv";
 "pst-plot-1.92"="nb5pbj56m205njaj6xx36fmpnjl2clj0";
 "pst-plot.doc-1.92"="9zns6nss0wbc30dbf42gm3gzkvddgrr3";
-"pst-poker-0.03"="8ny6asww2zmrbm4aqilmhn3wh5rlx4jj";
-"pst-poker.doc-0.03"="icmvyk2m0yn1cqgmfplp6r271ipsnnqf";
+"pst-poker-0.03a"="n0v39sbb0i18kdpkdg0c8yhjzyyk7sr8";
+"pst-poker.doc-0.03a"="b8na7nwvm3mx2rca78pb9xkna32agak2";
 "pst-poly-1.63"="caj343wmgfxzbzchalw7w14jazj3xb3n";
 "pst-poly.doc-1.63"="gq61g8l852k4m8n69kzqdx1sii0jr41n";
 "pst-pulley-0.02"="d7y0xspcv55vq4xhhpwhl9a3q33fpyga";
@@ -7733,8 +8003,8 @@
 "pst2pdf.doc-0.18"="hpjd3gxsk0lmajf2fpac7ykhrznzsily";
 "pstricks-2.97"="l6vcl5rj0qw82chj5hks3a7xilmsvphw";
 "pstricks.doc-2.97"="qk796lx5myp7c5p8s6wv9pby9pb67v3h";
-"pstricks-add-3.87"="vkfiryg7plqky6c43dvyx7zspa8b7fxb";
-"pstricks-add.doc-3.87"="hx8sxyd3fxsp146500flnr8cvwsrm5rw";
+"pstricks-add-3.89a"="96y4vwq9y08a0ydk06v808ixsikg0hb6";
+"pstricks-add.doc-3.89a"="kaw6qyrdi6ci1hr7vpfsbgfzqjrvmldv";
 "pstricks_calcnotes.doc-1.2"="4q48najl98h9lb1866avfw6c5ir7p4bj";
 "uml-0.11"="ggl1iw3qhzysy0fza2dbl3igwlcq3i0n";
 "uml.doc-0.11"="rhj5ivlvx43d8c700117lklmgardm76a";
@@ -7750,13 +8020,13 @@
 "IEEEtran.doc-1.8b"="ms8cp0i51knhhbp2fckkmr2cwlvyx4b0";
 "aastex-6.3"="y4ki003dd755ybn25iwr9fzh8cn8jinj";
 "aastex.doc-6.3"="x8lg7m1398a7fdh30yh1iaj9vpdv1419";
-"abnt-2019"="fj4wb6q7pw8gnh87r9ks86h76x0mik3h";
-"abnt.doc-2019"="g3r7s171g24fkl77b6y3khm6rhvjv704";
+"abnt-2019"="wd7i0nxrx28rasb5azskxcqvvr2dll47";
+"abnt.doc-2019"="r89hwrrbpwxd45iavd8lr8hfphcrh1l2";
 "abntex2-1.9.7"="zxahr9mb1vq0yfcj35znym4qx2jh4p53";
 "abntex2.doc-1.9.7"="hs3g3ji0knhsh0gmjcz49dvc547wh0cc";
-"acmart-1.64"="jw81rcgi34yaa2l5w66qrzazsnyhbxlp";
-"acmart.doc-1.64"="swxjs2nc6s40r7m1vixcsk8d4wlhsrfb";
-"acmart.source-1.64"="93h569xdnwl14wx10ycsyl4fz2qc5sv8";
+"acmart-1.70"="1zz9697iczfdiwdh37hx70kvsnvy786a";
+"acmart.doc-1.70"="q0f3xng9vqv1gb7jk8i6c6j7iam9m2b6";
+"acmart.source-1.70"="qrc4gy68w0zkcs904bdabgn7hcxrmi84";
 "acmconf-1.3"="9wid04wqz4l1xisvlng52xabw9m0p1k5";
 "acmconf.doc-1.3"="66xjqp6a86iq2908p77cz57651av2i23";
 "acmconf.source-1.3"="7ssw68bvkxxixxmf9ygp7szxmc59fvik";
@@ -7784,12 +8054,15 @@
 "aomart.source-1.21"="xf9126s1w02lxbllbzblzd405qg0ydsy";
 "apa-1.3.4"="g7ywm2jp0b70qdwmm59m4rr8glx3wc66";
 "apa.doc-1.3.4"="vjg7gj1wi6mb9b1qyfsznhgcbvivdn1c";
-"apa6-2.33"="3qyl47lciv0f08fvqsb6py1pyvf6sqv0";
-"apa6.doc-2.33"="a988adq52ii3kh28ra3hk71vgk7rxbzg";
-"apa6.source-2.33"="vjs6f857l1swfsnvzw53v9jw8spnmw4q";
+"apa6-2.34"="gq1rkj5hq03b1sp0a1gikw2vbi4a1z7l";
+"apa6.doc-2.34"="4nmwwb5z010k64p74f033myg7kcy9g35";
+"apa6.source-2.34"="149j7rpcbzy97nidnyw3z9b9jndh7797";
 "apa6e-0.3"="0bilb5nbgi83kp1w7d1kci1akg36nv1z";
 "apa6e.doc-0.3"="p7ir3azb68s9pms0gpa968gffr2qr0xw";
 "apa6e.source-0.3"="baqh9z3mlxqy4kklhnb9a66gj36lnhxk";
+"apa7-1.04"="ya377hz6phq6nrhshhvfl4q3789z95yi";
+"apa7.doc-1.04"="i567d7p3kfl8h1lgzvry9zg1qzzkpslr";
+"apa7.source-1.04"="vxzyy1zhh0409q64dnvf0ns8kdfgxyf2";
 "arsclassica-2019"="pk5gn6ifrhj5c33f78d619hq4j3d7nmg";
 "arsclassica.doc-2019"="z21lmz2x0sc7g6gc50j1x0hhzz96ra7b";
 "articleingud-0.3"="45hkl8j1hxdww0igp85iifrdz4g4h18l";
@@ -7799,10 +8072,10 @@
 "asaetr.doc-1.0a"="8d1x4sq5xpgc1kb5ys4dp02i2r1p3ha1";
 "ascelike-2.3"="b7ff1cj0jmbdr6wrvcqr37byak164fy3";
 "ascelike.doc-2.3"="sqynsfl8cm40n0r7v2a7qlhxx6zny623";
-"asmeconf-1.12"="2db3vqhghx1cyza2696vflsfvajbkx5x";
-"asmeconf.doc-1.12"="bzdzkxg25r7ms67jglacivy6bfr14ndf";
-"asmejour-1.06"="qkwsh5qwgvy8282m868hls9hj8szm9vk";
-"asmejour.doc-1.06"="zp3gnln8qj1g3jk45snh2l8z5w1zdp8l";
+"asmeconf-1.15"="r5xkhp1hiifmkpr5c1w7k7y3adx76c2q";
+"asmeconf.doc-1.15"="x09az8gqch9d65hngi191c2bvlxpd4j3";
+"asmejour-1.09"="ni1dmnhj9i33xk94v9gz28kzqiycg6bk";
+"asmejour.doc-1.09"="z8l4iwp6z1dr180xxwx2gg83n8sz2nv2";
 "aucklandthesis-2019"="gqqynyfp4l80jc7a90by84wjmn22s0br";
 "aucklandthesis.doc-2019"="mqasialmycia8nzmrc2m3d9pwf1a39r9";
 "bangorcsthesis-1.5.3"="h92q93ga8029hvd79hywxq73kaszm5a1";
@@ -7811,25 +8084,28 @@
 "bangorexam-1.4.0"="6s8rc4pgza915qgldk95ykqmxhf2czxf";
 "bangorexam.doc-1.4.0"="kxjxdnfljg1pracpx514adjp7ynbvvll";
 "bangorexam.source-1.4.0"="rf9s69qaaw2qrbyljcsj9pmg5qw4m18b";
-"bath-bst-3.0"="1ppl98wg6px20rpfs6rn8aqw4r1hs672";
-"bath-bst.doc-3.0"="yfh2hj2kzm0kfr8ckzhgwkzk7608zm8a";
-"bath-bst.source-3.0"="nczg3l893i16k3hmrrci2yvh1903a2jq";
+"bath-bst-3.2"="3iw0z4i51jw3p3h6s2v6ajvgmqag9mfm";
+"bath-bst.doc-3.2"="vc36qwvdx188zcrhbb5wp4y806grwfd3";
+"bath-bst.source-3.2"="14smap4zd5h7nw7ygiwchd7109xb857h";
 "beamer-FUBerlin.doc-0.02b"="k09b82znxfk7gi7cxpkffs65v3q5siph";
 "beamer-verona-0.2"="jgqm1267x276xsdikvc586h946xfzhcv";
 "beamer-verona.doc-0.2"="skxiv6nxw4vk3c7ppl2bripmlkada52x";
-"beilstein-1.4"="v59d234rg06vkwrqqcd58jkyc008qj6k";
-"beilstein.doc-1.4"="ysg1dalzi5mzznrfwmcirz0593d9pfmv";
-"beilstein.source-1.4"="vacm0gshx6r8lp12jc40wj97lwwsdw4r";
+"beilstein-2.0"="1lpc46w3g3bs4bgn66bg5bl5nzbcqsqx";
+"beilstein.doc-2.0"="2c6l8nqzk8cgzv4hw0l3n5jb538mhjsk";
+"beilstein.source-2.0"="2j7r772lybfdsqw809s86q4vwrblggj6";
 "bgteubner-2.11"="kjykk4kfr7iig49zpd26kga2p4kki4gq";
 "bgteubner.doc-2.11"="wi654djqdqp0hff6cshv1hfkhmgcacs7";
 "bgteubner.source-2.11"="jhqhmr6bb4ldma4dscl9l4csan3qrv6q";
 "br-lex-2019"="ipw7gwrsdv691vnv257w9i15f465irnv";
 "br-lex.doc-2019"="kai74ysi41iw5bc9rjv8saj7qh7n0s12";
-"brandeis-dissertation-2.0"="8nqvv44ahsf5nxn6m4qrd5yiarim1zr9";
-"brandeis-dissertation.doc-2.0"="lfpykcdb4yrf7pz7b1ljrissjlk4v20v";
-"brandeis-dissertation.source-2.0"="xnp41jb8wf2zlrcqikp6qxnhw9k6j1z6";
+"brandeis-dissertation-3.0"="bxql4xddw1kcp4jkm8sq9rj0524ikkj2";
+"brandeis-dissertation.doc-3.0"="cjvkrg5lmpkn698yawflfq0z2lpix30k";
+"brandeis-dissertation.source-3.0"="6g1d6w74w02lk2hr8yzgpd0656c3mgi0";
 "brandeis-problemset-0.5.5"="x7ivk7r7qvi08kb7jmdajym04hxyhzk8";
 "brandeis-problemset.doc-0.5.5"="zsa3r4xc2kfp00r3jj7mfzdxaphj7505";
+"brandeis-thesis-1.0"="q8pgwqm12272pv5i4wpy2nmdnndksgyi";
+"brandeis-thesis.doc-1.0"="wcdwhg8lng175v4xyg0dsfqdid5s7bi9";
+"brandeis-thesis.source-1.0"="sy1wpmdvp5snrvc0ffn0qm4c5yb77hjk";
 "cascadilla-1.8.2"="03g1znhjzcvxvclzwb33lrm6703j1xxw";
 "cascadilla.doc-1.8.2"="njy3lpaw3lch5x3p1mm07zis50z38ps1";
 "cesenaexam-0.2"="0n58an00m7xywgjxd4mk4jvr3wkla1sg";
@@ -7852,9 +8128,9 @@
 "cquthesis-1.40"="7g1w96hbvmqyq1g80w6s4mhsccwh2cqp";
 "cquthesis.doc-1.40"="9brf71cxxkn7dczvmqafg59lyf4y0qk7";
 "cquthesis.source-1.40"="hs0h3na9h7nf6rgm2vs0zv9ppadppj8z";
-"dccpaper-1.8.1"="p8hdx4gbjlpa6zg527003dngbz3b5h4p";
-"dccpaper.doc-1.8.1"="n68flqg7wjg0yiarwrza361rmaskw3md";
-"dccpaper.source-1.8.1"="h77q2ar40hfwsl4p096b8717kidy2kp3";
+"dccpaper-2.0"="h1yrq5symnq9gbgkf2zv4xz1sj7f05xp";
+"dccpaper.doc-2.0"="ih4ds4wmlrfbny1l949bbq90l2l8b565";
+"dccpaper.source-2.0"="vqp1lk8ppwa9n3n8va90xkkibxihid5q";
 "dithesis-0.2"="y0xrpjxnblvgahdwyfhm2hag5hss6qzv";
 "dithesis.doc-0.2"="b7ka35ywbrn2m3a6b8cyzyvajwxyvdkl";
 "ebook-2019"="08y1g19fvjskwm55g1av1x8bs95vmc6y";
@@ -7872,14 +8148,13 @@
 "elbioimp-1.2"="wp7pv78ijjgb48majhg8pjqcmkq29jbl";
 "elbioimp.doc-1.2"="0515vzg1miiljb8grlb8idsb2y9gfcdc";
 "elbioimp.source-1.2"="lzbvgi6d0w8wwf052v6a1gzz2qfvpkn4";
-"els-cas-templates-1.0"="2ksscb78z249vcm9p3m171nrfb2r3bbs";
-"els-cas-templates.doc-1.0"="f3h55yq38qa098gixw53a1zs2zy2v2xj";
+"els-cas-templates-2.0"="yga1wxc0q2s077qvk2hyhnqwxzd4acxh";
+"els-cas-templates.doc-2.0"="lh7a4nhklkk42a0gwqj7sw463gl6qwmq";
 "elsarticle-3.2"="wybpbhzmw2a1h76ik1m7dafh0z83537z";
 "elsarticle.doc-3.2"="1dpvggnxxpyvg331xsgnwnyzrj9sw2hm";
 "elsarticle.source-3.2"="0w53y3wskl6iarnpmdk9c154dp63pnky";
-"elteikthesis-1.2"="fq911ak06fd2h6brn2zsb20pkqgl4kb4";
-"elteikthesis.doc-1.2"="b5ja8g2vrf7gxpsfwshly6h3i0h0kw7d";
-"elteikthesis.source-1.2"="iyrmq8s585am0kb3ixgbi2g3n7aqxwr2";
+"elteikthesis-2.0"="5c5y98vwknhynzyyx94hi7s5jl87k86c";
+"elteikthesis.doc-2.0"="brxdx2p6ipx28wf3jm3asn3nc27870kk";
 "emisa-2.2.0"="5ap5gagakjpx889lpiz1knpd3z8fcff3";
 "emisa.doc-2.2.0"="x1qp5j19svjw388qkmccwlh6by9r5a1r";
 "emisa.source-2.2.0"="i3zqwl03w9ff9caf1nafflv8a3gvbdjm";
@@ -7901,9 +8176,9 @@
 "fcltxdoc-1.0"="gr5vxdra4lcsljhm591xs1b6z4ci2ddc";
 "fcltxdoc.doc-1.0"="mibli0mi846flzm0id9z0cr8x90rivgw";
 "fcltxdoc.source-1.0"="yn567l5sbbrrdbcmiqdpyq8kq5y1ni1v";
-"fei-4.6"="zfjscl3qvmawsfslhj0nkjqx4hwhvwij";
-"fei.doc-4.6"="zlql81212lv8rcsr04pzi80a72bg5bay";
-"fei.source-4.6"="rrq61x01046cd9824y9hnbllqjhf1761";
+"fei-4.7"="zcz43y8cv9xsyszz5r9wsd4qw6q4zanx";
+"fei.doc-4.7"="4zsz9sgj2c0grii2dxxcr324wfcbq178";
+"fei.source-4.7"="q19169lgprz5wmd24p4w2h5k5nwppigz";
 "ftc-notebook-1.1"="rmxxga464shdkh4v9c4kk1ihxy9vsl49";
 "ftc-notebook.doc-1.1"="l3a2q406sj7pvfhgw2zsxfyk5qyq0dsp";
 "gaceta-1.06"="gkwy4pkpzmykxm2rqldpjfh5q5m87ca1";
@@ -7932,14 +8207,20 @@
 "hecthese-1.3.2"="w882kxwpk80lrxl0bnqkp7mz8zdh47bh";
 "hecthese.doc-1.3.2"="fsrvd79g6588zisibmjzb137b4b11xyg";
 "hecthese.source-1.3.2"="d36nipvwmff2napcy14lgciw50061aw0";
-"hithesis-2.0.6"="phgkz2xkzy89q1gdw77qada1ngv012ff";
-"hithesis.doc-2.0.6"="sixfmbvs731n6w0s6hljj82w8hxd72gi";
-"hithesis.source-2.0.6"="s6xrir5z48h3zk8g4s8ydfp6hrkdk3dk";
+"hep-paper-1.1"="c1nncq2hhlxyqxi3lmzxlfsl56055vbw";
+"hep-paper.doc-1.1"="389fq3rmlk4cfz23mwpdp86b1z73f2fg";
+"hep-paper.source-1.1"="0lay616n9djpqhi5xi2yqp0wdajf2zyq";
+"hithesis-2.0.11"="drsv1qaj1wnzsnl1kqzq5k8c4g00xi0m";
+"hithesis.doc-2.0.11"="anqnh1ra6l9fhi0xmgks1yj46zp58irp";
+"hithesis.source-2.0.11"="a7nrjypxwi5m6l49paqc182jz5yh96f1";
+"hitszthesis-2.1"="zf5r34bsbmdr1fbvpyj2hc4b4z7n3lhj";
+"hitszthesis.doc-2.1"="lpnnwzsg7bwrdcskhbhlhaihssb1lbbm";
+"hitszthesis.source-2.1"="b8i11x2kkrjpfliq0b8jxr8qgpyl4m8a";
 "hobete-2019"="k2agw9n4s8imsfi399r1n3v80sdxc41s";
 "hobete.doc-2019"="n60jvwc9ca27sxbyjam8jpp6b73ydc4g";
-"hu-berlin-bundle-1.0.3"="sds4ppapjar9lhgir5jnxfgzbddp5qf0";
-"hu-berlin-bundle.doc-1.0.3"="k7y6kwi7x063ja0wf14yysqxp4b5k94x";
-"hu-berlin-bundle.source-1.0.3"="2fb4mzmmgnf96yfl8slwc8gnvads736p";
+"hu-berlin-bundle-1.0.4"="m39x7czjhkqd5yliw1kj3iwnpyqmj5jp";
+"hu-berlin-bundle.doc-1.0.4"="rlza70v4mslnyiwv1xz8gpk0sdlfwivq";
+"hu-berlin-bundle.source-1.0.4"="256nqypzyp0i5r1srs94y6q1qgpxgm3l";
 "hustthesis-1.4"="f7wr0296h2a3i6vahvrxysl7dr03sihs";
 "hustthesis.doc-1.4"="jknn279nybf7j78y4s99abb6znbkif9w";
 "hustthesis.source-1.4"="j828cim80xhwzjvn6drhy5qzr8sx87w2";
@@ -7966,11 +8247,11 @@
 "iscram.doc-1.1"="0bd1j3dqs4kgsdaag5wkv7n9zci8qgda";
 "jacow-2.4"="z7ag0qa8hzbihrqij6dha0hm4nkp14vp";
 "jacow.doc-2.4"="c08j0j2lc0awnk2l9bcx022wcxzswala";
-"jmlr-1.24"="rnmwix9b0hfdm6zys2zbzy2rx1rfas98";
-"jmlr.doc-1.24"="b7aj9p4s5xzpv2jkih803zx713lp212g";
-"jmlr.source-1.24"="bncl60ks6g38pj64ig53q0s3kr3fpws9";
-"jnuexam-0.5"="0krgibnimk7nlpyd8q93fyg3gynnr93s";
-"jnuexam.doc-0.5"="cygds83h5nrspcrfhxf426isxjzvajl6";
+"jmlr-1.26"="0dwhgsxcysh4bfsl1gh1srgm87rfw1xv";
+"jmlr.doc-1.26"="j7pr8rpwjvcf2yssa1kwqij6vw094jwc";
+"jmlr.source-1.26"="a3jjxbjrw1nzny0afpwnfqkliqg9srpa";
+"jnuexam-0.7"="jklladlbjlbr3vc1dyqvzggr87lgwqp1";
+"jnuexam.doc-0.7"="d4mrhs90v6j5pqab9hp86i1dfydvw6dn";
 "jpsj-1.2.2"="xpasajag9rdz7nr5xk7k40g181lyc45x";
 "jpsj.doc-1.2.2"="994fxd5c7947y4s7g71i7031l72qj26b";
 "kdgdocs-1.0"="i0v1kfpnhn5210jj5vd2pyi9s9h1vhmr";
@@ -7985,9 +8266,9 @@
 "ku-template.doc-0.02"="067zqymqvljm9ras3a48glc0clfkfwkk";
 "langsci-2019"="2wdzpxs9p7xkj5ka0hafr9831cifyp1p";
 "langsci.doc-2019"="iafasc98czzn1pkk7q2w2iqrglxzflhc";
-"limecv-0.1.3"="kvjmm481ihl7idl0z0k2a7qd1f83b2bg";
-"limecv.doc-0.1.3"="9lxwfgxfgpnkmm5pmikrgsp9kf4vfhvh";
-"limecv.source-0.1.3"="5fcyq9gad359zzhpara50rclrqm62qzh";
+"limecv-0.1.7"="8c6i2a0n5xmyb3swsndk7vvjqf2j4ayg";
+"limecv.doc-0.1.7"="c6mj9fyrr6m53xs2fixsaxcaywdj7nb7";
+"limecv.source-0.1.7"="cvvvclgxbcdiscdsm19pa4qbb8b2h2vx";
 "lion-msc-0.28"="anbklyjjiy9ssy1iy7sggx6mfc1gak9q";
 "lion-msc.doc-0.28"="knq0z2pjiwchnwja3jnxbsmxhyyppmyn";
 "llncsconf-1.0.0"="w9rc61m4yijyf6mb4h78xhr0h7mf3p9g";
@@ -8004,9 +8285,9 @@
 "matc3mem-1.1"="1w8m977ngbqivnhlaqsf6bvn7yngg3hg";
 "matc3mem.doc-1.1"="y6b8v00dhz5xg56kz04jql3rdrl0v5n1";
 "matc3mem.source-1.1"="3n9x1jfgrc8jigj8w2bmngk7pxqz9v29";
-"mcmthesis-6.2.2"="ff8c64hwmm0lrajz4lskk1a94bkgigf3";
-"mcmthesis.doc-6.2.2"="7qr2gimafh1li0kmvx2fa8ddbw1b28a1";
-"mcmthesis.source-6.2.2"="xsadfnmz57hhr517clv6bg8x9mnzsj58";
+"mcmthesis-6.3"="3sxh596ivd2sfwzb9vcyn4b0gcpwpa7f";
+"mcmthesis.doc-6.3"="aa86mfx1a75jphkyjvlm0b0gd19ng2hi";
+"mcmthesis.source-6.3"="4sr3z45i1zhjkd7z7bb5098bqf45wpih";
 "mentis-1.5"="nfpcmyxlg0gadqj33jnxji3nvs5fni9l";
 "mentis.doc-1.5"="vnj4lk1vxc0c0710jb21x3vskppk9c86";
 "mentis.source-1.5"="x8djid957v6324m74fn1m8l9hcp7mr1g";
@@ -8055,9 +8336,9 @@
 "nrc-2.01a"="pwgmkqwj9nh6c5ibhgz0gx4fha8y4mfa";
 "nrc.doc-2.01a"="y8ga6db77g42jblz5hpvk3vhcsj6zczs";
 "nrc.source-2.01a"="14br9wclpq3sfj0gcb8q3ws6nz3ws7jw";
-"nwejm-0.98f"="58q31l8g24gw092x9njl6mbpqfbv461f";
-"nwejm.doc-0.98f"="i7w6pfk5hxjmli2s9gbpd3dfsj71ncmk";
-"nwejm.source-0.98f"="n6x1i5y1swnm1vblxs3k3cc7d023s7n0";
+"nwejm-1.0.0"="055hp4xhv3r7pim4z9dxjkjk46lviw7b";
+"nwejm.doc-1.0.0"="mfjnf514b3ydrd0993am08xm6rj2qgrm";
+"nwejm.source-1.0.0"="1h2nw801s8n1lvpr84hq7yxq09cxn89w";
 "onrannual-1.1"="zfqaz0fi36py1y5izbphl677ny5mcrl6";
 "onrannual.doc-1.1"="hxdcfp7y4lcpc2j1d25sx3p0nga1435h";
 "opteng-1.0"="fnx8hnwcpahlkw6h2q1hbnkwa3kfr477";
@@ -8068,10 +8349,10 @@
 "pittetd-1.618"="1jjhfr2c6ycp2c6r3kg0y4fziq3vjpv5";
 "pittetd.doc-1.618"="9394r72nr766i8mnb24s4qr4jp15jci4";
 "pittetd.source-1.618"="s0apvlg01wkfzhzp5cgy3jwxx9z14469";
-"pkuthss-1.8.0"="kkhdsrrj8h227xbg7mifxgc63628c5rd";
-"pkuthss.doc-1.8.0"="1pp01q7aakicnjd2187vn2z52wp433im";
-"powerdot-FUBerlin-0.01"="r89y2lmmzzyln4jx6kzdn4rb84jz7w15";
-"powerdot-FUBerlin.doc-0.01"="gy9ianzkp3a81sga5i1xp4kzsnyppzb2";
+"pkuthss-1.8.2"="rvla82aghkzrq11iklb8ysvqklaky5pk";
+"pkuthss.doc-1.8.2"="dc60g5c9zagylhnhagi37yj6066n62x8";
+"powerdot-fuberlin-0.02a"="2wv4gd2gi1xvzmy83cp701hd7971xdsa";
+"powerdot-fuberlin.doc-0.02a"="jzdfhb0xjlx0cffp8ma18r99lvr26l2z";
 "powerdot-tuliplab-1.0.0"="x7ygn34dsmvncmaps2skxfqdakqkp4rz";
 "powerdot-tuliplab.doc-1.0.0"="s41i6f75xbl8wmnsblyrpvdbf1awbanr";
 "pracjourn-0.4n"="iv8vll5az565ki1vcjpacrcb369z2g4c";
@@ -8144,9 +8425,9 @@
 "stellenbosch-11a"="s0wddhmfp77y6v54qq4jsmqidjq3bkqh";
 "stellenbosch.doc-11a"="97wbyj0mg7phb66ngkf82ziiy8v624b1";
 "stellenbosch.source-11a"="0raanzzc5qjay7gz94himx8np0437pgb";
-"suftesi-2.9.1"="cap1rpj53n6klf16mc445n4k3r5jj703";
-"suftesi.doc-2.9.1"="jhwkziz34371zgr9sssji656hfr99hyz";
-"suftesi.source-2.9.1"="4jisrrzysq8gm1cr4dsinf6k5f49gwp7";
+"suftesi-2.9.8"="0cm530jnjyjm449d7k0ldd393j7k0arm";
+"suftesi.doc-2.9.8"="kzspydwv2f1ypg7d0cws48cwc42p8hrp";
+"suftesi.source-2.9.8"="8nkd1hypc0m3ynwy3af3067xvikdq081";
 "sugconf-2019"="9bgrgs1gqxlj5czai1l1m45z3z4xbr6d";
 "sugconf.doc-2019"="siyxf3blr7z953fm4xy61z4jfx589bcb";
 "tabriz-thesis-1.1"="psrla5z8x9icyxgdqnxpiv2vjnbq4rsq";
@@ -8155,9 +8436,9 @@
 "technion-thesis-template.doc-1.0"="8kkfqc0f3pkn9sm84zw2iqi133nr2sy8";
 "texilikechaps-1.0a"="v3x5w1a3lblqc3pks3yzychj64rvr67l";
 "texilikecover-0.1"="fn8g82q7mvdqaa3i14nsc95wjlp0ziyl";
-"thesis-ekf-3.1"="bbgsv5kal6shxd9sm7pjsgb9gz9syqhx";
-"thesis-ekf.doc-3.1"="b7459cmxvc392xj2mj27bxr8gb4622i2";
-"thesis-ekf.source-3.1"="cilr7qsq9lsv2jhvkzds1276cmc6nsa2";
+"thesis-ekf-3.3"="4yi93pxsd95c4ym6da2z2v84jfxk59xm";
+"thesis-ekf.doc-3.3"="4qwlwvb6xr8f142jky5mq1jhag3psql2";
+"thesis-ekf.source-3.3"="fm901cqg8ys36wfmyfkrgw7g5h3m3yrx";
 "thesis-gwu-1.6.1"="s6xwfmvvc6i8w9limmknqxp44l0dk7px";
 "thesis-gwu.doc-1.6.1"="s4hsb2vq46fdwlxsxn2i4dfcblp2jd02";
 "thesis-qom-0.42"="rnhdvsrpsgjbwih0ia9r1h4kyqdrhg6x";
@@ -8167,12 +8448,12 @@
 "thesis-titlepage-fhac.source-0.1"="zp492p2j40bpphwr3zhjcqiwnj18yk56";
 "thuaslogos-1.2"="jr4nwbd21jwglz99v1aqplzv2jbpn10v";
 "thuaslogos.doc-1.2"="i352h1s47cdbj957kz6c3dj3kwb7rj11";
-"thucoursework-2.5"="0dfnpgz9k0rnfcxd84978j40q9ybqip3";
-"thucoursework.doc-2.5"="2g1mix0k6jas8pwg3gayc3rwhp3bg1bz";
-"thucoursework.source-2.5"="g1503caaz9sfmxdvfkd1ia4hhlalcz61";
-"thuthesis-5.5.2"="1ddg223hv0lahjxfqp4xyam3dqiisrc1";
-"thuthesis.doc-5.5.2"="69b7zd315rns793kcblsdkmn3x3famc2";
-"thuthesis.source-5.5.2"="p4d8lhf6ajacbvqws7pjjwhvk4n9hgnr";
+"thucoursework-2.5.1"="gxr37nmdvd1j76ayls7y1k33h93m6g33";
+"thucoursework.doc-2.5.1"="gfzq02wgfm9p4il9z98yggxvqfdwz2h7";
+"thucoursework.source-2.5.1"="c3zx83bg3s8k2g76c7bj5wkn8gm0f8ki";
+"thuthesis-6.0.2"="5n80f534n6i5wh67qczibm8q5q9vfg6k";
+"thuthesis.doc-6.0.2"="72sgic1hxxy2cgskwh0qd32q5df5fq3d";
+"thuthesis.source-6.0.2"="44kbilkjc1i9c7nmm61jddy2n001fwyb";
 "timbreicmc-2.0"="8mnap2xvfny35sb0ziq5xhlckwcmgb3w";
 "timbreicmc.doc-2.0"="b649dhjapj0ani2as7783bphamp0hwsq";
 "timbreicmc.source-2.0"="8s3vn2id27cl1164brvkrxg96ggvgb3v";
@@ -8184,14 +8465,14 @@
 "toptesi-6.3.06"="dmvzw2y0ds92dli8sb5fwaldd0jh63c3";
 "toptesi.doc-6.3.06"="58d2smp53hc7kqymv2y206s10b14d9qb";
 "toptesi.source-6.3.06"="4030gxyzknihz1xy80j14dykczdz8qh5";
-"tuda-ci-1.11"="lnpnkdv6kpd31vga9358vfz1dla4923n";
-"tuda-ci.doc-1.11"="3gialzi9j38gm4h0cc9iw6z79w4x46ys";
-"tudscr-2.06d"="mzv2v046cg77wk4aqip3sp24cynsw86h";
-"tudscr.doc-2.06d"="vlwzb9lbpsjf43433lcfx38pzxpgpp8b";
-"tudscr.source-2.06d"="wwy27qw6b5a2hizca89a873i99dgaacz";
-"tugboat-2.21"="5kany9pm9v5mx260qhydlnvq3qvcixlq";
-"tugboat.doc-2.21"="9qidcwzj4n5bsiyla1rrgi9gvajmdmjc";
-"tugboat.source-2.21"="0lais4g13s4v33gvwy9qjkv56dp193z0";
+"tuda-ci-2.08"="6ha294w4xcip3ymk5nn9r43fqhqnb06b";
+"tuda-ci.doc-2.08"="8r3slc5zcs7y7afrx7pk59s2ffdbrmgs";
+"tudscr-2.06f"="jlp1xigdgbr0cscyxjs6z5kcl70z6i7d";
+"tudscr.doc-2.06f"="7v2qsq9hapnaz5cbns12j5hgvzpr0n5h";
+"tudscr.source-2.06f"="q41mx2d8m2xfcfvwaddbr5g2f5mjai5v";
+"tugboat-2.22"="h2pa9z0pcxfr4dmw6hxs8ha96qmxv4ip";
+"tugboat.doc-2.22"="drwddwqvgp8xb835z2g5s9wrwr8mfl1r";
+"tugboat.source-2.22"="63p7gmblqwk74ixgjj73cvwg35m1iccg";
 "tugboat-plain-1.25"="hdp8r703mch4096qy67y5zqjma848hh1";
 "tugboat-plain.doc-1.25"="36nn5cxa1rms40af14c7bbxrkz8y7q40";
 "tui-1.9"="s71xp2jz0v4wlvgvx9f9r62i2clj8grw";
@@ -8206,16 +8487,16 @@
 "uantwerpendocs-2.4"="l61xisx3imhck8sbqykhpjd7py573gaz";
 "uantwerpendocs.doc-2.4"="hk8a9gyw42wfp0300ya1zd7p69ycww4c";
 "uantwerpendocs.source-2.4"="pb13x65657039qbivjfpyni164fz2gbj";
-"ucalgmthesis-2019"="z8s5fzsbfbahahqgyj64g3p21xcxl3sa";
-"ucalgmthesis.doc-2019"="dkbfmm73kgrp5yi7dgy6ys84h58dj921";
+"ucalgmthesis-2019"="ijbimiv9xjwlxwrawqzw82f8ycahxwwj";
+"ucalgmthesis.doc-2019"="rbi9mvqdixa2wk7ankfw7l3vy1pf83j0";
 "ucbthesis-3.6"="3wa2xk8yvyh5hwy0d41p9fdrxvy8y2iw";
 "ucbthesis.doc-3.6"="lr9w29xp965yydg4mk93rpq4d3808ksa";
 "ucdavisthesis-1.3"="naibrb9h1lg8y22j26wygm9zxcv3rfc2";
 "ucdavisthesis.doc-1.3"="0mgnn8l7wwi7mhaqanfsrkjwydm8m2gz";
 "ucdavisthesis.source-1.3"="nkag4al3xvv8xnns5gspsq1ix6bii31p";
-"ucsmonograph-1.2.1"="hbsbmdmba2hzr36ganjyigg16cy7dd1p";
-"ucsmonograph.doc-1.2.1"="fip7b5zrciifq89zw9ivvzwfhzjjv1dm";
-"ucsmonograph.source-1.2.1"="k7cvjvv3yrcl10fc0csiqd8s7nrhh1k1";
+"ucsmonograph-1.3.0"="p73dkv6qazqwbn7826iyhbhkl1crlmbj";
+"ucsmonograph.doc-1.3.0"="4h30qzw3g5svyrljfdbvzh76pgpj3m1z";
+"ucsmonograph.source-1.3.0"="cdw1jffh4my2qisxgls1qvbw422c107n";
 "ucthesis-3.2"="kbq1nnk6d3vk378kk5wcwpzh93y8xv08";
 "ucthesis.doc-3.2"="515r7ha1aq9f0zxlgiz2zv2aph460aad";
 "uestcthesis-1.1.0"="h0cz0i3vnalcc3i77qhb941yymg6bl2q";
@@ -8229,9 +8510,9 @@
 "uiucthesis-2.25"="62smailyn66fyhpdgrmjx0p9m0j0n12y";
 "uiucthesis.doc-2.25"="ygqpzgk5jslsnqa813k0l2nvw2j8gnwq";
 "uiucthesis.source-2.25"="lkq6bvdvm6ya5q5wp263zqkk7y4ig57a";
-"ulthese-5.2"="rms2lyh9h1pb96v75xhh2v47md2z8wsa";
-"ulthese.doc-5.2"="fd9iw7jwfgj8y5yr4rxc5l5yw61g2x87";
-"ulthese.source-5.2"="6mhfbvxxmqpv5v57qxlc5acz9m2shsmy";
+"ulthese-5.3"="b446ranwjx8rc019hc595kqkq7811jfd";
+"ulthese.doc-5.3"="0xlr9ybx4nxzq2awbx0lwq456750s99g";
+"ulthese.source-5.3"="3klscdvz28ygk15l9f2pvpygxhnd0xwp";
 "umbclegislation-2016-6-8"="wjkna9qn6g0w0axsgpa80vc8d8jsl94y";
 "umbclegislation.doc-2016-6-8"="44hd3iax5vblcr03xxgxccmbrf4y5sma";
 "umich-thesis-1.20"="mgwbc9lzd25w17fm9j2098r6y0q1k688";
@@ -8348,9 +8629,9 @@
 "xebaposter.doc-2.51"="sbpqsj7cqhhhs9gq8jia92hxrdgnhzkk";
 "xechangebar-1.0"="1f2zszj2l5mkqv5zs5bs8g5w4c8rirpv";
 "xechangebar.doc-1.0"="xbirklnxaljhxxghr1prqq7zb9l0mgzm";
-"xecjk-3.7.4"="c8m9j43ij2zqigs6h2r17hbmzgiglfcl";
-"xecjk.doc-3.7.4"="m47k3b09wr6gd5im7qgx4giwmq55ikbc";
-"xecjk.source-3.7.4"="naazw07wpw01ilsmby3zww0i5ralk8y7";
+"xecjk-3.8.2"="qdr14rgjqi9hajzbl9g4b31pijd7wf1f";
+"xecjk.doc-3.8.2"="2bp2zjai1yvsx306aqmw2snacm1n2438";
+"xecjk.source-3.8.2"="b3b5sq5vrl5031jx3gsak9as5l3ly5b9";
 "xecolor-0.1"="pdybpn00rxsb5ipxx377a77xnmmf5i43";
 "xecolor.doc-0.1"="vl2lpda4kkr2q8gzj6ii2rjfccx6qvl0";
 "xecyr-1.2"="8zv0hcgk6f94mjb7h0vkvpz0yij6p257";
@@ -8370,8 +8651,8 @@
 "xetex-tibetan.doc-0.1"="m49lmg8669bbir9hcj33clc2v811xdvb";
 "xetexfontinfo-2019"="jzx2is0hbcggma6s0pdzq21hcb5j8vgi";
 "xetexfontinfo.doc-2019"="h4i3q0c5rpbw8pssb7d6nyy7kqvkkj98";
-"xetexko-2.21"="xi7pi65x4bkjzrsfyqj8iwcmyh4fv726";
-"xetexko.doc-2.21"="flqfvmaajg0w96farbiwipyi59vf3ah8";
+"xetexko-2.23"="0k7pgmhy6jrqj36bbz4i2xcg97mv03sq";
+"xetexko.doc-2.23"="f0hk90a0fxfdiyhv4vcy0f3f734r9452";
 "xevlna-1.1"="jwpjj1b3y45n3lksn9wvsh3hyccy1i00";
 "xevlna.doc-1.1"="4559f3ddvnis97px7180q0is9n4aqq2h";
 }
diff --git a/pkgs/tools/typesetting/tex/texlive/pkgs.nix b/pkgs/tools/typesetting/tex/texlive/pkgs.nix
index 31680913a9d8..64f24ffa0567 100644
--- a/pkgs/tools/typesetting/tex/texlive/pkgs.nix
+++ b/pkgs/tools/typesetting/tex/texlive/pkgs.nix
@@ -102,10 +102,10 @@ tl: { # no indentation
   version = "1.22b";
 };
 "a2ping" = {
-  sha512.run = "983084ca3d70eff729d81d5d52a74e1bf1f95e384916bc81d17be81290f70c1da5ac891c1665a2451975f36fd56ea0036e1d0dc46b2e98b61ddc660ac044c23c";
-  sha512.doc = "daeefb01a0197e3b7751614cb84e2926f670d36b7e8a389bfbbe39cbd941c4d10ef5112593bfb88e11fa15f7f7bb07f2538c7d0a68cefe1482bbdaf02d475512";
+  sha512.run = "4008c18f93a7d378c8da20bad7c1fdf19c3e6befccdcc804326168854fcd35bb89fe414b30a26dbddeaf81a11c0d404bf5b5459bd3d8adce49dc30279e3bd420";
+  sha512.doc = "7a7b6474819b2715c131485472963b463163378d4ae4ac586f17a130b3327c6dda1f4132f4f2379388a8a493fb2374abfff6b7ad87513cbe9d04993572692aeb";
   hasRunfiles = true;
-  version = "2.83p";
+  version = "2.84p";
 };
 "a4wide" = {
   stripPrefix = 0;
@@ -120,6 +120,11 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "4";
 };
+"aaai-named" = {
+  stripPrefix = 0;
+  sha512.run = "bb851e6bb3d9c2efd8d9abd32056d0853e320ee7f495b3c595d6a112d5e66bdbcb24107f741249fdfde350dead6763484cc412d380188d29155649b4076c4e77";
+  hasRunfiles = true;
+};
 "aastex" = {
   stripPrefix = 0;
   sha512.run = "387de695ddcca83c294a39846bad1cac883382f82ce1cf1eb481c12de181c062c3a451da084b42937d7f9bd86e9102acd4fac4b2f7323affbb33bedd558f6df8";
@@ -143,8 +148,8 @@ tl: { # no indentation
 };
 "abnt" = {
   stripPrefix = 0;
-  sha512.run = "e26dff31bb974379dbe8c33ce9a3321870ca0194ad6714e2848c427108626c066dd6c3ae7e0c7ce182f75cf928bb9741c09ccb3fecf3cd20c0f0b7b450219c45";
-  sha512.doc = "dd331cc5a403bcf10e7c9cbb551cc604e9de8df456a373e2b4cbb7ec397ced5b1bc48d0bad1fb9201b73214ffeb54cf0d7291e66b70af697a5638641a22443ec";
+  sha512.run = "eb5b8d75b345c14fecaef598947fe5a6a13c03cd58d77be91bf8155eed0192417358c33cd9e94e236992be9aa13fea9cddfc8c3d80f8640ad59b6feb58b3a435";
+  sha512.doc = "23315ea3d16bed57c979dd6e820a83243ed660d91855bbc58db77b787043410237f579e79f3ad011f418cca5b9afc1eaf5358147ff89d6d157f7608b3c1e6234";
   hasRunfiles = true;
 };
 "abntex2" = {
@@ -197,10 +202,11 @@ tl: { # no indentation
 };
 "accessibility" = {
   stripPrefix = 0;
-  sha512.run = "b001529b18f8782519156a63e3aa08079516ac68bbfbf68e991c0981fe9132b1ab07d429870e6b61929d3064894d0be2b4e66eac0647d068a0ac5db068e4ad00";
-  sha512.doc = "d40927f3ad33f3b4ae9996b1a40b5eb92f80fd79fa66476f4d98d8feb1c0232e2f072db20d7171cd9b8b8b118ea25cb2fab73d420ac7b284fdaeeff9ab7b3c74";
-  sha512.source = "c85b049111e566d1a0a5aea7b6e170d4310982b893dbd908317a51f1192b051a49ea17d6535aad4112cc76f13e5c29ba7070ff20a9d6d98b567072149972649e";
+  sha512.run = "f0d198f630c3184f649232fa51860b3dcbb845832c1441dd4f6513d4fae21716d3c75f4f405258a78bcb3918f7a59d19b3c8ea814896e5536a2c58daf0386279";
+  sha512.doc = "8248afcbcebcc179d438bd4394de64f8bcc6b07095d5ae4146f6a10f73eaebdd6bceba6fbf4e441a434d5e72bce0995281249dac321bcfda24074e9ba2085373";
+  sha512.source = "9a5b277ff4897b4b0c9ffd471fc923ca821bce1912aec64b742268042ad46a588624d64c3eab09704e0719b8fbf35452136ad10c21e7550c92909ca8d75f4c8e";
   hasRunfiles = true;
+  version = "2.0.3";
 };
 "accfonts" = {
   sha512.run = "f70105569c5b8ed83c103e423d29367702a5330d57f743a640ef68fc6a290b246e8f514907d63d6c7f203c12ab3eeb0cc64a45fe5c0379f10ccf1c8002007a47";
@@ -208,6 +214,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.25";
 };
+"accsupp" = {
+  stripPrefix = 0;
+  sha512.run = "0b6e474617333ca00c2503e99f60a290b930d7e7534de7223be511404aa6c7ba9a8dd69b94f3433b347146bba7b8dbbd4b6d45ed8b2c6b0880c0177842ba8b45";
+  sha512.doc = "650909f5212a92659d18ba3ef5209ed12c9b9ddff2b3157ea17cdbc8955536f41e43dafcd715e5ec26c1d0c839ffb7b26081ea36150b2f0f50c952c5231a1a20";
+  sha512.source = "e867fabe08188b8fe68c1d9ac6688fb99f69422db26b4cd611028cb8880ce90a8981efb7eb7c49f4fd3d1182d3b99cd90f171959751d7e1ecc1f7880d5a8b5a8";
+  hasRunfiles = true;
+  version = "0.6";
+};
 "achemso" = {
   stripPrefix = 0;
   sha512.run = "87882436a324828c3a787aabf5516f773afa35be70c64392117e356af18c37cca77d439f1cb88422cda441950ca40bbf624fc01ce3eb05d6ae22fa817bf8a743";
@@ -218,11 +232,11 @@ tl: { # no indentation
 };
 "acmart" = {
   stripPrefix = 0;
-  sha512.run = "ea2cf0785986aec984c2b2b147f3848e2930919e719dfff290faa427a384b0d39296b1d0e53e2dc3d871399cdbfacca702926a078517c8df48e2feed839b16df";
-  sha512.doc = "27d213d4e03cd173c5f78b5ab5184369a4ff9cf3dcd1487183b74ec2f8f8d6fa85feadb8675c64dc65e246a273b94d509f7af5331c67e9cb16c825d81d784f36";
-  sha512.source = "be3fdfd03914ecc4aff2629cc7f4ff8f82a08146beaa10c1cba834ea454a03fd907768022d97e5df0e7f157886a0f660aad6069c8578319b5a9a370aeb2bd219";
+  sha512.run = "c0fc4e8a8efa3f96ddd3cdc303f385569f0520c0f3066b1e8f85cbdc9da8727ef8800213adc274b6956ed9db74d98def527da156a4ac1ba6aa2449892068d240";
+  sha512.doc = "d10d6032aee87b89766bf9203327666efd8e4608a7962782444b1f585594fa96fdcd9dc62fbc529350259785b30d86d7bc0f8a9c727b89208cfb6936772259c6";
+  sha512.source = "6ae9cc2ebc94d3cacf070647613a4bb706ed140518501772db8f5ebbbd3c4f419f21deb2db6ca5f826cfc55ba6bf16dcc644dcc4ce255221c563bff10b50b452";
   hasRunfiles = true;
-  version = "1.64";
+  version = "1.70";
 };
 "acmconf" = {
   stripPrefix = 0;
@@ -234,18 +248,21 @@ tl: { # no indentation
 };
 "acro" = {
   stripPrefix = 0;
-  sha512.run = "bd768e27445f1557019cd3a7f598205fbacf14bee45e31b2da8f1d9958f90f486b6ef01788584565c61bf7bda2a03f12f4e64fb851f750f9b424e65def4daf03";
-  sha512.doc = "9a795393e82518fa5c9a50eeff22f5f6bc1efb42e6bb7cb4b58378799cfbbad6f1b676e5c5e502c509950c6d318649c6b60cdcf6f8947a590326f49eac9e5735";
+  deps."etoolbox" = tl."etoolbox";
+  deps."l3kernel" = tl."l3kernel";
+  deps."l3packages" = tl."l3packages";
+  sha512.run = "3568379b27e16b2356b38b7d1c6f241e3a80db3ede3a2b0b623b39296773a0b3451464cbd6344f5eb5e42cd2bcfb6ae0792ef3f9db2f9253f9fcc66b60e948fa";
+  sha512.doc = "a635d6f355f48ae2c435aa914ad98d2cab7feda07d9df7a821126eae46f216fedbf88609842bb931f397660afc3ff9399bd410678e03fae4cbd1718d2fde64e0";
   hasRunfiles = true;
-  version = "2.10c";
+  version = "2.11c";
 };
 "acronym" = {
   stripPrefix = 0;
-  sha512.run = "68468f027077b6ca895dce3127a78891dc41b1eb245c17f02810180bd0a66d4a5543596f7bce2d751600d49664833a93680339e0adf959681937db8861624673";
-  sha512.doc = "e5ca45891edb4b43f48ad8cef3cb4191e7e8a971a4a6dc86c4b6198aad74599c274fd68c3045b34b539f2bd673619ffe7410058139b39d14830387156cfbcacc";
-  sha512.source = "9b33c43c3573efa5435cbfaee439ed08bd9f46666dac143092f28ba0080b291f97b215fe73cda5d358285619396565d4437245031608fd52e50979eac2877967";
+  sha512.run = "152e25fea3adc15632bb4c5a37981e3cc0dc516d76927aa6842f51d4c3996bba41bef8fd65ed9983b1a4b5dcf194741a454f88e822a5c33b87f48ef14a22c983";
+  sha512.doc = "0fdd8e2d43fa4becf1de2e7f80caaec56c8a8897c2c821a8c13a3c90cd26a4c75b6906910f55493634fe3b3fc3d5b4e88571264bcfc37602b950f4875a040d61";
+  sha512.source = "6a30df35639273942bdfb2802b374882082afd29de8c3530ad36b99a1626c24fd0fae8dd43fa7f7e9091575006917147b904167b29daf9f0b6f7e6a3f627e9b4";
   hasRunfiles = true;
-  version = "1.41";
+  version = "1.42";
 };
 "acroterm" = {
   stripPrefix = 0;
@@ -400,8 +417,8 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "afm2pl" = {
-  sha512.run = "daff35d38fc35b83fc270c3d304e2383ce43b277e3e70645f957157d6e57cfaf4ce6a9191504404a9a0a681ff2167f361612cedf920f79e243c8afb9a9f3ecb7";
-  sha512.doc = "667d5a03190ebb1fefa164f854afebb0f703c671a2339dfb0558a547cb53072c6a5d8118c781884c559b8136b3427d08286f74abe31b0ebb021288474f0397c8";
+  sha512.run = "17a191fa347683f93f7d74e4b0be13b4690c84f0c17c084b10805aa1b5b057de6316836122114d1ebc76b1f8b4d134f6f5b08a21a8e28417f8259c3e52c12226";
+  sha512.doc = "0e175a69c26457719ce3aa5587f8857c77ea9bde7eaf59d33f7fda330cf73d0ea68060a83de09100d651b043ac60473dd2f25b8875566dc39d67eb6219be34a7";
   hasRunfiles = true;
 };
 "afparticle" = {
@@ -474,8 +491,9 @@ tl: { # no indentation
   deps."antomega" = tl."antomega";
   deps."latex-fonts" = tl."latex-fonts";
   deps."omega" = tl."omega";
-  sha512.run = "844257e47e80ae4cbd243dc2363ebd6524b97ebc87e02a3a14b8a650d28ba268acef6ea3ccb6eeaa22c12169981410970cd72aa57fd80f00881cc98fdd9004c7";
-  sha512.doc = "8fa6b630a6567afd7f0789182dc382df21cd1557d556f0b9854e2628ca369c578aced877af0b6ef55fef3f12d0b46a30f3b3c92e8e53cee3d02554f35ed4891d";
+  deps."l3kernel" = tl."l3kernel";
+  sha512.run = "a85d851b21d2ab7d34caad7d59daaead5f42920cf1de5bbb5ad01e825b51067bbaf05aaec519ec8d7eb6c77b07183d51cacb6827d860063578c9ab6b00a96254";
+  sha512.doc = "0316e421ce8eee32108057c4e88381da3c0b47f32c0daa18dedefd7dab08b7ea6905bf92fcc523030b29fbdea835594ce22d991cab055c80b122aa69e9cbd8aa";
 };
 "alertmessage" = {
   stripPrefix = 0;
@@ -502,10 +520,10 @@ tl: { # no indentation
 };
 "algolrevived" = {
   stripPrefix = 0;
-  sha512.run = "b9bfde7e4d0a36f0e55bfff77fd24f8e76553573e1ed2d8596cdc4e1aee74ba9cec90518b4b5a54153d42d85b9645c68c8de02fb28b15f294aef8ddfe7c16d43";
-  sha512.doc = "3f8cb6cf18d02c8b29cae7a64c93d394df958f5b8edf95917169730e95fd90121c52120c821d09bfcb9d335f0bfb762c42734cbb8f0b6111911dc8b1322dd9b8";
+  sha512.run = "d9104a0e083b249b2c623dc15c800796a0ed5c141a9886795bd9329defac3e912f5871866153eac7e8ab3b4bc33c335b93f73a554c30f8c0e4a4209dd1d6f498";
+  sha512.doc = "b85c938e9f527d215ba8fb98ab2f466a3a938c468fc58027c8c625981dc9880ab04c1cd87abe42029d3b69d5694dcbe0c7249fefab5e5bb951040e3c42211b5a";
   hasRunfiles = true;
-  version = "1.03";
+  version = "1.041";
 };
 "algorithm2e" = {
   stripPrefix = 0;
@@ -528,6 +546,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.1";
 };
+"algxpar" = {
+  stripPrefix = 0;
+  sha512.run = "7c42dc2037c4171a1e557eb1af38ad39037a818e1b97063790c7e987bd7b6e8e30c25e046d053dc67de3478375bdb62bf4e9c8c2210d4f149d8fa1d53417f8d9";
+  sha512.doc = "8568d188f107ceeac4b29be9b2ef69de8c6b4b22f8522047651de7fd6f77c9cbc985da87d7f7f7dfddccd65b2895324c029e975bbd115fa4f6acf02d6cb52f7e";
+  sha512.source = "405aeee3aff9f9f1f923d28f278c66a4235059c7998ec462ef66e48be35c1de77a2af971b5e168c45272f2fcbfa79713b64840f9e2ecc697c33425b6e40a1db1";
+  hasRunfiles = true;
+  version = "0.9";
+};
 "aligned-overset" = {
   stripPrefix = 0;
   sha512.run = "3998cd5515ad43e559da91bd1f25b835743299ec13fcf22ee9cb3aadc44c285f428ee701f5b27141c4d03c97b31a31e8620a2911854a1781ee5543a99073fed4";
@@ -579,6 +605,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.3";
 };
+"alphalph" = {
+  stripPrefix = 0;
+  sha512.run = "de17ab4278afc9fb308abc23c19d4d1ce117ef3b66a21b748c102b95722d3395016682e9508e135e2b01bf4ff274964df0fb723ba2f92c81873dd58d73a3a733";
+  sha512.doc = "a098159842a9bd47e6da930af94cf365629c72f539fc3d045fb33b4bbe2004468fc690564850b67549b3eeb2265134c92aecef65b47d16da732bcc5aa93d26dd";
+  sha512.source = "34e3c847a63de5a6e6dbea406e79fe0715a46c746f7113a5e8651838499c1d8b0a636c0bf138a1030c957e2e7cd17f848bf2285109642686f56ef95d18354717";
+  hasRunfiles = true;
+  version = "2.6";
+};
 "alterqcm" = {
   stripPrefix = 0;
   sha512.run = "da1bf55dd283082c5407b8ef8654f5da1b4f2adff120aeb7f2dad556dc01df18a0da16246e2b8b0242579e9fcc44fe0f4e43e8e6f9fea4ef2c67426699fdb3ec";
@@ -664,11 +698,10 @@ tl: { # no indentation
 };
 "amsmath" = {
   stripPrefix = 0;
-  sha512.run = "eb80cfebfbfba8403c2063fefbd9f779ea3d547fc6e7d15f47def3a77ec327e2674fe68d9303f7a3600c04be563f62272e2919387fb1c757246b8d4c33e4c24d";
-  sha512.doc = "4b426d8e89c6291d7325e665d2de8d33fa5552d348478c34495bff3afee29f1ce12a8c37c60d07f555d381099707b1378923ddbe12bbe52afbd33e1db5001ae3";
-  sha512.source = "8571ad765aa182bafdb6dd257020595e454222d00314eaf5acf08285383dcfa99fd900a74ce5b87446430c8ec158f001b79da9f4fe3e509e6d24b7db7f26f7d0";
+  sha512.run = "1982aa9f7345f47e50efe9f1e8be307491458e3689838cda328afdd704fa8e04e232187c0778b05848e46d49fada532b14b74bb0d327ebd91f821190b7bf1306";
+  sha512.doc = "9a9f7d065b3486d31a9db681757fa48d14d319232d918ad07fa5a8cca205a6e0023584eefbf36542bc5dfbd609b69b4801a8c95d7e38cfd9594cbd2afa862e50";
+  sha512.source = "c7f680fe62fcf225ae466f71d78578a8d48e34fa9a8444b4ad7730d6309eb8c7b74bc798e1b116aa6385a810f52c165505d915de66840b5ff42dc82b9f74acab";
   hasRunfiles = true;
-  version = "2019-10-01_PL1";
 };
 "amsmath-it" = {
   stripPrefix = 0;
@@ -701,9 +734,14 @@ tl: { # no indentation
 };
 "animate" = {
   stripPrefix = 0;
-  sha512.run = "973147378dcc608d797a9886059fb2beba6ea5f2a88a04d9f0d4570b4f6518db80f18a0a02435f673bbc95f809137bfeefb617c3b72257c3b92823bafc01c853";
-  sha512.doc = "46ce529a784fc1360dbc8aaaf99a7d22f0de0d54d676d5aad3fad197bdbca428ee5cc615d2381ca6cb743645253d6575987c1d2e80a88c8af95d3dbbaf6da848";
-  sha512.source = "d11b8b1ce8e89d2457b9e8e244103934cbdb3f0a2fd15d7c20d127de9b40fda55a8df601c95b18ea49bbf912dc3295878354702770ae63179e1f70deb535381e";
+  sha512.run = "1c8d528d2bb96d6f47ee2a36dcfc7b1f696426b799b2825cc4ca558d18cfeb6c142c32040dfe861f86a91f671358c45825d00a2b0c6eef8d44e4b89cb6f64b3a";
+  sha512.doc = "2839c6cd71a0ae63d4116ea4a71b9566f698cc77f727ab5dcefd6ba97f9d433b1b6b605bf564f4f86af0cbe2a7212cf38b3c384290c7e19a9c5342dfe8885a18";
+  sha512.source = "eea48e512e9167a08d214a04295c49c729d96728a2f5e70f6e7be7d4b4e74323f44d86d921853a7a22b4adab8bf2285f6749d50ec812c34c3ad6b4ec487b8180";
+  hasRunfiles = true;
+};
+"annotate" = {
+  stripPrefix = 0;
+  sha512.run = "bd31306b72bec73d4a2367fda6804e648ade536181d7a5c34d196591bb5fbd483f13a1e4aa2c28d3a4f29d0c74d37d5f1a77046b15d321c29176d9f742e91a72";
   hasRunfiles = true;
 };
 "anonchap" = {
@@ -794,11 +832,11 @@ tl: { # no indentation
 };
 "apa6" = {
   stripPrefix = 0;
-  sha512.run = "338e7bc7d97fc2b9c322d00fdc084d76e025584fc4584bc253f44ecedd6774cce38913e8ad0c08bb6bc64b63b83702d0a13e896f2e87b0760129e1b734b15fd1";
-  sha512.doc = "2e34f5094708aad343a716d96be89aaca2c86dc08da5280ad2146013e3df635ab9e49b814efb1166a9e43a3b98245f92f2e5144637bd96c13ee4e1a59b2ad04d";
-  sha512.source = "f73170f6eeadfe27dcaf0ffa7b66232eb7da5246b1630ce5794aebd6a6faec0233a3f148225a2df4e7c95af38d5005fe84e1e3cac1011bc7b0398113fd49d9d2";
+  sha512.run = "76a307c077ebec0ef984e9296018e1b91a51e95db8d1955924a373e82feb5152ce453d1388e706e6b0ca46f3dcc71a8981bf68848a2022cd19e179fc9ecc0bee";
+  sha512.doc = "841821dbf4f8efa07a96dc37d26e21348ef5e1c486ffabbedfe973833d2328b8c5fb32196ae2e0323683d1d20b635242c371262df92ccc0c4bbe126c89263dfe";
+  sha512.source = "b7571a14e100e65748c31ae49ca070c42b3c6d868885f2ee487c76561858aa19744b890eb7bac075c43208ee8d6dd91ef327f8afff2758a1be6c79d23d50f717";
   hasRunfiles = true;
-  version = "2.33";
+  version = "2.34";
 };
 "apa6e" = {
   stripPrefix = 0;
@@ -808,6 +846,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.3";
 };
+"apa7" = {
+  stripPrefix = 0;
+  sha512.run = "8fc5c0fa2417077725dc121b098f69fe23ab721d7f6774dcb2464123ffd18c148897588c8d420dd433d20af98ecd435ba637cdab7de5ea4134574fc6d1ade162";
+  sha512.doc = "4294a53e7ce87a02fbbf88ccf598343bc09284acad858ece888ea84735e83134aba4d761bf669a67f98ee400dfeb8d73502764c160df51e228a983ff4d945a7d";
+  sha512.source = "3a3e161294c8f5e067fada0b6aad7fbfebf80fff4932f8ef75a47616322f589b9350bcb5684c2eab0fd64abffc4916d813d88542e6d929c606633b682f0372d1";
+  hasRunfiles = true;
+  version = "1.04";
+};
 "apacite" = {
   stripPrefix = 0;
   sha512.run = "02b89374a1a61c7f972aa759b11420cbc7a895972a9b36dd09e48f0aba2ab8d83632949d6f8fbdd781170403639b765ee68a22e1962d13751af7fbd121a875df";
@@ -836,11 +882,11 @@ tl: { # no indentation
 };
 "appendix" = {
   stripPrefix = 0;
-  sha512.run = "ed3858af33069bf1cf5303f4fdd5ed17b1353be7202544e4e387ac9f428896bb24b9ad98ecfabda8a6fa9852c3ffe5179f1ed06a7377b4cda91e9b480d6a38be";
-  sha512.doc = "88298d222e63e3e122a60d63e1f8a8eeeaeadf0d7287ffb4a2db5dd5d6ee944b64d74d181ce5f5e2605577827cc9a64054312448b6457c26c08e67284c00447b";
-  sha512.source = "4778f0e2586b746957ae480e90f68a951c274be59588e7d22e2ebdf13514ff08e058c0793ca5c83433897c720d5371f0f6e847433405f0d880462933ad0707f7";
+  sha512.run = "efaf48867a45f8365755224123b9259f80f49417c409698420d67670baa969d5d354df1429fe7abbd87c29a8e89a9e084cd75384310a44d61e1f2fb7a2650977";
+  sha512.doc = "f4e90fc9fa5ca89a9a20ceb56cce788984f3ce5e55f92c99de966a54afca7145d9e3602c4e514ee6b7887b3ae9f8facc9b3191ada19514aae7c7886ae2984b0c";
+  sha512.source = "7e7222abea6401b749f2019fb205956c99bc3ce48134138862caead25aadce25410ac4fdf9ce10e34dbb802c07e5fadf8e4facaf846047ea654f2605b4f3743d";
   hasRunfiles = true;
-  version = "1.2b";
+  version = "1.2c";
 };
 "appendixnumberbeamer" = {
   stripPrefix = 0;
@@ -936,11 +982,11 @@ tl: { # no indentation
 };
 "archaeologie" = {
   stripPrefix = 0;
-  sha512.run = "4998ea296e2a3e6c94ffb23b8ef981ff88f49f886063fb6f7ad6a549dff1624bd23f0615ad7ce44358de7f79b87b02b5d90800c48b8de607399403c045750d82";
-  sha512.doc = "4d8e3d71d6516654dc96602dd1bcf7eeb0bcbb26fb87efc4cc8c78655140ba28d1d68b1fa42bf6a653e6058e7c648a190e18abb7a9ec1b467acf885d71db38d2";
-  sha512.source = "55e8e5bfb8f0845750a3b13545c979367f34a6de44e8714089c95c3df34b4b07bbcc058a30ef941d9e835b8a3e2070b92822a575f472410f388fe19780e08618";
+  sha512.run = "3bb26b77a812a285d5a6fffe4906efaef3a972a6078e6150531f756d39f1287af8746a776cdaec58ec1d3973da740c20f0352c322858f2631772532588d429e6";
+  sha512.doc = "fd3bf3deb244ee05b4ce1eb9ca81ae0c7268447a974e87d41e1cb29468129f7366702d271b1fdda2f5e3ac561a2cea82525877b2f5b077ca80f9bd6158a17608";
+  sha512.source = "2f91bb17dcc8b650a379fb1c39ab1b52361b01eb5fa8e77bcc53344c777c32ed5471472540359f9a6ba1053628f823e1e12838ca08e9ae8df0359a13948057f2";
   hasRunfiles = true;
-  version = "2.4.2";
+  version = "2.4.4";
 };
 "archaic" = {
   stripPrefix = 0;
@@ -1084,11 +1130,19 @@ tl: { # no indentation
 };
 "ascmac" = {
   stripPrefix = 0;
-  sha512.run = "e2ce69f4352eb45549488c4fdd26f9acb1b0dea0db86864de95fd72fc0f7f7b5105748bd54449578e6d13a33fc28503e3bba73a4bdd88466b7de3925c4e47a45";
-  sha512.doc = "64597bc037ac6760a14164ea55a32513f0e3b3026bf2e371247e528bc6acf071e81fe8b5dc724ed17ebe75cbacc3ff005c19539804a8f1984bdd825a1ad39513";
-  sha512.source = "026990d150f593a23381862b25adc6b93784edf02951089f3417492250fa9bf4873162b7869ad9f182b4ff62504dd4a24dc8a259f83e07e43499e01e40068108";
+  sha512.run = "f03ff628aced70ac2406863aa4b23eac26cf47fa09ee377ba78a8df3af633ac1f3fad8d005022c1555d957ec9d84f98eebf2dc97b296713a2edf5f0060d4180e";
+  sha512.doc = "e35257d0992717350e78e611f31f864651a1762dcefb76ba60510180de177fab02f634423b0f3c78c03394fe0eeb6191db0d534190d4f168922263526a85b1b9";
+  sha512.source = "3613b89f600ca51f1234f711816d041c4a3c58f72217b299505d90d0b7316606b3015c43edf3546fe93625dc628f232179ddcb0dce7a2f26375b93af7e6e7171";
   hasRunfiles = true;
-  version = "2.0h";
+  version = "2.1";
+};
+"askinclude" = {
+  stripPrefix = 0;
+  sha512.run = "909260b69e3f3cdab62e8b13b80a12fd19a34703267171a0f87dfe60651e4ab249a670a1e7854a3d63f00e266fa127b2ab1c13f949abb06afc49397abe7bfd54";
+  sha512.doc = "068432d6304e755f4231ddbf8cebb6ceca31ed040190e6c06d3bb84e8cecd66b40fc7e46650008a6d2effbaa24a7fb3aa43633e46b7a2f4edbd7abb08ee45794";
+  sha512.source = "201cf77a2ae05dc9bed78aab5206d384fb6bb11d6e112a08372948384b0a10d49823de85fa6dda78135c4312cbd28cc67579fa69c7756ec99e54b76f8b3e0fa9";
+  hasRunfiles = true;
+  version = "2.6";
 };
 "askmaps" = {
   stripPrefix = 0;
@@ -1099,17 +1153,17 @@ tl: { # no indentation
 };
 "asmeconf" = {
   stripPrefix = 0;
-  sha512.run = "6e834fd16bace20d505d13af26bca1347cdb8f5035172dc16f3fb43ad836986ed70409ac73fe2c410b191fd4838d9d8be8802687a81d883036118708600b08c7";
-  sha512.doc = "702fede94fc147e98e5b09bfbbb585c90430f90be5de9f82014909993b4aa2d8808832613bebf605ac742535ccdd5f403bee5e0630af9019c07d1dc867042497";
+  sha512.run = "2158d1ec6d6c4e57a0870e16d1f0308197bd5be36e853904c7da87893c4e1063447963bfb7a653a2a2d16f122645397e46658c6b73e115fd4286bba9152cc25e";
+  sha512.doc = "e25477a5227433f4115c2d3fd99585367c519678b8480c18434a3e1cc5ca067c3af0d4218403ad1a3041f8b18424966553b28a2099a82be44f06492359230f10";
   hasRunfiles = true;
-  version = "1.12";
+  version = "1.15";
 };
 "asmejour" = {
   stripPrefix = 0;
-  sha512.run = "3c3536f41691c251fb9d94a603981cd184c8cfa92776ddcac7a67d166f918fae1f20625870bbb3bd963c6448695dd4e575c75ef5aadec0c1dd1d412a2fef3be8";
-  sha512.doc = "70b3ee220e37957e992a6570b1b4668e8d7cb730a0e0d910228f0f2bf0ea1f2e9509b12571d01f7aad628114e52754305eec4389af1d6afe7dcdb2a697f0e542";
+  sha512.run = "14d0157c28e56292411595b7fb166d62b177f97edb3b1d348e98af3a265bf75ffcf3a779039d1c20990061c5e5e34d3d7ddc409c19cd824255cd777cca2a5e8d";
+  sha512.doc = "d5dedf38f02e993715f7a588ca3123ff811542cfa8fde29ca7be731a95de9f355bf98677d06f16c87ccd6ed5da80f6d87d41f877240c6db24cc6a6b77343091b";
   hasRunfiles = true;
-  version = "1.06";
+  version = "1.09";
 };
 "aspectratio" = {
   stripPrefix = 0;
@@ -1175,6 +1229,22 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.3";
 };
+"atbegshi" = {
+  stripPrefix = 0;
+  sha512.run = "7e03a9a73d8790f6603d53c11aacd01fb7108546e2d3b6ddbd5fce1e42d68ed9c23dfe41794b943eeea67ce0c598851132dd23faa95289789911cd059a8caad8";
+  sha512.doc = "8f6402dd0f36d4cc4a4674c0d0b37f012a7d6e557174ca3b58a7a2b33d89475d1e47028cc39d2b77c496bfae0751275369c5f4f49cf53b8c36fb60fce47a6bd3";
+  sha512.source = "8eee629abbe71332a00a7ffd41f8def262baef4bdfe9e314a4afa90015b30c77e291634f3e83d904646cdbe4820e3c6e0e6398383892ea26f62ad348ac2f3409";
+  hasRunfiles = true;
+  version = "1.19";
+};
+"atenddvi" = {
+  stripPrefix = 0;
+  sha512.run = "d936d42a3a5e2c4fa0dd9064658b450ea521e054c22ab9a30b3b11e0c093ba9961b3553b686021f0fbeae6eca7e40b2aedf3c42287ecb68a724c499007c552eb";
+  sha512.doc = "56f03915ef772c486e44b0b80ceb29543c2c1e2ede3ba5b4028af17f013aec8f3d373912aa7b1ef8b5f4524de5c0946833cbe418932dc3bdfe10a752a18035e1";
+  sha512.source = "56abe3e2c0b7896d4b5fa46f70569f5fa0a7f18970f8d4dd6255a3825d5a698467bbb18b84eb3400bc81ce799577f8d58884f7a1c5f38a1bc5ff77a8232d3125";
+  hasRunfiles = true;
+  version = "1.4";
+};
 "attachfile" = {
   stripPrefix = 0;
   sha512.run = "526a279f3fcb309cb117327f4206e7dce8c49d39b85a846799bdfea5bf453d2f00e14e854a74d544e49fa92ce056cd8ccc7e03f56856a8e8562b7105d5fd19fa";
@@ -1183,6 +1253,21 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.9";
 };
+"attachfile2" = {
+  sha512.run = "13fae92b9d6456a5b8fd322855040291ac4bbb30671ec202f466d87a6b461dedfc0ec5b06389bd745ee02e91b736b4c704c4b2095877a2164fa00f8ddc467f60";
+  sha512.doc = "6d94dae0c75089882298545ad3759f044101b2202cdec4bf87a052c6eecc2055b5936b9f6a4fdb9451cdb0f389da3621cba19a91f81c478551daf99c549db471";
+  sha512.source = "62a12e1d7e54caa097e3a83eb89ac9e363450dff0e19235c886d33c547965407a94626f45a1a049d0adc0af63dda1b91c5cee69dacfa8b1a12fb1a3c9c760ebf";
+  hasRunfiles = true;
+  version = "2.11";
+};
+"atveryend" = {
+  stripPrefix = 0;
+  sha512.run = "2a546be6d2109de9db60e94bea3a63a3c7af8ae892c8540a1513fbe4bfa505dcbdde9913b7a4449727df0ccf6957f8010c5b76abd8d6310c118b269bdc7334e4";
+  sha512.doc = "5c5948ab7f0ca213bb5fe3ae056cddd392461911e2af7dfff133253f6aae970d525fc752f154921de2186c8a443fa4f90b18d23896a016ebc9ea177d6826613b";
+  sha512.source = "1ec0c4752df403e47c4f8d4186167ccb59d2269012d904e9de1ec54acacbdb84b571f5bd1e6b645f7f86972178db2793853701cfa180b66ae7edc1d1488958b2";
+  hasRunfiles = true;
+  version = "1.11";
+};
 "aucklandthesis" = {
   stripPrefix = 0;
   sha512.run = "54c6708b343c2605d7779561fb086b914f1a7a825f5556b4a36faee0c8ad29b1c8ed67eaffae223c5e5d47bb6e6a9aaae4c0c658debb7bfd196d9362ae7b8796";
@@ -1230,6 +1315,12 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.1.1";
 };
+"authordate" = {
+  stripPrefix = 0;
+  sha512.run = "c67f75eb92a937755ef0a1ef0896ae3cc1c256008d864572503d3e9d3be1321d25be59e76d4d3ae443398612233a328b1d6e2da9c103f41b30eb088208701308";
+  sha512.doc = "156fec304fa95388fdbb386153482016a4d78d4862943bcd6124466b12df920498d5b42446465fc0f70da6353f58c329a27a822efb5cca8f0c4d7fdcb3239a02";
+  hasRunfiles = true;
+};
 "authorindex" = {
   sha512.run = "75e35298e4839f3975824624c7367504a26dafdf4b8e1d5238e2575c821f652282cd9a6e58fb4296b2c0345ff104dbd2281135776718fe4d2ecb76110946ab9f";
   sha512.doc = "a6c48d89cfd854d8acae47e318bc3951f8e81434d9a81901c8a7b7f1c25188afb013b94780ceb201e81b5d10efb7f5c24f5b5e4c8d8379aba390431707bc4d55";
@@ -1237,9 +1328,12 @@ tl: { # no indentation
 };
 "auto-pst-pdf" = {
   stripPrefix = 0;
-  sha512.run = "383de50023906861e45b9d6330962e89513aac0448a06af36057d4266ac1657fc49f650dfc9d3709f5f50879e6912ea93246225651412e8c919fe3ce0eb77f58";
-  sha512.doc = "bb0682378d96bef60480b8155d1725b21c89c5be04ad1a6dc108da871d8e25001be0d696cbe806cd7e4d69a9005a54f71d601fd67e322f22dcb17d0dc6addfea";
-  sha512.source = "fa24b5a7daf996b05384537fe90a17204b299d5fd837cdafef3bb338e9a9c06b3eae369271ffe3d090cadfcbf4d4b3979ad17aef908aab374b5d1c0465952c1e";
+  deps."ifplatform" = tl."ifplatform";
+  deps."iftex" = tl."iftex";
+  deps."xkeyval" = tl."xkeyval";
+  sha512.run = "2737915601138794b675c44441e71c372d7d2f6fa8d9af3abb2a620582c6c6f11853de0ca7410306e5279012ab3992ef3e40ea115643efe9eff7257b71686f73";
+  sha512.doc = "d26d65d10f4999e64e4c67a104aff38747824b88c290a21a4af3f2b0e5df8d9c524e1f7f62075453582b8bc0a87f32d72bb8fdf274f2eddb12f6984bf516f97c";
+  sha512.source = "8d7e77da20f8671bd562f8971e67f02b357aecc573ac7013544ebe289cde98da2affd1b80c14e32ee9f8249daa82ee83a98829a64cfb644723d62deadf214192";
   hasRunfiles = true;
   version = "0.6";
 };
@@ -1296,8 +1390,16 @@ tl: { # no indentation
   version = "1.1";
 };
 "autosp" = {
-  sha512.run = "dbf678612287af08bf9262467033c6aa69f6114886b3e681715f91abe232466a87d32a571b3d5261c31a4f07c9999a63ad08649691a7620702b9994845f2a386";
-  sha512.doc = "354d5a8d1cc6ef32b821e84957c9e19b4567495cf5cec72bfd25df2bf6bbbde0c6abadb3034edb356ccc758f28beef0198e112f5dc48ab731c5f26fec3f4e671";
+  sha512.run = "46d141e52aca5a538432d937f398d8bbbefa6fdba0c002a82d2afaa7bb42367e4f13638a79469a668b6630659e34fe64852e1f1c99cf075e553e1dedbb59762c";
+  sha512.doc = "f7c7c63ef8bbb122137f5d35ae5f6be1e306f169026134b330cac458498d1f3f898c442b999f6324abba2ea41d513d6c3d87a499ef037240e82d67b7a77a8eb3";
+};
+"auxhook" = {
+  stripPrefix = 0;
+  sha512.run = "8ea845a19818df2df7939031e7b251b4b4d99a17c0d1b8177a592275bed6efdc660266964e0639222b86cfdd897bcf13302f1477b997ea1a06179cdd44aff0d1";
+  sha512.doc = "7c4f850d93f8a6d25a35e762bdb2df26384c75ba1cbaba06806964737badb2f7c8ba3192c62df7e7f3de12c6fa117ebc525c735e696a9cafdad943a8cfeedabd";
+  sha512.source = "f378f365c8fdee267224d092b35cd2bde971302cba003edd24b3f0a06bbd59e077096580e65480cb66adc6488aefb688ea423d74334976dfc92168688514e0b4";
+  hasRunfiles = true;
+  version = "1.6";
 };
 "avantgar" = {
   stripPrefix = 0;
@@ -1319,10 +1421,18 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.6";
 };
+"axessibility" = {
+  stripPrefix = 0;
+  sha512.run = "b7628e6b5f8a46fb4b7ecf7901b0836142e3ba5947dfc1d7e023ebd5b46665c72b3bb0c77b192e1b1c2095f1fe4319749a9644b22cdabaa651924cc8a22c83ae";
+  sha512.doc = "b329855249999b41eee83fb0c679210714173b5697f4405b8b4edcfc2e47290f66ce281128179e688a2284481cbe71cc50cbe7a9b4d039db977749bb783a47ad";
+  sha512.source = "e522fe38a080b1823b22665d7954f6944a83c28be4dd7493c2a2624ab05f552866f4304c68573f2490dcf31e85508b5b537adb106555777648fe4d0f999382ff";
+  hasRunfiles = true;
+  version = "3.0";
+};
 "axodraw2" = {
-  sha512.run = "085aa45989c7a452f64d3999e94806fa01120aef36e5a97d133f65e56eb0348aee3b75a871bd5ac460df47e4d77de3db930512a833da4ffda6722a314ff51f86";
-  sha512.doc = "b30b2fa595920e28c0b25ac69f4d91b724bc12059bc10450cb8f5d87cfedc19ac6d0f0177d5c97d42509c5db016202910a34de5c0c30cc9f148b5407ca9ad23c";
-  sha512.source = "0680c1e0bf7818b59c9ee9ad0eb25c41abbe82ecce334486dd2f960f1dd1f5edae2e509ffe0a29d66aba961c062ebd257ac9fd03fbc37289540c1bbc809e343e";
+  sha512.run = "9db94d97812b93c81542319320710d4b6f5f21ced10215fdf4b4d6eddae89151a8b01d0bfebcace099d259c394ea8425467174860696366cddf7527695029734";
+  sha512.doc = "a24da2094fedccf5b7d61f97533b9c62f3d0ab637aff347127cd79fc81223e1d8616059b450cd7f9ab754895dffa56c84af8783e949a84c7f6361898617ca121";
+  sha512.source = "722430e741dc848f1465edafca74affe0f02c02d556eb311c1a4471c1cc0de1801245ecf322dc702ff8d491555768323969d545f06f297dfea2802d86544f323";
   hasRunfiles = true;
   version = "2.1.1b";
 };
@@ -1336,11 +1446,11 @@ tl: { # no indentation
 };
 "babel" = {
   stripPrefix = 0;
-  sha512.run = "39ddba69866680f14de203c60d16809efe3900a9318d61a8b77ff75ddd20ea0ef3e058077a6e24edd72688bc92d8844ec681ffeed025ffd6d3815932e3c04709";
-  sha512.doc = "a5bc5e6f8fb3edd0e54ae0cd64223a06f9b5be7870c60b19851ba330e8066dc244560e95db509bc26a79f61a79355e4f89e635a98507f6ca47515ac718afbcc2";
-  sha512.source = "6bc89db2e3382b8a5e79936c7ea2fe5380db8442066afea4541e250ec2ddb0ca46283257652c1f6fac4eb0ad2e6c37ecae9236374c5d01c68cc0c2dd31809336";
+  sha512.run = "2f86e0a45d4911a3a1331c7c42e42903c89f3c2226773caa42a4ddafd11990df8be7b76211581fc4c6ae49424466a78f89b07d41b9b7a86f1ad53dda7b1b66e5";
+  sha512.doc = "fccda4835fd0b1a861e6da181be38db85c4d27718de81a33aeb64765fbeeb6d31ad003b4b3dd165a579c29618cca01d8874fb73c1c69c3e0dca0e3fa70bf338e";
+  sha512.source = "a7de843ec2a5dfa920d32901206a1818e61c4afdb3b5f09968b8d1adfc03742a25d0592d2858dec5258947ab9524959880cd614b6d5c72703ac1fccc7bc294ac";
   hasRunfiles = true;
-  version = "3.34";
+  version = "3.41";
 };
 "babel-albanian" = {
   stripPrefix = 0;
@@ -1472,11 +1582,11 @@ tl: { # no indentation
 };
 "babel-french" = {
   stripPrefix = 0;
-  sha512.run = "f8fbcf377cc0e66b0fad4f5b2123a8d3931ee3c0d46ed1d23435c00508fa26f4e24b29eeacacdee2c4468b412346a48fd5684fb2e9a8d1b90cd451f2ec6cc8be";
-  sha512.doc = "69f19350e4929d5acf87be0241776612ed784f5493ece6dbd701ff1ebadc2208c11353ee773c38592e084b6f1e709b3b39c3c53fbaed737581eb27d553e174d9";
-  sha512.source = "544cc799881b56a6623eb64e0856d6f5b9d1a005fe6add8ce7752924616539b1045595c079b80e3b3b3f19bbdef726420f765f51511354fc61098d2c3fc8d63d";
+  sha512.run = "3e90696f5484f6031dc0dda7189ccd28adf12b1f75ee731bc91e5c8e1395f1ea30590980180da91eef20f3a3c271d581ff510eba6660a8354d9c33e67798cb13";
+  sha512.doc = "ac711c3ef2647cc17897f1388c26ca81254da83bfc4030929f618c68d5fc7cc1ecfc7d992f29cf8acbf2c445d31f3f80db8360146bb3397d393dfad111d99dd2";
+  sha512.source = "a691116ff8b0af3113dfefc21377300d9d8a6fe3368e2bab995a69fc7254741c7d6e0839b85659f7620579052bd50e08db5c8a4273f7a9d971f423ecd17ddd71";
   hasRunfiles = true;
-  version = "3.5f";
+  version = "3.5g";
 };
 "babel-friulan" = {
   stripPrefix = 0;
@@ -1511,11 +1621,11 @@ tl: { # no indentation
 };
 "babel-greek" = {
   stripPrefix = 0;
-  sha512.run = "4b4cb6cc75cd7ff896a2881402809b253e8720140ff80b0cfdb85f6cebd3cbe9b095d7fc277574525d3601f9aa3c1546940ecab65bb85ef216667b4e42e1aa46";
-  sha512.doc = "cae49d0afd7db0191581189d0613ca0fd1bf906e81232ea4b0ec1db9b90bdd7c724833ad4ba72ed193b62817dad41dc62e50d4873c60f5642e97ebfb20706be2";
-  sha512.source = "80f955015d5cd62ec84c694f61525ae3eda442a00fb9d41997c465c9c8df70ef50a103aa94ea3aba51f01f35f70b4ed15e1e02a3791386d1cf506dba390ea9a0";
+  sha512.run = "2475f93fa7ee64412a5dff0934cb85cb1c07dc54c3ff905548bb0c4d32cea4580b16d0f43dc0f533bf7996f429888bff6425b8f138bc7b87925c4305bc7cc47e";
+  sha512.doc = "ecfc024317b75bed8428a743c7b3b5c0dd3b06979ec4e90a1a7d06694b019e08cafe39e94db866dbba8c34be78c84ff971d5ef2c7dd2c41133cbb39a7f34e5ce";
+  sha512.source = "6f5d600ceb31a83d4c40496e19e44fd0ad529eb4ee149feecdbff1b9cdbb3ef8c98d51d7d0aea688447cbc86bab89090d21a36eb8438224255a157ada08e7673";
   hasRunfiles = true;
-  version = "1.9h";
+  version = "1.9i";
 };
 "babel-hebrew" = {
   stripPrefix = 0;
@@ -1566,11 +1676,11 @@ tl: { # no indentation
 };
 "babel-italian" = {
   stripPrefix = 0;
-  sha512.run = "5950227b917860a1954b8050ce2949cf5decb0340abd1bad36464a73f84f0a0f86ca7f81c2c412b90a3d7b12a9355d383391bc2eae6ceaaee9328dc4b46252c3";
-  sha512.doc = "5be388f15aa9a2a84e9770f1be49c6b2cc1e0539d5ad9149ce02eb7154253292105d10f83ef291b30c079b0fd29aed53394ebb9270cb7326a0e94014aa0e9403";
-  sha512.source = "5256bf88ae2bd3160cc1b11a757e0541e0dc5be05e6a0033ab5b4471d75845265921a2771320f397f957ec4f77882577bb23bafa1b91eeca74af7ff9570b3857";
+  sha512.run = "9dd2d58f0d730be0cc5319eea1400b8644ba107c81f9d4905842e5c5a4bfb20402e2d67ede0a1c1337e166c63f8c1e90574e11b18275596cf24764de671b3a16";
+  sha512.doc = "97d2a498f4fd9fb8cf1561117b5eb805dd17c7c09c85addb510a62adbfd25ad83cf23e4b97a234878cb735f986245363a1b9f9cb2ec36f67bc45408b05539b48";
+  sha512.source = "98cc8e42965bef45e30309d0e3f6dac1c39d4964e9aa362552c5bd5aeb9a583f94c41ff5cf3ee6ebc7918588ae6f0bc3913dad0226dbfea98b301deec272ef73";
   hasRunfiles = true;
-  version = "1.4.01";
+  version = "1.4.03";
 };
 "babel-japanese" = {
   stripPrefix = 0;
@@ -1700,19 +1810,19 @@ tl: { # no indentation
 };
 "babel-serbian" = {
   stripPrefix = 0;
-  sha512.run = "5c048c0d2e04820ebd3cd22808f3c960e43dc715d9425ad0369a47cf38086f3995b4dbca491f05a4cc1e952a1c237bc6f0af9d4758ab970de31494cd45ab264f";
-  sha512.doc = "47bacc3ece71805524b057ff53b1acfb99a84920aa0ee0a7ac2c059f2cbcbeaa1b40c99d93fd3177dcb3a5910b71679da5c0a25618d3c7222ad2718d839bc5d7";
-  sha512.source = "33aca6ddf3454dce1978348f68e64492aa5993c60ab0d8e7fc8b448c121aebf5d8b0b0038e56aa7d370e8b7d18d5c40a3043950b73a2a7fbcb989de77f9dc853";
+  sha512.run = "7c2e8e6cf0cf320f5907d3f39c21072c1d478ff77ed78b6ab461fabfc38e2d93fce7c3cd93ddb66adb768bb10c64dc69f2f83709e36163f9376f89811c77eb97";
+  sha512.doc = "7acaf09d1583c59fc61ad05009e4829b0f1c320529fc093b749408bf1ffea347c1f440b1174c6340d4d128ff7ff1017b28403cc55dd4aebf3467b629f8f46171";
+  sha512.source = "5038823f38991cc0fc3977ef719347d394cf7eb6dea84a3a79fb98de8ba1f5039d2a1992659ec90914d823984ba71f5d17bf48ee7d832705aa7cfd9cead12a9b";
   hasRunfiles = true;
-  version = "2.0";
+  version = "2.0a";
 };
 "babel-serbianc" = {
   stripPrefix = 0;
-  sha512.run = "bcf0ff70ccdcd6f3e74ac54ab0acd0f5d804b7d7e91c86524242fd75423be3648b09d878f001c91417b3182fdaa6ac4d4836e71668e97c1eb124df9f13b82e45";
-  sha512.doc = "a43cbfd660bf909b90cd135589285ac66bae3655d00869571fbe76cc7016b45eb9899ab76606bcaf25b065074f78baa5d698dc196d1b302d2103103bc35ed0d9";
-  sha512.source = "0eb121cc4eb9527884a39f0c8ab2977f39889f4d41439039f914a7faf7d2cee85b8b001592df2945b41c3cd2b5f2e03a1feae78db1b06c0cebdbb27f83f5a8fe";
+  sha512.run = "b449ff8aea679484585ca92e47c256efc589657333818f2a4dd47344b4df8926149718520fce18a99ff2c37809873f112784b0b034abf73b1fe6c0410843bcc6";
+  sha512.doc = "a692cbaf4f42d6829bc89972dfab6a7045119b9e7f75c2416aa15492e73bcbb51687d6a3a9b7a860ea618602573d0fbbc6251068fe59e91473e9a8cedee7295d";
+  sha512.source = "8457f2f0b79989905ea8eb706fea487018609ed03c7cd70764beb0c940d32a3de642bb4bfd4032c974ea086ce31b1cdcb75a092fac29c66e92161c495662e931";
   hasRunfiles = true;
-  version = "3.0";
+  version = "3.0a";
 };
 "babel-slovak" = {
   stripPrefix = 0;
@@ -1887,6 +1997,13 @@ tl: { # no indentation
   sha512.doc = "6600ecadc60fdd00e4d894969a84118265b5c5d07e9a411d3f01887fd1e94c481b117cbda80451774294dbb989a61379b16fe3ba5c3b8363a9a2485b76752aed";
   hasRunfiles = true;
 };
+"barracuda" = {
+  stripPrefix = 0;
+  sha512.run = "8331d0a9fd3504eef4e759e144bf34682f55c0bbf435aad9f53671083af2a0c766180665348fd6de4668c67b7cbb3690919619b2a0b175b77f76caa95a951328";
+  sha512.doc = "8c7be1abea65248e0f34bd9b538aba2018058688a19d31c696ee964049d44046f4f92117b9db8a1056a4b5e45dcc8aec843971886de69214f0dd3368e1f4c3c2";
+  hasRunfiles = true;
+  version = "0.0.10";
+};
 "bartel-chess-fonts" = {
   stripPrefix = 0;
   sha512.run = "33c52620d32f5e79a702bb664cfcb47409faa049dbf7f34cc5816005b4667267810fab130e3aee1ff7a7e3292af37c2d376c01dd2bbf17be199a22cc36ba751f";
@@ -1918,17 +2035,17 @@ tl: { # no indentation
 };
 "baskervaldx" = {
   stripPrefix = 0;
-  sha512.run = "e3d0d7c0329c170f2b88a9696b96bb7e19b51470030a039eba34f6bf90f033ef6805bca13227415dd69a636ccf0eb5b45527597128bc412ac9ae9415deea1e78";
-  sha512.doc = "442a8f29795b3af8022e0a4753807e1f2060f53e06257d5198e8e23cd7615a20869a90eb7f50649c4773fa2d72faaa038c579738b3c5f3ba47c796b00afe1720";
+  sha512.run = "2351599211d376c25243504645b32f6b6f14967e5a428861b0ab9218fef35f6111b4c0822fb4e63888c4628246cee80863086921e02a069ea010fd21d09cee40";
+  sha512.doc = "93ca07e01ecef3aacf09be060744cd91a16cb18f54c2841dafe1b40f046195deac555adae00bdff80577ecb3c9081da856a1eba2870be8d0ae182a66f1e05ccf";
   hasRunfiles = true;
-  version = "1.072";
+  version = "1.073";
 };
 "baskervillef" = {
   stripPrefix = 0;
-  sha512.run = "ee8de6accb53b62908a025fea331a07570bbb016c7904fd700ba9ed584e482dd993ab04b7fbf8e6517d3a573cea1b6a055d3b3ea7ad03eedad2fe14aa8893191";
-  sha512.doc = "942d3d68e79cf65cffbc73ac225a6020655bce8af27d616de784747225cd6de51ca606963daa55fc698c6dd989ce12ff1a0103ba3b9391ed6aa2edadadead829";
+  sha512.run = "ae3f2b3570269852bb558a8b7db6db1605d520276b57558d67459441e911f67d830fecf44c61f9db71bedf65ac1414b26e152f4e0657d7ebc9d42028fcd67d2c";
+  sha512.doc = "559763ae59222eabe3666a9422950bd15b089481b2a39ea0eda80aac3633ae38b2ba8c67f7fb750137bcb261c6109675bd48599c8706ae6de8ff152e5e8518c9";
   hasRunfiles = true;
-  version = "1.047";
+  version = "1.050";
 };
 "basque-book" = {
   stripPrefix = 0;
@@ -1948,11 +2065,11 @@ tl: { # no indentation
 };
 "bath-bst" = {
   stripPrefix = 0;
-  sha512.run = "af48f1407a950028fe68ebda82db1091c511ad5763416d60dc7df4ce6ddc080a4a0eaa9cf3385a27ecd9586fece07ee02f78e1f8df9446697bcb9c88aa9b974a";
-  sha512.doc = "4738ae6f96c75f9cfa222ccfc8acf300c5844d19a1888ff23c52f6f7dd4d85bb0065728734fc6a43ed7fae507e34cd40c4a2b7240b4644adff9eeb05e6118e4e";
-  sha512.source = "50ace871f9adb958618d128d48fc204a188a6c94cf4bc986b3605518050df19c990fb818f6cfcafedda868c7254d1bf1e05f51e075754e4e2dfb8528fcf45f20";
+  sha512.run = "6aaa7b85e0097532857f6ca91f3daf7b5d69750de57f3884f446b0d778dca9cf752abbed289128e575cdeed1d74970684bdfa701318303ef9536170d0289be74";
+  sha512.doc = "6678b1ad382c4e99f6b494ffbe002e17df088a76852e0ddabb15d252af38c7ddffe4686189257c0e7ab18525e53b2ad6809c922d319df777309fd2d08d5b6f04";
+  sha512.source = "6726222bbe8ef5185f375ec706c408089751f65157a5b8f9ead9c4c72ae778881365f6b250851ca33495d23801b3f74b8d97cf093dafc30f989a19fc7a828216";
   hasRunfiles = true;
-  version = "3.0";
+  version = "3.2";
 };
 "bbcard" = {
   stripPrefix = 0;
@@ -2096,11 +2213,11 @@ tl: { # no indentation
 };
 "beamerswitch" = {
   stripPrefix = 0;
-  sha512.run = "9fbf8189382ecee21db66a792beb737a89fcc690af35c4d604eadf0aef61669df5c5a629abcd86a8fea3d53a424c86bb233aec0ef3ffda0d2bbe156bf227402d";
-  sha512.doc = "3bbd226e69390e7a9add9d076e9b60d910a5c63669d679f171cf88d159ebb5f9fe48cc93e334baf27078d03c140a7607f5cdf927a17b6319fbdd7d92b54cc10b";
-  sha512.source = "31ca49fd909e406d2d679cbaac8cf2e1fa0aeb0feed61bd6600f83e5d58c970df0e2072671ffc73944abbccbb42b7e83384aee94ad8e5e68e60f456dfd537274";
+  sha512.run = "e117e71b17cf08b9194edb502fa60b0e551e80db08e18fd56c7b3e1a23761b47ccaef2fee4aa547bd3c04ff8ab0fd7b3128d2fecf972fe389cff7bbcfeff413a";
+  sha512.doc = "f893371bfc9e636d0b5bdfcdcc6209fa264744887ab145eb23335d891082b091d809bc1ca59d75163d8f95179221235327198abdf87bee7116bb0b5271523697";
+  sha512.source = "693f6a0bb6d690926f7bb4fca34126155a3999841664a8847902beb615d3b0f037fd01328577a7ed5a16532699374840889f3d015b8e3a6dbf5f874131726822";
   hasRunfiles = true;
-  version = "1.6";
+  version = "1.6.1";
 };
 "beamertheme-cuerna" = {
   stripPrefix = 0;
@@ -2125,10 +2242,10 @@ tl: { # no indentation
 };
 "beamertheme-focus" = {
   stripPrefix = 0;
-  sha512.run = "52ee3fce7ed3757003ed22aedc66e7fcf54786cddd937920562fb9e84075e682a4fa9ac6af8c35e10b7995c92b5fe1ade1804194cb7ad7acb6e85dbc4e59ac85";
-  sha512.doc = "cdf902c6b053ac56dfd450ca4e6aa0e3eb2b12eadeaa39618f5603f409e6ce8ca69e617c6eec574b4991a70264579f3c9f533bd196c18579755d82a6c869ceec";
+  sha512.run = "8f863bb0b42356e9d4b11d62020bf81c84662c71820101fa2e5f6303d8da8cff955cd370128fdadded781afdaa0937630733fbdea67fdc80026773cdae4d01fd";
+  sha512.doc = "6f8c1aa0cab3a9cd906c5eb6ea4e727b344e8a15479641acf04d23141a4af80169efc91b2117270be38c1d7505625458f276578756d61e12e34364fb901c383a";
   hasRunfiles = true;
-  version = "2.4";
+  version = "2.5";
 };
 "beamertheme-light" = {
   stripPrefix = 0;
@@ -2186,9 +2303,17 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.1";
 };
+"bearwear" = {
+  stripPrefix = 0;
+  sha512.run = "cbce954b7c626f2941e77a121346dc4d9fb618908165bc1d8a6a55904573249dde7cfd4a6323c9753e8fdabd88b73aaf4b7e6d4b40b21e13290e2a80d2080399";
+  sha512.doc = "2d9c60efbc6d0d29d31daebcbef2cdc0d0af35a84223107424e36ecfb085b7341340e06b9006cae0ac15ba93ceaa50e1b0a942b7a01292f9f5010f32983fd4dd";
+  sha512.source = "7b233bfada9e05a147579f32d6405c7eae3e2934c55dc77659112cfd60f4d57b084854458de3fdf3aae7a14c4d4d82da8be91718b487b4b2eca33a569594a693";
+  hasRunfiles = true;
+  version = "0.1";
+};
 "beebe" = {
   stripPrefix = 0;
-  sha512.run = "12e064422d57b50d7c5600faee4f95ccfd14503da70e8540f72bc8d5de46fdffb62307a76c569934210c84de55b0eb5e625fef5df900a9848646956b0dbdb60c";
+  sha512.run = "802a349991ec0418de9a3de2247dd73c904ec5e3223f17cda0dd2805c8012276fabf412b861d656bfdd7aa2da46fec251b7eeae083ac3ed361cf1219f9b2e915";
   hasRunfiles = true;
 };
 "begingreek" = {
@@ -2208,11 +2333,11 @@ tl: { # no indentation
 };
 "beilstein" = {
   stripPrefix = 0;
-  sha512.run = "b581df03b91834de1382b50dbcd1c4df25d8d3c1788889bb7057cebf3193fb664ef94f63b5c137f7ec5e3ce7a8d2d40fa3acf3a2640ba1e2b7b94daaf870841d";
-  sha512.doc = "00d281b248088fc0e31004bd4eced9a9eacba7f4260676318e13452e467d8e4587a8493a6444e709b76c18902ce766e35cda7ebf14595c277b59232a66e76e4b";
-  sha512.source = "fbaa3aeb41641adb0dcb559347b8eaf30adc79719d305d26f62bdbc2a80a913e4dcbb6507f7c2353687011a02fbf43f0fa49a67445844e4d37294b7ea4c3726f";
+  sha512.run = "63e4720a73e3ac4abd650c3787dc85e7e4e261481e805cfae4f32dc7ce9cdae6e08516d3e8f10c0f52c7d7790e6d2a2bd390bb512cc0b94fbdb2e04cc67b2495";
+  sha512.doc = "cff7c9ee987ccfcec0252e3e7ed1c06f67d9ea6f6534d36b62c4c00df0f1fe99123debd2fce376fd8d0febcb9d3fcc61b14ee9e4ee7b54a9ca042056beb4d7c0";
+  sha512.source = "551f92238fb5546d3a76bc74786c0cad07d0c2b707adab292d47eeb984e06bc44749437e876eec82908eacd4f3b3927f3830eeee9b8f65b9b7a5ba5c6939e063";
   hasRunfiles = true;
-  version = "1.4";
+  version = "2.0";
 };
 "belleek" = {
   stripPrefix = 0;
@@ -2337,11 +2462,11 @@ tl: { # no indentation
   version = "1.5";
 };
 "bib2gls" = {
-  sha512.run = "d96ac64723c13e4d17780ddddcf526840796cc329358cc1672ad12aed53d64fb09a828d5c0501e398fed365193784ddcc74bb944df8a924385e63a1bdca938da";
-  sha512.doc = "892a57451f2a9f0083388a22951f04ff2610c2754e66d2e9f1e48470023e4d5e2c3c74c51dccb8a32ba80bf3398be7707a7de74102d63737d94dfe11dc0f1306";
-  sha512.source = "ebd165839e3312d13240818185a0ee9234b49d0d7ecec1714536086a9a68e8f5e92e9f35c21ca4fe633af9bae79f6f1360a349a3ec85a27e190888aa1657f631";
+  sha512.run = "96d9bbc8d0beea9bbebb6fe4c9611c12947c1b820c0b6e029052e292797fde624166761f112cecfbc4ce040c66b4f5fc0c6450facb7827d8af3dd365a2a58920";
+  sha512.doc = "c08f2ab6452f4dec935131f0139fbb84e8fb92a30f909c7843b452f9c4992532f4bcc9012539d795037d555ad12da918fffcbc8b8373bb6bf10045858c0c5e65";
+  sha512.source = "683f9f48c12bb29a413592a38ed21326b0993010e6a0244be1957c54ce8f1c954f74fab9e16e169dfa0ea254fb05803e0b89ca985242b9588f0556bb53ad2829";
   hasRunfiles = true;
-  version = "1.9";
+  version = "2.1";
 };
 "bibarts" = {
   stripPrefix = 0;
@@ -2352,10 +2477,10 @@ tl: { # no indentation
   version = "2.2";
 };
 "biber" = {
-  sha512.run = "38906d5a99cbe59e2e078c936f6f4d0809b5561b4f218edb3bef0a8125158781d3e511caa2dfb14fef6a426f00e4a5418fa33d6d890371f4bc36425ff9531145";
-  sha512.doc = "b33190ae07d73e7cf8eba7a23ebc8854ff904d7b8aecd92ab302f011277ab9055252aee31d69f2777d6d312605786417d942d8ea9d0520b0291b360cd6c706a5";
-  sha512.source = "a630725fee902e8e36d6da5b7e0402fb480f41acc1c7fb0b4a25db1a2118d64bb25e63628c8920a6eb5c881154d553a6217923b1358ec1ae05cc7fec03b1f0e1";
-  version = "2.13";
+  sha512.run = "e0f59f15bb12276ba653ae57d7599a0d31a5dcd67c64a311382a14ceda686acaef689f1e3be72597b2333fbf3df1d9ea3b21c12ade41393972853ccd51d1912f";
+  sha512.doc = "4aa96124801d1cee36a2a3621a697ecc2184089fc7893ffb43de27e6a9c29a093e22aa5a7a54f0587b35159055998f7a2424637f83fb5107450ad4a3672dfe4c";
+  sha512.source = "e467ec0b5ed9f3d568cde7d71962b1e8c6c1a3ab26ec48b75a08332c69521ca740e54f14558a7a0ecc8f7cc7ef1072fa7a5745f1b84f61a3f7e7d7a709378f72";
+  version = "2.14";
 };
 "bibexport" = {
   sha512.run = "75f9cb374e0aee1b049e977e3ee1a855ae8f908a6c6191589ce9d9fc28a8358fedf93faa416b1020e157a8ec7a3980673d00e052a100c88724e86050ea5eb487";
@@ -2373,10 +2498,15 @@ tl: { # no indentation
 };
 "biblatex" = {
   stripPrefix = 0;
-  sha512.run = "4858e37ba14539bee844d887df8339667a6fa9b4f763235d3bdb468897806ffec4718c3f47eefa0fd74b9fc6b658e17eb0229d739a785df0cc510257ee2a9b03";
-  sha512.doc = "95c6c9d4e7a5a392278c328ca2098008fb68c296067c4e4bc8cb7e283b584b4ce28aa17899f1ba502e0ffefc5101de0cc92fd915161d04896e78585ae256d106";
+  deps."pdftexcmds" = tl."pdftexcmds";
+  deps."etoolbox" = tl."etoolbox";
+  deps."kvoptions" = tl."kvoptions";
+  deps."logreq" = tl."logreq";
+  deps."url" = tl."url";
+  sha512.run = "544d32bf4ee3b822ecdab4583ceebb00fc3a03222e6846fe5aac6939fe4fcc6f0997939107b4654bf2d0bae920b6a92310328e330ae60de49402f9b9c21cb753";
+  sha512.doc = "d8a323a2e946c1eb94bca8e24081dfa3af71466a4b25b6b8c677de7515929093a75823198f35e86b175045d2b91a4c18e6e3277b08b8fe8ddc4d7d5c411e3492";
   hasRunfiles = true;
-  version = "3.13a";
+  version = "3.14";
 };
 "biblatex-abnt" = {
   stripPrefix = 0;
@@ -2394,18 +2524,25 @@ tl: { # no indentation
 };
 "biblatex-apa" = {
   stripPrefix = 0;
-  sha512.run = "5cfb52e454b1a0ba7d96cd831f752dbd977c575bcd4a280b21ec9bbfd3c13c6e7cf2d255c7204df9ea963465dfed0c6077fe8ceaf85528dd15b987546323fdf5";
-  sha512.doc = "44fc683945c8ea04b72741a433ff30fdfac239b7797dbf0f2f89f38425ee7a70456c874ea642bec2a8e28243c3ae4064b247378d572813aec72bdc55266ee890";
+  sha512.run = "1fa8864f512f62025a4ad844c2c1b9571028911846f8ad57dd86ad189c331586e316ae403104ba717af308c89ca27f822ce6f2800df574e5acbb07d95b822c2c";
+  sha512.doc = "7bb1923fb7ea69b4a34e77c0e7b3b5792be6e603042021108ad679a045b2fe0bb8cbd6a74bf3530c981e94ed0d8d419bd95d2491bf05f4bcce1d610682d1d912";
   hasRunfiles = true;
-  version = "8.0";
+  version = "9.6";
+};
+"biblatex-apa6" = {
+  stripPrefix = 0;
+  sha512.run = "83a7456021e207fb8616f4dc1010979e4e37097f05914fdb6bd631c02a75f28e5892cc028e0d05981841a419e74e4d02923b2b58be883855574acbef5973fa26";
+  sha512.doc = "963ff8ca4c6e7c81e410af7d476936def4b19867b38f6740952581f36e87b52872dc3b90b731b8445ecd13696f9b383a48cd5d473754f6324f4bf13eed1d4d7d";
+  hasRunfiles = true;
+  version = "8.3";
 };
 "biblatex-archaeology" = {
   stripPrefix = 0;
-  sha512.run = "16e26c3a96789ac75333fb474e12acfd4e8bbdfe9dc19c5b44194842870238de100603befb0d1bc468ac24f5ceb9b1bae54ae6fe955f215a67d86046fc9ab287";
-  sha512.doc = "8929d568b2d6d9e7e2a1e6eb335490f9b9ac246bf1dff5553fa564675dbd9922ef1125b0f648b638951ba7ac1eda0942f22ea75eeac0ef20ff9b6533ffe96f22";
-  sha512.source = "f057e96faeb6c5d355b6bf6d809b64dc395d42781ddcd0d29b7b42b057f0313a1fd46e9aa34634c9de51dc2055b63106b289c441c35823f812c01db5eb431ba6";
+  sha512.run = "04c9541ac2f3cab21e412b0ea2efc284f9404f225f83f13c5ec3da2d6f3e7274e5d24647205079971beb11125c8fb3403bf09bac3ae5bbe353f6e2eb073d28c2";
+  sha512.doc = "4cb13b2b394262a7c8ed212092cf65bd0707c1f0b0e8c62b1d166fc929a7ddd7f676e72b0750680908c67a17dbcd5dc1b558ef83b35c8ac7b43048fae2e56856";
+  sha512.source = "0cef203b6be6246ca4664295d9b4d5403154e9813c3419c5473fdc950bfbbfb51f1b6caffd1af7891933684380e2b81756875eec9fd79ec0eeacd6f8ced7b09a";
   hasRunfiles = true;
-  version = "2.1";
+  version = "2.2";
 };
 "biblatex-arthistory-bonn" = {
   stripPrefix = 0;
@@ -2416,11 +2553,11 @@ tl: { # no indentation
 };
 "biblatex-bath" = {
   stripPrefix = 0;
-  sha512.run = "a7c2e6d1131fe80bef091d7da888c9c119d70af480b22010858a61420c2819abcbc3ddcf29e7616df000cc8e23d3881c3c23f8c3f61b2fb83cf3cf381b699921";
-  sha512.doc = "2b051aca6922ea10e97b6b9759c4de31ce9aa7d9bd47d1bd53117dbe9560d216c944c0d1c7738f6fc5200a069ef1688fa3c70d86d6e04a9ddf0083c0e86e61a3";
-  sha512.source = "993b4e88723f9ea0593de57994a37a4ef8fd408f3c5aa932ecde3fb18ec35fe7fb2eaa5df61e5e26f0debc016b66045f257ce9fcfb25fc447c7eb0231be0994e";
+  sha512.run = "a4025d3e6a8b6ea92d8389d93e5fd05fe9cda7c806d96e88cc24522d02b8757e04b1064aeddb429779feb18db2af631c2c3830cb84fc03aa4376e981c13e2355";
+  sha512.doc = "af03f6398bb8b64abbb6568428ae75ba5e958977ae977e9198f17186fb72ed4712eb8a2d74abab643fa67ae0c5302b041ee39b413f06f56c8f47f1baede975b0";
+  sha512.source = "b7929462bea8667d059b821af0a121e94341334dd70350792d42e7c26fe9a27ba7668c7458fd31dd6dccdb4b9153ffd7baec29f3ea4bdedff836223b57324f7d";
   hasRunfiles = true;
-  version = "3.1";
+  version = "3.2";
 };
 "biblatex-bookinarticle" = {
   stripPrefix = 0;
@@ -2431,10 +2568,10 @@ tl: { # no indentation
 };
 "biblatex-bookinother" = {
   stripPrefix = 0;
-  sha512.run = "2e6f21726ee4289801546508a26a9416b6725059c63f214d7cc8a6a8b3cf7d3b60fcb87fb7451f4ccfe6d1a27b986e9e0ddbd5a8f0b1070d7e37b775d07ec7d4";
-  sha512.doc = "5c6a1c0b44533b518d95f0dab2aed58e41253c97eee9d04b9b734bcfc7eb2f8437f835a3b7120b37fb5ec3b58d8929b93185fe9bc43c78e15f30fe1f8e7adfb4";
+  sha512.run = "ff9cc867462155dde3fe654a1d71bc3a3370ce0ad5dfdd8d6a799581e637e17f687a2830d56c3d396616bfecedb5b0d562513d5497bc89e02dc76874e948d95f";
+  sha512.doc = "0ad1d1280699e000c7183c2337e7c2c7570bbed2fb901872249bbe733098cbc623c68d1d6357e21274f8e2e0c1ada023b6e845ea21e96f6c22a22acd5741051c";
   hasRunfiles = true;
-  version = "2.3.1";
+  version = "2.3.2";
 };
 "biblatex-bwl" = {
   stripPrefix = 0;
@@ -2445,10 +2582,10 @@ tl: { # no indentation
 };
 "biblatex-caspervector" = {
   stripPrefix = 0;
-  sha512.run = "f309df056d2fa0d58f46568e64b188d21414d4640106ca11ac51cc1de779b3e7a76d2633b1adb38412131c682808dfb2397093969e69b765c3d79099f421b9e7";
-  sha512.doc = "78de4d815a69d965c08cd789c4c42aa16342f43dd9e485dd4af2ed10f688c32d69bad9fc9678947e8c3cffb4c6baa4cf84e4d6f90d21f1f99acbd9c3e5b11153";
+  sha512.run = "0dbc78505f64dfdae6bfda4276f0958b046305b847c8d228d8ccdad2657c571866380bcf3026c6ebe260e27060c184dea61038b99079bf93c0c98994ca64b267";
+  sha512.doc = "91e37539ffc49b637afbfd097071fd6b0124f8e6a531287019f21c1ff9d13d8cf57d7915fbb65e489ac800323dfde2b251da8fa1540d6bba1cdcf19347c5d03d";
   hasRunfiles = true;
-  version = "0.3.3";
+  version = "0.3.4";
 };
 "biblatex-cheatsheet" = {
   stripPrefix = 0;
@@ -2457,10 +2594,10 @@ tl: { # no indentation
 };
 "biblatex-chem" = {
   stripPrefix = 0;
-  sha512.run = "6a7494fe396febf23e6d6afe7f7800e7117c722aa45e28373acae3590bca898da8867269d6e148b36c4da301b60c8c342f4ae24dfeb56d0100528dcc4305fbe8";
-  sha512.doc = "90bcd8c128dd7d601a29c828302ef3cc4dc345a77d6dfda9962061ebdcfbdc8ac4a2525c727985a14467bbfae651347226fcabc395318ed490bf4d324476ed28";
+  sha512.run = "16ec0b77de0d9162287dfedb7eef76818b7d58f6764e4edbd67e25ec141919f23802602f1505dd92b2fdc8ca948db0a32ac62ab99d1b79baa2e24ea616165556";
+  sha512.doc = "0c19ce9fa71e67b035f3b945f33ace8f21b65fdfd5d290284a3607d7aff74f50123b03656601a77225632c85d5c6b12ea0beb54dcf5c3d22752c2f6763c72efb";
   hasRunfiles = true;
-  version = "1.1x";
+  version = "1.1y";
 };
 "biblatex-chicago" = {
   stripPrefix = 0;
@@ -2492,10 +2629,10 @@ tl: { # no indentation
 };
 "biblatex-ext" = {
   stripPrefix = 0;
-  sha512.run = "2cc2dd7ccfe5e664471bc67992fdc655d66fbda0f60dfdc62853067206c467cbbf85595983df25a71e317b3193653996ba76147b96419f32a4c0df0f9628083d";
-  sha512.doc = "7ee2a44ea93c1e7f85f046ac36084a4a7d521e4fd48844e75b68b61551f35d6be75cdeb7c458c83e93eaa7340acf9bb2f99c10c242ec129cb0da38e1d5a3a247";
+  sha512.run = "5d2294cb06e78052985f99d63ec56d35f54b3e423fa1e184a2829b5089420c7963d341124086ec7a4df3064f3b6f65ce55224260140a5874c15edb1ac66bc251";
+  sha512.doc = "bc44a8ec304dd082c7aebfc9e8ffc29cb5fa0ba53ec18b993f07d79bcbdca6a128a77744e231111093d695ae2ca036f3e660963cbda08a389ee2d1b2fa5775f4";
   hasRunfiles = true;
-  version = "0.8";
+  version = "0.8c";
 };
 "biblatex-fiwi" = {
   stripPrefix = 0;
@@ -2513,10 +2650,10 @@ tl: { # no indentation
 };
 "biblatex-gost" = {
   stripPrefix = 0;
-  sha512.run = "bba80e3d8452ff64b54f2f71ba7440f67c823583937b1ac82c6f63e61fb72e69d08ffd01ecb76753ba9ccd9defeb2233d426afe474605134d04659b3f1b39a19";
-  sha512.doc = "e6187b9afacf87fed1877057532a0fadd6dab04cd5de084931cb66a2ae2bf8ff4100eaa1d7aa43dd89c208c6cd512b36173b83b82e37829cbf455362be683f42";
+  sha512.run = "a620eb113751c856e3b7838067e35af53b9ca54587b2eb76fe6a613b202a66569a607801cbfdc18afee182467841f9031db62d3777378d923a559f3811eb6f10";
+  sha512.doc = "d74575b0eed08f5e75fb31f8bf2aa3cf00e4a896f34119ab6665f8add1b938ded58e81ed1ac16f7a66ff088294478eef630789c8350a6c5767d4eec829f678cc";
   hasRunfiles = true;
-  version = "1.17";
+  version = "1.18";
 };
 "biblatex-historian" = {
   stripPrefix = 0;
@@ -2527,10 +2664,10 @@ tl: { # no indentation
 };
 "biblatex-ieee" = {
   stripPrefix = 0;
-  sha512.run = "57cfe53365c131afc5a4778166e52bd5bd4d2bba666a536f03e6ab5ff74ef757e9578910da0e3d69ded2f85be509992860e0f1081d2814f293ef3fbb6531d64e";
-  sha512.doc = "d2e22835c9c28134039ba0ceb808ffc76d0be0e6c367e76eaa078c332fc69a4bde00549c9499d3451f468bded8a5345114488029c8efe142da8c04f86a60fd8a";
+  sha512.run = "6a5ef61a577b8fe91bb66b3569fb4082f7a5108a710c8ee6aa533b66603914114ddc09de70e3ba019bca1a744c090f21da8000810746d172924947a3c1e4a7e0";
+  sha512.doc = "4c4b8ccdb791ae55e27de07ef4b00793c4461334c7b5f63a564a46738d206cb00441637f6f149842bc04bdbdbdc4a25592bef58601ff9514aad0d9eae1c0c858";
   hasRunfiles = true;
-  version = "1.3";
+  version = "1.3b";
 };
 "biblatex-ijsra" = {
   stripPrefix = 0;
@@ -2541,10 +2678,17 @@ tl: { # no indentation
 };
 "biblatex-iso690" = {
   stripPrefix = 0;
-  sha512.run = "f9fdbc47e9d655a525d5f02a82d45ddc89cbd2a7ab8f3827996bec5c28c3e6f3f8ad5524ab129a86b235bebd2c3005dd2abdf121bfa419292a09d0915ec0badf";
-  sha512.doc = "ff6a45de0d40f99dbd55402cd4aa19fe4eac71a1e65376241ea3a4fead3370208acefc8bb37595c8bf380aa00d2acdc7657d195df8e62fef49c389d0e698bfee";
+  sha512.run = "aed09ed7de33ae8dcbbe6261ff678fde9f9ba92cae48edefe722c944b5fa3396f6094bd93517070e7f77afdd48d6ef9ad185bc73498d398db17cc9f8b33ab6fb";
+  sha512.doc = "e07b9376f3cd5dab1b9dca41d17c06b161288c898db3175dd479ee0d8aa4b93bdb20be9e6934f48f3065ac07fbd074c41a3691f164e1e5e57a375dd2f956bc9e";
   hasRunfiles = true;
-  version = "0.3.2";
+  version = "0.3.3";
+};
+"biblatex-jura2" = {
+  stripPrefix = 0;
+  sha512.run = "a47d1cabf771d3b90ffa1c00e354cf1440c0ca6b0e36ea3d92e0fb37aed003ae457fc446fe5e739b513c0d1e39dde09109fe377ad60e5ca074e8ce64d64026b4";
+  sha512.doc = "f6cef0f752daa994751089f63b2e8948423b3644e3f1e49aed6bae05b9a36e5ea8f614a34a3c7cfdf81e0b8262105d25b436efb17e7cbe09bcd8d0a423c0943b";
+  hasRunfiles = true;
+  version = "0.3";
 };
 "biblatex-juradiss" = {
   stripPrefix = 0;
@@ -2569,10 +2713,10 @@ tl: { # no indentation
 };
 "biblatex-manuscripts-philology" = {
   stripPrefix = 0;
-  sha512.run = "47fe3d91435d47fb5a5b0c0fb1a7c98cecaca3a44f03446e17f9be3ab4239bee5b2f2413ae8aef1beaa879256bb84db965b38f5cf2c6f2619b0efe2975506bdb";
-  sha512.doc = "da2356f81c1f02ac33bf7d34c01e0d68d0567766ec562298761edf949d8e0dd0b6c486ad99924811242af09616a4d055385546734023f80a164830ac605dd96c";
+  sha512.run = "3677e980482bd1beedafd4120d119d2a73c4c7ae9a3ddef7130572fac5d2388ec4144b0ba74d4d8012fd994262c378226c987472d4d66e323e3b8395b5d3259b";
+  sha512.doc = "da435de87f61045d565199034c5ffb1bf818d31c74309648b1cd78cc80dd1b1274cb008a575dae1bcc6b1987973745e3483e829085438821ef1e4a10fbf157d5";
   hasRunfiles = true;
-  version = "2.1.1";
+  version = "2.1.2";
 };
 "biblatex-mla" = {
   stripPrefix = 0;
@@ -2633,11 +2777,11 @@ tl: { # no indentation
 };
 "biblatex-oxref" = {
   stripPrefix = 0;
-  sha512.run = "06ae3e10be6563c96570ec00ddb9946ad57f51865429e162603d77e56a9a0c357bd891cca134c1a35a965755eab6f33fe974255ff8634d21c090b935822ff714";
-  sha512.doc = "d7c9f617575fa74dd38214f91e4896fa8b7ad712dc601268f86a3467d88e03abddb9242ee235e23d18b1ce3b2929d49f23758d4d4b5bcbad79a9562acc4e808a";
-  sha512.source = "d736c1cfa5471adafdc5203dae07c3e17091511fed18538c049433f3c0f2a2a364c5bb424ac68fa4809fd566e0acd44f8820f2c0621ef57366708fde8b321a4d";
+  sha512.run = "deb25777940c0aa54976865590f629b866d5175de57fe21dac0193c4991eb5333591f350475bf9ad4fee253acea2c27f9a6abc52280f487b422f70a9c77f5877";
+  sha512.doc = "f589fecde40d9e07d99b453c9119668d6ee3a9b672a2a3184e8aba08e6c18484a359ef598c7a5ba9f741fee104b7d1260144075f28767064ba6971d5965771e3";
+  sha512.source = "3c979ac6b9cdf3a256f29ad012068cbf901781a0f977f79603c74eadd38cd8e21365efdedc6979ddd86b145663f0ec6f74df6d6cdc7985f3836ff351210bbf77";
   hasRunfiles = true;
-  version = "2.0";
+  version = "2.0.1";
 };
 "biblatex-philosophy" = {
   stripPrefix = 0;
@@ -2649,10 +2793,10 @@ tl: { # no indentation
 };
 "biblatex-phys" = {
   stripPrefix = 0;
-  sha512.run = "8eb90dd0bf30a8eb3a6dae780d9b89724dbd124bdbae112c0d87f865b1e1ba106f13ccdc2d9299735899ef7b8e6aedce3dfa24264123bee1a14249fbf979c716";
-  sha512.doc = "87bf23273c9e981175fc36a2f3d8238fac13ae3115473f755e5151811d3a3903d31d4571f96dfae1a2f257da628e1c13dfc5fb17a49022f2995eacb4f8abbe36";
+  sha512.run = "a7afe31e2cad56dece6bdf60d75d2d7b4279525da00bc4fe0003804dffd0934514a43164e4f5fe5a4776365d428a21a800f0419cd632f56afb6bea6233bf51c5";
+  sha512.doc = "a1dfe75c92e89ef47ed6a4ef6d997bf2aa717d6c6f023773a056f5ccf53cbc78d5d2206b1b29e0ab11389b76ef98d7e2a7f8242947abd0a8fd93e1db94f299c3";
   hasRunfiles = true;
-  version = "1.1a";
+  version = "1.1b";
 };
 "biblatex-publist" = {
   stripPrefix = 0;
@@ -2733,19 +2877,19 @@ tl: { # no indentation
 };
 "bibleref" = {
   stripPrefix = 0;
-  sha512.run = "0a25a0c4577815d27c02a0af30d1b70eddbb9de696c83333858d698aff9e8ed5e76d6b3278504cb153f284ce8fa23e0748140d7f9cc7fe1e04607825458941e2";
-  sha512.doc = "5479f8c951c37d27f6a4115030fc1065b1da5d9ddfc81be2ef6da561adde77f71fc86b49f08958a7b3310256c38b760aaa556b0a275be920f79b5c6e98e97471";
-  sha512.source = "b21f2e9e48dc4c1bb690a5ac6faec0664ea691bfab8c347df540f3172aff14cd2aac12fe38aee3a9339c874af158c2f440733bdadd9a0ebe45c5a28a642fe08b";
+  sha512.run = "1bd916174754653ada58aa5fe3ae646aa9f409ab2e8860a3a630d552a47ffea2888de5b8bc5a05b246525a317418f4118e1f4dfc5860d2409364e919743c187a";
+  sha512.doc = "270f34c698e043786c703aef017ec67b764ba3743244ed1a5ad66843fd01448a37ef7d790c1a57eb2c1984a4495bdc9bc51b5899579343a01681c17557a4b104";
+  sha512.source = "ab222b17342c909ec9517ce09df4df1b2ac5c021bb7a6cdb16f5bc1c3160c35d7ee1c44227e76d528ba239794dee888e9858e923c6dbdef4c2f9e7ff09a9a1a5";
   hasRunfiles = true;
-  version = "1.23";
+  version = "1.24";
 };
 "bibleref-french" = {
   stripPrefix = 0;
-  sha512.run = "0e7d9a9a6db26612cc2a78c526980aee6b1f47312e02317b5d9791a9386c1799622df36283337c57d33bf4935cf24b1cf65999875479973b8f1309392d97b3a6";
-  sha512.doc = "133644d3298435d9ceaa1443cea19dbf7465ef82a4fdde4c7f2e1f950735fe220e6dafb0512505f8762725bbbc0062413b646204ca728fcf9481dfcb51a9ef35";
-  sha512.source = "d17db1b6a96b8a4c69217e1685e653a03ed2536e146fc10788521a9fa95b44cced0abaff6ba965e654f4d69cc68d03f75956f619cfd8d2735c8ab605876cda09";
+  sha512.run = "f768d01206a35a6ca18ba777fb159294f566be365845bc82d344e9eaa3dd7cd0c1763564b7e17d4a1b851330405cfb3c383019b575276bd9b12d084c4845ed89";
+  sha512.doc = "e72ac2b74f01df60c998896b76013eec56a3d8cda8df2f26f92d05d342760204913d7d70a6c8f63680f54bf3c84fb1c654c213ec2356dcf189bf9e134ce4de30";
+  sha512.source = "f70a734e6391ff8681a6e58c3161ed5bc894a9bff26a6b0cedd4d868acc0412fee0069ff937a247b129186c8d73b43305cb6747678aabfd0537c1238c9ee2305";
   hasRunfiles = true;
-  version = "2.3.2";
+  version = "2.3.3";
 };
 "bibleref-german" = {
   stripPrefix = 0;
@@ -2798,8 +2942,8 @@ tl: { # no indentation
   version = "0.99d";
 };
 "bibtex8" = {
-  sha512.run = "9d8ebea38bad048488251baf4ec7f939eec9c75df17dba576e510c09da6288a9cd2967c6c1dd5f7a472de51e38030801ff192874fd7d038a1f81e063614675d7";
-  sha512.doc = "bf6b13a5ca1e467c5435b51e6c5c6c4549eb456ae91fcac1c756ca09c165fafd488de6a4d2462057ef6ec7b3ea0b0518bd732556159ced0936494c5ebd4aad22";
+  sha512.run = "69f6b09fbed8a089e18ab7d39e352ad5a1e7512096a1806158ecb4df74822664b6620f3cffc12cb8a938b15a4000df2b46eadc0ff38c8de1d325539f01e8aff8";
+  sha512.doc = "d0863c43a5cbb87632a3513ffe75ab8a686647003366fbca1c9c168a4bb234f26078b260e1a3180f941e3eacf4717439a400df1bd180763aa43eec664009f25b";
   hasRunfiles = true;
   version = "3.71";
 };
@@ -2812,8 +2956,8 @@ tl: { # no indentation
   version = "1.5";
 };
 "bibtexu" = {
-  sha512.run = "ad6c9702b9b1a41f45e493d27a75f703a06aab99f30ed920f8e3fa8a00d9fdb37009afc7dc5c27ac557e5fb5b3214cb0473ea5099e1fbdc596c5d8f86865a71f";
-  sha512.doc = "317a7806774db23017870f67b66730a77ff3944467bd9575bc6fb9f6a64c8e273bd3e337af218e1b4a156cd4e040bf6c152711d2e8bcd4bcfcb94c4746cd6b06";
+  sha512.run = "9f1e27f1d7a76700aaa4f0f19c4e999070dbce873203b80e3ce5d2f4ed14c9b685515b6c648ece8942ba429d698f66f492b58373f348bcfef2523ffec270f466";
+  sha512.doc = "0c0f0db13c18029bc822c5cf82b358e7784992f5799e03f1312a550ae3d40d4c59a01bda0355698f7ebbfb0488a426f20833d2b075675a83b5ae01e4a949c4a4";
 };
 "bibtopic" = {
   stripPrefix = 0;
@@ -2841,11 +2985,11 @@ tl: { # no indentation
 };
 "bidi" = {
   stripPrefix = 0;
-  sha512.run = "a65ad641869648ecee494a6d3e18bcecf89ada7f0a340246e0277e13f0b119c1c643b8323238986e0ffae8564ee6e44b84a802c661a7df7da33acd3bb821dc7b";
-  sha512.doc = "17fd648a19f68f7ba3c6155eb01b17ca00f4f64cbfa2809d22f18a073bc6726df5bac69bc8adcfe7291f2846e144c311de9eb48d6ff5860a90289494d943b11f";
-  sha512.source = "3da2a95d2cbb599b2be51e047a9a03e2952ba2e51aa41472913246d18747d3b7ca34b36409033a5c9fb242938e8ad83c5acf9f05a2a7a8a14fb36f0705b0ddb8";
+  sha512.run = "267dc7398d0e4de4a72fafe8bffe08a876dee7618dc2850c149b55b316945ef98d7c0ff76a4866a58a21c998a70e0ab0fa2dedcb6895809af05f10efa433d01d";
+  sha512.doc = "2d2de125e597310a8856f309c6d4325c3579c36dd43998bd8272cba187e15084d1e1985a240adea8fd862c9472732907d2facfc63d570ff8b97cbdf80ec7e0bb";
+  sha512.source = "445d060b983834bf151e6cf346bda0554e49d2794416ebecb16596a078b7d8eaac54e5b86a53c9be455a146aad73d3472726827befacfd549afd1c3b0f2d1955";
   hasRunfiles = true;
-  version = "35.9";
+  version = "35.11";
 };
 "bidi-atbegshi" = {
   stripPrefix = 0;
@@ -2897,6 +3041,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "2.1";
 };
+"bigintcalc" = {
+  stripPrefix = 0;
+  sha512.run = "c801e5953008e8cd8521886496238f4f7a86a6c65a160255beb3fd6a41a48dd7bfa2da438f8e1ae4c79b51f769f0e07bcaa7c3c8aa6e1204ea656aca3d1f4620";
+  sha512.doc = "f5e7cc163157e429906489cb3cb94d8694c01be3c720e03b85bb24c7bd757391cf09e08f3d88df4ae7485978042e9d408fc5af0d93e016c82912479d40457079";
+  sha512.source = "e829ad1e3a118e8fd0ea0e632740ed49db65603d6fdcc7d40126a048db5cc0f73c9f4aa64d81902794ed308ca31a153044a56ef37ac179918b24be71ae168f64";
+  hasRunfiles = true;
+  version = "1.5";
+};
 "bigints" = {
   stripPrefix = 0;
   sha512.run = "23f9a529af214771f74c6921baf8582b6a3c5e170d0fa511c260f5dd3fb6cb6194ef4082ed299dc0a3ff8e413981a36b594b440e7bc5512c7d2732fed9eb7a8e";
@@ -2953,6 +3105,15 @@ tl: { # no indentation
   sha512.source = "8c5860792394f85ab87d2a3ab234496a1f550a24f98a5e2f8f4d815b24e4fd3e7d0a1ffefac3912536d22cd39fdbd91db013b1c8e05d4de92aca47db679fa7e3";
   hasRunfiles = true;
 };
+"bitset" = {
+  stripPrefix = 0;
+  deps."bigintcalc" = tl."bigintcalc";
+  sha512.run = "b1c9121312404d3daf6907623972c35e0f36cfb4197e589bd937c145506cb5a2d9d8c1f665ae3b4d3ec093e55bb146c0b67cd0858425b704fe29989b9924ccb7";
+  sha512.doc = "a5a3ba9d27dc3d9658c1d261f798fdc5e6dc4cedd85287ef77d2a0341048d71f8575d4fbd711e499233e0991c51765953931d87d40dd22fa2a4e8ecb9f2a8dab";
+  sha512.source = "40580c17ac81137d533eb013ed14bc092281b354ce42883c0a3c33ee7843be7ebed0ce642746ba9e173bedf8ee6f6c243b65e692ef2a50654ada23e323166c89";
+  hasRunfiles = true;
+  version = "1.3";
+};
 "bitter" = {
   stripPrefix = 0;
   sha512.run = "edb101df2026b97585f8f5ca712a4bf41f5a2a15122a0e51448fcf1bdfe532bd7f70315644935a942bacdd431db4ff48ebc8b119cbf5d758909560eb2c942633";
@@ -3139,13 +3300,21 @@ tl: { # no indentation
   sha512.run = "bcc6a2ca260350a22927d806b29dec9b7a6c7d9bfff2517d3c64072c9bcb3b73ec72937c004d36c2570a2c78f073548db6897195591e36bae7b6eaaecf6b6023";
   hasRunfiles = true;
 };
+"bookmark" = {
+  stripPrefix = 0;
+  sha512.run = "29f24d431958caf824b8a3af098f9b8712315ac98ed7c1b4969b1a650cb8a9732341ea3af42c154e28aff35fa6a0abe8b3cfd24772662027912f355f3f5cd16e";
+  sha512.doc = "39ff86ed5dace26339bf93b83e9d41a8d89cf17ba6abbf07be9f9ec72232dd27e88e88291d54c09b2bc1ff8b88bcc40a04c75767ba2f9b35a192dfbb8b6b9100";
+  sha512.source = "411587deb4d6e436928dfe318166735444c178c777b2124e2479b993e4b00240060569bb95f56ff12d421e73ec191a203186318057b649bb3a48ca5cfd7ebbd5";
+  hasRunfiles = true;
+  version = "1.28";
+};
 "booktabs" = {
   stripPrefix = 0;
-  sha512.run = "54647cc2c7807baefe85a94f0be70a44923183d219e0ebefecad5df0c44080014e9b3ed8296dd9c1d1810deb148168c34e90625c58181af07b561a96c1fbcd46";
-  sha512.doc = "0be929de9e5b20be5df76696a78c57a5282bf0875f9da27fc13b188dabc0bb699e10e66d8660617604299f0367b19edeb40cf7891dc8421d367a18b3c7b3d112";
-  sha512.source = "58e7fbb298b931b0666b3a91c18dc596404912786418f360c059e7c3d49f262af612371b97c5bdb140c5c9d11b8dfc8caa52305cf187ebece6aa71f73d72dd98";
+  sha512.run = "8d7e46297d19f2e683f5c16a13577fc582cba391cdc8a15ad395a6b44072a5b50216ec9e9a8c727c1b2a36b9275ba9bed10baec3aba9d726505955af01d48c3e";
+  sha512.doc = "952ff0f30cf7679c09020cf2bca542e11e3a64c88956e87db6289acfb03879609f66c8beb019a6639716462aa088bdff7df3330d60a5d864f25de164affa4c51";
+  sha512.source = "cdca8f3e7f7dd99b87da76f60b1279de6efa8af666fc99e11749c21e59b77148a40aa197c0682ac1085a4d971a26b8cb59a9d2794fef81063006a220caf91ba4";
   hasRunfiles = true;
-  version = "1.6180339";
+  version = "1.61803398";
 };
 "booktabs-de" = {
   stripPrefix = 0;
@@ -3268,11 +3437,11 @@ tl: { # no indentation
 };
 "brandeis-dissertation" = {
   stripPrefix = 0;
-  sha512.run = "fa3e2f0c3cc3f1fa1607095dfd52e0d518e5710488a0d86bf9c46de444efbb5b1b253284cf8e996869ef4ff2c051ff1a6331296a7b8517ae93ebb91e7dff2826";
-  sha512.doc = "fb7fee200d7547615f5671743f89d571e9ebb7a0d52f5e8d835568230bdf16c9b4c8279d65dd93fec929e9337af666d2b9dae3dce744e4b71ad98b578a262099";
-  sha512.source = "b4aafd8e9afb0d8cfc9e184181e0e911214d1420114cb32ae41a184f4c7b5ce2a262c5bdb1ffd0144d9e566937a8c662d25316ef82c0d74ed5d5142a3b01a7b5";
+  sha512.run = "5315b8ef67866fe9b41e4e51d3f627a1a5c63411c786a8856c980bffddc24300539aad065dc936628fcc8ccb1df75e6709dfa3d655698f19f0b6ad9a2ecba516";
+  sha512.doc = "10f38445d595e907888bf7b07adf50c956c35af0571dd883f5e2f6f66c0b7ab196a91356c87a4c605067ed0fc851a305fbe4e53773fa4b83549f566c5f4a383c";
+  sha512.source = "a94ba2f6a394431354fa83eed83a59218c4e150685971cdefe3aa6dab06ec188903157d30ba4b71359377dbfd267fd8f4673bc3e750584402e762ad8535bc6d5";
   hasRunfiles = true;
-  version = "2.0";
+  version = "3.0";
 };
 "brandeis-problemset" = {
   stripPrefix = 0;
@@ -3281,6 +3450,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.5.5";
 };
+"brandeis-thesis" = {
+  stripPrefix = 0;
+  sha512.run = "d769296db0ae91931bca16a358f61924dc1cdcbd5cef42c0c07bfedd8ebb4b700882b2a3b0bbedba2683fd1ad51e9a54597b07c7c6017c22764988476944e66e";
+  sha512.doc = "fb23797c136648c16d0e282308c044e64d91a4ea26d7ac835f4d7ab299a49dcdbc10b1a8922cb655284f3670b17b324c57c9560474b02c27f382f436778063ab";
+  sha512.source = "cdf7f50b75e71d4c6bafa6af9736643d22facb508937b46866af6c1143872f9645f9ea7320921769997a2308a07b8e7513c66dfa3eb134549165261b1857f5be";
+  hasRunfiles = true;
+  version = "1.0";
+};
 "breakcites" = {
   stripPrefix = 0;
   sha512.run = "13fdad42586a361b4e01999476f4d92ccc0fbcca4ee2663153b9eabbb08ad571dae6631306e9fc590d94f3f02af79519de30a78ed35f737004d86bd62b76786a";
@@ -3304,11 +3481,11 @@ tl: { # no indentation
 };
 "breqn" = {
   stripPrefix = 0;
-  sha512.run = "0b0c40a54bebca784f8057c4f3b0595777bff39c016d6c3c97ea8b4e3d2b357045eb65ae8e24a98fc1777ea523bc372ec164ebe3b92e749704f156af0733148f";
-  sha512.doc = "fd38471bc060a853d853326870aaed0770ad8d7826168a9539ffbc074debe7d054f351f9ee34380ffd78aaefd55f1fa5aa16fa7da823d4d7b981296c67d435a3";
-  sha512.source = "16c62790776452a5aba32f48389299fa9b6c9193bc12168f75057ade14761e09902adb95436e064e0d84729e6421781f05943cea9ea914d2b23b7f179bc7fba3";
+  sha512.run = "0f939606cb3e6a41a9fd51f994671c5ca774b6982fc7b8e19275cb33cc6331b56244156017d9cc091f852c5bc0b7979434a8376c1a9900b59ec573e63036e065";
+  sha512.doc = "8a70f3eef2414778ff4124ada2b7aa442f21e35e9b4dd893f5d64196d97dfe2ac8ecc4bf7ec76dc0c432c81deadb23d0ccd9bcd358e83b2c281909d16a75fe91";
+  sha512.source = "7c73ac6585defc2a6a43ff562f01ac3ecf908ce2be02bd234cee9e128c3e171c8d168c7ba2d6f4b42ade5e6c34f3420ed28c44a5e4de9e16cd184ecd05654132";
   hasRunfiles = true;
-  version = "0.98f";
+  version = "0.98i";
 };
 "bropd" = {
   stripPrefix = 0;
@@ -3376,10 +3553,10 @@ tl: { # no indentation
 };
 "bxcalc" = {
   stripPrefix = 0;
-  sha512.run = "6669cb896306c352a7320eb957fe5751e7d0c4916fe7504cf9b385a16e9b1280267f2e7a2a5430d052369841f713e86e58e5c03fb995b0d7dd16123dd316c368";
-  sha512.doc = "d7606ce81855c390bef558df8af083cd2576700d2d26c5d892a938ca6f9720d685d2e78e6fb6a3b15d9c672db9b795ce169a617a93f2baf5240ffe3b73ab7df4";
+  sha512.run = "68947c8aa57d3f0a449c2da45c081cede0dbe28570f28c3091939e43b7d6f5fd601e5eca02556f46497d2dc82d829dc783288ed665b7efeffe5e946b84b3f713";
+  sha512.doc = "caa11080d43cc6f0d8af7f9f13cac63e26d8423cf97d6a77d76467bc73644efec190fd5c1a6d93f3ceccca2606d50ac937b4d04bdf60f080683c8314048adda8";
   hasRunfiles = true;
-  version = "1.0a";
+  version = "1.0b";
 };
 "bxcjkjatype" = {
   stripPrefix = 0;
@@ -3418,10 +3595,10 @@ tl: { # no indentation
 };
 "bxghost" = {
   stripPrefix = 0;
-  sha512.run = "a3818f3a4e804a402f8a54288d135bd4e9ffd5cb8a061923548ae4534dbc46490f32c1b5db24bd8cdc32709ad7326145abd7f99592e0d22a14bb60938bbba841";
-  sha512.doc = "bed6d2e8e579b904941ae095ce879eabfa501374542d4716b890f3071d199723f2875ef47f0fa72adf1f8c542c763f4b49fab09d192db10400f17d9c2e0852cc";
+  sha512.run = "72b5a376d5a927297fc466936ae55ed4fe4fe8705aa8f31fcaa4f4b558496b19952b55ff8b02318f5d5cc8c6cfe31c6310cbd22900084d353a93f348291e0c6e";
+  sha512.doc = "718c59d1c05689fbb4641ead9437b2ddde19f848b6f7c9fd5f4c91b10abe9fc6413c531c2f5af3f9e70e30578341116e5b4731a8f873f75fd4ee0803f3597a3b";
   hasRunfiles = true;
-  version = "0.2.0";
+  version = "0.3.0";
 };
 "bxjaholiday" = {
   stripPrefix = 0;
@@ -3444,13 +3621,20 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.3b";
 };
+"bxjatoucs" = {
+  stripPrefix = 0;
+  sha512.run = "ffe18ddb89393c61df4371d6fe1154759992e544af64cdfcc007122ed212e87d16194d906d4c9f797671860a96c4dcde12682ecf98adb3c7b8b4c6ae0b432b81";
+  sha512.doc = "9c281fdda182269c7a048e1ef422f0c403ecef7d8fd8dc462ebe39b861fba013ede2ef351baa5ad4537b2e1495f1f0572c7edc6fa6407031ff19053bd6dfdc02";
+  hasRunfiles = true;
+  version = "0.2";
+};
 "bxjscls" = {
   stripPrefix = 0;
-  sha512.run = "a109996608f1ab1b12274726e8522b6e3f07cf6c07774800168a8ed171948684a8821260f4917838f5ee7509858f6a668cd881ec6d5be2aa29ccecbcb51bb200";
-  sha512.doc = "f76a6fd1b5656be0a3a486e3dbe9dfde5e39d40310e3912158a6bee3981dfd615beb89675a5875cb5d31cc73f556a61842ddb427662e0e3ef40ca85415811014";
-  sha512.source = "97cd18d0e977d341e9ae04899c29541b24946ea87905b51477c59cc3231ee2cb650b7876e8a7c9acca2a712ab7d02c30d2d7cff52c080d87fefed8974ed91be4";
+  sha512.run = "4b100e52663c714296d18b487ad5c21fcedfb154bb517ddf399646fc27795da77cf156de18e1119bbe3563dda13cf504e9ef7132bfe427ec48cf4d8a21a9c1bf";
+  sha512.doc = "5f7ddec0451a01d2994d532088754b7135e8dee2d915f94b268e0c07dbdffda4a294c8d9012d0b4a524049fd82b3d3029180ab16d33b68d34700beeb9e0ff973";
+  sha512.source = "efb5fa10b47a48746dea5453979ed80a4ab8ff723d3a4c30ce8b27746b83b6d05f1de6e80b48d6a3ae925d5e1e321d659aed36aa5b0d8f523be6530403a83bc9";
   hasRunfiles = true;
-  version = "1.9h";
+  version = "1.9k";
 };
 "bxnewfont" = {
   stripPrefix = 0;
@@ -3518,8 +3702,8 @@ tl: { # no indentation
 };
 "cabin" = {
   stripPrefix = 0;
-  sha512.run = "f27414422184524fb0128f96865e3dc2de91efa6c71701b1829f87880ea95819a33233b7bfe82dcd396d6cdbd04c1d886f294323cdbd27b2729f23a34f0bf25e";
-  sha512.doc = "e63cdda53ef967030c13d31047bfa3ea25e45585e508a213f12c6cd1e8af7ab71387bb7ccb460654986254f8ff46462ce9a4b0c90ca01456983df74b942354fe";
+  sha512.run = "b5fac4c3439798f21dc67f7ccbdf51a48d6946438dbd5e15e4432faacdd5231e158615c2cfe1617347473109a783dd49bfbd613613431e8e2951ca487482b7f4";
+  sha512.doc = "f76c3faf1bd7084f7697a219d8b12751a820f6d0cfc60c2390a2d2d8c07dce768381dd4e8b018614a73213ad5f07950a069d9646e96418d61ab10e8baee86949";
   hasRunfiles = true;
 };
 "cachepic" = {
@@ -3600,10 +3784,10 @@ tl: { # no indentation
 };
 "calxxxx-yyyy" = {
   stripPrefix = 0;
-  sha512.run = "d66d7c31c9e16d79d28b99a395b8d2206bf64ca1f036d94a34d9a60c67f87c5ee0e9295a9d01a8fe16590b42e570ee2d49e7ffb07cd831588ae9d8bab40746f2";
-  sha512.doc = "53e3cc3a8152d7bcad1e00f2ab7163b0c6630c0a9a065f0bbe79ac9caf871bc50c985ba22eef2a69f745296ec22353e6d2780e92711d4c0453033ed436b414da";
+  sha512.run = "99c3eaa37d1502328352e67091390ea47e3bf1d3fbdf776bb885e06bc2613a1e3056db4344b2a6bf968ec146bc3e3d44c1edae6a56a37eb1a8e5225ad6f62a94";
+  sha512.doc = "0fd575f4c4535bcf705acd8e3e4b091ccb1d3d1edcb8e6797bb2b5f891c95c8e7de439015d565d6be0098441abf175d96ab20351a5669237ebd846e37eaa65d4";
   hasRunfiles = true;
-  version = "20.19a";
+  version = "20.20a";
 };
 "cancel" = {
   stripPrefix = 0;
@@ -3650,9 +3834,9 @@ tl: { # no indentation
 };
 "caption" = {
   stripPrefix = 0;
-  sha512.run = "047ef9f5bb8b5885ebd656e961360135cb531a9b8b4e582a5d92b8b813b593e4b588e969c75d83c52e65656701855fb16335f9f5fe3ebf0145a3a08bd59b28af";
-  sha512.doc = "cf45afa493d9365446cce41ac6c4e7cecb08495dbf1c6f7ad5cb17a57a85dbc1237a595406beeea259ccedd0737776da6c393441010c2f7995b2675f7ce30170";
-  sha512.source = "377db41ee95d07c1c13c54b291d88d11c6c31ecaa982f59953d6b69c33f59f9a91f3df323e0a9bf975feefc4b8ce788d6f1485cb0e052b5d78315fb7e9bdab04";
+  sha512.run = "5902f3a3c9706f3eb1fe973515232f5d5271c3a5c7dc23d027a30b0274da998c289887e204071538d3c58342572f5c92cff73f729436fdf0e34475fd47405da3";
+  sha512.doc = "57b89b79f2c81aed9101ef2b7ad0ba17053873ce8ec512fb10fde4ac8400bd7a7ba47fac67eded49db870b1dc4d001f46aa2e4ae994d750423c830b8f46450af";
+  sha512.source = "67730bbecc3a2644e3c7157a969908538a5f7356898a9f78f68663a499cff5b3cbdb8e2b91eb18af5e74d49ece6804e39744822765d86820d52d68b653051807";
   hasRunfiles = true;
 };
 "carbohydrates" = {
@@ -3698,10 +3882,9 @@ tl: { # no indentation
 };
 "cases" = {
   stripPrefix = 0;
-  sha512.run = "43d512d0a408c82b80cd3cc93ad858ded8a0af5634557e1a67fd41cdbef6f3df5d42d9f3e910d05fc203b741f9fb374271d22b2a22c4704010b934237e055c82";
-  sha512.doc = "1d09e32e370635db9c9d3bb618b51da7c16f178b6d6639eb7e4247b67e12036ddea3095a41dee4ea4746eee8ea7ec33ceed5e3f84473dc5c08ef078734a02589";
+  sha512.run = "81c0aa3c563cb8faf27fde5859a298b7bccf97ee4b38841f0a8b1e4e1d2130ce01007befefdb5bd28048472c2fca30b477cc9a701096a181a3c551ca01f4d95b";
+  sha512.doc = "f06f9e40be1af54a3b73a7b1c949475b6d6c9bf5e05a74a4c29c261f057220d93d08cd4cb57085eb8cf01d200d9cc18764950b88529ff2df0814c354d5546e5f";
   hasRunfiles = true;
-  version = "2.5";
 };
 "casyl" = {
   stripPrefix = 0;
@@ -3710,6 +3893,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "2.0";
 };
+"catchfile" = {
+  stripPrefix = 0;
+  sha512.run = "6e01a91913a2a81224a533eb7f119283c267682efaa2a6cec11e9db7fc593b0d7a6830b83e482f22e96df208dba598b1c6596a78ae5d4cd17aa4c9a50eeaddea";
+  sha512.doc = "ad0d938e0bb4fe3d307dff1afc5ff93cd4b76948a88f88a65e3d036fe679cddc91c52e64febbf887c766d423fa5d94371869793c93138eeb919188b9b44234a7";
+  sha512.source = "e254709b62517cbb717c43e894c17a72277465504bcbfdcacb2bf7423173e0476cce8355acb9772ca74fb267abd43faf0470ebf92139dd7847c756244efbc3fb";
+  hasRunfiles = true;
+  version = "1.8";
+};
 "catchfilebetweentags" = {
   stripPrefix = 0;
   sha512.run = "71656fb162aae4fccf15767911b8524c4f3a72f4c6fbeaea45a3dd9593489ec7644e7c10ab61a49cdd125ffe56e61331c30e35a10517720948d4f03b97b20056";
@@ -3923,11 +4114,11 @@ tl: { # no indentation
 };
 "changes" = {
   stripPrefix = 0;
-  sha512.run = "8e5cebc3a86ca8152c36c6e0947a05e0033f817c7c49581d607ee6b4c6d18535eff31762bac071f679fabccc23e3c0fabe8eb142a7a8fb7755110a495a5503c3";
-  sha512.doc = "d25b8fc5fbe8b88a6c2c7dffd9180e6c40ccf659ea8c2bc6e6fe7bebfc695aa61a5d18919374894dde82c49d7dffce26c07b552ddb73d89b590336c817ff0a7f";
-  sha512.source = "934f9e2eca8541fc139cd90e9dec08f37473aac5ff8e465619ac37ed41bb27a59971a5cbb32829dd555da4db77e01f9d658312c2344b18ee5ae462919ba78d1f";
+  sha512.run = "04b141aeb9925e3dd0b54acec65d90e2a88937c9591ace8ea103571413f19896790af9a2a22e98d05129a9c0839edada755a722d2455d6692363c8fa01e1e633";
+  sha512.doc = "8d293b2c22d49f39264535c899746118308640f489a6649b25547723bfb42160064a63ca785e25b939cb0488ec20ee5f4047ed6662c62bfbe1367c191df96003";
+  sha512.source = "fd3788b508f306f106a12abaac398e99ba9c8187f91e4874bc8256266f8680dccdf4594961dc755ed3bec90c2db4e9436fa749df52fde98a21f9d09077f29079";
   hasRunfiles = true;
-  version = "3.1.3";
+  version = "3.2.1";
 };
 "chappg" = {
   stripPrefix = 0;
@@ -4037,24 +4228,25 @@ tl: { # no indentation
 };
 "chemformula" = {
   stripPrefix = 0;
-  sha512.run = "4ab3d7f4b86899a2088ef210b4ec03f6a511d17140c0b0ccb8fbe61057107e018415c5ed591096e27eec701775ded1d2e3c6cf90e76a25ba58a47a6cf79e5ab5";
-  sha512.doc = "1b2edd7ba989074cc19eb5789a5f87baab32d7ef0ec96991e76c8c864293dad38bee3ea2f1def3b7fcafec01afbe4de4b3e34aceb8ac5e4140058245cd02e2e1";
+  deps."units" = tl."units";
+  sha512.run = "adc4567055bfcf2c3758856c889fee55e4e59fd5999378b60996aed6d81927c0feb5af99dd96b677b84a9fa20e583aef73dc435d6d1e81d5b47dcad6eab7b4f6";
+  sha512.doc = "28198199ff48a4575e368ff55137123cf5565638f1c7a91012b1f414529fcf07a9df10659670f02a3f0e3b1c5a681e30638c1a349fa5073fbd591062fc355d7d";
   hasRunfiles = true;
-  version = "4.15h";
+  version = "4.15i";
 };
 "chemgreek" = {
   stripPrefix = 0;
-  sha512.run = "5ad82bd7e1973ec3cc79277ab653e926bece0b9e8feffffbb798545ab1fe667c15a6ca08de7c6115c1436d552ec4ded0a9e489315f3e9325ea9dc0f82972a874";
-  sha512.doc = "015c8e3357c7d53745516a4c6d6282bde49c9462d516e9bebe9316769684c310195c23fee9e7e24a14d8084bf0d5875b158b60488b7fbdd03a83b590abb1cf45";
+  sha512.run = "8e70154271fb921ad9edf6ab5f8a21ce7c229723f88d7e37fe17aedb189c67a5749ea9e622c2dcebeedd614efbf18b9138e0219aea998f7a8ab3087348afa788";
+  sha512.doc = "69ef091ed42bb40826af81c9a4ce5536873a5debd971d70d30804f75a3240bc1aea037817cdc42346537cd025306c928fa347938785af9e69022ef51fba20d2d";
   hasRunfiles = true;
-  version = "1.1";
+  version = "1.1a";
 };
 "chemmacros" = {
   stripPrefix = 0;
-  sha512.run = "fe9bf2371b862873e7c1ae2a0b72ce622a4ab98b00846397b2b108bdd56051caaccaaae556b815c2c4e077c6c785b58bf79c66c3c764e86a8edc97faf7443fdd";
-  sha512.doc = "d5494677c903fb5e7c5376fb0a684ab5169d10aa145cf021a1cb9b87be03f1470e4b74a7c721319aa598779893fdd5a9144519207658c077a78998762a22d937";
+  sha512.run = "cf382e9fc9269b3c24b37f028491e5be439cbb30f3f77b04ed7481bc3eab02bf17c5182ca43ab3fcfc9737e72a93af808b3ee8599b65a0a63354da95913771ae";
+  sha512.doc = "6b570a5f63c516ec1da9133faed9f579df9850e9b81d221b107e2ab7637ce8dedb7b4c7bfc0a63c84623bcc9255e65186bcf4f60d7ff03477c43f98b00aac852";
   hasRunfiles = true;
-  version = "5.8f";
+  version = "5.10";
 };
 "chemnum" = {
   stripPrefix = 0;
@@ -4063,6 +4255,13 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.2c";
 };
+"chemplants" = {
+  stripPrefix = 0;
+  sha512.run = "271a8f113b9c722f08c750d77aa6d70c5342396c6bfee815f94e90cbd7f6ed7f9793dfcaed9f5ce49612e15924298f2e995b2b5f504b975c8081338076a61272";
+  sha512.doc = "18eb6cbbab95af45040cbf66384e32701e83e509c62bc3a68b82e760f131827740a16d5da35175eaea20810d4a66e8b1cc586baa10f372f1ad2a043c8f9f3f54";
+  hasRunfiles = true;
+  version = "0.9.8";
+};
 "chemschemex" = {
   stripPrefix = 0;
   sha512.run = "c7375af2dbf1a7b55d41b0ab617111cc198f1aeac98c354813cb2886e0707ce5648d3e4fd9eefdd23bffddc08b96c35a050c1f440f21d5a2d7d5c6b5e0b6aaac";
@@ -4102,11 +4301,11 @@ tl: { # no indentation
 };
 "chess-problem-diagrams" = {
   stripPrefix = 0;
-  sha512.run = "9216d5a545da3a9bf845d0fb91e345117a5917fbb992c93049a05baef3ea6517870572cd0c4f6f725045cb094f64ee3067a2d2eb461515c937d061a611619b11";
-  sha512.doc = "2d9268dd31ad4b9961824c7f9e73ea13c140a4d6fc6ab9c741ace4ec32de76ca2d0986b2caa5d2efa45c87968551dd3ba88d4d58b7c439300c9e748f551b2964";
-  sha512.source = "52ecd3daa5e1de9feb486c256cb0acd1dc262d12d574fec5cee8fa81cccd927d2636a6309a2aa6a8a57e27648c89dfbe4c3c5d380ecfc44e816e1a428c00831a";
+  sha512.run = "5125a7f27889534f74acd4918641ba1ec10344efb639fc7490941b605d530ab5f7c1d9e31beef978d471693e328640d0be89fea5628b1a9f9a20322649db5e05";
+  sha512.doc = "a329c412da558e092d52bbe429cfe2dd815a7e5709022d2ace45ca9f42588a7b563b16259222214680e955c77adc38d044a4f19639ecbfd8d85cb97c6e82b8a0";
+  sha512.source = "2f5c30195017fdf2f8fbce3bd80f6bfbf89f2e4dd9beacc172bc6c38a761e4cdfec9e278118c4c5aa0e64fe0c51a735acad2a862c24ca6f3684c024238da5f10";
   hasRunfiles = true;
-  version = "1.12";
+  version = "1.15";
 };
 "chessboard" = {
   stripPrefix = 0;
@@ -4150,6 +4349,11 @@ tl: { # no indentation
   sha512.doc = "893ba3ff20355e0c395b2092fc01689bd956eb177434ab7152aea686210a7167a04b64ed8ec21030e4f4cbc7e1367a90976168b174fd068d6aecbd0304f380db";
   hasRunfiles = true;
 };
+"chicagoa" = {
+  stripPrefix = 0;
+  sha512.run = "47cd96b4933b6c0bc4af01e5085af2450b60168813715c946ea18e3e7e5f6bda409862638038917bb678579bfba127fadf51b9a5916e4fb6c78bd10481a273a4";
+  hasRunfiles = true;
+};
 "chickenize" = {
   stripPrefix = 0;
   sha512.run = "82df32cba5f14ea8de96020b2412d7c2b3939b0afc4f42bd91e957694404a12a8ea38c9260cf472d81e9aa776556e9b5cf97a674d23ad32633f4fdefe3b3bf83";
@@ -4181,9 +4385,15 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.1";
 };
+"chklref" = {
+  sha512.run = "12f5e950ae439d0efd3f625572e8b81d993485a1efd71dc04c078cb1dc9b76650de3c424d7a6c60ebc5ccb5d29f37ed04c477ea1306acf4c5f4fccbd95e18985";
+  sha512.doc = "5aeb13824c1781feefe94215f3efce15c212e0d38f9e0d5fb393e96c2159ba43f165c600cd64ee9d8c42c0a4f0db6c2e462ee85a93993965bad0420b6b662ef6";
+  hasRunfiles = true;
+  version = "3.1.2";
+};
 "chktex" = {
-  sha512.run = "528392dde236fd4dc9cca54239e7b1d19103fa5789a1c0f541a74472ccea52548fceb13e10a629e389f94ac5c16006246edb3ca584b1681b9e22346edc720715";
-  sha512.doc = "6c879a78bc9aef8b851c07f54e3e1974628b0533a843046fad4e82013c32da6f1bcf585547816ac3f3b97fb4425af61e8b7b2b6e3ac1ca177e667a9b26ec17ae";
+  sha512.run = "918392b98262e29503fff544c735b9c7d8da07340362d258b88b09a940d6c8495d761c416ae79b99711ad0fafc559b4ec3b71511e881adac3f3d55c617ddc2cc";
+  sha512.doc = "5c24c5fe8f3100346e52104d0f65b096b9e3af7cdf02318fdc1977c7b9ded9b2a40fb06bd13a77866a34a9bfe77365038303e0cd09a327afcfe6c81b3dc36fdf";
   hasRunfiles = true;
   version = "1.7.6";
 };
@@ -4270,19 +4480,26 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.1";
 };
+"circledsteps" = {
+  stripPrefix = 0;
+  sha512.run = "f8e34dbb7167f4d9b6a9585c856f57cadcde9ccbde1d28a1918ff3f4c04916fe347acd2377cdfc5d0cb03ca2a8f5ed3389ca134e8621084da6504e0a5fa10622";
+  sha512.doc = "b7a50fa849e89393ebc6624623743ee7be737805c7807dd57957c05bd3489d908731c37c87d950615e5d6b835035169717a2648ba876ae458a0d4b0f779f0eea";
+  hasRunfiles = true;
+  version = "1.3";
+};
 "circuit-macros" = {
   stripPrefix = 0;
-  sha512.run = "a4b36693356178d6c3c15b9e1829d8d980ba5965ba4ffdd8dbe62ea44a5cb962cd326ddfa34e767b489d879e6ae39a9dcbfa607d3a769b370977d6e4dcf1e54a";
-  sha512.doc = "277dc7140b6fe176d27cc62afb018ad266bc946259b38f02f3166e0bc8ba9a5e3fa0b56134d48000545f41e59f1f0343985552bd075cd2d1fe98750c890862ab";
+  sha512.run = "2a4144072152000ae818322ff505c478ff266f40516c218c013dbb1e0e0bcee56b5bf3e4a67f112642348b6931b63946a17f407fa9bda07d5a4c35b326ffa136";
+  sha512.doc = "eca330bc347b7f2722f3c609b753cbdcdb8a204c162db8161256fbe1d627fd28b4bc6989cb024316f531fad935f3f927163c2c338373efda58794971ec1d5f5f";
   hasRunfiles = true;
-  version = "9.1";
+  version = "9.2";
 };
 "circuitikz" = {
   stripPrefix = 0;
-  sha512.run = "00474a4568fc629f57a76b963bc0445e582fecc3c6d7a714120998adb0f9bab94cf87b834938eb91575e22a5ad61896bc252f995cad439cda5f0b471bf2f9a49";
-  sha512.doc = "4e628fc482a6488ee6e4c78dab70645d42e19c2d34456ba4f12a2730487df5bbc09f582f9a72092edbd4bea019c80d9ffa65fd3ce0b70df955a4602ed73e115c";
+  sha512.run = "e9e7476e2e39b0212bb63384deb67b5c01a37dead40f7e310797468a7b8a78539297890132d58c6b77d96c2594b9585f3f908a99c2c4b99f6ecb60fd41fcdbd5";
+  sha512.doc = "50f9d3b6c31cda2c367cd464de88635daf173599e3ef297fd75b710ed8c7260ab8bf1338fc969e9bb4a7527b224d2aa01029389b56e610df55e398986fa184b0";
   hasRunfiles = true;
-  version = "0.9.5";
+  version = "1.0.1";
 };
 "cite" = {
   stripPrefix = 0;
@@ -4334,11 +4551,11 @@ tl: { # no indentation
   version = "4.8.4";
 };
 "cjk-gs-integrate" = {
-  sha512.run = "f4b6cad8406972b57a540a29897962cd01a481932e7a1efad6000f336040517a1b5af19a8f422a74d4c32fea02d95aec30085e26cccaae3e8e634e8233fff071";
-  sha512.doc = "c74b94b3de893c2a93bd14c059f85b786684fd548e568c058e182935ccdef5e1ffa16788d7b4ed9af1544152e39e3e16ede95431ede8cc9474d2e72161fe2c12";
-  sha512.source = "0ac430f7b0f56c244b57d704383af91e74d0eff5262839c375769b170d84380b92a9e17ec46d2c894fc35a27a527b93b5338b8ef3440386c2ca17e2884b4c3d4";
+  sha512.run = "f584536c3d70ab767407f9ea8f048ab9592133c0b1a76d8eec76e132aa0009cc5b1fe1ee6fc86174aaac618ebb2b5fa7258da79a12acfea9fc2aba4be0184ac5";
+  sha512.doc = "f2524df9e46cddb522517e38e53c1aa116ea7c6df04affe585c7265d427fbb748b2a7c94ab40d36040474ee4085bc3c0a1ada0340bae04d36a0d8ce7302014f0";
+  sha512.source = "e6ac59451a128fadbc32e96652b015b9e407ac623f67b26d1ddeba34ef169ea0f2c53cc57a3ea34fe66b127aedf1d81341d6115ba4711dca7394665d20634c09";
   hasRunfiles = true;
-  version = "20190816.0";
+  version = "20200115.0";
 };
 "cjk-ko" = {
   stripPrefix = 0;
@@ -4356,17 +4573,23 @@ tl: { # no indentation
   version = "4.8.4";
 };
 "cjkutils" = {
-  sha512.run = "0c6e2eef5022fcdedee3d3eeadd87a885e663f92274a4f671c039197b6fd886605c4d71b052669dc8665737f38f2ba02d070f75610384ed53d4e96d66d696457";
-  sha512.doc = "50437984ba42ea9f4d0a23ce78110d5899cbe205a46150998a2e44b2710196a0b5cefc44fe3ff78567e4372f57bf9f9d7177dc29ca7c37785b56f4bbe49cf11e";
+  sha512.run = "84ae942d24c6a5b6dc8a5ae9a7aed0e1da511e68a2730c26d022d935974869c810600321f4ec1b8c5aeb00d17c6eb360d2735b2ac529bee6aaf85bbf4e44ec2b";
+  sha512.doc = "f135a594a95a0d30262a00bbe8279a2d58c6549dba65533b6d1032f99b517b9ff91217ff3ece3768bffdd086e50ce99b56db494aea24dc460c7b077771e97921";
   hasRunfiles = true;
   version = "4.8.4";
 };
+"clara" = {
+  stripPrefix = 0;
+  sha512.run = "b5e91f144a9c1a8ecc2e912e47e49c61a42fcaafddef05731c701bc46f95cbbd88289bddeeb4928aa8766c6f696fecbb59b4638e89619cb08b94c5326a15ffd3";
+  sha512.doc = "40366f58178152d696308513816d642b57d791463260a5afd69df7ccdfe548a1e9bd9e0457fc7c9cb50c3bca7a2170d7c3573761e7362164a7e3d9c592cab7f5";
+  hasRunfiles = true;
+};
 "classics" = {
   stripPrefix = 0;
-  sha512.run = "e92314a21577423aa48e718d044de1e2abd1c052f6f85139a5d20f99f670867bf448a52592ab267fa8fc88a96ef0edc23637573f16859843dd1e4b9a5dce489d";
-  sha512.doc = "353b486d22807305031d5b25e2a9d403da220f217d4dc7ee5b2d6c42e5127d004ad8eabf37d53f4933121961120ac476afa8ec3535498d1b5e4bee8c889fa53a";
+  sha512.run = "86eaa987025658749c642f5132933745a418002feda5a3dec0f1dd9967a178af7e9c3188cde0b0b1fc8fb9ddf5cd59b68cf95942bd811d978d72a68f44a2999f";
+  sha512.doc = "df7d88ae0dc936b8b7f60e98f806b1368d249a838a7407ebd12de05fe10a6e0c9da1ba8cddd3d396033271dd3692451441ad267a187c30cbdf28dd996f707b78";
   hasRunfiles = true;
-  version = "0.1";
+  version = "0.1a";
 };
 "classicthesis" = {
   stripPrefix = 0;
@@ -4392,8 +4615,8 @@ tl: { # no indentation
 };
 "clearsans" = {
   stripPrefix = 0;
-  sha512.run = "af8b236f99abe2d0da1c0beb3237918649b7fe1d76eedcf1a5c409d5bd9fa3c89c6dc59daffb787f3e41aa3d45aaf3e78fdc2f7e67b376d958b00cdd111a57f7";
-  sha512.doc = "cdf49149657826202661563a01ae28a290b8fd9c7fd2395c1822bdf9284eaacff61781f5eeb0561c76149559614a59dcf0d03b765c4ab60151739f92031dc2e9";
+  sha512.run = "fbbb0be85ec7e2fcd8e75475df45d0ef6229c86c9672f56516711f8718575b857018239c4ce9bbafc7f226f986c48ea873a1b0e0f187ff46fc6ede604a3abff8";
+  sha512.doc = "43949701e72c24922afa76c49a04067035d5393c480d1fcb8e7db3d50030255f5506cfeb1d66d66ada35a479b4aaa12455424140c2bb74421d4fe3b9a4b487cd";
   hasRunfiles = true;
 };
 "clefval" = {
@@ -4463,16 +4686,16 @@ tl: { # no indentation
 };
 "clrstrip" = {
   stripPrefix = 0;
-  sha512.run = "bfa316a11232b3d1ce78641dda962918788186a7e164cb49829aebd187c72305adba6cd51285cb9b36f9c31d7d0b4454eabd488038970d79132e0c941e989c75";
-  sha512.doc = "a9d7648048eced494766636395fe99177a47456d61fd3d88a70006c718b259f7cf13e39696869230c098d696f0c12e505a4eea33201e2414f6e1833468eb1648";
-  sha512.source = "f63197e26dd88365a5c9af83f37ecc04281fda2362bfc79e29d35d37ddb4d25892a89c7a721cd04ab9286ca19f382d16c2f2df89a5242f12862890f177b8f6c6";
+  sha512.run = "34893bc3758fa010c34523284d73e18d347cc51a46236599c5e6df7bde4ea196da4ae8731b316c13cb9d225d353f1b3ee9bf0357ba9f30e400a9f16783a6bbe5";
+  sha512.doc = "8a18217808e2dbe8e6f96fff8c93458c14fa8bc97e6a8d460eb75c051b982bb2f423d46ea5c4b77bb45942896b126b8782bbbe1ab1a0f5fdc4831a5b8435d59d";
+  sha512.source = "b5cfa0234c7960718b4d201dc1896c8a92c437cdcd531e8decc783470df2e1a932f923a49ee3434dcf540263c9238374e455a14a0f64e84c41cd3985e1f21084";
   hasRunfiles = true;
 };
 "cluttex" = {
-  sha512.run = "e6b721b8220a7196d0baa93878526f76f8ce986ee586ae8a31344b674061012a644b2d492ae7ca4f896bd90648a3786cbdb8965b8e25695eb751fbfbc6692ce9";
-  sha512.doc = "904b3594c4c90d906e7ab801a5d2bf5c3297cdc5a05ed4a9fe3c97ef1330b45e357356a27ccb15d3deb76d98764550da6e84d0f2f9a845452ed382f1a606a50c";
+  sha512.run = "e211cd6fc89751628b0ebf0bd599ddffd18e39e24292fa896bd2394bbc1fe60c35d5230662a53fa685f051963db3966f27dd752cc63877585880a62483f6f93d";
+  sha512.doc = "d26a6fe183999987b2a1d375d1061fadd78d23a1bddb0582d8f70561c5d1bd745d33e0c41e8256adb00e2dc5b9f4904e7de4f2c03a00a6688b6c4a433f1d359c";
   hasRunfiles = true;
-  version = "0.4";
+  version = "0.5";
 };
 "cm" = {
   stripPrefix = 0;
@@ -4598,6 +4821,13 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "2.1";
 };
+"cmupint" = {
+  stripPrefix = 0;
+  sha512.run = "df5fec72f9116ddeaa19bbfb1c174c008b6c6e78313459542092cfee30f20ad93c0e42b3078cef83d606e4403d2c84ec232f365c02e4be8b80109544ab24ac3a";
+  sha512.doc = "fe7d492c660ec1786f486f1a58b405303b2dbd63094f05fb0da85fd0a7811eebd11f18a065b524027dd4fc559bd5ebb037a3114b9984f622af5daeb3d42e8acb";
+  hasRunfiles = true;
+  version = "1.0";
+};
 "cnbwp" = {
   stripPrefix = 0;
   sha512.run = "31c83774160e64dadc95afebe830ea1aa7c929e48f611cf5c9742cb66e12a3dd459928c85ed1378460247241fd4f007145b002ae7aabb88e773779124510c86f";
@@ -4606,10 +4836,10 @@ tl: { # no indentation
 };
 "cnltx" = {
   stripPrefix = 0;
-  sha512.run = "cbe777c4dc81f0798ba3d64844e65c84a7623611feb93a14e949375f0cda982d7a973fd662975edc51e508c0cd0d19f24e92bff112f56b765ad4378ae95b8bd4";
-  sha512.doc = "1af4a294f758889b8cec97cdc53519fa9eb360e590e5db96cfb25ad2d0d0f89b7b3efa6b6ea986e29819b3023d04f3cf50a0a2e583bcd6fd80a61dfcdbc5dcc1";
+  sha512.run = "e2e51aefb221bd92c03af9fe82738ff4912445cdc56bdcec2ad1e9da132804bc1b1ae578f4db69a39a90981e16682f88b32b5192b0510977f2444dd5232f487b";
+  sha512.doc = "8cb976bc69502c4e4a17473cf5a57cf0316cd488a64af97a4c76679ebb7acf5655991d7a9f21a1e3c3fbbf03b934675fe3c00b6a2db7af12e8e1e170151a6eb7";
   hasRunfiles = true;
-  version = "0.13";
+  version = "0.15";
 };
 "cns" = {
   stripPrefix = 0;
@@ -4634,10 +4864,10 @@ tl: { # no indentation
 };
 "cochineal" = {
   stripPrefix = 0;
-  sha512.run = "8f59083fe0f335b08c61e68bc5f4e747409e9514e5ae9361acfa001b698e14effc830ad993eb2e0b4d026edcdf918868959766a998eb35310cc51e03a5894ea8";
-  sha512.doc = "84cfa9d369a1a342becda4837617b14436e9ec9bbefe5fd446acde3f73292a306e705e88c29b65621f39590c1507f7619accdb505829b8441ba58110c6a47ba6";
+  sha512.run = "1042d59946773c0f321758bd61f9aec5f4a6536493db50df4d9afe693f02fc5a3a64b40c01a7097f5ca9c6e1b3f23181e5bec5ea62de0b2c7c7a38438374e3bf";
+  sha512.doc = "115bc2ed0e846f374b768908f5af7019d4b000ecba18df9914248c023eda5ed5033ffc3483ddf89ec909dc6509820858f7de6721a3d5701f1475764c008c49fd";
   hasRunfiles = true;
-  version = "1.055";
+  version = "1.060";
 };
 "codeanatomy" = {
   stripPrefix = 0;
@@ -4679,8 +4909,8 @@ tl: { # no indentation
 };
 "coelacanth" = {
   stripPrefix = 0;
-  sha512.run = "12c3567797664581309fd1507003838dd14c217b26d5cbf7ec149ebd60f77eb0b126fafe41b612037afbf6a79ecbcc5b1047516199c9a1dd677d0b81e1a40046";
-  sha512.doc = "47da656f6952b769049f0a3a267ce5245c08ffe2dc3c7902bebf51cfbbf0fa37bcf6522cae8b6d4040ad112a1aae5eeab997c2d5d975c1b64d91aad21ff1d025";
+  sha512.run = "b29dd50ce96159af8c212aee3dfab5eed5285df453caa60c9fd65bef69ff865ba81c698af8ad55f2d3533ed3ad4209644f34815b7287a678a734c9b27e2acc24";
+  sha512.doc = "38f0f12bd2510a29120fef972578bf7587d4d5a469fda80f8eeecf4d0492e7503040ead69ef9eba46766598889ecea3741b9f78296ca49feb69e69d2f475b1f8";
   hasRunfiles = true;
   version = "0.005";
 };
@@ -4708,6 +4938,7 @@ tl: { # no indentation
   deps."colorprofiles" = tl."colorprofiles";
   deps."dvipdfmx" = tl."dvipdfmx";
   deps."dvips" = tl."dvips";
+  deps."ec" = tl."ec";
   deps."enctex" = tl."enctex";
   deps."etex" = tl."etex";
   deps."etex-pkg" = tl."etex-pkg";
@@ -4717,9 +4948,8 @@ tl: { # no indentation
   deps."hyph-utf8" = tl."hyph-utf8";
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyphenex" = tl."hyphenex";
-  deps."ifluatex" = tl."ifluatex";
   deps."ifplatform" = tl."ifplatform";
-  deps."ifxetex" = tl."ifxetex";
+  deps."iftex" = tl."iftex";
   deps."knuth-lib" = tl."knuth-lib";
   deps."knuth-local" = tl."knuth-local";
   deps."kpathsea" = tl."kpathsea";
@@ -4729,9 +4959,9 @@ tl: { # no indentation
   deps."metafont" = tl."metafont";
   deps."mflogo" = tl."mflogo";
   deps."mfware" = tl."mfware";
+  deps."modes" = tl."modes";
   deps."pdftex" = tl."pdftex";
   deps."plain" = tl."plain";
-  deps."tetex" = tl."tetex";
   deps."tex" = tl."tex";
   deps."tex-ini-files" = tl."tex-ini-files";
   deps."texlive-common" = tl."texlive-common";
@@ -4743,17 +4973,20 @@ tl: { # no indentation
   deps."unicode-data" = tl."unicode-data";
   deps."updmap-map" = tl."updmap-map";
   deps."xdvi" = tl."xdvi";
-  sha512.run = "cfe97f315159b9f5732cdc417b16c18d37443d13389abee846d690c13bf5ea0cadbce78b77e78154e6adc3bfbce1d049a8302147c5a9defa9795ba98637c04b0";
+  sha512.run = "57aab47e05657c83c41e81fa1ece61a43b223c76043b7f4c2a3af6c54110ba69ee3421ad7bda591e7f0872a5f2e4def87f338d6d0fa9a931396a37ca76dda521";
 };
 "collection-bibtexextra" = {
   stripPrefix = 0;
   deps."collection-latex" = tl."collection-latex";
+  deps."aaai-named" = tl."aaai-named";
   deps."aichej" = tl."aichej";
   deps."ajl" = tl."ajl";
   deps."amsrefs" = tl."amsrefs";
+  deps."annotate" = tl."annotate";
   deps."apacite" = tl."apacite";
   deps."apalike2" = tl."apalike2";
   deps."archaeologie" = tl."archaeologie";
+  deps."authordate" = tl."authordate";
   deps."beebe" = tl."beebe";
   deps."besjournals" = tl."besjournals";
   deps."bestpapers" = tl."bestpapers";
@@ -4766,6 +4999,7 @@ tl: { # no indentation
   deps."biblatex-abnt" = tl."biblatex-abnt";
   deps."biblatex-anonymous" = tl."biblatex-anonymous";
   deps."biblatex-apa" = tl."biblatex-apa";
+  deps."biblatex-apa6" = tl."biblatex-apa6";
   deps."biblatex-archaeology" = tl."biblatex-archaeology";
   deps."biblatex-arthistory-bonn" = tl."biblatex-arthistory-bonn";
   deps."biblatex-bath" = tl."biblatex-bath";
@@ -4786,6 +5020,7 @@ tl: { # no indentation
   deps."biblatex-ieee" = tl."biblatex-ieee";
   deps."biblatex-ijsra" = tl."biblatex-ijsra";
   deps."biblatex-iso690" = tl."biblatex-iso690";
+  deps."biblatex-jura2" = tl."biblatex-jura2";
   deps."biblatex-juradiss" = tl."biblatex-juradiss";
   deps."biblatex-lni" = tl."biblatex-lni";
   deps."biblatex-luh-ipw" = tl."biblatex-luh-ipw";
@@ -4823,6 +5058,7 @@ tl: { # no indentation
   deps."cell" = tl."cell";
   deps."chbibref" = tl."chbibref";
   deps."chicago" = tl."chicago";
+  deps."chicagoa" = tl."chicagoa";
   deps."chicago-annote" = tl."chicago-annote";
   deps."chembst" = tl."chembst";
   deps."chscite" = tl."chscite";
@@ -4852,6 +5088,9 @@ tl: { # no indentation
   deps."ijqc" = tl."ijqc";
   deps."inlinebib" = tl."inlinebib";
   deps."iopart-num" = tl."iopart-num";
+  deps."is-bst" = tl."is-bst";
+  deps."jbact" = tl."jbact";
+  deps."jmb" = tl."jmb";
   deps."jneurosci" = tl."jneurosci";
   deps."jurabib" = tl."jurabib";
   deps."ksfh_nat" = tl."ksfh_nat";
@@ -4869,6 +5108,7 @@ tl: { # no indentation
   deps."notex-bst" = tl."notex-bst";
   deps."oscola" = tl."oscola";
   deps."perception" = tl."perception";
+  deps."plainyr" = tl."plainyr";
   deps."pnas2009" = tl."pnas2009";
   deps."rsc" = tl."rsc";
   deps."showtags" = tl."showtags";
@@ -4883,7 +5123,7 @@ tl: { # no indentation
   deps."windycity" = tl."windycity";
   deps."xcite" = tl."xcite";
   deps."zootaxa-bst" = tl."zootaxa-bst";
-  sha512.run = "b1582ade8d050be6c53fcdec2a03f2c8c5d9aa661bfc5fba874221fb2fdefa8382eba0b6d54aa43eed6916349eb1b33a94c7f9235d49951438e206625d5c6ee3";
+  sha512.run = "51da88d702cff5d127c1f40119cac08df392b0677825e9ececbd3183d1691ceaf1bdafd5b9541a434d37a7562dbd2851b6cac28ee4d3558c8a85dc1ad44566c7";
 };
 "collection-binextra" = {
   stripPrefix = 0;
@@ -4896,6 +5136,7 @@ tl: { # no indentation
   deps."bibtexu" = tl."bibtexu";
   deps."bundledoc" = tl."bundledoc";
   deps."checklistings" = tl."checklistings";
+  deps."chklref" = tl."chklref";
   deps."chktex" = tl."chktex";
   deps."clojure-pamphlet" = tl."clojure-pamphlet";
   deps."cluttex" = tl."cluttex";
@@ -4938,6 +5179,7 @@ tl: { # no indentation
   deps."ltxfileinfo" = tl."ltxfileinfo";
   deps."ltximg" = tl."ltximg";
   deps."listings-ext" = tl."listings-ext";
+  deps."luajittex" = tl."luajittex";
   deps."make4ht" = tl."make4ht";
   deps."match_parens" = tl."match_parens";
   deps."mflua" = tl."mflua";
@@ -4948,7 +5190,7 @@ tl: { # no indentation
   deps."pdfjam" = tl."pdfjam";
   deps."pdflatexpicscale" = tl."pdflatexpicscale";
   deps."pdftex-quiet" = tl."pdftex-quiet";
-  deps."pdftools" = tl."pdftools";
+  deps."pdftosrc" = tl."pdftosrc";
   deps."pdfxup" = tl."pdfxup";
   deps."pfarrei" = tl."pfarrei";
   deps."pkfix" = tl."pkfix";
@@ -4967,9 +5209,11 @@ tl: { # no indentation
   deps."texdoc" = tl."texdoc";
   deps."texdoctk" = tl."texdoctk";
   deps."texfot" = tl."texfot";
+  deps."texlive-scripts-extra" = tl."texlive-scripts-extra";
   deps."texliveonfly" = tl."texliveonfly";
   deps."texloganalyser" = tl."texloganalyser";
   deps."texosquery" = tl."texosquery";
+  deps."texplate" = tl."texplate";
   deps."texware" = tl."texware";
   deps."tie" = tl."tie";
   deps."tlcockpit" = tl."tlcockpit";
@@ -4978,7 +5222,8 @@ tl: { # no indentation
   deps."web" = tl."web";
   deps."xindex" = tl."xindex";
   deps."xindy" = tl."xindy";
-  sha512.run = "ef80a1b88f05deb69f19d0a918aaea7bc761ce76744c161229cad06904168eacd53eb0f67de9beec245b417692e587b78ed4ce7ad36c7eafc6a38ccb30becdfe";
+  deps."xpdfopen" = tl."xpdfopen";
+  sha512.run = "306dac78fb385fca7c2de33deded8f13fe1dc7999cc58b5019cb0eafd0ac74f629db627b05a49b1ca7cae431d5aff5bb514329b167ee2c2bb16bba81d8f6dd54";
 };
 "collection-context" = {
   stripPrefix = 0;
@@ -5084,6 +5329,7 @@ tl: { # no indentation
   deps."cherokee" = tl."cherokee";
   deps."chivo" = tl."chivo";
   deps."cinzel" = tl."cinzel";
+  deps."clara" = tl."clara";
   deps."clearsans" = tl."clearsans";
   deps."cm-lgc" = tl."cm-lgc";
   deps."cm-mf-extra-bold" = tl."cm-mf-extra-bold";
@@ -5094,6 +5340,7 @@ tl: { # no indentation
   deps."cmpica" = tl."cmpica";
   deps."cmsrb" = tl."cmsrb";
   deps."cmtiup" = tl."cmtiup";
+  deps."cmupint" = tl."cmupint";
   deps."cochineal" = tl."cochineal";
   deps."coelacanth" = tl."coelacanth";
   deps."comfortaa" = tl."comfortaa";
@@ -5115,6 +5362,7 @@ tl: { # no indentation
   deps."dice" = tl."dice";
   deps."dictsym" = tl."dictsym";
   deps."dingbat" = tl."dingbat";
+  deps."domitian" = tl."domitian";
   deps."doublestroke" = tl."doublestroke";
   deps."dozenal" = tl."dozenal";
   deps."drm" = tl."drm";
@@ -5135,9 +5383,11 @@ tl: { # no indentation
   deps."epigrafica" = tl."epigrafica";
   deps."epsdice" = tl."epsdice";
   deps."erewhon" = tl."erewhon";
+  deps."erewhon-math" = tl."erewhon-math";
   deps."esrelation" = tl."esrelation";
   deps."esstix" = tl."esstix";
   deps."esvect" = tl."esvect";
+  deps."etbb" = tl."etbb";
   deps."eulervm" = tl."eulervm";
   deps."euxm" = tl."euxm";
   deps."fbb" = tl."fbb";
@@ -5167,6 +5417,7 @@ tl: { # no indentation
   deps."gfsbodoni" = tl."gfsbodoni";
   deps."gfscomplutum" = tl."gfscomplutum";
   deps."gfsdidot" = tl."gfsdidot";
+  deps."gfsdidotclassic" = tl."gfsdidotclassic";
   deps."gfsneohellenic" = tl."gfsneohellenic";
   deps."gfsneohellenicmath" = tl."gfsneohellenicmath";
   deps."gfssolomos" = tl."gfssolomos";
@@ -5196,6 +5447,7 @@ tl: { # no indentation
   deps."kpfonts" = tl."kpfonts";
   deps."kurier" = tl."kurier";
   deps."lato" = tl."lato";
+  deps."lexend" = tl."lexend";
   deps."lfb" = tl."lfb";
   deps."libertine" = tl."libertine";
   deps."libertinegc" = tl."libertinegc";
@@ -5227,7 +5479,9 @@ tl: { # no indentation
   deps."missaali" = tl."missaali";
   deps."mnsymbol" = tl."mnsymbol";
   deps."montserrat" = tl."montserrat";
+  deps."mpfonts" = tl."mpfonts";
   deps."mweights" = tl."mweights";
+  deps."newcomputermodern" = tl."newcomputermodern";
   deps."newpx" = tl."newpx";
   deps."newtx" = tl."newtx";
   deps."newtxsf" = tl."newtxsf";
@@ -5236,6 +5490,7 @@ tl: { # no indentation
   deps."nimbus15" = tl."nimbus15";
   deps."nkarta" = tl."nkarta";
   deps."noto" = tl."noto";
+  deps."noto-emoji" = tl."noto-emoji";
   deps."obnov" = tl."obnov";
   deps."ocherokee" = tl."ocherokee";
   deps."ocr-b" = tl."ocr-b";
@@ -5263,6 +5518,7 @@ tl: { # no indentation
   deps."punk-latex" = tl."punk-latex";
   deps."punknova" = tl."punknova";
   deps."pxtxalfa" = tl."pxtxalfa";
+  deps."qualitype" = tl."qualitype";
   deps."quattrocento" = tl."quattrocento";
   deps."raleway" = tl."raleway";
   deps."recycle" = tl."recycle";
@@ -5274,6 +5530,7 @@ tl: { # no indentation
   deps."sansmathfonts" = tl."sansmathfonts";
   deps."sauter" = tl."sauter";
   deps."sauterfonts" = tl."sauterfonts";
+  deps."scholax" = tl."scholax";
   deps."schulschriften" = tl."schulschriften";
   deps."semaphor" = tl."semaphor";
   deps."shobhika" = tl."shobhika";
@@ -5300,6 +5557,7 @@ tl: { # no indentation
   deps."tinos" = tl."tinos";
   deps."tpslifonts" = tl."tpslifonts";
   deps."trajan" = tl."trajan";
+  deps."twemoji-colr" = tl."twemoji-colr";
   deps."txfontsb" = tl."txfontsb";
   deps."txuprcal" = tl."txuprcal";
   deps."typicons" = tl."typicons";
@@ -5316,7 +5574,7 @@ tl: { # no indentation
   deps."yfonts-t1" = tl."yfonts-t1";
   deps."yinit-otf" = tl."yinit-otf";
   deps."zlmtt" = tl."zlmtt";
-  sha512.run = "76ac1206ba9618472b23d739823635d9a3832917adf5c94f1e3a8aad663a01a5594f6f2d3b170013fc5dc30ae120b00f87482fa6034dceefed0749eef3c4977f";
+  sha512.run = "c98b0241f30fbc7be047c0e1ecda32be6ef0d4e7737906e230ba13de55e0847bf29e2a54e87a84a4270fa023608280b063586830c7cd9c3715f392aba4504b0d";
 };
 "collection-fontsrecommended" = {
   stripPrefix = 0;
@@ -5327,7 +5585,6 @@ tl: { # no indentation
   deps."cm-super" = tl."cm-super";
   deps."cmextra" = tl."cmextra";
   deps."courier" = tl."courier";
-  deps."ec" = tl."ec";
   deps."euro" = tl."euro";
   deps."euro-ce" = tl."euro-ce";
   deps."eurosym" = tl."eurosym";
@@ -5351,11 +5608,11 @@ tl: { # no indentation
   deps."txfonts" = tl."txfonts";
   deps."utopia" = tl."utopia";
   deps."wasy" = tl."wasy";
-  deps."wasy2-ps" = tl."wasy2-ps";
+  deps."wasy-type1" = tl."wasy-type1";
   deps."wasysym" = tl."wasysym";
   deps."zapfchan" = tl."zapfchan";
   deps."zapfding" = tl."zapfding";
-  sha512.run = "9ce869ce9e21838cb467b7fb6e6087b2afa005c398075c5da77e07fcc57a3c153663ddf8c53f914638b3e1e44e8957b59459b689d17668fdf42a050b19d079f5";
+  sha512.run = "9d2691b1deb294c6a947b4412470f84eb7beee9b8b6ce6a536cdec6a86de7ade51b58d332e8718fb82acac7fbe8980c184ccdc73d720feb8df40cb414c8cb5c2";
 };
 "collection-fontutils" = {
   stripPrefix = 0;
@@ -5368,7 +5625,7 @@ tl: { # no indentation
   deps."lcdftypetools" = tl."lcdftypetools";
   deps."metatype1" = tl."metatype1";
   deps."ps2pk" = tl."ps2pk";
-  deps."pstools" = tl."pstools";
+  deps."ps2eps" = tl."ps2eps";
   deps."psutils" = tl."psutils";
   deps."dvipsconfig" = tl."dvipsconfig";
   deps."fontinst" = tl."fontinst";
@@ -5376,7 +5633,7 @@ tl: { # no indentation
   deps."mf2pt1" = tl."mf2pt1";
   deps."t1utils" = tl."t1utils";
   deps."ttfutils" = tl."ttfutils";
-  sha512.run = "39ede1185914e6df2bd1a535d2ca955720dfd51fba425f0ee6ac75c9e8e7480e779c8eb41df0cd57d1f23595db0f247f5e8fb2988dcc1845dd5d51b3f8918533";
+  sha512.run = "bd36ffb3bdf0c9df289f73143288b4d1fae6a4fd9c391590274b3eb3365e44dceb67f091e0d94466c7e6110a19a5b8c4b47e8d0591d04bdfa664b4fc2a58c7fe";
 };
 "collection-formatsextra" = {
   stripPrefix = 0;
@@ -5626,7 +5883,8 @@ tl: { # no indentation
   deps."texlive-ru" = tl."texlive-ru";
   deps."texlive-sr" = tl."texlive-sr";
   deps."ukrhyph" = tl."ukrhyph";
-  sha512.run = "15c733db1104a296e0caeceab761a9e0f89c7bbae5c87d49a9539638cbcb1c2489c41fe08b0bbca5df503cb8ee54b61425e35b0e6db41947bdbcc40e4daea0bc";
+  deps."xecyrmongolian" = tl."xecyrmongolian";
+  sha512.run = "28ee3e3b72c9297cc2ae6617b80706ff47d97450c5b5547b5be493d156ee420c822cd84909bce148d596aad1601289f5b6167130aa87aca7c2edbf18d248dc05";
 };
 "collection-langczechslovak" = {
   stripPrefix = 0;
@@ -5840,7 +6098,6 @@ tl: { # no indentation
   deps."etdipa" = tl."etdipa";
   deps."etoolbox-de" = tl."etoolbox-de";
   deps."fifinddo-info" = tl."fifinddo-info";
-  deps."geometry-de" = tl."geometry-de";
   deps."german" = tl."german";
   deps."germbib" = tl."germbib";
   deps."germkorr" = tl."germkorr";
@@ -5860,6 +6117,7 @@ tl: { # no indentation
   deps."milog" = tl."milog";
   deps."presentations" = tl."presentations";
   deps."r_und_s" = tl."r_und_s";
+  deps."schulmathematik" = tl."schulmathematik";
   deps."templates-fenn" = tl."templates-fenn";
   deps."templates-sommer" = tl."templates-sommer";
   deps."termcal-de" = tl."termcal-de";
@@ -5877,7 +6135,7 @@ tl: { # no indentation
   deps."uhrzeit" = tl."uhrzeit";
   deps."umlaute" = tl."umlaute";
   deps."voss-mathcol" = tl."voss-mathcol";
-  sha512.run = "efa8741b737f9331fed483fd4d0f8b286099f65503b3ea4874a272ea4c53f52e8d23cb9d76c1a4b19853d938a093e49b583a87003b7cdba41e9d6287598b396a";
+  sha512.run = "a73e281ccb849825e3a1996273cbd34ef7337fcf5368f556c2909a029fbedb10672a18b984444574cde3a2b39d11a6f23f17bedd382268a2b6aa2226c5a26d61";
 };
 "collection-langgreek" = {
   stripPrefix = 0;
@@ -5927,7 +6185,8 @@ tl: { # no indentation
   deps."lshort-italian" = tl."lshort-italian";
   deps."psfrag-italian" = tl."psfrag-italian";
   deps."texlive-it" = tl."texlive-it";
-  sha512.run = "1cace30c8b68dc6e44e5bfe070c155bc65462b4d950506d79967f9e7472c9d7b7f9b3016fe3a34049cc7ec50c21d12f4bd6c4a03bf4f3c63172976d1b888855e";
+  deps."verifica" = tl."verifica";
+  sha512.run = "2b172a37bd15ab85cdfa52f25c1b7310c23af5f9f4925cd678ee7a6f7731e4ba39fb866de2df05d6e06f3483303a9a4bfa60b65edd035e1cf55d6f5c004413b9";
 };
 "collection-langjapanese" = {
   stripPrefix = 0;
@@ -5940,12 +6199,15 @@ tl: { # no indentation
   deps."bxjaholiday" = tl."bxjaholiday";
   deps."bxjalipsum" = tl."bxjalipsum";
   deps."bxjaprnind" = tl."bxjaprnind";
+  deps."bxjatoucs" = tl."bxjatoucs";
   deps."bxjscls" = tl."bxjscls";
   deps."bxorigcapt" = tl."bxorigcapt";
   deps."bxwareki" = tl."bxwareki";
   deps."convbkmk" = tl."convbkmk";
   deps."endnotesj" = tl."endnotesj";
   deps."gentombow" = tl."gentombow";
+  deps."haranoaji" = tl."haranoaji";
+  deps."haranoaji-extra" = tl."haranoaji-extra";
   deps."ifptex" = tl."ifptex";
   deps."ifxptex" = tl."ifxptex";
   deps."ipaex" = tl."ipaex";
@@ -5983,7 +6245,7 @@ tl: { # no indentation
   deps."wadalab" = tl."wadalab";
   deps."zxjafbfont" = tl."zxjafbfont";
   deps."zxjatype" = tl."zxjatype";
-  sha512.run = "01f27234f79c1f468f6a5d12175c9a115f425f1d36921136825c76208cdce9abf7171f700c4d13b7ba01eab87b24ec819f29e648c1a7bbaa10ac5ce3c4053f50";
+  sha512.run = "3d9cc9c20a4ef6dbacae6fda18e625fc3828b4f899460d8e920217b79e19aab5601bd7146e6adaa6d599c81a7424390a98c3b8a26dd5ac759caa57fa74fcb5c4";
 };
 "collection-langkorean" = {
   stripPrefix = 0;
@@ -5996,10 +6258,11 @@ tl: { # no indentation
   deps."kotex-utils" = tl."kotex-utils";
   deps."lshort-korean" = tl."lshort-korean";
   deps."nanumtype1" = tl."nanumtype1";
+  deps."pmhanguljamo" = tl."pmhanguljamo";
   deps."uhc" = tl."uhc";
   deps."unfonts-core" = tl."unfonts-core";
   deps."unfonts-extra" = tl."unfonts-extra";
-  sha512.run = "6234b292f8b36a13d1a3543fb8ba19cb3cdab2fa30df008f1e33e62f4e6f291280b9f3e85aa21e5400ddd59392e698ddbf8c9c642934242402e93d6e3661d914";
+  sha512.run = "6f1ae7dfcee95eb5f9c8d0b6545ccdd159e63684b7bba22ebe4280dd2e13cbfb6518274eb131f1502bd99ac16114b4e694105e366631afe484caa22eee94b9d7";
 };
 "collection-langother" = {
   stripPrefix = 0;
@@ -6040,6 +6303,7 @@ tl: { # no indentation
   deps."hyphen-turkmen" = tl."hyphen-turkmen";
   deps."latex-mr" = tl."latex-mr";
   deps."latexbangla" = tl."latexbangla";
+  deps."latino-sine-flexione" = tl."latino-sine-flexione";
   deps."lshort-thai" = tl."lshort-thai";
   deps."lshort-vietnamese" = tl."lshort-vietnamese";
   deps."ntheorem-vn" = tl."ntheorem-vn";
@@ -6055,7 +6319,7 @@ tl: { # no indentation
   deps."wnri" = tl."wnri";
   deps."wnri-latex" = tl."wnri-latex";
   deps."xetex-devanagari" = tl."xetex-devanagari";
-  sha512.run = "1a5c0d201f18eae47341d5683507602341baafcf5bc519116f7e4ae8a0c535210469ce1c9a8db0f21cbdf8277cee71b0c989ab0a97dd7f11aebdd5bb8e2f3443";
+  sha512.run = "e69c9003086890a627c9e7bafb9e76e722e3bd111af1ba7b36b393e81a536752fb6355455a491effa5aaabe286c97e16fd9d6688a237656c9d3e63437ec2b718";
 };
 "collection-langpolish" = {
   stripPrefix = 0;
@@ -6121,32 +6385,56 @@ tl: { # no indentation
   deps."ae" = tl."ae";
   deps."amscls" = tl."amscls";
   deps."amsmath" = tl."amsmath";
+  deps."atbegshi" = tl."atbegshi";
+  deps."atveryend" = tl."atveryend";
+  deps."auxhook" = tl."auxhook";
   deps."babel" = tl."babel";
   deps."babel-english" = tl."babel-english";
   deps."babelbib" = tl."babelbib";
+  deps."bigintcalc" = tl."bigintcalc";
+  deps."bitset" = tl."bitset";
+  deps."bookmark" = tl."bookmark";
   deps."carlisle" = tl."carlisle";
   deps."colortbl" = tl."colortbl";
+  deps."epstopdf-pkg" = tl."epstopdf-pkg";
+  deps."etexcmds" = tl."etexcmds";
   deps."fancyhdr" = tl."fancyhdr";
   deps."fix2col" = tl."fix2col";
   deps."geometry" = tl."geometry";
+  deps."gettitlestring" = tl."gettitlestring";
   deps."graphics" = tl."graphics";
   deps."graphics-cfg" = tl."graphics-cfg";
+  deps."grfext" = tl."grfext";
+  deps."hycolor" = tl."hycolor";
   deps."hyperref" = tl."hyperref";
+  deps."intcalc" = tl."intcalc";
+  deps."kvdefinekeys" = tl."kvdefinekeys";
+  deps."kvoptions" = tl."kvoptions";
+  deps."kvsetkeys" = tl."kvsetkeys";
+  deps."l3backend" = tl."l3backend";
+  deps."l3kernel" = tl."l3kernel";
   deps."latex" = tl."latex";
   deps."latex-bin" = tl."latex-bin";
   deps."latex-fonts" = tl."latex-fonts";
   deps."latexconfig" = tl."latexconfig";
+  deps."letltxmacro" = tl."letltxmacro";
+  deps."ltxcmds" = tl."ltxcmds";
   deps."ltxmisc" = tl."ltxmisc";
   deps."mfnfss" = tl."mfnfss";
   deps."mptopdf" = tl."mptopdf";
   deps."natbib" = tl."natbib";
   deps."oberdiek" = tl."oberdiek";
+  deps."pdfescape" = tl."pdfescape";
   deps."pslatex" = tl."pslatex";
   deps."psnfss" = tl."psnfss";
   deps."pspicture" = tl."pspicture";
+  deps."refcount" = tl."refcount";
+  deps."rerunfilecheck" = tl."rerunfilecheck";
+  deps."stringenc" = tl."stringenc";
   deps."tools" = tl."tools";
+  deps."uniquecounter" = tl."uniquecounter";
   deps."url" = tl."url";
-  sha512.run = "b1aae6d9b6a16813d76ee4c4bff813120784f856574b83aad156bb6bd0edc8815688159f78a5fa74dc1662c02c94c675e8caa3f654e933673f0424e8f1ead80f";
+  sha512.run = "0dbb2072e05a4f11ba940b9672d86c6c87a765c584c258271b93589382401ba96a296a00ad446645357cded4bfc44b60aa21df4b923e567aadf2b220f34f2dfb";
 };
 "collection-latexextra" = {
   stripPrefix = 0;
@@ -6163,6 +6451,7 @@ tl: { # no indentation
   deps."abraces" = tl."abraces";
   deps."abstract" = tl."abstract";
   deps."accessibility" = tl."accessibility";
+  deps."accsupp" = tl."accsupp";
   deps."achemso" = tl."achemso";
   deps."acro" = tl."acro";
   deps."acronym" = tl."acronym";
@@ -6179,6 +6468,7 @@ tl: { # no indentation
   deps."akletter" = tl."akletter";
   deps."alertmessage" = tl."alertmessage";
   deps."alnumsec" = tl."alnumsec";
+  deps."alphalph" = tl."alphalph";
   deps."alterqcm" = tl."alterqcm";
   deps."altfont" = tl."altfont";
   deps."amsaddr" = tl."amsaddr";
@@ -6196,8 +6486,10 @@ tl: { # no indentation
   deps."arraysort" = tl."arraysort";
   deps."arydshln" = tl."arydshln";
   deps."asciilist" = tl."asciilist";
+  deps."askinclude" = tl."askinclude";
   deps."assignment" = tl."assignment";
   deps."assoccnt" = tl."assoccnt";
+  deps."atenddvi" = tl."atenddvi";
   deps."attachfile" = tl."attachfile";
   deps."aurl" = tl."aurl";
   deps."authoraftertitle" = tl."authoraftertitle";
@@ -6206,6 +6498,7 @@ tl: { # no indentation
   deps."autonum" = tl."autonum";
   deps."autopdf" = tl."autopdf";
   deps."avremu" = tl."avremu";
+  deps."axessibility" = tl."axessibility";
   deps."background" = tl."background";
   deps."bankstatement" = tl."bankstatement";
   deps."bashful" = tl."bashful";
@@ -6231,6 +6524,7 @@ tl: { # no indentation
   deps."beamertheme-upenn-bc" = tl."beamertheme-upenn-bc";
   deps."beamerthemejltree" = tl."beamerthemejltree";
   deps."beamerthemenirma" = tl."beamerthemenirma";
+  deps."bearwear" = tl."bearwear";
   deps."beton" = tl."beton";
   deps."bewerbung" = tl."bewerbung";
   deps."bez123" = tl."bez123";
@@ -6281,6 +6575,7 @@ tl: { # no indentation
   deps."carbohydrates" = tl."carbohydrates";
   deps."cases" = tl."cases";
   deps."casyl" = tl."casyl";
+  deps."catchfile" = tl."catchfile";
   deps."catchfilebetweentags" = tl."catchfilebetweentags";
   deps."catechis" = tl."catechis";
   deps."catoptions" = tl."catoptions";
@@ -6311,6 +6606,7 @@ tl: { # no indentation
   deps."chngcntr" = tl."chngcntr";
   deps."chronology" = tl."chronology";
   deps."circ" = tl."circ";
+  deps."circledsteps" = tl."circledsteps";
   deps."classics" = tl."classics";
   deps."classpack" = tl."classpack";
   deps."clefval" = tl."clefval";
@@ -6504,6 +6800,7 @@ tl: { # no indentation
   deps."elzcards" = tl."elzcards";
   deps."emarks" = tl."emarks";
   deps."embedall" = tl."embedall";
+  deps."embedfile" = tl."embedfile";
   deps."embrac" = tl."embrac";
   deps."emptypage" = tl."emptypage";
   deps."emulateapj" = tl."emulateapj";
@@ -6572,6 +6869,7 @@ tl: { # no indentation
   deps."fbox" = tl."fbox";
   deps."fcolumn" = tl."fcolumn";
   deps."fetchcls" = tl."fetchcls";
+  deps."fewerfloatpages" = tl."fewerfloatpages";
   deps."ffslides" = tl."ffslides";
   deps."fgruler" = tl."fgruler";
   deps."fibeamer" = tl."fibeamer";
@@ -6611,6 +6909,8 @@ tl: { # no indentation
   deps."fnumprint" = tl."fnumprint";
   deps."foilhtml" = tl."foilhtml";
   deps."fontaxes" = tl."fontaxes";
+  deps."fontsetup" = tl."fontsetup";
+  deps."fontsize" = tl."fontsize";
   deps."fonttable" = tl."fonttable";
   deps."footmisc" = tl."footmisc";
   deps."footmisx" = tl."footmisx";
@@ -6704,9 +7004,11 @@ tl: { # no indentation
   deps."histogr" = tl."histogr";
   deps."hitec" = tl."hitec";
   deps."hletter" = tl."hletter";
+  deps."hobsub" = tl."hobsub";
   deps."hpsdiss" = tl."hpsdiss";
   deps."hrefhide" = tl."hrefhide";
   deps."hvindex" = tl."hvindex";
+  deps."hvqrurl" = tl."hvqrurl";
   deps."hypdvips" = tl."hypdvips";
   deps."hyper" = tl."hyper";
   deps."hyperbar" = tl."hyperbar";
@@ -6730,6 +7032,7 @@ tl: { # no indentation
   deps."indextools" = tl."indextools";
   deps."inline-images" = tl."inline-images";
   deps."inlinedef" = tl."inlinedef";
+  deps."inputenx" = tl."inputenx";
   deps."inputtrc" = tl."inputtrc";
   deps."interactiveworkbook" = tl."interactiveworkbook";
   deps."interfaces" = tl."interfaces";
@@ -6808,6 +7111,7 @@ tl: { # no indentation
   deps."lipsum" = tl."lipsum";
   deps."lisp-on-tex" = tl."lisp-on-tex";
   deps."listing" = tl."listing";
+  deps."listingsutf8" = tl."listingsutf8";
   deps."listlbls" = tl."listlbls";
   deps."listliketab" = tl."listliketab";
   deps."listofsymbols" = tl."listofsymbols";
@@ -6838,7 +7142,9 @@ tl: { # no indentation
   deps."luatodonotes" = tl."luatodonotes";
   deps."macroswap" = tl."macroswap";
   deps."magaz" = tl."magaz";
+  deps."magicnum" = tl."magicnum";
   deps."makecookbook" = tl."makecookbook";
+  deps."makerobust" = tl."makerobust";
   deps."mailing" = tl."mailing";
   deps."mailmerge" = tl."mailmerge";
   deps."makebarcode" = tl."makebarcode";
@@ -6878,6 +7184,7 @@ tl: { # no indentation
   deps."menu" = tl."menu";
   deps."menukeys" = tl."menukeys";
   deps."metalogox" = tl."metalogox";
+  deps."metastr" = tl."metastr";
   deps."method" = tl."method";
   deps."metre" = tl."metre";
   deps."mfirstuc" = tl."mfirstuc";
@@ -6893,6 +7200,7 @@ tl: { # no indentation
   deps."minted" = tl."minted";
   deps."minutes" = tl."minutes";
   deps."mla-paper" = tl."mla-paper";
+  deps."mleftright" = tl."mleftright";
   deps."mlist" = tl."mlist";
   deps."mmap" = tl."mmap";
   deps."mnotes" = tl."mnotes";
@@ -7006,6 +7314,7 @@ tl: { # no indentation
   deps."paralist" = tl."paralist";
   deps."paresse" = tl."paresse";
   deps."parnotes" = tl."parnotes";
+  deps."parsa" = tl."parsa";
   deps."parselines" = tl."parselines";
   deps."pas-cours" = tl."pas-cours";
   deps."pas-cv" = tl."pas-cv";
@@ -7018,11 +7327,13 @@ tl: { # no indentation
   deps."pbox" = tl."pbox";
   deps."pbsheet" = tl."pbsheet";
   deps."pdf14" = tl."pdf14";
+  deps."pdfcolmk" = tl."pdfcolmk";
   deps."pdfcomment" = tl."pdfcomment";
   deps."pdfcprot" = tl."pdfcprot";
   deps."pdfmarginpar" = tl."pdfmarginpar";
   deps."pdfoverlay" = tl."pdfoverlay";
   deps."pdfpagediff" = tl."pdfpagediff";
+  deps."pdfpc" = tl."pdfpc";
   deps."pdfpc-movie" = tl."pdfpc-movie";
   deps."pdfprivacy" = tl."pdfprivacy";
   deps."pdfreview" = tl."pdfreview";
@@ -7045,12 +7356,14 @@ tl: { # no indentation
   deps."philex" = tl."philex";
   deps."phonenumbers" = tl."phonenumbers";
   deps."photo" = tl."photo";
+  deps."picture" = tl."picture";
   deps."piff" = tl."piff";
   deps."pkgloader" = tl."pkgloader";
   deps."placeins" = tl."placeins";
   deps."plantslabels" = tl."plantslabels";
   deps."plates" = tl."plates";
   deps."plweb" = tl."plweb";
+  deps."pmboxdraw" = tl."pmboxdraw";
   deps."polynom" = tl."polynom";
   deps."polynomial" = tl."polynomial";
   deps."polytable" = tl."polytable";
@@ -7142,13 +7455,16 @@ tl: { # no indentation
   deps."schedule" = tl."schedule";
   deps."scontents" = tl."scontents";
   deps."scrlttr2copy" = tl."scrlttr2copy";
+  deps."sdaps" = tl."sdaps";
   deps."sdrt" = tl."sdrt";
   deps."secdot" = tl."secdot";
+  deps."secnum" = tl."secnum";
   deps."sectionbox" = tl."sectionbox";
   deps."sectionbreak" = tl."sectionbreak";
   deps."sectsty" = tl."sectsty";
   deps."seealso" = tl."seealso";
   deps."selectp" = tl."selectp";
+  deps."selinput" = tl."selinput";
   deps."semantic" = tl."semantic";
   deps."semantic-markup" = tl."semantic-markup";
   deps."semioneside" = tl."semioneside";
@@ -7192,6 +7508,7 @@ tl: { # no indentation
   deps."snotez" = tl."snotez";
   deps."soul" = tl."soul";
   deps."soulpos" = tl."soulpos";
+  deps."soulutf8" = tl."soulutf8";
   deps."spacingtricks" = tl."spacingtricks";
   deps."spark-otf" = tl."spark-otf";
   deps."sparklines" = tl."sparklines";
@@ -7311,6 +7628,7 @@ tl: { # no indentation
   deps."totcount" = tl."totcount";
   deps."totpages" = tl."totpages";
   deps."translations" = tl."translations";
+  deps."transparent" = tl."transparent";
   deps."trfsigns" = tl."trfsigns";
   deps."trimspaces" = tl."trimspaces";
   deps."trivfloat" = tl."trivfloat";
@@ -7394,6 +7712,7 @@ tl: { # no indentation
   deps."xhfill" = tl."xhfill";
   deps."xifthen" = tl."xifthen";
   deps."xint" = tl."xint";
+  deps."xkcdcolors" = tl."xkcdcolors";
   deps."xltabular" = tl."xltabular";
   deps."xmpincl" = tl."xmpincl";
   deps."xnewcommand" = tl."xnewcommand";
@@ -7418,14 +7737,16 @@ tl: { # no indentation
   deps."zebra-goodies" = tl."zebra-goodies";
   deps."zed-csp" = tl."zed-csp";
   deps."ziffer" = tl."ziffer";
+  deps."zref" = tl."zref";
   deps."zwgetfdate" = tl."zwgetfdate";
   deps."zwpagelayout" = tl."zwpagelayout";
-  sha512.run = "278401d543e2dfa2ed93138b54c55e43d199f97ac6087421de844ff3e36507256e7eca7764f9c3df820aff2f23bdd29397dff64f800fcdca8de36a95ff3c1d05";
+  sha512.run = "3d19c59c6d2df89882415bfa2b1f647a2bdbb17b68eae2e2664fceff7bf6381a2127e94e7dc6ef159527f3036d8de7a42bdc9d926541be15ea6bb2d6ac17454c";
 };
 "collection-latexrecommended" = {
   stripPrefix = 0;
   deps."collection-latex" = tl."collection-latex";
   deps."anysize" = tl."anysize";
+  deps."attachfile2" = tl."attachfile2";
   deps."beamer" = tl."beamer";
   deps."booktabs" = tl."booktabs";
   deps."breqn" = tl."breqn";
@@ -7447,13 +7768,14 @@ tl: { # no indentation
   deps."fontspec" = tl."fontspec";
   deps."footnotehyper" = tl."footnotehyper";
   deps."fp" = tl."fp";
+  deps."grffile" = tl."grffile";
+  deps."hologo" = tl."hologo";
   deps."index" = tl."index";
+  deps."infwarerr" = tl."infwarerr";
   deps."jknapltx" = tl."jknapltx";
   deps."koma-script" = tl."koma-script";
   deps."latexbug" = tl."latexbug";
-  deps."l3backend" = tl."l3backend";
   deps."l3experimental" = tl."l3experimental";
-  deps."l3kernel" = tl."l3kernel";
   deps."l3packages" = tl."l3packages";
   deps."lineno" = tl."lineno";
   deps."listings" = tl."listings";
@@ -7465,9 +7787,12 @@ tl: { # no indentation
   deps."metalogo" = tl."metalogo";
   deps."microtype" = tl."microtype";
   deps."ms" = tl."ms";
+  deps."newfloat" = tl."newfloat";
   deps."ntgclass" = tl."ntgclass";
   deps."parskip" = tl."parskip";
+  deps."pdflscape" = tl."pdflscape";
   deps."pdfpages" = tl."pdfpages";
+  deps."pdftexcmds" = tl."pdftexcmds";
   deps."polyglossia" = tl."polyglossia";
   deps."psfrag" = tl."psfrag";
   deps."ragged2e" = tl."ragged2e";
@@ -7489,25 +7814,29 @@ tl: { # no indentation
   deps."xkeyval" = tl."xkeyval";
   deps."xltxtra" = tl."xltxtra";
   deps."xunicode" = tl."xunicode";
-  sha512.run = "b4b677811f192eaa7a56f5208807a36c01e930ce966012bd44231b80fd39480a5103b634d2a2b349c8e6999e47e7864b1e6cdbb1052f6f5b803deeadb51cf513";
+  sha512.run = "63b9150f0f35a6d4cfa2a0e1d9ce42f686d1887a4984340403ad74e267af063831c01921d55435159e39a683d7db0a45ba9a5f5f9d6c3d8416060f565c4bc237";
 };
 "collection-luatex" = {
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."addliga" = tl."addliga";
   deps."auto-pst-pdf-lua" = tl."auto-pst-pdf-lua";
+  deps."barracuda" = tl."barracuda";
   deps."bezierplot" = tl."bezierplot";
   deps."checkcites" = tl."checkcites";
   deps."chickenize" = tl."chickenize";
   deps."combofont" = tl."combofont";
   deps."cstypo" = tl."cstypo";
   deps."ctablestack" = tl."ctablestack";
+  deps."emoji" = tl."emoji";
   deps."enigma" = tl."enigma";
   deps."interpreter" = tl."interpreter";
   deps."kanaparser" = tl."kanaparser";
   deps."lua-visual-debug" = tl."lua-visual-debug";
   deps."lua2dox" = tl."lua2dox";
   deps."luacode" = tl."luacode";
+  deps."luacolor" = tl."luacolor";
+  deps."luahbtex" = tl."luahbtex";
   deps."luahyphenrules" = tl."luahyphenrules";
   deps."luaimageembed" = tl."luaimageembed";
   deps."luaindex" = tl."luaindex";
@@ -7529,13 +7858,14 @@ tl: { # no indentation
   deps."luaxml" = tl."luaxml";
   deps."nodetree" = tl."nodetree";
   deps."odsfile" = tl."odsfile";
+  deps."optex" = tl."optex";
   deps."pdfarticle" = tl."pdfarticle";
   deps."placeat" = tl."placeat";
   deps."plantuml" = tl."plantuml";
   deps."selnolig" = tl."selnolig";
   deps."spelling" = tl."spelling";
   deps."typewriter" = tl."typewriter";
-  sha512.run = "0994c7425cc79885ec523d73d7ab2db08f32117d2bff82f4e5c0c4df6c70c012f7b90e04e8f83cc263cdf29c39b1104e09a92e86a94eda0c2e9cdfb66377fe50";
+  sha512.run = "3cc433cf11324c414817c88a47819776f78b18d81306ed5e4f26ffb94240fca51be693fbba2c628f5e4efd21634f177fdcea5e756c81a30463690124621d96f1";
 };
 "collection-mathscience" = {
   stripPrefix = 0;
@@ -7550,6 +7880,7 @@ tl: { # no indentation
   deps."algorithm2e" = tl."algorithm2e";
   deps."algorithmicx" = tl."algorithmicx";
   deps."algorithms" = tl."algorithms";
+  deps."algxpar" = tl."algxpar";
   deps."aligned-overset" = tl."aligned-overset";
   deps."amscdx" = tl."amscdx";
   deps."amstex" = tl."amstex";
@@ -7580,6 +7911,7 @@ tl: { # no indentation
   deps."chemgreek" = tl."chemgreek";
   deps."chemmacros" = tl."chemmacros";
   deps."chemnum" = tl."chemnum";
+  deps."chemplants" = tl."chemplants";
   deps."chemschemex" = tl."chemschemex";
   deps."chemsec" = tl."chemsec";
   deps."chemstyle" = tl."chemstyle";
@@ -7613,6 +7945,7 @@ tl: { # no indentation
   deps."eqexpl" = tl."eqexpl";
   deps."eqnarray" = tl."eqnarray";
   deps."eqnnumwarn" = tl."eqnnumwarn";
+  deps."euclideangeometry" = tl."euclideangeometry";
   deps."extarrows" = tl."extarrows";
   deps."extpfeil" = tl."extpfeil";
   deps."faktor" = tl."faktor";
@@ -7642,6 +7975,8 @@ tl: { # no indentation
   deps."karnaugh-map" = tl."karnaugh-map";
   deps."karnaughmap" = tl."karnaughmap";
   deps."kvmap" = tl."kvmap";
+  deps."letterswitharrows" = tl."letterswitharrows";
+  deps."lie-hasse" = tl."lie-hasse";
   deps."logicproof" = tl."logicproof";
   deps."longdivision" = tl."longdivision";
   deps."lpform" = tl."lpform";
@@ -7673,7 +8008,10 @@ tl: { # no indentation
   deps."ot-tableau" = tl."ot-tableau";
   deps."oubraces" = tl."oubraces";
   deps."perfectcut" = tl."perfectcut";
+  deps."physconst" = tl."physconst";
   deps."physics" = tl."physics";
+  deps."physunits" = tl."physunits";
+  deps."pinoutikz" = tl."pinoutikz";
   deps."pm-isomath" = tl."pm-isomath";
   deps."polexpr" = tl."polexpr";
   deps."prftree" = tl."prftree";
@@ -7696,6 +8034,7 @@ tl: { # no indentation
   deps."sesamanuel" = tl."sesamanuel";
   deps."sfg" = tl."sfg";
   deps."shuffle" = tl."shuffle";
+  deps."simplebnf" = tl."simplebnf";
   deps."simpler-wick" = tl."simpler-wick";
   deps."simplewick" = tl."simplewick";
   deps."siunitx" = tl."siunitx";
@@ -7735,7 +8074,7 @@ tl: { # no indentation
   deps."yhmath" = tl."yhmath";
   deps."youngtab" = tl."youngtab";
   deps."ytableau" = tl."ytableau";
-  sha512.run = "8a57a2ca065d0bbcd1c7359802cd82806cb386be6b9324c154fc3d14d2fa155c0cfffc83317c6bebff6507b644c5d30c73687363c7191ab364d17b196ed297ce";
+  sha512.run = "f76274cf450f7d01e10650537756aa2794bb4acd9c7c08afaad899a0c14b7b5e8d3bdd2d47ac7d6f7c37bc22bc95a90abdd9cd69e14272608569bf66f97a407e";
 };
 "collection-metapost" = {
   stripPrefix = 0;
@@ -7986,6 +8325,7 @@ tl: { # no indentation
   deps."tikz-relay" = tl."tikz-relay";
   deps."tikz-sfc" = tl."tikz-sfc";
   deps."tikz-timing" = tl."tikz-timing";
+  deps."tikz-trackschematic" = tl."tikz-trackschematic";
   deps."tikz-truchet" = tl."tikz-truchet";
   deps."tikzcodeblocks" = tl."tikzcodeblocks";
   deps."tikzducks" = tl."tikzducks";
@@ -8018,7 +8358,7 @@ tl: { # no indentation
   deps."visualpstricks" = tl."visualpstricks";
   deps."xpicture" = tl."xpicture";
   deps."xypic" = tl."xypic";
-  sha512.run = "08879ddc094db933adadc42a75a54aab493c5d9552b84d355f71b54572cd01e67a97baa1a48fc13fcea90da88893a5e0c8db8b90c7f96bd4861621de06ff3e84";
+  sha512.run = "86e6de5c89def33ebdd4c501713ca857ea24537cc4522a8c6d851c058822f51398023d80bac638611fd0a93a0a7f05598a992e53f95c43281f046dcd1e087f54";
 };
 "collection-plaingeneric" = {
   stripPrefix = 0;
@@ -8044,6 +8384,8 @@ tl: { # no indentation
   deps."epigram" = tl."epigram";
   deps."epsf" = tl."epsf";
   deps."epsf-dvipdfmx" = tl."epsf-dvipdfmx";
+  deps."expkv" = tl."expkv";
+  deps."expkv-def" = tl."expkv-def";
   deps."fenixpar" = tl."fenixpar";
   deps."figflow" = tl."figflow";
   deps."fixpdfmag" = tl."fixpdfmag";
@@ -8061,8 +8403,6 @@ tl: { # no indentation
   deps."gtl" = tl."gtl";
   deps."hlist" = tl."hlist";
   deps."hyplain" = tl."hyplain";
-  deps."ifetex" = tl."ifetex";
-  deps."iftex" = tl."iftex";
   deps."insbox" = tl."insbox";
   deps."js-misc" = tl."js-misc";
   deps."kastrup" = tl."kastrup";
@@ -8115,7 +8455,7 @@ tl: { # no indentation
   deps."xii-lat" = tl."xii-lat";
   deps."xlop" = tl."xlop";
   deps."yax" = tl."yax";
-  sha512.run = "9ef13861626d3431dae68447b371f05ddbd0eaa3f81a41eaa830825df7775a12a824a36e9be8c14a1b3bcf25f7acafda0b010d3c6021e6cf2b2eb17b3f91c8ef";
+  sha512.run = "04b467a1c6be23641e42fe2988487139757e67badc710d7547ab63dfc772091af105930c37f2e34b32a8f01528393fea742f3c3b20c5147db916c8bdf5bb0caf";
 };
 "collection-pstricks" = {
   stripPrefix = 0;
@@ -8257,6 +8597,7 @@ tl: { # no indentation
   deps."apa" = tl."apa";
   deps."apa6" = tl."apa6";
   deps."apa6e" = tl."apa6e";
+  deps."apa7" = tl."apa7";
   deps."arsclassica" = tl."arsclassica";
   deps."articleingud" = tl."articleingud";
   deps."asaetr" = tl."asaetr";
@@ -8274,6 +8615,7 @@ tl: { # no indentation
   deps."br-lex" = tl."br-lex";
   deps."brandeis-dissertation" = tl."brandeis-dissertation";
   deps."brandeis-problemset" = tl."brandeis-problemset";
+  deps."brandeis-thesis" = tl."brandeis-thesis";
   deps."cascadilla" = tl."cascadilla";
   deps."cesenaexam" = tl."cesenaexam";
   deps."chem-journal" = tl."chem-journal";
@@ -8316,7 +8658,9 @@ tl: { # no indentation
   deps."hagenberg-thesis" = tl."hagenberg-thesis";
   deps."har2nat" = tl."har2nat";
   deps."hecthese" = tl."hecthese";
+  deps."hep-paper" = tl."hep-paper";
   deps."hithesis" = tl."hithesis";
+  deps."hitszthesis" = tl."hitszthesis";
   deps."hobete" = tl."hobete";
   deps."hu-berlin-bundle" = tl."hu-berlin-bundle";
   deps."hustthesis" = tl."hustthesis";
@@ -8371,7 +8715,7 @@ tl: { # no indentation
   deps."philosophersimprint" = tl."philosophersimprint";
   deps."pittetd" = tl."pittetd";
   deps."pkuthss" = tl."pkuthss";
-  deps."powerdot-FUBerlin" = tl."powerdot-FUBerlin";
+  deps."powerdot-fuberlin" = tl."powerdot-fuberlin";
   deps."powerdot-tuliplab" = tl."powerdot-tuliplab";
   deps."pracjourn" = tl."pracjourn";
   deps."procIAGssymp" = tl."procIAGssymp";
@@ -8461,7 +8805,7 @@ tl: { # no indentation
   deps."yathesis" = tl."yathesis";
   deps."yazd-thesis" = tl."yazd-thesis";
   deps."york-thesis" = tl."york-thesis";
-  sha512.run = "3ff65b8b007456d71ce63e06569023b37fc06e05b777fc89aab3bbebfe3ed9e8e7d33801d1f32b7fd6ce350f88f0b8710e50f5c398024c064eadfc315c9a1ed1";
+  sha512.run = "6c8fb62dbf05c1d522965f8837a3753ea0b534870bb17512178aed979f21401d1e96c4ded2054fa6d71f2c3ec57d4fa158c30fb6b0c0462d336d4f2fc057b0af";
 };
 "collection-texworks" = {
   stripPrefix = 0;
@@ -8508,6 +8852,7 @@ tl: { # no indentation
   deps."xecolor" = tl."xecolor";
   deps."xecyr" = tl."xecyr";
   deps."xeindex" = tl."xeindex";
+  deps."xelatex-dev" = tl."xelatex-dev";
   deps."xesearch" = tl."xesearch";
   deps."xespotcolor" = tl."xespotcolor";
   deps."xetex" = tl."xetex";
@@ -8518,7 +8863,7 @@ tl: { # no indentation
   deps."xetexfontinfo" = tl."xetexfontinfo";
   deps."xetexko" = tl."xetexko";
   deps."xevlna" = tl."xevlna";
-  sha512.run = "1dbbe2fba18718b2f7488bd078ce0ad2f46e66308a383ffe2a17e28f660ce56762da83df52e884867bdcce128267a2d608768a0df2fd9b29eeacf43285c78a6e";
+  sha512.run = "f4413abed31de8fc073ae63c0136da9e3e71d7dad5f4d46d59c7251a74b446df77db6eafc3ec97848fb2f5c5a84f07b37d36d0e43f2d7379922876874d33594e";
 };
 "collref" = {
   stripPrefix = 0;
@@ -8585,11 +8930,11 @@ tl: { # no indentation
 };
 "colortbl" = {
   stripPrefix = 0;
-  sha512.run = "fcfad0e46aa26afb44ad18f0dce4301c41f2db3168a5f8914eb58b2e91a53eb3fc2533249bd330152e3632b8d5ffb591b70c37b3700f6597eb6cae29804168aa";
-  sha512.doc = "e550a2e3d3d0265a8d49db856a52899eafec47db8534297bae6c85f50f9858dce8e9f989d99e7cbdff0ecc61442827e79cadb4b8dc005f6cf60c9574996a661b";
-  sha512.source = "2e5af0c9831e0aabea6079b67ea53df24953c05c1bd0ef2fc96190077a898840d530a061d585ba6a37d37686f9acc6192c1220793e373a52588009b1a134acb8";
+  sha512.run = "b24972e5a945458318a7b383ad652c7851f01e6c66fa40f8d670f4f3724d280e18d825fc905d76d111d7de969bf6be29f45447eaab78fe985275984a23fd47bd";
+  sha512.doc = "4de654d192374960d94c13ff47785ce40f2b0a298bae0d1b5342119f018844653ccf4f4c99c6286accdd62d94bab82cdf6eef1f7977cbb583cf37e21496b0420";
+  sha512.source = "6e88584339dfc54f00b9f18096c2c35fe147f7da1e0f08807ad0964d22dfc61554ec28335eef428c76adaff8d1cf37ccee4945f128869465751ae5c1f1e31d03";
   hasRunfiles = true;
-  version = "1.0d";
+  version = "1.0e";
 };
 "colorwav" = {
   stripPrefix = 0;
@@ -8950,8 +9295,8 @@ tl: { # no indentation
 "context-letter" = {
   stripPrefix = 0;
   deps."context" = tl."context";
-  sha512.run = "52caf1eaef275b90c883992562b66f837d439f176c0b061836e1fba412b3957502ae9c5b9dd893e89e7ff1274d70e2ed162b75709563874e4ff6a9844044035f";
-  sha512.doc = "ef7e344e25095ebfa7376af1fcfd5f4e617e91b5841ed8f8fbd2109bdc645d71174ce7b571f2f3dbce46ea08ccf7c3c73b0075b2cabd3847c239171a7275ef87";
+  sha512.run = "12e0ab8934b8022010e6a23109b094ae97a9c409cc143705d73776350b8d36aca11f3d6df181d5252415f12ff11bbaa4d12e2271ba5ad9b43ee84c566c5c1e17";
+  sha512.doc = "74d2f845dfe6c70ab2a4601e0d074ed5996f7d8f3f024bae2c40836b4f30dc66451dfb030e6559a986dd1a460c5426ebd01b72133f328f08a85cc48690c8427b";
   hasRunfiles = true;
 };
 "context-lettrine" = {
@@ -9093,11 +9438,11 @@ tl: { # no indentation
 };
 "cooking-units" = {
   stripPrefix = 0;
-  sha512.run = "d37a80797b11767dca8494626e7c7fb7b6a64ef216f2f278935d5d1078547239e05b1d5945d03c1d91e902cf979d492d5586a6d1419df1a17192ce77d4c20d22";
-  sha512.doc = "06cfb266d9676148b305bb4e2a6b49c802752195abb4ef7510aa226e10b6d9f804b7e9bf45e8c0ecff19071c1aacd6dbafc9ff89adc55830609ec158a3ef2468";
-  sha512.source = "2a3ee2c632a544708b192b260809403bf6a9124c2207babf9dcce20d6b8869d01adb5a37a2644f6263c59d4c67eab11461484d454be67744a8243f6a08f9a4ea";
+  sha512.run = "4182a43bc869dca19d022ae019fd479ac658c609a792677b9cfe5e3271af890ee353974b15b9cd4bb667f39fb38b96ee1a31359ca4a89986a3c03053ffd1974c";
+  sha512.doc = "71e7ab3f1a89984063e26d5532eb1c1533efb06b8d8164548b7b46eab966e88e8ce5300ca0c91c639ae896b95bf5e9487c8c149d2f90af7cca0168b674052c8e";
+  sha512.source = "8eb0c4698cf35fcb24b4e02db44f284c51f953ce1debc5f334fa514e4cee0ccb3278c74bdded88cfe379a47ac1f32efe089711f11fafa477f7a053e2e45a0092";
   hasRunfiles = true;
-  version = "1.45";
+  version = "1.46";
 };
 "cookingsymbols" = {
   stripPrefix = 0;
@@ -9172,10 +9517,10 @@ tl: { # no indentation
 };
 "cormorantgaramond" = {
   stripPrefix = 0;
-  sha512.run = "ebd296acc2bbff8ebcf0142f4e3053d3989257bab98366c80bf81390fa711d95b84f537f394cddeb9c034b079572c515ebb8eabce531329ea3863601cc564617";
-  sha512.doc = "ce82ad39ca86a383bb28b2c766f3d48c7234fc8c65418a8cf90c63b580a2aa92ca0999d90c44cb0c35e119a8f34a601b02ff921433f373d8c8dafdbe04568228";
+  sha512.run = "04f9cf2cfa444b33af34e1289825333a105e05f224b855229a3eb437c28085a5cbfc3507761918867dadf940e5c175acf61d124668941549f4d0acddca0385fd";
+  sha512.doc = "7641db7d8c3100e6db19eef63cc6a9d9de15eb4547175cd6d32482926c1f3665dbd9d1658f52023fc030c4921a5c7a8d050fc3acb839937816e9eb704205d8e5";
   hasRunfiles = true;
-  version = "3.00";
+  version = "3.601";
 };
 "correctmathalign" = {
   stripPrefix = 0;
@@ -9241,10 +9586,10 @@ tl: { # no indentation
 };
 "covington" = {
   stripPrefix = 0;
-  sha512.run = "d317d23948d7308e99ce1e2b0d8371ec165012ac199ba271b8d43a869106ba13d416744d8f78fc8e91a14e4c33456675d6c277ee6841c07084aa8203b0a99b84";
-  sha512.doc = "819f2c75cfc0bb571df7736d630668ace9ecca49bdeca6ed760b7575d028ca2acf0e0977a19609baec02c4e409f52d1b35176492eb3e6d392e591ca3d7fdcb6a";
+  sha512.run = "cdaff0af120ec8b455a25a57544b2a5cb5c55798c2c0b5c360f647b95840581820ff4caaea6ab27d586c0eb6369288deec889f28c6f7669f59177480a64baaa8";
+  sha512.doc = "9c665da78243fbbcbc6beb9d1170fc30c0fb43b033f872cac9667638027f00473cf1dd02ea5912c448407f774c8deb07b8fb02e7bb7a74eecae9aa87be9fd4c1";
   hasRunfiles = true;
-  version = "2.3";
+  version = "2.4";
 };
 "cprotect" = {
   stripPrefix = 0;
@@ -9284,8 +9629,8 @@ tl: { # no indentation
 };
 "crimsonpro" = {
   stripPrefix = 0;
-  sha512.run = "f7b01c39e7fc5d170896f1649c1230ad9cf6ed79f4ef5703fa5166bfd3b3bf2fe9c28485a56a70655ba0083ddaa2e444860be1ae421dfe06d63e8d81091f39e9";
-  sha512.doc = "d87ef7bf936a235be18527798ea657d8f963edc0e0be08689bf7551b378d80eba605d55ce6936b997277534069fc9065871e532107986dd9d987cb90bef1edaa";
+  sha512.run = "64c7f5d30798fd99de0745869985108b702b66de8d48f0d2ed68ede9cd49e032aaacbf24d5a5fdbced79c2fd01d25e171273fab5873baa351f5b46ebd91993ab";
+  sha512.doc = "fa46cd05b0e5fbd71881d8a42f635bc7271106a73d412d02e49b968ca60985b60f470927a6c8f68c42060774dd2f67b0830ff6628c506eff57462f5bc6e06638";
   hasRunfiles = true;
 };
 "crop" = {
@@ -9362,11 +9707,13 @@ tl: { # no indentation
   deps."cm" = tl."cm";
   deps."csplain" = tl."csplain";
   deps."hyphen-base" = tl."hyphen-base";
+  deps."l3kernel" = tl."l3kernel";
   deps."latex-fonts" = tl."latex-fonts";
+  deps."unicode-data" = tl."unicode-data";
   deps."tex-ini-files" = tl."tex-ini-files";
-  sha512.run = "d0a3ebaea7659e4f1b53aef42b9a8361e215083fd7d669b0a119ba744ddfb1afc79d5b25d7fa94082085dadf1d7d7da5981e485246c28c4708b82c40e0ad00dd";
-  sha512.doc = "9a8bab74f51651b732bd155b386f69ea8b0aededb0ac29226d6aee2bc3547c5157d0150a854987dd5f9f8a001a7191509340c9dbffdc02bd7c01de47fa80f7c1";
-  sha512.source = "c982e771c3db5b91806faf9976dde51499af9ab6c7afa81cbbaad04dd8808ba07e8c1dd683af77fe112237fe2868f73520a464bbe72fa1762ab6ccc0e8e4cdb5";
+  sha512.run = "bfb780410a2b80919c5535e6985206a0bb9e719f9773d9704342e5506cc20305adbf7b45029829af6fc07e1158fe0b55ec92abf3fc43a8cbf370a69be9932b95";
+  sha512.doc = "03c4f67508330801762682f06a7e23572a1fe1374d559820e25847076ac9e6ae153eabe749473564fa54a1abac472cf5387d4dc75b1abc7567d6f8186ed74e73";
+  sha512.source = "409ccab513ec606b4c92087cf947aa1937f99f53d616b64b62310a73787a9cb58d878e26a937fc031b281fd5343aaef1f7050464de5051d3b3cfb89bd213387d";
   hasRunfiles = true;
 };
 "csplain" = {
@@ -9379,15 +9726,16 @@ tl: { # no indentation
   deps."tex-ini-files" = tl."tex-ini-files";
   deps."luatex" = tl."luatex";
   deps."luatex85" = tl."luatex85";
-  sha512.run = "d0e6ea08d7f8266de7b17dc5ac3290800ff39e1dd77708b3025034983347791ab2dd732e3586ed84e8a572429b92ebc312398587eb10b62ce99dab336c84b19b";
+  sha512.run = "cdc33ef0288eabc03a189917bb5a40c4dda1d206ae4bc4097a72be1d9a9575301cfcc289f24ed7c313c2804bd99125684d53c6599c4a9f8b6eb85af85cdc5a95";
   hasRunfiles = true;
 };
 "csquotes" = {
   stripPrefix = 0;
-  sha512.run = "c3c8bb734145ab42ff388c08263af3b16e21dcb1995f05f91ea6fc6028d9c3c5f4c268aa9c2902e95dbe15e3bb5e01defe2d2360a8aedcf0c8ef5163ea400067";
-  sha512.doc = "0110c7d89008ff857076cc7a3c41870329d3421f10e6cd5d8ab0237562b01ddc238850e677cd0e4f3d1be4b4b3948c08f831807e37564c7075503969f993310c";
+  deps."etoolbox" = tl."etoolbox";
+  sha512.run = "541cefb84ffcb6a398c18d01cab5d7c96bfaa82841b9439c1f77f3b2b4904e0a37fe2e2b355777e4552fdff3ebb054daae9d9d9a6c7436746f44917095be119c";
+  sha512.doc = "84407b58454e4e4b235d93b01bef99f7a20a5de4ebac4990c9e00694a14dd67debe27afb6f3a079040330af3ab186db11f1150e97fa9511e782e55c4abe52bcf";
   hasRunfiles = true;
-  version = "5.2e";
+  version = "5.2j";
 };
 "csquotes-de" = {
   stripPrefix = 0;
@@ -9404,8 +9752,8 @@ tl: { # no indentation
 };
 "cstex" = {
   stripPrefix = 0;
-  sha512.run = "644dc718fe3f6a941304f8d2324db36954edee5c53d4af3ecb4d27088ca1ebaa667576414aedaebb07a17b499864ec0e48f7afca38d26a593d68e274936ac9e0";
-  sha512.doc = "4b041c36fdfde6f2eb5c05d0d130286d18fb22ebc92bb6f823edd5412f146f46eb89285e788291bf23496d679280e6057b929f499753edd39cd35e62395e486e";
+  sha512.run = "4694b738593a72d14822afb5fdfcf6b26ed6aba7368f5957bac357aae822fc85c3e8a4f2a6faf58bd03ae77601034ad86cf9ec67e9d946dcc4c859edd42bc20a";
+  sha512.doc = "a1bc7ce21066c16897e6874e6ebccbee21d111e1f16e33fda07231e80b06fa537e98970789ae6e7f4c51a1135c995f3b971b6078872595dc954b0cf70a0557dd";
 };
 "cstypo" = {
   stripPrefix = 0;
@@ -9478,9 +9826,12 @@ tl: { # no indentation
 "ctex" = {
   stripPrefix = 0;
   deps."ttfutils" = tl."ttfutils";
-  sha512.run = "af7b2de3742d21021a71eb7659a04f78d8f69cd41a0ee66d2bffd61413d1abf5a9bc1bddcfea667f3bb0cce64de2d69433c845a8f0443c0df92a0a3131c7336c";
-  sha512.doc = "e899f98031757f690cadb37c457b1acc1f0287df5ba5c90417c6175ff6bb0f9b411356272f33552f47999f5c1869cdd9a6a122b340448077b7a1ce68e110c831";
-  sha512.source = "c1a9f995510318bb0fc71936c39958e65b696fae31fb218b6b9e39b875eed8054868886e1d0125949a654e233a77d21d3e1ed41b533687332e66865eac5fe55a";
+  deps."ms" = tl."ms";
+  deps."ulem" = tl."ulem";
+  deps."zhnumber" = tl."zhnumber";
+  sha512.run = "f632e40abceca81daa4db24362c4cae46533f6e8df33c221bc76e60380dc48301d8b9fba338a40c1c6880dd06cdf9fd36fe9907c5fc5a97c9aad6cef07b84d80";
+  sha512.doc = "eab21d42d1984fb697167d2d51f09e34495e331548f32daf620ba852ddbdd1233c34b382595364b7e208ad58cc25c4f08ee09ecc080e7c9b17e84290f4c9c885";
+  sha512.source = "d35c6f8425efb53d7fbad1b4baec18166d4888a92b70decc7e66b1371b8e78392795a850c213d292dd7fb344f5b3cb8efae3a76e16dd84c2a82dc582dd69d67d";
   hasRunfiles = true;
   version = "2.4.16";
 };
@@ -9554,11 +9905,11 @@ tl: { # no indentation
 };
 "curve2e" = {
   stripPrefix = 0;
-  sha512.run = "3a3338e1fc29c7526291a5f6814ed8ba5bda7f96162bd96945cbb8e81c60a51071c178a7a0158f12cab162fcce37bbd9abc33cb2bd9b1a4ba64996b085800505";
-  sha512.doc = "677ec58576b1c5559127b3effd921461eef24be62053d4f74f2f86950a9f7ead20686ff1e15157c989d84df3eca138855c4cef91bd0f592641503068c1de458e";
-  sha512.source = "854aa083e353e53407fd456bcf5175a3ef691035a5c47e3704becaa839b7a13576d1b5cb59157111e26bf6dfb6f5c730c82a6a45be73d77a2656bf32e31649bc";
+  sha512.run = "fbb2481e0baf08b163b016f494a05dcfea0b28fc458e502f69af12a264059717687ddbea1c8b4395246c18c731969b5f1ba48b3f20e37a1248952b2faf33134c";
+  sha512.doc = "5ec0e0fb849540f819090dc0c9488167553d44452975d218ce4b25359b89f8ceb78504539d522c3a281afbdd3dc44903bb89837b1b73bcc8a31d597d95da8efb";
+  sha512.source = "8845ee9fc5fa19a6ed749715e52f4dc03e938a8355672e7b6e7b4d4c6e3823c70d726473a096c4525eda7d94d2ce1818d93df0ba03e0639c4d46244d533476f2";
   hasRunfiles = true;
-  version = "2.0.1";
+  version = "2.2.3";
 };
 "curves" = {
   stripPrefix = 0;
@@ -9598,10 +9949,10 @@ tl: { # no indentation
   version = "0.2";
 };
 "cweb" = {
-  sha512.run = "274b81a9a12de63e62c72878971c517427fe3dbd9a5ab10d89676326ecf23caefaa961504cb0e9a609224c519a3a6983346212fa67e759dbbf18c2c74de4c61e";
-  sha512.doc = "1acb8eb3dfa5d563369baccf3615c06c61f03ae70e18988fe4d4637bc97290f04288a9d15c548d48c65aba0dd3b0b23faa9c1a7f7aa093ed37035fab569c8d4f";
+  sha512.run = "3fa0a2d9d5e4647fee550b0da0449619e22198866e6ecf47956a99c5d8d8081a09c63f1644f4b37788aa91c411df567776589aa61244fb6e0da3ac72314d2b3f";
+  sha512.doc = "f685b045d0253a1dfcbb81d80aa976553c459ce13b7049ee05f792646906a83976c71570b0d7b995dc9d7928558a7ded210b8fb1cb0fcf79508af731161fee22";
   hasRunfiles = true;
-  version = "3.64b";
+  version = "3.64c";
 };
 "cweb-latex" = {
   stripPrefix = 0;
@@ -9646,8 +9997,8 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "cyrillic-bin" = {
-  sha512.run = "f218abc7a05b5247ac3e7c6488c94ad775f7d238d4caa96d7537156052acf8c51cdd2131f55411050f7f8d725e163aa37e16a6af7147e0522be3db7115dcd207";
-  sha512.doc = "bfd4da4e4ba7c0d47e929a31b0fb52f5690b54fda797dd0df71864d411baffee9eb8c99b83942129802799ad95fbaf710b0f4da6be2e8fe003fc24fe97d9322d";
+  sha512.run = "cb6d1ed18b1e8cf24d0856fc8a8fe8b2e4c2e5889e68521440386c0fcde8226367242c8adee9d4f127cadaa3f4a4ca2693ee501810d243d426fc8a395a49e3a9";
+  sha512.doc = "e8f1aa0313026995668e491f63171c57841c79187435b8b7ad9e807d2c7b40970b2ec1b14181d6122231b7557fb66c39dca0eec0a877735380d152482865feec";
   hasRunfiles = true;
 };
 "cyrplain" = {
@@ -9692,11 +10043,11 @@ tl: { # no indentation
 };
 "dashundergaps" = {
   stripPrefix = 0;
-  sha512.run = "190b4559e568ac1b5281314dc17d8e2b143af0b1f3e0812c02b70eaddb6ece2a33843585dfbf21f10af0112e2f6611338df3708d396997bc63f8f1ca5e9884d7";
-  sha512.doc = "262ac83918e07be8fc0d57c416a6d3fc342c75160cc603186147b81c00af2edec662c1822b01d486bc4dc871733dcb235f3f7edcf9f4cfac6688d412cef54744";
-  sha512.source = "22b6d3821c2b9ee3d8fb1ec40a0d5825e98c957028935706d2ec52e8608d413af6a14ebddf02d140882a79b480193b940197afb12d94f4af3daf6c8e67b69c82";
+  sha512.run = "f42cdc5eee0b48aa8c6873febc6baa7a7c1251c630098850736bb321e4cd80d8300c35b9dea45cbc044366e2e522c1ba52eaa23fa64d5f469a3eb68a1616c444";
+  sha512.doc = "4748b63855824fa4f7ec86a9f20d8004f546389e17d2dfe8fc6c8cb910be696ea6ecd20a0ba90569c450137e51bf3c193cd45c4c24161bae41290e6c644489eb";
+  sha512.source = "c10565ec5823f5cd7cf0b827d944b2cadaa72adbef722ad3c906e9e1ddf1a74c506406d1c49590b4dcea05c1e348f24489b4283e0082d632d6f1f6666d92dd5d";
   hasRunfiles = true;
-  version = "2.0d";
+  version = "2.0g";
 };
 "dataref" = {
   stripPrefix = 0;
@@ -9707,9 +10058,13 @@ tl: { # no indentation
 };
 "datatool" = {
   stripPrefix = 0;
-  sha512.run = "e399e70d6d5a1af9a19e47eb6beb7bcfaa2200d96151ffe5e068cac279ce88a3c9ad5e3b55bd93bc4eaa7ca26e3ba1dfe906fd979275b04d57e86b1546b7440d";
-  sha512.doc = "ee42a5da7ed08e6938881f991addc26f3cfcda8e5dc03ff3aab7fe268d749ac38793efd9dbec2b195f88a76718d7a02a0c9c2ae11a901b89af0cd7c1081a1400";
-  sha512.source = "287d96d2b74cd34909917f59154010bf167e43051b5b0d992813392b826641d01df84e03256988b46ed843a7d53e3f6f9c29754ad3cd5c2f6c33c4998a17fb27";
+  deps."fp" = tl."fp";
+  deps."substr" = tl."substr";
+  deps."xfor" = tl."xfor";
+  deps."xkeyval" = tl."xkeyval";
+  sha512.run = "323b1526a32eb4e0d81db77278d66ebb6ac91fa357f7f76c8ac1f199efdc4be17ae4f8fb83fe55f3ac9cfb8a18d163a85d6c21cc11c26e4dea0db5f85dc12dd5";
+  sha512.doc = "32b5391c7197bc29783bab0c93a5225784fea999f69bdd8b1b5c152ed338716f82dbedfdb6cd19064ee409407c0b808e5f410e6090cda6d1f8ded2ca41f3ace9";
+  sha512.source = "e149a3be96ee0161b2bd872ab73e74c36ea638f0a1f0a48e0268093bdff2c2c1cfabe5c0a4d3ca8ef7ee4c02bd03710c5c1b2ff9c1b543ed792a444160814493";
   hasRunfiles = true;
   version = "2.32";
 };
@@ -9739,11 +10094,11 @@ tl: { # no indentation
 };
 "datetime2" = {
   stripPrefix = 0;
-  sha512.run = "876b16d0fe08584c02804e93bdce6029376e1c37b3c8a3a0a5ae4ce93cebed615b077d042cff0a658f0f2c65745fd22b40f18c4db87ae73ecf3844a699f09e81";
-  sha512.doc = "37fb08d1d23645a53a6d0c76aaeaf8df34de9ee148aac23723adc892e026a5daf74c446f1ef747a62175984dd601560a1338fc37ec6600d9d0772237e60b1d21";
-  sha512.source = "42f6ef0eb78480c10ea1dfa1ba3733f48fb5f4a639ffc11c11d264ebb46845823224604b7c43b4120da6ec0534c2d8eb63c327825c074c7ffe01ee1bad3137c2";
+  sha512.run = "ba5a5b194f60ed3cdb7494d8b6eae89027a89e32188972475fd9fd43423e19a106d88a64a5b8484dc9bfd6d2fe7d03d01edf1391c9375d9e7647ed6d1e16a790";
+  sha512.doc = "e96d7b74d9f2ee18e50b98c82c58da425e7007939d3dbeb21035bf03d2e40e9d9525f695081dfa03c84660f3e2f88c19f79778e7d57bda5285535e98e9d99bfa";
+  sha512.source = "00077e62d983ceec941d5512a843642e3fe9e99a50dd9ccc2484554cc9d1b693ca9b6bd8e1feda26d12906b8bb776ea33ac75cf1dfb77d837db51958bd687f70";
   hasRunfiles = true;
-  version = "1.5.3";
+  version = "1.5.5";
 };
 "datetime2-bahasai" = {
   stripPrefix = 0;
@@ -9763,11 +10118,11 @@ tl: { # no indentation
 };
 "datetime2-breton" = {
   stripPrefix = 0;
-  sha512.run = "b212e5cbae4f1b61c3455f2ed2f05b9b61f34d65079d5f9fbb0be716c9d06f14ce915efc1059cccc828b52b3c0fae3a5e08680195c4ca20bcfc8c6378798229c";
-  sha512.doc = "4b6d0592e5fa100b3a68cdefaee29a089827fc2f86d5dcc1aee79aa6348b7cf4165319433714914337239220d01e8a3d93fbad1448cd3ff4790c817215a1cbce";
-  sha512.source = "e4a7240799195b9be7a9a755c181268082076218e1e49c4a81e5ac2c32bbe1537e3965bc5e6791a62a3a502c27059292bfcd985f3fae31e961bf129ef166dbf0";
+  sha512.run = "725766f3227119012a79807c5909daab83e8056718cc4e116d8992d13e11867439d71392cdd8a2118f2d8ead61b1d36af5ae42438f8ca68f26ea14f0bb7cd0c7";
+  sha512.doc = "f421a467caa9202ec50678d398e31e1c4cbb4e98805bf86114c97fd49479670e825c1c091955a41056adf0f9c7596dbf5dd14397326c1b88fbc2b6f75ec8ec55";
+  sha512.source = "0d1d5ab08bd27ca1e322ee25f8a6d58733d29291439c2e901d971969f4f05148b2c1d660567ef07ef9d002e7939dc10d5bf37f03fb23728e6242b3db783928b8";
   hasRunfiles = true;
-  version = "1.1";
+  version = "1.2";
 };
 "datetime2-bulgarian" = {
   stripPrefix = 0;
@@ -9827,11 +10182,11 @@ tl: { # no indentation
 };
 "datetime2-english" = {
   stripPrefix = 0;
-  sha512.run = "1385ea09d797877ea45dcc37e864c5e695d8eb2e210fabe33e6c13ab221cfeb5c55bb2d95ddd9db5c07653ac882375426c7694dd8d3da6bf77ac8f3fb798e02e";
-  sha512.doc = "21fa34d1dc4fc5e082bec3c6a82a29683c0ae6515cc8ee3f07c4cdb3c01639fb05e033e40c9aa4e8489789eefeb904e5b3c2e5cbf4501db26477db34f5e39219";
-  sha512.source = "20cfbd776fc91c547fef6dddad5c87b6abd49273607fe854b6dd453602833e7bcacd138e92c3c567c80cc8a45b1176160cd1cb0334bd6dbc55ff8477156cfcc9";
+  sha512.run = "2faf2dbcc9e49a9c30e5af599a26bb6925c6cb6831c1eb38bb58e08f50314cde1f3ebed343fc43ff50c6338a089caf90b8aaa53093f1284c583ba217c25cafa0";
+  sha512.doc = "ff904eb3279062f6573aa0190bd2f7426a18f4b67564b9b10673a88c4583c580cb88b33ccbfc0c8a979b10f6d2379bd22ad8483f19b1c4baf3f66e06d2ec52f4";
+  sha512.source = "f5177d83f75709135356331615baa47cdea2a01fc706bb507391c40866b1d072260bbba4ec33fe88ce44e9995bec77941d636e5ec6132b6c4f07d2f1f25fffae";
   hasRunfiles = true;
-  version = "1.04";
+  version = "1.05";
 };
 "datetime2-esperanto" = {
   stripPrefix = 0;
@@ -9875,11 +10230,11 @@ tl: { # no indentation
 };
 "datetime2-german" = {
   stripPrefix = 0;
-  sha512.run = "596fe3086d2bf16922f0219815474eea872950b1f31bb6777f375107571e70e5756bcd8c3930aefdfbbb6e1ab931a2a9d7976b537aeebedb98c1a541c178dc6d";
-  sha512.doc = "5fccb91afde9d59f6c26ee4bc5d7a5a90cc6c727d32effc328755e292477659feeb9eaadca85ef4351a104f9811426d7324616ca639a9c0bbc061ce32f10e778";
-  sha512.source = "35d7fd9a3f164503861980ee78b16c8784bcab76d46806a64e21c400cfc24900dddfdcab7cd8538b9071f69137eb746797e9555658540605950ea4081fa515d1";
+  sha512.run = "a27345e07164419862e2aa50a46252ffa05ccc1f3aa36cf530544642faee34a7670cb2d9279245b657bd5cfb5f9282eb537a94acfe56017bd855948a0b0d1ae7";
+  sha512.doc = "70c3d14708a87ea3e7f81ce3fa26420daa123f214a1bbdee17a8d1a33c437be51602a5857081ddc82998526e5424e4899dc795d1fc7462519ff35cfe8b63df9a";
+  sha512.source = "04f88422f1134325f6c9dae292c8c6e10ea61da4c5159afb04774a776277f35130a5d7dd90d58e368df3db20a29d472e4c8c1ef2527d17cfe77ef1f46bb7dcdf";
   hasRunfiles = true;
-  version = "2.1";
+  version = "3.0";
 };
 "datetime2-greek" = {
   stripPrefix = 0;
@@ -10011,11 +10366,11 @@ tl: { # no indentation
 };
 "datetime2-serbian" = {
   stripPrefix = 0;
-  sha512.run = "d66f09a0b8cda86efcf006ded72eb90c75d6d675ea598048e7003ca8e3d5910d765d202855c3899a5467b71c1fd04e2f0605b8f9ce0aefb0e689567c06333bed";
-  sha512.doc = "75e062aaaf56b2d244c15c7f6b84eea54cc6b2eb2177c5f7dc73c2e82d17c4274dcb4df5f37f7f9ea1da3bd3389f206ced0b6024d9ca26c0d8469bb9cc2e6acf";
-  sha512.source = "2a55f815e7d93bc99d7f0c7ce775ce9e09624ef96c91605b66eb30f7b4434be5c3cad995d25ea30ec59761bd4553ec02157c1dd1ebfdc8429db1855b2becc871";
+  sha512.run = "ebcdbb32af1743e9dc2b46b6730664c48a26ac4d15c4e9936c9df883a718fb52e8800f29285295e7521a02130471bdc10f8227b5dbbbeaf6481355d7025a8dd4";
+  sha512.doc = "c56761130dc00406a27356a8b38f4c82f233dab32fa6f19d58626139ecd7e12fe3c736edc676db52176c5918800b4f0a47362fcb9b3ef265ec3beebd641c1b15";
+  sha512.source = "a7d421d3e090bfdcdd0fc5f734a45cf32d8849e1c27ddb2de3f829c5488d99220797400c8039deef2fb76c3ede96059519dad3d54412f2c780ca5b9bca39f043";
   hasRunfiles = true;
-  version = "1.1";
+  version = "2.1.0";
 };
 "datetime2-slovak" = {
   stripPrefix = 0;
@@ -10075,11 +10430,11 @@ tl: { # no indentation
 };
 "datetime2-welsh" = {
   stripPrefix = 0;
-  sha512.run = "6590e6facec1539e60f9abf746f6359be87983f9c637cc7c571ad08c279d719bd4b820507feee1a18cfb4d97e8710d430ba4fe959e422b583b215aad9f059a8b";
-  sha512.doc = "5d61392e7563d87e5f18723aa309ccbd7c42b3ab19cccd0eda6a714c925c49b259c2202f90d3fc7e75158dfc0f2a34b5104e60300e5d736f655f98d9fe72f9a7";
-  sha512.source = "d285938163f81ae02873bcb55ce37d0ea1f416ddd42ff5dcacac3e8ec82e9d89ea53b2363dbe5b5f3ae93301af7f46b0fdf1d975a5e1179b528323eaa94fcea2";
+  sha512.run = "2c3b56f2e2796840fec8a60b4f75800743a4d71128cb900ed7419a7a01acd306a9ef86c2b1587e661833f8de48ef89e22c11589af21c9abfa2cedbf709c4c340";
+  sha512.doc = "7abb3d603eb94f99c1fc49e53ee28996d2a536d647b0940db20e5a9aa70eb10d7e00385300bfb3adbaf4f463db20c4277a8afbf0f174c449e402c02954c57243";
+  sha512.source = "92b71dbc5a21f650de8e9ef42bab3e3cdae1f4f1a48b34db9b656d894edc678e79e27dfe8b2143d85dd69aebf6e1cc9156a9b72d632065a2d146084f7da0f12f";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.1";
 };
 "dblfloatfix" = {
   stripPrefix = 0;
@@ -10090,11 +10445,11 @@ tl: { # no indentation
 };
 "dccpaper" = {
   stripPrefix = 0;
-  sha512.run = "fe202a6540c5e95f4c2b2914409081499d31f4ddff41c9d7d25630d00b3dbb3bc7fb2bac4bf9ce17b67867561d8eee8625d849da1ede2e51f706ffec21fa081a";
-  sha512.doc = "59765c9239c6ff8b263b3e819fd26c7bed841279394948fe902bdd5c5364fbce08120db366abf2b90fc8364933cedb834f982d4609e1f2d9686bbca341e3816f";
-  sha512.source = "41b0b7f978c0bf5109c976a76b593473f492090a5f392d640377c24a034c26a5829b28e317944876287b9a0a092f47f3ce85195bfad7b4d2aa41ca226abe80d3";
+  sha512.run = "76d73fd1e3dd94465a99e4aab6ad0c411626fbd5ace6edec6a185359fdd33dda507e86d55d7ea182490626548785df140c7939ed811b3c23ba06227dae293151";
+  sha512.doc = "f0c725c43911a38bbc8ee03f77382ce4d1abee5af1d57a12910c67f0eeae9ffe3b44f0a33d916e79c5a54b1fbd16bd5e440848e51996c4d13e200a714704e934";
+  sha512.source = "8da6ebb5ed65d94a020df98597411fb886a2f035566cf902d22708def1a44c2e848c2904c65893ea0b7d0c96a5108c9895aac569269594cb73f5200525170de6";
   hasRunfiles = true;
-  version = "1.8.1";
+  version = "2.0";
 };
 "dcpic" = {
   stripPrefix = 0;
@@ -10140,8 +10495,8 @@ tl: { # no indentation
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
-  sha512.run = "df64c7988e8194564716a0abef4949bad9b34b8571a579148cad5eeaa3676a6e066c9eeb183f69d49e5089ce92ef45b4c7747bb4d23334c6812c900c91069ef3";
-  sha512.doc = "0199cf3ca0a7fc36fd3b2b736be56c3baa1430422ec97a3bdf86e740c4117ca73cc0b7d057ebf40d1d48def4d5156bf51e9023604794ac3cdab19f0716d8f6a9";
+  sha512.run = "4f4e9585f959c51e3700121785217f96d34ab1c8d9af59fde4e3584eddda75a1f1384427992d8335581ecf53c89a5364e1330abeee00c17b318a04870d9f2c3f";
+  sha512.doc = "4469deb5cac413e37b57af14e41c8fbb55fb5c840d4951e79105251b2b362c13417f1811716938b4a2074296845073fb3a13971addd0284207c0c48067c5f719";
   hasRunfiles = true;
   version = "0.6";
 };
@@ -10199,14 +10554,14 @@ tl: { # no indentation
 };
 "derivative" = {
   stripPrefix = 0;
-  sha512.run = "b0fa98877855c265cc0f0973a0b848924f189f445403461f22998dad4bb470ecd5b117075de8e2cfc1292eea27d93b258a1fa0ac1c005463f645ee6009e08315";
-  sha512.doc = "1247f1977d624e4f00b505c4758b1463d03768c4d47e6bae368965566bb7d6d0589951d0c356dfe024245d93e8d8f0f584d3809273e7474beb8f5bd100ddbfa3";
+  sha512.run = "e74c2abfcb29f075c11545aea4665a06edc93f9cbcbd6e687ab1a1c7b07d095c1349225182862b020b8bdf551a90468ba7357f3138d847a2234ca2351f3383be";
+  sha512.doc = "5b794da3675ee46ffd1951b1887487670e26d22a60a3665c5120f08cd931bfa562b5cf97b8690db966e10583b5471dc26956dedadeab1db4057287db64ec4485";
   hasRunfiles = true;
-  version = "0.95b";
+  version = "0.97";
 };
 "detex" = {
-  sha512.run = "cd2e97f09a80642c52b2ea02b8bc9f81651de23ede8c5425a6f37400191d68a6f1c25ef451d4048a2b2cb4b263fb8bab91ef5649d8102396c98a5d4761db1d7e";
-  sha512.doc = "60a69f4447b51dc7c2b8a15d2027a30dfb47fea82713617f0d4699109711fdf507ed6d2b7dd950ae8afd89b838903db4f94ea5b91755cb1f53feeb433939f5b4";
+  sha512.run = "cbdae140b0fa1e5e0afc34548a7febc92f5c1f2981eaf36101ba12857303e1a4f4152e7673393c1fa796e3fde783119d7ec2ca5081f5e127092cecd8c64a2050";
+  sha512.doc = "f60fe0817f1f53320a7f1a54b65e7a39a11c519439a71c379dcf4a9472c5b067c5a687ab2c0145f5229606c4ef05d2d498d4def677d9d5b0fa0fe99876b56c38";
 };
 "dhua" = {
   stripPrefix = 0;
@@ -10224,11 +10579,11 @@ tl: { # no indentation
 };
 "diagbox" = {
   stripPrefix = 0;
-  sha512.run = "d1a45837a94efb7361d7f0df518170263d9ade42110c95554531e3e877e328f2918e63679220125c6803e2338c9095ace5143a1f56fa154b75fdf7e0b539dbc1";
-  sha512.doc = "e986ab45e44315739a02a48489076be1ecc4d19bce3f3f7689a58c78fa1d63b4375955f82ca4e6f9cce51b10c14a14068ef88171dcba9bcef4e962fee1a153ce";
-  sha512.source = "946f732d453692d9e16aaa8a48c862bd8f904d7ec23a1c51a419582feef30b57f3e864aae344598a9ce610ced52034a1034bc8542f35881b642a284001c330ae";
+  sha512.run = "b9508c1073b88458ee80a63cc1f10a22a96382da7790b54c80bc76e9f7a0315d6f1b9305e373bc4b4542c4c5a6a647625642d021b6bd01955b531bbe59cd3b42";
+  sha512.doc = "07c4a00573a4d30c6c52195b66e8293e575bf80f448cee7e1384040f0ea057194051327fda9719c95ae43e8c249391845803de7c041945a3b72c9c252d8492b7";
+  sha512.source = "bd644dacfcba987a0909a58105696aa8d9ce9e171942509083c6418ae80e7a4964a553a641dc5be6d54a1b1c20ff3319adbf4e78f30705134a2e7b4620c58d08";
   hasRunfiles = true;
-  version = "2.2";
+  version = "2.3";
 };
 "diagmac2" = {
   stripPrefix = 0;
@@ -10276,10 +10631,10 @@ tl: { # no indentation
 };
 "diffcoeff" = {
   stripPrefix = 0;
-  sha512.run = "5677888e02bba39b32d6b2e421adf69e7777e76552bc8a4a30e157a0a2f20d040a9638a382cc1df1542e6d62e1cbbbce015c864ac54ab5b1e98a092525900a1d";
-  sha512.doc = "66bf438f6a88309c58dc22df80992afcbbba5a25a23bd6726aff777e2d628bc11c423c24cc142569ec1c713af97c8575e409af96fb85e3ed1c04748ef407dfba";
+  sha512.run = "4f8a1dd23b34cf7d6f213a6bf6699286c7e0df73a8a81ce59d6bd2d500f108f60293fac6f1c938c73afd5d4b1b20f64f2ccfe74f5031b0dda8cba65eabe7178a";
+  sha512.doc = "b45ae815b92e542d0158da9a75978f97b2ca14056484a776dbd236da551dabe025fd85366fe2ca230b095119bb47fc3048fbb8f1cc4943f7fde9aa4820f0cb36";
   hasRunfiles = true;
-  version = "3.1";
+  version = "3.2";
 };
 "digiconfigs" = {
   stripPrefix = 0;
@@ -10465,6 +10820,13 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.01";
 };
+"domitian" = {
+  stripPrefix = 0;
+  sha512.run = "e52d996066ada71b5be5b63c44807fc6f7b0fe1971411b3c106f9e122f64bdaba8d1e70a315b18dc2d94ae15daf5e5990eda6d9865e21f172556a5eb55db9eba";
+  sha512.doc = "7d5bf1324c70b321c5ff795e6113ce5742e72fd2da32332b27322960bf32199dbfd079408c7c0c60b542b6ed7d456e7e77a636bf44238149fcac2640488d99bb";
+  hasRunfiles = true;
+  version = "1.0c";
+};
 "dosepsbin" = {
   sha512.run = "7f31d47d60b0bf151cd6e6516e29a8414c6344657c133e726e6e8dfe23818995b10b9a2898b1801c4bcb9219969a8af1d2725b75df514ffb119730b3e49008f1";
   sha512.doc = "b9edce9984698db8e50f9183f89b025cfa89dca8a8725054af80f379c88ff1d2b02cef8f3d5f37ee5b8585a59d1a4d0f0ee0e541a7784f3f3f4e382d78e6a47e";
@@ -10667,22 +11029,22 @@ tl: { # no indentation
 };
 "dsserif" = {
   stripPrefix = 0;
-  sha512.run = "346d9192803712c47d8905920b6c86244759635e7929e1a2c049a558a7e50eb36dc6574dae59f17bda21e6c95d1a661c9857514eb7f5f60d008f293beb758da8";
-  sha512.doc = "87e5ede487017ac47d7502d5983d5d158deb4d709f033ca34855f01f4b93fe7e3001c6287277f4f830b79c2ff1cf41caacccf2942769f8b2b848524ba4fa6696";
-  sha512.source = "31ad24b5b7667c1763dc36a475ce13b70bdc38c239a5c38a09acc3d4e66c95b1abf82d60ca240e7bf121f9dc93b17a17f420ab863a8f2052ed363c5adc46ec22";
+  sha512.run = "70cf249f7e3fd88d03fb7ba2ce07f21a6183a7ab465e8ad319c53aaf3e800ec3e4a9f12226f1302490a316e88c0571c2c9d5310dae6e10c0714527da271c174f";
+  sha512.doc = "ef40db14eed4e267e490df95147c7c5854fe034128f2465fd5dbbbeda6e0aff1267e00daaaccc14820e788957a097cb9c3116c6fd923f9aad152049866025848";
+  sha512.source = "c8ce0770faf0072a23552ef606fcfd80de18effab6e8a40e2f54a1a13ef23d019c81578b95eb9b421353f566e2d32009ed646a1bceb27b224e6acd11846782c4";
   hasRunfiles = true;
-  version = "1.00";
+  version = "1.01";
 };
 "dtk" = {
   stripPrefix = 0;
-  sha512.run = "12ecc654b0bdd73c96297e7f05a2f9d031bad727b6fe83fb247cda5a1c496bd8a63e2f4927fe4f4fa9755237c7c0f85a81326732f95c7daafba7cb7eb03b265e";
-  sha512.doc = "5ada9e107e6de2efa8614075492d405aa560d2d2a0eabcbe41976f03d28064c152ec3f66ca22d6d81dcbed13eaf383c53a60c68e7b72731cd39f6e613cf0f14f";
+  sha512.run = "c18c982e209b38a4f5d275eff1916f4b7670f2d4f0168d009d89e62d1692beb421b21459d994710e0d6ef3d6b6c09aa9288abc3eaedc9c0fe4e929ec24b1e4c2";
+  sha512.doc = "bae8991bb3e21a6f00d88d687c9a041bd0aef9b41b249c28d9ab4b9eecf91cea2189257791675bccd6796b4e745d4ab46ab7ca44c920955bd95b26fb8c89404b";
   hasRunfiles = true;
-  version = "2.08c";
+  version = "2.08f";
 };
 "dtl" = {
-  sha512.run = "796f01b568969124edc40662db5d8699a815b72d9eafea640c9499b7cd907e4cd36ab42c87ade466c51fcb18a47de3363f5c6068f4c678243c7633343705f35d";
-  sha512.doc = "b0e1d2c3728b859bc010efc5d31c50b10c7f9a045530f99278228fd4a4bae5563d58852dc995e9f4430d64512f7b0ec0c868c6f86259127bdf524c6f66bbec86";
+  sha512.run = "866039bb0f76bc6b2f4dbb86133a48869d90ce7dae716df42e35f4d3ac2808fab52a79f77b047267d206ec416bba7dd6282468767b1b1f4fbb1146a1140eb78a";
+  sha512.doc = "d624505c9bbcf7140fc264811631f55f8a26fb1e9c4d3b1fbb1be93460aca2d6dbd88192f057e1b17fe807af0b4ddbbef6e2a3ba919e6aed073a903045609d7f";
   version = "0.6.1";
 };
 "dtxdescribe" = {
@@ -10713,11 +11075,11 @@ tl: { # no indentation
 };
 "ducksay" = {
   stripPrefix = 0;
-  sha512.run = "57deacbacac1d79bbe0f4657fb55c05eb03c93068534f2d6703cd3785f1b056289f548edd9f01f52dfb22b5c1b402e8a3809240d323bd62fddc6b69a32e27e9b";
-  sha512.doc = "f4b49ccc5c3044a00c55fe396cea8e63b04fa5ad8d24e894b15044c189d6f3abba4e4e8d3d2200ebcbd15e9e40efeb2ac1f29996fb41d82d47b83810260408c0";
-  sha512.source = "8b027a2d0f11606d4469c490c8c4825cc68f147f99d1e708689cff2627e7df0b2583ab4bb4accbb2cbb7b0b8d803c2f0a7a13dec1d67036bb25330371345d515";
+  sha512.run = "0d81bad6d32724b569a483cd6656abe3700e218a52dbce511f6740d05837a9a0cece95461d3b7cb6b4b35cf6ed860c675f2182d61eb1498b503bf1660b675441";
+  sha512.doc = "9667ff1be349058cf969b512e022f354bc840867031d004759c5be53fee67cdff0abaf5a02205181ab6caded8ba46ee4d6f68570d7b92bace69164d7a2418151";
+  sha512.source = "587cb02ca297e92539e017610d63daf0c66c797649fb45be11d2cf079ff9c1a07899ae53e7c93f38d5f90bcc28c34423c00ea63d79cda8451be6b08748e8fa2e";
   hasRunfiles = true;
-  version = "2.4.1";
+  version = "2.5";
 };
 "duckuments" = {
   stripPrefix = 0;
@@ -10770,13 +11132,13 @@ tl: { # no indentation
   version = "0.1";
 };
 "dvi2tty" = {
-  sha512.run = "41399ea5ec5d9e32cd032caf70009181bef98b28e29ffee84414914ca436a49bb59caa7e5523ae3c76cb8ede89d89ab74af79dd6ecc89cdf9f0d65605668e9c2";
-  sha512.doc = "31cd9e13e873269f27e7e40b681a56022e7c0d776179fedb3c9396bcd9743b9e2b5f3043d6d2858858593aac49e40c16bb27d676f77ded984f4b803dfd9b07eb";
+  sha512.run = "303289e5bef9fcc097c1e3ce3eff923c303f50f71c72f2c3929c55f006149171eeb4b69ff38f8a46b8a5d19ac79ebf6ca28ad1df5f9525a8f1dc6587bfa42d72";
+  sha512.doc = "fd8c456f223c78128b5a7c50bdd93068d00f92ffbb096ed2cecf23180b765eba0ba0dcea374f585754ecb28276e668788979e0be131465fbb56967b4ecdad900";
   version = "6.0.0";
 };
 "dviasm" = {
-  sha512.run = "f8f24627f416053ed4a53008eb6f4b83a6f7114793e361956c3a968efdfe06c11c233e24e14568ccffec612d1ef63daf8f6644333f68d202b816cafee1da98b2";
-  sha512.doc = "49d49f53bbba34659a96d587d899af7a1d4eb4841d3b5132ca8647efeb27bf6590f7bbac42bc5d5becca356f7bfcd4fb244f6ce9282539fc9aae4bc99a633ecc";
+  sha512.run = "4407c22869b64e8ced5e48c41d56495404bf665cf5b9d4d252b71cc4a868696ad2f3339c4c92aca354d5fea4ebef294509e282fbc87136b12565e6c3c2de43c4";
+  sha512.doc = "a11c7b5e891958f10adf03812ff0a6123e8bff09410c4f9002e23d488956835019e5f54a5f130133f214831060992f2dcd7dc76b4497647b7005c704a7fa2d2b";
   hasRunfiles = true;
 };
 "dvicopy" = {
@@ -10785,8 +11147,8 @@ tl: { # no indentation
   version = "1.5";
 };
 "dvidvi" = {
-  sha512.run = "0b21ec8ae0741fe0b9cbe53fd97c4ef20cd4330bae769424b2fbd2998293b05419008ebcc7ab74bc17f166a30a66cad980f5692ab32aa1621ad4a771d20d720a";
-  sha512.doc = "831daec5b770f866c15440a384d1352824ead05faaacb8ae991e2d9bc1b115d599e5260cc9d7db6f0752ca7a16f21b0c52b5fff58ed1b23f30ffbfae59387c13";
+  sha512.run = "d4589c7c034308547b4970104f6396ef24a15be22e034ac2f4f04a1004915c8d477e64e2c4b61927f43313b90b063602a4bcd45afb1bc33ee395e0b7caef202b";
+  sha512.doc = "865f4e96bc8ff13005350800014ede4c95671db1c45f35e37b153637c23834d34054e3aac1b6033c6a219f9f123563b1d0cc3093c901f67dba7e33e65ba81646";
 };
 "dviincl" = {
   stripPrefix = 0;
@@ -10802,31 +11164,31 @@ tl: { # no indentation
   version = "1.04";
 };
 "dviljk" = {
-  sha512.run = "9c94578a0e4a43663cf1d3e05447d51ee84b892bb78ac105321b471e21417dd636bf8746d04c0decce06293f8ae8d8f60e0127b52796310a9c9dfc512158ab4c";
-  sha512.doc = "fa77f151e69f8baccbd01f8beb29c0143283892d42f5b0213909c7d434688a4e4c5e121ef9b8b73d93ebb211ca03a454ce309efd447a7d351968cbe9066b5ae8";
+  sha512.run = "7f0fff6f850f22788981370dfe9759f8d1ac803f75e6355c582eca83ca3940f64e3c32c32881234e25d8bda59e47a4f236751c9464dc41f93c67c16cc55082ef";
+  sha512.doc = "82d28f1adfc368582a5b1d05e2e73ba99bd05d51f9daa972f5ca753905341ee1d61b9e15d402b3017bfdd78bd64c7c222794bbf76073517f96ea1b9d7a58cea6";
 };
 "dviout-util" = {
-  sha512.run = "bc4ebab6476e9023c4c6e130082ec1ace7f068f9d0b2835f1bfb40db892baa7db4a5f0ffee0e49e4368f2b34ca044f2de31c9905c244157d9238daa8939cd56c";
-  sha512.doc = "916faf1b17e02ec011a6ace727f17807ae72b64126c3a29337b06554aeac3fb86bb5bc0ea36c5f82523843be1f051e56cf9cde9370b40170295d911cd91eb6da";
+  sha512.run = "a9445602ac5a3663920f8c7d428e833b0451c3e80203be57cc6fbdda5db5f7c89da75cf58e74d56c4ab9cd817fc9f080a056ebd045828a0d5b034108cda61bc5";
+  sha512.doc = "61f86a23314334d7faa4f1ae0760aea6c5e5f77754a6a9b1d5952f09e3e15d3dead73a9f72ccfe9b9d7a022654f8d2e1e6e3051dc12bff574b6f053cdbc9b598";
 };
 "dvipdfmx" = {
   deps."glyphlist" = tl."glyphlist";
-  sha512.run = "eded65e852efd5caa8cad6227894b5d76b190baed17678a0a89a90ec14ad0853abe0b8bf09d2b989af05b05c47dd1167ccacfb18aacbfd70915a483152904fc0";
-  sha512.doc = "332955e7a57969de8647845f0d7a36bae6bb2fe8bc431533198c7225d5bf67ea18228a2c71bc88581fc3e72fcaef366002ea58b4ab54f3f8591ff7a3d4888f1a";
+  sha512.run = "9bb72d88bcb5c0cfe818e9490afe532029b8fc569764e02706e0301e901287d617c2111d854ea96db00e3567c29e78dbae42498f837c4cf429ffd5c098df565b";
+  sha512.doc = "121b8956d42fb45be7d61371661512f5b8bd75fc2b754ef97c7a7b86b6e43435425403c99f5ad9492d4c6feb8948b4d10c9bd67c621f1451fd6abc5b13dfb446";
   hasRunfiles = true;
 };
 "dvipng" = {
-  sha512.run = "3716cc269d2f869527f6f4d5cc9ea92844c6d67e8eb56d80874540f37b89d6f8a391fb5c3fe0c194088f4ee7301396605c22d2990322ff441e1d1872a58eca78";
-  sha512.doc = "752961d28935c2399badb3e31af65c76eeb5a9cddb0de44f5d9907b8800567bf9fd8019fe8c39cc335dc9a60487aacd4de196611fe1f289cd0c424fd1d6c180e";
+  sha512.run = "abd26644c7980c2b2d10dea4d8ae54ee773fc9e417ca0cc053665ed814370b8ae3ea515818eed2171dd52a996c253e1269f4b3a9469f776d55ca429b92389222";
+  sha512.doc = "2f6a35103039d27cb78451a2b1a4832765f3bb482cae9ccd1aa368124f11648864860b87d31f3a81a489bdfd4c938572039c3329a8073be051d1386b2ef38075";
   version = "1.15";
 };
 "dvipos" = {
-  sha512.run = "ea771c689b519ab7167a0e363af501db771e7883c0b82fe0ded3661b57fcf31b932cb268b08b7e1f2f4ea3a7f85a7bc1efca83272f7eaf163354166a0b9a5a93";
-  sha512.doc = "0e4548fc7abe4aa8f54a1b1a17d4582e1cb6e9f0aecd9812a1e2337ab1aa9995b4f3c4e2417f3eed248a9d40a5ba2c314aab273fda3ff5dafda3d9ca23307b77";
+  sha512.run = "152cc45942bb1d241008ea0924f1e96e2329d6fd4228be42dc6dcb9eb28081bcb3d80e407e9fdf0560e93d095fd07351cf073f14d4a4c25eb984613fd9189826";
+  sha512.doc = "2bf3fd5bbd7b6e1fb8a263dd0e3deef358bead727df5de280342376225fd7366ff470b9c2fca8f763890d1047fe2c7a5b138ade1b5fcab383c8113e10f245199";
 };
 "dvips" = {
-  sha512.run = "ee10b8c1b67997d1c781fe2c3e5ce7826c111a2b6f4078330b566bf5525ad2a1cb2b89c4efa8d877ae1557fb319941ed09db30b229a62b6d3ff6f6a784e48df5";
-  sha512.doc = "fcc91e88fd3536244d878458a90d31ad3b9ec9efbc08d09d8b23f13d3887ca575e17663b2e21451abf88de389f7fc3937ce3ab49bc9e6ea94ab77c66ba179a00";
+  sha512.run = "c9ff911b92a757c1eb300f933f049c686c85d4ba09aabfcbbb87013fc34cf106fd5560931719e2f50be4357f9d83fb24692ba1ec24d2999fc3da79dbba02fcd3";
+  sha512.doc = "2d6950701b62654e303805bcbb364711aa93aa7eee8165944167046584c9686667304b70c6b8f43bf36f529e70e9bbabf1671cfb1749a4cb43ec9abe4fff353f";
   hasRunfiles = true;
 };
 "dvipsconfig" = {
@@ -10836,9 +11198,9 @@ tl: { # no indentation
   version = "1.6";
 };
 "dvisvgm" = {
-  sha512.run = "9497809c9788b1bec8afe64d67828b7035545eafa92fc6e3be62e9ced5a2428db6ff169d0919fd929a30872d0c70359d679d0d32b3a741dd9070bf6bc2901556";
-  sha512.doc = "2e44abd6925358d1dc594296ac2c13f146b4c8bd9b5d7dfd3dce92f5bf00e88712cc0f3a0da915578d39a8e1243c84b936cd624aec424f7d1661e9a7fe2b5635";
-  version = "2.6.1";
+  sha512.run = "c7b33eab605df8488a6f0d25e0a0d7afde99016cc719a6b13bdbe68df0d1fce2c0d0996742633c392b0f9c56ec6aec307734b06dd845d4cbd2777c932b057d6e";
+  sha512.doc = "253a0ece82b4792bb30504132b4db8382b073bb004d1ab22ee8f74b339227171711318d76d59ed20c7bf66575758cdaaa9c4dc3199d446150971a1d57152c91e";
+  version = "2.8.1";
 };
 "dynamicnumber" = {
   stripPrefix = 0;
@@ -10857,10 +11219,10 @@ tl: { # no indentation
 };
 "dynkin-diagrams" = {
   stripPrefix = 0;
-  sha512.run = "077268d796ca7e45df408fec24dbdeaa8d2192097f99880edefc12b7773359ef78ee243c0e479b6259c11b928908e8cbfead96b1ef0470831a65d1c58ebc4dfc";
-  sha512.doc = "c188c4e237439e6f38e062a89428413f94951c747e3c0cd122ea3ad8b0ca4d516f545dc2c6ac5fe5221d8a6d86b8754acc1981986d0eb53498f00a3b56809cf5";
+  sha512.run = "9ca3c426525f48db3f2bd53ea6dd0bfa2c67184b800efbe7e5723659f7c0cda9bf1c1d2f56ae022783689490b4bfa47d5028c9dca02d534070bfd6f2a242c28b";
+  sha512.doc = "c6d3d0f6315bace752fc85f02bc90e118b66048631f24c82d72d39da56bbeb1f40bec61059c441e154b9f8002cc000471a6a5b34e5dad39acd8bc7d98364dfc9";
   hasRunfiles = true;
-  version = "3.141592";
+  version = "3.14159265358";
 };
 "dyntree" = {
   stripPrefix = 0;
@@ -10942,8 +11304,8 @@ tl: { # no indentation
 };
 "ebgaramond" = {
   stripPrefix = 0;
-  sha512.run = "36ee434fc88f4b72e0d1b5fa1cd0a912b1416bc3d74881e78494c2e9eedd1eca6c8bc5ad684969ee8b2bdd83d31c944e3f01bb4e26a6c6581d67cfc9bded6184";
-  sha512.doc = "da563ee20f8271177944ba4c891e91fe54a778bfdf2c17f5ae106357b12ed34ae9db71e4e82680b008184c6ed18a5fe645d848e450dac7b031246821fdafa925";
+  sha512.run = "87897444a30627daa830f97f184766881e0c3c94108f0fdd3c83a56861827070623a1a374a579d7bcc27efe93761c2d326638a6f36708da5e785626efedfaf61";
+  sha512.doc = "ba927f6c72f6761dad70cabc51b5163d26e5679ebdbe55987eeae4cfcfb36353efea3fed98431fa93875c15c9a40cafe8db8d300c94531ccd307fdb4a1d71995";
   hasRunfiles = true;
 };
 "ebgaramond-maths" = {
@@ -11032,10 +11394,10 @@ tl: { # no indentation
 };
 "econ-bst" = {
   stripPrefix = 0;
-  sha512.run = "8d54d44602d10d09ffa23b289763e439e0613a753039acfce5c6b2ddb3801886bc4c621a3749730488b2ae22cf41f5d0b887dbaf2fb0050afcddee2b32d02eec";
-  sha512.doc = "fbbb25b129e477d89263e5bdfd9e998378496ed0be0b77ae580cdd3a6bd539827321fc966d08ee7f71babd3911ec4e3aa1eba9f0e0b7b41dbbbd87c61187a891";
+  sha512.run = "94b5c473100b1f6f900093f78e2a3a4b30482cb81a55ba27858dc12883e221aefb686b6bf6ad5bf98982203350d73b5e745e57f26f1fb8c62ab9f4a4378f7eb7";
+  sha512.doc = "fef5635f67b826505174596c98ea9e6d596a29d0a844ed1df08c6126aa50900626cf4ba2a09383eedf55dc3f95c459ac311857dc87de014ec1d6b22b6d2a2069";
   hasRunfiles = true;
-  version = "2.5";
+  version = "2.7";
 };
 "econometrics" = {
   stripPrefix = 0;
@@ -11228,17 +11590,17 @@ tl: { # no indentation
 };
 "elegantbook" = {
   stripPrefix = 0;
-  sha512.run = "8903163ce14195549cdca1ada3473c379630e273d1889f99b86eaad85f07913cc3ce54ed6c14650376729ca0d470d639b8b10ed915fd11f5639d5c62845c7118";
-  sha512.doc = "bcdda56507c66123acfc3489dd055d2fe3064875969d8b31c535f8f9cf6e06555f701134c1075683a392ba0ec2933c1a916b0a05eb70d761ff45b29a52df8648";
+  sha512.run = "9161124e17257a15fdfb9994d8163a9ac29852b7b67f007a270862690166ba7fd567154147a91bd191c57e24a51880256a00b4cb7fe4a2effb5bf0a6949be681";
+  sha512.doc = "ea9eaf95ec5b6e83f7ea51af43ac3107da4a6cb9393f0037e71be4a6fccf201e116b8d47119766e6c4054b0d243ec28f501c300954c1cb7b3ab95513c4db2809";
   hasRunfiles = true;
-  version = "3.09";
+  version = "3.10";
 };
 "elegantnote" = {
   stripPrefix = 0;
-  sha512.run = "fa01c305f478e100ab30b187ee053ec82c0d067ea2a463584a60d68b8358f9e8f65027b87d2e59f9c6c6df2dedb3885f151bcd9db8df5bd9e451c035d21bfb51";
-  sha512.doc = "a1c24f6637ece128a313f24e8ef1ba2b587490c876706f0d2fff2734ff0a5e799b6ae981d073bd2577a60040e121e59d1b3aac81e7ec0e844a0a270a52862020";
+  sha512.run = "447bd06f4fe7d1ec3a21d0d43e49ee3a10c50c107fb358c0dc3b2e522a625e9b69f544e30a5235cc0bf25e98c22c3dc36cfaad9fbef076774bdd317c480cc341";
+  sha512.doc = "72ac88b89b70499ddd5b52147094585267ca6c48bac1387852742e8562f3db8b6577951b22225d5bf8f5636eb7b3db7cd0fa092e7e8225c7358e1155b919f864";
   hasRunfiles = true;
-  version = "2.10";
+  version = "2.20";
 };
 "elegantpaper" = {
   stripPrefix = 0;
@@ -11294,10 +11656,10 @@ tl: { # no indentation
 };
 "els-cas-templates" = {
   stripPrefix = 0;
-  sha512.run = "23197c9c87b21b92dde909aac95128b0e92d1510a98479d739ee38cf05f5873538bc5d558181bbe62ddf24f5ec1e62a06bd42fd4b7abf73d99bd27bb70a566ea";
-  sha512.doc = "d32781a8dc8b9182f2e1ecaecc3a952bb4b05d596dacc6346a45730f0d43a1b786b175dc45d4acf15279f6b0795f4d7227ddcd350f32b0464f3debb1ddddd7ba";
+  sha512.run = "38872c8e042f91713f653aad4f613a54aed5f8b6de2bc9d93798239e2d2cd7f5b6965baec089433ad1368b92a08a7fdd9b37041d35fe279b22712ceb2b676dc5";
+  sha512.doc = "88693bd2873621c0afda517c6603a7097279406fb8f149d30c74d1a20c23d85d5a009f04b50e1c0ffaabb2bec92953a833a987b0a9a9ec4bfca05c4571114744";
   hasRunfiles = true;
-  version = "1.0";
+  version = "2.0";
 };
 "elsarticle" = {
   stripPrefix = 0;
@@ -11309,11 +11671,10 @@ tl: { # no indentation
 };
 "elteikthesis" = {
   stripPrefix = 0;
-  sha512.run = "e4e4eb999e46b47e2cfdac34e1f36d49354104cd3bd0e13a78ccd63acc8a36997e3f075f40785e1eef059b79c0ff154b156bbc2e7ad039d79db778819de6ecce";
-  sha512.doc = "3d409ba033132d5c4ccb14e4e987cabda0f62e01d79f3c45b8fcf3ebc571fc9a5f94bdb0f2d66daa8d746de573069d9c3e7af0c998925a1176580bac3eaaafb1";
-  sha512.source = "a37110177743fedfae82f6b84c081661b29d29dacd4e54f810f2c69ee6e288836ccd6c5428a53350d422eb2f1d1c503e50ea1ee0861d33fc80e93f63eba89586";
+  sha512.run = "d52fb9c415354b154a1c49158cfc13f97c2d499def4942404671fe2ddfc363ba0f19e7a60a5e75c3d1a6068c94a8ede004de4eebdcfa9f0e10d183c59dfc4fa9";
+  sha512.doc = "144b4c5ac1ac38bf92b395d7d68d992a7ed2c6271063a0bffdd4228618dfda5f670c4c98f210f7ee84a2bcd7c56607c305709cdc19d1825ccd603a2c5a71c74a";
   hasRunfiles = true;
-  version = "1.2";
+  version = "2.0";
 };
 "eltex" = {
   stripPrefix = 0;
@@ -11352,12 +11713,20 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "2.0";
 };
+"embedfile" = {
+  stripPrefix = 0;
+  sha512.run = "2ec32d1b6eec133457582ff7289244f918c402b9512b0187c651cbf3ca4c648945b8c2fb62245ebb65d73f1cc160a78f2025f2901ba2a4b2dc906f96f5f6d878";
+  sha512.doc = "86ad1713ce35c219c8298cfc585a3fe69169b410561087939d157dbdcd83f61b058413d75259419b1382beb7a92a9d711203754842a1e9155e9bace17fc97502";
+  sha512.source = "4774257a618c15d41768acb569c4b047bed8c51af90a4c2e2971d899c2aefcfba0c90c41e68a32a8f1dfeb9fbbd4ad4b91066ff80c664dfa5374475bc6356946";
+  hasRunfiles = true;
+  version = "2.9";
+};
 "embrac" = {
   stripPrefix = 0;
-  sha512.run = "fee6203fc9017cc9471657ec8283342a3ee7dffd84d6e1debe3ee908986da80732dfdd916d7290bee51638dc624fe4d1920b7b561d19de5649938b6cc7324286";
-  sha512.doc = "f60e2dec5ef1d1a1cd370f98a94fa7ac963bccc97a47bc29966e26748b9616f4d1b8bea9d180bd7a1185d82a5c0ddc9e5cf0da3f019c2bc8b32ad07dabcd8b67";
+  sha512.run = "ab55ff04144eda0f73d311841e70df69366e68266918cc765f35a2563cf230faca761a2e9bd53140cf4549e3a0b5bf8452694e469db84bcb3b2997f7a78557ff";
+  sha512.doc = "1aa1ab6e56cc4ebb197ac20489cdba7bb68bc9da7776f6790419dd63472740acfa5adbbf034e8299f510f4000c0d8510f7d9d4d68a3b9aa8b8c4861ddb950c13";
   hasRunfiles = true;
-  version = "0.8";
+  version = "0.9";
 };
 "emf" = {
   stripPrefix = 0;
@@ -11374,6 +11743,13 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "2.2.0";
 };
+"emoji" = {
+  stripPrefix = 0;
+  sha512.run = "56e94ced1a0c04bd58c6fe5a59f4cf8b11cbc4a1139010a9b14f4afe4f1d2b47d9e4d0e04369353a86993cc3c338411dd213d25f3485c8a47427608ae4188f1d";
+  sha512.doc = "24e878208f9957b98faf060b5827bc320b744a09b44844f7c00fdb8743a9871d8d28b6ebf826398cf7a402acbbb88e817fb6d4dbbe715d4299483f88859acd98";
+  hasRunfiles = true;
+  version = "0.1";
+};
 "emp" = {
   stripPrefix = 0;
   sha512.run = "5028360a2b412232b06b0bc53352c7a0a379943c14781b49b45cb75aef044df5bda24449dbf13601d1a574e5349bd0f2d2f7b7969f10bf72b3aeebe9e81b6ecb";
@@ -11433,8 +11809,8 @@ tl: { # no indentation
 };
 "endnotes" = {
   stripPrefix = 0;
-  sha512.run = "927d0883e4453e96dbdc9739fd2db471e63d3ebe2ced9f0cf55be74f2bc26804ddd1151b82d04a6d977427e0396bde01f4332083dab7a413049d9d639295c196";
-  sha512.doc = "44aa9b7d48d7f363c35c61c1945161650cd030ca23d443931236bd1739f6b1d084998fbfab27fd48fd17ade00d1fa494a3595a8101963c311b7fb41a9307a40d";
+  sha512.run = "3b4d5b55dd1ef844b96d30c7d40d5ea56ea3082a9e6740e3bffb837b864823a2c5545a13fa79eb49f79b47ee86aaa28e15c64f676bd27e4987aaaaca76bb2f31";
+  sha512.doc = "e4de81d6cf0d7bc686d84420dff1e390ad18747ebc9381c6df006f871f9d5e000aae5cd43a3648dfdab2806da83efc6b375ceb4a9110137ed6b373538a7a8b57";
   hasRunfiles = true;
 };
 "endnotesj" = {
@@ -11482,10 +11858,10 @@ tl: { # no indentation
 };
 "enotez" = {
   stripPrefix = 0;
-  sha512.run = "98c83d1a6f738ad708568e620574a14ccf75325838a80f9beb1e2f345e236b4f5bed156bfdc9c280f20e5371007dbb59a8e7081eed07f65c739c3105c794b829";
-  sha512.doc = "c77e63d310940d35be4c7bc9cae0c9894b815ffbf27b41092f6aad32389dd866de08a5b15b3283059a08c88510fd6d1ab60ff33cf9f483a586016dcb8604cb91";
+  sha512.run = "887e305ff2755dde33c9ba39ebab63d3518a6ed7663b15245d6eb2dcd4ba263616f1c76d82dc8e86426567bab12c7379e093a57075542303678e45c8b884d022";
+  sha512.doc = "621c119bee8f05f3543804eef752df1d2498077e1d323841cb1259123fe402aefd8dd536983a9b94f176560dd36c2170db904a5427812dc2cde2bee6611da909";
   hasRunfiles = true;
-  version = "0.10a";
+  version = "0.10b";
 };
 "enumitem" = {
   stripPrefix = 0;
@@ -11538,11 +11914,11 @@ tl: { # no indentation
 };
 "epigraph" = {
   stripPrefix = 0;
-  sha512.run = "a6d4ffda943916b41743ad9c924351279e469c4fa2fa419e6e54d566d68faf6f381db54c9c5ffc2627ec2d7c699efbab47794682d8eb6633ec5a81a9029a9fda";
-  sha512.doc = "bc9f14e7f1a6897720c6ba2f2faa5e35f739a2d581f3f865ab4b46696656ad996637ffc436bc20b91eb0f09632ed89dd79c42c11905d3ad419a580a5f87fca68";
-  sha512.source = "1736ff1760772cbe5c806a489b3bfd578300405362a4759e0701915cc2ef8e4ceba58f07d53419d0136db549323b57d0bcda7aa35d2ecaa021e1768d6a8024ee";
+  sha512.run = "7be9b7851f4e98b5b618dca8535d7e3443cd12c64784680ffd0fbd31b9097a0872a676f2fb0f8b031682d43427814aebc0225e1931db658ce14aae2431597b6b";
+  sha512.doc = "7b4b60e8ddfd8f3d899829cf057f7a3db93498cc5214fa03c7116e794722d523cb51846fac80455bf3610b73cb5820872c628d2fcbb754c79b5c7fade26ef4bd";
+  sha512.source = "8f0502015099e2e7465156b02681a2774701f53c97c690f97cb1ef5b6538b99141d93f3570893775d8fd702fad60934f5dd0161f5b540b7e77251cc689714cec";
   hasRunfiles = true;
-  version = "1.5c";
+  version = "1.5e";
 };
 "epiolmec" = {
   stripPrefix = 0;
@@ -11555,14 +11931,18 @@ tl: { # no indentation
   deps."pdftex" = tl."pdftex";
   deps."babel" = tl."babel";
   deps."cm" = tl."cm";
-  deps."dehyph" = tl."dehyph";
   deps."hyphen-base" = tl."hyphen-base";
-  deps."knuth-lib" = tl."knuth-lib";
   deps."latex-fonts" = tl."latex-fonts";
+  deps."l3backend" = tl."l3backend";
+  deps."l3kernel" = tl."l3kernel";
+  deps."tex-ini-files" = tl."tex-ini-files";
+  deps."unicode-data" = tl."unicode-data";
+  deps."dehyph" = tl."dehyph";
+  deps."knuth-lib" = tl."knuth-lib";
   deps."plain" = tl."plain";
-  sha512.run = "66095056f095bb8d716382af1cc0c269bd61a6931dfd4a0d5edada684f4e2e794583417e6ffe09e64a3276ae3330844bbaa3d668697db163de89038e1d020758";
-  sha512.doc = "93086e5846ddbd57c799446be06afd6489a788427202ecb41bc60c283953af07513f3cc7e67964929a9944515dd3582f54ee2bc81a99e9770f15cbec51a86534";
-  sha512.source = "41ea85290fc3abc63f0e3b879e0210f204bb9e5dbf99ea44c0d506e9e68533313f19837ddc1ca1c45616d709cd0402396ac4729908f3acf38491e80ed4cb24f5";
+  sha512.run = "28cfcf717d5d874cb277a0c3bd495cc54d10967f922e15306c3e1d33c3db21bd3f81c9bc0c00de9d6429f898c17da47618695d245783bdec245a498ffd9c952e";
+  sha512.doc = "2d097430db5acdcf38c3342bc2cbe2e5bb58b848c468d0392629a0666f0c7bf9137b3d9f0a0f1edd59f17a2e56a1c3e0a81968f0a99a1e28656a78b85f98470f";
+  sha512.source = "57a9a76e579afc4dc040ff95a1fa36d93beae7175a6d2615e8804361f3ba349893c46c50be84383c8e026236b5067d2c8de9338c3b9204c64f46643129a071ea";
   hasRunfiles = true;
   version = "3.9";
 };
@@ -11601,10 +11981,10 @@ tl: { # no indentation
   sha512.doc = "7965e6094535d22b04193619842bc0bd090c2b47139e65498dcdf428f4ce2ec54e7da5edbdf9015c9d8f2013642d11347373e625a3884c629d9d807af2a9880a";
 };
 "epspdf" = {
-  sha512.run = "a8d2e4cdf1b3e4439ce8c96b18cc7182bf29f745b8a35942623575951ddf179964536f72ec58a357e7544d861bcf624d7b35ed3a0932d758e011e56633aba078";
-  sha512.doc = "f2c5ed08890388bc064af0bfe31f540c126b9bab4a5b262a5e44f6cbb4e4511ed43ef0fdd2945b01bfb1ff4aba15aaa7e7fa373f7cf93827fa352226a423d8dd";
+  sha512.run = "8464aef2f11712c124b2fb29eb448706007f8b4825ba09a7579b4b8a6cf31fc3ea4b98359ecb588e6886fbed9b59d1da155a3d69946bcb99f90f39043aeb4eea";
+  sha512.doc = "6de1e86931bedc481f2cce725c58e83a9bcb8af10938ba8d5701f325ebc0e98824cc472b32e95c9f319dbac7c49ca849e368d431dd79c5d1d0fceca81da3cd35";
   hasRunfiles = true;
-  version = "0.6.4";
+  version = "0.6.5";
 };
 "epspdfconversion" = {
   stripPrefix = 0;
@@ -11619,6 +11999,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "2.28";
 };
+"epstopdf-pkg" = {
+  stripPrefix = 0;
+  sha512.run = "3e2177a1c6cbf8850026f981ce3ec5e6a24c4fdf8c40716e3f18ba7233cc7a5115e5b74d60aa077575f41bafc58af966ab55c189de4d06863ab2a38551ff0dca";
+  sha512.doc = "c098251d55112c0c630e007c85d1c7271e32bba9443ca3c2590b51987053e945e3c52030ef4bd1f6758894cc263e9316bc31683572bd07c24fd0855f01c68be4";
+  sha512.source = "0816a754b15e42d6f43ef333c6f508988c861c04f7f6f53a370777ca85633a981948c10a13f3180797c1f5af1ed156b60a29c608d7387a53756f2e440f38bd99";
+  hasRunfiles = true;
+  version = "2.11";
+};
 "eqell" = {
   stripPrefix = 0;
   sha512.run = "b3544579e03c33b7a5a10f1fbcb22735d1bbcdb9fb5ac94330ec1eeb6f6ae646935a46f4c7c3bdb4305368b2e9aa9eba244c80f08f3127fad2080b610f1041a1";
@@ -11686,10 +12074,17 @@ tl: { # no indentation
 };
 "erewhon" = {
   stripPrefix = 0;
-  sha512.run = "efc2a9afd043de41d9fb81fbf09cff81d87165d96bd402d68ad8a00db4924d6c7f0b33d2e12efde8f34d24979109a47c1cc542289b4cd89b089501f88905f9a4";
-  sha512.doc = "a25654fe1d3b08412a5393a899fbb1192510613478a2f6e9143c802db7857261ced89f04f52a90349c450d4b42650d964e633687ca785f4bf69f6a3adbd35c16";
+  sha512.run = "5c432ee9ea7d2a76d9fba1c8ddd3d0d19432009df86d7386381d39355bfc46328f8763308d4021bfe0b0a4e18e9b3d9eb3dc8bcf4b0cf50921528a9f549b46b2";
+  sha512.doc = "60dfb45af8a284ea995f06d3243dca7247702ce6d05331dbb0d72f353b8a82fd9a4a3d39af56e7d0dcd5c487e2bdf8dd498c7d72281d4c68d2774d8fc3b9cb5e";
   hasRunfiles = true;
-  version = "1.093";
+  version = "1.102";
+};
+"erewhon-math" = {
+  stripPrefix = 0;
+  sha512.run = "f02b635f08de904566a700e29528f74bdd8f8021e6f5b82433bab98f04e95fb8906add6a87ebea5bc81674455b46baf2c2b675180db66ec56ba71229bdbb00a7";
+  sha512.doc = "ea557d32e31ed890c9dc796de465c42acebdb27ac11e9ba1dd1a7b19a02df4eb952826b746f2a2698e42631584a76d3c836d1458e65501bac19a586be3085dc9";
+  hasRunfiles = true;
+  version = "0.41";
 };
 "errata" = {
   stripPrefix = 0;
@@ -11701,11 +12096,11 @@ tl: { # no indentation
 };
 "erw-l3" = {
   stripPrefix = 0;
-  sha512.run = "d38e28024ecfa8be96a0125bea5728f54618849963881983fe9d375086530246a8e0351fcfd519ad37a235c3897906ff2f7b3f88854865e2de92237d7873aa39";
-  sha512.doc = "8d1df458ed784fad2be09b46bfb48f1478c12a76127dda7a16b3c8b89966643e385ec139f0caae7a71b265451140ad95c4de4678ffbc6540bd1653c82a9775f2";
-  sha512.source = "e7e2ddbb2bf750c16148915d779412f81d4508539bfed20f0bf0ef1f983675f9976984a870dfe67ce56041954e25aea6e5ebef5b07c82197ab7183968402e20d";
+  sha512.run = "230c866b9b72c0155af79cbf7d212411f3a038fde5bdae44f09554cb3499d501ba71be5234e7c9e2c2d5844919a8ff6a4473b6a06de33f66baa6ba0316037eff";
+  sha512.doc = "34bb0e752d769cac90b50ae350e91e224dd83c9206ad05ea2d4ef0c427df413cff692808d6b0820b12852a9f60628679d18d9d7bc2f2d4c11328d162f8adf491";
+  sha512.source = "63202dce4c3c74b1bda95bddb0b66655745f8dbd26aba1da261bb38d7aba056b2280ccaaf301c394feca09ae06f1372ed4c25a1cd4965fa049558c2d9590a0ca";
   hasRunfiles = true;
-  version = "0.1.3";
+  version = "0.1.6";
 };
 "es-tex-faq" = {
   stripPrefix = 0;
@@ -11818,6 +12213,13 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.2";
 };
+"etbb" = {
+  stripPrefix = 0;
+  sha512.run = "e5ed5e381105bfcf7b424427464305598d3aa90b7a27248ce4e7000408fa642fe6f25eeee6930ea85b2dbc74ffa1b0ea6cc1bb5ff189050fa579b806bf7a0bb8";
+  sha512.doc = "37a50869ccf719673f97e1ca0da89297feb50b01b9a5f28f9129997ca983e23b0cad2976902b4498f0ac36f3d64676f2e765deeb539e9d2da08db063e3cf8461";
+  hasRunfiles = true;
+  version = "1.001";
+};
 "etdipa" = {
   stripPrefix = 0;
   sha512.run = "88502eeb78f2f5901cdfc192638501690aea861de2105445de226261c62f526d6602ab5c63f02974d067e229b12441ee6663b54769236a1e0e125896b869301d";
@@ -11837,6 +12239,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "2.7";
 };
+"etexcmds" = {
+  stripPrefix = 0;
+  sha512.run = "b0be75d3c8eb92407f21111e6c9d397ab5de39b96b99403a149a9554eff523e99cdacc9c1c37ef47cd190487511c6fc6b7c91b617e889eac1d6d8b6aa61c0c6b";
+  sha512.doc = "841ff47f9cefecefb241cb81602b825c07d4d0eaf143343eb9bf6c35ca66194c98f851e4aa27a369d60927fe96968bf7a1c1d8dfc7bb5be092e77330ad8ac6f2";
+  sha512.source = "057bd48b4c4455f3641c961b6337127c6f84c72dd89615197c095b13846599f1fd8016ffb7fe22be820f16f7b012ee0991d8e959e59a3393694239c1abd610e7";
+  hasRunfiles = true;
+  version = "1.7";
+};
 "etextools" = {
   stripPrefix = 0;
   sha512.run = "ed7e514441de2fd296c372d9c56dd71ebd5318bd67eb4611c4bf784b16b045a08338ca4456899739dc023e5bc4695a6fd1784e592e542cac6a0564a68307a983";
@@ -11861,11 +12271,11 @@ tl: { # no indentation
 };
 "etoc" = {
   stripPrefix = 0;
-  sha512.run = "f513ad397a4c48add5b1eb21714bacc54989532a9ef56ae2e7d02254e325acb430a1bfdbd9d90ec8bd20c5ed473c7f8a73b3f2ff615690ba85ae2c69acd283f5";
-  sha512.doc = "e4363e5790dbe31c12e3c4392285fc3edcc3390af6ca66d5fc98008110c35c9f9eaea38ed401315b9403368ca4a977f4a926ec59cf76f70424c6e59bc52aca14";
-  sha512.source = "895ad1979e26e8fde07f5df98b338c661b849e4f67f5db77df7176aa7bbf37183c377acf19d9fd92259ce413c4efe5fb0269a854213e565925d826c9822a7939";
+  sha512.run = "f8386d45116a250f5f482774b8dcc40b0f4e30b8260d201f2d8abf0b10f0e103253af3f23649c3aa948009392072dcb29d7661ee86711c2dcdc7d66e69a4135b";
+  sha512.doc = "27bd651a6178a07d4cfa7d741653765b04e9a0ccef5e04eb8c89fad12df1ad7428312204c18f590de6d099d6bf108bd01931728c1ad392ba666c695099006779";
+  sha512.source = "edb8c19dfaa0877a2ed038b5e687dc590a569fa8f0577fa782b9d7ac26831718bc269f64373e5039c4668dd0e2725442613c5fa7ef0a7b1fc84d0ca77b3a8264";
   hasRunfiles = true;
-  version = "1.09";
+  version = "1.09b";
 };
 "etoolbox" = {
   stripPrefix = 0;
@@ -11887,6 +12297,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.0";
 };
+"euclideangeometry" = {
+  stripPrefix = 0;
+  sha512.run = "8f77c81afe33b837bcd0ed3287173b974a637952384168ae93671a84fce5d89cafc43f1f217d0b8b388dfe733b8a5b5c83c52c9abacb6ea082162acff53b101d";
+  sha512.doc = "e89b948b0866e8b1acdbb72eba354c72272e243e721380ef7111e8670a1ab54981a44e61354ab3aa76dd8e534071da61edb6f92c105ccede0efbd88990ff1a33";
+  sha512.source = "3d26956790d2870b918574b23e64a194d5ea6226e8387fbea1a40b9217609b946e50653cc3549b1a21ba1dda017134a106d1c8090e467791316538b008077823";
+  hasRunfiles = true;
+  version = "0.1.5";
+};
 "euenc" = {
   stripPrefix = 0;
   sha512.run = "f5968e42b36d9c3ab7ae17d156283f8fc09f0c725dd1037cae3b232f94af11a8ee84507efd87cab901bdc8a34f0f72d831a078de205e9beec81c574bb65f79fb";
@@ -11957,8 +12375,8 @@ tl: { # no indentation
 };
 "europecv" = {
   stripPrefix = 0;
-  sha512.run = "474af2851e52b5b4b385ca9014bb6868494a6eb06d86d9ba7ad62cb5defca53c094a0bc3a91d62cc8d9af656adf8f8e8efd577fb6f3d940c134842d1c6a172e2";
-  sha512.doc = "fa6a2a0d208b7e4d87e0927d858719f522dc8ea8ff57e9db391372138b2d20447e5835662712bd81520868a0155c5209f6336a7ab3a14ff811b3da04ce11662b";
+  sha512.run = "54c1a4198183c346182db14b62c88dab981b1c2bf18ff10067b335e2e4eff2bb32400f9589d6e16065b891958e46cdf80f8ac4f5a73a70d0fde7a0228b1e13b5";
+  sha512.doc = "65ca93f3b5e8cca103abb82cc47485a5aedd1fa9e78d1bb4fe80623c9b76bf34ded529dcf4ebb35f8d141cf198a6e8ba1a012ee4e698053ff16e8ad23741e059";
   hasRunfiles = true;
 };
 "eurosym" = {
@@ -12076,11 +12494,11 @@ tl: { # no indentation
 };
 "exframe" = {
   stripPrefix = 0;
-  sha512.run = "36fc2c125586780b798225fd4f3bd5d089236b7d0b19fadaa92911fbc47e9bd47cb5d6e6f31e42262c72d9ac1053999ba41a4dd23054abfa43283b7a0e957b75";
-  sha512.doc = "9697e6388b7a1c1ab96ab945d5da34249425c460230b9508d9c3386f3c2ce0d969a2dbc20cec96a3390feb3e81bbd71ea13646af3982f266dc73031d3663ce6f";
-  sha512.source = "b8348107fd677a900e4a8f3f5557d9b2fd6cf154359a1ed991934f74db331725ba1c790b99b9f291dd975873050f5cb5dc42f9a094839b8d482c08e9c80a2dc1";
+  sha512.run = "426128ad41db65598a47e0baf0e019b6592c996b10442edddd624d86524116df4e0fd01411c3ac2f4153ab1af6f3a960680a085a556f07a90ff2b326bfbc26b2";
+  sha512.doc = "c8f9913899a52815ddf7d96f033db62e248a92ddfbafea2091a93b55fd1bdcb01734177c7e234ac2de51383eea7e21afaf77164ce496c7858f95d63800461007";
+  sha512.source = "1a42fbe43846bf5e3a87b43b4e855a0f7b198aad0f0aa311a4e7c3632b4d45ef338f107484190461fa15dbfa8a52dc7fbbcf95ac00cde18281b2d58e931df060";
   hasRunfiles = true;
-  version = "3.3";
+  version = "3.4";
 };
 "exp-testopt" = {
   stripPrefix = 0;
@@ -12105,6 +12523,22 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "5.1b";
 };
+"expkv" = {
+  stripPrefix = 0;
+  sha512.run = "a4c3691608573967a4162290f04da6fe56af27c866cbded1272bb939d2787b168ce70dc3a3a421ac0f232985a213ef36bcec5e3e2b98e66edfa6051d1c29b340";
+  sha512.doc = "33860f56de19ba0e5cd8d5109e7a04865b1ae08bf292b4ceab9d5adbe2319c54630054d4c02448548ab4a9f88fcc80040d9c58119e8d632dfa9e20b94dd84883";
+  sha512.source = "045f29b91ca9fc5562e739e7ed5ab84e902d375dda756daa6d281b2993b9e4edd884a946441d264cc936e8360238b980318af24c983ae27f1ab5b793b484ef6e";
+  hasRunfiles = true;
+  version = "0.5a";
+};
+"expkv-def" = {
+  stripPrefix = 0;
+  sha512.run = "0e4b25eed122d54765c527e00105a2c48fa658647621a0c4f61dc2b494139e60ac03c20533086016c172d3c93764af2598a0501326219dcb39ce227321a8862b";
+  sha512.doc = "b6f95ff4700c0acd0f4161ad9c8ce34d2803e8a84eb28caac26b7632d1d2be7f5036a99554298cf7f5344ee463cc8a1b0a5167f7cbe61394c3f5e566dab42d47";
+  sha512.source = "c495e55740f7ca25c5be51138fd8064c882d19d2b45bd9824cab7653c36d12d54df1bae951fdfe6d44df1c6bce7e6047234267c800196c831aded4c9e98cb570";
+  hasRunfiles = true;
+  version = "0.1";
+};
 "export" = {
   stripPrefix = 0;
   sha512.run = "04b5eac3e263fd692a1f4796ddccf7c5f41398075c9b15e65a0712cc83dcd85a65ae4506a882249e09c9ceea37f973be3398a0c31d2590e0c3e57549f07e9116";
@@ -12295,10 +12729,10 @@ tl: { # no indentation
 };
 "fancyvrb" = {
   stripPrefix = 0;
-  sha512.run = "334df96a99813a99d36a68cb99b35145048bc478e463373efec5932bfa981eec2eeac910616e6cda2491636961249c947b9daf4b130329696c755076909cf46b";
-  sha512.doc = "45ef859efb1e9f22799686600c1be8a5f2db4acece1f8c0bb4e1bcd37ce5a83d708ea027f0c0b60da7bbb2c8add47ce70ef6f53f68bf0810886066230072c9d2";
+  sha512.run = "18e96a9e2f0d397e83af318f2bdec75b9ccc819c1961ed3d1898ec5cdcdeee8d9f6cd3659e11184495045110ff9637088dd61382c039504722e0119da8c67af2";
+  sha512.doc = "cbae429b29f1bf6d6fd78f449e7b81cf81069db3cbfcc3aaabbc686f3c390db2bacfd13c483ed9bdfe8424276839a17d2ace710612cf014bdc27820cb16bb4fd";
   hasRunfiles = true;
-  version = "3.2a";
+  version = "3.5";
 };
 "fandol" = {
   stripPrefix = 0;
@@ -12339,10 +12773,10 @@ tl: { # no indentation
 };
 "fbox" = {
   stripPrefix = 0;
-  sha512.run = "1216117fdb03433d2986eaa8b277718304d5cd67b0d7944c7a4712c27a68e68979a3ae44d563a847b01bbbb0d5dd0d7da8feafa7699e27e8a336077cb96cfa43";
-  sha512.doc = "d2cf24e58efb78c8680cd3a8cbedf2517bce05025745bcae80dd7ccb23f127f3262cca75bf8c4f9b33100253194525f1538e6340c145a38c473a2afe5737148b";
+  sha512.run = "c7b6b1af67b8984486b5327a1d017be65ee3f5bb026e9e41e929dd572125363aaa9726ed6d619903ad465c792f10ce52038f0ae7356d836799945416e96e18c3";
+  sha512.doc = "565c22a94102c184da9180cca35e840881bfee10c9f404dbec230e167f1f2587233d85851c9db6babbe29494c7ba4f6acc495464320df0a6f4055c29ae8eb1f2";
   hasRunfiles = true;
-  version = "0.01";
+  version = "0.04";
 };
 "fbs" = {
   stripPrefix = 0;
@@ -12404,11 +12838,11 @@ tl: { # no indentation
 };
 "fei" = {
   stripPrefix = 0;
-  sha512.run = "ece490df465a83203acbbf0a1002a801534e628fdcaeac7c54536a8e33a633d41fbb26e25ca8cc19677799a2be1f89080f3e9472f4d9bff10c6260ce53692844";
-  sha512.doc = "b1f97d16b0652a5e19144f652a3e30bd45486ad5de8dd287832a73345539ec6c2a509b1851b5ea6033e8d967c9fd2c997652163510a8554750641a61037d5bf7";
-  sha512.source = "1e9f70e9fe26fb0f5915fa9e9aa1bb5debde0f43a75abe64d9490de3d857f167dc19c9f215376fba3db7b1a9d2ff4a67e4c2d0708149b122afaae0e785c32a27";
+  sha512.run = "bbce2eab74a8fa480fd68bb0559c2bc41998ae119720ae2a2e2b2a0688fd0a61a817a4a7102d1c08a2aaf042182bc3fd4fdde64d2be66e0ec309276cbf47ef92";
+  sha512.doc = "dffd3e43bcee3c608d3b5f6b13e6ac721649db0bc7484357c34fd3a3c962cc7e4a5af2188d76a409ddc0cc7fd8111e8aa402d740a53b14b58c8be86f964e6243";
+  sha512.source = "819e66b25ef2f2221c79848d3c161aa7ab6f7406b95281f43860330093463dae5728cb452487b372e79446ef9f6f9265f33018c590f1a69c18331893cda15735";
   hasRunfiles = true;
-  version = "4.6";
+  version = "4.7";
 };
 "fenixpar" = {
   stripPrefix = 0;
@@ -12439,6 +12873,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "4.0";
 };
+"fewerfloatpages" = {
+  stripPrefix = 0;
+  sha512.run = "9618c6cc8f94957cde1f015cb49379e3e3ef3b39aba816a81f38749037240506c8fbfbe12cb9c32f7f1e651804659649f06f509e6d7882d5fcb16a34507a264f";
+  sha512.doc = "96e9f9cd865731d4429f921c41493bab6a760ad6bc8d984c12334149dec3309949a7a213ce28f2ca11ba793ff4264bb3a3065de86a1509301d7d7ae046a45d3e";
+  sha512.source = "4b54a41311355e9c0cc79d667700771540ffcc3841d3b1c2e9264a17548019c3ee6936c0aa9690a848ff5c8af106b5339b092176f416768bfa6d753f454d98d9";
+  hasRunfiles = true;
+  version = "1.0a";
+};
 "feyn" = {
   stripPrefix = 0;
   sha512.run = "56e7d5b875db6eb6e5ad2b07d5696fa4fc6cea7d0f0f9d691bdec0fb90f16bbcac0c9f20f8f16bde20eabf98f72fbbd75831af1191b229cd7acca60bb2edda28";
@@ -12487,11 +12929,11 @@ tl: { # no indentation
 };
 "fibeamer" = {
   stripPrefix = 0;
-  sha512.run = "566fad32f04b81c95b85f65415acd86e729802a3b638c217054a2b5c0432deeae87213a4ac4a71e35f0113c23b1e98e0cf7fe047b2bcb4f9e00b929d804a230a";
-  sha512.doc = "a70d38f8b6e1f68f9261a99144d6fbdbbd4a883d4b60f3ddaa01524710e0405bb61599716fa80fd99e9b40e37dde9dbf3ac6fdbaa48a8f2ff4da2534973c42e4";
-  sha512.source = "51947801fc6c4c8e4098fe38bc6638bcf328884cc86b25e7beca8525db1c8888145b1852a3113d651f5595b84a84738adc5516e65677ea8c31c195dc9ab0c3e5";
+  sha512.run = "7f10c002cd04dc2624f84bd2da11a9331639a33a5a9642a7ebac96f28a4af3fa177c2088557bd966c4250d561a8b8813b042e7fe9c456e5b41629094dffd5c64";
+  sha512.doc = "1121bc8f0f7c226bee621cd0bb5f75a12cdb8dfb64540debc6b25a24a34b939d4dbac04cea3cdd97372be5b355fe028a0354bdf2393160b577f10fc31c2ae9fa";
+  sha512.source = "50993fb045581fc04281266856a7bba7c2b0c9f4052a01543139a2ee4a0b376490aa5ecf0f4a3ad7a66b48e0bb4817e297dfa6002a27b57d6b5d2f819cc8b093";
   hasRunfiles = true;
-  version = "1.1.7";
+  version = "1.1.8";
 };
 "fifinddo-info" = {
   stripPrefix = 0;
@@ -12565,11 +13007,11 @@ tl: { # no indentation
 };
 "filehook" = {
   stripPrefix = 0;
-  sha512.run = "cecba772dd7c5059750891151bac94cf1ca37512623363a3b42be449c47f29faac5746ac937fb43ea9a54e6e5f8f54087ceada240d3f1fbb33564c56d14720de";
-  sha512.doc = "dbd41905d906934608fcf83901b946ba811aa37463c8d0ef42679abb1a19d273298ca9399964e2c16b76b9451ceba89c220956133bf9edf0a83be1b9aec019f8";
-  sha512.source = "65bb2fdba8b6288189d6940d27caef6c25a999efb3df6ac673441cfeace02934fc7121e4a4df27cd2fbf7b3f52619e9d8399d2fe47cdc26afeac59b6cb9c4820";
+  sha512.run = "16196dfc6efde9c09a0a285e25672b144e8ec291fd76eff4e3e8db3c178c2b1bd84e18890c5fc392c7bb87640e8fc8a6683999454b0619fc96dd1628804bbaca";
+  sha512.doc = "0fe00874d60f10be246f8ce50060f84cd15b4448d52933a053b20e69fcf247823ccdda23b3282aa6d2317bc629b2cbb182c60967a2ebf23b64a4a57719664960";
+  sha512.source = "f1d0078a515810e9850a34341f2ac831beea2a636a58161782ef07554820bbd5ac7213d59d92a79924a07db53c45feb8be3442b5c9a7043e9005825049e34209";
   hasRunfiles = true;
-  version = "0.6";
+  version = "0.7";
 };
 "fileinfo" = {
   stripPrefix = 0;
@@ -12622,10 +13064,10 @@ tl: { # no indentation
 };
 "firamath" = {
   stripPrefix = 0;
-  sha512.run = "0a2e603e05302bc9dff0ac983b9f05e62cf085a89056eceb8c82aa8fe1d94b40fd8be48ab30a59cbd5a48cfea4f9da0e0060adc73d4cf76af5c03e0f3162560a";
-  sha512.doc = "f00a37d702ed8e38a841d308e51efee4c6b474a56dd4ccb9c1b395386da6e0de16be9cfce9acc7486bf5a000e0553bc1a47aeb189b4e7829db4bdd6c0739dfc1";
+  sha512.run = "282d1d6dc2f414c4fbeb0267ecbc52446c125e3195d82f5ecc60f1c659b0e92607fe2621f8627835732a8428d5028df47e3b75a8da051fc3da8ecfe9eb5eab1d";
+  sha512.doc = "d8d3ebd6c529a7e518597b9de2372ea8aa6e07f39c281e904c2654ee575caf200bf3e18d8a9d98861aa1102be13d64d12e18860ec046374418e8226360e3aeef";
   hasRunfiles = true;
-  version = "0.3.2";
+  version = "0.3.3";
 };
 "firamath-otf" = {
   stripPrefix = 0;
@@ -12731,8 +13173,8 @@ tl: { # no indentation
 };
 "fjodor" = {
   stripPrefix = 0;
-  sha512.run = "26186ec669370270049d45f81b873b444d829c11e9127702533bc09036795ddbd5b6bb43ad54b91662ab9206d56211f1db08b99045c2693c0826f2ec531958c8";
-  sha512.doc = "3115f5294219a3db2a87d702081b69a27c36065345b4c2bb8fdc4d63f3d20c542c81f6d7d70cedad094297b358b83be4141b69615293ed2530e7e1224a5796a6";
+  sha512.run = "adf4d23888c6c778ada6d7cf930d4aba68b1cc20c64c571c17017b11c115452e5a4eb766d03ca03f27f9de46a5027590cd806b17fe94dbc4c5026948d3ec74d5";
+  sha512.doc = "a0a0e01d4d40f1b847f40401d20604bafd2723097e72c208df2a5acb30f57042b35df4cabfc93108d4278f5725dd4b50539f7e17b7c51adf875898071a368fbd";
   hasRunfiles = true;
 };
 "flabels" = {
@@ -12845,11 +13287,11 @@ tl: { # no indentation
 };
 "fmtcount" = {
   stripPrefix = 0;
-  sha512.run = "847b8337131417ef6ae30469b6a8780539511e08eb3d2723df0a444d48a427b18a723e2c6da8d88ee65c04a47d2d8796ae95afea61302d77efab3e3e584ca8c7";
-  sha512.doc = "6fc1958d288d657929d503301e6dc0c68c475ce03f270767fccdc6d2c95a58809704bccee3122763992a24817fb5072844c3a50fef99dd541c0dceaf12a13fc7";
-  sha512.source = "f7cee2dec2189c65500c58d349b6273014c6273ca703f809cc7e5843136d70ada0f4baec6ff139543fdc9d5648f86c81fd4db63102df4240266c52cf19ab3c65";
+  sha512.run = "ec5e10be2b93adbfa0e1ac710c7df37457e8d14dc5c7fe1cd13e062f136c63bd20a3e42d57c237fb4ae5c1be936e1d821d0a6568ca0c22b41948660f0848da43";
+  sha512.doc = "fa0955c7d08dca99d3323b9cf364edd8b4b305723a3fd3ae38687c6473ea2af3593c47384a61feff0071199b909e1424d422eed3864866b28c7d27b1f42c3994";
+  sha512.source = "1325ecfee60e7b602e5ca2fffa2b95a4ad11d04b5e986413af57da19cb75e2a268356f33ad64355511d526ed144e14e2abab4b84e5ec5e4faae122eff9914104";
   hasRunfiles = true;
-  version = "3.05";
+  version = "3.07";
 };
 "fn2end" = {
   stripPrefix = 0;
@@ -12957,10 +13399,10 @@ tl: { # no indentation
 };
 "fontawesome5" = {
   stripPrefix = 0;
-  sha512.run = "31f9a5ecf1db94e562764f0e645aa4b7848ea7f940957177ba457cee4fbfb0b829af778fd5ea039d3269591c1f67288193bb17124a0059c286c33e45fda4bec2";
-  sha512.doc = "1901cc7843051cb0bc4b209c57903f380c6d9eb75b09991fd05792f9232b51fde09edb35cd0ed82dbfcd39a8712ac35fb4808eceabd43488579d9b5a5c9817e0";
+  sha512.run = "766985dd08abe4df21c4246bc387ad55075921377ce0f53fee67995a04bd6e85ca20c1135da6e906ef92ca63db89bd56ae82de7607ee955bdb272532f360b594";
+  sha512.doc = "1e627742b48a0c3eabf18402592fbdf265b35cb884e9863d00d456fc3b0f1301c67ee8d249ed7299f6a7f11768db9d97b940d1d8238a7b43881710b59ff08b44";
   hasRunfiles = true;
-  version = "5.9.0";
+  version = "5.12.0.1";
 };
 "fontaxes" = {
   stripPrefix = 0;
@@ -12986,9 +13428,9 @@ tl: { # no indentation
   version = "2.2";
 };
 "fontinst" = {
-  sha512.run = "af57d72185dbfb0e169231b2dc0d7117722a5c1b4db7a9b2054d4848d1e5288e5dd5b6f0f0153f2e9dc87a13915fa77cf9286fce6d5afed7b541eb9e48024d98";
-  sha512.doc = "e7774b46ac38bc2dd86ec8091ce4df364cf377b3864fac5d67ec0299e789ec10a171f8239c98f12775c750d023f69104a25b03f7bbc7dba15a2d1a7da3e70929";
-  sha512.source = "2f6deccf77ca8325a105ac187da3f4d6cd038ce7bbf174c57724b73836d662d3514355ff7d51ff51ec4ffae2f55871510817834cdd8c0431061e310ef20c3093";
+  sha512.run = "1703570199fbc41d589817f83b5782bef5552030ab54646d464423f0788b1f2f3a5017a92846de55ee696b4ccbe1d46b2220382f7446ac7cafc9970c58d1b5ba";
+  sha512.doc = "dc7aca7d63e13fb908df02363542abebb1760b66669bf360c2ab33e790ae6d3ac0ac1808849efab2784c39499ee1eb5e2fe43091d41b0270a4c402c2394f6fec";
+  sha512.source = "f0e4fd7818432ccf95a91f6e5d307aefe8d6d0bc3bcef464fa5b94cde24304c693466695e3a57fcc7d3bd388fc16a2ebb23fb80ecd3e5887ce845151983ed493";
   hasRunfiles = true;
   version = "1.933";
 };
@@ -13000,13 +13442,13 @@ tl: { # no indentation
 };
 "fontname" = {
   stripPrefix = 0;
-  sha512.run = "42412120cf59a9a3fe284c2d0dfdb0bdc4f8856ef1a2d814644290c772b00ad37f296fb66e83ed306a110602b314f6e7abd482180a0119bdd1dfbaa2233c77d5";
-  sha512.doc = "b6affbe821e1f127a5dd9962a7d89373108f57391648a15311de802ff555205ae864074d296690ac594377d00af5e4d375989b663c79e01408936c0bf934ea5e";
+  sha512.run = "97b85e6a11136049f54f611e8b4eda75fe097addb2b70edff263e5e4c124e0e05976407572468b7590a3c7fb41e53c0c5fe495ab922a3553c0c6d3fd5067ffdf";
+  sha512.doc = "4c981cbaff6dd6a700b5b4c323396676539aab8bacf44781de560ef226557182f3be5e573a7a2be98a1ccd7ca4f47fb7ad4b847184b8a18e3aeeca62077223f1";
   hasRunfiles = true;
 };
 "fontools" = {
-  sha512.run = "3d9635c6081f59b702107628f45df3253544ab4325cda5a53fa95a551c4acc8e067bae8fc863b05d087ab2f7191ecd35b32c7f95fb8a5c0e8c9a1df9eef42271";
-  sha512.doc = "eb5d0b04751127225964b28230d91e4c8dd9c630c93addc0f2bc19b4e657c874b11c93901c126ebfe83778f5d71f26fed9b7a4c823ef4019660dd0da2085134e";
+  sha512.run = "925615ad004844670af5fb6fa3e456dcf2e130b1e10cb64eb40967dc5d1af300f401c87e4f2bc44dc39af0fea0498fd6a6445181e7e21a63a007cf7d0a54e388";
+  sha512.doc = "a31f98f3791b464c1165f852000ee7408ca49e9a12efdf45c64d38b170e352508e0e5e4b3c9cc264799f184024e780fd968161bb03c520f39dd178256bb300f7";
   hasRunfiles = true;
 };
 "fonts-churchslavonic" = {
@@ -13024,6 +13466,21 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.7.1";
 };
+"fontsetup" = {
+  stripPrefix = 0;
+  sha512.run = "3affc864780a057995aaf3f2b4512a3577708433f92597f1c43f01761d65579f71559d39a14b29f12860c86cfeffa3aabb243f701d04a7d1b8901b72f409ecab";
+  sha512.doc = "7ef9b087ea0ff5bf62a553841c4e7ab976e08a0bf1b6d1b325c25e69d8ba0137d751d3f238e3b175060fd01f53b95b9bd775166a014567020ef63cc7c55101d8";
+  hasRunfiles = true;
+  version = "1.002";
+};
+"fontsize" = {
+  stripPrefix = 0;
+  sha512.run = "e174166999dac65cdf95a0d1bb79c88858ad448608bdc1ccc3390f04d4b5e02a4e219539092aaeb4217a44a1d230d977a482b4b63c67e0c7582d75ac2c85e98c";
+  sha512.doc = "049f38a64e19dd9eaae0f2a26d7c6ce2fea6e7e7078ca63818beedd830c4f3e2e52e0ab4da1865e58752c73910c62da47c456345f7452d902eb2e9b778cc7086";
+  sha512.source = "c25db2e82383e0cec01cdc7ba3bdfefb3f2fac0cf44ce24e0f807d39dddbf316818b01f383dbfa574d5232d7ddbf56da567a76b3beb35c9a84f2388944af3923";
+  hasRunfiles = true;
+  version = "0.1";
+};
 "fontspec" = {
   stripPrefix = 0;
   deps."iftex" = tl."iftex";
@@ -13032,11 +13489,11 @@ tl: { # no indentation
   deps."xunicode" = tl."xunicode";
   deps."lm" = tl."lm";
   deps."euenc" = tl."euenc";
-  sha512.run = "12ca8f1195131cc60a4cb61f35a4eb3cfba88cbbcbf3a4c8b57f24ccd27d16ec0fc2975e0b2f456ef753dd983b25bacd865e3d974adfc4d5532b766a83c7a75e";
-  sha512.doc = "cc8357c53c3771de506369b92a4db08b9964ac8071f84839a9f4ad02d703d2bef3e56053a0b389d7c4e3e686038a33f587eb75f8a898faeab845f4ce92bd3166";
-  sha512.source = "7b36496857143742acca3df007f68d4b1bf197c938804ca3421609f2cde4467097a5cb810f983370f522805724764c81167652c2796607a0b5e90b4d5f628a17";
+  sha512.run = "ef65e31a03f5bfe5dad80aa3bd33c5eca727e3200a9cee5bb199908accf429464efcf999680b02776f2ca49f8bf8175520fc91bf37eee03bd9e0fe87feadc941";
+  sha512.doc = "c3f3c52ba06d107913d2b47c9784b1807461051dfb9e3705efaa5ea3a400f98c975f200411599ea5755c46d9919e4f90721e8d7f8ae89e940866a2beb88b4424";
+  sha512.source = "ec740228a34972d328e854f45678dc421c92dffb105d743ffe8845b56ad581031a7f97b28c2703a9c7166fa4c166af45f9f2be69a7cec94d6f0bfd85123d453b";
   hasRunfiles = true;
-  version = "2.7c";
+  version = "2.7i";
 };
 "fonttable" = {
   stripPrefix = 0;
@@ -13089,19 +13546,19 @@ tl: { # no indentation
 };
 "footnotehyper" = {
   stripPrefix = 0;
-  sha512.run = "1daa49ea85b5ae7ac0d1e3d5dd86dfb1ba79a132c4a1493d911e4416cd6f1f7d7e6487032ff0cc970284a9df039996fd26258868f734a1ef7fa0311380bd7709";
-  sha512.doc = "d380557ece02393115148311e2186c99c6dda4f7ab311e448c3a52111a52a93fc17661bba80a6f62b24a30f7096793e422a93cd0d326336c1153a572b69c8b72";
-  sha512.source = "ec3dbcda29e1e7e441741607c897e39c3cedf5728b3661e8274b01ce759a1f78afaec3e69a1f5ddbbd8f0e0e153a9924535ea015645d2d2b09e917dc6724635f";
+  sha512.run = "593e4563dd9b2c209088f46e8f33f283d17d493e9aaca5ed1bd1cf0738b5761417e7edc4936b16401bb48a6f17468872139ce3010185646060f83ec35fcd1cc0";
+  sha512.doc = "12adb12da81ff88cb6b25d98ef871eabfcd01e38fc0adc91c122168a99c5e3e42ce6932715eb976b685853d559e4099725f543e1b04e8928b98526b5c684f588";
+  sha512.source = "a1bbee1e1c3df787236ce32535a93f1d2bff2a850887f34c0a62f2f48b11ac9e7d99a90d9c4a3851359ce48bbc5be909200aa2ad7632c6a9f35ee6e1ea3f843c";
   hasRunfiles = true;
-  version = "1.1";
+  version = "1.1a";
 };
 "footnoterange" = {
   stripPrefix = 0;
-  sha512.run = "c80c158c550e99e0d10f2ddfd248e21a897947058ef9d5f6e38fcfd9bf3067eff1846181b46a3abd23054f133974f1ee6e53496fc80b11b1df749d889cf983ae";
-  sha512.doc = "d87cfefdcfccea2c08e8d7669bafbb18b940bb06fe3986634c684455ae12da25c515be60b5e50b685bcc4ca745e1b26747abfa88f2328836a30ed89e60efc366";
-  sha512.source = "9b46378a9a8282d78edbc8c73edf10292ef2e09d25e9d09e9cc1718df891e464d51364945221e84609a096116bdb79388045c1312762ea08f4316158512707af";
+  sha512.run = "6d1a5ae7982aa9f928d09dbe0dc8cb3fcae5894bd8d0eace4590a7627d476dd32c9c91dd2d68aa9a9428b7258b305b13911421f0834b694fe828654aafcc4eb7";
+  sha512.doc = "eb31ded0bf2112afd6c278456701690a0a7d846af6bd1f28721bb6db4e67b8a83e2ec67b6876fb05315430d9d1d400ae4b5dd7e04f5bfeecde322ec6aa84e30d";
+  sha512.source = "1cd3a85585772bfe701cbd25f45ed5a94e476d48c9c2efe5868b4d7d2a41c3add423a51238ee793c0cf8d4f65767e9c2b9e0c0c19603259f61e221aa40935b35";
   hasRunfiles = true;
-  version = "1.0b";
+  version = "1.0c";
 };
 "footnpag" = {
   stripPrefix = 0;
@@ -13180,8 +13637,8 @@ tl: { # no indentation
 };
 "forum" = {
   stripPrefix = 0;
-  sha512.run = "6e15fe7d945fa300e85d8a61644de7783e34c1f8a61dc6a8f7496f3d14ff54bc5cc10ca7e253b5cc2bbff5db0061e50208a5892fc0b9f438326bf6d7137b4bd3";
-  sha512.doc = "c043736ca7c6dfddb6397628a5a832b37a98fd0a9e1fb95a3df2c786baceb3f289e53e49beadd05a481a1997cf0072903cf3c934101df4b542d41c15801e20d8";
+  sha512.run = "05fa8a77cc9bc2ea5ca7dd5962d56a4885ccc3d86f5d1af44d80231a7a803bb7818b4fa1ef1159ac56a22ced86fbbf6b02f4b20acafca4c1f7af36f7868ce8a9";
+  sha512.doc = "0bb1d74e658088d53f8adc83c4e8efa37469671860993512996631b18a99188f671a28bb4cd6ecfdc37b6e4e7f09118289f2ef83bdbcb726cf8a6055f3386496";
   hasRunfiles = true;
 };
 "fouridx" = {
@@ -13194,11 +13651,10 @@ tl: { # no indentation
 };
 "fourier" = {
   stripPrefix = 0;
-  sha512.run = "3bcd5010df4ecd50bd29664b69d6ac6d56d76615dd20ef44d38ed021a2ca3beadb7eb5f8cc2634dda2476f225f6c174f48dad98fbfea7f3c91f3398ebc29c737";
-  sha512.doc = "49655ed0c27aa8b9f76ae2f1dc956eae91ccfc074d4811fcd455709d6574affca3706d06b8a2d1ad5b1285daf287b2b46e61f6ae28575c3197965df78f2e9107";
-  sha512.source = "026c359eea5d49cda0ac58c5905277c90231664d96cd8ad1276626beaae05bee30a0f3884533eae5641e494942ed65848579653ac8adef88de4075fb5d6f114a";
+  sha512.run = "25578e0293ca10081e8266a4984280c8af9a33ada6102e8a5369e1207cb213e132be5b93ddfbc19c0e8f2d1117eb84311521dfc65e99a86137e0e545d773d782";
+  sha512.doc = "c5b0ee9b007607345c8b6d50087fa0ffca8ca5d472c4ee513ea6219e53312305cf8770079facc38adf628b9f344a1a23eb041cf437b1478324bf42102fd9b78c";
   hasRunfiles = true;
-  version = "1.3";
+  version = "2.1";
 };
 "fouriernc" = {
   stripPrefix = 0;
@@ -13437,8 +13893,8 @@ tl: { # no indentation
 };
 "garamond-math" = {
   stripPrefix = 0;
-  sha512.run = "e9815808b7dba1d0c37835bb30838fb8073f3ba7c3700bbf7997cce30b70d71194fe07e595728ffc894e22f6bd76bb559104249aa6c22c1b49a92251971c513c";
-  sha512.doc = "1fb3966ec8d6d7b8e048476a7129b8e6a650e4f7350f744db53f844c35528042024d156db8cf20939aef79d74292d3d90a61e6391e8723045efb4603eb0a8a38";
+  sha512.run = "5a6520612a6cfc8633149f4ea795049c017cb1a483104dc7258cd0c0afa0388d4348ebc0fd7d5b7229031adda5ba835c122b69d5310091106c972c5b8aa32891";
+  sha512.doc = "3afc74609589c22ad0e540f2915c8cc27a2712a2409f0085098cd00df74007e2cecdecaa40cfe79e99ac6538e496d59bed9ca44cfb18dd2b7fce2620805623b3";
   hasRunfiles = true;
 };
 "garrigues" = {
@@ -13497,11 +13953,11 @@ tl: { # no indentation
 };
 "gbt7714" = {
   stripPrefix = 0;
-  sha512.run = "20d7691ca964b30f89560a250d73ac35fb01e2da40026d5e03d1367a12c0466b94d19592694950daadc41d76b3dc15420b0fc257579a6be0a4cff06011b0f39f";
-  sha512.doc = "4c251b0ad2d13581b0085847eadb6a376c6cc64218c08439f4851cd3210671275d692d49a57f115c3a5764667f0558056ecce99fd51cccf169a5e61d80af84f5";
-  sha512.source = "8949ed61bf30ad172217bf50943c805edad7de98baf01e3e07bf411dbc95b56f8268b0c143156c153fcaac7326134282c1a7d797b03989ddd14ecc4eac810201";
+  sha512.run = "91bf06c6bfb5ce2a5a9ea1fc729e3438a385d2b3071adff342816f5c914e6047d80393778b1919f21da51293a86960d5b00d08d73a4bbbe499142d7700936606";
+  sha512.doc = "6eb4e9c23987bfd19fa18cbf89a5c21f0893e5d7d2dc704e9cff435f1de9497083ac54f886a3c87c40db95db22f607532e44b2b903e51f0a3251f1f143242633";
+  sha512.source = "2dc153cfe75d6ca026348df3dc796078faafab54ae2f9563735ea371892ec58d077519712ca7c5d90a9f41886ea932da91d2942b6dca4f89bc2c7d50f1c2ebd7";
   hasRunfiles = true;
-  version = "1.1.1";
+  version = "1.1.2";
 };
 "gcard" = {
   stripPrefix = 0;
@@ -13587,17 +14043,13 @@ tl: { # no indentation
 };
 "geometry" = {
   stripPrefix = 0;
-  sha512.run = "792e765a8882e18db38219b0004c6079793d630ca7f80b6b53cb79989d0a9a0d9a58c69507ab6418cbcdfe4cb00236919c51f3851171dfc42e43be682e0b92d1";
-  sha512.doc = "0293ca9ad86d2b2bb0cd38d151aab88c2d6991fc8ec5c6745fe68dec0795082c55d473114cf44e5dffeaf17f064b24720509f60bcc1830bfcae67254b0997a0d";
-  sha512.source = "9a18a0339fef0c5a0056ddd03b100e329b8860d1778c1e0119bc9677d5e571323adc5029c245afe30b7232a65d5793221aee099e7666a73e9b695a2336bdc341";
+  deps."graphics" = tl."graphics";
+  deps."iftex" = tl."iftex";
+  sha512.run = "991f8b0da99e4d7ecd2966cbc1e8a9ec3ce085ba18030492fdba5068111816e077f284ba782160265ef3f7f0fe436242a5b31f411bdf8db198f15af9d09c3a6a";
+  sha512.doc = "046d18d86f13dac1ddf0171bd54bb38d09e5537a202a32de52e801816ed72438809b8f2e82f9d00c0af887e5373f23c2593e0aeb834f04b1e19c849435a913c7";
+  sha512.source = "5296e913b7ee92a1dd26798a1082ee4c01f08a1a75fa389a60505854c556be6b7acf34fbbde832465cb1312bf1cb9428b2d13f8ff4cb3f0ade68a1b4f371d646";
   hasRunfiles = true;
-  version = "5.8";
-};
-"geometry-de" = {
-  stripPrefix = 0;
-  sha512.run = "462a81975ad340106b5e35d6d57e6102d31baf494b203426bb8783ca82b7f02e0656ccda608d558e91693a771e14ceaa02094f365328296b721147eab83fdd3f";
-  sha512.doc = "afcbc17a2cf01ec949cc2ad427335f092f65b3187a7a0225971a9ebe53402b19629767dcc3b1935f7d019cd1dcaa72b46931efccfcd2aa61c4fbffce2034e4dd";
-  version = "1.1";
+  version = "5.9";
 };
 "german" = {
   stripPrefix = 0;
@@ -13656,6 +14108,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.0";
 };
+"gettitlestring" = {
+  stripPrefix = 0;
+  sha512.run = "101ad92c2fba5c43321d8e12754190e09b0442508799dbb6bac23d5cbe96c470425a4cc10a28441408ac5a1c406e18aab7567f2464e48c2692fa38af1e23a16f";
+  sha512.doc = "f9e33fbe89df368c4c5dfd855f2fc0fa8c4d1eec5c0ab925b0a28b9f021fd2d88521895233d12783a023e40d70b05a0e849d4551f79fd4b8d0af72fb60a1af32";
+  sha512.source = "9bddc79e0f839a21ebb76e21e20ba5a26971f4192ebc2209468a780a15e5e5f61a328df5f033c115452751a31d1e6dc2e6e238097d2cbdbffa33f56ca420b602";
+  hasRunfiles = true;
+  version = "1.6";
+};
 "gfnotation" = {
   stripPrefix = 0;
   sha512.run = "4f99442eacf28ea13cd98ee4bbe981b95ae9d849e6bf2682cac2305fd793f6e9f5e4211362385890956fdb24ef03748e9cb0184c7ba9ed89e7985b2caa3e2da2";
@@ -13697,6 +14157,13 @@ tl: { # no indentation
   sha512.doc = "93bf3a4fbff9e0c936877b135a487739a7f48c2797cce9d27c2a9f173fd290c2da5a3a3f30ca883ea057ec47a4695d54f5e85ae01f13af40e1dfd3210cc7c273";
   hasRunfiles = true;
 };
+"gfsdidotclassic" = {
+  stripPrefix = 0;
+  sha512.run = "7b07a974f5447917d0a10a964011f2ed57db2dc9155384117310eadbe1dd05067dea6d617a598545713fb9250bda4241b0b2d5bdd84be4fb8c994d8d8c4e5ac4";
+  sha512.doc = "3256c1af2f7b0d15625eb3a7250e15b9645991b3a7408d11afc77aa65bb067cfc3682fac334a61d67f894468b3a14c21e694e4b7445a01ce88203af06a269031";
+  hasRunfiles = true;
+  version = "001.001";
+};
 "gfsneohellenic" = {
   stripPrefix = 0;
   sha512.run = "c8ec8f9fba5d653e5497a9812c5978a21cdb5b59f6bb0f45441c761d2afeff1c055c48f1b07c4f56c6ba6a6adb2f99525d838fc7850c7c97bb3f3e0f67f50dbe";
@@ -13705,10 +14172,10 @@ tl: { # no indentation
 };
 "gfsneohellenicmath" = {
   stripPrefix = 0;
-  sha512.run = "11816aed70ed5d89b65148b3872f77a788271c603ee4f9eda71d250347bf7f2aa251b7c8e9dadaab75dde273a465a199adbcade3a957dcc79947d5d52297e7b7";
-  sha512.doc = "2022e02ec438b19ce6e8fbf8f300ee050c2c7687408a4c4772751ef3059c882cd6944985a59ed9a5c1c8de1aec0ef2444c6f06c468cb4a8c8a3ea269b12b7ed1";
+  sha512.run = "1dbce2d775c204b758b34c66adfa7af5315ba5d40f577a2e5f8bc37aedd4fd5814dccf31e6830804f8b8ededcfe88eed9f0ea020fb411e439777bc19d88698b8";
+  sha512.doc = "5f511a3433bbfe68bd2240791126de6254f5dc552a24bd344aa33e2c8c93a08ed924b5d900d8bba1cd2fb03a2349ccd0c7233ae9b54db5f888b68bf97bad7f05";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.0.1";
 };
 "gfsporson" = {
   stripPrefix = 0;
@@ -13733,10 +14200,10 @@ tl: { # no indentation
 };
 "ghsystem" = {
   stripPrefix = 0;
-  sha512.run = "fb818e9da2c92ec4b8f943766f00b39bf2ef0f9a5ca5606ddbc4846cd8294ad012c6e7e45b51d04c249af2bb8f4d59410b644e65e20e397318453e0860d60b91";
-  sha512.doc = "b013e2e327a648b07d541c6d4af50f3142012a8ad62eba032aeb625ddf4ab5c285b8428f795b193fc85d6487f68921df96f8fac70f0128c77b1604bd71443b62";
+  sha512.run = "42f94adda3268ce20f664113211d3c32e7ee005db053f3daecf72d381dd4c4cc2e78610b821cd4b43c4543610bc66170513c4fd9357445977a8a2ffc6bf140f2";
+  sha512.doc = "d2f1f42177ea820d209e9574def8efc0dcf9fac0c73ce1c9eeaace7bc0b25fc470ff7265ca8a4f42f6482dba61d7d764b2171268c168aa7eb154bb6f9672f52a";
   hasRunfiles = true;
-  version = "4.8a";
+  version = "4.8c";
 };
 "gillcm" = {
   stripPrefix = 0;
@@ -13833,18 +14300,17 @@ tl: { # no indentation
 };
 "gloss-occitan" = {
   stripPrefix = 0;
-  sha512.run = "699068d013af556efe5c02f5a2338f2440c0b8dd6bed61dfec94c9fea3f8b50926061db899e5408172414e48fbef98e79905df51463967ae173ee0dd7f361b85";
-  sha512.doc = "68b577e22544b76caf10aae62282a2649e1d18d9019c0727d9eb14d5f0342b95f35e1a95c85bcaeea551808aedebb76a9d5031453269d5ead71a2df0fa45e228";
-  sha512.source = "a4d1936873891b2e04e6d9b476432090b7b3e31ccd07dcce7931b62a8044f691ae79df929dea87ab2f6b7bb89dc84e33054f56e51332d84fb97db9d787dadb0f";
-  hasRunfiles = true;
+  sha512.run = "ee68a2f0c41dac79d00a4103804ad735b5bdc78bad660d5933e61e88290a2dea17a695ea45129a672cdb301e1c89e4fc319173df1fbfd87f944abbe46f7f1dd0";
+  sha512.doc = "1325b4c8c0ff8c1e53d27b5696da419f99852bd6c272176bab4e03f91bb6a715de51d24317b9cec1af50ee0ae2b34c03c51afe9cedb8903a1e8f74bbee3cc06f";
+  sha512.source = "043c132580baf8e66ac76a01312706996902c448cbd81f596db732cbb90d66be64d8a1f673275edaf11031d1f878587270663bba7db32da37360ed024e210280";
   version = "0.1";
 };
 "glossaries" = {
-  sha512.run = "2b70c5a8318f35288c728d3b03caab7ef73a689fbbe186fe46266c987d7a7922be1838307a00be2bf6c3714bbbdd30c778aea61d85ae92545d0ad4111021b9db";
-  sha512.doc = "2a3f0bf2bc02cead8077dd45f3b1c3c02fdebb9b37a25afe7c7e63f99c049cb41a0ae77fbdc28ab72aead555e926a95a242175490fd548dddf8cdb98dc4f10d7";
-  sha512.source = "1783b1e706e870b2814aa558e3f80b8c4a92f12d6be519e532f0f6a1c7a7316860488347ca1b4a53d75a75dbe469014cd424e098c28efe10fab4e3ddf7c62fe0";
+  sha512.run = "7ad38fe17be336d0c849bdd149ab67ac3f519fe34000257df52a3f7b6c93a048dd45c1dc96bc674bcd461301fe51a0adc6e5d3fb6ed3395543911f5370942156";
+  sha512.doc = "b401f5bb665569d21c1eb47282ae24ba987fe1f042540f98cacbea4cc3619df4da4c63072a0ca8a38c34cc0ab236b8c87c47ebe5982882122b229e3c8a545489";
+  sha512.source = "cb72f70e9d3cf90826798ac736cf72612b07d80698b5e3d23fb3006e1a663f0f0b47adfa3e74e80a9232a8d3a97de29a03807f4b883b8c8055cfc73eda227959";
   hasRunfiles = true;
-  version = "4.43";
+  version = "4.45";
 };
 "glossaries-danish" = {
   stripPrefix = 0;
@@ -13880,11 +14346,11 @@ tl: { # no indentation
 };
 "glossaries-extra" = {
   stripPrefix = 0;
-  sha512.run = "419da7c981304d369dbb6dd342bc5315d84fe248793df725e454841b25ce2b5d2204e76e84539bc4bd71025115b9369944cfd8d879a02a5a63fb3cca11d0c977";
-  sha512.doc = "e2244e01f9efc52e629a50491543ddf9b4f441be5afd9c185923a9eb23d9ba01208e90fa4a7c05e11072fd5f05246c30a4a48e9deaabb1207b05aedf38ba7fc2";
-  sha512.source = "a11ae8c79f40f47ed05081112f811242b5b5192e35124fdc6ce628c1a2c3cc73ae816f6ce43f9804c783072f9ffaef1f5a7bf9744b7439bb754cbd588b948729";
+  sha512.run = "0ceb8bf5de2ce8b5875abed3693e77f748eaa391c91c97dfc178c2ff2140865e75e218e021b6baa48d3d4125ec108265e8710affea8b0bf6db50c79771fc5abb";
+  sha512.doc = "5569cda0e9fed35bcb534a8215d1909968786d4ff5966d04b629a2c576b93c28a211c8c103e1ee9082d9ffd22699989ca43a3aae975c0c21f9d734e5f8b40f06";
+  sha512.source = "c75916555ebf52a3dfca621cb39ad3fc56367859d656510687c390a954136d6679363d9df00e3b2ffaa167e9c4b13741dc25fbbb0f5a1c6b6d1b0cb5ced749e0";
   hasRunfiles = true;
-  version = "1.41";
+  version = "1.43";
 };
 "glossaries-finnish" = {
   stripPrefix = 0;
@@ -14039,11 +14505,11 @@ tl: { # no indentation
 };
 "gnuplottex" = {
   stripPrefix = 0;
-  sha512.run = "1d1f271fb02e7cc8e5a5fa563d4ff30269fa3f6a33f0acf3eb833998dc22276c0ada1ccd751588987bb2b6f2dd9aad2fb6c44caeca47953c2ef7c5472dd50dca";
-  sha512.doc = "b782fa72903c4de4aba803b0e3b888f4af5598cbf8c82a94929d0a5148f081ed45d6f8339f6a20a97b8ace731e2039047173e4fd02d795b75cbd2e5bbbfeecf2";
-  sha512.source = "5101ea2848d49449f0899e2a3b83478291c03b439c92d2033b56a0f01bf4af628f592cfaa44ae113388603ee0c4f0588cc08e226de4ffd01618ad785d6d1ae07";
+  sha512.run = "2a7a885bf212c0abaad8bf9f515b6d3743c09cb8e6ea21a3fa95132664a8724ae549d2d91a630783959b16c83b85bc54fa96fb281f827d33948cc9476c04a3d2";
+  sha512.doc = "b4fc6a585bd8b86eaa5dfd6ed0f68d557e9905b5a0b8f6dce3aebf4b8cc1dbb7e588b9e73ce39055ae47ac56e837f882acbd10be94305272d47d29be7eda17d2";
+  sha512.source = "e2248f82d7f6bf47b931e8fa9f1c332c9f7eaf8459b55ecfb064c0cf488143093ae57652f3ed57d125a10d93db49cb8c65d319c5a11a8d4f26a9c825b394080a";
   hasRunfiles = true;
-  version = "0.9.3";
+  version = "0.9.4";
 };
 "go" = {
   stripPrefix = 0;
@@ -14145,11 +14611,11 @@ tl: { # no indentation
 "graphics" = {
   stripPrefix = 0;
   deps."graphics-cfg" = tl."graphics-cfg";
-  sha512.run = "56507f63739bc8257e849d77f08fe2a4daf70ded39bb474d7da6dc6013ed6484fff7505fddacd445d6510848da6a955ab15e1752e5abe566fecb47419d4b9000";
-  sha512.doc = "c938e463d63715e7d5803608ef567d7dd58fdfed49acaad19c079c30239ef9d5738d2308b1178b9a77c06b472d91f1e42fc724c56bc34cda9885d6e7d1f3a899";
-  sha512.source = "057f7744323cf220bdebb07ff17f5f83882b3f0b35d48198bf1e7503d4f67b2c0db770c81d7ca21fbf7b7f7c38e8036520d8acc71f93e2652c8b92de2d08c3a8";
+  deps."graphics-def" = tl."graphics-def";
+  sha512.run = "e46cb5c148958bfb538bfb0a3265f4b33c9f950285e39f9e7bb8bf2e8a5bf801a2baff9bee3268c072ed02c8f84097a4e7dadbd5f2a2f50b92fb8e7f9585f03f";
+  sha512.doc = "5b978813cf8fd00523cae6b543af0ef2f50544211a2fab6d2be84d778cf6c720ad2c4c91ef44cac21719358568c5728892a15b29e0b1858d61592d6b196e5479";
+  sha512.source = "bc052e0d9c2d0ee0364511b1faf6965f656fff76ca7961598ba168ceae730e22b962adf130ee5f7b2a44a77cc80f8d54eba3a1438fa3aeb5d400994560bc45c0";
   hasRunfiles = true;
-  version = "2019-10-01_PL1";
 };
 "graphics-cfg" = {
   stripPrefix = 0;
@@ -14209,10 +14675,11 @@ tl: { # no indentation
 };
 "greek-fontenc" = {
   stripPrefix = 0;
-  sha512.run = "11b9fa2b314fcb5ba800ba800be4b88935ad2f56f4fee0209d3ca5dae9bb120a9267bca723195a9945535e24f4cb883b08ef335c1db1061773e1ea91a42ec132";
-  sha512.doc = "3fd4d1459679fe228006957bc194a2603b3064dee8312e5dbe52bad517192ed58fdfdbcb82477a30fa80ded661d97529aff463ca468c8e9d72073a75ed58f958";
+  sha512.run = "4922c34492ad12bf9d60eaf8ea8b5c40dde4fcff13ed2400a059f2ee53f0e15481d96535db582a1439e52f0ab0541618ac52a8fbf871397c5cd197cf964586d0";
+  sha512.doc = "ea33ea77cc01ca580494588e6cb00002f456859f9e698533b32e712184729d0e21d47296c594148dacd0e6adfd9349a5a7b533cea78316ac1a099128105bb633";
+  sha512.source = "c52b4980244acb31be51b6b1e9cc792ad34c3845e1ef4bb7acc2c749887f886a9ff595df78758e95deb26289dcd460cc16ca1417249abf33e309c2b26a1ed04c";
   hasRunfiles = true;
-  version = "0.13.4";
+  version = "0.14";
 };
 "greek-inputenc" = {
   stripPrefix = 0;
@@ -14253,6 +14720,22 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "5.2.1";
 };
+"grfext" = {
+  stripPrefix = 0;
+  sha512.run = "a5f68f2bb2ea26d4b8f963a1b8fb8adfb3bd32e3a139dca57e6b45d80fcdd94c5e846549b1292224b9d845fd6a4d0ee56d4c2d2fbfc12c24806eca8551b9dc96";
+  sha512.doc = "4337ae578d9e524e2da8564a1b736eac1dd50c1e4495d027c44f3841eb65c6c494527109e32f00844c17a5973a94572569a429ceb95beec98d2b19e84735eaaa";
+  sha512.source = "cb7dcf9b3860b90bc8618c6d964fb7e9f5e056882bd5e6739a57564224f970ab9cf0ba136ebd88072541b8d169245ccaae90f714392a30f83c73e82281a07359";
+  hasRunfiles = true;
+  version = "1.3";
+};
+"grffile" = {
+  stripPrefix = 0;
+  sha512.run = "3f1f5e4f258e4ab1f51fdb44fa0b49e80df21a6c35dccad16a6b70ad76489cb4fdfff7e6c4dd07821c54543fdaeecae32cfd8037d4920ce60db02be9a2f8fa07";
+  sha512.doc = "2f2285ad44d0c585cd02b85359eb31f885f7c704f6da5f906240c1094ef8d347d33ba6beb31cf34e09a5e39e618a27a7ea263a63d6a887638d8f761e3cd4b61b";
+  sha512.source = "6538e5cf13f8212b5b231637a4abb68bc97330e123432922e403ae7321439bef910a0d1839abf394518ad274ed232c4c2e19671c8e6aaa55e2525708f305c679";
+  hasRunfiles = true;
+  version = "2.1";
+};
 "grfpaste" = {
   stripPrefix = 0;
   sha512.run = "e7c28c38a20e01b05c5839dc7d011ef5769b3344fd4321f68e1189a830a90e6ccf9edd596e248489a0a578b2aa4e5e5f3bd1ec21c76b3dba86a91d5e431d0617";
@@ -14277,11 +14760,11 @@ tl: { # no indentation
 };
 "gridset" = {
   stripPrefix = 0;
-  sha512.run = "e9e9fbb2dcec8932e96655886ab9c4c19ed3e986f033feac7d8e64241fcb41f8e2be5e5bbb47032816626580bbe77611dabe24fba34b43ad53f3a592062b826a";
-  sha512.doc = "b9c0001a5d89d592e9d176f2bf91cdd5fc6363de32e21621b73f9d7c392928f0e39ef4eb17c589469e59e2e865b05e33233d237afd1266f0477ed3d8f3c1c66c";
-  sha512.source = "bedb06496d04f10395ba999f91bb49c4ad6c19d26f3c8de3b1492268fc58dcde72d8c03bea6d646ef75ef65dd843b4459af453ca673634fce164599ac014d50a";
+  sha512.run = "296200c463b67ce45fd7c9625298b5e0b83b730055830b3affcdc0c329a2ebd5f89c5da93e004b056efb63f8e43771824c7f0adfe435461943cc68aea4bbc480";
+  sha512.doc = "54fd48dce732ee11a7279eb663bcadde958f2ec9d3307194000dae2ced43f604a54e44174ca36dec389c9ce8e5e0809849b5c66aebd9527337ea3273353142aa";
+  sha512.source = "fc25880cbaa087230b0106a40d2c945809f09200c7e25de88588ab0075e06b91efd362453c599397e29f5e9a053f9554e0496cf03f4f134bd74678d1534ba07a";
   hasRunfiles = true;
-  version = "0.1";
+  version = "0.3";
 };
 "gridslides" = {
   stripPrefix = 0;
@@ -14313,8 +14796,8 @@ tl: { # no indentation
   version = "0.9.4";
 };
 "gsftopk" = {
-  sha512.run = "d05802963d499c4dc0979a58bfb56a1c04e006b25b7eac4cdeb7659ac6f31a0380e476e933586f4169846f88d727742ae5494cdbcb29995439a4cca5be4c7332";
-  sha512.doc = "7d9fc4dc5c3b4cbc05939332e7286be712a51f74b408df2e6cd9f1c52f81b01104e4f41074c55f74ecd003276f2b9fa2285e875a27c20e16936e78ffedc6a4f5";
+  sha512.run = "cb9aebd7428d10b627d80ea40d297f3e6de006859c7dd713478ff193458494f90017ecd0737376ac1f47638b059e02e8a46ea53a7c56b8561af75f770e214413";
+  sha512.doc = "0a597e2908438fc00fc2bafa7ec635a82b70aad9d7f7e86851a654c0b72b719b8c550be0c20ecf6c8d96627863a48e6a387156ad2c7e71d1e296dd4937d60805";
   hasRunfiles = true;
   version = "1.19.2";
 };
@@ -14428,11 +14911,11 @@ tl: { # no indentation
 };
 "halloweenmath" = {
   stripPrefix = 0;
-  sha512.run = "f56079b815307a59054559a0edc8c0d3e9e4138b0d961f81282a80af5ae579e4e3a2b18a3722cda0b49c014b834c6bb76971862e7e0740e0130b2f89d27318e8";
-  sha512.doc = "0ec7d77114ab6296be8c7b38b2a6dad0cf5cdaa9c8bc833df52e89971b5d71e3cd6f026e02d480e8cbf1ce1b4231563463524745ce0f76be279340cc03550d4d";
-  sha512.source = "84dce1251e7fa939233322d5a74b41225e9a2d786af0f49b8a4b8df962ee1fda46ac492122fb361a4184ffa2c6dfd5bf2967f577b3a9b675900f3ede8015d790";
+  sha512.run = "1c897f5582e26a42799065d9b105bde3ab7823e9320912eba72654d00624a3796f468d9138fcd47c32e021b31bffb1a618f3ce0024ce753005236a9e08ed05d1";
+  sha512.doc = "aea1397af446f64f4d8bacb03f0f2d211a44f0f85d93612db840f198a1ed894e1b0a3680005a002808fbe5b8b367f8a8d79b9b99908a4be0891c0d5b43c730e2";
+  sha512.source = "dcefec44ecf9cd8488b756c70624e3cce53ea6cb2c98acd09948d08fa0f4292ea20fd19156189329f30b47a0a3f7f7fee96e633125eb55eee066ee87b09981cf";
   hasRunfiles = true;
-  version = "0.10a";
+  version = "0.11";
 };
 "handin" = {
   stripPrefix = 0;
@@ -14487,6 +14970,20 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.0";
 };
+"haranoaji" = {
+  stripPrefix = 0;
+  sha512.run = "4c137f99d91640c805bfbe9555de08ad1d5e8a2c9aad32d90a3061b8408c8f5cd05ea41150fc09813f02ffe401f517e6cbabf4b5eab4d793b9324e3d00dc2b44";
+  sha512.doc = "5b3edc1a1db549a596cbfd383fc5b8e27d7d523e7276e2a79a7aa81f87314d0586b9f4277bfcf79a4c44e2202c80dfec31266384f9f15cdccd14a251fd6e207b";
+  hasRunfiles = true;
+  version = "20200215";
+};
+"haranoaji-extra" = {
+  stripPrefix = 0;
+  sha512.run = "0f5997b425e157a5b6ea8a4202150c4ee1d696d6ea956c990f249df8db2a5ecb82f4ca25228905ef2b2ded38f13a9a1c35ae444ae9f2f60f189e293947349ec8";
+  sha512.doc = "d3eee236a541e1b20572d8f3386ea9d9dd630f6c1cce638e5afde8291f8cea16cb9e3ae790f09d71733405f8ebbb2de0e7a251b5b09fa48bcde9acdd988126e2";
+  hasRunfiles = true;
+  version = "20200215";
+};
 "hardwrap" = {
   stripPrefix = 0;
   sha512.run = "eeb0f1da2161dae80d292db7b3289a307d892b8967ecf16021b8ed73c5fe724d914dda356bb8fbb48786760698e0060b39349b51886e13289524ed9d45463106";
@@ -14592,6 +15089,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.0";
 };
+"hep-paper" = {
+  stripPrefix = 0;
+  sha512.run = "3b0378e1ee99a8fbda42713c61969c967357b645745959a3e7e3a8a182789b2f2b1855cf13eff2fa9f0c4830b1814bcff52e2503f4c7c289e7d554775448909d";
+  sha512.doc = "5d9b52511d2fdcae8f16c0c9eb0cb4306f18c06e3a97c7a1b3b9246d736f823642bd0e7e178ae4f379445fe0dc55f6172c5c4ea4c7740d94b79b4fdf6b32bd60";
+  sha512.source = "fa35abf6157e74ccdb7d86e1d55d688a2fc7bab06f4ccfd84253141cefd265e872a494204425ee643c35490f695af4566331f456d752444acf7269c75f87758e";
+  hasRunfiles = true;
+  version = "1.1";
+};
 "hepnames" = {
   stripPrefix = 0;
   sha512.run = "ec893de8b4cedd1b18dd16c3237fa79b434e91cbab4b856c4fbe11afef162b560bda18c0fd75ab2c47b863cdcca1d64809a139d51f04e9c2f45eab6ba4036c28";
@@ -14694,11 +15199,19 @@ tl: { # no indentation
 };
 "hithesis" = {
   stripPrefix = 0;
-  sha512.run = "987d14e74f7adb87acc5b9ca44ffcda67872657f48ce421a13a028b7cde886ce6ae70d504d6684f42ec03774b6d1012a7fee11616b9f66ce6d989a2c4594e2cf";
-  sha512.doc = "18fe3f3b8892f69354caa043944fc6dad88b0f468506acbeb08eaa0b220dfee44af5ebd2470e70814205d07541b2eb3ad93532dbf0c1c1b544591eda81e05da8";
-  sha512.source = "9d77eeacbc6738862aeaf12b9af9f9474c90bd2a916e06fe4eed26743101eeea48e64508cb2ac29cb7abe9de56f1d187e4f84d89d0fe8408dbc4c878ef6587dd";
+  sha512.run = "c23d1a9aad18b7ff37380cdf7644b759d7cad35998baf6dbb4593a19d38c85a47e376f06e6cc3b8eb445eed3f59f1e1213d844405b62317507602376b1efc2c8";
+  sha512.doc = "fbf6767efa3bbc7cef8583735e23a7f5a3db1aa2f7b0de8bc276d4728c8627fb9321ca212d010b1604c2e5087f24a947c5794a9d09d3d326ae45ad8d0fbf298a";
+  sha512.source = "7c04ab284c9f5383aceca3fae590ea9612dd7f05cc0baafd3757b4fb5bf647260cf4645a3242392f211db63b239d0d8c6329ac0375f85631bcbf70a38928b9df";
   hasRunfiles = true;
-  version = "2.0.6";
+  version = "2.0.11";
+};
+"hitszthesis" = {
+  stripPrefix = 0;
+  sha512.run = "7bae43ed124d9e37af7d7bed2ec0ea81c9de93f96b1cdde39c292b5f28095e87319ce2fe6b5881baa599b8df6d5bedcebd41acaa2162f38d849b27c098f809b6";
+  sha512.doc = "c0d1220af85f6a1e21f6580f322ef021c387efae3159e319309aceafe8188b0a7dea26cc593ce778e5fcfa458b2a9e0b8fb397df34a0399b00163cb938c77b38";
+  sha512.source = "cfa589b3f4a66a1580d9967c0e2f414b98f67c0ae9b15cdba7b2d12a160554315e9d7e3708c3f0cd631bf02f248ef9e2a97d94ebd225558de1c1b238d09400ba";
+  hasRunfiles = true;
+  version = "2.1";
 };
 "hletter" = {
   stripPrefix = 0;
@@ -14735,6 +15248,20 @@ tl: { # no indentation
   sha512.doc = "ef7b1bd487c496cb2ffc01fb2940a72ac69edb1a5516d19ce6a6e6cb197ba6f517e03ac673b2372cc9cd4f40e5c6ea2469c2712528a10a3f5ba09e9d3a46f209";
   hasRunfiles = true;
 };
+"hobsub" = {
+  stripPrefix = 0;
+  sha512.run = "586189051038582c9303935c70bed67975f51472d28b533e4b72ef341d4d93ad8f313774a5c585baf4b72d607101941f01176892499c7ecc5cec3ede2e28a693";
+  sha512.doc = "8cf2210285b162e52e2cbaf0d1a9e7027ca3aeb7da81ba238fff97a9cb10c7ba9058f5eb4f28303031a7774f457207ace1f30610cef2f733dd65b35d9ab6b1b7";
+  hasRunfiles = true;
+};
+"hologo" = {
+  stripPrefix = 0;
+  sha512.run = "8d1fd73519f0185db7ae8e82ac62957cb958311a5bded23823591157c6c31557b455ca6baa42fffa39d969e42a5fe87b18186dab7d18097e4e30e8589524ec96";
+  sha512.doc = "72a65838829017ca887afe5bdf1f7645209601e267241a5650731a806c08b58670a4934698c4ebf2548d198e0b79619ef33c06d6eccfd5eef9119bee19629105";
+  sha512.source = "0fa9111eb2d1dd0ce076cb831466219be1f18b87e9520aafa15bdfea7636df836e77611e393909b6c410f6bd1aee76b76aa4779317fb4159353098aa95921ed4";
+  hasRunfiles = true;
+  version = "1.14";
+};
 "hook-pre-commit-pkg" = {
   stripPrefix = 0;
   sha512.run = "6fb3009d4bb4016f0d6e92571d52aaf7e3780d39a6b2ec73ffb37112b3f153ed71ecbcd985b81dd841f296a39da83e9004a2d6e6e85e9a49765e1682563cfde3";
@@ -14775,11 +15302,11 @@ tl: { # no indentation
 };
 "hu-berlin-bundle" = {
   stripPrefix = 0;
-  sha512.run = "1f7e2b6dece2dca1334c876cb881f7754bdc2e66eac656c577a416f26873b5fc6ffdf0bf539b446ceb66ad28d7334e3dc340ed33bc59a24a1ebd734b936b754a";
-  sha512.doc = "67ae49666ac397c0cf86eaedfb1b7a2cd0748074b518ecdba2ab9c38f25408f4de42a8293eb3ddbef9724dfb24be1e8da30f3ee5ea4e6bfb9f11c730d622931a";
-  sha512.source = "7de2dba58b4efbe8bd03290fc90c29f6b515abbd74d32f8eb1639a488c5ea98cb4b7a94ca9883d69dbb0cdf16adffad913fabf01ac5184fabf8ea615feb4ddf5";
+  sha512.run = "c81c1260c626d46d2b10a060f03b30b797db0f02fe42535e2311b91ec8db7da94c83afc99e0e1e91a4c1a92bcb95ad766ef08d3b08723cd7750fb6b098c0061c";
+  sha512.doc = "61d85bca6fdb3f5d725eac008be499241d98a3a6fea56f24be09aa0fa470c30dc28f44f670e6d9beda8b02986bb40f23bdf90131bd39fc81cae28480caafb1a2";
+  sha512.source = "2e06738bf926085c044bfc22795db7acc63d3e37d40b6a29687d908c0bb2aeda49d3fce88be7cffa27ef81094da4c5d61309659a2876f4085eb9f6ab1214fd52";
   hasRunfiles = true;
-  version = "1.0.3";
+  version = "1.0.4";
 };
 "hulipsum" = {
   stripPrefix = 0;
@@ -14811,10 +15338,25 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.04";
 };
+"hvqrurl" = {
+  stripPrefix = 0;
+  sha512.run = "3f52fae550f92e379b76bc91b6a4b8fc25cb9ad6bc19c744c6f9ef0948d6590c1289f267681339fc7f596a7c328adaf45eb7c94be45e5f327bd77db5e366e315";
+  sha512.doc = "2f9c4772b34ebb6096da22ffb10b41eef091be66513d1dbb20c4f224c2e471493fa30e63432e19e47b03ca7b248ae178a1a729517ed3108ef406cb30abb6cef8";
+  hasRunfiles = true;
+  version = "0.01a";
+};
+"hycolor" = {
+  stripPrefix = 0;
+  sha512.run = "5269044c5b462f13c78e80d28f7237f2d6e353da98db50267a5c4f01b22d565b0300c689470f6eb1ef9af7b66c1068c1d40d7a30ae01f30e7b3649189a7e7fbd";
+  sha512.doc = "79e4c83b952182ea89b2ae7a1abdafd771359baadd34fce8d573d7449b24908a5bbf515d16d73fd088e7add82c143a458b2c196c125e5b492033cb36da63eb6d";
+  sha512.source = "587ca9470aaa935119d142a970931d89444d2d64ec311ba74a697fa4cd982be999e7e62ee9924dd6028f2b9411657d6b1cf4b6cb9887d08cdb0b969e8a334fd7";
+  hasRunfiles = true;
+  version = "1.10";
+};
 "hypdvips" = {
   stripPrefix = 0;
-  sha512.run = "da692cfec4c9989b313326cf32c00a2602413da7a01b1bd7557ce5bf982fde071e1e4ca6613f0e2c7ff74b53a8edd5cc88c2b8ccc681ea94a46a5ccf97f2d3bc";
-  sha512.doc = "40c8126cb0fe0ee748afe0c46f80fa3a01cb52142b3d8e06168877b8e08a7d35c80e555322ef97ada73f17f649e50ded340836d33eba3d9560143e7f64abe2a3";
+  sha512.run = "515089c437413d6d21c8d2987b8917aca7c046e42c0dc9212b39be1c9119bcc867f70c37087f9f3709db8c9f824ffe16d1b261f34d06d66e12857db9854892f7";
+  sha512.doc = "ef485ca27145ffc614c78547f68d574a0b27cd1a7cd5abd5752681e20ad6612e280f34f85c3e1c753bc6cfea976c9801da1768bda1dcea377c19b138ec9f2777";
   hasRunfiles = true;
   version = "3.03";
 };
@@ -14843,11 +15385,25 @@ tl: { # no indentation
 };
 "hyperref" = {
   stripPrefix = 0;
-  sha512.run = "a05e87f45b52f1e73fda4233dd3c117828d3edf06ae8eeec2657a4c887bd8f7ca65cbb4def4f68a2222b2b586da3df9be7eb75aabf2aefc6c80c7d1f191e2af7";
-  sha512.doc = "d3a016cd4de4003d65dce1382e0b987bf62e9d5e6107fceac9ff78c23cda49f8d35b8b2963403258ae4328e3feb3ac8d4d24936a3937cd4fdd575e854a082be6";
-  sha512.source = "23a44931030ff104b7f2251458401a10133b9352021ff9f316b12026a56485b05c5ac05666c8f4eae038a962ffc2d06be32efbe80af16b2094e8ff6cad6cad0c";
+  deps."atbegshi" = tl."atbegshi";
+  deps."bitset" = tl."bitset";
+  deps."etexcmds" = tl."etexcmds";
+  deps."gettitlestring" = tl."gettitlestring";
+  deps."intcalc" = tl."intcalc";
+  deps."kvdefinekeys" = tl."kvdefinekeys";
+  deps."kvsetkeys" = tl."kvsetkeys";
+  deps."letltxmacro" = tl."letltxmacro";
+  deps."ltxcmds" = tl."ltxcmds";
+  deps."pdfescape" = tl."pdfescape";
+  deps."refcount" = tl."refcount";
+  deps."rerunfilecheck" = tl."rerunfilecheck";
+  deps."stringenc" = tl."stringenc";
+  deps."url" = tl."url";
+  sha512.run = "2efe03b554745ebfdd0939ce93aef7cb048e296115b07129c5d0f16ebd91658bdf216830ee8ab6fcb06a5da72cdbbb148be65dab10d60a403985f79b262768ae";
+  sha512.doc = "15d78301321738026532c5bcf926f4e20d2eac8b66b87bd1b38b79b3785029f05f8abe4a0300d23f2bc68edd923bc0e49c01a32b81e6493faf3f2f04b2c11881";
+  sha512.source = "94763191d72329744ad2f76c08dfdce5d0b320a31788d13db61402a7d42284b002d35fb70ccb7272547e18a8482947cee1f3e2558a1d08c88990737eb84a3b8b";
   hasRunfiles = true;
-  version = "7.00a";
+  version = "7.00d";
 };
 "hyperxmp" = {
   stripPrefix = 0;
@@ -14895,7 +15451,7 @@ tl: { # no indentation
 };
 "hyphen-base" = {
   stripPrefix = 0;
-  sha512.run = "e1980b81a98b82da2e590d08ae5873529041f3b048396d9bd1c3e644e6e8a48a8eb2040ce120462a9e844353f8f0c3fa93c38bd7492d35d390525fac69794503";
+  sha512.run = "f7084afba6bb1e38629f551d3334fa6d66d0fe0a9450980911adf7f3869e46ab486fde0c2fb3ee1dd6358a4d9cc4aa545302e552f1a7b07a0329e6f556c465d1";
   hasRunfiles = true;
 };
 "hyphen-basque" = {
@@ -15390,14 +15946,6 @@ tl: { # no indentation
   sha512.doc = "586dc66004dcf4abed254d223394badd45557d79c7e1b56bd20080f41185ea8dca28b3d501e708cc3ed4088f1368f153ba2d2af313d5d6add2d072b46954952f";
   version = "1.0.0";
 };
-"ifetex" = {
-  stripPrefix = 0;
-  sha512.run = "0f814eded272bafb38e04d7df845f002382c1f87854f8eb8dbe41e964383d3390f5f44973d0a23461568700b7a3ed0f837afaee360c996fe17fd7b2473256cbf";
-  sha512.doc = "34741cc3514404ed1327c8c621926cdd2c24a5ca655c24b9e6157e0623d61b4e2d9bbb7df3bb396251e564d59eeafc9eeccc5509914eeda931a43b9d8b23df94";
-  sha512.source = "4904d2d78dc8cf67cb3d4b2498b391f290addac86d07fba24a76dc16446ed10b18061dd32e4890fd0344e10bc02302a13cf3a16cedf9033591f35f0bb4ddd00d";
-  hasRunfiles = true;
-  version = "1.2a";
-};
 "iffont" = {
   stripPrefix = 0;
   sha512.run = "a2a329da661f003edac0e0bc701958e0744864f8693ffccce7f1ea6867eaabe7d71b38a1dbef8bc27f770e8b4c30a4480ede1dd575d26860095575020db987f6";
@@ -15406,14 +15954,6 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.0.0";
 };
-"ifluatex" = {
-  stripPrefix = 0;
-  sha512.run = "b381103b0f9bba985d7d8eab15082207ae5ec5b12c2f656101796a2a6f5ba023ed068ce06bd9e960b23d8182baa3c3d24c63050ac35a924fd94b5b8e38024bcb";
-  sha512.doc = "12fa539de223618275f3484a7c803dfdaa3c7ba7deabed7c591605beea2aedc88d48c2b66606c4d5a208324a4fd385474d911e4f6489d0b68f56c504f0e459ab";
-  sha512.source = "221972938c4b52a57b569b0729f04b517baa703a7e9cef14335512ab3a0a401bf0c7a131b8c7af7c1d6727073d3c2f21c9856608307eb612ad2861d5fa83e40d";
-  hasRunfiles = true;
-  version = "1.4";
-};
 "ifmslide" = {
   stripPrefix = 0;
   sha512.run = "c9027b8bb34f15e667e530a8b8d57b793ed16a7ea33feabe58f22cd71230945905054e01853561f4cbaf5fe22f4aa140cbc95072f375d567f57bcce3c4d07d09";
@@ -15455,10 +15995,10 @@ tl: { # no indentation
 };
 "ifptex" = {
   stripPrefix = 0;
-  sha512.run = "56c72a37f02e87817736a8c172bd031293e63379a15a01c727f5d0208e6bba1900e06383bdb470d96edec80f5151eda05c5ee28bdbe37943e07d6d846f0f2a93";
-  sha512.doc = "47aeb2a9e1f9b1b2ec102fdfbefbc932f0a0b5e7c89819609b5b6456dd8c50effbd05ab7eb24d65d40bd4f9065baa5aa5aa008e613a23a10bcc5bfe44e651377";
+  sha512.run = "cd06bd01d071c091962451850de4cf78c0ed7604b392e6c0eb59fd66b202ed9f015cac75b6260bfe071b70246cb1d9a70a5bc9f052876469ace54a68ef250e22";
+  sha512.doc = "6d6668a5f663aeeddd19c5f8086633d6542316807d0dbfc94e8ed1991136dc2258718e61a450dcc3c1560af3d349519ca2da98a05964741083dbb66ef85fb848";
   hasRunfiles = true;
-  version = "1.2c";
+  version = "2.0";
 };
 "ifsym" = {
   stripPrefix = 0;
@@ -15468,10 +16008,10 @@ tl: { # no indentation
 };
 "iftex" = {
   stripPrefix = 0;
-  sha512.run = "29f81db9d89a5802558a0e6abe9718863d1cbfa3f456aea211da5c6c6e134aaa47ddcb3b35cd2c4c77c06c2a962aa0687410dae2963fb02ebb69c68ff25784b3";
-  sha512.doc = "59bd612d82b2f5d8bc3e5d978a61db54f7626f779ad1c183e90fc03e998b73608cb54263ba352748763a9cad657a24fff51ad15e71d5dfc0cb36c7cf65636045";
+  sha512.run = "a40cf1fbcef9af4cae18c045c051fd63fa6e1403ae83b12d635317bd60e7f677fa0b13252ed272a8855351bcf139b2bdac076a3c74b5bd93059a4478bb2d8b48";
+  sha512.doc = "f499cb46462f43e89d76a84f8c32983bd332a502764c8e0a5e88ecc696c35470f663719e443a36b0740cca40a5b8d9e03aeb8f1a93bc375900eae9f2a05607b6";
   hasRunfiles = true;
-  version = "0.2";
+  version = "1.0c";
 };
 "ifthenx" = {
   stripPrefix = 0;
@@ -15480,14 +16020,6 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.1a";
 };
-"ifxetex" = {
-  stripPrefix = 0;
-  sha512.run = "44642709a4936cdd65d9cc25480a34bba64e3ea38426ac6566608cb40b54fa82fb96067680a70d8234bb448c3a3423a43d565014860194242ad86995dcfd200f";
-  sha512.doc = "231969b2185c83eb9be54abf7bd06797d47bef253198fa8d73df951a4f7fdfc7218d6155c971dad77546767e99e476bef169df1fac13146abee841a10b257fd2";
-  sha512.source = "59e3644df1afddbf83fc0b8db58290b47f0d7065fff81535b3bde024bfb6da80c62751763aca5c2ba494ea7bf2fbac3ebf5f4e95579af4295916ce1a80ee1848";
-  hasRunfiles = true;
-  version = "0.6";
-};
 "ifxptex" = {
   stripPrefix = 0;
   sha512.run = "7bc52847fe21879614ffe673ebec74c735c70e07d63649def00f70d22db80faa920f0764f76c5094ef982abbff8202ca55410ee92d033c45ec43fd25adabb23b";
@@ -15554,8 +16086,8 @@ tl: { # no indentation
 };
 "impatient" = {
   stripPrefix = 0;
-  sha512.run = "d66e22eadafc2de1816356c60151578f7ae7b1b7136ebc9cdb4e1a32e019b4d403af2f19d4bfb15d8fce4a7e48576e396cb63dee1a07da6d013e93fb09421423";
-  sha512.doc = "dc557d4bf80acf430ba867a0767e17ab2ffd57acda5d811f38144b57ec19ee797ca64fa01487704a90c3eb84ebc14610719370af358d60fa392877d4133a49a0";
+  sha512.run = "dbb5efd07c2a88643c5b49a9d835061ac13c1dbf4356769b30b7d7ceff8c29d75b3abc00dcacc9cc901a449bf18b95781916f9b33c3917e86310b0923033301c";
+  sha512.doc = "7558bb2138f0b09179d3979f46328366a410a540e51aa59380c6c5107067dd5b9b350be2f38255a271f75b01bf4669fd64e75fae7fff88d4239b459f70cc5988";
 };
 "impatient-cn" = {
   stripPrefix = 0;
@@ -15577,10 +16109,10 @@ tl: { # no indentation
 };
 "import" = {
   stripPrefix = 0;
-  sha512.run = "d3b1d7fda67d0f685a7f338dfbe37199c40a4ade516d482b12efe03b5885eecf1258dff861dd17ca98f267cb12bcdee05178949dce192c2e8336d42209029e3c";
-  sha512.doc = "aed56b21c2b10e94f72ac15c7b892a6aa2b0a27f50e502f49366ef73c72f71021a85ce5aa4288f48a09b941c189bc0477d040ae83f9b52a20db2d23160fbaa5e";
+  sha512.run = "21f83a762b00d159f157807d8e2bb4eb4737d3989f2d01b4943e6000b6f7b4791b084b39e532ebd34443c90cd213d7889c319343e64f9eaae6a06314d7302810";
+  sha512.doc = "e3d3016d04bb3b069f9dd291447fddedc3db7c498fcfdaa6b6d44f63e7cbecef7cf4068c92012f57151d2fc8b2a5286a3a2df47e7e65c08ee39ef18b5c2b3a94";
   hasRunfiles = true;
-  version = "5.1";
+  version = "6.0";
 };
 "imsproc" = {
   stripPrefix = 0;
@@ -15634,6 +16166,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.5.1";
 };
+"infwarerr" = {
+  stripPrefix = 0;
+  sha512.run = "a41fd6f2ee199e460950fdd31484be7e949a5e36ca740daaf3a1ffa01103d865f573c8ffe0859a8629456786cabf2f1751dbd828cb5d26356b1973960c854261";
+  sha512.doc = "2830f622e2ea8e5b3427a9d924dd5f45f0c63a8a6de82e261102ca2c3f3afd7b781a7e0d50903dc8d8c1bee0674503f3ab935fe81dd9490d4310650097c4ffa6";
+  sha512.source = "ccc6e1f7a63c10fed449c390b2283ac44b94c33a453f1146658082c888723ad8223bea01b71545d7f57f89fb8c8373f1a8329aab7255b7d17fd36853456cfbe9";
+  hasRunfiles = true;
+  version = "1.5";
+};
 "initials" = {
   stripPrefix = 0;
   sha512.run = "65b2ca2049dbeffca1a425530ea36357b0f06ae8cc744f16471a29dc9f1668023a7edb184d23c80dfdf57d74f24c9425b48a90133f9fa6c794ddf495e3d0413b";
@@ -15668,6 +16208,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.0";
 };
+"inputenx" = {
+  stripPrefix = 0;
+  sha512.run = "5550c1d76a0906f47ac3e2303fc57ef9ad1c8442e12e3522826dbe7fa8c971c7ca4241e0a1707f6e10336855eded20e94130a6db212b787383282326aee8886b";
+  sha512.doc = "087bca2b38a73530b19dba7343cc488b39ab505ce00b4c622f56f9d40c448e6349052e12358cc8fe6d8db7039c6af4f06910784795a2cb1e69b85eed423d1314";
+  sha512.source = "a633d0ba777e0342fe99d1ee8d9c955fe159c4a881f31c46fa205078c3b1786edc2025f58ac88b7dccce0c6bed50e8f44025ebd43b28871db953a34e54b3aad7";
+  hasRunfiles = true;
+  version = "1.12";
+};
 "inputtrc" = {
   stripPrefix = 0;
   sha512.run = "e6450fbeb0f9033b0bcc586c34f5bb8e9c3a6aae102c15912be315d14fe883b8bea62a59a4a65d0ebbfa9cebcc518b9dedf59297f026423ef14aed2c0a2004ab";
@@ -15696,6 +16244,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.7";
 };
+"intcalc" = {
+  stripPrefix = 0;
+  sha512.run = "e1087a7ab3f1d695bc20435ef0bb2b806d1cca71eb792fcf46e6c2fc6d819de2ff623a65593b65d5bf228309e3e3d5210ae1fb1452356f97a5ecb45921a7ce0f";
+  sha512.doc = "f3cc5dba031957d77cdf39d902eeda96c8405efef52352109a7bfb187e363321d31120b4c66ed4b2e990fbd7085b927599a0956749e4303611cdbec5d9d7179e";
+  sha512.source = "c3fc56d3ece265756a6c19684e7c2f9717df7f65176a640bcf6fede941468c8a426abb610ebf9955de920adaf2c96165f91f7314f48701121dfc4381f921d42b";
+  hasRunfiles = true;
+  version = "1.3";
+};
 "interactiveworkbook" = {
   stripPrefix = 0;
   sha512.run = "2afca3ee8051065d4014cae8ee751f085abe6e62ea0af7d6c036bfd9ae6c3f38a295857d67c7e8f75a049fd618c82ad8b28a66f5c83a387969549cbf20ef159b";
@@ -15808,6 +16364,13 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.5";
 };
+"is-bst" = {
+  stripPrefix = 0;
+  sha512.run = "491b40704ad4c36e7ffac12bd5b823a4d796a9d52b82176cbd9654b6fe07d3a8a0c63f9756070bd4a971a33836e179ce6c7609e5de2eebddfac9c6aaecb92b43";
+  sha512.doc = "bbd5aa6261779b7d395a89c04421c680b6906f795ec713b9c72bbdc282fbf459c443a08ccc7c395ac5274ef5aa1b3f56cd773e50faa7ced4ab4629f1b91e73e9";
+  hasRunfiles = true;
+  version = "2.03";
+};
 "iscram" = {
   stripPrefix = 0;
   sha512.run = "6111c93a14c28572c17a1336fdf00ddd16b6c04b34b4a10a1b4a5e46742852b949cc99438397895de36632c9f2fd57c4940a0ffa458ac148b4a5e49707e5ca79";
@@ -15939,36 +16502,55 @@ tl: { # no indentation
   deps."pdftex" = tl."pdftex";
   deps."tex" = tl."tex";
   deps."amsfonts" = tl."amsfonts";
+  deps."atbegshi" = tl."atbegshi";
+  deps."atveryend" = tl."atveryend";
+  deps."auxhook" = tl."auxhook";
   deps."babel" = tl."babel";
+  deps."bigintcalc" = tl."bigintcalc";
+  deps."bitset" = tl."bitset";
   deps."cm" = tl."cm";
   deps."colortbl" = tl."colortbl";
   deps."cyrillic" = tl."cyrillic";
   deps."dehyph" = tl."dehyph";
   deps."ec" = tl."ec";
+  deps."etexcmds" = tl."etexcmds";
   deps."fancyhdr" = tl."fancyhdr";
   deps."graphics" = tl."graphics";
   deps."graphics-cfg" = tl."graphics-cfg";
   deps."graphics-def" = tl."graphics-def";
+  deps."hycolor" = tl."hycolor";
   deps."hyperref" = tl."hyperref";
   deps."hyphen-base" = tl."hyphen-base";
-  deps."ifxetex" = tl."ifxetex";
+  deps."iftex" = tl."iftex";
+  deps."infwarerr" = tl."infwarerr";
+  deps."intcalc" = tl."intcalc";
+  deps."kvdefinekeys" = tl."kvdefinekeys";
+  deps."kvoptions" = tl."kvoptions";
+  deps."kvsetkeys" = tl."kvsetkeys";
+  deps."l3kernel" = tl."l3kernel";
   deps."latex-fonts" = tl."latex-fonts";
   deps."latexconfig" = tl."latexconfig";
+  deps."letltxmacro" = tl."letltxmacro";
+  deps."ltxcmds" = tl."ltxcmds";
   deps."marvosym" = tl."marvosym";
-  deps."oberdiek" = tl."oberdiek";
+  deps."pdfescape" = tl."pdfescape";
+  deps."pdftexcmds" = tl."pdftexcmds";
   deps."psnfss" = tl."psnfss";
+  deps."rerunfilecheck" = tl."rerunfilecheck";
   deps."stmaryrd" = tl."stmaryrd";
   deps."symbol" = tl."symbol";
   deps."tex-ini-files" = tl."tex-ini-files";
   deps."tipa" = tl."tipa";
   deps."tools" = tl."tools";
   deps."ulem" = tl."ulem";
+  deps."uniquecounter" = tl."uniquecounter";
+  deps."unicode-data" = tl."unicode-data";
   deps."url" = tl."url";
   deps."wasysym" = tl."wasysym";
   deps."zapfding" = tl."zapfding";
-  sha512.run = "7a284d9eb0639b64299b59a3b29cf939786590ee7eb289a7f67793ac10b8945272116015d7ac8732870eca5a2751e17e9d69946664620cd8617d056f505ab85a";
-  sha512.doc = "00014ee9e648cd179c8435c1eb90c804f8904ed890ab1c3f93ce8a8e04785a493682b4191c1790a1c0945761fa193b6c6f759e852e43445e896b0c97870247d4";
-  sha512.source = "a9e70b48db9ee9fe389889acf512bb9db9010fa61e19aea210129098781d8f6f211548b1392ed2299945d7bf24cc213d43fab2fc7f792ccdeb8dce6ec1dab09f";
+  sha512.run = "5aee50d3e9bf30a413222e9432ecec830b8556f81913b5e02bb7bdc06a42799f91895f32a9aa059f304023e36d67c8ded0006e83f503b1ed831345ae6b8a7a31";
+  sha512.doc = "5d2a95dbbf86986aff08fd66f8ec1c5092d79dc5803a7d44e98bbcec722edc594595db1c7d646d2923f894ab48c40dbc2904e5186ae659bd8e94906409892731";
+  sha512.source = "c156127a7bc71c6987339cd0ecbb7b81a6f474d42b53ac583bf6380fdf6680b646582db593b646139fd93a0dc40c79d962f874840db09f438824ca1762e4dd25";
   hasRunfiles = true;
   version = "3.13";
 };
@@ -15996,6 +16578,12 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.24";
 };
+"jbact" = {
+  stripPrefix = 0;
+  sha512.run = "0f1cd72dca41b37c26d863aa734737ad128f5c39c508db13a3e91e4088477a99d9978aa1ed003ba0812e276bb4d80e527c80915cd7a08fd1cbe968816359814e";
+  hasRunfiles = true;
+  version = "1.30";
+};
 "jfmutil" = {
   sha512.run = "8aa9ff7477739e75824f7c7242a02cf6186fa1a7a37ae145f7fbe989d6a7fd774c0428c60575609b235cc8d1d4f0f108cf6bdd7cb1003a0b12b6b6700e9414ee";
   sha512.doc = "b607607ac051370a5374d57f2aebe33a2763029bee0e7cd8816a614e3a49728d4ef4777ed5c8de4d9f09edfbf3524959c3f8e644d811105e5c69d93496ea3dca";
@@ -16030,17 +16618,24 @@ tl: { # no indentation
 };
 "jlreq" = {
   stripPrefix = 0;
-  sha512.run = "adaa5b508bb35b7fa362f9a8b533f147214eae0b779169d2e35689050548c6245f29c10527dbe437ace467f176deb7f5d8a2f19ebddd667b29dc9edeafb627b1";
-  sha512.doc = "466f1083d06639d983b1e2d6b4ea502bf7e4c70e32de27f58c2054cfb4197258537dc531d3ed7b1a5d1d2cbd3753eb5fb67da73aaddfc757429622c2effd33c8";
+  sha512.run = "0f51670a5cf6c7e7adb2c0c8b5c155d67574ddc5d1c73026bf18a5f6f4cad26bb529a98d32f82936a2740184bd6ef4dc04eeff1b194a2439af9da53f6c173c18";
+  sha512.doc = "8bba85d024192315137fcbe494a2ef3c397242d34bf1278dfb6ae54115b8a6bdfe45206b5abb8af89ba39dc16e97d4546ab05d312d2d8a0fbf5cf26ba1ebfba4";
+  sha512.source = "e8e1c0723a61c1e75718382af0648eed242de51256d16894f5bbb84bc0889703de83b0f3582905411ce3f5a8d94bc6e7c97752f4ab1708d0c944b59e57672101";
   hasRunfiles = true;
 };
+"jmb" = {
+  stripPrefix = 0;
+  sha512.run = "6317f3437416ead3fa1224432bd2cae247614e614f888ea074cfc442b8c7c3832d0243988269a1d772172008fa377b142288f9644bb1e2954c3758c1b75f78a7";
+  hasRunfiles = true;
+  version = "1.21";
+};
 "jmlr" = {
   stripPrefix = 0;
-  sha512.run = "68e236de2bbf2e1658b2319f5c6ce8cde914c8be03090c0ce2893e8843e5410c477a9bed4cd5e5912c69fa4a268ec1ba5ed13d04f2f49395d60f0c72a41ca44c";
-  sha512.doc = "3b42e6e17818bbd8280e6501561ea746f754ba9b9a4d7483e7b74b40cabbf1bb634dcc4e27677c1f8bc68f932fa03a739cfe5b928ffc8d4ecc0872f263f352f5";
-  sha512.source = "706a99ddc53804b5d61a7ca8f65fe6acb7632dbaa8d3f7a4e9b11270ca5da1d38d811c2fd9ebd9bc5d4aefeec406f36cfbaaad0644051e59593c297a35abaa42";
+  sha512.run = "bb293ba280f8b0d15fc2d3fd997a8992f0664d01bf56d42151a6f71633d077cff751302188c857b4f6c8d1381bb37f1807c1c3ca85ae0427846aa1189aeb5c3d";
+  sha512.doc = "d32cb5cdaacf8c865bca05ef170cce5cc92f0a5d77a33162ce5de6e4f8e77c729d876afd682f1972e3207427557d68ca9a822ab3a6ec9c08b1db7241acfc4e47";
+  sha512.source = "fb5da231bf161f0ad32d0c4617337aa36a5d443bbda0e2def547434744253b5476bd7696fd4bd025ef601a7a71800e6013213e3e5357ed7fb2956be4c0cdf47a";
   hasRunfiles = true;
-  version = "1.24";
+  version = "1.26";
 };
 "jmn" = {
   stripPrefix = 0;
@@ -16056,10 +16651,10 @@ tl: { # no indentation
 };
 "jnuexam" = {
   stripPrefix = 0;
-  sha512.run = "2dc1aca90383740ae471a096c82e99b613841305f55d960b861cb3c3c1ae920caf8386adc56f6f0f5908b412c399a12fe69648820525ee0ec5edaf6cb7e46c48";
-  sha512.doc = "0a87e1920d853a08516ec039f4f87f7c2d9bcf28a0e8e1153c6748f9fc067a9fbf1d168e7f96d4dab59961d288d514790d79e31da7a117378055252f8cf9531f";
+  sha512.run = "9fc6ed0fc12a0eec779a511de2582cb6278b4576569cfad310a26bae0ae024336b335b2ff9760f0055463302c51933ad291a25f542a7974c56e17c3013c480c3";
+  sha512.doc = "b9650a69d2f8b7c78e165d35c3b8cfebb8e76886f5b20a0592ab6b50ec63a659c5b76c6cbe02b8c5aaad5a7733623fd8c73bed624dbe9651bbb2263339f9019d";
   hasRunfiles = true;
-  version = "0.5";
+  version = "0.7";
 };
 "jpsj" = {
   stripPrefix = 0;
@@ -16076,17 +16671,17 @@ tl: { # no indentation
 };
 "jsclasses" = {
   stripPrefix = 0;
-  sha512.run = "3ce4b069c3446c5a7973bf9e26b3effe276a827aaf8658068193710c480f1f32bc1299ff008f760df7945ead776da164130eb7d7d63e09dac2aa6ccd0d19222c";
-  sha512.doc = "ce4144322f2a1b3cfb4a3197ca079c59fd775f2ee0443bdec29f713bc98691245c1ab95e0ac6d685df48db13abe9813bb42344c3a3e7924e221d6f1c4b2e84b4";
-  sha512.source = "050f9eb1c70a37d3ab789e0ed5bf168cf91f515cc647943842503606c22eca20a0c701f2b80d63ad4d3d662d3d78fd5a2896c95577f60eb89ff4096df776f177";
+  sha512.run = "e9a932b1a667b049283eea0a75d12cf83513b4d4f97d50a8c9f4a820e139fbd922c8448ea226a367be1450ab96e2184ef4973043589e0f84b8a1d55b94931ebc";
+  sha512.doc = "b19caf831b88256aad481a50a6c3cd73f088d7a8514476b7b8c04be39990b341d79437b4774a3291e4af8cd40aadc83cad75fc50f1b8fbe91fce0cd366f0c0d7";
+  sha512.source = "09ecb81467d6ba54254edc317c375f858b8e7c978e4bd07667fa2456b05b142e653de561ed2c2576fc368f1ee9bc4c20ddd02950458997b5600269a887317cc1";
   hasRunfiles = true;
 };
 "jslectureplanner" = {
   stripPrefix = 0;
-  sha512.run = "a60f38383f72ab069fbed0de38fd139bfe2c446c0dbf566e3e78c842bacc27b0a49e0595e4764645018a73f57dde31c4f945e2ae77978827e35014a1d69aad57";
-  sha512.doc = "f52f3c0212cdffbab4ebb12ac99a07e3f496774d89039fadcacd2d96d9f15fd508c7d7a759e440fc69a4b17aeb7b38781fe6a2566217bfbac6b59782e1e4ed0f";
+  sha512.run = "9da09cb979caa5ea54466091c785bd6c66e46b93c9182ba426884cf973cd1a9ad0662e9d9053f8749862ad237e7379fa83fae3a43de96712e59267506e0090d9";
+  sha512.doc = "758ca6441a1ed9eb9ac8a8445cf1a3bb14a796d888aeaec374abdeee824c1578e5ef02ed204cdedb17dd96ef5ae35f42a8b32ddc826a73d638ff3d250ea259ff";
   hasRunfiles = true;
-  version = "1.8";
+  version = "1.9";
 };
 "jumplines" = {
   stripPrefix = 0;
@@ -16097,10 +16692,10 @@ tl: { # no indentation
 };
 "junicode" = {
   stripPrefix = 0;
-  sha512.run = "e35652c1bf36d48b5e98264604d62cfd25a0a69891b1577d701d75944e859435bf156ad70f808ccf2dd74f8fed963eb3efe5383fa5fd18b341932b7ceb2fe9b0";
-  sha512.doc = "f2e31f4459adc639f6dd36654c82871e1e79ec24c5a2a864b16ff3d4fc230619264d958e7915da9444bde9c6cf828f9c919880fa48a4339ce7d867adbba2e950";
+  sha512.run = "a0e447471da270a19659d19bb4e18699eda7447ef65b5c5abea1662ff6ca631ccf1a4c0efbb192208a835d8acabfeb51aba3c576578c7e40c13d6d28e727cbd4";
+  sha512.doc = "f692c94008d88ed2b0b0d91678072cee6cd379e5a3fe58831a69393cb2de3058c0e7320409385a2112b41c9369255ddbc6919520a222adccb38223b5b2576790";
   hasRunfiles = true;
-  version = "0.7.7";
+  version = "1.0.2";
 };
 "jura" = {
   stripPrefix = 0;
@@ -16217,9 +16812,10 @@ tl: { # no indentation
 };
 "kerkis" = {
   stripPrefix = 0;
-  sha512.run = "80989cf32881e82a9111bf99cee96377b8e315dc4b36af014653caf551fa008ee453d342710b8a5308d01654c68bcd0beb7d2c868f81354a699522379ff95061";
-  sha512.doc = "bd7d84083fe8d07a8e3fa7aebe9964771616e6a8429888cc11188ad7ef00912e92399cdc56ced9b67e2a7962af3bcdd5d99fa183e6760b8458427c19f79b354b";
+  sha512.run = "07d24ba7d57e46d8a2484ed9a7633cdd42062f99c9c48b0dd385159707dbcffe3abb2fdbf8dbb3a22c2532ae86e0c4ee6709edc0eb9cda030f78f7563fdc3646";
+  sha512.doc = "d6f17d255a04ad88c9ddc6a1f50a18e98a06222d9153b6fdda96bb9858bc7bcf26ae2797e617e69c6b701eb5705d71f29ae4644c98eb0c4af9e3db00cf929250";
   hasRunfiles = true;
+  version = "1.1";
 };
 "kerntest" = {
   stripPrefix = 0;
@@ -16230,10 +16826,10 @@ tl: { # no indentation
   version = "1.32";
 };
 "ketcindy" = {
-  sha512.run = "38c3963781e1a880ef3b8d2ed5d21f7c64f9454ba1fa01385592fde62815c935594d3f7d1a1ac5e77d709f012034a194ad9c4f78c06903a12ba71be5ff67f720";
-  sha512.doc = "0bb1eb8c190ebe91624b7bc8a1c1cbf922a29200159236d683a1bfc356b502c38d2c2d2051d65104a85a15e1b55625b32025e2496b7987cb7dbdd0e07ff1fdc3";
+  sha512.run = "a65dd1d1ea906ecb1ee232029230005c781066bca2d7192893b5230a06059feed4416b78d4670df104cd7b3f5afb6c3463868340c7991f770026da2294009c18";
+  sha512.doc = "e387f94fb712b223864ab615c26c57b505a313a657f54830a61893cad2273ee82ed362438963ae6447496c57474041ebfdb528d92047e6f6bd214c35d4d37cc1";
   hasRunfiles = true;
-  version = "20190927.0";
+  version = "20191225.0";
 };
 "keycommand" = {
   stripPrefix = 0;
@@ -16282,11 +16878,11 @@ tl: { # no indentation
 };
 "keyvaltable" = {
   stripPrefix = 0;
-  sha512.run = "b7a0fc52feb2a4e4bf6b626701f7d4fcc455e4ebd560389f2ac7eb15e9cb2ba814ed3f179c1662364ddd4fdd899158f863656555e9d3bfe08ab03ac2471c1025";
-  sha512.doc = "277544403f8e06739789396077dfa08b3a0fecb99c8eaf41dc61528d66f0765a519a8314b85196bca5adb733dd1356034b72c9a949fe0d09a845ed3d35ddce5e";
-  sha512.source = "039b27d55b8b51a4d49e8e06cdebf3266633a3ee658f7c99e191d248c27ed05ebae7bb433bc5b242d815a795160e13ab8a0853e92147979a6ac0a1568e013662";
+  sha512.run = "7d60a87919114209b20bae17603f53b8b22bb1b4ec6b9e411488a9e0eeec661376c0f74c7fa0f229c5bbec771b23e1d0fd8b8ec1167a8f98432f2f196568bec1";
+  sha512.doc = "6988e60ca067d77b82c5c339bfe958c0d486c04869c0b74f9c92fe87946079a380a0863edadf136bc54a849f4a751621f649feca591a8d89a402a88453a359c2";
+  sha512.source = "c1b6c85c3c292b3dbcc811fdce7d1e9fc45ae03717e83c317c4623c9f1edbb06a3ef115dbc742be2b440f9642bc8c95e77d33bf3c5adde7a92da7bcb0b008002";
   hasRunfiles = true;
-  version = "2.0";
+  version = "2.1";
 };
 "kix" = {
   stripPrefix = 0;
@@ -16322,11 +16918,11 @@ tl: { # no indentation
 };
 "knowledge" = {
   stripPrefix = 0;
-  sha512.run = "b0b447090a1fe99b3c30d47aa7e3b9dcc6dc7114e37d1eec6cd6fd66d1b976a70bf8e00fbe1decf25b8d0d74c77555282ebf0e4b921a5c28e615191403c57286";
-  sha512.doc = "cd77f5c9880d32e48daeec69fd4b23f0fb1bb3d945a3025f2f62da9c9a4becd3146e9f04033e9b40a4103daafc7a356c6c0796a644d1f4e20a8b26ad84e345cf";
-  sha512.source = "74d7c0a1adb9ec30ef73f755e0b14dc986c69bd85341f0c1dc92f03469709f65f2d84094aa5e8160256e2241793a68c97dc14eca7d6b7ae1f1e2f7d8df178521";
+  sha512.run = "6f5d172b155e7cde0a48ff6fca11e4ae8cdf45eb29bbd4ab9a708f62d25de70c9e3607a80364aa1631b828c954dab522748fe3f651be6583b1918db35e1a5b93";
+  sha512.doc = "11328ab7c3d5f64c97561cf43167323e084d978a65e2f352e37baaad4b89ec6893bcaa8e90360a971a352ed77d9560713eeb0bc902996c858a3584e1a0c1ff67";
+  sha512.source = "bf3d6310aa994cd36d961c20a0f473576e33f5daf1d0a54adef633fc53aebdaf1957e1eda98c31d071d71352b26aecf2513aa4d82a20a1002f9467c060b064c4";
   hasRunfiles = true;
-  version = "1.17";
+  version = "1.21";
 };
 "knuth" = {
   stripPrefix = 0;
@@ -16353,9 +16949,9 @@ tl: { # no indentation
 };
 "koma-script" = {
   stripPrefix = 0;
-  sha512.run = "9a87386ea77897100dc1edb17665ad32cd1282b0243de956c7c1d60983988fd22f54dac9d519ecd7d0b3b00bf619a83ff1782baef6012299a8159d6c5264b1e7";
+  sha512.run = "b8d227da363192b4ed7e4b9dd65e0e94fd3e77405598b8a10e6e16255c4814c524c5bf8238861f7461831d8258d6e00cb2da29f9e3cf61c1260b108a1fb8f92d";
   hasRunfiles = true;
-  version = "3.27";
+  version = "3.29";
 };
 "koma-script-examples" = {
   stripPrefix = 0;
@@ -16417,8 +17013,8 @@ tl: { # no indentation
   version = "2.1.0";
 };
 "kpathsea" = {
-  sha512.run = "c501be99e4de8c65a63e4e9ce4d1c5c518d849e792b36ccf4048c6697c272b511a4f9a34bcd2f3372daae96f97c0378d04348eec7ba29580a9649dfc3e144637";
-  sha512.doc = "e31624b39e972b6c18bf34e513d14b929deaa203d6df8072a783cac661ec1431b28a36dea7b0d0f1793f7a048871c3697965ef5948a400582d618175bb314bac";
+  sha512.run = "69c660f750a66974e2678cff84f0d6537fc56fd1f35ab9eb9485a29d0332c702afbfdddfd29d5ae5275ba5306a7d79867a027c89728d90e725837a4a576d41da";
+  sha512.doc = "fff6708f75f5704698e5d339d3fb57232ea64de7c01bd5eef4279dbf4ee9ab6fb3ae940ce688a7540e14bb062278c701f78d98206cbaa8c9d7a9ee0f60030df4";
   hasRunfiles = true;
 };
 "kpfonts" = {
@@ -16471,13 +17067,37 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.995b";
 };
+"kvdefinekeys" = {
+  stripPrefix = 0;
+  sha512.run = "2a03840307805bd6fe30be9c108982bc472912c11c8cec25737ebc4042e48af8fe4f1a76124536874bea8c554f003a9c52b8a72d2f6900bc6872ffef8649c40e";
+  sha512.doc = "c540045ec1c8bd7fea3000dd0ebc8adac64da7ccc24b0becb9b9c32c9dda6e5e11a77b57bee667bd2ddbddf347bd8af069907e087d543898a92ebaedf3fa4b7c";
+  sha512.source = "0944a3f6f8e8cd8c189767944a74d5dbf09fcccd94cfdd2e67018f4a3542ce2ca4b8b7e3cb440345eb299584707962ed903f2fd8c832fad6cb850b29c7a99af6";
+  hasRunfiles = true;
+  version = "1.6";
+};
 "kvmap" = {
   stripPrefix = 0;
-  sha512.run = "e9482c26c7f188d1bf45e5d577899efbadb221485e037460f233ca3b1fdf540f9984a371f62d5dbafb6bd8d9840c6e26ab3173152ec5b128e9a3522540db7912";
-  sha512.doc = "fe9cb7b39aeda44d826920898c48001406801ba9e651af34ea9d25ec85141e6a0a6cf4eb7f95451c84da5c7716d4214292c7e3f9e442d0ab5aca1c16e17e5c94";
-  sha512.source = "07562b173f46aa4787d3e3d279f37f59418260c9c610ecc476c62cd8c96f7f59629a126af024de5664cc8c8dc8620bf7fa5fa00baac009c62575c2ad47008b7d";
+  sha512.run = "4c860279b96a34755f7ba16a7f3c80557e223bc0a4099f4dd72474abe3073be97026ae2593a24cafa1553b936181eb2fb11c7c47a7b7f264a1146803fffd08ec";
+  sha512.doc = "0e5b4dacb5ee5f7193b418f0b9740e1a3fb139da2136e5939078d8e3ff2b9ae3a909a3559821dcdf5d033e04af062ee42de84d1bab4d360bb20bb6eba057d788";
+  sha512.source = "d514d398f65729d96e69c0a0231bd266be4ce707fec171cd01fd222fe623ba2b1ee2d60a7e26fdc81990e2e585fdbfc33db1dbc9dec8af979e334cfa4fb43397";
   hasRunfiles = true;
-  version = "0.3.1";
+  version = "0.3.2";
+};
+"kvoptions" = {
+  stripPrefix = 0;
+  sha512.run = "af26d9fcf6f3afbd4e4dc105aa84e77bd737649864b3a8b4ba822e1dc62f4fc95e916df704249757d1ba4ec3b8281b510a6c5278b1f82b1a3af558b67790a781";
+  sha512.doc = "6f567a5310250dff8d15de8d0fcda8c6eaf392fd9e221b5ea50c0de0bab44324ffcc42902a9d3b6f13cf6090f5e8ca513b5abb218b0f1827e953d76d377ff1ab";
+  sha512.source = "ccb433710f2337e3663cf295b951e7d83e1fd46420a7dab127ff3f0c78f0f8e82ec064639f9c071f2a1e4ccb454776560bc25399e22fb6621c53c984c75f34bb";
+  hasRunfiles = true;
+  version = "3.13";
+};
+"kvsetkeys" = {
+  stripPrefix = 0;
+  sha512.run = "c5e117a46ab54485b7748bafd5cfd381d28073564b571fd1cda78da70b42dcf48fe054538323cdee7e784aff91cb76dd24361908a4c97213df315f6cb91af583";
+  sha512.doc = "875af5f0ef28b6bb80b19537ca3dc426fb9daf4de8e10dc518cf5daea8f6bc6801832156e5bd978937209b2e9883898b957c8cbe87b51a2b2aeb071445e045de";
+  sha512.source = "48a8299a53c47b518b3461fc960c18d81acd26b90bc58e84756cff28fa34b072d769b55162ab86ebd10fb6e3e1a4486c85c66093a32695636f7821582234cb9f";
+  hasRunfiles = true;
+  version = "1.18";
 };
 "l2picfaq" = {
   stripPrefix = 0;
@@ -16517,39 +17137,40 @@ tl: { # no indentation
 };
 "l3backend" = {
   stripPrefix = 0;
-  sha512.run = "333591d082c62f4455d7e8208857b29fa7c4a9ecd0a29c1e51f326f13f10cbfd7ca71fc2b5a28d13ce6e1c6900bfd414bc2599aa9ffc93e7b29f08958998d277";
-  sha512.doc = "da240912b67819ef4ced9ff48064b5d84db033948cf318cd86f00142cb6ed9e0e31f26bd56e368cfc532f0f10555dda5c2fb52a663bd73a0512cf1735b760334";
-  sha512.source = "404811374a59ec3dd65817ac920639c2ab002f9f0974d53ee75836d507d82cf1c9c93b8d7178911b82713a0f2e99cb0245720152397467420822d84fc093171b";
+  sha512.run = "bda67ee1c48c06b4d399664c352267a3202b5877eb324cf413b7a6ad31d94249333a22bb8b6cca285135c36e46d01cf8bbfb5f2f5c9c8d70f5fe48da20a42a5f";
+  sha512.doc = "7c193eace43f388843c9bed21d1cea87be8a2cca86ac2d8aaaa42da2409dc634628f38c1a51322d76233d2abf82490551685086c458729afdda6d5b3f093847f";
+  sha512.source = "507f472439d2229e501642f6774911bfc8edb71e0758d9fd27d7547822ee5ff5945fa922f760a33cf5a8d2e357ff090260842127cf620f8f11ed4f9a52b53ee5";
   hasRunfiles = true;
 };
 "l3build" = {
-  sha512.run = "c9f28b9d6f84df09f1d3f30a86d228ebe1c0108b235aac32bb11dc605323a2fb04a9b7002e3ad0969ff29c321fa96f2dceff02ff718797f21b2c5de4fe499462";
-  sha512.doc = "f1eb06d0f8a521f14c76581600151a31aab40fff6f43961c971202ec6a17617192c39b14e79224505ad31707166c165c7b08a66dd0ef9950bba6d6293309475a";
-  sha512.source = "a41771f414fda27e16a02b7b6f8d46a864532197a3f8361751db54c66db00ca4014a3742d34831d3bbba7bcd869c1c28ad10adc8a742e7686d923dbf6bed463b";
+  deps."luatex" = tl."luatex";
+  sha512.run = "c18aa191efa5c9af53a7012e4453ad615178e90798377ba0de39434c917c99732799edd3a3b89f719ae4c79da8fe4b97d867778d9cc01db81e6ff68fd9a441f1";
+  sha512.doc = "94eea53a369def65df51ad48fbbcba851d1c6d9208c7ee1475af284752e853c4f9286e70010f494803bc02fe26afdc421143cb5eb659093d2ff0580e0f4c5b40";
+  sha512.source = "1e15ccc9f0b71115935325eb97698b2660ad479f08e66a18634be2a5703d3b86f6953f4bc3570d95a1964d841dc026efb1663923ce962db767aa2711b5ef259c";
   hasRunfiles = true;
 };
 "l3experimental" = {
   stripPrefix = 0;
   deps."l3kernel" = tl."l3kernel";
-  sha512.run = "e69ab380e3039e4b449c811f201e6ad8bcabbd74cfb887e18a2760d391ce7d0d253ef152e2a27857cb182ad867629b5a4a1982ae4253d618bd1f2ab147a42c06";
-  sha512.doc = "40da1995d9b5932dbe4278f0c24ba512f6880c048e04b1e38ea7fdfe47a60ae6b0ff07c2133f7faa3d901b5c5a29716ad8e373256ad65f9684b027e36d734724";
-  sha512.source = "2483730b0b0ab47b55c09f0d51c87f427b0f4c1c5967057a907807f04f3c9fbf977068156ee8ac2ac1b8203feaac826da602e4cb894cca5eec7d6f1ca90b17e3";
+  sha512.run = "30b8d6b71c62cff716887c08830ed6a28c39056a833722e7cb93163e174eddae21ecf597f9090b12887fdec7da447ff7f4a00fa0cd352974e5de838a4858d264";
+  sha512.doc = "2d050b481cfef489a6373b4ca8c7bb765148d11dc90f49c86d2484fdee58be940e7e294168c0ce0fe62fe9c4ea70bc76d915a0ae3e55148a66a4a2355c74ca1e";
+  sha512.source = "4fb4229da07eed9d0b79fc08082255a04a3b9d78fd0c9190afb25708eb44c07f11544a55eee7afc4faff53dbaa7454ac3573b8beccfb5b8dcd7e79bf49521f44";
   hasRunfiles = true;
 };
 "l3kernel" = {
   stripPrefix = 0;
   deps."l3backend" = tl."l3backend";
-  sha512.run = "e5290e256df8a05d80e27a33ab9e498c061e2ae25ada357ee1d2b50eed947f0231c6e8c22960603373a1007095c3ae56381037aee5cc0297c57e7657b97fdd08";
-  sha512.doc = "6b6fda38fd8cf982682977a3e7d90dc22f45260251f30f29cdd6dd047a97368989fbb45bf4a1458ed29e1f45dc22648a75599fadd3c9528999e98d5bf55e3f2f";
-  sha512.source = "3682ae236165b37846d9e0605f5600117a71c31c1d282d95aa88ee5711b38708b11f6cb1de06d71d97858fe612b8ef7cedb2c479e58e0d7a0e9e29ad37b98cbb";
+  sha512.run = "95861694b7406506eaa4d158cf8187a0f0a919b225ffcc8c9dcec78cc41e928276d9f6d67de746ae7c566f93b8ac4ffb3c6a295cfb611f742829d742619a0486";
+  sha512.doc = "4a03e19c4d45e01e0773a3de2caaa6c13ad45535b91703215c108fc8cda657591492b8e22b292d5cec6e5277e4eab177698f4405d42309489fd6e58562165c5b";
+  sha512.source = "0e2ee5a7ff9098b11f71f9a73005661503d047f73a6d42a3b67efbcc3d162206a22723b49d48194ea10011e1a74ec39681e20b6145318aac651f1dc01c0a1539";
   hasRunfiles = true;
 };
 "l3packages" = {
   stripPrefix = 0;
   deps."l3kernel" = tl."l3kernel";
-  sha512.run = "eabaa7d60a77ab4dd9b4ae96e5b5cd1a93bcc4e5c4ee0259c3f3dd7856f1844b1b1b7eb4dd9cbab5b9b8803483ff1d9b1b84618d627a2bbf157472aa3db46289";
-  sha512.doc = "6f296faeabe88c7a1d6b47b2ae491c138be85b1fe93611f51eba8d756225d569d3c415969ac1907b08c6cb8885ee2f98f0063e43eb7907bbd8cc805588e51be8";
-  sha512.source = "59a319d8832072e9cf57cd5a3d4a9b0173bf8357f8714e587b2b1b50d84ae2a59e9ab9f8284f79f110d27e6e513c389ce5c95957811f2ff7039dd12eb1ae3ec4";
+  sha512.run = "804fd6b5d2835c23324252b627491e083931f0a78d9f2140531da5f29076b3c5e8af1b264c0cd82a0fd30300c3ed96c9b02354635798dca91d721c415da351dc";
+  sha512.doc = "c1253c55b434171fa77b3c1954a8cdf0f1eaf44344c6f24b4a58939bafa66313f12652184b443fa9eaed4b9dc46ecae908e52920ae64dd71a3cbe2ba84f25b5e";
+  sha512.source = "bee101af17e2a73f2094a0ef4a45203d22309b5c2feb272da872e6a8fe9a1c1c49219350756554403235c1d4d132ab11ceefeb70ab964305a194709293c35c3a";
   hasRunfiles = true;
 };
 "labbook" = {
@@ -16653,27 +17274,27 @@ tl: { # no indentation
   deps."pdftex" = tl."pdftex";
   deps."latexconfig" = tl."latexconfig";
   deps."latex-fonts" = tl."latex-fonts";
-  sha512.run = "c1238a06abcf973717a49441d243bf7cd30ce4f641db3ede8c04796ae5be38b5724c3431d44ad0d2e83998b7421443ecc7feba2ea318eeafbecd33d959704dc5";
-  sha512.doc = "7dca728cb9733a93de6265b4504f2ab5bd4b9b518a28c7980e658564c32f800aa3a9ed8cca7e43252b54b9888077efaca385308b33d7cfbe8ffb942e170d4756";
-  sha512.source = "c28ca4c596a1fd0357fafb3f67332ead41ab0445c6f2258fed19249a67e25864f70fbe1a08d5879db918d102d30a0249b88e5897097538578c5c52b8523447a1";
+  sha512.run = "cf8f91ef3dbfe100597a779a369adc5ebb18c298408d60f6c4453abdbf40315e32bc7b9a943ccaf03dbfe6cf0a43cb0bc942c6ec04ca07cd7bd23c7cf239a7be";
+  sha512.doc = "043858d0c636c83f1e641b72b330475383e0ae04de43bf80437fc51130519c8ab5985a60a2ac5a1bc77a1ce0072ca7367994728e8d83a6cf7796ef50caffc23b";
+  sha512.source = "ad0d796bffb1cb8622cde8f7e3d59d748763bdaa6477bd01a3a8644ed28f7d95150d981825e7b8f9240ff0c775d73a7bfdc0080553662ff7d4fdbcad22528faf";
   hasRunfiles = true;
-  version = "2019-10-01_PL1";
+  version = "2020-02-02-PL5";
 };
 "latex-amsmath-dev" = {
   stripPrefix = 0;
-  sha512.run = "97acbb55f65abb9ead2b6134d47ff72dcd6de996123b5916c6073f976064a4c8055228f37a82a124fb7958f3cc7c08f3c2c4e61fe5c9004a5b8c24a086d0f9e0";
-  sha512.doc = "cf2ac69cc86e95f8afc814bdb9003c6ab59f3f9a9afce7aec776352496ef114fcb0d8ae672f71d901c2bdc0d45ad5efd70a7bb158e9ee7eefb247142d9330db6";
-  sha512.source = "569e963b567e5e1aaffc8352894f707063d0b83ac87728a125cd9bb915e1f6e1f82e89fd6c35a1b4fc440aa4ad51b61479c8837ba910b4baee8400bc990ce4e6";
+  sha512.run = "92a2d1957d2f79bfa96aad5ce8aaf56b76e01aff51971c18fe139173fb90a22884830769eb090e68acb84a6bdcec18540e29461fb3f76eb6e9e62b82b9248e36";
+  sha512.doc = "82fdc4e2ad9323a28f29d470841be560c37574acd4ef864003656f38f7ad80279ccfc5774311c90b7741dca26c3b6a38187d68a40a1b9b262cb2c2d351ae6c54";
+  sha512.source = "519dde0546b8c548e09d2df2ba1840da4cb877d0656a620476717f4a3997776c9846035f8dc7f1db63d5f5b6558e0268f8cd335078a7dcf64ebff7507af3e368";
   hasRunfiles = true;
-  version = "2019-10-01_pre-release_3";
+  version = "2020-02-01_pre-release_1";
 };
 "latex-base-dev" = {
   stripPrefix = 0;
-  sha512.run = "2667d8bac15b58018d60535087cf1e95f78cefa7c55203220af2ab895dbc3d144e140f80aa3511f2c08b1a31736e893a4533f41a3d6c60b56de6aa522bd129f5";
-  sha512.doc = "0cde2495ea61c5f0dcd066b50a487ff950022103947894cf28e5859590065879dc9ce4b3c6feccd195bfe408c3ef4ff3b24feb86ebe5de68de4d237246c131d4";
-  sha512.source = "551c2a9cc8389bc5cea38672a68fd746593a74613a95072856d2a8edbec84a8569ba77f39c06adcdb5caf4c58d087882b2bd56fddcb4fb0e6ad7ce0940e51afd";
+  sha512.run = "5ab3580f08bd80592fa2276c66c4d5723ec8d68e6d15a73a47caa66a96c03c0aef178e93e6c42be5549df1dab8e64eb5dcd45517ab029a528470a16e3a91a622";
+  sha512.doc = "677e656aae83503deb68ce955e31df1f5b3465cf4d9c6b7558f6fca6354bf85c7b5f11a4c02bd8fece14726a7a1da9b7d29598015cb08c74003c010a9f88d974";
+  sha512.source = "51b3fede4db7a512d0eab48ae75a3afc741e0a46e961983a3af025c48ad85bdc82a6819ab697348ab721d28cacd88907a832f80b5f1192dfcb9eb9d5681c8cb2";
   hasRunfiles = true;
-  version = "2019-10-01_pre-release_3";
+  version = "2020-10-01_pre-release_4";
 };
 "latex-bib-ex" = {
   stripPrefix = 0;
@@ -16691,15 +17312,20 @@ tl: { # no indentation
   deps."cm" = tl."cm";
   deps."hyphen-base" = tl."hyphen-base";
   deps."latex-fonts" = tl."latex-fonts";
+  deps."l3backend" = tl."l3backend";
+  deps."l3kernel" = tl."l3kernel";
   deps."tex-ini-files" = tl."tex-ini-files";
+  deps."unicode-data" = tl."unicode-data";
   deps."dehyph" = tl."dehyph";
   deps."latexconfig" = tl."latexconfig";
-  deps."unicode-data" = tl."unicode-data";
-  sha512.run = "d06524764c097f26b80a82d53ca02d2648cf6292a0d346cea6c52029c3838829cc2a3f1d4ba410f009648a1cac0c851bde40955fecdbd25146293fa63ee99af1";
-  sha512.doc = "90a9668373a99610db35b748aa44b34cb56a0c02cbecf483e93af106b0ce2745bfc03aa2d41eece3038e9c9ca0b1e1428ea38c2606be6a607dea01d4aa46a5b5";
+  deps."lm" = tl."lm";
+  deps."luaotfload" = tl."luaotfload";
+  sha512.run = "40445a3b11e87d12b665b09300ab634a90bd5a9d8b63475f8a81cd50befd9274558fed2d6c3ee29819feb09d87c79047b0deb198e69e6cd031c99b52c6c1d378";
+  sha512.doc = "c444005a8b8a81dc2f21c5b030b075d1c489e6a73d384a47d39aa87cda4dfe7846d09e2badc009d7c96a1970def48fd985b2ef210a39ed4d294bc41bce7d1492";
 };
 "latex-bin-dev" = {
   deps."luatex" = tl."luatex";
+  deps."luahbtex" = tl."luahbtex";
   deps."pdftex" = tl."pdftex";
   deps."latexconfig" = tl."latexconfig";
   deps."latex-fonts" = tl."latex-fonts";
@@ -16708,11 +17334,15 @@ tl: { # no indentation
   deps."babel" = tl."babel";
   deps."cm" = tl."cm";
   deps."hyphen-base" = tl."hyphen-base";
+  deps."l3backend" = tl."l3backend";
+  deps."l3kernel" = tl."l3kernel";
   deps."tex-ini-files" = tl."tex-ini-files";
-  deps."dehyph" = tl."dehyph";
   deps."unicode-data" = tl."unicode-data";
-  sha512.run = "a00c38a2e40b62c40613b73ec6f71344453cc638f17840984a95c66de4a2b42fc670710d5e242350e6cc4245c29b5cb35ec0764e56d5c8e094e841c29c6617b3";
-  sha512.doc = "109e4028793c4c0f0db6f7c7d004b11d483ef35cf0091ce50135510cbadee2069d6203f3b6504cf50f43f5ceea9a409dc47707cf31dfa6cc7bb013e6c7ccc781";
+  deps."dehyph" = tl."dehyph";
+  deps."lm" = tl."lm";
+  deps."luaotfload" = tl."luaotfload";
+  sha512.run = "4870115605106d3954bb2ff7a78e2c823306b293b8cbc960462f0b9b82e6bd6bf996a6d05c0efde82dc24004e591f2685770368aef9cd1b4f8aef55f464626e0";
+  sha512.doc = "3e6a442ecad5f02132a8936b5d353223360754fb2e69674cc6eb63da3d21a5cbf58de3e89095b3f10a73a2e062398b4de7c6f7a20f4e35ab7778b6d5bf344f84";
 };
 "latex-brochure" = {
   stripPrefix = 0;
@@ -16737,10 +17367,10 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "latex-git-log" = {
-  sha512.run = "7277bd2160cfbab8daa88144b384cd03647192d516114d692af232906a39ea44ae5721ff0b935e7dd6425ec5514851220787827b819af71ae3f0c57b29d0d924";
-  sha512.doc = "34c96eaa3950f9577ddf63fb42aac51080f8e92c55f02b217d2b680353f97b1fa6bcdd59158fa9e81d48dbe63d35859b52285912ceac4b523a8ae34ec894a1ac";
+  sha512.run = "c320354a35d98a3e32c835c2a797100dc2a4417dd3e72169c35baf1dc2022b7aadb3f8ce124ab6ea6f7d6b99728aa438cf4d15f7f6635bf3850e271679b07603";
+  sha512.doc = "5ff991cc421b7f44f975119f0d6445d5898e0a2534adad4ba0454d70645e7f9358321ba2d6465fc0d89bdcfe2f70eac6efb4d93a915cf23018cae835d3979328";
   hasRunfiles = true;
-  version = "0.9";
+  version = "1.0.0";
 };
 "latex-graphics-companion" = {
   stripPrefix = 0;
@@ -16750,11 +17380,11 @@ tl: { # no indentation
 "latex-graphics-dev" = {
   stripPrefix = 0;
   deps."graphics-cfg" = tl."graphics-cfg";
-  sha512.run = "92bdb4f11668c51691cf39f65a2998b8fe9eccec0928eede30c38a85faf3cdc5f8a97ecebf871a15b1cc89655217e7c94557f9a7a83945e900c126b28a94d950";
-  sha512.doc = "5c0b12fec212b50cb444ee873d0e09993bc0b969cb6118d9cad02ec3857cf89a91c0fb23b288af7c3d21c3dd95fd979740952bfa8557ca93e3a76a1815a7d22f";
-  sha512.source = "a92a2b7d1a6e970e4be733697c4e9d00cf7cf8ea3deb19e1b076e3967ccf2e00828054001de482db3bbaa7e90f593d3e199bb9e8c77b07bbc79acbb78588ea74";
+  sha512.run = "52dfe7ed351ab0d02eb1de79c8a76f2fd0c8e2e566539a2c688abe281cce1e018ae56d1a4451c180577ad7456bb3ee90cad6bbbd4b05d8bfefd98777c096b20a";
+  sha512.doc = "e51cefe0eea01972b029655605942bf78519ecc0d4d0e1812ed755e0caa91492972e627c0fae61d0166bf49f6d1ee6279249592cc025dc1bf31f0f31ad1d5a7b";
+  sha512.source = "e146e29297ffd54555590b2eee36d35c4cd989dc51ad1d96ec20a416b6b9d24f2076c4253eb16226d394f6a1a0175fe27917ecb8d5c1475623c71f6987999e58";
   hasRunfiles = true;
-  version = "2019-10-01_pre-release_3";
+  version = "2020-10-01_pre-release_0";
 };
 "latex-make" = {
   stripPrefix = 0;
@@ -16777,10 +17407,10 @@ tl: { # no indentation
   version = "1.20";
 };
 "latex-papersize" = {
-  sha512.run = "cc3c6b563e16f70cab0ec113068d7f870a266c090ef518c06b4e3eced8e8fd9cb7aaa3544ef362ffd4af7f1d033a104daa48d47416061c3a73ba8329cc9a0fbb";
-  sha512.doc = "662d7a890978bb772a79db7a1d406ce6958970f6cdec352f78347d9ad8df47734ddae444370fa9e93582d4030568cd516ca32125b2d1e0f60aac3ce1c9b930e9";
+  sha512.run = "00010f764235c6d9e4d6667c8c8b9f0ec6ae4b65afb53109f8179e0429d4b3787bd6b0985cd511f770cd74512483d1077e0f42136fe7ce1871984b372f2f2e54";
+  sha512.doc = "8ebddd884e3e533d06332f2d6f8657ed54c9c376b3de68c7e7652f3b2835ec6601f5326ea70dc830b645440f0bd9ba2281e4f71a847946bb595771c6a950c0a6";
   hasRunfiles = true;
-  version = "1.62";
+  version = "1.63";
 };
 "latex-referenz" = {
   stripPrefix = 0;
@@ -16807,11 +17437,11 @@ tl: { # no indentation
 };
 "latex-tools-dev" = {
   stripPrefix = 0;
-  sha512.run = "67afc0ae3988c380dab97d9d9af8667448df0e15aa0e403f6db7e4699a87bd74522bd396ae924af3d265dadc9825a6f5f22e47bca92cf3dc07e7b243a97fd78d";
-  sha512.doc = "40eee2b3183fe5c6ac1e7af831c3119b650bcdecfd596b5cb5b8f4799f886829e6bbdcf042c027f3d4d9713741bd2017652551c95e02b2c4f0a8464efa1f2f2d";
-  sha512.source = "2062c2d699afe1c5a6ed1a8b9f3f09ecff3bc2f7d36b13d6381e48b27c25ec8539f19dfe6383a504462bbda8184fbce0adc555efc441f73092c84c3496e16679";
+  sha512.run = "3d4c711d21b2a64ed895bec4a144c22db6f2df8acf396cfb490c61ac924f2a73af06e28a4c7b1e4ec034979edaea62bdf5041e10145b4883186c190a91ecdcb1";
+  sha512.doc = "907666c610d9f56e2f182c7c958bd83dd7fa48dd259bb7ae58e1e33a0c7349f694174324c6eedae9a1cd2476ae68b7c6beffa337cbba4d0b92c1fe03de2320c7";
+  sha512.source = "c91c08cb02e6429e92be70af04d1442162e7b8d1b4caf02cb6a61b2032d557dd7850d7c5dbdd2cd547b6daf3f5d29d5a6d01db768a901a025c5e9c31014932e6";
   hasRunfiles = true;
-  version = "2019-10-01_pre-release_3";
+  version = "2020-10-01_pre-release_2";
 };
 "latex-uni8" = {
   stripPrefix = 0;
@@ -16827,9 +17457,9 @@ tl: { # no indentation
 };
 "latex-via-exemplos" = {
   stripPrefix = 0;
-  sha512.run = "a56c986dd52cde8d03689c74453b2491d2ea2d2d187ef559facdf9b5ee4e00f5c28cd0934c9bfc0a9955a33cd2b221fba334bfc80af7207638c90ecd72404bd0";
-  sha512.doc = "9db3b7cb038014f4bb01ab13cb091a5d01b1ddfd2c9a6edf176ca0eeac7e15a69f466d8c54bc9c3d3d463cc683eff943bfb60d157121aa83b794f49a43c8b1b5";
-  version = "0.5.5";
+  sha512.run = "12760e4866e1796a290bae531205da1cca1f24c51359a9e0f231524a55834a94a357625b775997f065c002da663c460eabcdb5ae22984330427c62e001f49fc7";
+  sha512.doc = "5a108346c7653122b37a9914cdf16410e6135f142b1f849d3d4d413be2cc59631d56c3b25d770621d84ff3256cadecbe7834f132b424244353f5889f09dfecf2";
+  version = "0.5.6";
 };
 "latex-web-companion" = {
   stripPrefix = 0;
@@ -16929,7 +17559,7 @@ tl: { # no indentation
 };
 "latexconfig" = {
   stripPrefix = 0;
-  sha512.run = "8251c3786d2dcda83fcd36a8f746e2601c72986e6c27396aa6707dcadd16c0bfbb65adb9c7f28035b019618b046c1b3f386beb206f877bad95ee4ff85cfd2cde";
+  sha512.run = "2d98dafa5c2b90321ca8600171ba22cc7eff73a23d6d88073c477bcb84de37369ddf682163b7a9dc26ce77fb2b1c174a4f810b66a34b29646ad988a9965d9bb6";
   hasRunfiles = true;
 };
 "latexcourse-rug" = {
@@ -16980,11 +17610,11 @@ tl: { # no indentation
   version = "3.7.1";
 };
 "latexmk" = {
-  sha512.run = "a019682dd8fa0c9b818a107cc55266254cd097d92fe2b05cd241f9bd183a3d2fb59d49e9f80e030052766ea0834af5c47ac5e5f7cfd59be33c1e99b0914e8660";
-  sha512.doc = "9db1bd349d393718e5c635ab108f77edea8b49d113104289b49ac2a2e860238ff0b82aca4e1e01d79ac005464afc9d188a69d534517a5f19303d58b3f13fd70a";
-  sha512.source = "1b74bb039d88ba228b71c08f500196de0fd15cf787f0daa521db9121e8b57f5a8f398a9636328210d685c35f3b119a0bd0ac02f80610b72241b4d86b24532dd0";
+  sha512.run = "b7e3971cd1aff149208fee6857066c83ed9af9229bc7402c7003480121a06684b9932deed33b8bba9bef544e000bab21425c51412cd2f7e273e0d53eecdc13d3";
+  sha512.doc = "3008825a99898209da2311ad09e6b0ead8d8557c2e47cfd6a668b8711bb22102b89a6d5326735c306e3e21b824e8df4bc2bec864958a2f3e1a8a2884175f7b35";
+  sha512.source = "eeecd1be1cce9a2baf33d544bfb7726b0c468d223006241f15bf6f8a0134bf1987be49b86fded6ed5dc40acc42523373cb2407ecd5d41e7641b1ae0fa64e55fa";
   hasRunfiles = true;
-  version = "4.64a";
+  version = "4.67";
 };
 "latexmp" = {
   stripPrefix = 0;
@@ -16994,10 +17624,17 @@ tl: { # no indentation
   version = "1.2.1";
 };
 "latexpand" = {
-  sha512.run = "9248c63fa16b9f9ccfb0243bdc6d56bb80b9887e26d8f1cae53092ecef94f046f554d8c5b9ed6cacf7202dd5be212472f8bddf9eb740f4ce54e521c9baaf75dd";
-  sha512.doc = "faf4b269446a008ba77d37d8f51ab123171a3cc56d59dc6fae9c5274833e97276c24392064f6f95e8e8eb5b88717d1c4433a915208cd81788364d382aae200c5";
+  sha512.run = "ff362aea91f703759157dc810067d39d0d8fbdfd031e993c1a6c019a55d50a3e11745ab72c8abc7bd615f79cbe589cb0bd7bf82c147d12d18d3483ef95dcf4ba";
+  sha512.doc = "63181837edaf48a5bcd842039579e3efad999cf2db1cc3da8184b59f359db0ed7f50a9c706a44f32fd0642438020256283434b95a29d64b184ddd5ca27895282";
   hasRunfiles = true;
-  version = "1.5";
+  version = "1.6";
+};
+"latino-sine-flexione" = {
+  stripPrefix = 0;
+  sha512.run = "6c6e7dacb974ba25fb5106ee1b846a22590c1ee3e5b19aa4c9cb90aab927216a19d15f977eb92f20fb589011769463a500ac2146c0c8cc807a91169da660bc13";
+  sha512.doc = "204422bc4fc85ecf94cc3236a74acc368d34926b53effb45b6411e694c4bdd2b91c30250894868d3928b19c693372c49e7435f83974e09b829938b6237ef1957";
+  hasRunfiles = true;
+  version = "1.2";
 };
 "lato" = {
   stripPrefix = 0;
@@ -17047,8 +17684,8 @@ tl: { # no indentation
 };
 "lcdftypetools" = {
   deps."glyphlist" = tl."glyphlist";
-  sha512.run = "90e2fd4cfdd5b7dcdcd3eb395630e534220ad406135acd251d9c2dd35d7078bf0d781ea9d7019a38f698fa045d6f03738ae25bff80df12218f8d64a88079835c";
-  sha512.doc = "2093330ede2753b383d57454c9fade7b89915985be4168677081ad2841ec1735c9d5ebefaeb3d53f49721d81f39d55ea01a42a0188ff79a986fed7530f3220e9";
+  sha512.run = "3f3cc8f7cce233eb36315b21db408847a267ff393d6d4118de61c4b03ec408f3f29b2d41fdcf84995bfbf5d07bcb25984d7ffc76458d4f2dc12fdb6dfb85e23f";
+  sha512.doc = "5a1dd1e2fd79351afc65d6786b24aebd9681a2b9e92755b44a836b47da5ceb1817f085483f306991a113dc0c26edfcd84839dec93bb46a003034536f31b31e5f";
 };
 "lcg" = {
   stripPrefix = 0;
@@ -17097,10 +17734,10 @@ tl: { # no indentation
 };
 "lectures" = {
   stripPrefix = 0;
-  sha512.run = "54e2b55fb43bf548a0d20dd6c98b3478cac25bff27c013353c1e0b693990bd3afde432d07ec4b0f48054f5e923c70bf5aa60ca5f5d79abbf12d36ff7949948e1";
-  sha512.doc = "45788814da746bcc2c00f3c33541fbc4d0114aa03676971b038ec38686d833e698cc1e255aafcd06d6d5029f835e93674f0dc544a8ef267703ecbcbc96da64a3";
+  sha512.run = "e3fb80a67dcb5198503050d61266cbd3890c91c1c5c93042a17f2aa410223c3943e3dcb73d7d6e7a4d5888d87ae9613fc89025f0435c122ab44a8f822732250f";
+  sha512.doc = "bc50485fd0a8782095bbc37b9185bbc61df2a6bdccaef359f2cedd553cedc14ffd0bb8e6690578f1d57b85e2efa650a68af3b579a7c360a737791ddd74373424";
   hasRunfiles = true;
-  version = "1.0.2";
+  version = "1.0.5";
 };
 "ledmac" = {
   stripPrefix = 0;
@@ -17119,11 +17756,11 @@ tl: { # no indentation
 };
 "leipzig" = {
   stripPrefix = 0;
-  sha512.run = "b5bf2bf26963f161fbd5c95259404def07a14c35dc40c9fe5c8d1c2e06f9a3bf5f1ba22e8a96c965159577d6219f376c8f3f50865a753019148becfa2defac28";
-  sha512.doc = "7c8063c1a5834dbb8ca87692b226968f98961c76eb25d4a435928253250c2aba2a204bc3c24883a1a932a726e5ec430944813d5cb78de40c7954b66a2ddc9f52";
-  sha512.source = "3a6a90f56a0bc2f7412a2481acb651289fad3caa4a69d65438dcb5e6e48e3e98118f9b15218569674fb6c5600f6a626dac3234ad6d3725afbb05f0bb69414b3e";
+  sha512.run = "6811c2259558856d930901d2d82a47774c4c37ceb5d1309fa6b78ebb031685405e334e8de7cd63b1998bf673d5210aacfd096b1c6570ed26840fe4ec22359c5c";
+  sha512.doc = "a701d8c9ffc741099aa09f75dcef117db6c64a832dd51f57dfe07cee694a177a3a8be824560308b9cdd483013d4e69b77ee8755972b9ed504e033db6396532a0";
+  sha512.source = "957fda848d5d4b5a07aa0150019670058343764434b5a7151131ac1d401e4de60a6f57af72eb485f02d0e3b63a60edc291ce1692d408363b23f811d1c97fb389";
   hasRunfiles = true;
-  version = "2.2";
+  version = "2.3";
 };
 "lengthconvert" = {
   stripPrefix = 0;
@@ -17133,6 +17770,21 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.0a";
 };
+"letltxmacro" = {
+  stripPrefix = 0;
+  sha512.run = "c9c1f5c3b9aab6b31750011cd45c42bdb32ecd712ced8f8cdafe1aeca532159051d1cff1449b06e3d35fbefdd44f2332805cb1618ff1da022d405a88d600083b";
+  sha512.doc = "8be12930acfaa79dbf3d7d3e0a60a518b12392c094e1dc531bfbcd8d9517d4744e99d339b3b7bcfb1e156d0ccbd17ca464126d8530e9f9c13e29d19a6aaeea99";
+  sha512.source = "86863fc9935ac5044f2e3b3013b0df39cfe95f54fff5c6b1af0297b828fc88353243b117caf79cafb7f8c17d9fa90b2e0e8ca753573baa06db7acb26a978f30d";
+  hasRunfiles = true;
+  version = "1.6";
+};
+"letterswitharrows" = {
+  stripPrefix = 0;
+  sha512.run = "4594fdce5a2c6bb4c4405d5111b574076faa247e4b5976596695af2de776edc26fb949d46012ce29663c55c78342d0d234e0a0e0f6a53fc59991083fc3b7e52c";
+  sha512.doc = "4bbef8f44103e5155cdcbb3719c80f3a1cd4b24211b3734e4e698b411519fb70742b4cab9ee510bf4db2a6a929550e1f448aeffba311b0fa7904e17ecd44b5b2";
+  sha512.source = "ea32a5da486d6c7501c900254f1c76494bc30ca6ab74be7d7f6494abe263151c0a94ec3ebae48d778e7fd21ab71f065a26c56535ae9d2f1d8205cceae13ee9af";
+  hasRunfiles = true;
+};
 "lettre" = {
   stripPrefix = 0;
   sha512.run = "7e50bf7d6109fcf0e128c35ebaa034c3301668f6e3bd8536b4a37c7e721592e28561911f922cfdf740d0c397a8375113dce0b7a00388a11bc4196b4b33fc04dd";
@@ -17161,6 +17813,13 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.1";
 };
+"lexend" = {
+  stripPrefix = 0;
+  sha512.run = "110cee53edf1d3bee06f93cc1bd7543a1da372d38a0ae8e8aa495a87681b565503e9f44d691dcc3a742ef245cde9e285b10b758742d928431a4f09d5df55a674";
+  sha512.doc = "66615fbcfcb04e7e833ff587d948357ca1f9318a3bfe6316c7883a65c16c7014720894f9bd40c0af5eb094d1a9898d6541527e2e0cfcfca132ac399017628191";
+  hasRunfiles = true;
+  version = "1.0.2";
+};
 "lexikon" = {
   stripPrefix = 0;
   sha512.run = "7c0642f9e727d34175898138d27a838f0432a68659acd7986acb0b74183f28467351c169c52ab057daf46546d8ef9f9bdf30dcb1846b458b6b718ae38633b275";
@@ -17213,8 +17872,12 @@ tl: { # no indentation
 };
 "libertine" = {
   stripPrefix = 0;
-  sha512.run = "22c376288f7feeca3201a0eb8150571e733acedeff62feaa1573a90d22c11b5cd1db34e5911bac9f6b86728ff47ab3f9ab94114fb829a83c77eb702ea7f453aa";
-  sha512.doc = "b65834e2903e8c11b1bda92a2d9f21e764db4828f5b63df7b14f28cf2ee791cd3000728858b262a2bc7536f9d536c4470089c7bfa8b0d5a961ba81775544f8bd";
+  deps."fontaxes" = tl."fontaxes";
+  deps."iftex" = tl."iftex";
+  deps."mweights" = tl."mweights";
+  deps."xkeyval" = tl."xkeyval";
+  sha512.run = "d52bf688d69ea2ba5de9c455ed61e4f084cc9b003cf075a319330ba0281bca5e4f3ffdf5c173fb77c831b9e8b8363da62c937ca13882194276024867573c47eb";
+  sha512.doc = "a4eaeb71df66f5533024024c77090d13bbf8de085848ee20f8747a26f958f877f90e1f94414fab3e8ac632c482413a842a6568f166de7777caa615a0fa7f3ee6";
   hasRunfiles = true;
   version = "5.3.0";
 };
@@ -17241,15 +17904,15 @@ tl: { # no indentation
 };
 "libertinus-otf" = {
   stripPrefix = 0;
-  sha512.run = "bcff14ba57c0c47b6b9c01290f47fd0d014d8c18913d1722fef2384df6b0c0e57f28900a9f53f62ec91da9aae7d3d40730ad318426eeba61a85c1c2b321856b2";
-  sha512.doc = "1a4939881e1684c940f5b8bc45d6f23d99e5c627205c16f09fab00b00bf37ec315104e1432003a83bf4406e3dcffe703d524f98f1168eb284fea8de327aa18d0";
+  sha512.run = "a4b85c7861aea614fa87a44314331aa51a53de6647f83f440577b3840e3748c02da110824b64188be9f052c4542a747fc44bf6a5119c30a7bc1f0b4e16e6499d";
+  sha512.doc = "437f9151d0bc948ef3a70984769c8cb53a658d1fafc2b774f6f8573eb6ef5e89970fb4ccff3e3c7b3e59584b06ff81ea308d78287412c5e552b9c9b457801bb7";
   hasRunfiles = true;
-  version = "0.20";
+  version = "0.24";
 };
 "libertinus-type1" = {
   stripPrefix = 0;
-  sha512.run = "ef51e05eda0197dfdf1094212ff3b8b25934d3a8b1825b145d17183ebdf96da1ceed2b6eee367e170d698c88342f2483285ea9c6f4733bdbed90a751426f5265";
-  sha512.doc = "8c7ce0de040a0012a3a15080817e5df153e30c82d3be504df7dde98fe50082307ff5cdafc35640de56eede72fc1daf55c66c8dff0ed182b1a1e4f89920475fbf";
+  sha512.run = "14bfca077c28612598abb0b0f422586646c0e43d6feca281b2965d22260c816ae23ab5e4e9aa22afc8c2d35988718729fe3777c1222427caf85cb0999f95e7ae";
+  sha512.doc = "8cce8f098880a2efceadf7f3ea8a703ed4cdcfdc33463c23b0d021d677bb7959d2111c3226f90493491296bd23254b2f79e0d283ac056a2d698041e16cd72ec4";
   hasRunfiles = true;
 };
 "libertinust1math" = {
@@ -17288,14 +17951,14 @@ tl: { # no indentation
 };
 "librecaslon" = {
   stripPrefix = 0;
-  sha512.run = "7f3de2e6478399b1f48bb0359c90e76de85bb764788fbbab561c4d2efb3f90171a1cd06a2b68eed444f8f70ce317b62e979d79d50b2ea47d4e0845a968238524";
-  sha512.doc = "ddb0f78d298566dee2703838a75f88011a24ffc40c13dd943ea05b28ef4e43d39f9a653b66617368e5c515240fc5b74e8c563d4de7b620db98c00d94fb91f615";
+  sha512.run = "ffb0cc23fa1bfffdb26f44cf174d0acc066790551609440a80be026abaef24cb99e261b28aadb323a830e7c50a07646fb2e304c074a6eb7a8d765155726892b6";
+  sha512.doc = "f5f618eb1a691e24acd624c065c79608f326e01cb01e2d6e535b23450a5a9e8ef5aca65989c689be996a23470664122c47176349a44200688ea4ddcae68002a5";
   hasRunfiles = true;
 };
 "librefranklin" = {
   stripPrefix = 0;
-  sha512.run = "565a2a3d05a9f22f5ed1ffdc5d91f6793584317e34b999291210bc87bf7c0b001a7a01458fe95bc69d793bc4fc001e07339df4a46e3ca14311d0fc49ff95805e";
-  sha512.doc = "12575264f327a724e157c925e5b66054f7982eb0bd498c1ee50e5eaf0b37e04f8eb497eb9f3ae22ac6c537dcbbbd40133bff80e79709720674b6af3b6fd146aa";
+  sha512.run = "9aa9b1d5d56875fad5e494c6d07da8494d12c3bbc37c99ff1b5917654e253649636e76d5c1dc92a243378e82e1d4a496c234a0acf18be810761c4eb534075bd8";
+  sha512.doc = "34ada19415b6ed29dd5bd35fca644d511669265ea3162d10aa582a5de9733bbea19e53d45a22c4f616ccae6d85b3f59883b54e69699c1b4e0c9782388acf6762";
   hasRunfiles = true;
 };
 "libris" = {
@@ -17306,6 +17969,13 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.007";
 };
+"lie-hasse" = {
+  stripPrefix = 0;
+  sha512.run = "ecd15640967371587139b06241a7031e86b72a6855a762e90b5b96ffa629c520613fafa95f08f346bbca365ef4e2156b2d1db6051f5e065bfd94291d942b2a44";
+  sha512.doc = "e33467606f46bf04dc4b42820a1016a3da4222e17dc3ee0fd44290b6e8cd831ee8080beb3536a66f961406066884bffd1488b103ec2fd86c1bc01399b1879bfa";
+  hasRunfiles = true;
+  version = "1.0";
+};
 "lilyglyphs" = {
   sha512.run = "8d0d8b994628731e23b1a579a141cee66043838bf254306af91f9edfe2848379492baddddd1018b7a8b7c5fc7de33f4895884412b21d1b6825856f19b7da4a57";
   sha512.doc = "8c834cb3ca5bff9538218112523537417bc41b05e34f6f6a1670c3f6eb573cc223ec8be121c7df79ebc746afe427520eef6d1ab0f4e569339b542ee67a6549fa";
@@ -17323,11 +17993,11 @@ tl: { # no indentation
 };
 "limecv" = {
   stripPrefix = 0;
-  sha512.run = "385f144eb64f9ad6ba13f42e75ae9ce5701265c3bb2641523bbeaaed086781e92f7cc03f25a576dea97fe533bb08adf8c24672e6237363d37f7ea598138fb40d";
-  sha512.doc = "c375f4e700e19fac6334df88100776b93df315000efa11189567d3ae0e6d542c3acf3d21dc29b541f7067d8cfb32fd74197e02569fe5275eb0277fc645e182e9";
-  sha512.source = "22953f4f1dca7a88f1f6aa359056d88944cf86010683b3b5cd1b9e0053b5501c4e98cce2abd66081f5053d75707a43749e78523b640097b9cc219b945665b481";
+  sha512.run = "9c1eee074b9ea30fa42838f7fd7455c374a504dadc3bd81f3bd43d494e881f5b7fd2637341bb777c73a25935874b508ee7d197f2d3ac5799ab16365a29b1c28b";
+  sha512.doc = "43f9572e3e0be38f26b1ff8cd0594706ffdbb448d6c3c3152216a887f2317a7b35f202046b2ab363abbe944a1982379ce6b9b439452968d56d996b44e785879c";
+  sha512.source = "c9132893f514f5fd1ae29ff07aef16de1a4d3fd350bfdbf7456d3ca76ffe281bacb91f656591808714c31e7c9475494b75e67083bbcaccda8e031e3908da59d1";
   hasRunfiles = true;
-  version = "0.1.3";
+  version = "0.1.7";
 };
 "linearA" = {
   stripPrefix = 0;
@@ -17367,8 +18037,8 @@ tl: { # no indentation
 };
 "linguisticspro" = {
   stripPrefix = 0;
-  sha512.run = "74f27695393e3b9489d085f6a358c05481c37eab37985530cc91a12d81430141e57226f08174079eb4034887ef439a27498c6f224c01169c74e04ce71bd4a680";
-  sha512.doc = "4073f3eff8e46433d6fa58f9cd271180ee8e2861229459fd8066a35212d562b6625a9acc267c68f584f82a7d235ebeb361a41a971a8097548eb926004418ece5";
+  sha512.run = "14666fba12a28f8ca8c1b939582778a7f3f0532df489865b92babd80f89453c69b97d987cc8c8449dc0ae8f349c47014439f476ea9cc5f48f114898d8a8e2321";
+  sha512.doc = "af514187b84cb6c6c5d623c76dfeaa0acb0b4186ecee83674266a5795d1b5ba909da1691891cb1c4a6d7ec9ead00341124922081798b19f2aa5521654277c146";
   hasRunfiles = true;
 };
 "linop" = {
@@ -17429,6 +18099,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "67";
 };
+"listingsutf8" = {
+  stripPrefix = 0;
+  sha512.run = "846cc046ced340cafd98f009a55e891bfa6bd5715c94c0dbd5b124599c8e3aed1f248f56592795184fa040285001b0d967dfb26b0fb764bdfadcc2eabe8c3122";
+  sha512.doc = "fd15657a8c7e8af4d21721f64ee0c2a77606d965698fdfeb581116f3b13dbf95bf774b77f019bef4cdb4565cd1957cf040818b1d9f78425eecfccc48ab6c5e28";
+  sha512.source = "9ee30440400c6cba5726ad3e15e0044fb18b74613237da64eca9e188246193b6e0ac205af9a3e7e1b566503330a85bf6507db7c3ac4caba6c31033f9f87404e2";
+  hasRunfiles = true;
+  version = "1.5";
+};
 "listlbls" = {
   stripPrefix = 0;
   sha512.run = "b5c2e7e168b07aa288c911dbf5c1fa8b56d2a73d38babf0140b77bbf783334f2da42b2bfa8d951e166f7184345cea26a908d12ff4a07ef89b85a7d7772d645e1";
@@ -17569,10 +18247,10 @@ tl: { # no indentation
 };
 "logix" = {
   stripPrefix = 0;
-  sha512.run = "19aa0ab48dce9b395436486fc731ec9ac1a153bd965aa6cb0835954acf54b2d2e32faef22c4130e167957ccfbed59fb3a83ded4d2b180966cd383e27d6a65f92";
-  sha512.doc = "f2408fc3d3a99c97e3be5090a54472f568cda97425d106bd14610d687f7bf5bf4297c3870c69a4f6b94004ad0e439e57055c2a6af5e18d39861640d0725405ea";
+  sha512.run = "5d392c564c4d4a5827a2fc58b95f95dcfb51e32c116bbf94834831ef2eda9880a07d0c21032a6a36f1a694cf184b5d4f306c0935f1c80ccb6bcbff97e9d6d37a";
+  sha512.doc = "2a12509e023fc089166aefff11174470856225b610b87f1707d775cea2e9d60da1ed047ae98a62ad7d923ceba2f71d30576f262e0db0a6dbf68f89ba612a64e0";
   hasRunfiles = true;
-  version = "1.01";
+  version = "1.02";
 };
 "logpap" = {
   stripPrefix = 0;
@@ -17584,8 +18262,9 @@ tl: { # no indentation
 };
 "logreq" = {
   stripPrefix = 0;
-  sha512.run = "4c9e5f42869e690768515d49f62aa5ef7ff2d9de2f42bd1b574f95b7903958a0506d334300f89b38955fce0c47bc65e4c3e17cfd04c5b6df95406e6b78ecaa2e";
-  sha512.doc = "5addb710e2948e67f6369763a74d31bd3cb20d847df6cccef739fad3b34abea8663d00e7304cf47309baa74086a5cfd581bf46610ed3d7123ff74c426fec0131";
+  deps."etoolbox" = tl."etoolbox";
+  sha512.run = "df61c0c6c0b8520f5ec38780d8eb69cfd5fccd21f5120e48eee71e02b004d3da4cc9cb9371a36766852e3ca09a3db86655f1a2639a49741f00134cff1246acd2";
+  sha512.doc = "fa9277da81dfb3aa235bd795780e8d3e629558fede90fa9234528b50a11507e59e65e49a0ca787af037186890392dfd45bf6de7bd859cec369626fb7d57b543f";
   hasRunfiles = true;
   version = "1.0";
 };
@@ -17864,6 +18543,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.01";
 };
+"ltxcmds" = {
+  stripPrefix = 0;
+  sha512.run = "9cc445ad177af9b8f942b0c5096f83200224e0cda838441d28d5a188fee50d6c24dd4d415c2afb01792f57813558400826ead9336200f810336c26852ef61ad9";
+  sha512.doc = "bba1f1505bd24d62c82aedb28382cce9f80232b45f9ff0002c94dc6c26de0937cd6c1757396c2ca5a0afbb44d25dafdb4a4da1df46f88757d9b4cb03c912630d";
+  sha512.source = "035c7436b6000f4b17c41b8fdd71e1497cae824e20a8c872f7f4cfdeb43d080f6a7fb1c193f3718cf725ae5c79576c24616c36ce38b8705d05a1f1b9a5eb50fd";
+  hasRunfiles = true;
+  version = "1.24";
+};
 "ltxdockit" = {
   stripPrefix = 0;
   sha512.run = "1144bd68bec92b4ac9ec8763e2e7df7c6018cd8b88c7ed2f02e7597c3bc13608a562551d80fab2a41b8aa9881848fa1b3501da7ae9c39edaae3720875ff65bd8";
@@ -17963,10 +18650,10 @@ tl: { # no indentation
 };
 "luabidi" = {
   stripPrefix = 0;
-  sha512.run = "080e97a588793eba6ca8b63ba25a7046006f4a788136d933f21009e0541c5e92e995bdb9970a5c4a921ae0654a1a29573a922ee5e0a3ac58fb30cd178f7ec736";
-  sha512.doc = "20667a11108b51603ff5866c85e023176d27bd2201c8e4736b6cd2cb895fd30f205bdef0077dff65d0d8a97192f74be6f6ac4a0ecf3948c51196071bc3be59e8";
+  sha512.run = "0cb391ad3f17ad8a85e7960ef11e4f0eb007fd255ed9eded40ef3fe5c81187b1d2d49c68b0411b813aae66fb252d9d1a9b3bda984cef2d034e96e06fe44ced26";
+  sha512.doc = "cabd1899682b7f1608106d6d36cfbfae1684fe84462420fbd9ca9b342c95f73750ed40d086553404f0a1eb34b56ee4026c497e42dae42d3348fa01cdc7a5c454";
   hasRunfiles = true;
-  version = "0.4";
+  version = "0.5";
 };
 "luacode" = {
   stripPrefix = 0;
@@ -17976,6 +18663,26 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.2a";
 };
+"luacolor" = {
+  stripPrefix = 0;
+  sha512.run = "2ed3a27258f4cf1fcb82abd6dbf660d090dc8dabefb2352dbb0fe15d32d7a0af33039c0249cb3c06dbf3b56a6d41039112ed9e5f2abfeb5bcb5ca50bf5f798c6";
+  sha512.doc = "89f13ca9832cef55f75bdae2933e1fa1f5c9d678c5980805871f5b7f2e13f7e406d50b2cd0366b6f191a9ec03e293ddd11163ba6a52260b609b6a3ca0c677795";
+  sha512.source = "5be92dddca40a473bbb1b84ce85dab0073594a2ffca4d3ab00a84209789c0ddb06e7b9880168216780159e243a75b2900bd706fc33749950f36b4a0c1e016c2c";
+  hasRunfiles = true;
+  version = "1.15";
+};
+"luahbtex" = {
+  deps."luatex" = tl."luatex";
+  deps."cm" = tl."cm";
+  deps."etex" = tl."etex";
+  deps."hyphen-base" = tl."hyphen-base";
+  deps."knuth-lib" = tl."knuth-lib";
+  deps."plain" = tl."plain";
+  deps."tex-ini-files" = tl."tex-ini-files";
+  deps."unicode-data" = tl."unicode-data";
+  sha512.run = "3eac2b2d77d5d348cec5bd36fc11fde18371ad34345900384b76d06b2edbb05513a2697b36da7ad1b1a8b55bab87294bdd0fbf59b10cec604c4171a3d4520f09";
+  sha512.doc = "5faa6744ff98cb424fe4bb6f170f22be344ea9d58bd967a997c0f3ba3f8adb64d942cb2c637f77e4afbb9d5a648598832f5b129bc8c506141c0e05ce6bbb18e4";
+};
 "luahyphenrules" = {
   stripPrefix = 0;
   sha512.run = "f1486d23a51111023fca3771ae530ca058c582640ddfc17281a66ec055b05aaf24021c724566f5e9c9a5bd674eb8724964fae78762dab30182d8a95333293efd";
@@ -18012,6 +18719,18 @@ tl: { # no indentation
   sha512.doc = "47de79cdc637810757b7879956cf758a77cde95e77060ce74829b438d13b58e23cbc8e9b328d0850b44fd8de8da90fa9fda206ff0e206918f1bccdf5d71d2c38";
   version = "0.03";
 };
+"luajittex" = {
+  deps."luatex" = tl."luatex";
+  deps."cm" = tl."cm";
+  deps."etex" = tl."etex";
+  deps."hyphen-base" = tl."hyphen-base";
+  deps."knuth-lib" = tl."knuth-lib";
+  deps."plain" = tl."plain";
+  deps."tex-ini-files" = tl."tex-ini-files";
+  deps."unicode-data" = tl."unicode-data";
+  sha512.run = "781346b437fd5fccd22a56d37fbe42d40197173db24960aa435d75fcf7fbafc2bea362156250cee34e1c03c8aa9ee340d97327cbafa32a202eed1af032370ef5";
+  sha512.doc = "045e424a75a951d6c6af885f952831d26cc44db785c5c802b7e88e37540c110074c4d2adaa872c1ff230bc0d37b247b0a44b9621f12e7e37f170b81abd9f7191";
+};
 "lualatex-doc" = {
   stripPrefix = 0;
   sha512.run = "a1d98422b13a26aa844213df2929629889ed6bfe3fa16c27f6376f00f038a50dd32c5128a27ecdd872d3fce8372fb93ec603c0c92edb8692325f1e76fca685d1";
@@ -18026,9 +18745,11 @@ tl: { # no indentation
 };
 "lualatex-math" = {
   stripPrefix = 0;
-  sha512.run = "931421eb1cfa64bb14050efc449e9d600ebbecfd524bea0162c1e20100345a85eee0d45764c8e1ada7429fd59ea6124b757f9361eb4183b2a295b87c62cbab7b";
-  sha512.doc = "33da41b1515fc58b68fd8354304ae454b0abdd5f41475260b762012216595025a28db60f2997e5d36553ce551f13450024e9c017b9971219667aac57df84a2ce";
-  sha512.source = "1b05c3b7c1ca0d8e34f2f0a4f70c8b27996db61313117b63232a8b0164ff981fa59d932aed6ef8ba41f2b82c35a11d90525a246f12dfc935c8a87380525a1a13";
+  deps."etoolbox" = tl."etoolbox";
+  deps."filehook" = tl."filehook";
+  sha512.run = "c976e181a84c74dc7bed8512cd76dba5cae0fb799c5c3e189ad89a131e782b380efccf9d625e6c1a68b813aa57adb018e25ab763e97bf31a40e48f03503e8e3f";
+  sha512.doc = "639bcf68bbdfa7e1992e2e5e8e5ae791f58250d098e17224a94a69b994d51f5f22dc95cd7bc27d968c5bb9ee49bb17d6825c18c65012c72bfb1bdb1e8bede9a5";
+  sha512.source = "af227f41bf4da5ae22cc17fa114fbe80f3de12072d9321cdee72409443e31fffa017e5762ed1514224edd19fea8d6098ce894f4bc00d1f4c9f507c2728532396";
   hasRunfiles = true;
   version = "1.8";
 };
@@ -18042,11 +18763,11 @@ tl: { # no indentation
 };
 "lualibs" = {
   stripPrefix = 0;
-  sha512.run = "7f0f9109835f61ae2d55dfc4f1cb4759f2c9e7f54987ace4199acf4b435c4222ac497256beaed06002e3be645fcc149f70a49507190615e54a0ee4e0e4caebf6";
-  sha512.doc = "3ee3797410c8524575f51feb669f079de3014d0fb6a18d3883a3ff1d2442b7c29989d71f80764c0991625b2ff2fe1ee23522cb28b1c5d7e7f56b702f315bc56a";
-  sha512.source = "554fb8b6b069982947964cc3807f2161c76373162944c06d839cfb0bb50220f6f3a8388cd4f0c56c3bca900228fd7c49b0548df6b754df2e8a66b4461bc4383f";
+  sha512.run = "bf41a6bca45473d40f927ec019434612947fe79d70671837b2b1ac53cfc727f68e436cd52bf60d12bca5d5dd0bf89e49fbf610107458ab4078b8dfa3bae25940";
+  sha512.doc = "3703aa61ceb2fb0cc79a33972e15f1e8d19a2f597eff19b871233422b78dde4cfcba2145cda33c0352cb54a014b7773c3fcee6819b547fb6d91f499f4b464f97";
+  sha512.source = "9975b9391ead3221261494bae828b0b2e618cc686da2bf27b6d7ef2d034868a6428fe9cf274a1ae87bcc42ea6c9d898254df93b1a9d0da21b8e6fefaa7b86468";
   hasRunfiles = true;
-  version = "2.67";
+  version = "2.70";
 };
 "luamesh" = {
   stripPrefix = 0;
@@ -18057,26 +18778,27 @@ tl: { # no indentation
 };
 "luamplib" = {
   stripPrefix = 0;
-  sha512.run = "35aa418e3c49e4d6943b2f4a118e1aaddc54a4337be32da676fd8bf37b8d47b78a63d707eadc7c00a9b90648c07ce1e26b21523c7167cc4f69b9a25608d3143a";
-  sha512.doc = "e994c52b44da2df051e66c2cd66ab88f8f705905b25472906d558395b1c673da797598cf0be44127f10d448cb36a0f0747e3ca594f632d7bc6e40f916889ab0f";
-  sha512.source = "9150ff583540bc6511874994b708a313295d01fc319accbfbac9e8b4176f9d146caa5ef3bc567e733e8938a88284fa273b38940615ee9fc00d04b7dd39e700c5";
+  sha512.run = "fbb99aa90563e6cce2e5e9c417f739868130f8a2dd9875fba8a44e3f92e94643f2a9446cf686f222067c5aec66e5199eb5fc134458d2a72f2fa8bc949ed51a1d";
+  sha512.doc = "e0568e3547253f6dc9d12f927c3d7025454520ec8611ede49497f80a6354518d07eb9d300208fa4a8173b068ce65904f45c071d0fea5bfb3bfe8de1d29e6a0ec";
+  sha512.source = "3a00f23c25b683b9c8949a7cb4841fa92babc470d40f756898c68fe2ed82e090cd7cca2dfaa4fa7894d7a4ea96ce5db5936ed2b1d509af118cdf039ea7a8e7a3";
   hasRunfiles = true;
-  version = "2.20.2";
+  version = "2.20.5";
 };
 "luaotfload" = {
+  deps."lm" = tl."lm";
   deps."lualibs" = tl."lualibs";
-  sha512.run = "b0934de001e68e95f1e79979e11d85a2268f67957b31b4f9d0aa5d069e5bacaa5c238c892a75146906f5aaf41a7fd4675f05c3170f3cc1ce4c96e25ff5233169";
-  sha512.doc = "eada60cbb87c0bd80b2b54e4bdc650614ce8841d8b8dfbfb4019f7abb74bc364d456424fe211a2fe9264d307d74a4b181200621c40884b5156edb81d60276ae5";
-  sha512.source = "feceb81fd2d1f1dd866b3c583d35d92bb721cd26109d3cc9339fc4bf37b250489d8e3619312ace75a19d83f4659c7fd2ce6c957a1b96e646d419535e8b85bcd4";
+  sha512.run = "0c61957b2276d8657ae5ab8e5274245ef6840b2258a2225a04aef269a3f54a98b6ec6206d02008973a4d1577df8a2234194faff033fcb8f1ca4e0341b2766fd0";
+  sha512.doc = "540cb93bee1ebe59eab60100e37177fafc83243c944fc87834f60cd1d50c0f6af466e1376aa5cb460176febe0f937f93808b6d0d20a096b344f5b8d48ff4cbc7";
+  sha512.source = "41e183b98987423fe35105b2b6b7aa0dd3784daff26e7e1101b1725689a7b9ee518b1f2c55e2f4c87b1332ef833cfe287bdedbd4d23c6065f23e84c620302087";
   hasRunfiles = true;
-  version = "3.00";
+  version = "3.12";
 };
 "luapackageloader" = {
   stripPrefix = 0;
-  sha512.run = "a89cbcb445b1a73d0fe1c5e241745d1572df9713bd867076c1390a302860891b5f08eb0aa3000d064df0a5cdc6135eeed53f5ef6f2801da17c84fc343005010f";
-  sha512.doc = "5e1de43c58d0bfd6b8bcd9c068d3b1084df398ca843ec341b29e55c646bba6a18fa9075a9f6cac737f0698f6bcf9626948e9be2c28f6210156d71ca00e1ef916";
+  sha512.run = "4e8be545786285cfea52ed31ec3eee7d69848d2d400a12ba723ca1b30daa214b7e2a8bcdf562cde6c7916c9b8ec6a3b04d866f0b8521eed169de8222a27a4e11";
+  sha512.doc = "93e063959a82368f1cf603c7b77b591b236ec95dca3a73f7ff0188cfc05462fbb4de53103b3b3bc0d241eb1efc43295a4870c52702df506a1adb89cee699ed83";
   hasRunfiles = true;
-  version = "0.1";
+  version = "0.2";
 };
 "luarandom" = {
   stripPrefix = 0;
@@ -18100,8 +18822,8 @@ tl: { # no indentation
   deps."plain" = tl."plain";
   deps."tex-ini-files" = tl."tex-ini-files";
   deps."unicode-data" = tl."unicode-data";
-  sha512.run = "0b9bdf74c170f6cd902386cf18b96f3cb78b853eacccc3a7c75f4135be0efbab47e36a717307600509b78c9fc4f58b8e62f1cdce52007fdd5e9a47dd2f57d666";
-  sha512.doc = "eb387b69cef102386bae65239835f0616cd676bb0dd6b91aac6ab0766cb106fae2e102de8682abcbf42d0937eb78173381fd12ddf3d27a34fc6d200f33e52b5a";
+  sha512.run = "85552efd1a47071736ecbf93db6b569a7daa2cba87a1ef7f381cc808c893b40e53b3c2b405648253b83b1883b9a8e4aa8aa5d1782bbe7db79a9f223531707501";
+  sha512.doc = "c844d4407c9f31bf43319c64d4f6e5460737423e32edb7ded2824615eba653d82df793fabcef9ebeac7fbbe61efec9582d463cf1210966b699ecfe9171deb29c";
   hasRunfiles = true;
 };
 "luatex85" = {
@@ -18114,26 +18836,28 @@ tl: { # no indentation
 };
 "luatexbase" = {
   stripPrefix = 0;
-  sha512.run = "5a369840242a429cc7b827126120f38656684d554e06882af8174c009272f0de88a11effa881fca338cb3e7f32aa80fc16acf24d3fc10fac2c2391ce2f2f6972";
-  sha512.doc = "4e7a3e00d5063996058bd85bdc11f3469bb90f16bdc5c6ecf1077189718950053d660a86988f1bf4f203bc8f91da0e9f79d76a327e0d2fc38dfbd1aafab20028";
-  sha512.source = "bf461aac2cea7282fa4be8beae1254fdd2260b34205b012bb2ab1780af387a6855634c87005ce58b5031c863b857f56f88f436f262f192ff6c3a16bea5acc919";
+  deps."ctablestack" = tl."ctablestack";
+  sha512.run = "cb187dcd0f9e454a3b9d021b802ac6f7d09c3eee68adb5da31035f5b7bb36d2938ca940505ee08c8410ee0e5e5c81ffdd21617ea5ba0e9ca7b58abb6ede3defb";
+  sha512.doc = "5dc696009e84662fc56443d7a5d61b3f30adbfeae3cf7176e81e676087d0fe580cb0575add49999ea8d5651850b7562c775b0727de01934465f3613ab7344be3";
+  sha512.source = "ebb46d5d4c3f6ccfdbc758f9dab64d7e83c2fe988f7da6852dfd5e786bc757f2438f86010a695eb2e780a02830f15dea941de7fb5bdd6e6561df0774b476dd5a";
   hasRunfiles = true;
   version = "1.3";
 };
 "luatexja" = {
   stripPrefix = 0;
-  sha512.run = "06ce71869965eeced3d97c5771e13a650b5d306d06c54c500e0222a9ed031b74d1db63e29791c4e10dc1873577e250e9197b2c9c945753b18da029b1f1eea06f";
-  sha512.doc = "32a21dcc470c38732e8851421f094ae7a24eefbfbb984630e2a5e392295ae557e1a28f5582805a4c5a4a41dbef1351227799a116743d179819c8560b846b6f4b";
-  sha512.source = "f01a6331deb8cddfb60069ddced04a1f621cfe72f2c083a4ba2de3fbdeed9197237dc976286e2ad3127f7d519969a8d60345b71d1aab40d4c0d5b54d70c4f9ba";
+  deps."luatexbase" = tl."luatexbase";
+  sha512.run = "f58bd79f429be61a69883435ae6445514e5c9a4cc936bca14e5d26da8ffd5437137a8d14b6d591e385a3e8183ec3248c9563b51dd3526554a4cc3500702cb708";
+  sha512.doc = "53aec90f642acf910a14cb5ca2b04cd1187b9094f01106227342ae51304585d01ec771551d67b2c916d05fec2179bd9bf33b182c5f5ff8c328159571db4aa947";
+  sha512.source = "8b8137f7f9db6b8e45b029f99f93b8e1c05d47394438f0de2f859e47c9675a6f9ada56489c2ef9e9cc3f51a20431397a4e4ca45e96a6377e3b1fb43c54496e11";
   hasRunfiles = true;
-  version = "20190926.0";
+  version = "20200301.0";
 };
 "luatexko" = {
   stripPrefix = 0;
-  sha512.run = "ad454d899cc34304231476cc5742ebff3a16565737a2e447b25afd97b07b1108ff4da6bf369b2aabfb038a472bb7eb706425a8501141e1dbc7427d2384fdf565";
-  sha512.doc = "42f54deadca1308c413be4ef2ab65c52b5739b1526bf9f436b3576089bd2a72a1e6461c8b30ea2da12a58c5160ea0b82304668f7897d11d7fa06dc00df4e3b60";
+  sha512.run = "50408947cdec08f41d081829f4cebd832aa817c233feb1fafa5e88bf38386232c2d04485e7feb8ea3056a0d0cc057975da2ed985bb485533f05c4cf7e56f6fa2";
+  sha512.doc = "645725cb6fae45627c9524ff45bf2851553764d0c1ea5fa2c6024aec1f00963f9c5baa787442bfb1ff9af0b70cd63ab4aada40dc32b11274e19296e9eee208a2";
   hasRunfiles = true;
-  version = "2.4";
+  version = "2.6";
 };
 "luatextra" = {
   stripPrefix = 0;
@@ -18145,18 +18869,18 @@ tl: { # no indentation
 };
 "luatodonotes" = {
   stripPrefix = 0;
-  sha512.run = "df5879d73d416054a5146919a59c2bcc7564f6895cd32b3a93e287c62f406f7d53dca0f6dc3da1e1380027e8403aebea75076dc50517dc697b8f9fb2279cab47";
-  sha512.doc = "bf2f0e49cd323e7439c1ce98c76deb0384c9b9a540764eccf3322da50ae939e855e5a002b41fd00e280aaf8d135959ec87b05830e9634e8d1bc701df97568852";
-  sha512.source = "6c7c1a9669405da4e07dc218ac84c23018923314dc3fc77a89a2755ab458fca7a3a35b6fd17dfbd4e7bd5deaab63bcb09af8e81d83680246eff43bf7a2b177c9";
+  sha512.run = "4cc24f72014d50179fa1cd3630a483677a98a5dedd28e94f2c7003c3c61eae66bf9b6787bcde81b654f4187d873440828655be372b4d6bbf59c802da23beaeea";
+  sha512.doc = "2b7298a56975f0ac71bf6c0327d95531622de23a33c4a1999cdd35ae960766342071722e388fd3d9fc10fcbd23c0752e5e5399516c8465f7e66f5ea8b952e447";
+  sha512.source = "0ed8cbb2160246c499ed98a7865216e8f5739a7c87a1b9a6ef8b63944a4b3f2c6a011ebb4276486d2ff8fca96428b0c25e87936fade5967cf41f7cee79307880";
   hasRunfiles = true;
-  version = "0.4";
+  version = "0.5";
 };
 "luavlna" = {
   stripPrefix = 0;
-  sha512.run = "532172433fe45c3b6a81d7b788f6202f46ba0685da373698629c11177d298ea81a30d967310b52c9055fe2dce6589e2ea67f08be9d1d3da5dc1488542feedaf9";
-  sha512.doc = "6e6c7b0d9701804b557605156b391815497bc7b78d7d3aeba172ad89e3f83d4cba7462e3f045d390d4f7a458f9b344083caaa27821a774f68b8e9cde476e9bda";
+  sha512.run = "048347c596056e587cf0785359ef3dd1ac1b86929be10ba1f8471fe53054e75cb815fb67d61fb15953285c240e81fe8e48e72518daedc6943287f1d518b5c0ee";
+  sha512.doc = "cc352d3acccc440d682fafe4978f65e6395134af29f9588289200992ecdba1c6bced1000aa1f20065feb2c6f0dc0db4de868898a22cc2fe64deb07980f5f2194";
   hasRunfiles = true;
-  version = "0.1c";
+  version = "0.1f";
 };
 "luaxml" = {
   stripPrefix = 0;
@@ -18166,11 +18890,11 @@ tl: { # no indentation
   version = "0.1l";
 };
 "lwarp" = {
-  sha512.run = "9251bf5d255bbeaddff8b3f1d6d32949fa9278158bc7326675b7c39d450e58853bcf673b52b1d86d41ded9892ab76c9955e3b48889b37fb4e847d57b020f858d";
-  sha512.doc = "eac134b818d05ce5396f0598d1b985953b23474aecdeb91901144d2dff5f2a940b53216494fca762dd955e36112cb5678688d0129c2fc81cb4dfb37247e7ced9";
-  sha512.source = "dbcc6a85e375f40081669eac063a01d5847753382e56ff137cc84c9b3701dc64cd19148baabbf7d7cf751b892f33e6c9f4022ac2817891c112ecb4261894ad51";
+  sha512.run = "a22c27a141c768d1e6e50fe847ddcf4b9fb7c6010eb3569590bf6da200beb2112d133c71d6cc38ca6a3e79558162fa5e3cd610679a3879c01096b0a09f1e2bf9";
+  sha512.doc = "4ba898d997ffad75225ae9dc37f24e9458f6e1129509131bac328587b3243286a7444d782c3905bb61eb0d9db73b8aab282fe5d59f10475e08f994bedf6ce801";
+  sha512.source = "a6148d128777973e3712e0e05cce24005c82d2ffd9d5efc1217f73fb13d0773aae91adbd7e1a14db90ef9d19114d415cde92232b3373683a1736f5db823dc8e1";
   hasRunfiles = true;
-  version = "0.76";
+  version = "0.80";
 };
 "lxfonts" = {
   stripPrefix = 0;
@@ -18194,8 +18918,8 @@ tl: { # no indentation
   version = "1.0f";
 };
 "m-tx" = {
-  sha512.run = "055839d04921e71aa0a83309485ba2506feaf2d3bcb919073cb011bdff8ba1f623c2c7af6fc4008badf8faad17e41dc4aa55f9aa47b0065af65fd2fb5dd6ae89";
-  sha512.doc = "c1470ffebb9b86958bdb68cf50e1fe18847e11cf1c28feca36ba0de68ce0fa72daa80c1df9312319d9cb5a42bfb250e7aa3a1e2ec8e093780b170b4d6d1b619c";
+  sha512.run = "c99b0a658d46c58e47f58c0494a4f32b5997ed304bb35b58a5732549ea17b366299aba4504982bb4a1e2743800b4bc02028e402e03cf363178bf1ac262802e9b";
+  sha512.doc = "ebf3e4035460439abd3ac91202e28c0f6926181c34bcfd1f1b3115ff6ec90bd2d0cb9a5043d81ee8434d8b260f3a8b437585d3e81b7161b145c8c112d5643cb1";
   hasRunfiles = true;
   version = "0.63c";
 };
@@ -18228,6 +18952,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.4";
 };
+"magicnum" = {
+  stripPrefix = 0;
+  sha512.run = "305d94ec07468511e7ada667ded30a1c3ba68835d5bdd03a9a32c7bb7c0d274d5ddc77a5ad02712faf10aba5eca73c6708cb2bf497bea0b73b3f99b10923a8bd";
+  sha512.doc = "084bdeb7d422a5e79f4a53864ea0c94b09962e159e103fe3ea77163a9a549605f7139bb2ba9d1a57877b3453162a99470f48a691ff78289a1caa5389b2a7f67d";
+  sha512.source = "3bc74965fdc7ecfe7481e426e3cd2c9a27c8752fec3248e707c1f0ee1fcd03205540d6cbde05b82c9313c567b7e689acc9b1146f53962eadfef22d7006c896fb";
+  hasRunfiles = true;
+  version = "1.7";
+};
 "mailing" = {
   stripPrefix = 0;
   sha512.run = "33fca4d77b34e3390de647e7e39d6240344f2a90c6067275bdb0e7dd1a3deaf5d5cdaa84dc4a49a0c817bc6923eb593602653b0d0ae4b794510a272b78498be9";
@@ -18244,10 +18976,10 @@ tl: { # no indentation
   version = "1.0";
 };
 "make4ht" = {
-  sha512.run = "ba85b1b4055d997677f5a158513eeca0390e9e07b872250970908151f33f7203a4d0938aaf4dc56c33e36f57b99f797b3a28f999add39d931bf4e78b907ceff3";
-  sha512.doc = "45637b363c64d0ad91e164d8c8a254506f98c8105d226ef9ce1912c2c4ee50057233f17035e8a5ab995c49875e638bbd14e1a13949867329a3e3cae65b844c55";
+  sha512.run = "86578903b820e3011042dfbb6d18a436cea35a780691d3aa82f468518f7666fad343d6c91c91dea0bac47a06b6a812ca5dc95e474f5913f305c22adc2636d422";
+  sha512.doc = "ca138ad89fd6b350dbb3fa6b22649c3b0ff2bb802e5273f772765b6b7fdea4211eb41ef3a679af2d9d853578a9256f84d492be7699f4b5d33660ad0d59219bba";
   hasRunfiles = true;
-  version = "0.2g";
+  version = "0.3d";
 };
 "makebarcode" = {
   stripPrefix = 0;
@@ -18313,8 +19045,8 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "makeindex" = {
-  sha512.run = "6ddccdfd89e0f362b312c981da16e7e2771035ad03135f7c49998ec7d2b4f7990cc8d3094d2a703277aa1be1d43b332906169d1a6699eee8730a5d6451d9a2e6";
-  sha512.doc = "6decf2c8d770fe0cb18c87929f877afac8f2e5baf64cc85c82e575fa0722ed9dc89fb49f08aedff17f26101dc3e7ae42ca6d4a1f2864ec2906c46a960efaf90b";
+  sha512.run = "7f4df4944bc738e92ccd7fe54e1448a9ead71077d25359d6b97d18ed9df4dde2e6db31bbb183c646ea902e24b5cb15581ef12eaecfe90ba08361dd191e5220d2";
+  sha512.doc = "492d0bb6f44ebc0440998f55b51ec5bce5ad564918296f85245ab10bd9ef67f8a2e441560ed7aeba8af2cdb0a923f225dd867454ee83889252da6be36f89ab16";
   hasRunfiles = true;
 };
 "makeplot" = {
@@ -18332,6 +19064,13 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.0";
 };
+"makerobust" = {
+  stripPrefix = 0;
+  sha512.run = "502b4dd65ae3535a2519c696b8b2ef73b3eb8f19d20af7dce94e24c8f718f827e55ddf7ff229bfc0810ab8747c94720cc7a66335a7d44065d0a0ac6b156a683e";
+  sha512.doc = "4503551b0085c7c829d41042083209bc02dfd2391f99cf0fabafb363e288a455e51273bf0f9d4ff5a5fe17050fb5288a7835742e06865407b8400c88244f4e6e";
+  hasRunfiles = true;
+  version = "2.0";
+};
 "makeshape" = {
   stripPrefix = 0;
   sha512.run = "b13358696b16b41a69e5a207fcfb717b417ec191ae9f6ad4408422b1ce99c3785a3328cf9bd2e87ade3ede4998ba76ddb2f640e06ef5ce88172942e4d0cf2bfe";
@@ -18481,19 +19220,19 @@ tl: { # no indentation
 };
 "mathastext" = {
   stripPrefix = 0;
-  sha512.run = "62834a7164b376228307ed63b763d395c074e3d861ebddead63ead1665b2b41177a7dd8db58ff8fe3eb56b4aa1cdc7a6b3a2ca75fc07860cec3cd8aef561e4cb";
-  sha512.doc = "5ea37b70e074b5e233b6ceb077f3ea95107615dfa54b0f3f1ebf3b44fdb744f4006e5bd9ffcef180830df5080c777d82edecb26ab430cc73aa08acd7cc8a5fa4";
-  sha512.source = "6cb645e4567b812740adea4efb097104d8e55542e317e97496a02813f309ef1204255bf0dca66d7123566739e99dcac706a67dc13a683a48c2cd6c9e88f26c83";
+  sha512.run = "a8c0ac4c041b52032e1bfba14eeb6ad42206428a8cc576597d7b509d652c818b2568f043a6edef0bd491057c661e30d9e61575d1fe0c8414e45f08d9629b4e19";
+  sha512.doc = "b2b1deeb2cb3a966d64a1e367de2ae6f932b5cca714a15ed113def4b00d3046fadfa4724dfe21028fe82bcd5d76a1c73196a2c599a0f6a56ec113fd4421c3456";
+  sha512.source = "f22a88f5ba02bb077fa0e3128a27e78b736e07702d611a059867646d5c6b4cbb6548c1f0f0e968735c3f887038f51c351a98aa6d60ec557c246ec523afdc735d";
   hasRunfiles = true;
-  version = "1.3v";
+  version = "1.3w";
 };
 "mathcommand" = {
   stripPrefix = 0;
-  sha512.run = "5258a3e438899835e65e092edc5b4e0bcdaa209aa5cdb26ef5d8208a673181a3d8a24ebd0eed311aa04ed79330891a828df0ebe47d02435c40328333f5b7faa4";
-  sha512.doc = "bb0c76f4349785aa196c7ed9156ca92e3f05aada3b6a6c42005d8cd8c58a3987eca54c396c89f03bd005e7eaf21b08734e8a4d4ac95f08ddba286ee615a92e4c";
-  sha512.source = "5f89ec740025fcc2fbbe5c7ce01fa3c3929390b4df8bc433457ab2e002480fa3d8511539c451783deb6d0fac230768ab08d5280fd1252d33845a19d583274688";
+  sha512.run = "733c1581550772bdeda24b12154709a09f4427776392e86214d273c2eee1df7a80fea4285d21410f44195af30682aafdecff9f678ac43ad5f78a90605f76d332";
+  sha512.doc = "eed721d4b0da17c2ae997c7b1c46f19531108db0ecfbb334b648d5931eb2e86eb99465c52093e2adee7150dac3d5c8dc4b9df45ae68f47d0a238c875b33beed1";
+  sha512.source = "9d7b9156f28db730c20d1b0e22ea3ff5b90bf34d8d500248f67dd1ef6c12b7eae8e570db065e85f77e61e828277d202e4f73eceedfb79c756a80e2413b14f6de";
   hasRunfiles = true;
-  version = "1.02";
+  version = "1.03";
 };
 "mathcomp" = {
   stripPrefix = 0;
@@ -18528,10 +19267,10 @@ tl: { # no indentation
 };
 "mathfam256" = {
   stripPrefix = 0;
-  sha512.run = "4e13b7f48c9e99f3f8af8a57f22636590376c7bbded8afb08c93524cb53dfd28e04ad1035a3052a2837ca5d0781c1eab5fc4ac8fb569cde558ec7823ab4ca4e6";
-  sha512.doc = "d49315d18922c3f600a0cec9596fc972324419317a717a987188135e1cbf35976dc54a028c7cf98a8425dfd44f8a45c40cbf46411847b3e31e71beba63f041fa";
+  sha512.run = "20912d6df0f287c14300e4598400cc2da676f7e484757e3a9a0c41ef6861d7180cf7110fbc7b5668ba8a713cb66b9120736b64a1f5098df25379ebc7b14e44f5";
+  sha512.doc = "26aa672bc55de7c45a857d1ae26e156fe19f4ffa05417a7a4163526d01d5f58576f8d6db951e377b646e1ff25167571587d09f21eadecb95bc96e6b85707a9bb";
   hasRunfiles = true;
-  version = "0.3";
+  version = "0.5";
 };
 "mathfixs" = {
   stripPrefix = 0;
@@ -18543,11 +19282,11 @@ tl: { # no indentation
 };
 "mathfont" = {
   stripPrefix = 0;
-  sha512.run = "bf99697b79edd78de3390556b030125cc325da1d3dbf28684f9a3324a2de614d1582a8306797e8cebd6be6000a3be64f178e6cf67a68a3c68f0f74757a652fa3";
-  sha512.doc = "4caef345e33342b06807d38097b4d3bd8a51f9f3278d069ce73c35b10dd72ca9e48f485a4870de4e2b3d827d1a433b4549a562c6eb9be68b2823bbd557f98fda";
-  sha512.source = "c9c569ec7b1e740212969fecce09008455fa6f72b28f00cbe62bc5c2087600f6c368ca4b49c312a553f16c5f9f416a17752a70c3e00885441807278c81195429";
+  sha512.run = "5951daaa320cedea9d40ce0af8b13f9e15e926bcc14cc31f64bfc92bbd22e5a600e1c696f0e7bbbd1cf6a31141c6d3a985433a8000df7c0eee0139c40393667f";
+  sha512.doc = "a09ec87af77663740e5cfcd271e7ebae1cacbee24a31093912a7ef3925827bf35800db424d3a88a40338fb1f1e63d033071b8cd3449493d6d3a64ada760289b1";
+  sha512.source = "8120ed30e7911dd224586f66ac93bd96ef3b87684239a69c21868968d112532c49d2d0a356e05ec17e1fd05433898c83b20dc3e8d8a51539d46a4ae53998fba6";
   hasRunfiles = true;
-  version = "1.5";
+  version = "1.6";
 };
 "mathpartir" = {
   stripPrefix = 0;
@@ -18559,9 +19298,11 @@ tl: { # no indentation
 };
 "mathpazo" = {
   stripPrefix = 0;
-  sha512.run = "e81a55353385ff86614cbfca0826298c6b5ae269e3d17ad8c9eb391ac37b25c95c059e916dadb67ac7432bab96be5d8a496880d24e56327129f6274c4950bb28";
-  sha512.doc = "0f325490cd35d94b202deaa7a27f4e4685ae15760dc06813d67ba7f156cf62ef56510c2e07fd8759a6c27d3d947d608bd72819fc36aa83674ca97af4641bc368";
-  sha512.source = "65d2a446e86431d805db9e7384f18c1f73fc8a5e7ef4bd55dd2bb30493345434f9b5b190b650e0af6ac170372a410f149d3b538e57b7b2189bb029a07e144745";
+  deps."fpl" = tl."fpl";
+  deps."palatino" = tl."palatino";
+  sha512.run = "72bfba52e37abd933cb7b1b19dd813c3c76438591c94f9c407cabb8a44c8c67f78fae04442027287e5bf30b7239c3703ece4271194716882773eeb50d4cb2f47";
+  sha512.doc = "94e624f2cea50bf3534300d3332dd61e1bc5b4c834603356831d0f9bf4c6bdc34af5d31df002c10430d4945c2c71dbf7c156b7b05ba08c657cc2d960839c2a35";
+  sha512.source = "bd6aba477ca38c9778d7d23460420f485ac5658e9514ac2260475a50b6ee7e2ff736bac81a4548fb4aebae952a406a0de1bef01bd7d8fe4984080ab835d328d4";
   hasRunfiles = true;
   version = "1.003";
 };
@@ -18593,11 +19334,11 @@ tl: { # no indentation
 };
 "mathtools" = {
   stripPrefix = 0;
-  sha512.run = "b3b13f14a37ec2e664ebacb0d30b220cf9d0ba8ba06e456c7f53d9d75e8018fdd685d0c078ae784c8bd13d5bb92c2a9868cbc028a925278391849de799092521";
-  sha512.doc = "f30811f20820e24e541bd0a19763ca713dd085b0f55d98a5d6b75116c18b80b9aae2240e6a9bfdcac0674244dcef72a439dd4287928fbf25a04ad44dd9fc11a0";
-  sha512.source = "e97678109b7655b1c2b4346bf1622a12cda4271ecb7bd010e36b158497c0506f6182c0fd7c5bd9e150e0a3e6211df8ce9e06c3c0343348b4f2508d9db88a93dd";
+  sha512.run = "c7da4d6606302ca3d569755f2cb532f93db37982113b8b632d486055ab08c9bbd1ffd0d285fc868907be3faf685f7dd3bb9b00570e75aced623a48c78c9f7937";
+  sha512.doc = "1b8bc4dcfb70575aade3bfb2f110f6561de4e4ee4ec0f39fd6c2726ded19a455280e131ffdc35840c3230a466996a5623683e94796541de3ecae7c58bd7b7f27";
+  sha512.source = "b174478ebaa04ae0fa28c78af928c3cc9bbc74939da3f54eb7a90b2b2dfbfd7f96ddf3d422419b25c2894f44b66e720b0495ef46a5d04d7f102a1f4f19f16028";
   hasRunfiles = true;
-  version = "1.22";
+  version = "1.23";
 };
 "matlab-prettifier" = {
   stripPrefix = 0;
@@ -18651,10 +19392,10 @@ tl: { # no indentation
 };
 "mcf2graph" = {
   stripPrefix = 0;
-  sha512.run = "39091f364cbbcea1fedaf04ade0ae9ea01025c188eed41dbc0babe4fbc68a76b8bb367614c6515cfc0b311b93771040d78dd15bb871459bc93acea067e6f04eb";
-  sha512.doc = "5bf78d5b708c93b23307d9c10394a74ddfb8e2926184db5fe7c7709cd3c140980f9c391b534597448b0b5003d2ab24b3ac0fb308d0bdfedcf207e40380c495bd";
+  sha512.run = "39324ce41fd8bf3f6c478533bb96f8c743d183754e28ab68f431fc74b1e873221a81fb782ef5f8b897dc9f929e19b41e617d042adac54d8b3c1c3b1094dbc3f0";
+  sha512.doc = "e005ebab9b4ccbd6766ae91a59fea1be987ce290c56569fe754ab0ac4fd7c68046345704d7fa17e75d4b3b5ff361ca907c34965cb6eff26549909ef55804a145";
   hasRunfiles = true;
-  version = "4.45";
+  version = "4.48";
 };
 "mcite" = {
   stripPrefix = 0;
@@ -18673,11 +19414,11 @@ tl: { # no indentation
 };
 "mcmthesis" = {
   stripPrefix = 0;
-  sha512.run = "1b74cb3339eae2ea8fbfccdd993b69177f901166015fd10a422471bfd84495774309a7bed56a36a5ff56d3ca119954353f844ec01bd64ae5dc64e7586b1de17d";
-  sha512.doc = "5944885065187151f4336d34cc94328f264ea35fde8cce35a0da4a13f52d1261a3bd32885f21ca442694cc98219d2c4a63708f31c918c4768f6e8e8f4bd54f52";
-  sha512.source = "9ca1ba748ca82968a940326ad695ad631f9a4e081a635b845b6ca94467a52a4e63fc67074414a214adfe0f7c14f91e07339b32bff28b5e770b6ae7bdd5ab3b9e";
+  sha512.run = "5768d3d07c88c186c9b1937efb3b4fb21cdb1cf9b05cf653657f34839e812c0072b0b0a24f05fc24cb29fe084fe8d26a099481c8b753e99c08b481957635470f";
+  sha512.doc = "5bcea5b94809ebf47416a9638112979d47a64aaf7ec02e1729bd8004f7159383f2c07db03164f44fc450548a80a7905569aaddd0fbf89775f3e1f894bffb20ee";
+  sha512.source = "23016bb72ae6eb43af0903440fefcd59d0a3b3b7d23afe5a834f1497d4cfdb62b88ecf78232909a33efef3f15370efe116e193f9904b9aca9385c282773e1548";
   hasRunfiles = true;
-  version = "6.2.2";
+  version = "6.3";
 };
 "mdframed" = {
   stripPrefix = 0;
@@ -18712,11 +19453,11 @@ tl: { # no indentation
 };
 "media9" = {
   stripPrefix = 0;
-  sha512.run = "dc3f33ef201fa910251d84c82b00efe206138bbb110a06752c0a5b44e98207500788f5494c7abbbc83236f39bcd131ea7434bbb5c72653e6c43ff8d6733f3535";
-  sha512.doc = "1f25b870fe8e00ead3d3703be49b8e3593b497764edd9681a7c065bbc5cc091b8b97830c76c4c54a4f206bc1c4d2942318f06734ef169ad54160ef983a19618d";
-  sha512.source = "a84780ee19bb49d3e3c34e8765be950388fe211d16d70633fdc0735dcd55d2b8df92cea4cc51ae73185844084a083299363694a73e399141403f52420ffd0b18";
+  sha512.run = "087c7f30c59645c06c7c09d9e48294f04a078baa1fd4c955ac4a7fcdfeab6e4ffe71a02c3ad77729bdf7bde16b15c940f38faab6a4a29ff594fd0a3185330e65";
+  sha512.doc = "ff27d8f8c4468cf3d6a34b8f9e677ec0b4a9b1765dd3c6d216e2fd2cb0b0fee09ae77c2237d6a236758ea6bb9c6250ffce49c282276301789a8026ca820f56bd";
+  sha512.source = "e281484f1dabfa99517810989492b1681327dc9c30d993ad0e9db89e1b4e64921a6a0b5a46a86e48048a7fa96e38eb16eb392e5f7008aa5728669e00c47e5e9c";
   hasRunfiles = true;
-  version = "1.03";
+  version = "1.05";
 };
 "medstarbeamer" = {
   stripPrefix = 0;
@@ -18746,11 +19487,11 @@ tl: { # no indentation
 };
 "memoir" = {
   stripPrefix = 0;
-  sha512.run = "b20d8d7f3e4a65d033f97ccace40b4e0f7ecb6ee143b6f0ecc7de46de7610305d04247ea4bba6b415940ca75ffe468793233df5965a5e366668fcb0a4ea2fbf6";
-  sha512.doc = "16ff13049125d9e3e9d1a735ed2a0c89c169769b543048b9443b5d03192897296727e878a9612a63683eb71fca9535eb0f737be6a2e764e9413c9b723d783b5b";
-  sha512.source = "e1586285097ba0adda9cc667afdc4ca143b967b5756ec3b661b2def79a3b13efc418a6204e3400b5bc799051ed62dca940c683de5d64563cc5839dc171b794a3";
+  sha512.run = "675bdbf5fd7843e44f747f720fe5fd85cead9b7179c5e3ca2a0daf14986eae7b57503a7ba6c2046169c3738ef2670aa0b013d8b1e9219834f4a85148107dfdbd";
+  sha512.doc = "a1ed8ca63f64e27fedb42c02bbfb920f8a31be0e4eed4f2fcc06c02db74b36b619612e6d721a73b453f82873e6da27065a91ead1444f4892105bf5d9aab87a06";
+  sha512.source = "a99104d5a94d53a038fe1dd771de900d4103dfcc46c4e8abf58beb49fc2e775ea190ac0be775eebdedf72d877d9e69d5de49e9446e08ee08dad85e3bbf6e025c";
   hasRunfiles = true;
-  version = "3.7h";
+  version = "3.7j";
 };
 "memory" = {
   stripPrefix = 0;
@@ -18811,8 +19552,9 @@ tl: { # no indentation
 };
 "metafont" = {
   deps."kpathsea" = tl."kpathsea";
-  sha512.run = "7a1a5d0090a538bda4abe8f994a6891f46a8c276f45f26b0be0901102fdb55103a86848a153d3b0a980d08321471cea3f4249595aa4dc6398875d1d14cef8e96";
-  sha512.doc = "119568cd01c06d8772495ff725f3056d648b844b58591216e8f35caf0f80b5d5908ef796c725eb7d917b04ca734fbff1ec0a4ad1e554ecb6a5d243a829644beb";
+  deps."modes" = tl."modes";
+  sha512.run = "35013e0bed6fa909f25ef74210986c3010b0c8de51975895e71c532a64f1d262324cde90f6fb2c956dc8efa454b14c5872bb9b3b91061c31a007dbadbbf59eba";
+  sha512.doc = "5feac4038689d6447150f7dbe1a6309b5b80e0b960317771560b1d5a70d9a56e52cf56363a4107b5adcc9d95cbdee4044fe771b33d2adce53831e1ba26508020";
   hasRunfiles = true;
   version = "2.7182818";
 };
@@ -18875,6 +19617,14 @@ tl: { # no indentation
   sha512.run = "95942b1b110e65274839ba01c16fed3e63a0ac99aa564d7a000bc9d9a0f5625ddc1dca13e786d0721bf93e76410722d4d76c86a05297bc39cd9af6dc91c2e6f8";
   sha512.doc = "2a3aec80b511864878e07ff973e17ed4fe1aec692c7e6983b57dde586aa19500cdd373687b0e081dc80c8584f116f0fa3de7ed4f09ba232eee8adce5e998c954";
 };
+"metastr" = {
+  stripPrefix = 0;
+  sha512.run = "c7a99993dbc27d883a8d1dc6e1c95b64db6b173b534773c28906966aef4f1036f27142fc04e927a370acccd02f16d139ee10f0cbdc649bbe49474c475293dbdb";
+  sha512.doc = "fccdb834bd22eb214eab42fe18afa3b7106099e3e589f3c685a0fb36c2226bcdd73ef5ca46ae48bc692e9d7b5868b8b8c263c3b02c796688466b7a54905b451c";
+  sha512.source = "12c5cd5c449f211aa6b047a19d88239d91ccdf73ecd7dd7d9493341fd245a5e3b5d3fd089a3b5c0d3d5f904cfaba5f4b3e821021e667da4d8046535da57a0619";
+  hasRunfiles = true;
+  version = "1.0";
+};
 "metatex" = {
   stripPrefix = 0;
   sha512.run = "8d438cf0f3bd375c169681b242b7f00dca96cd3bcfb167c6aa664e27dba59eefb53a6d28ef537802d584b17bc578b1d63ca25799146ee6d986bc647ae1b0af2d";
@@ -18968,7 +19718,7 @@ tl: { # no indentation
 "mflua" = {
   deps."metafont" = tl."metafont";
   deps."luatex" = tl."luatex";
-  sha512.run = "a12e8a56228f0e3c49ef08a47c989135028ce6a99db714eee1304feaa31ae10ca5f030291ac56e9a344b54626247a521a909a18a35038333dbdce6553019e31f";
+  sha512.run = "d7e7707c9c44f0e744326afcb58e3cb5f71451530503c0b09940db3d5d29d6d0d6e0b3b258dfc6a85d8698afd85a61c196c0f9d47ed804b7b2b12c94a1e229b4";
   hasRunfiles = true;
 };
 "mfnfss" = {
@@ -19017,9 +19767,14 @@ tl: { # no indentation
 };
 "mhchem" = {
   stripPrefix = 0;
+  deps."amsmath" = tl."amsmath";
   deps."chemgreek" = tl."chemgreek";
-  sha512.run = "c6ab7b1a02d2b4c510e487d86857ca82b2d9e9b46a786b6067b91a097246ccd40e24aee09b2140ac2b5446f7b12d85614b31ce75d45641d923bbd77411696781";
-  sha512.doc = "832897ccbc039a46d0c5e0c3c8dca172ac54451b8d22a5d275acd6fdd30f6119ed13345b0b473c44edff3c8cde47480e6fb3424b795db55957d40bed08a1def1";
+  deps."graphics" = tl."graphics";
+  deps."l3kernel" = tl."l3kernel";
+  deps."l3packages" = tl."l3packages";
+  deps."tools" = tl."tools";
+  sha512.run = "32c9a82b2c4f6c2ca5a48d3f781206e4384df91a13d2ee8f7f5ad0ee5ff454e6c70c545eb576b4d8431cda581ed1f8ccd57dbd22d281d764c4872fef28c6626f";
+  sha512.doc = "5911b5548fa03abf787ca009b08553e3e575bb0d6601f36d878d7541e5e5cea0fcfceb5c3c69e6459f3aa6b791f8090bc244edb35c116112230bc5928b15f901";
   hasRunfiles = true;
 };
 "mhequ" = {
@@ -19047,11 +19802,11 @@ tl: { # no indentation
 };
 "microtype" = {
   stripPrefix = 0;
-  sha512.run = "fc9b36ea89ff8b064a415c84d692ee6cf2a928d650bff56bea9d34e3bc5bae84e080b3a34c147f9bb1b6f16d2ebdb7c32198a592ca2470afe4b181dfb3e58144";
-  sha512.doc = "ab9092d0b91881d78fdf9007b23f9c147fa944bef745329cc2a099a1e4dbcc9aa5836cd79cef3dedd2e458e2c9f4e83599b20436bd3d50e5420c84929f660930";
-  sha512.source = "d79f9aa79e3b4ebb38dd6b72dadcc6e00d722010d973d2bd6177350f4bc58d6f2e490be1c1eb7233df1d2d6a0a10d70dc76e08aa59bc7109099e2c0d2c2864ac";
+  sha512.run = "eba24c7a1e0f18e5d559d559745cecc9398630e4491b5c71f695e0e6893e74a87171e6cddaca8345e99ddb63558ad2a712822819c17fe1c20684e043adde4fdf";
+  sha512.doc = "b0222af67733ff7e11717388d10e0b57fbeca805c85844360ce70bfc3b5d0c18157a12fb40156edddc263b8970c9b172d3fd4a1210450efc250aa05334d2c5b7";
+  sha512.source = "638efade6088401e90aed764f47927b28d8840dd4e8fa1db2d1ca160a746e0633ae5da9f4e9947fde49ae2288fdf48dd37e7771b4e0011d10c2066a9cf4fb4ed";
   hasRunfiles = true;
-  version = "2.7c";
+  version = "2.7d";
 };
 "microtype-de" = {
   stripPrefix = 0;
@@ -19170,11 +19925,11 @@ tl: { # no indentation
 };
 "mismath" = {
   stripPrefix = 0;
-  sha512.run = "6993d47e645b2cf4ce2bf735e12b639ef9cc3e91bb48be0b693534b23ae6b1b90b9abef56d3781e4d87aaedccbfa2200f963379842635d43de6d3ca76c0c7b92";
-  sha512.doc = "0e2fd30b52ba2ebb77ecb4d3c90218fb097b65356a5a7a05897d29394ffb59649d9ab24f1140b416eff8a64cf0ec16d326f312d55488be8fcbe9eb591b598a3b";
-  sha512.source = "a568817f4112ebabae20e73b8166085064a6b336ed242af132f96313eccbb878de8bb18f08ac8be2012dea6cc63af856d80afe5593f336090059dbfe869acf39";
+  sha512.run = "0bf6eea83401374473c001b3ec6a39c70d14551983a89fafdab854b12000d7806b76bbf10fd3fc393d5e7bee0880bb9fff9087da274b643a1123c128d708e22c";
+  sha512.doc = "359a86cc49554c0efbb932b0cc8e7698582b01fdd7935d88d50a754d91bbc7bd8d69ab3cbb18a81ce89c3614fa5a22ff27bcdacecaee1dce3adf35be9dd119d3";
+  sha512.source = "bdf6b92a81afceff6705e7ce4aac5b50de44dff45b84043638c807ebec3435d732e1dfcbb91118e1963eb7e585d6f22188be75abfa5b34c14af3c5e7f0e42046";
   hasRunfiles = true;
-  version = "1.6";
+  version = "1.7";
 };
 "missaali" = {
   stripPrefix = 0;
@@ -19223,6 +19978,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.6";
 };
+"mleftright" = {
+  stripPrefix = 0;
+  sha512.run = "d1423d7e794ff011e6bf436d85bc3d2d933263bee059cac910e1a3375140d0eb0f1682e38c675afe17607d71d253b656a81cc927d22f54a8add2df01571a5e95";
+  sha512.doc = "193d3fa473d136c11ad8a1b4f707d286cb0243bd32c020c1c5343c23a5d6347c2ba2ccc5c11e5bf835b4666c8e4a0ca2d234661e155c0f5fdc32e7b85cf2d253";
+  sha512.source = "365cdce5350ecad7f1ea2fe478ac4c7414c9e8c5053c480229cfed7a478f135cb033e67070f327956cb5aadf862762e270726bbeaf8e511b10fc96e996e06d64";
+  hasRunfiles = true;
+  version = "1.2";
+};
 "mlist" = {
   stripPrefix = 0;
   sha512.run = "23466ef3b73d8476c69632fe0c701f3ec675250b534fb4451cb0dcaf93c30a649ca07bb58cfbac89054cc31cc1219daaa1e7f746e6689927573175d42f78bfc0";
@@ -19237,12 +20000,14 @@ tl: { # no indentation
   deps."hyphen-base" = tl."hyphen-base";
   deps."babel" = tl."babel";
   deps."dehyph" = tl."dehyph";
+  deps."l3kernel" = tl."l3kernel";
   deps."latexconfig" = tl."latexconfig";
   deps."latex-fonts" = tl."latex-fonts";
+  deps."unicode-data" = tl."unicode-data";
   deps."knuth-lib" = tl."knuth-lib";
   deps."plain" = tl."plain";
-  sha512.run = "61f3712c0422eca9663cba6159a98ee20fc902e8c2afcebe700239958a97f948e8d02af04a5aec779751cd13f9d000128b4d6acb4b6d00f95164775693bd7f37";
-  sha512.doc = "4a4f957ea1d27c25a4a5ca5a3aaaa7be0d65513741112512dcf65c4326c81ee090f371a6f8787629a8a7075344d8f8150da006004945a5075bfaee095e1ecb95";
+  sha512.run = "b03ff5cd8548afa5d6caf9d8d3b03e662c515752f957c6876653169de58bf0af01dc40f57aa9b6a43541d485b8b9e633276b791466a60de9429db875fa81f8d7";
+  sha512.doc = "32a8a3a1e4f482db22586466a89a964a5394452b375b3b0babc02c720f7ffd02786297a2246858ba23c9d8b8d276a3396ac15aef721658961b04faaa3a8911f7";
   hasRunfiles = true;
   version = "2.2";
 };
@@ -19285,8 +20050,18 @@ tl: { # no indentation
 };
 "moderncv" = {
   stripPrefix = 0;
-  sha512.run = "0d175791a9d10d0fa9fbe2702d663ff94d06f5486aff2b8563f9dab1f18305be0e29cdd050cc6e8206c07adefd0811a614589f7afd1af4fe37687c7eff229b43";
-  sha512.doc = "3dcad35776d47e27e6013545d28e2f6891eb538775d30966ac89aee8a8d4111d86acb2dc51e546070c818731ef6a7d753a55939e80c2cb5346c5b127e7e63b77";
+  deps."etoolbox" = tl."etoolbox";
+  deps."fancyhdr" = tl."fancyhdr";
+  deps."graphics" = tl."graphics";
+  deps."hyperref" = tl."hyperref";
+  deps."iftex" = tl."iftex";
+  deps."l3packages" = tl."l3packages";
+  deps."microtype" = tl."microtype";
+  deps."tools" = tl."tools";
+  deps."url" = tl."url";
+  deps."xcolor" = tl."xcolor";
+  sha512.run = "d45dadcbe35356b64c6e81173e02d08f03f148333aab7f40f7ade71c6818a9be0fd649472ee9b7605bd0437054e304ba9fcd991c9092f7550b8cc925b66b6522";
+  sha512.doc = "ff121a7936943ca52f5bf9007b34004e8a8af6a0161a96e42eec9b08947df72df289e7dd324eae539ff7eba93f512ae441118d53dce1bd7763c93adfbcc32ab4";
   hasRunfiles = true;
   version = "2.0.0";
 };
@@ -19305,12 +20080,19 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.10";
 };
+"modes" = {
+  stripPrefix = 0;
+  sha512.run = "85e7cfb20a26d64f007def1edf1353b225dbb1bfcd4398d74727a02b345c35aadb486e45c526202c28d6617ad079de57811fcc6dca1210eacb76df7a7abe7add";
+  sha512.doc = "4e6e9cf770c72177b729812469cd25f11967cfc90eaf7557d182409f8f1ca1f438bdaaa20a8935fcbdaf69ad2b7c60e55c00c76a3f506fbfaffb5b74336e0230";
+  hasRunfiles = true;
+  version = "4.1";
+};
 "modiagram" = {
   stripPrefix = 0;
-  sha512.run = "7a84caae8d6811bed003266283674bf364d18b9d3cb01a440bfca97ee66124b991b4a3dfc9edd07059f02e047892d8cabff81bb0066d449171b669cc872be2fb";
-  sha512.doc = "cf1ffc9c60773c8860cc4c0021e6af82a719aa02d1ae7c56dc332d1e2fb6bfccab85c09473ad8f62a7219703d792cd4bd9db311834a35a186accd4857661ec37";
+  sha512.run = "aee09f61375cde8fd2ad80099fc42234a4ba787b212cf8f5e5e28a09480bcda5c307bc3e2b0e027b18666808debaa2f5215d3e98f9cd816b9f31192b30f5993b";
+  sha512.doc = "d07402a534917ec27c6415503c73ea5b680515a223d41d2f16ceddbf6805c61c29404d4628cec21cb15ec8e8cf3ac62c5756744fe5eb0545e9381d001d05a3e8";
   hasRunfiles = true;
-  version = "0.2g";
+  version = "0.3";
 };
 "modref" = {
   stripPrefix = 0;
@@ -19368,10 +20150,10 @@ tl: { # no indentation
 };
 "montserrat" = {
   stripPrefix = 0;
-  sha512.run = "10f6a7bbf0d3ae2ba7d859d6e180e38c01708439cf27c89f7998aed93eecf85096f368094ddaecef304e00a62bfc76d8106842bcfebdb94b2a5c8ed27c51825a";
-  sha512.doc = "63db767833f42d6340955aa67e0cc48fd0edf9e47ae129cd4fe39caea13f6613142a0042d97e366eef09b935fba2b3c27dd473d2cf7549d235fd6ebf27e4c1e6";
+  sha512.run = "c6794b165dbd522fdd5aa2a57518cd8e1377c5a54bf4031c85804104934b4dcf0bf5f806bcc57b0683fed9b3d51ae45ffea6c6f27552f0c4072d9588e077df6c";
+  sha512.doc = "9ffbd4159c42506df109d62f380f3324929ee0aac5a3af5f42e7ef57c9dc51b0f543e52a2f6651cee7300117a8cced44d529f6e93f8865b0562e8bef01615cf7";
   hasRunfiles = true;
-  version = "1.01";
+  version = "1.03";
 };
 "moodle" = {
   stripPrefix = 0;
@@ -19476,6 +20258,12 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.20";
 };
+"mpfonts" = {
+  stripPrefix = 0;
+  sha512.run = "20406681edb69ad3a366483ef17d2ca735ba61479458475b3a0f010db0212d1c453a8d152aad97a172f66ff68cbdb7b5b070a9eb630a60eb141ee21b60ef40ab";
+  sha512.doc = "98d9a49b711d6889da96765cd24b1ba308d2030133fb8de13e5c69724d1c540a1d9f479a1c11b391f023bcc00a617b32e66b2b05e00701e9d9cbbd5e0ca87b4e";
+  hasRunfiles = true;
+};
 "mpgraphics" = {
   stripPrefix = 0;
   sha512.run = "5d711f7a981f701e11874916fe8d22fa237404dc119fc2d5c8f8e9b3eaf8feb59a63023ec30f0c67d304839e4971288a669d70a697260af35e401edf00673adb";
@@ -19500,8 +20288,8 @@ tl: { # no indentation
 };
 "mptopdf" = {
   deps."plain" = tl."plain";
-  sha512.run = "3960623583dec782191299a72261e41d85a636d6d630cbde0b0c85c5ff84263699e31bc4ebef674dd516cdbf9089988b5ccb8afa8fe5bf9134cec927d8078c22";
-  sha512.doc = "a80bf1cb2fd0f7197162d0b3cdd2e7dcc084f3745e92273df8e45a989e42bbcd5522b9cf5aeaaba597c29b285181e48e08767b63ae484193c67d42b47479c6a6";
+  sha512.run = "1c005dda3caf90966782bce15e6f82063c8b87cff0b5458519f78a7e064fc0ec4eadc4aa3644d61770cba92a1157ade059f8baa347868c12741090ab370f70f3";
+  sha512.doc = "2ecc946c3a7027e502a468c8fe8366c794b4c1c8c3bb5c1f58a2ef127317f89ba69804de10070844c7fd43ab49b8ee66b0326d882a5aba615a4fca6f7f4fd1f1";
   hasRunfiles = true;
 };
 "mptrees" = {
@@ -19685,8 +20473,8 @@ tl: { # no indentation
 };
 "musicography" = {
   stripPrefix = 0;
-  sha512.run = "6c1bab036f58b9f1ab39a29e4c2344361e772e44992da5c9b345d3d2b97e4b5b5a5f237494f228bd1ef812f1ac5d5e00432133c64d8a71cfeed9e526360f2310";
-  sha512.doc = "a9497d4dab85061ef8fb5698bfb7e3a1356d141a4c1736359f124842e09d87871ceb3035e6683c2f2dcccc39accceed4fd2b76a6cd2850958e3cd3740f04affc";
+  sha512.run = "062bd689224a432188b10d53f1224cf915432147db66d93d944fd9fbe9e0ea8928562fb19a6b5f94373db7c6fcc2c23daf7a7fa338f5b9dab53e9eee2a78db35";
+  sha512.doc = "9dda39b912cc766aa619254eba7a7d3d90bab3a24668d82e2d4c9c18fff1bfeb7a09e549774aac6d654da1108378f1867ad1d8e84464f8672b3f5ddf445d5e47";
   hasRunfiles = true;
 };
 "musikui" = {
@@ -19762,8 +20550,8 @@ tl: { # no indentation
 };
 "mweights" = {
   stripPrefix = 0;
-  sha512.run = "944c84225a923fb3a1b72f8f44872fbf9f1207194924c9fba8c9c45a2de304748f9630a6267868eaabb5feba4b268a702568ed81cea6cc587319a1cecb94de0d";
-  sha512.doc = "613f3a22759878a34e659a9606b289cd9969280a3de4e8a7614d277aee66aeefb44776f555efd0d2e11d61f70342f747301002bf9b84b888f01216c439cb5a5f";
+  sha512.run = "50d675bdee00625b5fbdcc1ef923a48abc19af890faab90ddde4893081dd2a5de6b5ce9165a4bece512c885ba3f3990d8dc300a873177c725a5aa16b434d4e77";
+  sha512.doc = "b103ae1a7e4072e646aa70ccd660cef52b6954deec6425fe2007c15a1f56fb45d43d276449e436f188e52192609766237ec22b69c7782af5c0e3f15081989dc1";
   hasRunfiles = true;
 };
 "mxedruli" = {
@@ -19828,11 +20616,11 @@ tl: { # no indentation
 };
 "nameauth" = {
   stripPrefix = 0;
-  sha512.run = "e393937e84856a21433266f18f78d739036df951f68d21ff17c607206abcf6b77f32253be2e7a771f10f1f789df47fe6bd45f629417eff94b91ff9b4f7179f74";
-  sha512.doc = "b586f85eb88204670384a0c7559219704f92c9f03922f98ca01ae2a8206ba3afbd920f94374f3c62ea3923129708a2edd74bc9b79be0d09ed1c29491811cc2d1";
-  sha512.source = "781de5fa5d74cf295718a0225e5faa87c3f65aa7f42def1610eb43ea86371ee3dff406f7b7fb7ff5a1dcfba84671847ac975bd55b14ec15875712405d912bd9f";
+  sha512.run = "847d9562465a4b1a8d126b2f35acafc9c2121ad7dc2ff6cea5ffa4edd744baef0710192bd196fa8f11f9972f5ea57db1df7ec2b533cbd473dcd241a1f9ed3794";
+  sha512.doc = "4a57f0325184b04c59e9686d64c2361cc139000ecdf9517cf56f2f9023d4c8942ea7104524583eb8b8bff1bcfe9f2da9b26342b5df146ff5974c5d70c037948c";
+  sha512.source = "2daa93fc8a1177cb1667f8b654399f6e90ef79e29130a2a802ecb976c2b5a7478484af6c207eeae8cf350d300cd43115196db8d199637bf5390d7282911b865c";
   hasRunfiles = true;
-  version = "3.2";
+  version = "3.4";
 };
 "namespc" = {
   stripPrefix = 0;
@@ -19972,6 +20760,13 @@ tl: { # no indentation
   sha512.doc = "84f71adb1cdf4213f34e30a2737f41c93fd0e8ac4970b2adb832570c98c5f3876502556392fa077a8cb647a552a8e914b2a30e4e38a039c355802e2c85c5f3e1";
   version = "2.0";
 };
+"newcomputermodern" = {
+  stripPrefix = 0;
+  sha512.run = "24720e53923a2669e8bae12153c86e463215dca9c11a1cf19bd4afe71181324b598f217bd49b43b503c50bcaad33e42236549f57122e1d1906882ffafb0ab51c";
+  sha512.doc = "8c61e46f813cf230fff94e2875acfa58cc38663c66ef8ce1e6af3a18e9d9058276c670178ef4033f90599e117a0b880bf6e7753e25856113e407e57177470bf6";
+  hasRunfiles = true;
+  version = "1.001";
+};
 "newenviron" = {
   stripPrefix = 0;
   sha512.run = "4ddcc24de158fb1a5b585c65adf769c3f92c4598355306e08257f4ef62718c6ca7f2dea80d742759601b37133a951d031445a39ed5d8062496459cc2f98a71b4";
@@ -19987,6 +20782,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.0c";
 };
+"newfloat" = {
+  stripPrefix = 0;
+  sha512.run = "2cd4d1e5097bd6b9abd25621fe64590e67f8933a5292f83277dd546cb949c6193af04e16a72e61c3023293f6471ed41e9b46c23dd4c6c19428c7875cf0279aa8";
+  sha512.doc = "4a9b942a072ac5da1e92f6ecd63ff16cda41195403794c8a111140d4d6af43947875828d497f7824bdcfd41ca03ece22469ed5e0fbec0cdd84c56471678cd469";
+  sha512.source = "311c22bfb91719a8358f5feb89f3ada35de942703009cb47d5489b2800f9eb149a285cd6ac99186f94cf8d82ec6b9f582dc9922cde9afe515c10e483044f0d98";
+  hasRunfiles = true;
+  version = "1.1l";
+};
 "newlfm" = {
   stripPrefix = 0;
   sha512.run = "72f7b087ba1002541e3d26d5b41b58380443e30061b92885bbd3bcc017b17cbad9227c14074a53706b98c785117c7b07c6d49639c84c617782066491dc0cabf5";
@@ -19997,10 +20800,10 @@ tl: { # no indentation
 };
 "newpx" = {
   stripPrefix = 0;
-  sha512.run = "bd5b9831b0c42c3d3558081085ad469637390d8410dc65ef622bb6cc01583b8b1d7da3b2a6c4c0a1409e1aa15334ac3f33aabd5666dd986c9168203204c143fc";
-  sha512.doc = "4a9a94af1171047411df91dc6a105f4fad7431259fd3035f61fa34b5611999486ccd031b1964b367d75a36bb77a92e7a368681fd2e6df3d9160b22194e90e1ce";
+  sha512.run = "014a13ecb4a30f957d99ce91c81aa40e246e8f270801755c374becc056d7e91eabfef9cfaa26ad1ec1a1b15dfc2bf18749682ea2370299844c0c16acd220061c";
+  sha512.doc = "b7c008b06ffb4671f3a33e26296db91186a8db2748830524c4878c6714717fc9effb9d26a07a270c75e514a9c2914df3482a19ef0b5e5d4e9e131d6f92c796e7";
   hasRunfiles = true;
-  version = "1.403";
+  version = "1.410";
 };
 "newsletr" = {
   stripPrefix = 0;
@@ -20019,10 +20822,10 @@ tl: { # no indentation
 "newtx" = {
   stripPrefix = 0;
   deps."kastrup" = tl."kastrup";
-  sha512.run = "c765cd858ec698cec72819e61f04fc75a53aacbc2459af20ff1c0724093a41b0c1dca17168ad46d118adac6f0290757c1ca4fc996fa9bc2a42bb5a83bbd4e10e";
-  sha512.doc = "494520dd7654e414d430b77acba7fd444ff429800e0a98bb2e4af1ae2f4472ac12d6b959575f5c9e821185cbbfe8703f1f4d8097ff890056cea185d304491422";
+  sha512.run = "aa18b291239e3cf2e2e974e276b4ec01efc4a214628520af8d09ffe0910e1d2eead4b9f40b081d69be1f6ebd7c06c356eb26ee0d7e653cd82737f85f097764bb";
+  sha512.doc = "20fd1a381fe48338992151ddf1696e33fb01191be1b8a2e05121d84d531bc8402a0acb9284a2cb13ff090f052a190be1b0f2baccb581f5e832045eeff2e86de2";
   hasRunfiles = true;
-  version = "1.604";
+  version = "1.624";
 };
 "newtxsf" = {
   stripPrefix = 0;
@@ -20033,10 +20836,10 @@ tl: { # no indentation
 };
 "newtxtt" = {
   stripPrefix = 0;
-  sha512.run = "95c25791796b56eb6e54be98c522861d3704e76c3d2a88c871fb88c9dfca616867a8cb839d8ba9f5b42e03eddf6d27f37cf91bfbdaae5aa13c4ce9fa681be9c9";
-  sha512.doc = "c4f9e344d0060b569e7503d12b1021bfd68bc58842778d2d9c4014b9f70c10a9a23ebca6495f2acac358a4d6d5710e8db48dcf445b3be5d278cc9818a57bb999";
+  sha512.run = "cba0af119d5c1dab0e62046c2d1deba626885be3df5a79b9ae129a143221f1062b33eb91af146e351ee1969157c915e39b96a5ff85116b87e16d5498101fd2f3";
+  sha512.doc = "2e96ac40334c855a12da28024aa05df5139c40b99a86e5dd5a94998453c187139eb73c927fccd653e4e99199b894620620dab4705064f99def6565f7501dca3a";
   hasRunfiles = true;
-  version = "1.055";
+  version = "1.056";
 };
 "newunicodechar" = {
   stripPrefix = 0;
@@ -20098,11 +20901,11 @@ tl: { # no indentation
 };
 "nicematrix" = {
   stripPrefix = 0;
-  sha512.run = "03b9289b7d8edb6a042fb4f9facd7b933d882ad1b88a8f70da8772e1d40628a59b331638a1cc149f2fc946dc252b7878b5950cd92b9944e34adebf6e2d1f3b87";
-  sha512.doc = "71089524b9cf67d7ba7156e3f7d1bef56ce699e2b39f8879731d692f2f9352f772d04714d7f7f2826d1db6a0f1ca0860bc490644f0df82e8e52ba0d5d85d9992";
-  sha512.source = "7f71495b48f8563ab8adeaf021dd998847001f5c05c9d643619fb370126bf31a1ed269b53c7be670549c94d13d32ceb9a5aebe65bafaa6815d696cbe2f7afc6b";
+  sha512.run = "8b84e5ea01033d93c7b8fd5764dd003c80c54fa5d1464972948308d611851ec1dc580b434f0bc0b7d4821b2617ba61231b017dabcff71f3682961edb9578c103";
+  sha512.doc = "15827f045d16f7ea6412b651e1d105fe55e6a1ba926d80eebf3350e3b8dc49554947499079e81a05748ee07db607b6a5275c0d1dcaf198dfb97e6dbb2fd29d6f";
+  sha512.source = "663a363591f44aa3c29dbfe1650370fdfc256a76996825d37dd60507c87fc39f6c1693bcd88fd8dbcf5509923e1ff3b5709fc9a7657bc8a65efdf205b96f88ae";
   hasRunfiles = true;
-  version = "3.5";
+  version = "3.11";
 };
 "nicetext" = {
   stripPrefix = 0;
@@ -20133,10 +20936,11 @@ tl: { # no indentation
 };
 "nimbus15" = {
   stripPrefix = 0;
-  sha512.run = "914621d7bc2d7f17f5536f7298885d720b348f15ee45a56493b6e227b8845136ae9394b93a20b8cd48c8333131bad21b4be473d61f57d5dd449dd416c3536c42";
-  sha512.doc = "4721c451b5f1a108ec86e9db369f34015e501aac3185f2dcdf34151a422ba94276d51ef09d1aecc86616ef7a72fb911c5634247c36e7fec79b60203a5e42e7aa";
+  deps."fontools" = tl."fontools";
+  sha512.run = "f045c6f3cd8ff71b05a1c323ecef4cca9b6af2d1921bdd7ef916d40064d2eda0c27c630de9eb85bbb9432121d5e0a2994778c7ea506202d093d95942e41eddaa";
+  sha512.doc = "5ed10efef5b70100d304d4a55656e3e2d101adc846019d4a4ef69d491c66a877c074a987298843e2fdc0d6e2a440452f3ae746a6d2419bca9312c76b6f2b9101";
   hasRunfiles = true;
-  version = "1.011";
+  version = "1.013";
 };
 "njurepo" = {
   stripPrefix = 0;
@@ -20156,10 +20960,10 @@ tl: { # no indentation
 };
 "nlctdoc" = {
   stripPrefix = 0;
-  sha512.run = "a13148e7c821353e23d9f378313023aa9140e48108ee7af258a5fd7bca9b42e620ce8eca00c3f6c9a27d78a7a2085fc86f5a2b73456d093b1aea2ff8a2f54159";
-  sha512.doc = "573ad374a072c3fd99c72a719f05dc37ef0b53742e78b1c3512ec8c495adba78183fcd3cbfe9ab809ad603dbf63d7dc26d7212a44272cf9a1114d0d954bc746c";
+  sha512.run = "9e73496b57f3a6ef6ab8f49fce6a57d2e0696b4361ee19bf32454eef9fb081f4124635b219c09f2f26578fd5c489e898c0a99b2ffbff3909b3aea6021f28407b";
+  sha512.doc = "0ebc3c315fa891a7a2cd3696dba75d755022f4b0b9f7b75854e98f91b31e93f32f0a513a78e0b6ba529b3fe515fd165c10e2413e0dd27c6c50c0d847a74e78f1";
   hasRunfiles = true;
-  version = "1.06";
+  version = "1.07";
 };
 "nmbib" = {
   stripPrefix = 0;
@@ -20208,11 +21012,11 @@ tl: { # no indentation
 };
 "nomencl" = {
   stripPrefix = 0;
-  sha512.run = "00f02434a164b721d996032ee97e3d6594b3e1119128cae47ef759a935fd454ae477648d1c1e506673a139c52dd8e8ef74b349748759b109588eca353d390604";
-  sha512.doc = "b7a2659e324207e37c38d37cf372c237cc94a3f8902bf9d907ed2a45ecfa94d463b550a4c3339dc75825a36b1e89e9cac771cfb2ae6bdfe3ad157aa235f488d2";
-  sha512.source = "ccc6093b379548c03a070b6443f308f757ea425148ab32dabafc3c271937f5d090918ad6f3c9f013bbbc6534c12dc9ffd7e8786f22999a8640650386b8ca3e30";
+  sha512.run = "420d6664ef3fb6cf6f1491325d7fee3435d9adf2f2a5920fb09da27303ae29a41403ff0f68e36dbc897a5811472e880324aa9f145d4018e24c595e331a0c447b";
+  sha512.doc = "69c83da8e9260447741dbab2006449acdd24d290f472d1522881143506baebc11f87ee0664331d1c4206b799b996d9b3fa9783cfd13a197ac5cf5a0af40328e3";
+  sha512.source = "8adaf08bb427d8bb848236bf8c80f060099bd3d8062aa2c9c0a007ccace86d036e0fbca6d0e5c98cad18a71dcf5ef833f11ce858f4732deb8967add2965cf2ad";
   hasRunfiles = true;
-  version = "5.2";
+  version = "5.3";
 };
 "nomentbl" = {
   stripPrefix = 0;
@@ -20305,10 +21109,17 @@ tl: { # no indentation
 };
 "noto" = {
   stripPrefix = 0;
-  sha512.run = "1b8835500a17a6607c35b5f2f6861e41ac250a042fba48e61604a967473dcad417350fe87ab350a72b9d8a49f8bd0fa65da6c955e98137c8b9015d3446806e9f";
-  sha512.doc = "6e5e003cb67a87355723f4460822a2f5e853d9ce3c3dad0887400d80c06e739bd4c98f268ad49530d0b3f55eaf031de50d38749aa457f2e4ab3c95a3b0b8a978";
+  sha512.run = "ad8c28a9d05c2dae3bcb097989debb110e3a8600567aa007c93f1782cc151d74abf62bacfa0bc52b758ce1c4a40180ede55406c68593983b1344d397d9efb7fa";
+  sha512.doc = "3229be953b5d4a4e642db5a0f8067ecd2b9788d96890640367105902609ad52ed56995671c7de9470cd295e0b77d1fb72fa600d1a52ec3e244be37a2da8c5e3c";
   hasRunfiles = true;
 };
+"noto-emoji" = {
+  stripPrefix = 0;
+  sha512.run = "c681b795a4f2678f5da213cabb37dde0fd604036e59593c34100bfca53ae56e9cbe2f408a2d1a99dd143b07d8a50fabafec0e51d614bb3ee6122b8eb27d6eb10";
+  sha512.doc = "c1794f61d4597ad06c504efdf94efaf2172d87b3efc29a289350122f85337f73c319fa7e10b261e7a9bc79ce96b8fdb3dcf4348454a0d2902ec5a47433b95ee4";
+  hasRunfiles = true;
+  version = "2019-11-19-unicode12";
+};
 "notoccite" = {
   stripPrefix = 0;
   sha512.run = "b63b890933b27717625383488d2cbeb1501ace58b83e5af66a35ba440816527dc879df444af78090294df6d4d412d21fddbab43068a6d677b22d750ddb4105e6";
@@ -20353,11 +21164,11 @@ tl: { # no indentation
 };
 "ntgclass" = {
   stripPrefix = 0;
-  sha512.run = "a801b4653b65eb27764a37330bd01b690c6eaf6cf569d18df01019af61b9a32efdfe3d1140ce6101f58a06294bdbe07a4c30110abaa9932df693d594d3a17135";
-  sha512.doc = "bf6d05d54c425b716b6a3c9a4f2e899d37bb7233b5386700e27e365f236ccb38b025722b7148529923bb94a4e88222a4c34855ab5c7490104a8d02f759acf3fc";
-  sha512.source = "1462eb56cddc974bc562c258eaeb6e031f89c3d0e0983c7810e276f500513bca0819f6ebbeb65182dfddc1dd495242ea260d945845e3b2c5e72ebcf15b8b13cf";
+  sha512.run = "c92ad04449f1cc888b80d0f5a6baf318bbf2f743f5131f8c3fafb263f88a2f9df2037c1e8172806a41dbfb96d447c1e55c949e99745a60073431f4affc27cba0";
+  sha512.doc = "18703b1ddaf9fbfebb2a546bc8e63f5e15958c6f07087d936a0751786f5fc620011654649999c815c3cc0e78a04c6efac736e1f36708ec858438770c27e9398d";
+  sha512.source = "1ce750624629809e1a13ff91be63584528c5d7a85f44304ea21b1beb6a01363d7727c1ff1268c1c373e3d0132b0e6701e3cf65c3be7ea01848fd08578581c90b";
   hasRunfiles = true;
-  version = "2.1a";
+  version = "2.1d";
 };
 "ntheorem" = {
   stripPrefix = 0;
@@ -20439,17 +21250,24 @@ tl: { # no indentation
 };
 "nwejm" = {
   stripPrefix = 0;
-  sha512.run = "3f5ba2d0971207cc76735268242e4cbaeb2ef956e5157b5c52fbfa061d4467061dc351f4dc9109d45bb155e3d7c098673f212e521a5efc55a3985cf8426da923";
-  sha512.doc = "7399a838fc6cb2a5c4a403c6f46bbeb373b9deb8435cdab0a892fce147dd365598a993cfbce3b9884cb4d2549fc1b3dd330a256c351b7df2a44aafdcda5f4545";
-  sha512.source = "cdadfdae87ccd8be021ef9c73b75d284c6bc34d98acccfe8faa16539e1eda6901a0f334fe2604273fe91d2b3860ea97a9266eaff6918fefd69b2b386dc993222";
+  sha512.run = "7bb333e3041a8cc20acf7b154adc8cf6008a759af22031dc2ac7f0c04fad341cc911a8a3ec4ddfb2048685a628c3042cabfdeb21d7f5d0128eb0844cea381b70";
+  sha512.doc = "5636fbded79f0ee81148f3367a88548b408928bb441e17c65aec16d75ced7218ecc627f7dd306baa4968d4229e81b9cd23361cf1adf833d8deefc3104632f7c3";
+  sha512.source = "d45391e905fe71a0c49e82e9c1e6cb019e05135d54e3af7401f692221ac76620d214095961360be6d903a132f6c9323db0680330c9b98115122282604c0851e0";
   hasRunfiles = true;
-  version = "0.98f";
+  version = "1.0.0";
 };
 "oberdiek" = {
   stripPrefix = 0;
-  sha512.run = "23385d64830348aed9697ab655600da776a5fbe8ad05c7d23bc2a8d3e51701efecabd27a7125fa49d2e65f2aeabb7935d21094cfed02912a2101687ca17875ca";
-  sha512.doc = "b8faa965ad60b2ebcef9f2d64bff6832734b476d8184267122798c51f8461c94c433908a10caba176a4e18ef72d2d01ecda148fc3e6a90f4cf3b9cc72ab13126";
-  sha512.source = "1f7449eeb46abfe1871d0fbf9a72c15ffb9b9861504c8cadd3606006f45a85870d18e617d4d53722d002340db80257594844a69a82024e0557604e45965750be";
+  deps."auxhook" = tl."auxhook";
+  deps."grfext" = tl."grfext";
+  deps."grffile" = tl."grffile";
+  deps."iftex" = tl."iftex";
+  deps."kvoptions" = tl."kvoptions";
+  deps."infwarerr" = tl."infwarerr";
+  deps."pdftexcmds" = tl."pdftexcmds";
+  sha512.run = "6e3aeb760239bd3f8ee92655703b6155f9f096f4baf0cd8efa3b6cdfb67f96ca16149ea3e11dd851960d98304eb88c78373241d0b00948b3d717ed92e32d858c";
+  sha512.doc = "76baac4bb06b595e05bf235a6436e8d59b06ea6917ffa66d6e82ccba994975b6992caf422b40d864ecf7ba7152446859299cb158eadef3c37a6d96354649f6e0";
+  sha512.source = "79b9c0a1e6c01cd20f8d9d7fbba82b0f4779d1724cc8b777e537e289833cb6a712de8ad4b2fa44083e3b3fdfee375ffa68c518779ceb7944091cb3e3a1e1d207";
   hasRunfiles = true;
 };
 "objectz" = {
@@ -20483,10 +21301,10 @@ tl: { # no indentation
 };
 "ocgx2" = {
   stripPrefix = 0;
-  sha512.run = "5d53ea7247d7ab98a415818a33fb80b4d5c3de01ddfcde361f0529d2f8adb71a09d4c1d007c9a2ddb30fc5441c68b4e8498981a54571c8d2ac617c46418e37f7";
-  sha512.doc = "f38f087a90d4cffa2569bd5186a708b41d0a01034b288c272c41c1e1755bacdf2f119721456e643a099c408a1aacb8e327f19b99c96cb74d53e6057e87e49079";
+  sha512.run = "fc31e8980d802d4ead440341d898990a083a537e9dbd15b0d2a0a7b0059b2513558c3ab6565536dcd9a189feadb4a5381a40c7ce7b81afe1ff53b9deeebde87b";
+  sha512.doc = "07078404f77cfec61516cf285246724abab8569967fa1ae3ccdb741e357031742a9e61782c48e7faf402cf38507a5c9b4063a543dd6e608b095d353344b13b04";
   hasRunfiles = true;
-  version = "0.46";
+  version = "0.48";
 };
 "ocherokee" = {
   stripPrefix = 0;
@@ -20569,10 +21387,10 @@ tl: { # no indentation
 };
 "oldstandard" = {
   stripPrefix = 0;
-  sha512.run = "b441e51ef7ebbdd9868e4161f554d6ddffeee852b7cce7f5ab754bd1d0d27fe7279c19b3ae12ae345211f5db6fbd78dda2c4519d50fe72146fe57b9477bb7f31";
-  sha512.doc = "7f7f421f3bf3764dae54289a2c81c0f0b1aa0611a203e3110d9f62bf9f162ba2ad5271ab9374d326be9aae1ea4c36b7205ea776c6bbf9d2aa5eaf392caee1c81";
+  sha512.run = "a009e523f070a0cd626df349e9f7ff4c3b83e24bb996e8711af52dbad178c6bb051eeab59e8c1e55a5a8eaf22974e063ae5a8cb0613a60431503a6f76ac568f6";
+  sha512.doc = "5fc4bc632bfd76a78b16bcdd25a30309725d408dc6e0d11ea31b2deeac11b3b17f1299465173702c33993085fa99dc3d42c8433f99e3a06467fc77cc18d0601b";
   hasRunfiles = true;
-  version = "2.4a";
+  version = "2.5";
 };
 "oldstyle" = {
   stripPrefix = 0;
@@ -20596,16 +21414,16 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "omegaware" = {
-  sha512.run = "da2ea42b840a49e8213bc4b1cbf30d042ec718a916fbc58a6a5db4bb352cba8a669a788530e54bc50c4918a5f106dea69f791c6f30adfb570fec8f8ae80096a0";
-  sha512.doc = "5eef2e7061a6b44086cb8c9a2e4230db2abbf7b1d9cea678264900f9b2c8da056dda07db004b26031ec6d79192b11ce0cb139a3080dd84421bd527cb92f144a3";
+  sha512.run = "3eeaf55d52884639dfc3448e4e9b61434fb47fe144edc7bfb13cf0e45eff0813e6fa79921d81bb1ed14c268904728e54bba6922f79dbb759f06dbe0758a157b8";
+  sha512.doc = "aa72ef38e326aacbba3101946ba2cb001ec6a8a034c10e047b716fa810062073e1bc83c15dbcdcd8d57860f5bf480a2595fdff1c07f85cff45daaa1070273168";
 };
 "onedown" = {
   stripPrefix = 0;
-  sha512.run = "e19fb9cccc481df8609b32fe79de5fcf5f963c0908e9ef7316b9d363d66f1e39bc3fcf85df9ca3f280d948b8ed6d59bcd646a1a11647c366a96764f4271153a4";
-  sha512.doc = "89c1065b82d603f3ad337519fc92866686457463152f06fd1c9e2aacc43a6d49cf28c9c2bed11af67d623ec945dfd59269baa5b63a5f3c15bdba682c0fa12894";
-  sha512.source = "6ef509399c88093917715fc32b725d3ee671be045a8ef70ae13a89345a9efd0bdf53698a2b86abbedacc1a4d21e141a363b31b53f70bd9a9c26e11333b698922";
+  sha512.run = "e7e1ef415ac2e311be871031c008d13773b4a16de491123f46c9511a98fb868624505fa602607a0d48337a19641487ab4ca49332660677c0e956b61544ef8fa4";
+  sha512.doc = "cab3a78d993daab2e5c8143d15293dffd0c67abc872c6538342c023843fa94985b6e03f9219c45356d3901829fe7be5cb2be6179189ff600a50ba4d5d62d0b2e";
+  sha512.source = "607b06a08b704dadb2669274e50e363c86e037e4b3de1ecfde5a5f9d6c9e3f22bd0240b727ab1646c81bca4b9c5b86feaae7914daf051e457e5f0bee6259b7b5";
   hasRunfiles = true;
-  version = "1.3";
+  version = "1.4";
 };
 "onlyamsmath" = {
   stripPrefix = 0;
@@ -20651,6 +21469,19 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.0";
 };
+"optex" = {
+  deps."luatex" = tl."luatex";
+  deps."amsfonts" = tl."amsfonts";
+  deps."cm" = tl."cm";
+  deps."ec" = tl."ec";
+  deps."hyphen-base" = tl."hyphen-base";
+  deps."lm" = tl."lm";
+  deps."rsfs" = tl."rsfs";
+  sha512.run = "9aeae528f488438fa8fec80aff5def3c402139d28b65541920898f6e16211ab7f68fa91477af2a2a10eb981591e3d378f6a163673341b7e747566ffc6513881e";
+  sha512.doc = "52c4e5c72c71097ad634ff3e7551750de906f6639ef3c40f0af396227e99d4221d08107674b4e760740846900891deac4c069124909347ba1b6a502b3a31c047";
+  hasRunfiles = true;
+  version = "0.05";
+};
 "optidef" = {
   stripPrefix = 0;
   sha512.run = "dfd704e585df8d01b279e67ea3a2baba6e86ddb9f38bc9747e370580a5f218e7ae4446d2429fc6bffc605ef0ea56c8077a8f41f3ca6a8e857df29d0e3f328143";
@@ -20768,11 +21599,11 @@ tl: { # no indentation
 };
 "overpic" = {
   stripPrefix = 0;
-  sha512.run = "2f5d8f46c4997a5eca5f82901727dc1ed790a6a2d55cd7aac45605d444191dd022c22bb7e120fd45f318fc0949dcde07e154c81f4e0c0bc3b9720cc99024dddf";
-  sha512.doc = "a4b721ebdfd6fc38559407c902599be2599c4887a28fabb976ba0525ab8d6e17ab9fd5470b11f1b70618365182012152f5bfd0d9308395db98f868addc8cee73";
-  sha512.source = "58ba7aaa6fab2bdcd55fa3cfffc0c18ffc029bf1fd0caa122f61fa6a67ff9e9dae0be3db916705fdd60dec84f7a14f89583d0400dfcd979df59cc463357fbabd";
+  sha512.run = "f6946c04fb1bd17f8708698671c17037688198996cbfac9b358169d1cfbaed9835b1b05b7779f3b4545c3b7de1d0ccd5148757b3cf125983ab0cdb8d895c5e69";
+  sha512.doc = "39a93d00bc5646095c1e104927655e61a6fc337ceca8c336cfd40c39a63c02b18a440ca4c9557537d3ddb991e0ba4aac9f9ea821c7cce3f447359fd9f0203dd3";
+  sha512.source = "9cc367d8b54a2c01d694602cfb8b0d0ff9e9d2117fd1e20a34ac80b9a1007f44b670eb17a55af7b073385ab4ec9511e76cca508ec108e22ec6f5891c0d32477e";
   hasRunfiles = true;
-  version = "1.2";
+  version = "1.3";
 };
 "pacioli" = {
   stripPrefix = 0;
@@ -20928,6 +21759,13 @@ tl: { # no indentation
   sha512.source = "9a4fb32c53f5bd2f6f79992b4ce076ab211c24e2c0f4ca2665c903b2e3d5268b5615bb5e9c8107d1d44df6a9e50a9f942f61cbb1fd05a388738449e4b312f306";
   hasRunfiles = true;
 };
+"parsa" = {
+  stripPrefix = 0;
+  sha512.run = "5056c44131038c65cb945ce5f7e8415381be16c6c5186ee4f747acdfe99b1d31e94f5fe1bd038df0423277300d92889379ba080c30bc5dd9f76c868474d5a553";
+  sha512.doc = "3e99c9ec2faafbd53a95ae6ba1641fe4eb0857f1a0ee46a633b162354e6c91f406cf438fac136d2e6085704bbd3f79a8814b6e4b4fa9769454b1812b9528bcf0";
+  hasRunfiles = true;
+  version = "1.1";
+};
 "parselines" = {
   stripPrefix = 0;
   sha512.run = "81d18bfa1f70157ca04383a2f6e4cf228f23d878a9e157e79ea0bbbb743090046f5058ff0731ac42f881f5cef13063fa0ff2fa9b80992b334e02dd7f2a1a33d2";
@@ -20938,11 +21776,11 @@ tl: { # no indentation
 };
 "parskip" = {
   stripPrefix = 0;
-  sha512.run = "7a157e443317d05b31cdbb34a07e69b9496116d52aedbd021c710751fcf1f5db4565803e26a824166d283e043ba52a865638e739a6e81dd48623cd7230e86731";
-  sha512.doc = "fc4484eb846ea726e69e890f5ef3e0f64479739aae3929f663935a6b26597fa706a34e1e2eb86284c79dce2bbc7a9c13f2d7e8285d7bb9a0148eab1a150aa584";
-  sha512.source = "41c3dbec891e1b6589f9d8cc2f54622df45cc56fa5d8ccce6e7b57c974ce6499477ce589b43dfd2b572cc636cbd850ff25e944e285faa0ea5d16487f5a7f3a8f";
+  sha512.run = "783e6be1ac9fa993d73c3c68c2fa3a96484e191e97a7f9b5d1027ed7aad11d3209f6d56d25c5f5f982cdb249c7cdc8dabce51bd8fb5d919da95665da04c39893";
+  sha512.doc = "fe5ed5b4a7a89917603859623cd053c7a4b78de2f90c85bcf18e829b4e44e7e72a094408008fce88e2bbc0b2f235b38014aecf471cb8c7554a462065df60280d";
+  sha512.source = "aad22e5509a07019dec39da136b9e3754235d4151c19d44006d5b0ce7f56e85903a7568bb6006943db9f1e6a54eea9e012c4ee29db2ef06530152bd30c0aebd2";
   hasRunfiles = true;
-  version = "2.0c";
+  version = "2.0d";
 };
 "pas-cours" = {
   stripPrefix = 0;
@@ -21083,10 +21921,17 @@ tl: { # no indentation
   version = "1.0";
 };
 "pdfbook2" = {
-  sha512.run = "f4d30e19b55b709c91eb64f9075b0e2e1d85591af295ea3ff64965073ab730603e660935e627e28a3878b700d417402d8de17fe6776022533f59f500a78a5255";
-  sha512.doc = "8958c4abe38a3a3b6623e3fe1861be908faffe935a433831cc1c87c463e0a72ba33ee89def4a1329350431e313e032ab35438be9f033e0a81711ce018a970b4e";
+  sha512.run = "dd87268e3856eb26b37f025ac62f24cd5e680e92e727588d36878de9df799f49254ef2259c29de15db11d5888ada83110a39aaa3116aa6f6aa290d3e64f1231f";
+  sha512.doc = "3048de4be891e270e8efe9f9d85524aff948c9483da25f491669a7181967dc281f42b984c9ee46464bc563c42a4f171589066f67818a291a136e1f49d40912ef";
   hasRunfiles = true;
-  version = "1.3";
+  version = "1.4";
+};
+"pdfcolmk" = {
+  stripPrefix = 0;
+  sha512.run = "ddcc125c608eea472c06981c9f5a901a431da978fecaa2a5ecdd08e2f6499ad25632e4de86f7e92445a8e276403ee92bca636b80e5216e78b21ce355910ead67";
+  sha512.doc = "e2bb876ad74381fb441d870422186f4cee76bb4cb5f721334b7119fe83b2ab0565ffd5300575ab52e8d25a263d87739a1e114cffed44ab3e25d8d5cff2006456";
+  hasRunfiles = true;
+  version = "2.0";
 };
 "pdfcomment" = {
   stripPrefix = 0;
@@ -21109,11 +21954,19 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.37";
 };
-"pdfjam" = {
-  sha512.run = "16cb97f7af45b0df2d8190eb8127e6e8837bc3971765f449c038a3afeb053c68fb127f087efbd2735b8958b529eaf3adca62df07a7deed5a90cf78947e9e817b";
-  sha512.doc = "5814b6464efd3ec226fb2feefd07d7c7f0ed3aeeaa341c25bebb5e998b438eb7b86d9234982ab1f9ec8b99cbad6fbe3f2eb85239b37070f9ca557e698deaf96d";
+"pdfescape" = {
+  stripPrefix = 0;
+  sha512.run = "ca908d58a9a0c0094fcd9bad550bf493a0dbea9e90702534a7418f9a5f506f5cedd42663f154bd227349e4e57e223b6360871bdc995eaea221c07cccaa780327";
+  sha512.doc = "d95aa97463b20c178a04f9f2cb71011985eb5242ec620adb9911bb5f1103f71e9fb0feca5704a9339b9490a71ed67c8c038efcf6cf43e16fcd20ba2eaeff8161";
+  sha512.source = "b6edb668b4803c91288b0f149e2700213ecab7725310d7d4bf499cf557590cd4356d9c79a6bfaf17a50ce85f4951a1e996ccf6725ea6da000f0c316f5a0466d4";
   hasRunfiles = true;
-  version = "2.02";
+  version = "1.15";
+};
+"pdfjam" = {
+  sha512.run = "9515d6156948df018b5c775e0882912aea5231ba73a30c5dbd33c258542a6afa936eaf9a366a0d498faf231e4e5ebe7485ad928c78114ddb9399b6f26f48c5ea";
+  sha512.doc = "b2d6f867ed37f8f3443e0a88b2e1547ef755756409ea0f25e0982410394807f40a7b0bbb89d56e6bddd8fd65607d43bb28ff7bed6751fcabecb284ed1c2aee89";
+  hasRunfiles = true;
+  version = "3.03";
 };
 "pdflatexpicscale" = {
   sha512.run = "d36dcc4d70156d52bcaf668d620c8eee5db8914473f943412ea5ad5c8bde673a6715fd5a69d13e502a5d4fe0b1e0e55099432c4e0e5e02bd5f6155ca5804c3f3";
@@ -21121,6 +21974,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.32";
 };
+"pdflscape" = {
+  stripPrefix = 0;
+  sha512.run = "c343f0527f21421f26396a6210f7932786a222a437b43d6b2bf1c53339633a0aa8337843222d92048a6a5a41f0952aa2fde6e2bfb2e181cf811383a23ffadadb";
+  sha512.doc = "5fccb7dc5607f1196d6df6a1a68d010c0b9eea10854cdf2e133f31dc4095f101efc05abcf9e980a3e05375ba29ce319dc13385790c2261778fde54d3b94d1251";
+  sha512.source = "08cc0550cb76eff49ab4cc9f357f22a7c8086b2802eb191237bbf79acce2b134a2bf3ea28a8324d0140ac785afb8a928a8f7b8cc7e58bdd7e9d8b1d3a66ee7e5";
+  hasRunfiles = true;
+  version = "0.12";
+};
 "pdfmarginpar" = {
   stripPrefix = 0;
   sha512.run = "1cfb39ec9982fce753e3c0040123fc0faf39d94a41cac95dd0d189f2f5dd21f0a03c2f7e26de999097905b2bb32ec8d73e6dfa808c8ed2a49610da436639767c";
@@ -21130,11 +21991,11 @@ tl: { # no indentation
 };
 "pdfoverlay" = {
   stripPrefix = 0;
-  sha512.run = "ddb976f8aac4a3efb3c392e0900ddced76fac3a14cc8935142a5ceb344b9eece59eb6697323ff21241b327c0b6af6028024dfcf88a69dcf092f2d3f359d9b4c7";
-  sha512.doc = "fbf34d577158ff042d7571f657ad8b145378c9387319b157270f56f5eef7d5e0bf860bb4eae3329628b9515d0641474af5911fa34ac4545519c16769f81f3a23";
-  sha512.source = "0bc7aa88e7536517303d4fb8ba4f03f3f9b99d56425f368bbf1bc65227ad1245b1d6e146a5daf3cb61efac2bba3cc61675804ce4a4fc1a6f66b9f8efca708b65";
+  sha512.run = "089e33b32284fa775bd8a5e9b47604f5639060928f54397f775103823822eab11640660a982ff8229e8c1d63baaa26086bc144f2160401fc25855015638c5f0b";
+  sha512.doc = "e4d21dee8c619fc301a75637f2f5fe8279e4deba63f627d153d47a90ee0cc19031547631acad2e9936aae456c330a7242aac9540a0b5c217ae7fbbfa2b15a29d";
+  sha512.source = "ac11650b32810ab9b1b05892d301b089eb6bb81304720ea258d7ad7efccc036528dd2acf5b0d0eb8666a238e4c01557c60d86571cbfb083475904c52f6a2c5fe";
   hasRunfiles = true;
-  version = "1.0";
+  version = "1.1";
 };
 "pdfpagediff" = {
   stripPrefix = 0;
@@ -21146,11 +22007,22 @@ tl: { # no indentation
 "pdfpages" = {
   stripPrefix = 0;
   deps."eso-pic" = tl."eso-pic";
-  sha512.run = "91e72e7247d026ddd7c598a5ee3d79bbde2dde920567cfe6d60601111d21e1663ada42c39fb951135b76f65e4186de53c0e1ca5c8846649c3a8abdacd5ab9643";
-  sha512.doc = "a04d593ee79a71d79409b475c169741bfb7a5ce2e3a1b1382dc20a8faf424324c5563161a13893ef4ff4da7b9b5513d63464fe3726169845bb402169b2523e3d";
-  sha512.source = "0e7d01cb7bf81f110ea073caf547ce75cf92236a5df45425fb6dcb11baebaaaa6f8582f432bc0c5d574ece69f03f9898d6d0d4894225444f240688b301ce3730";
+  deps."graphics" = tl."graphics";
+  deps."oberdiek" = tl."oberdiek";
+  deps."tools" = tl."tools";
+  sha512.run = "0f8b9efede65eacc6f0a970ac30bd8839ef521e01ed2cb4672882eb768ea36f1ac2b6df72275c681a952e827253d35e43c77b4cff675c5eef3673ad7fb94675b";
+  sha512.doc = "1a0143d380280618be15f5fa2227ef27969e96dbf58ee8ef1d167b5864ef2565af0225ba2d6c5fb5e81ea03f78ba4fb8f2d4a1266c5e4a7ab834186489fbc66a";
+  sha512.source = "a833ed5aa8059e344a6edaa9f499b419b3f0fd3a0d23499219d4a3391c28a0fcf9afdda0ebfba4ddb9233a47f80b71d07fc87773d0c7ce9a51aa9954e8c9198b";
   hasRunfiles = true;
-  version = "0.5n";
+  version = "0.5q";
+};
+"pdfpc" = {
+  stripPrefix = 0;
+  sha512.run = "2f7a04d3cf55e996bb6507b7dd85a1816bd0ab2c26025b9a46f7c111912237b91889731f656b2490c06db5756e5241cb77c00c59215fb5c56a6d48d16bf7ed91";
+  sha512.doc = "b49f357c4d08dfa8802218b30b1dc94f8db8fbd612399245333a26d93e543534899d7f0884222481fc5758b90220779330a85094317636860b44c9ab16f8f6eb";
+  sha512.source = "ea5daef06e63cab760cf70c51c3777a44b223737709a65ef6ae232a0c040deb38e58983b22e862e1a8bad08383fddaeebbe0ded9c0b384d0a283a21925052aa8";
+  hasRunfiles = true;
+  version = "0.2";
 };
 "pdfpc-movie" = {
   stripPrefix = 0;
@@ -21203,8 +22075,8 @@ tl: { # no indentation
   deps."knuth-lib" = tl."knuth-lib";
   deps."plain" = tl."plain";
   deps."tex-ini-files" = tl."tex-ini-files";
-  sha512.run = "47b862d6ca260ee389a308a2027259c48d3b6a478c718684c7554aeb2f193142f348a668fb426d49790cc4046659ce42fc0bce099ea4c65863daa129de4fffb7";
-  sha512.doc = "bb9a4ab19719fdf345146877fa91d3bae835e02b35b1dec6b288b85ea96f0492682bd4b627bf044fbc49824b6b7059a4daedf0c99055ab1ceb21cbbd86154762";
+  sha512.run = "703fc22a4d9f9251666491693b526a2622f63ae05d1caa402219b72d680a43a9eaa1294dea53144a7f0ca326ab7b88405d0fbca9e9652444bc1f34144917df99";
+  sha512.doc = "cf15ec2fa6cb7230edf4a22a6811aeabb48b0420275bb6be4b2976593e33865837e50b874ab7da7a7b536cf48b74a805b93e154d4cafc42542995acbc49e29a4";
   hasRunfiles = true;
 };
 "pdftex-quiet" = {
@@ -21213,11 +22085,17 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.1.0";
 };
-"pdftools" = {
-  sha512.run = "ba9ae7b0bbe512465357405e87f3d523235c2398d4a94e8d0c8191e37db06bfabd6676f3fb9f603397e5682f9dd4f9b1b4cad03fce89448a9f0b254f8a7f2b46";
-  sha512.doc = "3f95883d9405bcec282468f42f8718bf9c510d98c41510aa643ce0b70eb7557f67b75def0dc0e1f862f79d586f0f49959b4c826f8c468ca9460fdd69d3d4ceb5";
+"pdftexcmds" = {
+  stripPrefix = 0;
+  sha512.run = "04bccf5df6e3d0e70673cad77a778c47eaa3e733ee3b30062bde6f19126aec573bd8bb3e669b98ad61a5a3e04af4a92fc038340761ec5da955254c2874a669ba";
+  sha512.doc = "932a1d8224152e54b34e5dce7f2a2ebb36d7816e3791b3d95399fe34a2c2dcd2a9487caed2e082c5e5e215e64ebc8a095a2ac6e1ee898546ea1f906634dd1ec7";
+  sha512.source = "628dad73557d9bcf1debd807618e6954ff6a844ca1d89cb3c96119ba6ba42b7cd88cba9035bd1ac43f34499b811aef1f503c4fb9f52de47137afe037df6a8c69";
   hasRunfiles = true;
-  version = "0.86";
+  version = "0.31";
+};
+"pdftosrc" = {
+  sha512.run = "6b6fe771e5dd9523fd8d35456865068d980dbaaa8a8c3228ac4578b1b218c48e2fa851a7bfc89a77ecd9ee6c2eb743fd9da8351ef379a149e5318cdd3dbb41e4";
+  sha512.doc = "96f268374f722248cba88a62cf81ccab39414d031345496044b4d2fa1b966d7e0722fa265d89f91ad755096920e937775c78dabcc4f60bd06645ddd990b18daa";
 };
 "pdftricks" = {
   stripPrefix = 0;
@@ -21248,10 +22126,10 @@ tl: { # no indentation
   version = "1.6.3";
 };
 "pdfxup" = {
-  sha512.run = "4086f58241799139e980c97c1aae786566bb7801932334d78e89dfc5f8e718b6b9fd3eada32ae006b9aeb74d8b2644071a1b1e60db7dda3b4b4942947d727fca";
-  sha512.doc = "3888fce668affc7efa7e9d88c890f72c94b49dd88ea3c05af956943dc015e89ad930e2de3a67e023c7e1be2cd1c7911e5df29dbc273e3c2b219eb5377c165956";
+  sha512.run = "db2713a1f00dc2bb641094b4f1b84ca233ee3a28ac9bb70f41703937f51aece3d4f7b8803fe158cd4a470a859a81fdb68131a95ca32aca50eb9e83fe76b26f11";
+  sha512.doc = "8d37a4bd8592ab172e59b9722712b4019d47cf6e732e6eead889119bdc396b4620b6aeb33d27def1b3f641e326cdefdf80191259386cb2a18292890ffaee9b14";
   hasRunfiles = true;
-  version = "1.30";
+  version = "1.51";
 };
 "pecha" = {
   stripPrefix = 0;
@@ -21330,11 +22208,11 @@ tl: { # no indentation
 "pgf" = {
   stripPrefix = 0;
   deps."ms" = tl."ms";
-  sha512.run = "104bb34bcfd38f3dc40a161a2150e4eb1bb5745ac4b98836ff94260699bb9acbe1d9a7120217aedca4674be64fb6e1cc0c8f70912d2630562d3e1ea7e87f5851";
-  sha512.doc = "0dd8602f32ce5516435f468e586dbe2c918c6a5f6a6bda1fb10a1ce897243e228d61bea0cc60e211a6155d8cdeab48c650f88763568932d12df0c7cb1d60b348";
-  sha512.source = "384342fb40e08fdf9cd5ab1036dbe91281b2119249c85d6266bcd39f361fda01b06caf6ce1b0d21fcb8d1ea18912ca2731234cc236b9f141653c7f4aa0a16c79";
+  sha512.run = "afeab677fa457cb4a12c9e3531749fe0389e8f84f0fd46fb077ea898200f3fa5f23fffd81c430d36f67078a42c8ecf624b6ff1a1809f17d2223dde72249b729e";
+  sha512.doc = "538a31e071a8eb8cd8b96046032e6ff059fc6841c908d89a29e0f3c16773658e6bf51831f40d261598ded5a33f33e03d3363dd701c183bc7cfe56028528671b6";
+  sha512.source = "ac83feec231dfcff261bd0afccec5e1961d65f8e5e31e7f493c61c9e5a02c1e76db724a32eefc5947df72d2714d1c533820033c1aee4fd8d7201832a541e6551";
   hasRunfiles = true;
-  version = "3.1.4b";
+  version = "3.1.5b";
 };
 "pgf-blur" = {
   stripPrefix = 0;
@@ -21346,11 +22224,11 @@ tl: { # no indentation
 };
 "pgf-cmykshadings" = {
   stripPrefix = 0;
-  sha512.run = "58a1c73f4ad2f0a64538683be8227b429fbe24d4a91c39949e37caa356a30ff1e70b6e00647b8a87eff26bcf99a99d65b0ac8c8710a6a85d89942a247bf3af26";
-  sha512.doc = "107029c601a5e889b6156c417a45013ecf47f7e2db4c35ca276467922e8c41ed8a23a118c5949095bc421fa15e41cccf9f6e57d2052434c44d81781532db73bc";
-  sha512.source = "c11c49bb5635a619ec9421013416f3ab18b2f4caecf2cc70bc393e858f95bece057279af6cce8c0664474e3d258c60e259c30ddd7415172ccb95a369a1565f0d";
+  sha512.run = "8634e486cc07bcf10af1abdd94bdf543f11bedc7fceac2f154a8a579920a7467635eae17cd62524b7ba7b2345f26cd4c4b50f8098b01b4f30eb15a120e480b92";
+  sha512.doc = "e3e301f4979f47e16b9804a50d23575302ee3abef1c5a4dc8ea9aca3d94502c378f805ae54c61d7be9ccf78e236dc0a6c0bb54de47a515cc3a5350381768cfa8";
+  sha512.source = "77e6713be90d2555db73f19588493718d390878187d8d0452ba571f2d98c47f3cdaed8ddf423a8c277688107f62f38654c991e17b820b9af45a6c05aa27ca30d";
   hasRunfiles = true;
-  version = "1.1a";
+  version = "1.2";
 };
 "pgf-soroban" = {
   stripPrefix = 0;
@@ -21382,9 +22260,10 @@ tl: { # no indentation
 };
 "pgfgantt" = {
   stripPrefix = 0;
-  sha512.run = "f4553f0ec519e5a8d5e2ad994f7271cc26d5fc80b20299f1aa816a5c21f159ac809a7a0bfe354cac99dad75c2e0bd8d1803277e069a26c105fb4ee83140274d8";
-  sha512.doc = "e6ab311ace663099eb878807036c3bda80298e9b591dccdaeccdbd65a46993d2b013353721d54f3833114fb1436296e079e9165b5071acb7d722238a1e6b52bd";
-  sha512.source = "e376f0c89d67a698fc9109e974e39b94fdaa661006422ef6b228e1d0f4c273a8f6cde95ee86c788d7051acdb75e693dea704d3d36e2de42ef53c2db320a7b9d6";
+  deps."pgf" = tl."pgf";
+  sha512.run = "0269703fc00f10981d5ce8958159a24814b9f410c1b00516608c039b1ea8a3381392bf1d89e98f3011d42210047bf2e1fec2f103467087f9172e143d9ab6fcf1";
+  sha512.doc = "4890ae174c92db8df7befcef30d03724ae52fa4b26ac796d247a703794ce745ee892f0d2ab8a4f62e96a5e5f792791a6f7e8b9e71f1c0f11b68e8cbcf5165472";
+  sha512.source = "668987bd37aebd38697c02bc39d85371c7d40613aba13c0f3b62ece8145608057cf3f76cda03de6df25f7ba820359ff2ba1c340aa1b9ebff94bbd42aed39e401";
   hasRunfiles = true;
   version = "5.0";
 };
@@ -21433,9 +22312,10 @@ tl: { # no indentation
 };
 "pgfplots" = {
   stripPrefix = 0;
-  sha512.run = "6a56f591562baac1b6256eb5c888c4cbfdca5762d4141ef4773ceca06ffbaccf3e0d12c35818b9447a1c782113c3c2a622dee0ee74e9a5b97634af0603c8c095";
-  sha512.doc = "1167fe761139de816533728f8b774f802190a1d58df979d192d3fd92427dc32d12ae0c176315de8c878d7f1e4ed58d8e7c40c5b794f8b75e813692c156dcba7b";
-  sha512.source = "ec594de33aab4206bf4c38808fca697f144337031677ae056fc05ab910e6886389cd9f283a299071dc488b41e60c03d27108661ed2d5f1c124f57a87e28f3999";
+  deps."pgf" = tl."pgf";
+  sha512.run = "0ddb564ecc457328291ba09e9162acfdbc19d50d1b6aac3ebcf0d6de0c39aed6c3b5efc8957c59850fb49269e6d149f73f4aa5b41e176bfd8d3b99ce38a15a61";
+  sha512.doc = "b9ef06b1d001a2dee3474ba75d202b428a50319f3ca90c06cafaa3e514f62abcbcecdfd8880d486ee363d15d6122b2c1b25b4051442e690a7beda0365a1c850c";
+  sha512.source = "908b71f3dc64400be750d7b602e94d864d35c3f7593577610507ab7fcb959afb2b46bf6d1e3cb4b2382078861c21279665dd2f7387c2b0f2f0db57f10b84d220";
   hasRunfiles = true;
   version = "1.16";
 };
@@ -21553,6 +22433,14 @@ tl: { # no indentation
   sha512.source = "644303a7eda6cbe50db8cf871ffd642dde5115d4f1a72edde65e9218337faaa63ffebc94bca96da28a4a2d7568ae0ea124f1aa12fe5402cfc1c57619e86746ab";
   hasRunfiles = true;
 };
+"physconst" = {
+  stripPrefix = 0;
+  sha512.run = "9d96b559e6e9a67983b55fd5393386ddee8f5e3b42b38ead8f860f8141dbda62bba20a83ec2e7b53db455718eafe8383ac645f062d848fbf52eb41e50b8b4556";
+  sha512.doc = "1fb1f3dec4373cb95b9282dc059a2997d05874cba9c08934770571357b2afece06806ca6615a8089cdb4832094dd0fd7f4abdeda812a070b100e1444c0ec2652";
+  sha512.source = "afe9453d9410f191095803a5974711db3930144e5680cd63afd7a2c9ab21ba200ee60daf9648ce21ccf27d65253d080d912c18e0d57d9fdd8c5747c6ca883e49";
+  hasRunfiles = true;
+  version = "1.1.0";
+};
 "physics" = {
   stripPrefix = 0;
   sha512.run = "e394a7f8eda4583cf196dccbd9d52122d0ee630a411630f11d432018c5e9696a9b3feacfa2f881d82090df165a73ee0fa610ad86422123a9e1502ccf4b695be0";
@@ -21560,6 +22448,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.3";
 };
+"physunits" = {
+  stripPrefix = 0;
+  sha512.run = "904be8c48e61e663936daf8b646f36009e287e8656b08897b5572307a32768a442b16d10a29d5f981bce5d8eb6638320e66d2551a36fc6e4cf9448eb57f96f1f";
+  sha512.doc = "e49086ad63a4dd87227e2433277b384015dbabbb7f1a5de4b46a2599a82978a96bb0553c336452c569a00372a7c1783f5098e0d765b9986e5778154ba3e7a52b";
+  sha512.source = "5deb57ec5afdd0404da24ec5678a04b2818b469e0251e0abdc77e59c0957b8772158e59f9c68e58c0b79e48f2a07d4202030de27cd439c8e353f6a9952681ecf";
+  hasRunfiles = true;
+  version = "1.0.3";
+};
 "piano" = {
   stripPrefix = 0;
   sha512.run = "49c3b29f48211ac6ca04ef8f9df74cd3f4673a84e9d84c2a9b06bbc958abd640116673abd751be40adb470907bcf65a42756c22996f0adc4e2c0dbf3d6afeca4";
@@ -21599,6 +22495,14 @@ tl: { # no indentation
   sha512.run = "a24861e4b6184084fffa783918db485e5c7cacf7a6528681e7d8d4212287f1f6687604bd4f347e9e34ab7d29867dec2b30c9871a13b9bedae31b5dbb82ba1ed2";
   sha512.doc = "148b7c29cb8189174442b95cd39b0d5fdf9f937a7a44a17314b93cce555cf3db459e21ae2c4eb9098c15551bd7aada2804855d68f9408fdbe974f6c12dd724a2";
 };
+"picture" = {
+  stripPrefix = 0;
+  sha512.run = "6e6db1ced24b2e3d9da18df7001a5bc371385dbced53d9b265dbdfa7adfb07f91ecbada1eb3a8604b4f83f2dd40ca3250d9122262ccb1e8bdaf7ed7111540511";
+  sha512.doc = "224a67a0e32f9713fbac6df806b0fabe47bf292d26ce4b4723655455c2396d9bba9c28f805c592f8247eb362bb28f9a26e300323d2372ad03c971b8b8af2518b";
+  sha512.source = "7dee50f956e046d868629226ef708672b11b7694633e5d43da4fe7acd62872cf2185c893ca24e158699c943567b2a1eaaf235c010af588dc1a33403e19f4cae1";
+  hasRunfiles = true;
+  version = "1.5";
+};
 "piechartmp" = {
   stripPrefix = 0;
   sha512.run = "e4ef7bdc43280c4311a6e8abf2719815196fb0ed0a8450501061e0b3b0bb44cd60947d6d623ff753c5ad1384d98219df695865e6459eef02b2b96f00906d023a";
@@ -21626,6 +22530,13 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.2";
 };
+"pinoutikz" = {
+  stripPrefix = 0;
+  sha512.run = "e59a8a5c1d40fe81ffefb91308adb73e270ea1f7fe6d6e3cccc5a950b5acec6ef2a50c20430365e24dee5fa6459dc78325c18cc3ff150fcfaf79538bae085f00";
+  sha512.doc = "ec0f726118a9a05aea49c498e60932492308d3f9fce70b2ef458b52a26465659175149da3a54a2e1ff76d4209f637a11cf8956c22ee9839a2540e1bcece023d9";
+  hasRunfiles = true;
+  version = "1.1.1";
+};
 "pitex" = {
   stripPrefix = 0;
   sha512.run = "dcc4280ef914ba66210ce471dc276042070b3246bc95ecb93b3d8af55393f49921a1d5e6851223299831344503dfc77fc2893f4cf1b78351dad40058979c20aa";
@@ -21669,10 +22580,10 @@ tl: { # no indentation
 };
 "pkuthss" = {
   stripPrefix = 0;
-  sha512.run = "3714a72dce39b7f72c4bdd8355d077822a41c332682e4e6b09bc81f16a61cf5017315428e942e26a36f8bff79a818b9e35b0674e01412f7c29f1bc94258d4636";
-  sha512.doc = "7077cebfe115ef19f1d0b1a333babe00f75b47c878d5c316bce75a80b75a53ee19814baa506b7587d18216d928a25f2e8722f244ac2ef5d32d7a7375d76be0e8";
+  sha512.run = "866cd78cd589dbb4228aff9464943bbe4808df08960000fc7916268dd2df5c85102c95c01072fc03714680e6f250d13c7abd83f25441bc924db9d819a2f18b8c";
+  sha512.doc = "2dcb977727324cf981f262aed38ba4d8856338a37b5499133c46348002335893b78f8efc0959d7c225c32eeca43a743c446f448b9e55ff354cb977ff9a86fcb4";
   hasRunfiles = true;
-  version = "1.8.0";
+  version = "1.8.2";
 };
 "pl" = {
   stripPrefix = 0;
@@ -21721,6 +22632,11 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.4a";
 };
+"plainyr" = {
+  stripPrefix = 0;
+  sha512.run = "a42c5fc8c9a530f91d467ab3707fbec05f49764e85b906510f4605749c60bdda224a4ba23be85acd722f48b0958ed7184b4bfe88dc7c3fea4a64e70f9407afc6";
+  hasRunfiles = true;
+};
 "plantslabels" = {
   stripPrefix = 0;
   sha512.run = "7e1724b32035ee32325c491bce57ead23f40ad7377b4c1d5572499fef920b874bd57298e654429203cbea726b8d645a0899807547db80825be163538c1d91537";
@@ -21755,12 +22671,16 @@ tl: { # no indentation
   deps."cm" = tl."cm";
   deps."hyphen-base" = tl."hyphen-base";
   deps."latex-fonts" = tl."latex-fonts";
+  deps."l3backend" = tl."l3backend";
+  deps."l3kernel" = tl."l3kernel";
+  deps."tex-ini-files" = tl."tex-ini-files";
+  deps."unicode-data" = tl."unicode-data";
   deps."ptex-fonts" = tl."ptex-fonts";
   deps."latex" = tl."latex";
   deps."latex-base-dev" = tl."latex-base-dev";
-  sha512.run = "dc0704d481a209545852edd6e4381d3d1bbd35173a3e67010f396093725d7e379aff68507898246ae0741658ca957665c9bcf5a6163648542a3585e8e8752240";
-  sha512.doc = "b762310465dd6cf147d5f5342115a57124cbbfc708e1a48caf8ac57996a5213499f9154c0c392f63766848f677f617d3014a7aca404ae5481c3fa0206b87ab39";
-  sha512.source = "cc1c90a007cda5d8fa5ddbf42230a23ab3249c71d70467b94aeaabbe5e42ca80e370fd2abe350ff494f8b17edd13c47d8e8ade18b47a46ad34c578a8baf06a6c";
+  sha512.run = "6e799696653ec8071bdf07f2e8646885b7c1aa85d1e904211df1177ead04e95432e6599a986dfc80acde29db7c9c789d5d16d26212dfd206af955bc7b909de85";
+  sha512.doc = "208523e476031fbed134feaa2dc91217492efe42d4d2d0b1e95745c7b1ab240ccf559eae21d82cb14d83cf37d1fc09bd36017eb77b85ba212fac5d60e58b0f14";
+  sha512.source = "112db9ef61955dc071a9054c15257dff686eb04e086f1293cb16aa805d88e7768735a432f01000e47be41ee077a6020fb81b2e0d1fde2b460aa551a10405c827";
   hasRunfiles = true;
 };
 "platex-tools" = {
@@ -21777,11 +22697,10 @@ tl: { # no indentation
 };
 "plautopatch" = {
   stripPrefix = 0;
-  sha512.run = "f7c02f596e58710b401ea7e9b071ac7786dd640f4512111522414f90d93600854fcaf31df49af6aca605ce1c4ebce62373226d2f511c9584ac665d6b20e37d72";
-  sha512.doc = "291d4c18d6b08eba869b32e058eed9de075dc35082496cc5bb552a905bd9f9a08ce7e7108320d0b2af953a351899bc0576f7d05dc2a0b87409a72fbf6c08224d";
-  sha512.source = "13c1c1aac3f0aa30f6f0b102ef0cfc478436eae8889de147dc7ef5e6ea4e7a555fc15d97600defee6b8fd8ee40a2a1d01603e591b0e4a3132cc3eee6dffbfde4";
+  sha512.run = "a50f5b0233e586d25fda8d2fcdc8817ae4ae56b13a2c3dd505011d17a30e7e5d3ca10547416fd2d5df9a628ace79f575307049510150c4e925fb1fc30871ec6c";
+  sha512.doc = "984daf85b86d3b1c308c52520148fef9cfce188a6d210514e44efc3dd7427e80c5e179cbed077e4b52b2ec6239710e64c18cb1b7f8f6734662ebd4cf1533cf5b";
   hasRunfiles = true;
-  version = "0.9d";
+  version = "0.9e";
 };
 "play" = {
   stripPrefix = 0;
@@ -21798,8 +22717,8 @@ tl: { # no indentation
 };
 "plex" = {
   stripPrefix = 0;
-  sha512.run = "e1fc413e26383514c6811ef3eff0263169cfc12881bfa8f2f9e1e60326156bd255bdb63438d0820c6cdf5a4c026afc9f6397598f1c59ebbbdcf3c64223fdf2aa";
-  sha512.doc = "f1132741d9d0d4961296f36cc17d56f7e32fc4a7d539593fc09a83460b5baa9f76a08b957bbd6dece4b29980420cfab73e05a65a2c4dbbc60308db582ebd2c8a";
+  sha512.run = "d25fef41064797f9cbfaa2350b8868ea8291fdad3bcadb48021e7795f0d31ff86beb21dcf5e5a6749870354b3f77815191572423c3956946c60c5232cde02034";
+  sha512.doc = "9d42faaf2fe27f38f96015899960d6b0ac8f423f0baead04a7b740b28e052b00f116bcfdaa8f435d1b61e6e697f55b5c5b8cc766ef11377f48580ce888b203c7";
   hasRunfiles = true;
 };
 "plex-otf" = {
@@ -21846,6 +22765,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.0.04";
 };
+"pmboxdraw" = {
+  stripPrefix = 0;
+  sha512.run = "d229b15e57fa76a9e8e9b903b5fbbb99d81d3c8a2b1818d71c103df7f2a1e9bcf79aa8396b6ab7a2ce054371d212375b968a4a5d572fa8686223baa8dccf4eff";
+  sha512.doc = "42a439f2f88235faf7302400432d49166861476cdc43708f84780d153bdcbcb55dea1a6b31cde2045d0b99d48c2a4f51ddae8bdee08937308c5de02e9b16a523";
+  sha512.source = "77220cba1cb61836f0be161566d1f177f2c503901b0fd4c0052dae81b457f59364596eaa4a32071b5c90623509f646ef3140f67e29a558b4910beb3a1d63cca6";
+  hasRunfiles = true;
+  version = "1.4";
+};
 "pmgraph" = {
   stripPrefix = 0;
   sha512.run = "b6e9f00789ad102b6cdcfb0fe48e5ca4f6976a7c207088c0c3e8b0c2d4fa376bbb932500d42133571a6e18747615c77eb6df2b4872ba86f853e3069ef198a671";
@@ -21853,6 +22780,13 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.0";
 };
+"pmhanguljamo" = {
+  stripPrefix = 0;
+  sha512.run = "123367842e0d4ba5521a502b322bd1509dc6cbfd8cb5de1c7d94bc2f96032aeec70277aa6e742a78a1bc989bfd5efa24a5ea95ae320fa736a2a2972d8eec8086";
+  sha512.doc = "366c1f364922eb5e00caec1f2922061ab9a80707e7a04b4d42dc077bdcb744026a545fecb597bacef7d1e253ec53ca7f15fb5e21d3398b9a18b366015e158eba";
+  hasRunfiles = true;
+  version = "0.3.2";
+};
 "pmx" = {
   sha512.run = "d8c20ad86fa90531b0bfb1e7af06492e31a4b3a46331fd36d60bf46275103672b61a419eb671a3c89f098e0c74a580df313d75001e52b27b148bf322c7df1593";
   sha512.doc = "37405b45aabf5bb6027b7849bc23f263f2ab9ffec515c3d7a2073bd7030580898b1c2171c760a9da40dcf0cd4cde890e235dde572b22e69e6a273b7bec4ebeb3";
@@ -21873,19 +22807,19 @@ tl: { # no indentation
 };
 "poemscol" = {
   stripPrefix = 0;
-  sha512.run = "59906e64751670ce1a00ac953db24a890b0c3388fc306c5520d62a728497203c1516106210b56b26f22ebf6e78e33a3f01bb7d897ad356f2364ac85c17819a82";
-  sha512.doc = "8631041e8c3188dce9a0982b7e69e6efdf7949fbd600c5869ee84467b06b80754c86e1b54476843002a12be4a52c9f88c82441cebfb86d4eceb12605391d3477";
-  sha512.source = "6717c08c6d728f7aed959cb2ab1ded7d050241f61d878889dd838c85c4090aba602dd8b85e5c8b8f01fbf23aac7ab1562d9d33e31eccfbd508277507f5ab24ba";
+  sha512.run = "ff2350ed68690432ca368330f50c5a76ff586c2a09e7e487ea114d75b9b488652ce561e40d69ee02a5271b4ef93ac3dcf888cd64b79a33b8f7b5d95ad7972e81";
+  sha512.doc = "89a929f03afae3c1a48aa4289bda29b06664d4583c6474fcc3df041b809c240114f1f5a14d2f1d1493c1c36d31cb9344a4ef6ba9ca6e00008f3c9f1dc5ffa0c8";
+  sha512.source = "5261ade28661f2ee8cffead2bbcbb6254a49477adf206303baa7912852e3a8562e3fd2fbc34dda8e4b6b3b86af6f8a81bce9158acb21342cbc238be650fe4353";
   hasRunfiles = true;
-  version = "3.14";
+  version = "3.141";
 };
 "poetry" = {
   stripPrefix = 0;
-  sha512.run = "72e1de3a851aa2f23bdc34d4f85674ae6479affda0f6f1e9e1b500b202fd9cef823a04d12a7ef2f9fc195f867c7344f88f6990b97cb95e53d9fcf5f32d8568b2";
-  sha512.doc = "8a5a23ad316171ba1f00abbf905eb767676de2777f49c33692087356462067fc9be82e50b26dfdd7492e75d9b4bf444368dc98205a294903902f7a2f5c96a90d";
-  sha512.source = "afeb5b72d5064418d0e2c87bc13516267be905d10949b42660cf8d5a589287209162e41c52b9214492bc4678886fe6b4ce79e5a2da3924609ae5aa2ffdbd93d6";
+  sha512.run = "1f618b339fecd44d21029ff9ecfb95a97e47fd5d20089a2115d70c8336738c794e1c639c78a16b5756d591fbe3ad52576e3923f6f86245fcc9f7501008382eb6";
+  sha512.doc = "540a209251cebb31bdc87143fc8b60627a9296f488f58a81faaefb3c3cb66517e8a670e81b4363840cfa1220697d26517fc1bebedf43f62a4f1c18e3e14a8d65";
+  sha512.source = "59132d5d5deb62236ebdb4ec0335f3557cb4a99d4a5871ec40669801338f5f1b72fe3023a09160feabe2e0e1d2e1a78c8b803dc4d21c63cd3efafd4040224f9d";
   hasRunfiles = true;
-  version = "2.0";
+  version = "2.2";
 };
 "poetrytex" = {
   stripPrefix = 0;
@@ -21903,10 +22837,10 @@ tl: { # no indentation
 };
 "polexpr" = {
   stripPrefix = 0;
-  sha512.run = "93cbffd695c765a14cbec16010d3804a1733377628b5b552cb0b110b629d415a07e993e73ce0ba4ed7df217d16a6eb3c0f3a00616d11b10d003a0cd8239467dd";
-  sha512.doc = "1d8f3bb80a538411abc72a30657f1f32b60164c807579ef4b346484f12d8797dcb4ad90472c872bdeeb450b44e32d08bcb06dca5334f4b54c528794b94be4376";
+  sha512.run = "562fbb09aa3eddf5e25d8617eb4d8332eecb20c0b5ea386762de4277ee15e47dd13243be978146b60b147bc30a167e5a00a6970ee0dc74710f13640ddb4da6fa";
+  sha512.doc = "7cd3af9fa8d281b780cbcde915cbb241efe8d2398dbc7ea9e1aaf467b9de58325834faf9f9bb7ea7b9f5f5192ff4016f4dffe7d58801860ebe1735dec7ecd6f5";
   hasRunfiles = true;
-  version = "0.7.4";
+  version = "0.7.5";
 };
 "polski" = {
   stripPrefix = 0;
@@ -21928,15 +22862,16 @@ tl: { # no indentation
 "polyglossia" = {
   stripPrefix = 0;
   deps."etoolbox" = tl."etoolbox";
+  deps."filehook" = tl."filehook";
   deps."fontspec" = tl."fontspec";
-  deps."ifluatex" = tl."ifluatex";
+  deps."iftex" = tl."iftex";
   deps."makecmds" = tl."makecmds";
   deps."xkeyval" = tl."xkeyval";
-  sha512.run = "2ccb7747c5c0becc77181c75bad4c035dd3a3a2f5a5d8cce03874c99b82d2594e2a80bd6d7799f3882b988705eb61ecbae4e8eccd9c415ccf4af6ff0e2e581a4";
-  sha512.doc = "21e73e878cc9bad95e3d7d842e89fb610bf2076e9f68a5b8f693a7112c30172dac72b75728cd079443118f598d4d775d96ead8953d0d765d5527d678750188b0";
-  sha512.source = "923333748435523d21f20351f4bbb46dd0a35a9abe1fe1db8faa09c53f7d7b9210627b2e7ead2b822815813f2569594c0652f672f1248f931b05814b86437188";
+  sha512.run = "a0b93306e12b29f327bb2545c7fddb1804c0cea7f91aded57aa1bc673857722a462eae469a8557671f3f1b10dafc81b7021be838ba943262897ac794728dd9aa";
+  sha512.doc = "65cf1e87d65ecdf0e6b43a00f391a8f70c4f5ba628dec15b9594272ed3a1f2c9ff8827520e4ea0f226f8d396afb412d770b9886c8e3fc6ce329ed1a217ade8a3";
+  sha512.source = "c345d4cf7de96638b7da0dfc23eb05eb5a1a35450b310f237bdc029298fdca7e5751c3b2ed0b144fb0c281ae855b6c82090d99f6938dbbabae2e66cbb25bb1db";
   hasRunfiles = true;
-  version = "1.44";
+  version = "1.47";
 };
 "polynom" = {
   stripPrefix = 0;
@@ -21998,12 +22933,12 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.5c";
 };
-"powerdot-FUBerlin" = {
+"powerdot-fuberlin" = {
   stripPrefix = 0;
-  sha512.run = "607e182a393baf3701b944459e9cdd59451c402722226aff8f09e89702e46723be269b21b3eff35c8f71adc4624b00f083bd4aa0ebde66d49a32bf7de1eeaa48";
-  sha512.doc = "d822434b9e03f500779ad0b035100d01cbb197a68e931d17871bbe00ef3defbe594796be28c375502129424ef1309eb49e5f9f6cf1fa5ba8b4b8719a2825a011";
+  sha512.run = "73026a8e853bb9141ef3d8915768ca07a9f5caba4e810cf08ab2f41b8c6ee42071065e347ecdc1da070686765591d5cca02a372bd256fc1f9871547a7e1657a2";
+  sha512.doc = "f2011b2d9362cdd1006714e71c3178b279cf764dc82f10ac31370d197de98a5131dec0c64bc17d4746a554396687e115e6880ae6940d902b34dbd91aa75ba308";
   hasRunfiles = true;
-  version = "0.01";
+  version = "0.02a";
 };
 "powerdot-tuliplab" = {
   stripPrefix = 0;
@@ -22045,10 +22980,9 @@ tl: { # no indentation
 };
 "prerex" = {
   stripPrefix = 0;
-  sha512.run = "1df2081c0f10d4514ff324d83fe9949b6cdb9cbfb209b06e5fdbd8ad90991cdccb02143add807b971065b63c1cb865815ac620db6a4df0600bea22e6d57fb734";
-  sha512.doc = "d94e663d94b9b05acf7ff38285dfa3927764d286fe6f8a386f33d8055a5a5b58ad09f61578009b6b93c3aed684c7492b1407a626113f8eb4f8d0171cc1f45930";
+  sha512.run = "7eb12c59d75d6a3f08dd0bbe8928626b5778acf01bff4caab1f214f2ce42dde798a2823b47b6c79c94c471f8924e79474c00ef9d6e251757c3d221bde06b410a";
+  sha512.doc = "3e10f4810b05377d5e54bd12a5303c781c36467479f30cc0044c24019aca81c155a90ca01d3a422e01b1bbb4d245d34bc51cabd4e97252ea8e1a6da747548d4c";
   hasRunfiles = true;
-  version = "a";
 };
 "present" = {
   stripPrefix = 0;
@@ -22085,11 +23019,11 @@ tl: { # no indentation
 };
 "preview" = {
   stripPrefix = 0;
-  sha512.run = "3884a0b8c8f09d046c7f39df28b7dcce43a95820636f39f628b499b2d06ab44eef647f74c6eaaf23692ff48d3bf5580ba97daa1e2021985c7d0f05f7206782f2";
-  sha512.doc = "d1d78634eb2289292948197bf3399b6afd2ccf5d59abe47ba489e11c0ca911c9820e7e06e9b84920ee0c323e83b32c0be53bfc8d09261ffc45ee728642e640b9";
-  sha512.source = "169f2fa0b59d1312a3cb42268612194455568cb8429b0c03b658a106dc0968fedd88f9ffe82fa984a02950640f1d0c6cba20e51674e747a3699488034dd7e0d1";
+  sha512.run = "176ec9db33dd9d95583216b4003921842df3e2eb76ceef40abe3a6f39daac058fa9807ddd2f2b789d011b415473b88d15f60916828317d30b65c8ceeb5d45422";
+  sha512.doc = "b6834905bc34836b33970933cb8a7b1a94a8d030e0da112a3092ea3ba3abe1fe1ec248aca3fd362eef653df5b05ebe7b2aa04338e721edcbd4358ae83b034566";
+  sha512.source = "c4d3f247edc4235ae2a4fa6ac6d0a8cba2f6f6b56b650b3fdb9c8b585d9f7dc9549aed6b5f072c7a89a6baf31ff4f3a5ad08dada4ffc8dd6d0e748644fb087ba";
   hasRunfiles = true;
-  version = "11.91";
+  version = "12.2";
 };
 "prftree" = {
   stripPrefix = 0;
@@ -22231,9 +23165,15 @@ tl: { # no indentation
   sha512.doc = "0441621561c2c4208d083f84eaf47573de94248cc1aaf027061de636c1a65f35a307260eaf390257bd02acac34b42963f96030ee27c83650deb11234edec89bf";
   hasRunfiles = true;
 };
+"ps2eps" = {
+  sha512.run = "dd92a9ecfbe36be9d8bdf7aa969559953ff9b56c0c7b703375febea04e3255ecb478204f7284eef84ac1a188368f2a7fe2a40a9c69c938b037d3704b38054e42";
+  sha512.doc = "53ca9f92488bb20d038340ea6f5bbbd7d31a1f7bf0aead699a37bb5bcb11f9cd3347016afc9c2ee61e61e5e040203553bb5f6b5aea4ee1d5474ec5d366ff6ef5";
+  hasRunfiles = true;
+  version = "1.68";
+};
 "ps2pk" = {
-  sha512.run = "cdaf699808804ddbc6e7a4c58db7332e6bcb2402aab67ab617c031ab6b3ef40ecb7211b446788aa0f1eb7a69a32d2e7802ef03e9adfa062cbbde002a909f8dd9";
-  sha512.doc = "58bc80926df5d9a75f8994f147d4d7472ee495ad0ecd22bfce2b7e79665108bd44f1b25eac6c26a047b9e572a259f10148abf35f2dd6410346d951cef222628c";
+  sha512.run = "4b3ead8d2708a182d0c158dd8ae5077fb2f4a94c7f6fff52a66d6479d4c05de3d742e4c960ab79b63084435bef491866c38e01d77c41ae3d630c7a32450d0a11";
+  sha512.doc = "c5b22a86807378fd7d6d83e8802780567a2473e87875bee4c827a48ff470911855bc4a1db4f439fbda1baf71f714086b96e6e78ee059590fb6ebb45c58abca4f";
 };
 "psbao" = {
   stripPrefix = 0;
@@ -22244,10 +23184,10 @@ tl: { # no indentation
 };
 "pseudo" = {
   stripPrefix = 0;
-  sha512.run = "3c91de9ec74af642bdff675435184ed058296d1238d4985bb22cfda82fc76e80ba6dd6fc0ba4b9f14e7899f34d0ff4fcb6fd68777c18beaddb2bb0ff9eba9661";
-  sha512.doc = "3e370ea32243a085a9d65966d464932223549080c2efcc297fe9f503cf72a7c6cc8b732f0d0b694f49484a0b7eb77a1c08b3ebe7aed3f977f63aaecca2189bd3";
+  sha512.run = "efe90b9cd0ada5a099886c8d0bfcb697fd831aef5fe60f6eeb0246dd8ac8bf43782901d77f30cc070b114c961d47602fb2b2d91aef74e9c266ae8323e722ac32";
+  sha512.doc = "3ad7ef72a132e91d030f150df2fbb217115d493acaab1c7c61238277ca3220f92091451c806920b7a848e15c5e5a928e30645854d12ad39a8e5e5fc5949d7651";
   hasRunfiles = true;
-  version = "1.1.2";
+  version = "1.1.3";
 };
 "pseudocode" = {
   stripPrefix = 0;
@@ -22299,10 +23239,12 @@ tl: { # no indentation
 };
 "psnfss" = {
   stripPrefix = 0;
+  deps."symbol" = tl."symbol";
+  deps."zapfding" = tl."zapfding";
   deps."graphics" = tl."graphics";
-  sha512.run = "d565256578225edc29fce8f9c8236542379a1918590035faa8d8b946c37fb9fd17414e5a05ad2bb0bf1ba683a5fb29ccf29c108a3fc678e184a1eb7326165bf5";
-  sha512.doc = "5a3441930471577bce029ddbf820a2aece01bf3bb88fca22fcc7c724030bb958731d0452af34e5dc9a2bef99e136ef24228094c71d35bd684220fd0d68f74f59";
-  sha512.source = "030108d03f62b74f1e0274168452f5b05201337e947303ee78567452b1ab38daff5be326b8d1c986add7252d2842b034577577e23ae6bec67a02c0f0339428c7";
+  sha512.run = "d1ac5027602b905a359974f9049b8e52cd4366513923483a3109ea21f042f3cd0cff645280de3438f615babafabae1a7b14a046acee8d6a48794bad89a3061cf";
+  sha512.doc = "18e539fefbcfb68c6f4520ef622fa577cd7f91e32cb26533bfb0769893775787dc0b1ac39080bfb5993f6f3094a3aaba3d177a882d51896823415624d3107998";
+  sha512.source = "6da773da315bcbf2d9a8624309f6f8524cb4e0eaa1ac6bead9490fe77a0997b7996c526c0ab959da5e32e504095fb868191eb57f7b9884716be9608b50f8ec3b";
   hasRunfiles = true;
   version = "9.2a";
 };
@@ -22499,10 +23441,10 @@ tl: { # no indentation
 };
 "pst-eucl" = {
   stripPrefix = 0;
-  sha512.run = "bee0b8065dc04c5deb47f10b0bcbc627317f2458e7bd9ce28e44ed023853b69ee87a2d8fd5784d172e9edd641fafd1b85a42862c83efd88140ddb5c51f89f6b8";
-  sha512.doc = "0bdd883d52b6f639fb7dea4e7b5e1f65287bbcca2031e351c4723b875114d2aaeee537c0e62cce3bb1658777ba9793f5409957e2d7e0e0748b2900a8fc0eafee";
+  sha512.run = "fc8a821de4589ce130d3d0f6057f657762171564db00f73576b5e954107785be5d6d9cf809ca21e96012243822347ed75ad8c5dd82bf86e0bb9de21ebcfdf8c6";
+  sha512.doc = "fc34471747331cf42e003fff20c975036965180c600e6c2051b68e9b49c9266f272e124675a6accdf96f468da3d117eeb1e52f9919462b8e54860e6814b9723a";
   hasRunfiles = true;
-  version = "1.65";
+  version = "1.71";
 };
 "pst-eucl-translation-bg" = {
   stripPrefix = 0;
@@ -22779,11 +23721,11 @@ tl: { # no indentation
   version = "0.3b";
 };
 "pst-pdf" = {
-  sha512.run = "537812f3811e9a62a2c9667438ea380c3219b1cd8a96ae2225e0ded063f1f1ad572a699d4f9d5d11f2c667fc560d94f17b275293198c5eb4035dcc3d3cb92242";
-  sha512.doc = "bd6e6b3c7ee31cafb5c6f6064abb6b6f4a197c10f4ea184fe028fab874a1a5b6bbf39719a1a620fcc9fec23e52ea15c6abfd4b66f79c788755f1ba8eb65ef778";
-  sha512.source = "ac181daad359ca790224fd0bc2eb560ca59312ec6330ff64c8e9af3cf58aef1f6c2ccc3310ffa9bcd2ccf36657d0675b8c926c859ecb6cbb3f5382257ab6ec85";
+  sha512.run = "e262eb62c86631aeb04bd4268672fcdb7da5eb458d91cfaf78ed668e0afe585bada46bccd9eaaa7374e23d9efb79106ab7ffde1ff879993a7138475b8f8d6599";
+  sha512.doc = "d16ca8328cdc79dc6c3488a68a537ace21d2f124604b69c79be6860d9913c8eac3d3093b9fcf03a17dbfe184a73c168a13d2e5a54056fe076e0e01941740f4a7";
+  sha512.source = "67286e2f38bb3c88d48f0cde11494a64e0bc751d65b997ae50f4f50df980ad396b58e1eb37e544d050b52b691bc9fedaa0a15018d8d1836b22e3dff6253f942e";
   hasRunfiles = true;
-  version = "1.2d";
+  version = "1.2e";
 };
 "pst-pdgr" = {
   stripPrefix = 0;
@@ -22817,10 +23759,10 @@ tl: { # no indentation
 };
 "pst-poker" = {
   stripPrefix = 0;
-  sha512.run = "df340b3087babccfdd371446582dd33a744af8d16a6c53939cbe0e2366c11d51de3ebe095e130dddfbcb8d062c71134679fdea8d8821818e61e4f18b1e63159b";
-  sha512.doc = "06eaab1e95de879d3de35017a3a185525375afd360ad6890b279950eda7d35599cbebd6580a31e7f0180c74266ac02d00ede982ef776eb4645b0da8966fd7708";
+  sha512.run = "6995f975d1c149f5b67126e6a01c076802a5a40cae3f7376a25258b923397d61f021af19822df4e4a522b3648d3a0e6ad1e5d81e38527c7468e753b0fa35c525";
+  sha512.doc = "619a0a9576c4cd17f6bdac1c2e0dad6b42084fa8f8f2bb1f38a8a07d0a0e7195f79edae841e79f80393165b2671063f6e8388fc2c5b9c12d063f1421a0a4a0fa";
   hasRunfiles = true;
-  version = "0.03";
+  version = "0.03a";
 };
 "pst-poly" = {
   stripPrefix = 0;
@@ -23037,12 +23979,6 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.5e";
 };
-"pstools" = {
-  sha512.run = "bb0046118a269ca8781bc5dd539e1dbb7b068bcda185d8d52f9ccc441ae07c96197078b204054fec079fce0d707e86a5b094db07dcf8c894e1b56fdee2db28ba";
-  sha512.doc = "ba3cb98dad993b56c7013d24fb515489dd5168c66c8e818b3c87922e812509903085ab9fc4f36b9df36b0371a7533822e840552d0a16feaae158d5e6f228370d";
-  hasRunfiles = true;
-  version = "1.68";
-};
 "pstricks" = {
   stripPrefix = 0;
   sha512.run = "4c674666903d17749de9a99204e59ceeadee66d3fff38cc0913efac0ca34fb0269c7e5e836543d28e998277537fbca4fe64889cb71fda2dfb258a5aee37f3260";
@@ -23052,10 +23988,10 @@ tl: { # no indentation
 };
 "pstricks-add" = {
   stripPrefix = 0;
-  sha512.run = "5302a1cc7e16baf545b545822a2717e3f37c5ed993273038f14a0950d5fd83b4f0bdb951f22f5673bb1ead60e3e86d2ef9880eea404e4af52d4fb5969d89024a";
-  sha512.doc = "7950a3756ac016fc7d759dd1d466673a6df6b0ea5163a6e6bb1c71cdc3314b5c557304828efd4b81109f2238c5c096bafffdb044ab3f6bef88c7bdf630069fb3";
+  sha512.run = "cf73863537b9058961d4592077dabfbd0e76ff0f07dbc7b17520945bad42286483da11ebbd44abe403845a9092cfa6415ad881ab19d323527f1b979b9e0163be";
+  sha512.doc = "7a7639cd2dc128ddb203de7aeae23eb50adba49702b5270c6c432a159f185dab78bd0b6ce9925b6b803c200403fb662a9ded85197f79711d6880a1641cd53996";
   hasRunfiles = true;
-  version = "3.87";
+  version = "3.89a";
 };
 "pstricks_calcnotes" = {
   stripPrefix = 0;
@@ -23070,8 +24006,8 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "psutils" = {
-  sha512.run = "1e0afa3066bd867425f8b34857e222268cab1e3048edd40d276f01f3c9cc1d5c31bfd1dd960702987c7182ce2e5512e314eaa87ad25da5696de24b3232f9a8c2";
-  sha512.doc = "5ba2329750889a16ea2f5c2feb79235251d1db841ca264075751bb183ddb81b960632ed956e623446143e907deec4b695634a48644d3169a5a7bbdf9c0f176b6";
+  sha512.run = "737cbffd48eec8244b11d6715a41feea6ed25cd6e53326dcbec0a5fe60881c5376dba508d70345db30a3c3515b24d3995f133b92015d2e943accea1093ea7c1c";
+  sha512.doc = "68505dab374e4e4ffd9da0ce6e6ee41008ebc0e2eaac1cd89ba7746b6882ba7bf6fb93143b4dd5a3a8fada821104ab8ca66fea5ffe313173631f98b221fdc62c";
   hasRunfiles = true;
   version = "p17";
 };
@@ -23083,8 +24019,8 @@ tl: { # no indentation
   deps."knuth-lib" = tl."knuth-lib";
   deps."plain" = tl."plain";
   deps."etex" = tl."etex";
-  sha512.run = "7e03619011e2095fe76674e39f6220d938a9673a34bf6cf35cf262a60d8eb140a5f978f8f04b6031a1fdb56e81edbc6c4ace82cea9fbbae2e9839b0b8d0e0612";
-  sha512.doc = "e09ce7a08be8a176e591cd69b1bdce5bf37d59537109ca820e9f4e60bdcb4cec32a58cee75ee36c61ab7a512eb2475df7f2afd570eeca53c33b2be94ac2ec88c";
+  sha512.run = "fe00cc7c0b2f84d3fa86dee33102428ec396d1f6458c0cfeeb11432c1616e1006d46974b9914f8390212e8b8e7b55a5fdbf83fa90ed49f4af031cfa66fe53ace";
+  sha512.doc = "38213de7cb55c5ef1dc8e0c289c4bcb6910980dc81f1b035d223dfb9956353fe3423b34b665666177d2f3e6087f8c763109f9ba61a2e02b62c4dd497604bc352";
 };
 "ptex-base" = {
   stripPrefix = 0;
@@ -23097,11 +24033,11 @@ tl: { # no indentation
   deps."arphic-ttf" = tl."arphic-ttf";
   deps."baekmuk" = tl."baekmuk";
   deps."ipaex" = tl."ipaex";
-  sha512.run = "8951d9e1bc4b2f2e4ac7bc5cb3b56ddd3924684c65edb35ff680e72ede7aa3f15b92a1cad39d8e6652cf76abaa51e72115aface47068031c6b24fc82c5e6531c";
-  sha512.doc = "c5e0f4b4ac9c657b83c27ced5bf3d4eccf993db6518fbb750e8a0b91752b40193a947a3ac2c53a82270be2f8ea736711b5a60e59f29c424bb3ca612038be8972";
-  sha512.source = "10b3aa3fabaae3f7307861401b7b47e14b62a5f075fbf79dcec44e99ceaccd2e208b09aa9733e850d01938332c31ad399540b5d98a38ffe29261aaf794dd66ee";
+  sha512.run = "948d156244b16385b0b4622662bcb12651be4bd5522b335bc0b24f1e0ddf48241a5fd4e7aca976e471d418a659b777735f14948b863894ea1fed0d2b5e44e4c8";
+  sha512.doc = "2e347f1a2be0c32d90daee6c351b6c71e757a3fbe694f97d50836a6a57187f72004d8cd8051a9bf1a22d77ea618566dadc7027fe24bdd0dd2dff3d8afd290231";
+  sha512.source = "70ea9c04d3a1c4d4e066036e6b1ff328e7c6903e2b57962ccee08c85820d0b2c20a36b684280779301c903c1706f95da5122cbde5c706329e304bc88cf3a0575";
   hasRunfiles = true;
-  version = "20190506.0";
+  version = "20200217.0";
 };
 "ptex-fonts" = {
   stripPrefix = 0;
@@ -23111,15 +24047,14 @@ tl: { # no indentation
 };
 "ptex-manual" = {
   stripPrefix = 0;
-  sha512.run = "a09a78d9c412cf812ddcb8c553650ed474516a97c7818fce68bb2222047d116cc4eae184b551f89b45eae49d0d91e902fae1025a353520dd56cb8280cdeda316";
-  sha512.doc = "539133b6f91ee252f62862760c502425b0387815c091d0a0e425bcfeda4939d44b83661b6e94de13086d7a5bb83c332b4ad998d5c23377f72d6a57f88e018488";
-  sha512.source = "259963273db22746370d950e307e7cc965963a4e059d129a4bc81136069ae4137b1e2c70a621d694fa2665a05da7c937e33922983bbd6d8c6c9e8e691f7ab2c1";
+  sha512.run = "bbe8cc1483d48b4b77c3ad00b0159c65b1a0dcdb2a860bc38993150e60f3b2a92ae61d3e598a02afb06c8b3810b85e64a179a8c2088b2b342c6c8148af3be2d1";
+  sha512.doc = "5ab04251235c4cd5c13e213f66e75fd7176bd3b393d4f7b74d7b5cf96620154f76f50dbef02b2ba65ae8ea47557be57baccec5e92a60a2b68e8c9b9e2c44ea8e";
 };
 "ptex2pdf" = {
-  sha512.run = "2528b9b182dccd3bb79fee2ce030874554d2ae674d78e481580bbbf03e38d12e1d7ee35b1e7d5fe887ea285851751bcbc2bf3d5cb462430b842ded4fb3a7b0bc";
-  sha512.doc = "ba07bede383c322ab541cda888c620d1ce7313dc65807e0d1728d53bb1ee8ad46a15a5fa1b88c93d796cce2eb6b8c4b534fa8d5c9089e83d0a721a3b222c0727";
+  sha512.run = "674d782ae7ae239971244cc5079a1575c416be8ac436c3d458719526fd5432faac2c42993418e4d76aea41a59c98d5ca9d8f2330ff08aa1707c505aaea94716a";
+  sha512.doc = "de114f20e22caeb6d03e1dcc2b59ec180c311f410e24b421a4e27e1988d19e024919f5c5d0fd33451516ffc256d02222b64bd54f1e644f2d5df79255530d461f";
   hasRunfiles = true;
-  version = "20181212.0";
+  version = "20200119.0";
 };
 "ptext" = {
   stripPrefix = 0;
@@ -23178,10 +24113,10 @@ tl: { # no indentation
 };
 "pxchfon" = {
   stripPrefix = 0;
-  sha512.run = "f7cbd2c1685fe042abacc13e649a187401c53eb42dc66bed1c0f7e56524ef9cfe6b25235f9379e3e8dd948bb6fcb21ab297fdc3a2b94b27e0ead8aca041c3e73";
-  sha512.doc = "88be1f7eea3298906fe1c439c1342690feae9300107d8c2b1467301f06686fa70f128112b3449b5045bdc131d30608d9f386556916cd0f87b49e6f715546ff74";
+  sha512.run = "2c81f0ce0c4f5762805cb86e6bf9a3965887e9beb5bdf7292d1a5a274d7728becc580afe0893621bba8e5c477da32936607e0b3fb5d3563f9c6f9ce640ab8859";
+  sha512.doc = "3284966056d60f10b9f6636714fd64c580ffc53c03aaaf225e59df2574642a7c8d28f8ce44eb46ba0a5c809476a2bac4891ec0589c87c37f9a2fed9f412a20cd";
   hasRunfiles = true;
-  version = "1.6";
+  version = "1.7b";
 };
 "pxcjkcat" = {
   stripPrefix = 0;
@@ -23206,10 +24141,10 @@ tl: { # no indentation
 };
 "pxjahyper" = {
   stripPrefix = 0;
-  sha512.run = "048978c0e09715f491f440a15cc08b9984a85f01dee160bf4dde530fde21b7c8a4d04f0a06c5ba0493aaf7f63e5e246813620e452d2464480ba60bafb4e740cf";
-  sha512.doc = "624c4d0fe038f6a13fa6814df000d52497810c3e74c8208a687571f524f1b8b878e36a01e8686f3fd8ec90177ef82829a2fa75ba70519ca435a97b42d1587340";
+  sha512.run = "ba1a25007905af5d61b2ff3805e09853de8a6c6463d1efa8c1a9a4de5266ec4db23b24b26c3511c72860264d8032059ded26f7e57f4d4da207fc032c1d79c07f";
+  sha512.doc = "f2b6a6fd0164321a1878af5daabd23ed7f82abdeb1a7666095779c9ff5cc39f6584282a0fe7f65c59080bb8f25b803e713832a1ecfb50654acbf2a3d6fba1269";
   hasRunfiles = true;
-  version = "0.3e";
+  version = "0.4a";
 };
 "pxjodel" = {
   stripPrefix = 0;
@@ -23249,10 +24184,10 @@ tl: { # no indentation
 };
 "pxufont" = {
   stripPrefix = 0;
-  sha512.run = "c364d150c3607a8f918301846ff919bc3a7a240b23da1a67faaeeac5d1000c7f59dd4ec7da829c4d4793e6b5c9aa11f94314c149bbd277d5a3d7df111f2839fe";
-  sha512.doc = "e1938ee53f1b7572ce85b354eb6bf9477c63adab65c7c3b3b486c7ca6365865845eaf4dc4670cde741475623e3654479e817075832b3a2d7bab14c75f360183a";
+  sha512.run = "bbbd7c0724e4b9a77ef731a4be2d014086aca61c78a439912ea20a630785fd8695ab9f287e07d0899ead8fe90614a806b0928a8cccfbd1cfb71c94b9b3c1266b";
+  sha512.doc = "850e3e336e1bc3f60a89325c66de38ea1171a2ba2f4444382dae12373c509579a5c686887cbab42b147b69a206b4ceb43af83f8d47446c4bca47cade5f9bfaf2";
   hasRunfiles = true;
-  version = "0.5";
+  version = "0.6";
 };
 "pygmentex" = {
   sha512.run = "d6e6327d0bce32aafb4be5a30eae63ab0418506367a4a18305f2fa45156b27911bf2cb945289323839c82bfacd6d8d3a588a302bff1cfc29911cf7d761d83cc9";
@@ -23344,6 +24279,12 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "3.1b";
 };
+"qualitype" = {
+  stripPrefix = 0;
+  sha512.run = "612570ea01cf7631d277a8a152540784f24a0c33c059e35357f5b753a213a0993ccb297dbd11fc831a7db3ef14c648bb1e39399187b42bf74b93c8b1c586b0b1";
+  sha512.doc = "7fd5285546fc3092165dee74c32c4622c3ef49dad0760b14ee0d1bfd3289ee837ad79cbb47c70c5ce1aeb665692faa660f9e6ae42011085ea0fb8a42eb25d337";
+  hasRunfiles = true;
+};
 "quantikz" = {
   stripPrefix = 0;
   sha512.run = "0d6946eeee69573a3c014a16c985da8ed193be32511723dd6302978851d9ac729aa7248be6cb152bb519b36e1b04bdc741b440d9746fc8106d326af67d8d10e2";
@@ -23446,11 +24387,11 @@ tl: { # no indentation
 };
 "ran_toks" = {
   stripPrefix = 0;
-  sha512.run = "145ef7d6307f0b949fa488d2510223bd055419b5677745aaf04f322a817562320829f931136b9f651e501726202a00da68d9b5bc13f4346c9de9361611d427e1";
-  sha512.doc = "a8e8b19485b3609cc8df896cc8eed9af31177866648d94f10c20b2be1c8ad23c48ba2d8e9004168cd6a67646b68aca48abe78dfdc668216904bd0f4f982b27f9";
-  sha512.source = "83a0c7f284b019b2c4ae6469f48b275c35e31d4f4cd2c61eef5d906f5bb41c46ba73fec3c4c34fe3ae745f5bf1156ed77021556c2e9ff4cf03dab3752bfe3c34";
+  sha512.run = "44c32e48f06a6c6f71a1a205ed4e4a818b100698e04828a2e5cdd305f1309f736a77945b79939258edb9606f8542a1327766e120075476168115d35a2a298fb6";
+  sha512.doc = "35b639dcdb54196bd73489e1e7c243d28c5cd24e957c06184c2e2d419f73433a140856313dcb67e2ae7b42d3e0833a283199fb2d251b16710c1ef50827c1bbb3";
+  sha512.source = "7a652b339f7828493761e1345299fd6ce70f04c228459d1d8f7b628851cd9dcca4643a54ab3ebf69435cf923e57cf5cadf5520d2a764eaa1c742b63e47b490e7";
   hasRunfiles = true;
-  version = "1.1";
+  version = "1.2";
 };
 "randbild" = {
   stripPrefix = 0;
@@ -23537,11 +24478,11 @@ tl: { # no indentation
 };
 "realhats" = {
   stripPrefix = 0;
-  sha512.run = "1340264b7e44e98c356c2c4b71c5b8ddf6488b221858c1a5668bc55fdef5f976eca954cd62d51bcb097f2a58f719c6f96f6a9cc4791283328ab969813186afa8";
-  sha512.doc = "faf01cf9153647bed3ccd282aa4f8370e763bceb2bd43c547d3ed2b1de77fe2e64c4d720cefbb9bee78416521661eb17eeb496b4548bb7b88c5a45d084765e30";
-  sha512.source = "354c3d88971a7d516ef9d0cbf37c40a28e02fb97e99c59590ab7ce12cf8b70a930ee486fc9fa9c94ce9cc52d2ace8a7a183d22b5ba15bb91dae042253462f86a";
+  sha512.run = "9f5c32cf6efc957f8cf7b577c77d953f7969589fd487032807bb2fd2e6dbc0f5c14ff24bd5ce14dfc14b69bfcfe39519a0ca6cdb73351bcbae561a9a01c93180";
+  sha512.doc = "681b327aa1c563436821fd7c2e736d2f45c419b0dda38abe86e146ccd9af80d3b1b57302608a42f4e0c1c744b00ba4aa6cb319c32fef5d6fb43e8fd4ba10f409";
+  sha512.source = "be1f69bbc0bd6703ac5e2e56af54d14688d5a79aa0152f488faf86609fc0e530c0f3e31baf5c3be03593a4d826f8f06d5571453e9a55154116729956592cc08d";
   hasRunfiles = true;
-  version = "3.0";
+  version = "5.0";
 };
 "realscripts" = {
   stripPrefix = 0;
@@ -23598,6 +24539,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.9.1";
 };
+"refcount" = {
+  stripPrefix = 0;
+  sha512.run = "da914e64de5b70e124d9eb62148f5650c9445d2fdb94272ce622478b9aa50a4c7625be9c2152fffe9ff9fd87ee19319a0bc31ec5fd82839a479faec687de4af4";
+  sha512.doc = "5324828978e3c8c14e9a28b86cbf87de175b9908f460ce6090bf19944557cfe82b112c6543d2878b54f4a16b1a9f3f3ffc66eddf1234c04b8852dbfa3ebaf27e";
+  sha512.source = "26c03363bd65be818d05792fc1c7e3a2e7e747a49382562eeebaefac35d5b4143b86bd46fce97fd4aa0f162ce7a1399e200f2593b3920091159bcfa08f0f8781";
+  hasRunfiles = true;
+  version = "3.6";
+};
 "refenums" = {
   stripPrefix = 0;
   sha512.run = "7113ba67dcaf3ca2a070e42b4fa9660889bdf7803401cc0f8c3f9f62c59e467d9f637c526712bf9aa9fc7ac3df3c550a41f419de9cff375e24e68d102207e8af";
@@ -23663,11 +24612,11 @@ tl: { # no indentation
 };
 "reledmac" = {
   stripPrefix = 0;
-  sha512.run = "0407a52e981e13a710bf898ada7a0217e76b87f922326c61cb914f3e309ebfb064417315cee2c66bcbdc17c13812871f42454edf64de63e39456a61108ae4c3e";
-  sha512.doc = "3dbdfac8f7dd936b7685003246106c80d02655ea76a08b4a3acb8acebc9b7ef9bb70d28544fc74456e057276139b7f9e19e291f7d8d73d76a4880b981f8dd890";
-  sha512.source = "eb9b558d7182c4c41bd74e00c6648ba593bd7887ef25878b24f7108111d7f28ecbf81589d1f2539393bba6e9ef9c8878bdee7da29c51a1d86bd3db29ff4200a6";
+  sha512.run = "fb2864ae9a8efbc466c7ac1d741fe4345e31fd59f8aee65f43a8ed3595cb13806030c71fe3678ae4e445b8a4d96e38028424dc1b28029a7dd099143151809558";
+  sha512.doc = "4caba1ec60ce639eb856be255348dde680edc7bc60e276ae9fea638abe0762f2ba45f67ee1050f529005b7fe0ff265a4abb6f868b80b36bf54745bc1d428e264";
+  sha512.source = "c506b4a40c663ced144b5712e30860be7072e8eeed1d596d18810e780b0b10f081515650757b70c99c2ed46717b2fe8e52e84dfdd57f4b1f3265741304e65c41";
   hasRunfiles = true;
-  version = "2.32.1";
+  version = "2.32.4";
 };
 "relenc" = {
   stripPrefix = 0;
@@ -23712,6 +24661,15 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.0";
 };
+"rerunfilecheck" = {
+  stripPrefix = 0;
+  deps."uniquecounter" = tl."uniquecounter";
+  sha512.run = "7c4e3a840b0c02b898182271c35fe36b3c0f77250a8e1629901df500ac12fca887f9f21aad62e3e43f747e409184e5646efd121240caa20f83d785b9b2aa1ed0";
+  sha512.doc = "d710c123a00a1b8a286dd9973356772402b6cd93d4debeeaa2e961b1bf7fe2714c8b8a12ad877f66dc5a6ae995235555838f20835f5f4522d110de07abe2e1fa";
+  sha512.source = "38c2f878bcd0322fb2606cce01f64b402acf816995696bdac58bbe0b8830ea8e3f09645d74ece6ff073e236996008eb78be332978441654494ca0377f44961b0";
+  hasRunfiles = true;
+  version = "1.9";
+};
 "resphilosophica" = {
   stripPrefix = 0;
   sha512.run = "0ed9a50305132206585f322ba68fb514e0a4d566fc703a617cc6eda1de23b53820ee45231167f8b81aac826de732763e3c141a9ab65d13fac5d76e92d2101cde";
@@ -23772,11 +24730,11 @@ tl: { # no indentation
 };
 "rgltxdoc" = {
   stripPrefix = 0;
-  sha512.run = "dce35e42e8a81cef5f31db1beddcae93b7c02a8baf3563e21a95d5f3a13daca83368c432702e7836dc9ed8cac2e55e0276062a643ced3b41ac85db9280e74d99";
-  sha512.doc = "c194c7464e2e3689309aa54a4a26d5bdc30f0b865448b1b3e51b8cc7288a91ae2d40914de3064d766e7142c0c319ad389a166711cef2d9758ff2309b7a86fb36";
-  sha512.source = "8df979de9f4ac297ee94d7fc3758e9c7e2430ee8ed6206012a55f15a57c4c683c65dc186b835fd7a1864a5437c41875b0aea136b00d5808f5c4d10641824a7c7";
+  sha512.run = "85b9166bb4408d3b1091b033455650fdf53b24c2fce821c872420191390a1bfbf457326a1a85aab1bf0d6c15765275337764f87adcb393464f2533e2462f10c3";
+  sha512.doc = "5e35c6d1e6883c895d031f047fff1ededd4629158a8958b61fb6fcbd885c57797726f595894081b4933c78e5f346289a020424405e0dcae6df40b279b86395cb";
+  sha512.source = "8f94655ca8d0006aed02fa7e8fd28c5e3b8be6e92ab010a674d85bc88ce8f6e0120392540fcf5f7649a4af1e6bed4e0aec3d1d15cd095738beeb709fa2efe526";
   hasRunfiles = true;
-  version = "1.2";
+  version = "1.3";
 };
 "ribbonproofs" = {
   stripPrefix = 0;
@@ -23816,8 +24774,8 @@ tl: { # no indentation
 };
 "roboto" = {
   stripPrefix = 0;
-  sha512.run = "1ee9e9e27e7ef6eb62d01849a9454a77830827b472cc492169660a02ec2e23fa88466462b3b4b568add687cad8c5cd0db59e71496d897cc9ad64a0167b0b6fd6";
-  sha512.doc = "45e5dff1445759080e9d62c8298fc333614fb2b0b6d8717bb05f522f1ce9593758832f27a99f0b778dd8da3c77c6c0367ca401f1976c91fe9afbfbafebd7459b";
+  sha512.run = "f52f94089af19aa4ced216946f8f2f1f69364f012dc16b044221c66681dc4aa83837a05521b973f8e6e8f8dba86bd5473d1b25887ffb3b4479fbe00c21af22cd";
+  sha512.doc = "1478c55c0d2857dba5a64e8ba7f19506e58b57eb10b913afeed9c005ff9c859ca22d26ca9ed7cffc7c30dc33ba9b11f8f9453a817fdd7b4d60bcbded149f0975";
   hasRunfiles = true;
 };
 "robustcommand" = {
@@ -24055,10 +25013,10 @@ tl: { # no indentation
 };
 "sanitize-umlaut" = {
   stripPrefix = 0;
-  sha512.run = "c6c3efc6577ef83da2a4ce3465955f19063e2fee725bd1109f5f48c14cb34da7a633b37297788e5f1445f98d8614e474835df43feb4de6288104a81a4909be8a";
-  sha512.doc = "adb489023414b980a224f9416ad420f68918ea60b8d2d0cb8f059c0c20063fdc7bc5eae724d2013037eda052e66200115518445d5bb17140389349bab70a2d4a";
+  sha512.run = "5dfdecb98f1be63d358cb029f7428cde40daae2aec1c991b345b5f8097862e43e85f329bd371624a2022c15231db2c4e86ee144c6c76edb9214725cfc90ca798";
+  sha512.doc = "eba6143a88ce245d1e67d0205f5ce69b86a17c598daf1faa42e0f4675af6674b6a3559ebe4267efa0919eecda642c2d3bbc7ebb5d8650a53fd8d3868241bc813";
   hasRunfiles = true;
-  version = "1.00";
+  version = "1.10";
 };
 "sanskrit" = {
   stripPrefix = 0;
@@ -24083,8 +25041,8 @@ tl: { # no indentation
 };
 "sansmathaccent" = {
   stripPrefix = 0;
-  sha512.run = "cbd8d7cdae74d34afc00da3e300cfe6e40b2217b6060732df0ff76a6484ab8dfc8c8921e3552a4cb06a1acd05de07d490a956464df3de97bc987a8a11cca32f0";
-  sha512.doc = "38cee91050b9b38cd5ad84b755782177854f9208e73205d51cc419feab34461a37a557660920412b936c8e7a9f9e1554574a1bd61a36c000f2422c709043666f";
+  sha512.run = "685b0c604978aac45efd75c37652471aa165bfbbf12dfa686320a6a9ef926f9043382333ecc26db6d2ff4d12732d135947145ba937eb6d01d4a4e9aa17784315";
+  sha512.doc = "c9bf7d65a232d668243df9867b2eca64e0288fd733c6b39ce200f64fc5b0a07c98ea6a971446f67f1766998e169c14a80eda71104c1653ed54d3865e6e145fc0";
   hasRunfiles = true;
 };
 "sansmathfonts" = {
@@ -24318,8 +25276,8 @@ tl: { # no indentation
   stripPrefix = 0;
   deps."kpathsea" = tl."kpathsea";
   deps."hyphen-base" = tl."hyphen-base";
-  deps."tetex" = tl."tetex";
-  sha512.run = "f95c49da292bc4eb602fa20bb8bcdd148eeb883db9673665b3cc23f010ce31cd09c51af9b5df81ba0e79ab59a0b5f28c2f854ac6dcde4e0f7c983b71885bc1e5";
+  deps."texlive-scripts" = tl."texlive-scripts";
+  sha512.run = "5c42114f0bd9a5351168e336438757c5d311cfe22e1ed6d5a65cca5e1e97439b3abab2826fea9472e6dd49ff9e7197d835932a37605d1e2b972e4fd910ef8aec";
 };
 "scheme-medium" = {
   stripPrefix = 0;
@@ -24421,7 +25379,6 @@ tl: { # no indentation
   deps."dvidvi" = tl."dvidvi";
   deps."dviljk" = tl."dviljk";
   deps."patgen" = tl."patgen";
-  deps."pdftools" = tl."pdftools";
   deps."seetexk" = tl."seetexk";
   deps."tie" = tl."tie";
   deps."web" = tl."web";
@@ -24441,6 +25398,7 @@ tl: { # no indentation
   deps."tamethebeast" = tl."tamethebeast";
   deps."tds" = tl."tds";
   deps."tex-refs" = tl."tex-refs";
+  deps."xpdfopen" = tl."xpdfopen";
   deps."collection-basic" = tl."collection-basic";
   deps."collection-context" = tl."collection-context";
   deps."collection-fontsrecommended" = tl."collection-fontsrecommended";
@@ -24466,7 +25424,14 @@ tl: { # no indentation
   deps."collection-pictures" = tl."collection-pictures";
   deps."collection-plaingeneric" = tl."collection-plaingeneric";
   deps."collection-pstricks" = tl."collection-pstricks";
-  sha512.run = "bfea4a64f5197305d18b4c066698cc19f49cbdbad180d2e3e5a3f3efce228868b184fd72d5be842235282ad1d85cb8b77c59735ca22f9c8714fb75f5f0b8c3a0";
+  sha512.run = "4485027ddec5142642acfc84ebbbff4ebc0e150ccea58e05ac558627b884a26b103361b827d8bd234f95c46525063b2072780daf861fad01206b91d2eadb8acb";
+};
+"scholax" = {
+  stripPrefix = 0;
+  sha512.run = "12dbebe73335138418cb375d12cf48d5dc8d3d528a8aca7e164822ff7d7f415c7fe3f23865e7f28c465c21afa625efd6307993d23b0fcce62c2cb2480d91f561";
+  sha512.doc = "9d232fd5ffd590cea91ca7247e0df3b16331317540d3685e6b3c509e3ebdb03e26cabf062a818bc33b36021bd7d31c865405cf6fc87ca33ea1fb18995f626b15";
+  hasRunfiles = true;
+  version = "1.021";
 };
 "schule" = {
   stripPrefix = 0;
@@ -24475,6 +25440,13 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.8.1";
 };
+"schulmathematik" = {
+  stripPrefix = 0;
+  sha512.run = "ed2db79bc6762f123fcdb452d483c8857c7ae20ad89152c3db9655ed90fe4743f00297a35e82e03d357ad733931aaceff49e0aa7eef2c9d66b2ac673d732629f";
+  sha512.doc = "13264b961f25e77c101478b0907896f99bc68814bc62659a16fa5d8567a6b3819398f4cbd91e2d53e252892b9f1313fc5b7431d439a8c3780b6ea140f2270348";
+  hasRunfiles = true;
+  version = "1.0";
+};
 "schulschriften" = {
   stripPrefix = 0;
   sha512.run = "baedf984b1d1cfeae56af4b9530b81d90653eee334a90f2a9a83a871240592ed6267668b6974033cedfc1e73166232201eaae8e4876d38b9fd94919e8262336a";
@@ -24484,11 +25456,11 @@ tl: { # no indentation
 };
 "schwalbe-chess" = {
   stripPrefix = 0;
-  sha512.run = "aa32ef2ad2e939250a91d9c8a8278f640f6d3ab935dbaaf0684f299331d336b287e7a6b6330f0e232407ab4af6371d2feb2666a92ed5d962be8bc1e07b4cc811";
-  sha512.doc = "ef7d55e273b0b61c94e2df009976f636dc67939555c67a3a79f0df4e76a5d1f8db8474506e16041492ea6e4588972a375972bcccfbeccf943dac664efd48291a";
-  sha512.source = "03c43c6667646c44f40b553d8af01a3c463142ec442a1979552186f34973b4e0e4058407e159b89969d3b5bd1179bf98f4dad2257bd9343b5c8d40da53547174";
+  sha512.run = "42f04e0fc134e4b429a7ddc2397e3c61ac1ff648670497f6ccbeb391748635c54648ab56645849a81b0002aec1a3f9ea74db631ab45972f69f2bde2dc92444fd";
+  sha512.doc = "f5ff7c4a235cb5fca0a9d0c9e347c3e2a997c1994e56dab7b9410483935253d09fb72fc678c15e63465de6fe25db7a7dcf7dc445a594711f2072020379b87df5";
+  sha512.source = "653d06a3e25c1990e8f0b0a703c661fab8db592e757d101e340ba494ca88b61077b1eafa44885a162632831c8f5a0ab945d81679206aca0df96b035cf62f0a7f";
   hasRunfiles = true;
-  version = "2.3";
+  version = "2.7";
 };
 "scientific-thesis-cover" = {
   stripPrefix = 0;
@@ -24515,11 +25487,11 @@ tl: { # no indentation
 };
 "scontents" = {
   stripPrefix = 0;
-  sha512.run = "87e9eca9f88ba6090728df86005f9a9fd1cd82156b9a126ddd6f4f9002ef978aaa846139106ce5df567cf69ebe69f05a104fe4b9c31619e0776510c43778e97f";
-  sha512.doc = "0c1195c5a24aaa7ceb52f53ef8cad4e496a765c7328b0f70ecf8ce1caf9d28b71634f4900ef83c02bb31212704a26afa5bc247b79e4290fdb64f3d89b4b43c29";
-  sha512.source = "555bb82c5173ea46ecde8b4b8f58ab523cd30ff7ed8a4b37ed70f1113d2c00f6cba30d9904a384f3508ad7cfb45b32b3d6bac2c645c0f960b8f2ade65afff971";
+  sha512.run = "3db5230a958ab9fc7cbc644e13e9861823f9a55c5426a9b3fc2c483e86f62369f4cbba869c2a0874684fe2d8ce1a6b0e8feb53b1a4c1d7d9fe94893a51c8ea03";
+  sha512.doc = "1d9c515aa099baa507fb776492c59d94397e49ff8ed95de49ca8ef6b91ddf3a7a1e9df0484b2b9100d71788951f9016b9c5318778207d1c973c91867dc2107ae";
+  sha512.source = "9a0f8133b8e7b04e4919ed4b32e0666ca6c31bf52449b5aef26ab36d9d20518981df40a4a59a8d38f1bfd364b19a4b9d6238f0b3f68f7e7c932d4bd68dda2d06";
   hasRunfiles = true;
-  version = "1.4";
+  version = "1.9";
 };
 "scratch" = {
   stripPrefix = 0;
@@ -24579,6 +25551,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.2d";
 };
+"sdaps" = {
+  stripPrefix = 0;
+  sha512.run = "a7ebb52da3c218f45ad01a954bed7262a47834006434136d533b1b81c0ed7485ce5793ad303c40cb0e01cbd75273ca6db9c2e74c1d5d01eeb3cc92bc7d50d380";
+  sha512.doc = "91fa4bc4e57e4695e93ba512cc41e0fc6ff8c15925ada551914977559e329055ad43c2220d4790e4563c1176dd5dade9f3f648ef3f4f5897694b83402e5d0e36";
+  sha512.source = "3fa5282f76531bc118a3b1b49596215f7f73d7864fca48b88da68c27c5472ff2b687a37723a646bdf95035a319328876207af94e15ca4fe13df6ff1c92d06c79";
+  hasRunfiles = true;
+  version = "1.9.8";
+};
 "sdrt" = {
   stripPrefix = 0;
   sha512.run = "6faa9948e5bb4369fefad7d2b1a5f2bf39baf8b98e8ad3b8f61ade2001b431894ddfbd61e2f1ec73ed767b102f79f8357d965a5c3805c082d8d88bda29e10c6b";
@@ -24601,6 +25581,13 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.0";
 };
+"secnum" = {
+  stripPrefix = 0;
+  sha512.run = "8e54eb92f9f9c2a07f50e11fc3c68bc39fe4da3eabee3658f24b76c85e8effa8c4cf72a26dc30a8fff9a002a5f66fa1cf349f2ff5ef1dc51eec7c1ae3c0ffe15";
+  sha512.doc = "e9c44b617d479f9850ad0e408c1c2edc36025f2e1f1e812ecc8370586b22c9aa05f74381e0fa6b1ab39f239bb18e53cc4665482f2b1f3f3057fbeac0f01945d2";
+  sha512.source = "eb4e6c55332e822b4e0b36fcafbe9fcc8a52e3cc5bad9abf538aa87ce6e0318123c0030f5b6e041701b07abc5cd6ba95a7629eff07c27f220e2188c8f6e4b7e4";
+  hasRunfiles = true;
+};
 "section" = {
   stripPrefix = 0;
   sha512.run = "8b3eaecd49f8b7046bc35df079541121d76757bc2a1b6a6ffa24357a20e9ec4bf5a7b65fae1673401ebf363e46ecffe3c64a2de9aac104594b2b111cd10426f2";
@@ -24638,8 +25625,8 @@ tl: { # no indentation
   version = "1.2";
 };
 "seetexk" = {
-  sha512.run = "b3dea76f239ec78da4eb15d4bea4dd1171c3193e9d9e82a1ecc5d5ed747e421a7a3dc96e422839772d2f825e862b8a71befbacb7cd816405d707f654c7e5a32c";
-  sha512.doc = "39504cee7a077e16d10b2d4d1f393b1b90e7c21c7452f761dde1117f4b8668962b1baeac4b834b71b481fd170059e4e60f2d529e523e40503d26704ff15a7dcf";
+  sha512.run = "8da27529da3e020f1853b02ce17f9481cfd3c32eeec9fb123d544a9d63a978831869036a1251e6b73bd007e0a5f947c1a7f5e2ae8004866631f1895a51cd14e9";
+  sha512.doc = "e450694c39ac2f161cb60b6e8e0d95db29fb6271633dbf3cbd48beb6ebd01946d504cc3282a207738994d42eeefcbad5620aa74edf057a965e4952bbfe914259";
 };
 "selectp" = {
   stripPrefix = 0;
@@ -24648,6 +25635,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.0";
 };
+"selinput" = {
+  stripPrefix = 0;
+  sha512.run = "41888a394e4c9adc60242e4c689b272a7b4e2a2db2e4824e0068a305cdae59c1edd46b0a9e45909cf29381f240693234330fb3488be68831136f8f04a72faca6";
+  sha512.doc = "918b0b2bbb8230a482418c56de8081bb455980e178843b0ea84b18435c1fbfcd50a71cd0491b89c5797a374479060175219333bbde2ab28b5147cb5c3fd65ff3";
+  sha512.source = "c6b2c23826216a5c479c3cb3de1685dd4d695422ec67fa7109e7a1adb46dd7ad8cd21138a480e8e13bce1c4184fea0153114f338a5754778b22dc173d6f9445d";
+  hasRunfiles = true;
+  version = "1.6";
+};
 "selnolig" = {
   stripPrefix = 0;
   sha512.run = "8b01d1b6f4e6f83efbfc603be7c510d3c8435559b1272f3e8beae7d0de04ac889e04d539c689abfbfb8af5ff2d04c38459320fec333a122c3b60a1a79a0b115a";
@@ -24665,8 +25660,8 @@ tl: { # no indentation
 };
 "semantic-markup" = {
   stripPrefix = 0;
-  sha512.run = "e0e519f87b17fc26a3a30662e9ad5ee6637c2bc054c9d718925cb5b68e6855c1510ef75e8df28d09b676ab40e348b15b85057c6f64d5f5a7f526f84791e5c67e";
-  sha512.doc = "28c2448170a73203261c1762eab7b2aa176c7c798b2320592f6fb4863be2a3845c10df86479ae984d7279882e080addf0476cceb3507b8daa17c94606aeb93b2";
+  sha512.run = "f795c901ec0b133520cde8e269364977638d410d6d06207d868e6151e7f43a4d3c54a73780237e2dfb86b9077b0724fccbd7e9121d51a64034f4bd604a38008a";
+  sha512.doc = "f1498e628054e91f7b0ecc0fea7c926aa55d7bec56c3c13ebcc5073f96df84e8c1e255532f9ec72b8133d21511e4f5f2996d95c39c15cb74ae39fffa87d5a785";
   hasRunfiles = true;
 };
 "semaphor" = {
@@ -24740,8 +25735,8 @@ tl: { # no indentation
 };
 "serbian-lig" = {
   stripPrefix = 0;
-  sha512.run = "cc8961bd7d6b0fd9226b663a6913e2312ba61b9dec8479fe4fb573b4dbbd7a74b82415fe1c83baa30c33f1bfaf672f02342997d45cd52096ed840544704fd062";
-  sha512.doc = "696c8d37d417b797beec4c4cbb5d7997c20391e98a875c59a1c803263e2ad64d6fcd2e4541a50364fce0176a472b201b99ceba0539cfa156814ea6e8cfa660e1";
+  sha512.run = "d9b5d42c565d5704ab516302534238961ad42e971d3c3b4b4672d4cc19927ac22a871735d88c362b753640d457597911fa269ec30edb5c1c0af96820299c6720";
+  sha512.doc = "6ed0551c176ddd34e1a4eb4449fd78ca38c166efd41b31c78dc1e192a714fdc81b195cf83587f256462b610681136b69960867d5f1a571a5b1b47256fca88f05";
   hasRunfiles = true;
 };
 "sesamanuel" = {
@@ -24842,8 +25837,8 @@ tl: { # no indentation
 };
 "shadethm" = {
   stripPrefix = 0;
-  sha512.run = "e86b448ac347677f4439e3fdf8d7d3448dee3d29529e72fd1c11e9b98af71dba6101ab3b3a4a988b6daeef4c1f96ba092426b109220d70289f43f12bd010f735";
-  sha512.doc = "b99b7c5eae48fa6a1af0fe25e71d7dcf65433e7ae0b2f712fbe7ff3569a66c10fde956287df9dd0bdf0c2b21610b295517a2065d9cba81a3d305e843e81d415f";
+  sha512.run = "b9e15e017332eeadd3324afb858ab15a820e23da59f5bf7ea57dac719b9864304effd092c3cb2f25a6f29f22dd2b6f2585279edab4d77c62256582c66be550c3";
+  sha512.doc = "c24f37f7f864283f9ced1da1728dd7ae137395ecda3010aeff8ad778b96723224df77755f8f71f7672f5870ad6832a22bce47bec88ae51d0992e39c0a00c8caa";
   hasRunfiles = true;
 };
 "shadow" = {
@@ -25021,6 +26016,13 @@ tl: { # no indentation
   sha512.doc = "8dd82147b1096f728fd52a56c39309d0f421abdd972a1297b88b516e0a5ecf8387a3accc508047bcd3996ab81d778dbdd221934e2bb4c96e1ef2a59cd0fc6995";
   hasRunfiles = true;
 };
+"simplebnf" = {
+  stripPrefix = 0;
+  sha512.run = "452c83082541e5e1c41687f9a6191f5bc86241454c34f3dd775671019a3e5ddcc22f7c6b2203f7b07aa549a5a84b2047af89ecad9a4ce43075d89fb490653acd";
+  sha512.doc = "8e47242ee6423bdf2c2222a10f4197a615e59bd6514a14b1d3c657b9669dcf2be312c334f8b98459d9953ff36d3584b0b47c25c82e2c23979a738f9aa9ba82e9";
+  hasRunfiles = true;
+  version = "0.1.0";
+};
 "simplecd" = {
   stripPrefix = 0;
   sha512.run = "5fe4024ce7991242fd60b8a87c88605f68ef9595895857b56981b35dabe96c97f9af684fc5ca9c3089ba96791e076512ccd549ce70071d215eaed4e731145b30";
@@ -25094,11 +26096,13 @@ tl: { # no indentation
 };
 "siunitx" = {
   stripPrefix = 0;
-  sha512.run = "6f1fc4ad2face3958cc6bb1a829ff99e8a0dffcafc88142207ee699f2b182a7b55c52fae4eff108daaf8e3603e309eed280de95588132d1ccce726eccf0a0cad";
-  sha512.doc = "99c0e95e386a898647124dc38d20b36546d402c0d3c76983de401f336c73e9b02936ae2401225bfba2f17823a734e1f51d0684ee61a9b404743de95c8ed89723";
-  sha512.source = "4cab6d4c7958021f2ee6a0f3306b542678b4f80b408a7b5fce7fd25772fa5ad5ee5620288ffaef02f3e143c1130ada1aaa3206dc15161eeff186092f6b8e23aa";
+  deps."l3kernel" = tl."l3kernel";
+  deps."l3packages" = tl."l3packages";
+  sha512.run = "371fabf3b76239174c7f2f0cb6bf123b7fbb224261e07460d1620459578fd12a400f8e4babd43637afa9b917a39050c11973f4db8dd5ef17a6cdcd172eca245b";
+  sha512.doc = "e0b8c3dbafa6cebf1aa344c6d99bb17a532201c198bbb6e9f73319e6653bb8ede2243ba0bdaa57074d8c374b31d45659f3e803680eafde37797085a8edada8f9";
+  sha512.source = "ac85900c379cc0c2b052685c02d0a684e24016333b4ae8072ee390e213aaa3204b35faa74052cb8d6716064daddcb940afaf4905cf3145c02e2436fce7af88e1";
   hasRunfiles = true;
-  version = "2.7t";
+  version = "2.8b";
 };
 "skak" = {
   stripPrefix = 0;
@@ -25263,11 +26267,21 @@ tl: { # no indentation
 };
 "soulpos" = {
   stripPrefix = 0;
-  sha512.run = "2f0a15e324013f2be4a8728fe9ed629b20b26a66fe2cb0d2347e12013684a64f908f9f1161c8f4c64928ac23a9fccdcbe5b8dbe85b0a406c5c7f7979223301ab";
-  sha512.doc = "9baf5e905e0bfbe0ddc956e419093518a3dc4a602d3e51bd6f9f0085a7ed92fc1efb194ed645c189e4beaf5b9a7900aa74625fdcc2ea314b274dea648b32ecd1";
+  deps."oberdiek" = tl."oberdiek";
+  deps."soul" = tl."soul";
+  sha512.run = "1187494b2c65535c47f88f2387df8cf4f835222ad19718a4fc6ba7c4dd9a30d7d6aeb972f35b5c9350b873056b87a6a93ced5f69ded272c6aac82e467da6cd81";
+  sha512.doc = "10a6999a68ebe21d4e9621a11c63154dc720332cefe8f64728b51dbabfdcda2f638e456c517374bf892b21354f3fca8a746c1539e5745ac42a0228d900b19700";
   hasRunfiles = true;
   version = "1.1";
 };
+"soulutf8" = {
+  stripPrefix = 0;
+  sha512.run = "777ebf7b4215b9a6e31ec284d27345de2ffc7c5d303db0e21bd31376692e528688deac59c2b49b84bf2088ab42523523adc284dd1d8fd5aaf7a074923bf7be9e";
+  sha512.doc = "eb3c81518312b6c0cc5b622bbf2b7ae954e42b2a813097d8c3fa681daea0a24c9df14d189ca5d5f2adcbfe479029bb985c3d85278beb6d9694bd61aaefd32103";
+  sha512.source = "a6b804099f59c6d67b5abe4146577f608176569ca4cd92fd27d43878ee012165ac65acdbf462f8a84d4e6a8d6e61c5bf7f0f5d0dc667ff97656a5d7fbf159997";
+  hasRunfiles = true;
+  version = "1.2";
+};
 "soup" = {
   stripPrefix = 0;
   sha512.run = "478c8cba8623b184db1c9237b7a805219bf1ffb7ef45280fecf7cd75a1720ca0ea2e1e1ad73465ee20dbc2bbaf14667d4707524edbc073dd4fbd0537dbeca8c2";
@@ -25486,17 +26500,19 @@ tl: { # no indentation
 };
 "stackengine" = {
   stripPrefix = 0;
-  sha512.run = "a030fa3c9bf8153c4ab387b7906788640f4b8d36f3f1a67392db5e2d5f62cd9e421231a92611555df2011b03318b06023194a7bcaea6ad1108de945bdff787cb";
-  sha512.doc = "e395c609c2160160c0892c5af1d197943ac6cce21c59ab489239b41877bd97fc70b75f1313118f3202b5d53ffe5f2537f5f084490dc70eb1e2f56dcb8bd208f0";
+  deps."listofitems" = tl."listofitems";
+  sha512.run = "13ce66f2a3335c62db5bb2872596480572e106e1cd594d8b787684f1fd3ea4b57ee015737e7e5dd053b526bf52b6ad20a84f4d4db49d9b888f55ad5b637894c4";
+  sha512.doc = "8a32a4a5e75023ab1750a6e85cb23b919f44ee838d24c0883fd4b8945d57a9e3a91b456503642544676eb4100de68a0ba4547d8e2c45a0ae90b3ab7b36acaf6d";
   hasRunfiles = true;
   version = "4.01";
 };
 "stage" = {
   stripPrefix = 0;
-  sha512.run = "60ca903a632f328bff8595d3dd076495409ae27045dbcab56493d05496c885de101cb3d6c77745291c661847bac2da5e41dc22f6e08f52c36957c997f1a90fc0";
-  sha512.doc = "96c32c5f5c272a521fa0efd94571fcdced21fcf582e7d94f503a46559a2f32a341e98f7c6b6f681c0b9918a63cf7a6bf6f90f628f87add2f7b60404e3d451d3d";
+  sha512.run = "3e59c8794ba63b4ed5ff0a0e99fadfba4371a93ec2076a818dc0c84b00b5f555ddd09caa89128ef52f59bf888609a045c522adb24417040a321407e4d7d2b679";
+  sha512.doc = "f047288e15f2ded21da1a6e1288951f3ff480c60b31dd3e43aff030e8a3fb111d87ce13b5f98a07e03123ac4f0a81e3661dfb433b389f088e8318134a5677712";
+  sha512.source = "f69a495f6e49bdccef6d69e5740bb548d1f5f10cedc86865a16e4110dc78ce32176e96432fedb8247500357099e6ce3e88e6de71ab1510e470b4c32ca40d7f18";
   hasRunfiles = true;
-  version = "1.00";
+  version = "1.01";
 };
 "standalone" = {
   stripPrefix = 0;
@@ -25615,10 +26631,10 @@ tl: { # no indentation
 };
 "step" = {
   stripPrefix = 0;
-  sha512.run = "3135dee51564248f0ea3d5c67c46d23151a187ce923fe5c83de2ee6072b62fa4314cf70ecdafe9b4ddb9a44787aca1e9bf2dc79bf38ca6c837ea5593672aa364";
-  sha512.doc = "9e693e25525deb2506ae9143beee56c0a8cce7d5852620b6f1daf5851662c36af52d4d3c38f9c004bc5944621f3113f179f80ff1aa83e9647fb4b079acdffe13";
+  sha512.run = "dab392c9d8182e0d06605b82f123223d6bc811291f0b6ee2c35b75a21f868a5e249a330a2c0876dd1e4fa6395e11000d0f6db687aa85e1eaf1058e933fa72160";
+  sha512.doc = "2f862061aa868cb2a74766270b42685f5625adfe42c46c6fb83d7d0efe5bccca2843275e9b68d11610174de193f0f754d976d64c11ee27fab0d128e63b0aa964";
   hasRunfiles = true;
-  version = "2.0.1";
+  version = "2.0.3";
 };
 "stex" = {
   stripPrefix = 0;
@@ -25679,6 +26695,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.0.2";
 };
+"stringenc" = {
+  stripPrefix = 0;
+  sha512.run = "a776ddb2378bea0880d7c17e1a87db5f66645c5856243e49de1c56bc427213098afbca34773a44ad955a0014b969c59454d3a0c0ec371d213481668f5f784ca4";
+  sha512.doc = "a4f182559d37e45ca8b6c50656d2d520e3f0bf1ab63dc6477cd6e3abe6cbb5c4b89d779c380997b167019aae6fb12ae68d5fe37ea0c08945e3383f5d9905bf31";
+  sha512.source = "3febbaa990eb691af640df745f36e289a7f2bfe6f52259d6693c6c9991d719e79edbd14b35c1eba5a9033b203531fceb4164303bd6a3dbab7238b814bdb5eda6";
+  hasRunfiles = true;
+  version = "1.12";
+};
 "stringstrings" = {
   stripPrefix = 0;
   sha512.run = "8ed9dc3bbc869f06126280a4dfab23da73b57a9c5c1058dd9764e2bece26840ad37637d4e83aa84e6d9a17d92095803788697b8d325bca7fd57c7135ade7cbf1";
@@ -25791,11 +26815,11 @@ tl: { # no indentation
 };
 "subfiles" = {
   stripPrefix = 0;
-  sha512.run = "9a71fe71fe0acd6f9df8b94b29b59416953e353857989d45ad974e6cc5f013319252f1f02f4feaf4bc788013ae3acc5082361da0eead42da1e51b344c6388727";
-  sha512.doc = "4c7470b61c49bf20292806f41ba21b824091a9c46bc3befb46dce259e706ba3523d1d41dfd45dc1a4406fc993a974c1e3f13eb6f7bd849dc24c21668acda20ea";
-  sha512.source = "ef5bd2853db5150d6c7890fa96f7eb59d35577457cd9c8214aef6e0afade618d8af17b9b8a9640a8d556835aa8e7cbfa6d20e735c440d90ee03266dd2c42186e";
+  sha512.run = "558a8e29ac5fcb4fba04a75fd02826824690bba8f8b6118ae15f856c0e5cb34a63a507bdaf90a7d2786fe3da34637f76d62d24d061df76dcb95bc324224002a4";
+  sha512.doc = "eef1fd8e0b739ed9cc8bf45952c53111b45b6659eb2a0afcf64ae76363fcdfe61320db0831f31b2cdc9a242fd766855be3d83224172e9baf84d15ff938d4b23c";
+  sha512.source = "9ff743bc9c3cf19fd6c12fbab9377230dec554efb2663a83f245b34c9b6db1f74d5d8b91d60a48efe164cd2844de2ae1724d0e6eee9d4692386078c9bbc44816";
   hasRunfiles = true;
-  version = "1.2";
+  version = "1.6";
 };
 "subfloat" = {
   stripPrefix = 0;
@@ -25858,11 +26882,11 @@ tl: { # no indentation
 };
 "suftesi" = {
   stripPrefix = 0;
-  sha512.run = "b5c845b35d39c689f0dc63cda289a2b3cb28199c843d46bed2bb0549477a5756b31afd99dcb7de9a0a3d86e93264f8ab3755ccc27c63937ebebd4283b22491e1";
-  sha512.doc = "995905861f47c1069085cdd7e52fbd85045d1b8a1800522e78fa2300a2923029a9ff11aaac7b557ec30217f5d99c9d873dd49cbb694355cbf601911cd775b343";
-  sha512.source = "e743364722e6f87aa375f19b5234708adfe83a4788cffa35ef94da0a3bd5933f78899d815fb75496136b28e61f337f6eb5c7be562898d7129ac5fe5fea140f6a";
+  sha512.run = "6b6249485e0c7076ad6141af22ec6aba22c0df86c38c03565bf61a486cd8d7c24c1909034e365699e3428307762f65aa6be64e222f167e8ce744e8b84d2a0e71";
+  sha512.doc = "316340999ebe6534adcb38c53f3183c64fce9819ed57ca51587c8ca2dda25afbb6d2c68529134524974ebaf9ee27b03267e8021d4d6e4cfa51a7697b942f4a7e";
+  sha512.source = "cdffa74eed1f65452acf39233decd0941bc23718862545fd74b95ede4daa3c1e65f7f7e14dbe69253ccf09f198ff2e2d8434bc9842b61d5a11de56c497aaa0e1";
   hasRunfiles = true;
-  version = "2.9.1";
+  version = "2.9.8";
 };
 "sugconf" = {
   stripPrefix = 0;
@@ -25879,11 +26903,11 @@ tl: { # no indentation
 };
 "supertabular" = {
   stripPrefix = 0;
-  sha512.run = "2501d5ccc7c4209cb2df6bb1f68ded224fd65fedc03d53b6854b5cb7824e5652cff18c8251f768e0ac1878beaa6c430231344d81fdc5dd375878ab2b62158d93";
-  sha512.doc = "7934c89c7bec6acc26a96662fbbcd0ef86ec9583d86b9c5de41e9d5385b72f8fcfdd04615c667f7e60632836e35d1ec0954f9d083a09a9b41d1aa903bb20475f";
-  sha512.source = "aa38f07fb900f0649db23d42556ff8d73ee3d84f995af367dec74fe275da32a167cf23bdb7a9e20eda9bd7b8e59c2c21d468ad47c4215b9b64894aaf0b0a896e";
+  sha512.run = "68ff94c82b9986983b0a8b0c1e60301067aa20c92c2576e6d0a9b9060d4db48e2770334ae941b6b7fd1a4914098e2125f324e0d5284da52b523a7616552604be";
+  sha512.doc = "0a36abcb782ea20b3c45d5c42a55fb41c04c3707c9c5b0166f90b7494032376d6756f827f1293cf998b56a84192aed36b6224e4abe14646557d130427f3bb63d";
+  sha512.source = "1c84cbac59404c9f2e1adca379d24168ee4a7f1639110c3c8c5031a17025efb06608a9e8e703395727d1cc4ddb8de87932af14da71475e16d850b78fd5de0b52";
   hasRunfiles = true;
-  version = "4.1e";
+  version = "4.1g";
 };
 "susy" = {
   stripPrefix = 0;
@@ -25893,11 +26917,11 @@ tl: { # no indentation
 };
 "svg" = {
   stripPrefix = 0;
-  sha512.run = "10edc900be609c7fd4f21b0d4aa70e06edc6bab8ac417635ffa6d8d6b06b64e9802f8f510ad3f288d4351983f4756f013e007d309843a271f88f8f4cbde8e05b";
-  sha512.doc = "53c9d4efe37b1281a143e0f65cad3a559f9e5ad0e92a92d91da3301501a09f4e24f6a3efe6ffb919718cccf5419c66896e5bb50f8e64abf90ac0c5ced0b16df6";
-  sha512.source = "9ebbc53e9edf019322f37e7b95f87bbdd37785c33785840dc66a706c38180a9646048a62e4a5aad9f7aaca9ea175256ee5a304062aefcf4d566a46599b61767f";
+  sha512.run = "9996c9d7bb018bf4526f91aef707192f748a04e3dda7cb61b27c9d69e44cb1492f08fb658d599ab2800224c9dc475305c747d433b14284144b73dbecf4f4a2cc";
+  sha512.doc = "31b6ce351b84f164683ea4bd33cc8dac41898022a966cf986f5d16ca31932422caa36f67785346ed33fbd7e1ec55b1480b898b8f928d153d4f1fe97da0b1359c";
+  sha512.source = "0ccdf4390ccdedde68eb4eed9ad297812c355c980ebcce87e1e1264749cd71254632231cc3e58221f51aca80fca88628d7a112a57eea6cda9bf41ee986af6a69";
   hasRunfiles = true;
-  version = "2.02c";
+  version = "2.02e";
 };
 "svg-inkscape" = {
   stripPrefix = 0;
@@ -25983,8 +27007,8 @@ tl: { # no indentation
   version = "0.3";
 };
 "synctex" = {
-  sha512.run = "9fb5f8c3729115a91a51efb3645f39809b07ef9eb842d2ded1d64cdfe558c0bfec6234827dd87b38c40bb167225a88c6ff09e3d7bd49b50db7561981105bd6a2";
-  sha512.doc = "3a61c57a78772d6f8441db824f489c7dbd5b547760b43dce500ba9ec07780a839d0c6db7f90921846985ce4400bccbec2435e6d4d8bc2952fe1dcbeb9a23c91f";
+  sha512.run = "43905f27307922763a00f259c538ea6c63aef31d7e1a9a451b929cd76b8402182360ab47a9090506cc3868c6ab56f040e16c5c45ccaaf9431eda31e5ae238ee0";
+  sha512.doc = "0e8992318ae2bd7a0b69c0735c565abbd9d21ce6aac6f2e9b44447c41482c4b9a8162220d5cbc073bf5c7c8453a42e85b64b9c1f4be4e247d88773e292370887";
 };
 "synproof" = {
   stripPrefix = 0;
@@ -26029,8 +27053,8 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "t1utils" = {
-  sha512.run = "93248c576de8f3a4bce051cc18af8327e5d0f1fc2a5a91bce99663a2fb0ffd718e5a472c5bfbae7c2cb9435ed795ae3abe8b44ffcd0c6de29be02ab9d1b6721c";
-  sha512.doc = "839bb491b146fbb5bf9b0dc638a9a853dd025fd211754579ec5fef18175df835ed412aa957b4483064ef25ad4f6afa7c928e8f902f677a3afc7f26480b70d4ed";
+  sha512.run = "834a966269f1871227b9918a513e154d4bfdc4d1a80deaba5f5bf22136bc8af10a7224f5b6f753f074208881de970076c1214199ee5210c5014366d4f6549796";
+  sha512.doc = "096f8fc612ef1793c4807fdc134b3d75650f98a79b49ddbdf11c346b175ec76a900b68189f7e6ba02dd1579396503faed58398da8dfb42d70a7d69dbe24f5f5a";
 };
 "t2" = {
   stripPrefix = 0;
@@ -26250,10 +27274,10 @@ tl: { # no indentation
 };
 "tasks" = {
   stripPrefix = 0;
-  sha512.run = "ac28ccf9510ccbe47160a0f06763c9d565d139e3105191a94571213daabdfa618a150bff70499f03b3eea87f213a071c77ea9c9842b6169ae1f06e2c5c308d7b";
-  sha512.doc = "92d0c6bab4d69902a25956e9ede9e75be10bbcd3318346b9708e63dbd18ed127393fdd47f90b801029169041b3d4dbd1ee08619587e78035750aaf9e59f8740d";
+  sha512.run = "79e6a16d9df2fcf647eb3cee57759044ec6e6f85fda5662d56db6f55911bc3350f0bd6df337327b29185d2d529892544f28d7a1b1f9be09e704857006dfb7cf9";
+  sha512.doc = "16846eb9eca1542d731617cc7a5b7ca7afbeec817fa941074b58caaa166faf8e593e33fe4d89e88741b02e48dd5b8a6be5cdcfd17d3d45cca2269037401c8a47";
   hasRunfiles = true;
-  version = "1.0c";
+  version = "1.1a";
 };
 "tcldoc" = {
   stripPrefix = 0;
@@ -26265,10 +27289,10 @@ tl: { # no indentation
 };
 "tcolorbox" = {
   stripPrefix = 0;
-  sha512.run = "b9b4faf76047b32b6b6ee14907e76f168289f9080b02a189a4ca879be830e2c2700052b4d9c18506e2c57a995c7996e8f6cdb75fd1df8765f7b99a33880f4078";
-  sha512.doc = "0dcaa95629203401d3b3fd8365c6c5ee3bb24a9d1e79c94cef0d00c3b3e05b0cbeb7e4db3498614e4705057ce4bf2c66e8ce75f9680e4f81d0cc349a39671379";
+  sha512.run = "59935197103e279b68a54dbe1b33936035b3073f1ce70ed70af8e405096d36df5d00a4b0bd583428211df3497b779e4b473359004c0d6aefbcdb4a398517a38b";
+  sha512.doc = "c7cb5fb7763872451934d7f767d90620e43dfef89de989fd3e233b8db8d169acd4a947f493cf724759cc6ad57b179eb902f923ff91c1172c0dd4567b348c7f76";
   hasRunfiles = true;
-  version = "4.21";
+  version = "4.22";
 };
 "tdclock" = {
   stripPrefix = 0;
@@ -26407,12 +27431,6 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.2";
 };
-"tetex" = {
-  sha512.run = "9459cfb644aca74ed5666350a94c1412a485c4099b524fa4708c18951abd0d6d4bd24a8a57b8a05010a7f0ff80565a5c17ba10bd94f722a694ca199827cf6fc9";
-  sha512.doc = "9e8b9386b27ded2c7c99cb036f5841df79aaaba44f9fb7a2c4623b7f733fef1278a4c347b7a2e01735c1eea66f21db0b60496eba1a9c1598d36e454d013be045";
-  hasRunfiles = true;
-  version = "3.0";
-};
 "tetragonos" = {
   stripPrefix = 0;
   sha512.run = "dbb37eec17d41633d951b3202289289bffd9bf9a8f509cfbb7f98baab9b7e684e7d7fbfb5f50ce41251d09d9f0ea81fd9e68fa91984e788e5e43f8e398463fff";
@@ -26434,8 +27452,8 @@ tl: { # no indentation
   deps."cm" = tl."cm";
   deps."hyphen-base" = tl."hyphen-base";
   deps."knuth-lib" = tl."knuth-lib";
-  sha512.run = "26b0f40fa859af1c76df5adae0d249255cf39c867051eabd703d1d4f56e37fa5c7a7506769b99470c1dd29f716926bbbffa6d9ce888b95f7c17b0765f1716d42";
-  sha512.doc = "a911ebce516a15f736e210d67c42f5237243c5509d74d8725ab0aa36bcc1c4898a25ce3519a756e3b8b654c68e10887698da3c5bc466d36b27ce2bffae876eb0";
+  sha512.run = "ef2e000027efc98b37426f3f9b235ed0bf66693a6dff34cd9260067da096284ccb10f2222a016a3d7b322b93f495fa6515f5c7c0b2b10d6a92a28a54239e432d";
+  sha512.doc = "00de1ab96fa89af7399d69734225cfd6aeb2654a857579eb1f51b1cf9b38c21335d6e954eda4da5330f307c2cde7bcd009581dbf1888ca36e6f1eb64308f7a73";
   version = "3.14159265";
 };
 "tex-ewd" = {
@@ -26510,14 +27528,14 @@ tl: { # no indentation
   sha512.doc = "aa73261fb0ffdbb7cdbf85df354490a72bd95e4d98e4a497e98666e6f5533a7f05a7132533db044ba993d86e03fc21825bc6fa7f262e5a0bcdb6de8114d38eee";
 };
 "tex4ebook" = {
-  sha512.run = "946317be3532db3e60b1fcf2c027f616c00526da55562ab3b682c01306277059edaf14138902d1e21eab53cfb9bf293c636598cffddb9f1980b287b2fba081d9";
-  sha512.doc = "586d3ce7642a0f06e358e0cb3d3dc577396a638d7e7c9f333a118716bf4dee8c18991d1736ac7169ba32c22b9aa10b887a8ae77ae5a4f40c800f2f1aca958abd";
+  sha512.run = "76600392b612abe233a98195c866bf291e4bc372f0cace58fed0855246b3bc8ee8687c1e8baac3026030e7eb60dd1f4a4ed3698521b37126127b33d1bd080661";
+  sha512.doc = "b00548efbb3b263f9cdaa7348186ae7e96ef3a224904ccd04d4622b85a94cd5a591532265281ed76c6135273a9abddb8af4ff3f6e1fea484d534dacec1903b70";
   hasRunfiles = true;
-  version = "0.2c";
+  version = "0.3a";
 };
 "tex4ht" = {
-  sha512.run = "a5a8834a3effa629a93ae35a06d28201f472f32a3ac79c7c3e6df6f475a57a854a8186fe201ac8d0476b854f864276578d5709216db3dde8bedddd1a12a85e2f";
-  sha512.doc = "e6364e7f86cbed62bf887396c42ae9e25ddd027f928782a02b4dd3881123aa1869e16a7526662e4adb1fdd0aeca7de9990ab229b56ee38415c10cd6b2a696680";
+  sha512.run = "c385b90fcff5ba43884918bf616aa4beffc285def1a380b84909bf4dd44cffb479612268a37977adf87f8dc226394d3239503b5d6f2a083a9f078862f282f0c4";
+  sha512.doc = "86b1ea30f9007e9d33f76a0e2970c40a6af0c40ec6c585bbe8ad98e057b41de3fdf3a7b1de0570ff2a718326a7e59a26d7d19f2c7ce0210599b57d95004188b0";
   hasRunfiles = true;
 };
 "texapi" = {
@@ -26567,15 +27585,15 @@ tl: { # no indentation
 };
 "texdoc" = {
   deps."kpathsea" = tl."kpathsea";
-  sha512.run = "2c12bf48d03d456e95d6bc31ad6d46f77c0dfebde73fd8a87e2128c7267327377b8d8d7d9b04ecf7295eaad16eccf1df5bab6f9050df7113c62bfbbffc0d00be";
-  sha512.doc = "133abc048e8cbfa84bd2788fe0942bc48d4d2844bec525c010a3590afa62b22ca77518ebbfd26e78c825152ec0eea0a8e1513d15931332656b8fec702b0b7479";
+  sha512.run = "ff55c658b4baf265bf9ca2ba6e5a161eecc1c75bd112e6400c9df4708ae3f355dcff277cb60ff0178bd41940d090e3dd28a7ce06421f509b352489d7a8d98b2c";
+  sha512.doc = "54931eb9882415f2182fed56b4905c723bb0df1444b1e2af939e2b6093ed9acceba6af7d46d6aceeac853686a57e366c13ab76da05f18469da61c36588ce66c1";
   hasRunfiles = true;
-  version = "3.1";
+  version = "3.2.1";
 };
 "texdoctk" = {
   deps."kpathsea" = tl."kpathsea";
-  sha512.run = "d6799beb8f8615c82dc8f66971bcfcb62e763672d707a284d2293164861cd861b47a691fadbda9dca736ce820e4c90adcf1358b04f4db38121459415101efbce";
-  sha512.doc = "f8f08bbc68488fd75a2291ea1556a8c1166357ba225ac0b0205f2b9e8ee1b23957f41c1a577540028b74f12647578c6fcc2219a07afb6d3a1f63affbfe383c19";
+  sha512.run = "5b2cfd56eddf1cbaa2471f631bf3b3e7dadf440fa4103e6ba490f738893ac7df4aeef5795bf269df16c9a02f873cb326bda5b98d2853c73a62b0e56a677b6e04";
+  sha512.doc = "1ee6930d450e7227bea84450a3f97933fe2f7dadd92e77970e7ce73f12fa1e9466c3b3ae987e441c447ec6d3069c7e0a4ea5b7d77d2690c71d1b8f6970b90aab";
   hasRunfiles = true;
   version = "0.6.0";
 };
@@ -26606,7 +27624,7 @@ tl: { # no indentation
 };
 "texinfo" = {
   stripPrefix = 0;
-  sha512.run = "24addde29f46c3af209543f168cc3c6ae6ca90a504738eda37bcd22d2d10041daaa8373d600f70afa39d0746596d2554ed132521e0cf32004a1b800832f03b3d";
+  sha512.run = "f898722cc80f1143e1df4df0d4a73008d80b2dcfb567f6ad02edd172373fea4a435c95716242103a6f3e0273b4899b004c988292ccd9f019a270f42f4467440d";
   hasRunfiles = true;
   version = "5.1";
 };
@@ -26626,14 +27644,13 @@ tl: { # no indentation
   sha512.doc = "c13300d4bfa0a9d97c5b01b82634c854dbf9c4239d9ad320470c8d16eff439b1996ff0d51a72baa5c3080ea027105521bd165198c8fe58f06fe785d130603916";
 };
 "texlive-docindex" = {
-  sha512.run = "91e32845cbe87135d4fe6faa66f6cf58c4867131aa6bc73812f9093af4d31997dbc29fa81a1a2bf21d0a90bd1657ea33c5de9c755452ecc83544f34149f0ba5d";
-  sha512.doc = "f5f9c49dee61ebbb87e14caec5a7be65d821912d7179021d10c24afddc5ae61d13c5efcb6dc9c1491443ad4e6fbe173ac037283eb0f77497d2cf24541e2a72d4";
-  hasRunfiles = true;
+  sha512.run = "39f3359e2a2149cf6d34066a6f727b0bdb56675635d1ec44fcdb910afc0cf8ccafb62b42f3d85bdb51319de97aaba5f0ba6c770c83ef81e634f309ee1fefddec";
+  sha512.doc = "e01e11202d021f7f3a12701495fe2e697a97da27adb06654dd5afc72cb217d8e86ee3e3b269c28efd6e2b7464a392903cc1794680299902c09aff5f418ff30f6";
 };
 "texlive-en" = {
   stripPrefix = 0;
-  sha512.run = "bf6130a940b5f328a0316322c2df85b60b7214ecbbd3b936f8ccff816cf2ace8853222c55efdb48ccdf48a55dbc64558a1a91ef88b83ff5f8425515125c486eb";
-  sha512.doc = "92ac46d9286520f1b6e5d927f976659771bd42cbefab7284fbb8c3b2ac5622c9af7e7c151163b30d95b16eee63027cbe36e758a1cd454055c63f5992357e6bcd";
+  sha512.run = "d9fbb8bce4b7a4e3f661a18608addbfa88ccc0ee73d6186fdc56baaedd21c0163f053961b19f3211761a0390d44e2f524c07c4c25e81a33cef0fde045f5a0c64";
+  sha512.doc = "c25b29907122f731a5980e3ca15ddf31c4e4866354f833a915734868132a8e46c9485a67750adacabdf86b724d8508c0cd6009835af89846b929f03d023c76f5";
 };
 "texlive-es" = {
   stripPrefix = 0;
@@ -26656,7 +27673,7 @@ tl: { # no indentation
   sha512.doc = "fd26ed74bb6a85f9aaa1907d89b3c2e6624325e36652a3e3c7a540181efa36f2b44322aac55190085c47d48176b0d04e6c58ef9fb633057954eaa6fd408998f9";
 };
 "texlive-msg-translations" = {
-  sha512.run = "aaa3c148d05c6172163ccf2a6b6ef114cb31196bfd00ca7370cdf75fd71620aee5b0efc9fe2ffb625fa2f8fadd624cdfc3f38c4f97db1c07a41a1a4eab50ae0e";
+  sha512.run = "f866a0afecb5c3a0767fdb50ab62d3bc196895b6dd6f9840612e28f0b6090c41ba00ae87b4e6a854bb3f6e66e6888856742c7737c07b5723aee2241022538a22";
   hasRunfiles = true;
 };
 "texlive-pl" = {
@@ -26670,14 +27687,19 @@ tl: { # no indentation
   sha512.doc = "b5d982cfe9cbb9022b0d35cf583a90148c0add4f898dc86f732f305cd9adf704902851366722d2624f0ceac66d00aab177663160d5ef624331f83d6a717c3505";
 };
 "texlive-scripts" = {
-  sha512.run = "a73dbbd393f2824c5d892249da25437fbec34cd099c3fcae02aea9c0486a5e1fe4ad110467a9424adf77ac34713464a44d668e169e055db999202916970f904a";
-  sha512.doc = "94c227164679b44fac0e50490ca344cfb2301f0092c7ed928cbd2578650cdfcea4910f4c45a3812c7ad75565ef8f3e0330eb94d3e8fd90e6f818c5862976c8a0";
+  sha512.run = "7e10b1796d11a58ccbedbf5f89bed570207306f2ee196680ed7c5f784aa8c1607e7ea26086812212e5fee8885fa48ae6e1856c3a147333f60224f2da53469014";
+  sha512.doc = "bf95f1b8895f9c7bd53c09072bd8ff77af7d357d52fb4d9bf7e9a1390c647cafa57c3c0c6694e8fa8a7e03d9ad301df7f52a07be4d79a00592b020919b76be12";
+  hasRunfiles = true;
+};
+"texlive-scripts-extra" = {
+  sha512.run = "a2f8e7888873d4f129cd83060ed0a9e65824c76870b238ebaa9b630aa00a51fdd479e182fdd4f9bfbeaf1113db5bb06d08baa2133544acaa368fbb690cec900a";
+  sha512.doc = "15a2e6a5be58cd74f8b8d906153b6d34f54e7a2eb1e3914016ca515bd43a67c021955660ef1c31b013dcc5ba91fd0015bebbaeaaee6916cdb75b6f55bc9152ac";
   hasRunfiles = true;
 };
 "texlive-sr" = {
   stripPrefix = 0;
-  sha512.run = "65cbac03143ec8b2881ba02b2827867848ba7b034745e2c3e5e793cb5a950c897d2903c1865cd42fbbfa65cea79cfa4b819be781027691be1467375598a6388d";
-  sha512.doc = "fdff59485fde0a134c78c506969b8c29bf82d30b3d2fa9b8137ee7efed7786e8aec9c79f5a1e000ce04ebd5bbe805885f8952234427a411021b9ef3988b11234";
+  sha512.run = "95d30458e64f61c89b015eea0dd8fec741ff3cdd4360bdbb65f0c8c8346b11a0c61d2b98fcc63ea62d621389411d257da4da0126a40dd9880ad557407fecdc25";
+  sha512.doc = "6965ea95aaedf7ed6c5cf55aa0524bb2ddaccb218c630c600e7942ac3f5a3609e1744e4a0e31e7e875550f436d5cde57f5953dacedda861f88543c915866bfea";
 };
 "texlive-zh-cn" = {
   stripPrefix = 0;
@@ -26724,11 +27746,18 @@ tl: { # no indentation
   version = "2";
 };
 "texosquery" = {
-  sha512.run = "bfe5cbc793a81a9ce3c98ddc94fd217c3b235614394d2f329db4f98ae29ded1757bba5d98997118a2c78cfdf6d774146a7ac6a716b2bce91c876b0387e1aeba2";
-  sha512.doc = "2b7cf8dad61829b96a2f17f1063baabd21087ea2526c8d8a6408b4c2e63c8f44be3f318be6d1e198661efe683afbff7055c678e7229a13d3b01e200565caea9d";
-  sha512.source = "c834540e5448887bb0d80dac77770c7f89b8017743bbe4691e46aa5c95c3f59f2bdfde93e0dd72aa8dd94295b1dbcfdd374a8892d4c622c41df7c4a37a68a701";
+  sha512.run = "d454a95139920c24404a501ad3bbde4ae8e809e0f0b6b7c32053d375e0cac31d81087a53d65ab067c9c6dfd988ae90429adbc5d7cd2e1b23f41f46dbf6a25056";
+  sha512.doc = "51bc4e5a9f62b4526198b380fa69dd2d79ff69ccf0915aef4269d890fed057c4130ccca65e0c279e58ebfb72347d627b186534138f9c4bc8d395677c73a2a0fc";
+  sha512.source = "5ed0dddadb7e8f406635d7a2cc309a030826607a76b4520b1f47a07affb603d96577118ba1fb5b9797322aa49a68616acbbcdde39bc8538c54c5d2fa1aebe510";
   hasRunfiles = true;
-  version = "1.6";
+  version = "1.7";
+};
+"texplate" = {
+  sha512.run = "8c9ff524bbc1c4a9a89d4da0329c560cb4a2916e87fb5dad8ffb8a288bce1c0e0eb4321834a34e4aafd68c3b8a8fc0ba44018b80fcc054e965869cad120bde4a";
+  sha512.doc = "0bce839225eb4d2bf8b763510ee89ca3133fef4a4d1ed7ca4a8257d00c64d1b188c3093a0d11c319450a219c220d44edc93ab66a4cca739477c42bd526c54ae8";
+  sha512.source = "599a199747dab1cf39f7e9c2141b38136085009b04578e65a5ce332ee3ecdfeac0999b721fca5f9d7335fc6fdee0a09bf1e078f140dcd4cd74f4a69fdebedf57";
+  hasRunfiles = true;
+  version = "1.0.2";
 };
 "texpower" = {
   stripPrefix = 0;
@@ -26849,8 +27878,8 @@ tl: { # no indentation
   sha512.doc = "a8ef6e6a062140ca6ab3311b7e57f452bbbb0eddebe36d02cd8122141320814508438d764a97d351febf9f65a5539b03774f611e9bfdcb5abdc5fa989fc5a848";
 };
 "texworks" = {
-  sha512.run = "06184922ee1dfb3fd6029d10d3bffa984aa7e1970d7439075678490f604d3d357e2b5b8d3cee4c941b5f43308006c53a816d015a61f0e9fa81a24d21593ff43b";
-  sha512.doc = "35bb50b86efa5f8842778f47b9f2c6863f6475f396e72d0cd34e6d6fcc4c2f103622904ebb27baa59f9ada014197e47bfb6537a391705c894ed669a7a92271f1";
+  sha512.run = "61a41a470a22bdcd70ed769385accc0135b7fe68b96b430ddcfdfc8e444ecd696c66167e2b44201809cc95b6369a925d32874dd40d878f62a6b7730852fae1e9";
+  sha512.doc = "d2ea2fa3447a4da66ad2617b20f853be8c1bc8aba163ef995ce0e516d9c249990113e0ba2f13ee6f1d51ba3a3e6b5c3745f68157399b9c1c6d4aae8b93134eb5";
 };
 "tfrupee" = {
   stripPrefix = 0;
@@ -26915,11 +27944,11 @@ tl: { # no indentation
 };
 "thesis-ekf" = {
   stripPrefix = 0;
-  sha512.run = "ee4e7a6e73e113334cd6ef392e2530803ace4873eb3c477df1b9de898dffcfbc73a20e466f9137ffb295b247df5ae2c5ab147ae274ef81224a2d1e6d4ec873f1";
-  sha512.doc = "36bbf561af8e75cc4c890b0856a1272be7f24fb24943706d94a3b4b4aceefd5b21f0857665ce800649e425c7e446f89952bb6b3d3b7a25b2dbc6810160d25dc6";
-  sha512.source = "9c1edc9bcf27f0e4186c7a57aac14cfc34b0f1f17c554b93ff6cb0f86e0eeb41af81d6fe105a32d33730ba881952e1fa9f72d2cfd8b8689d4a9a2e8f62edeb41";
+  sha512.run = "2cf781811d1a58885b4f9703d0541da7d629c4f1fdc6fc0c519f266d95fdfdfd7c5dbf5bbb92aed80269292cf7bfed016433a9e75d13836b27a63616bf745ddc";
+  sha512.doc = "9215773df9ce87c5c397f87d1bb53f44177c301b00a220651c24a7e65c2b4a0ac82b8441d877b51cfa71d264a385a566714bdb8671dc1475411057e80ad0544d";
+  sha512.source = "026e80e3fe4ba2511fb9f25f95dddd66a4dd241ec8237badcf8564e4704f9abedbe01c3563c6d696ca5dcbcf9ce27087cc8fe99c063b998df2c694aaa5c164c0";
   hasRunfiles = true;
-  version = "3.1";
+  version = "3.3";
 };
 "thesis-gwu" = {
   stripPrefix = 0;
@@ -26959,11 +27988,11 @@ tl: { # no indentation
 };
 "thmtools" = {
   stripPrefix = 0;
-  sha512.run = "dff9b009caf0735effdd5c8da157f74a3c83914eb3a858a7f530d9d882abf4673706a96a68870664c9da2c9ce34c017cb0a0b2d96a6f9aed070dcb18c7d814f1";
-  sha512.doc = "c5b370bfd673458321bc1d95f2a4a70a2c15cf2eb0b0d830aadaccc0efc77aa60c0d897b56f65bdf292ff0f3a1c136002b65d4ec7cbc54703058938f34e7af73";
-  sha512.source = "740afaad4b634e0296fd77ada2b583b544e02942839f16e9d12bc4757c384d52c56992dbc2afb6b8c133745727be1bfea94ba321459b1b105528a35fc93d744d";
+  sha512.run = "1530f49499593262aaa24714bb4f9801876f9903b4c8f664deae0ee65e9384d52a050c5352ebd2cf158342752191e15deec4b7f5d2cc880a39012720963cc723";
+  sha512.doc = "9331df3428012c486ddff27810248f83fb607a780509691d82b7f732269654d848441d2982cc8609f5804a3b73eeca5184cdecae90e3a337945357bbe660c685";
+  sha512.source = "9d08c2249ee3d9e6d243b22a52a1dbf8fe834ca322be31c7bdb12def50da3e851476070aa4ad7b9ce20246d86f3ac94146099553696ff4a7f2ccbc071d216074";
   hasRunfiles = true;
-  version = "67";
+  version = "68";
 };
 "threadcol" = {
   stripPrefix = 0;
@@ -27002,11 +28031,11 @@ tl: { # no indentation
 };
 "thucoursework" = {
   stripPrefix = 0;
-  sha512.run = "28786a2d16bef84f87bd87b57977a9d9cbf8b2f172928ccf56224205ec54945fc12ebe563d73df1d3501e987f8aa6af9038e28127d7d381b31be276f6e2546f6";
-  sha512.doc = "a4e7cdf992721820376ef2b967aeed1821edb6e4763251b627c61a0a85328de8d3d3ff78c7a39f43dd57f3c2ccf54fabf274a074e529ee9f82770766e87cd263";
-  sha512.source = "82615d29bafe844d4c27f75d477b2f731f090fa8080fd36f727c9f17dfbadcfd0bcee2ca7d1ebaae0b75ba61d18828298d5ce64c046f8a6a2a283a2f24658c0f";
+  sha512.run = "8329369e1850003a66a386a82746c36e62d43ae752844434c83e88a56c7914a5919c137899562b566863e05b15f272dde691cc0dcbbe64df863ec68e59fedc64";
+  sha512.doc = "bd28776cba58bcceaf668ede00c2c07eaca6b522a6bf59058c74554f6f17d5be1e66124a612bbe72929c90850359cf5fa632a2ad664e4d20d041671fcf8cca03";
+  sha512.source = "8720d8a0bd4d9031431658f81d8b46dd074dd42cde74a3b03cf23a7cee8b245d281fae1a7a5062e79efd4f5388056c411922a85961bd6c4df0fd5a02545c0829";
   hasRunfiles = true;
-  version = "2.5";
+  version = "2.5.1";
 };
 "thumb" = {
   stripPrefix = 0;
@@ -27039,11 +28068,11 @@ tl: { # no indentation
 };
 "thuthesis" = {
   stripPrefix = 0;
-  sha512.run = "c13d916b927b5caadd0b6d7d9b9abe05cb6ccff2eebff4cad0034589ec63eddeb8a7bb19f8280e7f52b7fe4ef651df29fe20f82c0e2b34e3c8c259cb5654ac5f";
-  sha512.doc = "db975be86cdfa84682ca866141e2673bee2cc9650c598057b9ab6e65251a07dbd4f760b9a80104df82661822b2319a1fca9589f568405543fdf5c207fa3560c3";
-  sha512.source = "74c47a6ed23839ede380bcadc4aaa24a526f62b46a92456e0f2c22e125dcfdb1006a0e4d9070247bb65b5096dd573988de9c4c1e6f12cca4cd8f9d553ad137d1";
+  sha512.run = "f5cc372f4ac691ac96e3b3d2378c6299005aa8d04ec86cf3813c583c1516e99ca41a608bf81507bf637e268bed0544d9bbed8999e941532ce78473e1a29b80e5";
+  sha512.doc = "82533934c9c1bf2b8a42339d0bb71aa2ae1f95ec50aba25bfa097da06ce001865f6b5204fa4b75d03760e31f9777e2c89c9486322c198520c06502f841233c98";
+  sha512.source = "d209faee1cfef085f34498456b9808db6618a8f50450b826c6694a50ed3952b7287ad5c37e4f3069f14f27359532e62ebbdd8065229a7beb335304c47c05e9a6";
   hasRunfiles = true;
-  version = "5.5.2";
+  version = "6.0.2";
 };
 "ticket" = {
   stripPrefix = 0;
@@ -27130,10 +28159,10 @@ tl: { # no indentation
 };
 "tikz-kalender" = {
   stripPrefix = 0;
-  sha512.run = "1b104896f1eda97270afce51ea05a5653d810c5362df86865e1b51149533ed9d1d2293d945e2917b502c94ff89a38aa98b50fb3014f769257deccc498bcad70d";
-  sha512.doc = "0698a9fcacf2a28f9e38fa2adac429a09e439808b017105b29ca68af5325f4caca552b88a11c71924e964914e8e362b26573b1dffb7c07bafeb901bfa04254c2";
+  sha512.run = "8bda7464a62135fe2eb8739d428aca770ee6ba90d3fc08037ebd192f6e436116b59962ae7e0f0cce7addc6a44d0bb5eed47d8c0ff83371a070d3a5c0e8b1feee";
+  sha512.doc = "d73e1427574212a2652191b0afce180155ff32b7d8d63f076f2b5dc71c64d1d8dd562666f8a7ebeff445409fb884ac79a66d0271582b0b6b72e84c5fe7c44f7e";
   hasRunfiles = true;
-  version = "0.4e";
+  version = "0.4f";
 };
 "tikz-karnaugh" = {
   stripPrefix = 0;
@@ -27229,6 +28258,13 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.7f";
 };
+"tikz-trackschematic" = {
+  stripPrefix = 0;
+  sha512.run = "5e00ec05ccd6c6900d8919efc35afc54051a25f8f57812fc476ab6a28f4cc194eb4887699e6353b15b76a68de799fcf9c96c4018ddfcf75d7fb889d998a6055c";
+  sha512.doc = "ded12f30baf163ea465531960745af6ab473ff59e21c579e2c58151b61d2aa8d9b04a29d580a8ed86e88dc1a11a98b7d9dbec9d853bbd8a7556c0b3d634a2947";
+  hasRunfiles = true;
+  version = "0.5.1";
+};
 "tikz-truchet" = {
   stripPrefix = 0;
   sha512.run = "74cc5a05cd9558c68cbb7987671fe1e02a9a076049aad96d4c95d7471ff04e48f03c500f58b85bd8eead46e1af592a54ffe1ef0b0ea0644f4479a332a63dec4a";
@@ -27245,10 +28281,10 @@ tl: { # no indentation
 };
 "tikzducks" = {
   stripPrefix = 0;
-  sha512.run = "a4787c51f622a45befe7a01e0d30dd7b6f7f408fc9f64bd53fbfbbef721a0adfbf80253a395670e13c6eed43593facb704894d8652d65853d1082c0fecde8498";
-  sha512.doc = "55f442ca85b45e3ab1852e2dca324bb580e35a648a4eeb7a693c4497ac358e6be94e5c90062f6216f5feddaa900376f96bf00b222574a5f45b176e2a80b38449";
+  sha512.run = "60a0bcb4560e294c96c3469e557c114cda5b92c6ad2b75c04d8bb7a07426f5dfb115072ff66894a75291bba786ae58d19ee5f651cc80dd1549367d5bbdee5829";
+  sha512.doc = "e7b34bbeb3372eb3ef9bc7b758ce479229b78dd3f9af72bf71bb56cccf2927bf8ca52f9bf985f2d44323754b41180197356f49d3e93ea34ad8ac2cf1adfe9e27";
   hasRunfiles = true;
-  version = "1.1";
+  version = "1.3";
 };
 "tikzinclude" = {
   stripPrefix = 0;
@@ -27431,10 +28467,10 @@ tl: { # no indentation
 };
 "tkz-base" = {
   stripPrefix = 0;
-  sha512.run = "3d187ef9abac64179de9d1c5992fb0b493eddd54e14b83b57adba977fea69598480f56546e685d212093f21d3ce7c9dcc0cef41f426975c2d51fd0188c53ad7b";
-  sha512.doc = "8ae2af7426f66ac769e13399a6bbcb86ed785dc45ad4b89c325fb1a3f5b512b24cb574162f6b1324b3b5d877e4acb0c00d07858a7ee46c8ea2b9bf64e4c5a087";
+  sha512.run = "221c722b6919f8bfaae489f07ddfce6eb3e1495bbeb4ab180fb7fe5627adf1ae3c853a36eae9626959073ea07bb41642351143142ca31e089b4e5f77c6f53f22";
+  sha512.doc = "f33b074f1d45a4d01a7fe02dff39360ca2e1c9352e8989e9c024b40e8fddb3f523526c86f5f205cca0cc7b009a974a02a1213b5e4c5d038c522076a2798b84ff";
   hasRunfiles = true;
-  version = "1.16d";
+  version = "3.02c";
 };
 "tkz-berge" = {
   stripPrefix = 0;
@@ -27445,24 +28481,24 @@ tl: { # no indentation
 };
 "tkz-doc" = {
   stripPrefix = 0;
-  sha512.run = "8ca4da6f1b627c7e6604e8eb55fec2a20198e23240cdb043f83d7f8b28ff1687f71e63fb6a500018d7b5a17add28531c45abe79398880bfbcf5395f5baf7639c";
-  sha512.doc = "e35ae8c425fb20a4f54ab5a81b0b013d107c86a37113b92b4db9fd90de338ec746899e2e554a5c568def0439ff484520bbb7e3bdffdea0728c0bc38d0d574c18";
+  sha512.run = "b0b1c71bcfd60065200492c6ccfcf7a4e4f107c042b6ba7c52a9dcee9094d650eb85fff991c86f389a682fbf2fb583f96f03b668dc0fd959c5871904f227434c";
+  sha512.doc = "cd7d5f718c75c1c6001e01e05d980a35432297539783f479f1a6d6db4faa5141b38832f594ac1f7e54714cef1f25da028ec2bc685f96292b63946bc143bf7568";
   hasRunfiles = true;
-  version = "1.1d";
+  version = "1.2c";
 };
 "tkz-euclide" = {
   stripPrefix = 0;
-  sha512.run = "59ec42eeb1bbdafd1b4c8cc386260d6db02d799e21a4d4a4e43e44edd3adce0b6ee67902b8e9c713738b3371cad22cf69f90f61e0ea55d9815f689afc2c5cac8";
-  sha512.doc = "44dd15fa046d3efb34de0050589ed1358e3b8db121aa64ac07a40ee83364fc8df5af30126ba58bd9fda22bb4dfde7b55170d5949b8cbee41f69de1a7a4e7d515";
+  sha512.run = "8a3809b248694681215e5e6c7349a7b063ff986942dd93a9a745c021b8a3a9e88972da9225bcba2dd30223ef13ba7cea010cfa3c4dcdd75b03a28ebb7bc4a220";
+  sha512.doc = "4a050ae4591d63eeb75cea10a8fb87e617d18af7360589cf616acc74a0ceea47713273bc0c99c243b5f35a4b00b1f61ca61ed52ef016c2fc935ed49ac2a29ffc";
   hasRunfiles = true;
-  version = "1.16c";
+  version = "3.02c";
 };
 "tkz-fct" = {
   stripPrefix = 0;
-  sha512.run = "baacde6c1153323e051b859477f888c66e707472db9e8377df2a3cca31de863a2c9357f10a199f1c3e494f85f412709be91fb8f4814b3ffe2c32dec5ea5d2c7f";
-  sha512.doc = "6bd18423f7169cf75247f77ad28b5b8a4ae5408dc417c4fb08985a559f2309f6dd34253a15cdd3bbb68f3f64c2d6b9bfadb3fc346c7e5a413673e83529b730ab";
+  sha512.run = "3a1b2a7a72def92fb8c44918680179fadaa69aae548b19f1a806e1b5176d4d6923a5e575e909d8c3df7aa26551b199412f1be4183199fe05ea5ce0775952df63";
+  sha512.doc = "77226e5e8a3fc289fd3063e7819918579194d34899e899e03f512481102fd3e3cf333b204e24d5805b4e310080f81ff1df9e4ff83e17980e74b8326139c37114";
   hasRunfiles = true;
-  version = "1.16c";
+  version = "1.2";
 };
 "tkz-graph" = {
   stripPrefix = 0;
@@ -27519,8 +28555,8 @@ tl: { # no indentation
   version = "1.1";
 };
 "tlshell" = {
-  sha512.run = "6a04842543dabc9027ac7865be7874f3b7fed25b0cb9ca2827f36d3559b92ca250389a329787366f24c44c7917dc87250468222eb2094ce7dd37d844debcc7e1";
-  sha512.doc = "947b95c7f03e7b8f9b63c8eb76a6690a720edf6fa23164b5024b2aaa6ecbbf7e2d88b7afa2e56993808a66d5b18b8313f742ef2faa82c694a8f6b950484fd6f6";
+  sha512.run = "1b8c40f2b6c4fb0a106c28f217dee218069942750c8302b936b89c2e1fd28030370e0d6a2ffe91789f9fee8175fac3384aa4b48a581d9edf1480db3b509fe441";
+  sha512.doc = "73d2770e5d28040995db376495938224e8fc4b9b986171f4d39df3557e0d1b99982436bbb6f687f329b533da30534240c8a892580bdfe13fcd22b3058f7b9e6b";
   hasRunfiles = true;
 };
 "tocbibind" = {
@@ -27541,11 +28577,11 @@ tl: { # no indentation
 };
 "tocloft" = {
   stripPrefix = 0;
-  sha512.run = "4630cda5785a75929f6b060a6d9a51168eb8a00476ce2ac4f070de8424df00cca1f7f2fb0d708ccb22b3516f0617977dffdb012b5d360c694c1a98f9495042f3";
-  sha512.doc = "4c85d817ed65a7dc96ed5298793836725637f934aaab95ee11bbc6d3c9a3e0b60af8e792bb99fb172c40c83d59f3b06752b1db1fe1c2ee2757c3c3733c6b7f94";
-  sha512.source = "6328bc6635a6e25d3c4408c255252daa8f60c64bf9add32e17b8c50813c8b1149414ace626c9ac1691f90a3e6f4b5d4c29723b5f92960cee884b56365baaa7c2";
+  sha512.run = "249b50b4dde3c9b14cfd3a7b00c441007643ad6638996b83a0274bf4126ca8a26f6cfff816c5efc9b6516953cfc29c18905138fe137877ae920e82376afeeab7";
+  sha512.doc = "edd477e3c4b2a9f815c3e57a6b785c2237bc34435dd561d28b3e38bd8da5cc5d4d4de79a10dfbb55e920d69dab90d0a40efd3bcc44cad1c736a723b89f147af9";
+  sha512.source = "a870218b7470962996f5bbab8c15f880d6aa863b8102dfccc67bbe3cdc3895785cc44624bd460d37a96da74d1ef28340535576aa481129e9ccda2e5ee1ee6256";
   hasRunfiles = true;
-  version = "2.3i";
+  version = "2.3j";
 };
 "tocvsec2" = {
   stripPrefix = 0;
@@ -27565,18 +28601,22 @@ tl: { # no indentation
 };
 "todonotes" = {
   stripPrefix = 0;
-  sha512.run = "708012c523b8609da3f394cf2def8b07c642fd6d0eeddbcea3e6c6825b7a8b865446b2599e7f1d4d06d00ecd1097bb713fc495d6bc25e6165e265901056d71d0";
-  sha512.doc = "e8cda7e59c10af8c1b93bcd800f94b36ab3202a996edc417634676a36d0b37668f7fec6aeef54166b603d7652b2f129e141e0cdfd974712e886d6fb70212ca08";
-  sha512.source = "3b1c9037e8b96d3848ce4aad8a256327be081fd215379d14ad45e0eb633abb6406062d218fac90200c5bb9adfa964045ea5ff2b6f1307a485249a6635ec8587f";
+  deps."pgf" = tl."pgf";
+  deps."tools" = tl."tools";
+  deps."xcolor" = tl."xcolor";
+  deps."xkeyval" = tl."xkeyval";
+  sha512.run = "07f532c8f96b04585b68f54a9092463a829e4f3aa440142a3d2589597d96e2c83568cface4e59e44d92a64ed909bd817e0e3467638d6e4c4015a6f9d30f2f6d6";
+  sha512.doc = "31ed8f25d274f1b7fc4ead8f2c43a1d30749c7e440a13f72dff07cb0668eda139335e517e60dba5f1ba8006abdbb92f2742f2012e3207e932352d6e7d3067240";
+  sha512.source = "00ec1e48e07f8f283d1ff3db8bdfe55d0ab0c03a7e117db584cbb22103eca7e59af684477a8adf552faaaa018e35681e258cb1ed970e189c960ab4caa0cfae39";
   hasRunfiles = true;
   version = "1.1.2";
 };
 "tokcycle" = {
   stripPrefix = 0;
-  sha512.run = "005911920c9452d6bd264f8ce807c9d5ac4a5ae5472d906a994e0bc5f7a39607cf9133d83b7ffe3216b30ecf6398cc6f416ecce8136a73f26617b8013a27e8ee";
-  sha512.doc = "31b18e642fe8e7653ca1f1c8505d6e2c387d51b1d1866f8179f30255b5814584117b07a58820e0f3eb7bf9d678d71d758505546097df2127cc67653b6a8a8b72";
+  sha512.run = "1d4186f5f12468cebdee8418925cd3b3ce4d987bc70bf268efa566f3b65b3eaeeea964085453beff9bc3950c67850fc3f37d2b6b5ed0dd14cc2f01cb569a42b6";
+  sha512.doc = "d08da1c1d6d4d42ba3bb6a866327c4deab6dd359130b9e795f08ff9bc3ea0e5ceca8fba74044d298e38ef54e1ed497245687a124c9cec49e2cce4140e1a8264d";
   hasRunfiles = true;
-  version = "1.1";
+  version = "1.12";
 };
 "tokenizer" = {
   stripPrefix = 0;
@@ -27595,9 +28635,9 @@ tl: { # no indentation
 };
 "tools" = {
   stripPrefix = 0;
-  sha512.run = "fdb0242e5168d0291c9d135961447385f7b70a2ac367b9f5e503ec2d945ac60ad86f66020da1bea88a86465b148e73451f4e19d4ab478144b3ed1323c6b97a14";
-  sha512.doc = "b4c3f4e869195beff26ed22189fcff0c4633cd8de604f59fcc6090edc16e135e26844997559c19dfdf28f35360366466f556a3122ec02ab2d9dce8a29adc05ae";
-  sha512.source = "f8186ea654a5e0b9521d3969a062d8df6a414294babf4d4891116077fa177847428f2d133a9aa7a85e2d1b2d1dfc6018b79035637c0541a60a54c592024cb740";
+  sha512.run = "1d3386bd098381e0ede5ff0c6cb107867719a54a8109208a1de448881e172265a000d91c6e7d0607af62de0504913e4698f5ee00a710b5dc32a8157faed094d5";
+  sha512.doc = "e0e7d9bd37f2268f7496b66b69fbc520413f74f67356319ec61c1c6c2523f0fa84d7ea4d78f0a9b0875d820c3514ae0c5871d4785df992ac345238e6f5af8a3a";
+  sha512.source = "57d12bcc8b51f349a45392c7a7b24d2ba52a5ee05f84bf7d70b1bc7e384e4b09b0733a23a0704f5a564dd812401dd851ecd6294201bb83a42b0bc73f7ccb889b";
   hasRunfiles = true;
 };
 "topfloat" = {
@@ -27646,8 +28686,8 @@ tl: { # no indentation
   version = "2.00";
 };
 "tpic2pdftex" = {
-  sha512.run = "3a0bfba17911731b52960646914da0050a6928b2b433c84140ccbe63835d816f018cea4b16a8513b447c7490fcfd610cbf7a48c8cb0d5dc67ee925c238361b14";
-  sha512.doc = "b2734d86215332e7898e611ee12880c559b095468881c9ec1f15696a182afaa2f056c46ebdcf4cd69427e9716ed70b1cf50f72384d9f698e644e8b2fe9d3a1a6";
+  sha512.run = "fa8689bd257b6336badb8e5a742d5c5f12d9088b33b43bdc41474feda62358c754db05735fa471baa307907bcd61f68e8d061e66c400198d6a1dc165f39d2226";
+  sha512.doc = "f24f8508279ded0689bb9dda8c653cfbd903c46782744fcb8d004f50a771ca74b86549c86abc765a408f2be67334048390e407be9446faa476a02ce9c27d5547";
 };
 "tpslifonts" = {
   stripPrefix = 0;
@@ -27667,11 +28707,11 @@ tl: { # no indentation
 };
 "tracklang" = {
   stripPrefix = 0;
-  sha512.run = "f5865a057b92eaee1f00e30d6a9246e85e3b684169472cbc78cfd3b0730b0ca9c7720f8d8516bd5bee07962e76dd59bc407bcef8b655f03addcf7e60808dfba2";
-  sha512.doc = "4199a53e4b8c56bcc17329fd82ea2f11b37e593c5b99aa3200b58748fdd7d575f9800b251a53ac535a8384ad74a33e29ac857f468e668784982ae61e6c6694fe";
-  sha512.source = "28efc751163250433d269817c2961d7364b872a562a5e3a2baefee76d339012c29620d01731ffa2c770b90a22b2e6c8ca29d2044a2d7c6771b7f857ec7f0e773";
+  sha512.run = "bf1126910a73aa2df406a596760802da334c0bdb451e9062cdad2fd80a29386c42b3deac4af1624741868e9de12bf7f1b3e94e79f48b291a6f062503f5161611";
+  sha512.doc = "72808d7fa6340d535db4aeeeda6e07dfb3bd29d910c13442722d2f8cfc0e19e446ba23eec098bbce505438352e2514aaf6411c72893d85fc960a7ce9c35c7203";
+  sha512.source = "b00242d2ff6f8e140431ca11df4db810fd0a24c6eca292ff700db8cc738771e6f0c9a3a33bfd34db23150b6e5cfae2e1dccb1c7d425656d2a1c8dd7822b210a1";
   hasRunfiles = true;
-  version = "1.3.8";
+  version = "1.4";
 };
 "trajan" = {
   stripPrefix = 0;
@@ -27751,10 +28791,10 @@ tl: { # no indentation
 };
 "translations" = {
   stripPrefix = 0;
-  sha512.run = "24686eda26044a45f42b4d821528af58b58710c31ba3a03e33e38de018cc8fc5c5d3f31f000ae69a1ba269e371c245b0c501718d45c803c3dfc8ba0f64dc99c7";
-  sha512.doc = "683b3e6180801d96a457180649cca7ab79e6d965e1de95cab3bf2579ae4e8b34e30ba032e1fb2719a1a2826845d55d8a963ec813c8b2f6620e60bc986b3811a2";
+  sha512.run = "c4f55be467d87f49a0e65729769846afbffcca6e8b3611897d185ddccfbde7773d7c1e7591d4e67d234c2eb025a6e8774b22478e35ad83a550bec2854253cb7a";
+  sha512.doc = "e964c0af6f855b32a3ded46616325876f3a132db9b6afb1d885730d05d958750eb2014291eef21949a11e4850b91e84b02f45bd7d4d86ac3069ef32960ab7243";
   hasRunfiles = true;
-  version = "1.7a";
+  version = "1.8";
 };
 "translator" = {
   stripPrefix = 0;
@@ -27763,6 +28803,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.12a";
 };
+"transparent" = {
+  stripPrefix = 0;
+  sha512.run = "a1b545dee3fc210d9ff39c9ad1e8015c3972b2f1655e40f828d3bca0d8ae759772e18fd180cec5fa88d45f48076d92d07bebf2e03ef26745ad53a2fd8581d9cf";
+  sha512.doc = "7de04001cea582db36ed0fb0b5f8382a367603d8ce8327d29d773d05af116ae76adddd678b220d2df8abf7c6c619bee9f050f51c5aa255d7b0fb9b576638e049";
+  sha512.source = "73a5f575a644334ee5a61f740c4f5f2e09a10ee0c4c5732be70809f66f67fddc5979bafe4a7fcd8a2462e0dec2b98867e9ba1ff2d82e3be9743ecf5773cd5ab8";
+  hasRunfiles = true;
+  version = "1.4";
+};
 "tree-dvips" = {
   stripPrefix = 0;
   sha512.run = "6153417c5d2677a56adf031c5f2f27e4c2bf204c0acef1cc5cd49355370aa336814bad7d2be00e95d22bcf73b9b69105a255d15f29ed650511c0eccc3c9bda07";
@@ -27828,8 +28876,8 @@ tl: { # no indentation
   version = "1.0";
 };
 "ttfutils" = {
-  sha512.run = "cb133e9067cc3b2d99dc2910d3722fd87d53bf38e664fdc80cbdd7ff1787047f0e71bbc60018802cae34cc5d6eeaeaddd0cac6ae23f980d0eb7316f6c342ce38";
-  sha512.doc = "27f3dc442a1892a903d5ebab16c82b0221efddd0def20b817ad1b33975d960219424ec1e6a408dc774e377aee99e905f6a850ce4a30ad1ed302acf442f09461d";
+  sha512.run = "9a473a7b6699ec81ce580c978a2a8987e6ecd3109db797d145f4fac3b6b3bda407fcbb2ff5c59eb6c8a2397757a2e241f1226058bb5982174b9517143d8ad0ae";
+  sha512.doc = "01a263779915465fa1dfc7461e536b606d1ca26801bf663af297c39292e2d554d559c43d748ce736c921326f296943bf98cda97f01ddbd2044b41c7084ba4d74";
   hasRunfiles = true;
 };
 "tucv" = {
@@ -27842,10 +28890,10 @@ tl: { # no indentation
 };
 "tuda-ci" = {
   stripPrefix = 0;
-  sha512.run = "cb06d36d7918544ee277a04c132eaeae67b4a305651f19b35e6bcfc6be4984af74dec0877610b4bf5337d162943a931ce2afe73baa9c2d739a5457718aa88b25";
-  sha512.doc = "d21cd3cc76bd297ac029629e8541281b213428975388e97e1c0b807bed52d6200e398ae52233379955040f63a3b01e56a86d3c8603273dc2426d2a517a0a86bb";
+  sha512.run = "2c53d5c65a56737a994b9463b18d81a96261f069bc94396e774986a42adabd0f75041265ea579dadc042b07046940f36f1c73600a8bb84956251a391e7215caf";
+  sha512.doc = "367fdde6b250fe609e02002bb35af92eb67c52b4234837a69bfeefb2f998f6563b1ecacb51078b5c5757da1c260fe30d57c323b6cb88af66c83e54dd26122b8e";
   hasRunfiles = true;
-  version = "1.11";
+  version = "2.08";
 };
 "tudscr" = {
   stripPrefix = 0;
@@ -27865,11 +28913,11 @@ tl: { # no indentation
   deps."trimspaces" = tl."trimspaces";
   deps."environ" = tl."environ";
   deps."oberdiek" = tl."oberdiek";
-  sha512.run = "02e53aa101f34734dd483ae9d5d82e4b62a3ce04898db4e17e79787c1908277645f673d10793c11093a9cab8f4540671f6c0d8bd466d9a00d4f9c18922ae7ac2";
-  sha512.doc = "5ba9010fbd54a607ec7a94765c28d1ba79f99a2113628143f673e0e7b2c3c55b60828c2019d288e143bd0f97df3a2e62a31b34f000048d37115d224c97860e6f";
-  sha512.source = "ff791b97aa0e7d58c6abf126550b29b1ff9521dab9d4c8c845049e5622fdd189805a5a382a82a87ddf97c295a1f16480468e11e0c931c246b56ca42fcdfd1a44";
+  sha512.run = "19ba4e0ce18b714fd62b81b030c58ed81781fcd199cb5df8c6d258a85fab3246295d662cb058b7bc0a413b5a202c5c459db7b7d450bfc3f5223e8a8b18d22074";
+  sha512.doc = "27ce6918d35adf0c788830c3a872b7cc3efc8be2e8485a8a33909d4ac32a2b4d4da41a7e278e9640b4b4128d53c196cf85e832c9a49eaa93452af0b958642afc";
+  sha512.source = "9bd2c55f4844028af2fef3122e2ae355d18d5c64b11028ab5d6ecbc69817a9fa27f03cbd179755f195c5ff8fcce90be57122e18bc78a910c40b99cee612f1d92";
   hasRunfiles = true;
-  version = "2.06d";
+  version = "2.06f";
 };
 "tufte-latex" = {
   stripPrefix = 0;
@@ -27886,11 +28934,11 @@ tl: { # no indentation
 };
 "tugboat" = {
   stripPrefix = 0;
-  sha512.run = "56a495c6239ed1a8ef1844bd90f9bcb97e2c97664877f343d198f9d9192d33e866b87334b961583d765d9b78633a5b5415933c000270d23be34f637612cfd1eb";
-  sha512.doc = "9fbe0a3438a81acc63424007bea1f2e8ff7f6a29e16bf1642963763aaba763f64bc26863ffbe9cc9318836df2e9191c5d8bcef821f573447a262f2b49896edfe";
-  sha512.source = "76152f1a32da57ed51d97a8f6189b5a72ae0ffbf18934506034ac84014bb0a4bd790aed1919454e87838e3a68f88d38f191dbce995372741a47bed65449dc90b";
+  sha512.run = "80eb6a023427f10c86ab97df7903e650f3b670b2a2aabb806e44735895156614cbc92e911f6fcd546ad90a2d8574abc187ccd7afc4ba8709f2b0dc496fc38a13";
+  sha512.doc = "3ebd5c7419fb6148eefe10d0704172f752065eb6e04b65e784a98b24d7f35a7f4de40c527b86ebb2f571047b62f2960600535a0f7e1174bfc9b8d27fbac0ab09";
+  sha512.source = "5d31d27e77211c2d35236894afe28088a4acb92deeb716f226dcb2e0fe3ebe515088fc97811b8e648177882f23e546fa237b56c34792885367cef5c3ce85f4ef";
   hasRunfiles = true;
-  version = "2.21";
+  version = "2.22";
 };
 "tugboat-plain" = {
   stripPrefix = 0;
@@ -27942,6 +28990,13 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.3a";
 };
+"twemoji-colr" = {
+  stripPrefix = 0;
+  sha512.run = "affbbf8529468cb034c42328a8c9226c8c4ad6213f087f20ae69e9d2631bdcecc826c3c7f12d63a46df798af99d896b114383adaabd720eb9821365a324ddb26";
+  sha512.doc = "32d51e15047a6b171987e7a4ae61b90d7280a5de80ea8b9859c7cee967869891fe1a21beb3676a04eaad317c441be5e8582697efffc5135e5363e071a162d656";
+  hasRunfiles = true;
+  version = "0.5.0";
+};
 "twoinone" = {
   stripPrefix = 0;
   sha512.run = "ffb9610d416a15f664bfc34772651af63f76843127290bd64462991b3b892a8bbe9b5a8251e278ce757883226bc07f89f54cf94be08d6bdbe6f68c5841e3a282";
@@ -27964,11 +29019,11 @@ tl: { # no indentation
 };
 "txfontsb" = {
   stripPrefix = 0;
-  sha512.run = "bcad7b4043aab05469166bc747a14746d8deaa3bf0d354c5b7bb706a86c4b95bea9943ef4529289f82ca939cffe377dc4f5cc89e95fc4bb4da797b61cc9b6c63";
-  sha512.doc = "f6af38502971c30cc2e082b0eb64ee86d494b77937e13b70dad24c77c90bc076b2b983028636bcdfb51ae5efb7d901cd082ca5d3cc6b7360d299611718d6eb31";
-  sha512.source = "61da236fc5cc33b520c4d7a68beca24dd4799bbed7675d44a3daa8bb4a815a3f3944d73eaaa157536a60c6d67d68dd9a214f083b1dd2bc768f14611b6ddd8aeb";
+  sha512.run = "cbe87a0540b2bf74ffe26e54f744e9e705beed6711e688380000115154a79f2520257109bc929b747f6f3ebd84577335278301289d65eb0f427258a7e2035384";
+  sha512.doc = "e71808976ca1f15a6d839f251a75a9ee71c3763daa9e36dfe08dc0d8deb8b13841eb9c0aa423879c7c245faf4acb288aaf2d53506ab312993bd42f7109d8a7eb";
+  sha512.source = "a4a9dfff6b19d91b1898203b1b167b1c31711be579a6dd61e9f2e7924b239364fbcff491037363c24332a5bd1989c30b2801445eeb2ca633339d9285f36b2348";
   hasRunfiles = true;
-  version = "1.1";
+  version = "1.1.1";
 };
 "txgreeks" = {
   stripPrefix = 0;
@@ -28081,8 +29136,8 @@ tl: { # no indentation
 };
 "ucalgmthesis" = {
   stripPrefix = 0;
-  sha512.run = "7f2d9b167b5268eb3f163ed71a12e3a979e2062469401a07b148c9d24f3080f050cb31df84adbd7de20675ec0275405f77923331862de78883faf86664445241";
-  sha512.doc = "f0a3a599e904525877c6737262de78b66d4144d49a5fbe3ac79db3a82481d168607f48af9974019d6bc773465714a5043bd95fb45161d833d2903de708375a03";
+  sha512.run = "79fe22cc61ca71e472b2ecd173230b518f97b66fd411430b57dc341394961999b0cb4dc7e122d6abc828e5ecc5e15f60e0b0ce785131cbf4942a49ddb8b5190d";
+  sha512.doc = "458ad22537a6152ff782725328e98b68f1fe68ebcb2764ae1598bca8b659c8e67ffcb0c889890c7254dba84301ea3a066a5e92bac814027f62ce6910cb5f5b9b";
   hasRunfiles = true;
 };
 "ucbthesis" = {
@@ -28124,11 +29179,11 @@ tl: { # no indentation
 };
 "ucsmonograph" = {
   stripPrefix = 0;
-  sha512.run = "e7d128e550f797aa566e1364102c5625ceb268f7e3d8ac78f03734d5721e92628ddb22942afb4355ba6dbf68cade8b129148a41ba777f925a4c51743db12bdff";
-  sha512.doc = "500317f88c5162f201b22d0d511fadd2e2a024c72fb7ad30c15d6f251a6c350bee724f62701341d78dd4ac2d718b231994a98319fbbd8b79caa639272e2627dc";
-  sha512.source = "c802f694093eb71d8cce30ac2ff2672ac07ed40196575f89d192864d5fbae7e5bc5e0910042798cf4ddae7481e812c62b50c5ebf245c59dda1d3f9b992cf1497";
+  sha512.run = "e4375327eabb390842ae833bceea1a554fd833b656e0ede5d56b1bd48a070dc0b89eb878db0c77e92865760755c006fffab8a1d0627f0acb6cc1485aa9a13c6f";
+  sha512.doc = "00cfc843b8377d9390806d72a78c5c7d219adc0312a7472ad764bb777200265b6f2d6757f98c44ebdc671671df38e920fe488a2cdea0dab0a3953856b5233b57";
+  sha512.source = "900c1f53d5f78fcd7e2fbab9a83130ff0d7233a4fc3a547fdecbb6c7ac35a7c3a32a10f74b00f959c8cc4afae98f97532f3baffe1db433053497db80ab74a852";
   hasRunfiles = true;
-  version = "1.2.1";
+  version = "1.3.0";
 };
 "ucthesis" = {
   stripPrefix = 0;
@@ -28204,8 +29259,8 @@ tl: { # no indentation
 };
 "ulem" = {
   stripPrefix = 0;
-  sha512.run = "f20ce5e900bfd20da9fe240214ae63ccb51fb6d0ee6f5a4081439f524889a480cfced5f261a10bcad8c7f28c31b7e1933254b3ab30c5de04d54ff80e49952342";
-  sha512.doc = "e73214c64517ecc2a30283b0e0e87f913bd768c2ab9dc0eef68e8c1534c3ac877ca8b96e6326205e7cb34eca072e5b2351542d0b9fb02b24f1604782efc5a7bf";
+  sha512.run = "bb7fc8d93d38a847431f9f62f1447520890f3904654ef6f3cdffd14537600da35d54bd0839cd8fd8d26e1e3146463cd9ced79f706df54df075292eea8a40ed4c";
+  sha512.doc = "153dcf2057d267c2f59c7705c4997752e902aa004201f97d52a180419d7c0fea4173c0b5b1a1c8a11bc1703226e55ea55721a4d18c265b30343a5812d1f4e0e7";
   hasRunfiles = true;
 };
 "ulqda" = {
@@ -28217,11 +29272,11 @@ tl: { # no indentation
 };
 "ulthese" = {
   stripPrefix = 0;
-  sha512.run = "d9b1228e4fe2f425a6c0b31695283a07092d4fe5bed1eeb2ba63eeba702fb07235faa9f5b3b443a8373b719d0e82dd03f5e3e691911c7a0922e1ae335ff10227";
-  sha512.doc = "1f93ca717472f2f894bdb413fbda7d3b40bb86742f470c1049a18dc141717475475e2ebba46923108db30f8a15d04da649c3d8840a3579b016c72334895080aa";
-  sha512.source = "c9212c8cbeeadc87fdb1e5573d48eee6997e2827b53f6a1cabc33f358f47b5589dcb785fd6597adfcfa55cd3d8c0e370f84733acb183ab95a136dcab8ff1032b";
+  sha512.run = "c2a3d8a837ecda20bf50c496b8506e6c7dc7d6308fa058e51f4b1dba858d76c391ab3b9faaff9cbbb39fea3696fc5a1c7daf9417f3c18b3eaef9fc7eb5383195";
+  sha512.doc = "adffed362b6ebe3bab7aa04563ca0de114917199893dd310578d372f6e4e67b84bae7e50658ebfd7bde270d4c3158ef9dda57c0c6855787fa3cde0102ef4153a";
+  sha512.source = "652cd812d9916f855ceb5983b1cfecfa9a7fd724939933ef0159c6ee4dd9199e9923cd09511598b30c8f5355845fb3764363e110bd69d02df4f62c6f69ebbc99";
   hasRunfiles = true;
-  version = "5.2";
+  version = "5.3";
 };
 "umbclegislation" = {
   stripPrefix = 0;
@@ -28368,19 +29423,20 @@ tl: { # no indentation
 };
 "unicode-data" = {
   stripPrefix = 0;
-  sha512.run = "7fefa735e9ab3499e6764b755a634d0161b776a8f5fea07a2da7df0506247eb6f15034c193affe83ee065894eac33d037b13af8a8f72e0675c4b377f1c919d60";
-  sha512.doc = "2442fd1bfc6add0c9dcefedb33a14fb7ed0d132efedc1f82cba3f367c2a759779e5585ebc8e76a96eec7bf57a3083676d704402444e10b03d060c5ee6edd235b";
+  sha512.run = "6502cb2f4251101727d9d9708450a47d46ace34bda50b6d760fb6ca3605317e948ad2b47d3fb4ac1349e55460a75a99a1aa56c59a444945c220ed8fe55c3c631";
+  sha512.doc = "6f8214ee77f098dff74941ba472d8115c64953f3f925222c6bb1fe756ab07a5ff4ca44ef2cb1515241f46d572c9d67df96ccc461f4923471edd17979604d83da";
   hasRunfiles = true;
-  version = "1.10";
+  version = "1.11";
 };
 "unicode-math" = {
   stripPrefix = 0;
   deps."fontspec" = tl."fontspec";
-  sha512.run = "f1698aeb2dada60c9ae2aae4e7471277cf8d34746ae0d215c26cf7c2d6683c9c3b43bb416cdf8359706c76bbcd0543bbd918aebf34e09284f0cdb8831cba41bb";
-  sha512.doc = "b9be53c40781bee98b58e97b92b01423310e991839c03a67e75c650ceda56a643de702b8fafb0097ac246c44a343f4fc8aced0fa8ab0742fc2c3f7fdd8e9ab1d";
-  sha512.source = "432cd02c01ac814b0989b0b845a059ffe2ddc8568a5e3f77ef672d01fdb4ba599c5d1fe0c15c6a32fb4dec6ae1b66603c006c86ab5813a8202323a02f16aae0d";
+  deps."lm-math" = tl."lm-math";
+  sha512.run = "7ed199c32680ae776c6367cc5d4d1c34826d6652ee50aa16f7952151b339d07809186c93a939f945d7166002ada059b3f02f54fdf5770b0b1cc50c6144d840ca";
+  sha512.doc = "47051682a03bd91a9e9d6861239baca8c0f34b0e2b1b94a4a1e4100a522c639712fd9cdebf4ab7be1b2d09e90ed6ca2335b4bce0233a8e047dbe5090493fbecb";
+  sha512.source = "b041007d75ea2bbcbe5e13c6797f3dbfed5bb7035ec8f9d4b3116304dc8a443fafdea6d31f957a6b57e2f9f3802ad9781fbbafc7b78404bfabee61925d2b87d9";
   hasRunfiles = true;
-  version = "0.8p";
+  version = "0.8q";
 };
 "unifith" = {
   stripPrefix = 0;
@@ -28389,6 +29445,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.2";
 };
+"uniquecounter" = {
+  stripPrefix = 0;
+  sha512.run = "9769fcfd787f210e0653c971872aaad6e0ef1e5a066e392e9d599f8fc11ab9f6587d21db1100b643d09d4850cfbfbbc1d32f01fd1e86aedab8c92da4f5a7d614";
+  sha512.doc = "4dc74aabd9288ae881c4513886ff917e1e8bf08446d3b34c946bded6a6fa71ea7b6786bf432fec2661cd1db1af6b5875ab329708cc3c443499b83b0325645d0f";
+  sha512.source = "caac3c3445b2b9301d46ca94744eb600cc45b79f6946065f036f412d2d1b41716864d61e0cfb9e9d32ab8dbf870e5f4e302c96b388d680badb13c52821f7722e";
+  hasRunfiles = true;
+  version = "1.4";
+};
 "unisugar" = {
   stripPrefix = 0;
   sha512.run = "01dbe995d32b49121e28163c11f89e51d4c692ab864b3dbe6305a0e4364c025b13751c137df52d24160acc9a8080fbee56fc7a5af522405c3d0564486c151260";
@@ -28448,11 +29512,11 @@ tl: { # no indentation
 };
 "unravel" = {
   stripPrefix = 0;
-  sha512.run = "862cdfee766dcf3be322423c7f3388b5bac739879f0910d7a3a5118a7813b86dea9e5c866c3bc33648e376ff223be55c18fcf56247e3082c199b5bd589cff49f";
-  sha512.doc = "5da7cdfb916e986ad783e43c79a57713c2d713061866a19fd975c157d8cd328b80a5620fa583b7964dbe37b8ac74d9c0921c15cef57e76266f52c62412a8befb";
-  sha512.source = "0f9791862c2b1e8ae4c9d293bde5a48fbcb49e5634f75c9bdff4d3ebd51f9e7b8f820b9c5f860f16bd15a6de0b04e112d96fee75313fd3316aa19a01803456a3";
+  sha512.run = "e31da53c07ddb60491412e94f50444cd3178879180426cc2d8f78d5056a05c091a36d1c5b9107f0e3714acab1f723e90ddfc0250319bde07d67133bc50543f4d";
+  sha512.doc = "5fc7618723ab27f57c14b0b81cb8d6f1b141ac6582cd73143a5c1543dca0f307ff5eaff006dd0a55c6f84887f0b08dddda5651b9c0938716262894cb3b8aeda0";
+  sha512.source = "2c7336dd1033f87a10ee48e699c0c782e5f2fbf52102580f396f8d7ac5805fbd665ece0370bd72cd191fa9df6fefa8b27d07ace58710e1c8d04aa45f3bfaa5e3";
   hasRunfiles = true;
-  version = "0.2g";
+  version = "0.2h";
 };
 "unswcover" = {
   stripPrefix = 0;
@@ -28491,7 +29555,7 @@ tl: { # no indentation
 };
 "updmap-map" = {
   stripPrefix = 0;
-  sha512.run = "a7b7ae8316e0e7e12965fe2d4bf87aa2cc6ffa5d6596b833999173e26e6030f322d1f5d24f09141401330b22037b64eba260169b3c1081277e6fc1a54c028a6c";
+  sha512.run = "087753526998c68fa94dc86df6beebd6293dab9bf87f0969bb80f362b6d33215bd4f3b9baae5c8a22adbe0e3ecd5d1b8e4d0f71eab6cf6c1a932e7acbc94efbb";
   hasRunfiles = true;
 };
 "uplatex" = {
@@ -28500,13 +29564,17 @@ tl: { # no indentation
   deps."cm" = tl."cm";
   deps."hyphen-base" = tl."hyphen-base";
   deps."latex-fonts" = tl."latex-fonts";
+  deps."l3backend" = tl."l3backend";
+  deps."l3kernel" = tl."l3kernel";
+  deps."tex-ini-files" = tl."tex-ini-files";
+  deps."unicode-data" = tl."unicode-data";
   deps."uptex-fonts" = tl."uptex-fonts";
   deps."platex" = tl."platex";
   deps."latex" = tl."latex";
   deps."latex-base-dev" = tl."latex-base-dev";
-  sha512.run = "c4838a2c99df646961f6be9e8ba051a97d5943f1f3ba25aeaf668c5924d3923c888d02a1b7ca4317d58777cb5cd17b6598e060583021e0a27f8a06ae586bd0ef";
-  sha512.doc = "c50305ae9898889f877de69cdfeb79eb08bdfe806976c21053094c1b7b0203ad83356b8f130c68ff68c649496c3685ffd35952f2e10dd6eaa30de41094d68193";
-  sha512.source = "0e5f6088d7bdfad79a26d5a99025b0fedd0a85bd461f24c2708dcacc7cf49578c42bef30f3682fc1db05d3e3c09dc572d5119f024c6e48d174372bdf3e49ef8a";
+  sha512.run = "5545d71ef35856e37a477a0f3fd9fb9e6138609e81b504f9a0ea5f06bf08cde0ed6a6f0f6459a57a317531cb93967013ff19872907b15b8c6220297cc28882f0";
+  sha512.doc = "208890f08f3d0e6011e49057799d34ecd33755133f92f69cf024a91da01ccf991e16550f20607f5ae825b8adb3f3b83d0994275ec07b9a68abc3a96ae62e4682";
+  sha512.source = "f1980b483360213db4734d0727b1cb9b521e4941f022c7ab986922d5b58e620bf003403087d3f29c9768b0dfba4b7e7246e1820a9bd1c7c487f8557789be4b05";
   hasRunfiles = true;
 };
 "upmethodology" = {
@@ -28540,8 +29608,8 @@ tl: { # no indentation
   deps."plain" = tl."plain";
   deps."etex" = tl."etex";
   deps."ptex-base" = tl."ptex-base";
-  sha512.run = "0e2f30249de81eb8040e74f0f99c781fdb8a93c9f507fb58329f226c8347cb8b9d3ca140eb1bce6ba8a82fef977e2a6a68c30bdb79ae44e2ffa6128899e669ad";
-  sha512.doc = "8d962e3bcda4d49fe6aadf89d0dcdaa9541fe01e50fc16cf9ebe3066b7df9f7bb2db85c3c6fef228125c8817a7ceaf2a2774313e75e98bd1b0aa429ed0f4558e";
+  sha512.run = "a2f63dadc6e4e20d4856cda577f7f49368ae8951cd5025c88226b11448dc72d9995496367de9afb2b528b02a7622200267585552dc2979d384f31f137b0e8dce";
+  sha512.doc = "8cb4a6d499ca37348953d39c4a6a2041daa09152ac5f780e87d1f903a19c5ee6b2a3f7e011f373c68de047b02aaffaa5e2bab77f5aef7ae28a0b9f82fe3adbb6";
   version = "1.20";
 };
 "uptex-base" = {
@@ -28739,8 +29807,8 @@ tl: { # no indentation
 };
 "velthuis" = {
   deps."xetex-devanagari" = tl."xetex-devanagari";
-  sha512.run = "9c4a81758b71d4ee815bfbb1d0336d50d6da4b71e5d7aab6d5797a259b165b2d9559afb30484f9c3582002d7d9c536f5479828490504e74ddd56719403757255";
-  sha512.doc = "d4d2f9692b173350419bff2f3e9ba2528ff21b467e93e63b991dda294bd562d4b0b25b5187d8348963d114bb4d28925ee74b20222e0946400cdd4a0b2b6194fe";
+  sha512.run = "92ed388e406324c0189f613197869d4ccdbef459fba5d1408e7ed9068777ad28fe7193c340d1786e21ec8178bdb275603cda2d86d33d3a6318788580a015a40c";
+  sha512.doc = "9b928842995afa63db5aba51e6605d3fb036687e83e609422954df4c4848563e7a6b62e669ababd1d2804077e8add424bfc88d965ad5ce1f904f1820cf750515";
   hasRunfiles = true;
   version = "2.17.1";
 };
@@ -28801,6 +29869,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.2";
 };
+"verifica" = {
+  stripPrefix = 0;
+  sha512.run = "7fbb232e4d732df813520c0a4085540bd5b16ca5cb4a68ad3fdffec8de273d821bbcc6304cb74fd06d30ea8f30e50475074c183ca96c9d46c32e818249f7cc45";
+  sha512.doc = "822e444c7657427dde2b3a51b3f2f42f6088e66933e51d1533782ae76f2e8de31d2cf1c5e7824e3d90600a971f253a7eb84e0dd0c874446cc0bc0b914e0a691f";
+  sha512.source = "a3418fecbaf2775b3aef2db90603dc64b0a2be211f02010d62e3c73517334d2628a68b17f911b3ea257f3cf439b5bf1f8360e97f5c3ea6ad0d7605ce904922b0";
+  hasRunfiles = true;
+  version = "1.2";
+};
 "verse" = {
   stripPrefix = 0;
   sha512.run = "3f9878dea106ec87f2b64960c5824fda6eb9f700b753a530cec7e1b8519dc9a817cf7ea74c13eb806497740501122790fb29f6e3cc383a8a89ad10e756b7a00a";
@@ -28871,8 +29947,8 @@ tl: { # no indentation
   version = "0.65";
 };
 "vlna" = {
-  sha512.run = "320aa1e734120d4434ff05b2560c8d131daeb3a04d8f2ecd4e47e89cbe05e72ad459698cee63c05fe1c7278335774a8e2e4ab6dcf07ce1ac7cc15dc119c6cba0";
-  sha512.doc = "e9b2676f12fba6415749cf72aa0d8c34c328941f722e2a11d2372220dc615acc0b5ffaaff57abb24a8dd0747894990bce912bf8f423519aaf8390b6f03061835";
+  sha512.run = "587e208e48a43698e99e388ee957e2ec201c0b1b0a0d077052cf11ef8b1e6b132bf9330db5b9eb48083b86aa362f0ab654d80d27ebd2690b5ba1ed452b8084fb";
+  sha512.doc = "ca7f3a54872bfaa4b11efeb94a3dbdd2f655b869ae0b1f9a3f5232c40500f4f5550c495007cd081e2069115da1d20ad1759923a7375147d4ca09c3a105dff779";
 };
 "vmargin" = {
   stripPrefix = 0;
@@ -28983,24 +30059,26 @@ tl: { # no indentation
 };
 "wasy" = {
   stripPrefix = 0;
-  sha512.run = "ba62a952ec1beb086cfdad1701780669e253d66163c6dc62d247182920d5fddacd062f3c7f0cec97ff8c3d0572fddef09f0fa30e82db9f6d58ddfedb37a6b0d3";
-  sha512.doc = "1b8f655b1c9a150e6f0d7fbc91dfb7c9158154709b226f04b4a456e1f3961bc65521b70844e736f68be9c66f2b852687f0d50352a6254343c5557177450d3e0c";
+  sha512.run = "4c747ea3cfab820b803f624a32178a1d09cbb5a3c441ee423abc74caeef9217095491c0c490f11d3a6d6adf052b97492e081b2abedce6cc9c61410a8e878f5b8";
+  sha512.doc = "4ee0dba83e3d1e00a1c58bc1c27d1b8e7e1677bfadf1d2653be216618d65fd168eab7aae26a5fe5ffae42c546b3438e2ad15f1a7bbfd58cd7b75cafa78a46205";
   hasRunfiles = true;
+  version = "2.5";
 };
-"wasy2-ps" = {
+"wasy-type1" = {
   stripPrefix = 0;
   deps."wasy" = tl."wasy";
-  sha512.run = "9ef8a52b1a92c162d567999ccaa2e77ca09f190dfb1a25c0073c5a66f97131b7b7ff4c562b473814f2359374e23b0191d1d1d5f45627e3896e75fa3aad19d3bc";
-  sha512.doc = "681f579b96bf6e5cf7f4e0fecf9e259aa60db57879820cc779f46f2065c0177ad0871bb8f0bf1f9409b0eb553611a54af9c9ce9b547ca9be1545022188bf74d5";
+  sha512.run = "d7131c025bd97bdaf62697feb698da97d175783e4b0502d3e85b60a663f46a0520268a6063956afaddc6308ddd21954992bf8d216049cb324133e3760ac20825";
+  sha512.doc = "d9c88d39deabe19393df0b6d83bddd644e347592735cd7511dc70374ea015cd7fdf36ac9f320b44c612c8276eee3d7cd94f9e0b26de050c0771c85ec7dbae53c";
   hasRunfiles = true;
+  version = "001.002";
 };
 "wasysym" = {
   stripPrefix = 0;
-  sha512.run = "9098cb0665f5ebd360a92f44aceb1b8c27c58b174c83a1b60ea837e605428ed2fda95a2b7836f69fbb06380fadc1a210a93ef519acb4bd4d393260472725240e";
-  sha512.doc = "7e7b46e8ff31a827c836d6bc6f8ac49474f23286470018276ebac18c386c4041f817fd9893a1a1f97d1fe1be3100c5f904987ece98b34c5816e347e4f9a1f300";
-  sha512.source = "4049e94ec5ae362178dbefae2f6a1e4718b5cee3fecf3d80b148682f64d2a830c47ca4a3b42c0f423f6f221d8f88fd9a8a2ff009e499a442207c0fdb7434a352";
+  sha512.run = "9f32c1c76ea630989d6e3f3aeef0db154f6677d52177fcf5e28bd049a68bafeef6d3960267029a25ad4ea0ecb13a5a344accc20a7d8f64c20ec304130d1cdb4f";
+  sha512.doc = "7c9f21ce5aa85e2bf766b50806cad76389603072a15d9fd599657eb7e3e58061befa60c8903c9be93b3bb8c6fea71b63c0fe90247654570ddbe289c8509b8f1b";
+  sha512.source = "d90a47d1975947b3709116f88afb85e7f4a2c1803c622d809e39d30465104b27bc3fff60dc578613acd44b54ddaac92b2eaab499320193131bec28734df38c57";
   hasRunfiles = true;
-  version = "2.0";
+  version = "2.4";
 };
 "web" = {
   deps."kpathsea" = tl."kpathsea";
@@ -29021,19 +30099,19 @@ tl: { # no indentation
 };
 "widetable" = {
   stripPrefix = 0;
-  sha512.run = "61aed9af524ce3e19f01676ee0a483737bb4ccdbad8e6465bfa8dc671c24bf07fb7bf88911b344a572bb91e4803ff932297d69e29768f4059cab63522ab0c3be";
-  sha512.doc = "9e24ce0131bbdec42bd92d54784e10f680fb352fdae3516e4419b8b4b1d0e1524d2309765c2c40c0d88829c5847de5a85bd98fc42def5f710f23ba471f2f83ea";
-  sha512.source = "c3de6c0bed48aead332639564f83b98adc4e9f23da15442655d4e09766f3587967c5a7292edca3cf0f4d29cef3cc8daf939f5ec53427ecc171c9b33520a3aeac";
+  sha512.run = "bd6c85eb76b1fdd4b7e81ad24ad7d282b79e4234ec029e48ed63611260b00e8b1c584ac800c45643e466ff6aefbf953246b24c1bc6453098a76b71ba01624821";
+  sha512.doc = "5f254468e606aa188030c95c79672a6fb0211c0b5c4df6c3fde98c43ce1fd89993d495eb750b58395175e2b6bbe3e9771895627a04bdb8839fd4d0a143c1ab69";
+  sha512.source = "31ae40849337a8c6a7872621e55ae2a53b1a7d4d1a7907e18f5aec07f94196636b99c26d46dd8c10e1494a35b86d435a014a229160edbbfccd064306fdf06598";
   hasRunfiles = true;
-  version = "2.0";
+  version = "2.1";
 };
 "widows-and-orphans" = {
   stripPrefix = 0;
-  sha512.run = "45c17dcbf2db08ca84b870c375bbd4e6caf9bbdcb7285c67082a72fb32822164d75520cdfd325b7f285a2936e8c0caf54480695d807fa6005d265d05fb4a51ad";
-  sha512.doc = "d798cfcede09337b299442babd4f77d1035a9e2d356db24bd9537c903b58e82cf191b273297658704847332e0198d8f64bf89aaced529df344a7483307b0bd55";
-  sha512.source = "0583468d3e4712eb666364ce2d3ef487c5c39797ec13408193c3976cd003098931427e30d0458d11186a7e3d11b377b59f8de97983d7c358ab8f27397b409426";
+  sha512.run = "577ed514a734513de7b5ead5efc98fd7ccfa9d2b8022843b9b3d17a5436d15a34430264bd23cae88e2daaaf1408066d194fded3d92f711f715ee40a85b6cbb05";
+  sha512.doc = "7049fb084dca55706a621bbeeef57bebee04e69264c823c84e89cfdd219dfa4ea5b5e5127f2d0e8f9c74fd88db662b926c62e70ac7ee08f689e08d25de5b0bdc";
+  sha512.source = "7e2651ce9f6d6d2acef2f87a773b7d83440936292650997dc19ca3a6774ebb9060e056a8c13174ed5098c0b6d5629d3a0939bc9938b8d687767cd051dd0aaab2";
   hasRunfiles = true;
-  version = "1.0b";
+  version = "1.0c";
 };
 "williams" = {
   stripPrefix = 0;
@@ -29049,18 +30127,18 @@ tl: { # no indentation
 };
 "withargs" = {
   stripPrefix = 0;
-  sha512.run = "6d30bb4adc63ebb1441c9547439757feb93a276fa53b7c203d688954e526602d5fd0916b37ee94cba8fb96db8935c02705ec12fdf2b22b48ce01dbd21f208d43";
-  sha512.doc = "d046bdb103f4fab24f41a730cbe585d9d8bcdf2c47f60bd545619c83a8c200ac82b4a7422423cbec8b0473a86a3f92fa6e91a7a769a580e127857cc647d864b6";
+  sha512.run = "73cc4db53528595f54f31f0d2824f08af54310aaed51b6eb51a5386de3f06dbe6ffeea8c4ab6f1e4ee1d169b5b0082f113ed435eae90b99a9b59df3296a3f4b9";
+  sha512.doc = "050ecd695b269896d1252649978af7cfbafa80e289038ef1054d82296cd83934b0f7ceee274340d54d836021f0da39f05a648dba8bff141eae8f378527bcf865";
   hasRunfiles = true;
-  version = "0.2.0";
+  version = "0.3.1";
 };
 "witharrows" = {
   stripPrefix = 0;
-  sha512.run = "46c4b5f26c3d8ac3e44380b4d70e6364cda313f63c4ff51078abbc09086fc04f0eca21bc2240dcb0f0de88a3f7156c31864673b11954039a758d3daf02cadec9";
-  sha512.doc = "b8692bc22aa753a964380bcbaa61f10daf85cbc7215ee878c2616116711ec8c28d7bb361d12fbb40dc2d177242875135b914f298b966221de1a75dd6ce2068c5";
-  sha512.source = "dfb46c1bac752aa91bea49d8029aa5abc0f5f9c6815f7eaf0e1b70cd992d7dc3c8d182c258e5a8fc6da470326ad760ce0331b83e70f6c066f8ad76b0642834e4";
+  sha512.run = "f1054a2d4be6121e3cd6f74ee6bff8afc71806cd6fc318e7f8e2b10f13e93bdb4268653224341976f847da5597309a3e5a09f202eebbb2e7440a098348f0d4da";
+  sha512.doc = "72aa193dfc4e88f7679f7ecf878d9077bb6c7327a6f4b14783595e9af13301250ba51063debf4e40be8ae05f6d09628a4868a3f98ce20287c66a98493a0302f5";
+  sha512.source = "404f39dacdabf259275ab5f594a6ee20bd16e61b895c2abbace15870ff087253308e7df8f1a258fb995fc8aca2dfd2611eba411971a4b11e44503a406fdddc7d";
   hasRunfiles = true;
-  version = "2.0";
+  version = "2.3";
 };
 "wnri" = {
   stripPrefix = 0;
@@ -29142,25 +30220,25 @@ tl: { # no indentation
 };
 "xbmks" = {
   stripPrefix = 0;
-  sha512.run = "c54e66e79cfb39276ab85c2e431326e071cb920483c00bfaa4dec7a431ea5c563ecf2ca6c5bbe0581f90054b75cc6f0a94d4e401863bc27790e4238a8792e1af";
-  sha512.doc = "95df04009084b9e4cffbc76b3ab6066e57ce6fbe5fcd1bf7f72970d98c0d5337523cd9a361e213365bed5addc8eefc6c01093e75b6010384d870dbb63cd05441";
-  sha512.source = "7d5ff7b0e4807fcb2544051caacdbb477fae6a46d2d9adb0af2843f8ca995f3b14d0890035d64b846c8895b1ff33702d8712a7b984ea911b93b5e4cfd5cf0823";
+  sha512.run = "e17701f9cd79d49467e4dd47ef9a504a8b0fb44b216fbfab0f5547e9215c4dc40f1fa46aabc209ff2221a4a9424221adacc52f6040d3f796d51f2d37dcd4e8c5";
+  sha512.doc = "76d255a036a19d80c826eff4b18643523787c53f9b79e44710e03f9bb8a7648136559727dee246508c1cc6ff332cbc92b8d1c728b4583ae26502ce44538a61db";
+  sha512.source = "4c3a9ade3d3c204db2c2d0e11a55bef0a18cf1e3e4dfa292c3da356ef5ef5aab9ed6021d07f6222f1ec722298c46ee4e4eff02658e76b99bb426e6e289fbc136";
   hasRunfiles = true;
 };
 "xcharter" = {
   stripPrefix = 0;
-  sha512.run = "a6fb6ecb8e423bbd0673b285ccbf274bc727a6b37a4263c53cfa5b79e3cadba5db21b3d7d0c056f7dd9ea66688035d2885e1eb04cf9889f7884358790c631ff1";
-  sha512.doc = "8f287c75e83afcd2cc12098b7bfa3421436b95b77497ecfba9b8a102ad66c089180adb363aed1a72a76a629573c4b351d355a6022f42f49df7ec00ddf6044195";
+  sha512.run = "4e269f15e3b874990151d51845aaa826e6995b886cc9806ff789b82d1bb34bf81f9f1ed6579c7020d2c02c5f02830d0f409e45ef2c1197239748179714398da9";
+  sha512.doc = "7a38a5891ee517d5666771b5cec3cd73cfced263dee1f1ac7eb58ec59377974b5bfcfae45b7359c1b63cc28ef7351c701403d655473edb0326460cce1ba47b5e";
   hasRunfiles = true;
-  version = "1.201";
+  version = "1.205";
 };
 "xcite" = {
   stripPrefix = 0;
-  sha512.run = "f49a3b76fac8d4631cca607c354eef956e77c3cbe4e95a9104118072c5e320983bec9412dcd2400c3034a7e4fa8e463cfa53ef1de1a7c39f0d857a242671c0b5";
-  sha512.doc = "f53c69274392c42c661efa04319999aa43ad7e81f515ac6184325672f4d00d5bf8113aa68f36d4d4c24d9dad393c91c8a6dfe94b95c8edc449642db8cc43f7eb";
-  sha512.source = "6db0c3ab886a2f90dd12e75dc8ad00391e09e8815dbd291b34d1fe9144677ef7b8c4c6bdc964ade6c12bb0dfcc53e2c56fa722ef30c3aa2a303e391e26ce57db";
+  sha512.run = "0412a4f47a044efbd22adbbea9cda1bec44379dbc799ca83821d4650e8e40f6b5de51b80ea6a80d747639a9b840b7cff6612b6e4df0b2c09c0f3ed506d3de714";
+  sha512.doc = "11af105ca5f1610e5cfa226cb191d1f69d257e21439c2408283572e136b183518f58631ec1b0b145a1edf50ca58e9a1eda789e5646c47b46f75a6325c90262f5";
+  sha512.source = "0f6d0e7206b59acd468dbd77ef3358d2865f48e2d59ccae2ec185759c137b9db99bf417acf71ec40cbafbf2569cd9b4a74a97b7a3959f51f1703af9a026486e4";
   hasRunfiles = true;
-  version = "1.0";
+  version = "16383.99998";
 };
 "xcjk2uni" = {
   stripPrefix = 0;
@@ -29241,8 +30319,8 @@ tl: { # no indentation
   version = "1.00";
 };
 "xdvi" = {
-  sha512.run = "9e05dcd35557d4655b8e78c8d8f64db1bd5fd37cea1dfaf163fc8ec2076d09c18f03c9fbf4314effa53048f660f86deb7adcde35b13aa7412d92f941ece0b550";
-  sha512.doc = "17ccc4f97a55f146d6aacd63e2ef3e2411aa221363f0490b484cdc88910ecd0d94bd016db18fdedc78eec4001658f25de736acbae20eaf8f95c9cd576861f015";
+  sha512.run = "0bffcb7e841c0517be816d9daf706e11d0a43973c5b8021133da819b66ce50875ceeaa9bc5c76004daf3640de72cef996364e49d1a9f433c72aca3992450c74b";
+  sha512.doc = "43466996014c40a4e902c2d28af008bf610e2c52cd88acb76f92a3999f6a062a440289b0afb96f1ad29881e280aa8a737ab1936b276e5f39be47fba3a5b80092";
   hasRunfiles = true;
   version = "22.87";
 };
@@ -29262,11 +30340,11 @@ tl: { # no indentation
 };
 "xecjk" = {
   stripPrefix = 0;
-  sha512.run = "cc7e1c47396c7b506d3f49969512bf3ec76ad330147d57c99467e57d5402bc56ceec4d5b56a4892bb6d93f27360851e84f4efa52f4b8b1b069d912d4a585b2d5";
-  sha512.doc = "a72c22f9d40ff9265f23c06d5f30cb8204b0cab5391ed9469be67adf8450a40ab52a9b65bf89dbfcca34e40d17bdadac2beee6aacb1452855044a990a1d8f472";
-  sha512.source = "684f3d76f5418ba4b840f87dfe06f365a90c5c4f141a981c0ede8e6badf98e8ee03a826bf0b41ab1df1aac6094f953696415ae51d1956ea09a59343f0f469b76";
+  sha512.run = "81a7fa804122c3093893f41110ed4fd0c1c43ae381b1070eef4dd4711dea7e6fa6ad7ff8b3dbaa78ef967790d2dafe5983b3fd7aeac4d7868e8c8af3ccf0319e";
+  sha512.doc = "93b16713f9e1d2c0e5ce7dcd0313e5bde13b21c80980b7d0b5447f8a0722e0dee656619a6890296a2f4cf96f386730c260191a7fa665ca4eb93044c60fda7c0d";
+  sha512.source = "35164492b6045f6bcad0ec712825fec02b22dbf172755e0e4f0e6c16264113f87f78941885d7c0a80c70976e6c29ea20ba400273a38d580a916e6a31359bb0e7";
   hasRunfiles = true;
-  version = "3.7.4";
+  version = "3.8.2";
 };
 "xecolor" = {
   stripPrefix = 0;
@@ -29281,6 +30359,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.2";
 };
+"xecyrmongolian" = {
+  stripPrefix = 0;
+  sha512.run = "2faeeadc81ca7f6fba45b6b237fb604a6eb6e8888117f759f6d369ed354b20b35dd007eb11c017e4f0ebcfa99627f519b291eecd1b41505d7f4ecbfc23307784";
+  sha512.doc = "11b9d4a92c6df44dfc629c7385b56463dcb13564e819cf1bde005e228040a9f675cfb5818ca9f5c5d59a3db7a0d42a5584d9a3a530d772ba2b4bf3145534bc0c";
+  sha512.source = "57a31504636eb9ebe717b6eb9028d5ed0eacdc7b9d406ac3822539a9e40ed0718668a640d557677b1a48920b272f3374817d8182b9db04a8329d2ee20227d801";
+  hasRunfiles = true;
+  version = "1.0";
+};
 "xeindex" = {
   stripPrefix = 0;
   sha512.run = "bc3f399973bd8be5b83ea6da2c39d80de8f39ac6cf2d82d689c81816cad334310081f44fb4e256e442fc47ed6640c2b8ebd185e431f0d0ddec5f75f7b535283f";
@@ -29288,6 +30374,19 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.3";
 };
+"xelatex-dev" = {
+  deps."xetex" = tl."xetex";
+  deps."cm" = tl."cm";
+  deps."hyphen-base" = tl."hyphen-base";
+  deps."tex-ini-files" = tl."tex-ini-files";
+  deps."unicode-data" = tl."unicode-data";
+  deps."babel" = tl."babel";
+  deps."l3kernel" = tl."l3kernel";
+  deps."latex-base-dev" = tl."latex-base-dev";
+  deps."latex-fonts" = tl."latex-fonts";
+  deps."lm" = tl."lm";
+  sha512.run = "0a8a8953a7180db0e5181a00660cb0d20b256ee044691209e13439c1f1eed3e654f43273999c42d28e4a94e844fac8a2c21b44cd4c14a2772941f030bc998366";
+};
 "xellipsis" = {
   stripPrefix = 0;
   sha512.run = "3bff74473b4e7fdc7a349fd54e7703b77282381d9ff5eac233d5eb7cefe98f4abc5ea4fd309b8693bd7245471c565545e0ab437a5f8e5cc1b89368c914078d54";
@@ -29298,11 +30397,11 @@ tl: { # no indentation
 };
 "xepersian" = {
   stripPrefix = 0;
-  sha512.run = "dbfc141ebfe828e6d2f331cb8841f712ac3577558c028df9af819a240791c35e157f9c03dfc3cf4a6b654411485ba14afee97a0d45d2393e5067b2fe3ae556f7";
-  sha512.doc = "ae6c252024b947c9d4cb1192ca61e55aac9bac10c0c737a29794cca2d291f90d6cc56c8e52bb338b2f6f0d27d2bb335adff38d0d792aab8a6d76e1ff11344611";
-  sha512.source = "6f1fe402b7af2531d6a04ad291752058391c3f437dc3c6bf2256ebbf570bce64e6c341b369ac6d5fe024d7eb28fb31592bc2571699c651e0096b3d70a13ee6b3";
+  sha512.run = "50b382f9b542a3874aa5ff162e458fc7443dbf601a31cb278d3cbd4f811baa45686ccdb83ea6e190ace009e3e055bf22828ec82804b6630abd95e1f3138353f3";
+  sha512.doc = "fe777722885de8352f26eb3b755d8f02155ba875fd1b9ddd230c13d4a0f2287b3c9f2261f0f2cc003554cced4120f81b9478b75ae3abee369a6a421c6e8a811c";
+  sha512.source = "3914efe8c8fa627a0b53ed4da3ccba7774d7b9c2847320fcd8096a52b271b9640d80e44be64fce95f1ae3b0ea55a40fcb6bb4669a2255722ba1d9be972c5d86f";
   hasRunfiles = true;
-  version = "22.7";
+  version = "22.8";
 };
 "xesearch" = {
   stripPrefix = 0;
@@ -29330,10 +30429,11 @@ tl: { # no indentation
   deps."etex" = tl."etex";
   deps."plain" = tl."plain";
   deps."babel" = tl."babel";
+  deps."l3kernel" = tl."l3kernel";
   deps."latex-fonts" = tl."latex-fonts";
-  deps."latex-base-dev" = tl."latex-base-dev";
-  sha512.run = "3f50f001bb1388e14112ead5c47f0e22a271e91a33e73c40f5f0fb43230494a7494d868094827d0c316e76c9cbd76c5b8b53b76ea267d24118c5146fab42f70a";
-  sha512.doc = "63b2f8b1c0cc906053098c2fd5f2dfbffaecb5cf1f37ed8334b30b2cd035ff5ef12d88cb46de2c0c5ac23becdac41319325e1d56507d21c9783736f3b0601f60";
+  deps."lm" = tl."lm";
+  sha512.run = "eca249be676ec6a4b25c9ac5ae60e0a29f460571f7735896ca141a944135782ce8635ed05fad0f01e558c22909dfa14740adfaf79680a2304fd6f07c82303310";
+  sha512.doc = "2d578801da1669e7ea36599d821e60bee4631c3a1bb44792ea5cc266f5788c05a0e93469374a19c4c7c2eff866d922438df5c5c2a4935570208f05327a45f56a";
   hasRunfiles = true;
 };
 "xetex-devanagari" = {
@@ -29376,15 +30476,15 @@ tl: { # no indentation
 };
 "xetexko" = {
   stripPrefix = 0;
-  sha512.run = "20c52e861ec9f38df4a7ca0402ca6817e80ee3788f40fdf9ac24c61aca3d38b02d6f6d3cca1c8c547088c1ba9a6b55b5b5a75be5dc98e707b33cb2ed900f968a";
-  sha512.doc = "820c0de971caf668a9fbe01613a0b82ae1620e3199593a29bf2e7992607a27052083b33c1359019c8f026b4295bebf01ddcf840ab8f4eb3ac5878bff97b8e578";
+  sha512.run = "96d6e74e10d39f2ab84c98a53b42800154183f4e80242f88209a0afec6734306c8a454cda44b5f171ee96229e1bcc06d2f35d57f2586ee53b403e6828d0213ea";
+  sha512.doc = "433f09555146f3de3c1d7bbdfc51ee2cb05803f9cf3d1a69d34d049d30e183ffd302273aea52b868e3dba08e64459b2d6bddc6d15284812b119d6a3b07f40dac";
   hasRunfiles = true;
-  version = "2.21";
+  version = "2.23";
 };
 "xetexref" = {
   stripPrefix = 0;
-  sha512.run = "d7c7d2a404de1fd609f172dc0f8173cfb6a255a220700cb4d8659002e2793a01e43caa7bb483fa343a85a84ba545edd7e7c985b92045855285f1704eafb20df1";
-  sha512.doc = "818383480f2e20d7e00a8ad77423e9326cdd130ec1d1dba0dcb536fd13e7e287b4e8a67460eb510ed786b3d1e7f65f92c1627cdec94860ba0622ee2b92c91974";
+  sha512.run = "926ebf995dea04300dee8cc061361f7eac8efe08ffd3ada87be5b682e2c581d3c2965328ec7c93deab8d6bb9311a0cb27ff1a14a7332c407be713657a136959a";
+  sha512.doc = "ad0700f1e1053abd8264f20ad04b7ade28cca6f5757e158f8ed031f493a966f5b62a197a34ba39ece7c3cb68d469334521a6325c2b4276dbfbc5c2519e13b33e";
 };
 "xevlna" = {
   stripPrefix = 0;
@@ -29395,10 +30495,10 @@ tl: { # no indentation
 };
 "xfakebold" = {
   stripPrefix = 0;
-  sha512.run = "d25ed6743f9fa372d6403c39c7f8f0bbd772a3e915565f9b610d35053c2387338e19a7edf1f2e813cf808899cf59deeaa54e6ca9b4aacc767c28fff069993f16";
-  sha512.doc = "6cbf7313a17b16c2779b652a7a1a1891e801fface6da4d864aa2a1fd8303a80be493bdc6cea9cb753f8784359a7214b514335d70ada90e5563d8017371153dc1";
+  sha512.run = "ba8d90525556025c1387f7c82d3bfd6e43be1c82c5b508d611c385cfab3f6b728499b2bb9cf98e65fe8f3ed3266da402fdacf454b367eb95e685ecc9591166c1";
+  sha512.doc = "c5d63984f0f2b9996ae5be08e3e43268a375c38e96965c5525fd95c9fdd167306ddf0801e7e233d2ad52dbd7a48e82bee9e822f22e68fcce180445a693fa3687";
   hasRunfiles = true;
-  version = "0.05";
+  version = "0.06";
 };
 "xfor" = {
   stripPrefix = 0;
@@ -29441,10 +30541,10 @@ tl: { # no indentation
   sha512.doc = "50322d89f494d07793d964fe515b8a0bacb74bd5706a6da80f6860771a8e3cad35c7d06bf398217a7e4364594d54f4dc490f39980194804a04460047ff5083f8";
 };
 "xindex" = {
-  sha512.run = "7e05824e42feee686c76fe1c29b3019feccd83f7d69bbbcabc835bcb94e69838d0d94c8c50d4871264bd930d0a2fbaeb6b84a26e3031bf3cc8d551698be1bc55";
-  sha512.doc = "f26541bde9d1d3440cd9d72d1e24b1d81eac37832e41cd99643449222185e214453e11f5076ee6eb2ce5d87ddd96364767dd5299191147352b1be2497d158d3f";
+  sha512.run = "fe62e02612bcd19a90bca6b94380c6c0b50acc381d47f60c81e142afbd6173adec8dda97e2f16c28a8ad101d8f080644d456768987ca5f8a7b30e03b3e30ee59";
+  sha512.doc = "07b1cc0ad37d8893bd50aceff18052642af52eb46f4e72320bdf093dcdcc7282019f3fccfc1e6df13a8bcd0f6d0a4cf41eb47d6f84a1ee3c6d1b0a8a1e150df0";
   hasRunfiles = true;
-  version = "0.16";
+  version = "0.20";
 };
 "xindy" = {
   sha512.run = "b9127f03d8917543f0b1caaa24344aef0356818d7414e390ad45d5de3420271a81509ded3636c3475b577d6781be6e24c94f3d444f6190bed9039dd720274787";
@@ -29454,11 +30554,11 @@ tl: { # no indentation
 };
 "xint" = {
   stripPrefix = 0;
-  sha512.run = "ec3264d51164642c9054b98026b7da7e06b0a42dbca8736315535326e3d478ca8fa09eabb62c4ad7bf8be374897efd0331b2371df22260220b65929ee952f852";
-  sha512.doc = "30823666c424eb695dd1371d6f14e5c0ac84c0c1825939b8c1bcc0f32ce8329496276263358cad91f615a934f82f1fb30f4c04cbaffd107fd145b648dcc45b3b";
-  sha512.source = "f2c10492bb960b84c293a6970a8a8c6fd7699d73ec023b963aaea075b62e072377aaef5750c94b55ef747046a3f3683930607df2a334674a2063773141a1dc61";
+  sha512.run = "971cfdfbb31d58d10732e06cae28a9de1761cca37191af07780c5603274057b3a2f1dfa57522583be7302f46e3f0c0eaafd27aac3cba42d7c3f710a115448ac1";
+  sha512.doc = "dd9baeeac6751b817cd6ddafc6142c220ebad4daf82f237f84f0535aa1412afb2e43504a076366e37221872ab582e6f4f9787bb759f40ebfd6e9b19badf7f1b9";
+  sha512.source = "4c30ebd2cecd9350c631ad3af6fc5b71674461e24dbcdb21d2556e4b80dab25752d5d80905a2a9631e51b06b65717411df25bbe250dc552b245f9f714768dc44";
   hasRunfiles = true;
-  version = "1.3f";
+  version = "1.4b";
 };
 "xits" = {
   stripPrefix = 0;
@@ -29467,6 +30567,13 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.301";
 };
+"xkcdcolors" = {
+  stripPrefix = 0;
+  sha512.run = "78e9d390e64c5f35a35f25475aab9fd4308cae2c495cd8181980799819a374f7460bf41f246d91ac297b96f804f3327e6b09e84b255b362b1f285873ddd5b107";
+  sha512.doc = "dba85b139b2146562acb51b64c8b0c7e4aef799e4bf25e131896c6143afd29d0279cd130db711d34fca06597792eef7f92be4ca10d34eb27f3da11a65b8713b0";
+  hasRunfiles = true;
+  version = "1.0.1";
+};
 "xkeyval" = {
   stripPrefix = 0;
   sha512.run = "5d49a32326057d18ebb2bf25d29e06362c23d9a2f9df5058457fd84c9faebb545316c502a7baa19073abdd661e9497255cbcb938684dd006b0c10ba7c957c627";
@@ -29506,13 +30613,13 @@ tl: { # no indentation
   deps."xmltexconfig" = tl."xmltexconfig";
   deps."babel" = tl."babel";
   deps."cm" = tl."cm";
-  deps."dehyph" = tl."dehyph";
   deps."hyphen-base" = tl."hyphen-base";
   deps."latex-fonts" = tl."latex-fonts";
+  deps."dehyph" = tl."dehyph";
   deps."latexconfig" = tl."latexconfig";
   deps."tex-ini-files" = tl."tex-ini-files";
-  sha512.run = "ff49080eda4d8f0133fd1f0b2a9be88d3017dea9faf6e2b4397b82c38424289e81b23fee7b3489b43a3741eb3218afba2c76749a2aacbc163f6891e04975ba02";
-  sha512.doc = "7c80b6fed3eb28735f19071d7fe0a61672355f6a2d2111c9f8eb8766387762b6d2cb343a5e0b601b6adde1c362c7407c9d1206e4fcc4457d5f4ca66f52d4ba3f";
+  sha512.run = "fc226772fb6487c102419e478e5944aa3e222f2cd5b00e892bf4902ee781795f2e8c8aedcdb40aaed473d65452742d6939b244b4c7852966323a22b375a66019";
+  sha512.doc = "000e0915906b85080455b68898dd76e0049bc27ed41dd01b39ce6566ac8a0f1c79e7373a003079c28a87d97ade76365cc88657f86fb85e4136ebdef9f7983f77";
   hasRunfiles = true;
   version = "0.8";
 };
@@ -29551,6 +30658,11 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "0.2";
 };
+"xpdfopen" = {
+  sha512.run = "4bc35a5699e39b12f6f38b48ed7e136e9c5c54cbcad71119d7ffcb0688df9739187b4e0042782a2678233b289902b24c6537ba10303ff26846bfe73b98c9f54e";
+  sha512.doc = "8dae12489e11fdc9e5e2aec22a4c70e8f8d15708b907404dde849b915515fe1f3d0771762f3a18112c8e2760e30bd1605d208b4315753ab37f738646e90c6f32";
+  version = "0.86";
+};
 "xpeek" = {
   stripPrefix = 0;
   sha512.run = "dc1dd0534645be0754551b2d3bc146c7e7663f7cc9f2daf40b13a383e13883d25ba46f320317d4e9f251594dccf3a880f5e123683f302638eb3b37018b369ce4";
@@ -29607,18 +30719,18 @@ tl: { # no indentation
 };
 "xsavebox" = {
   stripPrefix = 0;
-  sha512.run = "bd4ecfee707499f13bdeaf278c5ff67807087fdc8da3c38d135e7c0fe1a4b5482751ffece77c89c4efaf1371a08962f0d470df4998863dcf0c69219f7712adc3";
-  sha512.doc = "6e0db4e18ea4a4bf7b4fe7158b226e20c7e2f348f727f9918ba739d9fb5daf7489bdd78c237b44575123cfbcca46eb38de50c5e0f7a5c7c1d40db6cf1bc6fd4c";
-  sha512.source = "b842a4a5655c01b35557b99b136fbffb1f1ecf68157944c8b21e112aef0b59dd63db549fdde78d20dcd2b15b435c521a3a851d231795d4de02baab508744d825";
+  sha512.run = "c6d04ba20e6218c39271dff28864fdd4063f0cae3f07fb5fe9452e27588873364d777815e9a08d0ca8324a1d92d693a91895ef66939e374cde0bb2722a6be3f3";
+  sha512.doc = "ef5f40ad12ec9f7c957a8329d396677667c1bb6288769259a5763e68f34e71b7473435ebc44dc7c8a6b9696a5f29d5f66cc2a070628b11ee585c7ee5ef955e74";
+  sha512.source = "a49c6d3f638335dd1e0f6a8064712c2970e7efaa0973cce4c46b6b05829f77186a88d077fe296fa0eea2529aec440efd67bc2f9283544a70fae6cd25c5877468";
   hasRunfiles = true;
-  version = "0.14";
+  version = "0.15";
 };
 "xsim" = {
   stripPrefix = 0;
-  sha512.run = "4cacf876c020262540a136554d065844a428ec754c03f2ca2784eb9e0b7815c3fef01d6ccee44e789a5115a1d563317cef3c3d80bd8b1306d9a441cf6b049581";
-  sha512.doc = "842a1fe4af1c6689be3f647d464a521a42277bac34829a483312e188656c6366493cc0e0fbb1769552a9cc8ea50ceb2c6f17adee97b264e67593ed4a71307f53";
+  sha512.run = "e3ccb054ca87583ff2dd5e624f0ca55cae742f53784fca9121e9e51d9cbb6c8af6b577fd5fd6b865924ddd63a4e4b1517f824907b0f0748a4f8963b671964055";
+  sha512.doc = "d85ad02e7bee8f08b28fc903c6178fddba89baaa3bb82dffd58396fea29bc6bbe68cd51621a0c422a0e7097f1536d6e995d86b8ed78fc15a261ec828352e1fb2";
   hasRunfiles = true;
-  version = "0.14";
+  version = "0.18";
 };
 "xskak" = {
   stripPrefix = 0;
@@ -29660,10 +30772,10 @@ tl: { # no indentation
 };
 "xurl" = {
   stripPrefix = 0;
-  sha512.run = "aa1a45825336ed3d62aec9671c53269c3e7e506092fc62e79075ef5bfe483003c513e402e09595ecc9a2f77f637665bbeff89948b1b6c30bcde2022bb110b1f7";
-  sha512.doc = "e69e6008e98bd6de089745223e9ad9690ab29069ff5e6a7ada1bdadba24fac2e16d703ce7534c8403ba4c1a9f84fb53477a1eded5e9522f8f15f17dde463726a";
+  sha512.run = "c034606febfdf397774f51f5057fb12243e5fbcd6ff8c9aa1fe60fa2643b5cdfe6c36558e5a4398e7c38c0da520ffeb53a930fda983b79c9d41fb31b74d6ad25";
+  sha512.doc = "6c8833dcbec24d6b336b6dff58558ce4c38de22032f24d7510db85e987c83b2cd2089bc1a5b414ac82987bd8387dadf3456f0ca3885607285834688fafd29175";
   hasRunfiles = true;
-  version = "0.07";
+  version = "0.09";
 };
 "xwatermark" = {
   stripPrefix = 0;
@@ -29920,6 +31032,14 @@ tl: { # no indentation
   hasRunfiles = true;
   version = "1.0";
 };
+"zref" = {
+  stripPrefix = 0;
+  sha512.run = "a4c944f78f4dd08e093a7b422983114fe335251f25fc9b9d2f64e08e725a05ab986729bc9b8a8eb7af5b6acf7490220fb5fe3ec7bf662583e1ddac09241291ec";
+  sha512.doc = "4166217c06abecef648706304e3ed02cd43c29317d918fe3fc60873e0b12d074e5a4304d57496b8ab7f902d4eeb848c38e068eeeddba559b0fb5ec88e1f316db";
+  sha512.source = "6baa0269f28d6c6bfb3e2853620bc584da225c9ed6e8ab4e22747075c6af245bd3e56b686524261799257d83fbfccb224a4b5a3f6265d340c5d007a98f8e5702";
+  hasRunfiles = true;
+  version = "2.28";
+};
 "zwgetfdate" = {
   stripPrefix = 0;
   sha512.run = "fe52555cc46a9e8340d8c9c37f88b372bf72efbd48a097b2d319592dc49a8cf55c87e80ea7d94ba6730742e9883215703749895008ba38838750efb9fb2334e9";
@@ -29928,8 +31048,8 @@ tl: { # no indentation
 };
 "zwpagelayout" = {
   stripPrefix = 0;
-  sha512.run = "f050edb743cb045547080925153ac16317f7f78205eedbc37b9db39704b84db376c9362cefcd6711d8c98d46af4d2baa82fe4c3be581d1e9c33689b702679d14";
-  sha512.doc = "6f2a0c3e646f442e570ce576cf638a6a290b0bf0f120b19a27c1f190fb3d20d0d3dcd2a2e3490e9671846338b9d6890884f54296a31593993be9bfd06a7241fb";
+  sha512.run = "b960d63e610cf28ff74d7ade9c297d1c6d23a801eaea2b4f9fde71a3b77defe43ea5625c098ded915b8c011cc0041177d3e4c3fb28359b522af63214accd362f";
+  sha512.doc = "16bf8b249fbc857bfef787862b1d8e0e0ff60d11e2b80377ad85d7db014ece77ecdbca91829b4dd8f92c811712be39e9ba30058b8c7e61805552f7f6b13fc817";
   hasRunfiles = true;
   version = "1.4d";
 };
@@ -29942,16 +31062,16 @@ tl: { # no indentation
 };
 "zxjafont" = {
   stripPrefix = 0;
-  sha512.run = "8d56b2f09b2f96a303a8338252a078c5856703d466ba23d2f8a96f93c002ea3f30c072398f47bf9c38aa94b08f93a9b3aef44799b61c117df9a9cbfadf60c2a9";
-  sha512.doc = "f6a332e3db7db28041cf0815122ec1134276b12c042fc2b1defb214ef6946598c9149e717309fde2c28b50cac545cbb2d0077890adffb8d3ec0371dfd876f66e";
+  sha512.run = "bb6047e07b1d3c326cdee875809053b90b7e753078ae1e6c0b3cad19cb645e7e46321b07509f86b8d8dc2eb331be8e50588a2f9c926afd413aed20c99f4f6a40";
+  sha512.doc = "c1cc759857b60c123ae798e1a9168f85e7fa663b875f241a8d5160b14cf366bcc282d09b9e527469986ee268b160cadc89a906facf8f38bd76ffb9d07e0a7ffa";
   hasRunfiles = true;
-  version = "0.5";
+  version = "1.2";
 };
 "zxjatype" = {
   stripPrefix = 0;
-  sha512.run = "fcc4c18b6a9ed31d4d32280aa088be06f6109deab53ce9e1820bc743151c1209e24d8c26bddaabd76f774be95de7599b087ef92415191fbf79a938169b9181fb";
-  sha512.doc = "e971a21c677f93e1caad2951fe05296f5ae253d6d31d32e160f8606492b7c21f9995e9a1ec3ac5581cf1fb52c4174acec35cdf871644bb74d5b50cef421d78cd";
+  sha512.run = "21eaace7188c9e61f5dd65f34e26b1ca16358e7396d44188ae17e8e01a58f38ac3be9f09f8f41923c257d089210d1fb7d841eada5c9a345cec42b934d257ef94";
+  sha512.doc = "0fccc73af66a05231cf8283920d65717600be4673329ed1f46b93a494d766aa9542deb1a56b5d23d6c0d6b93be98aa778234ddc2dcd9c0936542a45d057b6dc2";
   hasRunfiles = true;
-  version = "0.6c";
+  version = "0.7";
 };
 }

From 9c4212cb9f9e5b5129e1c181b16993862b21a91b Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 12 Mar 2020 17:58:07 -0400
Subject: [PATCH 3173/4636] texlive/pkgs.nix: add revision

---
 pkgs/tools/typesetting/tex/texlive/pkgs.nix   | 3775 +++++++++++++++++
 pkgs/tools/typesetting/tex/texlive/tl2nix.sed |    3 +
 2 files changed, 3778 insertions(+)

diff --git a/pkgs/tools/typesetting/tex/texlive/pkgs.nix b/pkgs/tools/typesetting/tex/texlive/pkgs.nix
index 64f24ffa0567..67dd438a9fb7 100644
--- a/pkgs/tools/typesetting/tex/texlive/pkgs.nix
+++ b/pkgs/tools/typesetting/tex/texlive/pkgs.nix
@@ -1,5 +1,6 @@
 tl: { # no indentation
 "12many" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "57a177b65450718631f36bfd8db0f2d1bff788f3bf147137b6412714cc945c7e08832f14f9e7e659adf7e072a91f13a2ea27fe3161cd9b60313bc956f1f543c6";
   sha512.doc = "9ce7fdae151a116ef6b22943bcbd1e94b90862baa5d50f54a00105d1f2d623f75a2e1440c3c49c560e2e6c5baddb8a6772753f400165b63a90a84f540e3fa381";
@@ -8,6 +9,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "2up" = {
+  revision = 41578;
   stripPrefix = 0;
   sha512.run = "b7844f246ef486d68babff92f2f648ef6b2eab28dbf8d22f649b2c9c26fc857b05f475e766a0c9b4c4cb5be1224afc690c22d19865e9efb9f4e75a8ff6d9dda8";
   sha512.doc = "c8569e5cec43525d6814816f7fdaa6bc9ce0ea810fd6be60da992c251fcfaaf4c5229a1956c1fc3e6675ea5dfb4529267acc5f198053a80902b69b25a1464b75";
@@ -15,6 +17,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "Asana-Math" = {
+  revision = 50999;
   stripPrefix = 0;
   sha512.run = "e1ee08540790685aab85c8acb407526f5936478c37d86b266728fdf39bb906bc7f6566bf5eae90b631eb59f59d65d414943a6faab922681199af76102078ed4f";
   sha512.doc = "69a6615dda5f7e47fdff1b0b1afc4211f749a929b81f19a554246033e6f5f4a482c3c03a6903b64d83c4daeccb70983dacb35467047a467314637e65a19c917c";
@@ -22,6 +25,7 @@ tl: { # no indentation
   version = "000.958";
 };
 "ESIEEcv" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "79fe8175d0adf25ebf30421eca323f9042bc98792290763b06ba53978bf4962dabab228b9aa6220f859f64356eabd2cc94e71351aac441e64afa3fca8f73f742";
   sha512.doc = "85d731182d5284da69254744a7d9e23326f5344a6585ae95410671cd5721961958480fab4b621d58fe01ff9bf0a602b3f94089dafaf5614fc8d57ad243e9b223";
@@ -29,6 +33,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "GS1" = {
+  revision = 44822;
   stripPrefix = 0;
   sha512.run = "c71acefcb0ff1cd97792c27435e7eb4f4e32f072a275e5eb7dd13d7b9928ca00318d0acdf605f35cc4a3d7099247c290155d6963ac1560f4b11f37a123fde0b6";
   sha512.doc = "6e714b1087d228923f38dc3c8680e57de314eab79ab15f0aa247ad002a3aa6a9dac2a253c5688c904408c8d14dadbe307b3d3446b38db767a650989d5ed9e878";
@@ -37,6 +42,7 @@ tl: { # no indentation
   version = "22";
 };
 "HA-prosper" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "330df0a8d9b7b7ed5e4d2b74c626576ca8ac852cc84f9c79296141b14892819869cbd0e7f68050b4f3e5d107c43f9939ec9c9248c19ddd20da8d16ee2c25104e";
   sha512.doc = "55822b9703d44481ae62dcb690adaba29cee5432b5b8b9f549884f55e943b1575064419712745166a6c0fd0fdfadac60473c6642816e1efac92c8e27c2cca76c";
@@ -45,6 +51,7 @@ tl: { # no indentation
   version = "4.21";
 };
 "IEEEconf" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "bd35025cabe78886f78333cb4ff186d0363480ea0c1f825456e9b6debc08c0a2dbfc7c703fc9caebaf2a20c47925141cb090d50146f054a76e1aecd861408517";
   sha512.doc = "0316a52d380555afb04358cadd56e6fabe23293bd3b6dd0f0d4e4df9db75e26708dfc7df4c280a8a9759e4c8518050805f197357b2efa43664a984f56dfabb05";
@@ -53,6 +60,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "IEEEtran" = {
+  revision = 51065;
   stripPrefix = 0;
   sha512.run = "7db183824e4a62a9f90046d62d33940573a25d2ebe72de0d57a68340e82e2b4b21fe74e74608cc73fe53b0d889019884aec8e1b11060849a38107280e0fce2f1";
   sha512.doc = "0fab8351fce31d36fc1cee91feea7d09e1acd78d80b0500d8c3fc7f3ce322055b952423e7f39d09f86e99b22aa24405ff5a0f00207f88a3cae8cf39593e9b326";
@@ -60,12 +68,14 @@ tl: { # no indentation
   version = "1.8b";
 };
 "MemoirChapStyles" = {
+  revision = 25918;
   stripPrefix = 0;
   sha512.run = "83455766eb557edebad28b73c5decb0a7a23f097bdfb795cad9cc0847af916ab012fd044a63dc9893932ce0f161e831a2a8e7c0138a2157e0f1f4f2211667c16";
   sha512.doc = "32b171486838a762b2cd49af46d3f2a152e9d592735a15a407784cde02e5be9281798302eb094f0c045f895a8f6e86464e9c214bd06f9061c313807ec36cbb1f";
   version = "1.7e";
 };
 "SIstyle" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "9473f7ef772f10ae4b70ea9d3074cbf7220ab1672076064aae9e54cf72d5007fa7e7f73c66082c53098c772a43d88af3ca1073e875c31c2821e528f8da836fd2";
   sha512.doc = "553357a037de0494641969db5a434a77984224f7fee3f64a2e153304eed6ae38548a1cf0330bb5e6cfc4f4dfdc21ceb8cd2b0659b0e27aa79a7379a82441451f";
@@ -74,6 +84,7 @@ tl: { # no indentation
   version = "2.3a";
 };
 "SIunits" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b804d61bcdcc9d6f4559a05d8bfa7d8f7a3c378a618e5cd068b29e2661968b7564c36ce2e3d97f7fc7af15c11e89ac61e88ff25318d8c08536181d1f546f260d";
   sha512.doc = "09c35a6d2e2d90701ac099eaf06116d4bf5b93652c512969dfe2afae74c9c04d70dcda8a5053d707aed0724fba0a8d9c3487a51fc617fd1a757c596a99b974dc";
@@ -82,6 +93,7 @@ tl: { # no indentation
   version = "1.36";
 };
 "Tabbing" = {
+  revision = 17022;
   stripPrefix = 0;
   sha512.run = "10d3c274c5838c48bd47f651bfc57aeded8246787e23091307dcabf2794fc9eec19bc3a3af9ae08b812688ebc4fffd295fb01c7be7d61fcd06ccb46ce4f6b739";
   sha512.doc = "1f4eb22039e3bae3897502fe541e595c802fffa94d2cdefed451cf24883e1f41d29e9ea0065d1d68ddee3e166aaa1ba7896dd84bf612e9c007ecc5c1e2d5f616";
@@ -89,12 +101,14 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "Type1fonts" = {
+  revision = 19603;
   stripPrefix = 0;
   sha512.run = "858836fc8a955b87f823c25b22fbb4b07f119186ab437e0e7ef7d387bb8295b8a65deb237c649d93afe7d72213745d4cfbe48a51372c69c12d088f5403f22dc3";
   sha512.doc = "5448b85539d29ace8365bd0e197693c0c4c53a145d5182c3f125e11cb3ca8194675ca9553ad53bf7e503b1636f17614ea2e338113f61474d9744dfa91800390e";
   version = "2.14";
 };
 "a0poster" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "95c13cc0fc3e4c8b76e02aef0622af10a420b9b536807effad3fa99822ebe1babdc7219536178a349aeb671f3bbdcf9e339ddcfa73c7afc71dafc2b2d7486996";
   sha512.doc = "d17f3a87682008d8110bb5562aefee406d84b15e3678e165cc3f50e0280aad0736ff0b9b9847d9dc47cf08d3db9a28be71b76f9a5c61c8f3dad0aac187b23434";
@@ -102,18 +116,21 @@ tl: { # no indentation
   version = "1.22b";
 };
 "a2ping" = {
+  revision = 52964;
   sha512.run = "4008c18f93a7d378c8da20bad7c1fdf19c3e6befccdcc804326168854fcd35bb89fe414b30a26dbddeaf81a11c0d404bf5b5459bd3d8adce49dc30279e3bd420";
   sha512.doc = "7a7b6474819b2715c131485472963b463163378d4ae4ac586f17a130b3327c6dda1f4132f4f2379388a8a493fb2374abfff6b7ad87513cbe9d04993572692aeb";
   hasRunfiles = true;
   version = "2.84p";
 };
 "a4wide" = {
+  revision = 20943;
   stripPrefix = 0;
   sha512.run = "e0f1f95bf660760683d6c5a917d75e537a0347837eb4388eded8194c6ca5371b2ad9be9829fcaaff1e24b7d8baefd287db6add752c19a57a6cf0737017e311e3";
   sha512.doc = "bf059462ec7e28ba782d5842d090c93f4e911bdf44eb3d4f184a7324b454105295460a52414ffcb9fc71dceeba902b1d78ba208d0998f71727ad41299eb1138f";
   hasRunfiles = true;
 };
 "a5comb" = {
+  revision = 17020;
   stripPrefix = 0;
   sha512.run = "443548964eb48ec458942e97f0d6ceb698050a5d4dc83ad17a71db0f1d5085a2c8e73c3e8d9bdbb7ab7e6328d12e42a6ec05c4c7dd4247717f295fcd5da66423";
   sha512.doc = "ee845d8b6a21271d2f0e4e6fd24c79a1235d24ba15cc2d037eb41761b05ad3e69dcb5379c223c07b81c62df5f89190c84ff977390e149566710ce7175e4c2823";
@@ -121,11 +138,13 @@ tl: { # no indentation
   version = "4";
 };
 "aaai-named" = {
+  revision = 52470;
   stripPrefix = 0;
   sha512.run = "bb851e6bb3d9c2efd8d9abd32056d0853e320ee7f495b3c595d6a112d5e66bdbcb24107f741249fdfde350dead6763484cc412d380188d29155649b4076c4e77";
   hasRunfiles = true;
 };
 "aastex" = {
+  revision = 51836;
   stripPrefix = 0;
   sha512.run = "387de695ddcca83c294a39846bad1cac883382f82ce1cf1eb481c12de181c062c3a451da084b42937d7f9bd86e9102acd4fac4b2f7323affbb33bedd558f6df8";
   sha512.doc = "8cf0ea4b6a71568d7cfa4b6f5470a7a326fddad84ea342834bccea8c3301d52debe835617fa5930414291a977104236fe8483f59913a15ac282c51841fd061fe";
@@ -133,12 +152,14 @@ tl: { # no indentation
   version = "6.3";
 };
 "abbr" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "4b5d504cc9438ceb97a6935e66a6eaeb494eb76eb313bed275b1f1a829690569972feec048132e12b5849f398d0a4b291bc5f9ce8462031846ec46bc88ebab3c";
   sha512.doc = "7080dea132581fdb0803b4ecfdcf4fd5ed5a689bd7e0c7b7b699ef5b3faeab908042f1704cb553ce38e7f37d9facf7d22a74ac71e2cbd269298f35666367f41a";
   hasRunfiles = true;
 };
 "abc" = {
+  revision = 41157;
   stripPrefix = 0;
   sha512.run = "8b1ccd152ed2ad90810551a36f0fa7f114625784fa967f70b67559f9f1e8eb32d7edd08efc9e55dd92723df4039d1bdcc212200d712e99f27de84a153c2a3777";
   sha512.doc = "5f127f8e1ec104b40ac4d5e9bb22965e9376033892362073cdea9f65f1f10a4152f237b4f27bf52dbbe1389f59d3da673434c39a2b3f43d6f17aa60caabd5584";
@@ -147,12 +168,14 @@ tl: { # no indentation
   version = "2.0b";
 };
 "abnt" = {
+  revision = 53128;
   stripPrefix = 0;
   sha512.run = "eb5b8d75b345c14fecaef598947fe5a6a13c03cd58d77be91bf8155eed0192417358c33cd9e94e236992be9aa13fea9cddfc8c3d80f8640ad59b6feb58b3a435";
   sha512.doc = "23315ea3d16bed57c979dd6e820a83243ed660d91855bbc58db77b787043410237f579e79f3ad011f418cca5b9afc1eaf5358147ff89d6d157f7608b3c1e6234";
   hasRunfiles = true;
 };
 "abntex2" = {
+  revision = 49248;
   stripPrefix = 0;
   sha512.run = "951c039cf0c97a6bd3974bd01ed9323876f1ee74b8250037dce3e92e00d598ab1cb2cfd0bbf4ea6d37b5f8c3e1095e531aa245ad1a91ee49262e6f99c5c84e59";
   sha512.doc = "b6a5871cc33d94c1294a62aeb809f9d29ccf021cff510497c02edbaef2f155a55847dc521a0f698367692e556b2c588a95066bd3097482b0477a67d4a78b7489";
@@ -160,6 +183,7 @@ tl: { # no indentation
   version = "1.9.7";
 };
 "abraces" = {
+  revision = 27880;
   stripPrefix = 0;
   sha512.run = "8d75830f3230b27fdee0b21cadcc9adf604eba3058607675b23231cc43be6a66d090bd64857b3715703d2aed1e8ecfb618373b89cfee743004f1bbff5c7d21b6";
   sha512.doc = "e7392bdf5f19e5dd4dafdc1b058cf0d587d9b1d8400ae01bac3a928e3edef962567e24c53b219206a6cb82f24085da43d18525973b7ccadce05efdfe79b5d524";
@@ -167,6 +191,7 @@ tl: { # no indentation
   version = "1.-";
 };
 "abstract" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "2d805c2cc322cd802d612213ce525765d49d06bfb371a4ac5d1434a3c752af0ba0182093b0b6e4ee28a80ab926ad0f3a0403c03f871d3e003f6eb5a60ae39c34";
   sha512.doc = "4feae7e22d9f8c6866a9b873359a3060ff75ebcd833e1ea5f82e833933b5beb36260833675775cdeb83f1cfde4dbae3421434890aa9f0f7539c999acd2e0405b";
@@ -175,12 +200,14 @@ tl: { # no indentation
   version = "1.2a";
 };
 "abstyles" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "de7e7a5c7e56ae4fb478c9a072c6b2dc8716ea34ee17be577cf4a485c5506f16cc5b79293cfbc80b245ab350c2e2059dd5fb37a2e28818f492edf7c0416d52e3";
   sha512.doc = "d12304eeb2cf797153d7e17beb25c462b3fdf75f5b7b1b24e1ff89d52ce8fe5b2a0fbf88d083ba51301afc45f51871e376253aede36bef21becc1a4350da8259";
   hasRunfiles = true;
 };
 "academicons" = {
+  revision = 48100;
   stripPrefix = 0;
   sha512.run = "8c394e4ebccb34cf3b9878a3b3577c8d43369bbef3ebe336336b9ece077e9fcef8ebbdff16f00355b7940bb325fc62ca22b428d2f25559bdee0cfaea73617938";
   sha512.doc = "ab38b79d6893ba290c13862e4518c7cf6ee297f4b3a248d051d1c4351cfec05b3f271bdc95c0d345433733b9de14f852de54351698be93eca0c802959133cb03";
@@ -188,12 +215,14 @@ tl: { # no indentation
   version = "1.8.6-2";
 };
 "accanthis" = {
+  revision = 32089;
   stripPrefix = 0;
   sha512.run = "9edbbdd97ea30709f0e0e1959bac7806c188d610e414f037a4115747f57ce7ad68be67b75506f9ce186c951a2c46c3bcd5b0697bb72d81fc48465906cd245be0";
   sha512.doc = "efa2cbf4c11b28dc0a907b62d8818489ca48c458419e37571633adb8403f914c01d28431684705363e56cc100adf7cff6539f19fae9e4b23e6cf3dc210109810";
   hasRunfiles = true;
 };
 "accents" = {
+  revision = 51497;
   stripPrefix = 0;
   sha512.run = "738e8299148365c0441495664cd97b408b181d192adb718adeacc93d4c63b7e81c12541746777571f3fd0da37348905269b5d7ecfc2d58f88174cd53edbe56b3";
   sha512.doc = "50e5cd01da80113ef3247c4a7c7da703d4a9c3df68822b31ff734da2d755f5fd2bf9f5f8982d84e3628e96905276dfe6cc6699bb625ff1dadbe810b11bf5a35b";
@@ -201,6 +230,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "accessibility" = {
+  revision = 52650;
   stripPrefix = 0;
   sha512.run = "f0d198f630c3184f649232fa51860b3dcbb845832c1441dd4f6513d4fae21716d3c75f4f405258a78bcb3918f7a59d19b3c8ea814896e5536a2c58daf0386279";
   sha512.doc = "8248afcbcebcc179d438bd4394de64f8bcc6b07095d5ae4146f6a10f73eaebdd6bceba6fbf4e441a434d5e72bce0995281249dac321bcfda24074e9ba2085373";
@@ -209,12 +239,14 @@ tl: { # no indentation
   version = "2.0.3";
 };
 "accfonts" = {
+  revision = 18835;
   sha512.run = "f70105569c5b8ed83c103e423d29367702a5330d57f743a640ef68fc6a290b246e8f514907d63d6c7f203c12ab3eeb0cc64a45fe5c0379f10ccf1c8002007a47";
   sha512.doc = "24b19688008b875890a397e2250277f81be1b77c00f95a9a2d40a257c0dc6f4c8adfc07e594f3873e60e1bfbcfeba786e45e9e63eb632ca92b7c935f74b3049e";
   hasRunfiles = true;
   version = "0.25";
 };
 "accsupp" = {
+  revision = 53052;
   stripPrefix = 0;
   sha512.run = "0b6e474617333ca00c2503e99f60a290b930d7e7534de7223be511404aa6c7ba9a8dd69b94f3433b347146bba7b8dbbd4b6d45ed8b2c6b0880c0177842ba8b45";
   sha512.doc = "650909f5212a92659d18ba3ef5209ed12c9b9ddff2b3157ea17cdbc8955536f41e43dafcd715e5ec26c1d0c839ffb7b26081ea36150b2f0f50c952c5231a1a20";
@@ -223,6 +255,7 @@ tl: { # no indentation
   version = "0.6";
 };
 "achemso" = {
+  revision = 50025;
   stripPrefix = 0;
   sha512.run = "87882436a324828c3a787aabf5516f773afa35be70c64392117e356af18c37cca77d439f1cb88422cda441950ca40bbf624fc01ce3eb05d6ae22fa817bf8a743";
   sha512.doc = "8576bc5db853243bb4b37f53cade79aa1913e763ef6bd2af3a9f74087e68598d40308bf65772a623e44824ee128c8e93aea250abc3499b219233af5aea558efa";
@@ -231,6 +264,7 @@ tl: { # no indentation
   version = "3.12a";
 };
 "acmart" = {
+  revision = 53899;
   stripPrefix = 0;
   sha512.run = "c0fc4e8a8efa3f96ddd3cdc303f385569f0520c0f3066b1e8f85cbdc9da8727ef8800213adc274b6956ed9db74d98def527da156a4ac1ba6aa2449892068d240";
   sha512.doc = "d10d6032aee87b89766bf9203327666efd8e4608a7962782444b1f585594fa96fdcd9dc62fbc529350259785b30d86d7bc0f8a9c727b89208cfb6936772259c6";
@@ -239,6 +273,7 @@ tl: { # no indentation
   version = "1.70";
 };
 "acmconf" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "9363127ba5d59bee9d41e800a0e11d12bc4493e5a79a94be8efe23a44278ea097a58fb53cd334fef0f2ab32c9350196c46ee1aec8347a4aa5554b317c15249ba";
   sha512.doc = "a8a971df6a94a9548b71c1463b9ab143525127774daf5aab227a805c302ee0732d3578c361c5346b123983a32e6d6c8afbd543bca4dc7ac7ad4d5919aba63099";
@@ -247,6 +282,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "acro" = {
+  revision = 53670;
   stripPrefix = 0;
   deps."etoolbox" = tl."etoolbox";
   deps."l3kernel" = tl."l3kernel";
@@ -257,6 +293,7 @@ tl: { # no indentation
   version = "2.11c";
 };
 "acronym" = {
+  revision = 52845;
   stripPrefix = 0;
   sha512.run = "152e25fea3adc15632bb4c5a37981e3cc0dc516d76927aa6842f51d4c3996bba41bef8fd65ed9983b1a4b5dcf194741a454f88e822a5c33b87f48ef14a22c983";
   sha512.doc = "0fdd8e2d43fa4becf1de2e7f80caaec56c8a8897c2c821a8c13a3c90cd26a4c75b6906910f55493634fe3b3fc3d5b4e88571264bcfc37602b950f4875a040d61";
@@ -265,6 +302,7 @@ tl: { # no indentation
   version = "1.42";
 };
 "acroterm" = {
+  revision = 20498;
   stripPrefix = 0;
   sha512.run = "fbcd24989570b083ec51365b560ad2a082a136fc8b2b57aaca4a03059f66dcbdca1efe39c959c8f1a049fdd978ab58a6920f914589c242264b9d803124d0e0cd";
   sha512.doc = "603375e44822841b1dbf52d7aab0c91c0ed36dcdada7e6fab607ba805fa896473674123a2594714fa0f698c559570431f09ec55ca41720586fd522df24453253";
@@ -273,6 +311,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "active-conf" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "afd71b77d016c6f2b36ff045176929409f1fc104d9f3530c1a70fad4fd1c71ac327a3b58dbf4a14b93cc691d88bf6b7d3add07196921876360280ee4e5915134";
   sha512.doc = "e1b990ceab6820376c18068bf5ac15e984150fe7ad66929496cb77665f0ae334cb28026e0000e788f0580eab549fe2f70e802ca67d0f968961f4582290646758";
@@ -281,6 +320,7 @@ tl: { # no indentation
   version = "0.3a";
 };
 "actuarialangle" = {
+  revision = 51376;
   stripPrefix = 0;
   sha512.run = "0f3cb2dc7b0e392942c5eee41227c93a2559c3a268916393530342fc9600c9c4b946f469f222250c23d9b635b9b51a9afc598003a00eab71d641d9d78db29cb1";
   sha512.doc = "ac945df0aad5f51dbc900d7b9def5115cc6aa48c081feaddf8cc7985daedce5fbc0ed633ab4c201a0b0af27327b028bfda1875ec6e2e1c90d038441785a0e8cd";
@@ -289,6 +329,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "actuarialsymbol" = {
+  revision = 51371;
   stripPrefix = 0;
   sha512.run = "49dbdc527b3fe204a4fbcac265accc0d0be88201553cf8e4110b51042ab8b72932bcc1488b7b199b1bb345941a624b486ccaed888851bbc6a63f70135a0c42b5";
   sha512.doc = "3ba7c377010c3d6d1e7c52bb4256c10f78fe72e6fb7e1b794831d68fb9628d17a6a74f31c8b7f6bae41a59d8a29e6705e28d1e466c36e8273a449bd2594d126f";
@@ -297,6 +338,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "addfont" = {
+  revision = 41972;
   stripPrefix = 0;
   sha512.run = "fff94f6b6bed71f6ba4662c78cf4ee5c3aabe2f9b232fa9b4c52ad39938e7f56306c905ca0c187b0c618f67fd5d245529fb06ce17124b980c29eb278aed9d857";
   sha512.doc = "10a3d45c3f4a4a1aebdee7f3a6a05866df428cf7bb9a1e3ab13ce6fb6254c679bea293449fb00cf5d1c64c99fe8b615168d011631d264aec2349053643f5bdcb";
@@ -304,6 +346,7 @@ tl: { # no indentation
   version = "1";
 };
 "addliga" = {
+  revision = 50912;
   stripPrefix = 0;
   sha512.run = "b54db5b075c2ba2f632e40a1ae2d840b0a61cc940512027effa2b2b3cadfd6dfa2407e2580a462b98f48cafed94281d39613397ed34ad76f54d6a7e8b614ecb8";
   sha512.doc = "572d9aa1396ac80be2cd9ab0bd317759805a6541b656e19ae36915a6277f9a4ff2987c84dbf903133e0a5027f382b0ed48fc882ce7a79df7a27cfe3082d2a666";
@@ -311,6 +354,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "addlines" = {
+  revision = 49326;
   stripPrefix = 0;
   sha512.run = "5d0a438fceef1481633f37824b686422e5000cf232b7dd24bba0f30c8d62b583daf01a67242283f2e4fe971438c061acad2860f50ce1438ca32677d497db8b2a";
   sha512.doc = "2993c6caae1d2f230d144c9f93f7694adcb2e17d9bcd60eb3aa3144806a522258fd4c44a314d40cc767b3b069c4c929b8e458e74bebc746771b975b77bba34d2";
@@ -319,6 +363,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "adfathesis" = {
+  revision = 26048;
   stripPrefix = 0;
   sha512.run = "4eb7fda01fa1961d213eadd2f0bc9b1cf102de664dae1f37588e161af22d043319e12ca704c3223e78e963411c3f0533c845b17f7d0744b020ef2dca35b2c7b0";
   sha512.doc = "86d89f4f139c9ddfe6babb84558f7d89f57b75e28d37f659d9893ef703cef7199272e60f1233d51351b5bd8a4565393dd6f09ba69796d2ab555423c2ba23c2b8";
@@ -327,6 +372,7 @@ tl: { # no indentation
   version = "2.42";
 };
 "adforn" = {
+  revision = 52364;
   stripPrefix = 0;
   sha512.run = "50369d5874b6ebd35498ab4502661de8630ed3175df02cf938817e17c858cadf0915dbf7c34ddfb0861a0063f7cdeeb40b1097573f77a4696f08354fd28d2a64";
   sha512.doc = "b2521044ab8869c114579b7ed59ba9b58a66049ead3202d5f62797c9de0fde442b4f39c7083e1626f50b0011fd57fdb4227cab7571bbf85d6076b88e8eece61a";
@@ -334,6 +380,7 @@ tl: { # no indentation
   version = "1.1b";
 };
 "adfsymbols" = {
+  revision = 52365;
   stripPrefix = 0;
   sha512.run = "d5ad659516da1a4df4b2244f90db9a35fd4ae1415e78067a378d389a536380c1c642d7910491d4d49273c9f3e03a8a916cb418d8e608329b2701df44f8011de2";
   sha512.doc = "39bebc154e84ea1286e25e8f7b9439e1c1441b7df83db770a75e26580c452cec7ac8be97bd77e2a99448f100d30ea9d5f40f3282a54e5fcfe940cb40c9917cdf";
@@ -341,12 +388,14 @@ tl: { # no indentation
   version = "1.2b";
 };
 "adhocfilelist" = {
+  revision = 29349;
   sha512.run = "57436dae1489c0f614c4b002f83d34a711398a762ac532b44b1d91a51d068462aaedb5b034923629f7630f039988452eb833d1e98af389c788091517bbee8954";
   sha512.doc = "14bde143bf3ffa3f2b972f93544089e4c0314c7696e1d711719549b7e831278c66fee0676665fe6eaaac744689d613dce159e4eee2e3f9c24dbbe602794fc62e";
   sha512.source = "15e7f652408c5975ba47131109e0d18bcb1d270e0ea630a9a3ff385e499cf3607a366e708a5ec9559d7ccc2a5e0b2d3d0f5f615142978a918b0bd1bd0218a30d";
   hasRunfiles = true;
 };
 "adigraph" = {
+  revision = 49862;
   stripPrefix = 0;
   sha512.run = "6a4684925e542a6ab0e3b97280059dc47fc892efdb99858370dca9dff91074d98030a93f964a5172bfa95a6dbf41f7a639977b0559332178ab8e4ca9dcb20e10";
   sha512.doc = "763f94d22e939c255cb0b920183403d7c753dd4d77483b79f82f4a302375bee4ea42357091866ddc392b554c6dfb707c624fabfc3f92fb6ae07853e3ddbc8594";
@@ -354,6 +403,7 @@ tl: { # no indentation
   version = "1.7.1";
 };
 "adjmulticol" = {
+  revision = 28936;
   stripPrefix = 0;
   sha512.run = "1134de8dc37c135e944c223946ca249106d12a6af8c653ef39c0418893ba5d52f6ac4a3df6fd521638f606106830e0ce31aa2ce284617ac11226950fefbd94af";
   sha512.doc = "299f6cfadae2e1c51021d849c9d2c10132007f4e4d0b2d0550c60a58f12781ca90ebed6052e9f84cc22bbdcd7b955018769264fe016800706ee7548c4f8a1e61";
@@ -362,6 +412,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "adjustbox" = {
+  revision = 49596;
   stripPrefix = 0;
   sha512.run = "19ee76701aa1c060d5163a06263cb5b6b58d74d4bba1b7e77813c5a3b683eef35249b6569fadd1c52c0cf82465c4e2acab7091dc1b396c1e938ddd6b0a1d3bb3";
   sha512.doc = "33febe9f49a7c78950258d1955b4518a4ff15b96f6a866cc8f59ba83bf66a8d560a4d00430da494013aa37a72494280b4d165d2104d81bcfda237350855e1f59";
@@ -370,11 +421,13 @@ tl: { # no indentation
   version = "1.2";
 };
 "adobemapping" = {
+  revision = 51787;
   stripPrefix = 0;
   sha512.run = "1dd2c4a813bbcd8063d42c1872fd14427bae2e5ce9698ddb0825770653d17798c037da511d43a0939cea1a607f0a7bb7ce974bff72a2ee88c6f56f941cc7510e";
   hasRunfiles = true;
 };
 "adrconv" = {
+  revision = 46817;
   stripPrefix = 0;
   sha512.run = "ec4300075ae2fbb0b29fa8126263d8852a405a84df8cdb6f484c989ebe948257ba3d1f3ddf9204ea7d6d50129c294a0130afabb053bc63022928ca748bb4ce14";
   sha512.doc = "93ec47833fee152b098477f838858a259f5842264d3a7e9a959d60fd35f46d680eba61c9f4b5efa08ab2878da4aec78d19cf83880e33aeabde9854aa88491c78";
@@ -383,6 +436,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "adtrees" = {
+  revision = 51618;
   stripPrefix = 0;
   sha512.run = "1e06f07576666fb7b54c78d930f66fef78571469bffc3ef448687c8bbb0d23d41761e17c8ec1293bb6527e31fc70413df1b7de5c9a06514e6aa8242ed90deb09";
   sha512.doc = "ad8f2e42a4a31368000909c5841fddc189bc2331b47f2c64b16ec509bd662a1b82df3ea8b712f0bdf1c40f123ac28221179b4352e20631d9fb776c0b2939bc4c";
@@ -390,12 +444,14 @@ tl: { # no indentation
   version = "1.1";
 };
 "advdate" = {
+  revision = 20538;
   stripPrefix = 0;
   sha512.run = "80075aa6efb4125bdce79e9b2ec6951caf1a753c8915201767de230acdd1adc2eef31400574effadf6287be159236422840751bf5ea24cd3cab8a01e82a0185c";
   sha512.doc = "acfcbd6a40630da2cf9024cbf3ed378c1f7f8a16c8f8395b69c12f9693e903ba54b9b051c364c5cb4de957876bbd41f0b480c4f4b320e22f2c6df7b08502873a";
   hasRunfiles = true;
 };
 "ae" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "6b1c57d5bd3f0959e611659f979ed42b81e397a182d09b3482e98865196077334a9796777aa112ff367b97c232859d4f9637730dcd2654e6232c577d2f59c39a";
   sha512.doc = "927521fb6b6a5787d0e94ad724cf19825b2cf2ce23333e60e13625a36390eaa4cbaa1bbe50dbc718efae97036d5d815860919f536601bb97224b489d20082953";
@@ -404,6 +460,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "aecc" = {
+  revision = 28574;
   stripPrefix = 0;
   sha512.run = "d36fd36a4d92a5031b36437ff8c75e3fbe2e3124982f496d6633476dc876a300d3b0ca18874d6d6256a096d01bde96854c30f76a777ad5ebf9755b035b41e7a9";
   sha512.doc = "58bcfd0db5d39265765a32c9996807dce4e1ef22c47a3b6f4307c59eae01e1f8eab2e8d2252f83ac42a41aeda1542087f21a52ca523a9364f1ecc6b635251df3";
@@ -411,17 +468,20 @@ tl: { # no indentation
   version = "1.0";
 };
 "aeguill" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b75f41c1d179b63d1807ebfa81e9e656bb43433a3291b9e29d5f0f76667868d26840dc6ce7f61f0f959cef724f0b5738b96af2a371f949daefc4179de1f861e8";
   sha512.doc = "8361fc02999b080f19beb793fb0d1d802203114c1e1581c312a21e3a682191470b93e373fc269f8aea0e2643a69c8caf80855597ff6a71aadb6bfc869f4370da";
   hasRunfiles = true;
 };
 "afm2pl" = {
+  revision = 52851;
   sha512.run = "17a191fa347683f93f7d74e4b0be13b4690c84f0c17c084b10805aa1b5b057de6316836122114d1ebc76b1f8b4d134f6f5b08a21a8e28417f8259c3e52c12226";
   sha512.doc = "0e175a69c26457719ce3aa5587f8857c77ea9bde7eaf59d33f7fda330cf73d0ea68060a83de09100d651b043ac60473dd2f25b8875566dc39d67eb6219be34a7";
   hasRunfiles = true;
 };
 "afparticle" = {
+  revision = 35900;
   stripPrefix = 0;
   sha512.run = "958ed5cbce1dc7bfb5d01befe74de6236a09b3ae5246aa3f2e80225bc353abf21b622f4128641c54a27197560557738d4c224e160c0be87010517c3a30a729ae";
   sha512.doc = "d8185772e114a891ff5ce0f2a2e12b827420f8c486813d87bbb6fafc662ca1db710178e8cfa260d7d650c3432909b9f7a8521648f6aebd5f90daf1aec4e28d7d";
@@ -430,6 +490,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "afthesis" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "0ed83c0a98bdade60c49b3408053e020c6deba1b96d74b47aa2404c778a96ce2898af1d76892704524c0c069128e59c0bee5af73de6ff9237624600b991ed6b5";
   sha512.doc = "c221f77700f974f0cedeb4f8ecca5280c04203e9cd89042d414eb54037db71cceed450477fe9498a15d9f09b8a0cffa177cc897958594fa7e3952adbd85225a8";
@@ -437,6 +498,7 @@ tl: { # no indentation
   version = "2.7";
 };
 "aguplus" = {
+  revision = 17156;
   stripPrefix = 0;
   sha512.run = "73bd9b7f01a4911fb25aa7d388c5827c62a01a786ece4317f5b702de4c281bd05f82568780f4396bf289fcbb348abd2a3eca6620fd8e3f801d23aff7a05e104e";
   sha512.doc = "48b9c010f746b8a85bbf1093b3dd39c2a853d74b20feb71bfebf2ded8d6f4c44538e6e20b24c65849e8adea9d34ff15498e847b1521bfca11d18fc23d18e10f2";
@@ -444,6 +506,7 @@ tl: { # no indentation
   version = "1.6b";
 };
 "aiaa" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "9a5c04cc0b24e2b11e4b6953ceed9e506ad9f44922b3407c3aed1f5fd1fda1e86b1a5d6613a059065c1026f69830a8f5af0ed21ad8e1856ab44d22985768f24a";
   sha512.doc = "cd69337eb21eaeff910696f153bc97fca94afa0b147e3360477f72c5d90afa5d54d375b5eb7801df1b988c8f11d8fd23848a07f013a4e06c28a013248e00599b";
@@ -452,16 +515,19 @@ tl: { # no indentation
   version = "3.6";
 };
 "aichej" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "7edc0ca36209f18dcca0b794c7ee712f0eba82e3e69b09fd46fdc7ede6bd33e93d4936d7bfcff88fe4f699acd04493053a7c76cabb87670215efaae12aaabc83";
   hasRunfiles = true;
 };
 "ajl" = {
+  revision = 34016;
   stripPrefix = 0;
   sha512.run = "083a549d425336eceee0ab8e85ef592aa15983e9a4dcf2264d835b5242933fed8719b81b427fcf7784b38b8e0b3dac2e2a7f8b9ffd10cf2690b96bf8b586ff3d";
   hasRunfiles = true;
 };
 "akktex" = {
+  revision = 26055;
   stripPrefix = 0;
   sha512.run = "481502410094aedb36f00dc93ff3cad9479e756b00c60abdd7da98713f273cf45a314ccb55ef2436dc54cf7e8f84e2bf9fc5f00974c9978aebacee177380c9a5";
   sha512.doc = "4378f1e2c96bab5f5926b22863580dc2ae555400d770f5875eff09b8f915da4c83e99679fa7487f788970d17537123d854400e31bfca868d693b3d950c33051b";
@@ -469,6 +535,7 @@ tl: { # no indentation
   version = "0.3.2";
 };
 "akletter" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "fc0702fce74b32b04ce2b1e03960a7617c84a89d4581f16bbbe1b16fc01d45300c0a46682460d78cc572b6e20cc42ec7701c5067adf5e4960ed1bdfd5a69e910";
   sha512.doc = "6a951bf2ad4a7af4a6c87b24e8f4c3b4ff520430024a6abe6b54cf56269a903d78e591def71ce7cac832a4d3f822e8baa14f8decc960b455688801f406d01e74";
@@ -476,12 +543,14 @@ tl: { # no indentation
   version = "1.5i";
 };
 "alegreya" = {
+  revision = 52379;
   stripPrefix = 0;
   sha512.run = "d1ccf5c1e3b53dbb5e5f41f6845c0ebb03b4d74355aa11f4dedc8214af2c49f2d4023b5296b24b7330b4fef0f0862dbbbac864831dac16317f7025a88c8c4a6a";
   sha512.doc = "3452ed4d59bdae841afcee2895e9ed64f60b5ce511f29468107f84ccf1cfcb3afc4798a11e48681bf66f17f448c27d3fd1e8b82cc75acfe7d6fb7e892d0efedf";
   hasRunfiles = true;
 };
 "aleph" = {
+  revision = 53786;
   deps."latex" = tl."latex";
   deps."plain" = tl."plain";
   deps."lambda" = tl."lambda";
@@ -496,6 +565,7 @@ tl: { # no indentation
   sha512.doc = "0316e421ce8eee32108057c4e88381da3c0b47f32c0daa18dedefd7dab08b7ea6905bf92fcc523030b29fbdea835594ce22d991cab055c80b122aa69e9cbd8aa";
 };
 "alertmessage" = {
+  revision = 38055;
   stripPrefix = 0;
   sha512.run = "df06377244dbd962326646fcd0aad535733d275ff6a86bed3739e8b77c6d1231290c4628a98be50d92e9006f25be68c20d5fc5e92c82a6cf841c0af5670f7ca9";
   sha512.doc = "412cecb146790ed0b7fae601d9ef0eb14381cf75ed20ff1bab3190c249750fb693708c2dce26e76da370a265f99dd312dc6747b6c9e7de62ef51a709accf7e60";
@@ -504,6 +574,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "alg" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "923f36ab03aa10cf3da008f4b3d7ba5919f3e4a512c82fd1c42386df22019ca70c4c1700b7596750a00ea7c50586bdb803db3fee22edfbc402ebb9e249668e99";
   sha512.doc = "d94795e7513612f3eb102b85b9fdcc792b175411fd67edd6779037b1e0dc101378159f58c6c6feb82ca6b73ea2a6fd415a36e4a4ea67913a0d1110582a41e38d";
@@ -511,6 +582,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "algobox" = {
+  revision = 52204;
   stripPrefix = 0;
   sha512.run = "0c7b068f117a5eb591646e32faf3a9dfb6a03a218411d092afc33c7adcee30f95836a9d841444fe87a700288e293510763807d393043518ba70e64a3df82099f";
   sha512.doc = "ccc96b84ea2d1c6c9dab8bd286e24f3dcb4fb9dd31904b1eef4b07a1de34a067f3cccd3d8e33785edced6dee8673e60d50ffc201643912d732660b1f14404d74";
@@ -519,6 +591,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "algolrevived" = {
+  revision = 52775;
   stripPrefix = 0;
   sha512.run = "d9104a0e083b249b2c623dc15c800796a0ed5c141a9886795bd9329defac3e912f5871866153eac7e8ab3b4bc33c335b93f73a554c30f8c0e4a4209dd1d6f498";
   sha512.doc = "b85c938e9f527d215ba8fb98ab2f466a3a938c468fc58027c8c625981dc9880ab04c1cd87abe42029d3b69d5694dcbe0c7249fefab5e5bb951040e3c42211b5a";
@@ -526,6 +599,7 @@ tl: { # no indentation
   version = "1.041";
 };
 "algorithm2e" = {
+  revision = 44846;
   stripPrefix = 0;
   sha512.run = "0203f337518811a04f255a1ea65045f487dbb4813fb848e0ba1b52d3e5fba96b784852d7e900a82f4c047c2943098e3b37cbca27322d115c341fef6d262c60cf";
   sha512.doc = "ae737056adb53f943ae8c92d8e7bfffe52a107cca4a7a3151932a581744f1396f43e134a55e9894de0ae1fb5418983ba4643e1e07487b690478a6979555d8768";
@@ -533,12 +607,14 @@ tl: { # no indentation
   version = "5.2";
 };
 "algorithmicx" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b6cccb7bc391ad11a8996d3e6a3a48f79e50e3e685a4b7670a3399d5d400435616794100b38e73d32633fc16cdd1795c2dcd57bc79279266dc6509bb14d08804";
   sha512.doc = "cda9c4082faeaaf504194d75c014fda9cda20fe85ab9dd8c4f5a3c9e39fc2c8c8428ef20b921790f36c8abae2ecd8ea089353db540477909039575bc65ed5228";
   hasRunfiles = true;
 };
 "algorithms" = {
+  revision = 42428;
   stripPrefix = 0;
   sha512.run = "ba02581f18b74ef97f37b7c1052bb7577b256ef94232b045a43c841fc4705f8d7ebcb2b286d95dd70943d309080b05d36dbf847ecd6e661038d6e375d514a787";
   sha512.doc = "3658a5a31162acf5ea1dc318503a2f9e74944cb998494083de76e2e31119bbc22094bfd41e048f5628730df359d2359943cec3cebd07b364a81703b92520dd01";
@@ -547,6 +623,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "algxpar" = {
+  revision = 52758;
   stripPrefix = 0;
   sha512.run = "7c42dc2037c4171a1e557eb1af38ad39037a818e1b97063790c7e987bd7b6e8e30c25e046d053dc67de3478375bdb62bf4e9c8c2210d4f149d8fa1d53417f8d9";
   sha512.doc = "8568d188f107ceeac4b29be9b2ef69de8c6b4b22f8522047651de7fd6f77c9cbc985da87d7f7f7dfddccd65b2895324c029e975bbd115fa4f6acf02d6cb52f7e";
@@ -555,6 +632,7 @@ tl: { # no indentation
   version = "0.9";
 };
 "aligned-overset" = {
+  revision = 47290;
   stripPrefix = 0;
   sha512.run = "3998cd5515ad43e559da91bd1f25b835743299ec13fcf22ee9cb3aadc44c285f428ee701f5b27141c4d03c97b31a31e8620a2911854a1781ee5543a99073fed4";
   sha512.doc = "d44ff38fe36352e1498e12eb56652e935cfeeb9ce6af5711bebe7844b1b7ba16864c8dac3c3b5f2e2bd6fee86de38c7555d5796940b834ce1ad396f5d2cb536e";
@@ -563,6 +641,7 @@ tl: { # no indentation
   version = "0.1.0";
 };
 "alkalami" = {
+  revision = 44497;
   stripPrefix = 0;
   sha512.run = "57d8a09d5643536cb2341cfd7bd84f24f101ebd73ef1456a39fa8557fc81bb6bddfb58990c38d4da229da5c6ccba0b4d956d82f7d07d65c57a87c749ba3ef841";
   sha512.doc = "c9ebe4fc7bbcb254e0fa0f027e93680be2d1690cded2d9b18f3da091544b05f5dcf38b87400f8c5b8d4dd9ec320379c752615fea99d010a118bf35f4693c704a";
@@ -570,6 +649,7 @@ tl: { # no indentation
   version = "1.000";
 };
 "allrunes" = {
+  revision = 42221;
   stripPrefix = 0;
   sha512.run = "d05513d484f11a9fcb5d202d02e7ea586cc82c44abe0488294e58c6f31185b083026bad3f17186ff03456481200e05e2ec4a7a7348f6b8fa4e952702b15274eb";
   sha512.doc = "569f61370178f2517ea4d4625209a1359cd56913073344816f4fa8aa19edc8bc63c073de4373adb0a0a8c8d45fe392da9869bd16bd7477da65d5b0decfe6de61";
@@ -578,12 +658,14 @@ tl: { # no indentation
   version = "2.1.1";
 };
 "almendra" = {
+  revision = 52374;
   stripPrefix = 0;
   sha512.run = "dccb1938af6f4de3a4135f2ed58d31ad1444d78ba7c415bc8d22d57f0c93d1b28b88634cad238df129fa5c40e4971998a70d4f753b0a7b8bf54b036d181c151b";
   sha512.doc = "da7305ec5775fea53d96985d2d859a490211dda1eaca56934db20f52fcccc9ed811932b498878c896d82300033432288f179c588b55eb774269602096880e3eb";
   hasRunfiles = true;
 };
 "almfixed" = {
+  revision = 35065;
   stripPrefix = 0;
   sha512.run = "1a5e41cac48a33c4336fe03576c49165b47a0bec606b0a15a3563922b964a9a3c2de735cd88cf10423b054b5131193441fbcd64fb2edc47d4944ff33cf6367ef";
   sha512.doc = "f51af6e63070fbf94a3f8ed756d544dc7d9460f37b016fcded0d2c56a6cf672d2e60c7b2cb8be9f9942f43e46b5ff2bfb59c6ae301a5d88a8858d6e60a3fbaa9";
@@ -591,6 +673,7 @@ tl: { # no indentation
   version = "0.92";
 };
 "alnumsec" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "d61adf9c03ef9f0b5d68325b435d5145297d85fa04a5bf106de50f58c04c9507eb63fb17070e955e7f476158419a802f0f18d2cd97ca93baa7997c2d57def479";
   sha512.doc = "ab07f751332fa0ad974e6ea84b10a0249e5bbb69e591d1319a8c5d743f88d63ad9a7c72fc08fbac95e3cf950d090313dd758ed8f604e209206f873c5f0f70880";
@@ -599,6 +682,7 @@ tl: { # no indentation
   version = "0.03";
 };
 "alpha-persian" = {
+  revision = 50316;
   stripPrefix = 0;
   sha512.run = "9907067b5353b62bb2d25833231c3152974f7f0826237e6b18007043a420018c7901505fcbec45414ba67ca8f90f0213c512b16cbd342413ec000144b5fcb1f2";
   sha512.doc = "aaae11a4d64fcd05b9a98d324356c9b206bf22d5a744f6d9bd124e1c53f2df3ffd7f2901dd63a8dc2addd9783212792e2e3bbc789b1376e8f5f1d5fd28ea3ed3";
@@ -606,6 +690,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "alphalph" = {
+  revision = 53087;
   stripPrefix = 0;
   sha512.run = "de17ab4278afc9fb308abc23c19d4d1ce117ef3b66a21b748c102b95722d3395016682e9508e135e2b01bf4ff274964df0fb723ba2f92c81873dd58d73a3a733";
   sha512.doc = "a098159842a9bd47e6da930af94cf365629c72f539fc3d045fb33b4bbe2004468fc690564850b67549b3eeb2265134c92aecef65b47d16da732bcc5aa93d26dd";
@@ -614,6 +699,7 @@ tl: { # no indentation
   version = "2.6";
 };
 "alterqcm" = {
+  revision = 51446;
   stripPrefix = 0;
   sha512.run = "da1bf55dd283082c5407b8ef8654f5da1b4f2adff120aeb7f2dad556dc01df18a0da16246e2b8b0242579e9fcc44fe0f4e43e8e6f9fea4ef2c67426699fdb3ec";
   sha512.doc = "b7016f6129e46475d46f0e19bd14604821e2a892ab29963710dee2c404d87f6aa36eaf978535e297333d85b8fc21bb312d44d36fb3fe13422a62c854ec767524";
@@ -621,6 +707,7 @@ tl: { # no indentation
   version = "4.1";
 };
 "altfont" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "18212e7107ed2bb6718a7c763d881dff7859e55e5bb33c42e1acfb5ea21228d1ebbdc6e13cb95f041bac99f871306bd3227326953229e69ac6b8ea774434cbd6";
   sha512.doc = "4d181a21f732b0265d4251d3775fdd8a4305c99c0dc1610adc9af583f73e376cce249b2ef237d8027aa32a269512db71260aebe78e5e1619f506f23d1105dc65";
@@ -629,6 +716,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "ametsoc" = {
+  revision = 36030;
   stripPrefix = 0;
   sha512.run = "34d99bedd34ea4195d4b0f60560c80c7d3624c2dcb3137a559eaa1b5a16bf465c39a0c54b6a5e64d2488dd7d4c1c82636d7c3adcee3e2e687a66b51b96fe6c48";
   sha512.doc = "80b64ca57599aab07dbd0d000e67fd002a19a8d8227bf9d635bbbefe84417d1f99cd75d81ff67e0d7a7e28231ab5438b4e51e90bbb5405f566877a4ec87b8d48";
@@ -636,6 +724,7 @@ tl: { # no indentation
   version = "4.3.2";
 };
 "amiri" = {
+  revision = 52218;
   stripPrefix = 0;
   sha512.run = "5d23cbea0fa6a8a0220ac93f6750b0601b8f0c904edbbdba9d4bef6d5ec9f2ef8935a16a29019b711c19f1a02e3515684e84568e4972c9e9eb42b691cad7e374";
   sha512.doc = "3b59bf9be9f8e35bf056345c380c8c16b5889c61c114d7812e00dcd9943bc46364abb383876f20f4d7e3b51f6523fccb718533280c7de302f4ac56bb39e5b04b";
@@ -643,6 +732,7 @@ tl: { # no indentation
   version = "0.112";
 };
 "amsaddr" = {
+  revision = 29630;
   stripPrefix = 0;
   sha512.run = "98aecccedd2cbfe9e348a9ca6c66d82da07eac20bbc53dfc5ea79435a20e88bbdc4e17c85723824b216a212c509fcfe96b2b708353cbf7f93773514e5433d8f5";
   sha512.doc = "dea731e32c5e02252db95deff66e4160ff3ac9c2b488b218098d9d82754a84d2d5821877c887f51086625c18d1bfb9c544dbb8d2fff4c5aa220463aa8c6d3fbe";
@@ -651,6 +741,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "amscdx" = {
+  revision = 51532;
   stripPrefix = 0;
   sha512.run = "6bdebfbe4985eea23ce24db5e0e14162310d81efab18a7a820fe819bd51f839b9deca35b94740f038ae80084f355e5e800fd6e681d859cb7bc9bb8886993c33e";
   sha512.doc = "65d6ea09c1bec56e5082d3521e1eabdd513013b0606f6cfbd0f7c7566795b8963dab6e9f3a46cbb6d008311e7ee3701efa345ef5dc780a3b18f6f4842d97594e";
@@ -659,6 +750,7 @@ tl: { # no indentation
   version = "2.2x";
 };
 "amscls" = {
+  revision = 46099;
   stripPrefix = 0;
   sha512.run = "0b69a69452e148113c208d52b8221056378e6f869fa2efb0c52d49980ab574ac21a04d9957a2450a6881514645cd156580ad2a0ff2879e240e217642061afac2";
   sha512.doc = "8c98528cd59e8da8c017fb49bc9a7cb617261f899770be56d92b1d52be274993b1777923189957f2ff70ef339223be569db586b80db7285cc824f321f258591a";
@@ -667,11 +759,13 @@ tl: { # no indentation
   version = "2.20.4";
 };
 "amscls-doc" = {
+  revision = 46110;
   stripPrefix = 0;
   sha512.run = "132432f34812f009233392ea29d6c4145717a80ea305632687da30de6969dcef8af9c2aa88cbf1809dd34b0c3dfca0f40a52b6216a7370f2a225b2602d0bbaf3";
   sha512.doc = "8c08813abf65f00b68441d1e5cad3eb4a16fc1a77b30e10d96e22f34d6af547804af4d47b62ef0dfc895e2bc7cc5ecf7bc08d912448fefefbf716430c4502a64";
 };
 "amsfonts" = {
+  revision = 29208;
   stripPrefix = 0;
   sha512.run = "ff1256ae20f435327c12424613a15aa8f207e9133325e3a823ca7ef9951b8d52acb56cc69cbf9f3c0860ac43c9a74ae54154d1cd956d7e25612307dcc6e74585";
   sha512.doc = "fe0df1a9efc821e21adc0e21bcfaf2defb1749e3206d7dac8cd9b667747c37303cb2c69283a89aa8740fc3e08e8803408903a2a95eb0b91e910931a8333c2fca";
@@ -680,23 +774,27 @@ tl: { # no indentation
   version = "3.04";
 };
 "amslatex-primer" = {
+  revision = 28980;
   stripPrefix = 0;
   sha512.run = "05c7c19430a85986db770d1ff8686993edcde35171e3653ddfb7db4a09422c80e53632f583371079fe14d3c6fd9ff4eb3f0c37cbecea7ca2d9a5aefb04cabdb0";
   sha512.doc = "85faf2a9c03f7d7d1e23d72b7041c9b322d5f8bd8cb309a60f7256416249ceb7582c112d25f8953ee67dd2b79a3697e29cf6250d7b199a9eb73a9682f123354f";
   version = "2.3";
 };
 "amsldoc-it" = {
+  revision = 45662;
   stripPrefix = 0;
   sha512.run = "9178b17bedc53957118083a78ead56f9fdaf9fd6a60ea0ebdbeee6c87254e7567b47b61bad1f9bda2554f471f79c28f3df7c3d2b9858faad65c3d110664ec4c8";
   sha512.doc = "eb23cb624c4cf6283b8f777911d102953d31dc8da04392d7023694fed02ee1b8a8a49365fe0f1cba9682e911405f04afc982b6cc9cf9699a4d76ec8dca6a471c";
 };
 "amsldoc-vn" = {
+  revision = 21855;
   stripPrefix = 0;
   sha512.run = "5b0c2cc1afcc4060249be20271af92c71c866db47d2551a176b5685c58182a6ca17da9540dd9a7c7abd33de75b0335a625aa921fdbd77329bc91d16718fb346a";
   sha512.doc = "827c294eb1cedd51a3924796b461ec3d6c858e7875254e0fdb6cb496fecbb6d2ec541e930327c54cc446b15dd69ed795470ae6cbf1cf1e51c0f3ae90f3f6c12f";
   version = "2.0";
 };
 "amsmath" = {
+  revision = 53640;
   stripPrefix = 0;
   sha512.run = "1982aa9f7345f47e50efe9f1e8be307491458e3689838cda328afdd704fa8e04e232187c0778b05848e46d49fada532b14b74bb0d327ebd91f821190b7bf1306";
   sha512.doc = "9a9f7d065b3486d31a9db681757fa48d14d319232d918ad07fa5a8cca205a6e0023584eefbf36542bc5dfbd609b69b4801a8c95d7e38cfd9594cbd2afa862e50";
@@ -704,11 +802,13 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "amsmath-it" = {
+  revision = 22930;
   stripPrefix = 0;
   sha512.run = "6bc869e3cf11a9521ff883e9b8cd227a267d28291124c0f268556ea576bc0af8ea4eaa145e45d1de84709df08182fc83946d80fd0f116a8656a35d75ca83eef5";
   sha512.doc = "814539a2a82601c930097113a9baca5166fcf68d1b0c4dcf25d8afa8991e667619517879bc415ff114b9e86664b9ff5e25a7bcf1bb04160b9297cbfabb4a639d";
 };
 "amsrefs" = {
+  revision = 30646;
   stripPrefix = 0;
   sha512.run = "a0993aa374bf845952c934a421d2b344564726207245102dec82915a3cddf33ad8cb1f2d4d48d71ba0263fae0c24c78f0cc21e0b923a875af02d12c602a375d6";
   sha512.doc = "2c472849194fb72453a541ba443b2232fbf876cd2d4071dd6e6eb65603845ac9715629bbc7b1f44dc0268a809a1a5d74a08f0dc27a81e9b30787a44d133bdd57";
@@ -717,6 +817,7 @@ tl: { # no indentation
   version = "2.14";
 };
 "amstex" = {
+  revision = 50602;
   deps."tex" = tl."tex";
   deps."amsfonts" = tl."amsfonts";
   deps."cm" = tl."cm";
@@ -728,11 +829,13 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "amsthdoc-it" = {
+  revision = 45662;
   stripPrefix = 0;
   sha512.run = "17631e2d6306887236f11eed586454a784f256c36c14955be1eb30377f1f73b189686b37ba6c95188fda2e0b0aac9a1f40469a32bc7787b5d4c244de9a01ccdf";
   sha512.doc = "2d35f87da43f957d7ec3d1e61d052d14b4dc207207fc2e6dc4de08b699e5211db17a84f0305888294ae163691e4dee2d067fb1c3a29fadcc34214033fe8e22eb";
 };
 "animate" = {
+  revision = 53010;
   stripPrefix = 0;
   sha512.run = "1c8d528d2bb96d6f47ee2a36dcfc7b1f696426b799b2825cc4ca558d18cfeb6c142c32040dfe861f86a91f671358c45825d00a2b0c6eef8d44e4b89cb6f64b3a";
   sha512.doc = "2839c6cd71a0ae63d4116ea4a71b9566f698cc77f727ab5dcefd6ba97f9d433b1b6b605bf564f4f86af0cbe2a7212cf38b3c384290c7e19a9c5342dfe8885a18";
@@ -740,11 +843,13 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "annotate" = {
+  revision = 52824;
   stripPrefix = 0;
   sha512.run = "bd31306b72bec73d4a2367fda6804e648ade536181d7a5c34d196591bb5fbd483f13a1e4aa2c28d3a4f29d0c74d37d5f1a77046b15d321c29176d9f742e91a72";
   hasRunfiles = true;
 };
 "anonchap" = {
+  revision = 17049;
   stripPrefix = 0;
   sha512.run = "4b84d5260c0986191fb4f2b560c386a806c8f93c76360a8d93aa7f9b55dcf089d7d03ca946143b52923130ee751fd47f1ff59908314297fd752ff5fbb17ec0cf";
   sha512.doc = "087db509e1d9649176614296f84fefe9b726dceb3ac8cb6eeecdd8a6fdb03dc97433c31478638eeb6f5f7cde85b8a8a693fce55ed0b3f5aae35a075a43e5652c";
@@ -752,6 +857,7 @@ tl: { # no indentation
   version = "1.1a";
 };
 "anonymouspro" = {
+  revision = 51631;
   stripPrefix = 0;
   sha512.run = "105334748bce7fa8a78edd599d6a8466729937f0008c479213a4d3d4b6b3e24b91bd1e124d0e3c1354fd68f99fdf621538696ba9b32ecbf09f5c7202b0b34997";
   sha512.doc = "ced94c5fd0be106433e99cbe66305b60ac6ddee82d3a1c8046d1467b11fe9ca10c2ba3b4ceba56a0ff439e7fa82d09c303f29200fdcec1600145fe7623773e47";
@@ -760,6 +866,7 @@ tl: { # no indentation
   version = "2.2";
 };
 "answers" = {
+  revision = 35032;
   stripPrefix = 0;
   sha512.run = "89f7fa19dad8e94b57a66b53b72578c277037c0c3a9fe008d0802dcdedaea03f01c6554f4c6b80fd038ebc4f18e21bad3fc176f4c4acedae07d9acad2a90700e";
   sha512.doc = "616569a8d972150c0a1da86625b580baaca642bfad773e9e2240f74d33ddfea203b4c7349660b996adbf8208a92b11861d3f1a42ff88c68f39efba0af97ffa19";
@@ -768,6 +875,7 @@ tl: { # no indentation
   version = "2.16";
 };
 "antiqua" = {
+  revision = 24266;
   stripPrefix = 0;
   sha512.run = "0318b6f81d365cbb4b320642ddb6d8f909b5b136daf952da01c22508c392c58c9f8a25b33e4dd0e5afe777bb0b366633afd6567c3992df2a2e286cc9f41e6211";
   sha512.doc = "4158160d42fc776891f974cf8de13631aed17578ad2e5a67225442b7e783a36e2a0d3be640d92dce0fa66097dc617ad54b2779a3a3ef9878b46d900c5dc2ed7d";
@@ -775,6 +883,7 @@ tl: { # no indentation
   version = "001.003";
 };
 "antomega" = {
+  revision = 21933;
   stripPrefix = 0;
   deps."omega" = tl."omega";
   sha512.run = "af2cbe945ac3495e94fbf69797c05d9a7cd8c3874148c54c602a4a152c669638cf7a861949a3cc2d08aa21f378b57beffddf2d13e3afc1157c74472c348f5405";
@@ -784,6 +893,7 @@ tl: { # no indentation
   version = "0.8";
 };
 "antt" = {
+  revision = 18651;
   stripPrefix = 0;
   sha512.run = "c31e92701d14e0559ca1807389d3f1d95a166e9dee918fc7218ee671227381e3c37a991756e9c19c7e7d3681597c3c012037a74249c7c8eaaefc7c8a3bc2fc36";
   sha512.doc = "00533390612e68b48dbbe9c1ba11e46a0e48f8b87cea8f6623267d53795ee9170daa1f34adc8cde12356ef779990fcd7fe7a10b601bfc11c9a0f590b5a25f3b2";
@@ -791,23 +901,27 @@ tl: { # no indentation
   version = "2.08";
 };
 "anufinalexam" = {
+  revision = 26053;
   stripPrefix = 0;
   sha512.run = "0f7deb262a96bf55eba167475ca7c55887c1cdfbe60f9a32debb6926d855764eb595acb693ce9ab74a2af89efd98114f6694255580b5d594915cb2470d84b485";
   sha512.doc = "0821831108f81bc8d23dfb7d26f2201057a897a2dc783959b9e298b8e59b79a12453db072b824397a9625b8a63e7fb19ad8ba6d4500436bb0f7b9a23f96d1c3d";
 };
 "anyfontsize" = {
+  revision = 17050;
   stripPrefix = 0;
   sha512.run = "31d1c235d011998043663bc1f5729bd40c5b90996627038be612115daef2b3526c9e616b16c251d6b653d5bad82beee62a7dcfc3b8c10feec0850729afb294ea";
   sha512.doc = "9003fdbf712448de70c858eba74f7de79e0cb83e8f9fe72d9c1b71869161d5a63099473c4f9ec670b28b356ceccd9b56110a1724dcde3062ae209a678f5b0e16";
   hasRunfiles = true;
 };
 "anysize" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "4439be91f8dd82cdc051c519b5bc36fdfb632cf09941f4e6ec92fa77c2b5f4d767c162018fc9451d48ece17e9cbd5d7d4c574eacea78b8f92b6e07d40d7b590b";
   sha512.doc = "96591bba808fc91a876dd49a6e1ede3b679c18952244f14b07e992b40d20f6c4a0f4b4dad00a409c766c5f2e883fc4923c501e65b06ad93193719001c2629f08";
   hasRunfiles = true;
 };
 "aobs-tikz" = {
+  revision = 32662;
   stripPrefix = 0;
   sha512.run = "76e3f9748c704efafda74e6184aa3c0199f8dae3a9f433615fb87ac5fd7c81d5dd604e91ed7648b68f05919425f82fd19ca0b66f4f590f55e55634a5cc4b7f9a";
   sha512.doc = "3732ca200dcb7d3d4b99cbb0edbe13ef7c9293e8424457c2493c330b4ea810bca21851161b83740bf3b7b53899941e906b0b2e4b46ba715e7b5bbe19844d2070";
@@ -816,6 +930,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "aomart" = {
+  revision = 46091;
   stripPrefix = 0;
   sha512.run = "699f0d1fc5e8fa4bccd31609044e2330dd33083acb56832a64ede0d23d4f21e7a8d37ad5734e282d11238c334399f5b5b6449671ab82b737f9c51612b49f727f";
   sha512.doc = "ca87c32d703e136735fb6e121c4bcf9fcad367121b071bbb792d96da1669001e4221116275aa6b37df1af7788df4ddaa6948aca3405facc0f05af7ae6924215e";
@@ -824,6 +939,7 @@ tl: { # no indentation
   version = "1.21";
 };
 "apa" = {
+  revision = 42428;
   stripPrefix = 0;
   sha512.run = "53d30a8458538f1852113370a63d49e8c0926437752c9d03299374fcf8adcd79c1c353bf420ac33a364e6ca296079ff385609bf2afbcb95dcf54465715790703";
   sha512.doc = "df97c4fd9187772847f29950e899fae480cf5fd82d7f6bc3fcd1de93a1535fac7481436c789ae2c04e998f521f23e5b5219b38904afe1394cebb6c68e55d780e";
@@ -831,6 +947,7 @@ tl: { # no indentation
   version = "1.3.4";
 };
 "apa6" = {
+  revision = 53406;
   stripPrefix = 0;
   sha512.run = "76a307c077ebec0ef984e9296018e1b91a51e95db8d1955924a373e82feb5152ce453d1388e706e6b0ca46f3dcc71a8981bf68848a2022cd19e179fc9ecc0bee";
   sha512.doc = "841821dbf4f8efa07a96dc37d26e21348ef5e1c486ffabbedfe973833d2328b8c5fb32196ae2e0323683d1d20b635242c371262df92ccc0c4bbe126c89263dfe";
@@ -839,6 +956,7 @@ tl: { # no indentation
   version = "2.34";
 };
 "apa6e" = {
+  revision = 23350;
   stripPrefix = 0;
   sha512.run = "155bd30654ec3a2bf3930bdad98235baa6bf7aa8109ad449aa1a7b6f2dbda37851f43978266e1c273cbd2155ed274003dcd91f9f452f2dffe268750fd0d9293b";
   sha512.doc = "d78ed178d1fbd07668bdeef74cf6f9f3674837a4f83eb5dce590762f7c02fae1017ee2eed6625a85a7b3e251ebff103e37da84af589125bdb60b73c9459cb748";
@@ -847,6 +965,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "apa7" = {
+  revision = 53280;
   stripPrefix = 0;
   sha512.run = "8fc5c0fa2417077725dc121b098f69fe23ab721d7f6774dcb2464123ffd18c148897588c8d420dd433d20af98ecd435ba637cdab7de5ea4134574fc6d1ade162";
   sha512.doc = "4294a53e7ce87a02fbbf88ccf598343bc09284acad858ece888ea84735e83134aba4d761bf669a67f98ee400dfeb8d73502764c160df51e228a983ff4d945a7d";
@@ -855,6 +974,7 @@ tl: { # no indentation
   version = "1.04";
 };
 "apacite" = {
+  revision = 31264;
   stripPrefix = 0;
   sha512.run = "02b89374a1a61c7f972aa759b11420cbc7a895972a9b36dd09e48f0aba2ab8d83632949d6f8fbdd781170403639b765ee68a22e1962d13751af7fbd121a875df";
   sha512.doc = "f9840a9ef1cd33ed01b8338956b3da3676167d8ac99cd1ce32dc0383992fc9b141edb20df2fdb6b0d5df5762ff8d434cd84881f8ab1cb4035fcfb2bd9f3ed14a";
@@ -863,17 +983,20 @@ tl: { # no indentation
   version = "6.03";
 };
 "apalike-german" = {
+  revision = 47002;
   stripPrefix = 0;
   sha512.run = "37dec37d8e08a2f124c3874eeb9934e7da3cc9cc8fb1ce82705a461e060e4a59dbd82c779ce89c4d53f1ea909b4b9abfd57e1f9362ed432693dbee7b1ce615b9";
   sha512.doc = "91899056f7c71a20e08e4f5e1a2cab83282f9436409cf28b120b92a3633ec5287ae2b6d7fec2c20ee28299589150408ef2e9760028231523e4c378351a88432f";
   hasRunfiles = true;
 };
 "apalike2" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "ff569f69538cf82afd19d9dd8f798ac36994791d4c5cdaf8998267883432ee0230485de6b0aa9e9babcb285f1121936e911fe69700762010bcfbdfac6cdf5be6";
   hasRunfiles = true;
 };
 "apnum" = {
+  revision = 47510;
   stripPrefix = 0;
   sha512.run = "2e155193dfdd3c88cf336cece23bc6b393a81529c31ac2535840a7c4f4a97530d35d0f4ae964e8f92856eea0d54c356e8bc15427918ba0891730827a3ba561c6";
   sha512.doc = "4e1a6ff31d9836dbb04fbd90911083a9ff70c7526ef099d437e21c11766314cc29e8071dbc21976af7a23fe99b673bbee82dfd265041b9ecd015070c58b4ce14";
@@ -881,6 +1004,7 @@ tl: { # no indentation
   version = "1.7";
 };
 "appendix" = {
+  revision = 53718;
   stripPrefix = 0;
   sha512.run = "efaf48867a45f8365755224123b9259f80f49417c409698420d67670baa969d5d354df1429fe7abbd87c29a8e89a9e084cd75384310a44d61e1f2fb7a2650977";
   sha512.doc = "f4e90fc9fa5ca89a9a20ceb56cce788984f3ce5e55f92c99de966a54afca7145d9e3602c4e514ee6b7887b3ae9f8facc9b3191ada19514aae7c7886ae2984b0c";
@@ -889,6 +1013,7 @@ tl: { # no indentation
   version = "1.2c";
 };
 "appendixnumberbeamer" = {
+  revision = 46317;
   stripPrefix = 0;
   sha512.run = "d5f4573a0f6c31be7e910512d86ee0443e713abea11e71694b58f1d1d65f4249f967aa5b873941e1d8b7686d408f411aad1a76009a3bbcb528693ae14dc60e63";
   sha512.doc = "58b32eacfbcd8e024a4cf3dcea0c1d057010dd454c1e54b6752b970a3fa1a9e10eb15d8cee9dbb9ae032aaa8b6c070079b112f5a91b1c9617df40877a4a3454b";
@@ -896,17 +1021,20 @@ tl: { # no indentation
   version = "1.2";
 };
 "apprendre-a-programmer-en-tex" = {
+  revision = 50933;
   stripPrefix = 0;
   sha512.run = "deaf9ad3580a803fd5fa7cbf8f8a11df4d350b7b90ed880317d1e67290ce8b48bf783bfdf470076b672cc5e257bd10d69d6361c7959d81f9fb759752adbf2a6e";
   sha512.doc = "820f1ba9f635e05a25167203a1f27d13c380281640784828c27ae7366816f309c6d3a630abf3ed49ed996357064878c735c9d7c17bd6dc262a21a420fe40f77f";
 };
 "apprends-latex" = {
+  revision = 19306;
   stripPrefix = 0;
   sha512.run = "fe9c7ee4cc8cac1ed932388ff75066e4166e582f92bc23da4a4f6049f3cfd8c100d6ab6c0b3c661dd76038a9683eb3207f94f54ea338dd172027815d6945ad94";
   sha512.doc = "d65d5f56e055ac4628e8198b718689631edca80abb3593480948ee8ba3336d7baccc091cac9f95b4dff745d84d409488d3a2032a1587f1f1a5db186af4da1413";
   version = "4.02";
 };
 "apptools" = {
+  revision = 28400;
   stripPrefix = 0;
   sha512.run = "05d243100c9fc575b7828e0084822fdb2c655f5d2d7c51b42aa3c5ee4d127f62f714affd1fa8e94b7c0c322b57a9fe1728d1829ed7f18d75b5287a673d580cc4";
   sha512.doc = "74ce416ef14978e0418754e3d2e2874ed07a8fbc6be90a1bf7dc492f191546407d7a967efb1306481d1b88ad296faa1194dc4da8975f7ac0c4e4053ccaa1444a";
@@ -915,6 +1043,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "apxproof" = {
+  revision = 52324;
   stripPrefix = 0;
   sha512.run = "400c95494142780c5359df48864fd5ca48409180220a9efc25c0650889fc84fdb725f7ea263c00ce7afb8099c80d4ef42b601e5b61ae0bd2fb8e68fcdbb673fc";
   sha512.doc = "fd818e5ec077a1d479b0bbcc8470a80c396dd5e4b0fd6191c30009f709d8da6de74277e1f162df3595a4de6e10bc88db6290c9b42df37672d8a6aef7047d9164";
@@ -923,6 +1052,7 @@ tl: { # no indentation
   version = "1.2.0";
 };
 "arabi" = {
+  revision = 44662;
   stripPrefix = 0;
   sha512.run = "6f59ea8c986078f388f4c8f067b12863422728cb1a56464ece4d793189bf0e6dcded476a3b86317c2bd5f9b4b3cbc475fd748c2ab9bbf60b3d8c8cd4c162ea62";
   sha512.doc = "c851b0cca46b11d7297a03488cc72adafb6409e0406de809a1a18d4993068702f03e17cbeda1399914005c9885108d747c844719764145c746b2a0ae45d9121f";
@@ -930,6 +1060,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "arabi-add" = {
+  revision = 37709;
   stripPrefix = 0;
   sha512.run = "5db89004e82030185f34c0a38e4ba55fe38fb9fa087c7a25ee7f7df9180734ffde0957eec52f0110655ea273202b6cdf63114e3520cb23db80c48c6c74acb0a0";
   sha512.doc = "4c44de9d3b46c605a463fd1704e56c5c61806f6e0dcc130251c81d0c555534e167034b6ba2deec1370e502fd006192540ef415aa42987f69025f18642451396e";
@@ -937,6 +1068,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "arabicfront" = {
+  revision = 51474;
   stripPrefix = 0;
   sha512.run = "efdd3769bedf8ececd7f71f6a918ed19f66caa78b348238b34e554698a5af6ae5616bad5cc494c970cd8e12073f1c27ccd1cfb7ab19ea263b5cf98061c42ccf6";
   sha512.doc = "64eb067784cdb56915b45e80f1666347bcdde06e3711a18cef16ae92450377aed236cc32c8c10d467d50e77de31a3f599abe900f411a510574378e63eb923862";
@@ -944,6 +1076,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "arabluatex" = {
+  revision = 50571;
   stripPrefix = 0;
   sha512.run = "53a6524c6d10975d9146acd93aec62f57175c8403dd23c4844a0ba987ddcdef7dd122132c8540733ce5c8f4f8f2f589d4ecd0c10b0ad8f2164b0886a5b8ae6b5";
   sha512.doc = "fe2a14e2e02c125c9042715766abfbc7a634103843475b15ffa7166b18e33e5e9c8d39481722a19963b79affdc88c3283ada72abb60f05b09a17fba999d06442";
@@ -952,6 +1085,7 @@ tl: { # no indentation
   version = "1.17";
 };
 "arabtex" = {
+  revision = 25711;
   stripPrefix = 0;
   sha512.run = "2dedbd482c223f65e13aae104e2014d2d28bf9f4ae6b90f1a4cf0718eb245d8a94899982f15de326f2eb19e2696045ba8ca9a19a6d903ef7c3e9b575a01d6bbc";
   sha512.doc = "f20af64239df9bdb82b7fdac6c5f6a222f1277eb877fa1907cbadd4ec6e426745b40733fd2ae726d3050e6f992b14cc91d6386ee02e2bf841d1f249d09df0c71";
@@ -959,6 +1093,7 @@ tl: { # no indentation
   version = "3.17";
 };
 "arabxetex" = {
+  revision = 38299;
   stripPrefix = 0;
   sha512.run = "7c58bd94b780abc5bc17b4218229d289797a155a8e98cae8e22825dc7d9b12c5514de01b12bf2f645047dafb13b4d519d463f4ced60f7ac53a65c6aa38cbec86";
   sha512.doc = "0dff3162a710b458b367bb4ca587d525b68ac79d2d3182e8b9d2ca90ff72f89bf69153960400c344511449c52346c329b8a34eb788e11ed9a5319bb6bca89418";
@@ -967,6 +1102,7 @@ tl: { # no indentation
   version = "1.2.1";
 };
 "aramaic-serto" = {
+  revision = 30042;
   stripPrefix = 0;
   sha512.run = "6731d62d8a24c9f0d26061b8b2574a880df30df333fbe16408d0830657ea36f04f50c56b574de5eb081f490a4c5782595fe17bdb9208b6602c1a0ac81a1f10f5";
   sha512.doc = "433018891123aebb201d6c4f2b00dd15a558344b758899f85b9bdc21556ad4fc4845ce72084863b243e42beba643c5ae4dd210b74e2588af4825e3c83d6d7997";
@@ -974,6 +1110,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "arara" = {
+  revision = 52106;
   sha512.run = "5ac4fbc1a03882b15611af6268453bcb2c1a476524a2913f16d78cb04414c3eb4cd9ab7426db813d95afb1e51828a6eff1683fc03fd785ffae5763d5fca89b24";
   sha512.doc = "4f2f7312a15e572dcf4f9a2fbeef07e9c6d940401c28730afbe9cda3e3247c835771d278e1562d55c33728ab4ca92cbe26a945d96c5e50f6ad54d424ba2af47f";
   sha512.source = "808c73a642fa3c8e74baeb86e1397c797f9dd69c56dd2ba1e98b2136a753f62d5bab354a7255c456a5837a324d586e36e36468a43658e74562d7e96fd0015fcc";
@@ -981,6 +1118,7 @@ tl: { # no indentation
   version = "4.0.6";
 };
 "archaeologie" = {
+  revision = 53813;
   stripPrefix = 0;
   sha512.run = "3bb26b77a812a285d5a6fffe4906efaef3a972a6078e6150531f756d39f1287af8746a776cdaec58ec1d3973da740c20f0352c322858f2631772532588d429e6";
   sha512.doc = "fd3bf3deb244ee05b4ce1eb9ca81ae0c7268447a974e87d41e1cb29468129f7366702d271b1fdda2f5e3ac561a2cea82525877b2f5b077ca80f9bd6158a17608";
@@ -989,6 +1127,7 @@ tl: { # no indentation
   version = "2.4.4";
 };
 "archaic" = {
+  revision = 38005;
   stripPrefix = 0;
   sha512.run = "5e841f4a8e5df375fd660c998d3d54221e6c8e383fe4a69fb082c98d62b44a1fab2e9ec88db37964e015abbc20cd0f2af5aa26cffd4fd92fece5e24661c0efa5";
   sha512.doc = "457eedb06a3a09a73a2ce0b20c18b643530aa2659d7b1b98be14238b9d40e8a6bdc39085654e8589fb134921f40d211d93f553cab25d7901e40286b3075f268a";
@@ -996,6 +1135,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "arcs" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "65737905ba0a6ede74d8cb211b46a2e62b640d1b655f895095ad4bdecefde496368707142143e2f2e48849faa89d86a9e90a0bde64fe84b3c828e14462f30406";
   sha512.doc = "2cf72d4ec304cfa08c1b3cc8df3bd9a6cb92a633a2ab783ac4efbb5edd6290ba256c86bc4a3bbc09d923a58a10e5f21f5d8e3e2b41b0ddce14406d29405523e0";
@@ -1004,6 +1144,7 @@ tl: { # no indentation
   version = "1";
 };
 "arev" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "8b6e88a41052740831fdfa03299f665fad9eaa0e45d1d235392aa0b849bd6ca03f1e18892c879d3a5289430a5d236b9544d617ea2c3af62a59b38b4d7ff8ce90";
   sha512.doc = "a8dcb8bf0fff3be9c99550623f12651df09b151d6e28bee03d7aa80c7b0eb8c86603b4d8037232e4998bc5603ab3dd368ff7a262b7c7f62f2903338774a9b8aa";
@@ -1011,12 +1152,14 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "arimo" = {
+  revision = 42880;
   stripPrefix = 0;
   sha512.run = "9dfd102a7a58778bdbea8fc9aa8688dce24bc0a8106121da5f5d57246bc72b4c6c5ac11089a496399dab273680da2b4d2735d40bcd2277b555eca67ff936d991";
   sha512.doc = "481649673936e5a05195b2fbaa7c7a3a702e23ac6998537a7c2b3c53b3a87ef1e1b0234c4254f737ee10bf8809ec03b524ae8e06d3e1ca3bca641d58746afcad";
   hasRunfiles = true;
 };
 "armtex" = {
+  revision = 33894;
   stripPrefix = 0;
   sha512.run = "9e76f19f3b1bdcc771039d0be62c5745e5605b1838c4d7b2df67b14b1babcecf49fa5abb667b0d106a432919dd08e23e82201a62bb4adfde3c2016aeace79bb1";
   sha512.doc = "8df4b5c1aa4b653869383336594ea3bb960ed8bdc2c413464df1aba607c9c310bcb5e8e63a911fc28113a8770573e510d81c6fcdf84242dcf08dd2da33f7dbf9";
@@ -1024,23 +1167,27 @@ tl: { # no indentation
   version = "3.0-beta3";
 };
 "around-the-bend" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "8fdfb83017cafe87778ea8a9e7147d6b73ead7019dfc9dc8b620858a67a2a02991e291d622aefc77723f6faa8a66b132313a100d298a2f6327473df4e0fb17f1";
   sha512.doc = "acec7325203a96ab3937cb687e3265b5cdf6d77af5740e1e187f993fcdcbb9db743835e9ab579b6c8b0534311ba94f3d1591330bedf1c2f9eb9e6955ad070f9c";
 };
 "arphic" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "2d4c0f91dd483df95bf91056e4d7cbc28b681fc9f42704cdbff297ceb4f8110affbed879cc8b15061c309764e1fdcce01fd47c2d742df441ed191f83a065538b";
   sha512.doc = "327dbc2cc7b4bad5e410dbb07dd2a2d5052dcb54c98310ffc3596c1e5b4121c1a12e3067b7074f209a3972cb51280f057cfe718eb963869bf05a76e17c528dee";
   hasRunfiles = true;
 };
 "arphic-ttf" = {
+  revision = 42675;
   stripPrefix = 0;
   sha512.run = "f0559968e2659a4e899bb0ee1e6236f4bf7f4133c96c146a189b42fe0ce7f375ffc5c62efd8acffa68b36c92159c28eb54167a7625b606cf7644c0a072d7f8e9";
   sha512.doc = "000030c21bf1ccd74ebc1c6bf8e46dc5d9f884480b2c31407353a3ff45a4d1072f759e9e31abbe5c9de7dfc68820fa359d42c5e980bfb7e9d408f015f8944aab";
   hasRunfiles = true;
 };
 "arraycols" = {
+  revision = 51491;
   stripPrefix = 0;
   sha512.run = "818971d673180323d20534faf9bcc41afb7da93f41df689b37237af19471ebba1942d0cef900bfd5dadfa5730295bca2e9c9e873ba2b25a1fc885f0d5aa3c4fb";
   sha512.doc = "10d1132c5f964915c88eed1c00edf982da80fb1dea3dec028e372eeacc91023b06a0b49a1b63e4442d23c0ef550f2651dc0f12246e3d58d0ae320006e9b49b37";
@@ -1049,6 +1196,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "arrayjobx" = {
+  revision = 18125;
   stripPrefix = 0;
   sha512.run = "5cf6573de2bf55c1b75c2a0f38515ecde848dafcc0e5f0e77185ac039d0bcc4049bf6fdef62134ea5e4839570fc20cc6928bc9357bee0c4396f08d714eca8d13";
   sha512.doc = "495f7f8f3265e349e16ad170eeda10296926864084ace743df54f5a4b304da6bc344bce901edc0fca8d835bd0f90943b192b0e16e3a8f5bc81e0f269f2b480a7";
@@ -1056,6 +1204,7 @@ tl: { # no indentation
   version = "1.04";
 };
 "arraysort" = {
+  revision = 31576;
   stripPrefix = 0;
   sha512.run = "6dd3c6a79c7b7e1f9a0fa29f2d7f4fda8c3aceb0b900c4e42773c81f8a49e84dd62ae24027065cf19cdff93d4addff11d0b25cde62f2d4854b84fec26eb98c61";
   sha512.doc = "1070b880c7bfb6101fa9294ee8d1ab4c61b21af41316ab711c3226173b73249944533cf0594571f90215a46322b1ef07322daf7230d95e7c23bf21650e1d6047";
@@ -1064,12 +1213,14 @@ tl: { # no indentation
   version = "1.0";
 };
 "arsclassica" = {
+  revision = 45656;
   stripPrefix = 0;
   sha512.run = "9c6b32e43ff86bd6f28d23b9aab5dd90a423610b2f3c842462e88985c2ee88eec2e78e05cf3e0b91397009bdd370880df6db642816d7de3bb10a96faf4fa34b2";
   sha512.doc = "84cd0583c074af45837f38c21815019613753890e056109abab3c79c774a7ebe966c35875264998398b18d7a7fc92ac6762dd72726e708193f699e321f296535";
   hasRunfiles = true;
 };
 "articleingud" = {
+  revision = 38741;
   stripPrefix = 0;
   sha512.run = "30a34052cd9586d4b49d687035ae8bed040cc5bc2d9ebc0d96a035c4c7cc06625877a501e02eda9be5eb79643f009ffa9e8d2bf9d7affecca016ef3c6310a6de";
   sha512.doc = "a7961a7ce16613d26d714d39bc441400cb37d7013d03684146ee9113d05dd821a23a1eda9f7e89601680959f3b473e31155f24003b5deaf60e069385c0681646";
@@ -1078,6 +1229,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "arydshln" = {
+  revision = 50084;
   stripPrefix = 0;
   sha512.run = "fd676917ccedc39b90b48b531ea4ec5098b70ca854583a3266d4080dc78f59e37a743e63b738be370cb0ca650594d0878ab1f807eb6f55daec17ecead73aa4dd";
   sha512.doc = "a809e2abfd26b11edaf8a5b23ddf01901f84bbd63b8fed7b6050a4947654ffada95bb697e13250038c6fb93db80dee4faad6d4493f05bb7f4ebb86dc7e9b9698";
@@ -1086,6 +1238,7 @@ tl: { # no indentation
   version = "1.76";
 };
 "asaetr" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b44fbf1bb916eb9fb01c70a7302ef4028d04c84dc6a89a51c0feaca762da9cc95cc03cce6497e96dd64ad73e812fe59a12adb515ff4f561401131476e7df6214";
   sha512.doc = "be0cd70f1b3035477a9b455328a8e167a5042e07634913c0d9efb995286165a1f41c1b86a505b3f23d19ec2f43712328f70085747d692bb97ea968c40ed109b6";
@@ -1093,6 +1246,7 @@ tl: { # no indentation
   version = "1.0a";
 };
 "asapsym" = {
+  revision = 40201;
   stripPrefix = 0;
   sha512.run = "9a683044f23fdec0547199afbc0f0c6c9de8faf01f09df38de324f53e91f446de867e951e187ec77bd63cc65bb92ba2fd7bc290d54650ce24e02b682cd10a941";
   sha512.doc = "4462b37c6575ba0f3e95c29e1d84eafaadc562da19ec58a604bb6ef677fb9b9d35fa68a6f2c81d8dafc35dec9f904cee9d3fdfe0c2031de928862324e83d8663";
@@ -1101,6 +1255,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "ascelike" = {
+  revision = 29129;
   stripPrefix = 0;
   sha512.run = "d8c9d69ac49e632b7b303c0fcff53762f6d40a490aa1655f58525e192481b65b50912867b1cb16c9aba1d93483a6a2bd31e586683819a7f2b3db7439d46deadc";
   sha512.doc = "0283fa497b53dc3a0d60960bd45945dd9b363c53a563139e911b8bb017a6f0ea7f46a95811812a679fe1ac5327c52e73f4aba35d26160041c61a1cb5597c880d";
@@ -1108,11 +1263,13 @@ tl: { # no indentation
   version = "2.3";
 };
 "ascii-chart" = {
+  revision = 20536;
   stripPrefix = 0;
   sha512.run = "ffc1634e3e5313eb0cf04caaa227d6477cf81ba9b6eb887b2897b6740999f1f338b2dc53e6da735876f9c3b130394be59b0a285309d61909a73fdb0d6f28a8cc";
   sha512.doc = "51b11a22dd963336fd93a87e2948d05f291b4191253a474b9d6f70ec31a2645801fb5f6fb6238f6a9b2979dbaba4a6ec8ac15a41c4e8867645dfa54408f18373";
 };
 "ascii-font" = {
+  revision = 29989;
   stripPrefix = 0;
   sha512.run = "e92e312e38432a7294c71a76604e5a3c2aa6b65937d39933fcbc9fc9b61e00a1e2f35ba739f64c29a3ebf6d2e388cd29da384a2a6456f71576101a1f12e36f0d";
   sha512.doc = "2d681a41d213fe260e3491a3b410239fa2e025ba19894d133a27e47b417ccf27648aa13ae431b4c42549c1692cbe517f2595c2de675b14d9ea0460d469e4f036";
@@ -1121,6 +1278,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "asciilist" = {
+  revision = 49060;
   stripPrefix = 0;
   sha512.run = "5c2e7938a9d2df31477cc976cfb549103c8f378a8d38a3624d3449229861fd834d462163df6e2e1f1fec686f513c6a194ccae9fcd0991820b357e12a1c32af28";
   sha512.doc = "8602a9f8e5dc04a6d4a914f603e04ced8f5cef55c5a335087b8f0953d19d4641d43ef732ce299ea18590de89e2360a8dddb44f8ae76be6498ccfd29e4a680746";
@@ -1129,6 +1287,7 @@ tl: { # no indentation
   version = "2.2b";
 };
 "ascmac" = {
+  revision = 53411;
   stripPrefix = 0;
   sha512.run = "f03ff628aced70ac2406863aa4b23eac26cf47fa09ee377ba78a8df3af633ac1f3fad8d005022c1555d957ec9d84f98eebf2dc97b296713a2edf5f0060d4180e";
   sha512.doc = "e35257d0992717350e78e611f31f864651a1762dcefb76ba60510180de177fab02f634423b0f3c78c03394fe0eeb6191db0d534190d4f168922263526a85b1b9";
@@ -1137,6 +1296,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "askinclude" = {
+  revision = 53096;
   stripPrefix = 0;
   sha512.run = "909260b69e3f3cdab62e8b13b80a12fd19a34703267171a0f87dfe60651e4ab249a670a1e7854a3d63f00e266fa127b2ab1c13f949abb06afc49397abe7bfd54";
   sha512.doc = "068432d6304e755f4231ddbf8cebb6ceca31ed040190e6c06d3bb84e8cecd66b40fc7e46650008a6d2effbaa24a7fb3aa43633e46b7a2f4edbd7abb08ee45794";
@@ -1145,6 +1305,7 @@ tl: { # no indentation
   version = "2.6";
 };
 "askmaps" = {
+  revision = 32320;
   stripPrefix = 0;
   sha512.run = "d07dc2e9b3cd0dc7d46576fcf9f08c5a628bcc701a95d8d934e322666c93f649054b9dbfe38f7d9577ce3d27344e9e5a99ec8b1e710c45f4a609a5a2dfadd126";
   sha512.doc = "a170144d18c4a90b166c8a315e9d1f0d86cc5f2a53ef69381652c3f8307b85d8b70dc610bcb98be6eee1bdbedc02b7cbf097a13133da78d492c71db33d94b04d";
@@ -1152,6 +1313,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "asmeconf" = {
+  revision = 53544;
   stripPrefix = 0;
   sha512.run = "2158d1ec6d6c4e57a0870e16d1f0308197bd5be36e853904c7da87893c4e1063447963bfb7a653a2a2d16f122645397e46658c6b73e115fd4286bba9152cc25e";
   sha512.doc = "e25477a5227433f4115c2d3fd99585367c519678b8480c18434a3e1cc5ca067c3af0d4218403ad1a3041f8b18424966553b28a2099a82be44f06492359230f10";
@@ -1159,6 +1321,7 @@ tl: { # no indentation
   version = "1.15";
 };
 "asmejour" = {
+  revision = 52728;
   stripPrefix = 0;
   sha512.run = "14d0157c28e56292411595b7fb166d62b177f97edb3b1d348e98af3a265bf75ffcf3a779039d1c20990061c5e5e34d3d7ddc409c19cd824255cd777cca2a5e8d";
   sha512.doc = "d5dedf38f02e993715f7a588ca3123ff811542cfa8fde29ca7be731a95de9f355bf98677d06f16c87ccd6ed5da80f6d87d41f877240c6db24cc6a6b77343091b";
@@ -1166,6 +1329,7 @@ tl: { # no indentation
   version = "1.09";
 };
 "aspectratio" = {
+  revision = 25243;
   stripPrefix = 0;
   sha512.run = "1447c3037f5477aeadfe3e5fe18a004ffa1b8c5c18b7c68295b8065e32c5a3e6a044e7f9868bafe3d8b81e391b2c614e2153302ef34e1e4aabe84c92ada2f129";
   sha512.doc = "5ee4918a3d90e9e4b51a2985352133331b77a8a87bdd8d41fab9348e5c548670ab56b5f0afc63756b65fdb6e45aa7594335995ac0d146d542b571eefbaa84d78";
@@ -1173,12 +1337,14 @@ tl: { # no indentation
   version = "2.0";
 };
 "assignment" = {
+  revision = 20431;
   stripPrefix = 0;
   sha512.run = "5b8ceaa313eccffff8930b4e1896c7aa069664244623baae2aa1eb3555786dfeb8af8245e56ca149754093f6d74d6b86c891cb9e52e67c7b76e2501ac206658e";
   sha512.doc = "49198297494adbb538385029d41681e55bf64c89fc9cee7d923b7ba9849c039a7e5aa2c1fbfc15f06c1a93a3b694899ffd8988d1833fd88c6f5dd51379289a14";
   hasRunfiles = true;
 };
 "assoccnt" = {
+  revision = 38497;
   stripPrefix = 0;
   sha512.run = "24dd03f444ff4dd627a97840837cb14288e9021117f93fbbdc4f79cbac9cab46d43fb93769d2f05970eeef3fafd39692eefe5d1b7bec8ae04f6078d7a4b48824";
   sha512.doc = "195f1f017fe187a224bde969f45b6494007e4d05ab2e8618b62e8d40055b4ef401f5ef069c3bd1af25f8a9f5e1ad1cba22923e4d615d4f075e13a78a06752e9c";
@@ -1186,6 +1352,7 @@ tl: { # no indentation
   version = "0.8";
 };
 "astro" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "8cf59f7de3ea5add30166fcd4284279582cbe6199bcb1ebd540688d03c03ccf03aa740602cfad11af9380d970ed7009e6bfb4e96c56d26036f872e82c02739b6";
   sha512.doc = "df4a06e10e9a438393c7e22f746618c5d760a6095e285acd0b2918f58e234a1eeca9b49597d381a113cdcbff0f13e4c7108b9b400afc81e81757f4400ea484f9";
@@ -1193,6 +1360,7 @@ tl: { # no indentation
   version = "2.20";
 };
 "asyfig" = {
+  revision = 17512;
   stripPrefix = 0;
   sha512.run = "f067e6aa1f3cb481e07f59781fb7d4c671a0b21a392ca7830d7fa19ed7a198fefd5ad5104ed3644eed484100871f9a8d36d1ae6e31d55487e4ff2846df618e9b";
   sha512.doc = "d798066b8c545ef385a75c81d431c169668bd10ad072bc3e0ef1db7c0df903d51e9dd9ac2d482d109b421a868e9cbff577c18f52a7b4520b32985fafcddb66ec";
@@ -1201,27 +1369,32 @@ tl: { # no indentation
   version = "0.1c";
 };
 "asymptote" = {
+  revision = 50885;
   sha512.run = "e314e473c14c2fd8980d3d0256c6cf6fc7c757a5b4b4dcf90c93cbd15fa70a5e7a0ce453c8382df3f9cfa4aba9c9047b3ee44084e398d9c767bb88ccf3bb47ad";
   sha512.doc = "7969d7001bf3662ed28f92b07defe67a9262aaf62d8dd2f137a4f36d90fb4ffac034052a6c037882c3bcfbc0fd2b9836fc8815c90c741a26dbc68b59a8879782";
   hasRunfiles = true;
   version = "2.49";
 };
 "asymptote-by-example-zh-cn" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "34608d6412d7936a15bf649555683ff03c5021e1688c99285a6b7ecdfc3a43eac4ed32108626243d6e9b07c23c557f07762897a96501a27412c7c5d039747553";
   sha512.doc = "a0087e5be69962c671e1972d9e7be12f76be64582182afe042693cbad92cf3fd027422c605dcf7860cd2e61f0b925860a50e94523b9ae2d1af7a8aa6d356c3a7";
 };
 "asymptote-faq-zh-cn" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "1efc7098392ac5cad5eeaa0dcf527bd158e3f7497ff1992603b833ff63d5cfa61fe5e7bc33c5cc0c441c13fc03dfe1e18a334411be6ad2f5acc94c902e9ccf2c";
   sha512.doc = "b7dbcf256cffae9cc8f5027934946929b4be7a8794fb8364892802eeff4e7cf970ca8549ef442a35f173ada61533b51c2da301bf2ce931107a7ce0c564ce0c60";
 };
 "asymptote-manual-zh-cn" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "c04fc953a0a9035c238b9f80873d9fc605b23b322e898ae55b8eda7537f0172076e512022b163e3cd397ce2e4e721afa2e981454db53511c1a7347a017185df5";
   sha512.doc = "0f82e25773a14b0f81b34354f16931834d0496b2c6636c498c6af686f46e7ff93a274739a1a4c189433c9df1ae91ca010f0887081c81f2ac9006a105c7fd4ac9";
 };
 "asypictureb" = {
+  revision = 33490;
   stripPrefix = 0;
   sha512.run = "a1ab37814223b13bf49d23c527543cb537e2224335e727e07e1f645a7f76a2f3ba1a275073c775463880b0e258e716b6b00d0df29ca944f1f22b3ac70aef4378";
   sha512.doc = "68b060950fdad080061b8d2c1a91726d0eabee9aaebe322e983e0dab81df30c65d9d7d0cf32fb2847f504ede155f2c43f3ba8c00073fa425bddcfe7d47a6f000";
@@ -1230,6 +1403,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "atbegshi" = {
+  revision = 53051;
   stripPrefix = 0;
   sha512.run = "7e03a9a73d8790f6603d53c11aacd01fb7108546e2d3b6ddbd5fce1e42d68ed9c23dfe41794b943eeea67ce0c598851132dd23faa95289789911cd059a8caad8";
   sha512.doc = "8f6402dd0f36d4cc4a4674c0d0b37f012a7d6e557174ca3b58a7a2b33d89475d1e47028cc39d2b77c496bfae0751275369c5f4f49cf53b8c36fb60fce47a6bd3";
@@ -1238,6 +1412,7 @@ tl: { # no indentation
   version = "1.19";
 };
 "atenddvi" = {
+  revision = 53107;
   stripPrefix = 0;
   sha512.run = "d936d42a3a5e2c4fa0dd9064658b450ea521e054c22ab9a30b3b11e0c093ba9961b3553b686021f0fbeae6eca7e40b2aedf3c42287ecb68a724c499007c552eb";
   sha512.doc = "56f03915ef772c486e44b0b80ceb29543c2c1e2ede3ba5b4028af17f013aec8f3d373912aa7b1ef8b5f4524de5c0946833cbe418932dc3bdfe10a752a18035e1";
@@ -1246,6 +1421,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "attachfile" = {
+  revision = 42099;
   stripPrefix = 0;
   sha512.run = "526a279f3fcb309cb117327f4206e7dce8c49d39b85a846799bdfea5bf453d2f00e14e854a74d544e49fa92ce056cd8ccc7e03f56856a8e8562b7105d5fd19fa";
   sha512.doc = "9f9e6572e70d348e1db71254a0c6a80cfe76b767801a3c18ad4517577b793b5388367b24f311f491f0dde8df38684b3de4a2ec7e6db67f1fc1ca7b4a9ce5ce78";
@@ -1254,6 +1430,7 @@ tl: { # no indentation
   version = "1.9";
 };
 "attachfile2" = {
+  revision = 52929;
   sha512.run = "13fae92b9d6456a5b8fd322855040291ac4bbb30671ec202f466d87a6b461dedfc0ec5b06389bd745ee02e91b736b4c704c4b2095877a2164fa00f8ddc467f60";
   sha512.doc = "6d94dae0c75089882298545ad3759f044101b2202cdec4bf87a052c6eecc2055b5936b9f6a4fdb9451cdb0f389da3621cba19a91f81c478551daf99c549db471";
   sha512.source = "62a12e1d7e54caa097e3a83eb89ac9e363450dff0e19235c886d33c547965407a94626f45a1a049d0adc0af63dda1b91c5cee69dacfa8b1a12fb1a3c9c760ebf";
@@ -1261,6 +1438,7 @@ tl: { # no indentation
   version = "2.11";
 };
 "atveryend" = {
+  revision = 53108;
   stripPrefix = 0;
   sha512.run = "2a546be6d2109de9db60e94bea3a63a3c7af8ae892c8540a1513fbe4bfa505dcbdde9913b7a4449727df0ccf6957f8010c5b76abd8d6310c118b269bdc7334e4";
   sha512.doc = "5c5948ab7f0ca213bb5fe3ae056cddd392461911e2af7dfff133253f6aae970d525fc752f154921de2186c8a443fa4f90b18d23896a016ebc9ea177d6826613b";
@@ -1269,18 +1447,21 @@ tl: { # no indentation
   version = "1.11";
 };
 "aucklandthesis" = {
+  revision = 51323;
   stripPrefix = 0;
   sha512.run = "54c6708b343c2605d7779561fb086b914f1a7a825f5556b4a36faee0c8ad29b1c8ed67eaffae223c5e5d47bb6e6a9aaae4c0c658debb7bfd196d9362ae7b8796";
   sha512.doc = "ae73abe45b0aecd033df666f3095486fb29252449e840e9a978cf916a2eeec4a126be8c3ec60379408bd6f7322c8794ba1fa3bd77e45f1723affa18ec109d93e";
   hasRunfiles = true;
 };
 "augie" = {
+  revision = 18948;
   stripPrefix = 0;
   sha512.run = "e8e40eb1e59b7bbd3e6b042e8c8ed40f604066fff6bffa3b46e0e7b7e5984fb25e880422d392209f6dcae6771339bb49a27bfcc7e9e33bd0b638b0794a5e5098";
   sha512.doc = "40db247d40e98bba2c79e5adbd564b77e09b52c34e75a41bb1447e586f605478e4e7399a8d294b078fbbe508eafe5d0c6a68b7e3b7c875af85016f72c74376f0";
   hasRunfiles = true;
 };
 "auncial-new" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "e6132432d4398f3a9b8b04f331bf0852b662da84a96882758a8ce07e7f50a0ad5317b0d6a51cfa389f55fcb3b105e5aa748d249dc3e6c8b2d52647f6c900bb24";
   sha512.doc = "2ab25dee888444432a2bd1eedeccbbcbeb5fa8008b15b0072e1537116d5c1f5f082818eddf31dc604f73ca1d4fb3bc6d3eb76c1ac712666ef1f86dd06bd19516";
@@ -1289,6 +1470,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "aurical" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "1c48c36d6121005c123018cfe1266783288572c0ce8a9ea4b9b47ac28f46206de61b7a73804121f9a57c056c871c547c97ff10a529fedaca57bcb3ab78f3bea0";
   sha512.doc = "89de4991373a50d673f569e72f4727bd66a2b40b385006c3c7e4605812e7f8d3d346e3b08be55241f9926a58b40126d123d6ecea912d09db3973985d0cf9e90c";
@@ -1296,12 +1478,14 @@ tl: { # no indentation
   version = "1.5";
 };
 "aurl" = {
+  revision = 41853;
   stripPrefix = 0;
   sha512.run = "4688987b83ae65e15a74cb7960dc990710930186ec94e376cc3a74dfec9f6d75a51babd99438ff87a5f6f8e05cee483b569fabe627ef00fb892126f74749649d";
   sha512.doc = "a58f7cbbae262c7650bc5147b400f25f0c666effdcf37e565f665092d1cff820d2d98652947d36f6940b8d16027336b970ff88ecd9f3500d9a39a45eb4a19acf";
   hasRunfiles = true;
 };
 "authoraftertitle" = {
+  revision = 24863;
   stripPrefix = 0;
   sha512.run = "ad07262ef312a8807e4419101fd7cd10663926000f7f3c63d9d2a306c02f718982a8c525ffc2c34f04bdc12c5501976236079d2840e16acb9e8b1bcf9598a489";
   sha512.doc = "54e7c6b96ecc37948e32ab1d057c6b3b242b68889fa07a049448d790b8310026014917977dfee6365bf6196dc661ca79bf963ae9891edd22c22c9f89a7d8d756";
@@ -1309,6 +1493,7 @@ tl: { # no indentation
   version = "0.9";
 };
 "authorarchive" = {
+  revision = 51430;
   stripPrefix = 0;
   sha512.run = "9d5dca20f1293b3805c628e051067838c9b7f14d1faf34f39bca031c0be1641424ee8d2466401733bfafb56c4ca1a668e4b3630d991d9911f6acfcde4dd22a61";
   sha512.doc = "070bbe6a8fae5ddcd6ad7743170fecbd9e1f0db1052fe05458689dd3c0f48c04b2afc579a22510b3ad0f26efe85c3b665386881eb0e2ad499a74ef422d6dcd45";
@@ -1316,17 +1501,20 @@ tl: { # no indentation
   version = "1.1.1";
 };
 "authordate" = {
+  revision = 52564;
   stripPrefix = 0;
   sha512.run = "c67f75eb92a937755ef0a1ef0896ae3cc1c256008d864572503d3e9d3be1321d25be59e76d4d3ae443398612233a328b1d6e2da9c103f41b30eb088208701308";
   sha512.doc = "156fec304fa95388fdbb386153482016a4d78d4862943bcd6124466b12df920498d5b42446465fc0f70da6353f58c329a27a822efb5cca8f0c4d7fdcb3239a02";
   hasRunfiles = true;
 };
 "authorindex" = {
+  revision = 51757;
   sha512.run = "75e35298e4839f3975824624c7367504a26dafdf4b8e1d5238e2575c821f652282cd9a6e58fb4296b2c0345ff104dbd2281135776718fe4d2ecb76110946ab9f";
   sha512.doc = "a6c48d89cfd854d8acae47e318bc3951f8e81434d9a81901c8a7b7f1c25188afb013b94780ceb201e81b5d10efb7f5c24f5b5e4c8d8379aba390431707bc4d55";
   hasRunfiles = true;
 };
 "auto-pst-pdf" = {
+  revision = 52849;
   stripPrefix = 0;
   deps."ifplatform" = tl."ifplatform";
   deps."iftex" = tl."iftex";
@@ -1338,6 +1526,7 @@ tl: { # no indentation
   version = "0.6";
 };
 "auto-pst-pdf-lua" = {
+  revision = 49364;
   stripPrefix = 0;
   sha512.run = "db12bf66e8c4c16de2ecf3caff64deb38eb1c163baac66d0dded1f540d817da4bbb9309620b4ad60000f48319c2b8236ae8ac7a0774bf297d731a0258d4be3d3";
   sha512.doc = "b21755948a9a272611d91622fe8e641f485e1ff4ebab4053331431e229b04796895ca9329e2b69921a9fe1f8624f7a635bbed7ab4699fc6aff819d351bce95b9";
@@ -1345,6 +1534,7 @@ tl: { # no indentation
   version = "0.03";
 };
 "autoaligne" = {
+  revision = 49092;
   stripPrefix = 0;
   sha512.run = "10c1b6b8973bc451d38f1051715d7f6efe8acc7420b954aae657bae10254d6919fc7e3d605ebc90e525a7cfa56f082a966bad600c54e50070f1c3fae2bec38fd";
   sha512.doc = "c0a1f2514d80e153b74efa94918c70cc16638d68c6b6e1ae4df8f765e13bc55218a1b7eed289f6dafba440ab7c5ef6cf1b6a728f8df161b21c9951894e83b949";
@@ -1352,6 +1542,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "autoarea" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "81a6e2d2c241056cdb5ca7e54b33b523aa3bebe08d83e3418080659d316720a6bdcbb63d82c337175e6f0591a81ea322289333c5b8f125360c5ed4ae99843c4d";
   sha512.doc = "8b3cb3def1945ae63b7d29614b868d07c64fba6ef50e266f92e3f1de1aa536084f5af5ff095bd467ef83d33701f780dcaed8a7d1c60dc68dcb5323444158b3b3";
@@ -1359,6 +1550,7 @@ tl: { # no indentation
   version = "0.3a";
 };
 "autobreak" = {
+  revision = 43337;
   stripPrefix = 0;
   sha512.run = "91cc17692654270bba9536ea9186ffea2e7e9a6e9dbf0ffcd9821c8b3ec470ea3222af2a1df05d85e47d65fc1737cf2dbeba150641355bf826e5ad2da90db059";
   sha512.doc = "0d06f75e6f4fb254463ee2a075d106c14a06c5f7fc25b5047fbeec0e48ca9faf6e136f098312811329db1da5f9fffb6dfd45abe6eea9ecf682f4fe99f0384178";
@@ -1367,6 +1559,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "automata" = {
+  revision = 19717;
   stripPrefix = 0;
   sha512.run = "09026f967084d5f1804a32166e854ac410a768f6b4654d9ea9bb69dd29acb8a3199919daa1fd6dd48963ea5d6454b9b9d8263939e5af81a8f07f66f08b5f4835";
   sha512.doc = "49c6515e979a87ce270d32b367c5800acffa4b638a8bed3e20f3e74387c2e7ee4ae0c2ea8b232e2ae57d0d0a730424d18911835581c0c274732f3d36f650693b";
@@ -1374,6 +1567,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "autonum" = {
+  revision = 36084;
   stripPrefix = 0;
   sha512.run = "3a663a53b4b4b53515978460dae1ac275cc4e3e6981b008c78b875e3e47af8abd950cb35f6e416ab02507e498bd75d6f4a775e2b429d668d02ebaa4bfdd03f25";
   sha512.doc = "2d0c515fac8afb219aaa1ee270b30bac09bcc310afcad71ff6ad2a3448187733718c03c304c09a0d631595d36043dc3eb0b6849fce0e4c3bf7f5d249b15c99c2";
@@ -1382,6 +1576,7 @@ tl: { # no indentation
   version = "0.3.11";
 };
 "autopdf" = {
+  revision = 32377;
   stripPrefix = 0;
   sha512.run = "f855fbe477986356d34360876a4a6613638255e234ad0210cb035a1f3a9b9b827ea140654e2001aa29ac09d7b8addf8f872d34bdb4d1700ead2f6e6f083cb2a6";
   sha512.doc = "d2c2ecf193f03f4f568d2304128e50f5cb5964a6c0a2ca8b739c59b9d3e80637134b5ca91e1b5c1971db11eb54a086b3eb888b6984050dbffa22a166c6757e39";
@@ -1390,10 +1585,12 @@ tl: { # no indentation
   version = "1.1";
 };
 "autosp" = {
+  revision = 52851;
   sha512.run = "46d141e52aca5a538432d937f398d8bbbefa6fdba0c002a82d2afaa7bb42367e4f13638a79469a668b6630659e34fe64852e1f1c99cf075e553e1dedbb59762c";
   sha512.doc = "f7c7c63ef8bbb122137f5d35ae5f6be1e306f169026134b330cac458498d1f3f898c442b999f6324abba2ea41d513d6c3d87a499ef037240e82d67b7a77a8eb3";
 };
 "auxhook" = {
+  revision = 53173;
   stripPrefix = 0;
   sha512.run = "8ea845a19818df2df7939031e7b251b4b4d99a17c0d1b8177a592275bed6efdc660266964e0639222b86cfdd897bcf13302f1477b997ea1a06179cdd44aff0d1";
   sha512.doc = "7c4f850d93f8a6d25a35e762bdb2df26384c75ba1cbaba06806964737badb2f7c8ba3192c62df7e7f3de12c6fa117ebc525c735e696a9cafdad943a8cfeedabd";
@@ -1402,11 +1599,13 @@ tl: { # no indentation
   version = "1.6";
 };
 "avantgar" = {
+  revision = 31835;
   stripPrefix = 0;
   sha512.run = "cf5f4701305bcfe2dcb2c92d43fbf2d0ab3b027b2c9b772926216094532e935cec234866f43135e7e050068679d0b1de5a11833696fd103ddae949458cd03044";
   hasRunfiles = true;
 };
 "avremu" = {
+  revision = 35373;
   stripPrefix = 0;
   sha512.run = "2541e80c0dd798675164cace381730c75268d5385883163b67230d49022f16c9ec72a77d602e8b5094db31b1d3aef2f0f71da91ed2f7eb7fe1039117f7488cf3";
   sha512.doc = "12c97e23dc853a971b27258a7666753d019620e832a06b10a49a26f0f30d7c6fde83c0e328e1579b62376f2e9cd10b0b3950fd6c4ca89041a988fedd4c604acb";
@@ -1415,6 +1614,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "awesomebox" = {
+  revision = 51776;
   stripPrefix = 0;
   sha512.run = "f8b841701beb248ecdc636756d954420b879028db1754319cf13a975313e7832e5393afc76f2edea579c6f38ba4a8fe779edcbf7f1442d7f179dbef9b1feb1ab";
   sha512.doc = "cb0a6e98faf307cd718b4c7409f3aa75d30a781b1a299d32c781b3b6906d6a74399c7a04d41ea421a5cb3def06d963d8fc87d841ae199e7e86dc2f1360e4e48f";
@@ -1422,6 +1622,7 @@ tl: { # no indentation
   version = "0.6";
 };
 "axessibility" = {
+  revision = 53416;
   stripPrefix = 0;
   sha512.run = "b7628e6b5f8a46fb4b7ecf7901b0836142e3ba5947dfc1d7e023ebd5b46665c72b3bb0c77b192e1b1c2095f1fe4319749a9644b22cdabaa651924cc8a22c83ae";
   sha512.doc = "b329855249999b41eee83fb0c679210714173b5697f4405b8b4edcfc2e47290f66ce281128179e688a2284481cbe71cc50cbe7a9b4d039db977749bb783a47ad";
@@ -1430,6 +1631,7 @@ tl: { # no indentation
   version = "3.0";
 };
 "axodraw2" = {
+  revision = 52851;
   sha512.run = "9db94d97812b93c81542319320710d4b6f5f21ced10215fdf4b4d6eddae89151a8b01d0bfebcace099d259c394ea8425467174860696366cddf7527695029734";
   sha512.doc = "a24da2094fedccf5b7d61f97533b9c62f3d0ab637aff347127cd79fc81223e1d8616059b450cd7f9ab754895dffa56c84af8783e949a84c7f6361898617ca121";
   sha512.source = "722430e741dc848f1465edafca74affe0f02c02d556eb311c1a4471c1cc0de1801245ecf322dc702ff8d491555768323969d545f06f297dfea2802d86544f323";
@@ -1437,6 +1639,7 @@ tl: { # no indentation
   version = "2.1.1b";
 };
 "b1encoding" = {
+  revision = 21271;
   stripPrefix = 0;
   sha512.run = "b33280f64e37f300c92f9bad4372c13dd34e3dbe5fe47f2dc9fe0e270f33eaf5bedf9485293a74a6e0eb87b65f44fb66a286fb279a3d2c390c463e6aecfacb57";
   sha512.doc = "4bfac8bf2a00dc61a007c10654cb7fe539c111170127934cd3a64ecea9ceed3fd04ac249cbd645d89400bef6f4a3527d1db04baa88eab88eceee2edd48e64393";
@@ -1445,6 +1648,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "babel" = {
+  revision = 53963;
   stripPrefix = 0;
   sha512.run = "2f86e0a45d4911a3a1331c7c42e42903c89f3c2226773caa42a4ddafd11990df8be7b76211581fc4c6ae49424466a78f89b07d41b9b7a86f1ad53dda7b1b66e5";
   sha512.doc = "fccda4835fd0b1a861e6da181be38db85c4d27718de81a33aeb64765fbeeb6d31ad003b4b3dd165a579c29618cca01d8874fb73c1c69c3e0dca0e3fa70bf338e";
@@ -1453,6 +1657,7 @@ tl: { # no indentation
   version = "3.41";
 };
 "babel-albanian" = {
+  revision = 30254;
   stripPrefix = 0;
   sha512.run = "55231eb303d7a2549d21e2d3bba9cb784e95cb99edc29a84212539ce04eb27261078437b8902419e85c69e2a8d7e6fba7abcb86e7b6448b4ab139de60cb77d87";
   sha512.doc = "12afde1de6174c7aee0dcafa4c6df472c0096373a09726c5d4223d082b53b558185b3b48d1ab3204d03c4a89c5f5f2293136fae671c2f2913ea72109c3f58e19";
@@ -1461,6 +1666,7 @@ tl: { # no indentation
   version = "1.0c";
 };
 "babel-azerbaijani" = {
+  revision = 44197;
   stripPrefix = 0;
   sha512.run = "3f20954607195d4804b4bd90d7fe5baa209d5ffac6dfbe5f758306bb7c8aedd1c4c92675f5dce7f634e7ceb2b65e9c3ead0ebfef730bfe2dbd8c0ba17d3079b0";
   sha512.doc = "bfd4434720b9676e253f69144aac9a07d6bd19e3a4418ae74269df70085391444ac46556928f131a14e85b87211fd76521b67a457e7319eedd3781a215efd962";
@@ -1469,6 +1675,7 @@ tl: { # no indentation
   version = "1.0a";
 };
 "babel-basque" = {
+  revision = 30256;
   stripPrefix = 0;
   sha512.run = "40079f02225f81c8838aee6179548f3fcb773fa8e031e07f30df761f298b9980e3a4357a8013bd7802c688a192cd9ef2102be1b6e8e1f3efcd68769a9e5a5a2a";
   sha512.doc = "e6342328d62cb0232d38e10b3b38cd4d75c55a5d31d702c167099a2bd4122e40c5e3cac8a9c2940a9f9893d7aa2594b8322cf469924b97e903cab970dee81c6c";
@@ -1477,6 +1684,7 @@ tl: { # no indentation
   version = "1.0f";
 };
 "babel-belarusian" = {
+  revision = 49022;
   stripPrefix = 0;
   sha512.run = "5856582f8bf6a98a4fbd560bfca82ccb226267e249f0caf8afc775875d50ec204ea613320534a63062dffd0e050905adb24763a95fec2ef4e8faed70a400d976";
   sha512.doc = "247d5a3b99cd5a377534a94fedf47f6710d32d875d3208b1516fdc9acafee70a14ef1dc37600f9da53f806323d0519ebb2c4e288e471363756b7b819751373c8";
@@ -1485,6 +1693,7 @@ tl: { # no indentation
   version = "1.5";
 };
 "babel-bosnian" = {
+  revision = 38174;
   stripPrefix = 0;
   sha512.run = "bef1defaacf5232bf9cce6c1a9956c9a42d35a2c2b6ddccbcca3938386f4f4a61a0cbcba74b930dfad18ed211374c3667120c6706ebf097c56ec3c5915ccdff2";
   sha512.doc = "84238e6b38021582de93e9fe934bf608e647c9b4cc0a066b4fbdd2ba98c8e6531b653907f9bcfb79e6afc9074b4a079b5e419db25625d40a76a8ca8e55e81ab1";
@@ -1493,6 +1702,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "babel-breton" = {
+  revision = 30257;
   stripPrefix = 0;
   sha512.run = "bbcfa22674ca1d4a8e23f179480f9e94a50d5b460b8b0d27365c9166adc02a191253ef2d61d6f5eaf5bc61e73faf5d307378898f1d6b1b748448bbd8a36ea141";
   sha512.doc = "3b47653b26901dd4aba1395c61c9dc01d43ed490c70ca04ba7d1cc67ba7b23b658db32b7a5fef085b236a68bcd009dc5cc5687e3dc2dc8d246ab2ccb8d391b42";
@@ -1501,6 +1711,7 @@ tl: { # no indentation
   version = "1.0h";
 };
 "babel-bulgarian" = {
+  revision = 31902;
   stripPrefix = 0;
   sha512.run = "0c838e5c5cd010fddaec385376f9eb5fb10730e918dd28f58987f855a444d91ed2e66c0de46c74637d134d72f7e348e538836df33f6255a14ed51d0e8d5e8a3e";
   sha512.doc = "4dcd92a2088e737972f0663fe5161883cae901dc82aafd1bd33f2d80a852fb51d6229c95cc655826bd17599a7152b8a7bf0031eb046530a135e8bc5c9c74b2dd";
@@ -1509,6 +1720,7 @@ tl: { # no indentation
   version = "1.2g";
 };
 "babel-catalan" = {
+  revision = 30259;
   stripPrefix = 0;
   sha512.run = "728d847331f1a00766cfc2818691516234b153182f31ad2da024ec3194cc384a41ca89cc67ce66447191188dfe088d1dc4c8af3b2e6952931ec7eb58737c4bca";
   sha512.doc = "3184373d85b1e9bd76588318372ced328d2ce7f6d4f45bc5634671a88314d1ed18cedd968e59dd5203b4d77e6d3576f36a654b1a8bbdaa106d47cbdfb825e452";
@@ -1517,6 +1729,7 @@ tl: { # no indentation
   version = "2.2p";
 };
 "babel-croatian" = {
+  revision = 35198;
   stripPrefix = 0;
   sha512.run = "b5724a84cd180e9de79136ced8bd38717dcb4e932dbba4e20fc071ba9f50fb35cebe83d4a95ec6e8ef0e09a02732cbdc8b1a71715c8a5967393f54087ba4a807";
   sha512.doc = "d5e40e95037c3035589b093037c563b3737e061369f27ff5c51d620e0655dd075f413b91434591e2130849d641c1ac59469db46be1d8b0761075424c468668d2";
@@ -1525,6 +1738,7 @@ tl: { # no indentation
   version = "1.3l";
 };
 "babel-czech" = {
+  revision = 30261;
   stripPrefix = 0;
   sha512.run = "0cc0f07fafefa6d7ea1ae1b2ce143dbec124fe96b36221f1b5a847fd0b789d1974b5990ebd93b8ac0607f63956948bede25c7e690784ca7e9638f48139585a32";
   sha512.doc = "1575fbe0d70725e975cdb0c1c5ca685985d91f23e4a997af4a0db21905ac34962f69653ffe4084065bda70cfbba0f0a1f0885d3afc19e98d0045ebb68cb545c3";
@@ -1533,6 +1747,7 @@ tl: { # no indentation
   version = "3.1a";
 };
 "babel-danish" = {
+  revision = 30262;
   stripPrefix = 0;
   sha512.run = "03bc05d7e6d59ffbb6191cc392294007bf4f1b6f758aceeedb8dddfe9aefadde3e7904d7aa0834ecdf6dbae732057ed0523b24ca20dfa594e02ee8857c94cd3a";
   sha512.doc = "b85445b348bd65abb4c7df530e20b93c5cc86f2ce25f0306aef3d32b585ce8ad8d5b16007bede46be535ac0737546f453c1241a225b31a9216ae25482360b2cf";
@@ -1541,6 +1756,7 @@ tl: { # no indentation
   version = "1.3r";
 };
 "babel-dutch" = {
+  revision = 30263;
   stripPrefix = 0;
   sha512.run = "3f967688c9124502243589b666e1e3af500329782cdad8da5225eb3fe6a50262c2287be02d6d6ec04f3ce81a6767b4d2821179cbf04dcea4c20001e8ea1a9f5c";
   sha512.doc = "5591a30a32ac2900266d4dd642481a5c9e7bac1062fcf5557ad4acf93cad0e36020c75e081b63680c0c96ff580a2156fded920e394a9c5c685cbb152e8d4142f";
@@ -1549,6 +1765,7 @@ tl: { # no indentation
   version = "3.8i";
 };
 "babel-english" = {
+  revision = 44495;
   stripPrefix = 0;
   sha512.run = "f570d2aae8a97ba0762fc1eab75dad1f17c4ac582a351ffeb8e56a136b789a38b7a6519247ba5981385f1a093101542942b3bd073a5097336392929ed40c9e39";
   sha512.doc = "77d6b482407ff24095b1076673316744374e66bdbdd7ebb767ec66ccdccd6ed5bb27ecfd0796eee210f1a888c82ad2eb4b9d2142c427bff137bd139c4cc53ec3";
@@ -1557,6 +1774,7 @@ tl: { # no indentation
   version = "3.3r";
 };
 "babel-esperanto" = {
+  revision = 30265;
   stripPrefix = 0;
   sha512.run = "0c3be27d02d4c3157f2b0df0950e0814db3ffbdb2553d2c0f176893f3669123a9130874e93edcfd86480b785bbbfda35f9246dac3b4a0779da51387b0bf12ee8";
   sha512.doc = "166c1b59511b5a01cac11b5cd76c84cfa485c2674b390a167ff165bec1326709437ee843f664fd4ac9e61338481df9e7f3026189f7c29c71778dbd1df98cd35f";
@@ -1565,6 +1783,7 @@ tl: { # no indentation
   version = "1.4t";
 };
 "babel-estonian" = {
+  revision = 38064;
   stripPrefix = 0;
   sha512.run = "03357f8b0c101e5e186fa4211a971e625f6970a3129a2594a611c74b77b36a27a288d2da518d21e6e2e5d98bb82802b2115d47e31e6258f01c003be854090baf";
   sha512.doc = "ca732f4b6ccb9ae27f99aaabc99037d9f3d04bc170b9a8bb189a81b6bc9f55fd757c5755bf51ff423850f6b45c88a5645f75a462fc9d9e9b989fa04c1a2cc7c1";
@@ -1573,6 +1792,7 @@ tl: { # no indentation
   version = "1.1a";
 };
 "babel-finnish" = {
+  revision = 30267;
   stripPrefix = 0;
   sha512.run = "b39de5e94debff30a9f3a0b0b1d27cdc75e7479ad3f37ba73769226e9e2b1883bf272c3dc87044f6c2b97c80a7c049aee64458a78c289f01470ee4a6ecec0d59";
   sha512.doc = "52fca9282d4070cc451eff247b0743b576dc7ef2553952863aeaf04c01f876d72e0062857690b1d62f1e3ed17918b64b125b96df82f2fc05ae695dcb4788146a";
@@ -1581,6 +1801,7 @@ tl: { # no indentation
   version = "1.3q";
 };
 "babel-french" = {
+  revision = 53603;
   stripPrefix = 0;
   sha512.run = "3e90696f5484f6031dc0dda7189ccd28adf12b1f75ee731bc91e5c8e1395f1ea30590980180da91eef20f3a3c271d581ff510eba6660a8354d9c33e67798cb13";
   sha512.doc = "ac711c3ef2647cc17897f1388c26ca81254da83bfc4030929f618c68d5fc7cc1ecfc7d992f29cf8acbf2c445d31f3f80db8360146bb3397d393dfad111d99dd2";
@@ -1589,6 +1810,7 @@ tl: { # no indentation
   version = "3.5g";
 };
 "babel-friulan" = {
+  revision = 39861;
   stripPrefix = 0;
   sha512.run = "e6210dc473c3d71759f2faf1558df2d6a7c646485d85cf0113074fb68eaef23b2e44eb88c9fd35a7a7929b408d6574f7230852643366bccd29afee744e0b2d07";
   sha512.doc = "0ce539cb0b6cc7af830c7413545f411e1291491fb26ad0451e7caf1346da9ab188a457e3292efe9724070e77f67e46e06293dbfb40b78a1328112b04d4a1fd77";
@@ -1597,6 +1819,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "babel-galician" = {
+  revision = 30270;
   stripPrefix = 0;
   sha512.run = "1c8aef52e0eaba8a55e6c0bdaca4ef47012012a85d38ed268207227063d042f2f0b2cbafa3d1e4d71432e3ea6effd2a781ab0aefc536276de36a95d0dc834b68";
   sha512.doc = "a60ed8ffc43cb56aeafab8d09e8235eea9482ff8cdabc00da68938d980b20a7067da3286fa8ce19eddf9276b51e78dd944545cb8bb891bc13c31cffbab39544e";
@@ -1605,6 +1828,7 @@ tl: { # no indentation
   version = "4.3c";
 };
 "babel-georgian" = {
+  revision = 45864;
   stripPrefix = 0;
   sha512.run = "07adf0a76fb15951db5dd01a0a1595aa9c8119d6e39e94eb36ac340932f763975abe284d738a52a1fa2a938a14f87fe7ede10758529c3f68c6d573dbccbcbc82";
   sha512.doc = "b2f45e828e32fef5e4ac130230050f035ec69607c97562a835ef2157ccc6673d4ae452624d2d1aded3552eb71d85d971a7e35d9774ad7b6e4ca7a8e0a71e48c1";
@@ -1612,6 +1836,7 @@ tl: { # no indentation
   version = "2.2";
 };
 "babel-german" = {
+  revision = 49391;
   stripPrefix = 0;
   sha512.run = "2aa32e3cd0deb815a559e1722cb2ee423d605449af766a8b7c36c67a0e9081fa0402b88ef5c171186d353a8a57d0ae630fd7eedca1d795bd8130189bf05ab2f3";
   sha512.doc = "fcee15f9b0123fd6c5cac11143f6ade9e770f4a3dab07e45bd5cebb30e020be58bb9e43cafee6b4dbc96f8037a84012f900eb33836f7e48607c5424ebfa61947";
@@ -1620,6 +1845,7 @@ tl: { # no indentation
   version = "2.11";
 };
 "babel-greek" = {
+  revision = 53959;
   stripPrefix = 0;
   sha512.run = "2475f93fa7ee64412a5dff0934cb85cb1c07dc54c3ff905548bb0c4d32cea4580b16d0f43dc0f533bf7996f429888bff6425b8f138bc7b87925c4305bc7cc47e";
   sha512.doc = "ecfc024317b75bed8428a743c7b3b5c0dd3b06979ec4e90a1a7d06694b019e08cafe39e94db866dbba8c34be78c84ff971d5ef2c7dd2c41133cbb39a7f34e5ce";
@@ -1628,6 +1854,7 @@ tl: { # no indentation
   version = "1.9i";
 };
 "babel-hebrew" = {
+  revision = 30273;
   stripPrefix = 0;
   sha512.run = "4690fc4288ba1d2142fcda24153e741a539ddc4a52d3e502c1c349feb19609c7cef1427751af24b93df191f12d2b7cf2d11423052193df01d848987e66744dab";
   sha512.doc = "cd4b52bb2d207cb2bcd327e2351bf30d18921c7c4f8a8fa79ce0bf8864d6f6a34e2272fd416828c772abb2df5612b4a78f73f54157b6d69b011c008495b93cd5";
@@ -1636,6 +1863,7 @@ tl: { # no indentation
   version = "2.3h";
 };
 "babel-hungarian" = {
+  revision = 49701;
   stripPrefix = 0;
   sha512.run = "5b05fe625155df3a958eaf44dc55190fff60ef356d40e681870ff27adbeaef1dd2b27402d9058d27dec665dbe9127d43a2e07ad02ef5a546c2e77479453678b2";
   sha512.doc = "696cff23cc5e2c32034729385c251c8dbeb5f78d11c0f8a0515af480f7a9b5fc5fa6c07d216c5078d5f1c4e71cabe093f023f294dbebb6b203337da9423a438c";
@@ -1643,6 +1871,7 @@ tl: { # no indentation
   version = "1.5c";
 };
 "babel-icelandic" = {
+  revision = 51551;
   stripPrefix = 0;
   sha512.run = "46aca093e061948272d2a54ff9f95b94b101582f0ec9d795668983c37b518be3c3d76d2c8e6901126d3dd7342db003589bacce9a40cfd573263a953bbedbfc48";
   sha512.doc = "bc859f01f52ad51da7df9d458e507b62eb69e40e1dc39362ff32ea8ee8890acce8ce49120fce967f321c9d674f4334c62c9bf2b3f8017288b724ecfe3943d667";
@@ -1651,6 +1880,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "babel-indonesian" = {
+  revision = 43235;
   stripPrefix = 0;
   sha512.run = "9e42cb144d53dc0a076afffdbcd2adb7bb55cbc58feb77916e02beebfd1833fa308a0c78d0c26e1d187386b60572381c881da083c73ac8fcc651e77af17e2093";
   sha512.doc = "c4f86b646d67ce4b29e96771ea5657e352ee7633c344f24552a2fde4c387aea41f9694d77114a1454b106646d12d30b277fc9de589d3d4b666b00208978f5bb9";
@@ -1659,6 +1889,7 @@ tl: { # no indentation
   version = "1.0m";
 };
 "babel-interlingua" = {
+  revision = 30276;
   stripPrefix = 0;
   sha512.run = "e562cdb5b7cc35d14f4696cd3b85c6578a4daaf7899bf684026e50ade2113ee2314405756dd5f6ab91b6faea4da59a3546e30a18ba77037eab581ae3c98b044d";
   sha512.doc = "f2f86fcb4a132a9c1f5c65007c8f1662a8498a53f265cc778ad3ba33120a97317aac890c1ff72cc6b94727d215937352ae268cf51344053bec6e0ee5687d0f69";
@@ -1667,6 +1898,7 @@ tl: { # no indentation
   version = "1.6";
 };
 "babel-irish" = {
+  revision = 30277;
   stripPrefix = 0;
   sha512.run = "d9b1486da57f9685e136e14adc61773ec0b3a58ade370da8383476862ad798f26609329d445ee6dd0c6419c98342b720a6880939324d19f67e1528fe99ea3692";
   sha512.doc = "f5dd55c6a527cf19eebe492271d1404be3c995cac004d41160522c6c71e4a4636c32547fd64b93beae41b60d8a48184ff9b498f82ca0453bc72b601de3d66cee";
@@ -1675,6 +1907,7 @@ tl: { # no indentation
   version = "1.0h";
 };
 "babel-italian" = {
+  revision = 53019;
   stripPrefix = 0;
   sha512.run = "9dd2d58f0d730be0cc5319eea1400b8644ba107c81f9d4905842e5c5a4bfb20402e2d67ede0a1c1337e166c63f8c1e90574e11b18275596cf24764de671b3a16";
   sha512.doc = "97d2a498f4fd9fb8cf1561117b5eb805dd17c7c09c85addb510a62adbfd25ad83cf23e4b97a234878cb735f986245363a1b9f9cb2ec36f67bc45408b05539b48";
@@ -1683,6 +1916,7 @@ tl: { # no indentation
   version = "1.4.03";
 };
 "babel-japanese" = {
+  revision = 50735;
   stripPrefix = 0;
   sha512.run = "eeab94dee49061fabb116702c1cdd0c6ff11eb61994c4bc20bc2147329411c42f5db7faae78141ca53380c308f8b310f592abbbc77d67654270b6b1d72ca5cca";
   sha512.doc = "152a3c6d723dc8bcbc046275993b207103e12ab551216e87aa999c2c912acf2ba7e1bd54b0a1c8099940c62f564a268da04372ee559da7a7c56b6e0a32e29b4f";
@@ -1691,6 +1925,7 @@ tl: { # no indentation
   version = "2.2";
 };
 "babel-kurmanji" = {
+  revision = 30279;
   stripPrefix = 0;
   sha512.run = "bbdd05e7106494f23892f3455ad224d3deb1881f5a73720e2c73e7401514fed324484416def64e2e8fd7c2416b521fb2d4527585d2302a220330925c296afecb";
   sha512.doc = "c31f7efd7415f3439635b293c9aad2cfc2632352534e579c0f8d3e74443fb7aa88a95e19735a7b65137d81899ad9d2ad8bbdb28c5da2ff05a2be9dbad552b0f8";
@@ -1699,6 +1934,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "babel-latin" = {
+  revision = 38173;
   stripPrefix = 0;
   sha512.run = "56ede1f441e96e3f17c165de65a7703c8e8897c17ef775fef1e30e1d2382eee0738ba91c97717694edc7e932ee0dbbfd1600d16ff86d6bbea1ccd5cfcec82ed2";
   sha512.doc = "6dc352b57346f0caaebc0832d12a9c1f13743e5cc39285b4d81edc23cd5f21692165040becf4ec12ca6d1acf6c19f1b2ab1da8d79e3e82ccc2dc865322bfaacb";
@@ -1707,6 +1943,7 @@ tl: { # no indentation
   version = "3.5";
 };
 "babel-latvian" = {
+  revision = 46681;
   stripPrefix = 0;
   sha512.run = "0e19f04d81195b77ae200946e5502fccfaedca5a6da8080a0e7351b684c7d1802a1d9d05794006561109dc8f9a0c04f45266e74068157caa9c470899cbec5230";
   sha512.doc = "e7c4f93db73431708eb902af924672727a6dc6d1cc9d17ca92436cea51310a10538f32825c13144ac35ec8633fc146d1788492f9c6ecf7b11ed72893ab6393fb";
@@ -1715,6 +1952,7 @@ tl: { # no indentation
   version = "2.0b";
 };
 "babel-macedonian" = {
+  revision = 39587;
   stripPrefix = 0;
   sha512.run = "c061ca1ec358e4d8df05e0adadd5d87695cf3b9f86cab52eaa0e08b1f5b1fedb66febe32107e74c1926fa4d697b056d7d3f119db525b90ff7e7bde30fd015508";
   sha512.doc = "7284141fbecedad06cfef78f50b4c13ebb3af76ced474c456a364c97943b51b9a233ecf6797e561ab0936ef7d082adc80daea0de4e961baab60e494bd72f7061";
@@ -1722,6 +1960,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "babel-malay" = {
+  revision = 43234;
   stripPrefix = 0;
   sha512.run = "6e2f95eb95a7ffe0b21789a65e74936139d92381867e507ce56bd8eb39b4061b177c10fed0a0226e9091b963370d3c001115473625910f03b699d5517350f2da";
   sha512.doc = "b06395639e743571870dee10e029e4622c55683d7a9d728fff381bcabe4bf694511230795c79da4080299938acf66d03cc55fd45cb8426b484e19e0fb0f73b10";
@@ -1730,6 +1969,7 @@ tl: { # no indentation
   version = "1.0m";
 };
 "babel-norsk" = {
+  revision = 30281;
   stripPrefix = 0;
   sha512.run = "a57f44910dea4a1b9fc94d2705e1627fd42ef21a35737067bbebf6c56f6e4e87031b40b41d68a4f90329aa38a468a87c8c91ca60e10af2d064f502ef9e60d3a0";
   sha512.doc = "646d8bcb3bb4b864fc9cab92a1ae264801222cc70eeae8db63be8ace926cc62918031726da9e758ebb4bc19797eea498af10437066612ff7dc3ca3c99bab4749";
@@ -1738,6 +1978,7 @@ tl: { # no indentation
   version = "2.0i";
 };
 "babel-occitan" = {
+  revision = 39608;
   stripPrefix = 0;
   sha512.run = "f1f2f26b5466d10e995d76f7003c202650e3976b82b431d2bae768a582bc0c5662fc120739c49fcfd1226da3595c8a6b2e8c952a491718c45e69770c09d542a9";
   sha512.doc = "86433fa646eb6b2f7ee0ba54f1dafa73b81bd98012859c59408883cc76ec876720ef526cb2f526bd4a8385c0371f9bb01ae6d604661deabb4ec920172986adf0";
@@ -1746,6 +1987,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "babel-piedmontese" = {
+  revision = 30282;
   stripPrefix = 0;
   sha512.run = "72fe6338ef6f172a23790402a632881906689117e7227b6f2f2fb6129fca9a7d44c42ddd48e8286252f3b5fce9dc34439594882c1f80f33557ef5ef70afe4993";
   sha512.doc = "a2fa0cc72a205fcc25c2baeb7717a573bf8f2db5438e49c9de8a90e8da37d4f267ff30f08f8bb79f08756f5d227acddba8c069c8a5c257adf95c3afac271927f";
@@ -1754,6 +1996,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "babel-polish" = {
+  revision = 30283;
   stripPrefix = 0;
   sha512.run = "cfd5f27f92e75883572adce926cbcfa9d9248367979c3b3411e6ca1c2d4bf441d2fa790dfff94f0f6001c68f354628334aa0a920ee68900398879c978cf962e4";
   sha512.doc = "6f12e4c792eda6ec33db820bf3e0c9a0fbec8f07adf413c4c98d40624cbf8d46588e16271e459eedcb37ceb2f89f13c3a9dab89122172fe2b8ee9330ab6109fe";
@@ -1762,6 +2005,7 @@ tl: { # no indentation
   version = "1.2l";
 };
 "babel-portuges" = {
+  revision = 30284;
   stripPrefix = 0;
   sha512.run = "5762aed39d183575921e0a6d4210d37b5cc25e66288c3c5eba18ce5b2854de8fd440a738faec95a4ec537a3d5c9667f8f2f7d7cd30eff96531062059d90ba97d";
   sha512.doc = "34c0d961f0cf2eba8c71a0e770d1539eb4825c50f8fd91046697d9b55fb4b45c54b98d69e82b3567faeddc1b59535d32d3d99e6ba9b10d6bb8ecd01c85ee6334";
@@ -1770,6 +2014,7 @@ tl: { # no indentation
   version = "1.2q";
 };
 "babel-romanian" = {
+  revision = 30285;
   stripPrefix = 0;
   sha512.run = "d2aca8f17ae173c36185d6d3514b0b09f76233e44f30177a50240ef0cf0f25f85767a6fc5ee0f94e2eff0df0b94fbca08eb048e95b35a631b7d30a1fbf6c23e6";
   sha512.doc = "876a8cd9e515ecad570ce23686b71e896fa377ce8fb4840e511430aabb05e9cb03f614167fa2abd13328d0ea7f4eebf7044a65db584b95ce4c64bd37d2602b2e";
@@ -1778,6 +2023,7 @@ tl: { # no indentation
   version = "1.2l";
 };
 "babel-romansh" = {
+  revision = 30286;
   stripPrefix = 0;
   sha512.run = "db28e78ce4e028ead2f31fc84d0e7d8997a18dff3bf6aed0301b79bfc7bdc52a8741f9975766d36ca9ca2af9908e7e0bda9e454abf268a1eebf4693c30f5a5e8";
   sha512.doc = "42f9b63d92e522b596839d10c1b90ee9052cac86cdd54ac408063c24456b2a7b5adbfc8208a0a388fcffbb19b98ae0810f7da9d6bc517ddeeab78c8389bdd5a7";
@@ -1785,6 +2031,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "babel-russian" = {
+  revision = 45007;
   stripPrefix = 0;
   sha512.run = "6072d24abd098a037a97c9bc139db9454e363b35ab1b84f2641684aa0e95ab3747068a715522e2716cc1dfcd129404f038aa5829054abc29102306e84cb27070";
   sha512.doc = "702b72058f3142b8e5c2d1e752ef46622f688bbe42a7afc3e93251dd42bced6543aadc4d9ed70865d8fc7868b2c560231489e521eb63ec897068b7d712d732cf";
@@ -1793,6 +2040,7 @@ tl: { # no indentation
   version = "1.3j";
 };
 "babel-samin" = {
+  revision = 30288;
   stripPrefix = 0;
   sha512.run = "8a9e832e988da76ca26d87ab54438048d3d76cf02027ac9120d1277096d2495ece671607d32182cc5f9a61032b1ec33695f6592796680aaba0b65c142aa8a43a";
   sha512.doc = "a8d43e73b4ab86378c5e3d2b402298580dfaf19afcce509ffa8ac747d68627c21b58020dd823528073240e1a28a2178157f9752d587286a0168fc3047cacd0cd";
@@ -1801,6 +2049,7 @@ tl: { # no indentation
   version = "1.0c";
 };
 "babel-scottish" = {
+  revision = 30289;
   stripPrefix = 0;
   sha512.run = "a2c708d9e116933fd00619fa8d89e30aecccbfe162c96eac22055bc442276863e8957481787d94a75507c2662ff4fcd13760b454d12b811dc4659205cdf5825b";
   sha512.doc = "b32687935329933a733d239a58d7cbb7c4721c4fe37c703891547c2e6e82503235a0420890a9f025cb81a5c86148bd5ac2301da20d538781fa6f2831939c8009";
@@ -1809,6 +2058,7 @@ tl: { # no indentation
   version = "1.0g";
 };
 "babel-serbian" = {
+  revision = 53140;
   stripPrefix = 0;
   sha512.run = "7c2e8e6cf0cf320f5907d3f39c21072c1d478ff77ed78b6ab461fabfc38e2d93fce7c3cd93ddb66adb768bb10c64dc69f2f83709e36163f9376f89811c77eb97";
   sha512.doc = "7acaf09d1583c59fc61ad05009e4829b0f1c320529fc093b749408bf1ffea347c1f440b1174c6340d4d128ff7ff1017b28403cc55dd4aebf3467b629f8f46171";
@@ -1817,6 +2067,7 @@ tl: { # no indentation
   version = "2.0a";
 };
 "babel-serbianc" = {
+  revision = 53139;
   stripPrefix = 0;
   sha512.run = "b449ff8aea679484585ca92e47c256efc589657333818f2a4dd47344b4df8926149718520fce18a99ff2c37809873f112784b0b034abf73b1fe6c0410843bcc6";
   sha512.doc = "a692cbaf4f42d6829bc89972dfab6a7045119b9e7f75c2416aa15492e73bcbb51687d6a3a9b7a860ea618602573d0fbbc6251068fe59e91473e9a8cedee7295d";
@@ -1825,6 +2076,7 @@ tl: { # no indentation
   version = "3.0a";
 };
 "babel-slovak" = {
+  revision = 30292;
   stripPrefix = 0;
   sha512.run = "b14b98d2cb66a3f8f5d8a313d9208a700d1c3664a5bd23f5baf0d9aa2e3acf3891a0536871988e7579020570999ea05a9dcd60a404cd6670e3c1cf8110d9094e";
   sha512.doc = "da1d663125b913e3480ad147ac1f5c1befa00110e71bbd2d42384db03fe0f0db3133b49e26d1a336b49c10018990763d42ef49b64440c9138d9d938057ac90e0";
@@ -1833,6 +2085,7 @@ tl: { # no indentation
   version = "3.1a";
 };
 "babel-slovenian" = {
+  revision = 30351;
   stripPrefix = 0;
   sha512.run = "0293242dac7cfa3aafca92ade6b065522872ee7561d9b465d42a846121c3387e710f06e330461d9d4347c9dccb2be3885050847f8fd721a3c3dcad3ec2715ad8";
   sha512.doc = "5e5bcc2a71e4258ccbe3f094f19c782512c70796886c94abe2254e3fc376cfbd1c13115f42da1828f16dcae4e0b95075e9510fe42879f6a116105190fcab70c1";
@@ -1841,6 +2094,7 @@ tl: { # no indentation
   version = "1.2i";
 };
 "babel-sorbian" = {
+  revision = 30294;
   stripPrefix = 0;
   sha512.run = "1c76a622852d0354112805a1db3b2ed6ac23656a754e2909c4bfceb0ab84db201f18d37d8c9fce527ea52fc4c2b302ff943353ec4cd5ab45da76dd4755a09be3";
   sha512.doc = "f79448d484de1fb95394dd28c833661d6c9a686148b544fe28a60af17ffb50d36902d4b7b8b62772466d7588dfedf31e772d0ce5b32270732d0d2453dc7d0fd8";
@@ -1849,6 +2103,7 @@ tl: { # no indentation
   version = "lower_sorbian1.0g_upper1.0k";
 };
 "babel-spanglish" = {
+  revision = 37629;
   stripPrefix = 0;
   sha512.run = "17fa7078d6bd54fff6c73677536dec46960703e14536c4a4476dc46a8586678b117e71058f665cbbf850a269cae841511807c6647251e088111262d9f2c4bef1";
   sha512.doc = "43cf66e656d965bb80e294a5e2786b412e79eb1ac6542a4a3788fde7cc6874e168cff30676c3bfe90c5bb67dc4452769dece84508fe999529d54bde40be5a5c1";
@@ -1856,6 +2111,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "babel-spanish" = {
+  revision = 39920;
   stripPrefix = 0;
   sha512.run = "3a80652d28b1a80ab83c49b0694cd88a236b6420f51c084e4eb24c5ea57a3359f15a05c7cc99118b303f199703749dd724cd5ad30035b9bde7b9f95f2bd34d46";
   sha512.doc = "8e6a424ec3caa8ff9b6d6f0695e54340dfa4fe61c4bdb46e5579ac768894f906458d594869e8d02bff9c7aeb47e75a7233367fcd6525f2a4815d211528552ebb";
@@ -1864,6 +2120,7 @@ tl: { # no indentation
   version = "5.0p";
 };
 "babel-swedish" = {
+  revision = 30296;
   stripPrefix = 0;
   sha512.run = "46dbacd9ed25d6eba7a8f5a26a28c40f5c77cbdf4140e3a6ceac1b34a8afdc95626200ea0a6775c3f00b8aa7ae5b7772144e7ef8d0e409531b5bb74e01a90278";
   sha512.doc = "2c3f738b347fb8a4c6dc3917c840de294f21e544ef995770099eb6d779995ba32ea1a1adc8def7a883bc983a4cf85268628e623aaff44c9be653fe55d901d452";
@@ -1872,6 +2129,7 @@ tl: { # no indentation
   version = "2.3d";
 };
 "babel-thai" = {
+  revision = 30564;
   stripPrefix = 0;
   sha512.run = "4e3e5c6d8944040177a21f04e63bd40e85c24e9327eeddfe98072da38590c58523f676fd7532e4e00d0e3cc88121a2885788d606d2dc9ca02fd91c7f04a6ef57";
   sha512.doc = "791539a57534c4870a81ec2318298b29e9e9ad925161b0a4cf52c49086a865d5b58b60da10829a5fb37e66f0d161b396beb127e586457c556875f1205fac9360";
@@ -1880,6 +2138,7 @@ tl: { # no indentation
   version = "1.0.0";
 };
 "babel-turkish" = {
+  revision = 51560;
   stripPrefix = 0;
   sha512.run = "02916936992e00e7aa884b46b6f786dd0fe5a0aaa6e2c6c4e28fe72de7fe5260fca7cdd37efc4a775a8d172e3993c98df7cec3d1ad08f01487f7cb0c8f2d179a";
   sha512.doc = "06931a6b9987a7affd4632ea5cc79028a2a88c584523c03ce79c2a15268947fb1103137da158886c7957e0a7c938ca69c1c5c7d88104c892cae611c914f6fb93";
@@ -1888,6 +2147,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "babel-ukrainian" = {
+  revision = 47585;
   stripPrefix = 0;
   sha512.run = "6729384e1029580ee8ff2337508cb5998e8a385de25da4d5969341869f22f17180b03a98a403b583ac5b7a965c2a07d5c96b0aff1b93b82cdcb549b4915ceb4e";
   sha512.doc = "f36acbe23a159e2a9547d7cd5b64d529c49a35353f5a84082a303204f8a55f088f1beb0aa75d852595768a3ad10de34763329a22e2c87c5081ce2d6fa4076309";
@@ -1896,6 +2156,7 @@ tl: { # no indentation
   version = "1.4c";
 };
 "babel-vietnamese" = {
+  revision = 39246;
   stripPrefix = 0;
   sha512.run = "ddb75c37017c1b0b6af2cfbdf574526cdfdce2099d599a23cc8ac819f6ebe5ea7a2eda4bd743af93d78835ca5dccb3d7fa55db22b3154862aa4affe83c28185f";
   sha512.doc = "b078464ce848b24d692d4dded7c9827f37fdb4141b719c71e28b5ef0a827f9ea5c2137745f9689fcb89a486d4a88a94a043a62348e86b5736a68ea48c7f33e16";
@@ -1904,6 +2165,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "babel-welsh" = {
+  revision = 38372;
   stripPrefix = 0;
   sha512.run = "89526156517773131b5452f2cf5bf773f34b97b2e35e786f2bcd4dad512519766eded269539ada9d5c34d4b1f02d65bf55a0da0053e6bd7b7a3c66c606cfb60b";
   sha512.doc = "cb0ff59d9c02bce3028f0025c07963d42856eb4e68f322b839ed1ea5f51abf372ea17fc695e7be4bf87f75b3d2b163f801102f469773a4474bd0d0a72a47376d";
@@ -1912,6 +2174,7 @@ tl: { # no indentation
   version = "1.1a";
 };
 "babelbib" = {
+  revision = 50354;
   stripPrefix = 0;
   sha512.run = "70214f7a3e16c1fe4b3bfae479df63c10f9b654b34bd29abe3b4837b1a375b1a13077d0ba98e46a78ed702616bccac6aac3c70d422c85e37f462a376b2ee2589";
   sha512.doc = "729fdb0bcc60929dffce6883db377e487a31610979d92f7be48e017a6f982298a9d113f06376bacbf2406a89fc1ce10cab86a43de3d92be8aeea7e3cb7cb9f98";
@@ -1919,6 +2182,7 @@ tl: { # no indentation
   version = "1.32";
 };
 "background" = {
+  revision = 42428;
   stripPrefix = 0;
   sha512.run = "e9fd9b5e680082aa3e9f0482ebe41a753088a1e61b85876a9685942172cb9d5b6c9819ac2d61e0274f988b46d4f962222ce0afeac2827630edc728125761f214";
   sha512.doc = "518b0785e562fc6f01d6bba6cf7157c847faab151bcfe7840d5f2c9d8fc3ca54689beaa8698c92f24c196393fdbf90b027165be80e6cf07e9ee79ad8073d8533";
@@ -1927,6 +2191,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "backnaur" = {
+  revision = 51505;
   stripPrefix = 0;
   sha512.run = "82fe2e845a29562218dff5d685e9458f2230395fb66e73f658f137cbbcf0e423c9f91bb0ca78ee36a8e0eb4db157ebe13ac3f134dc819b1ded918ff0d1a7ee4d";
   sha512.doc = "4d130cea9a46abbcd092d1e9fbe5d943847b207258119722d5f5ff36534cee77a1dc213938e48ad629977bb72c68de6eee2b4bf9c7afae14c10659cf1ca3f13c";
@@ -1935,6 +2200,7 @@ tl: { # no indentation
   version = "3.1";
 };
 "baekmuk" = {
+  revision = 42106;
   stripPrefix = 0;
   sha512.run = "e10fef8fcee389514d759d7b985df3e84d3459a357fc3b4b6bec5c3814aea175aa8f313ab63e6048e60cfa5fe1cb1ddc0ae0410801893ec0e7ff5eabd7283c9f";
   sha512.doc = "0a69ee489e8ee9fea0fedd80bdbcc7a13505b5e3cc12fae3d56e09a852bc54eb0e64ba73f4c085e5286fb048114eb81aacc2aa34b27d72b4a72b966e188d78c5";
@@ -1942,6 +2208,7 @@ tl: { # no indentation
   version = "2.2";
 };
 "bagpipe" = {
+  revision = 34393;
   stripPrefix = 0;
   sha512.run = "7d815e23e9b5d686e0df54c4a0ad51c85360c7b3879695977fb9be2b69cb343e1c9043c2595ac5554e87e0a568b2441bd16a43b334af4b43e5302eba19bc33d8";
   sha512.doc = "696047cc4965a06388a61232af9336f2010fdb0b869914cf66ac9b052d1efd85ff05119a277aa127cf05f56e03b63060956c7c284df78e93b0f0beabd691d33a";
@@ -1949,6 +2216,7 @@ tl: { # no indentation
   version = "3.02";
 };
 "bangorcsthesis" = {
+  revision = 48834;
   stripPrefix = 0;
   sha512.run = "3d8dd2648361f74ec6af8727f0895ad1e1008ce0e8612d879634b196d5e4cdadff20e33e60e27d9812d7b6fe3762026ee46139f3ade3a3a3cd5d27a941355a62";
   sha512.doc = "97c98bb791018631b7c5bb282aa3585ae68ab1d2d81f56e1be91ad92d6dead30885c478856f59651b533590eca2f80e3596d09f0277ea6dbd6ec44b97ed64fb9";
@@ -1957,6 +2225,7 @@ tl: { # no indentation
   version = "1.5.3";
 };
 "bangorexam" = {
+  revision = 46626;
   stripPrefix = 0;
   sha512.run = "9da594fb6d8dec3727dc5e437923c225aff392250c42566972a6998a4709e1853e6b7399ce64e8cbb7408a422631ee61229cc97001343ac8acee7d5c0fd20847";
   sha512.doc = "576b991d414d9a8b481dd2d76a4ba74af9db70ae720d9b81f16cb2cfd887d8a09c2bd601bf7711ec77073909aa61470f2cdd7573457ea2ed25f9e316417da9ac";
@@ -1965,12 +2234,14 @@ tl: { # no indentation
   version = "1.4.0";
 };
 "bangtex" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "e64473076f23f537a3d543aa325b159b6f7c050b626e880628bfa76a705dbbc57dd6dbc1418b4fe0124e90ec4922e90800b42d5f636ed910590fb060e119d962";
   sha512.doc = "ccbcc6e4739001b6306dc6559f76f577310e73e515aef27ad39c08e770a9eef54a6cd162343aac83ef3530758b3d7dd4c19b1bf5718a86fd321189ea58a786f4";
   hasRunfiles = true;
 };
 "bankstatement" = {
+  revision = 38857;
   stripPrefix = 0;
   sha512.run = "c388a06b1527fe131dd56813303ca727c035f2023b25426e8aae7387867afa0425e4f739c2698b30af97737557c068b94741dce51f8df573c29c14e4cc4f02c0";
   sha512.doc = "5290904ce0aab9e4e098fb4625c8a0cb5c728769faef312267131eedbee937e1d964a561b2c001c38131ff93c9083db46275d693431b2447267edaae19c296f9";
@@ -1978,6 +2249,7 @@ tl: { # no indentation
   version = "0.9.2";
 };
 "barcodes" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "e4b9f432d4464da19d279d8e7a5c2ccbd6dbba27fd175bbe7385c0f34199955c16427fc7bf6b487cad1da0b2e28b94d44267a0042e811fc73a88661f3d312b91";
   sha512.doc = "2054d8b87084bbdccdea4a2c05c43b427249d597880b3870fffb98bcf0bf88adf64c9110e3ff98d1755596d559ab548a464a2d681eb1adbaf57cc748424e0d98";
@@ -1985,6 +2257,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "bardiag" = {
+  revision = 22013;
   stripPrefix = 0;
   sha512.run = "dad9b5a50e5a82ed0285fb36c609c4302f7b22daf71c159848788d8c7c91c19dd44398e98357dd58366cd97140e943540d05b6e1c9937124a40c4b4070065a1a";
   sha512.doc = "54fcfb2473c6ece46ec2b01853c89046c7f5396e97f62b9175cedaf4b1e783285c7c417700c827a7b9fefe5055b10723ce278e5fff0e864434f84020472c1cd8";
@@ -1992,12 +2265,14 @@ tl: { # no indentation
   version = "0.4a";
 };
 "barr" = {
+  revision = 38479;
   stripPrefix = 0;
   sha512.run = "6bd398efda5027e3b762b817ce777adb9bb1c8e593ca04386adedeab7dc26ba382058ccfa3c281ef8612fcc50c9b719e7f881dcde0cfec041cf4b2cd05f238f8";
   sha512.doc = "6600ecadc60fdd00e4d894969a84118265b5c5d07e9a411d3f01887fd1e94c481b117cbda80451774294dbb989a61379b16fe3ba5c3b8363a9a2485b76752aed";
   hasRunfiles = true;
 };
 "barracuda" = {
+  revision = 53683;
   stripPrefix = 0;
   sha512.run = "8331d0a9fd3504eef4e759e144bf34682f55c0bbf435aad9f53671083af2a0c766180665348fd6de4668c67b7cbb3690919619b2a0b175b77f76caa95a951328";
   sha512.doc = "8c7be1abea65248e0f34bd9b538aba2018058688a19d31c696ee964049d44046f4f92117b9db8a1056a4b5e45dcc8aec843971886de69214f0dd3368e1f4c3c2";
@@ -2005,12 +2280,14 @@ tl: { # no indentation
   version = "0.0.10";
 };
 "bartel-chess-fonts" = {
+  revision = 20619;
   stripPrefix = 0;
   sha512.run = "33c52620d32f5e79a702bb664cfcb47409faa049dbf7f34cc5816005b4667267810fab130e3aee1ff7a7e3292af37c2d376c01dd2bbf17be199a22cc36ba751f";
   sha512.doc = "e61232eed7f345e28796192d836af9de29bda257fb85460f67a89bbdfd7dce01b8361962b7cccf314311c0e772e69367f2921ad898c106389195164b6c925ffc";
   hasRunfiles = true;
 };
 "bashful" = {
+  revision = 25597;
   stripPrefix = 0;
   sha512.run = "b46abbc1622fcc15d65981368d5c8a7528f2142d722604eb028e0cc364d6e908587cb58a340283e7afa43581ce365ac7a545bef65d1cb5e273e777467231c40d";
   sha512.doc = "5017fef7ad1c67f33cc881a94f75cce97d422b047d8944dbff377b1f3f3d36025b7b73c76ba2ed96bf06b0c6e9c3e99b97ecf36e2ec8ab8b7e1893dc11f201f2";
@@ -2018,6 +2295,7 @@ tl: { # no indentation
   version = "0.93";
 };
 "basicarith" = {
+  revision = 35460;
   stripPrefix = 0;
   sha512.run = "346edf1704ed621a326e4f945b8f5341dfbd2d46af095691c7b853a9683dfb2254d443ae04bf235f192a57dd55336dd50249b0963bde041120468499e61012b7";
   sha512.doc = "bf454539b0202321121437d2448c3b49a2d6122459af4788a573cc2525f0301d1267b12f3df8636a36fe807c474cb23347a41a2c412eb12b674c58541516ade2";
@@ -2026,6 +2304,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "baskervald" = {
+  revision = 19490;
   stripPrefix = 0;
   sha512.run = "3c0451c43f81396038c3ccff2b4a9b07bf31023fa7afafd2884506928dffc8a9345ff0b8c8114f20b3016026f4532ab138a8b4787a37811501659a0f53c98941";
   sha512.doc = "e9e2c8749e29351b59690027b019da441de5c74068aa5a8457e3014c751fb23dddb0e8b94bf56529879086ea8c58e023a23b85ed9bbaece10f6dcc65ddcf3ff6";
@@ -2034,6 +2313,7 @@ tl: { # no indentation
   version = "1.016";
 };
 "baskervaldx" = {
+  revision = 53626;
   stripPrefix = 0;
   sha512.run = "2351599211d376c25243504645b32f6b6f14967e5a428861b0ab9218fef35f6111b4c0822fb4e63888c4628246cee80863086921e02a069ea010fd21d09cee40";
   sha512.doc = "93ca07e01ecef3aacf09be060744cd91a16cb18f54c2841dafe1b40f046195deac555adae00bdff80577ecb3c9081da856a1eba2870be8d0ae182a66f1e05ccf";
@@ -2041,6 +2321,7 @@ tl: { # no indentation
   version = "1.073";
 };
 "baskervillef" = {
+  revision = 53627;
   stripPrefix = 0;
   sha512.run = "ae3f2b3570269852bb558a8b7db6db1605d520276b57558d67459441e911f67d830fecf44c61f9db71bedf65ac1414b26e152f4e0657d7ebc9d42028fcd67d2c";
   sha512.doc = "559763ae59222eabe3666a9422950bd15b089481b2a39ea0eda80aac3633ae38b2ba8c67f7fb750137bcb261c6109675bd48599c8706ae6de8ff152e5e8518c9";
@@ -2048,6 +2329,7 @@ tl: { # no indentation
   version = "1.050";
 };
 "basque-book" = {
+  revision = 32924;
   stripPrefix = 0;
   sha512.run = "645d55362506a1bcf563a12ddb7616f085d5cc75a45cb2f0dcdf551158b48f595cd71278caf9a0c35f1d85ca66b880e6f59f9ee416fb9bf15cd7c18bf6fda2b9";
   sha512.doc = "7954b1c86ddac3a1409bf16cc7db5470332fb86459257756200dc794a3443b137e6013a7e904bbf63e8fceae64850418e56ad08af12a448c1fe507e29221c7be";
@@ -2056,6 +2338,7 @@ tl: { # no indentation
   version = "1.20";
 };
 "basque-date" = {
+  revision = 26477;
   stripPrefix = 0;
   sha512.run = "2f0cdfa78c3b75dddc5ab9ed15f651308dad4e598f9623eea50929c48d6f15318f768b95d55ba124eb048129447ce1e629febbb3fa6925677b2a46ac94d82654";
   sha512.doc = "249bfaabe93c4306c32c698eede8835cac334a27802253dc6ce1f380eaafa5c79fc3b86ee34ddd7b98df043cc0ccec137ae3d342cd3904f39203b0ffba2fc9b7";
@@ -2064,6 +2347,7 @@ tl: { # no indentation
   version = "1.05";
 };
 "bath-bst" = {
+  revision = 53422;
   stripPrefix = 0;
   sha512.run = "6aaa7b85e0097532857f6ca91f3daf7b5d69750de57f3884f446b0d778dca9cf752abbed289128e575cdeed1d74970684bdfa701318303ef9536170d0289be74";
   sha512.doc = "6678b1ad382c4e99f6b494ffbe002e17df088a76852e0ddabb15d252af38c7ddffe4686189257c0e7ab18525e53b2ad6809c922d319df777309fd2d08d5b6f04";
@@ -2072,12 +2356,14 @@ tl: { # no indentation
   version = "3.2";
 };
 "bbcard" = {
+  revision = 19440;
   stripPrefix = 0;
   sha512.run = "ac7fff708b3e25312460a740241ed003ee471f84dd4d30388d9cde8380ec9a6b6fa6fd6aba69b170c464a25bec44f1669fabc4ac2d7d3e216885b7e683f88af6";
   sha512.doc = "9e4561e97ea77c84e3c1cc8f75ca61318937c45b7b50dab66d6745f61725b6397458a05e50a267937bf6db4b28558ff0e9f2225078b9516fe574620982ab2cb4";
   hasRunfiles = true;
 };
 "bbding" = {
+  revision = 17186;
   stripPrefix = 0;
   sha512.run = "d5505fd7aaffead426a873844112e11fba47694ab07d0f5c88be31188fbf4a09ed4b8f8bce75221b2b2efb3ff81fc132fe54c2634f32679e2e2041944ec92f7d";
   sha512.doc = "a1425b521b1c8178bd6c9b059acf034080be6f3f312decb575b7541d34a6e1de926965cde8701061ffcb57147052b1495b21142f0eac645596a783820eb6200a";
@@ -2086,12 +2372,14 @@ tl: { # no indentation
   version = "1.01";
 };
 "bbm" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "d795fb56f2ba57dea55a546244c5d07bb20c104cb9d1e6f9b6c229df9e5fa4244f8bb883bcddc150e1072453cb518d31c110bb85d157b4fbfeb47195da939619";
   sha512.doc = "034d880588fa88d97045d73dd651a0b3573c624dbbf1d2f9fee046c59f007b9e3e2121d5d773b34aa7b0bc8c72daa540447981bf60731e64d99cde49b5f6e911";
   hasRunfiles = true;
 };
 "bbm-macros" = {
+  revision = 17224;
   stripPrefix = 0;
   sha512.run = "06f59837d585c721da77f289119bd4b45a91e3d72543ed3e4de76f84a2916431a733baa379b83a3e299d166e27bc0350df6f053d1ec744c52dcd0297d416fdf1";
   sha512.doc = "20a29809dffe8090e5c067dd2df9dd5a5f7de6ec7abbc01eb14b5a500f37cd62b50914733edf7403af89a1db86ebe10b3d7262f519dc01dc35b29ba0c70c3478";
@@ -2099,6 +2387,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "bbold" = {
+  revision = 17187;
   stripPrefix = 0;
   sha512.run = "1b123e9135179244050ed6f97f17efa2a43c42018b2fa3b01c956a99886ae6696c83df2a0d61ce95cba925c2bb4c734d77253aab165fe9f622695f557fcb0abe";
   sha512.doc = "c754e81f83a53c4a1cacbd2638d550ad178e0e26d7feb592585579a27b780e11733a7dc68fd374ac575cc7866a1e5417d3df0d2b973e7278d1012657bf340390";
@@ -2107,12 +2396,14 @@ tl: { # no indentation
   version = "1.01";
 };
 "bbold-type1" = {
+  revision = 33143;
   stripPrefix = 0;
   sha512.run = "86631e16388a447db7c521087eccbb666612933f6fee8eace091e00b20b5070d38ebc2d4d0a754536eacef9e9e6470f237d184e00cc4419bff85087f54b81566";
   sha512.doc = "ad841ac652a7985ab907572f66462091b1c40f7cdab2b00086209a2d96056e0a9e32842dfbc22c829b27799882252da95e3d10d4a9dd174f487327d5f3ac3899";
   hasRunfiles = true;
 };
 "bchart" = {
+  revision = 43928;
   stripPrefix = 0;
   sha512.run = "b78e4017d0355107e1e73670c20457c2dc314dd0537bb3e699df3118231b5b3c0b2acbf50ca07f71216d56c81acbb031d38dea7b42099165a03a8049f62021a0";
   sha512.doc = "762b75974de179360fcfe6057102919644a564ad2c3431ef25e2c373267ec063ac8350caf0038a5964345491355ddda4f5190eff6de93f2c2da7ab168c829fcd";
@@ -2120,6 +2411,7 @@ tl: { # no indentation
   version = "0.1.3";
 };
 "bclogo" = {
+  revision = 39364;
   stripPrefix = 0;
   sha512.run = "9afc02338b4141607cfd50d7678832304339d0b532464ada6fbc22c58d06dbc5a0793098c9e24617ba5296c3f7b22bccf16062017701608a758e4a26c05f12a2";
   sha512.doc = "8671f8095005a0abec84a316da59f914d19d8fe0f4d33b13e73d6ddabcefd3ec7fedcfc8ce9dcf2ed3380a129f58bec16f73694a5d2769a18618142de93be38b";
@@ -2127,6 +2419,7 @@ tl: { # no indentation
   version = "3.1";
 };
 "beamer" = {
+  revision = 52222;
   stripPrefix = 0;
   deps."pgf" = tl."pgf";
   deps."xcolor" = tl."xcolor";
@@ -2136,12 +2429,14 @@ tl: { # no indentation
   version = "3.57";
 };
 "beamer-FUBerlin" = {
+  revision = 38159;
   stripPrefix = 0;
   sha512.run = "10d5ac201b18b2d7de8e8e4ce2d08255ced89567f311d449002711235e0e0d052b6001acf5aac198397e295e7970863d42a57ecedb8464c8d49a3eba43b6d90d";
   sha512.doc = "451a4ff305191947bb594394f863c447a96b5ca8327a08a5897ed7486e1a3ddcfb7e415d4da613050e38c8a76388cfbd7a3631be8a84d82e31f25081e71e913f";
   version = "0.02b";
 };
 "beamer-rl" = {
+  revision = 52284;
   stripPrefix = 0;
   sha512.run = "4e7e9cae6b48521baab4d92965d5b4e14d9b09a51e95b45c4953a7c6199c29691e5a8e69a68c0b29d27d51ddbd1fe57ed21cc6dc6744fb0de2f7544848aacf06";
   sha512.doc = "bfa9d52b34ad4edef40166e6a0355e5efd4508499a87c1cf4f643fe30f873366158e21706c06f43822e244c69b85c40d254c68d60a82b91e3a4381d27866b807";
@@ -2149,11 +2444,13 @@ tl: { # no indentation
   version = "1.3";
 };
 "beamer-tut-pt" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "6074f5933b945f02b24c31353bd7d683b35a54f53aacfa2ac19de382f56fbb9f6284316ee70c0eacea3760101d98d4a6b7d78412a0d41b13c9e1c907d181ee16";
   sha512.doc = "ef6e80c3417cfad3e2f3e0ecd3ce249aa0b4cf0a6b5dced09c27138e34a8c86a74d0d03c6888d0944fe2b03bb5b8180872306263c58f54281f4ed2fe3424d4bc";
 };
 "beamer-verona" = {
+  revision = 39180;
   stripPrefix = 0;
   sha512.run = "71b241e603688bd22e10f171d32ea3dcca1f25c136a7c0d0cea3e72e936b068ea7ced6a40c03d2e2fb21e533506bcbfaf10f450493cb4e2c3df2981b714048d5";
   sha512.doc = "ab68e6accfbfea7651dd43b55c4ddd86a66a827ecc6f6353dc58e3aad47ba89e051fb4f9dcc76e0e8081784385cc696fda9d95c0e82c71b0645d358afaf42c4c";
@@ -2161,6 +2458,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "beamer2thesis" = {
+  revision = 27539;
   stripPrefix = 0;
   sha512.run = "793ec95902fbecc2de84616b74494d7e34a1a1c88277277ee82bb172c1ef0cc42cf175f62fa2b4926abb73817b7eb258d85be6689b60a56e0faee941276471a9";
   sha512.doc = "ea71d35ac3e02d3016b8d19d38132ee16960757c9846192cf2213061c9899a9788e98f50dac074b0cf83f6029f883eb1f7784779d0256c719d55490284cfc8f0";
@@ -2168,6 +2466,7 @@ tl: { # no indentation
   version = "2.2";
 };
 "beameraudience" = {
+  revision = 23427;
   stripPrefix = 0;
   sha512.run = "f1fa8d1d30b00ea59b3fd83347fc1ea1e90135e51e8f4393eacdf32ae983a80e865d4364c924c74bb1d409ebf22ebb5e290707b945898db9e6234dd297553b49";
   sha512.doc = "25fbfbf71ff66a80597b368882de63aee2e090e5604a67d66d52e99dd606ce54079e4a7350c4acee5966555dfa5dc8de0e650c7cb4c136bdc40cbe5739c0dfe1";
@@ -2175,6 +2474,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "beamerauxtheme" = {
+  revision = 51053;
   stripPrefix = 0;
   sha512.run = "3f5585ec5b379f32d6051d604526ebb00673fab5236190226fce4bc2a4da3ed4c6a79431edd0c011bd34298d8bc2f5eb7a9dd9aa9b0bb15bfca0195222e1a37b";
   sha512.doc = "faaf5267dea60efacd78f6ed055e1a8691729d96e3959d98ec315ef9802aa01a7193823973c488d44d21ecd845ae21bf51433acf007a34f806656fa6b3a8ecbb";
@@ -2182,6 +2482,7 @@ tl: { # no indentation
   version = "1.01";
 };
 "beamercolorthemeowl" = {
+  revision = 40105;
   stripPrefix = 0;
   sha512.run = "bf9874f0d7bbbe3f95c352d1c5e93c5e7fa3af18dd02eedee553c312ef01783420b035ac74f93eb150a99a597ff9948d978ea575963f4117d0965137446ee5fc";
   sha512.doc = "258016683c605b4961ee25f30077cec69c486cf3ed0cccce2482db01b39141e122dcb46e02e960a83138d124aa269ec903379c3c6b65f3366e96565e90c2337a";
@@ -2190,6 +2491,7 @@ tl: { # no indentation
   version = "0.1.1";
 };
 "beamerdarkthemes" = {
+  revision = 35101;
   stripPrefix = 0;
   sha512.run = "ca30d15a7bc198e67cca5cc43dcdb8e644e03d1c8ed71f0b40c1dd0219ce81688067a82a0ab002b2d72e990e227f4628319cc72d5687881a3b886e213d7eee93";
   sha512.doc = "6a1fcfc34793b93005b683eb0f0f4aae794c56e85fd5e14ac6e1c4eeed763f7c6203bd05c92755a2db91aea10f4c16117e702c291388153415dfbacb4b39d00d";
@@ -2197,6 +2499,7 @@ tl: { # no indentation
   version = "0.4.1";
 };
 "beamerposter" = {
+  revision = 47508;
   stripPrefix = 0;
   sha512.run = "e4ade5948c1eb8e18cba3d3b7699686d55d57361e0b26b923336d295b8fb6c7cdec39832dbe4f9358c94302d412000f19b4706295af5856e12482bb3c9951a98";
   sha512.doc = "88ec2b723a551711c33972cb72b7ab9ac13508f583e4e26eaa1c9e6d57d537667259b4f93e7e33fd2a5db8086998f6ddef05c363613be645eb293606d72cd52f";
@@ -2204,6 +2507,7 @@ tl: { # no indentation
   version = "1.13";
 };
 "beamersubframe" = {
+  revision = 23510;
   stripPrefix = 0;
   sha512.run = "d3ab81c5eb90d8566eb850c25d7751f5a341107fdb756b46bb50b392741746eea356ff54ef1ceb6ca6f0a2c0dfb7940aa7cd6e3d0cd27e4328e817d1be454964";
   sha512.doc = "85878ad48e6ba191174140517ac03039320620f246efb51c65e57541d9cf569d59bdd6cef17f10f6f6d85bff9532f6ea70175cb09b68ea6e59312a407d89f557";
@@ -2212,6 +2516,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "beamerswitch" = {
+  revision = 53467;
   stripPrefix = 0;
   sha512.run = "e117e71b17cf08b9194edb502fa60b0e551e80db08e18fd56c7b3e1a23761b47ccaef2fee4aa547bd3c04ff8ab0fd7b3128d2fecf972fe389cff7bbcfeff413a";
   sha512.doc = "f893371bfc9e636d0b5bdfcdcc6209fa264744887ab145eb23335d891082b091d809bc1ca59d75163d8f95179221235327198abdf87bee7116bb0b5271523697";
@@ -2220,6 +2525,7 @@ tl: { # no indentation
   version = "1.6.1";
 };
 "beamertheme-cuerna" = {
+  revision = 42161;
   stripPrefix = 0;
   sha512.run = "f0433d4a4582958ad057fddcddf1f1f992ec98a199943bcf80a7834e37eb7fa5660258edb08e2bd9205628dc1b8a69419c907b6c007a1c63cd1fb335e439125d";
   sha512.doc = "96f4e9c3afbb81a7841130ea076b2cd35477e93eb105c03add6077fd76981cbd14b609c3b9e573f143572764ac87b1ff76ce18c377f3bbd9b02a1ed45a02eaab";
@@ -2227,6 +2533,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "beamertheme-detlevcm" = {
+  revision = 39048;
   stripPrefix = 0;
   sha512.run = "cab4d390d7469056f2235c493b9383a4374c4a686810db428cfe622a4c2513f7176df489d22f7e37ae1f8a2d3303443b60c12c577764be2258b345fe9c3dc543";
   sha512.doc = "2c637af44b258c688449ad2bbd81664e3086efe874d03352ab393487d7eae1148773ba39a498611a848c43824415cb5b860259111f6d287fd9e6d7f1c01eb530";
@@ -2234,6 +2541,7 @@ tl: { # no indentation
   version = "1.02";
 };
 "beamertheme-epyt" = {
+  revision = 41404;
   stripPrefix = 0;
   sha512.run = "2bf451ccfe095384aeec149e97d7022cefaf997cd19dedffcad5606fc149739cf21b6128ef08e609aaffd6afbaa59b1cdc401cbd3ee4fbe0e997d724b713a620";
   sha512.doc = "a615bddd7955869d7e175f734a06308b166057dce0b479a4b11d2bd1d06fda7e0a4fdf8185d0a3db2d2302cea2890184616b92d0b7abd5321fe9edaca6dbbd2e";
@@ -2241,6 +2549,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "beamertheme-focus" = {
+  revision = 52872;
   stripPrefix = 0;
   sha512.run = "8f863bb0b42356e9d4b11d62020bf81c84662c71820101fa2e5f6303d8da8cff955cd370128fdadded781afdaa0937630733fbdea67fdc80026773cdae4d01fd";
   sha512.doc = "6f8c1aa0cab3a9cd906c5eb6ea4e727b344e8a15479641acf04d23141a4af80169efc91b2117270be38c1d7505625458f276578756d61e12e34364fb901c383a";
@@ -2248,6 +2557,7 @@ tl: { # no indentation
   version = "2.5";
 };
 "beamertheme-light" = {
+  revision = 49867;
   stripPrefix = 0;
   sha512.run = "5cc15c3ee0222678c1c97b31805421caac8b20fca03b1d748fd2a71756d5d764b8fbfb32ab70937e890f7755966b520362db98a9ae65be3f83509cfa287d600a";
   sha512.doc = "e2d0cdb7fdabe582f2b6f1a656a5b9b61ee3680fd4944c06f108cf69eced96bed7b25e56563b1cb9879e8da42fdbbeaa41d769158c5e256bc70b5d695571a5af";
@@ -2255,6 +2565,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "beamertheme-metropolis" = {
+  revision = 43031;
   stripPrefix = 0;
   sha512.run = "dae8058ae5c2883b383a2bcb85bbdc45d0b0a3fab46a4498ea1f3b8568f04d049598fa78b72429adc7e36773905c67801e129378e233582f0fd8eb5ca4327745";
   sha512.doc = "c4661061ea3ce52a20fb8c704042cf755b8b54549dd62467b1e78f85a4067c11a02c89422384e96323ef277ce44a3f648b1778b54e0b5c79b721f67451fabfc1";
@@ -2263,6 +2574,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "beamertheme-npbt" = {
+  revision = 48424;
   stripPrefix = 0;
   sha512.run = "bbc620fbe30505183c4678e0dc9c7574ba93a4c410647b54609c310918e32a638265b07633932e2f5f63fd2ecf8504869e4f3f138073e666e1341a4d0aff327c";
   sha512.doc = "0c1f5df1c664a31e400f4d05a9f2b57c4c9fbf881295fa8165796944a06ace35641487df93db33276924d4e7c5b9d6c621aba70e5ed9ee61dc269af3b51f7a2a";
@@ -2270,6 +2582,7 @@ tl: { # no indentation
   version = "4.1";
 };
 "beamertheme-phnompenh" = {
+  revision = 39100;
   stripPrefix = 0;
   sha512.run = "30745bb1f92c230bedd953d32eaa6f2085ad2aa7f147bd3368fe8ebe4f6092ecc615acce55b9573da4dc04c8e89877ba2705a6712cd4c4f67f34dc59eae97880";
   sha512.doc = "626d124c6ac02271cc3bc137e60b8a66a861b7f692910e9fad283d8836599e3adbdd1ac472fe66955a392d1b563e955da852cfd5a0d712d284fdb2dc4d709a63";
@@ -2277,6 +2590,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "beamertheme-saintpetersburg" = {
+  revision = 45877;
   stripPrefix = 0;
   sha512.run = "c258a4eee25ccdb2437625982e54def90aec87be003f697a47334be52b85ef223b377c7fc57d49c889121caea664fcd6353015ad2e62f5bee5379bc222958f53";
   sha512.doc = "bf51e2bc33f32ba3dda6c140040a7499a60c26082569729743228a6c7abc97fb20076d1d0c7d0b64a25a54cbba1d9a8b59a9059d160a5a488ef6641999e8611f";
@@ -2284,6 +2598,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "beamertheme-upenn-bc" = {
+  revision = 29937;
   stripPrefix = 0;
   sha512.run = "0c483991348107a2b9102e514ec05838a9ae3e97dceddcbf3b8cc21ae635a272c7d70d97b2e1a0929b7545e50560f16a71f7b290ca16cdfd63177782b993b714";
   sha512.doc = "5feb0a4401d9ebbc4672b7f9668f850fb65002c7d7124c607009775149c4c428642cd17df133ae80d564ab091fdff039d34c1704360033f2374b55466fe1b618";
@@ -2291,12 +2606,14 @@ tl: { # no indentation
   version = "1.0";
 };
 "beamerthemejltree" = {
+  revision = 21977;
   stripPrefix = 0;
   sha512.run = "b079ceab30460a7b92a616fa6d7216ddddecfa02adfd66bf38aea83eccdf6e63cc52d8b2ae88db0b21962af223b364424227806beabbfb2e344af98474af2528";
   hasRunfiles = true;
   version = "1.1";
 };
 "beamerthemenirma" = {
+  revision = 20765;
   stripPrefix = 0;
   sha512.run = "6fe83e0805fde96d585dc027ecadd23862815171f56f6a05db0a6788018a096c193c995895f7ca18af6d322877e24d570743d84a922a2c7e4baef35d3f6dfca1";
   sha512.doc = "13f1dfbc8f09662b627dd4ed6c7ff297612c5d05a140a446ccdcb6f0ad3a9995b434d418994cccc2323ead666eaeb10b32e1a9d410a38c632df9873717397231";
@@ -2304,6 +2621,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "bearwear" = {
+  revision = 53425;
   stripPrefix = 0;
   sha512.run = "cbce954b7c626f2941e77a121346dc4d9fb618908165bc1d8a6a55904573249dde7cfd4a6323c9753e8fdabd88b73aaf4b7e6d4b40b21e13290e2a80d2080399";
   sha512.doc = "2d9c60efbc6d0d29d31daebcbef2cdc0d0af35a84223107424e36ecfb085b7341340e06b9006cae0ac15ba93ceaa50e1b0a942b7a01292f9f5010f32983fd4dd";
@@ -2312,11 +2630,13 @@ tl: { # no indentation
   version = "0.1";
 };
 "beebe" = {
+  revision = 53819;
   stripPrefix = 0;
   sha512.run = "802a349991ec0418de9a3de2247dd73c904ec5e3223f17cda0dd2805c8012276fabf412b861d656bfdd7aa2da46fec251b7eeae083ac3ed361cf1219f9b2e915";
   hasRunfiles = true;
 };
 "begingreek" = {
+  revision = 36294;
   stripPrefix = 0;
   sha512.run = "88b3bd66f458eacdb1c4da1cf4a44de333ab45f3d498eecc1a1d4b688c955b3a759a620642e3cf94268136989817f97d783475740a0c16d3b5578b670d967719";
   sha512.doc = "3792be7b825db6ffa7194a0cad8d8ba0c2ab3ef64f87abeb607870702612a22c798a61e8b07d61f21e1a0db30c4645c3ebe03bc0ac7c297fbec163d9cb91f22b";
@@ -2325,6 +2645,7 @@ tl: { # no indentation
   version = "1.5";
 };
 "begriff" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "ed1060e0ce9bad28f98481eed44f8bd98f6b8be91dd5dc87d5c34a6cc57e724d175fa909fd6ff514399eb81bd8f28450f7c9a6c6a9bc991f35d617a8a25de8ed";
   sha512.doc = "af28c20897e297af4ca1fb13bb286ff0eece9e2f06f5b734062716c0c5f5b7dd673d046a5a47c907f9a845a7257393f3328d46c4ea2ac0ae6b0eff1244e97256";
@@ -2332,6 +2653,7 @@ tl: { # no indentation
   version = "1.6";
 };
 "beilstein" = {
+  revision = 53925;
   stripPrefix = 0;
   sha512.run = "63e4720a73e3ac4abd650c3787dc85e7e4e261481e805cfae4f32dc7ce9cdae6e08516d3e8f10c0f52c7d7790e6d2a2bd390bb512cc0b94fbdb2e04cc67b2495";
   sha512.doc = "cff7c9ee987ccfcec0252e3e7ed1c06f67d9ea6f6534d36b62c4c00df0f1fe99123debd2fce376fd8d0febcb9d3fcc61b14ee9e4ee7b54a9ca042056beb4d7c0";
@@ -2340,6 +2662,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "belleek" = {
+  revision = 18651;
   stripPrefix = 0;
   sha512.run = "cdc7499ec32c26ac524caecc6b5c1f30f3ded83d78756b198b918d321696f378e6487f528cb3781a44f3485110dfff14a14c9b3306e22ae79a8d262c1f1baea4";
   sha512.doc = "e974e00c2e43d01d598c18f664e8ca3ca9259ca55089598c77468d6f50d0cc9a64d4fc23154bf9ba7acf3b9b9ca406beff24623eae5b6c3ce4c167904e5fb720";
@@ -2347,6 +2670,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "bengali" = {
+  revision = 20987;
   stripPrefix = 0;
   sha512.run = "384c07640acd5d4ef2fb661d661f1f3550fd84ed08e5345ec71cd7b3189560cff18c4992a91c13812e5bacd06364e3cc52faf6fd32d01a4fac1b2928490f97b8";
   sha512.doc = "cde57bbf0c8eb52b92973f80c7a780d30967fc2dc0624f1626856054bc0005a5f0e318474f145b9abd60a59cdb6e87e8b4a3b03b4b18282db758b5f110b46371";
@@ -2354,12 +2678,14 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "bera" = {
+  revision = 20031;
   stripPrefix = 0;
   sha512.run = "103b2db8f7bccf6a9729faae793246d2933667295ba404fdaa7b61cfbce0f1209ea27e7a2a63846c6550b41214ff496a62598bbb9b731c087b8bba9e0abade80";
   sha512.doc = "2606c87871d6f6ed27b2a5e49117c50f00573bc6b9ce249d1433da214764b220eb00c73e59be43e32e8a4827c397c53504103e00b7e5602de5df5bb817e2145d";
   hasRunfiles = true;
 };
 "berenisadf" = {
+  revision = 32215;
   stripPrefix = 0;
   sha512.run = "70dd547d0c5138f2a61e20b4585160e5fef281bbba72ba8dcc7032efa957d80c158ba88fdc0dda9982dbcd69a48d5d54286f52d1425a5819e54e05d79eb9dd49";
   sha512.doc = "f076717ff948247589225fbe4fcd92114d719526e535d645d767a3f7fdaafd3a6ca84c3a60997074186974ebf045e31a51d16d53c8a5fdc78a2461733cc66372";
@@ -2367,12 +2693,14 @@ tl: { # no indentation
   version = "1.004";
 };
 "besjournals" = {
+  revision = 45662;
   stripPrefix = 0;
   sha512.run = "e797bce36fa6529d6b57be352ed81b7413c2ca818fa904a8cc4c7c8f0801369543482aa5c286b40f6f7c5e0b73d53b6aa6b9aaeab3e6229da7dd954a3dedb1ca";
   sha512.doc = "c790eb0ced559adc6696f0f228c88a2314214ff6a4ab71ae03dc46b3974cdaae53fc685c05f0bbb7646a5b31d332f763fce4a71919319aa520965f56979eee54";
   hasRunfiles = true;
 };
 "bestpapers" = {
+  revision = 38708;
   stripPrefix = 0;
   sha512.run = "d015369a268cff98571985f319f95df9ffe0255ad222e8c8133252c3ab5537cfc4c3ea11aab13a565c096e92472d7724c0ef23ce6a71f62c7a5fc2b30382a054";
   sha512.doc = "cb5e9bbcc83b6081dd0207001d1b39c6e089e2ae168f20d1cc87482560a483e4ea195fbf208c342ba691d3c85ea9f4674b2eb6cf68db9f9d83d3b98bbab60dc3";
@@ -2380,6 +2708,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "betababel" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "db2a590e8ed5e946652cc54d5c01bd540b87f77253278f9211c8720229992275f80edc26d0c94b4f68237d84a5bf7b56bd93a40e2a0ce8df5ffdeb124c81d219";
   sha512.doc = "209f8fc6123f8403bf6a30731773aeea82c5c6de123e24755e9a22ca6f3ea170015feeb541242a772c3244e7b74f1a766e95886e4f773f21c48b353f22d6adce";
@@ -2387,6 +2716,7 @@ tl: { # no indentation
   version = "0.5";
 };
 "beton" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "23d243f15a79246aa590a7ec65249724a4460ac6e3ac01dba2aeddfc169875dd8392c1374cb8459ff84210d51822430fab9d75a87f0ece20323cd20709de0c14";
   sha512.doc = "fa579427c97f930455bc548d5b438f32aa291d98f9d8b391dae686b270e135605cb3ddd6cfb9076cb248a17eabb4e62bcf4f720b2daf829b3d12d6ebc294f832";
@@ -2394,6 +2724,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "beuron" = {
+  revision = 46374;
   stripPrefix = 0;
   sha512.run = "623d3b7d8747ce1776de9d0ee6eec013c2050f9cb4a521167bcf23435d5e30c1233ee869ccb299360cfb6f8f4b4034a77d4fe601f789211b290684c0858462a2";
   sha512.doc = "812dd30a9b49d7ab5e529f3c7ef934be5d72b75adeec1a38cba77c867525243ffd0d4f4901c9100e6518eb0a8c35e208157b8e3669d3700203ab7fe95aa29845";
@@ -2401,6 +2732,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "bewerbung" = {
+  revision = 37880;
   stripPrefix = 0;
   sha512.run = "a82ffeb4fc7fa5bc42f06476df0c985d59d70c81b34ab50f10cf2117f8861a09b90ef3f53bee78291842a46fbc15bc40663d65b88c7c682c72b25fc86ccff2bd";
   sha512.doc = "d9fb4f9da944e132187fce6e987be8eb0ef08cce80ce63e8813c1af8738dad61a93aa7c2e214b3ac0b77c980f8a000251ab9536c8a7557b9c7cdf66ae42fcbcd";
@@ -2409,6 +2741,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "bez123" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "e70a0889ceab74fcff4994568a97f31ac93165353ac207ee683b28aee2ad3cb8f770d8e3b450e3237537e97312a0995fa8c17196ead0fce55fd76a49c77de72b";
   sha512.doc = "91ae5e35394e5bf3a6bbcc6aa7d7180ba546b58e84683c569bc34f5b0f9dcc6ea30153305fd83fe28e3bcd8eccb6179d277d28e1ff56538fc6980a7c3ec8f444";
@@ -2417,6 +2750,7 @@ tl: { # no indentation
   version = "1.1b";
 };
 "bezierplot" = {
+  revision = 51398;
   stripPrefix = 0;
   sha512.run = "0cfc80b93b76053591f4d76e3cd2f5518dec2dabc397b0d18f0d9edb40a0eabfd1ed608b0cbd6f4b7b28b9a10a9668b21f9ee798514bfd3ab4cc125392512d6c";
   sha512.doc = "284cce26134afe943c4b5c0b3d968f2512fa1c47ed1f2b19e70f48d618829b76ffc200933933f27b407e1086d95f38a4e9ecfe85506ccc2336cd5fe7eb40bf37";
@@ -2424,6 +2758,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "bgreek" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "64a0a2a8e19d7fbc2953b8f1e9fee90d0367e5f943cbf146489e930d6a946f9977c32b5ea3fcb334c2c297050b36292f813e073e35866a167ddddb72f123a2d6";
   sha512.doc = "b5af046a386422400434b1c5ef441cf1c2ddc29f5d4b089aab0ece392e7ea81d9ba224145d612d721d13f05eab3e4b0f2cd6283f95e096d831e6e68074d6fbf6";
@@ -2431,6 +2766,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "bgteubner" = {
+  revision = 44205;
   stripPrefix = 0;
   sha512.run = "0bf19f7ecb12194c2d112ab15226aaaed3737f99cb2841ab9c755e78e3fe92d43f8c1e3abca566426f1c16bb4a200790d77397129da594239aa9d2f9a6ff0a0a";
   sha512.doc = "a4277960129fff04ba3ef6e24463866ae75ae0b690d8e95f618a7c95a442dd02e84d16793a4f5ac12a945ef3b4bc7af05fdc27e551c0e8c92c141081d6a71cd3";
@@ -2439,6 +2775,7 @@ tl: { # no indentation
   version = "2.11";
 };
 "bguq" = {
+  revision = 27401;
   stripPrefix = 0;
   sha512.run = "8a795ba517941a07ec1445a16947ce5028cfd61ba2b5c818bc894ffa73d439162271d6269c67c8ee7afd6d13551d4a9bf73763c00b719bf3a9019a8e7d368256";
   sha512.doc = "1bfe38f2d904af63a5a0fd2ab4accd04fbd294083cc462f7d53f79819f40dccf1c3c729ad591d15327eb120bce847ae62c2bc9b9554ea278c1974e3b37296dc5";
@@ -2447,6 +2784,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "bhcexam" = {
+  revision = 39041;
   stripPrefix = 0;
   sha512.run = "83841b8ee51766a9fd7acaef2f2c2662a969e5e6460a54db66e1b70138041eb799eda2e4881b0a2102a00019464a26253ca7d36d7858d2d56684f104bc570be3";
   sha512.doc = "167f5a65edce24e367d6cfb7ebea877b13b1d9cb6f406689c9bdcf364aca0ed04d86c0c1cd3694986dab2ac10230818cbf58f8039568c3e5d9b6b4b98bb93ec6";
@@ -2455,6 +2793,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "bib-fr" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "24e5ada94266ba8786470453bf8a076891e9b7efac1ff64fcb559bfe2c95875d3120634f94f464c9e40da0f45b18a78af1bc428106b31e85851a2998b58f0834";
   sha512.doc = "a19ffa9b3ce51d372a7467bdf7e360ac4a0faf45fc2205eadfaff16fb640ffb0cccac7fd0849a74955dcf612e353f0e25f94c0af9e3b5bf617f067606c1da120";
@@ -2462,6 +2801,7 @@ tl: { # no indentation
   version = "1.5";
 };
 "bib2gls" = {
+  revision = 53964;
   sha512.run = "96d9bbc8d0beea9bbebb6fe4c9611c12947c1b820c0b6e029052e292797fde624166761f112cecfbc4ce040c66b4f5fc0c6450facb7827d8af3dd365a2a58920";
   sha512.doc = "c08f2ab6452f4dec935131f0139fbb84e8fb92a30f909c7843b452f9c4992532f4bcc9012539d795037d555ad12da918fffcbc8b8373bb6bf10045858c0c5e65";
   sha512.source = "683f9f48c12bb29a413592a38ed21326b0993010e6a0244be1957c54ce8f1c954f74fab9e16e169dfa0ea254fb05803e0b89ca985242b9588f0556bb53ad2829";
@@ -2469,6 +2809,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "bibarts" = {
+  revision = 50226;
   stripPrefix = 0;
   sha512.run = "04ac23199e53049f54b670a2c6de94546a01d987e96aed23617692aef156e487dbf631309b81aaa0a95885f9b989e4e9fd9409d444d319cd58169e930b842ae6";
   sha512.doc = "4e6282217b655fe87dea8e5cd68ed0db14990756bf997e90d3a5def53da50fed63687bf33e00ed741ed437572bb554fe68ce34b146bd31f3fd16e9f66e5879f8";
@@ -2477,12 +2818,14 @@ tl: { # no indentation
   version = "2.2";
 };
 "biber" = {
+  revision = 53064;
   sha512.run = "e0f59f15bb12276ba653ae57d7599a0d31a5dcd67c64a311382a14ceda686acaef689f1e3be72597b2333fbf3df1d9ea3b21c12ade41393972853ccd51d1912f";
   sha512.doc = "4aa96124801d1cee36a2a3621a697ecc2184089fc7893ffb43de27e6a9c29a093e22aa5a7a54f0587b35159055998f7a2424637f83fb5107450ad4a3672dfe4c";
   sha512.source = "e467ec0b5ed9f3d568cde7d71962b1e8c6c1a3ab26ec48b75a08332c69521ca740e54f14558a7a0ecc8f7cc7ef1072fa7a5745f1b84f61a3f7e7d7a709378f72";
   version = "2.14";
 };
 "bibexport" = {
+  revision = 50677;
   sha512.run = "75f9cb374e0aee1b049e977e3ee1a855ae8f908a6c6191589ce9d9fc28a8358fedf93faa416b1020e157a8ec7a3980673d00e052a100c88724e86050ea5eb487";
   sha512.doc = "ec96364b4a9f7ab446c6b0104646e82cab1c9015e0d3dfac6a795e58e02dd3920737207d16089c5470ac32f76a61be949efa6899ca935322c0062f71f3477b16";
   sha512.source = "6c18b4e12e8eecdd03f6afae80766cebe3f826a1146c38b6387c6793abf284d3c44e7d4d6050675f01676128f1d073d8ee8f38f31a6081049b8c390b5a7813a1";
@@ -2490,6 +2833,7 @@ tl: { # no indentation
   version = "3.03";
 };
 "bibhtml" = {
+  revision = 31607;
   stripPrefix = 0;
   sha512.run = "c7245cce245740f0d930518cfee66dc513bd4b43c8b5804e1012fb95f401dbca2321be44ba6251de573723ec2e6da85fc77b9a9192004ac2144bfbeb3225d27c";
   sha512.doc = "cf01a0853d87180205651768b639ee4cf7ed1b6bb4869880489f57e37ed8fbff3e8406fbcae1d0c652b3d410f77af9b4d1932ee154c60cc79e2876014abf7b80";
@@ -2497,6 +2841,7 @@ tl: { # no indentation
   version = "2.0.2";
 };
 "biblatex" = {
+  revision = 53063;
   stripPrefix = 0;
   deps."pdftexcmds" = tl."pdftexcmds";
   deps."etoolbox" = tl."etoolbox";
@@ -2509,6 +2854,7 @@ tl: { # no indentation
   version = "3.14";
 };
 "biblatex-abnt" = {
+  revision = 49179;
   stripPrefix = 0;
   sha512.run = "f2c239aed726d57eb98cef8892c4b4295205d5a8d55a14b16db8bd6b42bf3f51aadb0dc767f97dfbcd8e57a1f867c5e344c604d726453113a007169edee0ff58";
   sha512.doc = "04158e1b92a2976d2a5cc107e00b5e4ab90a85799f9e55b25936fdd0e141fc2196f0f64577bf2eb8997b7ba5b7e8c575bb725febfc397940d271ecd5f56138a8";
@@ -2516,6 +2862,7 @@ tl: { # no indentation
   version = "3.4";
 };
 "biblatex-anonymous" = {
+  revision = 48548;
   stripPrefix = 0;
   sha512.run = "3a3cc037e3ce718c219e4bd4e380075d4a92d85cd1f490b8ffee10c5b80bb9e515f1f170b53eae033ea064cac2ddb3bb285655482e5cd65801403584fb9e215e";
   sha512.doc = "11b4a4f281068004c2bb11028200bf7f8b1461b4b40d0b52b60d60f145b3e9ea38fb672ae532d8430b0ed889df631b1dbeabcef5e9373b720d4a3c3354254789";
@@ -2523,6 +2870,7 @@ tl: { # no indentation
   version = "2.6.2";
 };
 "biblatex-apa" = {
+  revision = 53873;
   stripPrefix = 0;
   sha512.run = "1fa8864f512f62025a4ad844c2c1b9571028911846f8ad57dd86ad189c331586e316ae403104ba717af308c89ca27f822ce6f2800df574e5acbb07d95b822c2c";
   sha512.doc = "7bb1923fb7ea69b4a34e77c0e7b3b5792be6e603042021108ad679a045b2fe0bb8cbd6a74bf3530c981e94ed0d8d419bd95d2491bf05f4bcce1d610682d1d912";
@@ -2530,6 +2878,7 @@ tl: { # no indentation
   version = "9.6";
 };
 "biblatex-apa6" = {
+  revision = 53000;
   stripPrefix = 0;
   sha512.run = "83a7456021e207fb8616f4dc1010979e4e37097f05914fdb6bd631c02a75f28e5892cc028e0d05981841a419e74e4d02923b2b58be883855574acbef5973fa26";
   sha512.doc = "963ff8ca4c6e7c81e410af7d476936def4b19867b38f6740952581f36e87b52872dc3b90b731b8445ecd13696f9b383a48cd5d473754f6324f4bf13eed1d4d7d";
@@ -2537,6 +2886,7 @@ tl: { # no indentation
   version = "8.3";
 };
 "biblatex-archaeology" = {
+  revision = 53281;
   stripPrefix = 0;
   sha512.run = "04c9541ac2f3cab21e412b0ea2efc284f9404f225f83f13c5ec3da2d6f3e7274e5d24647205079971beb11125c8fb3403bf09bac3ae5bbe353f6e2eb073d28c2";
   sha512.doc = "4cb13b2b394262a7c8ed212092cf65bd0707c1f0b0e8c62b1d166fc929a7ddd7f676e72b0750680908c67a17dbcd5dc1b558ef83b35c8ac7b43048fae2e56856";
@@ -2545,6 +2895,7 @@ tl: { # no indentation
   version = "2.2";
 };
 "biblatex-arthistory-bonn" = {
+  revision = 46637;
   stripPrefix = 0;
   sha512.run = "93b48bb950e9a4bb81efabe4a3c8ee85d7056daeca88c1c1a070c5321b8caa0045c4005467cdc029f8a26b94a425235e36a36bdee163242194a5301ddd6fcc98";
   sha512.doc = "e31b7912ca34e6ec27c365c2b3e549cdfb60bd94c19b9f1cd54d35d2a1b99ef2702c3f818f7354ef4f5d3157c0e29538a94315ae7af8177de23893e598c7d439";
@@ -2552,6 +2903,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "biblatex-bath" = {
+  revision = 53424;
   stripPrefix = 0;
   sha512.run = "a4025d3e6a8b6ea92d8389d93e5fd05fe9cda7c806d96e88cc24522d02b8757e04b1064aeddb429779feb18db2af631c2c3830cb84fc03aa4376e981c13e2355";
   sha512.doc = "af03f6398bb8b64abbb6568428ae75ba5e958977ae977e9198f17186fb72ed4712eb8a2d74abab643fa67ae0c5302b041ee39b413f06f56c8f47f1baede975b0";
@@ -2560,6 +2912,7 @@ tl: { # no indentation
   version = "3.2";
 };
 "biblatex-bookinarticle" = {
+  revision = 40323;
   stripPrefix = 0;
   sha512.run = "8a7bfae09d95434d6db671e4037a2f1d5c1ba9cae5982e286389364ee2ff24f9a2daee78c69e529efd06be37d2e6a6f860820361feb42f5b84157dda2ef0988f";
   sha512.doc = "727228b915e6b370a74b4d38dffde3bbb7ae47973c33263bafab2aa6b640102775dbeeea7f09c046903dbfe86dbdfcdd8e0418d125a51678e603425328cd2da1";
@@ -2567,6 +2920,7 @@ tl: { # no indentation
   version = "1.3.1a";
 };
 "biblatex-bookinother" = {
+  revision = 53484;
   stripPrefix = 0;
   sha512.run = "ff9cc867462155dde3fe654a1d71bc3a3370ce0ad5dfdd8d6a799581e637e17f687a2830d56c3d396616bfecedb5b0d562513d5497bc89e02dc76874e948d95f";
   sha512.doc = "0ad1d1280699e000c7183c2337e7c2c7570bbed2fb901872249bbe733098cbc623c68d1d6357e21274f8e2e0c1ada023b6e845ea21e96f6c22a22acd5741051c";
@@ -2574,6 +2928,7 @@ tl: { # no indentation
   version = "2.3.2";
 };
 "biblatex-bwl" = {
+  revision = 26556;
   stripPrefix = 0;
   sha512.run = "ca5e20736a70ed02fbdada150433162b64b39b0d95bca623cebda8da821bfe8554f9409cdd49af7559737dbc6d6033bbf6868f5ed809b1004cbeba4bbabbc38f";
   sha512.doc = "32acf8bc10c07532e8d6174f3dd9a1f850acaeaaa5a91d14a1c299f2f5f22e34c619a41fd9ae7a90e097fd5ec30fdbce581f65560e2891f697ddb0106469f50b";
@@ -2581,6 +2936,7 @@ tl: { # no indentation
   version = "0.02";
 };
 "biblatex-caspervector" = {
+  revision = 52802;
   stripPrefix = 0;
   sha512.run = "0dbc78505f64dfdae6bfda4276f0958b046305b847c8d228d8ccdad2657c571866380bcf3026c6ebe260e27060c184dea61038b99079bf93c0c98994ca64b267";
   sha512.doc = "91e37539ffc49b637afbfd097071fd6b0124f8e6a531287019f21c1ff9d13d8cf57d7915fbb65e489ac800323dfde2b251da8fa1540d6bba1cdcf19347c5d03d";
@@ -2588,11 +2944,13 @@ tl: { # no indentation
   version = "0.3.4";
 };
 "biblatex-cheatsheet" = {
+  revision = 44685;
   stripPrefix = 0;
   sha512.run = "a974a8eeb4282f66ebdc7a57d40c76b0f2bc957249c130d4f97aa9f9749f5091745a87db277c3bef43d0f4e37790a9663949ca3bba3b28a16d37c13bd6029181";
   sha512.doc = "a2b9a82afe127d0bfb71f3a481eed3198e27ef35caa5cd08557ed35645f6209e9187f1e0c21d6fa51e6c32d0cf044c0d85373195a5f034c856fb4beec360af13";
 };
 "biblatex-chem" = {
+  revision = 53012;
   stripPrefix = 0;
   sha512.run = "16ec0b77de0d9162287dfedb7eef76818b7d58f6764e4edbd67e25ec141919f23802602f1505dd92b2fdc8ca948db0a32ac62ab99d1b79baa2e24ea616165556";
   sha512.doc = "0c19ce9fa71e67b035f3b945f33ace8f21b65fdfd5d290284a3607d7aff74f50123b03656601a77225632c85d5c6b12ea0beb54dcf5c3d22752c2f6763c72efb";
@@ -2600,6 +2958,7 @@ tl: { # no indentation
   version = "1.1y";
 };
 "biblatex-chicago" = {
+  revision = 46331;
   stripPrefix = 0;
   sha512.run = "85f50368da0e9497b92c09548c60c7160779fe583a8817a114d625846349dbdb0f9be6813476bd74246016b85badf90733557770094207107fa3d23bdb436783";
   sha512.doc = "aa511c96eed89d10629bf6f47aad832530f1c108a6f5eea64bfdb9c47f377e7b64b69cd55eed2022ab79fb0d93a31574adb9182919b2113976d1ff084898e920";
@@ -2607,6 +2966,7 @@ tl: { # no indentation
   version = "1.0rc5";
 };
 "biblatex-claves" = {
+  revision = 43723;
   stripPrefix = 0;
   sha512.run = "008cb8403f1b35a7fd077f8ac2f33f73ced090ce3d65ce678ecfe90af8ab6fb2b4349342aa838d2d4f1e78d0d87267c7b8206a3377c6490499ee9196498c130f";
   sha512.doc = "a11a4df38dbeb4c27f30b824c9f1ba230d273e227b8cdbfe5f61268a1a2b7ff3193e79d8e8bedb6f9334df39001b71a3ec78116637745679bf3d67582727371d";
@@ -2614,6 +2974,7 @@ tl: { # no indentation
   version = "1.2.1";
 };
 "biblatex-dw" = {
+  revision = 42649;
   stripPrefix = 0;
   sha512.run = "faa43e5f4de281747e5cbc22fdcbfb7d03c5c04d68245340e084c4e34f1ff9917c6ccf22a06ae4eefc41f7a5315db15aa8b51f2a8c3ed7c68cd033308fbe99be";
   sha512.doc = "d29c64dac41255066a844639e4330193811c62049e4b38600951346d4c126a495fab78458bd322fb3defc4352b765c1a7e7a73b7c64bdfde3a90f3e5a74e4e4c";
@@ -2621,6 +2982,7 @@ tl: { # no indentation
   version = "1.7";
 };
 "biblatex-enc" = {
+  revision = 44627;
   stripPrefix = 0;
   sha512.run = "6aab8a819ce9a3ec2d6676ab8850c3fc6bb81e5af5c9414555581cc9d164184d18ec550fb0ca67d28d800826356f1c709144ee7d38c0cfbc274179fa813a3a0c";
   sha512.doc = "ae50544ebdf7bbf9ee708f193493ffa241ba91f0925a2bf03b6bf1ec486586fde3c630fe717f4f2904373c08a2f9a90afca86b50870f87aa0d04430554650223";
@@ -2628,6 +2990,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "biblatex-ext" = {
+  revision = 52977;
   stripPrefix = 0;
   sha512.run = "5d2294cb06e78052985f99d63ec56d35f54b3e423fa1e184a2829b5089420c7963d341124086ec7a4df3064f3b6f65ce55224260140a5874c15edb1ac66bc251";
   sha512.doc = "bc44a8ec304dd082c7aebfc9e8ffc29cb5fa0ba53ec18b993f07d79bcbdca6a128a77744e231111093d695ae2ca036f3e660963cbda08a389ee2d1b2fa5775f4";
@@ -2635,6 +2998,7 @@ tl: { # no indentation
   version = "0.8c";
 };
 "biblatex-fiwi" = {
+  revision = 45876;
   stripPrefix = 0;
   sha512.run = "72b1e41ac55403f144529fd5cbd88f51dfd61cd637bd8e6427a2714d3684ffa37774c698475994f1481442cc8eb336d8de398d55b3df28e5e1615b9cd74cef27";
   sha512.doc = "37fd37d39fee963af8567cf27cd266597175ccebe20f016c7dda699d95e6f7fd0408a57f9061b98996a6ce8eab04a8ed376e6e29b5cb41635d004d24082e91be";
@@ -2642,6 +3006,7 @@ tl: { # no indentation
   version = "1.7";
 };
 "biblatex-gb7714-2015" = {
+  revision = 51985;
   stripPrefix = 0;
   sha512.run = "b81acf7825f546d76a55e617c5d78a85aa6b8ad1c35fa63543f49180b78c59629c97a9c11db1291990a001bccccdcd725cf2550e5df46e87528eccd96fd6f045";
   sha512.doc = "b6f51fa52262b40b847c62e1f8310f7a1d2d2de73608b022286ec5686677fdb7861d2b819c291ba7bbac33dc8be720ab05900ba4e036b37552a7f8e086a929c0";
@@ -2649,6 +3014,7 @@ tl: { # no indentation
   version = "1.0s";
 };
 "biblatex-gost" = {
+  revision = 53916;
   stripPrefix = 0;
   sha512.run = "a620eb113751c856e3b7838067e35af53b9ca54587b2eb76fe6a613b202a66569a607801cbfdc18afee182467841f9031db62d3777378d923a559f3811eb6f10";
   sha512.doc = "d74575b0eed08f5e75fb31f8bf2aa3cf00e4a896f34119ab6665f8add1b938ded58e81ed1ac16f7a66ff088294478eef630789c8350a6c5767d4eec829f678cc";
@@ -2656,6 +3022,7 @@ tl: { # no indentation
   version = "1.18";
 };
 "biblatex-historian" = {
+  revision = 19787;
   stripPrefix = 0;
   sha512.run = "bba5cedd64fcf0c0cfbf9b56c66838141917ba1e7c2f27aea5bda44261ba28366b465415e3674a2ce398812d5cefbb2727c7e5e1adf53a2d9779754849664502";
   sha512.doc = "ed87ab74fd06ccdfa0923289dcd7a37df695fdf76003aa7ab142c9d924fb69a81430ab7651314a9a391b9114dc2c2d63ffe94461bb00fd33d97ac9e8c5b2a8cf";
@@ -2663,6 +3030,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "biblatex-ieee" = {
+  revision = 53931;
   stripPrefix = 0;
   sha512.run = "6a5ef61a577b8fe91bb66b3569fb4082f7a5108a710c8ee6aa533b66603914114ddc09de70e3ba019bca1a744c090f21da8000810746d172924947a3c1e4a7e0";
   sha512.doc = "4c4b8ccdb791ae55e27de07ef4b00793c4461334c7b5f63a564a46738d206cb00441637f6f149842bc04bdbdbdc4a25592bef58601ff9514aad0d9eae1c0c858";
@@ -2670,6 +3038,7 @@ tl: { # no indentation
   version = "1.3b";
 };
 "biblatex-ijsra" = {
+  revision = 41634;
   stripPrefix = 0;
   sha512.run = "040efc5b43e2642251921bcc49db1ae2e00342100d302bca24e2b7b11d1724797f1fe7aa254d01b35d1dfa316f2b0f739664f275031c498b157bb652c6aaef44";
   sha512.doc = "36cef635b4603606d36f13b489320e10fad48869b8cdbe78d6f81ca9f3caee0f3e14e408236b1f18e6c7cbf3cd414ed8eb2863058b31e761b4355c6ff1230dd3";
@@ -2677,6 +3046,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "biblatex-iso690" = {
+  revision = 52629;
   stripPrefix = 0;
   sha512.run = "aed09ed7de33ae8dcbbe6261ff678fde9f9ba92cae48edefe722c944b5fa3396f6094bd93517070e7f77afdd48d6ef9ad185bc73498d398db17cc9f8b33ab6fb";
   sha512.doc = "e07b9376f3cd5dab1b9dca41d17c06b161288c898db3175dd479ee0d8aa4b93bdb20be9e6934f48f3065ac07fbd074c41a3691f164e1e5e57a375dd2f956bc9e";
@@ -2684,6 +3054,7 @@ tl: { # no indentation
   version = "0.3.3";
 };
 "biblatex-jura2" = {
+  revision = 53243;
   stripPrefix = 0;
   sha512.run = "a47d1cabf771d3b90ffa1c00e354cf1440c0ca6b0e36ea3d92e0fb37aed003ae457fc446fe5e739b513c0d1e39dde09109fe377ad60e5ca074e8ce64d64026b4";
   sha512.doc = "f6cef0f752daa994751089f63b2e8948423b3644e3f1e49aed6bae05b9a36e5ea8f614a34a3c7cfdf81e0b8262105d25b436efb17e7cbe09bcd8d0a423c0943b";
@@ -2691,6 +3062,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "biblatex-juradiss" = {
+  revision = 29252;
   stripPrefix = 0;
   sha512.run = "48e5d926b24752a8138b1094ba47955e9f8d479d3572c2c81d727824e0e5a6243cad37d3a61f1d28163b5bddec6ceb2b35a5f19aff722980eae350ac9382cdd9";
   sha512.doc = "573378ed40ce0a3efd0c47bf0a32d146543e16b80dbff7935ab980e82de61a1d8023688d59fc2df001a3415b9c73bfbbeae3ce4c240c2ea958a65d6d2003274d";
@@ -2698,6 +3070,7 @@ tl: { # no indentation
   version = "0.1g";
 };
 "biblatex-lni" = {
+  revision = 49935;
   stripPrefix = 0;
   sha512.run = "9089117cc653cb9251622299b20d79525ae9623661de402732c9b9f47b2b296cc0b756bda279487f5d042316693ac624b18352dcfd04e6cec436a402b9bbba57";
   sha512.doc = "23435bb5cdcc7cfaa58d732582e23d3a23589ee064122b231794f17ecd0137e7a4a0e21057835d3925c149d637a7bd12270b4dd05cff6259f103498e0989ac66";
@@ -2705,6 +3078,7 @@ tl: { # no indentation
   version = "0.5";
 };
 "biblatex-luh-ipw" = {
+  revision = 32180;
   stripPrefix = 0;
   sha512.run = "e58e2522d9a4711454166c816b971bbf6bab1f8d1c7eea122933c8b7955a49ad294df410fe0a75375134b77d442bd5214ee25d56d766be7e5843e4ac14d7ef5a";
   sha512.doc = "bbfa55884d3dd3167618f6f9595c301e5faeab0a35cd058cc68922a2aa8362cb3a9d035eaea06ee43c428dd89d23538b15bd4c79c1e095ad10aa4d1d7184f92d";
@@ -2712,6 +3086,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "biblatex-manuscripts-philology" = {
+  revision = 53344;
   stripPrefix = 0;
   sha512.run = "3677e980482bd1beedafd4120d119d2a73c4c7ae9a3ddef7130572fac5d2388ec4144b0ba74d4d8012fd994262c378226c987472d4d66e323e3b8395b5d3259b";
   sha512.doc = "da435de87f61045d565199034c5ffb1bf818d31c74309648b1cd78cc80dd1b1274cb008a575dae1bcc6b1987973745e3483e829085438821ef1e4a10fbf157d5";
@@ -2719,6 +3094,7 @@ tl: { # no indentation
   version = "2.1.2";
 };
 "biblatex-mla" = {
+  revision = 42445;
   stripPrefix = 0;
   sha512.run = "b6e3f7b5323e0246c1b2e1ee1c767b624e59d4d1ab9aac4bc24d59c15d1f8228695ccc072b30bbe1f4a2de24fb6eeee3c81095fa572f3e27a09f0de7c5b3994e";
   sha512.doc = "87e9b73615b404f8b676b8a4158edac551f8dd3712e1f6ecaec473789df884c85d6ba48eafad428eebce10ff6f0c13b382fb4e4c79cc960b860565bedf7f935f";
@@ -2726,6 +3102,7 @@ tl: { # no indentation
   version = "1.9";
 };
 "biblatex-morenames" = {
+  revision = 43049;
   stripPrefix = 0;
   sha512.run = "7e847faa586655aa7b3c92d9379540b2f5e78fb50843e36416e21552c6a9e810945f5b60a96a14c35570bd0403ac29a43af29bd46e2ecb0d87e3c6ac90345826";
   sha512.doc = "c30953fabfd4717c56cc818e55f83995ceb203bfd67775aced3fe8f1f4f4a92b118ed9c40665ea28944806cb2d409a541f59df530e37274e3bc3babfbe55713a";
@@ -2733,6 +3110,7 @@ tl: { # no indentation
   version = "1.3.1";
 };
 "biblatex-multiple-dm" = {
+  revision = 37081;
   stripPrefix = 0;
   sha512.run = "9f83220ae7f2576b4f58394634dea831e5759bf6560ede3244ffb9d18fbf522e9c728c47a4184a43c2dcf6807481a964d7e468e4e6cb921129440bf917925a8f";
   sha512.doc = "f33e650b2faac0c7b9d078f0f4fd9da8a58562c6a9a8b13acbb4b23001d2ecdde105c08b6b6e62f138783d61f3e071f8780afee2f170c134c275ae62ca5a597a";
@@ -2740,6 +3118,7 @@ tl: { # no indentation
   version = "1.0.1";
 };
 "biblatex-musuos" = {
+  revision = 24097;
   stripPrefix = 0;
   sha512.run = "129d1c12bc0e4e8fd339f7bc37442947dc492700a721933c9dda0b18edf78a9b402884376cb7d80893a06834f70a5d377fd264813cdf869ce5e40667f296d618";
   sha512.doc = "d2fc62bb25394195a161e47ba116f2e795e6009b5f547d09cae2e21cc0f8171c610013622c2a019438e04b6c089d17c21333e3c70b8faeb09f90113cca9536c4";
@@ -2747,6 +3126,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "biblatex-nature" = {
+  revision = 48940;
   stripPrefix = 0;
   sha512.run = "265427460a57fa3cba846b3e7dd4fddf9639c11e223cba5e7f47da5b18ed1d348a70c29204378ab560f2eeacfdb12257c25482a1c3d9836f9025d0ddf987b511";
   sha512.doc = "9053472af9e07e4c297ce0650c7d9d20b85dfe22645652a9be49e950bc9718160433e6ffa01e5d0dec04a036425e31d4b7e6c31de9fc7553a730720fe54eb36a";
@@ -2754,6 +3134,7 @@ tl: { # no indentation
   version = "1.3c";
 };
 "biblatex-nejm" = {
+  revision = 49839;
   stripPrefix = 0;
   sha512.run = "97443b036769ffe3487cefa6cb5647eadfb8cdb20db0f6607028298b196a0df1ddf1fdee85e3f163a138da47f28019ab32147f65a5f7cb23b46596c96a772799";
   sha512.doc = "bfcf854e7545237dab17bfe3cd2045a1914397a02e5fa31bde2bce8c0e44c474fe0389e2cb8cd59516f4db9a3b538524f8321723a49c41233de637075bb41720";
@@ -2762,6 +3143,7 @@ tl: { # no indentation
   version = "0.5.0";
 };
 "biblatex-nottsclassic" = {
+  revision = 41596;
   stripPrefix = 0;
   sha512.run = "a0da4bac443dcbc2c0d8b97d4eed21c171e876cdaee3699a0652c905088056802bc12e1f16965b6b2063e1ca0dee808f5f5e9fd9e5f6da7f956548fd5bf0b222";
   sha512.doc = "d0b6de2439ff0698b14781deecd260d5851b44da80a10827e0b0bf5ff21ddbe46b979dae9afe988ec1520387668a802a777fba28a830b0e0a7ce60988bfe375a";
@@ -2769,6 +3151,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "biblatex-opcit-booktitle" = {
+  revision = 48983;
   stripPrefix = 0;
   sha512.run = "4779618979e358380b2d9d2163a8e62274093bc4e7d7a959364b1980d86110233f3927a80e2dac7390ec43d0626f92311d5923657872d25bdcab5d93dd84956a";
   sha512.doc = "81990177b6cb92dde0e2d1371fa6e5ad6685c9750eac87063e336fd3412b46eca40e091bf2222631f6abcef995fd04c82a3cfd3f87baa2b069c74457edf7f13a";
@@ -2776,6 +3159,7 @@ tl: { # no indentation
   version = "1.9.0";
 };
 "biblatex-oxref" = {
+  revision = 53571;
   stripPrefix = 0;
   sha512.run = "deb25777940c0aa54976865590f629b866d5175de57fe21dac0193c4991eb5333591f350475bf9ad4fee253acea2c27f9a6abc52280f487b422f70a9c77f5877";
   sha512.doc = "f589fecde40d9e07d99b453c9119668d6ee3a9b672a2a3184e8aba08e6c18484a359ef598c7a5ba9f741fee104b7d1260144075f28767064ba6971d5965771e3";
@@ -2784,6 +3168,7 @@ tl: { # no indentation
   version = "2.0.1";
 };
 "biblatex-philosophy" = {
+  revision = 47283;
   stripPrefix = 0;
   sha512.run = "faf78d9a7a551c2a161bf69c1a9146dd7846cb4ff1c3f6332806f955357a8f3af66b9ddc7d9732246982b9bba60730071390a0cf240a241d50db03655414174d";
   sha512.doc = "1e68948403c72e93f94b758786a0c632827d5e5bdf0a8db2066e52868b2ee339bbf0948ed381d78db733482cfca075d9d5c26624df9f2f85d4ded232ece45ed8";
@@ -2792,6 +3177,7 @@ tl: { # no indentation
   version = "1.9.8a";
 };
 "biblatex-phys" = {
+  revision = 53013;
   stripPrefix = 0;
   sha512.run = "a7afe31e2cad56dece6bdf60d75d2d7b4279525da00bc4fe0003804dffd0934514a43164e4f5fe5a4776365d428a21a800f0419cd632f56afb6bea6233bf51c5";
   sha512.doc = "a1dfe75c92e89ef47ed6a4ef6d997bf2aa717d6c6f023773a056f5ccf53cbc78d5d2206b1b29e0ab11389b76ef98d7e2a7f8242947abd0a8fd93e1db94f299c3";
@@ -2799,6 +3185,7 @@ tl: { # no indentation
   version = "1.1b";
 };
 "biblatex-publist" = {
+  revision = 50989;
   stripPrefix = 0;
   sha512.run = "9f73dd60d22adc1af2cc87c7fe3cf38b50fcc173a66cd1511a08a37938a0bcacef20ab27995ccc2cf4912d2b74948e417d0209bef93be8bcf49f51a6883778a4";
   sha512.doc = "1899ddf6edeb2ed11417cd90957bd9567041d6c06b43a56d08d618a734d7700e5092dc1e350ed03a08e82f3b2e8759ef8fed8f8933996d1d8a5b7ed5c8becb17";
@@ -2806,6 +3193,7 @@ tl: { # no indentation
   version = "1.16";
 };
 "biblatex-realauthor" = {
+  revision = 45865;
   stripPrefix = 0;
   sha512.run = "dec592d3f16a431286f7887af863664d777e09e5784a53e9b99247e3bae86c7928907135980d27614e52ab6bd1f1f59a3e8633ecde05d3f9b84b97c84ccefa23";
   sha512.doc = "bf0ed482905bfcf9bf5a8eda61f609037316012aa2992796c57d48b5f5ccac496dd372ef5e8c88262c8bc5b2d543cbf5f6aba8ff1833a99db6929dfbf379d2cc";
@@ -2813,6 +3201,7 @@ tl: { # no indentation
   version = "2.7.1a";
 };
 "biblatex-sbl" = {
+  revision = 49426;
   stripPrefix = 0;
   sha512.run = "dfbe4de870b93fd1bd77aacf003ea56926adc6d52d0b5f47125d411738a66822f8c99bf3d58d0fe955105a30e5f2629a0c37ef5bc3cf00d3ebe895cadf621063";
   sha512.doc = "c7ccc14015397b816ca508bed2533fbc2ff183dbdb035d13100e8ec8faee18ea7ce10f7d8140b2ebbc6d58831db59ed6a9d7a4b75b0ef346081deebc7c323b72";
@@ -2820,6 +3209,7 @@ tl: { # no indentation
   version = "0.11";
 };
 "biblatex-science" = {
+  revision = 48945;
   stripPrefix = 0;
   sha512.run = "e75dccc1a01975776cf94c17aad531823844085e4fa2ba54ba4f74d77ad193c26238eed602f309760f3057b6fc405fd01ec2a7a20647cd8570889832b1ee6bdb";
   sha512.doc = "ad7d8fd4e54830d77f0a155a04cd523c5c789745b5da34b8ea1efe59ffd4ee1673045dec58d28b8234993a70061337178cddda2267506366549c2639f6c917b7";
@@ -2827,6 +3217,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "biblatex-shortfields" = {
+  revision = 45858;
   stripPrefix = 0;
   sha512.run = "be9562c2b79e1f01a110708eb6c0de165a9f596bd18ee72dd6c8add0bf380222a31ae12d86ab843083ae3e7f47a608826b985455f4c8501bbe21d4f0a0e15b80";
   sha512.doc = "e6e5e6c113ef43a9784f9000637d526f0bc989358d690d4f41be01e1e22abcb33f347421c727c411c2c02f0c11b1c60d54e7fc23180bd6f66c5c46bf29fc1202";
@@ -2834,6 +3225,7 @@ tl: { # no indentation
   version = "1.0.1";
 };
 "biblatex-socialscienceshuberlin" = {
+  revision = 47839;
   stripPrefix = 0;
   sha512.run = "f927cccda37e1ab37bd01b49f3247b688ba0186db5b162ab9b73db7be5f83d1b261bcfbf355d575a3905cdfca2421b6b592ae0763d7575957ea382b451fb6099";
   sha512.doc = "30c411b27e50e0f4ac46385a07606846ae3dd744879de257e2f2abec829e5920957d55e970255cc51cb768f3ca0aab629f30d2860e5745c4addf5aac10ecaca3";
@@ -2841,6 +3233,7 @@ tl: { # no indentation
   version = "0.0.1";
 };
 "biblatex-source-division" = {
+  revision = 45379;
   stripPrefix = 0;
   sha512.run = "f7a9b6a9f8fb21a5b9f06e3904ec2147ccd21383c3ced8852b22d0cf62088be103b674466ae571ace6bea52904f6cfb79ef2982bdb16679d02ff1d260d5b3517";
   sha512.doc = "1ae3883454e6aafc91b996de520a4669a06a67cd74b9df7e7cb7d096291d5f1dbe728a2a0fbd3b5968fdebf64946e829c4722bff33ff52ccbf32d8055f042144";
@@ -2848,6 +3241,7 @@ tl: { # no indentation
   version = "2.4.2";
 };
 "biblatex-subseries" = {
+  revision = 43330;
   stripPrefix = 0;
   sha512.run = "37955d7e547fceb3e3856f5e367d39a4952ee0d604652963db2a54466e9d6c1effb6b2c195ffd1dd15eec5552df97419a09763bc51af06c6726dbe40a6e3bbae";
   sha512.doc = "94bf4807e0623c35690ef7b1fd879710a762630224c0a52ee4e7b4a96c27001a9653de2c7d2ecd2a12cda448bfbdc336c54bcc8fb6674782af017cddfdc8e5fb";
@@ -2855,6 +3249,7 @@ tl: { # no indentation
   version = "1.2.0";
 };
 "biblatex-swiss-legal" = {
+  revision = 32750;
   stripPrefix = 0;
   sha512.run = "fd21319f30eb2187333db187c7ad171cb61a75ad4d62ddf3414a04021a7ad4fce57836aa0d2a9ef00488256d5126c18a976f664cff8978f8aa1e80a161dce979";
   sha512.doc = "beba2cd9e8a78076148f7aedb6b5cf950ed865de9432633f225c160e1a46c98098a8bc94c783ec35cd982e020736c85ec94bc66ad68ead05d7187238ceb0a07c";
@@ -2862,6 +3257,7 @@ tl: { # no indentation
   version = "1.1.2a";
 };
 "biblatex-trad" = {
+  revision = 46668;
   stripPrefix = 0;
   sha512.run = "3a21ed76cdfd4c327562aed15a56fda824b33fdbab993accc8e944a662e157ca8ce30c4ac6413b4365c27ce787625e03d206a5574116c205daa55a5211779f7d";
   sha512.doc = "cabf53ca2febe8bdc26c56f58f99e811ab8695134f3b10c01f946c7c13a63b723ebd598013fdad3eff8aec9d4f629b16bd3915d9087b1dca365cf208a7f72ea5";
@@ -2869,6 +3265,7 @@ tl: { # no indentation
   version = "0.4a";
 };
 "biblatex-true-citepages-omit" = {
+  revision = 44653;
   stripPrefix = 0;
   sha512.run = "908f6544890f69b4ca405c94e68c4814c52956bb77108f8e29bb4b6b63ad7de3bc0b1f1213a612f9e0ebd94ddc054907092451a9f326476f39e18a1f81ed0c63";
   sha512.doc = "bb53e66c1aec87669be8bb608f82cd7683692cf87aeed792d1e9d49045039c15fc7113fe116e04332e8aa6331101a6e97e97f655e26cecee9636409d810f77e7";
@@ -2876,6 +3273,7 @@ tl: { # no indentation
   version = "2.0.0";
 };
 "bibleref" = {
+  revision = 53090;
   stripPrefix = 0;
   sha512.run = "1bd916174754653ada58aa5fe3ae646aa9f409ab2e8860a3a630d552a47ffea2888de5b8bc5a05b246525a317418f4118e1f4dfc5860d2409364e919743c187a";
   sha512.doc = "270f34c698e043786c703aef017ec67b764ba3743244ed1a5ad66843fd01448a37ef7d790c1a57eb2c1984a4495bdc9bc51b5899579343a01681c17557a4b104";
@@ -2884,6 +3282,7 @@ tl: { # no indentation
   version = "1.24";
 };
 "bibleref-french" = {
+  revision = 53138;
   stripPrefix = 0;
   sha512.run = "f768d01206a35a6ca18ba777fb159294f566be365845bc82d344e9eaa3dd7cd0c1763564b7e17d4a1b851330405cfb3c383019b575276bd9b12d084c4845ed89";
   sha512.doc = "e72ac2b74f01df60c998896b76013eec56a3d8cda8df2f26f92d05d342760204913d7d70a6c8f63680f54bf3c84fb1c654c213ec2356dcf189bf9e134ce4de30";
@@ -2892,6 +3291,7 @@ tl: { # no indentation
   version = "2.3.3";
 };
 "bibleref-german" = {
+  revision = 21923;
   stripPrefix = 0;
   sha512.run = "094177e505025eef5262b876fc49cfb09435b653c87fb1ee7453650e94f098bfbc7f5c78684849b3ce0cec2019d85a0413728397b5ffaf32bde542d8fa86222f";
   sha512.doc = "c3c610fd8a80ca5a0b8de6ce4aac887a7d16f01e21d845fad595e1d5d6069d8e89459dfd187cc458d21bf2247f4f2c7fe72233a12c8e532b9466f2ceea283360";
@@ -2899,6 +3299,7 @@ tl: { # no indentation
   version = "1.0a";
 };
 "bibleref-lds" = {
+  revision = 25526;
   stripPrefix = 0;
   sha512.run = "ba3c4e41b566d0a26bd9f0d11d8e776fe04a18aac451435ff0283ff273971138407753bd6806f34708c5a2f0c1b2581c71de46bbc2e0c8063c9838b3d946f2ca";
   sha512.doc = "6fd81f90d0c94644231e911ab44827b77864842a3fa91127fb53114179488e5ffd66a404a1b5afee513e0cd3f4c83f38cae547e6dd6484403926c4c46b5cdec7";
@@ -2907,6 +3308,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "bibleref-mouth" = {
+  revision = 25527;
   stripPrefix = 0;
   sha512.run = "5ae9356781549cb5ecbdfa33085ede0fdbcb7f131d55484153484c777f88e23cf965507afde803e7bc5b775aeb416b9ee767815b5dbec444a3d21be18c7445f4";
   sha512.doc = "a904b4c9c0c8f3ff1feaaad8d1650b383ff0110bcf463f004938c51bce84ffc860082bf3e598922eedf0aeaa664ef0379ea3304f6dc5b681679d9545026c6bf4";
@@ -2915,6 +3317,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "bibleref-parse" = {
+  revision = 22054;
   stripPrefix = 0;
   sha512.run = "3af7da247ff7f9708ef076a3fe110979e7ff07be0afb08597feeda9ae31e60a66eb2bbbb5da015e10566e83a116cc9f2efa56fe91a57717230fb35bd004c209d";
   sha512.doc = "08393d76bca59dcbd715cc443ffbf7a1e15894ac6a2963d0ce770c96974c14d42283fd9237c215fe454ec4403a21387ba9dee52ea1bd93b83ab4a13fbc65157c";
@@ -2922,6 +3325,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "bibletext" = {
+  revision = 45196;
   stripPrefix = 0;
   sha512.run = "3c5170b747c6426099c021390f7ac226ebf9dbe42ff586c698b3489d47639fcd4198a4cf49261bba9335caebf8f39488d65fe851d60d9f3c2cc2127539ef080a";
   sha512.doc = "ea38659b5b2bc252760937ecf21d4ac3e8986ac8be6afdc1f2205d84696b8da55e02037bcddb24de389d54a692240ae946ab3e41a0a7913015da4d7b5e12da7f";
@@ -2929,12 +3333,14 @@ tl: { # no indentation
   version = "0.1.2";
 };
 "biblist" = {
+  revision = 17116;
   stripPrefix = 0;
   sha512.run = "02f006139b475cb5d4ec2bf85ec098de78f5bed7242ec693317ad4e01acb62a8c5479f295a8a1409fccd41b327daa75a2639b67d9838777b8355e6bd40af478c";
   sha512.doc = "b5bdd51d7acb738569671f13dbd25fc7b98a8e2e03e324e9501a20ac34cf1ae3578fcd622be73a80467e47a64a81f4d897c4e167b07a5ff5d06635b09dbec51d";
   hasRunfiles = true;
 };
 "bibtex" = {
+  revision = 50602;
   deps."kpathsea" = tl."kpathsea";
   sha512.run = "2657225efc1d8f9954d1be9d9b866a626cb252cf596a78a7573ab5b43272e8646a4dd5c59f87275bd6280a2e614bb450c000da6cd9db6b2666f551943ccba8ef";
   sha512.doc = "4974d5cc9b6702558a9df37d48ed1c00cf12b1ac54c38954c2ff000dcf11a832b2f1267ca1bc009768cc18adccc0fd7bc7bf0e8ebd351f11caaa5f58b63f6585";
@@ -2942,12 +3348,14 @@ tl: { # no indentation
   version = "0.99d";
 };
 "bibtex8" = {
+  revision = 52851;
   sha512.run = "69f6b09fbed8a089e18ab7d39e352ad5a1e7512096a1806158ecb4df74822664b6620f3cffc12cb8a938b15a4000df2b46eadc0ff38c8de1d325539f01e8aff8";
   sha512.doc = "d0863c43a5cbb87632a3513ffe75ab8a686647003366fbca1c9c168a4bb234f26078b260e1a3180f941e3eacf4717439a400df1bd180763aa43eec664009f25b";
   hasRunfiles = true;
   version = "3.71";
 };
 "bibtexperllibs" = {
+  revision = 47520;
   stripPrefix = 0;
   sha512.run = "157db9c0bd7d44fea67844046996b5323f2d26828a8a4031712fe006ef0cdbb0992348d4a8e53c2a52ef0f8a1bd8cd108946baba46783d83d27e05b370bbc6c6";
   sha512.doc = "59f0d671efc182550ca926b1a208c31569e76bacd96e6444437d8ddfae3ad7fcfba60fcb292fcebacfeed1dc225a3e973b41e852ed77eab11308848e532a2c31";
@@ -2956,10 +3364,12 @@ tl: { # no indentation
   version = "1.5";
 };
 "bibtexu" = {
+  revision = 52851;
   sha512.run = "9f1e27f1d7a76700aaa4f0f19c4e999070dbce873203b80e3ce5d2f4ed14c9b685515b6c648ece8942ba429d698f66f492b58373f348bcfef2523ffec270f466";
   sha512.doc = "0c0f0db13c18029bc822c5cf82b358e7784992f5799e03f1312a550ae3d40d4c59a01bda0355698f7ebbfb0488a426f20833d2b075675a83b5ae01e4a949c4a4";
 };
 "bibtopic" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "34e2a644cc4472f415522e6e798bcb1e2d623afd4783b07f4904405c63296ec912fb6c1d03f80d51c37ab81944cddb5b4f3678a22a7151d89376ed9aa343e9d7";
   sha512.doc = "5849fd57abb9bd847833993e660e342a537562bea9fba76376f3885d3bd09360c5783e4f04828137b43c076b635a2d566d908be48287c3fe6645c2abcba06652";
@@ -2968,6 +3378,7 @@ tl: { # no indentation
   version = "1.1a";
 };
 "bibtopicprefix" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "1df7d78498b6de233aea92cb1b18f73893b8cab723fb614a9fe895e5131639c1b4f4318cbe103ea4d9308e383627873576664f0af3ac6fd26aebd5b8b0036379";
   sha512.doc = "473a7db7638f471fd87b1cb242a3a593e3ff0aa4586c1fbe906cf12f2dd866a27ab50176b01d3f4158cdf0fc263fa54ce16eb63c797392349fbc90a8422c3b2f";
@@ -2976,6 +3387,7 @@ tl: { # no indentation
   version = "1.10";
 };
 "bibunits" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "5658d508b876a88f3916a190a9090d66f2dbee98260af8d23c8358d0708f27fc80d4cf6c348b1f6e1ff196e7de6d5567e371ada640a9a602185611fb09e64ddd";
   sha512.doc = "888e5a4c1863c15112ece5763b01525a1a74f97ae1270495a41d598e73c4583ce2b9e28030b3054dcfebd60b038fb2d32938d6be947477fca93014fac70676af";
@@ -2984,6 +3396,7 @@ tl: { # no indentation
   version = "2.2";
 };
 "bidi" = {
+  revision = 53615;
   stripPrefix = 0;
   sha512.run = "267dc7398d0e4de4a72fafe8bffe08a876dee7618dc2850c149b55b316945ef98d7c0ff76a4866a58a21c998a70e0ab0fa2dedcb6895809af05f10efa433d01d";
   sha512.doc = "2d2de125e597310a8856f309c6d4325c3579c36dd43998bd8272cba187e15084d1e1985a240adea8fd862c9472732907d2facfc63d570ff8b97cbdf80ec7e0bb";
@@ -2992,6 +3405,7 @@ tl: { # no indentation
   version = "35.11";
 };
 "bidi-atbegshi" = {
+  revision = 35154;
   stripPrefix = 0;
   sha512.run = "1295c87c038683212deaf52a4436bb6adc2a0cc0220b6767e770aa909d88eaeda4a0bd2dec739a2415745609aaec78cdd91d4949f90663323aeec63cefd45d01";
   sha512.doc = "6199c4d5b6064244c2fd38d8a0d6c4eac3c790cc786625502d89a5a8a2426f7182cc0e7c4b70513971a0cb4b1230bdbd1382c05762f6537a63a34fa4e79c020d";
@@ -2999,6 +3413,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "bidicontour" = {
+  revision = 34631;
   stripPrefix = 0;
   sha512.run = "10364edc592375f69912888945e6d555df30627498aaae409b727392c64cd4aac386433119578a7a01a48bd0cff84aae33079593219b282feb9d96a68bdde78f";
   sha512.doc = "a1a3f9692ea2e462305f8c6db432586eb76d78cef5fa0e9057cbe5766ad99e25c560ad658569a92d1885e373fb6215fe2f9bcbc1c69b46c3088d36eb92e1aae9";
@@ -3006,6 +3421,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "bidihl" = {
+  revision = 37795;
   stripPrefix = 0;
   sha512.run = "fd82ad18b96cdd782fddab8739e09978d08fc37e8c65a177bde930671e102c9ffefe7465fc766860068188f6b9f8222119ac791f07223f79e9840f25659ea3ea";
   sha512.doc = "c9d0503857f2cfa960e36872757afcab17b2631caa8a33112ff2361694939774052a5249db62d21831e19c17826f422853a78c5522094706bd4208d4c5223019";
@@ -3013,6 +3429,7 @@ tl: { # no indentation
   version = "0.1c";
 };
 "bidipagegrid" = {
+  revision = 34632;
   stripPrefix = 0;
   sha512.run = "b823a646d97c15ad9beb3aebeb7b2156aefc3ffd7bdec813e9cb2481e137cd661936c57bacc3b8c42509151205dbd4096329b5cbec25bd06698b698c59739551";
   sha512.doc = "615d87ca4c29e0a30cf1eee08819b10419a2f399a88f2bfed5bfb6eaf7b1adc8b64a2ccac5da7bedab4e4b951e80488b97203b9960980ca5919f653cc4218996";
@@ -3020,6 +3437,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "bidipresentation" = {
+  revision = 35267;
   stripPrefix = 0;
   sha512.run = "a41f98c3f009f7f8de8a41e386cc829c55650e603ccaa8e7e381fae45be2872e0b20e66b68e4d7ef8110abf7c9f6661865d49f7c0cf3ca4ae6f781c3ef5bc0ac";
   sha512.doc = "56993d41b237d25e00536926b3b23f1b1a6940aabe4f636df73cabd5ec27252de9fb8ff17d872cec3cda7a0a3b8b13013ec77477dd89ebba83a8406da3ee144d";
@@ -3027,6 +3445,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "bidishadowtext" = {
+  revision = 34633;
   stripPrefix = 0;
   sha512.run = "bf9a75be6d1f37055c793a16b0a4d019579adcbe14a93b64cec5495e4d7c8bcd8b8c6d86906714f8aa47be5789209a1ce78d19e8023b44b9d52409b281797310";
   sha512.doc = "ac2f47ed1a5535ff1f0030c38bc210b2e3905bd46ce7024d5237387faf87be6a408ea35648f83a2ad7697ec09a91a4cce1aebd32c3446756adf1955bfa97f7c3";
@@ -3034,6 +3453,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "bigfoot" = {
+  revision = 38248;
   stripPrefix = 0;
   sha512.run = "f56fb1545e0a044a143d1a257b9784b5f5dcc56d68bbeb52f909eb928e9d749729135f0c76b3af6dd0306add550b440d32aee21c33e70b9b48a5a82220623702";
   sha512.doc = "f5935a5ede836798f3eab1ff61d528870a07be712047a64aa5af5576a1c6032e9d88fb5c42cf216e0f9812266f9a8562b5290301446c654dcb46146d7b60a16e";
@@ -3042,6 +3462,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "bigintcalc" = {
+  revision = 53172;
   stripPrefix = 0;
   sha512.run = "c801e5953008e8cd8521886496238f4f7a86a6c65a160255beb3fd6a41a48dd7bfa2da438f8e1ae4c79b51f769f0e07bcaa7c3c8aa6e1204ea656aca3d1f4620";
   sha512.doc = "f5e7cc163157e429906489cb3cb94d8694c01be3c720e03b85bb24c7bd757391cf09e08f3d88df4ae7485978042e9d408fc5af0d93e016c82912479d40457079";
@@ -3050,12 +3471,14 @@ tl: { # no indentation
   version = "1.5";
 };
 "bigints" = {
+  revision = 29803;
   stripPrefix = 0;
   sha512.run = "23f9a529af214771f74c6921baf8582b6a3c5e170d0fa511c260f5dd3fb6cb6194ef4082ed299dc0a3ff8e413981a36b594b440e7bc5512c7d2732fed9eb7a8e";
   sha512.doc = "46799d5c6758657eadca7fb30d214baf47c237b63655a71ad19e188fd54b664397babbbc5cf6d9897e81decd027dea1e0d1a6fea97384461ec8976fc19c7fd8d";
   hasRunfiles = true;
 };
 "binarytree" = {
+  revision = 41777;
   stripPrefix = 0;
   sha512.run = "b2204194393811994915604d428e0b537bf871681ea42a93d1e26a74d01cdee3ccd7817e7705cb6a3b9a1f2a97381e23226db9d671ddc36beb5c478271099cc0";
   sha512.doc = "4ef9f7db1d9cf124112e3f3e5c6db7e0b53bd72a5d7674a9f0ac7c471b88ff72309705b8d3942277a93883ef821907f0119d4dd3f645c8caa098f363612df68a";
@@ -3064,6 +3487,7 @@ tl: { # no indentation
   version = "1.01";
 };
 "binomexp" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "61cd0072f766bc4abb1e3ed828d06c0e0ae6fb74902ad86e6c4ff3279ddd84386bbb0b1d669d9e71eef362c8d50577047e6076b174ca5b54da8680a43c5e1715";
   sha512.doc = "9f8e24377ef858e0b3ecc94dc87eeeae08931084316034ea5e3de822ed8b6a65c4744b744a547aea19d3486bb6f2b04f46f1e7ec81cac2470d16b7134885d355";
@@ -3072,6 +3496,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "biochemistry-colors" = {
+  revision = 43960;
   stripPrefix = 0;
   sha512.run = "204e04776677a70f40ac602977cb4e4f53a8d15873808b98653981b2e8198e7cd234189bc0903467569bc95a1f4aa2070343f27042bcbcf2d43720a44dc53b5e";
   sha512.doc = "e1ce9b0e9afc7b6fad2b22b9a30b8785dca1a8a5e132c23a1ed688fcf6df06245a6914a5123f937fc37b597fa3a2f412e0a4afc5f8aae85cefc32dbf70a14405";
@@ -3079,18 +3504,21 @@ tl: { # no indentation
   version = "1.00";
 };
 "biocon" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "54676e4acaee07609c379d387af4f06b45a4bc0051a3333c250555536114b3862da73d70305b1f62adf7afca2b4a2157cce8afd9e20f10e49b01d4c2ad351cdb";
   sha512.doc = "c296c8402129338295a3043a66bab91a499b29703f7ecead0a045e0820ced683a4c25168ecdfc184c07282904afed3703b31f8ca707492a913de7c49a351c322";
   hasRunfiles = true;
 };
 "biolett-bst" = {
+  revision = 42217;
   stripPrefix = 0;
   sha512.run = "e593f073daea4a8326d0a472999c128f511becde100c5dbedd540fd6ea116c5585b2d3673165ed39abf1942fb66c8372ca1961cef90501244f5320119117af05";
   sha512.doc = "7b3f9666225849463683a38a3ccb4e5bc9c0869312d31173f48776c2b209eb269309699b2173c2eb5fc9163baabefd1bf6cf288ca683142285dda6f0c6d95b61";
   hasRunfiles = true;
 };
 "bitelist" = {
+  revision = 25779;
   stripPrefix = 0;
   sha512.run = "a2022ccc4f45f7a911eea4e99557764770b4e6f2ba0333e043fda2419e29d93bac40462fd36568354a415a9b27204a38620e6191fddcdb053f8956aac5747cbf";
   sha512.doc = "5c3186464aaadbf269b26321ed9447e8a1633ca9b4a7b323da692277ab074f15b6c39df866eb41955dbd6ca8b0ff76a115786f3273fdb293bfb79893dfe0de99";
@@ -3099,6 +3527,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "bitpattern" = {
+  revision = 39073;
   stripPrefix = 0;
   sha512.run = "34a0ade2d1110a15618b2ecc7f46a413519a0864a2e5cd1e25eacb9dd76cc66b35565b4b8c015780fa1d3dc88e2237ae7de33c77e29fd5428758a526959625af";
   sha512.doc = "d1fd1b2b46d7846804c9163889bf3a96cda2e11e35de2328c9043f99ccd9d0778710219593565ec9231775e1404d713edd7998e3fa909ada7dee35333137b56f";
@@ -3106,6 +3535,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "bitset" = {
+  revision = 53837;
   stripPrefix = 0;
   deps."bigintcalc" = tl."bigintcalc";
   sha512.run = "b1c9121312404d3daf6907623972c35e0f36cfb4197e589bd937c145506cb5a2d9d8c1f665ae3b4d3ec093e55bb146c0b67cd0858425b704fe29989b9924ccb7";
@@ -3115,12 +3545,14 @@ tl: { # no indentation
   version = "1.3";
 };
 "bitter" = {
+  revision = 51086;
   stripPrefix = 0;
   sha512.run = "edb101df2026b97585f8f5ca712a4bf41f5a2a15122a0e51448fcf1bdfe532bd7f70315644935a942bacdd431db4ff48ebc8b119cbf5d758909560eb2c942633";
   sha512.doc = "926e4a3e7e19ed8571e23afc779be014c3b451d9696ef8d552d6c7f9072c9ccac2eb3ebd68adbb247d7238b0e4786594f85aaecd65b91ddf883e81f20222f29c";
   hasRunfiles = true;
 };
 "bizcard" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "1575499c7118a96f3273c5b8d68e25a20410daeecbce48d1e6355039b97867b34a06c40785052d378dffbc80b862beafc06b9fedf62254d8b31445d8f95cdd29";
   sha512.doc = "f529ec77b370def29ad77927170874dc02af37bfb9f57a4e1383b5adaa93f6e59aa33df06d40a80e2374db514f55e2f115e7c8f22e4c92cbd3cb621d8a735bdd";
@@ -3129,6 +3561,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "blacklettert1" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "eb7d531fd91c6d46145c76a08678033e20097805b3a911fa85194217104e071c56d3842cee83c275a11cd4cdee162aee4630d86025cab76806f20e19c975076d";
   sha512.doc = "a1f18f4adc7f26b9e71db6f171ddb4a8eb15912cf57445110a9da52eb4e0b017a0ace85ddc46ec2df36e73ee3d9bf8dee087fe4467f46bb2bd7f708108585412";
@@ -3136,6 +3569,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "blindtext" = {
+  revision = 25039;
   stripPrefix = 0;
   sha512.run = "3baf7b9db502824ebf1cf8892cafb189654ad0a91a8cfba399e103b417a91e4f137918b73201fb5988c8dcecabc557865e190cdf77af35e634d0519d52715795";
   sha512.doc = "290a4c76fbeb8003c6972933baaa95e62b37310594e459e27083326977d370c1408de95eae44d05d848c61eb22b555792e5e38f4a0b70267d6a87c0314268501";
@@ -3144,6 +3578,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "blkarray" = {
+  revision = 36406;
   stripPrefix = 0;
   sha512.run = "5ed66db84619cd9130e68e05acf617ed0007db9ea35895e31ad96b543f7d6a01fddf00304f05b0fb71ec9484556326ebad1d895b81b821b9f19fe6ae9f3ee12e";
   sha512.doc = "81f1d5b5609531deda3475eb906b841d33a6e01ee49c54102474d852856172954d943ee02648fd1ce74d5bf4030db8d36c7b6786c9fe3105f3be08fea36fe207";
@@ -3151,6 +3586,7 @@ tl: { # no indentation
   version = "0.07";
 };
 "blochsphere" = {
+  revision = 38388;
   stripPrefix = 0;
   sha512.run = "cf7a7865e3e994f2b951a24018b1b1b71ce2b61542751f495dc14ebc4964a1f4a2833d95bde9b8920d4a4fd60ccc03760e66b8ab64f6b14ff77b9206c98e19a2";
   sha512.doc = "3a9706ba73e8da7280495f9d32d32a38c9119bac9b8497e7e1bc69a704fde2552848d60ab0ec175544046fdc06b3e8887b4eaeb1c50a5796144cd56e4a44d9e3";
@@ -3159,18 +3595,21 @@ tl: { # no indentation
   version = "1.1";
 };
 "block" = {
+  revision = 17209;
   stripPrefix = 0;
   sha512.run = "0dedf4b50238e3f12c3d17eca19e4640f2a36511fd65fe4d0baf4f221df279a5d9f28024cb0e20f528e32921e1d6b4c785071210e5ff6471c73e42e58faf89a5";
   sha512.doc = "77b8c5b6949fb7eade5eee082be1c28433136b8374d45f255a80daa0c7a0340a3154a9f6f174fc52b25c252f1b5a2304b32e26c6d6a2f9af033569d7ba602952";
   hasRunfiles = true;
 };
 "blockdraw_mp" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "86bd39051095fde2a99b232b1139c4c196467d0e1825b3c1c73bd25551a55edb6417a0810b20c4ac3d53ff82519364f2ac72fde3845a750396a4f6a8966c73ef";
   sha512.doc = "01fc4226a952c76b52726d1217649d9d98ec708163e4a9b997e36f505b385ed145182bca747a2b5334cfe8b4663d010a699664728c5be05cc4daba63ff1f3c00";
   hasRunfiles = true;
 };
 "bloques" = {
+  revision = 22490;
   stripPrefix = 0;
   sha512.run = "06b18467956f6782de7e0dad41f66a79e1c7dc5c3ff007a8970f24740dd5edfae0e375288c3510a8acfcdfda7b568f2316827cad1b6a006789afe8a31f829f4f";
   sha512.doc = "fe37018f08820f21bf188301d0145e42b50563d8dbd8f9b232e6fa1b7eecda931e8a42d40f47ed7cbae24235833eebab874e30dd24d8393dc728d6fcb10057e1";
@@ -3178,6 +3617,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "blowup" = {
+  revision = 46213;
   stripPrefix = 0;
   sha512.run = "6ccf18bd12423d3a561e59a2ed9c8e2c7586fa65e47ab784c71111318fe370615acec672ca0e89bde159ec946abc1d4233f8367cc2e6f6f28f3f52dae6bc93e1";
   sha512.doc = "962ab6dbac803f5043df96d178452da2e4ec2db96a7fe9a8400eff658e61169faff501cab3e7e078a18738d683c3bf1ec09a14f70fecbe5c8190b35101196ce2";
@@ -3186,6 +3626,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "blox" = {
+  revision = 35014;
   stripPrefix = 0;
   sha512.run = "66a326bc8bf228db3bb7ee061958f0daa7ff8645a7ed89748d60c5193b63b494a94248bd3a9c4734f810b9cbb76cfcedc88201728dec86f1e4d2d33101f741cc";
   sha512.doc = "5a78aeb59f517d74def3dbb0353545e1efca8bc7627e4c095743a6c2bbe4f9ddc78a0e293f9689089f1f253150404706622745c7a823de9e6b316f2950d98c02";
@@ -3194,6 +3635,7 @@ tl: { # no indentation
   version = "2.5";
 };
 "bnumexpr" = {
+  revision = 49643;
   stripPrefix = 0;
   sha512.run = "c4bf69cf261c8545aeffe69c22e0a018afab5f919aa186efbdae0d0eff6728f36f0ca94831cbef7828e9df349bc2e7eed22c284cb41924b83464efa51418b22e";
   sha512.doc = "2e1430651869f89d3b1ecd146858b004ea04e6506cad29bcc131761b975a89671504b22e7bbe8bdd9e6be1d513f28f85e073a0f123e21e12584782db5242a50c";
@@ -3202,6 +3644,7 @@ tl: { # no indentation
   version = "1.2d";
 };
 "bodegraph" = {
+  revision = 20047;
   stripPrefix = 0;
   sha512.run = "eb4be1d54f84a372bda79a35aa928be028aa3fdd13c589143e3bfbdd111f4819ac7927bc9eb7473c64fb9035b5bbab789b55a5967e4569e916a7fe516933612d";
   sha512.doc = "479d5d95643a0b5a673df4d48049f6a7d89b4dc8d1511676d6ff53e039f65fb27994e35d3db3adeef0cdb30658d3eaa454d997ab4649567148fe90938602024c";
@@ -3209,6 +3652,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "bohr" = {
+  revision = 37657;
   stripPrefix = 0;
   sha512.run = "cb85d1a70ea2ba3bca7a21996319df8c29f1c28b5a62d08f0f145f5c157d4eda65b66f8fa5b833c40b1a4bb7c91d6f42eecb8d97a3c3d906207558110eee1880";
   sha512.doc = "5e3dffb0e2d1ac0a5aa3021ade89416e330f7b71600bb1a524920eafbda148bda2f55d5d355efbced93528cad1c918fedbf50f43089f4948d0211e0e13386591";
@@ -3216,6 +3660,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "boisik" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "48403f4b18cb23e7e16e3cbf19d066dc7e1576f4d9ae42b94a4a34508905f5e6e2f8f60f2de7881a29b8525c86a8120a76f1f66f8b9ea047da0a884637b1bb9e";
   sha512.doc = "c68e8434fe456c5e58a6ebb9e744c81dfba5098c0fb12024de750f73022e300016a424bd1ad9cc85c3122c9a0c863737b2e27f2b151667955f92ebbdc060c6bd";
@@ -3223,6 +3668,7 @@ tl: { # no indentation
   version = "0.5";
 };
 "boites" = {
+  revision = 32235;
   stripPrefix = 0;
   sha512.run = "894f6d2484e9b72a24816c34e1254ae8a6d011610770e40590fdc3ed22a24b6f655418694de256a6522e4024f4df033c017f294743113256583ffb8445a63bec";
   sha512.doc = "22ef96e0f64b4d42b978abbba806f497fecf686d76b159bf3d06aedefe1097569053a11ced6c3ff2c7d05f975345957af0790f2035fa3af396b123da7d41cd7c";
@@ -3231,6 +3677,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "bold-extra" = {
+  revision = 17076;
   stripPrefix = 0;
   sha512.run = "cc12de98493fc01b9a59993ad32e646102751c3023e64f66255a1b66505d3cc2f82d71ac53b4f6691e083bcce3037e521a35feb09cd5019d662a6ce56cc55032";
   sha512.doc = "4bb27a63f711421437385c2a76f26d74cbfcf6ac5bd8811bf4ca5a0da354608dbc6ff295c3943edae1701fefece397ec356361176a9713f607c9677b8222b7af";
@@ -3238,12 +3685,14 @@ tl: { # no indentation
   version = "0.1";
 };
 "boldtensors" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "3c2d17f2bf8ff48638540ec5a3ea57bc835227291fdf6580747a87dafeed6afa4f49b91a67154da35dfac9a405aab2aaed5bbef1ac188291319a972b4e50ebeb";
   sha512.doc = "657bdc4960e2d40621520240840ab4252e927baca704da0388e3124938c55de834e59cf8ff3d900aa294ac366ae7b1367909cbe885de08790d51380726960146";
   hasRunfiles = true;
 };
 "bondgraph" = {
+  revision = 21670;
   stripPrefix = 0;
   sha512.run = "171233d7850335c1819bf1f74e0bcd1c221e5db73d092b0efea71ad35f71b16e4f240c3c791f9022a9e21ab7a2bb62f20ad06609051ecb54fd0640add0ef8381";
   sha512.doc = "0697b880e1bcd51c3b5c2e035a15f852f943ffb86ea2952b460f01e42ced2e4fad8f8b15f32f58cc7771c28ca9bf66f2302914bf08d6696b6d952d347199134c";
@@ -3251,6 +3700,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "bondgraphs" = {
+  revision = 36605;
   stripPrefix = 0;
   sha512.run = "61ed449d8fcee24f383762eeac54949d709fe3fbcf06598acb8849613c68ce2f445dfb4cfc7871bb6c61bec65ed45e8888dadf036f299a4d5c0bad13db0e16ba";
   sha512.doc = "223448f91f0cb9f7b032439aeddc85c132f39bf5ffacd058b76c85db825df15bb47bafe333a0ae8afb089864fe966973fbde6da0e02e1fa46b8077e3f84eb6f3";
@@ -3259,6 +3709,7 @@ tl: { # no indentation
   version = "1.0.1";
 };
 "bookcover" = {
+  revision = 46410;
   stripPrefix = 0;
   sha512.run = "1a96e15ab73c11f36b58dfbc0109529fb9bbe322d4c589222e122f774dbcff5337e88a5350a3fac05652aaf0010cf97ea1842693102acf00e9a22db7b6bf77f4";
   sha512.doc = "1f017e0071060f82e5f530d3726d1d91c5fd742c6a29613a2009756d96a2afcbda1e647cc588c350e90cd65be67207c811ef6466cd863c1b80b39f6afcbbd7e1";
@@ -3267,6 +3718,7 @@ tl: { # no indentation
   version = "2.3";
 };
 "bookdb" = {
+  revision = 37536;
   stripPrefix = 0;
   sha512.run = "3e44184427ce346930b35fc2ea3b508d9f32c1e89cc01d66046e271d61e0bbfde54b5d18917b09acc159f1d657f9d32c29f3086b04e4f1dc6da0cd21a0df3da2";
   sha512.doc = "2449b7d32558665b297e57eaff6529932289e957e0a77d8a8ff84e9614b53844a2684a7b23a62ce6684b6e813223c2c1293bf25e678a1271e3e3cc27383d12b4";
@@ -3274,6 +3726,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "bookest" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "e49d8f0959276202dea2079df1a509dd296858841f4fa2df235743033ba852b856e5f2a9a14176fd986ad1e431ebd3581469e7ea30093b5a01b7d23b791a028e";
   sha512.doc = "ad51d3cfff90ce83c7f6479f9f0eb49a54613c585561def33529b301e00915d7a8f94fb62660b3bf5bd87104651e7333c3a9b620bbfc1ab7fa9fa510e16dc15b";
@@ -3281,6 +3734,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "bookhands" = {
+  revision = 46480;
   stripPrefix = 0;
   sha512.run = "8a341131397637618acdb9bedc835a4ea98f40d55a8a2b312ac820821b00a1f059f37cde2aeb3f5b715eff9928b579a531c4c12d3bdbb3a7629a50d363f1a4cb";
   sha512.doc = "b5901beafa849a52afaaa7cf09ebab327640eb5ad1c627bea5f8dde2c98aaf176f23f0c9460e7fb2212ce9b4038800c3a3c572830d08d059a04d3574d1015a75";
@@ -3288,6 +3742,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "booklet" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "be6bc46fa76c0a1ecbfe199b1a1a6f0cedf14a8d583e9ab8ffd75d4cf8ae22e404b289224ed8fa6cd9e143119760d50131e97228cfe75ea56d5ab2f540e8ea8b";
   sha512.doc = "fb6d74ee03f303433e61fe1afe297cf5e343f95e3834fbdee483522a183d403fb6bac8bfd1d0ca687c448d522d370f5216caba2b52b066ac1657b8dc2fc3df1a";
@@ -3296,11 +3751,13 @@ tl: { # no indentation
   version = "0.7b";
 };
 "bookman" = {
+  revision = 31835;
   stripPrefix = 0;
   sha512.run = "bcc6a2ca260350a22927d806b29dec9b7a6c7d9bfff2517d3c64072c9bcb3b73ec72937c004d36c2570a2c78f073548db6897195591e36bae7b6eaaecf6b6023";
   hasRunfiles = true;
 };
 "bookmark" = {
+  revision = 53026;
   stripPrefix = 0;
   sha512.run = "29f24d431958caf824b8a3af098f9b8712315ac98ed7c1b4969b1a650cb8a9732341ea3af42c154e28aff35fa6a0abe8b3cfd24772662027912f355f3f5cd16e";
   sha512.doc = "39ff86ed5dace26339bf93b83e9d41a8d89cf17ba6abbf07be9f9ec72232dd27e88e88291d54c09b2bc1ff8b88bcc40a04c75767ba2f9b35a192dfbb8b6b9100";
@@ -3309,6 +3766,7 @@ tl: { # no indentation
   version = "1.28";
 };
 "booktabs" = {
+  revision = 53402;
   stripPrefix = 0;
   sha512.run = "8d7e46297d19f2e683f5c16a13577fc582cba391cdc8a15ad395a6b44072a5b50216ec9e9a8c727c1b2a36b9275ba9bed10baec3aba9d726505955af01d48c3e";
   sha512.doc = "952ff0f30cf7679c09020cf2bca542e11e3a64c88956e87db6289acfb03879609f66c8beb019a6639716462aa088bdff7df3330d60a5d864f25de164affa4c51";
@@ -3317,18 +3775,21 @@ tl: { # no indentation
   version = "1.61803398";
 };
 "booktabs-de" = {
+  revision = 21907;
   stripPrefix = 0;
   sha512.run = "25a46153cea4a6e94c77cabf3afac74e642c7362f7c852725e8443de8ef8873c5a9d2dab3fc3b083dd7382e10d74e71b40b40b1143afce1646e853899c0ea2c6";
   sha512.doc = "1016522eb74332542a9497f47fb0ea884c7d8b3d0a0630b8a6604bdc41ee08d29d963fcee0d643a8260d2e667c0b39edc74f4998ecbe66bc7a45ef23ac78371c";
   version = "1.61803";
 };
 "booktabs-fr" = {
+  revision = 21948;
   stripPrefix = 0;
   sha512.run = "62d4aefc19ff86a60b8fc68a5203bbc2dd2c86ef2f74d5dc0d2a664ff342c13077f5f71a4991704e1d9c69587e4ecde629e5432ade3695efbbc388714fa3c268";
   sha512.doc = "eab2c83e6d81a601ec98ffe43ed4b5ec71e17c6ec42c26c519fdbbb3c3e82154b01bb569adca65dbf540ccbd7263cc20806dbe901ba44204b84d07d235b07bc7";
   version = "1.00";
 };
 "boolexpr" = {
+  revision = 17830;
   stripPrefix = 0;
   sha512.run = "677a397363b80126e45609d125ec2cf22b3ef144216e19183bcd48c1f0ccd6e2e079fbb0a2e7ac03f094470c8c0bc64ae652863aed970ee9fc75a9a69b60c618";
   sha512.doc = "6351bf2d3382c5a3b9a07a8458d7f158ee3bd0e72c96af5f2f985d28a40859f95ae7ae956e5dbaa1ed93b1331322ae1e8901ad3110f5e74024efd831e29b6b44";
@@ -3337,6 +3798,7 @@ tl: { # no indentation
   version = "3.14";
 };
 "boondox" = {
+  revision = 43344;
   stripPrefix = 0;
   sha512.run = "348b48abd7a8b95f37d211612ccc1e4931c0a768af82b695c263b7e8931eded562049ae5a1198361363b08cc269cfb8eafae93c074fe1ada7e9881dfc88d7a41";
   sha512.doc = "24ee6699a84da5931e5223f27bf74518544ebe1a11b303bbcb27c4afc203267159fd4b6d8d9e5828e92c96abd8fa3bb395528868bba0cc26db93fa6748643eca";
@@ -3344,6 +3806,7 @@ tl: { # no indentation
   version = "1.02d";
 };
 "bophook" = {
+  revision = 17062;
   stripPrefix = 0;
   sha512.run = "8ce41fecd2befaf448ed238d8bf643362f5a945b7391d18b2698c006421b7b60ce4d886e09dc579eef12cfb459f49247f7f3afebdf8b590e9285c608d654ed60";
   sha512.doc = "7d8ce0b7caffa4e16539154ade5a3df6d6b42b75bc521643473ff568ef5c65c3014fb22053b353a917d2c4782f378bc765475dca5d20b3dc06ff02c0dd2a63ec";
@@ -3352,12 +3815,14 @@ tl: { # no indentation
   version = "0.02";
 };
 "borceux" = {
+  revision = 21047;
   stripPrefix = 0;
   sha512.run = "e4658e7a672caccd24832b31b0635dc61ae5ace5297569a84d9da981eb37f6b9b944bc33c1e964c09c7042e3e74f9b3067795fdad508e52e624f2bfaf439559e";
   sha512.doc = "202e6b476c5c6f48ea2e6bdf2710d01afcdd9a02669d220bb11bab8fa920f41fddb8aa152a815045ce9d0c92b761f90ab34cd426ba62cf26282d71696f00f03f";
   hasRunfiles = true;
 };
 "bosisio" = {
+  revision = 16989;
   stripPrefix = 0;
   sha512.run = "659cd163c28a52fc12651b35b8018d0df7e4fb706739b090167689a7199a8f9ca3bc3376ed3a5b6c076e9242f4f8132dbec6cbeead499453fa5c9cbd2aecce38";
   sha512.doc = "7fc9a651f6845643fecbb9f0fff150fec2a22273accc420451c2c5dbeab6e40cbeb9b51a32589787c005fe479f626111214bebadb217a238baab07fa18d8c92b";
@@ -3365,6 +3830,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "boxedminipage" = {
+  revision = 17087;
   stripPrefix = 0;
   sha512.run = "374033f9b8b88c55db6de9247d065f7841d49c8b7d42386694752e78b4bb2f4a311e42d5ca3c1e0dd5e694fddb0c18bf9ae6ccb39dc80bf075086e18fe39bf59";
   sha512.doc = "6fe8b0c04117d6b70972ca973e9a71cb33f2ea3f2789460aecb1f0702b896a3cf1d2e6d31533a13819caf1636c5e33ca40f60156992770e243be509dff765644";
@@ -3372,6 +3838,7 @@ tl: { # no indentation
   version = "2";
 };
 "boxedminipage2e" = {
+  revision = 36477;
   stripPrefix = 0;
   sha512.run = "418fbe838e907f3f545522922cf20548abcde20320dc63396434f7b68f578abaffa9f7b76a18373318ce5ed7cef699c64ad8e10e01cedf0b568e65f33ab609b9";
   sha512.doc = "1366f37d45e3df28d3b370b3a6d9618aad06dc68127d1c22cccb0a64d3f82195d5ca93adae86158a830cca26e7f3da051bd36ab1f80cd4bf3609676c0b790dd8";
@@ -3380,6 +3847,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "boxhandler" = {
+  revision = 28031;
   stripPrefix = 0;
   sha512.run = "8aa988155d5115e2fbfbee113013cbb4d32cebc670229104cf96c2920c81bb23245e2365cf31705b67cf72345387a275c83f170a777129ddafdf6cb7558bb077";
   sha512.doc = "15b69a4d434be9561cbcf45a5c3c68ae9560fae35ed2256cfcb4c2bca8ac172a8bd0d6f7335644f586a9b3da65948b9372ae9f7ec9bf2c0d43b572cce5af20bc";
@@ -3388,6 +3856,7 @@ tl: { # no indentation
   version = "1.30";
 };
 "bpchem" = {
+  revision = 45120;
   stripPrefix = 0;
   sha512.run = "3359bc429ec00bdf3b26810e373fd9bba8f562d4782d16adf2706b59ec1cd153f0fd565c26319bac0cf5065b6a2ea99ad5cf6461fba62a7bae8355fad7d8279b";
   sha512.doc = "c8edfa3e5fd901ef705b6b55dd2278eabd996e2b3aa76ec5da9c34c07db95909b67f31990684883edd256f7a5eb7c29450886472fafbd0ff91f8e81abc4dc93e";
@@ -3396,6 +3865,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "bpolynomial" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "370b9ee803390f51da2cf7da4832ce9a51d923420908ffbf5dba21a2380e13cf345413eb81465e0acf86bc4011ec0bdf8cfcf5ac0cdf62cb3e88b2f2b6a6edb1";
   sha512.doc = "2778eccb795d4543baa16966d55ab68a8c2c6f547d7a544aafec365036d9805a5cbfce97efbd25d0b39329814e95f6a2e18610f5e83a4d755a31dafbd651ce0b";
@@ -3403,12 +3873,14 @@ tl: { # no indentation
   version = "0.5";
 };
 "br-lex" = {
+  revision = 44939;
   stripPrefix = 0;
   sha512.run = "e4eede34a086ab025a9918798feea2c6b8b19d86782a6d93745aa82d40258e1619433eb445d0b3c1335dcb195689bb76ac8142e6c65618cea6392e243dadd915";
   sha512.doc = "3d277aeef55721a833cd613c98852c33f7ce22a8034e2fe62952409cffe1ea49ebe1f3b80f91018ea51fadef226939a14e103884dca19227193a32d1e3ba3110";
   hasRunfiles = true;
 };
 "bracketkey" = {
+  revision = 17129;
   stripPrefix = 0;
   sha512.run = "ecdf6f5c6cfa46a3a0eedc9eeef5bbc59cc05a2a831249787ff70fda7d69466862c18dd7ed7a440b8b2bb93c6a08225c7a97bb2f5588d94548d9f6b626ec36aa";
   sha512.doc = "db067a4ab9ac087f565d184c48a90800e68ddb25f5f78146ef1f65bcd3cfb1d0adea78483ca8e27fb9f82bbf26d23c5c16ce735aae194f4816ea73eb993ef099";
@@ -3416,6 +3888,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "braids" = {
+  revision = 51048;
   stripPrefix = 0;
   sha512.run = "bf0c0ff2b6e81b0dbbbb317a1be711e8dc9812214740048a0dea40d8d3045c3fbb996fe1369783ed906571587a5fd241e6a7ce5023c3278ee1bdda19a7411787";
   sha512.doc = "2a96dfb2c18a89d34e4116e1fa81f48532605b625b227fb24f7a949a9e3707f1ffc02f4a20b254e963801a8f97d7f093db7b568adc3b8f4a1fce4bbb7ffb51b5";
@@ -3424,18 +3897,21 @@ tl: { # no indentation
   version = "2.0";
 };
 "braille" = {
+  revision = 20655;
   stripPrefix = 0;
   sha512.run = "04893a3664b10fa1d5b912751e51b6d4a596821535da87aa1f2c2c5632e1fc60278435fe9deae4b0fba8296f2e46015b27b592721dde26dcc4acf7e3bd672a4c";
   sha512.doc = "1cf6922ffa0785adb8e7e7fa5cfe134b206d70d012eb2ec1bd40bedb72ace43c8a17b3e94b16635473d425420f362c49f1b509796d43ca0d2aff0bd9be9f25cf";
   hasRunfiles = true;
 };
 "braket" = {
+  revision = 17127;
   stripPrefix = 0;
   sha512.run = "dc5f931ce9adbb3e8398cfab83402776d92018945172c7c17f04772f3253942c6ebecd5ca0f3d23f0befa87327dea4a3a9b90528bb7409963f04d9b856186562";
   sha512.doc = "9bdd3cec0da91ffd13d556b9620e9c502a658374657e2821141191000a2321bf030edc9c32641b5ae6c52acfc7266c377a8f4dfe4891cb616f8d4f6a377d9ee0";
   hasRunfiles = true;
 };
 "brandeis-dissertation" = {
+  revision = 53735;
   stripPrefix = 0;
   sha512.run = "5315b8ef67866fe9b41e4e51d3f627a1a5c63411c786a8856c980bffddc24300539aad065dc936628fcc8ccb1df75e6709dfa3d655698f19f0b6ad9a2ecba516";
   sha512.doc = "10f38445d595e907888bf7b07adf50c956c35af0571dd883f5e2f6f66c0b7ab196a91356c87a4c605067ed0fc851a305fbe4e53773fa4b83549f566c5f4a383c";
@@ -3444,6 +3920,7 @@ tl: { # no indentation
   version = "3.0";
 };
 "brandeis-problemset" = {
+  revision = 50991;
   stripPrefix = 0;
   sha512.run = "fc5026cefa87e1ab248d9d26466a05e11b112c75bc3908c7e6f123a1436d5f813038176e97e1ed290cc99f93dfc8d024c88c1242b9bb41689bfa0a29153db9da";
   sha512.doc = "0f6857c1ff226d797d6e0dc96bf040e2393564121b54d5d9b1e9e35acb01b7663441e0460cd117a0b015cb768bfdf3f40df142ae93d5a0d77f9a84f31c3e45b1";
@@ -3451,6 +3928,7 @@ tl: { # no indentation
   version = "0.5.5";
 };
 "brandeis-thesis" = {
+  revision = 53736;
   stripPrefix = 0;
   sha512.run = "d769296db0ae91931bca16a358f61924dc1cdcbd5cef42c0c07bfedd8ebb4b700882b2a3b0bbedba2683fd1ad51e9a54597b07c7c6017c22764988476944e66e";
   sha512.doc = "fb23797c136648c16d0e282308c044e64d91a4ea26d7ac835f4d7ab299a49dcdbc10b1a8922cb655284f3670b17b324c57c9560474b02c27f382f436778063ab";
@@ -3459,12 +3937,14 @@ tl: { # no indentation
   version = "1.0";
 };
 "breakcites" = {
+  revision = 21014;
   stripPrefix = 0;
   sha512.run = "13fdad42586a361b4e01999476f4d92ccc0fbcca4ee2663153b9eabbb08ad571dae6631306e9fc590d94f3f02af79519de30a78ed35f737004d86bd62b76786a";
   sha512.doc = "2184e40db7f4a01113ba1040a62f8213f43bf34202a57a33abfc6291e84b01cf27298442f0f636289892d02764f1000ff3542f2ca6e490e0eaf6d5bab247b3f4";
   hasRunfiles = true;
 };
 "breakurl" = {
+  revision = 29901;
   stripPrefix = 0;
   sha512.run = "fa1fa9e3ac50f305ae5b82eb63997d1674b3f640f36d502a1000b439dd52dcaf6b539d153a2c7022f3a00fc0042bcfe341e850ed6b01f7058b1f8f6fd92b4d9b";
   sha512.doc = "38f7847274cbee0a6e7c536a982d0110670cf6af54bfa99718a862e1974fdd839f6ef6871cbe2c40bcd0b2a9036c806eb2b57c8adaee583ef316da367ed854f5";
@@ -3473,6 +3953,7 @@ tl: { # no indentation
   version = "1.40";
 };
 "bredzenie" = {
+  revision = 44371;
   stripPrefix = 0;
   sha512.run = "1e5629a2e6e6099a319d8b8a1efec83262780c70a57c482f66a33a48722bcdb18fb891a96b6b6f29c54d71ce581dd1c82decdd22ad74d6ef61765fec3f8c3614";
   sha512.doc = "29fba5bb48aeb2353616cfe9a8dd4fff90c164c10779b8115958733470fd47dc40a567212c62315110a5a7a51363c9f917c4984583d40177037d6b0803ce66fe";
@@ -3480,6 +3961,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "breqn" = {
+  revision = 53833;
   stripPrefix = 0;
   sha512.run = "0f939606cb3e6a41a9fd51f994671c5ca774b6982fc7b8e19275cb33cc6331b56244156017d9cc091f852c5bc0b7979434a8376c1a9900b59ec573e63036e065";
   sha512.doc = "8a70f3eef2414778ff4124ada2b7aa442f21e35e9b4dd893f5d64196d97dfe2ac8ecc4bf7ec76dc0c432c81deadb23d0ccd9bcd358e83b2c281909d16a75fe91";
@@ -3488,6 +3970,7 @@ tl: { # no indentation
   version = "0.98i";
 };
 "bropd" = {
+  revision = 35383;
   stripPrefix = 0;
   sha512.run = "d6bcf207cddeb6115cab45eab12d48326f067df2fec21386ca29282ccd484e572ee4b5420473079b033bf2b085e134fb42b76b3f18d5b56b47ad765c62b07023";
   sha512.doc = "b9ed0de353b0b0e6d7c8e48f3a20c5ee88a0ee9fb1873ced88e89b9c4d73b20701add802442e69aecc419a2c6f433ca12ccea9130abcf895a5568f7b2d66d6a2";
@@ -3496,12 +3979,14 @@ tl: { # no indentation
   version = "1.2";
 };
 "brushscr" = {
+  revision = 28363;
   stripPrefix = 0;
   sha512.run = "f8c7107b0e98cc6e402ec8ee6f5e6f9a1b8e0d046dddae9486e4ca68327f370a75a0f90000939828605334b3ad3c5caaf5e541c7933c5545fe3e531066fa650f";
   sha512.doc = "41ad7b1afc7cb0f4bfdf0bcff4c1d85f3d9603c3d48ccb62f94a6fa2258cf3f60f03ee1b4b5756d85a77ba4ff9afddbccaba1c4bd5b69d85ce4fed206aa16b1c";
   hasRunfiles = true;
 };
 "bullcntr" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "886109fdce6a936d22b829ff769b130a445876073c73b2bc1767610302ba8a40112938311a138e1c93a0495a6e7d5cafa8d3606ca3b2fe48af442e023195ab93";
   sha512.doc = "ab01cfba0570bc565d8b40945aec5d87739a0826d5c323c5ee960c0d3c7c3135ef2c8b7878268b415ffae3beb06fbc6af48656e7c4a6a45ee423254ce23cad1e";
@@ -3510,12 +3995,14 @@ tl: { # no indentation
   version = "0.04";
 };
 "bundledoc" = {
+  revision = 52059;
   sha512.run = "5b3b4e343e8ce0103a7f0cc736331995fde330b473c21d97df761bffab8e0b82f00238187801978611e32b2190b0a0d51c87c4249135228c8bd53ae8fcb6bfc8";
   sha512.doc = "acd848c58261520c2ea9038d0229b75e7c12e72c087ea1aacc3bd0dc4f8f99d50cf243d282abe44d72c99a75618cf284de400e342a9128f9f1ff87b54ebcdd9a";
   hasRunfiles = true;
   version = "3.4";
 };
 "burmese" = {
+  revision = 25185;
   stripPrefix = 0;
   sha512.run = "7bce3a31febfc6a959ba4779d975cf93276a0bd1115e06a50a3c8d705e49e8d6747ecebc7eac2147f021a538dda1bb241d8f320ef1486229c930141e06d6ae26";
   sha512.doc = "4a7f3628efd913a362786564dd260dc1a63e51a397af3d92222db6f758b7a7792b13e58422d2604ae98f615fb5fc42e77f265e505236db9bc981d7951e0ee1ed";
@@ -3523,6 +4010,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "businesscard-qrcode" = {
+  revision = 48417;
   stripPrefix = 0;
   sha512.run = "c0cccd1959a358d06db838ab035dfe2c4c2b960ffbea5241057871e4131ab06bdefd369fbc0179e74777fd83720692eb190322c797bc8da2ea84f1943684faf7";
   sha512.doc = "bc2db833044104ec82b3c8913067e7687ab18944e7b12ac003391a207fe287b92426de1fce32088eb4293eb2a1bf955a21a82a42ed673938113d9d8a01ec9d10";
@@ -3530,6 +4018,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "bussproofs" = {
+  revision = 27488;
   stripPrefix = 0;
   sha512.run = "a23aa5580e6c3d691c7b14a58b20af1e135681000c50a84be01040df7e1a844b8abeebe11a9dc456cee37e9e34ec020139c9f8de4de51833a88f90e495a65fcc";
   sha512.doc = "b9af525a6a6204c07095864d257c65feda61214c557b0801c9a0c4357578755e1d01e278fe875c0b290f250e3adb03d260a5816a4ccd9f6f51ba67cd8af8269e";
@@ -3537,6 +4026,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "bussproofs-extra" = {
+  revision = 51299;
   stripPrefix = 0;
   sha512.run = "8410e4a795b79e7ea06bfd72c713f39950da8d1c418002bc497eb802ae71dce5d5372f7692267ca62891cbb2a58719b76c2bce3f10ec11cff63c40bae9122a2e";
   sha512.doc = "87ed5af043bcb4d41f301d4b09dae511fa509fc9c50ac70cef29d0df4bc023f97856504c0650b6139ff8bcd9c25a046411b58f72db016d7429788db757a4e87a";
@@ -3545,6 +4035,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "bxbase" = {
+  revision = 44481;
   stripPrefix = 0;
   sha512.run = "18b281f5147a179d2908944dc35e5b9547bb094b15adb559f8154c432710e531ada4c7ab6f755cb631ab882d005e55dd5aecf8602b61fa07bc54fa91506aac89";
   sha512.doc = "da2a4dbce775b37d143b112159e132568b3c48bfa56599ab5f04db0b0b51d1b901775036b76cb4bc049f8193117a01a4d2b6054744a49a8d57f986a2193fc6d8";
@@ -3552,6 +4043,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "bxcalc" = {
+  revision = 52947;
   stripPrefix = 0;
   sha512.run = "68947c8aa57d3f0a449c2da45c081cede0dbe28570f28c3091939e43b7d6f5fd601e5eca02556f46497d2dc82d829dc783288ed665b7efeffe5e946b84b3f713";
   sha512.doc = "caa11080d43cc6f0d8af7f9f13cac63e26d8423cf97d6a77d76467bc73644efec190fd5c1a6d93f3ceccca2606d50ac937b4d04bdf60f080683c8314048adda8";
@@ -3559,6 +4051,7 @@ tl: { # no indentation
   version = "1.0b";
 };
 "bxcjkjatype" = {
+  revision = 42292;
   stripPrefix = 0;
   sha512.run = "ea75072ca87925cbac9c69335fd77b509396516b11cd74b4f29976566613a3f0fe091b8d77f00803932c55f87fd1af964243a02271ef3ba64f08da5a065fb7f3";
   sha512.doc = "4cf0962455982064956fed4080ccb8a4e4e386bdde5952880e05246bb655f064c22b4c1e2af32d3a8850304c1dd46c817ef16f0cb8a0e8cb764fcf788bb4ce6a";
@@ -3566,6 +4059,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "bxdpx-beamer" = {
+  revision = 41813;
   stripPrefix = 0;
   sha512.run = "48009e69d2bb6c316c5d33dcc9d17fcf9f762b68688130ee8407648039b7c3effbbdeaf991bda7842738da59213cc855b50f48cf179ec77e0682729d6e5d3709";
   sha512.doc = "2692918a0fb1ac7bccc6e905350c6cd716b72b33d8f00bad73ed0146238965d0c1a1d9de07c22fbef1ba7211a919c1152342a9f4bb48185099aa470f76374bc8";
@@ -3573,6 +4067,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "bxdvidriver" = {
+  revision = 43219;
   stripPrefix = 0;
   sha512.run = "dc37ee5237e6eb02fca173b8b0501795604930b56c3e9101c6b653ad6df12cb5ae82ad81e66aac5c1ce4ff0aa8d7f05658f4b41057ede286715c25d290682182";
   sha512.doc = "83e18920fb6f2f54f54c401fe83ff131dcbe64ca712ded59f0690d90f1d8b2623ec135692a3fa437b77fe82336553a529d36b5bdcec96a96cd57523f11cc0e0b";
@@ -3580,6 +4075,7 @@ tl: { # no indentation
   version = "0.2a";
 };
 "bxeepic" = {
+  revision = 30559;
   stripPrefix = 0;
   sha512.run = "a0436e9dc7dffa9c7a7b2a41662a41db934aa4242c953f480400b7a2c8a71bb526ebe8eefa46b02db03364efdf14fd88c1dcd267ebd59f594d72540ddd3048c2";
   sha512.doc = "25789b297ba2fcfb81e74637cb2270d41eff858e747b841cfbf5d29791fe6697d3a9cfd4abbbbc4ed0a5c5b274f8b5a7cdeaccc995f6ae623d2a6e2d831b7e55";
@@ -3587,6 +4083,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "bxenclose" = {
+  revision = 40213;
   stripPrefix = 0;
   sha512.run = "f3d0f39e9c21f3bff75d118bb1a9408e7fb2c84beb9301873cd37a678de4b7680d1e8f13693839ce32e1e816e756d8f0af14cc620952afc8fb02885debf478a8";
   sha512.doc = "ea7e0f17ee70d3d4798e85e3788af1110fb2adb436106ad08f601655453af2c5d192d5e3854fee1b29f6ac21f2f6b02e239ff4ec6ae9181818b23bdbac45583e";
@@ -3594,6 +4091,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "bxghost" = {
+  revision = 53606;
   stripPrefix = 0;
   sha512.run = "72b5a376d5a927297fc466936ae55ed4fe4fe8705aa8f31fcaa4f4b558496b19952b55ff8b02318f5d5cc8c6cfe31c6310cbd22900084d353a93f348291e0c6e";
   sha512.doc = "718c59d1c05689fbb4641ead9437b2ddde19f848b6f7c9fd5f4c91b10abe9fc6413c531c2f5af3f9e70e30578341116e5b4731a8f873f75fd4ee0803f3597a3b";
@@ -3601,6 +4099,7 @@ tl: { # no indentation
   version = "0.3.0";
 };
 "bxjaholiday" = {
+  revision = 49924;
   stripPrefix = 0;
   sha512.run = "d028523087abe4587c8eaf877eb2dd0f4c12fc12055c29bc1bbf615e855155a77266df8cdf50bb458600bab0264836346a6d98fc183aafc92b546cfc7bcc1bdf";
   sha512.doc = "398bc4686c7c3b121260cbaf379ca66f7f64911b18d771c04507287d3cce834256662dd8f72f1f55601648cc364703f88a0713d9dab19c53cf19c252e2919fd1";
@@ -3608,6 +4107,7 @@ tl: { # no indentation
   version = "1.0.0";
 };
 "bxjalipsum" = {
+  revision = 43369;
   stripPrefix = 0;
   sha512.run = "fa8f096023f86fe53d09ef1e719d1930248981f4a9c4f762ceb00eb7e42ae87a876857f03b8210ded78798c4ea18bc44486a87876bd5f2509a9270f09d56a53f";
   sha512.doc = "551385ef1ec3aed5d21cef7f1f66254f937c1a7f979db2ad083411580a64cd152b16b9629bdeaa8c2a14ebdc8566278e7a9533ea178b953b033b2637a5f29df4";
@@ -3615,6 +4115,7 @@ tl: { # no indentation
   version = "0.3a";
 };
 "bxjaprnind" = {
+  revision = 45291;
   stripPrefix = 0;
   sha512.run = "77f754e9d9cfc643286df17c7102685ee4c893b5b99308da7a8a9033fc043a7ac95a34dc4a253da4f5e6ed29b35a04376eba1635abbbbe6a6e2670d0d47f50b8";
   sha512.doc = "0010c6e9d1041013401f59820795e338d9e0f852b2d29212fda0c66cda3e2dbdf59593547a8d83d9c6d78d48fb0372a4335976ad1fcc190c3c71a3b5607a47a4";
@@ -3622,6 +4123,7 @@ tl: { # no indentation
   version = "0.3b";
 };
 "bxjatoucs" = {
+  revision = 52509;
   stripPrefix = 0;
   sha512.run = "ffe18ddb89393c61df4371d6fe1154759992e544af64cdfcc007122ed212e87d16194d906d4c9f797671860a96c4dcde12682ecf98adb3c7b8b4c6ae0b432b81";
   sha512.doc = "9c281fdda182269c7a048e1ef422f0c403ecef7d8fd8dc462ebe39b861fba013ede2ef351baa5ad4537b2e1495f1f0572c7edc6fa6407031ff19053bd6dfdc02";
@@ -3629,6 +4131,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "bxjscls" = {
+  revision = 53812;
   stripPrefix = 0;
   sha512.run = "4b100e52663c714296d18b487ad5c21fcedfb154bb517ddf399646fc27795da77cf156de18e1119bbe3563dda13cf504e9ef7132bfe427ec48cf4d8a21a9c1bf";
   sha512.doc = "5f7ddec0451a01d2994d532088754b7135e8dee2d915f94b268e0c07dbdffda4a294c8d9012d0b4a524049fd82b3d3029180ab16d33b68d34700beeb9e0ff973";
@@ -3637,6 +4140,7 @@ tl: { # no indentation
   version = "1.9k";
 };
 "bxnewfont" = {
+  revision = 44173;
   stripPrefix = 0;
   sha512.run = "83775ee72fceb4de0037327561ea2f1723db89dc23ccc42245390212ae1fb849c92c75b2e7b4b23440c62086116b8f0a14b12b27f97c9277c55a7454b231826f";
   sha512.doc = "f09fde7abd39a4df52175eff90363a469270ab1385f3600e654535cc90d7b4b5ba704be734323dffca512f5942c45a9ffb5cd19a73026c224cee3be33eaa5b65";
@@ -3644,6 +4148,7 @@ tl: { # no indentation
   version = "0.2b";
 };
 "bxorigcapt" = {
+  revision = 48606;
   stripPrefix = 0;
   sha512.run = "de76176e7448732d3d429c11b605f24a01779651dc5bb3969a6cdd45ac1801a9d2472dcb4bda9751aae09428d7962981a4c9c581244f15b68b6a4aea43d54972";
   sha512.doc = "0ec8b913862e51f89f661de3f628bb51a306d09d04adce4ff46183d8bb24c351f73c877b08b699f704661ae2c31131b7a959ad863a3a6613235318f8825136a2";
@@ -3651,6 +4156,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "bxpapersize" = {
+  revision = 52304;
   stripPrefix = 0;
   sha512.run = "09b679f14ae4c851b0f4df35ca44653960ba0ca6de03b923602721c25a68e17c6ac3818bc91e189606fe64e3d0585ebf5e5ec5ace60f52435ff79cf6c7a8a12b";
   sha512.doc = "519c4ab5c8eff946e075a84834209adfad9d1262ddcb30fe51b66bdfab5a15d7abe50549073f8d0aba1b661cc262c11f179a0c71edf1e3eceddef020e3fe107f";
@@ -3658,6 +4164,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "bxpdfver" = {
+  revision = 43201;
   stripPrefix = 0;
   sha512.run = "06795ad6cf70da674064e9712584761e9ed7fc295585d66439c5501532fb5ed3da03d05c8b22b6022d3491079b7ae40af1edae12dd3c959c2adc0f05732be723";
   sha512.doc = "326cf6f244660a7d94a4c847ee9c7a43cf3d2fc199ae94035a76464691b48355432e71fff82f9c6bd3642e10b2011ba4d8d0f318304818ad9a8c27c579d3ca37";
@@ -3665,6 +4172,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "bxtexlogo" = {
+  revision = 47230;
   stripPrefix = 0;
   sha512.run = "d3144e28a695f0e9939ac3074679558757f2272f0a2f2ad958481981389fae44a663c07fb914b13a890a736989bbb9946d22e1c9bd5d3ffba1db010fa451ee58";
   sha512.doc = "59ee17c9147587d1eb1052dcf4624517cb575c49163a24f3dcbf27785f75b325c0de1c079c0b214cc6a63dd9d5862578303170eea91b0903d3b803c044078ee5";
@@ -3672,6 +4180,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "bxwareki" = {
+  revision = 51286;
   stripPrefix = 0;
   sha512.run = "73f44924ed35cf95af7d2eae057a48fcdd307741ef9a0a0943638681f9008eac56e8f2b1f57afdf0c3dc789a079e65ab1142cc5e993ecf6b382e8bb127f6ea1e";
   sha512.doc = "d861ef91292b76b4f248b51d99d062116f49be1f942629d049fff00e20a6e383bed050799a576e14f7daef52dd4f7f1fdd2ce898374191b9c719421ea755d7f0";
@@ -3679,6 +4188,7 @@ tl: { # no indentation
   version = "0.6";
 };
 "bytefield" = {
+  revision = 45339;
   stripPrefix = 0;
   sha512.run = "ae5c3c97ded2cc83be2dad6d67132b75eb55b22ffd8d4c0bd49dc842344a310c4ac80571165e43d2b446148dee1ae3927fc2193a92e85e75ad457b4732bca7ed";
   sha512.doc = "6657581a9b97383c2dc3f8972ff77461a73ea33ecc0ba4dacbf0188e1db0dbe21e2d324dbb8fac7f05fafa585d3672d6de7d7db267a8e9f5e623838d0c46df5d";
@@ -3687,6 +4197,7 @@ tl: { # no indentation
   version = "2.4";
 };
 "c-pascal" = {
+  revision = 18337;
   stripPrefix = 0;
   sha512.run = "59aa375b3b953f2fab04547b3234b36fd08af39392cfdf05f6992a90ef3a52503b2e11296787763abb9ce6251f9cc2fd062d78133038ca4a92e1b06ae65118e9";
   sha512.doc = "52252a2265d9bd48f09ddaf5f1517a6a74980897f0e8e0ad7ea71bafb194ca5bb98386af537ef2a4fb955e62ccba3d16cc1ebbae094502f16ae3bea0c5073c79";
@@ -3694,6 +4205,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "c90" = {
+  revision = 45666;
   stripPrefix = 0;
   sha512.run = "f7e7aeb931bd215d38b41e1ded6d8fd046f90e54946a1bd1d4dc04b7ede4f6c20a3501d57397601f8a423fed9518672fffa9d45f17515f56b05217ebd59efe81";
   sha512.doc = "dbf3f9d28bfad1d52dae43f9e9804d082525ea6deef94ba4ebbef6d06b06ad6010f5944c52ce992b1ba4cb5f3877a8eb3b694f106f0eaaef48ef350f62c76e8e";
@@ -3701,24 +4213,28 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "cabin" = {
+  revision = 52475;
   stripPrefix = 0;
   sha512.run = "b5fac4c3439798f21dc67f7ccbdf51a48d6946438dbd5e15e4432faacdd5231e158615c2cfe1617347473109a783dd49bfbd613613431e8e2951ca487482b7f4";
   sha512.doc = "f76c3faf1bd7084f7697a219d8b12751a820f6d0cfc60c2390a2d2d8c07dce768381dd4e8b018614a73213ad5f07950a069d9646e96418d61ab10e8baee86949";
   hasRunfiles = true;
 };
 "cachepic" = {
+  revision = 26313;
   sha512.run = "a0405befc4ed9217cedc4abc78c355b869bb803fa4be32245198ba4aa8151884ace023b3465db3b4757c923d0425fd1d186e25facd7c29d05d5072668a9f0e3d";
   sha512.doc = "93108475f74b2356cea79a8403729df7c24e95871680b0b53f9316a7b158aa973ce108632a121198459352968bfdfd79f265d4aa301ecd00ce55cf56db5f976c";
   hasRunfiles = true;
   version = "1.0";
 };
 "caladea" = {
+  revision = 34991;
   stripPrefix = 0;
   sha512.run = "3e1d6bbb049ee4ac637fe051ac39d2e590d0e5ef4f2801ed9c1dac96b9ec8724e7643fcffe8a72de905572a75525fc6954871d8d953ae120af7e9f336da51442";
   sha512.doc = "f6b47af3681349536a80bf5b6ea0db2113e35384dd7ce99da3704bdad3a3c5dc8f6dc0e4b1402c89ac97ece9907af5e0f2263edc4c0bb0a1e46ee89cac2f6639";
   hasRunfiles = true;
 };
 "calcage" = {
+  revision = 27725;
   stripPrefix = 0;
   sha512.run = "d3f6d46166f2b37e6ee8ff9185c6ddf5ed99ca2b32c7520966fa9a3db95d3a9517e39f5e8f928332a8dba490274c4fe48e62b6ce83ca10d0fbdb9a4218e0d92b";
   sha512.doc = "4c3f1ed751005a5fc19e0ae40dfeb010ca211dbbdb7ac11c01525c7643f1e993346f1af21d411705ebcb119f8b1c20e4ad35384d2be9618fbe6db2de99e6eb45";
@@ -3727,6 +4243,7 @@ tl: { # no indentation
   version = "0.90";
 };
 "calctab" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "20ccd46a047987004eef78f75b18f49b1e3001e240604e2657e23e30c4e6f286ba700cb828eeffbd608880ac4994d4a3cd2d67aa336957fecd1d3ea8a48058b1";
   sha512.doc = "555a9d966fe556e8aa1dd39ec1ec327995f62fa447bfd2bbb8efe47ad667427eef249c749f9d2c0436c16e31e6fe7b0dced9b449da307411ac186d30c2407270";
@@ -3734,6 +4251,7 @@ tl: { # no indentation
   version = "0.6.1";
 };
 "calculation" = {
+  revision = 35973;
   stripPrefix = 0;
   sha512.run = "d60f9face95cdf6944363ce66b842b2a695b468e77193785564d1697244e193cc0dcf462e7a13c8a22eee173d5d4cd192ae59bbc68e086ac27c92d2dbaf6f156";
   sha512.doc = "741f4600986798bb191352ef98ac1a398014f92956267c36ca1834d95996008204107dcd8575077d7eb2dc1ddc627f03ffdf071ce0d8b2646809063eba59625a";
@@ -3742,6 +4260,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "calculator" = {
+  revision = 33041;
   stripPrefix = 0;
   sha512.run = "d381e15db10c289b3de79bc6464c714391949f149cf5e6ff7af04e3f195308cd9d71627dc04c6138b17d4d2c1e5caeb44149e327df78d20e54344d95cfc4d8ac";
   sha512.doc = "107055cab430fa0867f48b3e4c9215052926ea328d29d920dd0345bc48cc956a0673f6ba3b72c954acd98fb65678acde00b4d18def40225e1b8ff656a7938754";
@@ -3750,12 +4269,14 @@ tl: { # no indentation
   version = "2.0";
 };
 "calligra" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "9479d6b5ab33b12acae5cb3858c218dc4a1e1901c4006dca5160778798813d333b2e9e615eeb29e01007084d8479c58573f88ad5e282dfc06f3f5a9820df482c";
   sha512.doc = "05e7b61864f483f0fc50d4680d80a395282a5c7f36b7ccaebb70e1c24cb5a101c4ee5accfec8d12c7fac0e7a32851dc15906267b93e6d75094b7ac646826dead";
   hasRunfiles = true;
 };
 "calligra-type1" = {
+  revision = 24302;
   stripPrefix = 0;
   sha512.run = "325764734735203d4e355d33b30a289d699fa10377212e39bf33d3195f2dfdebd4397785d69d6ca392e040cd2fd5bad20b0055b5f92620149fc96ed0d6d337a7";
   sha512.doc = "c1acbd3ae35c423b9414b5e132e1a164d4b102ecf9d7305548bb5d203a8d3a25309e2aa5a5d09277d310b9446013ca2db65f9ce6d5783432ed325838bfc9a48f";
@@ -3763,18 +4284,21 @@ tl: { # no indentation
   version = "001.000";
 };
 "callouts" = {
+  revision = 44899;
   stripPrefix = 0;
   sha512.run = "a440d3815f5c5a6d291ce4d7a20bc8483bebe190a0e6944de9f5be78a23eef119f41740ca0fbae4515b6ea7f2aefff90a62005883c44e8d70c6aec0a58c777ee";
   sha512.doc = "0801298bd110f2e484b45c66626c790217666f3351aeeab87881d7f32ada1868222a21f2a7861afaacdea302ad269d2062aaf5fa9d13fdf8efb93efaeb499bb6";
   hasRunfiles = true;
 };
 "calrsfs" = {
+  revision = 17125;
   stripPrefix = 0;
   sha512.run = "34b5315e9e5e0ca532733f7b7ebe66e77d935fedf0e042aec63fb7cae257a423db5e93e288b9e1dacb26b0b75784eddffa8b565acfa537a7d970297f71e63a2e";
   sha512.doc = "2378c004fe888bd2d60d0830ec98e805a2bdea3a5a6f4161dd3d4cb56c437dabdb579f3293845a10e316cd868725abd304ecb8eab55fb4c728ed5bc0d2073673";
   hasRunfiles = true;
 };
 "cals" = {
+  revision = 43003;
   stripPrefix = 0;
   sha512.run = "75321e774560d7a205a7bf6b7d2d512c6aa9b5f38f6116813ff43ebd4d1fed23ebe26c235b278ee5723062e49630fc5f9480dccbe5bdfa44f5168f18657ddadc";
   sha512.doc = "15accc06e3de07dc535078300efbffe305d8e26a3aa0e81304de37090500210932f08c24454d0bcb5d93ced903832891b6f987525eb64d04b1a7bfe577071153";
@@ -3783,6 +4307,7 @@ tl: { # no indentation
   version = "2.4.2";
 };
 "calxxxx-yyyy" = {
+  revision = 53290;
   stripPrefix = 0;
   sha512.run = "99c3eaa37d1502328352e67091390ea47e3bf1d3fbdf776bb885e06bc2613a1e3056db4344b2a6bf968ec146bc3e3d44c1edae6a56a37eb1a8e5225ad6f62a94";
   sha512.doc = "0fd575f4c4535bcf705acd8e3e4b091ccb1d3d1edcb8e6797bb2b5f891c95c8e7de439015d565d6be0098441abf175d96ab20351a5669237ebd846e37eaa65d4";
@@ -3790,6 +4315,7 @@ tl: { # no indentation
   version = "20.20a";
 };
 "cancel" = {
+  revision = 32508;
   stripPrefix = 0;
   sha512.run = "ac6e6b642dde29e32e45d7a0e967370c1f7a6ce604075cd43c57b1ee002e75adbe4fbc81de30e8d252cd58f2ac091503595a433c5de898deb3bfbdbb6f2d2e62";
   sha512.doc = "5af252a521c1976166db248c4c19d4fcadd32ec9801e0cd42b73e0a3a0adc461b88d765b90dec1af859474fc64bc00cbc8be44450cb4da6b43944c8fc46ba670";
@@ -3797,6 +4323,7 @@ tl: { # no indentation
   version = "2.2";
 };
 "canoniclayout" = {
+  revision = 24523;
   stripPrefix = 0;
   sha512.run = "19858946010eaac99d0a0b0808f31c57949b7488dea007e7a5a2d8820b0ae16518ff8aa48bfa5e067d90c8662937de7af7f325aa9a80dba382a03a66d89e46b6";
   sha512.doc = "221b7eb51a3e5e9da2e354646cf1c09a78811ff1804805171bedc1e72e5c1ebc3a2e974f3b5ce3eb6322e17111ce2486e9c9452367e4e753be029d096ae9033d";
@@ -3805,6 +4332,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "cantarell" = {
+  revision = 51459;
   stripPrefix = 0;
   sha512.run = "4565c3ff88cb4449fc2feab5f87de79eee7f38d0bdf61866d8fff421bc92e0382653b9956a724b1540c64ac78dbb529f34421e5dd0a3b76a2669da3a0d667c89";
   sha512.doc = "2c696061a46a3b83951869ebb36b31da87e61d9489441d14b8f8ca2eaf4616802ac917e9e68d56d6e81fc03a534175b592d74ac42f8079340f476725f869f0b7";
@@ -3812,6 +4340,7 @@ tl: { # no indentation
   version = "3.2";
 };
 "capt-of" = {
+  revision = 29803;
   stripPrefix = 0;
   sha512.run = "f3b1b81aa5a8c2ed9d5ab94e2e242442674af957d3f987b0db459ff8ca920abaab43d46db234b92ab588bb5f7d4c587eccf586a87fd492659f5b088760859c62";
   sha512.doc = "a8fa6b2a0787a3e52f3a9a22482ba9f9217ae97b985b4975c690d240ae040f4f1e17c3ea7439d53337e5a0815a66754d0e6c528417c04d7c6684d28e869f71d0";
@@ -3819,6 +4348,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "captcont" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b5002e8ea4fc8ca1840190e8a2d40540576dc5e17110da473a8981198e3f24c858644b181545be3bed6275cd0e0bb9848a6058adfc8dbef26956e0754c4e4699";
   sha512.doc = "91bdb436163ff745f3aecc67eec747ef5a1853035d86258bbe23a080a92b3393f72b4029bad719765663c94e79217df4edf753be930a3e4b62f0b999c296ea86";
@@ -3827,12 +4357,14 @@ tl: { # no indentation
   version = "2.0";
 };
 "captdef" = {
+  revision = 17353;
   stripPrefix = 0;
   sha512.run = "c24a7d66c1daa3a9c336a8555286876aea9e969a4107c42c258f0f4c9a88070316df70e0f2a860adb6335a33e49cdd7a9ba8391255f1e1fb283bd2f6a7e7b343";
   sha512.doc = "c0a1a4584d0802eda39812d2c293fabed2487b0cedb57df622519d5857c2ef10e54e66032e9e9ee9ab81c757fb827eabf422b1bf2ab0ae6f7c22ab3aecb49a8f";
   hasRunfiles = true;
 };
 "caption" = {
+  revision = 53517;
   stripPrefix = 0;
   sha512.run = "5902f3a3c9706f3eb1fe973515232f5d5271c3a5c7dc23d027a30b0274da998c289887e204071538d3c58342572f5c92cff73f729436fdf0e34475fd47405da3";
   sha512.doc = "57b89b79f2c81aed9101ef2b7ad0ba17053873ce8ec512fb10fde4ac8400bd7a7ba47fac67eded49db870b1dc4d001f46aa2e4ae994d750423c830b8f46450af";
@@ -3840,6 +4372,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "carbohydrates" = {
+  revision = 39000;
   stripPrefix = 0;
   sha512.run = "dfccca523ef4ea2c9bba9ebdbed7f6bbce1ab0739be02118231d1eb449bc826dd5e96406d5e009239a1bf25088e8df289e2e66423a536d76cf592af1a50f276a";
   sha512.doc = "67de0675fbe00573058f428d34779b3423d1c9a7d47be5f8f1c3ba6b3cfb6783f5f1a945c1f201bb719bfe835ef035dfb56864a13ba0f12e0e83ef1ca0ce059d";
@@ -3847,6 +4380,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "carlisle" = {
+  revision = 47876;
   stripPrefix = 0;
   sha512.run = "d3e743a5e614479167ead02eabfefeffc8006e27c486fb5c57f1cb94278418f86db0431c752310bc1f7cda6dad22b1610edf4d24742391f6b743cad4ea050344";
   sha512.doc = "8d49c9d72669bffa042defaa53b4bdacf2e107753608747162947f05ad8438b9463afd905a376e462e6491293cf0c4a202e0b76db965854c19b97641d0a7d295";
@@ -3854,18 +4388,21 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "carlito" = {
+  revision = 35002;
   stripPrefix = 0;
   sha512.run = "57575185b89cf337f612f3e5b8458502e0d86a49c992d40f8cdb390417b0387fb0039ec316fa807fcddad7795e9f6617f62cf0bd6827bb654ac28231f65bc0a8";
   sha512.doc = "b656565ef24d9939545e52af7bafcfc8a3613d0f206e1aab455e339c1d2590e930207db24033c8585a1e7950ec9f550d3b37a0c1adf456800b85ef63b68f875d";
   hasRunfiles = true;
 };
 "carolmin-ps" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "61ae809b5e4e7ff493de30ebb825870ab9caa8dc64d6d3c82d4654fece82dece4937c798e3c1e5086a84411edbcaf8c2ea777a9534865b38d4bc5457ae59aa25";
   sha512.doc = "284d9f740d1e4b1a4c989b527bac80e54afa74013d1234bf9e1c2d42ac2ca4387c3b0d24004818e1fb92b001582114a4432480804c721cc7df0bd3b85835f111";
   hasRunfiles = true;
 };
 "cascade" = {
+  revision = 48200;
   stripPrefix = 0;
   sha512.run = "d72e9c46f4228af10abc33e96818ee488d09389d21575b40cec183c03664c63cf7dc7b9dc319b0fb775c41b5c9df8f767d06d131ada730f9b8dfb655111fd7fe";
   sha512.doc = "d74ad316352672ad753f48e1b1c317dbdf402927d75d583d85d85367ceac69228e81b726b575e84d2746a709457e18d25817ebe7850dd17ca07515192749b713";
@@ -3874,6 +4411,7 @@ tl: { # no indentation
   version = "1.01";
 };
 "cascadilla" = {
+  revision = 25144;
   stripPrefix = 0;
   sha512.run = "df66bd91562f3678e2ef42f16a4a0c4af95209fb28b1176b5b63968632b3235391180b06431a42afdc73a9e4f97f47c8c954ed1ef2ccb746cdbf1d65058ad919";
   sha512.doc = "2c15b786f550642c26cc8f5e0151dd5b31e964b46d59837b3f1ccbe118fba6ad8f06f86c6a5bdc6a791615929bf4c9b7c2287f930d1ca3c8bd6c2d0d7ddf64b2";
@@ -3881,12 +4419,14 @@ tl: { # no indentation
   version = "1.8.2";
 };
 "cases" = {
+  revision = 53909;
   stripPrefix = 0;
   sha512.run = "81c0aa3c563cb8faf27fde5859a298b7bccf97ee4b38841f0a8b1e4e1d2130ce01007befefdb5bd28048472c2fca30b477cc9a701096a181a3c551ca01f4d95b";
   sha512.doc = "f06f9e40be1af54a3b73a7b1c949475b6d6c9bf5e05a74a4c29c261f057220d93d08cd4cb57085eb8cf01d200d9cc18764950b88529ff2df0814c354d5546e5f";
   hasRunfiles = true;
 };
 "casyl" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "1536d4fe6c0cc647def47d3686ac73757da8b4ebbb99a5188e78944d59350c0da731f2e51a40c94a1e05b225a793f292766de4221792804887b4350631c8a24b";
   sha512.doc = "74adbaee46656ad57512a11986f834239d60259eb45014e2c738f7f5b5bb47897185528c0feeb96c45ab7d6c04e679e1858417a93db791b72b5eea1cf828c0ce";
@@ -3894,6 +4434,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "catchfile" = {
+  revision = 53084;
   stripPrefix = 0;
   sha512.run = "6e01a91913a2a81224a533eb7f119283c267682efaa2a6cec11e9db7fc593b0d7a6830b83e482f22e96df208dba598b1c6596a78ae5d4cd17aa4c9a50eeaddea";
   sha512.doc = "ad0d938e0bb4fe3d307dff1afc5ff93cd4b76948a88f88a65e3d036fe679cddc91c52e64febbf887c766d423fa5d94371869793c93138eeb919188b9b44234a7";
@@ -3902,6 +4443,7 @@ tl: { # no indentation
   version = "1.8";
 };
 "catchfilebetweentags" = {
+  revision = 21476;
   stripPrefix = 0;
   sha512.run = "71656fb162aae4fccf15767911b8524c4f3a72f4c6fbeaea45a3dd9593489ec7644e7c10ab61a49cdd125ffe56e61331c30e35a10517720948d4f03b97b20056";
   sha512.doc = "4071d6d6ada488b5bbbac0df3b7604939fafbebc17808430d8bd389b86a8aeca0df90da77fb00f8be14af9e9a79c45bf5a2dc0b9ea45af34f60cbce83810e1a5";
@@ -3910,6 +4452,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "catcodes" = {
+  revision = 38859;
   stripPrefix = 0;
   sha512.run = "6eeba6d0c7435050e5ca07a6b0a24bca1714a9ba3d3a20168547502c2ec954b9d74918767c9728c1595355fdb84eb74ef258fee86cae1907fc5b186ccac0a939";
   sha512.doc = "4dbf09f34abc39d9aa5003ce3defe4f5a04b0cade5d6a848bbde4ff3f35ff6bd511b8dd8dade14f92b1ba38bda2595da65da589b0236920c7aa340d245e0cb7c";
@@ -3918,6 +4461,7 @@ tl: { # no indentation
   version = "r0.2";
 };
 "catechis" = {
+  revision = 49061;
   stripPrefix = 0;
   sha512.run = "2fb8f8ae6f9e597740edbdd0e686f9715dbd4ad2df2cf9d3737b09d1ef496582e243b8e21414fab8cb89d3d5a8ad30a4d82276551ad6fa548895c6cbc7612cb9";
   sha512.doc = "2273842b6b0222c98736fe6338eec505e5a75ca45d180c259bb3073ed47a5d0bab65fbb95630076f764db64d978ad8b3dbdb6a12775d2af3ea730c9d1b938bf6";
@@ -3926,6 +4470,7 @@ tl: { # no indentation
   version = "2.5";
 };
 "catoptions" = {
+  revision = 35069;
   stripPrefix = 0;
   sha512.run = "1169ec654a56230c615f561649ca1fc22716eaee05e5229d1d2320ff73717b708abb98789d7457093e5ab5f2dc67f3e818e58c7e8f32c8f29014e19548f02de1";
   sha512.doc = "4c35a3fc5829e3492fad27f2635bb4ae62b17b5d012db40fcdc5929ffe0f3917ec76c12a940d5fc6dad2b8d7d9d12042c7f5c2350467ba0777a23c97372cca5c";
@@ -3933,6 +4478,7 @@ tl: { # no indentation
   version = "0.2.7h";
 };
 "cbcoptic" = {
+  revision = 16666;
   stripPrefix = 0;
   sha512.run = "7d48e324b5c5ff5b0755903973e0b439025e98277269f21cae33709a6c39eb6df7cd8f054b22fb8b1c072cabf9e92d0f1456cb41fbdd5a6e99bc0d63952e6c3c";
   sha512.doc = "e7e33c5af518e7fc4f8fb15af79a9aefc1ab8cb4401d0eecbd6b418acfb01c2fa790d4d7f55206ec9d6d865aa177b2872f4d742bec2991e7118df4b834341af2";
@@ -3940,6 +4486,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "cbfonts" = {
+  revision = 31624;
   stripPrefix = 0;
   deps."cbfonts-fd" = tl."cbfonts-fd";
   sha512.run = "652472d9251cc9090906627a823fbaef3015ce0a5db5d08a347f6bb496303adb65339ccc2cd55c19df489512ba06c605342ba2871f99175685259415f6d3bc0a";
@@ -3947,6 +4494,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "cbfonts-fd" = {
+  revision = 44917;
   stripPrefix = 0;
   sha512.run = "f892af7e63b4376f2d82d886516f6b25d362f8dc627435b4f353a72926f25c3867af1fb42a4083ebd16bddd05ea797d643b94f556cea37495fa0fb7786e33b3e";
   sha512.doc = "dc2b0570e042ed2e676c55df43b9254a277d1258861cd3c4c45ef65012dc8182c0e374ddf71f3d3ec6a667b5ef99bb449c43ada155367e1ef26a6ca8c8dd058d";
@@ -3955,6 +4503,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "cc-pl" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "768977678d3948fa5f479bba6248ffaed6b176a4b3d0c90d691b02e91108b7567420ec600fac235a7d8351ed00803f760d4432015f518c1c62c93af95b0a8394";
   sha512.doc = "cb004afd1b835f5d75389f3470e1cf46506e8db46f56f562e5376b5f1a8a9d45d59ec99d7df2d791df0462cbc760aa8a278c6a73a582afa8c4e7d8c73149febf";
@@ -3962,6 +4511,7 @@ tl: { # no indentation
   version = "1.02.2";
 };
 "ccaption" = {
+  revision = 23443;
   stripPrefix = 0;
   sha512.run = "f002efbd7af71c108e041daaa182a4432d1886a058cbfda2da7fcf6c0f75a217d04bbb8498deed29c7f03a8d22d4d2e24327e6a3b284d38c7b37200431f17918";
   sha512.doc = "a3d2f92700e3421c37a666093944ae297ed39a35d99d6971978f5707619046603fad06b84aad55f41d3af08725535470ccec6d6bde3ab8f1ce4f0a53038e9ca8";
@@ -3970,6 +4520,7 @@ tl: { # no indentation
   version = "3.2c";
 };
 "ccfonts" = {
+  revision = 17122;
   stripPrefix = 0;
   sha512.run = "0affcca65346d83ddfdd9f2d6a9bd9baf41113b396a99c76c88801b1d509f3e9d6168f0a4659a5cd440bb46fff996d5f3361ba342e11c902d0866f616e0d41c9";
   sha512.doc = "6a08c3f13c5ece4ebd67ff1463a4c27c1b5b114fa777e916c034a66dca5c8c85bfc138394ae9c2955182f68f34a91ad57eb4834f749e7107b0a311e0eb61848e";
@@ -3978,6 +4529,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "ccicons" = {
+  revision = 45646;
   stripPrefix = 0;
   sha512.run = "45df39a60891940e4ab24c489d7ff76971a7d378156ab4c533eb739fcc8723bc7ff6ef81322ef157b2498e24b5df97e6807796330f5852301e1e88d950f90d40";
   sha512.doc = "3e988fa5a9c4f3a07f0557d5ef787ff9f6ee2630be5ecbcab1e892086430f39a8f8e23deaeb624c1bc4b3f2f00b708edef4b3ed645c56400c13c0f9351b5d8dc";
@@ -3986,6 +4538,7 @@ tl: { # no indentation
   version = "1.6";
 };
 "cclicenses" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "dca388e065610abad24a76f7dc600d9ae659973fbc47f4fc2157958aa2850d9c3bae7811418bf76effaf696386a62584c8a2ff158e98ec7a971bd1dc800424ea";
   sha512.doc = "eb710fbac41527da39c26d5d27aaa84faf05e380356e9c3bc1a0c0fcb4d2dd5412f304d323ccf13084dfe8d31243698350fbdbefac07fff6cfabceed9f4d842c";
@@ -3993,6 +4546,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "cd" = {
+  revision = 34452;
   stripPrefix = 0;
   sha512.run = "8b47a219e4d40364e1a4ed4d13245c0c9334508ffca0cff565a8d8856aef32184bdf0a19966027fc4e958a06b4f5a53bfb66188c6fd065a1b3b230cf1da2f484";
   sha512.doc = "5ab78083715332130aacf3a97f6280f2533e7f9383c38ddf431d3486c6e88589cc69b7cd760088fbd2928c9b349ff583bc275ce8d80590234deeaf1e1a23b4ca";
@@ -4001,6 +4555,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "cd-cover" = {
+  revision = 17121;
   stripPrefix = 0;
   sha512.run = "345b001cd40137d9739a97c3c06549c3c7b761f56f61109dd4908c767151515081defd6c432232ec7a9fdeb8e85e95258ded345facdef0cf6bffa82bb5c39fbe";
   sha512.doc = "f22c8eccbecb35d4c3c01788c0eb8ca793fbaf7b97e2bd54ec79e78ba10c13a4eef46c5eee70f1550cc7c378bb01926e8eecc6d41916df22a6e615aacd2b1e75";
@@ -4009,6 +4564,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "cdpbundl" = {
+  revision = 46613;
   stripPrefix = 0;
   sha512.run = "142dc5657e1482cdf7392ee7df6967557cf09e5b733b12e8c7559863c2edc66a3439b29c7cf16c2461cc1090090117337f63db899bf7bba0cc23d04bb573c633";
   sha512.doc = "3fbfe5b5a8771bf3a74c6adc7a90e04f6085179c11a6db4ed8ebe644e00e334f447f3d32214d72ac341d18e3c79d3bfcfd788053d2065eeced76ad7c7ce6a9aa";
@@ -4017,12 +4573,14 @@ tl: { # no indentation
   version = "0.36d";
 };
 "cell" = {
+  revision = 42428;
   stripPrefix = 0;
   sha512.run = "917431174b203fd839d3cf81ed965cc654d66597246ef7a4f9f3c3a945397b546eef1e7bfc4f9fb52889e149ee2fd195dd559c317472831e66e0fc3253a6c22b";
   sha512.doc = "3cbf1ffa3902f49c155f2ee6b13e24b9abcbdf50da4668042dbc720ef20f483e230fd2ffdc8448007df7ced1ed34077811199cda4fbb35c104dce73084215bf4";
   hasRunfiles = true;
 };
 "cellprops" = {
+  revision = 52205;
   stripPrefix = 0;
   sha512.run = "0dd543116fdf89a6d83c5e7a4a96b6dd627f156b13bc56db5905bdb32f2e880d9292913d6e3423e1eb248c0340fa2e9cfb73d0c7795fb4bd363f90c9d150ebc9";
   sha512.doc = "3f44b803ca78fc08732ca9971da4bfc7755cc73e0b8cae8d88ab3b4e4906271bffe9762b75b2281776f36f3813f3cf0d58c0b38bf2fbb14b25156e00c711e14b";
@@ -4031,6 +4589,7 @@ tl: { # no indentation
   version = "1.6";
 };
 "cellspace" = {
+  revision = 50374;
   stripPrefix = 0;
   sha512.run = "d2de1e55913a434eb5b0ab19f615ee325dca750eaa8d61222045220153d521eb8149bf025aa03b1e6a7c625cd994b8bdaea241b227b28d1622c1a75ec72d76fd";
   sha512.doc = "a1cdfb273e8c32374b03dfcd1d2ccbf12a19918fdeada025cf948fefa624decda07f8c3384a4dd859efdaa9048adcf0c513f59f28e48f31062819c1f9acdcd0d";
@@ -4038,6 +4597,7 @@ tl: { # no indentation
   version = "1.8.1";
 };
 "celtic" = {
+  revision = 39797;
   stripPrefix = 0;
   sha512.run = "df78495c7a42a60bf40be46bf14c30d97dcd7c7d1b283f487026f7c3b6a680c750d09527cdd578f69234500eca05764792ddc90ae4dc8005126510ae33fcab4a";
   sha512.doc = "ed29c2882619bc7f076578c91cfb7e1e83af9e6960ee58af78486c1af6aeeb2b2b6eabdf916fa30ab865991c677955c0fd15a43f128aecb635ee30b3ba514bb3";
@@ -4046,6 +4606,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "censor" = {
+  revision = 49168;
   stripPrefix = 0;
   sha512.run = "03b94dea9f5f69f0fde8dbd198e73a1ccc1e7b118b26c8272b217bfe76b7cec7eb0c8706dfbca7dd2a9438ea7337482cb55d631d3cabfaff3dab19d1cc565780";
   sha512.doc = "131b995300b302f482359820bb9dab62188be11f46470e2c9d25753a22d6b81def5e272cdca4f2057adbacb3bb9aa777e758ebfe8a95205db7de36b378369bdb";
@@ -4053,6 +4614,7 @@ tl: { # no indentation
   version = "3.22";
 };
 "centeredline" = {
+  revision = 50971;
   stripPrefix = 0;
   sha512.run = "7b1359bd93853830d85fd84c9132d997c1384211c504999f4bc819cd6fe85effbe9f0fba64cc502419484cea3cacedf02beae22052bd10a7a7dbad3f97583731";
   sha512.doc = "237af456a51f539d02d96bc1c2bfd1fde1328cb270985b50a0ee9760f4b6f3675610ca088af135a86f07c02a0cd84c651118726915a0a01546468030acd596f3";
@@ -4060,6 +4622,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "cesenaexam" = {
+  revision = 44960;
   stripPrefix = 0;
   sha512.run = "780962e24e1dc4c6c385c18a6c95b8864b1930b2bc684d9a556a1d6579a2a8d06ec0df3fdb085c3ae8115dc72d06e376ed8ea6f6d801af07dfcbf133c9cb9c67";
   sha512.doc = "72d53ea8ffc1827f3965c6f0728aa5f2cae36f645ab10d78ff8c16a3537f79c6f53fd34f388f2991e5cd2261b366e7746a140285df95d17475adde9cee3fcaed";
@@ -4068,6 +4631,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "cfr-initials" = {
+  revision = 36728;
   stripPrefix = 0;
   sha512.run = "d67830168afffe72ef37784db45176528065210d4956b4aef2a166d41c886f5b3874e0878da9c56302412cf5939291451e1e20ba3e676429c598342982b64083";
   sha512.doc = "0d628f9134254a92c7b88d0744b588bb197c6850d7d5e44a90e91c1ed128625c7add731916b727c2d3b532ade017daaf17f45e446e4bc6f0e447bb5fdb770066";
@@ -4075,6 +4639,7 @@ tl: { # no indentation
   version = "1.01";
 };
 "cfr-lm" = {
+  revision = 36195;
   stripPrefix = 0;
   sha512.run = "02e30f6d6d19bede2121ee0a8db20c3d96c26ef000ffeab08e800bb1da994dfa2cb356a6d67c815e8579566cf97b33b956c79940de61725524c4a239f7c1a251";
   sha512.doc = "32488ecec8a781f5548419a782775725e6b32276bab5e1d7f660b99468d47e71087fb35b8f4534f874b1dcf236d04eae9d7920fcf0bb46e139a4e7fedc415ef1";
@@ -4083,6 +4648,7 @@ tl: { # no indentation
   version = "1.5";
 };
 "changebar" = {
+  revision = 46919;
   stripPrefix = 0;
   sha512.run = "fa75f75aead49adb949e0bb5b5c116387e14b5fcf804502e12b7214a2638ec2032699125adc6ba8c528445c9f5c552ec744007530d1e5a69159f1041d2b7bceb";
   sha512.doc = "f25c8bd3cb493bfe8446d98f3c599ec002f818daecac76ec4f08d19bfd15581bf8bf8970fd145886a42c51cd40a53df7bfc2e10641df2f4c2cdcd8aa02bf6c30";
@@ -4091,6 +4657,7 @@ tl: { # no indentation
   version = "3.6c";
 };
 "changelayout" = {
+  revision = 16094;
   stripPrefix = 0;
   sha512.run = "c6852a40bc8415656b8137cfb90a79cff8f8e9938979eba4e02dadb3c5d1ffef60966f9e5779696402f2b9344026ebc1e22ddeb9dba856d779317ca801f26e7e";
   sha512.doc = "bb81e02317d12b4dae8b0886ac3222849a457563ee8c43e09495596c56482202bb702352a8551f5d760ee41a82dde6b3f3c2bf57b4671831a25805d44e8705de";
@@ -4098,6 +4665,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "changelog" = {
+  revision = 51574;
   stripPrefix = 0;
   sha512.run = "ba47ffdfdbc0c43a25ac4ff4379463d9a4d63edd0e2b477650731609685aa1ceaab71216f092ab7bb94e9d2b090601f0a2968f0fade479697f1d4b6b13d80aa9";
   sha512.doc = "540814f3a757f145087f6d625cef48257303ebb0560e07c49102e086f747678032e4f2a8208060997e8ecbd54c0780483722675c6edd9913d020f70e2bc01396";
@@ -4105,6 +4673,7 @@ tl: { # no indentation
   version = "2.1.0";
 };
 "changepage" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "0ef1d3370affd4ffc2ef77031a8713b5c663263802d67142b10fa7fc025569b3914dbbaa5e71e2c643718940a0cb89194d79ec83a83b93fcf5d57e0bfbbdbb46";
   sha512.doc = "e3894d3a475f132e2242a6402899e8b9b6045681ce1fdb05fc5b0570e4d6b8b6980c2b5f5953602690250826db0e7dc9bab2f235d39fa5bda0e1161fd781478f";
@@ -4113,6 +4682,7 @@ tl: { # no indentation
   version = "1.0c";
 };
 "changes" = {
+  revision = 52838;
   stripPrefix = 0;
   sha512.run = "04b141aeb9925e3dd0b54acec65d90e2a88937c9591ace8ea103571413f19896790af9a2a22e98d05129a9c0839edada755a722d2455d6692363c8fa01e1e633";
   sha512.doc = "8d293b2c22d49f39264535c899746118308640f489a6649b25547723bfb42160064a63ca785e25b939cb0488ec20ee5f4047ed6662c62bfbe1367c191df96003";
@@ -4121,6 +4691,7 @@ tl: { # no indentation
   version = "3.2.1";
 };
 "chappg" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "8286a7b7664f7634bc5dd16ae1888cc4b70e2880c8749fe2e894d209384da7a8513b2daa318a4154f9b443f89b7eb2e3c6d620b81e1bbfa1ed64c243ad57e47d";
   sha512.doc = "c0d42e7a9cbae3fc7386e9734492cd3f879ecf69551d17483c4f4516c2ea09d0b9b76914decb987f850af362e54c638af190de6d0d6414d09c49cf48c0635f59";
@@ -4129,6 +4700,7 @@ tl: { # no indentation
   version = "2.1b";
 };
 "chapterfolder" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b5f68c160249e9cd94efc4c664a18c04e627d416b304697859144d6bbc5ef787c0f8721d19cd6aab6c60864dedc65e84b3ea9114b7c823a8131b4bfdfad0c2b8";
   sha512.doc = "43a28dd7182e02ebe0541c7b236046a6c23d55c73e36aa1a0e85954c5efd917667e1916ed0bb7000cbc5285230d162d5e844726282f0bb93ff85dfbde5fe8c57";
@@ -4137,12 +4709,14 @@ tl: { # no indentation
   version = "2.0.1";
 };
 "charter" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "706efb4e3daf7c304f5047b99d1f68051aedafc110cdd51b2e3cc520ebe628a87c41579cf476978e70aa0ae920e7a3aca1082013b41be8902174975e164a8f9b";
   sha512.doc = "846ccf6ea679e3fc70192e340ce79982cd916d1383579a8549dba7125de645e4fcd4c276800bd5815fcb67d7227081a66b51f42dabebe8cf112585ce9685fb8e";
   hasRunfiles = true;
 };
 "chbibref" = {
+  revision = 17120;
   stripPrefix = 0;
   sha512.run = "c87fc723f7d78aaf6f47f0eb34760d20c22a46983e802f1383ca4d952b354e199fe17dcb0e8b42e66522826f71f1031c59457ad4c5f5751c6ffeba66adeb4c30";
   sha512.doc = "58c43dbb1274e99ab60ae8c2911dff6d73099c02f3c6b4b97eeccaa336f56e677ad3a1897a4fd782cf97e59b9938c83f13c0741697630d2dcaa4a7daa0b852e0";
@@ -4150,6 +4724,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "cheatsheet" = {
+  revision = 45069;
   stripPrefix = 0;
   sha512.run = "5d50e5bc579821cc9296209983af68f5c12f6aaea90dffe386efb85d72683c10dd518fc2abefd51687402125bdd4f108ea6325c546ed6b2216cff130abdd1a51";
   sha512.doc = "0c798c7057e6e9d8b3aabaf745b374823f0a186e95a01d6208ec22df8f733f02a86c01b35bf4dfab88837574fc63f159ffe177f6c155e52f85bc0d062966acd3";
@@ -4158,12 +4733,14 @@ tl: { # no indentation
   version = "0.8";
 };
 "checkcites" = {
+  revision = 52022;
   sha512.run = "65af6aa0b8a8f0d6f4e3a1dbaeabea845bdec985beffe8589bef06784fde37a02baf41c3ea65055b3ff2b21dd003b51749b20a84ef0e1d0337bdb8ea416a0751";
   sha512.doc = "35b79a866235727c65053f0fa2dae53372230395a61e8ed4b530b02c4760d9cb3a89f81e4ac905ed4966ed4137c8047dd80655f6d94ebb260bfd96e441e45781";
   hasRunfiles = true;
   version = "2.4";
 };
 "checkend" = {
+  revision = 51475;
   stripPrefix = 0;
   sha512.run = "40af84a5510dc3038c536c4b0aae0176651f01953650c1e6ec8b5d76459e7000246205d55f2b13ef566930649daf1eafc38e6d2d822787d1fa462e99837b6ba7";
   sha512.doc = "0527c3c080f502baaaaa14a398ecbdfa714cec872f6cf8391ef8a766aa24b497a0fc00012433409904ea11d7fec425dd7c7116a52e8d983bddb2633248d2b090";
@@ -4171,6 +4748,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "checklistings" = {
+  revision = 38300;
   sha512.run = "599ed476321a825bea61fbdd468670cadcdb11249a4a9324fc88339a9445ceeced3680459dc2d27c2e6263cd207ffc0ce3b60b325d31072922bf4644478cf544";
   sha512.doc = "3f8d6eb67f305fa5e03bb625a4034ffe616a6c0223774688463884df99c337c1e5bdd76bbfa3b9428ec4812ec72388979c4252ba7407ae8b79e3de7cfacbeb01";
   sha512.source = "a7435841305ce368f1bedac9cb531d8f0fce3fac27484547821a2e82998e977968e578601382f4cddf6c089b42e8e175c56d2e466faa5c4c0e5b49edaf6baf1d";
@@ -4178,11 +4756,13 @@ tl: { # no indentation
   version = "1.0";
 };
 "chem-journal" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "afe7c82f6e139c1321759ef9125f262d504bf602c1c5e16a11d41cc00ea47dac3f2befd602a863a12c46beaac4c50fe6fcdb145c5c6582c9d44c2740aa1b7743";
   hasRunfiles = true;
 };
 "chemarrow" = {
+  revision = 17146;
   stripPrefix = 0;
   sha512.run = "4a95a6b81bd649764dea052984eb21c7f9e89c612ff96d23907eefce29e2d33fe92bd7944d94a6b108213d1820b3340feab35e3646f727288cb1df9b78302990";
   sha512.doc = "882e6c6fbeb5223fc1d2404e8b9ef9bce2c3b2ed1279d2bdc45616476a856c63fe07cdeb42e27f3bc459199f3537fc620ef08c00f4eea83df77502463fc30ca6";
@@ -4191,6 +4771,7 @@ tl: { # no indentation
   version = "0.9";
 };
 "chembst" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "f6bc14345c841db93207745de1d6ce189e08a30d17110d8efe04af0c5aa98cf7e3a1208e1969afeca0c69f747fb5db39437645e2437f9596ba5a70610747b6d4";
   sha512.doc = "3263dbeee44d46b6661e2e755ba10e22475432d03de6b3286d1191acf2fc8df1541d9a9684d5e00143dbebf65bee468e9244ffe73d7ff43889153925b6edb379";
@@ -4199,6 +4780,7 @@ tl: { # no indentation
   version = "0.2.5";
 };
 "chemcompounds" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "d8cafe15f21045522812279337f9680a975a3f9b9930231b7992435bf694f8f180b061623bdf5fbe7dc9cfdf7d6342e0d6c2dae1cbe0d8e855699064a97a95fd";
   sha512.doc = "26d9568f73f6b0c557cc55b48a99826b70d87724f7f5776f7c58691e8374b3b6ed400206b338bb0397ae5e0c1df5d1bdbb638e80d0dbfea228138b96863587ad";
@@ -4206,6 +4788,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "chemcono" = {
+  revision = 17119;
   stripPrefix = 0;
   sha512.run = "29b6e78d47cdcb21c634540ed6a935cd5c6eea5fb6a28ee85cfe681ff00c8bd24d7175ee5adbbeab03e11db2f56a38d3359235ed44771976917f35c673fd21c5";
   sha512.doc = "9936d1f0ce1e6ab9498aec9d68c176ddd803de3ed1e5a698ca7b548203cac66492ce319af3e5951144ad11878065c8b349f57668498d245413d7db62d1b6a8ae";
@@ -4213,6 +4796,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "chemexec" = {
+  revision = 21632;
   stripPrefix = 0;
   sha512.run = "62f374a57c799873aa4d1db52c56fcaf2f15dd813e3bd9295044499defa29a88567034e39b20af1e8a7e4208dcc35aa422c0ea8e1e0925fb1ae3e02a1a8cb482";
   sha512.doc = "83b622fe694111fefb9c7863d5322f7a717778727c99db3fe5eedec0b6575d4fe50e6b5076413cbbf36a222ee7765bbb847c44783d6ce45cb07f55bab16955da";
@@ -4220,6 +4804,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "chemfig" = {
+  revision = 51176;
   stripPrefix = 0;
   sha512.run = "bf8b9f313bdc239eac7c11c8b887755fc5106c389b3d62f013c764a8392298f4e0074796ec128edaa0d4126b52b055b3787454885dd2cd214e2603b7896b28dd";
   sha512.doc = "61027d844de25043317e4eba23fd3003296fd0fad7ea9495f6b809c0a8b5cc055deb0798259bc6de09ed2a1e462b8aa9c226d5482c9642e87ae6c0de3787db47";
@@ -4227,6 +4812,7 @@ tl: { # no indentation
   version = "1.41";
 };
 "chemformula" = {
+  revision = 53624;
   stripPrefix = 0;
   deps."units" = tl."units";
   sha512.run = "adc4567055bfcf2c3758856c889fee55e4e59fd5999378b60996aed6d81927c0feb5af99dd96b677b84a9fa20e583aef73dc435d6d1e81d5b47dcad6eab7b4f6";
@@ -4235,6 +4821,7 @@ tl: { # no indentation
   version = "4.15i";
 };
 "chemgreek" = {
+  revision = 53437;
   stripPrefix = 0;
   sha512.run = "8e70154271fb921ad9edf6ab5f8a21ce7c229723f88d7e37fe17aedb189c67a5749ea9e622c2dcebeedd614efbf18b9138e0219aea998f7a8ab3087348afa788";
   sha512.doc = "69ef091ed42bb40826af81c9a4ce5536873a5debd971d70d30804f75a3240bc1aea037817cdc42346537cd025306c928fa347938785af9e69022ef51fba20d2d";
@@ -4242,6 +4829,7 @@ tl: { # no indentation
   version = "1.1a";
 };
 "chemmacros" = {
+  revision = 53665;
   stripPrefix = 0;
   sha512.run = "cf382e9fc9269b3c24b37f028491e5be439cbb30f3f77b04ed7481bc3eab02bf17c5182ca43ab3fcfc9737e72a93af808b3ee8599b65a0a63354da95913771ae";
   sha512.doc = "6b570a5f63c516ec1da9133faed9f579df9850e9b81d221b107e2ab7637ce8dedb7b4c7bfc0a63c84623bcc9255e65186bcf4f60d7ff03477c43f98b00aac852";
@@ -4249,6 +4837,7 @@ tl: { # no indentation
   version = "5.10";
 };
 "chemnum" = {
+  revision = 52256;
   stripPrefix = 0;
   sha512.run = "f16b41aec7baa6cb088c008b373ff648b8e801951528b24cbdfbe4ad4d54eab12c64a76e23521396bfcc8ff8cc3089f0da9cf9fad37526d1639547412038f5cf";
   sha512.doc = "b9dfe8de349ebcfbafa967668895dbe5bb14cc6f065711f56dbfa5ef771eefda79114cc994f6de2d5d45143740aa9e93543035dfbe6cf1c2628088927e06ab06";
@@ -4256,6 +4845,7 @@ tl: { # no indentation
   version = "1.2c";
 };
 "chemplants" = {
+  revision = 52863;
   stripPrefix = 0;
   sha512.run = "271a8f113b9c722f08c750d77aa6d70c5342396c6bfee815f94e90cbd7f6ed7f9793dfcaed9f5ce49612e15924298f2e995b2b5f504b975c8081338076a61272";
   sha512.doc = "18eb6cbbab95af45040cbf66384e32701e83e509c62bc3a68b82e760f131827740a16d5da35175eaea20810d4a66e8b1cc586baa10f372f1ad2a043c8f9f3f54";
@@ -4263,6 +4853,7 @@ tl: { # no indentation
   version = "0.9.8";
 };
 "chemschemex" = {
+  revision = 46723;
   stripPrefix = 0;
   sha512.run = "c7375af2dbf1a7b55d41b0ab617111cc198f1aeac98c354813cb2886e0707ce5648d3e4fd9eefdd23bffddc08b96c35a050c1f440f21d5a2d7d5c6b5e0b6aaac";
   sha512.doc = "b5e864a02ed664e7d7596b56e2583f9a4aff2b8117f79415156df0cab9be084bb96eb6c70c4fca9dd4bd03b30e8b145e4cd809b165d17325625ae625c33f1dc3";
@@ -4271,6 +4862,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "chemsec" = {
+  revision = 46972;
   stripPrefix = 0;
   sha512.run = "7a69ed2535d477063e55541d53f73f5d1972905f63d2298629522dfbfbbc97dba0e9ea4a48ed1667ad7b50e24c4a0f7b6d5dbbf79863c9e79a0b3de522be54c4";
   sha512.doc = "5e132354e874b3ad5a4363cfbcad49e3601380dea8f53e106bb0b5d92fb1aff6facfedbad69444ea362c76473dcc7bd8703beeeda9b69f2501d995da98ef71a2";
@@ -4279,6 +4871,7 @@ tl: { # no indentation
   version = "1.12a";
 };
 "chemstyle" = {
+  revision = 31096;
   stripPrefix = 0;
   sha512.run = "299e15460a64019177530a4d28154453a813c6987e6e89b6f60466ae9e59372c1a5e0fc418c49b85364ba3185d4fe4e4b7f98caad9add7dce9bbe1792d4e314d";
   sha512.doc = "f8d6c51cd7e3df7ea8366ade62d0cf8ec3825b0ca54be600107a6be8853d1c58e1989f5c13bddcacd97673260890fd0f63e9a0282203dbdbc6a01653d86f0537";
@@ -4287,12 +4880,14 @@ tl: { # no indentation
   version = "2.0m";
 };
 "cherokee" = {
+  revision = 21046;
   stripPrefix = 0;
   sha512.run = "731fb10454a9d359d91abf927a27215e72283a9635cbd853a6738ddbd5047d81fdb8d547b891f29836d0b604d97749074e9f2676c5ad122522d987ac9bb46105";
   sha512.doc = "34b258b5b699f644cc0f7f9b673f3dbe48357bbd338726af2b404da4888a9e742f04e397cc3b6a3221d218a96ac7180ce1e6ba80a19c688de0960ce59cb14bb8";
   hasRunfiles = true;
 };
 "chess" = {
+  revision = 20582;
   stripPrefix = 0;
   sha512.run = "236e195febc213825fbb5569d8eddd1967fbce1c6e9d550a1c52729be43674e063161adcd5dcb1f6293d9ecf8809518d40064fee08ab64ffe444affe3282224b";
   sha512.doc = "95d3b598f63231abb6cdccddc970d6ccb29bec7e9fa29efcf1391bca70b610e9c0bc65754061a4b955548a854bcbbdd8cdf05f8f93fe52bea400b7c281ccc0da";
@@ -4300,6 +4895,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "chess-problem-diagrams" = {
+  revision = 53302;
   stripPrefix = 0;
   sha512.run = "5125a7f27889534f74acd4918641ba1ec10344efb639fc7490941b605d530ab5f7c1d9e31beef978d471693e328640d0be89fea5628b1a9f9a20322649db5e05";
   sha512.doc = "a329c412da558e092d52bbe429cfe2dd815a7e5709022d2ace45ca9f42588a7b563b16259222214680e955c77adc38d044a4f19639ecbfd8d85cb97c6e82b8a0";
@@ -4308,6 +4904,7 @@ tl: { # no indentation
   version = "1.15";
 };
 "chessboard" = {
+  revision = 51469;
   stripPrefix = 0;
   sha512.run = "ed7a1d973992897fdb174ef4e250d78a6747e40a822e026b787fd0899f6465a6e845175028279b57f5e16c50162feeb8b1c833248ae3b073e32a8d63051ac0b0";
   sha512.doc = "586202bf2d2b8bade26af19170e5129da6a2f66f78e79880929d2df2b6a7971b8d3683fb79a3ea6863eeedddfee170c06bccce88ad96ca6c7d982aed43378084";
@@ -4316,6 +4913,7 @@ tl: { # no indentation
   version = "1.8";
 };
 "chessfss" = {
+  revision = 19440;
   stripPrefix = 0;
   sha512.run = "8250d4b470a74877c44093888657b0a3c6ce71abc2a23780e71590d0398fc08943ef77ffafcfdabdc6bfd739f7d5b4ca15f2436df103271de029e5ff6102f579";
   sha512.doc = "1f9e625cb7765450fde23f5666af3b43ddb9ba2e67e7d04b98ef19446117cf26eaec3c2586be7c683286dedc37f8d628e4142bae834af716f2c068ac28beef58";
@@ -4324,6 +4922,7 @@ tl: { # no indentation
   version = "1.2a";
 };
 "chet" = {
+  revision = 45081;
   stripPrefix = 0;
   sha512.run = "d4a43d5ed1f8e74f0b4681abeb2b1134e9ad770cbde69679d53ea77e09a1a23412f03705691cd31110d145a96dd97e078d675274342c9323b849c770828db5fd";
   sha512.doc = "143b224d3ad957def3ec22a6e55c1b9eebd5db582065d422e1cf972580eb321ffc768c51cd687add62c01ab1cf3dec170422e6d9bbbab01846bf3e4cf84ec936";
@@ -4331,6 +4930,7 @@ tl: { # no indentation
   version = "2.2";
 };
 "chextras" = {
+  revision = 27118;
   stripPrefix = 0;
   sha512.run = "6fa92c9cf1da7cbe2ba74dd10f1f71274e25b228156f01efe5c67e54a2ba258500f7b2cc39fe935d4e92c641b760eacb7f39ea70643557ade4816e92e92a0b17";
   sha512.doc = "8bcc8a6c99be02d8e0babc82ec016fd6e91823a31338701e3d741af895a1d87d224a849598c2784f5de9cfefaf9cd7a09ee5b102636114d528b1e17b830ffecf";
@@ -4339,22 +4939,26 @@ tl: { # no indentation
   version = "1.01";
 };
 "chicago" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "2313d7911a8c6bbcfbfb25405e3fd2ea8c0721045f77b9ecf27e4daaee5cfc1a5c010c72d192583e6025aecc6f69421fbd7921d63daa9f29145eb6f9c96c3abb";
   hasRunfiles = true;
 };
 "chicago-annote" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "be2bc8e7e8eaa881ed7a8225b211ef464dd5635b93b867333458521e405fa42375d4804fbdebe1b913fa694aaaa839703494a155b0ea5d4a99162f6335ccef0b";
   sha512.doc = "893ba3ff20355e0c395b2092fc01689bd956eb177434ab7152aea686210a7167a04b64ed8ec21030e4f4cbc7e1367a90976168b174fd068d6aecbd0304f380db";
   hasRunfiles = true;
 };
 "chicagoa" = {
+  revision = 52567;
   stripPrefix = 0;
   sha512.run = "47cd96b4933b6c0bc4af01e5085af2450b60168813715c946ea18e3e7e5f6bda409862638038917bb678579bfba127fadf51b9a5916e4fb6c78bd10481a273a4";
   hasRunfiles = true;
 };
 "chickenize" = {
+  revision = 45083;
   stripPrefix = 0;
   sha512.run = "82df32cba5f14ea8de96020b2412d7c2b3939b0afc4f42bd91e957694404a12a8ea38c9260cf472d81e9aa776556e9b5cf97a674d23ad32633f4fdefe3b3bf83";
   sha512.doc = "6d29cddc0030de2ac6b82dde660e405916bb79bb1e18fd0579a66555d49062fde5d0fa327b906baa1556efd080c55b7ee181ed7569e96dab256ab2be27620935";
@@ -4363,6 +4967,7 @@ tl: { # no indentation
   version = "0.2.5";
 };
 "childdoc" = {
+  revision = 49543;
   stripPrefix = 0;
   sha512.run = "b268695b1d91b49ba6a0179124cafa5e5cfed56672424ab40cc31924c07879b4f50be47f9fe9d574f2adb3f183c71d799cde8854a2942b530c40a1e101d399ef";
   sha512.doc = "1a74059d946b82da211f5fed7cb120453049ceaf5f10841a78ff8864b41444064b223939bd2296142bde9c7bececc0ca8bed141be02431fd60f069ecab998d87";
@@ -4371,6 +4976,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "chivo" = {
+  revision = 51689;
   stripPrefix = 0;
   sha512.run = "c50965da981e688530e115352f0d1baae7c9fa2b286856fc1c3d7a9dba1b463b299c129cda72514792a2faf77f512b8720f02494bb178cd619ccac6a37e5f606";
   sha512.doc = "b7ec648495dc0be4201f01b162ef995eb2168bdaaa43c84144a7518e9b1e0d471e08a1282d301162cc9cabfd23c86249fc57cf0136dd37c0689a33893917f12b";
@@ -4379,6 +4985,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "chkfloat" = {
+  revision = 27473;
   stripPrefix = 0;
   sha512.run = "2a08b71c204709846bbf26ec3883e9037af6ff22e9bdf13b27319ceda55381eb9e3816ead4e444eba4b8a050a188e58d14f0d9153a813953f587c6cabb3932b8";
   sha512.doc = "b79b6bd6943dcd07656bb46d44bf50ca2c0148bdb6ae711d17a49e78f3bbf2b95781cd6f3d0b2f7625b131f7485d3db608c963367dd91dc91070501b367471b3";
@@ -4386,18 +4993,21 @@ tl: { # no indentation
   version = "0.1";
 };
 "chklref" = {
+  revision = 52649;
   sha512.run = "12f5e950ae439d0efd3f625572e8b81d993485a1efd71dc04c078cb1dc9b76650de3c424d7a6c60ebc5ccb5d29f37ed04c477ea1306acf4c5f4fccbd95e18985";
   sha512.doc = "5aeb13824c1781feefe94215f3efce15c212e0d38f9e0d5fb393e96c2159ba43f165c600cd64ee9d8c42c0a4f0db6c2e462ee85a93993965bad0420b6b662ef6";
   hasRunfiles = true;
   version = "3.1.2";
 };
 "chktex" = {
+  revision = 52851;
   sha512.run = "918392b98262e29503fff544c735b9c7d8da07340362d258b88b09a940d6c8495d761c416ae79b99711ad0fafc559b4ec3b71511e881adac3f3d55c617ddc2cc";
   sha512.doc = "5c24c5fe8f3100346e52104d0f65b096b9e3af7cdf02318fdc1977c7b9ded9b2a40fb06bd13a77866a34a9bfe77365038303e0cd09a327afcfe6c81b3dc36fdf";
   hasRunfiles = true;
   version = "1.7.6";
 };
 "chletter" = {
+  revision = 20060;
   stripPrefix = 0;
   sha512.run = "a32f71d89ee69ad60de6173f415d0a3aca7563107cfed71aab0ae99972a2ead442bc75f848ddf07c26c5d464b2224afed5ce976bf037049764f722396e9666d9";
   sha512.doc = "05cf8a4f37eb51cc00d9c254dcb817c41167eeb7643f7a793d1a841bd2c8a3715ced2036b974533521f48be48ae493e52ef0809789d36155d1ffc9624db538d5";
@@ -4406,6 +5016,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "chngcntr" = {
+  revision = 47577;
   stripPrefix = 0;
   sha512.run = "0fc94f91911c623578912ed43526d18f85a003f797e94ef5610aab8477154078efae7000256892cc3d3103843ac8065c27d56a10c6f57c16d9ff13693930b0b0";
   sha512.doc = "3b63e4676232c05516bb12c189873e4af39b8b34df2690c897c4733203c9f19a30759850979c47b05e5fea0bd1c277a5c1ea0624709cda6a3a4ab0196231afb9";
@@ -4413,6 +5024,7 @@ tl: { # no indentation
   version = "1.1a";
 };
 "chordbars" = {
+  revision = 49569;
   stripPrefix = 0;
   sha512.run = "1349aef2649fdd9b54751425d54cc9b0746dbcec9eebd1264c36867517c4f422d74d390a0e43d22fe81c5a36ff00e6cedc5e652183422e9408a2165486e79052";
   sha512.doc = "ba8aae66430e2df58f01bb9860bfab9cdb3aa0636f77f657a1fe4405ec9397773b51b01d94201bb8dfc8660d05f2aa4ce9233ef985d3e4e35faf005c81759404";
@@ -4420,6 +5032,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "chordbox" = {
+  revision = 51000;
   stripPrefix = 0;
   sha512.run = "0e07cae95a8ee5f040b4df4d94f996f772f0780bbe47c77db891fbf44b08f20e28ba8442dee3e981a052b0ccebb0d630e0f0917eb7c65a490c844a65f3b2e3f4";
   sha512.doc = "0826513579953ea80047d596b6c577e4b6f00fcdddb7a06bdc953bccd72e09ec2fd9123995c1e04260ad880bc860454abd283885817a9eb359ec7cb5beba3cc5";
@@ -4427,6 +5040,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "chronology" = {
+  revision = 37934;
   stripPrefix = 0;
   sha512.run = "6fca0b31511366c1e39f6518bf5c6e10bfb503a8a901d9e1167866a40e2fbb9d2a6e109f48e146bbaaa2c017ac96e82196a5f49a91c6c9f52eee2633fd5c0737";
   sha512.doc = "ce0417e339724dfd97c227f104d9cd0b697c1cb7a5c586c890c3e938bbdaf5db2984fa83a09d983970c1105751cd012e544807a74bf0a35ecd2074a97d0520a4";
@@ -4434,6 +5048,7 @@ tl: { # no indentation
   version = "1.1.1";
 };
 "chronosys" = {
+  revision = 26700;
   stripPrefix = 0;
   sha512.run = "a9503f9440dfa9a42a3f2d345c5e74faa9f40b03264bdf8482ffa58c34318467a7863033acaf089acff6056f91e9d85969676c1b0b080b363c1274ab96f022ed";
   sha512.doc = "1f2078bc645e1a9af4220bf4041391353495f76f530ab5f1a35ebf2c2a534d60a910a9ec079ec2222ced7fc3d9c146bce3d6d4d703acd2bfb9ccf357f6fd812c";
@@ -4441,12 +5056,14 @@ tl: { # no indentation
   version = "1.2";
 };
 "chs-physics-report" = {
+  revision = 48549;
   stripPrefix = 0;
   sha512.run = "e1af3e29e5b59545804d7ac7f3cfd0c7463fa9487c458ff3790a2b434151cfec925863bc2d107e5eb6e43c988d85136eaabe28065bf95b04836a8342d5626d23";
   sha512.doc = "3f87d4b32e3257a22e0e7146a89ab2fc90f796d524b0641ea0ec51ff7328518854d226f5405220d7f5466a138bdfecb6d1c6f8b056781e985cc1cc757d0f26e0";
   hasRunfiles = true;
 };
 "chscite" = {
+  revision = 28552;
   stripPrefix = 0;
   sha512.run = "809c76b1bb47e194c43c869b27352578fb5490f6a9a8bbc2fae662b357bd36a099f5114765611d73fae87a846526781ceb7b45aa8968836c543e15f13e7ad7a8";
   sha512.doc = "215085d808b75d0d7f3e7e95830c63172606fd43e1e30a20e376f43d12959da71e8e77a6f06a6058d8ab9f9406f1260262af3e904ff65254e5d2635ca6d15975";
@@ -4455,6 +5072,7 @@ tl: { # no indentation
   version = "2.9999";
 };
 "churchslavonic" = {
+  revision = 42751;
   stripPrefix = 0;
   deps."fonts-churchslavonic" = tl."fonts-churchslavonic";
   deps."hyphen-churchslavonic" = tl."hyphen-churchslavonic";
@@ -4467,12 +5085,14 @@ tl: { # no indentation
   version = "0.2.1";
 };
 "cinzel" = {
+  revision = 52392;
   stripPrefix = 0;
   sha512.run = "5325c8ebd42cb7311d16ac20b4b0bad6832cea05dd685b17975eef92363dd0ef99a06ac4e5e269c932e30df2dc9b0ec3b5dbe54adc70e93718c08a92a140d866";
   sha512.doc = "939dbd310bb861bfef206584d8011b0a296f4b70673b7f334b85999a40d352ff74f07078c9215e6510e431b95e6fd12778e468ab53f401f3b952324c3162f792";
   hasRunfiles = true;
 };
 "circ" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "638a89cd3ef49ba7f21f42944d1452c2866265f326e33e07b47d9607723de7f477766e8c240df7a91081f864f12346aa358b48f66cb67017fc11ace129c9c694";
   sha512.doc = "389d98b3b5cce6c93d84bb3022f4aaaad1927bf78b323c106f7e89612835b92a2ff878fbe8d120406018549dba6cb370d88f098df523ff69a8810ff6e2b80241";
@@ -4481,6 +5101,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "circledsteps" = {
+  revision = 53382;
   stripPrefix = 0;
   sha512.run = "f8e34dbb7167f4d9b6a9585c856f57cadcde9ccbde1d28a1918ff3f4c04916fe347acd2377cdfc5d0cb03ca2a8f5ed3389ca134e8621084da6504e0a5fa10622";
   sha512.doc = "b7a50fa849e89393ebc6624623743ee7be737805c7807dd57957c05bd3489d908731c37c87d950615e5d6b835035169717a2648ba876ae458a0d4b0f779f0eea";
@@ -4488,6 +5109,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "circuit-macros" = {
+  revision = 53821;
   stripPrefix = 0;
   sha512.run = "2a4144072152000ae818322ff505c478ff266f40516c218c013dbb1e0e0bcee56b5bf3e4a67f112642348b6931b63946a17f407fa9bda07d5a4c35b326ffa136";
   sha512.doc = "eca330bc347b7f2722f3c609b753cbdcdb8a204c162db8161256fbe1d627fd28b4bc6989cb024316f531fad935f3f927163c2c338373efda58794971ec1d5f5f";
@@ -4495,6 +5117,7 @@ tl: { # no indentation
   version = "9.2";
 };
 "circuitikz" = {
+  revision = 53883;
   stripPrefix = 0;
   sha512.run = "e9e7476e2e39b0212bb63384deb67b5c01a37dead40f7e310797468a7b8a78539297890132d58c6b77d96c2594b9585f3f908a99c2c4b99f6ecb60fd41fcdbd5";
   sha512.doc = "50f9d3b6c31cda2c367cd464de88635daf173599e3ef297fd75b710ed8c7260ab8bf1338fc969e9bb4a7527b224d2aa01029389b56e610df55e398986fa184b0";
@@ -4502,6 +5125,7 @@ tl: { # no indentation
   version = "1.0.1";
 };
 "cite" = {
+  revision = 36428;
   stripPrefix = 0;
   sha512.run = "39196b799273a2da29591b1b59c0a504f0e0971a6fb12a21bed5ac45d94eb017f1e7c64691fcd46f5c151d867c1ffac706f050fe2e08bf3c58aec8867fa185d3";
   sha512.doc = "f9ccc0e1975064ec792c6138907cd3dc8080ff2fd02a2925d1a1334cebbb2289797b234b46d92be0ba45d460c31359b5c143f20e28cd1aa1827489d04b88d300";
@@ -4509,6 +5133,7 @@ tl: { # no indentation
   version = "5.5";
 };
 "citeall" = {
+  revision = 45975;
   stripPrefix = 0;
   sha512.run = "2549b398c98f82833849a45716d55a776ab3b7927fdc400c2e6d43c45fb0cf628bd66bdade7ca63bcaa2e98807914f7adb958c6a06c27762fb0ee70452d4d280";
   sha512.doc = "f1eaf5ed48bf3fd2bc336b7d91dde09b5cfa9a1901bd6315d4abf032439571a89f1d7c4794ed0256ef1aff0456d275e68326e81627f164652c84de2900165a98";
@@ -4516,6 +5141,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "citeref" = {
+  revision = 47407;
   stripPrefix = 0;
   sha512.run = "5f56fb1d813962358c737023e06bc2fa249712d8ef984f835073e11b075b676e845596a61ac312991e646d72068670b60eb002f78ac322f66d8e5a9bce185063";
   sha512.doc = "21d1a8063586b09ba953ac5df96a3b1552c586d66c5f2af517b1b1ceb75b40f173bd411654dd313c6aeebabc35db7543ea8edcbc8705ae104c7f63e5a5b3cf57";
@@ -4523,6 +5149,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "cje" = {
+  revision = 46721;
   stripPrefix = 0;
   sha512.run = "cab80d266c2b5f9d4ba9d37cc5490e831e3f773d86c92fcbfab9474864aebbb6123e1ed44877127e84b6e1fe8037f2425259789b9b9597de49e1b24b123992a4";
   sha512.doc = "47a2d96b6b530be732385617af832ad48c3d6c7a34a7e9e0523c38a03b5116b94588c995afd153c25be6ceea9bc199685fab9eb83636b5fe27525b19a4bc7cec";
@@ -4530,6 +5157,7 @@ tl: { # no indentation
   version = "1.06";
 };
 "cjhebrew" = {
+  revision = 43444;
   stripPrefix = 0;
   sha512.run = "65a73380bcfd8892ab2eb93d088076e2d5371019244bc8a65a4695e69a45f743248fce59557533add032a02a0b7ea4f02d6ea4634265d2d9718a5b100f5a18c6";
   sha512.doc = "591d932ae099aa168d55f9479842d25c5212dd7aed27eac1a5d05a111a8a396baae7c73ddafe1087a7b8008528c50b1a85825851643d8107133d41470ce1e397";
@@ -4537,6 +5165,7 @@ tl: { # no indentation
   version = "0.2a";
 };
 "cjk" = {
+  revision = 36951;
   stripPrefix = 0;
   deps."arphic" = tl."arphic";
   deps."cns" = tl."cns";
@@ -4551,6 +5180,7 @@ tl: { # no indentation
   version = "4.8.4";
 };
 "cjk-gs-integrate" = {
+  revision = 53410;
   sha512.run = "f584536c3d70ab767407f9ea8f048ab9592133c0b1a76d8eec76e132aa0009cc5b1fe1ee6fc86174aaac618ebb2b5fa7258da79a12acfea9fc2aba4be0184ac5";
   sha512.doc = "f2524df9e46cddb522517e38e53c1aa116ea7c6df04affe585c7265d427fbb748b2a7c94ab40d36040474ee4085bc3c0a1ada0340bae04d36a0d8ce7302014f0";
   sha512.source = "e6ac59451a128fadbc32e96652b015b9e407ac623f67b26d1ddeba34ef169ea0f2c53cc57a3ea34fe66b127aedf1d81341d6115ba4711dca7394665d20634c09";
@@ -4558,6 +5188,7 @@ tl: { # no indentation
   version = "20200115.0";
 };
 "cjk-ko" = {
+  revision = 40373;
   stripPrefix = 0;
   sha512.run = "52ed45e1e67b50a09ce4b1fc333222d93adba691265e13d0523aa2d1a2a82b78dacae5ec2ee1ec0e78dfdde740a15a3d48fe45750db17e5270480807521c59fa";
   sha512.doc = "15b96571e56e9e08656f28fe8f8875e22de4a4c513a76b21206b66b8ffe2c986acc87c6f0bb1f693a2ac05ad07948ba89fbdf5f63259d08ef3b41726190e089d";
@@ -4565,6 +5196,7 @@ tl: { # no indentation
   version = "1.8";
 };
 "cjkpunct" = {
+  revision = 41119;
   stripPrefix = 0;
   sha512.run = "cb44aa3386cd79f05980e5402adcbbf9f8b67fa76bdd5b293063fe9810520edbdf243656cfb54fe17d6ca43d405e6b16e8012eda63bae3cb3d8fc0f7755e2551";
   sha512.doc = "cb9383b6d3fe9ffd5926d10dddcb1ea758aabda232f015b22f61dc8a9b316193b30ca2d8e2b849b1c03d92e0073bba6d90cc5b3b50f47b28a745dff2f7229486";
@@ -4573,18 +5205,21 @@ tl: { # no indentation
   version = "4.8.4";
 };
 "cjkutils" = {
+  revision = 52851;
   sha512.run = "84ae942d24c6a5b6dc8a5ae9a7aed0e1da511e68a2730c26d022d935974869c810600321f4ec1b8c5aeb00d17c6eb360d2735b2ac529bee6aaf85bbf4e44ec2b";
   sha512.doc = "f135a594a95a0d30262a00bbe8279a2d58c6549dba65533b6d1032f99b517b9ff91217ff3ece3768bffdd086e50ce99b56db494aea24dc460c7b077771e97921";
   hasRunfiles = true;
   version = "4.8.4";
 };
 "clara" = {
+  revision = 53552;
   stripPrefix = 0;
   sha512.run = "b5e91f144a9c1a8ecc2e912e47e49c61a42fcaafddef05731c701bc46f95cbbd88289bddeeb4928aa8766c6f696fecbb59b4638e89619cb08b94c5326a15ffd3";
   sha512.doc = "40366f58178152d696308513816d642b57d791463260a5afd69df7ccdfe548a1e9bd9e0457fc7c9cb50c3bca7a2170d7c3573761e7362164a7e3d9c592cab7f5";
   hasRunfiles = true;
 };
 "classics" = {
+  revision = 53671;
   stripPrefix = 0;
   sha512.run = "86eaa987025658749c642f5132933745a418002feda5a3dec0f1dd9967a178af7e9c3188cde0b0b1fc8fb9ddf5cd59b68cf95942bd811d978d72a68f44a2999f";
   sha512.doc = "df7d88ae0dc936b8b7f60e98f806b1368d249a838a7407ebd12de05fe10a6e0c9da1ba8cddd3d396033271dd3692451441ad267a187c30cbdf28dd996f707b78";
@@ -4592,6 +5227,7 @@ tl: { # no indentation
   version = "0.1a";
 };
 "classicthesis" = {
+  revision = 48041;
   stripPrefix = 0;
   sha512.run = "9a8c0c9ad0d97f187cf66679613514000324a72d2745c1026889b73e5981e0dcf36f388a0bf630f5ab35d28a39ae50ac842db28c214442ccfd987ff2c132ce7b";
   sha512.doc = "3eb82d6c0f951a060e56c763e90ec842d1692326501f538d71780f4a0981edfda33b0ac0b5d00ccded7d3273fa69d4dd5d4a9c3557d9a69e1c3bc17375fbf43b";
@@ -4599,6 +5235,7 @@ tl: { # no indentation
   version = "4.6";
 };
 "classpack" = {
+  revision = 33101;
   stripPrefix = 0;
   sha512.run = "ac5e26d91107bb0166040c990e586b6504eccad7da3ec084a49b141a1e0fee2725939f10deef5af1c4fe89396bc8fdef86f3bd2e8de9099cbed9700867700e8a";
   sha512.doc = "6a22b10f5630a52ba85d113ddab8dacae0ab8148f62d4f9958bf3619c2d88f9a1f3c9778e41773d7b9d392ddc4d6a30dc3cb995a24072cc60b446896ca48707c";
@@ -4607,6 +5244,7 @@ tl: { # no indentation
   version = "0.77";
 };
 "cleanthesis" = {
+  revision = 51472;
   stripPrefix = 0;
   sha512.run = "0f12e2eb830014bd08e742ed6dbbc83f9b6d17141a4c0a6c00934ff1d831ab7a9e9dfca6931f5842284845435593449b11b8ed9cc29c7c607fe4df14c2b11d7a";
   sha512.doc = "6042357f473bf4bce302b6f43d67fadcf0f449a3f1b1183a26d4b04375d60013eedc7389b002c1f0ed62ab1a8672735774d5aff0d7301e9a5e435080a4181c65";
@@ -4614,12 +5252,14 @@ tl: { # no indentation
   version = "0.4.0";
 };
 "clearsans" = {
+  revision = 52530;
   stripPrefix = 0;
   sha512.run = "fbbb0be85ec7e2fcd8e75475df45d0ef6229c86c9672f56516711f8718575b857018239c4ce9bbafc7f226f986c48ea873a1b0e0f187ff46fc6ede604a3abff8";
   sha512.doc = "43949701e72c24922afa76c49a04067035d5393c480d1fcb8e7db3d50030255f5506cfeb1d66d66ada35a479b4aaa12455424140c2bb74421d4fe3b9a4b487cd";
   hasRunfiles = true;
 };
 "clefval" = {
+  revision = 16549;
   stripPrefix = 0;
   sha512.run = "8bd7457b6f8144982781b029500db910fff387f3872d09039a2929c5e62dd7dea56e22cbc40036519cbb2060ba62bcc7d621dfd383493420a88699660a796e03";
   sha512.doc = "5789c53aed9c4bbe92e8c36f115cf63e07c7e7c35c26d62ba2be41eff8408c8e60f619f565cec1fc0e1ed55f2c571ee6f8115ffc2e88d9917fff085d19731694";
@@ -4628,6 +5268,7 @@ tl: { # no indentation
   version = "0";
 };
 "cleveref" = {
+  revision = 47525;
   stripPrefix = 0;
   sha512.run = "669e122c22c55c1fe95353533a2c35adcd161080ab2e4f3120dab2286b60df316f4de792e9a6fe5b971d622bc2b087061836a3c0aebaf0bc5df17c854f64990b";
   sha512.doc = "3885fe13cd51967620f1e48a25a82c2a4916b07ee45c963dfe9ea933a920f347512cf5c30f29ccef9c49c3862df4c9176fe0fa57b1043d3ac230b7cd8b3f8d78";
@@ -4636,6 +5277,7 @@ tl: { # no indentation
   version = "0.21.4";
 };
 "clipboard" = {
+  revision = 47747;
   stripPrefix = 0;
   sha512.run = "19aed32c2dc229852133a44fe5ed692a0d3194d374cc77e2301314b3fff929b834fd4df82e811095049e64ba127180eddb77fcc4211aecd2db40e8124a38d55c";
   sha512.doc = "50e7447b35c1d73c1d36bab165a8bb476764ffcc4ed7994e1bc63c6759baad0dd6c2c1f6a95334c7bf649dd13c8e79d17ec536120f1112d621e833b6f9f80578";
@@ -4643,12 +5285,14 @@ tl: { # no indentation
   version = "0.3";
 };
 "clock" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "ba378fe241cd2e51b641f0edc4bdd1403477b392e0a22363bcf540b513c1c15b1c0e3ab37020aa77ec147ce59cc7ad6f09c86cadcc0a77892a1a798c36c411aa";
   sha512.doc = "d06e263266ab91b48ae3238af6ce283c7f720c2113d95d10c7de6026b4557b0fcb22aaec44caba2f7ad743e578e9840da1b116fd3372558d545c424159d8f2e5";
   hasRunfiles = true;
 };
 "clojure-pamphlet" = {
+  revision = 52082;
   sha512.run = "a420e5548af550ef91103a82c5bf8e43345abfce69bb438d488ed9a3a62db1e6763ea1c17b246ef307cc62d28b5c575b5da07d5857241e21ce7d789e9a2a055d";
   sha512.doc = "23f6cd97dc5d521689555ec95a695db0f9cae8873d28e2bac2969f07e9e8d2f7ca9a6c8105ca127da202d811717b3c1f4219fe15f9af01036800a083f065cd09";
   sha512.source = "32f90dabd0e73206930f589a97e8630c25ce2f95f1657d08ce71cd36241bafd6c2a79c483805f7574ccab29deb478d1ef8837fdf2e922592e6d8f18f43121a14";
@@ -4656,6 +5300,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "cloze" = {
+  revision = 41531;
   stripPrefix = 0;
   sha512.run = "e66b5d9086d3d6ac39c0664cc4906b467413b919a64538371077bbd9088d80ea81276ce66a64ba29040068b9b73ec5990a7d4422608ce85b0d94e8b2ee3bdce2";
   sha512.doc = "c21e8561c296efaa8b4c30044f6121736d58a98d910bf671d11f1931d29ddd0d626bca69ab6f50225a3cb588346877b76ec43426822a869e72e266ee5d65cd5e";
@@ -4664,6 +5309,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "clrdblpg" = {
+  revision = 47511;
   stripPrefix = 0;
   sha512.run = "bdd3de3ea16cb5d24879bcf2255bbe01612f8af70f663b9ac578a4ac98910119ea96b8a5b4a59d25c0406c1b33786997ee2940da0273b025455e334b48f17b7d";
   sha512.doc = "53ba8c83224ee6573cd1549e7e425fd524b5caf65ab139b67e7de9b32bdd5c3c87f5af63c2c43696554fcc33c8bff4690373ad25582b23bf51134b9cb6301409";
@@ -4672,6 +5318,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "clrscode" = {
+  revision = 51136;
   stripPrefix = 0;
   sha512.run = "c26ac99b2f097b3b9df8bcb3ae040da959c0bd238be75a50b3711cdf0b7b0024ef40749169c0fe0437aa8c845b3ee9c9ec4ab46fe31fe6b1e28019fcd4779076";
   sha512.doc = "b74c858703577f79c89b4e95a0fef2012a756defda525c25f2945952b6637fba7ae4c30791a5d566267a16627bf7ce991c4edf726f7106b27b2df3c2b81eb765";
@@ -4679,12 +5326,14 @@ tl: { # no indentation
   version = "1.7";
 };
 "clrscode3e" = {
+  revision = 51137;
   stripPrefix = 0;
   sha512.run = "eb609d4204f9292b387fb8ecac13eaaad77e1d32870cd29f4996771acc5f8e82560e3fb9dcd2c8284888ed55d2b7bfbf931b50e01b0e4b8790c2ce5ce4445588";
   sha512.doc = "0792d458ee46b44d37c31a5bbeaad2257ae1aca818ce33d0b1c8ae96b7e90ea6e06e9036ce61063f232c3829ec36bcef58f111b5df0b25d209e867ac53d322d1";
   hasRunfiles = true;
 };
 "clrstrip" = {
+  revision = 53537;
   stripPrefix = 0;
   sha512.run = "34893bc3758fa010c34523284d73e18d347cc51a46236599c5e6df7bde4ea196da4ae8731b316c13cb9d225d353f1b3ee9bf0357ba9f30e400a9f16783a6bbe5";
   sha512.doc = "8a18217808e2dbe8e6f96fff8c93458c14fa8bc97e6a8d460eb75c051b982bb2f423d46ea5c4b77bb45942896b126b8782bbbe1ab1a0f5fdc4831a5b8435d59d";
@@ -4692,18 +5341,21 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "cluttex" = {
+  revision = 53698;
   sha512.run = "e211cd6fc89751628b0ebf0bd599ddffd18e39e24292fa896bd2394bbc1fe60c35d5230662a53fa685f051963db3966f27dd752cc63877585880a62483f6f93d";
   sha512.doc = "d26a6fe183999987b2a1d375d1061fadd78d23a1bddb0582d8f70561c5d1bd745d33e0c41e8256adb00e2dc5b9f4904e7de4f2c03a00a6688b6c4a433f1d359c";
   hasRunfiles = true;
   version = "0.5";
 };
 "cm" = {
+  revision = 49028;
   stripPrefix = 0;
   sha512.run = "e939416545071f5c445d866255050cd4302c3ede6af1e080909a68b6e4327ace1f90af4677c68c18d1a85aecd4d2ff346e13670b0be59c76e11ef6334991aaad";
   sha512.doc = "d27b43854fa022de53379a84087657bf97ce5475d70f98c783f790e320d78daab2f002f49f3dd917224d30e308d78dcf0855325b39014fb0fe5b50d645c9b9a4";
   hasRunfiles = true;
 };
 "cm-lgc" = {
+  revision = 28250;
   stripPrefix = 0;
   sha512.run = "5fcf591d132314d8ce160e3070036f6fba56962ed40d8fee7b58b0e8219a8124bcf380b1be4e943209ba230f05cfcd374c96e3e799695a018356d12be3215760";
   sha512.doc = "eda2082e865dec858a010b757a2d60e0be9526d2e5f2c276d1c5e8d386a71f4d7631d1af8dee009f9d61e0682904697bfdc89222863499c8e1aca2b11d0f3ed9";
@@ -4711,17 +5363,20 @@ tl: { # no indentation
   version = "0.5";
 };
 "cm-mf-extra-bold" = {
+  revision = 45796;
   stripPrefix = 0;
   sha512.run = "c9a9c5631ce016112ccd37ac3325c753e608bdc55e1de524742ce81f1ffa6c53ad6d113346d9d90cbe5466fe301d27050d40bff258678df840c693987afaf6ad";
   hasRunfiles = true;
 };
 "cm-super" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "45638ebf4ef2ffb7c4b74669ea089a9f8d3ab4b98e555b3f9b2e9bd9732b48fdba61dc91188e2c8962b8bfa3caaab31c10d1ccd3e0aa9e26197b148e59576f8f";
   sha512.doc = "5b524c55dbcfa1db87484d3437156ca9987fcca66e2c2e6d69e562c48ae708e51f089051524f324cbafb72a29e08f90e70c408d7fea7341e9ef0b5d53288b7d3";
   hasRunfiles = true;
 };
 "cm-unicode" = {
+  revision = 19445;
   stripPrefix = 0;
   sha512.run = "b50e647db3be42cb8bc7f1df849590b4f3f8856523c57d16aa5b42237a3f7fbd381ea5f05c1337091a66fe667841704133828141eb8c40e50f595498949acd65";
   sha512.doc = "162e407cb299b1a4ee353fcd0cee7eee048f8356def550d591630f12924b4a5ff0e9d6f9a0652c3dee7a88e5c2521b0c23ba4549bdfcb21a90c1949ef566183f";
@@ -4729,6 +5384,7 @@ tl: { # no indentation
   version = "0.7.0";
 };
 "cmap" = {
+  revision = 42428;
   stripPrefix = 0;
   sha512.run = "d907b1483bcd8de1b2b3158ad1a90493e86a27bd60f3ea901011866e81d57b22a555da0e54340f77ae9584aba3960959e89071330d035671c549e887fbedbdef";
   sha512.doc = "c3ca940f836f5c5e433adedb404d3f1033d8efde61bbd9a043356889377e0914fe9dcb8cce8c2b9252502de6af3cc1a8bd71dbfc61e12446cc07bc9d5d2c2668";
@@ -4736,6 +5392,7 @@ tl: { # no indentation
   version = "1.0h";
 };
 "cmarrows" = {
+  revision = 24378;
   stripPrefix = 0;
   sha512.run = "5f56f9ab77b2f250aff664b0007aa17eccad96d6f674ae7417f610b62d84123fc85bc80cf83948e0df2a7bfb721300e149fc764b03638e5005cc4832f2fa5544";
   sha512.doc = "0bc738eb48fc34b7cb35240622925d43e5ff5fce21b1c560158b2ceee2790a284b33816fd192a5b0161544ee5add98f4e3ebe7dd0165273d53e5ea2de7d994ac";
@@ -4743,6 +5400,7 @@ tl: { # no indentation
   version = "0.9";
 };
 "cmbright" = {
+  revision = 21107;
   stripPrefix = 0;
   sha512.run = "3251c7ce9f139a9e553e3cf343339367e98e6982850ca3d2a2087efe5e26f4828597e6f5c1ac85567e81897a09239f5be717a6a85d04b164442c9c5c53ea4fac";
   sha512.doc = "7add06e9502ab0bf912e811afbb66caf7ac83d60b6e2575dbc75709438ce6252239a43106632633e2d90b2badd46bb800533c496c811de7316cd1766456058c9";
@@ -4751,12 +5409,14 @@ tl: { # no indentation
   version = "8.1";
 };
 "cmcyr" = {
+  revision = 39273;
   stripPrefix = 0;
   sha512.run = "452551d8563b53408a058f847a4a8d3738ac7f0de1da15aea05208c030c67f904b848d71bacca2f6f5ec3e882cdf0be58a4037ed7dea7c7bbd2aeb08776427b9";
   sha512.doc = "748c60e2e54f49bc6afd2867574919003ad6412d721613dacf6f8dc48cb187ca915b1a5e7286a47db7087fe1133c8ceabd998a8c60b91e4d60264b6fc6253190";
   hasRunfiles = true;
 };
 "cmdstring" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b05a8f8d326a6546b7c865e4cbc1afdfb0fa50993f4ad5e3b3a1e1781be9ed7590e1dd17b18d58f8a96c83aa2fe6218328b2df3e193e2dc7923d051374ebc9ba";
   sha512.doc = "c102fcd054597d84d98a4f74656f36a9e1aa53623bebaa4ef39f341ddb889062a0e0c705074a4909bf50ae3cdc9a0e0da06fc6b12fde10bcaf5391fe6c792818";
@@ -4764,6 +5424,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "cmdtrack" = {
+  revision = 28910;
   stripPrefix = 0;
   sha512.run = "22de643d5b45f3898a1aeee44ae88594b545af34bb5bdac937753c13d31071872a78935dc2c73fb22c0e591d164f618549a2bd67a00550f3fb70753a951ad4cc";
   sha512.doc = "2a69b054e1de07b31426e653af45125824bd037cf5a24fcde1f0fe1b6aa3eb925688959aa84094ecc65954b92030e1b78545db18f08a39990c4412d487ce2284";
@@ -4771,17 +5432,20 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "cmexb" = {
+  revision = 45677;
   stripPrefix = 0;
   sha512.run = "1d5a3b2ee73dc85c2e19e7bd8bdf0eee0283ca161ecd42dbeffe0443849e73e09113220ca6e09039c0daa684b2f372e0f8b13bdd711a937a09cb8a8fb63b4593";
   sha512.doc = "f833bc57edead21d4fcb27c5822849f26cbd4b434bcd230bfccb190c94c47d2eaaec4dbc9264c6a55ba24b2571d2607197abfd792423e03b7013c478e261ee6d";
   hasRunfiles = true;
 };
 "cmextra" = {
+  revision = 42428;
   stripPrefix = 0;
   sha512.run = "a9cf3d6157c6341de13f400bc496211912679702606d4e6c488231c41c4a70053791d031c7b6973ecfd68ab8e28c7d56d41a10492af7d8e4ae66b6eb923db370";
   hasRunfiles = true;
 };
 "cmll" = {
+  revision = 17964;
   stripPrefix = 0;
   sha512.run = "8470819c5a37b3d8d1d44aae53b62ff020087e1125f381e51ef4a639fd6b2394c3d6f15a3a86fe70e61a4545213059bde6fc3e9d06cd054e46218e90e64c0543";
   sha512.doc = "71a7cd27a2744e8e3ab09b8fbbc514eb2e38d9740349139212f0861c67948fa1a98728acb1d22a4397fe95d8efd5c6fcb87a1843a1f9dbd0d161e2e835e1ac11";
@@ -4789,12 +5453,14 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "cmpica" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "2aac63861c3c1099054286647917f4ab594fd535de9d513f790cb70e8a38278ffda0be29656e1da57206c7bac21928cf5179bd1cc22f50e0f10d1ca8083f4b86";
   sha512.doc = "7c6251f1c5090328c93f6ec224bbb6d05433b5471c6cb8b4d7f3b9ff05f9be8ad49587d24a34702fb23b9f1803ca3df3a638b16335944a9b2dc35422ca8bf9fe";
   hasRunfiles = true;
 };
 "cmpj" = {
+  revision = 51661;
   stripPrefix = 0;
   sha512.run = "31e9fb352cf03797436bcc1cd0f3d16b2ff6234d6306770e940f59eb77392fe7f616530febc4b299cc52c71036358b203e7cc99256099093fbbd4eceb71af4bf";
   sha512.doc = "3e2b162c6c04f409e1dd32ac4be59431d65e6b39e813e091bff0cbdbb9fe101c751664df8f83704d38daaf4c7c04db24b22e32a36d3cdf07411b73a1d21c076f";
@@ -4802,12 +5468,14 @@ tl: { # no indentation
   version = "3.02";
 };
 "cmsd" = {
+  revision = 18787;
   stripPrefix = 0;
   sha512.run = "97e1830bdbab04e321433f43e14d65fd2e9820d46a6fb3616f2cea38a54208e80e1238eba7b5cfd20137f6e3a3da3a1586a7caa3e0a495ed91235a05120d444c";
   sha512.doc = "f9994a39f6e14f40398abacfe0f4c1a9cbd71d7b55c29787105fdbf8212953fb761f1696cf35196d446b9905a967d2908d7e41e7742e5cd7dd538ac0e7d3f5d0";
   hasRunfiles = true;
 };
 "cmsrb" = {
+  revision = 51887;
   stripPrefix = 0;
   sha512.run = "71114f560befd3f1c7586dbdde38c12b682bf1eb73019d874b1a55e89ef9829786623ad9f53d2dad99361dfac09c9ec011dd7018d07f48d483463219df18baba";
   sha512.doc = "81803d7ab7c220b64684ac2c7bf3b56ced62fafec33e5ba2ed2ab2bfcc4c8abccfacb5614a853fbc1ad0993bd6f221b41ddbad1c494558fa3d4af2c27a51eafb";
@@ -4815,6 +5483,7 @@ tl: { # no indentation
   version = "3.1";
 };
 "cmtiup" = {
+  revision = 39728;
   stripPrefix = 0;
   sha512.run = "9412576d07ec490fda4dd01445f28e4b966d2664a81e5f44a574019df1eb4de4189b8d06edf7a1a3b57e8ade129b57c0147a96fa9b77337d9a906134e33f2067";
   sha512.doc = "aae6105fc9e828715193bc4d251210f23ce6f4c4d703c79c244ff765a377f90055188f8af83e705da062cea8db8bf6b89beecc488cce32d7903fb7fb8c4bcad9";
@@ -4822,6 +5491,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "cmupint" = {
+  revision = 53507;
   stripPrefix = 0;
   sha512.run = "df5fec72f9116ddeaa19bbfb1c174c008b6c6e78313459542092cfee30f20ad93c0e42b3078cef83d606e4403d2c84ec232f365c02e4be8b80109544ab24ac3a";
   sha512.doc = "fe7d492c660ec1786f486f1a58b405303b2dbd63094f05fb0da85fd0a7811eebd11f18a065b524027dd4fc559bd5ebb037a3114b9984f622af5daeb3d42e8acb";
@@ -4829,12 +5499,14 @@ tl: { # no indentation
   version = "1.0";
 };
 "cnbwp" = {
+  revision = 32550;
   stripPrefix = 0;
   sha512.run = "31c83774160e64dadc95afebe830ea1aa7c929e48f611cf5c9742cb66e12a3dd459928c85ed1378460247241fd4f007145b002ae7aabb88e773779124510c86f";
   sha512.doc = "d41f72a3c5482b1ec50f1bacbaf8bed5f926c5d522ab5e3574d71d68b2d7c63e20fa1df65962f94e53b70f75aa7dee5337d064c212990c0f3351c30b05b567ac";
   hasRunfiles = true;
 };
 "cnltx" = {
+  revision = 52601;
   stripPrefix = 0;
   sha512.run = "e2e51aefb221bd92c03af9fe82738ff4912445cdc56bdcec2ad1e9da132804bc1b1ae578f4db69a39a90981e16682f88b32b5192b0510977f2444dd5232f487b";
   sha512.doc = "8cb976bc69502c4e4a17473cf5a57cf0316cd488a64af97a4c76679ebb7acf5655991d7a9f21a1e3c3fbbf03b934675fe3c00b6a2db7af12e8e1e170151a6eb7";
@@ -4842,6 +5514,7 @@ tl: { # no indentation
   version = "0.15";
 };
 "cns" = {
+  revision = 45677;
   stripPrefix = 0;
   sha512.run = "0b3645da07e0fc9482cfeddd93f949e18dc12b6aa02e5a6c45669f3d5f7f25d5fa7ff4992f40b9b71894e21b5b1855999ba8e1b130be27e8b7001444ed30db0f";
   sha512.doc = "264c64f2ae29bff96b428500af07a81402434d9422792a36ee0da74e9821f161cf8281d38317787c0db78109d2eeaaff4e62730855ae1f1e1f250f4173740d35";
@@ -4849,6 +5522,7 @@ tl: { # no indentation
   version = "4.2.0";
 };
 "cntformats" = {
+  revision = 34668;
   stripPrefix = 0;
   sha512.run = "f829d6452faa20a514bfe43a8b002d4d728b57e0d6c44de7ba8aebaa96d9a40fc0ac26ca6ef637ab9efd3f133c70cd4d5b9c81dd382ed8adcd5abd1b2fb5d6cd";
   sha512.doc = "4d6c9b8ad41dea1e14eec71570afdeb28fb834191587ba964642628674526a5ac82d6ceb972d5d89e0faeb3fb46da26361dea45f8757523f58765dfbdb773a3d";
@@ -4856,6 +5530,7 @@ tl: { # no indentation
   version = "0.7";
 };
 "cntperchap" = {
+  revision = 37572;
   stripPrefix = 0;
   sha512.run = "ade4e6bbb00d619d52cb65549cb50f4ff9275d20a9e871ddee99064fb2ae0e02ba7d403bd6c7d658fdc6d542d7a32244ce8ff7fbe023b4fe292697584aed966a";
   sha512.doc = "354ea40ce2fe4e543016970fe81745c151a53c182800e8b861006d7e1c6fff84628a0baa4bfad29a0b81c8d0eede9f31145e7d3f380953921a48f31c5b8d0a8a";
@@ -4863,6 +5538,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "cochineal" = {
+  revision = 53348;
   stripPrefix = 0;
   sha512.run = "1042d59946773c0f321758bd61f9aec5f4a6536493db50df4d9afe693f02fc5a3a64b40c01a7097f5ca9c6e1b3f23181e5bec5ea62de0b2c7c7a38438374e3bf";
   sha512.doc = "115bc2ed0e846f374b768908f5af7019d4b000ecba18df9914248c023eda5ed5033ffc3483ddf89ec909dc6509820858f7de6721a3d5701f1475764c008c49fd";
@@ -4870,6 +5546,7 @@ tl: { # no indentation
   version = "1.060";
 };
 "codeanatomy" = {
+  revision = 51627;
   stripPrefix = 0;
   sha512.run = "0f7613af5e91d364d0c8cc3978ce5251cff4650bf5e187ef03606b9cf5294eed82751b8f7604583af5187b62f40688733a39aaaca6a022ddd0087ab610f8c978";
   sha512.doc = "877a827dfd0bb9e79f80fa0a9cd7275a647fc4f0451af5c5a5253caee306f202a419f0164b2878c7a780176e018a2f1a3f8e9ec37fd8245997da537eefcd4e7b";
@@ -4878,6 +5555,7 @@ tl: { # no indentation
   version = "0.4-Alpha";
 };
 "codedoc" = {
+  revision = 17630;
   stripPrefix = 0;
   sha512.run = "8dc006776f2a3f0f28aeed0450e2d7b714402de1939a92d1e7f1e0174a8de7e9f7099e7ae9a5de34df03613ff16800bde17f7cc90fa82798f30c775c10c655ff";
   sha512.doc = "fa23f45c539ec134cff114d7252a4d96585168729dc33d0865f4976f94620a8d3c02fa21572953161977d893c7f311b0d15a431f74b8526d1de0680dfdad7341";
@@ -4885,6 +5563,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "codepage" = {
+  revision = 51502;
   stripPrefix = 0;
   sha512.run = "2531186744ce4915b8d903e0ea49e1d3e0a6be5ab2db7bc2a5cbc70e675c2dd00104a677c08b7b7d12eca56dfc4b283c49ee599fff6d3460c6238f414ba3cb76";
   sha512.doc = "b49ffff68cc599835acf436de3117c7f9511b362d821bdd8c18f0af930c5b717dc0bcd00477e6f0f367229b9d1f6dd150a8166dd74bbfbc2cfcb77ccf28cd8d5";
@@ -4892,6 +5571,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "codesection" = {
+  revision = 34481;
   stripPrefix = 0;
   sha512.run = "95318ae4933d0cb43226c714c8ff931aaa8e06cfb2c44c3929db59ae8336882c588e26268445b62f8da32145a962bae0030daff3d5cfa22007919fb7b13fd69d";
   sha512.doc = "881e62381793f548d0c291141944d81e19cf4340f2c1f63916857f5702756e18d107337c340568d62de48fe2190cf4c74a8d6604f8d4843c47ceb7c59608c0b0";
@@ -4900,6 +5580,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "codicefiscaleitaliano" = {
+  revision = 29803;
   stripPrefix = 0;
   sha512.run = "7c93841ceadbb7bbfc9846d281fdbd84b7f284117344e1c4fd984e746186403e9be3e2048cfca53f6690a1e20b7471224b8d30ed1358959053111c22d3f15191";
   sha512.doc = "7b0c13252796be7d584d3e5dad65711229cf916ce7c8e89e423805183629f161b3d4e4f47d6c9488ab32ff8b52723b0fbc4252f2ca99e965f4d7c4409881b67d";
@@ -4908,6 +5589,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "coelacanth" = {
+  revision = 52462;
   stripPrefix = 0;
   sha512.run = "b29dd50ce96159af8c212aee3dfab5eed5285df453caa60c9fd65bef69ff865ba81c698af8ad55f2d3533ed3ad4209644f34815b7287a678a734c9b27e2acc24";
   sha512.doc = "38f0f12bd2510a29120fef972578bf7587d4d5a469fda80f8eeecf4d0492e7503040ead69ef9eba46766598889ecea3741b9f78296ca49feb69e69d2f475b1f8";
@@ -4915,6 +5597,7 @@ tl: { # no indentation
   version = "0.005";
 };
 "collcell" = {
+  revision = 21539;
   stripPrefix = 0;
   sha512.run = "34a2fb5a5dc309e625e4c7d89b9e5aa9806d15d93cf0fec124a0505b20c6711bfa96b3f99986c23393632a9db1c773842c9bf6f10c01d1c4da8dcef2960df289";
   sha512.doc = "1bbb4e70a5f5163a62f1b0b135f5601b4d9378cf2a5d27fddfabf9ee5e65dae7a94cb4cf63ed5e98dbf35cee550bd0a7b425f505d462eeb7f1e7035fe3c7664d";
@@ -4923,6 +5606,7 @@ tl: { # no indentation
   version = "0.5";
 };
 "collectbox" = {
+  revision = 26557;
   stripPrefix = 0;
   sha512.run = "e530c630a905084a3f9c43fd54c45fc5d4af437aab887f15f5d37c40d3ba2a86c576ef032e723cf95f4f5dc46256d3e7bf6440545f68133217fb620aa2db8a65";
   sha512.doc = "e2248e9825490474e545c1674d1256ad586332045e2fd5ee5dc84d9965d4df263522277a14676010085a73dcf00d822ffb29117338b3fd3f854b7b0d0ddb5c9f";
@@ -4931,6 +5615,7 @@ tl: { # no indentation
   version = "0.4b";
 };
 "collection-basic" = {
+  revision = 53774;
   stripPrefix = 0;
   deps."amsfonts" = tl."amsfonts";
   deps."bibtex" = tl."bibtex";
@@ -4976,6 +5661,7 @@ tl: { # no indentation
   sha512.run = "57aab47e05657c83c41e81fa1ece61a43b223c76043b7f4c2a3af6c54110ba69ee3421ad7bda591e7f0872a5f2e4def87f338d6d0fa9a931396a37ca76dda521";
 };
 "collection-bibtexextra" = {
+  revision = 53243;
   stripPrefix = 0;
   deps."collection-latex" = tl."collection-latex";
   deps."aaai-named" = tl."aaai-named";
@@ -5126,6 +5812,7 @@ tl: { # no indentation
   sha512.run = "51da88d702cff5d127c1f40119cac08df392b0677825e9ececbd3183d1691ceaf1bdafd5b9541a434d37a7562dbd2851b6cac28ee4d3558c8a85dc1ad44566c7";
 };
 "collection-binextra" = {
+  revision = 53491;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."a2ping" = tl."a2ping";
@@ -5226,6 +5913,7 @@ tl: { # no indentation
   sha512.run = "306dac78fb385fca7c2de33deded8f13fe1dc7999cc58b5019cb0eafd0ac74f629db627b05a49b1ca7cae431d5aff5bb514329b167ee2c2bb16bba81d8f6dd54";
 };
 "collection-context" = {
+  revision = 47139;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."context" = tl."context";
@@ -5268,6 +5956,7 @@ tl: { # no indentation
   sha512.run = "21aa181d7a3e8c16dbb30e12e30822d18db1386e088103a0987dc2a0a4d611172079ac12d7edd7f9d8923598c1532f7162905940846d6e13e143883bd735996f";
 };
 "collection-fontsextra" = {
+  revision = 53908;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."Asana-Math" = tl."Asana-Math";
@@ -5577,6 +6266,7 @@ tl: { # no indentation
   sha512.run = "c98b0241f30fbc7be047c0e1ecda32be6ef0d4e7737906e230ba13de55e0847bf29e2a54e87a84a4270fa023608280b063586830c7cd9c3715f392aba4504b0d";
 };
 "collection-fontsrecommended" = {
+  revision = 53774;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."avantgar" = tl."avantgar";
@@ -5615,6 +6305,7 @@ tl: { # no indentation
   sha512.run = "9d2691b1deb294c6a947b4412470f84eb7beee9b8b6ce6a536cdec6a86de7ade51b58d332e8718fb82acac7fbe8980c184ccdc73d720feb8df40cb414c8cb5c2";
 };
 "collection-fontutils" = {
+  revision = 53559;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."accfonts" = tl."accfonts";
@@ -5636,6 +6327,7 @@ tl: { # no indentation
   sha512.run = "bd36ffb3bdf0c9df289f73143288b4d1fae6a4fd9c391590274b3eb3365e44dceb67f091e0d94466c7e6110a19a5b8c4b47e8d0591d04bdfa664b4fc2a58c7fe";
 };
 "collection-formatsextra" = {
+  revision = 44177;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."collection-latex" = tl."collection-latex";
@@ -5660,6 +6352,7 @@ tl: { # no indentation
   sha512.run = "73b00a08738778902d35e934e296552c76db6a202c197432e57c3fe03d300dd5b3ba41a618151ffcd9642275db6899d8030329f3ec424b55da0a743ecbc84d0e";
 };
 "collection-games" = {
+  revision = 51178;
   stripPrefix = 0;
   deps."collection-latex" = tl."collection-latex";
   deps."bartel-chess-fonts" = tl."bartel-chess-fonts";
@@ -5700,6 +6393,7 @@ tl: { # no indentation
   sha512.run = "bfa055b06a2a56cdac916627c79ad94242fee0b1ae747f721e0932452eedbff05566211a9e41aa8e66607b27d753db5edf5d0ed04cbf1ebb2944d3c4cebbf108";
 };
 "collection-humanities" = {
+  revision = 45363;
   stripPrefix = 0;
   deps."collection-latex" = tl."collection-latex";
   deps."adtrees" = tl."adtrees";
@@ -5756,6 +6450,7 @@ tl: { # no indentation
   sha512.run = "94e1a021c967f623d24a3720199293f564ccc3e7339c2e58a456163d617740d3a6bfc8b5fd54fc288f269ebe7a4eafddaba0c6c78c66ea565bb2e0d753b7ebad";
 };
 "collection-langarabic" = {
+  revision = 50080;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."alkalami" = tl."alkalami";
@@ -5784,6 +6479,7 @@ tl: { # no indentation
   sha512.run = "4c0f4860c69b0be0e3bc909c577e2795fcb3c15b65961d7ada1624cc3c9f77b104f8a58a6d390c1085c464ae043c65b4912da9faa0e8334964d0c302952792fe";
 };
 "collection-langchinese" = {
+  revision = 50930;
   stripPrefix = 0;
   deps."collection-langcjk" = tl."collection-langcjk";
   deps."arphic" = tl."arphic";
@@ -5817,6 +6513,7 @@ tl: { # no indentation
   sha512.run = "fa19508a88844191ac410af63bdfbf95ac75231c3e7564aa0c2d54bb1b474b1d769a61c96abf01a11757ce002ae4cdc4c757cbd28414f6a182ffedcb13afb6bf";
 };
 "collection-langcjk" = {
+  revision = 45194;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."adobemapping" = tl."adobemapping";
@@ -5836,6 +6533,7 @@ tl: { # no indentation
   sha512.run = "959ee256fdf82076f8fa0d5a35f876b3c030e69feaf94cecc68e6e1061d968a72b9389e62b5c18c4d7fd4e98e707a1dfffecca7b7149d0c30388cb0c73870059";
 };
 "collection-langcyrillic" = {
+  revision = 53160;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."collection-latex" = tl."collection-latex";
@@ -5887,6 +6585,7 @@ tl: { # no indentation
   sha512.run = "28ee3e3b72c9297cc2ae6617b80706ff47d97450c5b5547b5be493d156ee420c822cd84909bce148d596aad1601289f5b6167130aa87aca7c2edbf18d248dc05";
 };
 "collection-langczechslovak" = {
+  revision = 32550;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."collection-latex" = tl."collection-latex";
@@ -5907,6 +6606,7 @@ tl: { # no indentation
   sha512.run = "daee20efa3c125fb5dcf55875eb3a7a3e94553a5f1e185c8fdf35db0ab933abbb2ac2f67da7fa578b1f915d88f3cde764dca098e76b5df73da18dece3e49dc6f";
 };
 "collection-langenglish" = {
+  revision = 52239;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."hyphen-english" = tl."hyphen-english";
@@ -5975,6 +6675,7 @@ tl: { # no indentation
   sha512.run = "1f003f1a719bf29ee0a0167784f48cc6aef203f714a5024c52b1e3791d47d2cae816056e78816dabb806059cb4f3be066d722f8191ca67e3d72e76b274759e89";
 };
 "collection-langeuropean" = {
+  revision = 46803;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."armtex" = tl."armtex";
@@ -6044,6 +6745,7 @@ tl: { # no indentation
   sha512.run = "9505445397888b80e7f92026c63d4ec053758f835d6b217902639ecef6670f85a49e308891381be0340b43e7a793885dac79f88e75c376226d474682cedc3b12";
 };
 "collection-langfrench" = {
+  revision = 51322;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."aeguill" = tl."aeguill";
@@ -6083,6 +6785,7 @@ tl: { # no indentation
   sha512.run = "be5230f2fec255b9bf7220a9ad33930032ef617de8665d2c35c4360852f77d2764dbe1d7917bab3552f6098e0749cc5e0a9e001bac87abbb5b0de6af24ee1eed";
 };
 "collection-langgerman" = {
+  revision = 53815;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."apalike-german" = tl."apalike-german";
@@ -6138,6 +6841,7 @@ tl: { # no indentation
   sha512.run = "a73e281ccb849825e3a1996273cbd34ef7337fcf5368f556c2909a029fbedb10672a18b984444574cde3a2b39d11a6f23f17bedd382268a2b6aa2226c5a26d61";
 };
 "collection-langgreek" = {
+  revision = 44192;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."babel-greek" = tl."babel-greek";
@@ -6167,6 +6871,7 @@ tl: { # no indentation
   sha512.run = "9633d376e164895cc7ea0d1a18759c1f06c71b83e612c10069dfd18237d61afab99170c03a9a1ba461d43d4273c7228f41f899dd77dc9308a8d329da6b336cba";
 };
 "collection-langitalian" = {
+  revision = 53306;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."amsldoc-it" = tl."amsldoc-it";
@@ -6189,6 +6894,7 @@ tl: { # no indentation
   sha512.run = "2b172a37bd15ab85cdfa52f25c1b7310c23af5f9f4925cd678ee7a6f7731e4ba39fb866de2df05d6e06f3483303a9a4bfa60b65edd035e1cf55d6f5c004413b9";
 };
 "collection-langjapanese" = {
+  revision = 53811;
   stripPrefix = 0;
   deps."collection-langcjk" = tl."collection-langcjk";
   deps."ascmac" = tl."ascmac";
@@ -6248,6 +6954,7 @@ tl: { # no indentation
   sha512.run = "3d9cc9c20a4ef6dbacae6fda18e625fc3828b4f899460d8e920217b79e19aab5601bd7146e6adaa6d599c81a7424390a98c3b8a26dd5ac759caa57fa74fcb5c4";
 };
 "collection-langkorean" = {
+  revision = 53506;
   stripPrefix = 0;
   deps."collection-langcjk" = tl."collection-langcjk";
   deps."baekmuk" = tl."baekmuk";
@@ -6265,6 +6972,7 @@ tl: { # no indentation
   sha512.run = "6f1ae7dfcee95eb5f9c8d0b6545ccdd159e63684b7bba22ebe4280dd2e13cbfb6518274eb131f1502bd99ac16114b4e694105e366631afe484caa22eee94b9d7";
 };
 "collection-langother" = {
+  revision = 52581;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."amsldoc-vn" = tl."amsldoc-vn";
@@ -6322,6 +7030,7 @@ tl: { # no indentation
   sha512.run = "e69c9003086890a627c9e7bafb9e76e722e3bd111af1ba7b36b393e81a536752fb6355455a491effa5aaabe286c97e16fd9d6688a237656c9d3e63437ec2b718";
 };
 "collection-langpolish" = {
+  revision = 44371;
   stripPrefix = 0;
   deps."collection-latex" = tl."collection-latex";
   deps."collection-basic" = tl."collection-basic";
@@ -6345,6 +7054,7 @@ tl: { # no indentation
   sha512.run = "38799df728e830c93a50928efe5f337c91e34b97368e4cce4707e6cbca0a8ee22b9edc528084034a86c72a748367c3f46af37fbe87f5171951563d98f836de58";
 };
 "collection-langportuguese" = {
+  revision = 51640;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."babel-portuges" = tl."babel-portuges";
@@ -6361,6 +7071,7 @@ tl: { # no indentation
   sha512.run = "d805cfa253db9af2c74f9aa072b384f7cdb775258d5063ff33713a60977899ef7b833d5bc5c5b589d9b4f61737c1a48209c25481571dc3be32d5ebdf43430340";
 };
 "collection-langspanish" = {
+  revision = 40587;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."babel-catalan" = tl."babel-catalan";
@@ -6380,6 +7091,7 @@ tl: { # no indentation
   sha512.run = "ed816cee1ca88a971b621d4a91ea7e6beebf8aacb684f8f000da8c4ce58e368a347eec69676db992dd1f09f287957855b4e814336a9bec689656a3eb6c34ce8b";
 };
 "collection-latex" = {
+  revision = 53921;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."ae" = tl."ae";
@@ -6437,6 +7149,7 @@ tl: { # no indentation
   sha512.run = "0dbb2072e05a4f11ba940b9672d86c6c87a765c584c258271b93589382401ba96a296a00ad446645357cded4bfc44b60aa21df4b923e567aadf2b220f34f2dfb";
 };
 "collection-latexextra" = {
+  revision = 53921;
   stripPrefix = 0;
   deps."collection-latexrecommended" = tl."collection-latexrecommended";
   deps."collection-pictures" = tl."collection-pictures";
@@ -7743,6 +8456,7 @@ tl: { # no indentation
   sha512.run = "3d19c59c6d2df89882415bfa2b1f647a2bdbb17b68eae2e2664fceff7bf6381a2127e94e7dc6ef159527f3036d8de7a42bdc9d926541be15ea6bb2d6ac17454c";
 };
 "collection-latexrecommended" = {
+  revision = 53921;
   stripPrefix = 0;
   deps."collection-latex" = tl."collection-latex";
   deps."anysize" = tl."anysize";
@@ -7817,6 +8531,7 @@ tl: { # no indentation
   sha512.run = "63b9150f0f35a6d4cfa2a0e1d9ce42f686d1887a4984340403ad74e267af063831c01921d55435159e39a683d7db0a45ba9a5f5f9d6c3d8416060f565c4bc237";
 };
 "collection-luatex" = {
+  revision = 53894;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."addliga" = tl."addliga";
@@ -7868,6 +8583,7 @@ tl: { # no indentation
   sha512.run = "3cc433cf11324c414817c88a47819776f78b18d81306ed5e4f26ffb94240fca51be693fbba2c628f5e4efd21634f177fdcea5e756c81a30463690124621d96f1";
 };
 "collection-mathscience" = {
+  revision = 53699;
   stripPrefix = 0;
   deps."collection-fontsrecommended" = tl."collection-fontsrecommended";
   deps."collection-latex" = tl."collection-latex";
@@ -8077,6 +8793,7 @@ tl: { # no indentation
   sha512.run = "f76274cf450f7d01e10650537756aa2794bb4acd9c7c08afaad899a0c14b7b5e8d3bdd2d47ac7d6f7c37bc22bc95a90abdd9cd69e14272608569bf66f97a407e";
 };
 "collection-metapost" = {
+  revision = 50293;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."automata" = tl."automata";
@@ -8126,6 +8843,7 @@ tl: { # no indentation
   sha512.run = "09dfaa35971f85134d0854c08a99c4d2b01ddf08e8ab97449460bb99d1236a38c48643501e7bb56197a844491509af301da6c4f75a33d9286601633211ec7d93";
 };
 "collection-music" = {
+  revision = 51864;
   stripPrefix = 0;
   deps."collection-latex" = tl."collection-latex";
   deps."abc" = tl."abc";
@@ -8162,6 +8880,7 @@ tl: { # no indentation
   sha512.run = "a4ad811435b9b6d51d59c6fa09fa20c82d8adf455fccca3121711f0814a1d73f10b3549d928555cd34ac9917accb1748f0a7ed3ebafd979833d8e6ebb146efd1";
 };
 "collection-pictures" = {
+  revision = 53426;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."adigraph" = tl."adigraph";
@@ -8361,6 +9080,7 @@ tl: { # no indentation
   sha512.run = "86e6de5c89def33ebdd4c501713ca857ea24537cc4522a8c6d851c058822f51398023d80bac638611fd0a93a0a7f05598a992e53f95c43281f046dcd1e087f54";
 };
 "collection-plaingeneric" = {
+  revision = 53957;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."abbr" = tl."abbr";
@@ -8458,6 +9178,7 @@ tl: { # no indentation
   sha512.run = "04b467a1c6be23641e42fe2988487139757e67badc710d7547ab63dfc772091af105930c37f2e34b32a8f01528393fea742f3c3b20c5147db916c8bdf5bb0caf";
 };
 "collection-pstricks" = {
+  revision = 52261;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."collection-plaingeneric" = tl."collection-plaingeneric";
@@ -8576,6 +9297,7 @@ tl: { # no indentation
   sha512.run = "336ecc5633674197d366aa52ad2ce650378868110ccc8203c64b9a2ebb69cfa2172230bd46f40acf38b1f984b4fb2d831a7747cca26b16a7d3b2c2ceef435020";
 };
 "collection-publishers" = {
+  revision = 53831;
   stripPrefix = 0;
   deps."collection-latex" = tl."collection-latex";
   deps."IEEEconf" = tl."IEEEconf";
@@ -8808,16 +9530,19 @@ tl: { # no indentation
   sha512.run = "6c8fb62dbf05c1d522965f8837a3753ea0b534870bb17512178aed979f21401d1e96c4ded2054fa6d71f2c3ec57d4fa158c30fb6b0c0462d336d4f2fc057b0af";
 };
 "collection-texworks" = {
+  revision = 36934;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."texworks" = tl."texworks";
   sha512.run = "76e9ad96aa649c70442533135cb3e198278a8df631f91f23b55bd2977eccacd81a2bafa6cf4f0fd1e83f86dd591a85eb8aaa93c5928b2cb9766683d089994199";
 };
 "collection-wintools" = {
+  revision = 30307;
   stripPrefix = 0;
   sha512.run = "648617c8a047b9833429a38e77f1b605b060fc3ab4a356ab8a19e0c1b3650bb56eef7e7b9e8727e95d1e48b0fcac40d8994303527afc7511c5d1a34adab8df30";
 };
 "collection-xetex" = {
+  revision = 52686;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."arabxetex" = tl."arabxetex";
@@ -8866,6 +9591,7 @@ tl: { # no indentation
   sha512.run = "f4413abed31de8fc073ae63c0136da9e3e71d7dad5f4d46d59c7251a74b446df77db6eafc3ec97848fb2f5c5a84f07b37d36d0e43f2d7379922876874d33594e";
 };
 "collref" = {
+  revision = 46358;
   stripPrefix = 0;
   sha512.run = "56c2fda36523ae348bea381d90493238c7cbf5ab59f074437c7b694b441f913e6b58795ca81d2c549fbba01505a8895e9e139a9d143050761bceced2717fdb97";
   sha512.doc = "2d75180ab389632ec320795d6e6b989d902b82d1cfc97ea3c5113647e605c1eead0d0f5a6733cb692b624f4caa7120959c0b15018e35be4d4894183ad3e4c37d";
@@ -8874,6 +9600,7 @@ tl: { # no indentation
   version = "2.0c";
 };
 "colophon" = {
+  revision = 47913;
   stripPrefix = 0;
   sha512.run = "e85dfdef7eefa2fedd6af7c0b6eb71200485b5190268de3a89cbec8dd15f8e66b3260430660f6cb860e2712d3e20e5a8d0b874592a71b116dc07de6e28161474";
   sha512.doc = "aba1badf34551d8340f733bb9e365a99c56c473f96ed69deadda917232ea8313df800579cb347e074ff0836553bdeb49f60330883581fb3cc7a3eeedc736d1ba";
@@ -8882,6 +9609,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "colordoc" = {
+  revision = 18270;
   stripPrefix = 0;
   sha512.run = "a4d87deccae89f844a6251887e4d20817837fff4eef9cbd2874bef8890d41e0ab930a3ee55fae9ee46685c6b3b2b3324b54ce8507f1cb10eef332b7a480b94a8";
   sha512.doc = "a2e5c6699a615651dd31a570ba6524cc7cb3d2f3c8d4b1fe49092dd4c01b40714c1c534f3554fca20fad7c17fdfb7104b699a10677519f57538e239820b6f1e7";
@@ -8889,6 +9617,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "colorinfo" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "63bfe1dcdfd85dd1d7d3c7c8d3d345f221bc90bd34bd75888c361d4de97633b9c14d96930b41adf63370403c858f754e740c53d8100b9eb3c5557dd66e6876b3";
   sha512.doc = "d871a76648cd57af0bd6bd800ee8673ff07b2572ea514a3806731713d9ec4ab368fba2cf540ba71005300d4e02beb180f8eba82c0b060bcaa7a60e54ae601df1";
@@ -8896,6 +9625,7 @@ tl: { # no indentation
   version = "0.3c";
 };
 "coloring" = {
+  revision = 41042;
   stripPrefix = 0;
   sha512.run = "7c89a6c53212beaa06d54dc091021c5fd57cc30fccc917ea413d23b0790ec637b6b8e69a3bf1b44d0a9ed24fa1c0dd21608b174c0230a0a94a2e5aed221be033";
   sha512.doc = "cfe600ff32f680f7b7d3916e5a2e767732a9ab9f1e6d06133afbadc87dc1b8ac420284c75c221ed5b5a81b76f6b01302c5595b69439566775adc18ab11185961";
@@ -8903,6 +9633,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "colorprofiles" = {
+  revision = 49086;
   stripPrefix = 0;
   sha512.run = "49be492e62fcd615b08bb6a32767cac54a9535ab859d2a27d1c84788d4e168df2a10133e5408ab1bd3a802ffa8465a61c4144cd9cbafc6fa98f995cb7af89381";
   sha512.doc = "ab7cabd369cdde5c2e5108b4d75d71bfa5e6b44d7ecc2eda25509078f26bfbc8515dd10a6dd82adab979170e12552fbecffca1f5bd3a1105db21b31097ec5f12";
@@ -8910,11 +9641,13 @@ tl: { # no indentation
   version = "20181105";
 };
 "colorsep" = {
+  revision = 13293;
   stripPrefix = 0;
   sha512.run = "3c6387a4c538235181dcaf7b6c3ac51d2893d35fa2c18d95d85810b778fecaed7ae2337d2b284ee3439f44d3570ee86884d42616539bf61a15526aa711da70e9";
   hasRunfiles = true;
 };
 "colorspace" = {
+  revision = 50585;
   stripPrefix = 0;
   sha512.run = "677f462e9ec347467ab39f3c4e776b870861ed0a38447d61a50abfc3172936c99b468320ad40a5b43713df070434c0b280e2d9d13609e141603453fa7d6c37f8";
   sha512.doc = "702060f3a2805be7dc472bab428fad866e947d8f700f8357e897443909d555dee399ac857feb1e341875bbd4017e7e456c46c4282def6daabc092417859bc634";
@@ -8922,6 +9655,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "colortab" = {
+  revision = 22155;
   stripPrefix = 0;
   sha512.run = "460225705cfa914efc689df2d3f0c0ef7f5883082195e3d8e29e124726589fb5e9b7fc4679541b685439de097b6b297b803cf08e104ec13b849dbb26cffeaa04";
   sha512.doc = "947e46ffe5c83c3803e40f0da9a1a926e830e2b24f1d486d158da24bceade870cb1fe580aded3838f895deb238d1615cc0e3f95a05e99800fb1bad87ddf0b134";
@@ -8929,6 +9663,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "colortbl" = {
+  revision = 53545;
   stripPrefix = 0;
   sha512.run = "b24972e5a945458318a7b383ad652c7851f01e6c66fa40f8d670f4f3724d280e18d825fc905d76d111d7de969bf6be29f45447eaab78fe985275984a23fd47bd";
   sha512.doc = "4de654d192374960d94c13ff47785ce40f2b0a298bae0d1b5342119f018844653ccf4f4c99c6286accdd62d94bab82cdf6eef1f7977cbb583cf37e21496b0420";
@@ -8937,6 +9672,7 @@ tl: { # no indentation
   version = "1.0e";
 };
 "colorwav" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "618f813c9e009a671069a151bc6d438a42b2c589b255685d91dbbbd162e6a106164d626cd772bdb3e6538a1b010ae178dd7e1519195b6b1fee10ce6e46253b6c";
   sha512.doc = "e042c10fcd4d2760383352ace13b2d3600682a01c900220913c79a950fb1597a59a82483429557aa7598e1cd1eea52b73dd23367139fb741ea48ee9c84c4c572";
@@ -8945,6 +9681,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "colorweb" = {
+  revision = 31490;
   stripPrefix = 0;
   sha512.run = "dd8e53aa707f1e73276cca9a9c5732b012ca7dcb0926d101c71aa5fe3829f07251a7f606accc95266f6c9aa4b867a38cc654ca97cc32857edc3d196b2c5a7fd4";
   sha512.doc = "b1ae7c14f2f07405b7a957831b60829046b058f6d1640051cbee877100c98a8f47d2c1d40f60599c42ff90eed246248b4f48dd8c1d31f9d45082f9ec5c341626";
@@ -8953,6 +9690,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "colourchange" = {
+  revision = 21741;
   stripPrefix = 0;
   sha512.run = "dba4ef8d97324c3da71de1c6a37e268618bab0a876e1da37226ec9fb187087d39f32507e97f4ab4fa801fd4bbb98c51a322c6f2493b719133154b24223bfba46";
   sha512.doc = "628bc515058108ba97312c15ee5af00e086ea3dc124b4e7b038b176d4175e2146afc6f571593c006d749634896fa286d16c923c17d4dc9e55e81ac3a8aa95442";
@@ -8960,6 +9698,7 @@ tl: { # no indentation
   version = "1.22";
 };
 "combelow" = {
+  revision = 18462;
   stripPrefix = 0;
   sha512.run = "17f1beb58a11f3c754c57331d1b2d9338fee359b6c27cdc0a855671397e78c0b2d29ba60247f3104d3eece22619671f56d2aac862ac404502faaea08f40d7be4";
   sha512.doc = "82d8e60a5cd8d46b952aa27dff03398cb6e65a1c5a76c1eb260d3e30172af89206a7a8ec7ab3871d5e33e87ccc2c99e2f54740facfd71d43ea6f88821c9ceb2a";
@@ -8967,6 +9706,7 @@ tl: { # no indentation
   version = "0.99f";
 };
 "combine" = {
+  revision = 19361;
   stripPrefix = 0;
   sha512.run = "9e57b01fa0a14556473764144dc3b5e4e3d40a7f913932b02826a68efdd952adc69e990ba75f6b5057d69850d3e693e1c5b5c40d2c3443aab2741ce9646d522e";
   sha512.doc = "4e09fd0a9b587d61da2c6a15579675b9a839c83f0b38b0f958b2f4aa2c0a49adf93730ebafa235043cf645d6b8689cbcc5916e4bba92b5e30ac87a8282402859";
@@ -8975,6 +9715,7 @@ tl: { # no indentation
   version = "0.7a";
 };
 "combinedgraphics" = {
+  revision = 27198;
   stripPrefix = 0;
   sha512.run = "22d36d3a44fbbe5f11522f28e716be862d354998750492d014d86037a24407a748248571e50dc99a6fe5518d8ecbf61ca657407194a43b75510b613438fa4b65";
   sha512.doc = "4802871f57bbc131c850f89eef43778ed25a9abb0a850dac0e91e762b7a321567348f147ae02847cad4c226f9acf2bce921f9745832d1dc298d751b8123741b4";
@@ -8983,6 +9724,7 @@ tl: { # no indentation
   version = "0.2.2";
 };
 "combofont" = {
+  revision = 51348;
   stripPrefix = 0;
   sha512.run = "838f10474c2e89f317df4592443deaec3d1a3310f7bb2b458c2a1b29a03013c4274912020ddd9b5807bb6018b6564c11df7b14b8a6db556e8db58dd98049c002";
   sha512.doc = "ab322618efb3cd8089e9142a28800d34724e499bacbd0cc4a0db14a409bea3cb355f50d412f92862f53c0a5f91fef8af7b652b21be0596cc9687e4919f5122b4";
@@ -8990,6 +9732,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "comfortaa" = {
+  revision = 51461;
   stripPrefix = 0;
   sha512.run = "83398c18c37a1e2d2e780133910e5ccd59daffb548f689e22bb642d7a2776e425a80df8ded3982f9b343b83d3421d3d5a9f363840b5f4d9e5ab470439183aa70";
   sha512.doc = "e7c554f3d8ddccf5660e7dd21ba4aec1412433fb594398d9e3b57f9ecd7943c34529b4ac747d9678dd30374eb8fdfbfcacac0545f12769bf419644cf79123a05";
@@ -8997,6 +9740,7 @@ tl: { # no indentation
   version = "3.2";
 };
 "comicneue" = {
+  revision = 42851;
   stripPrefix = 0;
   sha512.run = "c72d19a0f5219d96da92916ec13fe333703c911b4222b60f825aa5ea2d412df261fbae2227c56844e70fcc057ed8367a4c42f17799c4b8418b02c3171b8d4864";
   sha512.doc = "e3d1630dbecc93365e18b496565a5430e0867f3d3a82c0bedcfec8a02168bddf71d9e65b996e4682294c086d1049cf88182a36c5619d8fe6762aa1050fd923a4";
@@ -9004,6 +9748,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "comma" = {
+  revision = 18259;
   stripPrefix = 0;
   sha512.run = "65c21bca8e6a707697847ff96d1cd909cbe0c7d33140b4b175a2e3464c1c67827cea9c9f65e45dfcd31fcf2fd94262daa907358341fddf351241753ab47ac99c";
   sha512.doc = "b25433b52a32cee71043c1f13d2ca45beff32733ac24259f767b6093f5b5f38e0da3c88569bcd637267397c49d26e546c26454381cf916040c52a2833b02df65";
@@ -9011,6 +9756,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "commado" = {
+  revision = 38875;
   stripPrefix = 0;
   sha512.run = "c5e48910b5e685c792b9dfe191cd8666472e24e7ef6d6c2fdb3bfb05b2f39f4d4ca68cc7b859d07f50e5d596250e36e1664e1ca48666b0e3126eb8c91d27c384";
   sha512.doc = "457d03b34ba53988ff287060d18f993f8e01ca99991505c5373abc05cfdde4cfcdda8fbb6dc3737e91c66ef0b30c083c31e64e326c08d4959ff8ed1a66cd4d33";
@@ -9019,6 +9765,7 @@ tl: { # no indentation
   version = "r0.11a";
 };
 "commath" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "68c25e035e211107c65eece91bf84d65f2328ebaa3dc81d70186707c081f865abcb1be383cecec7d780bbebf3f565647406d6bcfc2c6bb3e846058d50882a6b0";
   sha512.doc = "5d1d162cf8fd6692788bd15e2d3c2021fa6ed96f289f2c17e9d7e9d2afb428030f0d016f4b4aac62aebec1c8988aa1a978f71bdc7f4873e181f1b2ec7e0f6d0d";
@@ -9026,6 +9773,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "commedit" = {
+  revision = 50116;
   stripPrefix = 0;
   sha512.run = "7a2248fc7c3de4755a68dfb769c0862332f41945a5efdac8f0b9911c3479bc45cf72ef0176d8d2ed2abe127aaf388c17c90d1f58cfea4aec8bd9e488f2d96c5f";
   sha512.doc = "b8c6fbb8c67aeb878fef32bb6e61dacdb3ebf9bb7ac92bcdb685bccfac8129ee3145d40ae579ff77b097fc81ebe0438ee5c50c6bc3df156910a287b368728c6e";
@@ -9034,6 +9782,7 @@ tl: { # no indentation
   version = "1.02";
 };
 "comment" = {
+  revision = 41927;
   stripPrefix = 0;
   sha512.run = "36b5b4c4d4345a4fcf706f5040c02c2de52567fae76146a06b7f084d59b12d151e65faba1ee4aeeaebee018d81200c2902feb81ae575de35a68c00fa14ed6ba3";
   sha512.doc = "d5a360c6a0c549fee1d46fa0e9c3f9aaaa4b19b30ac48046e736008ddb42393062824950684185175f8ab569cec221bc8f9a798a07623dbe26cc92a3fd6bc72b";
@@ -9041,11 +9790,13 @@ tl: { # no indentation
   version = "3.8";
 };
 "compactbib" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "dbc3bb28178a656b400a2a72e48ec813d6e282ddba7c70bb4dd0b5ed7f76e9e0be1dffb0ecf43e4893210453ef420c1b1d859c287663cad6bfe8c7f46dc8d86b";
   hasRunfiles = true;
 };
 "competences" = {
+  revision = 47573;
   stripPrefix = 0;
   sha512.run = "e5b2b3a77418d5bc55e8fbbc68c39b1852ce6081b00bf6115573ac29cb7c2b8fd70392fda9b04edca5c3aa1617424541fef2da4d2f777c433b8ee168e850ad99";
   sha512.doc = "8a0078f2a3c32f03aef58a5d1ba4167ac4c738103d65cad9a5f4bae67aebcce3cb7a16d6aa27fa7b83955c95b28c1f70a0404f5633e3231c3b6d4232265e6c53";
@@ -9054,6 +9805,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "complexity" = {
+  revision = 45322;
   stripPrefix = 0;
   sha512.run = "352e1a308e159e432c3123afeba8b173b28e164c81b4874273ddd3f8bb8c8866ef33ba7c06e061d52a3845eafb3307b045b82c9da5ea6a812f3808417fa074d6";
   sha512.doc = "2ffc63af2d86b7dc121c6e122ee1d23387c4c73a6ba65b226413671b86644d0cd9e9ec646b3eef49d9c4b2d64575d83ff45f3691337ba1dea6835945ca80de13";
@@ -9061,17 +9813,20 @@ tl: { # no indentation
   version = "0.81a";
 };
 "components-of-TeX" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "364836128154056aa5d1e005144a64aa64ee105c78d34127958599c8c0eb82aa70e856017be3d7166d723a0fd7c9656d72cb24e46bd61d8768c1dc82991c5f77";
   sha512.doc = "5da762a898a6cb95d5da95f444e862c8d0ac351ca63eca776fc1a9e35e2fb00389d414a85fa1bef357abc3d68b691a36ddac8c6aba20b7ea6f398c9017ac13fb";
 };
 "comprehensive" = {
+  revision = 46270;
   stripPrefix = 0;
   sha512.run = "8c34a44188cb3dd286f0f841cbfd2d4760bee9be75c814041ea7d2f9ffef39991f018fce276a440f88ca8771eca0c1baa9884d2a7f60afbb788f63220b51c3e7";
   sha512.doc = "e262b3996a745024d2cca39d62ba35e00e9b6a8ead58ae1c89c5d8949744cf8a084021beba8c611ef6b2726447919241e0f2f6cbbb21e6de4d6c15af7c7b5ea4";
   version = "12.3";
 };
 "computational-complexity" = {
+  revision = 44847;
   stripPrefix = 0;
   sha512.run = "639ae984ee1b581260434ace517d8209843127795e674af045ddafe16838946bebbd2dbeded45fddf62ec0a49b1a30492db0cba4ad1e5bf65530d1d5a5df9198";
   sha512.doc = "9daf1691d33bbf00b67b82cc29de0002e1aef968cb1f182bc3d722082582ed7e60945f74675b48a87baf67aa9f5fee4a167bf1548d3312492a8f570feda93ac8";
@@ -9080,6 +9835,7 @@ tl: { # no indentation
   version = "2.25f";
 };
 "concepts" = {
+  revision = 29020;
   stripPrefix = 0;
   sha512.run = "2fe917ad25df3b14bd3a20566b97a7ece0f87f79ec7ef10bcafdffde1834f6fc4bfa6775a7ec8d044e5f3ad241913b2664a7a5c25893e9406de26c0a1008d25c";
   sha512.doc = "5519f645d55e2a3e4e5f9156bdac2ea9e4ad4735ec9104255e75ea254f45b135f0d635322cf46a5536e8600eee1447ab48753763a4c89310e92d51c94c4fde80";
@@ -9087,6 +9843,7 @@ tl: { # no indentation
   version = "0.0.5-r1";
 };
 "concmath" = {
+  revision = 17219;
   stripPrefix = 0;
   sha512.run = "1e2fd3339fd2bf2a48967102ca42c930ff41a5b4a9fa850cbce6aa2ed701ab351a5dfb931ed80de34aa13e18ab2b01fa2893f981fc671d6399f4d55aa9f8ea40";
   sha512.doc = "05dbb0a6d89d3f72f3d77824670afb29e6ea8dbba6d37255f6a36006a6a6b630fb56b12815ae3075c41dd698d6a85c6be7ce1dc2da9b3b69b636fcd8c4855a84";
@@ -9094,24 +9851,28 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "concmath-fonts" = {
+  revision = 17218;
   stripPrefix = 0;
   sha512.run = "65b3f7003b8aaaf6565bea6a65da11f42dca2283f1d53710f4b476a48ab39ae6fffc1d0f9206e23b66047b572c28e793e1a75d047f1c1a892fb4e7c17c854741";
   sha512.doc = "7b2db9b8f2f23816cf413676dfbf6ca3413a39bb20cbc12070b9202bd2e98714a86dcb5f27a746ae197efd2284eb794f06af1b2941667abfddb72773ceb61378";
   hasRunfiles = true;
 };
 "concprog" = {
+  revision = 18791;
   stripPrefix = 0;
   sha512.run = "f650acafa4ffa424451f338d6432d665ff679396ed367650d360adf699d3b1e7d8d23f5b3fd070440cb4d6578d07978bfd02960c1219eed6c8594f110708e5cc";
   sha512.doc = "bf4d76362f7a764ae4c7937edf05a575b3faa8d6919c6c857ae350b742f53d6390546263d14958dbdfd423c9b45a7f9eebe862a00378f51c754b5fee65f60bc0";
   hasRunfiles = true;
 };
 "concrete" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "465b6d7e427e8bd7b8cfb44551d4f8999ed0e8482f905416ec4ea7db6ea4293e6124f0b69e84a84655d5230cee1555f15030c8dfeac8c7da99c1c8ba20a3d640";
   sha512.doc = "5fb4fd77468dd4d5ba19d43d176588f05345038d58c9b0b2630e6795ed33bdb3db0053d5bb249030a118bf19cddf7c7e4d8f1ae96173b1e1368e468ea2c00727";
   hasRunfiles = true;
 };
 "confproc" = {
+  revision = 29349;
   stripPrefix = 0;
   sha512.run = "b6e054332f7f6a239a6eb102ae4b022f90d9523628a293517b1d070602290bea8e623379b5c246fcd5b8daae29c9d32d02a8a7637cd704ede5b1b928de4536fd";
   sha512.doc = "0bd697d12f1740257e89cd5853aac7340659350a6374c32c5fc22da4249ea08b7e176dc499712f4c2cac6641c0161394ff0433513f7ce1942d50ac69021c14aa";
@@ -9120,6 +9881,7 @@ tl: { # no indentation
   version = "0.8";
 };
 "constants" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "c4f807315c7f95fe7945e937e750ea18c346a8ecabb80a39922a9b861e3cce3956db31c55e68a0d3417406284d7187fd3b1d1c336c0a130eabb07e4bb60503ca";
   sha512.doc = "2712e46552a8391b0f2a95991368882a393007788cebabe7ed6c5a604eb2085b4bf00749c6fde3c88028904b7117cd4865b964d11eb443c6939e734495d4df2b";
@@ -9128,6 +9890,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "conteq" = {
+  revision = 37868;
   stripPrefix = 0;
   sha512.run = "ee0f344ed0eab872aca3c54422f83a6f8bbed2462a22cbd54dde075ceae79dc5a01ef13947327ec726d5eeb64eee5519e4074c138f4d172bbf2b4024eb88ceff";
   sha512.doc = "edf52893cef8c5f8538a64d626a12725b043c5f0106a63f02cad91df9ad632009cfe3da51149750d4c23c12742c00052b951ada957b89641d9a0da59e93396c8";
@@ -9136,6 +9899,7 @@ tl: { # no indentation
   version = "0.1.1";
 };
 "context" = {
+  revision = 50573;
   deps."metapost" = tl."metapost";
   deps."pdftex" = tl."pdftex";
   deps."xetex" = tl."xetex";
@@ -9152,6 +9916,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-account" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "755ddb4c62a496873d5362df01307163c79d2a6c3fabce6ea01b442c16dad2f23d72909df71dd44eb4fbbf5c57366e20eb49bfce240807c2e2a9a52cbd76680a";
@@ -9159,6 +9924,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-algorithmic" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "72d4bbfe723b4012f8701c2786f96009bbed3c6b4bd2129f7153306f172e72218920e222f97ee6d5ee4b863e9e915fc38dd92b0c42066385fde35c5c3d0cc42a";
@@ -9166,6 +9932,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-animation" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "19691ca3325b3f72154ac8439e616a128b5f3ba8c9447bb1e92979e175daa902cd756853a2b6e6a34a84fbe96e02771a0c6ef27ed5bbb7eac94f62dd72d571f1";
@@ -9173,6 +9940,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-annotation" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "bb66132ed1e4f146c407bb3b2852c451b82d3d06de1dc25ddec6e692d17f4d994d1a67cfd7ff711dc2de7a4ce7259b1768d6efcfb58856321d5ea5b15271cd34";
@@ -9180,6 +9948,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-bnf" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "53e5d3d7c977aab648bb024942263a8aed5da6314506825ace02556db890ea23400c6de714ddf6380235c942dfc02e127736579b6be1c5b0b0ecc65d25fb0d6b";
@@ -9187,6 +9956,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-chromato" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "52e11c6953e7c2e2f9a3a20b8885fd12f5abef32d32da5ae5415b0321d37ac5ff8ff5bece3d522e1f785470cef542568cd56abd509d26671da9298c3d0ba27cc";
@@ -9194,6 +9964,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-cmscbf" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "cb0e5849ac3168a4ecdd1545edd029a1622ecf1c46d29eec97b28a66f65305e6b4d3a9c83e24d78e1596c8009ad5c9a0e25fa7e09448c3e0ea492e62bc933ea8";
@@ -9201,6 +9972,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-cmttbf" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "e3bc048c09bfdf114efa25077fa4e6a6c20b4d0e2ba337cefa0a8a82348fd3376f82cae0c85b029b863b7a5db9d9552b4fc5f5487d5ed5f6d88484181ea98ced";
@@ -9208,6 +9980,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-construction-plan" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "b292f8e271fcac88eaedc376257ae16a401a6c31009eaa3d4faeefba25c33d034f57d30ba4638e85b76ffd0d24ef4d541dfbceb1bc0b5c806a8412d239a32146";
@@ -9215,6 +9988,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-cyrillicnumbers" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "14a90656d706d68ce441301aa6bccf2033c36f9c8d8605ec9dedeeedb71a5670dae325a5a198b2ca25373eb2b495e57fff31b85089c6c0fb987738c76ac636b2";
@@ -9222,6 +9996,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-degrade" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "b2df5bbee492b7137180bfe7b0b826f4149b8231b78cb839ac9716f02b622e5b3a0eb5964e12625650a224ae463714bb7cafbecae6061a6e3120022d2f545d52";
@@ -9229,6 +10004,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-fancybreak" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "1e8e51de47c67a3287dfa4386f9c09b4dfaa494d9b59fe8d117a3a1b65a5041add24c36227f2d2d7fb3bf2ec34d6a5a8b6658d275b63f55793d05dea08722b10";
@@ -9236,6 +10012,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-filter" = {
+  revision = 48390;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "330e7085ce8d3e284c9e4cff349b351b862cf7e6544f736268b01d623370658de507176d3bf957f5b2bb2da28523a9b5543b091cf1dad0711f0cd38b2da30fb6";
@@ -9243,6 +10020,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-french" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "0131af9d1c23f612450333c2cca116d2369cb8ecd402bfb9c9abc7e473b4eab44c9962d343d7391d9d9a29bd376012c82bf9e6378a280d41e37d41736b1853a2";
@@ -9250,6 +10028,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-fullpage" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "280a16b47e04f3099a2f960435bf1c22ec623553303e339df4d06135b768cee6565e20a0c4e0c080d8c6f621a32d862ba6203daacdbf9ecd03b62829dd0014fd";
@@ -9257,6 +10036,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-gantt" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   deps."hatching" = tl."hatching";
@@ -9265,6 +10045,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-gnuplot" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "d3d7dce105707bd8fd903038e458cae614ec63da7932231e1f659570ec3a7960ea0fab338a8405f2ca8ce8b03946b58db8255333d2a4ab5a659566f4d272b0b0";
@@ -9272,6 +10053,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-handlecsv" = {
+  revision = 51306;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "10f862b7152e0efe2a8444fcf847ade2aad2c1499e146b94643a7e08a438359c2f7d1927e7e9773f3dd14475fb4535d17fb4f29ff053e7a29c9463f40c6e5598";
@@ -9279,6 +10061,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-inifile" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "9dd9b61cd2b5700b0e2b6e59bf4040de9431820c659f121c2681e454ddb4b34454270eac6c442836c90f8a1819761ce0d7659684a1f0c8876fec1f947a0b16f7";
@@ -9286,6 +10069,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-layout" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "6cad00783d0bc91000ca0e0c8350fe2a2e99f7fefccd375d5bb2f1a144fc04a59f83122dcd490fc0596b1dc9fd0c0a779bfa35932362927ed50ed8df39ec359e";
@@ -9293,6 +10077,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-letter" = {
+  revision = 53499;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "12e0ab8934b8022010e6a23109b094ae97a9c409cc143705d73776350b8d36aca11f3d6df181d5252415f12ff11bbaa4d12e2271ba5ad9b43ee84c566c5c1e17";
@@ -9300,6 +10085,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-lettrine" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "79e4e246a7bb0a300db53425e2769a3ef61bc0249ce57840c0b9037805e86eadbd1ef4ab8a110fd806584393feef00f498418732cfd53922aed6df67c561e535";
@@ -9307,6 +10093,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-mathsets" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "e4c689c745d06c61d6f693a9832001aa8c79d51664c2a5d6d0c6148a95b30870063f50eecca31ac0924193c6dab8c12cd5ccaca16eeaf5f83a99cef1a8889ec3";
@@ -9314,12 +10101,14 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-notes-zh-cn" = {
+  revision = 23171;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "a05cd68d609fb9427ca07f64ba1b9ad85762464a3294653c8a790c0a6a41d6af43aab72a1eb7ef0d56a299db2f54af5666dbe974f9fdac014f624350c8bfe50a";
   sha512.doc = "4261b8aeb5b3cbebde2890af1b7039c6f557ce36f4979228f40f9e5e99b19aa5c457ed6842f4501f4dc32f51f58d9fcd0764028b9d5c74fd07d41c8c866220a1";
 };
 "context-rst" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "f93173c1b27afe538d670c791048f495fa3f236cf75511d43b33172d140ac47fa3b5f11c674db5d515733b8ef9cfa7ac2d3c46b78b624768ee95a21884dae904";
@@ -9327,6 +10116,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-ruby" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "e219c6da61585d88f8e899278d1c85f0903ed32b6c7368cdb6076697230a0e79f5f88f53dd98514394fa09e7580c1c6b7c167d81c010107f3399dffb18b13d95";
@@ -9334,6 +10124,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-simplefonts" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "7c817f4a25a8883ce052c9657a3d6117042e8538fadc8d67b4b0194abd69238045c09d365e90e555d5b04d83a1ef82039ca9631aec00eb1f80b56fbefa729cd3";
@@ -9341,6 +10132,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-simpleslides" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "8bc6a0ee37116c200cffdc6595fa4d6b3383dd92da869f2e142d475a5693cc2ff4745144e3b2fd5a3ad0876a5182f1824a2a402aa48b0b02e288990e16056083";
@@ -9348,6 +10140,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-title" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "bc7d6cbd373cb6d6214489ed97117929ba381626c854a0a5a950bfa44c06214991d7a90290793c825c96e6d22ba1f6807054d4553d1d3980d9d9bc0e6dabafda";
@@ -9355,6 +10148,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-transliterator" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "d41cd0ebcb99670bd48f8becde633c21401dd9044bbf93618a031da10c59bb8f6d4d6bbc68eecac75965b26f5052f797609d67d791cd7a281f72cd062d3d7388";
@@ -9362,6 +10156,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-typearea" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "c4a2f2317b146b31102273e9b616d403d4ee836a61fae96bd9315670b0bdd5f9d94ecde00b53d2ea5f7073773bd8af5c322b07c3b05bf7ad5262a9f0e0b623a1";
@@ -9369,6 +10164,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-typescripts" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "f2d43256997cfba2ab2fe0fc8ebe90a3798bb42e6d455fbe84540654a95fb06a170aa19cf11e4f3477517473b21fc05426247b1f1d39c9132e703c0f1a9a5d0c";
@@ -9376,6 +10172,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-vim" = {
+  revision = 48391;
   stripPrefix = 0;
   deps."context-filter" = tl."context-filter";
   deps."context" = tl."context";
@@ -9384,6 +10181,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "context-visualcounter" = {
+  revision = 47085;
   stripPrefix = 0;
   deps."context" = tl."context";
   sha512.run = "da7799ee31a4298f8e8cb02cb4e480fa49fb4188b776df877648c663c93523636bdd7fa6ca5eb403fc8f3483064bf223fed042c1d27eb0817c224ddf8e21c673";
@@ -9392,6 +10190,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "continue" = {
+  revision = 49449;
   stripPrefix = 0;
   sha512.run = "42cda9a2796e9006263320163777df7046a79e38cb2c0ffb53f23c27cc03c686e00e39b066228b09ca99a6e5c2bf4a6cb32d5d7c49b40cf614c542e258968ab9";
   sha512.doc = "0b6bbf7c3123b7e741255bd3ff9e020ec61bcb81a236ddec41e709f14de514057d9b902ad783f48e5c04ba1ca6daee31a38f130649cb0e5b2d548ca9689d5dca";
@@ -9400,6 +10199,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "contour" = {
+  revision = 18950;
   stripPrefix = 0;
   sha512.run = "0dd4a28f97efcfd0459595776cbab019168fca48984d78f9ec17e0f3af9dbebd378adc6649bce6a9a999651c75316f3ff44e0f10e208465dda2d904d080c41d3";
   sha512.doc = "af1c649d2e5666ee3973395babce4802da2154ba95fa7fc08e378c261a8ea1c5be44053c40c5cc1bd0c74e2c54b659470c3d45063fbbd4330cdc5e664f19bff0";
@@ -9408,6 +10208,7 @@ tl: { # no indentation
   version = "2.14";
 };
 "contracard" = {
+  revision = 50217;
   stripPrefix = 0;
   sha512.run = "07c77a1e864c012a88be95a98ef662f5642fd63e84801a994be702f5ae2d62100b02e109ba6c775f2c8d11d75627fdef48acdbd55bdb4735896fd945edc4fdc6";
   sha512.doc = "984acf51897209c3bc3fe4760088a6b9cbae613acf51c5f8c848dae3a3d13e5e8171fc62db25dcea267cadaf9f2ba81d221085ae90a7da1fb5e6d0dd8e243f10";
@@ -9416,6 +10217,7 @@ tl: { # no indentation
   version = "2.0.0";
 };
 "conv-xkv" = {
+  revision = 43558;
   stripPrefix = 0;
   sha512.run = "7bbbcfd71a32704f2383289d91fcc1b5993aa9e184f5d974f6dd5592312e85848a926ad9e6f412bef801daa20cc2b9c999ba137b9b24e31facfd6931309630df";
   sha512.doc = "c1c923008185db09b3e7cfd90bfd9b33ca2a61ccc706b0f9cefb238e0860120da517fdc7166e4fe476a1cc02cb4a7a3fe4c9b81c87c8de25ddd1c0c417dcfca3";
@@ -9423,12 +10225,14 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "convbkmk" = {
+  revision = 49252;
   sha512.run = "01bb9621459bac7eecc99b1d9aa59de420ba805b2e0ecdb2a89f5c86fa4a3021d957b4ddc69617ea406e77865d68e40c657979c488fc51f4676d084cfe6181cd";
   sha512.doc = "937d436cb9387eac601883ced516fa40f60e606bb4bae0be62e1ded2a31754a1d00461a34ad533cce1cc48f4d11e880233eaac128d80841e0b22f18801e86506";
   hasRunfiles = true;
   version = "0.30";
 };
 "cooking" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "6c2fb1adf244dafa9689844e1283dce19786e2c1df170d4172d3567514555d90adcb82414f79b5d9dcd59cfdd3af5d6893fff57972d6e4fb32196add0ed5b1eb";
   sha512.doc = "30cc2a5b4679126cad1b13785081d924f9d455a5f392e5047c14c8ce1dd3efca102bafb74e1a339dd938680f3a95111a7025a31508ea63108eb33cf32b03c9c5";
@@ -9437,6 +10241,7 @@ tl: { # no indentation
   version = "0.9b";
 };
 "cooking-units" = {
+  revision = 53403;
   stripPrefix = 0;
   sha512.run = "4182a43bc869dca19d022ae019fd479ac658c609a792677b9cfe5e3271af890ee353974b15b9cd4bb667f39fb38b96ee1a31359ca4a89986a3c03053ffd1974c";
   sha512.doc = "71e7ab3f1a89984063e26d5532eb1c1533efb06b8d8164548b7b46eab966e88e8ce5300ca0c91c639ae896b95bf5e9487c8c149d2f90af7cca0168b674052c8e";
@@ -9445,6 +10250,7 @@ tl: { # no indentation
   version = "1.46";
 };
 "cookingsymbols" = {
+  revision = 35929;
   stripPrefix = 0;
   sha512.run = "9b43ffdce038ebb001c0ab6198fa2d92ad6f1ec6040f1c315a53fbfd29367e5c851f4015c36b0cdb2eea84f4a8dc90aa3d5126a09f93766d614931bbf555f982";
   sha512.doc = "fb6794942d016d12f527b86947c7fae9947a7cf9122a7b26d39bfeb6d5f55a7cccc11b666101b0c80a92c7385ae8305bcb4d792baa0974b738af80697ad12891";
@@ -9453,6 +10259,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "cool" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "ec5b1612484852897856b58bde90aabc3e8c051f6a14674f2bf3a121993ce074214c3d61c7d074dae54e227c759630cff71793ac1ff433b048f3a15f90038c0f";
   sha512.doc = "bf27e08a04f02f58ffb04ae0fa7b26860ab4129d3de3e2ab20d244a99c96b112a7a3dc10d064a364e38a80c1087ea8c693e7e7538a36975b6914f75418a82547";
@@ -9461,6 +10268,7 @@ tl: { # no indentation
   version = "1.35";
 };
 "coollist" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "e7568164dc7d7aa9395cd79e52e4f58b1087d1203d7ad73dca6aefab9222af6875cbacd3270d3ef193416c1b2d893877118c74a206fdc813b3fbd52935ac9d7c";
   sha512.doc = "6e183739d0dea5e0da341381c06a671879caf6fc666a74c87b8c3e9df425d3a99cc4ca2f2acb32969cce869a496f0a50bbfbf1351bd71e177b63829bd11aa6ec";
@@ -9469,6 +10277,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "coolstr" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "d4fe8de308d6dd9711f1d877fd1d5ad32f36a4d6cb17480571d88f4b63f9441fb1db217629ddafb25e774bb6d43d148742f9e823e1d43f497a9799b869f90b62";
   sha512.doc = "63c833be3ab646ce509e5082af3d135d81224c7b586f6998e5fc7410f2ed0e52abb05adfb49d78bae721889fc522395b53810e3ee627184de83dddb198cd3083";
@@ -9477,6 +10286,7 @@ tl: { # no indentation
   version = "2.2";
 };
 "coolthms" = {
+  revision = 29062;
   stripPrefix = 0;
   sha512.run = "7a9d8f4605a0ff108ef5cb32ef4b6f455d16898248fee534e6557d8323c4378c8299fc1a6d58dd491020090ed4fdd3e41a90de99d18a9d114b72bd57b27b5e7d";
   sha512.doc = "2f5ff3ead76bc83138e41ee881713829de7b8b0ecdda353fcbdd9ebdb7851139eb9022fb4eec1a1c03d125f4106ce748123a9d9fcd76859e82158a541aa20aba";
@@ -9485,6 +10295,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "cooltooltips" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "c17cb15979b575ece2c16dac8d56991c7cb32d99e165205c099b5058b658c60b393696fee5f7178611d5ccdf1d812522640dee56c1c4c881a73a11edc2ec8799";
   sha512.doc = "6a091ed9c41f4cf31d9db7cb2c1c76a342583f9d568ed89380bb624fba35cb3b788abde47f746b0e8a0402da19171fce72c7f356da2a2e4cb8264452f727eff7";
@@ -9493,6 +10304,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "coordsys" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "83a57df64b3386b7e927ca30b4b2ea031bd656121dda79dba0f96779e77d733d2293b80a3b08081678bea9b31a31a586123e9866c6aa595561843af3de0cc4f6";
   sha512.doc = "bb89a04e5889c39c23ee65c38232cc0be931dff383d52614e290b6bd8ab23e7c9063fd7ea656dde896c08830b8c7c85e1da7f56728fd43a1bedf31bef6ca2e83";
@@ -9501,6 +10313,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "copyedit" = {
+  revision = 37928;
   stripPrefix = 0;
   sha512.run = "27f48ff201c66d61ed7702b4d11f0d39b0c74974ea3a90506dace0f3cb4ac3c4ee5cac28f9669574184620b3e64a4b9ef3fa5564213e3d200754bbab791e52ea";
   sha512.doc = "60fde840ac3c6876f031daf09e852ddf79276d2f841dea2ee5299678bd116df31b2ec2dfa6d6175e45a42fd781be6935cbfa2aab8621af641985e3df2c665fc1";
@@ -9509,6 +10322,7 @@ tl: { # no indentation
   version = "1.6";
 };
 "copyrightbox" = {
+  revision = 24829;
   stripPrefix = 0;
   sha512.run = "2ae2afc738cc906d24fca0a6319c98dc1e9382bbde6db3d0c3a371d3de8b92c30b3bf05be04797bc0ed6d905933a50e74809eed52f06cdba5fc5088be033d4a9";
   sha512.doc = "9b817f2874a35f3e023774d3be32e0f8bf53a26f9daf553525c95ce0c21a64a22c3a716fb20cdc76921ec90b7b5305f305bf44853cf87d13ac38ce853ca00ea4";
@@ -9516,6 +10330,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "cormorantgaramond" = {
+  revision = 53339;
   stripPrefix = 0;
   sha512.run = "04f9cf2cfa444b33af34e1289825333a105e05f224b855229a3eb437c28085a5cbfc3507761918867dadf940e5c175acf61d124668941549f4d0acddca0385fd";
   sha512.doc = "7641db7d8c3100e6db19eef63cc6a9d9de15eb4547175cd6d32482926c1f3665dbd9d1658f52023fc030c4921a5c7a8d050fc3acb839937816e9eb704205d8e5";
@@ -9523,6 +10338,7 @@ tl: { # no indentation
   version = "3.601";
 };
 "correctmathalign" = {
+  revision = 44131;
   stripPrefix = 0;
   sha512.run = "5a7e9b3b51ae82980cc1ab9d4ae74aa0b65afa533d21230b1f5e6867bb6464f910a07bb1c38621eb18d8bccd8bc50260b8741752936c310012590706726ed6f2";
   sha512.doc = "bc6c9f24a4107d28120e6934f6966b2560ca4c34169b0074023e941746240879bc0572840d3967effd3a1358ef288ac412946f79fd3b40151c1507cba8828be0";
@@ -9530,6 +10346,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "coseoul" = {
+  revision = 23862;
   stripPrefix = 0;
   sha512.run = "21524a0721fa26d85b383879cc75600bcd55ee05220eac245171eadc30dea7296731e4d6d2d3d82d10b32f1d674d444bf1df41dd82b92d5cfa7ea06d53f56147";
   sha512.doc = "6e950d1f5129b39de2cfdbf7cc46b101f81336f29325a5e74f58dbb4378dd79189d1e29dd88a9e828fe4e758b6de93e76f70884c9fc582cc8a69f6db1e1f2617";
@@ -9537,6 +10354,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "countriesofeurope" = {
+  revision = 52285;
   stripPrefix = 0;
   sha512.run = "77d075fe233359be6d50003d9577ce84965c409ae89da18ae91ab214a80200b83843ee25a1caaf1d0ac1e6fc076efbe560f3dacc1770120a89c6d8612915418b";
   sha512.doc = "03071f1cc0c00f1930307395126f035080c2efae21ec99ae81a03abdbc572d1219dcd3a63b8d988036a1c2b9c4f1a4a564df7017a886965068d1ae314a995306";
@@ -9544,6 +10362,7 @@ tl: { # no indentation
   version = "0.23";
 };
 "counttexruns" = {
+  revision = 27576;
   stripPrefix = 0;
   sha512.run = "569393d76512308751bff3c5cb22bc11ecee420bb16b5f7d35d6b10beaa02f9c99a4d440e7f3a35bda4e6821405e5f8d621af5af176821549a0e0f0660f998bd";
   sha512.doc = "4a67cac01589ae5d3eb61c5c6c66bb38ede138c9c2b56fcb6359c8f851bf55ce3cf2e5662cd7751d6708c86644cb5f607318612b01b60f769858d594c2b24218";
@@ -9552,17 +10371,20 @@ tl: { # no indentation
   version = "1.00a";
 };
 "courier" = {
+  revision = 35058;
   stripPrefix = 0;
   sha512.run = "a7a7350f23921254b9a37e498c2360aeb67d4aa8161072dafa38c941eca35388eaa5d8a341e8b490e783f346ed6b0f4a4d356dd914f70a858c92c76ff1808440";
   hasRunfiles = true;
 };
 "courier-scaled" = {
+  revision = 24940;
   stripPrefix = 0;
   sha512.run = "570256a4353163cba169ac5d649458d363edc5c2836efccff1e7df83c12d9b552978b3531f2ab026430b3222b3dfc00be0e4700031e6bc50bdb60a739a68c9aa";
   sha512.doc = "59c5cec8491e678b084afb4c6e63ed07ca179b5f17be8fe581ff341c80b3cee8016601799ada090e1fcde9eeb72197986f3d4aeffa7c7a9d10a014e34282f52a";
   hasRunfiles = true;
 };
 "courseoutline" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "fd3bbcd90570aa1cbfae49fca247d761ac0b886d795fd8097754706b21ab1d6954eb8d8a6c1fb4e69d550e7ec89294fa006f50bab0c7b806c545666eac4915f1";
   sha512.doc = "5a52cabfbc28fe27aa6f85b3653de3ace51b65011ca2e33b56be59854b364319ed8adf95576f8211d9494a367fb637b47fd2805a2663df87103b2d67a168dc13";
@@ -9570,6 +10392,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "coursepaper" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "bae9e3188a3312f970434b21f23436251dcf8d7b5b2049decf1f95903f5e58ddf9dd328ffc6908c70bec436c9edc3ae62b05d110f42a8ab322eb3f464733ba96";
   sha512.doc = "359ee3956a6da4eb41947db9b5f8dbaac7c13c18ea91afd6d63f738ab43af4c77fd93e9123ecda28b4e2211387c910b7a46b2ccd97edeba70fd6d2852b228094";
@@ -9577,6 +10400,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "coverpage" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "6ba22fe89f292ef65ec41a958a93a8ab729954fab33f10677954791bb2be8bcbca71ba4953b6ec47066d3b92e444ebbef9b5f465952076ff0c679706f0ba406a";
   sha512.doc = "01346bc57d5742be2196c8768106fc06534ce03571dc1e3e9d48957ba6d0e1a3aab1a4ac070d4e545f058d1b3833e908398fff62d3ce6bd462b927646ff1e60e";
@@ -9585,6 +10409,7 @@ tl: { # no indentation
   version = "1.01";
 };
 "covington" = {
+  revision = 53303;
   stripPrefix = 0;
   sha512.run = "cdaff0af120ec8b455a25a57544b2a5cb5c55798c2c0b5c360f647b95840581820ff4caaea6ab27d586c0eb6369288deec889f28c6f7669f59177480a64baaa8";
   sha512.doc = "9c665da78243fbbcbc6beb9d1170fc30c0fb43b033f872cac9667638027f00473cf1dd02ea5912c448407f774c8deb07b8fb02e7bb7a74eecae9aa87be9fd4c1";
@@ -9592,6 +10417,7 @@ tl: { # no indentation
   version = "2.4";
 };
 "cprotect" = {
+  revision = 21209;
   stripPrefix = 0;
   sha512.run = "f4795674aa97744b0d6ed70bcae83a1ce3b41670a1bff2e67d12825154bcfd7eac2a740996bcb4aa0445697a3e4c17ef3d8606b308b7db3aea263269a7e2eb51";
   sha512.doc = "e8a5000eb9a538f95bf6df4e2d68ecd8769974192e8181b6eb40e5f48b2cc3a9b9d405d1c7b611e35c41dac5ca5165a503efb7584ee94289ed3255a9482b2b2e";
@@ -9600,6 +10426,7 @@ tl: { # no indentation
   version = "1.0e";
 };
 "cqubeamer" = {
+  revision = 47630;
   stripPrefix = 0;
   sha512.run = "6dd13c29855533c100146e712431d64e4d55bfe9c49b2199a63f292933e6666c0fcd15e17e56b534e648a64b5117b8bf211a1f0f595d83db54e587977590a2ce";
   sha512.doc = "38cbdd297bf4ff67d0404b75c497416eddaf18d4430ea49af8413ef504e8463a3127e3d42aa12f2920a12d13c03935d6aab5b036d398322428659918b5058444";
@@ -9607,6 +10434,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "cquthesis" = {
+  revision = 52355;
   stripPrefix = 0;
   sha512.run = "08c18f72346fcb3bda3f0bacdcdaca72d68e89675b98f1aba46c3181a334fb4e21de82b219637d05bce0de4259b3b4ef4790ebdea3ac538f4a121311e5fcab5b";
   sha512.doc = "88daa7155ffbf06bc393c991c9e043015bfa25122737f64203f6c0352eb2e9b386ce7398736ca62d33e0708db4f60741f5ac76ab48eaabb10b5c1ce7c4a40b71";
@@ -9615,6 +10443,7 @@ tl: { # no indentation
   version = "1.40";
 };
 "crbox" = {
+  revision = 29803;
   stripPrefix = 0;
   sha512.run = "087ae9406fd8f6916e355b51d2f4dc7383228813716ab9f6c37714794c931a9b5defa4678a4471523c5fda2c6b0b7784d11dfb488a8d9c60f0244d9d2d64ab2b";
   sha512.doc = "8927d6f60a3a895685c679e565632ee2ca68c1f2e8dfd795a481767463d88ec37579bfbd55858ce1e6e433a981de4b5140cf75489221243716cd8035a2967a90";
@@ -9622,18 +10451,21 @@ tl: { # no indentation
   version = "0.1";
 };
 "crimson" = {
+  revision = 43525;
   stripPrefix = 0;
   sha512.run = "58708970173456998d07a7953d86b3124a0b97a918910229c0d20a300de688283bdb85b63a7596d2bbf2a6cf5f1069a596e43b29d6fa0c5866ef9b0cc1d01b3e";
   sha512.doc = "2fac264b2986a52a739496c907930b6182e56dc24c8b13356d4d564113d6aa019734fb450168122aff2b0f14ecea3d962b4097638277b805d3a13cff5493fa9b";
   hasRunfiles = true;
 };
 "crimsonpro" = {
+  revision = 52506;
   stripPrefix = 0;
   sha512.run = "64c7f5d30798fd99de0745869985108b702b66de8d48f0d2ed68ede9cd49e032aaacbf24d5a5fdbced79c2fd01d25e171273fab5873baa351f5b46ebd91993ab";
   sha512.doc = "fa46cd05b0e5fbd71881d8a42f635bc7271106a73d412d02e49b968ca60985b60f470927a6c8f68c42060774dd2f67b0830ff6628c506eff57462f5bc6e06638";
   hasRunfiles = true;
 };
 "crop" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "6909ec6d94362aca7b0c0a00accba6015f5b30c06bce01acd22b87b2d1550ebb7747013d008b7cc82c4cf0b3f5fe6a6575fcca4ee50707214fcb0e19ed796989";
   sha512.doc = "b68db452aca35a90dc77e500df8db574c321c693490abdf9c7135c7457b34b5a42dc32213c5917a2e4ee37252d909315c4e68ff76f3185a9c321eee3bee10a04";
@@ -9642,6 +10474,7 @@ tl: { # no indentation
   version = "1.5";
 };
 "crossreference" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "e34b4d383b8398880b962cdddf248c95f2bc7187b5ed4f0caf84655a94f92b915906b150ef904c696f49f22ef23c039ee66427a03b1430f7a3d5f619f2a80d01";
   sha512.doc = "e21b294ac2b3489cc81ccc99c54bc60985d8769e297f137180a9373ad289248b5d90acf3dd9800d0690907543cf52f0532f6317ef55a43a5b55541805e2be68b";
@@ -9649,6 +10482,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "crossreftools" = {
+  revision = 49589;
   stripPrefix = 0;
   sha512.run = "9f5426951f7062ac3a850d141aff2031ea2197a97d5e4bf2c2b93fcd2719d5b1d6587b66d51fb258f514423bcb43cc8699b58a74c411824ffe7057cc27d03702";
   sha512.doc = "66597598d04218394abe1762aca2e9ecb25ab25328e9b203bb789459d053ec575f2a7adcc9460b1356d5488b32f2fb8335e8a7554074fb5ab2df810fde2be586";
@@ -9656,11 +10490,13 @@ tl: { # no indentation
   version = "0.9";
 };
 "crossrefware" = {
+  revision = 47861;
   sha512.run = "351f123bab2b83614b660959e86573845e32b6ac894ddabf24484cc3bbb68d71fef1e543b4d14a3684804f8b4b8e4a5123c8acc46fd813048320ab50f245475a";
   sha512.doc = "cef9694f4e984ee077902852143e2c88bb533739c6b53c010eae74c32b486faf7806010beecee49bfce07d5f35270bd312852f6d5701860073854a5fec949125";
   hasRunfiles = true;
 };
 "crossword" = {
+  revision = 32657;
   stripPrefix = 0;
   sha512.run = "e55390ea7eb83686bc49e1f33fd4df2e7b977e031fa6d42e3d18d2cb5b9f34905aa4c43f173ad6745e98683376eb5ad4fae1a8344355b272f0b4b8096b1521ce";
   sha512.doc = "121e26265895e99dd00dc84ef8b1ba9f4b6917ccbfafa6a35d1f6b81b42c70153bed17790eb6e2d4a5a4fcd8c5cf2e03f5b6e458a2b125a2b7a0f0292bb24947";
@@ -9669,6 +10505,7 @@ tl: { # no indentation
   version = "1.9";
 };
 "crosswrd" = {
+  revision = 16896;
   stripPrefix = 0;
   sha512.run = "889334e046aa6371df566c814faa98fdf4931c85be3d49e04d932f02bb71bffaa929614398469be04bf6426ec05ccbfcdbe0ad9798017f9504fba5f3781521e6";
   sha512.doc = "0d4d1e8c1577ee23f7fc60ab8c106121978e986945b8dd399faef4ca55e60a7ed3ba65220ef56ad11b7a100690f89692f0c1ad80c845e2aa04d81c8664a6cd27";
@@ -9677,6 +10514,7 @@ tl: { # no indentation
   version = "3.0";
 };
 "cryptocode" = {
+  revision = 49131;
   stripPrefix = 0;
   sha512.run = "b15b76169656d91a366e17fc832f0b661e0bd31e2d8f61e2431d3e7adab66b24c145c2e84e4c9f9aa8dfbe27655b37c657765e549e04f9de447c5c6cefe38480";
   sha512.doc = "0245804ad3761368a634d7b062a02e5a073ed91499c3792f82670ea6ed18f6790f74d23e5ff4770c1c3af64b3a90d9f3d59ebe88828496ae19fb517dfca1e0f4";
@@ -9684,18 +10522,21 @@ tl: { # no indentation
   version = "0.3.0";
 };
 "cryst" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "49e1c9d0cb6909e421446230bf71123fa71b4aad1d90b1c7614fc465651f701d91f576c2edd8b6840d1c78dfa5557cd604e61a5e745e1ccb2f60bde9e66117ed";
   sha512.doc = "55c765a9a4799f719383473700a0ef5627ec8873fc9fbd4ffd191d205d24b29d57255d90687176789240a3c4a547a3a57ed341a0558d99aa01dbcff0fc7dffc1";
   hasRunfiles = true;
 };
 "cs" = {
+  revision = 41553;
   stripPrefix = 0;
   deps."cmexb" = tl."cmexb";
   sha512.run = "bc956c595d4460f35c64c92e7730a7cc9cd3af95301afba56c49bcf8415666863de926733409ce1afd99ba767fe3a3fa45c68f2dcc912b69c6f72b618289fb30";
   hasRunfiles = true;
 };
 "csbulletin" = {
+  revision = 49681;
   stripPrefix = 0;
   sha512.run = "730ca61f0678ab2dfe4aca6be57b64cf6944ec018a7154f25c565687c29cc746b9cbd508ea01600a1d17f31850dd2bd047ebd47788997cd244e8f74199a96d68";
   sha512.doc = "b9581a3d257647ddbdb583c5327e1e6dbbb52c8bc3153e115dcbcc6047fc2146ee0b62271727826f608d70f9d1a1b25e844c6f772c12ce6b8c38e1cf32015303";
@@ -9703,6 +10544,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "cslatex" = {
+  revision = 53786;
   deps."latex" = tl."latex";
   deps."cm" = tl."cm";
   deps."csplain" = tl."csplain";
@@ -9717,6 +10559,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "csplain" = {
+  revision = 53766;
   deps."tex" = tl."tex";
   deps."cm" = tl."cm";
   deps."cs" = tl."cs";
@@ -9730,6 +10573,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "csquotes" = {
+  revision = 53041;
   stripPrefix = 0;
   deps."etoolbox" = tl."etoolbox";
   sha512.run = "541cefb84ffcb6a398c18d01cab5d7c96bfaa82841b9439c1f77f3b2b4904e0a37fe2e2b355777e4552fdff3ebb054daae9d9d9a6c7436746f44917095be119c";
@@ -9738,12 +10582,14 @@ tl: { # no indentation
   version = "5.2j";
 };
 "csquotes-de" = {
+  revision = 23371;
   stripPrefix = 0;
   sha512.run = "7d4667b77f1e27acb1d3c8becaad4889910edaab4b9da6b0fe821db262f3a31672050f5985a56533003178fbf1d579d170be3fcd22c31bbf41af9bcb68fb7c40";
   sha512.doc = "1e8829faf2cb23b2e565a4b5daa5a09ef01d590d920444ee4659964bee042148ea19e9fbcb63e4c4ea1e2698697554e0bc532fa0fb7610bbf9bb4bca234d33d5";
   version = "1.01";
 };
 "css-colors" = {
+  revision = 43961;
   stripPrefix = 0;
   sha512.run = "b5e000180b583470bc6721601321f81a2f11e70388f05fd85a482b491e1d3ea536db0fbb96a6715fcca81e5bcbaf289af9540c82a2201befac1d2254fbc4cfb0";
   sha512.doc = "d08c0212f4c36eb114b25128ac8516cb7181ac73a2ea61ee4ed1eafdfa7fed15a2b928d6d0f63bdbf2b4beb93a843fc8dd16b959297a4fccff89c428647f4ddd";
@@ -9751,11 +10597,13 @@ tl: { # no indentation
   version = "1.02";
 };
 "cstex" = {
+  revision = 53767;
   stripPrefix = 0;
   sha512.run = "4694b738593a72d14822afb5fdfcf6b26ed6aba7368f5957bac357aae822fc85c3e8a4f2a6faf58bd03ae77601034ad86cf9ec67e9d946dcc4c859edd42bc20a";
   sha512.doc = "a1bc7ce21066c16897e6874e6ebccbee21d111e1f16e33fda07231e80b06fa537e98970789ae6e7f4c51a1135c995f3b971b6078872595dc954b0cf70a0557dd";
 };
 "cstypo" = {
+  revision = 41986;
   stripPrefix = 0;
   sha512.run = "ecc9054a0866e4926277bf5f52faf97b0b07f0ea660b7c4d089a552ab57d3a900cd1d688981770df9b3a4285c3d451fb23f1b69757381f3cbdf88cf0c88cf61c";
   sha512.doc = "1ac42bcd1cadde9165f8edceadb438c4c2e91d6a89486e56e31623cf1ffdd5f38ec800d836dc90a5a6a0bc48dfac4a8ec90192319f8f046665c77e91fc51b91d";
@@ -9763,6 +10611,7 @@ tl: { # no indentation
   version = "0.03";
 };
 "csvmerge" = {
+  revision = 51857;
   stripPrefix = 0;
   sha512.run = "f3f679127d912a8df32893f0afec13b21a272b6e5ed2d2c147e1bcbea5698e043d88d5dcadc0c772f5640945fdbbf4ff43655d6d4450b48966740cd3cb936829";
   sha512.doc = "b090bd51f547f16270534c2305ba68af9f86800f55809b050eea25d5566be3a3ce245ad0f79a76ed21ac64b68b6650800fba5a5ad942cc1f3f8e982f56ba5286";
@@ -9771,6 +10620,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "csvsimple" = {
+  revision = 51010;
   stripPrefix = 0;
   sha512.run = "c071fb93d269e27c7059919213a858d82bb5fc381d8a9a0faf82ad0b05eaac808dbfc19c30c8530a98582f3179a01774de78b0f290a15d4ef79e06eef0a9aba8";
   sha512.doc = "da691d9d44e1624ccab48e5979ae9ecb8697387a19280602c28467c8f2aefbafc494067217836a09a6ba1a653c8fd3a7903e3607ca56922ebf47870bea49c583";
@@ -9778,6 +10628,7 @@ tl: { # no indentation
   version = "1.21";
 };
 "ctable" = {
+  revision = 38672;
   stripPrefix = 0;
   sha512.run = "3192df463eb4d307ba886b82d586580a741da8d901dc560c06d293e04c5d5af9efff56a1482bc41b03aeaade2cc25cdf6f4dda3e1baa26da1f7d4d138f44bebc";
   sha512.doc = "a32bc9c82a87f1f9327d5cbf4c15052124608f970ecda1909aa67abcc2fb4f10bdfcbb5568d8af9332687817f6f5bd6aaa0ce4843490e8ffac22526bbe123fdd";
@@ -9786,6 +10637,7 @@ tl: { # no indentation
   version = "1.31";
 };
 "ctablestack" = {
+  revision = 38514;
   stripPrefix = 0;
   sha512.run = "3485fbd1bebf80814645c1be3e7358a959637439fa17cbbf7c2478ca73c4312cab82eed2aedb5403dfe94b0cfc09ee3e9c8182c08d3708608a267da235ab30a0";
   sha512.doc = "2c74b9d2aa44b25952307e4593b4a792cb5d98b78619efef82ddfb134ee3da64de87973db30f3e5d5788ce5e6ef138fca2cabc4ed412c97cfa7b3dc6c3ed1060";
@@ -9794,36 +10646,42 @@ tl: { # no indentation
   version = "1.0";
 };
 "ctan-o-mat" = {
+  revision = 51578;
   sha512.run = "a995dfc6d79ba77fe673aa501f28eaf9f057c34501fa032423569317e5a4eed048c3375d806eafacedefec02e91bcb587fa6bfb8c0ff980395bb877b2ce88c4c";
   sha512.doc = "423efc3f2f850c5a9bcbe787edb8155ef76e56ce5e3a1ba3332bb465b8239616bd1fcff2e8a58db6f5ce9d5191ae3209a5451f746250a3b081fe9b35d024eebd";
   hasRunfiles = true;
   version = "1.2";
 };
 "ctan_chk" = {
+  revision = 36304;
   stripPrefix = 0;
   sha512.run = "6eabd7281d79ff0ad19080350dfcca8ee3a33ddfa6d17827a7851cc53f09f627729c8d715a1dfe50e0c079add44331a07d543cb8b6a57000efa6d73c30f2ffe0";
   sha512.doc = "c61bc0d70cadcc4382dae55cdc1af076882801321a2de16f164223267732e476e41f949f566808c928f446d69aa22bd9965adb155c97905e32b93808810c76c0";
   version = "1.0";
 };
 "ctanbib" = {
+  revision = 52145;
   sha512.run = "af03e3079304d24b7cf996158ce7344a15aa2f17efc46378132bedc5e9bb4488f89210c24a8a5ef0c21a293600589aef78b7a8c7a7673ad09ceab2077b0a351d";
   sha512.doc = "1a971e49827476b5ae419189f7acff4c17ab41159d60c5627663d435368b28aa7dc4aeeb5fcc2c4a9f34f648ac9f2de229b250660333ca2f32bfd0808f24e732";
   hasRunfiles = true;
   version = "0.1d";
 };
 "ctanify" = {
+  revision = 44129;
   sha512.run = "6774b151bb0fb052d41d8447c7e8d378d7f31b0a5aea5f2f00b93669b8c2f629f479ae21d40480fd62f468d866cbe0c6f0dedd8a0248f8d83cd1039131849439";
   sha512.doc = "f9b636cb41b126809d808c167410a37052b1c6c385fe4eb8df3b819c0cf2cac2c7c1c74d7ea15d2916c1cbc563e078845e451000e3a08cd9a8e0696a342b22ac";
   hasRunfiles = true;
   version = "1.9.1";
 };
 "ctanupload" = {
+  revision = 26313;
   sha512.run = "4464bdfbf72318b24abcd88e1c25dae5925a96e867c694f3f02a594ed7b8b24cffdcdb345f0054e200a6af63f88b591ff84058af0adfb4a1b3feff2a057d9d72";
   sha512.doc = "9e027f7ce08041be7668a7a404fad6b6c7cfc71e581ad1216956d0b53c379d204bd84d2d55d186c74f784df8911770b96f934775f44f7141a5f1b9b5e773cb7a";
   hasRunfiles = true;
   version = "1.2c";
 };
 "ctex" = {
+  revision = 52683;
   stripPrefix = 0;
   deps."ttfutils" = tl."ttfutils";
   deps."ms" = tl."ms";
@@ -9836,11 +10694,13 @@ tl: { # no indentation
   version = "2.4.16";
 };
 "ctex-faq" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "39ff8931e0007a78e4fa0788d7c7fcd8f25dd4cf4fa3f34b694e681e10dfb3d804842daf45a6e56b5ff450bb965bc322dcf593bdce176ffec27f4696c1c99fc0";
   sha512.doc = "0942a249a30f97d56bf5cbac2eb4de285a63406620b825a36d9ff8d46fbccd614af488f89e2af7472f1a9075a0e2b7228bb65a5804451df6945ce6bf4287b0a2";
 };
 "ctib" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "8999ea42b82e56cbb06e2485060b829a0781550834ea421607b4621199692976488f4031266eee1a6b1443b12828e2fb5148ff43eff137c01ee9db8770bb1565";
   sha512.doc = "65d8f613ddb651cef4c345791a4a849e3f672930fb94d1ba789e827b466c459bc321762c71675cb4c5fdec8fc456520bb7013d5b737b4ff2bd049bb5917a98ef";
@@ -9848,12 +10708,14 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "ctie" = {
+  revision = 50602;
   deps."kpathsea" = tl."kpathsea";
   sha512.run = "05fd794d4437c662b77b0662dd0c9169aef35a10140abad2519702577c087177d0a02ee5b6163873fe5b3c83c3f77c342c4774af168ebca2ed875717c7d0c5b0";
   sha512.doc = "83bb53248ce262bc8310faa8c0e057dac72c7c682e295fb9888acff237249a66a69d66b99d79033f5a1d8611ef582dd2121f8c28be9800ebcce775bf3adecf63";
   version = "1.1";
 };
 "cuisine" = {
+  revision = 34453;
   stripPrefix = 0;
   sha512.run = "cb594c2ef79a1d1614ad2b7bedff3b5bd9853bf36947751c880c36c73a458152eb7036861d0292614992623192841c28a3f4010bc0c4107fd8a4277154a1baf5";
   sha512.doc = "9e4f55bf8199b4bd06847dd39e67e91a8a6885b3903c9ea772199d9b9fd9d7cade173dff6f785d143b4e7c3b154477622a4c2cad14576b22068a6729693a8227";
@@ -9862,12 +10724,14 @@ tl: { # no indentation
   version = "0.7";
 };
 "cuprum" = {
+  revision = 49909;
   stripPrefix = 0;
   sha512.run = "578ce2e5af01e81ba80c0cfcc0225985722c1515e8f98460a1cb5d71d8ee4630d400f28dee04bb505c429b13f5cb604364d26503af0b5d9bf98164b218b09413";
   sha512.doc = "b9a9bda8eab6087a134b3b0660282998c7c3fa7fda8890e61ba107b9f7576d85ca01b59664c1c198679151e01cef6ebce5b8de29644a2e249a6ca2100f526fe2";
   hasRunfiles = true;
 };
 "currency" = {
+  revision = 48990;
   stripPrefix = 0;
   sha512.run = "d975cbe846ad5708a3558252094f4568c3ea4c5bc840dea7ade74eb8f6d90f4527b417a875a7bc286010473078d895cf510560f1287013e70498c983c896750b";
   sha512.doc = "1f32fed0bf778b3460e094239afd76b4be9915be8a3e8ea20b7e48b02f1ffdcffdd1e588a507b8145ed232a38cee43db1bac0e232c472d5b5dd85f1cf3954c8c";
@@ -9876,6 +10740,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "currfile" = {
+  revision = 40725;
   stripPrefix = 0;
   sha512.run = "5e67b659df7048a2f3e0d99f7e7da753fcabc4cc94d284d88b6b6922dffe2823eff3c07e96d0d4689d2c430a1cd66ef4693d0ceb344609c6aeeb919aa378a297";
   sha512.doc = "d45abaaab826dd9dc8a7d5cccdeece29b26d8f56c0c74c2047f5ae7d43ffc3c0596f009536fca744fa9bede2e8d87a13b68b8ebf4a0ced31afc6bbab5b76ad72";
@@ -9884,6 +10749,7 @@ tl: { # no indentation
   version = "0.7c";
 };
 "currvita" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "c555b0e9c7a500e086f0435a2dc6cde8da8b02df4d27be14534d28c77c1f546aafecb863bc652922e07191d0441a77db647f8d1d11e33ec9bc6014f73a5822c2";
   sha512.doc = "b3de1ad371cead2829225015d60a4defe604e63890ef06da65fa9223cce4e748707f0b6f4f0b0dcdf22c3096e381adc3432a7b21b36f834c18ae4eb32bfba024";
@@ -9891,11 +10757,13 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "cursolatex" = {
+  revision = 24139;
   stripPrefix = 0;
   sha512.run = "6c58f5a0f6fb8f129e202b786c258ba088efa44639f162b9e0109182072c16bfc6ba928953d6e9b31b2b1c2f693fe064476095c232dcb9e0c6bfcf18bfb7994e";
   sha512.doc = "a0f726330a5b2d8da94cbf25fb1b1a2b22e5e9010e0cafdfdee3781bf518f0cb48adb27dce0fe2e46572460f8c1749c0db1c16e06343cabb8cb94227e3da58b6";
 };
 "curve" = {
+  revision = 20745;
   stripPrefix = 0;
   sha512.run = "9d318d35ef04d171da1c36ab4646465d4aa0feebd90fd3e97db5f1cf09c28c174d0c3be288c369215812f51ca83b341abbfdf3fa44458d1994cf68dfaeef0615";
   sha512.doc = "7a56d7c3bd8b9b13ee675b99a2f5a8a27fb3dfd81dc5225f3a880f338d5390c893ca887cbbcd9ad8deae2a1d6b6620ef664ea64384f93fd93a75a5c886641a2d";
@@ -9904,6 +10772,7 @@ tl: { # no indentation
   version = "1.16";
 };
 "curve2e" = {
+  revision = 53960;
   stripPrefix = 0;
   sha512.run = "fbb2481e0baf08b163b016f494a05dcfea0b28fc458e502f69af12a264059717687ddbea1c8b4395246c18c731969b5f1ba48b3f20e37a1248952b2faf33134c";
   sha512.doc = "5ec0e0fb849540f819090dc0c9488167553d44452975d218ce4b25359b89f8ceb78504539d522c3a281afbdd3dc44903bb89837b1b73bcc8a31d597d95da8efb";
@@ -9912,6 +10781,7 @@ tl: { # no indentation
   version = "2.2.3";
 };
 "curves" = {
+  revision = 45255;
   stripPrefix = 0;
   sha512.run = "b2ac96620bdcae2263e0ff37ef0975fc705efd2ec30fa53a5cc50d54378cb29c6ef44543cc321e6cb37dfca0ea9a6cdf85777825703b866bcbad9729235c9722";
   sha512.doc = "afd68373952dbf2a97944bcd7b36dcb62d5b65727c660af56dd8da97137ef4845037988e211996289fb54efa435833fa4a503ae4bba70ab38cd6e55f1966db1e";
@@ -9920,6 +10790,7 @@ tl: { # no indentation
   version = "1.55";
 };
 "custom-bib" = {
+  revision = 24729;
   stripPrefix = 0;
   sha512.run = "95b485e330c97242bbea4b989ea9e70882d796f7ff8fdbb10b0627d102ef6177c8cdfca976a89853170a9171a69499c58711d1deeb0e420f9cb268e336d4f663";
   sha512.doc = "3d5fe696f095ef5661418e3066f2f98768968eddbeb24ce9ec84647b78452f97482ae1dd17cd9c84cfb81fc4a43052b05ef6aa4080e32a464d2ba4e8ce33869b";
@@ -9928,6 +10799,7 @@ tl: { # no indentation
   version = "4.33";
 };
 "cutwin" = {
+  revision = 29803;
   stripPrefix = 0;
   sha512.run = "484c995cd3b18f723899fc04e3af7b49bc7ac90a02448c4b49643b8ebe09c445bab122bc2ca0f2cab872323438fb02af3e5a053977ae8ff6146cb4af96f08ba1";
   sha512.doc = "89b4fb68d949b86eb3b5d90f7d8c828e10df591cf734f5e6908a221aa9e2d50820841e6095dc912619d4461c37b735907504e63fffbfd95c3371602144f87429";
@@ -9936,12 +10808,14 @@ tl: { # no indentation
   version = "0.1";
 };
 "cv" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "624d9bd1578e0d2e40e2ca76cd97d7f44d9da5c71daf737e06e6b6b15c64911af17f0da197afa17b5ff3b145461cf7efb058a5cbcd02e7c21642e660cfa3ca4d";
   sha512.doc = "c04b207a635f1b6f76e316284da987b45fd4387961c59b7b1f1b947284937f91f4d95ade824195d1f0db00766fec870e6859a6dd27cf3b6b426d095866f17d6a";
   hasRunfiles = true;
 };
 "cv4tw" = {
+  revision = 34577;
   stripPrefix = 0;
   sha512.run = "607745abedd1325c59bc8ae360a1c5d00834ec7bd050b057ba5427c135f17046027da3fb6130a0718e8d33bcab74eaf235f2de7a1ace483da1af87be5e559867";
   sha512.doc = "d9166421ab15d7569a4db66970486c78af43ddbda9d7f9c9488dbc46eed91ab5079c0f9b7851835afeed6045ee4c65c888e1be93a95cda14623405847267880b";
@@ -9949,23 +10823,27 @@ tl: { # no indentation
   version = "0.2";
 };
 "cweb" = {
+  revision = 52901;
   sha512.run = "3fa0a2d9d5e4647fee550b0da0449619e22198866e6ecf47956a99c5d8d8081a09c63f1644f4b37788aa91c411df567776589aa61244fb6e0da3ac72314d2b3f";
   sha512.doc = "f685b045d0253a1dfcbb81d80aa976553c459ce13b7049ee05f792646906a83976c71570b0d7b995dc9d7928558a7ded210b8fb1cb0fcf79508af731161fee22";
   hasRunfiles = true;
   version = "3.64c";
 };
 "cweb-latex" = {
+  revision = 28878;
   stripPrefix = 0;
   sha512.run = "5d94dd53bf3212967ae38c094115c4ae581ec15a49e3d0f64be311cd1aa190eb9efdfec2cd83bbc3bd89250efef9470a6a6af342247fb9670992546a976a5886";
   sha512.doc = "16c8cd2681e216084564cec718401b9e8d98228e6597d38c42f8ef4cc4775e8e606fa11c84d21f0450d85ee18c7ed1e5fd9e1f54bcd0e8c2927b1147ecd4591b";
   hasRunfiles = true;
 };
 "cweb-old" = {
+  revision = 49271;
   stripPrefix = 0;
   sha512.run = "efb1c9b65f7c628905d2dac1373da96346b6b6c78f15e8c0c8055e86c1a52b09bdb5f78fb06106e350d10a8daa378eb45f5fe788c6c3d8b23f0b47c3db6f256a";
   hasRunfiles = true;
 };
 "cyber" = {
+  revision = 46776;
   stripPrefix = 0;
   sha512.run = "f79e9ce92036c8a106de0a5da06f5c2b833683527f1225f5b69298b6d886cb967f9d1eb459b7a0543d89b0943a8425dc802619fadb9d69aa4f57a5ccc71a593b";
   sha512.doc = "4dfc2289e92552dde5cd1703e5644e6a19f4281dd16cb80d86caa35cfbc07eaf0f5cd57686e185adafce3883433fc87b1fcb590cd65087571115dd4b98023d02";
@@ -9974,6 +10852,7 @@ tl: { # no indentation
   version = "2.2";
 };
 "cybercic" = {
+  revision = 37659;
   stripPrefix = 0;
   sha512.run = "f3bfbece973cb3b9a3077c160b0212561056cbf7733e1c011b39fa1dbf94395937f4858964acd0874f1cd3ba283df9797cdf19e8e71e7363a7619c5ae653881c";
   sha512.doc = "dc72453f55c6a72913865f584b026baf287a35885548ee5c2c8d29cefd60595f4aa9f7c456f59ebf3ed3e3b72711beaf90cf85f24c2ce6773146fd2a4724767f";
@@ -9982,6 +10861,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "cyklop" = {
+  revision = 18651;
   stripPrefix = 0;
   sha512.run = "dd6584831fae3eb388f66e42f289f9bdeff401412c7df471752c4aa56bc67c16c56f6f271d11c289a1389faae138ac15abc41bb716bf344bc2f49fa087ecd380";
   sha512.doc = "4d81a01eea30a4f86b2f0a7c9c21923196dbd28c7d5ba5c1639068318ef227720550b3052cf0ead6f3194450d50dce9acaa325a0dace0e6fd230e0ed11d9b106";
@@ -9989,6 +10869,7 @@ tl: { # no indentation
   version = "0.915";
 };
 "cyrillic" = {
+  revision = 47350;
   stripPrefix = 0;
   deps."cyrillic-bin" = tl."cyrillic-bin";
   sha512.run = "447f8628641df193b258559435567e5e7f912de6a87688e68676ab683512f09661b2098707fa6ff9544972bdf3a58d81caf946811d3ff8516782062b1a10545c";
@@ -9997,16 +10878,19 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "cyrillic-bin" = {
+  revision = 53559;
   sha512.run = "cb6d1ed18b1e8cf24d0856fc8a8fe8b2e4c2e5889e68521440386c0fcde8226367242c8adee9d4f127cadaa3f4a4ca2693ee501810d243d426fc8a395a49e3a9";
   sha512.doc = "e8f1aa0313026995668e491f63171c57841c79187435b8b7ad9e807d2c7b40970b2ec1b14181d6122231b7557fb66c39dca0eec0a877735380d152482865feec";
   hasRunfiles = true;
 };
 "cyrplain" = {
+  revision = 45692;
   stripPrefix = 0;
   sha512.run = "84651aeb63d3e47f208732f3c0d54ba86862d0ff7da7c56b3d8b8d1b49b6b88ed4c5f9abfb4c1c9d8a1ef8a455632aaa69408651e238bdc4aeb4eb7709f62096";
   hasRunfiles = true;
 };
 "dad" = {
+  revision = 47027;
   stripPrefix = 0;
   sha512.run = "3a4a039e8407ea7b8ebb9b2fa500a634930161f6e824e0d090fb00c233cc29bc110e5fd802ee11768569612df1c18cd03137ea086dab86e19bd3cb54dc806045";
   sha512.doc = "5715bb8219f9800a89c660b2dc581b5be7fd86d9dc085417f3d8e3342dba2f27c16952d9427af64212d6e60359be551b8ddf4eb01f89be93a9c714024c82eeb8";
@@ -10014,11 +10898,13 @@ tl: { # no indentation
   version = "1.2";
 };
 "dancers" = {
+  revision = 13293;
   stripPrefix = 0;
   sha512.run = "f570e4c775a7e4cdbeaf2ad764ee147a685b5332369aea29175a76fdc9fb37f052da295d20a177eda8e4b8352d733034eba36882c2507fe804d7b996c0e0537a";
   hasRunfiles = true;
 };
 "dantelogo" = {
+  revision = 38599;
   stripPrefix = 0;
   sha512.run = "883c5d6f8368bed41002eae123329954fe38cc23a5e6db7feecd57c16540b6b9277cf7d13af6ce8f63994c11148708e1d3dd10ddd9d17457b015d40477f91eac";
   sha512.doc = "4612de774c6a39c7f09dfc99aa182fd37d9f3e32dece37726f1e87e48e5faae246f2959992267f5b2cb685c26177e47c5112fbe42b8f1ac3a60da92e6276a681";
@@ -10026,6 +10912,7 @@ tl: { # no indentation
   version = "0.03";
 };
 "dashbox" = {
+  revision = 23425;
   stripPrefix = 0;
   sha512.run = "a52bac248fa26031db34686e57cd3c9be90bc18b41339d7e2dc85a68de1de23a627648599e5fdb207d3364b2b4e3651aaf9c2d90e6c3bd0f0fdcaa30fbc8932d";
   sha512.doc = "26672278ffdbdaee64b82f4e7554b5664ca3410ce8009454cfc229e3590439b4a4e212b77568605adda885761f5ad456bca022f198e259ff9a33b8e0abc1ea6d";
@@ -10034,6 +10921,7 @@ tl: { # no indentation
   version = "1.14";
 };
 "dashrule" = {
+  revision = 29579;
   stripPrefix = 0;
   sha512.run = "4b1b993e9044eb2ed4bf6bde0c114b0cd1fe7daed38f8bc5d3e25a2705d55cb41b8a372cce84b0d61093044d970003a4317de98cb468978c8cb1a8315f980940";
   sha512.doc = "f45e0785d7c6522683e724ca27f7505e3da6bf5923d5a8c71a75ef8c67ffba8a4e4711b91b64f25dca95566448cbf74b5937dcecc73f5ec0aeff7ace8d0e4c1f";
@@ -10042,6 +10930,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "dashundergaps" = {
+  revision = 53756;
   stripPrefix = 0;
   sha512.run = "f42cdc5eee0b48aa8c6873febc6baa7a7c1251c630098850736bb321e4cd80d8300c35b9dea45cbc044366e2e522c1ba52eaa23fa64d5f469a3eb68a1616c444";
   sha512.doc = "4748b63855824fa4f7ec86a9f20d8004f546389e17d2dfe8fc6c8cb910be696ea6ecd20a0ba90569c450137e51bf3c193cd45c4c24161bae41290e6c644489eb";
@@ -10050,6 +10939,7 @@ tl: { # no indentation
   version = "2.0g";
 };
 "dataref" = {
+  revision = 42883;
   stripPrefix = 0;
   sha512.run = "8b76861673fe05785582abbfb50d46ee6beea2cd63bd7f622e2640acce9c88a39e4fbf57b6db7872dc3f3b473d3e33581bb6c93f305e036148efb1c3ad4b6d8f";
   sha512.doc = "2d1bb12245c071b8282db3d0aaf198206fe2b8509527ef6e56950464b6f13d20be8381015fa62a1b0c7469e004664182170ba400c7650b38bc597e269f1d173d";
@@ -10057,6 +10947,7 @@ tl: { # no indentation
   version = "0.6";
 };
 "datatool" = {
+  revision = 52663;
   stripPrefix = 0;
   deps."fp" = tl."fp";
   deps."substr" = tl."substr";
@@ -10069,6 +10960,7 @@ tl: { # no indentation
   version = "2.32";
 };
 "dateiliste" = {
+  revision = 27974;
   stripPrefix = 0;
   sha512.run = "6da6a802994a06e040d43ac7fc9db0515d9273ba9d4cac061e04b05922f9eb9fecaf138eb641b3149be7b98f9139c428084b6470bc177a020386e0dc053427b6";
   sha512.doc = "53ca32cabd7e3a32d02c77beb076b08ccaa782b6a2ae249b932242987741f0e255bdc83a2b6ccc7ed2e0efbec66923798026040745152f7244984a0843c8c23d";
@@ -10077,6 +10969,7 @@ tl: { # no indentation
   version = "0.6";
 };
 "datenumber" = {
+  revision = 18951;
   stripPrefix = 0;
   sha512.run = "f87518683c9820e816f33e535bc8e5d7e31fcda124178593f9635b040151d1f43f6eeb4d69ca974b847c97efcf19fa94f571d5534dfdc8ac0e40d711d26190b3";
   sha512.doc = "b9c156b19bd6abbb3f996495dcda633172f8e559add744ebe25bb58070ba06bc233c2dda54c93415da14aecc30d2888241bf9b80c0dc5922b46cd3ee05865701";
@@ -10085,6 +10978,7 @@ tl: { # no indentation
   version = "0.02";
 };
 "datetime" = {
+  revision = 36650;
   stripPrefix = 0;
   sha512.run = "3d033ee164d52f7085bffdc12f2062be7e94a644d9ed731b4d1b97a3a46838dabadcf6687063e165c65fc938a51a4adf8078339b720a305175d6cd6a3b889f07";
   sha512.doc = "510449d17b09d9207b76e732b5d426121888cf653f29bb3be8872b74a243596ac339f09d11a14a4a3007f8818171aab28727cd1713ee35c8908d2d168a57d9b0";
@@ -10093,6 +10987,7 @@ tl: { # no indentation
   version = "2.60";
 };
 "datetime2" = {
+  revision = 52846;
   stripPrefix = 0;
   sha512.run = "ba5a5b194f60ed3cdb7494d8b6eae89027a89e32188972475fd9fd43423e19a106d88a64a5b8484dc9bfd6d2fe7d03d01edf1391c9375d9e7647ed6d1e16a790";
   sha512.doc = "e96d7b74d9f2ee18e50b98c82c58da425e7007939d3dbeb21035bf03d2e40e9d9525f695081dfa03c84660f3e2f88c19f79778e7d57bda5285535e98e9d99bfa";
@@ -10101,6 +10996,7 @@ tl: { # no indentation
   version = "1.5.5";
 };
 "datetime2-bahasai" = {
+  revision = 46287;
   stripPrefix = 0;
   sha512.run = "6bc05fa0f1cfbf05008de715f9b278948272cf7894e8c29b52b6ee4ba436e01e5588356fa020fd5453ed2e9bee185cb46c54ee3e808417782587c9509bab17fc";
   sha512.doc = "d9542fe7057b9972c6e0b9ebc1360c2fde8f9b3538e70efd7249f0bb344f2d5c2845acac9ce39fec6f9f7197b47e65496ffc662b9f3a3044829e4709d6202995";
@@ -10109,6 +11005,7 @@ tl: { # no indentation
   version = "1.01";
 };
 "datetime2-basque" = {
+  revision = 47064;
   stripPrefix = 0;
   sha512.run = "73d7dcb4a2d13d4ad4747d4d2a19b839bd9a1bd55793657315832178091357f61d9b748d5aaefd317baa7f52df2a4926dad6196d11d11cbce0df78168b2ad380";
   sha512.doc = "ce083f982f95f5e4beb33a706144d26f6f09de8ede946ac89d28ad5e5c75f9a475e4e9bca5fbc7773ee90a91ca095f0b1a9908fc0f74fcbb4117ec7511d603b2";
@@ -10117,6 +11014,7 @@ tl: { # no indentation
   version = "1.2a";
 };
 "datetime2-breton" = {
+  revision = 52647;
   stripPrefix = 0;
   sha512.run = "725766f3227119012a79807c5909daab83e8056718cc4e116d8992d13e11867439d71392cdd8a2118f2d8ead61b1d36af5ae42438f8ca68f26ea14f0bb7cd0c7";
   sha512.doc = "f421a467caa9202ec50678d398e31e1c4cbb4e98805bf86114c97fd49479670e825c1c091955a41056adf0f9c7596dbf5dd14397326c1b88fbc2b6f75ec8ec55";
@@ -10125,6 +11023,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "datetime2-bulgarian" = {
+  revision = 47031;
   stripPrefix = 0;
   sha512.run = "fe0cf5eb73c5253467a8d2b972cc20825b5179ccd3964f64656ee8f4fa5d7fb7bf1660a7e79d58c491fe74e8c9421b75c177d4c8bf7309782c81ddeb69ff1203";
   sha512.doc = "f07df79af157b8ed471f5c8021719d8ac4dea9075885cc42ed0d64405692efc5ea59b6a77448225aee477b8fb05d564ce9155b7e1efb3d9cd7b7baa794783cb7";
@@ -10133,6 +11032,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "datetime2-catalan" = {
+  revision = 47032;
   stripPrefix = 0;
   sha512.run = "7a414761760e3fb61ed12c656a88b6ae4d36b8268998f10ffc85a9cd362a6ee60b73b37c0994aa47603e805d785a3a0faa7266efa46c3e017535b864f2282e5d";
   sha512.doc = "d1613bf5d8a35f69bf3dde127a764434b8527f0e627cecbdda43490642cb8d0a10ae629bf5f1359b7a87c12b3845bd468fb2c00b508be1d2cd80b6ad98904ebe";
@@ -10141,6 +11041,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "datetime2-croatian" = {
+  revision = 36682;
   stripPrefix = 0;
   sha512.run = "603052fb5cff6ea8fa5b951623efb1fc72aa6583fa1ed560b4c5266ce96cdd209423773ee0d3a592465247343f3fff966d7a9cd9698e02e339d5a1c579591f37";
   sha512.doc = "a56060b84fc6d2917fd0cf160f0405104a3413e02456ce91cbd97aebd746b0e91c730d2e2e4bbbb46f39521b5c6cbc45558bb4327c7260719ce21e8226fe5910";
@@ -10149,6 +11050,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "datetime2-czech" = {
+  revision = 47033;
   stripPrefix = 0;
   sha512.run = "048ffe6258ce1d4bf9d098e7623d3c5e25ef8215a538e33806c4d35d6368fda81941ff9adbb394085c9b4f058fe9a3b02cbeeaae8cb1f7b2bb55aaa35c743d61";
   sha512.doc = "976e98000a80e15a4ea5204f15a5288781ab35089bcd9427b62fb445f28a25ba0c03af4e64a3de688a51c5c94788732fa199705a68de3e9925f1db4ec7dcead7";
@@ -10157,6 +11059,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "datetime2-danish" = {
+  revision = 47034;
   stripPrefix = 0;
   sha512.run = "b9e5b442282fcebfc114a772af8317d8888cdf24cd5cafebd5d3c79e3ea8790a4fd082c2facc1a466e7e5b4266b0d93ea5fb6cae64f96f3d131fd4869a465a4c";
   sha512.doc = "1d933d9d48ad6ef3dd0716fce0b2da6de6700bcd8c1d729d8216145dc5f243ea83323b0fefb6adeaf10a9fb264343e1b429044aaf86e6a77a121b0c951c2c77a";
@@ -10165,6 +11068,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "datetime2-dutch" = {
+  revision = 47355;
   stripPrefix = 0;
   sha512.run = "c14fcbb882183095c60f0e881ad1668f90855b90cce352922a562371bf2cdd556bd196ec85068775b9aec590f098c956c784b98da283ee1117bec68ee585f5fa";
   sha512.doc = "e5f2fe126eaf87ef34dce686db6e9b9c3c322a2266293517e803435dfa67b55da6a771f6c7253203dcae0dd1237096093a6463f6bbbc096c108b73bac4a641d8";
@@ -10173,6 +11077,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "datetime2-en-fulltext" = {
+  revision = 36705;
   stripPrefix = 0;
   sha512.run = "19f08e264921b8b12def2b20bb1d904f90dae712bcbe579a9697d1f657f148ad8311c6d7a8621f336dc82518ec64438640b49776fdab62f302b0919cc7de8e4a";
   sha512.doc = "a6ed1e804d8229d735aaf1874458dda3206ecb5e648c35af82a1d3fe524e65aeb7669088dc4bd9fd83919263d59035fd539a8318a24b2bc2470f14670e28eced";
@@ -10181,6 +11086,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "datetime2-english" = {
+  revision = 52479;
   stripPrefix = 0;
   sha512.run = "2faf2dbcc9e49a9c30e5af599a26bb6925c6cb6831c1eb38bb58e08f50314cde1f3ebed343fc43ff50c6338a089caf90b8aaa53093f1284c583ba217c25cafa0";
   sha512.doc = "ff904eb3279062f6573aa0190bd2f7426a18f4b67564b9b10673a88c4583c580cb88b33ccbfc0c8a979b10f6d2379bd22ad8483f19b1c4baf3f66e06d2ec52f4";
@@ -10189,6 +11095,7 @@ tl: { # no indentation
   version = "1.05";
 };
 "datetime2-esperanto" = {
+  revision = 47356;
   stripPrefix = 0;
   sha512.run = "6406e5a6708c1c97da6e0f8460ba70d61c403875497c57008013a3d1a8a9100b344b3d7267ed869f777566aa403110e17d778e2a47b3970846324bf08e8ae046";
   sha512.doc = "c200c3f39ed756765876ca5655b99025a898719f9723a996bd4772974643e0421edd8d36a8eeb00d29dc75ae715fb55927e31f067b1159bbb1f4dd218de780a7";
@@ -10197,6 +11104,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "datetime2-estonian" = {
+  revision = 47565;
   stripPrefix = 0;
   sha512.run = "93e8ebc62b48da8f5c159822f53c35aaa2cbd2fb6bc701108cf6452db7eca3df39de3c1ba9b84136683d22d65a975dc138aace0a81960d1c9382309a4cee5f3f";
   sha512.doc = "268b873d870ff19a3151d4244b0329994e559ab61198ab3d76d830b1bdd6a05e8b5a7a7df2fd6eec8d57b9e28626f80af755b1866f4ee90eb0c7e94b85f3c087";
@@ -10205,6 +11113,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "datetime2-finnish" = {
+  revision = 47047;
   stripPrefix = 0;
   sha512.run = "45f971bd3711d1424b002f32e0535465658e50cd9abd9758faa3685aad6a6e74747e7b3cc840a38968ef49ecb91b3007ec678f63f0c0ad3b77ae0c39bdab2457";
   sha512.doc = "01470814a87a5c87bb54b17a763011872864aad8d1f78f82c2325defb7f135daf34aa2b721bb4cbe7ec80efcf839372de07c29245ecc477708fe60f3d501a258";
@@ -10213,6 +11122,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "datetime2-french" = {
+  revision = 43742;
   stripPrefix = 0;
   sha512.run = "90a5f2e7c7570c88cfd10ea78cab34affd0483916a867c425cee593a080dd41f85c1db9eee22f1c5d1b27899c0d8afbfae2169e0b4fbc5951f0580437f735a86";
   sha512.doc = "d86846e741d2c4f07efee33c1bb15b1de205d0ceb2f6c2c5930c3f224e350e53d3817b7ca96b47073ea8510389d2cb36b49f853812fd98c6a3d1b2484fb3a80d";
@@ -10221,6 +11131,7 @@ tl: { # no indentation
   version = "1.02";
 };
 "datetime2-galician" = {
+  revision = 47631;
   stripPrefix = 0;
   sha512.run = "050dd3e5db5aaae106804a315e679cdee0a4e9fc2d10481f21059c410a73492d6e41d9db070bbe5112377a4f1dbec3345bc5f87efba998130cb20e31a443bf34";
   sha512.doc = "881250aaf53eba33ee223e5d87f0d8d4081785ea723d5f2e605d04767aed63b2fd8a592eabddd4343c489f1abd809218c600aa5df2447b24bf0465e7a31c8ff5";
@@ -10229,6 +11140,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "datetime2-german" = {
+  revision = 53125;
   stripPrefix = 0;
   sha512.run = "a27345e07164419862e2aa50a46252ffa05ccc1f3aa36cf530544642faee34a7670cb2d9279245b657bd5cfb5f9282eb537a94acfe56017bd855948a0b0d1ae7";
   sha512.doc = "70c3d14708a87ea3e7f81ce3fa26420daa123f214a1bbdee17a8d1a33c437be51602a5857081ddc82998526e5424e4899dc795d1fc7462519ff35cfe8b63df9a";
@@ -10237,6 +11149,7 @@ tl: { # no indentation
   version = "3.0";
 };
 "datetime2-greek" = {
+  revision = 47533;
   stripPrefix = 0;
   sha512.run = "d067dc579e739c8ebfee602d667042c4727e73595fc199197d58d0c6caad4460401bc9d08965292b36811e38be5424c22d6dc4f49c4a9682da3ef34d46e35cdd";
   sha512.doc = "5025cf0113e24efaa2bc413da5d2c14c58ead82ceb07fedad299783c5e445a40295d54e0d5ef3a5937586c484ccaf80e40fcb95e5592266fc82e5e52966af6dd";
@@ -10245,6 +11158,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "datetime2-hebrew" = {
+  revision = 47534;
   stripPrefix = 0;
   sha512.run = "c9bfe10e1cda7e3890cd79fac15a8f629ece47971caa43229fe73236e80e1f476411aa4d05be61f7f03bc34324b114ccac2585b83cced2d38a28f279639523d1";
   sha512.doc = "636dd01321842cd0ae1c3a1ed8ef41e1704d720aeb830f03a93c921c4735c1913211a1d987a1b430e312c57440a11cf8cb80f4336b4770a13fddbd9d6a5c3cbe";
@@ -10253,6 +11167,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "datetime2-icelandic" = {
+  revision = 47501;
   stripPrefix = 0;
   sha512.run = "50b5b4a4dbe38b669929637c9b22517b960ac0eab3486705efbd92e57e50c7c3a7f46c0d2ab0048a1c382f052589f091724828e2139d8796408edb899cac2e50";
   sha512.doc = "148963ad2651a79371d8f218c763c90c96d28d18d84c2f57e76ad64b456418a44d15983fd1b1622e33c6ef256f6457b6b33090b7c57fd3c37b8dbc8a0754c09b";
@@ -10261,6 +11176,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "datetime2-irish" = {
+  revision = 47632;
   stripPrefix = 0;
   sha512.run = "8c1d54d5fc80b2f7dd8faabc31df20253c9ee48987c268ae685144b02acccb5c3ec6bdaaa5bc420e90ecf4ec7d421afc96d82aef1a76ec7e01fb8e5f81d0a036";
   sha512.doc = "692acb7c50c30e6790344b37e9fe3cb07f2a0e10b9d63b47c78df1b2d1bd1f8f186107acf4d75dabc14a99db57cb32810989bf7af817bfdd16fa694bfee5f17f";
@@ -10269,6 +11185,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "datetime2-it-fulltext" = {
+  revision = 38093;
   stripPrefix = 0;
   sha512.run = "389840e273ea5b9e8e8c66e77578d9908349589b11a599308acfde9ab8dd972ec855011fc4d3302ad2ae16dfad05812ae75d6eece275761587242099fa907d67";
   sha512.doc = "a5a56a912b1b618999cec4b37fccaefe6f1e00f3b84f6aff8dd6b9b3ffa1855d25e8af8b49d04112829d7cef82f21b757772876b75cfc910a4dd5c89920ce131";
@@ -10277,6 +11194,7 @@ tl: { # no indentation
   version = "1.6";
 };
 "datetime2-italian" = {
+  revision = 37146;
   stripPrefix = 0;
   sha512.run = "d099d05904e416d44e9a9ffb337b23e2c1f908dfddbb41cfd7629c4abaa7769c76f50ef687751224ab4ae94a0df4d1962adbad602ed3a7473566e16c5c4bea48";
   sha512.doc = "963759f5e07e01315b827d4c67364d9367d114a09d518154524ba4496aee69f1ef08acbdeb67522d3b350a6f8abf8bf571171d4c380bc3f093d59ea3207beea1";
@@ -10285,6 +11203,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "datetime2-latin" = {
+  revision = 47748;
   stripPrefix = 0;
   sha512.run = "25f4e92c72abe14db9340aae354e0f598aadf88ec109b6dbe6b48e12f55926f63fc80ca420ccbbbf8fcc8dac066520d69b653981ccdd41b2e8588d85d4f11a99";
   sha512.doc = "f683c8764e99edcd9d9a449eecd3f1e4a10a2803a20bff7be22568a69ee1b06c5d054d6664a051b0eef8cdac5bc2387175cb582d005e1af31a5be8bbac4a0de4";
@@ -10293,6 +11212,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "datetime2-lsorbian" = {
+  revision = 47749;
   stripPrefix = 0;
   sha512.run = "04fcebad65bee525697ba96cba9d66d6acfe9bc602b6cfb207103a2bfba0d3cbbef948d614930c1a2bc785a6ae2ad6c4e0b06db58d562681225d67b7a5f2f8a6";
   sha512.doc = "7bee606e0c48dcfa676835e3a313ec8c3b79f566fba6d6b65cb34c4f939e7a7df34d73e24f0f03d569e0f6a01cb244a90b9023e2846c597eb589e984ad9d1f18";
@@ -10301,6 +11221,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "datetime2-magyar" = {
+  revision = 48266;
   stripPrefix = 0;
   sha512.run = "4d3b27b0409d26431cc06a1ac83485b6d4d63b9bba30a862ac043cc27c25a77805d5c3aeff3a329e1348a32ca4ceaea917f2f840ce1696a58f00325775ae5009";
   sha512.doc = "1eff11bc2c7cdae101331521f08d3a9eb878e8d1695b35724475eb5b99e0a537bf16a00bd3c13760cb36306e84b72f15e5ec294ed958ab5d67e75ad8571ac9a2";
@@ -10309,6 +11230,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "datetime2-norsk" = {
+  revision = 48267;
   stripPrefix = 0;
   sha512.run = "9ebcd994305b3b3aad61383b9ece13425b4c34432dae0aac2ce38c0219b2f19871f89cb30bd774a7db9be45cc8a21f7856f1f568c32941502b18f6089b787066";
   sha512.doc = "3d834d8572cb8f1237b4b9e69bcbcf1a5eb0a1e5c001e8610a00ec377204c570218f6d97765c3efbad9130cb2ad9ced3cb80b32bcdfccfd62d7069ece93ab1da";
@@ -10317,6 +11239,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "datetime2-polish" = {
+  revision = 48456;
   stripPrefix = 0;
   sha512.run = "3b63541325de4082a828af5131a639c11f2562b8e2951f50199f7281e7c59e2a2deaf8cba124cc8679a4de5da3e95d988bb3533eed6cdbc9471a95476ec59bc4";
   sha512.doc = "6bcccc320063567e2527ca6acce6180c9d19a3ec8a1e922e640e82d3ad2a244cd455741e059e385fa26ee6479ddd5086b9dcf73a705988adec96a311cfc5e40b";
@@ -10325,6 +11248,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "datetime2-portuges" = {
+  revision = 48457;
   stripPrefix = 0;
   sha512.run = "976ad1440f05bd166659b5b950691b4d0ce988a3d71bb91525e4448b1520a6ead37bbb3ef9a899bac08c7dfe8cc7b9b7e15174c8ef143891133bc00e5c39e9fe";
   sha512.doc = "3cd176813f3b0bb16341ddeee4d0a848b4eee9bacfb90734d97fd9ddc3e88285057dd0bf4f0f3ebb5641ebee48b15161feb3e4e75032e32368a51bfb9ca4a8f0";
@@ -10333,6 +11257,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "datetime2-romanian" = {
+  revision = 43743;
   stripPrefix = 0;
   sha512.run = "9167976dca51779669fbd91cc54ceced2f0dd6a97610faf9e55bd51a9e5c0ca3c8096c143a71180f0d572d1f1fdca5c72feccdebb58c7caed6e3e33a21c4b4a1";
   sha512.doc = "62514ec016e7913b74e8c19624aceda5b258d1e1972da97b04bed2565f1c4ac0c694e695e6eefa528963f0375c3866ea4e475747e6141f0612dad2db8e7a1b7a";
@@ -10341,6 +11266,7 @@ tl: { # no indentation
   version = "1.01";
 };
 "datetime2-russian" = {
+  revision = 49345;
   stripPrefix = 0;
   sha512.run = "2821680ce189aacf8b0303d5698d9359f240ab4e470c0e2b052235e6aaeeffc882ea4b9c9c4f91d52b1402ef7486c7115bab8058e2223b7ebd3186fbd4c4c34f";
   sha512.doc = "97c1b02377328ff75775194baeb2c3e15f2dafee303dbb85c47a0baf7f6edb4323f754578a9caf9db609477204c1310dade3b87d5a768a16fa940be2fe320081";
@@ -10349,6 +11275,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "datetime2-samin" = {
+  revision = 49346;
   stripPrefix = 0;
   sha512.run = "fc4e6401ce02b1aa7be5fd78e5d5e74aff6ac35cbb6864cbce6d93fe0b2716510f6ccdd290c82286b8e51f37abe8460c0f8340ce0f9135838ecace7502f72784";
   sha512.doc = "e5879faedd4d4fa5ac40575e0ccd1d0db94a80d78c3d01f8d36bb37875e2b9025537c876087b85626ccaed5c90f505a98fd3e5adee64ac1bc72f48ff66114438";
@@ -10357,6 +11284,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "datetime2-scottish" = {
+  revision = 52101;
   stripPrefix = 0;
   sha512.run = "b3f8c2e2c61461c162f4b7c029ced53b5f0c61398415d17044a5189c08460550bfd0ddd15c693dc959b5cb5bacef63a1d4de8a9fe11108843edeff475964aae6";
   sha512.doc = "87035e38cea316b776f2c61d0c1522e61c560602650bf6955fc7330536fac42dcb17bdad1c3828f2accd10cef009efcd805ed917352ff921d03b46ed3d0bea18";
@@ -10365,6 +11293,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "datetime2-serbian" = {
+  revision = 52893;
   stripPrefix = 0;
   sha512.run = "ebcdbb32af1743e9dc2b46b6730664c48a26ac4d15c4e9936c9df883a718fb52e8800f29285295e7521a02130471bdc10f8227b5dbbbeaf6481355d7025a8dd4";
   sha512.doc = "c56761130dc00406a27356a8b38f4c82f233dab32fa6f19d58626139ecd7e12fe3c736edc676db52176c5918800b4f0a47362fcb9b3ef265ec3beebd641c1b15";
@@ -10373,6 +11302,7 @@ tl: { # no indentation
   version = "2.1.0";
 };
 "datetime2-slovak" = {
+  revision = 52281;
   stripPrefix = 0;
   sha512.run = "c69d8eacf36fb7232a85d92e5db277b281b631c0c8f63df7fbba51876d1be782b7196efaaea0ac25140716f983ada40aedaa550102fbe0d445e5cddd41317a09";
   sha512.doc = "c40e20b000f3fd5ac368c310d1f11519566410963cadaf4aabfb0c9cae05e0d3e8a3810c7da451a5e206e8b5b174ac0b837c1beff207597e050ec529e82acf51";
@@ -10381,6 +11311,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "datetime2-slovene" = {
+  revision = 52282;
   stripPrefix = 0;
   sha512.run = "1d0a73d3781fcc9ea0df63e391f6b7a0a254bfa920c63ad1a0c76b56d4770822bc4e049ce18c554974bbb20478150cd7a4f545ef8983bacd31a112fc3acd5419";
   sha512.doc = "dfb2a9808488ab0e0b225d0a397490f7e1cd2343caf0a685d8e3f48feff2ce549092771f0b4017a3c45640067ad1ede8a852e714b313d9abfc7c9642f983cb46";
@@ -10389,6 +11320,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "datetime2-spanish" = {
+  revision = 45785;
   stripPrefix = 0;
   sha512.run = "07c321a300d779e39de46628b8e1b95d383e2a1a0af882cc607929d894f11b2e8329cb256014193d428182e78f2cbd5e3e277bc7821d3ad7a2740fedacf14e28";
   sha512.doc = "629b4a2771fe68715978afcb202d984e1032d2e0f1af95d4971a980e14baf4b0705187f4a7ef9748c024eb27780f7720d8d5010ebfb23026ad8605a42730293f";
@@ -10397,6 +11329,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "datetime2-swedish" = {
+  revision = 36700;
   stripPrefix = 0;
   sha512.run = "b904b21b593e529ffb714f3762ca5b8de37e87fe25df593873defa43de3995d1c72b0500217182728eaee6030cacaca969376a5623bc0baf48fe33aafafc0a66";
   sha512.doc = "7d6f2468aaa20da4e086201c0ffa6e6ae031e2a23db7fcccbb9ee8776c59b56a51cda9a03dfcce9fbf81b618f2e7543272f4ae88871f2b5380d1b98ff89e451f";
@@ -10405,6 +11338,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "datetime2-turkish" = {
+  revision = 52331;
   stripPrefix = 0;
   sha512.run = "7d4b756ab2f102c7981376d6f87e5a7f7b47d57b1ae9f821185bd5b04e7a5d9a81aebc7835a9bb43a217dffcfceb5b2c46b838bc652dab7c2f468d9510c2ee4a";
   sha512.doc = "6c95641444f2eb510a330c7002bba2c40cf28daeb63fd9092d74846673c03d2aeafd1e7d61d5a7470bac95117c3717cd75566907a896f5cb4b54ccbe952c6d65";
@@ -10413,6 +11347,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "datetime2-ukrainian" = {
+  revision = 47552;
   stripPrefix = 0;
   sha512.run = "5e3d412b8a5b73bb6bd2ee176305806d9b41c5a67196ddd28640e958a7019b3e73f961964b7510be4cd69833c4599db1fed05c6a6f66d4d0b3bc5ad73b5d6dbc";
   sha512.doc = "df40b4e156164a1c05a94c926d691b887a56ef8f42baee26e684383871edff05e5c6e87eba95994783cac2fcea1a5c72347c8eb86f0cca360faa8dd4829349b5";
@@ -10421,6 +11356,7 @@ tl: { # no indentation
   version = "1.2a";
 };
 "datetime2-usorbian" = {
+  revision = 52375;
   stripPrefix = 0;
   sha512.run = "bae799fc523f01f7c70c7818ced0294bbb57a849567e05768c4f1c3f9cbe241755ac2dbda0a9ce0e3bb3f70eec45bae1c0607410302b458370a4c05951d791cf";
   sha512.doc = "bacc067e851e4b58b2978472551cf869cc9d3d4412ba930b2ab81f39c4fa9ca352188b6a6bffc5b5dc4a6bcf611146b3d1344d221732a7caaf45f95bb67d5589";
@@ -10429,6 +11365,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "datetime2-welsh" = {
+  revision = 52553;
   stripPrefix = 0;
   sha512.run = "2c3b56f2e2796840fec8a60b4f75800743a4d71128cb900ed7419a7a01acd306a9ef86c2b1587e661833f8de48ef89e22c11589af21c9abfa2cedbf709c4c340";
   sha512.doc = "7abb3d603eb94f99c1fc49e53ee28996d2a536d647b0940db20e5a9aa70eb10d7e00385300bfb3adbaf4f463db20c4277a8afbf0f174c449e402c02954c57243";
@@ -10437,6 +11374,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "dblfloatfix" = {
+  revision = 28983;
   stripPrefix = 0;
   sha512.run = "05931528012077b92702926856b1e0d1aa6472188f9b1fbff74e5534a41a3260e53b82bcdd0684ff045aafaf4b427dab6d8e06fc7a5d11cb42a545949bc6bfc8";
   sha512.doc = "5790850d01d9f3734cb89146c23077bc852d84242352718ee655f1410ee84b77366bef133d8df49fd46ad976aa007fe2c4039a08035122f93e719c5f0f7563f7";
@@ -10444,6 +11382,7 @@ tl: { # no indentation
   version = "1.0a";
 };
 "dccpaper" = {
+  revision = 53412;
   stripPrefix = 0;
   sha512.run = "76d73fd1e3dd94465a99e4aab6ad0c411626fbd5ace6edec6a185359fdd33dda507e86d55d7ea182490626548785df140c7939ed811b3c23ba06227dae293151";
   sha512.doc = "f0c725c43911a38bbc8ee03f77382ce4d1abee5af1d57a12910c67f0eeae9ffe3b44f0a33d916e79c5a54b1fbd16bd5e440848e51996c4d13e200a714704e934";
@@ -10452,6 +11391,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "dcpic" = {
+  revision = 30206;
   stripPrefix = 0;
   sha512.run = "6cfae1fe50baa81ba778ee1b8cc76dd2d0e66e3cd4a868364857f2338b1078ac81178dbcea81d4edbe013726b7cb14700506f38e49eb528701bf784280ca7de8";
   sha512.doc = "25f768812f31cfc3e4d00717ed8d77392272f2480efe3311ecf5e922b18e1f5b6fa36892c7eb69cc077e350d5d7e55b7201673fc653c188ec8a76205f90b681c";
@@ -10459,6 +11399,7 @@ tl: { # no indentation
   version = "5.0.0";
 };
 "ddphonism" = {
+  revision = 52009;
   stripPrefix = 0;
   sha512.run = "9ccd7a8715af4a808a72d4dbc96a1216663c7eddb7a0fea48b77bbcb546a12d0e9de00928189b424e9db8e612778ed53231456d087a1eb83bca827852c9691c8";
   sha512.doc = "d75ead2518ae448eba251b3f43431751f415c9650e9ac023e1647fbfa828f700ef2fa3a19f53fdd6e28c9e8461e071fabb7c016aeaa62678ada20ed0b96017bb";
@@ -10466,12 +11407,14 @@ tl: { # no indentation
   version = "0.2";
 };
 "de-macro" = {
+  revision = 26355;
   sha512.run = "5ce9beff85d65654173557af668ff15af6989d9fa6d341fe9c26149d0715ed7cf57bf5b2a59b6cf99e8ec14e4ebb6816e9972268516a0b2a78ee13c6423b3599";
   sha512.doc = "05793930357ad58a57e221696d836895f02dec82cc93b9aa7ea302978bee24410d4b382ff72407faa67f4133c75a84fb2454957de446beca05606776c6581ade";
   hasRunfiles = true;
   version = "1.3";
 };
 "decimal" = {
+  revision = 23374;
   stripPrefix = 0;
   sha512.run = "9a0d0947eacd52800b3b2cbc36d6e866c1876bd5f929896825dc604d9d633cfb169d93de0f86b0e78e3274936bb47834c222ee54b3571bfcdc0fe81bb2821776";
   sha512.doc = "977fc97627bbdbf4d65844dcb7ce267cb2291b102b718ca36ba2fee881d5fcf359d6d0dae839d4e640200d3b8a31cba301d20560f5002344b8ea256266efc9e4";
@@ -10479,6 +11422,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "decorule" = {
+  revision = 23487;
   stripPrefix = 0;
   sha512.run = "e5a962002f66d4d3a5c48d93930ea2e14a68226a1beb9f9aee5b7936ef51a49b4d9a249b7a3038d5ade41aef8388ad78f254973e7ef3558e42848409427e5cd7";
   sha512.doc = "533ca67eabadea3125dc359a839d5b45b5e1efee88fe74b4a2b911014b599930419a49e7e0b5967e5f89d29e1b452d223faae3d31fc3f94c64cb613907cc2255";
@@ -10487,11 +11431,13 @@ tl: { # no indentation
   version = "0.6";
 };
 "dehyph" = {
+  revision = 48599;
   stripPrefix = 0;
   sha512.run = "2dc4ee5b4389549c032f3a4d87740ab3c5e296a1ef109a6b673656a82ca4c317ca774f39f61417568b8ccbeac787c4058184fc893d53799bbf0b042ba5aca9a2";
   hasRunfiles = true;
 };
 "dehyph-exptl" = {
+  revision = 53316;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -10501,6 +11447,7 @@ tl: { # no indentation
   version = "0.6";
 };
 "dejavu" = {
+  revision = 31771;
   stripPrefix = 0;
   sha512.run = "a26a57bd02b14c6e67d328c2c00174730b819f7da37ac147ec7f34f37195b6aa17e3223ac4d03617f5239700b1dfa45ca1741eed7b4488d2e604f02ac34ef2a3";
   sha512.doc = "7e3364a3e0863c63f2a66057780fa922cb53f4da2f81e42ce9e200d5a034854216f4d4b833756a6d4d6837385e48aa8d03f608846f2f95caa84a7ebffe3257b0";
@@ -10508,6 +11455,7 @@ tl: { # no indentation
   version = "2.34";
 };
 "dejavu-otf" = {
+  revision = 45991;
   stripPrefix = 0;
   sha512.run = "d0d32f3c9d53a1a61e6e717a6275f3fc934c0815fddc3b36fe2afbf7702e5128d4cf15e8cdfe8b02009a6fb7c203ea42b134eeeb080b9765ff99c4143f887744";
   sha512.doc = "212663371f747b03694327a40de3bec0be8efd5cda15c0cc343284f3a427890e8d16c4223098fc16a260b837a9d522c9cd35876a4c1004e09ee9ee29c05ec7b3";
@@ -10515,6 +11463,7 @@ tl: { # no indentation
   version = "0.04";
 };
 "delim" = {
+  revision = 23974;
   stripPrefix = 0;
   sha512.run = "c18dc230c5bac8db3d66f062402392761467ad18f48a65930a960c0772be30a7ed729a50657b12f533d72086563a67a98e8f5ce7afdc9947b52146e76e22b157";
   sha512.doc = "c343842bcc03981c1814f5cffa2ba3eacc2e6abb5673ba700859406869a2398518e9abf02e159f4d92bf91383c3a6cdaa9f5720adaec81715fa30f4b8f36ff9d";
@@ -10523,6 +11472,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "delimseasy" = {
+  revision = 39589;
   stripPrefix = 0;
   sha512.run = "7f9b1d77e9b9bdc6e5c45ed3c38606fb0d65113f7303e03f591c1b84aa83748d72fb8ecde0cd0c7b19d1bc9fcb454834e156429fd9080660aec77ddfd7b53e42";
   sha512.doc = "bc9c1ff757a9d98ff9b84993cedb62ee024d0f4aafee301db0d862be3d45c76d8d164d2d3099ae37d41017316282db1e7882330dd10de43a9539ba0b10e86b08";
@@ -10530,6 +11480,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "delimset" = {
+  revision = 49544;
   stripPrefix = 0;
   sha512.run = "5c19bda2a87de91ac1d32981198ce7718d490184d4d65dade231b66c3f46621af91dbeb89bb79ba1370fd82a0527d01d0aa7cd9dddeea818e8c4b4380a7b63ed";
   sha512.doc = "9e671fa601b878187b5b3ae1a47feffb6c451fd42f202f948a87b02f35385b47239947a3e91260e699c64c453df161d9ae734fa3a8e241b0e47056181fefc46c";
@@ -10538,6 +11489,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "delimtxt" = {
+  revision = 16549;
   stripPrefix = 0;
   sha512.run = "25332ff7d2602047938630668c849829844fcbd622f911542bccd59d2eb1293e406cc79aca08ac3acaa98828b4a6fa4da98feb08fdf678ad3863c70cc2fc1817";
   sha512.doc = "cd9363d8d44309c2ca51431bae067d87c790180eb884888144cd089cc9c14f83e1e7ea2389650d547e47d4575755a5b6b369e82b76cc19150b1dc973e99109fe";
@@ -10545,6 +11497,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "denisbdoc" = {
+  revision = 42829;
   stripPrefix = 0;
   sha512.run = "c713ac155e390d3fc75549fb7ff6e3ba13ebf3b3b1a0c001dd39f6300fe2b55ec232221d5aa07b84c87ab7daa971504c20e5f08f033ef5d36dcf9af097128b74";
   sha512.doc = "561342a0807ca00550410463755c0a348c97e2ededdfe7e6b55c99e34b8a93928167b33e1ec0a7529de6280ee5cdc4001f051234b9c4eec9c41bc2c560bad62c";
@@ -10553,6 +11506,7 @@ tl: { # no indentation
   version = "0.7";
 };
 "derivative" = {
+  revision = 53654;
   stripPrefix = 0;
   sha512.run = "e74c2abfcb29f075c11545aea4665a06edc93f9cbcbd6e687ab1a1c7b07d095c1349225182862b020b8bdf551a90468ba7357f3138d847a2234ca2351f3383be";
   sha512.doc = "5b794da3675ee46ffd1951b1887487670e26d22a60a3665c5120f08cd931bfa562b5cf97b8690db966e10583b5471dc26956dedadeab1db4057287db64ec4485";
@@ -10560,10 +11514,12 @@ tl: { # no indentation
   version = "0.97";
 };
 "detex" = {
+  revision = 52851;
   sha512.run = "cbdae140b0fa1e5e0afc34548a7febc92f5c1f2981eaf36101ba12857303e1a4f4152e7673393c1fa796e3fde783119d7ec2ca5081f5e127092cecd8c64a2050";
   sha512.doc = "f60fe0817f1f53320a7f1a54b65e7a39a11c519439a71c379dcf4a9472c5b067c5a687ab2c0145f5229606c4ef05d2d498d4def677d9d5b0fa0fe99876b56c38";
 };
 "dhua" = {
+  revision = 24035;
   stripPrefix = 0;
   sha512.run = "c6e6187bdfc80cec3ce092a4dd3605055f3ad67ff49777bf0948af128c8b48118247ed9ca6f5feb1a69d32719f81968d8259794082a28277796eb6beccf9cedb";
   sha512.doc = "a2f9f61ed61c5476d5f70fdfe59a451e7b3cafd3412336c5767b53b0157416149ee9ae924834f8a05beaedabb9e4a8dd3e4dbcb2f17b733af113c0a8085e363c";
@@ -10572,12 +11528,14 @@ tl: { # no indentation
   version = "0.11";
 };
 "diadia" = {
+  revision = 37656;
   sha512.run = "55a246d4e3ab86d6300210d830ce464a935bb83c9ffd29b5387f0a56f5c82d4c5a71cf107f78ffe0cde07f17897e2f949acf1fe70da9da7c7992b330a07b1c68";
   sha512.doc = "e7487bb47fbe8aee714304150c00866780782a9ad32bf6ccbb02799aeb251345ce1cf042e8b4d7b4011083a3be2fe3b16b78f25a4a4206d173ac1384716592ab";
   hasRunfiles = true;
   version = "1.1";
 };
 "diagbox" = {
+  revision = 53737;
   stripPrefix = 0;
   sha512.run = "b9508c1073b88458ee80a63cc1f10a22a96382da7790b54c80bc76e9f7a0315d6f1b9305e373bc4b4542c4c5a6a647625642d021b6bd01955b531bbe59cd3b42";
   sha512.doc = "07c4a00573a4d30c6c52195b66e8293e575bf80f448cee7e1384040f0ea057194051327fda9719c95ae43e8c249391845803de7c041945a3b72c9c252d8492b7";
@@ -10586,6 +11544,7 @@ tl: { # no indentation
   version = "2.3";
 };
 "diagmac2" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "553d3610ef7bba5bf669040cfe6b51b26718b9f04835413d43c3f8a018a8a37274b445bbdbaa4a512aaefc8327f6a2c7abd8d754b3d8cbd4687c9c518265ad09";
   sha512.doc = "37952cbaa4c20180a2d09455c748b245927245c40093510a79fa0461e5836197d8bc05bdc3cf5c7bafa72c54cb503fa9722d7a8ff9a0630ad1b5e8382b4029d2";
@@ -10593,6 +11552,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "diagnose" = {
+  revision = 19387;
   stripPrefix = 0;
   sha512.run = "91fd8eb4b7d896f27c15c2b3b2a0a9bc839bb736a1fa053d47896c6b989729c3dc3a644ad59f6b3bd4164c150034f6ede5d52b680fb1c8cea6838dc70713f654";
   sha512.doc = "f3e7152e656ee4c5f6ac28205b1dd5e9c0cf19c3d9400e2c40c8d8e9fecbcbc01cb1f7a36534849b6ba26f222f9547e3d669114a7d8923645528b7150cd10de4";
@@ -10600,6 +11560,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "dialogl" = {
+  revision = 28946;
   stripPrefix = 0;
   sha512.run = "68fb25b66499e289c7615fda04fec859d2a3a6105ecb3bc69ecd0e5af8f87027e74170495fa587f21767028d9f423cf04e3d11768ea0581a7474e9a66d62882a";
   sha512.doc = "cc1fa10345fa089cd86ea4b0a638334c55c6a57cac3a9c549469cd52cff27b8eb3d349ce14d49de14fbb65f41d1887bf98e9c69081688703d8eef06e6324f684";
@@ -10607,29 +11568,34 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "dice" = {
+  revision = 28501;
   stripPrefix = 0;
   sha512.run = "7ec762fccc174a13f2a84ee43aa49319548aa970f017cd17bca73add506ca270a6ac621f51ff96d47a4f5eadeafc89ecc44f1c99b31a2e76722e648519e1fd69";
   sha512.doc = "9c09c47b70e28e4c8ccffd4c75f8cac7942767279d0e01e543538ddf0ee70fe60cd15d1e3ddce27b56e1a9f865d5ad9b1794a875e41d131d763c11a3e0fb96ef";
   hasRunfiles = true;
 };
 "dichokey" = {
+  revision = 17192;
   stripPrefix = 0;
   sha512.run = "8ed4f0010546af68390f93642cab4495226387fd7461383e32fd3dfa72867050d0da05ba90cb768c6893afeac9bfe55d23b7299ef4a76432e8d11252012b47a4";
   sha512.doc = "16a75d20463a0b0b508c2d50aa67a77999cab525e003704ab34663d1f0212c39432caab0e4df1c69b540be014bc86901031c7c8f647ff18ceda77dcef7239233";
   hasRunfiles = true;
 };
 "dickimaw" = {
+  revision = 32925;
   stripPrefix = 0;
   sha512.run = "8e478160699ca5dd9c52ea7e6b0a7be491d0af44b3022c22797b02b9e6ba6ef67ce9dc35649d9a2ebb9b123e3fbcc02c0602271bd8049a12c4520a32a15d4ef3";
   sha512.doc = "5ebe8605d1a4ebeb11896919c39aa736220e9ca247912b5655dbcadf03bfa45b4cdfe44ee6555bf8d5ecdaf63b0d2527d3d58ee6d7056a194a6a42f88ab0aa41";
 };
 "dictsym" = {
+  revision = 20031;
   stripPrefix = 0;
   sha512.run = "6195ea914b422d5bb1c098e3a8f103d91aaa94520bdff1f5a04d7c952f84f16b1aa96287dac4a309d8d72eabac65a5dbaca275abc211d9290266cfb8f5fcce3a";
   sha512.doc = "935e67c0be73969b572146ccfc92ca42c15b3b5cf2cdfb596cf3ecb9368463b793d530221d2a7e90df18edd54b7938dd27d1ee00757b580c543ea59ddce5d277";
   hasRunfiles = true;
 };
 "diffcoeff" = {
+  revision = 53244;
   stripPrefix = 0;
   sha512.run = "4f8a1dd23b34cf7d6f213a6bf6699286c7e0df73a8a81ce59d6bd2d500f108f60293fac6f1c938c73afd5d4b1b20f64f2ccfe74f5031b0dda8cba65eabe7178a";
   sha512.doc = "b45ae815b92e542d0158da9a75978f97b2ca14056484a776dbd236da551dabe025fd85366fe2ca230b095119bb47fc3048fbb8f1cc4943f7fde9aa4820f0cb36";
@@ -10637,6 +11603,7 @@ tl: { # no indentation
   version = "3.2";
 };
 "digiconfigs" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "a1d5cf0e93aa2722087a491d49c87c1b6c1dc863a39807f28dca198d4c52d8add42706f992ee91b6a42fdbf379293a2aaf3a21199094526c545f41002e8992d3";
   sha512.doc = "95e948491a51321671b15aab55dddd7c6b8bad78bc67bcc25db0970dc478d1bba898fc2efe44537a18d46f3fcc73bd2af600c4a74af4982e8de8a5fc0345a134";
@@ -10644,6 +11611,7 @@ tl: { # no indentation
   version = "0.5";
 };
 "dijkstra" = {
+  revision = 45256;
   stripPrefix = 0;
   sha512.run = "2b3d6d68c6e3eafd1c88eb44c8ab68f27dc77326ef43a34119679b0dc1c1c584db8568584956617354f359a52792c6a2c0104dddaa1ec389004dd673ca749136";
   sha512.doc = "96ed892f5c910421eb5cabe54c4a7c6caf4d9cc139ae7dfe454fac9e3275d3dab4690db877bbe8fa303523f38cc563611ee5270949a6d2fa8d7d2593c1bff06a";
@@ -10651,12 +11619,14 @@ tl: { # no indentation
   version = "0.11";
 };
 "din1505" = {
+  revision = 19441;
   stripPrefix = 0;
   sha512.run = "cb9b819eb69ce4870dd36da844b1d24e4f678ad05f43eabbe861e9de5b53258e45e70530ca76c0aa9fcf54232e8f33dc55623f94c1d9e5fc3dfc48481093c3cc";
   sha512.doc = "4479f5ea1e1ade4bc7951d5722e397a688e75293da55ec57dd0f3d32add2bd551844da81336be0a77cc783e4c9af958be46501c4b78adbbf8a5463770b5cbb2c";
   hasRunfiles = true;
 };
 "dinat" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "0b22f43a5088f669820674b46af72e66f3f2714a36052bc7d18c334b202d0060fd07b1a608626adf183314d2380fad672baf58307ed83aaa888231e75c63b1c8";
   sha512.doc = "f4491ab35e2ae8003faa8220e88c0abd2d970cc6b985d2baf993effd2ebe94a964ae8ece6db70a55f922abc83c91cce5f598ac2e722b5eb7e1584aee436e4393";
@@ -10664,6 +11634,7 @@ tl: { # no indentation
   version = "2.5";
 };
 "dinbrief" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "0c2679265417acb042f81300895be7dc7d6b8d8f0bfa2ff8853b9c1adbb6bae78598c7eb4b7c2c91a9f95959ff7a7945f846e1f262f923d741e6fc77458be9f0";
   sha512.doc = "5182bf0761a484e89331ced44d05f82da097cb7be010333ad3eea1b987119af3f3e2a3cd8ac2c4b2b6149a09a5789325edee49205fdfe52d2960c12edacad0af";
@@ -10671,6 +11642,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "dingbat" = {
+  revision = 27918;
   stripPrefix = 0;
   sha512.run = "d6bdfc62eff8816e03eaea41ffbabf2d3af7194edbb2f9073c8d8b3d333c75f0b587a74556b916efb40afe41c88a8029f0dd764d7dc5894aa50e66e06fccb77a";
   sha512.doc = "993ef5169759d86641e2a3185064f94df858d81d9b7ba4b0516b22abc51eab887b5d02ca487ad85b007e7ee3117563a257d80b803a361ea1d32857921e794b9f";
@@ -10679,6 +11651,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "directory" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "c07947f06fb08da461391cf6101a7a2e55875179c5d19b41007b0d11ff1881623e353b813dcca1da1f09e55beb80bf412f85ea6c9f7e3dd6e52a875770a5ffdd";
   sha512.doc = "24bf3fe447363c20e4ace4fb326c329a244aaeaafbf6f596ec91a3975e7cba86a2d711f9a5f10c2a70d72d74bc08dd2540e5139b4c4b525103e867a9d8e62bf9";
@@ -10686,6 +11659,7 @@ tl: { # no indentation
   version = "1.20";
 };
 "dirtree" = {
+  revision = 42428;
   stripPrefix = 0;
   sha512.run = "5faecc2a6d79ae79929481c283b01e69df482267635957c5eb11c264d924ce299021d95baaf8cf6f9cb10e57f5fe14820c6b3506021b4d0213494bdeff5746a2";
   sha512.doc = "9edfb6fbcf4278c2b24599b58e10f64918d901bdd19dc0e9e8c8bd77756f2f3ba5dc13e31fefd2bd5f1467a0fb0dc0e765fe4e0515781103bdb1b81f687def7b";
@@ -10694,6 +11668,7 @@ tl: { # no indentation
   version = "0.32";
 };
 "dirtytalk" = {
+  revision = 20520;
   stripPrefix = 0;
   sha512.run = "d5cf28f17a68cd064a290769aff11e656debe87ff0c04e61d4dd4fe87d285daab6dab9516b80b33b03680d50c420a4f3a9858ed5d2d3d5c96fa7fbf9989d29d6";
   sha512.doc = "8cdbdbfca4bdc58a560703b6406c98334ea0b5d9920cbc98ea0fdb7b56c9f1d48844167201829cef83fa84f0e21530baf2fcf4a3f8f8b5e44c5e792864ebf94f";
@@ -10702,6 +11677,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "disser" = {
+  revision = 43417;
   stripPrefix = 0;
   sha512.run = "98c497bd8d422cacf639cb38ff3a489b5fcda3f92cb5a734287fc930666867eb0e9e6f6014ad42df527d3999eb5a87da28d7178b47cc53eb44a338567f952ca4";
   sha512.doc = "ed0c04c0afccd7f9f68bb8f65a6497b9cbfb2bbcb5333852da7b790083e71ceec8348f6893f1e0f16bef7e4b5ca0b9d1a58ca46898dc58a02f0324a62971b916";
@@ -10710,6 +11686,7 @@ tl: { # no indentation
   version = "1.5.0";
 };
 "ditaa" = {
+  revision = 48932;
   stripPrefix = 0;
   sha512.run = "1aa2fab8150212ae8dbda9d0138a4c396f47256f93582ed38d9449f9440daba9e07dc0be397c49981e2d1813b7e41d2002fb7ff914382606f417f2738a8d2735";
   sha512.doc = "345d6d7d3f21d2dc728b93e2cbfeb4fc1f589797e852604809b1ff3e7bca53414d684571faf8245c740a50205e7d8787afd5304beb89efd3545a389ec4a74331";
@@ -10717,6 +11694,7 @@ tl: { # no indentation
   version = "0.9";
 };
 "dithesis" = {
+  revision = 34295;
   stripPrefix = 0;
   sha512.run = "b11165408ccd30427390e9f409e8f561122d1a2dbe821ce90687df9feb2faef692d8ccd75fd8372b975a06e3f11bca0ba6e873d59b30aabfa95015ca35e557a8";
   sha512.doc = "25058b262f803fbbf3c41fa62ae8983ade351fc7bb65be7d886a4300390f836ef5d1240e59571839b407afa2ddb363e6c31e76e36c160ed3fe0c6d0e0ef71fbf";
@@ -10724,6 +11702,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "dk-bib" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "9de9e026b9e3de53b297d7925bd0e4e9ab08562e798a8f1b9e6988ecb891067534a741aefbbb81f1c53d7ae6b6cd0e0796d8c0690c5af661e76a5c6d9ea876df";
   sha512.doc = "258d8413d860f6a30c597c10b8c25f352166f8bc39cf23714a137e46f4748ba716dcae8eb8b6e17378f6a850ae64a68a9f331c8301c938f0a8042d967b3e62b3";
@@ -10732,12 +11711,14 @@ tl: { # no indentation
   version = "0.6";
 };
 "dlfltxb" = {
+  revision = 17337;
   stripPrefix = 0;
   sha512.run = "d1d7bd6a855d131324fee30bcb920e0dfa6ba733a1d52f94c59e8f328b533d63444b5ce7e5fca9dcc7f21833a9cef84460106aab0a578fd17974c0e348f1ee07";
   sha512.doc = "171d6661ca71533fb869832be2bf6f7d26244bb5735fb884b5b1ce7c27d291b3e9518a902d6c7565d94d2c55c37b00564184bc5851824a00b5a71963a577128f";
   hasRunfiles = true;
 };
 "dnaseq" = {
+  revision = 17194;
   stripPrefix = 0;
   sha512.run = "b4a83c42e16aa734611dd8295aa033904828ac1825ccdd41f297586c0667ebec4a43606740fde56bd01f58ffee1b1f4afa647ce196ed042a5dfdb641f0ee2d7d";
   sha512.doc = "089352ea3210231ad158ecb0bc17d5ba0a9efe49ee4c609554f08dceff9ef534185a7f9f17526910d3b602c4c6c358f211fec4cfe27bd6df61555bce4f9d795f";
@@ -10746,22 +11727,26 @@ tl: { # no indentation
   version = "0.01";
 };
 "dnp" = {
+  revision = 45701;
   stripPrefix = 0;
   sha512.run = "9cccb6befd2059b13571e083664e4c85215cc12c96b41afdd9efdeb758b444a95edd4c2586ee1b44dca70fe31f38c4eea821cf08cc1237a82d67e0e567d65d8a";
   hasRunfiles = true;
 };
 "doc-pictex" = {
+  revision = 24927;
   stripPrefix = 0;
   sha512.run = "c866f0855f701917fa81966c16a7f1c869320ddaf38e2c1c2a71844fa7b224fe2216f267b7b700ef6e36a13f97fa6f33a1d05342d5a7a8dd47ccda761fc577f4";
   sha512.doc = "3440fd4d0e2117594d6b350dcfed891506ce7fc0500ecdd4f156431363a38e399061469f5def9082d59c39b14b65ebc19ccb3204fef71ade300825cf35659158";
 };
 "docbytex" = {
+  revision = 34294;
   stripPrefix = 0;
   sha512.run = "0b212fe2131eb4070e08efad7f1e0745d0538b2173b274a41c113ae6dfce46d7d1fc8ebd22f16b3a956570865df9cad668866fc2038687ad6c0b7b72e76a79d8";
   sha512.doc = "0daa32aa23ca248dce228b8029cb19c6d4509114094d46efdcc45b52d6593176c44da88040b37d83054ec286c4b79727ea4ab2cf07c4522e5f597750d85118fd";
   hasRunfiles = true;
 };
 "doclicense" = {
+  revision = 51332;
   stripPrefix = 0;
   sha512.run = "a66bae24e43e619dfed88b039b8fd44143a1ee1c94a7764d49f7e5d7920f041deb66c8c0ebc91ddc19e7725895a5e5793196724b45945cd31675765caf06a236";
   sha512.doc = "d0388a64e6679007965b2c1075d730f6b25a08431bf9bacfa8cab8890ea809150c334c96730d8170515b552e5743784c07424ba34d9033669d8463744b5ed5e8";
@@ -10770,6 +11755,7 @@ tl: { # no indentation
   version = "1.10.0";
 };
 "docmfp" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "55f68d7affd8d82631eb0e67c6232330bdff97ea908259a5e14255058d88f9f745afe55bd4a15eb91bff959b7cfc31835fa22196d3d0edcafa40da521b3105b6";
   sha512.doc = "fc3721046105ae78b19b61a45fd01570873842c6786a096575efae282e4fc884f5f5dfd5ea6888a25ddc82077340bf0ede4a36977cd33d2b555ccfc3d0ff2c02";
@@ -10778,6 +11764,7 @@ tl: { # no indentation
   version = "1.2d";
 };
 "docmute" = {
+  revision = 25741;
   stripPrefix = 0;
   sha512.run = "5c01f4e6922b7a23e753edf9110ae7f1386a4d6ca719ac898b058068a754a6c3bb123f918bdb1087baf5efd1176545f543ab8b93bcb6c9529c9000ad6a3b1e97";
   sha512.doc = "8207eade8841747201656a7e6edc789926a9dd411946a860e4d865fed618392bb9159245f7162adb4a58c88d00191d83f2daef49f610c3d8e5e231ad7f1fcb7e";
@@ -10786,11 +11773,13 @@ tl: { # no indentation
   version = "1.4";
 };
 "docsurvey" = {
+  revision = 48931;
   stripPrefix = 0;
   sha512.run = "e51d73b0dc7267b0564119b6836398a939676d8929e850201900eacb49e701e873661ec897e8c0523a094d82e736014e0ef61d07e2ffb5311924d2fdcaf1d5c4";
   sha512.doc = "3231dbb4c28a03b754817f50f930f1a6eec33ca9ef6e29a1c4b1edd025315ee9f9e7a371b8733d6624cf9b02dbb705dfcc82d6f98a99aa1ca05b4f277e083304";
 };
 "doctools" = {
+  revision = 34474;
   stripPrefix = 0;
   sha512.run = "5c621b063d752fbcce773f2b209d358de1588e7c4edec017eb45a74c350e86932ac9c4e0662415ba7ad5bca8ca86d1255b15f4e5572ea949a5d6404b28f14025";
   sha512.doc = "a78cec3ce74e4689c848b49af7da035cc7c684730f78acd7a7f8d8f78194492e53880e7884eb00dd22d4bbca4f370aabe8175048503959f88023a12ee4f26598";
@@ -10799,6 +11788,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "documentation" = {
+  revision = 34521;
   stripPrefix = 0;
   sha512.run = "330534f15cafffa56dc35e5b4de8caac66a87ccb0b834df5419a68a7cb136136263af14ef14ee7ecaf01fedb2803c2653dab7570ec2535ad1ca3033e1afd64e2";
   sha512.doc = "09854b00d86dd902c26c1b4f8cda942ea09796911939a20014b6d50d01b052e04007b55fe814877cb4515a6aa1f4ca1a7ebb39a6a6ac1bfc89b98d1f910329ee";
@@ -10807,12 +11797,14 @@ tl: { # no indentation
   version = "0.1";
 };
 "doi" = {
+  revision = 48634;
   stripPrefix = 0;
   sha512.run = "7a041a56ecc0f88d5200d39d7611c74f955e79e5f5f887d26a70c76624c334b6229f7b937426cbbabfd7de7ae0f9cd2aee70c502981c46fcc3f18fddd62261bc";
   sha512.doc = "3dd77559fbcb32d8bee7121f62bc37ca14c14c8e62f8d2ba44978438920dcdd54605a543135a6294e2ea9742f5fde4862a2efe3eeb6bf22b6d7418b4b01a2ebd";
   hasRunfiles = true;
 };
 "doipubmed" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "3f313afd9cee76d11b5f957a3e9f7cc0d5d2d04003c285df7cd872adc0cdd26d0248c03f0642d62af53f23c4399e7e5ac3ffcde38da782f64ab265e5879a7f60";
   sha512.doc = "0298b7f4a408f2092bb7ecd8d5b0cee745f442bdcc2bae463d922ae4511d5b0fd79b8f78d1de49f77b4fb158937fcb752d919239efc25829228c1f75185454ae";
@@ -10821,6 +11813,7 @@ tl: { # no indentation
   version = "1.01";
 };
 "domitian" = {
+  revision = 53938;
   stripPrefix = 0;
   sha512.run = "e52d996066ada71b5be5b63c44807fc6f7b0fe1971411b3c106f9e122f64bdaba8d1e70a315b18dc2d94ae15daf5e5990eda6d9865e21f172556a5eb55db9eba";
   sha512.doc = "7d5bf1324c70b321c5ff795e6113ce5742e72fd2da32332b27322960bf32199dbfd079408c7c0c60b542b6ed7d456e7e77a636bf44238149fcac2640488d99bb";
@@ -10828,6 +11821,7 @@ tl: { # no indentation
   version = "1.0c";
 };
 "dosepsbin" = {
+  revision = 29752;
   sha512.run = "7f31d47d60b0bf151cd6e6516e29a8414c6344657c133e726e6e8dfe23818995b10b9a2898b1801c4bcb9219969a8af1d2725b75df514ffb119730b3e49008f1";
   sha512.doc = "b9edce9984698db8e50f9183f89b025cfa89dca8a8725054af80f379c88ff1d2b02cef8f3d5f37ee5b8585a59d1a4d0f0ee0e541a7784f3f3f4e382d78e6a47e";
   sha512.source = "d5739533a9d10e584ed7de4ec033b4a31be5681fd06fd9a2268f924d4434df902fc1f346ac2636f4ba7b7dcc6b5804a80b5431f7055fe8eccfeeea09915ad2e7";
@@ -10835,6 +11829,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "dot2texi" = {
+  revision = 26237;
   stripPrefix = 0;
   sha512.run = "20cc54f907b00e2eb14e4641d5098dd4886ce8d4627f391421bc5e819614dec97e0ec42c92794bacb8ffcb03737cb8736c308fad6984abf13c127f6d1174ee0f";
   sha512.doc = "9e8461946582e0c99ee35437522e25769e2afe5d7051f072937a57c5d4e1a0c8e144509c751f9ddb7ef576f43ca408ffca663f81c8b5e69fb176a4233ff45ea3";
@@ -10842,6 +11837,7 @@ tl: { # no indentation
   version = "3.0";
 };
 "dotarrow" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "43ff7e4e163764e703673312a1213c50f0a77da98f3f36b726e87042d082f3d2433e35156e1c963d1c6287aa4cea5ccc64f140f89b82569b0552f406b29813c9";
   sha512.doc = "7b5a4d0b2b31f55e657eed5b7cc0185a8895df77895bbe40f27c4d29d1086c9fef1779f7c4c726faae25821972fac418c379e9e68ad4cd059b1c6f5b0420e9fc";
@@ -10850,6 +11846,7 @@ tl: { # no indentation
   version = "0.01a";
 };
 "dotlessi" = {
+  revision = 51476;
   stripPrefix = 0;
   sha512.run = "348be296d710fe22d8122b45437d91027913b90ef36fa7aa365ad49dbdea566506c80072623ccc95170227e77ee2fc2fb3f711772afe4e7e7b83195eb3110b61";
   sha512.doc = "c77fed1f0b8ddbd6ed141fe8c9f914cbd5592820ffe3e457ecf35952817149d1315598f449dfe0e15e0e50328e45b408d3f1ef91fe83154f5374bcc62041ba77";
@@ -10857,6 +11854,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "dotseqn" = {
+  revision = 17195;
   stripPrefix = 0;
   sha512.run = "794be5110d50ff9134471aedec8adaf7267f112012d962ee6e1cd7ddaa36cc37d993517cf4663686c90df891fe2e912d260cc9c9945aaee25925c2915afcc45f";
   sha512.doc = "aeb026d83497b78725d623b52223877d4d5a0a745312511f007d69395b87ba5362904cfa26bb24f2f2c7d0e0ae14bb82699d6108533260d736c0e85bc29ceff2";
@@ -10865,6 +11863,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "dottex" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "037586577425d8a38a2170bc4bb9a7fa28a7886ad852d1c85483f7c3b625321c41a204b613479382ff5fb9e8cc3f8f9d8ff6e0a07c14b71ce6fdc68280515e33";
   sha512.doc = "3708e08c630e27d744c3a865cc02e91868a32b1648b4d390cea0f20ea6340c56ea1720348f6b82796df6cc3f4d5b7feaf59ffe7e24c32e34535a4e5763318df6";
@@ -10873,6 +11872,7 @@ tl: { # no indentation
   version = "0.6";
 };
 "doublestroke" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "ff1be47939d9a2e8ec4fe8e6852d9fa31c2776511de158611ef8b853ac73291d1aa4ffe81985bed60c75a16e3cfc963a3a8ce3fb9494dcf6664cd6d92a549e73";
   sha512.doc = "2cf0cc8936393be2b01ed06158b250a43514098aeec4007bf493bd9232fda911f4a59f45716fba5837e475bdc39a86cf6e1180d4220e6aef26ff9e0315389200";
@@ -10880,6 +11880,7 @@ tl: { # no indentation
   version = "1.111";
 };
 "dowith" = {
+  revision = 38860;
   stripPrefix = 0;
   sha512.run = "7c9bc25d94364ea13326ebc010d15c92b27ffad08b68fa5c3b5034e6bbd6a96370d159727270adf76e6edca15d08de86c13ca7ede009a445b500ac22b151c05c";
   sha512.doc = "2fb2234cdf6b42bd3f9f991b3d2d76473c45c51ffb67e7c12e7976310e0fa562cb8d1f01b347e9b8140c854e1ede865cfed17f5748ded909dc8d983d4f246961";
@@ -10888,6 +11889,7 @@ tl: { # no indentation
   version = "r0.32";
 };
 "download" = {
+  revision = 52257;
   stripPrefix = 0;
   sha512.run = "051fdf31160c95e88c8ed1214311b0ec8eda80b7128752c27a203c7e7dc5cee6d275dc4ed93f06308b71d199d9216b18600a2b6b219f852fc256eb2486c2bfd2";
   sha512.doc = "388fbef93df8f76de34e7968b8a1925f294b87972e2e26cb1ae92145b252b5a88fc06254453a6bc15eab14a4532e1a18e3b719ea243142c09239e3521ff8f7d7";
@@ -10896,6 +11898,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "dox" = {
+  revision = 46011;
   stripPrefix = 0;
   sha512.run = "dc37733e7253d457b2fe09b72b808c5198f222dcde12e0d36ae546a8ad0537419fe7f27945625bb3cd3efd2b5b63991e89dede1199e89c67fe7d6917370cab67";
   sha512.doc = "4474e38d3dd35dd14b281f7d2e5ad1d6104d95579901a50b3575e846532c279111c81f813b78c4d16ca6c78ac627a30e51515ee7b178602b7338c1c799c62609";
@@ -10904,6 +11907,7 @@ tl: { # no indentation
   version = "2.4";
 };
 "dozenal" = {
+  revision = 47680;
   stripPrefix = 0;
   sha512.run = "ca4171da87126231a791f432a6015cc069f0eb0d540f8b79b3b5028f3f3e30d9202622886b582f2e351049603d0323a458fbce3d6b2565af5391a4aa94b734c0";
   sha512.doc = "e7c180bed185135cfba31acbf4488ff0991066be7456a7c54625df458a24819ef8b41bc19eec955967f22fc156ad6efc9e194489178e2cffb806bf066ea42520";
@@ -10912,12 +11916,14 @@ tl: { # no indentation
   version = "7.2";
 };
 "dpfloat" = {
+  revision = 17196;
   stripPrefix = 0;
   sha512.run = "df136498f7ba41b1335ac109667d07dd9584e6682e1d75fc82a80839bf0f6d7a4de1f5750aa738eefb96d14d2adea20a3ec9fbc92130481d9bce0abb6c6f175e";
   sha512.doc = "2cbdb8711556580d14a01b9daf03b1a1095387c077413b2815bfaef1af2781fc8bc56fa7a6a36abee60d6ce6928f920c9d9c3deecc2e071e8e99d51c1421508c";
   hasRunfiles = true;
 };
 "dprogress" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "4f56a2d6e345cb98eba3ffddfa977bd48661d90bd10712387141b3398c9a85e8b9d7b0f33e75635b7a98e91176f1e866ecf0b14ef0197fc488bf976dd4889673";
   sha512.doc = "455451396b22b3d38288a5c51f6c2413c56ffd07ac1331c3727c4f382eaa07f0a128373ba033ae58e53411e69a4ec0eca67609fc3c111c91f24f2adb2536a2e1";
@@ -10926,6 +11932,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "drac" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "f45c94e222a6bcae0d87ab5aebf0f594f1674a49787391dfb9cce32f9b36a0aa6a81e84ea4ca345e0918ff2166e36738ae9969e4d9e4653bbb99ac6a7f0cc63f";
   sha512.doc = "7e6debf9580d7c145d8f95329aeadd63012bcfe3ac04fb9c4a3e815391757051ce021e4e2659c96fd7ff5066e3e324ac947cfaca16e52bf5895fd5724f81f552";
@@ -10934,6 +11941,7 @@ tl: { # no indentation
   version = "1";
 };
 "draftcopy" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "f1f2ac803e1858ffab880c7427ed2dfeaeb435255e83ed795e0d5b4262fce1fbf7593653035af2e45d4731107c8f886938015ee1a7fd0018001c0e39e9f1018d";
   sha512.doc = "f7a4941c26c92223a9dde51e288380efe3b701d847051c13345e97f5a082cb3cd9e5d5421dfb2b1f1cdc12214df1ce6970a8ca6fe7463faad73af1a12c3542e7";
@@ -10942,6 +11950,7 @@ tl: { # no indentation
   version = "2.16";
 };
 "draftfigure" = {
+  revision = 44854;
   stripPrefix = 0;
   sha512.run = "e8ced947e69803243543657185e8fb28e67776dc9eee5e095126ec712fa368c32903f53243aaabb7308c895cf8e0c10a6d89c33e6b6c5d109f0300dab5213e60";
   sha512.doc = "f0a9a59ee326746802fb33412c44148ed8c836a24653df6685ecb69bc76870cae63ac8955274705639e658491566da0d0633ee8d57cf57d58fe43a971252ee05";
@@ -10949,6 +11958,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "draftwatermark" = {
+  revision = 37498;
   stripPrefix = 0;
   sha512.run = "10cc5a9f6ba21ce87022e0f45d4f4cb92c4aaf8e1a4edfb5e78d24f8cfa1d283745db0d04f32ba2943963677bb3fa934a1f410e9148baceeec23b70436682a1e";
   sha512.doc = "5d7d9d4dbb18f452e917f91a5e67f46bae4f0ac2b8088279832e32d9e7a7fca1230a666ea1031c258ea3882e7a00d3a071864a20a75b523bbbfb12e7a3da0a4f";
@@ -10957,6 +11967,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "dramatist" = {
+  revision = 35866;
   stripPrefix = 0;
   sha512.run = "d61da72538a7d83ee902081aefc23f3addf2fd6e5fa7ebb207fdac16546d13602c50419682e842df8f36a899c2c0aba0aaf615bf64202135dd9f470f5391838d";
   sha512.doc = "fc28e1dc8614d836637350a20478a0e8a03121909cb42bfd1cf4caf8e7adc01a4ac3eba08e82c389c41a567cd00f191ecd8938ac40a0a226e2fbdac047ecb733";
@@ -10965,12 +11976,14 @@ tl: { # no indentation
   version = "1.2e";
 };
 "dratex" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "1a18f8866d1cffb0ac3c277bf27e1585c7596eab60ed51756077abe3154b6d67ea95205f60b5a244e9acabb05e8dc95a792d48f0a2fc492f90d224f85895fdd8";
   sha512.doc = "0ff34bd23dd8718f4f8b0dc3e84068ca2b38a9758849d98230f1a8d4561705d6db7be3b0fcb34621054993f27df7a9215267b3ebbd7fb3d77b8cd9cfefa0ad60";
   hasRunfiles = true;
 };
 "drawmatrix" = {
+  revision = 44471;
   stripPrefix = 0;
   sha512.run = "6be4d4ee6970956dd2f3b31d31ca0cfbad268e2f98ae64fd87a49de9ab26765447531121aa0edc157779f3f9c0dd76ab2ec3f747912f4204aab9e2e7181368f6";
   sha512.doc = "07eec69024d4daff597f2a937178f66413e6dc4974a2044f983e809b046f09140db7eaf3cfd68833bd95be0d56b4a564dfc9ad4d771fa124f55ea3783eafca1b";
@@ -10979,12 +11992,14 @@ tl: { # no indentation
   version = "1.5.0";
 };
 "drawstack" = {
+  revision = 28582;
   stripPrefix = 0;
   sha512.run = "383eab0b77675ae418a775a413c37720d6f74d51d1a31bdb2923b45ced53afa576f10304e372171298ddbd566a8418526d291f74a1871eaba36ea3793d7d0173";
   sha512.doc = "d435447ec29bc26262886b3dc4c41cefae81d24e0704857a9ea61f1fc08ff8e4bfb4ead7686a9f49808dff30da47fc5638e2c0dbea4c6a551800a373f68df0e6";
   hasRunfiles = true;
 };
 "drm" = {
+  revision = 38157;
   stripPrefix = 0;
   sha512.run = "662a2593713dc02debd4702b5184586736f12200aba4079154e6890b49d581810e1a7a94f0d3b6750ecd241dc03cd5a638a3ea5bd4792f13829e7812f5620b36";
   sha512.doc = "7821503ea6548fa200221d2c2234389a252ddc61498d66389f0afd13b6c36536b744f060f42bf26c4e2be722a7cbca8841b1b76510391da4960dcfbfb9956177";
@@ -10993,6 +12008,7 @@ tl: { # no indentation
   version = "4.4";
 };
 "droid" = {
+  revision = 51468;
   stripPrefix = 0;
   sha512.run = "e2fa1b84bde04858b16b39a559478005a6585d71ddc9879d6e54130970a1f0f6e45e584f9635f457af8143093872541dda0ad98fd647ef2af309b0d0badc813f";
   sha512.doc = "82613922360967cced68b24fd997b06ee8a082512f6567c4ae17f0046972eca84ec1e154d78ba196eecd0aeff8e9b7adae12f3b7efd780e1eb1e161f8b18ebe7";
@@ -11000,6 +12016,7 @@ tl: { # no indentation
   version = "3.2";
 };
 "droit-fr" = {
+  revision = 39802;
   stripPrefix = 0;
   sha512.run = "76c928be0648ae7bddc76f654b65a99ae6670cb17b0ae9a54596599ff655636d4520b31d4e802a15af65637c5bf956d41a2095762a3c4bb77052c9f74da5e7af";
   sha512.doc = "6129658aad2fae20dd12252941ee774393e262d9322ec2163ebc964ec27c4ffb63f2ce0faf9b74a90717c137065e9af238d45c623cc58d52b1e4776da221e231";
@@ -11007,6 +12024,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "drs" = {
+  revision = 19232;
   stripPrefix = 0;
   sha512.run = "5054b389c79b6895e648d3d4fcd1a3f7b06b213963245702e5bc4c0e8b6e3a87c6a2d3f72509998216e25553148008e597c6dd3015ef0b94724e84f3fade5936";
   sha512.doc = "c265c462094e50872fc2748167226319a5723aabe54ca057661b95c7cff897afd08f42ce6d520b7ab35f259b760800e79ac6deae0f1ca0c776c2c2aa7839cf80";
@@ -11014,6 +12032,7 @@ tl: { # no indentation
   version = "1.1b";
 };
 "drv" = {
+  revision = 29349;
   stripPrefix = 0;
   sha512.run = "b7f2b56f305d552bd857a5950fad2dadbf800857d4c8ee411fd2f5786697385404fce3956e59b5928ed5f0a688117dd740c0f56806674d08cd8cb1d52b79a9d8";
   sha512.doc = "a79d9883615568bd6c0d5aac44cc2ce28e0bd08e96f802d500515428ffb5400beadea94347abab7752904ae01342049b8d6687f6047aa9d8b27f5fe3a647bd02";
@@ -11021,6 +12040,7 @@ tl: { # no indentation
   version = "0.97";
 };
 "dsptricks" = {
+  revision = 34724;
   stripPrefix = 0;
   sha512.run = "282c1c1aa51c70a77b0b63190ee875668dab9fc2303e2a84ff0d79a7c9f78a2534e4752a32c093e72eda7e98aea220923f9d1703b5c94214f9590962187de194";
   sha512.doc = "c45da3740ed14540cada0c75a98c19f5e3cd2b32811a4f1906e11c45a40e0e8d31bd706ff4afb18073690e4e285b7b44b858f53f33f050702526dbe0fc88f8b8";
@@ -11028,6 +12048,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "dsserif" = {
+  revision = 53384;
   stripPrefix = 0;
   sha512.run = "70cf249f7e3fd88d03fb7ba2ce07f21a6183a7ab465e8ad319c53aaf3e800ec3e4a9f12226f1302490a316e88c0571c2c9d5310dae6e10c0714527da271c174f";
   sha512.doc = "ef40db14eed4e267e490df95147c7c5854fe034128f2465fd5dbbbeda6e0aff1267e00daaaccc14820e788957a097cb9c3116c6fd923f9aad152049866025848";
@@ -11036,6 +12057,7 @@ tl: { # no indentation
   version = "1.01";
 };
 "dtk" = {
+  revision = 53020;
   stripPrefix = 0;
   sha512.run = "c18c982e209b38a4f5d275eff1916f4b7670f2d4f0168d009d89e62d1692beb421b21459d994710e0d6ef3d6b6c09aa9288abc3eaedc9c0fe4e929ec24b1e4c2";
   sha512.doc = "bae8991bb3e21a6f00d88d687c9a041bd0aef9b41b249c28d9ab4b9eecf91cea2189257791675bccd6796b4e745d4ab46ab7ca44c920955bd95b26fb8c89404b";
@@ -11043,11 +12065,13 @@ tl: { # no indentation
   version = "2.08f";
 };
 "dtl" = {
+  revision = 52851;
   sha512.run = "866039bb0f76bc6b2f4dbb86133a48869d90ce7dae716df42e35f4d3ac2808fab52a79f77b047267d206ec416bba7dd6282468767b1b1f4fbb1146a1140eb78a";
   sha512.doc = "d624505c9bbcf7140fc264811631f55f8a26fb1e9c4d3b1fbb1be93460aca2d6dbd88192f057e1b17fe807af0b4ddbbef6e2a3ba919e6aed073a903045609d7f";
   version = "0.6.1";
 };
 "dtxdescribe" = {
+  revision = 51652;
   stripPrefix = 0;
   sha512.run = "4f226da178f26f2e3310a86e2d884aee681f87528c0d43f942f23c68b6e335eb21bef830233524d44d2945a1d287ff9542bd69744c15c722a54ba38a5af73d96";
   sha512.doc = "45592bc0c6836d83f1db18f7852394a0288c2557aa708ccbd1407656b7939cefba07556e924fe495da36078411b81bd00702f7998332a5fd801aac0327655f47";
@@ -11056,24 +12080,28 @@ tl: { # no indentation
   version = "1.02";
 };
 "dtxgallery" = {
+  revision = 49504;
   stripPrefix = 0;
   sha512.run = "c4b164fc1fe9230aa92bd38689ffa67391aea511af59e74b93c9379f1d027f07091f98734af837a1af90b35b0e2e5245f78f0198f4a09465a8c59c18077a2457";
   sha512.doc = "ea56d62e0fb8b168461f8d01a08a9829ed00db4e2d6a460791de3018be21b4b446ad8ebf4a1c4a69e99a0989b85b55cbaa8aed171a53479df0501ea36cf03bdc";
   version = "1";
 };
 "dtxgen" = {
+  revision = 51663;
   sha512.run = "b197684c1e941a64b606b472fb9e0f1ed4f5d0b0db2df59202712c0e3f3b3993106b8d493d707c4875e90dacd9dc7d12bba784ef7c8d04984a38708073b1b92d";
   sha512.doc = "f666a2b5d3cb32d43a23cc3edcd92bfb727d500a8c439b4b78bae89ac73c317adac9786e4702e78b5b4861b76489ff7af5cfd115a80b96cd6298c65412d56a50";
   hasRunfiles = true;
   version = "1.08";
 };
 "dtxtut" = {
+  revision = 38375;
   stripPrefix = 0;
   sha512.run = "cc28ede4898b583a89df3efbfed45318be9034b3c2a92bff083e79007326d4d680177f1884aa506dbc9574a924687eb463f2d69c297906fcbddaa584ef9e52bf";
   sha512.doc = "2c8a2ec4fc38aefa720bee29f24149837f985a54cc1b9cc9325887f5b7738d89ef38d8b60acbb4b5adf0e6c13e1677003e58adaaaf50e8949c33377ca29679a7";
   version = "2.1";
 };
 "ducksay" = {
+  revision = 53631;
   stripPrefix = 0;
   sha512.run = "0d81bad6d32724b569a483cd6656abe3700e218a52dbce511f6740d05837a9a0cece95461d3b7cb6b4b35cf6ed860c675f2182d61eb1498b503bf1660b675441";
   sha512.doc = "9667ff1be349058cf969b512e022f354bc840867031d004759c5be53fee67cdff0abaf5a02205181ab6caded8ba46ee4d6f68570d7b92bace69164d7a2418151";
@@ -11082,6 +12110,7 @@ tl: { # no indentation
   version = "2.5";
 };
 "duckuments" = {
+  revision = 52271;
   stripPrefix = 0;
   sha512.run = "77c975ea3e42faee4db5d99d692220884b24ccce2d69a30ce484d113cd261ddf5cf5a13ee04d9e8a95572e98c8c4bedfd901db34379af6a567777f9358e4bad5";
   sha512.doc = "0c9e24cc988b9350d188878dd8b463428133fe30c00218eed3d67917ace24412e55c396422890fc6c02030378b560b3d374970e879e3a331db7d8e34b3302421";
@@ -11090,12 +12119,14 @@ tl: { # no indentation
   version = "0.5";
 };
 "duerer" = {
+  revision = 20741;
   stripPrefix = 0;
   sha512.run = "15f39b70d6b595a1c4d6594a2908fc07e3597bf1bf88ba25b24ee545d473c709a15b52ad0bd367b0cb1a47ff9548a110c6dce6c2a2b2402f655c21f6dac5a393";
   sha512.doc = "babbe18510ab7acc910639e2993858b2cf27c4414772d2a03fd2d3576f7dd64f4c7b1aa05d9a7913b4eb8d4eddc942137b41b87816631b34cf35e0120dd3ea40";
   hasRunfiles = true;
 };
 "duerer-latex" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "e474634e00b86878bc0c09ff247a930e102621d3606079d72e7c284a8ec61d2a2b36f1d09c171b7a4953981dea65df49da1962f01df272fa80354281a3209bc6";
   sha512.doc = "d1ea1a023e9f2f1ea4e0fa045d8831f764dbef34d1ef2ec96090f7f7a49aa1f4ed2df63bb611ee354a1e816a204841fbd7f4059a14ed06d758a31ca9f460d50a";
@@ -11103,6 +12134,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "duotenzor" = {
+  revision = 18728;
   stripPrefix = 0;
   sha512.run = "33990302586baf5731976a27a8268986db6917137219248e559900fc2e64e5ef443bfd14a0472194a962f6fa59a8ed8bb1caadd46badf157fbe39f36815eacd7";
   sha512.doc = "83a811a37004975e4b3fca67bfed83d8fc85fe97a07a20f624d321c62efddf2ce188f1748a5cea47185675e8d5226433b48327d8d7daf87465471b89b652f2fe";
@@ -11110,6 +12142,7 @@ tl: { # no indentation
   version = "1.00";
 };
 "dutchcal" = {
+  revision = 23448;
   stripPrefix = 0;
   sha512.run = "46b90d505661424bcc96d40bae09303193baf5c681338b5b2d526e51ba59cd56fd64a81a01710fb4911727a3cc4263e731754d82a9a2c021bdf73b6ffb15f5b6";
   sha512.doc = "adbd2c44d3b2de4149dc647d4e88e46fdb968e6c6898c4de3395d51665bb147d0abb474ab462e75da028265d0cc6935f930f4397558d057171dd56a4999dcb25";
@@ -11117,6 +12150,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "dvdcoll" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "e6b553b2e13e87e105ba1c64422e5269e2f285754f12db1d43f475e0f94dbd32253620c1e71ef08de106d5a050c531e058e529264478e7f4545ed83dfffdd233";
   sha512.doc = "59b152b1922bc79ec3a132902547e8ffebce8cc05e2933b3b54292b507d1ac1810cd0aa2c974045b9b996fd14445126e3eebe6ae3d6ec45e1fdccea9a6ca35e1";
@@ -11124,6 +12158,7 @@ tl: { # no indentation
   version = "1.1a";
 };
 "dvgloss" = {
+  revision = 29103;
   stripPrefix = 0;
   sha512.run = "51227cd1323c6ef94f8e0c537289abd3812f39109ce178793347d6615a718109f120bf9e6a4dac1ea801effb6f2b9425c376fdcfd5db6a5409887a8b9b49dff8";
   sha512.doc = "4e59a568e0230e5e5dab7968eb27a8bda4680ed31b23d21fe3dfc15d0e3d8b3d6599535f91a092e2f9dea69402ba8ef07291d2cadc1e1cce28aea927fbb84341";
@@ -11132,25 +12167,30 @@ tl: { # no indentation
   version = "0.1";
 };
 "dvi2tty" = {
+  revision = 52851;
   sha512.run = "303289e5bef9fcc097c1e3ce3eff923c303f50f71c72f2c3929c55f006149171eeb4b69ff38f8a46b8a5d19ac79ebf6ca28ad1df5f9525a8f1dc6587bfa42d72";
   sha512.doc = "fd8c456f223c78128b5a7c50bdd93068d00f92ffbb096ed2cecf23180b765eba0ba0dcea374f585754ecb28276e668788979e0be131465fbb56967b4ecdad900";
   version = "6.0.0";
 };
 "dviasm" = {
+  revision = 52941;
   sha512.run = "4407c22869b64e8ced5e48c41d56495404bf665cf5b9d4d252b71cc4a868696ad2f3339c4c92aca354d5fea4ebef294509e282fbc87136b12565e6c3c2de43c4";
   sha512.doc = "a11c7b5e891958f10adf03812ff0a6123e8bff09410c4f9002e23d488956835019e5f54a5f130133f214831060992f2dcd7dc76b4497647b7005c704a7fa2d2b";
   hasRunfiles = true;
 };
 "dvicopy" = {
+  revision = 50602;
   sha512.run = "34e16ff93daa924658b433affc70fdab01bd8d6c1d537cf1787389b8de34e7348aaa91a39ba3f3671d25d216420421a5ca73cff5de254fbf25a8433e20fda322";
   sha512.doc = "a85e3cf8ee5e500264ffaffddf8ebe6642373f29fcca42c346654f304f34b9389f2e190014eacd215ca0d78debe44859e05696789b9f703fd6eaefc9bebd4ff7";
   version = "1.5";
 };
 "dvidvi" = {
+  revision = 52851;
   sha512.run = "d4589c7c034308547b4970104f6396ef24a15be22e034ac2f4f04a1004915c8d477e64e2c4b61927f43313b90b063602a4bcd45afb1bc33ee395e0b7caef202b";
   sha512.doc = "865f4e96bc8ff13005350800014ede4c95671db1c45f35e37b153637c23834d34054e3aac1b6033c6a219f9f123563b1d0cc3093c901f67dba7e33e65ba81646";
 };
 "dviincl" = {
+  revision = 29349;
   stripPrefix = 0;
   sha512.run = "dc09380d453b2c83359fa1862f6d289162ed4ec12e7f1b2842789db26e780713981261369dee0d03561a6864bb8bb25e071ca73c3d85e6218667587fa78f55bd";
   sha512.doc = "3418aa91ac8daf98f2ccbe67c2ca13bcf8fc5adb380f7c56e133f4487bc3ab701be1925d7a5878fc02ab7b8607e70991887a3d875d25b777b5489b7ae904aa7b";
@@ -11158,51 +12198,61 @@ tl: { # no indentation
   version = "1.00";
 };
 "dviinfox" = {
+  revision = 44515;
   sha512.run = "33b37192832362c170575d1770b0e8da105ab0f9197ee52ff86a9dedfdac718fd7f3ca87d6f3f2075803fcffbc2f3739b806b1088bd7e2a21beca53292d918f0";
   sha512.doc = "f5f84a2df36ee93ccc0a8acb687fa4fdc6441ee6b0c76fe4330cb28ff2e5106014df5f367d5f2821c10864ff16988837099114ce331afe8a303e0f9102d92193";
   hasRunfiles = true;
   version = "1.04";
 };
 "dviljk" = {
+  revision = 52851;
   sha512.run = "7f0fff6f850f22788981370dfe9759f8d1ac803f75e6355c582eca83ca3940f64e3c32c32881234e25d8bda59e47a4f236751c9464dc41f93c67c16cc55082ef";
   sha512.doc = "82d28f1adfc368582a5b1d05e2e73ba99bd05d51f9daa972f5ca753905341ee1d61b9e15d402b3017bfdd78bd64c7c222794bbf76073517f96ea1b9d7a58cea6";
 };
 "dviout-util" = {
+  revision = 52851;
   sha512.run = "a9445602ac5a3663920f8c7d428e833b0451c3e80203be57cc6fbdda5db5f7c89da75cf58e74d56c4ab9cd817fc9f080a056ebd045828a0d5b034108cda61bc5";
   sha512.doc = "61f86a23314334d7faa4f1ae0760aea6c5e5f77754a6a9b1d5952f09e3e15d3dead73a9f72ccfe9b9d7a022654f8d2e1e6e3051dc12bff574b6f053cdbc9b598";
 };
 "dvipdfmx" = {
+  revision = 52851;
   deps."glyphlist" = tl."glyphlist";
   sha512.run = "9bb72d88bcb5c0cfe818e9490afe532029b8fc569764e02706e0301e901287d617c2111d854ea96db00e3567c29e78dbae42498f837c4cf429ffd5c098df565b";
   sha512.doc = "121b8956d42fb45be7d61371661512f5b8bd75fc2b754ef97c7a7b86b6e43435425403c99f5ad9492d4c6feb8948b4d10c9bd67c621f1451fd6abc5b13dfb446";
   hasRunfiles = true;
 };
 "dvipng" = {
+  revision = 52851;
   sha512.run = "abd26644c7980c2b2d10dea4d8ae54ee773fc9e417ca0cc053665ed814370b8ae3ea515818eed2171dd52a996c253e1269f4b3a9469f776d55ca429b92389222";
   sha512.doc = "2f6a35103039d27cb78451a2b1a4832765f3bb482cae9ccd1aa368124f11648864860b87d31f3a81a489bdfd4c938572039c3329a8073be051d1386b2ef38075";
   version = "1.15";
 };
 "dvipos" = {
+  revision = 52851;
   sha512.run = "152cc45942bb1d241008ea0924f1e96e2329d6fd4228be42dc6dcb9eb28081bcb3d80e407e9fdf0560e93d095fd07351cf073f14d4a4c25eb984613fd9189826";
   sha512.doc = "2bf3fd5bbd7b6e1fb8a263dd0e3deef358bead727df5de280342376225fd7366ff470b9c2fca8f763890d1047fe2c7a5b138ade1b5fcab383c8113e10f245199";
 };
 "dvips" = {
+  revision = 52851;
   sha512.run = "c9ff911b92a757c1eb300f933f049c686c85d4ba09aabfcbbb87013fc34cf106fd5560931719e2f50be4357f9d83fb24692ba1ec24d2999fc3da79dbba02fcd3";
   sha512.doc = "2d6950701b62654e303805bcbb364711aa93aa7eee8165944167046584c9686667304b70c6b8f43bf36f529e70e9bbabf1671cfb1749a4cb43ec9abe4fff353f";
   hasRunfiles = true;
 };
 "dvipsconfig" = {
+  revision = 13293;
   stripPrefix = 0;
   sha512.run = "ff7ad395329dd1cc5d21d5459916d0f10a8c03399d733048bce0a8aaa4e3a955f3ad3dbb228319d4bfb96e0694069002507bc294ed81fda5a48ad93f8cd82589";
   hasRunfiles = true;
   version = "1.6";
 };
 "dvisvgm" = {
+  revision = 52851;
   sha512.run = "c7b33eab605df8488a6f0d25e0a0d7afde99016cc719a6b13bdbe68df0d1fce2c0d0996742633c392b0f9c56ec6aec307734b06dd845d4cbd2777c932b057d6e";
   sha512.doc = "253a0ece82b4792bb30504132b4db8382b073bb004d1ab22ee8f74b339227171711318d76d59ed20c7bf66575758cdaaa9c4dc3199d446150971a1d57152c91e";
   version = "2.8.1";
 };
 "dynamicnumber" = {
+  revision = 38726;
   stripPrefix = 0;
   sha512.run = "802df3848c8ace40e1eef5c1d30c07a6a5f30fc902a9bb18581b79ff322921e7235ab05981625eb289f093f4486f0aec2e9c83bf669a9afa993a86146317b619";
   sha512.doc = "3eeb8617b33d45c1f97756f58bb87fa1244cd3089e0ed64f363f2909480459ce17e30d54bfbf948642856984618081d0fd15c0721d0190c187b375fbdfcfcebd";
@@ -11211,6 +12261,7 @@ tl: { # no indentation
   version = "0.1.3";
 };
 "dynblocks" = {
+  revision = 35193;
   stripPrefix = 0;
   sha512.run = "bda4ad43754e7d4fa87cc4ac5bdb772cd24a4e613bcf7993e3d448a9c884aad5ad484c6dd7739f4c6edb983560181717319dc26376a6025f3847afb588fa47a1";
   sha512.doc = "4f4084cc4dd913bcff3e71286fa4e881c7d577afd8e0669396de2ab18ccbdbc8649117bb931e365fa5999c5c842a71cab18da5573e83c1d721c87256e614c321";
@@ -11218,6 +12269,7 @@ tl: { # no indentation
   version = "0.2b";
 };
 "dynkin-diagrams" = {
+  revision = 53832;
   stripPrefix = 0;
   sha512.run = "9ca3c426525f48db3f2bd53ea6dd0bfa2c67184b800efbe7e5723659f7c0cda9bf1c1d2f56ae022783689490b4bfa47d5028c9dca02d534070bfd6f2a242c28b";
   sha512.doc = "c6d3d0f6315bace752fc85f02bc90e118b66048631f24c82d72d39da56bbeb1f40bec61059c441e154b9f8002cc000471a6a5b34e5dad39acd8bc7d98364dfc9";
@@ -11225,6 +12277,7 @@ tl: { # no indentation
   version = "3.14159265358";
 };
 "dyntree" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "8f8d568cc708e62ae1217188acf3deef05d7bbacf1da04f38c1f5b08d4b2bd0ee465021c923ed314ed284dd2234dce5079b7918c12d3bab72ad5f91749bdfe4c";
   sha512.doc = "fde82bf8b97840014737734fb57eec7c37b34ca0d5eeb1a66c27dab16d4a5f1c4a7f7c10fb9c8bb98f3ef56a15645da0ab66cdcb658f69ea32eb84625b25023a";
@@ -11233,6 +12286,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "e-french" = {
+  revision = 52027;
   stripPrefix = 0;
   sha512.run = "ed14a41b05d47117fc354bb5a1782338ed91ebbd6071af96f4bb94fcefed31048ef3ed1301686dd720d7f1c9ee59c518adbf83c6c7de2c35e3d50cdd65c0b0bf";
   sha512.doc = "d76ba6c016c8a48a06ed126d0d011e1336203cc8182f744de9d238e723019156f369574b7090cfcc943829ef058b77ec536ab6bb7c054e5e2587dc92998258d0";
@@ -11240,18 +12294,21 @@ tl: { # no indentation
   version = "6.11";
 };
 "ean" = {
+  revision = 20851;
   stripPrefix = 0;
   sha512.run = "8a44b134d612ad4908a3ec025b0934feb56a8a8d7c7dce91f7ff152fda91c99c0c557ecacf7b22d8e9abf8e99d28b09b21abc8658e598baf37bfbbaa885b86d4";
   sha512.doc = "35c7d054236569b03082af07412f00dd08d760547433ec8da1876a83546c7432c4cdbffb617ff34b4e48b86873d699d41749bd838e12ffe32980b3d6e92865b0";
   hasRunfiles = true;
 };
 "ean13isbn" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "39d124c59b8c35c0ce103530d30943bd0c17060981f2be4412cad2a38bdaf0a3f4332105e07248718d835169d33fc50ccaa07d462d494e3d74ab02d7de344653";
   sha512.doc = "b4f5f0f2e3e8316c61129a6b9662cfb0e23aacbe58bc3e111d94ab7a51d01eaee6354395bbdb91a944a261a794362ed719fc6e515285f55ea901acc5e6653d75";
   hasRunfiles = true;
 };
 "easy" = {
+  revision = 19440;
   stripPrefix = 0;
   sha512.run = "fbc84351fe02c560ffa1c6b1713e762810123e7abee47bb31899d4baed353928350422e7d237abca758753ad306f927466919ce6b160a3820d1d5101c0b71ee9";
   sha512.doc = "27bfb9792f0c8261cd2de9bc95dc4023c69a37e12037855e31c606f0dc18d47e45f8299d385fa1dfcabaf6df298bb529e9da41f6d9d36f38f8d7fb5ef7930886";
@@ -11259,12 +12316,14 @@ tl: { # no indentation
   version = "0.99";
 };
 "easy-todo" = {
+  revision = 32677;
   stripPrefix = 0;
   sha512.run = "88b496c1f4f56d26ac2fcc6d82e28d71bf11418368d82d3dcb193f8299672bf41d6c15938f3f6af5ac28141f2a52d132844fd178ebb9694de7f7a22fe8f13eaa";
   sha512.doc = "b2c49273445084f94083ed11f43492ed8ca32582fd9ffe9d12ccb7afe316b06b1924a507c5a12ab5880cae40ef4ee196c6d3e5d05f916356fdc026acc0a9acf1";
   hasRunfiles = true;
 };
 "easyfig" = {
+  revision = 47193;
   stripPrefix = 0;
   sha512.run = "4c84122d2989fa90533ced69f6eb9d2536e6de9fbecb096412b6459bdd45225bbf48a512ffdf4fd3f8ffa8a582b47692661b3f4197fe76f911682582b038bf06";
   sha512.doc = "9544e9d4bb98f78915669d8ed7f314e1de92a0fc5c57b6163a1aa91afa7c97bc0a0726fe57fb1f3b03d981f9d9b320f211316e0d1babeb3d2900f7f49e9a2fdd";
@@ -11273,6 +12332,7 @@ tl: { # no indentation
   version = "1.2a";
 };
 "easyformat" = {
+  revision = 44543;
   stripPrefix = 0;
   sha512.run = "f952227a7b0e579d2bf432b3a72e80a45e8adc22ddd9e7af380de54c12f04acf6c4a88dde5a8e7027d11fb820448fdbcc6a343500ae493fa20341634fc64aed5";
   sha512.doc = "99b5f56c6004b72bfc7289905d2808b5e3c743449896e2af88a7b5c23bae3c62aaf2da9bee43192c662be28372bd856dec1b78a56626d5b1eb91b5e21a759356";
@@ -11280,6 +12340,7 @@ tl: { # no indentation
   version = "1.4.0";
 };
 "easylist" = {
+  revision = 32661;
   stripPrefix = 0;
   sha512.run = "b1ddb6242b9ad2e40785602f942d4381a5d72a7d35784bbc2a1732ead1fbd9d730b580226452e9f56fda873b174c56f9b433f1193e0e3424efba4821f7b714ad";
   sha512.doc = "518258b7d24763477376657e128ef3504d2c8e0f71187edf9edd34825d567f9cdcdb09d61a37d99655959d7c76edfbe550bd08ebd7760735e46fff33bddfbf0a";
@@ -11287,6 +12348,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "easyreview" = {
+  revision = 38352;
   stripPrefix = 0;
   sha512.run = "4efa69b2e6280333a89022f93a95c8af4d22cc9b82c4e8692291470af83696e7ed524c77cfe9d9c397c4136c0ebd8399a8ca4ab47d42b84da35bb79189ff1b6f";
   sha512.doc = "4f71891df0b1dfbf32be06a427f34e5c45f73543b3acb9117487d2bffa46f5b61b74f795249cf3d806705beab710c5a7934a59a8e215c87678e778db517a0832";
@@ -11295,6 +12357,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "ebezier" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "ccd80579b8c7e7e3500ad644f8a418bbd48ad1f2e1cb2aaa82836477553332b43092bb760c01cd7412393ee5b8bf23c055361f111467c71bd7061459781557ac";
   sha512.doc = "b81d28abf5c8b4a3dbed9219e6519e23fa5b94428baa8aef0ff32dd4893b24524e49cbb8ae08327a7ee59eba93cb0fa2950883d22296451c1f7949225f42b1f1";
@@ -11303,12 +12366,14 @@ tl: { # no indentation
   version = "4";
 };
 "ebgaramond" = {
+  revision = 53956;
   stripPrefix = 0;
   sha512.run = "87897444a30627daa830f97f184766881e0c3c94108f0fdd3c83a56861827070623a1a374a579d7bcc27efe93761c2d326638a6f36708da5e785626efedfaf61";
   sha512.doc = "ba927f6c72f6761dad70cabc51b5163d26e5679ebdbe55987eeae4cfcfb36353efea3fed98431fa93875c15c9a40cafe8db8d300c94531ccd307fdb4a1d71995";
   hasRunfiles = true;
 };
 "ebgaramond-maths" = {
+  revision = 52168;
   stripPrefix = 0;
   sha512.run = "5d65f676daee62f96875def0faf6d1fa217143046768985956372473b4cd3c6c00ca650cdedcdf677d6ae6a03c65743d30df6d32c36cc8366d8a1a9961bc11d3";
   sha512.doc = "d2207e0f6535be6ed1a53fc15717a60fab0d473da4f307cfc70c7271fbd93e7f6cbd92d1c0f0738da6d1b607832cbed95e5c87edd53cc5423f35f287289b4573";
@@ -11316,17 +12381,20 @@ tl: { # no indentation
   version = "1.2";
 };
 "ebong" = {
+  revision = 26313;
   sha512.run = "c16699e17aec0c6b8148b8ea224a3b2a0dc4fe1982e0b8dc5105f3a07075d99a07e743b55cb3ee23451a80d84e9887ca10c810c639b36a30c8ff275a27d9dcbc";
   sha512.doc = "82fd3ee7c02b22bd42c38349a50fc61e78050040877f28b4f9e88f89ead962732b7e20f1999133074488b26d9609a36afc563d8e6cc5958829af22d2e3e44008";
   hasRunfiles = true;
 };
 "ebook" = {
+  revision = 29466;
   stripPrefix = 0;
   sha512.run = "3345ec303d77965800fb78a1a6b0645c206534bdf84e5b5287d23fb273a720025ec770527d662a5a535e98fb6cb9a6d37d50569963ca24225af8d626ea7d4dfd";
   sha512.doc = "0aba8d5010ece8e6e3c155d05a87eea960d8ec1b4deb1cd7ba948b4106eb8e20d752d3032696bb98c1d23b1927317d3d53a79fdf0b62e9053245aa86ef6e79e5";
   hasRunfiles = true;
 };
 "ebproof" = {
+  revision = 44392;
   stripPrefix = 0;
   sha512.run = "1b8ba3dc47ba03fdb14af5e98ffddab51ba4ea2c423b959ea6b88f00e7b3c837daad5f43d4963de1f6a4b2f55527a45645783b0edf62dc30118f51ed71379a9d";
   sha512.doc = "33eb4e25b0083b9c3844d4786c1f483d37e7a00f716ceec92c4e5a5e57cf1c8f1a5eb474d7f3c9e98a688174a16caab170a1853a6757ebc5ce0be837811a32f6";
@@ -11334,6 +12402,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "ebsthesis" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "37df2bd7749bf91c2e2a6e27e92a9222ed9b9d499b3a9bdb63f7751008bf7a4bea20d62bd59e8672b7fbc7bf0caa1ca77ef797c42224fc4167e5212f21cafbd3";
   sha512.doc = "5c508fdf7304668a371966d1be0198d71cce4ec762aa1b5b480dc495f47dd13d88f678d8613ed266e1d8e1353811e3058c31aaa5ae9f181c34c6bcf40adf5ae9";
@@ -11342,6 +12411,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "ec" = {
+  revision = 25033;
   stripPrefix = 0;
   sha512.run = "a967804b42bcc11e766d5b74de28c54d167625d2b108a34bc5e49351533ddcfe3334e4a7a34966f8d159bbde6a80f84b4d216553ce03fbcfb7a4b6267574538f";
   sha512.doc = "bcf6617cf66af91312aea98f6c4a034f3af4ada14687414e7c3572e319fa4bd957dd25ebf557078297950d8ba8fd02229c5ad53464077feda462263b52536f29";
@@ -11349,12 +12419,14 @@ tl: { # no indentation
   version = "1.0";
 };
 "ecc" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "0f91383595d8606d0a118f8111af0531e0c53fe383511b6424f7cbbf70ace9c4d94dd379813bfceafcea11f6be361bf7d8df2088fad98a42a5e5d31476581f11";
   sha512.doc = "e3263aab5c8ac9985c579d4fba121085419d5c28e4813798402ad67213f96575dac0776d18918edaa18d42d458937a1e60ad666b2a01dea445675eea7e32b2c2";
   hasRunfiles = true;
 };
 "ecclesiastic" = {
+  revision = 38172;
   stripPrefix = 0;
   sha512.run = "f2518f8f25bf4b7c7fd34ee5fc271d08c3262ca2d90e271e02db96ef4826bdee53565f004fddd89e886258716874b101e7fb63b46a6124ed13b67facded6ddcc";
   sha512.doc = "35902f78af7c9acc42e23ae1d5c39ead5d92f0cf73f9c27b3f15d025555ed08502709638dec3788305fa776bb2924eb43e691c6e69424b23c21110de3160b60d";
@@ -11363,6 +12435,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "ecgdraw" = {
+  revision = 41617;
   stripPrefix = 0;
   sha512.run = "419650d8ad24b9e08523953596a79c318740b2dcb7fd18a7c7a17019fe17cc66439c0acf56a7a7f8176349df0d80b44640511269d498cfa19aba6fb1f353923f";
   sha512.doc = "24968ada8568861eb973967b33827642e1201d002f73d40de5183a38d5f447a2fb93feb1db32807829c071d1a1147039e34ed4c287886260453b9c9737693986";
@@ -11371,6 +12444,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "ecltree" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "7461fe472dbd2ecb4e692cdbd58d5b801960d160bd7e18fa7d5ebe3e42defd11faba318d5d9134fd17275a4271f4c7761fa2d65fc1f202b4eb7b0fe3968a9fbc";
   sha512.doc = "3dc607ff60f9e738476b1f5c801801e3dc10713d7f5dc4b790b92f454fec1e68e9abe8efa7e4b0464ed6ad854d7971e241987fd63d406ba9deec9c99f8bf229a";
@@ -11378,6 +12452,7 @@ tl: { # no indentation
   version = "1.1a";
 };
 "eco" = {
+  revision = 29349;
   stripPrefix = 0;
   sha512.run = "7bed893bb3f379d61dc874280ccc26db037511ea69faf37076f3cfbf01cf3d747706d40086eb99c502f215f026b2e357e44e8940a859559c3a5d9876bfd70c00";
   sha512.doc = "3c2042779dd30c8ff0e8f09580b3173f3dd43659ff2ca94c52500f989a338a29799c22eb08c493dfa82496117d7fd7548f903f71fe488727acf4e517dc6c0377";
@@ -11386,6 +12461,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "ecobiblatex" = {
+  revision = 39233;
   stripPrefix = 0;
   sha512.run = "bfa49fbd340223db68ae6d0906b617c06605a41aa141ce7863d5ab85b4da44eaba554b93bf163f7e4b7cd2c5131e22ba30161082663588ce85240fe2147433a5";
   sha512.doc = "e12bf5be5028e848baf10fed969a5ea94e2246153b481fc1b8ab55a6fbb5c356391ec4ccdb37ae7c71d76885000d9d74e46271402ed83ed08d1d67a94cf372d9";
@@ -11393,6 +12469,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "econ-bst" = {
+  revision = 53937;
   stripPrefix = 0;
   sha512.run = "94b5c473100b1f6f900093f78e2a3a4b30482cb81a55ba27858dc12883e221aefb686b6bf6ad5bf98982203350d73b5e745e57f26f1fb8c62ab9f4a4378f7eb7";
   sha512.doc = "fef5635f67b826505174596c98ea9e6d596a29d0a844ed1df08c6126aa50900626cf4ba2a09383eedf55dc3f95c459ac311857dc87de014ec1d6b22b6d2a2069";
@@ -11400,6 +12477,7 @@ tl: { # no indentation
   version = "2.7";
 };
 "econometrics" = {
+  revision = 39396;
   stripPrefix = 0;
   sha512.run = "40c205421ca11111d2aeae9f84b4e418e6b4f260858805c03029753af03def61221b81eabc18dea5fd4cf5722e3dca1ff9f575264257db3a8431b061177530dd";
   sha512.doc = "b5992f38536f0e4ec1c570d78523530b53e428d922517d0ad380ec76dcd2ee21243b9979e876a7f809b1581f4c4b6907bcd3f581dff97c13a0fea2a0fca1d790";
@@ -11407,18 +12485,21 @@ tl: { # no indentation
   version = "1.0";
 };
 "economic" = {
+  revision = 32639;
   stripPrefix = 0;
   sha512.run = "d8bad4a76eefc8729ea06e93a63adadfeed57de5694775bc44f1dfe03217101609ada6d12b7a2382b9d80d068f0c51fb2ef45c2cf289fe294efe23fcf0bd028a";
   sha512.doc = "39c319f14ee3d6fb10fa3c4f5d3a873322d332bc181a33a70020a9fa787383b72809b3b9aea5fcf4a3cff9930543e0d0269f74146c12f2b0d77a4f77c159eeb7";
   hasRunfiles = true;
 };
 "ecothesis" = {
+  revision = 48007;
   stripPrefix = 0;
   sha512.run = "bed57bb0ea79c74517b26e51d88966f9a05943c4df6464200ffe36f486e9cabccaef2fced0a231b40b40410ef32c44a3ebaa984e6def30bde5d426dc68e42309";
   sha512.doc = "7e1e3716de1eb964142a85ab31e28fc807ca1433f964e44cc8a7103b9ed023457bcdb01af2797a5e22fcf75a2e851d9c534f17937fdc44e4ebb6b5a670c6c115";
   version = "1.2";
 };
 "ecv" = {
+  revision = 24928;
   stripPrefix = 0;
   sha512.run = "0ff0a352516aa90a19eb1a0a9bdc651601edc63f03c5cce9face4bd45b359734d954e2b7859a0244015e3933eaa2d3803d5579ab9260dde51a0ec89db8034910";
   sha512.doc = "1cb8871b552a3d91fb59c644ea98373742ba9bfea64a92911f67f2795afaf01babe82a691fb3344f236e42b92860b754d7e92132b266713948cd1a6af13c58d7";
@@ -11427,6 +12508,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "ed" = {
+  revision = 25231;
   stripPrefix = 0;
   sha512.run = "a6999fbe2a9a44f961ef60d3da65ea306809d1ee5c39d2fc605982083d69c3c723a0e18f4042cbd441103421cb569008925279871ea8ceeb0af4c4a21b746943";
   sha512.doc = "cd7bac245c14e969b5162b86cfc76e0673da357fb1492ba311930ea7e20a6db61e3a13be2069f4f589ab57cba9fdfb0fcc8779ec8607a624437d1b2bd746825b";
@@ -11435,6 +12517,7 @@ tl: { # no indentation
   version = "1.8";
 };
 "edfnotes" = {
+  revision = 21540;
   stripPrefix = 0;
   sha512.run = "3ffca21a97b1e54045129a8894db25d677a54c791e3453f53285741bceff0eb4c7cc00e81706ef77ac475a0f54a7868f2e9b444df0c4e4ba6b161fdfa954dc07";
   sha512.doc = "144e2e22c4ceb6ea46235ed51b9a1ad4b20aa524af7b6eff617194aaec4f1606d857a8575e95816b4ef089e5c7d3fc1e2fc8e622486bafe9e5a9ace22bb44105";
@@ -11443,6 +12526,7 @@ tl: { # no indentation
   version = "0.6b";
 };
 "edmac" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "a9f12f0745305ce261b142f96ed496341997098461df749715723fb09d978ebb037976c7fd7176eae2475d24c71df201a0123b1651749b2b96c9ed9429746f6e";
   sha512.doc = "a54f4b1171f8f6edd6e655f49adec69f21a8293af03a02228056ca700feb7b656cbf715047a20f45127695fa851af45fb5e4852ccbf7d28374a02d14f6e55acc";
@@ -11451,6 +12535,7 @@ tl: { # no indentation
   version = "3.17";
 };
 "edmargin" = {
+  revision = 27599;
   stripPrefix = 0;
   sha512.run = "242e7eff25ffb539353b73c18d31a268efaebe4fb51d9ba1cf376346e559ea2fb380743b29056aeb8e4db2065a660bf59e7c8dcf5469f91c39135be2b8c9527c";
   sha512.doc = "da77df03b3eb89daa0a544d61c88956a7105073110dd9e1f4d1a753805bdf722a63f5a9674897f4f09a92f689d6bbafc190c870cf5784e02df7efed781dbbcee";
@@ -11459,6 +12544,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "ednotes" = {
+  revision = 35829;
   stripPrefix = 0;
   deps."ncctools" = tl."ncctools";
   sha512.run = "be181a2665a8dbd44d98f75a0bc718b460d85c4fb66e412e18f12b542d65a870660597ece71588e9410214a61d6e2d9883089ab1439eeefd63a5cea95fca5d6b";
@@ -11467,6 +12553,7 @@ tl: { # no indentation
   version = "1.3a";
 };
 "eemeir" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "81679a08a320275221058cf0a73d71489621bfa4322a4b90759f67253df06e5c98c1325846966924c145092d9f63d9ba51544d0640c7f0827c7ebc42fddf9f3a";
   sha512.doc = "4f7a67d76504c4fa8de1f7f4e5db19c1ed1509a3ee68d93811c84e3ca523b8ff040d61e14881ccf75d20edc7c6b52550b3b3fdfa58a9a73bf21ec7f8b0b719aa";
@@ -11475,6 +12562,7 @@ tl: { # no indentation
   version = "1.1b";
 };
 "eepic" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "37930ecdebd43ac8ac1dcb42da4d4eb4b5ff371605b9bfe4675ea861f4edff7cb19703669c8356c3d69e7ccc09789bc536714114397c3bca74fcb4a22b6f4d9b";
   sha512.doc = "02efd8775f6d0db35fa4682c6bc715fe619037a6531de60a2955fbd7fca01d97a8e6dee0109a8cd7cc8237bd694c64797392991e5c203baab49dd9857b0ccb4c";
@@ -11482,6 +12570,7 @@ tl: { # no indentation
   version = "1.1e";
 };
 "efbox" = {
+  revision = 33236;
   stripPrefix = 0;
   sha512.run = "5091324e7f5c05385296d570027a8546db4220a24da330ab85ef5d1185772f51b4f200f63eaad0cfa3eaeafd3d055509f4ffbdf798c1139a60c5e572ea46926e";
   sha512.doc = "394387e09ecb0d497014a62fc1caedcb3e00148f6e0a9a16ae1b53efbb4d5cf749e154e4c905d197280e4ecd9bc88ea07ab7e0c004b8c30eadbe7f9f414c1345";
@@ -11490,6 +12579,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "egameps" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b8d1c056783c4a71484a00f0d80de4eb9de3beaa54cc4dc71e5a7c171871b5dacba753ad03ab196661b1bd73cf9d2eaf202a813b73bea405f807319a143644cb";
   sha512.doc = "0216a85d539ab19aef8c2c4f313f5095aa39e4955ae9610c14d0243081b7af98f50a74a2f7720b376493e660a5486f83e69b41f8cb8017ff66a8e706eb9ca71b";
@@ -11497,6 +12587,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "egplot" = {
+  revision = 20617;
   stripPrefix = 0;
   sha512.run = "c96cc3185c09f66fc6a4c19958b88d178cf0b6ea9d889938df5a07d4fb7b19962a9c17ebe0a906ab19a8725808aa09ee41b39a0379fefbf8816a5e78abf9201f";
   sha512.doc = "e6e55708004cdf3dfd753071e2fc242428a6636944f3ea65510d2e9f8e2921b869ff4a22d100b43d70ba0708a5b19f002bbe21f57c858ec72b11ffe82e161e50";
@@ -11505,6 +12596,7 @@ tl: { # no indentation
   version = "1.02a";
 };
 "ehhline" = {
+  revision = 51122;
   stripPrefix = 0;
   sha512.run = "d0549e354c34d1ad76502ccfd565292074a8e1aa72f021c9efd8dcb39ce9465ccfb0add899226775e82e9e90ad27a7980d5f79fc8a5a71a449a8a17845384918";
   sha512.doc = "a3c436900a964fecb613469c5beca557a0f923d1c651591d9b884f88f127c435081a5fbd2f4129041f5438536901feaa4697b59a011064a4b4822ef6ecea5068";
@@ -11512,12 +12604,14 @@ tl: { # no indentation
   version = "1.0";
 };
 "eiad" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "3123d601a5f5c34c45bff20eb052a0934a2bba9d693e460fdb84908ed327eff8b3a022a5c617c8818bd48b1fe72b9b0c48443e0cb290f15e94334152f1f5e5cc";
   sha512.doc = "546bbad79f9f13e420b05b318010f078ea8844a02cedf11faa506d41073e2e0668356291a4e12758e5a37586e4aa9c79c17c8135f244756c39b61076038fb8e6";
   hasRunfiles = true;
 };
 "eiad-ltx" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "e052333d39e72562e8e84d0e7f6af7066c2068a782422f612a26bd2903d8143874cd4dcc556d7406f3601a6b3a28506a3c0edc92e4029d124f02fe91edf0163c";
   sha512.doc = "907a20283eb78965dc4d8fdb46c542937c70c7a3f2849984034f9f37872d4d3042064fad0ee232132aadcb7daa4d4ec4b9745f8a6d0406dfa7b929ea68be0d96";
@@ -11526,21 +12620,25 @@ tl: { # no indentation
   version = "1.0";
 };
 "eijkhout" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "448f3b51c984a1ec81428c1840ba01d072cef4d1110b85f8d4f4d786d02e8d08e702e0b33e757035aecef1f43b604746c7b6f492905fbb201fc1a34ca6fb859e";
   hasRunfiles = true;
 };
 "einfuehrung" = {
+  revision = 29349;
   stripPrefix = 0;
   sha512.run = "e346283ecfc6ca35684267e8b11f2800c6715378d84c4896e4d29557fbd97e57665a45503e7cab7cb7def679914b7d737a222e05eaccf543d8d2f7370ed49792";
   sha512.doc = "1c012e15159a2c4940cb7bbcb17bf3675c2b2028e939acd3b1c98ff2cc377b55a602f404900cd4eae3f03de74a98d61f6db0de9ad90e8598d9f49b398b5a6a83";
 };
 "einfuehrung2" = {
+  revision = 39153;
   stripPrefix = 0;
   sha512.run = "affafa673dbb2bb3bd935a977a809bab30d01c92f8c9162eff337b635b57993e884c9d96398d39acc16e470a362276579120f4ab27e8cf8111928b12e75cc72b";
   sha512.doc = "4a4c9549a7957688071226e4383dc9ad3c0580c9e321ab5a71c75806477a2156ce74aefa6dff95a329c65ae8ae6eeec9fab6f6e1f689a827b7050e457b248093";
 };
 "ejpecp" = {
+  revision = 50761;
   stripPrefix = 0;
   sha512.run = "eddfab8de433480327dac32762640d610fce78903630bf0b8b26548024764d5ecf1b6356d6a8d725eda75f075a0b8627be6b90117a11a6dc39f0fb0e60eeb155";
   sha512.doc = "4131b375690a452fddfd5124611bd37017913cac6ade1bbf35ba01d2656f098141e2bfa83da2af7a25dd814312394c127fa1dbb0fd61a3e0f511e8d8c9e6d608";
@@ -11549,6 +12647,7 @@ tl: { # no indentation
   version = "1.7";
 };
 "ekaia" = {
+  revision = 49594;
   stripPrefix = 0;
   sha512.run = "97479cb146f37e0fd80fbcf67db44a474d96da9897fb058073b75bbd9a109f16dfa36bdd97c5fed5397255cf0320028ca687955fb40e069bdfa262af50773c99";
   sha512.doc = "f95512969ca475b87f09fa3b61e2be1ebf949161b7209721579f7ec1399e6873186535ec30dbee092fd69dc427a199daa4f94ee47cc08a0fc37fbac6213429de";
@@ -11557,6 +12656,7 @@ tl: { # no indentation
   version = "1.06";
 };
 "elbioimp" = {
+  revision = 21758;
   stripPrefix = 0;
   sha512.run = "4db2b191fdb73854bfe605efed30c4835a77180fc865eaf201f8405fccaf880e02ac9ef7802c2d215df8ad77d01fff611114c391a6c43190f95dc2b40cabd596";
   sha512.doc = "5097310e0e400c269a30ef8ea26f400ac7768f4a790ca5b79222c0480553434343de7b0976b18bb6d67bc89dc2b2ad2251c24e94e4747450275fd52a8c9d3285";
@@ -11565,6 +12665,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "electrum" = {
+  revision = 19705;
   stripPrefix = 0;
   sha512.run = "c12af3a1e6a76d4a94f0d02fa5802179fd1f47e31be29e2151e7be3f569f027137c9d0268c86696d822b8d7a4c88ae2ef264341345c6a7421a8ec1026c104213";
   sha512.doc = "b840b153a134fd9cd923aa9f70576b7e586bca87d7f1b9cfbf7a1f25ac4972905989876545a914ce845096dd32579901ece93851012d057114c0c61b1eceffa4";
@@ -11573,6 +12674,7 @@ tl: { # no indentation
   version = "1.005-b";
 };
 "eledform" = {
+  revision = 38114;
   stripPrefix = 0;
   sha512.run = "4103aa370bc8314433b5cc9242390340467591bc38e2f5b820f9d35a1951bb9fe9e384b1d3c64a0434b3c3dc87c42463a0af5d9ff872180bc2b7a08d4b40c080";
   sha512.doc = "c59cfa6957a21c5e74d9a15b7621536170137447111f9a88295e79aa7a29dcbb3d1f1f1367afd7243d2506b864a53df41b0e10419592a5e4e12af8e1e90216d4";
@@ -11581,6 +12683,7 @@ tl: { # no indentation
   version = "1.1a";
 };
 "eledmac" = {
+  revision = 45418;
   stripPrefix = 0;
   sha512.run = "644df002adf2f39acd9a6704a5c2e18e02f30d17c8e04173fb0f68e9daf5469bb6290c7e98ca181ebd45b40d54dbdf4a14fbbbe7dbe8f945b226ee086efc3972";
   sha512.doc = "14c8b024b6cc817a025b6a4870d3edcf956ac9e358107c80d29fcab41f343efba5b5832dc22cd11fe2e92bc74b58fc5d67982ab26a60230a5b92af4223543e04";
@@ -11589,6 +12692,7 @@ tl: { # no indentation
   version = "1.24.12";
 };
 "elegantbook" = {
+  revision = 53747;
   stripPrefix = 0;
   sha512.run = "9161124e17257a15fdfb9994d8163a9ac29852b7b67f007a270862690166ba7fd567154147a91bd191c57e24a51880256a00b4cb7fe4a2effb5bf0a6949be681";
   sha512.doc = "ea9eaf95ec5b6e83f7ea51af43ac3107da4a6cb9393f0037e71be4a6fccf201e116b8d47119766e6c4054b0d243ec28f501c300954c1cb7b3ab95513c4db2809";
@@ -11596,6 +12700,7 @@ tl: { # no indentation
   version = "3.10";
 };
 "elegantnote" = {
+  revision = 53061;
   stripPrefix = 0;
   sha512.run = "447bd06f4fe7d1ec3a21d0d43e49ee3a10c50c107fb358c0dc3b2e522a625e9b69f544e30a5235cc0bf25e98c22c3dc36cfaad9fbef076774bdd317c480cc341";
   sha512.doc = "72ac88b89b70499ddd5b52147094585267ca6c48bac1387852742e8562f3db8b6577951b22225d5bf8f5636eb7b3db7cd0fa092e7e8225c7358e1155b919f864";
@@ -11603,6 +12708,7 @@ tl: { # no indentation
   version = "2.20";
 };
 "elegantpaper" = {
+  revision = 52420;
   stripPrefix = 0;
   sha512.run = "b7fe545c2c9d2e55e0cc9983bc2158d41cf550b228bf3357b8a4a051a32d6692aa7ff2b1fcba33e17cac2fb2852e2bf14467675aabd6b8ff6f1d40f89ff2ebc2";
   sha512.doc = "bb99b00f8d826290757907db4179d74222cf4cd992c2bc7c3342a4ad97c2ca83d018ded548571b9acaf9b46d444909be60603710e56638781edf3c036817d470";
@@ -11610,6 +12716,7 @@ tl: { # no indentation
   version = "0.08";
 };
 "elements" = {
+  revision = 52398;
   stripPrefix = 0;
   sha512.run = "777546b1aa3ab2c4a951d618f73b0a37f15de10afa72f710786ae5c9b29daed45ac61db978e07a010f72531203d6fb066853657c6cd728a6dd8850736756a063";
   sha512.doc = "d72b74d189689b77134347ab0e76e7219fa2b4cafbf33cf7f9504a9293635487488b652a0cb293be2f28291481b2eb990baf92739146ac7a554d710b01b6df57";
@@ -11617,6 +12724,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "ellipse" = {
+  revision = 39025;
   stripPrefix = 0;
   sha512.run = "edcbca8843239eae7bd927d9bc6b5095d1b9a4d8db213e22c77ab4a7c5bf7a09781aa225af26f1e4127f263d5322c8138cf38ad1a7b19688468ba2ba56f840f9";
   sha512.doc = "722d50daf9863145c81ad2b97d6acf6b6229d65f868985878651b506b00f52c4a556b888ed848ac1194c4a68e793bc498b2b6b09132c8070b61b103e6ca9137a";
@@ -11625,6 +12733,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "ellipsis" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "1a60250e0db34f3dca834a1cf276b2f0a5975709bec3ae3c7486f92fb3a5c49ac9b07bb3cfa18724f27504c8e12bc7ca933edc453dd0ecb65d63dc5f7fbf75e9";
   sha512.doc = "35441d8562d2be79787f2d3326352dee2fa7a9a3bde500f4d61dc5d8d3eb4f4f782548d464fff74e0156664616342e4afa3a03bc91a2b6f8a028382c12c19e9c";
@@ -11632,6 +12741,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "elmath" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "66e11b5d5166fc6399337183dea142ecd045050176384e71993c76aeacf57c693495b5153887a95051a902167a8444c24ba6fe2ab2fcfc699abfd41ffaa96b18";
   sha512.doc = "3454096f8ddd220820709a83f4b5b741e80213bada631f5fd78292ff77f3a1963a487b07bb6c227451568c594c5bcaec9c1fe9724345a35478a68191305d5a97";
@@ -11640,6 +12750,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "elocalloc" = {
+  revision = 42712;
   stripPrefix = 0;
   sha512.run = "7bd72984c7bc1530e2659364b5e93b643db1accc8a034f6fe8333e26ecc12b8dca9cf40ada0b5986576e266e0eb7c801f9a3e4c2cb7dbe4d8c373ba0f0486ba9";
   sha512.doc = "6b2d6f65683912405cc97b81a7cef07b4eb21be4304a12b5e0e11087d809d32023ea8067a81c01d45851943af2efc4eb4018f3a0e7a39e08bdc821f87264d9cc";
@@ -11648,6 +12759,7 @@ tl: { # no indentation
   version = "0.03";
 };
 "elpres" = {
+  revision = 46429;
   stripPrefix = 0;
   sha512.run = "e3b0dfc5c2da908b95a882acf37ccf56abbad0e37c53c4e8ece14b98401be3a84ebc4546b739ed8a3f5c30977522b5650c56f12028fbfff467b4cf0a53877475";
   sha512.doc = "bd4b73534eecdc0e02184d0736684e09c688bef1658ddad28b0c1a952a63ebc87546c426e7bf3a9733bd62192d87d500ba3f99463830d3e14f30c0726d80cb6d";
@@ -11655,6 +12767,7 @@ tl: { # no indentation
   version = "0.4a";
 };
 "els-cas-templates" = {
+  revision = 53910;
   stripPrefix = 0;
   sha512.run = "38872c8e042f91713f653aad4f613a54aed5f8b6de2bc9d93798239e2d2cd7f5b6965baec089433ad1368b92a08a7fdd9b37041d35fe279b22712ceb2b676dc5";
   sha512.doc = "88693bd2873621c0afda517c6603a7097279406fb8f149d30c74d1a20c23d85d5a009f04b50e1c0ffaabb2bec92953a833a987b0a9a9ec4bfca05c4571114744";
@@ -11662,6 +12775,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "elsarticle" = {
+  revision = 50786;
   stripPrefix = 0;
   sha512.run = "17770bd130aa601a8208e996c1bcf192459d6c6ffd4ca170a303c3a548c7481e7e3a136c64865999ab7ab38ab56b09fc2021555fab60e344a7fa23d8cd62943f";
   sha512.doc = "28c78ca516aee82dfe3be32683ae404cdb7be9d2d248fb747079e2d9cca9da44aec40145d095d2e3f0bb2f3d600712fb75a987c8d1aa1ded3f738e58350c44f6";
@@ -11670,6 +12784,7 @@ tl: { # no indentation
   version = "3.2";
 };
 "elteikthesis" = {
+  revision = 53926;
   stripPrefix = 0;
   sha512.run = "d52fb9c415354b154a1c49158cfc13f97c2d499def4942404671fe2ddfc363ba0f19e7a60a5e75c3d1a6068c94a8ede004de4eebdcfa9f0e10d183c59dfc4fa9";
   sha512.doc = "144b4c5ac1ac38bf92b395d7d68d992a7ed2c6271063a0bffdd4228618dfda5f670c4c98f210f7ee84a2bcd7c56607c305709cdc19d1825ccd603a2c5a71c74a";
@@ -11677,6 +12792,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "eltex" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "6de1507df2fe408081aad0f75b69d7c21807f238d37e3c6d9cd243b741ae1761aced90e948a0c570f28db5a39616954412fc77a87482c890183f039923915c05";
   sha512.doc = "1bdd0f64c524def46dd0a20482b9ad6925b0d06ea272b05d6163a23f61ad1727b099a893f5af7a7de4140bd264b1d3503794a4c9c11cf8137c5c6070d08fe0e3";
@@ -11684,12 +12800,14 @@ tl: { # no indentation
   version = "2.0";
 };
 "elvish" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "ca1496b488a85a32364b264706c9b4e4edde5c92681493b150942a3a8a2a32158b314a163ff4be8afbea489a75feb5dbb1c96e8e70f730530cce6472f9e46912";
   sha512.doc = "e296ece5bb11d273b33e801ecddb1b9bb93e5f8cfc4a7d62b1555ddca89661557149935b7c5a71880efb888364989715b4e39585b2de1bcd8ecc24203afef199";
   hasRunfiles = true;
 };
 "elzcards" = {
+  revision = 51894;
   stripPrefix = 0;
   sha512.run = "436449b4e8d6368fee200dd810b05db570d27846a56a5159422e7af74348f08e6f2f4c45cdc1aaf21d31cf0ac6e8552cc7f0968c2178ad4e65163294d771e027";
   sha512.doc = "c24119acc3aebfc676641b17a0db75edc30dab7eb3aa766e35291463ee6049c9570ebe05d456e0bc0fff3765bee514332cde7b80e7d1479ed440c621143b7457";
@@ -11698,6 +12816,7 @@ tl: { # no indentation
   version = "1.60";
 };
 "emarks" = {
+  revision = 24504;
   stripPrefix = 0;
   sha512.run = "8e5f2d559958083abbde5efe9e70b3cb3dc71cdddd3066ac305c310fd5a8b2652bc6b5ce66531963c5a5f9426ccfed7eee0700938ed6a515865ac8e1718de5aa";
   sha512.doc = "4deafa2295612c7428b82a4c8c2c19811f91c2d456b430b6ab59014b3cdb42a86a84e67319745dea469ae40f89b36d104d30db28228c825ba0d86436a37cc7df";
@@ -11706,6 +12825,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "embedall" = {
+  revision = 51177;
   stripPrefix = 0;
   sha512.run = "c531feeb7557cfca45127d9c37c93bf5835e35efa7c8aab65d58594c30d6864deaa22b64ba90cebcb1e9dcb139b00ad64ff96238835b8e059169278fb602ff2a";
   sha512.doc = "be228eb577bb2a59b93c7684bc1fd47e9a4a505f6c66eabf434ad29523f978c877608fe76cd6ee24c8942889710270b8f304170f445e2a1408303d7c5a8a52b7";
@@ -11714,6 +12834,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "embedfile" = {
+  revision = 53025;
   stripPrefix = 0;
   sha512.run = "2ec32d1b6eec133457582ff7289244f918c402b9512b0187c651cbf3ca4c648945b8c2fb62245ebb65d73f1cc160a78f2025f2901ba2a4b2dc906f96f5f6d878";
   sha512.doc = "86ad1713ce35c219c8298cfc585a3fe69169b410561087939d157dbdcd83f61b058413d75259419b1382beb7a92a9d711203754842a1e9155e9bace17fc97502";
@@ -11722,6 +12843,7 @@ tl: { # no indentation
   version = "2.9";
 };
 "embrac" = {
+  revision = 53334;
   stripPrefix = 0;
   sha512.run = "ab55ff04144eda0f73d311841e70df69366e68266918cc765f35a2563cf230faca761a2e9bd53140cf4549e3a0b5bf8452694e469db84bcb3b2997f7a78557ff";
   sha512.doc = "1aa1ab6e56cc4ebb197ac20489cdba7bb68bc9da7776f6790419dd63472740acfa5adbbf034e8299f510f4000c0d8510f7d9d4d68a3b9aa8b8c4861ddb950c13";
@@ -11729,6 +12851,7 @@ tl: { # no indentation
   version = "0.9";
 };
 "emf" = {
+  revision = 42023;
   stripPrefix = 0;
   sha512.run = "bc1b601aa523b30a54493ac92e15bcdb918775e9f57514b62357b85b5919fb05cc945b3120cea474fab714585fe2a81603f43eae51bb266e8989af6105ebc65c";
   sha512.doc = "f2e37967476ed678dce7c01f195ec03f77327d59beb2b15cc6a64ef92cc377700a2b7b528ae6c42497cde0ac127cd10c51e3ecf5fda0cf7954d598a0dc92b5df";
@@ -11736,6 +12859,7 @@ tl: { # no indentation
   version = "1";
 };
 "emisa" = {
+  revision = 46734;
   stripPrefix = 0;
   sha512.run = "9f62531d3cc26b428a628d2cab0e9d3fa95b1f67e91f5ffecaa432432b02acc6076acd32ac2650eabb54d9e14b6081d70fcc09299b45a0b5bd27905f1dcc8506";
   sha512.doc = "092818afd707380679c4d3d44ad50954c48562ecb5b988d3bb94701991bc30cfa356f975a8fe8a381fe99171efea2b790115cd0a4f12b17430cecf2efc3d7d78";
@@ -11744,6 +12868,7 @@ tl: { # no indentation
   version = "2.2.0";
 };
 "emoji" = {
+  revision = 53894;
   stripPrefix = 0;
   sha512.run = "56e94ced1a0c04bd58c6fe5a59f4cf8b11cbc4a1139010a9b14f4afe4f1d2b47d9e4d0e04369353a86993cc3c338411dd213d25f3485c8a47427608ae4188f1d";
   sha512.doc = "24e878208f9957b98faf060b5827bc320b744a09b44844f7c00fdb8743a9871d8d28b6ebf826398cf7a402acbbb88e817fb6d4dbbe715d4299483f88859acd98";
@@ -11751,6 +12876,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "emp" = {
+  revision = 23483;
   stripPrefix = 0;
   sha512.run = "5028360a2b412232b06b0bc53352c7a0a379943c14781b49b45cb75aef044df5bda24449dbf13601d1a574e5349bd0f2d2f7b7969f10bf72b3aeebe9e81b6ecb";
   sha512.doc = "480edb224fcb42457c6252d4b6fd8cf42796e9b2ac72aa8d4bb22b3840cb10a55a509a47b8c504efbdba3e28192acee367e99638dfdbf9cab4fc5628496cd5db";
@@ -11758,6 +12884,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "emptypage" = {
+  revision = 18064;
   stripPrefix = 0;
   sha512.run = "6379cbd0983ca7b58d2c94ce02a76e054faab1afb2942227469dcf2c4d572d9946921b6d24e9c7d2b5a82cc45e7e380a8ffae671f165ad0e2a3a611b95841352";
   sha512.doc = "11681a155df95f913c3d25cceb32b54ace35bfa5aa7541916c15473b951b02a7417380dfa5c30f5dc3de1259d6cad99859c31bad4c2f2056ffb4608c614a2e14";
@@ -11766,18 +12893,21 @@ tl: { # no indentation
   version = "1.2";
 };
 "emulateapj" = {
+  revision = 28469;
   stripPrefix = 0;
   sha512.run = "12b73ef4234af72358c1f120d860b7ba823bb4d65f91cba348a4a136b57f8edccf3849eb36e95c50cc40445a5fe3908652c221b938ee34a17aed6b4cb265744e";
   sha512.doc = "2d226b60313de3387d87c373a23e490a66c2fe1a94e97ef2364e65fafb037a148db7f5162ab9d3f1d788a037fdebe02ddedaa772eb715dc1ec8fea941b0e6708";
   hasRunfiles = true;
 };
 "enctex" = {
+  revision = 34957;
   stripPrefix = 0;
   sha512.run = "e6dc0988bd10dcefd63db2a57999637b63187d8a234c46dcb148e9dfe8388800e61237d7b58d271b735d2658d40c1f81016b5018e239d556fb9615d35b4129a0";
   sha512.doc = "2bf47c879c6ed0fc539763c899d8db261135f1a0ef0052904d03a72663cff38d40d2fe7b0daacaf2d54771c7b9eb5e98b73ef71d2a733899d458803f8caee723";
   hasRunfiles = true;
 };
 "encxvlna" = {
+  revision = 34087;
   stripPrefix = 0;
   sha512.run = "f6aa0a954affda9152f5b15958ea453e3c2979205f25a5d9f15e3fb189b2352a87256a345d382a3c7dc401eeb55360afa9cf942cc4779406b97cc8f8c47eba81";
   sha512.doc = "01f44c8205daf33006eaa73061d27c9e17ce5b456e73f427f797023cf94d7380e44180c347021cc5c17870550fc7e626bab8de6219d6b56000526aa54ba34efe";
@@ -11785,6 +12915,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "endfloat" = {
+  revision = 51003;
   stripPrefix = 0;
   sha512.run = "2bc564cb0ad7b9bd53af9304f378b6d0cdd9aa32564f2bbb39abcf0d942c4e18015b7181d4be5e873bcdf4e8f971d65678fdbcfb544c005ad012b378eb6e1351";
   sha512.doc = "39a1cfa84a2cbe5ff1b59fd9c5fa6a19cb1d3aafac6d1fbb111f117892e34142f6a21ce7808238608ac0602d905cfff6235a78762a0d510dbc436c881baf59f9";
@@ -11793,6 +12924,7 @@ tl: { # no indentation
   version = "2.7";
 };
 "endheads" = {
+  revision = 43750;
   stripPrefix = 0;
   sha512.run = "55f01774d62616b81fc846af275067445c8979d50cbb67c8f6cdc362a26999c83c9ce5428af28170ab9e4c6262fc4ed8bd0431c5aee8aafa89e38bf4cdc30989";
   sha512.doc = "bbed9408161f827ebe39ae2161e89f1f15d8327f29f7eb18bf58f3cac7c58492529caf05ebe3111891520c406c547b2f1aa57d2927c5f857ea6e02ecfa9cf84b";
@@ -11801,6 +12933,7 @@ tl: { # no indentation
   version = "1.6";
 };
 "endiagram" = {
+  revision = 34486;
   stripPrefix = 0;
   sha512.run = "50cda29c5f045e45e0421efe11128b11be1206b4ea3b183d401562a9c8afe214031c993f885bfca67f81e8b4827e024a0aeb1d95e5a8a03426f72f414cfd17fe";
   sha512.doc = "0807629080916e9ca7451fd1975da985ac786326914521c21155c337acbf48888620e3bac03b00fbbf45bbb47740faaa40d1db768a296e4a6b1cf6c6671357ca";
@@ -11808,12 +12941,14 @@ tl: { # no indentation
   version = "0.1d";
 };
 "endnotes" = {
+  revision = 53319;
   stripPrefix = 0;
   sha512.run = "3b4d5b55dd1ef844b96d30c7d40d5ea56ea3082a9e6740e3bffb837b864823a2c5545a13fa79eb49f79b47ee86aaa28e15c64f676bd27e4987aaaaca76bb2f31";
   sha512.doc = "e4de81d6cf0d7bc686d84420dff1e390ad18747ebc9381c6df006f871f9d5e000aae5cd43a3648dfdab2806da83efc6b375ceb4a9110137ed6b373538a7a8b57";
   hasRunfiles = true;
 };
 "endnotesj" = {
+  revision = 47703;
   stripPrefix = 0;
   sha512.run = "acc3ecb055add319d5cbfc4e542c1be490c00187153990dd42d5b9a23adfd19795bebe4648129bc1cd8aa8cc243111602b287183803db8b5962b23b6c60487e3";
   sha512.doc = "71e52552f4a432b8743e448142fdc8e49b9e1ff1d290b6d20731c083f62bb5be823db76720fcfa40cbb8bf75968b80875926aea8a7f67808555fdec160de1911";
@@ -11821,12 +12956,14 @@ tl: { # no indentation
   version = "3.0";
 };
 "endofproofwd" = {
+  revision = 45116;
   stripPrefix = 0;
   sha512.run = "900fc2d9a2673cd75bb25a3c1d5d13a66a91dcf21a105ed22ab52b7e61db4753f3419e6e7f5d09b64b27efd6d4c52b6fc6d1ffd06d6cac37bba9017aa96712f6";
   sha512.doc = "1b99e26313b9a0572c41900d6e0b10621032957e7569a436d0a84a4d2451b857993b8bcf3554da5ddad00ebb3d83347d5f81e7df858b7b15f2ce3ca92d5ce511";
   hasRunfiles = true;
 };
 "engpron" = {
+  revision = 16558;
   stripPrefix = 0;
   sha512.run = "e525f8d2ad25b93566c101edd29a70d49d9f65f591e15bf3457671aaf748da1afac5d483389eada870cefc9e144010e16c561d0561d97ecb3ae240e21b5c5b39";
   sha512.doc = "dfa3ba98bddd11db47f308c988735967d1ec92c688081bad0deba88c29bd01c976bd1180342b890489f3026c964520ec1fa399fdb52f484c24285e3540a12859";
@@ -11835,6 +12972,7 @@ tl: { # no indentation
   version = "2";
 };
 "engrec" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "3856199a11043eb42062122d99f11a64791113ebee137b588b69eab7ba79d721349c2268440a4b801b0e7bc293fc99011fb9a70a732a03a5656cc6302cbd0054";
   sha512.doc = "f5402766dee90ec0cd2aad59db562a7314805072d4247e5930e59f5aebda9c1b87c4b6935028ec960bca4eb27a1bb1c7ff31b2a671ae0338e1058e24323d4cec";
@@ -11843,6 +12981,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "engtlc" = {
+  revision = 28571;
   stripPrefix = 0;
   sha512.run = "c1ad2ed5337168c70bcfddd35c72b83b19a1596bc7d9c71298eb82ad8637c984253c79216606060753d1cc5ad4f961095eed8be2381b786b12202f5b0bc748f1";
   sha512.doc = "4c6cbcf337eca115a856eda24924588208ed9e7491936640c8875d49d649d6012279e4eadfa7cdb6544e08fa283c341754d896c921402a2b1180764e8a8ff233";
@@ -11850,6 +12989,7 @@ tl: { # no indentation
   version = "3.2";
 };
 "enigma" = {
+  revision = 29802;
   stripPrefix = 0;
   sha512.run = "70cf80101d3fe9a75e750f5b3df4db79f30f5ef76ed65f4bfb40f36e5c8c5f0d22468396fe3a531508dd484ed5929cd14d4e22734a92814a4eae9ae2ec3e2b07";
   sha512.doc = "b0509d252a2dd7b61339ed084dcb8dd4c3ec0e63aa6fcb7fd81302b82bbd3ddb0b68d0460e5970798a12b2b66e1f560b80c7bf36187553abf6531e0916ddb71a";
@@ -11857,6 +12997,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "enotez" = {
+  revision = 53439;
   stripPrefix = 0;
   sha512.run = "887e305ff2755dde33c9ba39ebab63d3518a6ed7663b15245d6eb2dcd4ba263616f1c76d82dc8e86426567bab12c7379e093a57075542303678e45c8b884d022";
   sha512.doc = "621c119bee8f05f3543804eef752df1d2498077e1d323841cb1259123fe402aefd8dd536983a9b94f176560dd36c2170db904a5427812dc2cde2bee6611da909";
@@ -11864,6 +13005,7 @@ tl: { # no indentation
   version = "0.10b";
 };
 "enumitem" = {
+  revision = 51423;
   stripPrefix = 0;
   sha512.run = "d49701368b0ce611f5cfb52ec06616edc27b2dedb99230983ffc59c4c1eadc265a8afd3c94f1e57920de875c4ec684fec007dceca59fd4f4008bb5572c13880c";
   sha512.doc = "b61f62bb0da61c7124f661739ebfaff6147d73899511d8b1a1d4b98b31bc596c3994acfd73c3c1922f5cc8a05c6a98572254067718be394c48976a10b2351503";
@@ -11871,6 +13013,7 @@ tl: { # no indentation
   version = "3.9";
 };
 "enumitem-zref" = {
+  revision = 21472;
   stripPrefix = 0;
   sha512.run = "5cd16cd19d63d4825dd1f726ad7617bc892a0d80e41f559234b3f82950f589f044a9816005a089f6837805ab08f07b507e47c5d2d389728adaa5350a76d1c1ea";
   sha512.doc = "af4404c0f76f6f693d1fc0a82e0673c461a1acd6a0d7e9cbac10719790e54199deed1b87fae59db4826c2d1874ce59c7c2a1e5ae33286369a4f7e495223fe2e3";
@@ -11879,12 +13022,14 @@ tl: { # no indentation
   version = "1.8";
 };
 "envbig" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "e39ce40decbb52360cfe465d8a5147f9eb5bfae8dd42b86a868a46f1d3c2544d14035d6c307e116c0d08e6ecb62ba5943de803ee9d40a0a8cdf94a88aec8f808";
   sha512.doc = "cd8c32d4694252449e78736be1697f9a8da01079a8aeafb774d92ded858de9ee7ae163b3758710df466dd0f75fb8b325e86e575457b66c8107f3c580fe0fc737";
   hasRunfiles = true;
 };
 "environ" = {
+  revision = 33821;
   stripPrefix = 0;
   sha512.run = "4e5bb20e2a69875006e8d9ebc3a8744dcfff3240cc28ea44f7acfa3775914dc9ee108a89368b6a510eb0a7aed19d2d13b001f0270ef9ad011b881c3cbc6aab9f";
   sha512.doc = "443362ac9bd70d88bfa92c26e66871ebfc9ec1bdc226ec49b8a41c7bb76f3afa8a424d7ae2e16a7d06f77f4da4208c10f8dad014d918ed7ed239d645781b8815";
@@ -11893,6 +13038,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "envlab" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "ba20028efa3c286132133d8c292fbc02d77881e64923ca98cece98fbe1e60acf4033b8308a3f9f31f144de071938698a75add803436e1205f7baa820a308a4f1";
   sha512.doc = "4dedc851e00f82ff3bb912e99bf112f4e464b129b89ed75ac41cab9e9ec8c54a32ace3901a3bdc11c90597cfc0481fc7cfc89b4b95bc9aa0c8850a1e8ec88cc9";
@@ -11901,6 +13047,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "epigrafica" = {
+  revision = 17210;
   stripPrefix = 0;
   sha512.run = "82e5dd9f781b6c3ad0bef743b117d9658ae9e0162fec524fbb59f35f13008d3ce9b37daef8d6b977a5ec4834a1ecdc06346627857445c5f19c89f4b202706beb";
   sha512.doc = "c90061813a408ea74da7c0a9a53c1dc0f4ef65a9ec1d96e92002127ef401abb5211b7f029630fa445725497018a6e5ed3415e31c40001674405b13a4b4ebf6de";
@@ -11908,11 +13055,13 @@ tl: { # no indentation
   version = "1.01";
 };
 "epigram" = {
+  revision = 20513;
   stripPrefix = 0;
   sha512.run = "8952dbb6f7c573028b1f9621cd9c947a264847e59e1ead9547d386d71c2c15ab5f9c26088568b023030645b02191c9b72d827a80706ca1570785876c6acac6f0";
   hasRunfiles = true;
 };
 "epigraph" = {
+  revision = 53298;
   stripPrefix = 0;
   sha512.run = "7be9b7851f4e98b5b618dca8535d7e3443cd12c64784680ffd0fbd31b9097a0872a676f2fb0f8b031682d43427814aebc0225e1931db658ce14aae2431597b6b";
   sha512.doc = "7b4b60e8ddfd8f3d899829cf057f7a3db93498cc5214fa03c7116e794722d523cb51846fac80455bf3610b73cb5820872c628d2fcbb754c79b5c7fade26ef4bd";
@@ -11921,6 +13070,7 @@ tl: { # no indentation
   version = "1.5e";
 };
 "epiolmec" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "5cbe40240b14ed494500c3831a02659be437ad9710708929a69670d00b788ffc99d4d35e66fba04f170c9844faf2432c116d75e6b01988736ab483e7d0255a8c";
   sha512.doc = "d2c54da2821e850f17ea0a21d0bc67385e2d986948503fbc23ce6df5229708f0700cdd30a94d09cb310cbd911c183c40935e944341b6ee7ec56cdd9c2602011e";
@@ -11928,6 +13078,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "eplain" = {
+  revision = 53786;
   deps."pdftex" = tl."pdftex";
   deps."babel" = tl."babel";
   deps."cm" = tl."cm";
@@ -11947,6 +13098,7 @@ tl: { # no indentation
   version = "3.9";
 };
 "epsdice" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "acc0ceb408f320570a93a52132d3e37d43d4be65a31a038187edd6de9899427f08d7859dbc383b7b27e9d9b5a635ae94ea97f0be4ab8386b5991089a1435c350";
   sha512.doc = "6d9db45832d3e26e79a518f06d00db992ddfb2999099d32b415891e8d05b51803dc4f03d097cdcb04e5ccd6073606d4c7a87a07b9dd20d8d257456f927ee7427";
@@ -11955,6 +13107,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "epsf" = {
+  revision = 21461;
   stripPrefix = 0;
   sha512.run = "4c3698edc9ef386b08a2ed7c360d926be6ca5a8284e3e53e0dcf5f222eeb27d4d33b4547b42dd2e5544ab381397aafcd58899376d26a4d9d47beee00ad1e9bda";
   sha512.doc = "52be704eec6159e70d99ae2a4823c1da0790f41da9e6de130c84cc77e0d8d29aae145ccb9b416ddc5c9641100821f5099b5c597a350438652381be903e7681bb";
@@ -11962,6 +13115,7 @@ tl: { # no indentation
   version = "2.7.4";
 };
 "epsf-dvipdfmx" = {
+  revision = 35575;
   stripPrefix = 0;
   sha512.run = "0f210b940d55bc2e85b3c86318be82fde1bf2b6fa2e5d498101036a01cec3b09cd8081079476f128f21881b14a13c7fa248c758a7a33ab0770f261505260992d";
   sha512.doc = "e7b770f6880bfa8001851cfdcf2f2d03117fba3a2d38514bd7e23683aae08d57774bd1bfa4d0f75df443d9111a5472ba96bf8129e45b618b39f1798b27fb533c";
@@ -11969,6 +13123,7 @@ tl: { # no indentation
   version = "2014";
 };
 "epsincl" = {
+  revision = 29349;
   stripPrefix = 0;
   sha512.run = "f9251142a990038acde2f1e7b61b94eba39b2c4f5c43a1151af29a17d5f0efb0cddc0af1ac8d056d8617b5ab4eef29bba14a4731ef933480a9bdb95fcc15d023";
   sha512.doc = "2cac5738a39157563707879656b473e7ac7edac2f304c209c8164c7878b10f0d5dcba1d38232ed6ba8e20fe21b3a0cf78dfd51733b993ccd5fcb2c0a05ea31c6";
@@ -11976,17 +13131,20 @@ tl: { # no indentation
   version = "0.2";
 };
 "epslatex-fr" = {
+  revision = 19440;
   stripPrefix = 0;
   sha512.run = "f3e90ecb487259301c20ab4c4c28702b9cadfa844a49361fee0881a26f827ae602f954e4a3e824e910d2e098097c387aa5311c5f32cb58df5a0a1e2fcd9d2364";
   sha512.doc = "7965e6094535d22b04193619842bc0bd090c2b47139e65498dcdf428f4ce2ec54e7da5edbdf9015c9d8f2013642d11347373e625a3884c629d9d807af2a9880a";
 };
 "epspdf" = {
+  revision = 53472;
   sha512.run = "8464aef2f11712c124b2fb29eb448706007f8b4825ba09a7579b4b8a6cf31fc3ea4b98359ecb588e6886fbed9b59d1da155a3d69946bcb99f90f39043aeb4eea";
   sha512.doc = "6de1e86931bedc481f2cce725c58e83a9bcb8af10938ba8d5701f325ebc0e98824cc472b32e95c9f319dbac7c49ca849e368d431dd79c5d1d0fceca81da3cd35";
   hasRunfiles = true;
   version = "0.6.5";
 };
 "epspdfconversion" = {
+  revision = 18703;
   stripPrefix = 0;
   sha512.run = "a1f328125f82f33bcc881adacec981f4ce8aefd4cbbe160de66397ed3b1d4c2ed980f5e1c17c63b75973e3c253d76afc2f1227272ab7f0236e47e8e48f0f015c";
   sha512.doc = "dc09e2ef835a85bbfc7c399b7c7323d64c312b04143e8070fc403fbd484bd893be1e4b532580efea93baffe64625c33004405eb0ed9bf6295646cfc260d72c40";
@@ -11994,12 +13152,14 @@ tl: { # no indentation
   version = "0.61";
 };
 "epstopdf" = {
+  revision = 48684;
   sha512.run = "6412bb97554b271cf5412dbccd316f3d69d7bcf2f524a5d6d1a75f69cfa11a981fc4ab063b6ea8302c2a0236ff93c59f1ee2f8f2b7f33dc466324080fc5016f4";
   sha512.doc = "7fef59ad3bc72b2e3fc10021216b88b8d5465f42503d9938031c3d40d93fbaf637094fdfc87b19ccc1da4d9a28c9890beccee7c30b915a513a909edbac6e0a25";
   hasRunfiles = true;
   version = "2.28";
 };
 "epstopdf-pkg" = {
+  revision = 53546;
   stripPrefix = 0;
   sha512.run = "3e2177a1c6cbf8850026f981ce3ec5e6a24c4fdf8c40716e3f18ba7233cc7a5115e5b74d60aa077575f41bafc58af966ab55c189de4d06863ab2a38551ff0dca";
   sha512.doc = "c098251d55112c0c630e007c85d1c7271e32bba9443ca3c2590b51987053e945e3c52030ef4bd1f6758894cc263e9316bc31683572bd07c24fd0855f01c68be4";
@@ -12008,12 +13168,14 @@ tl: { # no indentation
   version = "2.11";
 };
 "eqell" = {
+  revision = 22931;
   stripPrefix = 0;
   sha512.run = "b3544579e03c33b7a5a10f1fbcb22735d1bbcdb9fb5ac94330ec1eeb6f6ae646935a46f4c7c3bdb4305368b2e9aa9eba244c80f08f3127fad2080b610f1041a1";
   sha512.doc = "9210b85937d0bae3eab982f45b1f38f7020327c9b4cfc6604de5b171ecc84f54f5bfd088a3f06ba7123a7fc01a6fb09953015b1813db9ab2fbabf2a15bca955c";
   hasRunfiles = true;
 };
 "eqexpl" = {
+  revision = 51524;
   stripPrefix = 0;
   sha512.run = "c3412287917852e6c8c1ae224616a3cc1cc15156d66bfccbdd3fab70b02e5d4ed0b3b097e7bbfc89f71ceeec6389d4e66c0c1abff2e160d813d2f3b29325d7e9";
   sha512.doc = "c94dd14530cf7b93ade41c7f4084988ed480dc4259b90886278dd5665e5b6e705e79a5c4d1db428b9d43e9ed9fa63a06a6e10569354d848dca3c76fc28c847d6";
@@ -12021,6 +13183,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "eqlist" = {
+  revision = 32257;
   stripPrefix = 0;
   sha512.run = "1af830f51ce25946ac8bc6a4cca323dffeff20389ec998b74afd49a8edab5ad7a453818d4799e55ca564153a87b85e2a6b03ed67e53cc5ae6fa74c45edf3aeae";
   sha512.doc = "a5b22b8e9300064d77d02ca6f5652659293c6fedb792be2f0664a2383b3167ed7bf8796af26edfabfdcab8d75ddf30f3815be36e8f38fda30f1609b56c16ac61";
@@ -12029,6 +13192,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "eqnalign" = {
+  revision = 43278;
   stripPrefix = 0;
   sha512.run = "6793d24d272ff5f95b4e37fa3f4206e7358e0f5b51c51bcf4c61908e3fa554d8c8a53d888c7d7b1adde09f5d308c19944e93abccdb7846c88544abc90bbe4924";
   sha512.doc = "65847f34d7d1c76dd4d87ebd7e46aa1bb9e9a34ecf04cac6e58c18f9f4949d3e82325dac982f6d704fe6013e2acf718f0372873e547434c15a4a07c07ace27c9";
@@ -12037,11 +13201,13 @@ tl: { # no indentation
   version = "1.0a";
 };
 "eqname" = {
+  revision = 20678;
   stripPrefix = 0;
   sha512.run = "1717aa83439019ba2c07ced56ca5dc969a68b78c9a711d97d0a168d432c6e26b53f30b2a3f6f8d241acf465fe8817d7e4fc4238982a68bf2ae143c5fdc2ca72e";
   hasRunfiles = true;
 };
 "eqnarray" = {
+  revision = 20641;
   stripPrefix = 0;
   sha512.run = "f5abd20910152cf65d92c7e44930729c1052f72441f162de2f4ad869f0ff37b669066f43089a1369298e9ebdb536ed62d437b3f34be5b3e417d8b0bf34d9c870";
   sha512.doc = "7ea3d87f81eca28dd52f9e9cf4f7df1ce4f7b9cd82cc40d0a7fff234415b2a3e033fa1c8a11594b2c08e5edf87ae265e5f7a65eb92a79cd523568f37853de30a";
@@ -12050,6 +13216,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "eqnnumwarn" = {
+  revision = 45511;
   stripPrefix = 0;
   sha512.run = "ddfee700caa63f65fb4f53fe2469d1e6ef6338843738dd2c06989f23b6f4b40dd1dfe4b5979a04b34a9430d7cdd4d0f3ef14e3ce39613c8961fb0266e4ce6af3";
   sha512.doc = "e6dddee646be40e01c211854d3fa04855286e24a39b8217380e555eaacfad50fc66a57e89336d505c80a8df77ff7885922195423d11c2acefce583c9cb9fce81";
@@ -12057,6 +13224,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "eqparbox" = {
+  revision = 45215;
   stripPrefix = 0;
   sha512.run = "b6e64a4d30840933614a42b16ffec215d1e01138c42805ed20bfab6ec03e232f87fcc2c20decb2e7e75234b7bd5fc2ebe5477808756ec92e6e724acb3482afca";
   sha512.doc = "1b0f7e6249e114bb6371d19f941cd2308f70ac4f1c831ce5a1c15551bbd65a4289b0b0e718580cc7df97bf4732ad3a76b3f22ea12f7caeaa2ea6362fabab2074";
@@ -12065,6 +13233,7 @@ tl: { # no indentation
   version = "4.1";
 };
 "erdc" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "56754f7ca1872837a362b1f5cc929fe5ed8bbd59a1a45eb2fe20b071f7c44362b0d98764c6d2870d275d0f0216a9543cc1e9f671f92de1b6b02136f9076f5f95";
   sha512.doc = "3e9d2dbfb3bd877c6bd105ca8cdff87cad9cf801797cea39e760ceaa1f27ed802795d728f9bd675c6553a88e22c03a035436abb19dacd38c774b94a0e2bd1567";
@@ -12073,6 +13242,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "erewhon" = {
+  revision = 52777;
   stripPrefix = 0;
   sha512.run = "5c432ee9ea7d2a76d9fba1c8ddd3d0d19432009df86d7386381d39355bfc46328f8763308d4021bfe0b0a4e18e9b3d9eb3dc8bcf4b0cf50921528a9f549b46b2";
   sha512.doc = "60dfb45af8a284ea995f06d3243dca7247702ce6d05331dbb0d72f353b8a82fd9a4a3d39af56e7d0dcd5c487e2bdf8dd498c7d72281d4c68d2774d8fc3b9cb5e";
@@ -12080,6 +13250,7 @@ tl: { # no indentation
   version = "1.102";
 };
 "erewhon-math" = {
+  revision = 53666;
   stripPrefix = 0;
   sha512.run = "f02b635f08de904566a700e29528f74bdd8f8021e6f5b82433bab98f04e95fb8906add6a87ebea5bc81674455b46baf2c2b675180db66ec56ba71229bdbb00a7";
   sha512.doc = "ea557d32e31ed890c9dc796de465c42acebdb27ac11e9ba1dd1a7b19a02df4eb952826b746f2a2698e42631584a76d3c836d1458e65501bac19a586be3085dc9";
@@ -12087,6 +13258,7 @@ tl: { # no indentation
   version = "0.41";
 };
 "errata" = {
+  revision = 42428;
   stripPrefix = 0;
   sha512.run = "ac3b99ef6e120a5b488cf79f3e942c10a47ee92e84a04d3667f99810ef365aac66598908c491897ef7a99df268a0bbc7185d49aed2313487712e300383356ec5";
   sha512.doc = "7fb625a66efc914e2eacc45696ac43112d7ca49b668ffbea179f47f04746509f981141a77d2948f30b8c56e4a2ff06f6af3047fe494e4f084237891fbbf6710f";
@@ -12095,6 +13267,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "erw-l3" = {
+  revision = 53694;
   stripPrefix = 0;
   sha512.run = "230c866b9b72c0155af79cbf7d212411f3a038fde5bdae44f09554cb3499d501ba71be5234e7c9e2c2d5844919a8ff6a4473b6a06de33f66baa6ba0316037eff";
   sha512.doc = "34bb0e752d769cac90b50ae350e91e224dd83c9206ad05ea2d4ef0c427df413cff692808d6b0820b12852a9f60628679d18d9d7bc2f2d4c11328d162f8adf491";
@@ -12103,12 +13276,14 @@ tl: { # no indentation
   version = "0.1.6";
 };
 "es-tex-faq" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "33f66e4f928591188289f07e003cac10229735e69ee7390020748e119930ea7b74ad69e5eea991d8e34325ac4d548ce0b843a00b3ca50b9e6fae3e96526a4ad8";
   sha512.doc = "5b5d0ebda1bde2c1c67fd4853a41bb10956487fa5ad2686d6814dbdd51f68dde2a3d294797b7b1602d587a44ea6acbd8260ab9965efab81d91eb9d9fdb93da69";
   version = "1.97";
 };
 "esami" = {
+  revision = 47639;
   stripPrefix = 0;
   sha512.run = "bbf24974b4feaba88b92b3179af6bdb45b86053ae8037fa41c99d0823cf3c79807283c01370365ea0264ba1eee3c4c289fadc5c2619900e85657366c14920a7d";
   sha512.doc = "d9f57db15517f47d648e4ef91111a843fdd7f0d0706d1a863f5b4f7c65008c00507c552975c01b60c00cc724e63aea24f7a6b40930148bc981e200866cc30ac7";
@@ -12116,6 +13291,7 @@ tl: { # no indentation
   version = "2.5";
 };
 "esdiff" = {
+  revision = 21385;
   stripPrefix = 0;
   sha512.run = "84b2490e6ff743f0133deacc22c8e0368368e961d634239694ccf7b5cde7826996e080077baa0e0045230b6d2c3cad53ee055c05b17c89ca735dc2e40a01fb5a";
   sha512.doc = "97dbb512437c868f2b15ebd1271f51a7f196e40c70043c224617378e6c9333f19e2c18666f64fe6ea323c7aa5a58438944d8c6f5b1a9c0d36a239caee972eb08";
@@ -12124,6 +13300,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "esindex" = {
+  revision = 52342;
   stripPrefix = 0;
   sha512.run = "4e3fe4402e025dbbf300b509954600e3a1eca221a448d32ff2399aaf552ff930e6921bed6f0e1aadb20d6453848e235e42e8b809c4f4280d39c29937615e90f5";
   sha512.doc = "6db4b39371280b0f3a3e0be9e18337a75611410ad25e7953742247e750ca439c92c614edeffa03c4a7f39d8aea447037a6e25cb8f6f0d22a190f359c9cc35f8c";
@@ -12131,6 +13308,7 @@ tl: { # no indentation
   version = "1.7";
 };
 "esint" = {
+  revision = 52240;
   stripPrefix = 0;
   sha512.run = "d0eda90d6a890b7813648516f21e3a88213b1374df0c418895301354de402b9634492a1fd89193f34c6db6b9fcc0cdd0f8f46472e0e3a210234c7d8cab1bbed8";
   sha512.doc = "aeeaafe3746b8fd75ba80fc36b1610a3e4f7c7f26044ca82c2c8091139e0294275a1dde9dd73fb3e5b013ff04e4d0f26422e8c2a44a88beab167353e7686b3fe";
@@ -12139,6 +13317,7 @@ tl: { # no indentation
   version = "1.2d";
 };
 "esint-type1" = {
+  revision = 15878;
   stripPrefix = 0;
   deps."esint" = tl."esint";
   sha512.run = "5a663d01e9241adf1961c922c588888561f495e6378fdd7aaa90954c3e51c5f0f8e6dc1e1947c9f03ce3472e1aab3dde1b35e6b5f0814f5e2cda564a31a45a1f";
@@ -12146,6 +13325,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "esk" = {
+  revision = 18115;
   stripPrefix = 0;
   sha512.run = "584d9b9abf202d93826c690545206c3b7276d6b3a4b717ed3671f9cbd2a1c6c6503d3352471fe60232e75d63632e021fb0ed34ce49d5a1e72ae58b08fbdd7211";
   sha512.doc = "acc40c8829e69c681d3bcfd5aa7223b3f5320c1ed5fa3f4a9a700f203b622f300b73912ef5df2c163d2cce1b40aecfdf1eb880dcba48e94783c14054981e0e11";
@@ -12154,6 +13334,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "eskd" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "d0c1745172683bcacfb061f48bee10f78dbc849657295f5e7714cca949afd586c441f727e909c627b595ccdb50b81d813538e6837a00809ee884ffe1acd6b25e";
   sha512.doc = "01a0be9d02e7fece62cfd1bc8ceb26b2036f3d2e374794f3c4aacbfe004cf4059346510009760fe48fc0141c4e9f3cf1e40088203d31b7bbb31ec375cf5f70ea";
@@ -12161,6 +13342,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "eskdx" = {
+  revision = 29235;
   stripPrefix = 0;
   sha512.run = "e5ef11cba6b0251844200093445f5183de60e0c0198da9c7000ef5c05a2a9a4303a15dc77ed03e9874e452ffdd283016cedb8901e78cd0312ea5bbcc529b74d5";
   sha512.doc = "748dec387a09546b28718e943e05772cd56c75a0066793332b343e7f604e607efd37a071c1f4f32fbd20d7427277bf2d598b355b8ea3a0a04943ccb90f4f249d";
@@ -12168,6 +13350,7 @@ tl: { # no indentation
   version = "0.98";
 };
 "eso-pic" = {
+  revision = 47694;
   stripPrefix = 0;
   sha512.run = "52c1987317382cc5b3af5fa05627d3137c692b402dec1a19104f814be191222b9699935a52e68c5813beabc0f659735ec22dd37926d6a681ca6e415ac0235cb0";
   sha512.doc = "e78570568903fc10ad3309c8247599da7faf2ec9851df46b2ff36451a874f605fd12b9aa0dfd68f237cc65e77b527baea296036721fbc0e2185d4cb61f0eb1b3";
@@ -12176,6 +13359,7 @@ tl: { # no indentation
   version = "2.0h";
 };
 "esrelation" = {
+  revision = 37236;
   stripPrefix = 0;
   sha512.run = "a6d8a0a9bde08e3582826affa52142fe5b5a0dba43c4ff15f5fdd19cb24b561bcdcdd761c2a84238c9b31d3fe0a023949d2d0c716e105852443e06ced9df13f1";
   sha512.doc = "6698e9f57df458d9652ae98abbea08ce1f14c6c31677c32ab8cdf9b8fa0866a57c50028ea36d2c7cde133588358dce0b2bb37b7085995e4bab9ce7d3de1a541c";
@@ -12183,6 +13367,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "esstix" = {
+  revision = 22426;
   stripPrefix = 0;
   sha512.run = "e503f25cb713918329f297a4ed088b63967eb06828fb753653aaf60ef99c5fb7db6507d6f0f74080b9fad2050ca1917f7ab873be2fb0bd3fcd126f29a43eb775";
   sha512.doc = "1233a284b88e5c8bfb29350b3b534e7a4c81b5692a9ac7aff5d69f77210e026dede300b511bc45efd18d6a96f6df9be2add166c80f0ee5d17c93732c0c242bf0";
@@ -12190,6 +13375,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "estcpmm" = {
+  revision = 17335;
   stripPrefix = 0;
   sha512.run = "20213ddd795e862dc924ddd71df08752f6adda4be7a06237507cec84abf6a6ccd664fa9676cb9b275ca9de8647011da0bc731fef9344945404f885b56b75aea1";
   sha512.doc = "c240305f2ad7a841c1d9309d1934001fc42d68819505b5c862ca8c97c5ecd7b6d2fd8a79a4273be79126d1503d968fa4649ad06e0c001f3b731e300341802dfd";
@@ -12198,6 +13384,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "esvect" = {
+  revision = 32098;
   stripPrefix = 0;
   sha512.run = "1a6940862940d8ca29bcb19c69817b84a7f71f7a8762d3a63829fb0e0e88eccd940f3e2973d8d05dbe9323aa1f80dc9045b531e3509239eab399f02a55e7988c";
   sha512.doc = "502d2cce629280d7c192ad11764c0c12e65f9f1318286d1acdc3e08c9d7d36b07fc3e5939c053aa57ad59ee91e73b4035c9bd1aafee3672ddeed4a64bf3cd7ad";
@@ -12206,6 +13393,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "etaremune" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "511f84d8cb951caaea65cbe839fe83c9c2dcd7dbe0e0c3db3611d914dea475b60de029d4dbe482616e9d219929c50b2a87f6c33451d0d880e3b368fbc9f7f612";
   sha512.doc = "4d7728be13e1454b2456e543ffb89a19fc5204e8025f949dcda7ce3b8a8b898dd9a6d96e44477cd158baad4d462afbcc17b6df6ddd9982232891e7b4ccb112b7";
@@ -12214,6 +13402,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "etbb" = {
+  revision = 53836;
   stripPrefix = 0;
   sha512.run = "e5ed5e381105bfcf7b424427464305598d3aa90b7a27248ce4e7000408fa642fe6f25eeee6930ea85b2dbc74ffa1b0ea6cc1bb5ff189050fa579b806bf7a0bb8";
   sha512.doc = "37a50869ccf719673f97e1ca0da89297feb50b01b9a5f28f9129997ca983e23b0cad2976902b4498f0ac36f3d64676f2e765deeb539e9d2da08db063e3cf8461";
@@ -12221,18 +13410,21 @@ tl: { # no indentation
   version = "1.001";
 };
 "etdipa" = {
+  revision = 36354;
   stripPrefix = 0;
   sha512.run = "88502eeb78f2f5901cdfc192638501690aea861de2105445de226261c62f526d6602ab5c63f02974d067e229b12441ee6663b54769236a1e0e125896b869301d";
   sha512.doc = "6aa2ecdb393932a485857222e66471b9c52388e726edffd0b4357e340e8a5092af96ad1847486a58d6a8485a4ce0e80e25e80ad58f60991004136739d26aa996";
   version = "2.6";
 };
 "etex" = {
+  revision = 37057;
   stripPrefix = 0;
   sha512.run = "8d9bbc49c5a9747bd0469d6941358e33dd273841c0e467ca5fac191dbf5d353de19e43fa6c66b95fe5975211c01cb6dadbaffbaf544faccd3e35af0158a0642d";
   sha512.doc = "5d10427a79c38a573036164d5de8315a80b709eae87eccc050e319435622664203b4f859a7a0875a13e444a3da06eb11a2801c44c8c3e7d5ed0241adda8b5d22";
   hasRunfiles = true;
 };
 "etex-pkg" = {
+  revision = 41784;
   stripPrefix = 0;
   sha512.run = "e2afebc530bdab4d5384170dd807d6e39c96d5a18af0defa534106103243b0e52d926e09f3ba62378452ef643bfa8f0e4d92a3c0256847c91e561707410052f4";
   sha512.doc = "2ef9984629ffdafdc799041127e31360c8eee80726d8c410130d61f12de306e7b4c2cc892e8012029827e8ed470f9191eebcf758830cd34b8d01593ff78cef1d";
@@ -12240,6 +13432,7 @@ tl: { # no indentation
   version = "2.7";
 };
 "etexcmds" = {
+  revision = 53171;
   stripPrefix = 0;
   sha512.run = "b0be75d3c8eb92407f21111e6c9d397ab5de39b96b99403a149a9554eff523e99cdacc9c1c37ef47cd190487511c6fc6b7c91b617e889eac1d6d8b6aa61c0c6b";
   sha512.doc = "841ff47f9cefecefb241cb81602b825c07d4d0eaf143343eb9bf6c35ca66194c98f851e4aa27a369d60927fe96968bf7a1c1d8dfc7bb5be092e77330ad8ac6f2";
@@ -12248,6 +13441,7 @@ tl: { # no indentation
   version = "1.7";
 };
 "etextools" = {
+  revision = 20694;
   stripPrefix = 0;
   sha512.run = "ed7e514441de2fd296c372d9c56dd71ebd5318bd67eb4611c4bf784b16b045a08338ca4456899739dc023e5bc4695a6fd1784e592e542cac6a0564a68307a983";
   sha512.doc = "5a8d722f9e2e59d483c7421909b4a0f8719b0de81f2b8b95801f905d478624eb4df936f193eb3e4ad1e3f0c2d844c7672a5e2ab1c0ff0654ed88c66bee4802ef";
@@ -12256,6 +13450,7 @@ tl: { # no indentation
   version = "3.1415926";
 };
 "ethiop" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "ad9da81e2a9af7f93c3a9677a72b80335562677d552511463c20b73df25adb0a6765463273306486e295b8c5994af03fa1df8f1e70cc48ed7df44698637f8459";
   sha512.doc = "13e9149433cee0c44d8eddbcc6f738cf113581e4890a8728aff08a6f3f26a62617e1770b4875668dcd75a3714925db9cf5c5d9fb58a9870292bc0d22005c844a";
@@ -12264,12 +13459,14 @@ tl: { # no indentation
   version = "0.7";
 };
 "ethiop-t1" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "84f97fb5320ada95562aade797fdb62577e533feee9d7ece5cc51e17303012b198c0b1e6b4f720dc1539c4cb917ac71e3da6f48776d6fcfe84d4527ffd7b78dd";
   sha512.doc = "81f2ed72d5cef9119c94c4b0025e31be6739153e36b7b31a2c59b0cbe5a683a67746da8346345d561472fdbb760c07831d1936222ce1388ee12d70c9053ca8ac";
   hasRunfiles = true;
 };
 "etoc" = {
+  revision = 52842;
   stripPrefix = 0;
   sha512.run = "f8386d45116a250f5f482774b8dcc40b0f4e30b8260d201f2d8abf0b10f0e103253af3f23649c3aa948009392072dcb29d7661ee86711c2dcdc7d66e69a4135b";
   sha512.doc = "27bd651a6178a07d4cfa7d741653765b04e9a0ccef5e04eb8c89fad12df1ad7428312204c18f590de6d099d6bf108bd01931728c1ad392ba666c695099006779";
@@ -12278,6 +13475,7 @@ tl: { # no indentation
   version = "1.09b";
 };
 "etoolbox" = {
+  revision = 52153;
   stripPrefix = 0;
   sha512.run = "f614e649193857d2348bed9c9ce49a64b78e0c165962acb51bab6b340a1b7397793ce07d649808eb04322d94c3df1699ed69164c6e4c3583600f9adf542650b9";
   sha512.doc = "89b5515a47fc18b6a0a2e70712b614e5fc32ae537c632e431be1ef1e8c55ec2791c7394701e676b0ee6cbf6addee38ebbab67e60d67a34118381fd4ebb0bc0b2";
@@ -12285,12 +13483,14 @@ tl: { # no indentation
   version = "2.5h";
 };
 "etoolbox-de" = {
+  revision = 21906;
   stripPrefix = 0;
   sha512.run = "cbddbd599e10b6409db5c9f9d27f35b5922bba82da39b19aac010ef77e76a29465d91c10a40c578e834acf5d9ade2d52baec5cca06eddc802eabbe599fb3dd28";
   sha512.doc = "4c966dc094430caf72e462c1a854995fb78b54dca84322233a16508e41f33f0dd71db2b997b26beb7fd4722f0df1695a118ef782d7954983e9df3ba2132b828b";
   version = "1";
 };
 "etsvthor" = {
+  revision = 48186;
   stripPrefix = 0;
   sha512.run = "c70654c50e186f73bd6dbbb65cc40cbfd809a86de223f96b4bbd1af94fc5fa928f2400eca58d6a97e5578186c58cd038a99264a412d9bb7fe15a01d7f3aff8b9";
   sha512.doc = "47c9d66a720a8225b34bd0571c0f0da18fc72fb5f37e4204e7d4842facade9a0b72550351c0743dbb9296ca8bd2ad61036361f0cb7447b06e0994fcdb7c657b1";
@@ -12298,6 +13498,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "euclideangeometry" = {
+  revision = 53794;
   stripPrefix = 0;
   sha512.run = "8f77c81afe33b837bcd0ed3287173b974a637952384168ae93671a84fce5d89cafc43f1f217d0b8b388dfe733b8a5b5c83c52c9abacb6ea082162acff53b101d";
   sha512.doc = "e89b948b0866e8b1acdbb72eba354c72272e243e721380ef7111e8670a1ab54981a44e61354ab3aa76dd8e534071da61edb6f92c105ccede0efbd88990ff1a33";
@@ -12306,6 +13507,7 @@ tl: { # no indentation
   version = "0.1.5";
 };
 "euenc" = {
+  revision = 19795;
   stripPrefix = 0;
   sha512.run = "f5968e42b36d9c3ab7ae17d156283f8fc09f0c725dd1037cae3b232f94af11a8ee84507efd87cab901bdc8a34f0f72d831a078de205e9beec81c574bb65f79fb";
   sha512.doc = "ac8d4e83ab23bf692d609a617bf8aacd8b33949e0bff1070301b8cad4e91f2a651555ffb44ad70be99791e64020984fe07afbb25976b73963abc79660eab96dd";
@@ -12314,6 +13516,7 @@ tl: { # no indentation
   version = "0.1h";
 };
 "euflag" = {
+  revision = 49970;
   stripPrefix = 0;
   sha512.run = "e046d3b4b0de99d6669aa7cb62b4304ea8c2b83bef6dbae7d997355bc97ef07ffbad6ba139a4969c0a99307a43202566a283a40de1a69635d09afd9256ba0a51";
   sha512.doc = "e0b58801624084e20083f1c92ee71dd6f53b75954cc2a63c7f99b2453d3925e9d4bb9509e86cf3fec3bcb2b1814ccc6ec27bdb08bc24f23803c0349dbe1a9574";
@@ -12322,6 +13525,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "eukdate" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "4f64df42384897fca09574330d919704bfac2115f330f8ef085c9be60b51c64a9f1f46c10b863e989b9eda6559a3e2cb2388a59a997afad73632d83b02177b3e";
   sha512.doc = "7c79bb48296d491816b5e5cbcec389fb7a2a200a9b8e544394a8363b5b99c7ad36b332c05968b98c1bfa1caf04fb554318494cafd0781e25ecbed532c752c65b";
@@ -12330,6 +13534,7 @@ tl: { # no indentation
   version = "1.04";
 };
 "euler" = {
+  revision = 42428;
   stripPrefix = 0;
   sha512.run = "3b3d383a2f715f14dba0ab926d3df9d10ab63c06d203c59e551732a7f6af4ff8965750404a37863c91d3fc3db7d44d1a279d03839162fde9d8d9fd849f0047c3";
   sha512.doc = "789c0b35257ad74dcddea589eed36f0a3b86eae3b201fc708c13cb11dbedc5b489d1495c218f9e10558b8977658b72c345a5622c10b8b1d7ceb3065a6c8fb9a0";
@@ -12338,6 +13543,7 @@ tl: { # no indentation
   version = "2.5";
 };
 "eulerpx" = {
+  revision = 43735;
   stripPrefix = 0;
   sha512.run = "1dd4c01260b9f2cf7053d7867530b1383a1b1218719a5a58895bb56e61416f9a93199218670e88cb59f0d87e65efdd7f10a218b45a165894c13b99330797296b";
   sha512.doc = "d755e9694d0631e80ccf81f78a2832ae22269ded788fd30f0acd83a4044ddb4ee4308c26ae5f79c0510a2986f146d28847eabe200015bb197805d57d149ba20e";
@@ -12345,6 +13551,7 @@ tl: { # no indentation
   version = "0.2.1";
 };
 "eulervm" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "f497e30a188bd0d6cb66795253b35f6a108ef11a2924da94110e5a2c913af64826a21789265bf7f2b15a31a914b74ec171fe3c3d299b1164801898c0d7b0e7b0";
   sha512.doc = "dce6b483aa0d8ed6d6e607a0a518060fb290b25f04306ea4ba50f863034aa3184118a7a13f42e89fb2706daa173abb7eb5c2bd433eb038aafd1f3a8eb9c17995";
@@ -12353,6 +13560,7 @@ tl: { # no indentation
   version = "4.0";
 };
 "euro" = {
+  revision = 22191;
   stripPrefix = 0;
   sha512.run = "35a1c763998bdbc3b3b54ade3e4887859aa9d166699ccfc73db432aab3439be075d858e88d3542c25f8a0065301f0b1fea9bc368f85ed767e9deafa090f35beb";
   sha512.doc = "896a040cf80bec968e4fed5b2bd774e433997d336855775c1e6e5215cd6d9bb094550da324a2433d4da94ead4af3cfa6b192382efa73bb7c6bc951c22bb02fb3";
@@ -12361,6 +13569,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "euro-ce" = {
+  revision = 25714;
   stripPrefix = 0;
   sha512.run = "c1a864ebf022c8949b62195be6ce857ba108b7f930cf6e0152d70b7e3283e09c2f93fc670732cac79e3f48b860431186ea903324a02597b2a92fa43a0819b57b";
   sha512.doc = "3a44189546231f3bfde594142e6901a69f6e351e1d04203d1d646c476ca330431c0560faa79fec79485a4092b667864dcfb522ddf9a56bfc2b2ab76764b3852e";
@@ -12368,18 +13577,21 @@ tl: { # no indentation
   version = "3.0b";
 };
 "europasscv" = {
+  revision = 49703;
   stripPrefix = 0;
   sha512.run = "b47453280812327a1528e7d2a484e0b92e5464381bda11b715c624bb8fb7a1f57e3df71ccaeba7dbe8b0f757297ad3c4515aed773a44bfe78efbe9f64297e180";
   sha512.doc = "e9041765db618541c6aa9a4142b047f4096bc335a9601186a26860d6b594d6b6125c0f5392fb6dae9a296392fb565ba0a8c288155e8d99e12bc12bec0bedf52d";
   hasRunfiles = true;
 };
 "europecv" = {
+  revision = 53313;
   stripPrefix = 0;
   sha512.run = "54c1a4198183c346182db14b62c88dab981b1c2bf18ff10067b335e2e4eff2bb32400f9589d6e16065b891958e46cdf80f8ac4f5a73a70d0fde7a0228b1e13b5";
   sha512.doc = "65ca93f3b5e8cca103abb82cc47485a5aedd1fa9e78d1bb4fe80623c9b76bf34ded529dcf4ebb35f8d141cf198a6e8ba1a012ee4e698053ff16e8ad23741e059";
   hasRunfiles = true;
 };
 "eurosym" = {
+  revision = 17265;
   stripPrefix = 0;
   sha512.run = "9624b0a91a8491d4178051e8e8264e506725ace0eb1b4e4ee9f3cf38cf7868d392f0f4fae92947c74182a6cdf7d4cfb46319a269e4e3aac686ecf4a4cd2f7b3d";
   sha512.doc = "db226757ec82087da3e67fe69b5e9c2429e3cc2addb126bc528dda8bc421a4e9da2a367e64f119eb109e8898409a4e50177b81f9035ed1e0672bb902836bb61f";
@@ -12387,11 +13599,13 @@ tl: { # no indentation
   version = "1.4-subrfix";
 };
 "euxm" = {
+  revision = 45696;
   stripPrefix = 0;
   sha512.run = "93f4eb11247f8576241a57b247dc2dec20405146a0749d54bb8631875256fd262ac06968901a8682f4d530ae68602af366fdc3ceddbf0fd1042ab95f259c3775";
   hasRunfiles = true;
 };
 "everyhook" = {
+  revision = 35675;
   stripPrefix = 0;
   sha512.run = "56547973d184de21ff5d6d3eaf1baf9b8cdbcf93307c31fbbcf658350ef0d441509ce359266ea6f962ef9b40b1680b47e4c14a822aa043ab8174ab0610df1665";
   sha512.doc = "331def0138dac385605b3ea1d88af6d5d1ae29bac696b76f41cdcfd070d50915eb3371a14a894b1e59bf35d55eb7dabecfe18e89f0bfbe6f028ce5fedfe1bbc2";
@@ -12400,6 +13614,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "everypage" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "6f4779a2a0e0d2352b702652a583f6ea7da71865196894b88b630e1105e56dd5ea525cbd4eccdebe8dfa347716c192fa098d5eb8501f305109b337b266e7ec2d";
   sha512.doc = "185bb6b87896f43472d8c902cfda976139d8b1df09c5eff75e8f579314867dc05b6c215f0dcb09a3438f7279c6579ffc8f92fa7fc682fce18ddf7f080e0c6e37";
@@ -12408,6 +13623,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "exam" = {
+  revision = 46084;
   stripPrefix = 0;
   sha512.run = "77c488cbfa6960df070c9898d699492826751ab5cee72a4e1f51e839b6842bce910542d02c42f3a87125f4f3ea25b496092c26d0eb698a50bcebd8408efffeab";
   sha512.doc = "7b225aee549267ad87b5e900570e5dde87e2e77d84a42f33043d760331cc71415f76148cd30245612ca8e566930531c07b71508f50867b4cb2c6ada659f4a2e8";
@@ -12415,6 +13631,7 @@ tl: { # no indentation
   version = "2.603";
 };
 "exam-n" = {
+  revision = 42755;
   stripPrefix = 0;
   sha512.run = "6cb28928125f1164fcf2a78980345373a094fc1a2f2f22756c8f9b27da05b88b6011f000508354b4d73aafa09a2a877bd0e6913a274518b471380074762be392";
   sha512.doc = "502d6fd1073f4ce68477e6be652dd131bb0a74818df2b1fc6b0a97aafeb946de1d0fe3fe90ed5843bd63305c528031acde37697cfd756c9839b083f9926a363c";
@@ -12423,6 +13640,7 @@ tl: { # no indentation
   version = "1.1.4";
 };
 "exam-randomizechoices" = {
+  revision = 49662;
   stripPrefix = 0;
   sha512.run = "0cb93637dda7a7813f8f89dba62db03cb1c1c6da5ce5dae596a14321fab8c46a5c6d67432c31855b66b37b0eb9086d23b5bf2881bf8fa41e410ed7a4724d84bc";
   sha512.doc = "74daa43aa020898bf2a969e5f6fa09aea190209dd71eab222dde2b30cf2f6e12936b454a62b328aee59f6c3ae13bf5f7005ec3aba66766ade77672f74bb3ee8b";
@@ -12430,6 +13648,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "examdesign" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "bf052063b16056faed35007a5e1b6e2bf4f116388b2698c24c7c00ff257fde4f0225f138af6c011f99d051085169b51357c8661647f28be07a7f6dfd330ac10c";
   sha512.doc = "1870e3732933e0d69f52eff2c403011b09814938083b91bb428c776ef50140e1b43713837e018b09e8340dd5e47811aa1050bb9f90b350aa341216edb00c2a9b";
@@ -12438,11 +13657,13 @@ tl: { # no indentation
   version = "1.101";
 };
 "example" = {
+  revision = 33398;
   stripPrefix = 0;
   sha512.run = "2f790c1bb8934e1127ba64c61ccf0d9ed503c01cb8975c114257a2179db7d88b4c969475b0e357d17785fcf7e42487e991e176df3dd7a1be5db4cdf87abb9cad";
   hasRunfiles = true;
 };
 "examplep" = {
+  revision = 16916;
   stripPrefix = 0;
   sha512.run = "1e28a283a2d6d2ebc0bf7acea39bbc97c459defd6115e125c6b9482f880f59ac5eadd715d034b78f5690806345311946bdf6122db9b41e2da9e31d730f2fa82f";
   sha512.doc = "f72f9893173263dab5436911b2efd5143a52dc43b24b470fbc315c69eaca0d326cc36e5254eb3f93f734a3240371e9aa2462c0c016659088014ee5a63cef756f";
@@ -12450,12 +13671,14 @@ tl: { # no indentation
   version = "0.04";
 };
 "exceltex" = {
+  revision = 26313;
   sha512.run = "ef8495b4ef6937af022951044652ea1fb1dcd3f65961408e84a52f9053db8f4fde6703f18833ee9cd002bc058f01813ddf765f575200211563d6e16a956d3613";
   sha512.doc = "a6c4ae60f2922af773f67494c30407b5b6ead39def9253b4710940774e619496a3c242f7e9bcc8733fc733234679bb2b01c6f4571e30dca16c8eb15ad8d6d01c";
   hasRunfiles = true;
   version = "0.5.1";
 };
 "excludeonly" = {
+  revision = 17262;
   stripPrefix = 0;
   sha512.run = "b83426d7ff334e64f8a5566fa905f1c03478ff68da5b74b85dfd6c872db7a63454f627db4e6bea48f8048da0d84bd80b269cf5cd3a5b487484dcd8f2e21c5058";
   sha512.doc = "11f1a4e7b0bfeb5728ab632756fb612b784e7a8b46e68c2e5cb3681928811d394ac0b7f508e7c655945209b1e75837d4ec1a69bcaa6b0ac8d45d66302b4bcb13";
@@ -12463,6 +13686,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "exercise" = {
+  revision = 35417;
   stripPrefix = 0;
   sha512.run = "8de2044404690716d781a3b081181d9a14596487213762bb1ef426a0951dc18b1097a4cd8255bc7094d9d5e7f874e68181849c173a4932e7d07c46e14d1609b1";
   sha512.doc = "3059c297ecb8a990bac32e1e52bcd6fe39e6958c96c145ad70b937ba89284a6f447a84e2f144d31aefa1c446331c7ce80ccba926e288d7ade917c7aa68095076";
@@ -12471,6 +13695,7 @@ tl: { # no indentation
   version = "1.6";
 };
 "exercisebank" = {
+  revision = 50448;
   stripPrefix = 0;
   sha512.run = "6398abee37218c1c4b0e21f7dcdc82b49985888c8e5cc4702fbe20942471cfcdb8bb37c66edf2c6764d9a38dcc932b8584f65bec8dcf75ba11c738705a71048e";
   sha512.doc = "d7b262b7a9ae3a45b69112e2924be8ec7cb2c13a8b973056e849cc5a0f4c82f85d4b5887a3286360b38c3459bc99ea9d917cd1084d6abf1ffc343d7ab522fed8";
@@ -12478,6 +13703,7 @@ tl: { # no indentation
   version = "0.3.0";
 };
 "exercisepoints" = {
+  revision = 49590;
   stripPrefix = 0;
   sha512.run = "cc706842f62ffd982dfde7f503f226c7f7050099b581dbef6e5e7f85269e3110a738232f1a99752b353a54a91ae5ef145697ff36ad9df1fb69ce1051bf92858c";
   sha512.doc = "81493e680086ce4d833e8e9107a056daa4e74e321964f914d8824e25b4dbd6c181b1e10d41ceecf27d18baa53958babf77b0edf4c0234e0b80a8a3f5ae49c348";
@@ -12485,6 +13711,7 @@ tl: { # no indentation
   version = "1.2.3";
 };
 "exercises" = {
+  revision = 42428;
   stripPrefix = 0;
   sha512.run = "064b8df6847af6e8464989de7070ce1d5282a050ed89016ba9954767c6f175882ee11dfc4c92791f68f972cb7dfefc801696a10a650b7113e93dfd9a9fc1adba";
   sha512.doc = "7108d509ed012d1560bf19205e45a2fcd09311c50e84ea4dcd87cf17b8c70d4e5496653d97cb303d32783fe9f1d29a17a273a7ac6808ec384b7972dc33106c87";
@@ -12493,6 +13720,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "exframe" = {
+  revision = 53911;
   stripPrefix = 0;
   sha512.run = "426128ad41db65598a47e0baf0e019b6592c996b10442edddd624d86524116df4e0fd01411c3ac2f4153ab1af6f3a960680a085a556f07a90ff2b326bfbc26b2";
   sha512.doc = "c8f9913899a52815ddf7d96f033db62e248a92ddfbafea2091a93b55fd1bdcb01734177c7e234ac2de51383eea7e21afaf77164ce496c7858f95d63800461007";
@@ -12501,6 +13729,7 @@ tl: { # no indentation
   version = "3.4";
 };
 "exp-testopt" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "26b5af9bdd06a3bbd231b1b55c4ae8929efa06655656747b804425e802fa7d07355e510ac673590cef235cceaf88fc03e1493f4bee9c99ce2a32c32b9a3f9aca";
   sha512.doc = "f4f7cda5cc8b3f8900cb12989834e5b1702f751248f58fe65a8d65ab69eb2a4118002212eefb609e251d4437579e635173366beb471e32d07d45c5c645ca506c";
@@ -12509,6 +13738,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "expdlist" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "fc0f0473faea3d8ffe917e654909374bef6b6d7e41d14c32acb3ee822748c6f37d1f5ab562b4bbfe35dde983f12cd9e1469bd2061aff32e3f79de66e6b3a6c32";
   sha512.doc = "624bbc4ce685589e7e6393cd991b6305d8a20419b4538f2e1728f9ffc004ef4d724831515b77a607093bf45b8cefefe3e6a352403ddcb543b690b314fb469ce4";
@@ -12517,6 +13747,7 @@ tl: { # no indentation
   version = "2.4";
 };
 "expex" = {
+  revision = 44499;
   stripPrefix = 0;
   sha512.run = "b447a885d65a000f0b79b4c9b050bc89bb32b71426a29261d282fad72428fcf64dc6c660d9142114094bba32040c8e723190e553260c3899a1c1923ebb9f765e";
   sha512.doc = "b0dce6401ccdef7fbfebbcdef9d68f073058f935eabc95fa45619f4d4d85e6b53e15091d845593255c000c3e672dabadb1cef024b2b0c79765f4f6a231de86e6";
@@ -12524,6 +13755,7 @@ tl: { # no indentation
   version = "5.1b";
 };
 "expkv" = {
+  revision = 53939;
   stripPrefix = 0;
   sha512.run = "a4c3691608573967a4162290f04da6fe56af27c866cbded1272bb939d2787b168ce70dc3a3a421ac0f232985a213ef36bcec5e3e2b98e66edfa6051d1c29b340";
   sha512.doc = "33860f56de19ba0e5cd8d5109e7a04865b1ae08bf292b4ceab9d5adbe2319c54630054d4c02448548ab4a9f88fcc80040d9c58119e8d632dfa9e20b94dd84883";
@@ -12532,6 +13764,7 @@ tl: { # no indentation
   version = "0.5a";
 };
 "expkv-def" = {
+  revision = 53957;
   stripPrefix = 0;
   sha512.run = "0e4b25eed122d54765c527e00105a2c48fa658647621a0c4f61dc2b494139e60ac03c20533086016c172d3c93764af2598a0501326219dcb39ce227321a8862b";
   sha512.doc = "b6f95ff4700c0acd0f4161ad9c8ce34d2803e8a84eb28caac26b7632d1d2be7f5036a99554298cf7f5344ee463cc8a1b0a5167f7cbe61394c3f5e566dab42d47";
@@ -12540,6 +13773,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "export" = {
+  revision = 27206;
   stripPrefix = 0;
   sha512.run = "04b5eac3e263fd692a1f4796ddccf7c5f41398075c9b15e65a0712cc83dcd85a65ae4506a882249e09c9ceea37f973be3398a0c31d2590e0c3e57549f07e9116";
   sha512.doc = "169236b497ce09d685c71bd21eb6c35ac260d5978c03f074371386062ce8219bac1e501878ba13b60677c423904ed11b37d8e018adae573d135a1e1cbfdb84a4";
@@ -12548,6 +13782,7 @@ tl: { # no indentation
   version = "1.8";
 };
 "expressg" = {
+  revision = 29349;
   stripPrefix = 0;
   sha512.run = "d380b7ca2efad2cdafc3ea6f2265452a85035765a221dd5cfeb33a03859dfca0e4cd01219995870c8943657d2525e25d32bf7e5b9fe8aa9afa8d17c1ac4703df";
   sha512.doc = "9287376ba5aa36088b4a99455b727c0f60648d50421ebf2fd125542f208f490c5b57af256bf2b704f01a3e00e85e6023c69cb6dad529fb7521ee8cde74ae9559";
@@ -12556,6 +13791,7 @@ tl: { # no indentation
   version = "1.5";
 };
 "exsheets" = {
+  revision = 52227;
   stripPrefix = 0;
   sha512.run = "c1263842d06916762306b0ead03cfec31535f40d41a0abe504366d0a762850f683b10563d47d149e89ddd75c18c3da7687a19b0a5bbe2b628acac1ed891a8285";
   sha512.doc = "fbb9dc0826789f6c19734b0b50925d035f3b55a5402dce6ced4cf6881c032d784d5f219b222170961a5e1563b2dd8a5c64e7bcdd434ca61dec94a857451250a8";
@@ -12563,6 +13799,7 @@ tl: { # no indentation
   version = "0.21k";
 };
 "exsol" = {
+  revision = 48977;
   stripPrefix = 0;
   sha512.run = "ef7e031334a27a522f54c5ba5adee0fbfdb4cfefca6e8c1d4f67c8bc542c82bab6ee89d35f8ba8e65ed0b17107fd164c00ed416c64160991b59693f5b567b502";
   sha512.doc = "b6c5dd47fba5d14560a2d2341f1d17b17eda0ce16a6198ec589f47143ab46fa71808aa6a40a43613cf906542ed9df7d164fb2c7fe5785bf414076934932c63b5";
@@ -12571,6 +13808,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "extarrows" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "c5ec26369801ba653899a6c67c41a173842f7f5283d1279d512104cc9cfd04707fdd0313a9fde03672f03a7bf1f2c46f376aa961b211b4bc0ff2641d34eb3b8d";
   sha512.doc = "be17974ce5f9361bbfd8ffdff55ab39cb1de6aa5701c4582586ea43cde45854bcc8c65f5c4c7a9a1eaa311c24132294ed02f36998905ed7f872c81a022d4d6ec";
@@ -12578,6 +13816,7 @@ tl: { # no indentation
   version = "1.0b";
 };
 "exteps" = {
+  revision = 19859;
   stripPrefix = 0;
   sha512.run = "1991bc0b471276ca3db68a8ba7611becc4557de4335a321b5c3e92c1fefbe34dc0488ab44850835b5ceb1684ce429e7756fb86d885e2da2177e0d9081797aa0c";
   sha512.doc = "aac2e20a993818576f9e1efb153e9285b17b48827a1547a0c1033f22fa1a52f84ede214b4322ce4c6ddff69b8736f214f27370b3f1c006ea6e5fe2ab9fd64304";
@@ -12585,6 +13824,7 @@ tl: { # no indentation
   version = "0.41";
 };
 "extpfeil" = {
+  revision = 16243;
   stripPrefix = 0;
   sha512.run = "5cfe0172ad420c3ca53c57be33fc56b205ba05a11876e4d14c6d86387788c73370bc0708bee46e43a02f10ce9db4b3611b4ee337ace44fe8fbcb2ca82f88b2f7";
   sha512.doc = "8c2983b2e777e21e95d6ce1b9b4732491ad8a931205adb071877bf966fbbdc4306b88b35db87db4c3fa0bc52cfd333f721de2e1e7d233ba3c91d192a3574171a";
@@ -12593,6 +13833,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "extract" = {
+  revision = 52117;
   stripPrefix = 0;
   sha512.run = "32889da48868c2335866bb5c229728f9a37dcfe552830ca03ad3b704d1f7a471ee120de2ffed07bcf50797f7e34dd6fce53c77f1b63d15071888171d44cc938e";
   sha512.doc = "64fd270a61f5e5f39442a56bb7a20606854b45a995b9a455604139df8006a1b198ae332669de09c1baa5dee5ccdf59e5989d21c17376a764a096f535ceff3f48";
@@ -12601,6 +13842,7 @@ tl: { # no indentation
   version = "1.9a";
 };
 "extsizes" = {
+  revision = 17263;
   stripPrefix = 0;
   sha512.run = "5b000d25ff594af2895408f0d83eeb0e7d6dd5604c53d5acd835898197e44fb88ed2469039489b75b45678f28182dc88a0af56ed1b1730be2ce41e6e81f13b7c";
   sha512.doc = "9bfa898f7eab416beaee2938902fc0f3a5ddcf1ce972f30d18a683756fb53bc8f66ef1220bd3bbe6ca6a473959a67c55c18a7996eb095ef301da8b594f42d3ae";
@@ -12608,6 +13850,7 @@ tl: { # no indentation
   version = "1.4a";
 };
 "facsimile" = {
+  revision = 21328;
   stripPrefix = 0;
   sha512.run = "3a179a3abcc33bd0f48bf267338c8a7dc0186f7eed097af74cfd8a936956952fb50876dea447839738842fad34c724c057f577d427a82fd82f85c7e8ab80c8ab";
   sha512.doc = "36da402d7b15601ad768aa1e07f356812ddf0a09b30d19c13bfecaeac847537caa3be31036cb80441370b6c046dee24b13aa3e04f339476e9ecd18cf09c8c9cf";
@@ -12616,6 +13859,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "factura" = {
+  revision = 51895;
   stripPrefix = 0;
   sha512.run = "e4ae9c0019ac296416497fbc8d30bc981a1987cb7b4fc7ccc21512fa2ecf11da0b4057775dac37e3421261faa8c76b9354725a2c514d1fc514cd7815571d2004";
   sha512.doc = "0b091d2d4da4cb858ab13514fdda12babe9bddbffe466fe4d40c7acf828e31b9aedd6efb3eedd8895e7e12691a0e1e2bbe1f9bc8a21f3c18cb3fb1d455a8a3c9";
@@ -12624,6 +13868,7 @@ tl: { # no indentation
   version = "3.70";
 };
 "facture" = {
+  revision = 43865;
   stripPrefix = 0;
   sha512.run = "6657931eb2c0a134c53cd9271109552d4b8848247198fee9aa8d9010ff2faa4909416484dec8809d7ddc58b4202f9e2a97c5b97279e5432a1e928f91d7cde71a";
   sha512.doc = "a96e30b15f1fa827fa4dafd3594e8b98ee8c17c23056926d82243955971225d5a4bdf41a1a2a5b19049619c2eabc1b8529db70adce17bc126c0e1e3be7ecb2df";
@@ -12632,6 +13877,7 @@ tl: { # no indentation
   version = "1.2.2";
 };
 "facture-belge-simple-sans-tva" = {
+  revision = 49004;
   stripPrefix = 0;
   sha512.run = "90d1ed96793b0463f14fffcef020ae58673df10bf511756387eb38bb2659ae3e362f52d898996410447bb5304f3950325fdaa25841ac4351b4584da951da2b4e";
   sha512.doc = "f111fd7a81812aa0d65c4143751bf0bc331f8de248876f81c5517301d8a9743cf2e091de6180e3ec1d74a646ec539b65f0f1d8068ad1eb5e6638cbb783b4f420";
@@ -12639,6 +13885,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "faktor" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "5c598fbb40d7b37ee5b66bc1bfa8b0b2a0b45f7e22c992e6d0c85ed952a79a120803d41f9b4a13bcbbd6424c555c8b9ba6adb4eb79d1056fbf759008f9b741af";
   sha512.doc = "57934606287afaf1471f1207af5d0e97533a504aa83324069154e88e70f10779d2eb19ed2a9e177c5a4b2cce4203b576272fd2513d989d4ee276330305597034";
@@ -12647,6 +13894,7 @@ tl: { # no indentation
   version = "0.1b";
 };
 "fancybox" = {
+  revision = 18304;
   stripPrefix = 0;
   sha512.run = "752e26abee96dd2bbf77b30a6d98d48a1673632d5601d28bba5799e845a015357b96302f3f1d8977f0458003d3456df4694884a05ccb6124b76ca8f7fc84fcbf";
   sha512.doc = "2c3e0466198d392af57b2bda16f80589a9aa9db992272980a2e7ab9d7d1842d7e8f2980003b3b09648cfe0b9a1977562534ca54fae120bd7e4d950d25a83c0c2";
@@ -12654,12 +13902,14 @@ tl: { # no indentation
   version = "1.4";
 };
 "fancyhandout" = {
+  revision = 46411;
   stripPrefix = 0;
   sha512.run = "0091703483cab573f9c9202603d31e310baafe932f929ad852c23d2ca97f21681637bb3ae34fd3d916f3e50f553b42ab1682b437f5a63b67c6dc4b7b7f202c80";
   sha512.doc = "be4c7b2caf2e85ec192f3aded87309ee2361fbb7e8fd1225f8f98f96446251aacd69e04e306473d06e14c8a8b686dd7a1c54cb0311bc4138fc9c34fa2d528ddf";
   hasRunfiles = true;
 };
 "fancyhdr" = {
+  revision = 49886;
   stripPrefix = 0;
   sha512.run = "da99c0def1655589988fcebf627dcb35ab1a3f7ef481f141ee91045f81138cc02f849f4879507afdbd89e631460e5104d49bf0be6a640f4c7e9532acbc952454";
   sha512.doc = "a54bd1e4c0835e1d3790ceb9c50ac63766df45fb3d807b74222465c116fd103d65bd09a8e0f4cd20941422734cc508fcca9f86be3ee0cc2beb4927b9a2149849";
@@ -12668,11 +13918,13 @@ tl: { # no indentation
   version = "3.10";
 };
 "fancyhdr-it" = {
+  revision = 21912;
   stripPrefix = 0;
   sha512.run = "6899f3c11ed4a8f7476fe954166ea7576446b670d0b22737766927fcd29eb24e6143ff3031b974856562a7ff55e68f208164729618a4d28d28b856919f2a666b";
   sha512.doc = "cda5ff0581545e4eca9787b27dddcdad226b5dc9a630773b13073e9248b7b30b985fa5f5fc1bc5380e5a0d96f06c666d4e7e73168afbc2fa4ed0dd202967dafa";
 };
 "fancylabel" = {
+  revision = 46736;
   stripPrefix = 0;
   sha512.run = "950455301b0bf3ea3be0817a45c4e7453ba95c8afd397c1cf9ebf559f160e2828f414f0dca4647a80481f6e8daa0902e24692469023c21ba844afe1edda60b2f";
   sha512.doc = "3a05f2b388eb2a22a0b48b4761b3964c7b0c616eaf0c8adcbd4f375a3dd059b3d3b0831e754842bc084123fff7a12f59c87c5c5b362739c062f36a215dca2ca3";
@@ -12681,6 +13933,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "fancynum" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "93e1b88ca722b4169a572285443fad53b66ac59a3c0b6465aad54bd8d416046bfd79897db3d8f318f9d6e004c958b94bbcab16b1183d66197e1078840934689c";
   sha512.doc = "4be390bfd7562e0c94dc19fad3e0f34e52db393878290773517d6d7951e428cd3d0dccf5f47f6f03e5f0b380ebb386c8d89373e8c8e4cbd16463a9cdd2f2417f";
@@ -12689,6 +13942,7 @@ tl: { # no indentation
   version = "0.92";
 };
 "fancypar" = {
+  revision = 49801;
   stripPrefix = 0;
   sha512.run = "18a4989c979c7d0b1a5c303b4663484e920962a5090e229d7b75ac5678860fedbc95df530fda954a3a2602a740f7afdae3e41f6a3e07405d77263045a6c62a1f";
   sha512.doc = "98cb690d9096a73523bfedc6a2ea35414e34043d5eef3d73d337c3d4feef3bb98303a22a1933eab53838e78cffc8ca1ee36bc00fdc13a50213849d87fa92c553";
@@ -12697,6 +13951,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "fancyref" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "8f4ea5f16bfdbd06bdbaad76da724a1aad82263f4db2c24cf5f2e9f2db9f2afd9d4004d629098f936e0c2d4dcfa5fba8bd278746b90542f87b547e20abb0bcba";
   sha512.doc = "2231f5fd45d45cb7b538852c95b90db35fde9b66629d17ec9288de6ecf5339359c17fdc8931019fd4acce61ec2927a0cd494cc7462cab0df13d7660106b6a142";
@@ -12705,6 +13960,7 @@ tl: { # no indentation
   version = "0.9c";
 };
 "fancyslides" = {
+  revision = 36263;
   stripPrefix = 0;
   sha512.run = "a0b9ef4ce804b78a60b4c3a25d5d70bb7ec17324d295cfaccb64d166bb1a704bbd2baa5cf6edfed7adff03f48bd3f3e7854e2fbfbbfdc7eb953d567a257a6e46";
   sha512.doc = "77e1839377ba440d4009f30ae6e58d843ec4b7a1bf7f0d3414700e32c9a01062cd6506cb589039299e7a4fd945f9ee5cd951a62fe9795f822089152ca19f3441";
@@ -12712,6 +13968,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "fancytabs" = {
+  revision = 41549;
   stripPrefix = 0;
   sha512.run = "0cd45edda0062f4a0fbc26a0516d7f5b35cb4f8dfd4072830da880369d71d8a4aea6a7d5dd95a0b479ec3128170108f114aa00ef4b0c8324c60ddd214568f5cf";
   sha512.doc = "0113da627d27fe88c4faa87e1564851344dac2efb75c78facc4da49a8937e2bda8e1f22997a2018b368001c24e721cbf623fc199d03673701a55c7ca45404770";
@@ -12720,6 +13977,7 @@ tl: { # no indentation
   version = "1.9";
 };
 "fancytooltips" = {
+  revision = 27129;
   stripPrefix = 0;
   sha512.run = "e1d7243552cdf65cef1e647472a7f6c1d818c1e862afcf8069768d9beec01e4c250786e2c4c1af4febbdf94f20362110399bee33c7902bb7006de474a0d013e6";
   sha512.doc = "4bd82e0ae682abd0157f94b5374ecdc6cedeff0af22a5227ab527b725d8710bd7f8c5a38b7380a91ecaaa383824d8b88d182d1edde312492c34728ab6ff2f4e3";
@@ -12728,6 +13986,7 @@ tl: { # no indentation
   version = "1.8";
 };
 "fancyvrb" = {
+  revision = 53392;
   stripPrefix = 0;
   sha512.run = "18e96a9e2f0d397e83af318f2bdec75b9ccc819c1961ed3d1898ec5cdcdeee8d9f6cd3659e11184495045110ff9637088dd61382c039504722e0119da8c67af2";
   sha512.doc = "cbae429b29f1bf6d6fd78f449e7b81cf81069db3cbfcc3aaabbc686f3c390db2bacfd13c483ed9bdfe8424276839a17d2ace710612cf014bdc27820cb16bb4fd";
@@ -12735,6 +13994,7 @@ tl: { # no indentation
   version = "3.5";
 };
 "fandol" = {
+  revision = 37889;
   stripPrefix = 0;
   sha512.run = "309b19d6bff9d3e009610d698a73ba191da70cabd57157f274dfca7583a9e9b31fc30ea52b2b2ab3386be7290a680f8eb47dc92381c3da8251b01d8c6a65c3ff";
   sha512.doc = "d74e78a1c863d3865ec4b21a4c762bf6e2c30a8656fe0ec830d1e56b9fcb48861f316ccf8d8641e7c674e25f1ac2292d10ff2127315275347096ad325828d7e5";
@@ -12742,6 +14002,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "fascicules" = {
+  revision = 49457;
   stripPrefix = 0;
   sha512.run = "5ca661dea7cad6094d66d0a843cf5f19183154f81773db38f9a13795a5b9d8646e9f0b471bbd741e5f25cd424f199b3a18d1257a7e8d07e0d812a04ae202ca24";
   sha512.doc = "02d72ccdec87334da2c10d5a57b004357e36c8fc1aad33783e44992019fe3dcc8b8d6442d63870b4806c3dd080c3518bf94ae110531ac65947584301a11b4b51";
@@ -12750,6 +14011,7 @@ tl: { # no indentation
   version = "1";
 };
 "fast-diagram" = {
+  revision = 29264;
   stripPrefix = 0;
   sha512.run = "cedc8305ba0a7b1d22274d869629a1872a80a4001b443c8baa93e44198a5dd88e39c16c28bb5edf9fedf4f8f2f68c6964f009cbf6feb21c7c14974c4b598acbb";
   sha512.doc = "cd8e3edf882fc16b5757f59d16ed1a479e437eba36c783cd86cdfb9cb81f8b30e8b95a522ef6fe4b6e22b4b0bf6637e72bff734f7771034cfaf85df935e4a003";
@@ -12757,6 +14019,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "fbb" = {
+  revision = 45277;
   stripPrefix = 0;
   sha512.run = "eebe9b977296dc02938c13cb9a160612adafc00dbf200fdebaad5eb1efe8c41eafd6102e40b7be2e734fceb7c92cf84730182bc2743c5c68924b00a5769ad172";
   sha512.doc = "480f1df4a1b1ad29f009d70f56e96ca3ea3e76ca913a86cc4b75850211dd4f92e3e43fd9ce832ebba98aae194111ed340af2f530f00edd37e4a63016dc7bc215";
@@ -12764,6 +14027,7 @@ tl: { # no indentation
   version = "1.14";
 };
 "fbithesis" = {
+  revision = 21340;
   stripPrefix = 0;
   sha512.run = "3e593e312ac8efbbdd294e6a00ec020678dcb12259ae778ddaed4d43a800aa19ba16f8eb15b5122ab22f44c5e23c77e4fe733c7772929ef55589d387985db694";
   sha512.doc = "92d0ae3382aa71260f6ed204f6bce1bcbac26985f41789e00c5d3186dcd448bd169b7641fa40d34cf87c556ca10573b0d8cd4235aaea8a0d1533dc40c71b3779";
@@ -12772,6 +14036,7 @@ tl: { # no indentation
   version = "1.2m";
 };
 "fbox" = {
+  revision = 53320;
   stripPrefix = 0;
   sha512.run = "c7b6b1af67b8984486b5327a1d017be65ee3f5bb026e9e41e929dd572125363aaa9726ed6d619903ad465c792f10ce52038f0ae7356d836799945416e96e18c3";
   sha512.doc = "565c22a94102c184da9180cca35e840881bfee10c9f404dbec230e167f1f2587233d85851c9db6babbe29494c7ba4f6acc495464320df0a6f4055c29ae8eb1f2";
@@ -12779,11 +14044,13 @@ tl: { # no indentation
   version = "0.04";
 };
 "fbs" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "2d5bce7890fd8e087e035e60064bf134d8ac7ca2646f7b846df8fca7c594843c2778d0ad1752ffefed40283153194b5da97156e866bb4b8bd10b14c8ee3f2c4d";
   hasRunfiles = true;
 };
 "fc" = {
+  revision = 32796;
   stripPrefix = 0;
   sha512.run = "12bb408f7ba4774d943aa954bd3d2558a329d383a65cd4780f6c5bdc39f51b943f01d87ad203aea3b02768dc0b9ab42f681175c18a1e1dd901255aae05156558";
   sha512.doc = "a7495a0d6bd394811ff22438a42afe3c5109633da7c606a732f4c5746cc4162fa1c86ac3774aa7754e9b07c499f3519423d4b6fb212ecae156b0b8e8f848d914";
@@ -12791,6 +14058,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "fcavtex" = {
+  revision = 38074;
   stripPrefix = 0;
   sha512.run = "db440d7310805a7f3d918996e577a07c5d8dff72e6d667f00c1ffe5d88e3bcb689e794837609d9a0760530e923f9a28d3e5c052cad4c38e23ae03454e0ec26c4";
   sha512.doc = "2060c70b6a926aae23c145f11c7c6e255f684f925bf5447ee98fdd6f6290d64fc5a92ccf8cbf85e0c6f0d6fee869a2d947e3df8726fffa4a5d2c87c217beef59";
@@ -12798,6 +14066,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "fcltxdoc" = {
+  revision = 24500;
   stripPrefix = 0;
   sha512.run = "c14db194a73247122e589024824a53125ff10e15f8bec2475530aa41e78d74993f73474ff9b3899bc499c0cd8dd3e1ea034ea821d233c2a512f8c4d4d06d095c";
   sha512.doc = "4aa6aed9c5b4ddaa63eb2aa7e529da03dcfc57723a6cb40cbbfc729636e459f4df1e292bdcd20093595cc3ea154787fda41abb4f6f46db2a7331626f181f47d0";
@@ -12806,6 +14075,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "fcolumn" = {
+  revision = 50937;
   stripPrefix = 0;
   sha512.run = "13128f25e12c914bf25c45c87a75bad814eab519059c8a478162cd4fc678972ed8e24800042e87866197174044eaf9f90d3cd3a8eca62f33400e3fd2294922c8";
   sha512.doc = "ae0645744e26bbf1a940ba1339256b7d718f4df819ad04f5f52301a26d445cbce4a1ae4bfa2fe6d13bb81ed31e94839d87a251a7429305d396a56ea113df37bb";
@@ -12814,6 +14084,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "fdsymbol" = {
+  revision = 26722;
   stripPrefix = 0;
   sha512.run = "37f716e9d540d7742f53cd38155141d763d3f8509d1aa1f3cff53ff33c45537c44dc68c9608558021868de3072302d7ac84909db05e8b25813c23ea01c87edcb";
   sha512.doc = "7d1f3fd153bc17e65a99ce6a38c8992b2172c1d0b85254fcc7e926b9539928ad403809b8af4355abb1e93196b4e4d5461b587c8ad94d04cca7785c8a334b4ac1";
@@ -12822,6 +14093,7 @@ tl: { # no indentation
   version = "0.8";
 };
 "fduthesis" = {
+  revision = 50738;
   stripPrefix = 0;
   sha512.run = "2c33af9559603c08ee844cc0dd6dcb8a6c215f0b0c7cd25435b64b1ad6c83dec608c601ce16efdfbeda890258bb36df8eb549bf43bca21bd778e003cd637507c";
   sha512.doc = "bc3d2c383233846631e5042742a08b5ca05d0cbe68fad908065310f00c50e9732af0b912eecf01496615d221a1ea6fa5f3d9be91c9533b97fdd642c47d6d8c5d";
@@ -12830,6 +14102,7 @@ tl: { # no indentation
   version = "0.7d";
 };
 "featpost" = {
+  revision = 35346;
   stripPrefix = 0;
   sha512.run = "9d7c35499df5c8c8efe8ea51d88c4cd9ddc6bd5238ec527d842aaa9ce42c30bb1d73c667f5aca22f385d3725c7443f043a2b63cd337a7f6d5b5d5810ea34bf64";
   sha512.doc = "e4eefb43d63c6522c3080a76b4df3a369932bc9e2f868ed0143d62fd2365bb74e6891705b287d19b4ca4b2560b0573d6ff9a0e5cf2a3da2e4b21482cd6cdd0b9";
@@ -12837,6 +14110,7 @@ tl: { # no indentation
   version = "0.8.8";
 };
 "fei" = {
+  revision = 53748;
   stripPrefix = 0;
   sha512.run = "bbce2eab74a8fa480fd68bb0559c2bc41998ae119720ae2a2e2b2a0688fd0a61a817a4a7102d1c08a2aaf042182bc3fd4fdde64d2be66e0ec309276cbf47ef92";
   sha512.doc = "dffd3e43bcee3c608d3b5f6b13e6ac721649db0bc7484357c34fd3a3c962cc7e4a5af2188d76a409ddc0cc7fd8111e8aa402d740a53b14b58c8be86f964e6243";
@@ -12845,6 +14119,7 @@ tl: { # no indentation
   version = "4.7";
 };
 "fenixpar" = {
+  revision = 24730;
   stripPrefix = 0;
   sha512.run = "1b09294b430bb9ab6a4eae11549500b224514e55bb99329a4ee3d9d72ab906128063537302f672a772c02ff4372d46649656a88c4a303a9301976fc7a804387e";
   sha512.doc = "6ee02d615438e99df82f939a8104097e43802b00af2a0e7be56f329061722cfc7df0edf84c82ac73754d63a703533bd6d5b88b6e648bedbc47be712ff86ec5c8";
@@ -12852,6 +14127,7 @@ tl: { # no indentation
   version = "0.92";
 };
 "fetamont" = {
+  revision = 43812;
   stripPrefix = 0;
   sha512.run = "20c5c83119d70a94e66aeec0bbb9a0494525deaf9addb9b91d8d5595397ab5a1195eb9d72056a5fd1c3ca490aef66b43558f5c5b86688e7d164360a697c331a2";
   sha512.doc = "16cfb520cf8b3030d546e1c7f7cd41772fc9d16ea55db6920a50945a7aa3034050d873d3d5da05c108ee303dc1c77217c8a1f014c2e9beaf36d932e33aefeb93";
@@ -12859,6 +14135,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "fetchcls" = {
+  revision = 45245;
   stripPrefix = 0;
   sha512.run = "6cd8e2016f7ff344aa06587fbfeb4e498d1b2e76d9a6ff64f167dad71c4ce6ae867d791660f50e80b6f2e59a9f2fff4c4c9b7c1cdf84cdbbec5113081b24a25a";
   sha512.doc = "ebf9aa0150b06a0b4674e7be076fa5ae4b2ba4542aa28e1b9d4320ea0152a5cc9cbbf926d713f877e74ea948d6132fc36898647e4790c67aab651502c4e5d57f";
@@ -12867,6 +14144,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "feupphdteses" = {
+  revision = 30962;
   stripPrefix = 0;
   sha512.run = "b4d4285b33f314720cd07eea903bb2fc6092f96033f75d4b06cf315fd24d1a34722aa73db4cb6410a847e1d23a131ae329f8ebe75fca15dcaffb99097768f55e";
   sha512.doc = "d87c0a7722f62a599bcc63f7ecfea190c64d82a4a4a1ba21d18c69866f80ec77a527a82cb94b0d081002073f5faab95119c6902e8f8f2c10d815ca2d206b1d4c";
@@ -12874,6 +14152,7 @@ tl: { # no indentation
   version = "4.0";
 };
 "fewerfloatpages" = {
+  revision = 53779;
   stripPrefix = 0;
   sha512.run = "9618c6cc8f94957cde1f015cb49379e3e3ef3b39aba816a81f38749037240506c8fbfbe12cb9c32f7f1e651804659649f06f509e6d7882d5fcb16a34507a264f";
   sha512.doc = "96e9f9cd865731d4429f921c41493bab6a760ad6bc8d984c12334149dec3309949a7a213ce28f2ca11ba793ff4264bb3a3065de86a1509301d7d7ae046a45d3e";
@@ -12882,6 +14161,7 @@ tl: { # no indentation
   version = "1.0a";
 };
 "feyn" = {
+  revision = 45679;
   stripPrefix = 0;
   sha512.run = "56e7d5b875db6eb6e5ad2b07d5696fa4fc6cea7d0f0f9d691bdec0fb90f16bbcac0c9f20f8f16bde20eabf98f72fbbd75831af1191b229cd7acca60bb2edda28";
   sha512.doc = "df4454efa6f9130fac5ee2986abdd8eacb42063930ee194b65d94a1e1a90460c4116fd62da232f01f94fad63d9eaef627655aedadaaf034f910ebb97b40a7792";
@@ -12890,6 +14170,7 @@ tl: { # no indentation
   version = "0.4.1";
 };
 "feynmf" = {
+  revision = 17259;
   stripPrefix = 0;
   sha512.run = "d4eb87e3f086f2d39c87eba057fc490ce5d39e9c5ae39aa1c04ee8c3be9c4a188ef123f860fe74d31e0e9e9182909c39df3434ddcc618632723f00627f66397f";
   sha512.doc = "933edaceff112f7442f7c662fda43f343b0e7e41f65aae4f1a45bfd2de18c1e4bda505a235eebc4daf2451846dab376449242217ec803f2932a4a1584038f4ee";
@@ -12898,6 +14179,7 @@ tl: { # no indentation
   version = "1.08";
 };
 "feynmp-auto" = {
+  revision = 30223;
   stripPrefix = 0;
   sha512.run = "64ca275292b12847d823322ced9dbad615a34089c8cbe43262e676b34db205ed56509f641e18e949523bd252ed1ea73eeb5f019e2cd052274c02b1df67860a25";
   sha512.doc = "3dd88f5af739013ace4fd8eea70ce247b997e887c0f7067040ff9bf4e0300126aff53845ecefafa7bb52dfc4d05d181a1e96847e6a534c718c5a7447231539ba";
@@ -12906,12 +14188,14 @@ tl: { # no indentation
   version = "1.1";
 };
 "ffslides" = {
+  revision = 38895;
   stripPrefix = 0;
   sha512.run = "393903c180f2fd554178c909bf9a4c060707d8f2fac44022b4811526c7b505a0354afed77f8ae0fa3fbcebed3918a6b46f9e81206be78d7ed6b1c959cd3473a2";
   sha512.doc = "4a8e176b7bce3d54464a30497e41d5a899905a0029199710aedca7234612092f0b2e265a465084536434c9b8c7f45eec3f2ac3df5eef66cecfdae5cdae36c798";
   hasRunfiles = true;
 };
 "fge" = {
+  revision = 37628;
   stripPrefix = 0;
   sha512.run = "0336a91c06bf658c1bf139d716952ac2ad420e307fb8b525e53cd4a488e0cff536c89ff06ceb8788d1e54b96a9fe4b24d94beb6913c1be8683e359a4d00dc4f6";
   sha512.doc = "4f18f7bc1c8000664753e6f0615f7dd1d0f71bf51aeee6860fc2181536f6f1fc37b21e83b0c5b6c151e1012a02ec97d3d5ff6d132a5f6986e94bd173f40f994c";
@@ -12920,6 +14204,7 @@ tl: { # no indentation
   version = "1.25";
 };
 "fgruler" = {
+  revision = 42966;
   stripPrefix = 0;
   sha512.run = "d189eafb4b2f7788d42614f87684bb3cc36d8e022c9c98f8f7f44babd5f95d3462ff25d2d9ab541384d35ad4daa39b09e28dadae1fbd0f7fa25d0f8ae217c34e";
   sha512.doc = "16e5f5be432e338788ea78c5e41091eac616a3ad779c3c40bff723fda2646d5205599857f0e23f1b2774fb56a2ac795c61babe21cc4de5ecc2fadb7b6d33eb2d";
@@ -12928,6 +14213,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "fibeamer" = {
+  revision = 53146;
   stripPrefix = 0;
   sha512.run = "7f10c002cd04dc2624f84bd2da11a9331639a33a5a9642a7ebac96f28a4af3fa177c2088557bd966c4250d561a8b8813b042e7fe9c456e5b41629094dffd5c64";
   sha512.doc = "1121bc8f0f7c226bee621cd0bb5f75a12cdb8dfb64540debc6b25a24a34b939d4dbac04cea3cdd97372be5b355fe028a0354bdf2393160b577f10fc31c2ae9fa";
@@ -12936,6 +14222,7 @@ tl: { # no indentation
   version = "1.1.8";
 };
 "fifinddo-info" = {
+  revision = 29349;
   stripPrefix = 0;
   sha512.run = "86767390bc9946b8f8d47dae0334d7cfc21ac2b064b00ab70732f7ca3f50d875a35dbb0e477ef1c014452fc14c177a1c5c6b96ee334c99bbc2bb49eee9ffe6b9";
   sha512.doc = "e6635f5cc989bfa0da9b2b0cbd5c3719aa793552f4c1adbc1ee218a78b6b116d2c2046b04254e3294834e63901ece9489b8c86421afd3c58aeb8615b5859ee92";
@@ -12943,6 +14230,7 @@ tl: { # no indentation
   version = "1.1b";
 };
 "fifo-stack" = {
+  revision = 33288;
   stripPrefix = 0;
   sha512.run = "4121e3cefed7ffe80bfaa8b054ba0825ab0fc2b4073a845386de4db3650b4d68c48a4f7378ffcfc4a221b21ad30ac6e199920e7d8c44f503b35c14cf4c001462";
   sha512.doc = "220d9b2796c20251ae568d1dc5a7eee1fad5cf6aff26a2b94c1a2c9dd6d853dfc9c25377ec8c3d6edfc43f5b4cf645c459754c5d6a642506fa7779cf79f1a901";
@@ -12951,12 +14239,14 @@ tl: { # no indentation
   version = "1.0";
 };
 "fig4latex" = {
+  revision = 26313;
   sha512.run = "3f01676ea85d64e09376da4481794e1537b9e19c0ff0bac77c022b10b5d49c39d789de6e4f0356b4ea4b23326f9ef320f4b08035bc04a827951cbf44ed7c6228";
   sha512.doc = "c05d3c08b916785b765694e68b8f7cd96c3c359325e8f84166102beb4caeada7490ed24ad0b4f52a66cb822000f8b4d75d1013b93055898e88e82d7f23d5095a";
   hasRunfiles = true;
   version = "0.2";
 };
 "figbas" = {
+  revision = 28943;
   stripPrefix = 0;
   sha512.run = "2fdc1114b03123c35eccd6b617310c714f37015620551538458a1a49b1e9a583aa55b3cb661f204bb9168cee0a7325b066d64315a15a94daa01e43d05bbb2561";
   sha512.doc = "7dc8140b3b545d2683c471e2e2907a58e2c995f23acea26d763da8989c3288940dcc154ffc0f81ea99169ce574bf90543e94f86bf8217996b7c83474a300806e";
@@ -12964,18 +14254,21 @@ tl: { # no indentation
   version = "1.0.3";
 };
 "figbib" = {
+  revision = 19388;
   stripPrefix = 0;
   sha512.run = "1632b372b06d8ef3cc363d6b05e70b8a493f357fb947ca1b8fbb7752d7ffc4ec09904e747a3e9b91b61e5d094c96eee954d533d1b286b372aa57244ec2abc63d";
   sha512.doc = "ba42f6cc811fc9e00c41bb6fb410a57a2efe759a0fd0621cd83801963d0ed138dc66a1a245a4b7256cb056f3fe71e883a8fa84d19dda785ba24825e85edfa044";
   hasRunfiles = true;
 };
 "figflow" = {
+  revision = 21462;
   stripPrefix = 0;
   sha512.run = "f75517b5c43119d33edf46fbe124523cacf0d7d837cdf66af702ba563392a96323b266bece1ec9e7f87df34d684a87ab38f9ddafab6c3d069dca8ee22c3bf25a";
   sha512.doc = "c972bfb356731aa119e8cdf1292a3bcbfc08a74453feb7e509a5cc519f62ae6c7e6b0c087973549b9d860b97ff1a3bae9cfd1166c4ac6a74553ca6c0f463694d";
   hasRunfiles = true;
 };
 "figsize" = {
+  revision = 18784;
   stripPrefix = 0;
   sha512.run = "3c7523b05d04363c57c1ba75a39d9698b1648ab6a858be15112b6f47c052742033e3ed16752a9b9ef3854ab93f547f0841c32f1cc68fb9d4538fc02a7bb19ad6";
   sha512.doc = "598f631423a97e189c21e117a7da23c95bbf4dc3b616e62fc6738674848fc46be4d7dd43832ff58ef834c0fdbe35d8923ba9729d5c48f90b0431a22bf86f79d5";
@@ -12983,6 +14276,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "filecontents" = {
+  revision = 52142;
   stripPrefix = 0;
   sha512.run = "b40bf2e4eea194783dded4f00dc24f1cea26a854e96b57995b69354a70c1e7ba9ef0e64542c2b524ad59d9b12fb1accf93ee28b4c7e735279c0bbeb915b6c991";
   sha512.doc = "0ebf1990c005dbf92b7ef73ccae0cf1ad47ca896f0805a5a8291a15c6764e2259ae03fe14d9c713484ea258764b706881051b4001589715bc36ee17ce5bdee23";
@@ -12991,6 +14285,7 @@ tl: { # no indentation
   version = "1.5";
 };
 "filecontentsdef" = {
+  revision = 52208;
   stripPrefix = 0;
   sha512.run = "63b399a5e21d2d4946c195f380a0d5f269f8c978c0b504cda80c0796604dfcb66df38ca79d31078efa03c7475967bc0ebfb856e933bce6b21d12836368780e2a";
   sha512.doc = "26e7ca9971a0683325b62e2feeeb0db6ecdd3a732f07ae93515f2300ed58e97a44ff8a7504d194119c1e27d1d9bc4f367f29c17458c0e7f0b6a0a61fe18ea0ca";
@@ -12999,6 +14294,7 @@ tl: { # no indentation
   version = "1.5";
 };
 "filedate" = {
+  revision = 29529;
   stripPrefix = 0;
   sha512.run = "5e2789c065459e82f073599c4d5f04c626fedae7e02c8dc58d6595d81ec8281c9c362592eee9547369b7a8e9cd2aed1ec526d69a8ae22f35771d5494e3109032";
   sha512.doc = "cfc2eb596e6b6d17015ab2ca061da39e673376d6f4c526dc045c8d2514fa8372f1a853a97425b4bcb9eb0bdc522c6b482a9bc3da9f56f8a4e0c22e4970a40575";
@@ -13006,6 +14302,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "filehook" = {
+  revision = 53655;
   stripPrefix = 0;
   sha512.run = "16196dfc6efde9c09a0a285e25672b144e8ec291fd76eff4e3e8db3c178c2b1bd84e18890c5fc392c7bb87640e8fc8a6683999454b0619fc96dd1628804bbaca";
   sha512.doc = "0fe00874d60f10be246f8ce50060f84cd15b4448d52933a053b20e69fcf247823ccdda23b3282aa6d2317bc629b2cbb182c60967a2ebf23b64a4a57719664960";
@@ -13014,6 +14311,7 @@ tl: { # no indentation
   version = "0.7";
 };
 "fileinfo" = {
+  revision = 28421;
   stripPrefix = 0;
   sha512.run = "2e5914e32af48db731aa83c3e51e6d9128dc969891bce21e1e2f859cab79130c9f5caa0f591765fa8a9b48c38eed8d19305f4be598430ab1e2cb3276b6faf191";
   sha512.doc = "03b4ecbd21ec39d98949f2e8ece7e48bd539a75051350d1a9ea19e3d32ecd620c0f1a5dc454e626237534114d0430e2ad7c175e9c1b27ba15c78a35aeca3e3b9";
@@ -13022,6 +14320,7 @@ tl: { # no indentation
   version = "0.81a";
 };
 "filemod" = {
+  revision = 24042;
   stripPrefix = 0;
   sha512.run = "4ec27d16dc551d42f9ff326d20f78c48d73e7324af65f6ccb9e662dcd399394c631d9a742aef8a2efc235dfd769a04d22b4ba37eb8a2cd06631cba298540c08b";
   sha512.doc = "88c1d8c61ed1759617c9cec7cecbb28459dd5e06f139ba3ca2f98d7b6357a15fc89dd90daf26e5f4d17f33fe9673a8c17363fb757ecb71d9e530f0e153ec486e";
@@ -13029,17 +14328,20 @@ tl: { # no indentation
   version = "1.2";
 };
 "finbib" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "14f08cdc92a2d6d511c112c480efb0112d45c199023e89c9314740c2b9b83598bc9f8917ce616bb2493671f408f946ada3de4535136eff48b7bbf72e7436f912";
   hasRunfiles = true;
 };
 "findhyph" = {
+  revision = 47444;
   sha512.run = "aea6305dc0d9b31367638078a7958933468e761ef4cf47a1c44d9fd5ab2e25f7af22273c4631946a90edc9b51947c2e56b3d4b74c8c59f0a79250c2edf5bc137";
   sha512.doc = "97f3fa22fe490d21bc9e5ce5ea0b23ff25ab9afd9c5dbf6e8d78b24fd306ddc132c5ba7ca7ea7e3d7aaeb48993c7968b0c02ae0b765416a939d84b53171f4179";
   hasRunfiles = true;
   version = "3.4";
 };
 "fink" = {
+  revision = 24329;
   stripPrefix = 0;
   sha512.run = "837a470970c8376e1d699b28954cf2ac6ed849c2f96a4c17ced56ebf142297c36d3f856f9cbf4db920ae33f491738f7891433c5c6627565a48fb5391b663634f";
   sha512.doc = "7b1d9d1c62766082030d7632bd91c65328d1bf3e8bb6abe4ed64ec5188d9f38d3b2a99695f32c2bf04e2fcd634819926ba923eeea915186eb9fe96bcb43954ca";
@@ -13048,6 +14350,7 @@ tl: { # no indentation
   version = "2.2.1";
 };
 "finstrut" = {
+  revision = 21719;
   stripPrefix = 0;
   sha512.run = "8b360a3426056b61e58e577cc68ba9e2f55b63a3b4a0a2eb76ebee53e9ff327da9235e9da5cbb85e3cf369cd48354c00a79cd46110ba4adb4b64192b7ff7b603";
   sha512.doc = "8cc27d82f7125b5ee82585f97385924737406e45d9739ec9cd57b76736e902a588c7258628bdcc4841e3e23f359a4d8ad22a31ed6f821f1d1c59798f4e8f3d56";
@@ -13056,6 +14359,7 @@ tl: { # no indentation
   version = "0.5";
 };
 "fira" = {
+  revision = 52339;
   stripPrefix = 0;
   sha512.run = "3fdea4c886ccde87500e792a7508d5e7923d7a58f7f536b047ca537728f42c1ad44ffebb9b80869f1e30206e7f17ff5e694bd72b9d4c1a68eefcd01ec0b6d6ab";
   sha512.doc = "b54acf3f963fcfbc58eec3fb1ba058724638939d6d0f63b69108c431e6014fc46313e7d2a11f2d31e1bf12041d6d85f426f2b0533a3669f3bed14ecffbb3ce3a";
@@ -13063,6 +14367,7 @@ tl: { # no indentation
   version = "4.3";
 };
 "firamath" = {
+  revision = 53388;
   stripPrefix = 0;
   sha512.run = "282d1d6dc2f414c4fbeb0267ecbc52446c125e3195d82f5ecc60f1c659b0e92607fe2621f8627835732a8428d5028df47e3b75a8da051fc3da8ecfe9eb5eab1d";
   sha512.doc = "d8d3ebd6c529a7e518597b9de2372ea8aa6e07f39c281e904c2654ee575caf200bf3e18d8a9d98861aa1102be13d64d12e18860ec046374418e8226360e3aeef";
@@ -13070,6 +14375,7 @@ tl: { # no indentation
   version = "0.3.3";
 };
 "firamath-otf" = {
+  revision = 50732;
   stripPrefix = 0;
   sha512.run = "dbbb13d184e2a407bcbc2681bc9c5ff0e83017141792e956013254dcc50815f5b913bb2e40d6c09421883db774e9ce5e5ed17f6602ee902f485069fbd570936e";
   sha512.doc = "699e10d44b1e36505e872070c2799e1191e995ca6ae26058e7d069c96500a9c0914614750f6af076abd3a30b281409613a846c314a64bef047b3e313b0a4cc97";
@@ -13077,11 +14383,13 @@ tl: { # no indentation
   version = "0.02a";
 };
 "first-latex-doc" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "39641224689a1d45d59b5643e5037599d03df3ecbe95090d565778758d334bddf832e867a25c1688adbee1f99eea23b3ed21fd6729fb3d4e50f1503537c9a400";
   sha512.doc = "497080fdad8195bdc43bef476f9e678b49d83829f10a6653c9443d327cb0da8505623e941cd3038349b6307ee37a65ce1a3d3eb48e4c6262f9d636d10d96e17b";
 };
 "fitbox" = {
+  revision = 50088;
   stripPrefix = 0;
   sha512.run = "5244567062493fcb5300048be6786f1ac48c72c363220b894a2695e78646f461584e189f227d04f55e9127a66ab966dc04cbd762fd08277774fe1c0fcc7d3c96";
   sha512.doc = "71d77dd1879a2b9b20f9c4934af8bd696de567b5c0187e7a5bccc9e225fec5793bff6bc670ce0bbe1065cb67de73f518942ae48aa0a27e46c2aa47dcad6856e8";
@@ -13090,6 +14398,7 @@ tl: { # no indentation
   version = "1.02";
 };
 "fithesis" = {
+  revision = 47409;
   stripPrefix = 0;
   sha512.run = "f21aa6a1866f0a4d21eb8ea1e1463e421fcc72c75b72f4a79efabeb65da21b633ff913cbf99eebc71232a9e020d2bb7743f520863563f7eaf9763bbf6e9ad29c";
   sha512.doc = "ba5c0e75760119d9423cef3d26eac3f4b5621c80e760ef026aeef68589b5a724b0c7837088652e4e369fc48850a3d78c0e86f1f2b1149118a17739b5b9c0809b";
@@ -13098,6 +14407,7 @@ tl: { # no indentation
   version = "0.3.50";
 };
 "fix2col" = {
+  revision = 38770;
   stripPrefix = 0;
   sha512.run = "b3f096a64fcea6c6b2864d4e8a86733afb852f3decae4704e6c275c41e1295622f1eb1c8db0e0d33a29e369a9b757495477c9ebcf82ae0003c4316967c03f0dc";
   sha512.doc = "302ffac957bc37305fc5b6f458c4b7dcb06b65408131bcf64c0132638a110813eb6c748270ead340f3d864b927aa7bbfe0a16c3722cbd8334b1d8ba8ca72e7d3";
@@ -13106,6 +14416,7 @@ tl: { # no indentation
   version = "0.04";
 };
 "fixcmex" = {
+  revision = 51825;
   stripPrefix = 0;
   sha512.run = "fc3a1ba6c5516378182373b89b71ddaf22e713c0be959e8d5afa1cd57c50f363e68669049750f286142499961c56f6bacd60c63b0211d5e6ba01d7f25d58f759";
   sha512.doc = "e6f65b38a4baddf6c1840b0bb18464b6c94f97163672b67a87c693af19030bc3ab2db7607646d73f8f684e08258906da2380e7b1637ba85f80c49cf7d5045bc5";
@@ -13114,6 +14425,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "fixfoot" = {
+  revision = 17131;
   stripPrefix = 0;
   sha512.run = "52c25b4d5bb9e34fe3f8d2b122e68352ad572ff9ecf1011f3e9fbd67319d0781a48ca08ab03ad3201f1d1d2bd6d4e35fa3818e695a741a8ab440ce81f7724039";
   sha512.doc = "bfe0e39165be8f9a56e2cbd4b91c0b7b7448d0b9d8a4a0b62d6c0d45e542a9964af3d34233ec777b69f0666a0945513a8475629f0b084f72a0b349682e8ad6f4";
@@ -13121,6 +14433,7 @@ tl: { # no indentation
   version = "0.3a";
 };
 "fixjfm" = {
+  revision = 47113;
   stripPrefix = 0;
   sha512.run = "5ed8db53c1757c4ab6f14e763f9e58a76e5f8c594c30c1d1fd4d7c9a49d65da90d72650c88375806997d0f268b1a75215bf6969f45e45ef3a2127c422415bf16";
   sha512.doc = "5de4126f1f5215fc8132e0449048bd66dc73d8a5cff460d7873205f3cb55c2f8069870d9ffc794d5c173a52acccb5bdbe45b34189fbdd40509bfcdeed804153c";
@@ -13128,6 +14441,7 @@ tl: { # no indentation
   version = "0.8";
 };
 "fixlatvian" = {
+  revision = 21631;
   stripPrefix = 0;
   sha512.run = "48d39745498c187d23c62191d7da6341ecc13d6c43ac97deebf453046e78a26d221b5c7b7ed22aa8909476a754e877de26c20391bccb5cddb2db1fa7b238d643";
   sha512.doc = "07dc4fa87b8564c3ff3144936ae4374e0bc7cf37a5a3e4b5d0724681859a41d30d714e96742253bb9a269116dd32d2ab0c1e5e1965242e88ea12fdcd224ace31";
@@ -13136,6 +14450,7 @@ tl: { # no indentation
   version = "1a";
 };
 "fixltxhyph" = {
+  revision = 25832;
   stripPrefix = 0;
   sha512.run = "df41497da718b157073b6ad2a4b9cea3f9ee0a0824698f47d4441b76261efb21271f1605f69b1c0de8a99e3e636587a25b4efdb4d578683ef0c89d7f849d2c8e";
   sha512.doc = "37d6b9903a56d33577c8aaabd40de592bd78dc6b2f5a2c82457f6d5b499d1d6f9a9bdaff29bb9f9511365d32e160f92c85c6c0d93ed065fdd1688aaeae9ab246";
@@ -13144,6 +14459,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "fixme" = {
+  revision = 49591;
   stripPrefix = 0;
   sha512.run = "fbfc3a79dbaed48f79dfd59efba58eb3d6c4e3c3f6716b0910cc0ee7e6b0913f345f4a05bcbc5d9943437d072cf3008615ab573725c4e7b4d7d716bd90dd8d07";
   sha512.doc = "78f64f31246acc6c153c0f0ec618a3a1c473ea3a5cce47af57ee65603d2064b64a3a506cd18332f1686b41768dcfdb10a9f9cc000dbe5cb476c8c4c61283dae9";
@@ -13152,6 +14468,7 @@ tl: { # no indentation
   version = "4.5";
 };
 "fixmetodonotes" = {
+  revision = 30168;
   stripPrefix = 0;
   sha512.run = "d327d19ac0e9041da98458e9147b3d1a9c9182bfe5c893c03ab9ef42b9c8044314f4024503327594bef337c1af6aad0b4f2046ea2d6a433947c6c45ebdf8838b";
   sha512.doc = "7d7f8b049feb8e70c5d1ab0c71147f1f398b098f9c961267c3e90dc5e9ea9a8317361a0dacd8fe581e17cd85669bd39e83a1391641d353b01265a6195af33714";
@@ -13160,11 +14477,13 @@ tl: { # no indentation
   version = "0.2.2";
 };
 "fixpdfmag" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "733995ec82df92bea5a674fc25a3a6af2102739c3c73eeed7c9f40cd54bc4c5d65cafb35366b70641ff0661dc83700071054f7af274487474c3893ce5a44c9ad";
   hasRunfiles = true;
 };
 "fiziko" = {
+  revision = 50293;
   stripPrefix = 0;
   sha512.run = "785f99a52193acc630e5fb00cc2db9e16795f42059d65054b0fa07f8081b95e66a245fd05c8b3ee49a69d91a17e7447d10c39863612e44e2632afd5fd0165e38";
   sha512.doc = "e9aafff476605082dd4116cda573c8f20311659276ccc7dc3477a24024d59604b4b8f724effc853d7d7832493658fb4f8b83302921544ba2c986266317f5a895";
@@ -13172,12 +14491,14 @@ tl: { # no indentation
   version = "0.1.3";
 };
 "fjodor" = {
+  revision = 53207;
   stripPrefix = 0;
   sha512.run = "adf4d23888c6c778ada6d7cf930d4aba68b1cc20c64c571c17017b11c115452e5a4eb766d03ca03f27f9de46a5027590cd806b17fe94dbc4c5026948d3ec74d5";
   sha512.doc = "a0a0e01d4d40f1b847f40401d20604bafd2723097e72c208df2a5acb30f57042b35df4cabfc93108d4278f5725dd4b50539f7e17b7c51adf875898071a368fbd";
   hasRunfiles = true;
 };
 "flabels" = {
+  revision = 17272;
   stripPrefix = 0;
   sha512.run = "b05d66f1181eb9d7eb80636b69ea3af7a29ae7011f6888438cf80a7fa6fde44666f9fa7ee71620055f6882e73b6f5e211a2a65ca003d903cb26cc4f9571257d9";
   sha512.doc = "cf9b774ef4e1336a123d48b3797d8122c5b9128324a9f6c0c1497194e8d3a3d9ee46a5a58470074c0dbc02f8c0aaeb1da3b4d5683ba9faf6e479a6790bc599cf";
@@ -13186,6 +14507,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "flacards" = {
+  revision = 19440;
   stripPrefix = 0;
   sha512.run = "45cf4fc3f4678a5242873f80ff1ab328e7675107d14052be90308d94d44a931ba8b2cf3eec67e7456a21168aba168fe848979a8d45ef07bfc62613ad9174488d";
   sha512.doc = "087d2c5500b5ab51280bf3f57362f00723856b041f520d41849d21043859bebc106ff9af33dcbf044aabd838f68d1165f74645360247de2c3feb9a8493ecc441";
@@ -13193,6 +14515,7 @@ tl: { # no indentation
   version = "0.1.1b";
 };
 "flagderiv" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "a7618ffc60c548fb98a581324901af09defd9226a655163d967e251b090b6ea74d91ec10bbe1e5d685a83d147818ecbf8b66d84c972cacaf3e270baf39293200";
   sha512.doc = "8c9731aec45eb594b95e1c89a1967f169bf8394664977059af0fd77aa40ebf3769200925382694e221a32ced470161f505420539b5e3f7f00be4688e308ff54a";
@@ -13201,6 +14524,7 @@ tl: { # no indentation
   version = "0.10";
 };
 "flashcards" = {
+  revision = 19667;
   stripPrefix = 0;
   sha512.run = "ea1d530296c2b3e11645bbf09b4776394cf1725db5f30f23297818fa68b5a8d1d860d5873755d1be010c8d7a3d01567d878f3a12490fced35f6f825034f1c9f6";
   sha512.doc = "f42cef1b5a093861818d03f2df9cc5029546a1bb9b01a4349b815fa26d7320bbb9d596adceadd0583dfee7bf7bf8a011c8296ec06058717a61ddce10baf19e53";
@@ -13209,6 +14533,7 @@ tl: { # no indentation
   version = "1.0.1";
 };
 "flashmovie" = {
+  revision = 25768;
   stripPrefix = 0;
   sha512.run = "99ae914e1fa627f462be84f7bed923c638bf493ca183f010bdeb5d607ab00abaff7a1fe3d0f8613e6fb9df7cd5047b99e99a5da18470df25e7507259a441e188";
   sha512.doc = "016331e7328732f5549487f8b2edbeabc9548eb81201584d3d3f7e0ff41a9a962761a8af867dbee8951bf4e99ea4eeecec7e9230868c23abc95260f288ca7958";
@@ -13216,6 +14541,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "flipbook" = {
+  revision = 25584;
   stripPrefix = 0;
   sha512.run = "8e3140fb417115ada958bf6dab1a22b39779926b47938bb49cf86499d64ae16d321e6e6bbc8482ee7e6a2d79d8341a227785ecf04c66a15f7e5c0ccaea016d21";
   sha512.doc = "a5f6aa188e7a0aff29d4e693f0f8e52512838278e12d13c29706c7bd5c1c1c2a8d70beb619195d8572ca5a3920205380d586d02580bc747acb8e3259c79c3fb0";
@@ -13223,6 +14549,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "flippdf" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "8f4de43f2d6310bcf3bfe350a071d43ff4ddf4d21acaebddf59e3fdc62ae562e32006707a6f7f5de1f631f9aeec12edd7cf75332b012e433478d171e149f2c96";
   sha512.doc = "3b40280c0d142add31bf27dd57cf52ab2d5f4f43637cf1a1a20202b5615b58c52567e53ff2f9875d2d1e73116c227319909d77df1609ed5590b30d2c151f2c63";
@@ -13231,6 +14558,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "float" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "4a5270ca2945915464ba25b7996dfbd4771ca5f477e4bf248183bc340b7051c042d9566908acac881782af74a59154f4163bc7879a21e042e1c31d67237fc6a8";
   sha512.doc = "6f713c71361c1536bb086e7638b770ffe58e97aa01bd59bbab779f71cb485b9c06322d7d89e7d87cc8f77a0c7f18f4174fd4ec47b62556faa32d82fead0b7377";
@@ -13239,6 +14567,7 @@ tl: { # no indentation
   version = "1.3d";
 };
 "floatflt" = {
+  revision = 25540;
   stripPrefix = 0;
   sha512.run = "1f7de96ac5e82cc4bbfab3fdb665a18d20413cceea097e1407dee2073109ee1b82d7d3ea82c80630d9aaf445f14a8497aee7e3824458dea8b40b270135052ef5";
   sha512.doc = "7ca1c6ed832bb3d697685cad5575e02b531c0469095468fd40eb3131d89b68dfa0fcb9c882965aa7a9cc9c60292f64bdbf6264d3d990bd697dc27b23a46fae47";
@@ -13247,6 +14576,7 @@ tl: { # no indentation
   version = "1.31";
 };
 "floatrow" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "c650b5c856bd625ad192901f3c056171f790c549748d5de5675f14cedca5cf32931ece537ce2280c0e4895895a8eff0cf140c3408dffc2b081ebc8c62d2ae1e3";
   sha512.doc = "b721ebbf59ca3744f1834c130da1a859cd4a98e9f5f977f5d35eef77b420deee303c109439fa70f89757cb9f57114bc74c5d527cafacc1daf2125b975621b525";
@@ -13255,6 +14585,7 @@ tl: { # no indentation
   version = "0.3b";
 };
 "flowchart" = {
+  revision = 36572;
   stripPrefix = 0;
   sha512.run = "9adc1f823378fcfaed58e99727b68389b97bc489ba38995e5e7451608cb712dd7fe02b2686f692328b73d1bc8011131017b8edcebcda5e886f3bb4a0f6aed65a";
   sha512.doc = "0bbc3f1f56f5adbabca07096804412b33e93669e20af345e57bc9ad42133ab629b9546887599b472dacc8ee43b9c395f8c2e58a288c487e78920be1db5a110aa";
@@ -13263,6 +14594,7 @@ tl: { # no indentation
   version = "3.3";
 };
 "flowfram" = {
+  revision = 35291;
   stripPrefix = 0;
   sha512.run = "880869c22914392c4ade9dddeaffb20d6c6edb6da78d30705d9f6aa1b1352ba2734565fa8c2a6851e81f1107573753748d3f4d208bbbc4c0dc443c066e912719";
   sha512.doc = "25924c121d2feedc7d815e4510b89f05000eef87efae8039c6566136b7fa92d6d4d9f25f2938363dcce8222d5c824d42894e4863b95e422b7949207a1e1daccf";
@@ -13271,6 +14603,7 @@ tl: { # no indentation
   version = "1.17";
 };
 "fltpoint" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "8991df799bab2ef9e9e7787123a61752260122ebda5491a22d8bd0aad88810bce93fd78e1fd6f79e58bd274684c2495225513d0f69591cc3e92a052ba51baa67";
   sha512.doc = "3b175372a197bdb243776d068e797e8f318200e6fb9cffd1ff612cd771a4c53e9e26b36079c2b392caa77b1ab430bf3ad7a6dc235a91f25662904ee702a84508";
@@ -13279,6 +14612,7 @@ tl: { # no indentation
   version = "1.1b";
 };
 "fmp" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b87a361454199c16e1fbf97bd2b82f8b5569bbd71b7beaa780a6d88357e9262f77c9c3ce17d2ab0ad9b043ed7a1dd721e533c516e1b927f0439e13ced6598a30";
   sha512.doc = "461ee793dc8156b0ecd6931b9d4c56f368ce4938838b042abae5d6475ca3739c4fe47517168dba742f03c98229376f59f8654a89f1d65ab394c0dd907ac48ba1";
@@ -13286,6 +14620,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "fmtcount" = {
+  revision = 53912;
   stripPrefix = 0;
   sha512.run = "ec5e10be2b93adbfa0e1ac710c7df37457e8d14dc5c7fe1cd13e062f136c63bd20a3e42d57c237fb4ae5c1be936e1d821d0a6568ca0c22b41948660f0848da43";
   sha512.doc = "fa0955c7d08dca99d3323b9cf364edd8b4b305723a3fd3ae38687c6473ea2af3593c47384a61feff0071199b909e1424d422eed3864866b28c7d27b1f42c3994";
@@ -13294,6 +14629,7 @@ tl: { # no indentation
   version = "3.07";
 };
 "fn2end" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "6be5c07123cf2470ca88b7c28c068c6dd308824138fd2f645a1a7c04c69fe84953468733ca2994faa42389b5889990941c8e09dc543b66a1589f3cf22df1e017";
   sha512.doc = "17f0a1d12afd607a26687b675ccc65a150e4ae67785389fe9582a3b05ee383f078bde35f296941ea069323757e1fccd1ae0e76e5e24f3446b4154738c1a45385";
@@ -13301,6 +14637,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "fnbreak" = {
+  revision = 25003;
   stripPrefix = 0;
   sha512.run = "794e427d66efeb15920062e86b4a405e36604703f350c4e20f2c237b358eaf08aa22cc923c7995a7db22c117b48555fb92b136edbc94100af8e2046d49eb1fc4";
   sha512.doc = "0e8778265258304ec1cae1f2d21902ffd6f99af18527b86af064209da7f4c84e8ca6bdcb359000e3f0e9aa75819db1b375f8ae9f0a825291ee03398b6bf345bb";
@@ -13309,6 +14646,7 @@ tl: { # no indentation
   version = "1.30";
 };
 "fncychap" = {
+  revision = 20710;
   stripPrefix = 0;
   sha512.run = "83d74f4bcd8fa90cdf5d0b6e03e9e8e36ab09884998f9955647928ed0a33924735d236a82cc730412edbf54485ec8c357ba3954a264965f67752e397908ba295";
   sha512.doc = "6a8c6910f0790457c71cd55c8d30d07df81c97f80a8b6b7930c067966c76c47848142cdcb7454c4b63a154c5c653933bf71acbd792c06eafdc496c92e4bc5806";
@@ -13316,6 +14654,7 @@ tl: { # no indentation
   version = "1.34";
 };
 "fncylab" = {
+  revision = 52090;
   stripPrefix = 0;
   sha512.run = "47aafab923d6455da7e63eb24e0fefa8b869efa5a04bb301000cb2eb658893927dd9f9aeb8e6919ea29e0caeca235b1883106228f6acddc667117a3ba1136974";
   sha512.doc = "a987a6efd0964bd5ab5328658e011b5c8da56b404d233c55d96541ec2f37cc72faacd934908c7346041ec8bab3866dd1f171e1c5de5eb528b0f0e80969c0bba6";
@@ -13323,12 +14662,14 @@ tl: { # no indentation
   version = "1.1";
 };
 "fnpara" = {
+  revision = 25607;
   stripPrefix = 0;
   sha512.run = "620aafcef4ec7fdaf5cd732551fddbfce53222cb7540dd370f2cda425e1782c907e59868953f50acfff993a8fd8a84d108da7992f1c1565cbfa889a5ca0ef5d0";
   sha512.doc = "798c7fb03a8fb20695ed63ba1333686d21832a936a74a93ca77c7614346316234b2255b8e0340dd87fd57bc1480f23df24381107fc81c68cd4c0cd594ddf5329";
   hasRunfiles = true;
 };
 "fnpct" = {
+  revision = 52294;
   stripPrefix = 0;
   sha512.run = "ab53cf7a616b6de5c5914efce55698dc02687892ae7065cf480eb2be1320592236f4150d520d606cac815b7a9c25c025d47bb981e28ff82ee0b16e7e39daac36";
   sha512.doc = "ef357a4e65cc4e5ebc1a73a744e3eaf054d9d940573f456171209d5d333a7ae63f572e37cc4e78dbd3a5c0495d450802e8d9e18b6dabd7e973595ff7fbfe726f";
@@ -13336,6 +14677,7 @@ tl: { # no indentation
   version = "0.5";
 };
 "fnspe" = {
+  revision = 45360;
   stripPrefix = 0;
   sha512.run = "5e9af6b3b3136f49e49524c7fc85074fd75fff30826fcbb8dad358102e3eee6fa44037b7dde99b6556a063dbe4e819b27ef5a522999eb304f70c2785642478b3";
   sha512.doc = "733a099cac2d96ddf6593b9e0195b85c8d5e86f6a1b283f011a55acc4a1bb7391bfd4356c6aaa40d9b2c70a7c180886d64162eaa396a5a457fbea491af1b47c1";
@@ -13343,12 +14685,14 @@ tl: { # no indentation
   version = "1.2a";
 };
 "fntproof" = {
+  revision = 20638;
   stripPrefix = 0;
   sha512.run = "c1cdc018808a2b9fb5b91c54b55eddf3d517b8dc6062db1ffda3db154efe6f3abb91e61ce90a68743ce411ec614785974b4362f20f03ae398488ac1f816b3ba6";
   sha512.doc = "cf9e8909ed030b27a57573cc257682da84b7f14c3c3775e17fdc8a2203fe99dda8797ae7b2599dc92e9684140102f6d1ca2147bbb437edcf8eb41ffd28b9a576";
   hasRunfiles = true;
 };
 "fnumprint" = {
+  revision = 29173;
   stripPrefix = 0;
   sha512.run = "7f43363ff861fd4f887df68dd6daae6c97940d4cdd60b19563a966dc7c08cb88356a150eab0cb5b91bd4c3d5d47e324dbbfd43cf45872a5738c5f9b70766e047";
   sha512.doc = "44d6fdf74bf6c231a57b3fad63efa7eb1bdf5b4342cdb38e0d504c4c09190130d37534769e17c3f60bbad668d50aab064bc5c0a1ad99808a6d084dd1921769a9";
@@ -13357,12 +14701,14 @@ tl: { # no indentation
   version = "1.1a";
 };
 "foekfont" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "45342633aec41f2a5fe7213dc418960d76ff196a08b906965e3b68f2c5ed264b3192ea45756133f12662e451fcad11d08232995c0de2493495c40b9b59cef7ea";
   sha512.doc = "7e1aa7a240d825c014be6af7be5cd7c1bbcbc6e52bd55be36f987b4a25223179bcc4c4d342906c10f9df624536252fe4dc5a45cd3b5ddb63f91e9f4c7401a239";
   hasRunfiles = true;
 };
 "foilhtml" = {
+  revision = 21855;
   stripPrefix = 0;
   sha512.run = "80b177c1eb224dbbd086d3b8a0b10b3f0b3434e977c8d71b34a58f76a5a73757148b4e7438a275f1be186df51e36342de132940ebdde9608e7c741664ea200d7";
   sha512.doc = "a24c9f048f7e1cf187d40f6eb3370cf68f6de80e24f2f72b077d782be5dcd369cf3a7ce9bc7d0a269c285d04cbb543481cf439710037a26a7597164492b277fb";
@@ -13371,12 +14717,14 @@ tl: { # no indentation
   version = "1.2";
 };
 "fonetika" = {
+  revision = 21326;
   stripPrefix = 0;
   sha512.run = "4db9e50fde60ac69373f5abd151f3e17275f5c492b6855a7f5dd8895650a79cda1feda43398fffebbecdd6f7e032f8935972ef573f79ae1cccc5844dc148352b";
   sha512.doc = "ac3f0de2a9a5b5052d4ae626b4368f8b1fef419503cab9a88d4bf89db348c1a756555a6cef7aa70bcf733fa032840fe9ae7cfe347fb40bae32b54506e60ccf37";
   hasRunfiles = true;
 };
 "font-change" = {
+  revision = 40403;
   stripPrefix = 0;
   sha512.run = "8ec91864d719d20ff66195ec1bab456d772417ff2d4d9ae75ecccafe0da616d1dfdf5b965be489a65eb28130b3672a5b55c33f3254f59c00cf204dcae6fd4eb7";
   sha512.doc = "75f7e45fb5313d0bc1c333253aba2bcd1d650fb6c0baffce6e5c558b0e7aeaf2e697ea9412860b4049d2685cdee26d19f12d9a28184084ab9df66101b78b0361";
@@ -13384,6 +14732,7 @@ tl: { # no indentation
   version = "2015.2";
 };
 "font-change-xetex" = {
+  revision = 40404;
   stripPrefix = 0;
   sha512.run = "17de7c596a774c5c2e115704c2c57385f3fa90bf2dd49362547873453c27700537ab7f1e8a143c2ed49c90efe6aec234d3cf61643228bcba5b51c5ddcbb8bba9";
   sha512.doc = "138375750a4d493774cbd558c6aa910d04bf3f32337f773438d6bb31e16df3d96af3a6ea12d4940c785c04f98130977750058f7c0ef2425e0d8147b4ab882a64";
@@ -13391,6 +14740,7 @@ tl: { # no indentation
   version = "2016.1";
 };
 "fontawesome" = {
+  revision = 48145;
   stripPrefix = 0;
   sha512.run = "e08643104006c9e14c40bb965b4401a8fe296f43e5f39b285cd19d5aa0ed33602cc0eb6ffcc996e1d6e5aaa57dd906903324626ee40facdcb3cedc5216a3deb6";
   sha512.doc = "bbd18a60db734922ea006ebd00b0c9f90c34907a7b519a08bf007daf01cceaaf6db3b31c3dd8c76e1dac199d4f7c312116f6935b764afb62248b7dcfd92ac78c";
@@ -13398,6 +14748,7 @@ tl: { # no indentation
   version = "4.6.3.2";
 };
 "fontawesome5" = {
+  revision = 53434;
   stripPrefix = 0;
   sha512.run = "766985dd08abe4df21c4246bc387ad55075921377ce0f53fee67995a04bd6e85ca20c1135da6e906ef92ca63db89bd56ae82de7607ee955bdb272532f360b594";
   sha512.doc = "1e627742b48a0c3eabf18402592fbdf265b35cb884e9863d00d456fc3b0f1301c67ee8d249ed7299f6a7f11768db9d97b940d1d8238a7b43881710b59ff08b44";
@@ -13405,6 +14756,7 @@ tl: { # no indentation
   version = "5.12.0.1";
 };
 "fontaxes" = {
+  revision = 33276;
   stripPrefix = 0;
   sha512.run = "69aba944977a676c557d2015aac1058091b96b52a50da52cc733187b96ca02b7a8dedcbfc848198442a5f62c824ee9e977696677f9aae267579f09d2e1637f73";
   sha512.doc = "f7e0986d9f811b6436ecfc42c943bc2b21b83cb94d8bdbd5daea3ab66fec5bff2033f56ad9509e9e9591b78e68dae1ea76e810bff51469583aba9c8b691898e0";
@@ -13413,6 +14765,7 @@ tl: { # no indentation
   version = "1.0d";
 };
 "fontbook" = {
+  revision = 23608;
   stripPrefix = 0;
   sha512.run = "55ee9dc22aefcf91c7fe30f516bfbaea5d0b8c5423cec204bfb208ebfb4b2331ebdd65032eb6f2a9f8958f15fd47433a9c7884f49ff1f3900f1538f9f25d4fe4";
   sha512.doc = "65eb7d3f6426d3dcb13ac9a0d5b396eb4c03586d9d2b3d842af9ae4ad98119e8721034de499eae485c5803873946f04af992ddd860d09a7131021027c14b5d4b";
@@ -13421,6 +14774,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "fontch" = {
+  revision = 17859;
   stripPrefix = 0;
   sha512.run = "c8354fbcb6a13f2f874dd3df71f23ee1fcefdaaa1eab5166f35001811b9788ea2b53e5d5653437071d02978dc94b0a658bca5e2cfe825a0315d3389446b6c138";
   sha512.doc = "a7c5f6622414d943a20745f7b02c3859d43d4f4ec0f9ffd3b2baec34e142c01474d8827c7b0fe5d1bebfa25d33224b26cd876e3457b7179097fd9539cb9d9444";
@@ -13428,6 +14782,7 @@ tl: { # no indentation
   version = "2.2";
 };
 "fontinst" = {
+  revision = 53562;
   sha512.run = "1703570199fbc41d589817f83b5782bef5552030ab54646d464423f0788b1f2f3a5017a92846de55ee696b4ccbe1d46b2220382f7446ac7cafc9970c58d1b5ba";
   sha512.doc = "dc7aca7d63e13fb908df02363542abebb1760b66669bf360c2ab33e790ae6d3ac0ac1808849efab2784c39499ee1eb5e2fe43091d41b0270a4c402c2394f6fec";
   sha512.source = "f0e4fd7818432ccf95a91f6e5d307aefe8d6d0bc3bcef464fa5b94cde24304c693466695e3a57fcc7d3bd388fc16a2ebb23fb80ecd3e5887ce845151983ed493";
@@ -13435,23 +14790,27 @@ tl: { # no indentation
   version = "1.933";
 };
 "fontmfizz" = {
+  revision = 43546;
   stripPrefix = 0;
   sha512.run = "43febb41a8bd7b0a89a2b60b52f9b83e0d0fa8303c0a7986658a95c93307ba6642fe07f8ac935ccb50b3047bc74100cc7268fde438d3ff80c944ac59afa6e3df";
   sha512.doc = "6dc0f6c10d44a17d42d8ed4148f39bf89c84dd5a3a672755340456b0ab983b1b52cbd3bb62cd6f5ef4c3f6dfed8a39568d5ca35598c4b016483fcf7d3cdeb360";
   hasRunfiles = true;
 };
 "fontname" = {
+  revision = 53228;
   stripPrefix = 0;
   sha512.run = "97b85e6a11136049f54f611e8b4eda75fe097addb2b70edff263e5e4c124e0e05976407572468b7590a3c7fb41e53c0c5fe495ab922a3553c0c6d3fd5067ffdf";
   sha512.doc = "4c981cbaff6dd6a700b5b4c323396676539aab8bacf44781de560ef226557182f3be5e573a7a2be98a1ccd7ca4f47fb7ad4b847184b8a18e3aeeca62077223f1";
   hasRunfiles = true;
 };
 "fontools" = {
+  revision = 53593;
   sha512.run = "925615ad004844670af5fb6fa3e456dcf2e130b1e10cb64eb40967dc5d1af300f401c87e4f2bc44dc39af0fea0498fd6a6445181e7e21a63a007cf7d0a54e388";
   sha512.doc = "a31f98f3791b464c1165f852000ee7408ca49e9a12efdf45c64d38b170e352508e0e5e4b3c9cc264799f184024e780fd968161bb03c520f39dd178256bb300f7";
   hasRunfiles = true;
 };
 "fonts-churchslavonic" = {
+  revision = 43121;
   stripPrefix = 0;
   sha512.run = "ab57be2bda808cce456fe2fe75d0c9f7560d1ed376631c907723d156360f8f20f734d4a2379273c8b8378a6cc124376574c162e3f95c4588c688dce34fb49029";
   sha512.doc = "596ae1cb37b35ab59bc712653ec873250cded1968b3e4874295692812ad4001c6f352c396ef6d224571da630d730cbe41f98bc5a3a5374a2f9532f9424f7a0b9";
@@ -13459,6 +14818,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "fonts-tlwg" = {
+  revision = 49085;
   stripPrefix = 0;
   sha512.run = "4d614651cab9a02809065b169f56685a7643a28d616f7b221dd6750c19bee5b4357ea003e4a0956fda585d73054288a2c7f60a8f1fa86650e2f175b08eaca35d";
   sha512.doc = "a0245c7b68836a8c80830fae693016fafd3b218340bcdcf2926ba88dc845759ddd7d02c7b50b025b6411667ce35f562ee6dd7cd9f2d7e8e7f0d6570184242987";
@@ -13467,6 +14827,7 @@ tl: { # no indentation
   version = "0.7.1";
 };
 "fontsetup" = {
+  revision = 53195;
   stripPrefix = 0;
   sha512.run = "3affc864780a057995aaf3f2b4512a3577708433f92597f1c43f01761d65579f71559d39a14b29f12860c86cfeffa3aabb243f701d04a7d1b8901b72f409ecab";
   sha512.doc = "7ef9b087ea0ff5bf62a553841c4e7ab976e08a0bf1b6d1b325c25e69d8ba0137d751d3f238e3b175060fd01f53b95b9bd775166a014567020ef63cc7c55101d8";
@@ -13474,6 +14835,7 @@ tl: { # no indentation
   version = "1.002";
 };
 "fontsize" = {
+  revision = 53874;
   stripPrefix = 0;
   sha512.run = "e174166999dac65cdf95a0d1bb79c88858ad448608bdc1ccc3390f04d4b5e02a4e219539092aaeb4217a44a1d230d977a482b4b63c67e0c7582d75ac2c85e98c";
   sha512.doc = "049f38a64e19dd9eaae0f2a26d7c6ce2fea6e7e7078ca63818beedd830c4f3e2e52e0ab4da1865e58752c73910c62da47c456345f7452d902eb2e9b778cc7086";
@@ -13482,6 +14844,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "fontspec" = {
+  revision = 53860;
   stripPrefix = 0;
   deps."iftex" = tl."iftex";
   deps."l3kernel" = tl."l3kernel";
@@ -13496,6 +14859,7 @@ tl: { # no indentation
   version = "2.7i";
 };
 "fonttable" = {
+  revision = 44799;
   stripPrefix = 0;
   sha512.run = "f8db43eedd7f9e43b0cfb8c37e2687321fe236daa4bee898141c305dd2e59fb40bf3e8b3cabde561c75fb65dd053de33e45b90a8ab9518b0b30aedf35f6af1f2";
   sha512.doc = "1d2b27ac253df62568087abb8f9e0f0054e3bb98cb62e65784192b281722e69e8565fa569eef4d061684e8965e0b05a0cd6dcbf7e632af7f68f97e8d4747426e";
@@ -13504,16 +14868,19 @@ tl: { # no indentation
   version = "1.6c";
 };
 "fontware" = {
+  revision = 50602;
   sha512.run = "6f6a58e0c804ff0aac48be7646bf1ef9eb13028e6b2d25d69b4764280d71ba57e5e48eded61b4855794efddcc7f1520b24a52f09ed541a975c205b11b23abc49";
   sha512.doc = "9ab42743fef5a65eaaa0ab186bdef895f8e7e3d95688fecdac8f7b59e064fc20f2b31bf5ef1b9b6676f3bf901867b06c25792ad07b2a13192e7290b5fbef33dd";
 };
 "fontwrap" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "5bad0487f5cfa4119d7baafccc6178925baea12f1cbed5912211c52f2c4ea01eb00f9dacd300c24b93f48e5f13197a86ba1e37c35ed69fb1031281fdeb08edf2";
   sha512.doc = "857be54c81d9bfb14277c17638ec24c643c278d660b56e18a4701aea0ad28e496df0aec191b12d93bb29b7ab326b39ad9cc7ddc3615871d1b70fdf6e44ccdc6e";
   hasRunfiles = true;
 };
 "footbib" = {
+  revision = 17115;
   stripPrefix = 0;
   sha512.run = "0cadef58331d5d51aeba1f69d0c9ceae99104f7c31ea79e0f5dee33c8612bc52cd0c8551abc6da1799705c879cc88535b46e4ef15232d3c4a0f7136e0fe46e05";
   sha512.doc = "27d1f0e6bf0ef526f2b3c4852c53b78fc60fc10ec526796447940565ad75fab023406bd28548170f7382e822c3b0f43d96181233bc772ea58f8ac195f71cf495";
@@ -13522,6 +14889,7 @@ tl: { # no indentation
   version = "2.0.7";
 };
 "footmisc" = {
+  revision = 23330;
   stripPrefix = 0;
   sha512.run = "50d0d02b243936d2455ad2353c0da1b77aab9f8f822033a98062d979b686163b94798784dc6b8496dda3ef38eadbd04a21e153f0fa9a76b499c50159c169fb85";
   sha512.doc = "3a732fe8a1ca364275a7b0849be097e307ba322ff611a650a4625cc47792410b974055c75165b62ec8d5d2a128b0d6a194d798248bcd6bae266c7638ffe67e01";
@@ -13530,6 +14898,7 @@ tl: { # no indentation
   version = "5.5b";
 };
 "footmisx" = {
+  revision = 42621;
   stripPrefix = 0;
   sha512.run = "591f181c8103ebd7a86440b27992df9eaea91d5998caa0f52dbfa48b7afc4791ef8c1f5a95d85b7cafd56113726beb74268b7498ec489d7b3142dcdf7f07adba";
   sha512.doc = "8c36c6eb169a804769ece280c2210949db96bbe57d6dacc1a0952fc1338d619334d3d8b46cbaa3dcac09e05a0c015f37146d8bed315238b5e918c373b2b42155";
@@ -13538,6 +14907,7 @@ tl: { # no indentation
   version = "20161201";
 };
 "footnotebackref" = {
+  revision = 27034;
   stripPrefix = 0;
   sha512.run = "8c18d95a4c74a7fe2ea4cc98df6bdb6813d9cf8323e44474330f03694758ee53da46d0d691164f6d90b2148a7cf9dc253dbc93548a3b33df3b0344096e4a90c9";
   sha512.doc = "685484323b721c5277aeaa041b1d40b0d4675bc901a371f36dbff6246063252bca69261748a096919c7345a4a6e6284a6093068555bb43eb92fbf7cfea41facc";
@@ -13545,6 +14915,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "footnotehyper" = {
+  revision = 52676;
   stripPrefix = 0;
   sha512.run = "593e4563dd9b2c209088f46e8f33f283d17d493e9aaca5ed1bd1cf0738b5761417e7edc4936b16401bb48a6f17468872139ce3010185646060f83ec35fcd1cc0";
   sha512.doc = "12adb12da81ff88cb6b25d98ef871eabfcd01e38fc0adc91c122168a99c5e3e42ce6932715eb976b685853d559e4099725f543e1b04e8928b98526b5c684f588";
@@ -13553,6 +14924,7 @@ tl: { # no indentation
   version = "1.1a";
 };
 "footnoterange" = {
+  revision = 52910;
   stripPrefix = 0;
   sha512.run = "6d1a5ae7982aa9f928d09dbe0dc8cb3fcae5894bd8d0eace4590a7627d476dd32c9c91dd2d68aa9a9428b7258b305b13911421f0834b694fe828654aafcc4eb7";
   sha512.doc = "eb31ded0bf2112afd6c278456701690a0a7d846af6bd1f28721bb6db4e67b8a83e2ec67b6876fb05315430d9d1d400ae4b5dd7e04f5bfeecde322ec6aa84e30d";
@@ -13561,6 +14933,7 @@ tl: { # no indentation
   version = "1.0c";
 };
 "footnpag" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "a1ce9661f0f6a69d1709ea053fd548aed428a9cc8ef0445b9c4b897eeef349bb9767c219f5d860ab4d7d264982c1f4404d33619c80dec8411350bb965b19d709";
   sha512.doc = "f83c9cc0701c63dbd5d3b7dd6038e1bb2c427e6edaca05b814778592587b066af3c4f7f12646f7b2ff7cc1c2ab8d2ffd99480dbfe72e50c9bce907e8e2d4c509";
@@ -13568,6 +14941,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "forarray" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "f818d0899fcba2d61ad119698d3633a28d5300098a4bd56a82b7b1c9cfc12c47a9457efed7cbdf8aee3ba9ba4143eefbdd54bc995c84c9bbe99dd5717030bef5";
   sha512.doc = "e292418f60b290bf0567ea70169d66557a8408b2933221e0658d6d8e807b6495258a6ea33d65d14e13129ff8e58dc9cb50115459b014ec00e0b084f3d3fd55fd";
@@ -13576,6 +14950,7 @@ tl: { # no indentation
   version = "1.01";
 };
 "foreign" = {
+  revision = 27819;
   stripPrefix = 0;
   sha512.run = "e886be0cbbb64b11b6c54d6b62d6b38db1bb7e65b7a3a9cc951ad71d4cc1a93c323d8a1e17ba863daa6535c747c9801b06bc4d3c664bfb8da38518a9c93d45b0";
   sha512.doc = "d3804dd1b83ba173e4098696656c814629ff099699f332c3b81136c4519bd577aaabd4d2601893f88a58009f00e8c8ba44fcf2c4a3b72ce90af4d4febb510ec6";
@@ -13584,6 +14959,7 @@ tl: { # no indentation
   version = "2.7";
 };
 "forest" = {
+  revision = 44797;
   stripPrefix = 0;
   deps."elocalloc" = tl."elocalloc";
   sha512.run = "84edfdecfe017508c496ead33102977f2548b1e664ed6fa5108ea54d738e5bd201716fc2185d917fa5ef43b727130ca46061228cb510f5f8f19d25d677dd689f";
@@ -13593,11 +14969,13 @@ tl: { # no indentation
   version = "2.1.5";
 };
 "forest-quickstart" = {
+  revision = 42503;
   stripPrefix = 0;
   sha512.run = "14c3512b55e7653d26571a73216cd1eb5bc4d7ec8b74ae71475c37372552fb309c148e91d4e973bd60710f2a43af9a8ddb6ad99087fd2a9b76da896e521eadbe";
   sha512.doc = "c53a365ccb1a4059c9440b8f23b3ec0bbafcbed14f871c92b99abaf91adc4bb42ac1d3b784cf545a6352298bded8b4cc7f6b2e114625335af5d9d003fcf922ba";
 };
 "forloop" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "a9cfda31fc63d24737a5b422e9fc7072bd1f75c0926cb45d26ea3cdb7cfb50b3f74d7602964a08f13d216f3fb3798acd21f04bdcfe85a3e3652052b9f2cbc9cb";
   sha512.doc = "49bb7031207902366fbd0924a025c692ba015af134ca38c90c43e8efe7a9522ee4db4cb9b071dd00681251ad07b4587cd49eb9e09bc77f1ad5632838fac686d6";
@@ -13606,6 +14984,7 @@ tl: { # no indentation
   version = "3.0";
 };
 "formation-latex-ul" = {
+  revision = 50205;
   stripPrefix = 0;
   sha512.run = "d705a402a4ba61f232e559e6a610646180f22f47df251d2731cf8f62a9edd26d60be53ad969ae0bb8d02a767b302df18b88c048ed1536b3677b7199d347e35d8";
   sha512.doc = "5bf8c412d061a5ce30ea3af713af400eded6a0f75ee019fc9f6e40623c3203839f718eb4b630282ec700871cf4b0cfe68ff38d43cb50f53560184d7d44d528e2";
@@ -13613,6 +14992,7 @@ tl: { # no indentation
   version = "2019.03";
 };
 "formlett" = {
+  revision = 21480;
   stripPrefix = 0;
   sha512.run = "9d984435565a9354d03f7ef1307d543e3a0bd3a8d398f6dec426f7ae16fe3c6b20e60cfb5daeca7be092427606b5a5886a31dc05d023d0f26d61aa1c07be4b8a";
   sha512.doc = "8eee17c77620f48319e862f2e7d8ae4b979c84250dd17f33cae9db52b1f219f2f86c690969a783648ee3979f24ef58e410cee47afcb12bcd26e4278af4625c6c";
@@ -13620,6 +15000,7 @@ tl: { # no indentation
   version = "2.3";
 };
 "forms16be" = {
+  revision = 51305;
   stripPrefix = 0;
   sha512.run = "9d8b0c7aa2314c81afe09cdd9ba3455e3ff7e3000fa9de0e99da935b282c3d32bc60aa7f97a27450ce999ff101b606fadae3dbb4965cbfc1d4a8ca5c29eb719e";
   sha512.doc = "52bedc12e5ad33ac78c906f9d60284ed079b0f6d66e578f826c946c28de3996c70da0b11284e774ad56196875b3bd166962eeead9282f3d71f6c6a0d4a8cba68";
@@ -13628,6 +15009,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "formular" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "0be09e33fc3cf97552dc9e960979447de61c53bea46205a52b37094f7ce39f10309f559dc99c0037392d4924bb688e27bc8d26e5f6fc69dfbc3d3c41736223ab";
   sha512.doc = "09550cdf735f340a13c9104b86b37dfca67e39c277ec9f98bab08754f393368bea8379019c402662b7e7df351636e44814bb45c0970cb24db10bf3efdd9dd7c7";
@@ -13636,12 +15018,14 @@ tl: { # no indentation
   version = "1.0a";
 };
 "forum" = {
+  revision = 53179;
   stripPrefix = 0;
   sha512.run = "05fa8a77cc9bc2ea5ca7dd5962d56a4885ccc3d86f5d1af44d80231a7a803bb7818b4fa1ef1159ac56a22ced86fbbf6b02f4b20acafca4c1f7af36f7868ce8a9";
   sha512.doc = "0bb1d74e658088d53f8adc83c4e8efa37469671860993512996631b18a99188f671a28bb4cd6ecfdc37b6e4e7f09118289f2ef83bdbcb726cf8a6055f3386496";
   hasRunfiles = true;
 };
 "fouridx" = {
+  revision = 32214;
   stripPrefix = 0;
   sha512.run = "01a2cc941482972cb8ca3f5402bef75f53d5e7db2b42f8bdf614c34faab3805c3548d3786c3e7cd9d8d8f7691cd5e8e71e056ad8afc24d52444c6969c11eaa14";
   sha512.doc = "8bc55b8e191b83ea42e228b47621780f4aaeec65248f5b3e9aad94443eeba08b1bf1bf44b7cf252f66466e5b0170260ad202c13abf2d76d4576833224212ae44";
@@ -13650,6 +15034,7 @@ tl: { # no indentation
   version = "2.00";
 };
 "fourier" = {
+  revision = 53401;
   stripPrefix = 0;
   sha512.run = "25578e0293ca10081e8266a4984280c8af9a33ada6102e8a5369e1207cb213e132be5b93ddfbc19c0e8f2d1117eb84311521dfc65e99a86137e0e545d773d782";
   sha512.doc = "c5b0ee9b007607345c8b6d50087fa0ffca8ca5d472c4ee513ea6219e53312305cf8770079facc38adf628b9f344a1a23eb041cf437b1478324bf42102fd9b78c";
@@ -13657,12 +15042,14 @@ tl: { # no indentation
   version = "2.1";
 };
 "fouriernc" = {
+  revision = 29646;
   stripPrefix = 0;
   sha512.run = "904b464fb9066100512cfd8a8998bb089113b443e2df1fb77100f9b5a26d48a5b3512931c00292d19764eb4f068f207eb38dab78798f217f2533a65229411df9";
   sha512.doc = "039ce79d06bd1fb55b257f1c65c53412b15c26d4eafb9d3abe9bb7a7fa836c8b545718f70d935f1449fa235f33d07c81ad8f228608de20ffdfa99b9f532e059d";
   hasRunfiles = true;
 };
 "fp" = {
+  revision = 49719;
   stripPrefix = 0;
   sha512.run = "27e60a78da80caf0e50d1fc83d227d19982e30950650845df710949f4d88db67dad96212331182561c43d37cdeabd3b68f9af55763f30175ab27a6b5f089870e";
   sha512.doc = "79b62424943f725ffc6c1698cadb9ba2fa6d9f0694741a951bbed23c43f870b930d966f110bbe722c17249c7211f08a3a95a5ce7e9da69b7487aec37e99e5152";
@@ -13670,6 +15057,7 @@ tl: { # no indentation
   version = "2.1d";
 };
 "fpl" = {
+  revision = 49603;
   stripPrefix = 0;
   sha512.run = "5bd87e686f418d0ef76ca1868b5034ebf5239665dfa52eff5d9e559a733420891ec2f17d7e08b527a422b8c4cf6ebaaa80753abace423759fa06beecef31228e";
   sha512.doc = "b101782fdbe6896cc49fd81b6ec213d5b9951d3e80de22d7797bbb34ee4ae18d3ad6650fb05e57983cd665d09d23f3d7efeb4dd1b14c294373f9d0df95e66162";
@@ -13678,18 +15066,21 @@ tl: { # no indentation
   version = "1.003";
 };
 "fragmaster" = {
+  revision = 26313;
   sha512.run = "dc5d80aa4bab7a0a66258face6cf8222d03b12ea492f7cf568ef815a6d5950a8a2b36c7403ab466141f49cb8faedfbb33146820b88da17d8b8fa18a2b16235e4";
   sha512.doc = "61f0bd7dab46bfb91b634006217f01648007cbce3c9187b0811a5cc1755ec19654da94b47866ad9873fd57629f1561d1cc46bf3a4d62db618502aa0e67500637";
   hasRunfiles = true;
   version = "1.6";
 };
 "fragments" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "adab94e7cc71c6ed2d881d13254793df16eaa08d1e37e4d3f0344e7a56cf08a4ffdca784871e8939f5db8e868b7166846843492ced0071c9dfbf56e39d20ec0e";
   sha512.doc = "dcf795392d989fdea695512c8f7011f783ea9091bfcc238ad296b0cdf1775bcf631c3097ede09a138117e39c7fa71da7eb355878c8389bdab2deb76a319102e1";
   hasRunfiles = true;
 };
 "frame" = {
+  revision = 18312;
   stripPrefix = 0;
   sha512.run = "b66df0a91a8605aaeef2452236b5169cd363689a40f4a35ab9006ac18c21d4ae2a070407f84beff7de0be246f2f1e55c8b06f234921c4d7153fea9a7f2df1679";
   sha512.doc = "b61a3dfbc23031a39bbe01788f0f1d51750a3aa9132671917ed8d14c57453d588c75f8cd54beac9ac120f26b09fead55b871d53e918a735ee172f1603e4cd1ea";
@@ -13697,6 +15088,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "framed" = {
+  revision = 26789;
   stripPrefix = 0;
   sha512.run = "06f0da36c24ba42959b2176066d3e95f23dfed41753f4e4b07c1f92c4789e68d1b246c61cbdeacbb9c00b6eb990ea2b3ec75dff8ac57845102a867dfdf2c72c7";
   sha512.doc = "1f48ac19f74f5003df88700ff85c072c8a655d4623b82bc3b7c6570a548c0a7b7e97fe292f8557a72188c0047fc28e280bc3ab65f58559804fa78e89317fd67e";
@@ -13704,6 +15096,7 @@ tl: { # no indentation
   version = "0.96";
 };
 "francais-bst" = {
+  revision = 38922;
   stripPrefix = 0;
   sha512.run = "b271711badae8883426ffa2783a2f942c9d37303fb4cfa8b4a2ec2f8999dd150060dae6689bef17d2120cc7489896ffa497ccb1f7f693d5db9a8ca5ef6747f21";
   sha512.doc = "b3a53111f7fcfe972c0722e8600b3115b6e1a93631568d9bdb1f824b8185d4c78fbb135c4593856e3766404fc8e4c005daaf017e5c1552dc452c57e943832e14";
@@ -13711,6 +15104,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "frankenstein" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "1d94962185391dc1fa9edcadd67a60d9a4b59592442ffdd45badea6279db8dea101b418ab3e03284e6e88c247fd213887f06e72fb6c4a002a66acaee82d8d4bf";
   sha512.doc = "8d8a404aa0a61fb76104bc57e1c2b837ddf68516c4d4fdc1af0a84425943f4e23a4f660b28b02e088db8849090e3734915ef7e0216f578a5199cf12115c498cd";
@@ -13718,12 +15112,14 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "frcursive" = {
+  revision = 24559;
   stripPrefix = 0;
   sha512.run = "5ac038493648ad14626e2a015c7dbf96a41257ab1d1086f9e79b0128df2c85af1a279e021e52c722636f8647364791bcf7580cccc1d80d60084f5a9a55a23317";
   sha512.doc = "eb0559574af52a711f61ab84cbda996c7cf4b2314b4d5faaa18824ae3396f041b7a5948151b2b5cffae6675bbe09c2e4358b81e9ad7792e5ece8a2912d7ff030";
   hasRunfiles = true;
 };
 "frederika2016" = {
+  revision = 42157;
   stripPrefix = 0;
   sha512.run = "b7b271af72364e0d2d00ac499bc1e419534d479d27fb424b7046373323354c47da29b888f0d765e3ff4725333ab3d407cd21a064bc4d063adf890de75aa49e3a";
   sha512.doc = "e205744d689113870fce9cf791f089ccb59cb6fa326c811f34db7183588df3de9b946cddba2a02128a9b88490e9326bea6563fa0fd9a3cdc76467555b7b8d198";
@@ -13731,6 +15127,7 @@ tl: { # no indentation
   version = "1.000_2016_initial_release";
 };
 "frege" = {
+  revision = 27417;
   stripPrefix = 0;
   sha512.run = "39d359f01256f2399cd9226744aa9735543d5c9eb26104855bb52efaf51b8c720cb85e5be08241d72d3b2e1c2deb9cc7a10dd90ffca789ae91b6ea6b7cffb879";
   sha512.doc = "28c5cb420f25ed57a03f3914ce2286732ab8e06cbb0b8446ab3112ccb79b34814762becb7ac7457593e1b5b1579613a76a8b21fe2c43ac9f08175495ea87bd1c";
@@ -13738,6 +15135,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "frenchmath" = {
+  revision = 51192;
   stripPrefix = 0;
   sha512.run = "1102ab998250a36d6d93aac7c673628eacf8b1abd203d91989922599ec6dae58439ec2700e40eade5b0ee1666a68a30d94f89d3a225082a6273ccd63f61fb586";
   sha512.doc = "622cbf8f1149c53f240036e2cf2d6245d6870ea24f9af6e1883e7fed2f1001f38227176156e8a33c9d9c07414b1accf1a924fbf7248e91903d764fb85d277bdb";
@@ -13746,12 +15144,14 @@ tl: { # no indentation
   version = "1.4";
 };
 "frletter" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "5f6c61585ab0626931cf7f19d18138ec70572f3531f36cf94eecd82d93855a2ec8ed2ed0146971e035f8b5119df7c602c6279a9976e024ac85869953448d51de";
   sha512.doc = "36fbbc422eed8e577e054067e7b442cc84b640fcbd0706e3d8cb503884a5208e0a5bbe0c40b67cb5b495bcdd0ba7a78855338588757e5a9d26dce21f9bedcf3e";
   hasRunfiles = true;
 };
 "frontespizio" = {
+  revision = 24054;
   stripPrefix = 0;
   sha512.run = "6045214cc6a8325d8c828c2591fb43995f098803b031adf50bf8b4dddfa0047ce110dd25e5db71b068376893b7ee83a70806713a83b90a26c4d1c8553e4f00f2";
   sha512.doc = "beb8cec7ff51ff9b85e2a650bd7931070c126ea3b126051eb63194e8a071f6dd92d0014953afd85b0e73095208fdcefbf202d9c0ac22003f71d7f7a72f4a4034";
@@ -13760,6 +15160,7 @@ tl: { # no indentation
   version = "1.4a";
 };
 "ftc-notebook" = {
+  revision = 50043;
   stripPrefix = 0;
   sha512.run = "9dca1b2e09293df3a12df85f843e1701e1ac428f4caccbc196f43cfd02517cbc98908fe95fcd3e26685cd95dc8565aa5e29ad79f7d42ec5cdeca0346db6a759a";
   sha512.doc = "36022ae2df65e45e2fdd2a01e2c95502c3acee0e8fb0b738ef06b313f47cf8798df30a41a6f5e7b4021a556ebdfd17f84b4a79d54d2b6e88c8044f0a67a87f8e";
@@ -13767,6 +15168,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "ftcap" = {
+  revision = 17275;
   stripPrefix = 0;
   sha512.run = "1287e0bd63fc92ef3e3c77ae3a6113cfcca38dd63f4a90948baadd2a365c07b38631d916230baeaf550b1aeff07f9cac3a26a07301838716d8d70fcf0843953e";
   sha512.doc = "afa317f10c600c88bb96fccb0383b291e1fb7c11abba5f6bd1efb05e7d2ce117c4ece7bdf9a9ea16c71c116143aa65ba26cf7c2e1dba68f225b655d122169001";
@@ -13774,6 +15176,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "ftnxtra" = {
+  revision = 29652;
   stripPrefix = 0;
   sha512.run = "df8395b996f96ed72505ef1ef7f0e8e6101d4b26059831b227344023514d377eb189961a240e83ba42ac4ef7e8086b8ffcda347290014fbb1cf1531371c20eff";
   sha512.doc = "fc16ff992e3339480a4154169665be49f51e56f361d0b1f97842c555be59485fd7edf3cf815e32642826224e188c5377fdb2ab36746cdaef7f552399a4b7119c";
@@ -13782,6 +15185,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "fullblck" = {
+  revision = 25434;
   stripPrefix = 0;
   sha512.run = "b298f55ca3afe8819e44704329c06be2867b00c1a2a399b5db8de8477751f9945bce1041450c7e91559eeee65c9bae5e76b57469c956239c9752341b820047c7";
   sha512.doc = "9da7587195a077f8218abc6a7df98bd15369650e00ab3893b6cd70a268bf34431b8c2c49b3415269bf6b8d1ddf51a8e23e76ae87667309f8466ad69da87f05a0";
@@ -13790,6 +15194,7 @@ tl: { # no indentation
   version = "1.03";
 };
 "fullminipage" = {
+  revision = 34545;
   stripPrefix = 0;
   sha512.run = "7ca92205caae688761ddeadfc0a37173b37e285adf3c1f54c4b2994a0c82c90713a255d5068784e3f3866a7f1af603906513a561632b2d09c68477e497330d2e";
   sha512.doc = "111145d2f1c81f74692df8ef397d36c4c0d7b6c89efe0250571c0153b22b9d562df0dcefa90e3be96f8eb518af75ee8a23d42ad898e23668265dcf39d3c678ff";
@@ -13798,6 +15203,7 @@ tl: { # no indentation
   version = "0.1.1";
 };
 "fullwidth" = {
+  revision = 24684;
   stripPrefix = 0;
   sha512.run = "c9b9c37991365346804b51aae7b4645e5b63eb6a3c5c60a953cbe0583de0960e8a9d6cc99dc7526944415764869308d778fb85e7cde821792bec940f6c19072b";
   sha512.doc = "55892645ce01b31dd0285749091b8fbcab0061a7190f7a426379f6d3ea8bece8a5c054cad8b53efe1bb69a68fd3e49c3e8c8afb94954ff4ba8838142ab4576b8";
@@ -13805,6 +15211,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "functan" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "0899d9a3c30e701d5ba6a0275521a40a3cf2df680e9d4a95624730184fb370ae2537bec1becc3b185647a988af5fa8e4bda5198f42cbe68cbc848d8915f1c9da";
   sha512.doc = "c824825fd424316701e25fc573a431aa5967af0d520b631489b20608459dcd0f7abfac277c5b1e7b60e0a2888e0b37d787755acd6f671e48d4911969e3058692";
@@ -13812,6 +15219,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "fundus-calligra" = {
+  revision = 26018;
   stripPrefix = 0;
   sha512.run = "a999f372ef266e66a199935a0783d99293141aa08586a38d65a3748c1a239eca7b0faa74d537085852e79520343ca937943b30ce38820fdc925d75b1a334aabd";
   sha512.doc = "93aa54f12ade2eab798bd84596ec3b366db0a15eb05b5279261af8bc13bc1ce782077de36465e8e29d11ea1b89456ab207c33ab907e5c31af95e63d5d897da88";
@@ -13820,11 +15228,13 @@ tl: { # no indentation
   version = "1.2";
 };
 "fundus-cyr" = {
+  revision = 26019;
   stripPrefix = 0;
   sha512.run = "de84ebbe6e70f61bf9765b9368df95fa5ae607a8d6e1c5535240e8665bb097c6958956d1b19ccf12a2a510672675c7ffa08ab98bd80b6ae2973fbe65d0e8d343";
   hasRunfiles = true;
 };
 "fundus-sueterlin" = {
+  revision = 26030;
   stripPrefix = 0;
   sha512.run = "b15a1fa2ee3272f25a616234a335d0bd5c8ac810724ecf453e172d2b68293b55f01f3e57acf81c17721cd3f489b35cde077d5456b78afacc589853224f1bce94";
   sha512.doc = "7162188682c9129e1788104fe94aae2a70607e276eeec4367ae60ff9e50d26aa88a73998028b99ee42627aa27e8868ed2fe72063db2e033798b09ff0b7a13477";
@@ -13833,6 +15243,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "fvextra" = {
+  revision = 49947;
   stripPrefix = 0;
   sha512.run = "9b5daea58dbbd82c3c2d5e637b3c46531aaac1600b39a945eecefc725591c885b0fd706fd38a11c3149fbee3b6029ed518147617a9f0c95b57fe5d66d19541f7";
   sha512.doc = "8e21f94366f7642cf92b8874050c961386fa019450a5e1ae9f6221ab3bf473b41e768bcb2fd1063a4421e721daef6ada5b964a1b6b9fc0054a1b9d7c4040b54c";
@@ -13841,12 +15252,14 @@ tl: { # no indentation
   version = "1.4";
 };
 "fwlw" = {
+  revision = 29803;
   stripPrefix = 0;
   sha512.run = "ac2c981bcc4da92a7f91c3ac17d66c4e0e7c94ff1bdb3bf3c7f6a4eef19fad1ecbbc6048a5c74627126c7e1190ee18c2c9373e80d52130a2d272c58ef70de6fc";
   sha512.doc = "bb55ca044aafb5b11b89b3c817066c4fb20facba8812667398ecf945bd8ed4b11bec2dfd21455db9cfa5e81e5f865655a3e6f4d3724bf40e47ad1db708896902";
   hasRunfiles = true;
 };
 "g-brief" = {
+  revision = 50415;
   stripPrefix = 0;
   sha512.run = "6c0a8e653cab5f67a85d25e18b98371323b3dd09365f6a3d1b47eee409b233db4290f6e6de70128f5b45facfc7771475671990bb2c79a1718c74972bfba78070";
   sha512.doc = "147d30be05a9224e141d9dc23a81750d0c43bf590d6e1dcb3e92fda6c668031522ef410904e5c7621c9b98879d6809fe604cf47de7f24891bc7e15c7be5ad05c";
@@ -13855,6 +15268,7 @@ tl: { # no indentation
   version = "4.0.3";
 };
 "gaceta" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "54c42cde3613f1fc28ba0a675281e64d2596e8f3c7831e1b1611c34fed1a82c01da2d6eb98058d5776ffc625d04e62359f63819307d04c6296705de74bfcef66";
   sha512.doc = "594fb3b44492018c6777e014ccc4784813784d3e282cffec0f6b6410a59f088ee30c8113a714fa41369eb795b35a1c615f3069a43697d0bed887123a44c02bf7";
@@ -13862,6 +15276,7 @@ tl: { # no indentation
   version = "1.06";
 };
 "galois" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "0c864940c2a47ad82f031868c1933679f9ee0e5ab01e98386433311a4230a77c7a5d41016619fbf7bb1957fecc259bd092d7a0894eedef91143a0d85e68a6978";
   sha512.doc = "7c71fe703efe235b3d1cf3298c99f2ba7dfbdc8d7c20861e8738070ef03b9671b1a4f6df40b2238d4b7cf9e765a1cfdc6210ea63ad06dfc60e0ac7a101735315";
@@ -13870,6 +15285,7 @@ tl: { # no indentation
   version = "1.5";
 };
 "gamebook" = {
+  revision = 24714;
   stripPrefix = 0;
   sha512.run = "4af22bc285bac3f368778dae5c91cf6a1999748a6dfa5fba96e166ed320e124c33f2b6d6bee16ad8d00d0f8067b24bb3567a1aba849b74a6b02fed3bb85dbc0a";
   sha512.doc = "58493c9b39343846913263f53b3bfe0fd89e4adb4154580d1bb0ff5d32b5b91ddc75511a0241fa3b98faef8b2d9d7c1846aca486e0c7262f8b3ea7a6bfddc619";
@@ -13878,6 +15294,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "gammas" = {
+  revision = 50012;
   stripPrefix = 0;
   sha512.run = "96be5ba2abc71f93d044d762403f294082e9afd10ff4f159713ae906233d1581ba408205746f968e10f84ce4e79e633a4f203ec4a8dade3f9738d0f277cb703d";
   sha512.doc = "0c1739b475a45149deb78daca921ff8cdba4555d466fcf26ee0098632b835f650d5bc5e9855aba889a0caaa2a64e08d7afe1021d6171984bde3161c3543fe7f9";
@@ -13885,6 +15302,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "garamond-libre" = {
+  revision = 51703;
   stripPrefix = 0;
   sha512.run = "3ef5b7bc8255319a25245616f1750cb09422a9dc0184f0e7a13d481e7124278e093dcc2962f9d65a621bd1ccf54ac82f46d74c5a97b5a2117f8e23c7a39fe587";
   sha512.doc = "d62d901e83e943653058d64c20135e460d5c8418665e5418439eaeaf662666011e5563fcea1bf3e68980bfde9a9572ad92a4a60d6755acd8737fb10932483d51";
@@ -13892,18 +15310,21 @@ tl: { # no indentation
   version = "1.1";
 };
 "garamond-math" = {
+  revision = 52820;
   stripPrefix = 0;
   sha512.run = "5a6520612a6cfc8633149f4ea795049c017cb1a483104dc7258cd0c0afa0388d4348ebc0fd7d5b7229031adda5ba835c122b69d5310091106c972c5b8aa32891";
   sha512.doc = "3afc74609589c22ad0e540f2915c8cc27a2712a2409f0085098cd00df74007e2cecdecaa40cfe79e99ac6538e496d59bed9ca44cfb18dd2b7fce2620805623b3";
   hasRunfiles = true;
 };
 "garrigues" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "e1440fcf8eb0ccd3b140649c590c902882a8a5a02d4cc14589ed44193f3a70bf13839e9de9663c500bb6874d6fce34f5a21c07e38a7456738548b6ebf449b258";
   sha512.doc = "0c91f7e1c8fe4910fa7052440edd9afd81c8932e99368219c8a5037bddfa4c8c11037576e9c94721062df9cf7fd5d467389ddcf3aed3e1853be38846c049100f";
   hasRunfiles = true;
 };
 "garuda-c90" = {
+  revision = 37677;
   stripPrefix = 0;
   deps."fonts-tlwg" = tl."fonts-tlwg";
   sha512.run = "304e330de80c822862725f05da0c800ff8043d73398a48a4d88b9156d5575593aa1797e65f88093d3058594969fe3a288010efd2a13e12de52beb405ebfdbeec";
@@ -13911,6 +15332,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "gastex" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b6e90db05d820b5e8001fb5d7168449d1fb6ed0679d158850ab4e5ad1166ebbe05680d190bcaf3c2808e2fffa6b3ddb2a824f223855182960cf849370493a1ba";
   sha512.doc = "2890b569863b2d65a2df850e0e885e15754ba4b483fd559c0f914fd5ef2516a4b33944d365fd58a381a1992a22bddf69166cec0bf2b1072c9aed7829fa21903b";
@@ -13918,6 +15340,7 @@ tl: { # no indentation
   version = "2.8";
 };
 "gatech-thesis" = {
+  revision = 19886;
   stripPrefix = 0;
   sha512.run = "c5928d0d383da4057a0ba00d2848d324624228f1a98f0f254b09fea35ba21e3ce655f1fbe02ecc6291921e43e9dbd2ae954d6199dc22c1390bf04670ca41038f";
   sha512.doc = "9fe1e4342becab8b57d892256bfd0723afea3a3f4ad3edab2b3c374bdf410d14b3105f165aed56479e848939a5cf6c807112788ff3a82099641fa71f4e78b5ec";
@@ -13925,6 +15348,7 @@ tl: { # no indentation
   version = "1.8";
 };
 "gates" = {
+  revision = 29803;
   stripPrefix = 0;
   sha512.run = "704126d5e113b9718654e5d611d169df17b45ec09f187d86d1c108a331e80939d0266c4473233277e1b465a70775da1ea9576744171209ab45203b4059b96b83";
   sha512.doc = "a9cd7d2c616021d429b299027503fed60e8474774b6d57095371f1afaba68709770857ba09f74e8e5223dcbdd1d9f1f70a0ec81c3801b1a77c3a494336fa86bd";
@@ -13932,6 +15356,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "gatherenum" = {
+  revision = 52209;
   stripPrefix = 0;
   sha512.run = "f0a0897ca3b306341a8af5121d09b31d9169a90e073f3d2babc2b4a32b72d33b4f7ded73f2455e5b6e7454188112440cdff97c4332f3396c948ace8b2944598d";
   sha512.doc = "9e6e1c322aa19a1c3ccaa622cf8657dd314dccc0fedeb7056e182bfc648fa21b06b67e8d1bf2d529fbf84652a0d6eec9d5a4ffeea1003dcfd2cd195ba628c6f5";
@@ -13940,18 +15365,21 @@ tl: { # no indentation
   version = "1.8";
 };
 "gauss" = {
+  revision = 32934;
   stripPrefix = 0;
   sha512.run = "9dd3f7685a8b7bbdfbee1fbe5dcc5d2819091c7c20df7979b1b0fb7971e613e45b6321a18674e88bb0d6222f050f0ab3959b087be70b90b5bfefaeffacc733f9";
   sha512.doc = "50de7e9af2360367de7f7136def2536a82348752656b1c40022d7e13271cfde64e67bcd482c2d208f47b88a30560f8179b7b8706288809b41d023c037147f0c2";
   hasRunfiles = true;
 };
 "gb4e" = {
+  revision = 19216;
   stripPrefix = 0;
   sha512.run = "1ec519ad5f22e6d61d16a0233a73065b45e8628549bfecd109f968b8749c362cd04f358d67e96b1311577f94f6152e7de7a9e3264ffcff5c5769662b52df7e29";
   sha512.doc = "9b8c8e2590a1a515aa84e11a4028aadeff9e4acb7d3ce99b0d21009e17443db3d2feee85d888a333595e144244efbf978239e6dbf48c68a43bd5709d9489c203";
   hasRunfiles = true;
 };
 "gbt7714" = {
+  revision = 52870;
   stripPrefix = 0;
   sha512.run = "91bf06c6bfb5ce2a5a9ea1fc729e3438a385d2b3071adff342816f5c914e6047d80393778b1919f21da51293a86960d5b00d08d73a4bbbe499142d7700936606";
   sha512.doc = "6eb4e9c23987bfd19fa18cbf89a5c21f0893e5d7d2dc704e9cff435f1de9497083ac54f886a3c87c40db95db22f607532e44b2b903e51f0a3251f1f143242633";
@@ -13960,12 +15388,14 @@ tl: { # no indentation
   version = "1.1.2";
 };
 "gcard" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "de462bff229779faa33c546d525e3624f1ed372c09c1b90fa9270928caf0a2604f2bb9d3ef0768de7dd0646202d7a59995b7252c0b83b19eaf777438bd1acc47";
   sha512.doc = "f7fd3c07e053962c88d0a0b8e5899272a3bd9af4cf1731f88a7014773d8f0ecc91fb45e1e59b1a372d8c8977e1dce91c5162558d0245d77a187ac7787a3710ea";
   hasRunfiles = true;
 };
 "gchords" = {
+  revision = 29803;
   stripPrefix = 0;
   sha512.run = "7fd655af5446982b450e3eec2b8966f2fc17c11686bb75f516ce0043af651b90e4f88c9cfac133929fbb686fe3f7be6de64d89bda6822f218b691791c9207950";
   sha512.doc = "26818218c9e3142f4bba491e996556b28266953c6b84f1c3de58d60b1bf100d15513fd2898507cf43226eec127942dede647784060668d86bcb22e3fdaee96cd";
@@ -13973,6 +15403,7 @@ tl: { # no indentation
   version = "1.20";
 };
 "gcite" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "169d9e96121d80bcbe7580e7ff447e8df252b19dca5b304514a792764344df679e9275b1a552d67070d3f5b0fc41c70a6cf1ce9c90358dd9ab58878643be6015";
   sha512.doc = "d9b50778855efc00ba4d6d6f48891865853b8de8e55c3432140b0ba69767c6c13ab934c2be43b2556a862bbb5413ddccce158ec4130576617a75708919f1ab0c";
@@ -13981,6 +15412,7 @@ tl: { # no indentation
   version = "1.0.1";
 };
 "gender" = {
+  revision = 36464;
   stripPrefix = 0;
   sha512.run = "261d57b05993954b80f82844f590f952fedaa4ade8f89704f2e2b4e2d18441ab5c8adef2ba3dfd81b61bed53150b737ef72964e1faa44ca48e923cfeb5a1bc14";
   sha512.doc = "7c8bf143cb7ae1d22416df88aecf7e004eb02bf199f74f8003aeb9ae3923a3db42f1735650fac8aa908bf220f16ca48b3e4f9dbc312668d87df65149ea674be4";
@@ -13989,6 +15421,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "gene-logic" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b7cdc0d653aa8e25d763ca4115fa6fc857ddae35ed835aee6b6a204ba83d01ab91928b00248c40677ba132ef113276912a6b85dfd456d937114a3263a1ef4c7f";
   sha512.doc = "db358777af18e7d2e93dc23084bec0f47270b4cb6c6078382a1eb9ce288aed06a6f55fc30ce728b1312d06f871458fc6b5b697b1073316e8f727b5ee80f99468";
@@ -13996,12 +15429,14 @@ tl: { # no indentation
   version = "1.4";
 };
 "genealogy" = {
+  revision = 25112;
   stripPrefix = 0;
   sha512.run = "907394cb0ca9b3d339d78595e613236038ea2acce27c4468b7d028d0db7ddf36f7037c4f0bc63d5970e904d0675bcaf057c769239a79f064fa6aa9dae4f2014e";
   sha512.doc = "34c9d737d31626331a18051a5b04584fd896d7cb8ea1814ff2fbf30486ec3578b2bef16155b9c8f2ca645d42f797f3101c799d3422c05f824026e268fa4f94e8";
   hasRunfiles = true;
 };
 "genealogytree" = {
+  revision = 50872;
   stripPrefix = 0;
   sha512.run = "295a763f682dc1acb025856df4de0474d3893d87cf0e530a2b3f72ef7a37dae87d34c97abbf40898f920f188f7cfb7366b654004b7c577b409ff14caf25c1072";
   sha512.doc = "9ef261874b54e2d5d092b2f362ba0e5ed6b1932f433290ebe6fda61cb87aaa3b6ba09708df31d6b10c1263288fb62ef79878ff0dbfbe104d83d3b4559292b6f5";
@@ -14009,11 +15444,13 @@ tl: { # no indentation
   version = "1.32";
 };
 "genmisc" = {
+  revision = 45851;
   stripPrefix = 0;
   sha512.run = "3e41f140088d5340e2ee6dd022eedf2dd9d9e6424d5a2467a674334b4afa079d91039e1eb018c4e95bea47d61dc32350a3b30897ff9e4c70cf9eba36a29f07ca";
   hasRunfiles = true;
 };
 "genmpage" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b2618005fc0f00a636e3a307ba1038f8dd39798e2ee2afa4d9169eb45ed4b38a67a57bfb516e9dd8d93ea0210a7fcde21b26c0564b974442e18021d83f905265";
   sha512.doc = "c428886adead6fed52f0d249db34a950b4f22b03770ce1bff0831fca29477ab92b5d83a9719b73aa45aeb5f2067f31afc810b6cdfdd69e709ec5e61a08f45472";
@@ -14022,6 +15459,7 @@ tl: { # no indentation
   version = "0.3.1";
 };
 "gentium-tug" = {
+  revision = 51613;
   stripPrefix = 0;
   sha512.run = "b95a521b417f21379e61b7afec5462f06e3e20265f9566d40a19fd6ba430b02c6a3994a2861ca1f885612bfab0ac174ac89fb2221734e33aaf267c2a532e56a5";
   sha512.doc = "074d5a42ddc427f240a956aca94d95b065813206b2ba66778de032665b924d02065cefa17dce14671b31bb8e455215bc34cdae29ee09a2db8b6e330fad3e7e1a";
@@ -14030,11 +15468,13 @@ tl: { # no indentation
   version = "1.1.1";
 };
 "gentle" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b244b249329d1ee622686d2a44d1469ceeed7e2adec5d82a2482e8659266a8224490531e0ed971b56f945b63fd1081f29aded9c43cea78fa8a9aec836301b26b";
   sha512.doc = "fe296c5bc38a1e6d13d2b46dc8081a6658764f7017d0831cfd46dd86082371d6ae095ec3b52b3aaaacc0a57cbcee066b94644a5746391fae4129eebaa246e146";
 };
 "gentombow" = {
+  revision = 51697;
   stripPrefix = 0;
   sha512.run = "4643d4146fe341552af7b3600b61b7c852427fca554b9c7fd4eddd3b1645ec7a686a799fa2371e0a9b1cad02ab5aa965a690daed477ea8c14711343e8c274992";
   sha512.doc = "0de50b7a73f752f36bca2ae985a53b1203e9bfc733e2cc3bb5e7ed9afbab0bc59b91cba95a315d8f41a4097402ac9c84a5fa86bbbffaf003fd1bb7da643af54e";
@@ -14042,6 +15482,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "geometry" = {
+  revision = 53299;
   stripPrefix = 0;
   deps."graphics" = tl."graphics";
   deps."iftex" = tl."iftex";
@@ -14052,6 +15493,7 @@ tl: { # no indentation
   version = "5.9";
 };
 "german" = {
+  revision = 42428;
   stripPrefix = 0;
   sha512.run = "6cc469012ca6cb76baf2bbea00d198b97c2694d9388e90d2ded6b27da30f8d56aa2e6742ecabbdd335b7299c0c7476cc5479b59fa94468c9354f35ce18b59732";
   sha512.doc = "b9795ae418790119ca923079221114b9bf608ce2460b810cb39575910c0b173ff445c428a2ce6260bf90a993fb354d2b5c300ba58344d907965b65bb6f2d4ee3";
@@ -14060,12 +15502,14 @@ tl: { # no indentation
   version = "2.5e";
 };
 "germbib" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "a7854f834c868ad80bcf986380f19139687eb80309e3aeb9a001d2030c5bca51de617394f920801834df460d05b52878301c6b45a52666984b3ba2d0910c416f";
   sha512.doc = "53dd4fff2fbb7044436f37e8a2baf48877699db4f99b92a701d10c0230439b00b48ee09051839efe4392abdb4335c3998d92d6239802c765bde4aa2df3d34ab6";
   hasRunfiles = true;
 };
 "germkorr" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "6819a79268da2704a3fa6baab74be48ccd591ba998a0b012d323cb0149273deba6298a92629f0d19c19725ef0b41db9dd28adf9bb898c1c637038f9c22ad4b16";
   sha512.doc = "ab5362e069674c2c53709bc776be9fcbcfd3e56226a8fa7b9230c2f4ccb6fb74bba20485362f48130c153d81df838281620a628671c202cd60a52bf8ab5b89cd";
@@ -14073,6 +15517,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "geschichtsfrkl" = {
+  revision = 42121;
   stripPrefix = 0;
   sha512.run = "24cad33dfcbdb8ab91a80509771bd130ea6682a14fea5510ea202af73155653471deab91abb43a302b9717c252475db58135ad465f28509adae5d8583bf98e0b";
   sha512.doc = "6d1097dd0047c029100358bd3161f2ca515a09cf9a62b2633d4797059688bd5c30e4eab11c31081faeefacf892415c5d9a4985d20245ea9cf79b4197925ed2e7";
@@ -14081,6 +15526,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "getfiledate" = {
+  revision = 16189;
   stripPrefix = 0;
   sha512.run = "017b3ad95801da2788f2c5040225c6a8a2ac6d005c1d68d9eba0be061dfc9fa6f088a0279a75d25bea8ba380e4a92cfbd9b6a6b812d08cd2f86de097f7974fb7";
   sha512.doc = "490daffa0b0b28c9c02d745d8de50f22395f6ae773e07f6e826a8ddaff0d38f9ee48e822953e9642e46be26084ec2919bcac76c388cb3f42965f1b662e4e43a0";
@@ -14088,6 +15534,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "getitems" = {
+  revision = 39365;
   stripPrefix = 0;
   sha512.run = "8797c7e70f1c81330b68b6c386116b0caf2c350a2b75724d796f0ab7380a2ea4cb2ae293ac3e6b941887b30faa2b73775c2bfce7c674ee98c4256a23231443b0";
   sha512.doc = "95302dae67f3193dc3d52b4e5724584ee066eee1dbba30b1233faa0c65fc568f932805b18b8054165760a2b655b486e7f3115d3b37be780f8f5a7220f2f924fc";
@@ -14096,12 +15543,14 @@ tl: { # no indentation
   version = "1.0";
 };
 "getmap" = {
+  revision = 50589;
   sha512.run = "e5287152442820e20087b45c50a750af621e71e2175cd6790231d81e1f338e50aa75f29d9fbc31c2e5802229c8f15c4e0c7769d0513f1d1b0bafc96a8a3b120f";
   sha512.doc = "bb55c60ec958182aaaa6dfc292a06fbad8a0ebdcb56a6799f1358ad2009bcb72b06611672219c5e9bd6d7cb4db76c4fa030be5e06f9bb38d04fa6744f8bca330";
   hasRunfiles = true;
   version = "1.11";
 };
 "getoptk" = {
+  revision = 23567;
   stripPrefix = 0;
   sha512.run = "6a2e543d0997c52155807d0d2641af9714cb09531286a58bcb2d5fec0e70c694edb7d603a250281a641610d1c39495d5f93417da5cfea7a86da1fd53a98ef77f";
   sha512.doc = "fba54e8acd4f494c4e859c8705cb97923e477ed909720adb8c4735c527c3b13799ad74ac1700099bfa282144f2b38358b890bc52d4ae4a9e16699c2d0e10619c";
@@ -14109,6 +15558,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "gettitlestring" = {
+  revision = 53170;
   stripPrefix = 0;
   sha512.run = "101ad92c2fba5c43321d8e12754190e09b0442508799dbb6bac23d5cbe96c470425a4cc10a28441408ac5a1c406e18aab7567f2464e48c2692fa38af1e23a16f";
   sha512.doc = "f9e33fbe89df368c4c5dfd855f2fc0fa8c4d1eec5c0ab925b0a28b9f021fd2d88521895233d12783a023e40d70b05a0e849d4551f79fd4b8d0af72fb60a1af32";
@@ -14117,6 +15567,7 @@ tl: { # no indentation
   version = "1.6";
 };
 "gfnotation" = {
+  revision = 37156;
   stripPrefix = 0;
   sha512.run = "4f99442eacf28ea13cd98ee4bbe981b95ae9d849e6bf2682cac2305fd793f6e9f5e4211362385890956fdb24ef03748e9cb0184c7ba9ed89e7985b2caa3e2da2";
   sha512.doc = "b65d173c11400a7681510cd837ac6e8ebf65a458327bfdee140013d49a0c6fcc339f6c45d4b4ee918585acaf785c12e66b3df5f73f01a1f2d8c5b8db58b9c47e";
@@ -14124,6 +15575,7 @@ tl: { # no indentation
   version = "2.9";
 };
 "gfsartemisia" = {
+  revision = 19469;
   stripPrefix = 0;
   sha512.run = "28cb811a30c06bd6390b9268dd2a7a4dadcb2fa9d426d9461af1ba5593b2c419ed1c7886c3aef9bdbb0f1fea3d6bf127ff6088a6b2c2048dcccfb21c2a06a5ee";
   sha512.doc = "9f2efd76c243177240f237f7232fc87eb33d7ea1177a7bfdf7d506077e19c40d3fd923a960595c46f50fa19979598bd06a1865cae8794d45f91da1d6a9a60a7b";
@@ -14131,6 +15583,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "gfsbaskerville" = {
+  revision = 19440;
   stripPrefix = 0;
   sha512.run = "b545ec586b3bdfe3da2cabaa959ceeeb4ff513b48024575b1b5e3c57bb2d10a0b4e2cd7507726275eed0826dabf03d05c20eb9d5ec341aaedc0313264214ef78";
   sha512.doc = "a45ed2b35774755a6558431f784faad4bbd63aa81ad5d80c3cfe3f7726604aea3e4de2baa72bb27a4e2271e9bfe180c8963d06b880a0efd2dc5f7789dcabb51b";
@@ -14138,6 +15591,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "gfsbodoni" = {
+  revision = 28484;
   stripPrefix = 0;
   sha512.run = "e01cca38176330bdc0a4b523bd2bd4f73a497d90a34682d29920e145d11ea099f163fa08470c79e10a27a137a5901d7da9db54e461667af61c687adca1960249";
   sha512.doc = "c70b1a32e945d82e50b8a37319ee2bf63d4800b381f317168fd945311485cf6c41c7a3112e89457f4ee40bd29736accf681bd61494120e3d41f0c8fb28ad466a";
@@ -14145,6 +15599,7 @@ tl: { # no indentation
   version = "1.01";
 };
 "gfscomplutum" = {
+  revision = 19469;
   stripPrefix = 0;
   sha512.run = "4013ef92910c3c1145708afa5a9ff13cfb0aae05e6b225c56c98090ea7cd223799e73212982312a14cf504a355dddce08e3364df8c046dfe462d07429cfa617d";
   sha512.doc = "5854b000522120f6a1b065300943fd8aebcd75f57da15d667616a3706d35ffa35cac0422712d0b008dc2abf2b9deceb0248fc044be68f893f6ad0eefcd50b316";
@@ -14152,12 +15607,14 @@ tl: { # no indentation
   version = "1.0";
 };
 "gfsdidot" = {
+  revision = 46310;
   stripPrefix = 0;
   sha512.run = "9e6ea7c3d5b7ecff95270b17879297abcccb62df11ab7eba54f02e7fc2c732d1be39b052e3b4b6eff9990ad010e46f73b40b4134b4e024f7d914a1bde29b4a7e";
   sha512.doc = "93bf3a4fbff9e0c936877b135a487739a7f48c2797cce9d27c2a9f173fd290c2da5a3a3f30ca883ea057ec47a4695d54f5e85ae01f13af40e1dfd3210cc7c273";
   hasRunfiles = true;
 };
 "gfsdidotclassic" = {
+  revision = 52778;
   stripPrefix = 0;
   sha512.run = "7b07a974f5447917d0a10a964011f2ed57db2dc9155384117310eadbe1dd05067dea6d617a598545713fb9250bda4241b0b2d5bdd84be4fb8c994d8d8c4e5ac4";
   sha512.doc = "3256c1af2f7b0d15625eb3a7250e15b9645991b3a7408d11afc77aa65bb067cfc3682fac334a61d67f894468b3a14c21e694e4b7445a01ce88203af06a269031";
@@ -14165,12 +15622,14 @@ tl: { # no indentation
   version = "001.001";
 };
 "gfsneohellenic" = {
+  revision = 31979;
   stripPrefix = 0;
   sha512.run = "c8ec8f9fba5d653e5497a9812c5978a21cdb5b59f6bb0f45441c761d2afeff1c055c48f1b07c4f56c6ba6a6adb2f99525d838fc7850c7c97bb3f3e0f67f50dbe";
   sha512.doc = "581bd169fc4f6ed92453e2e8f50ee0efa4d3ea282b710c340d1f05f8ccd1e117721ef4b9e9fd6553912ca60d8ee63eccadeac710186cfae62a39842d31b5b766";
   hasRunfiles = true;
 };
 "gfsneohellenicmath" = {
+  revision = 52570;
   stripPrefix = 0;
   sha512.run = "1dbce2d775c204b758b34c66adfa7af5315ba5d40f577a2e5f8bc37aedd4fd5814dccf31e6830804f8b8ededcfe88eed9f0ea020fb411e439777bc19d88698b8";
   sha512.doc = "5f511a3433bbfe68bd2240791126de6254f5dc552a24bd344aa33e2c8c93a08ed924b5d900d8bba1cd2fb03a2349ccd0c7233ae9b54db5f888b68bf97bad7f05";
@@ -14178,6 +15637,7 @@ tl: { # no indentation
   version = "1.0.1";
 };
 "gfsporson" = {
+  revision = 18651;
   stripPrefix = 0;
   sha512.run = "f52d6cd8d0b674771dd56a5d2974fd3edd8b4685bb201489e578c62d1e31b5dcb6f2cb2e9b05702ec439ec7f0b35740e291d3a92de53b75870fd791858f8a474";
   sha512.doc = "3dbcafd00a88537db9e27aece276df08da805b59076d5e65395a4752d8ce57a794f23508238e96ec26b8d7e6d25e11992c2a567e44ca2f930bc44b9dc980202c";
@@ -14185,6 +15645,7 @@ tl: { # no indentation
   version = "1.01";
 };
 "gfssolomos" = {
+  revision = 18651;
   stripPrefix = 0;
   sha512.run = "6e6ac03cf7ee20accfb67855b3dce136e3caa2466fce760adef0a2c1633e0a170543cf861a6a07a0c80344ab026dc2f74a35c5543ea92a53f7ce8a1042f778b7";
   sha512.doc = "67640d1a95ad7ec43d7df407916cde264c5460cf400011cf0cdb3dc4caffabba370f2fc15ae945e20b6a9bb6623645f6ffe80034a781cdeb11c400bd23985e3b";
@@ -14192,6 +15653,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "ghab" = {
+  revision = 29803;
   stripPrefix = 0;
   sha512.run = "7e919cbb0c84fe337dd05c749a3288990e750ff0aeaf119736108463a1684a18a66be94811a31156f951c871b2f073627914629756b06e747f3220d2ce08950f";
   sha512.doc = "2cb7dbf5b43130b122618c50c18e513dc0ee0ce267cdfa6e710451d1fa7fce8965617d74d48748241321948ae8c5eb9cfa4945df146ed8e5d476d0fc5caaf204";
@@ -14199,6 +15661,7 @@ tl: { # no indentation
   version = "0.5";
 };
 "ghsystem" = {
+  revision = 53822;
   stripPrefix = 0;
   sha512.run = "42f94adda3268ce20f664113211d3c32e7ee005db053f3daecf72d381dd4c4cc2e78610b821cd4b43c4543610bc66170513c4fd9357445977a8a2ffc6bf140f2";
   sha512.doc = "d2f1f42177ea820d209e9574def8efc0dcf9fac0c73ce1c9eeaace7bc0b25fc470ff7265ca8a4f42f6482dba61d7d764b2171268c168aa7eb154bb6f9672f52a";
@@ -14206,6 +15669,7 @@ tl: { # no indentation
   version = "4.8c";
 };
 "gillcm" = {
+  revision = 19878;
   stripPrefix = 0;
   sha512.run = "37c8141eac6b1636292479299f7df6b3dc128addf8f7ba680cef2c75d2f7ab04686134b243a86168c54052d4dcbc33f13c13a6629d7c98d3908e4cce5fb53f06";
   sha512.doc = "55e02d36c12bd12932c2d220f892852dd1c8c947cdea09d058ad38e5e513dfb684e75a8ecf07f5711200f942ea7732519c739866458c330ee271bf45af32ed45";
@@ -14213,12 +15677,14 @@ tl: { # no indentation
   version = "1.1";
 };
 "gillius" = {
+  revision = 32068;
   stripPrefix = 0;
   sha512.run = "9620e63fa3a9a981bdb20cbd6d8002179c722e844df0a18566593acef864f134a894a7e1920fbc4494467b1301af0bbf9ee80fb10bcc192762e5b2505fa8becd";
   sha512.doc = "df8fdeb2055b4d3383eb6ebab3dc4fb92774a96d7b31e7bdd7a238e215619710a8c0ec3fe9593213535933fd76c38947ed295df1a628aee7a7d7b21078f5ffb4";
   hasRunfiles = true;
 };
 "gincltex" = {
+  revision = 23835;
   stripPrefix = 0;
   sha512.run = "c77fd5030e626027819396e94d07c1aebaf05a1ef6a02025a6a0f4140d22fa8d0a8695e440ab72eb0a042ef5f33430ef60a47706658134907725c49969841171";
   sha512.doc = "2f3a0ef1eb5d1b9f5a819e99354572f34b6fcb7daff3ae02f277d9280e202d1d4d1a54b9c033860da1ef3ff302229bf2d1aabbe1e6acff05589d3daa32f5c87d";
@@ -14227,6 +15693,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "gindex" = {
+  revision = 52311;
   stripPrefix = 0;
   sha512.run = "b65317c570c923c7b6b84c2923122d844f895657267b694b46fed2d505348833a57700e4da93cde3d5a81e7589a456eea179a455dacb7c9324e0f65d9c718c9b";
   sha512.doc = "2a3ed388473c669874b0474b9b1f45c60e2efd69e8c589a9f9086cecaeb5f1e3192fbb949c3d0b485422c7f6b49075d3db4cb8ba03bbdde0f5f77089331f770c";
@@ -14234,6 +15701,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "ginpenc" = {
+  revision = 24980;
   stripPrefix = 0;
   sha512.run = "20ea4e42fa07c21d8f2ae5d4419e6382141e6babca0b89b508744ea22d6310052f2c46e6ba0ad32b06f5623daee07a16eeaaa98378c9ad04dacb78634b9a583d";
   sha512.doc = "4e343ab469e2445f6a2fd5297ae38d1cb42d4db1a3c438885815a2e4c5d367bfae3226a628e11152826fc5e4fd28a9c4bc5c393acea550c5ab33cd854d4f3e8e";
@@ -14242,6 +15710,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "gitfile-info" = {
+  revision = 51928;
   stripPrefix = 0;
   sha512.run = "7d3577b55f0154dd9c0a1aff3d46741631fc561b4c730a4f55a84dff361e6c27f327979638946d89ceb35370bb4051b1471481e6bd761fbed66757bc613abb2c";
   sha512.doc = "ac2083dea1ae4373ee2482f41f9c66ab93a2b66699fa01449c712c219ec0c53635230b062ba58b4107eaf7fb54fb7eed76c5b9346ffc60f6f35b18a72ed0a08e";
@@ -14250,6 +15719,7 @@ tl: { # no indentation
   version = "0.5";
 };
 "gitinfo" = {
+  revision = 34049;
   stripPrefix = 0;
   sha512.run = "099bcb4970827cd3309f88278d8ed993856d5ebdabb22c3a3f558787bc6cae46378f7a92b88c5cbaeef496f40a8adf1e0740e685d667ba2376b5852a12af9e5b";
   sha512.doc = "c5a9c948ad8cf8f2bc3cc134d60165ca4fc79117a6597a5981b39e26e25f4334f479f2bc1a0e22c52fc48794224115c0c170612c8088a414544d9f51b18421f9";
@@ -14257,6 +15727,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "gitinfo2" = {
+  revision = 38913;
   stripPrefix = 0;
   sha512.run = "7dd68c7b1d5ea49dcaae8ba1a1582676617bcfc6f5c6ba34eb1c62e60ea5b8ac3a50841a93394b640e8a79c3cfe447858fdd1630e4095683958f8d36439a84ca";
   sha512.doc = "872b7fa8e0c97e4f6e0e1989b7c45507773b4f96cd56f7aa7064376b520d8f2beb4acfe71a21e295a8a457b86fcf7521809fa59ad02875466cf426fa09bd8aa9";
@@ -14264,6 +15735,7 @@ tl: { # no indentation
   version = "2.0.7";
 };
 "gitlog" = {
+  revision = 38932;
   stripPrefix = 0;
   sha512.run = "2fc9830dd1c43cf0c32fd743c9fa001287f5753dea38d8491af43803a1d98a0e09cd05641484fd2f7c47e68c8c6919c2eb9fc298ebd761166eb5b77c54d7f00d";
   sha512.doc = "c1bc22cdf9b23baec98ddba49784a09c97e9e5f8c1a471dc39b3d58d67bb3ad2559f25766debeaf613b3c4e8d8bb4b22244de07d09e957ff09a94c0254fd3e64";
@@ -14271,6 +15743,7 @@ tl: { # no indentation
   version = "0.0.beta";
 };
 "gitver" = {
+  revision = 49980;
   stripPrefix = 0;
   sha512.run = "ccb08db2f49ab23e832e12dcec8b2754b4a1c916f2b0b5582723ef6080dd93a922111f6b5b514f1f53ca684e141c89f0e1d95d0b391adee857211f0e7bd243e9";
   sha512.doc = "92bc02edf0ba8a6877444b418cb15a9260fb5b26fd95bcc044665b306edcc1c5f5b12e36695cd02ad9260d7c996195e3beff69843ab7ef9a9272bafa2b1f2419";
@@ -14278,6 +15751,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "globalvals" = {
+  revision = 49962;
   stripPrefix = 0;
   sha512.run = "815a1aff9e889313854962e44c1c09a41713f4efae915a1d1a65a3f0777a4c36e9987c588c0d6f2f1ea91cfed6c28ffbe045a842ad71fd6babc91ae1bb16aa5f";
   sha512.doc = "36a8b35ad90d9fb797a03b48f8cf818c9514ffe6e7c24be157e04455559d3004ac6011e2dbd16a4c478105b39ec0d2597f74e484a1913bcb180a7209b9191fb3";
@@ -14285,6 +15759,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "glosmathtools" = {
+  revision = 51809;
   stripPrefix = 0;
   sha512.run = "9587fecefba724acf5db13a1e915d1adb8494536be2cd72b1d20d9a52b065e4efc91ac4d40da9a16bff1fac0271c0e982c8b975ed0606bcc188cbba46522ff89";
   sha512.doc = "f000a1389a70239256c61ce72865f1b606f11802f6ad9761c10786d19414f0e59de38dcf0f1414b0b05fef3f49dbc4c0c345b2398b4066e6accd62a746fafd7e";
@@ -14292,6 +15767,7 @@ tl: { # no indentation
   version = "0.5.1";
 };
 "gloss" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "399bc1b809c01fd60934e28834dd7d6f263aded75bbede67507a5dc7bdbcdef725248b9a10d4ebf3cfaa981be33fd35a4ade78eb20b2b23cbf851376ad5e58f8";
   sha512.doc = "871760a86ffb9d50cd480e2cd234a9873de48ce620f57a6538b36b0c1fd5e7f11342fa435e147ee1fb47ed08b8e855eba8168c8b755ed67ed7fffcb8f0e0ac86";
@@ -14299,6 +15775,7 @@ tl: { # no indentation
   version = "1.5.2";
 };
 "gloss-occitan" = {
+  revision = 52593;
   stripPrefix = 0;
   sha512.run = "ee68a2f0c41dac79d00a4103804ad735b5bdc78bad660d5933e61e88290a2dea17a695ea45129a672cdb301e1c89e4fc319173df1fbfd87f944abbe46f7f1dd0";
   sha512.doc = "1325b4c8c0ff8c1e53d27b5696da419f99852bd6c272176bab4e03f91bb6a715de51d24317b9cec1af50ee0ae2b34c03c51afe9cedb8903a1e8f74bbee3cc06f";
@@ -14306,6 +15783,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "glossaries" = {
+  revision = 53777;
   sha512.run = "7ad38fe17be336d0c849bdd149ab67ac3f519fe34000257df52a3f7b6c93a048dd45c1dc96bc674bcd461301fe51a0adc6e5d3fb6ed3395543911f5370942156";
   sha512.doc = "b401f5bb665569d21c1eb47282ae24ba987fe1f042540f98cacbea4cc3619df4da4c63072a0ca8a38c34cc0ab236b8c87c47ebe5982882122b229e3c8a545489";
   sha512.source = "cb72f70e9d3cf90826798ac736cf72612b07d80698b5e3d23fb3006e1a663f0f0b47adfa3e74e80a9232a8d3a97de29a03807f4b883b8c8055cfc73eda227959";
@@ -14313,6 +15791,7 @@ tl: { # no indentation
   version = "4.45";
 };
 "glossaries-danish" = {
+  revision = 35665;
   stripPrefix = 0;
   sha512.run = "d9551aaa01e6f6720406a58f869048fbeac30fd629edd7fcdef657525dd1f7fb3faa2127cd81fb777d339ae65a1015e9cea7e5fe26a7de10db3a387152aaf0b3";
   sha512.doc = "8e6097ced6686f3f5f0162c7deb11de9acfd55ca152c8ba3d4eafe155f645f33ec32dc495e3b4f4832e33300cd63d2d4ba56d018177f96426ee72e14cc60e230";
@@ -14321,6 +15800,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "glossaries-dutch" = {
+  revision = 35685;
   stripPrefix = 0;
   sha512.run = "0e3d2607caa6032c8c768c1bd7c84808f6b836d6c167b1e0c720b57c3033c175269663f6e21edc248676bb2b73142c20c85cb6c3011586cf17d876e540a435dc";
   sha512.doc = "c2d6ce929bb9e7482413886967beb598b6cfb4a2f84d5a2e5edd7039b94e397ba9ad2e63954178d6fae91c5e3aeb080a68ed466b609ba0adddf98003f570cfd1";
@@ -14329,6 +15809,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "glossaries-english" = {
+  revision = 35665;
   stripPrefix = 0;
   sha512.run = "f62c43c9cb5a10fe5e364e6aa4ca500aae8b89e71f6bc80831a8c8211ca640f3631f011735ee5c82278b188bf896360b69502da2128e1db1287d24e44805ef97";
   sha512.doc = "40c30888541114f5594403ddf251f0c209daa57c6b6f2d3d75b4a51416bf3011bea70cdc5f461e80a1e148181d6ecc2b2d7c891a7c75b1c577a72e5ee8ddc8e9";
@@ -14337,6 +15818,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "glossaries-estonian" = {
+  revision = 49928;
   stripPrefix = 0;
   sha512.run = "48eac96868bbeb636bc8d4352cbc1959829daab75716b3dea2ef98d98e388a2668a2ea1e35cc46f53e9ee030aa07dcef3e528f056f59d49883f0a00380785bcc";
   sha512.doc = "5f957f53acaf6b56e338b606843cfa2ddd16dccef6bd2c74844e514c157ddbc3c5c24168cbe28c67894afab8d115460fd497de91f0142bbec3d1987d5889925f";
@@ -14345,6 +15827,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "glossaries-extra" = {
+  revision = 53961;
   stripPrefix = 0;
   sha512.run = "0ceb8bf5de2ce8b5875abed3693e77f748eaa391c91c97dfc178c2ff2140865e75e218e021b6baa48d3d4125ec108265e8710affea8b0bf6db50c79771fc5abb";
   sha512.doc = "5569cda0e9fed35bcb534a8215d1909968786d4ff5966d04b629a2c576b93c28a211c8c103e1ee9082d9ffd22699989ca43a3aae975c0c21f9d734e5f8b40f06";
@@ -14353,6 +15836,7 @@ tl: { # no indentation
   version = "1.43";
 };
 "glossaries-finnish" = {
+  revision = 45604;
   stripPrefix = 0;
   sha512.run = "f4008f165ed34678a9f9d1cc2fbf2f2dedfa66d31acb5449da6f93a8b19a7ea6b7a7a584ff7c744e92637cfa4a7c98a478b096be73a3abcbeadf7d2af00a607f";
   sha512.doc = "46ffa9e86596919c6ee001bfd425fbe0c58e890e8af3131ad89b4e5ae8ce20c8f3266f2ffae6ce039908a137180c0552b9c9f2a729bb55094f999a0bdc3443a7";
@@ -14361,6 +15845,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "glossaries-french" = {
+  revision = 42873;
   stripPrefix = 0;
   sha512.run = "8516e94f69248238b0e94099b67c9807f02587e934e6fd2c9ef23befcfac783297cc4df71b8e41be77fdab85abcb4103435c3fd24584b46a3b473fc4489d5d82";
   sha512.doc = "c26b40d499199c15c875cdca901a3168ab72e4009a04e92f3b1ae9010d7912484b1185453d117154eb5b9e63358b36cd58aeff3d0c4727945a343be4c3c2ede0";
@@ -14369,6 +15854,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "glossaries-german" = {
+  revision = 35665;
   stripPrefix = 0;
   sha512.run = "e0b8e18dbe4d4e503c144be2406b99b56ef0a48847b4044665ac178dffc59d2b8ea95873ee5f2e64fcfb8379a44ee8761ee84ae44fddf996d1029372d5185d58";
   sha512.doc = "0ad0d7d8f41e52613d049fe3ec6e48d5ceb77e768c7b9ee6b3b0978eeebe6abfc803df44bbb7f90b4e487de074a2cc174224ab0e89d5fe7bc896adff495abfc6";
@@ -14377,6 +15863,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "glossaries-irish" = {
+  revision = 35665;
   stripPrefix = 0;
   sha512.run = "b59add658270f734a8fcb70bae29ac210c84472f0f7ded62baa647bdbdbcba2e63dab71aca6f8c524eae9e3d80bfa7bf96bef45bef7039c3eeff738055a93acf";
   sha512.doc = "9ce14ee4ca3ac1eed10f8c356fd6561f7ac43abcde46009a6d43245395985f045e9ecb83a38a190ea3a5cabf462a233967993bcaa40211cd7e64791dc2a583a5";
@@ -14385,6 +15872,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "glossaries-italian" = {
+  revision = 35665;
   stripPrefix = 0;
   sha512.run = "aeeeb9fcd98e55ed64c918276e0bf0b25489538da80f96030a85225635e7e0ca3d1c93c65aba8b97b486f086a50504c257ba478bdba28de92058053dcafe323b";
   sha512.doc = "f1ee5a84c9a67b88087f657c259a3700fcd1fa4ad8c765cfae11cde2d54c4a71e69dc57bf626ead0d2cf1057750e284a31443c72e994e37a62715548fa9dbadd";
@@ -14393,6 +15881,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "glossaries-magyar" = {
+  revision = 35665;
   stripPrefix = 0;
   sha512.run = "66847635e1f00af9191cef210c19ed154dc1e5405ef0d2ad38485a913626ab9cd93b7c35395feedefcc04bfd1b46112e6410154c2ff26be51553619326d1e55e";
   sha512.doc = "a6bc19bf794943b1b15c8cbece363f644671f912bb71d8b2f0a9e75d05886ae4af4846c78cd060099bb78872e4d7991a9a3274fd1343a07bf73c3ba1d475241a";
@@ -14401,6 +15890,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "glossaries-polish" = {
+  revision = 35665;
   stripPrefix = 0;
   sha512.run = "7ad5a924f24acb052c16436f1d1eb198bf10c65ed3f77fb8911cc8b390cf286581a6d7ed409211993545d597a4dee4318e1d9b820dca6f831ca215986ec4a1cc";
   sha512.doc = "cad7bbadda3e690ce56c75d2dfc92b02576226cb31d848b0c96d6115d18d222a50e514a6c6b5db9907d6a0e542824e229b063a0cec49dd726246f3dc5d4b41ed";
@@ -14409,6 +15899,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "glossaries-portuges" = {
+  revision = 36064;
   stripPrefix = 0;
   sha512.run = "64582081553f90a5000992f9db3f79aae7ddfedc6f128ddc09ec7878576b0e17a580f7c58515c2696e2c46ce1ba49c2cd756687c144d0134d91cb6c5e0506ec0";
   sha512.doc = "5f1692f14e2e4a596555cc426a556d069fcf710775d9a039f0143eddbafd0502e4f4a10e677a43589b1f91cddedba6dc9358b6015801e68f1b3d1e908e57dc09";
@@ -14417,6 +15908,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "glossaries-serbian" = {
+  revision = 35665;
   stripPrefix = 0;
   sha512.run = "7360d33c1d3912802be171ecf8c218fad45719ee6dfa0596904484ebf9dcebcc0d926112e40fca76a196ec6081fafc4524c81b366008fd20207f8150dd82be29";
   sha512.doc = "1ce493838bdc59521728b6856d2cc2df26f44f3bcfcfc04d32fc20d3e416639b1420e1451acad8b8bb0597336a77b553ac599ec0c541527ab4d8e56765f07f3f";
@@ -14425,6 +15917,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "glossaries-slovene" = {
+  revision = 51211;
   stripPrefix = 0;
   sha512.run = "d569d73cbaad175549fe5d4000ac73b0fb65d00598dcab0f3a7c7b384682568d21016fb50d7dc6d2f6a1b250ef34c44c784eb99a1ff042bc3a52bf1c987e0b55";
   sha512.doc = "63d212e4c04dd7c7e663de230274b9111b8025839c8136313677d13e967a23870927a49220aa1efa0702422e8ad4cf683d1e5e09fcf291873d78bcb055e24003";
@@ -14433,6 +15926,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "glossaries-spanish" = {
+  revision = 35665;
   stripPrefix = 0;
   sha512.run = "6c92de5e24135a9c47d200f8f0c0ce7dff8a01f8c13bfb49d4090d1c195052559f75763c0ed68d633b40cf18bc89bc51e7b6c2aacdec05376a3c2e1d1b7a31b2";
   sha512.doc = "5fc58f64a7f54b50dcfd632e700805bab2f46a92b727853b147d9f7156b2fddd50a8fac08d0ac59bf5f89e0ecf1d5ddf7c22482e661f8a5e7b5568832168bd5c";
@@ -14441,11 +15935,13 @@ tl: { # no indentation
   version = "1.0";
 };
 "glyphlist" = {
+  revision = 45696;
   stripPrefix = 0;
   sha512.run = "d4b606f0aafd19d642be4e18c6ae4a6fc2051f0359bd5f15cec2b398b097e204bb9fdfd0b0925f3b697658c671e598e7b2711a85d0ae13d21af1d00040cd2354";
   hasRunfiles = true;
 };
 "gmdoc" = {
+  revision = 21292;
   stripPrefix = 0;
   sha512.run = "cfe29d7bd5e7936c2a40292fe2518dcd79dbc105f08d3f0dfa11ebdc4693ff207a1b312e6160fad4c089bbe5012697bef1122a893b1d42d59fc39fa5c48d2ccf";
   sha512.doc = "68825a5fe89383d68b2829bc7e2fe230d717104a2ec56010bc7e67fcb14f9191bf47594cd0387b490debb5e752670048404a7985ab0b5dc039f4764d7926192e";
@@ -14453,6 +15949,7 @@ tl: { # no indentation
   version = "0.993";
 };
 "gmdoc-enhance" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "481bed630ec444fda66a22656c2cdfcbd931a6743823c36f570ede09038ec4f219ecd1985243a4fc8d852f38512c6b369227f559d3874447144e0cd62d7949a7";
   sha512.doc = "0cbecac4ae6f70ed01a407a9e5fa388f2c142b7bf77d219429d6685bf7d7c6bb3f324694286e6fe49bc2eff287faba901b7eba44f8bde1894e8cb09527c289a8";
@@ -14461,6 +15958,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "gmiflink" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "768353fee03e36d5f13e5ea8ca2cf0925fb5dc3c847680325a0961b78a3ed6c30859bc57de7b927cd9e782f85539c97183687755c31738e1da3cc27a08f52387";
   sha512.doc = "4fea41151ea197efdacd9e5756043b87500af8445769d0d0f69560cb94decd4f097bcdd52041706ada9b1ee7826f3c56aa30db473c472b1c74553cebb5231072";
@@ -14468,6 +15966,7 @@ tl: { # no indentation
   version = "0.97";
 };
 "gmp" = {
+  revision = 21691;
   stripPrefix = 0;
   sha512.run = "79ec2dd12610086eb5e7b582f5296fe7f1101c20b6d4edf10d47c5dbcdd506ff7c5f326af7600287a148031be060b3e8319d20d8267933b94b6c8a53e7753bf8";
   sha512.doc = "d3d4bdbc5b1c4618820247ec101e43c1c28b9e023e7613d5256456424fa95a54f23463ff1336f2586359a6078aa733de77cd7ccb892b367cdd00215ac7b67512";
@@ -14476,6 +15975,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "gmutils" = {
+  revision = 24287;
   stripPrefix = 0;
   sha512.run = "af0fa2ec7a3ce1414bf5d48d0bd8ce9de1b96b2bfa4f9c2babc6b27c52d11a7e5024bcf66938f3566cf6cf331b154f7eb4ca9d1cbe7109cde939829ea5be55a5";
   sha512.doc = "f1d6205f39f573b0c9b28f0ebca03b32e20e27c0be12adeb7eb23e12daf41a9590733270661aa29d6b8393dc87855f293437617cd8598f39082db8a33e9281ac";
@@ -14483,6 +15983,7 @@ tl: { # no indentation
   version = "0.996";
 };
 "gmverb" = {
+  revision = 24288;
   stripPrefix = 0;
   sha512.run = "18038202bca3493596925d9d7c65612434ccddde4b301134f1f57706e5d2978025fead598751e27a29d23f66ed12306e6092461aac1d9d921ce818b0a49cdfbd";
   sha512.doc = "6dfcc27b38639d4a97ed311bf7c6f1faeb1a023abc27d53e272f334b232a52aa0edc030b0c53d6587845da64097496696ceb03cbd6aa13c8ca5ac12c1772860c";
@@ -14490,6 +15991,7 @@ tl: { # no indentation
   version = "0.98";
 };
 "gmverse" = {
+  revision = 29803;
   stripPrefix = 0;
   sha512.run = "98692f781fead4dc292648153ca18a05d03f2c44174bce8b2f72e85fd1e98cb5ef0fb67c12f33dc982f1d04958873ea4e78f486fadb0c94544ecb66180ee52bf";
   sha512.doc = "7e37c0c2e8443aedd6462251f603e2eef9cbacc45d980d79bf42cdc64b7ab0a5d81f50ae65251c17115265c45e641a5930de640099f04dc8112155f68ce9adf0";
@@ -14497,6 +15999,7 @@ tl: { # no indentation
   version = "0.73";
 };
 "gnu-freefont" = {
+  revision = 29349;
   stripPrefix = 0;
   sha512.run = "c8ced8afc3b1b9108e5a4a82db54a9a28ac6ba5f4f379062b0d9d8b9724716ca98234a345c06c7d809b1ce609f817f0a9acba1ef8e94ecbf8f1301fd3bc9d248";
   sha512.doc = "3b7adbdabaf996fe8e0cff7e1192cb7f5984103398b22af6f859500a0041a0ce2ac0c70bc3f17abb7294ba80e34baa5cc77639500fa03f1a2c1c93548aa2a816";
@@ -14504,6 +16007,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "gnuplottex" = {
+  revision = 53218;
   stripPrefix = 0;
   sha512.run = "2a7a885bf212c0abaad8bf9f515b6d3743c09cb8e6ea21a3fa95132664a8724ae549d2d91a630783959b16c83b85bc54fa96fb281f827d33948cc9476c04a3d2";
   sha512.doc = "b4fc6a585bd8b86eaa5dfd6ed0f68d557e9905b5a0b8f6dce3aebf4b8cc1dbb7e588b9e73ce39055ae47ac56e837f882acbd10be94305272d47d29be7eda17d2";
@@ -14512,6 +16016,7 @@ tl: { # no indentation
   version = "0.9.4";
 };
 "go" = {
+  revision = 28628;
   stripPrefix = 0;
   sha512.run = "772772146ad95f2ebff85a2f3064615c26300a6a4050c1a6c7207d53e12b41477b0936b1c3d182f1c5db0aebd8499de19e0c23283c2bccf753addb2623dfd1be";
   sha512.doc = "c65516b11156d4fef5104a36cb361bf59be244555233cb5d9692892da06d3bdecd0b09866db136aec177a2bcbacfae6bb41c606f6b9da0329a00c614055905d0";
@@ -14519,6 +16024,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "gobble" = {
+  revision = 49608;
   stripPrefix = 0;
   sha512.run = "c2426530cc89a96c8a8e6e01c936053c9eb9c4a07cb46369f3dcf6d0d74557421b1a749a112f561f7248a34a46262fa0b2b52d103bbd8cfed720285383a5ff8a";
   sha512.doc = "1f4879234402deaf684312daf31abec8a9c36c04ec52ce9b48cf6b7358153b6feef328f2c4f704a2ac7a0ead18a87e35e3ec21d9e22b1a60311aac56f6b48413";
@@ -14527,12 +16033,14 @@ tl: { # no indentation
   version = "0.2";
 };
 "gofonts" = {
+  revision = 52366;
   stripPrefix = 0;
   sha512.run = "564685c341571d012c0ba80b44470c257714cb03644791bb4d0dc771a4c8234aa980adac503caad9defb0a6230bbb65c6aa552989c25fe59d42b0e623077b538";
   sha512.doc = "0ba8fe236f77ca7bb32fa7420a8c6dcbc1a493837c6fb78aa5f32fae80614c4e3a413aae9e691a33eccb747f297ae0c2e3dd3da9d483b15ed043aa21c0a01c74";
   hasRunfiles = true;
 };
 "gost" = {
+  revision = 44131;
   stripPrefix = 0;
   sha512.run = "81509f8eeda503dbb62d696adebf15c7f5fccfbd34d23ca8d83a9e7e2fa328c98fc1acd1fd99061c260ace3895cadae8138f0350027c6e81a0b52fb2735a0cf0";
   sha512.doc = "4a1a95d8647cc0e2b57f7815b4b06b7fd009e78a6aae701248f70a73825b394ff508a558a03386871d0a2ce22d43af81b677a2eeb3c2f2475a64a13d87493e51";
@@ -14541,6 +16049,7 @@ tl: { # no indentation
   version = "1.2i";
 };
 "gothic" = {
+  revision = 49869;
   stripPrefix = 0;
   sha512.run = "0c3fafd295fb087d3ace144df7253ff09fb3d79091dcd49003964a7ce57308cb4e86f3c3158a5e3d7e509e9958f77d5cc6da03fc41b585ec4ea397822ac29a7a";
   sha512.doc = "8f2495f3f9c72e5a5b01e17e1a9f80bae3ded97b902765dd2fa9b43ff87769a9ac2b972aa660344bcc8e29af3824985c49639477ee96213c0ee7d9d411e8ebad";
@@ -14548,6 +16057,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "gotoh" = {
+  revision = 44764;
   stripPrefix = 0;
   sha512.run = "478d51d4f8af849180d1e21ea21c6404f6eb1d13cd70d232f7002f62a588ed2de40e2950699c1bc0e5442069a957b05f3128430ef421311737cf55a6df868a12";
   sha512.doc = "3aa9837e81bc59adaba5b1cc3908738451fefe2645bf1422e0c6b119e4ff94ad85a7c2ddbae798e1e1ced95a530ab95b2f7a5a92da827c9f6d9bdc574b5f3231";
@@ -14556,6 +16066,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "grabbox" = {
+  revision = 51052;
   stripPrefix = 0;
   sha512.run = "d56aedb2c60216ff18af9cc2f2bce0c646545becf973c7d791db5a17cf593e6677c3bca7134d9d663e6826c249e0ee737128ff68184200f1cf7c09c308508db3";
   sha512.doc = "584d8fc20bb49a9486426eea0c7694461e904375bd9af4d0030394d65c1dae8d97451244decfe3c00a59ee7ba92a5e8b5fcfdbec6668cc1ee3652657b7b04330";
@@ -14564,6 +16075,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "gradientframe" = {
+  revision = 21387;
   stripPrefix = 0;
   sha512.run = "31612230548e2167c7f1d6a13029ecc202675d6ae3e681fd915d38aa116374214916155453616da51ef3dadab06955fcbfa9bc383f12b5008adaa8a60e24e6a1";
   sha512.doc = "8b010be9e222609d13015176dee4bcc196d953caf7a8c1814e49f9e50325bc33362975338241bd5cef27d59516114113bd5ac81e3dcc6e89ea7f4d53465b3cff";
@@ -14572,12 +16084,14 @@ tl: { # no indentation
   version = "0.2";
 };
 "gradstudentresume" = {
+  revision = 38832;
   stripPrefix = 0;
   sha512.run = "b66b3b8f7cf16f17758e4dae3bcd45f6e6e5cbc0dcfd6fc42f8dbc08abb572f16b96d5de4ba634b27cd16a1c4177bc62644d3eb5ac6060e66d9ca6d3f5df4eee";
   sha512.doc = "e7b166b87a5dce9941d6bd931dec91124a118ba127075aedbe70fc9fe415a8083911f90f094ddede551eef197baee9cfa4ab6ac65c8ae081cd8938f872ad7bb2";
   hasRunfiles = true;
 };
 "grafcet" = {
+  revision = 22509;
   stripPrefix = 0;
   sha512.run = "d322b1b45762c65232f6f66adcc12955d85d4bfddc08655cba8e11903f6403f2031a78d7e566f4d9b5eaf950aa8d2a53472038e204a1d18517c754c379c60bc6";
   sha512.doc = "b02bfb612cd5fd85c1839307a016bfc4c3d472ddbd591d1318bd7c5fcca42cc1200da07f2105ec429768cb0f9270273425b01df1242e475946bd37658e692f41";
@@ -14585,6 +16099,7 @@ tl: { # no indentation
   version = "1.3.5";
 };
 "grant" = {
+  revision = 41905;
   stripPrefix = 0;
   sha512.run = "849bb84949f2fc2f766556988eba540ed1a63ffe1d3a16279295cfcc772ab027dc1e9e5d55a9bf834c24e97a0bcdb04bdbfa653c71f99cf55ec3e18a83015a40";
   sha512.doc = "bfadcd59264fe3d3a6914267cc9d26c5bd6f7aa2061160a6547b04f448daed041d2c15633a61a246ea7808b778ff32679249f4c68e15b84e8502a454a4cec1dc";
@@ -14593,6 +16108,7 @@ tl: { # no indentation
   version = "0.0.3";
 };
 "graph35" = {
+  revision = 47522;
   stripPrefix = 0;
   sha512.run = "c9e2cb847614a7c21259b7b4e28ea1134d900049ca55da63990ac1f2c733e3b567bfae48de46b1e4b6b8faa9b4e0d4f9202bb00327ff33a899380dc3496214f1";
   sha512.doc = "21a04b52c476b78142239e3db4165267b51ba596c2c7a95b175f323cf1e78b0bdcd324f55f817cfd8b2b6b7434200b060b51165e3468ee009d295eed752d1e88";
@@ -14601,6 +16117,7 @@ tl: { # no indentation
   version = "0.1.1";
 };
 "graphbox" = {
+  revision = 46360;
   stripPrefix = 0;
   sha512.run = "d78f870b4cd54f7c6819413fd8acf0e3e1fe9b3b44f3b68ff3a20ad51aa6fde69c52b336b57285db1f6d5465204beb8a1179f918a71922889297cf6925282d14";
   sha512.doc = "342c9018116e80ebf3414358320df55e456581630e7e266ff868e6c624baec0b7209ad3895d3232cd0bf35a9677b8c3db800b7772606afa928ed3424ac16c71f";
@@ -14609,6 +16126,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "graphics" = {
+  revision = 53640;
   stripPrefix = 0;
   deps."graphics-cfg" = tl."graphics-cfg";
   deps."graphics-def" = tl."graphics-def";
@@ -14618,24 +16136,28 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "graphics-cfg" = {
+  revision = 41448;
   stripPrefix = 0;
   sha512.run = "e1015d360b56f63f1b9790daf16e2101e6af995bd1e45288ea604ae94e20196cab22e7e54d318aa79fa386123032a928be70a57154d409321e04f03ecf97ab75";
   sha512.doc = "dbcfdf635c2816f305205915119e1f6acba816c17b683622a8a32c361d75338376426b258c1fa3271abc1d7ad2a520ac85092a7b3bfbac6463106449bc906ae4";
   hasRunfiles = true;
 };
 "graphics-def" = {
+  revision = 46267;
   stripPrefix = 0;
   sha512.run = "ce101b28d6a62698636e03bb1f79ab7450552d15603e1d8df416b2fb55d397b3d696152c05e84e12415790b7e634322eeb6266435b0d9ff13fdac28ab164cddf";
   sha512.doc = "6c8d0cb49cfe1a5abf60a1473da509e34685c4ee2525a3d0e895b9513550842ed420d2bf6e949e8cbbaf543ad32e18fe1fd8434b16e46e2bcbd3ff7f50154e99";
   hasRunfiles = true;
 };
 "graphics-pln" = {
+  revision = 46363;
   stripPrefix = 0;
   sha512.run = "fa45e825390e1a7db1bde443e24a73fd84ae45c1403391bd2d4c944820a3bedddf388a29998f92af7c3c22c895fc2580f827808e84ca1ba334bf5bdce38f37ff";
   sha512.doc = "8df46cfbb8fd1a6c2b921030645f70795923fa21046dc209414fe3302f0c920cd47b432df22e0bd77574834dc67ee68fe4f307d79ccfdb95c1f8bcf0c6d5691c";
   hasRunfiles = true;
 };
 "graphicx-psmin" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "852b917dd2f4e4366516db9e7e22a6f34fecd1b69dddf687bd79b1dd995b1bb94c8372b85214e4d4c668a4a8d7d84a8c6e246a09e9d36937cec380c65a14c12f";
   sha512.doc = "7b2872618992fa6363b8a5a4e1d72f51779372475e7b7bf8ec3c5b9b571e77c1d80be42f2958d7c89ee4c09ce87f7c3fb76533010b0266d5108cdb89a81c49f6";
@@ -14644,6 +16166,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "graphicxbox" = {
+  revision = 32630;
   stripPrefix = 0;
   sha512.run = "032168dcdd5eab142cd6bf24eaccc3fc6482e3eba7e0fd2600322b4a6f2bcb1ceb8e30a64dd811b500af37c94e7de3ec25c60c437ba9afa7ba4d8a9af8b79a19";
   sha512.doc = "6fd432f48c05c486963b8058025dda2a65b5cfa87b6ae03581009dcdeafd26396bf16e04fecd0e68a896a99d5c3e09e43902bcfd3f58fa9a9b393cf64406e160";
@@ -14652,6 +16175,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "graphicxpsd" = {
+  revision = 46477;
   stripPrefix = 0;
   sha512.run = "b9a6cd054b8b2bf80372d1e4b7d8a29e1d0c6d0bf0b3d67d961e37ddb433a73678fbf99cc6f2b00d94e6111871b0b267b8541762b52100ee7ead3ebaa6257543";
   sha512.doc = "61d86c6eacc90a74a349eb52bbc7ababf6aa7dbd881a22ab39e06c0abdc6b8498cca525c431b2057245b294096a01a22d40c9dadbea91565b660f59c7b08120e";
@@ -14659,6 +16183,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "graphviz" = {
+  revision = 31517;
   stripPrefix = 0;
   sha512.run = "9065f2316f423697c8f815ddcf91254f22e44d89964196d971c3a42192bb1e20f9152c5a98375060daffbb295f8885899d2800728de31ecf60e1a25cf7bce31e";
   sha512.doc = "688f17db6771785753797edccd141470517dbb2ee875e2a70769754bbd314cf8af46b3dd89d5c340e7da7d81d86895894baa2b9e8facc0a54ad91cd1a3947722";
@@ -14667,6 +16192,7 @@ tl: { # no indentation
   version = "0.94";
 };
 "grayhints" = {
+  revision = 49052;
   stripPrefix = 0;
   sha512.run = "45d0736b5b600aa3ae524e0ff2471846cf48105464710fc7bb7f8d27326275d1accc63b5a0726c5d43e5af487207eba105e1d5e4f59913a1b27d33e950122574";
   sha512.doc = "85a6b8e44ec045ec00b7526f034e5b15d71fc8e439bfbbd43e1c8f85d4400318d8dfeee4bece211705c351e2b5afc9ddc89073fa14c1d90756bdf458d7b5b100";
@@ -14674,6 +16200,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "greek-fontenc" = {
+  revision = 53955;
   stripPrefix = 0;
   sha512.run = "4922c34492ad12bf9d60eaf8ea8b5c40dde4fcff13ed2400a059f2ee53f0e15481d96535db582a1439e52f0ab0541618ac52a8fbf871397c5cd197cf964586d0";
   sha512.doc = "ea33ea77cc01ca580494588e6cb00002f456859f9e698533b32e712184729d0e21d47296c594148dacd0e6adfd9349a5a7b533cea78316ac1a099128105bb633";
@@ -14682,6 +16209,7 @@ tl: { # no indentation
   version = "0.14";
 };
 "greek-inputenc" = {
+  revision = 51612;
   stripPrefix = 0;
   sha512.run = "1b3ad85dba5955a9dfb17d44a41db3e39c0d33920e1c36157e77803c4b2e402c6f7231c0628ad549c07ce7914f4a05c7da9369950b406270233d28f1a5adac55";
   sha512.doc = "42cab0f26d944da70ec3397946bf217155534f0def949f2a0fdeaf8c0dc30a5046447c5daa1d8e2d4fa4235cbd29fef2d8e6fa0c4c440c1ea58d1f2c4c2ab81d";
@@ -14689,6 +16217,7 @@ tl: { # no indentation
   version = "1.7";
 };
 "greekdates" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "7f350b4db9578f9020b28bc217e508574b697749c1d2e10c9de9c6499e26605da8334583ea7fb56d74bae77bc30e5835653014f5f8f594d3f35d04478ccffa9c";
   sha512.doc = "979353f7cdeb127e12388e1eeea4903a929d911f6f8fd42cd814b6cbea09a64d0ab9c8118968bf218330dfae64f9147621d23d2955fb85291f484d0b5eb92a00";
@@ -14697,30 +16226,35 @@ tl: { # no indentation
   version = "1.0";
 };
 "greektex" = {
+  revision = 28327;
   stripPrefix = 0;
   sha512.run = "d7aeb9640061341ed39a71f7f69036f892bbe60b9db2236660e163b42fede81d6be58627b0163d3a183c120c9c8fa54f91a1a036ed9e50d2a72d5eac7f8a79a5";
   sha512.doc = "b58305d403a58a60ac0cd6ebb60afe3058430eae15774895e03e41b331824673c128c5f06b583525e2311dd8ee5166549ea831e756e8c934c73ae911a0adbaa7";
   hasRunfiles = true;
 };
 "greektonoi" = {
+  revision = 39419;
   stripPrefix = 0;
   sha512.run = "a19dd42de4bfdc3c068169bbf32c55fbd76135a8138d41e0726b421d3cd5e20483f77d7b78f85e54571381f780568f1fa1ebc57d23ca460b33e4caa256c4894a";
   sha512.doc = "94da0bcac7b513fb9f720c0bc6d7ca8d822956b1517a95335b415e477d3144063bbff65d57978421b6b9611c6b4a866701762cbb2ab09351fe6c5d02e4b02f39";
   hasRunfiles = true;
 };
 "greenpoint" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "2ab6b0a9d12c12936362e9e1ff387c393bcd2e9769357dbc74a5d9bcbbe027424f5d58d85d608c2c519d615f01e6e809f6192280c8c60aa53fb8d96dcbdeb8dc";
   sha512.doc = "84143440a421999f0a59461652be21d49d8ace66fd3b8d9d89132c6f06f67ef4b571522d6ed54d87f614a15dceb99cdf4c3caecb54eed9a4bbf49401de20ada5";
   hasRunfiles = true;
 };
 "gregoriotex" = {
+  revision = 51029;
   sha512.run = "b27e105c26022f7a9d04d4990f83ed6a73cb92fcfde1698c4be81faedfbfd67730d4957db1ce5b865820cf714072c842b85fc698dfe6cda0bdba100b3d4d60fb";
   sha512.doc = "66e5170d2084c01b2a9cff2ec344322e1b76942d7424ca75306e7163ffa592806240ae0f1dab176053753dc3dcd2ea7f0db9aa9afd5d7dca8200e593b2158193";
   hasRunfiles = true;
   version = "5.2.1";
 };
 "grfext" = {
+  revision = 53024;
   stripPrefix = 0;
   sha512.run = "a5f68f2bb2ea26d4b8f963a1b8fb8adfb3bd32e3a139dca57e6b45d80fcdd94c5e846549b1292224b9d845fd6a4d0ee56d4c2d2fbfc12c24806eca8551b9dc96";
   sha512.doc = "4337ae578d9e524e2da8564a1b736eac1dd50c1e4495d027c44f3841eb65c6c494527109e32f00844c17a5973a94572569a429ceb95beec98d2b19e84735eaaa";
@@ -14729,6 +16263,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "grffile" = {
+  revision = 52756;
   stripPrefix = 0;
   sha512.run = "3f1f5e4f258e4ab1f51fdb44fa0b49e80df21a6c35dccad16a6b70ad76489cb4fdfff7e6c4dd07821c54543fdaeecae32cfd8037d4920ce60db02be9a2f8fa07";
   sha512.doc = "2f2285ad44d0c585cd02b85359eb31f885f7c704f6da5f906240c1094ef8d347d33ba6beb31cf34e09a5e39e618a27a7ea263a63d6a887638d8f761e3cd4b61b";
@@ -14737,6 +16272,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "grfpaste" = {
+  revision = 17354;
   stripPrefix = 0;
   sha512.run = "e7c28c38a20e01b05c5839dc7d011ef5769b3344fd4321f68e1189a830a90e6ccf9edd596e248489a0a578b2aa4e5e5f3bd1ec21c76b3dba86a91d5e431d0617";
   sha512.doc = "63719b8f7904baccddc9e68d1fc7d609453b2eb9feeee95bb077b82d1345c40db7a92c649c3d9abae6b9c2e19090163b6a227418f4d9d4d91b1e8b1c0438005d";
@@ -14744,6 +16280,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "grid" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "c8a6c0d6ac1f6043411d5484c87877a939d891aa3bbaef31248f8dc04f39bfc5f7f13344ab2997724682f228f180025bc5afcba8712ee95de983d7182785a8fd";
   sha512.doc = "9fa0fbf1dfd0fd334c9dd57f50e6d1f893a222bda6402345c70240fce48ea07065fa25ce890fda77983dcb537c8b3b4740cea71ed6a6b4b94275f1e2bd8ea983";
@@ -14752,6 +16289,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "grid-system" = {
+  revision = 32981;
   stripPrefix = 0;
   sha512.run = "b9846f467854538c488ae444645fcfb962c1aece34e3847dc3dfdd4a2aadf8339840c09243448922ce184f6211bb3b95c6fe9675b5bae0e3b3756b2787e7e87b";
   sha512.doc = "659b426e99db9152c64f37a4c977176ce1a24c324465399f3e481cffef505044aa820f1a445a79c68f069702c07082d3d5c73c5fa762068a44acdc21221cce68";
@@ -14759,6 +16297,7 @@ tl: { # no indentation
   version = "0.3.0";
 };
 "gridset" = {
+  revision = 53762;
   stripPrefix = 0;
   sha512.run = "296200c463b67ce45fd7c9625298b5e0b83b730055830b3affcdc0c329a2ebd5f89c5da93e004b056efb63f8e43771824c7f0adfe435461943cc68aea4bbc480";
   sha512.doc = "54fd48dce732ee11a7279eb663bcadde958f2ec9d3307194000dae2ced43f604a54e44174ca36dec389c9ce8e5e0809849b5c66aebd9527337ea3273353142aa";
@@ -14767,6 +16306,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "gridslides" = {
+  revision = 45933;
   stripPrefix = 0;
   sha512.run = "222ba30817fdd016d80210e25300c925fc45f5a0e5eb02d569f8e709ba578a6ac12aa3f2ed16e5bd6fea3e4b4ffd2356a046a27445e47f79bee9be93ca5aff96";
   sha512.doc = "6d8a2f2a43b7e0b6232aabb78b25bbbb2f256e9afd54c704b818958496f7ea7b38a2741a60b3d2f3f7745431c302a7106ee015fc18d5c50349ad3cce375789ff";
@@ -14774,12 +16314,14 @@ tl: { # no indentation
   version = "0.1.1";
 };
 "grotesq" = {
+  revision = 35859;
   stripPrefix = 0;
   sha512.run = "30d0d52c98f44945ed40f45f1e73ed60e6b98a8a74dbf57cdae5c2d400ef613f8bed2b89b3b6afbf7b98e449738f637911dc1becf0c0dd33c21a23ecac9a9767";
   sha512.doc = "d41ae946f315d87b483a03d8b5a1034706f5bda765c69fa692f117b79bd5046b409e42c7b17577ee086ec98795e8a93acd761e30815c6083520b4bd244c33cd5";
   hasRunfiles = true;
 };
 "grundgesetze" = {
+  revision = 34439;
   stripPrefix = 0;
   sha512.run = "2fb5c03a405e29d27c929fd3970af300df8134efc584a52dd088adb6e0678979af7c6302cffc590b2471a66e13399f628d257f298f1ffb9689d8aa1d268b9438";
   sha512.doc = "cdf228d38f34810d543b0e5135acb75a8ab12de7b706bda79f2abe9b6cdcf1e7c7ccd3f0ddb7cc4cc2560f5fb06c06eacdebcf06af89500953812f2e7a0c8285";
@@ -14788,6 +16330,7 @@ tl: { # no indentation
   version = "1.02";
 };
 "gsemthesis" = {
+  revision = 36244;
   stripPrefix = 0;
   sha512.run = "7debd75f882855b45665937669a3869a9268d2184b22da3d344a4a6182577aa8bb440a6f4e48123d359c23b630b61016331cad94f4a08acc3295dcfd722c40ea";
   sha512.doc = "41ecef19c29f63970dbee2242fcdf612b7619a6930002d8be03f4116f3397a619951f2f19a79f0e3772f17005847ea5a6a20a91b6ba9dc3529fc4e84dbf7833d";
@@ -14796,12 +16339,14 @@ tl: { # no indentation
   version = "0.9.4";
 };
 "gsftopk" = {
+  revision = 52851;
   sha512.run = "cb9aebd7428d10b627d80ea40d297f3e6de006859c7dd713478ff193458494f90017ecd0737376ac1f47638b059e02e8a46ea53a7c56b8561af75f770e214413";
   sha512.doc = "0a597e2908438fc00fc2bafa7ec635a82b70aad9d7f7e86851a654c0b72b719b8c550be0c20ecf6c8d96627863a48e6a387156ad2c7e71d1e296dd4937d60805";
   hasRunfiles = true;
   version = "1.19.2";
 };
 "gtl" = {
+  revision = 49527;
   stripPrefix = 0;
   sha512.run = "cd1c08d092b11423d77a87a5fd7cf4f62290aebcfd6a99b12dca957e075d0b26cc3c482b45e5083916bee3bb6aff91940df375ca4b1dbcbd9fc37a31d8709aeb";
   sha512.doc = "2f41bb930e46a95d5c7acb07153e5d874724ac009b2741f6f2e62a9b56165b5e2cf06cf8c89cd9c1fc42a1a93babf6761d0a48b418ddc0a0f5d38e9c2f31f175";
@@ -14810,6 +16355,7 @@ tl: { # no indentation
   version = "0.5";
 };
 "gtrcrd" = {
+  revision = 32484;
   stripPrefix = 0;
   sha512.run = "dabadc0fba92f6da23830069e533e8d4fb234bb679aa355382c03bd3ac13924328ea8fcece3186f36d33b7d7f6cceaebb23f1158b855673160f183991e880796";
   sha512.doc = "d8e715d1c4d9c7ebb0c34c690a82e338733501012ad19cd9e2c52e6b39dff352a4e042bdc5f54e63a03a38eb9c76b5aed2ec3afae88ccd63f56663ada32e828b";
@@ -14817,6 +16363,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "gtrlib-largetrees" = {
+  revision = 49062;
   stripPrefix = 0;
   sha512.run = "320b5993b676d803b235d0a10cfbcdde966c3e9415f164da6f45dbd2f6f201750b84cf9dd8ce5383afd92c72acd35aa8a44d0c6518e359615b5b2009e772bc6a";
   sha512.doc = "6558466d513a94cc98e5fe97d5e3bc89f518128dcfe411e27d0af171716545557096a6cdb103511157f0cd93540ea784f97d688ba271d9b2f1918f11608bb437";
@@ -14825,17 +16372,20 @@ tl: { # no indentation
   version = "1.2b";
 };
 "gu" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "243eb6ca0af62518d60134a8fa66f91ab05e39c96fa9c0ebeb2232d27f46679da0a634b64273608028bef7f80bfaaf049dcd9f0cd935d5f66b0d5054b2d21a20";
   sha512.doc = "151f9765d6da2312a10523ffca06cb4e0529d4ebf8189e9ddc00f86510c9cd13be9a04e47b85dc8cd815461c17f7e4b8be9604a1a605c86d7228d1113f985a23";
   hasRunfiles = true;
 };
 "guide-to-latex" = {
+  revision = 45712;
   stripPrefix = 0;
   sha512.run = "cc569e242b42361e6506144257db1109f1adee52915f361ed330699edea1895b78ac64488ae8b9e2224bd3baab01515be86486113afc1ed9b072a400ca736695";
   sha512.doc = "bba47b9a9e5223e558244029e258835a865b90824c7069287f0c996a36c4fb78d21e62e88e52ea008dbc573e7a4ea34843a646eab11d8377a5167724286c397e";
 };
 "guitar" = {
+  revision = 32258;
   stripPrefix = 0;
   sha512.run = "fed7be24d0bff6d2a0022374e4cbb60cda508b0f99a5a96d59060247aad561c1124728f00a6d0a51b3b22f4490c6153df740a5e9d8106da23c85bb18db385195";
   sha512.doc = "4a2012e693257c2bdb4daf46a2402882caf0c8efbc65bd6679c9eb11440ae75f09d31369839f84312bd1028207d8aa23a745847be1e762dea977ecd7f73b4a87";
@@ -14844,6 +16394,7 @@ tl: { # no indentation
   version = "1.6";
 };
 "guitarchordschemes" = {
+  revision = 41880;
   stripPrefix = 0;
   sha512.run = "3d4506825043357708cb5fcfee6ba7d6cc42fdcbdbaa772628bbcc89381afe40c58bebe9ad01343b96f3535c80c217bac5b85d5079d1e83a42bacfec995bbfa5";
   sha512.doc = "ae3e21f74e66ad70a60403c8e9a06e747b770af3e586ee580686095fce8b405801e9c4d1bd59cf429defff61fb087974ce305c5fade387d5be10fe47be46e6bc";
@@ -14851,12 +16402,14 @@ tl: { # no indentation
   version = "0.7";
 };
 "guitartabs" = {
+  revision = 48102;
   stripPrefix = 0;
   sha512.run = "a4866683cb639b63d455f40da2ef58ee4c69d0e29e5071437a07922a0a45598677557ce609905dd8fc5c3e40a98bceb9a753cf4506342585e6cc2c37fa591271";
   sha512.doc = "ef5f516db586d1473d949f44a2eb9fb307b84ea5a7dcc3c9419298203b41c54ff4dad75d3b24cf30fbc24f4c60ad4b79b9c1fd58804667732a66b0ccb52cc3b4";
   hasRunfiles = true;
 };
 "guitlogo" = {
+  revision = 51582;
   stripPrefix = 0;
   sha512.run = "c4fff100ff6eb6c73607ce83ec90057a47628d0d354f24176be02c8e9e4f62311c466cf7d8e7ec27787fb83a4c35accfe06d01055ad1db2189c82b9a7277aec7";
   sha512.doc = "e60d42b6db1db84688fbc657b854cb17f60657c22e296d13677e462b39090c8e99e83b86227ea65fe60dfb7616619f0459aecdfc6c6725db68567f458d0a4308";
@@ -14865,17 +16418,20 @@ tl: { # no indentation
   version = "1.0.0-alpha.3";
 };
 "gustlib" = {
+  revision = 45712;
   stripPrefix = 0;
   sha512.run = "cb91f48e66063c784addd1a208946343cdaece3ae0d28d3eb697add3bf16d82b7d01535018984434a882aa5d1901cd05ac68e0966554b77f4a2feeba933ca880";
   sha512.doc = "0a472bcba101b759b0864c09fbb28fd7473e8382e73cb5c2cfa8fe97f075a9a0ccba1603e0b08bb17fc10faa53907e52d78efb7ab09a7d5cd06bf1e17d82a1be";
   hasRunfiles = true;
 };
 "gustprog" = {
+  revision = 45712;
   stripPrefix = 0;
   sha512.run = "597abdd6c2eec380c531ef7f89ac0d2fcce6e33dc2d2c5040a58b5da3bfbdf2dc75cad926291c94ff1207a47e66cc213c7b7f76890495aa9ef6466bd830caace";
   sha512.doc = "7817b203f9722409f10161072096dd410d34c2d84ee0ccf332d717c2eea0f408c76597fccea18b6022088cff0155433f77d085a8e8d5f28b72c4c227f578cb0d";
 };
 "gzt" = {
+  revision = 47381;
   stripPrefix = 0;
   sha512.run = "7e0f493dca3e9916f28509b94bef393e8ff7be95f55e8da937b4922139ae77f4f4197586c3bff343f1fe1d22dcb4a803e2d4a3a115d201cc0f2c5fd71ba8a836";
   sha512.doc = "388aa99642bb838ae4a81a665bb90019c6e31b3aabefbc2c49396edc98d8fe2d00986023699b849162a69db6e6dafff26602f61540758510acb1aefcd883c4e6";
@@ -14884,6 +16440,7 @@ tl: { # no indentation
   version = "0.98";
 };
 "h2020proposal" = {
+  revision = 38428;
   stripPrefix = 0;
   sha512.run = "ddee9c5c1838bad606f212c1a7ebb7ac4d7ae571f1e29e83d55744dd50afb55e302f4f20a3cedd0d4446886cfa515371fb913b862d4549618858896de2a543ef";
   sha512.doc = "5ffad62ed8eb39c8cf07d4840983990009e5696a2d7714d2cbab13a69c77634d01f10a18f612c853a09dfd91ae1ea453bb3373681e89a6994ff4924dd64c3093";
@@ -14891,12 +16448,14 @@ tl: { # no indentation
   version = "1.0";
 };
 "hackthefootline" = {
+  revision = 46494;
   stripPrefix = 0;
   sha512.run = "223fb22b01327fb63ff16684d578f89ee583d5c7700dbfd5966aa8cb94ca4e280e4409620b0d261bf2a80a57f51658990b0a221c0dd311e3eae1f39d459e8098";
   sha512.doc = "960c6a0bd61210b097710cc6715012e4406b54dafcf070659228074598a05e0dbb65669ef77c3f6ca2cf80001e95c5f801070be29d416d2bd552d6c2a1d27f56";
   hasRunfiles = true;
 };
 "hacm" = {
+  revision = 27671;
   stripPrefix = 0;
   sha512.run = "6f4373f4e30d95c747ecbec45c53a9af23b78acb84a063dc0b2d4d5ed218e7c5f70d4f29817d39f6cf62cacc455cc3117ced589d41bf3f321a6f9d882823164a";
   sha512.doc = "bb6d5cd50e68ce84abd5f7296d8216d929b772f30e946508ca9bad2ffcd8d077d1927fcc76a5ea2e338799109b34adc8272f9f7f6d316f5af1312070f57fcc3e";
@@ -14904,12 +16463,14 @@ tl: { # no indentation
   version = "0.1";
 };
 "hagenberg-thesis" = {
+  revision = 51150;
   stripPrefix = 0;
   sha512.run = "a8515fd281f726029f3bcc170f60c8a98447d8e16cb64ad787fdd5576ab5fb58a077666f191a02f46608e1aaf84bfcc8f1064a28e00c77f62505134a5508be28";
   sha512.doc = "e7f1ff1c796b7ec2dcd7758a46149a20ce3d33fa6bfc3dc93a0d7dc4832e4f4692e1e74037c1f9e990a0245fd6cc5791ff998439ea6604519cf40bf463be7476";
   hasRunfiles = true;
 };
 "halloweenmath" = {
+  revision = 52602;
   stripPrefix = 0;
   sha512.run = "1c897f5582e26a42799065d9b105bde3ab7823e9320912eba72654d00624a3796f468d9138fcd47c32e021b31bffb1a618f3ce0024ce753005236a9e08ed05d1";
   sha512.doc = "aea1397af446f64f4d8bacb03f0f2d211a44f0f85d93612db840f198a1ed894e1b0a3680005a002808fbe5b8b367f8a8d79b9b99908a4be0891c0d5b43c730e2";
@@ -14918,6 +16479,7 @@ tl: { # no indentation
   version = "0.11";
 };
 "handin" = {
+  revision = 48255;
   stripPrefix = 0;
   sha512.run = "361fa013f1932da2370ccbd67e70acaac725349e4fd4fea28a6b676a5459aa8ce8fbc1edf42f3f3fe234e12771c5be8bc463ef758f823a3b43fcb7191bc1a660";
   sha512.doc = "cf91e16a8f04835a47da1a5ccb31711fd9317db557f0152689a93c4f58de33c8e7c8be1f7c5d9eac599bf8dceab3f4d3e84831efd0612a58571d3c71f508f20c";
@@ -14925,6 +16487,7 @@ tl: { # no indentation
   version = "0.1.1";
 };
 "handout" = {
+  revision = 43962;
   stripPrefix = 0;
   sha512.run = "9c5da5e16df3bfb4eee1ff7b8c6881e7faeba7001fd7f0ecb8b3027a464d611149c8768b8d8853c07417d67a723fe5b1de19620593a177139241b47c7a814285";
   sha512.doc = "6da7783c7a0dcfee168ec4ad6924fca636ccb5fc965e326d9c38ff31c9d2c7942a820165232e4e89b7c1e4857e81952156198de55d7990ba01e5abcd4c31bfcf";
@@ -14932,11 +16495,13 @@ tl: { # no indentation
   version = "1.6.0";
 };
 "hands" = {
+  revision = 13293;
   stripPrefix = 0;
   sha512.run = "77c1742d045110ee4da7473b14c1804fcfab3772ae10223848fee99c7c8a8fb3809aabeb82e4c99460f3cfa0e009ee8d470d60e8be4c79c25c3ff990b7d1595a";
   hasRunfiles = true;
 };
 "hang" = {
+  revision = 43280;
   stripPrefix = 0;
   sha512.run = "4a8227707b6878ab010b595296dbc96f0b31489dfc0abf0116e00d6b0acf54e91bad1ec182169357e4a2e1f14ee27afcaa23bd35db1fed7e4e972e66eebee042";
   sha512.doc = "bb0af0db38793e12dbd8d33e2df613d581a1809e0661138a3e75cabac1aee2aca942aaa429678a817f487fda82f3ffa3a631d98c3129853ba6a5ce4175346b09";
@@ -14944,6 +16509,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "hanging" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "54bd2269c169bfe2a28513354407de22948658e8067cebafa3a3b3d88040acc318f3f3aa375798e36bafacecfa10c4ab5500095b92328e6cbfc12a541a8a7b3e";
   sha512.doc = "a1e7e9d0d5b85e43ebd7ad88b39d6d5629807f668040041fd1248239c02394cf3c51aa676065c1d1d9e9ba8d1ad20f00e46d25025ddc0db7ec15148280a5b9c0";
@@ -14952,18 +16518,21 @@ tl: { # no indentation
   version = "1.2b";
 };
 "hanoi" = {
+  revision = 25019;
   stripPrefix = 0;
   sha512.run = "efc8c4892ea4cc8ae395907fc428fe74d535d689a68b3b21422c5c944d4defd57747e519dbca9bd2df2dd010b99e3132afceadee36d547fc11b04480147626c4";
   hasRunfiles = true;
   version = "20120101";
 };
 "happy4th" = {
+  revision = 25020;
   stripPrefix = 0;
   sha512.run = "45492a6becc7496ec6ca6adca474aa141b9c68b06aeed46bb1459f15b6cd1df9e4e2de3842a91ae0121d83269c1fe4f772418a93da67031bd14b6649f3a80657";
   sha512.doc = "78fe311673e370b867ad209fc1c62acd7aeb515e4b145bb7c487d30c121715994803e6dd540bcbf1b9b0776014327c7ca2f6c03437d9ff0b40f477ebff9cf254";
   version = "20120102";
 };
 "har2nat" = {
+  revision = 17356;
   stripPrefix = 0;
   sha512.run = "b3e76b7c4a3a241f716de344481c9927daaa73badc2f40cade074402629cdb3ed02568d9cb3d6276b0abd59ddcb34254fda419f859633281870ebc394c4a5a14";
   sha512.doc = "927ff5d03cb3559dcda63aa2745958722ab9233c58e55cdeaf7e1c441146991d3edca9c3a40fae2cc147e5e69d0c44c0d357ed37ef0e02bea41952474b36f88f";
@@ -14971,6 +16540,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "haranoaji" = {
+  revision = 53810;
   stripPrefix = 0;
   sha512.run = "4c137f99d91640c805bfbe9555de08ad1d5e8a2c9aad32d90a3061b8408c8f5cd05ea41150fc09813f02ffe401f517e6cbabf4b5eab4d793b9324e3d00dc2b44";
   sha512.doc = "5b3edc1a1db549a596cbfd383fc5b8e27d7d523e7276e2a79a7aa81f87314d0586b9f4277bfcf79a4c44e2202c80dfec31266384f9f15cdccd14a251fd6e207b";
@@ -14978,6 +16548,7 @@ tl: { # no indentation
   version = "20200215";
 };
 "haranoaji-extra" = {
+  revision = 53811;
   stripPrefix = 0;
   sha512.run = "0f5997b425e157a5b6ea8a4202150c4ee1d696d6ea956c990f249df8db2a5ecb82f4ca25228905ef2b2ded38f13a9a1c35ae444ae9f2f60f189e293947349ec8";
   sha512.doc = "d3eee236a541e1b20572d8f3386ea9d9dd630f6c1cce638e5afde8291f8cea16cb9e3ae790f09d71733405f8ebbb2de0e7a251b5b09fa48bcde9acdd988126e2";
@@ -14985,6 +16556,7 @@ tl: { # no indentation
   version = "20200215";
 };
 "hardwrap" = {
+  revision = 21396;
   stripPrefix = 0;
   sha512.run = "eeb0f1da2161dae80d292db7b3289a307d892b8967ecf16021b8ed73c5fe724d914dda356bb8fbb48786760698e0060b39349b51886e13289524ed9d45463106";
   sha512.doc = "6dbb83fc5d4b82d11bc8d97d0ded3bcfe583c2b21ec2a260000b6bfb0bdea9c10df834735ffdcddfa9785b7c86b53920a20146d020b0435b8dc04610f05b9b16";
@@ -14993,12 +16565,14 @@ tl: { # no indentation
   version = "0.2";
 };
 "harmony" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "25e84addf5ac4c67985e1e433f795f377accfdd4dc56eae0ffb25ddffeb52e0a44278ce1a936406105ff5b7e9541452a103e0bb4ed91b8949facee75ca7c11ae";
   sha512.doc = "3226831df9702b669ba4c269549927563ae321e8e10e0e41c6bd1a8d6522dcdaa4ae6a25a907a84cc1dc324c516a53754c81a0e1296fd8e3afbbb29f0992ead9";
   hasRunfiles = true;
 };
 "harnon-cv" = {
+  revision = 26543;
   stripPrefix = 0;
   sha512.run = "5acef7bfd07f896f4251fe922cb96f71e9f289205eebfa83dd6aadd241f20eec5d9ecaa3d70d6df3dd61fbe7523f568407d89b7c32c27aa719a6f97b89f4cd33";
   sha512.doc = "1a8d96a152f9ac90f3a6e546c03652ebcde8f8d88a7282626d44177854aa41ec1c66eb6f4d787853711b80935f5e3e3c31d726d0e49d60841119db7ae278de96";
@@ -15006,6 +16580,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "harpoon" = {
+  revision = 21327;
   stripPrefix = 0;
   sha512.run = "1894f54ff9eb98975f4eec9250a382534a0ede5312b4b540223d298a0fe5d7d8d24abe2018d07b30773e14bacdd97b60039a458fd274bb446aeb2e26b91bf96f";
   sha512.doc = "4d69050cd2a7c57219a7c55e8d97656fe6f130936d2e79a00d3760e9139799cbb98db2f338586b65412402069b22971ac73e5b722a3911bf1402625dac3e7d52";
@@ -15013,6 +16588,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "harvard" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "64781bb5c419248934f259dafba2c43270396a1d3f49bb9a79050ebbb5655a5836a07fd69720f54f009501c5294a62f344f6b6c76adb89114a8c60d1e149e612";
   sha512.doc = "291c2a530da6d24ecf1a87818d27b6141e99944eed10cc2dced2537f30ecfc12580c2f58d01245ef53f7d2b803853ce9bf72c03f8a2c3267dde0f4c799a991bc";
@@ -15021,6 +16597,7 @@ tl: { # no indentation
   version = "2.0.5";
 };
 "harveyballs" = {
+  revision = 32003;
   stripPrefix = 0;
   sha512.run = "c282249d5758f6c8aa9dfd06cc4671211e76adc2e7c4f5cf925e713472e60f3d44c8a389c9ab4db5b8096336d46d99b62bde0f8c1f9fb5d22857e3cba98994e0";
   sha512.doc = "89ede2f13e82600a2e78047a08766e99879ef5c64dcbcf747a2c21b1a395f4c1a1184921a8a0064b15b86f574834f602870f6641f0f265f92dce506959c6c4e7";
@@ -15028,12 +16605,14 @@ tl: { # no indentation
   version = "1.1";
 };
 "harvmac" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "7acf7eb52104bab80b0b9995cf43cac842c106b8aecdff8245b0d1ce8440823e65ead75e470f00923764eadd32e936e02192ec7bbe70295ca254aa57f9b5f662";
   sha512.doc = "a0f3308b938ae73c66398c5a3140662240603248cd6fe338a22f3ca6b23f28789dbccee48dcd94a8bf84de029ec103aa35c5b9a78151ceaf61a9cb60b832c484";
   hasRunfiles = true;
 };
 "hatching" = {
+  revision = 23818;
   stripPrefix = 0;
   sha512.run = "71983591270b533a6824a836948fdd15d19c3f966c8277d8948b13c5f38b29c29c0b7fe577661f1ecc570dd71d89fa964afd254d50556b6893667cda95e21aa7";
   sha512.doc = "02c2eb4991aa9775feec0846eaad9ddb74123a64eba8a3731c8e40c689844e542793e0f6884df8666f3cec2ed43af26b2d25254cd0536920c6ff0b107f35bf5b";
@@ -15041,6 +16620,7 @@ tl: { # no indentation
   version = "0.11";
 };
 "hausarbeit-jura" = {
+  revision = 50762;
   stripPrefix = 0;
   sha512.run = "99fe789073c76535c9c8a307289bc29b14b0b7a45adf01459d76ee67099d56c9cf36fbe3587b108c99c1563cf077066ad6408955bd55f31cce6b4e53bab378ca";
   sha512.doc = "cd98eab62d47ae03a5238702ec5a246496880e55dd8a1a9913b3639197d0fe65d607317d9cc9cbd578bca6bc64babc80d257c2f8d84b7327fdbd77537ca1f660";
@@ -15049,6 +16629,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "havannah" = {
+  revision = 36348;
   stripPrefix = 0;
   sha512.run = "f19498f0f9a7ce349fab4291fef80ff2f2f9eb88c60edeb76174918955fab51f22a0d06b533112e594c0f4cfba23feab58c41fe75e1c4fa2fc4db7cd9f473d0e";
   sha512.doc = "ee1a90d491debac3f22f470e5df79e11152d153cef97e8d2e38c5d8a60a1931384d65bb91a6d459e6aeba39741763fa67d589bf9004efc5059699ec621b99e43";
@@ -15056,6 +16637,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hc" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "17c7037eb04c1d0064dbb637f51947243d1b8f07d46245dfb8f2a38a1ea068ebe41da7e2346ccedf02979003a0a2fa0fbd25eaebf7847b266e21b7c873b032d4";
   sha512.doc = "18aaf579ef82a11ea1e752524d9a04a4a0aa5d6cbb496bde380664723dd30cd421c77dfba1ee6bd88def576c76e202b328198fa6dfb4a9ab451875c3753a515b";
@@ -15063,6 +16645,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "he-she" = {
+  revision = 41359;
   stripPrefix = 0;
   sha512.run = "726954216d3f8328eb7868553875651c2dbc3f626a9eb60fddd770b0e236a4e09a45872020589d8f263cb9f39300d1743e0a35676947752f33933db1e766411d";
   sha512.doc = "580702222de769b066b01af45aad75717d11f46178a2b1f19e0bdc85b67497d9aed8b7ad642f76b8b85c5513f4921f58af8bcb80d1fcb88307f8ca8b07c8307b";
@@ -15070,6 +16653,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "hecthese" = {
+  revision = 50590;
   stripPrefix = 0;
   sha512.run = "5cf62262cc231f229c1a66819e620fc55f798d8152b09434c0c288610a59a6ada5a9703e903b7d0fe761f1197757a1594242fc181928f6c6a5bad1c3d7dfebde";
   sha512.doc = "3d06c52646c4985df8fe71bf07ae0f5305dc719c03025f1cbaf511b1c1de99e02f381740cd4f1074f0fd4b211a16575dcc7c1def28d9d75e615dc1d08d5257fa";
@@ -15078,11 +16662,13 @@ tl: { # no indentation
   version = "1.3.2";
 };
 "helvetic" = {
+  revision = 31835;
   stripPrefix = 0;
   sha512.run = "db1921bbf180287cb735ef403948585a91b3d84fa0cb5c99ca1bd06db57632f2533f40d0b7aa04c01664ca7898166482559e130f375a85242bc44f362079ec8f";
   hasRunfiles = true;
 };
 "hep" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "9cd27826b7dde1ebd5830cdd17423f4092c9833c962be7e73b515de2e624a7853badde0c244dc26be6b7d3d9f9c3932fffc48bb4e86e06b90d6699dcebb0d497";
   sha512.doc = "1d77a9bd31e982a8ff908f772d8cf67692145624bf00db2745afaf1aa59fc1da7cae6d2e094379077a550e4d76338a5a82bef8e25c8d733547751a24c84035f2";
@@ -15090,6 +16676,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "hep-paper" = {
+  revision = 53393;
   stripPrefix = 0;
   sha512.run = "3b0378e1ee99a8fbda42713c61969c967357b645745959a3e7e3a8a182789b2f2b1855cf13eff2fa9f0c4830b1814bcff52e2503f4c7c289e7d554775448909d";
   sha512.doc = "5d9b52511d2fdcae8f16c0c9eb0cb4306f18c06e3a97c7a1b3b9246d736f823642bd0e7e178ae4f379445fe0dc55f6172c5c4ea4c7740d94b79b4fdf6b32bd60";
@@ -15098,6 +16685,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "hepnames" = {
+  revision = 35722;
   stripPrefix = 0;
   sha512.run = "ec893de8b4cedd1b18dd16c3237fa79b434e91cbab4b856c4fbe11afef162b560bda18c0fd75ab2c47b863cdcca1d64809a139d51f04e9c2f45eab6ba4036c28";
   sha512.doc = "36a0966b755b6bb0f0dd27c80235e66af7c5252df1ae27652e59fd65fc5f280eb487666eef04206813438204dc592c0295651ccf0bce1e5f85f4797cdb439850";
@@ -15105,6 +16693,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "hepparticles" = {
+  revision = 35723;
   stripPrefix = 0;
   sha512.run = "fb9229745b601b6f731c959856fe46d6871dd3a1c7fec2bac8116f4d74a575ff52523f610599979e25e7147b4ae6d36906d19ba66260356f15bc1a47a2d57460";
   sha512.doc = "539025b2f0998bf031f417d002028e29edc58c1818d0dc9c07ee58c6877b5709936be23985ecd5a518c36187f451a2d5df66b5832d0019ff8b755c763b903aa8";
@@ -15112,6 +16701,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "hepthesis" = {
+  revision = 46054;
   stripPrefix = 0;
   sha512.run = "ea6543fec07480af8db52e43ea5fda346ed4e9ea245af0810a6988d864675a903841849e502506b333cef0b1685a6946ebf1f686bbc74f4ddcc7eea676c019ed";
   sha512.doc = "e456a0ca03da4bf71d767616a140b6e1d922e05944a4db2c0cbb360dff39fc7e8bae741ae5adb49972253f38774f1a9c65393bcf4e38e3c568b0215a04f63d48";
@@ -15119,6 +16709,7 @@ tl: { # no indentation
   version = "1.5.2";
 };
 "hepunits" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b6abbe3a93eac6c7c159cd9c305fbf61664908b93956b90cb413e2220b12d183e4fafcb361d8935bac16a39d14451f538d38d9452ca78eb4ed03841f3e5bda78";
   sha512.doc = "3247cf7865444fc2a600c05843c55ddca792b59b5906326e79591822c0e2577880d55704d4e726447aa503983644e7c0b7943482045b5c9ce6e8fc765bbc67b5";
@@ -15126,12 +16717,14 @@ tl: { # no indentation
   version = "1.1.1";
 };
 "here" = {
+  revision = 16135;
   stripPrefix = 0;
   sha512.run = "35c9ac325579de5d3bac4b8d16b1f30355398037cd0ad1c52b1585eb7ec666e743680eb05bec7b1f8cfa3bba3d7f5c0e6e06cddde6ca879ea708388df140eef0";
   sha512.doc = "482a2ef8edbe41ce76e2c32bb579b132c84306cbd5387cb5249b10a02826e610229ec9c75a1df53b5b930bb982e1157ad9ffa63a77f84461cb6cc6332f6d6e54";
   hasRunfiles = true;
 };
 "heuristica" = {
+  revision = 51362;
   stripPrefix = 0;
   sha512.run = "bbadd84c1cc0825f0dbe72bdd8f5c4b939ae1986dc0f97ea80ecf12999f97d455e2f89cd12e71e8a51ae4ccadbcb01ae7768a60a47b9b35f19b98ea17332372f";
   sha512.doc = "f445e4588ba85a71af43640e6625fe1fbcb1f8a2208d2c5cfc7fadd1df325be3fdda85b9da4dd824f3c0445033b2bd9e2120e71abf61c6f55b9e828a3e61a87e";
@@ -15139,6 +16732,7 @@ tl: { # no indentation
   version = "1.092";
 };
 "hexgame" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b16abb669f6bb5c3111e6c333353cc37a76431c49920a4cd22af79f6237f78a5c56124c5854b7665e9dcf963fb2715c488dd7ef4df86d5582aa7b3dbe3d08822";
   sha512.doc = "0fad11a5510dd1a2ceec227c46c3f8c0c387ab3e2819bd70765d363ca5f97822147bfac62e69de773a96d24a881394c35c1542a8f08a1828a82f94aaa7f02644";
@@ -15146,6 +16740,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "hf-tikz" = {
+  revision = 34733;
   stripPrefix = 0;
   sha512.run = "47ca98b066829e6ea2009c4beb92db2c7671642c495f1011df9be00d546f3613b7853aba5db88e3805441eab66c873e15b60f5ef75cf21e906f80b5f11aa30a7";
   sha512.doc = "234a8ccdd9cd921368f700fdcca818d0c76265371ac89e09c1a54454fa3e00f0f28fdc7f962c227f9bb69d851585f2c65e20b4a4093aacc3ad0aa84d1abc7f87";
@@ -15154,12 +16749,14 @@ tl: { # no indentation
   version = "0.3a";
 };
 "hfbright" = {
+  revision = 29349;
   stripPrefix = 0;
   sha512.run = "91c8b007dd8ce71af9dbc98a66a82a395d68fc87a0abcf9518b5b89a98dc23b28f1b9b9aa551f82b920dc3e2d8b6500884eaa3bc98be48371a9774f9f283a641";
   sha512.doc = "7de24b513093d965fab1f8d7d13ec4b356e7f5495cb3a8f17204b1a786288488b4921df6b7e184262bdd3aa11fed6483a25d0bf8e898db05c8b1f7dff769c175";
   hasRunfiles = true;
 };
 "hfoldsty" = {
+  revision = 29349;
   stripPrefix = 0;
   sha512.run = "5ff36855df468bf59d387d56f4ea65c86ba304eb2495f2ca110558ef48c528ef444c7ebfaa378a454c311c806525ddaa639a32d3d1b16ca492b641f223133390";
   sha512.doc = "1f88ae3c13857be317ac2097093bb368a9f1ffa2a8fe1b5e15f59622dabdce2f2b3aededbca31a4d17f05c2dcb28f8ae0c9be3cfb1758bab4501a99efc68612c";
@@ -15168,6 +16765,7 @@ tl: { # no indentation
   version = "1.15";
 };
 "hhtensor" = {
+  revision = 24981;
   stripPrefix = 0;
   sha512.run = "387fb53bc2c9b83d2f34d9fe7856e3e7c54e2403378a1f806e29549e1d4b871cbc8333b64f721230918b96b9082ebe0ec07533cae9e4ba54d73dd8244a95b1f3";
   sha512.doc = "30de49c3074840066555f2363f2c4120d731c3d515c2b3ad6839bd4e04abfc7043930428f0345149c6da1b5396950c8864baff6414a42769f1652a057817616b";
@@ -15176,6 +16774,7 @@ tl: { # no indentation
   version = "0.61";
 };
 "histogr" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "987c392828a4995afdb37b10194c7735a7dfe3375bcc6efda6592d3f35351c369c045a2c1464cd2653d6275913a335ce3d527afb44c51ee38d3038d4751eaadf";
   sha512.doc = "6cebdf9d6000ba48dd8106645e7a05709ced06c8790f8383a036629d8d53ca434f5c5aa0ff511754ea9e00fa743e435a304dacc16edf18098409972f763f9087";
@@ -15184,6 +16783,7 @@ tl: { # no indentation
   version = "1.01";
 };
 "historische-zeitschrift" = {
+  revision = 42635;
   stripPrefix = 0;
   sha512.run = "da501792653c77f7cdac978a348e1267d4abc2e80d8b5565b47fdab4a1e2204f9544bab972a291d191ce26bd29203ff28a6440e2f8969cf1b33a5cea48998b04";
   sha512.doc = "1b091b850e4936e8e6484ca484f740005c66458655a0cbe24938c3f33f23807fe9b7a0ab93b38f6a3481c684e35031398860d5452f6bc3fc8a8e6f4c2e82f927";
@@ -15191,6 +16791,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "hitec" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "d7ebe166a23c05a1b78552c102507e697c07b955cddc8f4061d22fc42fc414664d3a1bc1c08e0dd122a987c736d24d4935dd944b37f62fe260b3c811678a3b30";
   sha512.doc = "f166b529f29f0470770d5a24e0f3ea2be9021732fb5373611b87cda10ff2196d1d121258fda75369a2f0f9a65324f4a8dc0d3c5f377cf994c04807b18b5a46f3";
@@ -15198,6 +16799,7 @@ tl: { # no indentation
   version = "0.0beta";
 };
 "hithesis" = {
+  revision = 53362;
   stripPrefix = 0;
   sha512.run = "c23d1a9aad18b7ff37380cdf7644b759d7cad35998baf6dbb4593a19d38c85a47e376f06e6cc3b8eb445eed3f59f1e1213d844405b62317507602376b1efc2c8";
   sha512.doc = "fbf6767efa3bbc7cef8583735e23a7f5a3db1aa2f7b0de8bc276d4728c8627fb9321ca212d010b1604c2e5087f24a947c5794a9d09d3d326ae45ad8d0fbf298a";
@@ -15206,6 +16808,7 @@ tl: { # no indentation
   version = "2.0.11";
 };
 "hitszthesis" = {
+  revision = 53887;
   stripPrefix = 0;
   sha512.run = "7bae43ed124d9e37af7d7bed2ec0ea81c9de93f96b1cdde39c292b5f28095e87319ce2fe6b5881baa599b8df6d5bedcebd41acaa2162f38d849b27c098f809b6";
   sha512.doc = "c0d1220af85f6a1e21f6580f322ef021c387efae3159e319309aceafe8188b0a7dea26cc593ce778e5fcfa458b2a9e0b8fb397df34a0399b00163cb938c77b38";
@@ -15214,6 +16817,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "hletter" = {
+  revision = 30002;
   stripPrefix = 0;
   sha512.run = "bd79dec347980624c634918880718af9e434e24acaed206815e974c2db856e8f424e12b6870d920079626423f18a02fd326bdc387c256ae9c3a1dfa4ae26e71b";
   sha512.doc = "67a9a39cf0c8ac1054588ad542a8ba3705e94445920d4ca85b46423a4cea364c58e8d2b02b7d7579c9684653734f0766e8ddced28a7c5ec77e0daa3c3dee26b9";
@@ -15221,6 +16825,7 @@ tl: { # no indentation
   version = "4.2";
 };
 "hlist" = {
+  revision = 44983;
   stripPrefix = 0;
   sha512.run = "9e2150f08a7fac07a0e2e36edcecbd5c16ab3c119d8532fbae9399f14c6c7567d2cf4e2a92eda9a650049a901a35b6a9a0dd3423a06da6a9d266a3859392334d";
   sha512.doc = "5b3748d7f67fb51dc0df2a03318e96ac9224abc42291ab475a907befa14fc210d9d2371005150404480900865e8ffa9f97e3ab122109bb5454c3b061f66a064d";
@@ -15228,6 +16833,7 @@ tl: { # no indentation
   version = "0.11";
 };
 "hmtrump" = {
+  revision = 51829;
   stripPrefix = 0;
   sha512.run = "62efa57cc09a2792fb755112defae31666d44ef295f75f1f04b3742b63ae5696352bba7369778a88f822ff3e09bca00ed58157df6afdd664f7090c084c28f9c5";
   sha512.doc = "58a765a12ff3ad55278502d8396c3580f971cb3af772acedd54d29fd47b73716ad543561d7d7f58a97b54c400e827e54bdaae3d6a599999ed12ef8d884d2c7fa";
@@ -15235,6 +16841,7 @@ tl: { # no indentation
   version = "1.2a";
 };
 "hobby" = {
+  revision = 44474;
   stripPrefix = 0;
   sha512.run = "669c768dffa4e88d831d0a03a7e518fb2c101cd0af9ca1e15e6527ccbe78a13485145bedd4ef45cbaefcc94e4bead303acb89a0d0f50c6fc3a7ab312717febad";
   sha512.doc = "7c8a353078be8b94195558d1d7a319173b4480a616c8725b99357ed3a086565c238b944b9b3baa719b354dcff9476aa7c7ffb055565df546054e662370d5d808";
@@ -15243,18 +16850,21 @@ tl: { # no indentation
   version = "1.8";
 };
 "hobete" = {
+  revision = 27036;
   stripPrefix = 0;
   sha512.run = "d2c79f5d39fbe82b43704a78add3a016768ff282d48ed1f49d1991c6ab56bef5266e8cfa7b3b03bcc944990d407ae43eca99930270ab84679f51323407b861a0";
   sha512.doc = "ef7b1bd487c496cb2ffc01fb2940a72ac69edb1a5516d19ce6a6e6cb197ba6f517e03ac673b2372cc9cd4f40e5c6ea2469c2712528a10a3f5ba09e9d3a46f209";
   hasRunfiles = true;
 };
 "hobsub" = {
+  revision = 52810;
   stripPrefix = 0;
   sha512.run = "586189051038582c9303935c70bed67975f51472d28b533e4b72ef341d4d93ad8f313774a5c585baf4b72d607101941f01176892499c7ecc5cec3ede2e28a693";
   sha512.doc = "8cf2210285b162e52e2cbaf0d1a9e7027ca3aeb7da81ba238fff97a9cb10c7ba9058f5eb4f28303031a7774f457207ace1f30610cef2f733dd65b35d9ab6b1b7";
   hasRunfiles = true;
 };
 "hologo" = {
+  revision = 53048;
   stripPrefix = 0;
   sha512.run = "8d1fd73519f0185db7ae8e82ac62957cb958311a5bded23823591157c6c31557b455ca6baa42fffa39d969e42a5fe87b18186dab7d18097e4e30e8589524ec96";
   sha512.doc = "72a65838829017ca887afe5bdf1f7645209601e267241a5650731a806c08b58670a4934698c4ebf2548d198e0b79619ef33c06d6eccfd5eef9119bee19629105";
@@ -15263,12 +16873,14 @@ tl: { # no indentation
   version = "1.14";
 };
 "hook-pre-commit-pkg" = {
+  revision = 41378;
   stripPrefix = 0;
   sha512.run = "6fb3009d4bb4016f0d6e92571d52aaf7e3780d39a6b2ec73ffb37112b3f153ed71ecbcd985b81dd841f296a39da83e9004a2d6e6e85e9a49765e1682563cfde3";
   sha512.doc = "3873c4714a8a6d221f860a5d0606113c64482b363727067e0017d27e99d73f31cfdac88a799fb1412225baffaecd7bb03dbdc66b607a075b1e4539ffc0df2a9d";
   version = "1.1.2";
 };
 "horoscop" = {
+  revision = 30530;
   stripPrefix = 0;
   sha512.run = "077b7bc742d0526daf7380a080e640de72d61d5e65cac441d3291e1dfee8c0240be8817328e7080fe410fca9ebc8b5d13e8719ed48bd7d412485d7c5d2f67ce0";
   sha512.doc = "b7cfdfb772f5423fe4cdcd914a4b0934162ea33542a773b14d91d057efcd05b7febfff46decc3760512b0df95f52180a4de0dea2f0dcc4b504945ee572f832a7";
@@ -15277,6 +16889,7 @@ tl: { # no indentation
   version = "0.92";
 };
 "hpsdiss" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "4905368d081cc6e7f2c7b43b28d4c6e22081796d8594e5a07e521bb7ab0fb14c9ccce1dcbe135b0cbc5a7b2671e3041d7764ff80c7e1543b4ac4cefe945794b4";
   sha512.doc = "566f0509feee0bc5c28481fb62f2c991827cd5855f9696fdda79628f5c43329b39dd508fe9613d2c0f823bef421a97393fd303d830c779c42ac67f88303a239b";
@@ -15285,6 +16898,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "hrefhide" = {
+  revision = 22255;
   stripPrefix = 0;
   sha512.run = "6d96fdc550a99ed7f3e4dbee19a589c27b27af16f910a22befb51bfb452d8f9f57cbb27f1ecf96c5604e61eb1cd0343c0a07810ac1519dc51422183d6229916e";
   sha512.doc = "a8ae0fbbb185ded46cbc1d7550526230de4098bf3a5bc8bf72ec8f5a5b4b93703501da19a4c9e09e08044aea768a01e39dfa36c38c9be72c7aee8e61f58acd71";
@@ -15293,6 +16907,7 @@ tl: { # no indentation
   version = "1.0f";
 };
 "hrlatex" = {
+  revision = 18020;
   stripPrefix = 0;
   sha512.run = "14bd6fdf4a60ec599971b1f5ee7ae5fc649b0d1382f9dff8bf9905f4623f3964c2d552bbc4485680d22cf04651a5e49b71220ec2c05e6599356b6dcee6e4d122";
   sha512.doc = "ecd67675466d365f00e49b775ae3e5264e2d10d574dbbe913d52b3a5b553fe942e06fcca26cb2357fa76688c55fc4268bf7d18f5cb2a90663bfe47c11a5bbde7";
@@ -15301,6 +16916,7 @@ tl: { # no indentation
   version = "0.23";
 };
 "hu-berlin-bundle" = {
+  revision = 53196;
   stripPrefix = 0;
   sha512.run = "c81c1260c626d46d2b10a060f03b30b797db0f02fe42535e2311b91ec8db7da94c83afc99e0e1e91a4c1a92bcb95ad766ef08d3b08723cd7750fb6b098c0061c";
   sha512.doc = "61d85bca6fdb3f5d725eac008be499241d98a3a6fea56f24be09aa0fa470c30dc28f44f670e6d9beda8b02986bb40f23bdf90131bd39fc81cae28480caafb1a2";
@@ -15309,6 +16925,7 @@ tl: { # no indentation
   version = "1.0.4";
 };
 "hulipsum" = {
+  revision = 46803;
   stripPrefix = 0;
   sha512.run = "c43867cb608e955254f2c597d3fd9938fe815c1683c9d61dcd1cfff29608b5c391d7374a740646dd915fdcf282d9adb8f83d3dcb6781fbe547b685de81f67143";
   sha512.doc = "43dcdd731116bd1eac309b1213b3c961dd189f861b8732d73127ba6b4c20d3ea3584f03340ff5973b4aab11744e61069edfe6736d389e1487587d0372591e343";
@@ -15317,6 +16934,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "hustthesis" = {
+  revision = 42547;
   stripPrefix = 0;
   sha512.run = "508c86a6cf5e3d952dd43786f78952cc8bbe635620a913abd82b49c2cfade29875bc924d5ea89803b03008328c7297010e98f70b62b5191d9855e0cc1614d3d0";
   sha512.doc = "5c114cda4bd4264904b7fdfedd55720046403b8cd3c1bce4181dffbf319a9107ec0ad8cdd092922c8c5268aac62437d1128a45ea0cdff4121a40f02e26dc0148";
@@ -15325,6 +16943,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "hvfloat" = {
+  revision = 52010;
   stripPrefix = 0;
   sha512.run = "717fd6f3a1b9f7fab0cbbfa929b09e9186637d56092f50d1f0d1603b7b7d67c300587d12e9ec25e73a89b240ac3744bbf232802b2046d34b8606263a7fb6064b";
   sha512.doc = "98b61ee75c06007773a5119a5c9ded7d0ff9579e016dd024265329193661771ae246b9e0e44c55017dae9754219f2898abf221a4affb6231e0d7ef775fbfc30d";
@@ -15332,6 +16951,7 @@ tl: { # no indentation
   version = "2.16";
 };
 "hvindex" = {
+  revision = 46051;
   stripPrefix = 0;
   sha512.run = "12e47531ca8dcea2f195d86b5721f2a62d2590de5a0b464e5e6de5484ee34803eac14f2474e4a00938f6d5e5b307ed3183ea3aa0a4f0d5874877356de6e8c83d";
   sha512.doc = "2a10c26537e550e3d51330c704711c2c43b872f90db15ee709dcfe603a5fc64102a8b466c5d5b7ab4706d5e96e91b11559305ac607477776f34da97590151368";
@@ -15339,6 +16959,7 @@ tl: { # no indentation
   version = "0.04";
 };
 "hvqrurl" = {
+  revision = 52993;
   stripPrefix = 0;
   sha512.run = "3f52fae550f92e379b76bc91b6a4b8fc25cb9ad6bc19c744c6f9ef0948d6590c1289f267681339fc7f596a7c328adaf45eb7c94be45e5f327bd77db5e366e315";
   sha512.doc = "2f9c4772b34ebb6096da22ffb10b41eef091be66513d1dbb20c4f224c2e471493fa30e63432e19e47b03ca7b248ae178a1a729517ed3108ef406cb30abb6cef8";
@@ -15346,6 +16967,7 @@ tl: { # no indentation
   version = "0.01a";
 };
 "hycolor" = {
+  revision = 53584;
   stripPrefix = 0;
   sha512.run = "5269044c5b462f13c78e80d28f7237f2d6e353da98db50267a5c4f01b22d565b0300c689470f6eb1ef9af7b66c1068c1d40d7a30ae01f30e7b3649189a7e7fbd";
   sha512.doc = "79e4c83b952182ea89b2ae7a1abdafd771359baadd34fce8d573d7449b24908a5bbf515d16d73fd088e7add82c143a458b2c196c125e5b492033cb36da63eb6d";
@@ -15354,6 +16976,7 @@ tl: { # no indentation
   version = "1.10";
 };
 "hypdvips" = {
+  revision = 53197;
   stripPrefix = 0;
   sha512.run = "515089c437413d6d21c8d2987b8917aca7c046e42c0dc9212b39be1c9119bcc867f70c37087f9f3709db8c9f824ffe16d1b261f34d06d66e12857db9854892f7";
   sha512.doc = "ef485ca27145ffc614c78547f68d574a0b27cd1a7cd5abd5752681e20ad6612e280f34f85c3e1c753bc6cfea976c9801da1768bda1dcea377c19b138ec9f2777";
@@ -15361,6 +16984,7 @@ tl: { # no indentation
   version = "3.03";
 };
 "hyper" = {
+  revision = 17357;
   stripPrefix = 0;
   sha512.run = "6e5bbad0a682440e28be67fc893a970de315671e1f4987bebff4a163d9c38bb33d8de9557765f1d8c74386556c59e332ef5855a3f1fe36d08eddcbd2a77179df";
   sha512.doc = "41fafe8bcaf651994c45abd0040e2123caf8e33fd2d06fafd310d978c10ae5c705f7dd64d9b4740bacee51f11fe52741ed64f83d6b236d298cb6c932fd3ba06e";
@@ -15369,6 +16993,7 @@ tl: { # no indentation
   version = "4.2d";
 };
 "hyperbar" = {
+  revision = 48147;
   stripPrefix = 0;
   sha512.run = "80077002a3bdc99339749e2f76687a0f8597a786fd3ca3f5207ec44dc2037dbec1e696ab58d77ee6b067d6e958357cb8f0c9805621c3feeb40dde004851311b3";
   sha512.doc = "0598acd8fb945605b204c5c99982db63f4fc06fc82c47f7b301ead30be0474c7dde5eb4f78f3aa698160cd068d38aa2aabe3a1fae3c49cc32194e7cd796839c2";
@@ -15377,6 +17002,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "hypernat" = {
+  revision = 17358;
   stripPrefix = 0;
   sha512.run = "0a803b9e7d23d364122869a89a6f181132f00b54d39f677a9d9471c336c933ba0e743fa4100636a6d3e929714a8896ce964e7614800c675ab9df7cce7e6d732c";
   sha512.doc = "04a3f646e1595404513149f0ba56a36f0cc21a29f3ab455f38c4a7c3f5a282199208ac3aad329f38aa9fd5086762d326d85fa5052dba125d944969bfc0446489";
@@ -15384,6 +17010,7 @@ tl: { # no indentation
   version = "1.0b";
 };
 "hyperref" = {
+  revision = 53837;
   stripPrefix = 0;
   deps."atbegshi" = tl."atbegshi";
   deps."bitset" = tl."bitset";
@@ -15406,6 +17033,7 @@ tl: { # no indentation
   version = "7.00d";
 };
 "hyperxmp" = {
+  revision = 50812;
   stripPrefix = 0;
   sha512.run = "95ab28036eb17cc540ade3462c3f205eeb07e6dbfbb6d150bff2c8264c3ba344dc7e977391a2c72c0d2d26f51e5cdb56751507b56da8d6862b7a2eb941929694";
   sha512.doc = "473038ca262432f860decdb67c4fca775bc96ff62da4dcff7b6f6b5c681302f32383c112b46b470fe0d96edc4599b4c2e328fbacab0ba091d9d1e9e5e837d1d4";
@@ -15414,6 +17042,7 @@ tl: { # no indentation
   version = "4.1";
 };
 "hyph-utf8" = {
+  revision = 51186;
   stripPrefix = 0;
   sha512.run = "51fd6b51c1292b74c7eb6e8ec3fa7cbc7e02b8c5d716aa55e378a4103d21f7c4dd5298e2efdc47378d27d5326830b9b94846fe3109d3bbdf60f8e038969ad95e";
   sha512.doc = "027285084e97c6a51296e532d306dd22d4b43ef02928e06d9d684d0137d0379d4f67f83e0f16e472fe37bd285793615af8bf082bbf7a959d586173a04bc5326d";
@@ -15421,6 +17050,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-afrikaans" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15428,6 +17058,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-ancientgreek" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15435,6 +17066,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-arabic" = {
+  revision = 50805;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15442,6 +17074,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-armenian" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15450,11 +17083,13 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-base" = {
+  revision = 53326;
   stripPrefix = 0;
   sha512.run = "f7084afba6bb1e38629f551d3334fa6d66d0fe0a9450980911adf7f3869e46ab486fde0c2fb3ee1dd6358a4d9cc4aa545302e552f1a7b07a0329e6f556c465d1";
   hasRunfiles = true;
 };
 "hyphen-basque" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15463,6 +17098,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-belarusian" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15470,6 +17106,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-bulgarian" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15477,6 +17114,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-catalan" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15484,6 +17122,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-chinese" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15491,6 +17130,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-churchslavonic" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15498,6 +17138,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-coptic" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15505,6 +17146,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-croatian" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15512,6 +17154,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-czech" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15519,6 +17162,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-danish" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15526,6 +17170,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-dutch" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15534,6 +17179,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "hyphen-english" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15541,6 +17187,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-esperanto" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15548,6 +17195,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-estonian" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15555,6 +17203,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-ethiopic" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15563,6 +17212,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-farsi" = {
+  revision = 50805;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15570,6 +17220,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-finnish" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15577,6 +17228,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-french" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15584,6 +17236,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-friulan" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15591,6 +17244,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-galician" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15599,6 +17253,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-georgian" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15606,6 +17261,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-german" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15614,6 +17270,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-greek" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15623,6 +17280,7 @@ tl: { # no indentation
   version = "5";
 };
 "hyphen-hungarian" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15631,6 +17289,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-icelandic" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15638,6 +17297,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-indic" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15645,6 +17305,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-indonesian" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15652,6 +17313,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-interlingua" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15659,6 +17321,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-irish" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15666,6 +17329,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-italian" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15674,6 +17338,7 @@ tl: { # no indentation
   version = "4.8g";
 };
 "hyphen-kurmanji" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15681,6 +17346,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-latin" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15689,6 +17355,7 @@ tl: { # no indentation
   version = "3.1";
 };
 "hyphen-latvian" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15696,6 +17363,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-lithuanian" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15703,6 +17371,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-mongolian" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15710,6 +17379,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-norwegian" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15717,6 +17387,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-occitan" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15724,6 +17395,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-piedmontese" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15731,6 +17403,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-polish" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15739,6 +17412,7 @@ tl: { # no indentation
   version = "3.0a";
 };
 "hyphen-portuguese" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15746,6 +17420,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-romanian" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15753,6 +17428,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-romansh" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15760,6 +17436,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-russian" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15768,6 +17445,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-sanskrit" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15776,6 +17454,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-serbian" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15784,6 +17463,7 @@ tl: { # no indentation
   version = "1.0a";
 };
 "hyphen-slovak" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15791,6 +17471,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-slovenian" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15798,6 +17479,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-spanish" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15808,6 +17490,7 @@ tl: { # no indentation
   version = "4.5";
 };
 "hyphen-swedish" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15815,6 +17498,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-thai" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15822,6 +17506,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-turkish" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15830,6 +17515,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-turkmen" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15838,6 +17524,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-ukrainian" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15846,6 +17533,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-uppersorbian" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15853,6 +17541,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphen-welsh" = {
+  revision = 51186;
   stripPrefix = 0;
   deps."hyphen-base" = tl."hyphen-base";
   deps."hyph-utf8" = tl."hyph-utf8";
@@ -15860,6 +17549,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "hyphenat" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "5af847cd55cc1b455b1928f6ba275054209ad5c9c2f81a7ae648d87eaa39353e842b2df4e91cf530909a46b4aa226228978d771b35e46b7e12f1a08a08faa181";
   sha512.doc = "57f8a5d71763cac73635fddba75eb59faaaed01d47bcbb7ecc96b80fa5a926bb0091d3cd3448c6f53ad82cd44c9244ee631fb5b56141351b578cd899509eb323";
@@ -15868,12 +17558,14 @@ tl: { # no indentation
   version = "2.3c";
 };
 "hyphenex" = {
+  revision = 37354;
   stripPrefix = 0;
   sha512.run = "dfa1f625e736c2c4125209552f084fbd5d64109db5dd5b8f37b5add3fce90984bfa5db855b581396ffad20b1f5a3461cae01e031c086f7db5dc98203bb7bf8d9";
   sha512.source = "cedcf83033a5aaebb44a8270b5e670b9db2fba2b8f65925cddee4684bf50fee5dcadb02921b04288d02c91ca3d003c8da143c7bb1974e7af26b1f392dfd4283f";
   hasRunfiles = true;
 };
 "hyplain" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "f2968e8baf048329d8c78934770aa5d0a364ac7b3f77dc00a163e085e4fe45420c180acd05b281016aefdfa6523bed234e75ca07da0d133438798c1e51330d83";
   sha512.doc = "cc64c35df85ba832f18f153d0f0cdc9f153ac4a9db0a175a1961a353f59ba585e19b6607e0c4cd1a832d921aa3451687427965cbef4fcb2a87488895e6643bb3";
@@ -15881,6 +17573,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "ibycus-babel" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "30f810bd70555df4f05fbc0b073456c030a0768372bd3c681921f41fc31bfbe0570a39e474ab26aeeacb142622154e5cab3714412b09f89d1260fae8b60e817a";
   sha512.doc = "f09dfd00f35f653defd756b72437dd712ed1ffceb05beeadfb34c1c5163559ee7c0ae6ce0420f57b722e93080248cbcfd678d811f1383fa5fa1ab76db52a060b";
@@ -15889,6 +17582,7 @@ tl: { # no indentation
   version = "3.0";
 };
 "ibygrk" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "89002af0024ec804ebffcc45f3a33337ffdb66f71e1ca70224b0936388892dadf99605a8ca3f59a2b879e76e24acc91b1da92622d602f49b236aecb8aafe64b9";
   sha512.doc = "9dd3bd7a8ef3267965f30048e4a71314b6a9813cb400b7a94dfe285606d7554cde80aa429603d0fb1f587935e193e5ece5ed67870fc4e0c66eb5152c392a9cdc";
@@ -15896,6 +17590,7 @@ tl: { # no indentation
   version = "4.5";
 };
 "icite" = {
+  revision = 50429;
   stripPrefix = 0;
   sha512.run = "1a71e185bf65c65f64ffe49d4b7cda415bdec89a7f92fa45914c0adccc2b1430f0022f9c789c2e13c2acb0a780ef90360a22247ba2aecc171a3fc6e06b8f05b0";
   sha512.doc = "efad2e573358b64b6d6146fa80011b033e4acd7435d9b0e32778240cf8051c732f1617614cd4ab56c91a03260b203084aa5c15c03208bc86686ad18d2c75e93c";
@@ -15904,6 +17599,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "icsv" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "e865708ef636c7c917cc9a870eaba4b8c0249acba01bd2cd3fbfc9d95672405db133bbf0faf9f2d299bc4024118b80b4354ecb8216427507f66817cac085e01b";
   sha512.doc = "dd06bf5d8a087bcb20c63a61cb9867bda3df35e8adf30a3d4ca69ab149772d46e3b83f168a8fc1c597aa2536a14b98561f42226a59b6663f58de4e338f9b4e82";
@@ -15912,6 +17608,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "identkey" = {
+  revision = 49018;
   stripPrefix = 0;
   sha512.run = "b04dc4859826ad3f4fc4dd4a9b19abc0f6125d66d200519652a130c522fc6b49de8565af73f81efa9e75d592036ccca6d373a368e66526d8997dab9d8a5f806f";
   sha512.doc = "c676908535a4a67efd8569e81a1d3ce5a47bf7a5ec755e87e62830e370fa3307bf0d6a84f3ec7c399bca3cc365f97469393a6fc954bf83b2e2fbc9eda9983811";
@@ -15919,6 +17616,7 @@ tl: { # no indentation
   version = "0.1.0";
 };
 "idxcmds" = {
+  revision = 38115;
   stripPrefix = 0;
   sha512.run = "ec7d58e5f52472b0d359f84afcba179ce3428638ad8c45293b7de2346d4ba84c3b22792bec27a10328dee9f0f186c2536d562ec47e9f6aa2103e708788a553f3";
   sha512.doc = "9c55acca21ba10f051c678f0e59d68f4a1231c744d7b470f7a905c81226a23ae0eee03b02b9466b5fb6c92af1e884a95d1f6644401f83a50441b7c77becf0874";
@@ -15926,6 +17624,7 @@ tl: { # no indentation
   version = "0.2c";
 };
 "idxlayout" = {
+  revision = 25821;
   stripPrefix = 0;
   sha512.run = "968d869a0b635b14ce8ce85e710c987ecd8ea2efb97a03314098014366ece450b4566d626031e11b52d7ede53a019665640fc1626dd1e24651275b35a8f2cac6";
   sha512.doc = "469a20893247406856f15dad6b14050e221299dc2adc40f1547361d74d3f7ce90ba6eabde06402bdbe22c845119df4bbfa8b999931e99c1b944b165f3b245892";
@@ -15934,6 +17633,7 @@ tl: { # no indentation
   version = "0.4d";
 };
 "ieeepes" = {
+  revision = 17359;
   stripPrefix = 0;
   sha512.run = "60ae4ff80be5c2b02e2ebeea5954ed61b73dbc085a4d282004796d9be6038cc7c8020b7c81226d7dc7b121683e4196e461c7c3d101bb460eb8c39bf2da179bb2";
   sha512.doc = "ae2413800f1bd4c0467321a7332fac15a8010e31ba7a4effc0fdb44e9e7a0001ba62d6acb44a72eb6f996560ddf96231b7355c4b9ad8b816be102a143b7c8011";
@@ -15941,12 +17641,14 @@ tl: { # no indentation
   version = "4.0";
 };
 "ietfbibs" = {
+  revision = 41332;
   stripPrefix = 0;
   sha512.run = "ad8796bf4e492072dcc9335f913ae2b5d81f2152289ca76cfbb61a63577c631bc38f5cad6860aef47b1fb54c02157f509c23c3f903b34b8e7a82b8604eaa449a";
   sha512.doc = "586dc66004dcf4abed254d223394badd45557d79c7e1b56bd20080f41185ea8dca28b3d501e708cc3ed4088f1368f153ba2d2af313d5d6add2d072b46954952f";
   version = "1.0.0";
 };
 "iffont" = {
+  revision = 38823;
   stripPrefix = 0;
   sha512.run = "a2a329da661f003edac0e0bc701958e0744864f8693ffccce7f1ea6867eaabe7d71b38a1dbef8bc27f770e8b4c30a4480ede1dd575d26860095575020db987f6";
   sha512.doc = "95a8f7357f095dc39ff642edeb6d7df206c37ef01c14a1daa280939d44047c5a935eb18049c280ce00238ad4fdfef6abe7399dd8c6fc815b7c70b22072465453";
@@ -15955,6 +17657,7 @@ tl: { # no indentation
   version = "1.0.0";
 };
 "ifmslide" = {
+  revision = 20727;
   stripPrefix = 0;
   sha512.run = "c9027b8bb34f15e667e530a8b8d57b793ed16a7ea33feabe58f22cd71230945905054e01853561f4cbaf5fe22f4aa140cbc95072f375d567f57bcce3c4d07d09";
   sha512.doc = "4e7a64773cc1a14df0d2f58ae0b66d1769b44958bafa8fdd4e51bc294555e7895632b741b47edbc29fc5f5ac0ddd73dddcc16723a7297c12311d3915e88f633d";
@@ -15962,6 +17665,7 @@ tl: { # no indentation
   version = "0.47";
 };
 "ifmtarg" = {
+  revision = 47544;
   stripPrefix = 0;
   sha512.run = "b04aebac5acfe90a149f417cdf0d45b3a7cbe53d53d4d9f39d5badddfcb894e07f397933199bca702f3f0e66458133ba17feb5ace2ebda4a25bb24bf1af5d259";
   sha512.doc = "8f456c15ecd5090d2124a85b02c1ad100dc999064b258678cad3c444acae3e88b95e38f7ad1785bfc91f385d6bc1664c0b58282d5ef36e6cff9857b81176ab7b";
@@ -15970,6 +17674,7 @@ tl: { # no indentation
   version = "1.2b";
 };
 "ifnextok" = {
+  revision = 23379;
   stripPrefix = 0;
   sha512.run = "a56c703e1830fa64432d1b3aa72d3dff52b17c0e5b90b2cb34f7dff974e51331f5d9daa2b5aba578a8bc4a73b693c9a3dd811c6d7e32379165cc7ec1349c541b";
   sha512.doc = "1eeb8d7627ad8887761e66704a8f3c848b633a4f3a5b094626b3c64888e6db95c25b8dbad4332887a6d9e866e4aada2816b7c7e7fd19c07dba03db38842886fe";
@@ -15978,6 +17683,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "ifoddpage" = {
+  revision = 40726;
   stripPrefix = 0;
   sha512.run = "f6ab9abdef81cbcca8728bac7e1f94e2b72e5db6a8e17ab13c8d56477e98fcf7fb20f006012c3a3cf815378d8bc9c5cc4d39e2767b7d634d1ad99bc24dc1d1d3";
   sha512.doc = "80f1431a4da340b0b2ba6f396c618e2923457e95b5de01018ef7f95937e55814e3c3e96b2f45f18e971fddd29021a16852b57bafd0b1ba50cf2626b4b784541e";
@@ -15986,6 +17692,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "ifplatform" = {
+  revision = 45533;
   stripPrefix = 0;
   sha512.run = "952f87877c058c1e8ba3df227ed7332501e7861bdfd2a29878dc4b14e6b95a1b116459bef7f65c5bf277c95d08120c7e9fa9576a7654739e4a26125ca4d5c724";
   sha512.doc = "520004cfa412c2a24ece0e00b11d457405e71a446e554a1d930e60ea7dbd00f61b2b6a7ecbe89b62610316fd3b6fad685d7013042fa71fd7fb270b40748dee56";
@@ -15994,6 +17701,7 @@ tl: { # no indentation
   version = "0.4a";
 };
 "ifptex" = {
+  revision = 52626;
   stripPrefix = 0;
   sha512.run = "cd06bd01d071c091962451850de4cf78c0ed7604b392e6c0eb59fd66b202ed9f015cac75b6260bfe071b70246cb1d9a70a5bc9f052876469ace54a68ef250e22";
   sha512.doc = "6d6668a5f663aeeddd19c5f8086633d6542316807d0dbfc94e8ed1991136dc2258718e61a450dcc3c1560af3d349519ca2da98a05964741083dbb66ef85fb848";
@@ -16001,12 +17709,14 @@ tl: { # no indentation
   version = "2.0";
 };
 "ifsym" = {
+  revision = 24868;
   stripPrefix = 0;
   sha512.run = "ef6615a3768f87009d22c3feeaa074a0589b17efc8585a509e21692195a100e5b11e2d0849fa2eaf8f80cbe0d96ea12e773aee0be28e7120ee80a86dcfa6f8e2";
   sha512.doc = "10dca0c00a52d9d9775bd2ae35b50d7d56294da9b8eb21f2bc35f7863cbf1ab357cf8f3e1d949570ebf4908a60d9ccfe604e69fe779780c8e7527172f3f0e999";
   hasRunfiles = true;
 };
 "iftex" = {
+  revision = 52711;
   stripPrefix = 0;
   sha512.run = "a40cf1fbcef9af4cae18c045c051fd63fa6e1403ae83b12d635317bd60e7f677fa0b13252ed272a8855351bcf139b2bdac076a3c74b5bd93059a4478bb2d8b48";
   sha512.doc = "f499cb46462f43e89d76a84f8c32983bd332a502764c8e0a5e88ecc696c35470f663719e443a36b0740cca40a5b8d9e03aeb8f1a93bc375900eae9f2a05607b6";
@@ -16014,6 +17724,7 @@ tl: { # no indentation
   version = "1.0c";
 };
 "ifthenx" = {
+  revision = 25819;
   stripPrefix = 0;
   sha512.run = "76235d3f8dc4e62604828beaf87327d11d4a9ff69061edf1a3ed4c874983251fba75d80973e54fb3daa2d160b27000089f4cdf1c29748124825fb4075b6f7148";
   sha512.doc = "efc4fa3b5d6e91d1d5af27846bf2652672a233537810051b2858c1c4ffacafb9771b2c3a222cea4d490e0478eef96b205c4043f4957b876b7f4d57903b26454d";
@@ -16021,6 +17732,7 @@ tl: { # no indentation
   version = "0.1a";
 };
 "ifxptex" = {
+  revision = 46153;
   stripPrefix = 0;
   sha512.run = "7bc52847fe21879614ffe673ebec74c735c70e07d63649def00f70d22db80faa920f0764f76c5094ef982abbff8202ca55410ee92d033c45ec43fd25adabb23b";
   sha512.doc = "1bc4feaacbdd33ba6f46c699969638cdc8a4b962287332476d0d163a10141136f9b913027ccc3418033dee0862d5e572957dbe07d47371c1d932103958151e27";
@@ -16028,6 +17740,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "iitem" = {
+  revision = 29613;
   stripPrefix = 0;
   sha512.run = "b2b37e68db2b33e414ecbfb9078b60ce5571b7ae931ca828a3c668ea7cccd7b93a2919cadc7723daa3f63a7015939a8046973ade140fba01025dde0d5212edd0";
   sha512.doc = "f9f001123e1f49bd90cb3b24448e423068565c9256129e23126791e2ea2bc39788ff5769939d90018087beb1b31fbf3568c6d4962f2e92205717c84aeee54a21";
@@ -16036,6 +17749,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "ijmart" = {
+  revision = 30958;
   stripPrefix = 0;
   sha512.run = "a1fc1aca9f557ea9c8c70343ad1e5712a846b8a7edddf2077e78fabc3919b928a5d7e8b1fee0f0bc29ebf7887e26dcda5bd95f2ba613051e52f13f1ee24001d3";
   sha512.doc = "502aebf377c8b13d7699761651cfd67e1e2d10a8e8a022303921aa1e708fe913b217e186b4e2527d8ed81e3db6ff055dba5edbea218d6b9a92f679da66fefe97";
@@ -16044,6 +17758,7 @@ tl: { # no indentation
   version = "1.7";
 };
 "ijqc" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "55f7693a820f0cdaafe8697ad352cef2748471711113cfa4738931926cb4d49497f4e825b0a737c233541203cb5c8f23dc4f8326950520e8aa0f4ad27f353347";
   sha512.doc = "6b94eb95d58a06b54a1fb28b26ddec15528ae99286a37631a64b4ced32343872a04b96cb2de540d54c54f02361981ecc575ef7d014a17e1d0111883e92671fad";
@@ -16051,6 +17766,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "ijsra" = {
+  revision = 44886;
   stripPrefix = 0;
   sha512.run = "9d5db4217675af4577fbf9b7e8a5dc4a42f447e7af60a818d740327326d478afa9071be37c80315b0822fec48d1fefe4e3d6a8dfddb6f34fbc11cd81a5d05a12";
   sha512.doc = "a3424b8ed16d1881c5a2c4d80a42277a1c0e3a62484a0d5ee6a18a9ed9fd39fe0de241fefbc723960bfee331908bb5c95a0b1b95ecf5e06d6425ac8e6c2dc342";
@@ -16058,12 +17774,14 @@ tl: { # no indentation
   version = "1.1";
 };
 "imac" = {
+  revision = 17347;
   stripPrefix = 0;
   sha512.run = "5e51d080e18f2a5d9529705d0e8745a8c7b2d0186c929e04434b71ed356df3ee2456c268ce2232da9cdbf6c15182f6580b2b96995a6c48e40fcff1efb001cef9";
   sha512.doc = "df4232356db6e2001277bdd8de706549d2f91b2d59d4a55f39c4aa9628e1a2b6ce092a7630ed4fc20096d069d19f2ecdf445129a870ca8bfc9d87e522350798c";
   hasRunfiles = true;
 };
 "image-gallery" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "0435d5011bdaac97c6f36202a03cbe52cb45f83d7dcf37111b9c68706e4cc971b5b13ab5fe0b29cb296f7af4b217a64b5507ea00dfe63e8496e10b5adefeed8b";
   sha512.doc = "ae9c965bcaeaae17b8a815bac824093a5834f2b96c99bf44527d915ae251cf1dc818279f78d3cbe75e51875e658d47baa3b9657e27f5121ed4e259ae5cc052b9";
@@ -16071,6 +17789,7 @@ tl: { # no indentation
   version = "1.0j";
 };
 "imakeidx" = {
+  revision = 42287;
   stripPrefix = 0;
   sha512.run = "6ca0680f29daf88dfbd26fa87d47a65c8b2c2d534321b814ff78d77d0b97d7fc5654b4dc0b91d12eb0c9373cfaff5fac59f24def8d0f50d97da34fda6f839d84";
   sha512.doc = "a07d9461013045274f03145e97d286d930055c4573e917a78e8913841cae30fb61b99e66d098b4ba014cf44e92982301c7d72414e3ce1df176bfd35ecd26ddf0";
@@ -16079,27 +17798,32 @@ tl: { # no indentation
   version = "1.3e";
 };
 "imfellenglish" = {
+  revision = 38547;
   stripPrefix = 0;
   sha512.run = "99dcc3e48c55b402adb5e5481615a35f4d6ecc535cf68ac95b223e13bedd8edfad2dcb2d6ce99712646b52d384e02a1500f333823a343d887f87fbed44a06ccc";
   sha512.doc = "3ae58fa270354ab028a4cfbd6d23ba12a9969073f28db5ce2de4888af2ec70a904767dfe692ff7ef657e5ce13747e7a2602856b0ee4cc92db87ac8e2f4a9e635";
   hasRunfiles = true;
 };
 "impatient" = {
+  revision = 53321;
   stripPrefix = 0;
   sha512.run = "dbb5efd07c2a88643c5b49a9d835061ac13c1dbf4356769b30b7d7ceff8c29d75b3abc00dcacc9cc901a449bf18b95781916f9b33c3917e86310b0923033301c";
   sha512.doc = "7558bb2138f0b09179d3979f46328366a410a540e51aa59380c6c5107067dd5b9b350be2f38255a271f75b01bf4669fd64e75fae7fff88d4239b459f70cc5988";
 };
 "impatient-cn" = {
+  revision = 45751;
   stripPrefix = 0;
   sha512.run = "216d5bddef463d26c6cec794a38f0b6d325aa1d4cb9792b642715d71d4f30f1d73396036f8eda79b12498c7ff2b3e1e3d2e17d04e3f071f90e8ca35b3acc04c3";
   sha512.doc = "00140f4b38177ad8c3040cb29a90545da65f2f6100d7058b1974a174e3cb9e4ccf03f0f9ba196953fdf6636bb44d46a1346a3f812aacd177247f40d16f1b78d4";
 };
 "impatient-fr" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "41bec2d1167dc2f57a09d0028411147f8bf31d5e020408bebbd1b6c6577d531a38f83ae395146da699a53d9504f7f6ec1ab5edc5d6b559527867b352e4a8a551";
   sha512.doc = "ca3f388df4f17940ffc3b27ec1bb6d07d3b8728d8de011975b4f2696a96eadb45f208f5455890491af6fb169c30d6cbc6849dd3d25b6aad0284f0a65a81c8e9e";
 };
 "impnattypo" = {
+  revision = 50227;
   stripPrefix = 0;
   sha512.run = "7afd6cf1fc2738bda4f390fe7f2f9d5e1bdd33c2e6bd32b4dda5b232005589f38436813d9e5effb6feae6371896be453b608ed61c64b9bf38fd25ec400c4b101";
   sha512.doc = "086b106a965e0f469cbf3560561da7d84e4151d5430d42d87c2c52568243305e20a1bc99ec4b252237f4c61369127683ff7b629013af8c76e9dc8ea6e551e24c";
@@ -16108,6 +17832,7 @@ tl: { # no indentation
   version = "1.5";
 };
 "import" = {
+  revision = 53932;
   stripPrefix = 0;
   sha512.run = "21f83a762b00d159f157807d8e2bb4eb4737d3989f2d01b4943e6000b6f7b4791b084b39e532ebd34443c90cd213d7889c319343e64f9eaae6a06314d7302810";
   sha512.doc = "e3d3016d04bb3b069f9dd291447fddedc3db7c498fcfdaa6b6d44f63e7cbecef7cf4068c92012f57151d2fc8b2a5286a3a2df47e7e65c08ee39ef18b5c2b3a94";
@@ -16115,6 +17840,7 @@ tl: { # no indentation
   version = "6.0";
 };
 "imsproc" = {
+  revision = 29803;
   stripPrefix = 0;
   sha512.run = "12ce0d8ccdcd54890f846b501cc5cf7af00f7759c916147c676358b689b852a86a1981b76a14e455a4edece20ad1857100123f91469dfb23ba168177e15fcafc";
   sha512.doc = "a4007fe80cca88525dcade8d8201fb82a2c35cafd7bf92a8ebe6b4668ddce6bd43e958e1223d5c212e91ca692df39aae84c4a25b6862afa3aed2f1f646eabba1";
@@ -16122,6 +17848,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "imtekda" = {
+  revision = 17667;
   stripPrefix = 0;
   sha512.run = "ae95a9d52ed07e962a9d98cdcad868a9d2dc6e1eee82c38fceda7f7668934caab5062727e75ee3b1824ec60ad112f15541c9519fd494fa8199caaf0e83906484";
   sha512.doc = "6f854d85a7649b49b3c88d99f1f011df514b39064e2c340ae1e807de3e730a46a432afe178574105a414bbd46ae0509b9e88d6c0ff825e74dd55772ed189427f";
@@ -16130,6 +17857,7 @@ tl: { # no indentation
   version = "1.7";
 };
 "incgraph" = {
+  revision = 36500;
   stripPrefix = 0;
   sha512.run = "9a063a51c77ec55136a60a7ffaa259f7c8e2fbc9c71dc2d5240f125be50fc246e2a1d1a6c3379aacc044ad0eb7a754dc27a6445bd12fd63c3d5b2929cdacc133";
   sha512.doc = "1a1be60ab0ee587095ad6e2c74ce356292ce454f3a40fa96e5fab7d48da52b98cabfe9826235b3afae679baeea1b23e5c4fb4d7a4b00279ce0433568a9cf3108";
@@ -16137,6 +17865,7 @@ tl: { # no indentation
   version = "1.12";
 };
 "includernw" = {
+  revision = 47557;
   stripPrefix = 0;
   sha512.run = "a2b43d658ed62ff3a301a1b190cc46f04a4a46f413ed4af3e0f84f1873efc6841cd23fc07d68a90cca50b6ed00ccf654aef9dcb6a8b4863277b06c7e8c666e6b";
   sha512.doc = "8ebde646868cebadd8d50cfca25cd8d924c0112129ea86b0ca3ae5b9f9f4e4fec3c1e464486ec0f92e5cf7b7fe3df1fceb1a7967bfec755c57645e6909705c0b";
@@ -16144,6 +17873,7 @@ tl: { # no indentation
   version = "0.1.0";
 };
 "inconsolata" = {
+  revision = 51433;
   stripPrefix = 0;
   sha512.run = "0356a6022a3370663382f887806a86adc20d9ab7943c5840eb9344a6c64893819d0e3de6b42aec599cf1cfad0cea5724625d96f032f67c45ab282aa386bde484";
   sha512.doc = "bf80610a2a64c12098ee2c9d6d034791cac79154869562723321c715a008479a267c2f4b8cb490b6d4de041c80bbcd25cdc3faef2b1986f2b53dd463c4b81be4";
@@ -16151,6 +17881,7 @@ tl: { # no indentation
   version = "1.121";
 };
 "index" = {
+  revision = 24099;
   stripPrefix = 0;
   sha512.run = "2b9bed00e12b5aa7b1813be766ba7c2e1eb750dc270e9eb585b1cc3d559a3f0c9094919344aaaa51cb6cf7cc132a5f89f8c07c96a12c5b1a5446524d07f4121e";
   sha512.doc = "0e68aca1c5dda444aa42cb1883821f2003c450291191b2eef16169f3f76e03e5ec9d31577574afd8d3b10237309be303538ccd1d4c8edb9757e7c910da7c5f51";
@@ -16159,6 +17890,7 @@ tl: { # no indentation
   version = "4.1beta";
 };
 "indextools" = {
+  revision = 38931;
   stripPrefix = 0;
   sha512.run = "69bb7007041b46a25e9f6bb12d8212a4dd4eaa9dfd00fc033edd94de153e8941cc4de8a06d74516220ade56f2f5800f83a96ea2c02d766939cf70aa3822da63b";
   sha512.doc = "9290dc53a68dcc191d39bc0d1e760bd4cb8db50d7cf70771e60686ba2b1a7923b408f21e777453a6f2ec9ec372ac30faa3ffa2cc6bf7d2bc82b2526327d732a7";
@@ -16167,6 +17899,7 @@ tl: { # no indentation
   version = "1.5.1";
 };
 "infwarerr" = {
+  revision = 53023;
   stripPrefix = 0;
   sha512.run = "a41fd6f2ee199e460950fdd31484be7e949a5e36ca740daaf3a1ffa01103d865f573c8ffe0859a8629456786cabf2f1751dbd828cb5d26356b1973960c854261";
   sha512.doc = "2830f622e2ea8e5b3427a9d924dd5f45f0c63a8a6de82e261102ca2c3f3afd7b781a7e0d50903dc8d8c1bee0674503f3ab935fe81dd9490d4310650097c4ffa6";
@@ -16175,12 +17908,14 @@ tl: { # no indentation
   version = "1.5";
 };
 "initials" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "65b2ca2049dbeffca1a425530ea36357b0f06ae8cc744f16471a29dc9f1668023a7edb184d23c80dfdf57d74f24c9425b48a90133f9fa6c794ddf495e3d0413b";
   sha512.doc = "ba6943a564c000f986a4029d31ead6ee4cec028496636090fc56267dd8594bb20be94e4fa4e4a2f39b5b4c7af1b0db3a74111e45a8ad229f6e9fa8862b11c68a";
   hasRunfiles = true;
 };
 "inkpaper" = {
+  revision = 51447;
   stripPrefix = 0;
   sha512.run = "a5357a2401cb104c64f64d31e9583b9e427673233a4dc6251ced5f23bda1ad895fe499f806aa7dafa3bfb2cb4f2aa9718868d6d3b0a71f249a545960232a78da";
   sha512.doc = "ecd15bcb523948b5dbd89ac387fd427a5041b39f6ae1aac26888632096fd1e797beb0cdee926dfad1b3abc5b55c6e1f599a07421e7a52953d0812261df21fc3f";
@@ -16188,6 +17923,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "inline-images" = {
+  revision = 48415;
   stripPrefix = 0;
   sha512.run = "60957844daeeb2e4956d83e1d57e9721b2dfaf4ad2fb4358f1d27cbda225ceec7cbc78cdae5144d28a946bb9408fa960748ca3aabac709bbffecbbb64356f8a5";
   sha512.doc = "5ec326c1323cdce80f5a83052302d2e18de3b0f054ddb7a29da5002605e1020c81fe0219ee68866eb5d8c3b12b4c138ff56f8a630e6f0455b27eb0a0c905d027";
@@ -16195,12 +17931,14 @@ tl: { # no indentation
   version = "1.0";
 };
 "inlinebib" = {
+  revision = 22018;
   stripPrefix = 0;
   sha512.run = "42e158a9ff10dc165345bd08b18fc0f90b463482fbb824872289edf93269b36b04faaf35cd12538e83ef1e509b7400ee61e604c5849922106368624c6c20f507";
   sha512.doc = "2a00d2f51daca68362b5243d8cc485bff6f64fbb9156d1a221d75dc5eec001c3377e6d67afe5d6384ba3f7504eafd65919f5afca8e1170f8b584eb101c947faf";
   hasRunfiles = true;
 };
 "inlinedef" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b98b83ff26b5ecc9826f111d9faef5aa0f51ebcec7978881da2a61287af7aee022dc1b7812ee457885c7813eee0d2200d250ef45648619f3d105e2df54cd21d0";
   sha512.doc = "6bf73914a9eff5d774ca7b7e37a859b0e7da3d408bae603b74c9f76e379ff6d3558d7e30ee4a246bf3f7d40f18446fc78299edf4eda0228e2f22e47ad09ea024";
@@ -16209,6 +17947,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "inputenx" = {
+  revision = 52986;
   stripPrefix = 0;
   sha512.run = "5550c1d76a0906f47ac3e2303fc57ef9ad1c8442e12e3522826dbe7fa8c971c7ca4241e0a1707f6e10336855eded20e94130a6db212b787383282326aee8886b";
   sha512.doc = "087bca2b38a73530b19dba7343cc488b39ab505ce00b4c622f56f9d40c448e6349052e12358cc8fe6d8db7039c6af4f06910784795a2cb1e69b85eed423d1314";
@@ -16217,6 +17956,7 @@ tl: { # no indentation
   version = "1.12";
 };
 "inputtrc" = {
+  revision = 28019;
   stripPrefix = 0;
   sha512.run = "e6450fbeb0f9033b0bcc586c34f5bb8e9c3a6aae102c15912be315d14fe883b8bea62a59a4a65d0ebbfa9cebcc518b9dedf59297f026423ef14aed2c0a2004ab";
   sha512.doc = "4fe7894ee87bcb81566d1838f52c02902d8f5668662fdc016005e9a44b31f35eef8831143cdf5321717ee590ed14fc6c35305f584a0b63254549f96149ae2a50";
@@ -16225,6 +17965,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "inriafonts" = {
+  revision = 49826;
   stripPrefix = 0;
   sha512.run = "fb8218a74562131139d0125a40d04363df7f50e43c8207181f3c72210fec7f501497b5256cfa38d663c21b466e6c7fa94ad2fae9612f4f9767b32a7f5784f7b8";
   sha512.doc = "b55bac3fce4d012be6d8d604faeff7868b62fda93493e49d7a0a0cc7d992c704de5a845ad7ba4cbd97acc787155b33fbd939954001dc6d4a9b29cef21b0004a5";
@@ -16232,6 +17973,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "insbox" = {
+  revision = 34299;
   stripPrefix = 0;
   sha512.run = "98398c838689cfe22ba859e2983f374ecf94b21bcf46de362056821af31285754717f7b2169f8bfb6fbbbee849449a1f3caf52d1397a901133d0364b392654ce";
   sha512.doc = "53baed8af86447a60bb1a97774778256fc4ad1f08f73e2172a68fa091c32e41bf84d10642ebb426be610e34ef5575999d15be7f0c5a966618cea5b3a3832c9a4";
@@ -16239,12 +17981,14 @@ tl: { # no indentation
   version = "2.2";
 };
 "installfont" = {
+  revision = 31205;
   sha512.run = "cd5133b93c5daabaa0ea13649f3d34c28f9af9f92db54917e64cafca5f5e7fe5169d87e36783036850ccde0002d34860eceaea528ad06e21f08141106e6599ae";
   sha512.doc = "2b61c4b229e0c4ec89c591075e52bcf8c150f5f9584bff94f81ec1f229940dafef11d6b6f84dd086692cbd99e6616685533d4313ef5bc48c56a7494fef3583b7";
   hasRunfiles = true;
   version = "1.7";
 };
 "intcalc" = {
+  revision = 53168;
   stripPrefix = 0;
   sha512.run = "e1087a7ab3f1d695bc20435ef0bb2b806d1cca71eb792fcf46e6c2fc6d819de2ff623a65593b65d5bf228309e3e3d5210ae1fb1452356f97a5ecb45921a7ce0f";
   sha512.doc = "f3cc5dba031957d77cdf39d902eeda96c8405efef52352109a7bfb187e363321d31120b4c66ed4b2e990fbd7085b927599a0956749e4303611cdbec5d9d7179e";
@@ -16253,12 +17997,14 @@ tl: { # no indentation
   version = "1.3";
 };
 "interactiveworkbook" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "2afca3ee8051065d4014cae8ee751f085abe6e62ea0af7d6c036bfd9ae6c3f38a295857d67c7e8f75a049fd618c82ad8b28a66f5c83a387969549cbf20ef159b";
   sha512.doc = "cdc12a36f547787fd1e6aaa5f9dc38b99092f4fd7e71095c1b5ca25730b4d2a5a5fc1636798978741538624091721c96220d91b8f1cc29d7f4698767ce0269f0";
   hasRunfiles = true;
 };
 "interchar" = {
+  revision = 36312;
   stripPrefix = 0;
   sha512.run = "8beb2e016e1a6af0199708355b8f13aa1accc614135cdf1d6dd534eceb6fd5a8d9e611e4d6fe0d72da9effdef446549b01d5ea2aad043f3fe94b81fd3d4aa188";
   sha512.doc = "c36dfea3f3f62660cae4f4653136269247bd109931b2eb6478eba29af089d42b6ea9f8afaf0c345c9364a68c1645e288d289345e13c8582e1639edaea20a26be";
@@ -16266,6 +18012,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "interfaces" = {
+  revision = 21474;
   stripPrefix = 0;
   sha512.run = "3c726602547ae05d0ca055d92b98a3cd5fce9709329fe9e769e5bb02c401a28b9b4cee53e5b1ee21dbb6c1c4223cf7a098aea227d615a45ced885c7c4ccab93e";
   sha512.doc = "a9b44711b1f38c48886f7b4a49b3a58ec5514995c9bed9a067d41cbf35dcc0093fcade7ef28693970f1f017924dc2f6f79d8c89a1efc847f7a8c264cb8f98ea9";
@@ -16274,6 +18021,7 @@ tl: { # no indentation
   version = "3.1";
 };
 "interpreter" = {
+  revision = 27232;
   stripPrefix = 0;
   sha512.run = "6dbbf39f9f0f357f45ae275458f03abfee625720b5f2dd3bbb5a78f60f4c0e8972d153c8d1647f147403f7c665e25147fd0c576cccb226a74630348a9f0a7381";
   sha512.doc = "3408bcb3cd3e6da67294c830870534d3cd620b7abc3ad35d4833e30c831bf93d11dc06d00547888268870c75f6a6e2e861448a0fa197e3e5a3c10aaccc6e4dd8";
@@ -16281,6 +18029,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "interval" = {
+  revision = 50265;
   stripPrefix = 0;
   sha512.run = "2a2fe0ebdc4754ca74962270ec48c69e6574c13e446628f34604b13584e7b14ff33add55744f03a1d28443b5ae87ba79926816bf44781951a729913ceeb4d6c9";
   sha512.doc = "22dcf2288d7f888e76967209ef1fd31bef66dcb9784a45126a945c4a0ea302c67ab4a35bd864355b29679131cf2cf36fc6172017599ccf3025c4ae1537362b9b";
@@ -16288,6 +18037,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "intopdf" = {
+  revision = 51247;
   stripPrefix = 0;
   sha512.run = "e1bbdb7fac641a3aa6965cc6dd7fe1c2df56026991277d25814e07f22722ce9bc3851db045611b121b358c46afecc2d8072e36f435cb56f4bfcf45859741d2e6";
   sha512.doc = "b56f170934bc7d3528604c27d4153800e1069b10ef98f4dcee6276d0c4259327160f8acd381c294490422e34dddd2ebe690d7143aa1493ebe36280323cbdd633";
@@ -16296,12 +18046,14 @@ tl: { # no indentation
   version = "0.2.1";
 };
 "intro-scientific" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "9919021461485fc22ed6ecc0b30d0a23c0a2217c76a07dd8acd87c9091c9d71be0e370ce1373f90e6f5a36a9638ce4312fc674b16ccd0846aab97d1b05674391";
   sha512.doc = "0daf84bdf7821aeb2f7971ed15de5546a13a444f3dc1b757f31490679350199fc893111109fc564aae2c8786fefc9e198e79e817bb318a1ad62698b6a5c79af5";
   version = "5th_edition";
 };
 "inversepath" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "d0d95399067922172799d17cc9b9b4fa7a79cf2928630c63441114c479bc60e72b3e5133b54f8f7925cbf90f5b419c89e07699ecf8e8269b43f969e584698043";
   sha512.doc = "a9dba77a8aa851a5e915e368c5090fc83fd894c22efedffce97ee0915b4ec50fa72efc30f377891b5efc0749c12018228ce400cd4024369cfb81ff3fe62567b8";
@@ -16310,12 +18062,14 @@ tl: { # no indentation
   version = "0.2";
 };
 "invoice" = {
+  revision = 48359;
   stripPrefix = 0;
   sha512.run = "7ddb8e05d88321f45cfe8618c740671e17e79ddf53fc2c11a3b9224a27ba1ebc815635484f3dfb4c849d90efb859412028df1e7f91a4e746cf812b19e5d1a269";
   sha512.doc = "7b827f575eca669f15767be9fd215e827a3e98b03ea3e1f353039f5190fa7d75a5e59dd5d89ada982518101fc5164449843656c60a65679dd82061dbfcb95ea2";
   hasRunfiles = true;
 };
 "invoice-class" = {
+  revision = 49749;
   stripPrefix = 0;
   sha512.run = "d31a445c1696741dbbdeb4f035358cdabc9a4ff74855c432dd2b6d66b0d690e65e400207bafdb643a1ae7bee3b3472393043088521a685251acaf9abadb08769";
   sha512.doc = "a3ab71dd11f6aedcb7ce8a89f8b97f8a18ac4c610e3460fd13c1d31b8db0d347d25ff6520af7bd4d37453759d03db384df9e69b281307a36a1d05b4beed0a60f";
@@ -16323,6 +18077,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "invoice2" = {
+  revision = 46364;
   stripPrefix = 0;
   sha512.run = "a790c180fedcf407b999e018cd96b1a0440b07f98c403e9c9e780863f2ecac4f4559ffb88f6a3e4f6080c89745d8a99e5ca6ee98299c7529972edebe68e00eaa";
   sha512.doc = "fc4baede264c6fd1ec94338829c6973c79c04f21284532194196063b3499becf2bbc2933644ca8b870608e8879315f724b173bbbd26548d24e1649929feed7d3";
@@ -16330,6 +18085,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "iodhbwm" = {
+  revision = 52118;
   stripPrefix = 0;
   sha512.run = "694c87987c02504c3e9d4db2c094582b0ed979d240f569a8d8fde37563885b23fea977c6671cdd7be464d7fe1fe2870dd321afd59ca5a33fcb7f0dbc6d6a485e";
   sha512.doc = "a94dae7e699365fdedda975b69905861a2187590269ffa65256d97e28c8b7a89facd79edda6b4b177afa18df3b790c6a2e95c82cb59b475a7a2e57c7e26fcf3a";
@@ -16337,6 +18093,7 @@ tl: { # no indentation
   version = "1.1.1";
 };
 "ionumbers" = {
+  revision = 33457;
   stripPrefix = 0;
   sha512.run = "f964955ea6470a8906dd7623bd6959aad72ab4da5cbd4c32aa78cb2350cda05a1f577316ef97cdec9658deda027429462b70bcdad18024f255191b2f6cd7f99a";
   sha512.doc = "5bf57ed5617846d10834f880e4a1c029547f1ac678a52be3e79613803b4e6cd0986887f2a44a0a4bfabaf9134ef39c44e420a12047fee81fd34243ec42c5262e";
@@ -16345,6 +18102,7 @@ tl: { # no indentation
   version = "0.3.3";
 };
 "iopart-num" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "49fadfe2a8a1796131be814b170e270e7d39c035419d7e546e57d2ef1fea13d48b2b022eda463829e1bdbe60233d361773321d86070420ad2b63b48154adf18d";
   sha512.doc = "167b0612883558f74d7696a6c9481fbb75e9ef6e7760edc4f79d81b3e1d7a344dc1efbf638eb4f5ba69be7002391211024f7aafed2e08e19fe559b58b0f7b1b0";
@@ -16352,12 +18110,14 @@ tl: { # no indentation
   version = "2.1";
 };
 "ipaex" = {
+  revision = 52032;
   stripPrefix = 0;
   sha512.run = "c15157c117594f670a5779bc33e1cac043fda730e2b7a95d781470da2f42075e387d2a939976d469f1b0d05804b2907a7daf7ddb7d9f45074239c6893d89c21f";
   sha512.doc = "04fca8414689b3b828937ba46767415b3b2de1a4cbc87ae95f790aee4bc82b658c1ff0ff705bea0c45952589693cb357cdf00c1721722d7c340a32f502d3b961";
   hasRunfiles = true;
 };
 "ipaex-type1" = {
+  revision = 47700;
   stripPrefix = 0;
   sha512.run = "0dd513aa3cbb9dba7e1099f7f08d839e80002fc5f5bcfc2a2a013dc799a0a6389f128fe72ebc32b673afd66f3ebbc7fab9b97c31763f94b7ad64eebc83b2f569";
   sha512.doc = "1c2974ec35c0291207ddf560b6cef4cb5b161fb59e80a6508b4f88aab5ecf93c6a3dda2a3107a40e838235f5af22ce23704bf4f13fc4a0b344f0805c29655605";
@@ -16365,6 +18125,7 @@ tl: { # no indentation
   version = "0.5";
 };
 "is-bst" = {
+  revision = 52623;
   stripPrefix = 0;
   sha512.run = "491b40704ad4c36e7ffac12bd5b823a4d796a9d52b82176cbd9654b6fe07d3a8a0c63f9756070bd4a971a33836e179ce6c7609e5de2eebddfac9c6aaecb92b43";
   sha512.doc = "bbd5aa6261779b7d395a89c04421c680b6906f795ec713b9c72bbdc282fbf459c443a08ccc7c395ac5274ef5aa1b3f56cd773e50faa7ced4ab4629f1b91e73e9";
@@ -16372,6 +18133,7 @@ tl: { # no indentation
   version = "2.03";
 };
 "iscram" = {
+  revision = 45801;
   stripPrefix = 0;
   sha512.run = "6111c93a14c28572c17a1336fdf00ddd16b6c04b34b4a10a1b4a5e46742852b949cc99438397895de36632c9f2fd57c4940a0ffa458ac148b4a5e49707e5ca79";
   sha512.doc = "24f5ebac7b8bfa826cb9ebaaeac0ec82db18807c5c3417dac53c6b636f6cb32b60901ef51f0d545cbe185ef0eef034404d3120c1211bf65c4ed4d155c67e19d2";
@@ -16379,6 +18141,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "iso" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "1ee4026383b28594c02ee7a3fde24228ac777814456fd8580954b1708ba3f735b563beaa291cea859c6492f8b9cc488635b67e373fc3afbd8f884a3b6d30a392";
   sha512.doc = "f5c874d3e00fb451f81a52f5711ac0b1c39ce48eca50a6edc0b1049bf4aeec43830fb534e207d852bb440c96bcb86d960d5e2e0670610d7cb9eabad2ff1451a3";
@@ -16387,6 +18150,7 @@ tl: { # no indentation
   version = "2.4";
 };
 "iso10303" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "40a36335c15b453d2e5b5abc29b2ec1891c6f1502ee2f8ffdebd2f9a159cea3aa28eba7c661c12a0445a4f713b77079d8b965ac955123fc81225cfd4491e5317";
   sha512.doc = "24c2a83508282a348d6748bbf722962f3ffcd193cd1cfafc4ca1e87c60622e463e5fd382ff65235590f2a9d629e8f40588630810036d2195172f61d1448e3dfa";
@@ -16395,6 +18159,7 @@ tl: { # no indentation
   version = "1.5";
 };
 "isodate" = {
+  revision = 16613;
   stripPrefix = 0;
   sha512.run = "5fa145cde64155e9a4ca7236cf41449169ce0d1aa88381b46935641ed94d166429c1b139c852f96526dda270fb85736ca54e8864c32452996109b0061003639d";
   sha512.doc = "75118f62de8568c9826dcc11b753511f57b7fd237cac6aab1c75377121fad2179c81ae5ec5f64ec127a299beb88abc209727d17b1ded623718c7594bb7ca5da0";
@@ -16403,6 +18168,7 @@ tl: { # no indentation
   version = "2.28";
 };
 "isodoc" = {
+  revision = 47868;
   stripPrefix = 0;
   sha512.run = "09256daeeb683ad518302f29d5385b4a084dce7fb6add48249fee7ed9920c1585f6c7033b19f466d9bec3c396c1b7950c65cc736be650836e09d3304c14312cb";
   sha512.doc = "0e215043768c2b55d20aef9ada76bf0820e9207ecd3674e4769944885477db9392aa978a90f221da17d75a010844e87988a3f449a29cfccef2c9560d5a98c903";
@@ -16411,6 +18177,7 @@ tl: { # no indentation
   version = "1.10";
 };
 "isomath" = {
+  revision = 27654;
   stripPrefix = 0;
   sha512.run = "c9ed49ca5df0932ab59de0988de688fa119682810c3163ec530a8cd80f439eab858bca4dfad85567dbc2de08d226117b4df5249ff29f247c208ae2b1739165f2";
   sha512.doc = "55d94c6b4cf4c2ebc0eae4998f8ed6a1f450efa70e1644549e169cabcc782f1acb879c99bec5237e3147886c696c36f675e9f3c452da9f9880570dabf7adc5ad";
@@ -16418,6 +18185,7 @@ tl: { # no indentation
   version = "0.6.1";
 };
 "isonums" = {
+  revision = 17362;
   stripPrefix = 0;
   sha512.run = "d82a96c2208dfd59f091b8316d8b496115ee56d51e5418344f128418c3b202f0ee20bea505c05f5e81f76006e2efcef48b2d3592bb5c550e219b5c8e4a6e5f4e";
   sha512.doc = "5ecd4587ad6d782182986592bb7f76fd62ccd2e9245921b48ae28e9e381f4084e0d5930b32815ebd074be4190fcfd6beec8be890014edd76e9a5b4958f71d6f7";
@@ -16425,6 +18193,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "isopt" = {
+  revision = 45509;
   stripPrefix = 0;
   sha512.run = "2e313aa3afe2e1457a794834c1c5eddec66ac2d17fb614e15e6781a23ca0834a3fc2d68632b07e55618c6d8dc28de5bb8bf435e34f61a419cb27fa53042d4a7c";
   sha512.doc = "94498c64a4acbb2b41a7e4869b628c683a975f1ba28a8b721b9c44843574610a47a39883f5333b405bb8c02d49f50c3d9ee4f344c27b5e5c0d22c181db46bac7";
@@ -16432,6 +18201,7 @@ tl: { # no indentation
   version = "0.01";
 };
 "isorot" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "788b712fc11f3e4dccd58a75a950752d0492dbc30f0475dedeb26b86e500d0d23c4babf0dfc2361fe16e74d7b37d8f5605b4d4faf1e7018642a5e9dd1be73be3";
   sha512.doc = "4aed42e6fe61aecba99783a1173d903daec621e7d5e0867f6f73319804bfa7727a2a2dac204d792b76a98f8e291bc563bff364360b19ccede2b79600a59260d0";
@@ -16439,6 +18209,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "isotope" = {
+  revision = 23711;
   stripPrefix = 0;
   sha512.run = "27c03c4c6519c038185ee485e94ac51d90c21fd095e4a4cb6d91b06f98e7adb7a423a53b1df035514f58cd0556ab0ecb1afd55c05008e558812d95de2159c8ba";
   sha512.doc = "e1a6e798f894f9455e5d2144a935ee2960199e65db0499c4a900f888065eacfce72269f6808e01e98be3ea3440144eb4004c53af26d80d6ddda1be5df5492b1f";
@@ -16447,6 +18218,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "issuulinks" = {
+  revision = 25742;
   stripPrefix = 0;
   sha512.run = "2ac24eb0e19b92e29fa898fcb8cca7e2f64cf87fac408aa0c834f6afc0ef262560a512637b30dcbee2ec06e9f0fc32f344258bab983b1b1d6fd4da85c821c056";
   sha512.doc = "2605ffe2f42560b04fe781efe3c1972ad76f6cbddc7ef68bdb0ece9b0573b8cec785c2bf4befdf339935730a728bf19b83f3597119d3f9705f571350e963801d";
@@ -16455,6 +18227,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "istgame" = {
+  revision = 49848;
   stripPrefix = 0;
   sha512.run = "3380e604bb3153d94ed21ca3c5fa16bcf0d81ff3ff878a3f19ee3f1beea0ab32185ea9d8b0118eaddfb15e483d040bbc5f915ab7bd3033978518fd30aeb5f609";
   sha512.doc = "9838728c32479b6a1229d2f9e9755209c07520bd691452bfba81a62f21ba929237bc916c5f49523610516aec6c054d080086c82be277eedd5fe4b0006b4be8e5";
@@ -16462,6 +18235,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "itnumpar" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "73770854d45bf404e874aeda0d0bc95dac7ba266cb012fe4af7c4e7686c078b1314500ddaa767b1652e9b05b02691c93cd24b34d6b145fc30c0a3f56693f6a17";
   sha512.doc = "b7c81a74d816508121f0449580e4599092bcf3d176cbf9f754fe9e662d83a5c8b66e52e43b2621338a13b09c44babac6a575f1e8894863402c028dc3ed792486";
@@ -16470,6 +18244,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "iwhdp" = {
+  revision = 37552;
   stripPrefix = 0;
   sha512.run = "7153fd75ec63a6abbb4d2bbda8a5eb150f4b202b72baec8361a810d28aac5690f76e4099ff3a616a44077337ace469d6a111d4e42ad8d68428144b7fdee58575";
   sha512.doc = "f75a9d0ea4b69de5a82659e18a0ea04544c93b056c52efac534e16490a5ac78b329d700f2ed7b3e8564a72331489106bb7e735c44b3e24ff943c6ec0b89eaef2";
@@ -16477,6 +18252,7 @@ tl: { # no indentation
   version = "0.50";
 };
 "iwona" = {
+  revision = 19611;
   stripPrefix = 0;
   sha512.run = "2a125919a015c82e00bff575407f02a6c9a176f83a6017df682b98af55473e7e36ca0a94ff27091a3a4279d42fea9c49f0d8ae6da7e852ae9c44389dd5d8f7fe";
   sha512.doc = "87128ca46f7f2f13f8f886fc1c3da11f17636637632c0d39ebae07dfe70ec92024e1136da7a736a3fc8d494e856b86407ef9c01cd54a56fc2e41372bc0f1c4fe";
@@ -16484,12 +18260,14 @@ tl: { # no indentation
   version = "0.995b";
 };
 "jablantile" = {
+  revision = 16364;
   stripPrefix = 0;
   sha512.run = "40fb96443b2194adf8477a68d9d435101dfa42471d02ec48a37968d21e12802ff1feffa830484642b457562392b6ea147d394734acdffd735a8a5db421d0eefd";
   sha512.doc = "00e753a85f3521ac0c6f336e0e563bd0a68a5e2ae756dfce72d3cf59a01eb9654b6f5c9ad9b83047d3d4f7743b7cce6f2d0d734510532db13942ef6619ae813f";
   hasRunfiles = true;
 };
 "jacow" = {
+  revision = 50870;
   stripPrefix = 0;
   sha512.run = "11cdae5bd4387f11e30200f72ebca29a0c19c61a44570fd02de40dfffe1b7578defadb15eef1b7e9d06d5f394f816ab8a5f46994b3a225be446c693dd23796d1";
   sha512.doc = "6872a79aacf4a59ab408fac511604a596c40ad8dc991d0519afd75590a1e3b06ab24c3b7ad33eb4a8447e14094fb34e64d52cea75fd4d41b2ef1e600b4d12d6b";
@@ -16497,6 +18275,7 @@ tl: { # no indentation
   version = "2.4";
 };
 "jadetex" = {
+  revision = 53786;
   deps."latex" = tl."latex";
   deps."passivetex" = tl."passivetex";
   deps."pdftex" = tl."pdftex";
@@ -16555,6 +18334,7 @@ tl: { # no indentation
   version = "3.13";
 };
 "jamtimes" = {
+  revision = 20408;
   stripPrefix = 0;
   sha512.run = "72e2dc3995f173f75aa4714c397bb036c140bace3b17ddbf321afad677ad397c2be804c890df472f89e15300d4645d02d8ce3746c33fa37be85a9d9312ece3a7";
   sha512.doc = "bc14db250b9d34e700c0fed6390948b39022f7ba39cc0e083c6a1355517fd10aaf7065f6ca90f40a50aa0cd6557a35cdfb1534aabff12ec6c462a2fc87ec699a";
@@ -16562,6 +18342,7 @@ tl: { # no indentation
   version = "1.12";
 };
 "japanese-otf" = {
+  revision = 50769;
   stripPrefix = 0;
   sha512.run = "e62e32e37fd460dd16a5bf62423564a83c6fc16a9b485dafee5f00fd4c3342e3b94c78731e25a9fca3aebf9cdf91a4bd1ae6edb8213699adc4c8e7d139e14ecf";
   sha512.doc = "90d9247aecc96871f1def7db153266d9c42292c5f0fdd7b835392cdf61d2b15c908e2895868121dcc5dfd508c75c1b7424104412a2b75e430a8fd2f0107cb085";
@@ -16570,6 +18351,7 @@ tl: { # no indentation
   version = "1.7b8";
 };
 "japanese-otf-uptex" = {
+  revision = 52048;
   stripPrefix = 0;
   deps."japanese-otf" = tl."japanese-otf";
   sha512.run = "130d2667c3829311153121415d27d880e475e121a16a8f739b018894b93d2f45200e50c53ead912419900100d596ce2cf6c047a201423690ea52ae415d82982c";
@@ -16579,18 +18361,21 @@ tl: { # no indentation
   version = "0.24";
 };
 "jbact" = {
+  revision = 52717;
   stripPrefix = 0;
   sha512.run = "0f1cd72dca41b37c26d863aa734737ad128f5c39c508db13a3e91e4088477a99d9978aa1ed003ba0812e276bb4d80e527c80915cd7a08fd1cbe968816359814e";
   hasRunfiles = true;
   version = "1.30";
 };
 "jfmutil" = {
+  revision = 52026;
   sha512.run = "8aa9ff7477739e75824f7c7242a02cf6186fa1a7a37ae145f7fbe989d6a7fd774c0428c60575609b235cc8d1d4f0f108cf6bdd7cb1003a0b12b6b6700e9414ee";
   sha512.doc = "b607607ac051370a5374d57f2aebe33a2763029bee0e7cd8816a614e3a49728d4ef4777ed5c8de4d9f09edfbf3524959c3f8e644d811105e5c69d93496ea3dca";
   hasRunfiles = true;
   version = "1.2.3";
 };
 "jigsaw" = {
+  revision = 49111;
   stripPrefix = 0;
   sha512.run = "3bff01425c502c98894fc517be9b4af8ed48bd5a059835fb850ad1c58a2618998967780a65a5bb43946acecaa397ea51fcdd051dc2b8c863e27b55fd3beb5230";
   sha512.doc = "17c263228124da3f17ca338738add762992e2674b0e0fb80e250c8302cc59d11bd1017a1d4e005a7c9c9d66444a91851cfd6e505a5e1f6fb73aef7d5ee703d31";
@@ -16598,6 +18383,7 @@ tl: { # no indentation
   version = "0.1a";
 };
 "jkmath" = {
+  revision = 47109;
   stripPrefix = 0;
   sha512.run = "8e549db42b25c2edac71013afba0ebe3e09859ce4ef104da2b969663014cb88c10bf1c8899ee181070e6cec1b28d0ec9e5966d27f2176e2032d6855ded8ea941";
   sha512.doc = "99a954f6eb917333a8e6c4e3437fcd16f6950e0473fc1a48c99d748246c97d5a3df5b96e0314a9ec5e7c6bb0b318b934c40070ec94df00546e49cf140aef23c2";
@@ -16605,18 +18391,21 @@ tl: { # no indentation
   version = "0.1";
 };
 "jknapltx" = {
+  revision = 19440;
   stripPrefix = 0;
   sha512.run = "0369405034393ea8de2cd94497a97ba6c40264ec9142eefee09647fd4e51f83e169a99757a4b92c1c9d911637f137404fa54231de452bcd208ba3f9982984153";
   sha512.doc = "cadb522c007963278990e75a011e22d2c6bd8429e55fe5ecba3c2f20b9ae13fda4eac304bc405440c1c1566b1458e0f3e77a6d4adc77117b20673204bf502131";
   hasRunfiles = true;
 };
 "jlabels" = {
+  revision = 24858;
   stripPrefix = 0;
   sha512.run = "5077471a09df4090e087a465e9d1823668ab80f088a7d5fea7d14559e9ea8906dae029a2093038ce5e9f013bbe3a9bcd74d8626e6ccbcaf7ebedd5c2f1e3521e";
   sha512.doc = "7736480f6736d8b623fac61683321eb7444ca8672eadf0da200eeca928de9dc031152e4599783d602e9c11b58463b03fc1162756edbaa5bd3dc1f6c5b64e08a6";
   hasRunfiles = true;
 };
 "jlreq" = {
+  revision = 53717;
   stripPrefix = 0;
   sha512.run = "0f51670a5cf6c7e7adb2c0c8b5c155d67574ddc5d1c73026bf18a5f6f4cad26bb529a98d32f82936a2740184bd6ef4dc04eeff1b194a2439af9da53f6c173c18";
   sha512.doc = "8bba85d024192315137fcbe494a2ef3c397242d34bf1278dfb6ae54115b8a6bdfe45206b5abb8af89ba39dc16e97d4546ab05d312d2d8a0fbf5cf26ba1ebfba4";
@@ -16624,12 +18413,14 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "jmb" = {
+  revision = 52718;
   stripPrefix = 0;
   sha512.run = "6317f3437416ead3fa1224432bd2cae247614e614f888ea074cfc442b8c7c3832d0243988269a1d772172008fa377b142288f9644bb1e2954c3758c1b75f78a7";
   hasRunfiles = true;
   version = "1.21";
 };
 "jmlr" = {
+  revision = 53616;
   stripPrefix = 0;
   sha512.run = "bb293ba280f8b0d15fc2d3fd997a8992f0664d01bf56d42151a6f71633d077cff751302188c857b4f6c8d1381bb37f1807c1c3ca85ae0427846aa1189aeb5c3d";
   sha512.doc = "d32cb5cdaacf8c865bca05ef170cce5cc92f0a5d77a33162ce5de6e4f8e77c729d876afd682f1972e3207427557d68ca9a822ab3a6ec9c08b1db7241acfc4e47";
@@ -16638,11 +18429,13 @@ tl: { # no indentation
   version = "1.26";
 };
 "jmn" = {
+  revision = 45751;
   stripPrefix = 0;
   sha512.run = "2e250c3f115911c56f9b8d46d358fdef289c624a5b24c9b4213bbf7818bf42c7b778df55d4bf181bce115b388915cedc90ef7cfa99ee6ad8dd621e7853fc7c29";
   hasRunfiles = true;
 };
 "jneurosci" = {
+  revision = 17346;
   stripPrefix = 0;
   sha512.run = "1ea3d11a66045784c2d1abe0290d95482c5a2a65a21963a58d9626872b25bb0d20f8d1c3c3b8173bf7f63ed71f7c33e13c8f6dab0918585b36d72fa37dc35714";
   sha512.doc = "2ed6a342b376ced405a75da39fff51d03e9fffa89341522555d2edf8d8eca701013a95f09f01cbf642d3ed1ba93a1aecc89682986ae5c94d784f3c857eaaadb1";
@@ -16650,6 +18443,7 @@ tl: { # no indentation
   version = "1.00";
 };
 "jnuexam" = {
+  revision = 52696;
   stripPrefix = 0;
   sha512.run = "9fc6ed0fc12a0eec779a511de2582cb6278b4576569cfad310a26bae0ae024336b335b2ff9760f0055463302c51933ad291a25f542a7974c56e17c3013c480c3";
   sha512.doc = "b9650a69d2f8b7c78e165d35c3b8cfebb8e76886f5b20a0592ab6b50ec63a659c5b76c6cbe02b8c5aaad5a7733623fd8c73bed624dbe9651bbb2263339f9019d";
@@ -16657,6 +18451,7 @@ tl: { # no indentation
   version = "0.7";
 };
 "jpsj" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "70b0e83af5b828e6a783d888adcacc504342e2cbe255d88aaa2fc3cdda629fca8e2fec9c98c73c0673d98d396727025b0a622905c3403c2b568d67597218398e";
   sha512.doc = "220c28ed6312c046dcb2973e2e22fd47c683460578dbf952d12d52da0aa4c21a5dc5e8195b78d743c093e05772ae1e00a45d3c221e805a452420c435f23b6a38";
@@ -16664,12 +18459,14 @@ tl: { # no indentation
   version = "1.2.2";
 };
 "js-misc" = {
+  revision = 16211;
   stripPrefix = 0;
   sha512.run = "6dd7920204cc66ff28c78f54bd6432a71d77ae2f4463bd997d2a4170465053eb86d61bc35d8da66377b47cb1eba88c6ed0918142910a5bdd4e44aec41d3ec4d0";
   sha512.doc = "507cc8c04589dfa7b4d36bf32e4c1d18af42b90df58fee128c0ad37284a87aa1adad32623591d0e8ca880c53a1f583b0bd8054487e231bb2a58ed06d1bf6c6e3";
   hasRunfiles = true;
 };
 "jsclasses" = {
+  revision = 53641;
   stripPrefix = 0;
   sha512.run = "e9a932b1a667b049283eea0a75d12cf83513b4d4f97d50a8c9f4a820e139fbd922c8448ea226a367be1450ab96e2184ef4973043589e0f84b8a1d55b94931ebc";
   sha512.doc = "b19caf831b88256aad481a50a6c3cd73f088d7a8514476b7b8c04be39990b341d79437b4774a3291e4af8cd40aadc83cad75fc50f1b8fbe91fce0cd366f0c0d7";
@@ -16677,6 +18474,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "jslectureplanner" = {
+  revision = 53672;
   stripPrefix = 0;
   sha512.run = "9da09cb979caa5ea54466091c785bd6c66e46b93c9182ba426884cf973cd1a9ad0662e9d9053f8749862ad237e7379fa83fae3a43de96712e59267506e0090d9";
   sha512.doc = "758ca6441a1ed9eb9ac8a8445cf1a3bb14a796d888aeaec374abdeee824c1578e5ef02ed204cdedb17dd96ef5ae35f42a8b32ddc826a73d638ff3d250ea259ff";
@@ -16684,6 +18482,7 @@ tl: { # no indentation
   version = "1.9";
 };
 "jumplines" = {
+  revision = 37553;
   stripPrefix = 0;
   sha512.run = "e09ee044fe7d5692fe4f1098406e33481ebdf81698168223235e735637499053c66f278a1f7e27585aaa1a586ccf85b4f5afdccfa3ac35950475f56e46324103";
   sha512.doc = "c7f56f012d6eca83e54610aabf1530889c01c1b28e9b790b220726bff860504a3e46ad4fd8d88ef50d3fff17507710bc168fd2d5861e9f2cdae69cff6f95ae71";
@@ -16691,6 +18490,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "junicode" = {
+  revision = 53954;
   stripPrefix = 0;
   sha512.run = "a0e447471da270a19659d19bb4e18699eda7447ef65b5c5abea1662ff6ca631ccf1a4c0efbb192208a835d8acabfeb51aba3c576578c7e40c13d6d28e727cbd4";
   sha512.doc = "f692c94008d88ed2b0b0d91678072cee6cd379e5a3fe58831a69393cb2de3058c0e7320409385a2112b41c9369255ddbc6919520a222adccb38223b5b2576790";
@@ -16698,6 +18498,7 @@ tl: { # no indentation
   version = "1.0.2";
 };
 "jura" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "08426bab6c0627e945d620a338c6081a8a21d80567d4a4b686617d0d57c99b1e148f5e5c3406a0337ee4ad61bd795dca353c28b0f33d397c5b47515969fa5951";
   sha512.doc = "4d19c663f73791712d9c24361d8e2a0c2faf25bdac15dcce48825f02468f6a798eff7e147f531368bcc8d7e2a1938202b5614e2434cd46866f359f8349564adc";
@@ -16706,6 +18507,7 @@ tl: { # no indentation
   version = "4.3";
 };
 "juraabbrev" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "4d6fd00247c6c915956679674dd029048cb96ac3bc97606c0a299bbaff24a4cbb9440d557eb2945151720265ecb27bf15c638c003e1039dafee56471dfa03945";
   sha512.doc = "ede48ff67dacf107baf50be345b042a7b64c815442875281241b7de4c3be56ec40c969e40ec69669f31058bbbe9b27c51cae25938d93bec99a8c57dfb8e9cb75";
@@ -16713,6 +18515,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "jurabib" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "12a1d9402ca15ff23cbb9818f07290f0b295c9844bc4cf02e1332eb27a26a3a8d0ed3199df1c4f4f85c9ff5308e7426d0c7adad8dc587fe905c5a15314863b3b";
   sha512.doc = "3f804537752bfd7b6780d082b37834c805e521491f39bd76b52541707e69f8b775b9e18bfcba0b0827133be8cf82bab86651f2a7ec351f9cc140427056ca0dc0";
@@ -16721,6 +18524,7 @@ tl: { # no indentation
   version = "0.6";
 };
 "juramisc" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "cbf6ebe12bf72dfb823578ed49066f34059e5ab1beefe0eeee84c7df55135644eabdea7582dc848b52cd575579d8807a2a2723bdb697e851eb8aef88f8a5e533";
   sha512.doc = "3925418b9e4d05def76b9e0ebcf882c4b7061ff7ae446aa63d412c093caa04536ad45c757e04e088c3b4099c569885c6e6708ad31b866ebe89ecabb8395964b2";
@@ -16728,6 +18532,7 @@ tl: { # no indentation
   version = "0.91";
 };
 "jurarsp" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "511130814ed94c7f0829802a0c3e8e613b0c4aae50854f6e06779448f430e78c8712142fe04d3662b799a488d90944072847dd223b01b642de78c1f98649e79a";
   sha512.doc = "1c439e351102ae3f768ae38404cc5d98403028fb6fa6088cd53eea40593ee03c10d20955f3fadef41f41af6d23f139ba356a9b06ed735644b67d3f42a076e0af";
@@ -16736,6 +18541,7 @@ tl: { # no indentation
   version = "0.52";
 };
 "jvlisting" = {
+  revision = 24638;
   stripPrefix = 0;
   sha512.run = "70626cd23359751909ce385a7ed4415c5641e9c303d0dafeb99e36d0151f382c02c2f6818a135bc92fb156d4fa25d1976b2c906074fcc112e56a1a7a458801c2";
   sha512.doc = "de6a694c26332d9c97bf4202bec0989370226b7381d080c4d6f5a106cd8f2bf352d756cbe7cede2a4ba3e17f85ad553e5c24e874a00cc1dd307325125e6d0bcb";
@@ -16744,6 +18550,7 @@ tl: { # no indentation
   version = "0.7";
 };
 "kalendarium" = {
+  revision = 48744;
   stripPrefix = 0;
   sha512.run = "fea39ce08f6028f078e2d87ec73aeeb56d72006d24d316f8e257b3c71604efe2b4ea2fa698f79798ec5c9b3d271d758d4c0699ffce1bf380a74d21158224eabb";
   sha512.doc = "60a1dcbaa92fcb4438f4a2416dc4784fc30af34c6e1511533b8827a266b61a62a6c0e66f51b27ce81dd879d774e9fee6b155a048ddb9f68e1f991294791739e1";
@@ -16752,6 +18559,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "kanaparser" = {
+  revision = 48052;
   stripPrefix = 0;
   sha512.run = "a9db1fc66330bafc5fc26ed600f1779dce328d6234ebe930aaff65a02a0d740188e73c5f73a9c75d69926323a610dca4b37044e7357a141eae9bb3231fd3e272";
   sha512.doc = "9eb00a9652f22411f9ae0123bd2bda62af617f39ed3eb8266c4ca38ff0783722a3d1eb05a0fe1ef6a238a3132ade65c5ebd882309f154ca416e2191b9db44c4c";
@@ -16759,6 +18567,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "kantlipsum" = {
+  revision = 51727;
   stripPrefix = 0;
   sha512.run = "7aac4684e6d08b46319b711a824dbe33446674f63fe301e366543553e6fc4c41aa1eb9aabfc9d11710014c9347ac559dfa1882478f6ec5d9edb39c5dc42cda8d";
   sha512.doc = "bb96e91c7562c34c56c7170e246eb71c353d67d649cbbaee5904f6bd82b905b93e79baeee536a3d8eb8b9f08296591a8d0fe621883914f4af676f78c6f244523";
@@ -16767,12 +18576,14 @@ tl: { # no indentation
   version = "0.8a";
 };
 "karnaugh" = {
+  revision = 21338;
   stripPrefix = 0;
   sha512.run = "344027bcf79a9b1d3c408aae774bc532a39e7c638c4831d2566e7cf5ba5780161c6314bc0f9337de21fa08a2a2d72f3b5ccf9df7a521d7c95b4dc6e62cf2136f";
   sha512.doc = "379638ab38cdfe3d94d049fec7701995566df9c5451f4f6a862c7cde232ceea899222b13f3c40398676bd2746305ee48e8b43781804cd24f48f36946526d23e4";
   hasRunfiles = true;
 };
 "karnaugh-map" = {
+  revision = 44131;
   stripPrefix = 0;
   sha512.run = "dc2327e4cda55e4b60365d6354f679f9bc68d87a3d3695eb98c2754d7a5f7f64d65db8732b107f686fc39a07868d4703afc0fba754f42af3fd567a143199580e";
   sha512.doc = "0daa9aafafd67df8934ff2b7b31794b23c8ebc53fb142f23111e64957a75904c4813c6f40512e4a440861351a2185884969cffef35209dfddbfd9ac4007e6557";
@@ -16781,6 +18592,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "karnaughmap" = {
+  revision = 36989;
   stripPrefix = 0;
   sha512.run = "72c5ee674d7719b535a03cb9180a605fce2ac089c875cf57b95739b5c139bc45552960faf8f3287731fbe12c8402ce3c2c6517513d20bbc484e12a44468d6ec7";
   sha512.doc = "c79e28dbfb45764c3f5feff21bf3cb8ec5ee41380fe43d35b2b091b1e263db1eb417a19c74987743c04a2f41fc2c3655fdc531c8971320580be48beeb4d3d6eb";
@@ -16789,6 +18601,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "kastrup" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "d7cbd22ead6633284e9d114d90b2cb47924bfeb10c15eb350e4c2f82b883930c953410362313cdf8ac476a68cfa3a9b020217097909504b97a8ecd7addbc8d97";
   sha512.doc = "32883a008b0f44c341fbd5f65f9783e403fb5751201235b0c4a2dfd9af8400e1a36adaf4573165688d78cacdaad3c8b2ac1b92ba87ef6951d3bc5330537d1f9e";
@@ -16796,6 +18609,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "kblocks" = {
+  revision = 52382;
   stripPrefix = 0;
   sha512.run = "dd234caad6b289f85109303a8e3f770bf7393abcf1685f402c3d44234d6ea4da060b9995b8bd2c11450e463d4b729538ab94d41e76deb9a0fec07bc1f909ea5b";
   sha512.doc = "924ed5dbe96eafc0bf8dd2fdffd4cfed43e7b8f236181553c999ff07a40aa3396e0b7fbf5c474b50d7c1c5cccdc364f941479ed710003055fbfefe2a34cebda1";
@@ -16803,6 +18617,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "kdgdocs" = {
+  revision = 24498;
   stripPrefix = 0;
   sha512.run = "79b64f2f20b9da908fd9acee1033fdef290c30e99794c37f5020f33dc5fdbb670383463bc17614f4ecaa1d5d4c03b4ffd3aa4f2b7c53f27455740adda9d0545a";
   sha512.doc = "6b579a44d041a10eb9224aa80c1b59b113492cb12c121b1ca5f57625d044b52a80cbfab63d7a3160043b41b1b4e27d463f5ef8c9688f620f431fc1937a8bc561";
@@ -16811,6 +18626,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "kerkis" = {
+  revision = 52753;
   stripPrefix = 0;
   sha512.run = "07d24ba7d57e46d8a2484ed9a7633cdd42062f99c9c48b0dd385159707dbcffe3abb2fdbf8dbb3a22c2532ae86e0c4ee6709edc0eb9cda030f78f7563fdc3646";
   sha512.doc = "d6f17d255a04ad88c9ddc6a1f50a18e98a06222d9153b6fdda96bb9858bc7bcf26ae2797e617e69c6b701eb5705d71f29ae4644c98eb0c4af9e3db00cf929250";
@@ -16818,6 +18634,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "kerntest" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "9f295c253228745bdd91db65f2e414bc6113d246242ea1717db6659c2ccbf72530fdc326c0ec499f6d6c2af3ec8df2b78965666dd8544e07bce864716804e76b";
   sha512.doc = "b471544af9d1ecfd6225e4b9d61f05b4da950a6512ac4c4bab54b1ef9befa859ee5aee2498690e724d84313808d2abc8f005fd4e121891878cd2dbd03ae36415";
@@ -16826,12 +18643,14 @@ tl: { # no indentation
   version = "1.32";
 };
 "ketcindy" = {
+  revision = 53233;
   sha512.run = "a65dd1d1ea906ecb1ee232029230005c781066bca2d7192893b5230a06059feed4416b78d4670df104cd7b3f5afb6c3463868340c7991f770026da2294009c18";
   sha512.doc = "e387f94fb712b223864ab615c26c57b505a313a657f54830a61893cad2273ee82ed362438963ae6447496c57474041ebfdb528d92047e6f6bd214c35d4d37cc1";
   hasRunfiles = true;
   version = "20191225.0";
 };
 "keycommand" = {
+  revision = 18042;
   stripPrefix = 0;
   sha512.run = "90c2246edbfd199d98a05df336ee228c65f26073f3c95c5ae55c3201cf59453bb5afb95ad367ab4af6b36dc4e0c52a25bb10f80fba265003c701122247be50d9";
   sha512.doc = "b99b58407f5d93fb868bf525ab199c41e07fcf5f31c7a6a14cf68622ef3a34e44d1014e4d34594441144af5c7d9a9853cef1505311928b32a9fcbd41c7bf4284";
@@ -16840,6 +18659,7 @@ tl: { # no indentation
   version = "3.1415";
 };
 "keyfloat" = {
+  revision = 52160;
   stripPrefix = 0;
   sha512.run = "3d2be77c6ff60292b3cb50e8033d5f182fa731b6b435e4eec4d6a3f4376e6f0487a6bc5bfbb59da37ba6d620721f3756e42a795bc26547d2218f66b2dcf82a4d";
   sha512.doc = "b678b7e0fac699625b9638b67e3e00b892ed4d0a01d78ef0fb13ce65d2a1e74afea50bbb9f4ffbfaa37b1e80a96dd1cd8f8420e8b1b5f1cbf6f6155d745a7604";
@@ -16848,6 +18668,7 @@ tl: { # no indentation
   version = "2.01";
 };
 "keyindex" = {
+  revision = 50828;
   stripPrefix = 0;
   sha512.run = "93de5becfa1b4950f518bc004f0dbdfe96f567e17ec4b7656326b89201f1f85edcbdaa771dc8568fc0c87bcbd8877b618d0d00ce387ca70036f6794a8b870695";
   sha512.doc = "4be79367bed5a7bc3f5bfd6c10f7ba6a4c87ed51139e8f8a7f55c59ae3ce6c1aa10df1c88728f7dbb4573634bba2ee599378755cf6c77a2ccf8d93ece5540736";
@@ -16856,6 +18677,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "keyreader" = {
+  revision = 28195;
   stripPrefix = 0;
   sha512.run = "d1786b07a3dc87f94248043f0bd941dcd8dccce29132e67118d3fedc0fe207a2df846d850851217fa87ed2219915719e70fa73ec284ed420072654c578ee0b3c";
   sha512.doc = "05c45cb13bd2612dd5b048f296437b605117c71a52cef2a1b90ad58b693a31d05da9491464ea9b208dd7eed3f3cfc96e9b5a00f5a77e5d492208fe1e924dde4c";
@@ -16863,6 +18685,7 @@ tl: { # no indentation
   version = "0.5b";
 };
 "keystroke" = {
+  revision = 17992;
   stripPrefix = 0;
   sha512.run = "e04e13e23b3342686078c2278d3b6f7c8678d99acda197f50296ade3dd91bc4316323a669efd7238fd246c60f169c694677252601a81d9e23b49a1e37049c93a";
   sha512.doc = "bac7f2e879796c0ccd5ee28c47aa79e9208ce0d01456de9ada6cd00d822c098cfa318615311c43b1815de0e6968252f6005a3dfd9d0475ee7dec25f7d24d1d86";
@@ -16870,6 +18693,7 @@ tl: { # no indentation
   version = "1.6";
 };
 "keyval2e" = {
+  revision = 23698;
   stripPrefix = 0;
   sha512.run = "08495711a9b509707ce6da359f9743b267baaa6ba6e18e41c965ce016c4c51e1bb7353769ecc9596e9bc415976449612f602e291608d306ee5baa69a4e823160";
   sha512.doc = "424035c6250990b4104200fdab744d50643b6ce36ea717f50544fecd40746d47d7d2145203f0d6f19652a7217c99eb599a1c7d8b0e3a0fe00e1355c416cd4294";
@@ -16877,6 +18701,7 @@ tl: { # no indentation
   version = "0.0.2";
 };
 "keyvaltable" = {
+  revision = 53861;
   stripPrefix = 0;
   sha512.run = "7d60a87919114209b20bae17603f53b8b22bb1b4ec6b9e411488a9e0eeec661376c0f74c7fa0f229c5bbec771b23e1d0fd8b8ec1167a8f98432f2f196568bec1";
   sha512.doc = "6988e60ca067d77b82c5c339bfe958c0d486c04869c0b74f9c92fe87946079a380a0863edadf136bc54a849f4a751621f649feca591a8d89a402a88453a359c2";
@@ -16885,18 +18710,21 @@ tl: { # no indentation
   version = "2.1";
 };
 "kix" = {
+  revision = 21606;
   stripPrefix = 0;
   sha512.run = "dd819518a80ca0486a191361625b58f91d00ccac88a2f69269bd6e1753f6c87dd3c97d39a14a5dc3768c9ecccbc981106eba1f495cb7870103a828ea69ed8bef";
   sha512.doc = "3d3816d395e69ec83c88fe55801cab052b12f5e38702edafec2d3f9225c80a31165dca553b60401dedac7689c583feb00615e41c7179fd19ccdc420fbd5e6d86";
   hasRunfiles = true;
 };
 "kixfont" = {
+  revision = 18488;
   stripPrefix = 0;
   sha512.run = "a866364705d75ab560488c84a5e403755acfffe7b49b8e6dd65342f45f852a5be9d4072d750fae606c3d5789e1d46458da66f0af6fb9f9e0225c1d9acf69d4a5";
   sha512.doc = "ca250703364924daf9827ddeb48126fb21ff5ec3230afbc3f6778d23e96dbbb16173e5504900032ddbe14920cb40adf8130be50ee92f3c9c2dbceb95b8ecb90f";
   hasRunfiles = true;
 };
 "kluwer" = {
+  revision = 45756;
   stripPrefix = 0;
   sha512.run = "36f0d6ade1e6afbc7a021780a9d6d56e358805be8a8d5835ce256c87f426aa4110b9e395d6406cd1572a362557ba0d914071a6589a65ca064cd77c9310c284c5";
   sha512.doc = "9990c4fb99023e6262c1c7336f4b8a98e3131ae60f380652469f7e2f88a8793d745655e0fc13dadc78fdb8c2beec6248e54af661bc81a8ec016af58b688e583e";
@@ -16904,6 +18732,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "knitting" = {
+  revision = 50782;
   stripPrefix = 0;
   sha512.run = "af3f7d2355054293c2c7973cfd40f0b741c8821884cca6ceec7562efeb92433bb81aa204b7b0ed4dae77cf674f4a63005f36133fbb5bf3d239f0cd5ef61a69ac";
   sha512.doc = "effaaf06a5593a9d73f2e93a722355009a0a957a2067a1432edb40d8dda7649c42571cbc37fc7aa4103ae2094dea7b1bfd861273566102c55546f71b326e7118";
@@ -16911,12 +18740,14 @@ tl: { # no indentation
   version = "3.0";
 };
 "knittingpattern" = {
+  revision = 17205;
   stripPrefix = 0;
   sha512.run = "cee26b0e6fd54a43a12e0e48fd5b4bf381816dabb6019cbd7c13ab5e2561b9f191d9fce4c75a513c06530077bba8d383b26552e2e6f4e97600aa2216547a08b5";
   sha512.doc = "d391a25a224713092128af5adf68e5331c530a67a763dc37f657d8bfcee0d904632e86ae2f3745ec2c4bb0cea5e886c85da15b064780dbe997104b9afbef9e4e";
   hasRunfiles = true;
 };
 "knowledge" = {
+  revision = 53572;
   stripPrefix = 0;
   sha512.run = "6f5d172b155e7cde0a48ff6fca11e4ae8cdf45eb29bbd4ab9a708f62d25de70c9e3607a80364aa1631b828c954dab522748fe3f651be6583b1918db35e1a5b93";
   sha512.doc = "11328ab7c3d5f64c97561cf43167323e084d978a65e2f352e37baaad4b89ec6893bcaa8e90360a971a352ed77d9560713eeb0bc902996c858a3584e1a0c1ff67";
@@ -16925,22 +18756,26 @@ tl: { # no indentation
   version = "1.21";
 };
 "knuth" = {
+  revision = 32899;
   stripPrefix = 0;
   sha512.run = "0444090d99b39e2cdb47060ec7eb07704948efba49d4c9ced27a0565e34bc31cc81e10ec19559d3455ad2da79c5117da3f2d84f2cdd080cf97d5c14e6d02f707";
   sha512.doc = "a2ec4befb238f3cc51593e0aa145d02f40e3e792d4ee13147cf58baf366f9e019fb874179940b7beedf859c9d756a8fde2b6f65e8c6c20e9c2964e980e7dfabc";
   sha512.source = "a5e53275149199e9bbf88f6f6f03759b39ab0401eaf1fee4cc9875eee62a82178bb3f79deea9cbddf5e3153366dd57e43733f583bd66327e73b2e78b0765964b";
 };
 "knuth-lib" = {
+  revision = 35820;
   stripPrefix = 0;
   sha512.run = "8925cee55d97e93e9947e62581bdad06cece4448b94516c72cdc8826ecb8148fd393c0621f57eb92dbc4752626a38029bcfb30963b618027e0fb5459e0b29bd0";
   hasRunfiles = true;
 };
 "knuth-local" = {
+  revision = 38627;
   stripPrefix = 0;
   sha512.run = "8ff3f05e2584cbc5301ce6fe74e469db70438f689323617ab0cd762af9f66fcc8db10ef687dbe5a97deb0771a75320ab099cfd8cb7a900f5ce6c65e2f6fc9edc";
   hasRunfiles = true;
 };
 "koma-moderncvclassic" = {
+  revision = 25025;
   stripPrefix = 0;
   sha512.run = "68aa7ea875f46a4c1d1bbf29d4abb77f4ec729242fab41f3e79caf95a925a076ec3d37ce7d98b44aecaaf9edce541d1673780238786b36cee0621acf4212a1ef";
   sha512.doc = "968f5303bc7b5fa3df39a2a44c38b63e54059a94ac7df2349b45cbc0855d22ec64ec39feaafd761515720d306d5e5ea8a223ca74790ba160bd093f989d8b69c0";
@@ -16948,17 +18783,20 @@ tl: { # no indentation
   version = "0.5";
 };
 "koma-script" = {
+  revision = 53617;
   stripPrefix = 0;
   sha512.run = "b8d227da363192b4ed7e4b9dd65e0e94fd3e77405598b8a10e6e16255c4814c524c5bf8238861f7461831d8258d6e00cb2da29f9e3cf61c1260b108a1fb8f92d";
   hasRunfiles = true;
   version = "3.29";
 };
 "koma-script-examples" = {
+  revision = 47523;
   stripPrefix = 0;
   sha512.run = "df9ccc215a2693454b3f8e1cbce816708415e987451cb652c1b3c2121ff073b7dd0311e3a61de493b5591923edd7688edf66e061467d28a5c3ea437f912568f9";
   sha512.doc = "6cdd548d21897f33927ee33be350b77b317777464ce3c7be24223cf10b6200ffb73944d72d0ea8491795de71c9554881ee52ae157a035b667f8c2c74aa1c3641";
 };
 "koma-script-sfs" = {
+  revision = 26137;
   stripPrefix = 0;
   sha512.run = "3b281a1e94c73e1d8224f6ae552be91e3df344f9031e139334fd7256e38dc70bed4132164935845c710bef9dfe0e8c439c229d3415ff835e48777aea182e7fae";
   sha512.doc = "84f7fb5c11c9b40029bc481d34ef7cca39baa2a3872f22fd5b656e324aa5cc0becf3ff6d894ceaf26e8ddea0d8cc14d428a140e1f19ff2e060c6d32390d51070";
@@ -16966,6 +18804,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "komacv" = {
+  revision = 43902;
   stripPrefix = 0;
   sha512.run = "007ff84d143bf46d2c5d0772111e26a459be663ab40c785a8dbc8b787202f4ccff15060fa7d52cb547348ae1b128a9f66256259c2f72775d4278ae0f4e04c0bb";
   sha512.doc = "58548f1dc27a80a65a275140bef757329a49255353eb09c0c41e7824985603799620b696fcb4af454d85e90b61a6bdc6965cd0f3f2f603674064be502674cec4";
@@ -16974,6 +18813,7 @@ tl: { # no indentation
   version = "1.1.1";
 };
 "komacv-rg" = {
+  revision = 49064;
   stripPrefix = 0;
   sha512.run = "6d400b0f228d42aaabf9527bbd3447fdf92eeff81f1fb7978cf90c3afa9835e4731a9da938bbece65034476ac2e2f7afff19000d9012ddd76b6f65618bea7223";
   sha512.doc = "58236086df2335cd167a5d475cb0e223747d43d81d23c0c0ace1cd711a19ca371426d36e199d69a9fd5414a33872dc4ab3725850a6677440484daba0e55d5208";
@@ -16982,6 +18822,7 @@ tl: { # no indentation
   version = "0.9.2";
 };
 "kotex-oblivoir" = {
+  revision = 43130;
   stripPrefix = 0;
   deps."memoir" = tl."memoir";
   deps."kotex-utf" = tl."kotex-utf";
@@ -16991,6 +18832,7 @@ tl: { # no indentation
   version = "2.1.8";
 };
 "kotex-plain" = {
+  revision = 38630;
   stripPrefix = 0;
   sha512.run = "f04333a7b7ffa7bee44b2d74bc1c4b0eb22fc57fe0721db0ed3bf260fddd68a6c10d92a041e42fe0ab1f897b5869cd7ff67da168336a708f03d072b4c4cedd68";
   sha512.doc = "55b16054d06f079a5d8bf6baa32155a0114e2a12b0269e1ba07ba988e733ad16cdebc1c991033f7bedbc3a180ef24fa84bb463c07e138136ffd89bab0c48b0e4";
@@ -16998,6 +18840,7 @@ tl: { # no indentation
   version = "2.1.1a";
 };
 "kotex-utf" = {
+  revision = 38558;
   stripPrefix = 0;
   deps."cjk-ko" = tl."cjk-ko";
   sha512.run = "65ce36703d824ae483a53ac6a3550a8d71d140bdeb67d3c9ddd343255cedbb74739c1688b05ae4742703c6c46b3e46deef5c6a7c5571cfe8f8a4003d56aac446";
@@ -17006,6 +18849,7 @@ tl: { # no indentation
   version = "2.1.2";
 };
 "kotex-utils" = {
+  revision = 38727;
   deps."kotex-utf" = tl."kotex-utf";
   sha512.run = "569e9677ef0f346e5a53f4cc84302a8ddf2b4ad85708f4ab8ba7d076ebf339ec60998a41fa92fa815167e9bfc37085ebfd921dd13a60b017a0574e4a5d205802";
   sha512.doc = "a46c5d09d119fa2fe8b9acea87a37776536e3216b776af6b7037fc5b0a522af5c1a58baf081e60f06c9a4054e8ac2372458c276c779038a030dc92efdfa3aef6";
@@ -17013,11 +18857,13 @@ tl: { # no indentation
   version = "2.1.0";
 };
 "kpathsea" = {
+  revision = 53977;
   sha512.run = "69c660f750a66974e2678cff84f0d6537fc56fd1f35ab9eb9485a29d0332c702afbfdddfd29d5ae5275ba5306a7d79867a027c89728d90e725837a4a576d41da";
   sha512.doc = "fff6708f75f5704698e5d339d3fb57232ea64de7c01bd5eef4279dbf4ee9ab6fb3ae940ce688a7540e14bb062278c701f78d98206cbaa8c9d7a9ee0f60030df4";
   hasRunfiles = true;
 };
 "kpfonts" = {
+  revision = 48470;
   stripPrefix = 0;
   sha512.run = "65cb12b6d10c91605db91de58fd33597720a4d8a7cded8a4b60c5bb3c1f2e7220c5354488a75e5a25ed0f8162d42689b6877b3a7efe5c1a0758dab237564c5ae";
   sha512.doc = "5157ad4e67bfb1f0ba54cb34c2896a856d167bdd89a9f4bc4d69ad0b6f4899ec53cb1d22582b352adbf28d7af9458e2d78147580740e7c41437855eb30557a17";
@@ -17026,12 +18872,14 @@ tl: { # no indentation
   version = "3.33";
 };
 "ksfh_nat" = {
+  revision = 24825;
   stripPrefix = 0;
   sha512.run = "8893133ed49c9b4ba7472bc80a4e5583ec2546838e261fa2cf9aee188a0b00bca45de05c4e969af0b6f222a9668c3a7fac0caadbb180c10500fc53ae8c9f56c6";
   hasRunfiles = true;
   version = "1.1";
 };
 "ksp-thesis" = {
+  revision = 39080;
   stripPrefix = 0;
   sha512.run = "3a250167d8810e3e81c5b6f86dad57e191a2a8387b5c7701e9b176cb007ebed79bd11867caa63e9cb9d3412fd59baeca7ff8e7589b11c4ef1144678552957216";
   sha512.doc = "ea4ff7ccabb237b113511b58ff767b494b213cec1382467ea8b95b72abe9c0d361f39781940c976075157bae93e8e32364f716cdba2a07b8a7d72c0970a31cf9";
@@ -17039,6 +18887,7 @@ tl: { # no indentation
   version = "1.0.2";
 };
 "ktv-texdata" = {
+  revision = 27369;
   stripPrefix = 0;
   sha512.run = "c2f3e86494993e6e56f131b9e7105ee2d15179b96580982ae7fba9e32c3e9889159ae767d96d95111f2eb052bd61f0c3c15406ae3af70b359e3b5ce081a6978a";
   sha512.doc = "d930db31105dbcfe3df4184422115d82fda7efa93d00eb8f9fefa0eff3893602fb4db9e7be26d2a44c0b3cb56e8e9810f61bc660c15e49c23880c3f0cd44025b";
@@ -17047,6 +18896,7 @@ tl: { # no indentation
   version = "05.34";
 };
 "ku-template" = {
+  revision = 45935;
   stripPrefix = 0;
   sha512.run = "4603e59129f749b0eb065283bff9cddcafcd1096627f196749be09c19a4a79848564ee9343f14f31dddb2e37a01e222bf08531d5b3237bb906cf88efb427fdb9";
   sha512.doc = "6b8535ef84bd1ccf70d16f7098826b5acea602b22cd461df66cdda64c4afe36f9ef6c4386227c5317a31767e4694c388f7a2fd87fe8fe06697af4bf5202b29bc";
@@ -17054,6 +18904,7 @@ tl: { # no indentation
   version = "0.02";
 };
 "kurdishlipsum" = {
+  revision = 47518;
   stripPrefix = 0;
   sha512.run = "d7160d78d7f0d8d7771740f030cf1c76b57aa9ec2d179887fe4065337e35bef528b522c666eca0974aea6696033678dec5446a9a198fb139f2d2469c8cd47eff";
   sha512.doc = "6af516595f4cc5b090398078977bb37e97a5aa4b28a578c068931eff7d34fa2cac379b53e70c8bcf270c998fa6fbcbe354b56d0299657fcce9a4e076a87b36d9";
@@ -17061,6 +18912,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "kurier" = {
+  revision = 19612;
   stripPrefix = 0;
   sha512.run = "4f727e8733824e8c516e3ab1286cf0c834413a6ab52bccb5519c9a14a526cd3397a6d0a264679dc8b7d80cfc1d75ab11dcd2c02734ea63d5a2a5cebd3ea3c24c";
   sha512.doc = "7fda14c05f105d341a31561e761517ce12b3e5ceabc01e0c5c8552ddaf55be1863a22545b268026c844b23f03e8700350f0dede79ca8fda62e7a2672fa510407";
@@ -17068,6 +18920,7 @@ tl: { # no indentation
   version = "0.995b";
 };
 "kvdefinekeys" = {
+  revision = 53193;
   stripPrefix = 0;
   sha512.run = "2a03840307805bd6fe30be9c108982bc472912c11c8cec25737ebc4042e48af8fe4f1a76124536874bea8c554f003a9c52b8a72d2f6900bc6872ffef8649c40e";
   sha512.doc = "c540045ec1c8bd7fea3000dd0ebc8adac64da7ccc24b0becb9b9c32c9dda6e5e11a77b57bee667bd2ddbddf347bd8af069907e087d543898a92ebaedf3fa4b7c";
@@ -17076,6 +18929,7 @@ tl: { # no indentation
   version = "1.6";
 };
 "kvmap" = {
+  revision = 53249;
   stripPrefix = 0;
   sha512.run = "4c860279b96a34755f7ba16a7f3c80557e223bc0a4099f4dd72474abe3073be97026ae2593a24cafa1553b936181eb2fb11c7c47a7b7f264a1146803fffd08ec";
   sha512.doc = "0e5b4dacb5ee5f7193b418f0b9740e1a3fb139da2136e5939078d8e3ff2b9ae3a909a3559821dcdf5d033e04af062ee42de84d1bab4d360bb20bb6eba057d788";
@@ -17084,6 +18938,7 @@ tl: { # no indentation
   version = "0.3.2";
 };
 "kvoptions" = {
+  revision = 52985;
   stripPrefix = 0;
   sha512.run = "af26d9fcf6f3afbd4e4dc105aa84e77bd737649864b3a8b4ba822e1dc62f4fc95e916df704249757d1ba4ec3b8281b510a6c5278b1f82b1a3af558b67790a781";
   sha512.doc = "6f567a5310250dff8d15de8d0fcda8c6eaf392fd9e221b5ea50c0de0bab44324ffcc42902a9d3b6f13cf6090f5e8ca513b5abb218b0f1827e953d76d377ff1ab";
@@ -17092,6 +18947,7 @@ tl: { # no indentation
   version = "3.13";
 };
 "kvsetkeys" = {
+  revision = 53166;
   stripPrefix = 0;
   sha512.run = "c5e117a46ab54485b7748bafd5cfd381d28073564b571fd1cda78da70b42dcf48fe054538323cdee7e784aff91cb76dd24361908a4c97213df315f6cb91af583";
   sha512.doc = "875af5f0ef28b6bb80b19537ca3dc426fb9daf4de8e10dc518cf5daea8f6bc6801832156e5bd978937209b2e9883898b957c8cbe87b51a2b2aeb071445e045de";
@@ -17100,42 +18956,49 @@ tl: { # no indentation
   version = "1.18";
 };
 "l2picfaq" = {
+  revision = 19601;
   stripPrefix = 0;
   sha512.run = "c6ea1d8ac189784d6581eaf9cae83a83beba9adfd32536f43c04633f7cc457353f0dbb69407332a29856633552910bfdd31cf85332c6dfb05da2cbab88ec67a2";
   sha512.doc = "e4202740ea2842296338e9d635b27c35801f4a5f8b21eb8dc0c1db572da0718fc5adcefc5c122793618336272606ec27f02f13825f8d2a6cf4b83583ea372288";
   version = "1.50";
 };
 "l2tabu" = {
+  revision = 39597;
   stripPrefix = 0;
   sha512.run = "2e94e77ab5c8327396d2ff714f7c6c1e8c91a3ab0f35be411d11f617d39dd815d4bf1c6eb1dd0be5154c1d702697c08b8658c8371dce3dca0349712a5dac2d1b";
   sha512.doc = "84673b59100568d1472f3221ff0cc35b8e8512ece38701f35d60265d316aa52186642def2d66885df47e2f613ae042a86972b7958349b7b2b83e754d72163df6";
   version = "2.4";
 };
 "l2tabu-english" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "66e1d62c731a021c1be2fb6e9e3034c7dec59edfd03dc2bb0042a37ff6f0d967e59a023fee994f45cf2c9b15e64445b45c48a207e21b7edb81d8a538b6c8eb6b";
   sha512.doc = "250ebdbd2a6dd3dd7d05c35cea0ea8fdb969bef983bc0a5f2c804129091f22ac0a499df482a1a990bf278ad94befc774d354341b30f9a0cd67539e1f63074ee4";
   version = "1.8.5.7";
 };
 "l2tabu-french" = {
+  revision = 31315;
   stripPrefix = 0;
   sha512.run = "8478211e871e38765cbbd36f8f571e63b5cfb9dc652107a4a9178c11a16b419eba7314246878507f22bf7f66818f8c5d1516a527deda5a2dc6c30f9260f23b59";
   sha512.doc = "f489b0bd07b60797b53fc9010c699029dabccbf326767948dd815224f1c591cb59d6da7bbac0d0385ddfb6f0e885e187b2385bfcdbb88933588b06dfc34f640c";
   version = "2.3";
 };
 "l2tabu-italian" = {
+  revision = 25218;
   stripPrefix = 0;
   sha512.run = "5b2348bed7ce47d7e2b8de6642e14b24ab440226d0de46a51eab08b3d11a39bada93d890e1ab9e2dbd3ce253b3263460fe7114baf9bc7b5c775a7d806c731ab2";
   sha512.doc = "c76981112631423d5d92ee9236d9b5b076e3d71086f9dada77de51362a5d5e01d82d5b018a68950c2b7f4b10eff1882d677243594436bae41bcc6ab996aa900a";
   version = "2.3";
 };
 "l2tabu-spanish" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "73cecbb031be2d421c25a7d6a5c04d08e30d83a88b4132682d434a879da915f1d4af56980f1bf04f7df5a3e881ecdd940a058a2dcf89b5e9f48c378eb322da06";
   sha512.doc = "a6886d54c0f5e1915ff9efbc4974ab1ef7f6dc026d67a0596ed47ac9e94da098e690bc70d5ed3e45a4d8cbd0f877f0cd6cd3a3757288dfc2df284e9c040b7c1e";
   version = "1.1";
 };
 "l3backend" = {
+  revision = 53888;
   stripPrefix = 0;
   sha512.run = "bda67ee1c48c06b4d399664c352267a3202b5877eb324cf413b7a6ad31d94249333a22bb8b6cca285135c36e46d01cf8bbfb5f2f5c9c8d70f5fe48da20a42a5f";
   sha512.doc = "7c193eace43f388843c9bed21d1cea87be8a2cca86ac2d8aaaa42da2409dc634628f38c1a51322d76233d2abf82490551685086c458729afdda6d5b3f093847f";
@@ -17143,6 +19006,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "l3build" = {
+  revision = 53862;
   deps."luatex" = tl."luatex";
   sha512.run = "c18aa191efa5c9af53a7012e4453ad615178e90798377ba0de39434c917c99732799edd3a3b89f719ae4c79da8fe4b97d867778d9cc01db81e6ff68fd9a441f1";
   sha512.doc = "94eea53a369def65df51ad48fbbcba851d1c6d9208c7ee1475af284752e853c4f9286e70010f494803bc02fe26afdc421143cb5eb659093d2ff0580e0f4c5b40";
@@ -17150,6 +19014,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "l3experimental" = {
+  revision = 53394;
   stripPrefix = 0;
   deps."l3kernel" = tl."l3kernel";
   sha512.run = "30b8d6b71c62cff716887c08830ed6a28c39056a833722e7cb93163e174eddae21ecf597f9090b12887fdec7da447ff7f4a00fa0cd352974e5de838a4858d264";
@@ -17158,6 +19023,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "l3kernel" = {
+  revision = 53913;
   stripPrefix = 0;
   deps."l3backend" = tl."l3backend";
   sha512.run = "95861694b7406506eaa4d158cf8187a0f0a919b225ffcc8c9dcec78cc41e928276d9f6d67de746ae7c566f93b8ac4ffb3c6a295cfb611f742829d742619a0486";
@@ -17166,6 +19032,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "l3packages" = {
+  revision = 53913;
   stripPrefix = 0;
   deps."l3kernel" = tl."l3kernel";
   sha512.run = "804fd6b5d2835c23324252b627491e083931f0a78d9f2140531da5f29076b3c5e8af1b264c0cd82a0fd30300c3ed96c9b02354635798dca91d721c415da351dc";
@@ -17174,6 +19041,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "labbook" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "92bd582cc729bcd3cea6979771e934d5a4a194536ff89a475309d3999ab0a2ab70d5ba5be6f0353e97498ab4e971e3209df9a3ca4ac99a8c9de27586a0f4a3b0";
   sha512.doc = "98758f4cc186df470e8a16b2e9365f3bec585be18c0fa8700df238befe052ad69b697357c7d89b19233a9cf2b308c29a54bf84215fa3ca8859111b0214971ed2";
@@ -17181,6 +19049,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "labels" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b1cd175e1c5ece09926ad3fb5ef3b2dbc528435e26c81df563f674388083b481e6a6f072724254302c243a640960a942a6b356664675f4041c94962155f5ee62";
   sha512.doc = "0ac61f3a1ec027dd3631a4e6ffabdbf71ca27eb19c877a0beef8d7d991989d613769474e99770e9edc74dffc8b59981da8666e5dcb26450717be37b098a028b9";
@@ -17189,6 +19058,7 @@ tl: { # no indentation
   version = ".13";
 };
 "labels4easylist" = {
+  revision = 51124;
   stripPrefix = 0;
   sha512.run = "1f792dfc8c3d51cbb3ec4370e4ea36612d503a9a92d088f0d8b03ccc78c480118308aa48e4dba66dcfd55c8a3442950242742eddd557bd6b44c925e01e361163";
   sha512.doc = "1ca630c5aa01e53d6a7fa65d9ebb4ccf5bc43af7d3cb66a6bbb287398e28764dae0b535eb4b821c2c406e22e239e8a88fc63a010d4e79977ef6e8cfd563afde2";
@@ -17196,6 +19066,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "labelschanged" = {
+  revision = 46040;
   stripPrefix = 0;
   sha512.run = "e9cbb45a636fa75c9b9c8d8400fd9a0cf0ef2a46f998d650631e9874907daa7b4deeb4c99d1610eefc343436d164ace717b32cb1d0c45e860e64d69e4c827a07";
   sha512.doc = "130c0e5f27f0de161949fca202f73bce3486e9346a48584ce1b8636c16367eb3398b36f0145e37531d64933698c201132ba90ca3b5d5b011978d0fad0cc5ad63";
@@ -17204,6 +19075,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "labyrinth" = {
+  revision = 33454;
   stripPrefix = 0;
   sha512.run = "06c61f5a0a2b39d644d5b741877f445dea48fefaaddfb7f60251ecb328f16ba2ec6f09731608ac5ca7b288fe77fc193984dad25b8f0ad0da5f35bdd43fb2f8ee";
   sha512.doc = "980a3bef8b8eb51cd454c835ba09205f8dedab92f747db9704c72d5433db75f68df298ee4ca06c6d68e0cb4c4b733c882d14bbbb9d877406163b0f95730a10ce";
@@ -17211,27 +19083,32 @@ tl: { # no indentation
   version = "1.0";
 };
 "lacheck" = {
+  revision = 50602;
   sha512.run = "7b8c4c7d15618b7e0d860afce675124372d31bc11b5e89ba169c355401714929c2c192912e7d666a3ca98c805e2f4942bd6173763a5a9265d1f19467a29223d2";
   sha512.doc = "59202286440ad95fc96576f6915843adfb2b3f0092509175c759c690069e36c0ce1ae66ef46c1dc1b9c33e42e7819b1f3490b45d3c3933233201d3e86eeb5746";
 };
 "ladder" = {
+  revision = 44394;
   stripPrefix = 0;
   sha512.run = "bbe2f94442a4f308a416e9d849f9e4b8af12387e59e73931b563d5daaee312dbdf82a99f5122de897cb069a54f3bc13619e719ed717b38db4aebcac72c2c4f93";
   sha512.doc = "1cf2a2a2267e819c9ee723af9cf51d711f778c3583c859eb01f2b2faebfd0f7a6fc4f4ab6caa83a9df6a797175ec27d29f0debbeaeb39387954070623ab60b29";
   hasRunfiles = true;
 };
 "lambda" = {
+  revision = 45756;
   stripPrefix = 0;
   sha512.run = "54da97daf172e3dae434e75425b80d1c617ddc9991f6ee804cd812e2c4bd70b49eb1a01318e243c10998870877d4f76e084b5ef0b0eaa89afa66f77a124a7c02";
   hasRunfiles = true;
 };
 "lambda-lists" = {
+  revision = 31402;
   stripPrefix = 0;
   sha512.run = "caeb3a547eb68d3e255d729cb6ec390cfaeb3bd9d4b4b6e8f877140fe24f4ee3ff0ddccd4107fa836faf5163d3d71209fed4a9e052d3329ff22a892d62b43b92";
   sha512.doc = "846c403f99194a19cd21e4d7367a1b43a8ad608055315bb36a1113fb37dd3d922dd8c5cb8474ae52ed3006be520b7e9023680e85f0dbb17f69a41c8c17e81a5c";
   hasRunfiles = true;
 };
 "langcode" = {
+  revision = 27764;
   stripPrefix = 0;
   sha512.run = "bc3e601701732d3ff533a7415446c2aaf7306732fdd6a8ac8aee6571cbdfc02b38f51fffde3a80cf5df6b0dd5e649971406f76d394500a74f1830139ea0bc0bb";
   sha512.doc = "7ac261071a2902d1e24cbe4bd43bf1baef418bdeb4d3c1dbee4db273d29918649f346e97b5ead3e3de2820110c0cd11dc58c78f765dbd07f7221f28ede5242a8";
@@ -17240,12 +19117,14 @@ tl: { # no indentation
   version = "0.2";
 };
 "langsci" = {
+  revision = 50706;
   stripPrefix = 0;
   sha512.run = "de35684ed71408adbda8f7238c80bd4e453761e18dd4083ec4680ac8cae711dfd0aa8339cc0ee211c231b17729d6e85316845586f6f6ee70e5c0577d84b1c9ad";
   sha512.doc = "439ac71163f1dad47fd4f2eb533f4a17a84bf3258f31baecf941242ea845d37b55ee88e8b879b3cdd070caca8f98b6b5d591c07889214ec1d64e32c3112d8476";
   hasRunfiles = true;
 };
 "lapdf" = {
+  revision = 23806;
   stripPrefix = 0;
   sha512.run = "10bb6891b82334f7dad4a1cf48c78b2b55c3b4a8939628a26576e99495f00e2bb8ee82028b13db4de6224e58e421402794feb2591842030cd47898506589ff6d";
   sha512.doc = "6e561e0d513f7b18e4e40d11fc1f077a061e6cb08ed072de1d186bb86ab1fbd3905af6a79f9dbb0c201e437a1a8716706a83f1709d580c293961ae454699c9c0";
@@ -17253,6 +19132,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "lastpackage" = {
+  revision = 34481;
   stripPrefix = 0;
   sha512.run = "f4d30e327704b32afe1bcb81023a247095203a9b47357f9a6dc4b631f4bb669255ba899cf1c8378b42ebd16f2608d8a649a0999f26e3d05c963eced1cc955ee2";
   sha512.doc = "f31731b5a93c154db123e66699ac5175fb63b965522bb511d344577645f9b8ac6d78c6a1a108cad8914b1c01b1c7a6e656743b075a03322c306aaa5417f62be2";
@@ -17261,6 +19141,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "lastpage" = {
+  revision = 36680;
   stripPrefix = 0;
   sha512.run = "adcd9319022ecf2a5b959ede5d5ce8c5d6a3e7efe1aae5f84abfa7d138162e24a403c6d50604cb6bf8bc80a918837f6d78dee60a452397e7a495cc4d15e52956";
   sha512.doc = "2eb7e8457918e2ed51abf6f48d5f5d93157eff19b8e320a782bc204b44c58a684cdeb2dd3b1c28f5a8de7434b6da9af49ffb2d939ae80875234797149a80c2ab";
@@ -17269,6 +19150,7 @@ tl: { # no indentation
   version = "1.2m";
 };
 "latex" = {
+  revision = 53958;
   stripPrefix = 0;
   deps."luatex" = tl."luatex";
   deps."pdftex" = tl."pdftex";
@@ -17281,6 +19163,7 @@ tl: { # no indentation
   version = "2020-02-02-PL5";
 };
 "latex-amsmath-dev" = {
+  revision = 52866;
   stripPrefix = 0;
   sha512.run = "92a2d1957d2f79bfa96aad5ce8aaf56b76e01aff51971c18fe139173fb90a22884830769eb090e68acb84a6bdcec18540e29461fb3f76eb6e9e62b82b9248e36";
   sha512.doc = "82fdc4e2ad9323a28f29d470841be560c37574acd4ef864003656f38f7ad80279ccfc5774311c90b7741dca26c3b6a38187d68a40a1b9b262cb2c2d351ae6c54";
@@ -17289,6 +19172,7 @@ tl: { # no indentation
   version = "2020-02-01_pre-release_1";
 };
 "latex-base-dev" = {
+  revision = 53885;
   stripPrefix = 0;
   sha512.run = "5ab3580f08bd80592fa2276c66c4d5723ec8d68e6d15a73a47caa66a96c03c0aef178e93e6c42be5549df1dab8e64eb5dcd45517ab029a528470a16e3a91a622";
   sha512.doc = "677e656aae83503deb68ce955e31df1f5b3465cf4d9c6b7558f6fca6354bf85c7b5f11a4c02bd8fece14726a7a1da9b7d29598015cb08c74003c010a9f88d974";
@@ -17297,16 +19181,19 @@ tl: { # no indentation
   version = "2020-10-01_pre-release_4";
 };
 "latex-bib-ex" = {
+  revision = 25831;
   stripPrefix = 0;
   sha512.run = "9f91b724d8fb1bf1c3140632c4ba485350defdfc926dd3d558d2a318affb5b6d56cfb1d0f8651d0af878f165148a5a1f06c82f71b8033187ca485fee1bb6ec0d";
   sha512.doc = "127f8ef52da49a348e79b062e16dc6a5f2b1728fd553ec3eaf824117e764e11d8e9dc63d34c0eb86417ddeda5e7f53403fe2361d8f959acb697330148f5d64a6";
 };
 "latex-bib2-ex" = {
+  revision = 40098;
   stripPrefix = 0;
   sha512.run = "cabd865b67e6e41b3b0745557b25d03cc15da1f1de41c79f92274c05e6d07718a598554b25c096a4261b202a20134abbd788f578e279ce6d57efaf1dc133eaf7";
   sha512.doc = "2b5f1cecb8cb5d3ed78b10846b6f5ae38e02b930c2012353e7064b12865b155019924aaf48d995910b6cb7594928276e896421e85e71bef17822237f8350dfde";
 };
 "latex-bin" = {
+  revision = 53786;
   deps."latex" = tl."latex";
   deps."babel" = tl."babel";
   deps."cm" = tl."cm";
@@ -17324,6 +19211,7 @@ tl: { # no indentation
   sha512.doc = "c444005a8b8a81dc2f21c5b030b075d1c489e6a73d384a47d39aa87cda4dfe7846d09e2badc009d7c96a1970def48fd985b2ef210a39ed4d294bc41bce7d1492";
 };
 "latex-bin-dev" = {
+  revision = 53786;
   deps."luatex" = tl."luatex";
   deps."luahbtex" = tl."luahbtex";
   deps."pdftex" = tl."pdftex";
@@ -17345,39 +19233,46 @@ tl: { # no indentation
   sha512.doc = "3e6a442ecad5f02132a8936b5d353223360754fb2e69674cc6eb63da3d21a5cbf58de3e89095b3f10a73a2e062398b4de7c6f7a20f4e35ab7778b6d5bf344f84";
 };
 "latex-brochure" = {
+  revision = 40612;
   stripPrefix = 0;
   sha512.run = "de98a91947d5cb919b6a2c6e6a87f63499c8c5975992d039bb8d2a4662ed597cbdad99668b006cf775f71af936e5ad285958b48b57eac61783460fe37ed76298";
   sha512.doc = "f057b86b61ee1f50430cdb83a56c27896e052047bbc93c4f09884b7d76f16f73cb1b570341faa2b8c771c0d42bb4d6450b8715c921fe866a57727eb4ffdd329a";
 };
 "latex-course" = {
+  revision = 25505;
   stripPrefix = 0;
   sha512.run = "9af9e8a2ff7663ba89538a93e45e27098451be4ccb9380b0deb002a9a42613467184b5a4d38ff8222c7ec5e3c722128222976aade12000c447ff7f8ab42c0656";
   sha512.doc = "772ecca6e71a9af7c31b9c5fd48cce88a7dd880a98b0885e9e5084247f64049234a8d123fe985e247ae706f1d0da1f58bae9e62082defe1acf9345bc252b03b7";
   version = "2";
 };
 "latex-doc-ptr" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "dfdaaea00e167fa3e4183b6e6a223996d1364707a7cdfc0bb8cc76d02a0c5b3739d8171979dd80540edb571cef84167b24639b265349fc9646d5570e6c48dc61";
   sha512.doc = "e5ccf3968aa02ecdedc2a64f0c53b2eccfa3c4df66da5255068248de013753ec4be67937d9c41552f302979edabc53ce64d902a9f13e4174d67f39909adf9735";
 };
 "latex-fonts" = {
+  revision = 28888;
   stripPrefix = 0;
   sha512.run = "98549dd0c7b29511abc3a1a6b6803a86af0b48121d47e292066f3b67e4b5847efbb7025352c1ec996778c7ea3a5cba552385e9b4dfd6ab005d716f503e37a26e";
   sha512.doc = "4d3162776a17f31caa8e6a0fe05eed9447b681d77e653371cb5fa5d8dd2f01bddddc9f95ca916f233c11f8ec7d15e02fe575dc953fdd18c34ba877829a142bea";
   hasRunfiles = true;
 };
 "latex-git-log" = {
+  revision = 53942;
   sha512.run = "c320354a35d98a3e32c835c2a797100dc2a4417dd3e72169c35baf1dc2022b7aadb3f8ce124ab6ea6f7d6b99728aa438cf4d15f7f6635bf3850e271679b07603";
   sha512.doc = "5ff991cc421b7f44f975119f0d6445d5898e0a2534adad4ba0454d70645e7f9358321ba2d6465fc0d89bdcfe2f70eac6efb4d93a915cf23018cae835d3979328";
   hasRunfiles = true;
   version = "1.0.0";
 };
 "latex-graphics-companion" = {
+  revision = 29235;
   stripPrefix = 0;
   sha512.run = "3148a646539db3622096f9aeefd7ca2d44b0cf83cd454673893978897d07cfe7107b8f5bc745bc6b60734d4ad3429be1ffc2edaa8c9dd1721b41bfe913fa0dbe";
   sha512.doc = "ab9d885c811af3964e8cdd8576349059bd45d660e6b9a7e931697f7c7fa5282c725e044817de8f2648ded59519d1592945e0804ba7cbe0054ce2bd4d44606af5";
 };
 "latex-graphics-dev" = {
+  revision = 53651;
   stripPrefix = 0;
   deps."graphics-cfg" = tl."graphics-cfg";
   sha512.run = "52dfe7ed351ab0d02eb1de79c8a76f2fd0c8e2e566539a2c688abe281cce1e018ae56d1a4451c180577ad7456bb3ee90cad6bbbd4b05d8bfefd98777c096b20a";
@@ -17387,6 +19282,7 @@ tl: { # no indentation
   version = "2020-10-01_pre-release_0";
 };
 "latex-make" = {
+  revision = 48925;
   stripPrefix = 0;
   sha512.run = "cb48ad252c77ca6271a527718872f95f28d64664aa62aca9ed11d73b1fdf29dec1cefa6c2fc07f0c95e16495a0a2410b59087e88a889b1047ce24bff71495ee4";
   sha512.doc = "bfe0143040544987d9e89827b79a847657f9b705ef3607ec2757ab7d5a8b4e005c64060ba5d3cf4066c4f21e622cafaf5e7c442aadd53f6583230e7f276c317a";
@@ -17395,47 +19291,55 @@ tl: { # no indentation
   version = "2.3.0";
 };
 "latex-mr" = {
+  revision = 44601;
   stripPrefix = 0;
   sha512.run = "3c5b806bb100cd7280d4a7e97104f21b4260372292aba60264f88fe9a7230fb42365ffea15a948d4334f8f74683d9a79ca40cb9b87c49066d61a2b0f101dfb8c";
   sha512.doc = "6022c2e3642928e716e6ed2536c849fade08dd26138312567b139a450032ec75d029ea5f1103bfbfdbdb7bec4b35d972c08e866da8d5eea89012b7a1fc414678";
   version = "1.0";
 };
 "latex-notes-zh-cn" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "5e5b3bb01456fec3dc22cb5d0d4f521b4d4f5f8f3119fdd76ea9cc55a70a2ad8a2b72e36471894ee448c1d40d887d20ac8fda39c4a3fe2cd111d2850eec12071";
   sha512.doc = "477df31445a2991db3c2b8cafaa97662d722f3f7171c2f756cf025717cb3b896c1773adadbc42c22cb360f7542a0e658547f15cd71c54e9b79f76fb1e2097e90";
   version = "1.20";
 };
 "latex-papersize" = {
+  revision = 53131;
   sha512.run = "00010f764235c6d9e4d6667c8c8b9f0ec6ae4b65afb53109f8179e0429d4b3787bd6b0985cd511f770cd74512483d1077e0f42136fe7ce1871984b372f2f2e54";
   sha512.doc = "8ebddd884e3e533d06332f2d6f8657ed54c9c376b3de68c7e7652f3b2835ec6601f5326ea70dc830b645440f0bd9ba2281e4f71a847946bb595771c6a950c0a6";
   hasRunfiles = true;
   version = "1.63";
 };
 "latex-referenz" = {
+  revision = 36671;
   stripPrefix = 0;
   sha512.run = "b61dfd5317eaf0ef7add1f80506492390d5ba0c01480e83d384e60ac0aff39710945ab81e030e7882fafa77a2913d88efd31f3cf05729ddc09c63243e825260f";
   sha512.doc = "e71abe8a8384be7b0e343657e992b7703d30b38bfcb1dfb689954bdf84581336e099059bdb14af464c951777a8a6809f1161955868dd2f3b219fee3d2046ef94";
   version = "2";
 };
 "latex-refsheet" = {
+  revision = 45076;
   stripPrefix = 0;
   sha512.run = "ea6751fc09aada1b8ebcca08ecdb10279b6df881b3b373b04e8c238609de92b4cdc4f1e7321f178b15637c0b712e9781317af07030f2f9297a3ce23a5f46cb32";
   sha512.doc = "77149dabb1fe5c4a46591b3b307d02b2e2b33a07267afcdb44b77a2a823dcea9ea76b4be5ddad530151b638cfbcaf5d87ed0fed59a9e8ed99acb0895717bc71a";
   version = "1.2";
 };
 "latex-tabellen" = {
+  revision = 16979;
   stripPrefix = 0;
   sha512.run = "ca056b194690d7b71429022c4b80b9d171cd7aa2e580921eed556a11fc2e3162106a06d61333dc69495d801120c35528fdc74b9c282cb6baa3391595e5f28d76";
   sha512.doc = "7f3f4ee26f1f9f6bd6d27cbde4193d8e2607a34ee2ebcbc44934b17673b60375a566828461ce672fe8d4404e32784cc62a54b51873645592079aedaa7c82e081";
 };
 "latex-tds" = {
+  revision = 40613;
   stripPrefix = 0;
   sha512.run = "a688c4e6790460f3155110f31c36c240fc1d9e9b8c3b2641a1a186c54d7939bbb4f779e80cb125d34036b64ce8da26d3460365d34d23d49067bf8438816cdaa3";
   sha512.doc = "cc4928fd82e07cc0b601c702444a84475978671e3c86280cc8aac334ca562f3841a9f8c191bc174522f5c00e45cad519e6ceec1344e229f4b125611f60e43766";
   sha512.source = "0f1b88a565c417a238476ab3c91bef40d265388458473f1ff3b4dd5e6b6897e8d8cdcd15f9eab17606aadfd5ce5ac978b81385618d8d3906defe4d13d438f72c";
 };
 "latex-tools-dev" = {
+  revision = 53773;
   stripPrefix = 0;
   sha512.run = "3d4c711d21b2a64ed895bec4a144c22db6f2df8acf396cfb490c61ac924f2a73af06e28a4c7b1e4ec034979edaea62bdf5041e10145b4883186c190a91ecdcb1";
   sha512.doc = "907666c610d9f56e2f182c7c958bd83dd7fa48dd259bb7ae58e1e33a0c7349f694174324c6eedae9a1cd2476ae68b7c6beffa337cbba4d0b92c1fe03de2320c7";
@@ -17444,6 +19348,7 @@ tl: { # no indentation
   version = "2020-10-01_pre-release_2";
 };
 "latex-uni8" = {
+  revision = 49729;
   stripPrefix = 0;
   sha512.run = "1e98eb60547932eb218f30cc713b94e8c7ee5861e66cc600b01f577a37e318a5b440b65c2aef1c770ef94bb4c4cf86d5d1636943de60f78049d2286a92ba5d81";
   sha512.doc = "201de55826ce4911153f079e1107e2f4d2399d3d3cca95bc669cd958d09839ed7de778d644502cb6af8429818834027c9d3f3255fe58f95c985d1a96e4682f22";
@@ -17451,67 +19356,79 @@ tl: { # no indentation
   version = "0.03";
 };
 "latex-veryshortguide" = {
+  revision = 41844;
   stripPrefix = 0;
   sha512.run = "239b6ae896eb109fb61aaa96149e3b3962fab250a4e017baf81da0ba7836837c1920456eec8fd20999535c96fe415115a621e73e639cbebf64cc2b14989c93cb";
   sha512.doc = "aa58ce07f56dd819b6a3b618a518384547350a4582828020f5b45752c1dbb88d5f36c5b5bb831129352489bba8f5c19f89d38c99585da9253f01311ea63d3232";
 };
 "latex-via-exemplos" = {
+  revision = 53248;
   stripPrefix = 0;
   sha512.run = "12760e4866e1796a290bae531205da1cca1f24c51359a9e0f231524a55834a94a357625b775997f065c002da663c460eabcdb5ae22984330427c62e001f49fc7";
   sha512.doc = "5a108346c7653122b37a9914cdf16410e6135f142b1f849d3d4d413be2cc59631d56c3b25d770621d84ff3256cadecbe7834f132b424244353f5889f09dfecf2";
   version = "0.5.6";
 };
 "latex-web-companion" = {
+  revision = 29349;
   stripPrefix = 0;
   sha512.run = "5f45c7f74a0e97b938009ada69146875e141edd556165b62185553b0ce5f590d5ca6f93a875dae1c546ebc788156d5cfc69c46535000adfe6933abe79a2fb06d";
   sha512.doc = "a972860f65d763c6fb45e9726e5dd7b8234509b90634f45b8b25e090da92d0ac577bf8b33ea7b0a0f91e4e5639bf62c07086dc36708ae697c1e16e644acc83f0";
 };
 "latex2e-help-texinfo" = {
+  revision = 48918;
   stripPrefix = 0;
   sha512.run = "dabdf3a20bcc6740b7feea1c444b2423dc54a97d0118411d44acfaca31259782eb49bf68b144ab553a9f865ec47557bcd47503b1f1dcbb69ae3302d94bdce715";
   sha512.doc = "0a3cd8f22e15709b056d6ace9fe0c8d348ac8bc808fe8cc98498b3d14747eba9f6e9838375b0ab8226694ac8dd45027c62ffc1949c3e1a42f9f182f346df0123";
 };
 "latex2e-help-texinfo-fr" = {
+  revision = 44997;
   stripPrefix = 0;
   sha512.run = "6023d1aaf419519fb35f916be296e9681dd2e2912b35d92da5b59d5ab279154eb71813f49b159c01bad045246a293c8e6552d2a469cb69916d169ac1b60d9daa";
   sha512.doc = "bb1ad23b5a46e00193b4e807aecd0a439d1d5f7c15736e748b002168441b5c7fccbcd8f7f6361a1c5fa3175344c9aa1c0ec77e20be450e653a0354a87643b9eb";
 };
 "latex2e-help-texinfo-spanish" = {
+  revision = 49023;
   stripPrefix = 0;
   sha512.run = "65faa42d1ee01399e1f8c34cdcd1a5d1ce6841f144e7b582aa4c3586ad1426d879c60427944a9524f16d48c8340028f1929dddc04f9ca4f8e634ffe29eeebf72";
   sha512.doc = "b6f612ef87c52c9b67c65ed79f8b2e4b7e089baff3da617951288b57124d63f53acd4f48edebbcd7f27855b3bfff14dd00aa5a2c277b4f89b8f49426abb49c6b";
 };
 "latex2man" = {
+  revision = 49249;
   sha512.run = "9ce1870958d7de7625fe73dfb735488d2512b048c8c06fed3f87255db0914080675017d24c88a97ec71ddb9cfe6f5769ea378f099d8787e447837a1ff5167436";
   sha512.doc = "214685e6982c7a9c694d74a73d37c58f3947d7304637d2ed44fc616cece6026e5d02763f26e280ab21212d18a962c31b4ac5315fa840f10bf1efcfb782f4dd2a";
   hasRunfiles = true;
   version = "1.29";
 };
 "latex2nemeth" = {
+  revision = 45934;
   sha512.run = "ee82b11dfd3ede3b926a034ce8a7f46ae2bdd065f648fc0375a62392a8be605e391c64726eea03efc439b7a01fcd3cecfd70106335c72927e45c70ef0c8aa48f";
   sha512.doc = "a674eac6b80811890433c613f7ec9c6fc4667791c5b4692606e88d3e38ee59a3b68951e5f19b26d2b9f9de3b79002d17f4c539fdcfce37b82c3dfea5cb811086";
   hasRunfiles = true;
   version = "1.0.1";
 };
 "latex4musicians" = {
+  revision = 49759;
   stripPrefix = 0;
   sha512.run = "a37c75d55857e9680b8e4b0f59f1889f3b5198477212ea531aa6bbf9ea11dbae06fef7fdba9e706f016c6c0618eebe4ddb81ba73b48979683a22592a0adb119a";
   sha512.doc = "738c2c467d9df87cb1eccf0442b5c94a97a3c4c2b329d78d80b05d2adf9e3be11aaf2fb407ebc29f07e6455e6533464d981ae65122b080aebabdfaa29cf71b61";
   version = "1.0.1";
 };
 "latex4wp" = {
+  revision = 35999;
   stripPrefix = 0;
   sha512.run = "64ce122ac380c4f2c06d3afe2cf1aa2af2dd6d29fc451ced9df05206c97dc0343e6867d770d9b4e1c0425ea41ef89cb2d0a003d43cddf82ea19a7b33d383b7ca";
   sha512.doc = "e8f22deb966044c87e7414d828ae3d8bfabfda40bdebb4b26b712692020c785ad8688595cced27ea5993c8b8f34f7fbe0cc86180d2ff8bfcc44cc009fd52e936";
   version = "1.0.10";
 };
 "latex4wp-it" = {
+  revision = 36000;
   stripPrefix = 0;
   sha512.run = "691d8936d71ca825da3a5fb193f8f7067480981b1b9bc93100f54834a7f9500e66785a216110cb1eb5cdd41b538333b693dab8e0e855e546a3eab90c43c48630";
   sha512.doc = "c0c527bc7e9e71038316be5c6a57f4200ed69e7ed6fa0f066923cb14d14e20e90213cf0b989d3ba746bdb3e2263cf1daba56db3073017a0d7582e40640d35fd3";
   version = "1.0.10";
 };
 "latexbangla" = {
+  revision = 42409;
   stripPrefix = 0;
   sha512.run = "97e4a88b3028f3836a82c80bee739393c0ebdd219ac3b78acfa00f84f5b5857334605ee4719c8dd40d1cfcb44a4f9f821d711401d091a3ab46204d2457559fd4";
   sha512.doc = "dd88aa9630a08992348699e71c1e1ac7a697c0279a83daa333f0bd0c098d564b730f7bff829e7489000ce09331c9f13a804badd4bc253dc181b09646f8c0b991";
@@ -17519,6 +19436,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "latexbug" = {
+  revision = 52414;
   stripPrefix = 0;
   sha512.run = "ff27b7fdfb53b0c2b0ac4b5aa12d98e30c09bf50fbc7959930b35721924bf52c361581ddcdf8dbfb03571f676ae9f659de2bba137b937d37ec11a0da2bc721b2";
   sha512.doc = "5e86be0719138bf111b6d655b2aed620be6a490f772906fa676038f2a5f13875d3ebffea2094f8c9001d2e70334002498d8eaf5ef96f14cf8458ea0b03bf8723";
@@ -17527,29 +19445,34 @@ tl: { # no indentation
   version = "1.0g";
 };
 "latexcheat" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "530041d286048809968d91b20fd40c5ec41eb440fec25bf08f92af0f0fd5e1481a1344ba3c659da4477de353d222f3cb160d75eea2241ccf19b05e63e059ed6f";
   sha512.doc = "28abbdc3b53c245b0cfb6ab68549661a72d37df004a5c760f5021e91b1df892b02872c7e20f328c7dd4624edff96f3b1fadfb46cf35d080c6b7c5635dc36adfc";
   version = "1.13";
 };
 "latexcheat-de" = {
+  revision = 35702;
   stripPrefix = 0;
   sha512.run = "84de8075c1ba86467c8b34ed614462953ca8b9a237bb84453b2f9a1482eebfdb628c3e460d38da126416cc111387d68d3f479c5806ecbf06d079e47c35b88ca6";
   sha512.doc = "dda8002178b55e155f7ce1f49f57f928b6c5097007daf36aa473c1a2d07aef4c3ec5e1c238537c0531731af0cb0d51804b0c0310be63954f112f266e737c7d37";
 };
 "latexcheat-esmx" = {
+  revision = 36866;
   stripPrefix = 0;
   sha512.run = "ab9965189096647e8af9aa58a937fa15595bed32055b3819bfd12334cf60e01d18b12563de8169ea28e3c0a7768864e51631c29bbbe47d45e09ffb2b87c5d524";
   sha512.doc = "a45f2db2445e2daec8b31e995669a189c1d201f457e06de7fc2a85ad85686b31fcf70040e7840e1168e29b2e5caf796c45b6ce934780fa5982d0750438263606";
   version = "2.00";
 };
 "latexcheat-ptbr" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "e50cd94941704f1a620a7411624ffd61d47aa4ef2944220ef0bfa9fbc428d8ea46be17bb3b18b30d645dcddf3c8091dafa9532f809dee7af230e2133c86b9bf5";
   sha512.doc = "00369fce725567a85310afd3063a4a20e670d8a0c57ef7e4515579ee0f91157f44bac2471b076c2ba51253e2c172447cc4b915877d80b0c43874c4e125f5f9d4";
   version = "1.13";
 };
 "latexcolors" = {
+  revision = 49888;
   stripPrefix = 0;
   sha512.run = "b22521df5572411a33ba84b2d7560f0735a6f3a3bab0c6d7ca460e19333fba20ec8852becc618274ca7b7461fac1c42d0e6ce7fb9b7e4349c74bd05e8e1b5faf";
   sha512.doc = "5f6f26c2ece42c07b2b2e634308a2a417e12a105d9856d630f483443825615d770ed35f7322f59904b1d8fea9425e0222fe9deff27451a5aec52fac39eb9369e";
@@ -17558,17 +19481,20 @@ tl: { # no indentation
   version = "0.1a";
 };
 "latexconfig" = {
+  revision = 53525;
   stripPrefix = 0;
   sha512.run = "2d98dafa5c2b90321ca8600171ba22cc7eff73a23d6d88073c477bcb84de37369ddf682163b7a9dc26ce77fb2b1c174a4f810b66a34b29646ad988a9965d9bb6";
   hasRunfiles = true;
 };
 "latexcourse-rug" = {
+  revision = 39026;
   stripPrefix = 0;
   sha512.run = "ab31ee52beb0fe100f4798e6e42673d5284f6f85ccdecf8875f4d058928cab7363507f8cafe6c3c6f437a682f3e0017923d138ff671eea118ca8d2339627fbe0";
   sha512.doc = "aeaeeef2c43a5ddf782a91152c9e2e18f00d9b3e18b7023837920a53eb390652d7ea85afcae338519a00b84a972a723eedd7819e73944ef7015f8c028822fea9";
   version = "1.1";
 };
 "latexdemo" = {
+  revision = 34481;
   stripPrefix = 0;
   sha512.run = "d8b6ceb9aed4b2edbb4fc9e939dbc2dc5b6989fd04703dce2e504135d2c1bda46c8dd78e995d41a7e8727563c72b4f77979a52513ab0d49d8c95f80246a94fa9";
   sha512.doc = "34a0ed1b5e9ce5f2b71d67384427b4a7d69439ac4eb5113e1b8e270618164f883b05bf7cbdff9da57fe2bec7cf43bed844ec77b90da00efe30fe9061b3ca0339";
@@ -17577,12 +19503,14 @@ tl: { # no indentation
   version = "0.1";
 };
 "latexdiff" = {
+  revision = 48926;
   sha512.run = "64b3c9906ade859568f67b235192ff29b70cd4ba94006a86cd1f7872d88ec7cf274fe89a5d292737d86295d7f92ff9be7be46936192eef2e5f99aabd116e9479";
   sha512.doc = "665d2029e8fa0eb6c1fbf3f9d99d6ae92e43e422bc59da6cc64b5119f3ffc46c6310acf8a95861ff3bc4d5ab6ac5fe78290c0454f9bcb4ffe2e815872f6b8c55";
   hasRunfiles = true;
   version = "1.3.0";
 };
 "latexfileinfo-pkgs" = {
+  revision = 26760;
   stripPrefix = 0;
   sha512.run = "b08fbfeb87299273a0e087e7cfe0e9df9bf50b95503a3110b9b329a9a41931f34f65661e219c6adf377e3448536d5aac8199799821f7057a67a4680a24f30ad0";
   sha512.doc = "af5ff5d84fbbaf299be548d13163c8e5e83b73ce795bc1236a204f4025e34d9ef0c587702ea5d6b234791e16e7cd1930a63f3839c20caefad7610de125a583e6";
@@ -17591,12 +19519,14 @@ tl: { # no indentation
   version = "0.22";
 };
 "latexfileversion" = {
+  revision = 29349;
   sha512.run = "3a017b8a367864358370f0063957c301014df2aa039566ef33ae78dcf428235ccc2a88e19c917c940e186371e2c0b747887cb04e7cb78b9a04ac1720dbd94cf9";
   sha512.doc = "b1df01f8bc7daed937cd20d1ab7cce443a3d1fbb58e04cb18f0c0b30ef0795c988cf51bf49ace2f960c173f6a95fe982ee9d29d7650dcde21784c788165094c1";
   hasRunfiles = true;
   version = "0.3";
 };
 "latexgit" = {
+  revision = 41920;
   stripPrefix = 0;
   sha512.run = "5076ebf74361a6997536988c5204a72ffd761a40c33acac03bf2a104bfac3661c91b320f47bd264d607df7dceff41a18670e7c18cf19cbb27fba1d5f273c58ca";
   sha512.doc = "dafc932c2d0184c848b7f7ca549a300f273fc7e358c6bfbc6b5698aaeded12071a722c856255889438e1dafd1c64d6c2adcd60766f8e1a1652a74591d5e74161";
@@ -17604,12 +19534,14 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "latexindent" = {
+  revision = 52050;
   sha512.run = "0aa45877dfacb861ff325c13518abe9fb15b6a07a2c6ba93fa7d8edf982be40c26d46c439875488fa468490e5a74e87cb214dba05346a8946addaddddb44a3a2";
   sha512.doc = "0257dec625380e5c31f982499738d67c0294acfb113f6c0bd6a81b6f725e400853405a60829290e3fa4626625a01df0e838d6d9c07fe4caf7a7949cd22ab690c";
   hasRunfiles = true;
   version = "3.7.1";
 };
 "latexmk" = {
+  revision = 53293;
   sha512.run = "b7e3971cd1aff149208fee6857066c83ed9af9229bc7402c7003480121a06684b9932deed33b8bba9bef544e000bab21425c51412cd2f7e273e0d53eecdc13d3";
   sha512.doc = "3008825a99898209da2311ad09e6b0ead8d8557c2e47cfd6a668b8711bb22102b89a6d5326735c306e3e21b824e8df4bc2bec864958a2f3e1a8a2884175f7b35";
   sha512.source = "eeecd1be1cce9a2baf33d544bfb7726b0c468d223006241f15bf6f8a0134bf1987be49b86fded6ed5dc40acc42523373cb2407ecd5d41e7641b1ae0fa64e55fa";
@@ -17617,6 +19549,7 @@ tl: { # no indentation
   version = "4.67";
 };
 "latexmp" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "e63d213969434907df862dba2684ea76f8603a8283764ff431edace0802a61cbf3eadea6a532a21cc83d722359ac39680e716a24859b85f526dcfd809ca319d9";
   sha512.doc = "7668afd5cc1dd365811f8e4290392037adcf5f3bb220e062588a446827f1d39510137185699d4b667f2b452809704d3c08caa889bb52cecafd0e190b0e7c49a5";
@@ -17624,12 +19557,14 @@ tl: { # no indentation
   version = "1.2.1";
 };
 "latexpand" = {
+  revision = 53109;
   sha512.run = "ff362aea91f703759157dc810067d39d0d8fbdfd031e993c1a6c019a55d50a3e11745ab72c8abc7bd615f79cbe589cb0bd7bf82c147d12d18d3483ef95dcf4ba";
   sha512.doc = "63181837edaf48a5bcd842039579e3efad999cf2db1cc3da8184b59f359db0ed7f50a9c706a44f32fd0642438020256283434b95a29d64b184ddd5ca27895282";
   hasRunfiles = true;
   version = "1.6";
 };
 "latino-sine-flexione" = {
+  revision = 53485;
   stripPrefix = 0;
   sha512.run = "6c6e7dacb974ba25fb5106ee1b846a22590c1ee3e5b19aa4c9cb90aab927216a19d15f977eb92f20fb589011769463a500ac2146c0c8cc807a91169da660bc13";
   sha512.doc = "204422bc4fc85ecf94cc3236a74acc368d34926b53effb45b6411e694c4bdd2b91c30250894868d3928b19c693372c49e7435f83974e09b829938b6237ef1957";
@@ -17637,6 +19572,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "lato" = {
+  revision = 51462;
   stripPrefix = 0;
   sha512.run = "1243f2c4fdea9ac510cc99bf4afae173378b47caaadcca88251b53badc5f63bc465e19247ab10605436ca07d96ba4966460f35d8336462950253c4eaebd80bb7";
   sha512.doc = "28053a4561422f721c6cb400be57a0aa18d18173dd5c9b46b806dbd4c8decc5eb65aa5dea509b42909791bfed7a2a8772d3ba9917d3bb1f6fff742caaa5fdbac";
@@ -17644,6 +19580,7 @@ tl: { # no indentation
   version = "3.3";
 };
 "layaureo" = {
+  revision = 19087;
   stripPrefix = 0;
   sha512.run = "849b0e0fbd15b45cb31ed4856b0eaa190c26437a1965da2c860af62b65cbb000b590320611e96c5a6c4cc63c029c31fb352ec44d96e0704eb52c70ee460abcd3";
   sha512.doc = "b4333e1361b352689dfd67e13a694a304449eac61ef8189957356bd94e5745f4c15fa38bc21219c8a21805dbecd44a51e719bbcd884b850ba1276759bdebeb94";
@@ -17652,6 +19589,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "layouts" = {
+  revision = 42428;
   stripPrefix = 0;
   sha512.run = "9db14862ac1bea22096130ddac071a9b058e4cc1309917d2f8e8c536f280d2f4efc9a8dad9a5dbec0824b94f92c290e82820ec1628f0e4b72aa8fa617b72d981";
   sha512.doc = "aa6639c5ca0029efda9af523a0a075ef2b60ae9e031bd68232ee03792bb2f7452e2201e7223735e83b7979f2c057674fcedde4ed416254ab4b5b8a6cd9bb002e";
@@ -17660,6 +19598,7 @@ tl: { # no indentation
   version = "2.6d";
 };
 "lazylist" = {
+  revision = 17691;
   stripPrefix = 0;
   sha512.run = "5ceccebce9cf3ff0574c471141f94b919d14a7faf1b5c7b5e09eb079aee11cb95bdfa7d8b26fb83e99875818d842cbd64733ab7cf7b7024f04f661f732a3fb04";
   sha512.doc = "1ecf491370fd7ba0fcd3ef1ce11df768509c32bc9bf14978e3d6f36e39094570144b897337bbc481bfeb8b74354b36f66d561a33e255ba50aae0a5c42f002e7e";
@@ -17667,6 +19606,7 @@ tl: { # no indentation
   version = "1.0a";
 };
 "lccaps" = {
+  revision = 46432;
   stripPrefix = 0;
   sha512.run = "98d57c77a3ca19a067c04c9cef06d632e56f42daaa70ec729a7cbf3ff68ef3e7ab95e1d0d25cf853d85dd1916668dd5601ba6feb889d1eda344b3ebcb31da333";
   sha512.doc = "ce14177476624831de64a12ef858516a2df28a3e194748a1c759d7a41743a93e03a7d96bff3acd85f9db0f5d4c96a53aff7b73077e131bc6fa807c8b36844bef";
@@ -17675,6 +19615,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "lcd" = {
+  revision = 16549;
   stripPrefix = 0;
   sha512.run = "829c0fbed639619707023c1df1fa511d584e4805aa4f26b0ba5e5c5dd85d927901f4ad949e4a171d9765995c9ccfd34e5d45aa44dfef2508d5ec84c27712e05a";
   sha512.doc = "385df3ec85fdbaa579b15f0ef0fa2347e15cb796a84265b1cc7a9e2bc520c0c98d0703615ed28c68ce5ab7cbca6f2699502ec26a31297c14b0039dd4b584fd86";
@@ -17683,11 +19624,13 @@ tl: { # no indentation
   version = "0.3";
 };
 "lcdftypetools" = {
+  revision = 52851;
   deps."glyphlist" = tl."glyphlist";
   sha512.run = "3f3cc8f7cce233eb36315b21db408847a267ff393d6d4118de61c4b03ec408f3f29b2d41fdcf84995bfbf5d07bcb25984d7ffc76458d4f2dc12fdb6dfb85e23f";
   sha512.doc = "5a1dd1e2fd79351afc65d6786b24aebd9681a2b9e92755b44a836b47da5ceb1817f085483f306991a113dc0c26edfcd84839dec93bb46a003034536f31b31e5f";
 };
 "lcg" = {
+  revision = 31474;
   stripPrefix = 0;
   sha512.run = "6ca6f347b6ca4104ec376554ff7ba5d19002b2b4174fa491f3fec87d6c75c3ed11c1d13b9e7d30e6c086b2a12dc3013f21ee10b482c95b177f0eaff02d953fee";
   sha512.doc = "5674612693481265f72420ae10914329029f9af2f526e6b59ba2614d4d2994a0033cb3393d2751064987698f819cca8e0fa3783555db3fa6cc5849f337b1cfd5";
@@ -17696,6 +19639,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "lcyw" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "324a9eb8f1a68124888ad7d4f35dd0446c917e643e2cdcfa041ca26b719ccdc541b9b89857aa05dea2d599912c506561c762d288ccc86d637fd927cc70bf910d";
   sha512.doc = "c063b6b5d23bd0a7197f5bd3121c93237c24f0a77fbc72cb370a7cd535282151731ef03098c36d8152707c50808c1b996fd1adaf16185bd3d0e3589e85b67981";
@@ -17704,6 +19648,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "leading" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "c326950e6c4b07782148ee4c9ac5b22f7e42512e0bc6e5e1f75be6ed757ca90ebf2bb6b30b91ceaac32c761d595ba5799f0f40ca15954f150d481ea366f1c72d";
   sha512.doc = "3ede6910ccb0a30c3ae9c78b86cf00cd7e2c5d8905b648861d2113d0af6225b2ffdc30509a72a5f69dd9e1164525c3225cd4ecaa04471ddf5c346a862fe097e4";
@@ -17712,6 +19657,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "leadsheets" = {
+  revision = 52275;
   stripPrefix = 0;
   sha512.run = "e7a84348b6347962fad95171059e968f35e7601da51ae6fa278add1ed4262bd7ab84bddad9b48780e7481056bece9c311ed1cc25e77c57f9d9e0649abc9197e5";
   sha512.doc = "dea48a9b053aa67f6d9e3dcd3560ceccd104d743a5797320e76d43cdb8709afe7236f7ac8ef23dc9175268fe57c97898c92d0dc329a4e3151b017544fa537521";
@@ -17719,6 +19665,7 @@ tl: { # no indentation
   version = "0.6";
 };
 "leaflet" = {
+  revision = 43523;
   stripPrefix = 0;
   sha512.run = "b819cae65ac9f38d7170f4aec4f94adfc547afdeadc345091fad170def744247ed46d653975e493aa64a28117e89a5414463f693a4b2f7e28b9bf998b8859915";
   sha512.doc = "d2355c9b93ae490f4087bca09ed3acc815abb714fa7508b64155d8b5994c967b7296b79f8b3d68cd59d082d7d3d7c618c0d4d0fa50df23724ed50718f0433f8d";
@@ -17727,12 +19674,14 @@ tl: { # no indentation
   version = "1.1b";
 };
 "lecturer" = {
+  revision = 23916;
   stripPrefix = 0;
   sha512.run = "e0c217ed089dccb7cb526e62456bf72d186bf8cdc69b2014bd4210b6f1225277d1afb514f381e4581727900c6ebf34780bb4df01c3682580cea0418fa9caa1db";
   sha512.doc = "97892442ebe9263cbdc8e35ecbc2f3acebdaa886e5fe814bcc0ada98b0cecd9e140a0d103adc9eb0aab1e5e48e9d7f4ab42e786d52f8fcc96d03db17c51fc17b";
   hasRunfiles = true;
 };
 "lectures" = {
+  revision = 53642;
   stripPrefix = 0;
   sha512.run = "e3fb80a67dcb5198503050d61266cbd3890c91c1c5c93042a17f2aa410223c3943e3dcb73d7d6e7a4d5888d87ae9613fc89025f0435c122ab44a8f822732250f";
   sha512.doc = "bc50485fd0a8782095bbc37b9185bbc61df2a6bdccaef359f2cedd553cedc14ffd0bb8e6690578f1d57b85e2efa650a68af3b579a7c360a737791ddd74373424";
@@ -17740,6 +19689,7 @@ tl: { # no indentation
   version = "1.0.5";
 };
 "ledmac" = {
+  revision = 41811;
   stripPrefix = 0;
   sha512.run = "b465117d5634dc4eeaefbc2c12a4d0fb892f4a27ed66057938701fe51e4dedfb5b7f28d796145d89a59b2667cf61c7175803f72e5970cf81244329130d173136";
   sha512.doc = "7e7fa49106457f13aed11bcf80a1e38f000f5161e9a67bdbb174371db63a3953109f26da3cef8781d2c13abb4b86d5cb0c2b1b41e6f2cd3584512bed1a67cf6a";
@@ -17748,6 +19698,7 @@ tl: { # no indentation
   version = "0.19.4";
 };
 "leftidx" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "a01d085af4ac4048b5659e7f2f1692dd787b7c4cc9a0c06acf9852ad9d5aaa9790bdad6db7a76ec2f1a268af520ac35975a7fc55ef0d6373f244c85b8b6e116c";
   sha512.doc = "1e372c7d307b4bae8fc5673c9654785db1fc7c510e188e7e0945e01dd502580479b7910e19132c7b8b169acf7d9de84504de2aa9fb580c9a526a5700114f009e";
@@ -17755,6 +19706,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "leipzig" = {
+  revision = 52450;
   stripPrefix = 0;
   sha512.run = "6811c2259558856d930901d2d82a47774c4c37ceb5d1309fa6b78ebb031685405e334e8de7cd63b1998bf673d5210aacfd096b1c6570ed26840fe4ec22359c5c";
   sha512.doc = "a701d8c9ffc741099aa09f75dcef117db6c64a832dd51f57dfe07cee694a177a3a8be824560308b9cdd483013d4e69b77ee8755972b9ed504e033db6396532a0";
@@ -17763,6 +19715,7 @@ tl: { # no indentation
   version = "2.3";
 };
 "lengthconvert" = {
+  revision = 30867;
   stripPrefix = 0;
   sha512.run = "71441058a60d5c642fc7f162952f8e7e696f25ed40e56d5b61177efe6e0f4bb3f55a8ab616e52f2555836d5205f1c09cc75307ca3d0f4fa964347d731c6924e1";
   sha512.doc = "756564bef540ac96195b9846d79cfdc8a553c25e83313c3cd22b7926010e65033e0eee56899a0ec1deb92eb34a1c7c74ea541e4881962d6bbf34a16ab5462b49";
@@ -17771,6 +19724,7 @@ tl: { # no indentation
   version = "1.0a";
 };
 "letltxmacro" = {
+  revision = 53022;
   stripPrefix = 0;
   sha512.run = "c9c1f5c3b9aab6b31750011cd45c42bdb32ecd712ced8f8cdafe1aeca532159051d1cff1449b06e3d35fbefdd44f2332805cb1618ff1da022d405a88d600083b";
   sha512.doc = "8be12930acfaa79dbf3d7d3e0a60a518b12392c094e1dc531bfbcd8d9517d4744e99d339b3b7bcfb1e156d0ccbd17ca464126d8530e9f9c13e29d19a6aaeea99";
@@ -17779,6 +19733,7 @@ tl: { # no indentation
   version = "1.6";
 };
 "letterswitharrows" = {
+  revision = 53709;
   stripPrefix = 0;
   sha512.run = "4594fdce5a2c6bb4c4405d5111b574076faa247e4b5976596695af2de776edc26fb949d46012ce29663c55c78342d0d234e0a0e0f6a53fc59991083fc3b7e52c";
   sha512.doc = "4bbef8f44103e5155cdcbb3719c80f3a1cd4b24211b3734e4e698b411519fb70742b4cab9ee510bf4db2a6a929550e1f448aeffba311b0fa7904e17ecd44b5b2";
@@ -17786,6 +19741,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "lettre" = {
+  revision = 44950;
   stripPrefix = 0;
   sha512.run = "7e50bf7d6109fcf0e128c35ebaa034c3301668f6e3bd8536b4a37c7e721592e28561911f922cfdf740d0c397a8375113dce0b7a00388a11bc4196b4b33fc04dd";
   sha512.doc = "308122fdd634c278f6e05e85a3a052e4255f06339db0f744fdd4859f6bc2983b7150c8fbb5d85fa71c39bf71ca6aec9d6c3d27707da0f95252beb2fb09dfafc7";
@@ -17793,6 +19749,7 @@ tl: { # no indentation
   version = "3.000";
 };
 "lettrine" = {
+  revision = 50847;
   stripPrefix = 0;
   sha512.run = "6d52341ea517e94128da35dfcfec9344e08a23fd933ef18e1830ce014e6906bd248be4161439cb4d48e1bee64d3b9896cb866a78233c86ce72f87ac5a788e98e";
   sha512.doc = "4f12fa28940188c95a3d707a97b18c7b30803d188bf7c5c46dd74a13589ca15609f47bffc309474c43966c3c2ba0fc6df09db2d85af1385b82ffd0a10e148c59";
@@ -17801,12 +19758,14 @@ tl: { # no indentation
   version = "2.22";
 };
 "levy" = {
+  revision = 21750;
   stripPrefix = 0;
   sha512.run = "a71294df1b2bdb1402892ebc0c82dd60275cf41f6844cdd284e1ba73c8515e98258118c5a1e5158fb6d09acdc53427eb4e3f62f24591fd2eafc90d0bb69b71ea";
   sha512.doc = "e69a1e2e421100a50416f86bda40702aa9a4d5c5b0b8c783e328e56e1ce587f832cad984fee2cad259603e893413155bc4539e853e1df0d95c89e9167c67b2e1";
   hasRunfiles = true;
 };
 "lewis" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "7dbe24061df0d0bb4762e7d308c895c99d8f9a9105137bce8c4e589c7fdc80f989aa8c3ebbe40708a8b6fa2a2df5542ce25fb16f528344ca46d50c47724e006a";
   sha512.doc = "b267e3c79dfacdd7ed8c931a0e5954c9fd2ea0cfc12beceef3b40bbbed30bbb421d29afd263a25a5b0b5b77a6bc74ddf38e609262485eecae065d65e23200bff";
@@ -17814,6 +19773,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "lexend" = {
+  revision = 53845;
   stripPrefix = 0;
   sha512.run = "110cee53edf1d3bee06f93cc1bd7543a1da372d38a0ae8e8aa495a87681b565503e9f44d691dcc3a742ef245cde9e285b10b758742d928431a4f09d5df55a674";
   sha512.doc = "66615fbcfcb04e7e833ff587d948357ca1f9318a3bfe6316c7883a65c16c7014720894f9bd40c0af5eb094d1a9898d6541527e2e0cfcfca132ac399017628191";
@@ -17821,6 +19781,7 @@ tl: { # no indentation
   version = "1.0.2";
 };
 "lexikon" = {
+  revision = 17364;
   stripPrefix = 0;
   sha512.run = "7c0642f9e727d34175898138d27a838f0432a68659acd7986acb0b74183f28467351c169c52ab057daf46546d8ef9f9bdf30dcb1846b458b6b718ae38633b275";
   sha512.doc = "4f1329d49d92d93743127e4f3ad9401e07529d31d2d68af86373f08b56ae69c22c70b89151461548aefb7fc1f7eca66cc1a4ac73407d82b65bd007f3372243cf";
@@ -17828,6 +19789,7 @@ tl: { # no indentation
   version = "1.0c";
 };
 "lexref" = {
+  revision = 36026;
   stripPrefix = 0;
   sha512.run = "f9bf7792ac09a6b5a69ae642e0becbcb1ed0c2eea3254b31da62bb9b7e3e161c24109e0bcacc8b89e3d03426710378f04e13a05be467115eaea2be028f8e5812";
   sha512.doc = "6a348acfd0e0701954195210bc717666308743f5f282b9efb7a253ab860a0372ed383cc2c8811527eeb2ed72c46be95cfb9e133d156fe8b906b67ed5140437af";
@@ -17835,6 +19797,7 @@ tl: { # no indentation
   version = "1.1a";
 };
 "lfb" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "5b1386321f8c24673531b48d996a20cea9ed527ae60e608f63a790a2cbbea573d01e0351c1ef695b11f14d31d5c482ffa02b337ea04e649b7b758eef713f3bf6";
   sha512.doc = "59eef59a1be002d28ce802617ee638b6c0e74efb391a502fa9593bf19e54f563f819f45442714b46a2e97f49bd561d2a2df631e53ad3847b48a881c8762d2d9d";
@@ -17842,12 +19805,14 @@ tl: { # no indentation
   version = "1.0";
 };
 "lgreek" = {
+  revision = 21818;
   stripPrefix = 0;
   sha512.run = "f0b5cc9b7267aa07dc0b0f8c6d23a164bc239591fd13b5d77c5c840d33e131546c63c63a3bbbee2851000bda2e8593e7617f8a7ae381e7cd0561302a667acac1";
   sha512.doc = "915df985f4766f492a70a35342e086567d17c155ea0dfce5514c6edebaf1dacb78998dc4bf5cc44415fef580a7779083bc2261a22dfd668e8f2023f1f15bff35";
   hasRunfiles = true;
 };
 "lh" = {
+  revision = 15878;
   stripPrefix = 0;
   deps."ec" = tl."ec";
   sha512.run = "265aeba5ee99cbec2eca77a273a9e4857d78280e0ff17089a358e7f85d0595025e259b2edd471ce5287479531fe37cfeeaeba405ac9cabc7ac9616242815b6cf";
@@ -17857,12 +19822,14 @@ tl: { # no indentation
   version = "3.5g";
 };
 "lhcyr" = {
+  revision = 31795;
   stripPrefix = 0;
   sha512.run = "55cf81c051e8f23fe4f085990bc72a5b1dfc276e3ae1721680ad033deae1e3eafb1b9dcff3380ee20b72623b1ab8f117aca66f61441387d914dc29dc91c78448";
   sha512.source = "18fc370261acff25634107705a36d06ec6367da95526a79fdd78c887234a2f2a6a17147eb317e97effa2ae8fe8e21e8df71cff3da5572055356386d26d2b06d8";
   hasRunfiles = true;
 };
 "lhelp" = {
+  revision = 23638;
   stripPrefix = 0;
   sha512.run = "3a5bb1d95c300e9546b67c48cc2c3e1a5c3089c4430d76172a8d7f3cdc59fe03de1fafc6a1babeacc9259444e09e85e02a64f3b3f8ddfe3883511482b9ff0985";
   sha512.doc = "2411bd37dba9c4afe1ac4251c9897c99e5934938bd802dbe89993d5b6ec0d19e1cba8b143ee5febd9ad73f0ef823eb79f34587e6885250a2bce8eebbdbf06fd6";
@@ -17871,6 +19838,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "libertine" = {
+  revision = 53310;
   stripPrefix = 0;
   deps."fontaxes" = tl."fontaxes";
   deps."iftex" = tl."iftex";
@@ -17882,6 +19850,7 @@ tl: { # no indentation
   version = "5.3.0";
 };
 "libertinegc" = {
+  revision = 44616;
   stripPrefix = 0;
   sha512.run = "0af71c5bd17a2c89d85c2df056e76e4f8ff98b24de40dd306a9c4207c15dbe9dfd08864736a3a45f1c82f51717396ea843082f6798b89f7e9ea8c316453a707f";
   sha512.doc = "010db594b034a5e401fd17a7772dd3dbf95c37d533fad97f7b1568336beca31523384da1eab42e74b2e8bf294b25a8d19df7469eddd65cc1bb61abd5dbe79d03";
@@ -17889,6 +19858,7 @@ tl: { # no indentation
   version = "1.01";
 };
 "libertinus" = {
+  revision = 48588;
   stripPrefix = 0;
   sha512.run = "ac413716b5316b11d09c30613461ebe432502d4f6b776aa3931a6e8e15ec1afe56d60632a5d9f941ce4acdb89e45914f2b072c95d8160fa1132819b8a0c67bc2";
   sha512.doc = "4a01523a5d8211138e873e15c9ab7c7b1f62900d64c7c75c08daae3114cea4fea5ae3a18d81b3210be78866887ec1cb9d38fe0d4b7e9c7e498f75d65f3eef5dd";
@@ -17896,6 +19866,7 @@ tl: { # no indentation
   version = "0.01";
 };
 "libertinus-fonts" = {
+  revision = 51614;
   stripPrefix = 0;
   sha512.run = "f30ece5291ceab44ec15c8eb6f20593e78ff2b31b27f49d9472f22ca63746099cfb9493dd9522ce3ff3b712eb3bf22d981318e985461fa53c01f399ecbfdc788";
   sha512.doc = "8bd8dbc35aebe0596173b93ae56f5547b3637f9973802ebe215216c485731721bb400b7bc8c404644a401062eb7efaac612f03ad431257a75cb36c59eb83c4b8";
@@ -17903,6 +19874,7 @@ tl: { # no indentation
   version = "6.9";
 };
 "libertinus-otf" = {
+  revision = 53871;
   stripPrefix = 0;
   sha512.run = "a4b85c7861aea614fa87a44314331aa51a53de6647f83f440577b3840e3748c02da110824b64188be9f052c4542a747fc44bf6a5119c30a7bc1f0b4e16e6499d";
   sha512.doc = "437f9151d0bc948ef3a70984769c8cb53a658d1fafc2b774f6f8573eb6ef5e89970fb4ccff3e3c7b3e59584b06ff81ea308d78287412c5e552b9c9b457801bb7";
@@ -17910,12 +19882,14 @@ tl: { # no indentation
   version = "0.24";
 };
 "libertinus-type1" = {
+  revision = 53159;
   stripPrefix = 0;
   sha512.run = "14bfca077c28612598abb0b0f422586646c0e43d6feca281b2965d22260c816ae23ab5e4e9aa22afc8c2d35988718729fe3777c1222427caf85cb0999f95e7ae";
   sha512.doc = "8cce8f098880a2efceadf7f3ea8a703ed4cdcfdc33463c23b0d021d677bb7959d2111c3226f90493491296bd23254b2f79e0d283ac056a2d698041e16cd72ec4";
   hasRunfiles = true;
 };
 "libertinust1math" = {
+  revision = 48862;
   stripPrefix = 0;
   sha512.run = "e1495d0bd0e0082b54748cc6536a2ba0c0664da049f3ea99cf3df3cf60066fef11854738fe89f477bea879db9dc49199fcd2e8c3c4676cd3bf135122e011bd10";
   sha512.doc = "8816d8592f613f9776d57bf1c71a0b4018a056647be658268f8d13135deb2903b7b31e4be11098b6aedeca852bbb889b23110f76c98bbee7cfd26a2c0ad29359";
@@ -17923,6 +19897,7 @@ tl: { # no indentation
   version = "1.1.9";
 };
 "libgreek" = {
+  revision = 27789;
   stripPrefix = 0;
   sha512.run = "0547ebdd180554fd00a7ad96932816e13744886457c84960b8abba06125f68ec9391ffb03c7bb7ad039a2654a1b73c2c378b8eee2130107a02e25881581c8139";
   sha512.doc = "105ad6a6d557213c6918b2160dfc70449d496155e3a0fe1e683b2186b8d10d3067a85b05e3ee26f01ccdb6f70c2f864d09439eb4b8347dc3217482e17600f79d";
@@ -17931,6 +19906,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "librarian" = {
+  revision = 19880;
   stripPrefix = 0;
   sha512.run = "2a01755bec49fa8c78680b0599b58649b803694f339383ad168bdc06554dabeab3047d1b17d63f7487860a5d0102dd8f68a78d5ad5ba94a2f8b29db7329e1ebb";
   sha512.doc = "6d95e43b1f9965fe016bd9fc7ba3f9df56716d8f6c89948417643bffc4b9e89f8a5e6cb045e873daff819a16cc10cd61e74e73e98119a076580967187338be37";
@@ -17938,30 +19914,35 @@ tl: { # no indentation
   version = "1.0";
 };
 "librebaskerville" = {
+  revision = 31741;
   stripPrefix = 0;
   sha512.run = "03f47456269d8fba252415fd2d13faef8efdd3895405dd0385eeb2bd44a9ffdcbf410c5cc0f63a2f9df349b940408a1bbe492bb8c8c71e756ab184b6ff75743c";
   sha512.doc = "c6fde0f97c5f5ce27172fb3d9b41499c45679fe65ad980916b0d4af5e6bc9a0c91eeb33b2a30967267887197628218772761e5a909703d1807d2b4d8f34fd4f6";
   hasRunfiles = true;
 };
 "librebodoni" = {
+  revision = 39375;
   stripPrefix = 0;
   sha512.run = "eebacf9b045b46df1a8c806deebbd94742e2c1615e45da85946c83cbb82a3a2ff278a6a0bdf47059c5713ed1c2dfce8988ff82c4682aeeadc05772c49426372f";
   sha512.doc = "5cad86257fd423e1f7551a014f888c28d4b61a9fea14aabb0128458fa17ad81372668f247d9e7a81ab0801d9ece0a0529a304d16ae2f06dae5598048bef4d036";
   hasRunfiles = true;
 };
 "librecaslon" = {
+  revision = 52536;
   stripPrefix = 0;
   sha512.run = "ffb0cc23fa1bfffdb26f44cf174d0acc066790551609440a80be026abaef24cb99e261b28aadb323a830e7c50a07646fb2e304c074a6eb7a8d765155726892b6";
   sha512.doc = "f5f618eb1a691e24acd624c065c79608f326e01cb01e2d6e535b23450a5a9e8ef5aca65989c689be996a23470664122c47176349a44200688ea4ddcae68002a5";
   hasRunfiles = true;
 };
 "librefranklin" = {
+  revision = 52520;
   stripPrefix = 0;
   sha512.run = "9aa9b1d5d56875fad5e494c6d07da8494d12c3bbc37c99ff1b5917654e253649636e76d5c1dc92a243378e82e1d4a496c234a0acf18be810761c4eb534075bd8";
   sha512.doc = "34ada19415b6ed29dd5bd35fca644d511669265ea3162d10aa582a5de9733bbea19e53d45a22c4f616ccae6d85b3f59883b54e69699c1b4e0c9782388acf6762";
   hasRunfiles = true;
 };
 "libris" = {
+  revision = 19409;
   stripPrefix = 0;
   sha512.run = "1a754d896846d0db358cf4f878928dcb511d76a7de6e7dfabee71970908e3ed7caab98f854695318ead334e052282b690712069597f42505b00c41e328ad141d";
   sha512.doc = "04378b8461d6ea0284f038974fed6ae6fc48fc362f63dfb8b8d57a81a721da7bf17ca3aeabb198c373a68a4c8e5516b66f12c240e081dabcf1b9c79fd2d2b388";
@@ -17970,6 +19951,7 @@ tl: { # no indentation
   version = "1.007";
 };
 "lie-hasse" = {
+  revision = 53653;
   stripPrefix = 0;
   sha512.run = "ecd15640967371587139b06241a7031e86b72a6855a762e90b5b96ffa629c520613fafa95f08f346bbca365ef4e2156b2d1db6051f5e065bfd94291d942b2a44";
   sha512.doc = "e33467606f46bf04dc4b42820a1016a3da4222e17dc3ee0fd44290b6e8cd831ee8080beb3536a66f961406066884bffd1488b103ec2fd86c1bc01399b1879bfa";
@@ -17977,6 +19959,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "lilyglyphs" = {
+  revision = 33164;
   sha512.run = "8d0d8b994628731e23b1a579a141cee66043838bf254306af91f9edfe2848379492baddddd1018b7a8b7c5fc7de33f4895884412b21d1b6825856f19b7da4a57";
   sha512.doc = "8c834cb3ca5bff9538218112523537417bc41b05e34f6f6a1670c3f6eb573cc223ec8be121c7df79ebc746afe427520eef6d1ab0f4e569339b542ee67a6549fa";
   sha512.source = "810c33637a1a8484e28b4a3b60c4a5ec281928d049024c2e24aa0200738a9d07eb9d63f2d5f2263c90376ab071dd8b4d8ed40db6d5ebefd8f49ac2aadee869df";
@@ -17984,6 +19967,7 @@ tl: { # no indentation
   version = "0.2.3";
 };
 "limap" = {
+  revision = 44863;
   stripPrefix = 0;
   sha512.run = "eae51f72a65d407b091244ed926ec98a7bf02ed8c360fcea2d614011555195992d315bb22b3697c8220f8e91f34a1c2f88092f34697dc9ac42f757e066198650";
   sha512.doc = "748504c008704d2aa1c763920c03c72372c89368e245fbf4172b442b6e9efe11b3754f37c37a864ab19301c8822aa31f0d25f80edbe26405c043aab8a0382739";
@@ -17992,6 +19976,7 @@ tl: { # no indentation
   version = "2.2";
 };
 "limecv" = {
+  revision = 53720;
   stripPrefix = 0;
   sha512.run = "9c1eee074b9ea30fa42838f7fd7455c374a504dadc3bd81f3bd43d494e881f5b7fd2637341bb777c73a25935874b508ee7d197f2d3ac5799ab16365a29b1c28b";
   sha512.doc = "43f9572e3e0be38f26b1ff8cd0594706ffdbb448d6c3c3152216a887f2317a7b35f202046b2ab363abbe944a1982379ce6b9b439452968d56d996b44e785879c";
@@ -18000,6 +19985,7 @@ tl: { # no indentation
   version = "0.1.7";
 };
 "linearA" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "5fc18101f389b2576b8e035e2f3bc79a37c11cdd64783df288f7776d1dc99ebc5c56a61d727de2dc57a9af4a4d0634b5ec6564513aea369fb1c8e4ce4eb407b5";
   sha512.doc = "ca6749644b81bd4e6407acf0ea99f2de57a408b8fd332725dc8319888ae05e8e27cec2c3201c49e51f2cab22221ebabd8f980c627c7ce9f836bff2cb0a2cd575";
@@ -18007,6 +19993,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "linegoal" = {
+  revision = 21523;
   stripPrefix = 0;
   sha512.run = "87a062513ff7674f315472cc46e13fbce99057c3b7083a2b9c93b92f09d538af29f5d1e3664dd5273080b9037ac232dc0d7491753b83136d2d3558ada1b81976";
   sha512.doc = "9c61ec4fa6bc63a57f7b272c7dfc55035e8e4f14225bbd2763157915fd351a2bb4f179150801f06682fd9bd59f756edbb127e7bd68592ffee5c1cfbac91b10a6";
@@ -18015,6 +20002,7 @@ tl: { # no indentation
   version = "2.9";
 };
 "lineno" = {
+  revision = 21442;
   stripPrefix = 0;
   sha512.run = "c98bb4c84d6473c3038a359872442ff8387ad8f111ce1d82021728d9bb8e29ca08cc65d5705261bb347a2da2fc27594cbcdc8accbd59aa03c91f0c25312578fb";
   sha512.doc = "da4fc0ca69d434c6d97cb87390247b3efd3463f5dcfa7e828d2bc840d2636036c097d6d54bb2e89b5d9b5f2a95a41db89af415d08ceacddbc4642883ebc134dc";
@@ -18023,12 +20011,14 @@ tl: { # no indentation
   version = "4.41";
 };
 "ling-macros" = {
+  revision = 42268;
   stripPrefix = 0;
   sha512.run = "686dbb33df2670af909a80863943a8870ecef128679ab679f3d90d1747042b752c9aea15660c962b0f02418233d4d152e64357d5b57884a2fc2371acb3d90a52";
   sha512.doc = "fe424a7db4be743168c4b1016fc25c95d33cf9d66767b39db0e79a5ba1bb667c76b9b5f10b23a08449362a3fef281d60f0b53e2b0f196846efe9f4765f3f08c6";
   hasRunfiles = true;
 };
 "linguex" = {
+  revision = 30815;
   stripPrefix = 0;
   sha512.run = "36fab316a894029feba86bf771d4e600b3e7f5d766deb9d844605979b066483500c8fa0a425718d22e9a2bc14d74aada16ca8deb7ee744a81e18fee8c77a7b50";
   sha512.doc = "7a5d84d5425031d341deea8f37f1d8a9f6eaee820ef66661e8e38eafad2b20a5e9b04b81b1a0db0b11ab70fb0adc9c81cef886978626008eba6aa3c32bc0c848";
@@ -18036,12 +20026,14 @@ tl: { # no indentation
   version = "4.3";
 };
 "linguisticspro" = {
+  revision = 53157;
   stripPrefix = 0;
   sha512.run = "14666fba12a28f8ca8c1b939582778a7f3f0532df489865b92babd80f89453c69b97d987cc8c8449dc0ae8f349c47014439f476ea9cc5f48f114898d8a8e2321";
   sha512.doc = "af514187b84cb6c6c5d623c76dfeaa0acb0b4186ecee83674266a5795d1b5ba909da1691891cb1c4a6d7ec9ead00341124922081798b19f2aa5521654277c146";
   hasRunfiles = true;
 };
 "linop" = {
+  revision = 41304;
   stripPrefix = 0;
   sha512.run = "ba0c5e053399c44203d6eff42252854a16ccbf12132ee6e26fa577587554234b36ed31a63f1a6c40059e0aab8d9367a5b6aa6f34d552d64866b46e68478c36b4";
   sha512.doc = "e63f09e370a53dadc92591d105c677f2a5eea4cbcbc4e3133448df64b10abf2eae1d76cdeed5e288f610be13eb4baf8f248a6e9df92ab79066078ee165b9fdc8";
@@ -18049,6 +20041,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "lion-msc" = {
+  revision = 51143;
   stripPrefix = 0;
   sha512.run = "93a6800c371a2444c34de2888d09076cd41b9cb773b39af1c6772928087f4c0438e85a58267e9a0afd309722b5eb16907a553c23d2cba008a65b6e2f3b3edda0";
   sha512.doc = "d3df6b66fe429e565b9f336b2d864458de759a907fe1c0ea88e002738fa7d7122a3dae0951f596c56192ec5b44023eb604eed7cce357521e8295431675bf2e67";
@@ -18056,6 +20049,7 @@ tl: { # no indentation
   version = "0.28";
 };
 "lipsum" = {
+  revision = 49610;
   stripPrefix = 0;
   sha512.run = "f5d2454f160162fd1272f5a43e021e1050947b527614c6450a87e1ba8aaa8151dad281cd962142d5ad39cec9f44ac7b313fdcc44da94db0256ab9a2e14b75b0e";
   sha512.doc = "fae8e8002b33c26ab34c53d09e1bbb76f46164e2fa8a59517dad19e81c1b84505170e675cc2d9072e30d5e5314f7ea7b72d61e273de9ca9f898d97ec2143e3fa";
@@ -18064,6 +20058,7 @@ tl: { # no indentation
   version = "2.2";
 };
 "lisp-on-tex" = {
+  revision = 38722;
   stripPrefix = 0;
   sha512.run = "67817d9894ac5bc8d456ce2b114eba81b0c444bf53422c4acb5066b42cd5cd55d73c46fb2b443db9fe3b13bebb58d6fd7f2bb31686dc4ac2295447285295c602";
   sha512.doc = "fb3a8ef4ada38d910b3055f408059daf700946c84b17873846175e6cd3075ad7f3889d2af154adc3a7898ac33646251bdbe0d8cda17ccf354dee526a96476432";
@@ -18071,6 +20066,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "listbib" = {
+  revision = 29349;
   sha512.run = "e71bda783acbb8ab6ccab3d8af535034caf0eea919bbd175685fe50585970b87613e0df5ed076967aca395cd8c7f1317e805fb1cf765897b03d6cc131d3d98b8";
   sha512.doc = "0ec0970f591fd3a840c27730d41f0b817f631727c9c7219880b45209c21fe0d3aa616eb6eb94bc7016a9acabfe9c50846d872d3b36a104e1f4eb74dd003a16d3";
   sha512.source = "441b13ec75d91c68b8e7253a5dc9a6e515c5bb0df81a4784dd414b1956be6f2c9189051ae9090a04bd4d11919945a38ad6563f41c27d1b8d03ad283f71c9a19d";
@@ -18078,6 +20074,7 @@ tl: { # no indentation
   version = "2.2";
 };
 "listing" = {
+  revision = 17373;
   stripPrefix = 0;
   sha512.run = "154a9eb9da19d4a1d9f6ed421bc13f1f83279cd456b95ab8b7d84f9c48d6aae5548b7357e46041580d4b457758aa090e6352aca9d9e20f1739dc589d4fa24bdd";
   sha512.doc = "11ef594d55ee823dab2a88ad5882e1ea89d7741f1038d3782ac43fa43cce948c1ed72096ddd11d1efbcc3b43ac9bc4dd23713f725aa71807ea174548d9a5c968";
@@ -18085,6 +20082,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "listings" = {
+  revision = 52079;
   stripPrefix = 0;
   sha512.run = "ca15ff0ea1958ccb4d7e464245f7a214a509341517b7bc71823823f5673bca3d7ce27b6b7236f195078c7f9e7e3812a5bfbcc1c0b59196d06bf28cbd4ca63acd";
   sha512.doc = "38e7e013f56787a025425342858e2f1933f0f6295876fd9c2d01df568d76b51aa17e479fab968a9cb950fd77cb0810faf4b31b267ad23c32ad26f6e85ec32d0e";
@@ -18093,6 +20091,7 @@ tl: { # no indentation
   version = "1.8c";
 };
 "listings-ext" = {
+  revision = 29349;
   sha512.run = "c68752d0e7a1ffb7d08f153bf337849164d0287f20ff8f092635ad7083b2e5a6c487bcd9dff913dd029f4ea92750768d23583eed53a0c2d3bf012e4db059708c";
   sha512.doc = "82491f81dfc89950d085f7cc41dabdf7b895b23c8a69f80c1b4f4c420fe8f036ac181b56e3ab60496910d0f1165ce19b2f94c5e268dc1d59e352ab6747e3bee5";
   sha512.source = "fab34f07d6384a5474f3ac30e2e00a75398418668134ac1041cabded6209c9521244e1637e4037e7346bc70b3247ebcd90526d5e34fc3c4e388fa978382bf228";
@@ -18100,6 +20099,7 @@ tl: { # no indentation
   version = "67";
 };
 "listingsutf8" = {
+  revision = 53097;
   stripPrefix = 0;
   sha512.run = "846cc046ced340cafd98f009a55e891bfa6bd5715c94c0dbd5b124599c8e3aed1f248f56592795184fa040285001b0d967dfb26b0fb764bdfadcc2eabe8c3122";
   sha512.doc = "fd15657a8c7e8af4d21721f64ee0c2a77606d965698fdfeb581116f3b13dbf95bf774b77f019bef4cdb4565cd1957cf040818b1d9f78425eecfccc48ab6c5e28";
@@ -18108,6 +20108,7 @@ tl: { # no indentation
   version = "1.5";
 };
 "listlbls" = {
+  revision = 34893;
   stripPrefix = 0;
   sha512.run = "b5c2e7e168b07aa288c911dbf5c1fa8b56d2a73d38babf0140b77bbf783334f2da42b2bfa8d951e166f7184345cea26a908d12ff4a07ef89b85a7d7772d645e1";
   sha512.doc = "225837c7a5c80b5a01739c20011f4b4c76b0cdeaf26e3f8f44fcafee3e439a104c6eb1a47660a788b96a3cd63f3e19d1384ecada059380773850c7a4109d3269";
@@ -18116,6 +20117,7 @@ tl: { # no indentation
   version = "1.03";
 };
 "listliketab" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "0aead2b70e314639aeb98c199d051fb0701570df0263f452bb2e65408678d437c7eb071c41d8674971e42a0961da30754696a58eaaa41dc32d33ded58a833153";
   sha512.doc = "70ceddb9c59981319ec33fba05c663ecaf549b5dab56f29fa07f9c314d97d999c762ee1efff0d20b5e35b39e89b031458fdde4c5c708e0a1c2dbfdf17d710c2e";
@@ -18123,6 +20125,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "listofitems" = {
+  revision = 51923;
   stripPrefix = 0;
   sha512.run = "9cdbbac3442d2b6cf45659a77dbbf7c1db2252af3c656d277f8c9c1f8cfd98879efb7e6a9957481cd6e892d8f3df1c8ef46c7992b45c6c461dfe936018600917";
   sha512.doc = "e7c3df40b9657dab386eaf54f08018e3d390a1de96a47c5c4f63759c11aa38b243301287940131297ad107e4a63fddad5bd9ca5982b211febda7bf5a6a8d40de";
@@ -18130,6 +20133,7 @@ tl: { # no indentation
   version = "1.63";
 };
 "listofsymbols" = {
+  revision = 16134;
   stripPrefix = 0;
   sha512.run = "dd32fbcd59fa9ec599b0a06672d2e810b5b8172a96a4170cad03a93be3da21a02a036967d0e7e3a617bad6535aca2b1a34a114c383b5ed1aca22bc45239266d2";
   sha512.doc = "ff8bb87ee326f0b0df175eb41d634d67cf2f1ecb76f1f8dacf2e19d061e54c4f5cf8e01c7e8c41087ca6b69a04f5a3184ee8ee39f00758d3df2f24a4b2e372d3";
@@ -18138,12 +20142,14 @@ tl: { # no indentation
   version = "0.2";
 };
 "lithuanian" = {
+  revision = 46039;
   stripPrefix = 0;
   sha512.run = "228fa0f588bb0293778a71a910401575e20aaa8a184d54d51dcf1bebc8bb6b0c0ea81cb1d3e0f2d36b6a0abf830dbd328caa6053fca7f40a83bb292f76b83918";
   sha512.doc = "e4b01bf2174854d95f348caeb5e5b88ec436420178eb06a78cb9157bad23bcd34584e9bde451e3963f4de59e66162820f9487ca4d166b2bd898b2cef17e63ee4";
   hasRunfiles = true;
 };
 "liturg" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "e97da4e9046fbd60ac2b22bc3753db7a75b5b6aeeb6c37293c5dd1e4e8fffd18b32818b9038b816a405033ff74d9c19ec2443b0169721656af687f1c5d62cf9d";
   sha512.doc = "6b342e85917d5a70dc32461de01ae3c6ac66ca247b4ba3d812b7645f1cd1d961c914e584cabf743bb03ea74cac144ec05b03cc09d0c23cf7bbf4b8ce7d01937c";
@@ -18152,6 +20158,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "lkproof" = {
+  revision = 20021;
   stripPrefix = 0;
   sha512.run = "58c211cf1ed20b36e69ceffc8568fc1cbdb51cb812af79d16a64cbe8a8e7e672a2d49e672501b2cb23ef72c4a04c59017e17e538061159c8b9e797624f8334ca";
   sha512.doc = "01c3f1b50147c73294dabf83d79811862d4742f5a76f69ff6f6a1d5a2b0a8462e3728ba6e4d6fea57d3703c638f6cf04568948d45d4ec8d1dfe59571ff2933b6";
@@ -18159,6 +20166,7 @@ tl: { # no indentation
   version = "3.1";
 };
 "llncsconf" = {
+  revision = 46707;
   stripPrefix = 0;
   sha512.run = "9df2b2ab5fa1434263f4df8a4f5c5329d38bff47a3f9178b2b220b50d34e410ce2904df5177076131ecff1a5a20cdb9cfd6cf84d986210df1ede7ee61f73b255";
   sha512.doc = "a0a9ee4372d9afc48fcaa16959a9c54a3d10216d6196be963f9b35c66f13c970a4cb4a01996cb2397a10a6ea36c445a75541f7bdb9608c759e611faffce56574";
@@ -18166,6 +20174,7 @@ tl: { # no indentation
   version = "1.0.0";
 };
 "lm" = {
+  revision = 48145;
   stripPrefix = 0;
   sha512.run = "f94af6c169ee05d3a2dceb00794feffb7808a4bedc05da7655ea74fbbf675047661f49f4f2542373e5fef60fc0f91ea9931b25bb10c1449f593b84ebf65cd154";
   sha512.doc = "baa33984a243c1000fbccb73f853dfab7c935e2da5f68294cff38db950d85f09ae9ab63f01178028c5f77d00c03b919487e73eca78dbcca60b9ade73a0773b18";
@@ -18174,6 +20183,7 @@ tl: { # no indentation
   version = "2.004";
 };
 "lm-math" = {
+  revision = 36915;
   stripPrefix = 0;
   sha512.run = "f2424f917e13aa9805f6738ceed376d6063713dd4c58a5953b5456da4ba81eaba3f0f97963ecf36ead4f68b1311c4c9e30f064002ab8bbf0f5ed3a67db3ead4a";
   sha512.doc = "262a99ab29fd22976334eabaed77d3326e87b63014d9e640ef8ea31b14382b273a6435f3059aa235c50f9f829ec28adf754763e17a945265495e9a54e7ee53fa";
@@ -18181,6 +20191,7 @@ tl: { # no indentation
   version = "1.959";
 };
 "lmake" = {
+  revision = 25552;
   stripPrefix = 0;
   sha512.run = "3613e9d53808b2d1e326175c28acb672c1f244b2e00ea1d544e1e05c73e2a93e49b5e8b187a8a73e87ffbb00c22235781983a2c0a733a6ae5598db12c278a763";
   sha512.doc = "08fa487d9151ea6a49a73044d1f6b41ed0c636a69e04a2c9f04bce996f915e9d267383a6fc374f3292c01244981fdebf6d9fc462ee0fc151ded2601e4554593b";
@@ -18189,6 +20200,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "lni" = {
+  revision = 52401;
   stripPrefix = 0;
   sha512.run = "8648f9a39d982e99f19af652e39ad1feb98c01ee2a06b3912dc609213673bbd685e11969507842caea4657d8ec0a33f7b3a9ceb0a4cbfd4a9c4939ac1d30e42a";
   sha512.doc = "7ee44a6ba2782b28a81c8d907ed11a07079b4e8eed3fc1d8adff80274df471637dc69e15e6012d9147116c76d2faf9beca10b22a554a03ae6985c9f68791f104";
@@ -18197,12 +20209,14 @@ tl: { # no indentation
   version = "1.6";
 };
 "lobster2" = {
+  revision = 32617;
   stripPrefix = 0;
   sha512.run = "97692ee9293dd7fce8a3ca01f29a11daca837baef5d55b2c85339e1b2656430d009b5beccf7f04c5eaaf9b1643624fa259e353bf7f8afd6ad78df00999c252ba";
   sha512.doc = "4efa18df18dc64cdc88d52b3b4bd9936f021a039e62eeeb2b028461328f2c3fc5b0bb0b661bcb3d2db155c48c270dcf1c2dcc2fa4951666597277e8ab1195494";
   hasRunfiles = true;
 };
 "locality" = {
+  revision = 20422;
   stripPrefix = 0;
   sha512.run = "c7fde4ad74b339d340a046a4f59ff73da45942631c6b68275d365c18ee80b213d18b84540b8ee535f012aa18ef559e88b1df3fcff4560d241ee1147695824a2e";
   sha512.doc = "5b7fde689fc764dc75930522416cfeb51ec30eec64080b289c085be4b00a0da1c5d6d79d2734502ca8a329bc2935216a8b298495e0ad1ac8331c6d3a5718bb5f";
@@ -18211,6 +20225,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "localloc" = {
+  revision = 21934;
   stripPrefix = 0;
   sha512.run = "ff1e797efe69f372e61272d187e758e303e505128549e02d8fe45c621a28e55337d13b0fdbf6065ef97d4f8c51018ead4e97c1c4b2d9a76f9a6d299136f510eb";
   sha512.doc = "13e03c65221c892acf80a51bedd6a18232e9e9adc7ba92f34399e678a2d88d7050b94f8047087c891075c2098bc759c79f1276ab2ee8cfe08dd7723f2ede6f74";
@@ -18218,6 +20233,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "logbox" = {
+  revision = 24499;
   stripPrefix = 0;
   sha512.run = "0c6f9d401c81344465d6eaa6eb6e655443c4af1622bfb6751db508638e2625aba7b5e77780fbb6453eee40b8a7ddba84d70ceca8882049779db61f83e7a15aee";
   sha512.doc = "21f379c88638ee8499e7e47abb0850822a08d520aabb352e0f85ed0c38950aa71b4f9b3d430c31193de5640a915d0c84dc28fba71443d3f2e461a2dac53e2b9a";
@@ -18226,12 +20242,14 @@ tl: { # no indentation
   version = "1.0";
 };
 "logical-markup-utils" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "87f7fc345935804705ab25ab010376fb72bc4722c75bb115b0c9dd0e0a51fc8bdd6dd4051b76dd083ec07d80b8c59c5d18423da55e0430db7a9f94ad0bd45906";
   sha512.doc = "80c44068a6e474071e40a0bf3dc67f0201b21eb84a041fad8423c59c9e34ce138833c54ead638979357dc3026eea55da034daa05e71a56ecabe701ebf53faf24";
   hasRunfiles = true;
 };
 "logicproof" = {
+  revision = 33254;
   stripPrefix = 0;
   sha512.run = "d5b15ee5f35a9ef94618f8b092e97ccc4f1959a617c2e604b99ba56eef14c4a1a078d66f2c77d02239289e30878293ea6c9ff4134bd003331fc41fd3db19cec5";
   sha512.doc = "bf8a33c5db05a30cb4f520fa2f73f572a90c3803c4b6dc1709f9e2c80f67e32e7665ce898852dedcd3daa8974bf909034d06f805ce473318f0f512645ceaf9da";
@@ -18239,6 +20257,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "logicpuzzle" = {
+  revision = 34491;
   stripPrefix = 0;
   sha512.run = "2c642c7aa6d6f12e51228432f8bd9fab906ff4dd3354a49f636582a065bff0f534222161ce11306ff6bf3e354a9ca6f6394cf9826b321ac94e9ef5ee8c0621ff";
   sha512.doc = "872a72ed13f7dcb43df3bd2f2b7bd504e3e430030115faadf0a130d2fd94331a335c4853e37c78e4b8aa7c59a44bfd87ad2a484b1b836c2a7526b97ef26ddd56";
@@ -18246,6 +20265,7 @@ tl: { # no indentation
   version = "2.5";
 };
 "logix" = {
+  revision = 53317;
   stripPrefix = 0;
   sha512.run = "5d392c564c4d4a5827a2fc58b95f95dcfb51e32c116bbf94834831ef2eda9880a07d0c21032a6a36f1a694cf184b5d4f306c0935f1c80ccb6bcbff97e9d6d37a";
   sha512.doc = "2a12509e023fc089166aefff11174470856225b610b87f1707d775cea2e9d60da1ed047ae98a62ad7d923ceba2f71d30576f262e0db0a6dbf68f89ba612a64e0";
@@ -18253,6 +20273,7 @@ tl: { # no indentation
   version = "1.02";
 };
 "logpap" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "159876dc23e96f65fbb29278e30baa497489331fcf52ebda2adcb19098c2519044ce54ee590c3d91f80bf27b6df0a49aff455da54748c3e04c7e81c2be108e4b";
   sha512.doc = "f85a52b9d95247ce5eb537cc677aff184a434a41fa9c3433955b43eec3e3cf2deaa701718fe77dd3b3cfad5811c5275a097d980e157130705ad5cd3f14276dff";
@@ -18261,6 +20282,7 @@ tl: { # no indentation
   version = "0.6";
 };
 "logreq" = {
+  revision = 53003;
   stripPrefix = 0;
   deps."etoolbox" = tl."etoolbox";
   sha512.run = "df61c0c6c0b8520f5ec38780d8eb69cfd5fccd21f5120e48eee71e02b004d3da4cc9cb9371a36766852e3ca09a3db86655f1a2639a49741f00134cff1246acd2";
@@ -18269,6 +20291,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "lollipop" = {
+  revision = 45678;
   deps."cm" = tl."cm";
   deps."hyphen-base" = tl."hyphen-base";
   sha512.run = "81557b83acfa4ad42dfa6fb1a65ea42bc33885da444ee23bc3c67a899df7b3ac2c19a1607305b5ec10b503980365c5d29ac3598339fc186a05417ea5bca60a78";
@@ -18277,6 +20300,7 @@ tl: { # no indentation
   version = "1.07";
 };
 "longdivision" = {
+  revision = 50586;
   stripPrefix = 0;
   sha512.run = "64669ae90bcf3c98d4e58e9ff016bd03e151f57a83c6a98e71eff714017c4e9bab95694d33fef3edde79001f0f90a54e4f64514488b00d1e373122914064d8b1";
   sha512.doc = "679f3766529588f5319f511178ab84e636d9e888a3f2cffdb6d94384042bcc7deca14821fb5010e7bec65614bab9adf336346bdcc38bc8908a29a6e9266cdaf6";
@@ -18284,6 +20308,7 @@ tl: { # no indentation
   version = "1.1.0";
 };
 "longfbox" = {
+  revision = 39028;
   stripPrefix = 0;
   sha512.run = "43164941fd7ad91fa304aee01c3d34ec1faf8672549ae3b2711bdd4c91ae57ecbdcd8b29080d6c96cc64a73f7d7fd74c8621a70604a29dc1474f3c922c34a4c7";
   sha512.doc = "fb319a679631e56122535b99a187d3c2ad5400d4a1f00275b73420c43f98e8b421a4b86f77b868c68edb39870132117de3310a00bde82f6387559c6adf34a8a7";
@@ -18291,6 +20316,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "longfigure" = {
+  revision = 34302;
   stripPrefix = 0;
   sha512.run = "984f10c8a2196b490dbffb015f2aa6449e8db6475c2f02dd71c92d5a3f6cb5dccb98a4c4f923f6efd3bbb1056aa8e64f324e3d8a051c11879677addaed8d3f06";
   sha512.doc = "1f949e3ada113710f40b6d2960bb01ffffd3f9d26a65fd0482644da2a20c5375454c430e1c7d3b74cf872cbe486ccab9a4e71567592da5d39ad9e72102c382db";
@@ -18299,6 +20325,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "longnamefilelist" = {
+  revision = 27889;
   stripPrefix = 0;
   sha512.run = "1d16ee9c76784c5124de3abe62b6e916d0f65e979a18a721ef688a960e5d20382dc976de0b68d95c47e9651ad71a67ca97a828f1bdfba8e4a77ac084d7561386";
   sha512.doc = "d909908d763342790b8ab56d333e60d7047894472f3922a2554581a5455539845af72d3867d0a55f5a27e982aa8128ae1a948f40e106fa127f2d01156b55ccf6";
@@ -18307,6 +20334,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "loops" = {
+  revision = 30704;
   stripPrefix = 0;
   sha512.run = "60ee6999e43ba9082c5a283dac5a930c9075b24f6bc7cd3f719b0336b01dfcb17fb2d5e3c82b9f1636c9bb3e6c923607a3d9237d08fbaf17bbfc1196d0a75281";
   sha512.doc = "9d70b3ae88d64bf2710157db88113224a95947aa03f11a2eb659c61109a451e2a93b2aa5ffd6ce9cf2f1b5fc8e0ef815850a0a9f27c7ec5ddbfbff1fe98ecaa4";
@@ -18314,12 +20342,14 @@ tl: { # no indentation
   version = "1.3";
 };
 "lpform" = {
+  revision = 36918;
   stripPrefix = 0;
   sha512.run = "91d5748629ad72ca421834ffc61c13f71240bbcaedf9f0e4279bc6aa0bbdc817f093c24cf5a9c50d5a4a132208969bd356642fc5704ebd5c4ef2b7eef23f27ac";
   sha512.doc = "92ddf3b473e13fe8b77ad955d55acbe7a6da34381bfaac78184342a900f2c9bb1e0981d5ebdb440cf0f44affe2eb0dd862f9b51d2a40c9abd90f1dbe81584c9d";
   hasRunfiles = true;
 };
 "lpic" = {
+  revision = 20843;
   stripPrefix = 0;
   sha512.run = "d918fdc8744a9f5e0d24f6ba4f19bbc4cbd9a5ba4b3c559ab1321c36a9e3599ccf6ee849bd7f2ef6c3156cec6e526a44d27bc033b7dc5b217e289fdbff0bf149";
   sha512.doc = "307109b75129099c191a65a7632ad0cbc903cb2b621b199dcceb7cab5ab5ddeff7ee504d7da3afd653e1aac04236efb6a3c1225f9e533a777295052bcc28d2ba";
@@ -18327,6 +20357,7 @@ tl: { # no indentation
   version = "0.8";
 };
 "lplfitch" = {
+  revision = 31077;
   stripPrefix = 0;
   sha512.run = "189b9d6000d4b762a3c64652bb05f9465d5c789b7e2413e8f0ca281a8d4729a3044aa955ad7eb82c7b8513bd547bb76c2ad2b609e902b07f8f4f018698e17071";
   sha512.doc = "a690ee2c1f9cf5eb36693a4a9385c047a31d29387930211bf6384d7cbedb3d1f1696c0c04269b02ef29b13ebccc69bbc329772f3fee209a1b1d51768484f9a50";
@@ -18335,6 +20366,7 @@ tl: { # no indentation
   version = "0.9";
 };
 "lps" = {
+  revision = 21322;
   stripPrefix = 0;
   sha512.run = "8bc59b5d8874fca88bfe62822f2050f5dee0461523d853a1c92a051e854ddd6a8b2ce235a674bda383f26ad01d6e18a83cac87db2ea73b4af7e22e74ff823d0e";
   sha512.doc = "a8ad542b5d2c28a9a02b5e4d4a43a13e2f3469512cf7264eb7ed78e2c5a29228531de3be7e84e557e3cc8a9ad60e59ca426da3d5e034dae6b40088ee99d2fd94";
@@ -18343,6 +20375,7 @@ tl: { # no indentation
   version = "0.7";
 };
 "lroundrect" = {
+  revision = 39804;
   stripPrefix = 0;
   sha512.run = "6e4968db6d4593fb0ad66c58b7977b77cfc5ad29a8ae8648bfa0f7844d71a809e0b381acfa4563cb1795177374963ddc10e8fad8a62c1523ea82288c7bd02087";
   sha512.doc = "12e6bccf3875f4045558df6e274a13f60fb7845a998de2e8a722168cbef2d9003224f02e379bcf0752770542aed15ec1d1e680a54e347763b554535ffc2e1042";
@@ -18351,148 +20384,174 @@ tl: { # no indentation
   version = "1.0";
 };
 "lsc" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "f61d81a49c25972e03120cbf6557d356d6df6937af6e0443e47305312485217b6bb5c0818adf248fb860ec5d42c07fc22fdc0c54f9dd1f3bdcb12486350316da";
   sha512.doc = "5d0550421ee0657c378cc1ad8159e16e43644f533e3d8a013d917c494bbb8d11cba79b99fcaa7bdcf8ef5f5deb88d144ed64d75a5682fe4c4187c60c634297f5";
   hasRunfiles = true;
 };
 "lshort-bulgarian" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b528c16903ca8ed5ce69f5e2397dff8f05b13016384bc1304980cad71d86bbb55004d41db92dc29dd412a12b9a0a1b1ea99afcbea621a25bb20da4639d008776";
   sha512.doc = "7cd22cad45d7ef2972679cf2a3653c3bbcb1d9bcfe94a65fb9dac23760de05b659470ca45cf8be13513924fa1cbb98599a304a51bc18f8f4d6631f082e662bc4";
 };
 "lshort-chinese" = {
+  revision = 50986;
   stripPrefix = 0;
   sha512.run = "29c47ba7c96ea569e85df3b94962bb60e9d81259c9a30e04ff2d51bf667bab0fdbebb658f432907f4cc813bdf0f14acc0cb28b24e35f98a9e4278e1c591e6b4f";
   sha512.doc = "5365dc7936d87d7af00909d9f3f3cbf4f0423777862407cb264a6a2d73ab9ab90586f7396ef606baf94ac95257742fba43aa1a4b48f59f01cf33bc15ae62b572";
   version = "6.01";
 };
 "lshort-czech" = {
+  revision = 29803;
   stripPrefix = 0;
   sha512.run = "feeb9c7244f686767c5f72ab3da8aa2bca69af7e6446e1bd8eb4dd858ef92e4a4eb6f42cf8d429127a20e84cac894732f0e05a360b47af02f67340b09311e495";
   sha512.doc = "03295ea4bed83fb67a370ae547945335f51f6441ef913aba0ac3364f258153c6f5013d57e6579f3be6a9746a22cc4f34762871569d9d68c0b0d2acf40127fd80";
   version = "4.27";
 };
 "lshort-dutch" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "c8635db5888817d392706b8b65aa5158a4973cf236dad7fe31a9545857daab15a6c1f2f82ab06e71e50a4af94824b17ac89c394a759721e192966a1f78433d47";
   sha512.doc = "29fc8b6a2645f241e8af437de3a295be8d56a088bd7c7666c35b14f104f242e68ecef2757d62a393400d9f337eb685e48ebac06769259c723d634312a7288ab9";
   version = "1.3";
 };
 "lshort-english" = {
+  revision = 46763;
   stripPrefix = 0;
   sha512.run = "88214b8addd6169f3bb1168e2b3eaaf9786e0c20e9261ed403f8ee6c95a22252426438b75d0ef74770ec26cce1da012ce0d908df03fcf1aa0458294e8e6bb603";
   sha512.doc = "14a1bd61570b2445bc8f38595260aa791760a0bce82419acfcce0109698b5600b727c78233edf3cce25b1e2b17dad97cbd8829b072fa7b33d71a3949fc74f303";
   version = "6.2";
 };
 "lshort-estonian" = {
+  revision = 39323;
   stripPrefix = 0;
   sha512.run = "6bd3c07c1e5f9d543b0f67a5585cc33252567cc346a8d7feca050baf8ab437be97e73d2c4b4b159102e9c4772f8cce2abcbc25486d73e976b83a3d2f4b9e9487";
   sha512.doc = "e16397fac3e6cefa699b412ada1851c7792520da8af1230274fa1a337b890629b68f71d94b3894044f28e687c6aa60d766377e12232d0e522e82e18dc97428e3";
   version = "5.05";
 };
 "lshort-finnish" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "997db393d16942e78e4f52eef886ac7b14cba7ec3fd0c88f8c2cc74fb6b35f3802c58c51ac0112cc2b086f9c3b965b5f8d508ea81a36edb7da1ce84ef83cd203";
   sha512.doc = "71c2e5c4d49a779f529a527cda5fcc6e55cfa0149fc2d9272ae7e69aecf2a8a361b057bcfdf5deaa7791073bc6252c3101f5ce0b8d231c779e99c34910a3343f";
 };
 "lshort-french" = {
+  revision = 23332;
   stripPrefix = 0;
   sha512.run = "1b2ab00e9e69eb058afd96c1ed099b8c783bb97bb52411cc907afcc82d43167ad6e2023a95671e90d059ee43ae335dae3401cc0d1b53c19c186992756aad5060";
   sha512.doc = "2974f067584486528adf42a13cad28afd205f2f52680e89e8de33c4c0debdccb2d0d9d8259d6e2adaa5f86af0b9451232450d40ffacd9f63c43af2519cd8a06a";
   version = "5.01fr-0";
 };
 "lshort-german" = {
+  revision = 47401;
   stripPrefix = 0;
   sha512.run = "92795389c811be26f98af6df5bde8c521ceecef1861facab67622811a9d6859ac83daa78f0f37257588318a87214f1ece3f0ada40790661d09938914b0cea437";
   sha512.doc = "11a2745ff16418ad28dbe1cf4b88225a86899c30d102ea8fa6f3775aabab102772173335cd4985b8fa9b53e324e060ee11d8d31ededf0f6b7f5020443c835331";
   version = "3.0c";
 };
 "lshort-italian" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b92c1566d1a7c9a079d3d770e9d5bc8e33e61da53100c3cb4617e37765076accd16b89210da12ff954e25a97c55d8a2168f81789ab31c05f66bcd6a19168f719";
   sha512.doc = "2f46613ff2ebaad079a8f2bea6756932aa9dd0840977dcbb8ee195072c1d8c590549e362dc979e9bd373a46ec44d21303aab72f351d799d2a7a3f5b6883e2c06";
 };
 "lshort-japanese" = {
+  revision = 36207;
   stripPrefix = 0;
   sha512.run = "25de64f37ca5811ce39c8efc3e895c1deea317c8dd02ac3e091a41ff11ab7a4730a0e476d323d8375c41fd60401cf441c2c15d614a090092d66413701500d43c";
   sha512.doc = "83292d42fa21614a055420eeb372ae5cf21a9a15b999e0b39f1063f63ee7fe53f77ce771a8aa649e860827214138fbd435161cb3dc4b3fdf2b75775979d904cd";
 };
 "lshort-korean" = {
+  revision = 51035;
   stripPrefix = 0;
   sha512.run = "3353534a09681a9f1187156bb6cd9a3b4586b135328a7ce606a0e3ef15844d57ac76b5b55ee7cd42b1dfe3d67f784d4f0682c3ad0af0468ec2433452127b52ff";
   sha512.doc = "046095e09db9664f68b985882ac92da51895342c79a34f8045853df40d868a2d60c1189b93e47843ffe6fd4ecaa5e7144eeb68bb2954190a9d6bd99e9bd50de4";
 };
 "lshort-mongol" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "464b6638ca4bf859ff178238625ecdb7016598fc98c476d3e4b2a24e2f34e6096edef5864ab325ab4df21bcf309a8467deda80b385b624685b38b538a0d40b8d";
   sha512.doc = "cb60632992b187e5cc80973b9e9848675b464b075b13356db171c1a7613c94dd9bf8ea53df47e0c36c910772316f4c43857c8e638819d8ece7c1ce1790fc9d29";
   version = "4.26";
 };
 "lshort-persian" = {
+  revision = 31296;
   stripPrefix = 0;
   sha512.run = "6430462b11786fe3703e78efc9f1486da78db15601ae31e72a95d516d10a098c8b4c5dc9079490e652c57369698d3b4fe4d75b32c44ddd2a470aa5cbc79ab492";
   sha512.doc = "9e7c43f3df8299db4bfad3c0b270c5b54a1448370e6782d095dd9a9b82ccc186aae98da86b2efe71c34031a5f4a07f54f4640de6d8b6fad913252979d440ccd1";
   version = "5.01";
 };
 "lshort-polish" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "13c52981d80ae9f9da34dbd14abedc166bb0abfe3dd31ba11f684b5912869be62e61a28d57d93dd81fe46f4d694429b3406bef774fa8b18b9918989fb839bf31";
   sha512.doc = "a284230f6599cef5fadacad2a3cac07f829cc8ba35a64b798fc76839b57a8867f745ecebf75d41a0c3bce05b3b868451ee141c65fe0dd8365d1807a38b8dc237";
 };
 "lshort-portuguese" = {
+  revision = 22569;
   stripPrefix = 0;
   sha512.run = "2c2d56eb0313dff9c2c102ef9d80d8e6029e35ab1ed8df5442c68b80fe4d746b3fb36b91b40cd831127e3004e1015ef61bb4b1c655d4e521f699ffc301f6d98c";
   sha512.doc = "d9519e2dc7632c1d933c62696aec95402ba0cce9fe6ab74758073f23ff474cede7af24d97c9a480e734f801547c062956cd4541dd61064d004f00410de88bc15";
   version = "5.01.0";
 };
 "lshort-russian" = {
+  revision = 18906;
   stripPrefix = 0;
   sha512.run = "71e40e2502db0706d5ea1776c49888a05229771eefea3d17b8260d489099249c59ff3b94f53eed14fb7b53806e1c29f99386cb4118bc28e2bacc3dc3875eaec4";
   sha512.doc = "65183cee479c3f3afc909616f39c6e8a51c4032ed67563709713d8c1d9a6d2f681914c2ace4bacc88cbf37a4bab4fb400b2ec108b257b4e3e67c0f0611de6eb3";
 };
 "lshort-slovak" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "bf3821d0846701c2e45d89578625f517567d401d613f5aa7aaa4cdfdf8c4c4f87abec22d6fccac21b274afdba9c29c21a6918fabef77f4cca506071341b7cdbe";
   sha512.doc = "8ee79c17e5ccc9dbb9f833b4f8927b22e7ce368f49f4d016fb936d2a5ec964791d9473b679a037d704efb269dc6caa1344168927a90a8e859527c64b0410996b";
 };
 "lshort-slovenian" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "933781a7b3b3481ad955aa346fd1011f9e6f8b27cdb4461f081a31331e8dd5fdcde72851b44aebfd9707a422c133099790d1f304c9f24f35d9fe2e12927061e8";
   sha512.doc = "21a7611b67d9baa0065df15e86b38872f057bd4b3ed2a337e19f52a5ec49b409f4b1297d7d0ec951f40d0b1b4cd18cba1f1ae33228142ac27178520579659065";
   version = "4.20";
 };
 "lshort-spanish" = {
+  revision = 35050;
   stripPrefix = 0;
   sha512.run = "127fc2d598f16d38b075b4a9668ded064537f7056aae34bdde22f89aa8d301d77cca818976e22aa036f47867929d30cc47e02ed3f724ea26279ecba723e5baf4";
   sha512.doc = "f968352fe1e32a918c1d5ebfce16d3975c436539349af22b32bfae1ab06061ac2b2b85feaed3e8a28da89956f4d5948e7d1a6426766144b0c0ebec72ecfe99cb";
   version = "0.5";
 };
 "lshort-thai" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "924081bb5ec18ffa92e92f71a5eb6da893ffe0b7460f757360e3bfdf15c08d4cbcad79b4d45cff702915b98ecea16212c4d5ab237c11410376677de527af71aa";
   sha512.doc = "a9522c99f62a8f51eb751d220495526f40cc7581b8d0fb120d6e9510b1af68e2c97158ec54fb220dbab4fc8d0070c93027741b549d01cfc3892bf373e3320f4f";
   version = "1.32";
 };
 "lshort-turkish" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "769036083d282ab95c5f1fed08d669dd4fb1d2dd7937e5a4e2fad54e20cf56ce3d5100b7aa612cc59dca50b6ff67fbbd5bbe05c085b6121654f873fcb991609c";
   sha512.doc = "3aad40a5de5eee9e59064b15fe3e9c6a2585146fc21fdaf4683bfcba6786366c4ff1b3c38b6932426f53a6a9211809d4173f688f0878cbf2011d8982e3732834";
   version = "4.20";
 };
 "lshort-ukr" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "18754d10f48df3ff86d644b772daf7f6530c4e03f0bd3373ccb12df2181aac26b4b5cef6bb673674b576a07fad2f3a13a5fde954a389090622f4d6f5ba9a4bac";
   sha512.doc = "03b8947d0e1d6e9d331c6ce6d60ae485bfab1b73ed936086a21f26b3d87116de99e535cd42f16561d3b839c84cbd343f8fa3167b1c478d6f8d0df3964d800e56";
   version = "4.00";
 };
 "lshort-vietnamese" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "ab9369125fa7283dc2a2b58999f57db3e5767e1e6810000fb71f2f0abdb693a60c2133703cf3427d35732769e393cf389733694aaa6d9e41f9ecf28073d06112";
   sha512.doc = "ba2fc0eeb69f845ca306c7a03c7f7a46cacd3304c420c048284d248202a12f34b176d91244ca25892a64f6ab734e852ea83ad888684cdafb644da7d665a02b2e";
   version = "4.00";
 };
 "lstaddons" = {
+  revision = 26196;
   stripPrefix = 0;
   sha512.run = "8b2b14b28bcc4a3b4f26d2f48bbb59c111d4fd33d5479c20f7e03ac838c6b6631b99b1a5211b383e58dec74d70d9130af2a38e3b85407c4376f81e1b52c212b5";
   sha512.doc = "82bb6745b9f2342628bc83f356313c0de52148eef25ed3ade22f899693abe190de1a09347ebd2d03b06a5976d8c6f42994e2495eb7c4e513ddfa8244ca258cfd";
@@ -18501,6 +20560,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "lstbayes" = {
+  revision = 48160;
   stripPrefix = 0;
   sha512.run = "8089546f54a849fdd2b8cd1bb2430927a03249f1acb72bd9d37e9ce42770be2413c6ba8186a45eda8f52a3ba2f34e01e6073ed7acce5883d9407e4ccd86cc12e";
   sha512.doc = "9e256d20493164eb1ed01bb6f7dc7f555d9617492fe14688c0852b85e27c1f8f7f1978b1352ea3294bea41f77ce505c6a5bf2910514240e62ce19c47c8da0ee6";
@@ -18508,6 +20568,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "lstfiracode" = {
+  revision = 49503;
   stripPrefix = 0;
   sha512.run = "d2752c177194f4926191245f6397ca1ad613e66708e245b29ed6719bfb7438cbbde8dc69a639bdaf7a4447d7737909a5dfdb465a0f0b446c0d30900b7d279c6c";
   sha512.doc = "ab396312abc4174267184dc2d5f4dd61e4510d3b70bcf1b6b84685cbe2e5941d6325d4abeb1d08f85cef62adc953d4a59ebc5d99fe9d7c643f7d25c3d36bfde7";
@@ -18515,6 +20576,7 @@ tl: { # no indentation
   version = "0.1c";
 };
 "lt3graph" = {
+  revision = 45913;
   stripPrefix = 0;
   sha512.run = "9a3137a56952d18f41337f3ea1412180d6a0d7732178fe4855d23647d01648ddefd57859f786534c5bf39cb622da11e113a028135429ca38e6ea3bcfde41b5ca";
   sha512.doc = "efa314f54f3d7444931f4b7410c406fc89c35fc318882683cc97cd479faae00d3aeb58be06c9b174e59bbcc2bae57ff712983ba0c216a270441490866646fcfa";
@@ -18522,6 +20584,7 @@ tl: { # no indentation
   version = "0.1.9";
 };
 "ltablex" = {
+  revision = 34923;
   stripPrefix = 0;
   sha512.run = "5a64bd2904338fc45d6150c6be6497d56cf2e190c41018527a59ef075db41f94378f8981d4b92e211f60f2d641408144c546f2de0bbe4a8e94b0a3cadf4311a8";
   sha512.doc = "c3ab3559880077f63523c84cfc5cf363cf9f1d2c4d8aa9cb173b4a2dd07e5afbbdc9b1ea1b29cb50b64c68d65f4470dd9c1656703e0a1ac8955b72b87e33e804";
@@ -18529,6 +20592,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "ltabptch" = {
+  revision = 17533;
   stripPrefix = 0;
   sha512.run = "15c839c34935ee27b0b741325a13cbe6ec2f918b007ddd691029ce341173d12ca0e5cdef3a0111c3148257babf686815c5f81c92b6019cbbb022608535f17283";
   sha512.doc = "d85ff06112e540d5bd3cac2bc6100d7d922e44d3388d247e521119ee4145716ef52889515b640e85c8a21405a35fbf63b168af09253e772e826572b0560305ac";
@@ -18536,6 +20600,7 @@ tl: { # no indentation
   version = "1.74d";
 };
 "ltb2bib" = {
+  revision = 43746;
   stripPrefix = 0;
   sha512.run = "42e634e7c3018b87825e2bae40513eeb757520e1dba1b1b20244bee2d0fadc4663cbfa0dfdf74fa71f7821f47c41bb7c873a64cc68e153f9b7207f6a8bf3f8a9";
   sha512.doc = "c26b018043c14022acc64bfaff6377988b5e40d09ac10916479079550bdbcfa5219df13988327679e7647c4a679490645376ed23be0601dc4df0528d45725325";
@@ -18544,6 +20609,7 @@ tl: { # no indentation
   version = "0.01";
 };
 "ltxcmds" = {
+  revision = 53165;
   stripPrefix = 0;
   sha512.run = "9cc445ad177af9b8f942b0c5096f83200224e0cda838441d28d5a188fee50d6c24dd4d415c2afb01792f57813558400826ead9336200f810336c26852ef61ad9";
   sha512.doc = "bba1f1505bd24d62c82aedb28382cce9f80232b45f9ff0002c94dc6c26de0937cd6c1757396c2ca5a0afbb44d25dafdb4a4da1df46f88757d9b4cb03c912630d";
@@ -18552,6 +20618,7 @@ tl: { # no indentation
   version = "1.24";
 };
 "ltxdockit" = {
+  revision = 21869;
   stripPrefix = 0;
   sha512.run = "1144bd68bec92b4ac9ec8763e2e7df7c6018cd8b88c7ed2f02e7597c3bc13608a562551d80fab2a41b8aa9881848fa1b3501da7ae9c39edaae3720875ff65bd8";
   sha512.doc = "a47852f464e8c31d9a2926e55d62c090292337acad6398568c7082012899045ce32163b798b25ac090e7fbd6ebec95f17a83ee1fdfe5f1f33d0b423dbeed94a1";
@@ -18559,12 +20626,14 @@ tl: { # no indentation
   version = "1.2d";
 };
 "ltxfileinfo" = {
+  revision = 38663;
   sha512.run = "ca078af6b822747e9b337eb5694c1b019444e55f5f9f9dbdf59fa1a65c9445b19a62b0d610514c9231365017d3ea95ad9288a37b62b400c12df74c0c7f774a44";
   sha512.doc = "0020ffc5874e0545c7ae4d1f6f9c0d5d598786444f4e98369e0c5fc872c5d63f235222594a9b0f5d2def5c3dcafc5ad660a4fd5a9e4551dd7717bc6ac06189d5";
   hasRunfiles = true;
   version = "2.04";
 };
 "ltxguidex" = {
+  revision = 50992;
   stripPrefix = 0;
   sha512.run = "bb808c7fc1d3fdc7a4d065822a5ff67113bd9fa47a60762b5674040c52149cad14ecd2d0612216b15bcb9684e65e9b51312f83f14030e66de37ee30dabbad434";
   sha512.doc = "534e51a54903e1bbc783b5120015178c48a1a9ff3b06b2121bc9f79c95b7fdc1bc64c374af27a357a44c67df45bb70699d788c150c625d7d949acdce5b109a3a";
@@ -18572,6 +20641,7 @@ tl: { # no indentation
   version = "0.2.0";
 };
 "ltximg" = {
+  revision = 51951;
   sha512.run = "28486dc83e37120eb5c8e0218541f17f6d9f631087b56890cb0bb9a10e3599d4afb31e997f736ce99476491ffae01ed9ae3b4194205e366dd0a2ea09dc2dd565";
   sha512.doc = "c8d688e451537c6b08556f3d021cd552ba491f0b031c253e0f914945604b492c4d2cb2b7423ad2f95cdd4ed180c8b0bee1501e28f7fc0b20a551b735a47a2094";
   sha512.source = "ffaa0f7f2d7a6bdffa12aa333a50e3729853f61684ad85a06e6583fde646e968e9ae3ba12a98655f3cd230c9cdd7618715bfb6b268928a06b3361e8194bdb1d0";
@@ -18579,6 +20649,7 @@ tl: { # no indentation
   version = "1.7";
 };
 "ltxindex" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "ff757a44f29820ab29946f66766b11a928db11b90269781b8039428aab4bf0b243b317176aebc92cfe95bf2e390be125012daa72ac4b8bfaab81477ed8129ba7";
   sha512.doc = "119f18b8337b365e09b5d6a22ab447bcd0d4d516514c7bc6622d8b1f30aec5746f45d81cfbc07a81aed9de7f47627797b9c7cac3015092f7ca72acd79d5263ec";
@@ -18587,6 +20658,7 @@ tl: { # no indentation
   version = "0.1c";
 };
 "ltxkeys" = {
+  revision = 28332;
   stripPrefix = 0;
   sha512.run = "f99008a8d6d18697d095721dfd741ed2dc48f6edad09b15d39ce2c37f05e6f9c9d613a4ca7ba7fce8755f9dc5659e21f7e7961a7e38dbe17b7114c2337103d8f";
   sha512.doc = "ab28eae4955de3e5a23be1d718fd1e23384ec0e4a8c4b86348bd83ff501ec2e51a3981c60babd478bca0c115ba524367f77f3cabd3f733b82a9fe4cc5fc06878";
@@ -18594,11 +20666,13 @@ tl: { # no indentation
   version = "0.0.3c";
 };
 "ltxmisc" = {
+  revision = 21927;
   stripPrefix = 0;
   sha512.run = "3433a283f52c41f198b944eaf58a961751e7fd3c0991960a2516fd72af61671e776f48c6a5e241e379b54a08af6fba732ab1c35e42b8c93a62937b5a38cdb767";
   hasRunfiles = true;
 };
 "ltxnew" = {
+  revision = 21586;
   stripPrefix = 0;
   sha512.run = "7dda3fd3638ddf528adda0430cbd32cd8fe410a743b7af5bf76e651ee98b10f2481723665a19fda2f2b468ca5c4a838144cbd6e9c457f50362f7b0e83106de26";
   sha512.doc = "91e07169ac377570382b9bc7044c0d66b61268fca38e2fcff4d7075322dbed0d3151976848c93b5d0a2088676e67f3a79d2a555829f170ca61a37b7c40fbdf66";
@@ -18607,6 +20681,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "ltxtools" = {
+  revision = 24897;
   stripPrefix = 0;
   sha512.run = "aed74d79bd9da7f7303cd14db5c2a74aab51de03e87a84986b294019a971eb68a445cace8af2394631fc4ec6963ad32347c47a80612f70a7427adeb689d3cf36";
   sha512.doc = "e0a8b28f512a15fec379aeb3350c0611a77652531a66ee5a39010400fe5d1416c40bf6bd89d4e967851b09ad5d11b1d83ead675a0a722255a0e941980d74d1d5";
@@ -18614,6 +20689,7 @@ tl: { # no indentation
   version = "0.0.1a";
 };
 "lua-alt-getopt" = {
+  revision = 29349;
   stripPrefix = 0;
   sha512.run = "94d186ff2dbaae126995eb2ee71e52145e88b32ed1fa765a6011c0d3935f19dcf41692e47699abd176f680ba8ebed58142cdad7be19526f7b8c249dac43bf3d4";
   sha512.doc = "b7cbb2dff24692038f38e6185fbd6471a6979dfd8b659fbd972c810cb701aca59aeaa4d30c510333003819ff08921f3d57b9c43a7044827a35472ee54e3990fd";
@@ -18621,6 +20697,7 @@ tl: { # no indentation
   version = "0.7.0";
 };
 "lua-check-hyphen" = {
+  revision = 47527;
   stripPrefix = 0;
   sha512.run = "89cd0a13578d386bbf584f3c74c6c3ee1a45a7c0bf40480e5396f86b2af29b26abe3ab8aac69be0f1fe23cceb6da33237ea38384854fdfc7be6939832a8cad08";
   sha512.doc = "cd756e0356b36ccd26d1d78c67026f5a27272ac383bdfc6f44ddb630f58d067c05fb9152f1ed9793d71a63af6607107b8d4b5af311563e2c3d966079b2d3e0c1";
@@ -18628,6 +20705,7 @@ tl: { # no indentation
   version = "0.7a";
 };
 "lua-visual-debug" = {
+  revision = 49634;
   stripPrefix = 0;
   sha512.run = "2b809e240570105b46f361ffcc031719f4afcdba45d14b4e51d4cbca10a7d189b385c00c9b277180bed4ceae45b8ad58e2145ac6f8de5d0568ff5f86b67c2cc5";
   sha512.doc = "814f650ce8505338b41a91e1e7e55872f1f35252ed5f1c3c74f73379b4c60c62e40d48a2cc5eab62b4a726db29fce70761ad7a2a0a17b7d5019859fcd72098f5";
@@ -18635,12 +20713,14 @@ tl: { # no indentation
   version = "0.7";
 };
 "lua2dox" = {
+  revision = 29349;
   sha512.run = "24b6cf17ee55a9699077aac82263e442f1ba3e7843742baf425a4d4c514cb2f4b1ea8a4af9165997559560f2ed060ef818d3a57f71a79d6238ed29ccd263d787";
   sha512.doc = "96746e4d0401cb0bb9cfdf7a44d2935d4e257dafb0f5099faf647aec0b385745518f160bfad8ae54a1ec018e0afcf4a7dc998cf9b7f310e0ba867bd2e6213960";
   hasRunfiles = true;
   version = "0.2";
 };
 "luabibentry" = {
+  revision = 31783;
   stripPrefix = 0;
   sha512.run = "00349f5a6f5ecd5478bb718bcfc419953db4f90c9b2a70aab2e2bbce4395d189066b39cca743e5b790f588a3f2a17047a6e233258c4ef389ad6fc5338184af69";
   sha512.doc = "9ec19b99275e3117f07e445e2c039bd504537fd470f62fb7f7f7fc428842ba86ebdbf0bd6a6be7a3b1b99100d209c6c47a9795c776287206afe331601222acad";
@@ -18649,6 +20729,7 @@ tl: { # no indentation
   version = "0.1a";
 };
 "luabidi" = {
+  revision = 52549;
   stripPrefix = 0;
   sha512.run = "0cb391ad3f17ad8a85e7960ef11e4f0eb007fd255ed9eded40ef3fe5c81187b1d2d49c68b0411b813aae66fb252d9d1a9b3bda984cef2d034e96e06fe44ced26";
   sha512.doc = "cabd1899682b7f1608106d6d36cfbfae1684fe84462420fbd9ca9b342c95f73750ed40d086553404f0a1eb34b56ee4026c497e42dae42d3348fa01cdc7a5c454";
@@ -18656,6 +20737,7 @@ tl: { # no indentation
   version = "0.5";
 };
 "luacode" = {
+  revision = 25193;
   stripPrefix = 0;
   sha512.run = "b107c9cf774608782c1ba1ce3ebea8d330ff9762046eaa9b9de112b704df1d0da1bd7e33b15e9d847f232b7594d53fb2678cdb78b23d87aaac73cc2517ac8e1e";
   sha512.doc = "622a2417490fb818d5021bb519ea7ac8d886df5002534c4d269268ca4d2119ccc15b029111edb42d04a546e7a46a60bc8eaa6a0a108e9231cc49fc2141ed8ec7";
@@ -18664,6 +20746,7 @@ tl: { # no indentation
   version = "1.2a";
 };
 "luacolor" = {
+  revision = 53933;
   stripPrefix = 0;
   sha512.run = "2ed3a27258f4cf1fcb82abd6dbf660d090dc8dabefb2352dbb0fe15d32d7a0af33039c0249cb3c06dbf3b56a6d41039112ed9e5f2abfeb5bcb5ca50bf5f798c6";
   sha512.doc = "89f13ca9832cef55f75bdae2933e1fa1f5c9d678c5980805871f5b7f2e13f7e406d50b2cd0366b6f191a9ec03e293ddd11163ba6a52260b609b6a3ca0c677795";
@@ -18672,6 +20755,7 @@ tl: { # no indentation
   version = "1.15";
 };
 "luahbtex" = {
+  revision = 53216;
   deps."luatex" = tl."luatex";
   deps."cm" = tl."cm";
   deps."etex" = tl."etex";
@@ -18684,6 +20768,7 @@ tl: { # no indentation
   sha512.doc = "5faa6744ff98cb424fe4bb6f170f22be344ea9d58bd967a997c0f3ba3f8adb64d942cb2c637f77e4afbb9d5a648598832f5b129bc8c506141c0e05ce6bbb18e4";
 };
 "luahyphenrules" = {
+  revision = 42670;
   stripPrefix = 0;
   sha512.run = "f1486d23a51111023fca3771ae530ca058c582640ddfc17281a66ec055b05aaf24021c724566f5e9c9a5bd674eb8724964fae78762dab30182d8a95333293efd";
   sha512.doc = "152f690268e3b1c6073b36a66965c84b6bc6f45050b2887b7a2ed67be9497ea7b1708cfa1335fcf296d6a2feb11924120336cd89ff3017cb7e77808e9927e9c6";
@@ -18691,6 +20776,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "luaimageembed" = {
+  revision = 50788;
   stripPrefix = 0;
   sha512.run = "c0ba8a3164f1a87cd12a5699e9caa23ff7a85debed9881798502436bbb594d48a2e15a135e3a18efb9f3d825af98303a46495148142c810e4601641fdf925654";
   sha512.doc = "188049c30c2c845d18e1a20af3d5ee009eab6064321b1f09aee4b77c3111317755e698e28876561440695c910cbfea6f67e41a5195a5f7b50d45831d7b78d76b";
@@ -18698,6 +20784,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "luaindex" = {
+  revision = 25882;
   stripPrefix = 0;
   sha512.run = "baafe2dbcfcc07293ec04f775becef7b59a2349ed5c98333c5a4e680fb3f8561f8749a6abadc6901cfbeae1b6e9a47cca05e8ae76064372585b7d7f4978dc844";
   sha512.doc = "c90deae24da8584170bc2247d5f6ee22ba522c21d3d0e05a6ec2b9594645a022eed1fcf12c3ffbaa03ce0d92a16f75550dc7e0694920ef58b17bdacae02d6fc7";
@@ -18706,6 +20793,7 @@ tl: { # no indentation
   version = "0.1b";
 };
 "luainputenc" = {
+  revision = 20491;
   stripPrefix = 0;
   sha512.run = "bc3f05260800cc537436377c1f9fbcfc6a1a60a7fd892af23ab323171208b083c08c8bb2a5d299e4ce09468f66197d43f68717a57e649c50caf74b736cdb06db";
   sha512.doc = "7c6093b3fa622007aa7e6cc852076090e1bcc64e9b890d1ff0cf6ae552a21e930e791d32cdc2238a0f60c605c92a2192dad7e9d423a2d6e013582926957da58f";
@@ -18714,12 +20802,14 @@ tl: { # no indentation
   version = "0.973";
 };
 "luaintro" = {
+  revision = 35490;
   stripPrefix = 0;
   sha512.run = "2585639b6a7b93019f8fe4dd353332dabbbfb5663b84b1c92df397e940392a1b3bb2ddcec203bbb1b0f4244ac26b62f9745fdf50cb7512f96e5c12af8c08335b";
   sha512.doc = "47de79cdc637810757b7879956cf758a77cde95e77060ce74829b438d13b58e23cbc8e9b328d0850b44fd8de8da90fa9fda206ff0e206918f1bccdf5d71d2c38";
   version = "0.03";
 };
 "luajittex" = {
+  revision = 53322;
   deps."luatex" = tl."luatex";
   deps."cm" = tl."cm";
   deps."etex" = tl."etex";
@@ -18732,18 +20822,21 @@ tl: { # no indentation
   sha512.doc = "045e424a75a951d6c6af885f952831d26cc44db785c5c802b7e88e37540c110074c4d2adaa872c1ff230bc0d37b247b0a44b9621f12e7e37f170b81abd9f7191";
 };
 "lualatex-doc" = {
+  revision = 30473;
   stripPrefix = 0;
   sha512.run = "a1d98422b13a26aa844213df2929629889ed6bfe3fa16c27f6376f00f038a50dd32c5128a27ecdd872d3fce8372fb93ec603c0c92edb8692325f1e76fca685d1";
   sha512.doc = "0756a0183d0b7b302f24cd16a8957915a69a3db3fe4a8a4fc301e246a0563f9fe81ce2af667b7bcfa45717b605be163cc5fd4c170d8584028f2ee7b2120390c6";
   sha512.source = "a18a7644b50ad608dbb2bbfc15f2672fe7b9a48505c3224dcb46aa97b2d57b5a007c928dd5b76518c8963970bb1b8b56bed8e5c374ba5cb18a9521528dfdd58f";
 };
 "lualatex-doc-de" = {
+  revision = 30474;
   stripPrefix = 0;
   sha512.run = "c1bf1c7f367e5d15cb1a5ba0878a4f02dfe25772bed22b48f7376e8448569247233ee41ee8b58c156494d9cf0c0956dc23f4576f053cc349896247de0a96444b";
   sha512.doc = "b615887d8b543af1c125b6e9fb9c533f52816f8087075a8bd4e6ef752ff48f51169f5945ccb067228612cbdeb10dbeb298a090bdb93d201b9629b128b0c5a466";
   version = "1.0";
 };
 "lualatex-math" = {
+  revision = 52663;
   stripPrefix = 0;
   deps."etoolbox" = tl."etoolbox";
   deps."filehook" = tl."filehook";
@@ -18754,6 +20847,7 @@ tl: { # no indentation
   version = "1.8";
 };
 "lualatex-truncate" = {
+  revision = 48469;
   stripPrefix = 0;
   sha512.run = "f4de38427798b565aacdb127152cd7ac8a42b441c555f742f5bf90480f7cdf8e182745a5882a9c8e0645c529d27647a056f26b7493dadb13216972794e617341";
   sha512.doc = "704b34da4b8ab787c53f2af21fd17a29d6c8e1d42024de2ff0e65d434a502b47022fa2a506e149b67ee5cb542f2f4835babda315b1dded598f63dca353aa78b1";
@@ -18762,6 +20856,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "lualibs" = {
+  revision = 53682;
   stripPrefix = 0;
   sha512.run = "bf41a6bca45473d40f927ec019434612947fe79d70671837b2b1ac53cfc727f68e436cd52bf60d12bca5d5dd0bf89e49fbf610107458ab4078b8dfa3bae25940";
   sha512.doc = "3703aa61ceb2fb0cc79a33972e15f1e8d19a2f597eff19b871233422b78dde4cfcba2145cda33c0352cb54a014b7773c3fcee6819b547fb6d91f499f4b464f97";
@@ -18770,6 +20865,7 @@ tl: { # no indentation
   version = "2.70";
 };
 "luamesh" = {
+  revision = 43814;
   stripPrefix = 0;
   sha512.run = "f9ae2e27725aa78c7a6c7d049d0c25f4a4fef260dd2a813a9cd6a4f49f5ef1a786540c77c88c0778c5ebda5f188ca8b62be8335d5bcf0ee1a5f22df193875cc3";
   sha512.doc = "f25df210662af9d91229a99228a7f15bfc58510adfa2f5a91c586b4ec30b2482ed044b30db40cff0a5c70dfc70ab560367efa96bc077bf412d536e15f1e32e0f";
@@ -18777,6 +20873,7 @@ tl: { # no indentation
   version = "0.51";
 };
 "luamplib" = {
+  revision = 53904;
   stripPrefix = 0;
   sha512.run = "fbb99aa90563e6cce2e5e9c417f739868130f8a2dd9875fba8a44e3f92e94643f2a9446cf686f222067c5aec66e5199eb5fc134458d2a72f2fa8bc949ed51a1d";
   sha512.doc = "e0568e3547253f6dc9d12f927c3d7025454520ec8611ede49497f80a6354518d07eb9d300208fa4a8173b068ce65904f45c071d0fea5bfb3bfe8de1d29e6a0ec";
@@ -18785,6 +20882,7 @@ tl: { # no indentation
   version = "2.20.5";
 };
 "luaotfload" = {
+  revision = 53652;
   deps."lm" = tl."lm";
   deps."lualibs" = tl."lualibs";
   sha512.run = "0c61957b2276d8657ae5ab8e5274245ef6840b2258a2225a04aef269a3f54a98b6ec6206d02008973a4d1577df8a2234194faff033fcb8f1ca4e0341b2766fd0";
@@ -18794,6 +20892,7 @@ tl: { # no indentation
   version = "3.12";
 };
 "luapackageloader" = {
+  revision = 53211;
   stripPrefix = 0;
   sha512.run = "4e8be545786285cfea52ed31ec3eee7d69848d2d400a12ba723ca1b30daa214b7e2a8bcdf562cde6c7916c9b8ec6a3b04d866f0b8521eed169de8222a27a4e11";
   sha512.doc = "93e063959a82368f1cf603c7b77b591b236ec95dca3a73f7ff0188cfc05462fbb4de53103b3b3bc0d241eb1efc43295a4870c52702df506a1adb89cee699ed83";
@@ -18801,6 +20900,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "luarandom" = {
+  revision = 49419;
   stripPrefix = 0;
   sha512.run = "54019dd968b2cf3b6ab9a3777e609789c04a0d369b1ae938df152ded3bf54607140fe6265b81ca2a75f458e9b8144000f0bf2e9d77fb00aa923f7ce9569c423f";
   sha512.doc = "f7fa30cd6668674cfee8116bdacd3c457fe6e1a3ef4a1c0da603db2fbaae77d187bfc5b4867aea0410a906238769d7138672b89b51eccc9fc4d110a079784092";
@@ -18808,6 +20908,7 @@ tl: { # no indentation
   version = "0.01";
 };
 "luasseq" = {
+  revision = 37877;
   stripPrefix = 0;
   sha512.run = "400e95fd898152e8d8e989084ca9cd115516850edb6e8d102eddaaf278f29213c8a4828dde01ca202db68d6cd2b2685bda71f63ad7a92eb586a4c303d2e9d02b";
   sha512.doc = "7ac8f5df74cede5734c9c47048cbb3b079155910a89ebf0c7adb169b4b61751f6255b2c07614d44a55e8dad43bb35693bf224d0f750bff28987c7c5f1a8a5bc4";
@@ -18815,6 +20916,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "luatex" = {
+  revision = 53977;
   deps."cm" = tl."cm";
   deps."etex" = tl."etex";
   deps."hyphen-base" = tl."hyphen-base";
@@ -18827,6 +20929,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "luatex85" = {
+  revision = 41456;
   stripPrefix = 0;
   sha512.run = "fbc1306d40e1c329a106d7ec4ef79ebb99b2869ce72c45212b87fa03f66a18b1636324dafc739a33500be77bee2c71ebeff02c97c42f85716f5bded4dcebc021";
   sha512.doc = "4bf353f60c305ea76e66848920e521dec0c66c80f71ebdfb0593acfc9e2914eac272eba3d69f63f43fe8be903cfbb2da7edd82cbc3d38a897934d91f1ac276b7";
@@ -18835,6 +20938,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "luatexbase" = {
+  revision = 52663;
   stripPrefix = 0;
   deps."ctablestack" = tl."ctablestack";
   sha512.run = "cb187dcd0f9e454a3b9d021b802ac6f7d09c3eee68adb5da31035f5b7bb36d2938ca940505ee08c8410ee0e5e5c81ffdd21617ea5ba0e9ca7b58abb6ede3defb";
@@ -18844,6 +20948,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "luatexja" = {
+  revision = 53983;
   stripPrefix = 0;
   deps."luatexbase" = tl."luatexbase";
   sha512.run = "f58bd79f429be61a69883435ae6445514e5c9a4cc936bca14e5d26da8ffd5437137a8d14b6d591e385a3e8183ec3248c9563b51dd3526554a4cc3500702cb708";
@@ -18853,6 +20958,7 @@ tl: { # no indentation
   version = "20200301.0";
 };
 "luatexko" = {
+  revision = 53824;
   stripPrefix = 0;
   sha512.run = "50408947cdec08f41d081829f4cebd832aa817c233feb1fafa5e88bf38386232c2d04485e7feb8ea3056a0d0cc057975da2ed985bb485533f05c4cf7e56f6fa2";
   sha512.doc = "645725cb6fae45627c9524ff45bf2851553764d0c1ea5fa2c6024aec1f00963f9c5baa787442bfb1ff9af0b70cd63ab4aada40dc32b11274e19296e9eee208a2";
@@ -18860,6 +20966,7 @@ tl: { # no indentation
   version = "2.6";
 };
 "luatextra" = {
+  revision = 20747;
   stripPrefix = 0;
   sha512.run = "03c95a5e42d8fc0ed88704799a36624ebb48b9c7606acbc09de29e5da845ede3f239a6dda43cbfb4377971cecb55b1f5280cf0ea1aae5057f3ab8df2e0870745";
   sha512.doc = "f1c0d31fbd66f4e78eb638a9bb336f49de3d19b29bf276fb6fd0d976ba2f33599c1536ec82f7887af1c1ee359b48b1048d400b7faf0cd8016b914f4c5318c849";
@@ -18868,6 +20975,7 @@ tl: { # no indentation
   version = "1.0.1";
 };
 "luatodonotes" = {
+  revision = 53825;
   stripPrefix = 0;
   sha512.run = "4cc24f72014d50179fa1cd3630a483677a98a5dedd28e94f2c7003c3c61eae66bf9b6787bcde81b654f4187d873440828655be372b4d6bbf59c802da23beaeea";
   sha512.doc = "2b7298a56975f0ac71bf6c0327d95531622de23a33c4a1999cdd35ae960766342071722e388fd3d9fc10fcbd23c0752e5e5399516c8465f7e66f5ea8b952e447";
@@ -18876,6 +20984,7 @@ tl: { # no indentation
   version = "0.5";
 };
 "luavlna" = {
+  revision = 52682;
   stripPrefix = 0;
   sha512.run = "048347c596056e587cf0785359ef3dd1ac1b86929be10ba1f8471fe53054e75cb815fb67d61fb15953285c240e81fe8e48e72518daedc6943287f1d518b5c0ee";
   sha512.doc = "cc352d3acccc440d682fafe4978f65e6395134af29f9588289200992ecdba1c6bced1000aa1f20065feb2c6f0dc0db4de868898a22cc2fe64deb07980f5f2194";
@@ -18883,6 +20992,7 @@ tl: { # no indentation
   version = "0.1f";
 };
 "luaxml" = {
+  revision = 52137;
   stripPrefix = 0;
   sha512.run = "95279ba444644ff60cd0aa812690a5f60aacb4c921b9e3fe1b714f8574b0b01692cf8042fdf34a044e162b7e231bb31989e256c4a4696f1e3358df8088114707";
   sha512.doc = "b5a7fd96f95350b8b7c781d1154ca2a46cb22b0413165f599e5d5614b411a1f1e5ba236862270855bc613e3d9d4503d9f9460fadd7694f719f8bac6d354fc8b3";
@@ -18890,6 +21000,7 @@ tl: { # no indentation
   version = "0.1l";
 };
 "lwarp" = {
+  revision = 53847;
   sha512.run = "a22c27a141c768d1e6e50fe847ddcf4b9fb7c6010eb3569590bf6da200beb2112d133c71d6cc38ca6a3e79558162fa5e3cd610679a3879c01096b0a09f1e2bf9";
   sha512.doc = "4ba898d997ffad75225ae9dc37f24e9458f6e1129509131bac328587b3243286a7444d782c3905bb61eb0d9db73b8aab282fe5d59f10475e08f994bedf6ce801";
   sha512.source = "a6148d128777973e3712e0e05cce24005c82d2ffd9d5efc1217f73fb13d0773aae91adbd7e1a14db90ef9d19114d415cde92232b3373683a1736f5db823dc8e1";
@@ -18897,6 +21008,7 @@ tl: { # no indentation
   version = "0.80";
 };
 "lxfonts" = {
+  revision = 32354;
   stripPrefix = 0;
   sha512.run = "aa732f403af1adc898e6ac462412a59e4d2c8821ef47807ec5d8c1ce565a73299d472377117bca3fb30add468b546280b1603feff95d35090b338f87b279bdf4";
   sha512.doc = "fed48ea91eb5ad414463d3b929dd4deb5cf433be63aa2753acc251aa1e8b85f0db7307a0ea96ea0bf9c4d9b14d0b90d26cde703bed2761a4a1b789ab3d117eba";
@@ -18905,12 +21017,14 @@ tl: { # no indentation
   version = "2.0b";
 };
 "ly1" = {
+  revision = 47848;
   stripPrefix = 0;
   sha512.run = "8b170d04aef1c95b345440b60e5aca56442374d897e4a64ea4fefff4506e133d4c06350b5ea86a81eb9a015a1fe32b2bd8c433401a9bf6433e279cc700d0b8ae";
   sha512.doc = "c1bbaff6124984b0c582cb86e3e8f729e2b2c256808dc621de2c12da94c7b67c673c70fbd3d17c723292a90c60638e32fd79ece9915648347a7469caea040d7b";
   hasRunfiles = true;
 };
 "lyluatex" = {
+  revision = 51252;
   stripPrefix = 0;
   sha512.run = "8ef105cf148927c99a20e792fb2259320d0e28f4140621561c9314afeb51f71a15013841e1497d0246df8305688e7211974bfe6a618b188d813481c9526f44ff";
   sha512.doc = "d8768ee9ae861477a13dd837629d870d34b0d1fc0b1f0709a90255f1ce230ceb3ebb782c9a6272f72e32c3371b2a1d16577033c53e2d6d1b1cd09adb19b62e41";
@@ -18918,12 +21032,14 @@ tl: { # no indentation
   version = "1.0f";
 };
 "m-tx" = {
+  revision = 52851;
   sha512.run = "c99b0a658d46c58e47f58c0494a4f32b5997ed304bb35b58a5732549ea17b366299aba4504982bb4a1e2743800b4bc02028e402e03cf363178bf1ac262802e9b";
   sha512.doc = "ebf3e4035460439abd3ac91202e28c0f6926181c34bcfd1f1b3115ff6ec90bd2d0cb9a5043d81ee8434d8b260f3a8b437585d3e81b7161b145c8c112d5643cb1";
   hasRunfiles = true;
   version = "0.63c";
 };
 "macros2e" = {
+  revision = 46026;
   stripPrefix = 0;
   sha512.run = "5bb8ea01d851272306a4d9aa1897d879eef53a1f7262c83a8cec81a7e00334a495eb89926683d42af29f38aadfd1461893ad7bd72cae3993f1ea63a7475dcded";
   sha512.doc = "0a089e411cce517581166b359ff092b7c98d09502afc83a4935269ed2520ffbb044921e5432238e999cfe85c72371bf8a45bedc07c6ecccc14cba2f4e7b6b6c7";
@@ -18931,6 +21047,7 @@ tl: { # no indentation
   version = "0.4a";
 };
 "macroswap" = {
+  revision = 31498;
   stripPrefix = 0;
   sha512.run = "39af1bcf247986c1f7559e1523d1d33680270602bda1d904404db0700452d203f950eadb2d9808a1cd3098bccf070218bd791fdbe5be4a3b0f539f013ef226a6";
   sha512.doc = "4e46c824a6a5909fca7d8a4628c87cc7a372ae5eab0d2f5110dc1f205e072e53a817043cbead53dde55e71c7c1c0e23695ba963c27e46bc70e2f84d430b656d7";
@@ -18939,6 +21056,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "mafr" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "802d108e7deaaa1a42b7f1eca5059f9547f0f4edb2eb5f8f3f0b68d03c05662f37d2bf7b25844dcec6b89d6d1f0babe93614cbc87fe1e2ca0ac2153602c0cad7";
   sha512.doc = "5e3a0c42944944fc467e09751c1881dfd16ee526c78e509acbad394725703771893770d11e5aa16b09b6b5d1059331b72ce0f1e85c6ec61677d101276398624c";
@@ -18946,6 +21064,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "magaz" = {
+  revision = 24694;
   stripPrefix = 0;
   sha512.run = "5c35baa39a8b26911b2c2dd875576a0f875f5edc37fb497dbd403720855861219fdced11ee3fbbdee8e63f0817b6c2ee6a20e6ec3bcc9a5183465c22caf7735d";
   sha512.doc = "78c9163951f269a489f6e8a48cce7d9ca46aa5c7f2f2567f8e50627ddc32920a8a5b54bf141ae881c2863de6bad4f7a954588fef9469291f18e65b7fadbf051b";
@@ -18953,6 +21072,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "magicnum" = {
+  revision = 52983;
   stripPrefix = 0;
   sha512.run = "305d94ec07468511e7ada667ded30a1c3ba68835d5bdd03a9a32c7bb7c0d274d5ddc77a5ad02712faf10aba5eca73c6708cb2bf497bea0b73b3f99b10923a8bd";
   sha512.doc = "084bdeb7d422a5e79f4a53864ea0c94b09962e159e103fe3ea77163a9a549605f7139bb2ba9d1a57877b3453162a99470f48a691ff78289a1caa5389b2a7f67d";
@@ -18961,6 +21081,7 @@ tl: { # no indentation
   version = "1.7";
 };
 "mailing" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "33fca4d77b34e3390de647e7e39d6240344f2a90c6067275bdb0e7dd1a3deaf5d5cdaa84dc4a49a0c817bc6923eb593602653b0d0ae4b794510a272b78498be9";
   sha512.doc = "2fd2d4dd5c1896d0849294a1911ae3682b7331cfa574bd46aa047f118fdcb09b4da3e29f6d5412d23ea49f776cd042694508e8b5492ec53cb44a6acafec110c5";
@@ -18968,6 +21089,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "mailmerge" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "1930b0c554dfa36514d0c0b33749d506d6e5acfcf65e3c1dde3ed75a7c45bafb74db8d83f1b286c1a623acb32b2047dcab566ad85e3676c67c0ce1f7722d24f4";
   sha512.doc = "3e8aa80211af8f59289b87dece6cc2a1c5eccf02805e3e7927c78cdac66cdb6afaacb07b1114f8c67105289e4d4f7188043cc28f00365c1f5c3f353a53f14922";
@@ -18976,12 +21098,14 @@ tl: { # no indentation
   version = "1.0";
 };
 "make4ht" = {
+  revision = 53514;
   sha512.run = "86578903b820e3011042dfbb6d18a436cea35a780691d3aa82f468518f7666fad343d6c91c91dea0bac47a06b6a812ca5dc95e474f5913f305c22adc2636d422";
   sha512.doc = "ca138ad89fd6b350dbb3fa6b22649c3b0ff2bb802e5273f772765b6b7fdea4211eb41ef3a679af2d9d853578a9256f84d492be7699f4b5d33660ad0d59219bba";
   hasRunfiles = true;
   version = "0.3d";
 };
 "makebarcode" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "a19268b5e63e577b4df9255e4c0eac640c73ac9e08f6d4b4baaff7920f714b7dd961f8143587b59478df2d854dc2f363312833c7636d08c2aab644a25b54bb40";
   sha512.doc = "ecd0121f679d7e4ffb162c151dc4b60acc78f9297d3bf0003882b914f0b1a10a52b43e844c5bb085d73ac08f9f0aa2e768ec4fe7374067ae2fcf304e842a29e3";
@@ -18989,6 +21113,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "makebase" = {
+  revision = 41012;
   stripPrefix = 0;
   sha512.run = "cf36d0bad24180f48a7cddae8fa19c6260ceb5076b21f05e48360a30ec259b342e6a17f1c5d299ce5fe02a8dc5ed7934dd55c5529118bb24dd13cd36242b0d6a";
   sha512.doc = "2f7eabf88fe3777ebb1455caed5a339c3b56e0e7a97d34aac0b4c461e7ccf6450de936678ce00e64e39f308167ec55a6b3ec42f7428a7a9c87d2607570e1576b";
@@ -18997,6 +21122,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "makebox" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "918052ed5c358e12ac7ca7c93f25a43fcfa8f7ba261fdf652d7ccbbcc27e3e0f822813d8297d3b75450c443687bd97e93416624b51da61572557d6a337638bc7";
   sha512.doc = "807d495fdef601fff666acb79c7f3fa43d1aeebf8aed77bebc02f90dca4fb9c36ae1bc911a9af1009538f3d3e2c4c7f9ceb0111d091dd4c1691a1520e089a697";
@@ -19005,6 +21131,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "makecell" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "ba32b6a68b0a4cd6df36d460832e5cd9664a9c305c24dbca93a4fce69e97b6db3d86e3f219a0511c7d70378ddd9424d3685d60cabbc8554077c6bfbd8847789b";
   sha512.doc = "7c762852f1c7b4609fa823117e765d2b42ad857e2ffa1ca84aa3df74497c88dfc0a2cf05747f11f14453873ee70c4b0f2f890112c567d04ad0d61ada37e14335";
@@ -19013,12 +21140,14 @@ tl: { # no indentation
   version = "0.1e";
 };
 "makecirc" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "9bba91e5139b90201e232aa3fa21254c5bf8d989aedaec8310209ae6b772d24d7b8c3be379909f04c2c7ff079cca10f43a1f74091a77bb1b8ca637a0743a2ef2";
   sha512.doc = "25190b3a5d911de1d02fa596f604527006f3adf7512afae397e5ba15ab62d6471ab834f92437d35a9f37ed83c8b84990d79ef0fd9ce2b0edfffdfaa2ec97a345";
   hasRunfiles = true;
 };
 "makecmds" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "fb63fdc9cc0aaa531b25417f0c23348971c306b1a93d99e7efdbbfd7c3907b50f28c67f36a88bb2a94154bcbde937e63246ece577ee2440ad4f5c2935eb25b99";
   sha512.doc = "f69dbf682df7e3089727570417be3624b496b5ad7db627b344d32b106606cab5299dd23497e137770fdfb9f940503a65e1074e06dd67e0561b36729ab6c3d428";
@@ -19026,12 +21155,14 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "makecookbook" = {
+  revision = 49311;
   stripPrefix = 0;
   sha512.run = "a4fdb7a7553a08b51d15c038187ef621ca6852c20a033b1751c544634c3092f93c3db5c1f4d744732ff6696509d8fa406251e9d14e619397ca4202b55c1b9c64";
   sha512.doc = "84c97dd438e3d3abedce031da5841f789f3b8c28672c9e3b6c53929e2e781a9d51adaec6d883d0008b42f1eae2ed5bbf992ec229bb8b2f7f510346d10dbc31fb";
   version = "0.85";
 };
 "makedtx" = {
+  revision = 46702;
   sha512.run = "e083fa791975cef84b2e2ba3472984e354d5ced50ae7fb96dd8239cfffd379e7a25fdab80abcb721e63dfb10d9557bce69e97c5624d1635f894bcd26e22b5f4d";
   sha512.doc = "913f6f02ff478ab5edeed4792846ee6bc06d28c16fd3d7396d394f4a964d6f39a12c8163d66a50a5bf53add151317184b09a712dfd32f9ff783bda7f520c7eef";
   sha512.source = "84e12e7798c37a598a2d37fa7faa206ffb6f5c1f9c21af7130a9f05bebf9857f2a4fb7988be55a9936199694a0d74595ff75a1261187d81fd06beda5e0628931";
@@ -19039,17 +21170,20 @@ tl: { # no indentation
   version = "1.2";
 };
 "makeglos" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "477523d4663e1e4a1fd6bb830e4574d6d116180b06a3199d6ba27f7cf704a1906a2812496e9a7ba8063690a2095fbd5022a5eb8c2448b1e0341c8a961cf05794";
   sha512.doc = "c580a23d65422d8405ce011fb6b088f53836811e3da517423f6d0dce098ffbd64c0648318eb9fb74ab637e1796d19247ee87ca8a25c7d306e3dc35a5d6d79f99";
   hasRunfiles = true;
 };
 "makeindex" = {
+  revision = 52851;
   sha512.run = "7f4df4944bc738e92ccd7fe54e1448a9ead71077d25359d6b97d18ed9df4dde2e6db31bbb183c646ea902e24b5cb15581ef12eaecfe90ba08361dd191e5220d2";
   sha512.doc = "492d0bb6f44ebc0440998f55b51ec5bce5ad564918296f85245ab10bd9ef67f8a2e441560ed7aeba8af2cdb0a923f225dd867454ee83889252da6be36f89ab16";
   hasRunfiles = true;
 };
 "makeplot" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "366e9ec4ce551e17ae6e77f068b0d2fb46582c033eb27781cd620a87731eba744212db8dde9ce8e50318f280dfe31e61a344ab4232c3bf26040dd7a2290d4fef";
   sha512.doc = "9aa863af450a66201e7cb3d3a58d9248430aa26cca9b50de4c71c350314ac9c0f6fe54e5eb1b37917a75030a60ca18102933f154bdeb7831ca02bdaa65b3a6bf";
@@ -19058,6 +21192,7 @@ tl: { # no indentation
   version = "1.0.6";
 };
 "maker" = {
+  revision = 44823;
   stripPrefix = 0;
   sha512.run = "d8cefc4d4389e4024c448400f02bc0ef0a21146c1d079f804f5e102ee3f2977be7fdd2c1011672b70192af48693ab1fcc38bc1d6f7711fce217792e82f0e5e54";
   sha512.doc = "fb7f68b4c48de87e6c1e380525a998bd1cf7578c2e4a51551b5ab4909481e66faf38f0a74083f25954b5d05e9eda12e56734351fab063f80955abf24eadc0e21";
@@ -19065,6 +21200,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "makerobust" = {
+  revision = 52811;
   stripPrefix = 0;
   sha512.run = "502b4dd65ae3535a2519c696b8b2ef73b3eb8f19d20af7dce94e24c8f718f827e55ddf7ff229bfc0810ab8747c94720cc7a66335a7d44065d0a0ac6b156a683e";
   sha512.doc = "4503551b0085c7c829d41042083209bc02dfd2391f99cf0fabafb363e288a455e51273bf0f9d4ff5a5fe17050fb5288a7835742e06865407b8400c88244f4e6e";
@@ -19072,6 +21208,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "makeshape" = {
+  revision = 28973;
   stripPrefix = 0;
   sha512.run = "b13358696b16b41a69e5a207fcfb717b417ec191ae9f6ad4408422b1ce99c3785a3328cf9bd2e87ade3ede4998ba76ddb2f640e06ef5ce88172942e4d0cf2bfe";
   sha512.doc = "a249c636b414203e75225af611173add2e90af306d4a78c7d865fdd0e76b23637fb3b8eb41f127905bbd0065cc7b941d3d26e3ee73b9aad56e05ed0a44f67d57";
@@ -19080,6 +21217,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "mandi" = {
+  revision = 49720;
   stripPrefix = 0;
   sha512.run = "a22c6cd667b7a256cdb0d1f975d214890811ad047d3eddc96e1289fd22a8ce9035183c5c1f6a876d7bab85bf8bba9626d36c2edbc8abbd060c0ebafca6b84932";
   sha512.doc = "60cc9d6215525424b3e05af173a533d3781d1eed50d1e89e3d31f80274ab2b91033d45254eb419ec9a9a4e7553f50ac9c737ac82daea8dfbf29ba077d69ce5b2";
@@ -19088,17 +21226,20 @@ tl: { # no indentation
   version = "2.7.5";
 };
 "manfnt" = {
+  revision = 42428;
   stripPrefix = 0;
   sha512.run = "6d4282db5f5baf92e6dfcde9b8a1e78027a5d6bef4e27b8ff35741fd8bcb35ca0a0d4e3db996ffc9a2e50868b1f849f961a4d0179aee0f580b33d79972656d4c";
   sha512.source = "1f8b2acaf18fd350ee0359acb4771245eb3d5d750f92a637745ca01f4100be9526ea323ced82c6a6ff71eb6b9dfdefa2c44b21f5ff9c15f3f2fc68536f5f8ad3";
   hasRunfiles = true;
 };
 "manfnt-font" = {
+  revision = 45777;
   stripPrefix = 0;
   sha512.run = "fe7ddf667368990f988005a44013aab80af9c097f4f824f717d84fddfd61dfc658f507d5b1bf8f7c076be1bd5a4363f117b388ecd39b0ce2b0ee5fc8aa83fd4c";
   hasRunfiles = true;
 };
 "manuscript" = {
+  revision = 36110;
   stripPrefix = 0;
   sha512.run = "24e4c800ba6f5089ae76b6d444c81689fa696cd2fd9e62281171d771f8f9f065320b53b058cc6adf836f36d378f6f7fece98e8c09e2b655ecaa8884067bd696a";
   sha512.doc = "baaa102f870cc307fe96b583f74c19c7ef2c7649f01fe7985c3dcd331539bc9d839f6e34aa238354b6932d14638b77e83b7bf8e62296c36fc2dba18f776271a6";
@@ -19107,18 +21248,21 @@ tl: { # no indentation
   version = "1.7";
 };
 "manyind" = {
+  revision = 49874;
   stripPrefix = 0;
   sha512.run = "e08291b4cb0d2c18e6b97cf6a287d7cf5b49eb312138910185845b6c0a075981a15548de2dded6f597605aef885e736c17b5306328574473aa56f8f11b6b8288";
   sha512.doc = "e8d9c687c1b3525c5e4d218a380781f1b2e7d512b053a583b00c97f0b7eefa1202dea310454065194039841bf8763acc2b0c4712ca8d5e9d31b57cf03c50b928";
   hasRunfiles = true;
 };
 "marcellus" = {
+  revision = 52367;
   stripPrefix = 0;
   sha512.run = "dbb5f27d0bdcc0ac304a45b06afb800c002b299cb70f86fefcc25f9aee288c2cf4eb8bbbc37eb97d380bf1d1e2371fa77c196e87fbb92c22d2cb248243dc35d0";
   sha512.doc = "a9c4fd90385e9ab3b39e4744084d2730dabb4091b09270855ca0d1bbd21b3f0518300a4f2ae0243121f5174f3a491a460ed6c5d617298bf4392a23368cd57f8f";
   hasRunfiles = true;
 };
 "margbib" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "7f734e46e72badf838397305ca926f4589b9aba7a0e91e21313f6a733f7cd09db959f30e3694490633713b1a77c8d11a521b2892722496fb162d7c25c7b8641a";
   sha512.doc = "c4f93e442d1337cb5a1825b4f7e6fe5ae0a759c32837a896852ec5592b3c31a9c473789db35c147b67360ed662b1e9ae42a59fed446dde234b174f65e358662c";
@@ -19127,6 +21271,7 @@ tl: { # no indentation
   version = "1.0c";
 };
 "marginfit" = {
+  revision = 48281;
   stripPrefix = 0;
   sha512.run = "dafe223cc6120beac7ce419c5f5eb72ece9be2a21992e829a8015f7e05ca22c40d5196d26d21d8febf3459bfa58c7defc797ce7bd4ee1e3dda28761594240b3e";
   sha512.doc = "fba2ff6febb4acd0dad443221c6146fc2b3818c4948827b827fe2ff2df82f4e2843520f1f4cd41fd64900012d64d973d9b649e65b1c5ee4e74757344ab423dc0";
@@ -19135,6 +21280,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "marginfix" = {
+  revision = 31598;
   stripPrefix = 0;
   sha512.run = "9b9649077a93599c653d0e2d46e6814eb378ee8d2b531e2b810fcf0a6b698899bd13041d3b7f4aca5039bced2eff4789ad21587ccc596f70a6105c2efc89ba59";
   sha512.doc = "fe547fa6bef7d2417447e4261fed0b43d2f88c944c499a55c5959a2e7d9e169e80a06c9e191edd76f1ce7ab4da9834b8b216f0881d93095e9c41ba5b7741d845";
@@ -19143,6 +21289,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "marginnote" = {
+  revision = 48383;
   stripPrefix = 0;
   sha512.run = "db05524c613df90a75c6545dbd19bccb955d0b3c2c0312686e21ed42e4802d47105726b0e092d178bf484f1585331bf71c604c2d9f039065872e218357d0d07e";
   sha512.doc = "a9d6a3d7f8de332a5f77d086d552caaf91e5ab4a71288548d6d7ac3318cde208d948a668ac554d2a8f510f984dc9943bcfd0e07a70a2ee00c9bdadd3e148f550";
@@ -19151,6 +21298,7 @@ tl: { # no indentation
   version = "1.4b";
 };
 "markdown" = {
+  revision = 50906;
   stripPrefix = 0;
   sha512.run = "c17f37998b3623bdd94f074d4f47fc871e8cbf3ffe961d1933ed2113eb90219cd74105d5e35675597376b64a854e89eef07c629335079a9b131f827c6839713b";
   sha512.doc = "34562bf94ae2a4c9dc415b8c4213b6f81d1fab8e92d1b6da057997c6e32fee652fbe7245bc2c7b9bc188bcd9d0b64c7a01eb1795874df473833730a551980cd6";
@@ -19159,6 +21307,7 @@ tl: { # no indentation
   version = "2.8.1";
 };
 "marvosym" = {
+  revision = 29349;
   stripPrefix = 0;
   sha512.run = "64093dc5de012c6a50762ef34001ff2305e6b59b667ac7b1ef72cc53f8b0ed3852b4d307a8d421ece996e78f2e32c8871038b6b66659b0866dbdc536445dc7a3";
   sha512.doc = "d6f72ee7ed64404acce5c37c216a7e23193f2053c18910d80fc6d5fde73ba86c07045102488f17f4cbeb9e1d148567973713bb4d9ce2cdd3cb166936ba5623e1";
@@ -19167,6 +21316,7 @@ tl: { # no indentation
   version = "2.2a";
 };
 "matc3" = {
+  revision = 29845;
   stripPrefix = 0;
   sha512.run = "19996040ec55b000d84637070a21fa9fc216eb3cf8ec75f7c408925e0d7a716a7dca0eff4887778f666be3e857b589cd033c53d3859f84226416ad069720f7be";
   sha512.doc = "68f65e9171eb03fed79dc9bffadb725dc7324fd9696ff9f6f0a13233327f47474477180c6e17b5bbb9ee2ee02996ebd6213b43eeb7e9b7eb7dca2caac2db470d";
@@ -19175,6 +21325,7 @@ tl: { # no indentation
   version = "1.0.1";
 };
 "matc3mem" = {
+  revision = 35773;
   stripPrefix = 0;
   sha512.run = "e0736f75126aca9506e1cfcbd321645e731e2dec7f3ae2c045201dd8c729044689e358724b77ef9d99aaf3ff742802857d488e3f2f78e781b64af711c7fdce12";
   sha512.doc = "2038d84ab20c6763163769b62a35fa4e95dbd3e76b0e2cf1c4a25694488ddb5b9be8b40f81a1702600d918618455bcae46d22fa101a1a95978b996714de41dfe";
@@ -19183,28 +21334,33 @@ tl: { # no indentation
   version = "1.1";
 };
 "match_parens" = {
+  revision = 36270;
   sha512.run = "1e03e279e977af436a8f5d5c3d30f046f46f1a31a0fd3de6d8ab458a64f0634b5f3ef8a338954971a898a1c68128f60c6eabd7ca231df9f3ca8ed12e55967dad";
   sha512.doc = "60428bc16f65fe820e267852c9d85a5f862c6800ac9c2aae0915a48819da381b2a311fdd3d08096d4aab7311ef86c1c89fabff3d88caf419dacbef515f4dd39a";
   hasRunfiles = true;
   version = "1.43";
 };
 "math-e" = {
+  revision = 20062;
   stripPrefix = 0;
   sha512.run = "c51c61baf8a8189fc2facc065d2f80c75026f5dcca8ee79c6d72ae9d71f0dd7fcafd7a230041db55c07e065838e865a56129c79b502c5f65e41ecc7b03e1e5f8";
   sha512.doc = "8f2356c61cf47332ad4b62f2065ba7f16173aae618e0d387c6b5f9f97a47c6b3fa14deba24e93ab7b359571ce732023e9b062342da0effc16aa6ad13fca71c5f";
 };
 "math-into-latex-4" = {
+  revision = 44131;
   stripPrefix = 0;
   sha512.run = "d5739155ac3cd6a02f356bbb600f7f76022faa4a5c004a93531678ead3c2f0a9f8e1419044883306ce453ac96ab8726ee45d8e49c86b0fca6a9232010a8927e3";
   sha512.doc = "5fee7c89fc9f273817b23fa25260733ee0552df7bed0333bbe604c17bdecfc28d7e386478f7b42d3c2aef89f80ce7a1d35215fdc386ea47e4db3a334bc6a9597";
 };
 "mathabx" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "400bb43207c43192321cfe1b658c85a07410778e7694ab1604b992025d69300bb2d4c2cb7866a255dc4988c843dd3b92c33e527c12f087bb560cba4520115643";
   sha512.doc = "e1f9f96794f6d20dd75bd7ceabd40993e56d5315848bbea8a6812a16f74c0fb92ddc6356c71aaa1367c47b1dc26a3711793ec88cf0b90d391f8157fe20f77196";
   hasRunfiles = true;
 };
 "mathabx-type1" = {
+  revision = 21129;
   stripPrefix = 0;
   deps."mathabx" = tl."mathabx";
   sha512.run = "ae2272ac7d79a3bb1a655000a2d5fa1c3d948363763abe194cbac4084d5ef60492648977660c3d9dfbc2c70bea3c207d031d2147097fb1d7af503aa80f257d1c";
@@ -19212,6 +21368,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "mathalpha" = {
+  revision = 52305;
   stripPrefix = 0;
   sha512.run = "c6b653e5a0b7788ac36ea9ef6ce07dd4fd19a75a82c4115cac5921849477839387b0cccac469dd74b9f4221315ca741c49304eb76213ecacb97dc7e218ac4cc9";
   sha512.doc = "5a1d993f73d3684ccd8a855cf8e016d35aa29c34fecea0f01f147a0cb108b355108faf43734c83bdb74f59287a7963b4b418894e0a5c0ec4ffd884f3f4ef1d0e";
@@ -19219,6 +21376,7 @@ tl: { # no indentation
   version = "1.13";
 };
 "mathastext" = {
+  revision = 52840;
   stripPrefix = 0;
   sha512.run = "a8c0ac4c041b52032e1bfba14eeb6ad42206428a8cc576597d7b509d652c818b2568f043a6edef0bd491057c661e30d9e61575d1fe0c8414e45f08d9629b4e19";
   sha512.doc = "b2b1deeb2cb3a966d64a1e367de2ae6f932b5cca714a15ed113def4b00d3046fadfa4724dfe21028fe82bcd5d76a1c73196a2c599a0f6a56ec113fd4421c3456";
@@ -19227,6 +21385,7 @@ tl: { # no indentation
   version = "1.3w";
 };
 "mathcommand" = {
+  revision = 53044;
   stripPrefix = 0;
   sha512.run = "733c1581550772bdeda24b12154709a09f4427776392e86214d273c2eee1df7a80fea4285d21410f44195af30682aafdecff9f678ac43ad5f78a90605f76d332";
   sha512.doc = "eed721d4b0da17c2ae997c7b1c46f19531108db0ecfbb334b648d5931eb2e86eb99465c52093e2adee7150dac3d5c8dc4b9df45ae68f47d0a238c875b33beed1";
@@ -19235,6 +21394,7 @@ tl: { # no indentation
   version = "1.03";
 };
 "mathcomp" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "7dca82aff58606afd315bc18c6908946193be75f04ec456e2cede8184867543437007b27f04f4363a026a0db83da3fdf963afecab7330e9419b1ac5376efcdd8";
   sha512.doc = "6135b3d06908c5c359cc432a7406f146ea6b0bb614ba0b983738230ca2073f4348a6ff139bdc4b43325a8b67ef59a6db8e60ecefd88af5c8ff0eddceb0f279fe";
@@ -19243,6 +21403,7 @@ tl: { # no indentation
   version = "0.1f";
 };
 "mathdesign" = {
+  revision = 31639;
   stripPrefix = 0;
   sha512.run = "cc8a1c58348f8f81417178434c9bc3d9edea79dc5d300753f41870734f8fca8f43325d56f73e3113aee8e9f38be1fbc6abd3cefe4458af1e1e22900ce889c315";
   sha512.doc = "f6c0a3595beb7b25ab5ef2c8a08b3e0be90cdbfa20c946b7b3f5cfd29f5c9a38963262818990ef78be02d95c2d2a5991581be77834048fab4eb0e4c0252e6871";
@@ -19250,6 +21411,7 @@ tl: { # no indentation
   version = "2.31";
 };
 "mathdots" = {
+  revision = 34301;
   stripPrefix = 0;
   sha512.run = "1235583223f831852458d53e1e8cb767495987829d4930387f4dccf7ab060b9f0af8722d6c1aaa820c1a371f8ce1c0222633e6feb064e0344e639eedbaa4129d";
   sha512.doc = "b1ce238b3abb3397b0085983e752dbb9eb9d9c1026046726360498d089304f7f4deecd656dceee27b63934092568f0ca46620231f03e0952c43f28ae73e97dc0";
@@ -19258,6 +21420,7 @@ tl: { # no indentation
   version = "0.9";
 };
 "mathexam" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "30fc0cc9c44f2b7a64860a7d8eeecd25eec7e888f4ebdafade236edebecbd79f5d832566d151243430a60c5995807ea77d34e19cfd5e0d8cb037ca67d3e933bc";
   sha512.doc = "6af2944d12d09f1ab593a7002b9de71d14c5436885b79e5e495dc0ba1fdf9dc6b9080bd009bafff988b019ec3e75da934a7c8c043870fdd52a9a46b36c9d646d";
@@ -19266,6 +21429,7 @@ tl: { # no indentation
   version = "1.00";
 };
 "mathfam256" = {
+  revision = 53519;
   stripPrefix = 0;
   sha512.run = "20912d6df0f287c14300e4598400cc2da676f7e484757e3a9a0c41ef6861d7180cf7110fbc7b5668ba8a713cb66b9120736b64a1f5098df25379ebc7b14e44f5";
   sha512.doc = "26aa672bc55de7c45a857d1ae26e156fe19f4ffa05417a7a4163526d01d5f58576f8d6db951e377b646e1ff25167571587d09f21eadecb95bc96e6b85707a9bb";
@@ -19273,6 +21437,7 @@ tl: { # no indentation
   version = "0.5";
 };
 "mathfixs" = {
+  revision = 49547;
   stripPrefix = 0;
   sha512.run = "513e5dd9eb58ca5b1eb8daec663c48577fa2102ade0234412dbb22b6d756ad37009c689746c57c6624c731df64fa8d58eabfecbd4cdc31c576eb0ecd1e232fdf";
   sha512.doc = "c9ad8dda9ffaa77ba727f536016ba1dcbfb91c4d7ab98b1e4b72156591e8ff0359f623475324e57c6b22f509cdfe7e30ba67c3fb22f9dd152e59f1557c96a6a6";
@@ -19281,6 +21446,7 @@ tl: { # no indentation
   version = "1.01";
 };
 "mathfont" = {
+  revision = 53035;
   stripPrefix = 0;
   sha512.run = "5951daaa320cedea9d40ce0af8b13f9e15e926bcc14cc31f64bfc92bbd22e5a600e1c696f0e7bbbd1cf6a31141c6d3a985433a8000df7c0eee0139c40393667f";
   sha512.doc = "a09ec87af77663740e5cfcd271e7ebae1cacbee24a31093912a7ef3925827bf35800db424d3a88a40338fb1f1e63d033071b8cd3449493d6d3a64ada760289b1";
@@ -19289,6 +21455,7 @@ tl: { # no indentation
   version = "1.6";
 };
 "mathpartir" = {
+  revision = 39864;
   stripPrefix = 0;
   sha512.run = "8e1c99db2d64e9c815bf8b6784d1c717969a5ecc96281df2f815ba7c0d779b53484c61ca233468de793be94cf636373f4fc0e3413c0ce32d4715db30cafe5471";
   sha512.doc = "fca6b3e2650ada022617af137dc86858c83c51c55fcadf2ff21832a1fcd9fc44f371f89e8943c5e1d117a09893c3587f15a3e8021b11f7472dd3c9d37383f8a0";
@@ -19297,6 +21464,7 @@ tl: { # no indentation
   version = "1.3.2";
 };
 "mathpazo" = {
+  revision = 52663;
   stripPrefix = 0;
   deps."fpl" = tl."fpl";
   deps."palatino" = tl."palatino";
@@ -19307,6 +21475,7 @@ tl: { # no indentation
   version = "1.003";
 };
 "mathpunctspace" = {
+  revision = 46754;
   stripPrefix = 0;
   sha512.run = "81d1fa6ce0e96190516f2440517d554e259013869065a4242c55bcc06f2d9eab1f8102464da71fe72dd0d231248b637d54733b2a11b832d2153f151dc5513339";
   sha512.doc = "ce318466af0c6690a905c92e9f24f9a7c2891c4afac7c51eead8ebf211bf13e2c20d368782ed41f20a2bb2d6f3a6cd6bf44eb6a0c848ff8006564ec98aeae2d7";
@@ -19314,12 +21483,14 @@ tl: { # no indentation
   version = "1.1";
 };
 "maths-symbols" = {
+  revision = 37763;
   stripPrefix = 0;
   sha512.run = "f2028a2b8dad52aee2db1fcf679647192cb926e13cca831a419d876783e492dbc590e4745302addae7d3f01eabf7eaa1fd7cc6f757eff2ab9d9b5c39a1b0b785";
   sha512.doc = "b60a66b3cc67e4dde62b0fc0552233ab59b1981ab92cedbe4c0de31a4c9e9d3207cf54ec5d2361f81937867d81bd345e77c4ab3e36fcd8588851765ec3267864";
   version = "3.4";
 };
 "mathspec" = {
+  revision = 42773;
   stripPrefix = 0;
   sha512.run = "7e9838ad2f212354b103b9beb61d60f124d2f47e52a04e2fad61de01e2e8220ca5f19f5b2188cbfefb379f94dc4b76573355dbde563f887beec29c57b3648ae9";
   sha512.doc = "d22c19bd2114bc48f438d820177006170d52d1a261f3cfe69452148f4e11a0ddeb1bb25e1c1fa22ef8d2284c7f34f7ef41bcf9d8e90a89705b3a7515a679a922";
@@ -19327,12 +21498,14 @@ tl: { # no indentation
   version = "0.2b";
 };
 "mathspic" = {
+  revision = 31957;
   sha512.run = "e556960f07a003e877ce678110e724ef94d34aabc0ae52c59ec2ae487fc7d3e5de169844baaefd61e467e98a7a9718d94d881c3f0d43855e133040bdbddb6a62";
   sha512.doc = "1702071f4c26097e241ba161258a51461405954105c8a7f2d92a552d6397ef69af029652ba5528df999c569fae32955d1b194b0f7c4475b3fc870656b473386a";
   hasRunfiles = true;
   version = "1.13";
 };
 "mathtools" = {
+  revision = 53442;
   stripPrefix = 0;
   sha512.run = "c7da4d6606302ca3d569755f2cb532f93db37982113b8b632d486055ab08c9bbd1ffd0d285fc868907be3faf685f7dd3bb9b00570e75aced623a48c78c9f7937";
   sha512.doc = "1b8bc4dcfb70575aade3bfb2f110f6561de4e4ee4ec0f39fd6c2726ded19a455280e131ffdc35840c3230a466996a5623683e94796541de3ecae7c58bd7b7f27";
@@ -19341,6 +21514,7 @@ tl: { # no indentation
   version = "1.23";
 };
 "matlab-prettifier" = {
+  revision = 34323;
   stripPrefix = 0;
   sha512.run = "840d860303925d148c10a980218018ed14e2d0ba2b1638f8328308a0400e8862ced7cd28822fd81c3c3533d2ef4cd37e1c4009065b1300011898fefb407ac202";
   sha512.doc = "22b783fbe09f661d1e5034cb623fab29e54df35b4f0379579f430b17a80236a843c15201b6583bf58f22ae39dba34d7f5a4f8482b1c6d185822940c67ac06942";
@@ -19349,6 +21523,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "matrix-skeleton" = {
+  revision = 51823;
   stripPrefix = 0;
   sha512.run = "2adfc8591ebb043b9b962167c4cc393d5c5e8ab2587c88407530fa8695210800b2a2ad0944d43b12c9cbf2e1018645d3c32fbffa4dc480d287a034b2387bbb68";
   sha512.doc = "768d78c3b5752f04f1ba4c45b0151659ffe5de91d976abb7b6a374b18d148890a7edf743215f263c6cee08506ee10725b8a1bee786977f998a546dadda1494e5";
@@ -19356,6 +21531,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "mattens" = {
+  revision = 17582;
   stripPrefix = 0;
   sha512.run = "9ae7b4d3e3386a5c9b94a30eafc02d00c9a6376ed356755ba283f7b9b43fc27d3b9dc2994d808360b77d23f39014e230434f404bcf6dc20bc974d9efae97a3dc";
   sha512.doc = "d67ce30be2e20c5182460b8e567d955c41b364383acd350cba1c07b52576d78016a865148ed871ce7ef3f937eb045201e64e5d5f52fd5b173fe93cf84def2119";
@@ -19364,12 +21540,14 @@ tl: { # no indentation
   version = "1.3";
 };
 "maybemath" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "32520ff01d76e11bd70694a07b86272425680ca8bf21b6da9412c133836f9ecbc9a9537377ee67cf9292e33dedaa1d33e906b4f681b89f075d1fcbbbbdc989dd";
   sha512.doc = "b0f978f89ebb7f681e7b045d03a9a6e7e9083d7c468c91d52ef417c85d707243fa0ef253b3e2d1f1737a9c7235fefae06c4a8fe2975cf2c13f7f09ada7752f26";
   hasRunfiles = true;
 };
 "mcaption" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "c3e1c2948e2687bf720dc05dfa1ed6140a1ea55de3cad7ebcfe518d720ed96793b6bde32fb0882cae773f986b11150482fdfb382391650a8c513131b7041555a";
   sha512.doc = "e803f5731e6ac1c299bc3a42666acb81a75a3f110be729639357a15633e0e7b8ad0a244820b96ae9f8b435d9d1fea54a0b7f14c5db02799b3a632b2f0c5cb4b9";
@@ -19378,12 +21556,14 @@ tl: { # no indentation
   version = "3.0";
 };
 "mceinleger" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "0792d7a5289965b2379001a54177e1aed4a3356d8611e52ef77f5097bed1918dac324bdf5c618ca76d2925d11539b623cd9d4016ff0f4d1f9283137816ec145d";
   sha512.doc = "2dab78fd096927e3958d7270ddf15de9350ec30d1d000e7cf92be3b249ccf70e6faa1dce482a07995e65b4a4549693ce3b34d1a63bcc403ebe81f3d1887ecf90";
   hasRunfiles = true;
 };
 "mcexam" = {
+  revision = 46155;
   stripPrefix = 0;
   sha512.run = "37637616c9ccbe4e20ebae6b479e076fe87b6bd5f3bbf9124c79b93cef6e992d82bbb4fcfbbec3e4a7dcc187d66742c410c4a6280328c80765495685b4fa2cac";
   sha512.doc = "5d1eddfdca3ebb7fbe28d93ed6e7332147857d7523d3b64e908aa56ef71d9bb2546d05c150737a3401b5ac7f76110a421513db2d8fba906173afbde9e012f7f8";
@@ -19391,6 +21571,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "mcf2graph" = {
+  revision = 53550;
   stripPrefix = 0;
   sha512.run = "39324ce41fd8bf3f6c478533bb96f8c743d183754e28ab68f431fc74b1e873221a81fb782ef5f8b897dc9f929e19b41e617d042adac54d8b3c1c3b1094dbc3f0";
   sha512.doc = "e005ebab9b4ccbd6766ae91a59fea1be987ce290c56569fe754ab0ac4fd7c68046345704d7fa17e75d4b3b5ff361ca907c34965cb6eff26549909ef55804a145";
@@ -19398,6 +21579,7 @@ tl: { # no indentation
   version = "4.48";
 };
 "mcite" = {
+  revision = 18173;
   stripPrefix = 0;
   sha512.run = "71276681ec29d3d77450a8c343d64a1ea734bb48de0d693a4e9ca795e4a4c9a3d5f4103b5641c8684d49b5c95f56bfd08bd12e1d7e37d06f9170008b51804897";
   sha512.doc = "8c5ae4b1beb334ecba3294108345bd616746ee651f03d39a7bd5f5cac97f671a861fb046e29ae7565863aecf4b043ebe25bf9a4180889c39e48735251e430004";
@@ -19406,6 +21588,7 @@ tl: { # no indentation
   version = "1.6";
 };
 "mciteplus" = {
+  revision = 31648;
   stripPrefix = 0;
   sha512.run = "5be1980964ea8342321964f0db1c750c33fee9f21724608a260ebed22500d1fcfb0fcb7e588a0dd030a6c534b0da904b8bfc3eb0da7b2df34c0b3f2b1b8fb637";
   sha512.doc = "5e720fc2b32ca00d71ade77fd0a47c6ef44d9b7692a8160ddc55a5f60495a40272a7a0c6c2f5bed923ea10703654f155701d4571d72805c1ef900780a209a0a4";
@@ -19413,6 +21596,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "mcmthesis" = {
+  revision = 53513;
   stripPrefix = 0;
   sha512.run = "5768d3d07c88c186c9b1937efb3b4fb21cdb1cf9b05cf653657f34839e812c0072b0b0a24f05fc24cb29fe084fe8d26a099481c8b753e99c08b481957635470f";
   sha512.doc = "5bcea5b94809ebf47416a9638112979d47a64aaf7ec02e1729bd8004f7159383f2c07db03164f44fc450548a80a7905569aaddd0fbf89775f3e1f894bffb20ee";
@@ -19421,6 +21605,7 @@ tl: { # no indentation
   version = "6.3";
 };
 "mdframed" = {
+  revision = 31075;
   stripPrefix = 0;
   sha512.run = "0cff0945adc04102e0b0a154cac1f78e9ea903b29e3f880156b888abeb4ca23565d39a7b66d8097c35534baebdf6af152c5b3830d08e1287e8e8d18e8f6344d0";
   sha512.doc = "06822404872899d6f509fa94f69cdcb81dd69866fbc5a82fd54ca361aaf27133140290cec2d08800dbb39c896ebb7cc19dc4cce38d2a0e45de9c658bbadf3352";
@@ -19429,6 +21614,7 @@ tl: { # no indentation
   version = "1.9b";
 };
 "mdputu" = {
+  revision = 20298;
   stripPrefix = 0;
   sha512.run = "2720c63845939d2befea3af157eae95d2550a216cd22634ab0a923a06d50b48e7133e914d210c5d3aaae6fd620312d23d2e55a015c2a24ee1881bc7ed4868778";
   sha512.doc = "8c8097552ffa1f11944203e818742bec244abc5a7708207cbb69c46ffc64acaac28ca390c1ee256cd1cf2af093e39189cc9bcf655e948062cd217b58acee7628";
@@ -19436,6 +21622,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "mdsymbol" = {
+  revision = 28399;
   stripPrefix = 0;
   sha512.run = "49b52141928fedfdf5fdd63251de182761825a6cdcbf423bff562a863df159ac0d1c001239f777e7aef68ddce23c52407758c70f7da42f066775e204ac8c841d";
   sha512.doc = "ea4ddd0fd65204ec0ed980108d86e97be267ba46c1cf45711c36721bfab9302766ec1d0849b38de75003af564a797f8566def377d8d947d464367bfa40b91399";
@@ -19444,6 +21631,7 @@ tl: { # no indentation
   version = "0.5";
 };
 "mdwtools" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "bd78773e42fe20cce637a8fbc7c0e3f4f37ed50810190ffcc035a20c83508b6b7de7f7432b7bba8fbd039ba62f43a5b5e1f4839acb3fe62b425b650f23ff71bd";
   sha512.doc = "06c8619d8bcce2c5cf9f5fce65318521bbb0c2ce53acd6b1793d0fe19a8f7a32c36ff68f355b6809491cec365d09f5f14b0589ddcbea6c5b48900d11fda4867f";
@@ -19452,6 +21640,7 @@ tl: { # no indentation
   version = "1.05.4";
 };
 "media9" = {
+  revision = 53573;
   stripPrefix = 0;
   sha512.run = "087c7f30c59645c06c7c09d9e48294f04a078baa1fd4c955ac4a7fcdfeab6e4ffe71a02c3ad77729bdf7bde16b15c940f38faab6a4a29ff594fd0a3185330e65";
   sha512.doc = "ff27d8f8c4468cf3d6a34b8f9e677ec0b4a9b1765dd3c6d216e2fd2cb0b0fee09ae77c2237d6a236758ea6bb9c6250ffce49c282276301789a8026ca820f56bd";
@@ -19460,12 +21649,14 @@ tl: { # no indentation
   version = "1.05";
 };
 "medstarbeamer" = {
+  revision = 38828;
   stripPrefix = 0;
   sha512.run = "731eb6f78875aa38a90a228626d7cb5b7129c60085418d7ddadff056c9b82f8db95ee17f20ec8cd4611aa90bec391868f6b0b16fa0eae518358a869b576c150b";
   sha512.doc = "1605cf9ac4eba56059b6e90e6a6e7f3cba9a924df1cf3dcfed300e218bbb71d79bd69b47a5e376da209490a8869061d6de8415e1670b4ac5b0fa977f74d7c035";
   hasRunfiles = true;
 };
 "meetingmins" = {
+  revision = 31878;
   stripPrefix = 0;
   sha512.run = "315897eff4ae50257057f8191ff92535b669fb174a2eca5c368a9a4b9f75cd71ad745f3feff1c6863705b3e9e4a954afa449cf56f86bf60c389250842aef5215";
   sha512.doc = "6afbfe02ee39e26e2f38ce462affa66e7e0acf5f26534ff9ace0b26b4e63514a3b1702e34bf478988a50c55fbb09b7d9421a8e79da6a6c46de88c6a958afa874";
@@ -19474,11 +21665,13 @@ tl: { # no indentation
   version = "1.6";
 };
 "memdesign" = {
+  revision = 48664;
   stripPrefix = 0;
   sha512.run = "42949db3193952d1ae75855110ed40a1ff467b3cef0bb6d43195bac960a0873a47fad002695ad1376da2d4a1df5e1e05f89289102780d27b173da2e852b53cdc";
   sha512.doc = "f4dfa00676379ce33857cc0fdeae867d1ae5c99e6767884a029285a94d2197926a68cd85c574bd876a2eeb85f0453520ef5efcb7f2a71a77c725f8066e7adf8d";
 };
 "memexsupp" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "74931ebb1a146edadcde19d8c404ff8df750c4eb8f2f59fa83e6da9f8dc6567005d51f58e4b7bd2cdfa6b960adb072e9fee7b1842142076df88887c3c2b41051";
   sha512.doc = "645bb189fca1c74e249745ad42c470dcd5d9fa4412a6dfefbcb6377555047bdbcf005f1c07977762e0026e8a4f8ea49e6965a7d50b0d5d5e7efd0228ac2141a0";
@@ -19486,6 +21679,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "memoir" = {
+  revision = 52879;
   stripPrefix = 0;
   sha512.run = "675bdbf5fd7843e44f747f720fe5fd85cead9b7179c5e3ca2a0daf14986eae7b57503a7ba6c2046169c3738ef2670aa0b013d8b1e9219834f4a85148107dfdbd";
   sha512.doc = "a1ed8ca63f64e27fedb42c02bbfb920f8a31be0e4eed4f2fcc06c02db74b36b619612e6d721a73b453f82873e6da27065a91ead1444f4892105bf5d9aab87a06";
@@ -19494,6 +21688,7 @@ tl: { # no indentation
   version = "3.7j";
 };
 "memory" = {
+  revision = 30452;
   stripPrefix = 0;
   sha512.run = "9b760613dc36895edf50a592aa5ef994a30117cc9da6ea256835cd3ad9ed62ab8d8c39de95bda5058d1bd3f06451d1c79d78d52ff6d068c28d75410c5ad98516";
   sha512.doc = "479428f1af468d909fa291388cde319aff1ac9ef6d7c0168577c5f6978c0fa7e6b23f8f81dedaf746b7e394c92d51d5799bd17aa3488207be494621b77220cd3";
@@ -19502,6 +21697,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "memorygraphs" = {
+  revision = 49631;
   stripPrefix = 0;
   sha512.run = "e35c7e727cf5d6e496c9c0e52252b5169670006b9bc9e96b1c95584085d57a3f25cb9464bb55fc4138640ebb6fdb079908cc49c0f1bfff130a509b6866d3eec1";
   sha512.doc = "1c04e25d1c16348e594191c17f9f104e9388bb608b10783927ab3412f2f316138d6b41242046f12853b37560873bb61e0a0ec3f884cf8fc26ae2ba5809b094c0";
@@ -19509,18 +21705,21 @@ tl: { # no indentation
   version = "0.1.1";
 };
 "mendex-doc" = {
+  revision = 50268;
   stripPrefix = 0;
   sha512.run = "2a4b24f7340194fa80160681fb038369e45c1e6783765860d3f57be944c4b79533febc82cdbc65f89b9ad99308cb4ecae4baad37205d0f375f244e5211a87df6";
   sha512.doc = "e8c8e773169a262e9f19bb9ab704c05968440aa0ea5928e329c79851e9e23fec5f78a108188fd2512becf7d78ea1e9f388ffa80b0795bbb4ff8cb81893b4e869";
   sha512.source = "b526ed09c503619dc128721e9ae439b89b5b143ae18d388fa387cb7407533e47f0bcaecb6967380f3ebc067f9e310f596f0302fca5438212734730d3ca7931cf";
 };
 "mensa-tex" = {
+  revision = 45997;
   stripPrefix = 0;
   sha512.run = "c453044a7f744cf89605996d0b913c56208f10c46e26e0ba37a85bb1d63ed08426a18d87cc7841aabcf44231c71dc33a5c858de482c6d48759893066168d5fc8";
   sha512.doc = "8297e3f69517f3bace8f509dfb42616e223073f5d428c2269d9dbeeb53579f105fb65755b22ab552e5635f1267e437c4aaeda284a8325b2d95717cf7adc2de01";
   hasRunfiles = true;
 };
 "mentis" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "ee03fae28adbf147945a88548e8223bfe8c8ce220a61726bc6738f34cc90ec776aa468a1cf7fc862d1f7f091cf87964cf665839922819130f3575d56301a5d26";
   sha512.doc = "2e869d1368b807a70f3de5550d2c79f229dbeb8d888a927005fcc43c70644da0ccd36eb2464fa6437c9947c78d59e77c4013824b1e8d5a4bb517b80f1cfb5a8e";
@@ -19529,6 +21728,7 @@ tl: { # no indentation
   version = "1.5";
 };
 "menu" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "2b2560a1df5091d19ff37bcbac1465fbfc54a848e4d19782602d656bf42abe47bd2bb1946f87a127c70725cf508ff9712337f3a8719d1fc0bcd4dab4473c7bc4";
   sha512.doc = "ce8ddeed4e1bd859865f548d8ffc6978a620d9003f908d360e656085f6010a0f179218cc8b2bda4f754685369b53ad59245fef8d8f8a766b241f092162bb76b5";
@@ -19537,6 +21737,7 @@ tl: { # no indentation
   version = "0.994";
 };
 "menukeys" = {
+  revision = 41823;
   stripPrefix = 0;
   sha512.run = "690a07e343a3358179b271fb51b33f6b9dd952fead758405bdbdea9afc8d410d1bc72a15557d90d0699f26dcf7e51a6df3aec1ddb7ca752f5088de46dd5b7711";
   sha512.doc = "4b962d91d637a69f7443fb6ac4a94fe63901a7fe7a2d880eed320314ac6114c341add9e589547649331f123d9bd3af7830c19f83389581a936c67fd0dfc4424f";
@@ -19545,12 +21746,14 @@ tl: { # no indentation
   version = "1.5";
 };
 "merriweather" = {
+  revision = 52380;
   stripPrefix = 0;
   sha512.run = "58f56dded4abe3724411d3c46e338fd5f7fc2c8ef9788939077981503383783b005a7e691478621437b158738129a7dcedaae45b397e1605805beff04437ebbb";
   sha512.doc = "54d8337ab007790d300ec6c9d8c0f24964693863bad3057d1f473225187b7c6b7315c3425fcffff3134cf8fd96d65d6d4311a9f4c6019011fc8c2e11f8ceec76";
   hasRunfiles = true;
 };
 "metafont" = {
+  revision = 53585;
   deps."kpathsea" = tl."kpathsea";
   deps."modes" = tl."modes";
   sha512.run = "35013e0bed6fa909f25ef74210986c3010b0c8de51975895e71c532a64f1d262324cde90f6fb2c956dc8efa454b14c5872bb9b3b91061c31a007dbadbbf59eba";
@@ -19559,11 +21762,13 @@ tl: { # no indentation
   version = "2.7182818";
 };
 "metafont-beginners" = {
+  revision = 29803;
   stripPrefix = 0;
   sha512.run = "39352d8b181f3010fd4dbfbfad18a8cd3f68f0c38bdb89996ea4c77a649acbbd15e9a7fa318193db08733b3722a07a8ebfb17a6430bcc9af8101dc444608d75b";
   sha512.doc = "4fb7148b0668845447fd38411df0288972312a56897b1d5bce69a7e57ae632aacd12c273a911045204705a5534ac1d1c290af08a7057bd62184a59eb7146feb6";
 };
 "metago" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "e7b3661d99ea50f7b20fe3af370e59e960fc0599409b5c11bfc9618c12c38e44b89e4e81d69ae7ba5e2565e46078ee52ed0bef46aa619408b386bb73926caeb7";
   sha512.doc = "8396725c0afc87c63d16256d5ab0d575a19f05d78ed245099a60785f0810a012e8c0026cf13d03781d09d7c0007bb9ed9b87072ed732ba706c893e5465461052";
@@ -19571,6 +21776,7 @@ tl: { # no indentation
   version = "0.9";
 };
 "metalogo" = {
+  revision = 18611;
   stripPrefix = 0;
   sha512.run = "20d5a9b8454166535aa3aa80da7d2931937fc6a4d730c1ab70c856311c223d466e9fce2ed6e3b2fbf4b4fc75778d7d4c2649111df5f92dd58b6fc42b3ec72696";
   sha512.doc = "48318b396e4e227dc1b80e21474a296ba4dfd37e81b95f9669dd8c96ca7318abd8a1e21ceb95e0ca7832ed64a85ede985fae7e2e52b3aa742c64b86e54fc563c";
@@ -19579,6 +21785,7 @@ tl: { # no indentation
   version = "0.12";
 };
 "metalogox" = {
+  revision = 49774;
   stripPrefix = 0;
   sha512.run = "d2f6bb89071ae56b0083e5b38a629e6089d5d2c73fc9206181b2aa3071e0a4a350a3f5266997063a011d41e4d369745ec5f246d8f3b723c00c8dfa84452e7cea";
   sha512.doc = "d55aa00226b6c7773cb275d33ed698e2617b82af5a2b060b58af7468e8be2d9c65bb8b052b66c28a94551fd51867a34e2c6b9d0147161e3df9cd05a03567a59f";
@@ -19587,6 +21794,7 @@ tl: { # no indentation
   version = "1.00";
 };
 "metaobj" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "cf587c174e44da9496ece876bfcb8330bc52173cc3bd6d1b1351efc75a7c333ed8c7cbd41c079d492947a1ee43d8043fabebc80b4c7a5d348eb054e82c704e3b";
   sha512.doc = "0bfe1fa6a4b3a8923cfbe9bdc4fa1b27567df66365db447346fdcc739675d1d815515e09fbe96f44369643c38e6a8007a0f8d089ed8504020fe0a0e2a795ea9a";
@@ -19594,6 +21802,7 @@ tl: { # no indentation
   version = "0.93";
 };
 "metaplot" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "eb083316720a5d7379c0ef7c1afa0e82ea5df63a3a98200b7041637a6fa47aa33dc20a265e05bdbc63abfc375e6b59fa199d4091875c057a044821c557963dab";
   sha512.doc = "1732b5a572a3d4c0a646308d3c102be29de845030a624763dd6075a44a739a29e65fd9f224229eed6dbe8dfc6b590a3df1cc07c184881dcd2f3dc5b0642a48dd";
@@ -19601,23 +21810,27 @@ tl: { # no indentation
   version = "0.91";
 };
 "metapost" = {
+  revision = 51290;
   deps."kpathsea" = tl."kpathsea";
   sha512.run = "a22902373feb03ba91fedd50274fc110bfbc5d53a016d18a5ffea87946db7f534f0d68c50aa28292ce0a8ecec4808541fcbb4ba94ca3a1db52232c59883bac65";
   sha512.doc = "ad46b27fdafccf2b6699dd64aca10a7f94916719d13a10bea0c3359577cbaf66324084777400c7c8ea531d911f0529bf7be1f95cb80d187d9b1a2b97a5077853";
   hasRunfiles = true;
 };
 "metapost-colorbrewer" = {
+  revision = 48753;
   stripPrefix = 0;
   sha512.run = "e59dd121f9a176e628697e31b720507723867a0b7b68b73531aa825bb02b07d04ff705bdfbeb369fe3a2d304f4c6c5aad3f823aaa4c82257540f1459cf099cb1";
   sha512.doc = "59f17d78ef78a142bde5783996f149b3a7c740c2b3ec6f90133115ebddcf6c460dada543482f5379872054a74eb772bab8afd96fa48b2484f7932a478b8bde2d";
   hasRunfiles = true;
 };
 "metapost-examples" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "95942b1b110e65274839ba01c16fed3e63a0ac99aa564d7a000bc9d9a0f5625ddc1dca13e786d0721bf93e76410722d4d76c86a05297bc39cd9af6dc91c2e6f8";
   sha512.doc = "2a3aec80b511864878e07ff973e17ed4fe1aec692c7e6983b57dde586aa19500cdd373687b0e081dc80c8584f116f0fa3de7ed4f09ba232eee8adce5e998c954";
 };
 "metastr" = {
+  revision = 53700;
   stripPrefix = 0;
   sha512.run = "c7a99993dbc27d883a8d1dc6e1c95b64db6b173b534773c28906966aef4f1036f27142fc04e927a370acccd02f16d139ee10f0cbdc649bbe49474c475293dbdb";
   sha512.doc = "fccdb834bd22eb214eab42fe18afa3b7106099e3e589f3c685a0fb36c2226bcdd73ef5ca46ae48bc692e9d7b5868b8b8c263c3b02c796688466b7a54905b451c";
@@ -19626,6 +21839,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "metatex" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "8d438cf0f3bd375c169681b242b7f00dca96cd3bcfb167c6aa664e27dba59eefb53a6d28ef537802d584b17bc578b1d63ca25799146ee6d986bc647ae1b0af2d";
   sha512.doc = "3c2918a3bbb30b4abe2395baf32ed2fd5fb1ce3541f86250f0c4037aeb127fe7e90cfced87144d564813a437b39b184503ea9a2c0c61b979907db74d91860677";
@@ -19633,12 +21847,14 @@ tl: { # no indentation
   version = "1.1";
 };
 "metatype1" = {
+  revision = 37105;
   stripPrefix = 0;
   sha512.run = "1dc34e3f826ebf09c6f3baf358aa0e5ee4ecbe86e2f82a7da12c706f443f5eba7fd8582bf46612b2fa3588515dac34c49d47cfa2b9c3ae905cc51dbe7779eb28";
   sha512.source = "26f891bb5a62da78763df29f1d9caf26588c6dff57e063eb445ae23a5dfd7108956068de991bbb514ee394c49d4ad119d4a0fdb5398aad48d9be223b8f13d388";
   version = "0.56";
 };
 "metauml" = {
+  revision = 49923;
   stripPrefix = 0;
   sha512.run = "96773f0d0e2788d13738930fa1aa727c7ca2edee020f3848326d7be3533c177ac977564aed533c59695b1e6c4c65e191784cbc3e7e70becdd651cd702b462ef5";
   sha512.doc = "6c649c32111a6350d36c69405fc272a917144be429bd84c0f118a74e1232c06744e66fb6647c5a742f58c6c78b46830a1484bbed3a9a962380ece6b16c555169";
@@ -19646,6 +21862,7 @@ tl: { # no indentation
   version = "0.2.6";
 };
 "method" = {
+  revision = 17485;
   stripPrefix = 0;
   sha512.run = "9b71ed52073f831431ef6a3a81afe7efac97a6dd39d772b8f48cfa639dfec01411a5654830fcbaef6a3bef7aeb718bbbc38cbd18c592a080e67175dabc7e9919";
   sha512.doc = "2a211d1325322bfaf57c81a534f29fde51ef2e0dad8d7697c3af9fe10745c5f6245bb689b65d54c39a66b34ccec69d055f201aba34b2a4957ce2fea0827eab45";
@@ -19654,6 +21871,7 @@ tl: { # no indentation
   version = "2.0b";
 };
 "metre" = {
+  revision = 18489;
   stripPrefix = 0;
   sha512.run = "29d99fe061c828b4eef12047215451eaf6d603106b0ebb0b7c83c8f8b5ffd360160e29a0c86bc0cd329e6f694efae695ef03282885e872cf26c8177f951b705b";
   sha512.doc = "73ca10e1d2b32d4f7b37de6c409b68dc38b3dd165f47f52714c3a17e7a5dc6c1562928e7a7f8c5a3ed9aadfe1324e451baf6cda5dce69043fef3811cb6ff8cf7";
@@ -19662,6 +21880,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "metrix" = {
+  revision = 52323;
   stripPrefix = 0;
   sha512.run = "00cbb4d0cd9417c57ae2cf701f0a485d296e17b95eb56a7a3b0acf328c4eadf3d8ddb7d4c3442ea26ef019dd4a6b5c95af9f718cd4e31b5e5d29301ce8e82edc";
   sha512.doc = "e5f8654272e8a85366c226113d3815ffb1e539237bdace71da55e30864f8c746162ce1b3f3023e3e62616b286145157816aedc871c6c42dcd3d4b76092d8ea46";
@@ -19670,6 +21889,7 @@ tl: { # no indentation
   version = "1.5";
 };
 "mex" = {
+  revision = 45678;
   deps."pl" = tl."pl";
   deps."hyphen-polish" = tl."hyphen-polish";
   deps."pdftex" = tl."pdftex";
@@ -19687,12 +21907,14 @@ tl: { # no indentation
   version = "1.05";
 };
 "mf2pt1" = {
+  revision = 33802;
   sha512.run = "87a90bdf45883da1291d8ef5a21e6f7fa51480f9933b92ad4a87384037de991ce36b47c238f822d466238f4bca6aa41a123c76a34f9f6efc2e43a2104f85182e";
   sha512.doc = "8e672808d60133e8a06bfd7350b1f9f5a4b1e706e565382b015f8eb9dbdb6da246b12815388f445fec87e63305381717d817c1eaae7762fd7b8043c89e1f2401";
   hasRunfiles = true;
   version = "2.5a";
 };
 "mfirstuc" = {
+  revision = 45803;
   stripPrefix = 0;
   sha512.run = "de7ca64b5a32f697ec1efb477c2230ac418799e72f298ee6ac80409952affb35ef6152fb366e822ba1b01e39afe4483d5437c4e9aa22130a90bef79f87ab77a5";
   sha512.doc = "1a2705a13325a97199095fbdb900b94e94f308311d7609ddfbb75efb7afeb1a2634a0f543da517a03d68e974d2b917f94a1b6a7b3d31965d7087ac585b6b0df5";
@@ -19701,6 +21923,7 @@ tl: { # no indentation
   version = "2.06";
 };
 "mflogo" = {
+  revision = 42428;
   stripPrefix = 0;
   sha512.run = "a1c5168e37fd9cbe5fc2714ee43143f36cec662441a7a9d33085652a5d6f769838d351faf416df6fda78529b5f8712f1a056afa47577fe925dcca5249f1fda38";
   sha512.doc = "6d1dabc636d22c824838a82da83a4676b20bb8a55dd1ab5628d00b4543096f91d234a51a312eb83544891910d923650f09e8911ec9db668f411735de6ef5bf3f";
@@ -19709,6 +21932,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "mflogo-font" = {
+  revision = 36898;
   stripPrefix = 0;
   sha512.run = "8be2b2456a14bc9a8a741a11b033a844bf529b511eb1173887eefab646922a37b82b5847cf94331ad34ad19bf6c75629687a7e490dc57e7ab7be473f751945b3";
   sha512.doc = "aec625435ec638a6c36b7303d9fa81681f355460392f42d78cd820d98f7b6489b978980ada6962db5c1143057133d32fc7f314dbd60f606db4b69209de5626d2";
@@ -19716,12 +21940,14 @@ tl: { # no indentation
   version = "1.002";
 };
 "mflua" = {
+  revision = 53322;
   deps."metafont" = tl."metafont";
   deps."luatex" = tl."luatex";
   sha512.run = "d7e7707c9c44f0e744326afcb58e3cb5f71451530503c0b09940db3d5d29d6d0d6e0b3b258dfc6a85d8698afd85a61c196c0f9d47ed804b7b2b12c94a1e229b4";
   hasRunfiles = true;
 };
 "mfnfss" = {
+  revision = 46036;
   stripPrefix = 0;
   sha512.run = "33206fb4cb7ce8f18050d713be415abb95323599270b2b91c886e2ac3f24a58786a480e5d4d1ad6ad2083456231eacf94dc769b26e6cae7288e996c6e14bea29";
   sha512.doc = "f8421e58ede77c8817679fcdcb43fecfc519427b3cb93ed2594fef5c8ac8124e0563a2182803a2a6bc417982df298abc7fe092f1cae5ed7583e2fa6fe94c8345";
@@ -19729,6 +21955,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "mfpic" = {
+  revision = 28444;
   stripPrefix = 0;
   sha512.run = "361983a020165d094bcd0fc9616be74bd2b5c72542b1e1b257b5ec42ac6be1175caf59c79e156da2bf6fecfe3746b4e33a4a8fc978eb124939ce0ffd2c383081";
   sha512.doc = "97ec26cc1ed8e181c7d69af264204772c9075e3650044b58cad938fd6918f9cbf5c849699e31846f437e41410492b67668a7ec33e848cf6b5fb9c2d52d7a7947";
@@ -19737,6 +21964,7 @@ tl: { # no indentation
   version = "1.10";
 };
 "mfpic4ode" = {
+  revision = 17745;
   stripPrefix = 0;
   sha512.run = "4f3a314afb6b1f8c4fb07421244f2a05747f5d24194659053c561ba24ed90f325e82ab9d97981af6455081580f75e9e8f75d11f06aef9e1c027ed0f9bf17696b";
   sha512.doc = "9d5f38873cd94fc3248b619f68e04bdb1824eb1249cf02e555a60c3e84dcab78d3e04f9451e1803943e898ed7f55e33615f673da8c58569219650976c25f0ae4";
@@ -19745,6 +21973,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "mftinc" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "64fa5f38398a626d5a351be7ad866c75feb4549f836932dc936cb99f921e7b8abe5b3d6fc1e1e6c427344606ee5dacaf067d8678e7b199fa1ff8d5c94cbffa49";
   sha512.doc = "0846744cfd86bbcd8b6ad90d58bfe5788a79f43d05f3cf6f438fdef50cc4872ad8ec4d32005ced9ea9c424f3e86a799d79b0baf2a9544a3018531a99cd81fd5e";
@@ -19753,11 +21982,13 @@ tl: { # no indentation
   version = "1.0a";
 };
 "mfware" = {
+  revision = 50602;
   sha512.run = "9379a31291d572743dd3d8f82e32e7057d686ef12d321e1f4c179df1d9d64116a61c7741b2be5b08a0f396e69b6c567e40cfb66141dae7a95ae3910366214a37";
   sha512.doc = "f22a628dfe7d1566efa13502f38ac399e17bd90fd274a0fe4fba98de25bd24b6a3526bc0124e24277979ca42af8c01898f71e9bd9e1027a899b12c74c6ac205e";
   hasRunfiles = true;
 };
 "mgltex" = {
+  revision = 41676;
   stripPrefix = 0;
   sha512.run = "f9d98f3e964ecefaf420ecdbdf7187300613bd22df092714ba5b5e945b47c2b24b95dbdb22abb92725a7fdc1ca1fcc88cd14cef1cd1f241c02ce26328951d751";
   sha512.doc = "3a987e0ac6ad678887e9a2aabb18d772a3bbe4d1d10d53184887f95191961b692d231c1a7942c3383a5468098432807030a0d3877c5f3b0e271d8b7efb1366df";
@@ -19766,6 +21997,7 @@ tl: { # no indentation
   version = "4.2";
 };
 "mhchem" = {
+  revision = 52662;
   stripPrefix = 0;
   deps."amsmath" = tl."amsmath";
   deps."chemgreek" = tl."chemgreek";
@@ -19778,6 +22010,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "mhequ" = {
+  revision = 38224;
   stripPrefix = 0;
   sha512.run = "90f7dabe6486f6566ad6f835838ddf58a6568364ca2b5a82ea9cb96f283c5025c1f93fb50bac98405e8200de32b2c27e592e401a44fab691331fe4f77d27a202";
   sha512.doc = "0d7a258a96604328231c1784f218ef3351f9ef02a0a9a9da42db36c89324ab5f74559f3ea91c12553ec5a39d14b3a5f282f61ab9e001994e22e266ce394df26c";
@@ -19785,6 +22018,7 @@ tl: { # no indentation
   version = "1.7";
 };
 "mi-solns" = {
+  revision = 49651;
   stripPrefix = 0;
   sha512.run = "ac5beb872c78675bc9df379f8a2afe533647a1c39781c57fed2cec6e610cafbbb45a4fdcbd9826cb123a584e121ff752633d6c990109bb1f619b1d9fac6906de";
   sha512.doc = "cfd36e0a1476e0d148fb36f350ec236d57beb2c0b27f08eb56f69683790b16425a6f95b4f93a010fe0d450863fb34a7eb31b1c8e40fbe5319df128439dfa5372";
@@ -19793,6 +22027,7 @@ tl: { # no indentation
   version = "0.6";
 };
 "miama" = {
+  revision = 51395;
   stripPrefix = 0;
   sha512.run = "f7a23b5d536b8fcdbab50eb86727a3e2b88c079f3e0a137220459522e4c939910f9a06ca55e944c1e9cc65301836aacd45aaaf8048d35397b3919220afe8ec95";
   sha512.doc = "415233ee772f2c1758f1a980c5a7d320735125819c5c7ccdf2d4a21a2c02ca20dd741d64fd3b3fa5dfd8e0f0b69e8b669a319745f30b179ec345ec4ef014bca4";
@@ -19801,6 +22036,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "microtype" = {
+  revision = 52853;
   stripPrefix = 0;
   sha512.run = "eba24c7a1e0f18e5d559d559745cecc9398630e4491b5c71f695e0e6893e74a87171e6cddaca8345e99ddb63558ad2a712822819c17fe1c20684e043adde4fdf";
   sha512.doc = "b0222af67733ff7e11717388d10e0b57fbeca805c85844360ce70bfc3b5d0c18157a12fb40156edddc263b8970c9b172d3fd4a1210450efc250aa05334d2c5b7";
@@ -19809,18 +22045,21 @@ tl: { # no indentation
   version = "2.7d";
 };
 "microtype-de" = {
+  revision = 24549;
   stripPrefix = 0;
   sha512.run = "bd9b7ad26bf0d4125d1631a377328d934e6fb8b619e7040f6644a6df70bd43cfb8a93e8ce6b49afb90d824b73302d063bb23e67fa172d635e952b035510dd6f5";
   sha512.doc = "1024c46f6b7dfdf4aae45090533087d1cb495d737856fdbd9691e7cbf489c19ce229d35ad55237e30998f154c9ef524c78068d338c236634df8922d50ae4fc17";
   version = "2.4";
 };
 "midnight" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "8f8bf1d8d3c5c12147dd61a4d65d311552877a9f5eb7ebcce71602dc69ed5459187134d3a1e346a15255f2c4ba57f054c3d020817df0d5d89c7fc2f216b19cc3";
   sha512.doc = "0c594cac3c7e8d3064145f1b2b088d74a5445b7a7506fc2629b3df6f63419b025779e348116f7dbc859d7c406d87e5b5988d529e5da61d01b0759b0f0fec2382";
   hasRunfiles = true;
 };
 "midpage" = {
+  revision = 17484;
   stripPrefix = 0;
   sha512.run = "9a13760b776cdce28cf3eb1e28e957265d7d4e83b23234f1590285bc83409f1d5b09040fc6cacd3b9f7a5ec2f61a4e5431fea92a5fcf20032c7bb919ed59612b";
   sha512.doc = "25f41bb8cb12c6d310da66d36032eb4933248f0c84a67216cd0981fda7e61343c0dee03e96f522bddf969e925e6cf495754e52e863672f1cab4e94ae3b0400cd";
@@ -19828,6 +22067,7 @@ tl: { # no indentation
   version = "1.1a";
 };
 "miller" = {
+  revision = 18789;
   stripPrefix = 0;
   sha512.run = "a1415d82a2a81c3dccdea1b59c4c0e8d2cb3902dbc6816cf7615fa3e571de26168a6a066f52bad94c38595102afcd1447721095bd084befc20b3fb3ad420e129";
   sha512.doc = "3f888fed2b909c269ead9e5191a788828048a21103c881a9b769fb0e8a3c0f3e6c41467827143f6b79a45d2497e3ac21d5c6da8727be3c987ab8a1fdbcec59ca";
@@ -19836,6 +22076,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "milog" = {
+  revision = 41610;
   stripPrefix = 0;
   sha512.run = "126942c7be2217843d5dd0a6a927d1a47537ced3b1a083caa54b4905625b57238cc0a3a8d1652da076144b8c2469f418077eb4051527e5d351c2d95f3d3a5f79";
   sha512.doc = "251b73ab0f52ff2672733c3855289e012965151e07ff447da373bea083b1ff6bfeff38adef72419f03ca153545fdb90bb18f3aa254fa7b59d3c5c061ec5d15ea";
@@ -19843,6 +22084,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "milsymb" = {
+  revision = 51566;
   stripPrefix = 0;
   sha512.run = "45e601def6cd11cd58f0d30e39f243a48be800861b0c1c787c393f39d5620e53ff43759e31e87e20aee80dabfb96da5bd5f2349b83fe2c4f0b82455e461986ee";
   sha512.doc = "12550ee788252597671d8f19f5fdf412999ec80d3319dfc92f48be5800dc9882b57a98ef898c79d5e22f333528a0db248edb7798ec28a9e41c9d2542dbe1cc62";
@@ -19850,6 +22092,7 @@ tl: { # no indentation
   version = "1.01";
 };
 "minibox" = {
+  revision = 30914;
   stripPrefix = 0;
   sha512.run = "18d409728f57cc2e423b5c74ad7ff4a9e93f2405497a96024769fb01f7604e019d914365f82fa5908bb679ce4a48cab64fd4435b531ef72235067481b8dbc96b";
   sha512.doc = "0404b375fb0ef258d0e5acb8e7a78a60a55d08ce7339b9b63b1711dcc6d40b6f302b0f35f7d1fc8bfbf431b66bb5aaa2c94e92ee8e788a5f2156031425c0c4a3";
@@ -19858,6 +22101,7 @@ tl: { # no indentation
   version = "0.2a";
 };
 "minidocument" = {
+  revision = 43752;
   stripPrefix = 0;
   sha512.run = "33a7938dc25833faef05245d00219ad4d94902d1b5a8f63de8c08448da1f4ddd8e305cd261a3051df919b097f0b3b82081b57fa420e773dc89a1c8cb801ba463";
   sha512.doc = "03ac398f6f8e79003b155434992a53b1485032ef779e5fa05a43adf7528fec1966ba94731ab2fc11cdfadce51bfca6ca9d1a88f882ca87f08d8e4077896af4c3";
@@ -19866,6 +22110,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "minifp" = {
+  revision = 32559;
   stripPrefix = 0;
   sha512.run = "412bbd3466eee82a99b43d6f4a5998a0a22b20c2d51621368ecba1084010a5333bda9e221b07dcfc6ddea8810edd0dcf60c2be6f926ca0da33071e6a812108d9";
   sha512.doc = "56e1b71f8289c126df12091cf155c8c05f05a391abd40ff6ce0b84bb7620630a80747e23c25bbb4276aa5d110314076f61da72683b6846a44a53ad3515b91670";
@@ -19874,6 +22119,7 @@ tl: { # no indentation
   version = "0.96";
 };
 "minipage-marginpar" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "acf33aac7dea3c20986a9ed1f76efbb470d9fa1cbd31f29ed4fddd0e16835ace1946278fcfd04ea179122e603f63b269872953e40f8a64843ae8e60ded769356";
   sha512.doc = "20d503697a246b8b56a71cf324e4daaec436b62e9c3b9556095670c2b461d273e8b77e24da3cada37106c350304827a37bd6f658727373e384f11fe064e07992";
@@ -19882,12 +22128,14 @@ tl: { # no indentation
   version = "0.2";
 };
 "miniplot" = {
+  revision = 17483;
   stripPrefix = 0;
   sha512.run = "2c5d08c2476871dd182bb320c50ec96f202ef65a417e65d1de8aec391fb60dc66c1e9e4642ad2207f7f4bfdd12e83bfe2cf75e9fa4f0fff0f4ee72769f7ca84f";
   sha512.doc = "6ae8000b3d0ef50e37dfbda399396a42bd348d6ed9ee485ff01ded9d850693f43b0c1945dfde93d9ea0f17494ac2e03391824f2f0c0eff67355c3d3f3ad6cccf";
   hasRunfiles = true;
 };
 "minitoc" = {
+  revision = 48196;
   stripPrefix = 0;
   sha512.run = "c5af65f4c1d7c19ac5bca84a6a8b465a6d00805164e0224ad3adfa473dbff8604d1ec39958568b3ab611364bf09aa671d277a7458595eac130b121b0972ee32c";
   sha512.doc = "c193a77791f3304b09ae58faf19490bd68bf129c8ec435c378d3ebce6ecb47c284ab1e1412d10e43dd2e4d5ef60a9fc26088d8c35054f6099fa2675076adb6ce";
@@ -19895,6 +22143,7 @@ tl: { # no indentation
   version = "62";
 };
 "minorrevision" = {
+  revision = 32165;
   stripPrefix = 0;
   sha512.run = "d76224254aa18dd80f9bab56f055fde5bb7ee6b5c3dd88e6ce19667c939fb2dbd1e5cb987522a3f1c50082f46ee20cf918f1e01fb00f588ce11d30d300fcf574";
   sha512.doc = "ab1484f7ec214d43b95a8bd5cd78ee28bf0055d99d8c63c424c5c1db1c77b41a8631ea35bef745ab0399dd1c8dd9c9ab66b60033bb151f46afb023b6b5e1ab44";
@@ -19902,6 +22151,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "minted" = {
+  revision = 44855;
   stripPrefix = 0;
   sha512.run = "5923b5e87e8bb2cf148a480035b906aab4b03b903308e8e9609f98376f82e23fedd529abca37bb4e9211719160abd9d4488f5c73a0283f67c7f11ee3e1f1d5fb";
   sha512.doc = "0187a04f9e42c1bf3e5d961c28b977e527dfc1b57c0f823eda047d5e6c888f3f8da1fed691c8e3128d09b3740deb1b324baa607b9abc20a4fe47ea0a29915e90";
@@ -19910,12 +22160,14 @@ tl: { # no indentation
   version = "2.5";
 };
 "mintspirit" = {
+  revision = 32069;
   stripPrefix = 0;
   sha512.run = "0155fde1eddb9558959c260334ab1d5489ca5415b1f7afb687308feb67f6951932bdfcc2e59e6cd3a4b34449f129dc1eb53730b75d60347bf7e2647a18cbadb1";
   sha512.doc = "54211f0e40fcd0e3c248be16b647462cbe3e3953fbc6ab050634e6a9455b5d52157b77a49fa96c707e3a65c088a92e7e24e86359cfdfa141d48a0ba5b2bfb682";
   hasRunfiles = true;
 };
 "minutes" = {
+  revision = 42186;
   stripPrefix = 0;
   sha512.run = "3abd6c4963ceec3cf073048c21d2abc236d58f522000195fd459c554c10d2af9afaf772b0fd1545fdf72decbc7e1c62a0bb12d7bc1dfd9d5b025f5131ca5f145";
   sha512.doc = "a069ea537eb1fc572c842a26dd406b1ef2f1343ef6066d266642dfe37515a3679c3a9e64eb37e1e992fc40281d855b817edf9116aae3922abc60e3c01106e3da";
@@ -19924,6 +22176,7 @@ tl: { # no indentation
   version = "1.8f";
 };
 "mismath" = {
+  revision = 53245;
   stripPrefix = 0;
   sha512.run = "0bf6eea83401374473c001b3ec6a39c70d14551983a89fafdab854b12000d7806b76bbf10fd3fc393d5e7bee0880bb9fff9087da274b643a1123c128d708e22c";
   sha512.doc = "359a86cc49554c0efbb932b0cc8e7698582b01fdd7935d88d50a754d91bbc7bd8d69ab3cbb18a81ce89c3614fa5a22ff27bcdacecaee1dce3adf35be9dd119d3";
@@ -19932,6 +22185,7 @@ tl: { # no indentation
   version = "1.7";
 };
 "missaali" = {
+  revision = 42810;
   stripPrefix = 0;
   sha512.run = "d16285296232f45ba3eef2e427ecac59b248f9788abd5b2e9b9007f2013bcc52ceb482063290e3ebe6ea625adefdd05b5948546e0a4c17377a6e4de30ecca041";
   sha512.doc = "c786638ba6c5d03395e8efdcc1295ec7b7470daa058b7bdaff4452e4524cc2467606bd7eea5591826c8aa50ed22baecd18319dfdb28bcaed6d2afce176e984a1";
@@ -19939,12 +22193,14 @@ tl: { # no indentation
   version = "1.004";
 };
 "mkgrkindex" = {
+  revision = 26313;
   sha512.run = "bbb0b306f30b4fe898f5d5bfdcb1eaa4d2d88a95cfa1ea0da51957aad1de028928562c930180f6c0a7d66b5cdfd804d52afbd229e7ca43173477a229cefff192";
   sha512.doc = "5a5b14d4282e97420f796456155a71c23a44d4197d4d92bfea1f0f20e95b42e506c7be3f2b0aba37508415341e999522bd823c649cc6259a6e26d42399c6b8cf";
   hasRunfiles = true;
   version = "2.0";
 };
 "mkjobtexmf" = {
+  revision = 29725;
   sha512.run = "c0dffdb276141b78bd2c47e6d2bfddcd13c1800d3a0806a05ca1fba72a91621364b827801430bc757601e07f2a5130366ade49d7ac1df27901fbec29827739c3";
   sha512.doc = "3ef5c333cedd5104b63c1457fff2eee40aea7d1f1b187d34ce4cfccd5b6bd38809b7686dc7b41a147fbee2ae0e951470f3ae574bd3c10a5f9b6fb76b686ce4f5";
   sha512.source = "7f9de9bafb890d12ef2f07d3b8596dc31c4bb97079f826c9efd4f318383f64d8250099a937d8d692fecf703e626b42f942962f4d906e705cf4b0155e354bff0f";
@@ -19952,6 +22208,7 @@ tl: { # no indentation
   version = "0.8";
 };
 "mkpattern" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "0395c9258e6c4a8459e69ff2fbdfe511b0c6863e02333d9481a8a1e82362cf9e1be7e89e7447bda497e7ed2bc18e1986e0a5461e9f49c63ff869f39a4da4f007";
   sha512.doc = "8232866143444fab1ed1f15255dc5f8c1c5050812e2882d2e20636bfd300216815a53aa03cd4f69ed7f45aab255a8efae9bfdc10df6b7a246d36d4db075204ef";
@@ -19959,18 +22216,21 @@ tl: { # no indentation
   version = "1.2";
 };
 "mkpic" = {
+  revision = 33700;
   sha512.run = "7814f14293e10a23bc9348dcaea9af326ab4dd93cc55865320706984e50883742381b5df3e77774e7a63fbba7ebcbe0fae7268a3d1a34ebb2d8a0303f5b53034";
   sha512.doc = "bfaf4232fc39c13fefd86c21b2f9f76cd93761c58e39c1420c601627e95adf9e6c5c06db73a0afda6621acef374089dd93afbd2a3bd761cf5aa8db29883375e2";
   hasRunfiles = true;
   version = "1.02";
 };
 "mla-paper" = {
+  revision = 20885;
   stripPrefix = 0;
   sha512.run = "01e6bcd07d5dc7ead0ddb4f5d8ad537738bf0b863d2b43f04f0136a33627941b377e53d29808cd284dee3601bc7839c3f0697178ca586578207f9efb60a6f70c";
   sha512.doc = "1367bb1bc5dd62faa89294141b74c7d2c9f5fd0acbfc37285421f9ff514ab67201de9c6a9070c5aeec396f0923afc8e10c5ec307fe89ad016ac167f33247154e";
   hasRunfiles = true;
 };
 "mlacls" = {
+  revision = 51865;
   stripPrefix = 0;
   sha512.run = "14397d8a4afa0cb4aad0749dd4d4e32c6384d8cc40d302504783ddf86756c65abef878fc7bfcffc150fd5b73c701c6d79a8f5a5a085a7bac00645bfa1b997c30";
   sha512.doc = "fb0c75e2f3a8f9f543af670309ec035e3f539cd642a8d829b88a733c5fc7656b86947c6b56d36dd8b17942f72b4023fd20b21a0415aeacde878b95e6675132dd";
@@ -19979,6 +22239,7 @@ tl: { # no indentation
   version = "0.6";
 };
 "mleftright" = {
+  revision = 53021;
   stripPrefix = 0;
   sha512.run = "d1423d7e794ff011e6bf436d85bc3d2d933263bee059cac910e1a3375140d0eb0f1682e38c675afe17607d71d253b656a81cc927d22f54a8add2df01571a5e95";
   sha512.doc = "193d3fa473d136c11ad8a1b4f707d286cb0243bd32c020c1c5343c23a5d6347c2ba2ccc5c11e5bf835b4666c8e4a0ca2d234661e155c0f5fdc32e7b85cf2d253";
@@ -19987,6 +22248,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "mlist" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "23466ef3b73d8476c69632fe0c701f3ec675250b534fb4451cb0dcaf93c30a649ca07bb58cfbac89054cc31cc1219daaa1e7f746e6689927573175d42f78bfc0";
   sha512.doc = "771f51f52e47aceb7da064a0bf8ba4b19f0255fbd14d3b6d301457ad0dea80836f3e4c449611f5574c12e87185ab5ac9668404c5f1f97100971293425c7ecd13";
@@ -19995,6 +22257,7 @@ tl: { # no indentation
   version = "0.6a";
 };
 "mltex" = {
+  revision = 53786;
   deps."latex" = tl."latex";
   deps."cm" = tl."cm";
   deps."hyphen-base" = tl."hyphen-base";
@@ -20012,6 +22275,7 @@ tl: { # no indentation
   version = "2.2";
 };
 "mmap" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "a2427b9863ef37385507783dba7bdfd65bf022d1c7322e7560b78222c3d4e0ddfccfc70aa927196e64ca1a520e985eea8cb78a4129a39e73a8410bc210b801bb";
   sha512.doc = "95a71c9a9b9cd46c1723c986ba41c29a7204fada2cd7bdd14ebfe5e0c4e1b06106f9c13469edd9caf0b94615bfbea9cc8a1f56a4f83cec37de481b39d2b4bd91";
@@ -20019,6 +22283,7 @@ tl: { # no indentation
   version = "1.03";
 };
 "mnotes" = {
+  revision = 35521;
   stripPrefix = 0;
   sha512.run = "f95e4cbe33ec00e62aab2b3b9cdddaeceb762ccc34b736b8e2c0d658b3e871134d0a0b8805470f8c4e148057c513dad9cbbf6c1d5076843b2b2fdce03c84dd09";
   sha512.doc = "58c3d8def0ee368f1cb87567aab160b4af10de7137de1901f4c6428531f1d080146ee5cb7f0be73a09216d0aa5580bf4baa8cbcca4c7801a322731f88cadf2ec";
@@ -20027,6 +22292,7 @@ tl: { # no indentation
   version = "0.8";
 };
 "mnras" = {
+  revision = 37579;
   stripPrefix = 0;
   sha512.run = "8c8c49846a2bac72383b0481b0da0cbfeb67bcb0787815d3509e4b55bf5afda5f3aa74f44d03267891b42b609b1a10b1e1577a02e9a3e4c8d9cd5ec57585e9bf";
   sha512.doc = "e90ce259881ebc34dce52eeef5b6eeefe1659a3e8b4ff5a749604d5f3061d38e1cb749d8dadce757a173c1174fdbc9bb3b272ff1bc344a55ec2dbe946e90cdb2";
@@ -20034,6 +22300,7 @@ tl: { # no indentation
   version = "3.0";
 };
 "mnsymbol" = {
+  revision = 18651;
   stripPrefix = 0;
   sha512.run = "68df6dcaca1d2f3b743c62e205a22427152ec6ac1deaa126e7511842ad7817ba4a7a232b72b45c6dae88d930837f46597c5f89e50b1057ba313a590157342ff5";
   sha512.doc = "bf06a1534665ad50d33073e5d7332337c05f5d5315ba41af399f73f98d54b22a0610c65fa0e96b311925f40bebc1458fd0f0fa9c5fb41330f6d0b9b49aa12aba";
@@ -20042,6 +22309,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "modeles-factures-belges-assocs" = {
+  revision = 50010;
   stripPrefix = 0;
   sha512.run = "870cd893fbb3bd36d9af8a35487fb47f9afeee75c6093fe3fe9167c4db4f0365499e0fd87b4b3debb0212076d1248902014fa374df3fca79108965bf0c3bb07b";
   sha512.doc = "f879904a96322990beafd7e444040b11fb9d69e93d73df5e5a159d70fd8e033d9a137e1bb4c54e4bbc4f8e5b04151336bed77aab0b46fcbeb531b346855df920";
@@ -20049,6 +22317,7 @@ tl: { # no indentation
   version = "1.0.1";
 };
 "moderncv" = {
+  revision = 52669;
   stripPrefix = 0;
   deps."etoolbox" = tl."etoolbox";
   deps."fancyhdr" = tl."fancyhdr";
@@ -20066,6 +22335,7 @@ tl: { # no indentation
   version = "2.0.0";
 };
 "modernposter" = {
+  revision = 47269;
   stripPrefix = 0;
   sha512.run = "d631f058a0a17a841d4026c43fd086cbefd50d0ece85563ee81e34440650bdd7d3db6dd6f49d5e74278872961300bbd443b896586f5c7ea00a9ff816ef20b7a9";
   sha512.doc = "385c8b97c57053d861d72b4f10134cbf2d943e4bcedb55ec42bff51000843db3fe30737f7ada3ce569c1d96584ec0df80afadc39be98c16950828647165f6801";
@@ -20073,6 +22343,7 @@ tl: { # no indentation
   version = "1.03.1";
 };
 "moderntimeline" = {
+  revision = 50228;
   stripPrefix = 0;
   sha512.run = "a38ab33c0ad2384699954688bed05d9ece3ba54107c962dd5e76fcb586699887ad5553dd12f801553ffab5e7a459cda9a9178c0d37d6eae3796766fed428058f";
   sha512.doc = "dd5f43c4287f5a5a23366c3cb982afdbf3385da2c19967e3a77ab42476536d2ba44887fe5fa657f18285448b0d7d3ef99b6f7003328924967529478e174625d7";
@@ -20081,6 +22352,7 @@ tl: { # no indentation
   version = "0.10";
 };
 "modes" = {
+  revision = 53604;
   stripPrefix = 0;
   sha512.run = "85e7cfb20a26d64f007def1edf1353b225dbb1bfcd4398d74727a02b345c35aadb486e45c526202c28d6617ad079de57811fcc6dca1210eacb76df7a7abe7add";
   sha512.doc = "4e6e9cf770c72177b729812469cd25f11967cfc90eaf7557d182409f8f1ca1f438bdaaa20a8935fcbdaf69ad2b7c60e55c00c76a3f506fbfaffb5b74336e0230";
@@ -20088,6 +22360,7 @@ tl: { # no indentation
   version = "4.1";
 };
 "modiagram" = {
+  revision = 52589;
   stripPrefix = 0;
   sha512.run = "aee09f61375cde8fd2ad80099fc42234a4ba787b212cf8f5e5e28a09480bcda5c307bc3e2b0e027b18666808debaa2f5215d3e98f9cd816b9f31192b30f5993b";
   sha512.doc = "d07402a534917ec27c6415503c73ea5b680515a223d41d2f16ceddbf6805c61c29404d4628cec21cb15ec8e8cf3ac62c5756744fe5eb0545e9381d001d05a3e8";
@@ -20095,6 +22368,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "modref" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "ef5d822fedbd5026903fb7d2630a837a3a1b0222150ee1a9f72a54e13d626a0387abd1fc20b18a257714c63cb65868ac885f8340d35c5453b42323da3b9b0782";
   sha512.doc = "f7539376630672b6fc67821045eb8c891b4781d233e1b914f8fc5c255fdcc57ecb6e5ef4d36ae72ceac185e8d2e4aee42741538f27fb3ab1f5160855cfbc8def";
@@ -20103,6 +22377,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "modroman" = {
+  revision = 29803;
   stripPrefix = 0;
   sha512.run = "3314a474cdb88e517fd16943b8f1f1da252608bc5505bd91581e87bca19ea317718d36694abc670d471d0028dcb5fe502a3be1b1294604cecf619de235fe63c8";
   sha512.doc = "5c6ad1cdad66a5a7285b7c51074f724670880d4417df45cae51e5b3b35bf5cf99f374f7abca73c7ae68d12f626e4b9bf0dddd6b2bc94250c4e6146598d4c5ac6";
@@ -20111,12 +22386,14 @@ tl: { # no indentation
   version = "1";
 };
 "modular" = {
+  revision = 44142;
   stripPrefix = 0;
   sha512.run = "13d80f572497551551151c35ac32c09cec70cd40c6d99d36c22ed84bcef509cbfafd511a8e2e284cd06ab1a57f4be7fe556d7e390f9d30135bd20cd49acf362a";
   sha512.doc = "7d7201db0a2791700748d440fdc5cca9d8d274ceeacddb3715d99b68b4c04f52949e8b9897377168463059deec86177470a997bfea7a32a2765afda713aed499";
   hasRunfiles = true;
 };
 "modulus" = {
+  revision = 47599;
   stripPrefix = 0;
   sha512.run = "e5dde62c2e0730befb63612bfd6ea3626463db85b74291df5937d8f7e1995f6b63c8bc6d7e08536ae761457ab1e9a0ddeccf11afa4108910561075dcc03201f6";
   sha512.doc = "965d03005ef257526ffa6667d889a4b238ca5314f4fe8714bc8219ace1e909eb5765da6c0dc94e9b312635e0f9ca096f1d14364effb0045ed467da7c1d735474";
@@ -20125,6 +22402,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "mongolian-babel" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "a4e7abdc0b5817d88ad442e693fefe79df224a74f37d09b630fd7ded16e1335f563ca00a26aee8ba4b46b7516c0fa2f5dc9d37ec00455b11223e46a6e289cc01";
   sha512.doc = "d0aa4f4a7f1b22d3d3a6a96b85d4d72acb71ee6b1374b70008b966ca2401b7b9434bca675601cc1cdf2f013520eb82c2cb193634b3ac9f9b9d40a201d10dbd58";
@@ -20133,6 +22411,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "monofill" = {
+  revision = 28140;
   stripPrefix = 0;
   sha512.run = "6b9a45c32bd44aa01119c7bd8304ba8e5953422c14bfeaacad20f012188f9204c19f432719c74d9481a00611a18d4ef1ba2c1dc858b83b8a25205d40568e5fa3";
   sha512.doc = "edb00621e74238c09d0ca0c04e5c57589012ef2272f0b470345845ddedd647c73fffc0fcaf4741726214b2419e9581127375ba2b36948ec73f4caef561c3e57c";
@@ -20141,6 +22420,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "montex" = {
+  revision = 29349;
   stripPrefix = 0;
   deps."cbfonts" = tl."cbfonts";
   sha512.run = "9676cef9e0fbe7a0196b1ea0fb3ea4f0399a3ee8ed76ef06e824848a57922dc4f7cc1f50a1fcea47fc265465407653447ab80e80dbac3c4bc00488d0929f87bc";
@@ -20149,6 +22429,7 @@ tl: { # no indentation
   version = "IVu.04.092";
 };
 "montserrat" = {
+  revision = 52694;
   stripPrefix = 0;
   sha512.run = "c6794b165dbd522fdd5aa2a57518cd8e1377c5a54bf4031c85804104934b4dcf0bf5f806bcc57b0683fed9b3d51ae45ffea6c6f27552f0c4072d9588e077df6c";
   sha512.doc = "9ffbd4159c42506df109d62f380f3324929ee0aac5a3af5f42e7ef57c9dc51b0f543e52a2f6651cee7300117a8cced44d529f6e93f8865b0562e8bef01615cf7";
@@ -20156,6 +22437,7 @@ tl: { # no indentation
   version = "1.03";
 };
 "moodle" = {
+  revision = 39367;
   stripPrefix = 0;
   sha512.run = "839db4d5082703e0b6d5516b6ec3c18b4fa4b449e732904569e839028bc3f7e27def83c56eb9929f65b0527cec9b180fd743aa3d0df2194aa6372922582173ce";
   sha512.doc = "9448341e5c33054a39f6990b4f7942f45fbbd884cd5691fa8c0b82fa1b3f9cfc887a02edadcb0df0a7a62c53c9f4b20496db5e6e9ecca4bd6ce8bddf2749a71d";
@@ -20164,6 +22446,7 @@ tl: { # no indentation
   version = "0.5";
 };
 "moreenum" = {
+  revision = 24479;
   stripPrefix = 0;
   sha512.run = "069ef44faaa8847a07ad00dae31c1b63278d59a560ed90823100cd601850a798f574d8210c07854a8b1a90165efb3bba852e100e53aee496f78395e3d6defade";
   sha512.doc = "987a1dd96669b9202846fc604fbcfb935b68c79d13bbe4599f32fab9e869ca5b60f3b4bdfcf78d3b3f5102db9ab16955ec13958c4cf3df7ec64649268c226d1c";
@@ -20171,6 +22454,7 @@ tl: { # no indentation
   version = "1.03";
 };
 "morefloats" = {
+  revision = 37927;
   stripPrefix = 0;
   sha512.run = "28fd471aa854852cc2a48597dda19cadda3c92c589d0419b8d36e044f9c04e406037f162e1d02c1f4b20a6288efe4a689fe4e03aafbfc6b06cf14019f7e880f0";
   sha512.doc = "f542aecb6d3868559cee66a7c153dc80cb6aacebae40c0cd0dd120c4230cd358b4d2787286cb3e7bdfb5565949861a35af65ca616369585b8f28462a2b1dbcf6";
@@ -20179,6 +22463,7 @@ tl: { # no indentation
   version = "1.0h";
 };
 "morehype" = {
+  revision = 38815;
   stripPrefix = 0;
   sha512.run = "698ec10d9e70dc1b89ed5094369359fdeffb663ca95513b7207aed065515a66dd2c82b4e43d14fe271c9851e72a44e9c2f6e3baa177ed9430f89e88bdd692172";
   sha512.doc = "2600045257c75dd15320a2f188f5b043358bfdb21ce4a19af2d1a696141a2f553da42c13143d14c8ba136fb1ef7a560684ac47c5274738c747f729a00b02a099";
@@ -20187,6 +22472,7 @@ tl: { # no indentation
   version = "r0.83";
 };
 "moresize" = {
+  revision = 17513;
   stripPrefix = 0;
   sha512.run = "92f67234dd9c0429798f9e8001a2d4b7004e11f2fa90130b738670e6228f45ebca3ba26ed98616e3af5c86148992f9915e3e6a1cfeb4c875fbd20fd818743525";
   sha512.doc = "3c1ed984163e2adbdaa7e94439e160327515f1c6999e40114819d8e5250e090c932909217d37d1d07fcb108c56ec50f294324c32523995f68f57fd918983a412";
@@ -20195,6 +22481,7 @@ tl: { # no indentation
   version = "1.9";
 };
 "moreverb" = {
+  revision = 22126;
   stripPrefix = 0;
   sha512.run = "673b7ab5951e418fe10622fb1a4b4a420c4c436684afbb1474c58b7aa7b235f7063555a220133257b351b5847be5e880714e44ca49bd9198a4306c0e821dcdde";
   sha512.doc = "27e4f361f5d7193c97629debec048168045bc38e353f677829677cb5ce5c0a9ad8f5b2576bd9f870da8dfbf16d745e489ba79e3dfe6aa1da8a9cab1ad72ace06";
@@ -20203,6 +22490,7 @@ tl: { # no indentation
   version = "2.3a";
 };
 "morewrites" = {
+  revision = 49531;
   stripPrefix = 0;
   sha512.run = "fb1f515fa834c422f628464467411a51c8c9a99f353ab297ca0ac0b63d65a7f2e05ec3e6a649fa35260a6bedb91dedda594654e83e94a28baa62764a38d9ca8c";
   sha512.doc = "9f4bad59ec0f024d24956481d2f70baa56748c9deb000979490c001cd671dd07fc3712eca1917713775d6b879169050786b22a76e2ce1d8d57a99cd76487d167";
@@ -20210,6 +22498,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "morisawa" = {
+  revision = 46946;
   stripPrefix = 0;
   sha512.run = "7f149fab67905d6b21670becb1c3e3afbc8fb4c45fa3c376960e5a87d7fe17abe091af63930a8385b5bcb63e550fc0b9bb16d522f50f90b911b09599dc5ccafa";
   sha512.doc = "7af68b3a8233cec22efb49e8131c65e33db4076ed4f254f2d62f629c03d0122e8dddc3ba68d283affb5ca663d3b1f744780dc98c14eadfa1a69028df281e5bb2";
@@ -20217,12 +22506,14 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "movie15" = {
+  revision = 26473;
   stripPrefix = 0;
   sha512.run = "a45726b24f76683c44b0f006d720695c14ef51a260fa00f3223a075e48173638dbc9d9d361fb4e1f8f567cbe80f65d990aae485b669901a50d5b18750640b103";
   sha512.doc = "4df2fec7f0abac6ef4d948285b3156bb9489a3b7b18939fa109abcd9c537e383d505e308516e1bc852aa5c5bdd6b8825e8f7e887c9787d7c2d337124942cc9e5";
   hasRunfiles = true;
 };
 "mp3d" = {
+  revision = 29349;
   stripPrefix = 0;
   sha512.run = "e5899aace25cef3a690150cf09e76bddc008f426800588ef7d21361229b0040dff74af7b43d563b05d8c3d16166e34b5a21e8e25ae3e97ca80e5ffe5c4925392";
   sha512.doc = "2b64199f50ae5b0e6528bf041ac2422574f9adf467183f3ee3d58ebd91317ce25937699be29d0a5954565a4fd326719f11bc04a35cb4938489696ae479d5d7f5";
@@ -20230,6 +22521,7 @@ tl: { # no indentation
   version = "1.34";
 };
 "mparhack" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "9f050b6ee0aabefe384f4b78678620b8a15a49f0582cf22caf0e5fc2b1b975eb0bfffbfe91165a121aad6d358044f97be410250597fd31b462630aa1e32ae96a";
   sha512.doc = "0f28a6dce33e14636bf5515bc1395a80f9ced23553698d9db766e023715554fd87df292836c669b8492844c559eefaca4c4598fbee94db425c419dea16e90ca3";
@@ -20238,6 +22530,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "mparrows" = {
+  revision = 39729;
   stripPrefix = 0;
   sha512.run = "58e4a909374486cd2d4313d62a49e4e30a5e85f8ef2cc0d9a7e734b546ad8b36e3bbfb96f3eecaa9c10b8d7b3b1557aa9e0b5dae5b4547d42cabc64d2f2949d3";
   sha512.doc = "d1ca204228c1bc76d4f15257687a865c650fa83742dd126b3d7cd5e93e725b2da31eedfbca9a86e93eaa08df487b0432cc41f0d4fd2f99951f874691acf47016";
@@ -20245,12 +22538,14 @@ tl: { # no indentation
   version = "0.1";
 };
 "mpattern" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "1efc3f1f1c93456a3038ae5037ad5dcc4b177c57852f7db475a7ce6d2002559b370ba22dcc6d312c68ba75c03523cdf0df8546fff8dab032832d3ff3148b5d65";
   sha512.doc = "4ec7cadd89449ca049fdd723de9e29f20199a630fc28585a4802e3ce3666783822e4f0769907cafbfb0fe097b1da4a08d3e5e5f4038ecebbe9fe3543dd3413d6";
   hasRunfiles = true;
 };
 "mpcolornames" = {
+  revision = 23252;
   stripPrefix = 0;
   sha512.run = "9808706010059e8d2683f88a47535b8039049681e5a9fdc013cc384bcacb1910cc7ab2f7614d35ed964c28507bf5fc062fe4db852afa45f9d9383c367838eeba";
   sha512.doc = "bfb9ce4c85de655b890948897deba96a5ff60cb7518b3e198cd0b088b63670531f29bd84dbde4837298a24f36dac0652f2d2d3491dbcd7ac8f9e57de6500c6dd";
@@ -20259,12 +22554,14 @@ tl: { # no indentation
   version = "0.20";
 };
 "mpfonts" = {
+  revision = 53619;
   stripPrefix = 0;
   sha512.run = "20406681edb69ad3a366483ef17d2ca735ba61479458475b3a0f010db0212d1c453a8d152aad97a172f66ff68cbdb7b5b070a9eb630a60eb141ee21b60ef40ab";
   sha512.doc = "98d9a49b711d6889da96765cd24b1ba308d2030133fb8de13e5c69724d1c540a1d9f479a1c11b391f023bcc00a617b32e66b2b05e00701e9d9cbbd5e0ca87b4e";
   hasRunfiles = true;
 };
 "mpgraphics" = {
+  revision = 29776;
   stripPrefix = 0;
   sha512.run = "5d711f7a981f701e11874916fe8d22fa237404dc119fc2d5c8f8e9b3eaf8feb59a63023ec30f0c67d304839e4971288a669d70a697260af35e401edf00673adb";
   sha512.doc = "954c8e3a8a0deafea163c9bea9da6bd1c27fcc9b5270408fdd29f0051ece1f4138a0af99808cf85279823cb48475b8e21b3a450f021d678fc5b2fbdf28e55320";
@@ -20273,12 +22570,14 @@ tl: { # no indentation
   version = "0.3";
 };
 "mpman-ru" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "e234fc25e9d8e5aa89a59e21186a16de3c695ce45c9ee8d132546381cb18e9be681bd4ee9c70bb10b4769ada5e5874b500d2a3cd7d264d89610dcda35fcba9a1";
   sha512.doc = "57f2449eaed3651b808095348f056fdfa90b00979ba2e21fad120efe096dca9a9e48474e9dbb539f347ffe20ccd5582f4815ff4552c54e9ea5f9df391dd75edb";
   version = "1.004";
 };
 "mpostinl" = {
+  revision = 49559;
   stripPrefix = 0;
   sha512.run = "0749fdf4c54efe9b8c9ed9f735a851a0c0b08a9092679bbb80eb32a80ed6e7284094a043e27721dacf8112b6898a8c5f47bf0b0dea4af9082a40bead0599ee76";
   sha512.doc = "ad639ec50e5b71a1ef02bcc04cb1c0b195e9ed2cdef9ff8e145d17cfb34dd853d96449620f5d0eba614154cdf6291902316f4fdfbd179a112cebbe2a059acc70";
@@ -20287,12 +22586,14 @@ tl: { # no indentation
   version = "1.5";
 };
 "mptopdf" = {
+  revision = 53687;
   deps."plain" = tl."plain";
   sha512.run = "1c005dda3caf90966782bce15e6f82063c8b87cff0b5458519f78a7e064fc0ec4eadc4aa3644d61770cba92a1157ade059f8baa347868c12741090ab370f70f3";
   sha512.doc = "2ecc946c3a7027e502a468c8fe8366c794b4c1c8c3bb5c1f58a2ef127317f89ba69804de10070844c7fd43ab49b8ee66b0326d882a5aba615a4fca6f7f4fd1f1";
   hasRunfiles = true;
 };
 "mptrees" = {
+  revision = 44453;
   stripPrefix = 0;
   sha512.run = "c495bed58639226b0552dff1d2e7c5e97a60ad4fb20cef65cfd873feaeffef4e0b7672a33d310576c042a94d6d27141056e8a56c0bd5d648841b860a3c1919de";
   sha512.doc = "38935dd6694e4c731e6ea8e8a1575ac5985a24ad5d1e05d5766168d3b6f82be6e3bde8c57601565be67ebd0d1232191779f973adf5bcb7851154aab3bd6472a6";
@@ -20300,6 +22601,7 @@ tl: { # no indentation
   version = "17.06";
 };
 "ms" = {
+  revision = 51784;
   stripPrefix = 0;
   sha512.run = "883832298e0135980808249f5af0b28e3dad7941f401e3ac031cd558b9c6b895bde1f5dc459de9f4c5f6ae41d6a6aac08137be09f9a91b26761399868ac7457a";
   sha512.doc = "adc189823e89d6cd90369497dc4468b72a36af808eb2c8d6738b3a00082335f139ecc54ad6b601a027b6961890b5bb6975e46d1de26a1e0ac7dfc9e8766fa6f1";
@@ -20307,6 +22609,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "msc" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "cfd66ed08d144698d11905ddf987f44782752e412d5ecb0a85fc27e569cedd4918ac05f19d986e0fa6e17065bf871e805094251eebd5d27653047d436541600d";
   sha512.doc = "9485a70d19aa2754ae4e12e4311d4a03367c57a7bbba69cfc50a38aa50d6d9160aeb812c4a63b23f7da0e726b07cf836ac9df7b66b4c847b9cad0e7d66aff23b";
@@ -20314,6 +22617,7 @@ tl: { # no indentation
   version = "1.16";
 };
 "msg" = {
+  revision = 49578;
   stripPrefix = 0;
   sha512.run = "9419f306ccde237320abe22fe192a2473785244fd337063332a242e029b8650404df7f7d150b196d3bccb0e10e58e25e2b8aefb15627e89eda8636ddc50599e1";
   sha512.doc = "85db0022daca5aeeb50e2eded6214a3b144012bfd0bd433b4f9474307c2a37e57c7a311385b8de4efcdc4e462f39c53f6a5fcfac2eae7263e2d1583b0ba584df";
@@ -20322,12 +22626,14 @@ tl: { # no indentation
   version = "0.51";
 };
 "mslapa" = {
+  revision = 17514;
   stripPrefix = 0;
   sha512.run = "76910e823a3d1114a2f7497c49d7a9edeabdfc3642309604654f244b060c4ef456aa170f677dfaa719d36416eaa41b68ab28c5cbf869f611a33155250bb44423";
   sha512.doc = "af01997554d68c0c779950e3be4c92fe7ab0616eb2c5ab55c5131f17ef22eb6e7066c4190607b77c9cc44aa50c15a472ea27733add54fe82b7801c7724f1663c";
   hasRunfiles = true;
 };
 "msu-thesis" = {
+  revision = 46106;
   stripPrefix = 0;
   sha512.run = "e05cdf909d11616692cb175b117a134f1eeae10cd9c62058847cca383b86eb99de675f4e534c3b9d378dbebef10312b773f111de46becf8e4f3c840faaf5555c";
   sha512.doc = "1b3c8266ff9dbd2c757365d30772057433e1ddcb04c83a9f98e55c9c4707a380e5d289496887da9adb922f96e7f4c64b9d3828e2a758aa38fba31e59c39c7d1c";
@@ -20335,6 +22641,7 @@ tl: { # no indentation
   version = "2.8";
 };
 "mtgreek" = {
+  revision = 17967;
   stripPrefix = 0;
   sha512.run = "fbc20f61e1d4e9d3ebf4a92216c7c007f2aec2b2cac0aca6e08f0e1ea5f6f405a32d947efcea0057a025a138afc85e0d1486191ee82fa9a0e9f2f6e2542a9e11";
   sha512.doc = "49631058e9bfc59dd38a7e0e2134f6d9ddf68779a6f8087a056a89fef975154510496415b782102dfeae6b5563527fb6178ce301b004fe33a4dfa8dbeb4474ac";
@@ -20343,6 +22650,7 @@ tl: { # no indentation
   version = "1.1+";
 };
 "mucproc" = {
+  revision = 43445;
   stripPrefix = 0;
   sha512.run = "02ee23aa25152e80e8dc2c57f14b99c70ff57c38175498c179e505a76d967f826acf076cae2085d305cde93964f03134fc6d1027e0669acdbaba5ed5ff6efa8e";
   sha512.doc = "01d154fab3c0ad8db790b5a22fcc4cae7a5beea1a2850f5e9d6fb1fcdc6c1071c2dc294568451f40db5455826f78ae910be9572de5a4a7d870e3a18a74fc0082";
@@ -20351,6 +22659,7 @@ tl: { # no indentation
   version = "1.02";
 };
 "mugsthesis" = {
+  revision = 34878;
   stripPrefix = 0;
   sha512.run = "26a40992f66bead658130b6a649e7da550c85a92dbf9bf5778d4987e06f3a5f7d168eeb77dab3e81c5f328d252be345265c2326760d861fff35fb4ffd1e3a4b0";
   sha512.doc = "2f9d069468c3ea0b420465200abafade7ec7c52cb22bee74865da5fb06064eeae47709a1ff60868bfbf675a4397d828e02581defd338ef3e79e179c0ae7cf7ef";
@@ -20358,12 +22667,14 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "multenum" = {
+  revision = 21775;
   stripPrefix = 0;
   sha512.run = "e73e2d3fe45f562398de752520628032fea310e5345a247472a2807618b72467b245995f32f21474dcb5702106bf32d6394508a96c4aeae4dbeaf6fdda7bdf4e";
   sha512.doc = "889ffbce149b1f0a98e22a1ebcafc60e29858d08b57e2e567956830c679515759a6c8209901641e3d77ded31238e8fe93f7e4cdff95d1be925e3972c9005f4a7";
   hasRunfiles = true;
 };
 "multiaudience" = {
+  revision = 38035;
   stripPrefix = 0;
   sha512.run = "58610f5b5138f7713fcd3e21fac721d0cc0a796e928bd5bd89e5981e08a0d4d6888f6f4f2dc2c6b9afecfbf0366462109be7a497ff6017e3b76ba83b361fe2f1";
   sha512.doc = "5db8176fc1c40091db428b73bbb8bb3eb2e7b14b8c8a681e7d5dcf04d990873fbe456d389e468456650faae3939e38d1217057485d60750cb29aef89e8e15b69";
@@ -20372,6 +22683,7 @@ tl: { # no indentation
   version = "1.03";
 };
 "multibbl" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "419f7bcf8f2226cf8c60119e30da278bf6138f4e1903dc322da33ca2b22120e50b205dc0bb01b46cab0c93fdaacc37b823a812121a731fdea4cf03354d1b0690";
   sha512.doc = "68a3f99cbde27d15fa8b56730f4e9f7587bcecfc9a6ebe19a7811a29278cbe21f214465942bd4ee6cc28833b9614dfef14714dceddcdb041d5676ee7ead810bb";
@@ -20380,6 +22692,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "multibib" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "82cd48cf9097b36664d4dcfb5d73dbd6e961c2f0a8bf7816d1bc59a33cb6d2c65e0f63a9d1d596dc9faa4339536746089e34bd1b510e1b2c0ea272df5840e396";
   sha512.doc = "1d4536094c09755fc91b2657cc0eb0b0b2fd8d1c5ca37bf2f046b62a4b0be6f83a93debac8be3c5481651dc75cac2066962556370bd84face6b03aaba24bbcc6";
@@ -20388,6 +22701,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "multibibliography" = {
+  revision = 30939;
   sha512.run = "faa2e16b8bdb9309e2f16cdb2c717b59c8ecd5d73e4819d72ee3226a80fe0c0ff6b4d686d0f1d009601e0d6dea140cd4812c2f4cb94f37b5bd9cc1bd19137965";
   sha512.doc = "3e13c8c60ab8091a363b63a63259e53e3c5076feb224a6f426e55a351141f007ea8bf7526b0f80684c83e4e97b43f5f05217e254f978e8b69665c736efbe8512";
   sha512.source = "544b3778bd0a51e99e89e18e606d37551576d655a01b46523786d6f910cf84b3886a8b29c72b9e0c25b3ae629045470b24e2741d7894f867437ca069cd692cb4";
@@ -20395,6 +22709,7 @@ tl: { # no indentation
   version = "1.03";
 };
 "multicap" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "5e4a4eebd7560d4aebdaf7035b9bc14116a32cb2e043aa93afb9f95eaf271fdd75fe7d2b6296d36327d7aa5b14b52046b0c941ae949584ad27a2b89ebe54b6de";
   sha512.doc = "644f46fa6431f0f7bbbdfed8a346887d107c8ff7c8d5b2c826b16994faa48d83ca59cd139c16fa144122e0425e6a2c592762b86568f17fb914dd943cdb7eb808";
@@ -20402,6 +22717,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "multicolrule" = {
+  revision = 52283;
   stripPrefix = 0;
   sha512.run = "591a7aeb5a918fcfb847cbd7f91cf389b6131472e62dea411b04e9ecd0c4eb1e203a31bacc69721f444c6eabdd44462e84cd263629ed4d6566840da2921c843d";
   sha512.doc = "ade3f0e13f39a4173d6402ee2521232ff42ebfd8ca55d491f27c1dd35caeb06d92d7f53c1f897d71752a9013f1383eb9cd6b6f250c9ca535a31c21f751db4abc";
@@ -20410,6 +22726,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "multidef" = {
+  revision = 40637;
   stripPrefix = 0;
   sha512.run = "2d15975c8a191cc08925cc8cd74b982af909a7488a68e4b6f5eb4c2ba0dc94dbcb40c4347c5c4774fda24f98efff52131f6a243e1e6bdcb4dde7e683e408d6a9";
   sha512.doc = "50b26f8fcfde20dd04f3e3701d611631c8914e9488a3f87d25e0c60803090133f9abe889b449c67a09ccd5053c67c4a3ea699d52d44480051391edaaa7ff9ef7";
@@ -20418,6 +22735,7 @@ tl: { # no indentation
   version = "1.10";
 };
 "multido" = {
+  revision = 18302;
   stripPrefix = 0;
   sha512.run = "5c861bddcb8b2bdb654dc4438621834a68b2bca102799317c9a220f9bc9bc4c9d70775375302a85736f8706bb7fbfc1a4c24fae2f850237e8f54ad521b1cef83";
   sha512.doc = "8cef36438fbe57c54f625b178331f7a6ca19854abcddb475283fc0cb4a362764c443de05989245e962dba9e2e4f17734533502fbd4b2ef4fc8e8c36b96bc68ab";
@@ -20426,6 +22744,7 @@ tl: { # no indentation
   version = "1.42";
 };
 "multienv" = {
+  revision = 26544;
   stripPrefix = 0;
   sha512.run = "b387532d90db9f46cb18518b27eb8853dd52366434c69693fd08d36942564c43a45605694a55783fe244690f4cb64b94f3082235e465336cb7536543b00b6f20";
   sha512.doc = "1ad0cbfb0c6029b77f2dfd71100ac43cf3c7512df88837c6da5c26fa9a520f4dacd970e331083a56ddf3d9cd19fd9934e863e4bea9e62c7a0b1cdd1ac6eb2a15";
@@ -20434,6 +22753,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "multiexpand" = {
+  revision = 45943;
   stripPrefix = 0;
   sha512.run = "63f512ca5b9649c86a6936cc2407737e41afd6c6a3b4810fe81155a5b4127aecc538303e26b91f53decee900fba7946e90a46a545b3c9caafb3e0863940e0009";
   sha512.doc = "6b8a727aae2d314877df551ca5804e84be0bc530b4f09d8bfe6a9c1a4c1eb98647257beeb1813a183f0aa5422b0041443e817ce11b6db70e4129e3edc664e788";
@@ -20442,6 +22762,7 @@ tl: { # no indentation
   version = "1.5";
 };
 "multilang" = {
+  revision = 49065;
   stripPrefix = 0;
   sha512.run = "57f9829b100068a84feb8a09a94066b93ec5fe70daf831ea99604089a4fc2f67af76f79505a2eab6dbc8f2b025feed6d908a1f24630e27e0f7606c4a3ebb71ca";
   sha512.doc = "e611f2195fc4f7083d6343eb3554a2e786fd6522383456544e45346481cd57d54b0899cdc6ffd9edc4b75567b1e092ecc597bff660d849e0ce2b3e2d1bd55507";
@@ -20450,6 +22771,7 @@ tl: { # no indentation
   version = "0.9b";
 };
 "multiobjective" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "80b0f340f19dff329cd9f0fc32cbb9a8cf690243aa925d6687b9da345984f9eba9c0db7b62fedd2a54f077d841b9cbe91e47c98140f1cfeebdb16fc05408898d";
   sha512.doc = "3a7c68054a85bbad36b6516c52ea74c35ce11c5ffd6f3d1f235ecc2ea55209343a4ff609857877094fb7f8861e8b7c54c8c979d06cc3b3583fb64e997372ae9c";
@@ -20458,6 +22780,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "multirow" = {
+  revision = 51278;
   stripPrefix = 0;
   sha512.run = "61a072b45e6caac673ae4e5df536f12ba0bcefb3457099a0a03c73f5177bf94b1f0da056f622d3963e07dd82fc1f18eaf892f2205ad34e221963a07a9458cccb";
   sha512.doc = "ae7b86866d6271f99bbda77e1df62276383b3759f59c30c86eaee3a5e14e0633dee081bcbb39fc9e52a5f4afe43ab0357aaeb11d81560a7c1c671d8773de742f";
@@ -20466,18 +22789,21 @@ tl: { # no indentation
   version = "2.5";
 };
 "munich" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "d8d2de2245f24c6993fcd178e2a21891e66b5b99039e8969639d2a9cba15abc6c3c50374db61c8082695a969a69ddce902ff8b5fb8104fe66ba1384ef99b93f2";
   sha512.doc = "ed2dc99df090a012f1b1b922659eebe4c2d8523127e17341b9c4b66413acfc89f8b64ed639c8fd40ace0f4fddc8662f42630411c67026311a26fed436a363b78";
   hasRunfiles = true;
 };
 "musicography" = {
+  revision = 53596;
   stripPrefix = 0;
   sha512.run = "062bd689224a432188b10d53f1224cf915432147db66d93d944fd9fbe9e0ea8928562fb19a6b5f94373db7c6fcc2c23daf7a7fa338f5b9dab53e9eee2a78db35";
   sha512.doc = "9dda39b912cc766aa619254eba7a7d3d90bab3a24668d82e2d4c9c18fff1bfeb7a09e549774aac6d654da1108378f1867ad1d8e84464f8672b3f5ddf445d5e47";
   hasRunfiles = true;
 };
 "musikui" = {
+  revision = 47472;
   stripPrefix = 0;
   sha512.run = "602132bc51f1ed20f045bf0c822f201f7bbf3386f9181599894e66cb3c59f4ed15364013a5e30bfc59b22ab3fe4931872b779d1e7f34b8dbcd1eabe058b1f5e3";
   sha512.doc = "29cc8526543698f218e8c9c20b424fb2b05d3ee0a67c70a2afadd33dc49f0030ceb440b349898b8bd66a53a5682aa8289d081e4502fa5ccdfe481b4e2430de03";
@@ -20485,6 +22811,7 @@ tl: { # no indentation
   version = "1";
 };
 "musixguit" = {
+  revision = 21649;
   stripPrefix = 0;
   sha512.run = "6262e1b447f517680ddfd9e5e076ea384dfa7fc8d219e7a2613a80ba66a0f0435d9dc31502f6abbfc150fa1e2de001afbdec25dd5778e3ffe559ea389d57208a";
   sha512.doc = "8a6c9a42383d6b35c1300b958a7629306a6883bec1bd68751165eb3514f8f069c9995247142bad459e06fa42378a9ddd23093cb749bb2ccd58743312f83425dd";
@@ -20492,6 +22819,7 @@ tl: { # no indentation
   version = "1.2.2";
 };
 "musixtex" = {
+  revision = 48353;
   sha512.run = "2793fe7e110e97df26dc0a681b24cd738eadbc6bf322b438141b66718b561af3d1c7cb029e465827151be5242d620a3182aa304467f3e8e7c58f457310881c0f";
   sha512.doc = "29e7bbfda630825726d716ec45e4112b7d35e180a5d9294a5d1f7a1c8a8c544a8f9020021d17a1db74068ec23ed0c744593f74426fe465182d139d3e9e70e829";
   sha512.source = "62a04ce4d437ada5b2a267b648844cc6702194979530f985bd7fb96b2242d9e92d9fd6367917352aa7f9a699f520569acd2fbfc4d6d56f2f33e9f6173f311909";
@@ -20499,18 +22827,21 @@ tl: { # no indentation
   version = "1.29";
 };
 "musixtex-fonts" = {
+  revision = 37762;
   stripPrefix = 0;
   sha512.run = "9cb72eba919842dcd8f892562a9f6f2c4638a46b4152509ffce1666e3e4243a2686b4feff3d9d68ac3c70c755606cda7b8659ceb1d8347b49bdfc4c0c7f35eda";
   sha512.doc = "6fbc429483bbb7e1382d72622168d692dc5686ee21b9172ddd3a14df04397cdb9a3b45bae57b2ba2851aff401a5819d81894354e2e942d41812ebede75c45164";
   hasRunfiles = true;
 };
 "musixtnt" = {
+  revision = 40307;
   deps."musixtex" = tl."musixtex";
   sha512.run = "eab6332d626f199e46dcd03ea546abbc4446b41c4b0354c066790ebfde154c6fa90f861dcff77206318b58a31565d884576899629520e78b3285bac673d1f4bf";
   sha512.doc = "2da473ad2425064747187da005e01d6844731c536b75095828a85d358ffb1344331ef483c0cebe79b346b4fa96a358a1e416cce7d7cfcce6b1242cf3c0a3645e";
   hasRunfiles = true;
 };
 "musuos" = {
+  revision = 24857;
   stripPrefix = 0;
   sha512.run = "3ad7bc18f20b0df70f6c92f7816d4e5bc90070a392788d93caffaba39f25e516a1ca4a6ef5438dbe55b514822d2882e7dfb809eaa4fb1380475fd624ec3efb9f";
   sha512.doc = "a2bc27d789cbd6833961d41ee6d697004fa7539810aafa8749af918572dbd20e2f267bb7435c068fd604540d0a75d1a558fea38a8cc7748c9dcf087c17469a61";
@@ -20519,12 +22850,14 @@ tl: { # no indentation
   version = "1.1d";
 };
 "muthesis" = {
+  revision = 23861;
   stripPrefix = 0;
   sha512.run = "66345512d1713dcd352feeb46d8ad9c609d4c9364a37b47b5fc0207800f6576831e15d7be59ce13f560ebedaeac9a595f2bd7045b621fbdc8e20a3b3c553524d";
   sha512.doc = "5ed08b459ffdc954f5857be1a1970e9a23d2cfc23cbb04e820b82368b1febb9bf04811e53ce6fd05cc12da302d182179d29b278fb99157e801afd05db15cbaa1";
   hasRunfiles = true;
 };
 "mversion" = {
+  revision = 29370;
   stripPrefix = 0;
   sha512.run = "3031b6aa9408bfb0994ff23c36f6b3f770aa8beac0e94bfe1361dc2ec6ac47859a996ddea9f5283833e5711d0308ebfe5aae91bc0ab564c6e83056d7394f14f5";
   sha512.doc = "bf7639f024b214c2b8b73cbe4f87848f390d106f46afff6f6a1257d80b37a6b7b02d8d9224580d945b93b3f86a43495d00c5c07d22e8428703036dc43273ad41";
@@ -20533,6 +22866,7 @@ tl: { # no indentation
   version = "1.0.1";
 };
 "mwcls" = {
+  revision = 44352;
   stripPrefix = 0;
   sha512.run = "045fbe4985684ff7bad3a7c493fa0b37e412e698ee5eaf31b4ccdf3e185433d185faeb78bbbae7e11b84354e4dcbc24c8f2cf549a64b81ed0b6adfceb4bc8d8a";
   sha512.doc = "17b548e9db8a842c16367cd27b3f5639fdaf418f1967155a72c90e3e91d47a121c87dcf2bf0c6eb9042005d54e04ee40b367e0d81c7e2ff57de04da617f8b1b2";
@@ -20541,6 +22875,7 @@ tl: { # no indentation
   version = "0.75";
 };
 "mwe" = {
+  revision = 47194;
   stripPrefix = 0;
   sha512.run = "fab45c12e55ddd3b748ac6a07041c64efd1b344cd8375d870ab3ddda155d9c43adb1fbed21c82237732c8d15ad68201ade3eeb54714e4737a79ee3fe22db48bd";
   sha512.doc = "361130c8fd556a564975ed94286645e1b2ebb399a4895b59244bbe941cbac20d0e4271cd74cd122595faad4f2ff1db24ad522c04bbded59df2ccfdbbfdb19c7e";
@@ -20549,12 +22884,14 @@ tl: { # no indentation
   version = "0.5";
 };
 "mweights" = {
+  revision = 53520;
   stripPrefix = 0;
   sha512.run = "50d675bdee00625b5fbdcc1ef923a48abc19af890faab90ddde4893081dd2a5de6b5ce9165a4bece512c885ba3f3990d8dc300a873177c725a5aa16b434d4e77";
   sha512.doc = "b103ae1a7e4072e646aa70ccd660cef52b6954deec6425fe2007c15a1f56fb45d43d276449e436f188e52192609766237ec22b69c7782af5c0e3f15081989dc1";
   hasRunfiles = true;
 };
 "mxedruli" = {
+  revision = 30021;
   stripPrefix = 0;
   sha512.run = "f721b48b71ae2eb74104e23989cae84d3316b322ebff4703d9bddf74e0ddacf742e279813977bf29883fd17f01049112169d02aa3e4a9be887c049f8484ca0fe";
   sha512.doc = "ea9de17ac138af2fdfbd624e0c516faa2eca674ae1c423cc7f972f87c1bfbd37812e199f68b463c07213fa263636490b7207baf68506514f73fdef1d6c041a49";
@@ -20562,6 +22899,7 @@ tl: { # no indentation
   version = "3.3c";
 };
 "mychemistry" = {
+  revision = 28611;
   stripPrefix = 0;
   sha512.run = "bf8fbe30dd3d1637db289bb92f6339545f4d52b3876e5a81e5153b4ac72be0b54af48f46fa7d1dbd5a129bc83223c53163a760e6cec0bc61101496b25b677f68";
   sha512.doc = "7f9a9d6c6e0f66805dc37120a4c76787e60452067d9f379cadaf4993a76d7363553699eba7af1b9e507bab4e68e66791a5c93d940e6079521de5d1b7a83e5a58";
@@ -20569,6 +22907,7 @@ tl: { # no indentation
   version = "1.99b";
 };
 "mycv" = {
+  revision = 26807;
   stripPrefix = 0;
   sha512.run = "72e74c30c994441aac708e719e894d01bc3d1a6570863a589dbacae8e3c69f70d192abf7473b58a026b2859f7f10dfd1e56827cc759898248e3cfc9d36f37583";
   sha512.doc = "892d0c10fb8a2dd9a65bb6fa4dd48fc3ea49803a7e633cd390427bfbcc8f16f6d213f9ef511c7202521b518db4c94bfdad5197c30b2c8786bbbb6c6f188293a7";
@@ -20577,6 +22916,7 @@ tl: { # no indentation
   version = "1.5.6";
 };
 "mylatexformat" = {
+  revision = 21392;
   stripPrefix = 0;
   sha512.run = "476e2c739c9a99a53a9f6bb7eb32e6122c149fe224497cd8e777af0ebd139ffadfa792090d8673ff96b4e17466e918f9af4ecb7a12c608d4c33d4e17f2b26f0a";
   sha512.doc = "c0754ef147a457e7c91b16a50dab2220fbf2f5385e126e796b1c65025f0fd998371b4e58d96ae72b8c6eb21b2030906729270c88c0914b1748714455e78d1bbb";
@@ -20585,6 +22925,7 @@ tl: { # no indentation
   version = "3.4";
 };
 "mynsfc" = {
+  revision = 41996;
   stripPrefix = 0;
   sha512.run = "fbf6a66d9e4f7863b380f6cea43c58bcfb54e458d56fe2867b3e1354cb2489d4a0576e6c392e4825023db33465176161e226d954bc12080722317e92edfb3d0b";
   sha512.doc = "11b2d4647cac4aa2280aeac24abca47b9d92680845eba5a99fdf05fbcd4590760927495ef87b04900084ec64652a8b2e28263d4d1a26765cd3e027393f2d7417";
@@ -20593,6 +22934,7 @@ tl: { # no indentation
   version = "1.01";
 };
 "na-box" = {
+  revision = 45130;
   stripPrefix = 0;
   sha512.run = "8b0659454d8324ca51c9e97f7957a3c14230dca0b4b8e047b961bad1b81d2a8b0220cf275bf84e9aae6a3d601fe93df3de94f603a198f6bea716064ae8675d0f";
   sha512.doc = "2c78a71155eab3cfdf551830051dd360f6e9fc8085ebe364c13a79a1ebda0693d633e7ba08e31c356e46140c33bf3b190365cb88d944d2b3e8c0799ff68cdc8f";
@@ -20600,6 +22942,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "na-position" = {
+  revision = 48071;
   stripPrefix = 0;
   sha512.run = "1f5d742e5fcfce8495f2c772ae166775151b555b1e4922615e5f62ce161a167969c8d6043d542018debc69ef75f472995f498ef9f3b1f094b97d5b986285b1be";
   sha512.doc = "569a4c0a03c224195752a072581e4c8a2ec428fc4644ba66c43c94e322ac495137f52b3b1cd5cf40741c83937ce056e610a2fb4f4b02f3f8a73d43fcb3fdb4d9";
@@ -20607,6 +22950,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "nag" = {
+  revision = 24741;
   stripPrefix = 0;
   sha512.run = "a2d239ed1e12fd1b082c8df5531c9b83cf55c39b13781aa01848f3fd06136a9522598abf9e63580a93fb12ad7c392061b14d5e96b4d4f4dcf8180180280224a0";
   sha512.doc = "9a4859b67182b40428f720e2e955b591fd3fdf30acbe7c3214548766312833b3ebd5a046d1ca2e2b824e3bad95bde635a1cd112e8023395333cdcdb9cdf55ba9";
@@ -20615,6 +22959,7 @@ tl: { # no indentation
   version = "0.7";
 };
 "nameauth" = {
+  revision = 53940;
   stripPrefix = 0;
   sha512.run = "847d9562465a4b1a8d126b2f35acafc9c2121ad7dc2ff6cea5ffa4edd744baef0710192bd196fa8f11f9972f5ea57db1df7ec2b533cbd473dcd241a1f9ed3794";
   sha512.doc = "4a57f0325184b04c59e9686d64c2361cc139000ecdf9517cf56f2f9023d4c8942ea7104524583eb8b8bff1bcfe9f2da9b26342b5df146ff5974c5d70c037948c";
@@ -20623,6 +22968,7 @@ tl: { # no indentation
   version = "3.4";
 };
 "namespc" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "71ec09a2aee5f299e9620b9b90558bca11415cdbf4304d0e5777896f85cf4e30cc39508fd69ff831a86707e230cfca1773fd9a8bc50c37f310f8bfeff629d2d6";
   sha512.doc = "4bd240f3ce155ea517fc267af1925f2e84f7af694a1ee4a068a2679d97cb6f97fd77f8812017e05f33c935bb54a34459a9deeaaf43cdb4ed69d792676316734f";
@@ -20630,6 +22976,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "nanicolle" = {
+  revision = 52237;
   stripPrefix = 0;
   sha512.run = "3e495d68e20596ada67e55fa7d7273aa0bb19ac8ea41abcede5ee66da6870d3a1703c464c6a7e911b0a202c6062bf1afd7700755fcca0abbc80d0e0c8afd5fee";
   sha512.doc = "007352388b415e597da827b25c2b8773e64fddd1b2910639139add09e07076a0f94b0a70422f1ccce0c00b7b7ed5f6534a8467e5257dc4670819dfb5d9f61fda";
@@ -20637,6 +22984,7 @@ tl: { # no indentation
   version = "2.01";
 };
 "nanumtype1" = {
+  revision = 29558;
   stripPrefix = 0;
   sha512.run = "fc775dae204d8f1ca7e05005ccba0bd568f00819519d34b2282028d7f2b89b9c1f9a091ed192def7281de97ea97c75b9327727489e8ff88585bb97cf5e8b8f10";
   sha512.doc = "ff0bd0bcc32eb8166e7bff9d440692a3c21c5cc7fd7b8139b472fbc2e079cba0591d162e2a81090919990dba31d1e04b57d50c35ac1d0670ef9102c64abc88ad";
@@ -20644,12 +22992,14 @@ tl: { # no indentation
   version = "3.0";
 };
 "nar" = {
+  revision = 38100;
   stripPrefix = 0;
   sha512.run = "212f1a002743ba14eac41de05a88325533db8b25d9f12b141064b9aa98f78dd5c28caa7cdaa4419829e6180e56ff93e42b069cdebb52fb8ef40c9652b8a23c79";
   hasRunfiles = true;
   version = "3.19";
 };
 "natbib" = {
+  revision = 20668;
   stripPrefix = 0;
   sha512.run = "7e78ab76bd86a864eeccef86a64fb28b6b063d5a12210da80f0c5a5608df429fc2939580b88263dc50fd68d841580a12358617e20a0048ccbc9e148ba04d5f26";
   sha512.doc = "afe78103a6ba2d58c6f6ba6927101cb481abb1b028c4cc09dca59296d30978c636e837c248eb4f8fa44aa8fa7f6db1e1b6855afac9d99b0cfa030dbad6e59edc";
@@ -20658,6 +23008,7 @@ tl: { # no indentation
   version = "8.31b";
 };
 "natded" = {
+  revision = 32693;
   stripPrefix = 0;
   sha512.run = "85568d2bd3b729cda5e4512a2e3309353e7abdcd6a02ee3f86e07bf65cd74ca9581d7b2746d582b704a116313b77cc5ea94f19fe0d233a3b41c4ae88a8704f12";
   sha512.doc = "5cc23aaaf6006c1f77d676ad1f20d3a62d9ac8d8be6f41e68085844f6060d570baa04000bf3108c975add502c7ad62086509464753474a74c43d045122b28294";
@@ -20665,12 +23016,14 @@ tl: { # no indentation
   version = "0.1";
 };
 "nath" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "2eed9bc55d9d994df8710703c5acee9fb07d8c9732288740cc3c20740bd8db1e3d22617886818ceffb0346110dcd0dbfafaf192878500b2865523d00c6e02bf0";
   sha512.doc = "ea75b3f282f81963484b2f6b29513a99f3153f222931dfa811deca40cc79a814a225a0a79e67237f53e3aabd33f7749095d3c7fb8f374ec802ee054ebca291d4";
   hasRunfiles = true;
 };
 "nature" = {
+  revision = 21819;
   stripPrefix = 0;
   sha512.run = "78b6e945642bf2073e49acb318a0ff78c1ad24d38c28133b08d5e2881e6e5ee2dd6e8634b467047145dd72d08bfefefc631fd81c7e0facb590be2f9f4798ff6d";
   sha512.doc = "cac72025fbb65e32fff8dbe3a457e28b2953ce2a14b9359b93724073d1c56761524f2e3200f80aabfea1aa0747fb010bb78586978856c89348fcb255630e5d9a";
@@ -20678,6 +23031,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "navigator" = {
+  revision = 41413;
   stripPrefix = 0;
   sha512.run = "868f3c08b71f670010fdad0320e4792929d31c2be1b29fbb38da518288596dc299b58635ebc8e7551b9191954b76280e87c47b1eb3c4987fbae3afcd133a5c2d";
   sha512.doc = "56605790284309e8b6432152bdd6765172e9e7c9c6ca88b07ce5b4b19ac792df21879999a47663dbffe7b3dfcf6da0de3e8f8399cc65fc96dc2e8e3a57350f47";
@@ -20685,6 +23039,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "navydocs" = {
+  revision = 41643;
   stripPrefix = 0;
   sha512.run = "b1a5afb90babbdf8fbba1915b88cdbf30a0244d8363c25dd9ce33bb153f9e8e0437146d9883016a40b1cf55c1dc02a06a7d2b72947326f5dc13998beaabff923";
   sha512.doc = "2122252986f1fc852a121e09ac4f6a6a6c23f9227e374809f2968e729602f6d870bd9293fe1d456c4cc04aa48ee01361d37695c7290bb047f2c8f9a41981d3d0";
@@ -20693,6 +23048,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "ncclatex" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "88ec3d2c350521fdb978734d32bb7eb9bacee0ecb95ae051d7bb039cb86e6dd1eba3b4ae93881ef8fa2623e99f6dba9b126373f181c4668176eaaafa94aa992e";
   sha512.doc = "e9c08ac08ee2316b07610bde89aee98289b937e8dbfdc86b392cae02037632d6d303c799f74f381f89a6bd4f4397a8c4d78025a88b8fa4ebbce4be663167f2ce";
@@ -20700,6 +23056,7 @@ tl: { # no indentation
   version = "1.5";
 };
 "ncctools" = {
+  revision = 51810;
   stripPrefix = 0;
   sha512.run = "f7ec6f6c51d2a4f071b85cf28299a4a11eeabaf225c85cd0144bb0971ec3da44ee9aeac7cdd7501d258b7e8cf25b3e3484cd60dbadf0ff3ee05767c713c12dfa";
   sha512.doc = "a594e74455024dff7d38a8a750ee02637341f84d342a83409ad0e20a1b0f292c370e16c1b267c2d6a58975f45a6b4c1092c8518653994392cf4dc08fe8553644";
@@ -20708,11 +23065,13 @@ tl: { # no indentation
   version = "3.5.3";
 };
 "ncntrsbk" = {
+  revision = 31835;
   stripPrefix = 0;
   sha512.run = "e023d0a407f666de1415728a90014041feb5d04ceb1007e8fc293452ecef1b9bdbd014adedb9e25993e57c0196632b1413ec19893f4c37c26a8e8e42a20a9de9";
   hasRunfiles = true;
 };
 "nddiss" = {
+  revision = 45107;
   stripPrefix = 0;
   sha512.run = "62f951bce52bab564ab2671bd5d019ff9f6f5ad1d8a18ae9f8b574226aa83e4d3a9c6c931f4830f71c43499f68b8b06e539d55a027e712ce4cd2c03e349d3fd1";
   sha512.doc = "bd92c614f160c50a22ff83d296f0e511909906459cfcb7100c615170ee9fadbd38ba032bf95f7b25a083cae33c80ede96964d3b81e23c481fe5a836d91967ad1";
@@ -20721,12 +23080,14 @@ tl: { # no indentation
   version = "3.2017.2";
 };
 "ndsu-thesis" = {
+  revision = 46639;
   stripPrefix = 0;
   sha512.run = "d79b603726abaa506ec0cd59c30e4c341839c1dd6f7b7aaeb536385d22d69a37d764499aba390fe7e1efc6a6e25ae6dbb7e92bf659a771b6f4d6ae3b5a2c98d9";
   sha512.doc = "8e93554ef50d43562d1c42fff3da81b77b4ae444d644e5b1a818571e80cef88a2006f1b1c61c320e467724df7847be50f4f3ec1663bd767261720cc1a80419ba";
   hasRunfiles = true;
 };
 "needspace" = {
+  revision = 29601;
   stripPrefix = 0;
   sha512.run = "663b2ffe30b1d9a588183916ccb0e3fecf3098d3e67f2a40fc49e1db1e5c1a892bfb56eb177bccd923415dfe51d4a225e2017be3b2f3f7185071836cb2e04391";
   sha512.doc = "3af05a6704a8d3c9539cab0871f9f9c8b7a241549c1b3127dfce2a0eaf77b87d54fdafff4b2749eb4614ad9aba45bd2e3d695a92243ea30472e62f7945eff004";
@@ -20735,11 +23096,13 @@ tl: { # no indentation
   version = "1.3d";
 };
 "nestquot" = {
+  revision = 27323;
   stripPrefix = 0;
   sha512.run = "cc75905a3423deb02f226340eeb6a5f97d9d83470f156bc75cdf39569da845279fe8d4a3907fdf269bac75e7afae02faa04dea367cf0326720301ba3f1c31395";
   hasRunfiles = true;
 };
 "neuralnetwork" = {
+  revision = 31500;
   stripPrefix = 0;
   sha512.run = "ba66b86e10f4425c063c76ffcc97759863677a673960255d5c335d215ff8c0eeb4d0f12fdac584ae1fdcec00ab04705cad716ff9290f6b1ca9c8635841f580ff";
   sha512.doc = "fc2cda90284e4360c9dd9c03611f582c7c4569331a3bf04d51152408ff8533dcc1f398f641ece389e63f9b7dd12ae471c3f6b5d8fbdea5d206afb1ab15df4852";
@@ -20747,6 +23110,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "nevelok" = {
+  revision = 39029;
   stripPrefix = 0;
   sha512.run = "01d207fe9d77df0a225cd5fe718f118bc755c1e23c9dcb2bc4e0b4c2983205469baeeefcc195b150cc54f4540ea71d96cfc393fe61a32f7e85d5c9b5944c5938";
   sha512.doc = "653fea96310508e8a30c76821d1cd83dbf579052fecbb8c859d40cb39926d24ae0141b4788901b34b4839615b33d5995eed2b6a27f6abcae981b9d47b6ebeb34";
@@ -20755,12 +23119,14 @@ tl: { # no indentation
   version = "1.03";
 };
 "newcommand" = {
+  revision = 18704;
   stripPrefix = 0;
   sha512.run = "e4716ec35793f0ed4140ed3bb221bbaedaf121b2529dbde5114a575bfb8aa32a8fc56e79e43068adf560423aaf68c5f09dd5d6b624e37005bbaa4def2b280060";
   sha512.doc = "84f71adb1cdf4213f34e30a2737f41c93fd0e8ac4970b2adb832570c98c5f3876502556392fa077a8cb647a552a8e914b2a30e4e38a039c355802e2c85c5f3e1";
   version = "2.0";
 };
 "newcomputermodern" = {
+  revision = 52877;
   stripPrefix = 0;
   sha512.run = "24720e53923a2669e8bae12153c86e463215dca9c11a1cf19bd4afe71181324b598f217bd49b43b503c50bcaad33e42236549f57122e1d1906882ffafb0ab51c";
   sha512.doc = "8c61e46f813cf230fff94e2875acfa58cc38663c66ef8ce1e6af3a18e9d9058276c670178ef4033f90599e117a0b880bf6e7753e25856113e407e57177470bf6";
@@ -20768,6 +23134,7 @@ tl: { # no indentation
   version = "1.001";
 };
 "newenviron" = {
+  revision = 29331;
   stripPrefix = 0;
   sha512.run = "4ddcc24de158fb1a5b585c65adf769c3f92c4598355306e08257f4ef62718c6ca7f2dea80d742759601b37133a951d031445a39ed5d8062496459cc2f98a71b4";
   sha512.doc = "cadfcd8ecc9c0904bc9a45542a24c1b6907dabacc94f45a1ed1b885557304a27e7e836b55cbebcc6130da0bffeff7c56fd89f0b7a16430dacccd670c8c6ddc7b";
@@ -20775,6 +23142,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "newfile" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b949934073af1aaaada73c93e493fd39ca01ad625d72bcfa5df915b2c2f759a39d77b7c2a0a952711c8c3e0af5e6cca59eb7f333fcd27e7232c3780ad5400ec8";
   sha512.doc = "c2c0e825ae7fee4fa551e831c822190f7682392d47bd8bffa3ee947900d6eaf00a363edd204f7404c834ade0bd5a05e9bb0a8284f8c660eeddf7f75179c0060f";
@@ -20783,6 +23151,7 @@ tl: { # no indentation
   version = "1.0c";
 };
 "newfloat" = {
+  revision = 52906;
   stripPrefix = 0;
   sha512.run = "2cd4d1e5097bd6b9abd25621fe64590e67f8933a5292f83277dd546cb949c6193af04e16a72e61c3023293f6471ed41e9b46c23dd4c6c19428c7875cf0279aa8";
   sha512.doc = "4a9b942a072ac5da1e92f6ecd63ff16cda41195403794c8a111140d4d6af43947875828d497f7824bdcfd41ca03ece22469ed5e0fbec0cdd84c56471678cd469";
@@ -20791,6 +23160,7 @@ tl: { # no indentation
   version = "1.1l";
 };
 "newlfm" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "72f7b087ba1002541e3d26d5b41b58380443e30061b92885bbd3bcc017b17cbad9227c14074a53706b98c785117c7b07c6d49639c84c617782066491dc0cabf5";
   sha512.doc = "8391122e13223055582bfe0f9e6d62315c9a48588848ab02cebd5b2d7045be5f1d476145e8ca29392820d4ee018b9f84380408331b3ea56e7e99071024a8c369";
@@ -20799,6 +23169,7 @@ tl: { # no indentation
   version = "9.4";
 };
 "newpx" = {
+  revision = 53792;
   stripPrefix = 0;
   sha512.run = "014a13ecb4a30f957d99ce91c81aa40e246e8f270801755c374becc056d7e91eabfef9cfaa26ad1ec1a1b15dfc2bf18749682ea2370299844c0c16acd220061c";
   sha512.doc = "b7c008b06ffb4671f3a33e26296db91186a8db2748830524c4878c6714717fc9effb9d26a07a270c75e514a9c2914df3482a19ef0b5e5d4e9e131d6f92c796e7";
@@ -20806,12 +23177,14 @@ tl: { # no indentation
   version = "1.410";
 };
 "newsletr" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "e2f1995420ed7b94b980fd794df5dca89e89dd96daefa43559d568881ffd17668717de1baaff18bf27e8519663203e0ea7fef214b8f7541bde81d436a3a5c378";
   sha512.doc = "aff23fd9e3397c52a1566930d6da6184786f07adc64c63e5d9e0062451014d261db8dab06e9d393cb66b3b56a51b57f494f01c9ab27b05bbe2a226cd4623d590";
   hasRunfiles = true;
 };
 "newspaper" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "227fd249bba9deea4f191c59060c49d2d1cb8e367bb3007d3b123c17dd4328206962946ce3f637c8e6ae079a9c95244ce9027b0c9f83e0901801dde066a0405a";
   sha512.doc = "b08d57346ba93e37e93f3c6e2487d56a0ac67eac0e4d9db564d221319e6403a1055729a2a1e43db4e161877b7300aa90e1853d75843c95295481d7cfaa3f6c1f";
@@ -20820,6 +23193,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "newtx" = {
+  revision = 53549;
   stripPrefix = 0;
   deps."kastrup" = tl."kastrup";
   sha512.run = "aa18b291239e3cf2e2e974e276b4ec01efc4a214628520af8d09ffe0910e1d2eead4b9f40b081d69be1f6ebd7c06c356eb26ee0d7e653cd82737f85f097764bb";
@@ -20828,6 +23202,7 @@ tl: { # no indentation
   version = "1.624";
 };
 "newtxsf" = {
+  revision = 47958;
   stripPrefix = 0;
   sha512.run = "ce1497bcc316b555b47dcab2bf68888fb580e0f1252fa1e1f73f2b3cfad2b9754ea4963ef0c39b967ac374323b6f75cdf28d0d25f93212b09a1e66bf90976c51";
   sha512.doc = "426c11211d3f66c8d87b1b2522ed8bd9b2ed0e4e006dac4c0751d0b479100e2cc1aa60ab2c32b8e6362b767300f568ed295bcabf4a86c51f2ada7ea868483066";
@@ -20835,6 +23210,7 @@ tl: { # no indentation
   version = "1.051";
 };
 "newtxtt" = {
+  revision = 53809;
   stripPrefix = 0;
   sha512.run = "cba0af119d5c1dab0e62046c2d1deba626885be3df5a79b9ae129a143221f1062b33eb91af146e351ee1969157c915e39b96a5ff85116b87e16d5498101fd2f3";
   sha512.doc = "2e96ac40334c855a12da28024aa05df5139c40b99a86e5dd5a94998453c187139eb73c927fccd653e4e99199b894620620dab4705064f99def6565f7501dca3a";
@@ -20842,6 +23218,7 @@ tl: { # no indentation
   version = "1.056";
 };
 "newunicodechar" = {
+  revision = 47382;
   stripPrefix = 0;
   sha512.run = "8e1748abc585f51033a857db126c4b18f0c42e015d7193f8bc7b69493fb13a218db38da97f3a6733df01dbc247093beb544651a050c5a690f3cd5479c4ad9e6a";
   sha512.doc = "9ec3bdc81587e8b2553dd4ff45ca4ba0bb504ded0726aa44d1e88423cdf425124334d04ebfbdbbe57b576b0fa52cfe1771c97308f146ea19d89d41eb4475eb9e";
@@ -20850,6 +23227,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "newvbtm" = {
+  revision = 23996;
   stripPrefix = 0;
   sha512.run = "029829b1da07d7e2fcc5950c32021707058f3d7228f6ff82404aeb962663277ed107934f04a93e7f43bd7b67f7034821437f3a8116f21028b7c9a154449ea53e";
   sha512.doc = "dda7ae47bb076f03cba83438c573405f1c67e5407d83fa0894e9575952c284010b62f62720022ffb7a8e723e829610d1e8ff6a8b5098c92207e8ab8755dcb409";
@@ -20858,6 +23236,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "newverbs" = {
+  revision = 52074;
   stripPrefix = 0;
   sha512.run = "1a076aadfcc8b82d3b003c0f7bdcf17e3c66aff17c7d1c3946fda3d67d44e6885f35f84033cbc1cd8dc3b0c3d90aaf63ace3152fb7619fcafa9d1899c45140d5";
   sha512.doc = "0c29b76949918fa03f4e4b506f35ad9d0cff6036702330d4e7771325869b7f5effd4f562dd2416d7c15d704fac60efa525f187ebee67a29d728a0d2490d2d266";
@@ -20866,18 +23245,21 @@ tl: { # no indentation
   version = "1.4";
 };
 "nextpage" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "fca0aec60c5c7277dcadb0f86d757617484d700575fae13df8b386775e153ea89c52935ffdb2448c52e351593b396fdf3394f5b97e23a0d2d40dac339e584f59";
   hasRunfiles = true;
   version = "1.1a";
 };
 "nfssext-cfr" = {
+  revision = 43640;
   stripPrefix = 0;
   sha512.run = "5083d4ff4168b857a7391855ce02ea354cb17a26242a3e3b2693d6bbb35f722f750299669a37afbb99a52180433d697fbf65a6fb6afd6bd58d4b16c63e5b0d67";
   sha512.doc = "28b2aff47d74de3a42c441dafc156297904b5db20d267f1af07d1e3210e7f9959474b3cec387be7d9b20dc04560b4100a0d9da6979ab8ad2a7cd1e4518cec278";
   hasRunfiles = true;
 };
 "nicefilelist" = {
+  revision = 28527;
   stripPrefix = 0;
   sha512.run = "4e3e1b651a5f3828c1806ee199ddff3a022f27381da241f2d9400cc3943d9aa29e0dd56bd10d7fab60da1901f221cb54c74823b35f163ace0efbd3217b767ca3";
   sha512.doc = "5c909c6dce453a7a73abd63896c0916db3f609b7d4283b70af33bfc31ec44e7aa5b3dc2e8d1ef6fb3d33605d23e079db4e7cadf4fa13197823ca3c177b82f527";
@@ -20886,6 +23268,7 @@ tl: { # no indentation
   version = "0.7a";
 };
 "niceframe" = {
+  revision = 36086;
   stripPrefix = 0;
   sha512.run = "539d4a6f3a192188064fafd94366ad2f8a9146175d9e04b08cd83d1386bccc730a0e3be4a9fd45e4f47152f10710191b063138ba504fca95e4226fc179f70a29";
   sha512.doc = "aaf777520d300b5e8c9a17c2dfb5b12406f5e6926b17c4244feaa8d6c5bc28d87277f23fd814304a7efb91dab8a42e1ed88f6568b96f13f30c831e81201ff4f7";
@@ -20894,12 +23277,14 @@ tl: { # no indentation
   version = "1.1c";
 };
 "niceframe-type1" = {
+  revision = 44671;
   stripPrefix = 0;
   sha512.run = "c99757f9907622958267f042f0ee0aec8dc6317839fba05309116f9151e476e37f24dde00e6de59fb0204beb9383eae039c0fabb089d6349d6f6031e8df196f0";
   sha512.doc = "5ab28cf7091ba993d7b4ac9f5caf2d563c60e63a3ce8975bae105f460e2dadbc963efd17b7ec5ddeeb8a35bea1b05a007590d3f6f9d5cf5dba0495e5b0ee8ad8";
   hasRunfiles = true;
 };
 "nicematrix" = {
+  revision = 53721;
   stripPrefix = 0;
   sha512.run = "8b84e5ea01033d93c7b8fd5764dd003c80c54fa5d1464972948308d611851ec1dc580b434f0bc0b7d4821b2617ba61231b017dabcff71f3682961edb9578c103";
   sha512.doc = "15827f045d16f7ea6412b651e1d105fe55e6a1ba926d80eebf3350e3b8dc49554947499079e81a05748ee07db607b6a5275c0d1dcaf198dfb97e6dbb2fd29d6f";
@@ -20908,6 +23293,7 @@ tl: { # no indentation
   version = "3.11";
 };
 "nicetext" = {
+  revision = 38914;
   stripPrefix = 0;
   sha512.run = "04a555a82287a39249cf6b0e18d890329098a1d0d6957fe9a1c535024b63a5f50b6487dc1fe4fd69d87908abd385b0366474ebe3af0b31f41f6a35c519a6ba9c";
   sha512.doc = "96cd1694ae0cb116bb4620f7cdc1f9e24385886c78cf87466cd329c5ca0d78111005ff89e9be50f07078eaedb69c4f3d495b1fc5063a1a69e483b86a6c8534b1";
@@ -20916,6 +23302,7 @@ tl: { # no indentation
   version = "r0.67";
 };
 "nidanfloat" = {
+  revision = 48295;
   stripPrefix = 0;
   sha512.run = "42ef65277deaf474a619e5ffd570309db8c8349f32e9bcfdf216251e81136a3da87a745b3dcea5212f636396179210c6acaa96a957ffd9588d1f414d6a59bded";
   sha512.doc = "2be76c8e243de71698ae5264a8e3af4da8dcfcd130b0554d1547a0a238e55ee71ec57d8757648b162a6ebd17ce1047206979cf139003a02921a4308a852f0030";
@@ -20923,18 +23310,21 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "nih" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "5f016d57b1b55c698a902c7a85a652fdcd40062b409a14e38c1356b9030129b46631929e49c6fa70db7ed499043a75060c97919f15876ac7a647d31c2f0bf729";
   sha512.doc = "1c209615f0745ed0ae4d2f4c55cf9447ec4711e9345ca3db778fbf45ccca76792039e6a7e51f2e7286034ae229b5c696ba7deee5bb8c224dbf95a4cccca650f2";
   hasRunfiles = true;
 };
 "nihbiosketch" = {
+  revision = 39460;
   stripPrefix = 0;
   sha512.run = "fed3f5fc0886ad44c9f442cb0e4d3289d9027375e3b0563be9fdccf2a963cea09a0b16db2ef51a57e652f27a5dc5c20a36e9d284162433b958cd4fcc905989c6";
   sha512.doc = "707adc7971861a35b352aba04521caa61ea3d84e15cf698f847be43e9a22e6157ba133f9d787c8c65610706481880571e82a1037082d00efaf08a5812f612e94";
   hasRunfiles = true;
 };
 "nimbus15" = {
+  revision = 53742;
   stripPrefix = 0;
   deps."fontools" = tl."fontools";
   sha512.run = "f045c6f3cd8ff71b05a1c323ecef4cca9b6af2d1921bdd7ef916d40064d2eda0c27c630de9eb85bbb9432121d5e0a2994778c7ea506202d093d95942e41eddaa";
@@ -20943,6 +23333,7 @@ tl: { # no indentation
   version = "1.013";
 };
 "njurepo" = {
+  revision = 50492;
   stripPrefix = 0;
   sha512.run = "a62efcf4630d7c26bbedb19e0c4405e730733b71361cbec9abed7a06a377c230bee561d8b48427104bef8dbd4e0bd56b0eaf9f0f7bbcdc8b289c726cd7b6cef7";
   sha512.doc = "61f32efbea3b94749fa0cfc3ef2a3b3a34ccfb4ed3b6b09afa74e4f6dbd2540c1a263c81ca6406288f015303250f51acab0b6a4a4d51c95a2f9bbf1f3360f8e9";
@@ -20951,6 +23342,7 @@ tl: { # no indentation
   version = "1.1.2";
 };
 "nkarta" = {
+  revision = 16437;
   stripPrefix = 0;
   sha512.run = "60537472bed0bd22d64789008ff8bbbab92ffcde68cbd74eb0b6d9910705f9f476e8f2c4dafa0020a24b0ff2e27c42a39de1791f2c91040af07dd429e0fa28ad";
   sha512.doc = "b3cb0205fdc567fbed23f797031e7336fb231c11490f463ee3bb3887e5d8ad1aba90bed1b14178b1d9ba15d76ba02ba93598362b9655eea78bf086c7df6c8b61";
@@ -20959,6 +23351,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "nlctdoc" = {
+  revision = 53768;
   stripPrefix = 0;
   sha512.run = "9e73496b57f3a6ef6ab8f49fce6a57d2e0696b4361ee19bf32454eef9fb081f4124635b219c09f2f26578fd5c489e898c0a99b2ffbff3909b3aea6021f28407b";
   sha512.doc = "0ebc3c315fa891a7a2cd3696dba75d755022f4b0b9f7b75854e98f91b31e93f32f0a513a78e0b6ba529b3fe515fd165c10e2413e0dd27c6c50c0d847a74e78f1";
@@ -20966,6 +23359,7 @@ tl: { # no indentation
   version = "1.07";
 };
 "nmbib" = {
+  revision = 37984;
   stripPrefix = 0;
   sha512.run = "c915b266e2a7644a88de6476bd4cf81943f7da31472f1b8eb889e048df8acc4afc36e247b8fc63bfdeb8c0384d87fc59f43d87f3ff09822d076c62a0edd1c110";
   sha512.doc = "0014c7fdade3685ce03bf9fcc2725b430f6272025809e224b88361960cb47e5b533d88d60f0ce55e011dbb943c8fc025340fadc506eedf10189724ae79dd2bda";
@@ -20974,6 +23368,7 @@ tl: { # no indentation
   version = "1.04";
 };
 "noconflict" = {
+  revision = 30140;
   stripPrefix = 0;
   sha512.run = "660ea2bc008866130d0955eabecf0afa1e21ce38fcaa0ff0d4364ebc32ea8af6a2ba57c80b340f824b14f0488d2b40e5c7ddcf663e37d6170a7ac0aa740ca260";
   sha512.doc = "b403c57b0d794bd95416ae09ed3fbc0c4a164689f9885dbb15e8a4c25ff8751376e6e61b622c9a94feacc4dfb905a7926500368bf51e5e568efa31e1dc5c785f";
@@ -20981,6 +23376,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "nodetree" = {
+  revision = 43011;
   stripPrefix = 0;
   sha512.run = "bc333202800520cf68e2aae42e849fdbbe8b2a1936245f35805adb3ba6795d724b8c6c5bf3973d760d5bb1327324c43721bef909d3440a3e7b8c559dc57aa61e";
   sha512.doc = "d81032f9f78e49d49a6e88c4017a6f95ca8e3ced2a24210716d456ff4ea1461933540d0b553eb66e6b74c8c94e3f93328b9ab0cef2ea91c2ac37a1ab4a28ed39";
@@ -20989,6 +23385,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "noindentafter" = {
+  revision = 35709;
   stripPrefix = 0;
   sha512.run = "6037e5b7b36742c2956f39020f7e9bd2072b17ab313f5d7d86e8b0c348b89ef1392571b8cba22190221a14c6f1e44a0156ddafce8f5e2bbf5362e443f590b2d8";
   sha512.doc = "1cc385e0bed9559d66c13967a5ffe83f1d01ad2005e4c7ca92243ca246da4f5f5e9abfde9b244ac54d73de4f874b800dc6620f7c93f6fb03a6d0ac8b2593fc96";
@@ -20996,6 +23393,7 @@ tl: { # no indentation
   version = "0.2.2";
 };
 "noitcrul" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "1629f5c0f832927093283cd5cb534cfb7ee35bd74f306fdf6cc18cfca3c72d5c1501139c180b7cf3fe71ef7131dd6a42465ee666c7bbb5c83a86f2a69a5a3c8a";
   sha512.doc = "c9c3adf9742b329ddbfdcfc41126c22039e89642f0c0d93ad064ff2160f7708b62ab28994a81860aa08d83f11a111bc11a2a54bbab88bf3713f3f6ee4aa2e641";
@@ -21004,6 +23402,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "nolbreaks" = {
+  revision = 26786;
   stripPrefix = 0;
   sha512.run = "4057a988b0357e2256eea6ae47c560d8535528e63b93d648c45d65ac44c4894104015e3411b7046606b9a68afc44033d037229d684f0c5427d9dd2ff5b272279";
   sha512.doc = "8cd5d7336097abd2d873af36b2ba6ebc8cd1c405c9a715c67e6c04d02dbdea067c0b7a8603418005ce223e0f1bff161a3dcb669da7c07c30b2ccdccc7f953fa0";
@@ -21011,6 +23410,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "nomencl" = {
+  revision = 52911;
   stripPrefix = 0;
   sha512.run = "420d6664ef3fb6cf6f1491325d7fee3435d9adf2f2a5920fb09da27303ae29a41403ff0f68e36dbc897a5811472e880324aa9f145d4018e24c595e331a0c447b";
   sha512.doc = "69c83da8e9260447741dbab2006449acdd24d290f472d1522881143506baebc11f87ee0664331d1c4206b799b996d9b3fa9783cfd13a197ac5cf5a0af40328e3";
@@ -21019,6 +23419,7 @@ tl: { # no indentation
   version = "5.3";
 };
 "nomentbl" = {
+  revision = 16549;
   stripPrefix = 0;
   sha512.run = "195cd134db2faf9c7405d040d0d3b4a71ec39ac201fad47c855d34d8f734d069c03424ddec6b1af978e7b244b3907f846fbd80fff6063e7b25df3de508fc51ed";
   sha512.doc = "4ea606a78da4c0c4f5c35b38b9a430de8dcea49c8662081a85f3aa575523c40f5951bd54e2c8acb368b52f75a3214c0a4b0d178dc262a64b8f6485852c4458ba";
@@ -21027,6 +23428,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "nonfloat" = {
+  revision = 17598;
   stripPrefix = 0;
   sha512.run = "39f8f0a4d9ef1cf8f1dc02c63612980f25cee80cb545bf405d9d2a080256ba6799ff3030c98c26e6f2aaa10ac71015e58e4233bf84703b290220b12db45c70c0";
   sha512.doc = "2d090fa397a385cb32c26957b5c4c05ba8443fb1bb7ce7e3eda777ddc2d3af11ec3ae6297bf014f40e71d4668044ab729a6dedd74e8802ce9089b59d57663374";
@@ -21035,6 +23437,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "nonumonpart" = {
+  revision = 22114;
   stripPrefix = 0;
   sha512.run = "e97fcc36af3e86c1a432d0e425dd86308429e764c976a2f7f8106c3433ae5a148bf3abc45706bcc3090089911e2dfe175156eccaba7d97f544154ad0b288e58b";
   sha512.doc = "0cd6b115638c3151e5983845dd2964ed90f24bd35a06e904a005755696d6faccd90bbf88c7bbb5a0282ffcd266cb55e9eb1d058fd78432ba062fb4fd723348f3";
@@ -21043,12 +23446,14 @@ tl: { # no indentation
   version = "1";
 };
 "nopageno" = {
+  revision = 18128;
   stripPrefix = 0;
   sha512.run = "0e152caa8b8df06444f50e2f9ca93f18088a0c58e2d5936f612a770b90cdb8f4bb0142064f56573d8569eee274adbc2703037ce4d7477c24d23c7c8de8748a62";
   sha512.doc = "5988c42840efc02f816ca0f9ff7ad2d731c66563c0c4de21b857de975bbec08962cef4ed1dad096abc39ecd8489d3a34a66809e98f49b0a280c186d03e6540a2";
   hasRunfiles = true;
 };
 "norasi-c90" = {
+  revision = 37675;
   stripPrefix = 0;
   deps."fonts-tlwg" = tl."fonts-tlwg";
   sha512.run = "d52fb16ee07ef72f6484b784346933a23b5a3357aa2f00ee212bb1decbfd3299153e88cd4bc352cfc2e888dbf37ea86a2bd6442b6393634c5f144f4accab55a5";
@@ -21056,6 +23461,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "normalcolor" = {
+  revision = 40125;
   stripPrefix = 0;
   sha512.run = "013354a5f7514f6267d57d098ca93eb48970df0ce1cb2db0c60ecf664cbcea177b934ab8f252cfb9dd4c0979417937462ef55e51502bca7f32a7de1a0e820e32";
   sha512.doc = "ca7a9c008f72aa1287092f881f9ffcbe58ed45bfc97ec3231fbeceeb007f6248629d9cf49598afe604ac8cc30a4e8117f54fe517fcbf52548add2f6ac6fdb662";
@@ -21064,6 +23470,7 @@ tl: { # no indentation
   version = "r11";
 };
 "nostarch" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "45992ab970abe997f3b01c9dae5e15303db81878b085f45fea4ba07209160ff0307550e9ecca9b67e0d01712831b6541def54382170d43db4dd547f2969f9fb9";
   sha512.doc = "94efe6a2b41a47b559b4b7c9e04dda1f32d0c6f5da79b51d994fda1af58b4e1cc7e808f9465f7874be6b67231383c38543fb3e98706c32da32d73a4ae07da9fe";
@@ -21072,6 +23479,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "notes" = {
+  revision = 42428;
   stripPrefix = 0;
   sha512.run = "7b569f27ec34c103c5808036a6ffd7f97f9171287883f38c048b8eabbd979559fbf15b20c7002dc9b8b0577889482c4347e4986e076079809a4a5656aed46101";
   sha512.doc = "4e66790b76290925f49ab7f56175e2d41a20e715c43518edbae39e444d02b945ec05ca918574f52fbb6ca10fbbb060242c688fb9344094df2e025de83272322b";
@@ -21080,6 +23488,7 @@ tl: { # no indentation
   version = "1.0.1";
 };
 "notes2bib" = {
+  revision = 52231;
   stripPrefix = 0;
   sha512.run = "019645974d270df27f5c5bf22570e26b5bfa5c076739824eff60a40d1c246010fe0e599eb2fb282cc08aa2161ec7ee753b734548ca04370d9bf923f357ced1f0";
   sha512.doc = "f4b97327b98e86c64620e975130a7fe790489d16135667c95ec7a368591084c381362e1447dfd1b3afb4f57ed2657a43f8623942f6618d839cb9b1c0995234e3";
@@ -21088,6 +23497,7 @@ tl: { # no indentation
   version = "2.0m";
 };
 "notespages" = {
+  revision = 41906;
   stripPrefix = 0;
   sha512.run = "f5f6960bfade079642a4b4f221a7b762cfb5276a74b20bb3eada51706cd2e3496f91ca23e35cb39f221c57da19012597eabc8d3aa63c58e0749c8a01b6a28ab4";
   sha512.doc = "8af2f746d4484a2e06bd0f7f766c49cc9b0b790da2cf0faf1c83d959f2e2f60fcdcb7cdb6f1ffed89c2b03846215b589de332dc20935d0c0add4e3dc025c42cb";
@@ -21096,6 +23506,7 @@ tl: { # no indentation
   version = "0.8.1";
 };
 "notestex" = {
+  revision = 45396;
   stripPrefix = 0;
   sha512.run = "64f9704fd3646cdcfdc03f6a3e03f9fb37859b9f11463fa77e1d3d076115297fac9c0b8d6875c8b6b7f3d37127a400e6205239957526018d9ad5cdf36a984269";
   sha512.doc = "c47bd3a4153467a63ac2e2b149f498f9458132e841cd70da9871f10674e77d928f7f88e58855c139dacdc225d286615caf0297077b843750e6940482398f02a2";
@@ -21103,17 +23514,20 @@ tl: { # no indentation
   version = "1.0";
 };
 "notex-bst" = {
+  revision = 42361;
   stripPrefix = 0;
   sha512.run = "68627ca4a07ed0228b9b9ea4b70cdea5196e907f71f343310259d19464d503e76e2ea8fb5f59f01337916ee1f2ef398bdb1d3e4d97f0d49eac660fdce20590ff";
   hasRunfiles = true;
 };
 "noto" = {
+  revision = 53953;
   stripPrefix = 0;
   sha512.run = "ad8c28a9d05c2dae3bcb097989debb110e3a8600567aa007c93f1782cc151d74abf62bacfa0bc52b758ce1c4a40180ede55406c68593983b1344d397d9efb7fa";
   sha512.doc = "3229be953b5d4a4e642db5a0f8067ecd2b9788d96890640367105902609ad52ed56995671c7de9470cd295e0b77d1fb72fa600d1a52ec3e244be37a2da8c5e3c";
   hasRunfiles = true;
 };
 "noto-emoji" = {
+  revision = 53968;
   stripPrefix = 0;
   sha512.run = "c681b795a4f2678f5da213cabb37dde0fd604036e59593c34100bfca53ae56e9cbe2f408a2d1a99dd143b07d8a50fabafec0e51d614bb3ee6122b8eb27d6eb10";
   sha512.doc = "c1794f61d4597ad06c504efdf94efaf2172d87b3efc29a289350122f85337f73c319fa7e10b261e7a9bc79ce96b8fdb3dcf4348454a0d2902ec5a47433b95ee4";
@@ -21121,12 +23535,14 @@ tl: { # no indentation
   version = "2019-11-19-unicode12";
 };
 "notoccite" = {
+  revision = 18129;
   stripPrefix = 0;
   sha512.run = "b63b890933b27717625383488d2cbeb1501ace58b83e5af66a35ba440816527dc879df444af78090294df6d4d412d21fddbab43068a6d677b22d750ddb4105e6";
   sha512.doc = "83b3d2c7b97bb88af13d888d04f08ebb7e79661b4924ed6e328f26b9d19e4c6eea6719b49e6f227dc37c96201a901fe57da3745dfa7151bec27c7e8bfb81b236";
   hasRunfiles = true;
 };
 "novel" = {
+  revision = 47492;
   stripPrefix = 0;
   sha512.run = "ab6fd183a8f1fefa9d7e56fd234cf577bfbfbf6635d8e8fb6665e05b5d2f98dacf285731b32df64abc3d314865409003d89a935e2af2cce8990e0cc3c4510998";
   sha512.doc = "3e1bf9313cf7e52f1d08f94b24be24153f4f2b68c19517e5be81c2bd224033fbfff5a17857866ad274cc54a96c0bb9f9da6536af5213bd561ea48b7ebb4e7cdb";
@@ -21134,6 +23550,7 @@ tl: { # no indentation
   version = "1.52";
 };
 "nowidow" = {
+  revision = 24066;
   stripPrefix = 0;
   sha512.run = "2dff380964c5c487a015073ade0cef996f5786b204657ec5c8948748f485c03b457f6d8caa5bce8148cdbba2623489a01b5370bcd38eb73469d07da4afb8a216";
   sha512.doc = "b11e2051543215f3f19c4d1e3398564093202be07771b7b3711e9ba5359e750bd8f73118b099f82fc3bb1e9a5f202027b168c371ca6587703d82f853ced4d538";
@@ -21142,6 +23559,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "nox" = {
+  revision = 30991;
   stripPrefix = 0;
   sha512.run = "0061e0bc12a06b79c4339684d0598587f3aaf1c2aeacc7aa32118d7b91d3937ffe0ca50b55f5ba9d1b7a4a1c511811191160c58bc51b68dfdfa2b0cee900b409";
   sha512.doc = "2383ebed9a9c6f65d6271317b46147915afdfd6caf39893e4cfe470e302f9ed6f30ca9f725bc2bec296cc88027462765b4ca5731cd5ccf98fa5c8156b1d88987";
@@ -21149,12 +23567,14 @@ tl: { # no indentation
   version = "1.0";
 };
 "npp-for-context" = {
+  revision = 51389;
   stripPrefix = 0;
   sha512.run = "6d5da8b6e2f2bb6b514d43e8b72157a81285b6c15cbe74891a94f21a09a313813ebcf9e3a0a12847875f13d5599436ada4e5febb694c0a480931dd62a23035c6";
   sha512.doc = "b3bddb0b9254ef9755628097ccb24ccbe86c25d3cba7a120c5d55da98a19061b716df1590a39323f57a8a698c5aafb5ecbe8b27d6505f2ba4acdf1ccdbcf82cd";
   version = "0.98";
 };
 "nrc" = {
+  revision = 29027;
   stripPrefix = 0;
   sha512.run = "2d93fc25d0305b8bee0e5e9ae61bba492bc265e023980a411ffa521f15746c6d73940e352c886ed5dbe08502f472a63559191aea44c3801518bca8b28d0b753a";
   sha512.doc = "35f86598105db616ea379175f3a098cf7c94f4a0a8836302de664c7bb65bbb5f72f41c5c9dc58bf336781a23553ec49e0a5c4d7d0be12b1cff68108aba77e88d";
@@ -21163,6 +23583,7 @@ tl: { # no indentation
   version = "2.01a";
 };
 "ntgclass" = {
+  revision = 53882;
   stripPrefix = 0;
   sha512.run = "c92ad04449f1cc888b80d0f5a6baf318bbf2f743f5131f8c3fafb263f88a2f9df2037c1e8172806a41dbfb96d447c1e55c949e99745a60073431f4affc27cba0";
   sha512.doc = "18703b1ddaf9fbfebb2a546bc8e63f5e15958c6f07087d936a0751786f5fc620011654649999c815c3cc0e78a04c6efac736e1f36708ec858438770c27e9398d";
@@ -21171,6 +23592,7 @@ tl: { # no indentation
   version = "2.1d";
 };
 "ntheorem" = {
+  revision = 27609;
   stripPrefix = 0;
   sha512.run = "aabab9d6f1a5d9e9bd2ee2ec4b9ca8200098a8f3dc786b9c06d4b0e00431dd66f32a254d452bce7e1bb595454e178dcdd71d724b8d835b6f1c9ad9de41107295";
   sha512.doc = "fdea81cedc9ceca6ee29ee006867a05f018f210db2cb59c763adc4bc15db65a7e96ffc93bcd576a4c1a50e7e55d4b199132371686538216eba6fed65dce77ba1";
@@ -21179,12 +23601,14 @@ tl: { # no indentation
   version = "1.33";
 };
 "ntheorem-vn" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "90460e92cb52bbf8ac9b56bb950d36551b40ba260a9745e8f4d339bbca855286f8682c1a5bd7dd4ecb53e85448f96d558e6c35ffb42d8b862d4680930f3a64ab";
   sha512.doc = "e097290ec9f9696aaabaef4dce11bec4337050848ee547535c30a9ecdf12a1e0be014f905b235fa1d851ad2c20426cd4a9a442a19475063dd4fa73945c3e1780";
   version = "1.203";
 };
 "nuc" = {
+  revision = 22256;
   stripPrefix = 0;
   sha512.run = "d540e5dc8a3edb41994ef4ed8af6a51fea544ac929ef059fc50cd561891e02e9ee9b55a62782757101cfc5eface3a170bd585c144e7c8e79e191299527f979c6";
   sha512.doc = "ac118243f5fa4c7a4000344dfd5793dfbacc4d7a16a7031fca6305578e06bdd627473eb065a13c4d9cc5d9ef3c1712202c2d65a913c75043e36221fc7df25ac1";
@@ -21192,6 +23616,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "nucleardata" = {
+  revision = 47307;
   stripPrefix = 0;
   sha512.run = "68f9d542701bb9d2db956e70784dfce8a14058b5cab5c8316f9d76d59d20de4bc7fa05f22cfe318312b9ecd823a0d0b5cd084b809bcd615217f14e9e0ba76de8";
   sha512.doc = "3d03a8b301c91fcc3e8221f913574b4542e0aa645d83e443d117ad0d69b7198c4780207f0a5e36f7e24f538a249097e1ac4d828e192f6dd22684e905ce9f1cb6";
@@ -21200,6 +23625,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "numberedblock" = {
+  revision = 33109;
   stripPrefix = 0;
   sha512.run = "d45a69881dee3aa3b6de69587b8c59d889fcae528c3c66f10cc14d653dbf7281e9ef4045dd2595d1a5c7305686bb0d12696bc00b672c5907dc58481a4e00d70e";
   sha512.doc = "99443d809e77b32fafaf59b3faecbd121f038e3ce8e054304e8fdae6b145a0d19a67b5e7d003db72f06528d975c3e543a2fb9bbfbae9f48be460b1a344a0d2c8";
@@ -21207,6 +23633,7 @@ tl: { # no indentation
   version = "1.10";
 };
 "numberpt" = {
+  revision = 51640;
   stripPrefix = 0;
   sha512.run = "c23fc54514b98cbc31e095f6b1ff37d37eef75146a3eb14e230ee75b71f6d506f148de643ec5e890a565b544b6d05436d47033f0c00ecdccdab697336b61dbf9";
   sha512.doc = "8b3723dbcbfa0163d7113c96ebcdc5a2262c169a94b733dc4af3bc263b119addf58042817dc8437ea5583ed93be1f3d5485ed76c2d704b20d303b5efa8bf41cf";
@@ -21215,6 +23642,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "numericplots" = {
+  revision = 31729;
   stripPrefix = 0;
   sha512.run = "6b51a7c68357dced9627d3c618a167d689b573ea44c2f36de5417735f39f5b3d1034558cf188bad2da5eb25f81a2bdee3df6059b8c14879770c3b300422cf016";
   sha512.doc = "1c9f9856ec2f8cfef61829256f1076099e6bcb79cb45e8155116d6c24feaa52f481c739593c6cc51df803fa76e8ec38b8d276e796660327a2bd1d86957896332";
@@ -21222,18 +23650,21 @@ tl: { # no indentation
   version = "2.0.2";
 };
 "numname" = {
+  revision = 18130;
   stripPrefix = 0;
   sha512.run = "b2859430992fa6ee99f4d96f58cabe26b0f216d5e3b512c69b4db74738d933ea8d54503a61257d304201ac3fbc2ba49e908eeca5953ccc0f0023cbbe8b3df76c";
   sha512.doc = "41aaa9057415ad83177f416e43fde4c8c81e335b2f3c025cbc53ffe1d9d61fc05dfe33221c16f1d652837e4ab5a797f60391fb4c319339517090ad0e2ffe66bb";
   hasRunfiles = true;
 };
 "numnameru" = {
+  revision = 44895;
   stripPrefix = 0;
   sha512.run = "c6f92a720fc5baf6f55c3bc18e22113de0f7cad8a051c2019360f5f3c64eaa450bb12d6c361c52a5a802f558ff8d2cbfaa35897682d6ad218e9adbbc788f3c57";
   sha512.doc = "5e67f1908356e1f21e672e63a8873e46ebb36af39e55a64c174c3bc5c49057c6d19ac36523c34a7f1c1fc53346f6ddde8fd239ca88b5790ebba1eb8b7dbeb0ed";
   hasRunfiles = true;
 };
 "numprint" = {
+  revision = 27498;
   stripPrefix = 0;
   sha512.run = "cdebfa502a461292b02186b146ad8086f46447b5d8a0292fd7943d93a39796eff1710563866506679e903b7a4d415af9a8d863fa81a62395c7bdeec2cd68e66f";
   sha512.doc = "b821566e6fc532425c8f1b901b5613c763eb392461644850428707105626b6eb1a53784d6a693e7f9fe2aa612b72b4d5a38ddf65f22a0d022981771b2b303d04";
@@ -21242,6 +23673,7 @@ tl: { # no indentation
   version = "1.39";
 };
 "numspell" = {
+  revision = 45441;
   stripPrefix = 0;
   sha512.run = "bf6d58521c82638b9f9e93fd5314db075fddd4cb249d7e8fe8b605581ed19414d259eef98a4f205d497fe4b9c552427ac202c0c0b5810e81ce1bf7ea903ec3ae";
   sha512.doc = "6f3f26985e8c656fd68fa716fcd3ffbdc890da7cd0797934351b4d128444eeff4b2f2adb05210fe45fdd627c0da22716153aa8ebaf4b5d7644235ed8b6c2b507";
@@ -21249,6 +23681,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "nwejm" = {
+  revision = 53597;
   stripPrefix = 0;
   sha512.run = "7bb333e3041a8cc20acf7b154adc8cf6008a759af22031dc2ac7f0c04fad341cc911a8a3ec4ddfb2048685a628c3042cabfdeb21d7f5d0128eb0844cea381b70";
   sha512.doc = "5636fbded79f0ee81148f3367a88548b408928bb441e17c65aec16d75ced7218ecc627f7dd306baa4968d4229e81b9cd23361cf1adf833d8deefc3104632f7c3";
@@ -21257,6 +23690,7 @@ tl: { # no indentation
   version = "1.0.0";
 };
 "oberdiek" = {
+  revision = 53283;
   stripPrefix = 0;
   deps."auxhook" = tl."auxhook";
   deps."grfext" = tl."grfext";
@@ -21271,6 +23705,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "objectz" = {
+  revision = 19389;
   stripPrefix = 0;
   sha512.run = "e98bb9208838b8e55d9fe793af3eb6439aff2809067878051a9849cf483a42e612ca7c9a43a86520e582161b1a9f575e4e7a5f4bf7bbcabbbbdb314595c58fd7";
   sha512.doc = "afcb2681f0983c345ddcf4cd484d337461a53af27f6d5467b12a5368f6ce3974b9d54cdd77365995e7268895f4f0edbb814a4f4e61e4cee947f6ea49c8381d85";
@@ -21278,6 +23713,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "obnov" = {
+  revision = 33355;
   stripPrefix = 0;
   sha512.run = "8adb7a1e6183576b4ed9d709b2f64cc778217602c807fce0daaa62b59786d5629fded5e7ad4824cdee90ad5333b9fff4fd47d462e38005fcd1026af8838f04ed";
   sha512.doc = "6fca30705b614ede4e055a39b92deac91daa6e9ca0922725f29c801e58b4a1ddc7176148b03de147aa906289962a3ff45a743828c0636d7f8fa3279b88e5103a";
@@ -21285,6 +23721,7 @@ tl: { # no indentation
   version = "0.11";
 };
 "ocg-p" = {
+  revision = 28803;
   stripPrefix = 0;
   sha512.run = "23b0b4377ec615d8d334d09018629f524a775311c3d227b350e7dfe95c6154795d1d3e44e7e1e405d45b623ecc614892d0996631615efae2ad6f040c1c4d8dd0";
   sha512.doc = "c51169bf3398b17f3dfd2e0aa0efb574cedf40c4739f1b4693f9282042fe9f024dd48675bdf5ec04895c49e0583ac436bfb36e12ac51ce89bc23ac587b3f92f7";
@@ -21292,6 +23729,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "ocgx" = {
+  revision = 28492;
   stripPrefix = 0;
   sha512.run = "5e8e27f2ad058f30431a78d006869d4448fcb722c6b86a306505afc54a4e39e9136980affad1267da479bb175b8608d093ea531f85302e1c4f450ee93451ac33";
   sha512.doc = "62dd19282c5ff9b030b1caa8a779590f46aae1bafeb4ecb90195e2e0469669c21e130408fdcf855a0a0859100d04cd7b3494ce60bc21e32ea5c3c6fc162ea69e";
@@ -21300,6 +23738,7 @@ tl: { # no indentation
   version = "0.5";
 };
 "ocgx2" = {
+  revision = 52730;
   stripPrefix = 0;
   sha512.run = "fc31e8980d802d4ead440341d898990a083a537e9dbd15b0d2a0a7b0059b2513558c3ab6565536dcd9a189feadb4a5381a40c7ce7b81afe1ff53b9deeebde87b";
   sha512.doc = "07078404f77cfec61516cf285246724abab8569967fa1ae3ccdb741e357031742a9e61782c48e7faf402cf38507a5c9b4063a543dd6e608b095d353344b13b04";
@@ -21307,18 +23746,21 @@ tl: { # no indentation
   version = "0.48";
 };
 "ocherokee" = {
+  revision = 25689;
   stripPrefix = 0;
   sha512.run = "9638c408e96fa861d395881d1bac87b55048a25de61561823242d78f836522205c9621f5a01bbb5ad1c8390230dac727b4fae333c22966a04ff5df1f923b5909";
   sha512.doc = "40bb5e47b2ac627007d349c0b043f299f09321aa0d6fc11ad9f345576fd7a902be4d012d56ceede9e66c8a5972828e7b5a5646c101c08fd28fa3ab1c935f8256";
   hasRunfiles = true;
 };
 "ocr-b" = {
+  revision = 20852;
   stripPrefix = 0;
   sha512.run = "30b658802a2a30776cef18c2ea0f1a71044b5b7819c75ec58df9acc04134cf1aaf85b97f93231d439d79c47f66d7bc57b43494aca073871ec3479ae70178fc58";
   sha512.doc = "6d162b10b558a9db8269b2535ac9df4f76973c54d7e23dea20efb29974b839278888fceab2da85f945da483415bbbafc614c8ae4c1cea6d262d6a46dea5b69a2";
   hasRunfiles = true;
 };
 "ocr-b-outline" = {
+  revision = 20969;
   stripPrefix = 0;
   sha512.run = "ac15acebab9c9f81f0e7786cb3222b336aae3fa4a379592d5fa231e145cfcab536e28c9078ac617bf9b8b672f6dd24b30caa998242ba1e3f4633873ae8d54609";
   sha512.doc = "7bafe00b9c5d846f21cac682d9577ffe696eb54a55f4bee9314646451fec37d883eca7531f594a7994fa8038f7bb5c78a55dd8a8264255a6e60ff90929596d00";
@@ -21326,18 +23768,21 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "ocr-latex" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "d6a4377f66293f8f7ad8b7f8fe3a3a3dd294a302dabb33e193921882d6681fc1c5537b8de2bb188396139bbdd33f14d4f1c20f6edf44ce680df837b250ee83b4";
   sha512.doc = "d0de99d5cf93517f5be8627d649a1d8018766cbba44c40cfbe0f93a3b69c1a5f10b4057dd79194d148030948509a26ef45ea83208c2922cc64b10473d663d591";
   hasRunfiles = true;
 };
 "octave" = {
+  revision = 45674;
   stripPrefix = 0;
   sha512.run = "f7063b207152ebdbd29da1e93db1b65796dabcc1eee1fcf36a470c6074b7abf239c87f5e4e765f08ec70d8ff7f2ebc8fa29a5590fa9a9d6740a5e74c0e3d719a";
   sha512.doc = "0fc6b228fff15a4dc90973339f2b155ede7051ce69066e24d7dcdb9c9d5ee162c8d684298c8ef7fae64274dfc4f101dbca8fc38ca68200c36cf901153fc461f9";
   hasRunfiles = true;
 };
 "octavo" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "06de0f1e69c4bd8bf0a65e08515994a10ae8df83e6e8981daf70b6eeb424fd59b58808249782d76b9373d9982aee50e7c12c17e090e3697533b87d35480f94a2";
   sha512.doc = "daa628a0c047ece5aaf15425c0123128a771a17f08fe9212856e2d63b40340dbd7a50a4ed1e19b04198637e11b530239f4280b810ee3813fc6275b78d37bd8a6";
@@ -21346,6 +23791,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "odsfile" = {
+  revision = 38449;
   stripPrefix = 0;
   sha512.run = "c739d1d20c26fde107649ae8aa5a3f767f59d6db3acd063264be6ffd0dcf43d2a1c87eaf9449d1e1f71a7c10cb24cbc55849255cf95fb72983e476e0cb2a8ee0";
   sha512.doc = "9be750187f9b4476748bb1bc7440dd68437ba8d11e8198af8a1d532b09c37696aa9341dbd91198922ef2ea0a2991d44a946fe080f68fd1d6bfcf563cac50a29b";
@@ -21353,18 +23799,21 @@ tl: { # no indentation
   version = "0.6";
 };
 "ofs" = {
+  revision = 16991;
   stripPrefix = 0;
   sha512.run = "347dc05e8742fa09679e3f16465077b0bbf5e34a4be5a5c2e1da094ad22c0e69ff9f4abb4aacb9be2c698b27da7e169adb0c1840da3e56b277514a9f9631dd02";
   sha512.doc = "13f7fd3ab4cb31ae521827b703cf4c3a0c796b6a33f46b2a24a2a8c488e92d6039a9b136440b00b6a0aba14a2dbad832b777cd5a3aa120ccfc4888ee147954e7";
   hasRunfiles = true;
 };
 "ogham" = {
+  revision = 24876;
   stripPrefix = 0;
   sha512.run = "fe651bcbdb0e8f9ded07fdc412f1273cc8d473894f06af69ae65ac4c6895daba3f61571eac9a49d16de043ae6ed6e03ea386f11dd6b395347d98784bece4c8b1";
   sha512.doc = "6d406cd0a2ba68946be8d2eb148a6c9286a164ae701f66802ecabe6661807ea54eba175617e00920d37a88dee376c1bfcecef6184320ef1790716d53e5a07871";
   hasRunfiles = true;
 };
 "oinuit" = {
+  revision = 28668;
   stripPrefix = 0;
   sha512.run = "4d6b72ce539766a3453f7edb24c243a2a495f3916ee9fd650917c510a0e8fe36e12399843c1de3dc0b0de704bf5362ea20e9bd0d6c3100e659c5641395d658dc";
   sha512.doc = "dfb7275002731695086aa8733a543ca1eaa207bc57cd0b324666940ab932cd9301cb1c0b0bbfa4df36278ac8e289ac1be78a2e0a58ec656c470ff4b841a70803";
@@ -21372,6 +23821,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "old-arrows" = {
+  revision = 42872;
   stripPrefix = 0;
   sha512.run = "2b67317d41349c6d601d8ddcba6ba58cf503756f5bb2f4343c1447cbe4e24c8949a4de58e7cf3863a730bfa809dd09f5f1ce9944e3dc5d4de104e4817d6add17";
   sha512.doc = "d142a95119386f85d1e6ff0f6a24bcf09b9bf7ec83a581ca43be67376cd4a44453d090e4eedf97bcba1026827eff29f97add3a6ed676833b02b718da4811a3ef";
@@ -21379,6 +23829,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "oldlatin" = {
+  revision = 17932;
   stripPrefix = 0;
   sha512.run = "02ba84762eccf816178cc652d7f8d8f7d962db7d5386de4a8274dbc9524fd7a212116de0d7a53886bd5b431ddb8a5cd8ffca7defe3174cbb50f417172d2963f2";
   sha512.doc = "1ed3c1640420272b33178c62aaf4c0d538f5f1ffc5350c377788210128c74eef4e6023fa20b3d9f214f518079e8a8c3753c74d30084f5a71a994dd4b5534635e";
@@ -21386,6 +23837,7 @@ tl: { # no indentation
   version = "1.00";
 };
 "oldstandard" = {
+  revision = 53928;
   stripPrefix = 0;
   sha512.run = "a009e523f070a0cd626df349e9f7ff4c3b83e24bb996e8711af52dbad178c6bb051eeab59e8c1e55a5a8eaf22974e063ae5a8cb0613a60431503a6f76ac568f6";
   sha512.doc = "5fc4bc632bfd76a78b16bcdd25a30309725d408dc6e0d11ea31b2deeac11b3b17f1299465173702c33993085fa99dc3d42c8433f99e3a06467fc77cc18d0601b";
@@ -21393,6 +23845,7 @@ tl: { # no indentation
   version = "2.5";
 };
 "oldstyle" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "968ff7b641f6ae6e8aaf43d1ae9617710b0bfed9894dad135cfd11050eef1c35c48d589d58d3a94e34f93c22d85c58b047ce8d0bbf0ae5c2e645de72e327f9cb";
   sha512.doc = "79e2c2d155bab57456cf7d2ec08930d54e538a830c1e7fb12c0731b246b917840d0ba06d31939ca97e7a20e53a061caa5a5a3beb139fc1a05f32dd9497a37ca7";
@@ -21401,6 +23854,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "olsak-misc" = {
+  revision = 51063;
   stripPrefix = 0;
   sha512.run = "17f360186b44fbeca93ebbe6bb99c51b1815bf376272de824e8a62474e59a1cecc09757639d0542270aa1f1c84ad8042f5859032a141f353b112ffeb8f5ba866";
   sha512.doc = "da6afafbde8ece27fc082b15ad29fdf53ae08ec8674f138f1a45afd39a1cc0a906287390986406b4c5aaabc009aee1843560f078fcac1aad2d7739ecf3e16a68";
@@ -21408,16 +23862,19 @@ tl: { # no indentation
   version = "May_2019";
 };
 "omega" = {
+  revision = 33046;
   stripPrefix = 0;
   sha512.run = "bd07f654ad56219136e2f9e7612b87892bf8c6d0c8f2e41434a7fabb8b159bc43f79444301383adf560f1985f64e639dd496dad6d3ea97ccbd85fcee4d7a36e0";
   sha512.doc = "31eb2aa643ec37d68d902f4de7be391e7da3af61bde93e78beb1e6df1c6367fcfe00f88e29c8cc878b9cd40f2e3a45f9e46bf24ca3a5608aeae09be491130fef";
   hasRunfiles = true;
 };
 "omegaware" = {
+  revision = 52851;
   sha512.run = "3eeaf55d52884639dfc3448e4e9b61434fb47fe144edc7bfb13cf0e45eff0813e6fa79921d81bb1ed14c268904728e54bba6922f79dbb759f06dbe0758a157b8";
   sha512.doc = "aa72ef38e326aacbba3101946ba2cb001ec6a8a034c10e047b716fa810062073e1bc83c15dbcdcd8d57860f5bf480a2595fdff1c07f85cff45daaa1070273168";
 };
 "onedown" = {
+  revision = 52525;
   stripPrefix = 0;
   sha512.run = "e7e1ef415ac2e311be871031c008d13773b4a16de491123f46c9511a98fb868624505fa602607a0d48337a19641487ab4ca49332660677c0e956b61544ef8fa4";
   sha512.doc = "cab3a78d993daab2e5c8143d15293dffd0c67abc872c6538342c023843fa94985b6e03f9219c45356d3901829fe7be5cb2be6179189ff600a50ba4d5d62d0b2e";
@@ -21426,6 +23883,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "onlyamsmath" = {
+  revision = 42927;
   stripPrefix = 0;
   sha512.run = "5452647ee6eb939c292457ee26cb3639560eb55893e44ebbbeaf27ef1c2ed30346d91d733422e65f6780af7c434cf02ac740d722612f888fca8dc45538d81303";
   sha512.doc = "154273f8589b0d8bfa0ed46cfb297d44000eaa750e8d34b1a7aad9f7b26cb19423d7f7ba362e3739cb7d22b2aa077fa44e59d9c46a52db5a82a57659e86a6dcf";
@@ -21434,6 +23892,7 @@ tl: { # no indentation
   version = "0.20";
 };
 "onrannual" = {
+  revision = 17474;
   stripPrefix = 0;
   sha512.run = "0c9f717c54d70ad24a1d3b08a6bd44a4e96e932af4d78ba2895f40e16ae5e5b841cd421b71ff3e90490c13e0843d48b8a28efd49b33ee3f74ef9b6476c88f8ae";
   sha512.doc = "4a4f46965a0de8ca99585d4af31aa2f0f94e51328c8cf1ed29768bb9e2f8cb7e14d63315a008a1d0446d7496ce4f8abb224946277ddf47223808f8f2277cfb64";
@@ -21441,6 +23900,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "opcit" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "4514d83e3554810da7fec3cc165c89a87a4aef04866755a5b42861b484ffea81bfff694609d18fb5e3bbdacc3723cbed96305ba0c09bc48af92456cef3b7b5a5";
   sha512.doc = "6c4e48aa8ea0dd464d7d2902513b1640437518661e9d7237b958b95ad091053b41c6c5ed4407f9c9d87ff5f0ce0b2bda3a99947d3bb0cf70352d5737419e22aa";
@@ -21449,6 +23909,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "opensans" = {
+  revision = 51458;
   stripPrefix = 0;
   sha512.run = "892cf5c5f2ce29049a8a836a94e64981bb51a9a7b18bd3d003cf9f3a233c0da0fa219fb24ce5ac07e7cfc2b94862bf1f201f62a91995ea7f45e3a9a657a875ab";
   sha512.doc = "e8c005fe3c22ca88ffa9f313bd1735dc879167abb17e9c3ba1ad60d609fd95c61377fffbcac15cb5fe2f3e855765b0981c7a602235c3ba5eaceb759f3c92236c";
@@ -21456,6 +23917,7 @@ tl: { # no indentation
   version = "2.2";
 };
 "oplotsymbl" = {
+  revision = 44951;
   stripPrefix = 0;
   sha512.run = "bb894b28fd62f95807bf00856aa2250bbe58b0c1def385d6528b50ba925410ff177ebef97279338bff7ab70db012ba916edad067584989f86797b1fbd7e21863";
   sha512.doc = "cd4ceb0b923da7c0f56817602eca672442d03f628440c8beb82c953cf73a9d1bf8e24939a3ba4c813c99b7a2aa98adede0c98b4678b06fffd3f0bdfe8fae52ad";
@@ -21463,6 +23925,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "opteng" = {
+  revision = 27331;
   stripPrefix = 0;
   sha512.run = "1af8edfbde5ac2abae770765a437bb42d5852877438d283d8021493c621e94d09bd62d9012556024ddecbeaddd838b37ae9abd0486d73e2698956ef49ab585e9";
   sha512.doc = "b1dc3f9f107e1e8313bfa25b843a4959522eec2e6bc886e8b6271c2175258d7108c824bcbed8d243f0e51b70851e68246fd572bcf6afa6aecdeb86a946bc247e";
@@ -21470,6 +23933,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "optex" = {
+  revision = 53927;
   deps."luatex" = tl."luatex";
   deps."amsfonts" = tl."amsfonts";
   deps."cm" = tl."cm";
@@ -21483,6 +23947,7 @@ tl: { # no indentation
   version = "0.05";
 };
 "optidef" = {
+  revision = 50941;
   stripPrefix = 0;
   sha512.run = "dfd704e585df8d01b279e67ea3a2baba6e86ddb9f38bc9747e370580a5f218e7ae4446d2429fc6bffc605ef0ea56c8077a8f41f3ca6a8e857df29d0e3f328143";
   sha512.doc = "3b80346a15a6e1d7209c3584d4fc9de944c55867ee7f21b018300b87615c0ff4fbe290a8683088c0e81f0eb20cf514f13fba0eb141808d8e5f5986c75bc9546d";
@@ -21490,6 +23955,7 @@ tl: { # no indentation
   version = "3.1";
 };
 "optional" = {
+  revision = 18131;
   stripPrefix = 0;
   sha512.run = "3f6d031b4bf863a339a80c3a05b101393f88dcefb67c61a67e01d9647e74def1fbf30f3d018158a83c8a171b875959bf57d7a3e90dc724c32868f9aafcd5cabd";
   sha512.doc = "d975e4f1b31e2335e55a41b317096be36161fc36fd589255a461772eb701376ce3fe714d727c4de9663ed8e4300bf0b570855b6b3ccb6b55fccd56206ac69692";
@@ -21497,6 +23963,7 @@ tl: { # no indentation
   version = "2.2b";
 };
 "options" = {
+  revision = 39030;
   stripPrefix = 0;
   sha512.run = "3cdcd07f3c279a601da49a843169f0cb44aea573ac6c1c67a347712e5a087df4b21c6481168407ac6383e8fd5cdc511ea29fd7ec944edd2d514ac88b560633a3";
   sha512.doc = "f23bc3575d6c93d056c752c63bb39e3ef9c92de1a90177e204e4d6a1fd90ce8c9afb36e727ac8ce827a59dad96a3b236e5c3c09af081160113cee1b529bc1973";
@@ -21504,6 +23971,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "ordinalpt" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "c494aee642949d56d8fe4aa28c18e38faf5f66ca8d9f1990419b7197ba6d8547004bb11c3d7b1d63cfcb7414b5c618af81425e4fd61fcf114dc36f9b7fcfb039";
   sha512.doc = "dbcad860dd1fcff2e44f568caac9d3d60f4e9ac2312c672b9e9b46f9b31a2498a7e92bd646df8c622b024aefa8f2ecdc9c24e3f95f72f30f1e9b213d6bc4a53b";
@@ -21512,12 +23980,14 @@ tl: { # no indentation
   version = "2.1";
 };
 "orkhun" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "c1e52283e54e4de7caccfe605438e2775ebacc9c3fd21c143e29d7966c591ccc3fba77019e4f9ed9850762a0c80475edb6c9142d7ac2e3ba54007f3dac8b056f";
   sha512.doc = "ad0c15ca89057f2ff7d43a1bb8ea4513973978e1316e661a0e32ad8fb8005257a634954e85990958ba22360d29eea2d6ea9d87049435416616349874617d9dd0";
   hasRunfiles = true;
 };
 "oscola" = {
+  revision = 49772;
   stripPrefix = 0;
   sha512.run = "849e2daf4a7a48c6a2371b01392726c28d55d4da7ab7fdecdba545d9a9f8a7c2b026e856cdb3ff1104c1872584d6f180d5ee3e272c8b2adc3325a846a8c0478f";
   sha512.doc = "3d38a95beb8d399e33d6c9e1674410f14d7941fcd83524b658373d06c897e8bc5474eaf32063077b4a9ee9e5db4055bdf908ab8574b74e44b04dc1977714c1e7";
@@ -21525,18 +23995,21 @@ tl: { # no indentation
   version = "1.6";
 };
 "ot-tableau" = {
+  revision = 44889;
   stripPrefix = 0;
   sha512.run = "f3240c0688276ab6537201b20d6eee422a795d5d994c6bc8eab3f275a037e7adcec7e54c9500a3a5a6d2fe237b44b0b350a7ce6f72c7012bb48a69c9c43f2fca";
   sha512.doc = "396256f0ce1bda04fe1c84cb45928d82651b4f6363928e33bf092737ee6ab224f473567aa5432fa00a8e4cfd9b5a3f7e7ad8448090afaaaf89f97b33ff695876";
   hasRunfiles = true;
 };
 "othello" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "cddd446d5b63ed22ebc4e561e43fa8b4b1ab2cdb1ecc45ab98e60d6799646845a9d432aa45248e7cf70bfc4aea10cd42960a8846479df46a7cd701f792b4ca74";
   sha512.doc = "8ba85bf32ff739e4588512c2b33bf242b00e3f38a7ddb1b3f5582cd19b925e1adf52b4243857f1ef4b9d8198e8dc80a9aff8a63a7b3ff926978dc7e5c81262de";
   hasRunfiles = true;
 };
 "othelloboard" = {
+  revision = 23714;
   stripPrefix = 0;
   sha512.run = "c975c73b8737f008b7f31af86e6c8a89de3f907c6fe782f075b04819bd936da3853a8ecf15935c04970777a4873b5baa38f9c675cc8943190df84ddc511dedba";
   sha512.doc = "af025805142a845bde22a5fe095fb96cd533d69c50bfcea8716dd7d61fc95c41727c16127c2f2b60c5bf2b55870d698db54d307c2b025aff3e251419ed58a3ce";
@@ -21544,6 +24017,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "otibet" = {
+  revision = 45777;
   stripPrefix = 0;
   sha512.run = "8fdc06f22bc9d25b61cb7b3b151919b7d2d6cf3d78f3cfe5a11284d9246acb858410ccab56996cd521eb98518be9c232a4c8e0f8ebbe52d7e93c510e3a0ac070";
   sha512.doc = "96f9d64c8f668f67afe20dad97d1cd3cfec19df3300204831fbfe0d245c1e15d8d0cea48bb94fb002cfa18db45d3ade730848908b0d77b867fff7557b0fb826f";
@@ -21551,18 +24025,21 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "oubraces" = {
+  revision = 21833;
   stripPrefix = 0;
   sha512.run = "8a0a6e0648cc3dd9a342a960dec6512fc9153a083c8fc74eb08c4e0f46d091e5f2c71bdb69bae80fc13a857175ec6bab4b18cc81a0963d794028f4faedd0def3";
   sha512.doc = "c97f91df77f64d824605c56669136585b94d95031ed5a4a67f3404c54b2c96f32bafaecc06d114755d0e65c3fcd0379d63f28f94aa32ccb8d23730f5f3eaf63c";
   hasRunfiles = true;
 };
 "outline" = {
+  revision = 18360;
   stripPrefix = 0;
   sha512.run = "ccfb49c4e035f0d246f00aae56efa9d6570ad3997c44e2bf70588ce67a0bc3fb7bccff19b65629fb27158b0156a9802d97ea1f8edf6f4494f644f40df5d97118";
   sha512.doc = "301ad12a8f964a7dab05b208649c74ad39a64264f113963ebf36dbf83c90ed8ed042d8cc15f626f6081bd41f51d66dec592eaadabec32c65a0d67d15e8ead37a";
   hasRunfiles = true;
 };
 "outliner" = {
+  revision = 21095;
   stripPrefix = 0;
   sha512.run = "9251cb4154042c7620f545b2fb305cb996af9ff51c44259287a1f5ec490cd83bfb82321c4d8512ca2d22e5d2a7409ac5dad9f7a7d51f38a76bfe77faf2ca4af2";
   sha512.doc = "024095493b4b7301597798285afbdaca9fad291dffec9707b82da9f23b1ee0585345e4f201d6b322a1a65ceb6f703ab5430d14973c3fb25970b04d2785ebb9d2";
@@ -21570,6 +24047,7 @@ tl: { # no indentation
   version = "0.94";
 };
 "outlines" = {
+  revision = 25192;
   stripPrefix = 0;
   sha512.run = "1611e4ba3b8fe21db83a542da9d7e0c3431330bc24e3733d28c8c5b3172ce3e4b46ff5b7dda41f95b4edb6502236f6d558608487ac47f8726420a2afafed75db";
   sha512.doc = "bdc507a3f3cb966d03df37d9385145811c5750bce6341935231ae987b0a30dd65424a1bbb772920586721e25711caa429cd6d8b8149088f753f36b9dd69ddaac";
@@ -21577,6 +24055,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "outlining" = {
+  revision = 45601;
   stripPrefix = 0;
   sha512.run = "0d2b7dbe710d1ccd54a70cfbf6464a3ee5ad0fab8ccfa61306d5d5d83252c0f3b64f1caba6b5e8e75f7e6237fdfc675981acb67fbb730282978071e76e92ee40";
   sha512.doc = "c083046671d159fc118f25e56ba34d04f8011e0c49169920fe679ffcb78d93e52a6f8bb5bcfb34c47f0b23f73579519c431976229ef143a31ab059cde6dd64ce";
@@ -21585,6 +24064,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "overlays" = {
+  revision = 46122;
   stripPrefix = 0;
   sha512.run = "6ee154baa88428dfa149de77fa12e9d37ba6e5dda7c54f5e7f28b9d274be7457ae9a71484f3cc588a0797d4209bdef37a15de9e3175f0708711a54a845274084";
   sha512.doc = "3e9962fb56116a4cfbaf0e54e95a3129aa2414be617a12cda9b0d6199afa24021ab9fb1f8d5ddbad8edd7af915c1b80ee42504ab7873385a391916c96fefd6c8";
@@ -21592,12 +24072,14 @@ tl: { # no indentation
   version = "2.10";
 };
 "overlock" = {
+  revision = 52408;
   stripPrefix = 0;
   sha512.run = "449caa738b2af059871e8142b6257a65bcf02001461c64deb4e785cf1cec6406ad3d13f9b39bb0c06fde690369cf44c64f9dbc869a3269eaa1161fd840334eb3";
   sha512.doc = "5083d926ee34f7df8ac55111fe503d31589ff319725aba1a726500c3ad935974a29c68d677035a9b82beb249295513d4e3f70310cf078d376f084e354de81d94";
   hasRunfiles = true;
 };
 "overpic" = {
+  revision = 53889;
   stripPrefix = 0;
   sha512.run = "f6946c04fb1bd17f8708698671c17037688198996cbfac9b358169d1cfbaed9835b1b05b7779f3b4545c3b7de1d0ccd5148757b3cf125983ab0cdb8d895c5e69";
   sha512.doc = "39a93d00bc5646095c1e104927655e61a6fc337ceca8c336cfd40c39a63c02b18a440ca4c9557537d3ddb991e0ba4aac9f9ea821c7cce3f447359fd9f0203dd3";
@@ -21606,6 +24088,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "pacioli" = {
+  revision = 24947;
   stripPrefix = 0;
   sha512.run = "a82b391630b5f572d8ded331ae98f480fb0cf7f3eaefdcab3100bc839e2b026f012320e334e82d04e01a27657f36927a4d1570086899ad637f8c47ddd0f22b2f";
   sha512.doc = "fa911ec25c0d6cfa62a2d5396aedf893b9078604611ae5d34b06f24740f65fd62895e4d53a10931071d19ddd24244e3c7ee9893f4eff03efd0920fd1c1626610";
@@ -21613,6 +24096,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "padauk" = {
+  revision = 42617;
   stripPrefix = 0;
   sha512.run = "fec57c3e7bd299671ae8d6489723a4d33c54b11223f5f37f3f3b3cc148fcbb6d9a9aa46587ab83e414221cde3a7d0e4493877d90e9536952d9069a4cec7c758f";
   sha512.doc = "ffa9d45c971b7fe4fbc55644be4093268f842e13a2ffb1713be401cc88934dae86f012741951f30580a94a57f35b85cac9525869e0abca5601278d48a19782c0";
@@ -21620,6 +24104,7 @@ tl: { # no indentation
   version = "3.002";
 };
 "padcount" = {
+  revision = 47621;
   stripPrefix = 0;
   sha512.run = "9378dbaa1d3a569a3cb4bd70fa1b5a6dcdb0fe089d3a2c3eecef4cfdb776607f42b7fb018461c00781f8b022dd962e790146297f5df29889db13794e25c1cbb0";
   sha512.doc = "68ffec3a80473b3b2899ae262fcbca47198c61bf1363b9c167986cc95214c778fdd49ed65e8fda8f15d48d3d9941ac54c6660f28729dda176123fa1b3f7e8631";
@@ -21628,6 +24113,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "pagecolor" = {
+  revision = 44487;
   stripPrefix = 0;
   sha512.run = "6df1ddc270fa99a658d2ffe94b29e31e54e665b3c3c41c8c1f992adb8453f5bb6b59356c2ef049ac4679f4e996a6888911e5c8c5d92500df0a3f53d5a11f5fb1";
   sha512.doc = "c63adfeddcd00a7d738fd74c047b034d4a88264185d519d4891a429b82c62f20dc28196e1657e1c7c1dd3fa8a570d5a66e6af3aed5c78ca851ec40153f2396e3";
@@ -21636,6 +24122,7 @@ tl: { # no indentation
   version = "1.0i";
 };
 "pagecont" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "53b0f558c6198181349a66b39f0b54108a931279766882bfb713390e79ad0f62218ed841416e143c6909161ffec548592ffccb337505eba61f643a05d49f1fa6";
   sha512.doc = "634110b7cde040e5ae7be237abd6817055f7886d9fed5ce1a00b5ea93e9bc885f0c15398c280abe8472e27ce89aade2a827e66fc041081c8d31cdaf7755119bc";
@@ -21644,6 +24131,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "pagenote" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "f1db9829d909add12458cd17771136ef642b5655b03779c8b2fa46cf25afcb8843d91de331737f8f6537e7afc5f2dfd275926e6f4502c8022b0472d61b433b1e";
   sha512.doc = "b57cbcef6a6ecec75b351f6a3dc09f0422873155a8f90819dc4dd2caf60cd562a21de7ce62b241259c2f0dc3889c0deceb25c00f7f3d8764a90f5861c8e8c1ee";
@@ -21652,6 +24140,7 @@ tl: { # no indentation
   version = "1.1a";
 };
 "pagerange" = {
+  revision = 16915;
   stripPrefix = 0;
   sha512.run = "9216d443f44deba5cfc4ce04174031cae55f2adffa0f3400bf3f315c3b9003d1ee015fb6df69cb2cba23eb117f2ed191b7033ad46a51bc718260a44778783c47";
   sha512.doc = "862ed02746c6d91a2b8d9e19bb2e943e251dd18f0d94562bce9cc9e8ad603f7554e77ccfa2485b9a4eb7a2d6d5185756985f104d870e95823a4b33072f24bc9b";
@@ -21659,6 +24148,7 @@ tl: { # no indentation
   version = "0.5";
 };
 "pageslts" = {
+  revision = 39164;
   stripPrefix = 0;
   sha512.run = "7db146bce45ee5ceeec5904e8f3ed6efe0010885b657b0f74546644c3ce2a018deafa95a11390da3d8a62eef16508b82c3efa9d02ac1662cbed18e905cf869b5";
   sha512.doc = "58fe6250af4ecdd6d62c231778c89e0b049995feface3af66dc73b920f4dcdca8838d3274a7648caf2b38746fbdaaddd1b4f87577c77dabad2096e9c8b681619";
@@ -21667,11 +24157,13 @@ tl: { # no indentation
   version = "1.2f";
 };
 "palatino" = {
+  revision = 31835;
   stripPrefix = 0;
   sha512.run = "f21fdeb0423853294f52427bbe1477bbfd49b1a6255bed5f561dfa2156cf8309b2f71d2c09ad74bd64bc1fd69fc73816e3d84e72d975db5925d4c3c4db6fe8ca";
   hasRunfiles = true;
 };
 "paper" = {
+  revision = 34521;
   stripPrefix = 0;
   sha512.run = "484964a6da8fffb001e29b471f7c9fa52d2f1aecf66da8f9365376b987c79e8e39cdede0f0d61977381aea78f9e6429216c0cc2eaa67a831e4f1ace29e2c9503";
   sha512.doc = "2fd771d5f1035cb48c0a4de89f1174a988b3b8254caf535ca75633efe2ddc0483d095a720a9dae93aa7e832b0d4e63bc49cbdcd801e4190209f56bb0632c5aa6";
@@ -21680,6 +24172,7 @@ tl: { # no indentation
   version = "1.0l";
 };
 "papercdcase" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "8f2c923e72c7f16b394222ad86bc3f07304e6c39965473482c708b15574b0475af6eb6aaa085b94be6b0ddcce3324cd5639a8317caad55844998868ff18f0e73";
   sha512.doc = "01d43ccf0be5caa114f1b406e5cd4c1f8f44f06ea92e6d3fc999a5bc71e911d6c99dbcb8a1b9c49105b978d0d36e6ad2642f73446e3ba6a55edb11f82f40638a";
@@ -21687,6 +24180,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "papermas" = {
+  revision = 23667;
   stripPrefix = 0;
   sha512.run = "b5ef2975638a8eb48e7aa9fee72024eaf5695ee3133a35a4326461de03e04b750ac90e0874de232176435e0855807aaa074e6555f3368fee55fcaf61e6abb552";
   sha512.doc = "2d0a43fd05efe6c96a7852f35c560b77b9461e005432f972a9896184831fb81f72946956f3aefd115ca0f5fbbf684ab615d50a7ab98a5e09a190b72a08e56793";
@@ -21695,6 +24189,7 @@ tl: { # no indentation
   version = "1.0h";
 };
 "papertex" = {
+  revision = 19230;
   stripPrefix = 0;
   sha512.run = "489718b18bff9055917d9aa1329c34218282c2dec743c4a136625b6c39dc5102bc85d7da6dfb5e2b6a0f4bfe5a8fe27341ba9c7cd205cb8435ed3bc81a7a5c1c";
   sha512.doc = "aa36046e89f7e4486020a62dc8cb10f0a680247a3148149831153400a4ee935d3120525de3fbf29eac5c6cd58b655c1a2dcc2c4a8baf7d849a40f842d3b895fa";
@@ -21703,6 +24198,7 @@ tl: { # no indentation
   version = "1.2b";
 };
 "paracol" = {
+  revision = 49560;
   stripPrefix = 0;
   sha512.run = "ff7f60734dcf6d1db89a0b80747b31eb95bb28ac90ea5d83546feb08389fe890c6e3b4c44995b115d3e9d446823e81e27bf08337ae2d236a5a89c2c79258f741";
   sha512.doc = "a5711614d817193cf34cce405fc57f00dc17f3757b8c945dd174ba03453943c22e9c66b19a0f83444abd61f486e5df10246556e59d281f10f95452ad1931fb49";
@@ -21711,12 +24207,14 @@ tl: { # no indentation
   version = "1.35";
 };
 "parades" = {
+  revision = 40042;
   stripPrefix = 0;
   sha512.run = "6eda005756083b1ca0c1ee09efe44830874d8090c25aaddb8d6631284a057130d2f03ca7f88b460fbeb7bea90ad31da8242028a70b07f6a66bfb978cd7390e26";
   sha512.doc = "eca6b66f0bb424730177498fd6310718a78ffdd031961f8de877bd6f9d027430143c19310b158abf26f92b4280016cdac696f423b493aa49d60b06cefc546688";
   hasRunfiles = true;
 };
 "paralist" = {
+  revision = 43021;
   stripPrefix = 0;
   sha512.run = "e05bbd65ae7146515dd5dcc6ad7e40fc8437fae29ee26861aa9c2b4b6da0015fc00974f0a2328a72e6487660794a822bb64b35ea3282eac980c3e7fd23f4b899";
   sha512.doc = "5f103c629d1c0bb94aaf6c86f7baefe3e99a854e764306cd21e256011ae5ed95601416e33677f73f6471bf4ce2a375b6dc98b8aaf35b8dab1c41ca91b7ec3ec5";
@@ -21725,6 +24223,7 @@ tl: { # no indentation
   version = "2.7";
 };
 "parallel" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "975bb869ea0df9236f0e86cbfe880e9bd59ab2d6aeb98f0a399f5bfc7e4367b3f14eb64e707e4e7ba8bd3e0ee641765b9ddfd79ee1abac61f96414f215fa5cbf";
   sha512.doc = "ab4c283176cf1fd3d524151cc647c1da360a1772e57b282a91007edb1269d6bade379775d0efe6731fee18b3f3bc02292057d67795475a291a4dadc748d5b185";
@@ -21732,12 +24231,14 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "paratype" = {
+  revision = 32859;
   stripPrefix = 0;
   sha512.run = "f7c3089b516e40d9d5534a1d25ba104623f37c3d2b77b6545b07034114644025873c0317f4a0bd5b54c6471853f5e4c7847176b42a6bdae29a6efea555fd7ae7";
   sha512.doc = "5d11fcd66eb57909bdc56416f53c060cd248731cea02bbeee232d10cbcd2e10753a66ad7347212337b6b110e94a82970f98b1486ce21a6ce61fffa50135a6b6f";
   hasRunfiles = true;
 };
 "paresse" = {
+  revision = 29803;
   stripPrefix = 0;
   sha512.run = "92c265c8f34f24ea37a478926c127b203b9ddd143015875869745ea1633cc1458cfbbf4129f24ff141e91724f9bbeb1384912ee753ab7a26336c8470897430c3";
   sha512.doc = "ac71db33fbc694555438441de4d03d5277c598f12a7a59f8d0b4df05c39bb29571691c3165dfe121deebaa4bfb90fa5e7b1a2460d8731bbaa71502ee79b37a00";
@@ -21746,6 +24247,7 @@ tl: { # no indentation
   version = "4.1";
 };
 "parnotes" = {
+  revision = 51720;
   stripPrefix = 0;
   sha512.run = "798ac362fa4b67dacfe9b744163555d3c25c9e4487c5d2e2fa47be12d8d4b41bf89cb24a04f6434c804e9ca1f45e6d1f22ec234ac04596d5e1905589cf1eb558";
   sha512.doc = "e9728eb1025e80f41ca07632cc2625ee670a61ebe06d003585645e6aed183087df460a1dea4f3a8b17013af6fb3e974a95b33d848d2502435a37b1aa881ce833";
@@ -21753,6 +24255,7 @@ tl: { # no indentation
   version = "3b";
 };
 "parrun" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "1a09e6dbde9c24d88e21fffe24ead7ee7567a2c7bccd2ef33e49eb1bc8eff2befb3828a87616872f63d1d8eeba21814cefc8bbe756b17f887558449aaccb1668";
   sha512.doc = "cf284387780c9b2f4a79ebdd781388525aeb2a03ad9d85048061a6c43728bb6f2f4fc840ebb499a44a3fdf612ff4a20f36c17a377f959be813b4ee4d12288fb7";
@@ -21760,6 +24263,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "parsa" = {
+  revision = 53130;
   stripPrefix = 0;
   sha512.run = "5056c44131038c65cb945ce5f7e8415381be16c6c5186ee4f747acdfe99b1d31e94f5fe1bd038df0423277300d92889379ba080c30bc5dd9f76c868474d5a553";
   sha512.doc = "3e99c9ec2faafbd53a95ae6ba1641fe4eb0857f1a0ee46a633b162354e6c91f406cf438fac136d2e6085704bbd3f79a8814b6e4b4fa9769454b1812b9528bcf0";
@@ -21767,6 +24271,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "parselines" = {
+  revision = 21475;
   stripPrefix = 0;
   sha512.run = "81d18bfa1f70157ca04383a2f6e4cf228f23d878a9e157e79ea0bbbb743090046f5058ff0731ac42f881f5cef13063fa0ff2fa9b80992b334e02dd7f2a1a33d2";
   sha512.doc = "b6dfad3ceac162f9c122c2b18fa168469cb6c4befce1c4b2c8f003507ff4b2aed30e6728bf29f04545a080efada1fd98a9c8c064f4ac1eea521fb486624e60b2";
@@ -21775,6 +24280,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "parskip" = {
+  revision = 53503;
   stripPrefix = 0;
   sha512.run = "783e6be1ac9fa993d73c3c68c2fa3a96484e191e97a7f9b5d1027ed7aad11d3209f6d56d25c5f5f982cdb249c7cdc8dabce51bd8fb5d919da95665da04c39893";
   sha512.doc = "fe5ed5b4a7a89917603859623cd053c7a4b78de2f90c85bcf18e829b4e44e7e72a094408008fce88e2bbc0b2f235b38014aecf471cb8c7554a462065df60280d";
@@ -21783,6 +24289,7 @@ tl: { # no indentation
   version = "2.0d";
 };
 "pas-cours" = {
+  revision = 42036;
   stripPrefix = 0;
   sha512.run = "0110f82a7e0fe6219b44f645bcb01a5ff97a8a6800c06cb9b6bf10cb15a5a4749d82728622e23e11f272bd2250f3e1757edffe3c9d27f808a3e2bed5f4439166";
   sha512.doc = "ff7dd904160a21ad3d84a71f75f6b25fdfa3aa0687128f2f2eda19b2d590a91d0db1e654dd7d1fd7be9bd643e008db1f0c30b2d46ee6e3b02d0d71bda2b964cf";
@@ -21790,6 +24297,7 @@ tl: { # no indentation
   version = "1.6";
 };
 "pas-crosswords" = {
+  revision = 32313;
   stripPrefix = 0;
   sha512.run = "cc93ed7340380b2072ac7df4c0d343e43e1a3ae4252c42d9914edcb33232597a5c86d22cce3dc02218e6e725191f056ef9fb342e88d1a60dcadd8d011723b649";
   sha512.doc = "65baac7fa63a01c70293baa26d99d21dc999f959074a3d2668cf6661d3db059b47d2f577f8c9f5d7ac6014e601f50e547283c55541c492b3c2df4e5f01b65be5";
@@ -21797,6 +24305,7 @@ tl: { # no indentation
   version = "1.03";
 };
 "pas-cv" = {
+  revision = 32263;
   stripPrefix = 0;
   sha512.run = "4dc3203c5888aeb3c613ddc16446d7ced1dbb8ee1c0f0d983fa010eaf81d5a0a7a9364381be04e10bb15a9f258d4ae086fdbc650ab8ca627b07cc286be1ce1ec";
   sha512.doc = "93460e4435546cdb2df20e4e1fd555a726e909e411d42068b6f16f8bce2fa90144e1db95cad4cb94430f65b9614d766be00fa8c3e781a1de733b189a0b4585e3";
@@ -21804,6 +24313,7 @@ tl: { # no indentation
   version = "2.01";
 };
 "pas-tableur" = {
+  revision = 39542;
   stripPrefix = 0;
   sha512.run = "61fc474406d55ce0fa4b2edfb41f4ac9b2585e448c2b2b76452a29f2a03eec9ea1658cca2fec4fd0f1b8576919698a6d3ceeed650b773783af47685f33c969fa";
   sha512.doc = "a498726006eb5b3c7352a776c47e215fedfa7005d529fbdf071946ec736818e6836591670c7342e84d2886718d2faeb44824256f2aca744bf97d157e00f71174";
@@ -21811,16 +24321,19 @@ tl: { # no indentation
   version = "2.01";
 };
 "passivetex" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "dec61bb52bc1bf8588474e6d8971ca16f691d13b9c1be1f131cf0a720a205df1a95830f2f172df2efc30799d4aff9af064f9d851d9c705235aaf96e4b50decdd";
   hasRunfiles = true;
 };
 "patch" = {
+  revision = 42428;
   stripPrefix = 0;
   sha512.run = "0ddcaa07696216f9fdea55471e1265fcaa71dd8ba2b8a50690dd519ad8b9442015502ec59b8f9f05c79f5031be3de2956cd71af58153dea8e1917f33c246fa63";
   sha512.source = "ada97aba615160b3c30c9cdccf3360f3692612bc702247ae3fa44f7821aefa2ee60c89ab79417b0ff658335768512a0d8d9b5b17df619c57d169f6487d39e5bf";
 };
 "patchcmd" = {
+  revision = 41379;
   stripPrefix = 0;
   sha512.run = "a98085cb274c189644fa1307cf4ab5949a9eda76936fd6b74a7ba366b04d58b2a213c1a5ede53f644bdb76d44eeccd919176fb1934b8eda55489fee16f0c349b";
   sha512.doc = "3c65e6b1fe2b25efb45853deb5b3111dbfa03de7c0b154fcd86719a81bbf725e1872a6e6b5a9955e63f410ff3c05bce5de336f4ab1e612ea0d82b8d44d5fe960";
@@ -21829,17 +24342,20 @@ tl: { # no indentation
   version = "1.05";
 };
 "patgen" = {
+  revision = 50602;
   deps."kpathsea" = tl."kpathsea";
   sha512.run = "524ea5aa09feba7ef5efd47e35d8d94703be4e191bb081d0b13007e853e88729c6029451e58a7237ad5ddf524c4d0798421316c38d1d9374ed7cd05f2744f761";
   sha512.doc = "136e6c23505593788da8343f4dffccee77ffcf9fa63382871507db47c3ff23d6c25d0cefc985f67e4ee137840aa3af8f1738a5b2dac5272e568e73b18b71a5e2";
   version = "2.3";
 };
 "patgen2-tutorial" = {
+  revision = 16490;
   stripPrefix = 0;
   sha512.run = "4a157b6351e15274fc2972e80cfca740b4abdce0fc643a499fad8588af71441887974ac258627b9ef215ff9be8e33bb045f134554a6c0382b74f6af3275ab04b";
   sha512.doc = "4c375722cc01baaca61acb9d93baae99f7776483a6492d19b7cfbb13038a40ec3c76bc8580cc455e9233e89d0c29194f8c41e51078d3996a3e72431d9113a64c";
 };
 "path" = {
+  revision = 22045;
   stripPrefix = 0;
   sha512.run = "6a1fad600e4683476206385504ab5fb916caecc1101ac903d23042c25e055c6d4a73b85a57a3293929b1effd7d4af6db26c36ff994d76efd1c4f81073cee785a";
   sha512.doc = "e52367b81b9042af70e940aab99fa13140c31d58768ce94fb86df74ec9b52fb365168e7e325d8b2e304094e5a35fbd9fd687305062b5b606bb9e5748f143ac2f";
@@ -21847,6 +24363,7 @@ tl: { # no indentation
   version = "3.05";
 };
 "pauldoc" = {
+  revision = 16005;
   stripPrefix = 0;
   sha512.run = "36e67d812dd0218d013808879eec1150d6029e13519b0796f061a850d2dca99b8c07a2ec2fe9c49004b0f9947db10ac8d02d47a858b8b27852744cea58779d13";
   sha512.doc = "178950b84cc4d5e1d78001aa75fd8cd5f0b3ca8e800b15fa1b65e19968a4642fc8ab2a3c2a95ab661155437790f100d48730d40a701dfba3a21981e93e35ba6d";
@@ -21855,6 +24372,7 @@ tl: { # no indentation
   version = "0.5";
 };
 "pawpict" = {
+  revision = 21629;
   stripPrefix = 0;
   sha512.run = "426fe59ed20c41d3b11c87814b5f3737271d20bfb2cbc45142a36a42cb5aecc1555ea69a8ba1a1cac7bab323d8c9f23720601934f183d197b25e84d2037f057b";
   sha512.doc = "5f8fb39ccf22aea8c40e3fb5d2babd757447e089da79a9df35336c56049872f45bb04fb76ad08d8d8a8404523666841fc757e7ebbb5201a156274ec2c29958b5";
@@ -21863,6 +24381,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "pax" = {
+  revision = 26112;
   sha512.run = "3fa85993a3cee32753a6b965a2e7a97cccda36f2c32941e8650026d90a8a69c93ba1f762f802f15999b3c32e327e1a98d970217613a660cc5fac68cf3afabd6a";
   sha512.doc = "e4a2c6b4220bb498bbc1f74ab8fdfcb65d261ef944a43a86f9007bfd0073c9c6aca08fb136c8b1516d78fd3a37bb00388afc95874778fe453e75f0ea615ef1bb";
   sha512.source = "ad5e65d29d540d3736bf7045c0c392d79d2ba9c9a194a7d04df3c76729105b95c609167900e9b4533d0ea353312c452de0cb02f303b0d5e777c0eddaac0c18dc";
@@ -21870,6 +24389,7 @@ tl: { # no indentation
   version = "0.1l";
 };
 "pb-diagram" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "6e2e18f93d5575e3f9db1147a9e255d2ab8a3918e25f53315f91ec395962a3c65d7321c1d162ab7510f16b25e4bdc5c8e4688e56820759baef06dcb08833a0d4";
   sha512.doc = "4b12c7f67411ed86eff674665f61b6b2e34694c937222c7adceaab453d78a6a1f23c58d3abd7ed2320ccf05c40e6b38ff2280bd498e7b71e857bd6fc86de3067";
@@ -21877,12 +24397,14 @@ tl: { # no indentation
   version = "5.0";
 };
 "pbibtex-base" = {
+  revision = 40986;
   stripPrefix = 0;
   sha512.run = "4c807466ddae93f7b12a62fb32b4a8a8dcdf16eb8935548aaeeccaa90de15484e396f307f229cab8a2980212aa7627e80047502a067847114ca7ff6a9ae22c3b";
   sha512.doc = "a87c2feac2b0a115ccec0ced7ed9b5215c8b7501020a4ca14fea9a5062bc0994fa31c892c1a738c582118b73ff4df5aba371abaef76d3c15a00d5268bef85031";
   hasRunfiles = true;
 };
 "pbox" = {
+  revision = 24807;
   stripPrefix = 0;
   sha512.run = "cf2ea3781aac3d0b8619c46513bf9894c4b4efd8ba89eefe2e5fbe4e8f82fedd3b17f64467598080a577c65cc21713671c68763ff2600ce24fb6f6ddfae83a3e";
   sha512.doc = "1955a1cd5336a7d71483f49bbc8c65426485fd38447282262b58b4633398cda0753c5574455421b19d92d5c88c599f9c227b54a7c340a35daf233a4f48a1c276";
@@ -21891,6 +24413,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "pbsheet" = {
+  revision = 24830;
   stripPrefix = 0;
   sha512.run = "4fee9d64b1988f9981a056adc10de3be6940cb2cc7e23d9bc4effa8647e27601e5b74d2c15289ed5cc96c3f42d4f2569d897be111e2dff064a4c5d40445c760c";
   sha512.doc = "d929cb815e8204268f17d9e71f53550b7647d39fd50782c1e6bb848a6a8840ef8389d2f3359bef554450179bd9a638ea80a1c7ec018c7275165622f1ba645a95";
@@ -21899,6 +24422,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "pdf-trans" = {
+  revision = 32809;
   stripPrefix = 0;
   sha512.run = "8e3d1526b0373113064e4812003b84fd78dec65ce4946ef991f09efcb6ffab8e89a9a655c8a0582e1f4452feb526c077ec9cff30b1ad7f3c59f07bc715e643e6";
   sha512.doc = "a275e35947c38b93f5ade7a812d7938d342b25460e2a29e16a1431c7fff5939826ffe0bab30aeaf504a57ded91925e85853f93611702ee6dfec713031edf9306";
@@ -21906,6 +24430,7 @@ tl: { # no indentation
   version = "2.4";
 };
 "pdf14" = {
+  revision = 17583;
   stripPrefix = 0;
   sha512.run = "6291a2cbe2fea33d2a948a8ce58415de875cb09df1eaeb674f2a8fd3e3eb9fd5897d73e2ff613cb71562299ac22b07566b3c8730c807928e5a12f3e572f99622";
   sha512.doc = "1b848dc73554175d33b7501fe83f1689e5181bddc6f59db00829ea39ac6aa7f91ca4f936f93a66411ebb257fd77132c6a4fd3371c8c28f0258cdcca31b8f0b38";
@@ -21914,6 +24439,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "pdfarticle" = {
+  revision = 51127;
   stripPrefix = 0;
   sha512.run = "50cabf25f9da7b9adee489fd0a01fd9e5da2115d1dd09111507143a99a605cbc7e2de5a40a0e963b68942a601b7f0b753fdaf9cc1eadcdfb1261730fff5b4875";
   sha512.doc = "d77754cf21565337f6db1b984dd3812798833f61fa263e39f9a929b25391a3b31a55df97a7f0db4fd379e4bf3855c51b61a719c30187865f67d7d37444e17de3";
@@ -21921,12 +24447,14 @@ tl: { # no indentation
   version = "1.0";
 };
 "pdfbook2" = {
+  revision = 53521;
   sha512.run = "dd87268e3856eb26b37f025ac62f24cd5e680e92e727588d36878de9df799f49254ef2259c29de15db11d5888ada83110a39aaa3116aa6f6aa290d3e64f1231f";
   sha512.doc = "3048de4be891e270e8efe9f9d85524aff948c9483da25f491669a7181967dc281f42b984c9ee46464bc563c42a4f171589066f67818a291a136e1f49d40912ef";
   hasRunfiles = true;
   version = "1.4";
 };
 "pdfcolmk" = {
+  revision = 52912;
   stripPrefix = 0;
   sha512.run = "ddcc125c608eea472c06981c9f5a901a431da978fecaa2a5ecdd08e2f6499ad25632e4de86f7e92445a8e276403ee92bca636b80e5216e78b21ce355910ead67";
   sha512.doc = "e2bb876ad74381fb441d870422186f4cee76bb4cb5f721334b7119fe83b2ab0565ffd5300575ab52e8d25a263d87739a1e114cffed44ab3e25d8d5cff2006456";
@@ -21934,6 +24462,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "pdfcomment" = {
+  revision = 49047;
   stripPrefix = 0;
   sha512.run = "82e1f9e9dc35f652d1ad348c6f2e03c1472c36c113cb17080061f66777d129f55f56a29c2a94292974ed759d12727d93e1724a8b529ed0b4c8c3e53511ab1934";
   sha512.doc = "a7b6f568daa2d2c01574f56641326c1cf46c692d247fb8a8fd7485d6e804241a43691ac42923df35dac4453a23a5433fe1d7a063a88f4675a00780e89675a169";
@@ -21941,6 +24470,7 @@ tl: { # no indentation
   version = "2.4a";
 };
 "pdfcprot" = {
+  revision = 18735;
   stripPrefix = 0;
   sha512.run = "d046543b42966f8a566be0c89d78ca26b26d4095d99d5b16045283f0eb52a90a92122c1e87a2842d12d7ef2f865fbeaa69315a51bb922f713d33b9ef2e270fac";
   sha512.doc = "ef19fdf93050dfe35df88163453067e589307b2173481d4f3b6943411bbaabda94b472622b93485637de5c2f885f9153d5078f5d3bccafb52bb28d3e25f39ca6";
@@ -21949,12 +24479,14 @@ tl: { # no indentation
   version = "1.7a";
 };
 "pdfcrop" = {
+  revision = 29348;
   sha512.run = "eba7fd5c529e1b3a29d00ee679c24748050f1a6005391de4bdb6e6fd537cd447b01e6569e0eaa87251d49e14f548dfc80d5e33f037862a4e978905af37e9e186";
   sha512.doc = "5deb207030892f9e351d511bba20e65e957b5db17df6af60022c3f069cba127be6e9bdc1e94600b6f36af8f35697b041ac5aa529ef7997f57264b1dcbf76ce2e";
   hasRunfiles = true;
   version = "1.37";
 };
 "pdfescape" = {
+  revision = 53082;
   stripPrefix = 0;
   sha512.run = "ca908d58a9a0c0094fcd9bad550bf493a0dbea9e90702534a7418f9a5f506f5cedd42663f154bd227349e4e57e223b6360871bdc995eaea221c07cccaa780327";
   sha512.doc = "d95aa97463b20c178a04f9f2cb71011985eb5242ec620adb9911bb5f1103f71e9fb0feca5704a9339b9490a71ed67c8c038efcf6cf43e16fcd20ba2eaeff8161";
@@ -21963,18 +24495,21 @@ tl: { # no indentation
   version = "1.15";
 };
 "pdfjam" = {
+  revision = 52857;
   sha512.run = "9515d6156948df018b5c775e0882912aea5231ba73a30c5dbd33c258542a6afa936eaf9a366a0d498faf231e4e5ebe7485ad928c78114ddb9399b6f26f48c5ea";
   sha512.doc = "b2d6f867ed37f8f3443e0a88b2e1547ef755756409ea0f25e0982410394807f40a7b0bbb89d56e6bddd8fd65607d43bb28ff7bed6751fcabecb284ed1c2aee89";
   hasRunfiles = true;
   version = "3.03";
 };
 "pdflatexpicscale" = {
+  revision = 46617;
   sha512.run = "d36dcc4d70156d52bcaf668d620c8eee5db8914473f943412ea5ad5c8bde673a6715fd5a69d13e502a5d4fe0b1e0e55099432c4e0e5e02bd5f6155ca5804c3f3";
   sha512.doc = "64440f794e88c08bfeeac75d6d4174eccb800125c8d57e3b0be3ac6883c04790d422cb05cbed6be7335ab2e4d2e6bb2c8c0137c04160db126674960ddb7603e1";
   hasRunfiles = true;
   version = "0.32";
 };
 "pdflscape" = {
+  revision = 53047;
   stripPrefix = 0;
   sha512.run = "c343f0527f21421f26396a6210f7932786a222a437b43d6b2bf1c53339633a0aa8337843222d92048a6a5a41f0952aa2fde6e2bfb2e181cf811383a23ffadadb";
   sha512.doc = "5fccb7dc5607f1196d6df6a1a68d010c0b9eea10854cdf2e133f31dc4095f101efc05abcf9e980a3e05375ba29ce319dc13385790c2261778fde54d3b94d1251";
@@ -21983,6 +24518,7 @@ tl: { # no indentation
   version = "0.12";
 };
 "pdfmarginpar" = {
+  revision = 23492;
   stripPrefix = 0;
   sha512.run = "1cfb39ec9982fce753e3c0040123fc0faf39d94a41cac95dd0d189f2f5dd21f0a03c2f7e26de999097905b2bb32ec8d73e6dfa808c8ed2a49610da436639767c";
   sha512.doc = "24f2fe0616b0e6872da321bc7878f423df54057c9ed7b62eac4e3de36df4ba9a5f0c4481392902130038c8f2da098d2fc48be34056a03d6e764a01b66c2649db";
@@ -21990,6 +24526,7 @@ tl: { # no indentation
   version = "0.92";
 };
 "pdfoverlay" = {
+  revision = 52627;
   stripPrefix = 0;
   sha512.run = "089e33b32284fa775bd8a5e9b47604f5639060928f54397f775103823822eab11640660a982ff8229e8c1d63baaa26086bc144f2160401fc25855015638c5f0b";
   sha512.doc = "e4d21dee8c619fc301a75637f2f5fe8279e4deba63f627d153d47a90ee0cc19031547631acad2e9936aae456c330a7242aac9540a0b5c217ae7fbbfa2b15a29d";
@@ -21998,6 +24535,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "pdfpagediff" = {
+  revision = 37946;
   stripPrefix = 0;
   sha512.run = "ce28e8160b14d0833b57445392237dceab536108a9d96942dcc0adf5305c149ba08269d697ab8508d8ba05dbc59dd972dd242cf7c4cd12e3d3e857eb885e5277";
   sha512.doc = "dbdfc61b7f7bcafa597e439085f9624a48b734b2adbf53dd58ba6186b3597180b7ad3fc757acbd07c6466276a9e865bc154245e84d28b1e291004cdde64f55ea";
@@ -22005,6 +24543,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "pdfpages" = {
+  revision = 53583;
   stripPrefix = 0;
   deps."eso-pic" = tl."eso-pic";
   deps."graphics" = tl."graphics";
@@ -22017,6 +24556,7 @@ tl: { # no indentation
   version = "0.5q";
 };
 "pdfpc" = {
+  revision = 53902;
   stripPrefix = 0;
   sha512.run = "2f7a04d3cf55e996bb6507b7dd85a1816bd0ab2c26025b9a46f7c111912237b91889731f656b2490c06db5756e5241cb77c00c59215fb5c56a6d48d16bf7ed91";
   sha512.doc = "b49f357c4d08dfa8802218b30b1dc94f8db8fbd612399245333a26d93e543534899d7f0884222481fc5758b90220779330a85094317636860b44c9ab16f8f6eb";
@@ -22025,6 +24565,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "pdfpc-movie" = {
+  revision = 48245;
   stripPrefix = 0;
   sha512.run = "131ebad8b05395d0ca812fe50a103847393e4b00bc5574109ae3644b6500c58b86c48e33aab548c2404bd08ec6b893b9461d76f957111c7e653fec8473b8e63a";
   sha512.doc = "fef635a0d0a48a6cb35fe8c3e0b17342b84bbeacd1604e01e9fa1217ee92aef4fd073c1db5aa72161082c6dbb273f1a2fc55a2bb057cf3fd12796de8844df614";
@@ -22033,6 +24574,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "pdfprivacy" = {
+  revision = 45985;
   stripPrefix = 0;
   sha512.run = "8ec360bcfa5056b240091f1b2b5e6562656b15379bcf74b161899ddce41cb70d08cfdfb73b9497efd48e192fde11bfb4ffc59ed99059e1b6f6619e34b7f39bcd";
   sha512.doc = "81e2d8a0e5f5889efbf96eae5e879378fd0b4cdfa9db66283e34836b767d27d216e35822f9225eadd8816e46c503443055dc822f221b35134ecf95fa2e0d22ab";
@@ -22041,6 +24583,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "pdfreview" = {
+  revision = 50100;
   stripPrefix = 0;
   sha512.run = "1cb41c081230f601eb627d81118a3832597e97c2e0565f48f584e8f4b6d039ce903cdca54fea4591a5c9707d5145ff45470858dd2e39d3b18a2e964cb380301f";
   sha512.doc = "72f7a2083c7bfae24d3a4cae397925f9d02555587c59cfea8d78b8fcc0de5db24367968fd27799f4148865ca7c2a4c2dacd11269d1d71c36f039fdc913a532e2";
@@ -22048,6 +24591,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "pdfscreen" = {
+  revision = 42428;
   stripPrefix = 0;
   sha512.run = "e8a3fecc3aedfb87156c1dfeff4673650a8dfd31109e3d76e7f51dd99b1610aee086a2fd183d48cfe1403dadbc6a8ba84fcfab5ea832b43b8a5128bd07612112";
   sha512.doc = "8f4b1f6876b0adfcefb4a9b1ea5f9c8ffae0fb4ffc245fd75f631b172dc592dc82ffaf68b37e9c1907db5275f317b444966a466ab6c8e7b20b80535842230794";
@@ -22055,18 +24599,21 @@ tl: { # no indentation
   version = "1.5";
 };
 "pdfslide" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "bdb1d91b587375a0d72e317e4a762b9cef984dfa36d94fd7bd13a3e22941f0f1f4c981138b805613f7a62f4d09c7c781fa9e4e5d4b5019a749a8f8a700bf5540";
   sha512.doc = "92008d1e461e5309649ec5160b7dd3796455f04e923f4e5c8593a3a4cc76f704639206c48a4af13bfa9fa3fd735b03ad419f07d1222a45d093a6824aafcb8df1";
   hasRunfiles = true;
 };
 "pdfsync" = {
+  revision = 20373;
   stripPrefix = 0;
   sha512.run = "0a7f183fd83f52016d499f8aefface745fee8351bafb4abb467166553d742f91ead7377fc3ce8111bc57253431aedf70f4b540975a1c139017f7d02ccebb6ca4";
   sha512.doc = "7e103ba84fd41acbed007f4acceb0188372a4984977a3fbee3bf4484612c6e0621a934709982407bd1d59a69167c1d2f5ebd4b94f73bc502baa8a4830fe3f983";
   hasRunfiles = true;
 };
 "pdftex" = {
+  revision = 52874;
   deps."kpathsea" = tl."kpathsea";
   deps."cm" = tl."cm";
   deps."dehyph" = tl."dehyph";
@@ -22080,12 +24627,14 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "pdftex-quiet" = {
+  revision = 49169;
   sha512.run = "7b33e37a4b33060abee48ccf825cacecdee552d641da48dae47e3615fa0ab91ea9912b52fbd5c5ba6cdaa9c0d2cc7baa7c48a80bebb6d1887e5c633dacb4d104";
   sha512.doc = "e13392cfefaed2c154c086ffcf85e21725e4230ce78d10e07dcb0a1c8b3685bef2572c5f5e249c56120320f2b0167cd5055ade50625a296446a197c0ba4b85cc";
   hasRunfiles = true;
   version = "1.1.0";
 };
 "pdftexcmds" = {
+  revision = 52913;
   stripPrefix = 0;
   sha512.run = "04bccf5df6e3d0e70673cad77a778c47eaa3e733ee3b30062bde6f19126aec573bd8bb3e669b98ad61a5a3e04af4a92fc038340761ec5da955254c2874a669ba";
   sha512.doc = "932a1d8224152e54b34e5dce7f2a2ebb36d7816e3791b3d95399fe34a2c2dcd2a9487caed2e082c5e5e215e64ebc8a095a2ac6e1ee898546ea1f906634dd1ec7";
@@ -22094,10 +24643,12 @@ tl: { # no indentation
   version = "0.31";
 };
 "pdftosrc" = {
+  revision = 52960;
   sha512.run = "6b6fe771e5dd9523fd8d35456865068d980dbaaa8a8c3228ac4578b1b218c48e2fa851a7bfc89a77ecd9ee6c2eb743fd9da8351ef379a149e5318cdd3dbb41e4";
   sha512.doc = "96f268374f722248cba88a62cf81ccab39414d031345496044b4d2fa1b966d7e0722fa265d89f91ad755096920e937775c78dabcc4f60bd06645ddd990b18daa";
 };
 "pdftricks" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "f7c0a71e44d0d388ab952ff820e5af63fe0f94acb2feb3415a2d1b3cffd94efc7e8bd17efbb7b608d082ab1b7d7ba1b780c63088df54a8db241c9b3d133eab1e";
   sha512.doc = "0e3ec1f3b7d7c9bda1e08060f0ee0615244863e513a25370b598f22bef00e6ece79592a105eb13cc913c169b1994c8a38fd60be0566e1c52e1ce2f97dc1e5995";
@@ -22105,6 +24656,7 @@ tl: { # no indentation
   version = "1.16";
 };
 "pdftricks2" = {
+  revision = 31016;
   stripPrefix = 0;
   sha512.run = "e50406cd680e1d5cfabcfd8000b743fde61dcff7e3c686b06f58fd1fd36e414d53140b5d244ef65931aeec67dbf458e5e2d43266f26ee9de301babbc0f88853d";
   sha512.doc = "4a22c280a28e4a45f068d52f4d75f19b5ccfec30609d7c8d143cccc67d16fc04cd1ae63e7d6a5a659a0805ed85d96d57ff5fba4b246f67029457088e7696ad23";
@@ -22112,12 +24664,14 @@ tl: { # no indentation
   version = "1.01";
 };
 "pdfwin" = {
+  revision = 45797;
   stripPrefix = 0;
   sha512.run = "7f1fafb7396eadc81ae39727f35b1f49ee0fecf7ca1950d8fd5b80c46d24811cfa779a6d53b10c007a7916e14584de5e88f2bb5b1f3ef8fad739dde63e56bc0d";
   sha512.doc = "d352311a94d9f673ea8c6460f6771747b0523e2c354e5c7114cc58d7e0e92210f4eedb70a728d423de387a2ed2a3460f1acbcaef38579a26d2225f713e606407";
   hasRunfiles = true;
 };
 "pdfx" = {
+  revision = 50338;
   stripPrefix = 0;
   sha512.run = "c1e1be225efd5bd66873663ccb134521b40253875248096a66a8499609e62e481fa64e563afd75952b2dc0041fa1fce594f4047c3c91fe6b9443493ce8899ae7";
   sha512.doc = "22b7e52295ab8da136e584f545001d0db480cefb06b7d595133ff3508c9ee3e7b7d8c8a93c41ebf24a9e313b4e40fdf355a88ef0a65b629c3b27f5f4bcec906a";
@@ -22126,12 +24680,14 @@ tl: { # no indentation
   version = "1.6.3";
 };
 "pdfxup" = {
+  revision = 53345;
   sha512.run = "db2713a1f00dc2bb641094b4f1b84ca233ee3a28ac9bb70f41703937f51aece3d4f7b8803fe158cd4a470a859a81fdb68131a95ca32aca50eb9e83fe76b26f11";
   sha512.doc = "8d37a4bd8592ab172e59b9722712b4019d47cf6e732e6eead889119bdc396b4620b6aeb33d27def1b3f641e326cdefdf80191259386cb2a18292890ffaee9b14";
   hasRunfiles = true;
   version = "1.51";
 };
 "pecha" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "12092c82c52e34259fb0894b8375c45fd94b9aead121085736a0f7bac90b7e156906a22d233c596c79880aa0b858f7213f37b2059cecbb4627ce2e4163f22335";
   sha512.doc = "3d0d9184aa0009ab67f299a87b3840513229a93ec08e33208fc7b3c1a69fe043b02844ccf7569d14c5d5cdf0546224b320970caa080458c92cc299853b021c98";
@@ -22139,12 +24695,14 @@ tl: { # no indentation
   version = "0.1";
 };
 "pedigree-perl" = {
+  revision = 31990;
   sha512.run = "9adc918e1156b2a14bc144b96b5d3fe2b1272a5c9924e30c67236c564c1a065f06ea075249df21f19ce13b9cc03a885402e120d6b8f40f912d8c6ef4b98fc1f3";
   sha512.doc = "1e645090b3cb78b95bfed3398923c6e4cd39637238e7849bb1d05623307f82115fca87ceb6bac2aa89beb68371d7acd438099675ca33295839e413905b4ae150";
   hasRunfiles = true;
   version = "1.0";
 };
 "penrose" = {
+  revision = 48202;
   stripPrefix = 0;
   sha512.run = "2d61b2b6a46cab4a0cdb5d306eaebebb85af41ef75baef395dceb253ac68966fdccdf2317c6d26c24fa359e299f13823e4f69c40959cb2e88045b65ecc1148a9";
   sha512.doc = "58bd3b307c33494f61a28c897ac25a6587ab550d4e1ccbd5f05d101eba6466fb3981410084f34d7fa16570b3af6ed1e56cb5d9cca18429fd23d3371601daff42";
@@ -22153,12 +24711,14 @@ tl: { # no indentation
   version = "1.0";
 };
 "perception" = {
+  revision = 48861;
   stripPrefix = 0;
   sha512.run = "669bf4b618c4120d6cd7b574352c38d0fb3ab7bd949e26ea239f4ceb0fccbe102dcc6644ad2cee9eb79385f590918a12bb2c065f80b54e8343223056df448060";
   sha512.doc = "35428e19d9e2429691948331ef574168a3eb5dd3e09f4286c66003ced8c0a65da9853de4dd57a1920e2f2315b8543f9ec9e096bbd26123554455dd8c23b33f55";
   hasRunfiles = true;
 };
 "perfectcut" = {
+  revision = 51744;
   stripPrefix = 0;
   sha512.run = "3537b9010fe1719e6f27c800d6b81f01007d0c223a11eebf53daea4c67dab02ce94def02591b4663a7dfbec3eb9ebc4e7d9aac3db92707904068bd53d8567367";
   sha512.doc = "41ac483d2c8662a29f85936445ced063f0325045513a1b703828f8af8b2f544a3054d9a65bf66669025396da698b8e14533f405ed24f37738236b65d17a9439c";
@@ -22166,6 +24726,7 @@ tl: { # no indentation
   version = "2.3";
 };
 "perltex" = {
+  revision = 52162;
   sha512.run = "af7cd6b065f2405a514d20cb386b34399742a42286002ab3e0f795b64dcb434ae97470ce9cbf25cb27a9b124ebe56844b47c7cf89e1f83a4bd35f1bfcc98163a";
   sha512.doc = "d39c93f4bf3da08266bb0f10b06582db2bf96bee73faafdb191af3770c7c24abde407774f21d3c97b1f2453a8a9bd24576acaf0606796d7439334b8b1e42ac7d";
   sha512.source = "99a8e27c23a7056496c56e734fefa1e921a002d7b86c153b3a209f7c3d7c415dac05e77b0ce5bc8685bd622243d6ed53be4a7f570a3ed487c3d55baa5b5af06e";
@@ -22173,6 +24734,7 @@ tl: { # no indentation
   version = "2.2";
 };
 "permute" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "2b1ea22ff45718a12f5a031a60a2780a43b324afb3a7c4b3bf2e1a9808f5eb789938f0e084214912a50dc1a8ebe76c58cc39dccd5a411ce001fafc8fa5c41ea4";
   sha512.doc = "f0f9f8d4e7e9b7cf5794529bd5febb0bd58f1ba0e95a72d688280ac3e6837cf39bdfb62ac29584fbf8cb37e1dafdcb971b9333a0306fa867fa4a1a256dd5a4e3";
@@ -22180,6 +24742,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "persian-bib" = {
+  revision = 37297;
   stripPrefix = 0;
   sha512.run = "e6650399eb5129dd0ad08c3ff93843da47287ce641a65826545b10a9213437da56467eabd8c37f1a7fc17086af968043586c53bdbc7485e9a4453b3f5b23bf83";
   sha512.doc = "a18f3652bfa8cccd8d574e475859bde8d41de04d3093f05222dfe5687460b8eb29a1e9bc258cb73cca69dad52f567572a654f46414a0d513ec27e462f4787f35";
@@ -22187,6 +24750,7 @@ tl: { # no indentation
   version = "0.9";
 };
 "petiteannonce" = {
+  revision = 25915;
   stripPrefix = 0;
   sha512.run = "8ff32eaddcc84973851b93f0c1c1b250b596a080669ef60ea2c115098c4984d426e37240ae8781fa3b95ce494e9fecccdd259fd25b47402498028f2b8e5f9fe3";
   sha512.doc = "d171f31889fbf07b727c78a99bc91a2e6a8231faa25944a600ddb17ba32273ffa40a39a56e6e9b2c35ebfd0bb396ee699ebd9ab179577ab07e63feb8686d4af5";
@@ -22194,11 +24758,13 @@ tl: { # no indentation
   version = "1.0001";
 };
 "petri-nets" = {
+  revision = 39165;
   sha512.run = "0807444f934acf16b052dc499a097a2a645d037622a71430cd82fcef85d11bc652341ce6396a27d717effd08bde8ba3224c5235351fa9146000c01abd522f644";
   sha512.doc = "cf03048e2bccded143fb493b100fd19103ab90f40713441c5380446702d6c57ac3820f2892a3dfdb80880952e09de78e69b309783767a3e157f76b81c9360535";
   hasRunfiles = true;
 };
 "pfarrei" = {
+  revision = 31934;
   sha512.run = "f6046dc96672b60ed272dd6fe23a4a51032f039d3aeaff3f8b5e2407c99fe1f43c568a03564a7c20212a97bbfa4ecbd0dcb7f5f44593e1485c8e5d9197467a6c";
   sha512.doc = "d50ff4603d51eb72d1d12e7f5b1440fa3d7abb1ab74fdf441d7e4a474df91247a1ccad504a14438bc0c3c6354c8f8674f180b5d9d826ff09a8749db3cf0d08c4";
   sha512.source = "1e4008782161066066fc4cb1b029a36f6a18eb0d5d52f11a2a70d04d4778de6ed1a80ea1fef5d8cc86c2e13b8cbcb1cf8ce43e58ff4431b16ca23c3fdafb9884";
@@ -22206,6 +24772,7 @@ tl: { # no indentation
   version = "r36";
 };
 "pgf" = {
+  revision = 53349;
   stripPrefix = 0;
   deps."ms" = tl."ms";
   sha512.run = "afeab677fa457cb4a12c9e3531749fe0389e8f84f0fd46fb077ea898200f3fa5f23fffd81c430d36f67078a42c8ecf624b6ff1a1809f17d2223dde72249b729e";
@@ -22215,6 +24782,7 @@ tl: { # no indentation
   version = "3.1.5b";
 };
 "pgf-blur" = {
+  revision = 48446;
   stripPrefix = 0;
   sha512.run = "a341495270be35f6824a10edff85edccdfe4d9a0f3cb0ba50ede1b8f5970dbe93b0d5567f113b5c2dfe0661f7201fff710cfae0d9f3f1420245520486775e399";
   sha512.doc = "4cd2faa5160e0286f8b23f518c857b957e9873c0f8f1ec54f8156acfa1e15f7e8c22e6b4691d07ea929b6cc3c76847413fcb9223852bf26efb1c6455909e1816";
@@ -22223,6 +24791,7 @@ tl: { # no indentation
   version = "1.02";
 };
 "pgf-cmykshadings" = {
+  revision = 52635;
   stripPrefix = 0;
   sha512.run = "8634e486cc07bcf10af1abdd94bdf543f11bedc7fceac2f154a8a579920a7467635eae17cd62524b7ba7b2345f26cd4c4b50f8098b01b4f30eb15a120e480b92";
   sha512.doc = "e3e301f4979f47e16b9804a50d23575302ee3abef1c5a4dc8ea9aca3d94502c378f805ae54c61d7be9ccf78e236dc0a6c0bb54de47a515cc3a5350381768cfa8";
@@ -22231,6 +24800,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "pgf-soroban" = {
+  revision = 32269;
   stripPrefix = 0;
   sha512.run = "e0f85a77e9d81bf01f5516c3b3baa52a9b7f1b0faaa6f0aab1cae2182732eaf04ea2edb6b0f9091272849f1d7ccb3797cb2641090b926db7f3d0483d08569845";
   sha512.doc = "3f4c021cfb99a27778c250f9ac13e2abe48127731b54d0fca9e8e588f44ebf797e034a56d3ca19bc847bca173dfb03ef9a70e0fee71649188a8427d6eabceb80";
@@ -22238,6 +24808,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "pgf-spectra" = {
+  revision = 42986;
   stripPrefix = 0;
   sha512.run = "868fbaa9606718d30a18b710f2295f6e17f31f8a30b724802c765cce872b3b6623539217912bd20998f43777d0a10a036dba01aa65f66f0f89816872ebebe5a0";
   sha512.doc = "28c0aa31dce7627d9c9db7ebd0f9d8efd6e01b5c6cda5b417fb24c569df5c097745b95e94d0ca328ae25649505fae154976e393d60abf39ad775ab7e73b12af7";
@@ -22245,6 +24816,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "pgf-umlcd" = {
+  revision = 33307;
   stripPrefix = 0;
   sha512.run = "323572892f452d609286e507032c03d7301b5822dbce0ce3bf3a588a75a307dee0981f2c6c49cf17017c967bfff0d23bac24d7bc06b66475b8a9cfab9ae906a1";
   sha512.doc = "18a494bc6e6c016b3da4d5d51c2cc529ad515b69c6a150623ffa6dec4cc92474766dfc50cbd9c894f491f594ba5f2af4b1796d3a92da21b99272bba9a65bc92d";
@@ -22252,6 +24824,7 @@ tl: { # no indentation
   version = "0.2.1.1";
 };
 "pgf-umlsd" = {
+  revision = 33045;
   stripPrefix = 0;
   sha512.run = "e32c27e2c779ba362435fd0901703dade14836347afd99b7f8e55dd91d5724ba69fd517c39bf52d95189351376ad505a56634c0a751bc68df36dea952e30e7a3";
   sha512.doc = "de4b7c62d79400f107d94fe3101fbbf87ee6bb2cdbb04aa6c1d5eddc9271fc4090b39a79dfc18c45d9f73371f6de09707c342e2cd5ee6dece663ee4494d53ddc";
@@ -22259,6 +24832,7 @@ tl: { # no indentation
   version = "0.7";
 };
 "pgfgantt" = {
+  revision = 52662;
   stripPrefix = 0;
   deps."pgf" = tl."pgf";
   sha512.run = "0269703fc00f10981d5ce8958159a24814b9f410c1b00516608c039b1ea8a3381392bf1d89e98f3011d42210047bf2e1fec2f103467087f9172e143d9ab6fcf1";
@@ -22268,6 +24842,7 @@ tl: { # no indentation
   version = "5.0";
 };
 "pgfkeyx" = {
+  revision = 26093;
   stripPrefix = 0;
   sha512.run = "c2adb44ef34930aef1d78aed2025a2dc17c69ed641b59af29bcb93c9c9532785090f30834d52c415116ab4a9477d83e5a46d1509e6bd41f47fd4e37cc8ff2933";
   sha512.doc = "2a596ee81d2af4992dc23d6f28f788ef1d3e9a528992f01b7113de726898ae3007b685c4c447d2fcad640403d1bdd8a0eb07299ac9ea81f41c4158eb21b8e9e2";
@@ -22275,6 +24850,7 @@ tl: { # no indentation
   version = "0.0.1";
 };
 "pgfmolbio" = {
+  revision = 35152;
   stripPrefix = 0;
   sha512.run = "bdbd89379ed7310b78a3847c43022f6cd65f5fccfabfc4723551f5ef4f4cad3e3dcf596ff65cb4c5ba4a354f9bd59fa4aa39147782a0ed369a7dfcb68ef7f9cc";
   sha512.doc = "a9dbe657b4037477adcf3ead4ad4ca5b703ee8c53739da9de0bed8e02c8e14961a963e9a4a5a86b3f53348da9eab5cdbada1b5ddd073bc18c82177abc92023f2";
@@ -22283,6 +24859,7 @@ tl: { # no indentation
   version = "0.21";
 };
 "pgfmorepages" = {
+  revision = 51051;
   stripPrefix = 0;
   sha512.run = "6e40413358c57b2f16153c12a9f227563f107bbb966c795bd2d1d0dc7444b2acf7ad72631f23903941516bea803e4c539399884fb4e479abb61b4dc9a5bde428";
   sha512.doc = "b8e0949fc1aeec50514fffa3fdd88ee96017207a39f1d8c15b326604192eb2277ae6749c5faa8f531bbb0e3ad3d0e25d3c0478583538b2a8ffbba5e3f780c9ed";
@@ -22290,6 +24867,7 @@ tl: { # no indentation
   version = "1.00";
 };
 "pgfopts" = {
+  revision = 34573;
   stripPrefix = 0;
   sha512.run = "39b29273305a894c37bbb8f2edc899eb69cabed78623ec5ac66d6a75fd7d6b344c1fe4813f56383acd1c51acdd099fcaf3e97af294c5fd63ffe47e25e9cb9caa";
   sha512.doc = "8c5df446fe33e40503caeb8740becb28b3328490fb6aac2cf858645a5d896681d6448e5160cd32e7220c164838fb65dcfd85a22a6c6b9205511f6055f23dcabf";
@@ -22298,6 +24876,7 @@ tl: { # no indentation
   version = "2.1a";
 };
 "pgfornament" = {
+  revision = 39988;
   stripPrefix = 0;
   sha512.run = "bf930b8abf986df03e46e8c228e82c4015dd3f671688deabe3756815d86c2ce21d0738e4172874d233c3c7c28792ea7081a32011a3db64d93dc4a8b4c9f56162";
   sha512.doc = "6909f93df3cd162f36817ae99c7f7da532b9a44b6621d303ec4f4828c22d99d25d4e4c1ddc17f81ce2b070ac8fa40bedf5790a097d3d5ebc095abb88a92fe037";
@@ -22305,12 +24884,14 @@ tl: { # no indentation
   version = "0.21";
 };
 "pgfornament-han" = {
+  revision = 51863;
   stripPrefix = 0;
   sha512.run = "a53e1595e0ac579cef90379a85465fc3c247b803dea104ce7111de68c6c7ca114c6364ca50cdeda051e2353b85e91b39118c31c3d8e464943b8ac7f07d3e660b";
   sha512.doc = "d2f429a40d6e1ad24b098039cd212f7667442eaf47b307eaf81585f9443028d03bf612d5f080acc5fa20a153283d49eb8a9550f01596c8d6a38bb9eea4399b31";
   hasRunfiles = true;
 };
 "pgfplots" = {
+  revision = 52663;
   stripPrefix = 0;
   deps."pgf" = tl."pgf";
   sha512.run = "0ddb564ecc457328291ba09e9162acfdbc19d50d1b6aac3ebcf0d6de0c39aed6c3b5efc8957c59850fb49269e6d149f73f4aa5b41e176bfd8d3b99ce38a15a61";
@@ -22320,6 +24901,7 @@ tl: { # no indentation
   version = "1.16";
 };
 "phaistos" = {
+  revision = 18651;
   stripPrefix = 0;
   sha512.run = "d5cb8a051e1e80629385bff368896c47bdfccfcf38a24a723ddc5f9056a59c57703986799253812c9a4651f4e16dc55cee0876ddd0552900f978dab0381c9aac";
   sha512.doc = "96eb22628467289f72aaa0d4983e494c75b3a2315d8b9d2921f8ab29d93fffae4f459ef852529dfa4ff48a65e25d652662c54d84db54e0118b1c021bbe39eafa";
@@ -22328,6 +24910,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "phffullpagefigure" = {
+  revision = 41857;
   stripPrefix = 0;
   sha512.run = "4d443d5ce4dfd4805eaea4ecfe11bc94b9e92bc4d68f8fdd001a72ef09f519f11e20517d01722f5c7f79eeb9b92d0a6099d620e5c54dc0845b7ed5cc762c260d";
   sha512.doc = "837b57707c0d37d20b02ed83ca32768c4b2718958ba3124650604f4de0bb11528c2d5fed95f942545db400eca0517ef59fb168408ea9960f0a894a777e9f2681";
@@ -22336,6 +24919,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "phfnote" = {
+  revision = 41858;
   stripPrefix = 0;
   sha512.run = "d542b73d1a25d0d141a37e3bf0a3d4753829efbcfed9745ea299a90026325f82624bb5d4a5075892af758d4a4613e1560824871e6bb784a8ce0030a7fb3f4836";
   sha512.doc = "a62dc8166944e953b8efa49c7ab78b98744cb9948523f4decffee6a553a8e432ce2d9774575bbedce59e5dbd01e9bcc01d82962a19d3878a11367127a7927287";
@@ -22344,6 +24928,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "phfparen" = {
+  revision = 41859;
   stripPrefix = 0;
   sha512.run = "c184623f226f9bc9926eef0b5e23443bec20e66c6641196bc90daf27a648d9f0db70ad176488fe061d44746b6cf46a3217eeb42f6a95f2e37c20d641ba2838c6";
   sha512.doc = "5c34575950ee1a9616408f293319eb0634795e07173677cae112466a298dbfa5cc18fbead8e92e459718df91326d27cc7baf0414a1f1e8613a5c115c070b5016";
@@ -22352,6 +24937,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "phfqit" = {
+  revision = 45084;
   stripPrefix = 0;
   sha512.run = "250626ed9e7e33abf0d19c32213236b02849db849f080bee0ddc19370acb7e2e66c838dc1149f8c1194d2534c1e073fc2971fe3687174978bdabc90efc4b7752";
   sha512.doc = "0acdb07c2484e2e5694690536eca084ffebee0f549ead32b3557e368ed85d7a7785c297cc639cee2cf4b41f64f7c2df806b6b27d4ae89769b0b8d99d2127f885";
@@ -22360,6 +24946,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "phfquotetext" = {
+  revision = 41869;
   stripPrefix = 0;
   sha512.run = "809820fd3108cb5b33c5f3129fb3ae8251476161aca5936b966219a49a29204107375a33e6bfc452d2aef8b0cefb30f8ab0e53984f39d5c3228ded25ca19c37e";
   sha512.doc = "501d652782670318fdb45368e01dbf76de7cb46f0f1584bc7dbf1242a71a42e7bc870c5cbf7dcb33d41463c550a0803226860a0aa64e75952f717436e8f6501a";
@@ -22368,6 +24955,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "phfsvnwatermark" = {
+  revision = 41870;
   stripPrefix = 0;
   sha512.run = "38dae3ef3fe183bf5149b91050afd5bc9c934d01332b021ce87e9ea412008bc22d42d25a389e82b02ccc4cc4820a10d821c228c02c4f08fdca89ebde69c6e2d0";
   sha512.doc = "7f35bcb41618c7e14e7e9f8fb289231a8032f7f1cd2e6333982a346c5f8dd24e5733f70c03ddd183d170361b2b3af4115f6fa9b788c4dd2a020020ba525aff18";
@@ -22376,6 +24964,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "phfthm" = {
+  revision = 41871;
   stripPrefix = 0;
   sha512.run = "c6aeab1fef49a56a7ab080945199a4f68186b53bd7fd00e4c3d3babcd3f63f998748635edded858d5904b8dc7604007753bec12fdc8ff6a7656cf1ef26c0ca9e";
   sha512.doc = "c2439e7a3e7f1b0730b8fc48f933b9754777e7750a58ee6a5985ac458689c2df96d9e74d09c5ade2b0b8dac49e0be43ca60a0769dedc662e151e1dac5bb18cf0";
@@ -22384,6 +24973,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "philex" = {
+  revision = 36396;
   stripPrefix = 0;
   sha512.run = "0b6ce5d281836926d6807dda7a8a4eace43a25160b8bdfaaded7ef9838f933db7a7bd4859019555002b662ca01800e64c4f6228427b4f40c9a79e71759aca6e0";
   sha512.doc = "ec8eafe3e1b5e7cdeeb2554c3e34036c808f33b4f4bd2e5fb8b2e10e4366f51db02b2bf3dd52e46c92d600cc092f30c4db6cb6f69cc66cafde5c11a53a883839";
@@ -22391,6 +24981,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "philokalia" = {
+  revision = 45356;
   stripPrefix = 0;
   sha512.run = "6a7b76995074ec233d4922de96f727ed031b21abbaf1a423bded6bcd964e8e503d7d3d84d8d4eb1ca42ebd99e1af50a244238f668db245ff4810176abefb0976";
   sha512.doc = "8cefb15592711d19d3fbe5fbbe6efb219ce081dac6d8bfb12ebc57ac807a30aefbaa37f371e70b7141876333ef408ae5fde177add749faf2302b2d7f60a1bf00";
@@ -22399,6 +24990,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "philosophersimprint" = {
+  revision = 41788;
   stripPrefix = 0;
   sha512.run = "05f9639dbc34d0fd653f2609c581df2e50825cd61af7eaca55f03fddee2b0bf1c0c6bb3258fe10265cdadf0d8371d351aa143327a07f3739defb4ca3ca9b4f16";
   sha512.doc = "45bf6648cf92ee58d35847845094614884ad300d5ae745a57bc036d72bf7a1cf8dc7596daab8c606266c717b0114727072298f91b61e92c40dd180bfeb678a3b";
@@ -22407,6 +24999,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "phonenumbers" = {
+  revision = 51933;
   stripPrefix = 0;
   sha512.run = "79f875543181adada6e60d57adbc225efef89440666aa179ce69eef0118c528bb603436cb7df5dba95c75f60bd57bbe321f169358e247842a42cafee14cffef9";
   sha512.doc = "85a496e3ff30df0bb1a852e1e21cf0fd8434124f3ec1b460fbd3c0da05573a1ac85136d3caec4f4d59993d47ad82fc0f123afcbf272982bd614dd2e1f318394f";
@@ -22414,12 +25007,14 @@ tl: { # no indentation
   version = "2.2";
 };
 "phonetic" = {
+  revision = 21871;
   stripPrefix = 0;
   sha512.run = "fbd137931a2571d542b8cb66f8b613a57925277112c2160e21298791a65d91f4d1a6d3d8be5d6faba9abe033ded174d9d301f6ff1784dda3c1a9530f5f7a0a40";
   sha512.doc = "710233d18f904db9eb8c235070681b9789177b375b538c743424252e6434dfc3a16fb4c6c1e19617d939a31eb75b4823bdf30e633bc240b7b24650cb411f94e6";
   hasRunfiles = true;
 };
 "phonrule" = {
+  revision = 43963;
   stripPrefix = 0;
   sha512.run = "0465e183077f7daa57d2bbc5f1a76afa72770718d2dc969ebc3078b213738f5ae3919f3ebbee04ae54ff7b8ad6e35630fb22293b5cdac31ee5bf31680433ad15";
   sha512.doc = "80ea19243537e769c49a3411e036c5811b19586fda3878894126a151af4ddff46a554db7bc07f488f692fe9efd0934149c8c94cde75b92c880bfcc28218ae5a1";
@@ -22427,6 +25022,7 @@ tl: { # no indentation
   version = "1.3.2";
 };
 "photo" = {
+  revision = 18739;
   stripPrefix = 0;
   sha512.run = "11727df46b85be20802588a6c5743a9ae70a89ea73b5f16b8a4a3d3f1d3a9ab3194f56f0ef9d79947b14fe3f6b3e05cbd291dad8346cdb128b4d1c8c22d50bf5";
   sha512.doc = "037466dff8edee9f6218b1fddfe579b2f82491746e22886ea5f8496b5f564084d81e35ed549ddfc42855c850913cf8c587806d71b7a531ec3ea3056962c54e48";
@@ -22434,6 +25030,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "physconst" = {
+  revision = 53674;
   stripPrefix = 0;
   sha512.run = "9d96b559e6e9a67983b55fd5393386ddee8f5e3b42b38ead8f860f8141dbda62bba20a83ec2e7b53db455718eafe8383ac645f062d848fbf52eb41e50b8b4556";
   sha512.doc = "1fb1f3dec4373cb95b9282dc059a2997d05874cba9c08934770571357b2afece06806ca6615a8089cdb4832094dd0fd7f4abdeda812a070b100e1444c0ec2652";
@@ -22442,6 +25039,7 @@ tl: { # no indentation
   version = "1.1.0";
 };
 "physics" = {
+  revision = 28590;
   stripPrefix = 0;
   sha512.run = "e394a7f8eda4583cf196dccbd9d52122d0ee630a411630f11d432018c5e9696a9b3feacfa2f881d82090df165a73ee0fa610ad86422123a9e1502ccf4b695be0";
   sha512.doc = "40a85407502116954024d51361dcbfdf36cac07aae382ada1f96d413f9b838ea5a11d7014722b5641a75b6c9bb8a5c6c134c8c0d424788f47f45fc80b277b3ca";
@@ -22449,6 +25047,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "physunits" = {
+  revision = 53574;
   stripPrefix = 0;
   sha512.run = "904be8c48e61e663936daf8b646f36009e287e8656b08897b5572307a32768a442b16d10a29d5f981bce5d8eb6638320e66d2551a36fc6e4cf9448eb57f96f1f";
   sha512.doc = "e49086ad63a4dd87227e2433277b384015dbabbb7f1a5de4b46a2599a82978a96bb0553c336452c569a00372a7c1783f5098e0d765b9986e5778154ba3e7a52b";
@@ -22457,6 +25056,7 @@ tl: { # no indentation
   version = "1.0.3";
 };
 "piano" = {
+  revision = 21574;
   stripPrefix = 0;
   sha512.run = "49c3b29f48211ac6ca04ef8f9df74cd3f4673a84e9d84c2a9b06bbc958abd640116673abd751be40adb470907bcf65a42756c22996f0adc4e2c0dbf3d6afeca4";
   sha512.doc = "50609a17b51de85d5f9df4da91c0c1c421a86ff222d08268fd0145e248eea740c68445724fee425a2adbdab85e0cf5b4a9bb4ee5cf3bfcb4a3d5cf4f1868df47";
@@ -22464,6 +25064,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "picinpar" = {
+  revision = 20374;
   stripPrefix = 0;
   sha512.run = "9706ae1d10df99327d4778ec538ffc9aec465a04382b0732005d25660f452dda539b736be50a271c9be623a823be113696471da6c2d482dbf8a269af7c1143c2";
   sha512.doc = "73b28f87550924b208b48ca9a066861e02b1a8360151ad89609e6d8c36a772192f174befd87fb02b65e92370fec332fca5d67a2e84e97c7549b86825384dcf34";
@@ -22471,6 +25072,7 @@ tl: { # no indentation
   version = "1.2a";
 };
 "pict2e" = {
+  revision = 51918;
   stripPrefix = 0;
   sha512.run = "9f8fc3acbfb19b9e45579c2e2b0013dc84b9c670404e71f94b70c1e8a91569731a3b6b44e17e3d80bce5a099c3f16d6d74b7788daedeb48262971ad001d38472";
   sha512.doc = "43297b99d4032a53b8dc36ae64a42ba12d5b800a352514e9678b0fccbe5798eb8c780b5b950f72f322eb12b9b23266d57df6d74409ad17d413d08028b033c6ce";
@@ -22479,6 +25081,7 @@ tl: { # no indentation
   version = "0.3c";
 };
 "pictex" = {
+  revision = 21943;
   stripPrefix = 0;
   sha512.run = "ed91f0518668007aab7b9222dd08c7f489caaf084ef915f88d435128012b2b4eb9ba610168154f07bd0d084a34909cefb1dc0c1cfb2186982b4f08f9f6412f7a";
   sha512.doc = "61ed0f632d7f12fca4631b13714994b2cee8e05176262dd8cab672d4f8f7e65a36e0d927e3b803991818d9d2976d5794d48a46ebbbaf8bc8aad99aadec7d3fcb";
@@ -22486,16 +25089,19 @@ tl: { # no indentation
   version = "1.1";
 };
 "pictex2" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "26b608cc8409c62f4c0130cc032f2ca5929886fafb9d22d93aa23af5a6dee62bbde83926bccbcb4fbd3d86a43810d751eb43a2a94be9528e1639c59fb61e5446";
   hasRunfiles = true;
 };
 "pictexsum" = {
+  revision = 24965;
   stripPrefix = 0;
   sha512.run = "a24861e4b6184084fffa783918db485e5c7cacf7a6528681e7d8d4212287f1f6687604bd4f347e9e34ab7d29867dec2b30c9871a13b9bedae31b5dbb82ba1ed2";
   sha512.doc = "148b7c29cb8189174442b95cd39b0d5fdf9f937a7a44a17314b93cce555cf3db459e21ae2c4eb9098c15551bd7aada2804855d68f9408fdbe974f6c12dd724a2";
 };
 "picture" = {
+  revision = 53081;
   stripPrefix = 0;
   sha512.run = "6e6db1ced24b2e3d9da18df7001a5bc371385dbced53d9b265dbdfa7adfb07f91ecbada1eb3a8604b4f83f2dd40ca3250d9122262ccb1e8bdaf7ed7111540511";
   sha512.doc = "224a67a0e32f9713fbac6df806b0fabe47bf292d26ce4b4723655455c2396d9bba9c28f805c592f8247eb362bb28f9a26e300323d2372ad03c971b8b8af2518b";
@@ -22504,6 +25110,7 @@ tl: { # no indentation
   version = "1.5";
 };
 "piechartmp" = {
+  revision = 19440;
   stripPrefix = 0;
   sha512.run = "e4ef7bdc43280c4311a6e8abf2719815196fb0ed0a8450501061e0b3b0bb44cd60947d6d623ff753c5ad1384d98219df695865e6459eef02b2b96f00906d023a";
   sha512.doc = "f74c3c34d37eabc3b5e857a90e8da2c6ffaa3b4a6974c6b1127f898fb727ff18f0f399e9c4ccde8d4d198bece0ea83fbbac37a1ba1d381576166b5a2742113c5";
@@ -22511,12 +25118,14 @@ tl: { # no indentation
   version = "0.3.0";
 };
 "piff" = {
+  revision = 21894;
   stripPrefix = 0;
   sha512.run = "79b804dfdbb12b8d2e854341062f2a149f9b0e061385a30650c39b877cce72d1af4ad1644d73fb3ca733a171aa61d1b533295818dc10a92eacbce2ca60722de7";
   sha512.doc = "ef9d14cf4a38315e4d523082db9baf8d0f89e5963001d12ba7ffe260ca2255a6aa99dc38392a6ceb0fe24e6abb8c77b9343f29300ff5c814c01adfff3321923c";
   hasRunfiles = true;
 };
 "pigpen" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "107700bb0c2afd35755589551ca6bbd9a95ee6bec39e51868ea1b5fde4855a0ea2eb92b50105eb6a3490f82ed6f55c33cac25bbd58eeecb57fb80380095b7285";
   sha512.doc = "48c6c4c26e7518f06233ce0da8898c1c722829adfad042c12b8820bb1bde43f25410c41f76c51f4d01035c9d654bf3ae8fc7bb44a4d2c23c52f3336ec7e7d128";
@@ -22524,6 +25133,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "pinlabel" = {
+  revision = 24769;
   stripPrefix = 0;
   sha512.run = "56ed76be6c634b3c1fd3f83e12304d0d0e078e027754ac7619d680d2072ac7b67c527a4d23dda8feb6496e3808b3414bec65a48d4750d44405fa4574f122880c";
   sha512.doc = "c56fad48b7cad065196cecdb64e501555d2a8f3ca098f001123215f8e21968cdec2da28f2a68f7e07ee9b1c2d961a82590aa136b15bdc87e9176462cd706b0a2";
@@ -22531,6 +25141,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "pinoutikz" = {
+  revision = 52999;
   stripPrefix = 0;
   sha512.run = "e59a8a5c1d40fe81ffefb91308adb73e270ea1f7fe6d6e3cccc5a950b5acec6ef2a50c20430365e24dee5fa6459dc78325c18cc3ff150fcfaf79538bae085f00";
   sha512.doc = "ec0f726118a9a05aea49c498e60932492308d3f9fce70b2ef458b52a26465659175149da3a54a2e1ff76d4209f637a11cf8956c22ee9839a2540e1bcece023d9";
@@ -22538,12 +25149,14 @@ tl: { # no indentation
   version = "1.1.1";
 };
 "pitex" = {
+  revision = 24731;
   stripPrefix = 0;
   sha512.run = "dcc4280ef914ba66210ce471dc276042070b3246bc95ecb93b3d8af55393f49921a1d5e6851223299831344503dfc77fc2893f4cf1b78351dad40058979c20aa";
   sha512.doc = "c3765f6acd4a147ffd2c216b1cda58e5e6ac8dc1202b444fe80d0dd69449b01df3eb17069842ef745e76e88371bf71c178d06c5ad2bc85e3427726bb30b74002";
   hasRunfiles = true;
 };
 "pittetd" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "5bd78a90b4c7b9cfa8fbfad66e0de79d09762e06d3bb35a7aaa13ef8ba73aacaceafd8d5b5468de8fb59c6f4c76d364af145e101543c7ef2089dc9fe00e5e9db";
   sha512.doc = "e72d325fbfd3159699621fd703fd539259d1b13ae69d00e771291e156e3ce6cc15a0d7e4d2e74a3ad3492c39c67adfdca5491b68dd6e8ac78ac1213400f091fe";
@@ -22552,6 +25165,7 @@ tl: { # no indentation
   version = "1.618";
 };
 "pixelart" = {
+  revision = 46740;
   stripPrefix = 0;
   sha512.run = "9f9839c0d286262560f24c7bb83603c227addb9d5e969aae8d0d943cf305c25b06f74b3a2a3fcac9e6ab5f2473ea0e11b94283b71ee3794bad21c22212d05e28";
   sha512.doc = "8ac425c6345b95739a4864f89c967170ec121e0bdcc4b1c3aec9b60430ae7c240073439270db1311f9383c139bbc485aa2a39248c4ac5f788b8ce37345e6c65c";
@@ -22560,18 +25174,21 @@ tl: { # no indentation
   version = "0.2.0";
 };
 "pkfix" = {
+  revision = 26032;
   sha512.run = "b4d374e5b771e131075ec59ef6713c6433cc3cefb6331a933e791c3774a9d54d6c8427d70a4aadb2c6326c3733abdb562ca103f0b6a9dbcafd87856d20b18a24";
   sha512.doc = "c6819c63aa4cf7df5879a796e08299f2fa132e1244648d17a7fb0b3c28204b0641e56fe4661887c257ca4f5998786c31b1cae2aa64e3163340f08d02fda4c8d4";
   hasRunfiles = true;
   version = "1.7";
 };
 "pkfix-helper" = {
+  revision = 29725;
   sha512.run = "4828927668f21f465ab672b92e6e3934e81e60bd9b3bc1f28a65b2c4dd26d2ce244258ac1b7d8846c0bfbb653a2fe009875ddfcc0383b34249e775f675497478";
   sha512.doc = "146bc49beeb779c4815737cffe1bad30c28e7e44409a3e7036ab82c58f6f1b7e0ea3498f1a19cfd312390bcbc31c72d9f61a92501d87690a61cdc7c66c2fd2ae";
   hasRunfiles = true;
   version = "1.4";
 };
 "pkgloader" = {
+  revision = 47486;
   stripPrefix = 0;
   sha512.run = "2b9af06a79f484ce948b98d8ac09f3327a64e2299770ae6746d9762fc6b339d68aa3ad2abc5e67dc385bf4675cf406f170ef706fc101e87f6b58c839b6d3a3e2";
   sha512.doc = "231038d0af3e7293cec5b5e3a9835b1ddfcb60d5c8006009998e5a04638e0ff818ed36abcb2326a56149af0884297059577a3437e9bb144264cf42feed055cb6";
@@ -22579,6 +25196,7 @@ tl: { # no indentation
   version = "0.7.0";
 };
 "pkuthss" = {
+  revision = 52836;
   stripPrefix = 0;
   sha512.run = "866cd78cd589dbb4228aff9464943bbe4808df08960000fc7916268dd2df5c85102c95c01072fc03714680e6f250d13c7abd83f25441bc924db9d819a2f18b8c";
   sha512.doc = "2dcb977727324cf981f262aed38ba4d8856338a37b5499133c46348002335893b78f8efc0959d7c225c32eeca43a743c446f448b9e55ff354cb977ff9a86fcb4";
@@ -22586,6 +25204,7 @@ tl: { # no indentation
   version = "1.8.2";
 };
 "pl" = {
+  revision = 36012;
   stripPrefix = 0;
   sha512.run = "8647d7f075ff8c4559c1549b0e1075790b3fc2890b55f2d8612ea71b385b9a90b25a1827fd99b823ed945c801e1dd1773b28be3fd9b8e9744048fc370178e599";
   sha512.doc = "f9e53f7d006b671d788ee888432e62a98704ac5ec964ff6b65704a2ac9afd056f1de366c4ae60460de3c112fd9267e8ac8605543ab7d8cef345d4603c93070d6";
@@ -22593,6 +25212,7 @@ tl: { # no indentation
   version = "1.09";
 };
 "placeat" = {
+  revision = 45145;
   stripPrefix = 0;
   sha512.run = "476dac5b149811659c663751478f9f224e209dd63954cb88baadcc94c70a4861673512e01c4a5f30097d242f56f1a6edbf4fc225f8b561e49a4e60b02020488e";
   sha512.doc = "0fc82d9b448c85eb3d77a7943b9243720f41894f062d9723b3dd56f2d3e9cd8fcb87a3d57f387f1c87b3ea132fee2e0e08962d9044aa7c756f0db979f4c06a3c";
@@ -22601,6 +25221,7 @@ tl: { # no indentation
   version = "0.1d1";
 };
 "placeins" = {
+  revision = 19848;
   stripPrefix = 0;
   sha512.run = "618eb33f1fce0b089fe111b083b0153c146e0d8abbcfc235a86dc6a698a2fad080f8ac38e04037e06b0e1e2782291ca6d01ae69922d181b26b4c809d6aba262a";
   sha512.doc = "2ac2312083ae8abd3fe3f85da7dc65032a4c6bed4d1778c058120b48292f459d1b77d40e4eb6f0afaf88a5160d4fb0eb7f353ba1d93b7ec672f054e58de4d6f5";
@@ -22608,23 +25229,27 @@ tl: { # no indentation
   version = "2.2";
 };
 "placeins-plain" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "ba143fda432b8ff9f96d48218ea3b3d29308db3a403c64af5f4a89b8305ff835481d9e0e77bff92530207359115f6a44b006cc58bce99c0f7d3924d1134ef60b";
   hasRunfiles = true;
   version = "2.0";
 };
 "plain" = {
+  revision = 43076;
   stripPrefix = 0;
   sha512.run = "66f585e1fb6b95913ce71406e840bb15953b2ddebc3ce0344eed791e496ea75b93c4969abc363016b71dcaf65c0c676064ec778bcccbb2490031959ef3276bf2";
   hasRunfiles = true;
   version = "3.141592653";
 };
 "plain-doc" = {
+  revision = 28424;
   stripPrefix = 0;
   sha512.run = "bae58c957de52e1a45f91d8ea49579ea9c5b50b641331ae8d27146b6bbda1cf93e09abe58a011164ef99e5513cc32d346da7d693e975271e1892674aa5799406";
   sha512.doc = "03f17a65680e4fedd76abf2ec46dbac4b7871c3106c74d3d7c7f200bd6124146b2f78848a3761eaf63b2c909eb5925b78441d73a48a4437ef496b8643777d847";
 };
 "plainpkg" = {
+  revision = 27765;
   stripPrefix = 0;
   sha512.run = "aa1158f3958013b133dd3f9308063543268181296274a40e2ca606c8e684105e89b79cd9bb45d225e14865ca0e998e0412e8edf8057445bde549f249a6d69b2e";
   sha512.doc = "684b4f193f29336d5bd2c494c0c447cf0ac28090a156ae286437033e14507607582b3b9b40bc7b82fd92661a4bdd75f953e7c0b675f46418bb585b6a9492eaa1";
@@ -22633,11 +25258,13 @@ tl: { # no indentation
   version = "0.4a";
 };
 "plainyr" = {
+  revision = 52783;
   stripPrefix = 0;
   sha512.run = "a42c5fc8c9a530f91d467ab3707fbec05f49764e85b906510f4605749c60bdda224a4ba23be85acd722f48b0958ed7184b4bfe88dc7c3fea4a64e70f9407afc6";
   hasRunfiles = true;
 };
 "plantslabels" = {
+  revision = 29803;
   stripPrefix = 0;
   sha512.run = "7e1724b32035ee32325c491bce57ead23f40ad7377b4c1d5572499fef920b874bd57298e654429203cbea726b8d645a0899807547db80825be163538c1d91537";
   sha512.doc = "999f132df73c15a7b3501487f350e48777543745c5cddbbaf314bcb62eca9b3ba41b51324b61d04e9f1d9cef4b9b8ab851d3528f8893bb21e612a7f50511da65";
@@ -22645,6 +25272,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "plantuml" = {
+  revision = 52175;
   stripPrefix = 0;
   sha512.run = "a7eaf9dfd05377787a9bf18855506506a8252f0a8c44aef2d452834ea1f7091ecca66dceb6124e44ef117294d526838944884ee815a8dbf48ef4558da1284eb6";
   sha512.doc = "ad2dc0f8696e15a55dca16c3a45a6376cd423c31722376b30fde2ba2443a4b768d02f745838ee4c83a1a228b6cb492367127799d9483a800f2da03ebd0eea214";
@@ -22652,6 +25280,7 @@ tl: { # no indentation
   version = "0.3.0";
 };
 "plari" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "86e91b884be131df6b4da6441a9fbeb872e0f345eed49005ef74d58eb3ef8a2724da98cc810a51b58d45047d77545ac6b9512612b5946ba29d443dd14bbdb263";
   sha512.doc = "befa46f8ef7c4c89e18339ececbd53341aa50d6bfc8927001d17395cba42db0f0ca3414619c746c78e4f5f4f9cb1f6db813defc7b89299f5b29e9c0866852c82";
@@ -22659,6 +25288,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "plates" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "f662191f6a053585bbcf5a71635b6f63ee5d713086bd24f3c879f73868b5ab42b6434860b68408fcade7b7ba448845d1dd6a5be12b10bc25be8032b9dcef9615";
   sha512.doc = "12779b285951d5e3d7a0f9d3ded736d5368291b678fd884262908897c4e32bd5fdbdd6bb4eeea59bf922555d5dc8daf6b0e06a174fba2605d4357dcf1f09c6d9";
@@ -22666,6 +25296,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "platex" = {
+  revision = 53975;
   deps."ptex" = tl."ptex";
   deps."babel" = tl."babel";
   deps."cm" = tl."cm";
@@ -22684,18 +25315,21 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "platex-tools" = {
+  revision = 52049;
   stripPrefix = 0;
   sha512.run = "bd1b61377f9793cce68a18c43c43316aed3f6382d031e7948e5ab6726b9be18d5b819ab3fb4800dd9fd1932af433352c7285eb9498925f54b66e0f87b0d293f1";
   sha512.doc = "a58c732af05538e8450b9a329754d576cd0c606a676d2451212d928d39e841bcf702cb5e096405c455f98cf012bf4f75d39295d7ac5efc1c6d3647a16345434b";
   hasRunfiles = true;
 };
 "platexcheat" = {
+  revision = 49557;
   stripPrefix = 0;
   sha512.run = "1409c7311eaa82811236d869b04e9f55fa2a96804faacef4820072a4813055e70ecce0e8c155ec19016f1ed4e57bebe0b362c5457d1258f317a40fc475d42aff";
   sha512.doc = "bfe47b947a915099de15e5519a3aff201b327c31d29c1966d4fd3e9b73581792d918b461ed1944aaf5e8a5eb7956c38579a3fd972f189b1e3abb903c7c904cbe";
   version = "3.1";
 };
 "plautopatch" = {
+  revision = 53906;
   stripPrefix = 0;
   sha512.run = "a50f5b0233e586d25fda8d2fcdc8817ae4ae56b13a2c3dd505011d17a30e7e5d3ca10547416fd2d5df9a628ace79f575307049510150c4e925fb1fc30871ec6c";
   sha512.doc = "984daf85b86d3b1c308c52520148fef9cfce188a6d210514e44efc3dd7427e80c5e179cbed077e4b52b2ec6239710e64c18cb1b7f8f6734662ebd4cf1533cf5b";
@@ -22703,6 +25337,7 @@ tl: { # no indentation
   version = "0.9e";
 };
 "play" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "040468367a783e7bc49dd4b51e22a72c41ff2985a52e2551b3be6780767e17c8d11178f097cc66f5683033eb03cc2ebc2c08c1f4477daa7b8f9e22d8a40dd385";
   sha512.doc = "97c882b12ab350c5b0fe066e04ea7c2c136b1dc7ca29e51d8f89ed695769c9ef1ed255c3c109ff71838bde91d25167a398230cd25809f1374ca306fbd9ae68fa";
@@ -22710,18 +25345,21 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "playfair" = {
+  revision = 52409;
   stripPrefix = 0;
   sha512.run = "cfd2c243878c3d2bad12bd6e284078b76097a43cb01e9c35bbc4af753502bebd49e73ca49dd91575196cd27d2e391511bfd4a268cdde20aa948f835d877a16c5";
   sha512.doc = "9b60309afe7472f848be4b85dbeb4a5dbc422a0b0ac480a2f97c73a7525c9f20289133dc33e6e49a029d9e277536df5dd1bfefb57d65341a5d2061b3877e898f";
   hasRunfiles = true;
 };
 "plex" = {
+  revision = 53058;
   stripPrefix = 0;
   sha512.run = "d25fef41064797f9cbfaa2350b8868ea8291fdad3bcadb48021e7795f0d31ff86beb21dcf5e5a6749870354b3f77815191572423c3956946c60c5232cde02034";
   sha512.doc = "9d42faaf2fe27f38f96015899960d6b0ac8f423f0baead04a7b740b28e052b00f116bcfdaa8f435d1b61e6e697f55b5c5b8cc766ef11377f48580ce888b203c7";
   hasRunfiles = true;
 };
 "plex-otf" = {
+  revision = 47562;
   stripPrefix = 0;
   sha512.run = "07e49e5dcbef60efd3e3050259f10b75bfbb83128412a1e60a31c2f17983ec73d055e5f6e117ec2673f9f0e5db716471fefb312be50cc4475761aa6ad895e9da";
   sha512.doc = "4af950e1a3a384a1c738c6fa1bad629010ee2718840094500976b6883c2e3120cd070631463f90610c60877c0dea771c9c7e4f8f8c091aaf1f29b15b8400de96";
@@ -22729,6 +25367,7 @@ tl: { # no indentation
   version = "0.07a";
 };
 "plipsum" = {
+  revision = 30353;
   stripPrefix = 0;
   sha512.run = "203b9cf56acbc53b2a3c195ba0a27728c93db91bd4be48441e61967fd0488cbc4ef96485ff0b567be64ddba798bb44308cb7cfabd2a2ac89d294203d93ff4d29";
   sha512.doc = "6d5c77102abf42304f8480f74a073ba25b8cf317c3a6cf4c22af6035b17b07ac213866a10ead2a53d033b214e4a6d6e642d043d847e61fb165aa8a02ef90f7b3";
@@ -22736,6 +25375,7 @@ tl: { # no indentation
   version = "4.3";
 };
 "plnfss" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "0ae352953c5981b791379d9da9b61ad8837c22053f3371f351152078f4dce6b12615ed771987115cc094613ddeb0c275568e1d7404f321516418d218d9c68473";
   sha512.doc = "9569a4f77dead68ad8c76794f03e6ffe147e1801324291fc13487b05051fcb7f307971e65edf66024c169411cee9b2940eb4daac4d073773e67f2f303b364870";
@@ -22743,6 +25383,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "plstmary" = {
+  revision = 31088;
   stripPrefix = 0;
   sha512.run = "72d54627fd8a10215ae9fe417423c46240997f865da8b4f4b976290ded7fbb0360477db27f140bed0ceb4dfc57c42a23fe5ce780ec5eeebb9b3e30b372adfe9e";
   sha512.doc = "6e5c425b7d484bbe187eef030fbc9d6a0ad50d6d8e22c5f08d3762cf8082b434de8a4c5d13251d90a016715c9a85aa82dd2637abb6e17a6973a08514baeef7fd";
@@ -22750,6 +25391,7 @@ tl: { # no indentation
   version = "0.5c";
 };
 "plweb" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "1899a3498d10950f67d24d2d7bf0488cd8867bd862960fa892581137bb1fb3426dea9e193f8993ffa93df11684dbd1f25bc79a98489317998936ab4186e9a22d";
   sha512.doc = "9a510c4fd534c9451863a47fb8fa3911cf5199b295b1e3e2739cfc37ca0351d28fa1876e5456cf05ac7cc05f9f60761578ba6d77841ca575908cf4f0c9f0e3bd";
@@ -22758,6 +25400,7 @@ tl: { # no indentation
   version = "3.0";
 };
 "pm-isomath" = {
+  revision = 46402;
   stripPrefix = 0;
   sha512.run = "2ca05438d8a9e4b2a9d1e4a9232071d34a915d9f93cdd865191e350b128b9ddbc9f0af67d76eb49ec2b6f2a1485a5a792850f0abbe59de0ba4f50c0c10b89a0a";
   sha512.doc = "76876cffd5c59b2ca74901c5c83e364c0c7982b947efd869f82ba801298f5b57d84f292015c8da28a3e49aada42eeea9c35d11660c3b61abd0ccfe31708e8d9c";
@@ -22766,6 +25409,7 @@ tl: { # no indentation
   version = "1.0.04";
 };
 "pmboxdraw" = {
+  revision = 53046;
   stripPrefix = 0;
   sha512.run = "d229b15e57fa76a9e8e9b903b5fbbb99d81d3c8a2b1818d71c103df7f2a1e9bcf79aa8396b6ab7a2ce054371d212375b968a4a5d572fa8686223baa8dccf4eff";
   sha512.doc = "42a439f2f88235faf7302400432d49166861476cdc43708f84780d153bdcbcb55dea1a6b31cde2045d0b99d48c2a4f51ddae8bdee08937308c5de02e9b16a523";
@@ -22774,6 +25418,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "pmgraph" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b6e9f00789ad102b6cdcfb0fe48e5ca4f6976a7c207088c0c3e8b0c2d4fa376bbb932500d42133571a6e18747615c77eb6df2b4872ba86f853e3069ef198a671";
   sha512.doc = "35f45f43c95264d4dbac5d12a71270fd15280f9008d204e12ab0a3bc6a62939e6de87233c94eeb7cf9627464d5f383c3d8c2cdeaed6eed9473a3e5fe380cc5e7";
@@ -22781,6 +25426,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "pmhanguljamo" = {
+  revision = 53693;
   stripPrefix = 0;
   sha512.run = "123367842e0d4ba5521a502b322bd1509dc6cbfd8cb5de1c7d94bc2f96032aeec70277aa6e742a78a1bc989bfd5efa24a5ea95ae320fa736a2a2972d8eec8086";
   sha512.doc = "366c1f364922eb5e00caec1f2922061ab9a80707e7a04b4d42dc077bdcb744026a545fecb597bacef7d1e253ec53ca7f15fb5e21d3398b9a18b366015e158eba";
@@ -22788,24 +25434,28 @@ tl: { # no indentation
   version = "0.3.2";
 };
 "pmx" = {
+  revision = 46823;
   sha512.run = "d8c20ad86fa90531b0bfb1e7af06492e31a4b3a46331fd36d60bf46275103672b61a419eb671a3c89f098e0c74a580df313d75001e52b27b148bf322c7df1593";
   sha512.doc = "37405b45aabf5bb6027b7849bc23f263f2ab9ffec515c3d7a2073bd7030580898b1c2171c760a9da40dcf0cd4cde890e235dde572b22e69e6a273b7bec4ebeb3";
   hasRunfiles = true;
   version = "2.84";
 };
 "pmxchords" = {
+  revision = 39249;
   sha512.run = "0a8f4a88834eb22d3f11ca567f37189af7834370530c6dbca4d83482e94cfb48b128bc1290e7f3ee718bffb4df445a300ddf5081805f88002f53bcf8b434bb3c";
   sha512.doc = "d4075306620fa1ce037a37b9d2646d197348f6482e1286ff6fd99641a8b441b3d830a1420dbf6c025b8d11af78363b717a1acc7ea6b9e2954aa4f11ef04452ad";
   hasRunfiles = true;
   version = "2.0.2";
 };
 "pnas2009" = {
+  revision = 16287;
   stripPrefix = 0;
   sha512.run = "5e20303db90b2db63a3d6026db582026df8b9e910942303c952753d5dc27928ec70a8dc21edaf44cd57e04d25e93a87a5f28caa769a0425b47c78ea9d56ffa86";
   hasRunfiles = true;
   version = "1.0";
 };
 "poemscol" = {
+  revision = 52574;
   stripPrefix = 0;
   sha512.run = "ff2350ed68690432ca368330f50c5a76ff586c2a09e7e487ea114d75b9b488652ce561e40d69ee02a5271b4ef93ac3dcf888cd64b79a33b8f7b5d95ad7972e81";
   sha512.doc = "89a929f03afae3c1a48aa4289bda29b06664d4583c6474fcc3df041b809c240114f1f5a14d2f1d1493c1c36d31cb9344a4ef6ba9ca6e00008f3c9f1dc5ffa0c8";
@@ -22814,6 +25464,7 @@ tl: { # no indentation
   version = "3.141";
 };
 "poetry" = {
+  revision = 53129;
   stripPrefix = 0;
   sha512.run = "1f618b339fecd44d21029ff9ecfb95a97e47fd5d20089a2115d70c8336738c794e1c639c78a16b5756d591fbe3ad52576e3923f6f86245fcc9f7501008382eb6";
   sha512.doc = "540a209251cebb31bdc87143fc8b60627a9296f488f58a81faaefb3c3cb66517e8a670e81b4363840cfa1220697d26517fc1bebedf43f62a4f1c18e3e14a8d65";
@@ -22822,6 +25473,7 @@ tl: { # no indentation
   version = "2.2";
 };
 "poetrytex" = {
+  revision = 39921;
   stripPrefix = 0;
   sha512.run = "9de77dc676f78ce6e18ae62f621126ffc2d78ceb9cb5612f8c129f0c0d123043c554a8996a68d2bf6c730a157f5cdda4101f8446e0e773671258ffb55d6fe93d";
   sha512.doc = "e9bc2551a92df86e5b76448b2de7af423b8f96ea6a62b1e243f76588478172a7ffe035ed904fb8eb3c5be031e1451c997a68de3187933c3a7273510710577f25";
@@ -22830,12 +25482,14 @@ tl: { # no indentation
   version = "3.0.1";
 };
 "poiretone" = {
+  revision = 51396;
   stripPrefix = 0;
   sha512.run = "b270f09c59711712e27b3a0a73ca6109fd0e2580184fc5df02fe55140eb7db7b4e72e190309d12486d49593053ec50048c89c6203512cb451baf5aa2caa77c7e";
   sha512.doc = "c9bb0616d8ce72c114178b4e0ca26bebcfb797af701555d53b3a1bceefd556eee2bf91fcde891b9b2a7b8650bccc9fd559b8630904e678adb4d2caa912da003d";
   hasRunfiles = true;
 };
 "polexpr" = {
+  revision = 53633;
   stripPrefix = 0;
   sha512.run = "562fbb09aa3eddf5e25d8617eb4d8332eecb20c0b5ea386762de4277ee15e47dd13243be978146b60b147bc30a167e5a00a6970ee0dc74710f13640ddb4da6fa";
   sha512.doc = "7cd3af9fa8d281b780cbcde915cbb241efe8d2398dbc7ea9e1aaf467b9de58325834faf9f9bb7ea7b9f5f5192ff4016f4dffe7d58801860ebe1735dec7ecd6f5";
@@ -22843,6 +25497,7 @@ tl: { # no indentation
   version = "0.7.5";
 };
 "polski" = {
+  revision = 44213;
   stripPrefix = 0;
   deps."pl" = tl."pl";
   deps."hyphen-polish" = tl."hyphen-polish";
@@ -22853,6 +25508,7 @@ tl: { # no indentation
   version = "1.3.4";
 };
 "poltawski" = {
+  revision = 20075;
   stripPrefix = 0;
   sha512.run = "bbdf230da2f81b48951eb90016745d68b73890f8c34ed2d336212ba33c7662a5bee1ba005d6e44c4370c81d22928e1013fb39e45db2de16fd05543310bb07d17";
   sha512.doc = "1ebe7bbd99a3316b6c4fd702770c6f14a32de653909099a86433bd847a63b2eb231cba4f74dfaf1155c54a9393ae1bdf25710fdfc25199d09b75a265392ba51b";
@@ -22860,6 +25516,7 @@ tl: { # no indentation
   version = "1.101";
 };
 "polyglossia" = {
+  revision = 53592;
   stripPrefix = 0;
   deps."etoolbox" = tl."etoolbox";
   deps."filehook" = tl."filehook";
@@ -22874,6 +25531,7 @@ tl: { # no indentation
   version = "1.47";
 };
 "polynom" = {
+  revision = 44832;
   stripPrefix = 0;
   sha512.run = "bbff103f5828757f9c58c768ba46dcd9197629273b12d997e80e299dc1cf6a34e851fa4ebe088d131781eb6efc1fbd39cab602ba23b791c68fdb0e12f69440aa";
   sha512.doc = "b0fdee90082414d88469ba5067f1c16279ddfc8c13627098bb3c2adfaded3c355cbb161193160fc5b9682d45a10216c56fe2613855528f9f4965479c681e6355";
@@ -22882,6 +25540,7 @@ tl: { # no indentation
   version = "0.19";
 };
 "polynomial" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "46324509f078d9e83f4d94893454061636fd1148d5a2e9b59af640f617d82ba1d7397c7f7bb68ac99a83945354c875d3f29853e5ba38da59a2812f5f45ccacb1";
   sha512.doc = "b570f3abf21a480e0bce2c08e44d97b488e9a0758d712cfde3ccbc45348eb95486c121662e296049220dd2802edb387651e839c2a819058111a2839049fc5964";
@@ -22890,6 +25549,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "polytable" = {
+  revision = 31235;
   stripPrefix = 0;
   sha512.run = "a83f8df3e09fd112a6f83a48f803847cbe112f2d18db803226e04efb6fabca1a8e5cd03d2ad1a3a30eb07d3590701b71b24f03b1e38d49f41493ddfc67576dbf";
   sha512.doc = "7e53e2956145c29d7b9775ad8fd757b5dec4d2651683f0a48507094b86a5b6d42f1b659ffc72cacfc0cd528a6baad03cc19aabd8c0d1afdf57bcf365a5fca1ce";
@@ -22898,6 +25558,7 @@ tl: { # no indentation
   version = "0.8.2";
 };
 "poormanlog" = {
+  revision = 52080;
   stripPrefix = 0;
   sha512.run = "39524ae2c1cfec8aeb09afa4c195dc2d4cd9445483dac4a99a6669e66fd0b236b99831b9212931930b7f821891f421fa85c363015996c2b5be35be8a82ff993a";
   sha512.doc = "3d624c5f870f4fdd8fd3df91ca6f80471223f00ce7407eaae6d0e98ba2da26f497bc149cc1beeedf5afbd0353e3f7fc9667ba3e4336262d3e7a9877981866a20";
@@ -22905,6 +25566,7 @@ tl: { # no indentation
   version = "0.05";
 };
 "postage" = {
+  revision = 47893;
   stripPrefix = 0;
   sha512.run = "97315373848a24fb0c49e184cb5e4980e6c124d60bd9141f7ecb5ecea9e81097e4005ee29fc45d828a206ccf8a23a936bbc27cbc59fcc7b6dc4b75cbe4f9105d";
   sha512.doc = "102b88d87ba4b371b16e1d1362f1ca42fb9feaab3f1df4d56176d353e90d68bbac535522e7acbd741be78f64624223a55a6f3802e8a190814ff9a71abefdb2bd";
@@ -22913,12 +25575,14 @@ tl: { # no indentation
   version = "1.0";
 };
 "postcards" = {
+  revision = 21641;
   stripPrefix = 0;
   sha512.run = "0e358697b47ee74afb9fb6bd339ea4a76457c78a76a37de6039ac44cd9ce1fc28a3866c42d988ccebf025d0e08c4c092a2b647cce4841662242f740f12297338";
   sha512.doc = "936c1f923bea76aa323d2c8ce9949cea3364eeb1a145e735ff5bdf609de4c54cc78125392e9e3cc914180815bb9dd5bae63e50c0000b2143fe7de94c199bc50e";
   hasRunfiles = true;
 };
 "poster-mac" = {
+  revision = 18305;
   stripPrefix = 0;
   sha512.run = "f685c2c6d7d2795cf80702c0f8b4da6661a6d076dfbefeeeb071f21ffebd4420c7777681e550ed8ce05726a4392f526da42cecd6e3f26b5dc8ba775494589297";
   sha512.doc = "d06f06a4432638ce7780923818cbe638edbb21f836566fb984353aff0bbfbe0905adfa39cc69fc59c87c9e6f7f2c3c268b7f2ef9a55a0f0a2bf0b5212d9e2124";
@@ -22926,6 +25590,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "powerdot" = {
+  revision = 45165;
   stripPrefix = 0;
   sha512.run = "20888eecfbf1e390ff32e7cea503c1c9bcb5910044fc4f41238b63039b56da82993fb38c4f24fbcc43c8a4b451b59e1010fb81bca048d5ded1cd6455f7568bc2";
   sha512.doc = "ba3051425104a49dc2d553d93220b569dfdf548090a90348ddc0286a36cb9f00e7956c617a133a0ef69bcf69cb5325b4f12007f6ce56868b6336d422183777a4";
@@ -22934,6 +25599,7 @@ tl: { # no indentation
   version = "1.5c";
 };
 "powerdot-fuberlin" = {
+  revision = 52922;
   stripPrefix = 0;
   sha512.run = "73026a8e853bb9141ef3d8915768ca07a9f5caba4e810cf08ab2f41b8c6ee42071065e347ecdc1da070686765591d5cca02a372bd256fc1f9871547a7e1657a2";
   sha512.doc = "f2011b2d9362cdd1006714e71c3178b279cf764dc82f10ac31370d197de98a5131dec0c64bc17d4746a554396687e115e6880ae6940d902b34dbd91aa75ba308";
@@ -22941,6 +25607,7 @@ tl: { # no indentation
   version = "0.02a";
 };
 "powerdot-tuliplab" = {
+  revision = 47963;
   stripPrefix = 0;
   sha512.run = "91a8008d0675ea36676682d741ffad1e2f842ae37b47da628bade8391b2c775d7a756d31d5169e087ca0c4c0b0e958a2bb34d5143f905439e9572a6e72c4dbf2";
   sha512.doc = "5805d79f125ad94bc0818f52d31e14d786f4f032e03a89a0ec8ae69433d56654b6acc864563e3273664576a59880bf86de81756f76cf9b920a21ca8331ce117c";
@@ -22948,6 +25615,7 @@ tl: { # no indentation
   version = "1.0.0";
 };
 "ppr-prv" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "4bbd2404d9cb4bee9de81d463a6f4966e28409b07aa744e155f398f07e513dac4ad262fb3ac81717dafc9dd9abaed2789c08d0cbf0ce29137739886b2ad1dc74";
   sha512.doc = "b8228988551d32a5d5b3ddfc59dde6af1f48aece8f5c0f8889fbe479db6c962d77b687fb5593079796393a255350dfc90965fac07e241d4f0a48027927065e67";
@@ -22956,6 +25624,7 @@ tl: { # no indentation
   version = "0.13c";
 };
 "pracjourn" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "40e7ea03f0b244810952cf93cdc7799e0e130a7b11d384893b88e420ce6adb4b5606462ab6f2dbb2e134770eaf32540b9feb59393dea72a70f4d881f6f6fa43b";
   sha512.doc = "8e9b171919bd6412a3adb75abf1124beaf0fd562cca49076c1729814c7907b5b3f9b240fdb68d91055225e9b366749c2be6a2e421f52142d0a138e377a442046";
@@ -22964,6 +25633,7 @@ tl: { # no indentation
   version = "0.4n";
 };
 "practicalreports" = {
+  revision = 52312;
   stripPrefix = 0;
   sha512.run = "71b180b863f5405c145fde98bcae5942ed186de52654dabda4ef1a859ea292e6c2e6f1a29fa4c4320f2f9a442699844d4268fddf0200281c0f1a7477b49d9f5b";
   sha512.doc = "48159a00f0c64c6a05e56d9c01b1e7c1fcc8342df3f762775c33377d45b0621e0e933db3097a5d489ddefeed1e0c155893e99ebf98c98fdd11df9b33e05e113c";
@@ -22971,6 +25641,7 @@ tl: { # no indentation
   version = "2.0.3";
 };
 "preprint" = {
+  revision = 30447;
   stripPrefix = 0;
   sha512.run = "66ef40f1f9bc1ef3348923e781ad92dd0174b9c45e16c97662f30971a449dd74580391e1f23fed031a41995e65ff90a6785328de0372cea53e3ce946da469d60";
   sha512.doc = "b5e5fa40832249c5a0faa24c26e8b3a2a73036ef007dd3a61adb6a7989926c80e018fba52a66078c3d7b39e76901cc041ebcb9985ff29b53ade2c057abaf1376";
@@ -22979,12 +25650,14 @@ tl: { # no indentation
   version = "2011";
 };
 "prerex" = {
+  revision = 52801;
   stripPrefix = 0;
   sha512.run = "7eb12c59d75d6a3f08dd0bbe8928626b5778acf01bff4caab1f214f2ce42dde798a2823b47b6c79c94c471f8924e79474c00ef9d6e251757c3d221bde06b410a";
   sha512.doc = "3e10f4810b05377d5e54bd12a5303c781c36467479f30cc0044c24019aca81c155a90ca01d3a422e01b1bbb4d245d34bc51cabd4e97252ea8e1a6da747548d4c";
   hasRunfiles = true;
 };
 "present" = {
+  revision = 50048;
   stripPrefix = 0;
   sha512.run = "b22c0bb6803ebed5cd26aca4a9b55f2c7b506cc7e8910346a07437d60007310a3d2e3549040ffb2616df7f173279342f2334100aab14b589d0cc9e710ea89369";
   sha512.doc = "e43a5de9c4bcf9281416963a898e350ba0a0b2d1cad92cbc97d99e2ee9d25f8407a09f024ec5d03a43fd3eee58e1c40bf99ebfff13913bbf85465588b4cf9710";
@@ -22992,16 +25665,19 @@ tl: { # no indentation
   version = "2.2.1";
 };
 "presentations" = {
+  revision = 43949;
   stripPrefix = 0;
   sha512.run = "b93bd6875538fb61fbbc737625da2d89fd7cef0f6b59999f78176f953d6eeecc2d44cc242bc89f85e293265b26a36eda55ab3fe6804a8e8cee2144694eb1a2fc";
   sha512.doc = "7767c2b3fdb77078729f25ceec85906722d6e2abb6ea45fe9e03e7c0653edffdf1326a055175f309d3afa1f1a30f64c708cf0c6c2c273accf777abec088336fc";
 };
 "presentations-en" = {
+  revision = 29803;
   stripPrefix = 0;
   sha512.run = "47c4c3e2b1dea3473daf00f1577a2cdbfff2a3a64d5f39507a9486fd2e77dbcd8ea1e3bdf4069aeee620a62047b1890eecd588b50bad2f1c33b739f7721b205b";
   sha512.doc = "f9d3b24aabc47cfaa0487d683708fed12489e1aca7e7107ba9bf058864f0dc5967fc7a84eab59888567bd47b06ce96a75dd50a132e6e929d206e30c30585d346";
 };
 "pressrelease" = {
+  revision = 35147;
   stripPrefix = 0;
   sha512.run = "0f983d4f836c03ede4ed6bd8c2c41dc69ad75a28d9006ff7ab534c6e483e84e2151bfd93fefa43ca327fbeec14787b43205457a9cf1e733f8a4c3a7c561498fc";
   sha512.doc = "f107b506ba50ba8ed1b655f13049210ec4b90620348ac708afbba4d992470dd5aa8eabe84e2c0b926a55afce49e0a2cee28ecb3877550fe81099f7e5b40e9f40";
@@ -23010,6 +25686,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "prettyref" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "06e3ee942b9a30ff866abf8f6a46b6960321c0aaf2516ce48f587a55ffcb66f158887cbb9a476bc6323e90edd22766fec19d0cfcc2be8805eedd175fdf08ef42";
   sha512.doc = "abcd8cb7e7ab78511d953d95699060581844dda67b3489317057782d97388f7cba990735b395e9563e15fd1fee137a86e8198d2d545f437a2d105bfd3e95bc12";
@@ -23018,6 +25695,7 @@ tl: { # no indentation
   version = "3.0";
 };
 "preview" = {
+  revision = 52590;
   stripPrefix = 0;
   sha512.run = "176ec9db33dd9d95583216b4003921842df3e2eb76ceef40abe3a6f39daac058fa9807ddd2f2b789d011b415473b88d15f60916828317d30b65c8ceeb5d45422";
   sha512.doc = "b6834905bc34836b33970933cb8a7b1a94a8d030e0da112a3092ea3ba3abe1fe1ec248aca3fd362eef653df5b05ebe7b2aa04338e721edcbd4358ae83b034566";
@@ -23026,6 +25704,7 @@ tl: { # no indentation
   version = "12.2";
 };
 "prftree" = {
+  revision = 51404;
   stripPrefix = 0;
   sha512.run = "c0e5f5134606c514b13e5fc3bc58a583f13ce844bc1e8fbbac7aa09d8a59652c50edaa986c5004619219fe4c72cb963fd89dff5119b3eb0f02fa74cdc1ad1374";
   sha512.doc = "d81403af762fc0d3ee9d7b53f9f0400dba5a50f8bd2feab92186db85c18011aa3170b9173530cea5e6e2aa7bd2f475e3b3016e5ab79e990c6abca3d5239fb6b0";
@@ -23033,6 +25712,7 @@ tl: { # no indentation
   version = "1.5";
 };
 "printlen" = {
+  revision = 19847;
   stripPrefix = 0;
   sha512.run = "bbb48c169f31a1f93024195056c323ce67afa1fcc00f309ef1b820dd40e0b86ca98d05f6cd4af66379682813a3807f24295a803fdc91d8b9f19972e1520d5eaf";
   sha512.doc = "25d00eec6c6bd069675cf7d980886b12444e41d18a83ed8e650923d839da8dca21dff65b110105458767b95c50b52a0143b2f7d88b6567ab3aa9953f4ec32a88";
@@ -23040,6 +25720,7 @@ tl: { # no indentation
   version = "1.1a";
 };
 "proba" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "33ef76474e7183c32b5f982347ed414ae7616484ff5a5d8564574220d3757688a3a47aad000c5b0a66a39dbbef20c789dd1445d872b025c274585248176c86e7";
   sha512.doc = "960887501b74d2c5e8a00c09464ff17dc9c733dd663fb35c32b34bd8b79b2a813536b6c0f9c5df4340dbd3adf1f30f569aac678e90d5f328e1c33130767fdf21";
@@ -23047,6 +25728,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "probsoln" = {
+  revision = 44783;
   stripPrefix = 0;
   sha512.run = "f0c63a327569410af7eefa9f87fed56a6a2db78b05133c417afd245958a7f10dac965270fe00e7fe5de6ddfcc4a1cec446df819728e76ad347c7664fcfe849ec";
   sha512.doc = "c79babc397260f03e2ad66556230966d1af97bbd5703c25cd09ff3aaad48b49d464672c501df047cf5226370b80588705c59212e75d0d1970337fd446d86e70e";
@@ -23055,18 +25737,21 @@ tl: { # no indentation
   version = "3.05";
 };
 "procIAGssymp" = {
+  revision = 51771;
   stripPrefix = 0;
   sha512.run = "66bd3472ef8d8d26f2eee0368615fb0a326ebd64dca3a0afe9a236880eacfd723caf6f65cfd07ad2a6f5f3db9dea6da75f33de9d026a48a8304c096c60d7e458";
   sha512.doc = "253adc51e38015c55af91bddc0b7ac6031d482d0cfa869cee556ca82464932a4922d0223a4a156e148dd89e369e2960156b411bb2601583d07a99790518c4823";
   hasRunfiles = true;
 };
 "prodint" = {
+  revision = 21893;
   stripPrefix = 0;
   sha512.run = "ab2b0ababfad124b38b018c7313df0114c36fed0dbbaa42de04295b09142740ef43f34c4c6ad926c97c1ce28521c1d87274486588609197c2178b631b4ee6876";
   sha512.doc = "addad035cb9e7b88d9da2bf161723db51897342872dd6c671695bb7bb0a6a4c7bac872ce40f31b22f5fdd84cc03994562a6f78f14d9203977d5b7c8d17130db8";
   hasRunfiles = true;
 };
 "productbox" = {
+  revision = 20886;
   stripPrefix = 0;
   sha512.run = "9b243f6558dd449ddb9d9190ea53a71ed5b28d25f5fddc64eddb194144aa688e8d8e946c53f115d40813d0933b77d5d2c78023f24a1887d8eeb70e6c1ad0bc1d";
   sha512.doc = "73f8e1afbbfd9d4047120280e746ae1349225dfa84b98b288e23f477d2eb83310271610d6f4e40cdeb0d124788a97c1f8aaeb182a03cf2b1311e286f7299aa45";
@@ -23075,6 +25760,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "program" = {
+  revision = 44214;
   stripPrefix = 0;
   sha512.run = "a9ef7d68ad86b42657681e2b798899b5c7c472c5e272a9098a1424a35a109dc4a946be54c4007db73edb861cb475f293e404cee9fa0dca8cdf086eb6c4790319";
   sha512.doc = "4213b5bc9cd6b2604bf1c667dd123729c0674d1c74338ebeb86b1551af14be3e24c4e94b4e5cc2c06a25ebf934d56eb6d3b5ce80e452798ea02fbb0ac6533580";
@@ -23082,6 +25768,7 @@ tl: { # no indentation
   version = "3.3.14";
 };
 "progress" = {
+  revision = 19519;
   stripPrefix = 0;
   sha512.run = "df21ec7e4adc36a420959550376fff5b8a55fb7dccc064476b2306226c1776fb2075994d9ae63bd5bde0b68571671bacadf9285f53bc9e639c2afd59e5b6814e";
   sha512.doc = "e88280bb1a93d34dd5597627d763d1b2a21a56990ede2e029246dac84f3bb22e05a08a9a94c0790a9c8a87698684816ace02149562785cf36f2b6af82f89c130";
@@ -23089,6 +25776,7 @@ tl: { # no indentation
   version = "1.10";
 };
 "progressbar" = {
+  revision = 33822;
   stripPrefix = 0;
   sha512.run = "d12161aa891ea45cec2a4511c48a1c338de5acd512e426a24988b79b7d9d1734479a1cd93e3e8ee11da67858d97260b71ca35a3a7a3dbbcd2bae746221a7bafa";
   sha512.doc = "a60ee29da0517d6769e09f12af7b600284f32478aef1d28cdf167610c45bd87f841500c2bf718ff9b6678a171f3138f4a7a6ac45bd41500510f509e8e7067efd";
@@ -23096,6 +25784,7 @@ tl: { # no indentation
   version = "1.0b-4";
 };
 "proof-at-the-end" = {
+  revision = 51194;
   stripPrefix = 0;
   sha512.run = "1e5647e1421742e9f0198c5ff8ae5ac315eccef96d0a7c9c5f1dabef167fca5ac9221cdf60d99dafbdfd60f6960a897ebb2d2c4370edcc0d0a36942c0041a777";
   sha512.doc = "9100916a9ebf426502d7c25e5f848fd4eeb19050faa01b0a4a795b838d4084849b42a1f6a187dc8218aeffb6df0cbe592b512e1c613a1045e467198119b33555";
@@ -23103,6 +25792,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "proofread" = {
+  revision = 50938;
   stripPrefix = 0;
   sha512.run = "ef0d35bb06d1bf31cdea9aec2f342eef4b8cf053863a26f5c223c1966f6715a547fb61b2f92d4ac273c3309fcfe219f9a78bdf8c9b3ec3886bb96dabd7935033";
   sha512.doc = "6b1ba0b1e009e2f7b337aebcc5c54882f2ef3f2089261d3b9355cb0adfec8aa3c7f207636955979cc0a74554e5878423a23982340bd26ed3c2a634f821497565";
@@ -23111,6 +25801,7 @@ tl: { # no indentation
   version = "1.04";
 };
 "prooftrees" = {
+  revision = 52221;
   stripPrefix = 0;
   sha512.run = "f455c85a30ca4882829e0d2b74f202b129333962843a799c575f080de9b67c1c543db10f012198655760bbe894eae2149eeba1322de3392bac0eaa9a89fe00df";
   sha512.doc = "ff1ec0f5f9112e7fd09fee4e3ffba06bd281c4578a055e831c64a8edbec234bd69c6e920745fe6e4fbcbb12b27189465d4fc41c9dae4f1ff80d5096ef9dc3cee";
@@ -23118,6 +25809,7 @@ tl: { # no indentation
   version = "0.7_svn_8641";
 };
 "properties" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "3bde5cf132c9013bcbb0eef439e61725ea41a09720f98bb53f8bbf39d56d6cde34ed1613b001a86b40221a36233b1d5c226819c94b41d49211065e1477a0bd42";
   sha512.doc = "eff6b91e8fdd7b0a6b0526c7dd2243e32586a5ce12071130f388a911fa34cbac4681d4118b601b9eb979a272bf89b82f00f8ba509fa996521e8a2861f8e84a80";
@@ -23125,6 +25817,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "proposal" = {
+  revision = 40538;
   stripPrefix = 0;
   sha512.run = "d9a352995030efd57ecd46028147a6326ede0695545194a01846d4a3e2d29096ace9e6f69900766906f3ecfa05ce566ebd1c2c5f76a3b2b2646c1e0f865093ba";
   sha512.doc = "53c1d47f2f42c9ceed73f350c2aff9b229d6dc8dfde9e3fb8109971905c5d6430ca52d72551d540f5a1727a767d6cf485d8bca2489f301edfbf964490ecfb5a2";
@@ -23132,6 +25825,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "prosper" = {
+  revision = 33033;
   stripPrefix = 0;
   sha512.run = "bf2285803a71b00c67a9e64ca5e51bdd880856338b0bf3e95bfb2ff2e78d5cdd0617424ed95918b5982d5befa71476b89567b2107eb0c206f9a9f53966a983b6";
   sha512.doc = "21593ccdc8231e37f0b2938d3978205ab3ed61f74a6e8a4b1dd2cf82da552bd920a7711c025964fdab5661207cbea1aee04244c93552e20d10df338c7dc5c138";
@@ -23139,12 +25833,14 @@ tl: { # no indentation
   version = "1.0h";
 };
 "protex" = {
+  revision = 41633;
   stripPrefix = 0;
   sha512.run = "be8ea34f282fdd739f72f9b33375bec3be5055bc953c7a441d769ac1e7568af9327ae6030f67a805188dbd485ee8223936921590ec86269e371da6d3ee353afe";
   sha512.doc = "95746823c32526fb5e2c9968749a7da2149d23c2ec9f1ced2a655a4fe54ad272bb414abd0be0d78775b0ac95e6440d9b6ead609de7615dcceb0186e4683e4138";
   hasRunfiles = true;
 };
 "protocol" = {
+  revision = 25562;
   stripPrefix = 0;
   sha512.run = "e9555a25b0051592bd700df5b7335ad07eff024efd1efc4ef620fe7ad37866aa1edc8f354a7c772b3a298935bcffa9b5b2b49c2b0a14c868ae744cb9165bfd19";
   sha512.doc = "f047068c0b9176087cd56530c9b73d30bbffb0d4b958cefae39f1f3bc924fbe705e81b5c867735715566b674379d1731e1d58b123dbbda3686a2b84f42674338";
@@ -23153,6 +25849,7 @@ tl: { # no indentation
   version = "1.13";
 };
 "prtec" = {
+  revision = 51919;
   stripPrefix = 0;
   sha512.run = "06e946526f194e36b55c91c46615c74a255411ff3de2fba005a672741830a5bfc162be122a7f03d00374917ab70dd789549a2976280db8c8106999ab7e0854e4";
   sha512.doc = "fb299846eca43fb054ff441c2eed6f87382cbb58419947092d04bfa99102e3db7a8395c9b974395b579f6b5700f55c2c730c162bcd19e5246fbc64b80acf5681";
@@ -23160,22 +25857,26 @@ tl: { # no indentation
   version = "1.06";
 };
 "przechlewski-book" = {
+  revision = 23552;
   stripPrefix = 0;
   sha512.run = "18b9546576957553b477a1c5a90e6780770f18d6aced92b17017c44770b6bfa9c3cf928500a9e56c6c67f45d375bc12ad8ebc97eb1589f3cf7b5b3ed2f7b55c6";
   sha512.doc = "0441621561c2c4208d083f84eaf47573de94248cc1aaf027061de636c1a65f35a307260eaf390257bd02acac34b42963f96030ee27c83650deb11234edec89bf";
   hasRunfiles = true;
 };
 "ps2eps" = {
+  revision = 53559;
   sha512.run = "dd92a9ecfbe36be9d8bdf7aa969559953ff9b56c0c7b703375febea04e3255ecb478204f7284eef84ac1a188368f2a7fe2a40a9c69c938b037d3704b38054e42";
   sha512.doc = "53ca9f92488bb20d038340ea6f5bbbd7d31a1f7bf0aead699a37bb5bcb11f9cd3347016afc9c2ee61e61e5e040203553bb5f6b5aea4ee1d5474ec5d366ff6ef5";
   hasRunfiles = true;
   version = "1.68";
 };
 "ps2pk" = {
+  revision = 52851;
   sha512.run = "4b3ead8d2708a182d0c158dd8ae5077fb2f4a94c7f6fff52a66d6479d4c05de3d742e4c960ab79b63084435bef491866c38e01d77c41ae3d630c7a32450d0a11";
   sha512.doc = "c5b22a86807378fd7d6d83e8802780567a2473e87875bee4c827a48ff470911855bc4a1db4f439fbda1baf71f714086b96e6e78ee059590fb6ebb45c58abca4f";
 };
 "psbao" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "cec6c6079d7a8757c9c01315f3b035fce1eba2dda487e3a9da21a2bcfe6c7f7fe5f82171ac5b850fb7f673b56258f7b39c2e0b74c421e324475b02ec13671b32";
   sha512.doc = "1a9d1a0250bfd82d76ff1a3feed17c016f46e5ef199038bb569708989f7a243682a9584c1d293807cce09394a70a25a2f8b31189d81aae89336306f3f146dc9e";
@@ -23183,6 +25884,7 @@ tl: { # no indentation
   version = "0.17";
 };
 "pseudo" = {
+  revision = 52582;
   stripPrefix = 0;
   sha512.run = "efe90b9cd0ada5a099886c8d0bfcb697fd831aef5fe60f6eeb0246dd8ac8bf43782901d77f30cc070b114c961d47602fb2b2d91aef74e9c266ae8323e722ac32";
   sha512.doc = "3ad7ef72a132e91d030f150df2fbb217115d493acaab1c7c61238277ca3220f92091451c806920b7a848e15c5e5a928e30645854d12ad39a8e5e5fc5949d7651";
@@ -23190,12 +25892,14 @@ tl: { # no indentation
   version = "1.1.3";
 };
 "pseudocode" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "28acc4dc69e5f4e181230f06dda363618146d30a3f7c6be0d11b258980bfed5636606dd808c1deaa627d04c526496152fdb2ddf56866b63a4c4313de423493a5";
   sha512.doc = "b11d8ae45d5a4564dbaa2669db7b5cd4f9b87bc9efda3da47ce652245b140cec1b2c569f38fd1ae175215ff422cd2df3919bf27126c9d9d661dc4a147963bcb0";
   hasRunfiles = true;
 };
 "psfrag" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "71bf5c02e7a8a17eaa891f15c88777dcbbfc3ecf8b4a72dea49683f061bc86427ab813dbac5f5b8ab4742edcb92cd32d510675a80b0b3cdff2dc2cf127ee89fa";
   sha512.doc = "072210deb2635a2032f6ac2d100ef72aa4471f69dec03fbb25fbb0d78b89aa2df0972b244d4335e8ed16e1a5f0cb8e04d22ad44dd5740fda59f9a4e5300befaa";
@@ -23204,11 +25908,13 @@ tl: { # no indentation
   version = "3.04";
 };
 "psfrag-italian" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "4d26f0191ffbbe7fa6a9aae1ece6e72739925b59a1a1db5ad3cbe8f2b3ece92ec8265f008e91fcabfe2e04863300db833eff3104486e9c33985ce5c7f8dd7543";
   sha512.doc = "7a513ff265d259adfbaee9ffb47856602004f19679dad1316f04d36848f2e22bff8c3164ba9b045e7a4a57df76c2ad17b071a9cac68d4b92cff57a29f1e99f55";
 };
 "psfragx" = {
+  revision = 26243;
   stripPrefix = 0;
   sha512.run = "b02063b8c1df58133b951eb10763d3b9099376a473dc980fef801ab565326ac1c5539be3ee94ee5c79837c1e6265cf41d6554f66e8900df2663d5d7e727e0df6";
   sha512.doc = "863df965aa6abb99c115b06ed7d1b1660345e9bca0d0f5d62b6a7ffb55391688a92114edae7bd28ef8b715515c8bcf3c5b4fb4970cc1b6bd9cc068b09595cb10";
@@ -23217,6 +25923,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "psgo" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "75791ac8c340cd72139c50b2e2a05f6001edf2b79bbb9fcb4c9118f2acbc67643469c8f6da34122bf001e85af60b5b0050bf3c7b5bcce7c393e7930e3cfe7eaf";
   sha512.doc = "9d061c884f76eb87e86cb441ebb693a9c64daca024c35dd631d660f3d1f8b1541c40e285d5f4115b36e2b02b7640ea7be70f4527e7ae92c6d6173625b215b7cc";
@@ -23224,6 +25931,7 @@ tl: { # no indentation
   version = "0.17";
 };
 "psizzl" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "adcd254a9991839c623b3f75098276dc26df935db1528d39f8588681b87237febe81f8289aab747486df92bc9af2103638734fc22c43ace8cdea1733d2a66360";
   sha512.doc = "e9d65b3b0c364fcc7632ab83974d8685568d4135cbd8568cbf69e9162dbb80283724ada72891a72dce2fabe35d846c6f09b05f1123f8fe72ae749215170ee996";
@@ -23232,12 +25940,14 @@ tl: { # no indentation
   version = "0.35";
 };
 "pslatex" = {
+  revision = 16416;
   stripPrefix = 0;
   sha512.run = "4e6c2163fe9d8573012cde55d7a9686d45276617d6368a2191b2ca5ecd9e2e88f9ea07d638c726cfb43f0fddb5d8c8b1b8ca1eb58177517b6704776f792630db";
   sha512.source = "27e8f6f5c30338cccfded6805b713b74b6139841ad81a10a4a06ff5acd5a189733e2d6fdc80c2483c5fc8beececfb91a0a9d03202bc44fea753ee6bfda9fe649";
   hasRunfiles = true;
 };
 "psnfss" = {
+  revision = 52663;
   stripPrefix = 0;
   deps."symbol" = tl."symbol";
   deps."zapfding" = tl."zapfding";
@@ -23249,6 +25959,7 @@ tl: { # no indentation
   version = "9.2a";
 };
 "pspicture" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "139d160fa67dbb7cc932fc75dba80dd46a55a1dd5973b27a6a5dd38a6035cb367441b178acaf3c11859ad60103283774ee5e2623a083a0336d5c2ff74a7b82fd";
   sha512.doc = "a743397a0d48c587b60db5f1dcf9e1c22f67ba15dbbce241a2584c95456b3546aebdfaebec9fcfb3dedcac65f7f053ec52cb479d726e5e3fbfe042efcf1ad702";
@@ -23256,6 +25967,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "pst-2dplot" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "3109c2709323906ec39bd1be6e7c9151b7b07f9d2dafd5f7af61d3facd3e37ae35bd8bd923968102fc702f35fa4a903e9a50d3a7a85a1c088017aababd16d969";
   sha512.doc = "f46a0c8c94900d180fac92e7b393672d010388fe80867f01125cdc7c486eff97ee36cab1aeeeb224b9ab80739c2ddd9e89b84926948acaa8b2b0ae08457ac0ef";
@@ -23263,6 +25975,7 @@ tl: { # no indentation
   version = "1.5";
 };
 "pst-3d" = {
+  revision = 17257;
   stripPrefix = 0;
   sha512.run = "dfd8a2b79d308cf4ae3bdcd438b967446f8601509fd4afb3f090d946df0cc2d66e9b7071ce33e51ad4cd53b7e62dbc02d861d46a302bfe2c901d1d8c82ab0649";
   sha512.doc = "e8355b936fbc1685edf205e88f2793ab298aac4e4c06de10dddbe1587b5401ba8cc4d2a01dbad3ad56da5eddb27bd6049a41e6da8c139727d36fcc94d93ac554";
@@ -23271,6 +25984,7 @@ tl: { # no indentation
   version = "1.10";
 };
 "pst-3dplot" = {
+  revision = 43703;
   stripPrefix = 0;
   sha512.run = "a509af726d13fbf9dd0f3b1181a1dc53a31fe007187ad345c8e3c6c65d52d09f6de422a723b472e3b8e5f1aba1563dea06b79e82a7940e018cdb9eaa30a40632";
   sha512.doc = "2f261cb9d32dfbb85b626238e25d8c9198ad50df008b54f800d3d5b404ea5734da8636c05c33ec30311c60f6e41ece1071a04af7affc61badc3aad64a5b9b194";
@@ -23278,6 +25992,7 @@ tl: { # no indentation
   version = "2.04";
 };
 "pst-abspos" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b56bed1fedb14fe7cc455fe4e87ec51085e8e09132ff5dbe52083701cdd0d63f2e6dac2ab55838fbefd8e7de9666d0239e9fba712573a51dce2804d31ab140c6";
   sha512.doc = "77754a1c27c083f60c2836483a60bfb6b4c826783d5acd16b1eaa9b7fe7aba8820886442ed28a5b334929a3f21f0f1b4487c7403f8dbfc3ad3cfc08407e35229";
@@ -23286,6 +26001,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "pst-am" = {
+  revision = 19591;
   stripPrefix = 0;
   sha512.run = "a5f466dacd393ed7243fa2cb43aed0a5bb8469a51aa82fac4b53c47a474a1d9758db4d7a001cee49716714049499339567cb62a66f2731ffc7646fecc15c7784";
   sha512.doc = "edea0ddc3f5472a86706d1823fe78459d2908724daf2b9bfe44b41e749f2b41483000602817a45a5e41869f86d4034ea52640bdffa334af54e4964510768152e";
@@ -23294,6 +26010,7 @@ tl: { # no indentation
   version = "1.02";
 };
 "pst-antiprism" = {
+  revision = 46643;
   stripPrefix = 0;
   sha512.run = "dc93e3a8a040a2712f701c2fa89924c45749824d20ad814a9f04aa423e15caed3a457b762dc7d30cf5c9e3afea378efc303851af919831c0969cde50b9adea57";
   sha512.doc = "df528e5693cbbdca80a88d02e2b8487b70c188109825da66c9d9042056c6ba62e361fcba2ac747d69a08a4c8d78f27534640ce55c583289c3f12c2eb4c57d861";
@@ -23301,6 +26018,7 @@ tl: { # no indentation
   version = "0.02";
 };
 "pst-arrow" = {
+  revision = 41980;
   stripPrefix = 0;
   sha512.run = "3400d901f40b9dc3434f107dda5480e0f8e37548b2ea0bfad5a38ff90e1d99aafd43d44d6cb6c0594b0574f781d94ad57e53074d28b10251f6ab8100f2814354";
   sha512.doc = "bf97ebd12c09ba4ec3dfad4107141054abc9f04b1e1408017ec038b656bc04ccf09894c5f15a8a0344f358f2e43acdcb7509cc7e0ce686303a62bf175de7a3c7";
@@ -23308,6 +26026,7 @@ tl: { # no indentation
   version = "0.01";
 };
 "pst-asr" = {
+  revision = 22138;
   stripPrefix = 0;
   sha512.run = "c5ae73e1553b564a90d2c77fa434c360fe2858657fb5ff4c6ce1cbb46838fea9c0dd7a8d92e2048a8ed0d748839518b461b0727db3b7937c4e39edf85277e081";
   sha512.doc = "560ea68a6f02dc3b79c64554652a9efd52c7fb00d07e7ffbc9b92ffab251854e07e87642028b94fc42bf7d01fedd82bfd50913f9c42d1c37d76c1eaba761ed00";
@@ -23315,6 +26034,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "pst-bar" = {
+  revision = 18734;
   stripPrefix = 0;
   sha512.run = "14c500c89dcce23c52f4551658496f55ac712c76bf9ab2e8878463a7dc7bb2bb3be10f94679cd2a5b720739e89cefed98237d18f65d0b9ca26ae91ac64525a25";
   sha512.doc = "e17655c65e96e2d777484ef8db7304562310af8585c21f8cb6c64921c9aa08ad4b5ff8f61924c87112323c2bb509b5ad7e3b2176b750bd1b0f3df837033f380a";
@@ -23323,6 +26043,7 @@ tl: { # no indentation
   version = "0.92";
 };
 "pst-barcode" = {
+  revision = 45096;
   stripPrefix = 0;
   sha512.run = "6c4799d7410da7f13225acd9cb5628d65bdbbb525e2bcb114d7f660d4c752122f8e9028763d3ecbca04c3c9da36b7910d64c981e8593b2c5df6b4cb372103785";
   sha512.doc = "918891da185bcbd26051a4715cf585fd8539e6ac534ada4a2524bfabec328f87cc998cbd65b7fae8a2fbe4de029403811214c0196e59125a77f8af715b3ed3f0";
@@ -23330,6 +26051,7 @@ tl: { # no indentation
   version = "0.18";
 };
 "pst-bezier" = {
+  revision = 41981;
   stripPrefix = 0;
   sha512.run = "e2277175eb2087e13ee0a1100d602730514e1e5bb023d4db7163ba4113f69c9fedf74ff50369298ed970b89425b824cb8619e2cac4be463589edbfd747ccc6c5";
   sha512.doc = "5126769fb89900916a52135af0ba459651083b01db466471cc984b6dc837686cd780bda7c3295b6afe9a7bc85180b3acd95c015084d49f46049adb2fd84b5748";
@@ -23337,6 +26059,7 @@ tl: { # no indentation
   version = "0.03";
 };
 "pst-blur" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "5726819bfa08fbf6e9b5a2c6f93008e468b759a825fef04739a47e756d4b12a99aef604d64618081b1788b5fed9247c75dd3580a899771b148306880341f0444";
   sha512.doc = "5e483141d8f5ad03421d9c7c5feef8baaa3b522385d307022dd617af0889bf57d1cf603a1d519a5d17d8dc918441ca3310d766e4dddb7ed6b8155985186b5e7f";
@@ -23345,6 +26068,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "pst-bspline" = {
+  revision = 40685;
   stripPrefix = 0;
   sha512.run = "1f39a02cb0d56b4fcb8ed3a3768b59a9d14ac14769783dfde7108d86a8c6d68d79342df501c60efcfb8aca4c7f97fffecfe4cd0ea0f4fb76e528f696180b6dfc";
   sha512.doc = "1f2b8c3f5d85db4215cb11fcd663c33fc1e34e764432a2285f879ec8bf7acb9d09368c6a9910618ee99c3305d701aff5e5d401c227d0c1db9028be3690b5216c";
@@ -23352,6 +26076,7 @@ tl: { # no indentation
   version = "1.62";
 };
 "pst-calculate" = {
+  revision = 49817;
   stripPrefix = 0;
   sha512.run = "b40a89c1e0152459e9dde468379b1a848955d40b9d9e05223544347d6057affac092a503e6307904e485a81de781eb9455abd948bef7f343359d44abf37f93ea";
   sha512.doc = "d6e936e7bc53ae3296812b1d33ecf6ae890599cbb9fa6afac719d8ebcca4516772ff6c18f27e8d825ab959d430cbfe8876b2bb97e480bf6464690b28cedfc2bb";
@@ -23359,6 +26084,7 @@ tl: { # no indentation
   version = "0.02";
 };
 "pst-calendar" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "541e353dcb33239f2230cd220bf7918051cbeb3bf8386bb9da045199a80decd68760a34f0461bb7e644f0d1545f2712969c79584a813551ee433d3a2bec888d9";
   sha512.doc = "02be7b99bf8fafb00994327e737a5a050601dd141ff4e3482b42dc3c98c9ecd1c62ee64488146e3a7e1017a965ff1cd41b7487acdae65f5c09e259753c2d2ac2";
@@ -23366,6 +26092,7 @@ tl: { # no indentation
   version = "0.47";
 };
 "pst-cie" = {
+  revision = 49422;
   stripPrefix = 0;
   sha512.run = "4967785a229c9cd316b36357fc94df53e7ebfb216ba5bb222d208a767828aac22184914e2e3744e2726738920dec05f3ed7ab9ce1e30321017f43fa8f52cdce8";
   sha512.doc = "f2554d76fc89d58e4ff61ac5e5635b93775f731e33e384a3113ebcca53c26ae0e4609d1fdfc5f093abb8945bc3f02a77041bce072c29340ff9623a580e0ce352";
@@ -23373,6 +26100,7 @@ tl: { # no indentation
   version = "1.06a";
 };
 "pst-circ" = {
+  revision = 49791;
   stripPrefix = 0;
   sha512.run = "608ed7ffdea15309a69d89c6a6107b9b71838e789f14ca78f92922cbb3d5e5929f61e0510b40e5531900099f805ae1d4acb2018984aedde05352c8f210573a77";
   sha512.doc = "575ab4e17abb1433659b60dc87920fe284a12d5cdc98dcd091df372437f165033872c7a7b3f27e17bb27f5a51c2dd4e5a98925e06e54353a8e51b77958b63afa";
@@ -23380,6 +26108,7 @@ tl: { # no indentation
   version = "2.16";
 };
 "pst-coil" = {
+  revision = 37377;
   stripPrefix = 0;
   sha512.run = "efa265a09857efe93dd3d6aa7f63cbdca456982ccbb4c882dac7c1aff43a6f524e546640d5e293b55e59bd6af582e6d91b503cd7875f8c5ab48491b5b8996e4a";
   sha512.doc = "e31a5c795f9cf1e21364f63d582465825f46d37c3c849e328dcb19c2a2d7d1336c425a027c02db7c1d0d00da74cb2250feda8f2f70d538561aa93a22bcec5498";
@@ -23387,6 +26116,7 @@ tl: { # no indentation
   version = "1.07";
 };
 "pst-contourplot" = {
+  revision = 48230;
   stripPrefix = 0;
   sha512.run = "9930e77c3ac5adcd9e3f14c4785a52a79fe5068b5ee239d1c9f052181657d2c5f16b082a8900b9571094ec83b7326be28a567dd39876332e5f68aa6b1c1b7083";
   sha512.doc = "1a52121a22c829c9c5423810f529cbc4cf3e49a805ec4fae123dd795dfc8fc87bebb13653a9d173ca962bba716c8428effa4410e48085af4bb208331e4e89bce";
@@ -23394,6 +26124,7 @@ tl: { # no indentation
   version = "0.6";
 };
 "pst-cox" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b7e0e787e5a6d825383a5c06d7aba34e5d7cb12258925b7f0384ec069e873a6652e421f963147648903f6bf063d9592089adee5b043f24dac10e30dc344f0608";
   sha512.doc = "1de830f83253ef11f092c9ec0e698ff36971c7b6d4237c8eb9f6712bde051b9302d657faa21bf56d34287c838453c611ef1a7c70c09e55ea647bad48ca216e1e";
@@ -23401,6 +26132,7 @@ tl: { # no indentation
   version = "0.98_Beta";
 };
 "pst-dart" = {
+  revision = 46579;
   stripPrefix = 0;
   sha512.run = "f5d41ddf7c5934a00fe8bbbc6dfa468d26e8ac0c06975301f17f31f168c6bf7499dac210f08f815cd01c05eb4a9a376d5c49cd96195a9df56bd3f1156d9ac6b7";
   sha512.doc = "668648d06ab3047e45737908bca5f901b4815f7b7b6745e9bd5387b6867b1fe6dafec3633295e8c164e26cbf06dab2240516a71e3b766a52b9e1ac0e64d1d93c";
@@ -23408,6 +26140,7 @@ tl: { # no indentation
   version = "0.02";
 };
 "pst-dbicons" = {
+  revision = 17556;
   stripPrefix = 0;
   sha512.run = "a09ba8f72ecc1b58298b436c47d3922b494337179bdf789468aa3a2236a5e2bd0f9ddd9b491c1a2eb181d08090cc1c6d8c4a0e9e56cb8619a65ce168d7efd355";
   sha512.doc = "fc0a74b0ca228ff598f3f88840ad1b87654cd7205afb757e6eb6d98abb0cd56cea0ac3ad7b3464a9a5b09d3d4f3a8489228b19c78edc8ceeb8b10f5d40e18540";
@@ -23416,6 +26149,7 @@ tl: { # no indentation
   version = "0.16";
 };
 "pst-diffraction" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "222e2361650aad3b59f99fffd56aabe3e53a5eddcbb643fb6f970ff9ac52bbebc4274dd02e051f9b24f069e355a081feaf20e735c385d80e3e58d3c72f1bf90a";
   sha512.doc = "efecfa760a636a90026bb8dc2c6677bf1f5d8f37fa9103d37f598bde413a136928717cd7bf62bdd7581ae4ce21d34b49a2a9e4dab7397cedf7dbc04884012160";
@@ -23424,6 +26158,7 @@ tl: { # no indentation
   version = "2.03";
 };
 "pst-electricfield" = {
+  revision = 29803;
   stripPrefix = 0;
   sha512.run = "db9f7474d8290640d960f411574b6dad9f9b705eaf68644e001ebfc5050328673f0c1c31f925c6a2cd2279b9bb7ff89cf8d21e71a99e4b937137af404d046df0";
   sha512.doc = "9d89a2818a56bed9e3cda9069f91cb49beb0182e0b24474051bb28c4299439a7b5477d09fa1caf23b855226d4d4441e48c9fba4a4dd1cd5eaf044a608876e5ae";
@@ -23432,6 +26167,7 @@ tl: { # no indentation
   version = "0.14";
 };
 "pst-eps" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "90be1124bd22958b0a9cbb45a3b76513e514131c416c98d7f70ca101e7841980c33bd8380e888054cedb873143aad168b0dc25918d9e241f763b9be3ea1a76d6";
   sha512.doc = "70542680c550bc11bef851cfcd12010e17f35dd75adfa390ffadc7b920c2b357594ca514fcdeaafcf1bfcf1b9e622b23c680adbc64ae4787fa96ff94f9a62add";
@@ -23440,6 +26176,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "pst-eucl" = {
+  revision = 53929;
   stripPrefix = 0;
   sha512.run = "fc8a821de4589ce130d3d0f6057f657762171564db00f73576b5e954107785be5d6d9cf809ca21e96012243822347ed75ad8c5dd82bf86e0bb9de21ebcfdf8c6";
   sha512.doc = "fc34471747331cf42e003fff20c975036965180c600e6c2051b68e9b49c9266f272e124675a6accdf96f468da3d117eeb1e52f9919462b8e54860e6814b9723a";
@@ -23447,12 +26184,14 @@ tl: { # no indentation
   version = "1.71";
 };
 "pst-eucl-translation-bg" = {
+  revision = 19296;
   stripPrefix = 0;
   sha512.run = "ba2a7a76db77f4db3a548654e53d587b8f5b3dab9fef56b1f8c2640bcace64237e0bea5129025a07a490a2660ccd019fc5e83e3db504c6cd30b12b19df755f8d";
   sha512.doc = "9f6d0153e79a205d0fce5b289fa43317ded0b70abc06139a503b98199584e8cb12b083c8235b6b53ff2a80cf249a4a43cefd3e0b39a9a406c62c1e684bcb35eb";
   version = "1.3.2";
 };
 "pst-exa" = {
+  revision = 45289;
   stripPrefix = 0;
   sha512.run = "af3bf68bf2401e0bd7023762748180bbedae1a34fa749b02cccd6b498f1f7ed0ca0e929e1b290f9b4f56b7f30718cc602d54b348e23f73c4cfb4d72ea22ffa4c";
   sha512.doc = "9f0310ad130ad4693575e33bb2f2deb795a8eb4cc6b3f5fa946095d979ad8a1a348feca0ee5421b4831fd16a1de23608013b69d027b0dd37f782113e7de868bf";
@@ -23460,6 +26199,7 @@ tl: { # no indentation
   version = "0.06";
 };
 "pst-feyn" = {
+  revision = 48781;
   stripPrefix = 0;
   sha512.run = "c1ac123bac3f92fd92321387be28f519963ab196fde7ead8ed6b4c93ff9fe5cdf07bfee65bef67b9cd70d020adfa99c72592df9be376d69c5dadcb8bd0d6963b";
   sha512.doc = "e30fc57ace8fb4f0c36fd1a07415e894abe6840592a9a62b9e45c0663281a79532387f5d37136e9cb5e7b27f4c0d7722e6d1a9779e1a57a2fddbd8d0324d1424";
@@ -23467,6 +26207,7 @@ tl: { # no indentation
   version = "0.01";
 };
 "pst-fill" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "69401352ca7e08d6d61ce7ae89f1201f186cec6221ac3b9c2cec61c6033df03b8151ee278ab2edab6a661c49f0867d7f9e764bf45e9dbf32feed655e12239688";
   sha512.doc = "061dcab012577f3d6e30008c15127f2f70469340598c781a436c0c8b1831d36dfce86a8cd0b802a6f174d3510ee2ed1d9269b4c894793f10d79eaf8b6d0c1ec8";
@@ -23475,6 +26216,7 @@ tl: { # no indentation
   version = "1.01";
 };
 "pst-fit" = {
+  revision = 45109;
   stripPrefix = 0;
   sha512.run = "ede8c3503963f44d65caf46975cebdad296576742a771243914b49c6d802deb2f24e816dde7fd9a4bea7fa0c39965693575676ebeb648da099d88ee50bdacb8b";
   sha512.doc = "c8619c7c98cd42884637de98c88d916e18db273371fd64090d5e9789570153b2508f0adb90fbec9c5184f6ef1ab24559b04daccf8dae7c5f65453044b9bfb73e";
@@ -23482,6 +26224,7 @@ tl: { # no indentation
   version = "0.02";
 };
 "pst-fr3d" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "ccd418ac7ac5ee1885cd2b7008e867c08cc0fc13fa97e264377446d301cef1caa82b8552731a4c7d3131f0e2ddaa0267276d5b1726998a0be2f149ac67bbffcd";
   sha512.doc = "48c559c27999b06d63ab5c33c9779d0902e05c80c51ba9225f0def724e02892557deda44add976bd5fb73403bbc2615854ef9ea398b830357f0fa5be12702e74";
@@ -23490,6 +26233,7 @@ tl: { # no indentation
   version = "1.10";
 };
 "pst-fractal" = {
+  revision = 49295;
   stripPrefix = 0;
   sha512.run = "96f38a81d57046ebb50e90cd7c06191483eefa8234ea73f706e6086a3f0723b3ecaeb0157b31c1364717c5f0643ead9fe94f9cf8fac8a8b27e0a3b81d3dee048";
   sha512.doc = "4c3793e65415b2fc394fc46c23d6a912c9288e77fa2f08e5d7a97de6beabfe2efd323f13b0f2bedd1bc52bfade476abc0f8edae38108de6419e6d4b3c854f82b";
@@ -23497,6 +26241,7 @@ tl: { # no indentation
   version = "0.10";
 };
 "pst-fun" = {
+  revision = 17909;
   stripPrefix = 0;
   sha512.run = "68d0c52bb40354a72b2eb14d2c10a18266badedd452a57e4c2a9aaad343b94f5c13f89853962e85c94ebed9274e87c44cc4ac1fd0203ec54097f71e5c4a15fdb";
   sha512.doc = "b4f498e3f9d97be8fb8918abe5139d431656b52ac592ce9f3155c6dc7afcea17e51996dbb275968950dfae179b336ef923b2d88efb4b77506c64b5c775920d38";
@@ -23505,6 +26250,7 @@ tl: { # no indentation
   version = "0.04";
 };
 "pst-func" = {
+  revision = 51149;
   stripPrefix = 0;
   sha512.run = "77349856b50aedfb4ebe05b2e3747b2bf98715201930ac374783172f0688c723405c069436459598744c681a5d8f42aa7d14bfe41adadcff69b6bf0e45d2df94";
   sha512.doc = "91acb2009228f42b79a85a4d343f484066ee9b930ab6e7acde69d796bd54185ad8d979b3fcfd72127203e91afddf3720a627895567e769378fdf0069f9cb8f87";
@@ -23512,6 +26258,7 @@ tl: { # no indentation
   version = "0.93";
 };
 "pst-gantt" = {
+  revision = 35832;
   stripPrefix = 0;
   sha512.run = "61b59f922129de60bf954145a0c83a5bb4c0232270b8213b45856a69ca56f32a9525d70ba86e51f95fa1c8836d4922a0dec971dea16f13f0c2f83c80fbfefc56";
   sha512.doc = "950a55218077d7203988c42c83445bfb10f53c7292cb85bb4178ab20b9f1404ab4a864266e52c3af074c45cc27b6777dae71af41caf270143160d3d59e222731";
@@ -23519,6 +26266,7 @@ tl: { # no indentation
   version = "0.22a";
 };
 "pst-geo" = {
+  revision = 46273;
   stripPrefix = 0;
   sha512.run = "2b559409de635cd04e9b128bf44ef5f92ee765d4ccaf2132e3014d9a75ee61867de1724de2c36752bcc600014767f058c3799a5387aa4029268d5fa9dff4e0e9";
   sha512.doc = "762140a38d7f39875d2d4d25aff57187d32daf017d5be19f7fde14c482d9128c4b2e911f67446cd47a28cd655ebcffe485dc4b6326d41bf3b0693072647cac0e";
@@ -23526,6 +26274,7 @@ tl: { # no indentation
   version = "0.06";
 };
 "pst-geometrictools" = {
+  revision = 45319;
   stripPrefix = 0;
   sha512.run = "1949864f97f21c6cd2a0e706028d5a0ecb4102c0afc5874b78c2bf883aa6698551214ac232f406bad9955e0f0a78f059118a4d950bc4b69bd30ecf9b6fc38606";
   sha512.doc = "adf2ae63d32d2cecf77c2aa950c8b827b51d0ae923dfbed7c851f0f0e7d6018216d92cf524b2cb4002c4040dbb579cff552a37cd5ef57cd2d0579b01128a3be6";
@@ -23533,12 +26282,14 @@ tl: { # no indentation
   version = "1.1";
 };
 "pst-ghsb" = {
+  revision = 45797;
   stripPrefix = 0;
   sha512.run = "3bb85212ac247b5d6ddabf8d98f7ff5621b78ae2b83b08c00ce7c2831f6f6ec4d621a4e5f2ad00e2b5d8883f95aed579f0d17a5525c9df5ef9939528ec736325";
   sha512.doc = "cfe4f9f8b24fbdbf22280b098c32c1b9b368fd6f74cd20c1ee7b241bf3a9afba822fda33b9c9365cb9c20c76ca658123039eb27828361d74e4a31fc8e170a6bf";
   hasRunfiles = true;
 };
 "pst-gr3d" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "85cbaa41c3cce49aeda36ef55a89122370fc23dc91c5e5e63790aff2b8b748eb6a13a9a921836b2a471ab2deb9577ecf59be0bc6dfa4d2f1ddcf17bc33ca4264";
   sha512.doc = "bd9026c7730dce9c09a092cc420fa7ca8d7c85db4a1f9a665a64f933595b43397027904c08311ab2301305f79a426a1b726b8df2c237c8a545726fadf9b8ed30";
@@ -23547,6 +26298,7 @@ tl: { # no indentation
   version = "1.34";
 };
 "pst-grad" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "f98fe4e4996e20947d90ef24d6825d72a8ceb6bbd586b0de9b90d5d73208816395e5b195dcda2816c8e709fa4c408f3b814c02911488c83a207039d28654b9e3";
   sha512.doc = "11f4a4de67f92bb2ba77457b5940e2b848985de111e3307215981e6d39617b8590316de5cb6e5002748d9e951be405e3f938d1708c28a7970be53808688c10ef";
@@ -23554,6 +26306,7 @@ tl: { # no indentation
   version = "1.06";
 };
 "pst-graphicx" = {
+  revision = 21717;
   stripPrefix = 0;
   sha512.run = "0d3f2d072a7bbb58ff555add4df7347a4dcba929bfba49d25dbf6b95956462a3fda07818135fe40f737151f323a27225983f656389f9a91a8295145ebf2877a1";
   sha512.doc = "8deba57cafa74987ff7dd22b52db699fef2067dfb62e8e2c7e8e17b662f1d7644278272ee97209b3c109345ae8c295e125d1b195ff68cdfa8362eb3b7ad1bc84";
@@ -23561,6 +26314,7 @@ tl: { # no indentation
   version = "0.02";
 };
 "pst-infixplot" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "a8e69a4bc20752d5f6d455f34fc4810e569a5f444de257c1b50c76d567a23d868b0e19c9f4656370a12d3a53ef35ad43e7dcc946782c19ef76091634bc2440a0";
   sha512.doc = "0b6958f851af834917ab04f39bf60d50e26eb61ea52c9dee91274714ec0a87519323b1f9ef7d665f0a6d05cc97e6f8b1bf51617f2c57a5d80ebb96ba1aa94306";
@@ -23568,6 +26322,7 @@ tl: { # no indentation
   version = "0.11";
 };
 "pst-intersect" = {
+  revision = 33210;
   stripPrefix = 0;
   sha512.run = "847a2532362e570d3e14ac4aadedf0cf1ac0f2da1991837abcb6cbfa607357d8a451d852bec9be50ea8b2995716613475c4c1ea1c3766169902eb82e70aaba0c";
   sha512.doc = "e8775b9d8adbab9e7ce63d595cb70747dc3d850c4b43095e1a35f6be8093b61ec92457c7fcf6565484e62b1aa7bec82700d8ccb2dc8dca0089e56bc8be5e762a";
@@ -23576,6 +26331,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "pst-jtree" = {
+  revision = 20946;
   stripPrefix = 0;
   sha512.run = "9947e00e7fdac25f25f1f828ff5b9a3b962b1d033c57232d2d47736ee7a675ee48367aa934153ec17ae3f2eaa763044dc067d83b2248c5f42a93eb5d9a79e292";
   sha512.doc = "4d0a2432e9880a71f1d7b6a9965dfacbebeb44ea2586fd428fa58f634d7670d763e9ac293aeec6adda6cdef98736a7b5d341ec41d89bf3999c4cfee9066001ae";
@@ -23583,6 +26339,7 @@ tl: { # no indentation
   version = "2.6";
 };
 "pst-knot" = {
+  revision = 16033;
   stripPrefix = 0;
   sha512.run = "f481b82e5d21dd86eef3cf64ecedc45420b33e43619574f072a050fd70a6446ef8d527607ed5a929443ff6976cc94a03817837c8776bb2ee9794fec80a4c0751";
   sha512.doc = "a8a82ce955b707c6ecb319783cdc4fc8406411dc8d711321919413d84ca42197828e69ae2b6b368a4b5b326650caf5393cb2214a7cd8b7bc0cff742b9b0d977c";
@@ -23590,6 +26347,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "pst-labo" = {
+  revision = 39077;
   stripPrefix = 0;
   sha512.run = "a8bc971be59f1072657d9cf9d26056ba800023858df1d060ccc7e31d2c533337520e9583de00085842dfafe84a590e0c90706ac00bc98da282a5454fac76aade";
   sha512.doc = "1b35f244a45fd18eeba484f925292358b5582f0ba18a9c6622afc67ed287e74d0c1c876ff78c19de0e9b53f55c86f30f47a6d179e0142e79aad5c5799e497ba5";
@@ -23597,6 +26355,7 @@ tl: { # no indentation
   version = "2.04";
 };
 "pst-layout" = {
+  revision = 29803;
   stripPrefix = 0;
   sha512.run = "6d4c06efe0d0095ba52eeee25ffdaf44f836e1e41840d8098e25c6fd3b5ee79d28663ef7f02ddd7d1ba21228bf4f9bd5a66548e3aef642a49cc9aab5b4b24fba";
   sha512.doc = "fa32cd065979fcaf2105372155ae8debb399a0f930d6b85e7ca4a69d8b76bc0d7fb717ebdc8fa4c9794ea03268c2079b93e0bd6453155bf5925defb75cf05e08";
@@ -23604,6 +26363,7 @@ tl: { # no indentation
   version = ".95";
 };
 "pst-lens" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "406bc53d476d47d464f7fb318e75a5aeac85cf4239ab916e91728f5d8c0c05a9fd4c4fbc24b4b058f1c15d1ee4c6a0d45511b8cf6b288bf10163523b2bed0f37";
   sha512.doc = "8d29f5014e0bae5d1fb22483ca3231e3631c76820be080b3a588660f868ece861c2d816291656a45c8a33356b992cd6e2396e9d73f4ab316b877b2ed8b778f7e";
@@ -23612,6 +26372,7 @@ tl: { # no indentation
   version = "1.02";
 };
 "pst-light3d" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "2bcfd2835e20302ec865667a44af8dec63c6c006c8a3e39b048464e129ef04300d0d7c2e23f324a8acee0e1ae1439e75ce642f7b76a8f1958d600546ac7c220c";
   sha512.doc = "166f47222230e24530508e3ca66c881dcc844cb8cb35b92fdbeab164b964ebf2928df3068d79467fc8a9a8a4db81d2be48350036169605365bda116cbd86d095";
@@ -23620,6 +26381,7 @@ tl: { # no indentation
   version = "0.12";
 };
 "pst-lsystem" = {
+  revision = 49556;
   stripPrefix = 0;
   sha512.run = "0da3611c401895f508b6963c46f781863ab6b42ced2addf3413b74ff1c14daf42cdfb5c166072e18427871ed6d06c5cfe3b185f0af30cb25db2f346828ee1682";
   sha512.doc = "0b277cd979f4a12abb57b8e6d2562b156bba74e0ca46da10da17a6bc505c6747592b5f19c5a3e9b72f99bffabcb45298663c6dca33c875c923408646c4c5f6d8";
@@ -23627,6 +26389,7 @@ tl: { # no indentation
   version = "0.02";
 };
 "pst-magneticfield" = {
+  revision = 49780;
   stripPrefix = 0;
   sha512.run = "cc2a45978e49d93e677f4b028afeaaf89a0ec5748f545cb575fcd339cf92e1b08d870be79d80a5cf464b29b4e51d5ac5196bfe0665408da1108abf4da4f57222";
   sha512.doc = "cb757378708fea31eb6e644eedb62a23de45c756d0d4fbd902d40a4fd9bb8189ec1a513e5d12748ee2264bc6a35eec67a7bebb8d59128a367025a6dbc6f5551a";
@@ -23634,6 +26397,7 @@ tl: { # no indentation
   version = "1.16";
 };
 "pst-marble" = {
+  revision = 50925;
   stripPrefix = 0;
   sha512.run = "e16ea0ed61c6548d43746f251bf8581a00863370b73d46077e5510fd167d63a539ab4543f0ad7db704571b5274cc5756fb713e5182c8abea404708215a98849b";
   sha512.doc = "5684abd4913353b7a4953ed1b5878183f1c10dcc1bdecea6f3e9e6adef7c73c7f16cdade2b5e18f4a645c203dfb15a3917740a7638c410002eab892bc5ca6acd";
@@ -23641,6 +26405,7 @@ tl: { # no indentation
   version = "1.6";
 };
 "pst-math" = {
+  revision = 49425;
   stripPrefix = 0;
   sha512.run = "4cc671ab7b7cfac83cab929d2a0cfba81f7bb6b92d89460195fbea2875511f9ac51c1f64cfa527903f2c081201f195512443c358691930cfe8c57059e907df53";
   sha512.doc = "76c4425e84bd67e989fa8c533dab1660c03aebb8c21dc335d26d99ce4b628aad3ff4d9769c7e1f501b4ad05b7762142910bb34a97cb92ff98a1cb637a50ebc46";
@@ -23648,6 +26413,7 @@ tl: { # no indentation
   version = "0.65";
 };
 "pst-mirror" = {
+  revision = 32997;
   stripPrefix = 0;
   sha512.run = "edb6796eb96047fe09833056c409527df06d63dd69e9c2b600c1301b43b6e5c858d1061e9a138c89ab47657682f9ee67995a02abfab5251356e2eb8de68f5316";
   sha512.doc = "a9e22f2e00f67f12c69df3a6dd4377d25b8c130c4afa8c995c8961ba426f69f0c286460925c7c782a30b2a23ca5f2d4a46a5dbfaf72955952f561df2545c38b8";
@@ -23655,6 +26421,7 @@ tl: { # no indentation
   version = "1.01";
 };
 "pst-moire" = {
+  revision = 49223;
   stripPrefix = 0;
   sha512.run = "7ae5693ca401b037482c4b8d7173a03b677ee1a8dc62ceccb710264b196a20240f310c26cbf9924dc2b4a9fa2869257843cfe4c87c26616a0f790ab444130a13";
   sha512.doc = "442f2477e9eaf122249b3a06fd2755afc9e701fe4333102274de3635eee398231d422b8077764465fa42041acc6289d00b4254505b591f055c6dddd41516d0e2";
@@ -23662,6 +26429,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "pst-node" = {
+  revision = 50215;
   stripPrefix = 0;
   sha512.run = "b4feb98035acf2fff9cab8c21c7e408fdf20dd6f12ea5209719eac9d77db51cd907e345daba876ab0b7312bc9dc4a51be17097d3fb02f0a181c006c4385b2096";
   sha512.doc = "2e47bab65f6077f796bf4d50cd4f5911eed2eea658701c46e47d65543697c68209aa307a5f620fedadee8ff2ba28f6ccf92dd9402bc3264616cdd3291b8673a2";
@@ -23669,6 +26437,7 @@ tl: { # no indentation
   version = "1.42";
 };
 "pst-ob3d" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "1b4eb87fd2c9c63edd4d7388b32c5e6a8f4d6ecc87b9c1129540398c607bdcd258b4f182710ff12d6a7a5e8b8f34c6686203d5c0ff9a60a1a6e462ccb3b382d6";
   sha512.doc = "f934cc75f6d2e6f80bddeda8d2226e6ba0aa6749adef4f08b83036a67f1b8406d1fff61a01862eecf48ec6e3ce76af2ff7967db67a294956fce50d3c7497bf00";
@@ -23677,6 +26446,7 @@ tl: { # no indentation
   version = "0.21";
 };
 "pst-ode" = {
+  revision = 50587;
   stripPrefix = 0;
   sha512.run = "eb00fab8b3932a868526aad8c1623ac7939d45a26b83374779f4eb3d25807ff58a5a75ce31adb84af650939d7e6957336f44d8f7a15de33262ee7b69c70fb002";
   sha512.doc = "5da26468c9426f614080513d9dd031bab06fdba87a899be28e09a21c7de75b50c4dbf00ebb569bfa63293bb7881fbdaef76f6bddac5a7e8084796fbec2e7ddf4";
@@ -23684,6 +26454,7 @@ tl: { # no indentation
   version = "0.13";
 };
 "pst-optexp" = {
+  revision = 35673;
   stripPrefix = 0;
   sha512.run = "7d171906d8fc840c8003e82b3ac175360dab625172b389c6205371bb432e280195c2daf53671d8ff2ab43d24233ab2c8bd3002b8d4489c7395533148bb40e939";
   sha512.doc = "f9c5f7bb43f9171b53a10941db9baf3f7e7b8e50620679f176a14b0b384a8a79118361e0e7afc2a8c44a2e9916313da6321cc5a08ceff5adfa4a678e35fdce46";
@@ -23692,6 +26463,7 @@ tl: { # no indentation
   version = "5.2";
 };
 "pst-optic" = {
+  revision = 41999;
   stripPrefix = 0;
   sha512.run = "c9e0231301824a612c755adbf2789f9cc428bbc6133a5669d173ff1426663f704aa978c506add7e4a0c786b51ed61df355f59e7b6392f355ac6913c6f9336f46";
   sha512.doc = "cba9465a3e81060bae7ab4b8d7c8a1ef804415a3f85c0a89c98d57c6a3e8ff2c58a40b91e9c6281ac520be5b03f13d1890d8cce063a892a84d6eee5f6beeb625";
@@ -23699,6 +26471,7 @@ tl: { # no indentation
   version = "1.02";
 };
 "pst-osci" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "d36d987ca50c50c0840660070dd7eefd4ff49f4e86b1a6f33bb9e549a1468f4992a7eff6de56307e5d5bf4e8063534cf4f658df8e98571a1d86fde3555a67e08";
   sha512.doc = "80d99115c7c3fdcafef8f4be99b3066799cb40571e219158abb48de0ba405a0c977d0158c20e2b550895d1e63580bc7366338fbbbe7add2c3a89abf618583ecc";
@@ -23706,6 +26479,7 @@ tl: { # no indentation
   version = "2.82";
 };
 "pst-ovl" = {
+  revision = 45506;
   stripPrefix = 0;
   sha512.run = "2777d0d3011ba4ba911dbed78bb3ab29eb54bf392a9aaf73707f17e5fd9ccded0198d0b42bbdbc6879b2f07ba84ccf9d121748e3f0d3f931a8fb6b6e2a904b8a";
   sha512.doc = "9b7057b4316adf9f0fa30561c658f309cfc1be757c0eebfb63bb5cb94dc9b8b6cff502f056f9e1d64b207cdd154c0ec64b13c51639ae46377c4d58d51aa00725";
@@ -23713,6 +26487,7 @@ tl: { # no indentation
   version = "0.07a";
 };
 "pst-pad" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "cf519f69dfd1003ab17a4a67f309336442bf35497cd0102e346ab8537865540c314666fbf01cf6e3e106ce922fd8922ac4bbb5b20ee90a7ce24a7a98ee974006";
   sha512.doc = "0a2206d3ef84dce88d3e0ea7899fb623d12f7f6a820298b031ff76044eb9ec49bb09f70f6ee0b00018fcc02f6260d67ee58c8a06a48ddbfd2e5b17f52d374830";
@@ -23721,6 +26496,7 @@ tl: { # no indentation
   version = "0.3b";
 };
 "pst-pdf" = {
+  revision = 52819;
   sha512.run = "e262eb62c86631aeb04bd4268672fcdb7da5eb458d91cfaf78ed668e0afe585bada46bccd9eaaa7374e23d9efb79106ab7ffde1ff879993a7138475b8f8d6599";
   sha512.doc = "d16ca8328cdc79dc6c3488a68a537ace21d2f124604b69c79be6860d9913c8eac3d3093b9fcf03a17dbfe184a73c168a13d2e5a54056fe076e0e01941740f4a7";
   sha512.source = "67286e2f38bb3c88d48f0cde11494a64e0bc751d65b997ae50f4f50df980ad396b58e1eb37e544d050b52b691bc9fedaa0a15018d8d1836b22e3dff6253f942e";
@@ -23728,6 +26504,7 @@ tl: { # no indentation
   version = "1.2e";
 };
 "pst-pdgr" = {
+  revision = 45875;
   stripPrefix = 0;
   sha512.run = "c42b723e2739eb3a70f7a984d45b6b738a1dab1f4f3bb7311850c344be736fbc97ababb6f744539deddc7d1cbde47830e81d1bfd42f705a7287b1fb970664823";
   sha512.doc = "006395a2e1caebf8c86f4eb41eeb03a35d47b82e65e18ce4045eb22f93bc78a38f7611a1328216712d29be852fa3431876254f3b41b8b7a2a7c453f32a8e1bf7";
@@ -23736,6 +26513,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "pst-perspective" = {
+  revision = 39585;
   stripPrefix = 0;
   sha512.run = "b1c6c1313e0f87d7c4dbc7122d09777f14f02ad0908c6151fb5da905d908a9ca2d905c5a9e3fb1e54deb0b7b91dda1488de0b96ff40683488947985d68e2d331";
   sha512.doc = "df82bc95d3720f7da3c23736d83fbaeae5132f7b84aea9f2fd8ddf925f919e5d56f6701bf5b541446c024e8d2f6a5875d562d96cdb1564dae92d6ade759671cc";
@@ -23743,6 +26521,7 @@ tl: { # no indentation
   version = "1.05";
 };
 "pst-platon" = {
+  revision = 16538;
   stripPrefix = 0;
   sha512.run = "8eade14982b0ffa2c5e7d5c68a91d4159ee6f3317b20836c3f470ed68940a522459bdce54b1e1dd4068173e50b0c611531d1210b1651d805602f952a1696626c";
   sha512.doc = "7c252b535853c4941fc4cdbe504a3c20ece2c04dd15e2bc5ea0c88928b5fdd7063035c329dccb7ed04d71606e70f632fc1d66847dd35ea46a4626c04070974be";
@@ -23751,6 +26530,7 @@ tl: { # no indentation
   version = "0.01";
 };
 "pst-plot" = {
+  revision = 51650;
   stripPrefix = 0;
   sha512.run = "58b2d0bec5abad6a4f1c2467badd6ca7cccbfdbbdd0a838493aceeb37f478f4500fc95463176fcc97e34111249512d50215a319b01a847d863d54bcfcf5e73a7";
   sha512.doc = "748945b66f21c63a160b793720ba5bd9243c73602e68e43ff72a5f52ccb4004de186e648ad0e5b5e883c3772197eb2a36ca0cab046f8313a7ed8ecad522fd761";
@@ -23758,6 +26538,7 @@ tl: { # no indentation
   version = "1.92";
 };
 "pst-poker" = {
+  revision = 53482;
   stripPrefix = 0;
   sha512.run = "6995f975d1c149f5b67126e6a01c076802a5a40cae3f7376a25258b923397d61f021af19822df4e4a522b3648d3a0e6ad1e5d81e38527c7468e753b0fa35c525";
   sha512.doc = "619a0a9576c4cd17f6bdac1c2e0dad6b42084fa8f8f2bb1f38a8a07d0a0e7195f79edae841e79f80393165b2671063f6e8388fc2c5b9c12d063f1421a0a4a0fa";
@@ -23765,6 +26546,7 @@ tl: { # no indentation
   version = "0.03a";
 };
 "pst-poly" = {
+  revision = 35062;
   stripPrefix = 0;
   sha512.run = "badd0fcc2b439ba270d5375703f91df9009fb7eae920915eab8757185da0c6665c34d530d9b4d8bf469767dd79ee834ded104a0fd98243a1e8a17cda47be0f79";
   sha512.doc = "0facae2d565a22853a6e455534065f5954571311898e0850fcee7b18909f1cd0fe06b116138faedda6767d8514d44f7d843c13985f8723ccb8ec03a81bbaa46a";
@@ -23772,6 +26554,7 @@ tl: { # no indentation
   version = "1.63";
 };
 "pst-pulley" = {
+  revision = 45316;
   stripPrefix = 0;
   sha512.run = "4253283884b3cc36801dd7d462655d3cccbdaa70af0219765a3225c8b928e49cf0964d4db4728ef01e06ed33865facc46bd767f4d1cdbddfbaf0213e4ead012e";
   sha512.doc = "28a4654d2219e056ab1a53bc0fbb60feb919b3dc26b1e542b561cdb6d3f0b1abd050afdaa99a9ba5b374462cc451c1681622f6c6c3f6aef26738a36a845648a2";
@@ -23779,12 +26562,14 @@ tl: { # no indentation
   version = "0.02";
 };
 "pst-qtree" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "5bbb7fdd477850e4e6c2bc395665c50668a427cbe176122d160fdfc2aa2f322ed83ec43929dd185fa1dec439bec3f5de719aa8d640d0bc498aa7ac9f9089cd5b";
   sha512.doc = "4a0bba9fa7072e5860403c3b22a23947045106fd4b89781af848d17afbc5ac456c77617979ebcb80afe07620ab8b990e868c688301c4637804d32790fa4bd7f4";
   hasRunfiles = true;
 };
 "pst-rputover" = {
+  revision = 44724;
   stripPrefix = 0;
   sha512.run = "3bd94d3a37fc8bbabba547a0072618c6e2bd2f6052f95cd4dd8cb973f64c4e97d0c7ef72fbe425df032aacbb8cb109b0eb06ee304b725ddcda6489da2c893934";
   sha512.doc = "16bc8c2500c19cdaeb701da98e4de0ffdc13116a0ed5802beae395e9664ee16acc6341db7d2c3ea7b2a16b0afac35503cd5a53e1ce1fbd67598be4c890b317d9";
@@ -23792,6 +26577,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "pst-rubans" = {
+  revision = 23464;
   stripPrefix = 0;
   sha512.run = "360f1a04170358b976bc8b6d4d4ee138398f6b018b5611811fc41d90475c474e89fed214708d11b47bdb58cfcf983b37c3338c4d5b13b13825f3388d1562372b";
   sha512.doc = "086f80c0b99a0043769b159b6f52de125f01e6c3b00189b0924c62961b934121b09a2f1634fdeef737b2fc468c392051f8b117e1de5d7e6d223e79ff443c2cae";
@@ -23800,6 +26586,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "pst-shell" = {
+  revision = 42840;
   stripPrefix = 0;
   sha512.run = "d91fc81c2140e0ff4aae4e190b4816887f0c068df42022b6b6545adec400920a69e81bca1373efae4249a95cfb1b7f6b712497d72510aec79954feb7a1ec07d2";
   sha512.doc = "a788f994d6003ca6a650cbe042b57a712fb91da2146b21fe3023b464487e5a56699a2aeea56be77aa26919f6c1fcaca6d49bd3ea33ccd2fd7a06e5f95a917803";
@@ -23808,6 +26595,7 @@ tl: { # no indentation
   version = "0.03";
 };
 "pst-sigsys" = {
+  revision = 21667;
   stripPrefix = 0;
   sha512.run = "db3d3dd31c4166a132a174cc9b2a86fb226496c663c1ba95b36f6590e18799c5eb4e8587ccc3db5de0d3833729ffa90080cf037519b2a7ba24c70fe381aedad9";
   sha512.doc = "ae2869eaa649898daf057875d28fef1be5f20caf0b7385ba7723e9be51e534cc69b953bba8ad4fa6d04a0d67f85659c82ec08043ba760279a6759c20a2c27d0f";
@@ -23815,6 +26603,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "pst-slpe" = {
+  revision = 24391;
   stripPrefix = 0;
   sha512.run = "43905d7525acca6d10261e169a1c1ec1ee0cf0d4b7fcd05643dea3f705331588d774649ad5ca560111269025e92a1e91796693c5246e4d2b2816dd33d4eed87b";
   sha512.doc = "377a89c5dcc49e587e3e2d2e1221c289da9dc6b3cc0565bd182d0ec356835309c12eecf68680ac4083c906701365de0068608ee1e49ea9fb95c866a188931a67";
@@ -23823,6 +26612,7 @@ tl: { # no indentation
   version = "1.31";
 };
 "pst-solarsystem" = {
+  revision = 45097;
   stripPrefix = 0;
   sha512.run = "48c38ec076b20b28aef50c207a77069cf5053a209f4ddcb3adb5a8e01f2b6510abb388075c7e5c90b6b48ecdf6f92764836dd58fb51181e28afbbe6d47600abd";
   sha512.doc = "581e73c180e455adb09453c7f535de5a3f540c3d8046ea0a1667f9f13390cf63297b9073ef66d93f4c6b2aadffad3de24000a49cbbbe374bb7af75402fb6bef1";
@@ -23830,6 +26620,7 @@ tl: { # no indentation
   version = "0.13";
 };
 "pst-solides3d" = {
+  revision = 49520;
   stripPrefix = 0;
   sha512.run = "7e725978c030da337d882e05069b749a4398b1a1c479a50db34fc63801cb77b78630e2d1dfd0c3a39aeab3e931236dad91b6c722c4d6e06dcfd867f007ce99f6";
   sha512.doc = "a00138b042c58700438cfb3f094f836b029d31ee3de40ed290d3f5475a31cb3fc949c13402c35d088dd1cacf13c66bcee934a0ad59e97ceee5ce9db1f99e7c4d";
@@ -23837,6 +26628,7 @@ tl: { # no indentation
   version = "4.34a";
 };
 "pst-soroban" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "c21d3f0e19c4cfcf79563e23e760178de6e39f1f42147f534946fef315c0514968548b30d24eb345f4f2c5cb7807fef4f0d45d8e345e9523806ce1e054d8cf11";
   sha512.doc = "b7c1422ac43df949426581f7dbe749300093ce2d20145df768e21e893b9d2c419ffa8ab16c60fa509f09317bee4c7f80bed4920b92a5f9f2e9289eb93cec5eec";
@@ -23845,6 +26637,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "pst-spectra" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "325e4f07e9c2788d571c6105e1fdc3a097881d1b472b038c365c65a84a4e69e15866750720b2c86f5b20e00fc3a054f619e79b6564fc3712194a1a5d05edf248";
   sha512.doc = "f3655f399c4986b122253c4849bcb15d0ea4d2390b0ec3b8328d8255e5e2d44481198d63c6ad9dc10365095414267285ff02a944c1bf5bfd8c458d1a7cd5a0c5";
@@ -23852,6 +26645,7 @@ tl: { # no indentation
   version = "0.91";
 };
 "pst-spinner" = {
+  revision = 44507;
   stripPrefix = 0;
   sha512.run = "7014c371182a354d11bc76c60bab01321d60af9559098a353c3e7a5a88d2e251f9362a24872b60d2214450ad3d423f3868d219bf109f0524a6431db17ce1c881";
   sha512.doc = "90ac8da08b1be6dbf3bf126ed49279fd0f593a586a3bb7e58b89f9b9da361637ab4c9aa133ee2f798b7d49c420a4765cf2fd9936410d37ac955d661196f1dffe";
@@ -23859,6 +26653,7 @@ tl: { # no indentation
   version = "1.02";
 };
 "pst-spirograph" = {
+  revision = 35026;
   stripPrefix = 0;
   sha512.run = "701964d1fad3d757fab421a9458c5983e11628d965ddabc2dfaec0259b829ed96f699a2361043c1f08024538b10d9b0ad36e921b704543288da5c5d5cb6e58fa";
   sha512.doc = "2b3a0bafb00c64d1ce883995f983b626390ad73492bb96ace3d2cc5df05e91bfb6f74d96269644b99f56ba0a670a94dbedab663c3dc3bff3e099d141185ae331";
@@ -23866,6 +26661,7 @@ tl: { # no indentation
   version = "0.41";
 };
 "pst-stru" = {
+  revision = 38613;
   stripPrefix = 0;
   sha512.run = "bc0961c1f9afb68f66c4af9aa9d37cd8cc7c6047f55920d12cfb14a18b2c2288c8468c8d9f0e21eb7e395eaa884f0216b37a6fa947fb2c5ef51d57996ba8bb5f";
   sha512.doc = "b9352eb01e9d80049a474e0b5a513bb8835be16af4226b4f4269d9a94d64b81a842e640ab316f066595b0b6053080042deac4b0cce1bbc602ea0e029f7809cd3";
@@ -23873,11 +26669,13 @@ tl: { # no indentation
   version = "0.13";
 };
 "pst-support" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "05ddd6f09d603a2a6887f03aa3da0374ad061e2ab52ad25f0036192179f985f3695b0248c602607172c94c55cd9d2bb453e8f145d73f133bf79a881ccb1daacc";
   sha512.doc = "ab2adb2c06d4f7f4b4a4fbfec59e1fc8d6b9f4ccff5aacc29f0a1524759fc1f0792640e8cc301e614477ad45261bbedb3ede93de2463e0a655aeff846561c185";
 };
 "pst-text" = {
+  revision = 49542;
   stripPrefix = 0;
   sha512.run = "6cf40d3dffb7803959a187f6a19b137b824d46ea73bd31430e983abec0b828d49c6d404287382242ad224e2f51feae74b3bee374443e9f421ae70d1ea2c0c3b6";
   sha512.doc = "87f213f037227c05ceefbcee7ab8a316b88ee6f9ddc366c40cfa7676a714ec6802f3781db8357224769216241feb9171668184534572ebe5c5776c1553c1b62d";
@@ -23885,6 +26683,7 @@ tl: { # no indentation
   version = "1.02";
 };
 "pst-thick" = {
+  revision = 16369;
   stripPrefix = 0;
   sha512.run = "5eab2dfdad0c9fad21cbb7d4484f9701bd48b225e881e0c86a2418afa143582aef160bbf4cc9f5a773aea97d2c12c7f614f41fd87f0ff2952c27ddac91f75905";
   sha512.doc = "5d75bab3e4b5c18a14e7348dd97a3f7e0895a2b44111a72d87ff8ce7c7c0499062f61b4ff38b2d36b0632719fd58a33c91f077edc269d74fa58281a83752e9d7";
@@ -23893,6 +26692,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "pst-tools" = {
+  revision = 45978;
   stripPrefix = 0;
   sha512.run = "9803ddb2afe664c53c1bede5d3444dbb4adaebe07c3a3d5b06cf7e0775593c13e6af5803584fb8b9afb12768fdb382b8603b0024fae40bbecabbfa720d87c4ee";
   sha512.doc = "48b440cd10fce6da42173d90e2e7ca1454cfb6ddf556836ecfba98729de441f6521e7fed0b95bd20a570c06c3b1baaee285b52ed121d4c16679ca6530b8b5ae7";
@@ -23900,6 +26700,7 @@ tl: { # no indentation
   version = "0.09b";
 };
 "pst-tree" = {
+  revision = 43272;
   stripPrefix = 0;
   sha512.run = "1148e0e571d68d8c95c0049313b244a6d6d77bf24a453121fd462a11e51d51aa21cd7eb66e9bb7c936fa90bc888912385814ce347cf911563206f520d2bb1850";
   sha512.doc = "d68059216626bbd3a33ec6bed2e6d2f0f78db2da3ae56cf947367608033a156126685bb0d162f95fbe7150c950c3d5d20de01fd0ab9b6bf77bcb2cba31bfebdd";
@@ -23907,6 +26708,7 @@ tl: { # no indentation
   version = "1.13";
 };
 "pst-turtle" = {
+  revision = 52261;
   stripPrefix = 0;
   sha512.run = "df30018ed03f10edbb9e215879f041ed6eb0db48cf0e7e2b5128cd3339d1005ef074aa0631c84bcfd2c8f9c1a1a69a26cac36248f3971a3b3302e2f763af750d";
   sha512.doc = "22c14f1eca2aa764bfc250d8140f0a24f3dab1cb8e755180167ddcd1ac9224aca07fb41408823b8933b73293204053f7f139513781ff37a67ca9e0ee7bec4fbb";
@@ -23914,6 +26716,7 @@ tl: { # no indentation
   version = "0.02";
 };
 "pst-tvz" = {
+  revision = 23451;
   stripPrefix = 0;
   sha512.run = "79e206f5e4154a797cf168b1b490cac8e1ddf98a79de6ddbd9dc98cf53eae01301c034643f6660708b58e890ca94b7235e5b0f48e53136f32c12c0adf5749179";
   sha512.doc = "ffbba30214dce83e7f00aa7c6e126919cafe341dc727736e27a5af8ae212dc66dafa49afba553079d6857258ca72577950c06ba2deb21ca3c1b13231d1909935";
@@ -23922,6 +26725,7 @@ tl: { # no indentation
   version = "1.01";
 };
 "pst-uml" = {
+  revision = 15878;
   stripPrefix = 0;
   deps."multido" = tl."multido";
   sha512.run = "e4ff8ea9b7fb9f530e33280de3e9eb20d653c0c062fa80611a544daf74da0b1dd2481b43d8f5258f9ebc1d1bf95b393b32c7152ab8464a9e980cefa105c45ceb";
@@ -23931,6 +26735,7 @@ tl: { # no indentation
   version = "0.83";
 };
 "pst-vectorian" = {
+  revision = 28801;
   stripPrefix = 0;
   sha512.run = "3ea49c1da6238c095dc2ee095b21dc95fca19c89b0ae473e73f9ea67ca9377cc8e696362f2cf859d87ad69350c7b94a1049823fc0b5329e36e8e31291cdcfef1";
   sha512.doc = "787b3b16dd0a73d96d16a8f32e26cc40f84706fd8abf48df23eb94a5dd9dedc0f9c9b7d8512894910ac96c8ec5e879a5f0d24f6f19e2d9f231ad66060e07565c";
@@ -23938,6 +26743,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "pst-vehicle" = {
+  revision = 45320;
   stripPrefix = 0;
   sha512.run = "4e5a5dc0227641a8b8f96913cfd513279c91f841fa1dd5960015ad79d5877a86cafcf87db38bd692611d5afd73a8a91505822d83433299db4efa9e4975a8da42";
   sha512.doc = "1183b285d9438c7360f2cef9c40d86424ed2891d36a4aee6281e57b84773dd6b2366ca6c2bcff200911e583bd11f2f5aa9615b45656a240b28b1809acacf4145";
@@ -23945,6 +26751,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "pst-venn" = {
+  revision = 49316;
   stripPrefix = 0;
   sha512.run = "63baf8075ef294bc3a909b3160fa7868a7f179c832d680728fe463f8b1c058411a1393614ade666824fa3233d6617b1dd4e0c50c299a620bc459104515c85727";
   sha512.doc = "e332f8ed24744c03c32bfd139a38dabfca1c6eaf9c5c4624d1579c16feda26e42e81b39dafc98527e8bdaacc2e3ff2d246c6f4b88d89bebfaadd57454e08af7e";
@@ -23952,6 +26759,7 @@ tl: { # no indentation
   version = "0.01";
 };
 "pst-vowel" = {
+  revision = 25228;
   stripPrefix = 0;
   sha512.run = "6ee1dd91b42e319e3a88966fe4cb7327211e5859ae9bc9e262afbfe1fb7f143386ecb70a71d6b24cb0c794cb0943a6cbab4eb40ac683c55a7ef1fbafc118e132";
   sha512.doc = "4fd8ba42b0d4ed821abe52e5848af0d19fcf12c2b9660f09a502561fcfbeffbe38bdf2a0540ee79b99f50cb3c783ab4b5d003a59cf84b3066c364daa7dca0eea";
@@ -23959,6 +26767,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "pst-vue3d" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "d2e5829b3c241f33a69b1c59b5aa360f73948a6dff70d39ed41b82c67abc2b469860e0bd91ff131dba6392cdb3eb9d78638928052175e65ad7aa94fc3a8d05df";
   sha512.doc = "70d297642f7f36539cb21c12b46e2d5e4a6db244f203aa1b009c500876d2def37224579cd8ad54e5b5004f26c41203a0cb2d0a321d38b15051605c2f9432bcc8";
@@ -23967,12 +26776,14 @@ tl: { # no indentation
   version = "1.24";
 };
 "pst2pdf" = {
+  revision = 45476;
   sha512.run = "ece2fc7c670d6c6895d364cf316facc5898c83569640f0c261ee89dbe3b302e5c6190e95c6eb08b132d213cbaddefbb1e589f1e6979a9540454ef442ec94bfad";
   sha512.doc = "79cd5a76de8c3cd53b96adb498ed30afb5a8f9b8cf35009fd4e1c487b7d381dad81f46d03e85b1896ca712b02cf31732a7b9b84d4e7f75b0a7d7b6e0032ad559";
   hasRunfiles = true;
   version = "0.18";
 };
 "pstool" = {
+  revision = 46393;
   stripPrefix = 0;
   sha512.run = "a97af35dfce4a137af97071b49e58c31739e6f271afc62a455db473e573148d25fc27937ce680c6f400a200151ffd73867d5dd8781b12a63c68b7bf256cff5d1";
   sha512.doc = "613cc4899b1d76e0686cd269568cfc0dda437cec0e50571086b3d44659dc4b3e3d567dec88b5420e4c802d676f21c2428b3930fb6bb3f7d7faa14c029d35d43e";
@@ -23980,6 +26791,7 @@ tl: { # no indentation
   version = "1.5e";
 };
 "pstricks" = {
+  revision = 51102;
   stripPrefix = 0;
   sha512.run = "4c674666903d17749de9a99204e59ceeadee66d3fff38cc0913efac0ca34fb0269c7e5e836543d28e998277537fbca4fe64889cb71fda2dfb258a5aee37f3260";
   sha512.doc = "8fae1af33f0d89b9da2d3bef0703e884ee0c0adfa187434e58a83fb84a999d783cf2e6483d4c67b247a34c5c3f87eb184f11fd34ac1ea6e266ed29d3552a625f";
@@ -23987,6 +26799,7 @@ tl: { # no indentation
   version = "2.97";
 };
 "pstricks-add" = {
+  revision = 53763;
   stripPrefix = 0;
   sha512.run = "cf73863537b9058961d4592077dabfbd0e76ff0f07dbc7b17520945bad42286483da11ebbd44abe403845a9092cfa6415ad881ab19d323527f1b979b9e0163be";
   sha512.doc = "7a7639cd2dc128ddb203de7aeae23eb50adba49702b5270c6c432a159f185dab78bd0b6ce9925b6b803c200403fb662a9ded85197f79711d6880a1641cd53996";
@@ -23994,24 +26807,28 @@ tl: { # no indentation
   version = "3.89a";
 };
 "pstricks_calcnotes" = {
+  revision = 34363;
   stripPrefix = 0;
   sha512.run = "1b17e544484b71f3c29e5c3e1bed6021658ce7b9a256c21c004113b722a85be7ea6861753230910771b7c900184ca8cce146408301e75de79e0c2bf8939c49a6";
   sha512.doc = "bab8492549fd268f856e11f5f6db4e1ca878c67634387e7295bc163cd17080ee6b685893ddc85a882bd895adf3689639bfa7fc7d0da5e9916ef305c18d94ad65";
   version = "1.2";
 };
 "pstring" = {
+  revision = 42857;
   stripPrefix = 0;
   sha512.run = "d77c937467a9cd16f24fb1374a0d797db04bc301fa8a677712e09d83b58df6fd12aad8857dd83f4d5278d799a0d1d52ef12106e8106921d1ec1453ff6692605f";
   sha512.doc = "51c316c27c3d4083696dd9ee86e378c83ed09c75c632a7f0a580bd84d0033c7776008056a4b26d7835a4974b879c0f2b0389ae83c70cbd6ab093bc8b2add9ed4";
   hasRunfiles = true;
 };
 "psutils" = {
+  revision = 52851;
   sha512.run = "737cbffd48eec8244b11d6715a41feea6ed25cd6e53326dcbec0a5fe60881c5376dba508d70345db30a3c3515b24d3995f133b92015d2e943accea1093ea7c1c";
   sha512.doc = "68505dab374e4e4ffd9da0ce6e6ee41008ebc0e2eaac1cd89ba7746b6882ba7bf6fb93143b4dd5a3a8fada821104ab8ca66fea5ffe313173631f98b221fdc62c";
   hasRunfiles = true;
   version = "p17";
 };
 "ptex" = {
+  revision = 52851;
   deps."ptex-base" = tl."ptex-base";
   deps."ptex-fonts" = tl."ptex-fonts";
   deps."cm" = tl."cm";
@@ -24023,6 +26840,7 @@ tl: { # no indentation
   sha512.doc = "38213de7cb55c5ef1dc8e0c289c4bcb6910980dc81f1b035d223dfb9956353fe3423b34b665666177d2f3e6087f8c763109f9ba61a2e02b62c4dd497604bc352";
 };
 "ptex-base" = {
+  revision = 50731;
   stripPrefix = 0;
   sha512.run = "616ce41d8fe02c6d38dc638d6557ab29580cc57e52977b27d319ddca63844f91d7b0f0373c57bb039a3f70b6ff462eac179d9e816933b2954f2af1b00c3fa0d1";
   sha512.doc = "e4aee26d3ac73efb1e0a2b4579e7e8cb1ae46925908ad407d8772eefd310fb5ac969c5c53303eb7e5ba6d0cc115f487fa600b5b6446ebaa52f9015ece56cc19c";
@@ -24030,6 +26848,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "ptex-fontmaps" = {
+  revision = 53823;
   deps."arphic-ttf" = tl."arphic-ttf";
   deps."baekmuk" = tl."baekmuk";
   deps."ipaex" = tl."ipaex";
@@ -24040,23 +26859,27 @@ tl: { # no indentation
   version = "20200217.0";
 };
 "ptex-fonts" = {
+  revision = 46940;
   stripPrefix = 0;
   sha512.run = "54ebb6d2923ff6b277b4376041b90a0fa6a164281cb18820f175d5aa87f9e996c1adff16e9e5eb5bb90d52c135d581eb1d5ddc476ecb2446fd27d0cecd75bb30";
   sha512.doc = "dd3c4d3510ec1de8a5174bd10a7ff7bb173b25354b28f0b8411fe23b41fee8523fe1993c30e55cb7c3eddd90bd17db5299cb8f4ca170e4d97869388d3fbd8137";
   hasRunfiles = true;
 };
 "ptex-manual" = {
+  revision = 53007;
   stripPrefix = 0;
   sha512.run = "bbe8cc1483d48b4b77c3ad00b0159c65b1a0dcdb2a860bc38993150e60f3b2a92ae61d3e598a02afb06c8b3810b85e64a179a8c2088b2b342c6c8148af3be2d1";
   sha512.doc = "5ab04251235c4cd5c13e213f66e75fd7176bd3b393d4f7b74d7b5cf96620154f76f50dbef02b2ba65ae8ea47557be57baccec5e92a60a2b68e8c9b9e2c44ea8e";
 };
 "ptex2pdf" = {
+  revision = 53457;
   sha512.run = "674d782ae7ae239971244cc5079a1575c416be8ac436c3d458719526fd5432faac2c42993418e4d76aea41a59c98d5ca9d8f2330ff08aa1707c505aaea94716a";
   sha512.doc = "de114f20e22caeb6d03e1dcc2b59ec180c311f410e24b421a4e27e1988d19e024919f5c5d0fd33451516ffc256d02222b64bd54f1e644f2d5df79255530d461f";
   hasRunfiles = true;
   version = "20200119.0";
 };
 "ptext" = {
+  revision = 30171;
   stripPrefix = 0;
   sha512.run = "ceb8844ff23034bf730823349e6251ef0c7f208ef74c3ed61fa212af89a3208e8f9f1b74b7877698d4459047b64376faea647a919b340d306d54de43ee9617a2";
   sha512.doc = "31ec6dea18c99aac831f4f180ccce47781ce98b2a8859bb62019cdffd690a8b803cba66728d1a9805a8a39de9ef43e357be8fb6a16e0602cf67f7f9dc6cb317e";
@@ -24064,6 +26887,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "ptolemaicastronomy" = {
+  revision = 50810;
   stripPrefix = 0;
   sha512.run = "58202171aa08b297e2999554d8b6ee43d4c5772e2f28fcf73c11a00ff8476dcdebfaa5352c7d248720feab2ba642947f07362cd9124dbed27e22086123da3de6";
   sha512.doc = "04997eb4bfd5c5e7789b5db02e9c27a9eb4d65e685be1428c5b81199957dff5aca626a76c719d871217ccaa2a6e6eef6c17ed94f4ea161f581b77a22306d61f3";
@@ -24072,6 +26896,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "ptptex" = {
+  revision = 19440;
   stripPrefix = 0;
   sha512.run = "a2c31b2e039c198d3c3c84cb58cc0b9326bcf11b4c361c1d5c9b8f5aa4943f14b30e722bc2425a38b69935f4c88c67439747ffd65e0a194f2e5dd54a6448bbde";
   sha512.doc = "0e754625fb8507591f21b860901de1b06bcb31f5c0b2fd7df1fa5257c7c611bae4f575f7387362bdd21d826a329a8af3ba00fd30c3bc9d91be7dea5d66e2fdae";
@@ -24079,12 +26904,14 @@ tl: { # no indentation
   version = "0.91";
 };
 "punk" = {
+  revision = 27388;
   stripPrefix = 0;
   sha512.run = "a442a536dbdaff9dfa9d1cdfe1a084d0f4e4e28174a424cf59a1da94013e115b9fc6294ea3362c85cb770028c62b21f7f7fa9817dbd68787498199ce585589dc";
   sha512.doc = "33842d1fb46a78654d7351ccf88b40b87e6e03d83598f661ac21ee99d45156dd8b37a652c5c8e55506f95fc57b83e7f62f6c90c3fea5443dc5bb6590302b3e7d";
   hasRunfiles = true;
 };
 "punk-latex" = {
+  revision = 27389;
   stripPrefix = 0;
   sha512.run = "e44098c082465aa620d436a41306c9a1f36075c2612aa045e7c958151fc62e9a740584d9a9dd94b0c5631c00d406762a8e35f672931cccd3c09fe95850f3a2ba";
   sha512.doc = "36a3341d2dca08941a923a1f407b422e96438e79ba5e3911a89f13d48317ec5aa0f5afccc7539b0882996fb872b38bc3653f1e5b088805e5ef7c9d96a4546d01";
@@ -24092,6 +26919,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "punknova" = {
+  revision = 24649;
   stripPrefix = 0;
   sha512.run = "bcb37b02258ba406e8ef3965619c99193c08a4e1d11f771b3c6b06716eac16134be81585220a581176d9e8b4d7f488730ada3b5963238ff982be400cbb41d888";
   sha512.doc = "64df58c8996563a447ed7a012c6dd8f5248c8a7db06089d776e8ce64d516b4a0c4bf9042f587c996c7ab61582bba919551d352c9ca75f8696bcac5ad0e34866c";
@@ -24099,12 +26927,14 @@ tl: { # no indentation
   version = "1.003";
 };
 "purifyeps" = {
+  revision = 29725;
   sha512.run = "79d99ef7ebc462c7c65d03f23cc85b9f136df2b0c9d647fc0672584fa57bfb7447f6db0e6d6b11bfc738cfe8c8658f45fe0b4059ff00f355e4b21d44f0d4102a";
   sha512.doc = "3f9fadfb35596835b250cab98b0d1e3c6d537cfac5878e0b9788aeb5cc7ef455ce3d44f7d0f03e9002796a162d374f6aa8f9bce5bd4c3f0e8937040de0b82a8d";
   hasRunfiles = true;
   version = "1.1";
 };
 "pxbase" = {
+  revision = 44756;
   stripPrefix = 0;
   sha512.run = "e567378515039b55eab0a12ca645ba5ff17c2dbaf56309c3273beb0d05c7e6e2dcf3d7d22091907df5636451df8e91d09673607918dd9ac091908cb6ef1e4de1";
   sha512.doc = "d6d87123dce0a2afe3380cf32fffc8954e30d22e9822d0ff89500bea6a455c70a6699576265cebad29ba33c0fa5e7b63a40f26f7579d1fe9dc0cbcb528c45d00";
@@ -24112,6 +26942,7 @@ tl: { # no indentation
   version = "1.1b";
 };
 "pxchfon" = {
+  revision = 53629;
   stripPrefix = 0;
   sha512.run = "2c81f0ce0c4f5762805cb86e6bf9a3965887e9beb5bdf7292d1a5a274d7728becc580afe0893621bba8e5c477da32936607e0b3fb5d3563f9c6f9ce640ab8859";
   sha512.doc = "3284966056d60f10b9f6636714fd64c580ffc53c03aaaf225e59df2574642a7c8d28f8ce44eb46ba0a5c809476a2bac4891ec0589c87c37f9a2fed9f412a20cd";
@@ -24119,6 +26950,7 @@ tl: { # no indentation
   version = "1.7b";
 };
 "pxcjkcat" = {
+  revision = 47266;
   stripPrefix = 0;
   sha512.run = "59923115da33e18e2b29a10f664063755b42937ce601ed46103ec8edf16944056180a1aacdb296aceb5206d3dd453c0eec6f84f5b689ad68736c88479f928214";
   sha512.doc = "3c822359a68800a29fbc7ceda3293b6be902d9bc61f277003e6e20404c32e9bb6b34638a4bc11aeb943c4bdf6e361386972251b9b015fbe68ead824e5fdc67d6";
@@ -24126,12 +26958,14 @@ tl: { # no indentation
   version = "1.1";
 };
 "pxfonts" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "3b50d3f04c00cd080495c71d9387fe9c810ade7d83ead1178d661a618374a3a67c0fc70ae2a809d2b91db4afaf352b1596a588f6998a4eda220a6f181390b6d1";
   sha512.doc = "71898d307cabff64078bbb98bee9417c79504fd56f1cfc1427b9e4ccc9448b5e2e8436fa085a63d6fa6601e591673ef52eb2225ddfad5e34943456a2239206a5";
   hasRunfiles = true;
 };
 "pxgreeks" = {
+  revision = 21838;
   stripPrefix = 0;
   sha512.run = "d3f8ff3c975643d74dd92e749397d01f8d3fd0087a838271a491791fa4bb2d65c852ff5989f79952d40547a601c97fe0274ab4407a8e73aa047221934b9b2e9d";
   sha512.doc = "22239223646ea121422016119b6d0edce32d002bf361d096c173857b36ce324ebe2e4107bc0eae650b50d0e94775c84f480768246ee65f975ad5a24af0335158";
@@ -24140,6 +26974,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "pxjahyper" = {
+  revision = 52899;
   stripPrefix = 0;
   sha512.run = "ba1a25007905af5d61b2ff3805e09853de8a6c6463d1efa8c1a9a4de5266ec4db23b24b26c3511c72860264d8032059ded26f7e57f4d4da207fc032c1d79c07f";
   sha512.doc = "f2b6a6fd0164321a1878af5daabd23ed7f82abdeb1a7666095779c9ff5cc39f6584282a0fe7f65c59080bb8f25b803e713832a1ecfb50654acbf2a3d6fba1269";
@@ -24147,6 +26982,7 @@ tl: { # no indentation
   version = "0.4a";
 };
 "pxjodel" = {
+  revision = 51379;
   stripPrefix = 0;
   sha512.run = "a8b4cab3c5951fa07659f323804e7037919d4a8b46f73fe14d3ff920c54a17dd41fe813a7991102cda4743b51152226e60974da1619cf4108f5dc77d63349d20";
   sha512.doc = "424713f3f6cfd46f75b05ae6f8f0ef59e4435f970a1bc40333e80a5ab1ba94a79a333314f683e377232f929bfbe8c99d5c2c59393d1c9db6990e2343778f2c09";
@@ -24154,6 +26990,7 @@ tl: { # no indentation
   version = "0.2a";
 };
 "pxpgfmark" = {
+  revision = 30212;
   stripPrefix = 0;
   sha512.run = "eb341eaebbe2fca860c2592c0d24f6b5c4ef0f1e6b2bd731d48c1994ded7afa01bd5cb365d3f30147f68855777defc3384038aa652240178fc948b5225cb4c08";
   sha512.doc = "8a80eade76fa7b5e5b919136e499eddb5ff534042fc56eb8223e80124bde97a39a65d31370037cf425042a1ae516e5888c8751388899ae65a8b561f091693c97";
@@ -24161,6 +26998,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "pxrubrica" = {
+  revision = 48421;
   stripPrefix = 0;
   sha512.run = "42de048a96a4d552726de6abea4e8903f7c952c02259001d66655f449bc4edc7bb25b351be594bca205177f31f09525c9b986629c6a964e8a2b50c66aa01e1e5";
   sha512.doc = "92c0b794ea85b1b685bd94fde0c7b7b009ec4069f99705e9fb3dd93ad67564952925bcb4d6442a669f965700e658eb0c15194ffa55da86bfb1867b0d8b7bf5c4";
@@ -24169,6 +27007,7 @@ tl: { # no indentation
   version = "1.3c";
 };
 "pxtatescale" = {
+  revision = 43009;
   stripPrefix = 0;
   sha512.run = "922aabc7fdd35d1b1a6199be0986ad6d42ffc0db138066a7b1607ec521cf22571abc752ce225c9d99e2e9f8685149a5b91c35d6914fbccdb293a2476797dbdc9";
   sha512.doc = "be6998e53e5d8d92138e440de1c75e83671ea88316fb9b4dde0188dab198dc65301b4cd4f53368c277b782edf82f17ef89903eddfa6656669a5329a029907249";
@@ -24176,6 +27015,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "pxtxalfa" = {
+  revision = 23682;
   stripPrefix = 0;
   sha512.run = "ac1972a7dd5445bafca244e04663e09c4e939eedf31e8038e2ea41d255bdf6a4721bc53a443f6663f989b21494c61b3dae9ddc9940e283cdb49723e6fabbea69";
   sha512.doc = "55d06ddcb52e79ea590b24e8aa53a41dc18162ef9a8871ea69eafe53c6d0f5ecd5b548f97864c0253f543ca9f4eda17c665f1a6de1115cd8052670c934fbe52d";
@@ -24183,6 +27023,7 @@ tl: { # no indentation
   version = "1";
 };
 "pxufont" = {
+  revision = 53733;
   stripPrefix = 0;
   sha512.run = "bbbd7c0724e4b9a77ef731a4be2d014086aca61c78a439912ea20a630785fd8695ab9f287e07d0899ead8fe90614a806b0928a8cccfbd1cfb71c94b9b3c1266b";
   sha512.doc = "850e3e336e1bc3f60a89325c66de38ea1171a2ba2f4444382dae12373c509579a5c686887cbab42b147b69a206b4ceb43af83f8d47446c4bca47cade5f9bfaf2";
@@ -24190,12 +27031,14 @@ tl: { # no indentation
   version = "0.6";
 };
 "pygmentex" = {
+  revision = 34996;
   sha512.run = "d6e6327d0bce32aafb4be5a30eae63ab0418506367a4a18305f2fa45156b27911bf2cb945289323839c82bfacd6d8d3a588a302bff1cfc29911cf7d761d83cc9";
   sha512.doc = "effc3db243edd25d4aecf7c2de6eeeaa18ff085f6304bc390ee0276c07d7672d17202d8832a012e9fedcf3bbd16771aaf78a4262366744f5a27266693fb0e87d";
   hasRunfiles = true;
   version = "0.8";
 };
 "python" = {
+  revision = 27064;
   stripPrefix = 0;
   sha512.run = "85c300c969fccdff036e2da59ada1040bee6f25c6a8ec3c173ce44084fb9fd812aab79b8fdc0b9fbe2ffbf9485abca57fc5d82caf4ac5a3ff922501b46dec164";
   sha512.doc = "8f88b9bc84a71c430486e2e3d2b33a4436cb1ac1257b9ea5629708438b8ac7488839d52fc138e4959575fe13388aa475770a62ca070b4746de8b78c53d5119a1";
@@ -24203,12 +27046,14 @@ tl: { # no indentation
   version = "0.21";
 };
 "pythonhighlight" = {
+  revision = 43191;
   stripPrefix = 0;
   sha512.run = "1018d4383ba04f92d383d2c4f51d30f091528f7a89ff23614e0ebc9e488ef3cc8167de12a42e6a6465c2b3937d849bd5eecc94cab0a9b8003569b06ae2c91632";
   sha512.doc = "31297eb541060d760fd61ebe169b840cf182f8f857986aba5a2a578373037d3c99ee12ec9c707ab1f9d29564925821665997ea45f728273007f61a5f0bea5180";
   hasRunfiles = true;
 };
 "pythontex" = {
+  revision = 52174;
   sha512.run = "27a3196f89ae04eb992817800f30dd26b275b65a2f9272907a2cc6a66708ee00290c3e0083bb537f0ee0152c93aee50728ea1ddab672aa08dfcef5f089bcf2b9";
   sha512.doc = "cdc5046cef480514417874ef5343a39f9e1c377d0e1f00e9df4ca8746670f2b222636afd58a06ef63086c3479b4d516f9d14074aabc1fa7876b2fb4f6599bef4";
   sha512.source = "9acadbf5a18d56d24bd1300ff4b713325c43f163d2ac27e190461fbb74bbe023e31b2a3cb0bf3c6ead42c1275bfcbcbc8cc87914f623537e05773e9e641b7b03";
@@ -24216,6 +27061,7 @@ tl: { # no indentation
   version = "0.17";
 };
 "qcircuit" = {
+  revision = 48400;
   stripPrefix = 0;
   sha512.run = "72dc726d377bfa13b30d5440f65e3f451a717c32785c9338bc95107a3fd29326d5011ea31a6805fd751e276279b8bb577f2b4a488ad0f380ffad84fbe46e272e";
   sha512.doc = "cb4d00d575ed8f859722b97af7f15323af85e69b7276947c05770a6c745dbf0e4b3aa1546b3cc82d9555a5ce839b142ea8edd3da166d2c109bf6b829b2ebb74f";
@@ -24223,6 +27069,7 @@ tl: { # no indentation
   version = "2.6.0";
 };
 "qcm" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "9fc1ac5b0b6fb819022f9e2ef625a73ed884ecd2c45b7c58283388ea0263d9f9c9045e14d9ee37e8a3c0036171284f30f7db5f99bacd01d4c65e1819bec6ab95";
   sha512.doc = "d7935c763e9e5245eb68d915b39a2f91d785a1590a7cd807e0923d7d5763ef8216069bf1119f15f91521fd83786c86de7b227e90b6407d6799a6104fe466fd4a";
@@ -24231,18 +27078,21 @@ tl: { # no indentation
   version = "2.1";
 };
 "qobitree" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "cd229c1611f269f904d73d276b8b36fb60a373130a3b5bf78508daf85d5ce50cdc4841a25e30c5a0925344eefd93f638e635be2878478f575f32fc458fa9a0dd";
   sha512.doc = "b3b587bbe835456cb6298804cac2a8d61c85d4bad6550cd355e6a9ba155e7b691c5b2f5f919ded355b21dde9c4009ee30466bcfc5cb6d81e0af0fdeb97aa3b64";
   hasRunfiles = true;
 };
 "qpxqtx" = {
+  revision = 45797;
   stripPrefix = 0;
   sha512.run = "7387592a338e7ba10942e4ed96364e36ca325040bff02cd69bf0f98d471775d38bd63e54bad494f64874e2fd0462762595c5796d7453aa6909fccc2d9d6bd27c";
   sha512.doc = "6b6fc20f5ec1269d318813b1ad34020e2b5341ed8891c11d2eda6b84884b3782e992dd9dde16d14b2030f2b57e1146fb6da6e761a35b12a3d88e8d865285668d";
   hasRunfiles = true;
 };
 "qrcode" = {
+  revision = 36065;
   stripPrefix = 0;
   sha512.run = "65ecc00d46d06f8a36cb1f170c12692cf7ef8c0cf9e68bbdc6a7da6b0a7f5fcda6a2e065b8a474609556518ab07c2d12f19a9fdaa0b6339aba94cf35184e26f9";
   sha512.doc = "406d1cf238b397412a57ed695a39af0ef32de007b94e8650cf591c63882d05d7df18061fbd2b350347c052091202a38de1ceef19f61fa58de38c2e73de6b01b2";
@@ -24251,6 +27101,7 @@ tl: { # no indentation
   version = "1.51";
 };
 "qsharp" = {
+  revision = 49722;
   stripPrefix = 0;
   sha512.run = "29aa0808112111d088f8795ec87ca3df6f2e10f0a8e91347ddc7101733aadc72ba90356f7e4b39fce6484e04975d3e151205a5d5272789ecd414cd0a6afc243b";
   sha512.doc = "69d74a3ed755d16957a2a844ae624a15e18813fdf02595c2e4ae2dc0cf13b20a1db1c4f49c20db3e4d3343c586411a88c7ecfe6367c4c1efea1a8cb2730cf8f3";
@@ -24259,6 +27110,7 @@ tl: { # no indentation
   version = "0.3.1901.1401";
 };
 "qstest" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "1461a7e5a88a75d1976b8bf0b6b9a685c7e68bd5983ea1549b277627e20b8e7d0b890536c8e8357e168914220c168cc2be2e9a688b512e16d613107c50622f79";
   sha512.doc = "a2e138b5de9012b637cc98b18e5aa64b2c9384f03beceda724c86f1e81e03b6da6b19de27fe15724463edc61520d035495f2f039a2d541b4761c44c55473d1c9";
@@ -24266,6 +27118,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "qsymbols" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b910db8e0e33bbc111a95db914958a3261fa89061677d999876b026d25609326b83444a7c6b77ee4a39d60eaedff448ec662dddf9511e99c826a3bddbf0b2861";
   sha512.doc = "c633094c09c291666f1953d8d8d8570d71b773e70f90c805cb01981117ea4212ce8cbd4ffabd9ca5aaee07637d19c6e627856115b3943f9d5c414034eee500ea";
@@ -24273,6 +27126,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "qtree" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "9f381007c2526f51483d7c190cd7cf86cb399e95475841900ffa8f522d3da71f4f451b42562783d756e252e513ca1f9e9e8586517057a8f6b881cbbecb5c3987";
   sha512.doc = "c16142acf0c3f9e4f347c9ceff7a6c29557c0c2c4d2232ce9df146279b3cd4e1019e703479f426709a3feeb6ac46fb91f7dcee8cad35b19c83c9893661322f96";
@@ -24280,12 +27134,14 @@ tl: { # no indentation
   version = "3.1b";
 };
 "qualitype" = {
+  revision = 53247;
   stripPrefix = 0;
   sha512.run = "612570ea01cf7631d277a8a152540784f24a0c33c059e35357f5b753a213a0993ccb297dbd11fc831a7db3ef14c648bb1e39399187b42bf74b93c8b1c586b0b1";
   sha512.doc = "7fd5285546fc3092165dee74c32c4622c3ef49dad0760b14ee0d1bfd3289ee837ad79cbb47c70c5ce1aeb665692faa660f9e6ae42011085ea0fb8a42eb25d337";
   hasRunfiles = true;
 };
 "quantikz" = {
+  revision = 50934;
   stripPrefix = 0;
   sha512.run = "0d6946eeee69573a3c014a16c985da8ed193be32511723dd6302978851d9ac729aa7248be6cb152bb519b36e1b04bdc741b440d9746fc8106d326af67d8d10e2";
   sha512.doc = "8dad4e65191d092b497216ed8d57249cb6edfcd54481bac8b1ca8af9734608b9f4f54e260be6ffc3df93353f81eb839db6c68e874a24f62acbb4613370578efa";
@@ -24293,6 +27149,7 @@ tl: { # no indentation
   version = "0.9.5";
 };
 "quantumarticle" = {
+  revision = 51925;
   stripPrefix = 0;
   sha512.run = "71568c84798b4ca114ccaa98475d84efb0e0332c12617bfdc72694aadbb3f6e30b9ff5a762baec0781420b02069a0a5874367e5d52089d6bfcda5d2af789cd69";
   sha512.doc = "99930e86922c19d13f534f5d04a0f29cb4ffaea04e8062bb018c6a848dd7674becf8a515f43413f3edf48c5c485d4d680b371c857b24dcae6307ddb329307dfe";
@@ -24300,12 +27157,14 @@ tl: { # no indentation
   version = "5.0";
 };
 "quattrocento" = {
+  revision = 52381;
   stripPrefix = 0;
   sha512.run = "04184f6e4eeb1dedfc165778d2886e5194e48adb5a17bdbd91c1cd408f42287b501a35047c761dfe6114eac1cd9cc68ec204f73e7c7946c7cb44b9b915bf1347";
   sha512.doc = "ec4fe49f7b5bee5ac61d39568a900783a21e67d36e77e0af6e974f7dad27821a01cda8ea244f40b02de7cf4d427bb8e7d5fd3db6bcb163f84310083dfef68278";
   hasRunfiles = true;
 };
 "quicktype" = {
+  revision = 42183;
   stripPrefix = 0;
   sha512.run = "4950c1c7a4536cb64d70fe8c08a69fd9336825973a7c8a669ba48bd66476888775d1ad288d34d4b83a9d674624960e3d17de1c972f52bd7f329eff971ec0f185";
   sha512.doc = "6e43ad0d932eb2237106fd991dcd25e5bd536cb64db5988c958b138af294fbc777dc6ce2c2b791e3875a2bdeaf5a10be7d15585b44e7487017925e0068e898f6";
@@ -24313,6 +27172,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "quiz2socrative" = {
+  revision = 52276;
   stripPrefix = 0;
   sha512.run = "f4fba8eb850a90288a9b3e7f4571f5df560e09e7cba608f7bf2bb3090db5a2c6bc7fc7240ef2e3cef9d37fe1a0105e74c4c63c39a7c1793a1fedc6f86772eac5";
   sha512.doc = "a51cc19b7d13c0bd4f1ed07c6292940176104b5fb381dece7709a5bc1332edb4606cdd4a66ee5a4e4886754c4d274aeab40666eb45328dcc6c465a29a1c4ae29";
@@ -24320,6 +27180,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "quotchap" = {
+  revision = 51591;
   stripPrefix = 0;
   sha512.run = "df77f5d148beb1b70d0d2683c1be2a1b556ff1fdd90e109a29fb222b5eadb5008dcd1bee4e36cbeabf484fe90cfbc7bd07f87d40a70cc0675fe18b9019ed712c";
   sha512.doc = "b705fe959bdc23b5633f850831fe7b8a5261e55cc7cf71e75f4b626cd6a35201f0dbcbcdefe1994c5b4eeeb6d914cb07a5f335a165835b26a45d256772613403";
@@ -24328,6 +27189,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "quoting" = {
+  revision = 32818;
   stripPrefix = 0;
   sha512.run = "44a9c726a5a9158fcd13fd93785101d2a9a940f34da3d52efd5be1a0467cd76aeaf4706b945a8de0b4e0b4a90740567cfad87f08aaa92e7d4eeae8eb9f7bbc73";
   sha512.doc = "b3990965effff7529a7c18cdd3a08af337be3766ffe535feaf54db504a47b0f054af41511a635c3e70c34d3025df419af702d319240ee673f7462d2cf4ccbbc2";
@@ -24336,6 +27198,7 @@ tl: { # no indentation
   version = "0.1c";
 };
 "quotmark" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "9f21ef20aa9354b1347f00a52df65ea691fe4a00b05b794815279c070d05544611ccd8773cb7c9f8146a3a135f3100a06aaec48acacba255bae9a0654a2a9b53";
   sha512.doc = "6507fcf8639e780ab844700f6356abd8eb69df6158ee638d8471a112159f95a3df8f358fa40479eefad0cf09c34fc37d9292904ae159f2a79fea5acb93f6e542";
@@ -24344,6 +27207,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "quran" = {
+  revision = 50980;
   stripPrefix = 0;
   sha512.run = "0b6488c5791f3afe774d0cec602e0da69fc9d5c5a83ee0f660d87e7f58e43f78c5e25cc7c7da446c0bff1e69a1857e9bfb920d03efc8492f5a2e226a2caa6dad";
   sha512.doc = "15d704615b7b08a570ede940ecd5dd73a75fa1ee07631b7b9354fada53ca42c87129b63a3c7825a17f37579b099131666cf2d20e81b9c09030eb7bdd8b069ec7";
@@ -24351,6 +27215,7 @@ tl: { # no indentation
   version = "1.51";
 };
 "quran-de" = {
+  revision = 50979;
   stripPrefix = 0;
   sha512.run = "bcd27ad64c01fae92d91155c918e4880837f657cfe5dd849a8bc137830a8b2bd6eb9942c1764e60f65bde41ce2e4397d755ce621ab83c5c56d181b60042a503d";
   sha512.doc = "baf460bbda2bc6890585dd21d0f86208501ddfa4443ba0d4552e1748ad44ba578fe78e79928a0c2556eca543089c2802616b9a4f9637c64ace7d01ef30168e39";
@@ -24358,12 +27223,14 @@ tl: { # no indentation
   version = "0.141";
 };
 "quran-ur" = {
+  revision = 51013;
   stripPrefix = 0;
   sha512.run = "0a6f214eac72a453050de2e2bac8574bbf746c3abeb528ed08c816633f2ea216a9e08f9be517c4bfa2a43924f5ac1921291c7f598297ac23848568f6ce85ad47";
   sha512.doc = "9bfbc6ee1896e1586150fd67443626b6808e9d15efa5552e5ad238c3d704868121ab93355a0b170f7bd958992b42b1553006bc2e28ad01bb555735da70ed1fe9";
   version = "0.1";
 };
 "r_und_s" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "86b219305e4e085af2a22d34bc586253b5674abb18e257fa96bab1d45695f841020c0004f1da51fcfca0fd0b325e4043f2e368740841a5a2e8db774711ac6348";
   sha512.doc = "26e227f106bb9303c4823f0230b689d6ed883580051e1bd5ec2e16ad796a3e33df2caa389c309b21b010bb43b07e5ec1027d6c046af55193deb0e4d975288846";
@@ -24371,6 +27238,7 @@ tl: { # no indentation
   version = "1.3i";
 };
 "ragged2e" = {
+  revision = 51780;
   stripPrefix = 0;
   sha512.run = "fb74ab5a4aef68ead15246701eb7ddaa07cb0efa66f309fe1dae067cb7e8fe38df9ab9d47338342895fccdea30fdb189e1868e3338cf84f61cc787a704697b22";
   sha512.doc = "f15fac0d6949fdac80ea27077720d72ffd7ff2ae695d4716875280d045b25c485016d8e72528957c10f93588d5942f440e67d79f1544d91c3eaa912c2f0e8067";
@@ -24379,6 +27247,7 @@ tl: { # no indentation
   version = "2.2";
 };
 "raleway" = {
+  revision = 42629;
   stripPrefix = 0;
   sha512.run = "8ce708ec993b1405dc04ddd96b6d39da324799f404e2798448c12cd03749f11685f840ba4f986b1b0f7696f9141923f3b91f5318de634979720af5af5b07781c";
   sha512.doc = "eae288de26c57ac27172e83bc6985b0edf80ac88538561468924c34656f31507e008097a1e8452ce47729ab501493733a1c022440c31c34cd99f8211383e889c";
@@ -24386,6 +27255,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "ran_toks" = {
+  revision = 53271;
   stripPrefix = 0;
   sha512.run = "44c32e48f06a6c6f71a1a205ed4e4a818b100698e04828a2e5cdd305f1309f736a77945b79939258edb9606f8542a1327766e120075476168115d35a2a298fb6";
   sha512.doc = "35b639dcdb54196bd73489e1e7c243d28c5cd24e957c06184c2e2d419f73433a140856313dcb67e2ae7b42d3e0833a283199fb2d251b16710c1ef50827c1bbb3";
@@ -24394,6 +27264,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "randbild" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b4fac4fe105366ae1047a1d4225bfbe8ecfe6e05c29e955bc91d591f25ad6a8ba0e2b81848f27af96a1509a278864393c8874b14f30e64c8d5b69b9db811ec41";
   sha512.doc = "fd8f83db389fa62ae8dd63a2c3bc8e4feb9beb6c56d7579fbd9e9065c399a73ad19563f22cdbe1dec78bd1c33056ed1cd4d9a534105b34a2ceae0cd8592326df";
@@ -24402,6 +27273,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "randomlist" = {
+  revision = 45281;
   stripPrefix = 0;
   sha512.run = "895eb116868ced533e23d398d0f17bda2f55a2cea52ec46bcfca4004b9411fade8817af4fc9d3d91b2ab2959ea24027266d8fcac0c77a64d2a4b88fbed5d56a4";
   sha512.doc = "4c0ebff9275bbd1c8550902735b4ef0d04dbd688bb1abdf124560defd2e5d0cc23171e8034fc67b5379d0ec30395b4433ababf3c3a244cbb5ca5f15005057f58";
@@ -24410,6 +27282,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "randomwalk" = {
+  revision = 49513;
   stripPrefix = 0;
   sha512.run = "3a1f08f41864cc3b855fc4a9f8aba298d92505231c728381f5c5aa29f21c73d6e10834ad589c114ae26ba97d092b33e9c83a30518a7f289aa0ec96c933471afd";
   sha512.doc = "00c23d42132d4a47973871bb9a2054385681898d6cd7e0a7a47337808187855812d98535428f6e37a3eb2da13680ac4128fce38db670a87a66483f6ece044c8a";
@@ -24418,12 +27291,14 @@ tl: { # no indentation
   version = "0.6";
 };
 "randtext" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "6cd20551f4b48d30d4c830da395873bd20e11b930336f4fac0f0ccf09c9a956d18107c45aa2b1ecea51d1fc4b0c0fabf06d436e247aac6ff58548cbfd31d35b2";
   sha512.doc = "3bec31ca40816e7e86642e080021ab5faabb19656a15463f712e111485f1de00d698816e84b1ed7b63ea9380970d4e80b04aa0cf79442c7d1d77d5fa3f4d072a";
   hasRunfiles = true;
 };
 "rank-2-roots" = {
+  revision = 48515;
   stripPrefix = 0;
   sha512.run = "43d76c8461a724c48e5e510701032c01a5bfa645734402b0fa0d0766f2d0cb7520f2e3d29d6c3abfe44ec369988445aab9216135f70c43a18fdec152cb4ae92b";
   sha512.doc = "f9e58f16b30b075b19929a9ad1ac0c47e53b2aea038e34db69dde6d64e1cf3281fda597499dd07aea03b3bb325c06a1c7abbfdca42a80f03fa2a3d272bf52e5b";
@@ -24431,6 +27306,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "rccol" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "0a712f0918b4c0e4cf8cc2a0d442a681c6cd4d00b50478751512ed4588f070566f005717196f694c8d07e79f8ab6a49be6ddbda8db71af65e30cfbbceeab6d2e";
   sha512.doc = "56c43ee9f49764ce50da6b1b4fd736cfff16a1cf3907fc7189807e5c946f1c25c593ddc1aa22c2ce2e0799f7057efe2df35bfb9aef0fa1c31724110a352fe4cd";
@@ -24439,6 +27315,7 @@ tl: { # no indentation
   version = "1.2c";
 };
 "rcs" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "4a9d7cbc5c16163a5866bcc3c9fae95d8fc42b27d0d8dd8ceaf32e2b568bf9ac6b710a4124cbd255f1f2d18fbcf66ae020cca58ce6d16c6c5eb6e0a85e288419";
   sha512.doc = "71430d5e481dac53c3b1d5f86ec589fd855c244c6717f31c16e2fe00507850779fed3ef43db2deb546ec5b99ffe775a10711f1fd59c022f4223a8d3327424cdf";
@@ -24446,6 +27323,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "rcs-multi" = {
+  revision = 21939;
   stripPrefix = 0;
   sha512.run = "156e3f47b8f4eae8cb959bd561cca2c592a43483cdb99fd04a88593ab5fd585a814b0e3416a835ce8d249969eafe119cd80c9c5364f40a9e595aff2c5f2e6f65";
   sha512.doc = "2eafcfc5c0297c021ea7f35abfac9526c4a40cd46efb88ee6f41a5c0f5d68586263d3140db73c1f9026cc0fc856a888369b21f5d85679f5eb60dccbe111938d3";
@@ -24454,6 +27332,7 @@ tl: { # no indentation
   version = "0.1a";
 };
 "rcsinfo" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "6070a3f0b434b5339e527161b7c1e18dd21b23a9b57817a2699bc13369bf35110868e38d3e487b7b0b58ddb12699599a6e8ac4314b150ff2c8049ade5124f786";
   sha512.doc = "c7d149405b9824f7fb9a453386477ee3ebb7e265b29a004eeab687695667a9e8ddd7ca91ffdb4fe7f60716e6c1f2b39004aae82777c58cb60532bb2ace2bc846";
@@ -24462,6 +27341,7 @@ tl: { # no indentation
   version = "1.11";
 };
 "readarray" = {
+  revision = 42467;
   stripPrefix = 0;
   sha512.run = "34a1a576a560ec5a66fd8b358e9f594e1971124023e9f88e67e5dbf7ff775e3950071c5f4daa004f8e59549f245934e4dd8a82e4a2928bcb1e9fff99f2b3bdd9";
   sha512.doc = "61bf2960c1a0058a5a64a679b4c17ac0e754f09f2ca1847fcee4cb0b0b9a0dd07e252a534768fcf3b098217afc4c52a8f65120dcf43e69f0907fff9b8638af99";
@@ -24469,6 +27349,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "realboxes" = {
+  revision = 23581;
   stripPrefix = 0;
   sha512.run = "944de8b761acc0949ba14c0d506287b64a1cf8efe20fd26dc74930e589f4d0651ffc3f1c4959111091f90d0f869ba18cc9456a5c58dee0a1b4b8ae7c1c6c02a9";
   sha512.doc = "cd194a9fd0836c8cefc57c26394f7e7f684974c374f787f3ac6d82daba3ac1e9f17aaeae06f26fb9851255bf53bab6290124a1878289651dedec824238e8193e";
@@ -24477,6 +27358,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "realhats" = {
+  revision = 52865;
   stripPrefix = 0;
   sha512.run = "9f5c32cf6efc957f8cf7b577c77d953f7969589fd487032807bb2fd2e6dbc0f5c14ff24bd5ce14dfc14b69bfcfe39519a0ca6cdb73351bcbae561a9a01c93180";
   sha512.doc = "681b327aa1c563436821fd7c2e736d2f45c419b0dda38abe86e146ccd9af80d3b1b57302608a42f4e0c1c744b00ba4aa6cb319c32fef5d6fb43e8fd4ba10f409";
@@ -24485,6 +27367,7 @@ tl: { # no indentation
   version = "5.0";
 };
 "realscripts" = {
+  revision = 39706;
   stripPrefix = 0;
   sha512.run = "20301b045034aee5650a976de1341cb0d1629d6d622e75fd3c52aad8f1cd6377d3e1095e75ff0552b9cba887f332205f861c24c4fa453bb9f957f1dfb2aa2968";
   sha512.doc = "5bfa7a13e824a6d7ade0f81fec6f0c9164035c8a5b512d5a49eb4b47b0b47ec514aa430a34e6cbad463674a180a3119305b5a6525cad824b8f21d4b15b03350d";
@@ -24493,6 +27376,7 @@ tl: { # no indentation
   version = "0.3d";
 };
 "rec-thy" = {
+  revision = 50047;
   stripPrefix = 0;
   sha512.run = "cd3d8c9f6b08e4471fb377586ab928c7173e72162269eeb9856d4fd50a2c89a1e1509bd36356ed0d37d89eeecb22391ca17bc5a214813acd3496d4c669f261cc";
   sha512.doc = "257746313876d190f62d50dfea03a614c5b6732d79b7f43b7d6c41be54c8827f82c996570c50907641536e1e5ffe172d495e1f3db94d8d1e13fa5f630225337d";
@@ -24500,6 +27384,7 @@ tl: { # no indentation
   version = "3.01";
 };
 "recipe" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "bd6046896b15d362fbe91e92485cabb1100485b5c91d4ac0214aab12e0debdc900d8693e1ca345da0152cfcd400a2f4e7603fc3e8476681127e64313e2f9b954";
   sha512.doc = "b21b70e757a0d842adfd70f0bad21f46fe9b3242bacf4861de183b833edc950eb2cc06f0d3569a48c8e028283b1526741a309abd8fa9501f9541256bbb357ddb";
@@ -24507,12 +27392,14 @@ tl: { # no indentation
   version = "0.9";
 };
 "recipebook" = {
+  revision = 37026;
   stripPrefix = 0;
   sha512.run = "c030f81bac27221f24b275d689fc7cf80bd6d97ccfecb0c5d51876ae825871854d7729e123caef3735a7b2a5608f070ce170709c8a1723b5c740f05371c82154";
   sha512.doc = "0c9d803360e1ef65b38f5b66c6d3eba6e9c38c371a430e2cca371594935fda16a051d6d1ee33e787114747b9efc36475c6c92b2c8b199aa1a5b48e214f7a4643";
   hasRunfiles = true;
 };
 "recipecard" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "62778e7429aaa8e4bed6546c748a7e135c9edc4909508723e7931284c619d502e9efb0e6fa54c8c1d242858355c6d95bdc87959400c18a5648ef105035ace26f";
   sha512.doc = "0e62ac28631ee072c9b0b5dfe9995744c381f17b14da5e9c8f4159fb274cf2a7662f0eed8f728ec5990a6a957de051304601acde2d171e696e79284ab2faeff3";
@@ -24521,18 +27408,21 @@ tl: { # no indentation
   version = "2.0";
 };
 "rectopma" = {
+  revision = 19980;
   stripPrefix = 0;
   sha512.run = "17a297d7862eeb8c48788e40fd761fd42b37fa7b49b7447e00e828f1a7e0f2e411eee357507d79bfe0441c7feada9e06fb18ee5ce0af87e7aeec7ae618e22d83";
   sha512.doc = "27ae9a381a685373a980e13b9b5c3f6057f98224a7c9659edc0c056a6292e7289ed9772f3a503e8de3ea93b796f271dafeba57f6e240caaf738003e1ab848e46";
   hasRunfiles = true;
 };
 "recycle" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "3bc28ed41a8205534d34593429429768bdfa64e61cc212017ba4be32f7a985e8d65ab296137cffbb7ad5be4dec90bbfd30d675ab314bb79ec0ea10b277c33d66";
   sha512.doc = "3bbe68b48915c6fa662fb72072eb9e130613587e86d3d4172766c8fe690a995d23d252cbda9a226a7716c9da8741b3ed0e18eae1cab2f547d08265ee493a64dc";
   hasRunfiles = true;
 };
 "refcheck" = {
+  revision = 29128;
   stripPrefix = 0;
   sha512.run = "46dde83ed04d4586eb6a2af393ab925aa7238a30c23f49ea33f0da331e2a5071447c5df22b31c2cd9b10bd37458794fe15e53e0e79f002bbcf95b0471d6a7d02";
   sha512.doc = "a87b6ab25848571770bc8a7ac1f47e139c7a2abebf36b9c72b65bc66e02c14b23f7b0d2246c7160b7669460f52afd29063449c6659336f01f3e99df53cbb4428";
@@ -24540,6 +27430,7 @@ tl: { # no indentation
   version = "1.9.1";
 };
 "refcount" = {
+  revision = 53164;
   stripPrefix = 0;
   sha512.run = "da914e64de5b70e124d9eb62148f5650c9445d2fdb94272ce622478b9aa50a4c7625be9c2152fffe9ff9fd87ee19319a0bc31ec5fd82839a479faec687de4af4";
   sha512.doc = "5324828978e3c8c14e9a28b86cbf87de175b9908f460ce6090bf19944557cfe82b112c6543d2878b54f4a16b1a9f3f3ffc66eddf1234c04b8852dbfa3ebaf27e";
@@ -24548,6 +27439,7 @@ tl: { # no indentation
   version = "3.6";
 };
 "refenums" = {
+  revision = 44131;
   stripPrefix = 0;
   sha512.run = "7113ba67dcaf3ca2a070e42b4fa9660889bdf7803401cc0f8c3f9f62c59e467d9f637c526712bf9aa9fc7ac3df3c550a41f419de9cff375e24e68d102207e8af";
   sha512.doc = "3511419e6507d2c5a7b48679e9220e63643b38f803e8a5d7046a55ea6b6f4827fdfabb74336fe61ba35628868a7f042ad472567e73351d13ab9568c508468a97";
@@ -24555,6 +27447,7 @@ tl: { # no indentation
   version = "1.1.2";
 };
 "reflectgraphics" = {
+  revision = 40612;
   stripPrefix = 0;
   sha512.run = "ad670c699d958eaf103db1ae65d79bad78dbb0677c7464144739fd67b63dc5acd3c298f81c81f258de477fe9f2d4a4177de887ce1c031ac9c701662167c1a5d6";
   sha512.doc = "78717728d537cf0dacaee67151cd7f19fef6fa031a856ac49a58bb576337690df4323c80e1ff0f318a4eda3689fbdbc2aa5a3bbcef69b957fc4615ff825e1e0a";
@@ -24563,6 +27456,7 @@ tl: { # no indentation
   version = "0.2c";
 };
 "refman" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "45f51a654703a7e749e7dbb08fd0ccedc86b5f264ce08b504ed11827799202583f81a4f3fe32dae0794e20cefe2e6bbd0ff8563955c3a85eac2642c307aaf332";
   sha512.doc = "560d70322bcedfd0ca6a10c161d3930d389e77fef25ed568f5a68ec87eaa63efd4f7dd2363bab283af00a49719c3c8ba38e8a35ca011ea349dd854a0698ec79f";
@@ -24571,6 +27465,7 @@ tl: { # no indentation
   version = "2.0e";
 };
 "refstyle" = {
+  revision = 20318;
   stripPrefix = 0;
   sha512.run = "15ab0ac1b41608ed2453bf1de27515aaeabd0b06a3e44fa3ced6b67f5e79cf237e92112848622303df2e174ae1e60b77ff31583837f3b12a447f8c4509891cbc";
   sha512.doc = "9edca88347914ef7810c3b1639cb85f598963404620a99f81f5bd56d45b684e55bf179ba46a5a49953a88151251ec084fe6126fa3ce83d2635450bad25e07059";
@@ -24579,6 +27474,7 @@ tl: { # no indentation
   version = "0.5";
 };
 "regcount" = {
+  revision = 19979;
   stripPrefix = 0;
   sha512.run = "6481e37b45ec26aa270637b465d9fabef010c6717c0a402f0bc2afaf5dfcd877e46fd8699ff8fa39d80218e6f319e09acec1417a47fedefe6da5d90a81b2928d";
   sha512.doc = "19215d4d4e22777b236f4226d82cebb1d0f8ced841cb33a4b275f0cb558c3addd4a1fd76d3aae9cac5e275695e197574145649be5f767372bd1bff13ec76cbb7";
@@ -24587,6 +27483,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "regexpatch" = {
+  revision = 47601;
   stripPrefix = 0;
   sha512.run = "ef1f12a2480834e447110945e685cea36a5e72abb462106bdc42b086cbbf0d0f9857429d1c5ec243eaba74ee39ce8af29a758f8741a6a7dae05f376786971ea4";
   sha512.doc = "6c6ee8769f2a602c4afa9e043daeb5151db1d5aa92732201f0d3c36d07cc754a9dcc09a15fb2cfe69527aa80633b26cc522bff0b696d774db933b6dd0c916369";
@@ -24595,6 +27492,7 @@ tl: { # no indentation
   version = "0.2d";
 };
 "register" = {
+  revision = 49581;
   stripPrefix = 0;
   sha512.run = "049cdd2039a37857bde1ef3f7296da1b6e95a62f366e43b508db8ef70e6afca7a763632078a5379c620692febd49df3afe4049d8c97971fdddd37afd8e357515";
   sha512.doc = "fe09f70f908d9b96ad961bbb6c44731572eec871f3adde68dd5b0a094ce932ed15e8bca7982997f17e771d202d9bee6d397f1c4c6823022faf53baa47e40dcb0";
@@ -24603,6 +27501,7 @@ tl: { # no indentation
   version = "1.9";
 };
 "regstats" = {
+  revision = 25050;
   stripPrefix = 0;
   sha512.run = "95e68cf4ea4cbb34801a7412ef1ce87fd75d017681e43ccb86e56ff47494aaf95e3cdccb4f0c2ea6a276d99960df881857d9a138368fa6cd37d7f38554ad84dc";
   sha512.doc = "1883f17190f3b24414dc8ef7f874cb50d682b5dcdf45f8bf95fd15b3347996de37a7839b727da4cdc9e39869ee1def31ed1b2be02e48bc68a81c0d2f8aef8be2";
@@ -24611,6 +27510,7 @@ tl: { # no indentation
   version = "1.0h";
 };
 "reledmac" = {
+  revision = 53675;
   stripPrefix = 0;
   sha512.run = "fb2864ae9a8efbc466c7ac1d741fe4345e31fd59f8aee65f43a8ed3595cb13806030c71fe3678ae4e445b8a4d96e38028424dc1b28029a7dd099143151809558";
   sha512.doc = "4caba1ec60ce639eb856be255348dde680edc7bc60e276ae9fea638abe0762f2ba45f67ee1050f529005b7fe0ff265a4abb6f868b80b36bf54745bc1d428e264";
@@ -24619,6 +27519,7 @@ tl: { # no indentation
   version = "2.32.4";
 };
 "relenc" = {
+  revision = 22050;
   stripPrefix = 0;
   sha512.run = "d638db869698a6b564f1482c3ffbda561bac0da00e008b5b3ddcbe267587813042bd3d578ea871f5ef48a27309baf8e290413b65f99daa26ba7a8b2a1dc62050";
   sha512.doc = "b5e81a7edf8e7d0c3be9ea46ffb2a43af5d58153ee91d656faba600d4082a8982706744ba1991c82ce8c119fd12fcc0eaee30353135338154b0445e48f33472f";
@@ -24626,6 +27527,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "relsize" = {
+  revision = 30707;
   stripPrefix = 0;
   sha512.run = "90a4829b63d86214c44cadab6b9c9c114d6abfbd72dd4cd8bddb18add9b7fede2867f39d57b03ac9e7762950db71664767554b515b5409cc873d8b31aebb2c1c";
   sha512.doc = "45b6e38a14c31d7387a99d78c395fd0cdab5ee8bbbe72f840d511d14f6af73f749649b48977e8a995c2ee375358677b31a97646c8162c5fe2ee6c286a05a20b8";
@@ -24633,6 +27535,7 @@ tl: { # no indentation
   version = "4.1";
 };
 "reotex" = {
+  revision = 34924;
   stripPrefix = 0;
   sha512.run = "e97663d414291b3d0a009143ea370676bdc69b1897492ef86bd2092e47fcead566151f175676b4a19e196054ecd4a41706a74e9d4e6ba353d9e346786d04a2d9";
   sha512.doc = "fbdfd00526129921896db36234343d991bba29b68adfdd06d9fce262a58b2cc544dbe49d28cb9722eff1fd03ba3a765e38368baeddff18e36bde436c56ce538d";
@@ -24640,6 +27543,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "repeatindex" = {
+  revision = 24305;
   stripPrefix = 0;
   sha512.run = "f700f201ff05d25fafde3eafd63ddb5aeba81dfe8be0dc4522a08459f35b3ab78cd06d215477ef5bd59c1dd6d1a05361ddfdc21159f3b6347f5a8271c4193192";
   sha512.doc = "031a5113799f662b88b2275f2f82467e2fd84ae58d18f4cb69e090aad7f2c8cb44eefc4c43f3fcda9e92de0c0027fd4ecaf9f152d33b73ebb69f06e6b4c8c1ae";
@@ -24647,6 +27551,7 @@ tl: { # no indentation
   version = "0.01";
 };
 "repere" = {
+  revision = 51363;
   stripPrefix = 0;
   sha512.run = "4bcfbea44ee34209ce95d6a64de3973eed864ac0e2453ab0afd8e1e05faa2d97fd8d90e90f4d2e1c8f1eb337321cba8c10b03975e1cd75aa32ec5c7373d54316";
   sha512.doc = "8a68f168573fa33ea635578aeeeb51060c3eae9f09ddd7dae1d49aca6de2a8eab7c857336eee1c17e2d4e1a7bb5f2440cd1901bf9aa61961966f727827cab38f";
@@ -24654,6 +27559,7 @@ tl: { # no indentation
   version = "19.06";
 };
 "repltext" = {
+  revision = 33442;
   stripPrefix = 0;
   sha512.run = "32d4e90befc06db973de384855c174ea0ed9ae938a9ea280118d82387fbcbdeeab8fd1143a96c9afb2b904766e5fc43c0d4eec93d763b3e0e730ac06f6883c9b";
   sha512.doc = "ead39615e96c4247be7072dc4fd715288ee1c8cddeb4cf88c5ea79a6659808936fa6eaba3dced3efeb6802e58bef4632604e92d1f00c29b8f0bb3a241d56559f";
@@ -24662,6 +27568,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "rerunfilecheck" = {
+  revision = 53837;
   stripPrefix = 0;
   deps."uniquecounter" = tl."uniquecounter";
   sha512.run = "7c4e3a840b0c02b898182271c35fe36b3c0f77250a8e1629901df500ac12fca887f9f21aad62e3e43f747e409184e5646efd121240caa20f83d785b9b2aa1ed0";
@@ -24671,6 +27578,7 @@ tl: { # no indentation
   version = "1.9";
 };
 "resphilosophica" = {
+  revision = 50935;
   stripPrefix = 0;
   sha512.run = "0ed9a50305132206585f322ba68fb514e0a4d566fc703a617cc6eda1de23b53820ee45231167f8b81aac826de732763e3c141a9ab65d13fac5d76e92d2101cde";
   sha512.doc = "30739549cd7295186c10a54232e4ed57d6c2a589acf6f27ee758a40880e7a4178375835662b88bd78bd50ed0f695c71650003ae5ea78c63f5dcbefa15c5dd770";
@@ -24679,6 +27587,7 @@ tl: { # no indentation
   version = "1.35";
 };
 "resumecls" = {
+  revision = 38427;
   stripPrefix = 0;
   sha512.run = "b7709500024b7badee75ef912158b368e9e3d01a6051b75ab0fbc4e5c90c6bee36226096a29891a32e1ef6dcb87a10e23b4fa1531c34caa48443c22726b07c81";
   sha512.doc = "a99f08f236cbcb321a106acc6b768aaa0aa10a7d101dc635dbadd161e1681531950cbc161553cda82f2edcf0cf94af7b89f5d53d504c049181c3f63a0d0ce527";
@@ -24687,12 +27596,14 @@ tl: { # no indentation
   version = "0.3.2";
 };
 "resumemac" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "f944441058cbe8468ed6646dcb10e09cbac78d5c7408c2a81f2531491739034e47da9fe8f45583008892740a57a2d36bbd1417f05f8d998bd79f886bfbad87bc";
   sha512.doc = "5b89a7684cbe4da1c653d4a6253f82304b7b3634a9dc973e5f7da41967bdb034597e64a4fd82a922fac5ca62ee40e2ce35be6234deceb25000ff9103859e165b";
   hasRunfiles = true;
 };
 "returntogrid" = {
+  revision = 48485;
   stripPrefix = 0;
   sha512.run = "751eddac662b8ca6d61edde7a25b11c357c497743aa0edff92be2a672fa13e4a92e6aaf40a8ed69853db642d656c3f54ad0af6cb35c94fe59cd540fa19f7b964";
   sha512.doc = "6f5eb1997e25ceaa7a8956ced78c584058cb8f9fc112f98c350ff996826188f9b7748b7bedc6c19ec0912894500a4743dc7542532317016ef3d295563c450889";
@@ -24700,11 +27611,13 @@ tl: { # no indentation
   version = "0.2";
 };
 "reverxii" = {
+  revision = 24976;
   stripPrefix = 0;
   sha512.run = "fa6efb9655cda15356163a93ca89f2b6a114ea5bdc151774bc99910fabd3306781319f92a5b5728f29df136c73f994f49011e31ea9c1c01b4ef2fed10af10a93";
   sha512.doc = "ff6b03b426de5508eb31fa5b2fe615fd5b7f0a6721e949bb48e1954c28cb547faa079461c0b1f885163bcba40c7f7d2a3fdc7dfb3946c08c308f5c37d33605a2";
 };
 "revquantum" = {
+  revision = 43505;
   stripPrefix = 0;
   sha512.run = "0e69ce3a2a4a1c289d494e081cd28e9c14c84a45717880e92292cc94803783a350bbe33426c4f5e7ebf64e5b28876e656ab2f1ce681b86c27c7a3c6700563a41";
   sha512.doc = "16b8ff06bbc2155a853a26a0b622e3f89bb7d35439945948128fb37d342d293951526d415a3da9a01381f841dd61287317e52dddda8e8fa6e0eaa5d6a0006dc2";
@@ -24713,6 +27626,7 @@ tl: { # no indentation
   version = "0.11";
 };
 "revtex" = {
+  revision = 49751;
   stripPrefix = 0;
   sha512.run = "c3303edee2d0d7f160381ce91c4018023d70fca88c215d5ed9d46abcdb71eb79ec5a06a899575748dd9d2572323cf80f0ddde75b9c7ab72deca5fb9bf396e0dc";
   sha512.doc = "ebf8f55ef5775b38cde9199e6c604e71400608e6a06bc59482fd017be8d5be68ed08e21ee87a11eaaf59e09af0f89fd7be1f6334fb67e3ca1914ef2c5e382e8d";
@@ -24721,6 +27635,7 @@ tl: { # no indentation
   version = "4.2c";
 };
 "revtex4" = {
+  revision = 45873;
   stripPrefix = 0;
   sha512.run = "7b4902efc551bb4224304adc3553a229393bcfbbf8c052b6e3d4e0f800ac3bb2f2f838f3e77144aa1693fd09f06c7a05c22d7ab0de9de382c53829891fb0f44d";
   sha512.doc = "d0757cce30acb2703a78310d1a9d27c7d28f5c697c3e70e5df9b2cc63ea122604b618615fa07da586cf8f78ec04b5eb9fb129a59a9504c6cec5acc07d05cf1ec";
@@ -24729,6 +27644,7 @@ tl: { # no indentation
   version = "4.0";
 };
 "rgltxdoc" = {
+  revision = 53858;
   stripPrefix = 0;
   sha512.run = "85b9166bb4408d3b1091b033455650fdf53b24c2fce821c872420191390a1bfbf457326a1a85aab1bf0d6c15765275337764f87adcb393464f2533e2462f10c3";
   sha512.doc = "5e35c6d1e6883c895d031f047fff1ededd4629158a8958b61fb6fcbd885c57797726f595894081b4933c78e5f346289a020424405e0dcae6df40b279b86395cb";
@@ -24737,6 +27653,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "ribbonproofs" = {
+  revision = 31137;
   stripPrefix = 0;
   sha512.run = "88d1ea87819bef7f8e70e0df273315981c28ffdbc00247431afb8b92959aa2e0a3e489b01f7571d30ffaf3606d240f25bee6487fc704f39417146a93403bcb3b";
   sha512.doc = "d0efb33c19d632253384182b562cf0e0aa10be81ce2336992c83ca7d25abce37c44b152cc8e928cdac90709cb99a4a5caf3ce8a631b13762aee7b39ad92da3a2";
@@ -24744,6 +27661,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "rjlparshap" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "9a7f5f821635f110d9bad0015d9fdf489f836cc6ec0c101f63a3bf5bf9235d7446dad98db1325b0720bab85d68432f4cbdbc6dfc78456329a8c48b47d9212abb";
   sha512.doc = "73987b63cd565766586dff08144bb9cfab13b7251053d5f008ccb7dd3091ec9d3bbe8ed92fd8e7dddce93afd13a649e68826468b87947a036a054fea76225921";
@@ -24752,12 +27670,14 @@ tl: { # no indentation
   version = "1.0";
 };
 "rlepsf" = {
+  revision = 19082;
   stripPrefix = 0;
   sha512.run = "198037c1fd20eaa28b727054607241b7ada10c9dbf4d48cd36f295a8b51a7d4f94859d2349d3d4e831a74e0da025ccaaf91fb53a3074a704f7a3216bb7df0cf1";
   sha512.doc = "fc06c857011fe01b07180c9530a334e021f5b9c034c65e15959e173a409670947c7aa406bf751d64d5d77d462139f4835824aa53203381d27d4ecb0e51463e7f";
   hasRunfiles = true;
 };
 "rmathbr" = {
+  revision = 40415;
   stripPrefix = 0;
   sha512.run = "71ad547496a4159f2ac609bd695bd3a38879dad118cc18bc58d8fc4c5a8da3d77abc609a0638584495dbb77bdf2078a30ac82f2534bfdf5b620d056b20aa7a8b";
   sha512.doc = "ab1b89d94e5fe92023ccfad1264aa38dac9be485d2717b4afb82a441e6bd8eb5813892c20c33a65741f62e6a8c4bbd3e3c778fe86f7d0da72080d51476f49a38";
@@ -24766,6 +27686,7 @@ tl: { # no indentation
   version = "1.0.3";
 };
 "rmpage" = {
+  revision = 20002;
   stripPrefix = 0;
   sha512.run = "d1627cfdf5ad3f23d03d4d06a4fa039e2ec7ca924245bbda7333b90a7cab8d1e22937cf23968eda45a2c3ff60dcae8a99e2223f9e235485a30ae68c4db7f901e";
   sha512.doc = "25fdd83906edeb10e5493bdb00d05469dbf323bb7bd3df587a5f6dec5af17ca844f27cff4eaca3eaa6b75928cde8a633f59b2029b60f03220d847222f589ddef";
@@ -24773,12 +27694,14 @@ tl: { # no indentation
   version = "0.92";
 };
 "roboto" = {
+  revision = 53095;
   stripPrefix = 0;
   sha512.run = "f52f94089af19aa4ced216946f8f2f1f69364f012dc16b044221c66681dc4aa83837a05521b973f8e6e8f8dba86bd5473d1b25887ffb3b4479fbe00c21af22cd";
   sha512.doc = "1478c55c0d2857dba5a64e8ba7f19506e58b57eb10b913afeed9c005ff9c859ca22d26ca9ed7cffc7c30dc33ba9b11f8f9453a817fdd7b4d60bcbded149f0975";
   hasRunfiles = true;
 };
 "robustcommand" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "806f997cf6c0eceec0c8d9b8f8207014c4ab9243f8007fc688674af2fd778455a787b9cf998262fb7d0a92ba8e2ffb597d61950c22a6122ad957a62ea54d9a42";
   sha512.doc = "4d5c8a994edf816d39af12d7881793f0fda0223a3545559255674fa5a08f2d0fc9ad8ea2779b3c8bfe476966045f996b8b8f5da6fdd028188d28ae724c24a222";
@@ -24787,18 +27710,21 @@ tl: { # no indentation
   version = "0.1";
 };
 "robustindex" = {
+  revision = 49877;
   stripPrefix = 0;
   sha512.run = "3aeac1a43261302532d7b5ee309d6cd94f54a2b17954c023bc6a94fa89c51291f3c4fd3276b03aa3ec65f4e21556d302c81aec107fac5dcb477941cb474dbbf3";
   sha512.doc = "aab461e990176e1d0cb82573edcfe11a4bf668b2d09edff05f673fa20d24ec76464495bebc64086fe3bb4411d5ec9590f43cd57949bedaa3366f6c7313359f56";
   hasRunfiles = true;
 };
 "roex" = {
+  revision = 45818;
   stripPrefix = 0;
   sha512.run = "7df2224f9970b72cfa1474898c057799fe42d717876eed864f35aab113d01dfb483edb71f7f4a0a98b6762bbc309ce6fb51e41dc222a6f19be2025f6448fb1cd";
   sha512.source = "d89d02dd79142344334678f2d8ec4f34eb825532e8be9260cd08a43b28e1aa94ff5655c1c1eadb2f9a365e51693f6195a4851e1420072c867d8b2c0f1cbcbbb4";
   hasRunfiles = true;
 };
 "romanbar" = {
+  revision = 25005;
   stripPrefix = 0;
   sha512.run = "205ed0508765e58397953f28e6a1172d8684f8063fbaaf4d741f4f092e1f652879b414a3225c87bac01e4d41f01c2b0a44632e0cb3088c5c174fdbe42cf25272";
   sha512.doc = "a5fc8c5d6e6a584de4394c59f9bacddc23fbec8d4639a0476cc0814404f1413774fa2d6bae3d8438cad2eeaacb56405680c0c6bcc152a5e4155ecb73de72f07b";
@@ -24807,6 +27733,7 @@ tl: { # no indentation
   version = "1.0f";
 };
 "romanbarpagenumber" = {
+  revision = 36236;
   stripPrefix = 0;
   sha512.run = "7c8fbfcd5e9ec9e306e7ac836fb4c82db3bc42179bf77502b5299c17c4d3ad515b9397016d600011eb24c5d9f2eda23a485634c5aca3a765653cce32d7bf82c5";
   sha512.doc = "a46bbeef023b74c576da84f9791d4d6d47a08091b43c6bf6936c4e17ff54ab2bf5b517cbf1d07e59c077e0981ac989570265df1fde7237ff24727e33d6f1b71c";
@@ -24815,6 +27742,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "romande" = {
+  revision = 19537;
   stripPrefix = 0;
   sha512.run = "874883eb3592852dd6dfe2dc675a768bed8db80c0c617cad7c28bbefb2ca111adb410a584f75fad935bfec330765650ea9d0f73c8c5a9fe567526b5fb46ff17e";
   sha512.doc = "708ffe5a4dccf8241eaee7d22787e0e30bbd10faa1cfd538836da676cbd4f67b16a80772f8a4cea08f59af6d41a697426c4a4254c481d13ac3a10157b2a679e0";
@@ -24823,12 +27751,14 @@ tl: { # no indentation
   version = "1.008-v7-sc";
 };
 "romanneg" = {
+  revision = 20087;
   stripPrefix = 0;
   sha512.run = "4195303ca32b46d722bb148ce4079bbea7cec08fc74a7b0cb6232dcce517b7b5a10753be22fbaab62ec11d894955e1368f3a6dc2a2474cf9b9450e035bb73c11";
   sha512.doc = "cd583b94911ed57e6c61689d437fb4a55a868813fad5791dfa7231b4cbd8b7d22cf4e6f3fe90e2cd36eb08202f4058abf93b5df2d74e1841070378dc9c31db64";
   hasRunfiles = true;
 };
 "romannum" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "06fb28ffcf6c8212ba3bea5e3fd93fe4a5394ce1cd3977556bdebb982888c2c0f7e45dc751f94b1ecf921c701fe6783166e73a595d5da55e874359b7a4065182";
   sha512.doc = "60caceb87b6d866c905685cd180f0deb73f400b33007e0589e1aa5a0b42ed948d88c672a620ebdd4d78bbf92aa81c1094e4d4d6afcb981747e65596711e112be";
@@ -24837,6 +27767,7 @@ tl: { # no indentation
   version = "1.0b";
 };
 "rosario" = {
+  revision = 51688;
   stripPrefix = 0;
   sha512.run = "e1e200c49ba98fb1d2bd5cd927ff209a1f72b9681b1cf3b49baa263985790f7d4854ac1cd9fedd464e2076488b3042456c7fede5648dd8ef23d1ba6701705437";
   sha512.doc = "1e5a12a62b7e62587b452d0f8926757b987e83a2980698deb94c6955cff1e45ef634ec8ac1c1051f6567db8a3de9fe8d4df23a5f80317ddfd2ba863ef15935c1";
@@ -24845,6 +27776,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "rotfloat" = {
+  revision = 18292;
   stripPrefix = 0;
   sha512.run = "2976812ba6d6bdb304d56c9f10f08c02aa8acceeeef6eb05ccd0ac7b3e3b86984794017627d8f939994ea0228bef5e9d6cab0b08843e87a840ee5c2390dd0bb7";
   sha512.doc = "020e080e047f20db45bf83ff32c267f5a10b7790adb64495d09ebb3795a55d953154b8afedcfa0214a77f11c35287b18949b8f1fb89b6ee51aac12a04832e922";
@@ -24853,6 +27785,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "rotpages" = {
+  revision = 18740;
   stripPrefix = 0;
   sha512.run = "a206e4147a68ad0ae750e18ee6a360d6ed2ac91785b75f8fecda4b63db695a36a9602da8dbec1310feed4072f952dc49f4d2c5d2817fe74477759aa55246177f";
   sha512.doc = "2723d32029abfc773de8f26a1f08cb3535c5878f63effcb94fcc6a2f98f1a0f9ff3c53df8a4d9c1ce1f99b52b9fd7b2f5c919dd9cc915ea8266835aa85ddbda2";
@@ -24860,6 +27793,7 @@ tl: { # no indentation
   version = "3.0";
 };
 "roundbox" = {
+  revision = 29675;
   stripPrefix = 0;
   sha512.run = "078938229ca1ccba4c26f97eae59376afcee469629a7e8704d6e376d5bb256e8991ee1cff17f24e362772b78ed800b57bc6018b10e897daa73c142fafa1f62c7";
   sha512.doc = "cf0f56e42a82d6ab36fe6af2ba690024cb555192780c04ef1a01e71fd6cdfb803b0129aa95e304de4fc8c1e2d1015b14dbb6631d9773bdf463fa52c22209501f";
@@ -24867,6 +27801,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "roundrect" = {
+  revision = 39796;
   stripPrefix = 0;
   sha512.run = "01cdc4c8443c50a91dd408c52122e8ae65257344176227a508cb082f92d61bc02756d47e27f75d7862d3c87c26add2003604956ad00b448f63b4f6417c520ba6";
   sha512.doc = "35289692327bdc68acbd442588fbd37185f9e00e3e4ca78fe500474c53ef96542042cebd18cba7720bdca0b72f19384fd3b8afcf45447644bb3c560a1385595f";
@@ -24875,6 +27810,7 @@ tl: { # no indentation
   version = "2.2";
 };
 "rrgtrees" = {
+  revision = 27322;
   stripPrefix = 0;
   sha512.run = "cf80b48866e36b983527f0646c94fc9776ea799ac475a2c5879a4dcb3b3b0d052e061f871b6eb0a8c0fb1153c0a9f6f0ccfcfb1c6b8f3ff4839c3d454ea3e62c";
   sha512.doc = "71992711c27e741403c5f7cc268e8597e2ea17abe42d953bf0c3caf255c0a8673f6210bb808fc70b741c694778f7cc7a45435afe39939b1377951e8e2343d73e";
@@ -24883,6 +27819,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "rsc" = {
+  revision = 41923;
   stripPrefix = 0;
   sha512.run = "abd1d24110722545b93cc16ff35b70c87f467193a33e8da2a04eaff354d89782911e42a46da5d380b9406f923c6fc48d38950d7346cfc799abc0660efa23db8b";
   sha512.doc = "8569a90d7f5c532e366901d8bd2bab3d5a32d5b6d1c4cedcf179d1ae96a6c34ef5d294392f93fed589a55baf3ffddee2cd35a67c2aa8fc7e0477b47ce92eb411";
@@ -24891,12 +27828,14 @@ tl: { # no indentation
   version = "3.1f";
 };
 "rsfs" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "f5d52f49ead227b058841bb88571ae0d6fb40b95dd652536887acf13c0a5dc5b61e3813faaef2effc26539125c2776e113937a1612e7bc7146e7d5517b02aeb6";
   sha512.doc = "2d23715b38d90c686d7edae77f2a774041d3b679035e0399b7b6089f9b17db3ea4c6c3cdd655bb6e5f3a3cae782e30984c1fe89f5f263a0cd86b441c5376848a";
   hasRunfiles = true;
 };
 "rsfso" = {
+  revision = 37965;
   stripPrefix = 0;
   sha512.run = "ce6e600f2fd5ce1aba31092c43401feeadc7927d22ab630f0fb28f421bdea858fb9e382f4d0e36036f6f4ecbd1232265216c29b2edcd44583df6fb3340ce468d";
   sha512.doc = "ff045c68d70079df6d2b21368fe599beb9ac1ba0e339a8c448bd75565774c237520f79fd0e3d119209765eef29f5891dabf689c7756791a91bb7c7ea1d3dcf3e";
@@ -24904,12 +27843,14 @@ tl: { # no indentation
   version = "1.02";
 };
 "rterface" = {
+  revision = 30084;
   stripPrefix = 0;
   sha512.run = "3c3cd754ab17d03d50c35ec9824b76b9d4528276fe2b5a882d35df5537ca12f83956b2c596a269f9961f243bbd5e8c394c6f1bd508d07cecae50fa47bf05fd86";
   sha512.doc = "c8c38026ce2bf2a996ba40062fe3bce797b381633e4aac50ec438bc9fb567f73ad1c4e764af3cdc816e62713d4f1dd8bf2ab1814b50d086811359e999103c7bf";
   hasRunfiles = true;
 };
 "rtkinenc" = {
+  revision = 20003;
   stripPrefix = 0;
   sha512.run = "a1f31a946838123b65124fc7220e77283cf89105ae439f1e851abfc3c30b6a6b7c83bebf676fe47de1dfa9668cfd22c638567ef9a097aa97dacef1f0e3ba1eb7";
   sha512.doc = "f3e7b1e7c95af7bf89b58ac949ab5b3fc12d991a436e28196f748ae033c46446a0cb885943777f44af1fe5ad4aa579e0fc43676c44812b01cc64d85e4ae15e4d";
@@ -24918,12 +27859,14 @@ tl: { # no indentation
   version = "1.0";
 };
 "rtklage" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "6e39e34a7c293f503949da66f1d5ebc65ae0388dc56e87992e9fc4daff1a250196afe68150be14ee2ec3242393ce9e5ea7b681cba31b7ed1c2d58526f6506554";
   sha512.doc = "550c21bcd8af04041f1fac11f2be3ae2a1f01265ad6bf31243569820c7b8d83f32ccd0cdbcc4d5a7a5905ae9aa0512a449a1b2d6923affceb344152e6c12d72d";
   hasRunfiles = true;
 };
 "rubik" = {
+  revision = 46791;
   sha512.run = "67931287ea126947b5b2d567ba355d44ce094b2b527288ce32329de4a73434be9a43cd520e6c24ef570a46a16c0edcf12212f46228ee1bcd2b8a8be7f9db3a7c";
   sha512.doc = "33d5c8210600cb4ce7b1313d1046f6644f0a6648f7ee9676d4d628d042f6501b5e92f2b56a31fbad6f637dc93a460a568be9e1335bd52bcea825f5772b2a9d51";
   sha512.source = "3159acbc71a007877c046f6c075bf271e031feb00cda04c1818e4490396c3fb0651f160c7a98d8d3391efccae6a5b1dfde2155c6bde1c463e1c7416107b4ab90";
@@ -24931,6 +27874,7 @@ tl: { # no indentation
   version = "5.0";
 };
 "ruhyphen" = {
+  revision = 21081;
   stripPrefix = 0;
   sha512.run = "d681972cad53b86167f4800f78b5d25de305d2f3f604e6b41b481c432bb9f09a964720fed5b5052cb8a30148da1bdc76306d8edb2139018d83c331d3439de958";
   sha512.source = "df587bb8c81e73f70a93146d6c3a50c2a66b16084e8eab0b01e0aefb3ce073c6b6e812cfd8c5a1520f98ca58e2e2e0634877ca2987742eccc4d7340a7d62e23b";
@@ -24938,6 +27882,7 @@ tl: { # no indentation
   version = "1.6";
 };
 "rulerbox" = {
+  revision = 50984;
   stripPrefix = 0;
   sha512.run = "197588dd36056d6b6e9f7772205cc44e81734cf63dfc83a7c987209df0c2b47f91f460d322df05f123768f3d10d9af8bcdda6619da394fdaf3367be88821a135";
   sha512.doc = "b4de5828d5602845217726ded4d56ce6f4008a599bb1ddba89745ab39bfc2ba9ed3fcd1f636cff4743252a975a18ba07925f1e78f81fc8cc2ded80a7cf8b74b2";
@@ -24945,6 +27890,7 @@ tl: { # no indentation
   version = "1.01";
 };
 "rulercompass" = {
+  revision = 32392;
   stripPrefix = 0;
   sha512.run = "8f2e8d9a4d61c3c79e3ef29ae554db2696b9c374fe10f59fe2a4baea33c679a0678a95c30ea1d4310662bb5af6a1b02d88db7bb43610545b1ffb39fba19b5001";
   sha512.doc = "6077a3c137269e5be37b62879c394d800f4bc80cacd1d9600b2aa81503958e2fa29f0364db58c1418bc206db916f84f46cbcf70d0f30a9276a6e78d154150425";
@@ -24953,12 +27899,14 @@ tl: { # no indentation
   version = "1";
 };
 "russ" = {
+  revision = 25209;
   stripPrefix = 0;
   sha512.run = "11bceea67aae767037d728ab7892eedab312e9477f1f9f7501f9702fca4ceea4e21bd575b1589fb545abdbdc5f5f5315243f77adb4c9b9a2507fb255481c5541";
   sha512.doc = "876cba326071d0f347d9a1a4c1eca692ca743729b9604a51bb5b53de96da6006ff24168040e77df60b1999cb22901b7318669c32378a869081956dde40974802";
   hasRunfiles = true;
 };
 "rutitlepage" = {
+  revision = 51073;
   stripPrefix = 0;
   sha512.run = "e071bf5dfcb8572dac3287394be5052ca04c6ec90182e306f020ad02c8f4db134c92b41f064423c1063fe5c1c465cf952a8d0d8fec4e917aba82f76850cf38c9";
   sha512.doc = "e6884d2eaa6e5fc9448c033f1a48ee218f171d5fc16e7a977db89f7807c0bb6d1bb4c212ee489bd882d87149003d9aea2da3170045e165150bb8f7578b719107";
@@ -24967,6 +27915,7 @@ tl: { # no indentation
   version = "2.3";
 };
 "rviewport" = {
+  revision = 23739;
   stripPrefix = 0;
   sha512.run = "eb4bd4e75f021db40119cb4d4334611fa80d26885dd4229ace652bf8dbd7b4647a6dc4f45c8be78ad8db0cf1001b7117ce3c38de2483f0dd96da05473543ac10";
   sha512.doc = "10f94dd8b29d354eda99e8c0f15b53baef80714f7212714a94070061e403d45fc5a97d25174f268a14b0f4c924af9b25c81131929c08be1ed9a4e62204f17c22";
@@ -24975,6 +27924,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "rvwrite" = {
+  revision = 19614;
   stripPrefix = 0;
   sha512.run = "c187dcb7e1c72b727cfd0827a55d721c6a094679c1dae27438ed030209042b49c646af20e158900543369ca8ceee9896a9f36de76607f8514004df80e3be15fb";
   sha512.doc = "545e5b96a2bb3646a7b4a6eb31d5192ef85dee9ac0b6859f6b414f26c5235651294f486bd132af112a2c6021d6843e6ffef8a8f79b7389b974227bc1eee16230";
@@ -24982,6 +27932,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "ryersonsgsthesis" = {
+  revision = 50119;
   stripPrefix = 0;
   sha512.run = "0846fb24c6b96cc30edf46d1311809e1170d3feb13b3c26be4dd330ef8dd856771f257ca197f562ed409815f0edb7e8ea744a38b9098b86a325eda9cd4ad360f";
   sha512.doc = "b0d57ce3dcab586fdc2e15f6c2291560c43dd772b693ec11e0678e083a1475c21b55601878cf938e666d0f8a5464ffb0b79281b62f4859200fc6cd67b33b8779";
@@ -24989,6 +27940,7 @@ tl: { # no indentation
   version = "1.0.3";
 };
 "ryethesis" = {
+  revision = 33945;
   stripPrefix = 0;
   sha512.run = "63988ab74eda81270f0e470f3b1d1c772b17668fd9c6526fd8d53f588da8e52d3690b4c3ee898f2b460f83ac44ab4c528a0c6c48abf1a1cbe21427fb4e678a1a";
   sha512.doc = "03ef086a51a97ed93038338b99a516ba2898a0097326f4cff3c650c7035acc4bba7ee2fd6458c579a9f1af4ff31334dd22cc23b7004d08e58a259306ee1fbd8e";
@@ -24997,6 +27949,7 @@ tl: { # no indentation
   version = "1.36";
 };
 "sa-tikz" = {
+  revision = 32815;
   stripPrefix = 0;
   sha512.run = "e30f8b6dd6f082bd127077fc5040ffef53e2c2fe43afd023bf0fa9dd8094769e2d40734dcf412d477989b746e1e5141cc42cc082e9f5b26e5986cc91f8336ec1";
   sha512.doc = "d6586a6196fa9ec8c70ff6410873604d987394ff09e93462548baa202f22bda479fb4f76f66fb710b8daeb7b34e455225c997f07cc9360a09c5cbc4c45697a5e";
@@ -25004,6 +27957,7 @@ tl: { # no indentation
   version = "0.7a";
 };
 "sageep" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "d8e107109129636cf68d88c96a36de87b95dcfc4e154dae51a1145d7a0c58a17ca12e95b1b2fa1312c6c50c5cc02be35b23168d8eca69a7643695c38c5d0bcd6";
   sha512.doc = "7f92c14d432ca5960669a8faace80ff6d4e97d9a021281c847b7f19942f4c1a06da3657e8992998e91bd1d69398b3fe379da690f81be28cb4ddc3980262c56b5";
@@ -25012,6 +27966,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "sanitize-umlaut" = {
+  revision = 53292;
   stripPrefix = 0;
   sha512.run = "5dfdecb98f1be63d358cb029f7428cde40daae2aec1c991b345b5f8097862e43e85f329bd371624a2022c15231db2c4e86ee144c6c76edb9214725cfc90ca798";
   sha512.doc = "eba6143a88ce245d1e67d0205f5ce69b86a17c598daf1faa42e0f4675af6674b6a3559ebe4267efa0919eecda642c2d3bbc7ebb5d8650a53fd8d3868241bc813";
@@ -25019,6 +27974,7 @@ tl: { # no indentation
   version = "1.10";
 };
 "sanskrit" = {
+  revision = 42925;
   stripPrefix = 0;
   sha512.run = "0dbfc19e366fc2e69c3700e0c532c280f1e444d0d6b44b37fd1565a64b0f883901c209fb1cab7c6a35cc9ffc23d32b5cd78ad2ee3e52d7cccf41a80a8fdd6c57";
   sha512.doc = "a5cb05e7fa966cb09d84d0dae14eec25354156f8acb5811f4867b3724fbed62df94305ea9062772879c5cfadffde8265e7c9de062bfdf6756cf2843053caf9fd";
@@ -25027,12 +27983,14 @@ tl: { # no indentation
   version = "2.2.1";
 };
 "sanskrit-t1" = {
+  revision = 35737;
   stripPrefix = 0;
   sha512.run = "8db4a734c40bcbefca8d1ac4e82b01b890bda547d3aa68e8f3a93a06d75335cd41a6c594563d0c7ec9a18a08868ff7b5e8a04b11a64110f80ded65cf5d809bf0";
   sha512.doc = "68259865bdde464c565c50497257c0f45f6cc1fcd01533087afabae35ed6d2d53e2160c9c3f867c254e301058e599bbcbf1c3fcaadb7ee7ab25c364642084073";
   hasRunfiles = true;
 };
 "sansmath" = {
+  revision = 17997;
   stripPrefix = 0;
   sha512.run = "075b9a32512f191767bfc739b833497eed371c2078fc8511ba507b19e2744675bfb3caeda40da484ae559aaff44aa4f6b2f7f5baaeb0c30076654593216fa5e4";
   sha512.doc = "7923dcfcf20c945dc61af747000694c59c61982417307356ef2ee335f7a3eac7e44974a334072125ed4a3ec3b29caf342f15dfda1fdbc348a5e2cfb8a4dc2469";
@@ -25040,18 +27998,21 @@ tl: { # no indentation
   version = "1.1";
 };
 "sansmathaccent" = {
+  revision = 53628;
   stripPrefix = 0;
   sha512.run = "685b0c604978aac45efd75c37652471aa165bfbbf12dfa686320a6a9ef926f9043382333ecc26db6d2ff4d12732d135947145ba937eb6d01d4a4e9aa17784315";
   sha512.doc = "c9bf7d65a232d668243df9867b2eca64e0288fd733c6b39ce200f64fc5b0a07c98ea6a971446f67f1766998e169c14a80eda71104c1653ed54d3865e6e145fc0";
   hasRunfiles = true;
 };
 "sansmathfonts" = {
+  revision = 51356;
   stripPrefix = 0;
   sha512.run = "71d70b034c7e0da6f8e1876c40ce2821e05cc814e5d8e1194f5a76c4b490d8d191bf6b3c9bb7fe880d0273ec8e1f3211bd335b526b154116d7ccdcdf0b61d0d5";
   sha512.doc = "e61cc601588681dc29113391426cb345c207eefb04562ea6eb8369cdb8ec4844b0bab586ed91bb2a1506c49c5a60661748de95cf792b07fd52ba23cbe58d254d";
   hasRunfiles = true;
 };
 "sapthesis" = {
+  revision = 48365;
   stripPrefix = 0;
   sha512.run = "92253d6532c6740ae1bd25fdc76b566ea2d488f31e6a24f90e3b55ddc15d471b6c4ce5c4e7ef29c9a416d9810af49b04ab51530e9594c39beb19fffdc066a917";
   sha512.doc = "a1d8c40975283a7301c1a842355149f4ae291fd7fd72cc5a44a292f96558b79bae734ec12a78b429c333aadd6f433e9603f7cc75a71eba84d42294461e87767f";
@@ -25059,6 +28020,7 @@ tl: { # no indentation
   version = "4.1";
 };
 "sasnrdisplay" = {
+  revision = 45963;
   stripPrefix = 0;
   sha512.run = "58cac1a9ca8311c570f8261014a4cbc52b2b1386196d9c12de1f7f7ac780a163626a21081005bd4a02f70f95ad0e3873e844b8520104939e8b1116b674104ad9";
   sha512.doc = "5d6024b9bf8fe91cef2e0427f33d9fa8b5fff78e2721afc4884ee83a4ea302a5c7b3bfd38ad8be05ebf5b021885d13938bf9424369a44f5701b29ffb6c015d77";
@@ -25066,6 +28028,7 @@ tl: { # no indentation
   version = "0.95";
 };
 "sauerj" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "a4fe5bad7f3d5c895d6166846100cabb1b59e5f37c06d21e451acbaeed0847ab93d9995e70209ab18cc55bf8c78a6c83cbbdd49a45a4cfe511cdad41baf3ddfb";
   sha512.doc = "3ec0f5c2132a809b4f2f945255f0806508a3dfa3733119368ba59e4dcf5304ac9876ea5f05912faf926db651d1aaf4a3a1c40744fe7d3a077d8bd9dde2676754";
@@ -25073,12 +28036,14 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "sauter" = {
+  revision = 13293;
   stripPrefix = 0;
   sha512.run = "17fc32a3dae358be5215301abe13d9e865ff9f52f58cdc849d5fc80aeb1a79723d0a39282383086282fbddcaeda0fe586cd3043edd582e0addc0b223bc3ee756";
   hasRunfiles = true;
   version = "2.4";
 };
 "sauterfonts" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "4d7e491a7a6a22fd6ad8f407cbc8c041434466850e2e5efd46897843281cb71e046fc6cb849cb091cbf05191c45c52a6cb3e0d806eccb9133fddda9c8f305969";
   sha512.doc = "16647b89752d1871c798f80be91bacf375ae9a4d5199ef7417edb4ff019d7aae548fbbbbde47f84cd5c7c36ec4988ad1df82735f4aeaeb40180b07a86dceb5a7";
@@ -25086,6 +28051,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "savefnmark" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "2d39c1246bc9c5c28222a6ce96b93bc0c1e93c3155f68f44843b5560b548191ad3b608f24b5c444b834fc441238a0d2174a9a8ec006f01b160f77159decfeeb0";
   sha512.doc = "9ca251e6d17373e5d6f308d2e75896aaa3e44d0f5883be65f7629f922f0eda296c963530e8fc1c80073e0706c2c72f97d062cd731481654c0564cdb695eaa86a";
@@ -25094,12 +28060,14 @@ tl: { # no indentation
   version = "1.0";
 };
 "savesym" = {
+  revision = 31565;
   stripPrefix = 0;
   sha512.run = "212ea18ebb424f9b64ca9c75a783dee9ceebac09adcd6ff6c721d90796bf4121aa8710935529451e6f9a4de9c3cb5910b6c07d6fd6b7093c4b9904348f43a1fb";
   hasRunfiles = true;
   version = "1.2";
 };
 "savetrees" = {
+  revision = 40525;
   stripPrefix = 0;
   sha512.run = "f31ac72f12ecbe2ab05bde14de907707988d6b9ba20414543b9176b71d2a0d5358a34348177857c56b961301678b612ee6f767d1b9cb671b9bab344bb8230e6d";
   sha512.doc = "3e5cfb62d4020d32d9bab01b3df2ea1cb485240aea5eda3541d29cbe38487ed8b242a1eb2b9d15d08bd742390a8d8a25b584e110145dab330580e69e2287f181";
@@ -25108,6 +28076,7 @@ tl: { # no indentation
   version = "2.4";
 };
 "scale" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "2d090a08c8f7d5d9b332f390b29b16e911f339071579cc09b954b2978df4b410ff3c47afd6b8bea0ce7eabac551b94f8630fdb7aaa4ef39f793748925157a19d";
   sha512.doc = "aa41f6de8baee992b123ed40086dd5d0aff63c187858502c66056a52f3b8bfb12a5b7dd15ae9279a224e9d67d717f3927e97f5879ab09ded9e0960a3eb910a90";
@@ -25116,6 +28085,7 @@ tl: { # no indentation
   version = "1.1.2";
 };
 "scalebar" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "1e367f025943a56b6592238e2961f967beb1d5ff5b68ee83565b3926a392214557237e482ba0b174ddb2e6861e4690e636edef1a5fe0473c465a0deaa1e1bd0a";
   sha512.doc = "cada3793771a28c3ce30439c782d245b6b21cfa426d2268e7e072a8559a81692b6c4e9e26a8bd452fe5882f39e55fd061a1af4e9be362bdcdb1f6ff6bba781e2";
@@ -25124,6 +28094,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "scalerel" = {
+  revision = 42809;
   stripPrefix = 0;
   sha512.run = "0b0a996bbed0fc185714f84e32c76e5a9277137d3d8dcc6b12b516afa97f3c80b2684c3c22af8717bb3e6acca267a3862c1244df7cb71eca61b10074fe1c3a89";
   sha512.doc = "1533997bed3ce5499a1285a6db03be20f28fe70b1ebbac5d117e692c53068ecbe7f8082cd5f93c753bbfc1eb4fb3b78372c7b14f5e2c636398f37dbc17972d97";
@@ -25131,6 +28102,7 @@ tl: { # no indentation
   version = "1.8";
 };
 "scanpages" = {
+  revision = 42633;
   stripPrefix = 0;
   sha512.run = "e13f7849b2b1cbe9fc60fc2e3d3bb7f2879644c282e8664a5ec46b3143f4ac7fbd21f2976183ad410bf778a181d5063b23832734f0ff43a617c9020b16587fb6";
   sha512.doc = "34eb2549a4d809602cf69eb562fd3c03c8d3fc4063820ce41b52d733228a6a83ace819e5bb82e77cd3be3cb8093e7997377fadeded652d20509eecde458d9b78";
@@ -25138,6 +28110,7 @@ tl: { # no indentation
   version = "1.05a";
 };
 "schedule" = {
+  revision = 51805;
   stripPrefix = 0;
   sha512.run = "c7d58c5e4ecdef504e1d32934ccf2c71cd36b073af4031ee83b0d0a3b3393a40acc26dd4e057f426561903d0d08297bb2a9849cad2cc5a11b02e15a3983f0e1b";
   sha512.doc = "ca5f9e2b27f0b01531e82e64e99f816aaa52f5f340bc2fdefac367918d50c564cd178709428554a908951c117dbcf3d24753f84d864fcdc546129c3de25d7e77";
@@ -25146,6 +28119,7 @@ tl: { # no indentation
   version = "1.20";
 };
 "schemabloc" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "5b875455f8a567a97c5594f1366fff624228ec2af396bf8cee73f32835d9896c41986b3540f215cca570f21d1531d248e315da5336c0323fb57c3f796ee2df65";
   sha512.doc = "27b0f1f5db78caacec8140b4f13a786ac50ba2cb393aeed153138b0ea8ee6caab640c2dafb14cc3fc01b3c7a511d4642f7fea65e2ccfe295a16cb7e125a47cf0";
@@ -25153,6 +28127,7 @@ tl: { # no indentation
   version = "1.5";
 };
 "schemata" = {
+  revision = 39510;
   stripPrefix = 0;
   sha512.run = "41ddeda2f81711f50238403fbd496f35f0b5548c52a4865dfd9f1ebd7d708db2d1780b1bebd0d1e1c993c140a760d4802770066b21b1bf4e98c09bb606dce2ba";
   sha512.doc = "51afe69e7356110ae73b2dc7d4cd84556ac245bc57ab2c4e05f8753345fd0628085b61c78e31fd25ab22e1a2e3255c560193fdc9e16729e7ca2dd7c48bba0684";
@@ -25161,12 +28136,14 @@ tl: { # no indentation
   version = "0.8";
 };
 "scheme-basic" = {
+  revision = 25923;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."collection-latex" = tl."collection-latex";
   sha512.run = "ab27a01ab3859bfc1718808ec931e24e58c1146c5e803d616ae0e1e2c2c563fb28bb8480f91e12db9e71d7c1ddfbdc3b73357fe212fcecf7e377aba4365aa27d";
 };
 "scheme-context" = {
+  revision = 50183;
   stripPrefix = 0;
   deps."collection-context" = tl."collection-context";
   deps."collection-metapost" = tl."collection-metapost";
@@ -25192,6 +28169,7 @@ tl: { # no indentation
   sha512.run = "214ab897d6ecac52278e3c63e988b0bd0ce146f07e9c58076e2c65bf6a7bb1a34d66341dc88b572d4549182a9a0b9daa51e91ad782ab41f7eeb7a6c2dc8786f3";
 };
 "scheme-full" = {
+  revision = 44177;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."collection-bibtexextra" = tl."collection-bibtexextra";
@@ -25236,6 +28214,7 @@ tl: { # no indentation
   sha512.run = "c5aa68661ccb1ef57e039e923397466c46349a4b52e1a282d5fa0bc466de382c3d121f69954a28c6345e0f02386eedd915c5abd8f0f0e86ec295e30b325ba9b7";
 };
 "scheme-gust" = {
+  revision = 52239;
   stripPrefix = 0;
   deps."Type1fonts" = tl."Type1fonts";
   deps."amslatex-primer" = tl."amslatex-primer";
@@ -25273,6 +28252,7 @@ tl: { # no indentation
   sha512.run = "88e35f41d2984e4ec6672650df5708e553f830ef5c16042613bc412aa2a62a4af6f46f80825dab6e50fbc73811c2059955ae0de88f989b170681c7499944ead2";
 };
 "scheme-infraonly" = {
+  revision = 53569;
   stripPrefix = 0;
   deps."kpathsea" = tl."kpathsea";
   deps."hyphen-base" = tl."hyphen-base";
@@ -25280,6 +28260,7 @@ tl: { # no indentation
   sha512.run = "5c42114f0bd9a5351168e336438757c5d311cfe22e1ed6d5a65cca5e1e97439b3abab2826fea9472e6dd49ff9e7197d835932a37605d1e2b972e4fd910ef8aec";
 };
 "scheme-medium" = {
+  revision = 44177;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."collection-binextra" = tl."collection-binextra";
@@ -25306,11 +28287,13 @@ tl: { # no indentation
   sha512.run = "cc9bd942db4afd9d1d15ccf20e2d404ca61d640f6c04058a876cce0dd09e1fcb581e8abd7b61ee55c2ac8d583c508e9f0461ce199aa7b38bdb64856afb8241d2";
 };
 "scheme-minimal" = {
+  revision = 13822;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   sha512.run = "8ae04d142c738142753b4601cc327721cb59689948c2c953f79ff1c4364aa6a449e3862d206223ef1ac1efc3fdfdb1f542c32c8049327662d4ddbe77fe7edbce";
 };
 "scheme-small" = {
+  revision = 41825;
   stripPrefix = 0;
   deps."collection-basic" = tl."collection-basic";
   deps."collection-latex" = tl."collection-latex";
@@ -25363,6 +28346,7 @@ tl: { # no indentation
   sha512.run = "9d6d9bdd5bb55deed726997629d69927f8da7c8eacae1b87c94c94f73ae90d68024fef2e29aa7d652d3e9b4062801213f35e91ba999380bf3ba11bcac6280581";
 };
 "scheme-tetex" = {
+  revision = 52954;
   stripPrefix = 0;
   deps."SIunits" = tl."SIunits";
   deps."acronym" = tl."acronym";
@@ -25427,6 +28411,7 @@ tl: { # no indentation
   sha512.run = "4485027ddec5142642acfc84ebbbff4ebc0e150ccea58e05ac558627b884a26b103361b827d8bd234f95c46525063b2072780daf861fad01206b91d2eadb8acb";
 };
 "scholax" = {
+  revision = 53330;
   stripPrefix = 0;
   sha512.run = "12dbebe73335138418cb375d12cf48d5dc8d3d528a8aca7e164822ff7d7f415c7fe3f23865e7f28c465c21afa625efd6307993d23b0fcce62c2cb2480d91f561";
   sha512.doc = "9d232fd5ffd590cea91ca7247e0df3b16331317540d3685e6b3c509e3ebdb03e26cabf062a818bc33b36021bd7d31c865405cf6fc87ca33ea1fb18995f626b15";
@@ -25434,6 +28419,7 @@ tl: { # no indentation
   version = "1.021";
 };
 "schule" = {
+  revision = 48471;
   stripPrefix = 0;
   sha512.run = "8f59d31e7bebb741a7c23c2559f0e90979df2d7ed1482d3dc09a1f5fd95ba7ee358e3acfd5bcfe0a708d36cecd4e36b226db4addcb007168789311758a444bc9";
   sha512.doc = "dbc4cb7922524e2a73c56861ebac5487b508016107bc7c2a104d93edafa816f27f84a142bd0d228aed008f85ba7aab53b694771a001657ac068db169b87b72b1";
@@ -25441,6 +28427,7 @@ tl: { # no indentation
   version = "0.8.1";
 };
 "schulmathematik" = {
+  revision = 53815;
   stripPrefix = 0;
   sha512.run = "ed2db79bc6762f123fcdb452d483c8857c7ae20ad89152c3db9655ed90fe4743f00297a35e82e03d357ad733931aaceff49e0aa7eef2c9d66b2ac673d732629f";
   sha512.doc = "13264b961f25e77c101478b0907896f99bc68814bc62659a16fa5d8567a6b3819398f4cbd91e2d53e252892b9f1313fc5b7431d439a8c3780b6ea140f2270348";
@@ -25448,6 +28435,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "schulschriften" = {
+  revision = 35730;
   stripPrefix = 0;
   sha512.run = "baedf984b1d1cfeae56af4b9530b81d90653eee334a90f2a9a83a871240592ed6267668b6974033cedfc1e73166232201eaae8e4876d38b9fd94919e8262336a";
   sha512.doc = "b43f16b38c0417b074b7f45bd42290f3434275c23c6031f293101d907c2004805168d86137190300daa1ca62dd1b25cd2f795e712868b36e454cda134f680bbb";
@@ -25455,6 +28443,7 @@ tl: { # no indentation
   version = "4";
 };
 "schwalbe-chess" = {
+  revision = 53305;
   stripPrefix = 0;
   sha512.run = "42f04e0fc134e4b429a7ddc2397e3c61ac1ff648670497f6ccbeb391748635c54648ab56645849a81b0002aec1a3f9ea74db631ab45972f69f2bde2dc92444fd";
   sha512.doc = "f5ff7c4a235cb5fca0a9d0c9e347c3e2a997c1994e56dab7b9410483935253d09fb72fc678c15e63465de6fe25db7a7dcf7dc445a594711f2072020379b87df5";
@@ -25463,6 +28452,7 @@ tl: { # no indentation
   version = "2.7";
 };
 "scientific-thesis-cover" = {
+  revision = 47923;
   stripPrefix = 0;
   sha512.run = "2427c534ad767f1e8f319aa24744346d4a0a39f73d93c779dc89d3cd0abfd683d7a33c81026c4a5823ad686084f026193c917ff173d639dfac2c99350a819c59";
   sha512.doc = "31bc280c96b87b079a7dfb6a0c2ff1a03f80c5a047bc2c11b9fb192c50b8e51a65cb3fd5c043c37124afe2383a611f38accd91d6202416451b3eb34bfe855077";
@@ -25471,6 +28461,7 @@ tl: { # no indentation
   version = "4.0.2";
 };
 "sciposter" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "1a4292c9fb6dd8a8780968c69ee70a88dd5d1c5d81df9a32e22e08c9115528d8af634a1681fb1672664d57f80ab333a1b811a9c0e17597afdc358988e14fae93";
   sha512.doc = "6ea102c2318e30080224684693806e16008f946a01fe9e1d232a871f231100d1491324a3ab0260746a61a10125afff6b20072c1a49c8da279a4c0b477361e46b";
@@ -25478,6 +28469,7 @@ tl: { # no indentation
   version = "1.18";
 };
 "sclang-prettifier" = {
+  revision = 35087;
   stripPrefix = 0;
   sha512.run = "77f8909b870fbaa4f1a0414f75f08ac602051d26c0c935be8661be8820a0b77734b614b9f5c8333b1f1fd12f57a6ee3c4c403f151bc60300e454673a2a4235c2";
   sha512.doc = "7680fa17762f17d2d7f3c9d3062bd194394bbbfbee36e4704e8b95b2be568cab51fd1dac9d90c6034919b3ec61f75f0f7689478c16f53ac7b4ee820768eaffa8";
@@ -25486,6 +28478,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "scontents" = {
+  revision = 53504;
   stripPrefix = 0;
   sha512.run = "3db5230a958ab9fc7cbc644e13e9861823f9a55c5426a9b3fc2c483e86f62369f4cbba869c2a0874684fe2d8ce1a6b0e8feb53b1a4c1d7d9fe94893a51c8ea03";
   sha512.doc = "1d9c515aa099baa507fb776492c59d94397e49ff8ed95de49ca8ef6b91ddf3a7a1e9df0484b2b9100d71788951f9016b9c5318778207d1c973c91867dc2107ae";
@@ -25494,6 +28487,7 @@ tl: { # no indentation
   version = "1.9";
 };
 "scratch" = {
+  revision = 50073;
   stripPrefix = 0;
   sha512.run = "fcee832dbad22e76387bbd10f7ea8e3127a6fac45ea1b42feb183506cd5c89c258cafb052d75e4d14b431a57e638fc84fc751bbb8fa700420197a0d2e33ead48";
   sha512.doc = "af7057f28ac0539a555db5774d3d29e01ba10fa78744712a5d76f95229c45022f682c321a551cb5070ab3e370b2d9e861c0b04b73365e828fe665b3f8aeb7730";
@@ -25501,6 +28495,7 @@ tl: { # no indentation
   version = "0.41";
 };
 "scratch3" = {
+  revision = 52250;
   stripPrefix = 0;
   sha512.run = "042ac97a5240c259f00f8bbe4c25b0886636b49e8218ec810306cda99525552bc4bd6f4a7392db19d45805c50866c7f4cfb299e63b8296d44409f12db3e3383f";
   sha512.doc = "ea7c2ac340fb69bf779af2948e684ccb73f0234ed55fe2d8260fe8b3eb94c7c0ef085db83f94f81fc19705b2d61c1697ad9ad1dd39d8aac343d16ebdb8e20ece";
@@ -25508,6 +28503,7 @@ tl: { # no indentation
   version = "0.14";
 };
 "scratchx" = {
+  revision = 44906;
   stripPrefix = 0;
   sha512.run = "793c4e96cedd97ca37b7906b6a9e78bb06f39572ddfb57d8e4b54dd9b2846b31bbdd835fe1a93517d1430448571a30d26fa8ad7cad0aa3fab6ca526bacb605b6";
   sha512.doc = "c87994e90a748fa8afba91b443850a2d9f555ff4ac6b264107b42981e078b6966e8cbffd75f071f3f69a78c9b9aa10db65c3e855a4920f3b732446df01da7d6c";
@@ -25515,6 +28511,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "screenplay" = {
+  revision = 27223;
   stripPrefix = 0;
   sha512.run = "d14dd76c4b1abd9ff7adbef7e4c3bc1f732156dc2d989787bed7382e0288c44dcde18ce05143e6af03ebe83c753bd2b6682cb4f56c73934ca4209a114eb9e3ef";
   sha512.doc = "ed723ffc17a98c8d4a8c960f56a3550ea74db84fdd06d26b08b5c46b12310fdb9b7b7719ffa25e8ddd21f17642f5f64f1c96327066a131c468cee8ff185cb199";
@@ -25523,6 +28520,7 @@ tl: { # no indentation
   version = "1.6";
 };
 "screenplay-pkg" = {
+  revision = 44965;
   stripPrefix = 0;
   sha512.run = "974795ca0b4a286077e38f4b3b120cf9fe243d450b87b8397adec2c5425b865cdfbe70b86b815d513edb6ae7051d9ad3003fcd6a15b5b02b624dcd4ee0534164";
   sha512.doc = "9aa4407d1b317442dd76f762af5b673460bbbcec89e47835521688085183e00ba9dbb70dc9e86a95235bd9a32da701c846ceb2985dc70894ca8abe334428a532";
@@ -25530,6 +28528,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "scrjrnl" = {
+  revision = 27810;
   stripPrefix = 0;
   sha512.run = "39198edddb3a3ce24bdc0d9cc6f5d7ff204b142c200a9ce36060bb016f1e1e1750b83210a91f1eec90a205c5a4923704bdc0e44876c462eb768355407597a05c";
   sha512.doc = "bf6dc1704ce60f9323b68d39502fe95d4eaf8409bf65c278e64deb1ff80aaa84f16e294ab08629466b6f8c0ca02ec03142abdf3fe0a43f862352d0ec55dd410a";
@@ -25538,6 +28537,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "scrlttr2copy" = {
+  revision = 39734;
   stripPrefix = 0;
   sha512.run = "7aa7ac841d667e627056ed0ef3e55368f580e9d8a35a35239780b12d0a18534086844009ba1dc40a1b6ef29ad64d06e1e2e8ffef216e89c15e684975acd87192";
   sha512.doc = "08e87246b20cc0ea9ed30cd74993aa2af520d8b01878e1f54c802b5beef4347c087ec36f32220581eefe933a524c813ec30b3235989453ff8b7be93ac35b725d";
@@ -25545,6 +28545,7 @@ tl: { # no indentation
   version = "0.1d";
 };
 "scsnowman" = {
+  revision = 47953;
   stripPrefix = 0;
   sha512.run = "87f207b478799ed88deaed71b60bced2158d6bf4406e6cbbd533f9110004cb8ceec71ded31d3706d8033bc53b1f0f31cb25877af9c58d27a5f350ab79572328b";
   sha512.doc = "5050ca6200a7531bfbc31dfd9f06d4b6503e832fc09a7132ec76a5ebc09bb0fe4743ef09740ff9646d4fe93a31ee9fcdef6091fc5c50e379c86d529d5df51f25";
@@ -25552,6 +28553,7 @@ tl: { # no indentation
   version = "1.2d";
 };
 "sdaps" = {
+  revision = 53795;
   stripPrefix = 0;
   sha512.run = "a7ebb52da3c218f45ad01a954bed7262a47834006434136d533b1b81c0ed7485ce5793ad303c40cb0e01cbd75273ca6db9c2e74c1d5d01eeb3cc92bc7d50d380";
   sha512.doc = "91fa4bc4e57e4695e93ba512cc41e0fc6ff8c15925ada551914977559e329055ad43c2220d4790e4563c1176dd5dade9f3f648ef3f4f5897694b83402e5d0e36";
@@ -25560,6 +28562,7 @@ tl: { # no indentation
   version = "1.9.8";
 };
 "sdrt" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "6faa9948e5bb4369fefad7d2b1a5f2bf39baf8b98e8ad3b8f61ade2001b431894ddfbd61e2f1ec73ed767b102f79f8357d965a5c3805c082d8d88bda29e10c6b";
   sha512.doc = "570795dd0c4fe0450e628f61e43d05f3e969488890eab2ee1364712e812d839c7b3185c7ddbd27c44c486e234afe36aceb4824e828cb0c9253e8e5479b0b6c15";
@@ -25567,6 +28570,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "sduthesis" = {
+  revision = 41401;
   stripPrefix = 0;
   sha512.run = "10f1c0a749b9b30dda0e1c7dce4ef2fdd29220b4d77d03b8e71d8c3a460a73c98f8d16e27e6bbab07a66bf7a23cc9d3bf2b12db523232df1142a8563e0068ed8";
   sha512.doc = "afa02606e7df5655ef46b59e92dc54bec9e8f05deb1d9ecd8a0546ee068f2595620cc8dd39d04ea8db53ac7f2e9983ff01ac2646b6946fd3619db64a0bdad332";
@@ -25575,6 +28579,7 @@ tl: { # no indentation
   version = "1.2.1";
 };
 "secdot" = {
+  revision = 20208;
   stripPrefix = 0;
   sha512.run = "7fb101dcd377cb5e3d1dca352d266af419c6fd83e4f2d1701a3d598e69e8e7f70afc9791a76337f4833da612cf07989ef244af1b24eb62ee59dd5f76225aa037";
   sha512.doc = "7ca1b4102c6f92bfc6dd0571c489852dc5c1df4a58530aea490098192ee256a4df7e0bbee20adff78c2b35dfe39b8cd3f821c5e45dc6d78ab4865b6f08ad8488";
@@ -25582,6 +28587,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "secnum" = {
+  revision = 53657;
   stripPrefix = 0;
   sha512.run = "8e54eb92f9f9c2a07f50e11fc3c68bc39fe4da3eabee3658f24b76c85e8effa8c4cf72a26dc30a8fff9a002a5f66fa1cf349f2ff5ef1dc51eec7c1ae3c0ffe15";
   sha512.doc = "e9c44b617d479f9850ad0e408c1c2edc36025f2e1f1e812ecc8370586b22c9aa05f74381e0fa6b1ab39f239bb18e53cc4665482f2b1f3f3057fbeac0f01945d2";
@@ -25589,12 +28595,14 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "section" = {
+  revision = 20180;
   stripPrefix = 0;
   sha512.run = "8b3eaecd49f8b7046bc35df079541121d76757bc2a1b6a6ffa24357a20e9ec4bf5a7b65fae1673401ebf363e46ecffe3c64a2de9aac104594b2b111cd10426f2";
   sha512.doc = "91defb5391b9e607cfaf74ac3abe53127ddec379d7a7c052f5c8f776bcef1728010a94ef7b590ddac8df140ee11fff4fd843bdbe1a13efd322a9a939ea2df39b";
   hasRunfiles = true;
 };
 "sectionbox" = {
+  revision = 37749;
   stripPrefix = 0;
   sha512.run = "d1a4da6a59c0411baaa785c58350c1d5be9c1081e0344d8a61fc009f49a1b751a09f358ba1baa3b645de4eff7d69e3781d8b44d90738105c0f56723da36efdb3";
   sha512.doc = "80ae58336eabd8169781c3c30b42b2583f78ffa4093a7d3f9d9e9c6e31a3fb8f457fd42d56f2ff75b2ff3c38b537642dd6f254e54b3112538657a37b3b4e0410";
@@ -25602,6 +28610,7 @@ tl: { # no indentation
   version = "1.01";
 };
 "sectionbreak" = {
+  revision = 50339;
   stripPrefix = 0;
   sha512.run = "4b2c26642ba346acce5aff9678bf94f76d85005464f80eaae862a522bcbfa34c1671af79671982a91208ef104a21a532d851dcc785b5c40de4fe462d12488832";
   sha512.doc = "a98eede394708bf612f593e00c58b5500a35b5173381c1f149d0be29b49fe95f5162602177b7d4f23c5b5312d7cdf47ea6ced8bc285853d2b7d77926a6ca66b0";
@@ -25609,6 +28618,7 @@ tl: { # no indentation
   version = "0.1d";
 };
 "sectsty" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "7e164b14f29a385f8a97e09ad124c347a154e316ac2eb41e0bf9f161d44f2782995fe271b5472ef90dfa4ffdd5495de81090b44f5777243ea76c9f75fcbde2b4";
   sha512.doc = "69d7fc032c06d015d7a6e6d2273c5240b146062565882fca0ddf5b7b795b788207bc9b478366a0a40e4acf223b07482f5cf41a65dd9b37047bcbf12566f6a826";
@@ -25617,6 +28627,7 @@ tl: { # no indentation
   version = "2.0.2";
 };
 "seealso" = {
+  revision = 43595;
   stripPrefix = 0;
   sha512.run = "4d52687aa57245d3be55bf486b100d61fe2e2d979447c2f123f566c3aeb13657e531ace55fe5d00eab57cebe89cfd3729a71dc7177831b5192b8c0fde452d7df";
   sha512.doc = "6baba95b6b08ef95f2966d227161ea39a4084b46371967057266ddae155b115fbe4fcf148e1afc4629e33f54d0329ebb6169f1be4fdcb801d869b212d056cc61";
@@ -25625,10 +28636,12 @@ tl: { # no indentation
   version = "1.2";
 };
 "seetexk" = {
+  revision = 52851;
   sha512.run = "8da27529da3e020f1853b02ce17f9481cfd3c32eeec9fb123d544a9d63a978831869036a1251e6b73bd007e0a5f947c1a7f5e2ae8004866631f1895a51cd14e9";
   sha512.doc = "e450694c39ac2f161cb60b6e8e0d95db29fb6271633dbf3cbd48beb6ebd01946d504cc3282a207738994d42eeefcbad5620aa74edf057a965e4952bbfe914259";
 };
 "selectp" = {
+  revision = 20185;
   stripPrefix = 0;
   sha512.run = "1674c9c9d7afbc851f8c4fad1b46a1ec18161eb48375d892c947416ee97791addf92f75a69090c95a0f08bbaac1a7a745af93a7bcf91e2e0f8117ed3f3106dc9";
   sha512.doc = "7c99f0400841cb1d88af4c239f43eaec7c0b2358c2e581866d4361cd86b9eff413bc9e07d8df630ddff8d4f37193896bd430f4c357d9cc04591295f18ebd09aa";
@@ -25636,6 +28649,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "selinput" = {
+  revision = 53098;
   stripPrefix = 0;
   sha512.run = "41888a394e4c9adc60242e4c689b272a7b4e2a2db2e4824e0068a305cdae59c1edd46b0a9e45909cf29381f240693234330fb3488be68831136f8f04a72faca6";
   sha512.doc = "918b0b2bbb8230a482418c56de8081bb455980e178843b0ea84b18435c1fbfcd50a71cd0491b89c5797a374479060175219333bbde2ab28b5147cb5c3fd65ff3";
@@ -25644,6 +28658,7 @@ tl: { # no indentation
   version = "1.6";
 };
 "selnolig" = {
+  revision = 38721;
   stripPrefix = 0;
   sha512.run = "8b01d1b6f4e6f83efbfc603be7c510d3c8435559b1272f3e8beae7d0de04ac889e04d539c689abfbfb8af5ff2d04c38459320fec333a122c3b60a1a79a0b115a";
   sha512.doc = "afc1a84aa85f3da5e5d121de0ee37f5347527985b3a9ae75abf0e51edc1d5371e831b5ffc7218d9863b8ff717554c6f469adec908f02f5d9be3bd4f6e45fc1ac";
@@ -25651,6 +28666,7 @@ tl: { # no indentation
   version = "0.302";
 };
 "semantic" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "d49c22d4982a33177fdd73c5ff15a68e663c3ff1ec9a45a40e5a8364371a25b536dd6c1dd963296ae998760178833b5f2c357119f41e7bb5a72061f0f9ad23fa";
   sha512.doc = "21e9a7efd9fd6dc28be30f284285cc8c13b266eb03c9212b30f97b761c1383e1fb84a18e92437d331d3963068a68c61276cc1fd3446807bedc954a490fc490aa";
@@ -25659,18 +28675,21 @@ tl: { # no indentation
   version = "2.0";
 };
 "semantic-markup" = {
+  revision = 53607;
   stripPrefix = 0;
   sha512.run = "f795c901ec0b133520cde8e269364977638d410d6d06207d868e6151e7f43a4d3c54a73780237e2dfb86b9077b0724fccbd7e9121d51a64034f4bd604a38008a";
   sha512.doc = "f1498e628054e91f7b0ecc0fea7c926aa55d7bec56c3c13ebcc5073f96df84e8c1e255532f9ec72b8133d21511e4f5f2996d95c39c15cb74ae39fffa87d5a785";
   hasRunfiles = true;
 };
 "semaphor" = {
+  revision = 18651;
   stripPrefix = 0;
   sha512.run = "b8741be1544d8ab488632e05464cf607069f0d09df7a727bc05d06175dc16bff461d551e7130e01edbb53863d56fbf4cd0cc9085c51186e19e5f2fae986b400b";
   sha512.doc = "ef0c85ca5e86a17d59c03255d679d54cc8fb36eec02c8546f29e1c514408559788d1dbe3ac7565224b320b71e9ad77979b1092fb0f098a1c48c3a7093b72b172";
   hasRunfiles = true;
 };
 "seminar" = {
+  revision = 34011;
   stripPrefix = 0;
   sha512.run = "63173000935f741b7d1e7dab2fa0091bcb758ba36dfca0b6c745ae165f6b5f3aeea7972319078f175e231d3e0ebd3454d2241a2bc4f0f36ee51bac7bb7287a56";
   sha512.doc = "0bc4ea04a561c8a8c17f4f6ea493fa98e12e93cefd58b0aeeb0b09823f2b97028d945f1c9199fd1a5ab10e0b695079a8d97608474a4d04640496737640a9993c";
@@ -25678,6 +28697,7 @@ tl: { # no indentation
   version = "1.62";
 };
 "semioneside" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "cb3f20a7f766681f9b7748ea3a816fcd477e6685a159b071502716c708e0e1d5a2a33a5b210cd1e2a684a288d07079870ad243218dd74e80853a227fd445c884";
   sha512.doc = "8d6b1ada214f99028ea9843b4d5a85a8a974a9ab52e8a7d9338d25341282d6f1c8ca4e7a24271ec20bc4be781f418f2ffb558ef4fe6e6f42d165bb24650b54da";
@@ -25686,6 +28706,7 @@ tl: { # no indentation
   version = "0.41";
 };
 "semproc" = {
+  revision = 37568;
   stripPrefix = 0;
   sha512.run = "ac78e19197af3c72863ee4ca94842d596189d37c2d559ac1254f70fda1011943ddd7ce17b48f183b839a6610f8d7dbded2a0f2a18453823a0c0044a70841dcf2";
   sha512.doc = "2c7e2a40348b098037001928d6f21f5a66c23967dc63296ce26736b006a46f9d9536fae9480c1f0d0db72ed59973a6140471bb110702fd5cb997fafe03133dee";
@@ -25694,6 +28715,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "sepfootnotes" = {
+  revision = 41732;
   stripPrefix = 0;
   sha512.run = "a7333a9779ebca371aeef0a1348968d8b4649ca037e88f6e8a6f5224d13265202c8de8d2ce5dd89de170ddc348cfb04f5df92e249c122a608efa8fbab4daba98";
   sha512.doc = "eb7d70eaec4bf58c85964f7a3692da09894c898f712a119fc0ffa42429be2e53b96ed6f569fcd37aff170d2b953543992bcc693e264ee1ec542c435be2723414";
@@ -25701,6 +28723,7 @@ tl: { # no indentation
   version = "0.3c";
 };
 "sepnum" = {
+  revision = 20186;
   stripPrefix = 0;
   sha512.run = "4ba90558d397f0c047ffeb01620d2d5ed4bc38431ddbd75d9a381fac58360d78270b8f22e761693a8a39176d1ab92c9da3b6bf92aaaa90b8ee20490f5b70f50d";
   sha512.doc = "080b081b101ea57480e4c958e997f5b10d22c5de56a60c1f415248ba0564046560650ae589b29c73d185fa88334a26ca3412e996fcc1214ef0b9d20e71bf18fa";
@@ -25708,6 +28731,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "seqsplit" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "02413d104e12aad40f093731e2d28d0354216d3d57e6f811609f398b8122bdbf906f78cef38f355562efb4e7df6dca314f8548d8d8c03a2a9404addc42f0e1f3";
   sha512.doc = "0c49425b619ac62da4eb2392c51cb7726d9bab008910a88ec36b866717c8ac341be0903e3014ed36a30ac701fafc453a0e319470f2f65eb6775d6ff52b9f07e9";
@@ -25716,30 +28740,35 @@ tl: { # no indentation
   version = "0.1";
 };
 "serbian-apostrophe" = {
+  revision = 23799;
   stripPrefix = 0;
   sha512.run = "4e3998b6c3f5578929204c0b5f131b0ad4526057b50811253b6a90367327c63af5bec386aef54ae6c80be7a1ecdcc6875bbdca532fab864e61837cf16855750f";
   sha512.doc = "38c8ac74b304ac992bad807f2727a3e75a727a77c5bfe5042e24a39ad305162e828ca0333963a3f91c5f26ca0324e7feea97dc6ab84c1cfdb6c26b05ed5f4fd5";
   hasRunfiles = true;
 };
 "serbian-date-lat" = {
+  revision = 23446;
   stripPrefix = 0;
   sha512.run = "420b77a36a08e75f8020edffed704ff0398115a6bfe694fa46957ad8b35c58435ecde4c16176a72bbcbcd16139502f8fb679399852bfc9000df6d5f305fbb04e";
   sha512.doc = "5c10fe13a4e1d6117ebfe8d737d50047dc97483c7a0cc287a9e79d367af50ec1cbdc0800161919b92c6d82774c9e756970db71344259028c254fbf2c1fe86219";
   hasRunfiles = true;
 };
 "serbian-def-cyr" = {
+  revision = 23734;
   stripPrefix = 0;
   sha512.run = "6cbd1da1160519914db1a2269a54f1f81442d84750b15179e4a0f4e5373512c959542a789ef39a2803b68030bd6a8001fde777e907e85852703ff696ec9e5113";
   sha512.doc = "0f2a2fb44eaef8e0eb01e12260fa310d661501c3e1dacde2882199ce4bd5323c837704fd50e8db5b4ba567a38038b37be28fd834874262de2e3ad36b65816498";
   hasRunfiles = true;
 };
 "serbian-lig" = {
+  revision = 53127;
   stripPrefix = 0;
   sha512.run = "d9b5d42c565d5704ab516302534238961ad42e971d3c3b4b4672d4cc19927ac22a871735d88c362b753640d457597911fa269ec30edb5c1c0af96820299c6720";
   sha512.doc = "6ed0551c176ddd34e1a4eb4449fd78ca38c166efd41b31c78dc1e192a714fdc81b195cf83587f256462b610681136b69960867d5f1a571a5b1b47256fca88f05";
   hasRunfiles = true;
 };
 "sesamanuel" = {
+  revision = 36613;
   stripPrefix = 0;
   sha512.run = "bb7b38ff9e6494fb3150602008a66df5fd8c35dcb52a2da196cd177bcffeb40e284fa493b296f01f22864a5bf25d89fb4c079ff4d9fffacdf37dfc9de9256518";
   sha512.doc = "cd144c93693367bdda658fb1ecd424715849fa57f0aded627125db2703947c8b5886df9ec08595592b6900327b42e8cff00f0c69967075321bd7cd1064054f3b";
@@ -25748,6 +28777,7 @@ tl: { # no indentation
   version = "0.6";
 };
 "sesstime" = {
+  revision = 49750;
   stripPrefix = 0;
   sha512.run = "5c5ab4808645230c6563a08b8243f27fad02a76fa56296f4c7e1b17d2140ad0c9ab0b6ed02e27240f596113019afbed52dc5a9f5efd874ba7783c921b81416c9";
   sha512.doc = "93b986ea6853761fae06b297b951a7a46ffee403a4fc980aa1afb7cc42c15fe753797eecbacacbfb49b0119ac9e24dc105975acf72852eb0265dc4586f397bc2";
@@ -25756,6 +28786,7 @@ tl: { # no indentation
   version = "1.12";
 };
 "setdeck" = {
+  revision = 40613;
   stripPrefix = 0;
   sha512.run = "817474bc928883f4bbe97391a477bf492a4e339879fc85d7aec3ca932f9b46c310f8fec5b732deb2196c705c2bd3a22721376ea8289a1bbdc12555447f12f757";
   sha512.doc = "c27f7ab563f35293ee6019560f643d562ff2bf06747402930c767031a8dccffac0ebae9cd16b9e3009b5883f594c541ccf4c38883aa89f4256f7db83e378e1e9";
@@ -25763,6 +28794,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "setspace" = {
+  revision = 24881;
   stripPrefix = 0;
   sha512.run = "d7e7f2ea7ea8ad3c0b2437a04a965a25b37d96fcc03e92a524f823e80316569db67ca4b1d9313c27e487d4914f4a7e1b4d088ba8fb6c1cb27040552cbb4c8697";
   sha512.doc = "6af94bda31c7276e7872286a1199363dc1de52c04f8cc8eb5825abda675657454f1349b619309014e934a9e5d3b80dd8d4b7a590c05d6ca2993ad3d8ceabd7fe";
@@ -25770,6 +28802,7 @@ tl: { # no indentation
   version = "6.7a";
 };
 "seuthesis" = {
+  revision = 33042;
   stripPrefix = 0;
   sha512.run = "a36006ff6a093cd589a0e328c60e7e78afc160ab45746e562a43a8944b2ab331643261f56890497b70449f76be43c0b226642cc5570dccfe0d6240181b20bcb3";
   sha512.doc = "5bbc5770bc42c62da7ca569b10558dc02bbe7fda2a463a3a2a78bc76fda3f1d0e7023c311f62a91bef73ae3c4026561403284404acc6bc72cb2e308ad4092ab8";
@@ -25778,6 +28811,7 @@ tl: { # no indentation
   version = "2.1.2";
 };
 "seuthesix" = {
+  revision = 40088;
   stripPrefix = 0;
   sha512.run = "8f2aa388faf3fc41cdda54ac44631dc2f0737b727f3af27c41bc268223d2f3f6353dc24f067ec487fe5f3ced5c7837ee6f60d46de3950a3a3c9573df77cc725a";
   sha512.doc = "1d54dacc742d558af5fb006cb4f26e073bbf6a3a572b7e81fbacf691995a4a96c72251225fb7cff598c930a4c9984d0d01d080c797f202f7e30aced20b8b3e5b";
@@ -25786,6 +28820,7 @@ tl: { # no indentation
   version = "1.0.1";
 };
 "sexam" = {
+  revision = 46628;
   stripPrefix = 0;
   sha512.run = "60fc18bf706b787b9bc59d1ff12e62fc3b69f5c6815a629f6743c8ff3fbbb2948c145278805888b235756beac5dde5613c10fe4ce20bb6536b4a3d77a2713569";
   sha512.doc = "0d2d5e2e5214622ea6b398c0b0f7a297a3f247ef3df0ed696c6faed94527b2edb6564c917d182177f8f3b44d7cd0e14ef4ac186c89113ad74e3ea70475ce1179";
@@ -25793,6 +28828,7 @@ tl: { # no indentation
   version = "1";
 };
 "sf298" = {
+  revision = 41653;
   stripPrefix = 0;
   sha512.run = "c9a262481a01019010a645c321c675bc93e3e0c6627b693bce53a808bc9366d7915c19f97871786001fbf61b589f2cef274aba005681f9b32094644568d0f2ec";
   sha512.doc = "03b1d51626e6ec0b076f4c2fb5b34daf490a671df69edef7235a6c8c77b2475e79604c7d49aed3c7d756c9fb781a7398a27596ab9b183b942119ee86385ec612";
@@ -25801,6 +28837,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "sffms" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "ea7fbce545b9e9dc8b804e293239fdd491bf1293875fa841afc5a33ddcac7acddf243194e36f8958df4d23c71ad9b83348fda57dc261f211b49fc137b66ff6b2";
   sha512.doc = "e1702249f2516dde93887403833f9261f73e90ce04bb97d4052de1a28b9f5bcd5729d1d9a68759ea92271b46cbbebed39565e8c30248af4c894c347e4b9b75a9";
@@ -25809,6 +28846,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "sfg" = {
+  revision = 20209;
   stripPrefix = 0;
   sha512.run = "d90305b5fbac3e06bc3195b802b4ef78f7c6cfb4f0592dfd300839dd608150e1ad08fc7479fe6d8df4f2429ad6b7f81692d9723dde198991fc9626565cb38578";
   sha512.doc = "26c17b606f0cfb4e199755f7f16eec16cbe379a786a88bec2d77d983d17107d86bf8da23474bc3450f8467d18028f2f41a314c83565916cf3ac3e97c5c079267";
@@ -25816,12 +28854,14 @@ tl: { # no indentation
   version = "0.91";
 };
 "sfmath" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "7ba73610785c9270e8741ba0137701677575e38cac79976d89e2f5768804ff52117c5fcbaab9b260be522f174458a18d2d70d82c2da201e7fd6a91fe4bbdf6fb";
   hasRunfiles = true;
   version = "0.8";
 };
 "sgame" = {
+  revision = 30959;
   stripPrefix = 0;
   sha512.run = "60e1c4d7f68bd6d39e081d49bfa1ecfa7dc56b940172719b4d6d0f2e87456c4b511ac29bb1884f7c290e7b226eb6ecae8f2ce4de3f7f5fbbd21934c440395ab7";
   sha512.doc = "29f4ee374c7b9d07274fb6f622c0769ff6977ce522ae25fa24571c0b7e60f1e120e4e26d37c6c340372fc0a2dde71a25121fa9538a35aa100e21637d5c79c874";
@@ -25829,6 +28869,7 @@ tl: { # no indentation
   version = "2.15";
 };
 "shade" = {
+  revision = 22212;
   stripPrefix = 0;
   sha512.run = "968be382e1f82029e7e06f5ed34473fc20fd38dc758b97fec6dbf015ca13c3604dd6b7638dcad2f80be474ad001c47ec86e75e8d9947bde26053873376e9e068";
   sha512.doc = "0c9ec337ed4c9bba949e6b449368868856d652b2f5ac7c70dd08a9daaf8a3ed3be4008a91c003c731c97f7e4132f571c44ea9d4a4529f7b0ac9be11a673310ff";
@@ -25836,18 +28877,21 @@ tl: { # no indentation
   version = "1";
 };
 "shadethm" = {
+  revision = 53350;
   stripPrefix = 0;
   sha512.run = "b9e15e017332eeadd3324afb858ab15a820e23da59f5bf7ea57dac719b9864304effd092c3cb2f25a6f29f22dd2b6f2585279edab4d77c62256582c66be550c3";
   sha512.doc = "c24f37f7f864283f9ced1da1728dd7ae137395ecda3010aeff8ad778b96723224df77755f8f71f7672f5870ad6832a22bce47bec88ae51d0992e39c0a00c8caa";
   hasRunfiles = true;
 };
 "shadow" = {
+  revision = 20312;
   stripPrefix = 0;
   sha512.run = "885bca1090b93545f59b387e952998f65dee0931fb5b680d06667c3bb8172e2aad37e840942b9495134b421bb40b871633eb5de941b3a257618751e789128ca6";
   sha512.doc = "402e64195e247cd2c5106e3bd621705b80c006b2f6cf0b1da14ea459acb7dd97e2ebeda87ec118be3e73bf76edebe3067330498a2875c52c4248add70d7a0a25";
   hasRunfiles = true;
 };
 "shadowtext" = {
+  revision = 26522;
   stripPrefix = 0;
   sha512.run = "59ab708b0f8987838cafe864cdcd68aad5aceb7cb4b3ab2b479ec4fbd15e268ba4fdd1b0143b7c247cc186a825d99ad810839221a391eafd5146f0a46865e23d";
   sha512.doc = "a89bd6ab160e364af06e26d9bbb88988c286befb5dfe4e4bdfc7c511811ef4a1ef630708d4a7ff32cb0ab6831dbee54d49a84376ee9366bd422d5689d86db404";
@@ -25855,6 +28899,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "shapepar" = {
+  revision = 30708;
   stripPrefix = 0;
   sha512.run = "407fb09d162a3f361c7182f23b010d25bf5d0d4d645780c1c9679be422a50f7181a8184ea391505d258afda822059f0d7d60ad24321adffa05f37d56d0376605";
   sha512.doc = "4db069b9e52935f0ef1463e40999b7f7893ae12b68f6bb07a105f83199b839e6ca3366b7367f6b38f79c4febfbf3a8c1f88115244f59a306870fa4617ade478a";
@@ -25862,6 +28907,7 @@ tl: { # no indentation
   version = "2.2";
 };
 "shapes" = {
+  revision = 42428;
   stripPrefix = 0;
   sha512.run = "4e082b6b61ae9f2d02c6bdf7fe5beeb6b6384b2718c1644b945b175bc17c951ec7890fe7e81eb59faea4ae86da93eaf51467450cd61d223e734408e624bd8abb";
   sha512.doc = "2c295a28748f8df117a5abf16a758b079d7481f579e1bb571fc758bae505860e1a1b82f9615259b14359eb4ea8f43be82de6ae6d761225ea76bc0da167b6786c";
@@ -25870,6 +28916,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "shdoc" = {
+  revision = 41991;
   stripPrefix = 0;
   sha512.run = "e72e5d88966ab88ce2ea331f2989a949f3da30cb1066a0501fe8770f077f8aaf15803d9337ab266374364fdb7b35507c6d3cd181e1fb472f6d39b6ef94c08c1f";
   sha512.doc = "38c3a7302edd2e38e3196b4d3935bc001f83fc71ed50ca8c3563ccf82e9e0729c65baf0b95db0ac637cd037cd572ba557586bc85230ff6014f63a8fe0602d9d1";
@@ -25878,6 +28925,7 @@ tl: { # no indentation
   version = "2.1b";
 };
 "shipunov" = {
+  revision = 52334;
   stripPrefix = 0;
   sha512.run = "e31326135e93eaddf9f07eb0a746c83b9b6b7a7569daccc2b4ae0439664ce4a9cb2edaedc0e3ff727a4896fea43411c9cef0f3fb8455b1616de04e03b54b257a";
   sha512.doc = "3c04f8dec84f3ad87572f6c180ec783f9a879b887b4c7f860097ac03b297dd7c4a4385cb402ea0b7f09176d711050ca7813e51607cf7bba871e191ec35d9af88";
@@ -25885,6 +28933,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "shobhika" = {
+  revision = 50555;
   stripPrefix = 0;
   sha512.run = "86050c89e5939b8ffc2148f9269a48dc66f8adf396cb883a7018a1a8f123cb602f216f652f56715bebbdb7b0577a8d0cc799c847898543a4cbd22e478524b127";
   sha512.doc = "f5d9d05f54876bab260043e698fd746c95b59b04ea5b2df7244b11af30bb78e5cbb6e3511bb75d775e1bc649082575192ccbcb68fcd32b9816879b5cbf3277ba";
@@ -25892,12 +28941,14 @@ tl: { # no indentation
   version = "1.05";
 };
 "short-math-guide" = {
+  revision = 46126;
   stripPrefix = 0;
   sha512.run = "6e2c131cb3a2ce85a6718a8dab1cc52fa5dab7a3db34575dcfb0a33e6a3f3ba6025eccb82a2e07a198243bd24c5070a931e591003a768c4a057f70659e442155";
   sha512.doc = "0feaf4b3cafbac8fc78855250dc39858b0b8326b803c851efd831f36476dac2f1ce86083c11476e36ac88b44a2a8d25094f9203c774044306536fcb2b261a184";
   version = "2.0";
 };
 "shorttoc" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "6e78bca7425e0b23d7520af19494d9de303b86fae7a013ef85b2d512ee86be1f478ede2293650b435ab579811e444b570995e2ae8720afc60b42c0c26d7489a6";
   sha512.doc = "03090924cdde619877b271fbd70761035b5da1f2278a3642b471a86e83559da316558a752d85716242001f40ca403a985d036750218e78d873a4920905c5a652";
@@ -25906,6 +28957,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "show2e" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "702d0913a299b68bedec15c697868a70f058957dbd3a2dd2c503bc21c8a250dc7601e6348080bb394a38108bcd2f5ee67796a888183aa181c9f88a72e7666580";
   sha512.doc = "a427f7126ded4251c255fcaf2c381f7c00d0d0e55253804cbe631ac59be1bd51e7ba2ee51110af86bcee27d73698bb7baa323fef8e23a41000928b242b0be282";
@@ -25914,6 +28966,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "showcharinbox" = {
+  revision = 29803;
   stripPrefix = 0;
   sha512.run = "9cb18e80701d22e167b026767068e0fc0a7b6c4cdbc9014991f10ecd76d37614983591c931972584c50e0d6e35abee70ae3079f7dd8c855d33d1e4ea06693d25";
   sha512.doc = "47dc7121ed852931bdc5bc38b7fb4dfda6616b8b0ce649d90da71c7a4cb6084ddd69e07596dd4179b5654fa9a54fcedef6949ac4778b449ad14740058e237dad";
@@ -25922,6 +28975,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "showdim" = {
+  revision = 28918;
   stripPrefix = 0;
   sha512.run = "07c409f3d30def6894a787d9c2f7366abf6ee4248386e9d5b2e4f7858d692c7cd3e72871ff02c73a39a190ac36ccbaf5fe16e8e1b7b328be80a9ba041d12feb7";
   sha512.doc = "ba76568009149bec7484b4dbe7bede8e516a2c2ad20c77c70f0357e865c66751aa4f3d8c92c59effa1ac12e03b3b8c500c65708547ddf52458b0ce90def8fc98";
@@ -25929,6 +28983,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "showexpl" = {
+  revision = 42677;
   stripPrefix = 0;
   sha512.run = "b937f9824793206b0fa55eb77f6c2688364d712fef66c63244a776c95e733d2b0e4535a2d63b23ad446e50fa52804bd99305ff20bce6d74e880d3fdfec432924";
   sha512.doc = "90fbef0962c609d4a50aac3840c703c6d421553425dc0d41a62883e012e4e2a8627a2f98f499b8fe984bfa57b597ee65e274d6e5bb9f30aba96b8b1bcafe0211";
@@ -25937,6 +28992,7 @@ tl: { # no indentation
   version = "0.3o";
 };
 "showhyphens" = {
+  revision = 39787;
   stripPrefix = 0;
   sha512.run = "e3dc83cf25d0006e4ed0b2181a7cfaa81a2c7d6a7152d9202b2d9ccc876a773045abcb055709a33d69f1efd80c11edd642364e13fde7991730755d944c35afe4";
   sha512.doc = "2e87bf2fb7eb014d28e44634fa8c307bcbfa4e774c1b279a5242b3c99e569dc1eb64d5f0ba30958d0ca84c5c2bd770ce3de81af98981a3e01a2c5bc8575c9e02";
@@ -25944,6 +29000,7 @@ tl: { # no indentation
   version = "0.5c";
 };
 "showlabels" = {
+  revision = 41322;
   stripPrefix = 0;
   sha512.run = "4d805bcd319df51219c956fce18fffe3b91aad3f468f54f5b6fd9ca15f8c24df10e1092252ba6870fd406c024deb054c60d7f64dfef7194c45b92a8a78a9da1d";
   sha512.doc = "0a8cf29e85526e92df738364607e31927223458a969c117d40a0e9cf3470e5c4050107b9fe915ad2a23720a2dd4f5faa1d43d9737b9b7a6f6105de3a36e9888b";
@@ -25952,6 +29009,7 @@ tl: { # no indentation
   version = "1.8";
 };
 "showtags" = {
+  revision = 20336;
   stripPrefix = 0;
   sha512.run = "b70dc03f22838dab65631d39d8690897d4a5c71b5451775e85cdc3ff600d63afc29bd28e49aa64a5a2467143f4a84d62f5a2a9af4a8365e0a867d6a46e9de93b";
   sha512.doc = "3e1efebe8edd469e66b18aea9d9a3614b753a43ac61f5a31b57fccc1b45047aaaee8f80d156932671f9ae7457fc627732f1f72c65fca42946280c1182d8960de";
@@ -25959,6 +29017,7 @@ tl: { # no indentation
   version = "1.05";
 };
 "shuffle" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "62b456ae961d34908fc25cc085bfa04d39e70f2641d65dc8e0eda419ec96a328798cc258162ebe065285f3ee1088e6076525ccbd8c0f7c0800024f371bdee65d";
   sha512.doc = "1b6427fa0cf98651a219f1cf6f15a400c09ea924bf0dcea7d48ce0665a5f1828ad64513f87089ea48d02d489d8020c90c661bac60c069601be437c77364813d4";
@@ -25967,6 +29026,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "sidecap" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "c0b775c16ea9acc7de952c6d08d49f57ac4517d5a78e822255176ee1f570c17d584b34821a255ec10e7fbb9334fc7904147bc4d613ad4db9553a3917f737b924";
   sha512.doc = "5bee3d448386a2bd508dcae495c6fb83806542680db7c5fe8cf35ea09a955df01e5c01fa64c28b64f0bb9a3dc0411fc68a835e1b0ae9d46c1387f544538d26de";
@@ -25975,6 +29035,7 @@ tl: { # no indentation
   version = "1.6f";
 };
 "sidenotes" = {
+  revision = 40658;
   stripPrefix = 0;
   sha512.run = "4e8fc132974ce90f3e08bb3b2770c88faba2dfd7a9f63bbf0b6b900811fbdbb2c625015e8f181968918a5965a32da8ffccf2e5798f44ad4327a6bbbda785c708";
   sha512.doc = "944b4d77b6923328732038d273aa74b14689e5177b4d609c81735e189556cea7f66ce81c89c41e5ca0d6b9871e412e21d836024a5290f31a3fc419b7af4bb34e";
@@ -25983,12 +29044,14 @@ tl: { # no indentation
   version = "1.00";
 };
 "sides" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "739e26e0c0b77d75e91f2a3a18996aa55ee1163a2bee6d489db4ba3b0864b51572c55ec53441946f16cb87694425d09e613abd2223fba2941fea4be137341b10";
   sha512.doc = "653a8472a278bb1d33d9f86559398b62e32b521c6ce8dd977dbbc4f44183e37b95378ea4b29356948735c42925f9ed25153cc6a9009341ff01d80befe2bcddb3";
   hasRunfiles = true;
 };
 "signchart" = {
+  revision = 39707;
   stripPrefix = 0;
   sha512.run = "d379bb1a9fecc06f4e48419d0f4f49e50b6b276e15e64992ee7e154154eefc24e71c060066de3bf9e97da6c8e62b78208f3a01918150cd2ef51231b5abaee44e";
   sha512.doc = "7b140f890f3342ba6b2d25385dcae6925d8e445a862af703578f455b73c69cb71f4b9b5a933ac8b1a16178874f71c80d124c352b5aff4d7bf3dad6f1aa5a3874";
@@ -25997,6 +29060,7 @@ tl: { # no indentation
   version = "1.01";
 };
 "silence" = {
+  revision = 27028;
   stripPrefix = 0;
   sha512.run = "95f4f095e0f70dcd11482be4f6d52c5ea7a06ad820c08386ad956b9bb9ad593410e59fe9bb5904c3242594d466c495e7793718d4cb707ed3edd1d17ac3c1c1a8";
   sha512.doc = "988df943eaf9337145d081de38ac22389bbffd3e94408b1cbb5de7605cccb47e2fa837813d4647c339d978b5b9b3e82e6d9859b840e89c09c95dd9572db0601b";
@@ -26005,18 +29069,21 @@ tl: { # no indentation
   version = "1.5b";
 };
 "simple-resume-cv" = {
+  revision = 43057;
   stripPrefix = 0;
   sha512.run = "996341ce711f6f9a68ccd7e0b315da98eed8f4737d44b8dbd9881c2a76c8ef2d04b1c956333b0e33997d57e0b62bcb2485029283bb4f4711c2f8e38c177755d7";
   sha512.doc = "a380b2a498bde69cef1ba2401e16886d35edb40e3338963bcbd6e862da3e54f547e7900a18f668515b3ff178462a4ea0d41bc228b6b6e7ea8b0693e295231e92";
   hasRunfiles = true;
 };
 "simple-thesis-dissertation" = {
+  revision = 43058;
   stripPrefix = 0;
   sha512.run = "201826e649acbc8dde933da3d141408ef3e4f3bc5daffbd520a19885af612f17de2618fe7e8c78a419b6e5e4eeeaa36a2fcb3db6f610df2189e01e0b4a66e9e3";
   sha512.doc = "8dd82147b1096f728fd52a56c39309d0f421abdd972a1297b88b516e0a5ecf8387a3accc508047bcd3996ab81d778dbdd221934e2bb4c96e1ef2a59cd0fc6995";
   hasRunfiles = true;
 };
 "simplebnf" = {
+  revision = 53370;
   stripPrefix = 0;
   sha512.run = "452c83082541e5e1c41687f9a6191f5bc86241454c34f3dd775671019a3e5ddcc22f7c6b2203f7b07aa549a5a84b2047af89ecad9a4ce43075d89fb490653acd";
   sha512.doc = "8e47242ee6423bdf2c2222a10f4197a615e59bd6514a14b1d3c657b9669dcf2be312c334f8b98459d9953ff36d3584b0b47c25c82e2c23979a738f9aa9ba82e9";
@@ -26024,6 +29091,7 @@ tl: { # no indentation
   version = "0.1.0";
 };
 "simplecd" = {
+  revision = 29260;
   stripPrefix = 0;
   sha512.run = "5fe4024ce7991242fd60b8a87c88605f68ef9595895857b56981b35dabe96c97f9af684fc5ca9c3089ba96791e076512ccd549ce70071d215eaed4e731145b30";
   sha512.doc = "5cd208f8869dc989542bf028c216fbddec5bfb285ffc18c25cfea928035946e903cc2b61de630125d8e8deea772f7f20cab552505538eaa5d3aecaef8192abec";
@@ -26032,6 +29100,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "simplecv" = {
+  revision = 35537;
   stripPrefix = 0;
   sha512.run = "c67e9200925ac86386efaab35a8edbf20f0fda700c00c3b0350eadbe62f39fc02f502493a73acc768a4727ad1162561d7baf38193d57d1fefb4c8083ebe38c35";
   sha512.doc = "dbf087e0659f11b4dc0cf40a6826cc45f48b8155d9148262877a0d51f5766888780698d792f055666766f029ac6f5384b41c0fc41e1c84548582e665eccc0f20";
@@ -26040,12 +29109,14 @@ tl: { # no indentation
   version = "1.6a";
 };
 "simpleinvoice" = {
+  revision = 45673;
   stripPrefix = 0;
   sha512.run = "8d3d905dd9dc418503bde7cd51c90ff6fc6f688502ff871040f9eb6bf96b6c1ef999d3dd98b16c8739ce9518a22a8e99a23b5cc66c437504b3837c30ea19cca1";
   sha512.doc = "81e5ff2bf76f2b35549feb9b6336bd04b9273d4e6b951ee327101d4e5a5d3c429276735238b63c3b2ee03466b477ca2d7990a68615c1d0eee4f12a37d6b65472";
   hasRunfiles = true;
 };
 "simplekv" = {
+  revision = 44987;
   stripPrefix = 0;
   sha512.run = "a67e5e977a4a14b32f3dcf08ffdf4b481a3926e9a5a7259b19aff07c4e311b223edacfd5bef8f9ecac4742dc94e7c65400cb9d883677f96d3d7d1d6256efe5be";
   sha512.doc = "6a0e0a7200bbfad56ad6729cb375fd11e105cfc89ba93fe592d14755a88d819b69dc3a383f9fe3c59f8a9076450ca5fd75085101d7ceff4a62e2d738b0907f15";
@@ -26053,6 +29124,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "simpleoptics" = {
+  revision = 52047;
   stripPrefix = 0;
   sha512.run = "85da18717b1907dd50fec7ecab0f90cc0f26ada24965611ed9f2a3114b46e58affba11d8f71173e4c2858054670814a67061587408a02343df355db18f3c74a7";
   sha512.doc = "b1ce0a90eef3755141db1f533da69959f8e356fd1a8028765833fe613e6427101a1d71776ad01108fe0dddb83bd786977e644124806eeeb036e5c011986664f6";
@@ -26060,6 +29132,7 @@ tl: { # no indentation
   version = "1.0.0";
 };
 "simpler-wick" = {
+  revision = 39074;
   stripPrefix = 0;
   sha512.run = "2bead248c2380e19fb19012ba2cf7a41fdd113f48a372011c27ebac0820236500c5e49e5235e2c52fcc5a0f9c79f61cbf76a5d6de86322bc40382f5499216783";
   sha512.doc = "d8a45e06707d3e6c39e36d83020f0a2d4654cab508d91e47022320e67454d08958cfd6d3872c5ae40539f29b03080915e136746452afb9f2e74fe8be2ec20bc1";
@@ -26067,6 +29140,7 @@ tl: { # no indentation
   version = "1.0.0";
 };
 "simplewick" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "86aab23f8d19e9fa5a6251f8f725ada87b66a71a3024253d8b56f3edcc20f26695b2194b710f691ff9ed0713c993a8652447674ec84d4084c3354791244a6f10";
   sha512.doc = "bf0c3b8724ed8cc41635f45001fa04f655a7b37792c5b0e632578b066649c3bde1f894c3ab739ea2bb49f6e4f65e63fd7cd7d515ea15b53ab5894778a7918d13";
@@ -26075,11 +29149,13 @@ tl: { # no indentation
   version = "1.2a";
 };
 "simplified-latex" = {
+  revision = 20620;
   stripPrefix = 0;
   sha512.run = "31313aede3900675d183bfcff0045df5fa7719b982df1822823c15d645c7ef64c0b46e0f1690d98d30b2a6057e082684f23cb61a490fb2217887d0f20231ce73";
   sha512.doc = "f5bf92ed89cfc83f306cd4b2599446a11b73f73a0b82afbd0f441e26d837e6f436913bd2df18585c5e215fa0504bfee3d5d4f5ef4da8925161f85c70c14045e6";
 };
 "simurgh" = {
+  revision = 31719;
   stripPrefix = 0;
   sha512.run = "11b77f831aff6796e41ccf2024496ae1c9d4b9b5f4c029daf33e0eb4b4fd3d1e5c78137b945e3c9fe7a16380365fb88165a46e614dc3078657ce025a55f90d44";
   sha512.doc = "30ddd7a9bbf3f568ad4876336228842651d8f95eb5f21df81ac524b99a7a695e68e0469f79867668dc3b9913cf223b72a22f6a0d0c818233c081ba90ac67de1a";
@@ -26087,6 +29163,7 @@ tl: { # no indentation
   version = "0.01b";
 };
 "sitem" = {
+  revision = 22136;
   stripPrefix = 0;
   sha512.run = "64a34fcf0769ed4ab4b201facc056b890a89009e1847e9ca65fb405e1c1144225e8fff59c1a906341521bba5d39e3338900a9a35aff5bb716a5aff5e6aa4d49a";
   sha512.doc = "af74d7b4f4dfce45e543494344fa32f4f4d55435034cc1b23b24b333f89d54d0b8c9d0a1247561bb7182d3841fb04b7b3531be847a6fed3db212497ef2ccec3c";
@@ -26095,6 +29172,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "siunitx" = {
+  revision = 53914;
   stripPrefix = 0;
   deps."l3kernel" = tl."l3kernel";
   deps."l3packages" = tl."l3packages";
@@ -26105,6 +29183,7 @@ tl: { # no indentation
   version = "2.8b";
 };
 "skak" = {
+  revision = 46259;
   stripPrefix = 0;
   sha512.run = "7bf473f1f35fa05c1cc7cccec212b035619382ce850c287a6b0734cd52182046df35133bd919a335532db9fd5327d2038ce1c3e98342055d93a5dc3b16028697";
   sha512.doc = "443d98538fb732bfe9f3df26e05e46be54641006df255d3084697301cfa93f48cb8d307a9a5b58f25742b96065658f446b52968c3bd8ce14fdc864f32cb920e4";
@@ -26112,12 +29191,14 @@ tl: { # no indentation
   version = "1.5.3";
 };
 "skaknew" = {
+  revision = 20031;
   stripPrefix = 0;
   sha512.run = "879107f0bb96441082ccc4afb560e4fd0f625e7fb7cab84ebbd642af1ef180bc27540eb9ff26c689039dd6abb11e9b88bcea30d5b1e75b40f0e3499c981ae6e2";
   sha512.doc = "8c26115910f2e9a9ae28e1b6c0933db3308c9f59eb151bb37b23de3f0f790b9726aef895def0826e00928b75753d925c5c9db0a6b91ebf7035fad5a4e473a315";
   hasRunfiles = true;
 };
 "skb" = {
+  revision = 22781;
   stripPrefix = 0;
   sha512.run = "5c2e0e7310898e258505cf438ad91650fbcef6b720e9d05b9ddd241ceca3eea0ccc3a71b6ac38acee58d8e205b8352ad7abbdc277596ac74f6a5cf0ca805a0d7";
   sha512.doc = "29aa9629f84a481cee1871b92b49e1a34683092759864f1e612ef4f7b3862a9ddf567b2d20fae3f99d5946de43055de2dae8ad326000e344383c854eb9ff4f20";
@@ -26126,6 +29207,7 @@ tl: { # no indentation
   version = "0.52";
 };
 "skdoc" = {
+  revision = 52211;
   stripPrefix = 0;
   sha512.run = "3f4bf340f6076f00101cc8be20d284d487672d544f0c17efe41cc1b6f469df90022455f23b790a8289151cbcc81cc3f1e846eb242321221ca290d97ead9ff2a8";
   sha512.doc = "b3a4972162cf366c5db5820b0075871f651c817a36c915841717d4856b5078a9de45b7043ac1cac0bb8e4b9f02cfd0a89fdb53b0723475950c182bfe3ea6bff9";
@@ -26134,6 +29216,7 @@ tl: { # no indentation
   version = "1.5b";
 };
 "skeycommand" = {
+  revision = 24652;
   stripPrefix = 0;
   sha512.run = "0aabcf0a47ffbdaa2f88bfb970f844df36cfa30f2e5ff02cbd9dba2179fd871c2ae1f979a99e70f3f7f2ab2589b7ecbaa6f999352559100bfaefcbe7f6ec16a8";
   sha512.doc = "26f7e544e9b1b75fe7131d409c3083c39914424c66051e46535de5415383d82e48a3e2c1d35e34e5bac624a034f2e14623c8cd5b6844707b09fd531daaf7c544";
@@ -26141,6 +29224,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "skeyval" = {
+  revision = 30560;
   stripPrefix = 0;
   sha512.run = "151a705f5e62dc80e8a470a7ce39cf197933452a35b296e70790d7ec0f6667f24acbc0c643db6c402ca1e9b9735f34be388efca5a5e5951725e8f00bb8d2833f";
   sha512.doc = "97bf20706cd14e0b479221c6ed96e56754aca13d7b72f1d7bedec6117d159caca2a4e9a931d3d8311f593a538985d8e4e5bb9d5a76a653d72aa8d094a66e9e92";
@@ -26148,6 +29232,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "skmath" = {
+  revision = 52411;
   stripPrefix = 0;
   sha512.run = "6cbc67d9a6fb9cb6a3d8da38ff83bbb6dbd28c5e3e81a07a1b7292472d9064f321206ebd4ac1917d80f138f9b9cf91c008b8e3eac27ef0a77ff2073cab08eab1";
   sha512.doc = "ce579b82a84f81169bf1a6cc37fff0c2e7c4e1570d0cbe2eb143dc8ac6dc082fa3cdaecae5a31791aa590c89fb74a58a4451811ec66d38eaa146520ff16e7471";
@@ -26156,6 +29241,7 @@ tl: { # no indentation
   version = "0.5a";
 };
 "skrapport" = {
+  revision = 52412;
   stripPrefix = 0;
   sha512.run = "60ee0f76dbf9e1539c08a97cf25cf14d2fbf02527facc3764c57cf0812a67d740d5c3148a4a7e76a6880717166c935b34bcf38de0b4f7d02df9c1ab50046a2ed";
   sha512.doc = "986bb0ce679b69bd9a0958b6d4d1a3fac49ac6a5e31bafa5d556ac28c2bc3d0d8c892e998791e74172ec86c5899acba2cbd193dfc685e7dcb0b5d47b4c2e3576";
@@ -26164,6 +29250,7 @@ tl: { # no indentation
   version = "0.12k";
 };
 "skull" = {
+  revision = 51907;
   stripPrefix = 0;
   sha512.run = "261ba31f30fa26e25f82dfe60ff7600c71db51f1dee68a5c094fa8a746995ee9031e41c0f24a4e83aec52c603cbea71a0773cae63481f167b81abdfb0ac3f782";
   sha512.source = "3967550eb9af93aaa3fb9c623437e2c6ceb90f52f20533832aae3be91c719a774e3fe6a51f4d1543d6547479a2efa6c1965f0870174cfcd5c93cef0c20aecddc";
@@ -26171,6 +29258,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "slantsc" = {
+  revision = 25007;
   stripPrefix = 0;
   sha512.run = "45d92cb8f2a5aeaecc9945ce2778f2fa330b703ea0efb2deb4407ac17d30ad3a3e1ae7966474af28a7816dee18254422fe7c72c50f11f47cd52a54522f05fec3";
   sha512.doc = "8f856a45e3088d2047157bc87d60a16b6c6e481334f4ee81a23e4cb8ecf53d1113849877ffb24ee4516dfba228c10c9974b0b0a148020d64e3069ed7a2d12750";
@@ -26179,6 +29267,7 @@ tl: { # no indentation
   version = "2.11";
 };
 "slideshow" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "f7bd44c9720512297f15ff6cee1c49ca52c29fc206f739e6aa447e778fed00a64e282aeab9d42b215cac69a64ab39f3919433bd0640d30d55ac540e2dde07967";
   sha512.doc = "d271c1f9e7b9c45694463982da8c9542fea326d7e191a705e92f5b423e054c3f926768d2209844ddabbe75eb610d4a5cb05ffd53098cdca9e35328c865027eff";
@@ -26186,12 +29275,14 @@ tl: { # no indentation
   version = "1.0";
 };
 "smalltableof" = {
+  revision = 20333;
   stripPrefix = 0;
   sha512.run = "50a4878bddc55e1b05ede3e770aad31f6c56b81f9e6d0a536ece25729e3c5a9a1720068534f26a9c224c101f0e0d833478f1a5c3b12759d7c3ffce027bbd5edd";
   sha512.doc = "ca62aa29f6ad62f149dd9c5077ee2b14ed69d8a750f33d3de274ae275e5d1528482e58140a78b0917cf02a879206194e24a6beecd33060544abb50dd6fc564a6";
   hasRunfiles = true;
 };
 "smartdiagram" = {
+  revision = 42781;
   stripPrefix = 0;
   sha512.run = "322589506d1cdaa30dd9f97b419347fba0d617a3ad35fd15fe91611b10382c595598ce1111a287f5b1aef617595cba77b53490da7744b23942f072f522a68ef1";
   sha512.doc = "1cc7abaed3dcdb11fca675bea8e458f1879bda4ac72278566a9247ec2cb0016f10467e3120e9ef688c5674af05559bff39862d4b3292596f0dafd5e13672a14f";
@@ -26200,6 +29291,7 @@ tl: { # no indentation
   version = "0.3b";
 };
 "smartref" = {
+  revision = 20311;
   stripPrefix = 0;
   sha512.run = "149dd95ca0677a4e273df64a589d1424b8dd89983adf3a3ef81f8236d1b594d35b851b4255fd9f0d05b4feb82db59d816408e3ca59f2b86b73a5724a8e937367";
   sha512.doc = "07eaecd9e924e5912e8e3a3ba6479412282e1408cbb59699b9e83006768c4042b173d38da2e8dd2c707b392cb48d99e4be25985023db4de80d69450fe95a338b";
@@ -26207,6 +29299,7 @@ tl: { # no indentation
   version = "1.9";
 };
 "smartunits" = {
+  revision = 39592;
   stripPrefix = 0;
   sha512.run = "d4c23a39d79cb5c0ba700da40b916ac6072e612d0e5b8ea1c189100cfe56fe77c9d1ff742d92fc44450255048d96f2e1dc2b5f0e098e56aad5efcdd423fec608";
   sha512.doc = "e85b83a090b3e352a0faa61ee0f3dfc84d3f2fad8f1ef503aef7bf571e706575b19c1da394b09e69968b10fff2542b5b749a895eb17e84ce1293273532d2e241";
@@ -26214,6 +29307,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "snapshot" = {
+  revision = 52115;
   stripPrefix = 0;
   sha512.run = "b153eb4fe8e5ed8cc4d135edc3dcbeacba094dc73587a2b15255f725cd03ebeb450c562ff94e9d87927a6d04d95ddd66e30dd84c0fa664a1e120a190667a72ad";
   sha512.doc = "14f92e7c36443785174f515c2fffa62f0bf253b4bef560de68cc9cf446fdf7c447e5552a1995dae0f26499e045c8e7baa991255f81b2b43c7bc27158083a8994";
@@ -26222,6 +29316,7 @@ tl: { # no indentation
   version = "2.13";
 };
 "snotez" = {
+  revision = 30355;
   stripPrefix = 0;
   sha512.run = "e1e6ecfd64a317745fba39643c70ef5a71719e3c4ed3644569ab7a4a549a44eb58d1fd1d77608fd455282124d0e7372a364f95f7b67de192b1cfca1a9644086a";
   sha512.doc = "6ab47280669285be6cd72e2027b939ab2c2e2df7c910b5775dcf02b570ba558a3c89832a45d65cf1a8a649dad67606a2d2fe3d4e477de67098dce497f0c2beec";
@@ -26229,6 +29324,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "songbook" = {
+  revision = 18136;
   stripPrefix = 0;
   sha512.run = "06f81b35318ee9844565f622b5ecfb0f323373f14acfed3fdd042a244537c313fcc974c8cc556011baed16c5a7f90b8163342d36e360749db240e6eb639351b0";
   sha512.doc = "a8d98e2d3b90ebfc4e8df53ebaf92f2d0deb95034bf234dfeaef1d38213af9a36e38d48599e6e78a7e87fb966de87db821f4de7a6fd50f57c1afb515050bb510";
@@ -26237,6 +29333,7 @@ tl: { # no indentation
   version = "4.5";
 };
 "songs" = {
+  revision = 51494;
   stripPrefix = 0;
   sha512.run = "dd1309fda1a7bff1236707cb45047dd5adc582d3e3f509f211af7a30c0469cde704773af48fed379a29307201d9781150487821219f76d45d556f1d27e420c08";
   sha512.doc = "72c374aab68334b050a5d801299179c8484b6fa46db8c8e20b9fceef3cb9a8c0c1dc51de93f34115d4e34767233179c5872054cd03ea3e622abb63a49ad81f24";
@@ -26245,12 +29342,14 @@ tl: { # no indentation
   version = "3.1";
 };
 "sort-by-letters" = {
+  revision = 27128;
   stripPrefix = 0;
   sha512.run = "41e7db4a4c5242493aeb099ca103f4540e038b1e91ec0296629f4dab1ad013f98b26b664c7d661dd2f53c1e5c749509763c46f51bb823225a104c125a9f75f4d";
   sha512.doc = "e2b6c68a42b9364d44dfa06ea93d8c8ea2444d97a3cf3c111065b720d3706b36315a7c8650877f1d6a2a72c1aa42268af4f17fc4632032e1e3c0a2d0fa08e577";
   hasRunfiles = true;
 };
 "soton" = {
+  revision = 16215;
   stripPrefix = 0;
   sha512.run = "59e9e0bd127e44e1a80ff7dccf1fecb18b34a54c379a46632b13f82d80648229daa54c4655575c52ee718b02277c4e2b264451f8d3fe58abd60e593d0826c97b";
   sha512.doc = "de9b03e8626535d2633af3884e373d8b25fe6d203af75382cf329aeb7b79c745f94c6d08d49a69b42172f4bad3cab2048fadcc4ad826a1c1126425a40289ecdc";
@@ -26258,6 +29357,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "soul" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "7a4ee70527282c50f28bc535ca34476538158b6fae6e37008cf5f04cf3caf5cc01ccb859967192da1b159b1026afa3eddede2cd86c3d63f469e6e2f6254a80f0";
   sha512.doc = "9b8831cf9c013fcca715a8a7100b76f2de364f55e8203899779ba18868e637cbb0d00d982098a3e42191dc63ac41afc65d2547b9976c64110e7b83f5f8d0108b";
@@ -26266,6 +29366,7 @@ tl: { # no indentation
   version = "2.4";
 };
 "soulpos" = {
+  revision = 52663;
   stripPrefix = 0;
   deps."oberdiek" = tl."oberdiek";
   deps."soul" = tl."soul";
@@ -26275,6 +29376,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "soulutf8" = {
+  revision = 53163;
   stripPrefix = 0;
   sha512.run = "777ebf7b4215b9a6e31ec284d27345de2ffc7c5d303db0e21bd31376692e528688deac59c2b49b84bf2088ab42523523adc284dd1d8fd5aaf7a074923bf7be9e";
   sha512.doc = "eb3c81518312b6c0cc5b622bbf2b7ae954e42b2a813097d8c3fa681daea0a24c9df14d189ca5d5f2adcbfe479029bb985c3d85278beb6d9694bd61aaefd32103";
@@ -26283,6 +29385,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "soup" = {
+  revision = 50815;
   stripPrefix = 0;
   sha512.run = "478c8cba8623b184db1c9237b7a805219bf1ffb7ef45280fecf7cd75a1720ca0ea2e1e1ad73465ee20dbc2bbaf14667d4707524edbc073dd4fbd0537dbeca8c2";
   sha512.doc = "318cb98167123bf8d9a5f80db8e31a31f6f61536e938da3b68efc0dfec6722bc898d8295d32896c24d2842b262f22f70e08014c07755b6728dbb2040f64aef5e";
@@ -26291,6 +29394,7 @@ tl: { # no indentation
   version = "1.0.2";
 };
 "sourcecodepro" = {
+  revision = 51163;
   stripPrefix = 0;
   sha512.run = "45c41d470f0e84cc35d4c06cacc1beebd7891e98326a0e0f6462c7dc0fdf1eb9f4e0da59ced33e47c2c93c9662eec31efb8cebcab471350eb2c1c198873268e0";
   sha512.doc = "7f8ca211769e3b626ba98f8d7265b7e383630c2d22496f03f79bca629f164374de9bb8601e903fc094c1264fa8b4ab4bef1db3b9deafef65ab41c56c27e8d8cc";
@@ -26298,6 +29402,7 @@ tl: { # no indentation
   version = "2.7";
 };
 "sourcesanspro" = {
+  revision = 42852;
   stripPrefix = 0;
   sha512.run = "23b6a26836ec517e833c1ec4155b5da60bfd03ba093fadcbcd418658d3d36a8cc41914349cd117bf2c5eec4121bcd7e29d6c50ca8ce4e4728b729fcbf089d3ab";
   sha512.doc = "963cf63732836329490ea1521ae0fd09e55591859ea4430799f32606c3710e44b7e203dabb4385821830043c12e6f19795951f3e4aff7abd173d8ba5d4d788ee";
@@ -26305,6 +29410,7 @@ tl: { # no indentation
   version = "2.6";
 };
 "sourceserifpro" = {
+  revision = 49120;
   stripPrefix = 0;
   sha512.run = "fbfd4b6bd8f75079272feee5f01c0c4b47aecfe89e382cd8f288453dffd6152bf7bab3ffbaf4d90c544f01a5943d280df061b757169f3dd27970cccdeb1f79f2";
   sha512.doc = "530b5ee29c8cad79ab359fc8fe225c18fe15483bb787f24c91a523ae8ddeca47aad5bf16c6ffea2465fc90182d5de65e08a1bea2f9015e710a03aed846510676";
@@ -26312,6 +29418,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "spacingtricks" = {
+  revision = 52063;
   stripPrefix = 0;
   sha512.run = "6dddc3f6b839c16902a590184955cb1f220fc5d1d2c2accaf4bebb70ceba0f446ffb5cee8c8649261d22df79e556016361550570b04f22c3d61644db2d188034";
   sha512.doc = "bd416ed7ba7dd3023be779ce3d67d1534fbcecf49c36c5b97ab29006f182e77f2882b0c0646da559b6132a40d97723414912bdb920804c5c1bf40facdb0a8c52";
@@ -26320,6 +29427,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "spalign" = {
+  revision = 42225;
   stripPrefix = 0;
   sha512.run = "6e00399e0940778a6ed8326abce14f15836bcb69f8e7c67d06cdf8567330ce0482a213c7b65c2662e0fddc47ce7b684a640e133017eca314b59eefc278eb6425";
   sha512.doc = "534f2c39076a6ff243a8e4cffe353a569b493b90fc1bdcc3db43229dda3955f013de15ce1db7beb38bc9b8d972c7430a24d64c263041c82e84c799f446faab0a";
@@ -26327,6 +29435,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "spanish-mx" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "cb638093e1a50de3fd67720ae21e11285337910f98da86db79613f73878084b93fc8afd998b4422b673e3daceaa2ba7aa76b02efc98003e741b74449d4c94af2";
   sha512.doc = "0b257bd5ce8a7332fe6cf1f5772a464ffdc525e80794dc89600e9ad279beb1f39523fabfcd2723123a458787d7bfd32ecbe0b2962b4abfc3627275862e05b97f";
@@ -26334,6 +29443,7 @@ tl: { # no indentation
   version = "1.1a";
 };
 "spark-otf" = {
+  revision = 51005;
   stripPrefix = 0;
   sha512.run = "863587da0d6a03267dd36437b112be4a1391537d7186db0f9acae2d5c3721b2a303d7b2ca86d47a619b9265930fb4795f87522498cd34c80d057ef56d1b8daa2";
   sha512.doc = "2b3a9fab8e29c1fd9bf1b3a3f729d4d728fd22d6dba86aa746febac2eafe59df1afe65f557c9e3c816983eeeab8d798bb4f54712be8f5590706bcc49a2e50199";
@@ -26341,6 +29451,7 @@ tl: { # no indentation
   version = "0.05";
 };
 "sparklines" = {
+  revision = 42821;
   stripPrefix = 0;
   sha512.run = "5dc74f46a819a6539034d570d4bc11403cb9f4617e2e6e373cced6cf335630e4e5a3d919041ac67a8b114b2d53c56871239b67a6acd6bc47f8c6130171d84824";
   sha512.doc = "4db42aec14145d4b73fce7940563f6771c3d994955006cceac7c93c9d5d5e2200fddf6d83d15e4dde0385f982c0ee85fc844914d80aa249c3ac2e86a49369b38";
@@ -26348,6 +29459,7 @@ tl: { # no indentation
   version = "1.7";
 };
 "spath3" = {
+  revision = 50018;
   stripPrefix = 0;
   sha512.run = "44417164e54d212ab18925af95cf4105d102ba07ea37e3275a59906637dca173db5de5e58ed3759ec61a2be96d4d44dcf3b2f7c811021acc2d0c0c6ad28ec64e";
   sha512.doc = "04ab2a7ef15dee7fdd418bc74f699c6afd21cbd912ed8d12760d0be5b5e4fa17f66b23e8e9c83ff8ee1a2459d95da483dc9e1978236c32d6c40d429c9582cc37";
@@ -26356,6 +29468,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "spectralsequences" = {
+  revision = 50072;
   stripPrefix = 0;
   sha512.run = "71677e3cba37f228acc096ae916793cf214f90d30809019efc67ba0793b5176da1a3fe8fab592ca80a077164948c4be777237f71e895515e519f399534cc0cd6";
   sha512.doc = "80eda3718c3cb2daf9f3a96a6def78011be1d7882eb50db692c2d34332a5aa79a44e0201445f67d1623bcfc3618f79f6d158a98a91572796674071143f017789";
@@ -26363,6 +29476,7 @@ tl: { # no indentation
   version = "1.2.2";
 };
 "spelling" = {
+  revision = 30715;
   stripPrefix = 0;
   sha512.run = "ec32c627f52e1cc08f893aff21d43519ac30169772e82793525cfd61c302883c9c0c8444f2d51cd03a94f55e1ad589afac1a404a47b87ebbe7855acde887e511";
   sha512.doc = "a51b8fb45701d318dd9b9736830b83ac34c84b781d61a3a247263167d527aad7cdb6e1917ce260d09e0304fba38bb2e2a25288f75aa2335bef479918036e1221";
@@ -26370,12 +29484,14 @@ tl: { # no indentation
   version = "0.41";
 };
 "sphack" = {
+  revision = 20842;
   stripPrefix = 0;
   sha512.run = "b2cd588384770e0d95bf6e5c6b67df0ba8160e0a01e3f64932d67debcf9fa836212aafc78c79b8d28aae8124a25aff73f4846db514dbfc0a65a519eba75fc52a";
   sha512.doc = "6b490ee2e736a6bf1ddf32d5db605ab5fe77f079d585c2e377bda73a688a7de575b99d56c6626d9888c395f6a4d181cd0b42e77dd5673c8456bb0e029510b8d9";
   hasRunfiles = true;
 };
 "sphdthesis" = {
+  revision = 34374;
   stripPrefix = 0;
   sha512.run = "44c467fc1de689bc198acfa224aa1109c47bcdfce8b161673752f73d59877465b0c4b87f1fcd4a8f589a78fb05ef5efd42edaff2fbfe7910a1ab7b409d9a7e5f";
   sha512.doc = "cfcd8c02c68a990cda426d737914d195c78d98e0b8c9765128aa8319d47d27163e7d072ea50d312a394b85e8ac1e580dcbd204fcf6b670b4dc519d1f09ce8d72";
@@ -26383,6 +29499,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "spie" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "282ee645ea5022fc0e325bf211b358236f07c6509883a254fa4e1ca0728fd73a4be8889e4919eb5e0ea9c203300359808b4d141d71d0c158a71a3d10d982264f";
   sha512.doc = "1242f49f1499b798977eace516487543c23dca36471b1e49a2b1377a84083f40a3d5a2e316624f8ac458b61c2cfa406fc3580209c9629739dabaa2fa35e6b806";
@@ -26390,6 +29507,7 @@ tl: { # no indentation
   version = "3.25";
 };
 "splines" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "f040046978cf51bbaf3347406e224fe60a85f449c1fac1703e7a2d936140b099c14ffd488ebe4c3d932b35a8380f943250734a054ea5165ed26b2be712ad577c";
   sha512.doc = "08532f43fb7aac979e78d30f27f36047d7b70733ef6bdd65d26a40e6818f2b73852d4a6ac5eeae8cd29fc86e1630d2ba068b9707666f66a13e2090a6da81ac25";
@@ -26398,6 +29516,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "splitbib" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "2936732fdcebff683e240e139ba6e1e4268dc72e427bd30af0590cc3dd7dcc8dd49eaf6f007e549efc5c429fbcea2b37f9e68040d1ffb023162c571341abdb40";
   sha512.doc = "df266ae77aaccf91b08931c57b01a9eefffe6a469c4cc549ce41640dc9c9041676539e1302aecfed88d19baef277f507ede8ba6f794dae6ea4745b1338459d14";
@@ -26406,6 +29525,7 @@ tl: { # no indentation
   version = "1.17";
 };
 "splitindex" = {
+  revision = 39766;
   sha512.run = "858033eadfa82b4e40a388356f64002370a5f4fc2c95565eae90c68373f708a3c9827fc4e0ba8094659382aba4e5925cba86632733b15d85ea6a82f73ace8737";
   sha512.doc = "c8dd92e955fcccf71b412d9750fff7b6f214e929ddf194a6496a79a146f4837af3d773ed3f2303546727cc4a8fb9d5366dd75b64d3877e6121ce20315f71997a";
   sha512.source = "8aa928bdf6f2e8fb6274c1fe8d0b4567d03a1c6ffbd078726bf6a36ff1bdab981d5150cf0250602a64d2a0a9be92695fdd399c04d041b7a9579a7d3a71910151";
@@ -26413,6 +29533,7 @@ tl: { # no indentation
   version = "1.2c";
 };
 "spot" = {
+  revision = 22408;
   stripPrefix = 0;
   sha512.run = "95a7bf0a9e04e7157fe27499a7a2d2bf3e8d86f284e9c2d150c40b5efc1786d4820af20ccde7f5b649a775d7a13d25a78347138a200335fc0b9e4165dd3e1f0e";
   sha512.doc = "26ee8b13622a46078e8199c818dc353801af36afdbf67707a6942202fa458e7cbe9a000a4ea022d0dc4ec6ddb3a63c6adadf240cf207778765e47b2db636ea5b";
@@ -26421,6 +29542,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "spotcolor" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "6748982e7007323414dd8ca5f1ede105bb2bfd0b0f8d2f83c8731926628c094c8c08f0cf4ddadbaa209e182f8af83ed6fb761142ecbb97371752473b33c44ffa";
   sha512.doc = "4055f42161bd45dee74974358eabda875e9a3d62690fec0486748cd7fe974af133c24e56bcfd240c6928334fd9c7e1e6a6935c45b974760b41f7ce080d44f568";
@@ -26428,6 +29550,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "spreadtab" = {
+  revision = 50147;
   stripPrefix = 0;
   sha512.run = "e662188fc94f3f31031238a9b20ce617b01adb65dfcb5ba00cc0f90555a151957747e9b24803436d0815528d945e3a65684ebffc04dc5de2552989c81bc80846";
   sha512.doc = "e7e1184c6d5013a5f991325e1f47b509b90f32022530281263bd5b1c0d9c9082a872f9b6ece3198ccdca555e1187546762c8fb4fcec9a75f72894f6fb49825c4";
@@ -26435,6 +29558,7 @@ tl: { # no indentation
   version = "0.5";
 };
 "spverbatim" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "0b26e941f77264ae2db7cdcf2c4459c26601f6079e0bad24a3ea0edbd22157c324bbf50426a794655dc1aee710092cd9b662bb401838186e42657fcef5c1121f";
   sha512.doc = "245825f18ae835b984eb6474b927a579f80b6c6feefbfe02a53f8b7ea5a48023e1bdb43b39f090afe4ae42937d053cbebfec6ff97d7732d754287401a95fc641";
@@ -26443,6 +29567,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "sr-vorl" = {
+  revision = 39529;
   stripPrefix = 0;
   sha512.run = "135186b501bcf2a9b338ff13e330401ae3ca39db4225f639549cc929991d2177804b44ddbaec805ec1cd56982b140cec4625e7564fad7f4de89d2c2e06ad60d8";
   sha512.doc = "a65dc0b7a12b5435d753aeeaca7643747c94463835cf1706e042710272cc0eef66d4f5f827c99034f9126bcbbf7e41293196f9ee29ed3f9961b9af27e2879747";
@@ -26451,12 +29576,14 @@ tl: { # no indentation
   version = "1.1";
 };
 "srbook-mem" = {
+  revision = 45818;
   stripPrefix = 0;
   sha512.run = "5cae41da74957078b2b0ed38c9fa4186006f24abca804b879641b4bff5324950b1a59296c5733fcadd2ef05661ff1dba8cd7d9a2c5f9e2a5c6bc1e6d993ff218";
   sha512.doc = "5e06fb85b3398cc65372fc0c82eaae3d807c6c908eedbfa8f4ea593ea6213790c3fe9c5142990a9b7d4c267ed01cd61aef4fb950a0c2b51424b0ef5e1f2aa520";
   hasRunfiles = true;
 };
 "srcltx" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "2edad3f8b56fafc034d94a3e3240190a8f4f1a1054c9b81d6dd9fa5426abaec0b29118f7bbec909ffc3534693b8941fd4e44b6670d7dbcb852fa3a056ba63fad";
   sha512.doc = "1f8428bccf142790a3221d470fb66dcfba40552da0d8aeb9cab62732c5a5ee0af3a565774e29822ebcf0c1e4d7a2bfffc61a0944b762ffbb7ff4e8901a61ab48";
@@ -26465,12 +29592,14 @@ tl: { # no indentation
   version = "1.6";
 };
 "srcredact" = {
+  revision = 38710;
   sha512.run = "9e11ed88fbbfc0130f43fdecd8fb0b3eecbdf50eb33bdca57bd34c860cdfe84dcd560371efba4cb261e65aaf4577306f478d1c43ed89152e7e21fd627eb7328d";
   sha512.doc = "dba9916acf75e800af1e581b4276e82bfe4c421a500a400773354766b37849568c1f19752a75983374ca41f793903f9776423888215f00376db1e0f5f3b3dbbc";
   hasRunfiles = true;
   version = "1.0";
 };
 "srdp-mathematik" = {
+  revision = 51600;
   stripPrefix = 0;
   sha512.run = "289d92617e5657326f93d5668563cd1067bb67c8e47b3b1b5bd318c4dbda8b4328d3605bcf194ee31cc779d684af8b7abb837b6a4f675406434b23f5081d1cf2";
   sha512.doc = "fe10c56c4674982df74e82c5390699e4fd70271429e79b95be9d56cdca574af4d940b654e92953739b62f21a38ceb8f52d6830ed3f5ddd02d9dd7ce0916c9001";
@@ -26478,6 +29607,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "sseq" = {
+  revision = 31585;
   stripPrefix = 0;
   sha512.run = "25d3d2af859d8ce83f7449470be02bc4bc77b8ac49c4e10f49fdca51b0a85488f01cbf5f826b07fba12806c932125a35197be2c7bcc330f9b6f51a331fbc77c6";
   sha512.doc = "3b5516fa412aa19fe8f3d23706b3046b6af698e8307db32cb895fb13eb876032c5c3fc908a69f0e18efc2ac5802a95957246d58248dd05e1fe25409d46a8bd20";
@@ -26486,12 +29616,14 @@ tl: { # no indentation
   version = "2.01";
 };
 "sslides" = {
+  revision = 32293;
   stripPrefix = 0;
   sha512.run = "5809b9968b16d35d5f76f185687c683512883942f8ff3537a7dafef3a76e5fb017a4bed36dfd102fb5edb93648148861c78f6f7e93aaea8c5cbc8113c05278a7";
   sha512.doc = "4a0fde19b43390f80d6d671933ba51b0be854d774d6f35f3e8fb33653ef7784df85871dc4fdec03f2c734e819af6c1098e8be152e0bd42740ec2f4ae53c38f4a";
   hasRunfiles = true;
 };
 "stack" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "897ca71e1a8531485d9807743e4549a994f5e6e22dbb9a958466d4bfc7fb1b4579af0d7ef701146b8142c394fcbfca70bfdf28779530e487a0ec868c77985c23";
   sha512.source = "d10c0b9555df5643d266cfcbc51970cb7d606c80053225e4c3891b49f59fd9831c89f8be97d41e3e70b8855defb2af709190631e71a470a061959486162d5ed1";
@@ -26499,6 +29631,7 @@ tl: { # no indentation
   version = "1.00";
 };
 "stackengine" = {
+  revision = 53843;
   stripPrefix = 0;
   deps."listofitems" = tl."listofitems";
   sha512.run = "13ce66f2a3335c62db5bb2872596480572e106e1cd594d8b787684f1fd3ea4b57ee015737e7e5dd053b526bf52b6ad20a84f4d4db49d9b888f55ad5b637894c4";
@@ -26507,6 +29640,7 @@ tl: { # no indentation
   version = "4.01";
 };
 "stage" = {
+  revision = 53915;
   stripPrefix = 0;
   sha512.run = "3e59c8794ba63b4ed5ff0a0e99fadfba4371a93ec2076a818dc0c84b00b5f555ddd09caa89128ef52f59bf888609a045c522adb24417040a321407e4d7d2b679";
   sha512.doc = "f047288e15f2ded21da1a6e1288951f3ff480c60b31dd3e43aff030e8a3fb111d87ce13b5f98a07e03123ac4f0a81e3661dfb433b389f088e8318134a5677712";
@@ -26515,6 +29649,7 @@ tl: { # no indentation
   version = "1.01";
 };
 "standalone" = {
+  revision = 47136;
   stripPrefix = 0;
   sha512.run = "48fdadf3c9e7b899ad75953baeaa9f47384d1bcea0ae08c94ee51b4f2fabfe2fa244a0b9a77f11fd038aa106551c4cb9e0ceb06292ab1ff7bf6802a65ad677fe";
   sha512.doc = "a5cb35587d86034c38584218b78fe4142563306a8d918d676cce0a970f593cece78bfb755d42b9fda3c0286bdd4a0bac231f8b750ed61acf6199eda6d51a3dcc";
@@ -26523,6 +29658,7 @@ tl: { # no indentation
   version = "1.3a";
 };
 "stanli" = {
+  revision = 42765;
   stripPrefix = 0;
   sha512.run = "8026823a73d9c061eb01e2b92363b52314c4de4d48bc8557bf33b89cb5381ca4886dcfc0f429f5be9268f3f1e64297ad974485edfa6af025e7744474a2ecd565";
   sha512.doc = "f97363b3d9aa6f0701c3ca89e7c3b2391327ee431fb71b5be599805a4063baf1f5517868fc3602de8d97aace79d6dc1d58fcceb789ae55b85a7c0824429f3ebb";
@@ -26530,6 +29666,7 @@ tl: { # no indentation
   version = "3.0";
 };
 "starfont" = {
+  revision = 19982;
   stripPrefix = 0;
   sha512.run = "1f45f97813f5e51b45e1cbd3246b877aad823895a4b087294d0754c560db5796d8b4f9d09972b5c90c4c569db82a2d70bd1c39a9dfe6e1fcc4e0deeceb44f876";
   sha512.doc = "def94e1e2995e20e282d9319f763ddbc5e152a48c18ba98ef4d168e69a9a6deb5d7d87923a3259553f990f2da73c78929858852c6165acf7a94a6010382f786b";
@@ -26537,6 +29674,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "startex" = {
+  revision = 35718;
   stripPrefix = 0;
   sha512.run = "840a60057867ea8439c0497eb22dbd8ca8c8a2375887d74ea383a8a356d5de34a389db3df5f4c41082683d1108a0f88cb31c25e4c3a56a27e45b8ff5b62da4b5";
   sha512.doc = "d2076580253889e51a07ebd094daeb10a9ebbf2d9154d288460a84d7b2a581b849d1433a442d8eb911a9d2110e87ae4eb0628567b50eac95cf9c6866d3c34b3f";
@@ -26545,6 +29683,7 @@ tl: { # no indentation
   version = "1.04";
 };
 "statex" = {
+  revision = 20306;
   stripPrefix = 0;
   sha512.run = "66fb0e346ddd4902ac98a90fb7d0b0193d8c8166aa30774dca1f5b6007a3e19c3b98e25bbc88abc379e199720b6c9a2c73caabbc515db2a54b2a8b437c5b270a";
   sha512.doc = "9851bb7e2e9af03affa1f4b5750817543be9e985e02d06ca4908ee1ebcf0eea2b8d75a25cefdde3492efc52d86be5bde6fc2f6a99f935c183cf3fc9041ee0e25";
@@ -26552,6 +29691,7 @@ tl: { # no indentation
   version = "1.6";
 };
 "statex2" = {
+  revision = 23961;
   stripPrefix = 0;
   sha512.run = "dc823a25cdc70bac79c69e721feba69883a99e9e0a5b211398ff0682af4fe4bb1c4a7feeaecfc7c12d2df876b8aab6be0cb8868df8b8eaaa10850042615226a7";
   sha512.doc = "6f0b45577bd4383359dbeb592c3f9e3c1a66d1b2540cf6027ffaa20f8f644316cf2feb0e585f42801b43b529632efdea52fc2c83f2a6d9347cd443da27259646";
@@ -26559,6 +29699,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "statistics" = {
+  revision = 52212;
   stripPrefix = 0;
   sha512.run = "b0f2c288a57cc64c72bd2b862cd6c40b62e7404c4733b25af64b43d008b277417bc72a4398734e5620e6d2b9f97b401c1d54ee69b0a1ad5947ecba798ecfe0b2";
   sha512.doc = "9d3f7b94c6d144b89c1c947645e4e071933b402e350ef6405d533bdb0a6aed650b215a135976410fbd3a68ceb0fdaf6c877f2d7435680f8c70f3a2209c0808bc";
@@ -26567,6 +29708,7 @@ tl: { # no indentation
   version = "2.2";
 };
 "statistik" = {
+  revision = 20334;
   stripPrefix = 0;
   sha512.run = "2d2455227b5db15235763c4fa677b549380d66f2485d1d53c2c607f96bb4b4a176ae9868419351f691f3efc3117e6e54be3317040f2a6f8d1d105cb86709f86a";
   sha512.doc = "88b28820b5d2a4a304c26658e27da7d673bf430a6be3ddf46f5eb3103abb7e8d20b03e30b65b88583960f9cf3dbebb9088330621b99e1eb9f2f28c0684638240";
@@ -26575,6 +29717,7 @@ tl: { # no indentation
   version = "0.03";
 };
 "statmath" = {
+  revision = 46925;
   stripPrefix = 0;
   sha512.run = "128532a808c4f8cae9ad03d19d9f70673427f9335d298d4840776ecf59a78b0051de64093f00510ef34c61d3e2ab900d4494f800eff8183a4c8451bf90a1424f";
   sha512.doc = "14754afa159041c359c85d31d8cf3483789b02a7057f59f6772455ff7dfbaaf81e793db3bbdb8d1a67e25de7a00f32c22089e2cc908cb1c2e0abf6a17eceb7fc";
@@ -26583,6 +29726,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "staves" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "f6a1aea97a3293ffb514ccc526faa71ea5ea3ab32990da8725cc3ff998d15a2909001976d9705ba13110fbde869001bec2f286e58c05f1fe31f345ecd5882482";
   sha512.doc = "b839484325cc6d06a407ea685dd705b3616d1e87f22d4a625c20dbc507647b602417a085328f9ba886766ee0fca2516da397c742198569477bc1009271a4db23";
@@ -26590,6 +29734,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "stdclsdv" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "88d8abc04d10f029a9ce0fe9025497afe3eba3dcc300631fd37baa8174bdec8dff44fbde07599ac8dd6635be27294c359c77178690a4e6c97f41d15f9d2abbd4";
   sha512.doc = "8321d823ffa159071f66d87d38fa38ba3af03f6c69999a041d765f0fda8549547da4b8eae86efce82109679284dd912f2c5494b5ef6e76c73c467cf4eb87aa2b";
@@ -26598,6 +29743,7 @@ tl: { # no indentation
   version = "1.1a";
 };
 "stdpage" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "a3835f211b744dd88e0238a01f0a5f960305f7eb92bbd9e3437474971173e66c84cbee1d5ab3f1aa1097a262a258b79085fd0d86884bcf3acc4017e7885968cc";
   sha512.doc = "77510670a49db00b185e6b502d07bd85f9ca18bedeed86277c7d51abb582f40c793c665f2ab87435e90380f7f6f740b64c937d2171531a419ccc59bed197b90f";
@@ -26606,6 +29752,7 @@ tl: { # no indentation
   version = "0.6";
 };
 "stealcaps" = {
+  revision = 46434;
   stripPrefix = 0;
   sha512.run = "83296141df9f56d0e38d04bcc948cb4a9b5e308f5a71ef3080b4b53392792d42c142a2cc5b69140233d6f00bcf7804dd1c9dff686df3debbca857d765d7639b7";
   sha512.doc = "3dd77d36d16fbfaf10993bf36c1a286506b6f80b795c721ce15b7854453af0b6041c586bbb653e7707eb057664885a9027135d199a9df7b748d23c6106175477";
@@ -26614,6 +29761,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "steinmetz" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "8ff095645447f9349d2b35ab5ccde72109eddcd85ad3c9de262833320ffcbe94c2fb08df5323c69fc64cdf173ee7193ce2ce887f1c033997455a33f290cf1884";
   sha512.doc = "e409db74c366c5f49011a6e21355150e3e97d16c1e3a7fcbf06cc8aa0db2c01288dfc60b3c79e539936077e452c40dd601490be8976c57d01f9a5a88a3798093";
@@ -26622,6 +29770,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "stellenbosch" = {
+  revision = 36696;
   stripPrefix = 0;
   sha512.run = "44b6b8149d4a5aa34ce4bc2e9e66b9bd3a1381b17ffea213b5d0f3afe5b71a62a3b85b4feb6caee4711119fbe27d46b3fcbad2a892e662ee9aac184336677d0a";
   sha512.doc = "6af215b7af75e04bf24ecf9f83c6e4b5a12013a84435e65872d4d84dadfc2231d341153b05f069d9ca927370a686b6642f4654c9924521f5d93d0d1772f48059";
@@ -26630,6 +29779,7 @@ tl: { # no indentation
   version = "11a";
 };
 "step" = {
+  revision = 53731;
   stripPrefix = 0;
   sha512.run = "dab392c9d8182e0d06605b82f123223d6bc811291f0b6ee2c35b75a21f868a5e249a330a2c0876dd1e4fa6395e11000d0f6db687aa85e1eaf1058e933fa72160";
   sha512.doc = "2f862061aa868cb2a74766270b42685f5625adfe42c46c6fb83d7d0efe5bccca2843275e9b68d11610174de193f0f754d976d64c11ee27fab0d128e63b0aa964";
@@ -26637,6 +29787,7 @@ tl: { # no indentation
   version = "2.0.3";
 };
 "stex" = {
+  revision = 50489;
   stripPrefix = 0;
   sha512.run = "43d9cb084f47b1fc2bfab9eb11ec9253fda495f29640d333c00de5d7a5681bf37e0331002938e141679b0ab10345e23d5cbff19cb33fbfa01d25be62295b18dc";
   sha512.doc = "3e936e5905f5dac9a16030af94037398c60b6b79feeb6180af4b7542eb8293a681a213115dd082d9e2df8264771d6d92544e6ec514cf40cf4a136cf74a0a6e51";
@@ -26644,6 +29795,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "stickstoo" = {
+  revision = 52341;
   stripPrefix = 0;
   sha512.run = "858647a31ecf1b3a186c020f43e8f3e7bba930f296f01b0893730f486270c8c4af83c26235484abcdffbb996fc4a3cb5c64363c7613269568ff9ec6acd70758c";
   sha512.doc = "dc1835c8806014872212c9812e1112b1765a5407530c2da786efa15ba08d11d390c4c64c97e3d5c6db451bbbf876d053e6b8baac2ed65f8acb65a5a80f531031";
@@ -26651,6 +29803,7 @@ tl: { # no indentation
   version = "1.033";
 };
 "stix" = {
+  revision = 47652;
   stripPrefix = 0;
   sha512.run = "1d4af4d903ce164b95321dbdc45ee17dff776cbecfb29ef74d7c192909da2eacf7ca7c143ee655d842999d347af8e63df683e4a216569c5954e48be54ad55fbc";
   sha512.doc = "fd69dc299f88faced8b7166025616de35f935d0726671fb19b94fce9acf6dbf6c9f041f0e4ecd3ddd3aaa8716b77939225301cc79bb0131f77bcff1429066e9b";
@@ -26659,6 +29812,7 @@ tl: { # no indentation
   version = "1.1.3";
 };
 "stix2-otf" = {
+  revision = 50948;
   stripPrefix = 0;
   sha512.run = "103ecade85ae44948216c901c487b77c29acaec1813d995f79d50497c9b273f312a46709202ff1e450ed45866a306343aaa34c912e556da1496062beadb6bfa7";
   sha512.doc = "678e183fdfef3a98a2778d7d694cb72682a2b1f44aa3595bc778b0b481f0fbbd60d3c05cc57f64edd78d656cda447b4a27505a71d942c6e63b7d35f31302445b";
@@ -26666,6 +29820,7 @@ tl: { # no indentation
   version = "2.0.1";
 };
 "stix2-type1" = {
+  revision = 50940;
   stripPrefix = 0;
   sha512.run = "7358467241a5eec7e62271395554de3a5e0aaafb926c2ecf5dbb2eec8d03b3bf054ec1366490950ca7f5e69e415816e82af3257c4ac87eb7e6a88fba1d35d4af";
   sha512.doc = "775626a232affb47e39da154da8a4d41f602fe235dfcf840966d5d60a102ae9a6f27b3ad05f3ab63c4a34746866ad076ba83ed9c2ec88f78039b56363e98756a";
@@ -26674,6 +29829,7 @@ tl: { # no indentation
   version = "2.0.0a";
 };
 "stmaryrd" = {
+  revision = 22027;
   stripPrefix = 0;
   sha512.run = "8abe58b84fff2f4fd6846b6c267f3b245fb1dfc2f38d0db54ce7cd9d456abd07627247613073f09dcf7e11e3e9c5940d8ff657327232ce638abc6babcc5b3d77";
   sha512.doc = "caf883d1c5021b52d6471c4c2145e708ac3c05c8944eaae621a3ea7b602b683ba2ef2bc0052f9caf67adc1415e7db02b5b55d3642ed82727a926ec193dd984f4";
@@ -26681,6 +29837,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "storebox" = {
+  revision = 24895;
   stripPrefix = 0;
   sha512.run = "365da48946b94161fe78447b402dfda931f7635b7a8a12fe6a4368c3b579c140b6c6037e6b04e192aaac1d768200af2fefc53659e52b813ac6956b9e82c8076c";
   sha512.doc = "89867e995ec04c8411e6ebb9919e8b94bc12674fd7e659ad6f42b17988748c98a4756268782a9fb5f46095ed2b83a877c3969f0ca8433e5f8c37dc7551c7825e";
@@ -26689,6 +29846,7 @@ tl: { # no indentation
   version = "1.3a";
 };
 "storecmd" = {
+  revision = 24431;
   stripPrefix = 0;
   sha512.run = "1987e3cffafe007d9f3cb9e0d53fcc648eca40140f5188dcb0202a0916296651c1ab02fc589339fc51999b56bfa4a06b29701aa598ec03f51d7b1ee66ecfde7f";
   sha512.doc = "feacd83403672380cc2cfe90ada2704f98bef63e905740f8f8d50767f86ddf95478efc38fb38fccadad172f27db56045f50a6af4a487f0c5cd2b6ebb5e7666f7";
@@ -26696,6 +29854,7 @@ tl: { # no indentation
   version = "0.0.2";
 };
 "stringenc" = {
+  revision = 52982;
   stripPrefix = 0;
   sha512.run = "a776ddb2378bea0880d7c17e1a87db5f66645c5856243e49de1c56bc427213098afbca34773a44ad955a0014b969c59454d3a0c0ec371d213481668f5f784ca4";
   sha512.doc = "a4f182559d37e45ca8b6c50656d2d520e3f0bf1ab63dc6477cd6e3abe6cbb5c4b89d779c380997b167019aae6fb12ae68d5fe37ea0c08945e3383f5d9905bf31";
@@ -26704,6 +29863,7 @@ tl: { # no indentation
   version = "1.12";
 };
 "stringstrings" = {
+  revision = 36203;
   stripPrefix = 0;
   sha512.run = "8ed9dc3bbc869f06126280a4dfab23da73b57a9c5c1058dd9764e2bece26840ad37637d4e83aa84e6d9a17d92095803788697b8d325bca7fd57c7135ade7cbf1";
   sha512.doc = "fd794606d8eb3a9ab27957268aae1b35b89c1bfc1b3d5602290797a6eda8551e14471d35fd85cc6d0561a1e74523a36450c958a0cf5881d42742eabf085bc794";
@@ -26712,12 +29872,14 @@ tl: { # no indentation
   version = "1.23";
 };
 "structmech" = {
+  revision = 47859;
   stripPrefix = 0;
   sha512.run = "4efa9a978eb0bb92dec5588107588346ba1a22a34e12bf43b811176d42871f415ec58adfa50a4a4bb9b72ef482395c374b9e7b979f1b779e672422bac2c91c6a";
   sha512.doc = "4eb7e209e5034c6809f8e746f63b1a5f3ed62c85cede4fc989ad6d89a9710bd15ee3e5622181ea9a450ea2b8430ae2c51ccc845851cd9fffa582e3b91b656457";
   version = "1.0";
 };
 "struktex" = {
+  revision = 47931;
   stripPrefix = 0;
   sha512.run = "3d81817eac5cc8b8bd468537406db6a26fecdaad1db269c2ceed582cae84fc2b549eaf527d4c356be7d4f2f16f9db4746251e9b69db0f0fc3cc8acd9f39d1f50";
   sha512.doc = "261a9f7ef5036bc8eebb87ba503b604b158647e82e88844758be506ac5d389103661f681689a836c0048529446bad0d6537a6fc6ba273dd2ed29abee40336360";
@@ -26726,6 +29888,7 @@ tl: { # no indentation
   version = "2.3c-0-g7d3fc5b";
 };
 "sttools" = {
+  revision = 43684;
   stripPrefix = 0;
   sha512.run = "acc5c6b470d1e5fd96eaebf3792b3c2402a8fe4a07409328878313cfbaa1e0febc758ae75c6d736e9320f6a332c67f7d6898c761b9c5e30f6658e9049df889b3";
   sha512.doc = "15292806d0f8f4a0364076fa225b7d914a4ae88935e08f87a46978f5a561405f6fe4dc2d471c974c85b369e57bcdc00a5a4759d66d296610713d858dcdd4da34";
@@ -26734,6 +29897,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "stubs" = {
+  revision = 19440;
   stripPrefix = 0;
   sha512.run = "13d9fbb0eb8fed9b92f1307db189e9f65df92470d0ed21a0c84dea2f53ebd1b4d665919372476b737184df4f9faab0a982e681a0f9cb5a99e40b5f80194d448e";
   sha512.doc = "a427047460a92a436b21c23c112bc4ed8608a9916b613530e5ee5cc56bc833a18c6336943ccba475b7854269680eb7d685bdf2f0641478e46cc4e8fd9a6e8260";
@@ -26741,6 +29905,7 @@ tl: { # no indentation
   version = "0.1.1";
 };
 "studenthandouts" = {
+  revision = 43516;
   stripPrefix = 0;
   sha512.run = "2a7d8cab28b58a26633fec5845498a2987763f61b896fb747d97521b569786f114d80979956a9b9c2b94b61f01677101248a1a4c1735415703398b57306b6c15";
   sha512.doc = "10e3ff558cd5c544d82a61bc67be8b7ed0c9ec9b01550bd3d1c9d3265d1de7153832983593c0be6f5a990d33063b065b397e4ab6b7ed12b0ea79e9e49e0a68f6";
@@ -26748,18 +29913,21 @@ tl: { # no indentation
   version = "1.0";
 };
 "sty2dtx" = {
+  revision = 29743;
   sha512.run = "05e17abf8322e70f275308e983a244e178883aa36571640d513962e813a2bfeb88264c0ae9ccab956f9bd016923d1727c14a7a26bb58b257c7d05600a540da1c";
   sha512.doc = "1abba13831a0cd4b93f9665f242b96d32e764c39ccdb917f655922fe2a4b00385d6a78c77c151e212082eace3b9c9447705681416b5cb2eed9f794d7eb30c905";
   hasRunfiles = true;
   version = "2.3";
 };
 "suanpan" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "a9fd27694ea7491321580ee325f8b151bbcfcf6da14ecce85b6d4e68b09cdf125c810a5170aacc966835fad8f2aaefd78916920cc3e896cad7738d026450ed83";
   sha512.doc = "667d3c5590468170acfded106a2a468d9abe7b4b34a9b56d153d401a60e8f24bce99a4f6c5f2761572a42b85c7faae5741ee5b6f22c3f1004e6d6685463b9350";
   hasRunfiles = true;
 };
 "subdepth" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "7328742873abc42d2b9916161ca43e339e03ac1fd34479e93d9eccc98a065e95cffbc920395dd6f90d90989d29840cbdf2ca87dd1d0b293dfae66abbdc6e2d3a";
   sha512.doc = "6bda8b822a4f1ac2a181ce34f739449bfb976a4450a54589e0cb4a64a0f1ff358a469fc88a37639104f731671ec474088968ab3dc95552a2d92a073d91857668";
@@ -26768,6 +29936,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "subdocs" = {
+  revision = 51480;
   stripPrefix = 0;
   sha512.run = "a38c6e9bad66582914ad4acdae213e37c2bd5658d5e16482a1700f5869762b489f85b61fdb70c04578319f2772c974267b7c9a4e302c34df87f3a01128caf949";
   sha512.doc = "46bde174536e96bb78ba40990ae3b4b8cc1fe2ef26803b193afe2fccfc05bdb6644a548a712522596786847a8fe6071a52599a17ea52134bbed2e5495bbc401e";
@@ -26775,6 +29944,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "subeqn" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "7d04ceeb8f75cae074f9bff3e8d0aac4b529d199343c59fae7715d1023aebc3cbf2b45614e0d5ef0a95ff9bca4ff9e8318c4ddd86ceaec42d271f8c0f71282cb";
   sha512.doc = "09f902bf3b4c8e2e1f9d805102c170b2bf2f4de067cdd590b22fde6b58f4e3042d0b14d362e0af587f9fff9e2c8789bb8af4b329bbfd721ca7dce8af01612c50";
@@ -26783,6 +29953,7 @@ tl: { # no indentation
   version = "2.0b";
 };
 "subeqnarray" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "846d822661b903328ee7b199df6bd7fe5b606c13a185cbb6e6fcccf3b009f2b94396bfc3f9e4b8eb5052688536867dee06c6b9571e051d477415e1ac999fc162";
   sha512.doc = "9f47b8fb760b51a87ce5f9728e9ff76dbbc10ae009e04c9bc0c91133941e5b528e09e5034156b1dc5ff9a0c74446b548bb69c389486e68a4b8a79a7c9ed1a7f7";
@@ -26791,6 +29962,7 @@ tl: { # no indentation
   version = "2.1c";
 };
 "subfig" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "ec7ae149b99fecae3b4ee7cf600811dcec9bc44eac762b5480c6df48b725db3c08a87922edb7a524d7d2b748bf7d25482e155fd40080cea9ac62f2575bf61d15";
   sha512.doc = "8cb67139bc1063fc4d5482b51f1c3ad690c85d4f7e022a99059a7b20176bbdc97a44af23756fa220b3f7f7afdf039c4a7b672700012e96b98ee25ebb9e5c99b5";
@@ -26799,6 +29971,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "subfigmat" = {
+  revision = 20308;
   stripPrefix = 0;
   sha512.run = "d607d2e79b3b0d6e99c8577daa577aa25a0a7d9aecc00c8b7026ef3a923b0e2815837d257599dcfdb1e5320305f492bf17845f5c6cd487b476e789c5140e01c3";
   sha512.doc = "6cfbc274a466796ed0478e9c43cf68d51bbf5379691ea6848968c48cabcfd54525075727463905e48b64946df9822cd10903c562a2f7d546b3d2cd2e9ef11db4";
@@ -26806,6 +29979,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "subfigure" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "d4ca2ef4c52c84ddda85ee95328c9d3e97ef601db4f08ea508bc53393e3b2722224273ac63f749d6a922c7b42787e932d7f60ed3ceb03667fcf8fc591d4ac97f";
   sha512.doc = "46c2950db73fb557e81887f605b866827b6ae7e027a684f0d24cb3f9d5962a3d83aad97b84e61617381af8d0949057df17ef45d629e992e51c80bce3474cc742";
@@ -26814,6 +29988,7 @@ tl: { # no indentation
   version = "2.1.5";
 };
 "subfiles" = {
+  revision = 53782;
   stripPrefix = 0;
   sha512.run = "558a8e29ac5fcb4fba04a75fd02826824690bba8f8b6118ae15f856c0e5cb34a63a507bdaf90a7d2786fe3da34637f76d62d24d061df76dcb95bc324224002a4";
   sha512.doc = "eef1fd8e0b739ed9cc8bf45952c53111b45b6659eb2a0afcf64ae76363fcdfe61320db0831f31b2cdc9a242fd766855be3d83224172e9baf84d15ff938d4b23c";
@@ -26822,6 +29997,7 @@ tl: { # no indentation
   version = "1.6";
 };
 "subfloat" = {
+  revision = 29349;
   stripPrefix = 0;
   sha512.run = "d5bd48fe7634ef6deec540595fd23aea21d95d7c68d053bc65eeebc950e35064add73e5b81e92d3a3d4a4dc938448d9c9a27bd0f1a625e4a9f425d4e2d55f237";
   sha512.doc = "400b9b272e51cd9fa7370f1cf7cb354dc1235fc41d57fb07061dd08b44e06cfc17d38c1be3fd5bafb5ed6bd0404660c46c9bbbfd2fb852297f283be85424c088";
@@ -26830,6 +30006,7 @@ tl: { # no indentation
   version = "2.14";
 };
 "substances" = {
+  revision = 40989;
   stripPrefix = 0;
   sha512.run = "c7e3d72a506242b79e99c531bc550c81081d59c5a850af52ca3b86054a5eae42f9f1ac5c7808f54c404bee829f4cafaa1807c46ac7b994cd0f88ade1aec94c5a";
   sha512.doc = "b2900ddbd6f8618522db171c5fb8b35ce5e5ab6b51fde609a18e6b5656437709772dba683767ad23ce955463a869c483e5e3fe81e1f9b5f7523f4f0cdb87a4d9";
@@ -26837,6 +30014,7 @@ tl: { # no indentation
   version = "0.2a";
 };
 "substitutefont" = {
+  revision = 32066;
   stripPrefix = 0;
   sha512.run = "d060c12b1283ebcf314d6f9f6efd2ed94151ae7030a3d6e424478b2e2cd05753260837f1b9c5003735e27a7eba0313f29263e9a8a8892264bec131bbe07ef9d1";
   sha512.doc = "ce241b95d029651d2de4464880f7f59e4909939697537cf5257bc2e132a476147263c8e9253ddd1fd35fd62dba73cf4d0d06d41bde26b11776b83c456adb0fb4";
@@ -26844,6 +30022,7 @@ tl: { # no indentation
   version = "0.1.4";
 };
 "substr" = {
+  revision = 16117;
   stripPrefix = 0;
   sha512.run = "979aaff088f7bd521e2af3f008fd6fb9dc908ec7c9f3963ab7b6338ece92b2a7eebbf9b4974ab87f73cc71ecf7ba92c25d22be8d1fdd297d066da72f61ad1d4f";
   sha512.doc = "97adaaa986a8540364cd6901448eb47bfbe9d53842f412100696621c55d2209807d0d527c8126d9df7b5b38b0ba2f0598e79a467934d9069fe96a2d9125b701f";
@@ -26851,6 +30030,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "subsupscripts" = {
+  revision = 16080;
   stripPrefix = 0;
   sha512.run = "a1578fb66e6068955c4aa69b8ccb951e79fe55616ceaac8d5f01b62d8c6e862d816e0e1ff6c387bad8b8416a3993699872b0ee3df4f432a733ded0eaa60424fe";
   sha512.doc = "b1424b69633b1c09fde52a38c2e50b6c744671292875688b295586bfcd340283c03a122c83298e8be9bf714201db35f0000c41720a6db49cc09591ae69a3d176";
@@ -26858,6 +30038,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "subtext" = {
+  revision = 51273;
   stripPrefix = 0;
   sha512.run = "0ab32328d346bddddd37094ec086727222bd386bd24c1aa164aaa0cba85d60cf6be2aa26d64bd0bcf63f49b0188e79a7212e8b98d2d7400f828ccf10f60272f3";
   sha512.doc = "cd3fdf312f2bd7d30c3aee67309220e8e75d20ea69ffcb17106812f0423791dbeb26a8ddd3621cd48e6b3cab5c910083f49aa18b439d9f8114c08002cdf8826b";
@@ -26865,6 +30046,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "sudoku" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "a5a9ed2ec9a5eb2cfe973094c6bfca609923ee14ec51916051985bcb2533d1f6670776877252f50a2f16fb54e3318adb15fde907182da215d1db81327fee313b";
   sha512.doc = "7e1fc099e6f84e0e22f6e479bfc611ebb8668fd1391c07f877abf4455579248b99108c9b6224da3a0abec4e0853ac8ba8f817e80832629a1d3b624b16394c29f";
@@ -26873,6 +30055,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "sudokubundle" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "da5c7954dda7fb8076d9b2fbd8a379e416a162ce0039a0566799bba0ddea975f3b951b7615cf50819440b46c419277a080b6e1c3c514e73483b4f81420a4b6d4";
   sha512.doc = "6878ae9a2734e5efb51f04fe24cc30546a2c812ccfd5ae62cbbbc94496a081b03f7d2bfcfa6c7edd610cd6eccd741c3dcc3441a6d437eea5f310865dd13d30f9";
@@ -26881,6 +30064,7 @@ tl: { # no indentation
   version = "1.0a";
 };
 "suftesi" = {
+  revision = 53903;
   stripPrefix = 0;
   sha512.run = "6b6249485e0c7076ad6141af22ec6aba22c0df86c38c03565bf61a486cd8d7c24c1909034e365699e3428307762f65aa6be64e222f167e8ce744e8b84d2a0e71";
   sha512.doc = "316340999ebe6534adcb38c53f3183c64fce9819ed57ca51587c8ca2dda25afbb6d2c68529134524974ebaf9ee27b03267e8021d4d6e4cfa51a7697b942f4a7e";
@@ -26889,12 +30073,14 @@ tl: { # no indentation
   version = "2.9.8";
 };
 "sugconf" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "413a4e36d4e4623898ffef9109b7bf26b6c8769e05d9d631898420a62d0766dbc8597083c6fe27393c8769f8a55d683cf52e3c650b9ed521268064bf510e76aa";
   sha512.doc = "9d4b4544d559fed2806783fd8cbc23485e4a4d14afa6702a90845786449b8fea920277c4c7d1bd4f5fa89ceefec34bd50e617a0ffd3bbee30711fa5e63a2414c";
   hasRunfiles = true;
 };
 "superiors" = {
+  revision = 51909;
   stripPrefix = 0;
   sha512.run = "783d14d75daa63d108fcf870004a46680c643699ccc7256906a06fc7ca4482ebcee14f120209bd488d5c2890a3c8c33d132a0eb23d4b93d04deb05eca6bd0970";
   sha512.doc = "f96d441d9dbd470023c1ecfe3912336f696dea7dcaf7b3c052aabf9c702869cd0ea27a28ffbd34294149c98d5bc23fe004871faafdfc1eb72fcc4fe2e2591d82";
@@ -26902,6 +30088,7 @@ tl: { # no indentation
   version = "1.06";
 };
 "supertabular" = {
+  revision = 53658;
   stripPrefix = 0;
   sha512.run = "68ff94c82b9986983b0a8b0c1e60301067aa20c92c2576e6d0a9b9060d4db48e2770334ae941b6b7fd1a4914098e2125f324e0d5284da52b523a7616552604be";
   sha512.doc = "0a36abcb782ea20b3c45d5c42a55fb41c04c3707c9c5b0166f90b7494032376d6756f827f1293cf998b56a84192aed36b6224e4abe14646557d130427f3bb63d";
@@ -26910,12 +30097,14 @@ tl: { # no indentation
   version = "4.1g";
 };
 "susy" = {
+  revision = 19440;
   stripPrefix = 0;
   sha512.run = "406a172dfb787c833d8d71e74cde627fad5dc168a1be7a71c4d0006e2f0a6625738ec11f99c9215af6973b101e17abe8eb8355206bdaa18ab3fa6328d7ea42bd";
   sha512.doc = "f802ccdadb5ac2bd96ff27396b020798ac023889f751bc3a286392f62341ee6ac50486899f4e633b90b85320f1bbb679dfba98aa3746d01f0220f07cf65549f6";
   hasRunfiles = true;
 };
 "svg" = {
+  revision = 53389;
   stripPrefix = 0;
   sha512.run = "9996c9d7bb018bf4526f91aef707192f748a04e3dda7cb61b27c9d69e44cb1492f08fb658d599ab2800224c9dc475305c747d433b14284144b73dbecf4f4a2cc";
   sha512.doc = "31b6ce351b84f164683ea4bd33cc8dac41898022a966cf986f5d16ca31932422caa36f67785346ed33fbd7e1ec55b1480b898b8f928d153d4f1fe97da0b1359c";
@@ -26924,11 +30113,13 @@ tl: { # no indentation
   version = "2.02e";
 };
 "svg-inkscape" = {
+  revision = 32199;
   stripPrefix = 0;
   sha512.run = "e1708206e6fe85271e729ee8c9bf952f45af662a54ad2e816b449fed263fefd8527529ea777b85a50f736d0ec7875afcb3059ed2ac81afd45c54ccdc687c3979";
   sha512.doc = "609d1a7d2256461a749c3a74ac5dffdb7efec999faa15315872f4e61884933cf47c380bfd8eba53de491494cb498a45ba263dc889fa0fd337c48f82842fa6bdd";
 };
 "svgcolor" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "617a880e8e94e781819a8ab3a169325e667a18afd83a10f070a56dd9f1813153d8f52cbc3322c264ee249c0e70080421a9e1debf844ecbc7ea6c2368a6ac67e2";
   sha512.doc = "02a28da03f72cd85f30f73282558bd3aa05a82318cc90f56af6ff8ae29e1f205d3c05553598b88ea13206b4d54f64ca36d5a6a8d6f8913e08c185c7bce6011ea";
@@ -26936,6 +30127,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "svn" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "a64768b2c5931ba6b9e0b910d7bdc1473a7dbc01a70e41fbda46b4064ca1c41592f3d704496199e41ff27ac4d0ccfad56d9d89e536176010e35c1c8f56312454";
   sha512.doc = "123ce3eda16e4a1c44a85c6d2ef2bf4e5f6b9e9d939cf66eee52ad1326f06b35c457f4df054956dc16c169031909f2ea93aca380d2ba080f6049795a841dc34e";
@@ -26944,6 +30136,7 @@ tl: { # no indentation
   version = "43";
 };
 "svn-multi" = {
+  revision = 26313;
   sha512.run = "f1367560fd6eb6247097d5e5901a56a01a90941f584797f6a5e3388cd9ebb5e33ae98a8cba69cccb4b42feb01a29d8507de8e814be8ca2516ba24ce6a0d929e5";
   sha512.doc = "8e54c597bec50dc541abe4e1be7ceeca9575c5e9f3e201bc66eaeab11ea529cfe3724389aa2d4938f6272c93213dd20a7ea89cc9c954f882ce916c6d610bafb1";
   sha512.source = "f90315214155802235b1137276d615bac052adb9295dba04443976fd7147898616e2ff8e32bc1c3f6cceaaf59480c9acafa73cc53ad50da2bd07d20dd68e2fa7";
@@ -26951,6 +30144,7 @@ tl: { # no indentation
   version = "2.4d";
 };
 "svn-prov" = {
+  revision = 18017;
   stripPrefix = 0;
   sha512.run = "24325a3de52afb9328a4b608710b94839c77ac65b13f08219f4efa24680ceabc410135de3c468c89d5d283a8986f2a9e337ef2285241ce776d0270622e0e77d9";
   sha512.doc = "b6de41de4535833025f2899ae28530f4198717bfdcf06b090d054c20bced3a524ae9627b1909eb7afc6ff4e09d5525203b869c09d23facbb86e207ab2193b57a";
@@ -26959,6 +30153,7 @@ tl: { # no indentation
   version = "3.1862";
 };
 "svninfo" = {
+  revision = 17554;
   stripPrefix = 0;
   sha512.run = "efb2b358bbf5a05b17a591114d0f45a38ff42837751d00b88183265d9bf595ba39377fc53dfe69ca01ae8c1776e6d4ded9c0f636e0e697b946f1d193b39c1537";
   sha512.doc = "f8f20578da98d54181475d23be625a80c35af5e464fdcfca80643f8701a029bfdf03cfb13ec42be34312eafc372e42e5bbb4260aaa5066fe004b2fd6fcb2acc7";
@@ -26967,6 +30162,7 @@ tl: { # no indentation
   version = "0.7.4";
 };
 "svrsymbols" = {
+  revision = 50019;
   stripPrefix = 0;
   sha512.run = "1fadd5259d527daf316502aae6072865b9c6e2efc1ab92f4bc0c3d1070ca4dd863b8f7366c9e6909b7885858c1745cd723003a9f4bd28e8208889da2c21f18d3";
   sha512.doc = "6ff7b9c1efa4b59c453b42fd37dc66e3c79912ff0bf9765b2745fd0cd946a4cfc4a063fc943d1b5919368f8a5809eef5cb7f3a4bf3b6cbdf8200f42180d21f92";
@@ -26975,18 +30171,21 @@ tl: { # no indentation
   version = "2.0b";
 };
 "swebib" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "c34174a73f2264bd0963bc6932f6ce840a84d3c48ec9aeae9f7f92ce25ce5f55dc2e4c05d1eaee54c18b4c0ef9adcf494310cdf0a3e1d73031910b75a6db30c8";
   sha512.doc = "a3db201554a0b828cfc72d47a22b777fd7b44b25c361a4d8f032cc62658780628e83f6eabfbf342b867fda335c1ddc228347f5fc66651193c8229e0bc6e46f67";
   hasRunfiles = true;
 };
 "swimgraf" = {
+  revision = 25446;
   stripPrefix = 0;
   sha512.run = "d4bd2097892db6467ae1c80032e4ff5f39e3da81f45ecf472d350297687609ff37b8498de9e44405ad9c7dd7b483599c844672233d289c6cc4ed1e2b9e2bb842";
   sha512.doc = "2394080a393e2a0cc8e8299dc4debbcc7548186a714454c87662c22a371308c7e8e6705c9dcbf6eca632f2f80788a733f9d5a9f3fddb2f46167fd50654c5bcdc";
   hasRunfiles = true;
 };
 "syllogism" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "6f74e300794afa114da0f498bf70a389500bd2346bd0bd3d9ecf0f30d6167bfc9ea094024039775c649f5feeaa4b62384072ff26fc0c0fb426634912f440999a";
   sha512.doc = "1d2f3cfb453a4964b0e64a486a7c466731fec93e3a4210b216ebe9bc311923f055bbb903c26b5177c34a16a343e5f4e1a0643c7f6bf635dc0762182185f6e362";
@@ -26994,11 +30193,13 @@ tl: { # no indentation
   version = "1.2";
 };
 "symbol" = {
+  revision = 31835;
   stripPrefix = 0;
   sha512.run = "d942031f4a865c9db3f1deb68e9468132e811c88a4de67661a25431506a8ea41b2a9cd36ae0855208802d5b7cd4495b3cc27e9e18996dbf96f2529fecf4683e0";
   hasRunfiles = true;
 };
 "sympytexpackage" = {
+  revision = 45818;
   stripPrefix = 0;
   sha512.run = "14813cf24b562ed135e6d5a0078306f0687cd464915ecc17e61df0bb5d9900d7110e8338c469d4d55664b2fecd1eeb6bb4f359b11fb2a07bad72a442b7698842";
   sha512.doc = "c4e7e386852b3acd071d1addea10435985e7722dfffd4933ac2c3821b5a75e8c9500f5c42bb6b3e2315bd06b8d3e2ad12423c2c43547bb51b2f59bd982d7dfd3";
@@ -27007,10 +30208,12 @@ tl: { # no indentation
   version = "0.3";
 };
 "synctex" = {
+  revision = 52851;
   sha512.run = "43905f27307922763a00f259c538ea6c63aef31d7e1a9a451b929cd76b8402182360ab47a9090506cc3868c6ab56f040e16c5c45ccaaf9431eda31e5ae238ee0";
   sha512.doc = "0e8992318ae2bd7a0b69c0735c565abbd9d21ce6aac6f2e9b44447c41482c4b9a8162220d5cbc073bf5c7c8453a42e85b64b9c1f4be4e247d88773e292370887";
 };
 "synproof" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "934235e8eb4ca51a906ca287c5524cc3b0b69c649b47a9fa0fc2c9fd664199eb6fce835d435e97e0b24bd0662ee68b8db471e3546c4bdb402bfcc19b1fd02c50";
   sha512.doc = "9a12fab29c7c0118bd97a7af1585ae97c5086e7a1e9529624b7fa43a723151e00537b9488a42628d7f6e93b87d092fe0dd18476c7d232e3ee74597186a92585b";
@@ -27018,12 +30221,14 @@ tl: { # no indentation
   version = "1.0";
 };
 "syntax" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "be1e049a98cd7e45cec9675e707575107af9c613028012b8fbfa658c6c9cbbac5782d3a7111f37edc719fb90e7c168c9a98a3d30a4c997b6ac4ed0691fc7fdc3";
   sha512.doc = "7d0754c08081abc9867d0d40fc910ae5f8b34518004bf698dddc184f0b514d75a7feb3085870cf8322b3d6f3bc4c32ab50acdaeb56b574bf41604a18c23a6656";
   hasRunfiles = true;
 };
 "syntrace" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "613c70859eb0c710c43fa4a62fe8b8d38a407ffe94c532d80927d00fd47c17b6570040f5d9ace5035f4dc53deef97419f52ecdf021ab11d5629445153b85ebd2";
   sha512.doc = "0349aba5e1455a6676cda43c7981677cfadf77b9898a79d90104808e77cd351f219392a91f83b670f7f1801babf53854f8719c32b8da112fde849b7b120e2327";
@@ -27032,6 +30237,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "synttree" = {
+  revision = 16252;
   stripPrefix = 0;
   sha512.run = "3fa23536373a41957d985e5a0aac744473459d195c1e7e00e60f2b4aeab15d8f150bc76fab05068d5ae4994ce52ba4dc35380ab042cc9917a23962b2f0a7094a";
   sha512.doc = "164c74dfacdb0cafab112d270b15ad0b7c58be0e8d65c5ce08f80182971b63026584c5c071988d9b7053f99b9d81c893f8b103a3145f1128ffad880259a16264";
@@ -27040,6 +30246,7 @@ tl: { # no indentation
   version = "1.4.2";
 };
 "systeme" = {
+  revision = 49690;
   stripPrefix = 0;
   sha512.run = "a71c84f41447a568cc56b2afe139dc7df23660c329e82c1a0d40e3bcf41ae775b2847f9d391bb591420cc546a36d0a69571a829822932892af1dcedc29e54e38";
   sha512.doc = "4cf7120bd6291edbb101ef1fcdaaeced3a6c771052d8f176b6c11365e1d48699978bc0593354ad9b132e05fc6f14f4074ccd7326492391c49c34a8273f4389c7";
@@ -27047,22 +30254,26 @@ tl: { # no indentation
   version = "0.32";
 };
 "t-angles" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "dae9953288c0067e233ca26d2d5e7ea32207790eb16bcff2f0f56180dd9a65e70c234de48652d053a858ec92940c3c5fea10c699c697b65a249a8c84fa050b71";
   sha512.doc = "32dc9adfda93bee5e61eb062e6970f6e093a09016a6ddf32f82d110b7717916fcc92f961c8be682958d1f3f345e02ad49cde4a85ad4a0d0add08a0bc80109d8f";
   hasRunfiles = true;
 };
 "t1utils" = {
+  revision = 52851;
   sha512.run = "834a966269f1871227b9918a513e154d4bfdc4d1a80deaba5f5bf22136bc8af10a7224f5b6f753f074208881de970076c1214199ee5210c5014366d4f6549796";
   sha512.doc = "096f8fc612ef1793c4807fdc134b3d75650f98a79b49ddbdf11c346b175ec76a900b68189f7e6ba02dd1579396503faed58398da8dfb42d70a7d69dbe24f5f5a";
 };
 "t2" = {
+  revision = 47870;
   stripPrefix = 0;
   sha512.run = "9a47581909735a9ba582b71a132c925beab45cbfeb0201c93d138c35670fdf65580e6dc20d9498458e01eba7088c81d67cce329465e4763235e3f3404959c5c6";
   sha512.doc = "8c30658eab02eb576963a6a2f722b143444abf5d286473f165b6cab84c75ef703462a1841121a5d12cf822b150ce8c23a96256754a2d662fbe6c451a058333ef";
   hasRunfiles = true;
 };
 "tabfigures" = {
+  revision = 25202;
   stripPrefix = 0;
   sha512.run = "d2a1fe985a74427888995437beaafa62b5def851d6f2a7788ead9cddbfcefd7206366a6711f29e85d2705c0d787bfc88accc56c93b827fa372ebd9cfc562f2c6";
   sha512.doc = "5b2c7c5bd350c3dba68117151f3cfd6eac8f0e7ed602b44406ff9d15a79dd7de7e0ec303b1163e3c882412c86adc48afac6c9653cf1fbff86e7cf6a7ce852c94";
@@ -27071,6 +30282,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "table-fct" = {
+  revision = 41849;
   stripPrefix = 0;
   sha512.run = "a6300b1989f536fecb27d300bc0b27afd93f7f72b894fdb87bae5b0756ab241985ee2e5b4c0b68d1b2cc5611aafdb62b300fe40e2a08df5f6b11774f13309756";
   sha512.doc = "a9108cee93e6c7250643636619f923659d468a2148f5b04168fb08738d85e794c1050fef8152fb95d114551f6967c955f3d6f548e1ede37711b98b1362e9910a";
@@ -27078,12 +30290,14 @@ tl: { # no indentation
   version = "1.1";
 };
 "tableaux" = {
+  revision = 42413;
   stripPrefix = 0;
   sha512.run = "1846fe9da749b92700be07c094556fd296d47123df3a5d6823570056e6ce2ca8ef365b70f6ab2a8577602d1be338867fd2610403f89729dd51632d404951f84f";
   sha512.doc = "cfa58a8e76dd61659f6c13ea6b3f97ae484715b735028c513576312dfa7dfe92c8c15a0858077e3ff2399807274dd5a836182ea65b948a976f6384bd8d1b19d6";
   hasRunfiles = true;
 };
 "tablefootnote" = {
+  revision = 32804;
   stripPrefix = 0;
   sha512.run = "90812cecdbb464592b17b8faf4d81b221844a354b0a3d3ea30cb72d0b56c4ff7eee701caf113e13586315ce846d30de6ce8d5028966f2c310527e34e8ec90464";
   sha512.doc = "712c1ab696f5924058f4ea6ce12e3ff14fcbf79a78328259c4b9acfdaad33e9e4dddf36dbb322598f09a8fa3ca75d68b474fe1a4bcd4d25752704e0c4e6ba5d7";
@@ -27092,6 +30306,7 @@ tl: { # no indentation
   version = "1.1c";
 };
 "tableof" = {
+  revision = 48815;
   stripPrefix = 0;
   sha512.run = "3eb5dd3a3399825a85280c79c9f013dc9615a534e475d64777ec84924c9257aa930b7fe677a85c32b158b4099d5b61f306ea54f610fa1c9db42764fbf5b683da";
   sha512.doc = "609011dc53d37fbad2abf84531ab99d8f60b636222debdf0466b33ed85964326b688a7e5d957500a970e1e974d5fbcf1dfc198e146360b6d43b58f6f3d67c845";
@@ -27100,6 +30315,7 @@ tl: { # no indentation
   version = "1.4b";
 };
 "tablestyles" = {
+  revision = 34495;
   stripPrefix = 0;
   sha512.run = "429d9e66e9dcc06814e75b08d1fcc9630de6cc614337c73fdc06588479e47e7df72dfab33a91fb7cb230f9e1ed0bade3d8e56fa423c1f2fcf0bac6f246620069";
   sha512.doc = "43c5dedd804a0aec1b7ad289d8113bca94d6fac7e9b5b8628880e2d7d7e4f0e29cde12864747cfcdf24ceeee0e143652c2acb2b448bfce0630b6915e2bed237c";
@@ -27108,6 +30324,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "tablists" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "ed0ebef871c7bdffe93e2cc38b823dd13376c53e4388daa8aa1198cb213010594c9bfe468ec0e42901df2dbd1b938e7f037cf49ef2cf6d9ff3bc53502b220a14";
   sha512.doc = "afcfa520702fd873b4deb7c4acfbd4290262a0df133c87f01698d20b8d17fd5b5932384124f49fb4d90155da284b873bb3ee1a2281955449f8ca2f278c38d39f";
@@ -27116,6 +30333,7 @@ tl: { # no indentation
   version = "0.0e";
 };
 "tablor" = {
+  revision = 31855;
   stripPrefix = 0;
   sha512.run = "64169a74a787f8877d41d5e32c42e5659950854a1e20cc05103b3ed58c54fb800a9af0701a40a6c5b75553b86d675fbda51948106cac464785c3d46aac77c979";
   sha512.doc = "77a6d1b47337f015dbfd39074e1dae417c3bea3c9635955c6518d691ff336854cdd7587af54640282b45f5bf3885044d3b6789a0a73f39a726aeaf0afd27c883";
@@ -27123,6 +30341,7 @@ tl: { # no indentation
   version = "4.07-g";
 };
 "tabls" = {
+  revision = 17255;
   stripPrefix = 0;
   sha512.run = "1a341985ae61f047694470d19d4e192b4f4e01c0bb595d91b1f80080eed3077be4e40b431cc05b1bb482f18c30bf36e6076542f2cf37a49dd6b065b0fe044bca";
   sha512.doc = "f458058964660b2b1ff2a61ff8ff2ffcfe7ab103e9714cb1e7c307a8bd39c5a1a6990683c4ed7aa401cbe9b9dcc083dfbadd80a5aa00bcd64c0fb72638cf71f2";
@@ -27130,6 +30349,7 @@ tl: { # no indentation
   version = "3.5";
 };
 "tablvar" = {
+  revision = 51543;
   stripPrefix = 0;
   sha512.run = "c0401c0ce273b59da6877f231b06f3e4da572a6531fb6c587e29a00bb0f53edcabc725453c2ad1dbe6ba0458721a7e4b04182fcaaeed46208a760a5dff9651d9";
   sha512.doc = "3bb104a3f50375d2e96f908126268bd3bcb3e371fdd339ed7bdad9dbbf714480b89a4a11625a2b537e09f214eccdabf6c0faee84dec4591f0627783481eff20a";
@@ -27138,6 +30358,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "tabriz-thesis" = {
+  revision = 51729;
   stripPrefix = 0;
   sha512.run = "b1e93632159fa6b5ce46a13b6d2bbd3115a09fd7c6908a8465934e37feb0633eea827fa1ba8521d91a0d30492135a428463f6aa99cca0c6fe7db640d1310c6ae";
   sha512.doc = "e56f4a93c7cdc68c227791a21fbb06e44193e9681e677f383d19994c714bdb8d0487f9550c0c94a78890f54c7342aa777349770b4ad04b58e191fa62b31a3462";
@@ -27145,6 +30366,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "tabstackengine" = {
+  revision = 46848;
   stripPrefix = 0;
   sha512.run = "2f6245d65a7d711d598b894c8acfd8d2a032ae210eabfa219934e8fa086bbe3edef81e73092234e5528f9f62a6856546aaec7eafe5572eded155ca8fa5fc3999";
   sha512.doc = "6ce0b2ec254e44bca6f6cb746d4e3762735e9bb85e561df7628d3a2e2e35ddaac1635c825f27900d06badeb310535e73c84495e24748c1181825fd61fb03105d";
@@ -27152,11 +30374,13 @@ tl: { # no indentation
   version = "2.10";
 };
 "tabto-generic" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "5b3bd8081ec6800c96ce4b4cbdd8091578ad1df2b625fb2792202a6c31f3f126d612f99f04802d82d490cb529e03e63f98b01c7842ec0df69b48c2fc289108fa";
   hasRunfiles = true;
 };
 "tabto-ltx" = {
+  revision = 50188;
   stripPrefix = 0;
   sha512.run = "3679dfd17ada1f2959def0c8eb9d434b84e5bec7245d7e5059e1d1b975248ef54ee04b6178cedaa8228805892f323aeb33d57bcfd4c37bdfb7d57f43a516da23";
   sha512.doc = "bf428fe02b3e1779a5ae685690527102f3d728095f55c3af0c54cc42d6c33430a52a0a27f57003cfe30eca3bfadc36343784ec93224c12ae612d2e24b4ec5e0b";
@@ -27164,6 +30388,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "tabu" = {
+  revision = 49707;
   stripPrefix = 0;
   sha512.run = "b5ee526ac9f68edba34784ed646557b8b1b28a0192c5acefa81dab5a637050798c4a7410589ff98549b2a29e30686c518d2f319144c7e4fb2ab1464d56d2fac6";
   sha512.doc = "b7cb976e6908f219d50bb3e30dc7874b3c9843c8c36bc59cfb909fd54472c4767e914889cb4f50b4ad426176764a09633254e05d271daaaefe0b0beef80161e9";
@@ -27172,6 +30397,7 @@ tl: { # no indentation
   version = "2.9";
 };
 "tabularborder" = {
+  revision = 17885;
   stripPrefix = 0;
   sha512.run = "a30f668ea84238df674c079fea6b05878776b26b4f6465385e26b01b16181825a8cc20767fa45eda8e7870d272875bc9664aed145885dd655d15258aa072ebb7";
   sha512.doc = "f0376dfe99c68523332be0e83c0a186d7e3051862fac22785b4ba1273673fb9b1776654a127ba1c617af67063763e5837723ca2f23b3f7dd012628bd40ad0604";
@@ -27180,6 +30406,7 @@ tl: { # no indentation
   version = "1.0a";
 };
 "tabularcalc" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "7535398538d6802c4e70858028ce6e7414aa8a88336e71f90f7f909d015bf896eeb5e6652cc5bc5a2bb384bc25d280d8cd6506f7ba05823c20dda04fb3adf0ba";
   sha512.doc = "7e35cad1507cfb62117aaddae77c3faa5d19c4e320193afa0054415e84d49833ba64afdf743b6241d611dbb4d45c6a532779293924f20b6c748659a361d6f30d";
@@ -27187,6 +30414,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "tabularew" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "512851ce7641e0904dd25ab8a5cd5ac0dd281154067e09c4389fa3d6f330d30099dc60b252de4ebee52a2cf28d6b7d10bcf63fe4ab1472238db35754adc1dba6";
   sha512.doc = "4b5b8aca9d9be8cc6618d9393278f8da2069341a982cf6cda9e561b64bc158e5c08cf9257b592f82134cd74ce0b69682e15339d9068d9fedcdb26626dc2b8a7b";
@@ -27195,12 +30423,14 @@ tl: { # no indentation
   version = "0.1";
 };
 "tabulars-e" = {
+  revision = 21191;
   stripPrefix = 0;
   sha512.run = "c755ffcbcb5636b641a5b31a7fa2b2d97ce2e3e0f14fd08c23e0b234abadfe584bdd6e2628fffb614c249ffd17e46d56790fedd929a5af55ec92869ec302e6a8";
   sha512.doc = "2a29bd4c343c172f37874423a754b03888838db7ba4237992ea38167b82fbf7169dbe3056b269d487e398208d165d4fe2bbcb5413c138cc6129fb926f9ee7701";
   version = "1.0";
 };
 "tabulary" = {
+  revision = 34368;
   stripPrefix = 0;
   sha512.run = "2c873a3840d8bf06a095ff3106b317ae6acfb8498d47b0229a37e247e0e0a9df80300759d65d13ebc9defb15d1cde0aa1e956d2f88bebab3311af459be47df0a";
   sha512.doc = "b619c6b3dce1421ad4f06ab5e6f0ecaa6dc4f55076b66303a4e5409b42a4a9e34d218251177234dc0f3dac13046638a75623db0094978badc4db93083660f5e9";
@@ -27209,6 +30439,7 @@ tl: { # no indentation
   version = "0.10";
 };
 "tabvar" = {
+  revision = 28908;
   stripPrefix = 0;
   sha512.run = "c03d57d066a5955ffe24900f97de82f9bd96d8ebc20ff7b9c11c1e5a858d8f4a50b171f687e041d629a7dbf43da708bd03aa0405419c9879b9a5bddf23021cb7";
   sha512.doc = "700e42e3e8d37e1b4e11af90f8f76bc2c3234984aa39b229138b5bd86418797bb8102b4624a43d3ca1738a7f848f1e09164c077d7224819250c7e034c10b4103";
@@ -27217,6 +30448,7 @@ tl: { # no indentation
   version = "1.7";
 };
 "tagging" = {
+  revision = 52064;
   stripPrefix = 0;
   sha512.run = "8947ad0dc443891e0b5a395a27d2857acb5879821443ff64cb0b15b99eea7a69401ba165b26565bac1b0036032d49241504ea2e008106a85cdd896aa28abd9e4";
   sha512.doc = "06d470576136a96edb69bf595e55f16416da552a5f4a84980ff5393689cb58246d4fbe62b979c22b85c5abc58b926d9be63cd0ec734b43c653a0d0a5c4b04d8a";
@@ -27224,6 +30456,7 @@ tl: { # no indentation
   version = "1.1.0.1";
 };
 "tagpair" = {
+  revision = 42138;
   stripPrefix = 0;
   sha512.run = "146c2e957965fb7ad9976a4b3b6c40d28b8d0cdaf0c8b9627f51dd55ba88b32ad7490bf000bb853a416b5dcc091243b9d6e92999431327a05879adcf89809d7f";
   sha512.doc = "af9dcc1c1dd0a5e44d3f436569cf5d36f8154b70219340dd914feb3d8c036164f1bd70eeb6819bb51a06c0f5c5dcab1b3ede8be4b4d22b2536529474d0d841ab";
@@ -27231,6 +30464,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "tagpdf" = {
+  revision = 51535;
   stripPrefix = 0;
   sha512.run = "4cdddad7f59d6d9365078817b99faf9b815baf55e2c7fa736a431d6aa11ea4ae2a6d8d825f5ea7c6b5e9d5b01d5420afddee9063273f2b7a92bc0af01d20fd6c";
   sha512.doc = "46ba8484bd25977fe93c1e9cbb0a078aa917060536ab5d5349eb7f5aaba5c59e2e9da4faa7e16d1c45f0e88bc896e70bcbadb32c4f679bc05931bc39cdf3d2a0";
@@ -27238,6 +30472,7 @@ tl: { # no indentation
   version = "0.61";
 };
 "talk" = {
+  revision = 42428;
   stripPrefix = 0;
   sha512.run = "371c640254994616744b2bd0c9b4040415392bb2a3adfbe5f4656faaea5bf3e7d2d4ab35373a65a857fd57112f7fc628321492d5bf7c5b052e0026c277663d7d";
   sha512.doc = "d6a641789923559a94b0077d718e56258804caa1dec0c9ea0f9d010e92ffc361884664ac22b07b95d20f464d18ac76301a718430d8f1ee30172489cae3b844ae";
@@ -27246,6 +30481,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "tamefloats" = {
+  revision = 27345;
   stripPrefix = 0;
   sha512.run = "bd45962a9caa5b098b6a6a5c0bd3fb964e13cf2744a5fc960a97910183799d532aba24d5f4774ac29eef14bf1439e285010b2e22641167c826d5a36262fc39ef";
   sha512.doc = "2b9d013fcb93682e9be0fb1758fc871b4784eef72a0892383a35073aa177ac29acfda5e54b6a919379b43a3dd0fb0b22dd44476857665efb59b2e9cf27bb679a";
@@ -27253,12 +30489,14 @@ tl: { # no indentation
   version = "0.42";
 };
 "tamethebeast" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "75a71590f1d905bd2a78b508d66936975eeacbfa32e850f599e94efa92da2b043edb8b0899b7027268fa131d94283c13432d4c4126afb79d1615bd538af52436";
   sha512.doc = "0df79f434714deefd60b9b9d32dfbd47ac7e560c26ec0d02465538eefbc779f0252aef235ae2e0a2d2d634d618bb52c73b31c229b5245866239776c742ebe69a";
   version = "1.4";
 };
 "tap" = {
+  revision = 31731;
   stripPrefix = 0;
   sha512.run = "07ca34ae47976c65deba5443052001406390befb6dc675af7651141505f088e2f67f39648f14a94f70788eda79221efb05c2246d1991811e697e88c7408f6cf6";
   sha512.doc = "a61b861cdac25c0d8c7d48f67abb9eed88458d0d55e8afb706adabfbed0d1e7c7159fcf000b8012885f82f849ee965bf6a2607f1b67f2d9191f59f8538147230";
@@ -27266,6 +30504,7 @@ tl: { # no indentation
   version = "0.77";
 };
 "tapir" = {
+  revision = 20484;
   stripPrefix = 0;
   sha512.run = "f3d93c9ad813008fa72cbe317d244bca9a70855c20f327d22d1720b79d70019af0f5d8aef237fc78a598a545f44a4612f1e5a7622b34247044ab230bd42eed5d";
   sha512.doc = "a32573ba9df3d0b30e796f7bdd03e63ba8a96559380895b8db2d33fd9812c8b781b75d19a12a24405c52df13acd9a5f2e925da64b019e92a124d143345bb5bb9";
@@ -27273,6 +30512,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "tasks" = {
+  revision = 53371;
   stripPrefix = 0;
   sha512.run = "79e6a16d9df2fcf647eb3cee57759044ec6e6f85fda5662d56db6f55911bc3350f0bd6df337327b29185d2d529892544f28d7a1b1f9be09e704857006dfb7cf9";
   sha512.doc = "16846eb9eca1542d731617cc7a5b7ca7afbeec817fa941074b58caaa166faf8e593e33fe4d89e88741b02e48dd5b8a6be5cdcfd17d3d45cca2269037401c8a47";
@@ -27280,6 +30520,7 @@ tl: { # no indentation
   version = "1.1a";
 };
 "tcldoc" = {
+  revision = 22018;
   stripPrefix = 0;
   sha512.run = "82348df3f6dcedc17a3cd50f709d01b1f2b0e4be9345e63d40ee6ad2aff908f97c7d19d586431e3fe8399a8d076505ceaadb5afe0116093240a6e59a335934c9";
   sha512.doc = "61f24f628c2b62c02e08e1a2a3a2fd917d057baaf977e7837b1f62e4331e370b83f8a0b00e679c86ddb1893d21af13211185502ed7bb19699d4f33356d3a3a0d";
@@ -27288,6 +30529,7 @@ tl: { # no indentation
   version = "2.40";
 };
 "tcolorbox" = {
+  revision = 52809;
   stripPrefix = 0;
   sha512.run = "59935197103e279b68a54dbe1b33936035b3073f1ce70ed70af8e405096d36df5d00a4b0bd583428211df3497b779e4b473359004c0d6aefbcdb4a398517a38b";
   sha512.doc = "c7cb5fb7763872451934d7f767d90620e43dfef89de989fd3e233b8db8d169acd4a947f493cf724759cc6ad57b179eb902f923ff91c1172c0dd4567b348c7f76";
@@ -27295,6 +30537,7 @@ tl: { # no indentation
   version = "4.22";
 };
 "tdclock" = {
+  revision = 33043;
   stripPrefix = 0;
   sha512.run = "29e2e50d9fa432b08ea730b8a12228cd2bd3eefe61946e576a262bab06a966c0b28c13d48b1074a838a1a567f9797a943282d17e936db146f15e7631261761fe";
   sha512.doc = "139c82690e2c9b695a10a6f3e6f94a54c3ae4d4a929ddc18763e248114926554206fb4c007ed758695476de3750ffc1dce3db75efdf2598434f27abd1ac84baa";
@@ -27302,12 +30545,14 @@ tl: { # no indentation
   version = "2.5";
 };
 "tds" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "20b739d69ba9804c12761c0eb76c0b7961657d2ba2fb00db9d083022279cca2b2b176fc7aaba11fceb77da4b7a23ba53c80e98a492fb4929adb545d56f5e8958";
   sha512.doc = "ab08ea4220a30ac896add47e5422dbf2ff3eb65c3c89e90c87983c5dff75dfae6fc4d6f8cda58f2da51dae505f537ea07cee0e2378da845c20e790f8a1724f7c";
   version = "1.1";
 };
 "tdsfrmath" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "f2c7a19dc327230f46320c695eaf40e9ff17088a709e38ec7f8de23f5c0cbeb18f606bd41625a1229734dacc80edba9d052c21620f7cdf213f60e915b6128010";
   sha512.doc = "9b0e747f90b75f372f04eddfb1c17dc73c3ef6a95d576077790b23bb496cee07afd3af5d1a53581872255c4e71b933949beae909591d0e1c407d9efc3f1d227d";
@@ -27316,6 +30561,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "technics" = {
+  revision = 29349;
   stripPrefix = 0;
   sha512.run = "8eb9eab801bd83fbf0d9365c36a202f909cbcd49b8da6887f3e26aa3fcd047b8085e0b405f0f5fa7f2b5ea0ef21a9956114ecaa7934e1b46b1abe55583d5e759";
   sha512.doc = "2158bee41c25a1fbbf8c963e3364cf7d08e160aa895f54c77ceeaab7da6963232af61b4c7349d1be7f0aa84097bc7c00cac7748bdb8ba523a899b9e7cf6ed11d";
@@ -27323,6 +30569,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "technion-thesis-template" = {
+  revision = 49889;
   stripPrefix = 0;
   sha512.run = "5e9c6bd47744601258bef52102acdfc744e0dd1219a7236a5710d6dd98ba5ebf1061bd6070c5d02707a7c8b895e362db51f48ee081126bcd9a99e523c6b9e5c0";
   sha512.doc = "bcc290eae933b00cb32af0da6d31c6190f3b38d02a599fec7f8cbfcdb6f8737380d4c440911b08de5d768d9925526a63521c97c20a8c075ce8e9500dd3a62c24";
@@ -27330,6 +30577,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "ted" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "42b0fcded19e05d5cf316fdfc0f1f6474816b656a57bfb5214a76f47e644bc16a42bfa95a21b80251723e2c30651a284d873d898e84c277922120a9169d274df";
   sha512.doc = "a36387e2520d7afadeb270f7393ef45ac1b26673840d541a50ecf864304d529b24be7d107070c96cfa123801284ffc53c9daa60753640fcd2ad6367f88887069";
@@ -27338,16 +30586,19 @@ tl: { # no indentation
   version = "1.06";
 };
 "templates-fenn" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "cc61496f15f9c4060c8d42de23e3bf6f6d2be02d3a8b4fb761f2fda4a9c3565d74bf1f107dd9371e096bef79ddbdef56d2e696cd84cb4fe39a41986b8ffbbc78";
   sha512.doc = "2a96b0963b2d09edd3f6a6866ae298001e6ccd4e96b98a9002df6e6718284a786b63761441c287ddd63dd5eba636fcb8ce9769d498962ffe2565e771902755e1";
 };
 "templates-sommer" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "55b47c4718786fd4910d099878d5808288e83714567adbdbceea32a76e92f7e36c3f850d8597b297445a6ff428d1d0dbaf9209a387485eca0fb1a85f4909ed59";
   sha512.doc = "543b5cce4842dc6b084d90f9bf4e3c19c18a690ebe85379d9d93a5998fed06272bcac4cb3ae44f965614962827b9926fec3439322e38a720c134133a88cd94f0";
 };
 "templatetools" = {
+  revision = 34495;
   stripPrefix = 0;
   sha512.run = "16abbf8e5c8972961d112cba712f927be24fca191467677bf27d76ba30c2eba8cd237842b003b9cf45247a122294d517b14a4bf5b4938eedaf3055ffdd22c05a";
   sha512.doc = "54d696f510cc75384703f750a8c532eb2a0d46e02821fd9126daac52ed1b39859882d475758cc1ff7fd6257211e49ee0fc5c06dbb2e13e83d4584523064cf19f";
@@ -27355,6 +30606,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "tempora" = {
+  revision = 39596;
   stripPrefix = 0;
   sha512.run = "0e1cc1a13f7937e5497f454b15ca66e0975b784b80223a902bf12a9587abdfdb56116b100e04306b1999e053b7c3716b32e1183dd7e6624162611f3b70388df6";
   sha512.doc = "18259e25b2c9f2a9cfbce9a9303d8827af069bbe2a7ade5c14518ce2c19dc973a86fadaa99b2abc8bc65644ee5371c745abba03cca76a685382b7d8b6d20bc6e";
@@ -27362,6 +30614,7 @@ tl: { # no indentation
   version = "1.05";
 };
 "tengwarscript" = {
+  revision = 34594;
   stripPrefix = 0;
   sha512.run = "c6a29d928b1f25dc4b8893f9fc803f3a5deef9e8e9aa4803153fbae5cdd7170eea819eafba8a165203e48c8b2f443c55ce682df9f7e968ab621f2cf7eb082108";
   sha512.doc = "35825a4c1cac91c088daea643e8a8901f0c3ea15c44e8a9328883c22c1fddab95fb32a65372af3979698f81e68d77b34764a1c5748460a28396480075cb594d1";
@@ -27370,6 +30623,7 @@ tl: { # no indentation
   version = "1.3.1";
 };
 "tensind" = {
+  revision = 51481;
   stripPrefix = 0;
   sha512.run = "fc20b6f6b705218b82b5788582d8b017be783e42c87b3f35e7aa99a8215ab0168b7da899c73ef1ebc282bedd5c715e69ed9e1c19b94d9b6369ba8e9986b5c5d6";
   sha512.doc = "12e443e2ffe876732759ddf91c8948e9cfcebc3c1c96949c51f090e15dadfbcaf801e488c8d043855b576404207612ae91d982279cf0b29bd73d4a5d1528bb6c";
@@ -27377,6 +30631,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "tensor" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "8f048f9c72eb693bf9e75e6ebda2901eb6b6add654b1f89651d54eb9416559c2455436f5e825160bfce220c790e00aa3a6f95a4557b3fdc880bade768dd36c05";
   sha512.doc = "d9ec6b7b49d028a5a405f16c8cdb54873d92d3a0968b7df38aad44da607c8ea8cdcac45cce63b0bd2258a2a89787e2388b2375189636b93bf643055c0b9f86fd";
@@ -27385,6 +30640,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "termcal" = {
+  revision = 22514;
   stripPrefix = 0;
   sha512.run = "f28ee31f06cf2b3119df8010aa6a8312d5365452e19c3a278db7bee3bdeafe9ae0d3b07decdf1a104d8eb763abc5e02ff0e6c7030dce924596ac89d8e9508e13";
   sha512.doc = "44f54dedd59afad78eea60ccfd43805dca1a4dc87a3d827e0fda26db15505dec18d91cf0629ec937dcf3eb14d1244f80559a0fa1ef09b30288bf687099fcec1f";
@@ -27393,6 +30649,7 @@ tl: { # no indentation
   version = "1.8";
 };
 "termcal-de" = {
+  revision = 47111;
   stripPrefix = 0;
   sha512.run = "9d4d0be3e26dc69fa3986fbe41099330e97cdd4d3aa0b12a180657577ef839878aea9e546a5651cdd0ea45e7af3968c5b83b509ad5bb3ef210d42af5c00fd91b";
   sha512.doc = "48f0ec01526f75e9e2b8369f8b30bbd8e4f093cc91fd5b485a36e225de35fa0afc750508b6533f2ec82ef123805788e40e98d5459dc85a73bef675162e682fa7";
@@ -27401,6 +30658,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "termlist" = {
+  revision = 18923;
   stripPrefix = 0;
   sha512.run = "799d5fbfb9b055e8674a244ecaac65c2f0412a4c173e6608fff946544142d851d8dbba02505fa8be21bc37b15acc2ba99a6f0dc77a13dd241fedea1c1b38dec9";
   sha512.doc = "14add37c32500f246eea2a3219b58a232c9a8f41cf3cf5a0d1d2aaf4cba4d700c1ba5379b037fe10cfc06385ff0a7d0925b46beeef15dff2502142e56f37e597";
@@ -27409,6 +30667,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "termmenu" = {
+  revision = 37700;
   stripPrefix = 0;
   sha512.run = "5c3d4ac4a2bab5e18453b9de0b372b364981444df3550c3a195a8fee841a6d76e73835096ff1b71a37f5e5acf0fd2777dbc8846be9345f99b004adb560ced517";
   sha512.doc = "029f4ae3b57e0b226883e66030db2d3c41cffc0a4dbd4f8b3662562fd566d8a09b7aa0c83d98f7fb0cdfbd1226c5dde9c93211565292f037e5b5554e9a5d02b4";
@@ -27416,6 +30675,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "testhyphens" = {
+  revision = 38928;
   stripPrefix = 0;
   sha512.run = "c16a9299721c571ce9bdc91e4ed4cc54c973b43fed5189d2f377b2a9143d94d3eeba6bd6b728e3df92a5436b3e2c5e07a21d4a6af0210bf87784d40d96caa42c";
   sha512.doc = "44cc1d9afa4e12ef2dc1f7be2d7718fa33b80e5ee16c7396053690bfea6246f444b50cb044d314ec677436a3559ff1ba9fa227acb446db37bacaa2829c309b2b";
@@ -27424,6 +30684,7 @@ tl: { # no indentation
   version = "0.7";
 };
 "testidx" = {
+  revision = 52213;
   stripPrefix = 0;
   sha512.run = "003179c0efebe0bb84cf1ddc80db6d905af6cbbbf59753b4102e5f7a760b5e7c90057976e2d0aac138b001e2a211da8758f8e2285866ac34c8287e1d3b82d1e4";
   sha512.doc = "deab83c1eb6f77b379b38bc81e680e18b9fb02a4b147363e05646849af1fe402249c50a8eb41e6ecf60fb1cc505cd82593ae90c356cd4bf43fa5685cf5162f44";
@@ -27432,6 +30693,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "tetragonos" = {
+  revision = 49732;
   stripPrefix = 0;
   sha512.run = "dbb37eec17d41633d951b3202289289bffd9bf9a8f509cfbb7f98baab9b7e684e7d7fbfb5f50ce41251d09d9f0ea81fd9e68fa91984e788e5e43f8e398463fff";
   sha512.doc = "f55cba055574e78934b8766f02de08f417f625042627c2c1e64cb7fe39ecb1e3553d5b862afe521f4d65805713c856ab000e3db3b7fc906266886f2ebec490a6";
@@ -27439,6 +30701,7 @@ tl: { # no indentation
   version = "1";
 };
 "teubner" = {
+  revision = 40197;
   stripPrefix = 0;
   sha512.run = "196c611d9a1f8231541a345a71bb45279715a748a8ef624865c076a8f346f8ac9a7be636feed01130d98445f8fa032ea8f22ff4f4194ae45efa0073231d5cc41";
   sha512.doc = "3714dd9003e03f0758031dce6dbd5a3840b2d9fee53382fdc66e99d4baaba153694c88fa5afc8e2ffd4af64e210a7e65e2a663baaeed7d96c0800a3fb08cc983";
@@ -27447,6 +30710,7 @@ tl: { # no indentation
   version = "4.8";
 };
 "tex" = {
+  revision = 52851;
   deps."kpathsea" = tl."kpathsea";
   deps."plain" = tl."plain";
   deps."cm" = tl."cm";
@@ -27457,18 +30721,21 @@ tl: { # no indentation
   version = "3.14159265";
 };
 "tex-ewd" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "9850acafe002f1b6b147d00aee55e4cd9c1813edbea0f570282119fd8b2f134d3a48c113cc9957c69905c4e88a06097c45829026342d7ec88838870eedd7fc44";
   sha512.doc = "05f6414dd2309401d1800e2b053d7907703e144f829c2e7623a7c98c1313da50c0a659c25fa0d9a0fcb8b50891c575b47d8fb8a90b925e105ed9a6f8c45b8667";
   hasRunfiles = true;
 };
 "tex-font-errors-cheatsheet" = {
+  revision = 18314;
   stripPrefix = 0;
   sha512.run = "403b4faae7b16b1eea5a4d2a7d77bcd8a6e7a7b5be54299b79635280be8f82f59d281380754a0bd1b9e53ff4fb534fb3bca0cf8bbe1cf0ee88ee4d925fba103d";
   sha512.doc = "adc72626fcb4c5a9285ad4a7cfd1c6b984f1aa26c7732f35cdc241f7b00d623f6b646e878317f30d10b9f47f4eee33e923538be58f3c15bee668f4fe652f0170";
   version = "0.1";
 };
 "tex-gyre" = {
+  revision = 48058;
   stripPrefix = 0;
   sha512.run = "7e8ab25cd563e2be7f333f5f4232a7d64e9cd8ef2b5b898ad5e33af96d455f3bb0214184650dde76770cb95f3bfc6b10f35286e0263e52a6f43affa289920327";
   sha512.doc = "ebfea3bfa958175078b78ee0f2ea36a4de289b967f8fc900268dce7b3d356d2faae9d9a1123c48a06e3ec78b05863626fa97cb3e249d1b87c036fe00c194ceec";
@@ -27477,6 +30744,7 @@ tl: { # no indentation
   version = "2.501";
 };
 "tex-gyre-math" = {
+  revision = 41264;
   stripPrefix = 0;
   sha512.run = "a50a9eaa30cfd7754ae702a3bd6fced2d07fac858215b913945665940c71a0aafd2b59a0d0baa0fb9d5090773ef69a86864cc11126a5e30adc3d0e94cdbd2594";
   sha512.doc = "cd346226dc36bb4fb5324a43dfab7790cd80ec6bba992849dfcca74ea6fe8d85fe7e0ac66408a41ac1ef644e6b32c9b06d337c4f394fbfd8fba4153fbc1abfe9";
@@ -27484,12 +30752,14 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "tex-ini-files" = {
+  revision = 40533;
   stripPrefix = 0;
   sha512.run = "c053ad3aaa49224f26999112b3f5f28eb6ba34cd130cb54ab5ce67971632d41a8470c361e4471f9d75831d230737a0197186b05c25a9b401286bb4d5525b12a2";
   sha512.doc = "c44315e35793a1e77b621af53061c25605fbc5ffce2f07fe52bc5e58f4db0e9252cdb1935c14d8dc632bf1b84c18f3ec18506c5415831ad230c7a314f4f7b670";
   hasRunfiles = true;
 };
 "tex-label" = {
+  revision = 16372;
   stripPrefix = 0;
   sha512.run = "513310d4dc5240d0b290d0acc941455ba64e069d19c223670d05a632033aba8de367d5dce6acf073af4df476876d3ee414dcf9f1f579738bf9bdfe6738c19d36";
   sha512.doc = "bc705cf6812515923d60cf44b75830bd3ea78f078c9ef88ded3e94f060155e1fbf5dc1485cbaa8530e1f10b41b421e70bcec6c61066ee98b498aba7ea8799dc4";
@@ -27497,6 +30767,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "tex-locale" = {
+  revision = 48500;
   stripPrefix = 0;
   sha512.run = "0e3aca622bb6fb49a06a3aea1d997414add9272dd39c10c3a1d80956dece59882993b24366a1126acab80f8a7c8328a30756f727210f829f5eb838ac0b9cb1a6";
   sha512.doc = "d3898da3687603b1f1f3f2f5b203d01c985ab0c3e39eeb05dc7c855c14fad8b73649777e4a0b7844c242bc8946cab80b585987eda37a1c10e3ba75c6955fee23";
@@ -27505,40 +30776,47 @@ tl: { # no indentation
   version = "1.0";
 };
 "tex-overview" = {
+  revision = 41403;
   stripPrefix = 0;
   sha512.run = "1217aeba55d723dad2843509ad3adf205090298f2362ba4ce23d73ec581e439c344f055281a95f82bd8cec298c77da012cf892e60369562238bba7f8b8d258a1";
   sha512.doc = "0cd9941afc0e50d3d936f5ba1f9d2c7f16244899982ff7eaa44bb019653b5e4e142edc1ee608ca1664636c77178dd8a02f4625a2216a019e770651a718f0a27b";
   version = "0.2";
 };
 "tex-ps" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "cc616b501be7c0724646d5e0f326a5729df8f4cb0c4070f92bdd3b5b370e496efd6208b3ec8b2387713810b9764c75525689f434b7f482a83fb0b8e9b0383cb6";
   sha512.doc = "2f82f63954c1407c2caa9c39a538ed1cffeabfde8ac0506906f0f28430d12e18d858040ee66f2326cad3fa758c23d1ed490b70c5d18eb68b699b7ddd0afd15d1";
   hasRunfiles = true;
 };
 "tex-refs" = {
+  revision = 44131;
   stripPrefix = 0;
   sha512.run = "12ce34f2173ddb5be885b174a6be708fb47822cdd34e05ffcf6f17cb28ccfc32528206c9e73373a6f68a5f3987cb9e244c5093539f14db3a4eab0daf8ff7fbaf";
   sha512.doc = "318f2872f308b2f22d96af2a553d9e13b60e1f6ffc1cbdf44e123fb2ca82423ff8bb7aba524f0e8570b8086ef85833cb11070d7848b3212b87ae0046405c1a5a";
   version = "0.4.8";
 };
 "tex-virtual-academy-pl" = {
+  revision = 34177;
   stripPrefix = 0;
   sha512.run = "b9358f50caf39d274c1684d4514fef0439e015588431883955f7aec63d35f7176ed61671f72cda7ae28125b2a977f25ae66b028b21017f106d8f78bbfc7df109";
   sha512.doc = "aa73261fb0ffdbb7cdbf85df354490a72bd95e4d98e4a497e98666e6f5533a7f05a7132533db044ba993d86e03fc21825bc6fa7f262e5a0bcdb6de8114d38eee";
 };
 "tex4ebook" = {
+  revision = 52616;
   sha512.run = "76600392b612abe233a98195c866bf291e4bc372f0cace58fed0855246b3bc8ee8687c1e8baac3026030e7eb60dd1f4a4ed3698521b37126127b33d1bd080661";
   sha512.doc = "b00548efbb3b263f9cdaa7348186ae7e96ef3a224904ccd04d4622b85a94cd5a591532265281ed76c6135273a9abddb8af4ff3f6e1fea484d534dacec1903b70";
   hasRunfiles = true;
   version = "0.3a";
 };
 "tex4ht" = {
+  revision = 54213;
   sha512.run = "c385b90fcff5ba43884918bf616aa4beffc285def1a380b84909bf4dd44cffb479612268a37977adf87f8dc226394d3239503b5d6f2a083a9f078862f282f0c4";
   sha512.doc = "86b1ea30f9007e9d33f76a0e2970c40a6af0c40ec6c585bbe8ad98e057b41de3fdf3a7b1de0570ff2a718326a7e59a26d7d19f2c7ce0210599b57d95004188b0";
   hasRunfiles = true;
 };
 "texapi" = {
+  revision = 24237;
   stripPrefix = 0;
   sha512.run = "ca4622f53eab49612b80781bf58130d419a89791f507164e34dc8123772d041d50790f63018a87bbe3e8ebecdbe49925fccdc35f4d90f5d87312a36ce1ee482d";
   sha512.doc = "2740b51e345092c14bf86a42d8b94a5595248851c606b6274369abab75b708bbd17a67a544b1b3a0bdae18f779e042a53bc2dc04edbfea912ed60078cedde16e";
@@ -27546,17 +30824,20 @@ tl: { # no indentation
   version = "1.04";
 };
 "texbytopic" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "d6d7373a50b85b4dcf30f9d6cd1f3ec3a4cbbe72f53158387b99ab5cae5372d1c7a7954d03a0ee06b9af6df9784cd9a06f73658a6286a737674f5046883a9ab6";
   sha512.doc = "29b3ea490b6c67a4c1d6dd2b744978536e3b847beda3a901873db7723c7c21ae4063b800d30d2d009e77a0e6fb199a3fb0d16d1f7f8d9a09722cfd7702c73c67";
 };
 "texcount" = {
+  revision = 49013;
   sha512.run = "82f51346d9474270af6374cc1619ca005206b1bd729ce1559b8b66e361b184a192c7fbe085216a3a64e656197756593f7d76e52437ac562fd33bf09504b0f58f";
   sha512.doc = "5141bdf4378cf87a19933945d6742427f4467dc73d92f4a470e34474232dbb2f60c4d8db065f812481520f1aa2f8a90d7e97dfc83f0f089d10386847f64f4d94";
   hasRunfiles = true;
   version = "3.1.1";
 };
 "texdate" = {
+  revision = 49362;
   stripPrefix = 0;
   sha512.run = "c6f34d5ab0c54f799669c4c44e8c6e00381796ca76b9d2e8352a749effe65b9ffd6ebd139998ab9267d1e54da6471f5f38cc6931f7ff046882261cd5e5440bc7";
   sha512.doc = "2338dd99b32a1b2e04326e888b718f595a26848bbef17206f92a0a0f26556edddc3e0a06327d86e72fcb3e55270bcdff846cab3bfc37cbd61115b601164fc10e";
@@ -27565,6 +30846,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "texdef" = {
+  revision = 47420;
   sha512.run = "7c5defeb9cf9d5fbe92f8433265543e6d7024e9f7fdc768582ec51a5880745c54cf8576f1b7455e32d51429e2faf122c0775ead117be97510f4b2d8123b04d71";
   sha512.doc = "a4727d57bb5b56106a9baf4aabbabd16cc8a8ac08358c28263abe9c40b76a6d692d0e819c23c7b8e946e97fd3f7574a498a6f43207c04e7544a0383b3681f54e";
   sha512.source = "4b57478b06d4cd67ae6b8d2afb059eb52e03e31c4c4066108d471134865a64f3eb3dc99f8bc4330625eaa8e7c660f445365c6bbe510f36d5770b406df99d6c8c";
@@ -27572,18 +30854,21 @@ tl: { # no indentation
   version = "1.8a";
 };
 "texdiff" = {
+  revision = 29752;
   sha512.run = "26fa84b3090d641efb186947ce4d1d89c30a2c224cfc8fa759da3ba7ec9cc113c0ed4afc1c3d0fa5f9d0a88af4f9b3001d57651df6b5be6e0234fb78ec4f252a";
   sha512.doc = "d458fa8db6433b4c7fbd23a16f9be53c2c822e396e7f50844cfa6acdd2a08acf8efdd0bd946c8fdc09ca8aa28d1eb25708d3719184634abced92ea5c94d9a948";
   hasRunfiles = true;
   version = "0.4";
 };
 "texdirflatten" = {
+  revision = 44751;
   sha512.run = "e4f03e9a434e1ab8ea1b69ca0ed2dffe1f8cdb2c853a733e275bee74ed4b17b84b72cd8cc7d1820f595e1c2282a38b9bfc7f7b7a9e003fdace6488390a1b97ba";
   sha512.doc = "972fc69b705b2f6289358199cedc91ec386da9212048f7f7a84e43eeadc943f7f42ade8d7faa9f58d1685d2bb10408e274b2461032927042371feb86b4ef6b43";
   hasRunfiles = true;
   version = "1.3";
 };
 "texdoc" = {
+  revision = 53859;
   deps."kpathsea" = tl."kpathsea";
   sha512.run = "ff55c658b4baf265bf9ca2ba6e5a161eecc1c75bd112e6400c9df4708ae3f355dcff277cb60ff0178bd41940d090e3dd28a7ce06421f509b352489d7a8d98b2c";
   sha512.doc = "54931eb9882415f2182fed56b4905c723bb0df1444b1e2af939e2b6093ed9acceba6af7d46d6aceeac853686a57e366c13ab76da05f18469da61c36588ce66c1";
@@ -27591,6 +30876,7 @@ tl: { # no indentation
   version = "3.2.1";
 };
 "texdoctk" = {
+  revision = 52851;
   deps."kpathsea" = tl."kpathsea";
   sha512.run = "5b2cfd56eddf1cbaa2471f631bf3b3e7dadf440fa4103e6ba490f738893ac7df4aeef5795bf269df16c9a02f873cb326bda5b98d2853c73a62b0e56a677b6e04";
   sha512.doc = "1ee6930d450e7227bea84450a3f97933fe2f7dadd92e77970e7ce73f12fa1e9466c3b3ae987e441c447ec6d3069c7e0a4ea5b7d77d2690c71d1b8f6970b90aab";
@@ -27598,6 +30884,7 @@ tl: { # no indentation
   version = "0.6.0";
 };
 "texdraw" = {
+  revision = 51030;
   stripPrefix = 0;
   sha512.run = "30cc546b259f93bec3f5d3efea5e73cdf7e34f9f76cac8946d82fff3123abb6f5bc7c70c48987bab24e154c56f6145fef0680b416e7cf2aaa79f5aa673600f59";
   sha512.doc = "28a7028a28749e2d7c8b5176dd473b749230750fe1ead78a731c9f4a40db299c4bd034be18e0587ab1dd79b6b0802abff19d12fdf44dab5e1a64e26d48185771";
@@ -27605,125 +30892,149 @@ tl: { # no indentation
   version = "v2r3";
 };
 "texfot" = {
+  revision = 51525;
   sha512.run = "0b9376db4c9006121907650bac3a13f8e81ca7bfe48cbab132cf635c72003de9aacf39f77e7e96abc3f7aa781f91cd9876a0fbcbe933d01e807597a581efaccf";
   sha512.doc = "fba2be7e6b23503b98ab499fe4799a1344ab0e9d4c806c451b38945cca58cbe15505b360fdf2d83906d6457fa94123c2b704d4c1da8e0dc435ada46af673d134";
   hasRunfiles = true;
   version = "1.38";
 };
 "texilikechaps" = {
+  revision = 28553;
   stripPrefix = 0;
   sha512.run = "b65e737c138a176e6674612dda6b066a9953d8b737fe2e947eb10c058d6b67eb27f154a3ca4f346481f4dc077fddc2c95cc302762a9e9eaa2f0f1d23160bd4be";
   hasRunfiles = true;
   version = "1.0a";
 };
 "texilikecover" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "fc73ce5601a10d638ea78fe815978d395001a73be75084539498644ac7f3fea0f3a57e95bd80e5f38659891adfd9c817e6068acfe04972a836938d733e0d4382";
   hasRunfiles = true;
   version = "0.1";
 };
 "texinfo" = {
+  revision = 53776;
   stripPrefix = 0;
   sha512.run = "f898722cc80f1143e1df4df0d4a73008d80b2dcfb567f6ad02edd172373fea4a435c95716242103a6f3e0273b4899b004c988292ccd9f019a270f42f4467440d";
   hasRunfiles = true;
   version = "5.1";
 };
 "texlive-common" = {
+  revision = 50466;
   stripPrefix = 0;
   sha512.run = "a2d1330cf12d9c7d78350384e69163f3c97c2d7ffe923a0819f487cf5b1f610b50ed2835f658f4a6c6e7df6b9d95bebed24073cb03f4213bd1a430e48716a702";
   sha512.doc = "9fa949114a490a7cfcd7c0083ea7fe797bafe4ae4b61f1b689e9950afafe8a8367f87a5e371aea6b669c90b3a6b31df00a0700e3bc0a96fd2b71c373f2a24a6a";
 };
 "texlive-cz" = {
+  revision = 50778;
   stripPrefix = 0;
   sha512.run = "2c65a9915e58f81a298389fda9dbfe5c6d0a0fbb91db2da4d970f084f568da8dbd20e61576c2af05c74c4c2876835f8159d6dc3a250038dd64b433e4cc305a37";
   sha512.doc = "8527c18ca429a877e747f66d68e3c6ff1992c42af0ce8e65d15a89743b689062e5d825578fb5896d5fb978251726cb2623d49207cb8126258bb6f419b36d09ec";
 };
 "texlive-de" = {
+  revision = 50617;
   stripPrefix = 0;
   sha512.run = "89b6004f34abdd998257c723613ac09a1ff761bc2eb1dd441b21c6e25958874bc388e0fb4256410661f53d2145f3ccabeadc9ec1341af834b719913dbc6b59a0";
   sha512.doc = "c13300d4bfa0a9d97c5b01b82634c854dbf9c4239d9ad320470c8d16eff439b1996ff0d51a72baa5c3080ea027105521bd165198c8fe58f06fe785d130603916";
 };
 "texlive-docindex" = {
+  revision = 53970;
   sha512.run = "39f3359e2a2149cf6d34066a6f727b0bdb56675635d1ec44fcdb910afc0cf8ccafb62b42f3d85bdb51319de97aaba5f0ba6c770c83ef81e634f309ee1fefddec";
   sha512.doc = "e01e11202d021f7f3a12701495fe2e697a97da27adb06654dd5afc72cb217d8e86ee3e3b269c28efd6e2b7464a392903cc1794680299902c09aff5f418ff30f6";
 };
 "texlive-en" = {
+  revision = 53451;
   stripPrefix = 0;
   sha512.run = "d9fbb8bce4b7a4e3f661a18608addbfa88ccc0ee73d6186fdc56baaedd21c0163f053961b19f3211761a0390d44e2f524c07c4c25e81a33cef0fde045f5a0c64";
   sha512.doc = "c25b29907122f731a5980e3ca15ddf31c4e4866354f833a915734868132a8e46c9485a67750adacabdf86b724d8508c0cd6009835af89846b929f03d023c76f5";
 };
 "texlive-es" = {
+  revision = 50671;
   stripPrefix = 0;
   sha512.run = "ecd29f0b62735145f57e48c74c07f1b7188a3e4aea26d82dad7e136e2276e2697381bae0afacd7b2083d796c213e72141893fc186b84e9b6caf4ed19513d9a29";
   sha512.doc = "32c4b3fad90a989e2b94f4fe63b8869721c36aa90df3a815177dbae38c8fc90bc420f197810266ee1350e2580428b8444ef73c5436041eab8bb46704bccc4fba";
 };
 "texlive-fr" = {
+  revision = 50567;
   stripPrefix = 0;
   sha512.run = "fa1830c0a7337f5629eff5f380f877307304f1986a3d9f63c43b0ef88960354c2737278e0e123523eb0d2c2957ec41ace896cefd096f4b2982b7086daf7f3ebb";
   sha512.doc = "bee228b706954bcdc1ea424d0227890bda2115abf47b73687a0f486b7daf68476bfd7a649f457b22b62e55936b1a113a685451095d1f23268e0d094dec902b7a";
 };
 "texlive-it" = {
+  revision = 50750;
   stripPrefix = 0;
   sha512.run = "be04ef3a7fabeeb9d6a05210e5939d61e0a364cbe97e461476db186c71ecfa2754af159ced3fad5fddff081e6bf5541bf60ed053cb8cb0e2de8813944e775009";
   sha512.doc = "a3381b82bfa78453c6014849e8ea8dc2ee881088450824e62bc056f0303227fb7eb5276f594436c6ac113292ee52672dd3e7b9e6007bdc22dc331b63330fca81";
 };
 "texlive-ja" = {
+  revision = 51990;
   stripPrefix = 0;
   sha512.run = "279c986e659a0ff33b4522057c90312f2376552b22bd3229cfeed2e87a0644410ad798a8bbda079253df16a3156e3dae9c20abc6132e49023e17e9e234820043";
   sha512.doc = "fd26ed74bb6a85f9aaa1907d89b3c2e6624325e36652a3e3c7a540181efa36f2b44322aac55190085c47d48176b0d04e6c58ef9fb633057954eaa6fd408998f9";
 };
 "texlive-msg-translations" = {
+  revision = 53947;
   sha512.run = "f866a0afecb5c3a0767fdb50ab62d3bc196895b6dd6f9840612e28f0b6090c41ba00ae87b4e6a854bb3f6e66e6888856742c7737c07b5723aee2241022538a22";
   hasRunfiles = true;
 };
 "texlive-pl" = {
+  revision = 50665;
   stripPrefix = 0;
   sha512.run = "57dc3f82b08ddb2a9f6e168ba7cee0870e558d796bd6acb8669207cc14aa327a531f6731d312fabd1761444f9d49da4f2b8a1424c603735468e76ae868813208";
   sha512.doc = "1e00df1860220e5627a913f2504e125165ec2743f5b461497e77636e46b069ba2e790de2c01317f7698212d2862e0aaf5cdbed40eaca40618d97e56436b93adc";
 };
 "texlive-ru" = {
+  revision = 50683;
   stripPrefix = 0;
   sha512.run = "53b6b2cdfc0357f7614cdb9ac5f4f26dd51288acf093e3bf644b0b259c61b9765775bd90956b645e2a915cd64b4d4470679e3725dc8f1dd044f2280e04677c5d";
   sha512.doc = "b5d982cfe9cbb9022b0d35cf583a90148c0add4f898dc86f732f305cd9adf704902851366722d2624f0ceac66d00aab177663160d5ef624331f83d6a717c3505";
 };
 "texlive-scripts" = {
+  revision = 53977;
   sha512.run = "7e10b1796d11a58ccbedbf5f89bed570207306f2ee196680ed7c5f784aa8c1607e7ea26086812212e5fee8885fa48ae6e1856c3a147333f60224f2da53469014";
   sha512.doc = "bf95f1b8895f9c7bd53c09072bd8ff77af7d357d52fb4d9bf7e9a1390c647cafa57c3c0c6694e8fa8a7e03d9ad301df7f52a07be4d79a00592b020919b76be12";
   hasRunfiles = true;
 };
 "texlive-scripts-extra" = {
+  revision = 53569;
   sha512.run = "a2f8e7888873d4f129cd83060ed0a9e65824c76870b238ebaa9b630aa00a51fdd479e182fdd4f9bfbeaf1113db5bb06d08baa2133544acaa368fbb690cec900a";
   sha512.doc = "15a2e6a5be58cd74f8b8d906153b6d34f54e7a2eb1e3914016ca515bd43a67c021955660ef1c31b013dcc5ba91fd0015bebbaeaaee6916cdb75b6f55bc9152ac";
   hasRunfiles = true;
 };
 "texlive-sr" = {
+  revision = 52494;
   stripPrefix = 0;
   sha512.run = "95d30458e64f61c89b015eea0dd8fec741ff3cdd4360bdbb65f0c8c8346b11a0c61d2b98fcc63ea62d621389411d257da4da0126a40dd9880ad557407fecdc25";
   sha512.doc = "6965ea95aaedf7ed6c5cf55aa0524bb2ddaccb218c630c600e7942ac3f5a3609e1744e4a0e31e7e875550f436d5cde57f5953dacedda861f88543c915866bfea";
 };
 "texlive-zh-cn" = {
+  revision = 50478;
   stripPrefix = 0;
   sha512.run = "86d70c96c3fd13095d664a9f719613dfcc6295803f9058341fd915d6cac240ca11d64e939395dcfc0ff84eff1bcdc2425971ee0c90f7fc45cc86be737e30b772";
   sha512.doc = "9567c16b972e2bae6f02356203cf68cf4390434e3da4f8a1cdfe8b902483fa33289c761bb00de345ff038e98054fef5994a980daaf0bb75aabf62be2bc1bdf75";
 };
 "texliveonfly" = {
+  revision = 26313;
   sha512.run = "e02a1214775f209c0698e62fb7f0ae91c9ad14024c076dd6a5ca73fad4c92ebbf9bbb0f281869cb0c073538c66edae2af23245f1bd0e1f939c80841269625af6";
   sha512.doc = "f89f82a59f726b226101275b1aeaec00b99ea1302ee5ff8c021e4696b4abad39d1a95b544a4bc45483440591e1266cfba4d5c3c3bbc769f193671a46aa7458b2";
   hasRunfiles = true;
 };
 "texloganalyser" = {
+  revision = 35584;
   sha512.run = "cbc18031b9b9ecfb6088b82b99eb72ad70fce92e4b103230a06ffeda0a50871715405a0aad18a7495ba1b80f16913cbadc4b8d1a7d2ebaa77d5cbd00e1682c93";
   sha512.doc = "1cccf82314d9afc841044aabbb5f06933f6bbdfcdb46c22909ce18c2736d40c532944405232633f61893f0f56de24233d520edd64d4cc89baeca5c01ffd0f9ea";
   hasRunfiles = true;
   version = "0.9";
 };
 "texlogos" = {
+  revision = 19083;
   stripPrefix = 0;
   sha512.run = "d3b5f5ea0dd90e925bffc1ac0f790848d1c2abe50003e2591c8efb219b4a205d48e4420d2000b3de15b1ff9d4d0bd9e083ba1694d4ee34febd68f8db0df16ea2";
   hasRunfiles = true;
   version = "1.3.1";
 };
 "texmate" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "52c35f096426385f229b7ddb66c8ec2a20539bbad6296f2bdd230c2da79edf5668fdde0fc7ebac7099a414b622b31309fa7f610564c8212602f71dca7193c597";
   sha512.doc = "dc1ca347bfb0ba8c54403e643b4052604f98b39ced23d092808cb221e930384f49d1c34794a933b0a05c7691ef04158688653ce69eb8a4b72e9172b4254954ee";
@@ -27732,6 +31043,7 @@ tl: { # no indentation
   version = "2";
 };
 "texments" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "6b0bc365ff7ba6a8118a4e83350e73d5c4dc40e6c30a0ed3267f0f20178a08264866bd016aa3a9da72d4f27a20bf7e8f658417561468294745b78911ff46fd4a";
   sha512.doc = "67b7843546704e9b48f6ffe75a33ab68a5d8ededf3cd45ca329c6ca5ffcc783f4ecb9a663fc4eb94fb554e3c43e753512f82dc8f2f7924c1bf4bb8942aabf749";
@@ -27740,12 +31052,14 @@ tl: { # no indentation
   version = "0.2.0";
 };
 "texonly" = {
+  revision = 50985;
   stripPrefix = 0;
   sha512.run = "a51d7288abaa3bd03e8f3816eaf2d7f8931340e95e3897ea4a63ae3d251277a78e71ae66b617da6cc81a8100c9ffe64a1c9142369c67d58daf200ab2ed7c9682";
   sha512.doc = "5f03987ce079f21801f08a7e325a36c6f1065f5cc32ff2dbec7989bdd3a6b3c54ade8f96a71e19553972d3c36454a08b007adf3287a7be7972a8b3ce6961778a";
   version = "2";
 };
 "texosquery" = {
+  revision = 53676;
   sha512.run = "d454a95139920c24404a501ad3bbde4ae8e809e0f0b6b7c32053d375e0cac31d81087a53d65ab067c9c6dfd988ae90429adbc5d7cd2e1b23f41f46dbf6a25056";
   sha512.doc = "51bc4e5a9f62b4526198b380fa69dd2d79ff69ccf0915aef4269d890fed057c4130ccca65e0c279e58ebfb72347d627b186534138f9c4bc8d395677c73a2a0fc";
   sha512.source = "5ed0dddadb7e8f406635d7a2cc309a030826607a76b4520b1f47a07affb603d96577118ba1fb5b9797322aa49a68616acbbcdde39bc8538c54c5d2fa1aebe510";
@@ -27753,6 +31067,7 @@ tl: { # no indentation
   version = "1.7";
 };
 "texplate" = {
+  revision = 53637;
   sha512.run = "8c9ff524bbc1c4a9a89d4da0329c560cb4a2916e87fb5dad8ffb8a288bce1c0e0eb4321834a34e4aafd68c3b8a8fc0ba44018b80fcc054e965869cad120bde4a";
   sha512.doc = "0bce839225eb4d2bf8b763510ee89ca3133fef4a4d1ed7ca4a8257d00c64d1b188c3093a0d11c319450a219c220d44edc93ab66a4cca739477c42bd526c54ae8";
   sha512.source = "599a199747dab1cf39f7e9c2141b38136085009b04578e65a5ce332ee3ecdfeac0999b721fca5f9d7335fc6fdee0a09bf1e078f140dcd4cd74f4a69fdebedf57";
@@ -27760,6 +31075,7 @@ tl: { # no indentation
   version = "1.0.2";
 };
 "texpower" = {
+  revision = 29349;
   stripPrefix = 0;
   deps."tpslifonts" = tl."tpslifonts";
   sha512.run = "7e2efadabaf173fd30c592cbcd2338563b8690048ccaffd86efb079a04b7b95c8ab113b99205cbb2912eae3a709a110d7b152270422cf2cbfd2ab85d42f12d69";
@@ -27769,12 +31085,14 @@ tl: { # no indentation
   version = "0.2";
 };
 "texproposal" = {
+  revision = 43151;
   stripPrefix = 0;
   sha512.run = "19265b32271b8603d8baf8b16f043c3228606230c1151a33e243e493b6306faa839860f2b07ec9d5d43c57f49e984134e760342bc6302186924e5c95cc1f3380";
   sha512.doc = "70c04643ced459099ae095c88c0316e96c75e99bba0877198c7800d3b5cc9ac872f74b36adfb03dde968150abb3cb99131fb52ecaff56dfbf1aa85379718a74f";
   version = "1.4";
 };
 "texshade" = {
+  revision = 46559;
   stripPrefix = 0;
   sha512.run = "785bba8f83063d37f2473759eb1ada73b31098ba757ce65ca1b7ac811581a64c706f2916eaa1237f6c6ee39dfa3514616d5b8789b9b8e2418c02ddd88e77e428";
   sha512.doc = "e08cefab84354056854fa00b15efe8ba99e2e8f4ae6721afd03ecee5fad7b227674ca456de11b0607b1b34a2378ce41e11c517b0b0a544c12278bc3b9f0c4de4";
@@ -27783,6 +31101,7 @@ tl: { # no indentation
   version = "1.25";
 };
 "texsis" = {
+  revision = 45678;
   deps."tex" = tl."tex";
   deps."cm" = tl."cm";
   deps."hyphen-base" = tl."hyphen-base";
@@ -27794,6 +31113,7 @@ tl: { # no indentation
   version = "2.18";
 };
 "textcase" = {
+  revision = 52092;
   stripPrefix = 0;
   sha512.run = "9cb8145b46343c34c4ac7c7ec64dc6d69f08e329cfae2c1ac41902a74e92cee715b5b171bbf26b92efc0a8a4500d11d317d8c927ffee623450b39e4ee6555483";
   sha512.doc = "737c03d99e03a188c80aa8478abb64f05e6a3241185d03746682bf3c5e2e48ed8181e46d1b10c9170b98882bafcfe61e37a0409d42d2506125e9515bc44f0e2c";
@@ -27802,6 +31122,7 @@ tl: { # no indentation
   version = "1.00";
 };
 "textfit" = {
+  revision = 20591;
   stripPrefix = 0;
   sha512.run = "96638c0bd5cb14b629f03e4b6a3266160c75bcf05d871ce3d4262ac1c070d9efc0532411f5d8774f97362b148ef6cd1c5dd5253e72e3aebb542fdf14aa6d78fb";
   sha512.doc = "b88df8c99662a182483fc6d12d33d0bac5f6a32c84be700146d048b799045800cbb69b21599e5debac122995800b0e48fd82395c498a58df503395fcedc92228";
@@ -27810,6 +31131,7 @@ tl: { # no indentation
   version = "5";
 };
 "textglos" = {
+  revision = 30788;
   stripPrefix = 0;
   sha512.run = "1652260a3e946a8847ceb7f937893bad27a24737d9b3573466f7369ce9cdbf900af0ef6c7f0bf3033200664da736e8232c3fbf6db61bb7d51acec1010d13a3e0";
   sha512.doc = "922ce1569fce889bc4608e9a5da4a45b7c3d2e80303ac36167efe6767c266844664de00384447e288da70383fe91261e5914394a6fdf8644349f785600271e5e";
@@ -27818,6 +31140,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "textgreek" = {
+  revision = 44192;
   stripPrefix = 0;
   deps."greek-fontenc" = tl."greek-fontenc";
   sha512.run = "2370f666c2cef43a579e32a755675431717ccfb4bad6f30261a6c67e0617816ffc272c25e0d076d91c4047c41926c92ae375507f36f2fab01673bd7e708f5188";
@@ -27827,6 +31150,7 @@ tl: { # no indentation
   version = "0.7";
 };
 "textmerg" = {
+  revision = 20677;
   stripPrefix = 0;
   sha512.run = "5ef9048849bd2515c1af0ff41d0b5189715b375464c15d4708e0152d99f01839c462a0c9d0a9a12f401375d38e2c53a0f0c314e6905e1bfb3171296448bab649";
   sha512.doc = "05a087347db5dce688065f56c106d022f3ac30d27ee5d2f420e7658c5b81df66549cda86193f3ce4fb2cbeaad37abe7eb32b984d00d4f25dd0ad51433f8d7a01";
@@ -27835,6 +31159,7 @@ tl: { # no indentation
   version = "2.01";
 };
 "textopo" = {
+  revision = 23796;
   stripPrefix = 0;
   sha512.run = "89a415b1040ff44f62c452e61abf9a5760929953ff0a4740080f79e8343b2b4f4eef9340e5a83fded39a000947dbe7f2916fb18624c4512c5ab58171708de268";
   sha512.doc = "80bd54a9843fae371884b87710094f72926d5ad8a7e40308e9aa753b01533d3e649ff94831ea75aed264b5f9f5df482e157a1563dc85ab2976cbf9260425c5ce";
@@ -27843,6 +31168,7 @@ tl: { # no indentation
   version = "1.5";
 };
 "textpath" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "7780972480a1355a05cbcca3c46f3e5284b120a93ed2265f0fcceb6965f55ed793756cf96df63aa8da589dd12fe1b8127bd470077b9f9dda758238ced566b3e6";
   sha512.doc = "5507082be0235ec2253ddc0b03e239607b9d140952799684e5193e4d3d584846d33a59aa9b1630d058f17cacf7cedd2fe0a180b40207ea8f10947b534784fc02";
@@ -27850,6 +31176,7 @@ tl: { # no indentation
   version = "1.6";
 };
 "textpos" = {
+  revision = 50988;
   stripPrefix = 0;
   sha512.run = "430c373d2c228615ecc9c46c10a99ce5394ff0497e9a375eec3c4e409452e006979501f7d18c5f603055c9ddb57b7c0687cf0a9273761d23aec75ed64c032200";
   sha512.doc = "5fdd14982f8b783f6b42197fb483eebb62f40c7e6f80648cfe7b7a356ae3fd243b4133a050cd84d2c8893460c15e717a21a70a5e1e0e31d52275f4a206956eb9";
@@ -27858,6 +31185,7 @@ tl: { # no indentation
   version = "1.9.1";
 };
 "textualicomma" = {
+  revision = 48474;
   stripPrefix = 0;
   sha512.run = "044ef3451267bcb74d3e4162d19915b1b7f2fac337af6faae7d3dcd630bc9be8484fa155a3579ad5245ce1f07578d8faada2e6a67830edb09b332714a95f2e9e";
   sha512.doc = "6e6c380eb0169878a34d3d40fea47bc57885c7ea378ffd2d2a7e9bf26826dd922f67a02e74d6c78801cecb87b18de3ab52b7600623de39c53954ed568c57eadf";
@@ -27866,6 +31194,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "texvc" = {
+  revision = 46844;
   stripPrefix = 0;
   sha512.run = "cc149d490180e58e9796ae0bc962e51794400384671eee53c932acef88512a129dc3d87ea4378247813acbd3ead010014ab71bd1717b6edb0bef4b7856be8aeb";
   sha512.doc = "e8639a2ffdd2d40b27545c3f4265e473bfbd81a028632a082199fb0dba7ea0b0468bdae488a9eeea63578bdd610f7e16d4f4da846f9316dabf5645af95fc8cab";
@@ -27874,14 +31203,17 @@ tl: { # no indentation
   version = "1.1";
 };
 "texware" = {
+  revision = 50602;
   sha512.run = "cc66e87d459fb04070b0c43c16f3412ea22e3cf8a2748efb8a87fb0417bf0b9caa32a38147a9dd068d7ad0d25e320dc78ac54d9004cf5adef337ed0a90e52923";
   sha512.doc = "a8ef6e6a062140ca6ab3311b7e57f452bbbb0eddebe36d02cd8122141320814508438d764a97d351febf9f65a5539b03774f611e9bfdcb5abdc5fa989fc5a848";
 };
 "texworks" = {
+  revision = 52616;
   sha512.run = "61a41a470a22bdcd70ed769385accc0135b7fe68b96b430ddcfdfc8e444ecd696c66167e2b44201809cc95b6369a925d32874dd40d878f62a6b7730852fae1e9";
   sha512.doc = "d2ea2fa3447a4da66ad2617b20f853be8c1bc8aba163ef995ce0e516d9c249990113e0ba2f13ee6f1d51ba3a3e6b5c3745f68157399b9c1c6d4aae8b93134eb5";
 };
 "tfrupee" = {
+  revision = 20770;
   stripPrefix = 0;
   sha512.run = "ee935ea5c6563fd8da4f403a1c3583b289b64e212aed4b9e3703ec345dc47c5521d291e1ae0a10c9aec2ebfed407fbf14e804bf51ae4c4a1e03046fc7cd0ad5c";
   sha512.doc = "19da18d665a8369e58a26d4e979d5fd6c8b3187dfba97a281008627aeb8c5ee824dc2ad3f5c94c3b35c67fe28a646f44aa5f532912de5f5640b0a7d56afec2f8";
@@ -27890,6 +31222,7 @@ tl: { # no indentation
   version = "1.02";
 };
 "thaienum" = {
+  revision = 44140;
   stripPrefix = 0;
   sha512.run = "25f6bd1e6e9586b261721b66b6b193c07f60dc074f7b7b1911b0a8ba4f33815c86945bcb3946ffe153f70f0dbaeec4dca8e5574f8369c754a6151fc271029f3b";
   sha512.doc = "246dbb624a2e2e30bd5468c2596e7b3f7183c7dd9d03eda42fbed88fe51f16b53801ed39f85590d2739a93d48bc413fce5c52685d5425615f650b19f56013261";
@@ -27897,6 +31230,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "thaispec" = {
+  revision = 51598;
   stripPrefix = 0;
   sha512.run = "16a7b186e026474f659ceade9d18f339fd597857897354c40208efaaa5caeb29be4c4c8b68aed2edc8ca8b4b6ef5e66ab511ebc943928b6ea51fe796e9956df0";
   sha512.doc = "e3bedf4c192c9505fe8569195e3be10643d236d826eac14878e46b62133a09029ad5625f988e6b22009cfdc3a26550f155b8d09eb8476e84ca561bb6f470bfeb";
@@ -27905,6 +31239,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "thalie" = {
+  revision = 51789;
   stripPrefix = 0;
   sha512.run = "193f59cc9fcad15ca4fd52e011152a08066329ed496ad55d4245f232a701692b8c3a33f24d457358d696ec540041beb90ef37696a77b1685f22f15031665585f";
   sha512.doc = "104972514a171a25557b5a0ba6501be9556f77eb7fdedc60843797ba7fc53873b75cbf4e470dfb76866e6042f77c5c39ae86367a119f64b34a18183eb0ef1be8";
@@ -27913,36 +31248,42 @@ tl: { # no indentation
   version = "0.10b";
 };
 "theanodidot" = {
+  revision = 51695;
   stripPrefix = 0;
   sha512.run = "f89e4fc9a726b87568eb5771e0f3a4c29f23198eece256fffd85aa3f7d8f359fc9446e24cb5945b3297d373a84ec11e6b0322e378fa6bb979bdf980e91e5ce82";
   sha512.doc = "82ced7608403dadc3d5be699acec21bdd7b9fd44c68db769f6060beb26b7a448bde9ec43060e95ee6699735c4c347ade0b2a1267f944c2b168363172c3c0b979";
   hasRunfiles = true;
 };
 "theanomodern" = {
+  revision = 51759;
   stripPrefix = 0;
   sha512.run = "cee56b45fe0b06c36fc4a11dda204117d20a5ade50b5d706aec08c4bc66ac9d801cb3c885b8f18b54db7a0152c3924cb844a0101c71a11c81d6ccd32d18518da";
   sha512.doc = "d7c6258b4e025111f8c8e29332b8325128fcbe095d9e8e3975227c86e171cd12a73319cfd341030f06f901d005815bba3c7643063a257dea006a159ccace5355";
   hasRunfiles = true;
 };
 "theanooldstyle" = {
+  revision = 51767;
   stripPrefix = 0;
   sha512.run = "41763eb636491cbd5d7f712b91d3ab6189a87d6fca61efb0b552f5c57eaf25a830763ef83d9b093b2eb5a31f45f91ecb8eef870a7aec0e0084dd685a55088498";
   sha512.doc = "3e9dfe575f249cacc577763f7b7aa2bc128659bdd19b0ab97b7c9a43a6b5938d7067e657c9a469d4b163faa75f1373a21f5e0825e345d342af037713d595713b";
   hasRunfiles = true;
 };
 "theatre" = {
+  revision = 45363;
   stripPrefix = 0;
   sha512.run = "d450ef176d5543581316ff36590eba2ed829a3f2b8a019fa8ca379af0ae2aa4df4e4e3068b52ed91edec4df33d08aa78b1f5f21d0fdf33d0aa718704e3de2851";
   sha512.doc = "cb4920d5acfe0e1288c7d459d15b06b9ced1130b56ea92c9ed49376743cee7e3fbb694362bac51f2660269992d64717effc5d8e9f52a21337fe7eed51a4622f6";
   version = "0.1";
 };
 "theoremref" = {
+  revision = 30640;
   stripPrefix = 0;
   sha512.run = "ec3f8bea432fc0a72d008884e8879bf22db5c2be3694d298828a493e1b4cde2dd591f35887e4aba646f44db47a75f87a08ec7e269cec77be66cb45798137c85a";
   sha512.doc = "ec478b840b200dd0e731545f039c8ac01d9f088b7644350cc3366aece722b924187ca0701ad15be3a428131bc3025d1af9bb0440e8a487e0272c8d7997924200";
   hasRunfiles = true;
 };
 "thesis-ekf" = {
+  revision = 53685;
   stripPrefix = 0;
   sha512.run = "2cf781811d1a58885b4f9703d0541da7d629c4f1fdc6fc0c519f266d95fdfdfd7c5dbf5bbb92aed80269292cf7bfed016433a9e75d13836b27a63616bf745ddc";
   sha512.doc = "9215773df9ce87c5c397f87d1bb53f44177c301b00a220651c24a7e65c2b4a0ac82b8441d877b51cfa71d264a385a566714bdb8671dc1475411057e80ad0544d";
@@ -27951,6 +31292,7 @@ tl: { # no indentation
   version = "3.3";
 };
 "thesis-gwu" = {
+  revision = 48537;
   stripPrefix = 0;
   sha512.run = "f5f54b6ba4d95422d3b5e219a8319375f543939b0a4fff260616048faee47203497cff1eadf8603f03ad54f7f93bfd524fc3f2efa108bcf36c34a38f468b85cf";
   sha512.doc = "88928ac624aa85413652ae32170854cce4c0519858b5e35752fa06bc4e7130ac031eade4127704edadf69a1fc5fa0e3357af1a0350af83decde430e606c0ff4b";
@@ -27958,6 +31300,7 @@ tl: { # no indentation
   version = "1.6.1";
 };
 "thesis-qom" = {
+  revision = 49124;
   stripPrefix = 0;
   sha512.run = "5afaa0d05b88dbe2d3e5dc2450d1d01b57a24f54be4437c2e9c71afa6c8b1f10144c674de2d8062c6d4a5b7a5140b1fac6ba82bb68c03ecb6560d8afd1384cae";
   sha512.doc = "7bfe521b8f1df650304080e50805f48437e9b22b5b06f3f2fc309bc770ea0370d0e5acf2977c4332e0ca3d7b664c2dc8161f31f057a910069ba1cb585225145d";
@@ -27965,6 +31308,7 @@ tl: { # no indentation
   version = "0.42";
 };
 "thesis-titlepage-fhac" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "62cdba17287f90580fe6273d1ca9143c9fac01d7da214a20413995b925c6eced385b3a5c172e8bedb4f17396ed7e9b78e789ca475c5efe542283d9b421bd6ffb";
   sha512.doc = "13378f3ef37bd1033d009d03772244e048ff2a16b95ca8a0f14feeda8c44b29036276c41aae812cf1c28ac5684edad56b000f8a45576bd0065fb844f5b6dd189";
@@ -27973,6 +31317,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "thinsp" = {
+  revision = 39669;
   stripPrefix = 0;
   sha512.run = "ddc80b4de32524ce76fe34e8f88d01e2db18a8bbf60a718454a0303aea8082fc2e495c89c2ad0a7459ed3151e890e30a1263267f249581e24bac87113a5fd266";
   sha512.doc = "b5b50522a4a7b5f7772118d95fdf42e2f570ac35c49a8690560df27df0754a170acddd782b516fa185c0f6ef2abb3ff8a9f366370c2ad46e2e4d32dba21e634b";
@@ -27980,6 +31325,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "thmbox" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "83ceeb0cf84ff75afb734f41be5a5309692c6804a5a20627c54cc8760f8ac5e205cf1a24097c8b8624823668796092d620f5ffbc488f63b87e7cbf9365279aac";
   sha512.doc = "ad8e0710a15781eb3164527dd16ecc2050d3cd3317c386841ad8612a9ebc6055a1501272e3b01bcbc6a7f1ffa80455bf2ccdc0cc9ff4428c9688e9f6404a16ff";
@@ -27987,6 +31333,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "thmtools" = {
+  revision = 53219;
   stripPrefix = 0;
   sha512.run = "1530f49499593262aaa24714bb4f9801876f9903b4c8f664deae0ee65e9384d52a050c5352ebd2cf158342752191e15deec4b7f5d2cc880a39012720963cc723";
   sha512.doc = "9331df3428012c486ddff27810248f83fb607a780509691d82b7f732269654d848441d2982cc8609f5804a3b73eeca5184cdecae90e3a337945357bbe660c685";
@@ -27995,6 +31342,7 @@ tl: { # no indentation
   version = "68";
 };
 "threadcol" = {
+  revision = 28754;
   stripPrefix = 0;
   sha512.run = "e75f887dc04aa55834c285d5e36babfd0844b79b9d1cc5cfb2eb6412bde9f42b651bfdca9f6819b27f6615aff6f96031135f1a6af3b59503fda34e7566cdb01a";
   sha512.doc = "626ac69b0a26fdbed51876782a9ac2e3b0ab9b32bf3b2f32ce19cce080b5cda40a62160f453199a76b58903d762cc8085a8541fa2de3adc5fea6266592c06bdc";
@@ -28003,6 +31351,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "threeddice" = {
+  revision = 20675;
   stripPrefix = 0;
   sha512.run = "66e6a27aa277b45b44c156d408c764da5bee6dc540f2058a783f02bbe806c95052267a5ed79ea49b5dc356d0f03747e9b186542640b34753a693ecffa158a6a4";
   sha512.doc = "c750497229b8bd41eca05b221ed2ca2ca49db8cbbff03bfce2712869d352ae0385e4c10e9730e0b2f8286db9af1e1b87f10d599788a3dfe8d41c28efb8b0e4a6";
@@ -28010,12 +31359,14 @@ tl: { # no indentation
   version = "1.0";
 };
 "threeparttable" = {
+  revision = 17383;
   stripPrefix = 0;
   sha512.run = "f947dd01e56f6f3db8a4ed0b8f3ec564a38486fcb27f30bb3bacdf31af8360590e7e3886cc00cfbab813213974f4b335ff06ceb521d25519e8b95e345a002692";
   sha512.doc = "6b5eb1d6ceea740ec54ba935c45f03c2e6328140e86122a38b90d84e375382adfcfe14e2e9f56384f825c913140f01a1eb6266d2d46f6b813a34b4da652ee31d";
   hasRunfiles = true;
 };
 "threeparttablex" = {
+  revision = 34206;
   stripPrefix = 0;
   sha512.run = "9dd33dcb7f9eebb9396a6a05ac20e9bb221260cd80f355b23f60a0466c64847ebacd8b0d19c75b3d9cecd9c522a8633468e7cc86121f7626141c066e12f977d6";
   sha512.doc = "3dceb0aecfa2ef09bc20250cd38dd698e35b2cd2a33fb446e78a39fa654899c4f6658a18b95b39a5bff2279a0cbeeda71bcedcdb7fa91d148290302b73e7a64c";
@@ -28023,6 +31374,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "thuaslogos" = {
+  revision = 51347;
   stripPrefix = 0;
   sha512.run = "584d8f130844ac834be8f061bd8078afcd8eae2e4d22e33d8a61dea8ea637476532181cdc7df9f1710ba5d8dd022a64dcb561f21334b830387e9a063ddbbe426";
   sha512.doc = "5a2298e713e4a0711b01fe7fceae12bf20d6a0fcf91cfda63313e74709586532bc407c07be1807eee5405a6b6de74fe976b2ac56fdebbc344d59255080d80224";
@@ -28030,6 +31382,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "thucoursework" = {
+  revision = 53891;
   stripPrefix = 0;
   sha512.run = "8329369e1850003a66a386a82746c36e62d43ae752844434c83e88a56c7914a5919c137899562b566863e05b15f272dde691cc0dcbbe64df863ec68e59fedc64";
   sha512.doc = "bd28776cba58bcceaf668ede00c2c07eaca6b522a6bf59058c74554f6f17d5be1e66124a612bbe72929c90850359cf5fa632a2ad664e4d20d041671fcf8cca03";
@@ -28038,6 +31391,7 @@ tl: { # no indentation
   version = "2.5.1";
 };
 "thumb" = {
+  revision = 16549;
   stripPrefix = 0;
   sha512.run = "30290cc3b8cc48de6c601fcb3d066f0533bb3f09f053d7912db7a127d8327c4aac0a96499b7eaed36b8caf4dcdda5c8f34a5430d69e1fac70510f426c92ab9f4";
   sha512.doc = "29abd2e57cf17edbfeea06c041666ba29e436defff1600df7222dca6160e7be740b64647d7a44a10f6f803011a1754abd693048ca36c4c372ee0da52df2562dc";
@@ -28046,12 +31400,14 @@ tl: { # no indentation
   version = "1.0";
 };
 "thumbpdf" = {
+  revision = 48625;
   sha512.run = "f3eaaa9ad4287d58ab89b98e1889f99dbabd82153f99921a9249b2cfb741c0cc45bfdd1903590c66bf0b63c77490017c36f552e34d7d15290cbc5904e57a3bc8";
   sha512.doc = "fa2a7cbf80f7b76e63aff8ce5584e698e9f88a0d5a902895afa22a100202fb30bc857f5a1b88e190ff2dbf5ca9cf2338f6ca96a7b80a6d3e6e549040fc3ece7d";
   hasRunfiles = true;
   version = "3.17";
 };
 "thumbs" = {
+  revision = 33134;
   stripPrefix = 0;
   sha512.run = "58e489402fc44cbaece118203bbe7011494b7ef16ffa0e5d60be2daaec0c4ef2d048a71f0d9373a1683aa780fd20e3d64330e199596effc7cf2fcdac34f1faf1";
   sha512.doc = "4c58ff61d64b841b3a3bc018f94c193730129edf45c87fcb9c85685f748ca3db1f7d51969dd25882848cec906485f739f8f07c8bb2f8bded580b59ea93032a14";
@@ -28060,6 +31416,7 @@ tl: { # no indentation
   version = "1.0q";
 };
 "thumby" = {
+  revision = 16736;
   stripPrefix = 0;
   sha512.run = "485bb2670133c3c83f0f7aaa685defc6d36f5d24173652d869f526770e1f55c55a31f3a3180f115aef45fb824d9032ee915b91c1c59b9b33794c95c92f03c3e6";
   sha512.doc = "bac645197085968fe8a7bd41f4a9ec3c6e51e17e6750b87ca1a458acc9f6a4f244d1f3b36b9c622c98492b90abddf9a4df1636b1874c02820dcdb6340bad0910";
@@ -28067,6 +31424,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "thuthesis" = {
+  revision = 53892;
   stripPrefix = 0;
   sha512.run = "f5cc372f4ac691ac96e3b3d2378c6299005aa8d04ec86cf3813c583c1516e99ca41a608bf81507bf637e268bed0544d9bbed8999e941532ce78473e1a29b80e5";
   sha512.doc = "82533934c9c1bf2b8a42339d0bb71aa2ae1f95ec50aba25bfa097da06ce001865f6b5204fa4b75d03760e31f9777e2c89c9486322c198520c06502f841233c98";
@@ -28075,6 +31433,7 @@ tl: { # no indentation
   version = "6.0.2";
 };
 "ticket" = {
+  revision = 42280;
   stripPrefix = 0;
   sha512.run = "cefb3e06df2953063e9d12f19f03e973212e784cebfd2d6628d2e9ddb443159b285b34f12238f6b77813cc48e86aae7018cb5bccc4fd158f4d891f05fc51dab5";
   sha512.doc = "fde4b06ad09837d1d6b6efb275800e32f617619f9c18d2dda5924b094f860492053c4ee361a2fded1c9f4509ba5e615601b183191c0cf064af24cc59cfb23748";
@@ -28082,6 +31441,7 @@ tl: { # no indentation
   version = "0.4d";
 };
 "ticollege" = {
+  revision = 36306;
   stripPrefix = 0;
   sha512.run = "92bebbf5a5e7ccf7be09c205d9007a780422c625d9a308eeeae50b2ec4ba3cc6755a37fd8a49e24b7a381894cc3791fbf50f54348c3ac584a2c0d9a693f93a56";
   sha512.doc = "f0049064eab926eefcf77fe5aa0606202cbce79ed7f0e0f1bafb171ad82b72daf09fe2c0cdf79720834d6349d9190f1d3069f155df922ceb469ad3453a6389b1";
@@ -28089,18 +31449,21 @@ tl: { # no indentation
   version = "1.0";
 };
 "tie" = {
+  revision = 50602;
   deps."kpathsea" = tl."kpathsea";
   sha512.run = "970a855d2d025b3ac30a4e1631986568459bae84727b661ffc8e0982656bc66eb940b59e2b9c3ee6430e3abd5f7d8b0ce4ff828127bd2f9420e0139f1860527b";
   sha512.doc = "24f07d9954fe0385abec8487d4c488df551453e13e8f638e32899722d62dc91b23df9d4494f9bc13662d57fed6e8dfd4d71835ef79832b59f075f9023797e858";
   version = "2.4";
 };
 "tikz-3dplot" = {
+  revision = 25087;
   stripPrefix = 0;
   sha512.run = "6d4aac2eaeebbe2a4827a5a40e8571c48ff4f5cc854daf130ec7f20f8fa06135bae1486a42b223410be848b72be2c19d6e2ed798694ef5dcdb5861846bd9c072";
   sha512.doc = "0fd9bde0f12ddf5a4bf6e2e1df66a9aafa42e81cd945b41e09e8d289c57b04faddd303a415c36239e6686be90f06e8a7cc794ea50d17ec54f1e25703314257da";
   hasRunfiles = true;
 };
 "tikz-bayesnet" = {
+  revision = 38295;
   stripPrefix = 0;
   sha512.run = "b3c535af8afe86e311e4c7371addfa484403a0a9571a17d1cb8d39dd7242aa4798476352bb04a6bb214086f1ed4985595c502723444a032f9bde04423c26bea8";
   sha512.doc = "2bdd764163c606579e68099873844fdef6b9a36495f4117b99ca483bbe43334965a177f398da60e82c11035b5c7b9e0513ae56e6868d6238cc0c798f47ab37e7";
@@ -28108,6 +31471,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "tikz-cd" = {
+  revision = 49201;
   stripPrefix = 0;
   sha512.run = "3fbfa7731eeb6d2b9cbe67cbc4d5470e235f6f990b76b3c82961df172fbba9a8f62ec6055743098cbdb2d3d8aaa3b94f5d4dd8f735624c7d9562de6aa72fdda3";
   sha512.doc = "63be72c0d55112e8328d40ae4fbd1e3c92133615e28f032f9f5efcf2432b6cc440b3c4de4ba46f3eb9e65725caf7de3623a8b49f3b9a87ef780dbeacc536df46";
@@ -28115,6 +31479,7 @@ tl: { # no indentation
   version = "0.9f";
 };
 "tikz-dependency" = {
+  revision = 42454;
   stripPrefix = 0;
   sha512.run = "e6f04805d8c36c6bf81deb68ffa2c43fed7a7ce21541d6b02828574b579cf41d5b57fd53d12f18e82b66c3f96e7c6962555dede9072e243693f6f6767146ad57";
   sha512.doc = "ebb3821e66d238967aadcb06d801a0d18a90610eba37d1763c44452f7bf8fdf0c1cd30d52a72f0120a45429c303739fa239ad05b92ae067b99771d9bf4f568ca";
@@ -28122,6 +31487,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "tikz-dimline" = {
+  revision = 35805;
   stripPrefix = 0;
   sha512.run = "c7a3b158a8acd100192b7dc936f2e452513125389f72c12f0c3818bb4e771abf0748338f13603765904adf1d808fc2b263d0f798999c52638e610d24addcc641";
   sha512.doc = "62edb9667ae4405c798a00c1d079ea9ed5bbdddd76e4a730aaf7405d175afa146fcb7bf43a551001eeff1f683ce3b47a0a79fab66b7410be59f18f4f6e409ef4";
@@ -28129,6 +31495,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "tikz-feynhand" = {
+  revision = 51915;
   stripPrefix = 0;
   sha512.run = "5dcaa2f5c846957f3583ac5bfba14c668cc855c6dd930eb5851c19d448efdd207ff34599b09379354d0c772cb1890fac375d75d61524e64148602f4b5dde4355";
   sha512.doc = "b0cf316dafb9494fc21d5657e1e3c1b4780b7c30e2fe93235d6d8538979471c31989e4203575dc66204fdb1cb11386d290feba3070e43a273b62ec59a73047d9";
@@ -28136,6 +31503,7 @@ tl: { # no indentation
   version = "1.1.0";
 };
 "tikz-feynman" = {
+  revision = 39582;
   stripPrefix = 0;
   sha512.run = "1a1ebc5d2f2eca4e5dd16ce744774add9b8f5b4c3124dee46f0366f43a59b188b0873939d2b68ff0d679f3e52f1a6bc387ab81c363912024efd0eb4110e2ba27";
   sha512.doc = "b3e90aa1d8476aed01faef977b75f4e3450cab121d457eca0bb254075c1e2ed58fe15196ab0d923906dcf6af4f78bc76d6053343f6444c8294bf7d5bbceb3cd1";
@@ -28143,6 +31511,7 @@ tl: { # no indentation
   version = "1.1.0";
 };
 "tikz-imagelabels" = {
+  revision = 51490;
   stripPrefix = 0;
   sha512.run = "b74cf7113b288af9e98ceb801eb4d72e4785ce30390718c4c0eeabae20c49ca8eba91342b89dda525f06b9f436a427277c4ae8415748f1487cdb073088ed26c8";
   sha512.doc = "843f943c4a0e12d1260ee17f9f908adee568100b1e415df3f1b383fd83d70065c57a21290b89923d7ee84819356a366a467e42fed61370b214621a9ee58ee97f";
@@ -28151,6 +31520,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "tikz-inet" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "0c4ecd55d10893ac8bca7b8ac38f2366f30cd989c5d6ab4dd501047f01c0285f8e4b78309dfce06525bf525cff77e2edd56429aa166f24b9a7e07586e3befe96";
   sha512.doc = "e61f0a7879dd0ec016b6c85d66e6ace6b953adc2b9abd87306dc4d071d82f44984e6e25530db3fc658650f5ca74e5c237aa64d18e60a3c5c8c7f57c6f42103e0";
@@ -28158,6 +31528,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "tikz-kalender" = {
+  revision = 52890;
   stripPrefix = 0;
   sha512.run = "8bda7464a62135fe2eb8739d428aca770ee6ba90d3fc08037ebd192f6e436116b59962ae7e0f0cce7addc6a44d0bb5eed47d8c0ff83371a070d3a5c0e8b1feee";
   sha512.doc = "d73e1427574212a2652191b0afce180155ff32b7d8d63f076f2b5dc71c64d1d8dd562666f8a7ebeff445409fb884ac79a66d0271582b0b6b72e84c5fe7c44f7e";
@@ -28165,6 +31536,7 @@ tl: { # no indentation
   version = "0.4f";
 };
 "tikz-karnaugh" = {
+  revision = 47026;
   stripPrefix = 0;
   sha512.run = "aef1c5e3fe96191d0dbe55ea9f2307b05c328b92621e9dcebf4f8fb862ae501bc6dabd4f96915a800532723b447632e21110cbfb9483bd73dcef928b102bfec3";
   sha512.doc = "b17971734dac21649b75c140dc1dca832de35460ba5de9e83f8907ed075fbd0fc2872edd39da7aaa5631b126ca0d59d1ad440e4fb2e68ad277d7ea4bb8975440";
@@ -28172,6 +31544,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "tikz-ladder" = {
+  revision = 46555;
   stripPrefix = 0;
   sha512.run = "b01bd48b4e8dbf5e3549bd24949b81b3731b32d715dcf3d3141e2e2eca5a98c1f5e5369c10cfdc62791280aa3349cb5409f582d71701ff03dced0688cad1847c";
   sha512.doc = "9133c29850f486ea62be8ef9b61bf67907e88c9557fbac132ad04501616efee97725fc58585fce64c59707b4828a4953d926860af7c99fde9e3e73a479b28d0c";
@@ -28179,6 +31552,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "tikz-layers" = {
+  revision = 46660;
   stripPrefix = 0;
   sha512.run = "900f3cba19f723cd75f59f2d3380ac96c6bcd53f4d80ce27b2d393d4728f37b9d9d2bae414f20d38e4b3b93769374281d4e741ac2480986b1662696e08a9a207";
   sha512.doc = "617f1a53fa77f4a766157e72013227e992589b0030ac90ddd181643b1ef212f7e83b8f84f2520d64acf53f2cc76e3333e7ba56b78984b28c3320e2977a87cd56";
@@ -28186,6 +31560,7 @@ tl: { # no indentation
   version = "0.9";
 };
 "tikz-nef" = {
+  revision = 48240;
   stripPrefix = 0;
   sha512.run = "e0bfbce75ff6c9ea02a42576a767e1a06b589797995e29e9c2ddd8640916496bb50126da69fd859d9fe6c89a447c342fc15d66ba620f084980740c6e7238c780";
   sha512.doc = "724dc025c4e67817940f9c4269290dbd1a77208ebb8bb489f4807fea30594eba77c9896e3bc814825307f2012112576cd268633e99b53ead7b60d3689e155c09";
@@ -28193,6 +31568,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "tikz-network" = {
+  revision = 51884;
   stripPrefix = 0;
   sha512.run = "e8100d04b9ef3336a514d18f43ffa6af5d4c2a2ce28663c9f4b40272f5619dbe11dc32f8d7399b7b730f8a90c5aab5fe18cc839d6736d7be6c8e37289e2dd30a";
   sha512.doc = "26cfe73177bbe885cbb224fcd9b4f136a224947a4d9000e24c7f4fd1c44194ab8d2e11dbfac558c68ce36a30c7a7b82f335e3275db22e599dfcddd48d91ab08c";
@@ -28200,6 +31576,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "tikz-opm" = {
+  revision = 32769;
   stripPrefix = 0;
   sha512.run = "eeb000cf28e2ff79106edd734ab71b9ec4ecb0db043a8b03764a98a33d3ef570711974bb13b58453362dd045b1019bfb4a1c1a856b74590110f7d8af308a3f01";
   sha512.doc = "a2ed9a4b52d34dece5b0007b9dc46cf8da8cee0a9288b8db79f38068db5227e35ef9e3fe1f93a4c53e994c06c2d5cf21257bcde24b02f1553cb21d9f7585751d";
@@ -28207,6 +31584,7 @@ tl: { # no indentation
   version = "0.1.1";
 };
 "tikz-optics" = {
+  revision = 43466;
   stripPrefix = 0;
   sha512.run = "703bf6777a78abfc72ff87d16a45c1599d9d68586b38fdb2aa4b2e180ce9cbd808a399a61f6ed381a3b04e83877dc2095c4701d10973f8632a0a32356d71f83c";
   sha512.doc = "0a9f4d246869cfa0a8e7d252f78261a7877f4366fe1fa5c9db9dcb9a8dc36021818042d4ba79eb711e73a7ac32c0dd601ff892f97243fd5cdad373ee3ee02611";
@@ -28214,6 +31592,7 @@ tl: { # no indentation
   version = "0.2.3";
 };
 "tikz-page" = {
+  revision = 42039;
   stripPrefix = 0;
   sha512.run = "be0e43fc329a014b11fce907c6b073f5f4be64b4da4b184705aff2c08d82c1e644056491d01d59ef0ef8a22b4b4c3f22b9012953e00802a9b697a10f0a2f4920";
   sha512.doc = "896da337485c89508e7cb2adf377090b768beded3360a730a5a9c2400db73866b01e0091aaaaf8ce25b7444bf5c5a243f5eeff444d4588a4f8f8b5ac8aa9cdc9";
@@ -28222,6 +31601,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "tikz-palattice" = {
+  revision = 43442;
   stripPrefix = 0;
   sha512.run = "6654ca0888b9a4ac7106d5d275a347e38de7dfc342d7c6228670e51a0285937015a39fd34e83e42a5ab8c2f4341e7f233535308bb2cd65a55227dba2d67ad79b";
   sha512.doc = "8fd0a5a2ca4371e021ccceef41115b6520df6437198fdcba7fc37aa600821a95e91696fabb19cb0277639ff7664574cc56a62e1edcc96e58f26dd65ef5c82fa2";
@@ -28229,6 +31609,7 @@ tl: { # no indentation
   version = "2.3";
 };
 "tikz-qtree" = {
+  revision = 26108;
   stripPrefix = 0;
   sha512.run = "5b00d147eef48e874d2d5c9b171e93703c728cb56f3882af4e63a41b36ebdadbd5bcae332bcfc8e091b16ee14a3a3e16c594b0f0879bdedeaacde1c1700c542d";
   sha512.doc = "0e2a19415d00cc6c94961dc2e8292038078334cbedeff63d889a3d843d9ca3e89533870cabe2068f5631b3f48fc456cac36b1720df175c20a9f6c986c388f799";
@@ -28236,6 +31617,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "tikz-relay" = {
+  revision = 51355;
   stripPrefix = 0;
   sha512.run = "ff171ed2c1b494ecbf012f1401fd0f2d0fc56a388383e482cf50ca7f591af93b2e6da74c237ac4a17fa214a489650670ef8560d826c7674086dbde6d541ffce4";
   sha512.doc = "1e81af1e171e7bf353617b1fee7f456b1e263ad911a842c154ec813c38fbab694f46b134c213810ca8de106854cc05d40bf8dbb1376c055d4d92c4f87e4e779d";
@@ -28243,6 +31625,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "tikz-sfc" = {
+  revision = 49424;
   stripPrefix = 0;
   sha512.run = "f31541b2333c5d8343143aad3a260e528523f78636cd772deae6e0eba81957ceeeb41491279dad621e4476bd9f5125ad994814cb2ab691e5039b54f9fffc7cc8";
   sha512.doc = "caaa3c08f358b7f920322c553ff77e1f42414f16c67d2dd77bde8992e545366224cd7070e833268437332c080d6c65ab244678a3e9d5888fa97d21aafaa2d2b4";
@@ -28250,6 +31633,7 @@ tl: { # no indentation
   version = "1.0.1";
 };
 "tikz-timing" = {
+  revision = 46111;
   stripPrefix = 0;
   deps."svn-prov" = tl."svn-prov";
   sha512.run = "f5f771d0fecb0615770d978d1ee5a8a5ebeae4c1d78d9f0ea33099a5c8d89cb7523c70dc38d3a0a6970e997fb5d7b9eb30e54bab4b865cbd8a53519d3bf529a5";
@@ -28259,6 +31643,7 @@ tl: { # no indentation
   version = "0.7f";
 };
 "tikz-trackschematic" = {
+  revision = 53754;
   stripPrefix = 0;
   sha512.run = "5e00ec05ccd6c6900d8919efc35afc54051a25f8f57812fc476ab6a28f4cc194eb4887699e6353b15b76a68de799fcf9c96c4018ddfcf75d7fb889d998a6055c";
   sha512.doc = "ded12f30baf163ea465531960745af6ab473ff59e21c579e2c58151b61d2aa8d9b04a29d580a8ed86e88dc1a11a98b7d9dbec9d853bbd8a7556c0b3d634a2947";
@@ -28266,6 +31651,7 @@ tl: { # no indentation
   version = "0.5.1";
 };
 "tikz-truchet" = {
+  revision = 50020;
   stripPrefix = 0;
   sha512.run = "74cc5a05cd9558c68cbb7987671fe1e02a9a076049aad96d4c95d7471ff04e48f03c500f58b85bd8eead46e1af592a54ffe1ef0b0ea0644f4479a332a63dec4a";
   sha512.doc = "7fb291a9d7309c722fe31cbcea7a4004d44552f547e4d71fdcd667efb4aba41b6bf0be0cb941dd16e425eedc668dc6de3d2e55f964146a62b861296b0ed18579";
@@ -28273,6 +31659,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "tikzcodeblocks" = {
+  revision = 47265;
   stripPrefix = 0;
   sha512.run = "709d531084b03a8bd1b645699de70a24ccd6c57050bd5d7b9697c778ea702e846adfe288983970a745b8745eeffe6acda3d0024fac65ec4e99475c736c5fc2e8";
   sha512.doc = "26ac33c604e51ed31a5b36c174350b1860b8b01169470cc1b50ce49808f7c8d84886110299bea82e72b3a5f0c18ac0f897d879aaabad1a4712dd94af47b3b10c";
@@ -28280,6 +31667,7 @@ tl: { # no indentation
   version = "0.12";
 };
 "tikzducks" = {
+  revision = 53312;
   stripPrefix = 0;
   sha512.run = "60a0bcb4560e294c96c3469e557c114cda5b92c6ad2b75c04d8bb7a07426f5dfb115072ff66894a75291bba786ae58d19ee5f651cc80dd1549367d5bbdee5829";
   sha512.doc = "e7b34bbeb3372eb3ef9bc7b758ce479229b78dd3f9af72bf71bb56cccf2927bf8ca52f9bf985f2d44323754b41180197356f49d3e93ea34ad8ac2cf1adfe9e27";
@@ -28287,6 +31675,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "tikzinclude" = {
+  revision = 28715;
   stripPrefix = 0;
   sha512.run = "1559c739ee5ce26c531ed1c989a2d986ee6da05880e6dcb8f14018c71c638028517d1c2374cb452421c92f5d430d4560ae4463732926c56ff33407941e70ffc3";
   sha512.doc = "9cf9e6f5e45f9dba8843684cce3ff395f18c485e30ad0d0566e947dfa69704cd99600f8673203ae212a1aaf77908715c2e5ddbaae0de3732b98564725297112d";
@@ -28295,6 +31684,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "tikzlings" = {
+  revision = 50841;
   stripPrefix = 0;
   sha512.run = "0c7c5af85cbdc6b5146e67083a8ab5485c3d0aab78d677ad8ef53f6419530e96385542d1317da04bf783a4c94b61152ebb8fd037ad8bd0ee472531476646177c";
   sha512.doc = "2b60d87c6925d1465588f244fdb3bee6912ebe02d89bed593caad9a8b8710b0d18a9aaef903395af9fa85207f0278054fb6a8d94b6572acdc60b30e7f8d9c6c2";
@@ -28302,6 +31692,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "tikzmark" = {
+  revision = 52293;
   stripPrefix = 0;
   sha512.run = "4f1040ee866eba68c6bf622d694cbbf417455691a08bb91169cf7a3a3a6e63d7136e1b976ee2e8e89361d5fd8871afab2dbeb7d26e04f4b51992f6e71854bba1";
   sha512.doc = "6575708cf87fc25c080001b6836df3dfa33474b594970a4dd4f2e772a9e3ed8dd6c3ed4f2ecb7866415606c983dfe36184f8ac9fbfb60852f5feae3dc90b98bc";
@@ -28310,6 +31701,7 @@ tl: { # no indentation
   version = "1.8";
 };
 "tikzmarmots" = {
+  revision = 49114;
   stripPrefix = 0;
   sha512.run = "d390b922ccb3cec5b215a97586578462f83774b3dd5d3dd461f47833f1ddaf705773e4a60acf385747df6b55d6d20c495f4ffa7f1c3f2e6d480d66ab5c5b04f6";
   sha512.doc = "4836d1d7c55ae98b26aa4968c5717457c8e2cb64d3e21f2b7298d3990ef612fb9087e64074945e24999fc302ae012e47c95a00c07e23286aae5ea7cb63fa254e";
@@ -28317,12 +31709,14 @@ tl: { # no indentation
   version = "1.0";
 };
 "tikzorbital" = {
+  revision = 36439;
   stripPrefix = 0;
   sha512.run = "cc0be76e583d67759d53ab89f777f137e7038eb8344e841a3a1c6e5327129063f2cdcb67c586546f8bec94e8e83d944ae864f291b5b7d384610f93c0ce604aea";
   sha512.doc = "676980e8772650f77ed37d545cbd4ac22af170e1a4541acbd0739f3b5c0aff91f3d48cd3b3fa3c562510c1c624f46de2218fe33a9e53532ca88ccbb929e3495b";
   hasRunfiles = true;
 };
 "tikzpagenodes" = {
+  revision = 27723;
   stripPrefix = 0;
   sha512.run = "4f0d6a4270bf90aa1fa5c5a018fb8a2703a6884215672cfcdb908f7c6d4e9b3610a9f6fb6c26b7b302daaf509d635d26443c6e8944bc1f8704f94a527090319e";
   sha512.doc = "14ad07e01c014d000a2bdd483a2dadba652cd78b42faf0ea5f9ba829ba484239361d73233443303be121dd5122b7e5e209867145b10e7607b5c6e5d13e2fb428";
@@ -28331,6 +31725,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "tikzpeople" = {
+  revision = 43978;
   stripPrefix = 0;
   sha512.run = "9a7cdc232e91fc0d6e5fcc67ea8c39dd2a4b482ccb6ccfd82332151117ef5121ef49bebcd2e0266492c88b57c146eaa578d2136a23f8781f3fc5f5d07f527db7";
   sha512.doc = "f561978adbe443659ec0890a8a38e9c9506f311d49d11fe952eacf579db0619946f86c0c6929a215fe7a98f5f02a782d1bc528359f195e09e1f388460dc0d55c";
@@ -28338,6 +31733,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "tikzpfeile" = {
+  revision = 25777;
   stripPrefix = 0;
   sha512.run = "9da38e2e02c651e2f89a0e9ea917fc5147626026acc7302b7e32aa2cbee072f91311fbab73e44852a2c237290de76e560f2b45e88639936b542e6986d90a9b4d";
   sha512.doc = "a66c6ca303ab6afcea5d94b02936335d28077697d81632199de2678528100c3b5a754aa281fa83d93819a53eb2fc945ae899e254b6d6ccd926f8fbbd86d5ac2e";
@@ -28346,6 +31742,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "tikzposter" = {
+  revision = 32732;
   stripPrefix = 0;
   sha512.run = "75fd7b71632c663329843a48bed32b2fd04cbac02d24271ff1a49bf03e2905ab8f94b5876ee68876bc6017455cc3272750e85eea6061dea57f47fe96ec9e1045";
   sha512.doc = "1bfdf7bc2aa38e876378a1dfac751a57ac93dcb0fc5abeff700107c8ef11423751dc69bd7502c9b2ad2641f7f760eb697a248833b6914111dcd86d7f8a32e9bd";
@@ -28354,6 +31751,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "tikzscale" = {
+  revision = 30637;
   stripPrefix = 0;
   sha512.run = "73aa62d84417deec8085c3f46b1ababb756e32ae55c4af97def15816606df2b3df4a7735ab434d489d24dabf26806428d945ff3fced3c5eb7c19b36996f2f58b";
   sha512.doc = "d2ac9080a08d7d7e37ea2d1f801c4091cddf9540eb7c2cc2c0753ab0c07c2f0e7392742bc2e93274775c890184c126aa490c78fedf8827a6c787b951abcb6bf5";
@@ -28362,6 +31760,7 @@ tl: { # no indentation
   version = "0.2.6";
 };
 "tikzsymbols" = {
+  revision = 49975;
   stripPrefix = 0;
   sha512.run = "6061fad290f71257b2496faabc1a11721518274964a18dc1d31d1e530de029c7418668444f868e6b660eea5d85bc440dbb7796fbf6cf181ec190ff34019b5aae";
   sha512.doc = "b688b3d4e2ec3352000b7bd8842736bbf52b10b5215725fba7970e048e4e823c0d522d753adf8c65be3ab6d1c091ab9b01b68922ba2796c012c4d948e3958f77";
@@ -28370,6 +31769,7 @@ tl: { # no indentation
   version = "4.10c";
 };
 "timbreicmc" = {
+  revision = 49740;
   stripPrefix = 0;
   sha512.run = "01e0e06769810e07389006e9443a836de76e95fea6133e7aab1f47cc554c3912a8aeb43bbf33d06cf9f3a8550a9eb9ec23830ab96ebbb84629ec957d7050e9a9";
   sha512.doc = "ebe4cf57814e6699127a30031c801efe583505098c707a97bece8dff93ff0cd4939cf047802ed38e645c339592e1a062c512dcb5d027192122e4c98ce41d1eac";
@@ -28378,28 +31778,33 @@ tl: { # no indentation
   version = "2.0";
 };
 "times" = {
+  revision = 35058;
   stripPrefix = 0;
   sha512.run = "252c933fb17ce2533f6e0f2b13a478d62223a596ee257937558c61e224c30753c157c92ed9d5ce3ced5ade0f5eb00ec15368fc75c10a182011312d6a0668911d";
   hasRunfiles = true;
 };
 "timetable" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "caee17cfe1a4bae7bae4479066e2f869e6ccee34d28a8952bed7a1409bd9ecb27adfd005f0e824d8ddacbd0e65762da79f9ea5b04d0332d643749ef36b908946";
   hasRunfiles = true;
 };
 "timing-diagrams" = {
+  revision = 31491;
   stripPrefix = 0;
   sha512.run = "0c07a24aea43b0092610cda5878a7e2be95777f199c9983e0aad42d83c1a6bd96dd4ca4caddef6b61165d62e924033eb01524fc925fdc8a4fd4baf44f568eec6";
   sha512.doc = "1882008e990cd6cfea47b35bd70a50f22972dab0470ada417edf1aa236d2619d57bd3b1d4a149ecc08c1a196c36c9dbf97328f58ea4aa25acb0a6addfcfe8651";
   hasRunfiles = true;
 };
 "tinos" = {
+  revision = 42882;
   stripPrefix = 0;
   sha512.run = "e8e8648d656cee747cae8eb5665fb8e1d327c9578b79a65b6d50cc1bbb428ed8ea81bd2332fb91af797383264d2fd9af9354be5a02a4721bbb7350051bcb2783";
   sha512.doc = "5c826e5a78001821396c0dce64c6becf9469c5b648d716ddbe899460242b67790f75d1a8a27973f450f1d7d7dba6ea672af5bca488209614fa72a7ff1a7aefb0";
   hasRunfiles = true;
 };
 "tipa" = {
+  revision = 29349;
   stripPrefix = 0;
   sha512.run = "7919b8f5a416cab24c02675ee0a24c60f64e9dfb3bbacb416eb74e29badf6b4dfd8a0528cc8b38dab6395b8c74ec5c808ad84d3a8d4ae5e8212691bed9066129";
   sha512.doc = "213c4eb24943e655c03087dbc5a51eb3cfeff09ece1d31fd11f1734ab3b219db94cc8b5f4735f3d6381b79a5d6ee2cfe727acd17f823b21163e910c09f48e413";
@@ -28407,12 +31812,14 @@ tl: { # no indentation
   version = "1.3";
 };
 "tipa-de" = {
+  revision = 22005;
   stripPrefix = 0;
   sha512.run = "45ce2504e63e517e76ebbd7b6bfc7b6a4b3a10d72747714c731b6af0b1a9de4d025bce996594449ea61e983097748389a6d878936078fb676ddd4d6f1f267425";
   sha512.doc = "c69333d9a7d335fb217dacb00610b9f0e5eaaf78e535d69998fc600fe53f0ba61c7e3cc1e82d75f52b435cd6945044560b2d275476e96d84d611ab4978c02e3f";
   version = "1.3";
 };
 "tipfr" = {
+  revision = 38646;
   stripPrefix = 0;
   sha512.run = "c8a8efbca7e1785dd81fd4695ed7e0c5dbe713d0a5632078bdba2f7df8e9358bc246d8f9d972ad3035106a7ef687f9229ed31bb630009eaec3b63170cf8933bb";
   sha512.doc = "bb739994051c5738ec0cacf1111d104b225593cbac1ee829057dce42017990483630cc062131ccd7d766d7400a252b1ff84744f91b77d0ca5a1f9ee195a28d5f";
@@ -28420,6 +31827,7 @@ tl: { # no indentation
   version = "1.5";
 };
 "titlecaps" = {
+  revision = 36170;
   stripPrefix = 0;
   sha512.run = "683240554b79bbf4f7e4f31653c5c633e93c74d71dd26232587de4d0d8ea012d350d0d43d508e9e9d8be4369d4ea9df996283c818583e573d4bc5fc379e4da4c";
   sha512.doc = "7025b5f9d53b65e228520a5e79fcbbf928ddc2f0fe071016a8c3726dca3e9b428b80749bce53438eb7a882a4660c2a10a4ee85e24ae5a26522b78d6a1dde4584";
@@ -28427,16 +31835,19 @@ tl: { # no indentation
   version = "1.2";
 };
 "titlefoot" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "aee68d15213c20d9ba0ef6e3a95f111804e4438d2c80a6cd83ae67725c3174db7f38b0d4280b26f7119e9e1c6477a0aa04d3ee5877e15b05ff2742d94a720c5b";
   hasRunfiles = true;
 };
 "titlepages" = {
+  revision = 19457;
   stripPrefix = 0;
   sha512.run = "affb8e221dd2ba1ad6e18d08dcbf3176bf65ae3006a732a7d2bf954fbfe90215175cd3de0dbb7546906b7d65eecb9aff06fabce86c46e88e5027851e11e52260";
   sha512.doc = "703f376c6bb2480f7a326f31ec277716073ddf67834930401c17627dba41c5321a0115e01ec73160917c68fb7ba4e0042e8ac40d968eef89f52b5dd27c2e0495";
 };
 "titlepic" = {
+  revision = 43497;
   stripPrefix = 0;
   sha512.run = "753ff5c116f102ebd9fe59ea0ad1e80a7fd102f55588f9454fb3ef43fd5478add2d39984638e112dfcc5421f5f79b4c34c8c15d47845273744b6960946ad1805";
   sha512.doc = "6faaeeb6c7212e35c22321e279c08ac8a985ebb8ec66054b49456ee5a9491b88e48edcb20920d61a052b2df9617ddee7e40bb0e868fe082ce5889e63c193b641";
@@ -28444,6 +31855,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "titleref" = {
+  revision = 18729;
   stripPrefix = 0;
   sha512.run = "73905fbe96bc095f602339e0c943048d775bf2a89ef9de3b7149dae7b76aef04e5c77803555450d931f3a4dfef16f5e72597a4d06052d4a852623516edd978f5";
   sha512.doc = "70db133fb8a5fa38a6f0f82912d19afe84e0f68820fe62b3835a6d237582a32fe6c2ba5ad05e46f39540d52d0aafa5a88325e1050e6102164a5753fd9c68d6ad";
@@ -28451,6 +31863,7 @@ tl: { # no indentation
   version = "3.1";
 };
 "titlesec" = {
+  revision = 52413;
   stripPrefix = 0;
   sha512.run = "bd1538a4596c55a6e0a542df5587f4466795a59ac55472340bcfc400670b79a04f0b141ad5705c826789ce0094fa4b106b5917f4232167a66047d8e6edd4998c";
   sha512.doc = "34623133da534fa15d491f3ecfeb6ee6736a580c12577d7ef313efb341c97ffe1cfac49f4c94b90f8f519847bb7b0d37b003ee485c240d1dfab3b68426563dcc";
@@ -28458,6 +31871,7 @@ tl: { # no indentation
   version = "2.13";
 };
 "titling" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "2a321a17b1ff74f57e7bf3f9d72d1b66a0623ed286c8aa75df6d55f1e62b214954ff38456f27f172789bc4cb500688656ab156609933faef67e62954d05d0ce2";
   sha512.doc = "e69af16331da73c2a61b063ca4dc4c5f70f7958c366b06e96745a2bc92397f89210ebfe598f445ff33ce7705d0f0b56fc3a46f93bcc89145d50b92d56820f61b";
@@ -28466,6 +31880,7 @@ tl: { # no indentation
   version = "2.1d";
 };
 "tkz-base" = {
+  revision = 53695;
   stripPrefix = 0;
   sha512.run = "221c722b6919f8bfaae489f07ddfce6eb3e1495bbeb4ab180fb7fe5627adf1ae3c853a36eae9626959073ea07bb41642351143142ca31e089b4e5f77c6f53f22";
   sha512.doc = "f33b074f1d45a4d01a7fe02dff39360ca2e1c9352e8989e9c024b40e8fddb3f523526c86f5f205cca0cc7b009a974a02a1213b5e4c5d038c522076a2798b84ff";
@@ -28473,6 +31888,7 @@ tl: { # no indentation
   version = "3.02c";
 };
 "tkz-berge" = {
+  revision = 22891;
   stripPrefix = 0;
   sha512.run = "f56372592ff8a7ddc3f9d778631c4ef5e06cd6e0995b35d2c16d24b046540765a41df701d830720c95cde77cc1757af99a3f51471d4b83d5311fd5695865f299";
   sha512.doc = "b5514c49defbcc5d934266df428ad96a158803edcfd9ba23fb32080cc383ffcc32ea51a26094684094740df3a28e3137e0a26dec8792bbd60b454269312de596";
@@ -28480,6 +31896,7 @@ tl: { # no indentation
   version = "1.00c";
 };
 "tkz-doc" = {
+  revision = 53701;
   stripPrefix = 0;
   sha512.run = "b0b1c71bcfd60065200492c6ccfcf7a4e4f107c042b6ba7c52a9dcee9094d650eb85fff991c86f389a682fbf2fb583f96f03b668dc0fd959c5871904f227434c";
   sha512.doc = "cd7d5f718c75c1c6001e01e05d980a35432297539783f479f1a6d6db4faa5141b38832f594ac1f7e54714cef1f25da028ec2bc685f96292b63946bc143bf7568";
@@ -28487,6 +31904,7 @@ tl: { # no indentation
   version = "1.2c";
 };
 "tkz-euclide" = {
+  revision = 53697;
   stripPrefix = 0;
   sha512.run = "8a3809b248694681215e5e6c7349a7b063ff986942dd93a9a745c021b8a3a9e88972da9225bcba2dd30223ef13ba7cea010cfa3c4dcdd75b03a28ebb7bc4a220";
   sha512.doc = "4a050ae4591d63eeb75cea10a8fb87e617d18af7360589cf616acc74a0ceea47713273bc0c99c243b5f35a4b00b1f61ca61ed52ef016c2fc935ed49ac2a29ffc";
@@ -28494,6 +31912,7 @@ tl: { # no indentation
   version = "3.02c";
 };
 "tkz-fct" = {
+  revision = 53696;
   stripPrefix = 0;
   sha512.run = "3a1b2a7a72def92fb8c44918680179fadaa69aae548b19f1a806e1b5176d4d6923a5e575e909d8c3df7aa26551b199412f1be4183199fe05ea5ce0775952df63";
   sha512.doc = "77226e5e8a3fc289fd3063e7819918579194d34899e899e03f512481102fd3e3cf333b204e24d5805b4e310080f81ff1df9e4ff83e17980e74b8326139c37114";
@@ -28501,6 +31920,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "tkz-graph" = {
+  revision = 48711;
   stripPrefix = 0;
   sha512.run = "9a933a9925dfe8782abaa6c983881a10d20542be294f15904d1645f5481309ed00d42d3b4eb38498dd4eab84774b685455235f89462de0af443b617bd4566927";
   sha512.doc = "ec22ca39b559b4d6f6192272470cfc748c466b5efe9f5ca00fdcf263cc172dcab5e34b059c328097479e1c03e038e71e4658fc22518cda545f9febaba2f43310";
@@ -28508,6 +31928,7 @@ tl: { # no indentation
   version = "1.00_d";
 };
 "tkz-kiviat" = {
+  revision = 48712;
   stripPrefix = 0;
   sha512.run = "d1b6b4c1ecfe29397c2a63c808cc24119688782326bff3615c3e84dc22ae1bd6bdffc57761af31ef21bf3f3378806dfd087fdd24d5dbac49ec890df54ea3bcf8";
   sha512.doc = "5ab29135b2903988727129f37496ae27a5ead3800edbe47728d7d5171d210ef7e11bf47d3a4fdd27c0c03f6e09aad8b9697acadbb959f549f5c290e66c1cab45";
@@ -28515,6 +31936,7 @@ tl: { # no indentation
   version = "0.1b";
 };
 "tkz-linknodes" = {
+  revision = 48713;
   stripPrefix = 0;
   sha512.run = "b41f40a2c27b9384c3edef8217c1224293b8a2901a0f3752c3267d911a7788e27138464b2f11634f67bca00dbfe2ed71a87fb9b3dd4dbc5f62765a022c51bcbe";
   sha512.doc = "d4fc88cf1dcc49b6bf2292c6892c5094bc4eb6f17535dd1ac51783b9abb7312279cadc5e06e624720be756f5a0907551f4411f246cbeb6dcbb1365b891e70840";
@@ -28522,6 +31944,7 @@ tl: { # no indentation
   version = "1.1d";
 };
 "tkz-orm" = {
+  revision = 39408;
   stripPrefix = 0;
   sha512.run = "a90dda0186a3e3309eaabe444a7404fe2cafa1caa737f7d5ec9779eafd76f0795890f36bc4f0c5302dcff30231ccc3a8306fe318f10695e8caf00cbf61fc6e04";
   sha512.doc = "a1686b02d79cf0af41f99faa2ac06e2a3d864b078231f4c9c165261557df0fe8f26db8159dce2a90be6206750d6fc8f3013421cb0171c1ff1f11624e634f910d";
@@ -28529,6 +31952,7 @@ tl: { # no indentation
   version = "0.1.4";
 };
 "tkz-tab" = {
+  revision = 49775;
   stripPrefix = 0;
   sha512.run = "c4290e2633a44122789abb3dd054cf61a1bdcece6274a43d9ce6ae403b73f0c0a32b4c1e6470278c46468d53149540f3884c6b2186b51008b0beeecc8a84b1c9";
   sha512.doc = "08d79e8c0aeef5323112182ae60c25a8ea6547aa5ec75f37b8c5e6e15a894d1a70efbd99421140156de844d35483803c21bba0ea0ee88ca36aea55e303095d14";
@@ -28536,6 +31960,7 @@ tl: { # no indentation
   version = "1.4e";
 };
 "tlc-article" = {
+  revision = 51431;
   stripPrefix = 0;
   sha512.run = "80b2c0d5418e8061d07d502399895a8334003bf5ed574de8f4af0c422ff0d3a660a511b5064b48e65064a91ea0cd057c134f9651e001eb7d5fa9d981366374db";
   sha512.doc = "96535abc8bf54c62e22d4e47178c1cbbb1ca96bfca16df4cab37b182d50e872c57a2e6ebe65727121fd2682776905c962551639d9435e86ab3fbb5d3e05fb72f";
@@ -28543,11 +31968,13 @@ tl: { # no indentation
   version = "1.0.17";
 };
 "tlc2" = {
+  revision = 26096;
   stripPrefix = 0;
   sha512.run = "3ac7d28285b15d7e97839619a449c870b3f96e1c557470ba4bf680016c9834af9f09715e09525b00aa2b951bbe20e5d3b1d0a5e5f957de99c13fdb39f4267e3d";
   sha512.doc = "79eead14f268eab643f676c36b20ba89828928fb3b418956277304ac6cf7145d53b4f97c30605690cddce8660361614b58ac65e8454b7740dde17ff82a053818";
 };
 "tlcockpit" = {
+  revision = 51620;
   sha512.run = "ae7d33579b16748a75ea5c94c328bebf01074428db854e823f38fba8632a70f8a00f91d06df04e4d074e3414f5adf706b1945e0ec565f588177a2b1608a47a24";
   sha512.doc = "ea727e465bd123458dd490fd2e0c66dbea47720eee9f3a3cdf3faca0b09e4696f8cd0c334645f306a901433de94f99a7b43c52691888702f36d369d1548aa464";
   sha512.source = "2c965f95c45dcf0cdde077940e371c995ec1f29f01cc479fd0b5cfe3121641a1fd4e35e2ed01705461213b8669ac7b9d3ef3f6895cd1c878c1309bd8f1ec256d";
@@ -28555,11 +31982,13 @@ tl: { # no indentation
   version = "1.1";
 };
 "tlshell" = {
+  revision = 53801;
   sha512.run = "1b8c40f2b6c4fb0a106c28f217dee218069942750c8302b936b89c2e1fd28030370e0d6a2ffe91789f9fee8175fac3384aa4b48a581d9edf1480db3b509fe441";
   sha512.doc = "73d2770e5d28040995db376495938224e8fc4b9b986171f4d39df3557e0d1b99982436bbb6f687f329b533da30534240c8a892580bdfe13fcd22b3058f7b9e6b";
   hasRunfiles = true;
 };
 "tocbibind" = {
+  revision = 20085;
   stripPrefix = 0;
   sha512.run = "f373d6c98730e60d06790d1a219df26e60bbddd2aaffc3aefc5877ae6b2c10c1a08e21dfef82cc591e1c6f7c014e0843ae30be948b7eb55321dc94cfb7b16aa9";
   sha512.doc = "1521eaf8a15038a2a0b6136e444ac38d6033071b305f6de6db6a5f8ae34625a5b8bf654d7a97b5ebdfcf4efeae58c41a7c9c17005552314928e315295766c441";
@@ -28568,6 +31997,7 @@ tl: { # no indentation
   version = "1.5k";
 };
 "tocdata" = {
+  revision = 51654;
   stripPrefix = 0;
   sha512.run = "81c64d55b33ac9c22abcbdd3ab683248c3ea12e21866de0f2d36c44434729cc8a32526e0f28bc0e945edfca5eca74dec78acf9c8e8439d1e7a3d28cc13c5a260";
   sha512.doc = "4616b125dbeb9458811ec7ecdf13a1f3750c5bad9670bb3f556b62ec084f1af17cc2b91a8e821fcda48b660ef0a14911a86be367297bbcc13d1c5c8cfb4a09da";
@@ -28576,6 +32006,7 @@ tl: { # no indentation
   version = "2.03";
 };
 "tocloft" = {
+  revision = 53364;
   stripPrefix = 0;
   sha512.run = "249b50b4dde3c9b14cfd3a7b00c441007643ad6638996b83a0274bf4126ca8a26f6cfff816c5efc9b6516953cfc29c18905138fe137877ae920e82376afeeab7";
   sha512.doc = "edd477e3c4b2a9f815c3e57a6b785c2237bc34435dd561d28b3e38bd8da5cc5d4d4de79a10dfbb55e920d69dab90d0a40efd3bcc44cad1c736a723b89f147af9";
@@ -28584,6 +32015,7 @@ tl: { # no indentation
   version = "2.3j";
 };
 "tocvsec2" = {
+  revision = 33146;
   stripPrefix = 0;
   sha512.run = "685ff581b0cba155a763ba951b4f5b1e12a44741dc5245967cc2d2effad12127828e4d2f3adabb9fe3d126ffa1f76d43dc196b89faa39745ce85a7f96fb44017";
   sha512.doc = "9247adf45a6a8f18e03d7b93ea8de8decdd9f1ba15eed7ee28c356679a6f62bd8607b9c519448bae2234cec15b76a5155ad7efe99ceb9382022988a29c2ee85c";
@@ -28592,6 +32024,7 @@ tl: { # no indentation
   version = "1.3a";
 };
 "todo" = {
+  revision = 17746;
   stripPrefix = 0;
   sha512.run = "e3cd06aa47c36344602a0dccfb48e43c0639cadcb91aa9e787d552c6d3ecca95da3b0f3af8d0f479caad41f657bbcc30016dfd3f80f42285fe8ab02e0a904601";
   sha512.doc = "c747b4cdcbe8533338a9120b06120b0daa68940ace4cf44d87882d5b5a5a42e2c062c667d2e3fbf8979e1385cd55dfd8747f4fcb044a4112f4b2a79588d0463e";
@@ -28600,6 +32033,7 @@ tl: { # no indentation
   version = "2.142";
 };
 "todonotes" = {
+  revision = 52662;
   stripPrefix = 0;
   deps."pgf" = tl."pgf";
   deps."tools" = tl."tools";
@@ -28612,6 +32046,7 @@ tl: { # no indentation
   version = "1.1.2";
 };
 "tokcycle" = {
+  revision = 53755;
   stripPrefix = 0;
   sha512.run = "1d4186f5f12468cebdee8418925cd3b3ce4d987bc70bf268efa566f3b65b3eaeeea964085453beff9bc3950c67850fc3f37d2b6b5ed0dd14cc2f01cb569a42b6";
   sha512.doc = "d08da1c1d6d4d42ba3bb6a866327c4deab6dd359130b9e795f08ff9bc3ea0e5ceca8fba74044d298e38ef54e1ed497245687a124c9cec49e2cce4140e1a8264d";
@@ -28619,6 +32054,7 @@ tl: { # no indentation
   version = "1.12";
 };
 "tokenizer" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "5174ea1b9c6c02fb8245db5315ccc7b65239d1343f719ee23428bd530dfd70edf26822bde25d672603d268a63360ba31b4a9fdcddf426b82eef440cd7f449d8e";
   sha512.doc = "4e978a368cd7e97a1300addb739b457cbf4810ecb2d4e1161d931373d858573d8fe1688629cd7d23a44a4d5403e5d8d9dc92869be9809bddc9110c55879c940e";
@@ -28626,6 +32062,7 @@ tl: { # no indentation
   version = "1.1.0";
 };
 "toolbox" = {
+  revision = 32260;
   stripPrefix = 0;
   sha512.run = "af5320de678474075998f9497be0b766e826b0105b344939a66c5c1377e7c345623e2de18b73cb43f93c8edc241fca7a99fff1ca4b6bd3dfba52bf2ff476f18f";
   sha512.doc = "ee800bb98c9577b12bf20a0b19ce27d9c6900f66e0920c922626599986b887e34513cca8474456aab7ae59aa5d5fae3c7c323ca4cc21372979ab3d545921ed34";
@@ -28634,6 +32071,7 @@ tl: { # no indentation
   version = "5.1";
 };
 "tools" = {
+  revision = 53640;
   stripPrefix = 0;
   sha512.run = "1d3386bd098381e0ede5ff0c6cb107867719a54a8109208a1de448881e172265a000d91c6e7d0607af62de0504913e4698f5ee00a710b5dc32a8157faed094d5";
   sha512.doc = "e0e7d9bd37f2268f7496b66b69fbc520413f74f67356319ec61c1c6c2523f0fa84d7ea4d78f0a9b0875d820c3514ae0c5871d4785df992ac345238e6f5af8a3a";
@@ -28641,12 +32079,14 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "topfloat" = {
+  revision = 19084;
   stripPrefix = 0;
   sha512.run = "a4e4031292203a04a1df1dc5e6bd4f6b89c8806599d995707fa0dfc238bcb3dd1ecf185665db33a406302567607da5640f385f12cffb46f482993850b78155a0";
   sha512.doc = "6c37c3b9ad32a121eb03f23049e11fe52b7cf6d49353e94a18eb39aaed3c049bee86ef6c6984440c9700546f20023f7a71975591c1f3750d31e176e8ba4f4c47";
   hasRunfiles = true;
 };
 "topiclongtable" = {
+  revision = 51601;
   stripPrefix = 0;
   sha512.run = "ed6bed14ed748cc3957746f65319c827f94745c6c99c896048362944f4ea96e54cdbc732d2f9324f472872a4111aa18c44ad17f035c5cc5beafcf1ca900b2ef8";
   sha512.doc = "f227c659e27d138d848b78fa43fe26792affa4181984de42eb17bf636d9777185fc0838fc617f4aac8142f3a611e65f01547e48a2a18e2ddad1d3363cdd0034c";
@@ -28654,6 +32094,7 @@ tl: { # no indentation
   version = "1.3.1";
 };
 "topletter" = {
+  revision = 48182;
   stripPrefix = 0;
   sha512.run = "1c583621d738ff203ef755c4ab6d4ad520fe25204c882b3b5b1dc719590cc4ae117502008f0b2ef67486f33127e6eab92a2177aed42a8e011c9309632ce1fda1";
   sha512.doc = "2fcaee9c15adec307e5cbbc4e71dadd2bfe2158f51d5bb842ea6faf1e10487f5881d171e29a48ac7c6c6ce52bae7bffee91772dd046311959167b11ddac8328c";
@@ -28662,6 +32103,7 @@ tl: { # no indentation
   version = "0.3.0";
 };
 "toptesi" = {
+  revision = 51743;
   stripPrefix = 0;
   sha512.run = "13176c395de6e5e6e52e21cc298ed5aabf0a68d42d90119bb1bbf9b85f99c26faa3e78f64f99ab9717d506950d22338b9df2094db0f503f50871e09d2b45a085";
   sha512.doc = "ca06bdd003084fa8bc11680f5d13ae6f0b333e81ac1ea57ef37959cb5c54933621c00f86ab2fe990b327198f28218eb60b1595fa50511c48625e35a9fa5c92e5";
@@ -28670,6 +32112,7 @@ tl: { # no indentation
   version = "6.3.06";
 };
 "totcount" = {
+  revision = 21178;
   stripPrefix = 0;
   sha512.run = "03ece717c7db3820cf41192e3bad2711e159fcb8a5a5a185e1c55335364917a515d9dd691cf1890421a8c62c9e55bdc49cb13718f7d98d9df34a2470cfff0daf";
   sha512.doc = "46ef8cd2317108d0896b32ba9104c69fb34a6d13d1e123d6b8f1648bfdfffa6bb21f17207433dd763451b1f6c104ae3532e7aac43ef2ba73281842f0a3bcd05e";
@@ -28678,6 +32121,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "totpages" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "8dbfcf7728690d6c2a20f661daf62e80c00d3f08fd00aee7a07cbddd31f6adf8f38e32623b2963748367ea08dd3c95919ab576b22d70214a2f5f4f07c40374f1";
   sha512.doc = "58cb9d30644402a68462e0b00b6175ec4a002135eae0bb16ad2cb5b919d1dd6b93583074a0723e1c55946e7d94dab506b8527a67d7d7b39be20608207bae5626";
@@ -28686,10 +32130,12 @@ tl: { # no indentation
   version = "2.00";
 };
 "tpic2pdftex" = {
+  revision = 52851;
   sha512.run = "fa8689bd257b6336badb8e5a742d5c5f12d9088b33b43bdc41474feda62358c754db05735fa471baa307907bcd61f68e8d061e66c400198d6a1dc165f39d2226";
   sha512.doc = "f24f8508279ded0689bb9dda8c653cfbd903c46782744fcb8d004f50a771ca74b86549c86abc765a408f2be67334048390e407be9446faa476a02ce9c27d5547";
 };
 "tpslifonts" = {
+  revision = 42428;
   stripPrefix = 0;
   sha512.run = "0394101636f394f04c38b6677f921136f74e3c8abccff199d4c972ede085c3915e2fe9bbc5b239044dd8f24b405cfc34b5c736a7cd03b749b6aeaf7feb15f5e4";
   sha512.doc = "e5be9024a02669212044844ad0e99b72faae15c62fb0c9065c8a5e3beb852968cf4cd4744d01890534df5a540bd1066749d999e919afd7d791b4e9ca7dd3c26c";
@@ -28698,6 +32144,7 @@ tl: { # no indentation
   version = "0.6";
 };
 "tqft" = {
+  revision = 44455;
   stripPrefix = 0;
   sha512.run = "0bd44773d17cdaac4e3490dbca1fe038bb18e50d057d6adee53b32d6127ec844e3ae9b8f0f671969c8a00e0df01eca9fd93f27e85fc1ebcf03966e6c82b53f8f";
   sha512.doc = "0b6c66aefec59955214299a99eaf4949900fb294e7f1eb904efdfc0de3aa85c5fa38961073ba3f7a3c60f26688c28e6f1bb5ea2c32751062fb3231edc4607f0f";
@@ -28706,6 +32153,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "tracklang" = {
+  revision = 52991;
   stripPrefix = 0;
   sha512.run = "bf1126910a73aa2df406a596760802da334c0bdb451e9062cdad2fd80a29386c42b3deac4af1624741868e9de12bf7f1b3e94e79f48b291a6f062503f5161611";
   sha512.doc = "72808d7fa6340d535db4aeeeda6e07dfb3bd29d910c13442722d2f8cfc0e19e446ba23eec098bbce505438352e2514aaf6411c72893d85fc960a7ce9c35c7203";
@@ -28714,6 +32162,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "trajan" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "66fe869b94f489a3240078fa28da32fab71767d93befefca62fda3a39ae53ab975b13b7ddf84e490658e915c100f16225ea0ed8e7787b099bf4cb067a9fd4e09";
   sha512.doc = "c6b6137d1952660b99bf077eae0ddc0f40b4ea9ff6308e4f461fd0e34c7b4b35b4ad79f3e42e4d0077c9d2947db642d0add032f2413d580748ba786a8abbf029";
@@ -28722,6 +32171,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "tram" = {
+  revision = 29803;
   stripPrefix = 0;
   sha512.run = "4592a288c08f5bf6b41fdffee8129e08fec7397edb2b351617fe79571d2905be61cb776f87a5b152c4b62acefdf21ee2f0b293f210ce52f449d3b9e41833b2d5";
   sha512.doc = "bfc46f516c2f81530ed7e648ef6774443502b580cf580b5fd5ea9f7be0311b33fb14156aca3f36bb4d74cc165dd33d0b8ef3ebbab5624f38239c281c7d7bda09";
@@ -28729,67 +32179,80 @@ tl: { # no indentation
   version = "0.2";
 };
 "translation-array-fr" = {
+  revision = 24344;
   stripPrefix = 0;
   sha512.run = "d32d6b397916bf631d65171f4f7de4bdb6049eec5414d1a9adbbe88d147ce2e4930a4f17b70c5c12b7ef9c3300d9eb099d63fb14ccd5478c6bfcd0557074b343";
   sha512.doc = "7d9b2e43f4fde3e6a3b7436a55b2095fbc4ffa31223019c1cbfdf3d623c48be406858cdb96c8693e10fd0023050ddfbb09b463a9a3804879945ac0d6aa616be4";
 };
 "translation-arsclassica-de" = {
+  revision = 23803;
   stripPrefix = 0;
   sha512.run = "76ced8c2c93e35d6bee10f34a7de5709b8027f9d498f8fcd21ba776850c65e1e20eaf20528414b7d9da1891a2db7132b6e3b703c4f8d91f4ff0c69eb9159c996";
   sha512.doc = "58773adb7493e6ef31d8fd3854a51cd37921dd331f56f1d9eab5283c121fa8c3316ffc41242356a87af04bb6da68761ea15829e5e8555d2e6cdbb68833c8d313";
 };
 "translation-biblatex-de" = {
+  revision = 45592;
   stripPrefix = 0;
   sha512.run = "3968a37e0add02d6e31ad49b3a263ec35651c960d7132d1ecfa418888a51444430e8d6ffe4a92fd35ab3904ce6a7aa686085b412117cb282b7e2867a701625c0";
   sha512.doc = "8f945fd3a4a63ef8e0e6e979bd530f1d13d11eca7490697d0c94dbd43ab7e6608e3801539ccaa47c48c81c52e27a14587f4a48887ceff524a6e188cd80b551a4";
   version = "3.0";
 };
 "translation-chemsym-de" = {
+  revision = 23804;
   stripPrefix = 0;
   sha512.run = "e23821fc1bbdee758e534bb52c4e0f348d6be3396ca2d8e3c11c9425132fc9c28f2bf6c98cb1beee9b23716cc1a75704561d9d8f16d2f4e94851fc2f88e0895a";
   sha512.doc = "efe9f711c42925fd035339c25284e09ca7a99c246bf70ef2c15c4f1149accf5bab09e396b94d6d59d4e8c303bfdb3f40570912713dcbd33e7ae360a6b21c36de";
 };
 "translation-dcolumn-fr" = {
+  revision = 24345;
   stripPrefix = 0;
   sha512.run = "8d2288707f13896dbb578b538b535efffc89991d56586f27a35b284b5be7c553df97a72ac163a625238e281bfe97bb79fa716855dc8e93f25f0a8af69674eb45";
   sha512.doc = "95d1633884f7237bf2a7abf8a43127ac1954fb5d0e308d676a7f4c3255d709496a382f01a8af6c28f793bcd1863e98f8ed1441e7cc288d3b8de3176631cdca1d";
 };
 "translation-ecv-de" = {
+  revision = 24754;
   stripPrefix = 0;
   sha512.run = "33998fcadaf7b42874968348ef4e3232652ea401410eea6a8011db146a4989afb102a2bba247df53b875bc02b1ea8f21ec5c68783ae43f36a3f175e77dde6453";
   sha512.doc = "a86784aaeaa786251f35ddf273050e9c981a68d060ba1a2f186379e04f89edc696090b44b402996c4f2422d1cbfd7fd68136c29fc7c74a2fd32d6d230eb2e489";
 };
 "translation-enumitem-de" = {
+  revision = 24196;
   stripPrefix = 0;
   sha512.run = "7018a95d7b68b6b736472d6f43d356d25d2a73df4a5dbc080485f3b4e747d122889788b3d1a75ec4c479a84a4453128104f01b2e1788e9dc50d09bda0eb53cfe";
   sha512.doc = "bee33ecf7a3045c382242f4b6ec9599f32fb254053a6417ceb514f3aad64b2bf51c50f660b562a2a3f0207f7bdc4676527627f432b1556362e3a9f5e9eda8694";
 };
 "translation-europecv-de" = {
+  revision = 23840;
   stripPrefix = 0;
   sha512.run = "6102a92b45fb7c19d2190bf4289e8b6b24ded67d0255ce2f483627bbdbee00c42c044be03bc10c9d0e23c2b911e781d21a7e6562e80988620a6da60562d98bf4";
   sha512.doc = "f50e761fc7925f0cf404788ad2ad70586536e1676bc7a026be5a81136a1323f011a281160a344c455346553e90cb632133668c2483200a05ecf961e46e50bfb3";
 };
 "translation-filecontents-de" = {
+  revision = 24010;
   stripPrefix = 0;
   sha512.run = "78dd9ee41d9b06438e01ec12f716929c4cf0fbf6ff209f45fadce9fad4bac0d1b31732b3f66896bf7526dac7532504e0913dbb69c3c7e13830e81297b2761935";
   sha512.doc = "17ed1c39c549b43c31c13dfd6ffbd968ecbdd3e64b00cbc66b0a8914726f4baa7faf98edf30c23ed81850cee98a732bbdd70ef667973163ccee0b35c160fdc64";
 };
 "translation-moreverb-de" = {
+  revision = 23957;
   stripPrefix = 0;
   sha512.run = "6b11a1b522c728722d4d5d5b38dd453ec017dc053d360180b943778923ca9a23b3ebb92516c1a6880e507f5e8b6d8d87878c92762637acc5ac93f42ad790446e";
   sha512.doc = "955070d4e92e38712a5df837fd0df716d1a597780a4b06046d5aac5164efc0fec1121c51ea09c3ef1a090d51732f57308f4db386440118548e2167f3cafe16ce";
 };
 "translation-natbib-fr" = {
+  revision = 25105;
   stripPrefix = 0;
   sha512.run = "ff34cb7cece157b933117ba0e9aadb0e9caa759a406fabf7b0ebb89e5b03ee6db7aa493551816e9061ff91a460e46a58f1402b086d37c48863b4e093d19326a8";
   sha512.doc = "971570414f9705cc4026a21a557b2f1dfe8fc010feca4f1ada946d11aa30169746c2017fb3882e65e68520539974eaf2361ebab7bcd292eed177fa7f6eb7337c";
 };
 "translation-tabbing-fr" = {
+  revision = 24228;
   stripPrefix = 0;
   sha512.run = "76f1c6318cd964b94d5a1d836b1a40fc58de49566cdc30b1ea60fc29fbcc8c6b01a477f4739a5fd9bb24998325dbf42817ad016fff27207e710bfc4b51b29985";
   sha512.doc = "ae2f1aa60162512287f15c770a465c2e39abe1fa5d1223d96c524dc81bf065d62f307893d22dfc06fc50da8d63d817ed60c8f07fd4fede984b6febe9c8b7b710";
 };
 "translations" = {
+  revision = 53962;
   stripPrefix = 0;
   sha512.run = "c4f55be467d87f49a0e65729769846afbffcca6e8b3611897d185ddccfbde7773d7c1e7591d4e67d234c2eb025a6e8774b22478e35ad83a550bec2854253cb7a";
   sha512.doc = "e964c0af6f855b32a3ded46616325876f3a132db9b6afb1d885730d05d958750eb2014291eef21949a11e4850b91e84b02f45bd7d4d86ac3069ef32960ab7243";
@@ -28797,6 +32260,7 @@ tl: { # no indentation
   version = "1.8";
 };
 "translator" = {
+  revision = 51279;
   stripPrefix = 0;
   sha512.run = "6105a57724bb880dd4b2166c052aa58abac70fe9cda70db2941195cbb0fd2fd874c8ca1f1b658bcd52f3f00ade88683d2f0f86baca8ed68702caa18c5e2d5e57";
   sha512.doc = "64547f60b7d6b99ad04fec07d9047282444f5c407accf49955002e74bec2b00b34ec8ea639eeeb9036f90a27460f926c0e400b3f27cf1e31b8d9b343370759b6";
@@ -28804,6 +32268,7 @@ tl: { # no indentation
   version = "1.12a";
 };
 "transparent" = {
+  revision = 52981;
   stripPrefix = 0;
   sha512.run = "a1b545dee3fc210d9ff39c9ad1e8015c3972b2f1655e40f828d3bca0d8ae759772e18fd180cec5fa88d45f48076d92d07bebf2e03ef26745ad53a2fd8581d9cf";
   sha512.doc = "7de04001cea582db36ed0fb0b5f8382a367603d8ce8327d29d773d05af116ae76adddd678b220d2df8abf7c6c619bee9f050f51c5aa255d7b0fb9b576638e049";
@@ -28812,6 +32277,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "tree-dvips" = {
+  revision = 21751;
   stripPrefix = 0;
   sha512.run = "6153417c5d2677a56adf031c5f2f27e4c2bf204c0acef1cc5cd49355370aa336814bad7d2be00e95d22bcf73b9b69105a255d15f29ed650511c0eccc3c9bda07";
   sha512.doc = "8c507ec7719b92f2cf82527c7799b073ff2679cf820528b489eb7d8c83d28d098033760cf092bceb9ee7e28fec15eb580122c080b982dbb12e0e65176121e84c";
@@ -28819,12 +32285,14 @@ tl: { # no indentation
   version = ".91";
 };
 "treetex" = {
+  revision = 28176;
   stripPrefix = 0;
   sha512.run = "49202a38697bd9bd3bc6fcbf30d28047b8ddc4d737bfa68cfdb83197b484352997a33f55e195211eff1d548f95e2072f07ed18f1d7c6772a03c66a13051d1709";
   sha512.doc = "fb9e09bc2f6e45b854824c9c757733c2c17b4d48edc955ea48bea3ab3fb5dd914eb6427c8ae4f74ebc62b4715bada84c8f3fca0ee7d01f8d3c2526339a844681";
   hasRunfiles = true;
 };
 "trfsigns" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "3607b6371c2dbbd93524f0811dbf14cd93cb2556fc217899ef3a273c27158771f743bafff0fc90a582d65da431efd7ccc1f07bf92a6600a7bc301b5b6a308325";
   sha512.doc = "9bac4f4deafd62a8b113107ce47bb5ea3afe05078a3c5083b1ed790ed690bc3d73066e0abadc5cb1a3d45246f759941d6e2389105632bb6592c32a08e7b7671b";
@@ -28833,12 +32301,14 @@ tl: { # no indentation
   version = "1.01";
 };
 "trigonometry" = {
+  revision = 43006;
   stripPrefix = 0;
   sha512.run = "366a5e96499bd96d2eee38b78305d9fd7368d0b70f91acecd5a5337675002808a5695a525d011a1ab7b31ff34cc14c469970a3fe55c694f003d0ba7002795297";
   sha512.doc = "a9bd77bda2cca604a69ca1b60deeb8da3128c625b87d64ccf39aaae853a645e736b5350d3d575302ec2a35e9736e4133cd4ffd223b9bff6191b6fed9549a8092";
   hasRunfiles = true;
 };
 "trimspaces" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "09bfe50d1b14502311aea7a20df80e70c1907b1c8443aba9453aa0a3eb76cbd34728734b81df63bd5895a4a5a55ddfe6d0feedf7d5d28d6b5922a374bc550c9e";
   sha512.doc = "8e26064de0c14d6caa1d6cf625cbd2d598102056136dfa20d0a7ffb178c26829db0206d87893937b63f83171744a29bea3567e16e2a7a0d454734a0b72837277";
@@ -28847,6 +32317,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "trivfloat" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "25e07373c53a6d4c92a5f2f19fa0d70c86202435863b8b3cd036f2d12f74a477a33cca6508794f67256a877117bea821a11b9bff235e1a894c90b71810bbcca4";
   sha512.doc = "eb9fce19c495eedd728e87bf47f5d925a685a8b9e81e8de0e6c317f74af6c82352f403486f5a904849ed418722d830ae294a89eaa57bbff59eee8a03cf9b8af8";
@@ -28855,6 +32326,7 @@ tl: { # no indentation
   version = "1.3b";
 };
 "trsym" = {
+  revision = 18732;
   stripPrefix = 0;
   sha512.run = "e571d1c0c042e2fe75b992c6e0e9e07b04f0368f1e74a51ba91c34a642be148fb817027931ec35831672970725377038b5cc80d34bdb716d936f4aa59075d83a";
   sha512.doc = "d6cd64c1c4bbc927f4154c2281ef4c13ab145b750d92561235364a35082e497afc5d8aa5806452757b499b827305a0a183723deb38272ba43bcc38eedc367731";
@@ -28863,6 +32335,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "truncate" = {
+  revision = 18921;
   stripPrefix = 0;
   sha512.run = "b676d65803577b4bce5f6240a0d05a306199f24c2b14402954f4430f07fed9a8af574c4cf9cdc233824bb1a285eee0c531aa40ae31c782a43afd678d6e44f27a";
   sha512.doc = "78e9a96fc2e635237cae9ab4d7ac30cfee8582dde13331800ac9079d1e0726c597accb598b5e679b6643d27b2a53fb367e740b76d59e9a5d27226a4c829e8518";
@@ -28870,17 +32343,20 @@ tl: { # no indentation
   version = "3.6";
 };
 "tsemlines" = {
+  revision = 23440;
   stripPrefix = 0;
   sha512.run = "d4b6a929a403ed7fea409aa618e7ca021c2c7138a6b11c980430ba18f952ffba44df951dbc7b7f3a5ffcdace3b5f3a455eedc2a50b6e0e003ae3e17e8e7f9969";
   hasRunfiles = true;
   version = "1.0";
 };
 "ttfutils" = {
+  revision = 52851;
   sha512.run = "9a473a7b6699ec81ce580c978a2a8987e6ecd3109db797d145f4fac3b6b3bda407fcbb2ff5c59eb6c8a2397757a2e241f1226058bb5982174b9517143d8ad0ae";
   sha512.doc = "01a263779915465fa1dfc7461e536b606d1ca26801bf663af297c39292e2d554d559c43d748ce736c921326f296943bf98cda97f01ddbd2044b41c7084ba4d74";
   hasRunfiles = true;
 };
 "tucv" = {
+  revision = 20680;
   stripPrefix = 0;
   sha512.run = "957485431ecbdd31f180b36e7519c4bee8379f477b765ff5cebe57ffa3c95caa5556ed057943eb052d61e720074dc78035fe05b0023115caceb05bd2c3757183";
   sha512.doc = "750f739c7cc244ce52b4838009666c9b6196cee234e9bbf0028e3316c75a435b5038269e93f42d99116b9db3d93dc4710c03705b924d62f09a217f2acfe36303";
@@ -28889,6 +32365,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "tuda-ci" = {
+  revision = 53749;
   stripPrefix = 0;
   sha512.run = "2c53d5c65a56737a994b9463b18d81a96261f069bc94396e774986a42adabd0f75041265ea579dadc042b07046940f36f1c73600a8bb84956251a391e7215caf";
   sha512.doc = "367fdde6b250fe609e02002bb35af92eb67c52b4234837a69bfeefb2f998f6563b1ecacb51078b5c5757da1c260fe30d57c323b6cb88af66c83e54dd26122b8e";
@@ -28896,6 +32373,7 @@ tl: { # no indentation
   version = "2.08";
 };
 "tudscr" = {
+  revision = 53404;
   stripPrefix = 0;
   deps."koma-script" = tl."koma-script";
   deps."opensans" = tl."opensans";
@@ -28920,6 +32398,7 @@ tl: { # no indentation
   version = "2.06f";
 };
 "tufte-latex" = {
+  revision = 37649;
   stripPrefix = 0;
   deps."xifthen" = tl."xifthen";
   deps."ifmtarg" = tl."ifmtarg";
@@ -28933,6 +32412,7 @@ tl: { # no indentation
   version = "3.5.2";
 };
 "tugboat" = {
+  revision = 52724;
   stripPrefix = 0;
   sha512.run = "80eb6a023427f10c86ab97df7903e650f3b670b2a2aabb806e44735895156614cbc92e911f6fcd546ad90a2d8574abc187ccd7afc4ba8709f2b0dc496fc38a13";
   sha512.doc = "3ebd5c7419fb6148eefe10d0704172f752065eb6e04b65e784a98b24d7f35a7f4de40c527b86ebb2f571047b62f2960600535a0f7e1174bfc9b8d27fbac0ab09";
@@ -28941,6 +32421,7 @@ tl: { # no indentation
   version = "2.22";
 };
 "tugboat-plain" = {
+  revision = 51373;
   stripPrefix = 0;
   sha512.run = "a2541eae8834f9a78fadaf4123aa1dbfed2215d3697299e17fcb0c9635091be57b5171514d771c2e14ee7c94ee2ab18e0907a1b3b3cc5bd60b3a3c74e305f45a";
   sha512.doc = "747ac188b7d738ae33808da86716712f80f98ec2f69b60bc45514cead00d837fde1dcc99c65804e61c9e35e94e9276f314617f885dd081fe6fce75f7a2baaf9e";
@@ -28948,6 +32429,7 @@ tl: { # no indentation
   version = "1.25";
 };
 "tui" = {
+  revision = 27253;
   stripPrefix = 0;
   sha512.run = "59e8af51c39984a42247435ad893c3b8e37eb9dc53634e0a5f30733ee0c973690b66d805079a0f5cf61762abe7fceb1f2dc91691df9be26f72a1a8edd2524ba3";
   sha512.doc = "b48d9811ac6414d96a7b5059b33c174464f262c721159552e48e6f5bcf5b969ae91bbac61aff6077304907d3d2bd8eb73774628458a7e740ea49fe433b9bbbc2";
@@ -28955,6 +32437,7 @@ tl: { # no indentation
   version = "1.9";
 };
 "turabian" = {
+  revision = 36298;
   stripPrefix = 0;
   sha512.run = "fe4ec8291e8b1dfc6130bdc862384b8e7c6ea2d4db6baaf92e0b7b053ab8ed328ec452e0c1efc4da2eecc3f8b6c86e77cfd2100ea66e4f59276fb64683d55a92";
   sha512.doc = "3b4900c67c65ee1b20dedb2ffbc844ff22dc519dde0121b375dd13bcd80a0f2fdf5cef8c4e43a395ebe8fb4c82d463f18ca30ec65fe2be398c181af78ec0a0f7";
@@ -28962,12 +32445,14 @@ tl: { # no indentation
   version = "0.1.0";
 };
 "turabian-formatting" = {
+  revision = 48330;
   stripPrefix = 0;
   sha512.run = "7a6027cb84a6f2e2990d171aeb1e4cf528038f2dfa4f8bcd59f4775aecefd1a9e3d3dc36e9a7fa1904a9e42da1cea8b7843482ff8dbf00fef6666588f7b7c31d";
   sha512.doc = "38d89482b53a8daec33e19fa9f6c782e42b61586ba96e7cdc91bfc839dc734352dd5abf9d3146c4eeadca5921d7a85189481393f0691ea5a9917547e1e7a1f3a";
   hasRunfiles = true;
 };
 "turkmen" = {
+  revision = 17748;
   stripPrefix = 0;
   sha512.run = "437ff775642326f25f260280ca8d846e546f0f4b3c3082eb1ebaadcfc6ca5196967f82a00237367754b3ff307f983a828dba5c8117539d65634379567062a377";
   sha512.doc = "39014c9049322a1966951a242152b8774b2bc914bd620b6eba8c97e8ec457a1ed3547f2c211b3bba333cab21bac98882dbc9a1e9028443e7365780cf4d78b577";
@@ -28976,6 +32461,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "turnstile" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "083050bb9f34b576cc1033a0b754a2e888883d98d41aa08c1694f78cb5e372748cfc1d62af94732334ce05e91933e95796498fc120d6584f554260fef4d87811";
   sha512.doc = "6f51d17752aab1c33442a92d3d926b1802c1274b3799f33f65bcd417d268ce851be76d36b13fbe0fa3599399f10df9e8bec7bfb6ffa929f667b9e7ee3e9eb323";
@@ -28984,6 +32470,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "turnthepage" = {
+  revision = 29803;
   stripPrefix = 0;
   sha512.run = "446b0516264eac6b880048e16cf4ad7bb529718c726233fc645b8c32d625f3f6b505b72beef81994b61ddc77ec8ecfece907347be4f9e18a79fa36c2aef91b5d";
   sha512.doc = "4af8dc61e53df587f19b61f6260e7a7820a8334f2841a63f2ecc05b7197eb69596dc36163b39cdaff9258651241a334b6e3a814699065c8ce4f861fba6110f83";
@@ -28991,6 +32478,7 @@ tl: { # no indentation
   version = "1.3a";
 };
 "twemoji-colr" = {
+  revision = 53908;
   stripPrefix = 0;
   sha512.run = "affbbf8529468cb034c42328a8c9226c8c4ad6213f087f20ae69e9d2631bdcecc826c3c7f12d63a46df798af99d896b114383adaabd720eb9821365a324ddb26";
   sha512.doc = "32d51e15047a6b171987e7a4ae61b90d7280a5de80ea8b9859c7cee967869891fe1a21beb3676a04eaad317c441be5e8582697efffc5135e5363e071a162d656";
@@ -28998,12 +32486,14 @@ tl: { # no indentation
   version = "0.5.0";
 };
 "twoinone" = {
+  revision = 17024;
   stripPrefix = 0;
   sha512.run = "ffb9610d416a15f664bfc34772651af63f76843127290bd64462991b3b892a8bbe9b5a8251e278ce757883226bc07f89f54cf94be08d6bdbe6f68c5841e3a282";
   sha512.doc = "5b79b0b235fda5e32680884702a16fe033f3a617daa765a72233d22df5e217f6d2a617a2d067f6a230985e5144e6e6d733ef6e7060f267c6d22bf5de39361d41";
   hasRunfiles = true;
 };
 "twoup" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b3734b3818498a7038d544304d27376ff481b81fbd776cc44b9d246c3e69560364a784d897755cb69f9608c51135a1fdbb8ed370d624db64dd7b5f18a48bf754";
   sha512.doc = "2bd34ca3274a229949c322a543c2e1fcffac7383edab2cbb7f0c74dd43d3b9531f9ade43f6d0126f5fd43371093f92170f69fdcbc4f69ba7fdca1d1fad167c36";
@@ -29012,12 +32502,14 @@ tl: { # no indentation
   version = "1.3";
 };
 "txfonts" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "2e6a195791067ec85f4eeaea5970467c97915dfa48f59d17b5a73c90ba221de1b41ed35502c6714335cd190af05ccaefc6cd5855c5f35f49bd8e15a2b4ca0726";
   sha512.doc = "f19a988305799931023026f714b63ee539ebaddcd39e9be1f1bf765cc4cc89428b626ff4d6bfc91ea2f324f08cf09b618b6a0f8db6b01dc9d8685618daa1e2d1";
   hasRunfiles = true;
 };
 "txfontsb" = {
+  revision = 52754;
   stripPrefix = 0;
   sha512.run = "cbe87a0540b2bf74ffe26e54f744e9e705beed6711e688380000115154a79f2520257109bc929b747f6f3ebd84577335278301289d65eb0f427258a7e2035384";
   sha512.doc = "e71808976ca1f15a6d839f251a75a9ee71c3763daa9e36dfe08dc0d8deb8b13841eb9c0aa423879c7c245faf4acb288aaf2d53506ab312993bd42f7109d8a7eb";
@@ -29026,6 +32518,7 @@ tl: { # no indentation
   version = "1.1.1";
 };
 "txgreeks" = {
+  revision = 21839;
   stripPrefix = 0;
   sha512.run = "05b24a0c9705589d2e04933a5e29b8a49de155ad0e9a4caa0c36785f7feafe475275b76c58aa50d9318df26342b800382d3c9e8164bd95fdf400f730191282f0";
   sha512.doc = "b671e433740ddc414e0a881d1f91a1311ab0957038ebeba23fe99d623a62e0499825548dd591d0adc67d32a5d7331cdcdc76be6ba87f77265bcf48758626919f";
@@ -29034,6 +32527,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "txuprcal" = {
+  revision = 43327;
   stripPrefix = 0;
   sha512.run = "f6840ff0846b52130b65c81513d4bf358dfea413ac6d7f324eab592b96d5277d7036e5d991dbfc1ecf6376fd35baaf0351818eed69a21b6ba88e25f878a41ef1";
   sha512.doc = "f5bd216c689b0368bbbfe29f7fbd57bb7c02344d8696af488fdd7f1078fc5ad9ac7ad5565f1408b7b7d19224093d1418c1e3d8920b8cb0cece770811576c894a";
@@ -29041,6 +32535,7 @@ tl: { # no indentation
   version = "1.00";
 };
 "type1cm" = {
+  revision = 21820;
   stripPrefix = 0;
   sha512.run = "85a72c942e61dc0c0fd3fd7646d264ee692ecaf4e2badab4f68dbcc380a1c88a78d4ce066e23a08d1cfb29ed3af0115b08ea05a0e078283513eb14f9c6031863";
   sha512.doc = "6cd4061eced23057d860143dd7121b1e0ca1a17de1c2f08334c678c9623c0066ee77c1ab5036953ce390be7356d3fc0d155a5de1f0aa977e1e95296fe71d5199";
@@ -29048,6 +32543,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "typed-checklist" = {
+  revision = 49731;
   stripPrefix = 0;
   sha512.run = "3ebcc55c6e6e5abe50b1040be5d53f662c632a8b53f2d1914dee66ff0ec812d61057113f8af5062171a3bc9f7a67de0b3b5768eb701534d386d0db6fdfea0ed2";
   sha512.doc = "87943514c64b12bc85711086f17bf06794e110f36b67232659f6746f39d4e671a7b618d45c21c7d034e5aef3f3374c959445e235329fd16d370410fc5f9621ec";
@@ -29056,6 +32552,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "typeface" = {
+  revision = 27046;
   stripPrefix = 0;
   sha512.run = "68a71a590aaf3c6defc28a52b47f38bd1d24ec034df904d7baf4e22f1d390ebbabe744855bda70e72986450b402f03295f772a9576a2bffcab5638f3f77718db";
   sha512.doc = "548caa57dcde46484ae947f46abbd8cfae54c0325b42cc32c23c092e23f7cfe6589b6ddcee1eef09ece3c5ce0328fa561c52234899d9544fdb86440c91c63ce9";
@@ -29064,6 +32561,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "typehtml" = {
+  revision = 17134;
   stripPrefix = 0;
   sha512.run = "9a158c2fd4c16a5dda1f8828ba32e082f5839fb841a8479563828b0085db4fbe28cb91674c6f22ab4965f8bf6f6cdc0f5b3113743113ca0188ff8bb851845ae3";
   sha512.doc = "0001ed86af90c4fba458d299a2651a200ece010ec76bd8e934afcbacb7d7684fcd6c9514d280bac886a41eb38b4630fa52b1ea18da70ef9c29bc04618e392673";
@@ -29071,12 +32569,14 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "typeoutfileinfo" = {
+  revision = 29349;
   sha512.run = "b30d2618c8cdbf69fcb8a5444922185a52b934448b5d28ba143948cf80ed17cb402d73d1162194df3d2992a52ca9e6faca79000644eef968c4eba892c415b6bd";
   sha512.doc = "143c4ad9cb3890b6350069d5d045f74c0bb0cfbe50e7d051c50c82011b56e651d483c1422d7d553a8d1d1784ae726a1ca1aead023fc3ccb1da4f0d59d47f7920";
   hasRunfiles = true;
   version = "0.31";
 };
 "typewriter" = {
+  revision = 46641;
   stripPrefix = 0;
   sha512.run = "f8b9edca6a860f0acf0d676fff381276594f7c13fb13da2e54caf5513a8a65fde378b4c16dc621d89d25d7492318b006d7c5d863c1f96a0a246064c0dad1f2d8";
   sha512.doc = "12376247fd8500e7c147609bf47acab379e36126976ea9f2dc0a352b8b0d779b1cd43bd1394f3961b1a7fa894a8b6448b0369f612d8bbf8d1bec3175e850f89c";
@@ -29084,6 +32584,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "typicons" = {
+  revision = 37623;
   stripPrefix = 0;
   sha512.run = "38b0afff6e88635a2a27502f1abc279fd70e49f36d56bb44114895614cf80184ebf8b627bcd576d128b3557de08b3791c5c2e48f2adac9766f9a809ff0db3cba";
   sha512.doc = "36b9517833fa6c430671fdaf0ad0775813c22ea3b3f56fad96410dd90e052b76d81f0ecd411ec19b567cd664b7ca44b9268d05ce59fb9bea0429c8f91c3a4a55";
@@ -29091,6 +32592,7 @@ tl: { # no indentation
   version = "2.0.7";
 };
 "typoaid" = {
+  revision = 44238;
   stripPrefix = 0;
   sha512.run = "56553f1ea620566efdcd5dbe3710627d4c1b0be0ee294d256cec8cd633a4b24048012c108eac867427ddda28614eadd73172fcd2c57ac702d5f5e5c4a40769bc";
   sha512.doc = "fd4809e02b1167e16bdb75cce5837f6202cfb44e7a0204900f6eb70173aac984eb35b14f00a9d43d4a61a4fb3a00298eafcbf71de15c7531f043e64cef418d8f";
@@ -29098,6 +32600,7 @@ tl: { # no indentation
   version = "0.4.7";
 };
 "typogrid" = {
+  revision = 24994;
   stripPrefix = 0;
   sha512.run = "4ef0239ae626245b25e43819bc05da7d22d89d1e33b94402f8bf2b24e2518bfa7ce6626d0c9deffba5d461dd65db0160bd9134b78cd9ba930d0e6315cd761b9c";
   sha512.doc = "d228343668d98616c6cab8a1c4b0cea313b4a7d2f25699a0f54f64b660b10869d2669d98f7f5b992ddff5a3202139ef1e278ebd40b3dd76466c6154a59804c90";
@@ -29106,6 +32609,7 @@ tl: { # no indentation
   version = "0.21";
 };
 "uaclasses" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "4341612f18d6f5f4352ec0bf0018fe3115be73f479479586a81d7f994ec23adea7c38fd773022b4d81a126e43bcbfe5f97f4c36d61bad73509f2c1b97882c00f";
   sha512.doc = "63beb08274ed7db9a2d77761277d65f89988812765a2484d7db54a8419cf67dad3fbf76b46bdafd8bd7cf17a1d540deb83c00c7b6df01f6f023bbb5f098c2ab1";
@@ -29113,6 +32617,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "uafthesis" = {
+  revision = 29349;
   stripPrefix = 0;
   sha512.run = "3f8146ae2cddcc8f136c7dad5cd926919d4d81a2b43038fcce55620c6c240326123b6f48c32504b44cbbd9b62aa3a61cd80f5b85c9890ecddef9d96342cc0eb7";
   sha512.doc = "bb1e0fddf66350187d8507b34811c0c1ea84fbf0c6cd3e9eeaec8ef6c7111fa2ad1eb4d805df01fa6bed58030056ddf0b2b4305ad821e696fa6de977cff46c98";
@@ -29120,6 +32625,7 @@ tl: { # no indentation
   version = "12.12";
 };
 "uantwerpendocs" = {
+  revision = 51007;
   stripPrefix = 0;
   sha512.run = "93c494ac45f8713cdff15e03b5f17388041ecf569eea304966da980d413d542d72af79ce86a57686e790ac527c5c6e562a93b9612c03438aa7ea1acb3fe7af92";
   sha512.doc = "94a6b8beddfa2b625fce0f75cbab43ae4fafa7cd7c5dd0568cbe46cc1a7b0218c74c5575d116c8e085bc0fddb62db0596635d549251a760ef93d93b662d40982";
@@ -29128,6 +32634,7 @@ tl: { # no indentation
   version = "2.4";
 };
 "uassign" = {
+  revision = 38459;
   stripPrefix = 0;
   sha512.run = "3e61f381e23c30670fe78c4a54d99970bd05883e6fa03040e7123fb0936aabf51341d64aeff92109fdc33b7b97f40aa0cd81fd6624d9449584aef1fa3061070b";
   sha512.doc = "e6569cdac6854bc1856d6a4604589619ecbf317442018790eabc3332723dc167a879e7ca6be0da8c281847e757ddada005daaa3b8712f7697ea4052b9c9f7cf9";
@@ -29135,12 +32642,14 @@ tl: { # no indentation
   version = "1.01";
 };
 "ucalgmthesis" = {
+  revision = 52527;
   stripPrefix = 0;
   sha512.run = "79fe22cc61ca71e472b2ecd173230b518f97b66fd411430b57dc341394961999b0cb4dc7e122d6abc828e5ecc5e15f60e0b0ce785131cbf4942a49ddb8b5190d";
   sha512.doc = "458ad22537a6152ff782725328e98b68f1fe68ebcb2764ae1598bca8b659c8e67ffcb0c889890c7254dba84301ea3a066a5e92bac814027f62ce6910cb5f5b9b";
   hasRunfiles = true;
 };
 "ucbthesis" = {
+  revision = 51690;
   stripPrefix = 0;
   sha512.run = "b1a4258afddfb1283c3fa4f8e126dc63f1ac948ebee2d2fab3738e2f5228b0bda85e71ab3cc3ccfab0b8ae66b84547c5070e111e8c1516b54bcef721f935e63c";
   sha512.doc = "aa443fe9530f08dde9b0531e075052868524c7ff6052e8e93e384ee3c01a354fd1752664b602ff6c98ab5250d05eca910773236d55270c09a567c9b238fbcd7a";
@@ -29148,6 +32657,7 @@ tl: { # no indentation
   version = "3.6";
 };
 "ucdavisthesis" = {
+  revision = 40772;
   stripPrefix = 0;
   sha512.run = "ce8191ad81027361c23175194bf23284bc2e43407f0047586a4a89a2c51f9823356e2e571639a1f76f6a1f2b43c08eeb134d874c03f559897b0cf50aecfc94a9";
   sha512.doc = "26ecd36ab09467341868d0ad7d71f39728f23688053ad4b8a89339238da5c96fcfe504d8e6403663eb6441a14333163f8998e00428609b161c3e9665a4ef0bf5";
@@ -29156,6 +32666,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "ucharcat" = {
+  revision = 38907;
   stripPrefix = 0;
   sha512.run = "333e8f92394d89bdc3492606e467d4b664c5d87eb464e1c16ff293e3f87931c3c70308aeb523fb40f2e76e5d0aa2c1635402f40fc36ecfbb7ced98d232b8bcb5";
   sha512.doc = "b4615cefd26201509c908c2719519f927d61ad96367a612d654917819b2ac973fff85d081dad6e1d092e634388b16e83e440d3cbad4fc7c16f638f5e2853bb7f";
@@ -29164,6 +32675,7 @@ tl: { # no indentation
   version = "0.03";
 };
 "ucharclasses" = {
+  revision = 45024;
   stripPrefix = 0;
   sha512.run = "1c90d8c0f27919e8b3e8bb057a43bb1878b1bf35840d13b6304edb24df56086081883731c35d1d58638374bc2835ac3f111a23981459357b1d1883168a4dd833";
   sha512.doc = "21453f2a5fd247f05033b929200bed163391c718ac0562953a732718b8851546b1e2b8c1fc35c1412def0ac368c47ef1c06d9d8f4bb724be6863c2568662d10c";
@@ -29171,6 +32683,7 @@ tl: { # no indentation
   version = "2.3.0";
 };
 "ucs" = {
+  revision = 35853;
   stripPrefix = 0;
   sha512.run = "f3a7120c45b722746b0f3c90a189ebf42daccaf659385c16507e5fbfb0a2922b7fbc3b3e34f53fc61ce6cf0883c9c182ee47c95b3596fbf9029db6fdafc6ddcb";
   sha512.doc = "b1c57fc95a282e546fae1fb8267c450412ff92b5bb0510c335cfa7d8ace9691c4f6c47fdc0a87d6752052abca1325a86a44b777cefd65363bf4d9c95265de888";
@@ -29178,6 +32691,7 @@ tl: { # no indentation
   version = "2.2";
 };
 "ucsmonograph" = {
+  revision = 52698;
   stripPrefix = 0;
   sha512.run = "e4375327eabb390842ae833bceea1a554fd833b656e0ede5d56b1bd48a070dc0b89eb878db0c77e92865760755c006fffab8a1d0627f0acb6cc1485aa9a13c6f";
   sha512.doc = "00cfc843b8377d9390806d72a78c5c7d219adc0312a7472ad764bb777200265b6f2d6757f98c44ebdc671671df38e920fe488a2cdea0dab0a3953856b5233b57";
@@ -29186,6 +32700,7 @@ tl: { # no indentation
   version = "1.3.0";
 };
 "ucthesis" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "5409e366c69372dd3a93b3755d185e0b96edf71c7a8de4d6cc3d41850e5b9915d2bbe68d3265b5facd52e7d8c00159031737dbcc26302a1a6a89425ac47f443c";
   sha512.doc = "7f7ec44a55e2d712af2204d883a7136b44192a402daff4376cd6cb217419179d2b46bc083688d9be9ad85d2b3daeb00305f2253196784ffc9d72c039f0aca5af";
@@ -29193,6 +32708,7 @@ tl: { # no indentation
   version = "3.2";
 };
 "udesoftec" = {
+  revision = 47164;
   stripPrefix = 0;
   sha512.run = "668c96da10c6fa73d9739e00e0144d20fcfe1677417f648c205fa0fd49eae7ce9d5460e30f2002c39791a41e7db19d8ac004b4bb0d4c44c230ae1ab1ba884719";
   sha512.doc = "fe902d88de4e7e98a5416bfcd67529d860ee85733ad9f76e8ad2112fb2ec071c2fb26d786e88abf8fe8c8f7d7e199a4f0c15f728aa1c117bfff7e32941e677d7";
@@ -29201,6 +32717,7 @@ tl: { # no indentation
   version = "1.6.2";
 };
 "uebungsblatt" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "e9ce935da13de8106d63f233349bd29e954538ad17de7505be14a4b5a2efa1e1aabd3ef46871e98d2f5d4730bcf6c49998187924328eed19a35a95bffdcb8d70";
   sha512.doc = "2853eae6fdddf889b305166c6c09351e8e7d7fb087c68a5ab9f4a7a282118200a5120c215708e7d2b9d4487457aa6330d11ec7f7a8e0139719b67217732f2633";
@@ -29208,6 +32725,7 @@ tl: { # no indentation
   version = "1.5.0";
 };
 "uestcthesis" = {
+  revision = 36371;
   stripPrefix = 0;
   sha512.run = "aaeb270174e260230d527379ef0a7581ec9f78387aae8505ed5e88a04586dfbb1d90cb923181f34e92d5100bcece0da66e17452218f0c83bbb12b38cc517f3b5";
   sha512.doc = "e68e86bb446c1e79111948b004ece03e2110166d01966d562b1bac6c932385aeaa682f04262eccd822e01b93c66c77be53c947c1dbdbf5ce129a74efdacf5df6";
@@ -29215,12 +32733,14 @@ tl: { # no indentation
   version = "1.1.0";
 };
 "uhc" = {
+  revision = 16791;
   stripPrefix = 0;
   sha512.run = "b5e722e7a72d2efcd89c969c10291779a2885603817374e4318f59b4042b8890df967503016d08a91e30ba8cbbc6f1838843644f06cf44766a7096efdd3bf905";
   sha512.doc = "c37c5041d155f9a175a6761154211a683405d094850cc829a6b942afcb93af987b4049e663d260ae2b066827007d8c6576fdcd5d14d3ff599f031b13c00e162f";
   hasRunfiles = true;
 };
 "uhhassignment" = {
+  revision = 44026;
   stripPrefix = 0;
   sha512.run = "a394f6f161cb72ba42eccdaf26f08b12048cee56207f754dac157a2eede1b0867fa0d5916a37d5e3dffbf10237178f156fd3cb33c88be6a926208ca8dcdd0508";
   sha512.doc = "21054dc051229a338d2aa954cbf80893e156236329206ff3cb63f47dceda4c35c6fbf6c2d9492551b7609aa88dec74c507094e2d96f2f96432436e74e80a9c38";
@@ -29229,6 +32749,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "uhrzeit" = {
+  revision = 39570;
   stripPrefix = 0;
   sha512.run = "7b5c732258e25ecc2d429b09349b94cc4f24de77e8db40add018f42bf7658868e9c3730f0fed86312ea96625556fe02a276535eb14416d06fa5fd2cc1eff30c6";
   sha512.doc = "76c7bdb6c74ac05fd9b51366b68b0dae8180da51f506ba1793765d25de29582c8eba51826d6d6c6d3c3c1793f10fda3f6bb75c82d8d454fb19e1339eb98a9eb2";
@@ -29236,6 +32757,7 @@ tl: { # no indentation
   version = "0.2c";
 };
 "uiucredborder" = {
+  revision = 29974;
   stripPrefix = 0;
   sha512.run = "4a398e734fe551f1636a63ab3ac8b851ff1e445c8b15b6e48017ed7a81edbcf042750919db790d7e2e9d6b08132ec5a3c04195854315ba1c1c8e8712996dcb25";
   sha512.doc = "6e1c91389897853bada4b52c8350dfbbc321395cf1ff7991d7f29d5e64119c86c4e07fdad889f2a4a149e0e2db1a1e5cd9a44cf6f905d5030afa25cfb14d1323";
@@ -29244,6 +32766,7 @@ tl: { # no indentation
   version = "1.00";
 };
 "uiucthesis" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "565b499bcef08716d627e206a53f2f344a10a0e219876eaf4bd82a63accb2eb43c14c8c8b25236d336022900e9a7d5299b5a34d5e40eba0be6d7dc8ee4431490";
   sha512.doc = "798e7428988a622562b94bfd4ae389dcbba3524fda0d427aa4fbdaff0f1a437babb4e68b58350a3229fa078bf11e17af9f5eff61a5c9153960a941783cca623e";
@@ -29252,18 +32775,21 @@ tl: { # no indentation
   version = "2.25";
 };
 "ukrhyph" = {
+  revision = 21081;
   stripPrefix = 0;
   sha512.run = "043338c4e92d84bc2b7bd63610656b53b39bac225c5610089c0c8b58ce9bbe3f414129a6b043a5307ebb7b59cc062ade7bd803fb6949d06a0d0c87e2dd4a0bd3";
   sha512.doc = "a283d11ed922181d4f29f521e3019fbca2b1bba1aacb312e22dd8e69d05d7dafbabc5c23b63707f265bcd215d8f517f58ab2ffee2b87d9bc1a968d00e9542840";
   hasRunfiles = true;
 };
 "ulem" = {
+  revision = 53365;
   stripPrefix = 0;
   sha512.run = "bb7fc8d93d38a847431f9f62f1447520890f3904654ef6f3cdffd14537600da35d54bd0839cd8fd8d26e1e3146463cd9ced79f706df54df075292eea8a40ed4c";
   sha512.doc = "153dcf2057d267c2f59c7705c4997752e902aa004201f97d52a180419d7c0fea4173c0b5b1a1c8a11bc1703226e55ea55721a4d18c265b30343a5812d1f4e0e7";
   hasRunfiles = true;
 };
 "ulqda" = {
+  revision = 26313;
   sha512.run = "228132cc464dfe171426fffec6103f0dd5eac61c112b03d64d98bc89a0af0ddb7f52f27f9bb5461c8be6f752ae30ef3d4c6b987e580d834eb7524d5c27d956cf";
   sha512.doc = "182dbcb73a25e05035f878696887ea219569a1a7ef44281bee14b4498b37e92346e0e97d187a5f3dbcd8d9783f260080ff10f58dfe41e69caec4888d901b9128";
   sha512.source = "352f1a739cb9c74c0dae529ff330f3269e763242af4dd1bc0aca963b3af03f02f5becad436cc3a93aa105359a1bf2f229b3cdb7175d539d58df67563b490de8f";
@@ -29271,6 +32797,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "ulthese" = {
+  revision = 52972;
   stripPrefix = 0;
   sha512.run = "c2a3d8a837ecda20bf50c496b8506e6c7dc7d6308fa058e51f4b1dba858d76c391ab3b9faaff9cbbb39fea3696fc5a1c7daf9417f3c18b3eaef9fc7eb5383195";
   sha512.doc = "adffed362b6ebe3bab7aa04563ca0de114917199893dd310578d372f6e4e67b84bae7e50658ebfd7bde270d4c3158ef9dda57c0c6855787fa3cde0102ef4153a";
@@ -29279,6 +32806,7 @@ tl: { # no indentation
   version = "5.3";
 };
 "umbclegislation" = {
+  revision = 41348;
   stripPrefix = 0;
   sha512.run = "ea6a55698b51da3939a1bfc10963dd74d9e772ebd18ad9018f649077224f7ee30ca20f051a68c9bd8d8bac94baf1d0d28ab2f864419c61385ebf9bc82aacb7f0";
   sha512.doc = "d4d5f318baa1f1ecd446bb864d0670ed2dcd7208429bfd2ce587810b27dde22f49a6f7c072aad8f6515e721a98ea0ec356ee36eb970cdee385910a291d964394";
@@ -29286,6 +32814,7 @@ tl: { # no indentation
   version = "2016-6-8";
 };
 "umich-thesis" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "52bb76c9d9e3bb742c2049495a74d026a1803396bc5064a10f4da2e80390ae6c9c9c74326b14966e989c9edd1e29b797b89413ed6e87e90527ae470a8b731889";
   sha512.doc = "db85abee0ad37ce814c645c072399a6ab7e3307c623bd402a1b9ee8b69a1c2a8aa782b5007a433ebe9eaba984432223bd78f247fdcd0c6f50edeccc87b874173";
@@ -29293,6 +32822,7 @@ tl: { # no indentation
   version = "1.20";
 };
 "uml" = {
+  revision = 17476;
   stripPrefix = 0;
   sha512.run = "b20da85c7166f8aec4309af3ab0b1319f37ada1513ff502555794b1721ac8c3f551afcdf49a58bf5c3c5e666e48962075f7711a45de003245584541175a6a470";
   sha512.doc = "d81393e3b6d9efc0177478e562dc0a22323e3e5913d7592cdb6ec595d525238e154d2a599380521652eda4fe75b12006cfdc907715b0a9d461f8df60ed27986b";
@@ -29301,6 +32831,7 @@ tl: { # no indentation
   version = "0.11";
 };
 "umlaute" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "35188d3930b11c0d1b52a5032bcf9cea21a22ce8ca2930f69ad4ab54bcdf56b73858168cc62581aac1173452dd0f7d0da3de8ac21b0ca2255ef324ff63c89091";
   sha512.doc = "89f28b3b90f63ea4f367019f0b65aa1f8e9489ff0d897af6ea29b7455948e3e75ef003a5a2d5b4a88e00a5e415d409a577c03b63a330f93ed6804c99f951c68e";
@@ -29309,6 +32840,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "umoline" = {
+  revision = 19085;
   stripPrefix = 0;
   sha512.run = "db3b8216d50288ec096f3dea9db24dfbad76848d9b8ccdc5d1310f4b8bb1b37ef10fed74ee5e6e0b70cc3e0aaa73aea87354ad731e4057c888031eb4e1940539";
   sha512.doc = "64d559300349fd75af4bd98f0841aee5c5d622791cdd03373ea1e7840989b5175e300663023d0f08636b86337f66c6668871387a51a9a28e079111087265bb98";
@@ -29316,6 +32848,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "umthesis" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b2fb90713da6547b9d4cbea4f972144f70d7f1875e325225f0dfb90df1a04b4693c5a3dc651f0066ef7ba6456c7732aeb5272ccfd5e8edc24281c1b1bc9e4e32";
   sha512.doc = "fb43c7ab262d2a1eb70b80bf4ad66ae9e022c847451009372e1ee1fcc5250e93b0a4a2195f4208799ae78cbcb5fc24d48de0b2355884721918ae5d4c827c3507";
@@ -29323,12 +32856,14 @@ tl: { # no indentation
   version = "0.2";
 };
 "umtypewriter" = {
+  revision = 18651;
   stripPrefix = 0;
   sha512.run = "44dc925eccfa4010566bc751bf202fbea6b369beb57c6851bffce2dab757bbcf415d601de44f97e929e046cdba1720ecd7bb6ca12c992674d33b43b9e0ce77ff";
   hasRunfiles = true;
   version = "001.002";
 };
 "unam-thesis" = {
+  revision = 51207;
   stripPrefix = 0;
   sha512.run = "aaa8c4029cfb130798c5e9401fde5dbc7943d7cb89c9a620e050e619ccc1950593b1d10bf6300958aede043ed0e4fbef371d0c40f055b259284f008463a64c40";
   sha512.doc = "ba6897f0b31953cc60bb49430de1b77d10d7656363d596d4160f96189c70417227193ac7d3809e1bd7518b89a871f5bf4b18004ff8185b2a03e0226536dc6a3a";
@@ -29336,12 +32871,14 @@ tl: { # no indentation
   version = "0.5";
 };
 "unamth-template" = {
+  revision = 33625;
   stripPrefix = 0;
   sha512.run = "b8d1d3bf42c11c967d9e3889e52e2c9a45aa3e0bf4ac6b6e5a72d69e1bccc2b254954a6828a66ec794dc7126f54d26ba48e3c11efb913d04e50f4867d348d3b1";
   sha512.doc = "eed527d21e7d8669e0a02fd5e880e9172dcc2ca8a1e499b079d1d8f3935b7e84a4c84763b0204bb3b90a9df493bbbba6ee90fefcde6b4975c1360ae119264f61";
   version = "2.0";
 };
 "unamthesis" = {
+  revision = 43639;
   stripPrefix = 0;
   sha512.run = "f48e7aab2c445c5e257bb39ea4dd880cf9334a5b1dcbf429e8d4420edbdc4621aa59548f31770d67698bfb4e59e239dbcddc959c1b010e012ad16971ee7956f0";
   sha512.doc = "240a697f242b880fd2436bbaa3752aae57ef3fd2e9ee63da173c78582c4bcbb1eb19e02a96607991d1d6a40157d52f00dadcd4956af230d429ad5223161a018d";
@@ -29349,11 +32886,13 @@ tl: { # no indentation
   version = "2.1";
 };
 "undergradmath" = {
+  revision = 42926;
   stripPrefix = 0;
   sha512.run = "1fa7b30670ff888b7b848b756b960690489aa7ea12e5cc5cc97b56061cc91c2fc4bb2ab0a3a2eaf13177baf760edf8bd7f222dbe02cc16ad7b53f57b4b4340fc";
   sha512.doc = "5dfa5955c7e9ed8fe89f6ccfb4517e699861b95619fc2013631d457938d64bd56bf34718c29b154a46b8519ec61bb102963668b13bb414a3a7ab35b748a981c7";
 };
 "underlin" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "b3afaf4c51b3da2d082e2cc742deaabe70cfbea7425e0c57f0d1d6696cd7d8f993707a219556a5c5bca925ea63373e3f0a716a82ead647e09ef2f716535886d2";
   sha512.doc = "d296a04d3a24b463de3e4fe99c96a2fd8afa7c4ed2fa17d1218ac9e4c17455b4752176be60743211d59657045c709c8b4bd66febf10c81a41879e8c7a67e9958";
@@ -29362,6 +32901,7 @@ tl: { # no indentation
   version = "1.01";
 };
 "underoverlap" = {
+  revision = 29019;
   stripPrefix = 0;
   sha512.run = "3f94b5d33cfaa7f48441ba656e9498ea17ee5ca404e39486004e43bed71bab5f2140b391191e4d6f9575ca23e09b83bce343433c02cc394844270e563aab70c3";
   sha512.doc = "5214981a15d7f15cd361f007505a4a0060a2952d75ea28f4eaef01c19a5b79736512a2b0a8c5e6ece2d08c364780256963276a9bc9ea980e13ba292e3d0b8bc2";
@@ -29369,12 +32909,14 @@ tl: { # no indentation
   version = "0.0.1-r1";
 };
 "underscore" = {
+  revision = 18261;
   stripPrefix = 0;
   sha512.run = "4fdc57d0a36aa5646c6b960b7579a8111441659469df32beaae06f54e6e835456810b1d9b5d36036510befd5e80b5b481b9179a6b24364bf8f858ebc97039ab2";
   sha512.doc = "e1f0730b39a5d25cc52160e090b797ed73a5becc16b6813cd0c2f4bf78696b23aec5c82367c347d0e734f3b92761ad2090e517bb6dd2a40879639f62149fdba6";
   hasRunfiles = true;
 };
 "undolabl" = {
+  revision = 36681;
   stripPrefix = 0;
   sha512.run = "b753a9d8a4809118a76b9651c5c7994aebe5c95019b408c59b356135ab34fe4e463099280ea43fc4e47692e32af9570be929999a661fe80ce993f25b85547e10";
   sha512.doc = "d7aa3497adacd6a5e10dfc9ac19762ba3fdabc74eb1d50c22dcd05e8d4a02d0723efe3c7e297050ab607525ad3611cddf87cc50d640394c4489d765fffbbe8b8";
@@ -29383,18 +32925,21 @@ tl: { # no indentation
   version = "1.0l";
 };
 "unfonts-core" = {
+  revision = 49455;
   stripPrefix = 0;
   sha512.run = "5b405d4d77d15392ce5c90e9b50b6ab68309fdff67313af2749ff0865f46ba02a40e4850a690f69834f0b6a7c7e7ac33d3d422a9b241586433718f82de31bc30";
   sha512.doc = "aabc766497c311a943f0a269d5822a44ab6baab6c8a82fddecf0b53010d794173d417f46fa6c073d2db453540a76866dd2265daea5879ec8c0ffdcd936d29a41";
   hasRunfiles = true;
 };
 "unfonts-extra" = {
+  revision = 44465;
   stripPrefix = 0;
   sha512.run = "ba57b43a7df5d1f9565a08e0a0588d9a3ac9702041763ee663dc8c906279f32c363a88e1c1be098e0d4e9b26550121e686cbb6fc6b0256bb91535a4a1b12a083";
   sha512.doc = "5fdc1ebd1d939ba99d4bb11c2d89128a97adaa4a0696abbc7517ab55ce39b87e7e7801e7a30b93c1f95e92bacd7d862144191f0ef542561816f6d1b84e9a7131";
   hasRunfiles = true;
 };
 "uni-wtal-ger" = {
+  revision = 31541;
   stripPrefix = 0;
   sha512.run = "d1b6186d50733f87576ef6509f7eebaa17651039d882f78abbfa8ae23ddf7b896a90065fd5ff83a2e216485c22e865057f715784fab37ad9440616297d67a26d";
   sha512.doc = "ffee19f2d4ac337f7615b99946287eb902d2841b48f9d5c49d51604b45b7eaa126538732d64b319a8ba320f1dcb9b62b45cf608dbb0059f37975a1220022c333";
@@ -29402,6 +32947,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "uni-wtal-lin" = {
+  revision = 31409;
   stripPrefix = 0;
   sha512.run = "803107d89b4ce6fe120bb528c684a65db3a9c70433abfd6bcebe2a5d05e6c7680256a407ef5f0515a56915c5c1e0637a183cc866631558e32afd96a0e45139ce";
   sha512.doc = "e88b2c8364eeebf3768d0d562447d29233280daf685d56fe791d25b352cc64c4c95be3bec198aa6e5502287a654f3088e643a3a58edf7e55d0d899eed5b704c6";
@@ -29409,12 +32955,14 @@ tl: { # no indentation
   version = "0.2";
 };
 "unicode-alphabets" = {
+  revision = 51712;
   stripPrefix = 0;
   sha512.run = "281c7fc8b290aeb264bfad6e69a7e6b00636a58b15a29129c7c7003292d4b13570964600e8040ccecc1272747b9b84d36f8d5210c231a108fe22f9c79882800f";
   sha512.doc = "f8297f2386bea8975ebb27a73044ed464077dcd7620bf7adfe70a3d07e8814c8da28af12d05a7192e883b9d2f179be3a928bccd77e557a4deec9c545f2f035d3";
   hasRunfiles = true;
 };
 "unicode-bidi" = {
+  revision = 42482;
   stripPrefix = 0;
   sha512.run = "35e32b9959e698ab0d32ef578376fdeaac54c1acb9abc584e742a7caafbb2cf82364d58d73ad07de4cd273a5c9c60e4468df74fc4c21fb6552ddb5be725e384d";
   sha512.doc = "44b76c810988c541c5dc6cc85a56fb81e8c2aa97afb84192477e57f59423e508e34aaa0542009ceb5ddbf74c95cd662697544af1cdda1d0c114bb3f0507493d5";
@@ -29422,6 +32970,7 @@ tl: { # no indentation
   version = "0.01";
 };
 "unicode-data" = {
+  revision = 52961;
   stripPrefix = 0;
   sha512.run = "6502cb2f4251101727d9d9708450a47d46ace34bda50b6d760fb6ca3605317e948ad2b47d3fb4ac1349e55460a75a99a1aa56c59a444945c220ed8fe55c3c631";
   sha512.doc = "6f8214ee77f098dff74941ba472d8115c64953f3f925222c6bb1fe756ab07a5ff4ca44ef2cb1515241f46d572c9d67df96ccc461f4923471edd17979604d83da";
@@ -29429,6 +32978,7 @@ tl: { # no indentation
   version = "1.11";
 };
 "unicode-math" = {
+  revision = 53609;
   stripPrefix = 0;
   deps."fontspec" = tl."fontspec";
   deps."lm-math" = tl."lm-math";
@@ -29439,6 +32989,7 @@ tl: { # no indentation
   version = "0.8q";
 };
 "unifith" = {
+  revision = 51968;
   stripPrefix = 0;
   sha512.run = "bf288fc67865b2440b7b62633a04779e0172ed139e6ca4f1f88b21ffc84147663c143867d204b54d49f0d0f4d1aa0f3ef689dbc36881198398512aeb735c717d";
   sha512.doc = "f185887da8604b1e24d9dcd7581b071e65dbdce6e61ecb435e99c19fe969a5912974af8430eeb22e090a8d2e1100a3457ece22cedc84aa10d589957e0cfd61cb";
@@ -29446,6 +32997,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "uniquecounter" = {
+  revision = 53162;
   stripPrefix = 0;
   sha512.run = "9769fcfd787f210e0653c971872aaad6e0ef1e5a066e392e9d599f8fc11ab9f6587d21db1100b643d09d4850cfbfbbc1d32f01fd1e86aedab8c92da4f5a7d614";
   sha512.doc = "4dc74aabd9288ae881c4513886ff917e1e8bf08446d3b34c946bded6a6fa71ea7b6786bf432fec2661cd1db1af6b5875ab329708cc3c443499b83b0325645d0f";
@@ -29454,6 +33006,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "unisugar" = {
+  revision = 22357;
   stripPrefix = 0;
   sha512.run = "01dbe995d32b49121e28163c11f89e51d4c692ab864b3dbe6305a0e4364c025b13751c137df52d24160acc9a8080fbee56fc7a5af522405c3d0564486c151260";
   sha512.doc = "8e6fdec36271f3561c768acf095b6fc353da07864829322dd0b52b1784d74793828951e006f8c56a9c38849b28ce186682d906bd7bc906739b22782db2102021";
@@ -29461,12 +33014,14 @@ tl: { # no indentation
   version = "0.92";
 };
 "unitn-bimrep" = {
+  revision = 45581;
   stripPrefix = 0;
   sha512.run = "595883fa58169e9cd7a860933f19847895ca02d3a684b71536dfcdff54c5fe6410e6cf6fab8ae9574cb9a9180ce24f3ddf41f817ceeab85d0c65684cdc9b3909";
   sha512.doc = "3049a0bfcbae6666f309979e2c2b8d52647d3c445992201afbbfa28684b83adb2a1ad5f227360c49826ba2de2cfebbc87195801c38413f5eb26bcd793b77ca61";
   hasRunfiles = true;
 };
 "units" = {
+  revision = 42428;
   stripPrefix = 0;
   sha512.run = "a1c3266bd95d8668d67e7dc451258f7a3a0362e4435ab70a574be5f7ac44bb5fbb7b30ded852602c73f227f57e8f7bf61af148070b9eae6103a982f726869a2f";
   sha512.doc = "e8a1d929e9817539a5fef6cd89c8d4daf60cc0495fc7698e4708eefbf60fd36daf88ee5cb668e9f1d53978d53253bb52ef6b3e6d1a313708022e5218c99e89d2";
@@ -29475,6 +33030,7 @@ tl: { # no indentation
   version = "0.9b";
 };
 "unitsdef" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "048b2d4f3b160a359a8db5a66b9bc3bf68545384c39c7c4964521aa2067a35e4524734e082d5bedeaf3ff52b6a5043717ca6f510cce0d041b0968968ffd232b5";
   sha512.doc = "c1e6de470c8b290c66f71020794fa5a855a0c9b22d90f629c8ec0f6ab110ff780c0f39291f0309348711cc2acb60cf52f38538da8894803cfee54f9fd6fdc9c6";
@@ -29483,6 +33039,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "universa" = {
+  revision = 51984;
   stripPrefix = 0;
   sha512.run = "f21f9bbc0c4e730cd1b115a5dbab22df9519d4a364045e292eae6b73741dabe0117c53759b7db7696c88241800970801335f7537e19d448fda6f72569c4eba50";
   sha512.doc = "3d5ae6da093d5671b369f7db4920baab6fea25e58e11926e2fffaedf1b0699885005f3d0158eb2a6afea9ac4f08ec63c577e99da7cbb75e33727f9a97c8157cd";
@@ -29491,12 +33048,14 @@ tl: { # no indentation
   version = "2.1";
 };
 "universalis" = {
+  revision = 33860;
   stripPrefix = 0;
   sha512.run = "fcf890f52623fbded89b6dc5e6a8ed425354437430f66a70515ef7cfc126e6af20331f557630205189c7aa676532795d77415f2b4099b1fa46f460dd1b0f2011";
   sha512.doc = "4cee70c65d7f83a5d280550934c47acc59cffad87d78364ef84d397914127f43fc74b469469371652a83625d0fbe97c2a50fad76f559f39924b1995bf6a09baf";
   hasRunfiles = true;
 };
 "univie-ling" = {
+  revision = 49785;
   stripPrefix = 0;
   sha512.run = "33cb5fbb0b8cf2a5a49bfab100c584155a965bd1304a8f16e78ea3c5e5007e43580f3839367cfed28e6f20e8e6f653e1fb9c7aa357e31e41e8f688d74a9f8800";
   sha512.doc = "52889934cb166ecfc6d5dc4433a9e1c4df927007584b6513d5a254734fd9b82c77af4fa535ddad34494fb207a41167080828500cce02b34f2f88787b8ec783d5";
@@ -29504,6 +33063,7 @@ tl: { # no indentation
   version = "1.9";
 };
 "unizgklasa" = {
+  revision = 51647;
   stripPrefix = 0;
   sha512.run = "ac96ff7105cc0a6eefa7a797b325c6e3cd7a0e59d31a6ead1f715d37d326450fbb3d39d6bc5228df5861c5633ab8be027f7652426c10e0ab23a2c9ab68bcfd98";
   sha512.doc = "00e373b284ea78d596519d982efe8d4c8f59f8abbec67c314bf361b1744d35fe2846615b8cb7d38e1516503c6ed49f9ea38718c31a760f3d19ed4a7686e8bebf";
@@ -29511,6 +33071,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "unravel" = {
+  revision = 52822;
   stripPrefix = 0;
   sha512.run = "e31da53c07ddb60491412e94f50444cd3178879180426cc2d8f78d5056a05c091a36d1c5b9107f0e3714acab1f723e90ddfc0250319bde07d67133bc50543f4d";
   sha512.doc = "5fc7618723ab27f57c14b0b81cb8d6f1b141ac6582cd73143a5c1543dca0f307ff5eaff006dd0a55c6f84887f0b08dddda5651b9c0938716262894cb3b8aeda0";
@@ -29519,6 +33080,7 @@ tl: { # no indentation
   version = "0.2h";
 };
 "unswcover" = {
+  revision = 29476;
   stripPrefix = 0;
   sha512.run = "e51938d3e31bb75abf7b8af27a7cfc47efde49b1e569c2d9b5d170bd4e7a29479571717d9932de22907e2f23093e977959112d4c1c42687fbaecddd6fe1b990f";
   sha512.doc = "ea443054c6c89bac4ead8218e12a4a8020fbcea1204eb12f237f0a58f4f303797b27bb45585b78167d0a43a6758d257da0b140deb563de7cdc9497b8df56f329";
@@ -29526,6 +33088,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "uothesis" = {
+  revision = 25355;
   stripPrefix = 0;
   sha512.run = "8549715b39426264ae94d5618f13837bf20e48a350cfccc5642ff5e246ad84e04050e2def0780e8f3da69647d86b6795a009215da1277f43ab9a8a3b5acb798a";
   sha512.doc = "16af5c258ae738401885a1451675ace657e169deb37670336ab87ac39d30128c98bff91b5f9f6f2de9961d981b2719f94472692c5456913bada6e7ec6bbb60c6";
@@ -29534,6 +33097,7 @@ tl: { # no indentation
   version = "2.5.6";
 };
 "uowthesis" = {
+  revision = 19700;
   stripPrefix = 0;
   sha512.run = "060684c777f377fcc98b371123cfcd9717a113deb0f7fbd99cdf6cec65e66b77fc44d50a3475c8b1e8071eec80c2e6b1c20437a4432d6d5fba208fe3f06fe127";
   sha512.doc = "00386265fd93cc89146fba04eff87b55fc250e3429ca5d769f006ee1e8c581fdd96702830a90ca4eeedd35e0d90305b5ce19dea6f16ef5600479d1fc1ab2e35b";
@@ -29541,6 +33105,7 @@ tl: { # no indentation
   version = "1.0a";
 };
 "uowthesistitlepage" = {
+  revision = 45022;
   stripPrefix = 0;
   sha512.run = "28f5d3f8bba3c0f3ee1cd7ada8bfdeb815ec607565e7385fe8483d66aef9b9e3c39cbb9796f84c58e8a6b4772989c2aed3c5407d64aa740eed2cedfd26d60e8a";
   sha512.doc = "beda6c309230f20abe8ec32e41258a42806534bb181e4cd070c7c9362a677280a0133b4ce83fc7475aa785a778480134125a162ae7d96d791eeaa1a9af621dd2";
@@ -29548,17 +33113,20 @@ tl: { # no indentation
   version = "3.0.1";
 };
 "upca" = {
+  revision = 22511;
   stripPrefix = 0;
   sha512.run = "3423a3a7d42273bfb28642d250d5000fd55d5cfe2dfb5ba0c2f875ced6c6df344866a5512a624dedb12d6bb9357f02a831297f4aba463dbd5e69e5e8dd9941dd";
   sha512.doc = "f19dd751bffb9ee92ee80f74f692ac410781e87817ee841c01f37bac87fc770b9fc97d488ffbe97490206899653d329034d82cf649de0ee52cfa4643f956d7de";
   hasRunfiles = true;
 };
 "updmap-map" = {
+  revision = 53971;
   stripPrefix = 0;
   sha512.run = "087753526998c68fa94dc86df6beebd6293dab9bf87f0969bb80f362b6d33215bd4f3b9baae5c8a22adbe0e3ecd5d1b8e4d0f71eab6cf6c1a932e7acbc94efbb";
   hasRunfiles = true;
 };
 "uplatex" = {
+  revision = 53786;
   deps."uptex" = tl."uptex";
   deps."babel" = tl."babel";
   deps."cm" = tl."cm";
@@ -29578,6 +33146,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "upmethodology" = {
+  revision = 52200;
   stripPrefix = 0;
   sha512.run = "ceb42b6b890c434de27445c564999e5a5c8ecd962061658f27cfbc59aaf405fd33b2a44474fb52b927e9e8721315dd87f907a084647433b251bd17a5ea79148e";
   sha512.doc = "a75984bf9de36b382e29d818736963df4a19f341240f227dacb1496f034484cb3340600e3d77ab82435781ce2d3fdf1703d8322a7a9c4607e98fa41790be3f60";
@@ -29585,6 +33154,7 @@ tl: { # no indentation
   version = "20190928";
 };
 "uppunctlm" = {
+  revision = 42334;
   stripPrefix = 0;
   sha512.run = "522b68bd32887ba14ecd927c49c5fd57a84a1c0f9b8a0bfad65a4d377b68a7bd449754dd411a72fd83e5736e32e2c47cb1f54155f72395c465e4e09ad1d09dea";
   sha512.doc = "d0f67dba683a40a6392121cd53b58df6d7ec6ffd8bf52df60f53537fc1b389de178dfceb1e772dfc9e292cc543448dac3a85cc6b712283b384ccfec4655c988e";
@@ -29592,6 +33162,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "upquote" = {
+  revision = 26059;
   stripPrefix = 0;
   sha512.run = "06360c313124487f291a8daf7399a3139cec8c0a05be12724cedb3d60393ecb07aa31e34f9b74a83048f5752a8d826505f91f2c85d34348264975b48a1813fab";
   sha512.doc = "4b92923e8af2dcd65e82269994c766b88c6f78f6e7b8d10b9f44889832150711acb0cbaf467d595d6745863f385569f7eeccb4ce69df8361e56910969532e314";
@@ -29600,6 +33171,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "uptex" = {
+  revision = 52851;
   deps."uptex-base" = tl."uptex-base";
   deps."uptex-fonts" = tl."uptex-fonts";
   deps."cm" = tl."cm";
@@ -29613,6 +33185,7 @@ tl: { # no indentation
   version = "1.20";
 };
 "uptex-base" = {
+  revision = 52151;
   stripPrefix = 0;
   sha512.run = "532360808157041a67221f12f78fea1197ebf083f3f90896b539fd7ae9501bdf696edadc6c61edfc1e5d1079a480ec7776a814dd8adb08fae194728c7f61e978";
   sha512.doc = "dc1470c66f000bf80851dd317b7eb26dc12c567bef647e2fd91bbe3f4bc7c29695b7c327781a23e79ea86a8bcac2db8e328bcfea2031caafb9f63d85209bae2b";
@@ -29620,12 +33193,14 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "uptex-fonts" = {
+  revision = 49985;
   stripPrefix = 0;
   sha512.run = "41fbb7b4a3e193744e36cdd1ab23145709b2ef94de30a18dda322f1e0539106f62be95b1a763750e72c81a7fe42053326c56efe0486254ba486c731b65bf47e2";
   sha512.doc = "9b8004ecb67cea126f0299d3eca749d5f011b0b3c50d23fba9a3adb4b9e5ab6d5e0a24494b9420e3a315639eecbe86a9c740b0772a694f2b36ee6f8b7e316c3a";
   hasRunfiles = true;
 };
 "upzhkinsoku" = {
+  revision = 47354;
   stripPrefix = 0;
   sha512.run = "03dcf2b73ca644f8e9e2589082d49a4d502adb51944fcd9ee5cf737ae782611b35ef2eda4242b7eec2b8033014ddbbbea3abb52b1bfe90be9cc1634345223d53";
   sha512.doc = "d4c038d864b40603281f3186e21110ec96530e84a9ff88be4241cad165d09cd091b28bd768ca8ca0a28575dd850bb68ff88ab553cf9caaee6edd8d311c6fc9e2";
@@ -29633,6 +33208,7 @@ tl: { # no indentation
   version = "0.5";
 };
 "urcls" = {
+  revision = 49903;
   stripPrefix = 0;
   sha512.run = "5b8c80a756e45e5b847c3b970005b866f6c498eff7646155c73a9b86585dffd73e8dc66d91583dd691c910caccab60ee22a1e9dbe3aa450290fb17f019477172";
   sha512.doc = "40b8e4ea2abcc82acb843c692d90e964932f1ad7d0e818d54eeec77340f49686aafcf2fcf3f8f4d942f7cd967754ab24ee2075c6906862266f5af56251063fee";
@@ -29640,6 +33216,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "uri" = {
+  revision = 48602;
   stripPrefix = 0;
   sha512.run = "402974f30df5a00118d4bd2e978f342cdcdb22119059dbd0c1b2111fd1ce94ab8a29ceff88672c80d18a669d5440bd48dfcd23fa07844f492e5f7e0eda1671a6";
   sha512.doc = "b2cc8cbcbc81f0c3db349952546e60c152044aae264d4b30aadb6b90b7aa5b304c89203b6219bb5161807bf1e4649235d2f98a60339a0cb93a588852a1755e00";
@@ -29648,6 +33225,7 @@ tl: { # no indentation
   version = "2.0b";
 };
 "url" = {
+  revision = 32528;
   stripPrefix = 0;
   sha512.run = "164fb94cb128e997031bfdf8c602892d78813694f39f4b95bfead8a5b7e3cd9a0d9596dbe697e012bdf84b89c2551c2f2f1c7f99d4543e357edfaf2076b9cfba";
   sha512.doc = "65596e0ce813233491959ef161be8570450c6c71c787b3253d0bce503558e63902137a6d337ad1e7cd2499feacbba4a93b7b75559750d05d7898ff2527f1240c";
@@ -29655,6 +33233,7 @@ tl: { # no indentation
   version = "3.4";
 };
 "urlbst" = {
+  revision = 51530;
   sha512.run = "31ab9071a50258b405e2850c6fceb4d30b3f71b731c06d4fbf6b5de25d7d23509a374e6c89dd58dab869e6aa987a234c21a0c6c6a8f2780826c5acc46f784eaa";
   sha512.doc = "0dd2c6cfda184d77866503bd94e79b7c99d20f4b9627e01946887aee80318adb26528f352fcb0db764e37d7b2292a78f0d80bcb51ca7cd95593a879063154315";
   sha512.source = "96d336764d7892af97b7fbbed48a121b8e058efb56364398f50d24bd598ee387b0544712bf95886641077c22d3542ba2facfa125a89e8072c0a65737ac18cd97";
@@ -29662,6 +33241,7 @@ tl: { # no indentation
   version = "0.8";
 };
 "urwchancal" = {
+  revision = 21701;
   stripPrefix = 0;
   sha512.run = "beb82950bda88e7170c7ad753e93859f96190f30e89fbfbe1cdbe37930b07740f70da40124639c6ab14be93fe79c5e87b35296b68c702888d3e9e25100e86a9c";
   sha512.doc = "8f218f76d45a2f3ea9be173ba1c6efcb8a7cff26a43149b7e0ef4fc535a4638cffe69358d8ccac44a3306044720958ea9189996e88a38d560d264f5fba6863ba";
@@ -29669,6 +33249,7 @@ tl: { # no indentation
   version = "1";
 };
 "usebib" = {
+  revision = 25969;
   stripPrefix = 0;
   sha512.run = "94e0ded0c7e7ac10f2d8ff9324afcfdd2dad8247cf31cd6b404d9c2b12e223e6f435ec9d3dfad0ab510b943050444f5206788540a948e44f44c5d011596cd34d";
   sha512.doc = "3b489185729ac7d93ebbfd632b77eeb865b39043b2b68d920a6ef561ac55701a44d362b84c1fb83a2f59770442a655b779c6e49287c9d2859c44140e61c543e6";
@@ -29677,6 +33258,7 @@ tl: { # no indentation
   version = "1.0a";
 };
 "ushort" = {
+  revision = 32261;
   stripPrefix = 0;
   sha512.run = "2ece6efb162a13c37413e4fe2eed33ab7982d681fcd9435ce53248dc4c573cd90ac51293424385aac29b84159b34fb3f7fde2bc8d39eacc71f0ecc91c8db7af8";
   sha512.doc = "d262bb270e41cb7d9378d42ec075a81158d401b737acc7788722ea7e99d896de1eb98c04a65e733d6e83f6229a9703f72bfd0a11e36e52d4799e82e19c102d5b";
@@ -29685,6 +33267,7 @@ tl: { # no indentation
   version = "2.2";
 };
 "uspace" = {
+  revision = 42456;
   stripPrefix = 0;
   sha512.run = "57a271421c15eefd41517881e951c8a55096e6bc7b769beba123813e19682407b24dcde898bc8df75700f33316a5281fedf5c24a3ffd7a97eea2bcf5f658e7e9";
   sha512.doc = "c4b3c401cdedde7e67a2b4fca44f53c67c578fec287e22f0c1b67252b6fa4c0ed4d3a8ab1328162e7bea015536f1a1e4539fb104c8c889bb4e1549f7bf748e13";
@@ -29692,6 +33275,7 @@ tl: { # no indentation
   version = "0.04";
 };
 "uspatent" = {
+  revision = 27744;
   stripPrefix = 0;
   sha512.run = "fbcce7a06cc018dfba47aa7e9d572003136d5b179e957f10e2bb42b2635ef4cdd40bbef19e8f827963d048eadb23a1aeedcebc87cf128f5b28cb1ab281408b90";
   sha512.doc = "e0eafb5fadeab38da049d0d5cbadc8fa3dc3c335afe4fd5289fe30de38f0898cdd9dee091b703f6a853eba56b32b161abfe56b3185c71512c9374585e6d9784d";
@@ -29699,6 +33283,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "ut-thesis" = {
+  revision = 38269;
   stripPrefix = 0;
   sha512.run = "06a8933b03e02bd092a09843686d518ab58a47a4821bcafbe9568eebbe6d4e72e7815752016200ba5d68ab193408847c9f0a784bae9a65af4d1ad06b501c03f1";
   sha512.doc = "13dcfbd7dfe45a4d1fa0e2ad8a06bda30cf5a76c993e6a6614d4fcf18964f5d44072c9c75acb6739b8df977590fd2c55aa193a2c88665e38a4e54e4411ca85b6";
@@ -29706,6 +33291,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "utexasthesis" = {
+  revision = 48648;
   stripPrefix = 0;
   sha512.run = "829826bbc06bbd9b8ffe585705856bbe4bc99973bad7bedd489ff23fad9cc19c4f33beb88756644d76945126983586fdf78eabb305e353cb8bde8341a3d20fc4";
   sha512.doc = "65e3100a6acd2a02df2e95834e5e99d718cd0b73e20ef6da839cbc9831918f63a2f5b38ad888a5068b1fd87ad71ac480754d5e6b459465cbb6238d4a3b3c09b1";
@@ -29713,24 +33299,28 @@ tl: { # no indentation
   version = "1.0";
 };
 "utf8mex" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "0cd4c549c7b00939dec5055705658f76f6ebbe5de70e082652b761673ba5a249924fb862a319512a9a124b9cdaae8906c74439bba97be8825d4d1ffc70642c8f";
   sha512.doc = "cd438089d90faa0e9144d23adb78ce91d85b80ce084cb92511cc23882c675cb654cb704aebeb623bb29c70b764c8a0ab19915607664895c457c583f376c1088e";
   hasRunfiles = true;
 };
 "utopia" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "5f58ac6dacaddf4110b2ac2f77fc0da90d5cfdff26d888b26af06cd6dd8f483c7a6a12e0aab3f50d4188aab9ab649d993ad89e74898d54c14b3de4948451279b";
   sha512.doc = "ba60eaf55cc08378560048ebc6f735e743449a18d2822e6027a86e595a9634461713ceb37d15b9f0c8239f1935f910bbdbd9a0d0d6fa1683174739f91c16a504";
   hasRunfiles = true;
 };
 "uwmslide" = {
+  revision = 27354;
   stripPrefix = 0;
   sha512.run = "a4ee1019a36a66abb6614dcf6ffdd9706b705bd18a19d34fcedba441c355ce3a7573ea0ee53686b325c6d6b485fef99dd1254118d1cdd1603e1597b0fa17b751";
   sha512.doc = "7560c214913e9dc61d01ba8528e1bc147a4f261995294c8c938ffd853a9b6a174c1d1d47e49fa20351ea45d61dca03ef7f0ff085e8725820c24d2895a0d17530";
   hasRunfiles = true;
 };
 "uwthesis" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "07bb8a3ab65110aef8de3b606ca53060dc8f29c76de55a5a84e87d43fe0e09dd16b48ec09b9a451f2285c06450ad059c4c3f9b8d48a21572a1bffbe2ee512a6c";
   sha512.doc = "278a7ce5f0bab547de0c8dd4a26dc270500baf8abfca1ff1a8e76283fffff4a73835fbb1daea2f6864cb9dca3e0fff297887ab10305c6a87ea1d7384d964a9d5";
@@ -29738,18 +33328,21 @@ tl: { # no indentation
   version = "6.13";
 };
 "vak" = {
+  revision = 23431;
   stripPrefix = 0;
   sha512.run = "b7606cf33b8e9d14f4ca4cced0620810eecc469faba959728d3b4d7f8d87023d600fb33f1739ce0e7d14d4a54936fbc682a54d8ad8c6b514a1f2baed2c79b2f1";
   sha512.doc = "1e6f148de79c2ecb5fcd03ff1509c3a509ee40795af0e7f7a95fdc64c403f2de7f9d9ca37716b6488cd496e2be0565749222ae95f8b97e5cf7e05b3877bb6d62";
   hasRunfiles = true;
 };
 "vancouver" = {
+  revision = 34470;
   stripPrefix = 0;
   sha512.run = "8fc852e2137af0b1e0664ecdaf115a6c4c631faf840b5564b9dca2f8c457f8fe33bd7edd92ff4590c05ab13c23a9b1771b7e688ee6f6d700a9feb01f9a921170";
   sha512.doc = "50ec342e62a14f417b8a0d4085ca46aa701a9e2ae5630daa2159ddd6532a0c3d5769a0cd351c932bc54395f159d560a259e3996f4f157e42d0dfa41aeca6dc80";
   hasRunfiles = true;
 };
 "variablelm" = {
+  revision = 46611;
   stripPrefix = 0;
   sha512.run = "e58a1c5a77861ed3a84f2fb372d6c3560129b656257e23a935fa9d7ce18c83b59f9863e29ff35c45c6ab800cd09aa2fe7bcb1fd01edbbe2e75112809c17faa9e";
   sha512.doc = "58611f636d5aea5ee2935c75206e0d051345d7138d04668ec7875b3ee0493e39bba54b1941aaedf33abfeb7636602fa6ac7fe7e750837b425678eae97b7495fa";
@@ -29757,6 +33350,7 @@ tl: { # no indentation
   version = "1.1.2";
 };
 "variations" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "71252475aec013adf9bf41460753a648420ea70fb093cadc667500a6884adcf0c6661a2d81053a733844a3f8595ccffb5ac5f7680689575d8485c47a1cc1e469";
   sha512.doc = "75d6d8afd13f6751bad23d0adc58355d75e355554dd95971dc16ac148150990e1362ec211a3f3e6fd832ce231dbd08e50ed9d44856c763e47ddb5374b1b182ff";
@@ -29764,6 +33358,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "varindex" = {
+  revision = 32262;
   stripPrefix = 0;
   sha512.run = "fb7216b4cb06126970148788859d9c12a0626d25321cc591b2db5d7018ab2a76f5c6505d9cd47da6a3babc765dcedb6653a3ead2eea67f688cd883fe81d9f42a";
   sha512.doc = "30b9f50b7357f12774f78f0792ee0321b5ba84d2c3dff96f5f98d87cf0bb811a2fee74b2bc691fef07a80eb65e13e42b657b74efb0ee334b4f04da7bfdd0b75e";
@@ -29772,12 +33367,14 @@ tl: { # no indentation
   version = "2.3";
 };
 "varisize" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "c1a900aa29601e9bcc5d1047ea5bca0bd3c079d05e8c42c8e3f85521cd8a1989425650d0e84ab0acf2a38e468bc4823e149cf1e799da8eea1d6af4554cbc0c94";
   sha512.doc = "f575e4faff4a80f72108ef5b97abb0bda08573669bb8b28592fa607538c632d3b59626282a0ff8d7805e6b66121b2c231618901a9dd71f0242e1a0875a3e2068";
   hasRunfiles = true;
 };
 "varsfromjobname" = {
+  revision = 44154;
   stripPrefix = 0;
   sha512.run = "0d5fb07c93fdd08570ef1dfa120870f4619b124cde769f48b4107c41827dd65c023840e1344aa283d0b21bfb0af2346135577510119579c531731f132bbfee1a";
   sha512.doc = "57e3111b8426ace2a838a128dae49a6ffadc6892e4b85cfc83eae3b9422dc4188e505fcb2a281ff38cbeb18e385ba1da398111c5f00683568999004ffd5eaea7";
@@ -29785,6 +33382,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "varwidth" = {
+  revision = 24104;
   stripPrefix = 0;
   sha512.run = "d44fcd1912f1751ab18f5d7d00ed47f42bed3ad2863b35781a83df9c881943c3e1916d003361b6e64640326541f43a37abdb0a3cdfe07e4d0cf7980dfc5fe1bb";
   sha512.doc = "ba0c0d562a7c9db36637bb18fa6f0d01661b229c66b8f0d2bd7cbafe286b81485e84bcccd06c4d47561db8895cf8933ff11d08a8de0b01405d6c7dde443e86e6";
@@ -29792,6 +33390,7 @@ tl: { # no indentation
   version = "0.92";
 };
 "vaucanson-g" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "e4bf83ea01ff4162f95dd595b93635ed988ae081d0c65ada59ae64c6c64c730dbb92ae049d22dcc20d6204c5a7cbca5cd643be6c572e51a3aa17df88c6f1f700";
   sha512.doc = "520aabba38562e208b464fc0d4e9f9a138c238abb94b43e89864e4ac21acfd35e5d6e224e855ab4baf9feb1df736b7e937508f6245e5f873c5c8f8a75947e014";
@@ -29799,6 +33398,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "vdmlisting" = {
+  revision = 29944;
   stripPrefix = 0;
   sha512.run = "58cab8cd7d23326b39e76a91db1bdb0b0cc9e1e6bf457d151af39a4c94886f623b8178de835e673118d5b797510d6f2fe5f97f6c0c8b5bcf679b9158ded3c941";
   sha512.doc = "a71b798d364f429c4894db38863301c1601ba7f2bbb2cf8e4394b48c5b7e3541cefcf915ca52860c0c55744ac2aa8fad82ea66142ed2fbfa81c05da211f04f74";
@@ -29806,6 +33406,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "velthuis" = {
+  revision = 52851;
   deps."xetex-devanagari" = tl."xetex-devanagari";
   sha512.run = "92ed388e406324c0189f613197869d4ccdbef459fba5d1408e7ed9068777ad28fe7193c340d1786e21ec8178bdb275603cda2d86d33d3a6318788580a015a40c";
   sha512.doc = "9b928842995afa63db5aba51e6605d3fb036687e83e609422954df4c4848563e7a6b62e669ababd1d2804077e8add424bfc88d965ad5ce1f904f1820cf750515";
@@ -29813,12 +33414,14 @@ tl: { # no indentation
   version = "2.17.1";
 };
 "venn" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "617ba85e996943d62a33acb2535e23700fffc63331741065faee558bebde608232a31bd73aa79ad707b107a9adda8b454f9b81dee184a64d94f32c44d76180c0";
   sha512.doc = "0b1940cdc2bcbb7e2f103497622c4d5971abf4f6f4885f60b35a360cd655c34cd789ecbfbef9d35c61611ef22198200b11008f4f59588a5cd111870b77ba19d5";
   hasRunfiles = true;
 };
 "venndiagram" = {
+  revision = 47952;
   stripPrefix = 0;
   sha512.run = "cf57b84165067234f5be58b2300eebb77339c33b883895e47cffdbc7c4acb6d013db7ace1eb47ef491e21526cea8b3ab993fac836498bfa16a5cea700caedd5b";
   sha512.doc = "966f7eea0d4c40004b9710c53fdd6838b757a2c8ed47b4098ca2d47834ba52575ac7c062497f1a6d26dadfcf0d7f95f2213d34bc638262520aade0e78beac827";
@@ -29827,6 +33430,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "venturisadf" = {
+  revision = 19444;
   stripPrefix = 0;
   sha512.run = "0f6b7369c1d589f9725897182f854f008b73dbda47078285635e87d480011bea0610da81512416b0963aa55487d646cd2a957002552ef2b8609d4536c0dd96bf";
   sha512.doc = "b46066744794a8ae1443b18bf1f6ce3d586c8ee8fa5c3273db608751979089b2407a6feab421a3c3c738a682e83e2f44bc5ac86eef1d51fa914ed0f0df985bcb";
@@ -29835,6 +33439,7 @@ tl: { # no indentation
   version = "1.005";
 };
 "verbasef" = {
+  revision = 21922;
   stripPrefix = 0;
   sha512.run = "483a75883ea602f674abec796199c5206420079c6ad5e4c3ac22bd836e7ce02f686cc8b9b749f806fe8e44bce8bd35fc6b17865fc076c72f2223143ee0e8a123";
   sha512.doc = "c88b1275eb4e3b87172e6cd157ad868b7b230d96d00ca0dc550757fdb89648a40b1090b771dcd0776b6f86a9194c553f265d990220348e5bbf9c7aa792f42914";
@@ -29842,6 +33447,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "verbatimbox" = {
+  revision = 33197;
   stripPrefix = 0;
   sha512.run = "dc686ec1e86c877a6f1467f4935f2337aedfaec32bdf867985ef05405569572c72d3593e75580c72a7bb3ee698798813094eabf738b3157194517839fbe47de5";
   sha512.doc = "9f8fa05294b68fb0994f01e36b468d341b76aa97bde983c7eab781c92c8bfd898033235a328a1fa858dee457f515d6640f780b330600418f2a7eb0fb45f0ef3f";
@@ -29849,6 +33455,7 @@ tl: { # no indentation
   version = "3.13";
 };
 "verbatimcopy" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "e415f9d74f35e28c73bec5442124b7c426aff8de013aa8a2af9c234ae3ea20c131d5ad21803c92eaaf6d0aef6584b7f9b83218f9665a959ec0d6ba3ef606b081";
   sha512.doc = "0281da688f11d2a2fefc053d8f7866878b337ee85114c551176d6c329009f8c1a8479ccb29f202106f745ba215728e7f08509898182521bcac433699e22843a0";
@@ -29856,6 +33463,7 @@ tl: { # no indentation
   version = "0.06";
 };
 "verbdef" = {
+  revision = 17177;
   stripPrefix = 0;
   sha512.run = "f6bcac8b35bfe707d4e39cf625987ddee6197977894e9f8ded9e3a715e0968d2d1fab07c57edf1d38150ae0c9cfc937230c9fccec431e73ae235a4cd44ed8609";
   sha512.doc = "e64d4bf3018de72a131e7688ebbfcbaa59914c0542d2c632a91097a77f404307f9bdfc613638badb3ccca3854313f17a7a5bfb6426f467bcc98ed235af6ba49c";
@@ -29863,6 +33471,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "verbments" = {
+  revision = 23670;
   stripPrefix = 0;
   sha512.run = "7b5780efe1b6e4cc62909df5d5cd4a03be3dc83717f20738a83f37f539103ad12e382c0a3891b8e81b44086f92b7277b17e88c4e7d81123c04941c38114f23c8";
   sha512.doc = "744471659373efbe040bd0698a9b33a0942d5df33312ad3cdd0f02c0e16fd2c67ea44c4ab13ce83ddca6a5e8ca68c8c8bc40c1a64470a9716511e2275683b004";
@@ -29870,6 +33479,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "verifica" = {
+  revision = 53722;
   stripPrefix = 0;
   sha512.run = "7fbb232e4d732df813520c0a4085540bd5b16ca5cb4a68ad3fdffec8de273d821bbcc6304cb74fd06d30ea8f30e50475074c183ca96c9d46c32e818249f7cc45";
   sha512.doc = "822e444c7657427dde2b3a51b3f2f42f6088e66933e51d1533782ae76f2e8de31d2cf1c5e7824e3d90600a971f253a7eb84e0dd0c874446cc0bc0b914e0a691f";
@@ -29878,6 +33488,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "verse" = {
+  revision = 34017;
   stripPrefix = 0;
   sha512.run = "3f9878dea106ec87f2b64960c5824fda6eb9f700b753a530cec7e1b8519dc9a817cf7ea74c13eb806497740501122790fb29f6e3cc383a8a89ad10e756b7a00a";
   sha512.doc = "6f255167db9ebb84cf86a14e6999410efb22d087d97b82837c3ebc5bf69f0990e77ae0325618ba3ea02c116741422a531f646929eab2b5810b9f3978be6651f2";
@@ -29886,6 +33497,7 @@ tl: { # no indentation
   version = "2.4b";
 };
 "version" = {
+  revision = 21920;
   stripPrefix = 0;
   sha512.run = "9b57997e63fab25d916630bb086b7d4372e094e64175caa761c20c3c2d426a58fdc42ef661bbc1ec47f2a8d9c617b7e4dc405499c01b84eb53ca0d10f6c9108d";
   sha512.doc = "9bada1489523eccc809d4b9654411addf31f2d63efc1f1f9d68b81e2bb3d9365e2709f55a77c53c3d2231b8da89114bd5a4217c8d18553234a980d379b1a0084";
@@ -29893,6 +33505,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "versions" = {
+  revision = 21921;
   stripPrefix = 0;
   sha512.run = "4a6474f6a014789daae358c5b73a85bcb0894eb67d09a530f3bdd8e4571552d0a3e1983b5ba40d33122caad8bd457f255b7f1bb34e9797c5137ccf461707dbbc";
   sha512.doc = "ffebda27a9000a0c8bd8462b750e34331968aa1abd5c7039e198950eac6dc02796da6a02a258bcfcd84ca12b3d5f6d0ab11587bb5d6fa9b3121297aec2179ccb";
@@ -29900,6 +33513,7 @@ tl: { # no indentation
   version = "0.55";
 };
 "versonotes" = {
+  revision = 51568;
   stripPrefix = 0;
   sha512.run = "3b1a33af069abaf1bca5d70c64f3f9034efd10c2104814c3db5360377cf67dde56794f950b1a96a5fd44c0fa3460922887ce97fa1a3eea31b54ce1f16c88977b";
   sha512.doc = "1f27cadfa8160bc5ebfe6cf93aa617b7a1a751d98d7e7dac052cfc50a450d57967104fcab00d89feb08d0e0cc62551738eee5e17e8f65889e9f32d4e6d2d220e";
@@ -29908,6 +33522,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "vertbars" = {
+  revision = 49429;
   stripPrefix = 0;
   sha512.run = "3c3c905c6bcb013a36bc2eede14d84315f49075ab5f63376e9a440e4e7fb281ee5086b5bf1953782641284027dd8e7058e0accdafdc9295a19ebfc0088d8f7e1";
   sha512.doc = "de6df3133c801e941cbb00c552cb2cdb1d556f099c402a0a66f460d5c7c1c6e28ec7d983563f20a609a5b5266420dcf8c204d1b6bc685031cc41fe2770a5ea13";
@@ -29915,6 +33530,7 @@ tl: { # no indentation
   version = "1.0c";
 };
 "vgrid" = {
+  revision = 32457;
   stripPrefix = 0;
   sha512.run = "ee46d8ae234af6f0b3bc8689cceab7d5ce8e7229b132c396a000cca15cde0ee422f91b2d4fc485c743e3a896bbab5ec90b24ea5d398bf63342751bf75143330a";
   sha512.doc = "92e5498cea29d5fc1b373619e97c6692fef3f63002757a954649c0c4f9ef7b6594d61cce017bee709f0f1898777f962c25053b64da8079c8c9c9893f821a9aa6";
@@ -29923,6 +33539,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "vhistory" = {
+  revision = 30080;
   stripPrefix = 0;
   sha512.run = "f1747b1c112c69cdc506234c571335647b365eb92a4054c70cb08752dc1da92ac4e84d533083cdee76f6398f5f1bf04b20b94cf38ddf13947d4086c5599529fc";
   sha512.doc = "60a8100cc10df177b04eba8751208c515eee9601806324184f737491707e1e4d453a92b0d12a16d6cc1af319a55c79afc8922d1378f8714990c97b5779540763";
@@ -29930,27 +33547,32 @@ tl: { # no indentation
   version = "1.6.1";
 };
 "visualfaq" = {
+  revision = 38647;
   stripPrefix = 0;
   sha512.run = "6b88343feaf39cd314e9453452da245054d3192f02ba0b2eb6e55a9bbca434e9b74cb16ad0902a6f5352d9ef945a4176e2e1998a7f0bd1cd75d2a3da7f4a203a";
   sha512.doc = "eea0f022741d52ebb3613e977948c0428ddbe5b7d41faa659e888b48b7bb4e655a0e693d1dfd92d40a52a67e6df9ad386ac64d2ffee7c2732feb2077d4b24f77";
 };
 "visualpstricks" = {
+  revision = 39799;
   stripPrefix = 0;
   sha512.run = "fa501a3ed6506fe52d3d31515f453db5378c7d01415ed05c0870ea15051d34dc5a564ab8ef2ef4608f616b657ecf29f5b18a8920bdf1606f78928fc505cfb0d1";
   sha512.doc = "3d2dfea937b2b99e148fb0220067b9a777126854d82cd1e591f84a1d13e1090755660509814e4690dad20d2568286ce05653d3b5c7c6653df61d27229c9cd5e2";
   version = "2.3";
 };
 "visualtikz" = {
+  revision = 47888;
   stripPrefix = 0;
   sha512.run = "fc5cb3e2d30bca419304b5f76bb75f9da0e22b6624c7ca658492e2758adf0dfcc24552648c983b0afd390bf7814ca30fd7d2a8b3037b6ea3fd95b2f608b36b19";
   sha512.doc = "556f4b852058c46a7d2a34db4898bd82429835ed4c5fc1eaf1c8bac9deba407c8a11fdd3eab3753b0f53fd0ba43a316c3b292cebe40c086862c6d94f8be0cc85";
   version = "0.65";
 };
 "vlna" = {
+  revision = 52851;
   sha512.run = "587e208e48a43698e99e388ee957e2ec201c0b1b0a0d077052cf11ef8b1e6b132bf9330db5b9eb48083b86aa362f0ab654d80d27ebd2690b5ba1ed452b8084fb";
   sha512.doc = "ca7f3a54872bfaa4b11efeb94a3dbdd2f655b869ae0b1f9a3f5232c40500f4f5550c495007cd081e2069115da1d20ad1759923a7375147d4ca09c3a105dff779";
 };
 "vmargin" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "dc0cdd4696a44bb6bd189dcf73c69f1b2c8790b9936b1c6f35013d9342a97d36a4bfd8eab82f3e2e97f1cc952459cd9a1909915348b25f01df446c5ffc452e71";
   sha512.doc = "ca8ebc274efacbe192b73c9551294bfae60b0cf7ebaac8425cf1b88e10ecda7f3230c336883afc438349f1ea47d66d369b52bb415c482803fb742b16cb483348";
@@ -29959,6 +33581,7 @@ tl: { # no indentation
   version = "2.5";
 };
 "vntex" = {
+  revision = 30579;
   stripPrefix = 0;
   sha512.run = "f39c04998d0685125d494c1a314f4cddb9e2924af4eb4bd8488be237125d818199640041a9c23d6b8839b9da1861e0b621f71488b316b65903c5f3a0366adec0";
   sha512.doc = "506c719a29a64611cc7ba228f1e13da9abface3168aa0122ec64dffa423a7c38b6f3a4fed43b787eb60b82bb8fec71a96e4432a9b0c05702a804a31997ccd49c";
@@ -29967,6 +33590,7 @@ tl: { # no indentation
   version = "3.2";
 };
 "vocaltract" = {
+  revision = 25629;
   stripPrefix = 0;
   sha512.run = "7daa3923a6b9d84a1fae2c9bd63404c2fb4dfe3866f897895deb9ab85f33649427b38ce5e34552bbbbd8704da1fac55822a747747a0c522728e605638831df8c";
   sha512.doc = "36aa01a5be9da9a23e3a4de63fb14a39beda4a42cd2615f75f942abff677e71f2a4f640773d27556ef246a99004c3a1aa68caac9435957152cfda96707d79787";
@@ -29974,6 +33598,7 @@ tl: { # no indentation
   version = "1";
 };
 "volumes" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "e54add2c60c5446329fe6f944c99132e0f99e89dd8fc9ff459e0ee106a5241e4df4d864b43269fc14a08ddda92f4e41607eaa20ba50d4a566be7468d0dd66b2c";
   sha512.doc = "4471a360d04cc1ed9c90ecb53bfc422fdae30571a25fc4811813f30ed5308f4d20309a1fdba808d1eb20e84b97318708f57d08722344afd755aa06588acbd024";
@@ -29982,18 +33607,21 @@ tl: { # no indentation
   version = "1.0";
 };
 "voss-mathcol" = {
+  revision = 32954;
   stripPrefix = 0;
   sha512.run = "cec0ea20b409192c618278001045352ca6c4c11c8eda59633a9bb65ebb7a89c8c1db4046936a7f0096f52efca8a251501fccf7890288ed830f13e0b24b1bb017";
   sha512.doc = "5d91b23d9eb45998282731620097f214b274ee744972b3d7fbeda1be2268799572f36b5f4c8b707f48e8ec2d825438bcdcee7f1376531f366af8949a862ff379";
   version = "0.1";
 };
 "vpe" = {
+  revision = 26039;
   sha512.run = "5fd5180edb830cc2f309652ad6a86e3ce1900dd0b150b72b3115f2e0f51aed4023b3f7af8c86befd1b1317829907b35ce583b50fe5cd1fa50f15863046e806d5";
   sha512.doc = "3c60c736fa03de82bfa5bb86f40420e7f7eb59f6943a94790361bd1d64076ec97843404d1cc508074a903f83392892c6dddd1dc912162928b286e65c24a46037";
   hasRunfiles = true;
   version = "0.2";
 };
 "vruler" = {
+  revision = 21598;
   stripPrefix = 0;
   sha512.run = "39582bec5217d65179b4293a18697cae20b35a0ec5416497691d16dbb919d78d4463ae15f2f05d308f45c65481f611a3f699cce9f5a3c311b84bde08fdd5f234";
   sha512.doc = "dad09087e028977501fe143ae050c57938500b8aa98bddc1afefb298444d17c37cdc5b9db2e9d01df5e9f6a47679e0659b21a2844d268f8b324a24bbf22d9492";
@@ -30001,6 +33629,7 @@ tl: { # no indentation
   version = "2.3";
 };
 "vtable" = {
+  revision = 51126;
   stripPrefix = 0;
   sha512.run = "ed8dee287daa32719b6650f43b963fa66cc55572526162978fc5245d3c253f027548ef5f1cbb38423c30e6cbe93b3418c373615ab92532be40d947c979f14b47";
   sha512.doc = "12626485ed74fdaee2aff65e97f59d14fad8f856bc2a84dda96010985b039d48850a07ef08525d74b155a699d44b1e173923e0f67716f47e392fa7558760076a";
@@ -30008,6 +33637,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "vwcol" = {
+  revision = 36254;
   stripPrefix = 0;
   sha512.run = "3963b738e1214f7a495daff6476102e6b25e86034c552b5f4e4314af55e4af073ed94a72e969dfd1fba16baa0264577234917f7dfd074dc85f9c56c5f2409903";
   sha512.doc = "a4d55b62caf4968d3e8329fd06f8857f646c5a867fbab23ea9bd7fb57c5b88b5f3a918642bc608eb1ccd936dc2e36edc50a5662667b8bb35cc59ba1739b2e7bd";
@@ -30016,12 +33646,14 @@ tl: { # no indentation
   version = "0.2";
 };
 "wadalab" = {
+  revision = 42428;
   stripPrefix = 0;
   sha512.run = "2d603ccfa92e8ef9abe91f5afaf490c7c8476061679f7a54c22879bb90b4d874f9e0e533e25aafb94fee2ff512f689ec96d25ed7ed42d0ae90c5e05985daadeb";
   sha512.doc = "f9c35379b396dfb563c66a05d200c405f03de96e22ec94de3a9f0c99ada057db21d31b43d59391bc0175479b5f150435f8e704fa40f6b58f2c116bbda3ec4603";
   hasRunfiles = true;
 };
 "wallcalendar" = {
+  revision = 45568;
   stripPrefix = 0;
   sha512.run = "43a682e78a3a80784180dfd84627e5584af9199bef965bb5551b203df7f939512d4307c450ed1ee55caab611154c1511fc339831da2907527c06ab738350e05a";
   sha512.doc = "e4816b91f08a26e99b03892b3d70f4d81110e476461dec505225335d46955f9f3790d883faf19afa4d7a31ff05afac4fea870e37299f45827c5a8155d4bbaf4c";
@@ -30029,6 +33661,7 @@ tl: { # no indentation
   version = "1.3.1";
 };
 "wallpaper" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "45647b8f8ebab9706437be2ce63f3506638fcc794839ff366210db4c35a3e16b2a39127fcacd0d97df356180770b6808e80e63ea1a50e69fc591cc0992e1787b";
   sha512.doc = "46b890e0ea7bbfb3c3421f79338f5140a105bb90cbe712477e2dc956f834682f6d137e39492437d8f206fefaf07086cab7f3cdd6c27dc7136df54c5ba850b4a3";
@@ -30036,6 +33669,7 @@ tl: { # no indentation
   version = "1.10";
 };
 "warning" = {
+  revision = 22028;
   stripPrefix = 0;
   sha512.run = "de3d9ef9a6dda4022fa8f04a0be509d3e9e583a539a3590cd30527f108ff739e0c1dbf8c5945e0a72902b14c2616e26d41a05f23957e9466c788fd228ac6b082";
   sha512.doc = "04c8ecdd39f2e0b3aec8cf6d9235acc7e10c8e182bbb2a7b30a46cf9ce7c08fb0fea21956356b3dad500a5a58c7a2b63e9471b2e8fe626b17492f721f527ce72";
@@ -30043,6 +33677,7 @@ tl: { # no indentation
   version = "0.01";
 };
 "warpcol" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "66fd9e243339e0841576e1a1a3de05f2e69a24a7e1dd31eb38d848d06c9183f691229d8e89878b661c7f6524bd9ebd1380fcd4c9b175feb8490cd4476ac81303";
   sha512.doc = "e88082379e90edf1517579009881204bcb70df888593d7535e2b1e5b673cf116a456967b0ca5ce372efef9dc0818b9d0dc252be79819f6b346ad8619d70551f3";
@@ -30051,6 +33686,7 @@ tl: { # no indentation
   version = "1.0c";
 };
 "was" = {
+  revision = 21439;
   stripPrefix = 0;
   sha512.run = "e3dec504da2dd28534872b4363695d797a874a0af5c2a77e6559a2765f6150cc50614b8905c90faa6fb9fd54d9634a9ddff148564904b1454f21d3fbd21918dd";
   sha512.doc = "24cc3a8931fe48134810ffe626789139a821585f0d359a177c56ae5a442482fb9d36f344061128ac185469b97c4c3f440ad02ebc7135366253cd9bbcf99895bc";
@@ -30058,6 +33694,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "wasy" = {
+  revision = 53533;
   stripPrefix = 0;
   sha512.run = "4c747ea3cfab820b803f624a32178a1d09cbb5a3c441ee423abc74caeef9217095491c0c490f11d3a6d6adf052b97492e081b2abedce6cc9c61410a8e878f5b8";
   sha512.doc = "4ee0dba83e3d1e00a1c58bc1c27d1b8e7e1677bfadf1d2653be216618d65fd168eab7aae26a5fe5ffae42c546b3438e2ad15f1a7bbfd58cd7b75cafa78a46205";
@@ -30065,6 +33702,7 @@ tl: { # no indentation
   version = "2.5";
 };
 "wasy-type1" = {
+  revision = 53534;
   stripPrefix = 0;
   deps."wasy" = tl."wasy";
   sha512.run = "d7131c025bd97bdaf62697feb698da97d175783e4b0502d3e85b60a663f46a0520268a6063956afaddc6308ddd21954992bf8d216049cb324133e3760ac20825";
@@ -30073,6 +33711,7 @@ tl: { # no indentation
   version = "001.002";
 };
 "wasysym" = {
+  revision = 53469;
   stripPrefix = 0;
   sha512.run = "9f32c1c76ea630989d6e3f3aeef0db154f6677d52177fcf5e28bd049a68bafeef6d3960267029a25ad4ea0ecb13a5a344accc20a7d8f64c20ec304130d1cdb4f";
   sha512.doc = "7c9f21ce5aa85e2bf766b50806cad76389603072a15d9fd599657eb7e3e58061befa60c8903c9be93b3bb8c6fea71b63c0fe90247654570ddbe289c8509b8f1b";
@@ -30081,23 +33720,27 @@ tl: { # no indentation
   version = "2.4";
 };
 "web" = {
+  revision = 50602;
   deps."kpathsea" = tl."kpathsea";
   sha512.run = "0d2d771e8452d67278adec061e1df8cfc06f3af729ea5ae7849acd5fe1b628167b18d86b1037484dbb6b20d5f703bba7ba9fb255788becc53ce22fd87f39ca7b";
   sha512.doc = "5647beef7b99a3a552b8f55d12ef669481e8ba3e01beefb014fb8e3cae6e8f419862131379b506ab8197e1717d563c34fa81d69db3c6db8107e6167447d87322";
   version = "4.5";
 };
 "webguide" = {
+  revision = 25813;
   stripPrefix = 0;
   sha512.run = "0c99e86fcba92d067ddd658893b58463390764b215515068e025563b66f445b23ae11482345bf305106afc1284ffaf32b23a28c8e0f81319002dd6332c8a3848";
   sha512.doc = "933ceaf7bb2400fff1bfc5ec26f60d750e0995680579fe487536ddcf8eca670e2b6d3fb6150b4ad659c6fa594b9db540523a878c74e9aba9be7710b5380e55af";
 };
 "webquiz" = {
+  revision = 50694;
   sha512.run = "725ff4b81203704a5cbf066c48d25a959031f89eed094da4d6a9b07ad059d977b2026b5e6a1e704999cf3b1b8eeaefcb5713f099f016f9cf17206ec1c1183dac";
   sha512.doc = "6b25d04e4cff7db299c4f13ceb55525fa3a4ff2d094960fbe8171b3822ce2917d6d868e62ed3a1d2083d78b2ddb839ec211b5ba00a6fd894c29ab2d3a6ca7cb8";
   hasRunfiles = true;
   version = "5.2";
 };
 "widetable" = {
+  revision = 53409;
   stripPrefix = 0;
   sha512.run = "bd6c85eb76b1fdd4b7e81ad24ad7d282b79e4234ec029e48ed63611260b00e8b1c584ac800c45643e466ff6aefbf953246b24c1bc6453098a76b71ba01624821";
   sha512.doc = "5f254468e606aa188030c95c79672a6fb0211c0b5c4df6c3fde98c43ce1fd89993d495eb750b58395175e2b6bbe3e9771895627a04bdb8839fd4d0a143c1ab69";
@@ -30106,6 +33749,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "widows-and-orphans" = {
+  revision = 53505;
   stripPrefix = 0;
   sha512.run = "577ed514a734513de7b5ead5efc98fd7ccfa9d2b8022843b9b3d17a5436d15a34430264bd23cae88e2daaaf1408066d194fded3d92f711f715ee40a85b6cbb05";
   sha512.doc = "7049fb084dca55706a621bbeeef57bebee04e69264c823c84e89cfdd219dfa4ea5b5e5127f2d0e8f9c74fd88db662b926c62e70ac7ee08f689e08d25de5b0bdc";
@@ -30114,18 +33758,21 @@ tl: { # no indentation
   version = "1.0c";
 };
 "williams" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "44ef966e5d8535aa7bb32109b20f47c774995e6368a92e20a68d25c1694ad86b7007bc90877d276c2f15b8aa3c3d11f7fe6aa117c35265b5988205df869af11b";
   sha512.doc = "c559e587868698c1a635db13b6db265234b3b475937fa1759f9e7e3a8d0644a43543005e9607b5a965bbdc304863d6c7cae6e5cb8345b546dc34afd8c7e2de43";
   hasRunfiles = true;
 };
 "windycity" = {
+  revision = 51668;
   stripPrefix = 0;
   sha512.run = "f52a60a78ec5855c1d0e34c2a01772de28e0d2c3dc553e12cb99baaa4ad97a7d6f6ef59fcfb429bfea00339e390d600d8b7e640b92aae8af19204d2567aa8b4a";
   sha512.doc = "8b0decbdcbfc0d0f0204e35a629904a48f44a5daf6b1b54f8e11dc601a103e97078bf7bf15eec028c14cc3c426782d7fda1a1bdd5d7725364959dd9d3d5dba2b";
   hasRunfiles = true;
 };
 "withargs" = {
+  revision = 52641;
   stripPrefix = 0;
   sha512.run = "73cc4db53528595f54f31f0d2824f08af54310aaed51b6eb51a5386de3f06dbe6ffeea8c4ab6f1e4ee1d169b5b0082f113ed435eae90b99a9b59df3296a3f4b9";
   sha512.doc = "050ecd695b269896d1252649978af7cfbafa80e289038ef1054d82296cd83934b0f7ceee274340d54d836021f0da39f05a648dba8bff141eae8f378527bcf865";
@@ -30133,6 +33780,7 @@ tl: { # no indentation
   version = "0.3.1";
 };
 "witharrows" = {
+  revision = 53246;
   stripPrefix = 0;
   sha512.run = "f1054a2d4be6121e3cd6f74ee6bff8afc71806cd6fc318e7f8e2b10f13e93bdb4268653224341976f847da5597309a3e5a09f202eebbb2e7440a098348f0d4da";
   sha512.doc = "72aa193dfc4e88f7679f7ecf878d9077bb6c7327a6f4b14783595e9af13301250ba51063debf4e40be8ae05f6d09628a4868a3f98ce20287c66a98493a0302f5";
@@ -30141,12 +33789,14 @@ tl: { # no indentation
   version = "2.3";
 };
 "wnri" = {
+  revision = 22459;
   stripPrefix = 0;
   sha512.run = "6ad06e6a867b323c382b85fa1effe16280566b1b61dd37be0bd7e9384d145fff2b1b4ff8117aa49749db1f15495e835e3367b0b7191cf9444e36fed662ffd0ed";
   sha512.doc = "c3d6ff664edd89fa711e9573b138b29b113b588ddef9ad4a258e1f28c4ca2aad1f05741a402c1c1972bbc317e0cb989ce7a51e52d59b42629343d9a5780b64d0";
   hasRunfiles = true;
 };
 "wnri-latex" = {
+  revision = 22338;
   stripPrefix = 0;
   sha512.run = "1dcecf9ac38a9099625ed6be3955af8b063ee5b5b8d0d3e3ab8c94a8215b72b86a0b5dbe930eb69680917bd3d6652b3f4f08bb377197ab6f3d2fccf2b96aa59e";
   sha512.doc = "924266d547910d25ed5355ec2ef697d271dd992aeb6767d5bcb703d4d07cd34b6844e9a821ed93f5a04237aba1c185fb68926967e78043f390785b619c2389d2";
@@ -30155,12 +33805,14 @@ tl: { # no indentation
   version = "1.0b";
 };
 "wordcount" = {
+  revision = 46165;
   sha512.run = "3c26b3bcb4c3edce8cf9d6628cf6b89103aa1ae454b07c1e963ca90693c18fb851772a52082a23efbefb51235005e558fd553afc891a472eb39cd430c97f861a";
   sha512.doc = "a86b034ebff42c89f07015b01f86756a83ff2c69ed911ecde185ff719b09e3db47f284fe778c9dfd16442d1513edc9ddbb4944cc242328c17bd3fc18a0aa098f";
   hasRunfiles = true;
   version = "1.7";
 };
 "wordlike" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "d600073b2373119973ca47564938db5824181d6b74409ef7f4a2b19d53b83b97ccf8edf5d77dd831c0d52a4379f5928ad7a0391d90a2f19fe4d3ef681133078b";
   sha512.doc = "10bbfa76beb0718dff8d4175712567e34e77aaefbce9fbc350d5bca43d8d5e87fe1cdcce5c558946c2b04beede8628b7535abc451f7d904ac283929ae39c6460";
@@ -30169,6 +33821,7 @@ tl: { # no indentation
   version = "1.2b";
 };
 "worksheet" = {
+  revision = 48423;
   stripPrefix = 0;
   sha512.run = "439c430189e74e8c476a068fe449034fa1c8f4e8770ee454b92b8645ee865b103a02b0eecb45a925a8021fa7c64d98240e5f1f980913515df49d8415bbeb2c2d";
   sha512.doc = "56d502e993eb77f7dd4b2a659a8646823cf033a3e246e90b0c6e4e9d2a7cb31922dee26c942404b13d18e7abaa79714b4394b589376d67e8fc1556a098ec7960";
@@ -30176,6 +33829,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "wrapfig" = {
+  revision = 22048;
   stripPrefix = 0;
   sha512.run = "ea9d0693a43f985b9ab13a51e0af82b866adc8500dfb9f42e8b20ce8facd07d0534749bda61d13bc86b921300336c9f7e6099f252c4c65370a2e2cb4423589ae";
   sha512.doc = "9ba4292d2641a31f3719ca66e3d80ca70638f9c943bfad9e9e08543f57a53eccc1292930e95d6a3677d0696e0deb1d1ca698b83eb7285baae275b70ac808be33";
@@ -30183,6 +33837,7 @@ tl: { # no indentation
   version = "3.6";
 };
 "wsemclassic" = {
+  revision = 31532;
   stripPrefix = 0;
   sha512.run = "064c1ec12a33dbb6c5a2c08c98c21d5684d8be6edb807987e69a47002d52bda4634a8e0d8016d01aaec6b0bcb9851de61d2a1723f70ea7da2dd4000d2340033d";
   sha512.doc = "d86741a35d1873a17839e880b2e1c0915cf7b64bd52e5836f9967159479611482c2b2c67388066b9f171574109a5fa0a5b9555ccf4e629d4b26434a31cd754da";
@@ -30191,12 +33846,14 @@ tl: { # no indentation
   version = "1.0.1";
 };
 "wsuipa" = {
+  revision = 25469;
   stripPrefix = 0;
   sha512.run = "7488fab88bb273463ffa45819fb486aa3c95d7202d8ffe2a8aa8f2a1b00555e70bbc5a008a72cb60ddc1759dbca60bed05d2a21b4308e75490e965e71a84ee7f";
   sha512.doc = "b24aa32e2e7b466d7afc827aed570deb70b41163cbe6ce975d8df77e9dcc92b453e5f0d5f0edd5a2f05c006939003849b7b44c2e3f8a86ffd61a51ff307466e5";
   hasRunfiles = true;
 };
 "wtref" = {
+  revision = 42981;
   stripPrefix = 0;
   sha512.run = "bae4e9c07d17e94a661a7a168fb5777d95f7b65644308197633069ec23d0b9e10e93cd0c1e892db9d85ae54f50fa787c60d04266eee512f45c5ecb3ec68f039a";
   sha512.doc = "5d7f2338beb7cf22ba62c2fcabec2b37900fb208726a59c25fe6b12c8605d15210a8cac8da454c8ad09090ddbeb01987aef53086cdb26628b72f32752cca1d87";
@@ -30204,6 +33861,7 @@ tl: { # no indentation
   version = "0.3.2";
 };
 "xargs" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "43b9cc5246123ef3c424614415e04db9e7a578eef348c3d580626918a4c31ac99714cf501dd54d305ed6ab9ad7e0533bf5b39250c43ad682032dd676a12173d2";
   sha512.doc = "387a051eb8581b51d2042bcfae2ff9af99659d664c328c6b30b3789c75fb73687c32e2037df7a345335966671a3e3267ff4b9e0eead0e5b759bd305850ef22b6";
@@ -30212,6 +33870,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "xassoccnt" = {
+  revision = 49516;
   stripPrefix = 0;
   sha512.run = "ba903cce2a9438c51e40d529e6b6c6993f4a2422aef2688cb9d875cc408e4423ff135afe3758bef6605eb26e1f2bf4921b652131e65bf068fcce54be3f765455";
   sha512.doc = "5a1805d9cd838aa7369fe4ca2d10c8f46b8bf913c14d8ce8dc546d80598f455696f83825c3a1691fb5a3ad36fd68c2bcb62b6a682ba374e54071aeb3f33c7a87";
@@ -30219,6 +33878,7 @@ tl: { # no indentation
   version = "1.7";
 };
 "xbmks" = {
+  revision = 53448;
   stripPrefix = 0;
   sha512.run = "e17701f9cd79d49467e4dd47ef9a504a8b0fb44b216fbfab0f5547e9215c4dc40f1fa46aabc209ff2221a4a9424221adacc52f6040d3f796d51f2d37dcd4e8c5";
   sha512.doc = "76d255a036a19d80c826eff4b18643523787c53f9b79e44710e03f9bb8a7648136559727dee246508c1cc6ff332cbc92b8d1c728b4583ae26502ce44538a61db";
@@ -30226,6 +33886,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "xcharter" = {
+  revision = 53535;
   stripPrefix = 0;
   sha512.run = "4e269f15e3b874990151d51845aaa826e6995b886cc9806ff789b82d1bb34bf81f9f1ed6579c7020d2c02c5f02830d0f409e45ef2c1197239748179714398da9";
   sha512.doc = "7a38a5891ee517d5666771b5cec3cd73cfced263dee1f1ac7eb58ec59377974b5bfcfae45b7359c1b63cc28ef7351c701403d655473edb0326460cce1ba47b5e";
@@ -30233,6 +33894,7 @@ tl: { # no indentation
   version = "1.205";
 };
 "xcite" = {
+  revision = 53486;
   stripPrefix = 0;
   sha512.run = "0412a4f47a044efbd22adbbea9cda1bec44379dbc799ca83821d4650e8e40f6b5de51b80ea6a80d747639a9b840b7cff6612b6e4df0b2c09c0f3ed506d3de714";
   sha512.doc = "11af105ca5f1610e5cfa226cb191d1f69d257e21439c2408283572e136b183518f58631ec1b0b145a1edf50ca58e9a1eda789e5646c47b46f75a6325c90262f5";
@@ -30241,6 +33903,7 @@ tl: { # no indentation
   version = "16383.99998";
 };
 "xcjk2uni" = {
+  revision = 50848;
   stripPrefix = 0;
   sha512.run = "c1174c6abe555eee84d753f76608fb3fc3234c43c5666def063983653908a03b8eab3787dc9e061c0f6bf3bfae7bcda9a31ded49b039580fccb254ed33571e72";
   sha512.doc = "30f81325aefa49fd44031ddda4e1ff30c40ccc08645671e1439df38cc4efb2a5cf4d9d50e98e970e96e3b18046e16834710d6be8fd9e5fa18cf5271bd5ae339e";
@@ -30249,6 +33912,7 @@ tl: { # no indentation
   version = "0.8";
 };
 "xcntperchap" = {
+  revision = 46236;
   stripPrefix = 0;
   sha512.run = "dd87c239759d04adc359a6f1dcaefd090b7cc0afaeeefd9ef71530e5933f8b174d53c8110163822150bbb722b5ed8f47eb279f2224b02aedec6137ef7edf97c5";
   sha512.doc = "5f7554ebf4ef3d878c8a31872e6d67b6716ea7d6e5e1b38915f4b4d7c2edbc4fb1aa31d557e74cbbe792134e77a6c9cb4dd24ab0daf765659e399cc84e70d7c9";
@@ -30256,6 +33920,7 @@ tl: { # no indentation
   version = "0.5";
 };
 "xcolor" = {
+  revision = 41044;
   stripPrefix = 0;
   sha512.run = "9fba18460e4488cf2836082952ffff6e5e481b964570ee515f503aed3c8790778e054919e4e24070ff6cf608e21c1356859341eae5704558b1293b01ba8c0925";
   sha512.doc = "65f15207df8a112a4bccbac1c5259053364b52da3f0d2fdf566e1e734f61e0649ae6cc674c96f775d8c668cc6238dad2993f06b81153d38713ebf96e747e0353";
@@ -30264,6 +33929,7 @@ tl: { # no indentation
   version = "2.12";
 };
 "xcolor-material" = {
+  revision = 42289;
   stripPrefix = 0;
   sha512.run = "7f1484435458dafa2a04eeb4b5b1b89ffee9ec8c91f1d724449457b719f92db009efd6b6a580a2b0ccb8ebc66c0d1889f3ffa05104c0fba5cc9c7ee90985d2d3";
   sha512.doc = "388f9b604291436ded0510437be93c1fdf120a91fc3ddbabb870840f2caa9e81313035ff6c9d0c00de259fa024f83399a4004e7ba512a5c3bc7920a08ff58819";
@@ -30272,6 +33938,7 @@ tl: { # no indentation
   version = "0.1";
 };
 "xcolor-solarized" = {
+  revision = 41809;
   stripPrefix = 0;
   sha512.run = "be443123bb994c40fde0c1783c9863a2ce8b75a8e3e3d311cc34596e72f2830dc92feee9fe87638adee2e942d540424bc389460e12aa0e33fe4014b28a1d46f7";
   sha512.doc = "a448de4d83ff30c2112c90fdf80f530b8e1ee46d6b3f574ad0933cbd415debd1f94cb1c55d6de5679d5502cf8e0e28b71cdbca803f0569422e79bf0ced384f45";
@@ -30280,6 +33947,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "xcomment" = {
+  revision = 20031;
   stripPrefix = 0;
   sha512.run = "ad19a29caaaa4da90c740a18f3b3bf63666303f8047210197e17c270082d483e33085c9249d7143ba65f343f6bf3b52c6974021f954831c5196708824e21b843";
   sha512.doc = "d3b4d70cd88923e25595acf726afa6eea2efff4550455ed2eff48411621f212059ffedc3a82e4ac15359420a00c69b55e3625d11f8e8d4111eeb87cc3a6e8cfe";
@@ -30287,6 +33955,7 @@ tl: { # no indentation
   version = "1.3";
 };
 "xcookybooky" = {
+  revision = 36435;
   stripPrefix = 0;
   sha512.run = "3f74d540c4da5ab4f6f1b6c78f3a35172fb4f2d94b7c720fe3fd1d31e1c53db6659371da6d48adf755675af831d252178b96ba57a1f0c0319459f4a564897b49";
   sha512.doc = "29d1620c7ea3d13e4fdf97454bf824fab8de6acd96661554a1f37717e4fa0dcf6df20cec580b6b25101b75d2d22080962713d05347eba4974c5cbdbca6129ec6";
@@ -30295,6 +33964,7 @@ tl: { # no indentation
   version = "1.5";
 };
 "xcpdftips" = {
+  revision = 50449;
   stripPrefix = 0;
   sha512.run = "ccf564a59d658a4f6747a3df866d0b0a0d6dae489215b5784fbc0619a2f3f222ef348c5fb96faf192d9db7e5c63d44c5f94549cb809e89dabd06bb43d745df1d";
   sha512.doc = "5d483b7bce276815fbb3602d4082ff9c939ae414cb2e2b03f75307c71b2b19a6adba23f609836c78859df5823f4aaad175e01b9f223326176b62a4ac9060cf02";
@@ -30303,6 +33973,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "xdoc" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "8cee132082c70214560ca8377766f45e6f15da2af18e0e9d68205d094b2a6af4d50150bfa6d145f78d92bb95c8657ad9fab1cbb8e76b75859f44ac1039464cca";
   sha512.doc = "cb7fc71f84f88a1035e91500e9b7ccf0c425733227e4106c7bd87eb30b25c8fdae6bce046f22e5a07ec919ee0527f264dcd826b7e6468eaf21a791e7dc0e7ab8";
@@ -30311,6 +33982,7 @@ tl: { # no indentation
   version = "prot2.5";
 };
 "xduthesis" = {
+  revision = 39694;
   stripPrefix = 0;
   sha512.run = "4a92d52c7ca60232849b02bd7d688f12230f858bb7559287610a4d33699158fcb3d5270a22b3abc99d89a684b81e2124602486c16f22fb434e98b54f715f592a";
   sha512.doc = "44ec843c2a6b7827c783c076e8f02dfb697f1bf021b54be238049068f466d9969d2e0bb9efdba37623b44a564985af4256eed2b82ef35d8f7ec9798ce84abc0d";
@@ -30319,12 +33991,14 @@ tl: { # no indentation
   version = "1.00";
 };
 "xdvi" = {
+  revision = 52851;
   sha512.run = "0bffcb7e841c0517be816d9daf706e11d0a43973c5b8021133da819b66ce50875ceeaa9bc5c76004daf3640de72cef996364e49d1a9f433c72aca3992450c74b";
   sha512.doc = "43466996014c40a4e902c2d28af008bf610e2c52cd88acb76f92a3999f6a062a440289b0afb96f1ad29881e280aa8a737ab1936b276e5f39be47fba3a5b80092";
   hasRunfiles = true;
   version = "22.87";
 };
 "xebaposter" = {
+  revision = 42046;
   stripPrefix = 0;
   sha512.run = "cc264905da875732a3bad46daa31a1f5595e3676ff4d5570554caea40dfd383eac8e9a05121e2211294749770e50fb4d80ca6e735421eb7ca295a10bc666ec3e";
   sha512.doc = "9bf0315e6fa502e0de606bb16c6575997314619f10a8aba312d8062be5f1edf4ba037eff7c23948ba7800bc2abf2fa300b8609287558a0ad6c59d63095b20045";
@@ -30332,6 +34006,7 @@ tl: { # no indentation
   version = "2.51";
 };
 "xechangebar" = {
+  revision = 44954;
   stripPrefix = 0;
   sha512.run = "0521eabe4444865747291d13a8664431b64e67969276191f1389bc0c7bd7198625a352ac391cc06e926cd90535b47b8edd8ffac6f3967ade0cbfe7022409519a";
   sha512.doc = "f2452e8d2281f4d92da80917d6883bd91318f8e4459189fdfd8e6a79269d4d2c1b16122bb42237598fec3b8d44b9cc313a4b7858895db8dc0fbc5157825f2046";
@@ -30339,6 +34014,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "xecjk" = {
+  revision = 53835;
   stripPrefix = 0;
   sha512.run = "81a7fa804122c3093893f41110ed4fd0c1c43ae381b1070eef4dd4711dea7e6fa6ad7ff8b3dbaa78ef967790d2dafe5983b3fd7aeac4d7868e8c8af3ccf0319e";
   sha512.doc = "93b16713f9e1d2c0e5ce7dcd0313e5bde13b21c80980b7d0b5447f8a0722e0dee656619a6890296a2f4cf96f386730c260191a7fa665ca4eb93044c60fda7c0d";
@@ -30347,6 +34023,7 @@ tl: { # no indentation
   version = "3.8.2";
 };
 "xecolor" = {
+  revision = 29660;
   stripPrefix = 0;
   sha512.run = "0ab23e651b36f06256fab5acb14effc93296948aecf7c7f11c81f4db89a58bfd8e038dd857a1da3a86ab573cf0ffb1d1bc188789e0d493ab0d0c1c9d96d593f3";
   sha512.doc = "9441eff384f57e8714cc543ade380ecc321e6c0e7dd0ae69c71337458e2607a43f793b490bfa6752c1c70bdb17be92488b89ff848ab9a3a1700907c15ed857c2";
@@ -30354,12 +34031,14 @@ tl: { # no indentation
   version = "0.1";
 };
 "xecyr" = {
+  revision = 52315;
   sha512.run = "b248cfde57f5f8023df47a7e6c6260e00820baeca261a52ddcefd6a17a2e9aff63a43fc870d8be747e491193800d87440ac1167afe06bf0b15238982f62bfb76";
   sha512.doc = "13e5bd963aaeb286498aeb631c88c3b14ac29ac740284014f11b881503d17d99b29233c86853c7691aa9752557773a8f6ec5d410cccd2d6665dd5d800f1fe2b4";
   hasRunfiles = true;
   version = "1.2";
 };
 "xecyrmongolian" = {
+  revision = 53160;
   stripPrefix = 0;
   sha512.run = "2faeeadc81ca7f6fba45b6b237fb604a6eb6e8888117f759f6d369ed354b20b35dd007eb11c017e4f0ebcfa99627f519b291eecd1b41505d7f4ecbfc23307784";
   sha512.doc = "11b9d4a92c6df44dfc629c7385b56463dcb13564e819cf1bde005e228040a9f675cfb5818ca9f5c5d59a3db7a0d42a5584d9a3a530d772ba2b4bf3145534bc0c";
@@ -30368,6 +34047,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "xeindex" = {
+  revision = 35756;
   stripPrefix = 0;
   sha512.run = "bc3f399973bd8be5b83ea6da2c39d80de8f39ac6cf2d82d689c81816cad334310081f44fb4e256e442fc47ed6640c2b8ebd185e431f0d0ddec5f75f7b535283f";
   sha512.doc = "c84682c8034c5e182bcbb2ac0411f4ba5d8065a5db1f008c6f9e7a01b94b3563c44c03fc4c1cf48b3b09d19ba93f22778d8840741737bf1a344cb0c8f66ceb49";
@@ -30375,6 +34055,7 @@ tl: { # no indentation
   version = "0.3";
 };
 "xelatex-dev" = {
+  revision = 53553;
   deps."xetex" = tl."xetex";
   deps."cm" = tl."cm";
   deps."hyphen-base" = tl."hyphen-base";
@@ -30388,6 +34069,7 @@ tl: { # no indentation
   sha512.run = "0a8a8953a7180db0e5181a00660cb0d20b256ee044691209e13439c1f1eed3e654f43273999c42d28e4a94e844fac8a2c21b44cd4c14a2772941f030bc998366";
 };
 "xellipsis" = {
+  revision = 47546;
   stripPrefix = 0;
   sha512.run = "3bff74473b4e7fdc7a349fd54e7703b77282381d9ff5eac233d5eb7cefe98f4abc5ea4fd309b8693bd7245471c565545e0ab437a5f8e5cc1b89368c914078d54";
   sha512.doc = "20d238f8281b93643af570c3dd09a9cdf9822af0da6a9d06b3b9d09196ac4c7fcff2efa3271f763caf42e54f9c72d2087c491cacc5ea4666cef1060c12ecab3a";
@@ -30396,6 +34078,7 @@ tl: { # no indentation
   version = "2.0";
 };
 "xepersian" = {
+  revision = 53625;
   stripPrefix = 0;
   sha512.run = "50b382f9b542a3874aa5ff162e458fc7443dbf601a31cb278d3cbd4f811baa45686ccdb83ea6e190ace009e3e055bf22828ec82804b6630abd95e1f3138353f3";
   sha512.doc = "fe777722885de8352f26eb3b755d8f02155ba875fd1b9ddd230c13d4a0f2287b3c9f2261f0f2cc003554cced4120f81b9478b75ae3abee369a6a421c6e8a811c";
@@ -30404,6 +34087,7 @@ tl: { # no indentation
   version = "22.8";
 };
 "xesearch" = {
+  revision = 51908;
   stripPrefix = 0;
   sha512.run = "4c204a8f92fe9af0ef1f0da99dfb12ac8f784800f7ef673a116a5f5167556fe49584b9457bebfd07aebace44951327f8a576cdbc8091a7aec776768384c62507";
   sha512.doc = "981e6cc62a2f50815aeb875c46ab2ac83510ea535953629755700650831500410650b66ba070d8b5ddc494792e782fb75f266ffe0fb868318a4782b2f8d701f9";
@@ -30411,6 +34095,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "xespotcolor" = {
+  revision = 40118;
   stripPrefix = 0;
   sha512.run = "7f4a111897f53b003473a40db9e779ed22215eb61e7485a1596bc215e6057d065d158887e1c93dc4e81b04ef1f8815044ce61daf406b62bb77ed57df8f13a70e";
   sha512.doc = "e1d2f3c52b95ef065e0d2ce93871278b8038b1bfe86700609e1197715dad91be572cf00a4391cdc4535672897d0ec52a09bdce2f24496538e512f760a7a622e7";
@@ -30419,6 +34104,7 @@ tl: { # no indentation
   version = "2.0a";
 };
 "xetex" = {
+  revision = 53917;
   deps."xetexconfig" = tl."xetexconfig";
   deps."latex" = tl."latex";
   deps."dvipdfmx" = tl."dvipdfmx";
@@ -30437,6 +34123,7 @@ tl: { # no indentation
   hasRunfiles = true;
 };
 "xetex-devanagari" = {
+  revision = 34296;
   stripPrefix = 0;
   sha512.run = "96eeb5289b4b0ce252eba1daf15fbccaf2cbb2d251a85818b6dd761048532f36355619e37f1f857caf4592cbf85d112d6d48d5944c455ef36da9913529a783fc";
   sha512.doc = "0f360c3f43c6562520b8843269068fc46ecc405cd3a4d8faecddc4f606d69cedcab28950fc1d2e11699e297fe4d70c4c3d50765a2ec30541c237914accbc7129";
@@ -30444,6 +34131,7 @@ tl: { # no indentation
   version = "0.5";
 };
 "xetex-itrans" = {
+  revision = 35088;
   stripPrefix = 0;
   sha512.run = "7d083e176a2786689a325c511d4e50afda5ea8c644c8288ea050db79fd248085be500ddf7a0b8ca3cef6191651669f9c48f894d16ac571096cd1658d6e6bac60";
   sha512.doc = "795a13fced2938c1679dcafd07e445ec62db6cb014259a15d1f8d1dd68ee4cdb98c20024b1601679da5f6e8d3a27b05a1285de967067abc1fd61ee6937540449";
@@ -30451,12 +34139,14 @@ tl: { # no indentation
   version = "4.2";
 };
 "xetex-pstricks" = {
+  revision = 17055;
   stripPrefix = 0;
   sha512.run = "59186971a188f4541361df8fc492b3767069b3081f7052c88df5395539807970c709537b074790411dffbc871010cf4d3fbbdb6684c43007477c44be6259b64b";
   sha512.doc = "cf71359ea6e56061848b085da9755fd3d96d2a9d30484b5d5028c7a3dfb52dfbe275c46f17016179a56f90db3b6df4453cbf3a990a709e59503fbf1a576eaf8d";
   hasRunfiles = true;
 };
 "xetex-tibetan" = {
+  revision = 28847;
   stripPrefix = 0;
   sha512.run = "de7d2f875416336f25e8a14f8c743aef87017cc0aeb30b5c6aa9e1bdf044d71d3c9e9a28d52ccbe7fbd2099ca9e47938310dc3311e46399027aa822b76ff90c9";
   sha512.doc = "0bba33024862284354416e55f2f718f3f3220e4a853c68bd6386c013702aa07a3142864168f6d136bb351044dd9ae8b59754cc2a0181a358fe1baad49106d504";
@@ -30464,17 +34154,20 @@ tl: { # no indentation
   version = "0.1";
 };
 "xetexconfig" = {
+  revision = 45845;
   stripPrefix = 0;
   sha512.run = "62b130d16ac01845df5acb1a10e487408208b0c4369d58892a83a42609b3dc92589195540154d1e07a9cb528e8e4ca65009dfef236efd53b9cfbce0a942c5b01";
   hasRunfiles = true;
 };
 "xetexfontinfo" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "8099f45c704ea74e5bbd90b1817c3ad06cffe3d6da0a997f8471e72cff364d346a3cc2e6f156b51bf7bc3ba149e5c755423418d58be89e1872f84db9c1eef039";
   sha512.doc = "a5a9b085e5dac02d75b83c7063fe653724367ce203c20832e2ef6b11db10e31bcb90745a7b7d65427a33cb018d68afdd4acf9f92c907f91904188ad60f2e1460";
   hasRunfiles = true;
 };
 "xetexko" = {
+  revision = 53826;
   stripPrefix = 0;
   sha512.run = "96d6e74e10d39f2ab84c98a53b42800154183f4e80242f88209a0afec6734306c8a454cda44b5f171ee96229e1bcc06d2f35d57f2586ee53b403e6828d0213ea";
   sha512.doc = "433f09555146f3de3c1d7bbdfc51ee2cb05803f9cf3d1a69d34d049d30e183ffd302273aea52b868e3dba08e64459b2d6bddc6d15284812b119d6a3b07f40dac";
@@ -30482,11 +34175,13 @@ tl: { # no indentation
   version = "2.23";
 };
 "xetexref" = {
+  revision = 53068;
   stripPrefix = 0;
   sha512.run = "926ebf995dea04300dee8cc061361f7eac8efe08ffd3ada87be5b682e2c581d3c2965328ec7c93deab8d6bb9311a0cb27ff1a14a7332c407be713657a136959a";
   sha512.doc = "ad0700f1e1053abd8264f20ad04b7ade28cca6f5757e158f8ed031f493a966f5b62a197a34ba39ece7c3cb68d469334521a6325c2b4276dbfbc5c2519e13b33e";
 };
 "xevlna" = {
+  revision = 43864;
   stripPrefix = 0;
   sha512.run = "69c80d5243a4af96f2dd8092926d2766bad5d6beaeff94d6aa2f184a68a45fa50bb3abb91a4652d8c5e5617073aee9caddeeb73fd5399965f477be7075b7ca01";
   sha512.doc = "d0d033b646314eb250b245575ea2361b6c12f13eefab071c2b9f91524b08bfceb9fec197c3fa5f61e3ed19caaf4198e69ce1305bf1eb2daf1db6e30365eeac48";
@@ -30494,6 +34189,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "xfakebold" = {
+  revision = 53272;
   stripPrefix = 0;
   sha512.run = "ba8d90525556025c1387f7c82d3bfd6e43be1c82c5b508d611c385cfab3f6b728499b2bb9cf98e65fe8f3ed3266da402fdacf454b367eb95e685ecc9591166c1";
   sha512.doc = "c5d63984f0f2b9996ae5be08e3e43268a375c38e96965c5525fd95c9fdd167306ddf0801e7e233d2ad52dbd7a48e82bee9e822f22e68fcce180445a693fa3687";
@@ -30501,6 +34197,7 @@ tl: { # no indentation
   version = "0.06";
 };
 "xfor" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "6e3ebe83dc39a87aa86d5f173f56893ab1678253dc18dedf16c5d4a2df864e21b9b6e84c6bda56e2c624106efb2f73c110964948e4d553848bbebae87f05bff8";
   sha512.doc = "e75b3d57c09e1580282f4002b684645aa21aeed4f90626b7e439f30dd79edec9c6f23492eef83b67e9ccb885c001caca6201d43b5182632a5b38ba5f67488b52";
@@ -30509,6 +34206,7 @@ tl: { # no indentation
   version = "1.05";
 };
 "xgreek" = {
+  revision = 46662;
   stripPrefix = 0;
   sha512.run = "1f2dfaeb88040a1b58b60c0ccb84e7417d4211491d34c17c9302b7cf388775ed729f9135b76e43ea276a50a665efeaf19884535c187bc1c0cd931c2e79b8aa19";
   sha512.doc = "8258ef4bca146a2ea8f42a235f151924156f116d2d3feb4d1974da1b1afd395858dd5d53d2343d748f0d60afffc8967e9f316026e07bdc2215d145334ec90e66";
@@ -30517,6 +34215,7 @@ tl: { # no indentation
   version = "3.0.1";
 };
 "xhfill" = {
+  revision = 22575;
   stripPrefix = 0;
   sha512.run = "cc0ea9e9d40a590444801359c455716856c807eb429aa01b460fd7566797490932bd3566a5c6f95bd6723e0b05bde1aa632b83383c8bcdeba8a455cb84ea9f1b";
   sha512.doc = "027287d941c4576d7f55a3d618e13cde5348ac072f3e546dac6f8a8814efb982f9cd0c4162866403f946d07ecba0ea8cc15543cafbdf9008d60b78d0ea3d26fd";
@@ -30524,6 +34223,7 @@ tl: { # no indentation
   version = "1.01";
 };
 "xifthen" = {
+  revision = 38929;
   stripPrefix = 0;
   sha512.run = "21c5882ffbde05c50a6536fbf19f812a3ce6381f565227f61c8062281a2472a105bf6223cdc03adebf275fa23dbc1ebbb967349c715f20d1b516f100f820af3e";
   sha512.doc = "52ffddbfb4d0d579849b7a89d30bebe9f1d511751c89012712a8ef73ae3f4eb8799ef9b3755dc957c47fd874f1ce76b3ed54591d59f7e4d9e1851c50aff3dd4b";
@@ -30531,28 +34231,33 @@ tl: { # no indentation
   version = "1.4.0";
 };
 "xii" = {
+  revision = 45804;
   stripPrefix = 0;
   sha512.run = "a5355a456005e09eac4135735973a14a6add3a31639fcea441d8d6a7c06e7a7efbfc1470d485ab317fa193897abc2d9edeccadd19239944014b7fccecdda52a3";
   sha512.doc = "c9b348da09c3a9c1522eb7713a17a58b3eabf4ff8ed52e8d14dc9eeff528ed93af505b5e3cb59c1af4c2ce999c6c1d98f66d026a6ab3d7a09778230286059d84";
 };
 "xii-lat" = {
+  revision = 45805;
   stripPrefix = 0;
   sha512.run = "e4538ac31b6508371ee156168d4da71644a65297b91be7f070291f35563a45a1ee5a528d25585bc23a4690e8fc5c6ad04bfc829de4e95f49468a5852fac9e822";
   sha512.doc = "50322d89f494d07793d964fe515b8a0bacb74bd5706a6da80f6860771a8e3cad35c7d06bf398217a7e4364594d54f4dc490f39980194804a04460047ff5083f8";
 };
 "xindex" = {
+  revision = 52892;
   sha512.run = "fe62e02612bcd19a90bca6b94380c6c0b50acc381d47f60c81e142afbd6173adec8dda97e2f16c28a8ad101d8f080644d456768987ca5f8a7b30e03b3e30ee59";
   sha512.doc = "07b1cc0ad37d8893bd50aceff18052642af52eb46f4e72320bdf093dcdcc7282019f3fccfc1e6df13a8bcd0f6d0a4cf41eb47d6f84a1ee3c6d1b0a8a1e150df0";
   hasRunfiles = true;
   version = "0.20";
 };
 "xindy" = {
+  revision = 50203;
   sha512.run = "b9127f03d8917543f0b1caaa24344aef0356818d7414e390ad45d5de3420271a81509ded3636c3475b577d6781be6e24c94f3d444f6190bed9039dd720274787";
   sha512.doc = "9e6c10388a7a707695e2965c3e3b851f939a68997cf880560a4a05ca3a167febeee9f1a7803cff1927bf7aecf0d6baac65bc4827c367f9c2d086d17d5947d64c";
   hasRunfiles = true;
   version = "2.5.1";
 };
 "xint" = {
+  revision = 53930;
   stripPrefix = 0;
   sha512.run = "971cfdfbb31d58d10732e06cae28a9de1761cca37191af07780c5603274057b3a2f1dfa57522583be7302f46e3f0c0eaafd27aac3cba42d7c3f710a115448ac1";
   sha512.doc = "dd9baeeac6751b817cd6ddafc6142c220ebad4daf82f237f84f0535aa1412afb2e43504a076366e37221872ab582e6f4f9787bb759f40ebfd6e9b19badf7f1b9";
@@ -30561,6 +34266,7 @@ tl: { # no indentation
   version = "1.4b";
 };
 "xits" = {
+  revision = 52046;
   stripPrefix = 0;
   sha512.run = "f78a9244a0dc31a9a69d920d6228b8dd3b398abd57fdac2e21de1154c93bdf7abaac806df1a76d2ff8994c9d52f17e5803bdea7c43f0e13480301ce136c2a0a9";
   sha512.doc = "4a8fe4842cdf000083352423735d7f34b6231472dd42a3108c324775ec97fee3f5ef457625f44ea0445c9c34e6f903e2af96c7a33ff3787069d77a4ebe70e145";
@@ -30568,6 +34274,7 @@ tl: { # no indentation
   version = "1.301";
 };
 "xkcdcolors" = {
+  revision = 52481;
   stripPrefix = 0;
   sha512.run = "78e9d390e64c5f35a35f25475aab9fd4308cae2c495cd8181980799819a374f7460bf41f246d91ac297b96f804f3327e6b09e84b255b362b1f285873ddd5b107";
   sha512.doc = "dba85b139b2146562acb51b64c8b0c7e4aef799e4bf25e131896c6143afd29d0279cd130db711d34fca06597792eef7f92be4ca10d34eb27f3da11a65b8713b0";
@@ -30575,6 +34282,7 @@ tl: { # no indentation
   version = "1.0.1";
 };
 "xkeyval" = {
+  revision = 35741;
   stripPrefix = 0;
   sha512.run = "5d49a32326057d18ebb2bf25d29e06362c23d9a2f9df5058457fd84c9faebb545316c502a7baa19073abdd661e9497255cbcb938684dd006b0c10ba7c957c627";
   sha512.doc = "a2c51df068c738d598c472143af901392d181db37bb416a2e406ad1d65c6679e428efc1281256edcbd04bf6a64ffd23dd568bed007ea278362ae7378f5371a03";
@@ -30583,6 +34291,7 @@ tl: { # no indentation
   version = "2.7a";
 };
 "xlop" = {
+  revision = 42899;
   stripPrefix = 0;
   sha512.run = "74f6ec3dfe32715ebe0bc0cbd3181dbc4e8384be19f2f7849333c21398fbb3a43d4e3385c8eb1dc81688bdde44072796cb1210402cdfa7522fd5a9052173004b";
   sha512.doc = "792a49ef02b67b0db85c827c52ea644235bb2d8c8d8c8c9c4e5c36d1003ab643906e7bad13ddc505e884abecbba97d495ae8d93d4a958c5ff9ce10888c29ae6a";
@@ -30591,6 +34300,7 @@ tl: { # no indentation
   version = "0.26";
 };
 "xltabular" = {
+  revision = 49939;
   stripPrefix = 0;
   sha512.run = "57f734e3715107169b53c017e9524c1cd4f29a120e6f6aab7e50e380216ca2f841fb0aa5e3d5fe016a061b87d64eae4714f35dcda8ccb4b2c73ec4d5727a877e";
   sha512.doc = "fb9567b70272ea7f49d6923a19748a1cc53615f45b56b2b573304c6cfa334f0dcf6aa1fc89a3236d814693332fa3cc71798d548323ec2b1c2bf34071ebd7fd19";
@@ -30598,6 +34308,7 @@ tl: { # no indentation
   version = "0.2b";
 };
 "xltxtra" = {
+  revision = 49555;
   stripPrefix = 0;
   deps."metalogo" = tl."metalogo";
   sha512.run = "decef1877478b8acd8a7a10abca00773bbae707dc47921adbf9e077c67fe186e8a90e5c9f35e8e8c173d93cbe799ba994f53d60e05eff4dde09525375d4e6bf3";
@@ -30607,6 +34318,7 @@ tl: { # no indentation
   version = "0.7";
 };
 "xmltex" = {
+  revision = 53216;
   deps."latex" = tl."latex";
   deps."pdftex" = tl."pdftex";
   deps."tex" = tl."tex";
@@ -30624,11 +34336,13 @@ tl: { # no indentation
   version = "0.8";
 };
 "xmltexconfig" = {
+  revision = 45845;
   stripPrefix = 0;
   sha512.run = "2620dde42acffee6561f406527794cc62d87c1104135da846b7cd3c7f4109c4d1986d562ea612f2b5246e1863eff86795c4789075f8475d45de00763cfb539fc";
   hasRunfiles = true;
 };
 "xmpincl" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "8d9a895a1efe8ce5eac190b8242c7f3e3bff7e433e1336aa7143894fbc5691c7b4fd791bae67fcefe97d16ff131b533f8b0c629580d7b5f9420e9216e932b860";
   sha512.doc = "2757de1bfcbfe9df02d5e667564b1a69205ab86c31f7bcc8ec3f37db0fb1a1f4bb21d7360dbfd771aeafaffa4599becc801df81e339b6f49adafeb38bc1ff5af";
@@ -30637,6 +34351,7 @@ tl: { # no indentation
   version = "2.2";
 };
 "xnewcommand" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "3296d6f9b580699e86ee01da444ec9b3cf7b76775f05529cc9c4dd931da5f887c914665651214a8107be612b18cb286ec039ad9ab3de520bd17090b38265d5c9";
   sha512.doc = "e03b7027a3956829823e92bd4d8a3000d8f79f26558875ea3837adc9ca4a17ce75d9d4e9136d7ebda7bdc8fbbf4a1b44fc6f71d1bfad710d2e22bba8fab24292";
@@ -30644,6 +34359,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "xoptarg" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "3ee6285ecac00a20781ad530a7ca1ef35a94efdcc31d29084e167cde75c51b4bdd644bfb5d25390c3deef44fa7b09e479b6c616169ab0bee1e83d4e37338e00d";
   sha512.doc = "1692c6700b978cd05cde7c0d45e970a4cc8f783d53cb1e2fc57639483e728ef5dcf29bc7563c9ce42eeaba72da93b36e366876494f3680f0fd5e8eada08694bb";
@@ -30651,6 +34367,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "xpatch" = {
+  revision = 27897;
   stripPrefix = 0;
   sha512.run = "8f74955f059b7cc27b01772893cb28c565df3773fe308d7862f7a41bc1930ebe8712468d8e32027d82b3b4f6c1a800b007ae202d8fe672d389f40f582ccb4e70";
   sha512.doc = "49fb3a9aa844ffe4dfc2e2adcf3ef6135302678bc423c377e171cea4ac784d9e5045e4f080aeec622e2cb5db7f706b8b5592d65e1bab60af766aa7df586979f2";
@@ -30659,11 +34376,13 @@ tl: { # no indentation
   version = "0.2";
 };
 "xpdfopen" = {
+  revision = 52954;
   sha512.run = "4bc35a5699e39b12f6f38b48ed7e136e9c5c54cbcad71119d7ffcb0688df9739187b4e0042782a2678233b289902b24c6537ba10303ff26846bfe73b98c9f54e";
   sha512.doc = "8dae12489e11fdc9e5e2aec22a4c70e8f8d15708b907404dde849b915515fe1f3d0771762f3a18112c8e2760e30bd1605d208b4315753ab37f738646e90c6f32";
   version = "0.86";
 };
 "xpeek" = {
+  revision = 27442;
   stripPrefix = 0;
   sha512.run = "dc1dd0534645be0754551b2d3bc146c7e7663f7cc9f2daf40b13a383e13883d25ba46f320317d4e9f251594dccf3a880f5e123683f302638eb3b37018b369ce4";
   sha512.doc = "047080eda80f9134b98196bf8a06e446ef856028aaa0f936da16db7f63be144b404708045d2a49c5bdb70b7a6f0b6b505697e95a5ff8b98b5b4f1ee8b2949367";
@@ -30672,6 +34391,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "xpiano" = {
+  revision = 37604;
   stripPrefix = 0;
   sha512.run = "3554bd514e1108649bc98d38dc84951edf17533758325d46726f55d9909d1a3747024aeff62842dc6eb1b5fc760c41a452e207b156bdee06468e9d7732e223b6";
   sha512.doc = "257c484983eed03adc77b1776c9207ff89b4152b817aa09fb57cb41d8f6494af0db191c61b954a7f2a605cb8695fdd0562cbab1e0c48f85329c3ad61fef0e62d";
@@ -30680,6 +34400,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "xpicture" = {
+  revision = 28770;
   stripPrefix = 0;
   sha512.run = "1915b8b9acb3db8d4f8ac4fbc0baab55d6b8352288852f20d066a3f0ce4f7dd0cd4d2d70ae2d2e29aadae0bdb272fcb237146379313b2900accaab2bc10ceb79";
   sha512.doc = "dafacd0f38ca6a248f701cf48381ce0a3816a693150118ab6a7e18f818814a1b54435820dc8c11135146cfde3d40a08a0f2cd78bc54a9ddb450bb5c848b99e84";
@@ -30688,6 +34409,7 @@ tl: { # no indentation
   version = "1.2a";
 };
 "xpinyin" = {
+  revision = 50849;
   stripPrefix = 0;
   sha512.run = "7235eeaf6b0218d4ee87a07b8b16034cbd40ccdf77c96baba14d4ab8a6bd5de78c5f5ab68891a6a91fe4bd0a77de146c357f4e4af4ed443ca8a38526f4f53240";
   sha512.doc = "b20233a1ff1f2f1f1474e5bcf81fab3747c26a3312d91297c73d1e57ebafd9459727c91da025b5cb4c1875ba5876873eb8099ad4012d85a972dc4fd1ea90e7e8";
@@ -30696,6 +34418,7 @@ tl: { # no indentation
   version = "2.7";
 };
 "xprintlen" = {
+  revision = 35928;
   stripPrefix = 0;
   sha512.run = "dc446adfe453430d5e2c9155acaad26e258a36319490a5158f0874292e9e68c1eb61ba57e361b5ff8bfff84c3b4a359709525f42599b95e9ba19ce9e28f88423";
   sha512.doc = "5905ee8d3589b7d75388e6e2355639435f3a72fa99abc17118068069715ba7220fa3d69f58e046d7972814bfa3834222858bc8933562ac91f83ea250f0952d82";
@@ -30703,6 +34426,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "xpunctuate" = {
+  revision = 26641;
   stripPrefix = 0;
   sha512.run = "4b69969632691a529ff0127f21a5974a509a29c047a33cdfc53d1bdef1aacee7d6ee8eeda5d185759b60b2e4dfcd0dc59948a8156767e2a7ced0256aac0697d4";
   sha512.doc = "04a839972105943ad72b848adb44584b647a3e52842c0956489ce82496d005ce35f4b8c8e6be1337b5f65616036b58e9543e7f4796075f9828aa9220015e441f";
@@ -30711,6 +34435,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "xq" = {
+  revision = 35211;
   stripPrefix = 0;
   sha512.run = "f1fc2f43099e022aaac631d4ccd1e5f5b9a9f23db6f1c6c3adf59d47dca57c25728f81ead0ab62d07b9bea6219e3121874c55973b54e826b1a70c5e4fd47c853";
   sha512.doc = "cbef1b95b4db328cc29d5f4fef544459b893cea82838e9e1f2faba00dd8fc78bd12d36931dba4ebe76cbe985879c30b8606df1f2091fc8d2108311350b2ea339";
@@ -30718,6 +34443,7 @@ tl: { # no indentation
   version = "0.4";
 };
 "xsavebox" = {
+  revision = 52780;
   stripPrefix = 0;
   sha512.run = "c6d04ba20e6218c39271dff28864fdd4063f0cae3f07fb5fe9452e27588873364d777815e9a08d0ca8324a1d92d693a91895ef66939e374cde0bb2722a6be3f3";
   sha512.doc = "ef5f40ad12ec9f7c957a8329d396677667c1bb6288769259a5763e68f34e71b7473435ebc44dc7c8a6b9696a5f29d5f66cc2a070628b11ee585c7ee5ef955e74";
@@ -30726,6 +34452,7 @@ tl: { # no indentation
   version = "0.15";
 };
 "xsim" = {
+  revision = 53893;
   stripPrefix = 0;
   sha512.run = "e3ccb054ca87583ff2dd5e624f0ca55cae742f53784fca9121e9e51d9cbb6c8af6b577fd5fd6b865924ddd63a4e4b1517f824907b0f0748a4f8963b671964055";
   sha512.doc = "d85ad02e7bee8f08b28fc903c6178fddba89baaa3bb82dffd58396fea29bc6bbe68cd51621a0c422a0e7097f1536d6e995d86b8ed78fc15a261ec828352e1fb2";
@@ -30733,6 +34460,7 @@ tl: { # no indentation
   version = "0.18";
 };
 "xskak" = {
+  revision = 51432;
   stripPrefix = 0;
   sha512.run = "202f61fffbf22346ff6ad6b2b8f411b2a8e4f58a9d53e5613810f2fe0b56b0c73867f0c1c293bb0c1f0edcd4ab73135ae33a953d3709d2d01060c1b638842dd4";
   sha512.doc = "6256df468580dcee451e4a650ebab0323c92024e9bf872fd683af1f10c19221887b5bd1bed7540a517eb6716627e689759b7ceaaa2944869e18591fba5467114";
@@ -30741,6 +34469,7 @@ tl: { # no indentation
   version = "1.5";
 };
 "xstring" = {
+  revision = 49946;
   stripPrefix = 0;
   sha512.run = "82254f103053d91eeea4c6230142de06138c392542cac63731c7b34fec5130984bbdebc29ac3b56998717dca11ad444c44f410215b6b89e6748029721a9daac6";
   sha512.doc = "c0c17b82ad0d5aad95d312935e0214a7e5404a23b9a284a56ac92ec9ea936a9bfd3a68a5b01e29c131b7850a3fd3922ac87020166eaf0a7ed9d695dc80d0a931";
@@ -30748,6 +34477,7 @@ tl: { # no indentation
   version = "1.83";
 };
 "xtab" = {
+  revision = 23347;
   stripPrefix = 0;
   sha512.run = "e308d3ae3ae32b945450b319834dfac19b6006cb0ede7f21a91999b840528927aaca7cdc330a02ebad874602d6d268fd1fe609dcb52bef2757b2e0417310e012";
   sha512.doc = "10a158bf2d50fa89355654da36a179bbbc5d30ef3efa8a79537de66c50a892f540938cb364e45896dc079266d5e47bfc2c74b8cfe01ec1691cde34bc221e4ca2";
@@ -30756,6 +34486,7 @@ tl: { # no indentation
   version = "2.3f";
 };
 "xtuthesis" = {
+  revision = 47049;
   stripPrefix = 0;
   sha512.run = "5d9081b8d197952aa5ff58b1cbd490bb529cbbc1b72956cca8dd28b1b6bc12c6248d3d04fd457349b30df7594aa1872ce9c8438feb67af1b93ff0fd33eefcb7d";
   sha512.doc = "96e94598e3e397a9657a83496d940aa2525fdbe1ec2cf820b05e5493b1f3e1c45568e16b62c22d4ee25afe2bd0657848a433477e82cc8038895c2195139ca065";
@@ -30763,6 +34494,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "xunicode" = {
+  revision = 30466;
   stripPrefix = 0;
   deps."tipa" = tl."tipa";
   sha512.run = "f49628013bc54e82bc38a2c749ddde9426c65716f04c5c8d8264398b9595e571d380e07c045db9e7ed5d6df7d0b7b1f8e81eaa28d6b67a6756d2c5023b731176";
@@ -30771,6 +34503,7 @@ tl: { # no indentation
   version = "0.981";
 };
 "xurl" = {
+  revision = 53538;
   stripPrefix = 0;
   sha512.run = "c034606febfdf397774f51f5057fb12243e5fbcd6ff8c9aa1fe60fa2643b5cdfe6c36558e5a4398e7c38c0da520ffeb53a930fda983b79c9d41fb31b74d6ad25";
   sha512.doc = "6c8833dcbec24d6b336b6dff58558ce4c38de22032f24d7510db85e987c83b2cd2089bc1a5b414ac82987bd8387dadf3456f0ca3885607285834688fafd29175";
@@ -30778,6 +34511,7 @@ tl: { # no indentation
   version = "0.09";
 };
 "xwatermark" = {
+  revision = 28090;
   stripPrefix = 0;
   sha512.run = "705c9eeccda8b2475cee782f6bb167691e985324361e6dbf147ef9843489f572f2e0b9e47a9f2beb7fdce68ef12ba2bbcb2ccf23c39db489d7d4486f09ff5787";
   sha512.doc = "70436c9927ed6c3c7604e1e70fa877b9be80287a18d9257abc85526fd756be5b0712b28b47b3271787f6ab062743964ca6eb5204005fec33c3a63d2dcab960ed";
@@ -30785,6 +34519,7 @@ tl: { # no indentation
   version = "1.5.2d";
 };
 "xyling" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "5f78d2d61050d9ed84d56136fe59b4674f4e03a536015e3ebc3b9500dd8a08878164ce9fb1aa9ca9a1262a000149061f3fe22f10cfd68941316aa186b81fe923";
   sha512.doc = "7b4ca312ea917329260eb0a19bd504ac2f3ddfb5f066806296b164fc541bfe26e6ed1c03ffac5b52af6b19fb4ba1e77b5228ac4b4db0c2ee8f2394fc0f888d09";
@@ -30792,6 +34527,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "xymtex" = {
+  revision = 32182;
   stripPrefix = 0;
   sha512.run = "9f0f14d1a862622ad0ef695a58f7dab554daac8d5151193a70c94ea872d16fe8eb1a763d03b226b08583db484bf576f5a41d2070d5396ac323ed00ccb0daf5e1";
   sha512.doc = "0e2eb5439f2e629da902e4c7d7ddd2d03bc4d654c4ee49e6b005450174acbd70760b52c9deb446ca60efe7c0389403584b86a6f9c9964cf24858b13cfccf7ed3";
@@ -30800,6 +34536,7 @@ tl: { # no indentation
   version = "5.06";
 };
 "xypic" = {
+  revision = 31859;
   stripPrefix = 0;
   sha512.run = "5bf1323499bd801e2d5e9ca2eaaf3d7726ed6b8063dee18180eec775ea4d2f86cca8bcae262375455af64ae00951a41b34386fd90666a2a89114a2fcf23ccb7f";
   sha512.doc = "cee264a3a8ee8f599b2310b4c9b722835a61fe8455c3f873ba91ad22ac7890cff8a1ef25f3d0b80aedd6420f31742f4e533fe20fc81dc83e4cc018684180c7ff";
@@ -30807,11 +34544,13 @@ tl: { # no indentation
   version = "3.8.9";
 };
 "xypic-tut-pt" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "291825c3461b397deb825266c7ee4316c5d04b8db1a29759378409de55c20d81552e31260468f4fa6a9a04f04705422714a8ec70a866c87fca2f4f1e189e0e4e";
   sha512.doc = "e27dfa0b36341bcd02ba63a8b543f1a6c55c674745cc790543ea2cfded80e536e5901f184a3af62b92b4534c738a06bf4fd5cbd4dfb4da865d13991279309aac";
 };
 "xytree" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "fdabfc451679f7ef3752db2537a7dd51e9c0fd34337e429f24e44728ec1ee0a9b97fc2f176948440a5c1cda609182f60d4c564ddcd76c70e84410cc6a0b1f371";
   sha512.doc = "0e2b08c8db25a5bd992c8aa843d8f6fb2e0efb3c11ea9dd0ac69106cd71f58996f73786513e0ff13bfb54932f468297edbb981e3efccfec2652f80bb02fc6ba7";
@@ -30819,6 +34558,7 @@ tl: { # no indentation
   version = "1.5";
 };
 "yafoot" = {
+  revision = 48568;
   stripPrefix = 0;
   sha512.run = "75ab34d40fb051000783abf573f4507e3791ea5aa1cf4b8571ad16bc020f10d17a49220a2878e5a2791fb7f073613ed20d72cd5618feadf38e290ee4f047e615";
   sha512.doc = "322e9cd25fd7686c4325d04bc7dfa00aee45fe993bdb730ca3669cf860b7cbae1dc76483fe3dec11e09ad848f166a01f43ad0885e0e9fe324ef28d28a7d2b4ad";
@@ -30827,6 +34567,7 @@ tl: { # no indentation
   version = "1.1";
 };
 "yagusylo" = {
+  revision = 29803;
   stripPrefix = 0;
   sha512.run = "f6f367155aa16ab0133957fea3c099d4e839f248a87ccca430e43c08257b2aed3a11c77ceaf8484097910bcee2dfadf260ab5047fa7f0244b43bcf332f367bf0";
   sha512.doc = "0ba73f1c7c7d7d646312f8a3d35c0d063e792ebae45c3e869565f01ef65e14f31bee463a1ebb8ad60166d54cdc23a9d21684675a6ccb09b8da233badb0d0ad96";
@@ -30835,6 +34576,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "yaletter" = {
+  revision = 42830;
   stripPrefix = 0;
   sha512.run = "28765f3b6296ea3b9daf671543b7b2cf371bf2aefb4f3eefe6e95d50ee9a11516a7ec14fec5d15305e8f52d0089072cf10ce9dd4cba30c8fb60fa75365ff0d22";
   sha512.doc = "ed81b08b0306ceb519c9a652ef0d271bfa486897b05bc3a91a3840e36d348ea86bdd645ae236d3f34de78d038de988a023e542075f871aa6d8752d9606910dc6";
@@ -30843,12 +34585,14 @@ tl: { # no indentation
   version = "1.1";
 };
 "yannisgr" = {
+  revision = 22613;
   stripPrefix = 0;
   sha512.run = "509e69acdef68eadc65fef6980e9166c6327e8927fb9cdf6a7a33786a8668ac9b900954a4bb661f223967b26dd240d5ebd91683658b324be284e46876c39061d";
   sha512.doc = "40ecdfe71670357e8ec84fd262015b5b5d0b8e486ab80c05d0863a335649501e9548d785cc2b2374f989b820dadd9a074cc229674dd1ae9a6252d4a0ebeb4191";
   hasRunfiles = true;
 };
 "yathesis" = {
+  revision = 50630;
   stripPrefix = 0;
   sha512.run = "f1ce86e173825007f87c2e4c3020ac761e7689cc079993dc7fbcb89985cc8e2684eb5bee4dc7e0a7bf44df0a37fe1d8fb8193e7006b511c256dad2b1b1e1ca4b";
   sha512.doc = "55f640414d27a1786edb8c1e4542bdabef94fe89e40c5eb06b56db97c6cd06f72f9386a4d27e674e956e7230015406a8f9df54f90e898ea8b7f174f5eeae6dd6";
@@ -30857,6 +34601,7 @@ tl: { # no indentation
   version = "0.99u";
 };
 "yax" = {
+  revision = 21183;
   stripPrefix = 0;
   sha512.run = "2fad927b46209e0705f96bcc5aafa9774d5a7cd7e4f984e48950525c282cc5e2273a21f5645bcdecff0a102a236f9f8470fffde829b44a886fe40f47699f94b2";
   sha512.doc = "f648b61eebdeb9a1d0497cc22205361c5495139fbf835173e067773956793c28220a6a6b8d3f7ac7f275cbcbb77b06a1774e0f4519587fca390d0aabe34ccf80";
@@ -30864,6 +34609,7 @@ tl: { # no indentation
   version = "1.03";
 };
 "yazd-thesis" = {
+  revision = 51725;
   stripPrefix = 0;
   sha512.run = "9f8350ad1d606769e5c5825bfa92832775ca7a120287013119f01e3cdd54b052a9bf51cce2c7350e5f7241b4817a4b840590bade6c07646fc519be5ba2d9e11b";
   sha512.doc = "315a82c7e548df4c971d9281f5da6e58a58282a3b05ab23eb41befe4cbe56b278d9a975c920d10cbd387f8809a2301ce800b9fc1c482dd6c3821040ac5911aa0";
@@ -30871,12 +34617,14 @@ tl: { # no indentation
   version = "0.3";
 };
 "ycbook" = {
+  revision = 46201;
   stripPrefix = 0;
   sha512.run = "8b98cd81e5f1252063da8dc297eb5580d06020a343638f7c8a1090a7f056a788eb4322e286f12d821be79fc7de94262a4ff15c14a1c787be0de89ddc87541452";
   sha512.doc = "45ee725849230549b4b2f200e0b140c1fc99a60d91730a42d2e3df63e828eb6053845a2eb84ff25bf916341df46a3f3c01166848afb291d322dfb21426903644";
   hasRunfiles = true;
 };
 "ydoc" = {
+  revision = 26202;
   stripPrefix = 0;
   sha512.run = "4e4292e4e6e6b4f5db8ff0721eacb582960932f48a221835c3e07841168b1f81227fcaaa41ed619430c5455edaef38dc073a8cf6c584ac759e88b9f40710caa3";
   sha512.doc = "c5257e669d802563c6ecec45a53645a69bc4c7980c95dc0a98164c950c1e5b12b5b4d012bd8a97164fa9b055eb84184c4df520b08949f68283d2ef2e33658838";
@@ -30885,6 +34633,7 @@ tl: { # no indentation
   version = "0.6alpha";
 };
 "yfonts" = {
+  revision = 50755;
   stripPrefix = 0;
   sha512.run = "1caa22023c93ae1e6a2fd94676da61fd576890f991a79d6a9724a4e5f7e653a752c6af792a1b15d44aa956f5788aa995614a33c2d97e95865d6a364f833e539f";
   sha512.doc = "54857e6693242080c5f410ded0bb16d3df65fee2834b2b5d1232dd063a70796905771059da07e7d92358fce9da992c3e605be345ae7c5d4012d37dc37a17dc82";
@@ -30893,6 +34642,7 @@ tl: { # no indentation
   version = "1.4";
 };
 "yfonts-t1" = {
+  revision = 36013;
   stripPrefix = 0;
   sha512.run = "ec4cfa0d4f08f506b3bf7a3acc8e303ba51c7761f32498f040e062264e595bebe64a4f5adc7d6ab5aa2180c55b817d0124d5b07b276cb39c775539113a08f490";
   sha512.doc = "dd37c5163de0bdcce937a1866a48d9f924faff81da11e566e9525a6d5a81ae82419ee7eaebdff1cd8512957a878f849f43e9cd71dd39625e6dc0e2ba18f4ac9b";
@@ -30900,6 +34650,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "yhmath" = {
+  revision = 50127;
   stripPrefix = 0;
   sha512.run = "10b98d5af7f179643bc0cd0fbf63e4a088c07e64ca6ac5f20ef05f3a00226159354f212de85ade3c7d96b9fb67e46207fbf7bed9f47a542df8427ac5fe248653";
   sha512.doc = "cae6f92dd19363251fddd7e6a2934e10e3b22840b5be4c9cc94c399637cfee241fcb34dfa22e93fbde3a599e14c82fb32a72c329c5de3af395ef2848ae7841ff";
@@ -30908,6 +34659,7 @@ tl: { # no indentation
   version = "1.5";
 };
 "yinit-otf" = {
+  revision = 40207;
   stripPrefix = 0;
   sha512.run = "5ec9f9408c3188b2bf985e9c3f1f9f6a345557d08a167a9d02c07fe41bbb981a8889f580d6e38a97798bb5e891d978eb4ee70b77a344c684051b5644654d1cd1";
   sha512.doc = "6c73466c1e4ce1f7aec1b30980e5c44ca4917e161236fad7a0816bc93e921525b90f62abd8d41d3b767d8a6eda62a34534d7129d1fc490fda430345f8a2b3ce7";
@@ -30915,6 +34667,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "york-thesis" = {
+  revision = 23348;
   stripPrefix = 0;
   sha512.run = "5b5152cc315dc05164ba3502d6e7aff355d853e43a3836bda0a15a4af7a90ef9fef02c852125c7e1e4842c05d51f2be6441b5131400eb46bb6704b281711e18d";
   sha512.doc = "e1ee454ad9996b61f1cac9bbeec30210359ecd8939bd9e0696e7cca7106733b13b8831946c47652186d4b80060f96c479b642274f5c90f8757953b1c3861f0bc";
@@ -30923,6 +34676,7 @@ tl: { # no indentation
   version = "3.6";
 };
 "youngtab" = {
+  revision = 17635;
   stripPrefix = 0;
   sha512.run = "d394f53ea68d2874036faa0d00323a0c15e3144a2433e27db0a630f05a637bad37d297132a92c00bc5ba3fb8a8bc643bc8778787b8897ab03296eb62d33683b6";
   sha512.doc = "38d42380d67372f2b84984cf41b0cd775c6b707405baffc5852cb147bba914899bcc09230e645e7779deb142358a4bf46f1efa0b47f159eeadc09d3e99f2728d";
@@ -30931,11 +34685,13 @@ tl: { # no indentation
   version = "1.1";
 };
 "yplan" = {
+  revision = 34398;
   sha512.run = "4884ac99b0b56927fb86c6e06ae9d4accb7d8b441bb17df79753d8af9ee84b9440d66ad4fcf2107aa036eb2af89d5ad49d0a4c4cb91236c6475cf81bab85566a";
   sha512.doc = "7d3cddf3f2d54283b777c7ab7867df68fdb484c67d2f88589e29fc087db721e7ba9e0fcea2ffde9328e89075884d668b7de8fc61f462b735d9f1cfadb9662463";
   hasRunfiles = true;
 };
 "ytableau" = {
+  revision = 27430;
   stripPrefix = 0;
   sha512.run = "2d9528c47b516213d0d8ea6341edc1772aa4a88a7db60d4506cbef107be034bcb9036b18f61a12e042e95bd9d0aea51b0ee696565841d2efb12b442756c48a30";
   sha512.doc = "47db377bfecce43d97e573360cfc65936664b5ea886b5bc0042b39e3a879becef0e9894c364a31cb4cda7420ba672c8f55e7936ae5b1d291259d8deb7a6d9f9d";
@@ -30944,16 +34700,19 @@ tl: { # no indentation
   version = "1.3";
 };
 "zapfchan" = {
+  revision = 31835;
   stripPrefix = 0;
   sha512.run = "46a104a6e4d1cf681bf10bf22fa32510982939cf52dd255a7ec50e5a9f95acf72457195cee13499c6f517a7f2b03be8a285eb6730f659d59ee5aa42522ba34bb";
   hasRunfiles = true;
 };
 "zapfding" = {
+  revision = 31835;
   stripPrefix = 0;
   sha512.run = "e3e6e69b82858d8bd653bcb112ed81b8b5aacc0b915b5e4ed4288f5aef896211e75b85b1b647989e0ffa431ec204a9d8ad27b2e60bc2b28eea83eb3518945bf1";
   hasRunfiles = true;
 };
 "zebra-goodies" = {
+  revision = 51554;
   stripPrefix = 0;
   sha512.run = "c6ba09e174207ed9f28053bd82ae46551910358e74ad7afd74b406a93d4720f5b11b1921497c3c464c80b55d8fd4e4adbfb115f3ed9a9bcdf68ebf96bda06434";
   sha512.doc = "48652f89e032526de7c37ad57ff5719d75dd50e5a00ec48a4d94c314bb159d76061ce9c9cf8519bfc8d546e274f8ab1344751d798abac422562efe6026df1872";
@@ -30962,12 +34721,14 @@ tl: { # no indentation
   version = "0.8.0";
 };
 "zed-csp" = {
+  revision = 17258;
   stripPrefix = 0;
   sha512.run = "2f41c5b28e602aa88146cbbc172eb2d6c6f21491e45622c4c1688b9a8acb5be304a8acde842bef84f7a238109ac9ebefa31844826387b266f14faa6a6943903a";
   sha512.doc = "e5e657656e46023e32366ba415f46322f4c9b4fe0e69f03c88d4e5fcdd577e3436be6436424f502c3807278efe3a31ab7cba3020ef3c9e44874de3660dcccd2b";
   hasRunfiles = true;
 };
 "zhlineskip" = {
+  revision = 51142;
   stripPrefix = 0;
   sha512.run = "c1e92d164d0b46ca1165775e5c17f72687cd83b6efbba95dd58fe55008877ab3f08bbaf90d36d491ec861705e9d15f74511c8a0f9cf66ef8bf5127d7aa2cf203";
   sha512.doc = "794822b3b89aec655af2663f3dfbe848ccac9fea8369f446596562178e73c01ddadcf1ce46fd1811e4b72a25917c310bd42e45f9b16a3adb897304ae345d5415";
@@ -30975,6 +34736,7 @@ tl: { # no indentation
   version = "1.0e";
 };
 "zhlipsum" = {
+  revision = 48629;
   stripPrefix = 0;
   sha512.run = "64ccc1f0baf30980162ce259d897a9fc97c6771768fadc3958e398e38f96ac6ea115b126a1b106270a7a509358108ffe8b93cf52af87503c66b8a365585391f6";
   sha512.doc = "06692d711ee3009bf11bc641569a9e3b0d6e339e0b7dca6e5e5d3a689b3fd24a5d4eaa45de7cd4ac2c0e3feea5c2612881dcc4bca88b12f554bc78fe96cb8220";
@@ -30983,6 +34745,7 @@ tl: { # no indentation
   version = "1.1.1";
 };
 "zhmetrics" = {
+  revision = 22207;
   stripPrefix = 0;
   sha512.run = "abc0b873b5abb0b053fb59d8bb831a835f90cd8bfc2cde87d1031dba2e31db8721e3ea1037e7322b33ae5216dd65bd01008fb769eade0c9b4815e8ea7c55615c";
   sha512.doc = "e77fd912d10d8ab535c366f8e5b99e996607788b9ede295a3d7739fc4c14e0679c66c36bdefe2ce5433967b28b2ab228c332d9b0a23a841d42d3fa56cd204040";
@@ -30991,6 +34754,7 @@ tl: { # no indentation
   version = "r206";
 };
 "zhmetrics-uptex" = {
+  revision = 40728;
   stripPrefix = 0;
   sha512.run = "1e068a0b402a5c69b44a86d797cb24266b2883c698decd8b8464c99b131d292cc5ac44249ba8e89dc0a414d6f12d73d4c069ffc3081cfa4b9926ca412bfc3dd6";
   sha512.doc = "f9ac2953877cd830e1cf3402f3f2bac1f8159d05a4a74e89047c494ae04dc8930f1c09701f83871b4361976572ae7d1c5fbdaf3af3d9e6db12347a207f1b82cb";
@@ -30998,6 +34762,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "zhnumber" = {
+  revision = 50850;
   stripPrefix = 0;
   sha512.run = "f5e0783636ca643463811293816c95f2e20345fc6b08f2bd22143ead830b102b7d5acb6dd587975ecae205ce8b79d75cff62bab153a6ada689958835c77298c5";
   sha512.doc = "d58579fcb6b5464db3d1ec20942b61516eb481df88fa23ef24f890a937fa72b62c6fef7fd2772172c4faf1a616805bfe32bdf39e17d854b907dc61ec9f6b6f4e";
@@ -31006,12 +34771,14 @@ tl: { # no indentation
   version = "2.7";
 };
 "zhspacing" = {
+  revision = 41145;
   stripPrefix = 0;
   sha512.run = "52d1d3523ae4c0d2dba5258b06cf9920f8a9005df7e03fd1407dd8ae2e4dc90768aab10127319ef9025765820b3ebb8a946ea0373114c9148a303517b563bfe0";
   sha512.doc = "7fd15e4f29671081670e881e9366ba627f5bed6d981fa0ef1c670d0744e1286c04e785e28b92279d66af851803d84949c2f463370f23c64987fea78531172128";
   hasRunfiles = true;
 };
 "ziffer" = {
+  revision = 32279;
   stripPrefix = 0;
   sha512.run = "3d29074642d8a4c63046347a36f47548557de92a64ab4d6b7d1cad87f97a9e25a09fe84cf699a3bf2129c4de00dd3ef3593f85056e8f38a9a2d1ca27c549cf96";
   sha512.doc = "8eb75b54a6711ba0d0ad30343f253eabf88b3752de3112b13b96e4182119ef5f789916c413a5ca35ba7bf6619eb25bf64e7717844e4b9a49d33781d91f5b14af";
@@ -31019,6 +34786,7 @@ tl: { # no indentation
   version = "2.1";
 };
 "zlmtt" = {
+  revision = 51368;
   stripPrefix = 0;
   sha512.run = "b60e880508e08fc0a3f265b7d85c7ae8667c0a16264148a2944184a598f690f337149348157dc7b7b11f1cac59d44117425b50a26bbdaa0fbf1dcebb023093e6";
   sha512.doc = "22e301f72e0b62078d7b6fe7d7740e0477d9b18beb59ab55b81dd65c50cb250ae711886f01944cdfd25f82d0dd2089c41e662cb2f16eaa0252d70c1006eed8d8";
@@ -31026,6 +34794,7 @@ tl: { # no indentation
   version = "1.02";
 };
 "zootaxa-bst" = {
+  revision = 50619;
   stripPrefix = 0;
   sha512.run = "80816556a2e23cfd8345b7d22224142a5448105ccc5c1143f33c4560a4e4ab432115c2fc47c5d4c6ba599031f4c36b481465a5fa7b32afde888beac69a6e6c62";
   sha512.doc = "f843aa27ab0c2139e1051aefaa9b667f2de489cc13578200ce7db2bdfc2397888856c6cbe68b6fa201e0cb269bb95818cb31f1b03622c49ebdced23fa5960d65";
@@ -31033,6 +34802,7 @@ tl: { # no indentation
   version = "1.0";
 };
 "zref" = {
+  revision = 52980;
   stripPrefix = 0;
   sha512.run = "a4c944f78f4dd08e093a7b422983114fe335251f25fc9b9d2f64e08e725a05ab986729bc9b8a8eb7af5b6acf7490220fb5fe3ec7bf662583e1ddac09241291ec";
   sha512.doc = "4166217c06abecef648706304e3ed02cd43c29317d918fe3fc60873e0b12d074e5a4304d57496b8ab7f902d4eeb848c38e068eeeddba559b0fb5ec88e1f316db";
@@ -31041,12 +34811,14 @@ tl: { # no indentation
   version = "2.28";
 };
 "zwgetfdate" = {
+  revision = 15878;
   stripPrefix = 0;
   sha512.run = "fe52555cc46a9e8340d8c9c37f88b372bf72efbd48a097b2d319592dc49a8cf55c87e80ea7d94ba6730742e9883215703749895008ba38838750efb9fb2334e9";
   sha512.doc = "7ab61dc4252ef7f60d1d5be8d4415bcaeaed194384a1da14a3400617b36c6efae3679dbbd6c8d64b8cc9f9947babe88c064d637379f663408cbe63ca42334bfb";
   hasRunfiles = true;
 };
 "zwpagelayout" = {
+  revision = 53965;
   stripPrefix = 0;
   sha512.run = "b960d63e610cf28ff74d7ade9c297d1c6d23a801eaea2b4f9fde71a3b77defe43ea5625c098ded915b8c011cc0041177d3e4c3fb28359b522af63214accd362f";
   sha512.doc = "16bf8b249fbc857bfef787862b1d8e0e0ff60d11e2b80377ad85d7db014ece77ecdbca91829b4dd8f92c811712be39e9ba30058b8c7e61805552f7f6b13fc817";
@@ -31054,6 +34826,7 @@ tl: { # no indentation
   version = "1.4d";
 };
 "zxjafbfont" = {
+  revision = 28539;
   stripPrefix = 0;
   sha512.run = "357b100dac7061a5e6fe91e3a708f32e99a134158393581bc717ae3e90afa5dbbff7aa1bae8c092638bca2d5c3ab65d8a8cbc39c20c3ec1ff85c967fb3849513";
   sha512.doc = "215079eeb772dc4ea55d5e00945a757c877acf9ea56aebe5a8969564a3836f54ca406d502d73e93d92b131600fc77bd2342d36fa78300adc0b4d1dd7f5d0f423";
@@ -31061,6 +34834,7 @@ tl: { # no indentation
   version = "0.2";
 };
 "zxjafont" = {
+  revision = 53884;
   stripPrefix = 0;
   sha512.run = "bb6047e07b1d3c326cdee875809053b90b7e753078ae1e6c0b3cad19cb645e7e46321b07509f86b8d8dc2eb331be8e50588a2f9c926afd413aed20c99f4f6a40";
   sha512.doc = "c1cc759857b60c123ae798e1a9168f85e7fa663b875f241a8d5160b14cf366bcc282d09b9e527469986ee268b160cadc89a906facf8f38bd76ffb9d07e0a7ffa";
@@ -31068,6 +34842,7 @@ tl: { # no indentation
   version = "1.2";
 };
 "zxjatype" = {
+  revision = 53500;
   stripPrefix = 0;
   sha512.run = "21eaace7188c9e61f5dd65f34e26b1ca16358e7396d44188ae17e8e01a58f38ac3be9f09f8f41923c257d089210d1fb7d841eada5c9a345cec42b934d257ef94";
   sha512.doc = "0fccc73af66a05231cf8283920d65717600be4673329ed1f46b93a494d766aa9542deb1a56b5d23d6c0d6b93be98aa778234ddc2dcd9c0936542a45d057b6dc2";
diff --git a/pkgs/tools/typesetting/tex/texlive/tl2nix.sed b/pkgs/tools/typesetting/tex/texlive/tl2nix.sed
index 8c29c8e76ae4..2f30aa69fe2c 100644
--- a/pkgs/tools/typesetting/tex/texlive/tl2nix.sed
+++ b/pkgs/tools/typesetting/tex/texlive/tl2nix.sed
@@ -8,6 +8,9 @@ $a}
 # quote package names, as some start with a number :-/
 s/^name (.*)/name "\1"/
 
+# extract revision
+s/^revision ([0-9]*)$/  revision = \1;/p
+
 # form an attrmap per package
 /^name /s/^name (.*)/\1 = {/p
 /^$/,1i};

From 9f44a61f3915b70af023af3e7578c9a961a1e65f Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 12 Mar 2020 17:59:23 -0400
Subject: [PATCH 3174/4636] texlive: use versioned tarballs

Announced in [1], versioned tarballs allow to make sure that a
specific version is fetched. This does not guarantee that all previous
versions are retained on the main mirrors.

Logically, we would want to first try to download versioned tarballs
from any mirror and only then try the unversioned ones. But right now
we only have two mirrors and only some of the tarballs are versioned
in texlive-2019, so the order is changed to not hammer the weak
tug.org mirror.

[1] https://tug.org/pipermail/tex-live/2019-September/044086.html
---
 pkgs/tools/typesetting/tex/texlive/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 7b208e05593a..278e33c383a4 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -89,7 +89,7 @@ let
     };
 
   # create a derivation that contains an unpacked upstream TL package
-  mkPkg = { pname, tlType, version, sha512, postUnpack ? "", stripPrefix ? 1, ... }@args:
+  mkPkg = { pname, tlType, revision, version, sha512, postUnpack ? "", stripPrefix ? 1, ... }@args:
     let
       # the basename used by upstream (without ".tar.xz" suffix)
       urlName = pname + lib.optionalString (tlType != "run") ".${tlType}";
@@ -97,8 +97,12 @@ let
       fixedHash = fixedHashes.${tlName} or null; # be graceful about missing hashes
 
       urls = args.urls or (if args ? url then [ args.url ] else
-              map (up: "${up}/${urlName}.tar.xz") urlPrefixes
-            );
+        lib.concatMap
+          (up: [
+            "${up}/${urlName}.r${toString revision}.tar.xz"
+            "${up}/${urlName}.tar.xz" # TODO To be removed for telive 2020
+          ])
+          urlPrefixes);
 
       # The tarballs on CTAN mirrors for the current release are constantly
       # receiving updates, so we can't use those directly. Stable snapshots

From c5f663ff306f3aca35d1edf1a2bf82dd0e347117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 15 Mar 2020 20:17:03 +0100
Subject: [PATCH 3175/4636] gcc8: 8.3.0 -> 8.4.0

https://gcc.gnu.org/legacy-ml/gcc/2020-03/msg00042.html
---
 pkgs/development/compilers/gcc/8/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index c6b785f84a4e..58248093d24d 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -43,7 +43,7 @@ with stdenv.lib;
 with builtins;
 
 let majorVersion = "8";
-    version = "${majorVersion}.3.0";
+    version = "${majorVersion}.4.0";
 
     inherit (stdenv) buildPlatform hostPlatform targetPlatform;
 
@@ -77,7 +77,7 @@ stdenv.mkDerivation ({
 
   src = fetchurl {
     url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
-    sha256 = "0b3xv411xhlnjmin2979nxcbnidgvzqdf4nbhix99x60dkzavfk4";
+    sha256 = "1m1d3gfix56w4aq8myazzfffkl8bqcrx4jhhapnjf7qfs596w2p3";
   };
 
   inherit patches;

From f241aa6910450c3a54c8cf5bf0c501f72e09dcef Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Sun, 15 Mar 2020 19:50:00 +0000
Subject: [PATCH 3176/4636] soundtracker: init at 1.0.0.1 (#82057)

---
 .../audio/soundtracker/default.nix            | 51 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/applications/audio/soundtracker/default.nix

diff --git a/pkgs/applications/audio/soundtracker/default.nix b/pkgs/applications/audio/soundtracker/default.nix
new file mode 100644
index 000000000000..ce73203c9590
--- /dev/null
+++ b/pkgs/applications/audio/soundtracker/default.nix
@@ -0,0 +1,51 @@
+{ stdenv
+, fetchurl
+, pkg-config
+, autoconf
+, gtk2
+, alsaLib
+, SDL
+, jack2
+, goocanvas # graphical envelope editing
+}:
+
+stdenv.mkDerivation rec {
+  pname = "soundtracker";
+  version = "1.0.0.1";
+
+  src = fetchurl {
+    # Past releases get moved to the "old releases" directory.
+    # Only the latest release (currently a prerelease) is at the top level.
+    url = "mirror://sourceforge/soundtracker/old%20releases/soundtracker-${version}.tar.bz2";
+    sha256 = "1ggliswz5ngmlnrnyhv3x1arh5w77an0ww9p53cddp9aas5q11jm";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    autoconf
+  ];
+  buildInputs = [
+    gtk2
+    SDL
+    jack2
+    goocanvas
+  ] ++ stdenv.lib.optional stdenv.isLinux alsaLib;
+
+  meta = with stdenv.lib; {
+    description = "A music tracking tool similar in design to the DOS program FastTracker and the Amiga legend ProTracker";
+    longDescription = ''
+      SoundTracker is a pattern-oriented music editor (similar to the DOS
+      program 'FastTracker'). Samples are lined up on tracks and patterns
+      which are then arranged to a song. Supported module formats are XM and
+      MOD; the player code is the one from OpenCP. A basic sample recorder
+      and editor is also included.
+    '';
+    homepage = "http://www.soundtracker.org/";
+    downloadPage = "https://sourceforge.net/projects/soundtracker/files/";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ fgaz ];
+    platforms = platforms.all;
+    # gdk/gdkx.h not found
+    broken = stdenv.isDarwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf811a543850..2e1244f84bac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21543,6 +21543,8 @@ in
 
   sound-juicer = callPackage ../applications/audio/sound-juicer { };
 
+  soundtracker = callPackage ../applications/audio/soundtracker { };
+
   spice-vdagent = callPackage ../applications/virtualization/spice-vdagent { };
 
   spike = callPackage ../applications/virtualization/spike { };

From 3951e718b8cc8ef1f07028a4ea231ae05fb21d0d Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 15 Mar 2020 22:05:27 +0100
Subject: [PATCH 3177/4636] postgresqlPackages.repmgr: 4.4.0 -> 5.0.0

---
 pkgs/servers/sql/postgresql/ext/repmgr.nix | 29 ++++++++++++++--------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix
index 6dc3be727c65..b0d3b5bead5e 100644
--- a/pkgs/servers/sql/postgresql/ext/repmgr.nix
+++ b/pkgs/servers/sql/postgresql/ext/repmgr.nix
@@ -1,26 +1,35 @@
-{ stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }:
+{ stdenv, fetchFromGitHub
+, postgresql
+, openssl
+, zlib
+, readline
+, flex
+}:
 
 stdenv.mkDerivation rec {
   pname = "repmgr";
-  version = "4.4.0";
+  version = "5.0.0";
 
   src = fetchFromGitHub {
     owner = "2ndQuadrant";
     repo = "repmgr";
     rev = "v${version}";
-    sha256 = "185789f7igvlqyqcb8kf42jjq8g0wbs2aqd9kimrq5kf4srwgpim";
+    hash = "sha256-1CshcutjgwWCRxBfjlNGDLKMT5BYqb+sh4i+/E/YN38=";
   };
 
-  installPhase = ''
-    mkdir -p $out/{lib,share/postgresql/extension}
-
-    cp *.so      $out/lib
-    cp *.sql     $out/share/postgresql/extension
-    cp *.control $out/share/postgresql/extension
-  '';
+  nativeBuildInputs = [ flex ];
 
   buildInputs = [ postgresql openssl zlib readline ];
 
+  installPhase = ''
+    mkdir -p $out/{bin,lib,share/postgresql/extension}
+
+    cp repmgr{,d} $out/bin
+    cp *.so       $out/lib
+    cp *.sql      $out/share/postgresql/extension
+    cp *.control  $out/share/postgresql/extension
+  '';
+
   meta = with stdenv.lib; {
     homepage = "https://repmgr.org/";
     description = "Replication manager for PostgreSQL cluster";

From 9729f30667ccc471e5570d4d282cfeb226000220 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 15 Mar 2020 22:09:39 +0100
Subject: [PATCH 3178/4636] aircrack-ng: 1.5.2 -> 1.6

---
 pkgs/tools/networking/aircrack-ng/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix
index 9d948eaf8221..e1b5f9827272 100644
--- a/pkgs/tools/networking/aircrack-ng/default.nix
+++ b/pkgs/tools/networking/aircrack-ng/default.nix
@@ -3,18 +3,18 @@
 , autoreconfHook, usbutils }:
 
 stdenv.mkDerivation rec {
-  name = "aircrack-ng-1.5.2";
+  name = "aircrack-ng-1.6";
 
   src = fetchurl {
     url = "https://download.aircrack-ng.org/${name}.tar.gz";
-    sha256 = "0hc2x17bxk2n00z8jj5jfwq3z41681fd19n018724il0cpkjyncy";
+    sha256 = "0ix2k64qg7x3w0bzdsbk1m50kcpq1ws59g3zkwiafvpwdr4gs2sg";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper autoreconfHook ];
   buildInputs = [ libpcap openssl zlib libnl iw ethtool pciutils ];
 
   patchPhase = ''
-    sed -e 's@/usr/local/bin@'${wirelesstools}@ -i src/aircrack-osdep/linux.c
+    sed -e 's@/usr/local/bin@'${wirelesstools}@ -i lib/osdep/linux.c
   '';
 
   postFixup = ''

From 46c80bfee65a4f75638ba8695e9ba06102f756c7 Mon Sep 17 00:00:00 2001
From: ysengrimm <ysengrimm@grimmbart.org>
Date: Sun, 15 Mar 2020 22:32:17 +0100
Subject: [PATCH 3179/4636] quicklisp: 2017-03-06 -> 2019-02-16

---
 pkgs/development/lisp-modules/lisp-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index d9478c60db88..9121bc1f0b43 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -8,7 +8,7 @@ let lispPackages = rec {
 
   quicklisp = buildLispPackage rec {
     baseName = "quicklisp";
-    version = "2017-03-06";
+    version = "2019-02-16";
 
     buildSystems = [];
 
@@ -17,7 +17,7 @@ let lispPackages = rec {
     src = pkgs.fetchgit {
       url = "https://github.com/quicklisp/quicklisp-client/";
       rev = "refs/tags/version-${version}";
-      sha256 = "11ywk7ggc1axivpbqvrd7m1lxsj4yp38d1h9w1d8i9qnn7zjpqj4";
+      sha256 = "0x9b4vf36n2hh102gqgjxg5f5ymxcr9j5khn4rskjdprfgd8d1y9";
     };
     overrides = x: rec {
       inherit clwrapper;

From 43e76027b99e82e02d6b722876ad6bf38c1df96f Mon Sep 17 00:00:00 2001
From: ysengrimm <ysengrimm@grimmbart.org>
Date: Sun, 15 Mar 2020 22:34:16 +0100
Subject: [PATCH 3180/4636] lispPackages: update distinfo

---
 .../lisp-modules/lisp-packages.nix            |  4 +-
 .../quicklisp-to-nix-output/alexandria.nix    | 14 ++---
 .../quicklisp-to-nix-output/anaphora.nix      | 14 ++---
 .../quicklisp-to-nix-output/babel.nix         | 14 ++---
 .../bordeaux-threads.nix                      | 14 ++---
 .../quicklisp-to-nix-output/caveman.nix       | 36 +++++------
 .../quicklisp-to-nix-output/cl-async-repl.nix | 14 ++---
 .../quicklisp-to-nix-output/cl-async-ssl.nix  | 14 ++---
 .../quicklisp-to-nix-output/cl-async.nix      | 14 ++---
 .../cl-change-case.nix                        | 31 ++++++++++
 .../quicklisp-to-nix-output/cl-cookie.nix     | 14 ++---
 .../quicklisp-to-nix-output/cl-dbi.nix        | 14 ++---
 .../quicklisp-to-nix-output/cl-fad.nix        | 14 ++---
 .../quicklisp-to-nix-output/cl-fuse.nix       | 14 ++---
 .../quicklisp-to-nix-output/cl-pdf.nix        | 14 ++---
 .../quicklisp-to-nix-output/cl-postgres.nix   | 14 ++---
 .../quicklisp-to-nix-output/cl-prevalence.nix | 14 ++---
 .../quicklisp-to-nix-output/cl-smtp.nix       | 14 ++---
 .../quicklisp-to-nix-output/cl-store.nix      | 14 ++---
 .../quicklisp-to-nix-output/cl_plus_ssl.nix   | 14 ++---
 .../clack-handler-hunchentoot.nix             | 14 ++---
 .../quicklisp-to-nix-output/clack-socket.nix  | 14 ++---
 .../quicklisp-to-nix-output/clack-test.nix    | 54 ++++++++---------
 .../clack-v1-compat.nix                       | 59 +++++++++----------
 .../quicklisp-to-nix-output/clack.nix         | 14 ++---
 .../quicklisp-to-nix-output/closer-mop.nix    | 14 ++---
 .../quicklisp-to-nix-output/clss.nix          | 14 ++---
 .../quicklisp-to-nix-output/clx.nix           | 14 ++---
 .../command-line-arguments.nix                | 14 ++---
 .../quicklisp-to-nix-output/dbd-mysql.nix     | 14 ++---
 .../quicklisp-to-nix-output/dbd-postgres.nix  | 14 ++---
 .../quicklisp-to-nix-output/dbd-sqlite3.nix   | 14 ++---
 .../quicklisp-to-nix-output/dbi.nix           | 14 ++---
 .../quicklisp-to-nix-output/dexador.nix       | 14 ++---
 .../quicklisp-to-nix-output/dissect.nix       | 25 ++++++++
 .../quicklisp-to-nix-output/drakma.nix        | 14 ++---
 .../quicklisp-to-nix-output/esrap-peg.nix     | 14 ++---
 .../quicklisp-to-nix-output/esrap.nix         | 14 ++---
 .../quicklisp-to-nix-output/fast-http.nix     | 14 ++---
 .../quicklisp-to-nix-output/fiasco.nix        | 14 ++---
 .../quicklisp-to-nix-output/http-body.nix     | 14 ++---
 .../quicklisp-to-nix-output/ironclad.nix      | 14 ++---
 .../lack-component.nix                        | 14 ++---
 .../lack-middleware-backtrace.nix             | 14 ++---
 .../quicklisp-to-nix-output/lack-util.nix     | 14 ++---
 .../quicklisp-to-nix-output/lack.nix          | 14 ++---
 .../quicklisp-to-nix-output/let-plus.nix      | 14 ++---
 .../quicklisp-to-nix-output/log4cl.nix        | 14 ++---
 .../quicklisp-to-nix-output/metabang-bind.nix | 14 ++---
 .../quicklisp-to-nix-output/proc-parse.nix    | 14 ++---
 .../quicklisp-to-nix-output/quri.nix          | 14 ++---
 .../quicklisp-to-nix-output/rove.nix          | 29 +++++++++
 .../quicklisp-to-nix-output/serapeum.nix      | 14 ++---
 .../quicklisp-to-nix-output/simple-date.nix   | 14 ++---
 .../quicklisp-to-nix-output/sqlite.nix        | 19 +++---
 .../static-vectors.nix                        | 14 ++---
 .../quicklisp-to-nix-output/str.nix           | 24 +++++---
 .../quicklisp-to-nix-output/stumpwm.nix       | 14 ++---
 .../quicklisp-to-nix-output/swap-bytes.nix    | 14 ++---
 .../quicklisp-to-nix-output/trivia.nix        | 14 ++---
 .../trivia_dot_balland2006.nix                | 14 ++---
 .../trivia_dot_level0.nix                     | 14 ++---
 .../trivia_dot_level1.nix                     | 14 ++---
 .../trivia_dot_level2.nix                     | 14 ++---
 .../trivia_dot_quasiquote.nix                 | 14 ++---
 .../trivia_dot_trivial.nix                    | 14 ++---
 .../trivial-indent.nix                        | 14 ++---
 .../quicklisp-to-nix-output/type-i.nix        | 14 ++---
 .../quicklisp-to-nix-output/usocket.nix       | 14 ++---
 .../quicklisp-to-nix-output/woo.nix           | 14 ++---
 .../quicklisp-to-nix-output/wookie.nix        | 14 ++---
 .../quicklisp-to-nix-output/xembed.nix        | 14 ++---
 .../quicklisp-to-nix-output/yason.nix         | 14 ++---
 .../lisp-modules/quicklisp-to-nix.nix         | 51 ++++++++++++----
 74 files changed, 674 insertions(+), 554 deletions(-)
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix

diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index 9121bc1f0b43..e6840e93bf35 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -24,8 +24,8 @@ let lispPackages = rec {
       quicklispdist = pkgs.fetchurl {
         # Will usually be replaced with a fresh version anyway, but needs to be
         # a valid distinfo.txt
-        url = "https://beta.quicklisp.org/dist/quicklisp/2019-07-11/distinfo.txt";
-        sha256 = "0r7ga5gkiy6va1v7a01fnj1yp97pifl9v8fnqpvbiv33dwdvbx2w";
+        url = "https://beta.quicklisp.org/dist/quicklisp/2019-12-27/distinfo.txt";
+        sha256 = "0fz0k7ydmddxvxyid0nkifap21n6bxap602qhqsac2dxglv3i4cs";
       };
       buildPhase = '' true; '';
       postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
index 3ed0c3eca784..1bbd82ba536b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''alexandria'';
-  version = ''20190710-git'';
+  version = ''20191227-git'';
 
   description = ''Alexandria is a collection of portable public domain utilities.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/alexandria/2019-07-10/alexandria-20190710-git.tgz'';
-    sha256 = ''0127d5yyq46dpffvr4hla6d3ryiml48mxd2r6cgbg3mgz3b2nr70'';
+    url = ''http://beta.quicklisp.org/archive/alexandria/2019-12-27/alexandria-20191227-git.tgz'';
+    sha256 = ''1vq19i7mcx3dk8vd8l92ld33birs9qhwcs7hbwwphvrwsrxbnd89'';
   };
 
   packageName = "alexandria";
@@ -19,8 +19,8 @@ rec {
 }
 /* (SYSTEM alexandria DESCRIPTION
     Alexandria is a collection of portable public domain utilities. SHA256
-    0127d5yyq46dpffvr4hla6d3ryiml48mxd2r6cgbg3mgz3b2nr70 URL
-    http://beta.quicklisp.org/archive/alexandria/2019-07-10/alexandria-20190710-git.tgz
-    MD5 2b5abc0a266aeafe9029bf26db90b292 NAME alexandria FILENAME alexandria
-    DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS (alexandria-tests)
+    1vq19i7mcx3dk8vd8l92ld33birs9qhwcs7hbwwphvrwsrxbnd89 URL
+    http://beta.quicklisp.org/archive/alexandria/2019-12-27/alexandria-20191227-git.tgz
+    MD5 634105318a9c82a2a2729d0305c91667 NAME alexandria FILENAME alexandria
+    DEPS NIL DEPENDENCIES NIL VERSION 20191227-git SIBLINGS (alexandria-tests)
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
index 61a07c61ca07..9af6ed369800 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''anaphora'';
-  version = ''20180228-git'';
+  version = ''20191007-git'';
 
   parasites = [ "anaphora/test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."rt" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/anaphora/2018-02-28/anaphora-20180228-git.tgz'';
-    sha256 = ''1bd2mvrxdf460wqrmg93lrvrjzvhbxjq8fcpvh24afx6573g2d41'';
+    url = ''http://beta.quicklisp.org/archive/anaphora/2019-10-07/anaphora-20191007-git.tgz'';
+    sha256 = ''0iwfddh3cycjr9vhjnr1ldd5xc3qwqhrp41904s1dvysf99277kv'';
   };
 
   packageName = "anaphora";
@@ -20,8 +20,8 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM anaphora DESCRIPTION The Anaphoric Macro Package from Hell SHA256
-    1bd2mvrxdf460wqrmg93lrvrjzvhbxjq8fcpvh24afx6573g2d41 URL
-    http://beta.quicklisp.org/archive/anaphora/2018-02-28/anaphora-20180228-git.tgz
-    MD5 a884be2d820c0bc7dc59dea7ffd72731 NAME anaphora FILENAME anaphora DEPS
-    ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20180228-git SIBLINGS NIL
+    0iwfddh3cycjr9vhjnr1ldd5xc3qwqhrp41904s1dvysf99277kv URL
+    http://beta.quicklisp.org/archive/anaphora/2019-10-07/anaphora-20191007-git.tgz
+    MD5 bfaae44cfb6226f35f0afde335e51ca4 NAME anaphora FILENAME anaphora DEPS
+    ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20191007-git SIBLINGS NIL
     PARASITES (anaphora/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
index 4cba3e86e068..661a337da845 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''babel'';
-  version = ''20171227-git'';
+  version = ''20191130-git'';
 
   description = ''Babel, a charset conversion library.'';
 
   deps = [ args."alexandria" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/babel/2017-12-27/babel-20171227-git.tgz'';
-    sha256 = ''166y6j9ma1vxzy5bcwnbi37zwgn2zssx5x1q7zr63kyj2caiw2rf'';
+    url = ''http://beta.quicklisp.org/archive/babel/2019-11-30/babel-20191130-git.tgz'';
+    sha256 = ''0rnb7waq3fi51g2fxrazkyr2fmksqp0syjhni005vzzlbykmkavd'';
   };
 
   packageName = "babel";
@@ -18,10 +18,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM babel DESCRIPTION Babel, a charset conversion library. SHA256
-    166y6j9ma1vxzy5bcwnbi37zwgn2zssx5x1q7zr63kyj2caiw2rf URL
-    http://beta.quicklisp.org/archive/babel/2017-12-27/babel-20171227-git.tgz
-    MD5 8ea39f73873847907a8bb67f99f16ecd NAME babel FILENAME babel DEPS
+    0rnb7waq3fi51g2fxrazkyr2fmksqp0syjhni005vzzlbykmkavd URL
+    http://beta.quicklisp.org/archive/babel/2019-11-30/babel-20191130-git.tgz
+    MD5 80087c99fe351d24e56bb279a62effeb NAME babel FILENAME babel DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME trivial-features FILENAME trivial-features))
-    DEPENDENCIES (alexandria trivial-features) VERSION 20171227-git SIBLINGS
+    DEPENDENCIES (alexandria trivial-features) VERSION 20191130-git SIBLINGS
     (babel-streams babel-tests) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
index c5305587a029..d53e238df82d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''bordeaux-threads'';
-  version = ''v0.8.6'';
+  version = ''v0.8.7'';
 
   parasites = [ "bordeaux-threads/test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2018-07-11/bordeaux-threads-v0.8.6.tgz'';
-    sha256 = ''1q3b9dbyz02g6iav5rvzml7c8r0iad9j5kipgwkxj0b8qijjzr1y'';
+    url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2019-11-30/bordeaux-threads-v0.8.7.tgz'';
+    sha256 = ''1an8fgam16nyhfninm0gl8k666f93k9j7kwmg43g8qcimyaj3l6w'';
   };
 
   packageName = "bordeaux-threads";
@@ -21,10 +21,10 @@ rec {
 }
 /* (SYSTEM bordeaux-threads DESCRIPTION
     Bordeaux Threads makes writing portable multi-threaded apps simple. SHA256
-    1q3b9dbyz02g6iav5rvzml7c8r0iad9j5kipgwkxj0b8qijjzr1y URL
-    http://beta.quicklisp.org/archive/bordeaux-threads/2018-07-11/bordeaux-threads-v0.8.6.tgz
-    MD5 f959d3902694b1fe6de450a854040f86 NAME bordeaux-threads FILENAME
+    1an8fgam16nyhfninm0gl8k666f93k9j7kwmg43g8qcimyaj3l6w URL
+    http://beta.quicklisp.org/archive/bordeaux-threads/2019-11-30/bordeaux-threads-v0.8.7.tgz
+    MD5 071b427dd047999ffe038a2ef848ac13 NAME bordeaux-threads FILENAME
     bordeaux-threads DEPS
     ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam))
-    DEPENDENCIES (alexandria fiveam) VERSION v0.8.6 SIBLINGS NIL PARASITES
+    DEPENDENCIES (alexandria fiveam) VERSION v0.8.7 SIBLINGS NIL PARASITES
     (bordeaux-threads/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
index 6cf810707343..30b21ee93d2b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''caveman'';
-  version = ''20181210-git'';
+  version = ''20190813-git'';
 
   description = ''Web Application Framework for Common Lisp'';
 
-  deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."clack-v1-compat" args."dexador" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."map-set" args."marshal" args."md5" args."myway" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
+  deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."clack-v1-compat" args."dexador" args."dissect" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."map-set" args."marshal" args."md5" args."myway" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/caveman/2018-12-10/caveman-20181210-git.tgz'';
-    sha256 = ''04b5dhmdwcwpdcjk4bk25fmqx786k7g3iqsk1xc35kvsxi9ykldf'';
+    url = ''http://beta.quicklisp.org/archive/caveman/2019-08-13/caveman-20190813-git.tgz'';
+    sha256 = ''017b3g3vm28awv8s68rwkwri7yq31a6lgdd7114ziis2a9fq9hyd'';
   };
 
   packageName = "caveman";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256
-    04b5dhmdwcwpdcjk4bk25fmqx786k7g3iqsk1xc35kvsxi9ykldf URL
-    http://beta.quicklisp.org/archive/caveman/2018-12-10/caveman-20181210-git.tgz
-    MD5 d3192b79636901bb0676681fc5d05748 NAME caveman FILENAME caveman DEPS
+    017b3g3vm28awv8s68rwkwri7yq31a6lgdd7114ziis2a9fq9hyd URL
+    http://beta.quicklisp.org/archive/caveman/2019-08-13/caveman-20190813-git.tgz
+    MD5 09d7223fd528757eaf1285dd99105ed6 NAME caveman FILENAME caveman DEPS
     ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
      (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -42,7 +42,8 @@ rec {
      (NAME clack-socket FILENAME clack-socket)
      (NAME clack-test FILENAME clack-test)
      (NAME clack-v1-compat FILENAME clack-v1-compat)
-     (NAME dexador FILENAME dexador) (NAME do-urlencode FILENAME do-urlencode)
+     (NAME dexador FILENAME dexador) (NAME dissect FILENAME dissect)
+     (NAME do-urlencode FILENAME do-urlencode)
      (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io)
      (NAME flexi-streams FILENAME flexi-streams)
      (NAME http-body FILENAME http-body)
@@ -57,7 +58,8 @@ rec {
      (NAME named-readtables FILENAME named-readtables)
      (NAME nibbles FILENAME nibbles) (NAME proc-parse FILENAME proc-parse)
      (NAME prove FILENAME prove) (NAME quri FILENAME quri)
-     (NAME rfc2388 FILENAME rfc2388) (NAME smart-buffer FILENAME smart-buffer)
+     (NAME rfc2388 FILENAME rfc2388) (NAME rove FILENAME rove)
+     (NAME smart-buffer FILENAME smart-buffer)
      (NAME split-sequence FILENAME split-sequence)
      (NAME static-vectors FILENAME static-vectors)
      (NAME trivial-backtrace FILENAME trivial-backtrace)
@@ -72,14 +74,14 @@ rec {
      chipz chunga circular-streams cl+ssl cl-annot cl-ansi-text cl-base64
      cl-colors cl-cookie cl-emb cl-fad cl-ppcre cl-project cl-reexport
      cl-syntax cl-syntax-annot cl-utilities clack clack-handler-hunchentoot
-     clack-socket clack-test clack-v1-compat dexador do-urlencode fast-http
-     fast-io flexi-streams http-body hunchentoot ironclad jonathan lack
-     lack-component lack-middleware-backtrace lack-util let-plus local-time
-     map-set marshal md5 myway named-readtables nibbles proc-parse prove quri
-     rfc2388 smart-buffer split-sequence static-vectors trivial-backtrace
-     trivial-features trivial-garbage trivial-gray-streams trivial-mimes
-     trivial-types usocket xsubseq)
-    VERSION 20181210-git SIBLINGS
+     clack-socket clack-test clack-v1-compat dexador dissect do-urlencode
+     fast-http fast-io flexi-streams http-body hunchentoot ironclad jonathan
+     lack lack-component lack-middleware-backtrace lack-util let-plus
+     local-time map-set marshal md5 myway named-readtables nibbles proc-parse
+     prove quri rfc2388 rove smart-buffer split-sequence static-vectors
+     trivial-backtrace trivial-features trivial-garbage trivial-gray-streams
+     trivial-mimes trivial-types usocket xsubseq)
+    VERSION 20190813-git SIBLINGS
     (caveman-middleware-dbimanager caveman-test caveman2-db caveman2-test
      caveman2)
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
index d84233c43424..401ad78aa091 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-async-repl'';
-  version = ''cl-async-20190307-git'';
+  version = ''cl-async-20191130-git'';
 
   description = ''REPL integration for CL-ASYNC.'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz'';
-    sha256 = ''1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6'';
+    url = ''http://beta.quicklisp.org/archive/cl-async/2019-11-30/cl-async-20191130-git.tgz'';
+    sha256 = ''01kadvflif18f4i2l8iwx9jpg9543hrxagv4ad4q1k9500078vv2'';
   };
 
   packageName = "cl-async-repl";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256
-    1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6 URL
-    http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz
-    MD5 ead46ad0e709ce26489eb8b239bdbd0e NAME cl-async-repl FILENAME
+    01kadvflif18f4i2l8iwx9jpg9543hrxagv4ad4q1k9500078vv2 URL
+    http://beta.quicklisp.org/archive/cl-async/2019-11-30/cl-async-20191130-git.tgz
+    MD5 3850bc827b4c41b6047b962e3892bcb2 NAME cl-async-repl FILENAME
     cl-async-repl DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -39,5 +39,5 @@ rec {
     (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async
      cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors
      trivial-features trivial-gray-streams vom)
-    VERSION cl-async-20190307-git SIBLINGS
+    VERSION cl-async-20191130-git SIBLINGS
     (cl-async-ssl cl-async-test cl-async) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
index c13b8b70647d..73bbce5709ea 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-async-ssl'';
-  version = ''cl-async-20190307-git'';
+  version = ''cl-async-20191130-git'';
 
   description = ''SSL Wrapper around cl-async socket implementation.'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz'';
-    sha256 = ''1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6'';
+    url = ''http://beta.quicklisp.org/archive/cl-async/2019-11-30/cl-async-20191130-git.tgz'';
+    sha256 = ''01kadvflif18f4i2l8iwx9jpg9543hrxagv4ad4q1k9500078vv2'';
   };
 
   packageName = "cl-async-ssl";
@@ -19,9 +19,9 @@ rec {
 }
 /* (SYSTEM cl-async-ssl DESCRIPTION
     SSL Wrapper around cl-async socket implementation. SHA256
-    1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6 URL
-    http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz
-    MD5 ead46ad0e709ce26489eb8b239bdbd0e NAME cl-async-ssl FILENAME
+    01kadvflif18f4i2l8iwx9jpg9543hrxagv4ad4q1k9500078vv2 URL
+    http://beta.quicklisp.org/archive/cl-async/2019-11-30/cl-async-20191130-git.tgz
+    MD5 3850bc827b4c41b6047b962e3892bcb2 NAME cl-async-ssl FILENAME
     cl-async-ssl DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -40,5 +40,5 @@ rec {
     (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async
      cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors
      trivial-features trivial-gray-streams vom)
-    VERSION cl-async-20190307-git SIBLINGS
+    VERSION cl-async-20191130-git SIBLINGS
     (cl-async-repl cl-async-test cl-async) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
index 363227534a8b..1346431f6fb7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-async'';
-  version = ''20190307-git'';
+  version = ''20191130-git'';
 
   parasites = [ "cl-async-base" "cl-async-util" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz'';
-    sha256 = ''1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6'';
+    url = ''http://beta.quicklisp.org/archive/cl-async/2019-11-30/cl-async-20191130-git.tgz'';
+    sha256 = ''01kadvflif18f4i2l8iwx9jpg9543hrxagv4ad4q1k9500078vv2'';
   };
 
   packageName = "cl-async";
@@ -20,9 +20,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256
-    1sgqdz1dqhknh92l39w67931kml6v9c5yj0brx7lb18l1z76ycw6 URL
-    http://beta.quicklisp.org/archive/cl-async/2019-03-07/cl-async-20190307-git.tgz
-    MD5 ead46ad0e709ce26489eb8b239bdbd0e NAME cl-async FILENAME cl-async DEPS
+    01kadvflif18f4i2l8iwx9jpg9543hrxagv4ad4q1k9500078vv2 URL
+    http://beta.quicklisp.org/archive/cl-async/2019-11-30/cl-async-20191130-git.tgz
+    MD5 3850bc827b4c41b6047b962e3892bcb2 NAME cl-async FILENAME cl-async DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -37,5 +37,5 @@ rec {
     (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-libuv
      cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams uiop
      vom)
-    VERSION 20190307-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)
+    VERSION 20191130-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)
     PARASITES (cl-async-base cl-async-util)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix
new file mode 100644
index 000000000000..158158fefad6
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-change-case.nix
@@ -0,0 +1,31 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-change-case'';
+  version = ''20191007-git'';
+
+  description = ''Convert strings between camelCase, param-case, PascalCase and more'';
+
+  deps = [ args."cl-ppcre" args."cl-ppcre-unicode" args."cl-unicode" args."flexi-streams" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-change-case/2019-10-07/cl-change-case-20191007-git.tgz'';
+    sha256 = ''097n7bzlsryqh6gbwn3nzi9qdw4jhck4vn3qw41zpc496xfgz9y1'';
+  };
+
+  packageName = "cl-change-case";
+
+  asdFilesToKeep = ["cl-change-case.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM cl-change-case DESCRIPTION
+    Convert strings between camelCase, param-case, PascalCase and more SHA256
+    097n7bzlsryqh6gbwn3nzi9qdw4jhck4vn3qw41zpc496xfgz9y1 URL
+    http://beta.quicklisp.org/archive/cl-change-case/2019-10-07/cl-change-case-20191007-git.tgz
+    MD5 385245df04b1f1514b9fd709a08c4082 NAME cl-change-case FILENAME
+    cl-change-case DEPS
+    ((NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-ppcre-unicode FILENAME cl-ppcre-unicode)
+     (NAME cl-unicode FILENAME cl-unicode)
+     (NAME flexi-streams FILENAME flexi-streams))
+    DEPENDENCIES (cl-ppcre cl-ppcre-unicode cl-unicode flexi-streams) VERSION
+    20191007-git SIBLINGS (cl-change-case-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
index a3aacd0aa8bd..5a03d4df4f9d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-cookie'';
-  version = ''20150804-git'';
+  version = ''20191007-git'';
 
   description = ''HTTP cookie manager'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."cl-ppcre" args."cl-utilities" args."local-time" args."proc-parse" args."quri" args."split-sequence" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-cookie/2015-08-04/cl-cookie-20150804-git.tgz'';
-    sha256 = ''0llh5d2p7wi5amzpckng1bzmf2bdfdwkfapcdq0znqlzd5bvbby8'';
+    url = ''http://beta.quicklisp.org/archive/cl-cookie/2019-10-07/cl-cookie-20191007-git.tgz'';
+    sha256 = ''1xcb69n3qfp37nwj0mj2whf3yj5xfsgh9sdw6c64gxqkiiq9nfhh'';
   };
 
   packageName = "cl-cookie";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-cookie DESCRIPTION HTTP cookie manager SHA256
-    0llh5d2p7wi5amzpckng1bzmf2bdfdwkfapcdq0znqlzd5bvbby8 URL
-    http://beta.quicklisp.org/archive/cl-cookie/2015-08-04/cl-cookie-20150804-git.tgz
-    MD5 d2c08a71afd47b3ad42e1234ec1a3083 NAME cl-cookie FILENAME cl-cookie DEPS
+    1xcb69n3qfp37nwj0mj2whf3yj5xfsgh9sdw6c64gxqkiiq9nfhh URL
+    http://beta.quicklisp.org/archive/cl-cookie/2019-10-07/cl-cookie-20191007-git.tgz
+    MD5 37595a6705fdd77415b859aea90d30bc NAME cl-cookie FILENAME cl-cookie DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre)
@@ -32,4 +32,4 @@ rec {
     DEPENDENCIES
     (alexandria babel bordeaux-threads cl-fad cl-ppcre cl-utilities local-time
      proc-parse quri split-sequence trivial-features)
-    VERSION 20150804-git SIBLINGS (cl-cookie-test) PARASITES NIL) */
+    VERSION 20191007-git SIBLINGS (cl-cookie-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
index 9c2580210085..186d321f8343 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-dbi'';
-  version = ''20190521-git'';
+  version = ''20191007-git'';
 
   description = ''System lacks description'';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz'';
-    sha256 = ''1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-10-07/cl-dbi-20191007-git.tgz'';
+    sha256 = ''0xsg0xqq88wsx6wf8nllfd0mk356bw2qw3c5c31rfj41wz5vpx35'';
   };
 
   packageName = "cl-dbi";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-dbi DESCRIPTION System lacks description SHA256
-    1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL
-    http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz
-    MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME cl-dbi FILENAME cl-dbi DEPS
+    0xsg0xqq88wsx6wf8nllfd0mk356bw2qw3c5c31rfj41wz5vpx35 URL
+    http://beta.quicklisp.org/archive/cl-dbi/2019-10-07/cl-dbi-20191007-git.tgz
+    MD5 bf524c4000468d12627fa419ae412abb NAME cl-dbi FILENAME cl-dbi DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax)
@@ -32,5 +32,5 @@ rec {
     DEPENDENCIES
     (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop
      dbi named-readtables split-sequence trivial-types)
-    VERSION 20190521-git SIBLINGS
+    VERSION 20191007-git SIBLINGS
     (dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
index d032b4768dd6..fd715a17cec8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-fad'';
-  version = ''20180430-git'';
+  version = ''20190813-git'';
 
   parasites = [ "cl-fad-test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-ppcre" args."unit-test" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-fad/2018-04-30/cl-fad-20180430-git.tgz'';
-    sha256 = ''175v6y32q6qpc8axacf8nw44pmsw7a6r476w0f01cp1gwvpis1cs'';
+    url = ''http://beta.quicklisp.org/archive/cl-fad/2019-08-13/cl-fad-20190813-git.tgz'';
+    sha256 = ''0kixjb6cqpcmlac5mh4qjlnhjbww32f3pn89g0cnwvz952y8nlng'';
   };
 
   packageName = "cl-fad";
@@ -20,11 +20,11 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-fad DESCRIPTION Portable pathname library SHA256
-    175v6y32q6qpc8axacf8nw44pmsw7a6r476w0f01cp1gwvpis1cs URL
-    http://beta.quicklisp.org/archive/cl-fad/2018-04-30/cl-fad-20180430-git.tgz
-    MD5 005c1b7b376fc60dea72574d2acdc704 NAME cl-fad FILENAME cl-fad DEPS
+    0kixjb6cqpcmlac5mh4qjlnhjbww32f3pn89g0cnwvz952y8nlng URL
+    http://beta.quicklisp.org/archive/cl-fad/2019-08-13/cl-fad-20190813-git.tgz
+    MD5 7d0405b44fefccb8a807527249ee2700 NAME cl-fad FILENAME cl-fad DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cl-ppcre FILENAME cl-ppcre) (NAME unit-test FILENAME unit-test))
     DEPENDENCIES (alexandria bordeaux-threads cl-ppcre unit-test) VERSION
-    20180430-git SIBLINGS NIL PARASITES (cl-fad-test)) */
+    20190813-git SIBLINGS NIL PARASITES (cl-fad-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
index de71e2e299ad..a581c5a268bd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-fuse'';
-  version = ''20190710-git'';
+  version = ''20191227-git'';
 
   description = ''CFFI bindings to FUSE (Filesystem in user space)'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."iterate" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-fuse/2019-07-10/cl-fuse-20190710-git.tgz'';
-    sha256 = ''1gxah8qwwb9xlvbdy5xxz07hh2hsw7xdrps1n4slhz4x6vyy80li'';
+    url = ''http://beta.quicklisp.org/archive/cl-fuse/2019-12-27/cl-fuse-20191227-git.tgz'';
+    sha256 = ''1yvzixbbwmi87w9zwc1nf2xngxrb3a2q3sp4l2g3751hbd4i0m38'';
   };
 
   packageName = "cl-fuse";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-fuse DESCRIPTION CFFI bindings to FUSE (Filesystem in user space)
-    SHA256 1gxah8qwwb9xlvbdy5xxz07hh2hsw7xdrps1n4slhz4x6vyy80li URL
-    http://beta.quicklisp.org/archive/cl-fuse/2019-07-10/cl-fuse-20190710-git.tgz
-    MD5 5f267e59eb2358b1b6e4e735fb408e6a NAME cl-fuse FILENAME cl-fuse DEPS
+    SHA256 1yvzixbbwmi87w9zwc1nf2xngxrb3a2q3sp4l2g3751hbd4i0m38 URL
+    http://beta.quicklisp.org/archive/cl-fuse/2019-12-27/cl-fuse-20191227-git.tgz
+    MD5 3c6f85db7797a2890d8303d11595100d NAME cl-fuse FILENAME cl-fuse DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -32,4 +32,4 @@ rec {
     DEPENDENCIES
     (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain
      cl-utilities iterate trivial-backtrace trivial-features trivial-utf-8)
-    VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */
+    VERSION 20191227-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
index babdf04e3ec2..16bf7d3a6382 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-pdf'';
-  version = ''20170830-git'';
+  version = ''20191007-git'';
 
   description = ''Common Lisp PDF Generation Library'';
 
   deps = [ args."iterate" args."uiop" args."zpb-ttf" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-pdf/2017-08-30/cl-pdf-20170830-git.tgz'';
-    sha256 = ''1x4zk6l635f121p1anfd7d807iglyrlhsnmygydw5l49m3h6n08s'';
+    url = ''http://beta.quicklisp.org/archive/cl-pdf/2019-10-07/cl-pdf-20191007-git.tgz'';
+    sha256 = ''0l0hnxysy7dc4wj50nfwn8x7v188vaxvsvk8kl92zb92lfzgw7cd'';
   };
 
   packageName = "cl-pdf";
@@ -18,10 +18,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-pdf DESCRIPTION Common Lisp PDF Generation Library SHA256
-    1x4zk6l635f121p1anfd7d807iglyrlhsnmygydw5l49m3h6n08s URL
-    http://beta.quicklisp.org/archive/cl-pdf/2017-08-30/cl-pdf-20170830-git.tgz
-    MD5 f865503aff50c0a4732a7a4597bdcc25 NAME cl-pdf FILENAME cl-pdf DEPS
+    0l0hnxysy7dc4wj50nfwn8x7v188vaxvsvk8kl92zb92lfzgw7cd URL
+    http://beta.quicklisp.org/archive/cl-pdf/2019-10-07/cl-pdf-20191007-git.tgz
+    MD5 edde2f2da08ec10be65364737ed5fa5c NAME cl-pdf FILENAME cl-pdf DEPS
     ((NAME iterate FILENAME iterate) (NAME uiop FILENAME uiop)
      (NAME zpb-ttf FILENAME zpb-ttf))
-    DEPENDENCIES (iterate uiop zpb-ttf) VERSION 20170830-git SIBLINGS
+    DEPENDENCIES (iterate uiop zpb-ttf) VERSION 20191007-git SIBLINGS
     (cl-pdf-parser) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
index efd8197bbfb9..9ef0248157ab 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-postgres'';
-  version = ''postmodern-20190521-git'';
+  version = ''postmodern-20191227-git'';
 
   parasites = [ "cl-postgres/tests" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."fiveam" args."md5" args."split-sequence" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/postmodern/2019-05-21/postmodern-20190521-git.tgz'';
-    sha256 = ''1vphrizbhbs3r5rq4b8dh4149bz11h5xxilragwf4l2i619k3cp5'';
+    url = ''http://beta.quicklisp.org/archive/postmodern/2019-12-27/postmodern-20191227-git.tgz'';
+    sha256 = ''1p44aphx7y0lh018pk2r9w006vinc5yrfrp1m9l9648p2jxiw1c4'';
   };
 
   packageName = "cl-postgres";
@@ -20,13 +20,13 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL
-    SHA256 1vphrizbhbs3r5rq4b8dh4149bz11h5xxilragwf4l2i619k3cp5 URL
-    http://beta.quicklisp.org/archive/postmodern/2019-05-21/postmodern-20190521-git.tgz
-    MD5 102567f386757cd52aca500c0c348d90 NAME cl-postgres FILENAME cl-postgres
+    SHA256 1p44aphx7y0lh018pk2r9w006vinc5yrfrp1m9l9648p2jxiw1c4 URL
+    http://beta.quicklisp.org/archive/postmodern/2019-12-27/postmodern-20191227-git.tgz
+    MD5 67b909de432e6414e7832eed18f9ad18 NAME cl-postgres FILENAME cl-postgres
     DEPS
     ((NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5)
      (NAME split-sequence FILENAME split-sequence)
      (NAME usocket FILENAME usocket))
     DEPENDENCIES (fiveam md5 split-sequence usocket) VERSION
-    postmodern-20190521-git SIBLINGS (postmodern s-sql simple-date) PARASITES
+    postmodern-20191227-git SIBLINGS (postmodern s-sql simple-date) PARASITES
     (cl-postgres/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix
index 46805421fa7c..c6afca1d8ca5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-prevalence.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-prevalence'';
-  version = ''20190521-git'';
+  version = ''20191130-git'';
 
   description = ''Common Lisp Prevalence Package'';
 
   deps = [ args."s-sysdeps" args."s-xml" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-prevalence/2019-05-21/cl-prevalence-20190521-git.tgz'';
-    sha256 = ''16j7ccpjdidz1p6mgib06viy966ckxzgkd6xcvg96xmr4hkksljf'';
+    url = ''http://beta.quicklisp.org/archive/cl-prevalence/2019-11-30/cl-prevalence-20191130-git.tgz'';
+    sha256 = ''01pk77nhyv89zd9sf78i0gch9swxlaw3sqnjdnx4329ww6qv2sg4'';
   };
 
   packageName = "cl-prevalence";
@@ -18,10 +18,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-prevalence DESCRIPTION Common Lisp Prevalence Package SHA256
-    16j7ccpjdidz1p6mgib06viy966ckxzgkd6xcvg96xmr4hkksljf URL
-    http://beta.quicklisp.org/archive/cl-prevalence/2019-05-21/cl-prevalence-20190521-git.tgz
-    MD5 6c81a4fe41bd63eef9ff8f4cc41aa6b9 NAME cl-prevalence FILENAME
+    01pk77nhyv89zd9sf78i0gch9swxlaw3sqnjdnx4329ww6qv2sg4 URL
+    http://beta.quicklisp.org/archive/cl-prevalence/2019-11-30/cl-prevalence-20191130-git.tgz
+    MD5 7615cb79ec797a5520941aedc3101390 NAME cl-prevalence FILENAME
     cl-prevalence DEPS
     ((NAME s-sysdeps FILENAME s-sysdeps) (NAME s-xml FILENAME s-xml))
-    DEPENDENCIES (s-sysdeps s-xml) VERSION 20190521-git SIBLINGS
+    DEPENDENCIES (s-sysdeps s-xml) VERSION 20191130-git SIBLINGS
     (cl-prevalence-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
index 0d58e11b4d26..accb8a014c89 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-smtp'';
-  version = ''20190710-git'';
+  version = ''20191130-git'';
 
   description = ''Common Lisp smtp client.'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl_plus_ssl" args."cl-base64" args."flexi-streams" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-smtp/2019-07-10/cl-smtp-20190710-git.tgz'';
-    sha256 = ''1bx5jh5vl8slsgrl2w4yv7imiswl8nmknczzyj5bzm1bzk0hx52r'';
+    url = ''http://beta.quicklisp.org/archive/cl-smtp/2019-11-30/cl-smtp-20191130-git.tgz'';
+    sha256 = ''04x1xq1qlsnhl4wdi82l8ds6rl9rzxk72bjf2ja10jay1p6ljvdq'';
   };
 
   packageName = "cl-smtp";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-smtp DESCRIPTION Common Lisp smtp client. SHA256
-    1bx5jh5vl8slsgrl2w4yv7imiswl8nmknczzyj5bzm1bzk0hx52r URL
-    http://beta.quicklisp.org/archive/cl-smtp/2019-07-10/cl-smtp-20190710-git.tgz
-    MD5 f55956a4708d0b4fc2ba181063b73e92 NAME cl-smtp FILENAME cl-smtp DEPS
+    04x1xq1qlsnhl4wdi82l8ds6rl9rzxk72bjf2ja10jay1p6ljvdq URL
+    http://beta.quicklisp.org/archive/cl-smtp/2019-11-30/cl-smtp-20191130-git.tgz
+    MD5 880f09b9fd22e358d1b94a3caf3bd34b NAME cl-smtp FILENAME cl-smtp DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cl+ssl FILENAME cl_plus_ssl)
@@ -35,4 +35,4 @@ rec {
     (alexandria babel bordeaux-threads cffi cl+ssl cl-base64 flexi-streams
      split-sequence trivial-features trivial-garbage trivial-gray-streams
      usocket)
-    VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */
+    VERSION 20191130-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
index 2aff988dfd24..a160cef9e033 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-store'';
-  version = ''20180328-git'';
+  version = ''20191130-git'';
 
   parasites = [ "cl-store-tests" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."rt" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-store/2018-03-28/cl-store-20180328-git.tgz'';
-    sha256 = ''1r5fmmpjcshfqv43zv282kjsxxp0imxd2fdpwwcr7y7m256w660n'';
+    url = ''http://beta.quicklisp.org/archive/cl-store/2019-11-30/cl-store-20191130-git.tgz'';
+    sha256 = ''1pybx08w486d3bmn8fc6zxvxyprc3da24kk3wxhkrgh0fi1vmcbc'';
   };
 
   packageName = "cl-store";
@@ -20,8 +20,8 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-store DESCRIPTION Serialization package SHA256
-    1r5fmmpjcshfqv43zv282kjsxxp0imxd2fdpwwcr7y7m256w660n URL
-    http://beta.quicklisp.org/archive/cl-store/2018-03-28/cl-store-20180328-git.tgz
-    MD5 2f8831cb60c0b0575c65e1dbebc07dee NAME cl-store FILENAME cl-store DEPS
-    ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20180328-git SIBLINGS NIL
+    1pybx08w486d3bmn8fc6zxvxyprc3da24kk3wxhkrgh0fi1vmcbc URL
+    http://beta.quicklisp.org/archive/cl-store/2019-11-30/cl-store-20191130-git.tgz
+    MD5 d6052274cd0c6a86bfc2de1e4a8a0886 NAME cl-store FILENAME cl-store DEPS
+    ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20191130-git SIBLINGS NIL
     PARASITES (cl-store-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
index f344dbfa2fe8..4c9ff159d991 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl_plus_ssl'';
-  version = ''cl+ssl-20190710-git'';
+  version = ''cl+ssl-20191130-git'';
 
   description = ''Common Lisp interface to OpenSSL.'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl+ssl/2019-07-10/cl+ssl-20190710-git.tgz'';
-    sha256 = ''0lxyd8nryhk9f8gg0fksqf3y5lgbb7f61snsc3qzi5gplkdy0mzv'';
+    url = ''http://beta.quicklisp.org/archive/cl+ssl/2019-11-30/cl+ssl-20191130-git.tgz'';
+    sha256 = ''073ba82xb0jsqlmhv46g7n31j0k2ahw6bw02a51qg77l7wxnms23'';
   };
 
   packageName = "cl+ssl";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256
-    0lxyd8nryhk9f8gg0fksqf3y5lgbb7f61snsc3qzi5gplkdy0mzv URL
-    http://beta.quicklisp.org/archive/cl+ssl/2019-07-10/cl+ssl-20190710-git.tgz
-    MD5 fae6e01902964d010ad2565a61a6af2a NAME cl+ssl FILENAME cl_plus_ssl DEPS
+    073ba82xb0jsqlmhv46g7n31j0k2ahw6bw02a51qg77l7wxnms23 URL
+    http://beta.quicklisp.org/archive/cl+ssl/2019-11-30/cl+ssl-20191130-git.tgz
+    MD5 995aaef02ec5112a0de78b2533691629 NAME cl+ssl FILENAME cl_plus_ssl DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams)
@@ -31,4 +31,4 @@ rec {
     DEPENDENCIES
     (alexandria babel bordeaux-threads cffi flexi-streams trivial-features
      trivial-garbage trivial-gray-streams uiop)
-    VERSION cl+ssl-20190710-git SIBLINGS (cl+ssl.test) PARASITES NIL) */
+    VERSION cl+ssl-20191130-git SIBLINGS (cl+ssl.test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
index 6cfd7842409c..5a831da39b82 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-handler-hunchentoot.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack-handler-hunchentoot'';
-  version = ''clack-20190710-git'';
+  version = ''clack-20191007-git'';
 
   description = ''Clack handler for Hunchentoot.'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."clack-socket" args."flexi-streams" args."hunchentoot" args."md5" args."rfc2388" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz'';
-    sha256 = ''1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k'';
+    url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz'';
+    sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w'';
   };
 
   packageName = "clack-handler-hunchentoot";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM clack-handler-hunchentoot DESCRIPTION Clack handler for Hunchentoot.
-    SHA256 1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL
-    http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz
-    MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-handler-hunchentoot
+    SHA256 004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w URL
+    http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz
+    MD5 25741855fa1e989d373ac06ddfabf351 NAME clack-handler-hunchentoot
     FILENAME clack-handler-hunchentoot DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -42,7 +42,7 @@ rec {
      cl-ppcre clack-socket flexi-streams hunchentoot md5 rfc2388 split-sequence
      trivial-backtrace trivial-features trivial-garbage trivial-gray-streams
      usocket)
-    VERSION clack-20190710-git SIBLINGS
+    VERSION clack-20191007-git SIBLINGS
     (clack-handler-fcgi clack-handler-toot clack-handler-wookie clack-socket
      clack-test clack-v1-compat clack t-clack-handler-fcgi
      t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
index da7f15e03c17..a9294b293cc3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack-socket'';
-  version = ''clack-20190710-git'';
+  version = ''clack-20191007-git'';
 
   description = ''System lacks description'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz'';
-    sha256 = ''1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k'';
+    url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz'';
+    sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w'';
   };
 
   packageName = "clack-socket";
@@ -18,10 +18,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM clack-socket DESCRIPTION System lacks description SHA256
-    1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL
-    http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz
-    MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-socket FILENAME
-    clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20190710-git SIBLINGS
+    004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w URL
+    http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz
+    MD5 25741855fa1e989d373ac06ddfabf351 NAME clack-socket FILENAME
+    clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20191007-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
      clack-handler-wookie clack-test clack-v1-compat clack t-clack-handler-fcgi
      t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
index 1792d79f1d89..6350dcdece45 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack-test'';
-  version = ''clack-20190710-git'';
+  version = ''clack-20191007-git'';
 
   description = ''Testing Clack Applications.'';
 
-  deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."dexador" args."dissect" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."local-time" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz'';
-    sha256 = ''1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k'';
+    url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz'';
+    sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w'';
   };
 
   packageName = "clack-test";
@@ -18,19 +18,16 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM clack-test DESCRIPTION Testing Clack Applications. SHA256
-    1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL
-    http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz
-    MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-test FILENAME clack-test
+    004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w URL
+    http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz
+    MD5 25741855fa1e989d373ac06ddfabf351 NAME clack-test FILENAME clack-test
     DEPS
-    ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
-     (NAME babel FILENAME babel)
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
      (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME chipz FILENAME chipz)
      (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl_plus_ssl)
-     (NAME cl-annot FILENAME cl-annot)
-     (NAME cl-ansi-text FILENAME cl-ansi-text)
-     (NAME cl-base64 FILENAME cl-base64) (NAME cl-colors FILENAME cl-colors)
+     (NAME cl-annot FILENAME cl-annot) (NAME cl-base64 FILENAME cl-base64)
      (NAME cl-cookie FILENAME cl-cookie) (NAME cl-fad FILENAME cl-fad)
      (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-reexport FILENAME cl-reexport)
      (NAME cl-syntax FILENAME cl-syntax)
@@ -38,19 +35,19 @@ rec {
      (NAME cl-utilities FILENAME cl-utilities) (NAME clack FILENAME clack)
      (NAME clack-handler-hunchentoot FILENAME clack-handler-hunchentoot)
      (NAME clack-socket FILENAME clack-socket) (NAME dexador FILENAME dexador)
-     (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io)
+     (NAME dissect FILENAME dissect) (NAME fast-http FILENAME fast-http)
+     (NAME fast-io FILENAME fast-io)
      (NAME flexi-streams FILENAME flexi-streams)
      (NAME http-body FILENAME http-body)
      (NAME hunchentoot FILENAME hunchentoot) (NAME ironclad FILENAME ironclad)
      (NAME jonathan FILENAME jonathan) (NAME lack FILENAME lack)
      (NAME lack-component FILENAME lack-component)
      (NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace)
-     (NAME lack-util FILENAME lack-util) (NAME let-plus FILENAME let-plus)
-     (NAME local-time FILENAME local-time) (NAME md5 FILENAME md5)
-     (NAME named-readtables FILENAME named-readtables)
+     (NAME lack-util FILENAME lack-util) (NAME local-time FILENAME local-time)
+     (NAME md5 FILENAME md5) (NAME named-readtables FILENAME named-readtables)
      (NAME nibbles FILENAME nibbles) (NAME proc-parse FILENAME proc-parse)
-     (NAME prove FILENAME prove) (NAME quri FILENAME quri)
-     (NAME rfc2388 FILENAME rfc2388) (NAME smart-buffer FILENAME smart-buffer)
+     (NAME quri FILENAME quri) (NAME rfc2388 FILENAME rfc2388)
+     (NAME rove FILENAME rove) (NAME smart-buffer FILENAME smart-buffer)
      (NAME split-sequence FILENAME split-sequence)
      (NAME static-vectors FILENAME static-vectors)
      (NAME trivial-backtrace FILENAME trivial-backtrace)
@@ -61,17 +58,16 @@ rec {
      (NAME trivial-types FILENAME trivial-types)
      (NAME usocket FILENAME usocket) (NAME xsubseq FILENAME xsubseq))
     DEPENDENCIES
-    (alexandria anaphora babel bordeaux-threads cffi cffi-grovel cffi-toolchain
-     chipz chunga cl+ssl cl-annot cl-ansi-text cl-base64 cl-colors cl-cookie
-     cl-fad cl-ppcre cl-reexport cl-syntax cl-syntax-annot cl-utilities clack
-     clack-handler-hunchentoot clack-socket dexador fast-http fast-io
-     flexi-streams http-body hunchentoot ironclad jonathan lack lack-component
-     lack-middleware-backtrace lack-util let-plus local-time md5
-     named-readtables nibbles proc-parse prove quri rfc2388 smart-buffer
-     split-sequence static-vectors trivial-backtrace trivial-features
-     trivial-garbage trivial-gray-streams trivial-mimes trivial-types usocket
-     xsubseq)
-    VERSION clack-20190710-git SIBLINGS
+    (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain chipz
+     chunga cl+ssl cl-annot cl-base64 cl-cookie cl-fad cl-ppcre cl-reexport
+     cl-syntax cl-syntax-annot cl-utilities clack clack-handler-hunchentoot
+     clack-socket dexador dissect fast-http fast-io flexi-streams http-body
+     hunchentoot ironclad jonathan lack lack-component
+     lack-middleware-backtrace lack-util local-time md5 named-readtables
+     nibbles proc-parse quri rfc2388 rove smart-buffer split-sequence
+     static-vectors trivial-backtrace trivial-features trivial-garbage
+     trivial-gray-streams trivial-mimes trivial-types usocket xsubseq)
+    VERSION clack-20191007-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
      clack-handler-wookie clack-socket clack-v1-compat clack
      t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
index 6162f8ffe10c..fbc02f04da93 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack-v1-compat'';
-  version = ''clack-20190710-git'';
+  version = ''clack-20191007-git'';
 
   description = ''System lacks description'';
 
-  deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."marshal" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."dissect" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."local-time" args."marshal" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."quri" args."rfc2388" args."rove" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz'';
-    sha256 = ''1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k'';
+    url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz'';
+    sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w'';
   };
 
   packageName = "clack-v1-compat";
@@ -18,41 +18,40 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM clack-v1-compat DESCRIPTION System lacks description SHA256
-    1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL
-    http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz
-    MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-v1-compat FILENAME
+    004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w URL
+    http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz
+    MD5 25741855fa1e989d373ac06ddfabf351 NAME clack-v1-compat FILENAME
     clack-v1-compat DEPS
-    ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
-     (NAME babel FILENAME babel)
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
      (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME chipz FILENAME chipz)
      (NAME chunga FILENAME chunga)
      (NAME circular-streams FILENAME circular-streams)
      (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-annot FILENAME cl-annot)
-     (NAME cl-ansi-text FILENAME cl-ansi-text)
-     (NAME cl-base64 FILENAME cl-base64) (NAME cl-colors FILENAME cl-colors)
-     (NAME cl-cookie FILENAME cl-cookie) (NAME cl-fad FILENAME cl-fad)
-     (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-reexport FILENAME cl-reexport)
+     (NAME cl-base64 FILENAME cl-base64) (NAME cl-cookie FILENAME cl-cookie)
+     (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-reexport FILENAME cl-reexport)
      (NAME cl-syntax FILENAME cl-syntax)
      (NAME cl-syntax-annot FILENAME cl-syntax-annot)
      (NAME cl-utilities FILENAME cl-utilities) (NAME clack FILENAME clack)
      (NAME clack-handler-hunchentoot FILENAME clack-handler-hunchentoot)
      (NAME clack-socket FILENAME clack-socket)
      (NAME clack-test FILENAME clack-test) (NAME dexador FILENAME dexador)
-     (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io)
+     (NAME dissect FILENAME dissect) (NAME fast-http FILENAME fast-http)
+     (NAME fast-io FILENAME fast-io)
      (NAME flexi-streams FILENAME flexi-streams)
      (NAME http-body FILENAME http-body)
      (NAME hunchentoot FILENAME hunchentoot) (NAME ironclad FILENAME ironclad)
      (NAME jonathan FILENAME jonathan) (NAME lack FILENAME lack)
      (NAME lack-component FILENAME lack-component)
      (NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace)
-     (NAME lack-util FILENAME lack-util) (NAME let-plus FILENAME let-plus)
-     (NAME local-time FILENAME local-time) (NAME marshal FILENAME marshal)
-     (NAME md5 FILENAME md5) (NAME named-readtables FILENAME named-readtables)
+     (NAME lack-util FILENAME lack-util) (NAME local-time FILENAME local-time)
+     (NAME marshal FILENAME marshal) (NAME md5 FILENAME md5)
+     (NAME named-readtables FILENAME named-readtables)
      (NAME nibbles FILENAME nibbles) (NAME proc-parse FILENAME proc-parse)
-     (NAME prove FILENAME prove) (NAME quri FILENAME quri)
-     (NAME rfc2388 FILENAME rfc2388) (NAME smart-buffer FILENAME smart-buffer)
+     (NAME quri FILENAME quri) (NAME rfc2388 FILENAME rfc2388)
+     (NAME rove FILENAME rove) (NAME smart-buffer FILENAME smart-buffer)
      (NAME split-sequence FILENAME split-sequence)
      (NAME static-vectors FILENAME static-vectors)
      (NAME trivial-backtrace FILENAME trivial-backtrace)
@@ -63,17 +62,17 @@ rec {
      (NAME trivial-types FILENAME trivial-types) (NAME uiop FILENAME uiop)
      (NAME usocket FILENAME usocket) (NAME xsubseq FILENAME xsubseq))
     DEPENDENCIES
-    (alexandria anaphora babel bordeaux-threads cffi cffi-grovel cffi-toolchain
-     chipz chunga circular-streams cl+ssl cl-annot cl-ansi-text cl-base64
-     cl-colors cl-cookie cl-fad cl-ppcre cl-reexport cl-syntax cl-syntax-annot
-     cl-utilities clack clack-handler-hunchentoot clack-socket clack-test
-     dexador fast-http fast-io flexi-streams http-body hunchentoot ironclad
-     jonathan lack lack-component lack-middleware-backtrace lack-util let-plus
-     local-time marshal md5 named-readtables nibbles proc-parse prove quri
-     rfc2388 smart-buffer split-sequence static-vectors trivial-backtrace
-     trivial-features trivial-garbage trivial-gray-streams trivial-mimes
-     trivial-types uiop usocket xsubseq)
-    VERSION clack-20190710-git SIBLINGS
+    (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain chipz
+     chunga circular-streams cl+ssl cl-annot cl-base64 cl-cookie cl-fad
+     cl-ppcre cl-reexport cl-syntax cl-syntax-annot cl-utilities clack
+     clack-handler-hunchentoot clack-socket clack-test dexador dissect
+     fast-http fast-io flexi-streams http-body hunchentoot ironclad jonathan
+     lack lack-component lack-middleware-backtrace lack-util local-time marshal
+     md5 named-readtables nibbles proc-parse quri rfc2388 rove smart-buffer
+     split-sequence static-vectors trivial-backtrace trivial-features
+     trivial-garbage trivial-gray-streams trivial-mimes trivial-types uiop
+     usocket xsubseq)
+    VERSION clack-20191007-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
      clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi
      t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
index 1813844e85fd..327dc5ace6ea 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack'';
-  version = ''20190710-git'';
+  version = ''20191007-git'';
 
   description = ''Web application environment for Common Lisp'';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."nibbles" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz'';
-    sha256 = ''1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k'';
+    url = ''http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz'';
+    sha256 = ''004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w'';
   };
 
   packageName = "clack";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256
-    1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL
-    http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz
-    MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack FILENAME clack DEPS
+    004drm82mhxmcsa00lbmq2l89g4fzwn6j2drfwdazrpi27z0ry5w URL
+    http://beta.quicklisp.org/archive/clack/2019-10-07/clack-20191007-git.tgz
+    MD5 25741855fa1e989d373ac06ddfabf351 NAME clack FILENAME clack DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME ironclad FILENAME ironclad) (NAME lack FILENAME lack)
@@ -31,7 +31,7 @@ rec {
     DEPENDENCIES
     (alexandria bordeaux-threads ironclad lack lack-component
      lack-middleware-backtrace lack-util nibbles uiop)
-    VERSION 20190710-git SIBLINGS
+    VERSION 20191007-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
      clack-handler-wookie clack-socket clack-test clack-v1-compat
      t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
index ca03207fabd8..26a8f1b53410 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''closer-mop'';
-  version = ''20190710-git'';
+  version = ''20191227-git'';
 
   description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/closer-mop/2019-07-10/closer-mop-20190710-git.tgz'';
-    sha256 = ''0zh53f4jffzjl8ix9dks0shqcxnsj830a34iqgmz3prq8rwba0gx'';
+    url = ''http://beta.quicklisp.org/archive/closer-mop/2019-12-27/closer-mop-20191227-git.tgz'';
+    sha256 = ''12qkaadpbj946ln17xp5cjahd9jkbwv9j51rvk3q9kqmsm0r1r9l'';
   };
 
   packageName = "closer-mop";
@@ -19,7 +19,7 @@ rec {
 }
 /* (SYSTEM closer-mop DESCRIPTION
     Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.
-    SHA256 0zh53f4jffzjl8ix9dks0shqcxnsj830a34iqgmz3prq8rwba0gx URL
-    http://beta.quicklisp.org/archive/closer-mop/2019-07-10/closer-mop-20190710-git.tgz
-    MD5 5ebb554f9f7ba7f0d9dc6584806c8a0e NAME closer-mop FILENAME closer-mop
-    DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */
+    SHA256 12qkaadpbj946ln17xp5cjahd9jkbwv9j51rvk3q9kqmsm0r1r9l URL
+    http://beta.quicklisp.org/archive/closer-mop/2019-12-27/closer-mop-20191227-git.tgz
+    MD5 67dda2ff56690bb8eec6131983605031 NAME closer-mop FILENAME closer-mop
+    DEPS NIL DEPENDENCIES NIL VERSION 20191227-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
index 2f07706a9129..aa89d5e45cc3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clss'';
-  version = ''20190710-git'';
+  version = ''20191130-git'';
 
   description = ''A DOM tree searching engine based on CSS selectors.'';
 
   deps = [ args."array-utils" args."documentation-utils" args."plump" args."trivial-indent" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clss/2019-07-10/clss-20190710-git.tgz'';
-    sha256 = ''1gvnvwjrvinp8545gzav108pzrh00wx3vx2v7l6z18a80kn0h9vs'';
+    url = ''http://beta.quicklisp.org/archive/clss/2019-11-30/clss-20191130-git.tgz'';
+    sha256 = ''0cbjzsc90fpa8zqv5s0ri7ncbv6f8azgbbfsxswqfphbibkcpcka'';
   };
 
   packageName = "clss";
@@ -18,11 +18,11 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors.
-    SHA256 1gvnvwjrvinp8545gzav108pzrh00wx3vx2v7l6z18a80kn0h9vs URL
-    http://beta.quicklisp.org/archive/clss/2019-07-10/clss-20190710-git.tgz MD5
-    c5a918fe272b71af7c4b6e71a7faad46 NAME clss FILENAME clss DEPS
+    SHA256 0cbjzsc90fpa8zqv5s0ri7ncbv6f8azgbbfsxswqfphbibkcpcka URL
+    http://beta.quicklisp.org/archive/clss/2019-11-30/clss-20191130-git.tgz MD5
+    9910677b36df00f3046905a9b84122a9 NAME clss FILENAME clss DEPS
     ((NAME array-utils FILENAME array-utils)
      (NAME documentation-utils FILENAME documentation-utils)
      (NAME plump FILENAME plump) (NAME trivial-indent FILENAME trivial-indent))
     DEPENDENCIES (array-utils documentation-utils plump trivial-indent) VERSION
-    20190710-git SIBLINGS NIL PARASITES NIL) */
+    20191130-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
index 6b99f99b7ab8..8f721b60f48c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clx'';
-  version = ''20190521-git'';
+  version = ''20191130-git'';
 
   parasites = [ "clx/test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."fiasco" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clx/2019-05-21/clx-20190521-git.tgz'';
-    sha256 = ''0rsais9nsz4naf50wp2iirxfj84rdmbdxivfh3496rsi2ji7j8qs'';
+    url = ''http://beta.quicklisp.org/archive/clx/2019-11-30/clx-20191130-git.tgz'';
+    sha256 = ''1fyh34hrx4p4kf5mijrmgl66hy7yjh9y43ilxck5q378291yk8dj'';
   };
 
   packageName = "clx";
@@ -21,8 +21,8 @@ rec {
 }
 /* (SYSTEM clx DESCRIPTION
     An implementation of the X Window System protocol in Lisp. SHA256
-    0rsais9nsz4naf50wp2iirxfj84rdmbdxivfh3496rsi2ji7j8qs URL
-    http://beta.quicklisp.org/archive/clx/2019-05-21/clx-20190521-git.tgz MD5
-    afcd581193237d3202a4fbcc1f0622c3 NAME clx FILENAME clx DEPS
-    ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20190521-git
+    1fyh34hrx4p4kf5mijrmgl66hy7yjh9y43ilxck5q378291yk8dj URL
+    http://beta.quicklisp.org/archive/clx/2019-11-30/clx-20191130-git.tgz MD5
+    61e86a60727732df62c9fa383535fc89 NAME clx FILENAME clx DEPS
+    ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20191130-git
     SIBLINGS NIL PARASITES (clx/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
index 1d81acba2dc6..fdedf9735eb8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''command-line-arguments'';
-  version = ''20190710-git'';
+  version = ''20191227-git'';
 
   description = ''small library to deal with command-line arguments'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/command-line-arguments/2019-07-10/command-line-arguments-20190710-git.tgz'';
-    sha256 = ''1221nraxk55mwgf6pilhzg5lh98jd0nxrdn2mj1zczj88im01733'';
+    url = ''http://beta.quicklisp.org/archive/command-line-arguments/2019-12-27/command-line-arguments-20191227-git.tgz'';
+    sha256 = ''1846v22mdi8qfavp9wcp7spic6gcmlrbd6g3l0f3crssqza0asgf'';
   };
 
   packageName = "command-line-arguments";
@@ -19,8 +19,8 @@ rec {
 }
 /* (SYSTEM command-line-arguments DESCRIPTION
     small library to deal with command-line arguments SHA256
-    1221nraxk55mwgf6pilhzg5lh98jd0nxrdn2mj1zczj88im01733 URL
-    http://beta.quicklisp.org/archive/command-line-arguments/2019-07-10/command-line-arguments-20190710-git.tgz
-    MD5 77b361a7f4b3b73a88c3a95c7bbffa98 NAME command-line-arguments FILENAME
-    command-line-arguments DEPS NIL DEPENDENCIES NIL VERSION 20190710-git
+    1846v22mdi8qfavp9wcp7spic6gcmlrbd6g3l0f3crssqza0asgf URL
+    http://beta.quicklisp.org/archive/command-line-arguments/2019-12-27/command-line-arguments-20191227-git.tgz
+    MD5 3ed82e1536b55fc0b7abc79626631aab NAME command-line-arguments FILENAME
+    command-line-arguments DEPS NIL DEPENDENCIES NIL VERSION 20191227-git
     SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
index 173a31e9f31d..850e7806965b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dbd-mysql'';
-  version = ''cl-dbi-20190521-git'';
+  version = ''cl-dbi-20191007-git'';
 
   description = ''Database driver for MySQL.'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-mysql" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-features" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz'';
-    sha256 = ''1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-10-07/cl-dbi-20191007-git.tgz'';
+    sha256 = ''0xsg0xqq88wsx6wf8nllfd0mk356bw2qw3c5c31rfj41wz5vpx35'';
   };
 
   packageName = "dbd-mysql";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256
-    1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL
-    http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz
-    MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME dbd-mysql FILENAME dbd-mysql DEPS
+    0xsg0xqq88wsx6wf8nllfd0mk356bw2qw3c5c31rfj41wz5vpx35 URL
+    http://beta.quicklisp.org/archive/cl-dbi/2019-10-07/cl-dbi-20191007-git.tgz
+    MD5 bf524c4000468d12627fa419ae412abb NAME dbd-mysql FILENAME dbd-mysql DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cl-annot FILENAME cl-annot)
@@ -35,5 +35,5 @@ rec {
     (alexandria babel bordeaux-threads cffi cl-annot cl-mysql cl-syntax
      cl-syntax-annot closer-mop dbi named-readtables split-sequence
      trivial-features trivial-types)
-    VERSION cl-dbi-20190521-git SIBLINGS
+    VERSION cl-dbi-20191007-git SIBLINGS
     (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
index 6668cd4f762b..9dcecf8cfd6a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dbd-postgres'';
-  version = ''cl-dbi-20190521-git'';
+  version = ''cl-dbi-20191007-git'';
 
   description = ''Database driver for PostgreSQL.'';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-postgres" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."md5" args."named-readtables" args."split-sequence" args."trivial-garbage" args."trivial-types" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz'';
-    sha256 = ''1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-10-07/cl-dbi-20191007-git.tgz'';
+    sha256 = ''0xsg0xqq88wsx6wf8nllfd0mk356bw2qw3c5c31rfj41wz5vpx35'';
   };
 
   packageName = "dbd-postgres";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256
-    1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL
-    http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz
-    MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME dbd-postgres FILENAME
+    0xsg0xqq88wsx6wf8nllfd0mk356bw2qw3c5c31rfj41wz5vpx35 URL
+    http://beta.quicklisp.org/archive/cl-dbi/2019-10-07/cl-dbi-20191007-git.tgz
+    MD5 bf524c4000468d12627fa419ae412abb NAME dbd-postgres FILENAME
     dbd-postgres DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -37,5 +37,5 @@ rec {
     (alexandria bordeaux-threads cl-annot cl-postgres cl-syntax cl-syntax-annot
      closer-mop dbi md5 named-readtables split-sequence trivial-garbage
      trivial-types usocket)
-    VERSION cl-dbi-20190521-git SIBLINGS
+    VERSION cl-dbi-20191007-git SIBLINGS
     (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
index 9b6fde0ea94b..d367a52c1c57 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dbd-sqlite3'';
-  version = ''cl-dbi-20190521-git'';
+  version = ''cl-dbi-20191007-git'';
 
   description = ''Database driver for SQLite3.'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."iterate" args."named-readtables" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-garbage" args."trivial-types" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz'';
-    sha256 = ''1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-10-07/cl-dbi-20191007-git.tgz'';
+    sha256 = ''0xsg0xqq88wsx6wf8nllfd0mk356bw2qw3c5c31rfj41wz5vpx35'';
   };
 
   packageName = "dbd-sqlite3";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256
-    1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL
-    http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz
-    MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME dbd-sqlite3 FILENAME dbd-sqlite3
+    0xsg0xqq88wsx6wf8nllfd0mk356bw2qw3c5c31rfj41wz5vpx35 URL
+    http://beta.quicklisp.org/archive/cl-dbi/2019-10-07/cl-dbi-20191007-git.tgz
+    MD5 bf524c4000468d12627fa419ae412abb NAME dbd-sqlite3 FILENAME dbd-sqlite3
     DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -39,5 +39,5 @@ rec {
     (alexandria babel bordeaux-threads cffi cl-annot cl-syntax cl-syntax-annot
      closer-mop dbi iterate named-readtables split-sequence sqlite
      trivial-features trivial-garbage trivial-types uiop)
-    VERSION cl-dbi-20190521-git SIBLINGS
+    VERSION cl-dbi-20191007-git SIBLINGS
     (cl-dbi dbd-mysql dbd-postgres dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
index 26c5306c06a3..b4d14d82741d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dbi'';
-  version = ''cl-20190521-git'';
+  version = ''cl-20191007-git'';
 
   description = ''Database independent interface for Common Lisp'';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."named-readtables" args."split-sequence" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz'';
-    sha256 = ''1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2019-10-07/cl-dbi-20191007-git.tgz'';
+    sha256 = ''0xsg0xqq88wsx6wf8nllfd0mk356bw2qw3c5c31rfj41wz5vpx35'';
   };
 
   packageName = "dbi";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM dbi DESCRIPTION Database independent interface for Common Lisp
-    SHA256 1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL
-    http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz
-    MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME dbi FILENAME dbi DEPS
+    SHA256 0xsg0xqq88wsx6wf8nllfd0mk356bw2qw3c5c31rfj41wz5vpx35 URL
+    http://beta.quicklisp.org/archive/cl-dbi/2019-10-07/cl-dbi-20191007-git.tgz
+    MD5 bf524c4000468d12627fa419ae412abb NAME dbi FILENAME dbi DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax)
@@ -32,5 +32,5 @@ rec {
     DEPENDENCIES
     (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop
      named-readtables split-sequence trivial-types)
-    VERSION cl-20190521-git SIBLINGS
+    VERSION cl-20191007-git SIBLINGS
     (cl-dbi dbd-mysql dbd-postgres dbd-sqlite3 dbi-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
index 4d5bc0a22175..6e043269f82c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dexador'';
-  version = ''20190521-git'';
+  version = ''20191007-git'';
 
   description = ''Yet another HTTP client for Common Lisp'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/dexador/2019-05-21/dexador-20190521-git.tgz'';
-    sha256 = ''15v475xvawp3vhbw3kkvxq8z98j6i7h9fi4mkicn5mylx2j3z1mk'';
+    url = ''http://beta.quicklisp.org/archive/dexador/2019-10-07/dexador-20191007-git.tgz'';
+    sha256 = ''1q0anlgbg5gbk9ifynnn6dd894d9hvjsrd45jjklkjabhywgizk7'';
   };
 
   packageName = "dexador";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256
-    15v475xvawp3vhbw3kkvxq8z98j6i7h9fi4mkicn5mylx2j3z1mk URL
-    http://beta.quicklisp.org/archive/dexador/2019-05-21/dexador-20190521-git.tgz
-    MD5 4e405ba1b7721c2d62bc315ec31af0fe NAME dexador FILENAME dexador DEPS
+    1q0anlgbg5gbk9ifynnn6dd894d9hvjsrd45jjklkjabhywgizk7 URL
+    http://beta.quicklisp.org/archive/dexador/2019-10-07/dexador-20191007-git.tgz
+    MD5 aa1c435f809a794610fe599987cb73a8 NAME dexador FILENAME dexador DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -48,4 +48,4 @@ rec {
      fast-http fast-io flexi-streams local-time proc-parse quri smart-buffer
      split-sequence static-vectors trivial-features trivial-garbage
      trivial-gray-streams trivial-mimes usocket xsubseq)
-    VERSION 20190521-git SIBLINGS (dexador-test) PARASITES NIL) */
+    VERSION 20191007-git SIBLINGS (dexador-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix
new file mode 100644
index 000000000000..c6ab6ac38e1d
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dissect.nix
@@ -0,0 +1,25 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''dissect'';
+  version = ''20190710-git'';
+
+  description = ''A lib for introspecting the call stack and active restarts.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/dissect/2019-07-10/dissect-20190710-git.tgz'';
+    sha256 = ''15h653gbi9iybns0ll8rhjr7diwwnq4g9wf51f6d9846nl1v424b'';
+  };
+
+  packageName = "dissect";
+
+  asdFilesToKeep = ["dissect.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM dissect DESCRIPTION
+    A lib for introspecting the call stack and active restarts. SHA256
+    15h653gbi9iybns0ll8rhjr7diwwnq4g9wf51f6d9846nl1v424b URL
+    http://beta.quicklisp.org/archive/dissect/2019-07-10/dissect-20190710-git.tgz
+    MD5 fb0e90e86fe4c184c08d19c1ef61d4e4 NAME dissect FILENAME dissect DEPS NIL
+    DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
index aa97f8f7cbe3..e880d94f433b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''drakma'';
-  version = ''v2.0.5'';
+  version = ''v2.0.7'';
 
   description = ''Full-featured http/https client based on usocket'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-ppcre" args."flexi-streams" args."puri" args."split-sequence" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/drakma/2019-05-21/drakma-v2.0.5.tgz'';
-    sha256 = ''14bqvdr1f5ms6kxdgran57qk43g9c37ia7ni1z3afdkbv8wp2lyj'';
+    url = ''http://beta.quicklisp.org/archive/drakma/2019-11-30/drakma-v2.0.7.tgz'';
+    sha256 = ''1r0sh0nsx7fq24yybazjw8n7grk1b85l52x523axwchnnaj58kzw'';
   };
 
   packageName = "drakma";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM drakma DESCRIPTION Full-featured http/https client based on usocket
-    SHA256 14bqvdr1f5ms6kxdgran57qk43g9c37ia7ni1z3afdkbv8wp2lyj URL
-    http://beta.quicklisp.org/archive/drakma/2019-05-21/drakma-v2.0.5.tgz MD5
-    85316671dd8ada170b85af82ed97ce8e NAME drakma FILENAME drakma DEPS
+    SHA256 1r0sh0nsx7fq24yybazjw8n7grk1b85l52x523axwchnnaj58kzw URL
+    http://beta.quicklisp.org/archive/drakma/2019-11-30/drakma-v2.0.7.tgz MD5
+    f166498aaed67f726060e9e997df10a3 NAME drakma FILENAME drakma DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME chipz FILENAME chipz)
@@ -36,4 +36,4 @@ rec {
     (alexandria babel bordeaux-threads cffi chipz chunga cl+ssl cl-base64
      cl-ppcre flexi-streams puri split-sequence trivial-features
      trivial-garbage trivial-gray-streams usocket)
-    VERSION v2.0.5 SIBLINGS (drakma-test) PARASITES NIL) */
+    VERSION v2.0.7 SIBLINGS (drakma-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix
index d68fd839bd16..d8258ea57dfd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap-peg.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''esrap-peg'';
-  version = ''20170403-git'';
+  version = ''20191007-git'';
 
   description = ''A wrapper around Esrap to allow generating Esrap grammars from PEG definitions'';
 
   deps = [ args."alexandria" args."cl-unification" args."esrap" args."iterate" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/esrap-peg/2017-04-03/esrap-peg-20170403-git.tgz'';
-    sha256 = ''123pl1p87f8llpzs19abn5idivl4b5mxrc9rflqirbsz3gyc8wl9'';
+    url = ''http://beta.quicklisp.org/archive/esrap-peg/2019-10-07/esrap-peg-20191007-git.tgz'';
+    sha256 = ''0285ngcm73rpzmr0ydy6frps2b4q6n4jymjv3ncwsh81x5blfvis'';
   };
 
   packageName = "esrap-peg";
@@ -19,11 +19,11 @@ rec {
 }
 /* (SYSTEM esrap-peg DESCRIPTION
     A wrapper around Esrap to allow generating Esrap grammars from PEG definitions
-    SHA256 123pl1p87f8llpzs19abn5idivl4b5mxrc9rflqirbsz3gyc8wl9 URL
-    http://beta.quicklisp.org/archive/esrap-peg/2017-04-03/esrap-peg-20170403-git.tgz
-    MD5 0d31f9c82d88ad11ee3d309128e7803c NAME esrap-peg FILENAME esrap-peg DEPS
+    SHA256 0285ngcm73rpzmr0ydy6frps2b4q6n4jymjv3ncwsh81x5blfvis URL
+    http://beta.quicklisp.org/archive/esrap-peg/2019-10-07/esrap-peg-20191007-git.tgz
+    MD5 48d87d3118febeefc23ca3a8dda36fc0 NAME esrap-peg FILENAME esrap-peg DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME cl-unification FILENAME cl-unification) (NAME esrap FILENAME esrap)
      (NAME iterate FILENAME iterate))
-    DEPENDENCIES (alexandria cl-unification esrap iterate) VERSION 20170403-git
+    DEPENDENCIES (alexandria cl-unification esrap iterate) VERSION 20191007-git
     SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
index a024ad3907a3..5ea7943aaf74 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''esrap'';
-  version = ''20190521-git'';
+  version = ''20191227-git'';
 
   parasites = [ "esrap/tests" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/esrap/2019-05-21/esrap-20190521-git.tgz'';
-    sha256 = ''0kbb05735yhkh2vply6hdk2jn43s8pym8j6jqip13qyaaiax6w5q'';
+    url = ''http://beta.quicklisp.org/archive/esrap/2019-12-27/esrap-20191227-git.tgz'';
+    sha256 = ''0614lb8iyraihx2m81manlyd3x89snsn9a1mihlil85piswdbiv8'';
   };
 
   packageName = "esrap";
@@ -21,9 +21,9 @@ rec {
 }
 /* (SYSTEM esrap DESCRIPTION
     A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256
-    0kbb05735yhkh2vply6hdk2jn43s8pym8j6jqip13qyaaiax6w5q URL
-    http://beta.quicklisp.org/archive/esrap/2019-05-21/esrap-20190521-git.tgz
-    MD5 401362d64d644f02824de03697435883 NAME esrap FILENAME esrap DEPS
+    0614lb8iyraihx2m81manlyd3x89snsn9a1mihlil85piswdbiv8 URL
+    http://beta.quicklisp.org/archive/esrap/2019-12-27/esrap-20191227-git.tgz
+    MD5 8dd58ffc605bba6eec614bdea573978b NAME esrap FILENAME esrap DEPS
     ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam))
-    DEPENDENCIES (alexandria fiveam) VERSION 20190521-git SIBLINGS NIL
+    DEPENDENCIES (alexandria fiveam) VERSION 20191227-git SIBLINGS NIL
     PARASITES (esrap/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
index 82c8603d4a45..cea5d251d72a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''fast-http'';
-  version = ''20180831-git'';
+  version = ''20191007-git'';
 
   description = ''A fast HTTP protocol parser in Common Lisp'';
 
   deps = [ args."alexandria" args."babel" args."cl-utilities" args."flexi-streams" args."proc-parse" args."smart-buffer" args."trivial-features" args."trivial-gray-streams" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fast-http/2018-08-31/fast-http-20180831-git.tgz'';
-    sha256 = ''1827ra8nkjh5ghg2hn96w3zs8n1lvqzbf8wmzrcs8yky3l0m4qrm'';
+    url = ''http://beta.quicklisp.org/archive/fast-http/2019-10-07/fast-http-20191007-git.tgz'';
+    sha256 = ''00qnl56cfss2blm4pp03dwv84bmkyd0kbarhahclxbn8f7pgwf32'';
   };
 
   packageName = "fast-http";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM fast-http DESCRIPTION A fast HTTP protocol parser in Common Lisp
-    SHA256 1827ra8nkjh5ghg2hn96w3zs8n1lvqzbf8wmzrcs8yky3l0m4qrm URL
-    http://beta.quicklisp.org/archive/fast-http/2018-08-31/fast-http-20180831-git.tgz
-    MD5 d5e839f204b2dd78a390336572d1ee65 NAME fast-http FILENAME fast-http DEPS
+    SHA256 00qnl56cfss2blm4pp03dwv84bmkyd0kbarhahclxbn8f7pgwf32 URL
+    http://beta.quicklisp.org/archive/fast-http/2019-10-07/fast-http-20191007-git.tgz
+    MD5 fd43be4dd72fd9bda5a3ecce87104c97 NAME fast-http FILENAME fast-http DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cl-utilities FILENAME cl-utilities)
      (NAME flexi-streams FILENAME flexi-streams)
@@ -32,4 +32,4 @@ rec {
     DEPENDENCIES
     (alexandria babel cl-utilities flexi-streams proc-parse smart-buffer
      trivial-features trivial-gray-streams xsubseq)
-    VERSION 20180831-git SIBLINGS (fast-http-test) PARASITES NIL) */
+    VERSION 20191007-git SIBLINGS (fast-http-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
index 39f2af5430fc..1e7e0db5ec4e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''fiasco'';
-  version = ''20190307-git'';
+  version = ''20191130-git'';
 
   parasites = [ "fiasco-self-tests" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fiasco/2019-03-07/fiasco-20190307-git.tgz'';
-    sha256 = ''0ffnkfnj4ayvzsxb2h04xaypgxg3fbar07f6rvlbncdckm9q5jk3'';
+    url = ''http://beta.quicklisp.org/archive/fiasco/2019-11-30/fiasco-20191130-git.tgz'';
+    sha256 = ''0jpxzrac8kzb34b9n5zyh3wcz0wghxd7pq8xwxp87yg6c3927sl0'';
   };
 
   packageName = "fiasco";
@@ -21,10 +21,10 @@ rec {
 }
 /* (SYSTEM fiasco DESCRIPTION
     A Common Lisp test framework that treasures your failures, logical continuation of Stefil.
-    SHA256 0ffnkfnj4ayvzsxb2h04xaypgxg3fbar07f6rvlbncdckm9q5jk3 URL
-    http://beta.quicklisp.org/archive/fiasco/2019-03-07/fiasco-20190307-git.tgz
-    MD5 7cc0c66f865d44974c8d682346b5f6d5 NAME fiasco FILENAME fiasco DEPS
+    SHA256 0jpxzrac8kzb34b9n5zyh3wcz0wghxd7pq8xwxp87yg6c3927sl0 URL
+    http://beta.quicklisp.org/archive/fiasco/2019-11-30/fiasco-20191130-git.tgz
+    MD5 235809b661c89fed1c4ca4ba3e4f3606 NAME fiasco FILENAME fiasco DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME trivial-gray-streams FILENAME trivial-gray-streams))
-    DEPENDENCIES (alexandria trivial-gray-streams) VERSION 20190307-git
+    DEPENDENCIES (alexandria trivial-gray-streams) VERSION 20191130-git
     SIBLINGS NIL PARASITES (fiasco-self-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
index 3754829ac37b..4242d9590463 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''http-body'';
-  version = ''20181210-git'';
+  version = ''20190813-git'';
 
   description = ''HTTP POST data parser for Common Lisp'';
 
   deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."jonathan" args."named-readtables" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/http-body/2018-12-10/http-body-20181210-git.tgz'';
-    sha256 = ''170w8rcabf72yq2w9a8134n1sgy7mgirkdj9fzwbr29gqv93plcz'';
+    url = ''http://beta.quicklisp.org/archive/http-body/2019-08-13/http-body-20190813-git.tgz'';
+    sha256 = ''1mc4xinqnvjr7cdyaywdb5lv9k34pal7lhp6f9a660r1rbxybvy8'';
   };
 
   packageName = "http-body";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM http-body DESCRIPTION HTTP POST data parser for Common Lisp SHA256
-    170w8rcabf72yq2w9a8134n1sgy7mgirkdj9fzwbr29gqv93plcz URL
-    http://beta.quicklisp.org/archive/http-body/2018-12-10/http-body-20181210-git.tgz
-    MD5 9699bbb11386c6e4d5cf35bea30dbf7f NAME http-body FILENAME http-body DEPS
+    1mc4xinqnvjr7cdyaywdb5lv9k34pal7lhp6f9a660r1rbxybvy8 URL
+    http://beta.quicklisp.org/archive/http-body/2019-08-13/http-body-20190813-git.tgz
+    MD5 d46ac52643ae7dc148438f84a8107a79 NAME http-body FILENAME http-body DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
      (NAME cffi-toolchain FILENAME cffi-toolchain)
@@ -46,4 +46,4 @@ rec {
      jonathan named-readtables proc-parse quri smart-buffer split-sequence
      static-vectors trivial-features trivial-gray-streams trivial-types
      xsubseq)
-    VERSION 20181210-git SIBLINGS (http-body-test) PARASITES NIL) */
+    VERSION 20190813-git SIBLINGS (http-body-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
index 2c56b5964f97..0c4d3d758a1b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''ironclad'';
-  version = ''v0.46'';
+  version = ''v0.47'';
 
   parasites = [ "ironclad/tests" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."bordeaux-threads" args."nibbles" args."rt" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/ironclad/2019-07-10/ironclad-v0.46.tgz'';
-    sha256 = ''1bcqz7z30dpr9rz5wg94bbq93swn6lxqj60rn9f5q0fryn9na3l2'';
+    url = ''http://beta.quicklisp.org/archive/ironclad/2019-10-07/ironclad-v0.47.tgz'';
+    sha256 = ''1aczr4678jxz9kvzvwfdbgdbqhihsbj1nz6j2qflc9sdr6hx24rk'';
   };
 
   packageName = "ironclad";
@@ -21,11 +21,11 @@ rec {
 }
 /* (SYSTEM ironclad DESCRIPTION
     A cryptographic toolkit written in pure Common Lisp SHA256
-    1bcqz7z30dpr9rz5wg94bbq93swn6lxqj60rn9f5q0fryn9na3l2 URL
-    http://beta.quicklisp.org/archive/ironclad/2019-07-10/ironclad-v0.46.tgz
-    MD5 23f67c2312723bdaf1ff78898d2354c7 NAME ironclad FILENAME ironclad DEPS
+    1aczr4678jxz9kvzvwfdbgdbqhihsbj1nz6j2qflc9sdr6hx24rk URL
+    http://beta.quicklisp.org/archive/ironclad/2019-10-07/ironclad-v0.47.tgz
+    MD5 b82d370b037422fcaf8953857f03b5f6 NAME ironclad FILENAME ironclad DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME nibbles FILENAME nibbles) (NAME rt FILENAME rt))
-    DEPENDENCIES (alexandria bordeaux-threads nibbles rt) VERSION v0.46
+    DEPENDENCIES (alexandria bordeaux-threads nibbles rt) VERSION v0.47
     SIBLINGS (ironclad-text) PARASITES (ironclad/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
index e4b89c382dc3..fa3f977560b1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lack-component'';
-  version = ''lack-20190521-git'';
+  version = ''lack-20191007-git'';
 
   description = ''System lacks description'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz'';
-    sha256 = ''0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593'';
+    url = ''http://beta.quicklisp.org/archive/lack/2019-10-07/lack-20191007-git.tgz'';
+    sha256 = ''1pjvsk1hc0n6aki393mg2z0dd0xwbkm4pmdph78jlk683158an5s'';
   };
 
   packageName = "lack-component";
@@ -18,10 +18,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM lack-component DESCRIPTION System lacks description SHA256
-    0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
-    http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5
-    7d7321550f0795e998c7afe4498e7a40 NAME lack-component FILENAME
-    lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20190521-git SIBLINGS
+    1pjvsk1hc0n6aki393mg2z0dd0xwbkm4pmdph78jlk683158an5s URL
+    http://beta.quicklisp.org/archive/lack/2019-10-07/lack-20191007-git.tgz MD5
+    bce7a6b5aefb5bfd3fbeb782dda7748f NAME lack-component FILENAME
+    lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20191007-git SIBLINGS
     (lack-middleware-accesslog lack-middleware-auth-basic
      lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
      lack-middleware-session lack-middleware-static lack-request lack-response
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
index 0d50e58ff55d..84ca1d6b66a0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lack-middleware-backtrace'';
-  version = ''lack-20190521-git'';
+  version = ''lack-20191007-git'';
 
   description = ''System lacks description'';
 
   deps = [ args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz'';
-    sha256 = ''0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593'';
+    url = ''http://beta.quicklisp.org/archive/lack/2019-10-07/lack-20191007-git.tgz'';
+    sha256 = ''1pjvsk1hc0n6aki393mg2z0dd0xwbkm4pmdph78jlk683158an5s'';
   };
 
   packageName = "lack-middleware-backtrace";
@@ -18,11 +18,11 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM lack-middleware-backtrace DESCRIPTION System lacks description
-    SHA256 0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
-    http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5
-    7d7321550f0795e998c7afe4498e7a40 NAME lack-middleware-backtrace FILENAME
+    SHA256 1pjvsk1hc0n6aki393mg2z0dd0xwbkm4pmdph78jlk683158an5s URL
+    http://beta.quicklisp.org/archive/lack/2019-10-07/lack-20191007-git.tgz MD5
+    bce7a6b5aefb5bfd3fbeb782dda7748f NAME lack-middleware-backtrace FILENAME
     lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES
-    (uiop) VERSION lack-20190521-git SIBLINGS
+    (uiop) VERSION lack-20191007-git SIBLINGS
     (lack-component lack-middleware-accesslog lack-middleware-auth-basic
      lack-middleware-csrf lack-middleware-mount lack-middleware-session
      lack-middleware-static lack-request lack-response lack-session-store-dbi
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
index cadf617bbdf0..1c2d2a1f6ac6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lack-util'';
-  version = ''lack-20190521-git'';
+  version = ''lack-20191007-git'';
 
   description = ''System lacks description'';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."nibbles" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz'';
-    sha256 = ''0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593'';
+    url = ''http://beta.quicklisp.org/archive/lack/2019-10-07/lack-20191007-git.tgz'';
+    sha256 = ''1pjvsk1hc0n6aki393mg2z0dd0xwbkm4pmdph78jlk683158an5s'';
   };
 
   packageName = "lack-util";
@@ -18,14 +18,14 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM lack-util DESCRIPTION System lacks description SHA256
-    0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
-    http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5
-    7d7321550f0795e998c7afe4498e7a40 NAME lack-util FILENAME lack-util DEPS
+    1pjvsk1hc0n6aki393mg2z0dd0xwbkm4pmdph78jlk683158an5s URL
+    http://beta.quicklisp.org/archive/lack/2019-10-07/lack-20191007-git.tgz MD5
+    bce7a6b5aefb5bfd3fbeb782dda7748f NAME lack-util FILENAME lack-util DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME ironclad FILENAME ironclad) (NAME nibbles FILENAME nibbles))
     DEPENDENCIES (alexandria bordeaux-threads ironclad nibbles) VERSION
-    lack-20190521-git SIBLINGS
+    lack-20191007-git SIBLINGS
     (lack-component lack-middleware-accesslog lack-middleware-auth-basic
      lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
      lack-middleware-session lack-middleware-static lack-request lack-response
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
index 08095979989b..2dbe5defe8e5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lack'';
-  version = ''20190521-git'';
+  version = ''20191007-git'';
 
   description = ''A minimal Clack'';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack-component" args."lack-util" args."nibbles" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz'';
-    sha256 = ''0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593'';
+    url = ''http://beta.quicklisp.org/archive/lack/2019-10-07/lack-20191007-git.tgz'';
+    sha256 = ''1pjvsk1hc0n6aki393mg2z0dd0xwbkm4pmdph78jlk683158an5s'';
   };
 
   packageName = "lack";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM lack DESCRIPTION A minimal Clack SHA256
-    0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
-    http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5
-    7d7321550f0795e998c7afe4498e7a40 NAME lack FILENAME lack DEPS
+    1pjvsk1hc0n6aki393mg2z0dd0xwbkm4pmdph78jlk683158an5s URL
+    http://beta.quicklisp.org/archive/lack/2019-10-07/lack-20191007-git.tgz MD5
+    bce7a6b5aefb5bfd3fbeb782dda7748f NAME lack FILENAME lack DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME ironclad FILENAME ironclad)
@@ -28,7 +28,7 @@ rec {
      (NAME lack-util FILENAME lack-util) (NAME nibbles FILENAME nibbles))
     DEPENDENCIES
     (alexandria bordeaux-threads ironclad lack-component lack-util nibbles)
-    VERSION 20190521-git SIBLINGS
+    VERSION 20191007-git SIBLINGS
     (lack-component lack-middleware-accesslog lack-middleware-auth-basic
      lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
      lack-middleware-session lack-middleware-static lack-request lack-response
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
index 1f6a0709b0f4..9d130c2b053e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''let-plus'';
-  version = ''20171130-git'';
+  version = ''20191130-git'';
 
   parasites = [ "let-plus/tests" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."anaphora" args."lift" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/let-plus/2017-11-30/let-plus-20171130-git.tgz'';
-    sha256 = ''1v8rp3ab6kp6v5kl58gi700wjs4qgmkxxkmhx2a1i6b2z934xkx7'';
+    url = ''http://beta.quicklisp.org/archive/let-plus/2019-11-30/let-plus-20191130-git.tgz'';
+    sha256 = ''0zj0fgb7lvczgpz4jq8q851p77kma7ikn7hd2jk2c37iv4nmz29p'';
   };
 
   packageName = "let-plus";
@@ -20,10 +20,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM let-plus DESCRIPTION Destructuring extension of LET*. SHA256
-    1v8rp3ab6kp6v5kl58gi700wjs4qgmkxxkmhx2a1i6b2z934xkx7 URL
-    http://beta.quicklisp.org/archive/let-plus/2017-11-30/let-plus-20171130-git.tgz
-    MD5 cd92097d436a513e7d0eac535617ca08 NAME let-plus FILENAME let-plus DEPS
+    0zj0fgb7lvczgpz4jq8q851p77kma7ikn7hd2jk2c37iv4nmz29p URL
+    http://beta.quicklisp.org/archive/let-plus/2019-11-30/let-plus-20191130-git.tgz
+    MD5 1b8d1660ed67852ea31cad44a6fc15d0 NAME let-plus FILENAME let-plus DEPS
     ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
      (NAME lift FILENAME lift))
-    DEPENDENCIES (alexandria anaphora lift) VERSION 20171130-git SIBLINGS NIL
+    DEPENDENCIES (alexandria anaphora lift) VERSION 20191130-git SIBLINGS NIL
     PARASITES (let-plus/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix
index aeb37b15a49f..23412435fc40 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''log4cl'';
-  version = ''20190107-git'';
+  version = ''20191007-git'';
 
   parasites = [ "log4cl/syslog" "log4cl/test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."bordeaux-threads" args."stefil" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/log4cl/2019-01-07/log4cl-20190107-git.tgz'';
-    sha256 = ''0c5gsmz69jby5hmcl4igf1sh6xkwh8bx2jz6kd2gcnqjwq37h46p'';
+    url = ''http://beta.quicklisp.org/archive/log4cl/2019-10-07/log4cl-20191007-git.tgz'';
+    sha256 = ''0i4i4ahw13fzka8ixasv292y59ljyzl4i6k6gmkrhxxbm6cdq1na'';
   };
 
   packageName = "log4cl";
@@ -20,11 +20,11 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM log4cl DESCRIPTION System lacks description SHA256
-    0c5gsmz69jby5hmcl4igf1sh6xkwh8bx2jz6kd2gcnqjwq37h46p URL
-    http://beta.quicklisp.org/archive/log4cl/2019-01-07/log4cl-20190107-git.tgz
-    MD5 ecfa1f67902c776f46d192acd55f628c NAME log4cl FILENAME log4cl DEPS
+    0i4i4ahw13fzka8ixasv292y59ljyzl4i6k6gmkrhxxbm6cdq1na URL
+    http://beta.quicklisp.org/archive/log4cl/2019-10-07/log4cl-20191007-git.tgz
+    MD5 11cdcd9da0ede86092886a055b186861 NAME log4cl FILENAME log4cl DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME stefil FILENAME stefil))
-    DEPENDENCIES (alexandria bordeaux-threads stefil) VERSION 20190107-git
+    DEPENDENCIES (alexandria bordeaux-threads stefil) VERSION 20191007-git
     SIBLINGS (log4cl-examples log4slime) PARASITES (log4cl/syslog log4cl/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
index d72e0839d1e8..86242c09da34 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''metabang-bind'';
-  version = ''20171130-git'';
+  version = ''20191130-git'';
 
   description = ''Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/metabang-bind/2017-11-30/metabang-bind-20171130-git.tgz'';
-    sha256 = ''0mjcg4281qljjwzq80r9j7nhvccf5k1069kzk2vljvvm2ai21j1a'';
+    url = ''http://beta.quicklisp.org/archive/metabang-bind/2019-11-30/metabang-bind-20191130-git.tgz'';
+    sha256 = ''0w4hk94wpfxxznl2xvasnwla7v9i8hrixa1b0r5ngph3n0hq48ci'';
   };
 
   packageName = "metabang-bind";
@@ -19,8 +19,8 @@ rec {
 }
 /* (SYSTEM metabang-bind DESCRIPTION
     Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more.
-    SHA256 0mjcg4281qljjwzq80r9j7nhvccf5k1069kzk2vljvvm2ai21j1a URL
-    http://beta.quicklisp.org/archive/metabang-bind/2017-11-30/metabang-bind-20171130-git.tgz
-    MD5 dfd06d3929c2f48ccbe1d00cdf9995a7 NAME metabang-bind FILENAME
-    metabang-bind DEPS NIL DEPENDENCIES NIL VERSION 20171130-git SIBLINGS
+    SHA256 0w4hk94wpfxxznl2xvasnwla7v9i8hrixa1b0r5ngph3n0hq48ci URL
+    http://beta.quicklisp.org/archive/metabang-bind/2019-11-30/metabang-bind-20191130-git.tgz
+    MD5 b0845abb1eadb83e33e91c8d4ad88d2f NAME metabang-bind FILENAME
+    metabang-bind DEPS NIL DEPENDENCIES NIL VERSION 20191130-git SIBLINGS
     (metabang-bind-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
index 8ffcbc784ff7..d9146cede100 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''proc-parse'';
-  version = ''20160318-git'';
+  version = ''20190813-git'';
 
   description = ''Procedural vector parser'';
 
   deps = [ args."alexandria" args."babel" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/proc-parse/2016-03-18/proc-parse-20160318-git.tgz'';
-    sha256 = ''00261w269w9chg6r3sh8hg8994njbsai1g3zni0whm2dzxxq6rnl'';
+    url = ''http://beta.quicklisp.org/archive/proc-parse/2019-08-13/proc-parse-20190813-git.tgz'';
+    sha256 = ''126l7mqxjcgw2limddgrdq63cdhwkhaxabxl9l0bjadf92nczg0j'';
   };
 
   packageName = "proc-parse";
@@ -18,11 +18,11 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM proc-parse DESCRIPTION Procedural vector parser SHA256
-    00261w269w9chg6r3sh8hg8994njbsai1g3zni0whm2dzxxq6rnl URL
-    http://beta.quicklisp.org/archive/proc-parse/2016-03-18/proc-parse-20160318-git.tgz
-    MD5 5e43f50284fa70c448a3df12d1eea2ea NAME proc-parse FILENAME proc-parse
+    126l7mqxjcgw2limddgrdq63cdhwkhaxabxl9l0bjadf92nczg0j URL
+    http://beta.quicklisp.org/archive/proc-parse/2019-08-13/proc-parse-20190813-git.tgz
+    MD5 99bdce79943071267c6a877d8de246c5 NAME proc-parse FILENAME proc-parse
     DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME trivial-features FILENAME trivial-features))
-    DEPENDENCIES (alexandria babel trivial-features) VERSION 20160318-git
+    DEPENDENCIES (alexandria babel trivial-features) VERSION 20190813-git
     SIBLINGS (proc-parse-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
index f6022cb2a1f2..08d83d1bb2ca 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''quri'';
-  version = ''20190521-git'';
+  version = ''20191130-git'';
 
   description = ''Yet another URI library for Common Lisp'';
 
   deps = [ args."alexandria" args."babel" args."cl-utilities" args."split-sequence" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/quri/2019-05-21/quri-20190521-git.tgz'';
-    sha256 = ''1khhdhn1isszii52xaibn6m4hv4sm5j2v0vgc2rp1x05xds9rzs2'';
+    url = ''http://beta.quicklisp.org/archive/quri/2019-11-30/quri-20191130-git.tgz'';
+    sha256 = ''00j71xf4c81w4lby22w2nm508djj36z4v4g3k5qsw16ylf92pkbs'';
   };
 
   packageName = "quri";
@@ -18,13 +18,13 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM quri DESCRIPTION Yet another URI library for Common Lisp SHA256
-    1khhdhn1isszii52xaibn6m4hv4sm5j2v0vgc2rp1x05xds9rzs2 URL
-    http://beta.quicklisp.org/archive/quri/2019-05-21/quri-20190521-git.tgz MD5
-    c2e37013c3b8e109aeb009719e9492ac NAME quri FILENAME quri DEPS
+    00j71xf4c81w4lby22w2nm508djj36z4v4g3k5qsw16ylf92pkbs URL
+    http://beta.quicklisp.org/archive/quri/2019-11-30/quri-20191130-git.tgz MD5
+    4a3e8d2ebe459ea731738650c2c5bf56 NAME quri FILENAME quri DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cl-utilities FILENAME cl-utilities)
      (NAME split-sequence FILENAME split-sequence)
      (NAME trivial-features FILENAME trivial-features))
     DEPENDENCIES
     (alexandria babel cl-utilities split-sequence trivial-features) VERSION
-    20190521-git SIBLINGS (quri-test) PARASITES NIL) */
+    20191130-git SIBLINGS (quri-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix
new file mode 100644
index 000000000000..53a1d41a7be2
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rove.nix
@@ -0,0 +1,29 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''rove'';
+  version = ''20191007-git'';
+
+  description = ''Yet another testing framework intended to be a successor of Prove'';
+
+  deps = [ args."bordeaux-threads" args."dissect" args."trivial-gray-streams" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/rove/2019-10-07/rove-20191007-git.tgz'';
+    sha256 = ''0ngklk69rn13qgsy9h07sqfqzyl1wqsfrp7izx6whgs62bm0vixa'';
+  };
+
+  packageName = "rove";
+
+  asdFilesToKeep = ["rove.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM rove DESCRIPTION
+    Yet another testing framework intended to be a successor of Prove SHA256
+    0ngklk69rn13qgsy9h07sqfqzyl1wqsfrp7izx6whgs62bm0vixa URL
+    http://beta.quicklisp.org/archive/rove/2019-10-07/rove-20191007-git.tgz MD5
+    7ce5d3b0b423f8b68665bbcc51cf18a1 NAME rove FILENAME rove DEPS
+    ((NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME dissect FILENAME dissect)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams))
+    DEPENDENCIES (bordeaux-threads dissect trivial-gray-streams) VERSION
+    20191007-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix
index 24ac9348005c..b67bf001b26d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''serapeum'';
-  version = ''20190710-git'';
+  version = ''20191227-git'';
 
   description = ''Utilities beyond Alexandria.'';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-extras" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."global-vars" args."introspect-environment" args."iterate" args."lisp-namespace" args."named-readtables" args."optima" args."parse-declarations-1_dot_0" args."parse-number" args."split-sequence" args."string-case" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" args."trivial-file-size" args."trivial-garbage" args."trivial-macroexpand-all" args."type-i" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/serapeum/2019-07-10/serapeum-20190710-git.tgz'';
-    sha256 = ''1yvpv8808q24r4fbi2apks12b94az41if2ny1i1ddv9h00vzvpy5'';
+    url = ''http://beta.quicklisp.org/archive/serapeum/2019-12-27/serapeum-20191227-git.tgz'';
+    sha256 = ''1d1yyzj1m0fqlr6dvq7njmkl1zdkj00jbd09l281971qwhfhmarr'';
   };
 
   packageName = "serapeum";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM serapeum DESCRIPTION Utilities beyond Alexandria. SHA256
-    1yvpv8808q24r4fbi2apks12b94az41if2ny1i1ddv9h00vzvpy5 URL
-    http://beta.quicklisp.org/archive/serapeum/2019-07-10/serapeum-20190710-git.tgz
-    MD5 60e2073fccc750d5b56a7e0814756e1c NAME serapeum FILENAME serapeum DEPS
+    1d1yyzj1m0fqlr6dvq7njmkl1zdkj00jbd09l281971qwhfhmarr URL
+    http://beta.quicklisp.org/archive/serapeum/2019-12-27/serapeum-20191227-git.tgz
+    MD5 dabf40eb6c6af7509da66450790cbf4e NAME serapeum FILENAME serapeum DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME closer-mop FILENAME closer-mop)
@@ -58,4 +58,4 @@ rec {
      string-case trivia trivia.balland2006 trivia.level0 trivia.level1
      trivia.level2 trivia.quasiquote trivia.trivial trivial-cltl2
      trivial-file-size trivial-garbage trivial-macroexpand-all type-i uiop)
-    VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */
+    VERSION 20191227-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
index 9f125cfd52a3..ccf102aaad53 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''simple-date'';
-  version = ''postmodern-20190521-git'';
+  version = ''postmodern-20191227-git'';
 
   parasites = [ "simple-date/postgres-glue" "simple-date/tests" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."cl-postgres" args."fiveam" args."md5" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/postmodern/2019-05-21/postmodern-20190521-git.tgz'';
-    sha256 = ''1vphrizbhbs3r5rq4b8dh4149bz11h5xxilragwf4l2i619k3cp5'';
+    url = ''http://beta.quicklisp.org/archive/postmodern/2019-12-27/postmodern-20191227-git.tgz'';
+    sha256 = ''1p44aphx7y0lh018pk2r9w006vinc5yrfrp1m9l9648p2jxiw1c4'';
   };
 
   packageName = "simple-date";
@@ -20,12 +20,12 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM simple-date DESCRIPTION System lacks description SHA256
-    1vphrizbhbs3r5rq4b8dh4149bz11h5xxilragwf4l2i619k3cp5 URL
-    http://beta.quicklisp.org/archive/postmodern/2019-05-21/postmodern-20190521-git.tgz
-    MD5 102567f386757cd52aca500c0c348d90 NAME simple-date FILENAME simple-date
+    1p44aphx7y0lh018pk2r9w006vinc5yrfrp1m9l9648p2jxiw1c4 URL
+    http://beta.quicklisp.org/archive/postmodern/2019-12-27/postmodern-20191227-git.tgz
+    MD5 67b909de432e6414e7832eed18f9ad18 NAME simple-date FILENAME simple-date
     DEPS
     ((NAME cl-postgres FILENAME cl-postgres) (NAME fiveam FILENAME fiveam)
      (NAME md5 FILENAME md5) (NAME usocket FILENAME usocket))
     DEPENDENCIES (cl-postgres fiveam md5 usocket) VERSION
-    postmodern-20190521-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES
+    postmodern-20191227-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES
     (simple-date/postgres-glue simple-date/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
index 57dec7c93cac..ac04ba80a0d5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''sqlite'';
-  version = ''cl-20130615-git'';
+  version = ''cl-20190813-git'';
 
-  description = ''System lacks description'';
+  description = ''CL-SQLITE package is an interface to the SQLite embedded relational database engine.'';
 
   deps = [ args."alexandria" args."babel" args."cffi" args."iterate" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-sqlite/2013-06-15/cl-sqlite-20130615-git.tgz'';
-    sha256 = ''0db1fvvnsrnxmp272ycnl2kwhymjwrimr8z4djvjlg6cvjxk6lqh'';
+    url = ''http://beta.quicklisp.org/archive/cl-sqlite/2019-08-13/cl-sqlite-20190813-git.tgz'';
+    sha256 = ''07zla2h7i7ggmzsyj33f12vpxvcbbvq6x022c2dy13flx8a83rmk'';
   };
 
   packageName = "sqlite";
@@ -17,12 +17,13 @@ rec {
   asdFilesToKeep = ["sqlite.asd"];
   overrides = x: x;
 }
-/* (SYSTEM sqlite DESCRIPTION System lacks description SHA256
-    0db1fvvnsrnxmp272ycnl2kwhymjwrimr8z4djvjlg6cvjxk6lqh URL
-    http://beta.quicklisp.org/archive/cl-sqlite/2013-06-15/cl-sqlite-20130615-git.tgz
-    MD5 93be7c68f587d830941be55f2c2f1c8b NAME sqlite FILENAME sqlite DEPS
+/* (SYSTEM sqlite DESCRIPTION
+    CL-SQLITE package is an interface to the SQLite embedded relational database engine.
+    SHA256 07zla2h7i7ggmzsyj33f12vpxvcbbvq6x022c2dy13flx8a83rmk URL
+    http://beta.quicklisp.org/archive/cl-sqlite/2019-08-13/cl-sqlite-20190813-git.tgz
+    MD5 2269773eeb4a101ddd3b33f0f7e05e76 NAME sqlite FILENAME sqlite DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cffi FILENAME cffi) (NAME iterate FILENAME iterate)
      (NAME trivial-features FILENAME trivial-features))
     DEPENDENCIES (alexandria babel cffi iterate trivial-features) VERSION
-    cl-20130615-git SIBLINGS NIL PARASITES NIL) */
+    cl-20190813-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
index 1cd4e4c44027..7dc242858c6c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''static-vectors'';
-  version = ''v1.8.3'';
+  version = ''v1.8.4'';
 
   parasites = [ "static-vectors/test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."fiveam" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/static-vectors/2017-10-19/static-vectors-v1.8.3.tgz'';
-    sha256 = ''084690v6xldb9xysgc4hg284j0j9ppxldz4gxwmfin1dzxq0g6xk'';
+    url = ''http://beta.quicklisp.org/archive/static-vectors/2019-11-30/static-vectors-v1.8.4.tgz'';
+    sha256 = ''07z3nrsf5ds5iqilpi8awfk5flgy0k58znnn94xlx82hznw4hwxp'';
   };
 
   packageName = "static-vectors";
@@ -21,9 +21,9 @@ rec {
 }
 /* (SYSTEM static-vectors DESCRIPTION
     Create vectors allocated in static memory. SHA256
-    084690v6xldb9xysgc4hg284j0j9ppxldz4gxwmfin1dzxq0g6xk URL
-    http://beta.quicklisp.org/archive/static-vectors/2017-10-19/static-vectors-v1.8.3.tgz
-    MD5 cbad9e34904eedde61cd4cddcca6de29 NAME static-vectors FILENAME
+    07z3nrsf5ds5iqilpi8awfk5flgy0k58znnn94xlx82hznw4hwxp URL
+    http://beta.quicklisp.org/archive/static-vectors/2019-11-30/static-vectors-v1.8.4.tgz
+    MD5 401085c3ec0edc3ab47409e5a4b534c7 NAME static-vectors FILENAME
     static-vectors DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -32,4 +32,4 @@ rec {
      (NAME trivial-features FILENAME trivial-features))
     DEPENDENCIES
     (alexandria babel cffi cffi-grovel cffi-toolchain fiveam trivial-features)
-    VERSION v1.8.3 SIBLINGS NIL PARASITES (static-vectors/test)) */
+    VERSION v1.8.4 SIBLINGS NIL PARASITES (static-vectors/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix
index d4004f3f8b50..bb5424438340 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''str'';
-  version = ''cl-20190710-git'';
+  version = ''cl-20191227-git'';
 
   description = ''Modern, consistent and terse Common Lisp string manipulation library.'';
 
-  deps = [ args."cl-ppcre" ];
+  deps = [ args."cl-change-case" args."cl-ppcre" args."cl-ppcre-unicode" args."cl-unicode" args."flexi-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-str/2019-07-10/cl-str-20190710-git.tgz'';
-    sha256 = ''1mlnrj9g1d7zbpq6c4vhyw0idhvbm55zpzrbc8iiyv0dzijk70l9'';
+    url = ''http://beta.quicklisp.org/archive/cl-str/2019-12-27/cl-str-20191227-git.tgz'';
+    sha256 = ''0dakksvrd6s96szwhwd89i0hy9mjff2vck30bdnvb6prkwg2c2g6'';
   };
 
   packageName = "str";
@@ -19,8 +19,14 @@ rec {
 }
 /* (SYSTEM str DESCRIPTION
     Modern, consistent and terse Common Lisp string manipulation library.
-    SHA256 1mlnrj9g1d7zbpq6c4vhyw0idhvbm55zpzrbc8iiyv0dzijk70l9 URL
-    http://beta.quicklisp.org/archive/cl-str/2019-07-10/cl-str-20190710-git.tgz
-    MD5 d3c72394ea33291347d8c825c153c143 NAME str FILENAME str DEPS
-    ((NAME cl-ppcre FILENAME cl-ppcre)) DEPENDENCIES (cl-ppcre) VERSION
-    cl-20190710-git SIBLINGS (str.test) PARASITES NIL) */
+    SHA256 0dakksvrd6s96szwhwd89i0hy9mjff2vck30bdnvb6prkwg2c2g6 URL
+    http://beta.quicklisp.org/archive/cl-str/2019-12-27/cl-str-20191227-git.tgz
+    MD5 b2800b32209061b274432c7e699d92b4 NAME str FILENAME str DEPS
+    ((NAME cl-change-case FILENAME cl-change-case)
+     (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-ppcre-unicode FILENAME cl-ppcre-unicode)
+     (NAME cl-unicode FILENAME cl-unicode)
+     (NAME flexi-streams FILENAME flexi-streams))
+    DEPENDENCIES
+    (cl-change-case cl-ppcre cl-ppcre-unicode cl-unicode flexi-streams) VERSION
+    cl-20191227-git SIBLINGS (str.test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
index e89eb1971d60..a90e497d449c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''stumpwm'';
-  version = ''20190710-git'';
+  version = ''20191227-git'';
 
   description = ''A tiling, keyboard driven window manager'';
 
   deps = [ args."alexandria" args."cl-ppcre" args."clx" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/stumpwm/2019-07-10/stumpwm-20190710-git.tgz'';
-    sha256 = ''10msx6a7s28aqkdz6x847n5jhg9sykvx96p3gh2pq1ab71wq1l3w'';
+    url = ''http://beta.quicklisp.org/archive/stumpwm/2019-12-27/stumpwm-20191227-git.tgz'';
+    sha256 = ''1dlw4y1mpsmgx7r0mdiccvnv56xpbq0rigyb2n04kq4hkp7zj6rm'';
   };
 
   packageName = "stumpwm";
@@ -18,10 +18,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256
-    10msx6a7s28aqkdz6x847n5jhg9sykvx96p3gh2pq1ab71wq1l3w URL
-    http://beta.quicklisp.org/archive/stumpwm/2019-07-10/stumpwm-20190710-git.tgz
-    MD5 7956cf3486c586f137b75f8b8c0e677c NAME stumpwm FILENAME stumpwm DEPS
+    1dlw4y1mpsmgx7r0mdiccvnv56xpbq0rigyb2n04kq4hkp7zj6rm URL
+    http://beta.quicklisp.org/archive/stumpwm/2019-12-27/stumpwm-20191227-git.tgz
+    MD5 247f56ddbdc8bdf4cf087a467ddce6f6 NAME stumpwm FILENAME stumpwm DEPS
     ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre)
      (NAME clx FILENAME clx))
-    DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20190710-git SIBLINGS
+    DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20191227-git SIBLINGS
     (stumpwm-tests) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
index f0df3b84f153..de11d48c9341 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''swap-bytes'';
-  version = ''v1.1'';
+  version = ''v1.2'';
 
   parasites = [ "swap-bytes/test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."fiveam" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/swap-bytes/2016-09-29/swap-bytes-v1.1.tgz'';
-    sha256 = ''0snwbfplqhg1y4y4m7lgvksg1hs0sygfikz3rlbkfl4gwg8pq8ky'';
+    url = ''http://beta.quicklisp.org/archive/swap-bytes/2019-11-30/swap-bytes-v1.2.tgz'';
+    sha256 = ''05g37m4cpsszh16jz7kiscd6m6l66ms73f3s6s94i56c49jfxdy8'';
   };
 
   packageName = "swap-bytes";
@@ -20,11 +20,11 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM swap-bytes DESCRIPTION Optimized byte-swapping primitives. SHA256
-    0snwbfplqhg1y4y4m7lgvksg1hs0sygfikz3rlbkfl4gwg8pq8ky URL
-    http://beta.quicklisp.org/archive/swap-bytes/2016-09-29/swap-bytes-v1.1.tgz
-    MD5 dda8b3b0a4e345879e80a3cc398667bb NAME swap-bytes FILENAME swap-bytes
+    05g37m4cpsszh16jz7kiscd6m6l66ms73f3s6s94i56c49jfxdy8 URL
+    http://beta.quicklisp.org/archive/swap-bytes/2019-11-30/swap-bytes-v1.2.tgz
+    MD5 eea516d7fdbe20bc963a6708c225d719 NAME swap-bytes FILENAME swap-bytes
     DEPS
     ((NAME fiveam FILENAME fiveam)
      (NAME trivial-features FILENAME trivial-features))
-    DEPENDENCIES (fiveam trivial-features) VERSION v1.1 SIBLINGS NIL PARASITES
+    DEPENDENCIES (fiveam trivial-features) VERSION v1.2 SIBLINGS NIL PARASITES
     (swap-bytes/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix
index 74c84f0520f2..3051d3cd5a95 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''trivia'';
-  version = ''20190710-git'';
+  version = ''20191227-git'';
 
   description = ''NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase'';
 
   deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz'';
-    sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic'';
+    url = ''http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz'';
+    sha256 = ''1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q'';
   };
 
   packageName = "trivia";
@@ -19,9 +19,9 @@ rec {
 }
 /* (SYSTEM trivia DESCRIPTION
     NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase
-    SHA256 0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL
-    http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz
-    MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia FILENAME trivia DEPS
+    SHA256 1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q URL
+    http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz
+    MD5 645f0e0fcf57ab37ebd4f0a1b7b05854 NAME trivia FILENAME trivia DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME closer-mop FILENAME closer-mop)
      (NAME introspect-environment FILENAME introspect-environment)
@@ -37,7 +37,7 @@ rec {
     (alexandria closer-mop introspect-environment iterate lisp-namespace
      trivia.balland2006 trivia.level0 trivia.level1 trivia.level2
      trivia.trivial trivial-cltl2 type-i)
-    VERSION 20190710-git SIBLINGS
+    VERSION 20191227-git SIBLINGS
     (trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0
      trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test
      trivia.trivial)
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix
index d1237b5ac261..1559589c9c34 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''trivia_dot_balland2006'';
-  version = ''trivia-20190710-git'';
+  version = ''trivia-20191227-git'';
 
   description = ''Optimizer for Trivia based on (Balland 2006)'';
 
   deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz'';
-    sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic'';
+    url = ''http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz'';
+    sha256 = ''1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q'';
   };
 
   packageName = "trivia.balland2006";
@@ -19,9 +19,9 @@ rec {
 }
 /* (SYSTEM trivia.balland2006 DESCRIPTION
     Optimizer for Trivia based on (Balland 2006) SHA256
-    0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL
-    http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz
-    MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.balland2006 FILENAME
+    1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q URL
+    http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz
+    MD5 645f0e0fcf57ab37ebd4f0a1b7b05854 NAME trivia.balland2006 FILENAME
     trivia_dot_balland2006 DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME closer-mop FILENAME closer-mop)
@@ -37,7 +37,7 @@ rec {
     (alexandria closer-mop introspect-environment iterate lisp-namespace
      trivia.level0 trivia.level1 trivia.level2 trivia.trivial trivial-cltl2
      type-i)
-    VERSION trivia-20190710-git SIBLINGS
+    VERSION trivia-20191227-git SIBLINGS
     (trivia trivia.benchmark trivia.cffi trivia.level0 trivia.level1
      trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial)
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix
index 30f823625373..7d38ca2f2da5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''trivia_dot_level0'';
-  version = ''trivia-20190710-git'';
+  version = ''trivia-20191227-git'';
 
   description = ''Bootstrapping Pattern Matching Library for implementing Trivia'';
 
   deps = [ args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz'';
-    sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic'';
+    url = ''http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz'';
+    sha256 = ''1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q'';
   };
 
   packageName = "trivia.level0";
@@ -19,11 +19,11 @@ rec {
 }
 /* (SYSTEM trivia.level0 DESCRIPTION
     Bootstrapping Pattern Matching Library for implementing Trivia SHA256
-    0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL
-    http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz
-    MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.level0 FILENAME
+    1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q URL
+    http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz
+    MD5 645f0e0fcf57ab37ebd4f0a1b7b05854 NAME trivia.level0 FILENAME
     trivia_dot_level0 DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES
-    (alexandria) VERSION trivia-20190710-git SIBLINGS
+    (alexandria) VERSION trivia-20191227-git SIBLINGS
     (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level1
      trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial)
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix
index 13680b8706c8..66c38c0d10ef 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''trivia_dot_level1'';
-  version = ''trivia-20190710-git'';
+  version = ''trivia-20191227-git'';
 
   description = ''Core patterns of Trivia'';
 
   deps = [ args."alexandria" args."trivia_dot_level0" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz'';
-    sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic'';
+    url = ''http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz'';
+    sha256 = ''1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q'';
   };
 
   packageName = "trivia.level1";
@@ -18,13 +18,13 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM trivia.level1 DESCRIPTION Core patterns of Trivia SHA256
-    0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL
-    http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz
-    MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.level1 FILENAME
+    1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q URL
+    http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz
+    MD5 645f0e0fcf57ab37ebd4f0a1b7b05854 NAME trivia.level1 FILENAME
     trivia_dot_level1 DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME trivia.level0 FILENAME trivia_dot_level0))
-    DEPENDENCIES (alexandria trivia.level0) VERSION trivia-20190710-git
+    DEPENDENCIES (alexandria trivia.level0) VERSION trivia-20191227-git
     SIBLINGS
     (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0
      trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial)
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix
index acbcd0b31ecb..1df169d4abd4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''trivia_dot_level2'';
-  version = ''trivia-20190710-git'';
+  version = ''trivia-20191227-git'';
 
   description = ''NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase'';
 
   deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivial-cltl2" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz'';
-    sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic'';
+    url = ''http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz'';
+    sha256 = ''1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q'';
   };
 
   packageName = "trivia.level2";
@@ -19,9 +19,9 @@ rec {
 }
 /* (SYSTEM trivia.level2 DESCRIPTION
     NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase
-    SHA256 0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL
-    http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz
-    MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.level2 FILENAME
+    SHA256 1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q URL
+    http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz
+    MD5 645f0e0fcf57ab37ebd4f0a1b7b05854 NAME trivia.level2 FILENAME
     trivia_dot_level2 DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME closer-mop FILENAME closer-mop)
@@ -32,7 +32,7 @@ rec {
     DEPENDENCIES
     (alexandria closer-mop lisp-namespace trivia.level0 trivia.level1
      trivial-cltl2)
-    VERSION trivia-20190710-git SIBLINGS
+    VERSION trivia-20191227-git SIBLINGS
     (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0
      trivia.level1 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial)
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix
index 4b81f2fa7fa0..9150c2b3d0fc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''trivia_dot_quasiquote'';
-  version = ''trivia-20190710-git'';
+  version = ''trivia-20191227-git'';
 
   description = ''fare-quasiquote extension for trivia'';
 
   deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-readtable" args."fare-utils" args."lisp-namespace" args."named-readtables" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz'';
-    sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic'';
+    url = ''http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz'';
+    sha256 = ''1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q'';
   };
 
   packageName = "trivia.quasiquote";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM trivia.quasiquote DESCRIPTION fare-quasiquote extension for trivia
-    SHA256 0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL
-    http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz
-    MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.quasiquote FILENAME
+    SHA256 1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q URL
+    http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz
+    MD5 645f0e0fcf57ab37ebd4f0a1b7b05854 NAME trivia.quasiquote FILENAME
     trivia_dot_quasiquote DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME closer-mop FILENAME closer-mop)
@@ -38,7 +38,7 @@ rec {
     (alexandria closer-mop fare-quasiquote fare-quasiquote-readtable fare-utils
      lisp-namespace named-readtables trivia.level0 trivia.level1 trivia.level2
      trivia.trivial trivial-cltl2)
-    VERSION trivia-20190710-git SIBLINGS
+    VERSION trivia-20191227-git SIBLINGS
     (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0
      trivia.level1 trivia.level2 trivia.ppcre trivia.test trivia.trivial)
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix
index b82f6089b06f..9d8a1a3acb1e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''trivia_dot_trivial'';
-  version = ''trivia-20190710-git'';
+  version = ''trivia-20191227-git'';
 
   description = ''Base level system of Trivia with a trivial optimizer.
  Systems that intend to enhance Trivia should depend on this package, not the TRIVIA system,
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivial-cltl2" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz'';
-    sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic'';
+    url = ''http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz'';
+    sha256 = ''1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q'';
   };
 
   packageName = "trivia.trivial";
@@ -23,9 +23,9 @@ rec {
     Base level system of Trivia with a trivial optimizer.
  Systems that intend to enhance Trivia should depend on this package, not the TRIVIA system,
  in order to avoid the circular dependency.
-    SHA256 0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL
-    http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz
-    MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.trivial FILENAME
+    SHA256 1hn6klc2jlh2qhlc4zr9fi02kqlyfyh5bkcgirql1m06g4j8qi4q URL
+    http://beta.quicklisp.org/archive/trivia/2019-12-27/trivia-20191227-git.tgz
+    MD5 645f0e0fcf57ab37ebd4f0a1b7b05854 NAME trivia.trivial FILENAME
     trivia_dot_trivial DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME closer-mop FILENAME closer-mop)
@@ -37,7 +37,7 @@ rec {
     DEPENDENCIES
     (alexandria closer-mop lisp-namespace trivia.level0 trivia.level1
      trivia.level2 trivial-cltl2)
-    VERSION trivia-20190710-git SIBLINGS
+    VERSION trivia-20191227-git SIBLINGS
     (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0
      trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test)
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
index 33eedbaa8184..de16d810824a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''trivial-indent'';
-  version = ''20190710-git'';
+  version = ''20191007-git'';
 
   description = ''A very simple library to allow indentation hints for SWANK.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-indent/2019-07-10/trivial-indent-20190710-git.tgz'';
-    sha256 = ''00s35j8cf1ivwc1l55wprx1a78mvnxaz6innwwb3jan1sl3caycx'';
+    url = ''http://beta.quicklisp.org/archive/trivial-indent/2019-10-07/trivial-indent-20191007-git.tgz'';
+    sha256 = ''0v5isxg6lfbgcpmndb3c515d7bswhwqgjm97li85w39krnw1bfmv'';
   };
 
   packageName = "trivial-indent";
@@ -19,8 +19,8 @@ rec {
 }
 /* (SYSTEM trivial-indent DESCRIPTION
     A very simple library to allow indentation hints for SWANK. SHA256
-    00s35j8cf1ivwc1l55wprx1a78mvnxaz6innwwb3jan1sl3caycx URL
-    http://beta.quicklisp.org/archive/trivial-indent/2019-07-10/trivial-indent-20190710-git.tgz
-    MD5 a5026ac3d68e02fce100761e546a0d77 NAME trivial-indent FILENAME
-    trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL
+    0v5isxg6lfbgcpmndb3c515d7bswhwqgjm97li85w39krnw1bfmv URL
+    http://beta.quicklisp.org/archive/trivial-indent/2019-10-07/trivial-indent-20191007-git.tgz
+    MD5 d0489ff824d58c03b5c2a9b16279f583 NAME trivial-indent FILENAME
+    trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20191007-git SIBLINGS NIL
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix
index 40e718cc10bf..e76be59540b6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''type-i'';
-  version = ''20190521-git'';
+  version = ''20191227-git'';
 
   description = ''Type Inference Utility on Fundamentally 1-arg Predicates'';
 
   deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/type-i/2019-05-21/type-i-20190521-git.tgz'';
-    sha256 = ''1d79g3vd8s387rqagrkf1nmxax6kq32j1ddjrnx7ly08ib6aca99'';
+    url = ''http://beta.quicklisp.org/archive/type-i/2019-12-27/type-i-20191227-git.tgz'';
+    sha256 = ''0f8q6klqjgz1kdyhisfkk07izvgs04jchlv2kl3srjxfr5dj5jl5'';
   };
 
   packageName = "type-i";
@@ -19,9 +19,9 @@ rec {
 }
 /* (SYSTEM type-i DESCRIPTION
     Type Inference Utility on Fundamentally 1-arg Predicates SHA256
-    1d79g3vd8s387rqagrkf1nmxax6kq32j1ddjrnx7ly08ib6aca99 URL
-    http://beta.quicklisp.org/archive/type-i/2019-05-21/type-i-20190521-git.tgz
-    MD5 9906855a0650f93186f37e162429e58b NAME type-i FILENAME type-i DEPS
+    0f8q6klqjgz1kdyhisfkk07izvgs04jchlv2kl3srjxfr5dj5jl5 URL
+    http://beta.quicklisp.org/archive/type-i/2019-12-27/type-i-20191227-git.tgz
+    MD5 af344179d3f97b836d1e3106f8d1c306 NAME type-i FILENAME type-i DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME closer-mop FILENAME closer-mop)
      (NAME introspect-environment FILENAME introspect-environment)
@@ -34,4 +34,4 @@ rec {
     DEPENDENCIES
     (alexandria closer-mop introspect-environment lisp-namespace trivia.level0
      trivia.level1 trivia.level2 trivia.trivial trivial-cltl2)
-    VERSION 20190521-git SIBLINGS (type-i.test) PARASITES NIL) */
+    VERSION 20191227-git SIBLINGS (type-i.test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
index c3928cf0e4cc..6b75384ea10c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''usocket'';
-  version = ''0.8.2'';
+  version = ''0.8.3'';
 
   description = ''Universal socket library for Common Lisp'';
 
   deps = [ args."split-sequence" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/usocket/2019-07-10/usocket-0.8.2.tgz'';
-    sha256 = ''0g5niqwzh4y6f25lnjx1qyzl0yg906zq2sy7ck67f7bcmc79w8zm'';
+    url = ''http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz'';
+    sha256 = ''19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7'';
   };
 
   packageName = "usocket";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM usocket DESCRIPTION Universal socket library for Common Lisp SHA256
-    0g5niqwzh4y6f25lnjx1qyzl0yg906zq2sy7ck67f7bcmc79w8zm URL
-    http://beta.quicklisp.org/archive/usocket/2019-07-10/usocket-0.8.2.tgz MD5
-    0218443cd70b675d9b09c1bf09cd9da4 NAME usocket FILENAME usocket DEPS
+    19gl72r9jqms8slzn7i7bww2cqng9mhiqqhhccadlrx2xv6d3lm7 URL
+    http://beta.quicklisp.org/archive/usocket/2019-12-27/usocket-0.8.3.tgz MD5
+    b1103034f32565487ab3b6eb92c0ca2b NAME usocket FILENAME usocket DEPS
     ((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES
-    (split-sequence) VERSION 0.8.2 SIBLINGS (usocket-server usocket-test)
+    (split-sequence) VERSION 0.8.3 SIBLINGS (usocket-server usocket-test)
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
index 59a41a7cf9ae..ecb0ba3762e6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''woo'';
-  version = ''20190710-git'';
+  version = ''20191130-git'';
 
   description = ''An asynchronous HTTP server written in Common Lisp'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."vom" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/woo/2019-07-10/woo-20190710-git.tgz'';
-    sha256 = ''16fxk75bfb6g3998wqra93a7w4n0yqqi1i8w8dx8yiyy9yb7jij5'';
+    url = ''http://beta.quicklisp.org/archive/woo/2019-11-30/woo-20191130-git.tgz'';
+    sha256 = ''18pw094i6damqsjx0v9jymvib0dhlr5s5bly1dphfnvfz5czs6j2'';
   };
 
   packageName = "woo";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM woo DESCRIPTION An asynchronous HTTP server written in Common Lisp
-    SHA256 16fxk75bfb6g3998wqra93a7w4n0yqqi1i8w8dx8yiyy9yb7jij5 URL
-    http://beta.quicklisp.org/archive/woo/2019-07-10/woo-20190710-git.tgz MD5
-    f35b65dec09276f08c4ca532d077a7a9 NAME woo FILENAME woo DEPS
+    SHA256 18pw094i6damqsjx0v9jymvib0dhlr5s5bly1dphfnvfz5czs6j2 URL
+    http://beta.quicklisp.org/archive/woo/2019-11-30/woo-20191130-git.tgz MD5
+    a876d194ed1ccb7439e3f3b6da63760e NAME woo FILENAME woo DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
@@ -43,4 +43,4 @@ rec {
      cl-utilities clack-socket fast-http fast-io flexi-streams lev proc-parse
      quri smart-buffer split-sequence static-vectors swap-bytes
      trivial-features trivial-gray-streams trivial-utf-8 vom xsubseq)
-    VERSION 20190710-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */
+    VERSION 20191130-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
index f717441068b6..257ed57df4e4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''wookie'';
-  version = ''20181018-git'';
+  version = ''20191130-git'';
 
   description = ''An evented webserver for Common Lisp.'';
 
   deps = [ args."alexandria" args."babel" args."blackbird" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chunga" args."cl-async" args."cl-async-base" args."cl-async-ssl" args."cl-async-util" args."cl-fad" args."cl-libuv" args."cl-ppcre" args."cl-utilities" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/wookie/2018-10-18/wookie-20181018-git.tgz'';
-    sha256 = ''0z7v7fg9dm6g4kdvfi588vnfh0dv2knb0z3rf5a9fw8yrvckifdq'';
+    url = ''http://beta.quicklisp.org/archive/wookie/2019-11-30/wookie-20191130-git.tgz'';
+    sha256 = ''13f9fi7yv28lag79z03jrnm7aih2x5zwvh4hw9cadw75956975d2'';
   };
 
   packageName = "wookie";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM wookie DESCRIPTION An evented webserver for Common Lisp. SHA256
-    0z7v7fg9dm6g4kdvfi588vnfh0dv2knb0z3rf5a9fw8yrvckifdq URL
-    http://beta.quicklisp.org/archive/wookie/2018-10-18/wookie-20181018-git.tgz
-    MD5 91e350e5aca3c3a5c56371bff8f754ae NAME wookie FILENAME wookie DEPS
+    13f9fi7yv28lag79z03jrnm7aih2x5zwvh4hw9cadw75956975d2 URL
+    http://beta.quicklisp.org/archive/wookie/2019-11-30/wookie-20191130-git.tgz
+    MD5 5e5d6537637312919fd528bb1d0c1eba NAME wookie FILENAME wookie DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME blackbird FILENAME blackbird)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -48,4 +48,4 @@ rec {
      cl-fad cl-libuv cl-ppcre cl-utilities do-urlencode fast-http fast-io
      flexi-streams proc-parse quri smart-buffer split-sequence static-vectors
      trivial-features trivial-gray-streams vom xsubseq)
-    VERSION 20181018-git SIBLINGS NIL PARASITES NIL) */
+    VERSION 20191130-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
index 9854567fd5bf..5a1b9039425f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xembed.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''xembed'';
-  version = ''clx-20190307-git'';
+  version = ''clx-20191130-git'';
 
   description = ''An implementation of the XEMBED protocol that integrates with CLX.'';
 
   deps = [ args."clx" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clx-xembed/2019-03-07/clx-xembed-20190307-git.tgz'';
-    sha256 = ''1a0yy707qdb7sw20lavmhlass3n3ds2pn52jxdkrvpgg358waf3j'';
+    url = ''http://beta.quicklisp.org/archive/clx-xembed/2019-11-30/clx-xembed-20191130-git.tgz'';
+    sha256 = ''1ik5gxzhn9j7827jg6g8rk2wa5jby11n2db24y6wrf0ldnbpj7jd'';
   };
 
   packageName = "xembed";
@@ -19,8 +19,8 @@ rec {
 }
 /* (SYSTEM xembed DESCRIPTION
     An implementation of the XEMBED protocol that integrates with CLX. SHA256
-    1a0yy707qdb7sw20lavmhlass3n3ds2pn52jxdkrvpgg358waf3j URL
-    http://beta.quicklisp.org/archive/clx-xembed/2019-03-07/clx-xembed-20190307-git.tgz
-    MD5 04304f828ea8970b6f5301fe78ed8e10 NAME xembed FILENAME xembed DEPS
-    ((NAME clx FILENAME clx)) DEPENDENCIES (clx) VERSION clx-20190307-git
+    1ik5gxzhn9j7827jg6g8rk2wa5jby11n2db24y6wrf0ldnbpj7jd URL
+    http://beta.quicklisp.org/archive/clx-xembed/2019-11-30/clx-xembed-20191130-git.tgz
+    MD5 11d35eeb734c0694005a5e5cec4cad22 NAME xembed FILENAME xembed DEPS
+    ((NAME clx FILENAME clx)) DEPENDENCIES (clx) VERSION clx-20191130-git
     SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
index e14a540a1783..9f6ac0a84cad 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''yason'';
-  version = ''v0.7.6'';
+  version = ''v0.7.8'';
 
   description = ''JSON parser/encoder'';
 
   deps = [ args."alexandria" args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/yason/2016-02-08/yason-v0.7.6.tgz'';
-    sha256 = ''00gfn14bvnw0in03y5m2ssgvhy3ppf5a3s0rf7mf4rq00c5ifchk'';
+    url = ''http://beta.quicklisp.org/archive/yason/2019-12-27/yason-v0.7.8.tgz'';
+    sha256 = ''11d51i2iw4nxsparwbh3s6w9zyms3wi0z0fprwz1d3sqlf03j6f1'';
   };
 
   packageName = "yason";
@@ -18,10 +18,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM yason DESCRIPTION JSON parser/encoder SHA256
-    00gfn14bvnw0in03y5m2ssgvhy3ppf5a3s0rf7mf4rq00c5ifchk URL
-    http://beta.quicklisp.org/archive/yason/2016-02-08/yason-v0.7.6.tgz MD5
-    79de5d242c5e9ce49dfda153d5f442ec NAME yason FILENAME yason DEPS
+    11d51i2iw4nxsparwbh3s6w9zyms3wi0z0fprwz1d3sqlf03j6f1 URL
+    http://beta.quicklisp.org/archive/yason/2019-12-27/yason-v0.7.8.tgz MD5
+    7c3231635aa494f1721273713ea8c56a NAME yason FILENAME yason DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME trivial-gray-streams FILENAME trivial-gray-streams))
-    DEPENDENCIES (alexandria trivial-gray-streams) VERSION v0.7.6 SIBLINGS NIL
+    DEPENDENCIES (alexandria trivial-gray-streams) VERSION v0.7.8 SIBLINGS NIL
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 972cb78a8857..2e23385175b4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -17,6 +17,18 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "cl-change-case" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-change-case" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-change-case.nix {
+         inherit fetchurl;
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-ppcre-unicode" = quicklisp-to-nix-packages."cl-ppcre-unicode";
+           "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+       }));
+
+
   "type-i" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."type-i" or (x: {}))
@@ -747,6 +759,17 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "rove" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."rove" or (x: {}))
+       (import ./quicklisp-to-nix-output/rove.nix {
+         inherit fetchurl;
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "dissect" = quicklisp-to-nix-packages."dissect";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+       }));
+
+
   "rfc2388" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."rfc2388" or (x: {}))
@@ -859,13 +882,20 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "dissect" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."dissect" or (x: {}))
+       (import ./quicklisp-to-nix-output/dissect.nix {
+         inherit fetchurl;
+       }));
+
+
   "clack-test" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."clack-test" or (x: {}))
        (import ./quicklisp-to-nix-output/clack-test.nix {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "anaphora" = quicklisp-to-nix-packages."anaphora";
            "babel" = quicklisp-to-nix-packages."babel";
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "cffi" = quicklisp-to-nix-packages."cffi";
@@ -875,9 +905,7 @@ let quicklisp-to-nix-packages = rec {
            "chunga" = quicklisp-to-nix-packages."chunga";
            "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl";
            "cl-annot" = quicklisp-to-nix-packages."cl-annot";
-           "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text";
            "cl-base64" = quicklisp-to-nix-packages."cl-base64";
-           "cl-colors" = quicklisp-to-nix-packages."cl-colors";
            "cl-cookie" = quicklisp-to-nix-packages."cl-cookie";
            "cl-fad" = quicklisp-to-nix-packages."cl-fad";
            "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
@@ -889,6 +917,7 @@ let quicklisp-to-nix-packages = rec {
            "clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot";
            "clack-socket" = quicklisp-to-nix-packages."clack-socket";
            "dexador" = quicklisp-to-nix-packages."dexador";
+           "dissect" = quicklisp-to-nix-packages."dissect";
            "fast-http" = quicklisp-to-nix-packages."fast-http";
            "fast-io" = quicklisp-to-nix-packages."fast-io";
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
@@ -900,15 +929,14 @@ let quicklisp-to-nix-packages = rec {
            "lack-component" = quicklisp-to-nix-packages."lack-component";
            "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
            "lack-util" = quicklisp-to-nix-packages."lack-util";
-           "let-plus" = quicklisp-to-nix-packages."let-plus";
            "local-time" = quicklisp-to-nix-packages."local-time";
            "md5" = quicklisp-to-nix-packages."md5";
            "named-readtables" = quicklisp-to-nix-packages."named-readtables";
            "nibbles" = quicklisp-to-nix-packages."nibbles";
            "proc-parse" = quicklisp-to-nix-packages."proc-parse";
-           "prove" = quicklisp-to-nix-packages."prove";
            "quri" = quicklisp-to-nix-packages."quri";
            "rfc2388" = quicklisp-to-nix-packages."rfc2388";
+           "rove" = quicklisp-to-nix-packages."rove";
            "smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
            "static-vectors" = quicklisp-to-nix-packages."static-vectors";
@@ -1313,7 +1341,11 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."str" or (x: {}))
        (import ./quicklisp-to-nix-output/str.nix {
          inherit fetchurl;
+           "cl-change-case" = quicklisp-to-nix-packages."cl-change-case";
            "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-ppcre-unicode" = quicklisp-to-nix-packages."cl-ppcre-unicode";
+           "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
        }));
 
 
@@ -2355,7 +2387,6 @@ let quicklisp-to-nix-packages = rec {
        (import ./quicklisp-to-nix-output/clack-v1-compat.nix {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "anaphora" = quicklisp-to-nix-packages."anaphora";
            "babel" = quicklisp-to-nix-packages."babel";
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "cffi" = quicklisp-to-nix-packages."cffi";
@@ -2366,9 +2397,7 @@ let quicklisp-to-nix-packages = rec {
            "circular-streams" = quicklisp-to-nix-packages."circular-streams";
            "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl";
            "cl-annot" = quicklisp-to-nix-packages."cl-annot";
-           "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text";
            "cl-base64" = quicklisp-to-nix-packages."cl-base64";
-           "cl-colors" = quicklisp-to-nix-packages."cl-colors";
            "cl-cookie" = quicklisp-to-nix-packages."cl-cookie";
            "cl-fad" = quicklisp-to-nix-packages."cl-fad";
            "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
@@ -2381,6 +2410,7 @@ let quicklisp-to-nix-packages = rec {
            "clack-socket" = quicklisp-to-nix-packages."clack-socket";
            "clack-test" = quicklisp-to-nix-packages."clack-test";
            "dexador" = quicklisp-to-nix-packages."dexador";
+           "dissect" = quicklisp-to-nix-packages."dissect";
            "fast-http" = quicklisp-to-nix-packages."fast-http";
            "fast-io" = quicklisp-to-nix-packages."fast-io";
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
@@ -2392,16 +2422,15 @@ let quicklisp-to-nix-packages = rec {
            "lack-component" = quicklisp-to-nix-packages."lack-component";
            "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
            "lack-util" = quicklisp-to-nix-packages."lack-util";
-           "let-plus" = quicklisp-to-nix-packages."let-plus";
            "local-time" = quicklisp-to-nix-packages."local-time";
            "marshal" = quicklisp-to-nix-packages."marshal";
            "md5" = quicklisp-to-nix-packages."md5";
            "named-readtables" = quicklisp-to-nix-packages."named-readtables";
            "nibbles" = quicklisp-to-nix-packages."nibbles";
            "proc-parse" = quicklisp-to-nix-packages."proc-parse";
-           "prove" = quicklisp-to-nix-packages."prove";
            "quri" = quicklisp-to-nix-packages."quri";
            "rfc2388" = quicklisp-to-nix-packages."rfc2388";
+           "rove" = quicklisp-to-nix-packages."rove";
            "smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
            "static-vectors" = quicklisp-to-nix-packages."static-vectors";
@@ -3060,6 +3089,7 @@ let quicklisp-to-nix-packages = rec {
            "clack-test" = quicklisp-to-nix-packages."clack-test";
            "clack-v1-compat" = quicklisp-to-nix-packages."clack-v1-compat";
            "dexador" = quicklisp-to-nix-packages."dexador";
+           "dissect" = quicklisp-to-nix-packages."dissect";
            "do-urlencode" = quicklisp-to-nix-packages."do-urlencode";
            "fast-http" = quicklisp-to-nix-packages."fast-http";
            "fast-io" = quicklisp-to-nix-packages."fast-io";
@@ -3084,6 +3114,7 @@ let quicklisp-to-nix-packages = rec {
            "prove" = quicklisp-to-nix-packages."prove";
            "quri" = quicklisp-to-nix-packages."quri";
            "rfc2388" = quicklisp-to-nix-packages."rfc2388";
+           "rove" = quicklisp-to-nix-packages."rove";
            "smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
            "static-vectors" = quicklisp-to-nix-packages."static-vectors";

From 29c2d042376ef236a80889b763c64ff6ee1fda7a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Mar 2020 20:32:29 +0000
Subject: [PATCH 3181/4636] python27Packages.hvac: 0.9.6 -> 0.10.0

---
 pkgs/development/python-modules/hvac/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix
index 3b5484dcbcb2..08867aa67086 100644
--- a/pkgs/development/python-modules/hvac/default.nix
+++ b/pkgs/development/python-modules/hvac/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "hvac";
-  version = "0.9.6";
+  version = "0.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1v37jabp859691863mw8j06hqxsy16ndf804z2k5y5b0d167j9by";
+    sha256 = "0s0705lk3i1srsjxqhqv9sc2m54fj8lbflxz9gyxf4igxaa6vj1f";
   };
 
   propagatedBuildInputs = [ requests six ];
@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "HashiCorp Vault API client";
-    homepage = https://github.com/ianunruh/hvac;
+    homepage = "https://github.com/ianunruh/hvac";
     license = licenses.asl20;
   };
 }

From 3f1b579b48e38f848c68a2b267fcbfddd86e2b18 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Mar 2020 19:34:03 +0000
Subject: [PATCH 3182/4636] python27Packages.kazoo: 2.6.1 -> 2.7.0

---
 pkgs/development/python-modules/kazoo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/kazoo/default.nix b/pkgs/development/python-modules/kazoo/default.nix
index 7d384ba7cc37..409a3b6c064b 100644
--- a/pkgs/development/python-modules/kazoo/default.nix
+++ b/pkgs/development/python-modules/kazoo/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "kazoo";
-  version = "2.6.1";
+  version = "2.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4a73c2c62a7163ca1c4aef82aa042d795560497cc81034f212ef13cc037cc783";
+    sha256 = "1jvpn1rcnnq3by1y6wlhfl9jynb110xv5lvd0x0ifkld7vfzd0v8";
   };
 
   propagatedBuildInputs = [ six ];

From 4398ab05807943d47f13d161ca8c5fa2b208fdf9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Mar 2020 18:51:05 +0000
Subject: [PATCH 3183/4636] python27Packages.azure-mgmt-cosmosdb: 0.11.0 ->
 0.12.0

---
 .../python-modules/azure-mgmt-cosmosdb/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
index 45542c8e9d57..d3605e3929e7 100644
--- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-cosmosdb";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "3f6c1369903856864c7e4a05c2c261563153597172b182382d6332f3acd04016";
+    sha256 = "07c0hr7nha9789x1wz0ndca0sr0zscq63m9vd8pm1c6y0ss4iyn5";
   };
 
   propagatedBuildInputs = [

From f27a51e36f49e0696c4208315dadd9ffded82c96 Mon Sep 17 00:00:00 2001
From: Herman Fries <baracoder@googlemail.com>
Date: Mon, 9 Mar 2020 23:45:37 +0100
Subject: [PATCH 3184/4636] cura: 4.4.0 -> 4.5.0

---
 pkgs/applications/misc/cura/default.nix                | 8 ++++----
 pkgs/applications/misc/curaengine/default.nix          | 6 +++---
 pkgs/development/python-modules/libarcus/default.nix   | 4 ++--
 pkgs/development/python-modules/libsavitar/default.nix | 4 ++--
 pkgs/development/python-modules/uranium/default.nix    | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index 7187b8c00991..d48efb1a1127 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -2,20 +2,20 @@
 
 mkDerivation rec {
   pname = "cura";
-  version = "4.4.0";
+  version = "4.5.0";
 
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "Cura";
-    rev = "v${version}";
-    sha256 = "131n36qhdfky584wr3zv73ckjjprwaqb5fih8yln2syf8b7ziwlz";
+    rev = version;
+    sha256 = "0fm04s912sgmr66wyb55ly4jh39ijsj6lx4fx9wn7hchlqmw5jxi";
   };
 
   materials = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "fdm_materials";
     rev = version;
-    sha256 = "141cv1f2pv2pznhgj32zg8bw3kmw9002g6rx16jq7lhclr0x3xls";
+    sha256 = "0fgkwz1anw49macq1jxjhjr79slhmx7g3zwij7g9fqyzzhrrmwqn";
   };
 
   buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ];
diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index 6594deb84a5a..2eb256935d77 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "curaengine";
-  version = "4.4.0";
+  version = "4.5.0";
 
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "CuraEngine";
     rev = version;
-    sha256 = "1m89bp4g0dldh7vv1clj110m29ajiaghdq7b49mb3y8ifgrf8rdi";
+    sha256 = "1gml8f6yqmghgncl1zggs7h2hdh05wf68jw9npg0gh7n9l7yzkk4";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction";
-    homepage = https://github.com/Ultimaker/CuraEngine;
+    homepage = "https://github.com/Ultimaker/CuraEngine";
     license = licenses.agpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar gebner ];
diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix
index 97fd448f1838..fdb6ebb3fe32 100644
--- a/pkgs/development/python-modules/libarcus/default.nix
+++ b/pkgs/development/python-modules/libarcus/default.nix
@@ -3,14 +3,14 @@
 
 buildPythonPackage rec {
   pname = "libarcus";
-  version = "4.4.0";
+  version = "4.5.0";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "libArcus";
     rev = version;
-    sha256 = "16m7m6ak5fqw3djn4azwiamkizcc1dv7brv11kv99n3b43zzgn6d";
+    sha256 = "1sfy8skvgw6hiihs9jmfn7a13yappqwffir98pahyg7cim7p55kr";
   };
 
   disabled = pythonOlder "3.4.0";
diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix
index b43468bdf9cb..abde16d8700b 100644
--- a/pkgs/development/python-modules/libsavitar/default.nix
+++ b/pkgs/development/python-modules/libsavitar/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonPackage rec {
   pname = "libsavitar";
-  version = "4.4.0";
+  version = "4.5.0";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "libSavitar";
     rev = version;
-    sha256 = "0sm8945icbdxvyj7yiq9yhkk17ww3gjkpsbk7875qijzlgfs60j8";
+    sha256 = "1l3l8cgaxzqdk93880p2ijrabshdj5sq05cwj1i6jpmhlqc5b9rx";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix
index a8259451bb0f..64333f23929c 100644
--- a/pkgs/development/python-modules/uranium/default.nix
+++ b/pkgs/development/python-modules/uranium/default.nix
@@ -2,7 +2,7 @@
 , pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }:
 
 buildPythonPackage rec {
-  version = "4.4.0";
+  version = "4.5.0";
   pname = "uranium";
   format = "other";
 
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     owner = "Ultimaker";
     repo = "Uranium";
     rev = version;
-    sha256 = "1hy7lhn48mfrmfx6mbqxzc6bfh9ndnvcwjlsb6a71mw62xg6w7c2";
+    sha256 = "1l8fwj521irla42bdbw298d3c5rjpn1nm9xhjnx7hidbqixr5d27";
   };
 
   disabled = pythonOlder "3.5.0";

From 1cc03ca516ad82aa49eaa0ebc4ec42f4aa0d61c2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Mar 2020 19:29:29 +0000
Subject: [PATCH 3185/4636] python27Packages.flask_testing: 0.7.1 -> 0.8.0

---
 pkgs/development/python-modules/flask-testing/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/flask-testing/default.nix b/pkgs/development/python-modules/flask-testing/default.nix
index 04c083a32638..ece8843209c9 100644
--- a/pkgs/development/python-modules/flask-testing/default.nix
+++ b/pkgs/development/python-modules/flask-testing/default.nix
@@ -5,11 +5,11 @@ with stdenv.lib;
 
 buildPythonPackage rec {
   pname = "Flask-Testing";
-  version = "0.7.1";
+  version = "0.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "dc076623d7d850653a018cb64f500948334c8aeb6b10a5a842bf1bcfb98122bc";
+    sha256 = "1rkkqgmrzmhpv6y1xysqh0ij03xniic8h631yvghksqwxd9vyjfq";
   };
 
   postPatch = ''
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Flask unittest integration.";
-    homepage = https://pythonhosted.org/Flask-Testing/;
+    homepage = "https://pythonhosted.org/Flask-Testing/";
     license = licenses.bsd3;
     maintainers = [ maintainers.mic92 ];
   };

From 16001eab7cdeec8c0c5c6c8c463b05518d40cbf4 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 15 Mar 2020 20:15:07 +0100
Subject: [PATCH 3186/4636] passExtensions.pass-audit: 0.1 -> 1.0.1, refactor

Updates to v1.0.1[1] which supports subdirs and zxcvbn[2]-based
complexity checks. Also, the following things changed:

* Add separate output for man-pages
* Enable test-suite (after adding a patch which mocks the
  `pwnedpasswords.com`).
* Added myself as maintainer.

[1] https://github.com/roddhjav/pass-audit/releases/tag/v1.0.1 /
    https://github.com/roddhjav/pass-audit/releases/tag/v1.0

[2] https://pypi.org/project/zxcvbn-python/
---
 pkgs/tools/security/pass/extensions/audit.nix |  42 -----
 ...it-possible-to-run-the-tests-offline.patch | 175 ++++++++++++++++++
 .../audit/0002-Fix-audit.bash-setup.patch     |  28 +++
 .../pass/extensions/audit/default.nix         |  51 +++++
 .../security/pass/extensions/default.nix      |   2 +-
 5 files changed, 255 insertions(+), 43 deletions(-)
 delete mode 100644 pkgs/tools/security/pass/extensions/audit.nix
 create mode 100644 pkgs/tools/security/pass/extensions/audit/0001-Make-it-possible-to-run-the-tests-offline.patch
 create mode 100644 pkgs/tools/security/pass/extensions/audit/0002-Fix-audit.bash-setup.patch
 create mode 100644 pkgs/tools/security/pass/extensions/audit/default.nix

diff --git a/pkgs/tools/security/pass/extensions/audit.nix b/pkgs/tools/security/pass/extensions/audit.nix
deleted file mode 100644
index ca5ca855337f..000000000000
--- a/pkgs/tools/security/pass/extensions/audit.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper }:
-
-let
-  pythonEnv = pythonPackages.python.withPackages (p: [ p.requests ]);
-
-in stdenv.mkDerivation rec {
-  pname = "pass-audit";
-  version = "0.1";
-
-  src = fetchFromGitHub {
-    owner = "roddhjav";
-    repo = "pass-audit";
-    rev = "v${version}";
-    sha256 = "0v0db8bzpcaa7zqz17syn3c78mgvw4mpg8qg1gh5rmbjsjfxw6sm";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  buildInputs = [ pythonEnv ];
-
-  patchPhase = ''
-    sed -i -e "s|/usr/lib|$out/lib|" audit.bash
-    sed -i -e 's|$0|${pass}/bin/pass|' audit.bash
-  '';
-
-  dontBuild = true;
-
-  installFlags = [ "PREFIX=$(out)" ];
-
-  postFixup = ''
-    wrapProgram $out/lib/password-store/extensions/audit.bash \
-      --prefix PATH : "${pythonEnv}/bin" \
-      --run "export PREFIX"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Pass extension for auditing your password repository.";
-    homepage = https://github.com/roddhjav/pass-audit;
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/tools/security/pass/extensions/audit/0001-Make-it-possible-to-run-the-tests-offline.patch b/pkgs/tools/security/pass/extensions/audit/0001-Make-it-possible-to-run-the-tests-offline.patch
new file mode 100644
index 000000000000..36faf3140ccd
--- /dev/null
+++ b/pkgs/tools/security/pass/extensions/audit/0001-Make-it-possible-to-run-the-tests-offline.patch
@@ -0,0 +1,175 @@
+From 37c2b4d2940476555aeec20fe1e5e3fa0492a94e Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch <maximilian@mbosch.me>
+Date: Sun, 15 Mar 2020 19:58:53 +0100
+Subject: [PATCH] Make it possible to run the tests offline
+
+Helpful when developing without network access, also makes sure that
+the test actually depend on the API's data like number of breaches
+(which will change in time).
+---
+ tests/commons.py         | 25 +++++++++++++++++++++++++
+ tests/test_audit.py      |  8 +++++---
+ tests/test_pass_audit.py | 10 +++++++++-
+ tests/test_pwned.py      |  8 +++++---
+ 4 files changed, 44 insertions(+), 7 deletions(-)
+
+diff --git a/tests/commons.py b/tests/commons.py
+index 13c4cb1..4f1ecd8 100644
+--- a/tests/commons.py
++++ b/tests/commons.py
+@@ -56,3 +56,28 @@ class TestPass(TestBase):
+         for path in self.store.list(root):
+             data[path] = self.store.show(path)
+         return data
++
++
++def mock_request(*args, **kwargs):
++    class MockResponse:
++        def __init__(self):
++            data = [
++                "D5EE0CB1A41071812CCED2F1930E6E1A5D2:2",
++                "2DC183F740EE76F27B78EB39C8AD972A757:52579",
++                "CF164D7A51A1FD864B1BF9E1CE8A3EC171B:4",
++                "D0B910E7A3028703C0B30039795E908CEB2:7",
++                "AD6438836DBE526AA231ABDE2D0EEF74D42:3",
++                "EBAB0A7CE978E0194608B572E4F9404AA21:3",
++                "17727EAB0E800E62A776C76381DEFBC4145:120",
++                "5370372AC65308F03F6ED75EC6068C8E1BE:1386",
++                "1E4C9B93F3F0682250B6CF8331B7EE68FD8:3730471",
++                "437FAA5A7FCE15D1DDCB9EAEAEA377667B8:123422",
++                "944C22589AC652B0F47918D58CA0CDCCB63:411"
++            ]
++
++            self.text = "\r\n".join(data)
++
++        def raise_for_status(self):
++            pass
++
++    return MockResponse()
+diff --git a/tests/test_audit.py b/tests/test_audit.py
+index d8c7a9a..5e0a9cf 100644
+--- a/tests/test_audit.py
++++ b/tests/test_audit.py
+@@ -17,12 +17,13 @@
+ #
+ 
+ from .. import pass_audit
+-from tests.commons import TestPass
+-
++from tests.commons import TestPass, mock_request
++from unittest import mock
+ 
+ class TestPassAudit(TestPass):
+     passwords_nb = 7
+ 
++    @mock.patch('requests.get', mock_request)
+     def test_password_notpwned(self):
+         """Testing: pass audit for password not breached with K-anonymity method."""
+         data = self._getdata("Password/notpwned")
+@@ -30,9 +31,10 @@ class TestPassAudit(TestPass):
+         breached = audit.password()
+         self.assertTrue(len(breached) == 0)
+ 
++    @mock.patch('requests.get', mock_request)
+     def test_password_pwned(self):
+         """Testing: pass audit for password breached with K-anonymity method."""
+-        ref_counts = [51259, 3, 114, 1352, 3645804, 78773, 396]
++        ref_counts = [52579, 3, 120, 1386, 3730471, 123422, 411]
+         data = self._getdata("Password/pwned")
+         audit = pass_audit.PassAudit(data)
+         breached = audit.password()
+diff --git a/tests/test_pass_audit.py b/tests/test_pass_audit.py
+index 4c10f87..2c949f7 100644
+--- a/tests/test_pass_audit.py
++++ b/tests/test_pass_audit.py
+@@ -19,7 +19,8 @@
+ import os
+ 
+ from .. import pass_audit
+-from tests.commons import TestPass
++from tests.commons import TestPass, mock_request
++from unittest import mock
+ 
+ 
+ class TestPassAuditCMD(TestPass):
+@@ -47,6 +48,7 @@ class TestPassAuditCMD(TestPass):
+         cmd = ['--not-an-option', '-q']
+         self._passaudit(cmd, 2)
+ 
++    @mock.patch('requests.get', mock_request)
+     def test_pass_audit_StoreNotInitialized(self):
+         """Testing: store not initialized."""
+         cmd = ['Password/', '-v']
+@@ -56,6 +58,7 @@ class TestPassAuditCMD(TestPass):
+         os.rename(os.path.join(self.store.prefix, 'backup.gpg-id'),
+                   os.path.join(self.store.prefix, '.gpg-id'))
+ 
++    @mock.patch('requests.get', mock_request)
+     def test_pass_audit_InvalidID(self):
+         """Testing: invalid user ID."""
+         os.rename(os.path.join(self.store.prefix, '.gpg-id'),
+@@ -66,26 +69,31 @@ class TestPassAuditCMD(TestPass):
+         os.rename(os.path.join(self.store.prefix, 'backup.gpg-id'),
+                   os.path.join(self.store.prefix, '.gpg-id'))
+ 
++    @mock.patch('requests.get', mock_request)
+     def test_pass_audit_NotAFile(self):
+         """Testing: pass audit not_a_file."""
+         cmd = ['not_a_file']
+         self._passaudit(cmd, 1)
+ 
++    @mock.patch('requests.get', mock_request)
+     def test_pass_audit_passwords_notpwned(self):
+         """Testing: pass audit Password/notpwned."""
+         cmd = ['Password/notpwned']
+         self._passaudit(cmd)
+ 
++    @mock.patch('requests.get', mock_request)
+     def test_pass_audit_passwords_pwned(self):
+         """Testing: pass audit Password/pwned."""
+         cmd = ['Password/pwned']
+         self._passaudit(cmd)
+ 
++    @mock.patch('requests.get', mock_request)
+     def test_pass_audit_passwords_good(self):
+         """Testing: pass audit Password/good."""
+         cmd = ['Password/good']
+         self._passaudit(cmd)
+ 
++    @mock.patch('requests.get', mock_request)
+     def test_pass_audit_passwords_all(self):
+         """Testing: pass audit ."""
+         cmd = ['']
+diff --git a/tests/test_pwned.py b/tests/test_pwned.py
+index 5ce6bc6..c28939a 100644
+--- a/tests/test_pwned.py
++++ b/tests/test_pwned.py
+@@ -17,7 +17,8 @@
+ #
+ 
+ from .. import pass_audit
+-from tests.commons import TestPass
++from tests.commons import TestPass, mock_request
++from unittest import mock
+ 
+ 
+ class TestPwnedAPI(TestPass):
+@@ -25,12 +26,13 @@ class TestPwnedAPI(TestPass):
+     def setUp(self):
+         self.api = pass_audit.PwnedAPI()
+ 
++    @mock.patch('requests.get', mock_request)
+     def test_password_range(self):
+         """Testing: https://api.haveibeenpwned.com/range API."""
+         prefix = '21BD1'
+         Hash = '21BD12DC183F740EE76F27B78EB39C8AD972A757'
+         hashes, counts = self.api.password_range(prefix)
+         self.assertIn(Hash, hashes)
+-        self.assertTrue(counts[hashes.index(Hash)] == 51259)
++        self.assertTrue(counts[hashes.index(Hash)] == 52579)
+         self.assertTrue(len(hashes) == len(counts))
+-        self.assertTrue(len(hashes) == 527)
++        self.assertTrue(len(hashes) == 11)
+-- 
+2.25.0
+
diff --git a/pkgs/tools/security/pass/extensions/audit/0002-Fix-audit.bash-setup.patch b/pkgs/tools/security/pass/extensions/audit/0002-Fix-audit.bash-setup.patch
new file mode 100644
index 000000000000..5703f3c1f652
--- /dev/null
+++ b/pkgs/tools/security/pass/extensions/audit/0002-Fix-audit.bash-setup.patch
@@ -0,0 +1,28 @@
+From 8f76b32946430737f97f2702afd828b09536afd2 Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch <maximilian@mbosch.me>
+Date: Sun, 15 Mar 2020 20:10:11 +0100
+Subject: [PATCH 2/2] Fix audit.bash setup
+
+This sets PASSWORD_STORE_DIR (needed by the python-code) to
+PASSWORD_STORE_DIR and properly falls back to `~/.password-store` if
+it's not set.
+---
+ audit.bash | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/audit.bash b/audit.bash
+index 7a973dc..c40ff76 100755
+--- a/audit.bash
++++ b/audit.bash
+@@ -17,7 +17,7 @@
+ #
+ 
+ cmd_audit() {
+-	export PASSWORD_STORE_DIR=$PREFIX GIT_DIR PASSWORD_STORE_GPG_OPTS
++	export PASSWORD_STORE_DIR=${PASSWORD_STORE_DIR:-$HOME/.password-store} GIT_DIR PASSWORD_STORE_GPG_OPTS
+ 	export X_SELECTION CLIP_TIME PASSWORD_STORE_UMASK GENERATED_LENGTH
+ 	export CHARACTER_SET CHARACTER_SET_NO_SYMBOLS EXTENSIONS PASSWORD_STORE_KEY
+ 	export PASSWORD_STORE_ENABLE_EXTENSIONS PASSWORD_STORE_SIGNING_KEY
+-- 
+2.25.0
+
diff --git a/pkgs/tools/security/pass/extensions/audit/default.nix b/pkgs/tools/security/pass/extensions/audit/default.nix
new file mode 100644
index 000000000000..bae6b9bbafdf
--- /dev/null
+++ b/pkgs/tools/security/pass/extensions/audit/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper, gnupg }:
+
+let
+  pythonEnv = pythonPackages.python.withPackages (p: [ p.requests p.setuptools p.zxcvbn ]);
+
+in stdenv.mkDerivation rec {
+  pname = "pass-audit";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "roddhjav";
+    repo = "pass-audit";
+    rev = "v${version}";
+    sha256 = "1mdckw0dwcnv8smp1za96y0zmdnykbkw2606v7mzfnzbz4zjdlwl";
+  };
+
+  patches = [
+    ./0001-Make-it-possible-to-run-the-tests-offline.patch
+    ./0002-Fix-audit.bash-setup.patch
+  ];
+
+  postPatch = ''
+    substituteInPlace audit.bash \
+      --replace '/usr/bin/env python3' "${pythonEnv}/bin/python3"
+  '';
+
+  outputs = [ "out" "man" ];
+
+  buildInputs = [ pythonEnv ];
+  nativeBuildInputs = [ makeWrapper ];
+
+  doCheck = true;
+  checkInputs = [ pythonPackages.green pass gnupg ];
+  checkPhase = ''
+    ${pythonEnv}/bin/python3 setup.py green -q
+  '';
+
+  installFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ];
+  postInstall = ''
+    wrapProgram $out/lib/password-store/extensions/audit.bash \
+      --prefix PYTHONPATH : "$out/lib/${pythonEnv.libPrefix}/site-packages"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Pass extension for auditing your password repository.";
+    homepage = https://github.com/roddhjav/pass-audit;
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ ma27 ];
+  };
+}
diff --git a/pkgs/tools/security/pass/extensions/default.nix b/pkgs/tools/security/pass/extensions/default.nix
index 6eb321229e00..1f41a6924821 100644
--- a/pkgs/tools/security/pass/extensions/default.nix
+++ b/pkgs/tools/security/pass/extensions/default.nix
@@ -3,7 +3,7 @@
 with pkgs;
 
 {
-  pass-audit = callPackage ./audit.nix {
+  pass-audit = callPackage ./audit {
     pythonPackages = python3Packages;
   };
   pass-checkup = callPackage ./checkup.nix {};

From 187f3e79ca133685a1ac7d6b7b8ff42339efe079 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 15 Mar 2020 22:21:19 +0100
Subject: [PATCH 3187/4636] pass: allow adding extensions without rebuilding
 the package

Until now, `pkgs.pass` was rebuilt entirely when adding an extension
using the `pass.withExtensions`-function. This is fixed now by removing the
linking of extensions from the fixupPhase and merge all paths (including
those from pkgs.pass) together in using `pkgs.buildEnv`.
---
 pkgs/tools/security/pass/default.nix         | 239 ++++++++++---------
 pkgs/tools/security/pass/extension-dir.patch |  32 +++
 2 files changed, 154 insertions(+), 117 deletions(-)
 create mode 100644 pkgs/tools/security/pass/extension-dir.patch

diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index 54a8f4de7d7b..aed6a9d4012c 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, pkgs, fetchurl, buildEnv
 , coreutils, gnused, getopt, git, tree, gnupg, openssl, which, procps
-, qrencode , makeWrapper
+, qrencode , makeWrapper, pass, symlinkJoin
 
 , xclip ? null, xdotool ? null, dmenu ? null
 , x11Support ? !stdenv.isDarwin
@@ -23,131 +23,136 @@ let
 
   env = extensions:
     let
-      selected = extensions passExtensions
+      selected = [ pass ] ++ extensions passExtensions
         ++ stdenv.lib.optional tombPluginSupport passExtensions.tomb;
     in buildEnv {
       name = "pass-extensions-env";
       paths = selected;
-      buildInputs = concatMap (x: x.buildInputs) selected;
-    };
+      buildInputs = [ makeWrapper ] ++ concatMap (x: x.buildInputs) selected;
 
-  generic = extensionsEnv: extraPassthru: stdenv.mkDerivation rec {
-    version = "1.7.3";
-    pname = "password-store";
+      postBuild = ''
+        files=$(find $out/bin/ -type f -exec readlink -f {} \;)
+        rm $out/bin
+        mkdir $out/bin
 
-    src = fetchurl {
-      url    = "https://git.zx2c4.com/password-store/snapshot/${pname}-${version}.tar.xz";
-      sha256 = "1x53k5dn3cdmvy8m4fqdld4hji5n676ksl0ql4armkmsds26av1b";
-    };
+        for i in $files; do
+          ln -sf $i $out/bin/$(basename $i)
+        done
 
-    patches = [ ./set-correct-program-name-for-sleep.patch ]
-      ++ stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch
-      # TODO (@Ma27) this patch adds support for wl-clipboard and can be removed during the next
-      # version bump.
-      ++ stdenv.lib.optional waylandSupport ./clip-wayland-support.patch;
-
-    nativeBuildInputs = [ makeWrapper ];
-
-    buildInputs = [ extensionsEnv ];
-
-    installFlags = [ "PREFIX=$(out)" "WITH_ALLCOMP=yes" ];
-
-    postInstall = ''
-      # Install Emacs Mode. NOTE: We can't install the necessary
-      # dependencies (s.el and f.el) here. The user has to do this
-      # himself.
-      mkdir -p "$out/share/emacs/site-lisp"
-      cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/"
-    '' + optionalString x11Support ''
-      cp "contrib/dmenu/passmenu" "$out/bin/"
-    '';
-
-    wrapperPath = with stdenv.lib; makeBinPath ([
-      coreutils
-      getopt
-      git
-      gnupg
-      gnused
-      tree
-      which
-      qrencode
-      procps
-    ] ++ optional stdenv.isDarwin openssl
-      ++ ifEnable x11Support [ dmenu xclip xdotool ]
-      ++ optional waylandSupport wl-clipboard);
-
-    postFixup = ''
-      # Link extensions env
-      rmdir $out/lib/password-store/extensions
-      ln -s ${extensionsEnv}/lib/password-store/extensions $out/lib/password-store/.
-      for f in ${extensionsEnv}/share/man/man1/*.1.gz; do
-          ln -s $f $out/share/man/man1/
-      done
-
-      # Fix program name in --help
-      substituteInPlace $out/bin/pass \
-        --replace 'PROGRAM="''${0##*/}"' "PROGRAM=pass"
-
-      # Ensure all dependencies are in PATH
-      wrapProgram $out/bin/pass \
-        --prefix PATH : "${wrapperPath}"
-    '' + stdenv.lib.optionalString x11Support ''
-      # We just wrap passmenu with the same PATH as pass. It doesn't
-      # need all the tools in there but it doesn't hurt either.
-      wrapProgram $out/bin/passmenu \
-        --prefix PATH : "$out/bin:${wrapperPath}"
-    '';
-
-    # Turn "check" into "installcheck", since we want to test our pass,
-    # not the one before the fixup.
-    postPatch = ''
-      patchShebangs tests
-
-      # the turning
-      sed -i -e 's@^PASS=.*''$@PASS=$out/bin/pass@' \
-             -e 's@^GPGS=.*''$@GPG=${gnupg}/bin/gpg2@' \
-             -e '/which gpg/ d' \
-        tests/setup.sh
-    '' + stdenv.lib.optionalString stdenv.isDarwin ''
-      # 'pass edit' uses hdid, which is not available from the sandbox.
-      rm -f tests/t0200-edit-tests.sh
-      rm -f tests/t0010-generate-tests.sh
-      rm -f tests/t0020-show-tests.sh
-      rm -f tests/t0050-mv-tests.sh
-      rm -f tests/t0100-insert-tests.sh
-      rm -f tests/t0300-reencryption.sh
-      rm -f tests/t0400-grep.sh
-    '';
-
-    doCheck = false;
-
-    doInstallCheck = true;
-    installCheckInputs = [ git ];
-    installCheckTarget = "test";
-
-    passthru = {
-      extensions = passExtensions;
-    } // extraPassthru;
-
-    meta = with stdenv.lib; {
-      description = "Stores, retrieves, generates, and synchronizes passwords securely";
-      homepage    = https://www.passwordstore.org/;
-      license     = licenses.gpl2Plus;
-      maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher globin ];
-      platforms   = platforms.unix;
-
-      longDescription = ''
-        pass is a very simple password store that keeps passwords inside gpg2
-        encrypted files inside a simple directory tree residing at
-        ~/.password-store. The pass utility provides a series of commands for
-        manipulating the password store, allowing the user to add, remove, edit,
-        synchronize, generate, and manipulate passwords.
+        wrapProgram $out/bin/pass \
+          --set SYSTEM_EXTENSION_DIR "$out/lib/password-store/extensions"
       '';
     };
-  };
-
 in
 
-generic (env (_: [])) {
-  withExtensions = extensions: generic (env extensions) {};
+stdenv.mkDerivation rec {
+  version = "1.7.3";
+  pname = "password-store";
+
+  src = fetchurl {
+    url    = "https://git.zx2c4.com/password-store/snapshot/${pname}-${version}.tar.xz";
+    sha256 = "1x53k5dn3cdmvy8m4fqdld4hji5n676ksl0ql4armkmsds26av1b";
+  };
+
+  patches = [
+    ./set-correct-program-name-for-sleep.patch
+    ./extension-dir.patch
+  ] ++ stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch
+    # TODO (@Ma27) this patch adds support for wl-clipboard and can be removed during the next
+    # version bump.
+    ++ stdenv.lib.optional waylandSupport ./clip-wayland-support.patch;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installFlags = [ "PREFIX=$(out)" "WITH_ALLCOMP=yes" ];
+
+  postInstall = ''
+    # Install Emacs Mode. NOTE: We can't install the necessary
+    # dependencies (s.el and f.el) here. The user has to do this
+    # himself.
+    mkdir -p "$out/share/emacs/site-lisp"
+    cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/"
+  '' + optionalString x11Support ''
+    cp "contrib/dmenu/passmenu" "$out/bin/"
+  '';
+
+  wrapperPath = with stdenv.lib; makeBinPath ([
+    coreutils
+    getopt
+    git
+    gnupg
+    gnused
+    tree
+    which
+    qrencode
+    procps
+  ] ++ optional stdenv.isDarwin openssl
+    ++ ifEnable x11Support [ dmenu xclip xdotool ]
+    ++ optional waylandSupport wl-clipboard);
+
+  postFixup = ''
+    # Fix program name in --help
+    substituteInPlace $out/bin/pass \
+      --replace 'PROGRAM="''${0##*/}"' "PROGRAM=pass"
+
+    # Ensure all dependencies are in PATH
+    wrapProgram $out/bin/pass \
+      --prefix PATH : "${wrapperPath}"
+  '' + stdenv.lib.optionalString x11Support ''
+    # We just wrap passmenu with the same PATH as pass. It doesn't
+    # need all the tools in there but it doesn't hurt either.
+    wrapProgram $out/bin/passmenu \
+      --prefix PATH : "$out/bin:${wrapperPath}"
+  '';
+
+  # Turn "check" into "installcheck", since we want to test our pass,
+  # not the one before the fixup.
+  postPatch = ''
+    patchShebangs tests
+
+    substituteInPlace src/password-store.sh \
+      --replace "@out@" "$out"
+
+    # the turning
+    sed -i -e 's@^PASS=.*''$@PASS=$out/bin/pass@' \
+           -e 's@^GPGS=.*''$@GPG=${gnupg}/bin/gpg2@' \
+           -e '/which gpg/ d' \
+      tests/setup.sh
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    # 'pass edit' uses hdid, which is not available from the sandbox.
+    rm -f tests/t0200-edit-tests.sh
+    rm -f tests/t0010-generate-tests.sh
+    rm -f tests/t0020-show-tests.sh
+    rm -f tests/t0050-mv-tests.sh
+    rm -f tests/t0100-insert-tests.sh
+    rm -f tests/t0300-reencryption.sh
+    rm -f tests/t0400-grep.sh
+  '';
+
+  doCheck = false;
+
+  doInstallCheck = true;
+  installCheckInputs = [ git ];
+  installCheckTarget = "test";
+
+  passthru = {
+    extensions = passExtensions;
+    withExtensions = env;
+  };
+
+  meta = with stdenv.lib; {
+    description = "Stores, retrieves, generates, and synchronizes passwords securely";
+    homepage    = https://www.passwordstore.org/;
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher globin ma27 ];
+    platforms   = platforms.unix;
+
+    longDescription = ''
+      pass is a very simple password store that keeps passwords inside gpg2
+      encrypted files inside a simple directory tree residing at
+      ~/.password-store. The pass utility provides a series of commands for
+      manipulating the password store, allowing the user to add, remove, edit,
+      synchronize, generate, and manipulate passwords.
+    '';
+  };
 }
diff --git a/pkgs/tools/security/pass/extension-dir.patch b/pkgs/tools/security/pass/extension-dir.patch
new file mode 100644
index 000000000000..028da31c4617
--- /dev/null
+++ b/pkgs/tools/security/pass/extension-dir.patch
@@ -0,0 +1,32 @@
+diff --git a/Makefile b/Makefile
+index eac2291..1b1df0a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -46,12 +46,12 @@ install: install-common
+ 	@install -v -d "$(DESTDIR)$(LIBDIR)/password-store" && install -m 0644 -v "$(PLATFORMFILE)" "$(DESTDIR)$(LIBDIR)/password-store/platform.sh"
+ 	@install -v -d "$(DESTDIR)$(LIBDIR)/password-store/extensions"
+ 	@install -v -d "$(DESTDIR)$(BINDIR)/"
+-	@trap 'rm -f src/.pass' EXIT; sed 's:.*PLATFORM_FUNCTION_FILE.*:source "$(LIBDIR)/password-store/platform.sh":;s:^SYSTEM_EXTENSION_DIR=.*:SYSTEM_EXTENSION_DIR="$(LIBDIR)/password-store/extensions":' src/password-store.sh > src/.pass && \
++	@trap 'rm -f src/.pass' EXIT; sed 's:.*PLATFORM_FUNCTION_FILE.*:source "$(LIBDIR)/password-store/platform.sh":;' src/password-store.sh > src/.pass && \
+ 	install -v -d "$(DESTDIR)$(BINDIR)/" && install -m 0755 -v src/.pass "$(DESTDIR)$(BINDIR)/pass"
+ else
+ install: install-common
+ 	@install -v -d "$(DESTDIR)$(LIBDIR)/password-store/extensions"
+-	@trap 'rm -f src/.pass' EXIT; sed '/PLATFORM_FUNCTION_FILE/d;s:^SYSTEM_EXTENSION_DIR=.*:SYSTEM_EXTENSION_DIR="$(LIBDIR)/password-store/extensions":' src/password-store.sh > src/.pass && \
++	@trap 'rm -f src/.pass' EXIT; sed '/PLATFORM_FUNCTION_FILE/d;' src/password-store.sh > src/.pass && \
+ 	install -v -d "$(DESTDIR)$(BINDIR)/" && install -m 0755 -v src/.pass "$(DESTDIR)$(BINDIR)/pass"
+ endif
+ 
+diff --git a/src/password-store.sh b/src/password-store.sh
+index 68551a4..2f3b5b7 100755
+--- a/src/password-store.sh
++++ b/src/password-store.sh
+@@ -656,7 +656,7 @@ cmd_extension_or_show() {
+ 	fi
+ }
+ 
+-SYSTEM_EXTENSION_DIR=""
++SYSTEM_EXTENSION_DIR="${SYSTEM_EXTENSION_DIR:-@out@/lib/password-store/extensions}"
+ cmd_extension() {
+ 	check_sneaky_paths "$1"
+ 	local user_extension system_extension extension

From 08b801c9b3f36dd14bf70eab01d1ceba7b3ee0ee Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Mar 2020 17:21:39 +0000
Subject: [PATCH 3188/4636] python27Packages.azure-mgmt-rdbms: 1.9.0 -> 2.0.0

(cherry picked from commit 6016eec541a9cfe5faf55f7044e36bd21ccd320f)
---
 pkgs/development/python-modules/azure-mgmt-rdbms/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
index ae4a5fee2c94..6a7b6df24185 100644
--- a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-rdbms";
-  version = "1.9.0";
+  version = "2.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "0v91hl936wp9sl3bc31svf6kdxwa57qh6ih9rrv43dnb2000km6r";
+    sha256 = "19z0lpq6bpidlflwa263y51549xgcg4m040k872m7fmy7jm2xcbb";
   };
 
   propagatedBuildInputs = [

From fbafe7ca64e9ce5dae908c6520035a0355043648 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 15 Mar 2020 14:50:46 -0700
Subject: [PATCH 3189/4636] azure-cli: freeze azure-mgmt-rdms at 1.9.0

---
 pkgs/tools/admin/azure-cli/python-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix
index 2ac74a16edd1..7b43ba209c2a 100644
--- a/pkgs/tools/admin/azure-cli/python-packages.nix
+++ b/pkgs/tools/admin/azure-cli/python-packages.nix
@@ -119,6 +119,9 @@ let
       azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.4.0" "zip"
         "1b69rz9wm0jvc54vx3b7h633x8gags51xwxrkp6myar40jggxw6g";
 
+      azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "1.9.0" "zip"
+        "0v91hl936wp9sl3bc31svf6kdxwa57qh6ih9rrv43dnb2000km6r";
+
       azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.6.0" "zip"
         "13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd";
 

From 0ab1692b597c710cb5f80c6a626030699318f8b9 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 15 Feb 2020 23:48:43 -0500
Subject: [PATCH 3190/4636] rust-cbindgen: upgrade cargo fetcher and
 cargoSha256

Infra upgrade as part of #79975; no functional change expected.
---
 pkgs/development/tools/rust/cbindgen/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix
index b97c9af088fd..34d744807463 100644
--- a/pkgs/development/tools/rust/cbindgen/default.nix
+++ b/pkgs/development/tools/rust/cbindgen/default.nix
@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1x21g66gri6z9bnnfn7zmnf2lwdf5ing76pcmw0ilx4nzpvfhkg0";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "13fb8cdg6r0g5jb3vaznvv5aaywrnsl2yp00h4k8028vl8jwwr79";
+  cargoSha256 = "13fbahdih5whll09pfgyb1bjag1f0d0xfwgm2s342bs1krxsrbh3";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 

From 9520a443b6b64bf252e46ae1ec7c86b9f08d92e0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Mar 2020 15:03:05 +0000
Subject: [PATCH 3191/4636] python27Packages.braintree: 3.59.0 -> 4.0.0

---
 pkgs/development/python-modules/braintree/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix
index db5ed5410e3e..f4d09ca5e5ed 100644
--- a/pkgs/development/python-modules/braintree/default.nix
+++ b/pkgs/development/python-modules/braintree/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "braintree";
-  version = "3.59.0";
+  version = "4.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08g8qlnsp9wd2zbf6x3npp1425g7ih4lyljzvybd3vazsbqlw4yq";
+    sha256 = "1m8z0ig40xmgcnmf508nflyy1w4qmff4kqxarrpg7rvsfj4pjsmh";
   };
 
   propagatedBuildInputs = [ requests ];
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python library for integration with Braintree";
-    homepage = https://github.com/braintree/braintree_python;
+    homepage = "https://github.com/braintree/braintree_python";
     license = licenses.mit;
     maintainers = [ maintainers.ivegotasthma ];
   };

From f942e137bb791b63f29884de6d202f412cf28b24 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Mar 2020 15:26:45 +0000
Subject: [PATCH 3192/4636] python37Packages.asgiref: 3.2.3 -> 3.2.5

---
 pkgs/development/python-modules/asgiref/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix
index 08f52ce51add..9fa7d8c7c42e 100644
--- a/pkgs/development/python-modules/asgiref/default.nix
+++ b/pkgs/development/python-modules/asgiref/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, async-timeout, pytest, pytest-asyncio }:
 buildPythonPackage rec {
-  version = "3.2.3";
+  version = "3.2.5";
   pname = "asgiref";
 
   disabled = pythonOlder "3.5";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = pname;
     rev = version;
-    sha256 = "1b8h50wvvby9m17q39kc0ql8a2yvg2f89ii7zrl2phaw0vb9i109";
+    sha256 = "040g2cghpskp427xiw9jv7c0lfj1sk5fc01dds8pi7grkk0br357";
   };
 
   propagatedBuildInputs = [ async-timeout ];
@@ -24,6 +24,6 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "Reference ASGI adapters and channel layers";
     license = licenses.bsd3;
-    homepage = https://github.com/django/asgiref;
+    homepage = "https://github.com/django/asgiref";
   };
 }

From 49ab3f87fec238b0d03d33f914451c67b539f90b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Mar 2020 17:10:26 +0000
Subject: [PATCH 3193/4636] python27Packages.azure-mgmt-compute: 10.0.0 ->
 11.1.0

---
 .../development/python-modules/azure-mgmt-compute/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
index afe57ee6204d..99545d2a9818 100644
--- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix
@@ -7,13 +7,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "10.0.0";
+  version = "11.1.0";
   pname = "azure-mgmt-compute";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1s3bx6knxw5dxycp43yimvgrh0i19drzd09asglcwz2x5mr3bpyg";
+    sha256 = "00ygppmlx21dxvb0swfdyhqf5xhi0zxy26abcgql02w0lklw91nj";
   };
 
   postInstall = if isPy3k then "" else ''

From 857551500252de2758fbff8410f4e75f96e80ae7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 15 Mar 2020 18:01:08 +0000
Subject: [PATCH 3194/4636] python37Packages.elementpath: 1.4.1 -> 1.4.2

---
 pkgs/development/python-modules/elementpath/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix
index 22b1c31ece95..903e74e32786 100644
--- a/pkgs/development/python-modules/elementpath/default.nix
+++ b/pkgs/development/python-modules/elementpath/default.nix
@@ -1,7 +1,7 @@
 { lib, buildPythonPackage, fetchFromGitHub, isPy27 }:
 
 buildPythonPackage rec {
-  version = "1.4.1";
+  version = "1.4.2";
   pname = "elementpath";
   disabled = isPy27; # uses incompatible class syntax
 
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     owner = "sissaschool";
     repo = "elementpath";
     rev = "v${version}";
-    sha256 = "1xgz4aml3g3q2011wxarg25xl3g9zny313p52w9abyy16f40vjy0";
+    sha256 = "0dd5si2ml3srn8snp7x3y4xjamssmnp05h41aqazzd9ykwmhh919";
   };
 
   # avoid circular dependency with xmlschema which directly depends on this

From 65e3e0168ab73c1fa481710596eb2e67b5abaf97 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 12:48:42 +0000
Subject: [PATCH 3195/4636] saml2aws: 2.19.0 -> 2.24.0

---
 pkgs/tools/security/saml2aws/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix
index 7d0878841611..011747890818 100644
--- a/pkgs/tools/security/saml2aws/default.nix
+++ b/pkgs/tools/security/saml2aws/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "saml2aws";
-  version = "2.19.0";
+  version = "2.24.0";
 
   src = fetchFromGitHub {
     owner = "Versent";
     repo = "saml2aws";
     rev = "v${version}";
-    sha256 = "1b34v52nvn5mgkxj90lmw0hhpqb35gi3dn47x3v7255890wkzryz";
+    sha256 = "15zxi64s1hgpm3rxk0m7z5363jc7h80g91bfx8vg7nw680lday4w";
   };
 
-  modSha256 = "1ndr8npjjaxg97azshpca7mclxhbqm49wzswmv571y5x519bb7q8";
+  modSha256 = "0qxf2i06spjig3ynixh3xmbxpghh222jhfqcg71i4i79x4ycp5wx";
 
   subPackages = [ "." "cmd/saml2aws" ];
 

From b25633a6f9a176ce42086e13d330464e52e2a62d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 17:32:06 +0000
Subject: [PATCH 3196/4636] fly: 5.7.2 -> 5.8.0

---
 .../tools/continuous-integration/fly/default.nix          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix
index 1a56be02a284..e5454796b7e4 100644
--- a/pkgs/development/tools/continuous-integration/fly/default.nix
+++ b/pkgs/development/tools/continuous-integration/fly/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "fly";
-  version = "5.7.2";
+  version = "5.8.0";
 
   src = fetchFromGitHub {
     owner = "concourse";
     repo = "concourse";
     rev = "v${version}";
-    sha256 = "1jhc2h00rh6lpgdq3n2d1sk7gdzmhkigyra04gf70s6kjb903igw";
+    sha256 = "0ji3jya4b2b4l6dlvydh3k2jfh6kkhii23d6rmi49ypydhn1qmgj";
   };
 
-  modSha256 = "00qagz28iz1z5kjshs1m74bf12qlhjbkf4pbchy7lzf09bd291pg";
+  modSha256 = "14wwspp8x6i4ry23bz8b08mfyzrwc9m7clrylxzr8j67yhg5kw6v";
 
   subPackages = [ "fly" ];
 
@@ -30,7 +30,7 @@ buildGoModule rec {
 
   meta = with lib; {
     description = "A command line interface to Concourse CI";
-    homepage = https://concourse-ci.org;
+    homepage = "https://concourse-ci.org";
     license = licenses.asl20;
     maintainers = with maintainers; [ ivanbrennan ];
   };

From 22228d1917b49feb1637bd4eb29074c5bd3b674a Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 15 Mar 2020 23:51:38 +0100
Subject: [PATCH 3197/4636] passExtensions.pass-update: 2.0 -> 2.1

---
 pkgs/tools/security/pass/extensions/update.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/pass/extensions/update.nix b/pkgs/tools/security/pass/extensions/update.nix
index b712557ab3eb..86563b7ff42d 100644
--- a/pkgs/tools/security/pass/extensions/update.nix
+++ b/pkgs/tools/security/pass/extensions/update.nix
@@ -2,15 +2,20 @@
 
 stdenv.mkDerivation rec {
   pname = "pass-update";
-  version = "2.0";
+  version = "2.1";
 
   src = fetchFromGitHub {
     owner = "roddhjav";
     repo = "pass-update";
     rev = "v${version}";
-    sha256 = "0a81q0jfni185zmbislzbcv0qr1rdp0cgr9wf9riygis2xv6rs6k";
+    sha256 = "0yx8w97jcp6lv7ad5jxqnj04csbrn2hhc4pskssxknw2sbvg4g6c";
   };
 
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "BASHCOMPDIR ?= /etc/bash_completion.d" "BASHCOMPDIR ?= $out/etc/bash_completion.d"
+  '';
+
   dontBuild = true;
 
   installFlags = [ "PREFIX=$(out)" ];

From 12eef00f70e559ce12c48d4dc432acb76784b628 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 15 Mar 2020 23:52:15 +0100
Subject: [PATCH 3198/4636] stress-ng: 0.11.01 -> 0.11.02

---
 pkgs/tools/system/stress-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index b1d04d992eae..32bb8f4f4548 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "stress-ng";
-  version = "0.11.01";
+  version = "0.11.02";
 
   src = fetchurl {
     url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "152lyqv7g6jl4xsvg639n6y8h6v2qag3afxynaws38bsr149bqcz";
+    sha256 = "0vwqv3hq7h4z53ayk2c69zf60ncr0v2g0vxaci1pmxlhiz56y6md";
   };
 
   postPatch = ''

From 3c10b1c2a7a28c773d00e435dc3b4d634e4e1343 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 15 Mar 2020 10:13:01 +1000
Subject: [PATCH 3199/4636] ostree: 2020.2 -> 2020.3

https://github.com/ostreedev/ostree/releases/tag/v2020.3
---
 pkgs/tools/misc/ostree/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix
index 9a41f5e857ad..24a104dc9743 100644
--- a/pkgs/tools/misc/ostree/default.nix
+++ b/pkgs/tools/misc/ostree/default.nix
@@ -37,13 +37,13 @@ let
   ]));
 in stdenv.mkDerivation rec {
   pname = "ostree";
-  version = "2020.2";
+  version = "2020.3";
 
   outputs = [ "out" "dev" "man" "installedTests" ];
 
   src = fetchurl {
     url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
-    sha256 = "0bbk0sg4m38g7j00hy358p2azxas87minpgz3avwma6jsylj1qjg";
+    sha256 = "01cch4as23xspq6pck59al7x5jj60wl21g8p3iqbdxcjl1p3jxsq";
   };
 
   patches = [

From d6f1d56eab66fbca288fe7016112bbb852816ef2 Mon Sep 17 00:00:00 2001
From: symphorien <symphorien@users.noreply.github.com>
Date: Sun, 15 Mar 2020 23:41:12 +0000
Subject: [PATCH 3200/4636] clementine: fix broken symlink (#82689)

---
 pkgs/applications/audio/clementine/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 3fdf98da325c..479f2a16fd8a 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -125,7 +125,7 @@ let
 
       mkdir -p $out/share
       for dir in applications icons kde4; do
-        ln -s "$free/share/$dir" "$out/share/$dir"
+        ln -s "${free}/share/$dir" "$out/share/$dir"
       done
     '';
     enableParallelBuilding = true;

From 98ccb8b194e80c1074ed04131ba16025fada5579 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Sun, 15 Mar 2020 17:22:31 -0700
Subject: [PATCH 3201/4636] hugo: 0.67.0 -> 0.67.1

---
 pkgs/applications/misc/hugo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index ab240aee12e1..f1d68b926910 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "hugo";
-  version = "0.67.0";
+  version = "0.67.1";
 
   goPackagePath = "github.com/gohugoio/hugo";
 
@@ -10,10 +10,10 @@ buildGoModule rec {
     owner = "gohugoio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0rgwrcs1ydwccyf714zpn3427p8zlwynn0q1v8k5j63zxr91jdbq";
+    sha256 = "0q55f8w0drc1miqziqp8r064h7900hrgj7nixxs71cb1p8ih4cq3";
   };
 
-  modSha256 = "1f320zbqnv2ybsp3qmlgn3rsjgp2zdb24qjd3gcys30mw48cx3na";
+  modSha256 = "0s7a13jkhsr6h19a9ysr8877imac5skdray0zg2qgwrapic2nw17";
 
   buildFlags = [ "-tags" "extended" ];
 

From 7e678381ce681b36f1afbccc7ab423cb19ac2d85 Mon Sep 17 00:00:00 2001
From: Lily Ballard <lilyball@twitch.tv>
Date: Sun, 15 Mar 2020 17:58:08 -0700
Subject: [PATCH 3202/4636] cocoapods: 1.9.0 -> 1.9.1

---
 pkgs/development/mobile/cocoapods/Gemfile.lock | 6 +++---
 pkgs/development/mobile/cocoapods/gemset.nix   | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock
index 93478fa1fdac..9aa7dfbf2301 100644
--- a/pkgs/development/mobile/cocoapods/Gemfile.lock
+++ b/pkgs/development/mobile/cocoapods/Gemfile.lock
@@ -12,10 +12,10 @@ GEM
       json (>= 1.5.1)
     atomos (0.1.3)
     claide (1.0.3)
-    cocoapods (1.9.0)
+    cocoapods (1.9.1)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.9.0)
+      cocoapods-core (= 1.9.1)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -31,7 +31,7 @@ GEM
       nap (~> 1.0)
       ruby-macho (~> 1.4)
       xcodeproj (>= 1.14.0, < 2.0)
-    cocoapods-core (1.9.0)
+    cocoapods-core (1.9.1)
       activesupport (>= 4.0.2, < 6)
       algoliasearch (~> 1.0)
       concurrent-ruby (~> 1.1)
diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix
index 26c198300207..4d4979d56206 100644
--- a/pkgs/development/mobile/cocoapods/gemset.nix
+++ b/pkgs/development/mobile/cocoapods/gemset.nix
@@ -55,10 +55,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1qywwpwdzspybi0772yscyiffq6bgqvzcppi2gjl6w4chxbmnphx";
+      sha256 = "0wxr81qy4jsbxl066nlfp8zlqk31i6fsmd7f01xmi9bv04990hrs";
       type = "gem";
     };
-    version = "1.9.0";
+    version = "1.9.1";
   };
   cocoapods-core = {
     dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"];
@@ -66,10 +66,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0wpjkps6q7lmd3cxhrcl9v3p5bk7y7bcjgnjw4ylbwirsl60bq95";
+      sha256 = "0c1679fkyp06dwsh93r0ldzly9vc74g0br4jdngwvdl4g0j4fyzc";
       type = "gem";
     };
-    version = "1.9.0";
+    version = "1.9.1";
   };
   cocoapods-deintegrate = {
     groups = ["default"];

From 3635332a425487324ff9fb1f514ec35aad9eb185 Mon Sep 17 00:00:00 2001
From: Lily Ballard <lilyball@twitch.tv>
Date: Sun, 15 Mar 2020 17:58:19 -0700
Subject: [PATCH 3203/4636] cocoapods-beta: 1.9.0 -> 1.9.1

---
 pkgs/development/mobile/cocoapods/Gemfile-beta.lock | 6 +++---
 pkgs/development/mobile/cocoapods/gemset-beta.nix   | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
index 4b632458c6a6..355608ca02e5 100644
--- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
+++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock
@@ -12,10 +12,10 @@ GEM
       json (>= 1.5.1)
     atomos (0.1.3)
     claide (1.0.3)
-    cocoapods (1.9.0)
+    cocoapods (1.9.1)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.9.0)
+      cocoapods-core (= 1.9.1)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -31,7 +31,7 @@ GEM
       nap (~> 1.0)
       ruby-macho (~> 1.4)
       xcodeproj (>= 1.14.0, < 2.0)
-    cocoapods-core (1.9.0)
+    cocoapods-core (1.9.1)
       activesupport (>= 4.0.2, < 6)
       algoliasearch (~> 1.0)
       concurrent-ruby (~> 1.1)
diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix
index fb70f8aa6c9d..1a5912b89e8e 100644
--- a/pkgs/development/mobile/cocoapods/gemset-beta.nix
+++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix
@@ -57,10 +57,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1qywwpwdzspybi0772yscyiffq6bgqvzcppi2gjl6w4chxbmnphx";
+      sha256 = "0wxr81qy4jsbxl066nlfp8zlqk31i6fsmd7f01xmi9bv04990hrs";
       type = "gem";
     };
-    version = "1.9.0";
+    version = "1.9.1";
   };
   cocoapods-core = {
     dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"];
@@ -68,10 +68,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0wpjkps6q7lmd3cxhrcl9v3p5bk7y7bcjgnjw4ylbwirsl60bq95";
+      sha256 = "0c1679fkyp06dwsh93r0ldzly9vc74g0br4jdngwvdl4g0j4fyzc";
       type = "gem";
     };
-    version = "1.9.0";
+    version = "1.9.1";
   };
   cocoapods-deintegrate = {
     groups = ["default"];

From 2275f79c27904a9f64f8d3c5b1cf065c793c6660 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 16 Mar 2020 01:45:55 +0000
Subject: [PATCH 3204/4636] python27Packages.rq: 1.2.2 -> 1.3.0

---
 pkgs/development/python-modules/rq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix
index 0fe7a942245b..9f57fb486d91 100644
--- a/pkgs/development/python-modules/rq/default.nix
+++ b/pkgs/development/python-modules/rq/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "rq";
-  version = "1.2.2";
+  version = "1.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0dk664lzjhj0rk4ffpv29mbcr7vh41ph1sx7ngszk3744gh1nshp";
+    sha256 = "0xr38j35iqmhx0f2l8ix34vjs9flpqv2y17k33crh7rhm6gi9ja9";
   };
 
   # test require a running redis rerver, which is something we can't do yet

From dce0f4f695618e347d8ad45065d27f2b4a9cb547 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 16 Mar 2020 02:59:00 +0100
Subject: [PATCH 3205/4636] cinnamon.cinnamon-control-center: so not use
 aliases

---
 pkgs/desktops/cinnamon/cinnamon-control-center/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
index 79c4023152f5..e8fa7c7b4e39 100644
--- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
@@ -13,6 +13,7 @@
 , libxml2
 , systemd
 , upower
+, gnome-online-accounts
 , cinnamon-settings-daemon
 , colord
 , polkit
@@ -67,7 +68,7 @@ stdenv.mkDerivation rec {
     colord
     cinnamon-settings-daemon
     libwacom
-    gnome3.gnome-online-accounts
+    gnome-online-accounts
     tzdata
     networkmanager
     networkmanagerapplet

From ca0050e806e20f0dcc896bad3458da3edcd11a71 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 16 Mar 2020 12:07:49 +1000
Subject: [PATCH 3206/4636] ripgrep: 11.0.2 -> 12.0.0

https://github.com/BurntSushi/ripgrep/blob/master/CHANGELOG.md#1200-2020-03-15
---
 pkgs/tools/text/ripgrep/default.nix | 34 ++++++++++++++++-------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index 4a409b8dd84d..d90537bd5533 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -1,40 +1,44 @@
-{ stdenv, fetchFromGitHub, rustPlatform, asciidoc, docbook_xsl, libxslt
+{ stdenv
+, fetchFromGitHub
+, rustPlatform
+, asciidoc
+, docbook_xsl
+, libxslt
+, installShellFiles
 , Security
-, withPCRE2 ? true, pcre2 ? null
+, withPCRE2 ? true
+, pcre2 ? null
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "ripgrep";
-  version = "11.0.2";
+  version = "12.0.0";
 
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = pname;
     rev = version;
-    sha256 = "1iga3320mgi7m853la55xip514a3chqsdi1a1rwv25lr9b1p7vd3";
+    sha256 = "0n4169l662fvg6r4rcfs8n8f92rxndlaqb7k4x63680mra470dbi";
   };
 
-  cargoSha256 = "0lwz661rbm7kwkd6mallxym1pz8ynda5f03ynjfd16vrazy2dj21";
+  cargoSha256 = "01zi9zqdjsgc3im9na511n6w2bmqvm46wryh10fhzc9fnkziqmq3";
 
   cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2";
 
-  nativeBuildInputs = [ asciidoc docbook_xsl libxslt ];
+  nativeBuildInputs = [ asciidoc docbook_xsl libxslt installShellFiles ];
   buildInputs = (stdenv.lib.optional withPCRE2 pcre2)
-    ++ (stdenv.lib.optional stdenv.isDarwin Security);
+  ++ (stdenv.lib.optional stdenv.isDarwin Security);
 
   preFixup = ''
-    mkdir -p "$out/man/man1"
-    cp target/release/build/ripgrep-*/out/rg.1 "$out/man/man1/"
-
-    mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions}
-    cp target/release/build/ripgrep-*/out/rg.bash "$out/share/bash-completion/completions/"
-    cp target/release/build/ripgrep-*/out/rg.fish "$out/share/fish/vendor_completions.d/"
-    cp "$src/complete/_rg" "$out/share/zsh/site-functions/"
+    (cd target/release/build/ripgrep-*/out
+    installManPage rg.1
+    installShellCompletion rg.{bash,fish})
+    installShellCompletion --zsh "$src/complete/_rg"
   '';
 
   meta = with stdenv.lib; {
     description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep";
-    homepage = https://github.com/BurntSushi/ripgrep;
+    homepage = "https://github.com/BurntSushi/ripgrep";
     license = with licenses; [ unlicense /* or */ mit ];
     maintainers = with maintainers; [ tailhook globin ma27 ];
     platforms = platforms.all;

From 8597ab999416fefdd0fa69f19aa174c66ef248ff Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 16 Mar 2020 03:30:29 +0100
Subject: [PATCH 3207/4636] maintainers/teams: add gnome team

gnome3.maintainers attribute always felt like a hack and now we finally have a place to put a groups of maintainers.

Also remove lethalman, as they are no longer available.
---
 maintainers/team-list.nix         | 9 +++++++++
 pkgs/desktops/gnome-3/default.nix | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index f98bbeee912e..1d8b291978b3 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -21,4 +21,13 @@ with lib.maintainers; {
     members = [ jtojnar worldofpeace ];
     scope = "Maintain Freedesktop.org packages for graphical desktop.";
   };
+
+  gnome = {
+    members = [
+      hedning
+      jtojnar
+      worldofpeace
+    ];
+    scope = "Maintain GNOME desktop environment and platform.";
+  };
 }
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index c7c26cec7c3c..f2d3182c337d 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -18,7 +18,7 @@ lib.makeScope pkgs.newScope (self: with self; {
     in
       lib.filter (x: !(builtins.elem (lib.getName x) namesToRemove)) packages;
 
-  maintainers = with pkgs.lib.maintainers; [ lethalman jtojnar hedning worldofpeace ];
+  maintainers = lib.teams.gnome.members;
 
   libsoup = pkgs.libsoup.override { gnomeSupport = true; };
   libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };

From 6040c11041fa0b9e3fa177c5fbaeb29c4787f3ae Mon Sep 17 00:00:00 2001
From: Hamish Mackenzie <Hamish.Mackenzie@iohk.io>
Date: Mon, 16 Mar 2020 15:59:06 +1300
Subject: [PATCH 3208/4636] openssl: Fix openssl build for musl

---
 pkgs/development/libraries/openssl/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 3c952d601654..a2a0c68c316e 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -59,7 +59,9 @@ let
                                      (stdenv.hostPlatform.parsed.cpu.bits != 32)
                                      (toString stdenv.hostPlatform.parsed.cpu.bits)}"
         else if stdenv.hostPlatform.isLinux
-          then "./Configure linux-generic${toString stdenv.hostPlatform.parsed.cpu.bits}"
+          then (if stdenv.hostPlatform.isx86_64
+            then "./Configure linux-x86_64"
+            else "./Configure linux-generic${toString stdenv.hostPlatform.parsed.cpu.bits}")
         else if stdenv.hostPlatform.isiOS
           then "./Configure ios${toString stdenv.hostPlatform.parsed.cpu.bits}-cross"
         else

From 9cadac7abd3a02259aa5ea222c73b10333ce5f4c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 16 Mar 2020 03:02:47 +0000
Subject: [PATCH 3209/4636] python27Packages.uamqp: 1.2.5 -> 1.2.6

---
 pkgs/development/python-modules/uamqp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix
index 8e74c6460fe7..e11088048c34 100644
--- a/pkgs/development/python-modules/uamqp/default.nix
+++ b/pkgs/development/python-modules/uamqp/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "uamqp";
-  version = "1.2.5";
+  version = "1.2.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "02d78242fcd0a58489aaf275964a6cf7581d7a2334ee240d2d547f8aca8607c6";
+    sha256 = "1pzgj85c6g8vr3dq215cd1y2pn8pxc6wa7mjd9m0zrglr1qwwhdz";
   };
 
   buildInputs = [
@@ -39,7 +39,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "An AMQP 1.0 client library for Python";
-    homepage = https://github.com/Azure/azure-uamqp-python;
+    homepage = "https://github.com/Azure/azure-uamqp-python";
     license = licenses.mit;
     maintainers = with maintainers; [ mwilsoninsight ];
   };

From d62f76f81dae6ee870991f7a55ce6139bf7c67c6 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Sun, 15 Mar 2020 06:16:33 +0100
Subject: [PATCH 3210/4636] stubby: build with libsystemd support

This was added in v0.3.0 and allows notifying service readiness.
---
 pkgs/tools/networking/stubby/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/stubby/default.nix b/pkgs/tools/networking/stubby/default.nix
index b560f2768ad7..2a10eb13e320 100644
--- a/pkgs/tools/networking/stubby/default.nix
+++ b/pkgs/tools/networking/stubby/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, getdns, doxygen, libyaml, darwin, cmake }:
+{ stdenv, fetchFromGitHub, getdns, doxygen, libyaml, darwin, cmake, systemd }:
 
 stdenv.mkDerivation rec {
   pname = "stubby";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake libyaml ];
 
-  buildInputs = [ doxygen getdns ]
+  buildInputs = [ doxygen getdns systemd ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ];
 
   meta = with stdenv.lib; {

From b8ef2285b5b91e402c8d6a8eb2bf625a440c2511 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Sun, 15 Mar 2020 06:17:12 +0100
Subject: [PATCH 3211/4636] nixos/stubby: set Type=notify on the systemd
 service

Fixes some dependency ordering problems at boot time with services that
require DNS. Without Type=notify these services might be started before
stubby was ready to accept DNS requests.
---
 nixos/modules/services/networking/stubby.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/stubby.nix b/nixos/modules/services/networking/stubby.nix
index 849d266576d5..c5e0f929a126 100644
--- a/nixos/modules/services/networking/stubby.nix
+++ b/nixos/modules/services/networking/stubby.nix
@@ -205,6 +205,7 @@ in
       wantedBy = [ "multi-user.target" ];
 
       serviceConfig = {
+        Type = "notify";
         AmbientCapabilities = "CAP_NET_BIND_SERVICE";
         CapabilityBoundingSet = "CAP_NET_BIND_SERVICE";
         ExecStart = "${pkgs.stubby}/bin/stubby -C ${confFile} ${optionalString cfg.debugLogging "-l"}";

From 0bec813abfb4f54e6c83039cf99229d4cd63ac44 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Mon, 16 Mar 2020 10:14:04 +0530
Subject: [PATCH 3212/4636] buildGoPackage: remove ehmry from maintainers

I no longer write Go and have lost familiarity with the tooling.
---
 pkgs/development/go-packages/generic/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix
index 03d777d5c880..2de234c9a1eb 100644
--- a/pkgs/development/go-packages/generic/default.nix
+++ b/pkgs/development/go-packages/generic/default.nix
@@ -243,7 +243,7 @@ let
     } // meta // {
       # add an extra maintainer to every package
       maintainers = (meta.maintainers or []) ++
-                    [ lib.maintainers.ehmry lib.maintainers.lethalman ];
+                    [ lib.maintainers.lethalman ];
     };
   });
 in if disabled then

From 95fa9cd0270f803e25f9e27e3af38aea4b4b1632 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Wed, 4 Mar 2020 13:56:37 +0100
Subject: [PATCH 3213/4636] aespipe: install the included bz2aespipe wrapper

---
 pkgs/tools/security/aespipe/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/aespipe/default.nix b/pkgs/tools/security/aespipe/default.nix
index 69bef27258e8..e25416e55b88 100644
--- a/pkgs/tools/security/aespipe/default.nix
+++ b/pkgs/tools/security/aespipe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, sharutils, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "aespipe";
@@ -9,11 +9,19 @@ stdenv.mkDerivation rec {
     sha256 = "15pg9j27mjzl78mpzkdqd84kdafj0g6j72f8wgjrpp2qkxjy2ddi";
   };
 
+  nativeBuildInputs = [ makeWrapper ];
+
   configureFlags = [ "--enable-padlock" "--enable-intelaes" ];
 
+  postInstall = ''
+    cp bz2aespipe $out/bin
+    wrapProgram $out/bin/bz2aespipe \
+     --prefix PATH : $out/bin:${stdenv.lib.makeBinPath [ sharutils ]}
+  '';
+
   meta = with stdenv.lib; {
     description = "AES encrypting or decrypting pipe";
-    homepage = http://loop-aes.sourceforge.net/aespipe.README;
+    homepage = "http://loop-aes.sourceforge.net/aespipe.README";
     license = licenses.gpl2;
     maintainers = [ maintainers.goibhniu ];
     platforms = platforms.linux;

From e68a4094d22010242e66493a1d5d49bc7e139f0c Mon Sep 17 00:00:00 2001
From: Kolby Crouch <kjc.devel@gmail.com>
Date: Sun, 15 Mar 2020 23:57:54 -0500
Subject: [PATCH 3214/4636]  Fix init

---
 maintainers/maintainer-list.nix           | 5 -----
 pkgs/misc/emulators/retroarch/cores.nix   | 2 +-
 pkgs/misc/emulators/retroarch/default.nix | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9a684309dc6a..5fc08c92e990 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3924,11 +3924,6 @@
     githubId = 13721712;
     name = "Konrad Langenberg";
   };
-  kolbycrouch = {
-    email = "kjc.devel@gmail.com";
-    github = "kolbycrouch";
-    name = "Kolby Crouch";
-  };
   konimex = {
     email = "herdiansyah@netc.eu";
     github = "konimex";
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 4062b39d7620..08f3032aef0a 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -479,7 +479,7 @@ in with stdenv.lib.licenses;
       sha256 = "1krr4lmdiv0d7bxk37fqz5y412znb5bmxapv9g7ci6fp87sr69jq";
     };
     description = "FMSX libretro port";
-    license = "Non-Commercial";
+    license = "Non-commercial";
   }).override {
     makefile = "Makefile";
     dontConfigure = true;
diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
index a04bc22194fd..0badccd036cc 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -86,6 +86,6 @@ in stdenv.mkDerivation rec {
     description = "Multi-platform emulator frontend for libretro cores";
     license = licenses.gpl3;
     platforms = platforms.all;
-    maintainers = with maintainers; [ MP2E edwtjo matthewbauer kolbycrouch ];
+    maintainers = with maintainers; [ MP2E edwtjo matthewbauer ];
   };
 }

From 2217b1d77c550841867767ced2ba11466ef927e1 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 16 Mar 2020 02:27:21 -0400
Subject: [PATCH 3215/4636] nuweb: fix after texlive update

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 906578031c87..7f953939589f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10495,7 +10495,7 @@ in
   # NOTE: Override and set icon-lang = null to use Awk instead of Icon.
   noweb = callPackage ../development/tools/literate-programming/noweb { };
 
-  nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; };
+  nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-medium; };
 
   nrfutil = callPackage ../development/tools/misc/nrfutil { };
 

From 9a21dd142a7b628246c4f8cc3a12a20a9a69e2ad Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 16 Mar 2020 02:28:35 -0400
Subject: [PATCH 3216/4636] nuweb: 1.58 -> 1.60

---
 pkgs/development/tools/literate-programming/nuweb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/literate-programming/nuweb/default.nix b/pkgs/development/tools/literate-programming/nuweb/default.nix
index 41c4b25c8b1b..719ea301d74b 100644
--- a/pkgs/development/tools/literate-programming/nuweb/default.nix
+++ b/pkgs/development/tools/literate-programming/nuweb/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec{
 
   pname = "nuweb";
-  version = "1.58";
+  version = "1.60";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/nuweb/${pname}-${version}.tar.gz";
-    sha256 = "0q51i3miy15fv4njjp82yws01qfjxvqx5ly3g3vh8z3h7iq9p47y";
+    sha256 = "08xmwq48biy2c1fr8wnyknyvqs9jfsj42cb7fw638xqv35f0xxvl";
   };
 
   buildInputs = [ tex ];

From fe6839b59c53ba004124760312af5dd1824b6340 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 16 Mar 2020 02:28:54 -0400
Subject: [PATCH 3217/4636] nuweb: enable on darwin

---
 pkgs/development/tools/literate-programming/nuweb/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/literate-programming/nuweb/default.nix b/pkgs/development/tools/literate-programming/nuweb/default.nix
index 719ea301d74b..30eb28fc698c 100644
--- a/pkgs/development/tools/literate-programming/nuweb/default.nix
+++ b/pkgs/development/tools/literate-programming/nuweb/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec{
     homepage = http://nuweb.sourceforge.net;
     license = licenses.free;
     maintainers = [ maintainers.AndersonTorres ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
 # TODO: nuweb.el Emacs integration

From 641e1029748a8ccd5fc052f0029e2fee89ebd0ef Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Thu, 12 Mar 2020 15:06:17 +0530
Subject: [PATCH 3218/4636] deltachat-electron: init 1.1.0

---
 .../deltachat-electron/default.nix            | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix
new file mode 100644
index 000000000000..ed30dca6cce2
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix
@@ -0,0 +1,36 @@
+{ lib, fetchurl, appimageTools }:
+
+let
+  pname = "deltachat-electron";
+  version = "1.1.0";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url =
+      "https://download.delta.chat/desktop/r${version}/DeltaChat-${version}.AppImage";
+    sha256 = "0pbn45cyv0h3fp7s9v9q93v12ah2gj7daaq0r3z140im6zv0rkrc";
+  };
+
+  appimageContents = appimageTools.extract { inherit name src; };
+
+in appimageTools.wrapType2 {
+  inherit name src;
+
+  extraInstallCommands = ''
+    mv $out/bin/${name} $out/bin/${pname}
+    install -m 444 -D \
+      ${appimageContents}/deltachat-desktop.desktop \
+      $out/share/applications/${pname}.desktop
+    substituteInPlace $out/share/applications/${pname}.desktop \
+      --replace 'Exec=AppRun' 'Exec=${pname}'
+    cp -r ${appimageContents}/usr/share/icons $out/share
+  '';
+
+  meta = with lib; {
+    description = "Electron client for DeltaChat";
+    homepage = "https://delta.chat/";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ ehmry ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 906578031c87..f1f53fd3363d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -867,6 +867,9 @@ in
 
   cue = callPackage ../development/tools/cue { };
 
+  deltachat-electron = callPackage
+    ../applications/networking/instant-messengers/deltachat-electron { };
+
   deskew = callPackage ../applications/graphics/deskew { };
 
   detect-secrets = python3Packages.callPackage ../development/tools/detect-secrets { };

From a95d5aef67dcb84c7853a486b42a2346d3781d69 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 16 Mar 2020 08:41:20 +0000
Subject: [PATCH 3219/4636] rsyslog: 8.2001.0 -> 8.2002.0

---
 pkgs/tools/system/rsyslog/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index 0dcde2b1e330..a5ced1e325d0 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -14,11 +14,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "rsyslog";
-  version = "8.2001.0";
+  version = "8.2002.0";
 
   src = fetchurl {
     url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz";
-    sha256 = "1nm83s9abknli46sknjs50cmdhhqzkznbsjspjbdg96likshdgsq";
+    sha256 = "1y414g61j93dgm5xg0ni985a99cyag0flvv1fqn2188dhr6w31py";
   };
 
   #patches = [ ./fix-gnutls-detection.patch ];
@@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    homepage = https://www.rsyslog.com/;
+    homepage = "https://www.rsyslog.com/";
     description = "Enhanced syslog implementation";
     changelog = "https://raw.githubusercontent.com/rsyslog/rsyslog/v${version}/ChangeLog";
     license = licenses.gpl3;

From 21cca8563555b2b9ea574074e6910fcbcd45667e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 16 Mar 2020 08:51:21 +0000
Subject: [PATCH 3220/4636] simg2img: 1.1.3 -> 1.1.4

---
 pkgs/tools/filesystems/simg2img/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/simg2img/default.nix b/pkgs/tools/filesystems/simg2img/default.nix
index 78f80ecfa87a..6782987c027f 100644
--- a/pkgs/tools/filesystems/simg2img/default.nix
+++ b/pkgs/tools/filesystems/simg2img/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "simg2img";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchFromGitHub {
     owner = "anestisb";
     repo = "android-simg2img";
     rev = version;
-    sha256 = "119gl9i61g2wr07hzv6mi1ihql6yd6pwq94ki2pgcpfbamv8f6si";
+    sha256 = "1xm9kaqs2w8c7a4psv78gv66gild88mpgjn5lj087d7jh1jxy7bf";
   };
 
   buildInputs = [ zlib ];

From 849e16888f439d98ba99c6a67123033edaa56663 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 15 Mar 2020 16:58:50 +0100
Subject: [PATCH 3221/4636] nixos/doc/matrix-synapse: refactor

* Linkify all service options used in the code-examples.
* Demonstrated the use of `riot-web.override {}`.
* Moved the example how to configure a postgresql-database for
  `matrix-synapse` to this document from the 20.03 release-notes.
---
 .../manual/configuration/configuration.xml    |  1 -
 nixos/doc/manual/release-notes/rl-2003.xml    | 19 +---
 .../modules/services/misc/matrix-synapse.nix  |  4 +-
 .../services/misc/matrix-synapse.xml}         | 97 +++++++++++--------
 4 files changed, 66 insertions(+), 55 deletions(-)
 rename nixos/{doc/manual/configuration/matrix.xml => modules/services/misc/matrix-synapse.xml} (61%)

diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml
index 5961209bc13a..507d28814ead 100644
--- a/nixos/doc/manual/configuration/configuration.xml
+++ b/nixos/doc/manual/configuration/configuration.xml
@@ -21,7 +21,6 @@
  <xi:include href="xfce.xml" />
  <xi:include href="networking.xml" />
  <xi:include href="linux-kernel.xml" />
- <xi:include href="matrix.xml" />
  <xi:include href="../generated/modules.xml" xpointer="xpointer(//section[@id='modules']/*)" />
  <xi:include href="profiles.xml" />
  <xi:include href="kubernetes.xml" />
diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index 18cb1e4c314e..20f232c9110e 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -746,21 +746,10 @@ auth required pam_succeed_if.so uid >= 1000 quiet
 }</programlisting>
       </para></listitem>
       <listitem><para>If you deploy a fresh <package>matrix-synapse</package>, you need to configure
-       the database yourself. An example for this can be found in <literal>&lt;nixpkgs/nixos/tests/matrix-synapse.nix&gt;</literal>:
-<programlisting>{ ... }: {
-  services.matrix-synapse = {
-   <link linkend="opt-services.matrix-synapse.enable">enable</link> = true;
-   /* and all the other config you've defined here */
-  };
-  <link linkend="opt-services.postgresql.enable">services.postgresql.enable</link> = true;
-  <link linkend="opt-services.postgresql.initialScript">services.postgresql.initialScript</link> = ''
-    CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse';
-    CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse"
-      TEMPLATE template0
-      LC_COLLATE = "C"
-      LC_CTYPE = "C";
-  '';
-}</programlisting>
+       the database yourself (e.g. by using the
+       <link linkend="opt-services.postgresql.initialScript">services.postgresql.initialScript</link>
+       option). An example for this can be found in the
+       <link linkend="module-services-matrix">documentation of the Matrix module</link>.
       </para></listitem>
       <listitem><para>If you initially deployed your <package>matrix-synapse</package> on
        <literal>nixos-unstable</literal> <emphasis>after</emphasis> the <literal>19.09</literal>-release,
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix
index 52b917a73a06..d02fa13bb99c 100644
--- a/nixos/modules/services/misc/matrix-synapse.nix
+++ b/nixos/modules/services/misc/matrix-synapse.nix
@@ -113,7 +113,7 @@ ${cfg.extraConfig}
 '';
 
   hasLocalPostgresDB = let args = cfg.database_args; in
-    usePostgresql && (!(args ? host) || (elem args.host [ "localhost" "127.0.0.1" ]));
+    usePostgresql && (!(args ? host) || (elem args.host [ "localhost" "127.0.0.1" "::1" ]));
 in {
   options = {
     services.matrix-synapse = {
@@ -721,4 +721,6 @@ in {
     '')
   ];
 
+  meta.doc = ./matrix-synapse.xml;
+
 }
diff --git a/nixos/doc/manual/configuration/matrix.xml b/nixos/modules/services/misc/matrix-synapse.xml
similarity index 61%
rename from nixos/doc/manual/configuration/matrix.xml
rename to nixos/modules/services/misc/matrix-synapse.xml
index ef8d5cbda889..053a3b2a563f 100644
--- a/nixos/doc/manual/configuration/matrix.xml
+++ b/nixos/modules/services/misc/matrix-synapse.xml
@@ -40,26 +40,35 @@ let
     in join config.networking.hostName config.networking.domain;
 in {
   networking = {
-    hostName = "myhostname";
-    domain = "example.org";
+    <link linkend="opt-networking.hostName">hostName</link> = "myhostname";
+    <link linkend="opt-networking.domain">domain</link> = "example.org";
   };
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
+  <link linkend="opt-networking.firewall.allowedTCPPorts">networking.firewall.allowedTCPPorts</link> = [ 80 443 ];
+
+  <link linkend="opt-services.postgresql.enable">services.postgresql.enable</link> = true;
+  <link linkend="opt-services.postgresql.initialScript">services.postgresql.initialScript</link> = ''
+    CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse';
+    CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse"
+      TEMPLATE template0
+      LC_COLLATE = "C"
+      LC_CTYPE = "C";
+  '';
 
   services.nginx = {
-    enable = true;
+    <link linkend="opt-services.nginx.enable">enable</link> = true;
     # only recommendedProxySettings and recommendedGzipSettings are strictly required,
     # but the rest make sense as well
-    recommendedTlsSettings = true;
-    recommendedOptimisation = true;
-    recommendedGzipSettings = true;
-    recommendedProxySettings = true;
+    <link linkend="opt-services.nginx.recommendedTlsSettings">recommendedTlsSettings</link> = true;
+    <link linkend="opt-services.nginx.recommendedOptimisation">recommendedOptimisation</link> = true;
+    <link linkend="opt-services.nginx.recommendedGzipSettings">recommendedGzipSettings</link> = true;
+    <link linkend="opt-services.nginx.recommendedProxySettings">recommendedProxySettings</link> = true;
 
-    virtualHosts = {
+    <link linkend="opt-services.nginx.virtualHosts">virtualHosts</link> = {
       # This host section can be placed on a different host than the rest,
       # i.e. to delegate from the host being accessible as ${config.networking.domain}
       # to another host actually running the Matrix homeserver.
       "${config.networking.domain}" = {
-        locations."= /.well-known/matrix/server".extraConfig =
+        <link linkend="opt-services.nginx.virtualHosts._name_.locations._name_.extraConfig">locations."= /.well-known/matrix/server".extraConfig</link> =
           let
             # use 443 instead of the default 8448 port to unite
             # the client-server and server-server port for simplicity
@@ -68,7 +77,7 @@ in {
             add_header Content-Type application/json;
             return 200 '${builtins.toJSON server}';
           '';
-        locations."= /.well-known/matrix/client".extraConfig =
+        <link linkend="opt-services.nginx.virtualHosts._name_.locations._name_.extraConfig">locations."= /.well-known/matrix/client".extraConfig</link> =
           let
             client = {
               "m.homeserver" =  { "base_url" = "https://${fqdn}"; };
@@ -84,34 +93,37 @@ in {
 
       # Reverse proxy for Matrix client-server and server-server communication
       ${fqdn} = {
-        enableACME = true;
-        forceSSL = true;
+        <link linkend="opt-services.nginx.virtualHosts._name_.enableACME">enableACME</link> = true;
+        <link linkend="opt-services.nginx.virtualHosts._name_.forceSSL">forceSSL</link> = true;
 
         # Or do a redirect instead of the 404, or whatever is appropriate for you.
         # But do not put a Matrix Web client here! See the Riot Web section below.
-        locations."/".extraConfig = ''
+        <link linkend="opt-services.nginx.virtualHosts._name_.locations._name_.extraConfig">locations."/".extraConfig</link> = ''
           return 404;
         '';
 
         # forward all Matrix API calls to the synapse Matrix homeserver
         locations."/_matrix" = {
-          proxyPass = "http://[::1]:8008"; # without a trailing /
+          <link linkend="opt-services.nginx.virtualHosts._name_.locations._name_.proxyPass">proxyPass</link> = "http://[::1]:8008"; # without a trailing /
         };
       };
     };
   };
   services.matrix-synapse = {
-    enable = true;
-    server_name = config.networking.domain;
-    listeners = [
+    <link linkend="opt-services.matrix-synapse.enable">enable</link> = true;
+    <link linkend="opt-services.matrix-synapse.server_name">server_name</link> = config.networking.domain;
+    <link linkend="opt-services.matrix-synapse.listeners">listeners</link> = [
       {
-        port = 8008;
-        bind_address = "::1";
-        type = "http";
-        tls = false;
-        x_forwarded = true;
-        resources = [
-          { names = [ "client" "federation" ]; compress = false; }
+        <link linkend="opt-services.matrix-synapse.listeners._.port">port</link> = 8008;
+        <link linkend="opt-services.matrix-synapse.listeners._.bind_address">bind_address</link> = "::1";
+        <link linkend="opt-services.matrix-synapse.listeners._.type">type</link> = "http";
+        <link linkend="opt-services.matrix-synapse.listeners._.tls">tls</link> = false;
+        <link linkend="opt-services.matrix-synapse.listeners._.x_forwarded">x_forwarded</link> = true;
+        <link linkend="opt-services.matrix-synapse.listeners._.resources">resources</link> = [
+          {
+            <link linkend="opt-services.matrix-synapse.listeners._.resources._.names">names</link> = [ "client" "federation" ];
+            <link linkend="opt-services.matrix-synapse.listeners._.resources._.compress">compress</link> = false;
+          }
         ];
       }
     ];
@@ -135,10 +147,10 @@ in {
 
   <para>
    If you want to run a server with public registration by anybody, you can
-   then enable <option>services.matrix-synapse.enable_registration =
-   true;</option>. Otherwise, or you can generate a registration secret with
+   then enable <literal><link linkend="opt-services.matrix-synapse.enable_registration">services.matrix-synapse.enable_registration</link> =
+   true;</literal>. Otherwise, or you can generate a registration secret with
    <command>pwgen -s 64 1</command> and set it with
-   <option>services.matrix-synapse.registration_shared_secret</option>. To
+   <option><link linkend="opt-services.matrix-synapse.registration_shared_secret">services.matrix-synapse.registration_shared_secret</link></option>. To
    create a new user or admin, run the following after you have set the secret
    and have rebuilt NixOS:
 <screen>
@@ -154,8 +166,8 @@ Success!
    <literal>@your-username:example.org</literal>. Note that the registration
    secret ends up in the nix store and therefore is world-readable by any user
    on your machine, so it makes sense to only temporarily activate the
-   <option>registration_shared_secret</option> option until a better solution
-   for NixOS is in place.
+   <link linkend="opt-services.matrix-synapse.registration_shared_secret">registration_shared_secret</link>
+   option until a better solution for NixOS is in place.
   </para>
  </section>
  <section xml:id="module-services-matrix-riot-web">
@@ -177,15 +189,24 @@ Success!
    Matrix Now!</link> for a list of existing clients and their supported
    featureset.
 <programlisting>
-services.nginx.virtualHosts."riot.${fqdn}" = {
-  enableACME = true;
-  forceSSL = true;
-  serverAliases = [
-    "riot.${config.networking.domain}"
-  ];
+{
+  services.nginx.virtualHosts."riot.${fqdn}" = {
+    <link linkend="opt-services.nginx.virtualHosts._name_.enableACME">enableACME</link> = true;
+    <link linkend="opt-services.nginx.virtualHosts._name_.forceSSL">forceSSL</link> = true;
+    <link linkend="opt-services.nginx.virtualHosts._name_.serverAliases">serverAliases</link> = [
+      "riot.${config.networking.domain}"
+    ];
 
-  root = pkgs.riot-web;
-};
+    <link linkend="opt-services.nginx.virtualHosts._name_.root">root</link> = pkgs.riot-web.override {
+      conf = {
+        default_server_config."m.homeserver" = {
+          "base_url" = "${config.networking.domain}";
+          "server_name" = "${fqdn}";
+        };
+      };
+    };
+  };
+}
 </programlisting>
   </para>
 

From c9836e9f6de0981f5f99c21c53362154c370179e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 16 Mar 2020 09:54:28 +0000
Subject: [PATCH 3222/4636] saga: 7.5.0 -> 7.6.1

---
 pkgs/applications/gis/saga/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index 747777c75af2..30ae92f58aee 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation {
   pname = "saga";
-  version = "7.5.0";
+  version = "7.6.1";
 
   # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
   # for why the have additional buildInputs on darwin
@@ -18,13 +18,13 @@ stdenv.mkDerivation {
   CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing";
 
   src = fetchurl {
-    url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%207/SAGA%20-%207.5.0/saga-7.5.0.tar.gz";
-    sha256 = "0s5195802xwlkb2w4i4vd9ys95d7fnzn5cnnixh1csaqc2x1qp6r";
+    url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%207/SAGA%20-%207.6.1/saga-7.6.1.tar.gz";
+    sha256 = "1i0cp1lms6cmjl7f5vgr9pl3qc02fmappn4kq21y0dn2gy7j2mkn";
   };
 
   meta = with stdenv.lib; {
     description = "System for Automated Geoscientific Analyses";
-    homepage = http://www.saga-gis.org;
+    homepage = "http://www.saga-gis.org";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ michelk mpickering ];
     platforms = with platforms; unix;

From 8cdfd69bb6ddb6f4549d26a845b6215fd785c99c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 16 Mar 2020 11:10:22 +0000
Subject: [PATCH 3223/4636] unicode-character-database: 12.1.0 -> 13.0.0

---
 pkgs/data/misc/unicode-character-database/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/unicode-character-database/default.nix b/pkgs/data/misc/unicode-character-database/default.nix
index 5f50049856f3..1eda25fbe2b1 100644
--- a/pkgs/data/misc/unicode-character-database/default.nix
+++ b/pkgs/data/misc/unicode-character-database/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "unicode-character-database";
-  version = "12.1.0";
+  version = "13.0.0";
 
   src = fetchurl {
     url = "https://www.unicode.org/Public/zipped/${version}/UCD.zip";
-    sha256 = "19m06iw0jl7lhlggcmghi12p6jld0qrmfpksgc243yn6sjh53fi5";
+    sha256 = "0ld97ppkb5f8d5b3mlkxfwnr6f3inijyqias9xc4bbin9lxrfxig";
   };
 
   nativeBuildInputs = [

From b143bc6ed42b682968c0992641c16b82adc5c406 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 16 Mar 2020 13:11:34 +0100
Subject: [PATCH 3224/4636] =?UTF-8?q?zsh-powerlevel10k:=20v1.3.0=20?=
 =?UTF-8?q?=E2=86=92=20v1.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changes since the last release

    New prompt segments:
        package: shows npm name and version from package.json (disabled by default).

    New and changed parameters:
        P9K_OS_ICON: set by Powerlevel10k on initialization; can be used in user-defined prompt segments and *_EXPANSION parameters.
        POWERLEVEL9K_ICON_PADDING: when set to moderate, some icons will have an extra space after them. This is meant to avoid icon overlap when using non-monospace fonts. When set to none, spaces are not added.

    Performance improvement:
        detect_virt prompt segment is now 50% faster.

    Bug fixes:
        Many terminal escape sequences are now terminated with BEL instead of ST. BEL is the standard terminator according to ECMA-48 §8.3.89 but Konsole doesn't understand it. Thankfully, all terminals appear to understand BEL as extension.
        Superfluous spaces have been removed from vcs segment when using a monospace font and not using my_git_formatter.

    Wizard:
        Generated configs now set POWERLEVEL9K_ICON_PADDING in favor of *_VISUAL_IDENTIFIER_EXPANSION. The value of this parameters depends on the answers to the first few questions that concern terminal font capabilities.
        Generated configs no longer attempt to work around misconfigured locale. The workarounds in Powerlevel10k proper are sufficient.

    gitstatus:
        Fix a regression on Linux systems where uname doesn't understand -o.
        Fix a regression on Cygwin and MinGW when running on older versions of Windows.
        Fix a bug that can result in occasional gitstatus initialization failure on WSL when using Powerlevel10k with Instant Prompt.
---
 pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
index 35355bf29759..777ec6e63c15 100644
--- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
+++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "powerlevel10k";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "romkatv";
     repo = "powerlevel10k";
     rev = "v${version}";
-    sha256 = "1w2iy9anc3cxb5kffrdz8knml8nsl6v3lcrdsigfzfp0zignb4cw";
+    sha256 = "03v8qlblgdazbm16gwr87blm5nxizza61f8w6hjyhgrx51ly9ln5";
   };
 
   patches = [

From b1e788c02831570067b8a6f62993fedab7b215c0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 16 Mar 2020 13:12:09 +0100
Subject: [PATCH 3225/4636] =?UTF-8?q?gitstatus:=20unstable-2020-03-06=20?=
 =?UTF-8?q?=E2=86=92=20unstable-2020-03-15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../version-management/git-and-tools/gitstatus/default.nix      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
index 57caada72b54..a444ab05039f 100644
--- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   pname = "gitstatus";
-  version = "unstable-2020-03-06";
+  version = "unstable-2020-03-15";
 
   src = fetchFromGitHub {
     owner = "romkatv";

From 3355e8d1ca1e6e414d5ef64da02fa5728f873e17 Mon Sep 17 00:00:00 2001
From: Matteo Scarlata <scarlata.matteo@gmail.com>
Date: Mon, 16 Mar 2020 13:16:43 +0100
Subject: [PATCH 3226/4636] unison: fix build with ocamlPackages_4_09 (#82619)

Fixes #61867 and #61505, bumps the ocaml version unison is built
against to 4.08. The patches included here appear in the trunk version
of unison, but were not backported to 2.51.2.
---
 .../sync/unison/4.08-compatibility.patch      | 52 +++++++++++++++++++
 .../networking/sync/unison/default.nix        |  6 +++
 .../networking/sync/unison/lablgtk.patch      | 31 +++++++++++
 pkgs/top-level/all-packages.nix               |  1 -
 4 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/networking/sync/unison/4.08-compatibility.patch
 create mode 100644 pkgs/applications/networking/sync/unison/lablgtk.patch

diff --git a/pkgs/applications/networking/sync/unison/4.08-compatibility.patch b/pkgs/applications/networking/sync/unison/4.08-compatibility.patch
new file mode 100644
index 000000000000..a6921b516f07
--- /dev/null
+++ b/pkgs/applications/networking/sync/unison/4.08-compatibility.patch
@@ -0,0 +1,52 @@
+From 29fa058c3127f3b47c347dcaa4a94f4c0e888308 Mon Sep 17 00:00:00 2001
+From: Jaap Boender <jaapb@kerguelen.org>
+Date: Thu, 21 Mar 2019 12:26:51 +0000
+Subject: [PATCH] Compatibility with OCaml 4.08
+
+---
+ src/files.ml                 | 2 +-
+ src/recon.ml                 | 4 ++--
+ src/system/system_generic.ml | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/files.ml b/src/files.ml
+index ba42ad57..5babf21e 100644
+--- a/src/files.ml
++++ b/src/files.ml
+@@ -722,7 +722,7 @@ let get_files_in_directory dir =
+   with End_of_file ->
+     dirh.System.closedir ()
+   end;
+-  Sort.list (<) !files
++  List.sort String.compare !files
+ 
+ let ls dir pattern =
+   Util.convertUnixErrorsToTransient
+diff --git a/src/recon.ml b/src/recon.ml
+index 5ed358d7..0df2cfe4 100644
+--- a/src/recon.ml
++++ b/src/recon.ml
+@@ -651,8 +651,8 @@ let rec reconcile
+ 
+ (* Sorts the paths so that they will be displayed in order                   *)
+ let sortPaths pathUpdatesList =
+-  Sort.list
+-    (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
++  List.sort
++    Path.compare
+     pathUpdatesList
+ 
+ let rec enterPath p1 p2 t =
+diff --git a/src/system/system_generic.ml b/src/system/system_generic.ml
+index ed8e18f3..0e28a781 100755
+--- a/src/system/system_generic.ml
++++ b/src/system/system_generic.ml
+@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen
+ let chmod = Unix.chmod
+ let chown = Unix.chown
+ let utimes = Unix.utimes
+-let link = Unix.link
++let link s d = Unix.link s d
+ let openfile = Unix.openfile
+ let opendir f =
+   let h = Unix.opendir f in
diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix
index c29bd3a486cc..9c49b22d9443 100644
--- a/pkgs/applications/networking/sync/unison/default.nix
+++ b/pkgs/applications/networking/sync/unison/default.nix
@@ -27,6 +27,12 @@ stdenv.mkDerivation (rec {
     "UISTYLE=${if enableX11 then "gtk2" else "text"}"
   ] ++ stdenv.lib.optional (!ocaml.nativeCompilers) "NATIVE=false";
 
+  patches = [
+    # NOTE: Only needed until Unison 2.51.3 is released!
+    ./4.08-compatibility.patch
+    ./lablgtk.patch
+  ];
+
   preInstall = "mkdir -p $out/bin";
 
   postInstall = if enableX11 then ''
diff --git a/pkgs/applications/networking/sync/unison/lablgtk.patch b/pkgs/applications/networking/sync/unison/lablgtk.patch
new file mode 100644
index 000000000000..20c1db1b1166
--- /dev/null
+++ b/pkgs/applications/networking/sync/unison/lablgtk.patch
@@ -0,0 +1,31 @@
+From 2e7ea9481c6c3ff2ec513c39f73cfe15c0763c06 Mon Sep 17 00:00:00 2001
+From: daviddavid <geiger.david68210@gmail.com>
+Date: Mon, 26 Feb 2018 13:36:36 +0100
+Subject: [PATCH] Fix for lablgtk >= 2.18.6
+
+---
+ src/uigtk2.ml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/uigtk2.ml b/src/uigtk2.ml
+index 2ba6d79..04c4da4 100644
+--- a/src/uigtk2.ml
++++ b/src/uigtk2.ml
+@@ -89,12 +89,12 @@ let fontItalic = lazy (Pango.Font.from_string "italic")
+ (* This does not work with the current version of Lablgtk, due to a bug
+ let icon =
+   GdkPixbuf.from_data ~width:48 ~height:48 ~has_alpha:true
+-    (Gpointer.region_of_string Pixmaps.icon_data)
++    (Gpointer.region_of_bytes Pixmaps.icon_data)
+ *)
+ let icon =
+   let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in
+   Gpointer.blit
+-    (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
++    (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
+   p
+ 
+ let leftPtrWatch =
+-- 
+2.25.1
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1f53fd3363d..7e45856b05d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22063,7 +22063,6 @@ in
 
   unison = callPackage ../applications/networking/sync/unison {
     enableX11 = config.unison.enableX11 or true;
-    ocamlPackages = ocaml-ng.ocamlPackages_4_05;
   };
 
   unpaper = callPackage ../tools/graphics/unpaper { };

From 977be2277aabb42c131879c74af3378e0669a9f8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 16 Mar 2020 12:16:44 +0000
Subject: [PATCH 3227/4636] uid_wrapper: 1.2.7 -> 1.2.8

---
 pkgs/development/libraries/uid_wrapper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix
index 8a79dab45b2a..e78e72bf9b87 100644
--- a/pkgs/development/libraries/uid_wrapper/default.nix
+++ b/pkgs/development/libraries/uid_wrapper/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "uid_wrapper-1.2.7";
+  name = "uid_wrapper-1.2.8";
 
   src = fetchurl {
     url = "mirror://samba/cwrap/${name}.tar.gz";
-    sha256 = "0mpzr70n24b0khri89hipxiqqay370m93syhnywrdmdxr3dhw2d8";
+    sha256 = "0swm9d8l69dw7nbrw6xh7rdy7cfrqflw3hxshicsrhd9v03iwvqf";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 57e309376a716a195e151da955bc8489f8b74d62 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 16 Mar 2020 12:30:22 +0000
Subject: [PATCH 3228/4636] tintin: 2.02.01 -> 2.02.02

---
 pkgs/games/tintin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix
index 62fda890e84c..fbf4b1beecfd 100644
--- a/pkgs/games/tintin/default.nix
+++ b/pkgs/games/tintin/default.nix
@@ -6,11 +6,11 @@
 assert tlsSupport -> gnutls != null;
 
 stdenv.mkDerivation rec {
-  name = "tintin-2.02.01";
+  name = "tintin-2.02.02";
 
   src = fetchurl {
     url    = "mirror://sourceforge/tintin/${name}.tar.gz";
-    sha256 = "15ajs6d0rb3xchd46gyziciz9vv0ks75schk1s4hs7pr30yr7k6y";
+    sha256 = "11ylbp8ip7dwmh4gzb53z147pcfxkl3lwhyy8ngyn2zc634vdn65";
   };
 
   nativeBuildInputs = lib.optional tlsSupport gnutls.dev;

From 25e844db9ae826bf5fe98c18bc92ebaac8e52182 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Thu, 5 Mar 2020 11:58:10 +0200
Subject: [PATCH 3229/4636] wine{Unstable,Staging}: 5.0 -> 5.3

---
 pkgs/misc/emulators/wine/sources.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 06b3a950ba09..62b1b7703ab5 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -39,16 +39,16 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "5.0";
-    url = "https://dl.winehq.org/wine/source/5.0/wine-${version}.tar.xz";
-    sha256 = "1d0kcy338radq07hrnzcpc9lc9j2fvzjh37q673002x8d6x5058q";
+    version = "5.3";
+    url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz";
+    sha256 = "1pkzj3656ad0vmc7ciwfzn45lb2kxwbyymfwnqaa105dicicf6wv";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     # https://github.com/wine-staging/wine-staging/releases
     inherit (unstable) version;
-    sha256 = "054m2glvav29qnlgr3p36kahyv3kbxzba82djzqpc7cmsrin0d3f";
+    sha256 = "1mvhrvshyrj7lgjgka735z6j8idwd6j58bpg5nz1slgmlh1llrs6";
     owner = "wine-staging";
     repo = "wine-staging";
     rev = "v${version}";

From bcb29ee284a7f0ca1232009aa2493aee5f8a6cc8 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Mon, 16 Mar 2020 15:36:23 +0200
Subject: [PATCH 3230/4636] wineUnstable: 5.3 -> 5.4

---
 pkgs/misc/emulators/wine/sources.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 62b1b7703ab5..906bec3176df 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -39,19 +39,23 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "5.3";
+    version = "5.4";
     url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz";
-    sha256 = "1pkzj3656ad0vmc7ciwfzn45lb2kxwbyymfwnqaa105dicicf6wv";
+    sha256 = "0b052xrjb7099b7v5gx53vlzqxirik152q0fajcz25alz87jngjb";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     # https://github.com/wine-staging/wine-staging/releases
     inherit (unstable) version;
-    sha256 = "1mvhrvshyrj7lgjgka735z6j8idwd6j58bpg5nz1slgmlh1llrs6";
+    sha256 = "0pj49wzryaaj0zxz7zzza9b36yhhwmap485qsk145sd4q2jlfhcr";
     owner = "wine-staging";
     repo = "wine-staging";
-    rev = "v${version}";
+    # FIXME: built from direct commit revision, due important post-release fix
+    # Revert to use `v${version}` after 5.5 release.
+    # Thanks to Zebediah Figura <z.figura12@gmail.com> for operative fixup.
+    ## rev = "v${version}";
+    rev = "a1246b5e921ea950851e4a971fb3dae535d7b982";
   };
 
   winetricks = fetchFromGitHub rec {

From ef3175bcfa0d44c5529e02e0da5668a4c1438e9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Mon, 16 Mar 2020 15:23:31 +0100
Subject: [PATCH 3231/4636] racket: enable building on aarch64

---
 pkgs/development/interpreters/racket/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 3e9716af5508..8e66bf96e8ca 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
     homepage = https://racket-lang.org/;
     license = with licenses; [ asl20 /* or */ mit ];
     maintainers = with maintainers; [ kkallio henrytill vrthra ];
-    platforms = [ "x86_64-darwin" "x86_64-linux" ];
+    platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" ];
     broken = stdenv.isDarwin; # No support yet for setting FFI lookup path
   };
 }

From 3ceec5df3cc0520f33584cb9f7184806bd5521c9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 16 Mar 2020 14:52:15 +0000
Subject: [PATCH 3232/4636] victoriametrics: 1.32.5 -> 1.33.1

---
 pkgs/servers/nosql/victoriametrics/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix
index 45d3d3cc5595..2d357712096a 100644
--- a/pkgs/servers/nosql/victoriametrics/default.nix
+++ b/pkgs/servers/nosql/victoriametrics/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "VictoriaMetrics";
-  version = "1.32.5";
+  version = "1.33.1";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "1i3l8bkii3x8wnq9a8yn48cchni5h0gy3rrpvg0jgm4kmm5dlq4y";
+    sha256 = "1irc3zahp72631ai9rafc8n7vayr4hzlh8qla05chlsb2fwzqrrd";
   };
 
-  modSha256 = "0696p1hv5z3dvawizvw0yi4xzl41bsmszkdqayzb37nm5cfk8riq";
+  modSha256 = "0qzh3jmj7ps6xmnnmfr8bnq97kdkn58p6dxppmlypanar3zsn7vk";
   meta = with lib; {
     homepage = "https://victoriametrics.com/";
     description = "fast, cost-effective and scalable time series database, long-term remote storage for Prometheus";

From 22805c0e5fbc6773fb997c14cbf81c9929930c2b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 16 Mar 2020 15:09:49 +0000
Subject: [PATCH 3233/4636] zabbix-cli: 2.1.1 -> 2.2.1

---
 pkgs/tools/misc/zabbix-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/zabbix-cli/default.nix b/pkgs/tools/misc/zabbix-cli/default.nix
index d21573885123..74e7e7223d14 100644
--- a/pkgs/tools/misc/zabbix-cli/default.nix
+++ b/pkgs/tools/misc/zabbix-cli/default.nix
@@ -4,7 +4,7 @@ let
 
 in pythonPackages.buildPythonApplication rec {
   pname = "zabbix-cli";
-  version = "2.1.1";
+  version = "2.2.1";
 
   propagatedBuildInputs = with pythonPackages; [ ipaddr requests ];
 
@@ -17,7 +17,7 @@ in pythonPackages.buildPythonApplication rec {
     owner = "usit-gd";
     repo = "zabbix-cli";
     rev = version;
-    sha256 = "10a1cvjqwlqqfz52ajv9i53h6v95w8y7xmgqr79q2c4v1nz5bfks";
+    sha256 = "0wzmrn8p09ksqhhgawr179c4az7p2liqr0l4q2dra62bxliawyqz";
   };
 
   meta = with lib; {

From 8efac4fc98e0a7b1147812ab752b6dec66e9a40d Mon Sep 17 00:00:00 2001
From: misuzu <bakalolka@gmail.com>
Date: Mon, 16 Mar 2020 18:16:43 +0200
Subject: [PATCH 3234/4636] zerotierone: fix build on armv7l via gcc9

---
 pkgs/tools/networking/zerotierone/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index da5b8837523d..63f0f8b17c5e 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -21,6 +21,9 @@ stdenv.mkDerivation rec {
       patchShebangs ./doc/build.sh
       substituteInPlace ./doc/build.sh \
         --replace '/usr/bin/ronn' '${buildPackages.ronn}/bin/ronn' \
+
+      substituteInPlace ./make-linux.mk \
+        --replace 'armv5' 'armv6'
   '';
 
 

From 795dcf890802b3bc23ea4ed40ab231d9cc240f15 Mon Sep 17 00:00:00 2001
From: misuzu <bakalolka@gmail.com>
Date: Mon, 16 Mar 2020 18:17:18 +0200
Subject: [PATCH 3235/4636] zerotierone: it supports all platforms

---
 pkgs/tools/networking/zerotierone/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index 63f0f8b17c5e..c060e6a61a42 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
     homepage = https://www.zerotier.com;
     license = licenses.bsl11;
     maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz danielfullmer ];
-    platforms = with platforms; x86_64 ++ aarch64 ++ arm;
+    platforms = platforms.all;
   };
 }

From fd0c7cc4ec3d4e336ec907c2ca9c09d54019738d Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 16 Mar 2020 20:12:10 +0300
Subject: [PATCH 3236/4636] lego: 3.4.0 -> 3.5.0

---
 pkgs/tools/admin/lego/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix
index 3a0d9491d157..72c61ceecaf2 100644
--- a/pkgs/tools/admin/lego/default.nix
+++ b/pkgs/tools/admin/lego/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "lego";
-  version = "3.4.0";
+  version = "3.5.0";
 
   src = fetchFromGitHub {
     owner = "go-acme";
     repo = pname;
     rev = "v${version}";
-    sha256 = "198nc0rpkxyjms2lvv7g0rzy8cczzs662ncywzmcqsd1qs67zvif";
+    sha256 = "08mh2q426gmhcaz578lw08jbxfqb7qm37cd00ap937dymi1zs9qw";
   };
 
-  modSha256 = "09w2lsn1zbn750m77084x886k4lx264dgl80d9g7kxjnsqgsmzig";
+  modSha256 = "10n8pcbmzlnk63gzsjb1xnmjwxfhxsqx8ffpcbwdzq9fc5yvjiii";
   subPackages = [ "cmd/lego" ];
 
   buildFlagsArray = [

From 759fd9b0b031ae7b293854bcb09ed1317ddc3d55 Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Mon, 16 Mar 2020 19:16:25 +0200
Subject: [PATCH 3237/4636] nixos/postgresql: add upgrade documentation

---
 .../modules/services/databases/postgresql.xml | 47 ++++++++++++++++++-
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml
index 72d4a8249a32..1754f19fe1eb 100644
--- a/nixos/modules/services/databases/postgresql.xml
+++ b/nixos/modules/services/databases/postgresql.xml
@@ -63,8 +63,51 @@ Type "help" for help.
   <title>Upgrading</title>
 
   <para>
-   FIXME: document dump/upgrade/load cycle.
-  </para>
+   Major PostgreSQL upgrade requires PostgreSQL downtime and a few imperative steps to be called. To simplify this process, use the following NixOS module:
+
+<programlisting>
+  containers.temp-pg.config.services.postgresql = {
+    enable = true;
+    package = pkgs.postgresql_12;
+    ## set a custom new dataDir
+    # dataDir = "/some/data/dir";
+  };
+  environment.systemPackages =
+    let newpg = config.containers.temp-pg.config.services.postgresql;
+    in [
+      (pkgs.writeScriptBin "upgrade-pg-cluster" ''
+        set -x
+        export OLDDATA="${config.services.postgresql.dataDir}"
+        export NEWDATA="${newpg.dataDir}"
+        export OLDBIN="${config.services.postgresql.package}/bin"
+        export NEWBIN="${newpg.package}/bin"
+
+        install -d -m 0700 -o postgres -g postgres "$NEWDATA"
+        cd "$NEWDATA"
+        sudo -u postgres $NEWBIN/initdb -D "$NEWDATA"
+
+        systemctl stop postgresql    # old one
+
+        sudo -u postgres $NEWBIN/pg_upgrade \
+          --old-datadir "$OLDDATA" --new-datadir "$NEWDATA" \
+          --old-bindir $OLDBIN --new-bindir $NEWBIN \
+          "$@"
+      '')
+    ];
+</programlisting>
+    </para>
+  <para>
+      The upgrade process is:</para>
+
+  <orderedlist>
+      <listitem><para>Rebuild nixos configuration with the configuration above added to your <filename>configuration.nix</filename>. Alternatively, add that into separate file and reference it in <literal>imports</literal> list.</para></listitem>
+          <listitem><para>Login as root (<literal>sudo su -</literal>)</para></listitem>
+              <listitem><para>Run <literal>upgrade-pg-cluster</literal>. It will stop old postgresql, initialize new one and migrate old one to new one. You may supply arguments like <literal>--jobs 4</literal> and <literal>--link</literal> to speedup migration process. See <link xlink:href="https://www.postgresql.org/docs/current/pgupgrade.html" /> for details.</para></listitem>
+                  <listitem><para>Change postgresql package in NixOS configuration to the one you were upgrading to, and change <literal>dataDir</literal> to the one you have migrated to. Rebuild NixOS. This should start new postgres using upgraded data directory.</para></listitem>
+                      <listitem><para>After upgrade you may want to <literal>ANALYZE</literal> new db.</para></listitem>
+  </orderedlist>
+  
+
  </section>
  <section xml:id="module-services-postgres-options">
   <title>Options</title>

From a723672c20f951888ce1d7049ed6b989b0b953e6 Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Mon, 16 Mar 2020 19:18:23 +0200
Subject: [PATCH 3238/4636] doc/postgresql: apply xmlformat

---
 .../modules/services/databases/postgresql.xml | 78 ++++++++++---------
 1 file changed, 42 insertions(+), 36 deletions(-)

diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml
index 1754f19fe1eb..07af4c937f03 100644
--- a/nixos/modules/services/databases/postgresql.xml
+++ b/nixos/modules/services/databases/postgresql.xml
@@ -7,12 +7,10 @@
 <!-- FIXME: render nicely -->
 <!-- FIXME: source can be added automatically -->
  <para>
-  <emphasis>Source:</emphasis>
-  <filename>modules/services/databases/postgresql.nix</filename>
+  <emphasis>Source:</emphasis> <filename>modules/services/databases/postgresql.nix</filename>
  </para>
  <para>
-  <emphasis>Upstream documentation:</emphasis>
-  <link xlink:href="http://www.postgresql.org/docs/"/>
+  <emphasis>Upstream documentation:</emphasis> <link xlink:href="http://www.postgresql.org/docs/"/>
  </para>
 <!-- FIXME: more stuff, like maintainer? -->
  <para>
@@ -23,18 +21,12 @@
   <title>Configuring</title>
 
   <para>
-   To enable PostgreSQL, add the following to your
-   <filename>configuration.nix</filename>:
+   To enable PostgreSQL, add the following to your <filename>configuration.nix</filename>:
 <programlisting>
 <xref linkend="opt-services.postgresql.enable"/> = true;
 <xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql_11;
 </programlisting>
-   Note that you are required to specify the desired version of PostgreSQL
-   (e.g. <literal>pkgs.postgresql_11</literal>). Since upgrading your
-   PostgreSQL version requires a database dump and reload (see below), NixOS
-   cannot provide a default value for
-   <xref linkend="opt-services.postgresql.package"/> such as the most recent
-   release of PostgreSQL.
+   Note that you are required to specify the desired version of PostgreSQL (e.g. <literal>pkgs.postgresql_11</literal>). Since upgrading your PostgreSQL version requires a database dump and reload (see below), NixOS cannot provide a default value for <xref linkend="opt-services.postgresql.package"/> such as the most recent release of PostgreSQL.
   </para>
 
 <!--
@@ -51,9 +43,7 @@ Type "help" for help.
 -->
 
   <para>
-   By default, PostgreSQL stores its databases in
-   <filename>/var/lib/postgresql/$psqlSchema</filename>. You can override this using
-   <xref linkend="opt-services.postgresql.dataDir"/>, e.g.
+   By default, PostgreSQL stores its databases in <filename>/var/lib/postgresql/$psqlSchema</filename>. You can override this using <xref linkend="opt-services.postgresql.dataDir"/>, e.g.
 <programlisting>
 <xref linkend="opt-services.postgresql.dataDir"/> = "/data/postgresql";
 </programlisting>
@@ -64,7 +54,6 @@ Type "help" for help.
 
   <para>
    Major PostgreSQL upgrade requires PostgreSQL downtime and a few imperative steps to be called. To simplify this process, use the following NixOS module:
-
 <programlisting>
   containers.temp-pg.config.services.postgresql = {
     enable = true;
@@ -95,36 +84,52 @@ Type "help" for help.
       '')
     ];
 </programlisting>
-    </para>
+  </para>
+
   <para>
-      The upgrade process is:</para>
+   The upgrade process is:
+  </para>
 
   <orderedlist>
-      <listitem><para>Rebuild nixos configuration with the configuration above added to your <filename>configuration.nix</filename>. Alternatively, add that into separate file and reference it in <literal>imports</literal> list.</para></listitem>
-          <listitem><para>Login as root (<literal>sudo su -</literal>)</para></listitem>
-              <listitem><para>Run <literal>upgrade-pg-cluster</literal>. It will stop old postgresql, initialize new one and migrate old one to new one. You may supply arguments like <literal>--jobs 4</literal> and <literal>--link</literal> to speedup migration process. See <link xlink:href="https://www.postgresql.org/docs/current/pgupgrade.html" /> for details.</para></listitem>
-                  <listitem><para>Change postgresql package in NixOS configuration to the one you were upgrading to, and change <literal>dataDir</literal> to the one you have migrated to. Rebuild NixOS. This should start new postgres using upgraded data directory.</para></listitem>
-                      <listitem><para>After upgrade you may want to <literal>ANALYZE</literal> new db.</para></listitem>
+   <listitem>
+    <para>
+     Rebuild nixos configuration with the configuration above added to your <filename>configuration.nix</filename>. Alternatively, add that into separate file and reference it in <literal>imports</literal> list.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Login as root (<literal>sudo su -</literal>)
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Run <literal>upgrade-pg-cluster</literal>. It will stop old postgresql, initialize new one and migrate old one to new one. You may supply arguments like <literal>--jobs 4</literal> and <literal>--link</literal> to speedup migration process. See <link xlink:href="https://www.postgresql.org/docs/current/pgupgrade.html" /> for details.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Change postgresql package in NixOS configuration to the one you were upgrading to, and change <literal>dataDir</literal> to the one you have migrated to. Rebuild NixOS. This should start new postgres using upgraded data directory.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     After upgrade you may want to <literal>ANALYZE</literal> new db.
+    </para>
+   </listitem>
   </orderedlist>
-  
-
  </section>
  <section xml:id="module-services-postgres-options">
   <title>Options</title>
 
   <para>
-   A complete list of options for the PostgreSQL module may be found
-   <link linkend="opt-services.postgresql.enable">here</link>.
+   A complete list of options for the PostgreSQL module may be found <link linkend="opt-services.postgresql.enable">here</link>.
   </para>
  </section>
  <section xml:id="module-services-postgres-plugins">
   <title>Plugins</title>
 
   <para>
-   Plugins collection for each PostgreSQL version can be accessed with
-   <literal>.pkgs</literal>. For example, for
-   <literal>pkgs.postgresql_11</literal> package, its plugin collection is
-   accessed by <literal>pkgs.postgresql_11.pkgs</literal>:
+   Plugins collection for each PostgreSQL version can be accessed with <literal>.pkgs</literal>. For example, for <literal>pkgs.postgresql_11</literal> package, its plugin collection is accessed by <literal>pkgs.postgresql_11.pkgs</literal>:
 <screen>
 <prompt>$ </prompt>nix repl '&lt;nixpkgs&gt;'
 
@@ -141,8 +146,9 @@ postgresql_11.pkgs.pg_partman        postgresql_11.pkgs.pgroonga
 ...
 </screen>
   </para>
+
   <para>
-    To add plugins via NixOS configuration, set <literal>services.postgresql.extraPlugins</literal>:
+   To add plugins via NixOS configuration, set <literal>services.postgresql.extraPlugins</literal>:
 <programlisting>
 <xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql_11;
 <xref linkend="opt-services.postgresql.extraPlugins"/> = with pkgs.postgresql_11.pkgs; [
@@ -151,10 +157,9 @@ postgresql_11.pkgs.pg_partman        postgresql_11.pkgs.pgroonga
 ];
 </programlisting>
   </para>
+
   <para>
-   You can build custom PostgreSQL-with-plugins (to be used outside of NixOS) using
-   function <literal>.withPackages</literal>. For example, creating a custom
-   PostgreSQL package in an overlay can look like:
+   You can build custom PostgreSQL-with-plugins (to be used outside of NixOS) using function <literal>.withPackages</literal>. For example, creating a custom PostgreSQL package in an overlay can look like:
 <programlisting>
 self: super: {
   postgresql_custom = self.postgresql_11.withPackages (ps: [
@@ -164,8 +169,9 @@ self: super: {
 }
 </programlisting>
   </para>
+
   <para>
-    Here's a recipe on how to override a particular plugin through an overlay:
+   Here's a recipe on how to override a particular plugin through an overlay:
 <programlisting>
 self: super: {
   postgresql_11 = super.postgresql_11.override { this = self.postgresql_11; } // {

From 10e5a43b03868df48571a93b2716a195bfa67b43 Mon Sep 17 00:00:00 2001
From: Piotr Szegda <piotrszegda@protonmail.com>
Date: Mon, 16 Mar 2020 18:50:43 +0100
Subject: [PATCH 3239/4636] keybase,kbfs,keybase-gui: 5.2.1 -> 5.3.0

---
 pkgs/tools/security/keybase/default.nix | 4 ++--
 pkgs/tools/security/keybase/gui.nix     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index 9a8a283d799d..da4b9c99e20b 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -6,7 +6,7 @@
 
 buildGoPackage rec {
   pname = "keybase";
-  version = "5.2.1";
+  version = "5.3.0";
 
   goPackagePath = "github.com/keybase/client";
   subPackages = [ "go/kbnm" "go/keybase" ];
@@ -17,7 +17,7 @@ buildGoPackage rec {
     owner = "keybase";
     repo = "client";
     rev = "v${version}";
-    sha256 = "1gq5s202zlf6z6fd4qwbgzmddrzj50js3kzyln63xh0svc3sgfvl";
+    sha256 = "0xqqzjlvq9sgjx1jzv0w2ls0365xzfh4iapzqkrqka635xfggwcn";
   };
 
   patches = [
diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix
index e46da9ca9b6a..0573391139b8 100644
--- a/pkgs/tools/security/keybase/gui.nix
+++ b/pkgs/tools/security/keybase/gui.nix
@@ -4,16 +4,16 @@
 , runtimeShell, gsettings-desktop-schemas }:
 
 let
-  versionSuffix = "20200225210944.9845113a89";
+  versionSuffix = "20200310205642.4f2689009b";
 in
 
 stdenv.mkDerivation rec {
   pname = "keybase-gui";
-  version = "5.2.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
+  version = "5.3.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
 
   src = fetchurl {
     url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb";
-    sha256 = "183vkwm12frdy50z6gyb1mffn3w8jvxxj472868af813r0n1akl5";
+    sha256 = "0zasw2dk33k6c6xqsjnyz3b3s1j27vza9alkp0hpvds88mnnmjv1";
   };
 
   nativeBuildInputs = [

From f387b85540cef7bdbf44ef5a0a32f15d023359eb Mon Sep 17 00:00:00 2001
From: Marek Fajkus <marek.faj@gmail.com>
Date: Mon, 16 Mar 2020 20:10:34 +0100
Subject: [PATCH 3240/4636] elmPackages.elm-instrument: Init at 0.0.7

---
 pkgs/development/compilers/elm/default.nix    | 18 ++++++++++
 .../compilers/elm/packages/elm-instrument.nix | 34 +++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/compilers/elm/packages/elm-instrument.nix

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 1d61b8331493..ceebfbde886d 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -42,6 +42,7 @@ let
               doCheck = false;
               jailbreak = true;
             }));
+
             elmi-to-json = justStaticExecutables (overrideCabal (self.callPackage ./packages/elmi-to-json.nix {}) (drv: {
               prePatch = ''
                 substituteInPlace package.yaml --replace "- -Werror" ""
@@ -50,6 +51,23 @@ let
               jailbreak = true;
             }));
 
+            elm-instrument = justStaticExecutables (overrideCabal (self.callPackage ./packages/elm-instrument.nix {}) (drv: {
+              patches = [(
+                # GHC 8.8.1 and Cabal >= 1.25.0 support
+                # https://github.com/zwilias/elm-instrument/pull/3
+                fetchpatch {
+                  url = "https://github.com/turboMaCk/elm-instrument/commit/4272db2aea742c8b54509e536fa4f35d04f95da5.patch";
+                  sha256 = "1d1lc43lp3x5jfhlyb1b7na7nj1g1i1vc1np26pcisg9c2s7gjz6";
+                }
+              )];
+              prePatch = ''
+                sed "s/desc <-.*/let desc = \"${drv.version}\"/g" Setup.hs --in-place
+              '';
+              jailbreak = true;
+              # Tests are failing because of missing instances for Eq and Show type classes
+              doCheck = false;
+            }));
+
             inherit fetchElmDeps;
             elmVersion = elmPkgs.elm.version;
           };
diff --git a/pkgs/development/compilers/elm/packages/elm-instrument.nix b/pkgs/development/compilers/elm/packages/elm-instrument.nix
new file mode 100644
index 000000000000..bd7690162277
--- /dev/null
+++ b/pkgs/development/compilers/elm/packages/elm-instrument.nix
@@ -0,0 +1,34 @@
+{ mkDerivation, ansi-terminal, ansi-wl-pprint, base, binary
+, bytestring, Cabal, cmark, containers, directory, elm-format
+, fetchgit, filepath, free, HUnit, indents, json, mtl
+, optparse-applicative, parsec, process, QuickCheck, quickcheck-io
+, split, stdenv, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
+, text, elm
+}:
+mkDerivation {
+  pname = "elm-instrument";
+  version = "0.0.7";
+  src = fetchgit {
+    url = "https://github.com/zwilias/elm-instrument.git";
+    sha256 = "14yfzwsyvgc6rzn19sdmwk2mc1vma9hcljnmjnmlig8mp0271v56";
+    rev = "31b527e405a6afdb25bb87ad7bd14f979e65cff7";
+    fetchSubmodules = true;
+  };
+  isLibrary = true;
+  isExecutable = true;
+  setupHaskellDepends = [ base Cabal directory filepath process ];
+  libraryHaskellDepends = [
+    ansi-terminal ansi-wl-pprint base binary bytestring containers
+    directory filepath free indents json mtl optparse-applicative
+    parsec process split text
+  ];
+  executableHaskellDepends = [ base ];
+  testHaskellDepends = [
+    base cmark containers elm-format HUnit mtl parsec QuickCheck
+    quickcheck-io split tasty tasty-golden tasty-hunit tasty-quickcheck
+    text
+  ];
+  homepage = "http://elm-lang.org";
+  description = "Instrumentation library for Elm";
+  license = stdenv.lib.licenses.bsd3;
+}

From d467d6ce4a608ae881aa5f35cd41a6af8e9d5188 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Mon, 16 Mar 2020 15:43:35 -0400
Subject: [PATCH 3241/4636] zerotierone: enable package test (#82738)

---
 pkgs/tools/networking/zerotierone/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index c060e6a61a42..2a3987f490ff 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -32,6 +32,13 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  buildFlags = [ "all" "selftest" ];
+
+  doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
+  checkPhase = ''
+    ./zerotier-selftest
+  '';
+
   installPhase = ''
     install -Dt "$out/bin/" zerotier-one
     ln -s $out/bin/zerotier-one $out/bin/zerotier-idtool

From 58b2b8d844eb74c239306e1900f8b4425cc3e7b1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 13:08:11 +0000
Subject: [PATCH 3242/4636] sensu-go-agent: 5.14.1 -> 5.18.1

---
 pkgs/servers/monitoring/sensu-go/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix
index a4e2b1eb313c..f109b08d1a6f 100644
--- a/pkgs/servers/monitoring/sensu-go/default.nix
+++ b/pkgs/servers/monitoring/sensu-go/default.nix
@@ -4,7 +4,7 @@ let
   generic = { subPackages, pname, postInstall ? "" }:
     buildGoModule rec {
       inherit pname;
-      version = "5.14.1";
+      version = "5.18.1";
       shortRev = "1f6d16b"; # for internal version info
 
       goPackagePath = "github.com/sensu/sensu-go";
@@ -13,12 +13,12 @@ let
         owner = "sensu";
         repo = "sensu-go";
         rev = "v${version}";
-        sha256 = "1fhvw2hrn2zqpz3ypsx6i1zrn83pdifvsyzpbhzxmff6l9a290bq";
+        sha256 = "1iwlkm7ac7brap45r6ly0blywgq6f28r1nws3yf0ybydv30brfj4";
       };
 
       inherit subPackages postInstall;
 
-      modSha256 = "0c0cj0ylhifyb7l9kjmgdlfzcz8528fzw8kr3c5y7j5h6pih06sy";
+      modSha256 = "02h4cav6ivzs3z0qakwxzf5lfy6hzax5c0i2icp0qymqc2789npw";
 
       buildFlagsArray = let
         versionPkg = "github.com/sensu/sensu-go/version";
@@ -29,7 +29,7 @@ let
       '';
 
       meta = {
-        homepage = https://sensu.io;
+        homepage = "https://sensu.io";
         description = "Open source monitoring tool for ephemeral infrastructure & distributed applications";
         license = lib.licenses.mit;
         maintainers = with lib.maintainers; [ thefloweringash ];

From a5f7fc6160dac2f670ec1275f91b8661105edf17 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 16 Mar 2020 05:43:12 +0000
Subject: [PATCH 3243/4636] python27Packages.zc_buildout: 2.13.2 -> 2.13.3

---
 pkgs/development/python-modules/buildout/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix
index 419e8dce2126..20731e76c814 100644
--- a/pkgs/development/python-modules/buildout/default.nix
+++ b/pkgs/development/python-modules/buildout/default.nix
@@ -2,15 +2,15 @@
 
 buildPythonPackage rec {
   pname = "zc.buildout";
-  version = "2.13.2";
+  version = "2.13.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0a73s5q548l2vs2acqs3blkzd9sw6d7ci77fz1pc9156vn3dxm2x";
+    sha256 = "1dyc5g3yv7wm3hf3fcsh6y1wivzjj1bspafr5qqb653z9a31lsfn";
   };
 
   meta = with stdenv.lib; {
-    homepage = http://www.buildout.org;
+    homepage = "http://www.buildout.org";
     description = "A software build and configuration system";
     license = licenses.zpl21;
     maintainers = with maintainers; [ ];

From 2ff00c41d732fe1bddfebddc9ccd3b314b0e5dd6 Mon Sep 17 00:00:00 2001
From: Steve Jones <steve@jonescape.com>
Date: Sun, 15 Mar 2020 16:51:42 -0400
Subject: [PATCH 3244/4636] cmt: init at 1.17

---
 pkgs/applications/audio/cmt/default.nix | 33 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/audio/cmt/default.nix

diff --git a/pkgs/applications/audio/cmt/default.nix b/pkgs/applications/audio/cmt/default.nix
new file mode 100644
index 000000000000..96cc3c573198
--- /dev/null
+++ b/pkgs/applications/audio/cmt/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, fetchurl
+, ladspaH
+}:
+
+stdenv.mkDerivation rec {
+  name = "cmt";
+  version = "1.17";
+
+  src = fetchurl {
+    url = "http://www.ladspa.org/download/${name}_${version}.tgz";
+    sha256 = "07xd0xmwpa0j12813jpf87fr9hwzihii5l35mp8ady7xxfmxfmpb";
+  };
+
+  buildInputs = [ ladspaH ];
+
+  preBuild = ''
+    cd src
+  '';
+
+  installFlags = [ "INSTALL_PLUGINS_DIR=${placeholder "out"}/lib/ladspa" ];
+  preInstall = ''
+    mkdir -p $out/lib/ladspa
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Computer Music Toolkit";
+    homepage = "https://www.ladspa.org/cmt";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ sjfloat ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a50780e8183f..34f4806b7e5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2472,6 +2472,8 @@ in
 
   cmst = libsForQt5.callPackage ../tools/networking/cmst { };
 
+  cmt = callPackage ../applications/audio/cmt {};
+
   codimd = callPackage ../servers/web-apps/codimd {
     nodejs = nodejs-10_x;
   };

From 8be2040cf73f14931a9513674d5a6a561a021595 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Wed, 4 Mar 2020 10:57:35 -0500
Subject: [PATCH 3245/4636] libkml: init at 1.3.0

Adding libkml with all tests enabled
---
 pkgs/development/libraries/libkml/default.nix | 53 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 55 insertions(+)
 create mode 100644 pkgs/development/libraries/libkml/default.nix

diff --git a/pkgs/development/libraries/libkml/default.nix b/pkgs/development/libraries/libkml/default.nix
new file mode 100644
index 000000000000..eca412fda6cb
--- /dev/null
+++ b/pkgs/development/libraries/libkml/default.nix
@@ -0,0 +1,53 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+, boost
+, expat
+, zlib
+, uriparser
+, minizip
+, gtest
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libkml";
+  version = "1.3.0";
+
+  src = fetchFromGitHub {
+    owner = "libkml";
+    repo = pname;
+    rev = version;
+    sha256 = "0gl4cqfps9mzx6hzf3dc10hy5y8smpyf1s31sqm7w343hgsllv0z";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  cmakeFlags = [
+    "-DBUILD_TESTING=ON"
+  ];
+
+  buildInputs = [
+    gtest
+    boost
+    expat
+    zlib
+    uriparser
+    minizip
+  ];
+
+  preCheck = ''
+    export LD_LIBRARY_PATH=$PWD/lib
+  '';
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "Reference implementation of OGC KML 2.2";
+    homepage = https://github.com/libkml/libkml;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ costrouc ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 34f4806b7e5d..f1c93d0c0bc4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12907,6 +12907,8 @@ in
 
   libkate = callPackage ../development/libraries/libkate { };
 
+  libkml = callPackage ../development/libraries/libkml { };
+
   libksba = callPackage ../development/libraries/libksba { };
 
   libksi = callPackage ../development/libraries/libksi { };

From 2f5b8d65224090fd9f25d550fdf55db54399362a Mon Sep 17 00:00:00 2001
From: S-NA <S-NA@users.noreply.github.com>
Date: Mon, 16 Mar 2020 17:47:30 -0400
Subject: [PATCH 3246/4636] aucatctl: init at 0.1

Allows those who use sndiod to adjust the volume of audio programs.
---
 pkgs/applications/audio/aucatctl/default.nix | 37 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/applications/audio/aucatctl/default.nix

diff --git a/pkgs/applications/audio/aucatctl/default.nix b/pkgs/applications/audio/aucatctl/default.nix
new file mode 100644
index 000000000000..4aff3e1f7bfb
--- /dev/null
+++ b/pkgs/applications/audio/aucatctl/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, sndio, libbsd }:
+
+stdenv.mkDerivation rec {
+  pname = "aucatctl";
+  version = "0.1";
+
+  src = fetchurl {
+    url = "http://www.sndio.org/${pname}-${version}.tar.gz";
+    sha256 = "524f2fae47db785234f166551520d9605b9a27551ca438bd807e3509ce246cf0";
+  };
+
+  buildInputs = [ sndio ]
+    ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.targetPlatform.isBSD)
+    libbsd;
+
+  outputs = [ "out" "man" ];
+
+  preBuild = ''
+    makeFlagsArray+=("PREFIX=$out")
+  '' + stdenv.lib.optionalString
+    (!stdenv.isDarwin && !stdenv.targetPlatform.isBSD) ''
+      makeFlagsArray+=(LDADD="-lsndio -lbsd")
+
+      # Fix warning about implicit declaration of function 'strlcpy'
+      substituteInPlace aucatctl.c \
+        --replace '#include <string.h>' '#include <bsd/string.h>'
+    '';
+
+  meta = with stdenv.lib; {
+    description =
+      "The aucatctl utility sends MIDI messages to control sndiod and/or aucat volumes";
+    homepage = "http://www.sndio.org";
+    license = licenses.isc;
+    maintainers = with maintainers; [ sna ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1c93d0c0bc4..04597ad02aed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18351,6 +18351,8 @@ in
 
   astroid = callPackage ../applications/networking/mailreaders/astroid { };
 
+  aucatctl = callPackage ../applications/audio/aucatctl { };
+
   audacious = callPackage ../applications/audio/audacious { };
   audaciousQt5 = libsForQt5.callPackage ../applications/audio/audacious/qt-5.nix { };
 

From 4b80e8a59f8fe1606ee9b66f26af70ae56cd33ae Mon Sep 17 00:00:00 2001
From: mehlon <>
Date: Mon, 16 Mar 2020 22:49:14 +0100
Subject: [PATCH 3247/4636] tor-browser-bundle-bin: 9.0.5 -> 9.0.6

---
 .../networking/browsers/tor-browser-bundle-bin/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 4fafe19b3792..a8a426b61626 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -90,19 +90,19 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "9.0.5";
+  version = "9.0.6";
 
   lang = "en-US";
 
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
-      sha256 = "1d4c3mrvqd6v086mwn3rnv776y2j3y45agnd0k5njqnmr53ybn2s";
+      sha256 = "1vk1pww8zmpjd5snyfz0if9v17g140ymlp6navxp28snzlffahss";
     };
 
     i686-linux = fetchurl {
       url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
-      sha256 = "040nh79hjkg5afvzshzhp7588dbi1pcpjsyk8phfqaapds74ma8y";
+      sha256 = "0bhikdilfz31iilgb48mayy9f4lilycq24pqsrq7w3dqdjg4v55v";
     };
   };
 in

From 11b54adeaceea07f26dc90897ba5315baf6b1ff4 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sun, 8 Mar 2020 08:48:40 -0400
Subject: [PATCH 3248/4636] armv{5tel,6l,7l}: update bootstrap tools after
 #80497

---
 pkgs/stdenv/linux/bootstrap-files/armv5tel.nix | 16 +++++++++++-----
 pkgs/stdenv/linux/bootstrap-files/armv6l.nix   | 16 +++++++++++-----
 pkgs/stdenv/linux/bootstrap-files/armv7l.nix   | 16 +++++++++++-----
 3 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix b/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
index c5426431b3ce..8189984770a9 100644
--- a/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
+++ b/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
@@ -1,12 +1,18 @@
 {
+  # Note: do not use Hydra as a source URL. Ask a member of the
+  # infrastructure team to mirror the job.
   busybox = import <nix/fetchurl.nix> {
-    url = https://hydra.nixos.org/build/112609163/download/2/busybox;
-    sha256 = "0dc5471dc6a5f69ad98eb7445f51a61e88aa5792d7a677025bf012bdb513b763";
+    # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv5tel.dist/latest
+    # from build: https://hydra.nixos.org/build/114203025
+    url = http://tarballs.nixos.org/stdenv-linux/armv5tel/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/busybox;
+    # note: the following hash is different than the above hash, due to executable = true
+    sha256 = "0qxp2fsvs4phbc17g9npj9bsm20ylr8myi5pivcrmxm5qqflgi8d";
     executable = true;
   };
-
   bootstrapTools = import <nix/fetchurl.nix> {
-    url = https://hydra.nixos.org/build/112609163/download/1/bootstrap-tools.tar.xz;
-    sha256 = "ca0564eca4eb944649ce10ec70859640427bf2241243af62812b163176487e02";
+    # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv5tel.dist/latest
+    # from build: https://hydra.nixos.org/build/114203025
+    url = http://tarballs.nixos.org/stdenv-linux/armv5tel/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/bootstrap-tools.tar.xz;
+    sha256 = "28327343db5ecc7f7811449ec69280d5867fa5d1d377cab0426beb9d4e059ed6";
   };
 }
diff --git a/pkgs/stdenv/linux/bootstrap-files/armv6l.nix b/pkgs/stdenv/linux/bootstrap-files/armv6l.nix
index caf7df66cef6..55946ed2ff91 100644
--- a/pkgs/stdenv/linux/bootstrap-files/armv6l.nix
+++ b/pkgs/stdenv/linux/bootstrap-files/armv6l.nix
@@ -1,12 +1,18 @@
 {
+  # Note: do not use Hydra as a source URL. Ask a member of the
+  # infrastructure team to mirror the job.
   busybox = import <nix/fetchurl.nix> {
-    url = https://hydra.nixos.org/build/112609441/download/2/busybox;
-    sha256 = "e6f6aecb675e924a96516f4379445dd2c0ba8b9c438fbfbaa2dc14ccce2802e0";
+    # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv6l.dist/latest
+    # from build: https://hydra.nixos.org/build/114202834
+    url = http://tarballs.nixos.org/stdenv-linux/armv6l/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/busybox;
+    # note: the following hash is different than the above hash, due to executable = true
+    sha256 = "1q02537cq56wlaxbz3s3kj5vmh6jbm27jhvga6b4m4jycz5sxxp6";
     executable = true;
   };
-
   bootstrapTools = import <nix/fetchurl.nix> {
-    url = https://hydra.nixos.org/build/112609441/download/1/bootstrap-tools.tar.xz;
-    sha256 = "7a3f20def1a17ebf0edb5a92c403558429bcc2ac3d931b5e1bd88606cb217778";
+    # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv6l.dist/latest
+    # from build: https://hydra.nixos.org/build/114202834
+    url = http://tarballs.nixos.org/stdenv-linux/armv6l/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/bootstrap-tools.tar.xz;
+    sha256 = "0810fe74f8cd09831f177d075bd451a66b71278d3cc8db55b07c5e38ef3fbf3f";
   };
 }
diff --git a/pkgs/stdenv/linux/bootstrap-files/armv7l.nix b/pkgs/stdenv/linux/bootstrap-files/armv7l.nix
index 67bca39eaf68..1bb149bac87c 100644
--- a/pkgs/stdenv/linux/bootstrap-files/armv7l.nix
+++ b/pkgs/stdenv/linux/bootstrap-files/armv7l.nix
@@ -1,12 +1,18 @@
 {
+  # Note: do not use Hydra as a source URL. Ask a member of the
+  # infrastructure team to mirror the job.
   busybox = import <nix/fetchurl.nix> {
-    url = https://hydra.nixos.org/build/112609103/download/2/busybox;
-    sha256 = "566a469dac214b31e4abdb0a91d32550bab1be5858d329e1b6074eef05370ca3";
+    # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv7l.dist/latest
+    # from build: https://hydra.nixos.org/build/114203060
+    url = http://tarballs.nixos.org/stdenv-linux/armv7l/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/busybox;
+    # note: the following hash is different than the above hash, due to executable = true
+    sha256 = "18qc6w2yykh7nvhjklsqb2zb3fjh4p9r22nvmgj32jr1mjflcsjn";
     executable = true;
   };
-
   bootstrapTools = import <nix/fetchurl.nix> {
-    url = https://hydra.nixos.org/build/112609103/download/1/bootstrap-tools.tar.xz;
-    sha256 = "79fa2d7722aeb856c7c9b62a3fd64b6d261fd6f6bcbac486f0a2a7d823210550";
+    # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv7l.dist/latest
+    # from build: https://hydra.nixos.org/build/114203060
+    url = http://tarballs.nixos.org/stdenv-linux/armv7l/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/bootstrap-tools.tar.xz;
+    sha256 = "cf2968e8085cd3e6b3e9359624060ad24d253800ede48c5338179f6e0082c443";
   };
 }

From c2b72612718055147d94bc0a5a51db573cb6d33b Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 13 Mar 2020 14:11:28 -0700
Subject: [PATCH 3249/4636] python35Packages.openyx: fix build

When dropping python 2 support, they also droppped
python 3.5 support.
---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0773a1984ab5..f7e892378000 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4619,7 +4619,7 @@ in {
 
   offtrac = callPackage ../development/python-modules/offtrac { };
 
-  openpyxl = if isPy3k then
+  openpyxl = if pythonAtLeast "3.6" then
     callPackage ../development/python-modules/openpyxl { }
   else
     callPackage ../development/python-modules/openpyxl/2.nix { };

From 48e1ed7c710e1a5da45a4b2a46fe69726af5f1c5 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 17 Mar 2020 08:54:40 +1000
Subject: [PATCH 3250/4636] conmon: 2.0.11 -> 2.0.12

https://github.com/containers/conmon/releases/tag/v2.0.12
---
 pkgs/applications/virtualization/conmon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix
index 53a31c656346..293cb91bb0d2 100644
--- a/pkgs/applications/virtualization/conmon/default.nix
+++ b/pkgs/applications/virtualization/conmon/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "conmon";
-  version = "2.0.11";
+  version = "2.0.12";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1mdnfkbbv41g590a1ja4rfw69z6kp03znyhikdmg6zqp4qsv32ib";
+    sha256 = "0vf88j582hv6dabmk3pnmbn60pp5w7hja2wmrhqq8wm2y07djhhi";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 6b361c3a311957da1304865933e1cb1c8be2c009 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 16 Mar 2020 19:04:39 -0400
Subject: [PATCH 3251/4636] armv{5tel,6l,7l}: bootstrap-files: quote URLs for
 rfc-45

Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
---
 pkgs/stdenv/linux/bootstrap-files/armv5tel.nix | 4 ++--
 pkgs/stdenv/linux/bootstrap-files/armv6l.nix   | 4 ++--
 pkgs/stdenv/linux/bootstrap-files/armv7l.nix   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix b/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
index 8189984770a9..0ac818b9f223 100644
--- a/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
+++ b/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
@@ -4,7 +4,7 @@
   busybox = import <nix/fetchurl.nix> {
     # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv5tel.dist/latest
     # from build: https://hydra.nixos.org/build/114203025
-    url = http://tarballs.nixos.org/stdenv-linux/armv5tel/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/busybox;
+    url = "http://tarballs.nixos.org/stdenv-linux/armv5tel/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/busybox";
     # note: the following hash is different than the above hash, due to executable = true
     sha256 = "0qxp2fsvs4phbc17g9npj9bsm20ylr8myi5pivcrmxm5qqflgi8d";
     executable = true;
@@ -12,7 +12,7 @@
   bootstrapTools = import <nix/fetchurl.nix> {
     # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv5tel.dist/latest
     # from build: https://hydra.nixos.org/build/114203025
-    url = http://tarballs.nixos.org/stdenv-linux/armv5tel/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/bootstrap-tools.tar.xz;
+    url = "http://tarballs.nixos.org/stdenv-linux/armv5tel/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/bootstrap-tools.tar.xz";
     sha256 = "28327343db5ecc7f7811449ec69280d5867fa5d1d377cab0426beb9d4e059ed6";
   };
 }
diff --git a/pkgs/stdenv/linux/bootstrap-files/armv6l.nix b/pkgs/stdenv/linux/bootstrap-files/armv6l.nix
index 55946ed2ff91..8bc99c64c681 100644
--- a/pkgs/stdenv/linux/bootstrap-files/armv6l.nix
+++ b/pkgs/stdenv/linux/bootstrap-files/armv6l.nix
@@ -4,7 +4,7 @@
   busybox = import <nix/fetchurl.nix> {
     # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv6l.dist/latest
     # from build: https://hydra.nixos.org/build/114202834
-    url = http://tarballs.nixos.org/stdenv-linux/armv6l/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/busybox;
+    url = "http://tarballs.nixos.org/stdenv-linux/armv6l/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/busybox";
     # note: the following hash is different than the above hash, due to executable = true
     sha256 = "1q02537cq56wlaxbz3s3kj5vmh6jbm27jhvga6b4m4jycz5sxxp6";
     executable = true;
@@ -12,7 +12,7 @@
   bootstrapTools = import <nix/fetchurl.nix> {
     # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv6l.dist/latest
     # from build: https://hydra.nixos.org/build/114202834
-    url = http://tarballs.nixos.org/stdenv-linux/armv6l/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/bootstrap-tools.tar.xz;
+    url = "http://tarballs.nixos.org/stdenv-linux/armv6l/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/bootstrap-tools.tar.xz";
     sha256 = "0810fe74f8cd09831f177d075bd451a66b71278d3cc8db55b07c5e38ef3fbf3f";
   };
 }
diff --git a/pkgs/stdenv/linux/bootstrap-files/armv7l.nix b/pkgs/stdenv/linux/bootstrap-files/armv7l.nix
index 1bb149bac87c..74d158452231 100644
--- a/pkgs/stdenv/linux/bootstrap-files/armv7l.nix
+++ b/pkgs/stdenv/linux/bootstrap-files/armv7l.nix
@@ -4,7 +4,7 @@
   busybox = import <nix/fetchurl.nix> {
     # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv7l.dist/latest
     # from build: https://hydra.nixos.org/build/114203060
-    url = http://tarballs.nixos.org/stdenv-linux/armv7l/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/busybox;
+    url = "http://tarballs.nixos.org/stdenv-linux/armv7l/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/busybox";
     # note: the following hash is different than the above hash, due to executable = true
     sha256 = "18qc6w2yykh7nvhjklsqb2zb3fjh4p9r22nvmgj32jr1mjflcsjn";
     executable = true;
@@ -12,7 +12,7 @@
   bootstrapTools = import <nix/fetchurl.nix> {
     # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv7l.dist/latest
     # from build: https://hydra.nixos.org/build/114203060
-    url = http://tarballs.nixos.org/stdenv-linux/armv7l/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/bootstrap-tools.tar.xz;
+    url = "http://tarballs.nixos.org/stdenv-linux/armv7l/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/bootstrap-tools.tar.xz";
     sha256 = "cf2968e8085cd3e6b3e9359624060ad24d253800ede48c5338179f6e0082c443";
   };
 }

From a503bd01e7bb1f3a28d4cba51b72f741c1e381b4 Mon Sep 17 00:00:00 2001
From: sohalt <sohalt@sohalt.net>
Date: Mon, 16 Mar 2020 17:09:11 +0100
Subject: [PATCH 3252/4636] superTuxKart: 1.0 -> 1.1

---
 pkgs/games/super-tux-kart/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix
index 2db49165c5fb..96444897cc94 100644
--- a/pkgs/games/super-tux-kart/default.nix
+++ b/pkgs/games/super-tux-kart/default.nix
@@ -1,20 +1,20 @@
 { stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig
 , openal, freealut, libGLU, libGL, libvorbis, libogg, gettext, curl, freetype
-, fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr, enet }:
+, fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr, enet, harfbuzz }:
 
 let
   dir = "stk-code";
 
 in stdenv.mkDerivation rec {
   pname = "supertuxkart";
-  version = "1.0";
+  version = "1.1";
 
   srcs = [
     (fetchFromGitHub {
       owner  = "supertuxkart";
       repo   = "stk-code";
       rev    = version;
-      sha256 = "03mrnzrvfdgjc687n718f5zsray6vbdlv4irzy2mfi78bz3bkjll";
+      sha256 = "01vxxl94583ixswzmi4caz8dk64r56pn3zxh7v63zml60yfvxbvp";
       name   = dir;
     })
     (fetchsvn {
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
   buildInputs = [
     libX11 libXrandr
     openal freealut libGLU libGL libvorbis libogg zlib freetype
-    curl fribidi bluez libjpeg libpng enet
+    curl fribidi bluez libjpeg libpng enet harfbuzz
   ];
 
   enableParallelBuilding = true;

From ebe5f107942c82386c64e170c001872a85e08ec0 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 16 Mar 2020 19:27:18 -0400
Subject: [PATCH 3253/4636] kicad: don't build versions with 3d on Hydra

The hydraPlatforms have to be set on the kicad package itself, that can be
checked using:

  echo ":p { inherit kicad kicad-small kicad-unstable; }" | nix repl ./pkgs/top-level/release.nix

This commit disables build of all kicad variants that require downloading
packages3d, which currently fail on hydra with the "Output limit exceeded"
status. This leaves Hydra with only building the kicad-small, which will allow
us to cache the build of kicad-base as well as all libraries except of
packages3d.
---
 .../science/electronics/kicad/default.nix       |  4 ++++
 .../science/electronics/kicad/libraries.nix     | 17 +++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index a60f8db388a5..f03a0a0cceff 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -137,5 +137,9 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ evils kiwi berce ];
     # kicad's cross-platform, not sure what to fill in here
     platforms = with platforms; linux;
+  } // optionalAttrs with3d {
+    # We can't download the 3d models on Hydra - they are a ~1 GiB download and
+    # they occupy ~5 GiB in store.
+    hydraPlatforms = [];
   };
 }
diff --git a/pkgs/applications/science/electronics/kicad/libraries.nix b/pkgs/applications/science/electronics/kicad/libraries.nix
index 53e190d2749b..7cdf9373e087 100644
--- a/pkgs/applications/science/electronics/kicad/libraries.nix
+++ b/pkgs/applications/science/electronics/kicad/libraries.nix
@@ -12,8 +12,8 @@
 # };
 with lib;
 let
-  mkLib = name: attrs:
-    stdenv.mkDerivation (
+  mkLib = name:
+    stdenv.mkDerivation
       {
         pname = "kicad-${name}";
         version = "${version}";
@@ -27,16 +27,13 @@ let
         );
         nativeBuildInputs = [ cmake ];
         meta.license = licenses.cc-by-sa-40;
-      } // attrs
-    );
+      };
 in
 {
-  symbols = mkLib "symbols" { };
-  templates = mkLib "templates" { };
-  footprints = mkLib "footprints" { };
-  packages3d = mkLib "packages3d" {
-    hydraPlatforms = []; # this is a ~1 GiB download, occupies ~5 GiB in store
-  };
+  symbols = mkLib "symbols";
+  templates = mkLib "templates";
+  footprints = mkLib "footprints";
+  packages3d = mkLib "packages3d";
 
   # i18n is a special case, not actually a library
   # more a part of kicad proper, but also optional and separate

From b7ef71665d1677854cfeeded99d19ea65a4ef71d Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Mon, 9 Mar 2020 22:24:41 -0400
Subject: [PATCH 3254/4636] habitat: 0.30.2 -> 0.90.6

The build has been broken on master for a very long time, for want of an
upgrade. This continues the effort put forth here:
https://github.com/NixOS/nixpkgs/pull/63105

Note that while there are newer versions than this, upgrading to those requires
getting some Cargo protobuf dependencies to compile. Since this fixes the
failing build, it seems like a good start.

Upstream does not appear to have any Darin builds in their CI, and we do not
have a Darwin maintainer available, so this disables it as well.
---
 .../networking/cluster/habitat/default.nix    | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix
index 31184bd68ff5..f2f3925fbe4d 100644
--- a/pkgs/applications/networking/cluster/habitat/default.nix
+++ b/pkgs/applications/networking/cluster/habitat/default.nix
@@ -1,27 +1,23 @@
-{ lib, fetchFromGitHub, rustPlatform, pkgconfig
-, libsodium, libarchive, openssl }:
+{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig
+, libsodium, libarchive, openssl, zeromq }:
 
-with rustPlatform;
-
-buildRustPackage rec {
+rustPlatform.buildRustPackage rec {
   pname = "habitat";
-  version = "0.30.2";
+  # Newer versions required protobuf, which requires some finesse to get to
+  # compile with the vendored protobuf crate.
+  version = "0.90.6";
 
   src = fetchFromGitHub {
     owner = "habitat-sh";
     repo = "habitat";
     rev = version;
-    sha256 = "0pqrm85pd9hqn5fwqjbyyrrfh4k7q9mi9qy9hm8yigk5l8mw44y1";
+    sha256 = "0rwi0lkmhlq4i8fba3s9nd9ajhz2dqxzkgfp5i8y0rvbfmhmfd6b";
   };
 
-  # Delete this on next update; see #79975 for details
-  legacyCargoFetcher = true;
-
-  cargoSha256 = "1ahfm5agvabqqqgjsyjb95xxbc7mng1mdyclcakwp1m1qdkxx9p0";
-
-  buildInputs = [ libsodium libarchive openssl ];
+  cargoSha256 = "08sncz0jgsr2s821j3s4bk7d54xqwmnld7m57avavym1xqvsnbmy";
 
   nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libsodium libarchive openssl zeromq ];
 
   cargoBuildFlags = ["--package hab"];
 
@@ -32,12 +28,11 @@ buildRustPackage rec {
     runHook postCheck
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "An application automation framework";
-    homepage = https://www.habitat.sh;
+    homepage = "https://www.habitat.sh";
     license = licenses.asl20;
-    maintainers = [ maintainers.rushmorem ];
-    platforms = [ "x86_64-linux" "x86_64-darwin" ];
-    broken = true; # mark temporary as broken due git dependencies
+    maintainers = with maintainers; [ rushmorem ];
+    platforms = [ "x86_64-linux" ];
   };
 }

From 90c3fa478b0ffd0222f081a05ce502e42b6adf0f Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 15 Mar 2020 12:29:08 -0400
Subject: [PATCH 3255/4636] doc: update 20.03 release notes regarding upower

UPower works just fine in 20.03, but only if the service is enabled.

Resolves #82529; see issue for details.
---
 nixos/doc/manual/release-notes/rl-2003.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index b629c460f4cd..bbbd62719b2d 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -641,6 +641,13 @@ auth required pam_succeed_if.so uid >= 1000 quiet
      The previous behavior can be restored by setting <literal>config.riot-web.conf = { disable_guests = false; piwik = true; }</literal>.
     </para>
    </listitem>
+   <listitem>
+     <para>
+       Stand-alone usage of <literal>Upower</literal> now requires
+       <option>services.upower.enable</option> instead of just installing into
+       <xref linkend="opt-environment.systemPackages"/>.
+     </para>
+   </listitem>
   </itemizedlist>
  </section>
 

From 707e0b1e96c585d7d94bdd1e59c273a5601207c0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 17 Mar 2020 01:13:50 +0000
Subject: [PATCH 3256/4636] brial: 1.2.7 -> 1.2.8

---
 pkgs/development/libraries/science/math/brial/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix
index 4ffe147b27f2..90d7357cc07e 100644
--- a/pkgs/development/libraries/science/math/brial/default.nix
+++ b/pkgs/development/libraries/science/math/brial/default.nix
@@ -8,14 +8,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.7";
+  version = "1.2.8";
   pname = "brial";
 
   src = fetchFromGitHub {
     owner = "BRiAl";
     repo = "BRiAl";
     rev = version;
-    sha256 = "1s0wmbb42sq6a5kxgzsz5srphclmfa4cvxdx2h9kzp0da2zcp3cm";
+    sha256 = "0qhgckd4fvbs40jw14mvw89rccv94d3df27kipd27hxd4cx7y80y";
   };
 
   # FIXME package boost-test and enable checks
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/BRiAl/BRiAl;
+    homepage = "https://github.com/BRiAl/BRiAl";
     description = "Legacy version of PolyBoRi maintained by sagemath developers";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ timokau ];

From b3b610831e235ab23a178ad83c2df3767aac806f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 16 Mar 2020 07:36:57 +0000
Subject: [PATCH 3257/4636] redis: 5.0.7 -> 5.0.8

---
 pkgs/servers/nosql/redis/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index 278ba8d13c57..8e75ee4fbde2 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, lua, jemalloc, nixosTests }:
 
 stdenv.mkDerivation rec {
-  version = "5.0.7";
+  version = "5.0.8";
   pname = "redis";
 
   src = fetchurl {
     url = "http://download.redis.io/releases/${pname}-${version}.tar.gz";
-    sha256 = "0ax8sf3vw0yadr41kzc04917scrg5wir1d94zmbz00b8pzm79nv1";
+    sha256 = "1msfxr97aflk5zdgq8xvdbsgmzb906x0vdc1v6l2ccs35z2fmizk";
   };
 
   # Cross-compiling fixes
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   passthru.tests.redis = nixosTests.redis;
 
   meta = with stdenv.lib; {
-    homepage = https://redis.io;
+    homepage = "https://redis.io";
     description = "An open source, advanced key-value store";
     license = licenses.bsd3;
     platforms = platforms.unix;

From 98f6a60460ca1bc11a4e7a2a71fedbdcf55c9282 Mon Sep 17 00:00:00 2001
From: cw <789@webuhu.at>
Date: Tue, 17 Mar 2020 06:54:06 +0100
Subject: [PATCH 3258/4636] erlangR22: 22.1.7 -> 22.3

---
 pkgs/development/interpreters/erlang/R22.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/R22.nix b/pkgs/development/interpreters/erlang/R22.nix
index 88fe21453a82..7596ad9e2f10 100644
--- a/pkgs/development/interpreters/erlang/R22.nix
+++ b/pkgs/development/interpreters/erlang/R22.nix
@@ -3,8 +3,8 @@
 # How to obtain `sha256`:
 # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
 mkDerivation {
-  version = "22.1.7";
-  sha256 = "18aqy2s8nqd82v4lzzxknrwjva8mv1y2hvai9cakz5nkyd3vwq62";
+  version = "22.3";
+  sha256 = "0srbyncgnr1kp0rrviq14ia3h795b3gk0iws5ishv6rphcq1rs27";
 
   prePatch = ''
     substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}"

From b8e76c49f4572d8d8c478fa4eb1dfd823ea1ed74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 16 Mar 2020 16:03:24 -0300
Subject: [PATCH 3259/4636] matcha: 2020-03-11 -> 2020-03-15

---
 pkgs/data/themes/matcha/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
index 05292e97772f..c2274c57bbf4 100644
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "matcha";
-  version = "2020-03-11";
+  version = "2020-03-15";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    sha256 = "1np2964g5f0vwdvfmi8gidsk9jj7v43nkshiqnfdbvmwa85ldpfl";
+    sha256 = "0hj1hpg9p46hyfcssd5ac7m599zkq7nrbwdwfbp98g5rw4fq8jaw";
   };
 
   buildInputs = [ gdk-pixbuf librsvg ];

From 97fb0072db07cc63459614e78028eaa97fd60c22 Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Tue, 17 Mar 2020 00:56:46 -0700
Subject: [PATCH 3260/4636] jbrout: remove broken package

---
 pkgs/applications/graphics/jbrout/default.nix | 42 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 44 deletions(-)
 delete mode 100644 pkgs/applications/graphics/jbrout/default.nix

diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix
deleted file mode 100644
index 4eb7518cc102..000000000000
--- a/pkgs/applications/graphics/jbrout/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchsvn, pythonPackages, makeWrapper, fbida, which }:
-
-let
-  inherit (pythonPackages) python;
-in pythonPackages.buildPythonApplication rec {
-  pname = "jbrout";
-  version = "338";
-
-  src = fetchsvn {
-    url = "http://jbrout.googlecode.com/svn/trunk";
-    rev = version;
-    sha256 = "0257ni4vkxgd0qhs73fw5ppw1qpf11j8fgwsqc03b1k1yv3hk4hf";
-  };
-
-  doCheck = false;
-
-  # XXX: patchPhase to avoid this
-  #  File "/nix/store/vnyjxn6h3rbrn49m25yyw7i1chlxglhw-python-2.7.1/lib/python2.7/zipfile.py", line 348, in FileHeader
-  #    len(filename), len(extra))
-  #struct.error: ushort format requires 0 <= number <= USHRT_MAX
-  patchPhase = ''
-    find | xargs touch
-
-    substituteInPlace setup.py --replace "version=__version__" "version=baseVersion"
-  '';
-
-  postInstall = ''
-    mkdir $out/bin
-    echo "python $out/${python.sitePackages}/jbrout/jbrout.py" > $out/bin/jbrout
-    chmod +x $out/bin/jbrout
-  '';
-
-  buildInputs = [ python makeWrapper which ];
-  propagatedBuildInputs = with pythonPackages; [ pillow lxml pyGtkGlade pyexiv2 fbida ];
-
-  meta = {
-    homepage = https://manatlan.com/jbrout/;
-    description = "Photo manager";
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.gpl2Plus;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04597ad02aed..8cfea0835276 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20002,8 +20002,6 @@ in
 
   josm = callPackage ../applications/misc/josm { };
 
-  jbrout = callPackage ../applications/graphics/jbrout { };
-
   jwm = callPackage ../applications/window-managers/jwm { };
 
   jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { };

From 2cc3a34d4a8e245aae97566cf0077a8ae70c141b Mon Sep 17 00:00:00 2001
From: LeshaInc <includeurl@gmail.com>
Date: Mon, 16 Mar 2020 19:15:53 +0200
Subject: [PATCH 3261/4636] openimagedenoise: init at 1.1.0

---
 maintainers/maintainer-list.nix               |  6 +++++
 .../libraries/openimagedenoise/default.nix    | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/libraries/openimagedenoise/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 993e5c2d46df..a38dccb27e1b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4142,6 +4142,12 @@
     github = "leonardoce";
     name = "Leonardo Cecchi";
   };
+  leshainc = {
+    email = "leshainc@fomalhaut.me";
+    github = "LeshaInc";
+    githubId = 42153076;
+    name = "Alexey Nikashkin";
+  };
   lethalman = {
     email = "lucabru@src.gnome.org";
     github = "lethalman";
diff --git a/pkgs/development/libraries/openimagedenoise/default.nix b/pkgs/development/libraries/openimagedenoise/default.nix
new file mode 100644
index 000000000000..5cecc33564e4
--- /dev/null
+++ b/pkgs/development/libraries/openimagedenoise/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, cmake, tbb, python }:
+
+stdenv.mkDerivation rec {
+  pname = "openimagedenoise";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "OpenImageDenoise";
+    repo = "oidn";
+    rev = "v${version}";
+    sha256 = "032s7vablqnmrcc4xf2c94kwj0kbcd64bram10g0yc42fg0a3r9m";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [ cmake python ];
+  buildInputs = [ tbb ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://openimagedenoise.github.io";
+    description = "High-Performance Denoising Library for Ray Tracing";
+    license = licenses.asl20;
+    maintainers = [ maintainers.leshainc ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e45856b05d7..5ea8fb5d7b62 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5556,6 +5556,8 @@ in
 
   openjade = callPackage ../tools/text/sgml/openjade { };
 
+  openimagedenoise = callPackage ../development/libraries/openimagedenoise { };
+
   openmvg = callPackage ../applications/science/misc/openmvg { };
 
   openmvs = callPackage ../applications/science/misc/openmvs { };

From d27b2f842cf0de852e4aa4baa66715e9f897de71 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 17 Mar 2020 04:20:00 -0500
Subject: [PATCH 3262/4636] syncthing: 1.3.4 -> 1.4.0

Changelog: https://github.com/syncthing/syncthing/releases/tag/v1.4.0
---
 pkgs/applications/networking/syncthing/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 2d7624ed89cb..516acab10f8b 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -3,19 +3,17 @@
 let
   common = { stname, target, postInstall ? "" }:
     buildGoModule rec {
-      version = "1.3.4";
+      version = "1.4.0";
       name = "${stname}-${version}";
 
       src = fetchFromGitHub {
         owner  = "syncthing";
         repo   = "syncthing";
         rev    = "v${version}";
-        sha256 = "076k06p2vqqz2r5bgvqkjipnhznbfbalp3pa2gjm2j9hy7nldr9f";
+        sha256 = "049f9h03qq9a7pa8ngwampwf5xc7kr7mm473zn56yl3nrmv0nid6";
       };
 
-      goPackagePath = "github.com/syncthing/syncthing";
-
-      modSha256 = "10fgfjip5xr8lim2z0dh7399xpcnhxis9s9yd36fk934h1k1hwzd";
+      modSha256 = "1qq0979cm42wd3scy3blyi0hg67mkghis9r5rn2x1lqi2b982wfh";
 
       patches = [
         ./add-stcli-target.patch

From 2c77f1c04914d82e01b50ae03baa492e2bad0c9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Tue, 17 Mar 2020 11:23:06 +0100
Subject: [PATCH 3263/4636] virtualboxExtpack: synchronize version with
 virtualbox

---
 pkgs/applications/virtualization/virtualbox/extpack.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix
index c935a40c5400..ba8407e4a736 100644
--- a/pkgs/applications/virtualization/virtualbox/extpack.nix
+++ b/pkgs/applications/virtualization/virtualbox/extpack.nix
@@ -1,8 +1,9 @@
-{fetchurl, lib}:
+{fetchurl, lib, virtualbox}:
 
 with lib;
 
-let version = "6.0.14";
+let
+  inherit (virtualbox) version;
 in
 fetchurl rec {
   name = "Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack";
@@ -11,7 +12,7 @@ fetchurl rec {
     # Manually sha256sum the extensionPack file, must be hex!
     # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
     # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS
-    let value = "c8a5cc980c9c94cdac3d94e23cf159c2433aae76b416dbfb5b1a918758f21e63";
+    let value = "3b73798d776ff223ea8025b1a45001762f8d4e5bcd1ea61449773c1249935800";
     in assert (builtins.stringLength value) == 64; value;
 
   meta = {

From 9c8068c4c42927a5ea8d8a9370565f86dc375a58 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 17 Mar 2020 11:52:01 +0100
Subject: [PATCH 3264/4636] python3.pkgs.rpy2: fix tests with pandas 1.x

---
 pkgs/development/python-modules/rpy2/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix
index 851a58584c66..af6f3c33b916 100644
--- a/pkgs/development/python-modules/rpy2/default.nix
+++ b/pkgs/development/python-modules/rpy2/default.nix
@@ -1,6 +1,7 @@
 { lib
 , python
 , buildPythonPackage
+, fetchpatch
 , fetchPypi
 , isPyPy
 , R
@@ -68,6 +69,14 @@ buildPythonPackage rec {
       # R_LIBS_SITE is used by the nix r package to point to the installed R libraries.
       # This patch sets R_LIBS_SITE when rpy2 is imported.
       ./rpy2-3.x-r-libs-site.patch
+
+      # pandas 1.x compatibility, already merged upstream
+      # https://github.com/rpy2/rpy2/issues/636
+      (fetchpatch {
+        name = "pandas-1.x.patch";
+        url = "https://github.com/rpy2/rpy2/commit/fbd060e364b70012e8d26cc74df04ee53f769379.patch";
+        sha256 = "19rdqydwjmqg25ibmsbx7lggrr9fsyjn283zgvz1wj4iyfjwp1za";
+      })
     ];
     postPatch = ''
       substituteInPlace 'rpy2/rinterface_lib/embedded.py' --replace '@NIX_R_LIBS_SITE@' "$R_LIBS_SITE"

From b8ed075c87574e1510580b48d4888329c59d3a68 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 17 Mar 2020 11:54:37 +0100
Subject: [PATCH 3265/4636] python3.pkgs.rpy2: 3.2.5 -> 3.2.6

---
 pkgs/development/python-modules/rpy2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix
index af6f3c33b916..613e7af7d3a1 100644
--- a/pkgs/development/python-modules/rpy2/default.nix
+++ b/pkgs/development/python-modules/rpy2/default.nix
@@ -25,13 +25,13 @@
 }:
 
 buildPythonPackage rec {
-    version = "3.2.5";
+    version = "3.2.6";
     pname = "rpy2";
 
     disabled = isPyPy;
     src = fetchPypi {
       inherit version pname;
-      sha256 = "0pnk363klic4smb3jnkm4lnh984c2cpqzawrg2j52hgy8k1bgyrk";
+      sha256 = "1p990cqx3p2pd1rc9wn66m56wahaq8dlr88frz49vb7nv4zw4a8q";
     };
 
     buildInputs = [

From dc434b0704400d80fe4657a7be797418450b9430 Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Tue, 17 Mar 2020 13:26:55 +0100
Subject: [PATCH 3266/4636] Doc: Fix typo

---
 nixos/doc/manual/release-notes/rl-2003.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index 20f232c9110e..1a6460336de8 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -235,7 +235,7 @@ services.xserver.displayManager.defaultSession = "xfce+icewm";
    <listitem>
     <para>
       The <literal>buildRustCrate</literal> infrastructure now produces <literal>lib</literal> outputs in addition to the <literal>out</literal> output.
-      This has led to drastically reduced closed sizes for some rust crates since development dependencies are now in the <literal>lib</literal> output.
+      This has led to drastically reduced closure sizes for some rust crates since development dependencies are now in the <literal>lib</literal> output.
     </para>
     </listitem>
    <listitem>

From baf37aabad3117bfae0f7bf0041c759df2c5cc51 Mon Sep 17 00:00:00 2001
From: Marek Fajkus <marek.faj@gmail.com>
Date: Tue, 17 Mar 2020 13:56:14 +0100
Subject: [PATCH 3267/4636] elmPackages.elm-coverage: init at 0.0.3

---
 pkgs/development/compilers/elm/default.nix    |   22 +-
 .../elm/packages/node-composition.nix         |    2 +-
 .../compilers/elm/packages/node-packages.json |   13 +-
 .../compilers/elm/packages/node-packages.nix  | 1626 +++++++++++------
 4 files changed, 1081 insertions(+), 582 deletions(-)

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index ceebfbde886d..ea84edd5e1db 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -91,9 +91,29 @@ let
           inherit nodejs pkgs;
           inherit (stdenv.hostPlatform) system;
         };
-    in with hsPkgs.elmPkgs; {
+    in with hsPkgs.elmPkgs; rec {
       elm-test = patchBinwrap [elmi-to-json] nodePkgs.elm-test;
       elm-verify-examples = patchBinwrap [elmi-to-json] nodePkgs.elm-verify-examples;
+      elm-coverage =
+        let patched = patchBinwrap [elm elmi-to-json] nodePkgs.elm-coverage;
+        in patched.override {
+          preRebuild = ''
+            sed 's/\"install\".*/\"install\":\"echo no-op\"/g' --in-place package.json
+
+            # This should not be needed (thanks to binwrap* being nooped) but for some reason it still needs to be done
+            # in case of just this package
+            sed 's/\"install\".*/\"install\":\"echo no-op\",/g' --in-place node_modules/elmi-to-json/package.json
+
+            rm node_modules/elm/install.js
+            echo "console.log('no-op');" > node_modules/elm/install.js
+          '';
+
+          # Link Elm instrument binary
+          postInstall = patched.postInstall + ''
+            mkdir -p unpacked_bin
+            ln -sf ${elm-instrument}/bin/elm-instrument unpacked_bin/elm-instrument
+          '';
+        };
       elm-language-server = nodePkgs."@elm-tooling/elm-language-server";
 
       inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse;
diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix
index 4add754b5999..1ffd758ac82e 100644
--- a/pkgs/development/compilers/elm/packages/node-composition.nix
+++ b/pkgs/development/compilers/elm/packages/node-composition.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.7.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
diff --git a/pkgs/development/compilers/elm/packages/node-packages.json b/pkgs/development/compilers/elm/packages/node-packages.json
index e129a0ffaec4..643aad746fa2 100644
--- a/pkgs/development/compilers/elm/packages/node-packages.json
+++ b/pkgs/development/compilers/elm/packages/node-packages.json
@@ -1,10 +1,11 @@
 [
-    "elm-test",
-    "elm-verify-examples",
-    "elm-doc-preview",
-    "elm-upgrade",
     "elm-analyse",
+    "elm-coverage",
+    "elm-doc-preview",
+    "@elm-tooling/elm-language-server",
     "elm-live",
-    "elm-xref",
-    "@elm-tooling/elm-language-server"
+    "elm-test",
+    "elm-upgrade",
+    "elm-verify-examples",
+    "elm-xref"
 ]
diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix
index 70aa04987c68..46920bf62b74 100644
--- a/pkgs/development/compilers/elm/packages/node-packages.nix
+++ b/pkgs/development/compilers/elm/packages/node-packages.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.8.0. Do not edit!
+# This file has been generated by node2nix 1.7.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -121,6 +121,15 @@ let
         sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==";
       };
     };
+    "abbrev-1.1.1" = {
+      name = "abbrev";
+      packageName = "abbrev";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";
+        sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==";
+      };
+    };
     "accepts-1.3.7" = {
       name = "accepts";
       packageName = "accepts";
@@ -157,6 +166,15 @@ let
         sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==";
       };
     };
+    "ansi-regex-5.0.0" = {
+      name = "ansi-regex";
+      packageName = "ansi-regex";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz";
+        sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==";
+      };
+    };
     "ansi-styles-2.2.1" = {
       name = "ansi-styles";
       packageName = "ansi-styles";
@@ -283,6 +301,15 @@ let
         sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367";
       };
     };
+    "astral-regex-1.0.0" = {
+      name = "astral-regex";
+      packageName = "astral-regex";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz";
+        sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==";
+      };
+    };
     "async-limiter-1.0.1" = {
       name = "async-limiter";
       packageName = "async-limiter";
@@ -661,6 +688,15 @@ let
         sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==";
       };
     };
+    "cliui-6.0.0" = {
+      name = "cliui";
+      packageName = "cliui";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz";
+        sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==";
+      };
+    };
     "clone-response-1.0.2" = {
       name = "clone-response";
       packageName = "clone-response";
@@ -895,6 +931,15 @@ let
         sha1 = "a3bbb302db2297cbea3c04edf36941f4613aa399";
       };
     };
+    "cross-spawn-5.1.0" = {
+      name = "cross-spawn";
+      packageName = "cross-spawn";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz";
+        sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449";
+      };
+    };
     "cross-spawn-6.0.5" = {
       name = "cross-spawn";
       packageName = "cross-spawn";
@@ -1129,6 +1174,15 @@ let
         sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
       };
     };
+    "elm-0.19.1" = {
+      name = "elm";
+      packageName = "elm";
+      version = "0.19.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/elm/-/elm-0.19.1.tgz";
+        sha512 = "rehOtJKZvoYDddlrd7AX5NAf0H+LUllnBg3AHaeaIOKWzw4W316d7Bkhlbo7aSG+hVUVWP2ihKwyYkDi589TfA==";
+      };
+    };
     "elm-analyse-git://github.com/elm-tooling/elm-analyse#1a665a6e540d7d11b29b3c5e3c52089704325d9c" = {
       name = "elm-analyse";
       packageName = "elm-analyse";
@@ -1184,6 +1238,15 @@ let
         sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==";
       };
     };
+    "emoji-regex-8.0.0" = {
+      name = "emoji-regex";
+      packageName = "emoji-regex";
+      version = "8.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz";
+        sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==";
+      };
+    };
     "encodeurl-1.0.2" = {
       name = "encodeurl";
       packageName = "encodeurl";
@@ -1220,13 +1283,13 @@ let
         sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==";
       };
     };
-    "es6-promisify-6.0.2" = {
+    "es6-promisify-6.1.0" = {
       name = "es6-promisify";
       packageName = "es6-promisify";
-      version = "6.0.2";
+      version = "6.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.0.2.tgz";
-        sha512 = "eO6vFm0JvqGzjWIQA6QVKjxpmELfhWbDUWHm1rPfIbn55mhKPiAa5xpLmQWJrNa629ZIeQ8ZvMAi13kvrjK6Mg==";
+        url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.1.0.tgz";
+        sha512 = "jCsk2fpfEFusVv1MDkF4Uf0hAzIKNDMgR6LyOIw6a3jwkN1sCgWzuwgnsHY9YSQ8n8P31HoncvE0LC44cpWTrw==";
       };
     };
     "escape-html-1.0.3" = {
@@ -1481,6 +1544,15 @@ let
         sha1 = "7afbd00f8f08c5b622f97cda6f714173d547bb3f";
       };
     };
+    "find-0.2.9" = {
+      name = "find";
+      packageName = "find";
+      version = "0.2.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find/-/find-0.2.9.tgz";
+        sha1 = "4b73f1ff9e56ad91b76e716407fe5ffe6554bb8c";
+      };
+    };
     "find-elm-dependencies-2.0.2" = {
       name = "find-elm-dependencies";
       packageName = "find-elm-dependencies";
@@ -1508,6 +1580,15 @@ let
         sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==";
       };
     };
+    "find-up-4.1.0" = {
+      name = "find-up";
+      packageName = "find-up";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz";
+        sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==";
+      };
+    };
     "firstline-1.2.0" = {
       name = "firstline";
       packageName = "firstline";
@@ -1607,6 +1688,15 @@ let
         sha1 = "337352bded4a0b714f3eb84de8cea765e9d37600";
       };
     };
+    "fs-extra-4.0.3" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "4.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz";
+        sha512 = "q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==";
+      };
+    };
     "fs-extra-5.0.0" = {
       name = "fs-extra";
       packageName = "fs-extra";
@@ -2219,6 +2309,15 @@ let
         sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f";
       };
     };
+    "is-fullwidth-code-point-3.0.0" = {
+      name = "is-fullwidth-code-point";
+      packageName = "is-fullwidth-code-point";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz";
+        sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==";
+      };
+    };
     "is-glob-4.0.1" = {
       name = "is-glob";
       packageName = "is-glob";
@@ -2561,6 +2660,15 @@ let
         sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==";
       };
     };
+    "locate-path-5.0.0" = {
+      name = "locate-path";
+      packageName = "locate-path";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz";
+        sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==";
+      };
+    };
     "lodash-4.17.15" = {
       name = "lodash";
       packageName = "lodash";
@@ -2849,6 +2957,15 @@ let
         sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
       };
     };
+    "moment-2.24.0" = {
+      name = "moment";
+      packageName = "moment";
+      version = "2.24.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz";
+        sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==";
+      };
+    };
     "ms-2.0.0" = {
       name = "ms";
       packageName = "ms";
@@ -2948,6 +3065,15 @@ let
         sha512 = "z9xN2ibI6P0UylFadN7oMcIMsoTeCENC0rZyRM5MVK9AqzSPx+uGqKG6KMPeC/laOV4wOGZq/GH0PTstRNSqOA==";
       };
     };
+    "nopt-1.0.10" = {
+      name = "nopt";
+      packageName = "nopt";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz";
+        sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
+      };
+    };
     "normalize-path-2.1.1" = {
       name = "normalize-path";
       packageName = "normalize-path";
@@ -3236,6 +3362,15 @@ let
         sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==";
       };
     };
+    "p-locate-4.1.0" = {
+      name = "p-locate";
+      packageName = "p-locate";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz";
+        sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==";
+      };
+    };
     "p-timeout-2.0.1" = {
       name = "p-timeout";
       packageName = "p-timeout";
@@ -3290,6 +3425,15 @@ let
         sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515";
       };
     };
+    "path-exists-4.0.0" = {
+      name = "path-exists";
+      packageName = "path-exists";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz";
+        sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==";
+      };
+    };
     "path-is-absolute-1.0.1" = {
       name = "path-is-absolute";
       packageName = "path-is-absolute";
@@ -4064,6 +4208,15 @@ let
         sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==";
       };
     };
+    "slice-ansi-2.1.0" = {
+      name = "slice-ansi";
+      packageName = "slice-ansi";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz";
+        sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==";
+      };
+    };
     "snapdragon-0.8.2" = {
       name = "snapdragon";
       packageName = "snapdragon";
@@ -4208,6 +4361,15 @@ let
         sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==";
       };
     };
+    "string-width-4.2.0" = {
+      name = "string-width";
+      packageName = "string-width";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz";
+        sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==";
+      };
+    };
     "string.prototype.trimleft-2.1.1" = {
       name = "string.prototype.trimleft";
       packageName = "string.prototype.trimleft";
@@ -4262,6 +4424,15 @@ let
         sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==";
       };
     };
+    "strip-ansi-6.0.0" = {
+      name = "strip-ansi";
+      packageName = "strip-ansi";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz";
+        sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==";
+      };
+    };
     "strip-eof-1.0.0" = {
       name = "strip-eof";
       packageName = "strip-eof";
@@ -4325,6 +4496,15 @@ let
         sha512 = "oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==";
       };
     };
+    "table-5.4.6" = {
+      name = "table";
+      packageName = "table";
+      version = "5.4.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/table/-/table-5.4.6.tgz";
+        sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==";
+      };
+    };
     "tar-4.4.13" = {
       name = "tar";
       packageName = "tar";
@@ -4397,6 +4577,15 @@ let
         sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7";
       };
     };
+    "tmp-0.0.33" = {
+      name = "tmp";
+      packageName = "tmp";
+      version = "0.0.33";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz";
+        sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==";
+      };
+    };
     "tmp-0.1.0" = {
       name = "tmp";
       packageName = "tmp";
@@ -4469,6 +4658,15 @@ let
         sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==";
       };
     };
+    "touch-3.1.0" = {
+      name = "touch";
+      packageName = "touch";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz";
+        sha512 = "WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==";
+      };
+    };
     "tough-cookie-2.4.3" = {
       name = "tough-cookie";
       packageName = "tough-cookie";
@@ -4622,6 +4820,15 @@ let
         sha512 = "NG1h/MdGIX3HzyqMjyj1laBCmlPYhcO4xEy7gEqqzGiSLw7XqDQCnY4nYSn5XSaH8mQ6TFkaujrO8d/PIZN85A==";
       };
     };
+    "upgrade-1.1.0" = {
+      name = "upgrade";
+      packageName = "upgrade";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/upgrade/-/upgrade-1.1.0.tgz";
+        sha1 = "4a50875ec5c715d19379799f0590a0e796958f61";
+      };
+    };
     "uri-js-4.2.2" = {
       name = "uri-js";
       packageName = "uri-js";
@@ -4838,6 +5045,15 @@ let
         sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==";
       };
     };
+    "wrap-ansi-6.2.0" = {
+      name = "wrap-ansi";
+      packageName = "wrap-ansi";
+      version = "6.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz";
+        sha512 = "r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==";
+      };
+    };
     "wrappy-1.0.2" = {
       name = "wrappy";
       packageName = "wrappy";
@@ -4946,6 +5162,15 @@ let
         sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==";
       };
     };
+    "yargs-15.3.1" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "15.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz";
+        sha512 = "92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==";
+      };
+    };
     "yargs-parser-13.1.2" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -4955,6 +5180,15 @@ let
         sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==";
       };
     };
+    "yargs-parser-18.1.1" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "18.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.1.tgz";
+        sha512 = "KRHEsOM16IX7XuLnMOqImcPNbLVXMNHYAoFc3BKR8Ortl5gzDbtXvvEoGx9imk5E+X1VeNKNlcHr8B8vi+7ipA==";
+      };
+    };
     "yn-4.0.0" = {
       name = "yn";
       packageName = "yn";
@@ -4967,180 +5201,210 @@ let
   };
 in
 {
-  elm-test = nodeEnv.buildNodePackage {
-    name = "elm-test";
-    packageName = "elm-test";
-    version = "0.19.1-revision2";
+  elm-analyse = nodeEnv.buildNodePackage {
+    name = "elm-analyse";
+    packageName = "elm-analyse";
+    version = "0.16.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision2.tgz";
-      sha512 = "zVs2mVeyIE+K9y7/8b333h5xRMDWAoqbBDm7ThLDhyTi7ICxeL3t5uOS4KZCrRk9+4sP6+voSbcBlgr46Q+GiQ==";
+      url = "https://registry.npmjs.org/elm-analyse/-/elm-analyse-0.16.5.tgz";
+      sha512 = "I7dgGFOc+mYDcDuyo1/HcIn3E5MiMbocStNzivsPSjCUviuEieHdDKZmJJ9uM3IdCu0fdBmRNWQBSOXtXrgzKg==";
     };
     dependencies = [
-      sources."@types/color-name-1.1.1"
+      sources."accepts-1.3.7"
       sources."ajv-6.12.0"
-      sources."ansi-styles-4.2.1"
-      sources."anymatch-3.1.1"
+      sources."array-flatten-1.1.1"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
+      sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.9.1"
-      sources."balanced-match-1.0.0"
+      sources."babel-runtime-6.18.0"
       sources."bcrypt-pbkdf-1.0.2"
-      sources."binary-0.3.0"
-      sources."binary-extensions-2.0.0"
-      sources."binwrap-0.2.2"
-      sources."bluebird-3.7.2"
-      sources."brace-expansion-1.1.11"
-      sources."braces-3.0.2"
-      sources."buffers-0.1.1"
+      sources."body-parser-1.19.0"
+      sources."bytes-3.1.0"
       sources."caseless-0.12.0"
-      sources."chainsaw-0.1.0"
-      sources."chalk-3.0.0"
-      sources."chokidar-3.3.0"
-      sources."chownr-1.1.4"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
       sources."combined-stream-1.0.8"
-      sources."concat-map-0.0.1"
+      sources."concat-stream-1.5.2"
+      sources."content-disposition-0.5.2"
+      sources."content-type-1.0.4"
+      sources."cookie-0.3.1"
+      sources."cookie-signature-1.0.6"
+      sources."core-js-2.6.11"
       sources."core-util-is-1.0.2"
-      sources."cross-spawn-7.0.1"
       sources."dashdash-1.14.1"
+      sources."debug-2.6.9"
       sources."delayed-stream-1.0.0"
+      sources."depd-1.1.2"
+      sources."destroy-1.0.4"
       sources."ecc-jsbn-0.1.2"
-      sources."elmi-to-json-1.3.0"
+      sources."ee-first-1.1.1"
+      sources."encodeurl-1.0.2"
+      sources."escape-html-1.0.3"
+      sources."etag-1.8.1"
+      (sources."express-4.16.3" // {
+        dependencies = [
+          sources."body-parser-1.18.2"
+          sources."bytes-3.0.0"
+          sources."http-errors-1.6.3"
+          sources."iconv-lite-0.4.19"
+          sources."qs-6.5.1"
+          (sources."raw-body-2.3.2" // {
+            dependencies = [
+              sources."depd-1.1.1"
+              sources."http-errors-1.6.2"
+              sources."setprototypeof-1.0.3"
+            ];
+          })
+          sources."setprototypeof-1.1.0"
+          sources."statuses-1.4.0"
+        ];
+      })
+      (sources."express-ws-2.0.0" // {
+        dependencies = [
+          sources."ws-1.1.5"
+        ];
+      })
       sources."extend-3.0.2"
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-3.1.1"
       sources."fast-json-stable-stringify-2.1.0"
-      sources."fill-range-7.0.1"
-      (sources."find-elm-dependencies-2.0.2" // {
+      (sources."finalhandler-1.1.1" // {
         dependencies = [
-          sources."firstline-1.2.0"
+          sources."statuses-1.4.0"
         ];
       })
-      sources."find-parent-dir-0.3.0"
-      sources."firstline-2.0.2"
+      sources."find-0.2.7"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
-      sources."fs-extra-8.1.0"
-      sources."fs-minipass-1.2.7"
-      sources."fs.realpath-1.0.0"
-      sources."fsevents-2.1.2"
+      sources."forwarded-0.1.2"
+      sources."fresh-0.5.2"
+      sources."fs-extra-2.0.0"
       sources."getpass-0.1.7"
-      sources."glob-7.1.6"
-      sources."glob-parent-5.1.0"
       sources."graceful-fs-4.2.3"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
-      sources."has-flag-4.0.0"
+      sources."http-errors-1.7.2"
       sources."http-signature-1.2.0"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."is-binary-path-2.1.0"
-      sources."is-extglob-2.1.1"
-      sources."is-glob-4.0.1"
-      sources."is-number-7.0.0"
+      sources."iconv-lite-0.4.24"
+      sources."inherits-2.0.3"
+      sources."ipaddr.js-1.9.1"
+      sources."is-stream-1.1.0"
       sources."is-typedarray-1.0.0"
-      sources."isexe-2.0.0"
+      sources."is-wsl-1.1.0"
+      sources."isarray-1.0.0"
       sources."isstream-0.1.2"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
-      sources."jsonfile-4.0.0"
+      sources."jsonfile-2.4.0"
       sources."jsprim-1.4.1"
       sources."lodash-4.17.15"
+      sources."media-typer-0.3.0"
+      sources."merge-descriptors-1.0.1"
+      sources."methods-1.1.2"
+      sources."mime-1.4.1"
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
-      sources."minimatch-3.0.4"
-      sources."minimist-1.2.5"
-      sources."minipass-2.9.0"
-      sources."minizlib-1.3.3"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
-      sources."murmur-hash-js-1.0.0"
-      sources."mustache-3.2.1"
-      sources."nice-try-1.0.5"
-      (sources."node-elm-compiler-5.0.4" // {
-        dependencies = [
-          sources."cross-spawn-6.0.5"
-          sources."path-key-2.0.1"
-          sources."shebang-command-1.2.0"
-          sources."shebang-regex-1.0.0"
-          sources."which-1.3.1"
-        ];
-      })
-      sources."normalize-path-3.0.0"
+      sources."minimist-1.2.0"
+      sources."ms-2.0.0"
+      sources."negotiator-0.6.2"
+      sources."node-watch-0.5.5"
       sources."oauth-sign-0.9.0"
-      sources."once-1.4.0"
-      sources."path-is-absolute-1.0.1"
-      sources."path-key-3.1.1"
+      sources."on-finished-2.3.0"
+      sources."opn-5.4.0"
+      sources."options-0.0.6"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."parseurl-1.3.3"
+      sources."path-to-regexp-0.1.7"
       sources."performance-now-2.1.0"
-      sources."picomatch-2.2.1"
+      sources."process-nextick-args-1.0.7"
+      sources."proxy-addr-2.0.6"
       sources."psl-1.7.0"
       sources."punycode-2.1.1"
-      sources."qs-6.5.2"
-      sources."readdirp-3.2.0"
-      sources."request-2.88.2"
-      sources."request-promise-4.2.5"
-      sources."request-promise-core-1.1.3"
-      sources."rimraf-2.6.3"
-      sources."safe-buffer-5.2.0"
+      sources."qs-6.7.0"
+      sources."range-parser-1.2.1"
+      sources."raw-body-2.4.0"
+      sources."readable-stream-2.0.6"
+      sources."regenerator-runtime-0.9.6"
+      (sources."request-2.88.0" // {
+        dependencies = [
+          sources."qs-6.5.2"
+          sources."safe-buffer-5.2.0"
+        ];
+      })
+      sources."safe-buffer-5.1.1"
       sources."safer-buffer-2.1.2"
-      sources."semver-5.7.1"
-      sources."shebang-command-2.0.0"
-      sources."shebang-regex-3.0.0"
-      sources."split-1.0.1"
+      (sources."send-0.16.2" // {
+        dependencies = [
+          sources."http-errors-1.6.3"
+          sources."setprototypeof-1.1.0"
+          sources."statuses-1.4.0"
+        ];
+      })
+      sources."serve-static-1.13.2"
+      sources."setprototypeof-1.1.1"
       sources."sshpk-1.16.1"
-      sources."stealthy-require-1.1.1"
-      sources."supports-color-7.1.0"
-      sources."tar-4.4.13"
-      sources."temp-0.9.1"
-      sources."through-2.3.8"
-      sources."to-regex-range-5.0.1"
-      sources."tough-cookie-2.5.0"
-      sources."traverse-0.3.9"
+      sources."statuses-1.5.0"
+      sources."string_decoder-0.10.31"
+      sources."sums-0.2.4"
+      sources."through2-2.0.1"
+      sources."tmp-0.0.31"
+      sources."toidentifier-1.0.0"
+      (sources."tough-cookie-2.4.3" // {
+        dependencies = [
+          sources."punycode-1.4.1"
+        ];
+      })
+      sources."traverse-chain-0.1.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
-      sources."universalify-0.1.2"
-      sources."unzip-stream-0.3.0"
+      sources."type-is-1.6.18"
+      sources."typedarray-0.0.6"
+      sources."ultron-1.0.2"
+      sources."unpipe-1.0.0"
       sources."uri-js-4.2.2"
+      sources."util-deprecate-1.0.2"
+      sources."utils-merge-1.0.1"
       sources."uuid-3.4.0"
+      sources."vary-1.1.2"
       sources."verror-1.10.0"
-      sources."which-2.0.1"
-      sources."wrappy-1.0.2"
-      sources."xmlbuilder-13.0.2"
-      sources."yallist-3.1.1"
+      (sources."ws-3.3.1" // {
+        dependencies = [
+          sources."ultron-1.1.1"
+        ];
+      })
+      sources."xtend-4.0.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
-      description = "Run elm-test suites.";
-      homepage = "https://github.com/rtfeldman/node-test-runner#readme";
-      license = "BSD-3-Clause";
+      description = "A tool that allows you analyse your Elm code and identifies deficiencies and best practices.";
+      license = "MIT";
     };
     production = true;
     bypassCache = true;
     reconstructLock = true;
   };
-  elm-verify-examples = nodeEnv.buildNodePackage {
-    name = "elm-verify-examples";
-    packageName = "elm-verify-examples";
-    version = "5.0.0";
+  elm-coverage = nodeEnv.buildNodePackage {
+    name = "elm-coverage";
+    packageName = "elm-coverage";
+    version = "0.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elm-verify-examples/-/elm-verify-examples-5.0.0.tgz";
-      sha512 = "dAOv+U9hXZ0IRGx19mkpCAdf5rUwoJWlzFmcR2gvOzE/QjZUSlPh3e0IIDAfGUuEF8DjfE5CTe31fNtIkkd2rQ==";
+      url = "https://registry.npmjs.org/elm-coverage/-/elm-coverage-0.3.0.tgz";
+      sha512 = "WHlO9LCu6DLzlIPR28GqcCgtyy6ZjRKBR+c6yYwy7m2o0D0buuLsr3wsZxJBjZYmwregmWRseUOM3DzHmoiIzg==";
     };
     dependencies = [
+      sources."@types/color-name-1.1.1"
+      sources."abbrev-1.1.1"
       sources."ajv-6.12.0"
       sources."ansi-regex-4.1.0"
       sources."ansi-styles-3.2.1"
       sources."anymatch-3.1.1"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
+      sources."astral-regex-1.0.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.9.1"
@@ -5156,29 +5420,43 @@ in
       sources."camelcase-5.3.1"
       sources."caseless-0.12.0"
       sources."chainsaw-0.1.0"
-      sources."chalk-2.4.2"
+      (sources."chalk-2.4.2" // {
+        dependencies = [
+          sources."supports-color-5.5.0"
+        ];
+      })
       sources."chokidar-3.2.1"
       sources."chownr-1.1.4"
-      sources."cliui-5.0.0"
+      (sources."cliui-6.0.0" // {
+        dependencies = [
+          sources."ansi-regex-5.0.0"
+          sources."emoji-regex-8.0.0"
+          sources."is-fullwidth-code-point-3.0.0"
+          sources."string-width-4.2.0"
+          sources."strip-ansi-6.0.0"
+        ];
+      })
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
       sources."combined-stream-1.0.8"
       sources."concat-map-0.0.1"
       sources."core-util-is-1.0.2"
-      (sources."cross-spawn-7.0.0" // {
-        dependencies = [
-          sources."which-1.3.1"
-        ];
-      })
+      sources."cross-spawn-5.1.0"
       sources."dashdash-1.14.1"
       sources."decamelize-1.2.0"
       sources."delayed-stream-1.0.0"
       sources."ecc-jsbn-0.1.2"
+      sources."elm-0.19.1"
       (sources."elm-test-0.19.1" // {
         dependencies = [
+          (sources."cross-spawn-7.0.0" // {
+            dependencies = [
+              sources."which-1.3.1"
+            ];
+          })
           sources."fs-extra-8.1.0"
-          sources."has-flag-4.0.0"
-          sources."supports-color-7.1.0"
+          sources."minimist-1.2.5"
+          sources."which-2.0.1"
         ];
       })
       sources."elmi-to-json-1.2.0"
@@ -5189,17 +5467,18 @@ in
       sources."fast-deep-equal-3.1.1"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fill-range-7.0.1"
+      sources."find-0.2.9"
       (sources."find-elm-dependencies-2.0.2" // {
         dependencies = [
           sources."firstline-1.2.0"
         ];
       })
       sources."find-parent-dir-0.3.0"
-      sources."find-up-3.0.0"
+      sources."find-up-4.1.0"
       sources."firstline-2.0.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
-      sources."fs-extra-5.0.0"
+      sources."fs-extra-4.0.3"
       sources."fs-minipass-1.2.7"
       sources."fs.realpath-1.0.0"
       sources."fsevents-2.1.2"
@@ -5220,6 +5499,7 @@ in
       sources."is-glob-4.0.1"
       sources."is-number-7.0.0"
       sources."is-typedarray-1.0.0"
+      sources."is-wsl-1.1.0"
       sources."isexe-2.0.0"
       sources."isstream-0.1.2"
       sources."jsbn-0.1.1"
@@ -5228,19 +5508,21 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."jsonfile-4.0.0"
       sources."jsprim-1.4.1"
-      sources."locate-path-3.0.0"
+      sources."locate-path-5.0.0"
       sources."lodash-4.17.15"
+      (sources."lru-cache-4.1.5" // {
+        dependencies = [
+          sources."yallist-2.1.2"
+        ];
+      })
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.5"
+      sources."minimist-0.0.8"
       sources."minipass-2.9.0"
       sources."minizlib-1.3.3"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.1"
+      sources."moment-2.24.0"
       sources."murmur-hash-js-1.0.0"
       sources."mustache-3.2.1"
       sources."nice-try-1.0.5"
@@ -5248,20 +5530,23 @@ in
         dependencies = [
           sources."cross-spawn-6.0.5"
           sources."path-key-2.0.1"
-          sources."which-1.3.1"
         ];
       })
+      sources."nopt-1.0.10"
       sources."normalize-path-3.0.0"
       sources."oauth-sign-0.9.0"
       sources."once-1.4.0"
+      sources."opn-5.5.0"
+      sources."os-tmpdir-1.0.2"
       sources."p-limit-2.2.2"
-      sources."p-locate-3.0.0"
+      sources."p-locate-4.1.0"
       sources."p-try-2.2.0"
-      sources."path-exists-3.0.0"
+      sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-key-3.1.1"
       sources."performance-now-2.1.0"
       sources."picomatch-2.2.1"
+      sources."pseudomap-1.0.2"
       sources."psl-1.7.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
@@ -5271,49 +5556,75 @@ in
       sources."request-promise-core-1.1.3"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
-      sources."rimraf-2.7.1"
+      sources."rimraf-2.6.3"
       sources."safe-buffer-5.2.0"
       sources."safer-buffer-2.1.2"
       sources."semver-5.7.1"
       sources."set-blocking-2.0.0"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
+      sources."slice-ansi-2.1.0"
       sources."split-1.0.1"
       sources."sshpk-1.16.1"
       sources."stealthy-require-1.1.1"
       sources."string-width-3.1.0"
       sources."strip-ansi-5.2.0"
-      sources."supports-color-5.5.0"
-      sources."tar-4.4.13"
-      (sources."temp-0.9.0" // {
+      (sources."supports-color-7.1.0" // {
         dependencies = [
-          sources."rimraf-2.6.3"
+          sources."has-flag-4.0.0"
         ];
       })
+      sources."table-5.4.6"
+      sources."tar-4.4.13"
+      sources."temp-0.9.0"
       sources."through-2.3.8"
+      sources."tmp-0.0.33"
       sources."to-regex-range-5.0.1"
+      sources."touch-3.1.0"
       sources."tough-cookie-2.5.0"
       sources."traverse-0.3.9"
+      sources."traverse-chain-0.1.0"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."universalify-0.1.2"
       sources."unzip-stream-0.3.0"
+      sources."upgrade-1.1.0"
       sources."uri-js-4.2.2"
       sources."uuid-3.4.0"
       sources."verror-1.10.0"
-      sources."which-2.0.1"
+      sources."which-1.3.1"
       sources."which-module-2.0.0"
-      sources."wrap-ansi-5.1.0"
+      (sources."wrap-ansi-6.2.0" // {
+        dependencies = [
+          sources."ansi-regex-5.0.0"
+          sources."ansi-styles-4.2.1"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+          sources."emoji-regex-8.0.0"
+          sources."is-fullwidth-code-point-3.0.0"
+          sources."string-width-4.2.0"
+          sources."strip-ansi-6.0.0"
+        ];
+      })
       sources."wrappy-1.0.2"
       sources."xmlbuilder-13.0.2"
       sources."y18n-4.0.0"
       sources."yallist-3.1.1"
-      sources."yargs-13.3.2"
-      sources."yargs-parser-13.1.2"
+      (sources."yargs-15.3.1" // {
+        dependencies = [
+          sources."ansi-regex-5.0.0"
+          sources."emoji-regex-8.0.0"
+          sources."is-fullwidth-code-point-3.0.0"
+          sources."string-width-4.2.0"
+          sources."strip-ansi-6.0.0"
+        ];
+      })
+      sources."yargs-parser-18.1.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
-      description = "Verify examples in Elm doc-comments";
+      description = "> Work in progress - Code coverage tooling for Elm";
+      homepage = "https://github.com/zwilias/elm-coverage#readme";
       license = "BSD-3-Clause";
     };
     production = true;
@@ -5736,438 +6047,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  elm-upgrade = nodeEnv.buildNodePackage {
-    name = "elm-upgrade";
-    packageName = "elm-upgrade";
-    version = "0.19.8";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/elm-upgrade/-/elm-upgrade-0.19.8.tgz";
-      sha512 = "SwNzV40wu9IEe35TWR9b7F8WctIRUkpl6F3lzF0AqmYnCcKjbzrxbW6G7DYfA9ICUYjuSLcyYJKm5c86oMiH8w==";
-    };
-    dependencies = [
-      sources."@sindresorhus/is-2.1.0"
-      sources."@szmarczak/http-timer-4.0.5"
-      sources."@types/cacheable-request-6.0.1"
-      sources."@types/http-cache-semantics-4.0.0"
-      sources."@types/keyv-3.1.1"
-      sources."@types/node-13.9.1"
-      sources."@types/responselike-1.0.0"
-      sources."cacheable-lookup-2.0.0"
-      sources."cacheable-request-7.0.1"
-      sources."caw-2.0.1"
-      (sources."clone-response-1.0.2" // {
-        dependencies = [
-          sources."mimic-response-1.0.1"
-        ];
-      })
-      sources."config-chain-1.1.12"
-      sources."decompress-response-5.0.0"
-      sources."defer-to-connect-2.0.0"
-      sources."duplexer3-0.1.4"
-      sources."end-of-stream-1.4.4"
-      sources."fs-extra-8.1.0"
-      sources."get-proxy-2.1.0"
-      sources."get-stream-5.1.0"
-      sources."got-10.6.0"
-      sources."graceful-fs-4.2.3"
-      sources."has-symbol-support-x-1.4.2"
-      sources."has-to-string-tag-x-1.4.1"
-      sources."http-cache-semantics-4.1.0"
-      sources."ini-1.3.5"
-      sources."is-object-1.0.1"
-      sources."isexe-2.0.0"
-      sources."isurl-1.0.0"
-      sources."json-buffer-3.0.1"
-      sources."jsonfile-4.0.0"
-      sources."keyv-4.0.0"
-      sources."lowercase-keys-2.0.0"
-      sources."mimic-response-2.1.0"
-      sources."normalize-url-4.5.0"
-      sources."npm-conf-1.1.3"
-      sources."once-1.4.0"
-      sources."p-cancelable-2.0.0"
-      sources."p-event-4.1.0"
-      sources."p-finally-1.0.0"
-      sources."p-timeout-2.0.1"
-      sources."pify-3.0.0"
-      sources."proto-list-1.2.4"
-      sources."pump-3.0.0"
-      sources."responselike-2.0.0"
-      sources."safe-buffer-5.2.0"
-      sources."safename-1.0.2"
-      sources."semver-7.1.3"
-      sources."to-readable-stream-2.1.0"
-      sources."tunnel-agent-0.6.0"
-      sources."type-fest-0.10.0"
-      sources."universalify-0.1.2"
-      sources."url-to-options-1.0.1"
-      sources."which-2.0.2"
-      sources."wrappy-1.0.2"
-      sources."yn-4.0.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Upgrade Elm projects";
-      homepage = "https://github.com/avh4/elm-upgrade#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  elm-analyse = nodeEnv.buildNodePackage {
-    name = "elm-analyse";
-    packageName = "elm-analyse";
-    version = "0.16.5";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/elm-analyse/-/elm-analyse-0.16.5.tgz";
-      sha512 = "I7dgGFOc+mYDcDuyo1/HcIn3E5MiMbocStNzivsPSjCUviuEieHdDKZmJJ9uM3IdCu0fdBmRNWQBSOXtXrgzKg==";
-    };
-    dependencies = [
-      sources."accepts-1.3.7"
-      sources."ajv-6.12.0"
-      sources."array-flatten-1.1.1"
-      sources."asn1-0.2.4"
-      sources."assert-plus-1.0.0"
-      sources."async-limiter-1.0.1"
-      sources."asynckit-0.4.0"
-      sources."aws-sign2-0.7.0"
-      sources."aws4-1.9.1"
-      sources."babel-runtime-6.18.0"
-      sources."bcrypt-pbkdf-1.0.2"
-      sources."body-parser-1.19.0"
-      sources."bytes-3.1.0"
-      sources."caseless-0.12.0"
-      sources."combined-stream-1.0.8"
-      sources."concat-stream-1.5.2"
-      sources."content-disposition-0.5.2"
-      sources."content-type-1.0.4"
-      sources."cookie-0.3.1"
-      sources."cookie-signature-1.0.6"
-      sources."core-js-2.6.11"
-      sources."core-util-is-1.0.2"
-      sources."dashdash-1.14.1"
-      sources."debug-2.6.9"
-      sources."delayed-stream-1.0.0"
-      sources."depd-1.1.2"
-      sources."destroy-1.0.4"
-      sources."ecc-jsbn-0.1.2"
-      sources."ee-first-1.1.1"
-      sources."encodeurl-1.0.2"
-      sources."escape-html-1.0.3"
-      sources."etag-1.8.1"
-      (sources."express-4.16.3" // {
-        dependencies = [
-          sources."body-parser-1.18.2"
-          sources."bytes-3.0.0"
-          sources."http-errors-1.6.3"
-          sources."iconv-lite-0.4.19"
-          sources."qs-6.5.1"
-          (sources."raw-body-2.3.2" // {
-            dependencies = [
-              sources."depd-1.1.1"
-              sources."http-errors-1.6.2"
-              sources."setprototypeof-1.0.3"
-            ];
-          })
-          sources."setprototypeof-1.1.0"
-          sources."statuses-1.4.0"
-        ];
-      })
-      (sources."express-ws-2.0.0" // {
-        dependencies = [
-          sources."ws-1.1.5"
-        ];
-      })
-      sources."extend-3.0.2"
-      sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-3.1.1"
-      sources."fast-json-stable-stringify-2.1.0"
-      (sources."finalhandler-1.1.1" // {
-        dependencies = [
-          sources."statuses-1.4.0"
-        ];
-      })
-      sources."find-0.2.7"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.3.3"
-      sources."forwarded-0.1.2"
-      sources."fresh-0.5.2"
-      sources."fs-extra-2.0.0"
-      sources."getpass-0.1.7"
-      sources."graceful-fs-4.2.3"
-      sources."har-schema-2.0.0"
-      sources."har-validator-5.1.3"
-      sources."http-errors-1.7.2"
-      sources."http-signature-1.2.0"
-      sources."iconv-lite-0.4.24"
-      sources."inherits-2.0.3"
-      sources."ipaddr.js-1.9.1"
-      sources."is-stream-1.1.0"
-      sources."is-typedarray-1.0.0"
-      sources."is-wsl-1.1.0"
-      sources."isarray-1.0.0"
-      sources."isstream-0.1.2"
-      sources."jsbn-0.1.1"
-      sources."json-schema-0.2.3"
-      sources."json-schema-traverse-0.4.1"
-      sources."json-stringify-safe-5.0.1"
-      sources."jsonfile-2.4.0"
-      sources."jsprim-1.4.1"
-      sources."lodash-4.17.15"
-      sources."media-typer-0.3.0"
-      sources."merge-descriptors-1.0.1"
-      sources."methods-1.1.2"
-      sources."mime-1.4.1"
-      sources."mime-db-1.43.0"
-      sources."mime-types-2.1.26"
-      sources."minimist-1.2.0"
-      sources."ms-2.0.0"
-      sources."negotiator-0.6.2"
-      sources."node-watch-0.5.5"
-      sources."oauth-sign-0.9.0"
-      sources."on-finished-2.3.0"
-      sources."opn-5.4.0"
-      sources."options-0.0.6"
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
-      sources."parseurl-1.3.3"
-      sources."path-to-regexp-0.1.7"
-      sources."performance-now-2.1.0"
-      sources."process-nextick-args-1.0.7"
-      sources."proxy-addr-2.0.6"
-      sources."psl-1.7.0"
-      sources."punycode-2.1.1"
-      sources."qs-6.7.0"
-      sources."range-parser-1.2.1"
-      sources."raw-body-2.4.0"
-      sources."readable-stream-2.0.6"
-      sources."regenerator-runtime-0.9.6"
-      (sources."request-2.88.0" // {
-        dependencies = [
-          sources."qs-6.5.2"
-          sources."safe-buffer-5.2.0"
-        ];
-      })
-      sources."safe-buffer-5.1.1"
-      sources."safer-buffer-2.1.2"
-      (sources."send-0.16.2" // {
-        dependencies = [
-          sources."http-errors-1.6.3"
-          sources."setprototypeof-1.1.0"
-          sources."statuses-1.4.0"
-        ];
-      })
-      sources."serve-static-1.13.2"
-      sources."setprototypeof-1.1.1"
-      sources."sshpk-1.16.1"
-      sources."statuses-1.5.0"
-      sources."string_decoder-0.10.31"
-      sources."sums-0.2.4"
-      sources."through2-2.0.1"
-      sources."tmp-0.0.31"
-      sources."toidentifier-1.0.0"
-      (sources."tough-cookie-2.4.3" // {
-        dependencies = [
-          sources."punycode-1.4.1"
-        ];
-      })
-      sources."traverse-chain-0.1.0"
-      sources."tunnel-agent-0.6.0"
-      sources."tweetnacl-0.14.5"
-      sources."type-is-1.6.18"
-      sources."typedarray-0.0.6"
-      sources."ultron-1.0.2"
-      sources."unpipe-1.0.0"
-      sources."uri-js-4.2.2"
-      sources."util-deprecate-1.0.2"
-      sources."utils-merge-1.0.1"
-      sources."uuid-3.4.0"
-      sources."vary-1.1.2"
-      sources."verror-1.10.0"
-      (sources."ws-3.3.1" // {
-        dependencies = [
-          sources."ultron-1.1.1"
-        ];
-      })
-      sources."xtend-4.0.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "A tool that allows you analyse your Elm code and identifies deficiencies and best practices.";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  elm-live = nodeEnv.buildNodePackage {
-    name = "elm-live";
-    packageName = "elm-live";
-    version = "4.0.2";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/elm-live/-/elm-live-4.0.2.tgz";
-      sha512 = "4I3UvJxF6MubC14VsgtV11B0zBxaaKtdKKsWquoaa5a3UHBIGW83qgTnt/NxOj4omOLfupaftmDaE4yRMTgTcw==";
-    };
-    dependencies = [
-      sources."ansi-regex-2.1.1"
-      sources."ansi-styles-2.2.1"
-      sources."anymatch-3.1.1"
-      sources."async-limiter-1.0.1"
-      sources."binary-extensions-2.0.0"
-      sources."braces-3.0.2"
-      sources."chalk-1.1.3"
-      sources."charenc-0.0.2"
-      sources."chokidar-3.0.2"
-      sources."commander-2.17.1"
-      sources."crocks-0.12.1"
-      sources."cross-spawn-5.0.1"
-      sources."crypt-0.0.2"
-      sources."debug-2.6.9"
-      sources."default-gateway-4.2.0"
-      sources."depd-1.1.2"
-      sources."destroy-1.0.4"
-      sources."ee-first-1.1.1"
-      sources."elm-hot-1.1.4"
-      sources."encodeurl-1.0.2"
-      sources."end-of-stream-1.4.4"
-      sources."es6-promisify-6.0.2"
-      sources."escape-html-1.0.3"
-      sources."escape-string-regexp-1.0.5"
-      sources."etag-1.8.1"
-      sources."eventemitter3-3.1.2"
-      (sources."execa-1.0.0" // {
-        dependencies = [
-          sources."cross-spawn-6.0.5"
-        ];
-      })
-      sources."fill-range-7.0.1"
-      sources."finalhandler-1.1.2"
-      (sources."follow-redirects-1.10.0" // {
-        dependencies = [
-          sources."debug-3.2.6"
-          sources."ms-2.1.2"
-        ];
-      })
-      sources."fresh-0.5.2"
-      sources."fsevents-2.1.2"
-      sources."get-stream-4.1.0"
-      sources."glob-parent-5.1.0"
-      sources."has-ansi-2.0.0"
-      sources."http-errors-1.7.3"
-      sources."http-proxy-1.17.0"
-      sources."inherits-2.0.4"
-      sources."internal-ip-4.3.0"
-      sources."ip-regex-2.1.0"
-      sources."ipaddr.js-1.9.1"
-      sources."is-binary-path-2.1.0"
-      sources."is-buffer-1.1.6"
-      sources."is-extglob-2.1.1"
-      sources."is-glob-4.0.1"
-      sources."is-number-7.0.0"
-      sources."is-stream-1.1.0"
-      sources."is-wsl-1.1.0"
-      sources."isexe-2.0.0"
-      sources."lru-cache-4.1.5"
-      sources."md5-2.2.1"
-      sources."mime-2.4.3"
-      sources."ms-2.0.0"
-      sources."nice-try-1.0.5"
-      sources."normalize-path-3.0.0"
-      sources."npm-run-path-2.0.2"
-      sources."on-finished-2.3.0"
-      sources."once-1.4.0"
-      sources."open-6.4.0"
-      sources."os-tmpdir-1.0.2"
-      sources."p-finally-1.0.0"
-      sources."parseurl-1.3.3"
-      sources."path-key-2.0.1"
-      sources."pem-1.14.2"
-      sources."picomatch-2.2.1"
-      sources."pseudomap-1.0.2"
-      sources."pump-3.0.0"
-      sources."range-parser-1.2.1"
-      sources."readdirp-3.3.0"
-      sources."requires-port-1.0.0"
-      sources."semver-5.7.1"
-      (sources."send-0.17.1" // {
-        dependencies = [
-          sources."mime-1.6.0"
-          sources."ms-2.1.1"
-        ];
-      })
-      sources."serve-static-1.14.1"
-      sources."setprototypeof-1.1.1"
-      sources."shebang-command-1.2.0"
-      sources."shebang-regex-1.0.0"
-      sources."signal-exit-3.0.2"
-      sources."statuses-1.5.0"
-      sources."strip-ansi-3.0.1"
-      sources."strip-eof-1.0.0"
-      sources."supports-color-2.0.0"
-      sources."to-regex-range-5.0.1"
-      sources."toidentifier-1.0.0"
-      sources."unpipe-1.0.0"
-      sources."which-1.3.1"
-      sources."wrappy-1.0.2"
-      sources."ws-7.1.1"
-      sources."yallist-2.1.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "A flexible dev server for Elm. Live reload included!";
-      homepage = "https://github.com/wking-io/elm-live#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  elm-xref = nodeEnv.buildNodePackage {
-    name = "elm-xref";
-    packageName = "elm-xref";
-    version = "4.1.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/elm-xref/-/elm-xref-4.1.0.tgz";
-      sha512 = "23nVGYsArS2DZ0RnFq6cKYO49pCjuLULhM+fvBcfA7ZIbKSw5WkDyK9c5hlQEm+JZAPZ43PNcI0yLzTEqaajiA==";
-    };
-    dependencies = [
-      sources."bluebird-3.7.2"
-      sources."compare-versions-3.6.0"
-      sources."core-util-is-1.0.2"
-      sources."fs-extra-6.0.1"
-      sources."graceful-fs-4.2.3"
-      sources."inherits-2.0.4"
-      sources."isarray-1.0.0"
-      sources."jsonfile-4.0.0"
-      sources."klaw-2.1.1"
-      sources."minimist-1.2.5"
-      sources."process-nextick-args-2.0.1"
-      sources."readable-stream-2.3.7"
-      sources."safe-buffer-5.1.2"
-      sources."semver-6.3.0"
-      sources."semver-regex-1.0.0"
-      (sources."semver-sort-0.0.4" // {
-        dependencies = [
-          sources."semver-5.7.1"
-        ];
-      })
-      sources."string_decoder-1.1.1"
-      sources."through2-2.0.5"
-      sources."universalify-0.1.2"
-      sources."util-deprecate-1.0.2"
-      sources."xtend-4.0.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Cross referencing tool for Elm - find usages and unused code";
-      homepage = "https://github.com/zwilias/elm-xref#readme";
-      license = "BSD-3-Clause";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   "@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage {
     name = "_at_elm-tooling_slash_elm-language-server";
     packageName = "@elm-tooling/elm-language-server";
@@ -6413,4 +6292,603 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  elm-live = nodeEnv.buildNodePackage {
+    name = "elm-live";
+    packageName = "elm-live";
+    version = "4.0.2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/elm-live/-/elm-live-4.0.2.tgz";
+      sha512 = "4I3UvJxF6MubC14VsgtV11B0zBxaaKtdKKsWquoaa5a3UHBIGW83qgTnt/NxOj4omOLfupaftmDaE4yRMTgTcw==";
+    };
+    dependencies = [
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-2.2.1"
+      sources."anymatch-3.1.1"
+      sources."async-limiter-1.0.1"
+      sources."binary-extensions-2.0.0"
+      sources."braces-3.0.2"
+      sources."chalk-1.1.3"
+      sources."charenc-0.0.2"
+      sources."chokidar-3.0.2"
+      sources."commander-2.17.1"
+      sources."crocks-0.12.1"
+      sources."cross-spawn-5.0.1"
+      sources."crypt-0.0.2"
+      sources."debug-2.6.9"
+      sources."default-gateway-4.2.0"
+      sources."depd-1.1.2"
+      sources."destroy-1.0.4"
+      sources."ee-first-1.1.1"
+      sources."elm-hot-1.1.4"
+      sources."encodeurl-1.0.2"
+      sources."end-of-stream-1.4.4"
+      sources."es6-promisify-6.1.0"
+      sources."escape-html-1.0.3"
+      sources."escape-string-regexp-1.0.5"
+      sources."etag-1.8.1"
+      sources."eventemitter3-3.1.2"
+      (sources."execa-1.0.0" // {
+        dependencies = [
+          sources."cross-spawn-6.0.5"
+        ];
+      })
+      sources."fill-range-7.0.1"
+      sources."finalhandler-1.1.2"
+      (sources."follow-redirects-1.10.0" // {
+        dependencies = [
+          sources."debug-3.2.6"
+          sources."ms-2.1.2"
+        ];
+      })
+      sources."fresh-0.5.2"
+      sources."fsevents-2.1.2"
+      sources."get-stream-4.1.0"
+      sources."glob-parent-5.1.0"
+      sources."has-ansi-2.0.0"
+      sources."http-errors-1.7.3"
+      sources."http-proxy-1.17.0"
+      sources."inherits-2.0.4"
+      sources."internal-ip-4.3.0"
+      sources."ip-regex-2.1.0"
+      sources."ipaddr.js-1.9.1"
+      sources."is-binary-path-2.1.0"
+      sources."is-buffer-1.1.6"
+      sources."is-extglob-2.1.1"
+      sources."is-glob-4.0.1"
+      sources."is-number-7.0.0"
+      sources."is-stream-1.1.0"
+      sources."is-wsl-1.1.0"
+      sources."isexe-2.0.0"
+      sources."lru-cache-4.1.5"
+      sources."md5-2.2.1"
+      sources."mime-2.4.3"
+      sources."ms-2.0.0"
+      sources."nice-try-1.0.5"
+      sources."normalize-path-3.0.0"
+      sources."npm-run-path-2.0.2"
+      sources."on-finished-2.3.0"
+      sources."once-1.4.0"
+      sources."open-6.4.0"
+      sources."os-tmpdir-1.0.2"
+      sources."p-finally-1.0.0"
+      sources."parseurl-1.3.3"
+      sources."path-key-2.0.1"
+      sources."pem-1.14.2"
+      sources."picomatch-2.2.1"
+      sources."pseudomap-1.0.2"
+      sources."pump-3.0.0"
+      sources."range-parser-1.2.1"
+      sources."readdirp-3.3.0"
+      sources."requires-port-1.0.0"
+      sources."semver-5.7.1"
+      (sources."send-0.17.1" // {
+        dependencies = [
+          sources."mime-1.6.0"
+          sources."ms-2.1.1"
+        ];
+      })
+      sources."serve-static-1.14.1"
+      sources."setprototypeof-1.1.1"
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
+      sources."signal-exit-3.0.2"
+      sources."statuses-1.5.0"
+      sources."strip-ansi-3.0.1"
+      sources."strip-eof-1.0.0"
+      sources."supports-color-2.0.0"
+      sources."to-regex-range-5.0.1"
+      sources."toidentifier-1.0.0"
+      sources."unpipe-1.0.0"
+      sources."which-1.3.1"
+      sources."wrappy-1.0.2"
+      sources."ws-7.1.1"
+      sources."yallist-2.1.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A flexible dev server for Elm. Live reload included!";
+      homepage = "https://github.com/wking-io/elm-live#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  elm-test = nodeEnv.buildNodePackage {
+    name = "elm-test";
+    packageName = "elm-test";
+    version = "0.19.1-revision2";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision2.tgz";
+      sha512 = "zVs2mVeyIE+K9y7/8b333h5xRMDWAoqbBDm7ThLDhyTi7ICxeL3t5uOS4KZCrRk9+4sP6+voSbcBlgr46Q+GiQ==";
+    };
+    dependencies = [
+      sources."@types/color-name-1.1.1"
+      sources."ajv-6.12.0"
+      sources."ansi-styles-4.2.1"
+      sources."anymatch-3.1.1"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.9.1"
+      sources."balanced-match-1.0.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."binary-0.3.0"
+      sources."binary-extensions-2.0.0"
+      sources."binwrap-0.2.2"
+      sources."bluebird-3.7.2"
+      sources."brace-expansion-1.1.11"
+      sources."braces-3.0.2"
+      sources."buffers-0.1.1"
+      sources."caseless-0.12.0"
+      sources."chainsaw-0.1.0"
+      sources."chalk-3.0.0"
+      sources."chokidar-3.3.0"
+      sources."chownr-1.1.4"
+      sources."color-convert-2.0.1"
+      sources."color-name-1.1.4"
+      sources."combined-stream-1.0.8"
+      sources."concat-map-0.0.1"
+      sources."core-util-is-1.0.2"
+      sources."cross-spawn-7.0.1"
+      sources."dashdash-1.14.1"
+      sources."delayed-stream-1.0.0"
+      sources."ecc-jsbn-0.1.2"
+      sources."elmi-to-json-1.3.0"
+      sources."extend-3.0.2"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-3.1.1"
+      sources."fast-json-stable-stringify-2.1.0"
+      sources."fill-range-7.0.1"
+      (sources."find-elm-dependencies-2.0.2" // {
+        dependencies = [
+          sources."firstline-1.2.0"
+        ];
+      })
+      sources."find-parent-dir-0.3.0"
+      sources."firstline-2.0.2"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.3"
+      sources."fs-extra-8.1.0"
+      sources."fs-minipass-1.2.7"
+      sources."fs.realpath-1.0.0"
+      sources."fsevents-2.1.2"
+      sources."getpass-0.1.7"
+      sources."glob-7.1.6"
+      sources."glob-parent-5.1.0"
+      sources."graceful-fs-4.2.3"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.1.3"
+      sources."has-flag-4.0.0"
+      sources."http-signature-1.2.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
+      sources."is-binary-path-2.1.0"
+      sources."is-extglob-2.1.1"
+      sources."is-glob-4.0.1"
+      sources."is-number-7.0.0"
+      sources."is-typedarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.4.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsonfile-4.0.0"
+      sources."jsprim-1.4.1"
+      sources."lodash-4.17.15"
+      sources."mime-db-1.43.0"
+      sources."mime-types-2.1.26"
+      sources."minimatch-3.0.4"
+      sources."minimist-1.2.5"
+      sources."minipass-2.9.0"
+      sources."minizlib-1.3.3"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      sources."murmur-hash-js-1.0.0"
+      sources."mustache-3.2.1"
+      sources."nice-try-1.0.5"
+      (sources."node-elm-compiler-5.0.4" // {
+        dependencies = [
+          sources."cross-spawn-6.0.5"
+          sources."path-key-2.0.1"
+          sources."shebang-command-1.2.0"
+          sources."shebang-regex-1.0.0"
+          sources."which-1.3.1"
+        ];
+      })
+      sources."normalize-path-3.0.0"
+      sources."oauth-sign-0.9.0"
+      sources."once-1.4.0"
+      sources."path-is-absolute-1.0.1"
+      sources."path-key-3.1.1"
+      sources."performance-now-2.1.0"
+      sources."picomatch-2.2.1"
+      sources."psl-1.7.0"
+      sources."punycode-2.1.1"
+      sources."qs-6.5.2"
+      sources."readdirp-3.2.0"
+      sources."request-2.88.2"
+      sources."request-promise-4.2.5"
+      sources."request-promise-core-1.1.3"
+      sources."rimraf-2.6.3"
+      sources."safe-buffer-5.2.0"
+      sources."safer-buffer-2.1.2"
+      sources."semver-5.7.1"
+      sources."shebang-command-2.0.0"
+      sources."shebang-regex-3.0.0"
+      sources."split-1.0.1"
+      sources."sshpk-1.16.1"
+      sources."stealthy-require-1.1.1"
+      sources."supports-color-7.1.0"
+      sources."tar-4.4.13"
+      sources."temp-0.9.1"
+      sources."through-2.3.8"
+      sources."to-regex-range-5.0.1"
+      sources."tough-cookie-2.5.0"
+      sources."traverse-0.3.9"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."universalify-0.1.2"
+      sources."unzip-stream-0.3.0"
+      sources."uri-js-4.2.2"
+      sources."uuid-3.4.0"
+      sources."verror-1.10.0"
+      sources."which-2.0.1"
+      sources."wrappy-1.0.2"
+      sources."xmlbuilder-13.0.2"
+      sources."yallist-3.1.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Run elm-test suites.";
+      homepage = "https://github.com/rtfeldman/node-test-runner#readme";
+      license = "BSD-3-Clause";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  elm-upgrade = nodeEnv.buildNodePackage {
+    name = "elm-upgrade";
+    packageName = "elm-upgrade";
+    version = "0.19.8";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/elm-upgrade/-/elm-upgrade-0.19.8.tgz";
+      sha512 = "SwNzV40wu9IEe35TWR9b7F8WctIRUkpl6F3lzF0AqmYnCcKjbzrxbW6G7DYfA9ICUYjuSLcyYJKm5c86oMiH8w==";
+    };
+    dependencies = [
+      sources."@sindresorhus/is-2.1.0"
+      sources."@szmarczak/http-timer-4.0.5"
+      sources."@types/cacheable-request-6.0.1"
+      sources."@types/http-cache-semantics-4.0.0"
+      sources."@types/keyv-3.1.1"
+      sources."@types/node-13.9.1"
+      sources."@types/responselike-1.0.0"
+      sources."cacheable-lookup-2.0.0"
+      sources."cacheable-request-7.0.1"
+      sources."caw-2.0.1"
+      (sources."clone-response-1.0.2" // {
+        dependencies = [
+          sources."mimic-response-1.0.1"
+        ];
+      })
+      sources."config-chain-1.1.12"
+      sources."decompress-response-5.0.0"
+      sources."defer-to-connect-2.0.0"
+      sources."duplexer3-0.1.4"
+      sources."end-of-stream-1.4.4"
+      sources."fs-extra-8.1.0"
+      sources."get-proxy-2.1.0"
+      sources."get-stream-5.1.0"
+      sources."got-10.6.0"
+      sources."graceful-fs-4.2.3"
+      sources."has-symbol-support-x-1.4.2"
+      sources."has-to-string-tag-x-1.4.1"
+      sources."http-cache-semantics-4.1.0"
+      sources."ini-1.3.5"
+      sources."is-object-1.0.1"
+      sources."isexe-2.0.0"
+      sources."isurl-1.0.0"
+      sources."json-buffer-3.0.1"
+      sources."jsonfile-4.0.0"
+      sources."keyv-4.0.0"
+      sources."lowercase-keys-2.0.0"
+      sources."mimic-response-2.1.0"
+      sources."normalize-url-4.5.0"
+      sources."npm-conf-1.1.3"
+      sources."once-1.4.0"
+      sources."p-cancelable-2.0.0"
+      sources."p-event-4.1.0"
+      sources."p-finally-1.0.0"
+      sources."p-timeout-2.0.1"
+      sources."pify-3.0.0"
+      sources."proto-list-1.2.4"
+      sources."pump-3.0.0"
+      sources."responselike-2.0.0"
+      sources."safe-buffer-5.2.0"
+      sources."safename-1.0.2"
+      sources."semver-7.1.3"
+      sources."to-readable-stream-2.1.0"
+      sources."tunnel-agent-0.6.0"
+      sources."type-fest-0.10.0"
+      sources."universalify-0.1.2"
+      sources."url-to-options-1.0.1"
+      sources."which-2.0.2"
+      sources."wrappy-1.0.2"
+      sources."yn-4.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Upgrade Elm projects";
+      homepage = "https://github.com/avh4/elm-upgrade#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  elm-verify-examples = nodeEnv.buildNodePackage {
+    name = "elm-verify-examples";
+    packageName = "elm-verify-examples";
+    version = "5.0.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/elm-verify-examples/-/elm-verify-examples-5.0.0.tgz";
+      sha512 = "dAOv+U9hXZ0IRGx19mkpCAdf5rUwoJWlzFmcR2gvOzE/QjZUSlPh3e0IIDAfGUuEF8DjfE5CTe31fNtIkkd2rQ==";
+    };
+    dependencies = [
+      sources."ajv-6.12.0"
+      sources."ansi-regex-4.1.0"
+      sources."ansi-styles-3.2.1"
+      sources."anymatch-3.1.1"
+      sources."asn1-0.2.4"
+      sources."assert-plus-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."aws-sign2-0.7.0"
+      sources."aws4-1.9.1"
+      sources."balanced-match-1.0.0"
+      sources."bcrypt-pbkdf-1.0.2"
+      sources."binary-0.3.0"
+      sources."binary-extensions-2.0.0"
+      sources."binwrap-0.2.2"
+      sources."bluebird-3.7.2"
+      sources."brace-expansion-1.1.11"
+      sources."braces-3.0.2"
+      sources."buffers-0.1.1"
+      sources."camelcase-5.3.1"
+      sources."caseless-0.12.0"
+      sources."chainsaw-0.1.0"
+      sources."chalk-2.4.2"
+      sources."chokidar-3.2.1"
+      sources."chownr-1.1.4"
+      sources."cliui-5.0.0"
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
+      sources."combined-stream-1.0.8"
+      sources."concat-map-0.0.1"
+      sources."core-util-is-1.0.2"
+      (sources."cross-spawn-7.0.0" // {
+        dependencies = [
+          sources."which-1.3.1"
+        ];
+      })
+      sources."dashdash-1.14.1"
+      sources."decamelize-1.2.0"
+      sources."delayed-stream-1.0.0"
+      sources."ecc-jsbn-0.1.2"
+      (sources."elm-test-0.19.1" // {
+        dependencies = [
+          sources."fs-extra-8.1.0"
+          sources."has-flag-4.0.0"
+          sources."supports-color-7.1.0"
+        ];
+      })
+      sources."elmi-to-json-1.2.0"
+      sources."emoji-regex-7.0.3"
+      sources."escape-string-regexp-1.0.5"
+      sources."extend-3.0.2"
+      sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-3.1.1"
+      sources."fast-json-stable-stringify-2.1.0"
+      sources."fill-range-7.0.1"
+      (sources."find-elm-dependencies-2.0.2" // {
+        dependencies = [
+          sources."firstline-1.2.0"
+        ];
+      })
+      sources."find-parent-dir-0.3.0"
+      sources."find-up-3.0.0"
+      sources."firstline-2.0.2"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.3.3"
+      sources."fs-extra-5.0.0"
+      sources."fs-minipass-1.2.7"
+      sources."fs.realpath-1.0.0"
+      sources."fsevents-2.1.2"
+      sources."get-caller-file-2.0.5"
+      sources."getpass-0.1.7"
+      sources."glob-7.1.4"
+      sources."glob-parent-5.1.0"
+      sources."graceful-fs-4.2.3"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.1.3"
+      sources."has-flag-3.0.0"
+      sources."http-signature-1.2.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.4"
+      sources."is-binary-path-2.1.0"
+      sources."is-extglob-2.1.1"
+      sources."is-fullwidth-code-point-2.0.0"
+      sources."is-glob-4.0.1"
+      sources."is-number-7.0.0"
+      sources."is-typedarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."isstream-0.1.2"
+      sources."jsbn-0.1.1"
+      sources."json-schema-0.2.3"
+      sources."json-schema-traverse-0.4.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."jsonfile-4.0.0"
+      sources."jsprim-1.4.1"
+      sources."locate-path-3.0.0"
+      sources."lodash-4.17.15"
+      sources."mime-db-1.43.0"
+      sources."mime-types-2.1.26"
+      sources."minimatch-3.0.4"
+      sources."minimist-1.2.5"
+      sources."minipass-2.9.0"
+      sources."minizlib-1.3.3"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      sources."murmur-hash-js-1.0.0"
+      sources."mustache-3.2.1"
+      sources."nice-try-1.0.5"
+      (sources."node-elm-compiler-5.0.4" // {
+        dependencies = [
+          sources."cross-spawn-6.0.5"
+          sources."path-key-2.0.1"
+          sources."which-1.3.1"
+        ];
+      })
+      sources."normalize-path-3.0.0"
+      sources."oauth-sign-0.9.0"
+      sources."once-1.4.0"
+      sources."p-limit-2.2.2"
+      sources."p-locate-3.0.0"
+      sources."p-try-2.2.0"
+      sources."path-exists-3.0.0"
+      sources."path-is-absolute-1.0.1"
+      sources."path-key-3.1.1"
+      sources."performance-now-2.1.0"
+      sources."picomatch-2.2.1"
+      sources."psl-1.7.0"
+      sources."punycode-2.1.1"
+      sources."qs-6.5.2"
+      sources."readdirp-3.1.3"
+      sources."request-2.88.2"
+      sources."request-promise-4.2.5"
+      sources."request-promise-core-1.1.3"
+      sources."require-directory-2.1.1"
+      sources."require-main-filename-2.0.0"
+      sources."rimraf-2.7.1"
+      sources."safe-buffer-5.2.0"
+      sources."safer-buffer-2.1.2"
+      sources."semver-5.7.1"
+      sources."set-blocking-2.0.0"
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
+      sources."split-1.0.1"
+      sources."sshpk-1.16.1"
+      sources."stealthy-require-1.1.1"
+      sources."string-width-3.1.0"
+      sources."strip-ansi-5.2.0"
+      sources."supports-color-5.5.0"
+      sources."tar-4.4.13"
+      (sources."temp-0.9.0" // {
+        dependencies = [
+          sources."rimraf-2.6.3"
+        ];
+      })
+      sources."through-2.3.8"
+      sources."to-regex-range-5.0.1"
+      sources."tough-cookie-2.5.0"
+      sources."traverse-0.3.9"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."universalify-0.1.2"
+      sources."unzip-stream-0.3.0"
+      sources."uri-js-4.2.2"
+      sources."uuid-3.4.0"
+      sources."verror-1.10.0"
+      sources."which-2.0.1"
+      sources."which-module-2.0.0"
+      sources."wrap-ansi-5.1.0"
+      sources."wrappy-1.0.2"
+      sources."xmlbuilder-13.0.2"
+      sources."y18n-4.0.0"
+      sources."yallist-3.1.1"
+      sources."yargs-13.3.2"
+      sources."yargs-parser-13.1.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Verify examples in Elm doc-comments";
+      license = "BSD-3-Clause";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  elm-xref = nodeEnv.buildNodePackage {
+    name = "elm-xref";
+    packageName = "elm-xref";
+    version = "4.1.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/elm-xref/-/elm-xref-4.1.0.tgz";
+      sha512 = "23nVGYsArS2DZ0RnFq6cKYO49pCjuLULhM+fvBcfA7ZIbKSw5WkDyK9c5hlQEm+JZAPZ43PNcI0yLzTEqaajiA==";
+    };
+    dependencies = [
+      sources."bluebird-3.7.2"
+      sources."compare-versions-3.6.0"
+      sources."core-util-is-1.0.2"
+      sources."fs-extra-6.0.1"
+      sources."graceful-fs-4.2.3"
+      sources."inherits-2.0.4"
+      sources."isarray-1.0.0"
+      sources."jsonfile-4.0.0"
+      sources."klaw-2.1.1"
+      sources."minimist-1.2.5"
+      sources."process-nextick-args-2.0.1"
+      sources."readable-stream-2.3.7"
+      sources."safe-buffer-5.1.2"
+      sources."semver-6.3.0"
+      sources."semver-regex-1.0.0"
+      (sources."semver-sort-0.0.4" // {
+        dependencies = [
+          sources."semver-5.7.1"
+        ];
+      })
+      sources."string_decoder-1.1.1"
+      sources."through2-2.0.5"
+      sources."universalify-0.1.2"
+      sources."util-deprecate-1.0.2"
+      sources."xtend-4.0.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Cross referencing tool for Elm - find usages and unused code";
+      homepage = "https://github.com/zwilias/elm-xref#readme";
+      license = "BSD-3-Clause";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
 }
\ No newline at end of file

From d52fdecab11f0ad50eeb266f9d821fd5c52756d8 Mon Sep 17 00:00:00 2001
From: Marek Fajkus <marek.faj@gmail.com>
Date: Tue, 17 Mar 2020 14:03:25 +0100
Subject: [PATCH 3268/4636] elmPackages.elmi-to-json: 1.2.0 -> 1.3.0

---
 pkgs/development/compilers/elm/packages/elmi-to-json.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/elm/packages/elmi-to-json.nix b/pkgs/development/compilers/elm/packages/elmi-to-json.nix
index 87b02f013f85..eaed18c5297b 100644
--- a/pkgs/development/compilers/elm/packages/elmi-to-json.nix
+++ b/pkgs/development/compilers/elm/packages/elmi-to-json.nix
@@ -5,11 +5,11 @@
 }:
 mkDerivation {
   pname = "elmi-to-json";
-  version = "1.2.0";
+  version = "1.3.0";
   src = fetchgit {
-    url = "https://github.com/stoeffel/elmi-to-json.git";
-    sha256 = "1kxai87h2g0749yq0fkxwk3xaavydraaivhnavbwr62q2hw4wrj7";
-    rev = "af08ceafe742a252f1f1f3c229b0ce3b3e00084d";
+    url = "https://github.com/stoeffel/elmi-to-json";
+    sha256 = "11j56vcyhijkwi9hzggkwwmxlhzhgm67ab2m7kxkhcbbqgpasa8n";
+    rev = "ae40d1aa1e3d6878f2af514e611d44890e7abc1e";
     fetchSubmodules = true;
   };
   isLibrary = true;

From c7e4c3b5a31766a858a44553fb32990554b97f17 Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Tue, 17 Mar 2020 15:34:43 +0100
Subject: [PATCH 3269/4636] nixos/phpfpm: add example to socket

---
 nixos/modules/services/web-servers/phpfpm/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix
index 2c73da103946..3db19c781d03 100644
--- a/nixos/modules/services/web-servers/phpfpm/default.nix
+++ b/nixos/modules/services/web-servers/phpfpm/default.nix
@@ -47,6 +47,7 @@ let
             Path to the unix socket file on which to accept FastCGI requests.
             <note><para>This option is read-only and managed by NixOS.</para></note>
           '';
+          example = "${runtimeDir}/<name>.sock";
         };
 
         listen = mkOption {

From bb9822be798d1ac4f842c9a00cbf9f34f9b41fce Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 17 Mar 2020 16:02:01 +0100
Subject: [PATCH 3270/4636] riot-desktop: 1.5.12 -> 1.5.13

---
 .../networking/instant-messengers/riot/riot-desktop.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
index 122a7e74f863..87342115e1e4 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
@@ -6,12 +6,12 @@
 
 let
   executableName = "riot-desktop";
-  version = "1.5.12";
+  version = "1.5.13";
   riot-web-src = fetchFromGitHub {
     owner = "vector-im";
     repo = "riot-web";
     rev = "v${version}";
-    sha256 = "1qz3n2dlklhbi6rbhv2v769xbr4rcp9s6pm2cc9r33ak6axn4aym";
+    sha256 = "1p2bdqq8yziv3l7kjkwqvi27a8djav7rk3lsipl7dvdjk1926941";
   };
   electron = electron_7;
 

From 09f55f8f17ebb4d9b01c8f8d0563ac9e4fd2a1f2 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 17 Mar 2020 16:02:16 +0100
Subject: [PATCH 3271/4636] riot-web: 1.5.12 -> 1.5.13

---
 .../networking/instant-messengers/riot/riot-web.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index e633f60d9770..1ff55fbb1cb0 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -12,11 +12,11 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "riot-web";
-  version = "1.5.12";
+  version = "1.5.13";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "064zghrsl348ydzngwxhwjn0d0gkkf3nkzq03v5gad2f11qwnwb6";
+    sha256 = "0xghpf9rv7ns5aipc6n517qd9dp50rr93arvx6r36kqhkdyzbfad";
   };
 
   installPhase = ''

From cefe9b2dac487fa8faf5777e89fd7a16371e4ae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 17 Mar 2020 17:12:16 +0100
Subject: [PATCH 3272/4636] add openapi-generator-cli-unstable

---
 .../openapi-generator-cli/unstable.nix        | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/tools/networking/openapi-generator-cli/unstable.nix

diff --git a/pkgs/tools/networking/openapi-generator-cli/unstable.nix b/pkgs/tools/networking/openapi-generator-cli/unstable.nix
new file mode 100644
index 000000000000..01a0ef2242ed
--- /dev/null
+++ b/pkgs/tools/networking/openapi-generator-cli/unstable.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, jre, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  version = "5.0.0-2020-02-04";
+  pname = "openapi-generator-cli";
+
+  jarfilename = "${pname}-${version}.jar";
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  src = fetchurl {
+    url = "https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.0.0-SNAPSHOT/openapi-generator-cli-5.0.0-20200204.091421-37.jar";
+    sha256 = "0swv976fcr2z8g53avr0r706c31xacb2dlnl8b4c8mzmi49byy7k";
+  };
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    install -D "$src" "$out/share/java/${jarfilename}"
+
+    makeWrapper ${jre}/bin/java $out/bin/${pname} \
+      --add-flags "-jar $out/share/java/${jarfilename}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec";
+    homepage = https://github.com/OpenAPITools/openapi-generator;
+    license = licenses.asl20;
+    maintainers = [ maintainers.shou ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 244603e28aaa..85b1d5a23717 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5535,6 +5535,7 @@ in
   onioncircuits = callPackage ../tools/security/onioncircuits { };
 
   openapi-generator-cli = callPackage ../tools/networking/openapi-generator-cli { };
+  openapi-generator-cli-unstable = callPackage ../tools/networking/openapi-generator-cli/unstable.nix { };
 
   opencc = callPackage ../tools/text/opencc { };
 

From 94e8695c2b75ac4a1ad467f09194bd4af244576f Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Tue, 17 Mar 2020 18:33:34 +0100
Subject: [PATCH 3273/4636] plex: 1.18.7.2457 -> 1.18.8.2527

---
 pkgs/servers/plex/raw.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index 666da1363517..d4dd993b3296 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -8,13 +8,13 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.18.7.2457-77cb9455c";
+  version = "1.18.8.2527-740d4c206";
   pname = "plexmediaserver";
 
   # Fetch the source
   src = fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm";
-    sha256 = "1lhsf4qrq77vqj63a6r0gm90nnlqg50b6v24lrpld1aia9akm9f1";
+    sha256 = "05543nkhmp6wq88vz5cnv3cfd5hbd8rqs1rylfy7njgvb0pxl107";
   };
 
   outputs = [ "out" "basedb" ];

From ee9362f880ee445204efbb4b880fd5dfc3b28f30 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 16 Mar 2020 12:58:14 -0700
Subject: [PATCH 3274/4636] pythonPackages.z3c-checkversions: disable python2
 tests

the zope namespace will cause collisions for python2
---
 pkgs/development/python-modules/z3c-checkversions/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/z3c-checkversions/default.nix b/pkgs/development/python-modules/z3c-checkversions/default.nix
index 41b7fb5c5206..cf4f6f7dd146 100644
--- a/pkgs/development/python-modules/z3c-checkversions/default.nix
+++ b/pkgs/development/python-modules/z3c-checkversions/default.nix
@@ -18,6 +18,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ zc_buildout ];
   checkInputs = [ zope_testrunner ];
+  doCheck = !python.pkgs.isPy27;
   checkPhase = ''
     ${python.interpreter} -m zope.testrunner --test-path=src []
   '';

From dcdd232939232d04c1132b4cc242dd3dac44be8c Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Mon, 16 Mar 2020 21:05:52 +0100
Subject: [PATCH 3275/4636] lib/modules: Remove internal _module attribute from
 config

The _module option is added as an internal option set, and it messes up
the results of module evaluations, requiring people to manually filter
_modules out.

If people depend on this, they can still use config._module from inside
the modules, exposing _module as an explicitly declared user option. Or
alternatively with the _module attribute now returned by evalModules.
---
 lib/modules.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index 6cbef5632bd7..48f4c04ed1bf 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -93,7 +93,11 @@ rec {
             res set._definedNames
         else
           res;
-      result = { inherit options config; };
+      result = {
+        inherit options;
+        config = removeAttrs config [ "_module" ];
+        inherit (config) _module;
+      };
     in result;
 
   # collectModules :: (modulesPath: String) -> (modules: [ Module ]) -> (args: Attrs) -> [ Module ]

From 0bce142b1e75263aae68352ff6a9b121b897aa1c Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 17 Mar 2020 19:02:54 +0100
Subject: [PATCH 3276/4636] jwt-cli: 2.5.2 -> 3.0.1

---
 pkgs/tools/security/jwt-cli/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix
index fc40129f6caa..f2314d7a0e87 100644
--- a/pkgs/tools/security/jwt-cli/default.nix
+++ b/pkgs/tools/security/jwt-cli/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "jwt-cli";
-  version = "2.5.2";
+  version = "3.0.1";
 
   src = fetchFromGitHub {
     owner = "mike-engel";
     repo = pname;
     rev = version;
-    sha256 = "1q6dqh8z6mhiksjrhi602cvq31jgc18pfbwf6mlm9gi1grpgm5dl";
+    sha256 = "108pwk0h6zcbfmp0k8rhjxaa9yk8rhb78aaql22x48n11fnjl27i";
   };
 
-  cargoSha256 = "1krsr4a1f5rdba4l0i90yr5s8k8hg1np9n85ingx37gar9ahr1y3";
+  cargoSha256 = "1xh2ylx5fqblhlrs8yhl3zf8kvgrqnwdwmix6yzch9bi5mv5c11w";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 

From 93919c66a844fb7f5cbdfa252f18e40f5bfeab89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCtke-Stetzkamp?= <christian@lkamp.de>
Date: Wed, 4 Mar 2020 16:02:24 +0100
Subject: [PATCH 3277/4636] pythonPackages.wsgitools: init at 0.3.1

---
 .../python-modules/wsgitools/default.nix      | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/wsgitools/default.nix

diff --git a/pkgs/development/python-modules/wsgitools/default.nix b/pkgs/development/python-modules/wsgitools/default.nix
new file mode 100644
index 000000000000..ab6f06abac65
--- /dev/null
+++ b/pkgs/development/python-modules/wsgitools/default.nix
@@ -0,0 +1,28 @@
+{lib
+,buildPythonPackage
+,fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "wsgitools";
+  version = "0.3.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0q6kmrkqf02fgww7z1g9cw8f70fimdzs1bvv9inb7fsk0c3pcf1i";
+  };
+
+  meta = with lib; {
+    maintainers = with maintainers; [ clkamp ];
+    description = "A set of tools working with WSGI";
+    longDescription = ''
+      wsgitools is a set of tools working with WSGI (see PEP 333). It
+      includes classes for filtering content, middlewares for caching,
+      logging and tracebacks as well as two backends for SCGI. Goals
+      in writing it were portability and simplicity.
+    '';
+    homepage = "https://subdivi.de/~helmut/wsgitools/";
+    license = licenses.gpl2Plus;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f7e892378000..40b42fbca78c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6245,6 +6245,8 @@ in {
 
   wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { };
 
+  wsgitools = callPackage ../development/python-modules/wsgitools { };
+
   wurlitzer = callPackage ../development/python-modules/wurlitzer { };
 
   xcaplib = callPackage ../development/python-modules/xcaplib { };

From 403a4b1cedfa816295d133dec9036d2c579b4f33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCtke-Stetzkamp?= <christian@lkamp.de>
Date: Fri, 6 Mar 2020 12:44:34 +0100
Subject: [PATCH 3278/4636] http2tcp: init at 0.5

---
 pkgs/tools/networking/http2tcp/default.nix | 47 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/tools/networking/http2tcp/default.nix

diff --git a/pkgs/tools/networking/http2tcp/default.nix b/pkgs/tools/networking/http2tcp/default.nix
new file mode 100644
index 000000000000..b1f3c704b1fa
--- /dev/null
+++ b/pkgs/tools/networking/http2tcp/default.nix
@@ -0,0 +1,47 @@
+{ lib
+, python3
+, stdenv
+, fetchurl
+}:
+
+stdenv.mkDerivation rec {
+  pname = "http2tcp";
+  version = "0.5";
+
+  src = fetchurl {
+    url = "https://www.linta.de/~aehlig/http2tcp/${pname}-${version}.tar.gz";
+    sha256 = "34fb83c091689dee398ca80db76487e0c39abb17cef390d845ffd888009a5caa";
+  };
+
+  buildInputs = [
+    (python3.withPackages (ps: [
+      ps.wsgitools
+    ]))
+  ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/{bin,share/${pname}}
+    cp http2tcp* $out/bin
+    cp Protocol $out/share/${pname}/
+  '';
+
+  meta = with lib; {
+    maintainers = with maintainers; [ clkamp ];
+    description = "A tool for tunneling TCP connections via HTTP GET requests";
+    longDescription = ''
+      The http2tcp tools allow to tunnel tcp connections (presumably
+      ssh) via syntactically correct http requests. It is designed to
+      work in the presence of so-called "transparent"
+      store-and-forward proxies disallowing POST requests.
+
+      It also turned out to be useful to stabilise connections where
+      the client's internet connection is unreliable (frequent long
+      network outages, rapidly changing IP address, etc).
+    '';
+    homepage = "https://www.linta.de/~aehlig/http2tcp/";
+    license = licenses.bsd3;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85b1d5a23717..6da9dda1e75f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -960,6 +960,8 @@ in
 
   hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { };
 
+  http2tcp = callPackage ../tools/networking/http2tcp { };
+
   httperf = callPackage ../tools/networking/httperf { };
 
   ili2c = callPackage ../tools/misc/ili2c { };

From 34fd0c096844c0599cfdc28ef4b4de00ba69bf42 Mon Sep 17 00:00:00 2001
From: Alma Cemerlic <Alma.Cemerlic@worldquant.com>
Date: Fri, 13 Mar 2020 11:31:28 -0400
Subject: [PATCH 3279/4636] pythonPackages.IMAPClient: 0.13 -> 2.1.0

---
 .../python-modules/imapclient/default.nix     | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/imapclient/default.nix b/pkgs/development/python-modules/imapclient/default.nix
index e45cdb3eab8a..ea9bc4844fad 100644
--- a/pkgs/development/python-modules/imapclient/default.nix
+++ b/pkgs/development/python-modules/imapclient/default.nix
@@ -1,32 +1,35 @@
 { stdenv
 , buildPythonPackage
-, fetchurl
-, isPy34
-, isPy35
+, fetchFromGitHub
 , mock
+, six
 }:
 
 buildPythonPackage rec {
   pname = "IMAPClient";
-  version = "0.13";
-  disabled = isPy34 || isPy35;
+  version = "2.1.0";
 
-  src = fetchurl {
-    url = "https://freshfoo.com/projects/IMAPClient/${pname}-${version}.tar.gz";
-    sha256 = "0v7kd1crdbff0rmh4ddm5qszkis6hpk9084qh94al8h7g4y9l3is";
+  src = fetchFromGitHub {
+    owner = "mjs";
+    repo = "imapclient";
+    rev = version;
+    sha256 = "1zc8qj8ify2zygbz255b6fcg7jhprswf008ccwjmbrnj08kh9l4x";
   };
 
-  buildInputs = [ mock ];
-
-  preConfigure = ''
-    sed -i '/distribute_setup/d' setup.py
-    substituteInPlace setup.py --replace "mock==0.8.0" "mock"
+  # fix test failing in python 36
+  postPatch = ''
+    substituteInPlace tests/test_imapclient.py \
+      --replace "if sys.version_info >= (3, 7):" "if sys.version_info >= (3, 6, 4):"
   '';
 
+  propagatedBuildInputs = [ six ];
+
+  checkInputs = [ mock ];
+
   meta = with stdenv.lib; {
-    homepage = https://imapclient.readthedocs.io/en/2.1.0/;
+    homepage = "https://imapclient.readthedocs.io";
     description = "Easy-to-use, Pythonic and complete IMAP client library";
     license = licenses.bsd3;
+    maintainers = [ maintainers.almac ];
   };
-
 }

From b6a5079800f520c3e30bd285c84d67643c973f42 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 17 Mar 2020 19:34:54 +0100
Subject: [PATCH 3280/4636] inxi: 3.0.37-1 -> 3.0.38-1

---
 pkgs/tools/system/inxi/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix
index 7866bece0661..f5b5d4ef7a2a 100644
--- a/pkgs/tools/system/inxi/default.nix
+++ b/pkgs/tools/system/inxi/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "inxi";
-  version = "3.0.37-1";
+  version = "3.0.38-1";
 
   src = fetchFromGitHub {
     owner = "smxi";
     repo = "inxi";
     rev = version;
-    sha256 = "15wvj9w601ci3bavd1hk5qlm8dfm7a7cjglczk29yir5yw2jww3f";
+    sha256 = "1qw3sxgd3ly916bzzl3873s3flngwd3vh57slw0shsj7ivz8bfnm";
   };
 
   buildInputs = [ perl makeWrapper ];
@@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A full featured CLI system information tool";
-    homepage = https://smxi.org/docs/inxi.htm;
+    homepage = "https://smxi.org/docs/inxi.htm";
+    changelog = "https://github.com/smxi/inxi/blob/${version}/inxi.changelog";
     license = licenses.gpl3Plus;
     platforms = platforms.unix;
     maintainers = with maintainers; [ primeos ];

From 31206e44e128926cb04a6e1c023f07c41541ee7f Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 17 Mar 2020 20:21:10 +0100
Subject: [PATCH 3281/4636] lib/modules: Test the ability for config to depend
 on options for compatibility

---
 lib/tests/modules.sh                            |  5 +++++
 lib/tests/modules/define-option-dependently.nix | 16 ++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 lib/tests/modules/define-option-dependently.nix

diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index 8cd632a439cd..d87f9db0a900 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -185,6 +185,11 @@ checkConfigError 'The option .* defined in .* does not exist' config.enable ./di
 # Check that imports can depend on derivations
 checkConfigOutput "true" config.enable ./import-from-store.nix
 
+# Check that configs can be conditional on option existence
+checkConfigOutput true config.enable ./define-option-dependently.nix ./declare-enable.nix ./declare-int-positive-value.nix
+checkConfigOutput 360 config.value ./define-option-dependently.nix ./declare-enable.nix ./declare-int-positive-value.nix
+checkConfigOutput 7 config.value ./define-option-dependently.nix ./declare-int-positive-value.nix
+
 # Check attrsOf and lazyAttrsOf. Only lazyAttrsOf should be lazy, and only
 # attrsOf should work with conditional definitions
 # In addition, lazyAttrsOf should honor an options emptyValue
diff --git a/lib/tests/modules/define-option-dependently.nix b/lib/tests/modules/define-option-dependently.nix
new file mode 100644
index 000000000000..6abce29366ae
--- /dev/null
+++ b/lib/tests/modules/define-option-dependently.nix
@@ -0,0 +1,16 @@
+{ lib, options, ... }:
+
+# Some modules may be distributed separately and need to adapt to other modules
+# that are distributed and versioned separately.
+{
+
+  # Always defined, but the value depends on the presence of an option.
+  config = {
+    value = if options ? enable then 360 else 7;
+  } 
+  # Only define if possible.
+  // lib.optionalAttrs (options ? enable) {
+    enable = true;
+  };
+
+}

From f22706eef0b9ed605194f91847ff865c8232f0bc Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Tue, 17 Mar 2020 19:24:49 +0000
Subject: [PATCH 3282/4636] maintainers: add raboof

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 993e5c2d46df..4268e1ef4011 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5963,6 +5963,11 @@
       fingerprint = "7573 56D7 79BB B888 773E  415E 736C CDF9 EF51 BD97";
     }];
   };
+  raboof = {
+    email = "arnout@bzzt.net";
+    github = "raboof";
+    name = "Arnout Engelen";
+  };
   rafaelgg = {
     email = "rafael.garcia.gallego@gmail.com";
     github = "rafaelgg";

From b779f1b55cc5da87c251777b6d46277208a79fc9 Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Sun, 15 Mar 2020 20:50:59 +0100
Subject: [PATCH 3283/4636] mopidy-iris: 3.45.1 -> 3.46.0

---
 pkgs/applications/audio/mopidy/iris.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index 2f3e5f64767d..000a0bc0bfe3 100644
--- a/pkgs/applications/audio/mopidy/iris.nix
+++ b/pkgs/applications/audio/mopidy/iris.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "Mopidy-Iris";
-  version = "3.45.1";
+  version = "3.46.0";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "02jmylz76wlwxlv8drndprb7r9l8kqqgjkp17mjx5ngnl545pc2w";
+    sha256 = "0c7b6zbcj4bq5qsxvhjwqclrl1k2hs3wb50pfjbw7gs7m3gm2b7d";
   };
 
   propagatedBuildInputs = [

From c0ef7406f124a1b1c6a954c887f36510ead63d81 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Tue, 17 Mar 2020 19:25:03 +0000
Subject: [PATCH 3284/4636] notion: 3-2019050101 -> 4.0.0

---
 .../window-managers/notion/default.nix             | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix
index 2b9e8237a045..ac4f00f45453 100644
--- a/pkgs/applications/window-managers/notion/default.nix
+++ b/pkgs/applications/window-managers/notion/default.nix
@@ -7,22 +7,22 @@
 
 stdenv.mkDerivation rec{
   pname = "notion";
-  version = "3-2019050101";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "raboof";
     repo = pname;
     rev = version;
-    sha256 = "09kvgqyw0gnj3jhz9gmwq81ak8qy32vyanx1hw79r6m181aysspz";
+    sha256 = "0rqfvwkj0j862hf6i4wsmb6185xibsskfj9kwy896qcpcg8w4kk7";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper groff ];
   buildInputs = [ lua gettext which readline fontconfig libX11 libXext libSM
                   libXinerama libXrandr libXft xlibsWrapper ];
 
-  buildFlags = [ "CC=cc" "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" ];
+  buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" ];
 
-  makeFlags = [ "PREFIX=\${out}" ];
+  makeFlags = [ "NOTION_RELEASE=${version}" "PREFIX=\${out}" ];
 
   postInstall = ''
     wrapProgram $out/bin/notion \
@@ -30,10 +30,10 @@ stdenv.mkDerivation rec{
   '';
 
   meta = with stdenv.lib; {
-    description = "Tiling tabbed window manager, follow-on to the Ion";
-    homepage = "https://notionwm.net/";
+    description = "Tiling tabbed window manager";
+    homepage = "https://notionwm.net";
     license   = licenses.lgpl21;
-    maintainers = with maintainers; [ jfb AndersonTorres ];
+    maintainers = with maintainers; [ jfb AndersonTorres raboof ];
     platforms = platforms.linux;
   };
 }

From ceda3f40636cb85a52095925a7cd7e2a411c01bb Mon Sep 17 00:00:00 2001
From: mehlon <>
Date: Tue, 17 Mar 2020 21:48:32 +0100
Subject: [PATCH 3285/4636] tor-browser-bundle-bin: enable multimedia support
 by default

---
 .../networking/browsers/tor-browser-bundle-bin/default.nix      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index a8a426b61626..a160e9c5b5a5 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -28,7 +28,7 @@
 , apulse
 
 # Media support (implies audio support)
-, mediaSupport ? false
+, mediaSupport ? true
 , ffmpeg
 
 , gmp

From 39621bb8dea088997f001f4ac6fdd00214e07a93 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Tue, 17 Mar 2020 22:12:48 +0100
Subject: [PATCH 3286/4636] nixos/alertmanager: start after the network-online
 target

If the host network stack is slow to start, the alertmanager fails to
start with this error message:

    caller=main.go:256 msg="unable to initialize gossip mesh" err="create memberlist: Failed to get final advertise address: No private IP address found, and explicit IP not provided"

This bug can be reproduced by shutting down the network stack and
restarting the alertmanager.

Note I don't know why I didn't hit this issue with previous
alertmanager releases.
---
 nixos/modules/services/monitoring/prometheus/alertmanager.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
index 4534d150885e..69e3dcf14085 100644
--- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix
+++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
@@ -155,7 +155,7 @@ in {
 
       systemd.services.alertmanager = {
         wantedBy = [ "multi-user.target" ];
-        after    = [ "network.target" ];
+        after    = [ "network-online.target" ];
         preStart = ''
            ${lib.getBin pkgs.envsubst}/bin/envsubst -o "/tmp/alert-manager-substituted.yaml" \
                                                     -i "${alertmanagerYml}"

From 880f5a61251647d7dcb52c04e37062bd23d0202a Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 17 Mar 2020 23:04:10 +0100
Subject: [PATCH 3287/4636] vimPlugins.vim-pandoc: fix startup

---
 pkgs/misc/vim-plugins/overrides.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index e4710e27193c..a8bf2f56b2af 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -112,6 +112,21 @@ self: super: {
     '';
   });
 
+  vim-pandoc = super.vim-pandoc.overrideAttrs(old: {
+    patches = (super.patches or []) ++ [
+      # Fix a failure on startup, which breaks the rplugin manifest generation
+      # https://github.com/vim-pandoc/vim-pandoc/pull/363#issuecomment-599080366
+      (fetchpatch {
+        name = "fix-fdetect.patch";
+        url = "https://github.com/vim-pandoc/vim-pandoc/commit/da4c0b0325c1bfad20f7cfd15abb53943fe22fc4.patch";
+        revert = true;
+        # For some reason that part was already reverted upstream.
+        excludes = ["ftdetect/pandoc.vim"];
+        sha256 = "10nykgsqpxx5hlagk83khjl8p58zx7z3bcryzinv5vv52wlqkq5p";
+      })
+    ];
+  });
+
   clighter8 = super.clighter8.overrideAttrs(old: {
     preFixup = ''
       sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc.lib}/lib/libclang.so')|" \

From cb099ca0d88e79eddbaa9741536e251b4ef870bd Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 18 Mar 2020 08:15:24 +1000
Subject: [PATCH 3288/4636] conmon: 2.0.12 -> 2.0.13

https://github.com/containers/conmon/releases/tag/v2.0.13
---
 pkgs/applications/virtualization/conmon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix
index 293cb91bb0d2..37223b5cb425 100644
--- a/pkgs/applications/virtualization/conmon/default.nix
+++ b/pkgs/applications/virtualization/conmon/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "conmon";
-  version = "2.0.12";
+  version = "2.0.13";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0vf88j582hv6dabmk3pnmbn60pp5w7hja2wmrhqq8wm2y07djhhi";
+    sha256 = "1cp9hhanndr6c71g4hdxfgwk348vnnlgijkr12f7qmd5acwfl7jc";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 12bcd78652f9343114ca106f67568f4210be0c00 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 18 Mar 2020 08:18:26 +1000
Subject: [PATCH 3289/4636] fuse-overlayfs: 0.7.7 -> 0.7.8

https://github.com/containers/fuse-overlayfs/releases/tag/v0.7.8
---
 pkgs/tools/filesystems/fuse-overlayfs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix
index 6debd333c41c..00f893139427 100644
--- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix
+++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, fuse3 }:
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, fuse3 }:
 
 stdenv.mkDerivation rec {
   pname = "fuse-overlayfs";
-  version = "0.7.7";
+  version = "0.7.8";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0fifqa4f79lhklajsf1aiipc4cyykscqlns9pzbcq5hdphi9fbsb";
+    sha256 = "10wsssf9mxgkgcqks3z02y9ya8xh4wd45lsb1jrvw31wmz9zpalc";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   buildInputs = [ fuse3 ];
 

From 9b43cf3a008b3a467f080d61365f037ad81807d0 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 17 Mar 2020 05:26:27 -0500
Subject: [PATCH 3290/4636] yosys: 2020.02.25 -> 2020.03.16

  - Bump `abc-verifier` (2020.03.05)
  - Install `yosys-abc` symlink for tool compatbility
  - Various `yosys` expression cleanups

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../science/logic/abc/default.nix             | 39 ++++++++----------
 pkgs/development/compilers/yosys/default.nix  | 41 ++++++++++---------
 2 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix
index 8551a3ee4ca3..a33cc92c7ce7 100644
--- a/pkgs/applications/science/logic/abc/default.nix
+++ b/pkgs/applications/science/logic/abc/default.nix
@@ -1,35 +1,32 @@
-{ fetchFromGitHub, stdenv, readline, cmake }:
+{ stdenv, fetchFromGitHub
+, readline, cmake
+}:
 
-let
-  rev = "71f2b40320127561175ad60f6f2428f3438e5243";
-in stdenv.mkDerivation {
-  pname = "abc-verifier";
-  version = "2020-01-11";
+stdenv.mkDerivation rec {
+  pname   = "abc-verifier";
+  version = "2020.03.05";
 
   src = fetchFromGitHub {
-    inherit rev;
-    owner = "berkeley-abc";
-    repo = "abc";
-    sha256 = "15sn146ajxql7l1h8rsag5lhn4spwvgjhwzqawfr78snzadw8by3";
+    owner  = "berkeley-abc";
+    repo   = "abc";
+    rev    = "ed90ce20df9c7c4d6e1db5d3f786f9b52e06bab1";
+    sha256 = "01sw67pkrb6wzflkxbkxzwsnli3nvp0yxwp3j1ngb3c0j86ri437";
   };
 
-  passthru.rev = rev;
-
   nativeBuildInputs = [ cmake ];
   buildInputs = [ readline ];
 
   enableParallelBuilding = true;
+  installPhase = "mkdir -p $out/bin && mv abc $out/bin";
 
-  installPhase = ''
-    mkdir -p $out/bin
-    mv abc $out/bin
-  '';
+  # needed by yosys
+  passthru.rev = src.rev;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A tool for squential logic synthesis and formal verification";
-    homepage    = https://people.eecs.berkeley.edu/~alanmi/abc;
-    license     = stdenv.lib.licenses.mit;
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    homepage    = "https://people.eecs.berkeley.edu/~alanmi/abc";
+    license     = licenses.mit;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ thoughtpolice ];
   };
 }
diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index de90a0c0695a..5e26e37b4438 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -14,14 +14,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "yosys";
-  version = "2020.02.25";
+  pname   = "yosys";
+  version = "2020.03.16";
 
   src = fetchFromGitHub {
     owner  = "YosysHQ";
     repo   = "yosys";
-    rev    = "6edca05793197a846bbfb0329e836c87fa5aabb6";
-    sha256 = "1cwps3nsld80bh2b66l8fx3fa2zsx174mw72kqxyihpfdm0m0z1s";
+    rev    = "ed4fa19ba2812c286562baf26bbbcb49afad83bc";
+    sha256 = "1sza5ng0q8dy6p4hks9b2db129xjcid9n6l8aglf2cj5ks82k5nv";
   };
 
   enableParallelBuilding = true;
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     # we have to do this ourselves for some reason...
     (cd misc && ${protobuf}/bin/protoc --cpp_out ../backends/protobuf/ ./yosys.proto)
 
-    if ! grep -q "ABCREV = ${shortAbcRev}" Makefile;then
+    if ! grep -q "ABCREV = ${shortAbcRev}" Makefile; then
       echo "yosys isn't compatible with the provided abc (${shortAbcRev}), failing."
       exit 1
     fi
@@ -60,20 +60,21 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkInputs = [ verilog ];
 
-  meta = {
-    description = "Framework for RTL synthesis tools";
-    longDescription = ''
-      Yosys is a framework for RTL synthesis tools. It currently has
-      extensive Verilog-2005 support and provides a basic set of
-      synthesis algorithms for various application domains.
-      Yosys can be adapted to perform any synthesis job by combining
-      the existing passes (algorithms) using synthesis scripts and
-      adding additional passes as needed by extending the yosys C++
-      code base.
-    '';
-    homepage    = http://www.clifford.at/yosys/;
-    license     = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice emily ];
-    platforms   = stdenv.lib.platforms.all;
+  # Internally, yosys knows to use the specified hardcoded ABCEXTERNAL binary.
+  # But other tools (like mcy or symbiyosys) can't know how yosys was built, so
+  # they just assume that 'yosys-abc' is available -- but it's not installed
+  # when using ABCEXTERNAL
+  #
+  # add a symlink to fake things so that both variants work the same way.
+  postInstall = ''
+    ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Open RTL synthesis framework and tools";
+    homepage    = "http://www.clifford.at/yosys/";
+    license     = licenses.isc;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ shell thoughtpolice emily ];
   };
 }

From 5cd4fd5bc50a5ecca1ff2c19e34790776a1577be Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 17 Mar 2020 05:29:38 -0500
Subject: [PATCH 3291/4636] symbiyosys: 2020.02.08 -> 2020.02.11

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../science/logic/symbiyosys/default.nix             | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix
index 6b41a44a3583..48c48836b06d 100644
--- a/pkgs/applications/science/logic/symbiyosys/default.nix
+++ b/pkgs/applications/science/logic/symbiyosys/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchFromGitHub
 , bash, python3, yosys
-, yices, boolector, aiger, abc-verifier
+, yices, boolector, aiger
 }:
 
 stdenv.mkDerivation {
   pname = "symbiyosys";
-  version = "2020.02.08";
+  version = "2020.02.11";
 
   src = fetchFromGitHub {
     owner  = "YosysHQ";
     repo   = "SymbiYosys";
-    rev    = "500b526131f434b9679732fc89515dbed67c8d7d";
-    sha256 = "1pwbirszc80r288x81nx032snniqgmc80i09bbha2i3zd0c3pj5h";
+    rev    = "0a7013017f9d583ef6cc8d10712f4bf11cf6e024";
+    sha256 = "08xz8sgvs1qy7jxp8ma5yl49i6nl7k6bkhry4afdvwg3fvwis39c";
   };
 
   buildInputs = [ python3 ];
@@ -29,8 +29,8 @@ stdenv.mkDerivation {
       --replace ': "btormc"'       ': "${boolector}/bin/btormc"' \
       --replace ': "yosys"'        ': "${yosys}/bin/yosys"' \
       --replace ': "yosys-smtbmc"' ': "${yosys}/bin/yosys-smtbmc"' \
-      --replace ': "yosys-abc"' ': "${abc-verifier}/bin/abc"' \
-      --replace ': "aigbmc"' ': "${aiger}/bin/aigbmc"' \
+      --replace ': "yosys-abc"'    ': "${yosys}/bin/yosys-abc"' \
+      --replace ': "aigbmc"'       ': "${aiger}/bin/aigbmc"' \
   '';
 
   buildPhase = "true";

From 2ef42e07fd5a178a73da7f67d69e687b48163729 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 17 Mar 2020 06:06:49 -0500
Subject: [PATCH 3292/4636] mcy: 2020.02.05 -> 2020.03.16

Now with working web UI dashboard -- but no working GUI (yet!)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/science/logic/mcy/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/science/logic/mcy/default.nix b/pkgs/applications/science/logic/mcy/default.nix
index 9f239f221b18..ec9af1926318 100644
--- a/pkgs/applications/science/logic/mcy/default.nix
+++ b/pkgs/applications/science/logic/mcy/default.nix
@@ -7,28 +7,31 @@ let
 in
 stdenv.mkDerivation {
   pname = "mcy";
-  version = "2020.02.05";
+  version = "2020.03.16";
 
   src = fetchFromGitHub {
     owner  = "YosysHQ";
     repo   = "mcy";
-    rev    = "83deeddd12d583a89ad4aa1d2147efa4d6adc33c";
-    sha256 = "1i0cabiqr68zflwzc6z894i4n7k6m3hbfck58vzh8zb9jwxwizav";
+    rev    = "562c02375067428bb657f57faa5131ee1ab44051";
+    sha256 = "0q77v2hxnmv61zx5bl4lrqiavgvsiyb5qxdp9hnihimj1m30bc5h";
   };
 
   buildInputs = [ python ];
   patchPhase = ''
     substituteInPlace mcy.py \
       --replace yosys '${yosys}/bin/yosys' \
-      --replace 'os.execvp("mcy-dash"' "os.execvp(\"$out/libexec/mcy/mcy-dash.py\""
+      --replace 'os.execvp("mcy-dash"' "os.execvp(\"$out/bin/mcy-dash\""
+    substituteInPlace mcy-dash.py \
+      --replace 'app.run(debug=True)' 'app.run(host="0.0.0.0",debug=True)'
   '';
 
   # the build needs a bit of work...
   buildPhase = "true";
   installPhase = ''
-    mkdir -p $out/bin $out/libexec/mcy
-    install mcy.py $out/bin/mcy && chmod +x $out/bin/mcy
-    install mcy-dash.py $out/libexec/mcy/mcy-dash.py
+    mkdir -p $out/bin $out/share/mcy/dash
+    install mcy.py      $out/bin/mcy      && chmod +x $out/bin/mcy
+    install mcy-dash.py $out/bin/mcy-dash && chmod +x $out/bin/mcy-dash
+    cp -r dash/. $out/share/mcy/dash/.
   '';
 
   meta = {

From e808d11c431d0b84f3e96c466b318e67bfcd4410 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 17 Mar 2020 23:18:57 +0100
Subject: [PATCH 3293/4636] peep: init at 0.1.4

---
 ...d-Cargo.lock-by-running-cargo-vendor.patch | 570 ++++++++++++++++++
 pkgs/tools/misc/peep/default.nix              |  23 +
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 595 insertions(+)
 create mode 100644 pkgs/tools/misc/peep/0001-Add-Cargo.lock-by-running-cargo-vendor.patch
 create mode 100644 pkgs/tools/misc/peep/default.nix

diff --git a/pkgs/tools/misc/peep/0001-Add-Cargo.lock-by-running-cargo-vendor.patch b/pkgs/tools/misc/peep/0001-Add-Cargo.lock-by-running-cargo-vendor.patch
new file mode 100644
index 000000000000..f444d72c4648
--- /dev/null
+++ b/pkgs/tools/misc/peep/0001-Add-Cargo.lock-by-running-cargo-vendor.patch
@@ -0,0 +1,570 @@
+From 153e9acd6fb50c50db5ebdd03303a42f56ec05e0 Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch <maximilian@mbosch.me>
+Date: Tue, 17 Mar 2020 23:14:36 +0100
+Subject: [PATCH] Add Cargo.lock by running `cargo vendor`
+
+---
+ Cargo.lock | 551 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 551 insertions(+)
+ create mode 100644 Cargo.lock
+
+diff --git a/Cargo.lock b/Cargo.lock
+new file mode 100644
+index 0000000..91f9100
+--- /dev/null
++++ b/Cargo.lock
+@@ -0,0 +1,551 @@
++# This file is automatically @generated by Cargo.
++# It is not intended for manual editing.
++[[package]]
++name = "aho-corasick"
++version = "0.7.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada"
++dependencies = [
++ "memchr",
++]
++
++[[package]]
++name = "autocfg"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
++
++[[package]]
++name = "bitflags"
++version = "1.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
++
++[[package]]
++name = "byteorder"
++version = "1.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
++
++[[package]]
++name = "bytes"
++version = "0.4.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
++dependencies = [
++ "byteorder",
++ "iovec",
++]
++
++[[package]]
++name = "cc"
++version = "1.0.50"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
++
++[[package]]
++name = "cfg-if"
++version = "0.1.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
++
++[[package]]
++name = "cloudabi"
++version = "0.0.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
++dependencies = [
++ "bitflags",
++]
++
++[[package]]
++name = "crossbeam-utils"
++version = "0.7.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
++dependencies = [
++ "autocfg",
++ "cfg-if",
++ "lazy_static",
++]
++
++[[package]]
++name = "ctrlc"
++version = "3.1.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7a4ba686dff9fa4c1c9636ce1010b0cf98ceb421361b0bb3d6faeec43bd217a7"
++dependencies = [
++ "nix 0.17.0",
++ "winapi 0.3.8",
++]
++
++[[package]]
++name = "fnv"
++version = "1.0.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
++
++[[package]]
++name = "fuchsia-zircon"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
++dependencies = [
++ "bitflags",
++ "fuchsia-zircon-sys",
++]
++
++[[package]]
++name = "fuchsia-zircon-sys"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
++
++[[package]]
++name = "futures"
++version = "0.1.29"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef"
++
++[[package]]
++name = "getopts"
++version = "0.2.21"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
++dependencies = [
++ "unicode-width",
++]
++
++[[package]]
++name = "hermit-abi"
++version = "0.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1010591b26bbfe835e9faeabeb11866061cc7dcebffd56ad7d0942d0e61aefd8"
++dependencies = [
++ "libc",
++]
++
++[[package]]
++name = "inotify"
++version = "0.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "40b54539f3910d6f84fbf9a643efd6e3aa6e4f001426c0329576128255994718"
++dependencies = [
++ "bitflags",
++ "futures",
++ "inotify-sys",
++ "libc",
++ "mio",
++ "tokio-io",
++ "tokio-reactor",
++]
++
++[[package]]
++name = "inotify-sys"
++version = "0.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0"
++dependencies = [
++ "libc",
++]
++
++[[package]]
++name = "iovec"
++version = "0.1.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
++dependencies = [
++ "libc",
++]
++
++[[package]]
++name = "kernel32-sys"
++version = "0.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
++dependencies = [
++ "winapi 0.2.8",
++ "winapi-build",
++]
++
++[[package]]
++name = "lazy_static"
++version = "1.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
++
++[[package]]
++name = "libc"
++version = "0.2.68"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0"
++
++[[package]]
++name = "lock_api"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b"
++dependencies = [
++ "scopeguard",
++]
++
++[[package]]
++name = "log"
++version = "0.4.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
++dependencies = [
++ "cfg-if",
++]
++
++[[package]]
++name = "maybe-uninit"
++version = "2.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
++
++[[package]]
++name = "memchr"
++version = "2.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
++
++[[package]]
++name = "mio"
++version = "0.6.21"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f"
++dependencies = [
++ "cfg-if",
++ "fuchsia-zircon",
++ "fuchsia-zircon-sys",
++ "iovec",
++ "kernel32-sys",
++ "libc",
++ "log",
++ "miow",
++ "net2",
++ "slab",
++ "winapi 0.2.8",
++]
++
++[[package]]
++name = "miow"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
++dependencies = [
++ "kernel32-sys",
++ "net2",
++ "winapi 0.2.8",
++ "ws2_32-sys",
++]
++
++[[package]]
++name = "net2"
++version = "0.2.33"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
++dependencies = [
++ "cfg-if",
++ "libc",
++ "winapi 0.3.8",
++]
++
++[[package]]
++name = "nix"
++version = "0.11.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "becb657d662f1cd2ef38c7ad480ec6b8cf9e96b27adb543e594f9cf0f2e6065c"
++dependencies = [
++ "bitflags",
++ "cc",
++ "cfg-if",
++ "libc",
++ "void",
++]
++
++[[package]]
++name = "nix"
++version = "0.17.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363"
++dependencies = [
++ "bitflags",
++ "cc",
++ "cfg-if",
++ "libc",
++ "void",
++]
++
++[[package]]
++name = "num_cpus"
++version = "1.12.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6"
++dependencies = [
++ "hermit-abi",
++ "libc",
++]
++
++[[package]]
++name = "numtoa"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef"
++
++[[package]]
++name = "parking_lot"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
++dependencies = [
++ "lock_api",
++ "parking_lot_core",
++ "rustc_version",
++]
++
++[[package]]
++name = "parking_lot_core"
++version = "0.6.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
++dependencies = [
++ "cfg-if",
++ "cloudabi",
++ "libc",
++ "redox_syscall",
++ "rustc_version",
++ "smallvec",
++ "winapi 0.3.8",
++]
++
++[[package]]
++name = "peep"
++version = "0.1.4"
++dependencies = [
++ "ctrlc",
++ "getopts",
++ "inotify",
++ "libc",
++ "mio",
++ "nix 0.11.1",
++ "regex",
++ "termion",
++ "termios",
++ "unicode-width",
++]
++
++[[package]]
++name = "redox_syscall"
++version = "0.1.56"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
++
++[[package]]
++name = "redox_termios"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
++dependencies = [
++ "redox_syscall",
++]
++
++[[package]]
++name = "regex"
++version = "1.3.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8900ebc1363efa7ea1c399ccc32daed870b4002651e0bed86e72d501ebbe0048"
++dependencies = [
++ "aho-corasick",
++ "memchr",
++ "regex-syntax",
++ "thread_local",
++]
++
++[[package]]
++name = "regex-syntax"
++version = "0.6.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae"
++
++[[package]]
++name = "rustc_version"
++version = "0.2.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
++dependencies = [
++ "semver",
++]
++
++[[package]]
++name = "scopeguard"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
++
++[[package]]
++name = "semver"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
++dependencies = [
++ "semver-parser",
++]
++
++[[package]]
++name = "semver-parser"
++version = "0.7.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
++
++[[package]]
++name = "slab"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
++
++[[package]]
++name = "smallvec"
++version = "0.6.13"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
++dependencies = [
++ "maybe-uninit",
++]
++
++[[package]]
++name = "termion"
++version = "1.5.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c22cec9d8978d906be5ac94bceb5a010d885c626c4c8855721a4dbd20e3ac905"
++dependencies = [
++ "libc",
++ "numtoa",
++ "redox_syscall",
++ "redox_termios",
++]
++
++[[package]]
++name = "termios"
++version = "0.3.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "72b620c5ea021d75a735c943269bb07d30c9b77d6ac6b236bc8b5c496ef05625"
++dependencies = [
++ "libc",
++]
++
++[[package]]
++name = "thread_local"
++version = "1.0.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
++dependencies = [
++ "lazy_static",
++]
++
++[[package]]
++name = "tokio-executor"
++version = "0.1.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671"
++dependencies = [
++ "crossbeam-utils",
++ "futures",
++]
++
++[[package]]
++name = "tokio-io"
++version = "0.1.13"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674"
++dependencies = [
++ "bytes",
++ "futures",
++ "log",
++]
++
++[[package]]
++name = "tokio-reactor"
++version = "0.1.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351"
++dependencies = [
++ "crossbeam-utils",
++ "futures",
++ "lazy_static",
++ "log",
++ "mio",
++ "num_cpus",
++ "parking_lot",
++ "slab",
++ "tokio-executor",
++ "tokio-io",
++ "tokio-sync",
++]
++
++[[package]]
++name = "tokio-sync"
++version = "0.1.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee"
++dependencies = [
++ "fnv",
++ "futures",
++]
++
++[[package]]
++name = "unicode-width"
++version = "0.1.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
++
++[[package]]
++name = "void"
++version = "1.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
++
++[[package]]
++name = "winapi"
++version = "0.2.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
++
++[[package]]
++name = "winapi"
++version = "0.3.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
++dependencies = [
++ "winapi-i686-pc-windows-gnu",
++ "winapi-x86_64-pc-windows-gnu",
++]
++
++[[package]]
++name = "winapi-build"
++version = "0.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
++
++[[package]]
++name = "winapi-i686-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
++
++[[package]]
++name = "winapi-x86_64-pc-windows-gnu"
++version = "0.4.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
++
++[[package]]
++name = "ws2_32-sys"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
++dependencies = [
++ "winapi 0.2.8",
++ "winapi-build",
++]
+-- 
+2.25.0
+
diff --git a/pkgs/tools/misc/peep/default.nix b/pkgs/tools/misc/peep/default.nix
new file mode 100644
index 000000000000..161ea3f75e63
--- /dev/null
+++ b/pkgs/tools/misc/peep/default.nix
@@ -0,0 +1,23 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "peep";
+  version = "0.1.4";
+
+  src = fetchFromGitHub {
+    owner = "ryochack";
+    repo = "peep";
+    rev = "v${version}";
+    sha256 = "0c0fphnhq9vg9jjnkl35k56jbcnyz2ballsnkbm2xrh8vbyvk1av";
+  };
+
+  cargoPatches = [ ./0001-Add-Cargo.lock-by-running-cargo-vendor.patch ];
+  cargoSha256 = "15qc9a4zpnq7lbcaji1mkik93qkx366misczbi1mipiq5w7sgn0l";
+
+  meta = with lib; {
+    description = "The CLI text viewer tool that works like less command on small pane within the terminal window";
+    license = licenses.mit;
+    homepage = "https://github.com/ryochack/peep";
+    maintainers = with maintainers; [ ma27 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4fb24fd00d0f..d1e82c5dc565 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5719,6 +5719,8 @@ in
 
   pazi = callPackage ../tools/misc/pazi { };
 
+  peep = callPackage ../tools/misc/peep { };
+
   pell = callPackage ../applications/misc/pell { };
 
   pepper = callPackage ../tools/admin/salt/pepper { };

From 4a672de9e65e79f6b3bc7e1ffc09f55046b24633 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Tue, 17 Mar 2020 12:00:00 +0000
Subject: [PATCH 3294/4636] python3Packages.matrix-nio: 0.8.0 -> 0.9.0

---
 pkgs/development/python-modules/matrix-nio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix
index f8c1222fb3ff..9320efc91a23 100644
--- a/pkgs/development/python-modules/matrix-nio/default.nix
+++ b/pkgs/development/python-modules/matrix-nio/default.nix
@@ -20,13 +20,13 @@
 
 buildPythonPackage rec {
   pname = "nio";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "poljar";
     repo = "matrix-nio";
     rev = version;
-    sha256 = "151c59a913y6kx99g7g3mhpgbgavwic1mh21nfrr9x0rm98ilay9";
+    sha256 = "0gqhk9d06w1in6dj7aqy45skzyg8018nmclqd5r0m5nnw8yns6gz";
   };
 
   nativeBuildInputs = [

From bfcb19197b117342da2676652fb5e30fe5323890 Mon Sep 17 00:00:00 2001
From: Vladislav Zavialov <vlad.z.4096@gmail.com>
Date: Wed, 18 Mar 2020 02:36:22 +0300
Subject: [PATCH 3295/4636] toggldesktop: use mkDerivation from Qt (#81720)

---
 pkgs/applications/misc/toggldesktop/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/toggldesktop/default.nix b/pkgs/applications/misc/toggldesktop/default.nix
index bf22cb0181da..a0d663efb3cc 100644
--- a/pkgs/applications/misc/toggldesktop/default.nix
+++ b/pkgs/applications/misc/toggldesktop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, buildEnv, makeDesktopItem, runCommand, writeText, pkgconfig
+{ mkDerivation, lib, fetchzip, buildEnv, makeDesktopItem, runCommand, writeText, pkgconfig
 , cmake, qmake, cacert, jsoncpp, libX11, libXScrnSaver, lua, openssl, poco
 , qtbase, qtwebengine, qtx11extras, sqlite }:
 
@@ -11,7 +11,7 @@ let
     sha256 = "01hqkx9dljnhwnyqi6mmzfp02hnbi2j50rsfiasniqrkbi99x9v1";
   };
 
-  bugsnag-qt = stdenv.mkDerivation rec {
+  bugsnag-qt = mkDerivation rec {
     pname = "bugsnag-qt";
     version = "20180522.005732";
 
@@ -24,7 +24,7 @@ let
     buildInputs = [ qtbase ];
   };
 
-  qxtglobalshortcut = stdenv.mkDerivation rec {
+  qxtglobalshortcut = mkDerivation rec {
     pname = "qxtglobalshortcut";
     version = "f584471dada2099ba06c574bdfdd8b078c2e3550";
 
@@ -37,7 +37,7 @@ let
     buildInputs = [ qtbase qtx11extras ];
   };
 
-  qt-oauth-lib = stdenv.mkDerivation rec {
+  qt-oauth-lib = mkDerivation rec {
     pname = "qt-oauth-lib";
     version = "20190125.190943";
 
@@ -62,7 +62,7 @@ let
     mkdir -p $out/lib/pkgconfig && ln -s ${poco-pc} $_/poco.pc
   '';
 
-  libtoggl = stdenv.mkDerivation {
+  libtoggl = mkDerivation {
     name = "libtoggl-${version}";
     inherit src version;
 
@@ -77,7 +77,7 @@ let
     '';
   };
 
-  toggldesktop = stdenv.mkDerivation {
+  toggldesktop = mkDerivation {
     name = "${name}-unwrapped";
     inherit src version;
 
@@ -108,7 +108,7 @@ let
     ];
   };
 
-  toggldesktop-icons = stdenv.mkDerivation {
+  toggldesktop-icons = mkDerivation {
     name = "${name}-icons";
     inherit (toggldesktop) src sourceRoot;
 
@@ -138,7 +138,7 @@ buildEnv {
   inherit name;
   paths = [ desktopItem toggldesktop-icons toggldesktop-wrapped ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Client for Toggl time tracking service";
     homepage = https://github.com/toggl/toggldesktop;
     license = licenses.bsd3;

From e110f5ecc1038ca2769013a6e6ba77321f387dc7 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Tue, 17 Mar 2020 10:32:37 +0900
Subject: [PATCH 3296/4636] nixos/firewall: fix types in reverse path assertion

Broken by 0f973e273c284a97a8dffeab7d9c0b09a88b7139 in #73533

The type of the checkReversePath option allows "strict" and "loose" as
well as boolean values.
---
 nixos/modules/services/networking/firewall.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index b0045ff795e3..cdc3a172ea70 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -546,9 +546,13 @@ in
       options nf_conntrack nf_conntrack_helper=1
     '';
 
-    assertions = [ { assertion = cfg.checkReversePath -> kernelHasRPFilter;
-                     message = "This kernel does not support rpfilter"; }
-                 ];
+    assertions = [
+      # This is approximately "checkReversePath -> kernelHasRPFilter",
+      # but the checkReversePath option can include non-boolean
+      # values.
+      { assertion = cfg.checkReversePath == false || kernelHasRPFilter;
+        message = "This kernel does not support rpfilter"; }
+    ];
 
     systemd.services.firewall = {
       description = "Firewall";

From 15c873b486347e7861c64fb0b5a7852be9fc82e4 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Mon, 16 Mar 2020 21:08:39 +0100
Subject: [PATCH 3297/4636] lib/modules: Throw better error when definitions
 assign to an option set

---
 lib/modules.nix                          | 4 +++-
 lib/tests/modules.sh                     | 4 ++++
 lib/tests/modules/declare-option-set.nix | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 lib/tests/modules/declare-option-set.nix

diff --git a/lib/modules.nix b/lib/modules.nix
index 48f4c04ed1bf..22df89f360ac 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -299,7 +299,9 @@ rec {
             in
               throw "The option `${showOption loc}' in `${firstOption._file}' is a prefix of options in `${firstNonOption._file}'."
           else
-            mergeModules' loc decls defns
+            if all (def: isAttrs def.value) defns' then mergeModules' loc decls defns
+            else let firstInvalid = findFirst (def: ! isAttrs def.value) null defns';
+            in throw "The option path `${showOption loc}' is an attribute set of options, but it is defined to not be an attribute set in `${firstInvalid.file}'. Did you define its value at the correct and complete path?"
       ))
     // { _definedNames = map (m: { inherit (m) file; names = attrNames m.config; }) configs; };
 
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index 8cd632a439cd..0e2fd0bf65d2 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -194,6 +194,10 @@ checkConfigOutput "true" config.conditionalWorks ./declare-attrsOf.nix ./attrsOf
 checkConfigOutput "false" config.conditionalWorks ./declare-lazyAttrsOf.nix ./attrsOf-conditional-check.nix
 checkConfigOutput "empty" config.value.foo ./declare-lazyAttrsOf.nix ./attrsOf-conditional-check.nix
 
+# Check error for when an option set is defined to be a non-attribute set value
+checkConfigError 'The option path .* is an attribute set of options, but it is defined to not be an attribute set in' \
+  config.value ./declare-option-set.nix ./define-value-int-zero.nix
+
 cat <<EOF
 ====== module tests ======
 $pass Pass
diff --git a/lib/tests/modules/declare-option-set.nix b/lib/tests/modules/declare-option-set.nix
new file mode 100644
index 000000000000..fddc650ffa90
--- /dev/null
+++ b/lib/tests/modules/declare-option-set.nix
@@ -0,0 +1,3 @@
+{
+  options.value = {};
+}

From e931de58a2f724c3632b7c8a656fb47489ecc963 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Mon, 16 Mar 2020 21:10:05 +0100
Subject: [PATCH 3298/4636] lib/modules: Fix type checks not being done before
 merging

Co-Authored-By: Robert Hensing <robert@roberthensing.nl>
---
 lib/modules.nix      | 7 +++----
 lib/tests/modules.sh | 4 ++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index 22df89f360ac..518f4047cc60 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -416,10 +416,9 @@ rec {
     # Type-check the remaining definitions, and merge them. Or throw if no definitions.
     mergedValue =
       if isDefined then
-        foldl' (res: def:
-          if type.check def.value then res
-          else throw "The option value `${showOption loc}' in `${def.file}' is not of type `${type.description}'."
-        ) (type.merge loc defsFinal) defsFinal
+        if all (def: type.check def.value) defsFinal then type.merge loc defsFinal
+        else let firstInvalid = findFirst (def: ! type.check def.value) null defsFinal;
+        in throw "The option value `${showOption loc}' in `${firstInvalid.file}' is not of type `${type.description}'."
       else
         # (nixos-option detects this specific error message and gives it special
         # handling.  If changed here, please change it there too.)
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index 0e2fd0bf65d2..7713207dadda 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -198,6 +198,10 @@ checkConfigOutput "empty" config.value.foo ./declare-lazyAttrsOf.nix ./attrsOf-c
 checkConfigError 'The option path .* is an attribute set of options, but it is defined to not be an attribute set in' \
   config.value ./declare-option-set.nix ./define-value-int-zero.nix
 
+# Even with multiple assignments, a type error should be thrown if any of them aren't valid
+checkConfigError 'The option value .* in .* is not of type .*' \
+  config.value ./declare-int-unsigned-value.nix ./define-value-list.nix ./define-value-int-positive.nix
+
 cat <<EOF
 ====== module tests ======
 $pass Pass

From 6e055c9f4a3734e1d1b8e9f55be68e6743bf59d3 Mon Sep 17 00:00:00 2001
From: Martin Baillie <martin@baillie.email>
Date: Sun, 8 Mar 2020 17:47:50 +1100
Subject: [PATCH 3299/4636] tailscale: init at 0.96-33

Signed-off-by: Martin Baillie <martin@baillie.email>
---
 maintainers/maintainer-list.nix               |  6 +++
 nixos/modules/module-list.nix                 |  1 +
 .../modules/services/networking/tailscale.nix | 46 +++++++++++++++++++
 pkgs/servers/tailscale/default.nix            | 35 ++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 5 files changed, 90 insertions(+)
 create mode 100644 nixos/modules/services/networking/tailscale.nix
 create mode 100644 pkgs/servers/tailscale/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 993e5c2d46df..5f90bc8b1520 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4607,6 +4607,12 @@
     githubId = 1269099;
     name = "Marius Bakke";
   };
+  mbaillie = {
+    email = "martin@baillie.email";
+    github = "martinbaillie";
+    githubId = 613740;
+    name = "Martin Baillie";
+  };
   mbbx6spp = {
     email = "me@susanpotter.net";
     github = "mbbx6spp";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 8c6e8766cd9c..1ff5f5ff0c25 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -728,6 +728,7 @@
   ./services/networking/syncthing.nix
   ./services/networking/syncthing-relay.nix
   ./services/networking/syncplay.nix
+  ./services/networking/tailscale.nix
   ./services/networking/tcpcrypt.nix
   ./services/networking/teamspeak3.nix
   ./services/networking/tedicross.nix
diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix
new file mode 100644
index 000000000000..513c42b40117
--- /dev/null
+++ b/nixos/modules/services/networking/tailscale.nix
@@ -0,0 +1,46 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let cfg = config.services.tailscale;
+in {
+  meta.maintainers = with maintainers; [ danderson mbaillie ];
+
+  options.services.tailscale = {
+    enable = mkEnableOption "Tailscale client daemon";
+
+    port = mkOption {
+      type = types.port;
+      default = 41641;
+      description = "The port to listen on for tunnel traffic (0=autoselect).";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.tailscale = {
+      description = "Tailscale client daemon";
+
+      after = [ "network-pre.target" ];
+      wants = [ "network-pre.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      unitConfig = {
+        StartLimitIntervalSec = 0;
+        StartLimitBurst = 0;
+      };
+
+      serviceConfig = {
+        ExecStart =
+          "${pkgs.tailscale}/bin/tailscaled --port ${toString cfg.port}";
+
+        RuntimeDirectory = "tailscale";
+        RuntimeDirectoryMode = 755;
+
+        StateDirectory = "tailscale";
+        StateDirectoryMode = 700;
+
+        Restart = "on-failure";
+      };
+    };
+  };
+}
diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix
new file mode 100644
index 000000000000..52b6f36dd020
--- /dev/null
+++ b/pkgs/servers/tailscale/default.nix
@@ -0,0 +1,35 @@
+{ lib, buildGoModule, fetchFromGitHub, makeWrapper, iptables, iproute }:
+
+buildGoModule rec {
+  pname = "tailscale";
+  version = "0.96-33";
+
+  src = fetchFromGitHub {
+    owner = "tailscale";
+    repo = "tailscale";
+    rev = "19cc4f8b8ecfdc16136d8489a1c2b899f556fda7";
+    sha256 = "0kcf3mz7fs15dm1dnkvrmdkm3agrl1zlg9ngb7cwfmvkkw1rkl6i";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  CGO_ENABLED = 0;
+
+  goPackagePath = "tailscale.com";
+  modSha256 = "1pjqfzw411k6kw8hqf56irnlhnl8947p1ad8yd84zvqqpzfs3jmz";
+  subPackages = [ "cmd/tailscale" "cmd/tailscaled" ];
+
+  postInstall = ''
+    wrapProgram $out/bin/tailscaled --prefix PATH : ${
+      lib.makeBinPath [ iproute iptables ]
+    }
+  '';
+
+  meta = with lib; {
+    homepage = "https://tailscale.com";
+    description = "The node agent for Tailscale, a mesh VPN built on WireGuard";
+    platforms = platforms.linux;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ danderson mbaillie ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7adf2d6f958..a9a2297f5cb6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16024,6 +16024,8 @@ in
 
   syncserver = callPackage ../servers/syncserver { };
 
+  tailscale = callPackage ../servers/tailscale { };
+
   thanos = callPackage ../servers/monitoring/thanos { };
 
   inherit (callPackages ../servers/http/tomcat { })

From 1e593070cdd8953f2c4f661535684d7aa8783441 Mon Sep 17 00:00:00 2001
From: David Anderson <dave@natulte.net>
Date: Tue, 17 Mar 2020 22:52:14 -0700
Subject: [PATCH 3300/4636] tailscale: 0.96-33 -> 0.97-0.

Fixes a severe bug with subnet routing.

Signed-off-by: David Anderson <dave@natulte.net>
---
 pkgs/servers/tailscale/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix
index 52b6f36dd020..2fc08e754b18 100644
--- a/pkgs/servers/tailscale/default.nix
+++ b/pkgs/servers/tailscale/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "tailscale";
-  version = "0.96-33";
+  version = "0.97-0";
 
   src = fetchFromGitHub {
     owner = "tailscale";
     repo = "tailscale";
-    rev = "19cc4f8b8ecfdc16136d8489a1c2b899f556fda7";
-    sha256 = "0kcf3mz7fs15dm1dnkvrmdkm3agrl1zlg9ngb7cwfmvkkw1rkl6i";
+    rev = "dd14b658a2f42a3b4d78682e4f4f82f730262c5c";
+    sha256 = "0ckjqhj99c25h8xgyfkrd19nw5w4a7972nvba9r5faw5micjs02n";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -16,7 +16,7 @@ buildGoModule rec {
   CGO_ENABLED = 0;
 
   goPackagePath = "tailscale.com";
-  modSha256 = "1pjqfzw411k6kw8hqf56irnlhnl8947p1ad8yd84zvqqpzfs3jmz";
+  modSha256 = "0anpakcqz4irwxnm0iwm7wqzh84kv3yxxdvyr38154pbd0ys5pa2";
   subPackages = [ "cmd/tailscale" "cmd/tailscaled" ];
 
   postInstall = ''

From 560036dfc28a77a022d8af32acbe6189113a70d9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Mar 2020 06:42:23 +0000
Subject: [PATCH 3301/4636] gotestsum: 0.4.0 -> 0.4.1

---
 pkgs/development/tools/gotestsum/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix
index 839c12c04af6..45629338d9ea 100644
--- a/pkgs/development/tools/gotestsum/default.nix
+++ b/pkgs/development/tools/gotestsum/default.nix
@@ -2,16 +2,18 @@
 
 buildGoModule rec {
   pname = "gotestsum";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "gotestyourself";
     repo = "gotestsum";
     rev = "v${version}";
-    sha256 = "0y71qr3ss3hgc8c7nmvpwk946xy1jc5d8whsv6y77wb24ncla7n0";
+    sha256 = "1wllcmc2c8ch2ggknhxwgdm6g70ppmxr492kbxvlbwif9p6ms0ci";
   };
 
-  modSha256 = "1dgs643pmcw68yc003zss52hbvsy6hxzwkrhr0qmsqkmzxryb3bn";
+  modSha256 = "08vil1jb7dpkld59b6qhsfh9cx450vbgfaji7777immzsd1azf4m";
+
+  buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/gotestyourself/gotestsum";

From c75398b10a23fe19408026b455b20a1961af3917 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Tue, 17 Mar 2020 22:24:48 +0300
Subject: [PATCH 3302/4636] nixos/fail2ban: disable work fail2ban without
 firewall

---
 nixos/modules/services/security/fail2ban.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix
index cb748c93d24e..976b01fd10ee 100644
--- a/nixos/modules/services/security/fail2ban.nix
+++ b/nixos/modules/services/security/fail2ban.nix
@@ -216,6 +216,10 @@ in
 
   config = mkIf cfg.enable {
 
+    warnings = mkIf (config.networking.firewall.enable == false || config.networking.nftables.enable == false) [
+      "fail2ban can not be used without a firewall"
+    ];
+
     environment.systemPackages = [ cfg.package ];
 
     environment.etc = {

From 08d1c7e4ede3d77c258e9004ef00a7f54dd5c37d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Wed, 18 Mar 2020 08:09:40 +0100
Subject: [PATCH 3303/4636] skypeforlinux: support app indicator

In contrast to e.g. Telegram or Slack, Skype does not show an app
indicator in the GNOME tray. This is quite annoying, since Skype will
continue to run in the background when its main window is closed, but
there is no way to access it.

This change adds libappindicator-gtk3 to the rpath to enable app
indicator support.
---
 .../networking/instant-messengers/skypeforlinux/default.nix    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index 78b7a6d81a2e..1eb25f916695 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, dpkg
 , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome3
-, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg
+, gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg
 , at-spi2-atk, libuuid, at-spi2-core }:
 
 let
@@ -29,6 +29,7 @@ let
     gnome2.GConf
     gdk-pixbuf
     gtk3
+    libappindicator-gtk3
 
     gnome3.gnome-keyring
 

From b6b89f1f0a806d1e34cc7eb5b870a930c9431e42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= <daniel@serbanescu.dk>
Date: Wed, 18 Mar 2020 08:12:58 +0100
Subject: [PATCH 3304/4636] kodi 18.5 -> 18.6.

---
 pkgs/applications/video/kodi/default.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index eef390d30ed8..77a68317b2f7 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -43,15 +43,15 @@ assert vdpauSupport -> libvdpau != null;
 assert useWayland -> wayland != null && wayland-protocols != null && waylandpp != null && libxkbcommon != null;
 
 let
-  kodiReleaseDate = "20191116";
-  kodiVersion = "18.5";
+  kodiReleaseDate = "20200301";
+  kodiVersion = "18.6";
   rel = "Leia";
 
   kodi_src = fetchFromGitHub {
     owner  = "xbmc";
     repo   = "xbmc";
     rev    = "${kodiVersion}-${rel}";
-    sha256 = "0pcrraj1ddzrd296br10yjnaxgb3iym74xzixcakaqhhp00f5hf6";
+    sha256 = "0rwymipn5hljy5xrslzmrljmj6f9wb191wi7gjw20wl6sv44d0bk";
   };
 
   cmakeProto = fetchurl {
@@ -194,15 +194,6 @@ in stdenv.mkDerivation {
       autoconf automake libtool # still needed for some components. Check if that is the case with 19.0
     ] ++ lib.optionals useWayland [ wayland-protocols ];
 
-    patches = [
-      # Adds missing cassert includes, fixing builds. This will be unnecessary
-      # after 18.6 is released (which will contain this patch)
-      (fetchpatch {
-        url = "https://github.com/xbmc/xbmc/commit/d5947e6733fd564edb68df91fd6d389d9fb82319.patch";
-        sha256 = "1shlbsbfba3074wdyhl42vgin6jfzl7sy3zsvxaxkpx8g7my9jn2";
-      })
-    ];
-
     cmakeFlags = [
       "-Dlibdvdcss_URL=${libdvdcss.src}"
       "-Dlibdvdnav_URL=${libdvdnav.src}"

From 50d26d1fdadecf6cd0298bf075ea5baf2eb09880 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Mar 2020 07:20:53 +0000
Subject: [PATCH 3305/4636] ipscan: 3.6.2 -> 3.7.0

---
 pkgs/tools/security/ipscan/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/ipscan/default.nix b/pkgs/tools/security/ipscan/default.nix
index 40546b6f1c33..b55b8b6e3431 100644
--- a/pkgs/tools/security/ipscan/default.nix
+++ b/pkgs/tools/security/ipscan/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ipscan";
-  version = "3.6.2";
+  version = "3.7.0";
 
   src = fetchurl {
     url = "https://github.com/angryip/ipscan/releases/download/${version}/ipscan_${version}_amd64.deb";
-    sha256 = "0wnnnabpj0dsxdijvss5sl9kd4i6rmcq55zbas33xs3c5g305ssk";
+    sha256 = "1g7nh0zl56m9042xqpzim7iydlgiqjw131203f37l4bg0w65mw2q";
   };
 
   sourceRoot = ".";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Fast and friendly network scanner";
-    homepage = https://angryip.org;
+    homepage = "https://angryip.org";
     license = licenses.gpl2;
     platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ kylesferrazza ];

From bb9c16de4bed40c40dfbe0e858db3947afc34496 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 18 Mar 2020 03:21:33 -0400
Subject: [PATCH 3306/4636] latinmodern-math: fix build

---
 pkgs/data/fonts/lm-math/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/lm-math/default.nix b/pkgs/data/fonts/lm-math/default.nix
index 8df851cb9dfb..ac5988d8eb60 100644
--- a/pkgs/data/fonts/lm-math/default.nix
+++ b/pkgs/data/fonts/lm-math/default.nix
@@ -9,8 +9,8 @@ in fetchzip rec {
   postFetch = ''
     mkdir -p $out/share/fonts/opentype/
     mkdir -p $out/share/doc/${name}/
-    unzip -f $downloadedFile otf/*.otf -d $out/share/fonts/opentype/
-    unzip -f $downloadedFile doc/*.txt -d $out/share/doc/${name}/
+    unzip -j $downloadedFile "*/otf/*.otf" -d $out/share/fonts/opentype/
+    unzip -j $downloadedFile "*/doc/*.txt" -d $out/share/doc/${name}/
   '';
   sha256 = "05k145bxgxjh7i9gx1ahigxfpc2v2vwzsy2mc41jvvg51kjr8fnn";
 

From fd867123f642fc818beb4b6847bc7236b8647015 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 17 Mar 2020 22:32:56 -0400
Subject: [PATCH 3307/4636] remove lmmath, rename latinmodern-math to lmmath

---
 .../fonts/{lm-math => lmmath}/default.nix     |  6 ++---
 pkgs/data/fonts/lmodern/lmmath.nix            | 26 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  4 +--
 4 files changed, 5 insertions(+), 32 deletions(-)
 rename pkgs/data/fonts/{lm-math => lmmath}/default.nix (84%)
 delete mode 100644 pkgs/data/fonts/lmodern/lmmath.nix

diff --git a/pkgs/data/fonts/lm-math/default.nix b/pkgs/data/fonts/lmmath/default.nix
similarity index 84%
rename from pkgs/data/fonts/lm-math/default.nix
rename to pkgs/data/fonts/lmmath/default.nix
index ac5988d8eb60..c971a699b2a5 100644
--- a/pkgs/data/fonts/lm-math/default.nix
+++ b/pkgs/data/fonts/lmmath/default.nix
@@ -3,14 +3,14 @@
 let
   version = "1.959";
 in fetchzip rec {
-  name = "latinmodern-math-${version}";
+  name = "lmmath-${version}";
 
   url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip";
   postFetch = ''
     mkdir -p $out/share/fonts/opentype/
-    mkdir -p $out/share/doc/${name}/
+    mkdir -p $out/share/doc/latinmodern-math-${version}/
     unzip -j $downloadedFile "*/otf/*.otf" -d $out/share/fonts/opentype/
-    unzip -j $downloadedFile "*/doc/*.txt" -d $out/share/doc/${name}/
+    unzip -j $downloadedFile "*/doc/*.txt" -d $out/share/doc/latinmodern-math-${version}/
   '';
   sha256 = "05k145bxgxjh7i9gx1ahigxfpc2v2vwzsy2mc41jvvg51kjr8fnn";
 
diff --git a/pkgs/data/fonts/lmodern/lmmath.nix b/pkgs/data/fonts/lmodern/lmmath.nix
deleted file mode 100644
index 679f52002139..000000000000
--- a/pkgs/data/fonts/lmodern/lmmath.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ fetchzip }:
-
-fetchzip {
-  name = "lmmath-0.903";
-
-  url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/lmmath0903otf";
-
-  postFetch = ''
-    unzip $downloadedFile
-
-    mkdir -p $out/texmf-dist/fonts/opentype
-    mkdir -p $out/share/fonts/opentype
-
-    cp *.{OTF,otf} $out/texmf-dist/fonts/opentype/lmmath-regular.otf
-    cp *.{OTF,otf} $out/share/fonts/opentype/lmmath-regular.otf
-
-    ln -s -r $out/texmf* $out/share/
-  '';
-
-  sha256 = "19821d4vbd6z20jzsw24zh0hhwayglhrfw8larg2w6alhdqi7rln";
-
-  meta = {
-    description = "Latin Modern font";
-  };
-}
-
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index af8cbed10613..6cd5581e71cf 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -212,6 +212,7 @@ mapAliases ({
   krename-qt5 = krename; # added 2017-02-18
   keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10
   kvm = qemu_kvm; # added 2018-04-25
+  latinmodern-math = lmmath;
   letsencrypt = certbot; # added 2016-05-16
   libaudit = audit; # added 2018-04-25
   libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1e82c5dc565..4a0a4c30b3fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17756,8 +17756,6 @@ in
 
   kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {};
 
-  latinmodern-math = callPackage ../data/fonts/lm-math {};
-
   lato = callPackage ../data/fonts/lato {};
 
   league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {};
@@ -17792,7 +17790,7 @@ in
 
   libre-franklin = callPackage ../data/fonts/libre-franklin { };
 
-  lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {};
+  lmmath = callPackage ../data/fonts/lmmath {};
 
   lmodern = callPackage ../data/fonts/lmodern { };
 

From cdde5967458c06d73389b6a9667139318f913e16 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 17 Mar 2020 22:45:08 -0400
Subject: [PATCH 3308/4636] satysfi: use packaged Latin Modern fonts

---
 pkgs/tools/typesetting/satysfi/default.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix
index f2d447f66f6e..c355d7b6d986 100644
--- a/pkgs/tools/typesetting/satysfi/default.nix
+++ b/pkgs/tools/typesetting/satysfi/default.nix
@@ -1,16 +1,7 @@
 { stdenv, fetchzip, fetchFromGitHub, ruby, dune, ocamlPackages
-, ipaexfont, junicode
+, ipaexfont, junicode, lmodern, lmmath
 }:
 let
-  lm = fetchzip {
-    url = "http://www.gust.org.pl/projects/e-foundry/latin-modern/download/lm2.004otf.zip";
-    sha256 = "1mc88fbhfd2wki2vr700pgv96smya6d1z783xs3mfy138yb6ga2p";
-    stripRoot = false;
-  };
-  lm-math = fetchzip {
-    url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip";
-    sha256 = "15l3lxjciyjmbh0q6jjvzz16ibk4ij79in9fs47qhrfr2wrddpvs";
-  };
   camlpdf = ocamlPackages.camlpdf.overrideAttrs (o: {
     src = fetchFromGitHub {
       owner = "gfngfn";
@@ -63,8 +54,8 @@ in
     installPhase = ''
       cp -r ${ipaexfont}/share/fonts/opentype/* lib-satysfi/dist/fonts/
       cp -r ${junicode}/share/fonts/junicode-ttf/* lib-satysfi/dist/fonts/
-      cp -r ${lm}/* lib-satysfi/dist/fonts/
-      cp -r ${lm-math}/otf/latinmodern-math.otf lib-satysfi/dist/fonts/
+      cp -r ${lmodern}/share/fonts/opentype/public/lm/* lib-satysfi/dist/fonts/
+      cp -r ${lmmath}/share/fonts/opentype/latinmodern-math.otf lib-satysfi/dist/fonts/
       make install PREFIX=$out LIBDIR=$out/share/satysfi
       mkdir -p $out/share/satysfi/
       cp -r lib-satysfi/dist/ $out/share/satysfi/

From 8c8f717275d6c17f21c0e387e6ec64d7a63bb162 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Mar 2020 07:25:08 +0000
Subject: [PATCH 3309/4636] ivan: 057 -> 058

---
 pkgs/games/ivan/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix
index 8acab2eed0e8..4e8dc5bbbe9f 100644
--- a/pkgs/games/ivan/default.nix
+++ b/pkgs/games/ivan/default.nix
@@ -4,13 +4,13 @@
 stdenv.mkDerivation rec {
 
   pname = "ivan";
-  version = "057";
+  version = "058";
 
   src = fetchFromGitHub {
     owner = "Attnam";
     repo = "ivan";
     rev = "v${version}";
-    sha256 = "0mavmwikfsyr5sp65sl8dqknl1yz7c7ds53y1qkma24vsikz3k64";
+    sha256 = "04jzs8wad2b3g9hvnijr4r89iiw6b1i44zdzkg0dy447lrw6l6xc";
   };
 
   nativeBuildInputs = [ cmake pkgconfig graphicsmagick ];
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
 
       This is a fan continuation of IVAN by members of Attnam.com
     '';
-    homepage = https://attnam.com/;
+    homepage = "https://attnam.com/";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [freepotion];

From 8e44423a9667b7fa8fba3c8b7c05fa379a67389f Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Mon, 16 Mar 2020 00:44:42 -0400
Subject: [PATCH 3310/4636] ocamlPackages.lacaml: 11.0.3 -> 11.0.6

---
 pkgs/development/ocaml-modules/lacaml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lacaml/default.nix b/pkgs/development/ocaml-modules/lacaml/default.nix
index 4b35ce25fde4..e576fa998c2e 100644
--- a/pkgs/development/ocaml-modules/lacaml/default.nix
+++ b/pkgs/development/ocaml-modules/lacaml/default.nix
@@ -4,13 +4,13 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.05.0";
 
 stdenv.mkDerivation rec {
   pname = "ocaml${ocaml.version}-lacaml";
-  version = "11.0.3";
+  version = "11.0.6";
 
   src = fetchFromGitHub {
     owner = "mmottl";
     repo = "lacaml";
     rev = version;
-    sha256 = "1aflg07cc9ak9mg1cr0qr368c9s141glwlarl5nhalf6hhq7ibcb";
+    sha256 = "1vn5441fg45d0ni9x87dhz2x4jrmvg3w7qk3vvcrd436snvh07g0";
   };
 
   buildInputs = [ ocaml findlib dune base stdio ];

From 7f31ed028d92f5263ff0edf6c4443e599ecede3f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Mar 2020 08:00:57 +0000
Subject: [PATCH 3311/4636] libite: 2.1.2 -> 2.2.0

---
 pkgs/development/libraries/libite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix
index 26d7e1e961d4..240636d518c3 100644
--- a/pkgs/development/libraries/libite/default.nix
+++ b/pkgs/development/libraries/libite/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libite";
-  version = "2.1.2";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "libite";
     rev = "v${version}";
-    sha256 = "0pvki6cm3ia27nsd6dljddjgz1bd6avf6c0ppj63fa3sz52lfmga";
+    sha256 = "0kad501mrvn0s0sw9pz5spjq7ymk117hnff249z6026gswrxv1mh";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 9d144b84a339ff38692e4b02b5268be01b2f3e30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 17 Mar 2020 23:44:19 +0000
Subject: [PATCH 3312/4636] kubeval: don't build against schema by default

kubeval-schema is a huge 7GB repository that we do not want
to build on hydra. Therefore make it optional.
---
 .../networking/cluster/kubeval/default.nix    | 25 -------------------
 .../networking/cluster/kubeval/schema.nix     | 15 +++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 17 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/applications/networking/cluster/kubeval/schema.nix

diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix
index 84e9b8899431..54be5956040c 100644
--- a/pkgs/applications/networking/cluster/kubeval/default.nix
+++ b/pkgs/applications/networking/cluster/kubeval/default.nix
@@ -1,26 +1,5 @@
 { stdenv, lib, fetchFromGitHub, buildGoModule, makeWrapper }:
 
-let
-
-  # Cache schema as a package so network calls are not
-  # necessary at runtime, allowing use in package builds
-  schema = stdenv.mkDerivation {
-    name = "kubeval-schema";
-    src = fetchFromGitHub {
-      owner = "instrumenta";
-      repo = "kubernetes-json-schema";
-      rev = "6a498a60dc68c5f6a1cc248f94b5cd1e7241d699";
-      sha256 = "1y9m2ma3n4h7sf2lg788vjw6pkfyi0fa7gzc870faqv326n6x2jr";
-    };
-
-    installPhase = ''
-      mkdir -p $out/kubernetes-json-schema/master
-      cp -R . $out/kubernetes-json-schema/master
-    '';
-   };
-
-in
-
 buildGoModule rec {
   pname = "kubeval";
   version = "0.14.0";
@@ -32,12 +11,8 @@ buildGoModule rec {
     sha256 = "0kpwk7bv36m3i8vavm1pqc8l611c6l9qbagcc64v6r85qig4w5xv";
   };
 
-  buildInputs = [ makeWrapper ];
-
   modSha256 = "0y9x44y3bchi8xg0a6jmp2rmi8dybkl6qlywb6nj1viab1s8dd4y";
 
-  postFixup = "wrapProgram $out/bin/kubeval --set KUBEVAL_SCHEMA_LOCATION file:///${schema}/kubernetes-json-schema/master";
-
   meta = with lib; {
     description = "Validate your Kubernetes configuration files";
     homepage = https://github.com/instrumenta/kubeval;
diff --git a/pkgs/applications/networking/cluster/kubeval/schema.nix b/pkgs/applications/networking/cluster/kubeval/schema.nix
new file mode 100644
index 000000000000..370fe9a1cd82
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kubeval/schema.nix
@@ -0,0 +1,15 @@
+{ fetchFromGitHub }:
+# To cache schema as a package so network calls are not
+# necessary at runtime, allowing use in package builds you can use the following:
+
+#   KUBEVAL_SCHEMA_LOCATION="file:///${kubeval-schema}";
+(fetchFromGitHub {
+  name = "kubeval-schema";
+  owner = "instrumenta";
+  repo = "kubernetes-json-schema";
+  rev = "6a498a60dc68c5f6a1cc248f94b5cd1e7241d699";
+  sha256 = "1y9m2ma3n4h7sf2lg788vjw6pkfyi0fa7gzc870faqv326n6x2jr";
+}) // {
+  # the schema is huge (> 7GB), we don't get any benefit from building int on hydra
+  meta.hydraPlatforms = [];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1e82c5dc565..9b89b51fee55 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20128,6 +20128,8 @@ in
 
   kubeval = callPackage ../applications/networking/cluster/kubeval { };
 
+  kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { };
+
   kubernetes = callPackage ../applications/networking/cluster/kubernetes {
     go = buildPackages.go_1_13;
   };

From 44f3de77d95c6d26e71fcbeaf5dc6dbf36e1ae63 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 18 Mar 2020 04:20:00 -0500
Subject: [PATCH 3313/4636] postgresqlPackages.pg_auto_failover: 1.0.6 -> 1.2

---
 pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
index c872e8bf95d2..257af21cec97 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pg_auto_failover";
-  version = "1.0.6";
+  version = "1.2";
 
   src = fetchFromGitHub {
     owner = "citusdata";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0fli8wxi5f3vyn9cjjqi0a2z4i9npx4nqndx2lqzzx95khqqknp1";
+    sha256 = "128bfxy7aabyvlcrzdi20f51k9xxgynd76f01v6w1314wrjg2r8f";
   };
 
   buildInputs = [ postgresql openssl zlib readline ];

From 97ac11f6a3563c1b50034d1079a208411803ef0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Mar 2020 09:15:14 +0000
Subject: [PATCH 3314/4636] blsd: marked as broken

no longer compatible without libgit version.
Also seems unmaintained since 3 years.
---
 pkgs/tools/misc/blsd/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/blsd/default.nix b/pkgs/tools/misc/blsd/default.nix
index 23bd7ed172c4..1b860fc1b4d5 100644
--- a/pkgs/tools/misc/blsd/default.nix
+++ b/pkgs/tools/misc/blsd/default.nix
@@ -24,5 +24,6 @@ buildGoPackage {
     license = licenses.mit;
     maintainers = [ maintainers.magnetophon ];
     platforms = platforms.unix;
+    broken = true; # since 2020-02-08, libgit2 is incompatible upstream is dead.
   };
 }

From 40b9ba1f96e36616814317130a93fe67b03d1057 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Mar 2020 10:46:36 +0000
Subject: [PATCH 3315/4636] pyznap: 1.4.3 -> 1.5.0

---
 pkgs/tools/backup/pyznap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/pyznap/default.nix b/pkgs/tools/backup/pyznap/default.nix
index 42df651e1a8f..b04aab345320 100644
--- a/pkgs/tools/backup/pyznap/default.nix
+++ b/pkgs/tools/backup/pyznap/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonApplication rec {
   pname = "pyznap";
-  version = "1.4.3";
+  version = "1.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "00xpw6rmkq5cfjfw23mv0917wfzvb5zxj420p6yh0rnl3swh7gi8";
+    sha256 = "0s8glb6kbwwha6zgzfrf195r1qkrv1a9wagyhhm3kryv7c88mqnp";
   };
 
   propagatedBuildInputs = [

From 3c54b996ca1663f3bcff7d8e49349c4510e85563 Mon Sep 17 00:00:00 2001
From: LeshaInc <includeurl@gmail.com>
Date: Mon, 16 Mar 2020 19:18:58 +0200
Subject: [PATCH 3316/4636] blender: build with OpenImageDenoise support

---
 pkgs/applications/misc/blender/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 338a5249aebb..e27aca4fc3d1 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -1,7 +1,7 @@
 { config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew
 , ilmbase, libXi, libX11, libXext, libXrender
 , libjpeg, libpng, libsamplerate, libsndfile
-, libtiff, libGLU, libGL, openal, opencolorio, openexr, openimageio2, openjpeg, python3Packages
+, libtiff, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python3Packages
 , openvdb, libXxf86vm, tbb, alembic
 , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath
 , jackaudioSupport ? false, libjack2
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ boost ffmpeg gettext glew ilmbase
       freetype libjpeg libpng libsamplerate libsndfile libtiff
-      opencolorio openexr openimageio2 openjpeg python zlib fftw jemalloc
+      opencolorio openexr openimagedenoise openimageio2 openjpeg python zlib fftw jemalloc
       alembic
       (opensubdiv.override { inherit cudaSupport; })
       tbb

From 060a9227c24639ca5a339fbb57b8e05a5eabb92e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 17 Mar 2020 16:27:27 +0000
Subject: [PATCH 3317/4636] buildGoModule: enable strictDeps

This will improve cross compiling in the long run.
See also https://github.com/NixOS/nixpkgs/pull/82786
---
 pkgs/development/go-modules/generic/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 1bf13c18821e..42b446b9fa86 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -208,6 +208,8 @@ let
       find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true
     '';
 
+    strictDeps = true;
+
     disallowedReferences = lib.optional (!allowGoReference) go;
 
     passthru = passthru // { inherit go go-modules modSha256; };

From 72f3f99907aae9d2b42551b0090673ddbabaab33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 17 Mar 2020 17:42:22 +0000
Subject: [PATCH 3318/4636] magnetico: move go-bindata to nativeBuildInputs

fixes strictDeps
---
 pkgs/applications/networking/p2p/magnetico/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/pkgs/applications/networking/p2p/magnetico/default.nix
index 94720f35504b..efab9aa992a0 100644
--- a/pkgs/applications/networking/p2p/magnetico/default.nix
+++ b/pkgs/applications/networking/p2p/magnetico/default.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
 
   modSha256 = "1h9fij8mxlxfw7kxix00n10fkhkvmf8529fxbk1n30cxc1bs2szf";
 
-  buildInputs = [ go-bindata ];
+  nativeBuildInputs = [ go-bindata ];
   buildPhase = ''
     make magneticow magneticod
   '';

From e63be529708199f58984b4add377110343892a87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 17 Mar 2020 17:42:54 +0000
Subject: [PATCH 3319/4636] gvisor: remove unneeded go-bindata

---
 pkgs/applications/virtualization/gvisor/containerd-shim.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/gvisor/containerd-shim.nix b/pkgs/applications/virtualization/gvisor/containerd-shim.nix
index 0161a117def3..d30897df79e9 100644
--- a/pkgs/applications/virtualization/gvisor/containerd-shim.nix
+++ b/pkgs/applications/virtualization/gvisor/containerd-shim.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildGoModule, go-bindata }:
+{ lib, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   name = "gvisor-containerd-shim-${version}";

From f288afefc10773011ec188145f9c35bf77c3dde2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 17 Mar 2020 17:43:26 +0000
Subject: [PATCH 3320/4636] documize-community: fix strict deps build

---
 pkgs/servers/documize-community/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix
index 0607902295a8..7780d900badf 100644
--- a/pkgs/servers/documize-community/default.nix
+++ b/pkgs/servers/documize-community/default.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
 
   modSha256 = "1z0v7n8klaxcqv7mvzf3jzgrp78zb4yiibx899ppk6i5qnj4xiv0";
 
-  buildInputs = [ go-bindata-assetfs go-bindata ];
+  nativeBuildInputs = [ go-bindata go-bindata-assetfs ];
 
   subPackages = [ "edition/community.go" ];
 

From f545f92f726fe9aa674682f86edf40ab88cade50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 17 Mar 2020 17:43:54 +0000
Subject: [PATCH 3321/4636] imgproxy: fix strict deps build

---
 pkgs/servers/imgproxy/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix
index be78e1aa8316..4cdfddcff6f4 100644
--- a/pkgs/servers/imgproxy/default.nix
+++ b/pkgs/servers/imgproxy/default.nix
@@ -13,11 +13,9 @@ buildGoModule rec {
 
   modSha256 = "0kgd8lwcdns3skvd4bj4z85mq6hkk79mb0zzwky0wqxni8f73s6w";
 
-  buildInputs = [
-    gobject-introspection
-    pkg-config
-    vips
-  ];
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ gobject-introspection vips ];
 
   preBuild = ''
     export CGO_LDFLAGS_ALLOW='-(s|w)'

From b5144456ccb57b48a48173bf04277217b7f9aa50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 17 Mar 2020 17:50:41 +0000
Subject: [PATCH 3322/4636] aerc: fix strict deps build

---
 pkgs/applications/networking/mailreaders/aerc/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix
index 0fa30a85d1b6..7b24ed93406e 100644
--- a/pkgs/applications/networking/mailreaders/aerc/default.nix
+++ b/pkgs/applications/networking/mailreaders/aerc/default.nix
@@ -17,10 +17,8 @@ in buildGoModule rec {
   modSha256 = "127xrah6xxrvc224g5dxn432sagrssx8v7phzapcsdajsnmagq6x";
 
   nativeBuildInputs = [
-    go
     scdoc
     python3.pkgs.wrapPython
-    notmuch
   ];
 
   patches = [
@@ -31,7 +29,7 @@ in buildGoModule rec {
     python3.pkgs.colorama
   ];
 
-  buildInputs = [ python3 perl ];
+  buildInputs = [ python3 notmuch ];
 
   GOFLAGS="-tags=notmuch";
 

From ae08790703b48fde1f6f384ec3bc03c0e64ab2bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Mar 2020 10:43:09 +0000
Subject: [PATCH 3323/4636] teleport: fix build with strict deps

---
 pkgs/servers/teleport/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix
index dc92a10fe24d..1e1c0f938dbe 100644
--- a/pkgs/servers/teleport/default.nix
+++ b/pkgs/servers/teleport/default.nix
@@ -14,8 +14,11 @@ buildGoPackage rec {
   };
 
   goPackagePath = "github.com/gravitational/teleport";
+
   subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ];
-  buildInputs = [ zip ];
+
+  nativeBuildInputs = [ zip ];
+
   postBuild = ''
     pushd .
     cd $NIX_BUILD_TOP/go/src/github.com/gravitational/teleport
@@ -27,7 +30,7 @@ buildGoPackage rec {
     cd $NIX_BUILD_TOP/go/bin
     zip -q -A teleport
     popd
-    '';
+  '';
 
   dontStrip = true;
 

From ea871809844410e2a64169094cc63895ed8a2228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Mar 2020 10:43:51 +0000
Subject: [PATCH 3324/4636] openshift: fix build with strict deps

---
 pkgs/applications/networking/cluster/openshift/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix
index 3b96ef4ea45e..fb88dfdbb643 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -33,7 +33,9 @@ in buildGoPackage rec {
 
   goPackagePath = "github.com/openshift/origin";
 
-  buildInputs = [ which rsync go-bindata kerberos clang ];
+  buildInputs = [ kerberos ];
+
+  nativeBuildInputs = [ which rsync go-bindata clang ];
 
   patchPhase = ''
     patchShebangs ./hack

From 243ec842aa1a9c9e8fd000cc5b9ccf1a2bb07c71 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 18 Mar 2020 22:16:27 +1000
Subject: [PATCH 3325/4636] buildah: 1.14.2 -> 1.14.3

https://github.com/containers/buildah/releases/tag/v1.14.3
---
 pkgs/development/tools/buildah/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index 55e0dc790ed3..f48aa35852b0 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -4,13 +4,13 @@
 
 buildGoPackage rec {
   pname = "buildah";
-  version = "1.14.2";
+  version = "1.14.3";
 
   src = fetchFromGitHub {
     owner  = "containers";
     repo   = "buildah";
     rev    = "v${version}";
-    sha256 = "1475k8h1l8rbbs6hyq9gxksh9884l1674z77fmiyr5vzql5yf7ca";
+    sha256 = "1qghlba8396gj9dfih8hg249gzwx0gpw9cysdw2vh8z52jhi5sx9";
   };
 
   outputs = [ "bin" "man" "out" ];

From bdd33bc3aa114a0218af7c68a7cb4571582ad996 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Wed, 18 Mar 2020 08:22:11 -0400
Subject: [PATCH 3326/4636] rsyslog: remove libksi from default build because
 it is broken

---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da01b5135e90..4e362e356a95 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2167,6 +2167,7 @@ in
 
   rsyslog = callPackage ../tools/system/rsyslog {
     hadoop = null; # Currently Broken
+    libksi = null; # Currently Broken
   };
 
   rsyslog-light = rsyslog.override {

From a17aab35584eb9ad19c76f4b129ff69e3d1448d6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Mar 2020 12:54:02 +0000
Subject: [PATCH 3327/4636] yder: 1.4.9 -> 1.4.10

---
 pkgs/development/libraries/yder/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/yder/default.nix b/pkgs/development/libraries/yder/default.nix
index 924a06e9551d..11eda01a76a8 100644
--- a/pkgs/development/libraries/yder/default.nix
+++ b/pkgs/development/libraries/yder/default.nix
@@ -4,13 +4,13 @@
 assert withSystemd -> systemd != null;
 stdenv.mkDerivation rec {
   pname = "yder";
-  version = "1.4.9";
+  version = "1.4.10";
 
   src = fetchFromGitHub {
     owner = "babelouest";
     repo = pname;
     rev = "v${version}";
-    sha256 = "06kxkq8ydgbb6b827hkvmaqd0irpal0n4hm96r3inq1bigz9gnvx";
+    sha256 = "1m1aw4im1vvddkl7mknq0h0nj0x2zpql3r17lxhw4mmib05zbdgj";
   };
 
   patches = [

From a99565139fb29eb2ba164bc2bd1ff344348dda4b Mon Sep 17 00:00:00 2001
From: Suwon Park <35622998+sepiabrown@users.noreply.github.com>
Date: Wed, 18 Mar 2020 23:03:17 +0900
Subject: [PATCH 3328/4636] glib-networking for TLS/SSL network (https://) in
 xwidget

https://github.com/NixOS/nixpkgs/commit/ea5bcb78c2cc4dd7ed0ef58c21a962c9ffbd64cb#r31513119
He accidently errased the glib-networking.
But it is needed for TLS/SSL networking.
---
 pkgs/applications/editors/emacs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index 1ab22a73c635..b6e9a4588b54 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -7,7 +7,7 @@
 , withNS ? stdenv.isDarwin
 , withGTK2 ? false, gtk2-x11 ? null
 , withGTK3 ? true, gtk3-x11 ? null, gsettings-desktop-schemas ? null
-, withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null
+, withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null
 , withCsrc ? true
 , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
 , siteStart ? ./site-start.el
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
     ++ lib.optional (withX && withGTK2) gtk2-x11
     ++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ]
     ++ lib.optional (stdenv.isDarwin && withX) cairo
-    ++ lib.optionals (withX && withXwidgets) [ webkitgtk ]
+    ++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ];
     ++ lib.optionals withNS [ AppKit GSS ImageIO ];
 
   hardeningDisable = [ "format" ];

From 0d09b7025bc6a3299b7dd745ce38ba694c3b5569 Mon Sep 17 00:00:00 2001
From: Suwon Park <35622998+sepiabrown@users.noreply.github.com>
Date: Wed, 18 Mar 2020 23:20:28 +0900
Subject: [PATCH 3329/4636] accidently added semicolon

Oops
---
 pkgs/applications/editors/emacs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index b6e9a4588b54..2b40eb77e2cf 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
     ++ lib.optional (withX && withGTK2) gtk2-x11
     ++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ]
     ++ lib.optional (stdenv.isDarwin && withX) cairo
-    ++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ];
+    ++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ]
     ++ lib.optionals withNS [ AppKit GSS ImageIO ];
 
   hardeningDisable = [ "format" ];

From 92f08e07af3bfc3d5334160adef2622a85c75d5e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Mar 2020 14:31:01 +0000
Subject: [PATCH 3330/4636] amass: 3.4.4 -> 3.5.0

---
 pkgs/tools/networking/amass/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix
index a79540eaeca9..548f6cfe7898 100644
--- a/pkgs/tools/networking/amass/default.nix
+++ b/pkgs/tools/networking/amass/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "amass";
-  version = "3.4.4";
+  version = "3.5.0";
 
   src = fetchFromGitHub {
     owner = "OWASP";
     repo = "Amass";
     rev = "v${version}";
-    sha256 = "1qr9cd22m6w5r32bsvg08bmvyvzz7agaklrghf8n1d23ijj1563p";
+    sha256 = "12xd5ig7d69ryflsl0vr0hab4rr10dxxdk3rlbl20am9zrfyz4x4";
   };
 
-  modSha256 = "00pd0xi0m3w4xqdqq7ldqcpirq9plln45nhpjrsp5r9bz7yc5wn9";
+  modSha256 = "1nahmgzd2akkr0zb80k6s1lz2s1fkggvilwi6bnafwqlaw0qxwcl";
 
   outputs = [ "out" "wordlists" ];
 

From 692b8900046f2c25a64472b56f0df62ff9004aba Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 18 Mar 2020 09:31:01 -0500
Subject: [PATCH 3331/4636] amass: enable on darwin

---
 pkgs/tools/networking/amass/default.nix | 7 +++++--
 pkgs/top-level/all-packages.nix         | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix
index 548f6cfe7898..bb3744d83342 100644
--- a/pkgs/tools/networking/amass/default.nix
+++ b/pkgs/tools/networking/amass/default.nix
@@ -1,6 +1,7 @@
 { buildGoModule
 , fetchFromGitHub
-, lib
+, stdenv
+, Security
 }:
 
 buildGoModule rec {
@@ -18,13 +19,15 @@ buildGoModule rec {
 
   outputs = [ "out" "wordlists" ];
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   postInstall = ''
     mkdir -p $wordlists
     cp -R $src/examples/wordlists/*.txt $wordlists
     gzip $wordlists/*.txt
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "In-Depth DNS Enumeration and Network Mapping";
     longDescription = ''
       The OWASP Amass tool suite obtains subdomain names by scraping data
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c30bc270ad47..d8ae6648f534 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -563,7 +563,9 @@ in
 
   acme-client = callPackage ../tools/networking/acme-client { inherit (darwin) apple_sdk; };
 
-  amass = callPackage ../tools/networking/amass { };
+  amass = callPackage ../tools/networking/amass {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   afew = callPackage ../applications/networking/mailreaders/afew { };
 

From 5966be5e229d2f355f92091a8ef5bc78512b0c1c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 18 Mar 2020 09:32:01 -0500
Subject: [PATCH 3332/4636] amass: 3.5.0 -> 3.5.1

---
 pkgs/tools/networking/amass/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix
index bb3744d83342..348104e95913 100644
--- a/pkgs/tools/networking/amass/default.nix
+++ b/pkgs/tools/networking/amass/default.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "amass";
-  version = "3.5.0";
+  version = "3.5.1";
 
   src = fetchFromGitHub {
     owner = "OWASP";
     repo = "Amass";
     rev = "v${version}";
-    sha256 = "12xd5ig7d69ryflsl0vr0hab4rr10dxxdk3rlbl20am9zrfyz4x4";
+    sha256 = "1lir0j6av5zl1jb3513cf7mlrydgnsvy0chn5ihg1fvbdiv5lww9";
   };
 
   modSha256 = "1nahmgzd2akkr0zb80k6s1lz2s1fkggvilwi6bnafwqlaw0qxwcl";

From 3f26a1c9611e1c5b9a3bf9d9b8709ddde962f647 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Mar 2020 15:03:36 +0000
Subject: [PATCH 3333/4636] cgal_5: 5.0.1 -> 5.0.2

---
 pkgs/development/libraries/CGAL/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index b3ae8c7aa31c..16a643e2a7ff 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }:
 
 stdenv.mkDerivation rec {
-  version = "5.0.1";
+  version = "5.0.2";
   name = "cgal-" + version;
 
   src = fetchFromGitHub {
     owner = "CGAL";
     repo = "releases";
     rev = "CGAL-${version}";
-    sha256 = "0mmz7kdpzs7xf40qypn4qyka4nq2dykz9sdkimfgpdka9l7lrfwv";
+    sha256 = "0w97knzw85mljrmns8fxjqinx0fqwls9g91mk434ryf6ciy6yign";
   };
 
   # note: optional component libCGAL_ImageIO would need zlib and opengl;

From d2e24da576bc7484d035f4c0aa5eb0dea3dac919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Mon, 20 Jan 2020 19:09:34 +0100
Subject: [PATCH 3334/4636] cinnamon.muffin: init at 4.4.2

---
 pkgs/desktops/cinnamon/default.nix        |   1 +
 pkgs/desktops/cinnamon/muffin/default.nix | 115 ++++++++++++++++++++++
 2 files changed, 116 insertions(+)
 create mode 100644 pkgs/desktops/cinnamon/muffin/default.nix

diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index b077ad184769..7aff8768134b 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -7,5 +7,6 @@ lib.makeScope pkgs.newScope (self: with self; {
   cinnamon-settings-daemon = callPackage ./cinnamon-settings-daemon { };
   cjs = callPackage ./cjs { };
   nemo = callPackage ./nemo { };
+  muffin = callPackage ./muffin { };
   xapps = callPackage ./xapps { };
 })
diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix
new file mode 100644
index 000000000000..2913d4761ff8
--- /dev/null
+++ b/pkgs/desktops/cinnamon/muffin/default.nix
@@ -0,0 +1,115 @@
+{ fetchFromGitHub
+, cinnamon-desktop
+, glib
+, file
+, gnome3
+, gnome-doc-utils
+, fetchpatch
+, gobject-introspection
+, gtk3
+, intltool
+, json-glib
+, libinput
+, libstartup_notification
+, libXtst
+, libxkbcommon
+, pkgconfig
+, stdenv
+, udev
+, xorg
+, wrapGAppsHook
+, pango
+, cairo
+, gtk-doc
+, docbook_xsl
+, docbook_xml_dtd_43
+, docbook_xml_dtd_42
+, docbook_xml_dtd_412
+, autoconf
+, automake
+, gettext
+, libtool
+}:
+
+# it's a frankensteins monster with some cinnamon sparkles added on top of it
+
+stdenv.mkDerivation rec {
+  pname = "muffin";
+  version = "4.4.2";
+
+  src = fetchFromGitHub {
+    owner = "linuxmint";
+    repo = pname;
+    rev = version;
+    sha256 = "1kzjw4a5p69j8x55vpbpn6gy8pkbbyii6kzw2nzbypmipgnnijw8";
+  };
+
+  patches = [
+    # backport patch that disables wayland components via build flags
+    # https://github.com/linuxmint/muffin/pull/548#issuecomment-578316820
+    (fetchpatch {
+      url = "https://github.com/linuxmint/muffin/commit/f78bf5b309b3d306848f47cc241b31e9399999a7.patch";
+      sha256 = "1c79aa9w2v23xlz86x3l42pavwrqx5d6nmfd9nms29hjsk8mpf4i";
+    })
+    # mute some warnings that caused build failures
+    # https://github.com/linuxmint/muffin/issues/535#issuecomment-536917143
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/muffin/raw/6b0af3a22173e374804371a1cca74e23d696dd37/f/0001-fix-warnings-when-compiling.patch";
+      sha256 = "15wdbn3afn3103v7rq1icp8n0vqqwrrya03h0g2rzqlrsc7wrvzw";
+    })
+  ];
+
+  buildInputs = [
+    gtk3
+    glib
+    pango
+    cairo
+    json-glib
+    cinnamon-desktop
+    xorg.libXcomposite
+    xorg.libXcursor
+    xorg.libXdamage
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXi
+    xorg.libxkbfile
+    xorg.xkeyboardconfig
+
+    libxkbcommon
+    gnome3.zenity
+    libinput
+    libstartup_notification
+    libXtst
+    udev
+    gobject-introspection
+  ];
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+    gettext
+    libtool
+    wrapGAppsHook
+    pkgconfig
+    intltool
+
+    gnome-doc-utils
+    gtk-doc
+    docbook_xsl
+    docbook_xml_dtd_43
+    docbook_xml_dtd_42
+    docbook_xml_dtd_412
+  ];
+
+  preConfigure = ''
+    NOCONFIGURE=1 ./autogen.sh
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/linuxmint/muffin";
+    description = "The window management library for the Cinnamon desktop (libmuffin) and its sample WM binary (muffin)";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.mkg20001 ];
+  };
+}

From 2fe09ed2bfdace786e5a8f4d94050c0e76d89af3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Mar 2020 17:14:30 +0000
Subject: [PATCH 3335/4636] eventstore: 5.0.6 -> 5.0.7

---
 pkgs/servers/nosql/eventstore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix
index 90dd16417465..d1f4938197ca 100644
--- a/pkgs/servers/nosql/eventstore/default.nix
+++ b/pkgs/servers/nosql/eventstore/default.nix
@@ -16,13 +16,13 @@ in
 stdenv.mkDerivation rec {
 
   pname = "EventStore";
-  version = "5.0.6";
+  version = "5.0.7";
 
   src = fetchFromGitHub {
     owner = "EventStore";
     repo = "EventStore";
     rev = "oss-v${version}";
-    sha256 = "0jlyyqs1z2xrw0dkai2k2zr3dsdbdsvmhx81qa92k7ga9hv04sqj";
+    sha256 = "0yvprql73g4lc88b6kp1kk8h64az2hn4am5hc4gyiaxfavaww3ci";
   };
 
   buildInputs = [

From e1913326c07861567225315b68b59ce3ace81201 Mon Sep 17 00:00:00 2001
From: Kyle Sferrazza <kyle.sferrazza@gmail.com>
Date: Wed, 18 Mar 2020 13:27:09 -0400
Subject: [PATCH 3336/4636] ipscan: use 'any' deb

---
 pkgs/tools/security/ipscan/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/ipscan/default.nix b/pkgs/tools/security/ipscan/default.nix
index b55b8b6e3431..642b7d80305a 100644
--- a/pkgs/tools/security/ipscan/default.nix
+++ b/pkgs/tools/security/ipscan/default.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation rec {
   version = "3.7.0";
 
   src = fetchurl {
-    url = "https://github.com/angryip/ipscan/releases/download/${version}/ipscan_${version}_amd64.deb";
-    sha256 = "1g7nh0zl56m9042xqpzim7iydlgiqjw131203f37l4bg0w65mw2q";
+    url = "https://github.com/angryip/ipscan/releases/download/${version}/ipscan_${version}_all.deb";
+    sha256 = "1dbralnbi5q5v6a5nbs64ihvs20fkm3cddsbakck5fbqdm5by7k7";
   };
 
   sourceRoot = ".";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/share
-    cp usr/lib/ipscan/ipscan-linux64-${version}.jar $out/share/${pname}-${version}.jar
+    cp usr/lib/ipscan/ipscan-any-${version}.jar $out/share/${pname}-${version}.jar
 
     makeWrapper ${jre}/bin/java $out/bin/ipscan \
       --prefix LD_LIBRARY_PATH : "$out/lib/:${stdenv.lib.makeLibraryPath [ swt xorg.libXtst ]}" \

From 4da307759cd0e5ad604cc717e0e008241553a9fb Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Wed, 18 Mar 2020 18:09:27 +0100
Subject: [PATCH 3337/4636] jc: 1.7.5 -> 1.9.2

---
 pkgs/development/python-modules/jc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix
index 1773a077fdd5..0c4d2062901d 100644
--- a/pkgs/development/python-modules/jc/default.nix
+++ b/pkgs/development/python-modules/jc/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "jc";
-  version = "1.7.5";
+  version = "1.9.2";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "16ndzvyvx4s3b6cnhxbd5fs3fkc3fwygz7qzaw7ws76sag1zpx67";
+    sha256 = "1zn6skiv5nm7g8cs86n152ni79ck538bwdjynlh8n2k9dvfd5i8l";
   };
 
   propagatedBuildInputs = [ ruamel_yaml ifconfig-parser xmltodict ];

From 3757e02434f4db6318eea3e1d22abe5b0da0ba30 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 18 Mar 2020 13:25:22 +0100
Subject: [PATCH 3338/4636] python.pkgs.httpretty: disable flaky test suite

There are some tests that fail occasionally because the current date
(with second precision) occurs in the output. This is fixed upstream.
I've made this conditional since python updates are often done in an
automated fashion and tests should be re-enabled after the next update.
This avoids the need for human intervention (except for a clean up at
some point in the future).
---
 pkgs/development/python-modules/httpretty/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix
index 79c0fbfcac8a..ee0e598a9ac2 100644
--- a/pkgs/development/python-modules/httpretty/default.nix
+++ b/pkgs/development/python-modules/httpretty/default.nix
@@ -18,6 +18,10 @@ buildPythonPackage rec {
   pname = "httpretty";
   version = "0.9.7";
 
+  # drop this for version > 0.9.7
+  # Flaky tests: https://github.com/gabrielfalcao/HTTPretty/pull/394
+  doCheck = stdenv.lib.versionAtLeast version "0.9.8";
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "66216f26b9d2c52e81808f3e674a6fb65d4bf719721394a1a9be926177e55fbe";

From 6245a6b342049aeb9f454ed0eb9923b61de0b286 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 18 Mar 2020 18:45:15 +0000
Subject: [PATCH 3339/4636] musescore: 3.2.3 -> 3.4.2

---
 pkgs/applications/audio/musescore/default.nix    |  4 ++--
 .../remove_qtwebengine_install_hack.patch        | 16 +++++-----------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index 5368fcb61656..7ef6328c02c2 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -6,11 +6,11 @@
 
 mkDerivation rec {
   pname = "musescore";
-  version = "3.2.3";
+  version = "3.4.2";
 
   src = fetchzip {
     url = "https://github.com/musescore/MuseScore/releases/download/v${version}/MuseScore-${version}.zip";
-    sha256 = "17mr0c8whw6vz86lp1j36rams4h8virc4z68fld0q3rpq6g05szs";
+    sha256 = "1laskvp40dncs12brkgvk7wl0qrvzy52rn7nf3b67ps1vmd130gp";
     stripRoot = false;
   };
 
diff --git a/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch b/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch
index 53a0c90ce46e..57a6092d5852 100644
--- a/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch
+++ b/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch
@@ -1,12 +1,9 @@
---- a/mscore/CMakeLists.txt
-+++ b/mscore/CMakeLists.txt
-@@ -660,22 +660,6 @@ if (MINGW)
- else (MINGW)
-
-    if ( NOT MSVC )
--## install qwebengine core
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -220,16 +219,0 @@ else (MINGW)
+-      ## install qwebengine core
 -      if (NOT APPLE AND USE_WEBENGINE)
--         install(FILES
+-         install(PROGRAMS
 -            ${QT_INSTALL_LIBEXECS}/QtWebEngineProcess
 -            DESTINATION bin
 -            )
@@ -20,6 +17,3 @@
 -            )
 -      endif(NOT APPLE AND USE_WEBENGINE)
 -
-       target_link_libraries(mscore
-          ${ALSA_LIB}
-          ${QT_LIBRARIES}

From 3d846aa29e9e881bb58c98e9c48ea0e882b2dbea Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Thu, 13 Feb 2020 09:23:44 +0100
Subject: [PATCH 3340/4636] mopidy-mpd: init at version 3.0.0

---
 pkgs/applications/audio/mopidy/mpd.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/audio/mopidy/mpd.nix

diff --git a/pkgs/applications/audio/mopidy/mpd.nix b/pkgs/applications/audio/mopidy/mpd.nix
new file mode 100644
index 000000000000..4dd32ea3aa35
--- /dev/null
+++ b/pkgs/applications/audio/mopidy/mpd.nix
@@ -0,0 +1,24 @@
+{ stdenv, python3Packages, mopidy }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "Mopidy-MPD";
+  version = "3.0.0";
+
+  src = python3Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "0prjli4352521igcsfcgmk97jmzgbfy4ik8hnli37wgvv252wiac";
+  };
+
+  propagatedBuildInputs = [mopidy];
+
+  # no tests implemented
+  doCheck = false;
+  pythonImportsCheck = [ "mopidy_mpd" ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/mopidy/mopidy-mpd";
+    description = "Mopidy extension for controlling playback from MPD clients";
+    license = licenses.asl20;
+    maintainers = [ maintainers.tomahna ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da01b5135e90..f01a224f392a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20546,6 +20546,8 @@ in
 
   mopidy-iris = callPackage ../applications/audio/mopidy/iris.nix { };
 
+  mopidy-mpd = callPackage ../applications/audio/mopidy/mpd.nix { };
+
   motif = callPackage ../development/libraries/motif { };
 
   mozplugger = callPackage ../applications/networking/browsers/mozilla-plugins/mozplugger {};

From b7bdf48e3fa6b90ea475a03ed159f397bd3c3c65 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 12:04:55 -0700
Subject: [PATCH 3341/4636] pythonPackages.tensorflow: disable for python2.7
 and 3.8

---
 pkgs/development/python-modules/tensorflow/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index ed685bc0c485..7c80452b20fd 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -1,7 +1,7 @@
 { stdenv, pkgs, bazel_0, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin
 , addOpenGLRunpath
 # Python deps
-, buildPythonPackage, isPy3k, pythonOlder, pythonAtLeast, python
+, buildPythonPackage, isPy3k, isPy27, pythonOlder, pythonAtLeast, python
 # Python libraries
 , numpy, tensorflow-tensorboard, backports_weakref, mock, enum34, absl-py
 , future, setuptools, wheel, keras-preprocessing, keras-applications, google-pasta
@@ -348,6 +348,7 @@ let
 
 in buildPythonPackage {
   inherit version pname;
+  disabled = isPy27 || (pythonAtLeast "3.8");
 
   src = bazel-build.python;
 

From b812a723f50890e6c6a9653fa36fe2eb56acfbbb Mon Sep 17 00:00:00 2001
From: Marek Fajkus <marek.faj@gmail.com>
Date: Wed, 18 Mar 2020 20:36:36 +0100
Subject: [PATCH 3342/4636] elmPackages: minor cleanups

* Make sure generate script uses node2nix version from the nixpkgs
* regenerate code generated by node2nix
---
 pkgs/development/compilers/elm/default.nix    |  4 +--
 .../elm/packages/generate-node-packages.sh    |  8 +++--
 .../elm/packages/node-composition.nix         |  2 +-
 .../compilers/elm/packages/node-packages.nix  | 36 +++++--------------
 .../compilers/elm/packages/patch-binwrap.nix  |  2 +-
 5 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index ea84edd5e1db..fa9f72ebd044 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -91,11 +91,11 @@ let
           inherit nodejs pkgs;
           inherit (stdenv.hostPlatform) system;
         };
-    in with hsPkgs.elmPkgs; rec {
+    in with hsPkgs.elmPkgs; {
       elm-test = patchBinwrap [elmi-to-json] nodePkgs.elm-test;
       elm-verify-examples = patchBinwrap [elmi-to-json] nodePkgs.elm-verify-examples;
       elm-coverage =
-        let patched = patchBinwrap [elm elmi-to-json] nodePkgs.elm-coverage;
+        let patched = patchBinwrap [elmi-to-json] nodePkgs.elm-coverage;
         in patched.override {
           preRebuild = ''
             sed 's/\"install\".*/\"install\":\"echo no-op\"/g' --in-place package.json
diff --git a/pkgs/development/compilers/elm/packages/generate-node-packages.sh b/pkgs/development/compilers/elm/packages/generate-node-packages.sh
index 1d24df549ea6..343721208b89 100755
--- a/pkgs/development/compilers/elm/packages/generate-node-packages.sh
+++ b/pkgs/development/compilers/elm/packages/generate-node-packages.sh
@@ -1,10 +1,12 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -i bash -p nodePackages.node2nix
+#!/usr/bin/env bash
+
+ROOT="$(realpath "$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")"/../../../../..)"
 
 set -eu -o pipefail
 
 rm -f node-env.nix
-node2nix --nodejs-10 \
+$(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \
+    --nodejs-10 \
     -i node-packages.json \
     -o node-packages.nix \
     -c node-composition.nix \
diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix
index 1ffd758ac82e..4add754b5999 100644
--- a/pkgs/development/compilers/elm/packages/node-composition.nix
+++ b/pkgs/development/compilers/elm/packages/node-composition.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {pkgs ? import <nixpkgs> {
     inherit system;
diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix
index 46920bf62b74..1c8956f4beac 100644
--- a/pkgs/development/compilers/elm/packages/node-packages.nix
+++ b/pkgs/development/compilers/elm/packages/node-packages.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
+# This file has been generated by node2nix 1.8.0. Do not edit!
 
 {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
 
@@ -2894,15 +2894,6 @@ let
         sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
       };
     };
-    "minimist-0.0.8" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "0.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
-        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
-      };
-    };
     "minimist-1.2.0" = {
       name = "minimist";
       packageName = "minimist";
@@ -2948,13 +2939,13 @@ let
         sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==";
       };
     };
-    "mkdirp-0.5.1" = {
+    "mkdirp-0.5.3" = {
       name = "mkdirp";
       packageName = "mkdirp";
-      version = "0.5.1";
+      version = "0.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
-        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz";
+        sha512 = "P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==";
       };
     };
     "moment-2.24.0" = {
@@ -5455,7 +5446,6 @@ in
             ];
           })
           sources."fs-extra-8.1.0"
-          sources."minimist-1.2.5"
           sources."which-2.0.1"
         ];
       })
@@ -5518,10 +5508,10 @@ in
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
+      sources."minimist-1.2.5"
       sources."minipass-2.9.0"
       sources."minizlib-1.3.3"
-      sources."mkdirp-0.5.1"
+      sources."mkdirp-0.5.3"
       sources."moment-2.24.0"
       sources."murmur-hash-js-1.0.0"
       sources."mustache-3.2.1"
@@ -6504,11 +6494,7 @@ in
       sources."minimist-1.2.5"
       sources."minipass-2.9.0"
       sources."minizlib-1.3.3"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.3"
       sources."murmur-hash-js-1.0.0"
       sources."mustache-3.2.1"
       sources."nice-try-1.0.5"
@@ -6762,11 +6748,7 @@ in
       sources."minimist-1.2.5"
       sources."minipass-2.9.0"
       sources."minizlib-1.3.3"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.3"
       sources."murmur-hash-js-1.0.0"
       sources."mustache-3.2.1"
       sources."nice-try-1.0.5"
diff --git a/pkgs/development/compilers/elm/packages/patch-binwrap.nix b/pkgs/development/compilers/elm/packages/patch-binwrap.nix
index 3a67954b78c9..30f54e6f5ac5 100644
--- a/pkgs/development/compilers/elm/packages/patch-binwrap.nix
+++ b/pkgs/development/compilers/elm/packages/patch-binwrap.nix
@@ -14,7 +14,7 @@ in
 targets:
 pkg:
 pkg.override {
-  buildInputs = [ binwrap binwrap-install ];
+  nativeBuildInputs = pkg.nativeBuildInputs ++ [ binwrap binwrap-install ];
 
   # Manually install targets
   # by symlinking binaries into `node_modules`

From 2b25d0e2a9af814ad8cb9703c3fe0fa0880e639b Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 18 Mar 2020 20:53:09 +0100
Subject: [PATCH 3343/4636] tdesktop: 1.9.14 -> 1.9.21 (#82806)

---
 .../telegram/tdesktop/default.nix              | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 9cd181c591d6..3d4096667983 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook
 , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash
 , dee, ffmpeg_4, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
-, tl-expected, microsoft_gsl
+, tl-expected, microsoft_gsl, hunspell
 # TODO: Shouldn't be required:
 , pcre, xorg, utillinux, libselinux, libsepol, epoxy, at-spi2-core, libXtst
 , xdg_utils
@@ -19,12 +19,12 @@ with lib;
 
 mkDerivation rec {
   pname = "telegram-desktop";
-  version = "1.9.14";
+  version = "1.9.21";
 
   # Telegram-Desktop with submodules
   src = fetchurl {
     url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
-    sha256 = "0jsss4b51ylf4qk58frvh2yap1s3cjf3isnlc273cc0fh5g1skc6";
+    sha256 = "1b7z68q2sb2y203nf4p6lmz72zkpi5gyv9ypqi5h99bm2j6bbyg1";
   };
 
   postPatch = ''
@@ -43,7 +43,7 @@ mkDerivation rec {
   buildInputs = [
     qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash
     dee ffmpeg_4 openalSoft minizip libopus alsaLib libpulseaudio range-v3
-    tl-expected microsoft_gsl
+    tl-expected microsoft_gsl hunspell
     # TODO: Shouldn't be required:
     pcre xorg.libpthreadstubs xorg.libXdmcp utillinux libselinux libsepol epoxy at-spi2-core libXtst
   ];
@@ -55,13 +55,9 @@ mkDerivation rec {
     # TODO: Officiall API credentials for Nixpkgs
     # (see: https://github.com/NixOS/nixpkgs/issues/55271):
     "-DTDESKTOP_API_TEST=ON"
-    "-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF"
-    "-DDESKTOP_APP_USE_PACKAGED=ON"
     "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF"
     "-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF"
-    "-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON"
     "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON"
-    "-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON"
     "-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF"
     #"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""'
     "-DTDESKTOP_LAUNCHER_BASENAME=telegramdesktop" # Note: This is the default
@@ -90,8 +86,7 @@ mkDerivation rec {
       "''${gappsWrapperArgs[@]}" \
       "''${qtWrapperArgs[@]}" \
       --prefix PATH : ${xdg_utils}/bin \
-      --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" \
-      --unset QT_QPA_PLATFORMTHEME # From the Arch wrapper
+      --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR"
     sed -i $out/bin/telegram-desktop \
       -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\","
   '';
@@ -104,7 +99,8 @@ mkDerivation rec {
     '';
     license = licenses.gpl3;
     platforms = platforms.linux;
-    homepage = https://desktop.telegram.org/;
+    homepage = "https://desktop.telegram.org/";
+    changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v{version}";
     maintainers = with maintainers; [ primeos abbradar ];
   };
 }

From fe60ff7a995ec45f4a7cb3e6bc634acb25159ed8 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 18 Mar 2020 20:43:30 +0100
Subject: [PATCH 3344/4636] chromium: 80.0.3987.132 -> 80.0.3987.149

https://chromereleases.googleblog.com/2020/03/stable-channel-update-for-desktop_18.html

This update includes 13 security fixes.

CVEs:
CVE-2020-6422 CVE-2020-6424 CVE-2020-6425 CVE-2020-6426 CVE-2020-6427
CVE-2020-6428 CVE-2020-6429 CVE-2019-20503 CVE-2020-6449

Note: The release of version 81 is currently on pause:
https://chromereleases.googleblog.com/2020/03/upcoming-chrome-and-chrome-os-releases.html
---
 .../browsers/chromium/upstream-info.nix        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index a58131ce0e0d..0e939f2fd219 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "1yam7lg38dbpvmva7pc3bw3npvgi3d1v6im8ld4z92gjgniwsjh2";
-    sha256bin64 = "0vsly218wv9x2nv5i82slz8pmb0hmdcl1z2mlhf2j5adnsxn9c5z";
-    version = "81.0.4044.34";
+    sha256 = "177hv5jkgpcbi6khk7j883rf3rzzkjmi8cqqpzckaiw7pcwsvyvd";
+    sha256bin64 = "0sicz51d2l3gj70mfpyh5idwarjl19pba5lc6ahznxxqsrjfp80r";
+    version = "81.0.4044.69";
   };
   dev = {
-    sha256 = "0pxvwjvkajlidk5m7jiqk69mxnxg3h56dr7vpi916r51w17pds0l";
-    sha256bin64 = "1jdyp0f2ig4251155db3m7lzd4jlmczcjqqnvdj5nwl2bn3ykc3s";
-    version = "82.0.4068.4";
+    sha256 = "0s0072rmg287iijh6wwm9i5a5fsh96qm6nhd13xwbxrvj6pldb7n";
+    sha256bin64 = "0l5ljjz0s5x9727syq4gs5xshl9vs8apvw6xw8il0xy5qax32g85";
+    version = "82.0.4083.0";
   };
   stable = {
-    sha256 = "00f2hpi2d0n15yw29dv3dli566cgi7qh55bfpziag9a6j02i401c";
-    sha256bin64 = "00xhacrs74ks3nrpsnnbqm5vk0r9ydyxrq5ifajzviqqyk2n24b8";
-    version = "80.0.3987.132";
+    sha256 = "07icl3hgg1wjkmz88lbpjf6ll4xyi64spki1nmsy6899jgkxvgjh";
+    sha256bin64 = "0qgp6hv4qj04v6pzfx9ggjvcl1vi6ljjc3cpi4hfr67p4jab40ji";
+    version = "80.0.3987.149";
   };
 }

From 25b193d71458532cea314378442eb24295ce3185 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 12:26:33 -0700
Subject: [PATCH 3345/4636] python2Packages.flowlogs-reader: disable for
 python2

---
 pkgs/development/python-modules/flowlogs_reader/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/flowlogs_reader/default.nix b/pkgs/development/python-modules/flowlogs_reader/default.nix
index 4064fc494b12..38faa5f12db4 100644
--- a/pkgs/development/python-modules/flowlogs_reader/default.nix
+++ b/pkgs/development/python-modules/flowlogs_reader/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
+, isPy27
 , botocore
 , boto3
 , docutils
@@ -11,6 +12,7 @@
 buildPythonPackage rec {
   pname = "flowlogs_reader";
   version = "2.0.0";
+  disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;

From 57bf2557f796e3cc3a751f70130ebf695ec40ba7 Mon Sep 17 00:00:00 2001
From: flyfloh <webstuff@fly-soft.de>
Date: Wed, 18 Mar 2020 22:29:36 +0100
Subject: [PATCH 3346/4636] pymetno: init at 0.5.0 (#78132)

Co-Authored-By: Jon <jonringer@users.noreply.github.com>

Co-authored-by: Florian <flo@halbmastwurf.de>
Co-authored-by: Jon <jonringer@users.noreply.github.com>
---
 .../python-modules/pymetno/default.nix        | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/pymetno/default.nix

diff --git a/pkgs/development/python-modules/pymetno/default.nix b/pkgs/development/python-modules/pymetno/default.nix
new file mode 100644
index 000000000000..129ec21e05ce
--- /dev/null
+++ b/pkgs/development/python-modules/pymetno/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, aiohttp
+, async-timeout
+, pytz
+, xmltodict
+}:
+
+buildPythonPackage rec {
+  pname = "PyMetno";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    repo = pname;
+    owner = "Danielhiversen";
+    rev = version;
+    sha256 = "00v2r3nn48svni9rbmbf0a4ylgfcf93gk2wg7qnm1fv1qrkgscvg";
+  };
+
+  propagatedBuildInputs = [ aiohttp async-timeout pytz xmltodict ];
+
+  pythonImportsCheck = [ "metno"];
+
+  meta = with stdenv.lib; {
+    description = "A library to communicate with the met.no api";
+    homepage = "https://github.com/Danielhiversen/pyMetno/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ flyfloh ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 40b42fbca78c..7d1c36f2d874 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7096,6 +7096,8 @@ in {
 
   pybotvac = callPackage ../development/python-modules/pybotvac { };
 
+  pymetno = callPackage ../development/python-modules/pymetno { };
+
   pytado = callPackage ../development/python-modules/pytado { };
 
   casttube = callPackage ../development/python-modules/casttube { };

From 20f197d0b9e97964d9c6a9aadd4b02f99afbcfe8 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 19 Mar 2020 08:03:58 +1000
Subject: [PATCH 3347/4636] gitAndTools.gh: 0.6.1 -> 0.6.2

https://github.com/cli/cli/releases/tag/v0.6.2
---
 .../version-management/git-and-tools/gh/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix
index a7e6918b4d8f..e74bd78fc59b 100644
--- a/pkgs/applications/version-management/git-and-tools/gh/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "gh";
-  version = "0.6.1";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "0jqr7i67s00gvi6cbww397jnh8qzwr37prd7frbl12j89glshwy1";
+    sha256 = "10vylfsc8lldmr1l6r882sx87pgxl687k419c19faq90vd403i14";
   };
 
   modSha256 = "03m193ny5z77yy586cwh099ypi1lmhb5vdj7d4kphxycnvpndr66";

From d034bf20351d2fc702ededbb45b14dc16d07cb9a Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Wed, 18 Mar 2020 19:42:53 +0100
Subject: [PATCH 3348/4636] aws-lambda-builders: 0.7.0 -> 0.8.0

---
 .../python-modules/aws-lambda-builders/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix
index c15beffca80d..b10bd6d7c1a1 100644
--- a/pkgs/development/python-modules/aws-lambda-builders/default.nix
+++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "aws-lambda-builders";
-  version = "0.7.0";
+  version = "0.8.0";
 
   # No tests available in PyPI tarball
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-lambda-builders";
     rev = "v${version}";
-    sha256 = "0g133yxh3bgvdjcpar65x5pyx2bcx0kg173rbq5iwmmpw388f47a";
+    sha256 = "1akiv92cd7ciky0aay94lh9azr73jajn0x0x6ywaf3qm5c4hyvys";
   };
 
   # Package is not compatible with Python 3.5

From 743f17a36e98c82f44498a0ddfbaa5252bebe019 Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Wed, 18 Mar 2020 19:43:13 +0100
Subject: [PATCH 3349/4636] aws-sam-translator: 1.20.1 -> 1.21.0

---
 .../development/python-modules/aws-sam-translator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix
index 846c7d9954f7..1fdfc4d4358c 100644
--- a/pkgs/development/python-modules/aws-sam-translator/default.nix
+++ b/pkgs/development/python-modules/aws-sam-translator/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "aws-sam-translator";
-  version = "1.20.1";
+  version = "1.21.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "17n7kajqf35g0bxqd30jpm2vq275l3b45l77lfh6r9llpkd1zxnx";
+    sha256 = "0diyqiwas9fhkj7p5hm08lvkd5h9yn9zqilwww2av04mclfk82ij";
   };
 
   # Tests are not included in the PyPI package

From 353016430ada46763244d251b2fe696ec5da1496 Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Wed, 18 Mar 2020 19:43:36 +0100
Subject: [PATCH 3350/4636] jmespath: 0.9.4 -> 0.9.5

---
 pkgs/development/python-modules/jmespath/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jmespath/default.nix b/pkgs/development/python-modules/jmespath/default.nix
index cc0a78872b2d..848437b453d8 100644
--- a/pkgs/development/python-modules/jmespath/default.nix
+++ b/pkgs/development/python-modules/jmespath/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "jmespath";
-  version = "0.9.4";
+  version = "0.9.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bde2aef6f44302dfb30320115b17d030798de8c4110e28d5cf6cf91a7a31074c";
+    sha256 = "1nf2ipzvigspy17r16dpkhzn1bqdmlak162rm8dy4wri2n6mr9fc";
   };
 
   buildInputs = [ nose ];

From 5e331582d2308509fbd6846c38fe6eeb4448358e Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Wed, 18 Mar 2020 19:43:56 +0100
Subject: [PATCH 3351/4636] aws-sam-cli: 0.43.0 -> 0.44.0

---
 pkgs/development/tools/aws-sam-cli/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix
index 38fd32f38b65..94ca01faef2c 100644
--- a/pkgs/development/tools/aws-sam-cli/default.nix
+++ b/pkgs/development/tools/aws-sam-cli/default.nix
@@ -30,11 +30,11 @@ with py.pkgs;
 
 buildPythonApplication rec {
   pname = "aws-sam-cli";
-  version = "0.43.0";
+  version = "0.44.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0v852636chil5n4cjqjvh29hhik881pkljs64jy5jiznbrph9ryr";
+    sha256 = "0r3m41xjmg8m2jwsqwc9kdkcs3xbz8dsl240ybwbnr7rp29pnirf";
   };
 
   # Tests are not included in the PyPI package
@@ -50,6 +50,7 @@ buildPythonApplication rec {
     docker
     flask
     idna
+    jmespath
     pathlib2
     requests
     serverlessrepo
@@ -65,11 +66,9 @@ buildPythonApplication rec {
   # fix over-restrictive version bounds
   postPatch = ''
     substituteInPlace requirements/base.txt \
-      --replace "requests==2.20.1" "requests==2.22.0" \
       --replace "serverlessrepo==0.1.9" "serverlessrepo~=0.1.9" \
-      --replace "six~=1.11.0" "six~=1.12.0" \
       --replace "python-dateutil~=2.6, <2.8.1" "python-dateutil~=2.6" \
-      --replace "PyYAML~=3.12" "PyYAML~=5.1"
+      --replace "tomlkit==0.5.8" "tomlkit~=0.5.8" \
   '';
 
   meta = with lib; {

From 75b0fc6f0c58e9193dcc383765b45efd90bc0f48 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 13:38:42 -0700
Subject: [PATCH 3352/4636] python3Packages.cufflinks: 0.16 -> 0.17.3

---
 .../python-modules/cufflinks/default.nix      | 26 +++++--------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/python-modules/cufflinks/default.nix b/pkgs/development/python-modules/cufflinks/default.nix
index ed25c2c73717..315c28c74caa 100644
--- a/pkgs/development/python-modules/cufflinks/default.nix
+++ b/pkgs/development/python-modules/cufflinks/default.nix
@@ -3,7 +3,7 @@
 , colorlover
 , ipython
 , ipywidgets
-, nose
+, pytest
 , numpy
 , pandas
 , six
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "cufflinks";
-  version = "0.16";
+  version = "0.17.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "163lag5g4micpqm3m4qy9b5r06a7pw45nq80x4skxc7dcrly2ygd";
+    sha256 = "0i56062k54dlg5iz3qyl1ykww62mpkp8jr4n450h0c60dm0b7ha8";
   };
 
   propagatedBuildInputs = [
@@ -30,24 +30,12 @@ buildPythonPackage rec {
     statsmodels
   ];
 
-  patches = [
-    # Plotly 4 compatibility. Remove with next release, assuming it gets merged.
-    (fetchpatch {
-      url = "https://github.com/santosjorge/cufflinks/pull/202/commits/e291dce14181858cb457404adfdaf2624b6d0594.patch";
-      sha256 = "1l0dahwqn3cxg49v3i3amwi80dmx2bi5zrazmgzpwsfargmk2kd1";
-    })
-  ];
-
-  # in plotly4+, the plotly.plotly module was moved to chart-studio.plotly
-  postPatch = ''
-    substituteInPlace requirements.txt \
-      --replace "plotly>=3.0.0,<4.0.0a0" "chart-studio"
-  '';
-
-  checkInputs = [ nose ];
+  checkInputs = [ pytest ];
 
+  # ignore tests which are incompatible with pandas>=1.0
+  # https://github.com/santosjorge/cufflinks/issues/236
   checkPhase = ''
-    nosetests -xv tests.py
+    pytest tests.py -k 'not bar_row'
   '';
 
   meta = with lib; {

From 29c22648374fd06c71044cc386d6abec05eff2bd Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 13:25:27 -0700
Subject: [PATCH 3353/4636] python3Packages.snowflake-connector-python: 2.2.0
 -> 2.2.2

---
 .../snowflake-connector-python/default.nix               | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix
index 84e92fa9f7c7..1d83edbc7229 100644
--- a/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix
@@ -25,12 +25,12 @@
 
 buildPythonPackage rec {
   pname = "snowflake-connector-python";
-  version = "2.2.0";
+  version = "2.2.2";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1d3qxjqc79fi2l4sns5svbc6kfaihivsrpycflmh50h7x0k9sv7f";
+    sha256 = "1qqlqypxj3j5qz8jjzil7250alf0w4bx8k8ndyj2ymp8kq2z1v0j";
   };
 
   propagatedBuildInputs = [
@@ -55,6 +55,11 @@ buildPythonPackage rec {
     urllib3
   ];
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "'cffi>=1.9,<1.14'," "'cffi~=1.9',"
+  '';
+
   # tests are not working
   # XXX: fix the tests
   doCheck = false;

From 12be6698e8fc5dae1f16f59a66aa6cd5084cdf4b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Mar 2020 11:58:19 +0000
Subject: [PATCH 3354/4636] texworks: 0.6.3 -> 0.6.4

(cherry picked from commit b35de30a2bcc0507330b760716719fff0428d774)
---
 pkgs/applications/editors/texworks/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/applications/editors/texworks/default.nix
index 8042363f73c9..f2bb9279c871 100644
--- a/pkgs/applications/editors/texworks/default.nix
+++ b/pkgs/applications/editors/texworks/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "texworks";
-  version = "0.6.3";
+  version = "0.6.4";
 
   src = fetchFromGitHub {
     owner = "TeXworks";
     repo = "texworks";
     rev = "release-${version}";
-    sha256 = "1ljfl784z7dmh6f1qacqhc6qhcaqdzw033yswbvpvkkck0lsk2mr";
+    sha256 = "0d7f23c6c1wj4aii4h5w9piv01qfb69zrd79dvxwydrk99i8gnl4";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Simple TeX front-end program inspired by TeXShop";
-    homepage = http://www.tug.org/texworks/;
+    homepage = "http://www.tug.org/texworks/";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ dotlambda ];
     platforms = with platforms; linux;

From aaefb947eaa5f227feb99ea181bca6404c549d74 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 12:53:54 -0700
Subject: [PATCH 3355/4636] texworks: fix qt build

---
 pkgs/applications/editors/texworks/default.nix | 12 ++++++------
 pkgs/top-level/all-packages.nix                |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/applications/editors/texworks/default.nix
index f2bb9279c871..d5549c525928 100644
--- a/pkgs/applications/editors/texworks/default.nix
+++ b/pkgs/applications/editors/texworks/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
-, qt5, libsForQt5, hunspell
+{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config
+, qtscript, poppler, hunspell
 , withLua ? true, lua
 , withPython ? true, python3 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "texworks";
   version = "0.6.4";
 
@@ -14,15 +14,15 @@ stdenv.mkDerivation rec {
     sha256 = "0d7f23c6c1wj4aii4h5w9piv01qfb69zrd79dvxwydrk99i8gnl4";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = [ qt5.qtscript libsForQt5.poppler hunspell ]
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ qtscript poppler hunspell ]
                 ++ lib.optional withLua lua
                 ++ lib.optional withPython python3;
 
   cmakeFlags = lib.optional withLua "-DWITH_LUA=ON"
                ++ lib.optional withPython "-DWITH_PYTHON=ON";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple TeX front-end program inspired by TeXShop";
     homepage = "http://www.tug.org/texworks/";
     license = licenses.gpl2Plus;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f01a224f392a..60da1eeaf5b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6855,7 +6855,7 @@ in
 
   textadept = callPackage ../applications/editors/textadept { };
 
-  texworks = callPackage ../applications/editors/texworks { };
+  texworks = libsForQt5.callPackage ../applications/editors/texworks { };
 
   thc-hydra = callPackage ../tools/security/thc-hydra { };
 

From 1e5fae561c04ee636b46342075418d2a3c325f08 Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Wed, 18 Mar 2020 18:37:29 +0100
Subject: [PATCH 3356/4636] mullvad-vpn: remove xfix from maintainers

---
 pkgs/applications/networking/mullvad-vpn/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix
index d673c75764a3..3b7de8360d74 100644
--- a/pkgs/applications/networking/mullvad-vpn/default.nix
+++ b/pkgs/applications/networking/mullvad-vpn/default.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/mullvad/mullvadvpn-app/blob/${version}/CHANGELOG.md";
     license = licenses.gpl3;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers ;[ filalex77 xfix ];
+    maintainers = with maintainers; [ filalex77 ];
   };
 
 }

From 4bcdfdb7b8151e8bf51c5bf3599c863ccdca0e12 Mon Sep 17 00:00:00 2001
From: Jeffry Molanus <jeffry.molanus@gmail.com>
Date: Mon, 16 Mar 2020 21:58:57 +0100
Subject: [PATCH 3357/4636] terraform-providers.lxd: init at 1.3.0

---
 .../cluster/terraform-providers/default.nix   |  1 +
 .../terraform-providers/lxd/default.nix       | 25 +++++++++++++++++++
 pkgs/top-level/aliases.nix                    |  1 +
 3 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 6298c25ba254..6a285d8b38be 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -33,5 +33,6 @@ in
     gandi = callPackage ./gandi {};
     ibm = callPackage ./ibm {};
     libvirt = callPackage ./libvirt {};
+    lxd = callPackage ./lxd {};
     ansible = callPackage ./ansible {};
   } // lib.mapAttrs (n: v: toDrv v) list
diff --git a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix
new file mode 100644
index 000000000000..fd2a6c36d65c
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "terraform-provider-lxd";
+  version = "1.3.0";
+
+  src = fetchFromGitHub {
+    owner = "sl1pm4t";
+    repo = "terraform-provider-lxd";
+    rev = "v${version}";
+    sha256 = "1k54021178zybh9dqly2ly8ji9x5rka8dn9xd6rv7gkcl5w3y6fv";
+  };
+
+  modSha256 = "1h95ng9by3i3v15s1ws1fv86a47vglivn42xbffdy94s108g0908";
+
+  postBuild = "mv ../go/bin/terraform-provider-lxd{,_v${version}}";
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/sl1pm4t/terraform-provider-lxd";
+    description = "Terraform provider for lxd";
+    platforms = platforms.linux;
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ gila ];
+  };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index af8cbed10613..bc6d759e843f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -480,6 +480,7 @@ mapAliases ({
   telnet = inetutils; # added 2018-05-15
   terraform-provider-ibm = terraform-providers.ibm; # added 2018-09-28
   terraform-provider-libvirt = terraform-providers.libvirt; # added 2018-09-28
+  terraform-provider-lxd = terraform-providers.lxd; # added 2020-03-16
   terraform-provider-nixos = terraform-providers.nixos; # added 2018-09-28
   tesseract_4 = tesseract4; # added 2018-12-19
   testdisk-photorec = throw "This package was a duplicate, please use testdisk or testdisk-qt instead"; # added 2019-10-13

From 1d6337b990ddb8c936e88aa6335dc87db1ea846c Mon Sep 17 00:00:00 2001
From: Jeffry Molanus <jeffry.molanus@gmail.com>
Date: Wed, 18 Mar 2020 14:18:11 +0100
Subject: [PATCH 3358/4636] maintainers: add gila

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 993e5c2d46df..54bbb93e76d3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2748,6 +2748,12 @@
     githubId = 3217744;
     name = "Peter Ferenczy";
   };
+  gila = {
+    email = "jeffry.molanus@gmail.com";
+    github = "gila";
+    githubId = 15957973;
+    name = "Jeffry Molanus";
+  };
   gilligan = {
     email = "tobias.pflug@gmail.com";
     github = "gilligan";

From 186412b42a4d1eb70f0d82c4b4dbba5ddd1fd4a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20Rivi=C3=A8re?= <babathriviere@gmail.com>
Date: Wed, 18 Mar 2020 12:14:32 +0100
Subject: [PATCH 3359/4636] insomnia: 7.1.0 -> 7.1.1

---
 pkgs/development/web/insomnia/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix
index d05fbff5e0c1..d877aa5331d5 100644
--- a/pkgs/development/web/insomnia/default.nix
+++ b/pkgs/development/web/insomnia/default.nix
@@ -16,12 +16,12 @@ let
   ];
 in stdenv.mkDerivation rec {
   pname = "insomnia";
-  version = "7.1.0";
+  version = "7.1.1";
 
   src = fetchurl {
     url =
       "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb";
-    sha256 = "1aqzg01dwgm1jidavwxichydxsz1c4ck8xhgvlgw24qddx5gwq1y";
+    sha256 = "0lg3j5pr2bkjq5rq035fwh4mgpqsja3ndp11zpcz85ni3nvhn657";
   };
 
   nativeBuildInputs =

From a36056d068770432a5203ba86e1a3accdc71aa76 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Mar 2020 09:42:25 +0000
Subject: [PATCH 3360/4636] opensm: 3.3.22 -> 3.3.23

---
 pkgs/tools/networking/opensm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/opensm/default.nix b/pkgs/tools/networking/opensm/default.nix
index e0a0dcd56cbe..3fe9f87d6585 100644
--- a/pkgs/tools/networking/opensm/default.nix
+++ b/pkgs/tools/networking/opensm/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "opensm";
-  version = "3.3.22";
+  version = "3.3.23";
 
   src = fetchFromGitHub {
     owner = "linux-rdma";
     repo = "opensm";
     rev = version;
-    sha256 = "1nb6zl93ffbgb8z8728j0dxrmvk3pm0i6a1sn7mpn8ki1vkf2y0j";
+    sha256 = "0r0nw7b2711ca6mrj19ymg97x862hdxv54fhhm4kiqvdh6n75y0s";
   };
 
   nativeBuildInputs = [ autoconf automake libtool bison flex ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Infiniband subnet manager";
-    homepage = https://www.openfabrics.org/;
+    homepage = "https://www.openfabrics.org/";
     license = licenses.gpl2; # dual licensed as 2-clause BSD
     maintainers = [ maintainers.aij ];
     platforms = [ "x86_64-linux" ];

From f1956252270ce7d37c39906b892d21969a2e1787 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Thu, 19 Mar 2020 01:13:27 +0100
Subject: [PATCH 3361/4636] lib/options: Only recurse into visible sub options

---
 lib/options.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/options.nix b/lib/options.nix
index e5c0631a5437..71481c9250ab 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -159,7 +159,7 @@ rec {
           let ss = opt.type.getSubOptions opt.loc;
           in if ss != {} then optionAttrSetToDocList' opt.loc ss else [];
       in
-        [ docOption ] ++ subOptions) (collect isOption options);
+        [ docOption ] ++ optionals docOption.visible subOptions) (collect isOption options);
 
 
   /* This function recursively removes all derivation attributes from

From f4a7afe4717559dde48b1951804b5f39f5652912 Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Wed, 18 Mar 2020 20:49:25 -0400
Subject: [PATCH 3362/4636] maintainers: update entry for notbandali
 (previously aminb)

---
 maintainers/maintainer-list.nix          | 11 ++++++++---
 pkgs/development/tools/alloy/default.nix |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 336ee7a88306..22033f143cd3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -412,10 +412,15 @@
     githubId = 20530052;
     name = "Andrew Miloradovsky";
   };
-  aminb = {
-    email = "amin@aminb.org";
-    github = "aminb";
+  notbandali = {
     name = "Amin Bandali";
+    email = "bandali@gnu.org";
+    github = "notbandali";
+    githubId = 1254858;
+    keys = [{
+      longkeyid = "rsa4096/0xA21A020248816103";
+      fingerprint = "BE62 7373 8E61 6D6D 1B3A  08E8 A21A 0202 4881 6103";
+    }];
   };
   aminechikhaoui = {
     email = "amine.chikhaoui91@gmail.com";
diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix
index 0b34055274d0..01706bd9b681 100644
--- a/pkgs/development/tools/alloy/default.nix
+++ b/pkgs/development/tools/alloy/default.nix
@@ -45,7 +45,7 @@ let generic = { major, version, src }:
       downloadPage = http://alloytools.org/download.html;
       license = licenses.mit;
       platforms = platforms.linux;
-      maintainers = with maintainers; [ aminb ];
+      maintainers = with maintainers; [ notbandali ];
     };
   };
 

From 9d6dce534489734b033a12c336da230849e586e9 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 18 Mar 2020 20:20:20 -0500
Subject: [PATCH 3363/4636] docker-slim: 1.28.1 -> 1.29.0

---
 pkgs/applications/virtualization/docker-slim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix
index 6b4db2d5f0ce..a4c2be050610 100644
--- a/pkgs/applications/virtualization/docker-slim/default.nix
+++ b/pkgs/applications/virtualization/docker-slim/default.nix
@@ -6,7 +6,7 @@
 
 buildGoPackage rec {
   pname = "docker-slim";
-  version = "1.28.1";
+  version = "1.29.0";
 
   goPackagePath = "github.com/docker-slim/docker-slim";
 
@@ -14,7 +14,7 @@ buildGoPackage rec {
     owner = "docker-slim";
     repo = "docker-slim";
     rev = version;
-    sha256 = "13lws9vgzq3chlqxc8aggz3i5kmir3vld2af0fx15kvcb9kpd79a";
+    sha256 = "0qfjmwqxgghp9pqj4s2z71cmn8mi1l6655z6nbhh72yqaxh5a6ia";
   };
 
   subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ];

From a51275f3b5f82fe3e45ff4536ee2994c9fc4029a Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 18 Mar 2020 21:21:21 -0500
Subject: [PATCH 3364/4636] gitAndTools.gh: fix build on darwin

---
 .../version-management/git-and-tools/default.nix             | 4 +++-
 .../version-management/git-and-tools/gh/default.nix          | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 8df8d96e6411..a4b3ac1a65aa 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -30,7 +30,9 @@ let
 
   diff-so-fancy = callPackage ./diff-so-fancy { };
 
-  gh = callPackage ./gh { };
+  gh = callPackage ./gh {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   ghq = callPackage ./ghq { };
 
diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix
index e74bd78fc59b..e655813d3403 100644
--- a/pkgs/applications/version-management/git-and-tools/gh/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildGoModule, installShellFiles }:
+{ stdenv, fetchFromGitHub, buildGoModule, installShellFiles, Security }:
 
 buildGoModule rec {
   pname = "gh";
@@ -20,6 +20,7 @@ buildGoModule rec {
   subPackages = [ "cmd/gh" ];
 
   nativeBuildInputs = [ installShellFiles ];
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
   postInstall = ''
     for shell in bash fish zsh; do
       $out/bin/gh completion -s $shell > gh.$shell
@@ -27,7 +28,7 @@ buildGoModule rec {
     done
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "GitHub CLI tool";
     homepage = "https://cli.github.com/";
     license = licenses.mit;

From bb1e2b83c016a9a9b9ac0f8869e69c66230da816 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 18 Mar 2020 21:21:21 -0500
Subject: [PATCH 3365/4636] postgresqlPackages.timescaledb: 1.6.0 -> 1.6.1

Changelog: https://github.com/timescale/timescaledb/releases/tag/1.6.1
---
 pkgs/servers/sql/postgresql/ext/timescaledb.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index 6f0ec04cd752..42a8d9de49ee 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   pname = "timescaledb";
-  version = "1.6.0";
+  version = "1.6.1";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ postgresql openssl ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     owner  = "timescale";
     repo   = "timescaledb";
     rev    = "refs/tags/${version}";
-    sha256 = "0b42rhkycr4pwwa4fxnmppd3bl0xz7azvlm145rd7warlsr5h0lb";
+    sha256 = "0k03aqpc1faqlpw46wazv0dy0xja57cv1sr1zwmizw3j3p3s0zdq";
   };
 
   cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ];

From 9eecf2d05711b8e8677af8ceda17f6b9938b3eb3 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Thu, 19 Mar 2020 03:48:46 +0100
Subject: [PATCH 3366/4636] Revert "lib/modules: Throw better error when
 definitions assign to an option set"

This reverts commit 15c873b486347e7861c64fb0b5a7852be9fc82e4.

This was causing infinite recursion when depending on nested options
---
 lib/modules.nix                          | 4 +---
 lib/tests/modules.sh                     | 3 ---
 lib/tests/modules/declare-option-set.nix | 3 ---
 3 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 lib/tests/modules/declare-option-set.nix

diff --git a/lib/modules.nix b/lib/modules.nix
index 518f4047cc60..c18fec66c705 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -299,9 +299,7 @@ rec {
             in
               throw "The option `${showOption loc}' in `${firstOption._file}' is a prefix of options in `${firstNonOption._file}'."
           else
-            if all (def: isAttrs def.value) defns' then mergeModules' loc decls defns
-            else let firstInvalid = findFirst (def: ! isAttrs def.value) null defns';
-            in throw "The option path `${showOption loc}' is an attribute set of options, but it is defined to not be an attribute set in `${firstInvalid.file}'. Did you define its value at the correct and complete path?"
+            mergeModules' loc decls defns
       ))
     // { _definedNames = map (m: { inherit (m) file; names = attrNames m.config; }) configs; };
 
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index 1b3d01646d84..e80a3eccecd1 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -199,9 +199,6 @@ checkConfigOutput "true" config.conditionalWorks ./declare-attrsOf.nix ./attrsOf
 checkConfigOutput "false" config.conditionalWorks ./declare-lazyAttrsOf.nix ./attrsOf-conditional-check.nix
 checkConfigOutput "empty" config.value.foo ./declare-lazyAttrsOf.nix ./attrsOf-conditional-check.nix
 
-# Check error for when an option set is defined to be a non-attribute set value
-checkConfigError 'The option path .* is an attribute set of options, but it is defined to not be an attribute set in' \
-  config.value ./declare-option-set.nix ./define-value-int-zero.nix
 
 # Even with multiple assignments, a type error should be thrown if any of them aren't valid
 checkConfigError 'The option value .* in .* is not of type .*' \
diff --git a/lib/tests/modules/declare-option-set.nix b/lib/tests/modules/declare-option-set.nix
deleted file mode 100644
index fddc650ffa90..000000000000
--- a/lib/tests/modules/declare-option-set.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  options.value = {};
-}

From 742e3fc0020573deecc04029764b288fdbaed4cc Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Thu, 19 Mar 2020 03:46:50 +0100
Subject: [PATCH 3367/4636] lib/tests: Check for nested option-dependent
 definitions

---
 lib/tests/modules.sh                             |  3 +++
 lib/tests/modules/declare-enable-nested.nix      | 14 ++++++++++++++
 .../declare-int-positive-value-nested.nix        |  9 +++++++++
 .../modules/define-option-dependently-nested.nix | 16 ++++++++++++++++
 4 files changed, 42 insertions(+)
 create mode 100644 lib/tests/modules/declare-enable-nested.nix
 create mode 100644 lib/tests/modules/declare-int-positive-value-nested.nix
 create mode 100644 lib/tests/modules/define-option-dependently-nested.nix

diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index e80a3eccecd1..e81cf016ee9a 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -189,6 +189,9 @@ checkConfigOutput "true" config.enable ./import-from-store.nix
 checkConfigOutput true config.enable ./define-option-dependently.nix ./declare-enable.nix ./declare-int-positive-value.nix
 checkConfigOutput 360 config.value ./define-option-dependently.nix ./declare-enable.nix ./declare-int-positive-value.nix
 checkConfigOutput 7 config.value ./define-option-dependently.nix ./declare-int-positive-value.nix
+checkConfigOutput true config.set.enable ./define-option-dependently-nested.nix ./declare-enable-nested.nix ./declare-int-positive-value-nested.nix
+checkConfigOutput 360 config.set.value ./define-option-dependently-nested.nix ./declare-enable-nested.nix ./declare-int-positive-value-nested.nix
+checkConfigOutput 7 config.set.value ./define-option-dependently-nested.nix ./declare-int-positive-value-nested.nix
 
 # Check attrsOf and lazyAttrsOf. Only lazyAttrsOf should be lazy, and only
 # attrsOf should work with conditional definitions
diff --git a/lib/tests/modules/declare-enable-nested.nix b/lib/tests/modules/declare-enable-nested.nix
new file mode 100644
index 000000000000..c8da8273cba1
--- /dev/null
+++ b/lib/tests/modules/declare-enable-nested.nix
@@ -0,0 +1,14 @@
+{ lib, ... }:
+
+{
+  options.set = {
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+      type = lib.types.bool;
+      description = ''
+        Some descriptive text
+      '';
+    };
+  };
+}
diff --git a/lib/tests/modules/declare-int-positive-value-nested.nix b/lib/tests/modules/declare-int-positive-value-nested.nix
new file mode 100644
index 000000000000..72d2fb89fc3b
--- /dev/null
+++ b/lib/tests/modules/declare-int-positive-value-nested.nix
@@ -0,0 +1,9 @@
+{ lib, ... }:
+
+{
+  options.set = {
+    value = lib.mkOption {
+      type = lib.types.ints.positive;
+    };
+  };
+}
diff --git a/lib/tests/modules/define-option-dependently-nested.nix b/lib/tests/modules/define-option-dependently-nested.nix
new file mode 100644
index 000000000000..69ee4255534a
--- /dev/null
+++ b/lib/tests/modules/define-option-dependently-nested.nix
@@ -0,0 +1,16 @@
+{ lib, options, ... }:
+
+# Some modules may be distributed separately and need to adapt to other modules
+# that are distributed and versioned separately.
+{
+
+  # Always defined, but the value depends on the presence of an option.
+  config.set = {
+    value = if options ? set.enable then 360 else 7;
+  }
+  # Only define if possible.
+  // lib.optionalAttrs (options ? set.enable) {
+    enable = true;
+  };
+
+}

From b4cf1c96faa60afaeea477dfff95f50ad08bf5f8 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 19 Mar 2020 10:57:30 +1000
Subject: [PATCH 3368/4636] slirp4netns: 0.4.3 -> 0.4.4

https://github.com/rootless-containers/slirp4netns/releases/tag/v0.4.4
---
 pkgs/tools/networking/slirp4netns/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix
index f9add47dd3fd..b70bf2952f7a 100644
--- a/pkgs/tools/networking/slirp4netns/default.nix
+++ b/pkgs/tools/networking/slirp4netns/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, libcap, libseccomp }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, libcap, libseccomp }:
 
 stdenv.mkDerivation rec {
   pname = "slirp4netns";
-  version = "0.4.3";
+  version = "0.4.4";
 
   src = fetchFromGitHub {
     owner = "rootless-containers";
     repo = "slirp4netns";
     rev = "v${version}";
-    sha256 = "0g7apfw33wkxxj7qwvlnnhv7qy13s1gkbmvns8612c0yfv9jrsvq";
+    sha256 = "1932q80s6187k4fsvgia5iwc9lqsdkxzqqwpw1ksy0mx8wzmwbih";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   buildInputs = [ libcap libseccomp glib ];
 
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/rootless-containers/slirp4netns;
+    homepage = "https://github.com/rootless-containers/slirp4netns";
     description = "User-mode networking for unprivileged network namespaces";
     license = licenses.gpl2;
     maintainers = with maintainers; [ orivej saschagrunert ];

From 0e886b69ab790c6c941c248faef50ba11da73134 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 19 Mar 2020 11:43:22 +1000
Subject: [PATCH 3369/4636] fd: use installShellFiles

---
 pkgs/tools/misc/fd/default.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix
index 3136381dd8eb..3dfe7c80a5a5 100644
--- a/pkgs/tools/misc/fd/default.nix
+++ b/pkgs/tools/misc/fd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, fetchFromGitHub, rustPlatform, installShellFiles }:
 
 rustPlatform.buildRustPackage rec {
   pname = "fd";
@@ -13,18 +13,17 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1nhlarrl0m6as3j2547yf1xxjm88qy3v8jgvhd47z3f5s63bb6w5";
 
-  preFixup = ''
-    install -Dm644 "$src/doc/fd.1" "$out/man/man1/fd.1"
+  nativeBuildInputs = [ installShellFiles ];
 
-    install -Dm644 target/release/build/fd-find-*/out/fd.bash \
-      "$out/share/bash-completion/completions/fd.bash"
-    install -Dm644 target/release/build/fd-find-*/out/fd.fish \
-      "$out/share/fish/vendor_completions.d/fd.fish"
-    install -Dm644 target/release/build/fd-find-*/out/_fd \
-      "$out/share/zsh/site-functions/_fd"
+  preFixup = ''
+    installManPage "$src/doc/fd.1"
+
+    (cd target/release/build/fd-find-*/out
+    installShellCompletion fd.{bash,fish}
+    installShellCompletion --zsh _fd)
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A simple, fast and user-friendly alternative to find";
     longDescription = ''
       `fd` is a simple, fast and user-friendly alternative to `find`.

From 6865db4d3cda54c131df09c124fd49bbd2639bb7 Mon Sep 17 00:00:00 2001
From: Jeff Labonte <jeff.labonte12@gmail.com>
Date: Wed, 18 Mar 2020 19:54:36 -0400
Subject: [PATCH 3370/4636] brave: 1.4.96 -> 1.5.112

---
 pkgs/applications/networking/browsers/brave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index cf3750addf85..2adc2ec7c795 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -82,11 +82,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "brave";
-  version = "1.4.96";
+  version = "1.5.112";
 
   src = fetchurl {
     url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-    sha256 = "12fdef417180d295170dd61ff0586e568a0c6475fabc0b3d003921ec924a84fc";
+    sha256 = "0am7qr09pvy6v720rngfxilh4yalxzp7vcq2yndcz6726wnhw9zx";
   };
 
   dontConfigure = true;

From 05343f6ff134c771802e554bbdacd109b7434933 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Wed, 18 Mar 2020 20:43:07 -0400
Subject: [PATCH 3371/4636] rust: remove legacy cargo fetcher

We have now migrated every single Rust package in NixPkgs! This deletes the
legacy fetcher, which is now unused.

Resolves #79975
---
 doc/languages-frameworks/rust.section.md    |  6 +-
 pkgs/build-support/rust/default.nix         | 23 ++----
 pkgs/build-support/rust/fetchcargo.nix      | 81 ---------------------
 pkgs/development/compilers/rust/default.nix |  8 +-
 4 files changed, 10 insertions(+), 108 deletions(-)
 delete mode 100644 pkgs/build-support/rust/fetchcargo.nix

diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md
index 97dc9e2ff531..cec3373cbee6 100644
--- a/doc/languages-frameworks/rust.section.md
+++ b/doc/languages-frameworks/rust.section.md
@@ -60,9 +60,9 @@ Nix depends on this file, so if it missing you can use `cargoPatches` to apply
 it in the `patchPhase`. Consider sending a PR upstream with a note to the
 maintainer describing why it's important to include in the application.
 
-Unless `legacyCargoFetcher` is set to `true`, the fetcher will also verify that
-the `Cargo.lock` file is in sync with the `src` attribute, and will compress the
-vendor directory into a tar.gz archive.
+The fetcher will verify that the `Cargo.lock` file is in sync with the `src`
+attribute, and fail the build if not. It will also will compress the vendor
+directory into a tar.gz archive.
 
 ### Building a crate for a different target
 
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index f42f951680f7..7cfd03a4e265 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cacert, git, rust, cargo, rustc, fetchcargo, fetchCargoTarball, buildPackages, windows }:
+{ stdenv, cacert, git, rust, cargo, rustc, fetchCargoTarball, buildPackages, windows }:
 
 { name ? "${args.pname}-${args.version}"
 , cargoSha256 ? "unset"
@@ -14,7 +14,6 @@
 , cargoUpdateHook ? ""
 , cargoDepsHook ? ""
 , cargoBuildFlags ? []
-, legacyCargoFetcher ? false
 , buildType ? "release"
 , meta ? {}
 , target ? null
@@ -26,21 +25,17 @@ assert buildType == "release" || buildType == "debug";
 
 let
 
-  cargoFetcher = if legacyCargoFetcher
-                 then fetchcargo
-                 else fetchCargoTarball;
-
   cargoDeps = if cargoVendorDir == null
-    then cargoFetcher {
+    then fetchCargoTarball {
         inherit name src srcs sourceRoot unpackPhase cargoUpdateHook;
         patches = cargoPatches;
         sha256 = cargoSha256;
       }
     else null;
 
-  # If we're using the modern fetcher that always preserves the original Cargo.lock
-  # and have vendored deps, check them against the src attr for consistency.
-  validateCargoDeps = cargoSha256 != "unset" && !legacyCargoFetcher;
+  # If we have a cargoSha256 fixed-output derivation, validate it at build time
+  # against the src fixed-output derivation to check consistency.
+  validateCargoDeps = cargoSha256 != "unset";
 
   # Some cargo builds include build hooks that modify their own vendor
   # dependencies. This copies the vendor directory into the build tree and makes
@@ -50,8 +45,6 @@ let
     then (''
       unpackFile "$cargoDeps"
       cargoDepsCopy=$(stripHash $cargoDeps)
-    '' + stdenv.lib.optionalString legacyCargoFetcher ''
-      chmod -R +w "$cargoDepsCopy"
     '')
     else ''
       cargoDepsCopy="$sourceRoot/${cargoVendorDir}"
@@ -65,13 +58,9 @@ let
   cxxForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++";
   releaseDir = "target/${rustTarget}/${buildType}";
 
-  # Fetcher implementation choice should not be part of the hash in final
-  # derivation; only the cargoSha256 input matters.
-  filteredArgs = builtins.removeAttrs args [ "legacyCargoFetcher" ];
-
 in
 
-stdenv.mkDerivation (filteredArgs // {
+stdenv.mkDerivation (args // {
   inherit cargoDeps;
 
   patchRegistryDeps = ./patch-registry-deps;
diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
deleted file mode 100644
index 7a0ba38dce71..000000000000
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{ stdenv, cacert, git, cargo, python3 }:
-let cargo-vendor-normalise = stdenv.mkDerivation {
-  name = "cargo-vendor-normalise";
-  src = ./cargo-vendor-normalise.py;
-  nativeBuildInputs = [ python3.pkgs.wrapPython ];
-  dontUnpack = true;
-  installPhase = "install -D $src $out/bin/cargo-vendor-normalise";
-  pythonPath = [ python3.pkgs.toml ];
-  postFixup = "wrapPythonPrograms";
-  doInstallCheck = true;
-  installCheckPhase = ''
-    # check that ./fetchcargo-default-config.toml is a fix point
-    reference=${./fetchcargo-default-config.toml}
-    < $reference $out/bin/cargo-vendor-normalise > test;
-    cmp test $reference
-  '';
-  preferLocalBuild = true;
-};
-in
-{ name ? "cargo-deps"
-, src ? null
-, srcs ? []
-, patches ? []
-, sourceRoot
-, sha256
-, cargoUpdateHook ? ""
-, # whenever to also include the Cargo.lock in the output
-  copyLockfile ? false
-, ...
-} @ args:
-stdenv.mkDerivation ({
-  name = "${name}-vendor";
-  nativeBuildInputs = [ cacert git cargo-vendor-normalise cargo ];
-
-  phases = "unpackPhase patchPhase installPhase";
-
-  installPhase = ''
-    if [[ ! -f Cargo.lock ]]; then
-        echo
-        echo "ERROR: The Cargo.lock file doesn't exist"
-        echo
-        echo "Cargo.lock is needed to make sure that cargoSha256 doesn't change"
-        echo "when the registry is updated."
-        echo
-
-        exit 1
-    fi
-
-    # Keep the original around for copyLockfile
-    cp Cargo.lock Cargo.lock.orig
-
-    export CARGO_HOME=$(mktemp -d cargo-home.XXX)
-    CARGO_CONFIG=$(mktemp cargo-config.XXXX)
-
-    ${cargoUpdateHook}
-
-    mkdir -p $out
-    cargo vendor $out | cargo-vendor-normalise > $CARGO_CONFIG
-    # fetchcargo used to never keep the config output by cargo vendor
-    # and instead hardcode the config in ./fetchcargo-default-config.toml.
-    # This broke on packages needing git dependencies, so now we keep the config.
-    # But not to break old cargoSha256, if the previous behavior was enough,
-    # we don't store the config.
-    if ! cmp $CARGO_CONFIG ${./fetchcargo-default-config.toml} > /dev/null; then
-      install -D $CARGO_CONFIG $out/.cargo/config;
-    fi;
-
-  '' + stdenv.lib.optionalString copyLockfile ''
-    # add the Cargo.lock to allow hash invalidation
-    cp Cargo.lock.orig $out/Cargo.lock
-  '';
-
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = sha256;
-
-  impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
-  preferLocalBuild = true;
-} // (builtins.removeAttrs args [
-  "name" "sha256" "cargoUpdateHook" "copyLockfile"
-]))
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index a5da7ee7a6d4..1673441575c0 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -30,14 +30,8 @@
       inherit cargo;
     };
 
-    # N.B. This is a legacy fetcher implementation that is being phased out and deleted.
-    # See ../../../build-support/rust/README.md for details.
-    fetchcargo = buildPackages.callPackage ../../../build-support/rust/fetchcargo.nix {
-      inherit cargo;
-    };
-
     buildRustPackage = callPackage ../../../build-support/rust {
-      inherit rustc cargo fetchcargo fetchCargoTarball;
+      inherit rustc cargo fetchCargoTarball;
     };
 
     rustcSrc = callPackage ./rust-src.nix {

From 68775b63f1f1d3897617b0a59b155313df5d9cd9 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <meurerbernardo@gmail.com>
Date: Tue, 10 Mar 2020 15:26:10 -0700
Subject: [PATCH 3372/4636] passh: init at 2020-03-18

---
 pkgs/tools/networking/passh/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/networking/passh/default.nix

diff --git a/pkgs/tools/networking/passh/default.nix b/pkgs/tools/networking/passh/default.nix
new file mode 100644
index 000000000000..6534d3a1d517
--- /dev/null
+++ b/pkgs/tools/networking/passh/default.nix
@@ -0,0 +1,25 @@
+{ lib, fetchFromGitHub, stdenv }:
+stdenv.mkDerivation rec {
+  pname = "passh";
+  version = "2020-03-18";
+
+  src = fetchFromGitHub {
+    owner = "clarkwang";
+    repo = pname;
+    rev = "7112e667fc9e65f41c384f89ff6938d23e86826c";
+    sha256 = "1g0rx94vqg36kp46f8v4x6jcmvdk85ds6bkrpayq772hbdm1b5z5";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp passh $out/bin
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/clarkwang/passh";
+    description = "An sshpass alternative for non-interactive ssh auth";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.lovesegfault ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71fb2a3134e2..ead87d32fa06 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5698,6 +5698,8 @@ in
 
   parted = callPackage ../tools/misc/parted { };
 
+  passh = callPackage ../tools/networking/passh { };
+
   paulstretch = callPackage ../applications/audio/paulstretch { };
 
   pazi = callPackage ../tools/misc/pazi { };

From 25f99265da5a11f617d80aa2c0b8cb9a2a80f392 Mon Sep 17 00:00:00 2001
From: Marcus Boyd <mwb@geosol.com.au>
Date: Wed, 18 Mar 2020 15:18:39 +1030
Subject: [PATCH 3373/4636] python3Packages.spyder-kernels: Add
 spyder-kernels_0_5

Previously top-level/python-packages.nix called spyder-kernels v0.5 for
Py2k. Now both v0.5 and v1.8 (default.nix) are in pythonPackages, as
required by cq-editor and spyder v4 respectively.
v0.5 also now comes from GitHub instead of PyPi, with checks enabled.
---
 .../python-modules/spyder-kernels/0.x.nix     | 72 +++++++++++++++++++
 .../python-modules/spyder-kernels/2.nix       | 30 --------
 pkgs/top-level/python-packages.nix            |  4 +-
 3 files changed, 74 insertions(+), 32 deletions(-)
 create mode 100644 pkgs/development/python-modules/spyder-kernels/0.x.nix
 delete mode 100644 pkgs/development/python-modules/spyder-kernels/2.nix

diff --git a/pkgs/development/python-modules/spyder-kernels/0.x.nix b/pkgs/development/python-modules/spyder-kernels/0.x.nix
new file mode 100644
index 000000000000..c4a61520333e
--- /dev/null
+++ b/pkgs/development/python-modules/spyder-kernels/0.x.nix
@@ -0,0 +1,72 @@
+{ 
+  lib
+  , buildPythonPackage
+  , fetchFromGitHub
+  , cloudpickle
+  , ipykernel
+  , wurlitzer
+  , jupyter_client
+  , pyzmq 
+  , numpy
+  , pandas
+  , scipy
+  , matplotlib
+  , xarray
+  , pytest
+  , flaky
+  , isPy3k
+}:
+
+buildPythonPackage rec {
+  pname = "spyder-kernels";
+  version = "0.5.2";
+
+  src = fetchFromGitHub {
+    owner = "spyder-ide";
+    repo = "spyder-kernels";
+    rev = "v0.5.2";
+    sha256 = "1yan589g0470y61bcyjy3wj13i94ndyffckqdyrg97vw2qhfrisb";
+  };
+
+  # requirement xarray not available on Py2k
+  disabled = !isPy3k;
+
+  propagatedBuildInputs = [
+    cloudpickle
+    ipykernel
+    wurlitzer
+    jupyter_client
+    pyzmq
+  ];
+
+  checkInputs = [
+    numpy
+    pandas
+    scipy
+    matplotlib
+    xarray
+    pytest
+    flaky
+  ];
+
+  # skipped tests:
+  # turtle requires graphics
+  # cython test fails, I don't think this can ever access cython?
+  # umr pathlist test assumes standard directories, not compatible with nix
+  checkPhase = ''
+    export JUPYTER_RUNTIME_DIR=$(mktemp -d)
+    pytest -x -vv -k '\
+      not test_turtle_launch \
+      and not test_umr_skip_cython \
+      and not test_umr_pathlist' \
+      -W 'ignore::DeprecationWarning' \
+      spyder_kernels
+  '';
+
+  meta = with lib; {
+    description = "Jupyter kernels for Spyder's console";
+    homepage = "https://github.com/spyder-ide/spyder-kernels";
+    license = licenses.mit;
+    maintainers = with maintainers; [ gebner marcus7070 ];
+  };
+}
diff --git a/pkgs/development/python-modules/spyder-kernels/2.nix b/pkgs/development/python-modules/spyder-kernels/2.nix
deleted file mode 100644
index 86daec23d954..000000000000
--- a/pkgs/development/python-modules/spyder-kernels/2.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer,
-  jupyter_client, pyzmq }:
-
-buildPythonPackage rec {
-  pname = "spyder-kernels";
-  version = "0.5.2";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "01354b7fa180a87212cc005553b31a7300159b108d36828e301d3782291323f7";
-  };
-
-  propagatedBuildInputs = [
-    cloudpickle
-    ipykernel
-    wurlitzer
-    jupyter_client
-    pyzmq
-  ];
-
-  # No tests
-  doCheck = false;
-
-  meta = with stdenv.lib; {
-    description = "Jupyter kernels for Spyder's console";
-    homepage = "https://github.com/spyder-ide/spyder-kernels";
-    license = licenses.mit;
-    maintainers = with maintainers; [ gebner ];
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7d1c36f2d874..cd594153eec5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1504,8 +1504,8 @@ in {
 
   sniffio = callPackage ../development/python-modules/sniffio { };
 
-  spyder-kernels = if isPy3k then callPackage ../development/python-modules/spyder-kernels {}
-    else callPackage ../development/python-modules/spyder-kernels/2.nix {};
+  spyder-kernels = callPackage ../development/python-modules/spyder-kernels {};
+  spyder-kernels_0_5 = callPackage ../development/python-modules/spyder-kernels/0.x.nix {};
 
   spyder = if isPy3k then callPackage ../development/python-modules/spyder {}
     else callPackage ../development/python-modules/spyder/2.nix {};

From da760cf7a01a23519a8bdaf6683705a6028fb46b Mon Sep 17 00:00:00 2001
From: Marcus Boyd <mwb@geosol.com.au>
Date: Thu, 19 Mar 2020 12:01:08 +1030
Subject: [PATCH 3374/4636] python3Packages.spyder_3: Added spyder_3

cq-editor currently requires spyder v3.x
---
 pkgs/development/python-modules/spyder/{2.nix => 3.nix} | 4 ++--
 pkgs/top-level/python-packages.nix                      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/development/python-modules/spyder/{2.nix => 3.nix} (96%)

diff --git a/pkgs/development/python-modules/spyder/2.nix b/pkgs/development/python-modules/spyder/3.nix
similarity index 96%
rename from pkgs/development/python-modules/spyder/2.nix
rename to pkgs/development/python-modules/spyder/3.nix
index b707d4a0abc1..7987775cee1d 100644
--- a/pkgs/development/python-modules/spyder/2.nix
+++ b/pkgs/development/python-modules/spyder/3.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPythonPackage, fetchPypi, makeDesktopItem, jedi, pycodestyle,
   psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc,
   qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments,
-  spyder-kernels, qtpy, pyzmq, chardet
+  spyder-kernels_0_5, qtpy, pyzmq, chardet
 , pyqtwebengine
 }:
 
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring
-    numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels
+    numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels_0_5
     pygments qtpy pyzmq chardet pyqtwebengine
   ];
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cd594153eec5..28695722a92e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1507,8 +1507,8 @@ in {
   spyder-kernels = callPackage ../development/python-modules/spyder-kernels {};
   spyder-kernels_0_5 = callPackage ../development/python-modules/spyder-kernels/0.x.nix {};
 
-  spyder = if isPy3k then callPackage ../development/python-modules/spyder {}
-    else callPackage ../development/python-modules/spyder/2.nix {};
+  spyder = callPackage ../development/python-modules/spyder {};
+  spyder_3 = callPackage ../development/python-modules/spyder/3.nix { };
 
   tenacity = callPackage ../development/python-modules/tenacity { };
 

From 45632582c52b6239675654560c2098c08aeef429 Mon Sep 17 00:00:00 2001
From: Marcus Boyd <mwb@geosol.com.au>
Date: Thu, 19 Mar 2020 12:03:28 +1030
Subject: [PATCH 3375/4636] cq-editor: use spyder_3

---
 pkgs/applications/graphics/cq-editor/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/cq-editor/default.nix b/pkgs/applications/graphics/cq-editor/default.nix
index 32d079d85ff3..a6b35b1d8ea6 100644
--- a/pkgs/applications/graphics/cq-editor/default.nix
+++ b/pkgs/applications/graphics/cq-editor/default.nix
@@ -21,7 +21,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
     pyqt5
     pyparsing
     pyqtgraph
-    spyder
+    spyder_3
     pathpy
     qtconsole
     requests

From e758e95c1db5806af246d4bcb9cd1f95a7b2ffe8 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 19 Mar 2020 08:42:34 +0100
Subject: [PATCH 3376/4636] linuxPackages.wireguard: 0.0.20200215 ->
 0.0.20200318

https://lists.zx2c4.com/pipermail/wireguard/2020-March/005188.html
---
 pkgs/os-specific/linux/wireguard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index b3f7a41d32bc..8672aeb22fd3 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6";
 
 stdenv.mkDerivation rec {
   pname = "wireguard";
-  version = "0.0.20200215";
+  version = "0.0.20200318";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz";
-    sha256 = "1hd9hm876ixr8jvzp5s1n9r6xal08sh2pxgj10pw4pk7mm15z2ib";
+    sha256 = "1syl3p37fvfxvp4apvfnlp632pg3xwslj9r3s54mpxbxc6d8s3v6";
   };
 
   preConfigure = ''

From e57d07f2ae8295e84a1fdb39f07dc3226b72e3ad Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 19 Mar 2020 17:46:14 +1000
Subject: [PATCH 3377/4636] libslirp: init at 4.2.0 (#82905)

---
 .../libraries/libslirp/default.nix            | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/libraries/libslirp/default.nix

diff --git a/pkgs/development/libraries/libslirp/default.nix b/pkgs/development/libraries/libslirp/default.nix
new file mode 100644
index 000000000000..27a4d6ceb64c
--- /dev/null
+++ b/pkgs/development/libraries/libslirp/default.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, fetchFromGitLab
+, meson
+, ninja
+, pkg-config
+, glib
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libslirp";
+  version = "4.2.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.freedesktop.org";
+    owner = "slirp";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1qk513fgfh4hwb1ajjmvg9m1bl97m3n731ymxqsh1c3fj468a2am";
+  };
+
+  nativeBuildInputs = [ meson ninja pkg-config ];
+
+  buildInputs = [ glib ];
+
+  meta = with stdenv.lib; {
+    description = "General purpose TCP-IP emulator";
+    homepage = "https://gitlab.freedesktop.org/slirp/libslirp";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ orivej ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 120a3718aded..1edff11927c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13111,6 +13111,8 @@ in
 
   libsigsegv = callPackage ../development/libraries/libsigsegv { };
 
+  libslirp = callPackage ../development/libraries/libslirp { };
+
   libsndfile = callPackage ../development/libraries/libsndfile {
     inherit (darwin.apple_sdk.frameworks) Carbon AudioToolbox;
   };

From d57719b5b670320762ea17ad95e137b8ba98e936 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 18 Mar 2020 18:00:00 -0500
Subject: [PATCH 3378/4636] flow: 0.120.1 -> 0.121.0

Changelog: https://github.com/facebook/flow/releases/tag/v0.121.0
---
 pkgs/development/tools/analysis/flow/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index c977a9d20820..9e7b2d5096d0 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flow";
-  version = "0.120.1";
+  version = "0.121.0";
 
   src = fetchFromGitHub {
     owner  = "facebook";
     repo   = "flow";
     rev    = "refs/tags/v${version}";
-    sha256 = "0cqwwrml7yaqyd52rqcz64gbm1pc0yj5yhqqqj9vqyil8wif30v3";
+    sha256 = "1lx3lfn0blnwpq6iph0x6xcr4nrdhyvfvx6x8qk6axwlmg2swdcy";
   };
 
   installPhase = ''

From a97b3677e3d30023b52b9369d44b9ccdf1d7ff6b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 19 Mar 2020 04:20:00 -0500
Subject: [PATCH 3379/4636] fluent-bit: 1.3.9 -> 1.3.11

---
 pkgs/tools/misc/fluent-bit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix
index a593805b651e..ddc5757bdce4 100644
--- a/pkgs/tools/misc/fluent-bit/default.nix
+++ b/pkgs/tools/misc/fluent-bit/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fluent-bit";
-  version = "1.3.9";
+  version = "1.3.11";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     rev = "v${version}";
-    sha256 = "1ly6afq4badmvs1rsqcai5kyka66n0rzi8857893wjcscppja55a";
+    sha256 = "0s1j5mrih4zzaxhqhrd01cibp53rbdqfxf0ng64yfjqlqdh4dhkk";
   };
 
   nativeBuildInputs = [ cmake flex bison ];

From 0ec3f4e26b6bcc9513202f9a479c897fece9b2bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20W=C3=BCnsche?= <holger.o.wuensche@t-online.de>
Date: Tue, 17 Mar 2020 13:59:19 +0100
Subject: [PATCH 3380/4636] llvmPackages_10: rc3 -> rc4

Only needed to update hashes and the version.
Updated comment for extension handling patch
---
 pkgs/development/compilers/llvm/10/clang/default.nix  | 4 ++--
 pkgs/development/compilers/llvm/10/compiler-rt.nix    | 2 +-
 pkgs/development/compilers/llvm/10/default.nix        | 4 ++--
 pkgs/development/compilers/llvm/10/libc++/default.nix | 2 +-
 pkgs/development/compilers/llvm/10/libc++abi.nix      | 2 +-
 pkgs/development/compilers/llvm/10/libunwind.nix      | 2 +-
 pkgs/development/compilers/llvm/10/lld.nix            | 2 +-
 pkgs/development/compilers/llvm/10/lldb.nix           | 2 +-
 pkgs/development/compilers/llvm/10/llvm.nix           | 4 ++--
 pkgs/development/compilers/llvm/10/openmp.nix         | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/compilers/llvm/10/clang/default.nix b/pkgs/development/compilers/llvm/10/clang/default.nix
index 13fe4bedd46f..b7d3f340d5fe 100644
--- a/pkgs/development/compilers/llvm/10/clang/default.nix
+++ b/pkgs/development/compilers/llvm/10/clang/default.nix
@@ -8,7 +8,7 @@ let
     pname = "clang";
     inherit version;
 
-    src = fetch "clang" "1w7ixr16a9f0g5kv4irvhwq973wn0d418kb0p9rabyfscm05wfmq";
+    src = fetch "clang" "19y2nii0rqq8hf657d331s8rmpddlm5wvcznhdwxkymd0fd5l7vm";
 
     unpackPhase = ''
       unpackFile $src
@@ -36,7 +36,7 @@ let
     ];
 
     patches = [
-      # 10.0.0rc3-only
+      # 10.0.0 only, this should be present in 10.0.1
       ./clang-extension-handling.patch
 
       ./purity.patch
diff --git a/pkgs/development/compilers/llvm/10/compiler-rt.nix b/pkgs/development/compilers/llvm/10/compiler-rt.nix
index 2d71268c6624..55575d53b00a 100644
--- a/pkgs/development/compilers/llvm/10/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/10/compiler-rt.nix
@@ -2,7 +2,7 @@
 stdenv.mkDerivation rec {
   pname = "compiler-rt";
   inherit version;
-  src = fetch pname "0qv40mv91630l6f75w9g5y6v97s5shz94n82rms12gcd8mir6qp5";
+  src = fetch pname "0s2dzhcvdw50wsw6abksrrc9bqzwa6dp0qfk3bykinj8ah33ljws";
 
   nativeBuildInputs = [ cmake python3 llvm ];
   buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix
index f2a8883a9a7e..4dc41961e23d 100644
--- a/pkgs/development/compilers/llvm/10/default.nix
+++ b/pkgs/development/compilers/llvm/10/default.nix
@@ -6,7 +6,7 @@
 
 let
   release_version = "10.0.0";
-  candidate = "rc3";
+  candidate = "rc4";
   version = "10.0.0${candidate}"; # differentiating these is important for rc's
 
   fetch = name: sha256: fetchurl {
@@ -14,7 +14,7 @@ let
     inherit sha256;
   };
 
-  clang-tools-extra_src = fetch "clang-tools-extra" "03669c93wzmbmfpv0pyzb7y4z1xc912l95iqywyx01xgdl1xws0r";
+  clang-tools-extra_src = fetch "clang-tools-extra" "0irbb1n31qpwzspizxp2b17m4jnbkh6rlr9bs85q16yc4xr6c781";
 
   tools = stdenv.lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
diff --git a/pkgs/development/compilers/llvm/10/libc++/default.nix b/pkgs/development/compilers/llvm/10/libc++/default.nix
index 767b1cbbc583..0ff4e2ab6ea0 100644
--- a/pkgs/development/compilers/llvm/10/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/10/libc++/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   pname = "libc++";
   inherit version;
 
-  src = fetch "libcxx" "1cjxiby8nq95g02rgx08iy86pswpi66b9wmxqjiyga1s92nb19j0";
+  src = fetch "libcxx" "1j15szimdyihqzz5k1ys40v1vrswa4aaj6ckpqx3gngindi80sdr";
 
   postUnpack = ''
     unpackFile ${libcxxabi.src}
diff --git a/pkgs/development/compilers/llvm/10/libc++abi.nix b/pkgs/development/compilers/llvm/10/libc++abi.nix
index 8ad52b5ed57f..ddfc15321d42 100644
--- a/pkgs/development/compilers/llvm/10/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/10/libc++abi.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   pname = "libc++abi";
   inherit version;
 
-  src = fetch "libcxxabi" "1xs7dr91qzz7lq9am4q3vcj2jf1gx23ar1jbnhn763011hl94vs0";
+  src = fetch "libcxxabi" "08w3lvg414k2w3ddbdbc979z38l7w1rbnwrxq68mvcrp7zry347a";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
diff --git a/pkgs/development/compilers/llvm/10/libunwind.nix b/pkgs/development/compilers/llvm/10/libunwind.nix
index 74a8687179fe..67805b31f14f 100644
--- a/pkgs/development/compilers/llvm/10/libunwind.nix
+++ b/pkgs/development/compilers/llvm/10/libunwind.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   pname = "libunwind";
   inherit version;
 
-  src = fetch pname "1dm7l75ajnjy6kbg2157v2g5gfia3n47fc56ayryyp2jdvbgprwl";
+  src = fetch pname "07rp723yldqvr05hmfq7xsa2g6sdw9jiird4r5v9lk112bwb2y1q";
 
   nativeBuildInputs = [ cmake ];
 
diff --git a/pkgs/development/compilers/llvm/10/lld.nix b/pkgs/development/compilers/llvm/10/lld.nix
index 6323866ae886..f161194982b8 100644
--- a/pkgs/development/compilers/llvm/10/lld.nix
+++ b/pkgs/development/compilers/llvm/10/lld.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   pname = "lld";
   inherit version;
 
-  src = fetch pname "1w9c9xmzbdnkwgal612hqz2lxj9jgqpfzxr2rllcspmf6v7arvf4";
+  src = fetch pname "1c8s5jcp1h2lvws6dxy7c3a36ic10q6lbmd4i38l3g3irl6dj871";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ llvm libxml2 ];
diff --git a/pkgs/development/compilers/llvm/10/lldb.nix b/pkgs/development/compilers/llvm/10/lldb.nix
index fd318314dea5..43e464fa00d6 100644
--- a/pkgs/development/compilers/llvm/10/lldb.nix
+++ b/pkgs/development/compilers/llvm/10/lldb.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (rec {
   pname = "lldb";
   inherit version;
 
-  src = fetch pname "06qzh13cr20wrd5925698yq696bhl68zbvm7kjxp7c2rx5swxmg8";
+  src = fetch pname "1djjjya2fawkc8fd9x82ijsscz3k6kj9mwdsnpk0yikac167pqaw";
 
   patches = [ ./lldb-procfs.patch ];
 
diff --git a/pkgs/development/compilers/llvm/10/llvm.nix b/pkgs/development/compilers/llvm/10/llvm.nix
index eb93d8648f9a..aa3668b43cfa 100644
--- a/pkgs/development/compilers/llvm/10/llvm.nix
+++ b/pkgs/development/compilers/llvm/10/llvm.nix
@@ -31,8 +31,8 @@ in stdenv.mkDerivation (rec {
   pname = "llvm";
   inherit version;
 
-  src = fetch pname "1pa322iwqg071gxdn5wxri263j6aki6ag36xbdzbyi3g8m8v8jci";
-  polly_src = fetch "polly" "0p9dmv4hxwx4f5k1v4r9b5jp7fbi71ajpmrv3xf3vmp6m4i3r0pc";
+  src = fetch pname "16mh2n5s7pngc1wlkwp2xnnjpjljm4p6d6ld1646dayr6q8lmi34";
+  polly_src = fetch "polly" "15w5mpl98wldyxjgqjnbh1pb4p9wnrqgik7sq2qi49qp4g1cg5wh";
 
   unpackPhase = ''
     unpackFile $src
diff --git a/pkgs/development/compilers/llvm/10/openmp.nix b/pkgs/development/compilers/llvm/10/openmp.nix
index cff2ad365360..9864235dca00 100644
--- a/pkgs/development/compilers/llvm/10/openmp.nix
+++ b/pkgs/development/compilers/llvm/10/openmp.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   pname = "openmp";
   inherit version;
 
-  src = fetch pname "0axdxar18rvk9r4yx7y55ywqr3070mixag9sg2fcck1jzwfgymjb";
+  src = fetch pname "1qnimi4dypy4r8vpjxcg2rpc9lsvsyi4kl08v51p33657q449syr";
 
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [ llvm ];

From e9aa8770ea8bd872da0d04cb98a7856ba1fc5412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20W=C3=BCnsche?= <holger.o.wuensche@t-online.de>
Date: Tue, 17 Mar 2020 14:40:07 +0100
Subject: [PATCH 3381/4636] llvmPackages_10: removed extra polly-build

There is no good reason to have separate builds for polly and no-polly
versions. wwwwwThe reason for the two versions was (as far as I can
tell) to defer rebuilds (see ed60483257b62c32b5b58c6e91c9c8cd586f77d0).
Polly is now enabled by default.
---
 pkgs/development/compilers/llvm/10/default.nix | 5 -----
 pkgs/development/compilers/llvm/10/llvm.nix    | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix
index 4dc41961e23d..566f9742ccb2 100644
--- a/pkgs/development/compilers/llvm/10/default.nix
+++ b/pkgs/development/compilers/llvm/10/default.nix
@@ -30,16 +30,11 @@ let
   in {
 
     llvm = callPackage ./llvm.nix { };
-    llvm-polly = callPackage ./llvm.nix { enablePolly = true; };
 
     clang-unwrapped = callPackage ./clang {
       inherit (tools) lld;
       inherit clang-tools-extra_src;
     };
-    clang-polly-unwrapped = callPackage ./clang {
-      inherit clang-tools-extra_src;
-      llvm = tools.llvm-polly;
-    };
 
     llvm-manpages = lowPrio (tools.llvm.override {
       enableManpages = true;
diff --git a/pkgs/development/compilers/llvm/10/llvm.nix b/pkgs/development/compilers/llvm/10/llvm.nix
index aa3668b43cfa..fff80e3f8140 100644
--- a/pkgs/development/compilers/llvm/10/llvm.nix
+++ b/pkgs/development/compilers/llvm/10/llvm.nix
@@ -17,7 +17,7 @@
 , enablePFM ? !(stdenv.isDarwin
   || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245
 )
-, enablePolly ? false
+, enablePolly ? true
 }:
 
 let

From 85d9b5b08315b371b6142240083e3996442ded64 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Mar 2020 10:01:16 +0000
Subject: [PATCH 3382/4636] miller: 5.6.2 -> 5.7.0

---
 pkgs/tools/text/miller/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix
index 1fc462bad8b0..3b8fbdb64298 100644
--- a/pkgs/tools/text/miller/default.nix
+++ b/pkgs/tools/text/miller/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   pname = "miller";
 
-  version = "5.6.2";
+  version = "5.7.0";
 
   src = fetchFromGitHub {
     owner = "johnkerl";
     repo = "miller";
     rev = "v${version}";
-    sha256 = "1xajaab02y9bysanfn4i5c77q1zfmjzdswyvw2mzbidsxnjsgn6l";
+    sha256 = "1lmin69rf9lp3b64ga7li4sz7mm0gqapsbk1nb29l4fqjxk16ddh";
   };
 
   nativeBuildInputs = [ autoreconfHook flex libtool ];

From d324a9aa0f97552ab847e3c401e3064a7fac23fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 19 Mar 2020 08:51:48 -0300
Subject: [PATCH 3383/4636] mojave-gtk-theme: 2020-02-20 -> 2020-03-19

---
 pkgs/data/themes/mojave/default.nix | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix
index d560e3fe5838..0bd71b46c0d9 100644
--- a/pkgs/data/themes/mojave/default.nix
+++ b/pkgs/data/themes/mojave/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchFromGitHub, fetchurl, gtk_engines, gtk-engine-murrine }:
+{ stdenv, fetchFromGitHub, fetchurl, glib, gtk-engine-murrine, gtk_engines, inkscape, optipng, sassc, which }:
 
 stdenv.mkDerivation rec {
   pname = "mojave-gtk-theme";
-  version = "2020-02-20";
+  version = "2020-03-19";
 
   srcs = [
     (fetchFromGitHub {
       owner = "vinceliuice";
       repo = pname;
       rev = version;
-      sha256 = "0fbpjfdx53g4qicr97jl1dssykjwwca9xzrfyh53dmd81vr6znpy";
+      sha256 = "1f120sx092i56q4dx2b8d3nnn9pdw67656446nw702rix7zc5jpx";
     })
     (fetchurl {
       url = "https://github.com/vinceliuice/Mojave-gtk-theme/raw/11741a99d96953daf9c27e44c94ae50a7247c0ed/macOS_Mojave_Wallpapers.tar.xz";
@@ -19,12 +19,32 @@ stdenv.mkDerivation rec {
 
   sourceRoot = "source";
 
+  nativeBuildInputs = [ glib inkscape optipng sassc which ];
+
   buildInputs = [ gtk_engines ];
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
-  installPhase = ''
+  postPatch = ''
     patchShebangs .
+
+    for f in render-assets.sh \
+             src/assets/gtk-2.0/render-assets.sh \
+             src/assets/gtk-3.0/common-assets/render-assets.sh \
+             src/assets/gtk-3.0/windows-assets/render-assets.sh \
+             src/assets/metacity-1/render-assets.sh \
+             src/assets/xfwm4/render-assets.sh
+    do
+      substituteInPlace $f \
+        --replace /usr/bin/inkscape ${inkscape}/bin/inkscape \
+        --replace /usr/bin/optipng ${optipng}/bin/optipng
+    done
+
+    # Shut up inkscape's warnings
+    export HOME="$NIX_BUILD_ROOT"
+  '';
+
+  installPhase = ''
     name= ./install.sh -d $out/share/themes
     install -D -t $out/share/wallpapers ../"macOS Mojave Wallpapers"/*
   '';

From ccf8d188b305d1720bdb4620d270c63908d560bb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Mar 2020 12:55:37 +0000
Subject: [PATCH 3384/4636] obs-studio: 24.0.6 -> 25.0.0

---
 pkgs/applications/video/obs-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 380b3d49ca73..61d58d42d433 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -37,13 +37,13 @@ let
   inherit (stdenv.lib) optional optionals;
 in mkDerivation rec {
   pname = "obs-studio";
-  version = "24.0.6";
+  version = "25.0.0";
 
   src = fetchFromGitHub {
     owner = "obsproject";
     repo = "obs-studio";
     rev = version;
-    sha256 = "07grnab5v4fd4lw25adhnlifs5c5phc3rsz7h80m663nbszy7abh";
+    sha256 = "1xbvj69zk1x2sv39wqjp5s929c61szn32d3d0ykhxr6jxb0sih4w";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
@@ -87,7 +87,7 @@ in mkDerivation rec {
       Software", software originally designed for recording and streaming live
       video content, efficiently
     '';
-    homepage = https://obsproject.com;
+    homepage = "https://obsproject.com";
     maintainers = with maintainers; [ jb55 MP2E ];
     license = licenses.gpl2;
     platforms = [ "x86_64-linux" "i686-linux" ];

From 39767f8ae50a8ed1878c550c9fb45f3253d7cbed Mon Sep 17 00:00:00 2001
From: Claudio Bley <cbley@exa-online.de>
Date: Thu, 19 Mar 2020 14:05:54 +0100
Subject: [PATCH 3385/4636] foldingathome: Make FAHControl be able to start the
 FAHViewer (#82925)

The command to run when clicking the button is configurable, but by default it
tries to run `FAHViewer`.
---
 pkgs/applications/science/misc/foldingathome/control.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/misc/foldingathome/control.nix b/pkgs/applications/science/misc/foldingathome/control.nix
index be400ffe5f95..e8eba4c2ab2f 100644
--- a/pkgs/applications/science/misc/foldingathome/control.nix
+++ b/pkgs/applications/science/misc/foldingathome/control.nix
@@ -1,6 +1,7 @@
 { stdenv
 , autoPatchelfHook
 , dpkg
+, fahviewer
 , fetchurl
 , makeWrapper
 , python2
@@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
     makeWrapper
   ];
 
-  buildInputs = [ python ];
+  buildInputs = [ fahviewer python ];
 
   doBuild = false;
 
@@ -45,6 +46,7 @@ stdenv.mkDerivation rec {
   postFixup = ''
     sed -e 's|/usr/bin|$out/bin|g' -i $out/share/applications/FAHControl.desktop
     wrapProgram "$out/bin/FAHControl" \
+      --suffix PATH : "${fahviewer.outPath}/bin" \
       --set PYTHONPATH "$out/lib/python2.7/dist-packages"
   '';
 

From 8edcbd58f1cff133ce0ef3d1425998439bb2a650 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 19 Mar 2020 14:13:23 +0100
Subject: [PATCH 3386/4636] visualvm: 1.4.4 -> 2.0 (#82842)

* visualvm: 1.4.4 -> 2.0

* visualvm: gtk is part of the JVM disto
---
 pkgs/development/tools/java/visualvm/default.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix
index 4dd6c1efc900..b85ae307ee5a 100644
--- a/pkgs/development/tools/java/visualvm/default.nix
+++ b/pkgs/development/tools/java/visualvm/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gtk2, gawk }:
+{ stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.4";
+  version = "2.0";
   pname = "visualvm";
 
   src = fetchzip {
     url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""]  version}.zip";
-    sha256 = "04x4z1013nzjgz9nhs743sphjgg7d3yjn0phxfmxdjzqpff9l133";
+    hash = "sha256-+T8U/GwMA46FHd0p6qpklHXb6+HPCbbIbo6s2Y/77RQ=";
   };
 
   desktopItem = makeDesktopItem {
@@ -26,16 +26,11 @@ stdenv.mkDerivation rec {
     substituteInPlace etc/visualvm.conf \
       --replace "#visualvm_jdkhome=" "visualvm_jdkhome=" \
       --replace "/path/to/jdk" "${jdk.home}" \
-      --replace 'visualvm_default_options="' 'visualvm_default_options="--laf com.sun.java.swing.plaf.gtk.GTKLookAndFeel -J-Dawt.useSystemAAFontSettings=lcd -J-Dswing.aatext=true '
 
     substituteInPlace platform/lib/nbexec \
       --replace /usr/bin/\''${awk} ${gawk}/bin/awk
 
     cp -r . $out
-
-    # To get the native LAF, JVM needs to see GTK’s .so-s.
-    wrapProgram $out/bin/visualvm \
-      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk2 ]}"
   '';
 
   meta = with stdenv.lib; {

From 355c58e485e76a4b91bb4613ee2a3e1bae809d28 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 11 Mar 2020 00:24:50 +0100
Subject: [PATCH 3387/4636] nixos/networkd: respect systemd.network.links also
 with disabled systemd-networkd

This mirrors the behaviour of systemd - It's udev that parses `.link`
files, not `systemd-networkd`.

This was originally applied in 36ef112a477034fc6d1d9170bf1bcda0140a8d1d,
but was reverted due to 1115959a8d4d73ad73341563dc8bbf52230a281e causing
evaluation errors on hydra.
---
 nixos/doc/manual/release-notes/rl-2003.xml | 10 ++-
 nixos/modules/system/boot/networkd.nix     | 79 +++++++++++++---------
 nixos/tests/networking.nix                 | 25 +++++++
 3 files changed, 80 insertions(+), 34 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index 0996791944f0..3d83b5265272 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -767,7 +767,15 @@ auth required pam_succeed_if.so uid >= 1000 quiet
       </para></listitem>
      </itemizedlist>
     </para>
-   </listitem>
+  </listitem>
+  <listitem>
+   <para>
+    The <link linkend="opt-systemd.network.links">systemd.network.links</link> option is now respected
+    even when <link linkend="opt-systemd.network.enable">systemd-networkd</command> is disabled.
+    This mirrors the behaviour of systemd - It's udev that parses <literal>.link</literal> files,
+    not <command>systemd-networkd</command>.
+   </para>
+  </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 6dfbe66fc647..3078f84f6e92 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -355,6 +355,14 @@ let
   };
 
   linkOptions = commonNetworkOptions // {
+    # overwrite enable option from above
+    enable = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to enable this .link unit. It's handled by udev no matter if <command>systemd-networkd</command> is enabled or not
+      '';
+    };
 
     linkConfig = mkOption {
       default = {};
@@ -1045,44 +1053,49 @@ in
 
   };
 
-  config = mkIf config.systemd.network.enable {
+  config = mkMerge [
+    # .link units are honored by udev, no matter if systemd-networkd is enabled or not.
+    {
+      systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links;
+      environment.etc = unitFiles;
+    }
 
-    users.users.systemd-network.group = "systemd-network";
+    (mkIf config.systemd.network.enable {
 
-    systemd.additionalUpstreamSystemUnits = [
-      "systemd-networkd.service" "systemd-networkd-wait-online.service"
-    ];
+      users.users.systemd-network.group = "systemd-network";
 
-    systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links
-      // mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs
-      // mapAttrs' (n: v: nameValuePair "${n}.network" (networkToUnit n v)) cfg.networks;
+      systemd.additionalUpstreamSystemUnits = [
+        "systemd-networkd.service" "systemd-networkd-wait-online.service"
+      ];
 
-    environment.etc = unitFiles;
+      systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs
+        // mapAttrs' (n: v: nameValuePair "${n}.network" (networkToUnit n v)) cfg.networks;
 
-    systemd.services.systemd-networkd = {
-      wantedBy = [ "multi-user.target" ];
-      restartTriggers = attrNames unitFiles;
-      # prevent race condition with interface renaming (#39069)
-      requires = [ "systemd-udev-settle.service" ];
-      after = [ "systemd-udev-settle.service" ];
-    };
-
-    systemd.services.systemd-networkd-wait-online = {
-      wantedBy = [ "network-online.target" ];
-    };
-
-    systemd.services."systemd-network-wait-online@" = {
-      description = "Wait for Network Interface %I to be Configured";
-      conflicts = [ "shutdown.target" ];
-      requisite = [ "systemd-networkd.service" ];
-      after = [ "systemd-networkd.service" ];
-      serviceConfig = {
-        Type = "oneshot";
-        RemainAfterExit = true;
-        ExecStart = "${config.systemd.package}/lib/systemd/systemd-networkd-wait-online -i %I";
+      systemd.services.systemd-networkd = {
+        wantedBy = [ "multi-user.target" ];
+        restartTriggers = attrNames unitFiles;
+        # prevent race condition with interface renaming (#39069)
+        requires = [ "systemd-udev-settle.service" ];
+        after = [ "systemd-udev-settle.service" ];
       };
-    };
 
-    services.resolved.enable = mkDefault true;
-  };
+      systemd.services.systemd-networkd-wait-online = {
+        wantedBy = [ "network-online.target" ];
+      };
+
+      systemd.services."systemd-network-wait-online@" = {
+        description = "Wait for Network Interface %I to be Configured";
+        conflicts = [ "shutdown.target" ];
+        requisite = [ "systemd-networkd.service" ];
+        after = [ "systemd-networkd.service" ];
+        serviceConfig = {
+          Type = "oneshot";
+          RemainAfterExit = true;
+          ExecStart = "${config.systemd.package}/lib/systemd/systemd-networkd-wait-online -i %I";
+        };
+      };
+
+      services.resolved.enable = mkDefault true;
+    })
+  ];
 }
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 933a4451af92..0a6507d2dc88 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -655,6 +655,31 @@ let
             ), "The IPv6 routing table has not been properly cleaned:\n{}".format(ipv6Residue)
       '';
     };
+    # even with disabled networkd, systemd.network.links should work
+    # (as it's handled by udev, not networkd)
+    link = {
+      name = "Link";
+      nodes.client = { pkgs, ... }: {
+        virtualisation.vlans = [ 1 ];
+        networking = {
+          useNetworkd = networkd;
+          useDHCP = false;
+        };
+        systemd.network.links."50-foo" = {
+          matchConfig = {
+            Name = "foo";
+            Driver = "dummy";
+          };
+          linkConfig.MTUBytes = "1442";
+        };
+      };
+      testScript = ''
+        print(client.succeed("ip l add name foo type dummy"))
+        print(client.succeed("stat /etc/systemd/network/50-foo.link"))
+        client.succeed("udevadm settle")
+        assert "mtu 1442" in client.succeed("ip l show dummy0")
+      '';
+    };
   };
 
 in mapAttrs (const (attrs: makeTest (attrs // {

From 4e53f84c79c4b4670dcebf00c1c92928439a87b9 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 11 Mar 2020 00:26:51 +0100
Subject: [PATCH 3388/4636] nixos/zerotierone: switch from manually generating
 the .link file to use the module

Previously, systemd.network.links was only respected with networkd
enabled, but it's really udev taking care of links, no matter if
networkd is enabled or not.

With our module fixed, there's no need to manually manage the text file
anymore.

This was originally applied in 3d1079a20dafd82fac7ac857e63c91e787f4eaaa,
but was reverted due to 1115959a8d4d73ad73341563dc8bbf52230a281e causing
evaluation errors on hydra.
---
 .../modules/services/networking/zerotierone.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix
index 042c4d5adddd..cf39ed065a76 100644
--- a/nixos/modules/services/networking/zerotierone.nix
+++ b/nixos/modules/services/networking/zerotierone.nix
@@ -69,13 +69,14 @@ in
     environment.systemPackages = [ cfg.package ];
 
     # Prevent systemd from potentially changing the MAC address
-    environment.etc."systemd/network/50-zerotier.link".text = ''
-      [Match]
-      OriginalName=zt*
-
-      [Link]
-      AutoNegotiation=false
-      MACAddressPolicy=none
-    '';
+    systemd.network.links."50-zerotier" = {
+      matchConfig = {
+        OriginalName = "zt*";
+      };
+      linkConfig = {
+        AutoNegotiation = false;
+        MACAddressPolicy = "none";
+      };
+    };
   };
 }

From d96bd3394b734487d1c3bfbac0e8f17465e03afe Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 19 Mar 2020 15:32:34 +0100
Subject: [PATCH 3389/4636] nixos/manual: fix build

---
 nixos/doc/manual/release-notes/rl-2003.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index 3d83b5265272..e5351519f8da 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -771,7 +771,7 @@ auth required pam_succeed_if.so uid >= 1000 quiet
   <listitem>
    <para>
     The <link linkend="opt-systemd.network.links">systemd.network.links</link> option is now respected
-    even when <link linkend="opt-systemd.network.enable">systemd-networkd</command> is disabled.
+    even when <link linkend="opt-systemd.network.enable">systemd-networkd</link> is disabled.
     This mirrors the behaviour of systemd - It's udev that parses <literal>.link</literal> files,
     not <command>systemd-networkd</command>.
    </para>

From 55d24ae82345ae877832011526efb7623dbe5593 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 19 Mar 2020 15:29:08 +0000
Subject: [PATCH 3390/4636] libffi: fix musl tests

Tests do not compile on musl, also alpine seems not to run tests.
---
 pkgs/development/libraries/libffi/default.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index 86e790bb9659..183f30e179e4 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -1,9 +1,6 @@
 { stdenv, fetchurl, fetchpatch
 , autoreconfHook
 
-# libffi is used in darwin and linux with glibc stdenv
-# we cannot run checks within it
-, doCheck ? stdenv.hostPlatform.isMusl, dejagnu
 }:
 
 stdenv.mkDerivation rec {
@@ -28,10 +25,6 @@ stdenv.mkDerivation rec {
     NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/}
   '';
 
-  checkInputs = [ dejagnu ];
-
-  inherit doCheck;
-
   dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; # Don't run the native `strip' when cross-compiling.
 
   meta = with stdenv.lib; {

From b549a006feba37a64d22c7063afeed4485a4f1db Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 13:12:13 -0700
Subject: [PATCH 3391/4636] pythonPackages.pandas: 1.0.1 -> 1.0.3

---
 pkgs/development/python-modules/pandas/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index de046d942c83..c35949e5659e 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -30,11 +30,11 @@ let
 
 in buildPythonPackage rec {
   pname = "pandas";
-  version = "1.0.1";
+  version = "1.0.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3c07765308f091d81b6735d4f2242bb43c332cc3461cae60543df6b10967fe27";
+    sha256 = "11j5s6hz29yh3rwa2rjgric0knbhp9shphd4i7hx00xr5wr2xx1j";
   };
 
   checkInputs = [ pytest glibcLocales moto hypothesis ];

From 0c1118b7e038c253f151d2277922e22e5a63db99 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 12:46:23 -0700
Subject: [PATCH 3392/4636] pythonPackages.celery: 4.4.0 -> 4.4.2

---
 pkgs/development/python-modules/celery/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix
index 4522379fa64a..68c6c282c9b9 100644
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/pkgs/development/python-modules/celery/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "celery";
-  version = "4.4.0";
+  version = "4.4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d3363bb5df72d74420986a435449f3c3979285941dff57d5d97ecba352a0e3e2";
+    sha256 = "0ps1c6ill7q0m5kzb87hisgshdk3kzpa6cvcjch1d1wa07whp2hh";
   };
 
   postPatch = ''
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   # test_eventlet touches network
   # test_mongodb requires pymongo
   checkPhase = ''
-    pytest -k 'not restore_current_app_fallback and not msgpack' \
+    pytest -k 'not restore_current_app_fallback and not msgpack and not on_apply' \
       --ignore=t/unit/concurrency/test_eventlet.py \
       --ignore=t/unit/backends/test_mongodb.py
   '';

From 779d4e65b38d2a3bad6252798b177c1f7ec0fe05 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 12:46:57 -0700
Subject: [PATCH 3393/4636] pythonPackages.billiards: 3.6.1.0 -> 3.6.3.0

---
 pkgs/development/python-modules/billiard/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix
index e53aa40446eb..91624210bb56 100644
--- a/pkgs/development/python-modules/billiard/default.nix
+++ b/pkgs/development/python-modules/billiard/default.nix
@@ -1,16 +1,19 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPyPy, pytest_4, case, psutil }:
+{ stdenv, buildPythonPackage, fetchPypi, isPyPy, pytest, case, psutil }:
 
 buildPythonPackage rec {
   pname = "billiard";
-  version = "3.6.1.0";
+  version = "3.6.3.0";
   disabled = isPyPy;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b8809c74f648dfe69b973c8e660bcec00603758c9db8ba89d7719f88d5f01f26";
+    sha256 = "0spssl3byzqsplra166d59jx8iqfxyzvcbx7vybkmwr5ck72a5yr";
   };
 
-  checkInputs = [ pytest_4 case psutil ];
+  checkInputs = [ pytest case psutil ];
+  checkPhase = ''
+    pytest
+  '';
 
   meta = with stdenv.lib; {
     homepage = https://github.com/celery/billiard;

From 1c4bb805cd4552fbf185e55a2e7d2afc74f3f2cf Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 12:47:37 -0700
Subject: [PATCH 3394/4636] pythonPackages.kombu: 4.6.7 -> 4.6.8

---
 pkgs/development/python-modules/kombu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix
index 5caab5a377e1..e0ac9e0fc18d 100644
--- a/pkgs/development/python-modules/kombu/default.nix
+++ b/pkgs/development/python-modules/kombu/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "kombu";
-  version = "4.6.7";
+  version = "4.6.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "67b32ccb6fea030f8799f8fd50dd08e03a4b99464ebc4952d71d8747b1a52ad1";
+    sha256 = "0xlv1rsfc3vn22l35csaj939zygd15nzmxbz3bcl981685vxl71d";
   };
 
   postPatch = ''

From 9fbeaa4cfce629a8f414a8553bcd03d6e2358c25 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 13:27:33 -0700
Subject: [PATCH 3395/4636] python3Packages.trackpy: 0.4.1 -> 0.4.2, mark
 broken

---
 pkgs/development/python-modules/trackpy/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/trackpy/default.nix b/pkgs/development/python-modules/trackpy/default.nix
index 32c8c64c68c7..d77ca31687fd 100644
--- a/pkgs/development/python-modules/trackpy/default.nix
+++ b/pkgs/development/python-modules/trackpy/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "trackpy";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "soft-matter";
     repo = pname;
     rev = "v${version}";
-    sha256 = "01fdv93f6z16gypmvqnlbjmcih7dmr7a63n5w9swmp11x3if4iyq";
+    sha256 = "16mc22z3104fvygky4gy3gvifjijm42db48v2z1y0fmyf6whi9p6";
   };
 
   propagatedBuildInputs = [
@@ -54,5 +54,6 @@ buildPythonPackage rec {
     homepage = https://github.com/soft-matter/trackpy;
     license = licenses.bsd3;
     maintainers = [ maintainers.costrouc ];
+    broken = true; # not compatible with latest pandas
   };
 }

From 4726a8f2d4d6db0565c634551e59d4510af8ef6e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 19 Mar 2020 16:24:13 +0100
Subject: [PATCH 3396/4636] cargo-make: 0.28.0 -> 0.29.0

https://github.com/sagiegurari/cargo-make/releases/tag/0.29.0
---
 .../tools/rust/cargo-make/Cargo.lock          |  114 +-
 .../tools/rust/cargo-make/cargo.patch         | 1053 -----------------
 .../tools/rust/cargo-make/default.nix         |    6 +-
 3 files changed, 57 insertions(+), 1116 deletions(-)
 delete mode 100644 pkgs/development/tools/rust/cargo-make/cargo.patch

diff --git a/pkgs/development/tools/rust/cargo-make/Cargo.lock b/pkgs/development/tools/rust/cargo-make/Cargo.lock
index dd5a492de6a9..bf634d338055 100644
--- a/pkgs/development/tools/rust/cargo-make/Cargo.lock
+++ b/pkgs/development/tools/rust/cargo-make/Cargo.lock
@@ -33,7 +33,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "attohttpc"
-version = "0.11.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -69,6 +69,11 @@ name = "base64"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "base64"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "bitflags"
 version = "1.2.1"
@@ -99,16 +104,16 @@ dependencies = [
 
 [[package]]
 name = "cargo-make"
-version = "0.28.0"
+version = "0.29.0"
 dependencies = [
  "ci_info 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "duckscript 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "duckscriptsdk 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "duckscript 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "duckscriptsdk 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fern 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fsio 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -120,6 +125,7 @@ dependencies = [
  "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)",
  "shell2batch 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -134,16 +140,6 @@ name = "cfg-if"
 version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "chrono"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "ci_info"
 version = "0.9.1"
@@ -235,7 +231,7 @@ dependencies = [
 
 [[package]]
 name = "duckscript"
-version = "0.2.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "fsio 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -243,20 +239,23 @@ dependencies = [
 
 [[package]]
 name = "duckscriptsdk"
-version = "0.2.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "attohttpc 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "duckscript 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "attohttpc 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "duckscript 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fsio 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "java-properties 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "meval 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "uname 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "whoami 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "whoami 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -326,10 +325,9 @@ dependencies = [
 
 [[package]]
 name = "fern"
-version = "0.5.9"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -522,23 +520,6 @@ name = "nom"
 version = "1.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "num-integer"
-version = "0.1.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "openssl"
 version = "0.10.26"
@@ -701,6 +682,11 @@ name = "rust_info"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "ryu"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "same-file"
 version = "1.0.6"
@@ -765,6 +751,16 @@ dependencies = [
  "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "serde_json"
+version = "1.0.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ryu 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "shell2batch"
 version = "0.4.2"
@@ -822,16 +818,6 @@ dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "time"
-version = "0.1.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "toml"
 version = "0.5.6"
@@ -840,6 +826,14 @@ dependencies = [
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "uname"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.4"
@@ -911,7 +905,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "whoami"
-version = "0.7.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -947,18 +941,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
 "checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee"
 "checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
-"checksum attohttpc 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ac9fd7bdf8ff0a1b9d73b41f95cb189d77528110295c80e3c858bf343db24fa3"
+"checksum attohttpc 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de33d017f0add8b019c6d98c3132c82c8815ca96bbed8e8006e7402c840562b3"
 "checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 "checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 "checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
 "checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
+"checksum base64 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d5ca2cd0adc3f48f9e9ea5a6bbdf9ccc0bfade884847e484d452414c7ccffb3"
 "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
 "checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
 "checksum bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1"
 "checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
 "checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
 "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-"checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01"
 "checksum ci_info 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e53a6853eb0aafd4be4d1c7c891982a91a58f84df98838992ce3eb774572bfd9"
 "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
 "checksum colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8815e2ab78f3a59928fc32e141fbeece88320a240e43f47b2fd64ea3a88a5b3d"
@@ -969,8 +963,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
 "checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
 "checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
-"checksum duckscript 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c0f699115ffc264c2d6ed8eed098b48d7d08122ba8d59d44f93170c5d33972c7"
-"checksum duckscriptsdk 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dad6bba01030a40c5c26a1393926220d046319c00352520b83e02bedf324c805"
+"checksum duckscript 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aa4a338912dce0ada9929b9aa81c3b279e51b101583da13541339efaee46dfa9"
+"checksum duckscriptsdk 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9da937d7dc544fe56d34e2b70c68bac038a821f5822e8a567b1ce52d47edd1c0"
 "checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
 "checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"
 "checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81"
@@ -979,7 +973,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
 "checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
 "checksum envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db101f16134ca37f91a6e30c32d9df5bbfcbe8d926f0c1f03602baf2fc2f7352"
-"checksum fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e69ab0d5aca163e388c3a49d284fed6c3d0810700e77c5ae2756a50ec1a4daaa"
+"checksum fern 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8c9a4820f0ccc8a7afd67c39a0f1a0f4b07ca1725164271a64939d7aeb9af065"
 "checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f"
 "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 "checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
@@ -1005,8 +999,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625"
 "checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e"
 "checksum nom 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce"
-"checksum num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba"
-"checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
 "checksum openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585"
 "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
 "checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f"
@@ -1027,6 +1019,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum run_script 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2dfbbb48b9c7ee71baadd968640f81ca4bc930c1a2029441eede96a6933275ac"
 "checksum rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017"
 "checksum rust_info 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be941f2b996df7ffaf093366039c9dc182b3ca2e00f3e81df44e08c3611e773d"
+"checksum ryu 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535622e6be132bccd223f4bb2b8ac8d53cda3c7a6394944d3b2b33fb974f9d76"
 "checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
 "checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021"
 "checksum security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df"
@@ -1035,6 +1028,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 "checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
 "checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
+"checksum serde_json 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)" = "9371ade75d4c2d6cb154141b9752cf3781ec9c05e0e5cf35060e1e70ee7b9c25"
 "checksum shell2batch 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "185a52ee351c1001753c9e3b2eb48c525ff7f51803a4f2cef4365b5c3b743f65"
 "checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4"
 "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
@@ -1042,8 +1036,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
 "checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
-"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
 "checksum toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
+"checksum uname 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
 "checksum unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4"
 "checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
@@ -1054,7 +1048,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
 "checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
 "checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-"checksum whoami 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "622a663c45e12b7ae198748afb532d0c53d2daea11037312221e26198ca4e8e9"
+"checksum whoami 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a08eb844b158ea881e81b94556eede7f7e306e4c7b976aad88f49e6e36dec391"
 "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
 "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 "checksum winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80"
diff --git a/pkgs/development/tools/rust/cargo-make/cargo.patch b/pkgs/development/tools/rust/cargo-make/cargo.patch
deleted file mode 100644
index b75a5a298878..000000000000
--- a/pkgs/development/tools/rust/cargo-make/cargo.patch
+++ /dev/null
@@ -1,1053 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-new file mode 100644
-index 0000000..fe75e29
---- /dev/null
-+++ b/Cargo.lock
-@@ -0,0 +1,1047 @@
-+# This file is automatically @generated by Cargo.
-+# It is not intended for manual editing.
-+[[package]]
-+name = "adler32"
-+version = "1.0.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "aho-corasick"
-+version = "0.7.8"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "ansi_term"
-+version = "0.11.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "arrayref"
-+version = "0.3.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "arrayvec"
-+version = "0.5.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "attohttpc"
-+version = "0.11.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl 0.10.28 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "atty"
-+version = "0.2.14"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "autocfg"
-+version = "0.1.7"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "autocfg"
-+version = "1.0.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "base64"
-+version = "0.11.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "bitflags"
-+version = "1.2.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "blake2b_simd"
-+version = "0.5.10"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "bytes"
-+version = "0.5.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "c2-chacha"
-+version = "0.2.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "cargo-make"
-+version = "0.27.0"
-+dependencies = [
-+ "ci_info 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "duckscript 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "duckscriptsdk 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "run_script 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rust_info 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "shell2batch 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "cc"
-+version = "1.0.50"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "cfg-if"
-+version = "0.1.10"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "chrono"
-+version = "0.4.10"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "ci_info"
-+version = "0.9.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "clap"
-+version = "2.33.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "colored"
-+version = "1.9.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "constant_time_eq"
-+version = "0.1.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "core-foundation"
-+version = "0.6.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "core-foundation-sys"
-+version = "0.6.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "crc32fast"
-+version = "1.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "crossbeam-utils"
-+version = "0.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "dirs"
-+version = "2.0.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "dirs-sys"
-+version = "0.3.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "duckscript"
-+version = "0.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "duckscriptsdk"
-+version = "0.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "attohttpc 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "duckscript 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "java-properties 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "meval 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "whoami 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "encoding"
-+version = "0.2.33"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "encoding-index-japanese"
-+version = "1.20141219.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "encoding-index-korean"
-+version = "1.20141219.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "encoding-index-simpchinese"
-+version = "1.20141219.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "encoding-index-singlebyte"
-+version = "1.20141219.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "encoding-index-tradchinese"
-+version = "1.20141219.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "encoding_index_tests"
-+version = "0.1.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "envmnt"
-+version = "0.8.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "fern"
-+version = "0.5.9"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "flate2"
-+version = "1.0.13"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "miniz_oxide 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "fnv"
-+version = "1.0.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "foreign-types"
-+version = "0.3.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "foreign-types-shared"
-+version = "0.1.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "fs_extra"
-+version = "1.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "getrandom"
-+version = "0.1.14"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "git_info"
-+version = "0.1.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "glob"
-+version = "0.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "hermit-abi"
-+version = "0.1.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "home"
-+version = "0.5.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "http"
-+version = "0.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "idna"
-+version = "0.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "indexmap"
-+version = "1.3.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "itoa"
-+version = "0.4.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "java-properties"
-+version = "1.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "lazy_static"
-+version = "1.4.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "libc"
-+version = "0.2.66"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "log"
-+version = "0.4.8"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "matches"
-+version = "0.1.8"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "memchr"
-+version = "2.3.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "meval"
-+version = "0.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "nom 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "miniz_oxide"
-+version = "0.3.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "native-tls"
-+version = "0.2.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl 0.10.28 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "schannel 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "nom"
-+version = "1.2.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "num-integer"
-+version = "0.1.42"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "num-traits"
-+version = "0.2.11"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "openssl"
-+version = "0.10.28"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "openssl-probe"
-+version = "0.1.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "openssl-sys"
-+version = "0.9.54"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "percent-encoding"
-+version = "2.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "pkg-config"
-+version = "0.3.17"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "ppv-lite86"
-+version = "0.2.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "proc-macro2"
-+version = "1.0.8"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "quote"
-+version = "1.0.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "rand"
-+version = "0.7.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "rand_chacha"
-+version = "0.2.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "rand_core"
-+version = "0.5.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "rand_hc"
-+version = "0.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "redox_syscall"
-+version = "0.1.56"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "redox_users"
-+version = "0.3.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "regex"
-+version = "1.3.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "aho-corasick 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "regex-syntax"
-+version = "0.6.14"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "remove_dir_all"
-+version = "0.5.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "run_script"
-+version = "0.6.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "users 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "rust-argon2"
-+version = "0.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "rust_info"
-+version = "0.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "same-file"
-+version = "1.0.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "schannel"
-+version = "0.1.17"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "security-framework"
-+version = "0.3.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "security-framework-sys"
-+version = "0.3.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "semver"
-+version = "0.9.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "semver-parser"
-+version = "0.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "serde"
-+version = "1.0.104"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "serde_derive"
-+version = "1.0.104"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "shell2batch"
-+version = "0.4.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "smallvec"
-+version = "1.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "strsim"
-+version = "0.8.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "syn"
-+version = "1.0.14"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "tempfile"
-+version = "3.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "textwrap"
-+version = "0.11.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "thread_local"
-+version = "1.0.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "time"
-+version = "0.1.42"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "toml"
-+version = "0.5.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "unicode-bidi"
-+version = "0.3.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "unicode-normalization"
-+version = "0.1.12"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "unicode-width"
-+version = "0.1.7"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "unicode-xid"
-+version = "0.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "url"
-+version = "2.1.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "users"
-+version = "0.9.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "vcpkg"
-+version = "0.2.8"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "vec_map"
-+version = "0.8.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "walkdir"
-+version = "2.3.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "wasi"
-+version = "0.9.0+wasi-snapshot-preview1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "whoami"
-+version = "0.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "winapi"
-+version = "0.3.8"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "winapi-i686-pc-windows-gnu"
-+version = "0.4.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[[package]]
-+name = "winapi-util"
-+version = "0.1.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+dependencies = [
-+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+]
-+
-+[[package]]
-+name = "winapi-x86_64-pc-windows-gnu"
-+version = "0.4.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+
-+[metadata]
-+"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
-+"checksum aho-corasick 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)" = "743ad5a418686aad3b87fd14c43badd828cf26e214a00f92a384291cf22e1811"
-+"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-+"checksum arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
-+"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
-+"checksum attohttpc 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ac9fd7bdf8ff0a1b9d73b41f95cb189d77528110295c80e3c858bf343db24fa3"
-+"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-+"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
-+"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
-+"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
-+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-+"checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
-+"checksum bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1"
-+"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
-+"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
-+"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-+"checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01"
-+"checksum ci_info 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a9c4ad4399f16ccee06f6a62acad539f42de4a80fa21cbe994df1bbb51bee3b9"
-+"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
-+"checksum colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8815e2ab78f3a59928fc32e141fbeece88320a240e43f47b2fd64ea3a88a5b3d"
-+"checksum constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
-+"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
-+"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
-+"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
-+"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
-+"checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3"
-+"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b"
-+"checksum duckscript 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "747bb4e541a0830b4581bffc001045d3dc259683546fbf35a35f47af831634b5"
-+"checksum duckscriptsdk 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "799c03843d05bb809ea1ee653c4f9ba9a5ee766c07490cc684cf6b259b68ba94"
-+"checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
-+"checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"
-+"checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81"
-+"checksum encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7"
-+"checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"
-+"checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
-+"checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
-+"checksum envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db101f16134ca37f91a6e30c32d9df5bbfcbe8d926f0c1f03602baf2fc2f7352"
-+"checksum fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e69ab0d5aca163e388c3a49d284fed6c3d0810700e77c5ae2756a50ec1a4daaa"
-+"checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f"
-+"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
-+"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-+"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-+"checksum fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674"
-+"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
-+"checksum git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "add3a9c3c08c8905a2165ff06891dd1c3bb32d81b2a32d79528abc9793dfb06f"
-+"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
-+"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772"
-+"checksum home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654"
-+"checksum http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b708cc7f06493459026f53b9a61a7a121a5d1ec6238dee58ea4941132b30156b"
-+"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
-+"checksum indexmap 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "076f042c5b7b98f31d205f1249267e12a6518c1481e9dae9764af19b707d2292"
-+"checksum itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
-+"checksum java-properties 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "caf4418ade5bde22a283a7f2fb537ea397ec102718f259f2630714e7a5b389fa"
-+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-+"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
-+"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
-+"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
-+"checksum memchr 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53445de381a1f436797497c61d851644d0e8e88e6140f22872ad33a704933978"
-+"checksum meval 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f79496a5651c8d57cd033c5add8ca7ee4e3d5f7587a4777484640d9cb60392d9"
-+"checksum miniz_oxide 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aa679ff6578b1cddee93d7e82e263b94a575e0bfced07284eb0c037c1d2416a5"
-+"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e"
-+"checksum nom 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce"
-+"checksum num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba"
-+"checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
-+"checksum openssl 0.10.28 (registry+https://github.com/rust-lang/crates.io-index)" = "973293749822d7dd6370d6da1e523b0d1db19f06c459134c658b2a4261378b52"
-+"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
-+"checksum openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)" = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986"
-+"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
-+"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
-+"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
-+"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548"
-+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
-+"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-+"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
-+"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-+"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-+"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
-+"checksum redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431"
-+"checksum regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8"
-+"checksum regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)" = "b28dfe3fe9badec5dbf0a79a9cccad2cfc2ab5484bdb3e44cbd1ae8b3ba2be06"
-+"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
-+"checksum run_script 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80a217951e2afacc57d3129bd52aeddc550559f5a82f57529a31fc5675bd6621"
-+"checksum rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017"
-+"checksum rust_info 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be941f2b996df7ffaf093366039c9dc182b3ca2e00f3e81df44e08c3611e773d"
-+"checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-+"checksum schannel 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "507a9e6e8ffe0a4e0ebb9a10293e62fdf7657c06f1b8bb07a8fcf697d2abf295"
-+"checksum security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df"
-+"checksum security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895"
-+"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-+"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
-+"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
-+"checksum shell2batch 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "185a52ee351c1001753c9e3b2eb48c525ff7f51803a4f2cef4365b5c3b743f65"
-+"checksum smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5c2fb2ec9bcd216a5b0d0ccf31ab17b5ed1d627960edff65bbe95d3ce221cefc"
-+"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-+"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5"
-+"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
-+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-+"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
-+"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
-+"checksum toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
-+"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-+"checksum unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4"
-+"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
-+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
-+"checksum url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb"
-+"checksum users 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c72f4267aea0c3ec6d07eaabea6ead7c5ddacfafc5e22bcf8d186706851fb4cf"
-+"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
-+"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
-+"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
-+"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-+"checksum whoami 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "622a663c45e12b7ae198748afb532d0c53d2daea11037312221e26198ca4e8e9"
-+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
-+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-+"checksum winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80"
-+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix
index 53849e4176fa..a7ccc0581910 100644
--- a/pkgs/development/tools/rust/cargo-make/default.nix
+++ b/pkgs/development/tools/rust/cargo-make/default.nix
@@ -2,7 +2,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-make";
-  version = "0.28.0";
+  version = "0.29.0";
 
   src =
     let
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
         owner = "sagiegurari";
         repo = pname;
         rev = version;
-        sha256 = "1sf4hjsylk68d3wb7bs8gfkz5az41hjs7hvb8mbhyc7nryklkq4d";
+        sha256 = "0sxwc61iaqln37m45a3sy1c92ri4zad8g5h5fgk5plj0qlps80np";
       };
     in
     runCommand "source" {} ''
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
-  cargoSha256 = "1x0lb68d47nhggnj7jf90adz7shb0cg305mavgqvxizd2s9789dx";
+  cargoSha256 = "1w7nw3amb5by60a8aqvwka4aify8k3csjqys7arzksy98jyn6b4j";
 
   # Some tests fail because they need network access.
   # However, Travis ensures a proper build.

From 5440025016c786bee8d9f369c97be6a43dd2f7eb Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Thu, 19 Mar 2020 19:13:01 +0300
Subject: [PATCH 3397/4636] netdata: fix load go.d.plugin

---
 pkgs/tools/system/netdata/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index 482e6253a52a..9abadd383560 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
 
   postInstall = ''
     ln -s ${go-d-plugin.bin}/lib/netdata/conf.d/* $out/lib/netdata/conf.d
-    ln -s ${go-d-plugin.bin}/bin/godplugind $out/libexec/netdata/plugins.d/go.d.plugin
+    ln -s ${go-d-plugin.bin}/bin/godplugin $out/libexec/netdata/plugins.d/go.d.plugin
   '' + optionalString (!stdenv.isDarwin) ''
     # rename this plugin so netdata will look for setuid wrapper
     mv $out/libexec/netdata/plugins.d/apps.plugin \

From 02c2c864d1d1c1ec792e51e148636e599edea9cf Mon Sep 17 00:00:00 2001
From: Jesper Geertsen Jonsson <yesbox@users.noreply.github.com>
Date: Mon, 2 Mar 2020 17:06:26 +0100
Subject: [PATCH 3398/4636] resilio: fix a list being assigned to the option
 config.users.groups

---
 nixos/modules/services/networking/resilio.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix
index 9b25aa575837..e74e03fc0b07 100644
--- a/nixos/modules/services/networking/resilio.nix
+++ b/nixos/modules/services/networking/resilio.nix
@@ -244,7 +244,7 @@ in
       group           = "rslsync";
     };
 
-    users.groups = [ { name = "rslsync"; } ];
+    users.groups.rslsync = {};
 
     systemd.services.resilio = with pkgs; {
       description = "Resilio Sync Service";

From cdee144dfc0dc3a507a9a84b46bf1626761bb9b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20W=C3=BCnsche?= <holger.o.wuensche@t-online.de>
Date: Thu, 19 Mar 2020 17:43:39 +0100
Subject: [PATCH 3399/4636] llvmPackges_10: rc4 -> rc5

updated versino and hashes for new rc
---
 pkgs/development/compilers/llvm/10/clang/default.nix  | 2 +-
 pkgs/development/compilers/llvm/10/compiler-rt.nix    | 2 +-
 pkgs/development/compilers/llvm/10/default.nix        | 4 ++--
 pkgs/development/compilers/llvm/10/libc++/default.nix | 2 +-
 pkgs/development/compilers/llvm/10/libc++abi.nix      | 2 +-
 pkgs/development/compilers/llvm/10/libunwind.nix      | 2 +-
 pkgs/development/compilers/llvm/10/lld.nix            | 2 +-
 pkgs/development/compilers/llvm/10/lldb.nix           | 2 +-
 pkgs/development/compilers/llvm/10/llvm.nix           | 4 ++--
 pkgs/development/compilers/llvm/10/openmp.nix         | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/llvm/10/clang/default.nix b/pkgs/development/compilers/llvm/10/clang/default.nix
index b7d3f340d5fe..dfdc9f74e15b 100644
--- a/pkgs/development/compilers/llvm/10/clang/default.nix
+++ b/pkgs/development/compilers/llvm/10/clang/default.nix
@@ -8,7 +8,7 @@ let
     pname = "clang";
     inherit version;
 
-    src = fetch "clang" "19y2nii0rqq8hf657d331s8rmpddlm5wvcznhdwxkymd0fd5l7vm";
+    src = fetch "clang" "0ap63qhz0j6m63l4njwp055xni4s71dsxqi1w5d2p93hbswaiiw2";
 
     unpackPhase = ''
       unpackFile $src
diff --git a/pkgs/development/compilers/llvm/10/compiler-rt.nix b/pkgs/development/compilers/llvm/10/compiler-rt.nix
index 55575d53b00a..8c870a610cc2 100644
--- a/pkgs/development/compilers/llvm/10/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/10/compiler-rt.nix
@@ -2,7 +2,7 @@
 stdenv.mkDerivation rec {
   pname = "compiler-rt";
   inherit version;
-  src = fetch pname "0s2dzhcvdw50wsw6abksrrc9bqzwa6dp0qfk3bykinj8ah33ljws";
+  src = fetch pname "1g067yx8qz0bmf00b2xqjqaayqj2xvrjp9smms3a16syj9m0hfri";
 
   nativeBuildInputs = [ cmake python3 llvm ];
   buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix
index 566f9742ccb2..574ab5ec4e77 100644
--- a/pkgs/development/compilers/llvm/10/default.nix
+++ b/pkgs/development/compilers/llvm/10/default.nix
@@ -6,7 +6,7 @@
 
 let
   release_version = "10.0.0";
-  candidate = "rc4";
+  candidate = "rc5";
   version = "10.0.0${candidate}"; # differentiating these is important for rc's
 
   fetch = name: sha256: fetchurl {
@@ -14,7 +14,7 @@ let
     inherit sha256;
   };
 
-  clang-tools-extra_src = fetch "clang-tools-extra" "0irbb1n31qpwzspizxp2b17m4jnbkh6rlr9bs85q16yc4xr6c781";
+  clang-tools-extra_src = fetch "clang-tools-extra" "0x23q70c0xcwdhj0d66nisr8rqq69qcshrbb4si9pxfsm0zs9h3i";
 
   tools = stdenv.lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
diff --git a/pkgs/development/compilers/llvm/10/libc++/default.nix b/pkgs/development/compilers/llvm/10/libc++/default.nix
index 0ff4e2ab6ea0..18eae91d3402 100644
--- a/pkgs/development/compilers/llvm/10/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/10/libc++/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   pname = "libc++";
   inherit version;
 
-  src = fetch "libcxx" "1j15szimdyihqzz5k1ys40v1vrswa4aaj6ckpqx3gngindi80sdr";
+  src = fetch "libcxx" "0qw85sy3y1mcdrj8yd1j1gmskh0vs4xdgrx80niigizhr7030vxs";
 
   postUnpack = ''
     unpackFile ${libcxxabi.src}
diff --git a/pkgs/development/compilers/llvm/10/libc++abi.nix b/pkgs/development/compilers/llvm/10/libc++abi.nix
index ddfc15321d42..ba51f0f33f1b 100644
--- a/pkgs/development/compilers/llvm/10/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/10/libc++abi.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   pname = "libc++abi";
   inherit version;
 
-  src = fetch "libcxxabi" "08w3lvg414k2w3ddbdbc979z38l7w1rbnwrxq68mvcrp7zry347a";
+  src = fetch "libcxxabi" "15iclzxjqfjynqxjg8dahyr0gfg83blv9dm7z9hq5ipxw8x2sglf";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
diff --git a/pkgs/development/compilers/llvm/10/libunwind.nix b/pkgs/development/compilers/llvm/10/libunwind.nix
index 67805b31f14f..6016d0536bff 100644
--- a/pkgs/development/compilers/llvm/10/libunwind.nix
+++ b/pkgs/development/compilers/llvm/10/libunwind.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   pname = "libunwind";
   inherit version;
 
-  src = fetch pname "07rp723yldqvr05hmfq7xsa2g6sdw9jiird4r5v9lk112bwb2y1q";
+  src = fetch pname "12c2fh63afav8rfmplfs628r74ksfs8fjls655rwjsrg1hk0gy3l";
 
   nativeBuildInputs = [ cmake ];
 
diff --git a/pkgs/development/compilers/llvm/10/lld.nix b/pkgs/development/compilers/llvm/10/lld.nix
index f161194982b8..ab2dd8caee83 100644
--- a/pkgs/development/compilers/llvm/10/lld.nix
+++ b/pkgs/development/compilers/llvm/10/lld.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   pname = "lld";
   inherit version;
 
-  src = fetch pname "1c8s5jcp1h2lvws6dxy7c3a36ic10q6lbmd4i38l3g3irl6dj871";
+  src = fetch pname "08zg546872b432qrx49i7k1c2vdq9yjvc7gnrvy2nywv0d2qf9nc";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ llvm libxml2 ];
diff --git a/pkgs/development/compilers/llvm/10/lldb.nix b/pkgs/development/compilers/llvm/10/lldb.nix
index 43e464fa00d6..12cb43bc504c 100644
--- a/pkgs/development/compilers/llvm/10/lldb.nix
+++ b/pkgs/development/compilers/llvm/10/lldb.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (rec {
   pname = "lldb";
   inherit version;
 
-  src = fetch pname "1djjjya2fawkc8fd9x82ijsscz3k6kj9mwdsnpk0yikac167pqaw";
+  src = fetch pname "0swv16n7gm12f399f7hxai1jh89s14h3yg7cci10yaiibpvwk73x";
 
   patches = [ ./lldb-procfs.patch ];
 
diff --git a/pkgs/development/compilers/llvm/10/llvm.nix b/pkgs/development/compilers/llvm/10/llvm.nix
index fff80e3f8140..0405958070a2 100644
--- a/pkgs/development/compilers/llvm/10/llvm.nix
+++ b/pkgs/development/compilers/llvm/10/llvm.nix
@@ -31,8 +31,8 @@ in stdenv.mkDerivation (rec {
   pname = "llvm";
   inherit version;
 
-  src = fetch pname "16mh2n5s7pngc1wlkwp2xnnjpjljm4p6d6ld1646dayr6q8lmi34";
-  polly_src = fetch "polly" "15w5mpl98wldyxjgqjnbh1pb4p9wnrqgik7sq2qi49qp4g1cg5wh";
+  src = fetch pname "1abfi0zqbcwxf68dk00szpjxkcd44589va243af8sg97hljq6709";
+  polly_src = fetch "polly" "1fzg5934km69rwam6vgznk0p4slzhr0icwmj3jibw3p93ppa8k9r";
 
   unpackPhase = ''
     unpackFile $src
diff --git a/pkgs/development/compilers/llvm/10/openmp.nix b/pkgs/development/compilers/llvm/10/openmp.nix
index 9864235dca00..1cdd4cc9bba1 100644
--- a/pkgs/development/compilers/llvm/10/openmp.nix
+++ b/pkgs/development/compilers/llvm/10/openmp.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   pname = "openmp";
   inherit version;
 
-  src = fetch pname "1qnimi4dypy4r8vpjxcg2rpc9lsvsyi4kl08v51p33657q449syr";
+  src = fetch pname "0swif1plz7drjha6rdw02b60symsz95w62wxpiygbpdwsmhbbgam";
 
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [ llvm ];

From 36c423530d00057095bd158ec9d74b8dd63554db Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 14:33:19 -0700
Subject: [PATCH 3400/4636] python3Packages.google_cloud_core: 1.2.0 -> 1.3.0

---
 pkgs/development/python-modules/google_cloud_core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_core/default.nix b/pkgs/development/python-modules/google_cloud_core/default.nix
index 2a9a13b26307..c5a0ead7c50f 100644
--- a/pkgs/development/python-modules/google_cloud_core/default.nix
+++ b/pkgs/development/python-modules/google_cloud_core/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-core";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0vfhvpiiigfldi3vb0730w13md1c90irpdx5kypmnfszrrzg7q2a";
+    sha256 = "1n19q57y4d89cjgmrg0f2a7yp7l1np2448mrhpndq354h389m3w7";
   };
 
   propagatedBuildInputs = [ google_api_core grpcio setuptools ];

From 7979557ab1d3935932a16946bd23fc4fdfe3cc92 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 14:34:50 -0700
Subject: [PATCH 3401/4636] python3Packages.google_cloud_logging: 1.14.0 ->
 1.15.0, fix tests

---
 .../python-modules/google_cloud_logging/default.nix          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_logging/default.nix b/pkgs/development/python-modules/google_cloud_logging/default.nix
index c4d9a1cb8d55..7ea418977dfb 100644
--- a/pkgs/development/python-modules/google_cloud_logging/default.nix
+++ b/pkgs/development/python-modules/google_cloud_logging/default.nix
@@ -12,17 +12,18 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-logging";
-  version = "1.14.0";
+  version = "1.15.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3c12d4421df8e4e77b5e029b1341ae80d180cfda0f9cbef417f36438630cc35f";
+    sha256 = "0smpvzdbz3ih3vc0nmn9619xa40mmqk9rs9ic1mwwyh1iyi44waz";
   };
 
   checkInputs = [ pytest mock webapp2 django flask ];
   propagatedBuildInputs = [ google_api_core google_cloud_core ];
 
   checkPhase = ''
+    rm -r google
     pytest tests/unit
   '';
 

From e87db4ac752e1bfd9c4b59a9b00a85eaab9f31a4 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 14:38:13 -0700
Subject: [PATCH 3402/4636] python3Packages.google_cloud_spanner: 1.13.0 ->
 1.15.0, fix tests

---
 .../python-modules/google_cloud_spanner/default.nix       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_spanner/default.nix b/pkgs/development/python-modules/google_cloud_spanner/default.nix
index 80e88d53f1fc..f6c54be1279a 100644
--- a/pkgs/development/python-modules/google_cloud_spanner/default.nix
+++ b/pkgs/development/python-modules/google_cloud_spanner/default.nix
@@ -11,23 +11,25 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-spanner";
-  version = "1.13.0";
+  version = "1.15.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "eafa09cc344339a23702ee74eac5713974fefafdfd56afb589bd25548c79c80d";
+    sha256 = "1ra1cim9kcs680yrhvfn5hjx8y1sccp3lw7id5j5pj53sshdng8h";
   };
 
   checkInputs = [ pytest mock ];
   propagatedBuildInputs = [ grpcio-gcp grpc_google_iam_v1 google_api_core google_cloud_core ];
 
+  # avoid importing local package
   checkPhase = ''
+    rm -r google
     pytest tests/unit
   '';
 
   meta = with stdenv.lib; {
     description = "Cloud Spanner API client library";
-    homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
+    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
     license = licenses.asl20;
     maintainers = [ maintainers.costrouc ];
   };

From dfe9388f0791506be899090c7d7ff21587c7fcd3 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 14:52:03 -0700
Subject: [PATCH 3403/4636] python3Packages.google_auth: 1.10.0 -> 1.11.3

---
 .../python-modules/google_auth/default.nix    | 33 ++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix
index 1f86c2a2af2e..d8c6a12aeaaf 100644
--- a/pkgs/development/python-modules/google_auth/default.nix
+++ b/pkgs/development/python-modules/google_auth/default.nix
@@ -1,18 +1,43 @@
 { stdenv, buildPythonPackage, fetchpatch, fetchPypi
-, pytest, mock, oauth2client, flask, requests, setuptools, urllib3, pytest-localserver, six, pyasn1-modules, cachetools, rsa, freezegun }:
+, cachetools
+, flask
+, freezegun
+, mock
+, oauth2client
+, pyasn1-modules
+, pytest
+, pytest-localserver
+, requests
+, responses
+, rsa
+, setuptools
+, six
+, urllib3
+}:
 
 buildPythonPackage rec {
   pname = "google-auth";
-  version = "1.10.0";
+  version = "1.11.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1xs8ch6bz57vs6j0p8061c7wj9ahkvrfpf1y9v7r009979507ckv";
+    sha256 = "05av4clwv7kdk1v55ibcv8aim6dwfg1mi4wy0vv91fr6wq3205zc";
   };
 
-  checkInputs = [ pytest mock oauth2client flask requests urllib3 pytest-localserver freezegun ];
   propagatedBuildInputs = [ six pyasn1-modules cachetools rsa setuptools ];
 
+  checkInputs = [
+    flask
+    freezegun
+    mock
+    oauth2client
+    pytest
+    pytest-localserver
+    requests
+    responses
+    urllib3
+  ];
+
   checkPhase = ''
     py.test
   '';

From e7036d9fc7efbe26b5243a37694e47105da1b143 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 14:53:09 -0700
Subject: [PATCH 3404/4636] python3Packages.google_cloud_storage: 1.23.0 ->
 1.26.0

---
 .../python-modules/google_cloud_storage/default.nix      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google_cloud_storage/default.nix
index ff750602465b..856de74dd938 100644
--- a/pkgs/development/python-modules/google_cloud_storage/default.nix
+++ b/pkgs/development/python-modules/google_cloud_storage/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-storage";
-  version = "1.23.0";
+  version = "1.26.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c66e876ae9547884fa42566a2ebfec51d280f488d7a058af9611ba90c78bed78";
+    sha256 = "0caxqf6vda89cmc81fxhmfk3n61aypqz2sswnbsylzf436rsxpzz";
   };
 
   propagatedBuildInputs = [
@@ -26,8 +26,11 @@ buildPythonPackage rec {
   ];
   checkInputs = [ pytest mock ];
 
+  # remove directory from interferring with importing modules
+  # ignore tests which require credentials
   checkPhase = ''
-   pytest tests/unit
+    rm -r google
+    pytest tests/unit -k 'not create'
   '';
 
   meta = with stdenv.lib; {

From d776f212a831c68fe02ded3fa1ef131f3e4c2c05 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 15:00:10 -0700
Subject: [PATCH 3405/4636] python3Packages.google_cloud_automl: 0.9.0 ->
 0.10.0

---
 .../python-modules/google_cloud_automl/default.nix    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_automl/default.nix b/pkgs/development/python-modules/google_cloud_automl/default.nix
index 3fc0fc8598d5..e081d4e3c317 100644
--- a/pkgs/development/python-modules/google_cloud_automl/default.nix
+++ b/pkgs/development/python-modules/google_cloud_automl/default.nix
@@ -3,24 +3,27 @@
 , fetchPypi
 , enum34
 , google_api_core
+, google_cloud_storage
+, pandas
 , pytest
 , mock
 }:
 
 buildPythonPackage rec {
   pname = "google-cloud-automl";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6541245cdee3e3ba5d98bb3ecd0b343fd5d3de1e880cfc5daf59f4a69a045171";
+    sha256 = "031331fs97jpyxacwsmhig0ndidn97r288qnkrzfdvg1wxw5rdhi";
   };
 
-  checkInputs = [ pytest mock ];
+  checkInputs = [ pandas pytest mock google_cloud_storage ];
   propagatedBuildInputs = [ enum34 google_api_core ];
 
+  # ignore tests which need credentials
   checkPhase = ''
-    pytest tests/unit
+    pytest tests/unit -k 'not upload and not prediction_client_client_info'
   '';
 
   meta = with stdenv.lib; {

From a06324598ff9081897050a5eb4d687c019d033ba Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 15:02:53 -0700
Subject: [PATCH 3406/4636] python3Packages.google_cloud_container: 0.3.0 ->
 0.4.0

---
 .../python-modules/google_cloud_container/default.nix    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_container/default.nix b/pkgs/development/python-modules/google_cloud_container/default.nix
index d0994ce5e0bf..5afaf97cfaad 100644
--- a/pkgs/development/python-modules/google_cloud_container/default.nix
+++ b/pkgs/development/python-modules/google_cloud_container/default.nix
@@ -2,21 +2,22 @@
 , buildPythonPackage
 , fetchPypi
 , google_api_core
+, grpc_google_iam_v1
 , pytest
 , mock
 }:
 
 buildPythonPackage rec {
   pname = "google-cloud-container";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "90cceceb487f1f4f2336b3674d594bc5e492fadbe27a5f06ca056d7148fd90ba";
+    sha256 = "07zjwwliz8wx83l3bv7244qzrv0s3fchp8kgsy5xy41kmkg79a2d";
   };
 
   checkInputs = [ pytest mock ];
-  propagatedBuildInputs = [ google_api_core ];
+  propagatedBuildInputs = [ google_api_core grpc_google_iam_v1 ];
 
   checkPhase = ''
     pytest tests/unit
@@ -24,7 +25,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Google Container Engine API client library";
-    homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
+    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
     license = licenses.asl20;
     maintainers = [ maintainers.costrouc ];
   };

From a802cc30ef2fc10a9248ea2416aa64950f54fe12 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 15:07:55 -0700
Subject: [PATCH 3407/4636] python3Packages.google_cloud_bigquery: 1.23.1 ->
 1.24.0

---
 .../google_cloud_bigquery/default.nix           | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/pkgs/development/python-modules/google_cloud_bigquery/default.nix
index e361b4436ee8..0b7c5d5c16ef 100644
--- a/pkgs/development/python-modules/google_cloud_bigquery/default.nix
+++ b/pkgs/development/python-modules/google_cloud_bigquery/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
+, freezegun
 , google_resumable_media
 , google_api_core
 , google_cloud_core
@@ -13,23 +14,29 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-bigquery";
-  version = "1.23.1";
+  version = "1.24.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "99c341592d711d8f131fe80d842f7e1b04b2ca1faefa1ffedf4dec1b382cebf6";
+    sha256 = "1ca22hzql8x1z6bx9agidx0q09w24jwzkgg49k5j1spcignwxz3z";
   };
 
-  checkInputs = [ pytest mock ipython ];
+  checkInputs = [ pytest mock ipython freezegun ];
   propagatedBuildInputs = [ google_resumable_media google_api_core google_cloud_core pandas pyarrow ];
 
+  # prevent local directory from shadowing google imports
+  # call_api_applying_custom_retry_on_timeout requires credentials
+  # test_magics requires modifying sys.path
   checkPhase = ''
-    pytest tests/unit
+    rm -r google
+    pytest tests/unit \
+      -k 'not call_api_applying_custom_retry_on_timeout' \
+      --ignore=tests/unit/test_magics.py
   '';
 
   meta = with stdenv.lib; {
     description = "Google BigQuery API client library";
-    homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
+    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
     license = licenses.asl20;
     maintainers = [ maintainers.costrouc ];
   };

From be23d2fac04cef0ad6992305be2fe86684113f38 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 15:19:27 -0700
Subject: [PATCH 3408/4636] python3Packages.google_cloud_bigtable: 1.2.0 ->
 1.2.1, fix tests

---
 .../python-modules/google_cloud_bigtable/default.nix     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_bigtable/default.nix b/pkgs/development/python-modules/google_cloud_bigtable/default.nix
index a71d2e493ddd..0eb606bf7f4b 100644
--- a/pkgs/development/python-modules/google_cloud_bigtable/default.nix
+++ b/pkgs/development/python-modules/google_cloud_bigtable/default.nix
@@ -10,23 +10,24 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-bigtable";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "eea9d4aca54499b555a893fa441deac1bd7ae9cbc8e03bdd681fd33fad72e170";
+    sha256 = "1wwhjfhvz5g4720qcdrj01fqb8kh3n36sxjpz8pzwhc7z4z5srs8";
   };
 
   checkInputs = [ pytest mock ];
   propagatedBuildInputs = [ grpc_google_iam_v1 google_api_core google_cloud_core ];
 
   checkPhase = ''
-    pytest tests/unit
+    rm -r google
+    pytest tests/unit -k 'not policy'
   '';
 
   meta = with stdenv.lib; {
     description = "Google Cloud Bigtable API client library";
-    homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
+    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
     license = licenses.asl20;
     maintainers = [ maintainers.costrouc ];
   };

From 96dcdb24b3626d0bf6de11c74527c3bd2de6ab44 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 15:21:12 -0700
Subject: [PATCH 3409/4636] python3Packages.google_cloud_datastore: 1.10.0 ->
 1.11.0

---
 .../python-modules/google_cloud_datastore/default.nix      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_datastore/default.nix b/pkgs/development/python-modules/google_cloud_datastore/default.nix
index 7f47725cde35..859e2271824f 100644
--- a/pkgs/development/python-modules/google_cloud_datastore/default.nix
+++ b/pkgs/development/python-modules/google_cloud_datastore/default.nix
@@ -9,23 +9,24 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-datastore";
-  version = "1.10.0";
+  version = "1.11.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cae213e3817f37fdc3ac27c3a162024de3319ad0faf87a536fce375c4a1c1dc9";
+    sha256 = "1p0ifkhj48fa3m1y5990412s8msnn6mbz5p5g8ffln7jq7dvn57j";
   };
 
   checkInputs = [ pytest mock ];
   propagatedBuildInputs = [ google_api_core google_cloud_core ];
 
   checkPhase = ''
+    rm -r google
     pytest tests/unit
   '';
 
   meta = with stdenv.lib; {
     description = "Google Cloud Datastore API client library";
-    homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
+    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
     license = licenses.asl20;
     maintainers = [ maintainers.costrouc ];
   };

From b866df5dfebb4dd3c596db8f587c45ccda488d07 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 15:23:27 -0700
Subject: [PATCH 3410/4636] python3Packages.google_cloud_dns: 0.31.0 -> 0.32.0,
 fix tests

---
 .../python-modules/google_cloud_dns/default.nix            | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_dns/default.nix b/pkgs/development/python-modules/google_cloud_dns/default.nix
index 3ed34303a727..833dfed4d6b2 100644
--- a/pkgs/development/python-modules/google_cloud_dns/default.nix
+++ b/pkgs/development/python-modules/google_cloud_dns/default.nix
@@ -9,23 +9,24 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-dns";
-  version = "0.31.0";
+  version = "0.32.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0dc0244c96378615b19679ab001a85fe74b564233d4f3e185a0f8fe333530fe2";
+    sha256 = "1shaj1x9ccwz1ad41f8hkldibpg313raqlhwky7wij4gn2nix22i";
   };
 
   checkInputs = [ pytest mock ];
   propagatedBuildInputs = [ google_api_core google_cloud_core ];
 
   checkPhase = ''
+    rm -r google
     pytest tests/unit
   '';
 
   meta = with stdenv.lib; {
     description = "Google Cloud DNS API client library";
-    homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
+    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
     license = licenses.asl20;
     maintainers = [ maintainers.costrouc ];
   };

From 41e4419593d2ebb83b1d3ac4d97774a4867a28f3 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 15:24:33 -0700
Subject: [PATCH 3411/4636] python3Packages.google_cloud_error_reporting: fix
 tests

---
 .../python-modules/google_cloud_error_reporting/default.nix    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/google_cloud_error_reporting/default.nix b/pkgs/development/python-modules/google_cloud_error_reporting/default.nix
index ef07bf1a3cec..724539c55a0f 100644
--- a/pkgs/development/python-modules/google_cloud_error_reporting/default.nix
+++ b/pkgs/development/python-modules/google_cloud_error_reporting/default.nix
@@ -19,12 +19,13 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ google_cloud_logging ];
 
   checkPhase = ''
+    rm -r google
     pytest tests/unit
   '';
 
   meta = with stdenv.lib; {
     description = "Stackdriver Error Reporting API client library";
-    homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
+    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
     license = licenses.asl20;
     maintainers = [ maintainers.costrouc ];
   };

From f89f4578fd1fd6eb5d6e34d4f36182af3d906351 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 15:26:52 -0700
Subject: [PATCH 3412/4636] python3Packages.google_cloud_runtimeconfig: fix
 tests

---
 .../python-modules/google_cloud_runtimeconfig/default.nix   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix b/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix
index a1628b991400..f8962e6fa5d9 100644
--- a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix
+++ b/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix
@@ -19,13 +19,15 @@ buildPythonPackage rec {
   checkInputs = [ pytest mock ];
   propagatedBuildInputs = [ google_api_core google_cloud_core ];
 
+  # ignore tests which require credentials or network
   checkPhase = ''
-    pytest tests/unit
+    rm -r google
+    pytest tests/unit -k 'not client and not extra_headers'
   '';
 
   meta = with stdenv.lib; {
     description = "Google Cloud RuntimeConfig API client library";
-    homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
+    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
     license = licenses.asl20;
     maintainers = [ maintainers.costrouc ];
   };

From 1b6632d6dbc695609abeb85888c870c508930cee Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 15:29:10 -0700
Subject: [PATCH 3413/4636] python3Packages.google-auth-oauthlib: fix tests

---
 .../python-modules/google-auth-oauthlib/default.nix            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix
index 54498ba1a853..cf83bd4d0ed6 100644
--- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix
+++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix
@@ -27,8 +27,9 @@ buildPythonPackage rec {
     google_auth requests_oauthlib
   ];
 
+  doCheck = isPy3k;
   checkPhase = ''
-    rm -fr tests/__pycache__/
+    rm -fr tests/__pycache__/ google
     py.test
   '';
 

From e7c1bff67624298d3fe66092a6b59917c9c8c8d9 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 15:34:33 -0700
Subject: [PATCH 3414/4636] python3Packages.google_cloud_resource_manager:
 0.30.0 -> 0.30.1, fix tests

---
 .../google_cloud_resource_manager/default.nix              | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix b/pkgs/development/python-modules/google_cloud_resource_manager/default.nix
index 70dd5475c216..d1d4217b3ccc 100644
--- a/pkgs/development/python-modules/google_cloud_resource_manager/default.nix
+++ b/pkgs/development/python-modules/google_cloud_resource_manager/default.nix
@@ -9,23 +9,24 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-resource-manager";
-  version = "0.30.0";
+  version = "0.30.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6e4f1d618d8934ee9011e97db940bb177770b430fd29e58848599a416d9f6590";
+    sha256 = "03n9ahf4qiyamblh217m5bjc8n57gh09xz87l2iw84c81xxdfcpg";
   };
 
   checkInputs = [ pytest mock ];
   propagatedBuildInputs = [ google_cloud_core google_api_core ];
 
   checkPhase = ''
+    rm -r google
     pytest tests/unit
   '';
 
   meta = with stdenv.lib; {
     description = "Google Cloud Resource Manager API client library";
-    homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
+    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
     license = licenses.asl20;
     maintainers = [ maintainers.costrouc ];
   };

From 85e2d6a9352538fb785b7f513c7058a3407c65da Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 15:36:13 -0700
Subject: [PATCH 3415/4636] pythonPackages.kubernetes: disable tests for
 python2

python2 is unable to traverse other google namespaces
---
 pkgs/development/python-modules/kubernetes/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix
index 153398bdd8ed..6827480b9df4 100644
--- a/pkgs/development/python-modules/kubernetes/default.nix
+++ b/pkgs/development/python-modules/kubernetes/default.nix
@@ -17,6 +17,7 @@ buildPythonPackage rec {
     sed -e '/ipaddress/d' -i requirements.txt
   '' else "");
 
+  doCheck = pythonAtLeast "3";
   checkPhase = ''
     py.test
   '';

From c69153580b37c37964f2a01f113813fc0b7975a1 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 18 Mar 2020 15:38:47 -0700
Subject: [PATCH 3416/4636] python3Packages.google_cloud_translate: 2.0.0 ->
 2.0.1, fix tests

---
 .../python-modules/google_cloud_translate/default.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/google_cloud_translate/default.nix b/pkgs/development/python-modules/google_cloud_translate/default.nix
index 99494b6886cb..7537b6fe52d9 100644
--- a/pkgs/development/python-modules/google_cloud_translate/default.nix
+++ b/pkgs/development/python-modules/google_cloud_translate/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-translate";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0nfc628nr2k6kd3q9qpgwz7c12l0191rv5x4pvca8q82jl96gip5";
+    sha256 = "02wlqlrxk0x6a9wifcly2pr84r6k8i97ws0prx21379fss39gf2a";
   };
 
   # google_cloud_core[grpc] -> grpcio
@@ -23,12 +23,12 @@ buildPythonPackage rec {
   checkInputs = [ pytest mock ];
   checkPhase = ''
     cd tests # prevent local google/__init__.py from getting loaded
-    pytest unit
+    pytest unit -k 'not extra_headers'
   '';
 
   meta = with stdenv.lib; {
     description = "Google Cloud Translation API client library";
-    homepage = https://github.com/GoogleCloudPlatform/google-cloud-python;
+    homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python";
     license = licenses.asl20;
     maintainers = [ maintainers.costrouc ];
   };

From e22eb2d7b5078f78655e478dcee3a8298821edf3 Mon Sep 17 00:00:00 2001
From: Dominik Honnef <dominik@honnef.co>
Date: Thu, 19 Mar 2020 18:40:45 +0100
Subject: [PATCH 3417/4636] epkowa: fix parsing of interpreters (#82909)

Building with -std=c99 breaks the obsolete "%as" format string, which
completely breaks the parsing of epkowa interpreters. This means that
no scanner requiring plugins worked.
---
 pkgs/misc/drivers/epkowa/default.nix  |  1 +
 pkgs/misc/drivers/epkowa/sscanf.patch | 29 +++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/misc/drivers/epkowa/sscanf.patch

diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix
index 13bb63ca7091..c8c0ecb872e0 100644
--- a/pkgs/misc/drivers/epkowa/default.nix
+++ b/pkgs/misc/drivers/epkowa/default.nix
@@ -244,6 +244,7 @@ stdenv.mkDerivation rec {
       sha256 = "04y70qjd220dpyh771fiq50lha16pms98mfigwjczdfmx6kpj1jd";
     })
     ./firmware_location.patch
+    ./sscanf.patch
     ];
   patchFlags = [ "-p0" ];
 
diff --git a/pkgs/misc/drivers/epkowa/sscanf.patch b/pkgs/misc/drivers/epkowa/sscanf.patch
new file mode 100644
index 000000000000..7bee9cae5180
--- /dev/null
+++ b/pkgs/misc/drivers/epkowa/sscanf.patch
@@ -0,0 +1,29 @@
+The "%as" verb requests sscanf to allocate a buffer for us. However,
+this use of 'a' has been long deprecated, and gcc doesn't support it
+in this manner when using -std=c99. The modern replacement is "%ms".
+
+Without this change, iscan couldn't read the interpreter file, in turn
+breaking all scanners that require plugins.
+--- backend/cfg-obj.c.orig	2020-03-19 01:27:17.254762077 +0100
++++ backend/cfg-obj.c	2020-03-19 02:01:52.293329873 +0100
+@@ -1026,7 +1026,7 @@
+       char *vendor = NULL;
+       char *model  = NULL;
+ 
+-      sscanf (string, "%*s %as %as", &vendor, &model);
++      sscanf (string, "%*s %ms %ms", &vendor, &model);
+ 
+       if (list_append (_cfg->seen[CFG_KEY_SCSI], info))
+         {
+@@ -1108,10 +1112,10 @@
+       char *library  = NULL;
+       char *firmware = NULL;
+ 
+-      sscanf (string, "%*s %*s %x %x %as %as",
++      sscanf (string, "%*s %*s %x %x %ms %ms",
+               &vendor, &product, &library, &firmware);
+ 
+       if (library && _cfg_have_interpreter (library, firmware)
+           && list_append (_cfg->seen[CFG_KEY_INTERPRETER], info))
+         {
+ 

From 1a786820c212863e53370dd4135d492189cf36da Mon Sep 17 00:00:00 2001
From: Fabian Page <fabian.page@tegonal.com>
Date: Wed, 18 Mar 2020 15:35:37 +0100
Subject: [PATCH 3418/4636] ammonite: updated to version 2.0.4

---
 pkgs/development/tools/ammonite/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index eba5a2b67149..743ebeef0a84 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -8,7 +8,7 @@ let
 common = { scalaVersion, sha256 }:
 stdenv.mkDerivation rec {
   pname = "ammonite";
-  version = "1.7.4";
+  version = "2.0.4";
 
   src = fetchurl {
     url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
   };
 };
 in {
-  ammonite_2_12 = common { scalaVersion = "2.12"; sha256 = "0d2xjhxrly4cv5fpjv1i0a74ayij7c2x5sb6lsgzxpq7jj0bk1m6"; };
-  ammonite_2_13 = common { scalaVersion = "2.13"; sha256 = "0hmdizzf8l8i07vdfik24iby39xg1vjfp1cwgjpbcmxv8klf50b0"; };
+  ammonite_2_12 = common { scalaVersion = "2.12"; sha256 = "068lcdi1y3zcspr0qmppflad7a4kls9gi321rp8dc5qc6f9nnk04"; };
+  ammonite_2_13 = common { scalaVersion = "2.13"; sha256 = "0fa0q9nk00crr2ws2mmw6pp4vf0xy53bqqhnws524ywwg6zwrl9s"; };
 }

From fbbe9a481a5c77a56c3c29db326009ba0c4aceb0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Mar 2020 21:50:55 +0000
Subject: [PATCH 3419/4636] half: 1.12.0 -> 2.1.0

---
 pkgs/development/libraries/half/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/half/default.nix b/pkgs/development/libraries/half/default.nix
index 063d416a8fc5..b0f4c3a0e9e0 100644
--- a/pkgs/development/libraries/half/default.nix
+++ b/pkgs/development/libraries/half/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
-  version = "1.12.0";
+  version = "2.1.0";
   pname = "half";
 
   src = fetchzip {
     url = "mirror://sourceforge/half/${version}/half-${version}.zip";
-    sha256 = "0096xiw8nj86vxnn3lfcl94vk9qbi5i8lnydri9ws358ly6002vc";
+    sha256 = "04v4rhs1ffd4c9zcnk4yjhq0gdqy020518wb7n8ryk1ckrdd7hbm";
     stripRoot = false;
   };
 

From e34636737cf611c7a34381e8a66f16d484b758d1 Mon Sep 17 00:00:00 2001
From: Rakesh Gupta <rakesh.gupta@formbay.com.au>
Date: Mon, 16 Mar 2020 16:34:01 +1100
Subject: [PATCH 3420/4636] pythonPackages.mask-rcnn: init at 2.1

---
 .../python-modules/mask-rcnn/default.nix      | 52 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/python-modules/mask-rcnn/default.nix

diff --git a/pkgs/development/python-modules/mask-rcnn/default.nix b/pkgs/development/python-modules/mask-rcnn/default.nix
new file mode 100644
index 000000000000..e9362f4e077b
--- /dev/null
+++ b/pkgs/development/python-modules/mask-rcnn/default.nix
@@ -0,0 +1,52 @@
+{ buildPythonPackage
+, cython
+, fetchFromGitHub
+, h5py
+, imgaug
+, ipython
+, Keras
+, lib
+, matplotlib
+, numpy
+, opencv3
+, pillow
+, scikitimage
+, scipy
+, tensorflow
+}:
+
+buildPythonPackage rec {
+  pname = "mask-rcnn";
+  version = "2.1";
+  
+  src = fetchFromGitHub {
+    owner = "matterport";
+    repo = "Mask_RCNN";
+    rev = "3deaec5d902d16e1daf56b62d5971d428dc920bc";
+    sha256 = "13s3q9yh2q9m9vyksd269mww3bni4q2w7q5l419q70ca075qp8zp";
+  };
+
+  nativeBuildInputs = [ cython ];
+
+  propagatedBuildInputs = [
+    h5py
+    imgaug
+    ipython
+    Keras
+    matplotlib
+    numpy
+    opencv3
+    pillow
+    scikitimage
+    scipy
+    tensorflow
+  ];
+
+  meta = with lib; {
+    description = "Mask R-CNN for object detection and instance segmentation on Keras and TensorFlow";
+    homepage = "https://github.com/matterport/Mask_RCNN";
+    license = licenses.mit;
+    maintainers = with maintainers; [ rakesh4g ];
+  };
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 28695722a92e..c812c7cd9f8b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -878,6 +878,8 @@ in {
 
   markerlib = callPackage ../development/python-modules/markerlib { };
 
+  mask-rcnn = callPackage ../development/python-modules/mask-rcnn { };
+
   matchpy = callPackage ../development/python-modules/matchpy { };
 
   maxminddb = callPackage ../development/python-modules/maxminddb { };

From bdf9aad7b25d4c645018e49321a98444b60979d8 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 19 Mar 2020 18:46:09 +0000
Subject: [PATCH 3421/4636] gucharmap: 12.0.1 -> 13.0.0

12.1.0 has switched from autotools to meson.

Fix build after #82721.
---
 .../gnome-3/core/gucharmap/default.nix        | 35 +++++++------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
index ce5e073ac064..3d2da33732b2 100644
--- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix
+++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
@@ -1,15 +1,15 @@
 { stdenv
 , intltool
 , fetchFromGitLab
-, fetchpatch
+, meson
+, ninja
 , pkgconfig
+, python3
 , gtk3
 , adwaita-icon-theme
 , glib
 , desktop-file-utils
 , gtk-doc
-, autoconf
-, automake
 , libtool
 , wrapGAppsHook
 , gnome3
@@ -45,7 +45,7 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "gucharmap";
-  version = "12.0.1";
+  version = "13.0.0";
 
   outputs = [ "out" "lib" "dev" "devdoc" ];
 
@@ -54,25 +54,18 @@ in stdenv.mkDerivation rec {
     owner = "GNOME";
     repo = pname;
     rev = version;
-    sha256 = "0si3ymyfzc5v7ly0dmcs3qgw2wp8cyasycq5hmcr8frl09lr6gkw";
+    sha256 = "17arjigs1lw1h428s9g171n0idrpf9ks23sndldsik1zvvwzlldh";
   };
 
-  patches = [
-    # fix build with Unicode 12.1
-    (fetchpatch {
-      url = "https://salsa.debian.org/gnome-team/gucharmap/raw/de079ad494a15f662416257fca2f2b8db757f4ea/debian/patches/update-to-unicode-12.1.patch";
-      sha256 = "093gqsxfpp3s0b88p1dgkskr4ng3hv8irmxc60l3fdrkl8am00xh";
-    })
-  ];
-
   nativeBuildInputs = [
+    meson
+    ninja
     pkgconfig
+    python3
     wrapGAppsHook
     unzip
     intltool
     itstool
-    autoconf
-    automake
     libtool
     gtk-doc
     docbook_xsl
@@ -90,19 +83,15 @@ in stdenv.mkDerivation rec {
     adwaita-icon-theme
   ];
 
-  configureFlags = [
-    "--with-unicode-data=${ucd}/share/unicode"
-    "--enable-gtk-doc"
+  mesonFlags = [
+    "-Ducd_path=${ucd}/share/unicode"
+    "-Dvapi=false"
   ];
 
   doCheck = true;
 
   postPatch = ''
-    patchShebangs gucharmap/gen-guch-unicode-tables.pl
-  '';
-
-  preConfigure = ''
-    NOCONFIGURE=1 ./autogen.sh
+    patchShebangs data/meson_desktopfile.py gucharmap/gen-guch-unicode-tables.pl gucharmap/meson_compileschemas.py
   '';
 
   passthru = {

From 913e6b5c7b9538a770b98fa867feb9e5b22c6f68 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Thu, 19 Mar 2020 11:32:30 -0700
Subject: [PATCH 3422/4636] grafana: 6.6.2 -> 6.7.0

---
 pkgs/servers/monitoring/grafana/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index a4a4796a8cdf..b96f2c8ce4e1 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "grafana";
-  version = "6.6.2";
+  version = "6.7.0";
 
   goPackagePath = "github.com/grafana/grafana";
 
@@ -12,12 +12,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "0zbc9jcr3w7rwsv96csqaifn5d0b435wyrrajr5wzsmhljygvrcy";
+    sha256 = "013586kaiyrs5b1mxf9vlcfh7va8md5amnh2jj26jph8ns6m0f87";
   };
 
   srcStatic = fetchurl {
     url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "1plijm7cy92k79ypcnxjmdf2vhlxa4dzwjyl9lkf2npm7kswswsl";
+    sha256 = "05g6lsl0vmc4q60dkm1404dl0k3wrlf6yy2l2cnaydl6aqz1kh8d";
   };
 
   postPatch = ''

From de7c13960bd2a04c4fb096f050f97d8ad3f13f1d Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Thu, 19 Mar 2020 17:51:41 +0100
Subject: [PATCH 3423/4636] i3-wk-switch: 2019-05-10 -> 2020-03-18

---
 pkgs/applications/window-managers/i3/wk-switch.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/pkgs/applications/window-managers/i3/wk-switch.nix
index 5b1cdbe05f5d..98855517303e 100644
--- a/pkgs/applications/window-managers/i3/wk-switch.nix
+++ b/pkgs/applications/window-managers/i3/wk-switch.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "i3-wk-switch";
-  version = "2019-05-10";
+  version = "2020-03-18";
 
   src = fetchFromGitHub {
     owner = "tmfink";
     repo = pname;
-    rev = "05a2d5d35e9841d2a26630f1866fc0a0e8e708eb";
-    sha256 = "0ln192abdqrrs7rdazp9acbji2y6pf68z2d1by4nf2q529dh24dc";
+    rev = "a618cb8f52120aa8d533bb7c0c8de3ff13b3dc06";
+    sha256 = "0ci0w5igjk5xa8x4rx17cpgmdkamwjmavxhp0vp6213cl93ybjhz";
   };
 
   propagatedBuildInputs = with python3Packages; [ i3ipc ];

From ad1aff582f11fc317a1ea686a1a795137b6c12bf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Mar 2020 10:43:10 +0000
Subject: [PATCH 3424/4636] nsd: 4.2.4 -> 4.3.0

---
 pkgs/servers/dns/nsd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index 130a25511d70..d815771c66cb 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "nsd";
-  version = "4.2.4";
+  version = "4.3.0";
 
   src = fetchurl {
     url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "0z7j3vwqqj0hh8n5irb2yqwzl45k4sn2wczbq1b1lqv5cxv6vgcy";
+    sha256 = "15qy25210j9nq2i3pm8rwphnc6b5gq83js10078fvw9hbmjps03s";
   };
 
   prePatch = ''
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.nlnetlabs.nl;
+    homepage = "http://www.nlnetlabs.nl";
     description = "Authoritative only, high performance, simple and open source name server";
     license = licenses.bsd3;
     platforms = platforms.unix;

From 8132a6fb8fe2cdf6e4d540b3dd55316b72b333bd Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Sun, 15 Mar 2020 00:45:51 +0100
Subject: [PATCH 3425/4636] sidequest: 0.8.4 -> 0.8.7

---
 pkgs/applications/misc/sidequest/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix
index 7059eeb2a0d5..3638a1d18809 100644
--- a/pkgs/applications/misc/sidequest/default.nix
+++ b/pkgs/applications/misc/sidequest/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }:
 	let
 		pname = "sidequest";
-		version = "0.8.4";
+		version = "0.8.7";
 
 		desktopItem = makeDesktopItem rec {
 			name = "SideQuest";
@@ -16,7 +16,7 @@
 
 			src = fetchurl {
 				url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz";
-				sha256 = "1fiqjzvl7isjn7w6vbbs439pp3bdhw6mnbf8483kvfb0fqhh3vs2";
+				sha256 = "1hbr6ml689zq4k3mzmn2xcn4r4dy717rgq3lgm32pzwgy5w92i2j";
 			};
 
 			buildInputs = [ makeWrapper ];

From f311e4f04bc21b4e7491e2d0b288875988358602 Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Mon, 24 Feb 2020 09:59:15 +0100
Subject: [PATCH 3426/4636] metals: 0.8.1 -> 0.8.2

---
 pkgs/development/tools/metals/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix
index 6ac2d4404eb9..6a6aafaf9e5e 100644
--- a/pkgs/development/tools/metals/default.nix
+++ b/pkgs/development/tools/metals/default.nix
@@ -2,7 +2,7 @@
 
 let
   baseName = "metals";
-  version = "0.8.1";
+  version = "0.8.2";
   deps = stdenv.mkDerivation {
     name = "${baseName}-deps-${version}";
     buildCommand = ''
@@ -15,7 +15,7 @@ let
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "0m1vly213cazylg1rmfh5qk3bq65aafa0rf1anfdb3ggymylwza0";
+    outputHash     = "09acvrfv23q1iv4sq7jhpf5frcv7dk2nq147licma5iixc726bdx";
   };
 in
 stdenv.mkDerivation rec {

From 2719f569d212291379a6c3d48eefcd83db21a867 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 19 Mar 2020 20:23:24 +0100
Subject: [PATCH 3427/4636] androidStudioPackages.{dev,canary}: 4.1.0.2 ->
 4.1.0.3

---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 8354a04b2c58..39929e5e5275 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -18,9 +18,9 @@ let
     sha256Hash = "0i4n5kxnfxnz3y44ba0x2j8nkmss4gchrzcdnb9wf6xc1jqrjwcm";
   };
   latestVersion = { # canary & dev
-    version = "4.1.0.2"; # "Android Studio 4.1 Canary 2"
-    build = "193.6264773";
-    sha256Hash = "0m09q4jp653i9jlqsjplx3d64xkdm27c35781yz6h5rw0a1sq6kz";
+    version = "4.1.0.3"; # "Android Studio 4.1 Canary 3"
+    build = "193.6297379";
+    sha256Hash = "0sb8ll9bkkdglq18wvy5hikimhjbpfadjdygx9cd8q545h8dy137";
   };
 in {
   # Attributes are named by their corresponding release channels

From 63697ed0c2b3e1ec3dd7f46e4ce29ef9aaf4b9b9 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 19 Mar 2020 11:32:06 -0700
Subject: [PATCH 3428/4636] python3Packages.geopandas: 0.6.3 -> 0.7.0

---
 pkgs/development/python-modules/geopandas/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix
index b7dea183b0e2..6b1b74cae8a8 100644
--- a/pkgs/development/python-modules/geopandas/default.nix
+++ b/pkgs/development/python-modules/geopandas/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
+{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27
 , pandas, shapely, fiona, descartes, pyproj
 , pytest, Rtree }:
 
 buildPythonPackage rec {
   pname = "geopandas";
-  version = "0.6.3";
+  version = "0.7.0";
+  disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "geopandas";
     repo = "geopandas";
     rev = "v${version}";
-    sha256 = "11mzb5spwa06h1zhn7z905wcwya2x5srghv82jp5zjka9zdhsycd";
+    sha256 = "0cfdvl4cvi0nim1qbmzf7vg0all272i8r0kj4xgdd0hr2j4jdg9p";
   };
 
   checkInputs = [ pytest Rtree ];

From c8edc08dc477ce2de29a95e77444bb84928a2e57 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 19 Mar 2020 19:53:57 +0000
Subject: [PATCH 3429/4636] mup: init at 6.7

---
 pkgs/applications/audio/mup/default.nix       | 41 +++++++++++++++++++
 .../mup/ghostscript-permit-file-write.patch   |  5 +++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 48 insertions(+)
 create mode 100644 pkgs/applications/audio/mup/default.nix
 create mode 100644 pkgs/applications/audio/mup/ghostscript-permit-file-write.patch

diff --git a/pkgs/applications/audio/mup/default.nix b/pkgs/applications/audio/mup/default.nix
new file mode 100644
index 000000000000..43098be12e3f
--- /dev/null
+++ b/pkgs/applications/audio/mup/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, autoreconfHook, bison, flex, ghostscript, groff, netpbm
+, fltk, libXinerama, libXpm, libjpeg
+}:
+
+stdenv.mkDerivation rec {
+  pname = "mup";
+  version = "6.7";
+
+  src = fetchurl {
+    url = "http://www.arkkra.com/ftp/pub/unix/mup${builtins.replaceStrings ["."] [""] version}src.tar.gz";
+    sha256 = "1y1qknhib1isdjsbv833w3nxzyfljkfgp1gmjwly60l55q60frpk";
+  };
+
+  nativeBuildInputs = [ autoreconfHook bison flex ghostscript groff netpbm ];
+
+  buildInputs = [ fltk libXinerama libXpm libjpeg ];
+
+  patches = [ ./ghostscript-permit-file-write.patch ];
+
+  postPatch = ''
+    for f in Makefile.am doc/Makefile.am doc/htmldocs/Makefile.am src/mupmate/Preferences.C; do
+      substituteInPlace $f --replace doc/packages doc
+    done
+    substituteInPlace src/mupprnt/mupprnt --replace 'mup ' $out/bin/mup' '
+    substituteInPlace src/mupdisp/genfile.c --replace '"mup"' '"'$out/bin/mup'"'
+    substituteInPlace src/mupmate/Preferences.C \
+      --replace '"mup"' '"'$out/bin/mup'"' \
+      --replace '"gv"' '"xdg-open"' \
+      --replace /usr/share/doc $out/share/doc
+  '';
+
+  enableParallelBuilding = false; # Undeclared dependencies + https://stackoverflow.com/a/19822767/1687334 for prolog.ps.
+
+  meta = with stdenv.lib; {
+    homepage = http://www.arkkra.com/;
+    description = "Music typesetting program (ASCII to PostScript and MIDI)";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ orivej ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/audio/mup/ghostscript-permit-file-write.patch b/pkgs/applications/audio/mup/ghostscript-permit-file-write.patch
new file mode 100644
index 000000000000..5059e71001f0
--- /dev/null
+++ b/pkgs/applications/audio/mup/ghostscript-permit-file-write.patch
@@ -0,0 +1,5 @@
+--- a/src/mup/Makefile.am
++++ b/src/mup/Makefile.am
+@@ -39 +39 @@ fontdata.c:	prolog.ps ../../tools/mup/getfontinfo.ps ../../LICENSE
+-	$(GS) -sDEVICE=nullpage -sOutputFile=/dev/null -dQUIET - < ../../tools/mup/getfontinfo.ps | $(SED) -e "/Warning:/d" >> fontdata.c
++	$(GS) -sDEVICE=nullpage -sOutputFile=/dev/null -dQUIET --permit-file-write=charnames:fontinit - < ../../tools/mup/getfontinfo.ps | $(SED) -e "/Warning:/d" >> fontdata.c
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1edff11927c7..cf5f169933ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20655,6 +20655,8 @@ in
       else null;
   };
 
+  mup = callPackage ../applications/audio/mup { };
+
   # TODO: we should probably merge these 2
   musescore =
     if stdenv.isDarwin then

From d28f138160dcf6bfb17c3c9c2f419987e6ca7b17 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Thu, 19 Mar 2020 21:19:25 +0100
Subject: [PATCH 3430/4636] nixos: Fix pkgs exporting

This needs adjustment after dcdd232939232d04c1132b4cc242dd3dac44be8c
---
 nixos/lib/eval-config.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index 9892d6f160f7..c8824c2690d3 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -61,7 +61,7 @@ in rec {
     args = extraArgs;
     specialArgs =
       { modulesPath = builtins.toString ../modules; } // specialArgs;
-  }) config options;
+  }) config options _module;
 
   # These are the extra arguments passed to every module.  In
   # particular, Nixpkgs is passed through the "pkgs" argument.
@@ -69,5 +69,5 @@ in rec {
     inherit baseModules extraModules modules;
   };
 
-  inherit (config._module.args) pkgs;
+  inherit (_module.args) pkgs;
 }

From 9ac94c36d4e3d3f8c7caf5896f3a8b957910c3aa Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Thu, 19 Mar 2020 13:21:46 -0700
Subject: [PATCH 3431/4636] zoxide: 0.2.1 -> 0.2.2

---
 pkgs/tools/misc/zoxide/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix
index 4ce1be83b557..9502af65201e 100644
--- a/pkgs/tools/misc/zoxide/default.nix
+++ b/pkgs/tools/misc/zoxide/default.nix
@@ -2,26 +2,26 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "zoxide";
-  version = "0.2.1";
+  version = "0.2.2";
 
   src = fetchFromGitHub {
     owner = "ajeetdsouza";
     repo = "zoxide";
     rev = "v${version}";
-    sha256 = "0ldqhzkpbqjc1in0d0f7b06b8gim4sbh292qcbwhf5abyrhbm3m8";
+    sha256 = "0s6aax6bln9jmmv7kw630mj0l6qpvdx8mdk3a5d9akr9d23zxmr5";
   };
 
   buildInputs = [
     fzf
   ];
 
-  cargoSha256 = "1grrqbdy37p3r857gz956h0ls922ma5fz6f8fb3vx7wc98rap621";
+  cargoSha256 = "1gzpkf7phl5xd666l7pc25917x4qq0kkxk4i9dkz3lvxz3v8ylrz";
 
   meta = with stdenv.lib; {
     description = "A fast cd command that learns your habits";
     homepage = "https://github.com/ajeetdsouza/zoxide";
     license = with licenses; [ mit ];
-    maintainers = with maintainers; [ ysndr ];
+    maintainers = with maintainers; [ ysndr cole-h ];
     platforms = platforms.all;
   };
 }

From b51d4e588db7b7f414fceefc36145242232ee834 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 19 Mar 2020 21:24:26 +0100
Subject: [PATCH 3432/4636] thefuck: 3.29 -> 3.30

https://github.com/nvbn/thefuck/releases/tag/3.30
---
 pkgs/tools/misc/thefuck/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix
index 4ac9b32b3556..d67da78a3004 100644
--- a/pkgs/tools/misc/thefuck/default.nix
+++ b/pkgs/tools/misc/thefuck/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonApplication rec {
   pname = "thefuck";
-  version = "3.29";
+  version = "3.30";
 
   src = fetchFromGitHub {
     owner = "nvbn";
     repo = pname;
     rev = version;
-    sha256 = "1qhxwjjgrzpqrqjv7l2847ywpln76lyd6j8bl9gz2r6kl0fx2fqs";
+    sha256 = "0fnf78956pwhb9cgv1jmgypnkma5xzflkivfrkfiadbgin848yfg";
   };
 
   propagatedBuildInputs = [ colorama decorator psutil pyte six ];

From e671d8d9c252df6b88a27493bb2c8ccba616c629 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCtke-Stetzkamp?= <christian@lkamp.de>
Date: Thu, 27 Feb 2020 12:46:55 +0100
Subject: [PATCH 3433/4636] gwenhywfar: 4.20.0 -> 5.1.3

also update download url

Remove update script, because upstream has changed its CMS, which
changed the paths of the website, so the update script does not work any
more.
---
 .../libraries/aqbanking/gwenhywfar.nix        |  8 +-
 .../libraries/aqbanking/sources.nix           |  7 +-
 .../development/libraries/aqbanking/update.sh | 92 -------------------
 3 files changed, 5 insertions(+), 102 deletions(-)
 delete mode 100755 pkgs/development/libraries/aqbanking/update.sh

diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix
index 061ed77849f4..ee1fffdacddf 100644
--- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix
+++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix
@@ -16,12 +16,8 @@ in stdenv.mkDerivation rec {
   pname = "gwenhywfar";
   inherit version;
 
-  src = let
-    qstring = "package=01&release=${releaseId}&file=02";
-    mkURLs = map (base: "${base}/sites/download/download.php?${qstring}");
-  in fetchurl {
-    name = "${pname}-${version}.tar.gz";
-    urls = mkURLs [ "http://www.aquamaniac.de" "http://www2.aquamaniac.de" ];
+  src = fetchurl {
+    url = "https://www.aquamaniac.de/rdm/attachments/download/${releaseId}/${pname}-${version}.tar.gz";
     inherit sha256;
   };
 
diff --git a/pkgs/development/libraries/aqbanking/sources.nix b/pkgs/development/libraries/aqbanking/sources.nix
index 884543d282a7..9df21f2dedd3 100644
--- a/pkgs/development/libraries/aqbanking/sources.nix
+++ b/pkgs/development/libraries/aqbanking/sources.nix
@@ -1,8 +1,7 @@
-# This file is autogenerated from update.sh in the same directory.
 {
-  gwenhywfar.version = "4.20.0";
-  gwenhywfar.sha256 = "1c0g3f8jk6j693774ifslx2ds4ksabgbbalhhm9gk20kpamxm22s";
-  gwenhywfar.releaseId = "208";
+  gwenhywfar.version = "5.1.3";
+  gwenhywfar.sha256 = "0xjr9d94y46h7pfdhz5ygn01pmlm66rhiybr520h13nvjh4zid0r";
+  gwenhywfar.releaseId = "242";
   libchipcard.version = "5.0.4";
   libchipcard.sha256 = "0fj2h39ll4kiv28ch8qgzdbdbnzs8gl812qnm660bw89rynpjnnj";
   libchipcard.releaseId = "200";
diff --git a/pkgs/development/libraries/aqbanking/update.sh b/pkgs/development/libraries/aqbanking/update.sh
deleted file mode 100755
index 8929e8bc6eb4..000000000000
--- a/pkgs/development/libraries/aqbanking/update.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh -e
-basedir="$(cd "$(dirname "$0")" && pwd)"
-
-getCurrentVersions() {
-    [ -e "$basedir/sources.nix" ] || return 0
-    (cd "$basedir" && nix-instantiate --eval --strict -E '
-    toString ((import ../../../../lib).mapAttrsToList
-        (name: info: "${name}:${info.version}!${info.sha256}!${info.releaseId}")
-        (import ./sources.nix))
-    ' | tr -d '"')
-}
-
-currentVersions="$(getCurrentVersions)"
-
-getLastestVersion() {
-    local baseurl="https://www.aquamaniac.de"
-    local pkglist="sites/download/packages.php?package=$1&showall=1"
-    local url="$baseurl/$pkglist"
-    local reVersion='[0-9]+(\.[0-9]+)+' # Only release versions, no betas!
-    local reHref='href=".*release=([0-9]+).*dummy=[^0-9]*('"$reVersion"')\.tar'
-    local reFull='s/^.*<a\>.*\<'"$reHref"'.*/\2!\1/p'
-    curl -s "$url" | sed -nre "$reFull" | sort -V -k 1,1 | tail -n1
-}
-
-getEntry() {
-    local name="$1"
-    for entry in $currentVersions; do
-        if [ "${entry%%:*}" = "$name" ]; then
-            echo "${entry#*:}"
-            return 0
-        fi
-    done
-    return 1
-}
-
-prefetchNew() {
-    local name="$1"
-    local version="$2"
-    local package="$3"
-    local releaseId="$4"
-
-    local url="http://www.aquamaniac.de/sites/download/download.php"
-    local qstring="package=$package&release=$releaseId&file=01";
-
-    nix-prefetch-url --name "$name-$version.tar.gz" "$url?$qstring"
-}
-
-processPackage() {
-    local name="$1"
-    local package="$2"
-
-    local latest="$(getLastestVersion "$package")"
-    local current="$(getEntry "$name")"
-    local currentTail="${current#*!}"
-
-    local currentVersion="${current%%!*}"
-    local currentSha256="${currentTail%%!*}"
-    local currentReleaseId="${current##*!}"
-
-    local latestVersion="${latest%%!*}"
-    local latestReleaseId="${latest##*!}"
-
-    if [ "$latestVersion" = "$currentVersion" -a \
-         "$latestReleaseId" = "$currentReleaseId" ]; then
-        echo "  $name.version = \"$currentVersion\";"
-        echo "  $name.sha256 = \"$currentSha256\";"
-        echo "  $name.releaseId = \"$currentReleaseId\";"
-        return 0
-    fi
-
-    local latestSha256="$(
-        prefetchNew "$name" "$latestVersion" "$package" "$latestReleaseId"
-    )"
-
-    echo "  $name.version = \"$latestVersion\";"
-    echo "  $name.sha256 = \"$latestSha256\";"
-    echo "  $name.releaseId = \"$latestReleaseId\";"
-    return 0
-}
-
-generateNewSources() {
-    echo "# This file is autogenerated from update.sh in the same directory."
-    echo "{"
-    for package in gwenhywfar:01 libchipcard:02 aqbanking:03; do
-        processPackage "${package%%:*}" "${package##*:}"
-    done
-    echo "}"
-}
-
-if newSources="$(generateNewSources)"; then
-    echo "$newSources" > "$basedir/sources.nix"
-fi

From 617d3b751aa09e3457721f5e1f06aa7a047b9df5 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 20 Mar 2020 07:09:17 +1000
Subject: [PATCH 3434/4636] podman: 1.8.1 -> 1.8.2

https://github.com/containers/libpod/releases/tag/v1.8.2
---
 pkgs/applications/virtualization/podman/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
index 7e557842bc8d..288cac27b21a 100644
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@@ -5,13 +5,13 @@
 
 buildGoPackage rec {
   pname = "podman";
-  version = "1.8.1";
+  version = "1.8.2";
 
   src = fetchFromGitHub {
     owner  = "containers";
     repo   = "libpod";
     rev    = "v${version}";
-    sha256 = "047nji6vbrdb1pm8ymxz4dv07xdnp5c624bq2cfy58m5l4f1dn75";
+    sha256 = "1nxlkqz1ffa3l2yf4rmsxj788dx6xdp8pbi55m9jc9k1vqwc9hxs";
   };
 
   goPackagePath = "github.com/containers/libpod";

From 6de54148ef4c3bb2c32039083a12e2faa42b53c0 Mon Sep 17 00:00:00 2001
From: "*Kim Zick (rummik)" <k@9k1.us>
Date: Sat, 16 Nov 2019 18:56:46 -0500
Subject: [PATCH 3435/4636] vim-utils: Fix converting vam.pluginDictionaries to
 VimL

---
 pkgs/misc/vim-plugins/vim-utils.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index d1b1bc846ebd..a19a09d23e0d 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -249,13 +249,14 @@ let
         # plugins with dependencies
         plugins = findDependenciesRecursively specifiedPlugins;
 
-        # Vim almost reads JSON, so eventually JSON support should be added to Nix
-        # TODO: proper quoting
-        toNix = x:
-          if (builtins.isString x) then "'${x}'"
-          else if builtins.isAttrs x && builtins ? out then toNix x # a derivation
-          else if builtins.isAttrs x then "{${lib.concatStringsSep ", " (lib.mapAttrsToList (n: v: "${toNix n}: ${toNix v}") x)}}"
-          else if builtins.isList x then "[${lib.concatMapStringsSep ", " toNix x}]"
+        # Convert scalars, lists, and attrs, to VimL equivalents
+        toVimL = x:
+          if builtins.isString x then "'${lib.replaceStrings [ "\n" "'" ] [ "\n\\ " "''" ] x}'"
+          else if builtins.isAttrs x && builtins ? out then toVimL x # a derivation
+          else if builtins.isAttrs x then "{${lib.concatStringsSep ", " (lib.mapAttrsToList (n: v: "${toVimL n}: ${toVimL v}") x)}}"
+          else if builtins.isList x then "[${lib.concatMapStringsSep ", " toVimL x}]"
+          else if builtins.isInt x || builtins.isFloat x then builtins.toString x
+          else if builtins.isBool x then (if x then "1" else "0")
           else throw "turning ${lib.generators.toPretty {} x} into a VimL thing not implemented yet";
 
       in assert builtins.hasAttr "vim-addon-manager" knownPlugins;
@@ -290,9 +291,9 @@ let
           endif
         endif
 
-        " tell vam about which plugins to load when:
+        " tell vam which plugins to load, and when:
         let l = []
-        ${lib.concatMapStrings (p: "call add(l, {'name': '${p.pname}'})\n") plugins}
+        ${lib.concatMapStrings (p: "call add(l, ${toVimL p})\n") vam.pluginDictionaries}
         call vam#Scripts(l, {})
       '');
 

From 4ebc22781d41cd8d3d732da9c5c7090a0edfc3a4 Mon Sep 17 00:00:00 2001
From: Lily Ballard <lilyball@twitch.tv>
Date: Thu, 19 Mar 2020 14:32:57 -0700
Subject: [PATCH 3436/4636] psc-package: Stop using haskellPackages to build

Switch to the approach taken by
https://github.com/justinwoo/easy-purescript-nix/blob/master/psc-package-simple.nix

This downloads a prebuilt release and patches the linker paths. It
reduces the number of supported platforms, but ensures we're using the
official supported psc-package compiler. The `haskellPackages` approach
wasn't supported and was leading to version conflicts with dependencies.
---
 .../purescript/psc-package/default.nix        | 70 ++++++++++++++-----
 pkgs/top-level/all-packages.nix               |  3 +-
 2 files changed, 53 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix
index 908a8e943e78..0bebd5d2f50d 100644
--- a/pkgs/development/compilers/purescript/psc-package/default.nix
+++ b/pkgs/development/compilers/purescript/psc-package/default.nix
@@ -1,27 +1,61 @@
-{ haskellPackages, mkDerivation, fetchFromGitHub, lib }:
+# Based on https://github.com/justinwoo/easy-purescript-nix/blob/master/psc-package-simple.nix
+{ stdenv, lib, fetchurl, gmp, zlib, libiconv, darwin, installShellFiles }:
 
-with lib;
+let
+  dynamic-linker = stdenv.cc.bintools.dynamicLinker;
+
+in
+stdenv.mkDerivation rec {
+  pname = "psc-package-simple";
 
-mkDerivation rec {
-  pname = "psc-package";
   version = "0.6.2";
 
-  src = fetchFromGitHub {
-    owner = "purescript";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "0536mijma61khldnpbdviq2vvpfzzz7w8bxr59mvr19i10njdq0y";
+  src = if stdenv.isDarwin
+  then fetchurl {
+    url = "https://github.com/purescript/psc-package/releases/download/v0.6.2/macos.tar.gz";
+    sha256 = "17dh3bc5b6ahfyx0pi6n9qnrhsyi83qdynnca6k1kamxwjimpcq1";
+  }
+  else fetchurl {
+    url = "https://github.com/purescript/psc-package/releases/download/v0.6.2/linux64.tar.gz";
+    sha256 = "1zvay9q3xj6yd76w6qyb9la4jaj9zvpf4dp78xcznfqbnbhm1a54";
   };
 
-  isLibrary = false;
-  isExecutable = true;
+  buildInputs = [ gmp zlib ];
+  nativeBuildInputs = [ installShellFiles ];
 
-  executableHaskellDepends = with haskellPackages; [
-    aeson aeson-pretty either errors optparse-applicative
-    system-filepath turtle
-  ];
+  libPath = lib.makeLibraryPath buildInputs;
 
-  description = "A package manager for PureScript based on package sets";
-  license = licenses.bsd3;
-  maintainers = with lib.maintainers; [ Profpatsch ];
+  dontStrip = true;
+
+  installPhase = ''
+    mkdir -p $out/bin
+
+    PSC_PACKAGE=$out/bin/psc-package
+
+    install -D -m555 -T psc-package $PSC_PACKAGE
+    chmod u+w $PSC_PACKAGE
+  '' + lib.optionalString stdenv.isDarwin ''
+    install_name_tool \
+      -change /usr/lib/libSystem.B.dylib ${darwin.Libsystem}/lib/libSystem.B.dylib \
+      -change /usr/lib/libiconv.2.dylib ${libiconv}/libiconv.2.dylib \
+      $PSC_PACKAGE
+  '' + lib.optionalString (!stdenv.isDarwin) ''
+    patchelf --interpreter ${dynamic-linker} --set-rpath ${libPath} $PSC_PACKAGE
+  '' + ''
+    chmod u-w $PSC_PACKAGE
+
+    $PSC_PACKAGE --bash-completion-script $PSC_PACKAGE > psc-package.bash
+    $PSC_PACKAGE --fish-completion-script $PSC_PACKAGE > psc-package.fish
+    $PSC_PACKAGE --zsh-completion-script $PSC_PACKAGE > _psc-package
+    installShellCompletion \
+      psc-package.{bash,fish} \
+      --zsh _psc-package
+  '';
+
+  meta = with lib; {
+    description = "A package manager for PureScript based on package sets";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ Profpatsch ];
+    platforms = [ "x86_64-darwin" "x86_64-linux" ];
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cf5f169933ef..a69af3479204 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8343,8 +8343,7 @@ in
 
   purescript = callPackage ../development/compilers/purescript/purescript { };
 
-  psc-package = haskell.lib.justStaticExecutables
-    (haskellPackages.callPackage ../development/compilers/purescript/psc-package { });
+  psc-package = callPackage ../development/compilers/purescript/psc-package { };
 
   purescript-psa = nodePackages.purescript-psa;
 

From 9ce9a32ed9a02488129e60b9d0fe2597d6afa5af Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Mar 2020 22:02:08 +0000
Subject: [PATCH 3437/4636] python27Packages.gspread: 3.1.0 -> 3.3.0

---
 pkgs/development/python-modules/gspread/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix
index 2a20d6104853..cebb48f43943 100644
--- a/pkgs/development/python-modules/gspread/default.nix
+++ b/pkgs/development/python-modules/gspread/default.nix
@@ -5,12 +5,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "3.1.0";
+  version = "3.3.0";
   pname = "gspread";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f7ce6c06250f694976c3cd4944e3b607b0810b93383839e5b67c7199ce2f0d3d";
+    sha256 = "1nlmg7lnj162nql1acw9z7n1043sk49j11arlfn766i9ykvq6hng";
   };
 
   propagatedBuildInputs = [ requests ];

From fac6ee175c420b8fa61b1e5631e29a3c5ab2e4c9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Mar 2020 22:11:49 +0000
Subject: [PATCH 3438/4636] python37Packages.etesync: 0.9.3 -> 0.10.0

---
 pkgs/development/python-modules/etesync/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/etesync/default.nix b/pkgs/development/python-modules/etesync/default.nix
index f96c3e10883c..4edf0f71cf20 100644
--- a/pkgs/development/python-modules/etesync/default.nix
+++ b/pkgs/development/python-modules/etesync/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "etesync";
-  version = "0.9.3";
+  version = "0.10.0";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1i6v7i4xmbpkc1pgpzq8gyl2kvg3a1kpdwp8q6l3l0vf9p5qm06w";
+    sha256 = "09sdqviv9jyd013gxjjcw6vd4si860304haylvw4dp9kljsd94qa";
   };
 
   propagatedBuildInputs = [

From 581faf79718f520876f2c0e72790befc220eeb17 Mon Sep 17 00:00:00 2001
From: andys8 <andys8@users.noreply.github.com>
Date: Fri, 20 Mar 2020 00:25:03 +0100
Subject: [PATCH 3439/4636] slack-term: 0.4.1 -> 0.5.0

---
 .../networking/instant-messengers/slack-term/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix
index 6271e338a964..d1f3e98c4ec2 100644
--- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix
@@ -3,7 +3,7 @@
 buildGoPackage rec {
   # https://github.com/erroneousboat/slack-term
   pname = "slack-term";
-  version = "0.4.1";
+  version = "0.5.0";
 
   goPackagePath = "github.com/erroneousboat/slack-term";
 
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "erroneousboat";
     repo = "slack-term";
     rev = "v${version}";
-    sha256 = "1340bq7h31fxykxbxpn6hv7n2hmjf20f8vg5gan9pjf5jaa6kfza";
+    sha256 = "1fbq7bdhy70hlkklppimgdjamnk0v059pg73xm9ax1f4616ki1m6";
   };
 
   meta = with stdenv.lib; {

From 19ceeb6de0b03381cd1444ceccaa95ebe688987e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 20 Mar 2020 00:51:01 +0100
Subject: [PATCH 3440/4636] wireguard-tools: 1.0.20200206 -> 1.0.20200319

https://lists.zx2c4.com/pipermail/wireguard/2020-March/005191.html
---
 pkgs/tools/networking/wireguard-tools/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index 4d2e9db33c5e..0a86d7dec8f9 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -13,13 +13,15 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "wireguard-tools";
-  version = "1.0.20200206";
+  version = "1.0.20200319";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz";
-    sha256 = "0ivc08lds5w39a6f2xdfih9wlk5g724hl3kpdvxvh5yff4l84qb7";
+    sha256 = "0g9vlngg9dnh7qqfhaycw35fq8ij5hfz6p1cykh4ncjgr93i7rbx";
   };
 
+  outputs = [ "out" "man" ];
+
   sourceRoot = "source/src";
 
   nativeBuildInputs = [ makeWrapper ];

From 16088585c986aeb495f88bb5bb621c7f943bc0eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCtke-Stetzkamp?= <christian@lkamp.de>
Date: Thu, 27 Feb 2020 12:47:58 +0100
Subject: [PATCH 3441/4636] aqbanking: 5.7.8 -> 6.0.2

also update download url
---
 pkgs/development/libraries/aqbanking/default.nix   | 14 ++++++--------
 .../libraries/aqbanking/libchipcard.nix            |  8 ++------
 pkgs/development/libraries/aqbanking/sources.nix   |  8 ++++----
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix
index 8be98f061a84..82d11cdc3a4a 100644
--- a/pkgs/development/libraries/aqbanking/default.nix
+++ b/pkgs/development/libraries/aqbanking/default.nix
@@ -8,16 +8,16 @@ in stdenv.mkDerivation rec {
   pname = "aqbanking";
   inherit version;
 
-  src = let
-    qstring = "package=03&release=${releaseId}&file=02";
-    mkURLs = map (base: "${base}/sites/download/download.php?${qstring}");
-  in fetchurl {
-    name = "${pname}-${version}.tar.gz";
-    urls = mkURLs [ "http://www.aquamaniac.de" "http://www2.aquamaniac.de" ];
+  src = fetchurl {
+    url = "https://www.aquamaniac.de/rdm/attachments/download/${releaseId}/${pname}-${version}.tar.gz";
     inherit sha256;
   };
 
+  # Set the include dir explicitly, this fixes a build error when building
+  # kmymoney because otherwise the includedir is overwritten by gwenhywfar's
+  # cmake file
   postPatch = ''
+    sed -i '/^set_and_check(AQBANKING_INCLUDE_DIRS "@aqbanking_headerdir@")/i set_and_check(includedir "@includedir@")' aqbanking-config.cmake.in
     sed -i -e '/^aqbanking_plugindir=/ {
       c aqbanking_plugindir="\''${libdir}/gwenhywfar/plugins"
     }' configure
@@ -27,8 +27,6 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig gettext ];
 
-  configureFlags = [ "--with-gwen-dir=${gwenhywfar}" ];
-
   meta = with stdenv.lib; {
     description = "An interface to banking tasks, file formats and country information";
     homepage = http://www2.aquamaniac.de/sites/download/packages.php?package=03&showall=1;
diff --git a/pkgs/development/libraries/aqbanking/libchipcard.nix b/pkgs/development/libraries/aqbanking/libchipcard.nix
index 32ec4dd06fd6..0e01480a4bdf 100644
--- a/pkgs/development/libraries/aqbanking/libchipcard.nix
+++ b/pkgs/development/libraries/aqbanking/libchipcard.nix
@@ -6,12 +6,8 @@ in stdenv.mkDerivation rec {
   pname = "libchipcard";
   inherit version;
 
-  src = let
-    qstring = "package=02&release=${releaseId}&file=01";
-    mkURLs = map (base: "${base}/sites/download/download.php?${qstring}");
-  in fetchurl {
-    name = "${pname}-${version}.tar.gz";
-    urls = mkURLs [ "http://www.aquamaniac.de" "http://www2.aquamaniac.de" ];
+  src = fetchurl {
+    url = "https://www.aquamaniac.de/rdm/attachments/download/${releaseId}/${pname}-${version}.tar.gz";
     inherit sha256;
   };
 
diff --git a/pkgs/development/libraries/aqbanking/sources.nix b/pkgs/development/libraries/aqbanking/sources.nix
index 9df21f2dedd3..b410e64d667d 100644
--- a/pkgs/development/libraries/aqbanking/sources.nix
+++ b/pkgs/development/libraries/aqbanking/sources.nix
@@ -4,8 +4,8 @@
   gwenhywfar.releaseId = "242";
   libchipcard.version = "5.0.4";
   libchipcard.sha256 = "0fj2h39ll4kiv28ch8qgzdbdbnzs8gl812qnm660bw89rynpjnnj";
-  libchipcard.releaseId = "200";
-  aqbanking.version = "5.7.8";
-  aqbanking.sha256 = "0s67mysskbiw1h1p0np4ph4351r7wq3nc873vylam7lsqi66xy0n";
-  aqbanking.releaseId = "217";
+  libchipcard.releaseId = "158";
+  aqbanking.version = "6.0.2";
+  aqbanking.sha256 = "0n41n3yki1wmax4i9wi485g8zqb43z1adywcixzfq9gbdjhz05hx";
+  aqbanking.releaseId = "243";
 }

From 8dddd8a07f3694cdc21abe884ca7ac52d2b01a17 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 19 Mar 2020 12:05:24 +0100
Subject: [PATCH 3442/4636] =?UTF-8?q?ocamlPackages.camlp5:=207.10=20?=
 =?UTF-8?q?=E2=86=92=207.11?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/science/logic/hol_light/default.nix | 7 ++++++-
 pkgs/development/tools/ocaml/camlp5/default.nix       | 6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index d799b52d115e..69ffb87e7670 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, runtimeShell, fetchFromGitHub, ocaml, num, camlp5 }:
+{ stdenv, runtimeShell, fetchFromGitHub, fetchpatch, ocaml, num, camlp5 }:
 
 let
   load_num =
@@ -30,6 +30,11 @@ stdenv.mkDerivation {
     sha256 = "0sxsk8z08ba0q5aixdyczcx5l29lb51ba4ip3d2fry7y604kjsx6";
   };
 
+  patches = [(fetchpatch {
+    url = https://salsa.debian.org/ocaml-team/hol-light/-/raw/master/debian/patches/0004-Fix-compilation-with-camlp5-7.11.patch;
+    sha256 = "180qmxbrk3vb1ix7j77hcs8vsar91rs11s5mm8ir5352rz7ylicr";
+  })];
+
   buildInputs = [ ocaml camlp5 ];
   propagatedBuildInputs = [ num ];
 
diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix
index c3fbb5863497..e0bd0e4ac676 100644
--- a/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/pkgs/development/tools/ocaml/camlp5/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation {
 
-  name = "camlp5-7.10";
+  name = "camlp5-7.11";
 
   src = fetchzip {
-    url = "https://github.com/camlp5/camlp5/archive/rel710.tar.gz";
-    sha256 = "1a1lgsc8350afdwmsznsys7m0c0cks4nw6irqz2f92g8g4vkk9b7";
+    url = "https://github.com/camlp5/camlp5/archive/rel711.tar.gz";
+    sha256 = "1s1f9i0r0czxlbnsaz4kvs2ahknmqxcm5ypl75g7scjcbl0an2x4";
   };
 
   buildInputs = [ ocaml ];

From 43ff2ab350b55f15a5227bb93431c151908938b4 Mon Sep 17 00:00:00 2001
From: Jason Miller <mailings-github@millerjason.com>
Date: Sun, 8 Mar 2020 04:29:00 -0400
Subject: [PATCH 3443/4636] vim_configurable: fix default gui for darwin

---
 pkgs/applications/editors/vim/configurable.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index bb3d571e6f86..3b37c805cdd7 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -14,7 +14,7 @@
 
 , features          ? "huge" # One of tiny, small, normal, big or huge
 , wrapPythonDrv     ? false
-, guiSupport        ? config.vim.gui or "gtk3"
+, guiSupport        ? config.vim.gui or (if stdenv.isDarwin then "gtk2" else "gtk3")
 , luaSupport        ? config.vim.lua or true
 , perlSupport       ? config.vim.perl or false      # Perl interpreter
 , pythonSupport     ? config.vim.python or true     # Python interpreter

From c7eafd37830f9d16d0d0bb100199d54cdacdd0e3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Mar 2020 01:06:12 +0000
Subject: [PATCH 3444/4636] python27Packages.pymupdf: 1.16.11 -> 1.16.12

---
 pkgs/development/python-modules/pymupdf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix
index 7cd504dec810..a3286b31461e 100644
--- a/pkgs/development/python-modules/pymupdf/default.nix
+++ b/pkgs/development/python-modules/pymupdf/default.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPythonPackage, fetchPypi, mupdf, swig }:
 buildPythonPackage rec {
   pname = "PyMuPDF";
-  version = "1.16.11";
+  version = "1.16.12";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "006m31qvvdwbpmxnhj1gs7rpd1jb214mf2hacqmisryx8dnb2jm7";
+    sha256 = "0mywnhn8ylm9xy23yfgnxiq4akk1rq3n7bl1m7pw6imsgbdhzrwg";
   };
 
   patchPhase = ''

From 3aade16ff3e6f5c6a82e0d138bf266fa945eddf5 Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Sun, 1 Mar 2020 14:43:04 +0100
Subject: [PATCH 3445/4636] perlPackages.CryptSSLeay: 0.72 -> 0.73_06

dependencies:
perlPackages.BytesRandomSecure: init at 0.29
perlPackages.CryptRandomSeed: init at 0.03
perlPackages.CryptRandomTESHA2: init at 0.01
---
 pkgs/top-level/perl-packages.nix | 54 +++++++++++++++++++++++++++++---
 1 file changed, 50 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1a4fd0da81ab..6d2e98255fbf 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1243,6 +1243,21 @@ let
     };
   };
 
+  BytesRandomSecure = buildPerlPackage {
+    pname = "Bytes-Random-Secure";
+    version = "0.29";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/D/DA/DAVIDO/Bytes-Random-Secure-0.29.tar.gz";
+      sha256 = "53bbd339e6a11efca07c619a615c7c188a68bb2be849a1cb7efc3dd4d9ae85ae";
+    };
+    propagatedBuildInputs = [ CryptRandomSeed MathRandomISAAC ];
+    meta = {
+      description = "Perl extension to generate cryptographically-secure random bytes";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.sgo ];
+    };
+  };
+
   CacheCache = buildPerlPackage {
     pname = "Cache-Cache";
     version = "1.08";
@@ -3605,6 +3620,22 @@ let
     };
   };
 
+  CryptRandomSeed = buildPerlPackage {
+    pname = "Crypt-Random-Seed";
+    version = "0.03";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/D/DA/DANAJ/Crypt-Random-Seed-0.03.tar.gz";
+      sha256 = "593da54b522c09cc26bbcc0e4e49c1c8e688a6fd33b0726af801d722a5c8d0f1";
+    };
+    propagatedBuildInputs = [ CryptRandomTESHA2 ];
+    meta = {
+      homepage = "https://github.com/danaj/Crypt-Random-Seed";
+      description = "Provide strong randomness for seeding";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.sgo ];
+    };
+  };
+
   CryptRandomSource = buildPerlModule {
     pname = "Crypt-Random-Source";
     version = "0.14";
@@ -3620,6 +3651,20 @@ let
     };
   };
 
+  CryptRandomTESHA2 = buildPerlPackage {
+    pname = "Crypt-Random-TESHA2";
+    version = "0.01";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/D/DA/DANAJ/Crypt-Random-TESHA2-0.01.tar.gz";
+      sha256 = "a0912b42c52be173da528d5527e40d967324bc04ac78d9fc2ddc91ff16fe9633";
+    };
+    meta = {
+      homepage = "https://github.com/danaj/Crypt-Random-TESHA2";
+      description = "Random numbers using timer/schedule entropy, aka userspace voodoo entropy";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   CryptRC4 = buildPerlPackage {
     pname = "Crypt-RC4";
     version = "2.02";
@@ -3826,14 +3871,15 @@ let
 
   CryptSSLeay = buildPerlPackage {
     pname = "Crypt-SSLeay";
-    version = "0.72";
+    version = "0.73_06";
     src = fetchurl {
-      url = mirror://cpan/authors/id/N/NA/NANIS/Crypt-SSLeay-0.72.tar.gz;
-      sha256 = "1s7zm6ph37kg8jzaxnhi4ff4snxl7mi5h14arxbri0kp6s0lzlzm";
+      url = "mirror://cpan/authors/id/N/NA/NANIS/Crypt-SSLeay-0.73_06.tar.gz";
+      sha256 = "0b159lw3ia5r87qsgff3qhdnz3l09xcz04rbk4ji7fbyr12wmv7q";
     };
+
     makeMakerFlags = "--libpath=${pkgs.openssl.out}/lib --incpath=${pkgs.openssl.dev}/include";
     buildInputs = [ PathClass ];
-    propagatedBuildInputs = [ LWPProtocolHttps ];
+    propagatedBuildInputs = [ LWPProtocolHttps BytesRandomSecure ];
   };
 
   CSSDOM = buildPerlPackage {

From 3e50e26e7d4c269bbbb33ce7f8b298b4b5477bca Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Thu, 20 Feb 2020 23:59:52 +0100
Subject: [PATCH 3446/4636] rt: fix build error

ZHF: #80379
https://hydra.nixos.org/build/113061284

Added requiredPerlModules as suggested for similar problem as described for
similar problem here:
https://github.com/NixOS/nixpkgs/issues/72783#issuecomment-549817011
---
 pkgs/servers/rt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix
index b4400215dd01..94fd1661c3f5 100644
--- a/pkgs/servers/rt/default.nix
+++ b/pkgs/servers/rt/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     perl
     (buildEnv {
       name = "rt-perl-deps";
-      paths = (with perlPackages; [
+      paths = with perlPackages; (requiredPerlModules [
         ApacheSession BusinessHours CGIEmulatePSGI CGIPSGI
         CSSMinifierXS CSSSquish ConvertColor CryptEksblowfish
         CryptSSLeay DBDSQLite DBDmysql DBIxSearchBuilder DataGUID

From a437fe25652dea5b86de63891ce9c779c6e8bb9d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 19 Mar 2020 04:20:00 -0500
Subject: [PATCH 3447/4636] terraform: 0.12.23 -> 0.12.24

Changelog: https://github.com/hashicorp/terraform/releases/tag/v0.12.24
---
 pkgs/applications/networking/cluster/terraform/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 6862ed23e742..b9c82f97c4fd 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -112,8 +112,8 @@ in rec {
   terraform_0_11-full = terraform_0_11.full;
 
   terraform_0_12 = pluggable (generic {
-    version = "0.12.23";
-    sha256 = "1lr2gfk5dmj6rhv5rvzn3fggb34za73ryjy0vdzx4kf3qj12r0wz";
+    version = "0.12.24";
+    sha256 = "1rjihp6qcaizp2nnv4z20kpmjnqcw95pq5rnhq381a3pdzr0cd0z";
     patches = [ ./provider-path.patch ];
     passthru = { inherit plugins; };
   });

From d5f2d4a593933422ca6f78b6d0ab621d0dabae54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc>
Date: Fri, 20 Mar 2020 05:39:40 +0100
Subject: [PATCH 3448/4636] jetbrains: update

---
 .../editors/jetbrains/default.nix             | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 466d52236d0d..8d5e8540aa14 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -250,12 +250,12 @@ in
 
   clion = buildClion rec {
     name = "clion-${version}";
-    version = "2019.3.4"; /* updated by script */
+    version = "2019.3.5"; /* updated by script */
     description  = "C/C++ IDE. New. Intelligent. Cross-platform";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
-      sha256 = "0whd379ck79vhz14yh5g6vpl4cvgw4z9ag4mwgizmd8kbcfnvdxd"; /* updated by script */
+      sha256 = "0qmhp0sqcknwgsirnbi6461lzr7mxgrgjsd0q5cxnhscbbczl7pk"; /* updated by script */
     };
     wmClass = "jetbrains-clion";
     update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@@ -263,12 +263,12 @@ in
 
   datagrip = buildDataGrip rec {
     name = "datagrip-${version}";
-    version = "2019.3.3"; /* updated by script */
+    version = "2019.3.4"; /* updated by script */
     description = "Your Swiss Army Knife for Databases and SQL";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
-      sha256 = "0zbyiw60gqcqi5bbazmsbs4qzmmxx1q034hs36k1dryf2y02jyih"; /* updated by script */
+      sha256 = "1ygbi212sga6mdkassi51idh7ppchr77ifq3vi5bbm4ibgnsf2b4"; /* updated by script */
     };
     wmClass = "jetbrains-datagrip";
     update-channel = "DataGrip RELEASE";
@@ -289,12 +289,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2019.3.3"; /* updated by script */
+    version = "2019.3.4"; /* updated by script */
     description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
-      sha256 = "15rs866fp4lrsqdk13fnbg7ncdfrhky1m5sl90p32v45j90hagrg"; /* updated by script */
+      sha256 = "1kspj5a9z6smcgrfxdylvc0y53s7y6jv7ckfhmbkvplmrj0h0wd7"; /* updated by script */
     };
     wmClass = "jetbrains-idea-ce";
     update-channel = "IntelliJ IDEA RELEASE";
@@ -302,12 +302,12 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2019.3.3"; /* updated by script */
+    version = "2019.3.4"; /* updated by script */
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz";
-      sha256 = "034aq5lf64apc152xr0889hg2xak2if9n5xl6zvd3f9q9srhivxn"; /* updated by script */
+      sha256 = "1i34kcd2j1xwx3l2sqc6jh3b69wqbxwwlq5yb7kf2ms9x4144bn0"; /* updated by script */
     };
     wmClass = "jetbrains-idea";
     update-channel = "IntelliJ IDEA RELEASE";
@@ -315,12 +315,12 @@ in
 
   phpstorm = buildPhpStorm rec {
     name = "phpstorm-${version}";
-    version = "2019.3.3"; /* updated by script */
+    version = "2019.3.4"; /* updated by script */
     description = "Professional IDE for Web and PHP developers";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
-      sha256 = "03ag1a40l1k8sqlywcs7kjn02c65xm3l9riyimg4hx23yi17w18h"; /* updated by script */
+      sha256 = "1bxi2i6vxpw8x4mvb4d5plqy4r938xjf8nkimfg0sspramcc4r5m"; /* updated by script */
     };
     wmClass = "jetbrains-phpstorm";
     update-channel = "PhpStorm RELEASE";
@@ -328,12 +328,12 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "2019.3.3"; /* updated by script */
+    version = "2019.3.4"; /* updated by script */
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "0ly3cdzm4hp4qchdadjmbd39jnqpmpnlk6vgp8s4amsv35b6hydd"; /* updated by script */
+      sha256 = "0k917si1d28fnmjyvi0fs7rkdyvi2vr0d138436lh300a6y0z6wr"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm-ce";
     update-channel = "PyCharm RELEASE";
@@ -341,12 +341,12 @@ in
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "2019.3.3"; /* updated by script */
+    version = "2019.3.4"; /* updated by script */
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1305zvb5n2zqnny4l50qfv7jd1sj4ffhrig4rpfiqg65ncfpypwb"; /* updated by script */
+      sha256 = "1hdwzkh6qzad2pqskqw9m8glj15x9d2g4csl0dxk6an82ps52naz"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm";
     update-channel = "PyCharm RELEASE";
@@ -380,12 +380,12 @@ in
 
   webstorm = buildWebStorm rec {
     name = "webstorm-${version}";
-    version = "2019.3.3"; /* updated by script */
+    version = "2019.3.4"; /* updated by script */
     description = "Professional IDE for Web and JavaScript development";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
-      sha256 = "1b7hwqpk96g4il5rbxb8cpqsizgc9k5kb8vkvkcc9xh7qqz02i85"; /* updated by script */
+      sha256 = "0q3595r4m22wf5r5zyncr1zv7yap5przbzjnyf75y51mqwl1g61i"; /* updated by script */
     };
     wmClass = "jetbrains-webstorm";
     update-channel = "WebStorm RELEASE";

From 080d77443e45cc00722dc9a9894c7389dd89c2d4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Mar 2020 04:06:23 +0000
Subject: [PATCH 3449/4636] python37Packages.nest-asyncio: 1.2.3 -> 1.3.0

---
 pkgs/development/python-modules/nest-asyncio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix
index 12412860f880..dbbbc04d1413 100644
--- a/pkgs/development/python-modules/nest-asyncio/default.nix
+++ b/pkgs/development/python-modules/nest-asyncio/default.nix
@@ -5,16 +5,16 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.2.3";
+  version = "1.3.0";
   pname = "nest_asyncio";
   disabled = !(pythonAtLeast "3.5");
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0fznrg32rk6fmvpfdxwwhadh526gdjivmdifg2hiciil2gr8n1s3";
+    sha256 = "1cbd885n3sf4qg1dv3mk1ggr5ssk48yzrzssznr92dh53g04ly7g";
   };
 
-  # tests not packaged with source dist as of 1.2.3/1.2.3, and
+  # tests not packaged with source dist as of 1.3.0/1.3.0, and
   # can't check tests out of GitHub easily without specific commit IDs (no tagged releases)
   doCheck = false;
   pythonImportsCheck = [ "nest_asyncio" ];

From 569566d98b191d4463c18b343b8bcf79c35d930f Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Thu, 19 Mar 2020 21:11:45 -0400
Subject: [PATCH 3450/4636] libgpiod: add support for Python bindings

---
 pkgs/development/libraries/libgpiod/default.nix | 10 ++++++----
 pkgs/top-level/python-packages.nix              |  5 +++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix
index 7bb2785dbcf2..76887347a182 100644
--- a/pkgs/development/libraries/libgpiod/default.nix
+++ b/pkgs/development/libraries/libgpiod/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, autoreconfHook, autoconf-archive, pkgconfig, kmod, enable-tools ? true }:
+{ lib, stdenv, fetchurl, autoreconfHook, autoconf-archive, pkgconfig, kmod
+, enable-tools ? true
+, enablePython ? false, python3, ncurses }:
 
 stdenv.mkDerivation rec {
   pname = "libgpiod";
@@ -9,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1r337ici2nvi9v2h33nf3b7nisirc4s8p31cpv1cg8jbzn3wi15g";
   };
 
-  buildInputs = [ kmod ];
+  buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ];
   nativeBuildInputs = [
     autoconf-archive
     pkgconfig
@@ -20,9 +22,9 @@ stdenv.mkDerivation rec {
     "--enable-tools=${if enable-tools then "yes" else "no"}"
     "--enable-bindings-cxx"
     "--prefix=${placeholder "out"}"
-  ];
+  ] ++ lib.optional enablePython "--enable-bindings-python";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "C library and tools for interacting with the linux GPIO character device";
     longDescription = ''
       Since linux 4.8 the GPIO sysfs interface is deprecated. User space should use
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c812c7cd9f8b..22115c938e13 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4151,6 +4151,11 @@ in {
     inherit (pkgs.linuxPackages) nvidia_x11;
   };
 
+  libgpiod = disabledIf (!isPy3k) (toPythonModule (pkgs.libgpiod.override {
+    enablePython = true;
+    python3 = python;
+  }));
+
   libkeepass = callPackage ../development/python-modules/libkeepass { };
 
   librepo = pipe pkgs.librepo [

From fbb273c5fe8634a1ffe246f41eafe2ae492f6cc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Thu, 26 Dec 2019 21:53:05 +0100
Subject: [PATCH 3451/4636] fenics: 2017.1.0 -> 2019.1.0

Fixes: NixOS/nixpkgs#75886
---
 .../libraries/science/math/fenics/default.nix | 246 ++++++++++++------
 .../science/math/fenics/unicode.patch         |  67 -----
 pkgs/top-level/all-packages.nix               |   7 -
 pkgs/top-level/python-packages.nix            |   6 +
 4 files changed, 170 insertions(+), 156 deletions(-)
 delete mode 100644 pkgs/development/libraries/science/math/fenics/unicode.patch

diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/pkgs/development/libraries/science/math/fenics/default.nix
index 2bb284477e6d..e70462cd9efc 100644
--- a/pkgs/development/libraries/science/math/fenics/default.nix
+++ b/pkgs/development/libraries/science/math/fenics/default.nix
@@ -1,43 +1,42 @@
 { stdenv
 , fetchurl
+, fetchpatch
 , boost
 , cmake
 , doxygen
 , eigen
+, mpi4py
 , numpy
-, pkgconfig
+, pkg-config
+, pybind11
 , pytest
 , pythonPackages
 , six
 , sympy
-, gtest ? null
-, hdf5 ? null
-, mpi ? null
-, ply ? null
-, python ? null
-, sphinx ? null
-, suitesparse ? null
-, swig ? null
-, vtk ? null
-, zlib ? null
-, docs ? false
-, pythonBindings ? false
-, doCheck ? true }:
-
-assert pythonBindings -> python != null && ply != null && swig != null;
-
+, gtest
+, hdf5
+, mpi
+, ply
+, python
+, scotch
+, setuptools
+, sphinx
+, suitesparse
+, swig
+, zlib
+}:
 let
-  version = "2017.1.0";
+  version = "2019.1.0";
 
   dijitso = pythonPackages.buildPythonPackage {
     pname = "dijitso";
     inherit version;
     src = fetchurl {
       url = "https://bitbucket.org/fenics-project/dijitso/downloads/dijitso-${version}.tar.gz";
-      sha256 = "0mw6mynjmg6yl3l2k33yra2x84s4r6mh44ylhk9znjfk74jra8zg";
+      sha256 = "1ncgbr0bn5cvv16f13g722a0ipw6p9y6p4iasxjziwsp8kn5x97a";
     };
-    buildInputs = [ numpy six ];
-    nativeBuildInputs = [ pytest ];
+    propagatedBuildInputs = [ numpy six ];
+    checkInputs = [ pytest ];
     preCheck = ''
       export HOME=$PWD
     '';
@@ -59,11 +58,22 @@ let
     inherit version;
     src = fetchurl {
       url = "https://bitbucket.org/fenics-project/fiat/downloads/fiat-${version}.tar.gz";
-      sha256 = "156ybz70n4n7p88q4pfkvbmg1xr2ll80inzr423mki0nml0q8a6l";
+      sha256 = "1sbi0fbr7w9g9ajr565g3njxrc3qydqjy3334vmz5xg0rd3106il";
     };
-    buildInputs = [ numpy pytest six sympy ];
+    propagatedBuildInputs = [ numpy six sympy ];
+    checkInputs = [ pytest ];
+
+    preCheck = ''
+      # Workaround pytest 4.6.3 issue.
+      # See: https://bitbucket.org/fenics-project/fiat/pull-requests/59
+      rm test/unit/test_quadrature.py
+      rm test/unit/test_reference_element.py
+      rm test/unit/test_fiat.py
+    '';
     checkPhase = ''
+      runHook preCheck
       py.test test/unit/
+      runHook postCheck
     '';
     meta = {
       description = "Automatic generation of finite element basis functions";
@@ -78,11 +88,14 @@ let
     inherit version;
     src = fetchurl {
       url = "https://bitbucket.org/fenics-project/ufl/downloads/ufl-${version}.tar.gz";
-      sha256 = "13ysimmwad429fjjs07j1fw1gq196p021j7mv66hwrljyh8gm1xg";
+      sha256 = "04daxwg4y9c51sdgvwgmlc82nn0fjw7i2vzs15ckdc7dlazmcfi1";
     };
-    buildInputs = [ numpy pytest six ];
+    propagatedBuildInputs = [ numpy six ];
+    checkInputs = [ pytest ];
     checkPhase = ''
+      runHook preCheck
       py.test test/
+      runHook postCheck
     '';
     meta = {
       description = "A domain-specific language for finite element variational forms";
@@ -97,12 +110,29 @@ let
     inherit version;
     src = fetchurl {
       url = "https://bitbucket.org/fenics-project/ffc/downloads/ffc-${version}.tar.gz";
-      sha256 = "1cw7zsrjms11xrfg7x9wjd90x3w4v5s1wdwa18xqlycqz7cc8wr0";
+      sha256 = "1zdg6pziss4va74pd7jjl8sc3ya2gmhpypccmyd8p7c66ji23y2g";
     };
-    buildInputs = [ dijitso fiat numpy pytest six sympy ufl ];
-    checkPhase = ''
+    nativeBuildInputs = [
+      pybind11
+    ];
+    propagatedBuildInputs = [
+      dijitso
+      fiat
+      numpy
+      six
+      sympy
+      ufl
+      setuptools
+    ];
+    checkInputs = [ pytest ];
+    preCheck = ''
       export HOME=$PWD
+      rm test/unit/ufc/finite_element/test_evaluate.py
+    '';
+    checkPhase = ''
+      runHook preCheck
       py.test test/unit/
+      runHook postCheck
     '';
     meta = {
       description = "A compiler for finite element variational forms";
@@ -111,66 +141,118 @@ let
       license = stdenv.lib.licenses.lgpl3;
     };
   };
-
-  instant = pythonPackages.buildPythonPackage {
-    pname = "instant";
+  dolfin = stdenv.mkDerivation {
+    pname = "dolfin";
     inherit version;
     src = fetchurl {
-      url = "https://bitbucket.org/fenics-project/instant/downloads/instant-${version}.tar.gz";
-      sha256 = "1rsyh6n04w0na2zirfdcdjip8k8ikb8fc2x94fq8ylc3lpcnpx9q";
+      url = "https://bitbucket.org/fenics-project/dolfin/downloads/dolfin-${version}.tar.gz";
+      sha256 = "0kbyi4x5f6j4zpasch0swh0ch81w2h92rqm1nfp3ydi4a93vky33";
     };
-    buildInputs = [ numpy six ];
+    patches = [
+      (fetchpatch {
+        name = "fix-double-prefix.patch";
+        url = "https://bitbucket.org/josef_kemetmueller/dolfin/commits/328e94acd426ebaf2243c072b806be3379fd4340/raw";
+        sha256 = "1zj7k3y7vsx0hz3gwwlxhq6gdqamqpcw90d4ishwx5ps5ckcsb9r";
+      })
+    ];
+    propagatedBuildInputs = [
+      dijitso
+      fiat
+      numpy
+      six
+      ufl
+    ];
+    nativeBuildInputs = [
+      cmake
+      doxygen
+      pkg-config
+    ];
+    buildInputs = [
+      boost
+      dijitso
+      eigen
+      ffc
+      fiat
+      hdf5
+      mpi
+      numpy
+      (numpy.blas)
+      ply
+      python
+      scotch
+      six
+      sphinx
+      (suitesparse.override { openblas = numpy.blas; })
+      swig
+      sympy
+      ufl
+      zlib
+    ];
+    cmakeFlags = [
+      "-DDOLFIN_CXX_FLAGS=-std=c++11"
+      "-DDOLFIN_AUTO_DETECT_MPI=ON"
+      "-DDOLFIN_ENABLE_CHOLMOD=ON"
+      "-DDOLFIN_ENABLE_DOCS=ON"
+      "-DDOLFIN_ENABLE_HDF5=ON"
+      "-DDOLFIN_ENABLE_MPI=ON"
+      "-DDOLFIN_ENABLE_SCOTCH=ON"
+      "-DDOLFIN_ENABLE_UMFPACK=ON"
+      "-DDOLFIN_ENABLE_ZLIB=ON"
+      "-DDOLFIN_SKIP_BUILD_TESTS=ON" # Otherwise SCOTCH is not found
+      # TODO: Enable the following features
+      "-DDOLFIN_ENABLE_PARMETIS=OFF"
+      "-DDOLFIN_ENABLE_PETSC=OFF"
+      "-DDOLFIN_ENABLE_SLEPC=OFF"
+      "-DDOLFIN_ENABLE_TRILINOS=OFF"
+    ];
+    installCheckPhase = ''
+      source $out/share/dolfin/dolfin.conf
+      make runtests
+    '';
     meta = {
-      description = "Instant inlining of C and C++ code in Python";
+      description = "The FEniCS Problem Solving Environment in Python and C++";
+      homepage = https://fenicsproject.org/;
+      license = stdenv.lib.licenses.lgpl3;
+    };
+  };
+  python-dolfin = pythonPackages.buildPythonPackage rec {
+    pname = "dolfin";
+    inherit version;
+    disabled = pythonPackages.isPy27;
+    src = dolfin.src;
+    sourceRoot = "${pname}-${version}/python";
+    nativeBuildInputs = [
+      pybind11
+      cmake
+    ];
+    dontUseCmakeConfigure = true;
+    preConfigure = ''
+      export CMAKE_PREFIX_PATH=${pybind11}/share/cmake/pybind11:$CMAKE_PREFIX_PATH
+      substituteInPlace setup.py --replace "pybind11==2.2.4" "pybind11"
+      substituteInPlace dolfin/jit/jit.py \
+        --replace 'pkgconfig.exists("dolfin")' 'pkgconfig.exists("${dolfin}/lib/pkgconfig/dolfin.pc")' \
+        --replace 'pkgconfig.parse("dolfin")' 'pkgconfig.parse("${dolfin}/lib/pkgconfig/dolfin.pc")'
+    '';
+    buildInputs = [
+      dolfin
+      boost
+    ];
+
+    propagatedBuildInputs = [
+      dijitso
+      ffc
+      mpi4py
+      numpy
+      ufl
+      pythonPackages.pkgconfig
+      pythonPackages.pybind11
+    ];
+    doCheck = false; # Tries to orte_ess_init and call ssh to localhost
+    meta = {
+      description = "Python bindings for the DOLFIN FEM compiler";
       homepage = https://fenicsproject.org/;
       platforms = stdenv.lib.platforms.all;
       license = stdenv.lib.licenses.lgpl3;
     };
   };
-
-in
-stdenv.mkDerivation {
-  pname = "dolfin";
-  inherit version;
-  src = fetchurl {
-    url = "https://bitbucket.org/fenics-project/dolfin/downloads/dolfin-${version}.tar.gz";
-    sha256 = "14hfb5q6rz79zmy742s2fiqkb9j2cgh5bsg99v76apcr84nklyds";
-  };
-  propagatedBuildInputs = [ dijitso fiat numpy six ufl ];
-  buildInputs = [
-    boost cmake dijitso doxygen eigen ffc fiat gtest hdf5 instant mpi
-    numpy pkgconfig six sphinx suitesparse sympy ufl vtk zlib
-    ] ++ stdenv.lib.optionals pythonBindings [ ply python numpy swig ];
-  patches = [ ./unicode.patch ];
-  cmakeFlags = [ "-DDOLFIN_CXX_FLAGS=-std=c++11"
-    "-DDOLFIN_AUTO_DETECT_MPI=OFF"
-    ("-DDOLFIN_ENABLE_CHOLMOD=" + (if suitesparse != null then "ON" else "OFF"))
-    ("-DDOLFIN_ENABLE_DOCS=" + (if docs then "ON" else "OFF"))
-    ("-DDOLFIN_ENABLE_GTEST=" + (if gtest != null then "ON" else "OFF"))
-    ("-DDOLFIN_ENABLE_HDF5=" + (if hdf5 != null then "ON" else "OFF"))
-    ("-DDOLFIN_ENABLE_MPI=" + (if mpi != null then "ON" else "OFF"))
-    "-DDOLFIN_ENABLE_PARMETIS=OFF"
-    "-DDOLFIN_ENABLE_PETSC4PY=OFF"
-    "-DDOLFIN_ENABLE_PETSC=OFF"
-    ("-DDOLFIN_ENABLE_PYTHON=" + (if pythonBindings then "ON" else "OFF"))
-    "-DDOLFIN_ENABLE_SCOTCH=OFF"
-    "-DDOLFIN_ENABLE_SLEPC4PY=OFF"
-    "-DDOLFIN_ENABLE_SLEPC=OFF"
-    ("-DDOLFIN_ENABLE_SPHINX=" + (if sphinx != null then "ON" else "OFF"))
-    ("-DDOLFIN_ENABLE_TESTING=" + (if doCheck then "ON" else "OFF"))
-    "-DDOLFIN_ENABLE_TRILINOS=OFF"
-    ("-DDOLFIN_ENABLE_UMFPACK=" + (if suitesparse != null then "ON" else "OFF"))
-    ("-DDOLFIN_ENABLE_VTK=" + (if vtk != null then "ON" else "OFF"))
-    ("-DDOLFIN_ENABLE_ZLIB=" + (if zlib != null then "ON" else "OFF"))
-  ];
-  checkPhase = ''
-    make runtests
-  '';
-  postInstall = "source $out/share/dolfin/dolfin.conf";
-  meta = {
-    description = "The FEniCS Problem Solving Environment in Python and C++";
-    homepage = https://fenicsproject.org/;
-    platforms = stdenv.lib.platforms.darwin;
-    license = stdenv.lib.licenses.lgpl3;
-  };
-}
+in python-dolfin
diff --git a/pkgs/development/libraries/science/math/fenics/unicode.patch b/pkgs/development/libraries/science/math/fenics/unicode.patch
deleted file mode 100644
index 2ef2709263ab..000000000000
--- a/pkgs/development/libraries/science/math/fenics/unicode.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 0cc9e68de1181d950d4185bf3a87b69a87e4358f Mon Sep 17 00:00:00 2001
-From: "James D. Trotter" <james@simula.no>
-Date: Mon, 14 Aug 2017 16:43:53 +0200
-Subject: [PATCH] Use a UTF-8 encoding to avoid errors with decoding non-ascii
- characters
-
----
- cmake/scripts/generate-swig-interface.py |  6 +++---
- utils/pylit/pylit.py                     | 10 +++++++---
- 2 files changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/cmake/scripts/generate-swig-interface.py b/cmake/scripts/generate-swig-interface.py
-index 843a49229..7b85453d0 100644
---- a/cmake/scripts/generate-swig-interface.py
-+++ b/cmake/scripts/generate-swig-interface.py
-@@ -212,10 +212,10 @@ def extract_swig_modules_dependencies(module_to_submodules, submodule_info):
-                     continue
- 
-                 # Read code
--                with open(header_file) as f:
--                    code = f.read()
--
-                 try:
-+                    with open(header_file, encoding='utf-8') as f:
-+                        code = f.read()
-+
-                     # Extract type info
-                     used_types, declared_types = parse_and_extract_type_info(code)
-                 except Exception as e:
-diff --git a/utils/pylit/pylit.py b/utils/pylit/pylit.py
-index bcd8ec5e0..8c2964fbd 100755
---- a/utils/pylit/pylit.py
-+++ b/utils/pylit/pylit.py
-@@ -1496,7 +1496,7 @@ def open_streams(infile = '-', outfile = '-', overwrite='update', **keyw):
-     if infile == '-':
-         in_stream = sys.stdin
-     else:
--        in_stream = open(infile, 'r')
-+        in_stream = open(infile, 'r', encoding='utf-8')
- 
-     if outfile == '-':
-         out_stream = sys.stdout
-@@ -1505,7 +1505,7 @@ def open_streams(infile = '-', outfile = '-', overwrite='update', **keyw):
-     elif overwrite == 'update' and is_newer(outfile, infile):
-         raise IOError((1, "Output file is newer than input file!", outfile))
-     else:
--        out_stream = open(outfile, 'w')
-+        out_stream = open(outfile, 'w', encoding='utf-8')
-     return (in_stream, out_stream)
- 
- # is_newer
-@@ -1731,7 +1731,11 @@ def main(args=sys.argv[1:], **defaults):
- 
- # Convert and write to out_stream::
- 
--    out_stream.write(str(converter))
-+    try:
-+        out_stream.write(str(converter))
-+    except Exception as e:
-+        print("Failed to write extract to", out_stream.name)
-+        raise
- 
-     if out_stream is not sys.stdout:
-         print("extract written to", out_stream.name)
--- 
-2.14.0
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 14a10cabb274..6fba7e4732e8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24320,13 +24320,6 @@ in
 
   rankwidth = callPackage ../development/libraries/science/math/rankwidth { };
 
-  fenics = callPackage ../development/libraries/science/math/fenics {
-    inherit (python3Packages) numpy ply pytest python six sympy;
-    pythonPackages = python3Packages;
-    pythonBindings = true;
-    docs = true;
-  };
-
   lcalc = callPackage ../development/libraries/science/math/lcalc { };
 
   lrcalc = callPackage ../applications/science/math/lrcalc { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 22115c938e13..6e78084edaa2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2704,6 +2704,12 @@ in {
 
   ffmpeg-python = callPackage ../development/python-modules/ffmpeg-python { };
 
+  fenics = callPackage ../development/libraries/science/math/fenics {
+    inherit (pkgs) pkg-config;
+    mpi = pkgs.openmpi;
+    pytest = self.pytest_4;
+  };
+
   filetype = callPackage ../development/python-modules/filetype { };
 
   flammkuchen = callPackage ../development/python-modules/flammkuchen { };

From bffc7492104bb744ae059602848db1e9d708ce82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Wed, 11 Mar 2020 22:22:39 +0100
Subject: [PATCH 3452/4636] nixosTests.fenics: Add basic test

---
 nixos/tests/fenics.nix | 50 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 nixos/tests/fenics.nix

diff --git a/nixos/tests/fenics.nix b/nixos/tests/fenics.nix
new file mode 100644
index 000000000000..7252d19e4e65
--- /dev/null
+++ b/nixos/tests/fenics.nix
@@ -0,0 +1,50 @@
+import ./make-test-python.nix ({ pkgs, ... }:
+
+let
+  fenicsScript = pkgs.writeScript "poisson.py" ''
+    #!/usr/bin/env python
+    from dolfin import *
+
+    mesh = UnitSquareMesh(4, 4)
+    V = FunctionSpace(mesh, "Lagrange", 1)
+
+    def boundary(x):
+        return x[0] < DOLFIN_EPS or x[0] > 1.0 - DOLFIN_EPS
+
+    u0 = Constant(0.0)
+    bc = DirichletBC(V, u0, boundary)
+
+    u = TrialFunction(V)
+    v = TestFunction(V)
+    f = Expression("10*exp(-(pow(x[0] - 0.5, 2) + pow(x[1] - 0.5, 2)) / 0.02)", degree=2)
+    g = Expression("sin(5*x[0])", degree=2)
+    a = inner(grad(u), grad(v))*dx
+    L = f*v*dx + g*v*ds
+
+    u = Function(V)
+    solve(a == L, u, bc)
+    print(u)
+  '';
+in
+{
+  name = "fenics";
+  meta = {
+    maintainers = with pkgs.stdenv.lib.maintainers; [ knedlsepp ];
+  };
+
+  nodes = {
+    fenicsnode = { pkgs, ... }: {
+      environment.systemPackages = with pkgs; [
+        gcc
+        (python3.withPackages (ps: with ps; [ fenics ]))
+      ];
+      virtualisation.memorySize = 512;
+    };
+  };
+  testScript =
+    { nodes, ... }:
+    ''
+      start_all()
+      node1.succeed("${fenicsScript}")
+    '';
+})

From f56a759f139437ca6c0fae316e624e3d8e5d4085 Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Tue, 28 Jan 2020 17:43:15 -0500
Subject: [PATCH 3453/4636] pythonPackages.pproxy: init at 2.3.2

Tunnels among remote servers using regex rules.
Requirement for pythonPackages.qiskit-ibmq-provider.
---
 .../python-modules/pproxy/default.nix         | 45 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/pproxy/default.nix

diff --git a/pkgs/development/python-modules/pproxy/default.nix b/pkgs/development/python-modules/pproxy/default.nix
new file mode 100644
index 000000000000..9f97d7df1356
--- /dev/null
+++ b/pkgs/development/python-modules/pproxy/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, isPy27
+, buildPythonPackage
+, fetchFromGitHub
+, pycryptodome
+, uvloop
+}:
+
+buildPythonPackage rec {
+  pname = "pproxy";
+  version = "2.3.2";
+
+  disabled = isPy27;
+
+  # doesn't use tagged releases. Tests not in PyPi versioned releases
+  src = fetchFromGitHub {
+    owner = "qwj";
+    repo = "python-proxy";
+    rev = "818ab9cc10565789fe429a7be50ddefb9c583781";
+    sha256 = "0g3cyi5lzakhs5p3fpwywbl8jpapnr8890zw9w45dqg8k0svc1fi";
+  };
+
+  propagatedBuildInputs = [
+    pycryptodome
+    uvloop
+  ];
+
+  pythonImportsCheck = [ "pproxy" ];
+  disabledTests = [ "api_server" "api_client" ];  # try to connect to outside Internet, so disabled
+  # test suite doesn't use test runner. so need to run ``python ./tests/*``
+  checkPhase = ''
+    shopt -s extglob
+    for f in ./tests/!(${builtins.concatStringsSep "|" disabledTests}).py ; do
+      echo "***Testing $f***"
+      eval "python $f"
+    done
+  '';
+
+  meta = with lib; {
+    description = "Proxy server that can tunnel among remote servers by regex rules";
+    homepage = "https://github.com/qwj/python-proxy";
+    license = licenses.mit;
+    maintainers = with maintainers; [ drewrisinger ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6e78084edaa2..f23f961e241f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4914,6 +4914,8 @@ in {
 
   ppft = callPackage ../development/python-modules/ppft { };
 
+  pproxy = callPackage ../development/python-modules/pproxy { };
+
   praw = if isPy3k then callPackage ../development/python-modules/praw { }
     else callPackage ../development/python-modules/praw/6.3.nix { };
 

From 0cc1efe21950d2d592e1175593bcb08dd08eaf69 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Mar 2020 06:07:15 +0000
Subject: [PATCH 3454/4636] python27Packages.zc_buildout_nix: 2.13.2 -> 2.13.3

---
 pkgs/development/python-modules/buildout-nix/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix
index c33006377df0..cf8b13823015 100644
--- a/pkgs/development/python-modules/buildout-nix/default.nix
+++ b/pkgs/development/python-modules/buildout-nix/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "zc.buildout";
-  version = "2.13.2";
+  version = "2.13.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5dd4de86dda684c46ef8ee9cc84e335ca7f6275d4363a684de82225270d1e328";
+    sha256 = "1dyc5g3yv7wm3hf3fcsh6y1wivzjj1bspafr5qqb653z9a31lsfn";
   };
 
   patches = [ ./nix.patch ];
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   postInstall = "mv $out/bin/buildout{,-nix}";
 
   meta = {
-    homepage = http://www.buildout.org;
+    homepage = "http://www.buildout.org";
     description = "A software build and configuration system";
     license = stdenv.lib.licenses.zpl21;
     maintainers = [ stdenv.lib.maintainers.goibhniu ];

From 7bf2e4874801d8c6ab3f29cc6028dfbcf3db744b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Mar 2020 06:57:00 +0000
Subject: [PATCH 3455/4636] python27Packages.xstatic-jquery: 3.3.1.1 -> 3.4.1.0

---
 pkgs/development/python-modules/xstatic-jquery/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/xstatic-jquery/default.nix b/pkgs/development/python-modules/xstatic-jquery/default.nix
index 8e3f084ca7f0..a1a5e2b4dadc 100644
--- a/pkgs/development/python-modules/xstatic-jquery/default.nix
+++ b/pkgs/development/python-modules/xstatic-jquery/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "XStatic-jQuery";
-  version = "3.3.1.1";
+  version = "3.4.1.0";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "0xlgs4rlabzfcp8p2zspwpsljycb0djyrk7qy4qh76i7zkfhwn8j";
+    sha256 = "0y2rhbasr7vdjbgi6x67cx97hwdnmv6m5difqqq59yb5n9zark1z";
   };
 
   # no tests implemented

From abd30ff7768eb1c173e650dea0a5c3703e570728 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Mar 2020 09:52:01 +0100
Subject: [PATCH 3456/4636] django: update version 2.2.10 to 2.2.11

---
 pkgs/development/python-modules/django/2_2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/2_2.nix b/pkgs/development/python-modules/django/2_2.nix
index 3a591e7009bd..63a0f33d8f93 100644
--- a/pkgs/development/python-modules/django/2_2.nix
+++ b/pkgs/development/python-modules/django/2_2.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "Django";
-  version = "2.2.10";
+  version = "2.2.11";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "16h7lw9vnmwarl4pjwc7xnkwmcjq1c79prvfwv8fzixiw65ic9hj";
+    sha256 = "0l0gndky4nwc1jk68b31m583a9g0fhmll903p0xislyyddz3iqk5";
   };
 
   patches = stdenv.lib.optional withGdal

From 84adca1568e8447bc46072f80510f6bb69a192d4 Mon Sep 17 00:00:00 2001
From: Arijit Basu <sayanarijit@gmail.com>
Date: Fri, 20 Mar 2020 15:30:08 +0530
Subject: [PATCH 3457/4636] poetry: 1.0.3 -> 1.0.5

---
 pkgs/development/python-modules/poetry/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix
index 2828cb6b3f97..f007ff3df1d8 100644
--- a/pkgs/development/python-modules/poetry/default.nix
+++ b/pkgs/development/python-modules/poetry/default.nix
@@ -31,12 +31,12 @@ let
 
 in buildPythonPackage rec {
   pname = "poetry";
-  version = "1.0.3";
+  version = "1.0.5";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0fx1ilgkrsqjjnpgv5zljsp0wpcsywdqvvi8im9z396qq6qpk830";
+    sha256 = "0y528095njf28isbcp5iwbf12j67xhxnrkac93pws0zy133v7kc1";
   };
 
   postPatch = ''

From 091bd1e65ad60eabff2cae64d73e920944f62169 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@enlambda.com>
Date: Fri, 20 Mar 2020 11:53:34 +0100
Subject: [PATCH 3458/4636] Update pkgs/tools/security/hashdeep/default.nix

---
 pkgs/tools/security/hashdeep/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/hashdeep/default.nix b/pkgs/tools/security/hashdeep/default.nix
index edb5794eef76..8c8ab5b01a5d 100644
--- a/pkgs/tools/security/hashdeep/default.nix
+++ b/pkgs/tools/security/hashdeep/default.nix
@@ -17,7 +17,7 @@ in stdenv.mkDerivation {
     description = "A set of cross-platform tools to compute hashes.";
     homepage = "https://github.com/jessek/hashdeep";
     license = licenses.gpl2;
-    platforms = with platforms; linux ++ freebsd ++ openbsd ++ darwin;
+    platforms = with platforms; linux ++ freebsd ++ openbsd;
     maintainers = [ stdenv.lib.maintainers.karantan ];
   };
 }

From 7cf8f4f2ccc4ce94dad1cce15bc22566d00e2cdf Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Fri, 20 Mar 2020 12:00:00 +0000
Subject: [PATCH 3459/4636] exiv2: fix CVE-2019-20421

---
 pkgs/development/libraries/exiv2/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index dc7610ee1782..d92f7ffc4fde 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetchFromGitHub
+, fetchpatch
 , zlib
 , expat
 , cmake
@@ -23,6 +24,16 @@ stdenv.mkDerivation rec {
     sha256 = "0n8il52yzbmvbkryrl8waz7hd9a2fdkw8zsrmhyh63jlvmmc31gf";
   };
 
+  patches = [
+    # CVE-2019-20421
+    # included in next release
+    (fetchpatch {
+      url = "https://github.com/Exiv2/exiv2/commit/a82098f4f90cd86297131b5663c3dec6a34470e8.patch";
+      sha256 = "16r19qb9l5j43ixm5jqid9sdv5brlkk1wq0w79rm5agxq4kblfyc";
+      excludes = [ "tests/bugfixes/github/test_issue_1011.py" "test/data/Jp2Image_readMetadata_loop.poc" ];
+    })
+  ];
+
   cmakeFlags = [
     "-DEXIV2_BUILD_PO=ON"
     "-DEXIV2_BUILD_DOC=ON"

From 254e3eaf5cd0e0c14f533762e34bc3cbd5003979 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Wed, 18 Mar 2020 20:57:05 -0400
Subject: [PATCH 3460/4636] jetbrains-jdk: derive expression for 11.0.6 from
 openjdk11 rather than openjdk12

---
 pkgs/development/compilers/jetbrains-jdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index 3ee12af5c06c..1502b243d889 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, openjdk12, fetchFromGitHub, jetbrains }:
+{ stdenv, openjdk11, fetchFromGitHub, jetbrains }:
 
-openjdk12.overrideAttrs (oldAttrs: rec {
+openjdk11.overrideAttrs (oldAttrs: rec {
   pname = "jetbrains-jdk";
   version = "11.0.6-b774";
   src = fetchFromGitHub {

From 7fe795d366d09b9afd03fdf0fd7f52b0691f3c46 Mon Sep 17 00:00:00 2001
From: Kevin Rauscher <kevin.rauscher@tomahna.fr>
Date: Thu, 19 Mar 2020 20:54:10 +0100
Subject: [PATCH 3461/4636] metals: 0.8.2 -> 0.8.3

---
 pkgs/development/tools/metals/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix
index 6a6aafaf9e5e..85a27fd9150b 100644
--- a/pkgs/development/tools/metals/default.nix
+++ b/pkgs/development/tools/metals/default.nix
@@ -2,7 +2,7 @@
 
 let
   baseName = "metals";
-  version = "0.8.2";
+  version = "0.8.3";
   deps = stdenv.mkDerivation {
     name = "${baseName}-deps-${version}";
     buildCommand = ''
@@ -15,7 +15,7 @@ let
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash     = "09acvrfv23q1iv4sq7jhpf5frcv7dk2nq147licma5iixc726bdx";
+    outputHash     = "1l196glr7rbsvrqmq6i7iw532jkz8d1w5m9nh0kh5z12visc7bkk";
   };
 in
 stdenv.mkDerivation rec {

From 9fc5e7e473874762fdb1b49d17dcf703d48352c3 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Fri, 20 Mar 2020 13:36:23 +0100
Subject: [PATCH 3462/4636] treewide: fix redirected urls (again)

Ran the same script as #78265.
Additionally, manually replaced `http://goodies.xfce.org`
with https.
---
 pkgs/applications/audio/MMA/default.nix                       | 2 +-
 pkgs/applications/audio/traverso/default.nix                  | 4 ++--
 pkgs/applications/editors/flpsed/default.nix                  | 2 +-
 pkgs/applications/misc/devilspie2/default.nix                 | 2 +-
 pkgs/applications/radio/gqrx/default.nix                      | 2 +-
 pkgs/applications/video/vokoscreen/default.nix                | 2 +-
 pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix    | 2 +-
 pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix        | 2 +-
 pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix       | 2 +-
 pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix        | 2 +-
 pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix     | 2 +-
 pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix      | 2 +-
 .../xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix      | 2 +-
 pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix   | 2 +-
 pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix         | 2 +-
 pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix       | 2 +-
 pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix     | 2 +-
 pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix  | 2 +-
 pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix       | 2 +-
 pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix     | 2 +-
 pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix    | 2 +-
 pkgs/development/compilers/purescript/purescript/default.nix  | 2 +-
 pkgs/development/libraries/openldap/default.nix               | 2 +-
 pkgs/development/ocaml-modules/ppx_tools/default.nix          | 2 +-
 pkgs/development/python-modules/cirq/default.nix              | 2 +-
 pkgs/development/python-modules/moviepy/default.nix           | 2 +-
 pkgs/development/tools/build-managers/dub/default.nix         | 2 +-
 pkgs/misc/emulators/vbam/default.nix                          | 2 +-
 pkgs/misc/frescobaldi/default.nix                             | 2 +-
 pkgs/os-specific/linux/apparmor/default.nix                   | 2 +-
 30 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix
index 4304fe59bdfe..1b13b11a0157 100644
--- a/pkgs/applications/audio/MMA/default.nix
+++ b/pkgs/applications/audio/MMA/default.nix
@@ -61,7 +61,7 @@
 
   meta = {
     description = "Creates MIDI tracks for a soloist to perform over from a user supplied file containing chords";
-    homepage =  http://www.mellowood.ca/mma/index.html;
+    homepage =  https://www.mellowood.ca/mma/index.html;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.magnetophon ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix
index 9188003ce66d..bbc5b4d4fd77 100644
--- a/pkgs/applications/audio/traverso/default.nix
+++ b/pkgs/applications/audio/traverso/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   version = "0.49.6";
 
   src = fetchurl {
-    url = "http://traverso-daw.org/traverso-0.49.6.tar.gz";
+    url = "https://traverso-daw.org/traverso-0.49.6.tar.gz";
     sha256 = "12f7x8kw4fw1j0xkwjrp54cy4cv1ql0zwz2ba5arclk4pf6bhl7q";
   };
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Cross-platform multitrack audio recording and audio editing suite";
-    homepage = http://traverso-daw.org/;
+    homepage = https://traverso-daw.org/;
     license = with licenses; [ gpl2Plus lgpl21Plus ];
     platforms = platforms.all;
     maintainers = with maintainers; [ coconnor ];
diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix
index cbff8e606f2d..ec9143943fc0 100644
--- a/pkgs/applications/editors/flpsed/default.nix
+++ b/pkgs/applications/editors/flpsed/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "WYSIWYG PostScript annotator";
-    homepage = http://flpsed.org/flpsed.html;
+    homepage = https://flpsed.org/flpsed.html;
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ ];
diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix
index 5699396a0840..f9c420a60de6 100644
--- a/pkgs/applications/misc/devilspie2/default.nix
+++ b/pkgs/applications/misc/devilspie2/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       positioned at a specific screen position, or position a window
       on a specific workspace.
     '';
-    homepage = http://www.gusnan.se/devilspie2/;
+    homepage = https://www.gusnan.se/devilspie2/;
     license = licenses.gpl3;
     maintainers = [ maintainers.ebzzry ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix
index e95c7d779526..0b65a407d9cc 100644
--- a/pkgs/applications/radio/gqrx/default.nix
+++ b/pkgs/applications/radio/gqrx/default.nix
@@ -38,7 +38,7 @@ mkDerivation rec {
       including Funcube Dongle Pro/Pro+, rtl-sdr, HackRF, and Universal
       Software Radio Peripheral (USRP) devices.
     '';
-    homepage = http://gqrx.dk/;
+    homepage = https://gqrx.dk/;
     # Some of the code comes from the Cutesdr project, with a BSD license, but
     # it's currently unknown which version of the BSD license that is.
     license = licenses.gpl3Plus;
diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix
index a38a9056c85c..94d0de20ccf7 100644
--- a/pkgs/applications/video/vokoscreen/default.nix
+++ b/pkgs/applications/video/vokoscreen/default.nix
@@ -40,7 +40,7 @@ mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Simple GUI screencast recorder, using ffmpeg";
-    homepage = "http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html";
+    homepage = "https://linuxecke.volkoh.de/vokoscreen/vokoscreen.html";
     longDescription = ''
       vokoscreen is an easy to use screencast creator to record
       educational videos, live recordings of browser, installation,
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
index ef7f7e580206..321e4792e4bc 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ intltool glib exo libXtst xorgproto libxfce4util libxfce4ui xfce4-panel xfconf gtk2 hicolor-icon-theme ];
 
   meta = {
-    homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+    homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}";
     description = "CPU graph show for Xfce panel";
     platforms = platforms.linux;
     maintainers = [ maintainers.AndersonTorres ];
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
index 3abeb74a4355..d5982ea3c12a 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ];
 
   meta = {
-    homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+    homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}";
     description = "Dictionary plugin for Xfce panel";
     platforms = platforms.linux;
     maintainers = [ maintainers.AndersonTorres ];
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix
index e6d1f6da26b5..94c26f9e1b2b 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ];
 
   meta = {
-    homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+    homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}";
     description = "Embed arbitrary app windows on Xfce panel";
     platforms = platforms.linux;
     maintainers = [ maintainers.AndersonTorres ];
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
index 03e5a2229672..1932a9e9968e 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ];
 
   meta = {
-    homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+    homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}";
     description = "Eyes following you!";
     platforms = platforms.linux;
     maintainers = [ maintainers.AndersonTorres ];
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix
index ee663aa71ca8..54bb4817d7e2 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ];
 
   meta = {
-    homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+    homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}";
     description = "Filesystem monitor";
     platforms = platforms.linux;
     maintainers = [ maintainers.AndersonTorres ];
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix
index 193d27af98a3..dd9827dcc5a9 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ];
 
   meta = {
-    homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+    homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}";
     description = "Cyclically spawns a command and captures its output";
     platforms = platforms.linux;
     maintainers = [ maintainers.AndersonTorres ];
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
index 2782decf6c4c..7bace3393c02 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = "http://goodies.xfce.org/projects/panel-plugins/${pname}";
+    homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}";
     description = "Hardware monitor plugin for the XFCE4 panel";
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
index e9d2eb590be9..058f25917161 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     xfconf gtk2 exo gnutls libgcrypt ];
 
   meta = {
-    homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+    homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}";
     description = "Mailwatch plugin for Xfce panel";
     platforms = platforms.linux;
     maintainers = [ ];
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
index b909540144ae..b936d2e441c0 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     xfconf gtk2 exo ];
 
   meta = {
-    homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+    homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}";
     description = "MPD plugin for Xfce panel";
     platforms = platforms.linux;
     maintainers = [ ];
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
index 2876c1b1f7d8..516d86f56abb 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 libunique ];
 
   meta = {
-    homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+    homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}";
     description = "Sticky notes plugin for Xfce panel";
     platforms = platforms.linux;
     maintainers = [ maintainers.AndersonTorres ];
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix
index 2e7233e6cdb0..56cad888168d 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    homepage = "http://goodies.xfce.org/projects/panel-plugins/${pname}";
+    homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}";
     description = "A panel plug-in for different sensors using acpi, lm_sensors and hddtemp";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix
index 5575962ab77e..95fb9358f946 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel gtk2 ];
 
   meta = {
-    homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+    homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}";
     description = "System load plugin for Xfce panel";
     platforms = platforms.linux;
     maintainers = [ maintainers.AndersonTorres ];
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
index 4eddfe8df574..4070156c2239 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" ];
 
   meta = {
-    homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+    homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}";
     description = "A simple XFCE panel plugin that lets the user run an alarm at a specified time or at the end of a specified countdown period";
     platforms = platforms.linux;
     license = licenses.gpl2;
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
index 5ab311ef16f7..0914c4cb7d97 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+    homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}";
     description = "Weather plugin for the Xfce desktop environment";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix
index 8798851579d8..eba7be91ef9d 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+    homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}";
     description = "Set of two plugins which allows you to put the maximized window title and windows buttons on the panel";
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix
index d1797a448ad1..1924c732b93f 100644
--- a/pkgs/development/compilers/purescript/purescript/default.nix
+++ b/pkgs/development/compilers/purescript/purescript/default.nix
@@ -57,7 +57,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A strongly-typed functional programming language that compiles to JavaScript";
-    homepage = http://www.purescript.org/;
+    homepage = https://www.purescript.org/;
     license = licenses.bsd3;
     maintainers = [ maintainers.justinwoo maintainers.mbbx6spp ];
     platforms = [ "x86_64-linux" "x86_64-darwin" ];
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 4c2052ae7915..b956ba19655b 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage    = http://www.openldap.org/;
+    homepage    = https://www.openldap.org/;
     description = "An open source implementation of the Lightweight Directory Access Protocol";
     license = licenses.openldap;
     maintainers = with maintainers; [ lovek323 ];
diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix
index 8173fc87aba1..551cfae1a741 100644
--- a/pkgs/development/ocaml-modules/ppx_tools/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix
@@ -41,7 +41,7 @@ let src = fetchFromGitHub {
     pname = "ppx_tools";
     meta = with stdenv.lib; {
       description = "Tools for authors of ppx rewriters";
-      homepage = http://www.lexifi.com/ppx_tools;
+      homepage = https://www.lexifi.com/ppx_tools;
       license = licenses.mit;
       maintainers = with maintainers; [ vbgl ];
     };
diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix
index d6109e8aabac..a671f0e68e83 100644
--- a/pkgs/development/python-modules/cirq/default.nix
+++ b/pkgs/development/python-modules/cirq/default.nix
@@ -79,7 +79,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "A framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits.";
-    homepage = "http://github.com/quantumlib/cirq";
+    homepage = "https://github.com/quantumlib/cirq";
     license = licenses.asl20;
     maintainers = with maintainers; [ drewrisinger ];
   };
diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix
index 7e9215f33933..7f7c5ccc4d7e 100644
--- a/pkgs/development/python-modules/moviepy/default.nix
+++ b/pkgs/development/python-modules/moviepy/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Video editing with Python";
-    homepage = http://zulko.github.io/moviepy/;
+    homepage = https://zulko.github.io/moviepy/;
     license = licenses.mit;
   };
 
diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix
index ef2b155482f1..110e6797a9d4 100644
--- a/pkgs/development/tools/build-managers/dub/default.nix
+++ b/pkgs/development/tools/build-managers/dub/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Package and build manager for D applications and libraries";
-    homepage = http://code.dlang.org/;
+    homepage = https://code.dlang.org/;
     license = licenses.mit;
     maintainers = with maintainers; [ ThomasMader ];
     platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix
index e44b45dbb4bc..6e39b5054d1d 100644
--- a/pkgs/misc/emulators/vbam/default.nix
+++ b/pkgs/misc/emulators/vbam/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     description = "A merge of the original Visual Boy Advance forks";
     license = licenses.gpl2;
     maintainers = with maintainers; [ lassulus ];
-    homepage = http://vba-m.com/;
+    homepage = https://vba-m.com/;
     platforms = stdenv.lib.platforms.linux;
     badPlatforms = [ "aarch64-linux" ];
   };
diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix
index abf4970c616d..45eab938d24d 100644
--- a/pkgs/misc/frescobaldi/default.nix
+++ b/pkgs/misc/frescobaldi/default.nix
@@ -28,7 +28,7 @@ buildPythonApplication rec {
   ];
 
   meta = with lib; {
-    homepage = http://frescobaldi.org/;
+    homepage = https://frescobaldi.org/;
     description = ''Frescobaldi is a LilyPond sheet music text editor'';
     longDescription = ''
       Powerful text editor with syntax highlighting and automatic completion, 
diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix
index de9601dc85e8..8f4db8aca449 100644
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@@ -18,7 +18,7 @@ let
   apparmor-version = apparmor-series + "." + apparmor-patchver;
 
   apparmor-meta = component: with stdenv.lib; {
-    homepage = http://apparmor.net/;
+    homepage = https://apparmor.net/;
     description = "A mandatory access control system - ${component}";
     license = licenses.gpl2;
     maintainers = with maintainers; [ phreedom thoughtpolice joachifm ];

From 1922268d8fedaff25543014f85270272db27e1e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 20 Mar 2020 09:44:33 -0300
Subject: [PATCH 3463/4636] mate.mate-power-manager: 1.24.0 -> 1.24.1

---
 pkgs/desktops/mate/mate-power-manager/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix
index 37ff34e081ab..63a27dec0283 100644
--- a/pkgs/desktops/mate/mate-power-manager/default.nix
+++ b/pkgs/desktops/mate/mate-power-manager/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-power-manager";
-  version = "1.24.0";
+  version = "1.24.1";
 
   src = fetchurl {
     url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1h6wm8vna97iayhwqh7rfsc87715np12nxa72w27p4zl54bdkdlg";
+    sha256 = "13ar40x5hs4d4h81q8qsy0agbx5wnarry3mbhws54zydcxd7j20a";
   };
 
   nativeBuildInputs = [

From 620f3c6cf7b3ee13da06a1eb554cbe837a8c30d0 Mon Sep 17 00:00:00 2001
From: Mike Sperber <sperber@deinprogramm.de>
Date: Thu, 5 Mar 2020 10:58:23 +0100
Subject: [PATCH 3464/4636] idrisPackages: add tf-random package

---
 maintainers/maintainer-list.nix             |  6 ++++++
 pkgs/development/idris-modules/default.nix  |  2 ++
 pkgs/development/idris-modules/tfrandom.nix | 23 +++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/idris-modules/tfrandom.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 04f0d882d8d2..594387e5ad50 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4748,6 +4748,12 @@
     githubId = 3958340;
     name = "Eshin Kunishima";
   };
+  mikesperber = {
+    email = "sperber@deinprogramm.de";
+    github = "mikesperber";
+    githubId = 1387206;
+    name = "Mike Sperber";
+  };
   mildlyincompetent = {
     email = "nix@kch.dev";
     github = "mildlyincompetent";
diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix
index 074a260b8169..7011a513c101 100644
--- a/pkgs/development/idris-modules/default.nix
+++ b/pkgs/development/idris-modules/default.nix
@@ -177,6 +177,8 @@
 
     test = callPackage ./test.nix {};
 
+    tf-random = callPackage ./tfrandom.nix {};
+
     tlhydra = callPackage ./tlhydra.nix {};
 
     tomladris = callPackage ./tomladris.nix {};
diff --git a/pkgs/development/idris-modules/tfrandom.nix b/pkgs/development/idris-modules/tfrandom.nix
new file mode 100644
index 000000000000..5c6319503123
--- /dev/null
+++ b/pkgs/development/idris-modules/tfrandom.nix
@@ -0,0 +1,23 @@
+{ stdenv
+, build-idris-package
+, fetchFromGitHub
+, lib
+}:
+build-idris-package  {
+  name = "tf-random";
+  version = "2020-01-15";
+
+  src = fetchFromGitHub {
+    owner = "david-christiansen";
+    repo = "idris-tf-random";
+    rev = "202aac3b96757e8247f6e26945329d90dd668aed";
+    sha256 = "1z8pyrsm1kdsspcs3h96k38h44ss0mv39lcz7xvwg8ickys3kqxl";
+  };
+
+  meta = {
+    description = "Port of Haskell tf-random";
+    homepage = "https://github.com/david-christiansen/idris-tf-random";
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.mikesperber ];
+  };
+}

From 20b5cf2aa22b8427e4d9af87d70bdcdd6a613cf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 20 Mar 2020 09:46:44 -0300
Subject: [PATCH 3465/4636] mate.mate-power-manager: use mate-panel explicitly
 instead of mate.mate-panel

---
 pkgs/desktops/mate/mate-power-manager/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix
index 63a27dec0283..30f1c48fa5f6 100644
--- a/pkgs/desktops/mate/mate-power-manager/default.nix
+++ b/pkgs/desktops/mate/mate-power-manager/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook }:
+{ stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "mate-power-manager";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
      dbus-glib
      upower
      polkit
-     mate.mate-panel
+     mate-panel
   ];
 
   configureFlags = [ "--enable-applets" ];

From ac367b9946c863b2d9cae4907d5af8cf2c1bad1a Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@suse.com>
Date: Fri, 20 Mar 2020 14:30:44 +0100
Subject: [PATCH 3466/4636] cri-o: v1.17.0 -> v1.17.1

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
---
 pkgs/applications/virtualization/cri-o/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
index 274468334ee4..793d34a0dcca 100644
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@@ -20,7 +20,7 @@ let
   buildTags = "apparmor seccomp selinux containers_image_ostree_stub";
 in buildGoPackage rec {
   project = "cri-o";
-  version = "1.17.0";
+  version = "1.17.1";
   name = "${project}-${version}${flavor}";
 
   goPackagePath = "github.com/${project}/${project}";
@@ -29,7 +29,7 @@ in buildGoPackage rec {
     owner = "cri-o";
     repo = "cri-o";
     rev = "v${version}";
-    sha256 = "0xjmylf0ww23qqcg7kw008px6608r4qq6q57pfqis0661kp6f24j";
+    sha256 = "0zipigjcnhcnn0w69dkd8312qb6z98l65ir175wp3jfvj4cx3g28";
   };
 
   outputs = [ "bin" "out" ];

From a0a61c3e34873d02034cb804975ad2981328b5b4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 20 Mar 2020 14:37:38 +0100
Subject: [PATCH 3467/4636] nixos-option: Disable on Nix >= 2.4 because it
 doesn't compile

This is needed when using the overlay from the Nix flake.
---
 nixos/modules/installer/tools/tools.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 833865e99bb3..655d77db157d 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -42,7 +42,10 @@ let
     inherit (config.system.nixos-generate-config) configuration;
   };
 
-  nixos-option = pkgs.callPackage ./nixos-option { };
+  nixos-option =
+    if lib.versionAtLeast (lib.getVersion pkgs.nix) "2.4pre"
+    then null
+    else pkgs.callPackage ./nixos-option { };
 
   nixos-version = makeProg {
     name = "nixos-version";
@@ -184,10 +187,9 @@ in
         nixos-install
         nixos-rebuild
         nixos-generate-config
-        nixos-option
         nixos-version
         nixos-enter
-      ];
+      ] ++ lib.optional (nixos-option != null) nixos-option;
 
     system.build = {
       inherit nixos-install nixos-generate-config nixos-option nixos-rebuild nixos-enter;

From f028498f634b4924a26d7eaaabd235bdbf827547 Mon Sep 17 00:00:00 2001
From: Christoph Neidahl <christoph.neidahl@gmail.com>
Date: Fri, 20 Mar 2020 14:59:31 +0100
Subject: [PATCH 3468/4636] rpcs3: 0.0.6-8187-790962425 -> 0.0.8-9300-341fdf7eb

---
 pkgs/misc/emulators/rpcs3/default.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix
index 674222dc3555..4e022b2868fa 100644
--- a/pkgs/misc/emulators/rpcs3/default.nix
+++ b/pkgs/misc/emulators/rpcs3/default.nix
@@ -1,22 +1,22 @@
-{ stdenv, lib, fetchgit, cmake, pkgconfig, git
-, qt5, openal, glew, vulkan-loader, libpng, ffmpeg, libevdev, python27
+{ mkDerivation, lib, fetchgit, cmake, pkgconfig, git
+, qtbase, qtquickcontrols, openal, glew, vulkan-loader, libpng, ffmpeg, libevdev, python3
 , pulseaudioSupport ? true, libpulseaudio
 , waylandSupport ? true, wayland
 , alsaSupport ? true, alsaLib
 }:
 
 let
-  majorVersion = "0.0.6";
-  gitVersion = "8187-790962425"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD)
+  majorVersion = "0.0.8";
+  gitVersion = "9300-341fdf7eb"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD)
 in
-stdenv.mkDerivation {
+mkDerivation {
   pname = "rpcs3";
   version = "${majorVersion}-${gitVersion}";
 
   src = fetchgit {
     url = "https://github.com/RPCS3/rpcs3";
-    rev = "790962425cfb893529f72b3ef0dd1424fcc42973";
-    sha256 = "154ys29b9xdws3bp4b7rb3kc0h9hd49g2yf3z9268cdq8aclahaa";
+    rev = "341fdf7eb14763fd06e2eab9a4b2b8f1adf9fdbd";
+    sha256 = "1qx97zkkjl6bmv5rhfyjqynbz0v8h40b2wxqnl59g287wj0yk3y1";
   };
 
   preConfigure = ''
@@ -36,14 +36,14 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake pkgconfig git ];
 
   buildInputs = [
-    qt5.qtbase qt5.qtquickcontrols openal glew vulkan-loader libpng ffmpeg libevdev python27
+    qtbase qtquickcontrols openal glew vulkan-loader libpng ffmpeg libevdev python3
   ] ++ lib.optional pulseaudioSupport libpulseaudio
     ++ lib.optional alsaSupport alsaLib
     ++ lib.optional waylandSupport wayland;
 
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "PS3 emulator/debugger";
     homepage = "https://rpcs3.net/";
     maintainers = with maintainers; [ abbradar nocent ];

From 78104ad2daf340d7471bd8c34f62d754e941e27f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 20 Mar 2020 14:59:08 +0100
Subject: [PATCH 3469/4636] neomutt: 20200313 -> 20200320

https://github.com/neomutt/neomutt/releases/tag/20200320
---
 pkgs/applications/networking/mailreaders/neomutt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index b4d7bd046d2e..bcd35510dce3 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "20200313";
+  version = "20200320";
   pname = "neomutt";
 
   src = fetchFromGitHub {
     owner  = "neomutt";
     repo   = "neomutt";
     rev    = version;
-    sha256 = "1k4k07l6h5krc3fx928qvdq3ssw9fxn95aj7k885xlckd2i1lnb5";
+    sha256 = "06xcl9pr8dna4kqjaqm7ss50gdy185425bwl31i0xs3l11cyjap4";
   };
 
   buildInputs = [

From d99e5e0a371a06812630f117650ff9f942b71c1d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Mar 2020 14:06:19 +0000
Subject: [PATCH 3470/4636] sonarr: 2.0.0.5338 -> 2.0.0.5344

---
 pkgs/servers/sonarr/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix
index 7a546d5813cf..d18e9fb7f586 100644
--- a/pkgs/servers/sonarr/default.nix
+++ b/pkgs/servers/sonarr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "sonarr";
-  version = "2.0.0.5338";
+  version = "2.0.0.5344";
 
   src = fetchurl {
     url = "https://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz";
-    sha256 = "05l7l4d1765m01c14iz8lcr61dnm4xd5p09sns4w8wmanks9jg3x";
+    sha256 = "0bsxf7m2dir7gi0cfn8vdasr11q224b9mp6cixak9ss5zafwn59a";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Smart PVR for newsgroup and bittorrent users";
-    homepage = https://sonarr.tv/;
+    homepage = "https://sonarr.tv/";
     license = stdenv.lib.licenses.gpl3;
     maintainers = [ stdenv.lib.maintainers.fadenb ];
     platforms = stdenv.lib.platforms.all;

From 5fa345922f1d5534be1c9ba9162c0bab3354e157 Mon Sep 17 00:00:00 2001
From: Darius Jahandarie <djahandarie@gmail.com>
Date: Fri, 20 Mar 2020 11:08:34 -0400
Subject: [PATCH 3471/4636] nixos/supplicant: Don't *stop* supplicant on
 machine resume. Fixes #51582

---
 nixos/modules/services/networking/supplicant.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/services/networking/supplicant.nix b/nixos/modules/services/networking/supplicant.nix
index 35c1e649e2e1..b5b9989ce186 100644
--- a/nixos/modules/services/networking/supplicant.nix
+++ b/nixos/modules/services/networking/supplicant.nix
@@ -39,8 +39,6 @@ let
         bindsTo = deps;
         after = deps;
         before = [ "network.target" ];
-        # Receive restart event after resume
-        partOf = [ "post-resume.target" ];
 
         path = [ pkgs.coreutils ];
 

From 5071f0b93a7fc7b3c98a77f4912dfbea4a5629dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 20 Mar 2020 12:20:00 -0300
Subject: [PATCH 3472/4636] volctl: 0.6.2 -> 0.6.3

---
 pkgs/tools/audio/volctl/default.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/audio/volctl/default.nix b/pkgs/tools/audio/volctl/default.nix
index 7b4cdd6b5315..dd58671824db 100644
--- a/pkgs/tools/audio/volctl/default.nix
+++ b/pkgs/tools/audio/volctl/default.nix
@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "volctl";
-  version = "0.6.2";
+  version = "0.6.3";
 
   src = fetchFromGitHub {
     owner = "buzz";
     repo = pname;
     rev = version;
-    sha256 = "1bqq5mrpi7qxzl37z6fj67pqappjmwhi8d8db95j3lmf16svm2xk";
+    sha256 = "0rppqc5wiqxd83z2mgvhi6gdx7yhy9wnav1dbbi1wvm7lzw6fnil";
   };
 
   nativeBuildInputs = [
@@ -28,14 +28,6 @@ pythonPackages.buildPythonApplication rec {
 
   strictDeps = false;
 
-  postPatch = ''
-    # The user can set a mixer application in the preferences. The
-    # default is pavucontrol. Do not hard code its path and hope it
-    # can be found in $PATH.
-
-    substituteInPlace volctl/app.py --replace /usr/bin/pavucontrol pavucontrol
-  '';
-
   preBuild = ''
     export LD_LIBRARY_PATH=${libpulseaudio}/lib
   '';
@@ -50,7 +42,7 @@ pythonPackages.buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     description = "PulseAudio enabled volume control featuring per-app sliders";
-    homepage = https://buzz.github.io/volctl/;
+    homepage = "https://buzz.github.io/volctl/";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = [ maintainers.romildo ];

From 81212e69554596fbe86b46d4842b3c64f3706bde Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 20 Mar 2020 16:50:40 +0100
Subject: [PATCH 3473/4636] python.pkgs.pandas: parallelize build

---
 pkgs/development/python-modules/pandas/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index de046d942c83..6fc5d11303b8 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -67,6 +67,12 @@ in buildPythonPackage rec {
                 "['pandas/src/klib', 'pandas/src', '$cpp_sdk']"
   '';
 
+  setupPyBuildFlags = [
+    # As suggested by
+    # https://pandas.pydata.org/pandas-docs/stable/development/contributing.html#creating-a-python-environment
+    "--parallel=$NIX_BUILD_CORES"
+  ];
+
 
   disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) ([
     # since dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat

From 55e85a0d62e0494c9f8c3648d5524b874c8e11e7 Mon Sep 17 00:00:00 2001
From: Dominik Honnef <dominik@honnef.co>
Date: Wed, 18 Mar 2020 23:25:02 +0100
Subject: [PATCH 3474/4636] epkowa: add the GT-S650 plugin

This plugin adds support for the GT-S650, Perfection V19 and
Perfection V39 scanners. I've tested it personally with an Epson
Perfection V39.

This plugin uses the ISCAN_FIRMWARE_DIR environment variable, not
ISCAN_FW_DIR. A quick grep didn't find any use of ISCAN_FW_DIR in the
currently packaged plugins, but a quick Google suggests that this
variable does (or at least used to) exist, so I'm not touching it.
---
 pkgs/misc/drivers/epkowa/default.nix          | 33 +++++++++++++++++++
 .../drivers/epkowa/firmware_location.patch    |  3 +-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix
index c8c0ecb872e0..964618f1fc66 100644
--- a/pkgs/misc/drivers/epkowa/default.nix
+++ b/pkgs/misc/drivers/epkowa/default.nix
@@ -153,6 +153,39 @@ let plugins = {
 
     meta = common_meta // { description = "iscan esci s80 plugin for "+passthru.hw; };
   };
+  s650 = stdenv.mkDerivation rec {
+    name = "iscan-gt-s650-bundle";
+    version = "2.30.4";
+
+    src = fetchurl {
+      urls = [
+        "https://download2.ebz.epson.net/iscan/plugin/gt-s650/rpm/x64/iscan-gt-s650-bundle-${version}.x64.rpm.tar.gz"
+        "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-s650/rpm/x64/iscan-gt-s650-bundle-${version}.x64.rpm.tar.gz"
+      ];
+      sha256 = "1ffddf488c5fc1eb39452499951bd13a2dc1971980c0551176076c81af363038";
+    };
+
+    nativeBuildInputs = [ autoPatchelfHook rpm ];
+
+    installPhase = ''
+      cd plugins
+      ${rpm}/bin/rpm2cpio iscan-plugin-gt-s650-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
+      mkdir $out
+      cp -r usr/share $out
+      cp -r usr/lib64 $out/lib
+      mv $out/share/iscan $out/share/esci
+      mv $out/lib/iscan $out/lib/esci
+      '';
+
+    passthru = {
+      registrationCommand = ''
+        $registry --add interpreter usb 0x04b8 0x013c "$plugin/lib/esci/libiscan-plugin-gt-s650 $plugin/share/esci/esfw010c.bin"
+        $registry --add interpreter usb 0x04b8 0x013d "$plugin/lib/esci/libiscan-plugin-gt-s650 $plugin/share/esci/esfw010c.bin"
+        '';
+      hw = "GT-S650, Perfection V19, Perfection V39";
+    };
+    meta = common_meta // { description = "iscan GT-S650 for "+passthru.hw; };
+  };
   network = stdenv.mkDerivation rec {
     pname = "iscan-nt-bundle";
     # for the version, look for the driver of XP-750 in the search page
diff --git a/pkgs/misc/drivers/epkowa/firmware_location.patch b/pkgs/misc/drivers/epkowa/firmware_location.patch
index 58ea849d8f9d..0f723a4ff9d7 100644
--- a/pkgs/misc/drivers/epkowa/firmware_location.patch
+++ b/pkgs/misc/drivers/epkowa/firmware_location.patch
@@ -8,12 +8,13 @@ set this environment variable. Instead, we patch iscan to set this variable
 before loading libesci-interpreter-gt-f720.so.
 --- backend/channel-usb.c.orig	2017-08-14 11:24:27.669582456 +0200
 +++ backend/channel-usb.c	2017-08-14 11:31:40.509010897 +0200
-@@ -169,6 +169,9 @@
+@@ -169,6 +169,10 @@
  {
    SANE_Status s;
  
 +  setenv("ESCI_FIRMWARE_DIR", NIX_ESCI_PREFIX, 1);
 +  setenv("ISCAN_FW_DIR", NIX_ESCI_PREFIX, 1);
++  setenv("ISCAN_FIRMWARE_DIR", NIX_ESCI_PREFIX, 1);
 +
    s = sanei_usb_open (self->name, &self->fd);
  

From 1711025a3d82abb6293cbeec0b0716cbb306c999 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 20 Mar 2020 17:44:25 +0100
Subject: [PATCH 3475/4636] vimPlugins: update

The vim-pandoc patch is now outdated and has been replaced by a better
workaround upstream:

https://github.com/vim-pandoc/vim-pandoc/pull/363
---
 pkgs/misc/vim-plugins/generated.nix | 180 ++++++++++++++--------------
 pkgs/misc/vim-plugins/overrides.nix |  15 ---
 2 files changed, 90 insertions(+), 105 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 1ce4cf0b7a33..06667caf5c83 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -446,12 +446,12 @@ let
 
   coc-metals = buildVimPluginFrom2Nix {
     pname = "coc-metals";
-    version = "2020-03-14";
+    version = "2020-03-20";
     src = fetchFromGitHub {
       owner = "ckipp01";
       repo = "coc-metals";
-      rev = "5b25ccfbb628d6645a20c27dd161b0eae30cf7c8";
-      sha256 = "1l62lia82yzx9crlby71i84zp48xjfpkan14va72mg482fl7akfs";
+      rev = "a4a82cd0ea5fb71399ca02c03456e9862a54eec8";
+      sha256 = "1cj05rzzwacf0c2gk0zhb5ln6pywyc35p2walna80ncpyniyk6k2";
     };
   };
 
@@ -534,12 +534,12 @@ let
 
   coc-snippets = buildVimPluginFrom2Nix {
     pname = "coc-snippets";
-    version = "2020-03-13";
+    version = "2020-03-17";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-snippets";
-      rev = "725167224850eed7e792c8fad667b1fb780d8385";
-      sha256 = "07crnlh71ycdp1p3xlkmgwq83k12kprain8yhvfzas068f8080hg";
+      rev = "881de16a72440c2db7ecc0a68ae0d32a2e5e6864";
+      sha256 = "12dwr6r30b78rhj2b19x2l48ri7qzvl2ggr9x6189fhbz4h25rs5";
     };
   };
 
@@ -556,12 +556,12 @@ let
 
   coc-spell-checker = buildVimPluginFrom2Nix {
     pname = "coc-spell-checker";
-    version = "2020-02-19";
+    version = "2020-03-16";
     src = fetchFromGitHub {
       owner = "iamcco";
       repo = "coc-spell-checker";
-      rev = "c956e288a4d0ffff85e920970776d89dc9c65099";
-      sha256 = "00xavbkdx019f6xm6bwf3xqgyvbp3sz7ddnjxfvgah97gwy0q7xs";
+      rev = "4a8195f5f22d9d7b42998b7e3b846aa2aef7de52";
+      sha256 = "1w8b9icwdam8ljprc8avs5pwdiwmx3j1jxsg03d1lvis9w5xm0cd";
     };
   };
 
@@ -622,12 +622,12 @@ let
 
   coc-vetur = buildVimPluginFrom2Nix {
     pname = "coc-vetur";
-    version = "2019-11-13";
+    version = "2020-03-17";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-vetur";
-      rev = "8c55c4b867cf2210810133fab6c9382a6f0a14e0";
-      sha256 = "1da97d4s2qnysqk21qdm0sgxn03c2cg8vjsajccx538dwiq9f8lb";
+      rev = "8072352a371261a922f30a89a6b5c6b07123da84";
+      sha256 = "1nb33ndl0pzxw30ibs6p4qaa781cni93ffgypcc69wg4b2r4341a";
     };
   };
 
@@ -666,12 +666,12 @@ let
 
   coc-yank = buildVimPluginFrom2Nix {
     pname = "coc-yank";
-    version = "2019-12-11";
+    version = "2020-03-17";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-yank";
-      rev = "79c5a97c9b7122180b869f90f7f011934f3ae8f5";
-      sha256 = "0dqz759aw0zlmgwrkv8ia45sdl27hb63ilawm9awzbl99w02psjf";
+      rev = "6cb8bc7f2d41b9fb75c797c5805444badeff3dd9";
+      sha256 = "0s28684531ihczg5nf2m3f8z1vx9fw4yllfq7jz8g7ifw922ddxb";
     };
   };
 
@@ -909,12 +909,12 @@ let
 
   denite-nvim = buildVimPluginFrom2Nix {
     pname = "denite-nvim";
-    version = "2020-03-08";
+    version = "2020-03-18";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "b6e2c7df9402f293bad1dc45f5d41b3dc5d8a9b1";
-      sha256 = "1rnxaj1ah7k5l2bcc2x7pdlqjb9fki5r732yanp4r3c4mlx28rvp";
+      rev = "a184e87b7df5e8f35aee115153b37f178e47718c";
+      sha256 = "1na637k62sgpqx69r6j5prad4qdc9dp3psq75jhqyvhm3yq2432w";
     };
   };
 
@@ -1121,12 +1121,12 @@ let
 
   deoplete-nvim = buildVimPluginFrom2Nix {
     pname = "deoplete-nvim";
-    version = "2020-03-11";
+    version = "2020-03-18";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "494fcd8f311fb394d81921b63797e963c7d642a3";
-      sha256 = "101y83y8gq81rijnsmx8z6aznxczjpm1k8iahix606jvsg7znxgf";
+      rev = "db7d2dc5f416634c9917054bcd6e1e5d925bb4d7";
+      sha256 = "1d34zy81j47icsrnbxpp4x9f35ihrmd0lnd0vphi216kdlkxk37b";
     };
   };
 
@@ -1176,12 +1176,12 @@ let
 
   editorconfig-vim = buildVimPluginFrom2Nix {
     pname = "editorconfig-vim";
-    version = "2020-01-31";
+    version = "2020-03-15";
     src = fetchFromGitHub {
       owner = "editorconfig";
       repo = "editorconfig-vim";
-      rev = "21fbc2afe8f30e98b890fb42fc6bc18fc0c0380e";
-      sha256 = "1za9q891bxc355qn7v0wasnvf2j6pvhizbp6ycj411hjcw90jwns";
+      rev = "c5804257c6b38c5537b71ac91ed051c70eaeb5e5";
+      sha256 = "147cqfwzaxwc1fzvynwdvx1cvx6zziamcayrvacqxs7vzjnz8lx7";
       fetchSubmodules = true;
     };
   };
@@ -1344,12 +1344,12 @@ let
 
   fzf-vim = buildVimPluginFrom2Nix {
     pname = "fzf-vim";
-    version = "2020-03-15";
+    version = "2020-03-17";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
-      rev = "d16ddcf58dd5d99671474ab9a815c5599e377f4c";
-      sha256 = "1ca0fpp55qa1gk6ljfm98042fyz9xpmk2dhqn0pd5iz93kfgn0gy";
+      rev = "d4d36b412bdc53e8bdaf0e2714a2227f51781d68";
+      sha256 = "0wbq8ckgzw867qqwjzm48jnbgp7yjl1vim7nsyk1wjm2d8z0xjm9";
     };
   };
 
@@ -1377,12 +1377,12 @@ let
 
   ghcid = buildVimPluginFrom2Nix {
     pname = "ghcid";
-    version = "2020-03-15";
+    version = "2020-03-20";
     src = fetchFromGitHub {
       owner = "ndmitchell";
       repo = "ghcid";
-      rev = "67a947821e3742eb1b4a2267d4d59adbf74ecb02";
-      sha256 = "05ch1mxwhjd9ln49sp8xp5f6fgc19i2a9262lfi1kny7i1zrxmg1";
+      rev = "63b7813cac0e67cba1ace94b42ef1af291e35e47";
+      sha256 = "1p4blbngaxdlacmrqiyxw8y4d0jiws104np68d31mfnvqghylcdy";
     };
   };
 
@@ -1818,12 +1818,12 @@ let
 
   lightline-vim = buildVimPluginFrom2Nix {
     pname = "lightline-vim";
-    version = "2020-02-15";
+    version = "2020-03-16";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "lightline.vim";
-      rev = "e8577f3654cac97ee18faae28c80a2200aaaad5a";
-      sha256 = "15jw9qvj1dqqfnf52yqvs11r9hzw42aviz89q1gx6yqmvjd5py4v";
+      rev = "893bd90787abfec52a2543074e444fc6a9e0cf78";
+      sha256 = "0cgzkyhpr1p184yc9b3m259i5mnwdyj5zg80idywvv2gh8phw2y7";
     };
   };
 
@@ -2104,12 +2104,12 @@ let
 
   neoterm = buildVimPluginFrom2Nix {
     pname = "neoterm";
-    version = "2020-02-15";
+    version = "2020-03-16";
     src = fetchFromGitHub {
       owner = "kassio";
       repo = "neoterm";
-      rev = "dacbae9d844e678c785db7c9d7988df7a405e572";
-      sha256 = "03aah6lgygf7rj78kf4rh5hw593l4qi83ivh5amy9yw8lc630pjv";
+      rev = "ee8bba435bed2ecadafb97ff00c2b7b07eedc1b4";
+      sha256 = "190k2b0nzkkpakkfwbhmnh5q0b9vj882lvvnzw6dyiq5w5z59pxb";
     };
   };
 
@@ -2236,12 +2236,12 @@ let
 
   nvim-gdb = buildVimPluginFrom2Nix {
     pname = "nvim-gdb";
-    version = "2020-03-12";
+    version = "2020-03-17";
     src = fetchFromGitHub {
       owner = "sakhnik";
       repo = "nvim-gdb";
-      rev = "2388fd4a673ac26608c5db570950f3e4edf71ad4";
-      sha256 = "0a86l5yn120rn8kz6pfq4j9k9ix3cibysfp2d8rqjz6lndg56cmk";
+      rev = "9ea1cd2cd110a8efa40dc893036596b39f979a7a";
+      sha256 = "10qcs59r27fkzk0pg90gywbrz7y7b4hvavbws5kx6fjx3h2mbfsh";
     };
   };
 
@@ -2258,12 +2258,12 @@ let
 
   nvim-lsp = buildVimPluginFrom2Nix {
     pname = "nvim-lsp";
-    version = "2020-03-09";
+    version = "2020-03-19";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lsp";
-      rev = "78b16eb3623c1c0d4433ca8e09c2cb661fa1a852";
-      sha256 = "0fgj2yhfcdvpqs7012nwcinlndpfhzfzq9ac7kk0cib4m4vg1zxm";
+      rev = "6d5e81c71bb90568b3bf9ca061980b9b30cdbc15";
+      sha256 = "1va480pw7nk650bmh4z7rvr2a5sqd4q86y19341p6mj12p2r2fcv";
     };
   };
 
@@ -2313,12 +2313,12 @@ let
 
   open-browser-github-vim = buildVimPluginFrom2Nix {
     pname = "open-browser-github-vim";
-    version = "2020-02-08";
+    version = "2020-03-16";
     src = fetchFromGitHub {
       owner = "tyru";
       repo = "open-browser-github.vim";
-      rev = "cb1b3b957d391e15eac41a2c9695086472d6638f";
-      sha256 = "0sd72arqqk6kpr3mxdvdcqsb0lcf80gbswxzd5piafwidkmk7m5n";
+      rev = "db483ae17f02a8561e85b2071b90359a9a3bd18d";
+      sha256 = "09x9lfyi9gfhy4m1vp6z1kxpvi31rr8dnlqhh6fgskkziiqch3jw";
     };
   };
 
@@ -2467,12 +2467,12 @@ let
 
   quick-scope = buildVimPluginFrom2Nix {
     pname = "quick-scope";
-    version = "2020-03-09";
+    version = "2020-03-17";
     src = fetchFromGitHub {
       owner = "unblevable";
       repo = "quick-scope";
-      rev = "2a12d429144cf083382a87743c1cb658cd314309";
-      sha256 = "16cf9jdjkf7igqvf40snq71n52kpszdi76ijhxk03dxgycj0hfkb";
+      rev = "49b00ee08176636384c98690a4719565372f68b9";
+      sha256 = "0lsmrmjrhyi1rm4sp3hs9lhs8v8ff50zc1gy4bg6gsxw4c1ghl3q";
     };
   };
 
@@ -3051,12 +3051,12 @@ let
 
   ultisnips = buildVimPluginFrom2Nix {
     pname = "ultisnips";
-    version = "2020-03-02";
+    version = "2020-03-19";
     src = fetchFromGitHub {
       owner = "SirVer";
       repo = "ultisnips";
-      rev = "e910b4fb9e276d18ed140fc492f30967ef9ace59";
-      sha256 = "0fbrwmk4plg1zyz5vyay7jsj240l9p2ksjlp7yjs1g3l7qf71xxz";
+      rev = "ee31ea1c7d08ced8577120b4c1d55c5a05351a75";
+      sha256 = "01nm3d95qjd2v3j9ln7w52i8bn2fgi5zms9078832w1x4iyb1mwn";
     };
   };
 
@@ -3073,12 +3073,12 @@ let
 
   unicode-vim = buildVimPluginFrom2Nix {
     pname = "unicode-vim";
-    version = "2020-02-27";
+    version = "2020-03-18";
     src = fetchFromGitHub {
       owner = "chrisbra";
       repo = "unicode.vim";
-      rev = "582b715562c953ea9a1f043443f98793cfbc0d47";
-      sha256 = "1wjmdjn129d8p6nrx69xdrrzg05l930a5lfbrvhyic3aiqn5x1mf";
+      rev = "fc2e986f34dc6b21e80d54845a7b538003129feb";
+      sha256 = "0h76726rnqrdvmm9bpgnrli66rg18b2snw077wz0zvcz7g0l9a24";
     };
   };
 
@@ -3370,12 +3370,12 @@ let
 
   vim-airline = buildVimPluginFrom2Nix {
     pname = "vim-airline";
-    version = "2020-03-02";
+    version = "2020-03-20";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "4e2546a2098954b74cbc612f573826f13d6fb88e";
-      sha256 = "1z1xnvkaz1yjjq87kdyplx0zh0il0qkmr5lzwfq33jcnwlafz6xw";
+      rev = "119477060d55bb5de173b28f310d430af5593618";
+      sha256 = "0hgq13iigpk8cy0lyamaz135019qbxc5nckgv0363ilhk4k5ilrd";
     };
   };
 
@@ -3436,12 +3436,12 @@ let
 
   vim-autoformat = buildVimPluginFrom2Nix {
     pname = "vim-autoformat";
-    version = "2020-03-02";
+    version = "2020-03-18";
     src = fetchFromGitHub {
       owner = "Chiel92";
       repo = "vim-autoformat";
-      rev = "b757f58c67908772a17300cf853ed0da653edeb2";
-      sha256 = "0cl858hk7gaaxlj22d61mqiaypv76q85srskjay9s3px0mm5fanc";
+      rev = "80bda05d0f5383af0a09b9ca4a2918a23d372f60";
+      sha256 = "1dgqz73cprn2s3xpdfpyjq7bmwjpdrz8b3kf6mwkajgxjl89sv7m";
     };
   };
 
@@ -3700,12 +3700,12 @@ let
 
   vim-cursorword = buildVimPluginFrom2Nix {
     pname = "vim-cursorword";
-    version = "2020-03-10";
+    version = "2020-03-19";
     src = fetchFromGitHub {
       owner = "itchyny";
       repo = "vim-cursorword";
-      rev = "8e859e4c54fda0728e8f0b5cc4f61c7ff193083f";
-      sha256 = "0nq7x957xwz6fibb4m4daq2xp74n922lm46117lfhvpa0ii2rz0i";
+      rev = "b5f8a4b148b566626210d0c1f6b63036b62322bb";
+      sha256 = "0a4gznfxmg7a62xwk4mmjcxykcgmm7mh5vv7n5hskxjczdrvl400";
     };
   };
 
@@ -4118,12 +4118,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2020-03-15";
+    version = "2020-03-17";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "14382b346ea03615bfb03115679c8a48bbf03af2";
-      sha256 = "0ni9kjqb78jf98v1xwmg6r7inm7qifpf21hnp1n2i65mvnrc4afm";
+      rev = "f5d34f40d6757470f40600000c9c08de142d7ced";
+      sha256 = "0a2g8f9xza2m07qm4pcj2aqjh1yvs9cxn8f3zima06swfw2ahdh8";
     };
   };
 
@@ -4625,12 +4625,12 @@ let
 
   vim-maktaba = buildVimPluginFrom2Nix {
     pname = "vim-maktaba";
-    version = "2019-08-14";
+    version = "2020-03-20";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-maktaba";
-      rev = "ed4357d2caf1d04bd229a24191098759f94b2e25";
-      sha256 = "0zz048nbp2dc361g7zr3qdn1n506ym82d6igaz0qv37ani85fq6v";
+      rev = "b31525d7f6170c68f900abe24748ac9fbaf1ee4d";
+      sha256 = "0d6qss18dq36hvxv1if1aaylljsnp2isxajb5xh4zr4cxarrzbfi";
     };
   };
 
@@ -4867,12 +4867,12 @@ let
 
   vim-pandoc = buildVimPluginFrom2Nix {
     pname = "vim-pandoc";
-    version = "2020-03-13";
+    version = "2020-03-20";
     src = fetchFromGitHub {
       owner = "vim-pandoc";
       repo = "vim-pandoc";
-      rev = "9c12affb112cf5bdbc74f6492f019dec539756ee";
-      sha256 = "199mr1b740vd4rqjkpgwx539flyaqm7bi05fknzkyxizn8180xzw";
+      rev = "c473c298d570622d520f455698a95356e55d6dcf";
+      sha256 = "1j4plsm7md6yhis8bmgznwln12gnnm0lg9wvxgydqd6wxrc6hfnd";
     };
   };
 
@@ -5043,12 +5043,12 @@ let
 
   vim-ps1 = buildVimPluginFrom2Nix {
     pname = "vim-ps1";
-    version = "2020-03-12";
+    version = "2020-03-15";
     src = fetchFromGitHub {
       owner = "PProvost";
       repo = "vim-ps1";
-      rev = "2008b24c1d740543041d1de9fa4036a35cd21e16";
-      sha256 = "0q5njcfc4zlb2z5bzr5jsmqfqnp96c83pwwayfcms8sqczj2w13v";
+      rev = "2decf51f19834434e34f1a8d79056b7014120ca3";
+      sha256 = "1hph6w6mrlma96ys1nk9v46hscmplkpp2y7xq1ld2bnfs4wab3v8";
     };
   };
 
@@ -5351,12 +5351,12 @@ let
 
   vim-snippets = buildVimPluginFrom2Nix {
     pname = "vim-snippets";
-    version = "2020-03-11";
+    version = "2020-03-19";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "8eafafe246152c94b64149dd04d9e03b87527eac";
-      sha256 = "1mfw69283w3xk9kawn2ms160sjzmxpfdh4drdis27fg27i58yadd";
+      rev = "6e6b69fd5c12d4645225e7a3ba7d9f3414d83d25";
+      sha256 = "0hc914c74dy22nm9bx2qd37py8f2xf3ylnfr3v4lvbxpnlpahjjc";
     };
   };
 
@@ -5527,12 +5527,12 @@ let
 
   vim-test = buildVimPluginFrom2Nix {
     pname = "vim-test";
-    version = "2020-03-14";
+    version = "2020-03-17";
     src = fetchFromGitHub {
       owner = "janko-m";
       repo = "vim-test";
-      rev = "2e3516833137ffcf6f291854551cfe70c17b1752";
-      sha256 = "1hfksbai45c5ql9gvm1fqdfhakm2fvas59jyf71iddsfiha5vv2k";
+      rev = "d878e9d61f186140f18a7a8a8badc0605d8955ba";
+      sha256 = "06kihjif3g00bibx304vz22w2w9z84v0g6a55cxs1hqlc4ygnl8v";
     };
   };
 
@@ -5945,12 +5945,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2020-03-15";
+    version = "2020-03-17";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "51797cde25904e595da62513b818ab3abc9acd9e";
-      sha256 = "0dpcxqrv9jn7d0f2wnnqyj3069wfqg4h70qqqnlq07n4p8yj2rw1";
+      rev = "16b23314b31862510d3feb8a2569199062b083ac";
+      sha256 = "0vibfwsyamp4jqbaaa872m922yg89fx7k0cfa6kfhr5ks4vhpya5";
     };
   };
 
@@ -5989,12 +5989,12 @@ let
 
   vista-vim = buildVimPluginFrom2Nix {
     pname = "vista-vim";
-    version = "2020-03-15";
+    version = "2020-03-17";
     src = fetchFromGitHub {
       owner = "liuchengxu";
       repo = "vista.vim";
-      rev = "a1e19503ce2f27a98fd6c03202d0651891aadecf";
-      sha256 = "19xy5qxizhpnyaqvjayxpmc5hdfixdf84g4ilhagq7isd5l4a1cs";
+      rev = "e7b362fffe3a5d1f21bd560d0455e19ff8192997";
+      sha256 = "15nmls0m5hajh4k1kjibp299hdhyyjkcax44fmkjq51xlfb1nhc9";
     };
   };
 
@@ -6111,12 +6111,12 @@ let
 
   youcompleteme = buildVimPluginFrom2Nix {
     pname = "youcompleteme";
-    version = "2020-03-14";
+    version = "2020-03-18";
     src = fetchFromGitHub {
       owner = "valloric";
       repo = "youcompleteme";
-      rev = "3108b9bd4408b2af891eea179108bc9704e7263d";
-      sha256 = "0913d0mixhm24mhqgf3cca3p4hglsj23f85m4n4npksiqw91swla";
+      rev = "cf4a76acaeed27eb3ca1dca5adf1115b6abbcfa3";
+      sha256 = "0si9by2ag2f7xgxidp5215d6wkg1mdhq9j5c4icdpsly9gv3w5s8";
       fetchSubmodules = true;
     };
   };
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index a8bf2f56b2af..e4710e27193c 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -112,21 +112,6 @@ self: super: {
     '';
   });
 
-  vim-pandoc = super.vim-pandoc.overrideAttrs(old: {
-    patches = (super.patches or []) ++ [
-      # Fix a failure on startup, which breaks the rplugin manifest generation
-      # https://github.com/vim-pandoc/vim-pandoc/pull/363#issuecomment-599080366
-      (fetchpatch {
-        name = "fix-fdetect.patch";
-        url = "https://github.com/vim-pandoc/vim-pandoc/commit/da4c0b0325c1bfad20f7cfd15abb53943fe22fc4.patch";
-        revert = true;
-        # For some reason that part was already reverted upstream.
-        excludes = ["ftdetect/pandoc.vim"];
-        sha256 = "10nykgsqpxx5hlagk83khjl8p58zx7z3bcryzinv5vv52wlqkq5p";
-      })
-    ];
-  });
-
   clighter8 = super.clighter8.overrideAttrs(old: {
     preFixup = ''
       sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc.lib}/lib/libclang.so')|" \

From 4d57e56b713319c52e05b19351c5ae67ca27550e Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 20 Mar 2020 16:55:44 +0000
Subject: [PATCH 3476/4636] $toplevel/system: use kernel's architecture

`$toplevel/system` of a system closure with `x86_64` kernel and `i686` userland should contain "x86_64-linux".

If `$toplevel/system` contains "i686-linux", the closure will be run using `qemu-system-i386`, which is able to run `x86_64` kernel on most Intel CPU, but fails on AMD.

So this fix is for a rare case of `x86_64` kernel + `i686` userland + AMD CPU
---
 nixos/modules/system/activation/top-level.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 14bd751ce324..49693b6f1be0 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -75,7 +75,7 @@ let
       echo -n "$configurationName" > $out/configuration-name
       echo -n "systemd ${toString config.systemd.package.interfaceVersion}" > $out/init-interface-version
       echo -n "$nixosLabel" > $out/nixos-version
-      echo -n "${pkgs.stdenv.hostPlatform.system}" > $out/system
+      echo -n "${config.boot.kernelPackages.stdenv.hostPlatform.system}" > $out/system
 
       mkdir $out/fine-tune
       childCount=0

From 4fa3bd1770f2a18c37c2216e91b8e18e60a1ae89 Mon Sep 17 00:00:00 2001
From: Piotr Szegda <piotrszegda@protonmail.com>
Date: Fri, 20 Mar 2020 18:02:14 +0100
Subject: [PATCH 3477/4636] keybase,kbfs,keybase-gui: 5.3.0 -> 5.3.1

---
 pkgs/tools/security/keybase/default.nix | 4 ++--
 pkgs/tools/security/keybase/gui.nix     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index da4b9c99e20b..6f2eaf577011 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -6,7 +6,7 @@
 
 buildGoPackage rec {
   pname = "keybase";
-  version = "5.3.0";
+  version = "5.3.1";
 
   goPackagePath = "github.com/keybase/client";
   subPackages = [ "go/kbnm" "go/keybase" ];
@@ -17,7 +17,7 @@ buildGoPackage rec {
     owner = "keybase";
     repo = "client";
     rev = "v${version}";
-    sha256 = "0xqqzjlvq9sgjx1jzv0w2ls0365xzfh4iapzqkrqka635xfggwcn";
+    sha256 = "1a1h2c8jr4r20w4gyvyrpsslmh69bl8syl3jbr0fcr2kka7vqnzg";
   };
 
   patches = [
diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix
index 0573391139b8..0a5855b20605 100644
--- a/pkgs/tools/security/keybase/gui.nix
+++ b/pkgs/tools/security/keybase/gui.nix
@@ -4,16 +4,16 @@
 , runtimeShell, gsettings-desktop-schemas }:
 
 let
-  versionSuffix = "20200310205642.4f2689009b";
+  versionSuffix = "20200320154633.3e235215b3";
 in
 
 stdenv.mkDerivation rec {
   pname = "keybase-gui";
-  version = "5.3.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
+  version = "5.3.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages
 
   src = fetchurl {
     url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb";
-    sha256 = "0zasw2dk33k6c6xqsjnyz3b3s1j27vza9alkp0hpvds88mnnmjv1";
+    sha256 = "00k1xg27arbqpa836c55fhkxjvjbhjgkf6jqzprjzz76zksfdcx4";
   };
 
   nativeBuildInputs = [

From baa4798f567cba95f1efdee08f93d8e69ab434a1 Mon Sep 17 00:00:00 2001
From: Dominik Honnef <dominik@honnef.co>
Date: Fri, 20 Mar 2020 20:02:21 +0100
Subject: [PATCH 3478/4636] epkowa: add dominikh as maintainer

---
 maintainers/maintainer-list.nix      | 6 ++++++
 pkgs/misc/drivers/epkowa/default.nix | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ea498f582595..7eaf8513d398 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1925,6 +1925,12 @@
     githubId = 126339;
     name = "Domen Kozar";
   };
+  dominikh = {
+    email = "dominik@honnef.co";
+    github = "dominikh";
+    githubId = 39825;
+    name = "Dominik Honnef";
+  };
   doronbehar = {
     email = "me@doronbehar.com";
     github = "doronbehar";
diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix
index 964618f1fc66..ecf79a953fe3 100644
--- a/pkgs/misc/drivers/epkowa/default.nix
+++ b/pkgs/misc/drivers/epkowa/default.nix
@@ -311,6 +311,6 @@ stdenv.mkDerivation rec {
       Supported hardware: at least :
     '' +
     stdenv.lib.concatStringsSep ", " (stdenv.lib.mapAttrsToList (name: value: value.passthru.hw) plugins);
-    maintainers = with stdenv.lib.maintainers; [ symphorien ];
+    maintainers = with stdenv.lib.maintainers; [ symphorien dominikh ];
   };
 }

From 899629ba4897bf84872ee8fa737eee37f1e22278 Mon Sep 17 00:00:00 2001
From: Jared Tobin <jared@jtobin.io>
Date: Sat, 14 Mar 2020 17:41:34 +0900
Subject: [PATCH 3479/4636] secp256k1-haskell: unbreak via override

This library simply needs libsecp256k1 in its pkgconfig-depends.
---
 .../development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 pkgs/development/haskell-modules/configuration-nix.nix         | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 3c6845705336..e0350c7a2e40 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -9072,7 +9072,6 @@ broken-packages:
   - seclib
   - second-transfer
   - secp256k1
-  - secp256k1-haskell
   - secp256k1-legacy
   - secret-santa
   - secret-sharing
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 5824ce2f5e6d..ff1c01aa8e87 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -498,6 +498,9 @@ self: super: builtins.intersectAttrs super {
   # requires autotools to build
   secp256k1 = addBuildTools super.secp256k1 [ pkgs.buildPackages.autoconf pkgs.buildPackages.automake pkgs.buildPackages.libtool ];
 
+  # requires libsecp256k1 in pkgconfig-depends
+  secp256k1-haskell = addPkgconfigDepend super.secp256k1-haskell pkgs.secp256k1;
+
   # tests require git and zsh
   hapistrano = addBuildTools super.hapistrano [ pkgs.buildPackages.git pkgs.buildPackages.zsh ];
 

From 6d071e74596af84e4fba29c83650a34bae467b44 Mon Sep 17 00:00:00 2001
From: Jared Tobin <jared@jtobin.io>
Date: Sat, 14 Mar 2020 18:03:53 +0900
Subject: [PATCH 3480/4636] haskoin-core: remove from broken packages list

e1408eb661 unbreaks secp256k1-haskell, which was the cause of this
package's failure to build.
---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index e0350c7a2e40..d03c6ae19f9c 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -5602,7 +5602,6 @@ broken-packages:
   - haskmon
   - haskoin
   - haskoin-bitcoind
-  - haskoin-core
   - haskoin-crypto
   - haskoin-node
   - haskoin-protocol

From 8c4479e3dd766ca74d5ac8756ea1cf6e8712ea65 Mon Sep 17 00:00:00 2001
From: Robert Kreuzer <robert.kreuzer@gmail.com>
Date: Thu, 6 Feb 2020 09:17:22 +0100
Subject: [PATCH 3481/4636] maintainers: add rkrzr

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ea498f582595..64c71d96702c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6219,6 +6219,12 @@
     githubId = 2507744;
     name = "Roland Koebler";
   };
+  rkrzr = {
+    email = "ops+nixpkgs@channable.com";
+    github = "rkrzr";
+    githubId = 82817;
+    name = "Robert Kreuzer";
+  };
   rlupton20 = {
     email = "richard.lupton@gmail.com";
     github = "rlupton20";

From 8aee4f4eeb0d9eba68428953bf8a9607e5579e42 Mon Sep 17 00:00:00 2001
From: Robert Kreuzer <robert.kreuzer@gmail.com>
Date: Sun, 16 Feb 2020 16:24:52 +0100
Subject: [PATCH 3482/4636] icepeak: init at 0.7.2

---
 pkgs/top-level/all-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b78ce32b1090..4b1d39324010 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4175,6 +4175,8 @@ in
 
   icecast = callPackage ../servers/icecast { };
 
+  icepeak = haskellPackages.icepeak;
+
   iceshelf = callPackage ../tools/backup/iceshelf { };
 
   darkice = callPackage ../tools/audio/darkice { };

From 9b931dc86a593f8757b1716e1285699ff4853f18 Mon Sep 17 00:00:00 2001
From: Robert Kreuzer <robert.kreuzer@gmail.com>
Date: Thu, 5 Mar 2020 18:36:02 +0100
Subject: [PATCH 3483/4636] icepeak: use haskell.lib.justStaticExecutables

Also, add myself to the maintainers section for Haskell modules coming
from Hackage.
---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 ++
 pkgs/top-level/all-packages.nix                                 | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index d03c6ae19f9c..14408cfe2c6c 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2476,6 +2476,8 @@ package-maintainers:
     - purescript
     - spago
     - termonad
+  rkrzr:
+    - icepeak
 
 unsupported-platforms:
   alsa-mixer:                                   [ x86_64-darwin ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b1d39324010..901313d8e632 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4175,7 +4175,7 @@ in
 
   icecast = callPackage ../servers/icecast { };
 
-  icepeak = haskellPackages.icepeak;
+  icepeak = haskell.lib.justStaticExecutables haskellPackages.icepeak;
 
   iceshelf = callPackage ../tools/backup/iceshelf { };
 

From 920fdc012af2922fc91ed853a6cfd653b98dd266 Mon Sep 17 00:00:00 2001
From: Robert Kreuzer <robert.kreuzer@gmail.com>
Date: Sun, 15 Mar 2020 21:03:14 +0100
Subject: [PATCH 3484/4636] Mark icepeak and sqlite-simple as non-broken

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 14408cfe2c6c..12c242def968 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -6417,7 +6417,6 @@ broken-packages:
   - iban
   - ical
   - iCalendar
-  - icepeak
   - IcoGrid
   - iconv-typed
   - ide-backend
@@ -9537,7 +9536,6 @@ broken-packages:
   - sql-simple-sqlite
   - sqlcipher
   - sqlite
-  - sqlite-simple
   - sqlite-simple-errors
   - sqlite-simple-typed
   - sqlvalue-list

From bf42ec029750398052b6a8f14d51b72c76531a9e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 18 Mar 2020 13:40:58 +0100
Subject: [PATCH 3485/4636] LTS Haskell 15.4

---
 .../configuration-hackage2nix.yaml            | 39 +++++++++----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 12c242def968..36ab6dd6e110 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -76,7 +76,7 @@ default-package-overrides:
   # gi-gdkx11-4.x requires gtk-4.x, which is still under development and
   # not yet available in Nixpkgs
   - gi-gdkx11 < 4
-  # LTS Haskell 15.3
+  # LTS Haskell 15.4
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Angle ==1.0
@@ -786,7 +786,6 @@ default-package-overrides:
   - function-builder ==0.3.0.1
   - functor-classes-compat ==1
   - fused-effects ==1.0.2.0
-  - fusion-plugin ==0.1.1
   - fusion-plugin-types ==0.1.0
   - fuzzcheck ==0.1.1
   - fuzzy ==0.1.0.0
@@ -835,12 +834,12 @@ default-package-overrides:
   - ghc-compact ==0.1.0.0
   - ghc-core ==0.5.6
   - ghc-exactprint ==0.6.2
-  - ghcid ==0.8.1
+  - ghcid ==0.8.3
   - ghci-hexcalc ==0.1.1.0
   - ghcjs-codemirror ==0.0.0.2
   - ghc-lib ==8.8.3.20200224
   - ghc-lib-parser ==8.8.3.20200224
-  - ghc-lib-parser-ex ==8.8.5.3
+  - ghc-lib-parser-ex ==8.8.5.6
   - ghc-paths ==0.1.0.12
   - ghc-prof ==1.4.1.6
   - ghc-source-gen ==0.3.0.0
@@ -848,7 +847,7 @@ default-package-overrides:
   - ghc-tcplugins-extra ==0.4
   - ghc-typelits-extra ==0.3.3
   - ghc-typelits-knownnat ==0.7.2
-  - ghc-typelits-natnormalise ==0.7.1
+  - ghc-typelits-natnormalise ==0.7.2
   - ghc-typelits-presburger ==0.3.0.0
   - ghost-buster ==0.1.1.0
   - gi-atk ==2.0.21
@@ -935,6 +934,7 @@ default-package-overrides:
   - HaXml ==1.25.5
   - haxr ==3000.11.4
   - hdaemonize ==0.5.6
+  - headroom ==0.1.2.0
   - heap ==1.0.4
   - heaps ==0.3.6.1
   - heart-core ==0.1.1
@@ -1038,14 +1038,14 @@ default-package-overrides:
   - http2 ==2.0.3
   - HTTP ==4000.3.14
   - http-api-data ==0.4.1.1
-  - http-client ==0.6.4
+  - http-client ==0.6.4.1
   - http-client-openssl ==0.3.0.0
   - http-client-overrides ==0.1.1.0
   - http-client-tls ==0.3.5.3
   - http-common ==0.8.2.0
   - http-conduit ==2.3.7.3
   - http-date ==0.0.8
-  - http-directory ==0.1.7
+  - http-directory ==0.1.8
   - http-download ==0.1.0.1
   - httpd-shed ==0.4.1.1
   - http-link-header ==1.0.3.1
@@ -1060,7 +1060,7 @@ default-package-overrides:
   - hvect ==0.4.0.0
   - hvega ==0.5.0.0
   - hw-balancedparens ==0.3.0.5
-  - hw-bits ==0.7.1.2
+  - hw-bits ==0.7.1.5
   - hw-conduit ==0.2.0.6
   - hw-conduit-merges ==0.2.0.0
   - hw-diagnostics ==0.0.0.7
@@ -1101,7 +1101,6 @@ default-package-overrides:
   - hybrid-vectors ==0.2.2
   - hyperloglog ==0.4.3
   - hyphenation ==0.8
-  - hyraxAbif ==0.2.3.21
   - iconv ==0.4.1.3
   - identicon ==0.2.2
   - ieee754 ==0.8.0
@@ -1113,7 +1112,7 @@ default-package-overrides:
   - Imlib ==0.1.2
   - immortal ==0.3
   - include-file ==0.1.0.4
-  - incremental-parser ==0.4
+  - incremental-parser ==0.4.0.1
   - indents ==0.5.0.1
   - indexed ==0.1.3
   - indexed-list-literals ==0.2.1.2
@@ -1403,7 +1402,7 @@ default-package-overrides:
   - mysql-simple ==0.4.5
   - n2o ==0.11.1
   - nagios-check ==0.3.2
-  - names-th ==0.3.0.0
+  - names-th ==0.3.0.1
   - nano-erl ==0.1.0.1
   - nanospec ==0.2.2
   - nats ==1.1.2
@@ -1421,7 +1420,7 @@ default-package-overrides:
   - nettle ==0.3.0
   - netwire ==5.0.3
   - netwire-input ==0.0.7
-  - netwire-input-glfw ==0.0.10
+  - netwire-input-glfw ==0.0.11
   - network ==3.1.1.1
   - network-bsd ==2.8.1.0
   - network-byte-order ==0.1.4.0
@@ -1845,7 +1844,7 @@ default-package-overrides:
   - servant-swagger-ui-redoc ==0.3.3.1.22.3
   - servant-websockets ==2.0.0
   - servant-yaml ==0.1.0.1
-  - serverless-haskell ==0.10.1
+  - serverless-haskell ==0.10.2
   - serversession ==1.0.1
   - serversession-frontend-wai ==1.0
   - ses-html ==0.4.0.0
@@ -1914,15 +1913,15 @@ default-package-overrides:
   - special-values ==0.1.0.0
   - speculate ==0.4.1
   - speedy-slice ==0.3.0
-  - Spintax ==0.3.3
+  - Spintax ==0.3.4
   - splice ==0.6.1.1
   - split ==0.2.3.4
   - splitmix ==0.0.4
   - spoon ==0.3.1
   - spreadsheet ==0.1.3.8
-  - sql-words ==0.1.6.3
+  - sql-words ==0.1.6.4
   - srcloc ==0.5.1.2
-  - stache ==2.1.0
+  - stache ==2.1.1
   - stack-templatizer ==0.1.0.2
   - starter ==0.3.0
   - stateref ==0.3
@@ -2081,7 +2080,7 @@ default-package-overrides:
   - thyme ==0.3.5.5
   - tidal ==1.4.8
   - tile ==0.3.0.0
-  - time-compat ==1.9.2.2
+  - time-compat ==1.9.3
   - timeit ==2.0
   - timelens ==0.2.0.2
   - time-lens ==0.4.0.2
@@ -2126,7 +2125,7 @@ default-package-overrides:
   - tuples-homogenous-h98 ==0.1.1.0
   - tuple-sop ==0.3.1.0
   - tuple-th ==0.2.5
-  - turtle ==1.5.16
+  - turtle ==1.5.17
   - TypeCompose ==0.9.14
   - typed-process ==0.2.6.0
   - typed-uuid ==0.0.0.2
@@ -2239,7 +2238,7 @@ default-package-overrides:
   - wai-app-static ==3.1.7.1
   - wai-conduit ==3.0.0.4
   - wai-cors ==0.2.7
-  - wai-enforce-https ==0.0.2
+  - wai-enforce-https ==0.0.2.1
   - wai-eventsource ==3.0.0
   - wai-extra ==3.0.29.1
   - wai-handler-launch ==3.0.3.1
@@ -2319,7 +2318,7 @@ default-package-overrides:
   - xss-sanitize ==0.3.6
   - xturtle ==0.2.0.0
   - xxhash-ffi ==0.2.0.0
-  - yaml ==0.11.2.0
+  - yaml ==0.11.3.0
   - yesod ==1.6.0.1
   - yesod-auth ==1.6.9
   - yesod-auth-hashdb ==1.7.1.2

From 11bc4ee7484f3355d8a272ee55ae4452dd7ed42d Mon Sep 17 00:00:00 2001
From: Samuel Evans-Powell <mail@sevanspowell.net>
Date: Thu, 19 Mar 2020 08:52:41 +0800
Subject: [PATCH 3486/4636] tasty-tap: fix failing build

- tasty-tap's tests were failing. In
  https://github.com/NixOS/nixpkgs/pull/71017 a patch generated from a
  PR was applied to fix this.
- That PR has now been merged into tasty-tap and was released with
  version 0.1.0.
- tasty-tap is now at version 0.1.0 in nixpkgs and so the patch fails
  to apply, breaking the build.
- Removed the patch and removed tasty-tap from list of broken
  packages.
---
 pkgs/development/haskell-modules/configuration-common.nix  | 7 -------
 .../haskell-modules/configuration-hackage2nix.yaml         | 1 -
 2 files changed, 8 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 90819d64c339..1dae1dab133d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1254,13 +1254,6 @@ self: super: {
   # https://github.com/bitnomial/prometheus/issues/34
   prometheus = doJailbreak super.prometheus;
 
-  # Tasty-tap tests are out-of-date with TAP format
-  # https://github.com/MichaelXavier/tasty-tap/issues/2
-  tasty-tap = appendPatch super.tasty-tap (pkgs.fetchpatch {
-    url = https://patch-diff.githubusercontent.com/raw/MichaelXavier/tasty-tap/pull/3.diff;
-    sha256 = "0l8zbc56dy8ilxl3k49aiknmfhgpcg3jhs72lh3dk51d0a09d9sv";
-  });
-
   # The doctests in universum-1.5.0 are broken.  The doctests in versions of universum after
   # 1.5.0 should be fixed, so this should be able to be removed.
   universum = dontCheck super.universum;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 36ab6dd6e110..f9d52a63741a 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -9834,7 +9834,6 @@ broken-packages:
   - tasty-laws
   - tasty-lens
   - tasty-stats
-  - tasty-tap
   - tateti-tateti
   - Taxonomy
   - TaxonomyTools

From 049816b538b0cb7a4061fe58c3fb815fbc8133cc Mon Sep 17 00:00:00 2001
From: Samuel Evans-Powell <mail@sevanspowell.net>
Date: Thu, 19 Mar 2020 09:00:50 +0800
Subject: [PATCH 3487/4636] Remove "ekg-core" and "ekg-prometheus-adapter" from
 broken pkgs

- "ekg-core" and "ekg-prometheus-adapter" are no longer broken.
  Removed them from broken packages list.
---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index f9d52a63741a..68a23cac475c 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -4409,13 +4409,11 @@ broken-packages:
   - ekg-bosun
   - ekg-carbon
   - ekg-cloudwatch
-  - ekg-core
   - ekg-elastic
   - ekg-elasticsearch
   - ekg-influxdb
   - ekg-json
   - ekg-log
-  - ekg-prometheus-adapter
   - ekg-push
   - ekg-rrd
   - ekg-statsd

From effc9fa337788cb467a98547fe274930a16b3c57 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Mar 2020 20:06:57 +0100
Subject: [PATCH 3488/4636] hackage2nix: update list of broken packages

Ping @cdepillabout because purescript is broken.
Ping @kiwi because matterhorn is broken.
Ping @roberth because arion-compose is broken.
Ping @psibi because persistent-postgresql is broken.
---
 .../configuration-hackage2nix.yaml            | 58 +++++++++++++++++--
 1 file changed, 53 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 68a23cac475c..f0717b3514f6 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2457,22 +2457,17 @@ package-maintainers:
     - streaming-wai
   kiwi:
     # - glirc
-    - matterhorn
     - Unique
   psibi:
     - path-pieces
     - persistent
-    - persistent-postgresql
     - persistent-sqlite
     - persistent-template
     - shakespeare
   abbradar:
     - Agda
-  roberth:
-    - arion-compose
   cdepillabout:
     - pretty-simple
-    - purescript
     - spago
     - termonad
   rkrzr:
@@ -2743,6 +2738,7 @@ broken-packages:
   - alex-prelude
   - alfred
   - alga
+  - algebra-checkers
   - algebra-dag
   - algebra-sql
   - algebraic
@@ -2848,6 +2844,7 @@ broken-packages:
   - arbor-monad-metric
   - arbor-monad-metric-datadog
   - arbtt
+  - archive-libarchive
   - archive-tar-bytestring
   - archiver
   - archlinux
@@ -2863,6 +2860,7 @@ broken-packages:
   - arguedit
   - ariadne
   - arion
+  - arion-compose
   - armada
   - armor
   - arpa
@@ -2922,6 +2920,7 @@ broken-packages:
   - atomic-primops-vector
   - atomo
   - atp-haskell
+  - ats-pkg
   - ats-setup
   - ats-storable
   - attempt
@@ -2970,15 +2969,26 @@ broken-packages:
   - awesomium-raw
   - aws-configuration-tools
   - aws-dynamodb-conduit
+  - aws-dynamodb-streams
+  - aws-easy
+  - aws-ec2
   - aws-ec2-knownhosts
   - aws-elastic-transcoder
+  - aws-general
+  - aws-kinesis
   - aws-kinesis-client
   - aws-kinesis-reshard
+  - aws-lambda
+  - aws-lambda-haskell-runtime
   - aws-mfa-credentials
   - aws-performance-tests
+  - aws-route53
   - aws-sdk
+  - aws-sdk-text-converter
+  - aws-sdk-xml-unordered
   - aws-sign4
   - aws-simple
+  - aws-sns
   - axel
   - axiom
   - azubi
@@ -3102,6 +3112,7 @@ broken-packages:
   - binary-tagged
   - binary-typed
   - bind-marshal
+  - BinderAnn
   - binding-core
   - binding-gtk
   - binding-wx
@@ -3495,6 +3506,7 @@ broken-packages:
   - cgrep
   - chalkboard
   - chalkboard-viewer
+  - character-cases
   - charade
   - chart-cli
   - Chart-fltkhs
@@ -3728,6 +3740,7 @@ broken-packages:
   - concurrent-buffer
   - Concurrent-Cache
   - concurrent-machines
+  - concurrent-resource-map
   - concurrent-state
   - concurrent-utilities
   - Concurrential
@@ -3750,6 +3763,10 @@ broken-packages:
   - conduit-vfs-zip
   - conf
   - confcrypt
+  - conferer-hedis
+  - conferer-provider-dhall
+  - conferer-provider-yaml
+  - conferer-snap
   - confetti
   - conffmt
   - confide
@@ -3852,6 +3869,7 @@ broken-packages:
   - cparsing
   - CPBrainfuck
   - cpio-conduit
+  - cpkg
   - CPL
   - cplusplus-th
   - cprng-aes-effect
@@ -4151,6 +4169,7 @@ broken-packages:
   - dhall-nix
   - dhall-text
   - dhall-to-cabal
+  - dhall-yaml
   - dhcp-lease-parser
   - dhrun
   - dia-base
@@ -4285,6 +4304,7 @@ broken-packages:
   - doublify-toolkit
   - dow
   - download-media-content
+  - downloader
   - dozenal
   - dozens
   - DP
@@ -4909,6 +4929,7 @@ broken-packages:
   - funspection
   - fused-effects-squeal
   - fusion
+  - fusion-plugin
   - futun
   - future
   - fuzzy-time-gen
@@ -5029,6 +5050,7 @@ broken-packages:
   - ghc-srcspan-plugin
   - ghc-syb
   - ghc-syb-utils
+  - ghc-tags-plugin
   - ghc-time-alloc-prof
   - ghc-usage
   - ghc-vis
@@ -5642,11 +5664,13 @@ broken-packages:
   - hasql-generic
   - hasql-implicits
   - hasql-migration
+  - hasql-notifications
   - hasql-optparse-applicative
   - hasql-pool
   - hasql-postgres
   - hasql-postgres-options
   - hasql-simple
+  - hasql-th
   - hastache
   - hastache-aeson
   - haste
@@ -5729,6 +5753,7 @@ broken-packages:
   - hdph-closure
   - hdr-histogram
   - HDRUtils
+  - headed-megaparsec
   - headergen
   - headroom
   - heapsort
@@ -5923,6 +5948,9 @@ broken-packages:
   - HLearn-datastructures
   - HLearn-distributions
   - hledger-api
+  - hledger-chart
+  - hledger-irr
+  - hledger-vty
   - hlibBladeRF
   - hlibev
   - hlibfam
@@ -6976,6 +7004,7 @@ broken-packages:
   - lhe
   - lhs2TeX-hl
   - lhslatex
+  - libarchive
   - LibClang
   - libconfig
   - libcspm
@@ -7201,6 +7230,7 @@ broken-packages:
   - lzma-streams
   - maam
   - mac
+  - macaroon-shop
   - macbeth-lib
   - machinecell
   - machines-amazonka
@@ -7291,6 +7321,9 @@ broken-packages:
   - matrix-as-xyz
   - matrix-market
   - matsuri
+  - matterhorn
+  - mattermost-api
+  - mattermost-api-qc
   - maude
   - maxent
   - maxent-learner-hw
@@ -7882,7 +7915,9 @@ broken-packages:
   - oidc-client
   - ois-input-manager
   - olwrapper
+  - om-actor
   - om-elm
+  - om-fail
   - omaketex
   - ombra
   - Omega
@@ -7919,7 +7954,9 @@ broken-packages:
   - opensoundcontrol-ht
   - openssh-github-keys
   - openssh-protocol
+  - opentelemetry-http-client
   - opentelemetry-lightstep
+  - opentelemetry-wai
   - opentheory-char
   - opentok
   - opentype
@@ -8154,6 +8191,7 @@ broken-packages:
   - persistent-migration
   - persistent-mongoDB
   - persistent-mysql-haskell
+  - persistent-postgresql
   - persistent-protobuf
   - persistent-ratelimit
   - persistent-redis
@@ -8496,6 +8534,7 @@ broken-packages:
   - pure-priority-queue
   - pure-priority-queue-tests
   - purebred-email
+  - purescript
   - purescript-iso
   - purescript-tsd-gen
   - push-notifications
@@ -8842,6 +8881,7 @@ broken-packages:
   - rethinkdb-client-driver
   - rethinkdb-model
   - rethinkdb-wereHamster
+  - retrie
   - retryer
   - reverse-geocoding
   - reversi
@@ -8871,6 +8911,7 @@ broken-packages:
   - ring-buffer
   - ring-buffers
   - riot
+  - risc-v
   - risc386
   - riscv-isa
   - Ritt-Wu
@@ -8927,6 +8968,7 @@ broken-packages:
   - rpc-framework
   - rpf
   - rpm
+  - rrule
   - rsagl
   - rsagl-frp
   - rsagl-math
@@ -8958,6 +9000,7 @@ broken-packages:
   - safe-failure-cme
   - safe-freeze
   - safe-globals
+  - safe-json
   - safe-lazy-io
   - safe-length
   - safe-money-xmlbf
@@ -9096,6 +9139,7 @@ broken-packages:
   - sendgrid-v3
   - sensei
   - sensenet
+  - sensu-run
   - sentence-jp
   - sentry
   - seonbi
@@ -9209,6 +9253,7 @@ broken-packages:
   - sha-streams
   - shade
   - shadower
+  - shake-bindist
   - shake-cabal-build
   - shake-extras
   - shake-minify
@@ -9326,6 +9371,7 @@ broken-packages:
   - skews
   - skulk
   - skylark-client
+  - skylighting-lucid
   - skype4hs
   - slack
   - slack-notify-haskell
@@ -10074,6 +10120,7 @@ broken-packages:
   - traced
   - tracetree
   - tracing
+  - tracked-files
   - tracker
   - trackit
   - traction
@@ -10375,6 +10422,7 @@ broken-packages:
   - validate-input
   - validated-types
   - Validation
+  - validation-selective
   - validations
   - validationt
   - value-supply

From 7ac3b76a9d8bdf1cf759c012c4e95d7875647b28 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 16 Mar 2020 02:30:49 +0100
Subject: [PATCH 3489/4636] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/c8058db7cda6823f797ee1aaec97a656cfec1b9d.
---
 .../haskell-modules/hackage-packages.nix      | 1797 ++++++++++-------
 1 file changed, 1112 insertions(+), 685 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 2caf04f479a1..5d7e04c71354 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -794,26 +794,26 @@ self: {
   "Agda" = callPackage
     ({ mkDerivation, aeson, alex, array, async, base, binary
      , blaze-html, boxes, bytestring, Cabal, containers, data-hash
-     , deepseq, directory, EdisonCore, edit-distance, emacs, equivalence
-     , exceptions, filepath, geniplate-mirror, gitrev, happy, hashable
+     , deepseq, directory, edit-distance, emacs, equivalence, exceptions
+     , filepath, geniplate-mirror, ghc-compact, gitrev, happy, hashable
      , hashtables, haskeline, ieee754, mtl, murmur-hash, pretty, process
      , regex-tdfa, split, stm, strict, template-haskell, text, time
-     , unordered-containers, uri-encode, zlib
+     , transformers, unordered-containers, uri-encode, zlib
      }:
      mkDerivation {
        pname = "Agda";
-       version = "2.6.0.1";
-       sha256 = "1s600ry1qwizr3ynyj05rvlx7jdcw9a1viyc0ycjamm5sjf8mf3v";
+       version = "2.6.1";
+       sha256 = "0af1nyyscdc4gr4l0k3ayq3rn8qxqkx1b7rh4mw023gkz1m433v7";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal directory filepath process ];
        libraryHaskellDepends = [
          aeson array async base binary blaze-html boxes bytestring
-         containers data-hash deepseq directory EdisonCore edit-distance
-         equivalence exceptions filepath geniplate-mirror gitrev hashable
+         containers data-hash deepseq directory edit-distance equivalence
+         exceptions filepath geniplate-mirror ghc-compact gitrev hashable
          hashtables haskeline ieee754 mtl murmur-hash pretty process
-         regex-tdfa split stm strict template-haskell text time
+         regex-tdfa split stm strict template-haskell text time transformers
          unordered-containers uri-encode zlib
        ];
        libraryToolDepends = [ alex happy ];
@@ -1484,6 +1484,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "BinderAnn" = callPackage
+    ({ mkDerivation, base, containers, ghc, ghc-prim, mtl, split, syb
+     , transformers
+     }:
+     mkDerivation {
+       pname = "BinderAnn";
+       version = "0.1.0.0";
+       sha256 = "0fv5xrgqh7scbkzjisrh112zpggwl3rxfjzfqhx2rzdjgda3m41g";
+       libraryHaskellDepends = [
+         base containers ghc ghc-prim mtl split syb transformers
+       ];
+       testHaskellDepends = [
+         base containers ghc ghc-prim mtl split syb transformers
+       ];
+       description = "Source-to-source plugin for enhancing EDSLs with static annotations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "Binpack" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -8007,8 +8027,8 @@ self: {
      }:
      mkDerivation {
        pname = "HExcel";
-       version = "0.1.0.0";
-       sha256 = "1g761qaqijwsnwinhbk44m967myz7iz8qfz60vhh9fljv89afifg";
+       version = "0.1.0.1";
+       sha256 = "0pa33yh2sqslhdr94bi17kysmf0j3gqhplcxrcafgip2gab9j626";
        libraryHaskellDepends = [
          base microlens microlens-th time transformers
        ];
@@ -10753,8 +10773,8 @@ self: {
      }:
      mkDerivation {
        pname = "HsWebots";
-       version = "0.1.1.2";
-       sha256 = "02nm89dwm43yg5a99n9x72jf2y61rshqk6ka52s13qsg6d0bvhzv";
+       version = "0.1.1.3";
+       sha256 = "0ddbg63wfjwmrziaq0472iz7yhlcfsh2hrjqj02r1qavba35hzwa";
        libraryHaskellDepends = [
          base bytestring inline-c inline-c-cpp JuicyPixels safe-exceptions
          template-haskell vector
@@ -18405,19 +18425,6 @@ self: {
      }) {};
 
   "Spintax" = callPackage
-    ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }:
-     mkDerivation {
-       pname = "Spintax";
-       version = "0.3.3";
-       sha256 = "04vb07r26p4rxgsym5zhqsnyx4sr2a112sa31mdda5hjpy9j3pr1";
-       libraryHaskellDepends = [
-         attoparsec base extra mtl mwc-random text
-       ];
-       description = "Random text generation based on spintax";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Spintax_0_3_4" = callPackage
     ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }:
      mkDerivation {
        pname = "Spintax";
@@ -18428,7 +18435,6 @@ self: {
        ];
        description = "Random text generation based on spintax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Spock" = callPackage
@@ -23449,6 +23455,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aeson_1_4_7_0" = callPackage
+    ({ mkDerivation, attoparsec, base, base-compat
+     , base-compat-batteries, base-orphans, base16-bytestring
+     , bytestring, containers, deepseq, Diff, directory, dlist, filepath
+     , generic-deriving, ghc-prim, hashable, hashable-time
+     , integer-logarithms, primitive, QuickCheck, quickcheck-instances
+     , scientific, tagged, tasty, tasty-golden, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, th-abstraction, time
+     , time-compat, unordered-containers, uuid-types, vector
+     }:
+     mkDerivation {
+       pname = "aeson";
+       version = "1.4.7.0";
+       sha256 = "15ykkxa636jnx1zcyq4yxgjz78m5fp315gg0llbjf44jk4fbhndh";
+       libraryHaskellDepends = [
+         attoparsec base base-compat-batteries bytestring containers deepseq
+         dlist ghc-prim hashable primitive scientific tagged
+         template-haskell text th-abstraction time time-compat
+         unordered-containers uuid-types vector
+       ];
+       testHaskellDepends = [
+         attoparsec base base-compat base-orphans base16-bytestring
+         bytestring containers Diff directory dlist filepath
+         generic-deriving ghc-prim hashable hashable-time integer-logarithms
+         QuickCheck quickcheck-instances scientific tagged tasty
+         tasty-golden tasty-hunit tasty-quickcheck template-haskell text
+         time time-compat unordered-containers uuid-types vector
+       ];
+       description = "Fast JSON parsing and encoding";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-applicative" = callPackage
     ({ mkDerivation, aeson, base, text, unordered-containers }:
      mkDerivation {
@@ -23874,8 +23913,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-match-qq";
-       version = "1.1.0";
-       sha256 = "0qkj38b05klzwrgy0vyr9qnkllzz9v225b3d60f6mbx3q3nxdk9x";
+       version = "1.2.0";
+       sha256 = "000dna5xs5ybhr4vyla6ndj7ykk7lphg4dbcp7nn13746fnnggs2";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring either haskell-src-meta scientific
          template-haskell text unordered-containers vector
@@ -25142,6 +25181,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "algebra-checkers" = callPackage
+    ({ mkDerivation, ansi-terminal, base, checkers, containers, groups
+     , mtl, pretty, QuickCheck, syb, template-haskell
+     , th-instance-reification, transformers
+     }:
+     mkDerivation {
+       pname = "algebra-checkers";
+       version = "0.1.0.0";
+       sha256 = "0phrm0lncqbjqsyxhk3ifmzfb2q42v6g81qklh49n1y73naykg9v";
+       libraryHaskellDepends = [
+         ansi-terminal base checkers containers groups mtl pretty QuickCheck
+         syb template-haskell th-instance-reification transformers
+       ];
+       description = "Model and test API surfaces algebraically";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "algebra-dag" = callPackage
     ({ mkDerivation, aeson, base, containers, fgl, mtl, parsec
      , template-haskell, transformers
@@ -31071,14 +31129,16 @@ self: {
      }:
      mkDerivation {
        pname = "archive-libarchive";
-       version = "0.2.2.1";
-       sha256 = "1rwvz196m837h5vxm7aqlyzc07h2y2q0czgpn8kwx2gjngpnmmdn";
+       version = "0.2.2.2";
+       sha256 = "12a7rvzbywz5kh403q0q612z1f2arb74jgjx9qk1vdhiyasgwnkh";
        libraryHaskellDepends = [
          base bytestring composition-prelude libarchive
        ];
        libraryToolDepends = [ cpphs ];
        description = "Common interface using libarchive";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "archive-sig" = callPackage
@@ -31431,8 +31491,8 @@ self: {
      }:
      mkDerivation {
        pname = "arion-compose";
-       version = "0.1.0.0";
-       sha256 = "11jg7y6gcgsm7pidqnpxi4smd5dbm7fnqw79pcqx60z32b0b99iz";
+       version = "0.1.1.0";
+       sha256 = "0d90m39gir2371wgjkkmb7yrqr92zncjr6naz68r64a9mq38ga90";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -31450,7 +31510,8 @@ self: {
        ];
        description = "Run docker-compose with help from Nix/NixOS";
        license = stdenv.lib.licenses.asl20;
-       maintainers = with stdenv.lib.maintainers; [ roberth ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "arith-encode" = callPackage
@@ -33415,6 +33476,8 @@ self: {
        doHaddock = false;
        description = "A build tool for ATS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ats-setup" = callPackage
@@ -34322,6 +34385,17 @@ self: {
        broken = true;
      }) {};
 
+  "autopack" = callPackage
+    ({ mkDerivation, base, Cabal, dir-traverse, filepath }:
+     mkDerivation {
+       pname = "autopack";
+       version = "0.0.0.0";
+       sha256 = "1z1w6bvsfhnia2dxihcay6a9va2ik1bg805zkfb0vn4vcxn76dcc";
+       libraryHaskellDepends = [ base Cabal dir-traverse filepath ];
+       description = "Custom Setup to automate package modules discovery";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "autoproc" = callPackage
     ({ mkDerivation, base, directory, mtl, process, unix }:
      mkDerivation {
@@ -34725,6 +34799,8 @@ self: {
        pname = "aws-cloudfront-signed-cookies";
        version = "0.2.0.1";
        sha256 = "1yk40n6gjs72pyi6yjwhqj0dngqc4b74rpg0ji61852nbb0snl28";
+       revision = "3";
+       editedCabalFile = "1v0bbyskwbawfhaji3s63hjrzwsi2bb7l8g6yxdp02bp6zb92757";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -34738,6 +34814,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "aws-cloudfront-signed-cookies_0_2_0_4" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, asn1-encoding, asn1-types
+     , base, base64-bytestring, bytestring, cookie, cryptonite, hedgehog
+     , lens, lens-aeson, neat-interpolation, optparse-applicative, pem
+     , text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aws-cloudfront-signed-cookies";
+       version = "0.2.0.4";
+       sha256 = "0j40760k1ackwhsy279ir8jybnvis5m56i5hy3rppjybhjiyyd4v";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty asn1-encoding asn1-types base base64-bytestring
+         bytestring cookie cryptonite lens lens-aeson optparse-applicative
+         pem text time unordered-containers vector
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base hedgehog neat-interpolation ];
+       description = "Generate signed cookies for AWS CloudFront";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aws-cloudfront-signer" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, base64-bytestring
      , bytestring, crypto-pubkey-types, RSA, time
@@ -34814,6 +34914,8 @@ self: {
        ];
        description = "Haskell bindings for Amazon DynamoDB Streams";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-easy" = callPackage
@@ -34837,6 +34939,8 @@ self: {
        ];
        description = "Helper function and types for working with amazonka";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-ec2" = callPackage
@@ -34866,6 +34970,8 @@ self: {
        ];
        description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-ec2-knownhosts" = callPackage
@@ -34939,6 +35045,8 @@ self: {
        ];
        description = "Bindings for Amazon Web Services (AWS) General Reference";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-kinesis" = callPackage
@@ -34964,6 +35072,8 @@ self: {
        ];
        description = "Bindings for Amazon Kinesis";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-kinesis-client" = callPackage
@@ -35049,6 +35159,8 @@ self: {
        ];
        description = "Haskell bindings for AWS Lambda";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-lambda-haskell-runtime" = callPackage
@@ -35067,6 +35179,8 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Haskell runtime for AWS Lambda";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-lambda-runtime" = callPackage
@@ -35156,6 +35270,8 @@ self: {
        ];
        description = "Amazon Route53 DNS service plugin for the aws package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-sdk" = callPackage
@@ -35207,6 +35323,8 @@ self: {
        ];
        description = "The text converter for aws-sdk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-sdk-xml-unordered" = callPackage
@@ -35227,6 +35345,8 @@ self: {
        ];
        description = "The xml parser for aws-sdk package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "aws-ses-easy" = callPackage
@@ -35313,6 +35433,8 @@ self: {
        ];
        description = "Bindings for AWS SNS Version 2013-03-31";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "axel" = callPackage
@@ -36280,8 +36402,8 @@ self: {
     ({ mkDerivation, base, base-compat }:
      mkDerivation {
        pname = "base-compat-migrate";
-       version = "0.1.1.0";
-       sha256 = "1k7yjqqc9kd2a1dch33hs3xiyh868a83klx9iz69ix72khacggvk";
+       version = "0.2.0.0";
+       sha256 = "0xc9fjdv4bx5isw39l9aknvwvi46zpc4930wxvsx0v4qa8yhfpaa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base base-compat ];
@@ -43657,8 +43779,8 @@ self: {
        pname = "brittany";
        version = "0.12.1.1";
        sha256 = "0nw7ymdb7xam634w42l1xjgyvpla8grcg02aj19fscw2fn9gfh7z";
-       revision = "1";
-       editedCabalFile = "0wqg0yl3da1dgpqqv5q0ml3k0njn7pgipaac4vd9gidv3d1pyd74";
+       revision = "2";
+       editedCabalFile = "0pfrm5vvh7x94f8gy8ka6rmq6yk6xxxgba68rd91bk8lbjxsmkxl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44783,8 +44905,8 @@ self: {
        pname = "butcher";
        version = "1.3.2.3";
        sha256 = "0lpicayq9k59m2ydz989xsypr653xwhp6mmhlp7nmjzk6jwpq5q5";
-       revision = "1";
-       editedCabalFile = "06vy9018ia6sncgxdmv4ili2krkqn1b6r7xz4raa18kdvgnl100v";
+       revision = "2";
+       editedCabalFile = "1751sllw8s81x3s1dhilbr5lqnv9cpdqiv17c8by466aa6304dxa";
        libraryHaskellDepends = [
          base bifunctors containers deque extra free microlens microlens-th
          mtl multistate pretty transformers unsafe void
@@ -44921,10 +45043,8 @@ self: {
      }:
      mkDerivation {
        pname = "byline";
-       version = "0.3.2.1";
-       sha256 = "196c75i7cz7yww3d5pi5p51wd5bf3a8v8nsb2vkiv25ndwrsb20w";
-       revision = "1";
-       editedCabalFile = "1bkrhwi851qq6jd3wcajypqi3aha66hsr0jq1h8wgqpgm6mg0abl";
+       version = "0.4.0.0";
+       sha256 = "1q8xb5b194ywm1sacxx47yhicww3m9hpffidgpj6l79fjqivgv09";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45062,6 +45182,8 @@ self: {
        pname = "bytes";
        version = "0.17";
        sha256 = "11gacfxcn9f3v5a1phlgi7mwwrnyh51sfsym573g6i4v2zqfrwi3";
+       revision = "1";
+       editedCabalFile = "0pa787mwyic7bhbxpcp2dh86vhdccbdiakxss2c084h8hd8c1g97";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base binary binary-orphans bytestring cereal containers hashable
@@ -47033,8 +47155,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.15.0";
-       sha256 = "1xfskgmwr75f1lk8a6mllp2h62jdl7hkwb01r74gpi0n6h17p3nm";
+       version = "2.15.1";
+       sha256 = "1gdwri0x7kw96y0c6j9rdqa68arrxkpisq43ld58applxcvr1cs7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -48152,19 +48274,19 @@ self: {
      }) {};
 
   "capability" = callPackage
-    ({ mkDerivation, base, containers, dlist, exceptions, generic-lens
-     , hspec, lens, monad-control, monad-unlift, mtl, mutable-containers
-     , primitive, safe-exceptions, silently, streaming, temporary, text
-     , transformers, unliftio, unliftio-core
+    ({ mkDerivation, base, constraints, containers, dlist, exceptions
+     , generic-lens, hspec, lens, monad-control, monad-unlift, mtl
+     , mutable-containers, primitive, safe-exceptions, silently
+     , streaming, temporary, text, transformers, unliftio, unliftio-core
      }:
      mkDerivation {
        pname = "capability";
-       version = "0.2.0.0";
-       sha256 = "0jssnbqrhkkfkjzya8qprk89r8vqzzy45sm9bwhw2rwx8mrbn40q";
+       version = "0.3.0.0";
+       sha256 = "1kha2y1x63af43psl708c0iib0ign4jrs2n4s2jl4a0pb7hlcdcz";
        libraryHaskellDepends = [
-         base dlist exceptions generic-lens lens monad-control monad-unlift
-         mtl mutable-containers primitive safe-exceptions streaming
-         transformers unliftio unliftio-core
+         base constraints dlist exceptions generic-lens lens monad-control
+         monad-unlift mtl mutable-containers primitive safe-exceptions
+         streaming transformers unliftio unliftio-core
        ];
        testHaskellDepends = [
          base containers hspec lens mtl silently streaming temporary text
@@ -50468,6 +50590,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "character-cases" = callPackage
+    ({ mkDerivation, base, containers, doctest, Glob, here, megaparsec
+     , prettyprinter, template-haskell
+     }:
+     mkDerivation {
+       pname = "character-cases";
+       version = "0.1.0.0";
+       sha256 = "1383g5fwy11h43268609n9dmvp0wqwgycn9ly8c7g8h4qpyckh38";
+       libraryHaskellDepends = [
+         base containers here megaparsec prettyprinter template-haskell
+       ];
+       testHaskellDepends = [
+         base containers doctest Glob here megaparsec prettyprinter
+         template-haskell
+       ];
+       description = "Exposes subspecies types of Char. And naming cases. e.g. meaning of [a-z], [A-Z], [0-9], PascalCase, camelCase, and sneak_case.";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "charade" = callPackage
     ({ mkDerivation, base, configurator, containers, filepath, heist
      , lens, mtl, QuickCheck, random, snap, snap-core, snap-extras
@@ -50865,6 +51008,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "checkers_0_5_5" = callPackage
+    ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }:
+     mkDerivation {
+       pname = "checkers";
+       version = "0.5.5";
+       sha256 = "1g16603803xzz73md1azlcpd6xz7gkwjpy66l638v6lvipdl9hr9";
+       libraryHaskellDepends = [
+         array base QuickCheck random semigroupoids
+       ];
+       description = "Check properties on standard classes and data structures";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "checkmate" = callPackage
     ({ mkDerivation, base, bytestring, containers, diff-parse
      , directory, file-embed, filepath, github, hlint, hspec
@@ -54415,8 +54572,8 @@ self: {
      }:
      mkDerivation {
        pname = "cobot-io";
-       version = "0.1.2.7";
-       sha256 = "0gf0amdlkzrar154vmqx952c5p7hbqm6qay47w7m0xb6p2qgvrv7";
+       version = "0.1.2.8";
+       sha256 = "1snq2ypf7blknhpv86xq1n7f6a9pifd77yylsirqj358j590c4i6";
        libraryHaskellDepends = [
          array attoparsec base binary bytestring containers data-msgpack
          deepseq http-conduit hyraxAbif lens linear mtl split text vector
@@ -54671,27 +54828,25 @@ self: {
      }) {};
 
   "codex" = callPackage
-    ({ mkDerivation, ascii-progress, base, bytestring, Cabal
-     , containers, cryptohash, directory, filepath, hackage-db
-     , http-client, lens, machines, machines-directory, network, process
-     , tar, text, transformers, wreq, yaml, zlib
+    ({ mkDerivation, ascii-progress, base, bytestring, Cabal, conduit
+     , containers, cryptonite, directory, filepath, hackage-db
+     , http-client, http-client-tls, memory, network, process, tar, text
+     , transformers, yaml, zlib
      }:
      mkDerivation {
        pname = "codex";
-       version = "0.5.2.0";
-       sha256 = "1bvz8pzh9qgb7ffnmihcain877igf1hm8rs4z9qx1gckz2c566vv";
-       revision = "1";
-       editedCabalFile = "0v0jlarip2689jxixymqzy36qywla76j78iqzyyc6s7hrd63mrlx";
+       version = "0.6.0.0";
+       sha256 = "1xak07a2sn2fafrng53n8yksf6z73wn2r8paqymmc4385shhmndc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ascii-progress base bytestring Cabal containers cryptohash
-         directory filepath hackage-db http-client lens machines
-         machines-directory process tar text transformers wreq yaml zlib
+         ascii-progress base bytestring Cabal conduit containers cryptonite
+         directory filepath hackage-db http-client memory process tar text
+         transformers yaml zlib
        ];
        executableHaskellDepends = [
-         ascii-progress base Cabal directory filepath hackage-db network
-         process transformers wreq yaml
+         ascii-progress base Cabal directory filepath hackage-db
+         http-client-tls network process transformers yaml
        ];
        description = "A ctags file generator for cabal project dependencies";
        license = stdenv.lib.licenses.asl20;
@@ -56654,8 +56809,8 @@ self: {
        pname = "compositional-data";
        version = "0.1.0.1";
        sha256 = "1pw7xqzin7v9xxjkm7xixf5d6r5jmgdgyvyhpsmn8bdqp8rrwgzj";
-       revision = "1";
-       editedCabalFile = "167j8vjxv8lf4h92dqag8wdz7k8sp2678s72afs0wig2sy4hm720";
+       revision = "2";
+       editedCabalFile = "1frk7dr9kqk5s4ngni3ygvi1g6g7wlnc6cqhrml3xyj1zj5c8chi";
        libraryHaskellDepends = [
          base bifunctor category transformers util
        ];
@@ -57310,12 +57465,14 @@ self: {
     ({ mkDerivation, base, containers, random, stm }:
      mkDerivation {
        pname = "concurrent-resource-map";
-       version = "0.1.0.0";
-       sha256 = "05zgjb2plrk35fiyskk07jfiydi4mlk6awbfjvhnsa3qi11pxdly";
-       libraryHaskellDepends = [ base containers ];
-       testHaskellDepends = [ base random stm ];
+       version = "0.2.0.0";
+       sha256 = "1m66x54rvw95gm63nh18w8jcny4r9ri19am870rbnlvb572zxsjz";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base containers random stm ];
        description = "Concurrent resource map";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "concurrent-rpc" = callPackage
@@ -57590,6 +57747,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "conduit_1_3_2" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, directory
+     , exceptions, filepath, gauge, hspec, kan-extensions
+     , mono-traversable, mtl, mwc-random, primitive, QuickCheck
+     , resourcet, safe, silently, split, text, transformers, unix
+     , unliftio, unliftio-core, vector
+     }:
+     mkDerivation {
+       pname = "conduit";
+       version = "1.3.2";
+       sha256 = "0vmcyi3f280b6ll6pcyma4aqrl6m69n6y6x7wplxgsmxz5q7kng3";
+       libraryHaskellDepends = [
+         base bytestring directory exceptions filepath mono-traversable mtl
+         primitive resourcet text transformers unix unliftio-core vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers directory exceptions filepath hspec
+         mono-traversable mtl QuickCheck resourcet safe silently split text
+         transformers unliftio vector
+       ];
+       benchmarkHaskellDepends = [
+         base containers deepseq gauge hspec kan-extensions mwc-random
+         transformers vector
+       ];
+       description = "Streaming data processing library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conduit-algorithms" = callPackage
     ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
      , conduit-combinators, conduit-extra, conduit-zstd, containers
@@ -57805,6 +57991,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "conduit-extra_1_3_5" = callPackage
+    ({ mkDerivation, async, attoparsec, base, bytestring
+     , bytestring-builder, conduit, directory, exceptions, filepath
+     , gauge, hspec, network, primitive, process, QuickCheck, resourcet
+     , stm, streaming-commons, text, transformers, transformers-base
+     , typed-process, unliftio-core
+     }:
+     mkDerivation {
+       pname = "conduit-extra";
+       version = "1.3.5";
+       sha256 = "1n8js1y1rdswvp0bkjmmz19fag19bdxgwsrqz93yc09w43p8sr4a";
+       libraryHaskellDepends = [
+         async attoparsec base bytestring conduit directory filepath network
+         primitive process resourcet stm streaming-commons text transformers
+         typed-process unliftio-core
+       ];
+       testHaskellDepends = [
+         async attoparsec base bytestring bytestring-builder conduit
+         directory exceptions filepath hspec process QuickCheck resourcet
+         stm streaming-commons text transformers transformers-base
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring bytestring-builder conduit gauge transformers
+       ];
+       description = "Batteries included conduit: adapters for common libraries";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conduit-find" = callPackage
     ({ mkDerivation, attoparsec, base, conduit, conduit-combinators
      , conduit-extra, directory, doctest, either, exceptions, filepath
@@ -58167,6 +58382,8 @@ self: {
        testHaskellDepends = [ base conferer hedis hspec text ];
        description = "conferer's FromConfig instances for hedis settings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conferer-hspec" = callPackage
@@ -58212,6 +58429,8 @@ self: {
        ];
        description = "Configuration for reading dhall files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conferer-provider-json" = callPackage
@@ -58271,6 +58490,8 @@ self: {
        ];
        description = "Configuration for reading yaml files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conferer-snap" = callPackage
@@ -58289,6 +58510,8 @@ self: {
        ];
        description = "conferer's FromConfig instances for snap Config";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "conferer-warp" = callPackage
@@ -60932,6 +61155,8 @@ self: {
        testHaskellDepends = [ base hspec hspec-megaparsec megaparsec ];
        description = "Build tool for C";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "cplex-hs" = callPackage
@@ -62467,6 +62692,17 @@ self: {
        broken = true;
      }) {};
 
+  "crypto-token" = callPackage
+    ({ mkDerivation, array, base, cryptonite, memory }:
+     mkDerivation {
+       pname = "crypto-token";
+       version = "0.0.0.0";
+       sha256 = "1azvzzf4w6q76fbggw4f4inqibkvzy9chpdd01349rm8b0nyfh50";
+       libraryHaskellDepends = [ array base cryptonite memory ];
+       description = "crypto tokens";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "crypto-totp" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, cryptohash
      , tagged, unix
@@ -69162,8 +69398,8 @@ self: {
     ({ mkDerivation, aeson, base, bytestring }:
      mkDerivation {
        pname = "deriving-aeson";
-       version = "0.2";
-       sha256 = "0d9f4xjczks79vrlw93q7jg32s3ygwl488v6ql8lr4rfvbxzik23";
+       version = "0.2.2";
+       sha256 = "0hv7c9fyfm9zynz5kha1ws0qsizkrcjnwy84lhyixxzlqh3rl16d";
        libraryHaskellDepends = [ aeson base ];
        testHaskellDepends = [ aeson base bytestring ];
        description = "Type driven generic aeson instance customisation";
@@ -69951,6 +70187,8 @@ self: {
        ];
        description = "Convert between Dhall and YAML";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dhcp-lease-parser" = callPackage
@@ -70725,8 +70963,8 @@ self: {
     ({ mkDerivation, base, parsec, random-fu, transformers }:
      mkDerivation {
        pname = "dice";
-       version = "0.1";
-       sha256 = "1rfx3vh983f3gc6si661zimhjl47ip30l3pvf7dysjirr3gffgz1";
+       version = "0.1.0.1";
+       sha256 = "1jybckq3wf3vs0d92ji6a6mlgw64afhwdr6b0w2p1d97zp2fsdn3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base parsec random-fu transformers ];
@@ -71587,8 +71825,8 @@ self: {
      }:
      mkDerivation {
        pname = "dir-traverse";
-       version = "0.2.2.2";
-       sha256 = "0wckqnfmdmfgp7kkvjc2pzg9610xqfnam5myv9xcq04cr3h3dy8g";
+       version = "0.2.2.3";
+       sha256 = "1nn85mfjsg1w3c9bz4f3igkh1ss0927zaqcz5p9qhwsf8f4wqr3x";
        libraryHaskellDepends = [ base directory filepath ];
        benchmarkHaskellDepends = [
          base criterion directory dirstream pipes pipes-safe system-filepath
@@ -73173,6 +73411,28 @@ self: {
        broken = true;
      }) {};
 
+  "dl-fedora_0_7_4" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath
+     , http-directory, http-types, optparse-applicative, regex-posix
+     , simple-cmd, simple-cmd-args, text, time, unix, xdg-userdirs
+     }:
+     mkDerivation {
+       pname = "dl-fedora";
+       version = "0.7.4";
+       sha256 = "092fmla7a0xbnfac6izcj08wsyxbd04n23cjy33c132lqhs5k6w5";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring directory filepath http-directory http-types
+         optparse-applicative regex-posix simple-cmd simple-cmd-args text
+         time unix xdg-userdirs
+       ];
+       description = "Fedora image download tool";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "dlist" = callPackage
     ({ mkDerivation, base, Cabal, deepseq, QuickCheck }:
      mkDerivation {
@@ -73475,8 +73735,8 @@ self: {
      }:
      mkDerivation {
        pname = "dobutokO2";
-       version = "0.8.2.0";
-       sha256 = "1czji489jj0f18shcx4likz8l46zwvq9vabrn1wv1lyh19nnk1k8";
+       version = "0.15.1.0";
+       sha256 = "1r2zwwcbkm07g1lrypdg3aj4qhyy3g7fds042i4l5abs045aqa2l";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -74497,6 +74757,8 @@ self: {
        ];
        description = "A small, low-dependency library that provides turn-key file download over HTTP and HTTPS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "dozenal" = callPackage
@@ -76480,8 +76742,8 @@ self: {
      }:
      mkDerivation {
        pname = "eccrypto";
-       version = "0.2.0";
-       sha256 = "1ng9lin5cavmcrp60lrnqxfkhb5drhlk9nzrl8d6gr1g7zfj75qm";
+       version = "0.2.1";
+       sha256 = "181c8avf0k8377n0z8qm3v7dnqg01z1gp5zwhcrk8khb3h4d4rp7";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring cryptohash-sha512 integer-gmp random
@@ -76496,8 +76758,8 @@ self: {
     ({ mkDerivation, base, bytestring, eccrypto }:
      mkDerivation {
        pname = "eccrypto-ed25519-bindings";
-       version = "0.1.0.0";
-       sha256 = "1yi93a9x5sl3h50cky7l9df3077kwr3grp2iw9s5iykcwi6jdzg7";
+       version = "0.1.1.0";
+       sha256 = "1yzalib6a5h7k7bhc9kzr2lqhd928yva3j2mxynx3lmw26jc5r17";
        libraryHaskellDepends = [ base bytestring eccrypto ];
        description = "provides \"ed25519\" API using \"eccrypto\"";
        license = stdenv.lib.licenses.bsd3;
@@ -77390,8 +77652,8 @@ self: {
        pname = "ekg";
        version = "0.4.0.15";
        sha256 = "1k3d5kiqm034qs04k0pcisf4zbdmx2fcgl9a6c1lzzjw96zf6aj8";
-       revision = "6";
-       editedCabalFile = "012y235n8k7hhx651l01xf88vgr2wskapbsn83w18ls1h1njqnzk";
+       revision = "7";
+       editedCabalFile = "1p6mq14si3bqgw4b1frdfj5cbqpz3p399q8wipk6z95yyg129f6i";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring ekg-core ekg-json filepath network snap-core
@@ -77465,16 +77727,14 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-core";
-       version = "0.1.1.6";
-       sha256 = "0hjprlx99k7mgs2zn06yckir71dvz90xs24g2r990r97mmwxva36";
+       version = "0.1.1.7";
+       sha256 = "04nv6iwzrb63fs97ixb0amj8p6zhabg3ggbrg4nbkq7xjhmkz0a5";
        libraryHaskellDepends = [
          base containers ghc-prim text unordered-containers
        ];
        benchmarkHaskellDepends = [ base ];
        description = "Tracking of system metrics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ekg-elastic" = callPackage
@@ -77539,8 +77799,8 @@ self: {
        pname = "ekg-json";
        version = "0.1.0.6";
        sha256 = "0iyx0ix4dcyhh9xg4ia1lm7x2q0iffswnr33khfg9fr81am80shy";
-       revision = "4";
-       editedCabalFile = "16sn4nbqm0rxkf0swi6r2jn6z9x92qmcg9xlx258d98kqb5fkwjg";
+       revision = "5";
+       editedCabalFile = "0qc3fdycamm97lhhvwgvl8kvj169qrwr5ds4vkvyclpv0s90ijva";
        libraryHaskellDepends = [
          aeson base ekg-core text unordered-containers
        ];
@@ -77585,8 +77845,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Easily expose your EKG metrics to Prometheus";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "ekg-push" = callPackage
@@ -77638,8 +77896,8 @@ self: {
        pname = "ekg-statsd";
        version = "0.2.4.0";
        sha256 = "1nvsiblha1fzykvfaq1s0fyvfmhm32wvxdsfkn9pqd6dl5ivyx2y";
-       revision = "3";
-       editedCabalFile = "0va7fliya7g546f5qbc42bl7dyh74al38sspd2smjyl7a9d5mmlk";
+       revision = "4";
+       editedCabalFile = "0mrar804w2m57zg9bd0qkp4vbkzmgi46478v6z7qcz7qpd8vml9d";
        libraryHaskellDepends = [
          base bytestring ekg-core network text time unordered-containers
        ];
@@ -78159,19 +78417,19 @@ self: {
      }) {};
 
   "elm-syntax" = callPackage
-    ({ mkDerivation, base, bound, deriving-compat, prettyprinter
-     , protolude, text, unordered-containers
+    ({ mkDerivation, base, bound, deriving-compat, hashable
+     , prettyprinter, text, unordered-containers
      }:
      mkDerivation {
        pname = "elm-syntax";
-       version = "0.2.0.0";
-       sha256 = "1fqfsk3xnvl8j49rarchabvw8lq8mflzyzawq5myi74w1gd6ril8";
+       version = "0.3.0.0";
+       sha256 = "0pv0ly51wpbfr11rng57pasn5sgq7xz986jy36n8qb03q6irvsn9";
        libraryHaskellDepends = [
-         base bound deriving-compat prettyprinter protolude text
+         base bound deriving-compat hashable prettyprinter text
          unordered-containers
        ];
        testHaskellDepends = [
-         base bound deriving-compat prettyprinter protolude text
+         base bound deriving-compat hashable prettyprinter text
          unordered-containers
        ];
        description = "Elm syntax and pretty-printing";
@@ -81331,23 +81589,23 @@ self: {
   "eventstore" = callPackage
     ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
      , cereal, clock, connection, containers, dns, dotnet-timespan
-     , ekg-core, exceptions, fast-logger, file-embed, hashable
-     , http-client, interpolate, lifted-async, lifted-base
-     , monad-control, monad-logger, mono-traversable, mtl, protobuf
-     , random, safe, safe-exceptions, semigroups, stm, stm-chans
-     , streaming, tasty, tasty-hspec, tasty-hunit, text, time
-     , transformers-base, unordered-containers, uuid, vector
+     , exceptions, fast-logger, file-embed, hashable, http-client
+     , interpolate, lifted-async, lifted-base, monad-control
+     , monad-logger, mono-traversable, mtl, protobuf, random, safe
+     , safe-exceptions, semigroups, stm, stm-chans, streaming, tasty
+     , tasty-hspec, tasty-hunit, text, time, transformers-base
+     , unordered-containers, uuid, vector
      }:
      mkDerivation {
        pname = "eventstore";
-       version = "1.3.3";
-       sha256 = "0xf67ywg2f1wj75s82s2lsi2zgvk1xqhl09c4hnl45qzslkbl2xp";
+       version = "1.4.0";
+       sha256 = "0p7xfvdm4bjdp23f1ikfyq1gbylxav6b3wmbxhmscmzai396al12";
        libraryHaskellDepends = [
          aeson array base bifunctors bytestring cereal clock connection
-         containers dns dotnet-timespan ekg-core exceptions fast-logger
-         hashable http-client interpolate lifted-async lifted-base
-         monad-control monad-logger mono-traversable mtl protobuf random
-         safe safe-exceptions semigroups stm stm-chans streaming text time
+         containers dns dotnet-timespan exceptions fast-logger hashable
+         http-client interpolate lifted-async lifted-base monad-control
+         monad-logger mono-traversable mtl protobuf random safe
+         safe-exceptions semigroups stm stm-chans streaming text time
          transformers-base unordered-containers uuid vector
        ];
        testHaskellDepends = [
@@ -82560,8 +82818,8 @@ self: {
      }:
      mkDerivation {
        pname = "extensible";
-       version = "0.7.1";
-       sha256 = "1vmn2ziv8qnw22pkfy1c80hym7cprv70xz0mqi5076glwdjkx3gr";
+       version = "0.8";
+       sha256 = "1p5mnzk4x6dk8gyr3n47wlndnqf8w7112whr872355zqyvcxlsq6";
        libraryHaskellDepends = [
          aeson base bytestring cassava comonad constraints deepseq ghc-prim
          hashable membership monad-skeleton prettyprinter primitive
@@ -83268,8 +83526,8 @@ self: {
      }:
      mkDerivation {
        pname = "faktory";
-       version = "1.0.1.0";
-       sha256 = "0vkg1siaiq6dj1i0dnfdcdswr7fw4shn92wyfj8lxrj6krmfjrni";
+       version = "1.0.1.1";
+       sha256 = "1wz7f1ai73xc5n06db8mjbmbdyf5r9p78ysx3q1yiq32h2mvjd3m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -83992,7 +84250,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "fb_2_1_0" = callPackage
+  "fb_2_1_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit
      , conduit-extra, containers, cryptonite, data-default, hspec
      , http-client, http-conduit, http-types, HUnit, memory
@@ -84001,8 +84259,8 @@ self: {
      }:
      mkDerivation {
        pname = "fb";
-       version = "2.1.0";
-       sha256 = "18h16dkyh35q0wyjvri7z2q2j8rx4bb6ma2bf6h2cdm7jh6zdakq";
+       version = "2.1.1";
+       sha256 = "0j2rckrv1aksfp2wyiyffqg40jl927vs97fk2lyzkscz673jd9s9";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring conduit conduit-extra cryptonite
          data-default http-client http-conduit http-types memory
@@ -85077,6 +85335,8 @@ self: {
        pname = "ffunctor";
        version = "1.2.0";
        sha256 = "0rq60a7ximvqdxqvijw1isd1d5gwqbjagmws91y0jvxlwmsgzf6w";
+       revision = "1";
+       editedCabalFile = "0biwzy37ig69s7l4x2cp0p71w3fn1azfd81vsj39fzn4kpcrpgld";
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [
          aeson base exceptions generic-lens http-client mtl servant
@@ -89341,6 +89601,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "free-categories_0_2_0_0" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "free-categories";
+       version = "0.2.0.0";
+       sha256 = "0932bvy2cgmancjy4invm9m16w27kawlfmd3zy9xi8sl9a62rp38";
+       libraryHaskellDepends = [ base ];
+       description = "free categories";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "free-category" = callPackage
     ({ mkDerivation, base, criterion, free-algebras, QuickCheck, tasty
      , tasty-quickcheck
@@ -90132,8 +90404,8 @@ self: {
      }:
      mkDerivation {
        pname = "front";
-       version = "0.0.0.3";
-       sha256 = "0n2w3rcl20njqrxx9ws2jrw3yjrxhxzl6q916apyh07bricmmkw9";
+       version = "0.0.0.5";
+       sha256 = "0gn5lrh817r9ky8j4kzrqdlisiy85gr6v7nyd2sj1psa8syrjfzk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -91399,17 +91671,6 @@ self: {
      }) {};
 
   "fusion-plugin" = callPackage
-    ({ mkDerivation, base, ghc, syb }:
-     mkDerivation {
-       pname = "fusion-plugin";
-       version = "0.1.1";
-       sha256 = "15bjjsxck6682nva7mahss87rxlzw8j66hzkhji122swyvgd89a1";
-       libraryHaskellDepends = [ base ghc syb ];
-       description = "GHC plugin to make stream fusion more predictable";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fusion-plugin_0_2_0" = callPackage
     ({ mkDerivation, base, fusion-plugin-types, ghc, syb }:
      mkDerivation {
        pname = "fusion-plugin";
@@ -91419,6 +91680,7 @@ self: {
        description = "GHC plugin to make stream fusion more predictable";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "fusion-plugin-types" = callPackage
@@ -91447,10 +91709,8 @@ self: {
      }:
      mkDerivation {
        pname = "futhark";
-       version = "0.14.1";
-       sha256 = "1bg0r9b0jg9j12lcc6wa684yjm58l020m9x5abpc54cghigywswj";
-       revision = "1";
-       editedCabalFile = "0iqg18jz8lgbh9iq1zgs8j9q5smzzi8w1asryz4dx8y6dl7n97p5";
+       version = "0.15.1";
+       sha256 = "181kgqbdqxcim16ld68wx09lr4gh0j9440lnn2lyzrzmn8a9567w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -93625,6 +93885,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "genvalidity_0_10_0_2" = callPackage
+    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random
+     , validity
+     }:
+     mkDerivation {
+       pname = "genvalidity";
+       version = "0.10.0.2";
+       sha256 = "1k6pba9zal7385838b9w9ybhk5742jwfy8bqa921zi08mv7vgqlp";
+       libraryHaskellDepends = [ base QuickCheck random validity ];
+       testHaskellDepends = [ base hspec hspec-core QuickCheck ];
+       description = "Testing utilities for the validity library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "genvalidity-aeson" = callPackage
     ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec
      , genvalidity-scientific, genvalidity-text
@@ -94966,8 +95241,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-lib-parser-ex";
-       version = "8.8.5.3";
-       sha256 = "0svjfrsq7r1hvpjp0bk4jqq9z6gm441hsv5zb1yljw9p9b20kbk6";
+       version = "8.8.5.6";
+       sha256 = "0jwndkf7idpf09zrj4i4x1vsyfpm0vf85vlh00qp0z3avqcxsf2m";
        libraryHaskellDepends = [
          base bytestring containers extra ghc ghc-boot ghc-boot-th uniplate
        ];
@@ -94978,15 +95253,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ghc-lib-parser-ex_8_8_5_5" = callPackage
+  "ghc-lib-parser-ex_8_8_5_8" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, extra
      , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit
      , uniplate
      }:
      mkDerivation {
        pname = "ghc-lib-parser-ex";
-       version = "8.8.5.5";
-       sha256 = "15rp1829zzppz3y014cac1ssmklssn5hsfvadqrzkzmnky2yr215";
+       version = "8.8.5.8";
+       sha256 = "1mw1ym5bn39z7lqmxnhhkfqb0kbxddabkafw025wgs54knsghvmk";
        libraryHaskellDepends = [
          base bytestring containers extra ghc ghc-boot ghc-boot-th uniplate
        ];
@@ -95417,16 +95692,16 @@ self: {
      }) {};
 
   "ghc-tags-plugin" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers
-     , directory, filepath, ghc, lattices, QuickCheck
-     , quickcheck-instances, tasty, tasty-golden, tasty-quickcheck, text
+    ({ mkDerivation, attoparsec, base, bytestring, directory, filelock
+     , filepath, ghc, lattices, QuickCheck, quickcheck-instances, tasty
+     , tasty-golden, tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "ghc-tags-plugin";
-       version = "0.1.4.0";
-       sha256 = "0ci82krwqiprh23p316n1k09z6ja962xscnx9ycqpsyywbgkcqk4";
+       version = "0.1.5.0";
+       sha256 = "065i5xdf5i0xxj8q2aah2p9n30n65w0r60rfd49bih1iisfk0ljn";
        libraryHaskellDepends = [
-         attoparsec base bytestring containers directory filepath ghc text
+         attoparsec base bytestring directory filelock filepath ghc text
        ];
        testHaskellDepends = [
          attoparsec base bytestring lattices QuickCheck quickcheck-instances
@@ -95435,6 +95710,8 @@ self: {
        doHaddock = false;
        description = "A compiler plugin which generates tags file from GHC syntax tree";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "ghc-tcplugins-extra" = callPackage
@@ -95560,24 +95837,6 @@ self: {
      }) {};
 
   "ghc-typelits-natnormalise" = callPackage
-    ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra
-     , integer-gmp, syb, tasty, tasty-hunit, template-haskell
-     , transformers
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-natnormalise";
-       version = "0.7.1";
-       sha256 = "1sbwzbs3bnvyla44kcsxs6h12sdfqzbm6n0swy2scp5p271fr0i3";
-       libraryHaskellDepends = [
-         base containers ghc ghc-tcplugins-extra integer-gmp syb
-         transformers
-       ];
-       testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
-       description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-typelits-natnormalise_0_7_2" = callPackage
     ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra
      , integer-gmp, syb, tasty, tasty-hunit, template-haskell
      , transformers
@@ -95593,7 +95852,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
        description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-typelits-presburger" = callPackage
@@ -95837,8 +96095,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghcid";
-       version = "0.8.1";
-       sha256 = "1k5yk9ba6g2x0wsqx1zb9zviqp9p7myd628fxi2rf4wjh0kkjc4c";
+       version = "0.8.3";
+       sha256 = "1b8a8mx6z2ridw79gijjv90b2jgk0qrncvg0sjbmvyyyajx1h5f7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95856,15 +96114,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ghcid_0_8_3" = callPackage
+  "ghcid_0_8_5" = callPackage
     ({ mkDerivation, ansi-terminal, base, cmdargs, containers
      , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit
      , terminal-size, time, unix
      }:
      mkDerivation {
        pname = "ghcid";
-       version = "0.8.3";
-       sha256 = "1b8a8mx6z2ridw79gijjv90b2jgk0qrncvg0sjbmvyyyajx1h5f7";
+       version = "0.8.5";
+       sha256 = "15zj78wasix4yz8mxx5hl6x1gj364vsbwn5arp7sbq13rywhs2qy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -103061,8 +103319,8 @@ self: {
     ({ mkDerivation, base, criterion, hedgehog }:
      mkDerivation {
        pname = "grab";
-       version = "0.0.0.1";
-       sha256 = "1jsi8g538w4a441w412siqvrkzmvx8sff74nax93b5paiaqfwcrf";
+       version = "0.0.0.4";
+       sha256 = "0yanm9ak2sw266wn9lllz086g53sra7xfncpql6403d2lj3j1jj4";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hedgehog ];
        benchmarkHaskellDepends = [ base criterion ];
@@ -103076,8 +103334,8 @@ self: {
     ({ mkDerivation, base, containers, grab, hedgehog, text }:
      mkDerivation {
        pname = "grab-form";
-       version = "0.0.0.2";
-       sha256 = "1mi21d3p7jwmwmn69f7xy6zkks0w11kkwwvzmhxsd84zsafnis8k";
+       version = "0.0.0.4";
+       sha256 = "0ch8c0kfjky9s1ilrxyr27jhmvynrp61imb188rc3fv7yfr0b5n5";
        libraryHaskellDepends = [ base containers grab text ];
        testHaskellDepends = [ base containers hedgehog text ];
        description = "Applicative parsers for form parameter lists";
@@ -103318,6 +103576,8 @@ self: {
        pname = "graph";
        version = "0.0.0.0";
        sha256 = "1v94nii7q6smm37m3yk390mcxpa69qclxqqdzcmay8f096dzk3pd";
+       revision = "1";
+       editedCabalFile = "0ij8sdnz3k6lfsvl5wvr4dl8njjlmpl3fai8fybvs0b2yhnr6v49";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Class of graphs";
@@ -108837,8 +109097,8 @@ self: {
     ({ mkDerivation, base, containers, random }:
      mkDerivation {
        pname = "hanabi-dealer";
-       version = "0.7.0.0";
-       sha256 = "0a62h0mblddp77binl73h8yq46r9szrqzdvx16zawb0y222d14mp";
+       version = "0.7.1.1";
+       sha256 = "1agh5sq0hj9r55w3k529jcar66p4vih54j5w3h28chm34n9k6qa2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers random ];
@@ -110309,8 +110569,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasbolt";
-       version = "0.1.4.2";
-       sha256 = "0qrfdfyzm61zaxd9m7s93zhrr2qjpgyn24l3gbyll2v8yj38j5rm";
+       version = "0.1.4.3";
+       sha256 = "1sfnr6qrv95ryf6c4hpj3vj8v6y64qjjd2fnz4x9i37win9wcb1z";
        libraryHaskellDepends = [
          base binary bytestring connection containers data-binary-ieee754
          data-default mtl network text
@@ -112471,8 +112731,8 @@ self: {
     ({ mkDerivation, base, haskell-src-exts }:
      mkDerivation {
        pname = "haskell-src-exts-simple";
-       version = "1.22.0.0";
-       sha256 = "1zfb12r7fpq5nnfgn27m8grql2bx50w7g2jbgy9404rjcr1gk59c";
+       version = "1.23.0.0";
+       sha256 = "1jfdjaikmjx9sfairp4jjn0vzhw5vhwrg43y082ddpc1bgx2jw7m";
        libraryHaskellDepends = [ base haskell-src-exts ];
        description = "A simplified view on the haskell-src-exts AST";
        license = stdenv.lib.licenses.mit;
@@ -112568,21 +112828,21 @@ self: {
      }) {};
 
   "haskell-to-elm" = callPackage
-    ({ mkDerivation, aeson, base, bound, elm-syntax, generics-sop
-     , protolude, text, time, unordered-containers
+    ({ mkDerivation, aeson, base, bound, elm-syntax, generics-sop, text
+     , time, unordered-containers
      }:
      mkDerivation {
        pname = "haskell-to-elm";
-       version = "0.2.1.0";
-       sha256 = "0a6h1hmfkwhi6yfbzb71yifmhvapbnrlwj5yp0kjp88nr1cnh69h";
+       version = "0.3.0.0";
+       sha256 = "02gspfwiif3a38fsfv0pxia7lcqyqppf9pnrbirnqdcry721mcvy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bound elm-syntax generics-sop protolude text time
+         aeson base bound elm-syntax generics-sop text time
          unordered-containers
        ];
        testHaskellDepends = [
-         aeson base bound elm-syntax generics-sop protolude text time
+         aeson base bound elm-syntax generics-sop text time
          unordered-containers
        ];
        description = "Generate Elm types and JSON encoders and decoders from Haskell types";
@@ -113885,8 +114145,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bitcoin & Bitcoin Cash library for Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "haskoin-crypto" = callPackage
@@ -115067,6 +115325,30 @@ self: {
        broken = true;
      }) {};
 
+  "hasql-notifications" = callPackage
+    ({ mkDerivation, base, bytestring, contravariant, hasql, hasql-pool
+     , hspec, postgresql-libpq, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "hasql-notifications";
+       version = "0.1.0.0";
+       sha256 = "18pix0fmbcf8l45q78w33vjyxxbp5c0gvqxdc9bhvkfhn0cl5q0i";
+       revision = "1";
+       editedCabalFile = "11crw51y45laxaidj615g7mlmp5igdxd5w35pmddb82xpg915ccs";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring contravariant hasql hasql-pool postgresql-libpq
+         text
+       ];
+       executableHaskellDepends = [ base hasql ];
+       testHaskellDepends = [ base bytestring hasql hspec QuickCheck ];
+       description = "LISTEN/NOTIFY support for Hasql";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "hasql-optparse-applicative" = callPackage
     ({ mkDerivation, base-prelude, hasql, hasql-pool
      , optparse-applicative
@@ -115178,8 +115460,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-th";
-       version = "0.4.0.4";
-       sha256 = "1kd12vw98wml58sp1dqfq58z0vjjqdssb6q7f6ngs7q6ig27kxfb";
+       version = "0.4.0.5";
+       sha256 = "1gc11n2g07cqipcvm779wwm36mfjjbnwg9n1ch7cldlg1wsr6m6n";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers contravariant
          fast-builder foldl hashable hasql headed-megaparsec megaparsec
@@ -115195,6 +115477,8 @@ self: {
        ];
        description = "Template Haskell utilities for Hasql";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hasql-transaction" = callPackage
@@ -116912,13 +117196,15 @@ self: {
      }:
      mkDerivation {
        pname = "headed-megaparsec";
-       version = "0.1.0.2";
-       sha256 = "0npkkphm4gv7cgm08asr5qxjyk6jdbm4h4w0jwsvxzpxh3nfxgbr";
+       version = "0.1.0.4";
+       sha256 = "1nl66j4fqmjcxkrmhm7jnbqqpw48727wfbb9xn0cz4yy1brivjrb";
        libraryHaskellDepends = [
          base case-insensitive megaparsec parser-combinators selective
        ];
        description = "More informative parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "headergen" = callPackage
@@ -120228,6 +120514,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "higher-leveldb_0_6_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, data-default, exceptions
+     , hspec, leveldb-haskell, mtl, process, resourcet, transformers
+     , transformers-base, unliftio, unliftio-core
+     }:
+     mkDerivation {
+       pname = "higher-leveldb";
+       version = "0.6.0.0";
+       sha256 = "0gsqf92vp92a0jl3nchm40mxi5k7hnm7wjczhpkq0akka6b7ciy7";
+       revision = "2";
+       editedCabalFile = "1g8fnqvxjcq332wrnls272ff8grcbrc875phm77nsmjb8q4wjqz7";
+       libraryHaskellDepends = [
+         base bytestring cereal data-default exceptions leveldb-haskell mtl
+         resourcet transformers transformers-base unliftio-core
+       ];
+       testHaskellDepends = [
+         base bytestring cereal hspec leveldb-haskell mtl process resourcet
+         transformers transformers-base unliftio
+       ];
+       description = "A rich monadic API for working with leveldb databases";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "higherorder" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -121651,10 +121961,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger";
-       version = "1.17";
-       sha256 = "1rdafl9c1z16ci3b812aaic6sbh1292dh5n3xqpnaqx9g68w71d4";
-       revision = "1";
-       editedCabalFile = "1lkg0h8hc7m0lj0hzylc3paiip2d6a6k9k37289gdynrm04nj258";
+       version = "1.17.1.1";
+       sha256 = "17c7g4xnwkbi77drqc6w96bp2lw0b86yg1qmm0gsdnli2m93baz4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121728,6 +122036,8 @@ self: {
        ];
        description = "A pie chart image generator for the hledger accounting tool";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hledger-diff" = callPackage
@@ -121806,10 +122116,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-interest";
-       version = "1.5.3";
-       sha256 = "1ff113z2ir07ihdvfa5fca4x326zwm2jd7sjy6hjpr4qgi1mszvs";
-       revision = "1";
-       editedCabalFile = "1myqv7hci32hvm98d4fn2zqdvkxsdx1g821n1fwr6814yn89kwjj";
+       version = "1.5.4";
+       sha256 = "0n3pjd86j43dprpsy1k9x72v8g46dhy3f9244hvwhigyx72ijm6h";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -121836,22 +122144,24 @@ self: {
        ];
        description = "computes the internal rate of return of an investment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hledger-lib" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base
      , base-compat-batteries, blaze-markup, bytestring, call-stack
      , cassava, cassava-megaparsec, cmdargs, containers, data-default
-     , Decimal, deepseq, directory, extra, fgl, file-embed, filepath
-     , Glob, hashtables, megaparsec, mtl, old-time, parsec
+     , Decimal, deepseq, directory, doctest, extra, fgl, file-embed
+     , filepath, Glob, hashtables, megaparsec, mtl, old-time, parsec
      , parser-combinators, pretty-show, regex-tdfa, safe, split, tabular
      , tasty, tasty-hunit, template-haskell, text, time, timeit
      , transformers, uglymemo, utf8-string
      }:
      mkDerivation {
        pname = "hledger-lib";
-       version = "1.17.0.1";
-       sha256 = "0kmwrkm4arhzzcfh4dhmikad1kfkv9y5dc58mjhi1jacdiy980r9";
+       version = "1.17.1";
+       sha256 = "19vny2l2l45dk0fkpi2lzpzaj7jks2r0zjv8dkpcxlyk8bvqi92c";
        libraryHaskellDepends = [
          aeson ansi-terminal array base base-compat-batteries blaze-markup
          bytestring call-stack cassava cassava-megaparsec cmdargs containers
@@ -121864,7 +122174,7 @@ self: {
        testHaskellDepends = [
          aeson ansi-terminal array base base-compat-batteries blaze-markup
          bytestring call-stack cassava cassava-megaparsec cmdargs containers
-         data-default Decimal deepseq directory extra fgl file-embed
+         data-default Decimal deepseq directory doctest extra fgl file-embed
          filepath Glob hashtables megaparsec mtl old-time parsec
          parser-combinators pretty-show regex-tdfa safe split tabular tasty
          tasty-hunit template-haskell text time timeit transformers uglymemo
@@ -121895,6 +122205,29 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "hledger-stockquotes" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cmdargs, containers
+     , hedgehog, hledger-lib, req, safe, scientific, split, tasty
+     , tasty-hedgehog, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "hledger-stockquotes";
+       version = "0.1.0.0";
+       sha256 = "19xn7rzrg4nw1dfdfm1hn7k0wdwrw8416rn28inkbkbn1f9mqgk5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers hledger-lib req safe scientific
+         split text time unordered-containers
+       ];
+       executableHaskellDepends = [ base bytestring cmdargs text time ];
+       testHaskellDepends = [
+         base hedgehog tasty tasty-hedgehog tasty-hunit
+       ];
+       description = "Generate HLedger Price Directives From Daily Stock Quotes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hledger-ui" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, base-compat-batteries
      , brick, cmdargs, containers, data-default, directory, extra
@@ -121904,8 +122237,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-ui";
-       version = "1.17";
-       sha256 = "1168h7lc6r61gpaiy07l9dp534hggnlvdcx3a2lmjx4m29ym1frz";
+       version = "1.17.1.1";
+       sha256 = "0cwjjcy4r6dy1w4svmi7jk1yrp654qr8ic33ipg24dh7bl6lqzps";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -121935,6 +122268,8 @@ self: {
        ];
        description = "A curses-style console interface for the hledger accounting tool";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "hledger-web" = callPackage
@@ -121949,8 +122284,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-web";
-       version = "1.17";
-       sha256 = "15flyvaamr7r3dlzk9ihc3bv8z15myfrzzhlbpc5s3gy6q85lmay";
+       version = "1.17.1";
+       sha256 = "0zcb7a8xchsb093sw9aq30n45rns9v0xknwvigds3ka8yb383krl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -122169,10 +122504,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlrdb";
-       version = "0.3.0.0";
-       sha256 = "0pc3hqi6v9b78fijisnarfs59w6mw8jgyww25r1wmblgwyakl5ab";
-       revision = "1";
-       editedCabalFile = "1ycglx3b5n1l97pq0rd50wd313gwz1is10snf8s0c9bjlrzspbn5";
+       version = "0.3.1.0";
+       sha256 = "19sxpyv331sjldanf40gw598gcj98n9xwc985cz9k2m38ck3vwhr";
        libraryHaskellDepends = [
          base base64-bytestring bytestring cryptonite hashable hedis
          hlrdb-core memory random store time unordered-containers
@@ -124265,8 +124598,8 @@ self: {
      }:
      mkDerivation {
        pname = "hopenpgp-tools";
-       version = "0.23";
-       sha256 = "1sgqx8b1sq89hpjzbdmkjsmrfagh5v0jfxyqphzkh1bq2zydj0jl";
+       version = "0.23.1";
+       sha256 = "0jq1if7c78758fnsb6wxsky0jn9mhmzwhb5jpyrpigx08diwd2mj";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -126668,8 +127001,8 @@ self: {
      }:
      mkDerivation {
        pname = "hs-server-starter";
-       version = "0.1.0.2";
-       sha256 = "1fykxrhh6s2w722jknz87in3ni3a9spjhbbrqm1vw5r5mcsv29gh";
+       version = "0.1.1.0";
+       sha256 = "1cki3c6fl7yjw9vww4h9vd68dnci5q8f5c1i3ip8kyv53s9rgbi3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory network ];
@@ -131274,33 +131607,6 @@ self: {
      }) {};
 
   "http-client" = callPackage
-    ({ mkDerivation, array, async, base, blaze-builder, bytestring
-     , case-insensitive, containers, cookie, deepseq, directory
-     , exceptions, filepath, ghc-prim, hspec, http-types, memory
-     , mime-types, monad-control, network, network-uri, random, stm
-     , streaming-commons, text, time, transformers, zlib
-     }:
-     mkDerivation {
-       pname = "http-client";
-       version = "0.6.4";
-       sha256 = "1n9rnbp8lwkd4whi2anniywi4y1bn9kx6nzfigfvz28d7pn7i4in";
-       libraryHaskellDepends = [
-         array base blaze-builder bytestring case-insensitive containers
-         cookie deepseq exceptions filepath ghc-prim http-types memory
-         mime-types network network-uri random stm streaming-commons text
-         time transformers
-       ];
-       testHaskellDepends = [
-         async base blaze-builder bytestring case-insensitive containers
-         deepseq directory hspec http-types monad-control network
-         network-uri streaming-commons text time transformers zlib
-       ];
-       doCheck = false;
-       description = "An HTTP client engine";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "http-client_0_6_4_1" = callPackage
     ({ mkDerivation, array, async, base, blaze-builder, bytestring
      , case-insensitive, containers, cookie, deepseq, directory
      , exceptions, filepath, ghc-prim, hspec, http-types, memory
@@ -131325,7 +131631,6 @@ self: {
        doCheck = false;
        description = "An HTTP client engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-client-auth" = callPackage
@@ -131686,26 +131991,6 @@ self: {
      }) {};
 
   "http-directory" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, html-conduit, http-client
-     , http-client-tls, http-date, http-types, network-uri, text, time
-     , xml-conduit
-     }:
-     mkDerivation {
-       pname = "http-directory";
-       version = "0.1.7";
-       sha256 = "11vka7a049mh56fy6bi9snjkl68il9fnw583l8dw02n67wldks99";
-       libraryHaskellDepends = [
-         base bytestring html-conduit http-client http-client-tls http-date
-         http-types network-uri text time xml-conduit
-       ];
-       testHaskellDepends = [ base hspec text ];
-       description = "http directory listing library";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "http-directory_0_1_8" = callPackage
     ({ mkDerivation, base, bytestring, hspec, html-conduit, http-client
      , http-client-tls, http-date, http-types, network-uri, text, time
      , xml-conduit
@@ -133095,8 +133380,8 @@ self: {
      }:
      mkDerivation {
        pname = "hurl";
-       version = "1.1.0.0";
-       sha256 = "0l405cp4kgmm00j91p0jmkymp83bqpxhqpgkv2g5qy242c6rjfk2";
+       version = "1.2.0.0";
+       sha256 = "07abw78ds4fb4y8c7x94fpwcab58b2k613b3dk8hh9qqplhgl8ms";
        libraryHaskellDepends = [
          base base64-bytestring bytestring directory filepath http-client
          http-client-tls http-types network-uri process text
@@ -133270,14 +133555,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hvega_0_6_0_0" = callPackage
+  "hvega_0_7_0_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , filepath, tasty, tasty-golden, text, unordered-containers
      }:
      mkDerivation {
        pname = "hvega";
-       version = "0.6.0.0";
-       sha256 = "0znipifss3cz55xj2nw27c4m284sb71gprksabypib3qdigqpwis";
+       version = "0.7.0.0";
+       sha256 = "0kj40mm5d809adblk74h0k57qqpk8jxl5bhildasjzjfmmr4spax";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ aeson base text unordered-containers ];
@@ -133370,29 +133655,6 @@ self: {
      }) {};
 
   "hw-bits" = callPackage
-    ({ mkDerivation, base, bitvec, bytestring, criterion, deepseq
-     , doctest, doctest-discover, hedgehog, hspec, hspec-discover
-     , hw-hspec-hedgehog, hw-int, hw-prim, hw-string-parse, vector
-     }:
-     mkDerivation {
-       pname = "hw-bits";
-       version = "0.7.1.2";
-       sha256 = "1jgj5j09ddiv6yf605m1azaknbfawqhfqc2m3xpr800v43myr3m8";
-       libraryHaskellDepends = [
-         base bitvec bytestring deepseq hw-int hw-prim hw-string-parse
-         vector
-       ];
-       testHaskellDepends = [
-         base bitvec bytestring doctest doctest-discover hedgehog hspec
-         hw-hspec-hedgehog hw-prim vector
-       ];
-       testToolDepends = [ doctest-discover hspec-discover ];
-       benchmarkHaskellDepends = [ base criterion vector ];
-       description = "Bit manipulation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-bits_0_7_1_5" = callPackage
     ({ mkDerivation, base, bitvec, bytestring, criterion, deepseq
      , doctest, doctest-discover, hedgehog, hspec, hspec-discover
      , hw-hspec-hedgehog, hw-int, hw-prim, hw-string-parse, vector
@@ -133413,7 +133675,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "Bit manipulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-ci-assist" = callPackage
@@ -135512,6 +135773,8 @@ self: {
        pname = "hyraxAbif";
        version = "0.2.3.21";
        sha256 = "0ghhfv8gzs9sg13nj3mhqd24zbrkjj1dgsjz3sql6276kpa1p2kc";
+       revision = "1";
+       editedCabalFile = "0rg4wldliyaixmgcyina2cnm7l6gwpcdd2bim1q83clnfk32scar";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -135535,8 +135798,8 @@ self: {
        pname = "hz3";
        version = "96.0.0.0";
        sha256 = "080bhbnhswic7m35rzbqi9i7lb57szag6khprrjccpa80vq7lj6n";
-       revision = "2";
-       editedCabalFile = "02q1pcy6z4vl1qm4klw17aqx577v7c4jsl4b5r5iw6293arym8fz";
+       revision = "3";
+       editedCabalFile = "0dm62xr708ps7dsln41cxsn4m4a5093dpq8xrp6hyss4mrzg8hz0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers transformers ];
@@ -135861,8 +136124,7 @@ self: {
        ];
        description = "A fast JSON document store with push notification support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       maintainers = with stdenv.lib.maintainers; [ rkrzr ];
      }) {};
 
   "icon-fonts" = callPackage
@@ -136682,8 +136944,8 @@ self: {
     ({ mkDerivation, aeson, base, hvega, ihaskell, text }:
      mkDerivation {
        pname = "ihaskell-hvega";
-       version = "0.2.3.0";
-       sha256 = "02j08ci3ss82g2a26qdnykwb1rggb8w53jqm4xnxc8hqm25fb3mk";
+       version = "0.2.4.0";
+       sha256 = "0yk8wxr1kh3xibb1l5jgjryq7h4id9cz59yjkjjzq41r6p1zr6yj";
        libraryHaskellDepends = [ aeson base hvega ihaskell text ];
        description = "IHaskell display instance for hvega types";
        license = stdenv.lib.licenses.bsd3;
@@ -137603,15 +137865,15 @@ self: {
      }) {};
 
   "incremental" = callPackage
-    ({ mkDerivation, aeson, base, containers, deepseq, extensible
+    ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , semigroups, text
      }:
      mkDerivation {
        pname = "incremental";
-       version = "0.1.1";
-       sha256 = "17lwakfa7xh0rdxr4hixlqy9hldvz06hcsclw3kln7m4iv4843d7";
+       version = "0.2";
+       sha256 = "0af3nrjmhxzn6q45nvrw8lw54239pkwdl3fdvhj10fv8rxdihnzh";
        libraryHaskellDepends = [
-         aeson base containers deepseq extensible semigroups text
+         aeson base bytestring containers deepseq semigroups text
        ];
        testHaskellDepends = [ base ];
        description = "incremental update library";
@@ -137666,28 +137928,6 @@ self: {
      }) {};
 
   "incremental-parser" = callPackage
-    ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
-     , monoid-subclasses, parsers, QuickCheck, rank2classes, tasty
-     , tasty-quickcheck, text, transformers
-     }:
-     mkDerivation {
-       pname = "incremental-parser";
-       version = "0.4";
-       sha256 = "0iyprnyk66zdyi21632d0aznvzk7i0hmr3idq49yjilxwck2xac4";
-       libraryHaskellDepends = [
-         base monoid-subclasses parsers rank2classes transformers
-       ];
-       testHaskellDepends = [
-         base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion deepseq monoid-subclasses text
-       ];
-       description = "Generic parser library capable of providing partial results from partial input";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "incremental-parser_0_4_0_1" = callPackage
     ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
      , monoid-subclasses, parsers, QuickCheck, rank2classes, tasty
      , tasty-quickcheck, text, transformers
@@ -137707,7 +137947,6 @@ self: {
        ];
        description = "Generic parser library capable of providing partial results from partial input";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "incremental-sat-solver" = callPackage
@@ -139560,8 +139799,8 @@ self: {
        pname = "intro";
        version = "0.6.0.1";
        sha256 = "1kka6dnlyqppjx9ykk3zixfyslr8cf4ja6sa2hgq6h69mmsicp67";
-       revision = "1";
-       editedCabalFile = "1jxd4agavzccgszniqzakgpb6b49qx5c20asr068rpvaf03msncx";
+       revision = "2";
+       editedCabalFile = "12jmy4lp9yrix6hm6cx3kmgprpmlwdyxqckyx53h01iygfpbx3w5";
        libraryHaskellDepends = [
          base bytestring containers deepseq dlist extra hashable mtl safe
          text transformers unordered-containers writer-cps-mtl
@@ -140205,26 +140444,23 @@ self: {
      }) {};
 
   "ipfs" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, data-has, directory
-     , directory-tree, doctest, envy, flow, Glob, http-client, ip, lens
-     , lens-aeson, monad-logger, QuickCheck, regex-compat, rio
-     , servant-client, servant-client-core, servant-multipart
-     , servant-server, swagger2, text, vector, yaml
+    ({ mkDerivation, aeson, base, bytestring, directory, directory-tree
+     , doctest, envy, flow, Glob, ip, lens, lens-aeson, monad-logger
+     , QuickCheck, regex-compat, rio, servant-client, servant-server
+     , swagger2, text, vector, yaml
      }:
      mkDerivation {
        pname = "ipfs";
-       version = "1.0.1";
-       sha256 = "1k4ybm99gbwnv1crx8y8fggf9iv1f1g49x3zvypji7n1zgx84b1r";
+       version = "1.0.2";
+       sha256 = "0mrr67bz283qqz0d70j9gz191l4pi554j3hmcf7pscg87b84rdv5";
        libraryHaskellDepends = [
-         aeson base bytestring data-has envy flow Glob http-client ip lens
-         monad-logger regex-compat rio servant-client servant-client-core
-         servant-multipart servant-server swagger2 text vector
+         aeson base bytestring envy flow Glob ip lens monad-logger
+         regex-compat rio servant-client servant-server swagger2 text vector
        ];
        testHaskellDepends = [
-         aeson base bytestring data-has directory directory-tree doctest
-         envy flow Glob http-client ip lens lens-aeson monad-logger
-         QuickCheck regex-compat rio servant-client servant-client-core
-         servant-multipart servant-server swagger2 text vector yaml
+         aeson base bytestring directory directory-tree doctest envy flow
+         Glob ip lens lens-aeson monad-logger QuickCheck regex-compat rio
+         servant-client servant-server swagger2 text vector yaml
        ];
        description = "Access IPFS locally and remotely";
        license = stdenv.lib.licenses.agpl3Plus;
@@ -140325,6 +140561,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "iproute_1_7_9" = callPackage
+    ({ mkDerivation, appar, base, byteorder, bytestring, containers
+     , doctest, hspec, network, QuickCheck, safe
+     }:
+     mkDerivation {
+       pname = "iproute";
+       version = "1.7.9";
+       sha256 = "1m306fi39ifqq53sklwn81q96wam8nvx7mr5hv4m9f26kiczlism";
+       libraryHaskellDepends = [
+         appar base byteorder bytestring containers network
+       ];
+       testHaskellDepends = [
+         appar base byteorder bytestring containers doctest hspec network
+         QuickCheck safe
+       ];
+       description = "IP Routing Table";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "iptables-helpers" = callPackage
     ({ mkDerivation, base, containers, mtl, parsec, QuickCheck, safe
      , syb, utf8-string
@@ -141700,10 +141956,8 @@ self: {
      }:
      mkDerivation {
        pname = "ixset-typed";
-       version = "0.4.0.1";
-       sha256 = "135cfc8d39qv02sga03gsym1yfajf0l5ci1s6q9n1xpb9ignblx8";
-       revision = "1";
-       editedCabalFile = "0kfklsbjn4gmx76vl7vm1s149f13h2p537930yaq8s2671lzc79p";
+       version = "0.5";
+       sha256 = "07n7qfi8slmrlgzvrkddr17b792phhb140q9gb5pm68kk1im4izs";
        libraryHaskellDepends = [
          base containers deepseq safecopy syb template-haskell
        ];
@@ -142434,6 +142688,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "jira-wiki-markup_1_1_3" = callPackage
+    ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }:
+     mkDerivation {
+       pname = "jira-wiki-markup";
+       version = "1.1.3";
+       sha256 = "1hr67awpl1zpwp53x9b6ix4gdfq8r77r9wnm44qc9q91q8i872wv";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base mtl parsec text ];
+       executableHaskellDepends = [ base text ];
+       testHaskellDepends = [ base parsec tasty tasty-hunit text ];
+       description = "Handle Jira wiki markup";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "jmacro" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
      , haskell-src-exts, haskell-src-meta, mtl, parseargs, parsec
@@ -144824,8 +145094,8 @@ self: {
        pname = "kansas-comet";
        version = "0.4";
        sha256 = "1q9rffh6589a5am8mvfzxzwws34vg08rdjxggfabhmg9y9jla6hz";
-       revision = "18";
-       editedCabalFile = "0yxgndvrashc0cp3zv39gjrzw7p53g0k51p13q67nqnpxhh05w2k";
+       revision = "19";
+       editedCabalFile = "0pnfhv3dlg9cs98nyz5kqdi5mq340909id8rb4lcdj9748w8gz4w";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base containers data-default-class scotty stm text time
@@ -149660,8 +149930,8 @@ self: {
      }:
      mkDerivation {
        pname = "launchdarkly-server-sdk";
-       version = "1.0.1";
-       sha256 = "1425n7b587k9c6w3k95lcdhk5blj9blzjgnb67ylr1fizzayxc7h";
+       version = "1.0.2";
+       sha256 = "1psm449p7fsh4b5mf7y7dlgh44za1fhf0cbn0qya1j4imy3x673b";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring
          bytestring-conversion clock containers cryptohash exceptions extra
@@ -151709,6 +151979,8 @@ self: {
        ];
        description = "Haskell interface to libarchive";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {inherit (pkgs) libarchive;};
 
   "libarchive-conduit" = callPackage
@@ -155403,8 +155675,8 @@ self: {
     ({ mkDerivation, base, containers, doctest, hedgehog }:
      mkDerivation {
        pname = "loc";
-       version = "0.1.3.4";
-       sha256 = "1xdqnqr4wy3xw9vyfkf6c8xsq74nryhb8z31grcwpn6ppdgzyqy2";
+       version = "0.1.3.6";
+       sha256 = "0bspclskqk0kzvic8y4bxagjrfzxpq53xgr0jfp6rcqacql6qvdr";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers doctest hedgehog ];
        description = "Types representing line and column positions and ranges in text files";
@@ -155417,8 +155689,8 @@ self: {
     ({ mkDerivation, base, containers, hedgehog, loc }:
      mkDerivation {
        pname = "loc-test";
-       version = "0.1.3.4";
-       sha256 = "1lzmyxm34zvkdz3piwmnhd7m0ijjnlwqbpi5lgbqvbrikbw579qp";
+       version = "0.1.3.6";
+       sha256 = "0kzr7adk85y9fcibi8rw7ix3vp2z17ig211lw820nirhwb8xj697";
        libraryHaskellDepends = [ base containers hedgehog loc ];
        description = "Test-related utilities related to the /loc/ package";
        license = stdenv.lib.licenses.asl20;
@@ -157726,8 +157998,8 @@ self: {
      }:
      mkDerivation {
        pname = "lzlib";
-       version = "1.0.4.0";
-       sha256 = "1l7mbxh2cn8vgfxwkzrz9mv5ca2bx4ymbswvjz7b3mgjx0wiy9g8";
+       version = "1.0.6.0";
+       sha256 = "1qirn7kbcnxx6ihhk0r6p2jyfbs8cqsinfnmn774i3vkj1fahpn1";
        libraryHaskellDepends = [ base bytestring ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [
@@ -157903,6 +158175,8 @@ self: {
        ];
        description = "A toolkit for working with macaroons";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "macbeth-lib" = callPackage
@@ -159713,10 +159987,10 @@ self: {
     ({ mkDerivation, base, comonad, HTF, MonadRandom }:
      mkDerivation {
        pname = "markov-realization";
-       version = "0.3.3";
-       sha256 = "1w6rj8l40ajb5nmh3mlf99n526a17w7q9vnyn6x3j9sn0sm4csl3";
+       version = "0.4";
+       sha256 = "1kkydk71yhzf2q82vzal6npfs022a5x2ynj95l835kn1lh2n3vhm";
        libraryHaskellDepends = [ base comonad MonadRandom ];
-       testHaskellDepends = [ base HTF ];
+       testHaskellDepends = [ base HTF MonadRandom ];
        description = "Realizations of Markov chains";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -160000,7 +160274,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "massiv_0_5_0_0" = callPackage
+  "massiv_0_5_1_0" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cabal-doctest
      , data-default-class, deepseq, doctest, exceptions
      , mersenne-random-pure64, primitive, QuickCheck, random, scheduler
@@ -160008,8 +160282,8 @@ self: {
      }:
      mkDerivation {
        pname = "massiv";
-       version = "0.5.0.0";
-       sha256 = "09hyrlhcvqrhsmyl7lsm9qmp8yshia1jmjh2bqlsnw8xvwg2z13a";
+       version = "0.5.1.0";
+       sha256 = "062b9mg1nqsg7lfv4a85s994jg1fipikpvxdb9w6ci3dqiq41dx0";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base bytestring data-default-class deepseq exceptions primitive
@@ -160547,6 +160821,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "matrix-sized" = callPackage
+    ({ mkDerivation, base, binary, bytestring, deepseq, primitive
+     , singletons, vector
+     }:
+     mkDerivation {
+       pname = "matrix-sized";
+       version = "0.0.2";
+       sha256 = "1sp9d3pfkq80klwryvggjf76hm4y9qqair3cppvgnp06kn99k1z1";
+       libraryHaskellDepends = [
+         base binary bytestring deepseq primitive singletons vector
+       ];
+       description = "Haskell matrix library with interface to C++ linear algebra libraries";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "matrix-static" = callPackage
     ({ mkDerivation, base, deepseq, ghc-typelits-natnormalise, matrix
      , tasty, tasty-hunit, vector
@@ -160647,7 +160936,8 @@ self: {
        ];
        description = "Terminal client for the Mattermost chat system";
        license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ kiwi ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mattermost-api" = callPackage
@@ -160675,6 +160965,8 @@ self: {
        ];
        description = "Client API for Mattermost chat system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "mattermost-api-qc" = callPackage
@@ -160690,6 +160982,8 @@ self: {
        ];
        description = "QuickCheck instances for the Mattermost client API library";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "maude" = callPackage
@@ -165228,8 +165522,8 @@ self: {
        pname = "monad-choice";
        version = "0.1.0.0";
        sha256 = "0vhfiqrnkfhqkhnh9h4npl3rfam321iikabr3przywfcfd4gap4z";
-       revision = "1";
-       editedCabalFile = "19acnk2dy5zan230g268nyvdx1y8piav3x9z6jsjbi2d7zm9sr38";
+       revision = "3";
+       editedCabalFile = "055zzzz9ag1wb79bjx0wg59plajym156hz0bh0lq4ndvn4k7sxay";
        libraryHaskellDepends = [
          base invariant MonadRandom mtl transformers
        ];
@@ -168022,6 +168316,18 @@ self: {
        broken = true;
      }) {};
 
+  "mr-env" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "mr-env";
+       version = "0.1.0.1";
+       sha256 = "102m1gqjcscwf620jpaz1i7hg73ikd19an2wjgnfpfrlzw83xgd6";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       description = "A simple way to read environment variables in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "mrifk" = callPackage
     ({ mkDerivation, array, base, containers, mtl }:
      mkDerivation {
@@ -169841,19 +170147,21 @@ self: {
      }) {};
 
   "musicScroll" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, dbus, gi-gtk
-     , gi-gtk-hs, gtk3, mtl, req, stm, tagsoup, text, transformers
+    ({ mkDerivation, async, base, bytestring, containers, cryptonite
+     , dbus, deepseq, directory, gi-gtk, gi-gtk-hs, gtk3, mtl, req
+     , sqlite-simple, stm, tagsoup, text, transformers, xdg-basedir
      }:
      mkDerivation {
        pname = "musicScroll";
-       version = "0.1.2.0";
-       sha256 = "0n0s9vkhfwykghniillih5qgdz4cg1rn4vn86hinxaqfgzv6m96w";
+       version = "0.2.0.0";
+       sha256 = "1iv80yhal5f8klsc095yabq7402w45j8lb0g64avdyp2zy569vmx";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         async base bytestring containers dbus gi-gtk gi-gtk-hs mtl req stm
-         tagsoup text transformers
+         async base bytestring containers cryptonite dbus deepseq directory
+         gi-gtk gi-gtk-hs mtl req sqlite-simple stm tagsoup text
+         transformers xdg-basedir
        ];
        executableHaskellDepends = [ base ];
        executablePkgconfigDepends = [ gtk3 ];
@@ -171101,8 +171409,8 @@ self: {
     ({ mkDerivation, base, containers, template-haskell }:
      mkDerivation {
        pname = "names-th";
-       version = "0.3.0.0";
-       sha256 = "09m5zflpk1h7jwz40mijhnpbsd8qnnay1jm3lpfrvdmg49m8zqqb";
+       version = "0.3.0.1";
+       sha256 = "12ally0n6ixsxj0zwbvw439dbx29phvh0rd6l5sd0c5a514a32aa";
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Manipulate name strings for TH";
        license = stdenv.lib.licenses.bsd3;
@@ -172694,8 +173002,8 @@ self: {
      }:
      mkDerivation {
        pname = "netwire-input-glfw";
-       version = "0.0.10";
-       sha256 = "1r186xwr5lycs0snr8amvyxvbq2l5jd9p20v8n12zyjm60kmi90y";
+       version = "0.0.11";
+       sha256 = "1sizk0c8mbm6ad984gaf933h1bg4dgwi9k8hzrm9wp5rwbqjvcz8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -174703,8 +175011,8 @@ self: {
      }:
      mkDerivation {
        pname = "nix-diff";
-       version = "1.0.8";
-       sha256 = "0073802yrd5f1zfhnbsll9cqcycihw9bac1psfwvcwvihsh3j413";
+       version = "1.0.9";
+       sha256 = "0gqrx0l6f10gwsz645dby2gascd0sanajvd2rkg65c61g8j7pxv4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -174816,6 +175124,8 @@ self: {
        pname = "nixfmt";
        version = "0.4.0";
        sha256 = "1ispgl8rc2scr6v8bb6sks7px856jf61x74zj2iyddrn5qamkb3n";
+       revision = "1";
+       editedCabalFile = "1hsj0jh6siph3afd9c2wii09sffl48rzqv653n4clpd8qy0rn48d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -177576,6 +177886,19 @@ self: {
        broken = true;
      }) {};
 
+  "om-actor" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "om-actor";
+       version = "0.1.0.0";
+       sha256 = "1wiasb3f22g47n54jhxv1c74a0ghxsknrakjdgj3fqlw878g3aan";
+       libraryHaskellDepends = [ base ];
+       description = "Actor pattern utilities";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "om-elm" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , http-types, safe, safe-exceptions, template-haskell, text, unix
@@ -177607,6 +177930,8 @@ self: {
        ];
        description = "Monad transformer providing MonadFail";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "omaketex" = callPackage
@@ -178733,6 +179058,8 @@ self: {
          base http-client http-types opentelemetry text
        ];
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "opentelemetry-lightstep" = callPackage
@@ -178763,6 +179090,8 @@ self: {
        sha256 = "1n27g8xjij05g7xxx8z50k39nmclhm707xs2pfqy830zdq1ldfl4";
        libraryHaskellDepends = [ base http-types opentelemetry text wai ];
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "opentheory" = callPackage
@@ -179779,29 +180108,33 @@ self: {
      }) {};
 
   "org-mode" = callPackage
-    ({ mkDerivation, base, filepath, hashable, megaparsec
-     , parser-combinators, tasty, tasty-hunit, text, time
+    ({ mkDerivation, base, containers, filepath, hashable, megaparsec
+     , parser-combinators, tasty, tasty-hunit, text
      }:
      mkDerivation {
        pname = "org-mode";
-       version = "1.0.1";
-       sha256 = "0nhpb8x11w0w3jwplk3bx9a2llw77l66wbm31bpgdpr6ak2r0z75";
+       version = "1.1.0";
+       sha256 = "1k8k24wkvjflrg5bcv6i4ypak5m0k20hrh0gxf5c23y5s4b9dmz5";
        libraryHaskellDepends = [
-         base filepath hashable megaparsec parser-combinators text time
-       ];
-       testHaskellDepends = [
-         base megaparsec tasty tasty-hunit text time
+         base containers filepath hashable megaparsec parser-combinators
+         text
        ];
+       testHaskellDepends = [ base megaparsec tasty tasty-hunit text ];
+       description = "Parser for Emacs org-mode files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "org-mode-lucid" = callPackage
-    ({ mkDerivation, base, hashable, lucid, org-mode, text }:
+    ({ mkDerivation, base, containers, hashable, lucid, org-mode, text
+     }:
      mkDerivation {
        pname = "org-mode-lucid";
-       version = "1.1.0";
-       sha256 = "066mdm9a7dkz6yy9g2yhqalvxrxhak1mw0awag3ivswv6djf528q";
-       libraryHaskellDepends = [ base hashable lucid org-mode text ];
+       version = "1.2.0";
+       sha256 = "1y7dxm3g7jzq7y45z1d4k1j4rsfjdg4l8gk1ykn5frigwf01vwkf";
+       libraryHaskellDepends = [
+         base containers hashable lucid org-mode text
+       ];
+       description = "Lucid integration for org-mode";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -179886,8 +180219,8 @@ self: {
      }:
      mkDerivation {
        pname = "orgstat";
-       version = "0.1.7";
-       sha256 = "1yvzs6sdkdgi5gfdgznnz1f03sf57icnn7bb5njcam7gxwvswbkp";
+       version = "0.1.8";
+       sha256 = "072xdy9kg853l7lskm1knkk63pnyqh44s7zakplb37x46rcsj4jc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -181764,8 +182097,8 @@ self: {
      }:
      mkDerivation {
        pname = "pantry";
-       version = "0.4.0.0";
-       sha256 = "11n0xrk5258inzzikbapsv7752396qsrgaaf5kimpzgb67cs9k5j";
+       version = "0.4.0.1";
+       sha256 = "182aiwwgrsdj9f4x71q1grj674d91djp4q6bz2l51ly5dsjy5wbf";
        libraryHaskellDepends = [
          aeson ansi-terminal base bytestring Cabal casa-client casa-types
          conduit conduit-extra containers cryptonite cryptonite-conduit
@@ -183092,6 +183425,8 @@ self: {
        pname = "parsers-megaparsec";
        version = "0.1.0.1";
        sha256 = "1fgxnxv5ispf7zg40fa35f1n7x7mk1pc8r96sbqpjbzasga79rx8";
+       revision = "1";
+       editedCabalFile = "16a7h16lq27930l0hpa8z97b4p6cwrz3wdxs67mfxvz2ndngm87d";
        libraryHaskellDepends = [
          base fail megaparsec mtl parsers semigroups text transformers
        ];
@@ -185294,6 +185629,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "persistable-record_0_6_0_5" = callPackage
+    ({ mkDerivation, array, base, containers, dlist, names-th
+     , product-isomorphic, quickcheck-simple, template-haskell
+     , th-bang-compat, th-constraint-compat, th-data-compat
+     , transformers
+     }:
+     mkDerivation {
+       pname = "persistable-record";
+       version = "0.6.0.5";
+       sha256 = "1jm8270c7805alxa8q8pa5ql9f1ah3ns3p910j86h4bjnvgbvyqa";
+       libraryHaskellDepends = [
+         array base containers dlist names-th product-isomorphic
+         template-haskell th-bang-compat th-constraint-compat th-data-compat
+         transformers
+       ];
+       testHaskellDepends = [ base quickcheck-simple ];
+       description = "Binding between SQL database values and haskell records";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "persistable-types-HDBC-pg" = callPackage
     ({ mkDerivation, base, bytestring, convertible, dlist, HDBC
      , persistable-record, relational-query, relational-query-HDBC
@@ -185738,7 +186094,8 @@ self: {
        ];
        description = "Backend for the persistent library using postgresql";
        license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "persistent-protobuf" = callPackage
@@ -188736,17 +189093,18 @@ self: {
 
   "pkgtreediff" = callPackage
     ({ mkDerivation, async, base, directory, filepath, Glob
-     , http-directory, simple-cmd, simple-cmd-args, text
+     , http-client, http-client-tls, http-directory, simple-cmd
+     , simple-cmd-args, text
      }:
      mkDerivation {
        pname = "pkgtreediff";
-       version = "0.3";
-       sha256 = "0n39cn75cdxzk39hn6fiimb7rm1qrvksmqidy5fgnx997y78z8s9";
+       version = "0.4";
+       sha256 = "00cah2sbfx824zvg4ywm3qw8rkibflj9lmw1z0ywsalgdmmlp460";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         async base directory filepath Glob http-directory simple-cmd
-         simple-cmd-args text
+         async base directory filepath Glob http-client http-client-tls
+         http-directory simple-cmd simple-cmd-args text
        ];
        description = "Package tree diff tool";
        license = stdenv.lib.licenses.gpl3;
@@ -188780,15 +189138,14 @@ self: {
   "plaid" = callPackage
     ({ mkDerivation, aeson, base, bytestring, casing, conduit
      , conduit-extra, containers, either, errors, hspec, hspec-wai
-     , hspec-wai-json, http-client, http-client-tls, http-conduit
-     , http-types, microlens, microlens-th, mtl, network, pretty-simple
-     , QuickCheck, raw-strings-qq, safe-exceptions, text, time
-     , transformers, wai
+     , http-client, http-client-tls, http-conduit, http-types, microlens
+     , microlens-th, mtl, network, pretty-simple, QuickCheck
+     , raw-strings-qq, safe-exceptions, text, time, transformers, wai
      }:
      mkDerivation {
        pname = "plaid";
-       version = "0.1.0.0";
-       sha256 = "125427rhy5xlaw3qinrazyyj39z4g0rbnhm2k4jrgp1jgba91lc3";
+       version = "0.1.0.4";
+       sha256 = "1mwwd3mnj45l1487hfhb8lhgcvik88qch7vzgk17zv77ginnifni";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -188802,9 +189159,8 @@ self: {
          safe-exceptions text time transformers
        ];
        testHaskellDepends = [
-         aeson base bytestring containers errors hspec hspec-wai
-         hspec-wai-json http-types microlens microlens-th pretty-simple
-         QuickCheck text time wai
+         aeson base bytestring containers errors hspec hspec-wai http-types
+         microlens microlens-th pretty-simple QuickCheck text time wai
        ];
        description = "Plaid.com api integration library";
        license = stdenv.lib.licenses.bsd3;
@@ -190080,6 +190436,8 @@ self: {
        pname = "polynom";
        version = "0.1.0.0";
        sha256 = "1cggjbmyas3bzcs81falp50wq649nhvgxwhhnyk434s0k2h2chwh";
+       revision = "1";
+       editedCabalFile = "0nfrlp48rgw96bpms30d9s2qmhjmbgxszprh2xi73pmjddk26qg3";
        libraryHaskellDepends = [
          algebra base base-unicode-symbols containers
        ];
@@ -191245,33 +191603,33 @@ self: {
 
   "postgres-websockets" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
-     , containers, contravariant, either, envparse, hasql, hasql-pool
-     , hspec, hspec-wai, hspec-wai-json, http-types, jose, jwt, lens
-     , lens-aeson, postgresql-libpq, protolude, retry, stm
+     , containers, contravariant, either, envparse, hasql
+     , hasql-notifications, hasql-pool, hspec, hspec-wai, hspec-wai-json
+     , http-types, jose, lens, postgresql-libpq, protolude, retry, stm
      , stm-containers, stringsearch, text, time, transformers
      , unordered-containers, wai, wai-app-static, wai-extra
      , wai-websockets, warp, websockets
      }:
      mkDerivation {
        pname = "postgres-websockets";
-       version = "0.5.0.1";
-       sha256 = "0afhrzhixy0f31050jb04w8np6935wcl3j7ckbk0dm23mqz2z3zy";
+       version = "0.6.0.0";
+       sha256 = "0m9fypc216qcsx596sizgxjv30w08fpfpjglmcias88ri4n3ggy5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring contravariant either hasql hasql-pool
-         http-types jose jwt lens lens-aeson postgresql-libpq protolude
-         retry stm stm-containers stringsearch text time
-         unordered-containers wai wai-websockets websockets
+         aeson base bytestring contravariant either hasql
+         hasql-notifications hasql-pool http-types jose lens
+         postgresql-libpq protolude retry stm stm-containers stringsearch
+         text time unordered-containers wai wai-websockets websockets
        ];
        executableHaskellDepends = [
          base base64-bytestring bytestring envparse hasql hasql-pool
          protolude text time transformers wai wai-app-static wai-extra warp
        ];
        testHaskellDepends = [
-         aeson base containers hasql hasql-pool hspec hspec-wai
-         hspec-wai-json http-types protolude stm unordered-containers
-         wai-extra
+         aeson base containers hasql hasql-notifications hasql-pool hspec
+         hspec-wai hspec-wai-json http-types protolude stm
+         unordered-containers wai-extra
        ];
        description = "Middleware to map LISTEN/NOTIFY messages to Websockets";
        license = stdenv.lib.licenses.bsd3;
@@ -194181,14 +194539,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "process_1_6_8_0" = callPackage
+  "process_1_6_8_2" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, directory, filepath
      , unix
      }:
      mkDerivation {
        pname = "process";
-       version = "1.6.8.0";
-       sha256 = "07vl1j66xya4wqm3h42lpkhshpmz90b68r93i2766zhsnx0ryr5r";
+       version = "1.6.8.2";
+       sha256 = "1gdz227gmpax92xmwrvj9nrylybh4kk7m4yqr8qwa9i34dg1jzqx";
        libraryHaskellDepends = [ base deepseq directory filepath unix ];
        testHaskellDepends = [ base bytestring directory ];
        description = "Process libraries";
@@ -195338,8 +195696,8 @@ self: {
      }:
      mkDerivation {
        pname = "prosidy";
-       version = "1.6.0.0";
-       sha256 = "19c8kz6kdd2flzi1gyddi4yp4fn62wfjahcp66saydb4ipxdxfs4";
+       version = "1.6.0.1";
+       sha256 = "1yd36sjs342may33fbrpzgaghql03wjgprbllkms8pr6d16z8m49";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base binary bytestring containers contravariant deepseq
@@ -196900,7 +197258,8 @@ self: {
        doCheck = false;
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ cdepillabout ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "purescript-bridge" = callPackage
@@ -197359,6 +197718,22 @@ self: {
        broken = true;
      }) {};
 
+  "pvar" = callPackage
+    ({ mkDerivation, async, base, deepseq, genvalidity, hspec
+     , primitive, QuickCheck
+     }:
+     mkDerivation {
+       pname = "pvar";
+       version = "0.1.1.0";
+       sha256 = "1fzcv2bzm9hf879a6vcgcsmyjn4fhpl9smz8phi6bq1acfzkg026";
+       libraryHaskellDepends = [ base deepseq primitive ];
+       testHaskellDepends = [
+         async base deepseq genvalidity hspec primitive QuickCheck
+       ];
+       description = "Mutable variable with primitive values";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pvd" = callPackage
     ({ mkDerivation, array, base, Codec-Image-DevIL, containers
      , haskell98, libdevil, mtl, network, stm, X11
@@ -198663,31 +199038,37 @@ self: {
      }) {};
 
   "quickcheck-state-machine" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
-     , directory, doctest, exceptions, filelock, filepath, http-client
-     , matrix, monad-logger, mtl, network, persistent
-     , persistent-postgresql, persistent-template, pretty-show, process
-     , QuickCheck, quickcheck-instances, random, resourcet, servant
-     , servant-client, servant-server, strict, string-conversions, tasty
-     , tasty-hunit, tasty-quickcheck, text, tree-diff, unliftio, vector
-     , wai, warp
+    ({ mkDerivation, aeson, ansi-wl-pprint, array, base, bifunctors
+     , bytestring, containers, directory, doctest, exceptions, filelock
+     , filepath, generic-data, graphviz, hashable, hashtables, hs-rqlite
+     , HTTP, http-client, markov-chain-usage-model, matrix, monad-logger
+     , mtl, network, persistent, persistent-postgresql
+     , persistent-sqlite, persistent-template, postgresql-simple
+     , pretty-show, process, QuickCheck, quickcheck-instances, random
+     , resource-pool, resourcet, servant, servant-client, servant-server
+     , sop-core, split, stm, strict, string-conversions, tasty
+     , tasty-hunit, tasty-quickcheck, text, time, tree-diff, unliftio
+     , unliftio-core, vector, wai, warp
      }:
      mkDerivation {
        pname = "quickcheck-state-machine";
-       version = "0.6.0";
-       sha256 = "0zbjap2jjd534w6cigi4xz34x3f6w8icvxyvxs35j61c52cp2pry";
+       version = "0.7.0";
+       sha256 = "053fc1hxkpfpmwn5dq5x5vd094g978hwc145qpzknwbk6hrc28ka";
        libraryHaskellDepends = [
-         ansi-wl-pprint base containers exceptions matrix mtl pretty-show
-         QuickCheck tree-diff unliftio vector
+         ansi-wl-pprint base containers directory exceptions filepath
+         generic-data graphviz markov-chain-usage-model matrix mtl
+         pretty-show process QuickCheck random sop-core split text time
+         tree-diff unliftio
        ];
        testHaskellDepends = [
-         base bytestring containers directory doctest filelock filepath
-         http-client matrix monad-logger mtl network persistent
-         persistent-postgresql persistent-template pretty-show process
-         QuickCheck quickcheck-instances random resourcet servant
-         servant-client servant-server strict string-conversions tasty
-         tasty-hunit tasty-quickcheck text tree-diff unliftio vector wai
-         warp
+         aeson array base bifunctors bytestring containers directory doctest
+         filelock filepath hashable hashtables hs-rqlite HTTP http-client
+         monad-logger mtl network persistent persistent-postgresql
+         persistent-sqlite persistent-template postgresql-simple pretty-show
+         process QuickCheck quickcheck-instances random resource-pool
+         resourcet servant servant-client servant-server split stm strict
+         string-conversions tasty tasty-hunit tasty-quickcheck text time
+         tree-diff unliftio unliftio-core vector wai warp
        ];
        description = "Test monadic programs using state machine based models";
        license = stdenv.lib.licenses.bsd3;
@@ -199923,6 +200304,19 @@ self: {
        broken = true;
      }) {};
 
+  "rampart" = callPackage
+    ({ mkDerivation, base, criterion, hspec }:
+     mkDerivation {
+       pname = "rampart";
+       version = "1.0.0.2";
+       sha256 = "17apaldhpqwz8xdnjvz9lwsdlhpvad5107xw5d4v6ql8zvjgz0yw";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       benchmarkHaskellDepends = [ base criterion ];
+       description = "🏰 Determine how intervals relate to each other";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "ramus" = callPackage
     ({ mkDerivation, base, criterion, hspec, QuickCheck, quickcheck-io
      }:
@@ -200127,8 +200521,8 @@ self: {
      }:
      mkDerivation {
        pname = "random-fu";
-       version = "0.2.7.3";
-       sha256 = "071b3gi88kmrfiy6kyz1x67mqljwqb4l45vzg1rc2zig3iwy66ih";
+       version = "0.2.7.4";
+       sha256 = "13dgx069lvdfxm7l2q2l6d7q0gd3wp41b8l4l6wmhlfbl5xici3m";
        libraryHaskellDepends = [
          base erf math-functions monad-loops mtl random-shuffle
          random-source rvar syb template-haskell transformers vector
@@ -200196,16 +200590,16 @@ self: {
 
   "random-source" = callPackage
     ({ mkDerivation, base, flexible-defaults, mersenne-random-pure64
-     , mtl, mwc-random, random, stateref, syb, template-haskell
-     , th-extras
+     , mtl, mwc-random, primitive, random, stateref, syb
+     , template-haskell, th-extras
      }:
      mkDerivation {
        pname = "random-source";
-       version = "0.3.0.6";
-       sha256 = "0wsv41kpswqml04ym5bq2nan4i637f7h3fmvda2zy506xwxfrpzk";
+       version = "0.3.0.8";
+       sha256 = "0kjvpmxhff6id99hhgjp3vvb4vlhs3shkrh1n5cbfm7450lpmmn2";
        libraryHaskellDepends = [
-         base flexible-defaults mersenne-random-pure64 mtl mwc-random random
-         stateref syb template-haskell th-extras
+         base flexible-defaults mersenne-random-pure64 mtl mwc-random
+         primitive random stateref syb template-haskell th-extras
        ];
        description = "Generic basis for random number generators";
        license = stdenv.lib.licenses.publicDomain;
@@ -200940,8 +201334,8 @@ self: {
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "9.0.8";
-       sha256 = "1a98zy1n6dlxxyfdganqfcx8hw04i4hjwdj8ggdd4g0jky62jaz2";
+       version = "9.0.9";
+       sha256 = "1i638s8q0vnwkn1s2gwdz98p28vg9rmlz0hc24maks80vbyjraba";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -202117,7 +202511,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "rebase_1_6" = callPackage
+  "rebase_1_6_0_1" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, comonad, containers
      , contravariant, contravariant-extras, deepseq, dlist, either
      , hashable, mtl, profunctors, scientific, selective, semigroupoids
@@ -202126,8 +202520,8 @@ self: {
      }:
      mkDerivation {
        pname = "rebase";
-       version = "1.6";
-       sha256 = "1hsfff3rsaigjcg8s7mvipi68xqx4ala1zdrghgyb76z1c23m6iw";
+       version = "1.6.0.1";
+       sha256 = "0w0vy4y2v09a9v8qjqcxq5nqrdk8c1mw7lak9mwv16j59bcijn0x";
        libraryHaskellDepends = [
          base bifunctors bytestring comonad containers contravariant
          contravariant-extras deepseq dlist either hashable mtl profunctors
@@ -202905,6 +203299,8 @@ self: {
        pname = "refined";
        version = "0.4.4";
        sha256 = "1xld5fc3nzsr43agvdlv0hbdbnrrsgy0n2a7mfrcc0n3s6rjbdcw";
+       revision = "1";
+       editedCabalFile = "184w9aj60hxm2bq9n29zakqzhi0kf4dqj7cwib31vilpwd0vgfvx";
        libraryHaskellDepends = [
          aeson base deepseq exceptions mtl prettyprinter QuickCheck
          template-haskell transformers
@@ -203003,8 +203399,8 @@ self: {
      }:
      mkDerivation {
        pname = "reflex";
-       version = "0.6.4";
-       sha256 = "162gjk11z6yjdwnb7y9xhg6h851wxssz9zb548h52hdld9vdfkcf";
+       version = "0.6.4.1";
+       sha256 = "0zm5jgjn4r59h8r0180mkmfnggqv4mgg52vqfwpnz20dv942wzcb";
        libraryHaskellDepends = [
          base bifunctors comonad constraints-extras containers data-default
          dependent-map dependent-sum exception-transformers haskell-src-exts
@@ -204805,6 +205201,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-query_0_12_2_3" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, dlist
+     , names-th, persistable-record, product-isomorphic
+     , quickcheck-simple, sql-words, template-haskell, text
+     , th-constraint-compat, th-reify-compat, time, time-locale-compat
+     , transformers
+     }:
+     mkDerivation {
+       pname = "relational-query";
+       version = "0.12.2.3";
+       sha256 = "0zjqk0gkzdhg1l8rw0bz7iwvp55p585xaqp8dc3sbbr0abhmsgi5";
+       libraryHaskellDepends = [
+         array base bytestring containers dlist names-th persistable-record
+         product-isomorphic sql-words template-haskell text
+         th-constraint-compat th-reify-compat time time-locale-compat
+         transformers
+       ];
+       testHaskellDepends = [
+         base containers product-isomorphic quickcheck-simple transformers
+       ];
+       description = "Typeful, Modular, Relational, algebraic query engine";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "relational-query-HDBC" = callPackage
     ({ mkDerivation, base, containers, convertible, dlist, HDBC
      , HDBC-session, names-th, persistable-record, product-isomorphic
@@ -204884,6 +205305,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-schemas_0_1_8_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, relational-query
+     , sql-words, template-haskell, time
+     }:
+     mkDerivation {
+       pname = "relational-schemas";
+       version = "0.1.8.0";
+       sha256 = "012b3jqxpyv41vwxvrk6nxall7hvbczkxwmld3w3jzg20z0535l4";
+       libraryHaskellDepends = [
+         base bytestring containers relational-query sql-words
+         template-haskell time
+       ];
+       description = "RDBMSs' schema templates for relational-query";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "relative-date" = callPackage
     ({ mkDerivation, base, concatenative, datetime, mtl, parsec, time
      }:
@@ -205963,8 +206401,8 @@ self: {
      }:
      mkDerivation {
        pname = "reqcatcher";
-       version = "0.2.1.0";
-       sha256 = "1fh9p7437czn7rw5jmpxlmg0zhrkkj5hwd0kzlr2jainxzvlw2b3";
+       version = "0.2.2.0";
+       sha256 = "0wiazimb8vpsdxrh012hczcxfapxyggq3p54f6lvcljmggh2ncdw";
        libraryHaskellDepends = [ base http-types network text wai warp ];
        testHaskellDepends = [
          base http-client http-types HUnit lens tasty tasty-hunit wai wreq
@@ -206055,12 +206493,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "rerebase_1_6" = callPackage
+  "rerebase_1_6_0_1" = callPackage
     ({ mkDerivation, rebase }:
      mkDerivation {
        pname = "rerebase";
-       version = "1.6";
-       sha256 = "0g2bgh30ra006w4ypsrnyvfwys4ajg2b0k6c55snci12acs2igzd";
+       version = "1.6.0.1";
+       sha256 = "07ddcmm2yx71nvgcbj87skrx5pfzsqhi87dxn7vv41ssibv714fk";
        libraryHaskellDepends = [ rebase ];
        description = "Reexports from \"base\" with a bunch of other standard libraries";
        license = stdenv.lib.licenses.mit;
@@ -206801,6 +207239,39 @@ self: {
        broken = true;
      }) {};
 
+  "retrie" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
+     , data-default, deepseq, directory, filepath, ghc, ghc-exactprint
+     , ghc-paths, haskell-src-exts, HUnit, mtl, optparse-applicative
+     , process, random-shuffle, syb, tasty, tasty-hunit, temporary, text
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "retrie";
+       version = "0.1.0.0";
+       sha256 = "0x8mc4w6w1pr8k9cmhnb4wad2brqj37qfhkg1vm47zmv3r5sza3s";
+       revision = "1";
+       editedCabalFile = "1gxd78fpn7pw30k0p70vgrr82qcbq4397fk41c4i7rb7m0y4kk3j";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal async base bytestring containers data-default
+         directory filepath ghc ghc-exactprint haskell-src-exts mtl
+         optparse-applicative process random-shuffle syb text transformers
+         unordered-containers
+       ];
+       executableHaskellDepends = [ base data-default ];
+       testHaskellDepends = [
+         base containers data-default deepseq directory filepath ghc
+         ghc-paths HUnit mtl optparse-applicative process syb tasty
+         tasty-hunit temporary text unordered-containers
+       ];
+       description = "A powerful, easy-to-use codemodding tool for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "retry" = callPackage
     ({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl
      , random, stm, tasty, tasty-hedgehog, tasty-hunit, time
@@ -207807,6 +208278,8 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "RISC-V";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "risc386" = callPackage
@@ -209174,6 +209647,8 @@ self: {
        testHaskellDepends = [ base hspec text ];
        description = "Recurrence rule parser and formatter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "rsagl" = callPackage
@@ -209716,10 +210191,8 @@ self: {
      }:
      mkDerivation {
        pname = "rvar";
-       version = "0.2.0.3";
-       sha256 = "1h3bii1pamkv7656280i6zx7fpdwgbn2ysfijpd2s65szlpsz2np";
-       revision = "1";
-       editedCabalFile = "1ifwwjlhc3l8ycjmmarw6v1nm7jxpgqw2ly0q35idlj0jc0nbxn6";
+       version = "0.2.0.4";
+       sha256 = "0p67lbzcbbm5bkhv0x380bdald6kaqlf968ay2q8qj69izpvk181";
        libraryHaskellDepends = [
          base MonadPrompt mtl random-source transformers
        ];
@@ -210019,6 +210492,8 @@ self: {
        ];
        description = "Automatic JSON format versioning";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "safe-lazy-io" = callPackage
@@ -210480,6 +210955,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "salak_0_3_6" = callPackage
+    ({ mkDerivation, base, bytestring, containers, criterion
+     , data-default, directory, dlist, exceptions, filepath, hashable
+     , heaps, hspec, hspec-discover, megaparsec, mtl, QuickCheck, random
+     , scientific, text, time, unliftio-core, unordered-containers
+     }:
+     mkDerivation {
+       pname = "salak";
+       version = "0.3.6";
+       sha256 = "00qyd09az0ldfidfgcki8z3r9gcpxmss3iyr99as5bky29rlz9n3";
+       libraryHaskellDepends = [
+         base bytestring containers data-default directory dlist exceptions
+         filepath hashable heaps megaparsec mtl scientific text time
+         unliftio-core unordered-containers
+       ];
+       testHaskellDepends = [
+         base hspec mtl QuickCheck random scientific text
+         unordered-containers
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         base criterion data-default mtl text time
+       ];
+       description = "Configuration (re)Loader and Parser";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "salak-toml" = callPackage
     ({ mkDerivation, base, criterion, exceptions, hspec, mtl
      , QuickCheck, salak, text, time, tomland, unordered-containers
@@ -213262,8 +213765,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bindings for secp256k1 library from Bitcoin Core";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {libsecp256k1 = null;};
 
   "secp256k1-legacy" = callPackage
@@ -213275,6 +213776,8 @@ self: {
        pname = "secp256k1-legacy";
        version = "0.5.6";
        sha256 = "0p7kp7011hfc95rdchkniw3gj5i0pkwgsa5kkhwn6fjzs2clslbz";
+       revision = "1";
+       editedCabalFile = "0fz2nypf6p1qsvcvvfa7ya0pggvkr2jsm306ryy8grncbzy4ydgm";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          base base16-bytestring bytestring cereal entropy mtl QuickCheck
@@ -214099,6 +214602,8 @@ self: {
        ];
        description = "A tool to send command execution results to Sensu";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "sentence-jp" = callPackage
@@ -217194,21 +217699,21 @@ self: {
 
   "servant-to-elm" = callPackage
     ({ mkDerivation, aeson, base, bound, elm-syntax, haskell-to-elm
-     , http-types, protolude, servant, servant-multipart, text
+     , http-types, servant, servant-multipart, text
      }:
      mkDerivation {
        pname = "servant-to-elm";
-       version = "0.4.0.0";
-       sha256 = "04i4mcj41c6wzxj9kgy7x8w9f3aaa77rr91c40qbhf1lkf7jmsny";
+       version = "0.4.1.0";
+       sha256 = "0kxkyijkxvpb5jv815i9s6pg7rnq437jj7hrwr0xprxd709mc648";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bound elm-syntax haskell-to-elm http-types protolude
-         servant servant-multipart text
+         aeson base bound elm-syntax haskell-to-elm http-types servant
+         servant-multipart text
        ];
        testHaskellDepends = [
-         aeson base bound elm-syntax haskell-to-elm http-types protolude
-         servant servant-multipart text
+         aeson base bound elm-syntax haskell-to-elm http-types servant
+         servant-multipart text
        ];
        description = "Automatically generate Elm clients for Servant APIs";
        license = stdenv.lib.licenses.bsd3;
@@ -217436,33 +217941,6 @@ self: {
      }) {};
 
   "serverless-haskell" = callPackage
-    ({ mkDerivation, aeson, aeson-casing, amazonka-core
-     , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive
-     , hspec, hspec-discover, http-types, iproute, lens, network
-     , network-simple, raw-strings-qq, text, time, unix
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "serverless-haskell";
-       version = "0.10.1";
-       sha256 = "18iqj3c60sx6v1d8lnlv0gcd1xrpvjwqwnshsi2n823dp1j975gp";
-       libraryHaskellDepends = [
-         aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base
-         bytestring case-insensitive http-types iproute lens network
-         network-simple text time unix unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base
-         bytestring case-insensitive hspec hspec-discover http-types iproute
-         lens network network-simple raw-strings-qq text time unix
-         unordered-containers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Deploying Haskell code onto AWS Lambda using Serverless";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "serverless-haskell_0_10_2" = callPackage
     ({ mkDerivation, aeson, aeson-casing, amazonka-core
      , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive
      , hspec, hspec-discover, http-types, iproute, lens, network
@@ -217487,7 +217965,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Deploying Haskell code onto AWS Lambda using Serverless";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "serversession" = callPackage
@@ -218512,20 +218989,20 @@ self: {
      }) {};
 
   "shake-bindist" = callPackage
-    ({ mkDerivation, archive-sig, archive-tar, base, bytestring, bz2
-     , lzlib, shake, zlib, zstd
+    ({ mkDerivation, archive-sig, base, bytestring, bz2, lzlib, shake
+     , zlib, zstd
      }:
      mkDerivation {
        pname = "shake-bindist";
-       version = "0.1.0.0";
-       sha256 = "0f2w7bbnnigfjpfywljl6k2gcz1rq99lfz7cig0076rbjg7aifii";
-       revision = "2";
-       editedCabalFile = "0bk1r9qn41xhhjisvahs0fdsfiv79rb1yk545ry0vw83d0af6kl8";
+       version = "1.0.0.0";
+       sha256 = "0fzq62a8rjh9jc9dc7rfi6ypp0fax7fhlf632a30mrbpk1hqyfz8";
        libraryHaskellDepends = [
-         archive-sig archive-tar base bytestring bz2 lzlib shake zlib zstd
+         archive-sig base bytestring bz2 lzlib shake zlib zstd
        ];
        description = "Rules for binary distributions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "shake-c" = callPackage
@@ -222040,6 +222517,8 @@ self: {
        ];
        description = "Lucid support for Skylighting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "skylighting-modding" = callPackage
@@ -227050,8 +227529,8 @@ self: {
     ({ mkDerivation, base, QuickCheck, quickcheck-simple }:
      mkDerivation {
        pname = "sql-words";
-       version = "0.1.6.3";
-       sha256 = "11z6g85dzrvkhnz0g6rhv5s2ssqcyyzbi2pp5rwzp30xp0ivsx95";
+       version = "0.1.6.4";
+       sha256 = "1rd2rkhq56zwv3s1jzxq0vjshjnf5818f70w6ayxbmmg87kiwwy0";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck quickcheck-simple ];
        description = "SQL keywords data constructors into OverloadedString";
@@ -227139,8 +227618,6 @@ self: {
        ];
        description = "Mid-Level SQLite client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "sqlite-simple-errors" = callPackage
@@ -227672,35 +228149,6 @@ self: {
      }) {};
 
   "stache" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, criterion
-     , deepseq, directory, file-embed, filepath, hspec, hspec-discover
-     , hspec-megaparsec, megaparsec, mtl, template-haskell, text
-     , unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "stache";
-       version = "2.1.0";
-       sha256 = "1q34h46px7miy2kx1yzaj785ai70mkchmijpdq2iih1fffir8kvk";
-       revision = "2";
-       editedCabalFile = "0vzby2q8qp6z74ighqalw05b94821cl9w6dbwy4hkgd67pc38nph";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers deepseq directory filepath
-         megaparsec mtl template-haskell text unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers file-embed hspec hspec-megaparsec
-         megaparsec template-haskell text yaml
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         aeson base criterion deepseq megaparsec text
-       ];
-       description = "Mustache templates for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "stache_2_1_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , deepseq, directory, file-embed, filepath, hspec, hspec-discover
      , hspec-megaparsec, megaparsec, mtl, template-haskell, text
@@ -227725,7 +228173,6 @@ self: {
        ];
        description = "Mustache templates for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack" = callPackage
@@ -228115,8 +228562,8 @@ self: {
        pname = "stack2cabal";
        version = "1.0.5";
        sha256 = "15swq7rv997fh1qka7ga5hc90gc889xzkx61910jz3an6sy5zx0p";
-       revision = "1";
-       editedCabalFile = "15qc686alcfbxjpr7iyi2bxv801cmbkqvncpb6jd0879ll9lznrh";
+       revision = "2";
+       editedCabalFile = "12dkq7shcsyp8yrr2vvzf968w3x11kgxqlam1h0m33zvjksbw6dq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -235550,6 +235997,8 @@ self: {
        pname = "taffybar";
        version = "3.2.2";
        sha256 = "02b6rmsb89c1h7fr81ljbij30pnl8z4dz6xz367g7a2b9hwq42gz";
+       revision = "1";
+       editedCabalFile = "0284vnzvgpjjh95p67k2b5476npa52hs8g55fvlvlcx487zpc1sc";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -235999,8 +236448,8 @@ self: {
        pname = "tai";
        version = "0";
        sha256 = "1kp7m9mhawi2fbdsir4kg9z6hbmlw4kmp3kjvlk4qkhvckgl3pxw";
-       revision = "1";
-       editedCabalFile = "0m95bx120pjigxncbdb28y3cv4d6x05vgpjgny86vk0lkslk130y";
+       revision = "3";
+       editedCabalFile = "09wmlfswhs0839iq08br4i4zgjavvwxavcp0i0mldgrj82x9cxfy";
        libraryHaskellDepends = [
          base clock lens mtl parsers time trifecta wreq
        ];
@@ -237133,8 +237582,6 @@ self: {
        ];
        description = "TAP (Test Anything Protocol) Version 13 formatter for tasty";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
      }) {};
 
   "tasty-test-reporter" = callPackage
@@ -238212,7 +238659,7 @@ self: {
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
-     }) {inherit (pkgs) libtensorflow;};
+     }) {libtensorflow = null;};
 
   "tensorflow-core-ops" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath
@@ -240137,8 +240584,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-replace";
-       version = "0.0.0.4";
-       sha256 = "18hiy0d18wxh8v4zd6vg69fwd8vp9b2yd3ngf04yh9y1bl8wwwhb";
+       version = "0.0.0.6";
+       sha256 = "05hr2185q4rcn1hvrrkqy2sbl8xzk7ij00x61vhvmyk29dbbk2cf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
@@ -240215,8 +240662,8 @@ self: {
        pname = "text-show-instances";
        version = "3.8.3";
        sha256 = "11v335p3wzf9ijqlkls5mk4m16dfak8fckn4gj7mahs8c7l9lm5d";
-       revision = "1";
-       editedCabalFile = "104r5k4h4sdf69frpc0pr8jijk4v9dalw9c18yib653bwjw0ypl4";
+       revision = "2";
+       editedCabalFile = "001xn2aq5k8hhn5iwhmxv1s3mnxyg630klmmdhbp3lxdb2yq8rha";
        libraryHaskellDepends = [
          base base-compat-batteries bifunctors binary containers directory
          ghc-boot-th haskeline hpc old-locale old-time pretty random
@@ -240818,20 +241265,20 @@ self: {
      }) {};
 
   "th-instance-reification" = callPackage
-    ({ mkDerivation, base, containers, HTF, list-extras, loch-th
-     , placeholders, template-haskell, th-expand-syns
+    ({ mkDerivation, base, containers, list-extras, QuickCheck
+     , quickcheck-instances, rerebase, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, th-expand-syns
      }:
      mkDerivation {
        pname = "th-instance-reification";
-       version = "0.1.4";
-       sha256 = "0cnq7qxqpc58a59iv8sfqrkhx9wkzpgn9l7r84kh0xa21w16inki";
+       version = "0.1.5";
+       sha256 = "0ssnd45bvz4k0fajc3xlqy7iq92rm0pjn3wwl4brnvaf7l1180q4";
        libraryHaskellDepends = [
-         base containers list-extras loch-th placeholders template-haskell
-         th-expand-syns
+         base containers list-extras template-haskell th-expand-syns
        ];
        testHaskellDepends = [
-         base containers HTF list-extras loch-th placeholders
-         template-haskell th-expand-syns
+         QuickCheck quickcheck-instances rerebase tasty tasty-hunit
+         tasty-quickcheck template-haskell
        ];
        description = "Fixed versions of instances reification functions";
        license = stdenv.lib.licenses.mit;
@@ -242272,14 +242719,14 @@ self: {
        broken = true;
      }) {};
 
-  "time_1_9_3" = callPackage
+  "time_1_10" = callPackage
     ({ mkDerivation, base, deepseq, QuickCheck, random, tasty
      , tasty-hunit, tasty-quickcheck, unix
      }:
      mkDerivation {
        pname = "time";
-       version = "1.9.3";
-       sha256 = "03n7lsapydivwj7lv2azb5i31ph8365kzh7zbl3kcgzzmiz9cnsp";
+       version = "1.10";
+       sha256 = "1000fhgcvqagvyhm587zf6y9g2ffj517w0hsvvpbzj1sggyjc93s";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [
          base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck
@@ -242311,10 +242758,8 @@ self: {
      }:
      mkDerivation {
        pname = "time-compat";
-       version = "1.9.2.2";
-       sha256 = "05va0rqs759vbridbcl6hksp967j9anjvys8vx72fnfkhlrn2s52";
-       revision = "2";
-       editedCabalFile = "1i94pch4zj713gxcrlb09airbh3hqqs7cscjjfkxk9lixkk6iwnc";
+       version = "1.9.3";
+       sha256 = "126vlfzv3z91vnjlkqarkyhs91hrx4g08gnrvsldqpclczk48smv";
        libraryHaskellDepends = [ base base-orphans deepseq time ];
        testHaskellDepends = [
          base base-compat deepseq HUnit QuickCheck tagged tasty tasty-hunit
@@ -244947,6 +245392,8 @@ self: {
        testHaskellDepends = [ base directory hspec process ];
        description = "Package to list all tracked and untracked existing files via Git";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
      }) {};
 
   "tracker" = callPackage
@@ -247245,33 +247692,6 @@ self: {
      }) {};
 
   "turtle" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
-     , containers, criterion, directory, doctest, exceptions, fail
-     , foldl, hostname, managed, optional-args, optparse-applicative
-     , process, semigroups, stm, streaming-commons, system-fileio
-     , system-filepath, temporary, text, time, transformers, unix
-     , unix-compat
-     }:
-     mkDerivation {
-       pname = "turtle";
-       version = "1.5.16";
-       sha256 = "164cs5gsl6pmfj4yd9p4vj02n1sj5krgd6azd5zfgyw4q7bfc5jn";
-       libraryHaskellDepends = [
-         ansi-wl-pprint async base bytestring clock containers directory
-         exceptions foldl hostname managed optional-args
-         optparse-applicative process semigroups stm streaming-commons
-         system-fileio system-filepath temporary text time transformers unix
-         unix-compat
-       ];
-       testHaskellDepends = [
-         base doctest fail system-filepath temporary
-       ];
-       benchmarkHaskellDepends = [ base criterion text ];
-       description = "Shell programming, Haskell-style";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "turtle_1_5_17" = callPackage
     ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
      , containers, criterion, directory, doctest, exceptions, fail
      , foldl, hostname, managed, optional-args, optparse-applicative
@@ -247296,7 +247716,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "turtle-options" = callPackage
@@ -251355,6 +251774,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unliftio-pool_0_2_1_1" = callPackage
+    ({ mkDerivation, base, resource-pool, time, transformers
+     , unliftio-core
+     }:
+     mkDerivation {
+       pname = "unliftio-pool";
+       version = "0.2.1.1";
+       sha256 = "0hxxngldp4zr55qv67gf62a87yxr1f0xfyh4gfzr45q62mscs8xv";
+       libraryHaskellDepends = [
+         base resource-pool time transformers unliftio-core
+       ];
+       description = "Data.Pool generalized to MonadUnliftIO.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unliftio-streams" = callPackage
     ({ mkDerivation, base, bytestring, io-streams, text, unliftio-core
      }:
@@ -253519,6 +253954,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "validation-selective" = callPackage
+    ({ mkDerivation, base, deepseq, doctest, hedgehog, hspec
+     , hspec-hedgehog, selective, text
+     }:
+     mkDerivation {
+       pname = "validation-selective";
+       version = "0.0.0.0";
+       sha256 = "01awbhfday2j0jcfgqq074yqxxasqddwxhlwigsbjgv94b4c55bd";
+       libraryHaskellDepends = [ base deepseq selective ];
+       testHaskellDepends = [
+         base doctest hedgehog hspec hspec-hedgehog selective text
+       ];
+       description = "Lighweight pure data validation based on Applicative and Selective functors";
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "validations" = callPackage
     ({ mkDerivation, base, containers, digestive-functors, HUnit, mtl
      , QuickCheck, test-framework, test-framework-hunit
@@ -256463,27 +256916,6 @@ self: {
      }) {};
 
   "wai-enforce-https" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, hspec
-     , http-types, network, text, wai, wai-extra
-     }:
-     mkDerivation {
-       pname = "wai-enforce-https";
-       version = "0.0.2";
-       sha256 = "0p3j438knirr32j6dhqscws93h3ygk6lvw97r489h8i1dip9rqll";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring case-insensitive http-types network text wai
-       ];
-       testHaskellDepends = [
-         base bytestring case-insensitive hspec http-types wai wai-extra
-       ];
-       description = "Enforce HTTPS in Wai server app safely";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wai-enforce-https_0_0_2_1" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, hspec
      , http-types, network, text, wai, wai-extra
      }:
@@ -256502,7 +256934,6 @@ self: {
        ];
        description = "Enforce HTTPS in Wai server app safely";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-eventsource" = callPackage
@@ -257087,6 +257518,25 @@ self: {
        broken = true;
      }) {};
 
+  "wai-middleware-clacks" = callPackage
+    ({ mkDerivation, base, base-compat-batteries, bytestring
+     , case-insensitive, http-types, tasty, tasty-wai, text, wai
+     }:
+     mkDerivation {
+       pname = "wai-middleware-clacks";
+       version = "0.1.0.1";
+       sha256 = "1mx3qmyiywib8wcrccxd7wjlx4jv9wlc5w8lykivgh8q66pbcihf";
+       libraryHaskellDepends = [
+         base base-compat-batteries bytestring case-insensitive http-types
+         text wai
+       ];
+       testHaskellDepends = [
+         base base-compat-batteries http-types tasty tasty-wai wai
+       ];
+       description = "GNU Terry Pratchett - Add the X-Clacks-Overhead Header to Wai Responses";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "wai-middleware-consul" = callPackage
     ({ mkDerivation, async, base, base-prelude, bytestring, conduit
      , conduit-extra, consul-haskell, enclosed-exceptions, http-client
@@ -257446,6 +257896,8 @@ self: {
        pname = "wai-middleware-static";
        version = "0.8.3";
        sha256 = "0l6az106r970v3jwx3z7fg7x8ja8x5hla0m5lwg7sjfs9vdh0bnl";
+       revision = "1";
+       editedCabalFile = "0jinswa97ll70xxj6hm4mxw7i1cfnm8jn87aczzccn9xscdpll4c";
        libraryHaskellDepends = [
          base bytestring containers cryptonite directory expiring-cache-map
          filepath http-types memory mime-types mtl old-locale semigroups
@@ -258184,15 +258636,16 @@ self: {
 
   "warp-grpc" = callPackage
     ({ mkDerivation, async, base, binary, bytestring, case-insensitive
-     , http-types, http2, http2-grpc-types, wai, warp, warp-tls
+     , http-types, http2, http2-grpc-types, unliftio-core, wai, warp
+     , warp-tls
      }:
      mkDerivation {
        pname = "warp-grpc";
-       version = "0.3.0.0";
-       sha256 = "15zpb9liai56i9765sf05kww7zykd68kd38vc0s0rhx9jgqk2clj";
+       version = "0.4.0.0";
+       sha256 = "1isi0xd6vvavvr4m3gfiqj2cmmpa3jn9py61m0ksrarxwmsw8s1g";
        libraryHaskellDepends = [
          async base binary bytestring case-insensitive http-types http2
-         http2-grpc-types wai warp warp-tls
+         http2-grpc-types unliftio-core wai warp warp-tls
        ];
        description = "A minimal gRPC server on top of Warp";
        license = stdenv.lib.licenses.bsd3;
@@ -259693,21 +260146,25 @@ self: {
      }) {};
 
   "weeder" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cmdargs, deepseq
-     , directory, extra, filepath, foundation, hashable, process, text
-     , unordered-containers, vector, yaml
+    ({ mkDerivation, algebraic-graphs, base, bytestring, containers
+     , dhall, directory, filepath, generic-lens, ghc, lens, mtl
+     , optparse-applicative, regex-tdfa, transformers
      }:
      mkDerivation {
        pname = "weeder";
-       version = "1.0.8";
-       sha256 = "1ylwq1087x6ppn5y5krvl6q6fxcln58y8fwbah3ygp0cpgm4w816";
+       version = "2.0.1";
+       sha256 = "1x5hgyp3zcwz63wcwh8bqalckcb7baakj39zwymifirxvhkws1xz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring cmdargs deepseq directory extra filepath
-         foundation hashable process text unordered-containers vector yaml
+         algebraic-graphs base bytestring containers dhall directory
+         filepath generic-lens ghc lens mtl optparse-applicative regex-tdfa
+         transformers
+       ];
+       executableHaskellDepends = [
+         base bytestring containers directory filepath ghc
+         optparse-applicative transformers
        ];
-       executableHaskellDepends = [ base ];
        description = "Detect dead code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -261052,8 +261509,8 @@ self: {
      }:
      mkDerivation {
        pname = "wordlist";
-       version = "0.1.0.2";
-       sha256 = "1p3pzacg4s0hx4gq2slm1bgkvr8fh3q1iqlpidbc3pc9whclr173";
+       version = "0.1.0.4";
+       sha256 = "0v2xnm4iqk8wh3l05vkmfblwk49q54awp2qr1cwszgxfzaz4n9zb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base optparse-applicative text ];
@@ -265006,35 +265463,6 @@ self: {
      }) {};
 
   "yaml" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
-     , conduit, containers, directory, filepath, hspec, HUnit, libyaml
-     , mockery, mtl, raw-strings-qq, resourcet, scientific
-     , template-haskell, temporary, text, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "yaml";
-       version = "0.11.2.0";
-       sha256 = "035sqc2bnya3ghv5i0qk9jdg9q6jvqzgnc5gkg9mgf4drjrd5wni";
-       configureFlags = [ "-fsystem-libyaml" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring conduit containers directory
-         filepath libyaml mtl resourcet scientific template-haskell text
-         transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson attoparsec base base-compat bytestring conduit containers
-         directory filepath hspec HUnit libyaml mockery mtl raw-strings-qq
-         resourcet scientific template-haskell temporary text transformers
-         unordered-containers vector
-       ];
-       description = "Support for parsing and rendering YAML documents";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "yaml_0_11_3_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
      , conduit, containers, directory, filepath, hspec, HUnit, libyaml
      , mockery, mtl, raw-strings-qq, resourcet, scientific
@@ -265061,7 +265489,6 @@ self: {
        ];
        description = "Support for parsing and rendering YAML documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yaml-combinators" = callPackage
@@ -265269,8 +265696,8 @@ self: {
        pname = "yampa-canvas";
        version = "0.2.3";
        sha256 = "0a1pq1psmc4490isr19z4prnqq1w3374vkfmzpw9s20s2p6k5y7r";
-       revision = "3";
-       editedCabalFile = "02zzv9xlmvja8jpgnk1r7wfrh33593qbmhbwrcnw0bmjvbk28ps1";
+       revision = "4";
+       editedCabalFile = "0yx1g19shmrhapmyqzksh861zyyrlwvv158ls5n9imlxr21zssf3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base blank-canvas stm time Yampa ];
@@ -265637,8 +266064,8 @@ self: {
      }:
      mkDerivation {
        pname = "yeamer";
-       version = "0.1.0.3";
-       sha256 = "02v33ya0nc0qvsnc5dz33kargyprzxjhbrcdfi439psxh43rw9fp";
+       version = "0.1.0.5";
+       sha256 = "0c8yrh43h9qhhdiz0dnrh00frfz0cymzzz9k723jnp03b8994srq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -266091,8 +266518,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-fb";
-       version = "1.9.1";
-       sha256 = "1368hxic51vnilwp6dygc98yfclqi0vn1vwkxpvdd9vzy73kdj0i";
+       version = "1.10.1";
+       sha256 = "01ckr3zs9bqwwskah2fd7rkpirifyl16v1xk062qx87zcwkf408r";
        libraryHaskellDepends = [
          aeson base bytestring conduit fb http-conduit resourcet shakespeare
          text time transformers unliftio wai yesod-auth yesod-core yesod-fb
@@ -266774,8 +267201,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-fb";
-       version = "0.6.0";
-       sha256 = "0anhnbwc9j11lm2sh8wi15p160vb9g0ng8lqc6g8am61jsxxw40x";
+       version = "0.6.1";
+       sha256 = "1nyi5jp85ysabljkds6h4w8ndrb12ac76awsih52amf60k4n7afl";
        libraryHaskellDepends = [
          aeson base bytestring conduit fb http-client-tls http-conduit
          memory text wai yesod-core
@@ -269648,7 +270075,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "zip_1_4_0" = callPackage
+  "zip_1_4_1" = callPackage
     ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
      , cereal, conduit, conduit-extra, containers, digest, directory
      , dlist, exceptions, filepath, hspec, monad-control, mtl
@@ -269657,8 +270084,8 @@ self: {
      }:
      mkDerivation {
        pname = "zip";
-       version = "1.4.0";
-       sha256 = "07g17n6fr86c6c5yhs8ml53mk0g032060vja620bp32irfm00m2r";
+       version = "1.4.1";
+       sha256 = "0jnvqss17zjfs91flsammlx4flw527iddlav37jzqihi6j65aqp2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [

From 57874b620e4f76509936fab269e23261a3508e26 Mon Sep 17 00:00:00 2001
From: Samuel Evans-Powell <mail@sevanspowell.net>
Date: Thu, 19 Mar 2020 09:20:50 +0800
Subject: [PATCH 3490/4636] prometheus: no need to jailbreak

- prometheus no longer needs to be jailbroken, removing 'doJailbreak'.
  Jailbreaking was added in
  https://github.com/NixOS/nixpkgs/pull/70956 to overcome issue
  https://github.com/bitnomial/prometheus/issues/34.
- This issue has since been fixed and so jailbreaking is no longer
  necessary.
---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1dae1dab133d..13566f3afd43 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1250,10 +1250,6 @@ self: super: {
     '';
   });
 
-  # Version bounds for http-client are too strict:
-  # https://github.com/bitnomial/prometheus/issues/34
-  prometheus = doJailbreak super.prometheus;
-
   # The doctests in universum-1.5.0 are broken.  The doctests in versions of universum after
   # 1.5.0 should be fixed, so this should be able to be removed.
   universum = dontCheck super.universum;

From 3f0bc2e7c2817f64442d2a321c405d5e27958e6e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Mar 2020 20:25:42 +0100
Subject: [PATCH 3491/4636] haskell-weeder: build with latest generic-lens

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 13566f3afd43..afa3c5338949 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1485,4 +1485,7 @@ self: super: {
     sha256 = "097wqn8hxsr50b9mhndg5pjim5jma2ym4ylpibakmmb5m98n17zp";
   });
 
+  # Needs a version that's newer than LTS-15.x provides.
+  weeder = super.weeder.override { generic-lens = self.generic-lens_2_0_0_0;  };
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

From 1b2b88671ee7642208f878e6029b50f725ee3e95 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 20 Mar 2020 20:46:21 +0100
Subject: [PATCH 3492/4636] haskell-fast-logger: fix the build with ghc-8.4.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 513c55ea9e9c..c4c5ed9422f7 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -83,4 +83,7 @@ self: super: {
   # Newer versions don't compile.
   resolv = self.resolv_0_1_1_2;
 
+  # The old Haddock cannot process the newer documentation syntax.
+  fast-logger = dontHaddock super.fast-logger;
+
 }

From cdf418e850d8cec3520337b534ab0a3104b5be2c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Mar 2020 21:04:25 +0000
Subject: [PATCH 3493/4636] cargo-expand: 0.4.17 -> 0.4.18

---
 pkgs/development/tools/rust/cargo-expand/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix
index a799fc0bec27..7ffb77f741bf 100644
--- a/pkgs/development/tools/rust/cargo-expand/default.nix
+++ b/pkgs/development/tools/rust/cargo-expand/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-expand";
-  version = "0.4.17";
+  version = "0.4.18";
 
   src = fetchFromGitHub {
     owner = "dtolnay";
     repo = pname;
     rev = version;
-    sha256 = "043adbvc1slswwygibgghfl2ryry3ja1x3zjz39qqv63f81pd5id";
+    sha256 = "1dhrzfy1ii2vg8psvz9rrgk0blj5bl64ghr0z44vh5y0kxn9v62p";
   };
 
-  cargoSha256 = "0kwpc62nwjjhlh3rd5d27sjv0p53q5gj0gky9xx9khxy8xazbh91";
+  cargoSha256 = "13ib0binyw1rzxjg59ly3ahyr53wdq3z7wfp11gd61kzwz34gs9d";
 
   buildInputs = [ llvmPackages.libclang ]
     ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with stdenv.lib; {
     description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code";
-    homepage = https://github.com/dtolnay/cargo-expand;
+    homepage = "https://github.com/dtolnay/cargo-expand";
     license = with licenses; [ mit asl20 ];
     platforms = platforms.all;
     maintainers = with maintainers; [ xrelkd ];

From f3ac3f0463d5854bf6794396c2befd2fe56801f5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Mar 2020 21:32:14 +0000
Subject: [PATCH 3494/4636] cockatrice: 2019-08-31-Release-2.7.2 ->
 2020-03-20-Release-2.7.4

---
 pkgs/games/cockatrice/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix
index 83ae5816b28d..9d07d09e27b2 100644
--- a/pkgs/games/cockatrice/default.nix
+++ b/pkgs/games/cockatrice/default.nix
@@ -4,13 +4,13 @@
 
 mkDerivation rec {
   pname = "cockatrice";
-  version = "2019-08-31-Release-2.7.2";
+  version = "2020-03-20-Release-2.7.4";
 
   src = fetchFromGitHub {
     owner = "Cockatrice";
     repo = "Cockatrice";
     rev = "${version}";
-    sha256 = "17nfz4z6zfkiwcrq1rpm8bc7zh4gvcmb3fis9gdjjbji20dvcfxp";
+    sha256 = "1d229gswfcqxch19wb744d9h897qwzf2y9imwrbcwnlhpbr1j62k";
   };
 
   buildInputs = [

From eb3690c462b03780edfd0221a304b5caac3e0ce7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Mar 2020 21:51:56 +0000
Subject: [PATCH 3495/4636] darktable: 3.0.0 -> 3.0.1

---
 pkgs/applications/graphics/darktable/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 53e04dc7f784..771e6677b170 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -7,12 +7,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.0.0";
+  version = "3.0.1";
   pname = "darktable";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "7195a5ff7ee95ab7c5a57e4e84f8c90cc4728b2c917359203c21293ab754c0db";
+    sha256 = "1dvwmgnlfvi1lvdhgyddcp5apwlc8v5gwy9gmfcpra8lv8hkjjy5";
   };
 
   nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ];
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Virtual lighttable and darkroom for photographers";
-    homepage = https://www.darktable.org;
+    homepage = "https://www.darktable.org";
     license = licenses.gpl3Plus;
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ goibhniu flosse mrVanDalo ];

From cbceee8e9755395f0ad843cdbf2a259ba1ab10e1 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 20 Mar 2020 01:32:16 +0100
Subject: [PATCH 3496/4636] gitea: 1.10.3 -> 1.11.3

Updates `gitea` to the latest version available[1]. Also ensured that
upgrading from `gitea-1.9` (used on NixOS 19.09) to `1.11.3` works
seamlessly.

The derivation required a few more changes this time since `gitea` uses
`npm` now to build the frontend[2]. When using the default tarball from
GitHub, we'd have to build the frontend manually. By fetching a custom
tarball published on every release, we get a prebuilt frontend
(as it was the case on previous versions) and build the backend only from
source.

Co-authored-by: kolaente <k@knt.li>
Closes #80175

[1] https://github.com/go-gitea/gitea/releases/tag/v1.11.3
[2] https://github.com/go-gitea/gitea/issues/10253
---
 .../version-management/gitea/default.nix      | 33 +++++++++----------
 .../gitea/static-root-path.patch              | 16 ++++-----
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 2bd1f6434b7b..164392ef4cec 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper
+{ stdenv, buildGoPackage, fetchurl, makeWrapper
 , git, bash, gzip, openssh, pam
 , sqliteSupport ? true
 , pamSupport ? true
@@ -8,23 +8,20 @@ with stdenv.lib;
 
 buildGoPackage rec {
   pname = "gitea";
-  version = "1.10.3";
+  version = "1.11.3";
 
-  src = fetchFromGitHub {
-    owner = "go-gitea";
-    repo = "gitea";
-    rev = "v${version}";
-    sha256 = "04jg1b0d1fbhnk434dnffc2c118gs084za3m33lxwf5lxzlbbimc";
-    # Required to generate the same checksum on MacOS due to unicode encoding differences
-    # More information: https://github.com/NixOS/nixpkgs/pull/48128
-    extraPostFetch = ''
-      rm -rf $out/integrations
-      rm -rf $out/vendor/github.com/Unknown/cae/tz/testdata
-      rm -rf $out/vendor/github.com/Unknown/cae/zip/testdata
-      rm -rf $out/vendor/gopkg.in/macaron.v1/fixtures
-    '';
+  src = fetchurl {
+    url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
+    sha256 = "1v0i7cppdqb02d73qq0bxzz8yydn17jh0g83y3cq3k48awlk22sx";
   };
 
+  unpackPhase = ''
+    mkdir source/
+    tar xvf $src -C source/
+  '';
+
+  sourceRoot = "source";
+
   patches = [ ./static-root-path.patch ];
 
   postPatch = ''
@@ -50,9 +47,9 @@ buildGoPackage rec {
 
   postInstall = ''
     mkdir $data
-    cp -R $src/{public,templates,options} $data
+    cp -R ./go/src/${goPackagePath}/{public,templates,options} $data
     mkdir -p $out
-    cp -R $src/options/locale $out/locale
+    cp -R ./go/src/${goPackagePath}/options/locale $out/locale
 
     wrapProgram $bin/bin/gitea \
       --prefix PATH : ${makeBinPath [ bash git gzip openssh ]}
@@ -64,6 +61,6 @@ buildGoPackage rec {
     description = "Git with a cup of tea";
     homepage = "https://gitea.io";
     license = licenses.mit;
-    maintainers = with maintainers; [ disassembler kolaente ];
+    maintainers = with maintainers; [ disassembler kolaente ma27 ];
   };
 }
diff --git a/pkgs/applications/version-management/gitea/static-root-path.patch b/pkgs/applications/version-management/gitea/static-root-path.patch
index 7c36afdff84c..985dbe04082c 100644
--- a/pkgs/applications/version-management/gitea/static-root-path.patch
+++ b/pkgs/applications/version-management/gitea/static-root-path.patch
@@ -1,13 +1,13 @@
-diff --git i/modules/setting/setting.go w/modules/setting/setting.go
-index aafe2d1b..1e4a8064 100644
---- i/modules/setting/setting.go
-+++ w/modules/setting/setting.go
-@@ -730,7 +730,7 @@ func NewContext() {
- 	LocalURL = sec.Key("LOCAL_ROOT_URL").MustString(defaultLocalURL)
+diff --git a/modules/setting/setting.go b/modules/setting/setting.go
+index 714015c47..a2f85337e 100644
+--- a/modules/setting/setting.go
++++ b/modules/setting/setting.go
+@@ -641,7 +641,7 @@ func NewContext() {
+ 	PortToRedirect = sec.Key("PORT_TO_REDIRECT").MustString("80")
  	OfflineMode = sec.Key("OFFLINE_MODE").MustBool()
  	DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool()
 -	StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(AppWorkPath)
 +	StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString("@data@")
-	AppDataPath = sec.Key("APP_DATA_PATH").MustString(path.Join(AppWorkPath, "data"))
+ 	StaticCacheTime = sec.Key("STATIC_CACHE_TIME").MustDuration(6 * time.Hour)
+ 	AppDataPath = sec.Key("APP_DATA_PATH").MustString(path.Join(AppWorkPath, "data"))
  	EnableGzip = sec.Key("ENABLE_GZIP").MustBool()
- 	EnablePprof = sec.Key("ENABLE_PPROF").MustBool(false)

From 146b207f087b4ca69c431929d228634cab219fcf Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 21 Mar 2020 08:15:42 +1000
Subject: [PATCH 3497/4636] conmon: 2.0.13 -> 2.0.14

https://github.com/containers/conmon/releases/tag/v2.0.14
---
 pkgs/applications/virtualization/conmon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix
index 37223b5cb425..449d06430a57 100644
--- a/pkgs/applications/virtualization/conmon/default.nix
+++ b/pkgs/applications/virtualization/conmon/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "conmon";
-  version = "2.0.13";
+  version = "2.0.14";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1cp9hhanndr6c71g4hdxfgwk348vnnlgijkr12f7qmd5acwfl7jc";
+    sha256 = "1h5mxs8wrsm1q48fmd7slpa0j6g6kjbm1mcizyhk7xz1xrbnicc1";
   };
 
   nativeBuildInputs = [ pkg-config ];

From a64f6187d497c4bd26641babc040106be5b05368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 20 Mar 2020 23:37:21 +0100
Subject: [PATCH 3498/4636] spring{,Lobby}: make it build, still tells me
 unsynced though

---
 pkgs/games/spring/default.nix     | 19 ++++++++++++-------
 pkgs/games/spring/springlobby.nix |  6 +++---
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 8f43a6d84b1a..1cfb6c6e4606 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip
+{ stdenv, fetchFromGitHub, cmake, lzma, boost, libdevil, zlib, p7zip
 , openal, libvorbis, glew, freetype, xorg, SDL2, libGLU, libGL
 , asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper
 , jdk ? null, python ? null, systemd, libunwind, which, minizip
@@ -6,13 +6,15 @@
 }:
 
 stdenv.mkDerivation rec {
-
   pname = "spring";
-  version = "104.0";
+  version = "104.0.1";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/springrts/spring_${version}_src.tar.lzma";
-    sha256 = "05pclcbw7v481pqz7bgirlk37494hy4hx4jghhnlzhdaz1cvzc6f";
+  src = fetchFromGitHub {
+    owner = "spring";
+    repo = "spring";
+    rev = version;
+    sha256 = "1z7c5yxsv0j4nlkmc0limxxkl5mp65jckjfh7nyv3a3zvzhv00zc";
+    fetchSubmodules = true;
   };
 
   # The cmake included module correcly finds nix's glew, however
@@ -21,8 +23,12 @@ stdenv.mkDerivation rec {
     substituteInPlace ./rts/build/cmake/FindAsciiDoc.cmake \
       --replace "PATHS /usr /usr/share /usr/local /usr/local/share" "PATHS ${docbook_xsl}"\
       --replace "xsl/docbook/manpages" "share/xml/docbook-xsl/manpages"
+    substituteInPlace ./rts/Rendering/GL/myGL.cpp \
+      --replace "static constexpr const GLubyte* qcriProcName" "static const GLubyte* qcriProcName"
     patchShebangs .
     rm rts/build/cmake/FindGLEW.cmake
+
+    echo "104.0.1-1466-g9ee29da maintenance" > VERSION
   '';
 
   cmakeFlags = ["-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON"
@@ -50,6 +56,5 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     maintainers = [ maintainers.phreedom maintainers.qknight maintainers.domenkozar ];
     platforms = platforms.linux;
-    broken = true;
   };
 }
diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index dbcec10fdc65..f872d2172375 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "springlobby";
-  version = "0.267";
+  version = "0.269";
 
   src = fetchurl {
-    url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2";
-    sha256 = "0yv7j9l763iqx7hdi2pcz5jkj0068yrffb8nrav7pwg0g3s0znak";
+    url = "https://springlobby.springrts.com/dl/stable/springlobby-${version}.tar.bz2";
+    sha256 = "1shgrfs4ssjj8m0c7805jisjzpc60796l0vja3yjfdksrz7yxvhg";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From d07c55752eb2dffd1e188071330ae7fbb1b7ac4f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 21 Mar 2020 00:13:06 +0100
Subject: [PATCH 3499/4636] flatpak-builder: 1.0.9 -> 1.0.10

https://github.com/flatpak/flatpak-builder/releases/tag/1.0.10

Also clean up the expression slightly:

* Use more convenient GitHub repo as homepage
* Move version into the attrset
* Fix license, it is or-later
---
 .../tools/flatpak-builder/default.nix         | 11 ++++---
 .../tools/flatpak-builder/fix-paths.patch     | 33 ++++++++++++-------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix
index 1bb5c23645d6..e400051e2c66 100644
--- a/pkgs/development/tools/flatpak-builder/default.nix
+++ b/pkgs/development/tools/flatpak-builder/default.nix
@@ -29,6 +29,7 @@
 , gnumake
 , gnupg
 , gnutar
+, p7zip
 , json-glib
 , libcap
 , libdwarf
@@ -44,16 +45,15 @@
 let
   installed_testdir = "${placeholder "installedTests"}/libexec/installed-tests/flatpak-builder";
   installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder";
-  version = "1.0.9";
 in stdenv.mkDerivation rec {
   pname = "flatpak-builder";
-  inherit version;
+  version = "1.0.10";
 
   outputs = [ "out" "doc" "man" "installedTests" ];
 
   src = fetchurl {
     url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz";
-    sha256 = "00qd770qjsiyd8qhhhyn7zg6jyi283ix5dhjzcfdn9yr3h53kvyn";
+    sha256 = "1fn61cl1d33yd1jgqm8jpffjw3xlyyhkn032g14d9gnwkcaf4649";
   };
 
   nativeBuildInputs = [
@@ -99,6 +99,7 @@ in stdenv.mkDerivation rec {
       cpio = "${cpio}/bin/cpio";
       git = "${gitMinimal}/bin/git";
       rofilesfuse = "${ostree}/bin/rofiles-fuse";
+      sevenz = "${p7zip}/bin/7z";
       strip = "${binutils}/bin/strip";
       eustrip = "${elfutils}/bin/eu-strip";
       euelfcompress = "${elfutils}/bin/eu-elfcompress";
@@ -146,8 +147,8 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Tool to build flatpaks from source";
-    homepage = https://flatpak.org/;
-    license = licenses.lgpl21;
+    homepage = "https://github.com/flatpak/flatpak-builder";
+    license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ jtojnar ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/tools/flatpak-builder/fix-paths.patch b/pkgs/development/tools/flatpak-builder/fix-paths.patch
index 6b82e623a02c..cc7d9e82b0af 100644
--- a/pkgs/development/tools/flatpak-builder/fix-paths.patch
+++ b/pkgs/development/tools/flatpak-builder/fix-paths.patch
@@ -1,6 +1,6 @@
 --- a/src/builder-context.c
 +++ b/src/builder-context.c
-@@ -763,7 +763,7 @@
+@@ -800,7 +800,7 @@ builder_context_enable_rofiles (BuilderContext *self,
    g_autoptr(GFile) rofiles_base = NULL;
    g_autoptr(GFile) rofiles_dir = NULL;
    g_autofree char *tmpdir_name = NULL;
@@ -11,7 +11,7 @@
                     (char *)flatpak_file_get_path_cached (self->app_dir),
 --- a/src/builder-git.c
 +++ b/src/builder-git.c
-@@ -44,7 +44,7 @@
+@@ -44,7 +44,7 @@ git (GFile   *dir,
    va_list ap;
  
    va_start (ap, error);
@@ -20,7 +20,7 @@
    va_end (ap);
  
    return res;
-@@ -58,7 +58,7 @@
+@@ -58,7 +58,7 @@ cp (GError **error,
    va_list ap;
  
    va_start (ap, error);
@@ -31,7 +31,7 @@
    return res;
 --- a/src/builder-source-archive.c
 +++ b/src/builder-source-archive.c
-@@ -430,7 +430,7 @@
+@@ -443,7 +443,7 @@ tar (GFile   *dir,
    va_list ap;
  
    va_start (ap, error);
@@ -40,7 +40,7 @@
    va_end (ap);
  
    return res;
-@@ -445,7 +445,7 @@
+@@ -458,7 +458,7 @@ unzip (GFile   *dir,
    va_list ap;
  
    va_start (ap, error);
@@ -49,7 +49,16 @@
    va_end (ap);
  
    return res;
-@@ -457,7 +457,7 @@
+@@ -470,7 +470,7 @@ un7z (GFile       *dir,
+       GError     **error)
+ {
+   gboolean res;
+-  const gchar *argv[] = { "7z",  "x", sevenz_path, NULL };
++  const gchar *argv[] = { "@sevenz@",  "x", sevenz_path, NULL };
+ 
+   res = flatpak_spawnv (dir, NULL, 0, error, argv);
+ 
+@@ -483,7 +483,7 @@ unrpm (GFile   *dir,
         GError **error)
  {
    gboolean res;
@@ -58,7 +67,7 @@
        "sh", /* shell's $0 */
        rpm_path, /* shell's $1 */
        NULL };
-@@ -604,7 +604,7 @@
+@@ -631,7 +631,7 @@ git (GFile   *dir,
    va_list ap;
  
    va_start (ap, error);
@@ -69,7 +78,7 @@
    return res;
 --- a/src/builder-source-bzr.c
 +++ b/src/builder-source-bzr.c
-@@ -124,7 +124,7 @@
+@@ -124,7 +124,7 @@ bzr (GFile   *dir,
    va_list ap;
  
    va_start (ap, error);
@@ -80,7 +89,7 @@
    return res;
 --- a/src/builder-source-patch.c
 +++ b/src/builder-source-patch.c
-@@ -215,15 +215,15 @@
+@@ -247,15 +247,15 @@ patch (GFile      *dir,
  
    args = g_ptr_array_new ();
    if (use_git) {
@@ -101,7 +110,7 @@
      g_ptr_array_add (args, (gchar *) extra_options[i]);
 --- a/src/builder-utils.c
 +++ b/src/builder-utils.c
-@@ -149,7 +149,7 @@
+@@ -149,7 +149,7 @@ strip (GError **error,
    va_list ap;
  
    va_start (ap, error);
@@ -110,7 +119,7 @@
    va_end (ap);
  
    return res;
-@@ -163,7 +163,7 @@
+@@ -163,7 +163,7 @@ eu_strip (GError **error,
    va_list ap;
  
    va_start (ap, error);
@@ -119,7 +128,7 @@
    va_end (ap);
  
    return res;
-@@ -177,7 +177,7 @@
+@@ -177,7 +177,7 @@ eu_elfcompress (GError **error,
    va_list ap;
  
    va_start (ap, error);

From 3064aa7525a7a343dedd31357d30208b2d60f9a2 Mon Sep 17 00:00:00 2001
From: Eric Dallo <ericdallo06@hotmail.com>
Date: Tue, 25 Feb 2020 21:37:47 -0300
Subject: [PATCH 3500/4636] gnomeExtensions.draw-on-your-screen: init at 6

---
 .../draw-on-your-screen/default.nix           | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix

diff --git a/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix b/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix
new file mode 100644
index 000000000000..5e6f7b89e1d9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchgit, gettext, gnome3 }:
+
+stdenv.mkDerivation rec {
+  pname = "gnome-shell-extension-draw-on-your-screen";
+  version = "6";
+
+  src = fetchgit {
+    url = "https://framagit.org/abakkk/DrawOnYourScreen/";
+    rev = "v${version}";
+    sha256 = "05i20ii8lv6mg56rz8lng80dx35l6g45j8wr7jgbp591hg0spj1w";
+  };
+
+  uuid = "drawOnYourScreen@abakkk.framagit.org";
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/share/gnome-shell/extensions/${uuid}
+    cp -r . $out/share/gnome-shell/extensions/${uuid}
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A drawing extension for GNOME Shell";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ ericdallo ];
+    platforms = gnome3.gnome-shell.meta.platforms;
+    homepage = "https://framagit.org/abakkk/DrawOnYourScreen";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0ad721bb4a96..566487020fa1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23784,6 +23784,7 @@ in
     clipboard-indicator = callPackage ../desktops/gnome-3/extensions/clipboard-indicator { };
     dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { };
     dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { };
+    draw-on-your-screen = callPackage ../desktops/gnome-3/extensions/draw-on-your-screen { };
     drop-down-terminal = callPackage ../desktops/gnome-3/extensions/drop-down-terminal { };
     gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { };
     icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { };

From 3474b55614775de1ddfa99368ef1c75ec8d7797f Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Fri, 20 Mar 2020 16:19:43 -0400
Subject: [PATCH 3501/4636] nixos/mysql: fix service so it works with mysql80
 package

---
 nixos/modules/services/databases/mysql.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 248bf0ebc915..f9e657f57742 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -10,16 +10,8 @@ let
 
   isMariaDB = lib.getName mysql == lib.getName pkgs.mariadb;
 
-  isMysqlAtLeast57 =
-    (lib.getName mysql == lib.getName pkgs.mysql57)
-     && (builtins.compareVersions mysql.version "5.7" >= 0);
-
   mysqldOptions =
     "--user=${cfg.user} --datadir=${cfg.dataDir} --basedir=${mysql}";
-  # For MySQL 5.7+, --insecure creates the root user without password
-  # (earlier versions and MariaDB do this by default).
-  installOptions =
-    "${mysqldOptions} ${lib.optionalString isMysqlAtLeast57 "--insecure"}";
 
   settingsFile = pkgs.writeText "my.cnf" (
     generators.toINI { listsAsDuplicateKeys = true; } cfg.settings +
@@ -366,9 +358,14 @@ in
           pkgs.nettools
         ];
 
-        preStart = ''
+        preStart = if isMariaDB then ''
           if ! test -e ${cfg.dataDir}/mysql; then
-            ${mysql}/bin/mysql_install_db --defaults-file=/etc/my.cnf ${installOptions}
+            ${mysql}/bin/mysql_install_db --defaults-file=/etc/my.cnf ${mysqldOptions}
+            touch /tmp/mysql_init
+          fi
+        '' else ''
+          if ! test -e ${cfg.dataDir}/mysql; then
+            ${mysql}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} --initialize-insecure
             touch /tmp/mysql_init
           fi
         '';

From 34dd64b0cc145533a935c798d5a3347d07d5d0aa Mon Sep 17 00:00:00 2001
From: bb010g <me@bb010g.com>
Date: Tue, 12 Nov 2019 17:29:30 -0800
Subject: [PATCH 3502/4636] nixos/documentation: Allow specifying extraSources

Because there was absolutely no way of setting this without rewriting
parts of the module otherwise.
---
 nixos/modules/misc/documentation.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix
index d09afadd6097..7b3f9c0fe9cd 100644
--- a/nixos/modules/misc/documentation.nix
+++ b/nixos/modules/misc/documentation.nix
@@ -17,6 +17,7 @@ let
     inherit pkgs config;
     version = config.system.nixos.release;
     revision = "release-${version}";
+    extraSources = cfg.nixos.extraModuleSources;
     options =
       let
         scrubbedEval = evalModules {
@@ -163,6 +164,19 @@ in
         '';
       };
 
+      nixos.extraModuleSources = mkOption {
+        type = types.listOf (types.either types.path types.str);
+        default = [ ];
+        description = ''
+          Which extra NixOS module paths the generated NixOS's documentation should strip
+          from options.
+        '';
+        example = literalExample ''
+          # e.g. with options from modules in ''${pkgs.customModules}/nix:
+          [ pkgs.customModules ]
+        '';
+      };
+
     };
 
   };

From 53a51f212a1295dadbbdbdcfe15ef65cd37a8518 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 29 Apr 2017 11:33:30 +0800
Subject: [PATCH 3503/4636] atd: systemd-udev-settle serves no purpose

---
 nixos/modules/services/scheduling/atd.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix
index 93ed9231d3c5..cefe72b0e999 100644
--- a/nixos/modules/services/scheduling/atd.nix
+++ b/nixos/modules/services/scheduling/atd.nix
@@ -67,8 +67,6 @@ in
 
     systemd.services.atd = {
       description = "Job Execution Daemon (atd)";
-      after = [ "systemd-udev-settle.service" ];
-      wants = [ "systemd-udev-settle.service" ];
       wantedBy = [ "multi-user.target" ];
 
       path = [ at ];

From 8a31cf1459fbb0c9cca8365d2c89dc9dab7d21af Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 29 Apr 2017 14:50:52 +0800
Subject: [PATCH 3504/4636] zfs: document systemd-udev-settle dependency

---
 nixos/modules/tasks/filesystems/zfs.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 09c7e074e121..07225ee88ff1 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -478,6 +478,7 @@ in
         createImportService = pool:
           nameValuePair "zfs-import-${pool}" {
             description = "Import ZFS pool \"${pool}\"";
+            # we need systemd-udev-settle until https://github.com/zfsonlinux/zfs/pull/4943 is merged
             requires = [ "systemd-udev-settle.service" ];
             after = [ "systemd-udev-settle.service" "systemd-modules-load.service" ];
             wantedBy = (getPoolMounts pool) ++ [ "local-fs.target" ];

From 7f838b4ddeadffbbe5863a6ca27ad776064a2f4a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 28 Apr 2017 14:25:52 +0800
Subject: [PATCH 3505/4636] display-manager: systemd-udev-settle serves no
 purpose

---
 nixos/modules/services/x11/xserver.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 74d702ea1c3d..6aec1c0753a2 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -651,8 +651,7 @@ in
     systemd.services.display-manager =
       { description = "X11 Server";
 
-        after = [ "systemd-udev-settle.service" "acpid.service" "systemd-logind.service" ];
-        wants = [ "systemd-udev-settle.service" ];
+        after = [ "acpid.service" "systemd-logind.service" ];
 
         restartIfChanged = false;
 

From 2b77be7cd7c8e4712e7a0f0cd2ec653ff8fd0085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sun, 15 Mar 2020 15:50:26 +0100
Subject: [PATCH 3506/4636] libnma: init at 1.8.28

Upstream have pulled out libnma from networkmanagerapplet.
---
 .../network-manager/libnma/default.nix        | 89 +++++++++++++++++++
 .../libnma/hardcode-gsettings.patch           | 26 ++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 117 insertions(+)
 create mode 100644 pkgs/tools/networking/network-manager/libnma/default.nix
 create mode 100644 pkgs/tools/networking/network-manager/libnma/hardcode-gsettings.patch

diff --git a/pkgs/tools/networking/network-manager/libnma/default.nix b/pkgs/tools/networking/network-manager/libnma/default.nix
new file mode 100644
index 000000000000..727c18e92c10
--- /dev/null
+++ b/pkgs/tools/networking/network-manager/libnma/default.nix
@@ -0,0 +1,89 @@
+{ stdenv
+, fetchurl
+, meson
+, ninja
+, gettext
+, gtk-doc
+, pkg-config
+, vala
+, networkmanager
+, gnome3
+, isocodes
+, libxml2
+, docbook_xsl
+, docbook_xml_dtd_43
+, mobile-broadband-provider-info
+, gobject-introspection
+, gtk3
+, withGnome ? true
+, gcr
+, glib
+, substituteAll
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libnma";
+  version = "1.8.28";
+
+  outputs = [ "out" "dev" "devdoc" ];
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "09mp6k0hfam1vyyv9kcd8j4gb2r58i05ipx2nswb58ris599bxja";
+  };
+
+  patches = [
+    # Needed for wingpanel-indicator-network and switchboard-plug-network
+    ./hardcode-gsettings.patch
+  ];
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    gettext
+    pkg-config
+    gobject-introspection
+    gtk-doc
+    docbook_xsl
+    docbook_xml_dtd_43
+    libxml2
+    vala
+  ];
+
+  buildInputs = [
+    gtk3
+    networkmanager
+    isocodes
+    mobile-broadband-provider-info
+  ] ++ stdenv.lib.optionals withGnome [
+    # advanced certificate chooser
+    gcr
+  ];
+
+  mesonFlags = [
+    "-Dgcr=${if withGnome then "true" else "false"}"
+  ];
+
+  postPatch = ''
+    substituteInPlace src/nma-ws/nma-eap.c --subst-var-by \
+      NM_APPLET_GSETTINGS ${glib.makeSchemaPath "$out" "${pname}-${version}"}
+  '';
+
+  postInstall = ''
+    glib-compile-schemas $out/share/glib-2.0/schemas
+  '';
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
+
+  meta = with stdenv.lib; {
+    homepage = "https://gitlab.gnome.org/GNOME/libnma";
+    description = "NetworkManager UI utilities (libnm version)";
+    license = licenses.gpl2Plus; # Mix of GPL and LPGL 2+
+    maintainers = teams.gnome.members;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/networking/network-manager/libnma/hardcode-gsettings.patch b/pkgs/tools/networking/network-manager/libnma/hardcode-gsettings.patch
new file mode 100644
index 000000000000..9b2f5366950c
--- /dev/null
+++ b/pkgs/tools/networking/network-manager/libnma/hardcode-gsettings.patch
@@ -0,0 +1,26 @@
+--- a/src/nma-ws/nma-eap.c
++++ b/src/nma-ws/nma-eap.c
+@@ -248,11 +248,16 @@ nma_eap_ca_cert_ignore_get (NMAEap *method, NMConnection *connection)
+ static GSettings *
+ _get_ca_ignore_settings (NMConnection *connection)
+ {
++	g_autoptr (GSettingsSchemaSource) *schema_source;
++	g_autoptr (GSettingsSchema) *schema;
+ 	GSettings *settings;
+ 	char *path = NULL;
+ 	const char *uuid;
+
+ 	g_return_val_if_fail (connection, NULL);
+
++	schema_source = g_settings_schema_source_new_from_directory ("@NM_APPLET_GSETTINGS@", g_settings_schema_source_get_default (), TRUE, NULL);
++	schema = g_settings_schema_source_lookup (schema_source, "org.gnome.nm-applet.eap", FALSE);
++
+ 	uuid = nm_connection_get_uuid (connection);
+ 	g_return_val_if_fail (uuid && *uuid, NULL);
+
+ 	path = g_strdup_printf ("/org/gnome/nm-applet/eap/%s/", uuid);
+-	settings = g_settings_new_with_path ("org.gnome.nm-applet.eap", path);
++	settings = g_settings_new_full (schema, NULL, path);
+ 	g_free (path);
+
+ 	return settings;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da01b5135e90..540fd6e0b2ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5339,6 +5339,8 @@ in
 
   networkmanagerapplet = callPackage ../tools/networking/network-manager/applet { };
 
+  libnma = callPackage ../tools/networking/network-manager/libnma { };
+
   networkmanager_dmenu = callPackage ../tools/networking/network-manager/dmenu  { };
 
   nm-tray = libsForQt5.callPackage ../tools/networking/network-manager/tray.nix { };

From f07bad3201edb6a23b2e01a82f312e0786859a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sun, 15 Mar 2020 16:44:08 +0100
Subject: [PATCH 3507/4636] networkmanagerapplet: format

---
 .../network-manager/applet/default.nix        | 70 ++++++++++++++++---
 1 file changed, 59 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/applet/default.nix b/pkgs/tools/networking/network-manager/applet/default.nix
index 69b454ea72ee..9de462bbe557 100644
--- a/pkgs/tools/networking/network-manager/applet/default.nix
+++ b/pkgs/tools/networking/network-manager/applet/default.nix
@@ -1,8 +1,34 @@
-{ stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3
-, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl, docbook_xml_dtd_43
-, mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas
-, libgudev, jansson, wrapGAppsHook, gobject-introspection, python3, gtk3
-, libappindicator-gtk3, withGnome ? true, gcr, glib }:
+{ stdenv
+, fetchurl
+, meson
+, ninja
+, intltool
+, gtk-doc
+, pkg-config
+, networkmanager
+, gnome3
+, libnotify
+, libsecret
+, polkit
+, isocodes
+, modemmanager
+, libxml2
+, docbook_xsl
+, docbook_xml_dtd_43
+, mobile-broadband-provider-info
+, glib-networking
+, gsettings-desktop-schemas
+, libgudev
+, jansson
+, wrapGAppsHook
+, gobject-introspection
+, python3
+, gtk3
+, libappindicator-gtk3
+, withGnome ? true
+, gcr
+, glib
+}:
 
 let
   pname = "network-manager-applet";
@@ -25,13 +51,35 @@ in stdenv.mkDerivation rec {
   outputs = [ "out" "lib" "dev" "devdoc" "man" ];
 
   buildInputs = [
-    gtk3 networkmanager libnotify libsecret gsettings-desktop-schemas
-    polkit isocodes mobile-broadband-provider-info libgudev
-    modemmanager jansson glib-networking
-    libappindicator-gtk3 gnome3.adwaita-icon-theme
+    gtk3
+    networkmanager
+    libnotify
+    libsecret
+    gsettings-desktop-schemas
+    polkit
+    isocodes
+    mobile-broadband-provider-info
+    libgudev
+    modemmanager
+    jansson
+    glib-networking
+    libappindicator-gtk3
+    gnome3.adwaita-icon-theme
   ] ++ stdenv.lib.optionals withGnome [ gcr ]; # advanced certificate chooser
 
-  nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobject-introspection python3 gtk-doc docbook_xsl docbook_xml_dtd_43 libxml2 ];
+  nativeBuildInputs = [
+    meson
+    ninja
+    intltool
+    pkg-config
+    wrapGAppsHook
+    gobject-introspection
+    python3
+    gtk-doc
+    docbook_xsl
+    docbook_xml_dtd_43
+    libxml2
+  ];
 
   # Needed for wingpanel-indicator-network and switchboard-plug-network
   patches = [ ./hardcode-gsettings.patch ];
@@ -40,7 +88,7 @@ in stdenv.mkDerivation rec {
     chmod +x meson_post_install.py # patchShebangs requires executable file
     patchShebangs meson_post_install.py
 
-    substituteInPlace src/wireless-security/eap-method.c --subst-var-by NM_APPLET_GSETTINGS ${glib.makeSchemaPath "$lib" name}
+    substituteInPlace src/wireless-security/eap-method.c --subst-var-by NM_APPLET_GSETTINGS ${glib.makeSchemaPath "$lib" "${pname}-${version}"}
   '';
 
   passthru = {

From 50438bd5b1589dfd3a4dfa407b81441ed42fc8c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sun, 15 Mar 2020 16:49:22 +0100
Subject: [PATCH 3508/4636] networkmanagerapplet: 1.8.24 -> 1.16.0

No longer carries libnma, so we can drop a bunch of dependencies and
simplify a bit.
---
 .../network-manager/applet/default.nix        | 42 +++++--------------
 .../applet/hardcode-gsettings.patch           | 32 --------------
 2 files changed, 11 insertions(+), 63 deletions(-)
 delete mode 100644 pkgs/tools/networking/network-manager/applet/hardcode-gsettings.patch

diff --git a/pkgs/tools/networking/network-manager/applet/default.nix b/pkgs/tools/networking/network-manager/applet/default.nix
index 9de462bbe557..109c4c8cce15 100644
--- a/pkgs/tools/networking/network-manager/applet/default.nix
+++ b/pkgs/tools/networking/network-manager/applet/default.nix
@@ -2,19 +2,15 @@
 , fetchurl
 , meson
 , ninja
-, intltool
-, gtk-doc
+, gettext
 , pkg-config
 , networkmanager
 , gnome3
 , libnotify
 , libsecret
 , polkit
-, isocodes
 , modemmanager
-, libxml2
-, docbook_xsl
-, docbook_xml_dtd_43
+, libnma
 , mobile-broadband-provider-info
 , glib-networking
 , gsettings-desktop-schemas
@@ -25,70 +21,54 @@
 , python3
 , gtk3
 , libappindicator-gtk3
-, withGnome ? true
-, gcr
 , glib
 }:
 
-let
+stdenv.mkDerivation rec {
   pname = "network-manager-applet";
-  version = "1.8.24";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+  version = "1.16.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1gzvz4wfqfsfclqg56y954al8x6fmz71cnxlx1i4nqr7a25bp2qi";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "1rf3nm0hjcy9f8ajb4vmvwy503w8yj8d4daxkcb7w7i7b92qmyfn";
   };
 
   mesonFlags = [
-    "-Dlibnm_gtk=false" # It is deprecated
     "-Dselinux=false"
     "-Dappindicator=yes"
-    "-Dgcr=${if withGnome then "true" else "false"}"
   ];
 
-  outputs = [ "out" "lib" "dev" "devdoc" "man" ];
+  outputs = [ "out" "man" ];
 
   buildInputs = [
+    libnma
     gtk3
     networkmanager
     libnotify
     libsecret
     gsettings-desktop-schemas
     polkit
-    isocodes
-    mobile-broadband-provider-info
     libgudev
     modemmanager
     jansson
     glib-networking
     libappindicator-gtk3
     gnome3.adwaita-icon-theme
-  ] ++ stdenv.lib.optionals withGnome [ gcr ]; # advanced certificate chooser
+  ];
 
   nativeBuildInputs = [
     meson
     ninja
-    intltool
+    gettext
     pkg-config
     wrapGAppsHook
     gobject-introspection
     python3
-    gtk-doc
-    docbook_xsl
-    docbook_xml_dtd_43
-    libxml2
   ];
 
-  # Needed for wingpanel-indicator-network and switchboard-plug-network
-  patches = [ ./hardcode-gsettings.patch ];
-
   postPatch = ''
     chmod +x meson_post_install.py # patchShebangs requires executable file
     patchShebangs meson_post_install.py
-
-    substituteInPlace src/wireless-security/eap-method.c --subst-var-by NM_APPLET_GSETTINGS ${glib.makeSchemaPath "$lib" "${pname}-${version}"}
   '';
 
   passthru = {
@@ -99,7 +79,7 @@ in stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/NetworkManager;
+    homepage = "https://gitlab.gnome.org/GNOME/network-manager-applet/";
     description = "NetworkManager control applet for GNOME";
     license = licenses.gpl2;
     maintainers = with maintainers; [ phreedom ];
diff --git a/pkgs/tools/networking/network-manager/applet/hardcode-gsettings.patch b/pkgs/tools/networking/network-manager/applet/hardcode-gsettings.patch
deleted file mode 100644
index a480fd6d91e7..000000000000
--- a/pkgs/tools/networking/network-manager/applet/hardcode-gsettings.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/src/wireless-security/eap-method.c b/src/wireless-security/eap-method.c
-index 2e9daa23..6663b3ce 100644
---- a/src/wireless-security/eap-method.c
-+++ b/src/wireless-security/eap-method.c
-@@ -265,8 +265,11 @@ eap_method_ca_cert_ignore_get (EAPMethod *method, NMConnection *connection)
- static GSettings *
- _get_ca_ignore_settings (NMConnection *connection)
- {
-+	GSettingsSchemaSource *schema_source;
-+	g_autoptr (GSettingsSchema) *schema;
- 	GSettings *settings;
--	char *path = NULL;
-+
-+	g_autofree char *path = NULL;
- 	const char *uuid;
- 
- 	g_return_val_if_fail (connection, NULL);
-@@ -274,9 +277,12 @@ _get_ca_ignore_settings (NMConnection *connection)
- 	uuid = nm_connection_get_uuid (connection);
- 	g_return_val_if_fail (uuid && *uuid, NULL);
- 
-+	schema_source = g_settings_schema_source_new_from_directory ("@NM_APPLET_GSETTINGS@", g_settings_schema_source_get_default (), TRUE, NULL);
-+	schema = g_settings_schema_source_lookup (schema_source, "org.gnome.nm-applet.eap", FALSE);
-+	g_settings_schema_source_unref (schema_source);
-+
- 	path = g_strdup_printf ("/org/gnome/nm-applet/eap/%s/", uuid);
--	settings = g_settings_new_with_path ("org.gnome.nm-applet.eap", path);
--	g_free (path);
-+	settings = g_settings_new_full (schema, NULL, path);
- 
- 	return settings;
- }

From 691ddf1a8ecc6f475be2a448cfbc07241ac2ebee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 16 Mar 2020 01:09:39 +0100
Subject: [PATCH 3509/4636] gnome3.gnome-control-center: use libnma

---
 pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index ea38ed883209..4e66a16bf7c5 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -48,6 +48,7 @@
 , mutter
 , networkmanager
 , networkmanagerapplet
+, libnma
 , ninja
 , pkgconfig
 , polkit
@@ -126,7 +127,7 @@ stdenv.mkDerivation rec {
     modemmanager
     mutter # schemas for the keybindings
     networkmanager
-    networkmanagerapplet
+    libnma
     polkit
     samba
     tracker

From ea4b4c41baa1192a85f9597789d45e84a2bab174 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 16 Mar 2020 01:11:30 +0100
Subject: [PATCH 3510/4636] gnome3.gnome-shell: use libnma

---
 pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 71d47a338a78..26e96b5a3385 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -3,7 +3,7 @@
 , libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info
 , libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils
 , libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr
-, accountsservice, gdk-pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd, gnome-desktop
+, accountsservice, gdk-pixbuf, gdm, upower, ibus, libnma, libgnomekbd, gnome-desktop
 , gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3
 , sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon
 , gnome-autoar, asciidoc-full }:
@@ -43,7 +43,7 @@ in stdenv.mkDerivation rec {
     gnome-autoar
 
     # not declared at build time, but typelib is needed at runtime
-    libgweather networkmanagerapplet
+    libgweather libnma
   ];
 
   patches = [

From ac7d843413c3891ca0fcf0ced9f8ff3ed050cad8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 16 Mar 2020 01:14:00 +0100
Subject: [PATCH 3511/4636] pantheon.switchboard-plug-network: use libnma

---
 .../pantheon/apps/switchboard-plugs/network/default.nix        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
index 6e050c92d805..1ff1068119b7 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix
@@ -11,6 +11,7 @@
 , gtk3
 , networkmanager
 , networkmanagerapplet
+, libnma
 , switchboard
 }:
 
@@ -43,7 +44,7 @@ stdenv.mkDerivation rec {
     gtk3
     libgee
     networkmanager
-    networkmanagerapplet
+    libnma
     switchboard
   ];
 

From dd48e9b58c991f6006745fca7c86c099ea7e679f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 16 Mar 2020 01:17:13 +0100
Subject: [PATCH 3512/4636] networkmanager-openvpn: use libnma

---
 pkgs/tools/networking/network-manager/openvpn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix
index 2762b12a364a..13f7eab5cc78 100644
--- a/pkgs/tools/networking/network-manager/openvpn/default.nix
+++ b/pkgs/tools/networking/network-manager/openvpn/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, file, networkmanager, libsecret
-, gtk3, withGnome ? true, gnome3, kmod, fetchpatch, networkmanagerapplet }:
+, gtk3, withGnome ? true, gnome3, kmod, fetchpatch, libnma }:
 
 let
   pname = "NetworkManager-openvpn";
@@ -25,7 +25,7 @@ in stdenv.mkDerivation {
   ];
 
   buildInputs = [ openvpn networkmanager ]
-    ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ];
+    ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ];
 
   nativeBuildInputs = [ intltool pkgconfig file libxml2 ];
 

From 5e19d8a4bbd324541ba9c3eee46a6980bebab661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 16 Mar 2020 01:18:44 +0100
Subject: [PATCH 3513/4636] networkmanager-iodine: use libnma

---
 pkgs/tools/networking/network-manager/iodine/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix
index 9042605caf17..47e5a2f41813 100644
--- a/pkgs/tools/networking/network-manager/iodine/default.nix
+++ b/pkgs/tools/networking/network-manager/iodine/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitLab, substituteAll, autoreconfHook, iodine, intltool, pkgconfig, networkmanager, libsecret, gtk3
-, withGnome ? true, gnome3, fetchpatch, networkmanagerapplet }:
+, withGnome ? true, gnome3, fetchpatch, libnma }:
 
 let
   pname = "NetworkManager-iodine";
@@ -28,7 +28,7 @@ in stdenv.mkDerivation {
   ];
 
   buildInputs = [ iodine networkmanager ]
-    ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ];
+    ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ];
 
   nativeBuildInputs = [ intltool autoreconfHook pkgconfig ];
 

From e2affc51a0e31a2d53ead9acc966db3c97dbf4b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 16 Mar 2020 01:19:52 +0100
Subject: [PATCH 3514/4636] networkmanager_strongswan: use libnma

---
 pkgs/tools/networking/network-manager/strongswan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/strongswan/default.nix b/pkgs/tools/networking/network-manager/strongswan/default.nix
index 843985bfa3e4..4f0a516b4201 100644
--- a/pkgs/tools/networking/network-manager/strongswan/default.nix
+++ b/pkgs/tools/networking/network-manager/strongswan/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM
-, gtk3, gnome3, libsecret, networkmanagerapplet }:
+, gtk3, gnome3, libsecret, libnma }:
 
 stdenv.mkDerivation rec {
   pname = "NetworkManager-strongswan";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "015xcj42pd84apa0j0n9r3fhldp42mj72dqvl2xf4r9gwg5nhfrl";
   };
 
-  buildInputs = [ networkmanager strongswanNM libsecret gtk3 networkmanagerapplet ];
+  buildInputs = [ networkmanager strongswanNM libsecret gtk3 libnma ];
 
   nativeBuildInputs = [ intltool pkgconfig ];
 

From f8000839dfc8350d3fb055a990b035718f4fc189 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 16 Mar 2020 01:20:55 +0100
Subject: [PATCH 3515/4636] networkmanager-vpnc: use libnma

---
 pkgs/tools/networking/network-manager/vpnc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/vpnc/default.nix b/pkgs/tools/networking/network-manager/vpnc/default.nix
index 663923255745..9c1d046e4fb6 100644
--- a/pkgs/tools/networking/network-manager/vpnc/default.nix
+++ b/pkgs/tools/networking/network-manager/vpnc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, substituteAll, vpnc, intltool, pkgconfig, networkmanager, libsecret
-, gtk3, withGnome ? true, gnome3, kmod, file, fetchpatch, networkmanagerapplet }:
+, gtk3, withGnome ? true, gnome3, kmod, file, fetchpatch, libnma }:
 let
   pname = "NetworkManager-vpnc";
   version = "1.2.6";
@@ -24,7 +24,7 @@ in stdenv.mkDerivation {
   ];
 
   buildInputs = [ vpnc networkmanager ]
-    ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ];
+    ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ];
 
   nativeBuildInputs = [ intltool pkgconfig file ];
 

From 59c82bcecaf358101814d01b6b37cae9e91d7d07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 16 Mar 2020 01:22:11 +0100
Subject: [PATCH 3516/4636] networkmanager-fortisslvpn: use libnma

---
 pkgs/tools/networking/network-manager/fortisslvpn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
index 94a4c4b362ae..0ce50a3b2d4b 100644
--- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
+++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, file, gtk3,
-networkmanager, ppp, libsecret, withGnome ? true, gnome3, fetchpatch, networkmanagerapplet }:
+networkmanager, ppp, libsecret, withGnome ? true, gnome3, fetchpatch, libnma }:
 
 let
   pname = "NetworkManager-fortisslvpn";
@@ -25,7 +25,7 @@ in stdenv.mkDerivation {
   ];
 
   buildInputs = [ openfortivpn networkmanager ppp ]
-    ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ];
+    ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ];
 
   nativeBuildInputs = [ intltool pkgconfig file ];
 

From f9f5ab3c88277f18a07c2e45780f822383b8b19c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 16 Mar 2020 01:22:55 +0100
Subject: [PATCH 3517/4636] networkmanager-l2tp: use libnma

---
 pkgs/tools/networking/network-manager/l2tp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/network-manager/l2tp/default.nix
index e4ab74f08e35..09fb0c5977b5 100644
--- a/pkgs/tools/networking/network-manager/l2tp/default.nix
+++ b/pkgs/tools/networking/network-manager/l2tp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig
 , file, findutils
 , gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret
-, withGnome ? true, networkmanagerapplet }:
+, withGnome ? true, libnma }:
 
 stdenv.mkDerivation rec {
   name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [ networkmanager ppp ]
-    ++ stdenv.lib.optionals withGnome [ gtk3 libsecret networkmanagerapplet ];
+    ++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ];
 
   nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig file findutils ];
 

From 31ffa73dd897fab9d4124076fbd9125c466ebc45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 16 Mar 2020 01:23:56 +0100
Subject: [PATCH 3518/4636] pantheon.wingpanel-indicator-network: use libnma

---
 .../pantheon/desktop/wingpanel-indicators/network/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
index fd22de25d63c..cd04e6287b72 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix
@@ -8,7 +8,7 @@
 , gtk3
 , granite
 , networkmanager
-, networkmanagerapplet
+, libnma
 , wingpanel
 , libgee
 }:
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     gtk3
     libgee
     networkmanager
-    networkmanagerapplet
+    libnma
     wingpanel
   ];
 

From 142916e4f8285420e6ac6fcff6698398d2606a30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 16 Mar 2020 01:27:13 +0100
Subject: [PATCH 3519/4636] cinnamon.cjs: remove networkmanagerapplet

This doesn't seem to be in use.
---
 pkgs/desktops/cinnamon/cjs/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix
index 9dbab8fd767e..d67a5d8386a8 100644
--- a/pkgs/desktops/cinnamon/cjs/default.nix
+++ b/pkgs/desktops/cinnamon/cjs/default.nix
@@ -17,7 +17,6 @@
 , libffi
 , gtk3
 , readline
-, networkmanagerapplet
 }:
 
 let
@@ -46,7 +45,6 @@ stdenv.mkDerivation rec {
     keybinder3
     upower
     xapps
-    networkmanagerapplet
   ];
 
   nativeBuildInputs = [

From e0ec9581c97baf0804265ed6a3132e9455b95757 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 16 Mar 2020 01:32:39 +0100
Subject: [PATCH 3520/4636] cinnamon.cinnamon-control-center: use libnma

---
 pkgs/desktops/cinnamon/cinnamon-control-center/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
index e8fa7c7b4e39..454d65335540 100644
--- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
@@ -33,7 +33,7 @@
 , wrapGAppsHook
 , tzdata
 , glibc
-, networkmanagerapplet
+, libnma
 , modemmanager
 , xorg
 , gdk-pixbuf
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     gnome-online-accounts
     tzdata
     networkmanager
-    networkmanagerapplet
+    libnma
     modemmanager
     xorg.libXxf86misc
     xorg.libxkbfile

From b6445d30a1c85ca9ae5a15528afcac5f0dabf0e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 16 Mar 2020 01:37:46 +0100
Subject: [PATCH 3521/4636] gnome3.gnome-initial-setup: use libnma

---
 pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
index 4423755f71ce..47d06ddac310 100644
--- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
@@ -28,7 +28,7 @@
 , polkit
 , webkitgtk
 , systemd
-, networkmanagerapplet
+, libnma
 , tzdata
 , yelp
 , libgnomekbd
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     pango
     polkit
     webkitgtk
-    networkmanagerapplet
+    libnma
   ];
 
   patches = [

From d012168b90f5a1c282ca0e9a71bba603e97b80f2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Mar 2020 04:57:58 +0000
Subject: [PATCH 3522/4636] syncthingtray: 0.10.6 -> 0.10.7

---
 pkgs/applications/misc/syncthingtray/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix
index 610409af7a7b..20dd3d6a3c68 100644
--- a/pkgs/applications/misc/syncthingtray/default.nix
+++ b/pkgs/applications/misc/syncthingtray/default.nix
@@ -20,14 +20,14 @@
 }:
 
 mkDerivation rec {
-  version = "0.10.6";
+  version = "0.10.7";
   pname = "syncthingtray";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = "syncthingtray";
     rev = "v${version}";
-    sha256 = "1lh1qsdy5081jrs27ba0mfh90ya1fj9h6j5k0cdsfap9mcxyjd9g";
+    sha256 = "0qix22wblakpxwqy63378p5rksnx2ik9gfw0c6za19mzhx7gwln8";
   };
 
   buildInputs = [ qtbase cpp-utilities qtutilities ]

From f50c31baa1c158f9060fca9ecfa7661cd7cf2cff Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Mar 2020 22:14:30 +0000
Subject: [PATCH 3523/4636] dnnl: 1.2.1 -> 1.2.2

---
 pkgs/development/libraries/dnnl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/dnnl/default.nix b/pkgs/development/libraries/dnnl/default.nix
index 23824e350016..40d9030b9534 100644
--- a/pkgs/development/libraries/dnnl/default.nix
+++ b/pkgs/development/libraries/dnnl/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dnnl";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "mkl-dnn";
     rev = "v${version}";
-    sha256 = "17bydid5v43lgwvgxv25i67iiyirmwgbdzvv9wpjig34ryhx8hvf";
+    sha256 = "0ydy7ibm6sh1awrikyj938n26cpg5magnxraz2d0pj76irv4vj5m";
   };
 
   # Generic fix merged upstream in https://github.com/intel/mkl-dnn/pull/631

From ab106571e170f210b29d4dd52a87b0729683104e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Mar 2020 04:43:01 +0000
Subject: [PATCH 3524/4636] spdk: 20.01 -> 20.01.1

---
 pkgs/development/libraries/spdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix
index 215e26ec43c2..e8d4f3eb4e07 100644
--- a/pkgs/development/libraries/spdk/default.nix
+++ b/pkgs/development/libraries/spdk/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "spdk";
-  version = "20.01";
+  version = "20.01.1";
 
   src = fetchFromGitHub {
     owner = "spdk";
     repo = "spdk";
     rev = "v${version}";
-    sha256 = "13pbl46bfzc3z10ydr1crimklyj7f0s73873bjknglw474gm52h8";
+    sha256 = "1ci0kj0bv5jp5yipa8g0q0ah71qv6pjvvban1ad0v24f7lq4xh0w";
   };
 
   patches = [ ./spdk-dpdk-meson.patch ];

From 9c3997e05a8ded99d2791b5ed51545500c77f51d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Mar 2020 02:43:20 +0000
Subject: [PATCH 3525/4636] parlatype: 1.6.2 -> 2.0

---
 pkgs/applications/audio/parlatype/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix
index fb5fe47f4f2d..e4728b9b9c45 100644
--- a/pkgs/applications/audio/parlatype/default.nix
+++ b/pkgs/applications/audio/parlatype/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "parlatype";
-  version = "1.6.2";
+  version = "2.0";
 
   src = fetchFromGitHub {
     owner  = "gkarsay";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "157423f40l8nd5da6y0qjmg4l3125zailp98w2hda3mxxn1j5ix3";
+    sha256 = "026i19vkdq35rldbjp1wglamr22a1330iv736mmgbd8fs7vz22nx";
   };
 
   nativeBuildInputs = [
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
       It plays audio sources to transcribe them in your favourite text application.
       It’s intended to be useful for journalists, students, scientists and whoever needs to transcribe audio files.
     '';
-    homepage = https://gkarsay.github.io/parlatype/;
+    homepage = "https://gkarsay.github.io/parlatype/";
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.melchips ];
     platforms = platforms.linux;

From 9280913df4143b54a1fc0a5005ea5ca3ac43afed Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Mar 2020 01:15:54 +0000
Subject: [PATCH 3526/4636] mdbook: 0.3.5 -> 0.3.6

---
 pkgs/tools/text/mdbook/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix
index 2aad1755cff0..09e0b24ab7ff 100644
--- a/pkgs/tools/text/mdbook/default.nix
+++ b/pkgs/tools/text/mdbook/default.nix
@@ -2,22 +2,22 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mdbook";
-  version = "0.3.5";
+  version = "0.3.6";
 
   src = fetchFromGitHub {
     owner = "rust-lang-nursery";
     repo = "mdBook";
     rev = "v${version}";
-    sha256 = "0gcrv54iswphzxxkmak1c7pmmpakiri6jk50j4bxrsplwjr76f7n";
+    sha256 = "07rpak233mi6ssqbpqsccn66a32jcgl90a5iyl2l5yyxw95rcya0";
   };
 
-  cargoSha256 = "12i9w9dgji36yvvdks0vkjjkh32nbnhz76sgrl2827pj49h9vnn0";
+  cargoSha256 = "0aanngwx7k86fb11zjx4wx954md446nn8667f2plr6bkqmlpxlkr";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
 
   meta = with stdenv.lib; {
     description = "Create books from MarkDown";
-    homepage = https://github.com/rust-lang-nursery/mdbook;
+    homepage = "https://github.com/rust-lang-nursery/mdbook";
     license = [ licenses.mpl20 ];
     maintainers = [ maintainers.havvy ];
     platforms = platforms.all;

From f365b382c760cf3c5757c43629ebe8d66326b047 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Mar 2020 21:12:35 +0000
Subject: [PATCH 3527/4636] catch2: 2.11.1 -> 2.11.3

---
 pkgs/development/libraries/catch2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix
index cc338e35d832..a2b65c9bbb41 100644
--- a/pkgs/development/libraries/catch2/default.nix
+++ b/pkgs/development/libraries/catch2/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "catch2";
-  version = "2.11.1";
+  version = "2.11.3";
 
   src = fetchFromGitHub {
     owner = "catchorg";
     repo = "Catch2";
     rev = "v${version}";
-    sha256="1jijj72cas6k5hckkxqppbv1inlwbca37p0ixzs3vzm2jhnd7z31";
+    sha256="012j7fnlsdyvg6d7gwdab7yzllkv4wqb164lfg4ixahx9l9schmp";
   };
 
   nativeBuildInputs = [ cmake ];

From 06b4333891ec281c19af62be190293b3eeb1fd17 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Mar 2020 18:36:28 +0000
Subject: [PATCH 3528/4636] xpra: 3.0.6 -> 3.0.7

---
 pkgs/tools/X11/xpra/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index ea4e84889f9f..cef8bd491637 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -14,11 +14,11 @@ let
   xf86videodummy = callPackage ./xf86videodummy { };
 in buildPythonApplication rec {
   pname = "xpra";
-  version = "3.0.6";
+  version = "3.0.7";
 
   src = fetchurl {
     url = "https://xpra.org/src/${pname}-${version}.tar.xz";
-    sha256 = "0msm53iphb6zr1phb2knkrn94hjcg3a9n1vvbis5sipdvlx50m08";
+    sha256 = "0i4c5cdr5prbz54jinsinhvb60s5s5yskjzjg47zbw0if17sp26w";
   };
 
   patches = [
@@ -88,7 +88,7 @@ in buildPythonApplication rec {
   passthru = { inherit xf86videodummy; };
 
   meta = {
-    homepage = http://xpra.org/;
+    homepage = "http://xpra.org/";
     downloadPage = "https://xpra.org/src/";
     downloadURLRegexp = "xpra-.*[.]tar[.]xz$";
     description = "Persistent remote applications for X";

From 0d8cd0861ad7936f60f05f375f5fe2da71894498 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Mar 2020 06:11:02 +0000
Subject: [PATCH 3529/4636] ytcc: 1.8.2 -> 1.8.3

---
 pkgs/tools/networking/ytcc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/tools/networking/ytcc/default.nix
index 4675dac5f47f..f5086e15436e 100644
--- a/pkgs/tools/networking/ytcc/default.nix
+++ b/pkgs/tools/networking/ytcc/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "ytcc";
-  version = "1.8.2";
+  version = "1.8.3";
 
   src = fetchFromGitHub {
     owner = "woefe";
     repo = "ytcc";
     rev = "v${version}";
-    sha256 = "0a4gxdan3aivbpkxw9cv1bgl7rfrwdii12d096dx06zlymb27gqs";
+    sha256 = "0993vqbsqcnxgv5l3il432i4sqzp8ns69rnsgww872vpb4bp3cg8";
   };
 
   nativeBuildInputs = [ gettext ];

From 473366f5cabfbbc5ed1be4477c90ffe5b30e772c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Mar 2020 05:58:38 +0000
Subject: [PATCH 3530/4636] x11docker: 6.5.0 -> 6.6.0

---
 pkgs/applications/virtualization/x11docker/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix
index 0d6b3632bc76..add16fd98f95 100644
--- a/pkgs/applications/virtualization/x11docker/default.nix
+++ b/pkgs/applications/virtualization/x11docker/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute }:
 stdenv.mkDerivation rec {
   pname = "x11docker";
-  version = "6.5.0";
+  version = "6.6.0";
   src = fetchFromGitHub {
     owner = "mviereck";
     repo = "x11docker";
     rev = "v${version}";
-    sha256 = "1lh45cxzpdwvhahlcayzqwq1q5hra25mszs13j0dswklcjvjqw8b";
+    sha256 = "0a7fggyaybfppsvqyll1gsh19pp41nkly4x1sgy5pk1d9j1lblgx";
   };
   nativeBuildInputs = [ makeWrapper ];
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Run graphical applications with Docker";
-    homepage = https://github.com/mviereck/x11docker;
+    homepage = "https://github.com/mviereck/x11docker";
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ jD91mZM2 ];
     platforms = stdenv.lib.platforms.linux;

From 41b012907d7ec302ef953dfcaaef337ae6f93f79 Mon Sep 17 00:00:00 2001
From: Michael Lingelbach <m.j.lbach@gmail.com>
Date: Fri, 20 Mar 2020 21:41:31 -0700
Subject: [PATCH 3531/4636] nvidia-optical-flow-sdk: init at
 79c6cee80a2df9a196f20afd6b598a9810964c32

---
 .../nvidia-optical-flow-sdk/default.nix       | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix

diff --git a/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix b/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix
new file mode 100644
index 000000000000..667f3d94e05a
--- /dev/null
+++ b/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+  pname = "nvidia-optical-flow-sdk";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "NVIDIA";
+    repo = "NVIDIAOpticalFlowSDK";
+    rev = "79c6cee80a2df9a196f20afd6b598a9810964c32";
+    sha256 = "1y6igwv75v1ynqm7j6la3ky0f15mgnj1jyyak82yvhcsx1aax0a1";
+  };
+
+  # # We only need the header files. The library files are
+  # # in the nvidia_x11 driver.
+  installPhase = ''
+    mkdir -p $out/include
+    cp -R * $out/include
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Nvidia optical flow headers for computing the relative motion of pixels between images";
+    homepage = "https://developer.nvidia.com/opticalflow-sdk";
+    license = licenses.bsd3; # applies to the header files only
+    platforms = platforms.all;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 480b9d7b6d27..446eda6fce82 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13585,6 +13585,8 @@ in
 
   nvidia-video-sdk = callPackage ../development/libraries/nvidia-video-sdk { };
 
+  nvidia-optical-flow-sdk = callPackage ../development/libraries/nvidia-optical-flow-sdk { };
+
   nvtop = callPackage ../tools/system/nvtop {
     nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; };
   };

From dc1a15e7bd74e8065369839e774f38bac43e4d4a Mon Sep 17 00:00:00 2001
From: Michael Lingelbach <m.j.lbach@gmail.com>
Date: Fri, 20 Mar 2020 21:42:12 -0700
Subject: [PATCH 3532/4636] opencv4: Enable nvidia-optical-flow-sdk when
 building with cuda

---
 pkgs/development/libraries/opencv/4.x.nix     |  6 +++--
 .../libraries/opencv/cuda_opt_flow.patch      | 26 +++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/opencv/cuda_opt_flow.patch

diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index 9fffd3d94770..519d4ecd2155 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -15,7 +15,7 @@
 , enableContrib   ? true
 
 , enableCuda      ? (config.cudaSupport or false) &&
-                    stdenv.hostPlatform.isx86_64, cudatoolkit
+                    stdenv.hostPlatform.isx86_64, cudatoolkit, nvidia-optical-flow-sdk
 
 , enableUnfree    ? false
 , enableIpp       ? false
@@ -166,6 +166,7 @@ stdenv.mkDerivation {
   # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with
   # what appears to be some stray headers in dnn/misc/tensorflow
   # in contrib when generating the Python bindings:
+  patches = lib.optional enableCuda ./cuda_opt_flow.patch;
   postPatch = ''
     sed -i '/Add these standard paths to the search paths for FIND_LIBRARY/,/^\s*$/{d}' CMakeLists.txt
     sed -i -e 's|if len(decls) == 0:|if len(decls) == 0 or "opencv2/" not in hdr:|' ./modules/python/src2/gen2.py
@@ -213,7 +214,7 @@ stdenv.mkDerivation {
     # tesseract & leptonica.
     ++ lib.optionals enableTesseract [ tesseract leptonica ]
     ++ lib.optional enableTbb tbb
-    ++ lib.optional enableCuda cudatoolkit
+    ++ lib.optionals enableCuda [ cudatoolkit nvidia-optical-flow-sdk ]
     ++ lib.optionals stdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration ]
     ++ lib.optionals enableDocs [ doxygen graphviz-nox ];
 
@@ -249,6 +250,7 @@ stdenv.mkDerivation {
     "-DCUDA_FAST_MATH=ON"
     "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc"
     "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr"
+    "-DNVIDIA_OPTICAL_FLOW_1_0_HEADERS_PATH=${nvidia-optical-flow-sdk}"
   ] ++ lib.optionals stdenv.isDarwin [
     "-DWITH_OPENCL=OFF"
     "-DWITH_LAPACK=OFF"
diff --git a/pkgs/development/libraries/opencv/cuda_opt_flow.patch b/pkgs/development/libraries/opencv/cuda_opt_flow.patch
new file mode 100644
index 000000000000..cb96721fb530
--- /dev/null
+++ b/pkgs/development/libraries/opencv/cuda_opt_flow.patch
@@ -0,0 +1,26 @@
+diff --git a/opencv_contrib/cudaoptflow/CMakeLists.txt b/opencv_contrib/cudaoptflow/CMakeLists.txt
+index e5b823ab4a..a728060d0b 100644
+--- a/opencv_contrib/cudaoptflow/CMakeLists.txt
++++ b/opencv_contrib/cudaoptflow/CMakeLists.txt
+@@ -11,18 +11,6 @@ ocv_define_module(cudaoptflow opencv_video opencv_optflow opencv_cudaarithm open
+ set(NVIDIA_OPTICAL_FLOW_1_0_HEADERS_COMMIT "79c6cee80a2df9a196f20afd6b598a9810964c32")
+ set(NVIDIA_OPTICAL_FLOW_1_0_HEADERS_MD5 "ca5acedee6cb45d0ec610a6732de5c15")
+ set(NVIDIA_OPTICAL_FLOW_1_0_HEADERS_PATH "${OpenCV_BINARY_DIR}/3rdparty/NVIDIAOpticalFlowSDK_1_0_Headers")
+-ocv_download(FILENAME "${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_COMMIT}.zip"
+-               HASH ${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_MD5}
+-               URL
+-                 "https://github.com/NVIDIA/NVIDIAOpticalFlowSDK/archive/"
+-               DESTINATION_DIR "${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_PATH}"
+-               STATUS NVIDIA_OPTICAL_FLOW_1_0_HEADERS_DOWNLOAD_SUCCESS
+-               ID "NVIDIA_OPTICAL_FLOW"
+-               UNPACK RELATIVE_URL)
+ 
+-if(NOT NVIDIA_OPTICAL_FLOW_1_0_HEADERS_DOWNLOAD_SUCCESS)
+-  message(STATUS "Failed to download NVIDIA_Optical_Flow_1_0 Headers")
+-else()
+-  add_definitions(-DHAVE_NVIDIA_OPTFLOW=1)
+-  ocv_include_directories(SYSTEM "${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_PATH}/NVIDIAOpticalFlowSDK-${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_COMMIT}")
+-endif()
+\ No newline at end of file
++add_definitions(-DHAVE_NVIDIA_OPTFLOW=1)
++ocv_include_directories(SYSTEM "${NVIDIA_OPTICAL_FLOW_1_0_HEADERS_PATH}")

From 5980050ee20b388bfc2cd1cb2b89b003cadfe7c1 Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Fri, 21 Feb 2020 14:23:53 +0100
Subject: [PATCH 3533/4636] matrix-appservice-slack: 1.0.2 -> 1.1.0

---
 .../generate-dependencies.sh                  |  8 ++---
 .../node-composition.nix                      |  2 +-
 .../matrix-appservice-slack/node-packages.nix | 35 +++++++++++--------
 .../matrix-appservice-slack/package.json      |  2 +-
 4 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh b/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh
index bf93cae5bc2e..fc89486cfbc0 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh
@@ -1,9 +1,9 @@
+#!/usr/bin/env bash
 
-#!/usr/bin/env nix-shell
-#! nix-shell -i bash -p nodePackages.node2nix
+ROOT="$(realpath "$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")"/../../../..)"
 
-node2nix \
-  --nodejs-10 \
+$(nix-build $ROOT -A  nodePackages.node2nix --no-out-link)/bin/node2nix \
+  --nodejs-12 \
   --node-env ../../../development/node-packages/node-env.nix \
   --development \
   --input package.json \
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
index e306e49c8498..36da6132423c 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix
index cc14fb2852f3..9af470f8310f 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix
@@ -40,13 +40,13 @@ let
         sha512 = "rzNIFst8iuVYyHdE7e3KSrbAtIA7sfS4Pth9ObKUm5KDemX0zyI7YfAijO1kgr1EMriQkjlpKBhlNq9Y+aQr6g==";
       };
     };
-    "@slack/types-1.4.0" = {
+    "@slack/types-1.5.0" = {
       name = "_at_slack_slash_types";
       packageName = "@slack/types";
-      version = "1.4.0";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@slack/types/-/types-1.4.0.tgz";
-        sha512 = "G5u2gCl7oci0k4E9KIX33nmA4YPp1pXYwS/It7ct9dOglCcj63Ee5GRCgtplzOBS+2++DMdp6l3ZCq+VeAMrfw==";
+        url = "https://registry.npmjs.org/@slack/types/-/types-1.5.0.tgz";
+        sha512 = "oCYgatJYxHf9wE3tKXzOLeeTsF0ghX1TIcguNfVmO2V6NDe+cHAzZRglEOmJLdRINDS5gscAgSkeZpDhpKBeUA==";
       };
     };
     "@slack/web-api-5.8.0" = {
@@ -1922,6 +1922,15 @@ let
         sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
       };
     };
+    "mkdirp-0.5.3" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz";
+        sha512 = "P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==";
+      };
+    };
     "mocha-6.2.2" = {
       name = "mocha";
       packageName = "mocha";
@@ -3221,14 +3230,14 @@ let
   };
 in
 {
-  "matrix-appservice-slack-git+https://github.com/matrix-org/matrix-appservice-slack.git#1.0.2" = nodeEnv.buildNodePackage {
+  "matrix-appservice-slack-git+https://github.com/matrix-org/matrix-appservice-slack.git#1.1.0" = nodeEnv.buildNodePackage {
     name = "matrix-appservice-slack";
     packageName = "matrix-appservice-slack";
-    version = "1.0.2";
+    version = "1.1.0";
     src = fetchgit {
       url = "https://github.com/matrix-org/matrix-appservice-slack.git";
-      rev = "8202c97c1fee0f8215f86b0fda1845ca17db3612";
-      sha256 = "b419d34771f4f4be56fe66ba4cbf690fb5a337e317a927e70e65be3f1ddd55ef";
+      rev = "62b2a05c99bbefb0b268adc8b0fedfe91a4f76bd";
+      sha256 = "64e930cecb11de9df3cb03367a22ff7dc78d44b7f992d9379fae8b692bf35157";
     };
     dependencies = [
       sources."@babel/code-frame-7.8.3"
@@ -3239,7 +3248,7 @@ in
           sources."p-queue-2.4.2"
         ];
       })
-      sources."@slack/types-1.4.0"
+      sources."@slack/types-1.5.0"
       (sources."@slack/web-api-5.8.0" // {
         dependencies = [
           sources."p-queue-2.4.2"
@@ -3464,15 +3473,13 @@ in
       sources."mime-types-2.1.26"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.3"
       (sources."mocha-6.2.2" // {
         dependencies = [
           sources."debug-3.2.6"
           sources."escape-string-regexp-1.0.5"
+          sources."minimist-0.0.8"
+          sources."mkdirp-0.5.1"
           sources."ms-2.1.1"
           sources."supports-color-6.0.0"
           sources."yargs-13.3.0"
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json b/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json
index 87dada8f027b..8fb44891dd42 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json
@@ -1,3 +1,3 @@
 [
-    {"matrix-appservice-slack": "git+https://github.com/matrix-org/matrix-appservice-slack.git#1.0.2" }
+    {"matrix-appservice-slack": "git+https://github.com/matrix-org/matrix-appservice-slack.git#1.1.0" }
 ]

From 7db50540230a09982938ee86de5f3a9cd6f09e41 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:20:00 -0500
Subject: [PATCH 3534/4636] age: fix build on darwin

---
 pkgs/tools/security/age/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix     | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix
index bde597ba9f30..0448faf53b76 100644
--- a/pkgs/tools/security/age/default.nix
+++ b/pkgs/tools/security/age/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "age";
@@ -18,7 +18,9 @@ buildGoModule rec {
     sha256 = "1n1ww8yjw0mg00dvnfmggww9kwp1hls0a85iv6vx9k89mzv8mdrq";
   };
 
-  meta = with lib; {
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
     homepage = "https://age-encryption.org/";
     description = "Modern encryption tool with small explicit keys";
     license = licenses.bsd3;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 014bb3e0b9a7..b5d1934dbb93 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2614,7 +2614,9 @@ in
     caps2esc = callPackage ../tools/inputmethods/interception-tools/caps2esc.nix { };
   };
 
-  age = callPackage ../tools/security/age { };
+  age = callPackage ../tools/security/age {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   brotli = callPackage ../tools/compression/brotli { };
 

From 7449323baf9d2fb97f4248c27a4975d3a494122d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:21:00 -0500
Subject: [PATCH 3535/4636] aerc: fix build on darwin

---
 pkgs/applications/networking/mailreaders/aerc/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix                           | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix
index 7b24ed93406e..e0f98208e7ab 100644
--- a/pkgs/applications/networking/mailreaders/aerc/default.nix
+++ b/pkgs/applications/networking/mailreaders/aerc/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildGoModule, fetchurl
 , go, ncurses, notmuch, scdoc
-, python3, perl, w3m, dante
+, python3, perl, w3m, dante, Security
 }:
 
 let
@@ -29,7 +29,8 @@ in buildGoModule rec {
     python3.pkgs.colorama
   ];
 
-  buildInputs = [ python3 notmuch ];
+  buildInputs = [ python3 notmuch ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
   GOFLAGS="-tags=notmuch";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b5d1934dbb93..6d3b03780ddf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -553,7 +553,9 @@ in
     wxGTK = wxGTK30;
   } // (config.aegisub or {}));
 
-  aerc = callPackage ../applications/networking/mailreaders/aerc { };
+  aerc = callPackage ../applications/networking/mailreaders/aerc {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   aerospike = callPackage ../servers/nosql/aerospike { };
 

From 7e03d4416bd9d8119db5ce4db95b155fd40d6587 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:22:00 -0500
Subject: [PATCH 3536/4636] act: fix build on darwin

---
 pkgs/development/tools/misc/act/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix             | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix
index de1cf939e6ae..17ff15265f25 100644
--- a/pkgs/development/tools/misc/act/default.nix
+++ b/pkgs/development/tools/misc/act/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildGoModule }:
+{ stdenv, fetchFromGitHub, buildGoModule, Security }:
 
 buildGoModule rec {
   pname = "act";
@@ -11,11 +11,13 @@ buildGoModule rec {
     sha256 = "0l7id483006mnii4rlcff4p0ricd8a2n24sf74a9b387x0akpbsn";
   };
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   modSha256 = "04s4p9j6j7gw1s4v271zwzvdny7dvjaazd2pihmyjfik95xmwx9r";
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Run your GitHub Actions locally";
     homepage = "https://github.com/nektos/act";
     license = licenses.mit;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d3b03780ddf..6714819683c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -528,7 +528,9 @@ in
 
   acpica-tools = callPackage ../tools/system/acpica-tools { };
 
-  act = callPackage ../development/tools/misc/act {};
+  act = callPackage ../development/tools/misc/act {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   actdiag = with python3.pkgs; toPythonApplication actdiag;
 

From 976a9ea16b883424cb31cc5b4d612def1da22cbd Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:23:00 -0500
Subject: [PATCH 3537/4636] go-tools: fix build on darwin

---
 pkgs/development/tools/go-tools/default.nix | 7 +++++--
 pkgs/top-level/all-packages.nix             | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix
index 1fd17060bd4f..b047689b81f9 100644
--- a/pkgs/development/tools/go-tools/default.nix
+++ b/pkgs/development/tools/go-tools/default.nix
@@ -1,6 +1,7 @@
 { buildGoModule
-, lib
+, stdenv
 , fetchFromGitHub
+, Security
 }:
 
 buildGoModule rec {
@@ -16,9 +17,11 @@ buildGoModule rec {
     sha256 = "0pvi1mzhy6zgx4zfgdypbl4zhvgg11hl5qv7blf2qs0a96j2djhf";
   };
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   modSha256 = "03560xjr2531xj87paskfx2zs364fz6y4kpsid8x08s1syq9nq7p";
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "A collection of tools and libraries for working with Go code, including linters and static analysis";
     homepage = https://staticcheck.io;
     license = licenses.mit;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6714819683c2..fb8828472500 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17136,7 +17136,9 @@ in
 
   govendor = callPackage ../development/tools/govendor { };
 
-  go-tools = callPackage ../development/tools/go-tools { };
+  go-tools = callPackage ../development/tools/go-tools {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   gotools = callPackage ../development/tools/gotools { };
 

From 4ca044eafc4a1ec888283ec55e6b6d167494506e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:24:00 -0500
Subject: [PATCH 3538/4636] archiver: fix build on darwin

---
 pkgs/applications/misc/archiver/default.nix | 7 +++++--
 pkgs/top-level/all-packages.nix             | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/applications/misc/archiver/default.nix
index 64b592b78714..8c79d867c831 100644
--- a/pkgs/applications/misc/archiver/default.nix
+++ b/pkgs/applications/misc/archiver/default.nix
@@ -1,6 +1,7 @@
 { buildGoModule
 , fetchFromGitHub
-, lib
+, stdenv
+, Security
 }:
 
 buildGoModule rec {
@@ -16,7 +17,9 @@ buildGoModule rec {
 
   modSha256 = "1mrfqhd0zb78rlqlj2ncb0srwjfl7rzhy2p9mwa82pgysvlp08gv";
 
-  meta = with lib; {
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
     description = "Easily create & extract archives, and compress & decompress files of various formats";
     homepage = "https://github.com/mholt/archiver";
     license = licenses.mit;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb8828472500..c0a2a7c4b42c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -191,7 +191,9 @@ in
 
   dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh;
 
-  archiver = callPackage ../applications/misc/archiver { };
+  archiver = callPackage ../applications/misc/archiver {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { };
 

From 64b130dd88c925fd54102c0df83de74a26bcdbe3 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:25:00 -0500
Subject: [PATCH 3539/4636] argo: fix build on darwin

---
 pkgs/applications/networking/cluster/argo/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix                       | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix
index f02b64e92c8b..25fb33399c0d 100644
--- a/pkgs/applications/networking/cluster/argo/default.nix
+++ b/pkgs/applications/networking/cluster/argo/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, buildGoPackage, fetchFromGitHub, Security }:
 
 let
   # Argo can package a static server in the CLI using the `staticfiles` go module.
@@ -32,6 +32,8 @@ buildGoModule rec {
 
   subPackages = [ "cmd/argo" ];
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   preBuild = ''
     mkdir -p ui/dist/app
     echo "Built without static files" > ui/dist/app/index.html
@@ -39,7 +41,7 @@ buildGoModule rec {
     ${staticfiles}/bin/staticfiles -o server/static/files.go ui/dist/app
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Container native workflow engine for Kubernetes";
     homepage = https://github.com/argoproj/argo;
     license = licenses.asl20;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0a2a7c4b42c..043adc4a1bcd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18385,7 +18385,9 @@ in
 
   arelle = with python3Packages; toPythonApplication arelle;
 
-  argo = callPackage ../applications/networking/cluster/argo { };
+  argo = callPackage ../applications/networking/cluster/argo {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   argocd = callPackage ../applications/networking/cluster/argocd { };
 

From a963023e7b13ef06ea15d5be021bfd53f6b41de1 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:26:00 -0500
Subject: [PATCH 3540/4636] atlantis: fix build on darwin

---
 pkgs/applications/networking/cluster/atlantis/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix                           | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix
index cb846060a3de..ce3a1730ae54 100644
--- a/pkgs/applications/networking/cluster/atlantis/default.nix
+++ b/pkgs/applications/networking/cluster/atlantis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "atlantis";
@@ -15,6 +15,8 @@ buildGoModule rec {
 
   subPackages = [ "." ];
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     homepage = "https://github.com/runatlantis/atlantis";
     description = "Terraform Pull Request Automation";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 043adc4a1bcd..15ec1e2fe910 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24960,7 +24960,9 @@ in
 
   ataripp = callPackage ../misc/emulators/atari++ { };
 
-  atlantis = callPackage ../applications/networking/cluster/atlantis { };
+  atlantis = callPackage ../applications/networking/cluster/atlantis {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   auctex = callPackage ../tools/typesetting/tex/auctex { };
 

From 6f95d105e04ebc5b5c4972c6d4d8d140ba6ae5c5 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:27:00 -0500
Subject: [PATCH 3541/4636] exercism: fix build on darwin

---
 pkgs/applications/misc/exercism/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix             | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix
index a071761599a3..81c2d9782997 100644
--- a/pkgs/applications/misc/exercism/default.nix
+++ b/pkgs/applications/misc/exercism/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "exercism";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "0pg0hxrr6jjd03wbjn5y65x02md3h352mnm1gr6vyiv7hn4ws14m";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   subPackages = [ "./exercism" ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15ec1e2fe910..135eebed8abf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19129,7 +19129,9 @@ in
 
   evilvte = callPackage ../applications/misc/evilvte (config.evilvte or {});
 
-  exercism = callPackage ../applications/misc/exercism { };
+  exercism = callPackage ../applications/misc/exercism {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   go-motion = callPackage ../development/tools/go-motion { };
 

From acac27bbefd2918623d9d1a04e18ec5d8eb02689 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:28:00 -0500
Subject: [PATCH 3542/4636] ctop: fix build on darwin

---
 pkgs/tools/system/ctop/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix    | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix
index 4f492def1624..b9ea0c04aa85 100644
--- a/pkgs/tools/system/ctop/default.nix
+++ b/pkgs/tools/system/ctop/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "ctop";
@@ -13,9 +13,11 @@ buildGoModule rec {
 
   modSha256 = "0wxv6yzlgki7047qszx9p9xpph95bg097jkgaa0b3wbpx8vg7qml";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.build=v${version}" ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Top-like interface for container metrics";
     homepage = "https://ctop.sh/";
     license = licenses.mit;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 135eebed8abf..28de31d76d16 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18785,7 +18785,9 @@ in
 
   csdp = callPackage ../applications/science/math/csdp { };
 
-  ctop = callPackage ../tools/system/ctop { };
+  ctop = callPackage ../tools/system/ctop {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   cubicsdr = callPackage ../applications/radio/cubicsdr { wxGTK = wxGTK31; };
 

From e375bd2632c2278a2995288f8c713f2a9c232111 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:29:00 -0500
Subject: [PATCH 3543/4636] conftest: fix build on darwin

---
 pkgs/development/tools/conftest/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix             | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix
index ae35170cd193..fe8d58f76827 100644
--- a/pkgs/development/tools/conftest/default.nix
+++ b/pkgs/development/tools/conftest/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "conftest";
@@ -13,12 +13,14 @@ buildGoModule rec {
 
   modSha256 = "1p7fjg1vcrcxb4f5hd00qxx4fqcl051klcjs6ljn4v46qcpn6dcn";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   buildFlagsArray = ''
     -ldflags=
         -X main.version=${version}
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Write tests against structured configuration data";
     homepage = https://github.com/instrumenta/conftest;
     license = licenses.asl20;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28de31d76d16..53f1890d0564 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -161,7 +161,9 @@ in
 
   cm256cc = callPackage ../development/libraries/cm256cc {  };
 
-  conftest = callPackage ../development/tools/conftest { };
+  conftest = callPackage ../development/tools/conftest {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   corgi = callPackage ../development/tools/corgi { };
 

From 48489b7e2c8ed3359f1452139703387f3d0a30f1 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:30:00 -0500
Subject: [PATCH 3544/4636] bazelisk: fix build on darwin

---
 pkgs/development/tools/bazelisk/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix             | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix
index 5780cf4382a7..a737ddbb0fb6 100644
--- a/pkgs/development/tools/bazelisk/default.nix
+++ b/pkgs/development/tools/bazelisk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "bazelisk";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "1w8k659ifapcxbbim0nf7wd7w10bhlagc33q08izh84gcgsh0yyz";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     description = "A user-friendly launcher for Bazel";
     longDescription = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 53f1890d0564..725681c394ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9889,7 +9889,9 @@ in
     go = go_1_12;
   };
 
-  bazelisk = callPackage ../development/tools/bazelisk { };
+  bazelisk = callPackage ../development/tools/bazelisk {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   buildBazelPackage = callPackage ../build-support/build-bazel-package { };
 

From 38be8fbe7f78699a4978df6d34a54b65f6eecfeb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:31:00 -0500
Subject: [PATCH 3545/4636] dbmate: fix build on darwin

---
 .../tools/database/dbmate/default.nix         |  4 +-
 .../tools/database/dbmate/deps.nix            | 84 -------------------
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 6 insertions(+), 86 deletions(-)
 delete mode 100644 pkgs/development/tools/database/dbmate/deps.nix

diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix
index efc20b6972be..57aa9c654d7f 100644
--- a/pkgs/development/tools/database/dbmate/default.nix
+++ b/pkgs/development/tools/database/dbmate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "dbmate";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "12x3m5bjyx3blh5i51pd99phv73m96pmm6i3ir4vf2kms3viif9i";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     description = "Database migration tool";
     homepage = https://github.com/amacneil/dbmate;
diff --git a/pkgs/development/tools/database/dbmate/deps.nix b/pkgs/development/tools/database/dbmate/deps.nix
deleted file mode 100644
index 97bfc10b20af..000000000000
--- a/pkgs/development/tools/database/dbmate/deps.nix
+++ /dev/null
@@ -1,84 +0,0 @@
-# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
-[
-  {
-    goPackagePath  = "github.com/davecgh/go-spew";
-    fetch = {
-      type = "git";
-      url = "https://github.com/davecgh/go-spew";
-      rev =  "346938d642f2ec3594ed81d874461961cd0faa76";
-      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
-    };
-  }
-  {
-    goPackagePath  = "github.com/go-sql-driver/mysql";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-sql-driver/mysql";
-      rev =  "2cc627ac8defc45d65066ae98f898166f580f9a4";
-      sha256 = "0n589y9ak2m6glaqmqlggrfv2hghy5i2906r123svf92ci4r9sww";
-    };
-  }
-  {
-    goPackagePath  = "github.com/joho/godotenv";
-    fetch = {
-      type = "git";
-      url = "https://github.com/joho/godotenv";
-      rev =  "a79fa1e548e2c689c241d10173efd51e5d689d5b";
-      sha256 = "09610yqswxa02905mp9cqgsm50r76saagzddc55sqav4ad04j6qm";
-    };
-  }
-  {
-    goPackagePath  = "github.com/lib/pq";
-    fetch = {
-      type = "git";
-      url = "https://github.com/lib/pq";
-      rev =  "19c8e9ad00952ce0c64489b60e8df88bb16dd514";
-      sha256 = "0lm79ja5id7phf1jwf1vs987azaxis0q7qr69px0r6gqiva0q0vz";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mattn/go-sqlite3";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-sqlite3";
-      rev =  "6c771bb9887719704b210e87e934f08be014bdb1";
-      sha256 = "0x6s7hy3ab3qw6dfl81y7ighjva5j4rrzvqhppf1qwz5alpfmpdm";
-    };
-  }
-  {
-    goPackagePath  = "github.com/pmezard/go-difflib";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pmezard/go-difflib";
-      rev =  "792786c7400a136282c1664665ae0a8db921c6c2";
-      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
-    };
-  }
-  {
-    goPackagePath  = "github.com/stretchr/testify";
-    fetch = {
-      type = "git";
-      url = "https://github.com/stretchr/testify";
-      rev =  "b91bfb9ebec76498946beb6af7c0230c7cc7ba6c";
-      sha256 = "178xyfgsbs40jq406aqj0r67ik1b81gdc28z45nbcw6hfhz82rvl";
-    };
-  }
-  {
-    goPackagePath  = "github.com/urfave/cli";
-    fetch = {
-      type = "git";
-      url = "https://github.com/urfave/cli";
-      rev =  "cfb38830724cc34fedffe9a2a29fb54fa9169cd1";
-      sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
-    };
-  }
-  {
-    goPackagePath  = "google.golang.org/appengine";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/appengine";
-      rev =  "150dc57a1b433e64154302bdc40b6bb8aefa313a";
-      sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq";
-    };
-  }
-]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 725681c394ce..630ef61f264b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8044,7 +8044,9 @@ in
 
   scry = callPackage ../development/tools/scry {};
 
-  dbmate = callPackage ../development/tools/database/dbmate { };
+  dbmate = callPackage ../development/tools/database/dbmate {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   devpi-client = python3Packages.callPackage ../development/tools/devpi-client {};
 

From a3a9f0387d5966277d7e01dbcb640753716f4861 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:32:00 -0500
Subject: [PATCH 3546/4636] dive: fix build on darwin

---
 pkgs/development/tools/dive/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix         | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix
index 5d4de99ffdbf..91889e80c044 100644
--- a/pkgs/development/tools/dive/default.nix
+++ b/pkgs/development/tools/dive/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, gpgme, lvm2 }:
+{ stdenv, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, gpgme, lvm2, Security }:
 
 buildGoModule rec {
   pname = "dive";
@@ -15,7 +15,8 @@ buildGoModule rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ];
+  buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 630ef61f264b..e240f1836d1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10161,7 +10161,9 @@ in
       binutils = binutils;
     };
 
-  dive = callPackage ../development/tools/dive { };
+  dive = callPackage ../development/tools/dive {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   doclifter = callPackage ../development/tools/misc/doclifter { };
 

From e00ccb36b8c599402ea415083090523add588a3a Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:33:00 -0500
Subject: [PATCH 3547/4636] circleci-cli: fix build on darwin

---
 pkgs/development/tools/misc/circleci-cli/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix                      | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix
index fde1c68d34d0..0ab126b63e73 100644
--- a/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/pkgs/development/tools/misc/circleci-cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule }:
+{ stdenv, fetchFromGitHub, buildGoModule, Security }:
 
 buildGoModule rec {
   pname = "circleci-cli";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "199ai38knp50mjjhddjd70qfwx63c69rf7ddw4hpzgx5cm5a04q2";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   buildFlagsArray = [ "-ldflags=-s -w -X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" ];
 
   preBuild = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e240f1836d1b..97ed4c25976e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2451,7 +2451,9 @@ in
 
   ciopfs = callPackage ../tools/filesystems/ciopfs { };
 
-  circleci-cli = callPackage ../development/tools/misc/circleci-cli { };
+  circleci-cli = callPackage ../development/tools/misc/circleci-cli {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   circus = callPackage ../tools/networking/circus { };
 

From 4a5a07a4870efd6611f66a97bb68ec8ede454e2d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:34:00 -0500
Subject: [PATCH 3548/4636] croc: fix build on darwin

---
 pkgs/tools/networking/croc/default.nix | 5 ++++-
 pkgs/top-level/all-packages.nix        | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix
index 52f9ef9fade8..70ffe180f157 100644
--- a/pkgs/tools/networking/croc/default.nix
+++ b/pkgs/tools/networking/croc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "croc";
@@ -14,6 +14,9 @@ buildGoModule rec {
   };
 
   modSha256 = "0d4mm840fjsbcyl98zg6d3i7qp1lmjkx07mh91d56jyf9j082g99";
+
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   subPackages = [ "." ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97ed4c25976e..baa8b77a2ff6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1434,7 +1434,9 @@ in
 
   cassowary = callPackage ../tools/networking/cassowary { };
 
-  croc = callPackage ../tools/networking/croc { };
+  croc = callPackage ../tools/networking/croc {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   cddl = callPackage ../development/tools/cddl { };
 

From 028d53e9964eb867df7167d19f6d24c2c9a62d77 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:35:00 -0500
Subject: [PATCH 3549/4636] packr: fix build on darwin

---
 pkgs/development/libraries/packr/default.nix | 7 +++++--
 pkgs/top-level/all-packages.nix              | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix
index 4482a9cd312d..b0c7ac3cab6b 100644
--- a/pkgs/development/libraries/packr/default.nix
+++ b/pkgs/development/libraries/packr/default.nix
@@ -1,6 +1,7 @@
 { buildGoModule
 , fetchFromGitHub
-, lib
+, stdenv
+, Security
 }:
 
 buildGoModule rec {
@@ -16,9 +17,11 @@ buildGoModule rec {
 
   subPackages = [ "packr" "v2/packr2" ];
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   modSha256 = "0afhkvivma16bi8rz3kwcsz9mhmcn4zm6rrymxkvazx6b844hcdv";
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "The simple and easy way to embed static files into Go binaries";
     homepage = "https://github.com/gobuffalo/packr";
     license = licenses.mit;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index baa8b77a2ff6..8dd0b806f83c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -292,6 +292,7 @@ in
     # Version 2.6.0 fails to build with go 1.13 due to nested modules:
     #   go: directory v2/packr2 is outside main module
     buildGoModule = buildGo112Module;
+    inherit (darwin.apple_sdk.frameworks) Security;
   };
 
   pet = callPackage ../development/tools/pet { };

From 203e2ca6f9b30685bbe3cd045402ce3e6dcbf9b0 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:36:00 -0500
Subject: [PATCH 3550/4636] docui: fix build on darwin

---
 pkgs/tools/misc/docui/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix
index 0329c1bc4a69..c8f3dbf8009c 100644
--- a/pkgs/tools/misc/docui/default.nix
+++ b/pkgs/tools/misc/docui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "docui";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "1wyx05kk4f41mgvwnvfc9xk7vd3x96cbn5xb5ph7p443f70ydnak";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     description = "TUI Client for Docker";
     homepage = "https://github.com/skanehira/docui";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8dd0b806f83c..d084b2387d7a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -215,7 +215,9 @@ in
 
   docker-sync = callPackage ../tools/misc/docker-sync { };
 
-  docui = callPackage ../tools/misc/docui { };
+  docui = callPackage ../tools/misc/docui {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   dotfiles = callPackage ../applications/misc/dotfiles { };
 

From 798569a534032f13db4b4f5b1265f11cdd2e7d2a Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:37:00 -0500
Subject: [PATCH 3551/4636] aws-vault: fix build on darwin

---
 pkgs/tools/admin/aws-vault/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix        | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix
index 48a1de61cd80..3e145f732362 100644
--- a/pkgs/tools/admin/aws-vault/default.nix
+++ b/pkgs/tools/admin/aws-vault/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, lib, fetchFromGitHub }:
+{ buildGoModule, stdenv, fetchFromGitHub, Security }:
 buildGoModule rec {
   pname = "aws-vault";
   version = "5.3.2";
@@ -13,13 +13,15 @@ buildGoModule rec {
   modSha256 = "1d3hjfmfmlpw2scfyn597zkzz864w97p0wrsxjp49m9mi0pgmhq9";
   subPackages = [ "." ];
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   # set the version. see: aws-vault's Makefile
   buildFlagsArray = ''
     -ldflags=
     -X main.Version=v${version}
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description =
       "A vault for securely storing and accessing AWS credentials in development environments";
     homepage = "https://github.com/99designs/aws-vault";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d084b2387d7a..b6d5c8e7a0a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -753,7 +753,9 @@ in
 
   aws-sam-cli = callPackage ../development/tools/aws-sam-cli { python = python3; };
 
-  aws-vault = callPackage ../tools/admin/aws-vault { };
+  aws-vault = callPackage ../tools/admin/aws-vault {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   iamy = callPackage ../tools/admin/iamy { };
 

From f2dd2b8634572b9564af8a0b1d6e8901ac61210b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:38:00 -0500
Subject: [PATCH 3552/4636] dolt: fix build on darwin

---
 pkgs/servers/sql/dolt/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix   | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix
index dbface601f54..27ab7d444bf1 100644
--- a/pkgs/servers/sql/dolt/default.nix
+++ b/pkgs/servers/sql/dolt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, lib, buildGoModule }:
+{ stdenv, fetchFromGitHub, buildGoModule, Security }:
 
 buildGoModule rec {
     pname = "dolt";
@@ -15,7 +15,9 @@ buildGoModule rec {
     subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
     modSha256 = "04bsj8mfamnbq3y2aqbx1605azi8v15nbdh1zk5grni0ihlal75a";
 
-    meta = with lib; {
+    buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+    meta = with stdenv.lib; {
         description = "Relational database with version control and CLI a-la Git.";
         homepage = "https://github.com/liquidata-inc/dolt";
         license = licenses.asl20;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6d5c8e7a0a6..8a34ec0295db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10182,7 +10182,9 @@ in
 
   doit = callPackage ../development/tools/build-managers/doit { };
 
-  dolt = callPackage ../servers/sql/dolt { };
+  dolt = callPackage ../servers/sql/dolt {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   dot2tex = pythonPackages.dot2tex;
 

From e50e48e9df2127b890d60d3387ee5568f96f8ec9 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:39:00 -0500
Subject: [PATCH 3553/4636] azure-storage-azcopy: fix build on darwin

---
 pkgs/development/tools/azcopy/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix           | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix
index 328092feafc5..40741d96f562 100644
--- a/pkgs/development/tools/azcopy/default.nix
+++ b/pkgs/development/tools/azcopy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule }:
+{ stdenv, fetchFromGitHub, buildGoModule, Security }:
 
 buildGoModule rec {
   pname = "azure-storage-azcopy";
@@ -11,6 +11,8 @@ buildGoModule rec {
     sha256 = "16pdvcgy1d5dfqk3as23j45rkwfrv232n384cj5wfz9qwijkcy5g";
   };
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   subPackages = [ "." ];
 
   modSha256 = "07cy2zi7m2pkbfdcy659x4k5j2w60cmjy8kxv1dcii3dc6ls4bvb";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8a34ec0295db..5902ea72da70 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -761,7 +761,9 @@ in
 
   azure-cli = callPackage ../tools/admin/azure-cli { python = python3; };
 
-  azure-storage-azcopy = callPackage ../development/tools/azcopy { };
+  azure-storage-azcopy = callPackage ../development/tools/azcopy {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   azure-vhd-utils  = callPackage ../tools/misc/azure-vhd-utils { };
 

From 86d19c4e32ef2231179498d621e675d61550460d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:40:00 -0500
Subject: [PATCH 3554/4636] chezmoi: fix build on darwin

---
 pkgs/tools/misc/chezmoi/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix     | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix
index b2fb6925abac..979a658ac022 100644
--- a/pkgs/tools/misc/chezmoi/default.nix
+++ b/pkgs/tools/misc/chezmoi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles, Security }:
 
 buildGoModule rec {
   pname = "chezmoi";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "0gh314d3mspqmz2z3m05bgsp62mrhb48m4mwhfy5h62fs7aqymr8";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   buildFlagsArray = [
     "-ldflags=-s -w -X github.com/twpayne/chezmoi/cmd.VersionStr=${version}"
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5902ea72da70..bda4cd5c76df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -843,7 +843,9 @@ in
 
   certigo = callPackage ../tools/admin/certigo { };
 
-  chezmoi = callPackage ../tools/misc/chezmoi { };
+  chezmoi = callPackage ../tools/misc/chezmoi {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   chipsec = callPackage ../tools/security/chipsec {
     kernel = null;

From 9fe9b597572c86c7e8ab360822a495c612395503 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:41:00 -0500
Subject: [PATCH 3555/4636] certigo: fix build on darwin

---
 pkgs/tools/admin/certigo/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix      | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix
index 5474cb254298..89c6b8996fa3 100644
--- a/pkgs/tools/admin/certigo/default.nix
+++ b/pkgs/tools/admin/certigo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "certigo";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "1i5n5yh6nvv2i2nm60vqy1gngj8p5w6ma5fcwmp7bl4jxjrzbi83";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     description = "A utility to examine and validate certificates in a variety of formats";
     homepage = "https://github.com/square/certigo";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bda4cd5c76df..085d5c5ea6b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -841,7 +841,9 @@ in
 
   calls = callPackage ../applications/networking/calls { };
 
-  certigo = callPackage ../tools/admin/certigo { };
+  certigo = callPackage ../tools/admin/certigo {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   chezmoi = callPackage ../tools/misc/chezmoi {
     inherit (darwin.apple_sdk.frameworks) Security;

From a35fcc100044d9bfc0754f218e35e94ec89fa558 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:42:00 -0500
Subject: [PATCH 3556/4636] cassowary: fix build on darwin

---
 pkgs/tools/networking/cassowary/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix             | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix
index 6156f43b04b8..5b9ba71f8c9b 100644
--- a/pkgs/tools/networking/cassowary/default.nix
+++ b/pkgs/tools/networking/cassowary/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "cassowary";
@@ -13,9 +13,11 @@ buildGoModule rec {
 
   modSha256 = "1iylnnmj5slji89pkb3shp4xqar1zbpl7bzwddbzpp8y52fmsv1c";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/rogerwelin/cassowary";
     description = "Modern cross-platform HTTP load-testing tool written in Go";
     license = licenses.mit;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 085d5c5ea6b1..51ec7dc3197f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1443,7 +1443,9 @@ in
 
   ccnet = callPackage ../tools/networking/ccnet { };
 
-  cassowary = callPackage ../tools/networking/cassowary { };
+  cassowary = callPackage ../tools/networking/cassowary {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   croc = callPackage ../tools/networking/croc {
     inherit (darwin.apple_sdk.frameworks) Security;

From 1da05f29db72e6e1209777a3f28a5938c45c9e02 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:43:00 -0500
Subject: [PATCH 3557/4636] awsweeper: fix build on darwin

---
 pkgs/tools/admin/awsweeper/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix        | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/awsweeper/default.nix b/pkgs/tools/admin/awsweeper/default.nix
index 661747c2fd0d..1ea54953701d 100644
--- a/pkgs/tools/admin/awsweeper/default.nix
+++ b/pkgs/tools/admin/awsweeper/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "awsweeper";
@@ -13,7 +13,9 @@ buildGoModule rec {
 
   modSha256 = "14yvf0svh7xqpc2y7xr94pc6r7d3iv2nsr8qs3f5q29hdc5hv3fs";
 
-  meta = with lib; {
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
     description = "A tool to clean out your AWS account";
     homepage = "https://github.com/cloudetc/awsweeper/";
     license = licenses.mpl20;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51ec7dc3197f..50e917c05de3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1125,7 +1125,9 @@ in
 
   awstats = callPackage ../tools/system/awstats { };
 
-  awsweeper = callPackage ../tools/admin/awsweeper { };
+  awsweeper = callPackage ../tools/admin/awsweeper {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   axel = callPackage ../tools/networking/axel {
     libssl = openssl;

From 91aacecb693d56c2ec2de13029c3da15d6bb8dff Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:44:00 -0500
Subject: [PATCH 3558/4636] berglas: fix build on darwin

---
 pkgs/tools/admin/berglas/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix      | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix
index c1c46da41b75..d088184f7a17 100644
--- a/pkgs/tools/admin/berglas/default.nix
+++ b/pkgs/tools/admin/berglas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "berglas";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "0m2bqx102lf6nihdjbl8a08xcwi80rawvh91j1cav0njm9w5vmmm";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     description = "A tool for managing secrets on Google Cloud";
     homepage = "https://github.com/GoogleCloudPlatform/berglas";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 50e917c05de3..59b92a374471 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -769,7 +769,9 @@ in
 
   awless = callPackage ../tools/virtualization/awless { };
 
-  berglas = callPackage ../tools/admin/berglas/default.nix { };
+  berglas = callPackage ../tools/admin/berglas/default.nix {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   brakeman = callPackage ../development/tools/analysis/brakeman { };
 

From b47c4218bb6eeb52c177c7cb4a5025fea8889ed4 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:45:00 -0500
Subject: [PATCH 3559/4636] clair: fix build on darwin

---
 pkgs/tools/admin/clair/default.nix | 8 +++++---
 pkgs/top-level/all-packages.nix    | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix
index 3f4d00736ad9..a12b8abe1206 100644
--- a/pkgs/tools/admin/clair/default.nix
+++ b/pkgs/tools/admin/clair/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub, makeWrapper, rpm, xz }:
+{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, rpm, xz, Security }:
 
 buildGoModule rec {
   pname = "clair";
@@ -13,14 +13,16 @@ buildGoModule rec {
 
   modSha256 = "0rgkrid58kji39nlmiii95r8shbzr6dwalj5m7qwxy5w1rcaljr5";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   nativeBuildInputs = [ makeWrapper ];
 
   postInstall = ''
     wrapProgram $out/bin/clair \
-      --prefix PATH : "${lib.makeBinPath [ rpm xz ]}"
+      --prefix PATH : "${stdenv.lib.makeBinPath [ rpm xz ]}"
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Vulnerability Static Analysis for Containers";
     homepage = "https://github.com/quay/clair";
     license = licenses.asl20;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59b92a374471..27c8314abdef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -856,7 +856,9 @@ in
     withDriver = false;
   };
 
-  clair = callPackage ../tools/admin/clair { };
+  clair = callPackage ../tools/admin/clair {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { };
 

From 36ae531bc2e3d7266f3748e8911d0b0866e36393 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:46:00 -0500
Subject: [PATCH 3560/4636] coredns: fix build on darwin

---
 pkgs/servers/dns/coredns/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix      | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix
index 017842f39dc1..8388968298ef 100644
--- a/pkgs/servers/dns/coredns/default.nix
+++ b/pkgs/servers/dns/coredns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "coredns";
@@ -15,6 +15,8 @@ buildGoModule rec {
 
   modSha256 = "0wlffk6wkcyn2lphw2vmdsmzag0wxljcxrvm7sv3i124x2x3yvy4";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     homepage = "https://coredns.io";
     description = "A DNS server that runs middleware";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27c8314abdef..213585553349 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16347,7 +16347,9 @@ in
 
   conntrack-tools = callPackage ../os-specific/linux/conntrack-tools { };
 
-  coredns = callPackage ../servers/dns/coredns { };
+  coredns = callPackage ../servers/dns/coredns {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   corerad = callPackage ../tools/networking/corerad { };
 

From 5b6342e8af8242e04a77060ca964dba29d263022 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:47:00 -0500
Subject: [PATCH 3561/4636] corerad: fix build on darwin

---
 pkgs/tools/networking/corerad/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix           | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix
index 96798c1c17e9..0cfaddcf06ae 100644
--- a/pkgs/tools/networking/corerad/default.nix
+++ b/pkgs/tools/networking/corerad/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "corerad";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "0vbbpndqwwz1mc59j7liaayxaj53cs8s3javgj3pvhkn4vp65p7c";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   buildFlagsArray = ''
     -ldflags=
     -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1583280117
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 213585553349..8a29f7f8375e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16351,7 +16351,9 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  corerad = callPackage ../tools/networking/corerad { };
+  corerad = callPackage ../tools/networking/corerad {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { };
 

From 59bc2841b4b960cacc558d40e25ad58414df38f3 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:48:00 -0500
Subject: [PATCH 3562/4636] dnsproxy: fix build on darwin

---
 pkgs/tools/networking/dnsproxy/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix            | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix
index 8296600cf3d3..89173e7b4277 100644
--- a/pkgs/tools/networking/dnsproxy/default.nix
+++ b/pkgs/tools/networking/dnsproxy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule }:
+{ stdenv, fetchFromGitHub, buildGoModule, Security }:
 
 buildGoModule rec {
   pname = "dnsproxy";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "0r5ybr4gpcdsldk12b0d4xiih6ckwnqkfwy89c97prv24v14zysv";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support";
     homepage = "https://github.com/AdguardTeam/dnsproxy";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8a29f7f8375e..83307c25f77d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2872,7 +2872,9 @@ in
 
   dnsmasq = callPackage ../tools/networking/dnsmasq { };
 
-  dnsproxy = callPackage ../tools/networking/dnsproxy { };
+  dnsproxy = callPackage ../tools/networking/dnsproxy {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   dnsperf = callPackage ../tools/networking/dnsperf { };
 

From 5ea0235ba9d44ca95dabaf436e677040566ac7ec Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:49:00 -0500
Subject: [PATCH 3563/4636] clash: fix build on darwin

---
 pkgs/tools/networking/clash/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix         | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix
index 234fd0b31afa..8e7499caa479 100644
--- a/pkgs/tools/networking/clash/default.nix
+++ b/pkgs/tools/networking/clash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule }:
+{ stdenv, fetchFromGitHub, buildGoModule, Security }:
 
 buildGoModule rec {
   pname = "clash";
@@ -14,6 +14,8 @@ buildGoModule rec {
   goPackagePath = "github.com/Dreamacro/clash";
   modSha256 = "02bki2iq99lc9iq1mjf9rbxwspalrj7hjlk1h384w3d4s4x4fyxy";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   buildFlagsArray = [
     "-ldflags="
     "-X ${goPackagePath}/constant.Version=${version}"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 83307c25f77d..3e56cc519675 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1475,7 +1475,9 @@ in
 
   clac = callPackage ../tools/misc/clac {};
 
-  clash = callPackage ../tools/networking/clash { };
+  clash = callPackage ../tools/networking/clash {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   clasp = callPackage ../tools/misc/clasp { };
 

From 33454dafa225bb5ca0b9ef66770fd1ae4f68115f Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:50:00 -0500
Subject: [PATCH 3564/4636] argocd: fix build on darwin

---
 pkgs/applications/networking/cluster/argocd/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix                         | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix
index 7f9ebda93c0a..51635292fa13 100644
--- a/pkgs/applications/networking/cluster/argocd/default.nix
+++ b/pkgs/applications/networking/cluster/argocd/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub, packr }:
+{ stdenv, buildGoModule, fetchFromGitHub, packr, Security }:
 
 buildGoModule rec {
   pname = "argocd";
@@ -16,6 +16,8 @@ buildGoModule rec {
 
   nativeBuildInputs = [ packr ];
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   patches = [ ./use-go-module.patch ];
 
   buildFlagsArray = ''
@@ -31,7 +33,7 @@ buildGoModule rec {
     packr
   '';
   
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes";
     homepage = "https://github.com/argoproj/argo";
     license = licenses.asl20;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e56cc519675..2e1ba3ab82f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18430,7 +18430,9 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  argocd = callPackage ../applications/networking/cluster/argocd { };
+  argocd = callPackage ../applications/networking/cluster/argocd {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   ario = callPackage ../applications/audio/ario { };
 

From 282966fc4e1a2858d3354a2a8b5faf99fb763647 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:51:00 -0500
Subject: [PATCH 3565/4636] cue: fix build on darwin

---
 pkgs/development/tools/cue/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix        | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix
index 98bf5249b626..4950e885e25c 100644
--- a/pkgs/development/tools/cue/default.nix
+++ b/pkgs/development/tools/cue/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchgit, stdenv }:
+{ buildGoModule, fetchgit, stdenv, Security }:
 
 buildGoModule rec {
   pname = "cue";
@@ -12,6 +12,8 @@ buildGoModule rec {
 
   modSha256 = "04dapx75zwi8cv1pj3c6266znrhwihv3df4izm3gjk34r2i07q6s";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   subPackages = [ "cmd/cue" ];
 
   buildFlagsArray = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e1ba3ab82f0..8346ef1a92a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -890,7 +890,9 @@ in
 
   crc32c = callPackage ../development/libraries/crc32c { };
 
-  cue = callPackage ../development/tools/cue { };
+  cue = callPackage ../development/tools/cue {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   deltachat-electron = callPackage
     ../applications/networking/instant-messengers/deltachat-electron { };

From d557b441ace98c40ae161c9dbe316636f94f673e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:52:00 -0500
Subject: [PATCH 3566/4636] drone: fix build on darwin

---
 .../tools/continuous-integration/drone/default.nix            | 4 +++-
 pkgs/top-level/all-packages.nix                               | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix
index 05257f65af52..e1f0a8de3b87 100644
--- a/pkgs/development/tools/continuous-integration/drone/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule }:
+{ stdenv, fetchFromGitHub, buildGoModule, Security }:
 
 buildGoModule rec {
   name = "drone.io-${version}";
@@ -14,6 +14,8 @@ buildGoModule rec {
     sha256 = "05cgd72qyss836fby0adhrm5p8g7639psk2yslhg6pmz0cqfbq9m";
   };
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     maintainers = with maintainers; [ elohmeier vdemeester ];
     license = licenses.asl20;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8346ef1a92a7..e88aab49b04a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2981,7 +2981,9 @@ in
 
   driftnet = callPackage ../tools/networking/driftnet {};
 
-  drone = callPackage ../development/tools/continuous-integration/drone { };
+  drone = callPackage ../development/tools/continuous-integration/drone {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { };
 

From a5a687734a963dc48ffbe2ed036809ae9e7bcb91 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:53:00 -0500
Subject: [PATCH 3567/4636] drone-cli: fix build on darwin

---
 .../continuous-integration/drone-cli/default.nix    | 13 ++++++-------
 pkgs/top-level/all-packages.nix                     |  4 +++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix
index a3df81d26053..c6e4878d52c4 100644
--- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix
@@ -1,11 +1,8 @@
-{ stdenv, fetchFromGitHub, buildGoModule }:
+{ stdenv, fetchFromGitHub, buildGoModule, Security }:
 
-let version = "1.2.1";
-in buildGoModule rec {
-  inherit version;
+buildGoModule rec {
   pname = "drone-cli";
-  revision = "v${version}";
-  goPackagePath = "github.com/drone/drone-cli";
+  version = "1.2.1";
 
   modSha256 = "0g0vq4vm2hy00r2gjsrhg57xv9sldlqix3wzimiqdli085bcz46b";
 
@@ -16,10 +13,12 @@ in buildGoModule rec {
   src = fetchFromGitHub {
     owner = "drone";
     repo = "drone-cli";
-    rev = revision;
+    rev = "v${version}";
     sha256 = "19icihi5nxcafxlh4w61nl4cd0dhvik9zl8g4gqmazikjqsjms2j";
   };
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     maintainers = with maintainers; [ bricewge ];
     license = licenses.asl20;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e88aab49b04a..33e45bed6164 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2985,7 +2985,9 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { };
+  drone-cli = callPackage ../development/tools/continuous-integration/drone-cli {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   dropbear = callPackage ../tools/networking/dropbear { };
 

From ee41c79c9a1d1341b0ae07ee82d70d0ef2bda60b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:54:00 -0500
Subject: [PATCH 3568/4636] elvish: fix build on darwin

---
 pkgs/shells/elvish/default.nix  | 4 +++-
 pkgs/top-level/all-packages.nix | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix
index ad2e845f9bc8..228692efe852 100644
--- a/pkgs/shells/elvish/default.nix
+++ b/pkgs/shells/elvish/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "elvish";
@@ -20,6 +20,8 @@ buildGoModule rec {
 
   modSha256 = "13x4wbfj8049ygm3zbgzyr2bm4sq4x6xddrxx6shr8fydlcf1g8v";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     description = "A friendly and expressive command shell";
     longDescription = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33e45bed6164..6b75b5c77884 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -917,7 +917,9 @@ in
 
   sedutil = callPackage ../tools/security/sedutil { };
 
-  elvish = callPackage ../shells/elvish { };
+  elvish = callPackage ../shells/elvish {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   emplace = callPackage ../tools/package-management/emplace { };
 

From ecec7dff61f0a6af1b6b8a7164ada42dd2ae1434 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:55:00 -0500
Subject: [PATCH 3569/4636] echoip: fix build on darwin

---
 pkgs/servers/echoip/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/echoip/default.nix b/pkgs/servers/echoip/default.nix
index b3402933f9fe..ae6057c34697 100644
--- a/pkgs/servers/echoip/default.nix
+++ b/pkgs/servers/echoip/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule {
   pname = "echoip";
@@ -13,6 +13,8 @@ buildGoModule {
 
   modSha256 = "025p891klwpid5fw4z39fimgfkwgkcwqpn5276hflzdp1hfv35ly";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   outputs = [ "out" "index" ];
 
   postInstall = ''
@@ -20,7 +22,7 @@ buildGoModule {
     cp $src/index.html $index/index.html
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     homepage = https://github.com/mpolden/echoip;
     license = licenses.bsd3;
     maintainers = with maintainers; [ rvolosatovs ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b75b5c77884..abc4b8fbaa54 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19030,7 +19030,9 @@ in
 
   eaglemode = callPackage ../applications/misc/eaglemode { };
 
-  echoip = callPackage ../servers/echoip { };
+  echoip = callPackage ../servers/echoip {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse {
     jdk = jdk11;

From e260f4861c5d5b034427eac98005f228a316d478 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:56:00 -0500
Subject: [PATCH 3570/4636] caddy: fix build on darwin

---
 pkgs/servers/caddy/default.nix  | 4 +++-
 pkgs/top-level/all-packages.nix | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index bcd4b7065b58..8b51e584e3ec 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "caddy";
@@ -16,6 +16,8 @@ buildGoModule rec {
   };
   modSha256 = "1gc0xvsihr4zp7hkrdfrplvzkaphz1y4q53rgwn2jhd8s98l57an";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   preBuild = ''
     cat << EOF > caddy/main.go
     package main
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index abc4b8fbaa54..09506da906f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1400,7 +1400,9 @@ in
     '';
   });
 
-  caddy = callPackage ../servers/caddy { };
+  caddy = callPackage ../servers/caddy {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
   caddy2 = callPackage ../servers/caddy/v2.nix { };
   traefik = callPackage ../servers/traefik { };
 

From 5480f994e9fae7f53da1720de46844c2d56e37d4 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:57:00 -0500
Subject: [PATCH 3571/4636] caddy2: fix build on darwin

---
 pkgs/servers/caddy/v2.nix       | 4 +++-
 pkgs/top-level/all-packages.nix | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/caddy/v2.nix b/pkgs/servers/caddy/v2.nix
index c0b2134abded..7330388a7859 100644
--- a/pkgs/servers/caddy/v2.nix
+++ b/pkgs/servers/caddy/v2.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, buildGoModule, fetchFromGitHub }:
+{ stdenv, callPackage, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "caddy";
@@ -16,6 +16,8 @@ buildGoModule rec {
   };
   modSha256 = "1sb8w6n84cpya2rjm0zm798kzf5vjpkr5440j1gfnnnr07jl2aqn";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     homepage = "https://caddyserver.com";
     description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09506da906f4..83d7248bee97 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1403,7 +1403,9 @@ in
   caddy = callPackage ../servers/caddy {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
-  caddy2 = callPackage ../servers/caddy/v2.nix { };
+  caddy2 = callPackage ../servers/caddy/v2.nix {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
   traefik = callPackage ../servers/traefik { };
 
   calamares = libsForQt5.callPackage ../tools/misc/calamares {

From ae47111f90316be0459bf297cf1f8b0241244972 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:58:00 -0500
Subject: [PATCH 3572/4636] documize-community: fix build on darwin

---
 pkgs/servers/documize-community/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix             | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix
index 7780d900badf..a6477d61e984 100644
--- a/pkgs/servers/documize-community/default.nix
+++ b/pkgs/servers/documize-community/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub, go-bindata, go-bindata-assetfs }:
+{ stdenv, buildGoModule, fetchFromGitHub, go-bindata, go-bindata-assetfs, Security }:
 
 buildGoModule rec {
   pname = "documize-community";
@@ -15,6 +15,8 @@ buildGoModule rec {
 
   nativeBuildInputs = [ go-bindata go-bindata-assetfs ];
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   subPackages = [ "edition/community.go" ];
 
   postInstall = ''
@@ -23,7 +25,7 @@ buildGoModule rec {
     mv $out/bin/community $out/bin/documize
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Open source Confluence alternative for internal & external docs built with Golang + EmberJS";
     license = licenses.agpl3;
     maintainers = with maintainers; [ ma27 elseym ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 83d7248bee97..6643f3456605 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17713,7 +17713,9 @@ in
 
   documentation-highlighter = callPackage ../misc/documentation-highlighter { };
 
-  documize-community = callPackage ../servers/documize-community { };
+  documize-community = callPackage ../servers/documize-community {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   doge = callPackage ../misc/doge { };
 

From b49ca4818defaeb052cb21a7afc08a393a4c36e2 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 04:59:00 -0500
Subject: [PATCH 3573/4636] fly: fix build on darwin

---
 .../tools/continuous-integration/fly/default.nix            | 6 ++++--
 pkgs/top-level/all-packages.nix                             | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix
index e5454796b7e4..4093e7e01728 100644
--- a/pkgs/development/tools/continuous-integration/fly/default.nix
+++ b/pkgs/development/tools/continuous-integration/fly/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, lib, writeText }:
+{ buildGoModule, fetchFromGitHub, stdenv, writeText, Security }:
 
 buildGoModule rec {
   pname = "fly";
@@ -20,6 +20,8 @@ buildGoModule rec {
       -X github.com/concourse/concourse.Version=${version}
   '';
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   # The fly.bash file included with this derivation can be replaced by a
   # call to `fly completion bash` once the `completion` subcommand has
   # made it into a release. Similarly, `fly completion zsh` will provide
@@ -28,7 +30,7 @@ buildGoModule rec {
     install -D -m 444 ${./fly.bash} $out/share/bash-completion/completions/fly
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "A command line interface to Concourse CI";
     homepage = "https://concourse-ci.org";
     license = licenses.asl20;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6643f3456605..bd4a35736987 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10274,7 +10274,9 @@ in
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
-  fly = callPackage ../development/tools/continuous-integration/fly { };
+  fly = callPackage ../development/tools/continuous-integration/fly {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   foreman = callPackage ../tools/system/foreman { };
   goreman = callPackage ../tools/system/goreman { };

From 6552397b674dfcd3c9b757382f708e6d54f83b3a Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:00:00 -0500
Subject: [PATCH 3574/4636] editorconfig-checker: fix build on darwin

---
 .../development/tools/misc/editorconfig-checker/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix                             | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix
index 88c43a8c42a5..335cd2f25247 100644
--- a/pkgs/development/tools/misc/editorconfig-checker/default.nix
+++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, lib }:
+{ buildGoModule, fetchFromGitHub, stdenv, Security }:
 
 buildGoModule rec {
   pname = "editorconfig-checker";
@@ -13,7 +13,9 @@ buildGoModule rec {
 
   modSha256 = "1iiv12ginb3ky739z7v8wf4z5lv24gmghbybs3lzay0kqn449n4x";
 
-  meta = with lib; {
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
     description = "A tool to verify that your files are in harmony with your .editorconfig";
     homepage = "https://editorconfig-checker.github.io/";
     license = licenses.mit;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd4a35736987..9552565dbd54 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10233,7 +10233,9 @@ in
 
   drush = callPackage ../development/tools/misc/drush { };
 
-  editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { };
+  editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { };
 

From da93b5a367ecd08d56a38b8d66ff24fca5112c32 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:01:00 -0500
Subject: [PATCH 3575/4636] eksctl: fix build on darwin

---
 pkgs/tools/admin/eksctl/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix     | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix
index 4c01383f8986..c700e4f397c7 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/pkgs/tools/admin/eksctl/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "eksctl";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "0f8dlcp3q84fa5dnnzx4347ngb1raw1mxkcqpz2s3zq6d1kv0nvf";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   subPackages = [ "cmd/eksctl" ];
 
   buildFlags = [ "-tags netgo" "-tags release" ];
@@ -25,7 +27,7 @@ buildGoModule rec {
     $out/bin/eksctl completion zsh > "$out/share/zsh/site-functions/_eksctl"
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "A CLI for Amazon EKS";
     homepage = "https://github.com/weaveworks/eksctl";
     license = licenses.asl20;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9552565dbd54..3d5e05b79ea1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1750,7 +1750,9 @@ in
 
   eggdrop = callPackage ../tools/networking/eggdrop { };
 
-  eksctl = callPackage ../tools/admin/eksctl { };
+  eksctl = callPackage ../tools/admin/eksctl {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   elementary-xfce-icon-theme = callPackage ../data/icons/elementary-xfce-icon-theme { };
 

From c8359c42e0d4996aa63f909c75aab118212fb205 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:02:00 -0500
Subject: [PATCH 3576/4636] fluxctl: fix build on darwin

---
 pkgs/applications/networking/cluster/fluxctl/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix                          | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix
index 982add3d517f..75e097131ea8 100644
--- a/pkgs/applications/networking/cluster/fluxctl/default.nix
+++ b/pkgs/applications/networking/cluster/fluxctl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "fluxctl";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "0ij5q31a0818nmqsdql1ii6rhq6nb0liplnw509qih8py7dk5xkg";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   subPackages = [ "cmd/fluxctl" ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d5e05b79ea1..3dcc312a635f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20271,7 +20271,9 @@ in
 
   k9s = callPackage ../applications/networking/cluster/k9s { };
 
-  fluxctl = callPackage ../applications/networking/cluster/fluxctl { };
+  fluxctl = callPackage ../applications/networking/cluster/fluxctl {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   linkerd = callPackage ../applications/networking/cluster/linkerd { };
 

From b1398870568b51ff90c7540f572fa58dcd580ce8 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:03:00 -0500
Subject: [PATCH 3577/4636] frp: fix build on darwin

---
 pkgs/tools/networking/frp/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix       | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix
index f44e2208646c..7323c914bfa1 100644
--- a/pkgs/tools/networking/frp/default.nix
+++ b/pkgs/tools/networking/frp/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, lib, fetchFromGitHub }:
+{ buildGoModule, stdenv, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "frp";
@@ -13,9 +13,11 @@ buildGoModule rec {
 
   modSha256 = "1v90w5grc0vjpcp0m56d73zi0qnbswgz1rcvcwrjfa3rwqhigbal";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   subPackages = [ "cmd/frpc" "cmd/frps" ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Fast reverse proxy";
     longDescription = ''
       frp is a fast reverse proxy to help you expose a local server behind a
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3dcc312a635f..cb3d41c89970 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10289,7 +10289,9 @@ in
 
   frame = callPackage ../development/libraries/frame { };
 
-  frp = callPackage ../tools/networking/frp { };
+  frp = callPackage ../tools/networking/frp {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   fsatrace = callPackage ../development/tools/misc/fsatrace { };
 

From 4f8836ee9971cf83e847bd1690851607586dfc15 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:04:00 -0500
Subject: [PATCH 3578/4636] iamy: fix build on darwin

---
 pkgs/tools/admin/iamy/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix   | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix
index e09cd2f52853..6a1ec948d907 100644
--- a/pkgs/tools/admin/iamy/default.nix
+++ b/pkgs/tools/admin/iamy/default.nix
@@ -1,11 +1,9 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "iamy";
   version = "2.3.2";
 
-  goPackagePath = "github.com/99designs/iamy";
-
   src = fetchFromGitHub {
     owner = "99designs";
     repo = "iamy";
@@ -15,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "0akak573zvz3xg5d7vf0ch2mrmj1jkzcdc29v3kn43f7944c2wcl";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   buildFlagsArray = [''-ldflags=
     -X main.Version=v${version} -s -w
   ''];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cb3d41c89970..fdcda2867a34 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -757,7 +757,9 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  iamy = callPackage ../tools/admin/iamy { };
+  iamy = callPackage ../tools/admin/iamy {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   azure-cli = callPackage ../tools/admin/azure-cli { python = python3; };
 

From 26f5b0ed8f44203622b25b4a6150150d1c595e89 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:05:00 -0500
Subject: [PATCH 3579/4636] go-license-detector: fix build on darwin

---
 pkgs/development/tools/misc/go-license-detector/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix                             | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/go-license-detector/default.nix b/pkgs/development/tools/misc/go-license-detector/default.nix
index 6675f7ed3e25..7ab7ff8b742c 100644
--- a/pkgs/development/tools/misc/go-license-detector/default.nix
+++ b/pkgs/development/tools/misc/go-license-detector/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "go-license-detector";
@@ -13,7 +13,9 @@ buildGoModule rec {
 
   modSha256 = "163f1kiy7kqrnaazb8ydaaiz57lv30jyjkvv6i7pczvcg9yfhmdb";
 
-  meta = with lib; {
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
     description = "Reliable project licenses detector";
     homepage = "https://github.com/src-d/go-license-detector";
     license = licenses.asl20;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fdcda2867a34..0299cf023471 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26348,7 +26348,9 @@ in
 
   quartus-prime-lite = callPackage ../applications/editors/quartus-prime {};
 
-  go-license-detector = callPackage ../development/tools/misc/go-license-detector { };
+  go-license-detector = callPackage ../development/tools/misc/go-license-detector {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   hashdeep = callPackage ../tools/security/hashdeep { };
 

From a8c36060b72c9bc5bc87c4102313e77c14b2dd27 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:06:00 -0500
Subject: [PATCH 3580/4636] grpcui: fix build on darwin

---
 pkgs/tools/networking/grpcui/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix          | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/grpcui/default.nix b/pkgs/tools/networking/grpcui/default.nix
index 58e698ed7081..de2b3f787986 100644
--- a/pkgs/tools/networking/grpcui/default.nix
+++ b/pkgs/tools/networking/grpcui/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, lib }:
+{ buildGoModule, fetchFromGitHub, stdenv, Security }:
 
 buildGoModule rec {
   pname = "grpcui";
@@ -13,7 +13,9 @@ buildGoModule rec {
 
   modSha256 = "1yq8484cjxad72nqsrim3zppr8hmn7dc6f8rgkw8fg952lqy5jjb";
 
-  meta = with lib; {
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
     description = "An interactive web UI for gRPC, along the lines of postman";
     homepage = "https://github.com/fullstorydev/grpcui";
     license = licenses.mit;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0299cf023471..fc2de2087fb7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3920,6 +3920,7 @@ in
 
   grpcui = callPackage ../tools/networking/grpcui {
     buildGoModule = buildGo112Module;
+    inherit (darwin.apple_sdk.frameworks) Security;
   };
 
   grub = pkgsi686Linux.callPackage ../tools/misc/grub ({

From cb8f82b8368a2dbd9dfa8bad1ad4f33dae55aebc Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:07:00 -0500
Subject: [PATCH 3581/4636] gortr: fix build on darwin

---
 pkgs/servers/gortr/default.nix  | 6 ++++--
 pkgs/top-level/all-packages.nix | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/gortr/default.nix b/pkgs/servers/gortr/default.nix
index 35c6e1452437..3e5dfc87f0ee 100644
--- a/pkgs/servers/gortr/default.nix
+++ b/pkgs/servers/gortr/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildGoModule }:
+{ stdenv, fetchFromGitHub, buildGoModule, Security }:
 
 buildGoModule rec {
   pname = "gortr";
@@ -12,7 +12,9 @@ buildGoModule rec {
   };
   modSha256 = "157dpalfz3z1s3mxq63xy6lrkwzyy9xzmvn7wsxkwznjq4djv1a1";
 
-  meta = with lib; {
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
     description = "The RPKI-to-Router server used at Cloudflare";
     homepage = "https://github.com/cloudflare/gortr/";
     license = licenses.gpl3;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fc2de2087fb7..7b044f52c4d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26339,7 +26339,9 @@ in
 
   sieveshell = with python3.pkgs; toPythonApplication managesieve;
 
-  gortr = callPackage ../servers/gortr {};
+  gortr = callPackage ../servers/gortr {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   sentencepiece = callPackage ../development/libraries/sentencepiece {};
 

From 7e4f82ce7f85633c0582a6306a40141dfcc67ceb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:08:00 -0500
Subject: [PATCH 3582/4636] hey: fix build on darwin

---
 pkgs/tools/networking/hey/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix       | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/hey/default.nix b/pkgs/tools/networking/hey/default.nix
index d65d5c9e3235..69cfa4526029 100644
--- a/pkgs/tools/networking/hey/default.nix
+++ b/pkgs/tools/networking/hey/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, lib, fetchFromGitHub }:
+{ buildGoModule, stdenv, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "hey";
@@ -13,7 +13,9 @@ buildGoModule rec {
 
   modSha256 = "0a00kcyagqczw0vhl8qs2xs1y8myw080y9kjs4qrcmj6kibdy55q";
 
-  meta = with lib; {
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
     description = "HTTP load generator, ApacheBench (ab) replacement";
     homepage = "https://github.com/rakyll/hey";
     license = licenses.asl20;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b044f52c4d0..273346599727 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4147,7 +4147,9 @@ in
   hexd = callPackage ../tools/misc/hexd { };
   pixd = callPackage ../tools/misc/pixd { };
 
-  hey = callPackage ../tools/networking/hey { };
+  hey = callPackage ../tools/networking/hey {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   hhpc = callPackage ../tools/misc/hhpc { };
 

From 121bc52a524b460b87933400b32f0041727b2be8 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:09:00 -0500
Subject: [PATCH 3583/4636] hcloud: fix build on darwin

---
 pkgs/development/tools/hcloud/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix           | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix
index 477a476dfe78..c20f3b9dc124 100644
--- a/pkgs/development/tools/hcloud/default.nix
+++ b/pkgs/development/tools/hcloud/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "hcloud";
@@ -15,6 +15,8 @@ buildGoModule rec {
 
   modSha256 = "1zy41hi2qzrdmih3pkpng8im576lhkr64zm66w73p7jyvy0kf9sx";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ];
 
   postInstall = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 273346599727..f6da0d4444db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10409,7 +10409,9 @@ in
 
   halfempty = callPackage ../development/tools/halfempty {};
 
-  hcloud = callPackage ../development/tools/hcloud { };
+  hcloud = callPackage ../development/tools/hcloud {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   help2man = callPackage ../development/tools/misc/help2man { };
 

From 33f90726c3c0aa390d446e51a8911edcd75f7d5b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:10:00 -0500
Subject: [PATCH 3584/4636] gotify-cli: fix build on darwin

---
 pkgs/tools/misc/gotify-cli/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix        | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/pkgs/tools/misc/gotify-cli/default.nix
index a4b9af09712e..56462aa3d303 100644
--- a/pkgs/tools/misc/gotify-cli/default.nix
+++ b/pkgs/tools/misc/gotify-cli/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, lib }:
+{ buildGoModule, fetchFromGitHub, stdenv, Security }:
 
 buildGoModule rec {
   pname = "gotify-cli";
@@ -17,7 +17,9 @@ buildGoModule rec {
     mv $out/bin/cli $out/bin/gotify
   '';
 
-  meta = with lib; {
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
     license = licenses.mit;
     homepage = https://github.com/gotify/cli;
     description = "A command line interface for pushing messages to gotify/server.";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f6da0d4444db..ecd1d5ececfa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1908,7 +1908,9 @@ in
 
   gosu = callPackage ../tools/misc/gosu { };
 
-  gotify-cli = callPackage ../tools/misc/gotify-cli { };
+  gotify-cli = callPackage ../tools/misc/gotify-cli {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   gping = callPackage ../tools/networking/gping { };
 

From c058bc936d88207e73586994c16e1d31d67f33c1 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:11:00 -0500
Subject: [PATCH 3585/4636] go-ethereum: fix build on darwin

---
 pkgs/applications/blockchains/go-ethereum.nix | 4 +++-
 pkgs/top-level/all-packages.nix               | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix
index d8660967a4e0..80e17cf1138a 100644
--- a/pkgs/applications/blockchains/go-ethereum.nix
+++ b/pkgs/applications/blockchains/go-ethereum.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit }:
+{ stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit, CoreServices }:
 
 buildGoModule rec {
   pname = "go-ethereum";
@@ -30,6 +30,8 @@ buildGoModule rec {
     "cmd/wnode"
   ];
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
+
   # Fix for usb-related segmentation faults on darwin
   propagatedBuildInputs =
     stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ecd1d5ececfa..386ad5bb8f25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23045,7 +23045,7 @@ in
   freicoin = callPackage ../applications/blockchains/freicoin.nix { boost = boost155; };
   go-ethereum = callPackage ../applications/blockchains/go-ethereum.nix {
     inherit (darwin) libobjc;
-    inherit (darwin.apple_sdk.frameworks) IOKit;
+    inherit (darwin.apple_sdk.frameworks) CoreServices IOKit;
   };
 
   ledger_agent = with python3Packages; toPythonApplication ledger_agent;

From 069aff87e7e1c0a4bd209e55621c4e1302a8977d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:12:00 -0500
Subject: [PATCH 3586/4636] hugo: fix build on darwin

---
 pkgs/applications/misc/hugo/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix         | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index f1d68b926910..a88ed0bfd048 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -1,11 +1,9 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "hugo";
   version = "0.67.1";
 
-  goPackagePath = "github.com/gohugoio/hugo";
-
   src = fetchFromGitHub {
     owner = "gohugoio";
     repo = pname;
@@ -15,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "0s7a13jkhsr6h19a9ysr8877imac5skdray0zg2qgwrapic2nw17";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   buildFlags = [ "-tags" "extended" ];
 
   subPackages = [ "." ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 386ad5bb8f25..616432520f13 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19859,7 +19859,9 @@ in
     wxGTK = wxGTK30;
   };
 
-  hugo = callPackage ../applications/misc/hugo { };
+  hugo = callPackage ../applications/misc/hugo {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   hydrogen = callPackage ../applications/audio/hydrogen { };
 

From f68366f274a491272b0632b9dccb15a919cd7cfa Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:13:00 -0500
Subject: [PATCH 3587/4636] gobetween: fix build on darwin

---
 pkgs/servers/gobetween/default.nix | 8 +++++---
 pkgs/top-level/all-packages.nix    | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/gobetween/default.nix b/pkgs/servers/gobetween/default.nix
index ff59ad53ed1c..e66d5581b3c8 100644
--- a/pkgs/servers/gobetween/default.nix
+++ b/pkgs/servers/gobetween/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, lib, enableStatic ? false }:
+{ buildGoModule, fetchFromGitHub, stdenv, Security, enableStatic ? false }:
 
 buildGoModule rec {
   pname = "gobetween";
@@ -14,8 +14,10 @@ buildGoModule rec {
   modSha256 =
     "dd91838d20c99c73447590e43edd13c87755276f17ef3e53f24c5df3d0908f78";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   buildPhase = ''
-    make build${lib.optionalString enableStatic "-static"}
+    make build${stdenv.lib.optionalString enableStatic "-static"}
   '';
 
   installPhase = ''
@@ -25,7 +27,7 @@ buildGoModule rec {
     cp -r config $out/share
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Modern & minimalistic load balancer for the Сloud era";
     homepage = "http://gobetween.io";
     license = licenses.mit;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 616432520f13..d42bf5b45daf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15536,6 +15536,7 @@ in
 
   gobetween = callPackage ../servers/gobetween {
     buildGoModule = buildGo112Module;
+    inherit (darwin.apple_sdk.frameworks) Security;
   };
 
   h2o = callPackage ../servers/http/h2o { };

From 4c6e7e64a0490131a26e2dcdeac70b4e8f94ccf9 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:14:00 -0500
Subject: [PATCH 3588/4636] golangci-lint: fix build on darwin

---
 pkgs/development/tools/golangci-lint/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix                  | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix
index 14311b0c7a51..00858e94bc55 100644
--- a/pkgs/development/tools/golangci-lint/default.nix
+++ b/pkgs/development/tools/golangci-lint/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, lib }:
+{ buildGoModule, fetchFromGitHub, stdenv, Security }:
 
 buildGoModule rec {
   pname = "golangci-lint";
@@ -14,7 +14,9 @@ buildGoModule rec {
   modSha256 = "0ab1s8pqkpss15rd9brin39lzx2fqkvq2v3nhk8kfrgpari2addk";
   subPackages = [ "cmd/golangci-lint" ];
 
-  meta = with lib; {
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
     description = "Linters Runner for Go. 5x faster than gometalinter. Nice colored output.";
     homepage = "https://golangci.com/";
     license = licenses.agpl3;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d42bf5b45daf..cf6cd38a939c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17195,7 +17195,9 @@ in
 
   golint = callPackage ../development/tools/golint { };
 
-  golangci-lint = callPackage ../development/tools/golangci-lint { };
+  golangci-lint = callPackage ../development/tools/golangci-lint {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   gocyclo = callPackage ../development/tools/gocyclo { };
 

From e0ce72f9010405c25b9bd748902650a36ce1ff1a Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:15:00 -0500
Subject: [PATCH 3589/4636] hetzner-kube: fix build on darwin

---
 .../networking/cluster/hetzner-kube/default.nix      | 12 +++++++-----
 pkgs/top-level/all-packages.nix                      |  4 +++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix
index 1d9940c8f318..8a59bf3197a9 100644
--- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix
+++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "hetzner-kube";
@@ -13,16 +13,18 @@ buildGoModule rec {
 
   modSha256 = "0jjrk93wdi13wrb5gchhqk7rgwm74kcizrbqsibgkgs2dszwfazh";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   buildFlagsArray = ''
     -ldflags=
     -X github.com/xetys/hetzner-kube/cmd.version=${version}
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A CLI tool for provisioning Kubernetes clusters on Hetzner Cloud";
     homepage = "https://github.com/xetys/hetzner-kube";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ eliasp ];
-    platforms = lib.platforms.unix;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ eliasp ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cf6cd38a939c..9c50f00a2ced 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17838,7 +17838,9 @@ in
 
   helvetica-neue-lt-std = callPackage ../data/fonts/helvetica-neue-lt-std { };
 
-  hetzner-kube = callPackage ../applications/networking/cluster/hetzner-kube { };
+  hetzner-kube = callPackage ../applications/networking/cluster/hetzner-kube {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   hicolor-icon-theme = callPackage ../data/icons/hicolor-icon-theme { };
 

From dbb3f260cae38cd2d53a1e3744160970d5e39f13 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:16:00 -0500
Subject: [PATCH 3590/4636] geoipupdate: fix build on darwin

---
 pkgs/applications/misc/geoipupdate/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix                | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix
index b7b90448e4bc..71ea8a3d43f4 100644
--- a/pkgs/applications/misc/geoipupdate/default.nix
+++ b/pkgs/applications/misc/geoipupdate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "geoipupdate";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "1bypanvrkcqp8rk84cv2569671irgaf3cy27lcrknyina4pdvir5";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     description = "Automatic GeoIP database updater";
     homepage = "https://github.com/maxmind/geoipupdate";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c50f00a2ced..c6e0fd0eb797 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19326,7 +19326,9 @@ in
   geany = callPackage ../applications/editors/geany { };
   geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { };
 
-  geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { };
+  geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { };
 

From 7faf44250d658654c2d5cd35ef77f73faf2ebe0c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:17:00 -0500
Subject: [PATCH 3591/4636] gomuks: fix build on darwin

---
 .../networking/instant-messengers/gomuks/default.nix          | 4 +++-
 pkgs/top-level/all-packages.nix                               | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
index a36f72c03d08..27790c2c9e08 100644
--- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "gomuks";
@@ -15,6 +15,8 @@ buildGoModule rec {
 
   modSha256 = "03vbrh50pvx71rp6c23qc2sh0ir4jm1wl0gvi3z1c14ndzhsqky4";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     homepage = "https://maunium.net/go/gomuks/";
     description = "A terminal based Matrix client written in Go";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6e0fd0eb797..c6cf178b390a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19367,7 +19367,9 @@ in
     inherit (darwin) libiconv;
   };
 
-  gomuks = callPackage ../applications/networking/instant-messengers/gomuks { };
+  gomuks = callPackage ../applications/networking/instant-messengers/gomuks {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   inherit (ocamlPackages) google-drive-ocamlfuse;
 

From 73cb29e6d9c71d15d0a344bbfeb9b52ee72b3c69 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:18:00 -0500
Subject: [PATCH 3592/4636] glow: fix build on darwin

---
 pkgs/applications/editors/glow/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix            | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix
index 928291940cfe..80fdcc8a09c1 100644
--- a/pkgs/applications/editors/glow/default.nix
+++ b/pkgs/applications/editors/glow/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "glow";
@@ -13,9 +13,11 @@ buildGoModule rec {
 
   modSha256 = "0r0yq7kgz7i1wf4gxxihdrn1c8mi4wcyhadncxbln24s9c5apxsf";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   buildFlagsArray = [ "-ldflags=" "-X=main.Version=${version}" ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Render markdown on the CLI";
     homepage = "https://github.com/charmbracelet/glow";
     license = licenses.mit;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6cf178b390a..fb5c2ff4af1e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19690,7 +19690,9 @@ in
     inherit (darwin) IOKit;
   };
 
-  glow = callPackage ../applications/editors/glow { };
+  glow = callPackage ../applications/editors/glow {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   glowing-bear = callPackage ../applications/networking/irc/glowing-bear { };
 

From 68705eee2e1878367f58205f0dd4281a16173741 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:19:00 -0500
Subject: [PATCH 3593/4636] hydroxide: fix build on darwin

---
 pkgs/applications/networking/hydroxide/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix                    | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix
index 75c1cdaece96..d3f45f7f0385 100644
--- a/pkgs/applications/networking/hydroxide/default.nix
+++ b/pkgs/applications/networking/hydroxide/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
+{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch, Security }:
 
 buildGoModule rec {
   pname = "hydroxide";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "0b19rcif8yiyvhrsjd3q5nsvr580lklamlphx4dk47n456ckcqfp";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   # FIXME: remove with next release
   patches = [
     (fetchpatch {
@@ -23,7 +25,7 @@ buildGoModule rec {
 
   subPackages = [ "cmd/hydroxide" ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "A third-party, open-source ProtonMail bridge";
     homepage = "https://github.com/emersion/hydroxide";
     license = licenses.mit;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb5c2ff4af1e..476336b5228e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19876,7 +19876,9 @@ in
 
   hydrogen = callPackage ../applications/audio/hydrogen { };
 
-  hydroxide = callPackage ../applications/networking/hydroxide { };
+  hydroxide = callPackage ../applications/networking/hydroxide {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   hyper = callPackage ../applications/misc/hyper { };
 

From 2f022c86f2b374fa9c930a3c3f0dc36e0925dab7 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:20:00 -0500
Subject: [PATCH 3594/4636] gobuster: fix build on darwin

---
 pkgs/tools/security/gobuster/default.nix | 7 +++++--
 pkgs/top-level/all-packages.nix          | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/gobuster/default.nix b/pkgs/tools/security/gobuster/default.nix
index c3426bee965b..c9348b2f23aa 100644
--- a/pkgs/tools/security/gobuster/default.nix
+++ b/pkgs/tools/security/gobuster/default.nix
@@ -1,6 +1,7 @@
 { buildGoModule
 , fetchFromGitHub
-, lib
+, stdenv
+, Security
 }:
 
 buildGoModule rec {
@@ -16,7 +17,9 @@ buildGoModule rec {
 
   modSha256 = "0jq0z5s05vqdvq7v1gdjwlqqwbl1j2rv9f16k52idl50vdiqviql";
 
-  meta = with lib; {
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
     description = "Tool used to brute-force URIs, DNS subdomains, Virtual Host names on target web servers";
     homepage = "https://github.com/OJ/gobuster";
     license = licenses.asl20;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 476336b5228e..fd59172bbda6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25247,7 +25247,9 @@ in
     binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
   };
 
-  gobuster = callPackage ../tools/security/gobuster { };
+  gobuster = callPackage ../tools/security/gobuster {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   guetzli = callPackage ../applications/graphics/guetzli { };
 

From b24059bc2f370055287b09558783b29ef41f94c4 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:21:00 -0500
Subject: [PATCH 3595/4636] gitAndTools.lefthook: fix build on darwin

---
 .../applications/version-management/git-and-tools/default.nix | 4 +++-
 .../version-management/git-and-tools/lefthook/default.nix     | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index a4b3ac1a65aa..3dc7b9e71df6 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -179,7 +179,9 @@ let
 
   lab = callPackage ./lab { };
 
-  lefthook = callPackage ./lefthook { };
+  lefthook = callPackage ./lefthook {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   pass-git-helper = python3Packages.callPackage ./pass-git-helper { };
 
diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
index 9fc89d520ae9..c80cff15265e 100644
--- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "lefthook";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "0ih11gw2y9dhv3zw1fzjmdfjln5h6zg1bj7sl68cglf6743siqnq";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     description = "Fast and powerful Git hooks manager for any type of projects";
     homepage = "https://github.com/Arkweid/lefthook";

From b30c0c8d5f821d1d3ff8d642ce232a0710c4ed83 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:22:00 -0500
Subject: [PATCH 3596/4636] gitAndTools.lab: fix build on darwin

---
 .../applications/version-management/git-and-tools/default.nix | 4 +++-
 .../version-management/git-and-tools/lab/default.nix          | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 3dc7b9e71df6..5d13fd385844 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -177,7 +177,9 @@ let
     inherit (darwin) Security;
   };
 
-  lab = callPackage ./lab { };
+  lab = callPackage ./lab {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   lefthook = callPackage ./lefthook {
     inherit (darwin.apple_sdk.frameworks) Security;
diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix
index 3e47631caf69..8780ce4a2205 100644
--- a/pkgs/applications/version-management/git-and-tools/lab/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "lab";
@@ -15,6 +15,8 @@ buildGoModule rec {
 
   modSha256 = "03fqa7s6729g0a6ffiyc61dkldpi7vg8pvvpqak4c0mqi1dycivd";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 
   postInstall = ''

From 3e92406ab0692dcefe4207ea1f9dd333bd90b24d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:23:00 -0500
Subject: [PATCH 3597/4636] gitAndTools.git-subtrac: fix build on darwin

---
 .../version-management/git-and-tools/default.nix            | 4 +++-
 .../git-and-tools/git-subtrac/default.nix                   | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 5d13fd385844..a8bf85d104e8 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -136,7 +136,9 @@ let
 
   git-subrepo = callPackage ./git-subrepo { };
 
-  git-subtrac = callPackage ./git-subtrac { };
+  git-subtrac = callPackage ./git-subtrac {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   git-sync = callPackage ./git-sync { };
 
diff --git a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix
index 07c63ea0119b..9ccf3c606a2a 100644
--- a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "git-subtrac";
@@ -13,7 +13,9 @@ buildGoModule rec {
 
   modSha256 = "147vzllp1gydk2156hif313vwykagrj35vaiqy1swqczxs7p9hhs";
 
-  meta = with lib; {
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
     description = "Keep the content for your git submodules all in one place: the parent repo";
     homepage = "https://github.com/apenwarr/git-subtrac";
     license = licenses.asl20;

From 02d54a88b628b929f83a193553808b88c8836f70 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:24:00 -0500
Subject: [PATCH 3598/4636] gitAndTools.git-bug: fix build on darwin

---
 .../applications/version-management/git-and-tools/default.nix | 4 +++-
 .../version-management/git-and-tools/git-bug/default.nix      | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index a8bf85d104e8..0bc60082dc16 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -65,7 +65,9 @@ let
 
   git-appraise = callPackage ./git-appraise {};
 
-  git-bug = callPackage ./git-bug { };
+  git-bug = callPackage ./git-bug {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   # support for bugzilla
   git-bz = callPackage ./git-bz { };
diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
index ed0c8680d753..fdb5a6c53fdf 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "git-bug";
@@ -15,6 +15,8 @@ buildGoModule rec {
 
   modSha256 = "1cfn49cijiarzzczrpd28x1k7ib98xyzlvn3zghwk2ngfgiah3ld";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   buildFlagsArray = ''
     -ldflags= 
       -X ${goPackagePath}/commands.GitCommit=${rev}

From b149f2ee80818be501684e1ea094bbf48b4654cd Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:25:00 -0500
Subject: [PATCH 3599/4636] gitAndTools.ghq: fix build on darwin

---
 .../applications/version-management/git-and-tools/default.nix | 4 +++-
 .../version-management/git-and-tools/ghq/default.nix          | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 0bc60082dc16..c4a99cf18584 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -34,7 +34,9 @@ let
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  ghq = callPackage ./ghq { };
+  ghq = callPackage ./ghq {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   git = appendToName "minimal" gitBase;
 
diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
index d0c468ab68ea..34829c14b7bb 100644
--- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "ghq";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "0hlbhky3c6zva9khn73n6xgq57k5p8anskxy3g2m0wzhr72cyc41";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   buildFlagsArray = ''
     -ldflags=
       -X=main.Version=${version}

From ed310da7370474e65c1ced5037189be91ed06755 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:26:00 -0500
Subject: [PATCH 3600/4636] imgproxy: fix build on darwin

---
 pkgs/servers/imgproxy/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix   | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix
index 4cdfddcff6f4..c7d0d910ac1e 100644
--- a/pkgs/servers/imgproxy/default.nix
+++ b/pkgs/servers/imgproxy/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub, pkg-config, vips, gobject-introspection }:
+{ stdenv, buildGoModule, fetchFromGitHub, pkg-config, vips, gobject-introspection, Security }:
 
 buildGoModule rec {
   pname = "imgproxy";
@@ -15,13 +15,14 @@ buildGoModule rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ gobject-introspection vips ];
+  buildInputs = [ gobject-introspection vips ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
   preBuild = ''
     export CGO_LDFLAGS_ALLOW='-(s|w)'
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Fast and secure on-the-fly image processing server written in Go";
     homepage = "https://imgproxy.net";
     license = licenses.mit;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd59172bbda6..dc004103a87f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15566,7 +15566,9 @@ in
     theme-spring = callPackage ../servers/icingaweb2/theme-spring { };
   };
 
-  imgproxy = callPackage ../servers/imgproxy { };
+  imgproxy = callPackage ../servers/imgproxy {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   ircdHybrid = callPackage ../servers/irc/ircd-hybrid { };
 

From 6852ecdcf5448bae3c5a10e760a862dda1e5ce3b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:27:00 -0500
Subject: [PATCH 3601/4636] ipfs-cluster: fix build on darwin

---
 pkgs/applications/networking/ipfs-cluster/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix                       | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix
index a214f222d566..9bf7faf51f3e 100644
--- a/pkgs/applications/networking/ipfs-cluster/default.nix
+++ b/pkgs/applications/networking/ipfs-cluster/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, fetchgx, gx-go }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "ipfs-cluster";
@@ -14,6 +14,8 @@ buildGoModule rec {
     sha256 = "1jh6ynj50jd4w79widaqrgm3h3yz5h03vq0lbsx717a8d9073blh";
   };
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     description = "Allocate, replicate, and track Pins across a cluster of IPFS daemons";
     homepage = https://cluster.ipfs.io/;
@@ -22,4 +24,3 @@ buildGoModule rec {
     maintainers = with maintainers; [ jglukasik ];
   };
 }
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc004103a87f..dc6aafba5ff3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4351,7 +4351,9 @@ in
     buildGoModule = buildGo112Module;
   };
   ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { };
-  ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { };
+  ipfs-cluster = callPackage ../applications/networking/ipfs-cluster {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   ipget = callPackage ../applications/networking/ipget { };
 

From 92da50afa856920842a353264b68673fe0dd2c8c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:28:00 -0500
Subject: [PATCH 3602/4636] ipfs: fix build on darwin

---
 pkgs/applications/networking/ipfs/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix               | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix
index 4f71fcf3b745..c3a31f4e290f 100644
--- a/pkgs/applications/networking/ipfs/default.nix
+++ b/pkgs/applications/networking/ipfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "ipfs";
@@ -18,6 +18,8 @@ buildGoModule rec {
 
   modSha256 = "12m4ind1s8zaa6kssblc28z2cafy20w2jp80kzif39hg5ar9bijm";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     description = "A global, versioned, peer-to-peer filesystem";
     homepage = https://ipfs.io/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc6aafba5ff3..abddc4ec7286 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4349,6 +4349,7 @@ in
     #    go: github.com/go-critic/go-critic@v0.0.0-20181204210945-ee9bf5809ead: invalid pseudo-version: does not match version-control timestamp (2019-02-10T22:04:43Z)
     # This is fixed in master, but release containing the fix does not exist yet.
     buildGoModule = buildGo112Module;
+    inherit (darwin.apple_sdk.frameworks) Security;
   };
   ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { };
   ipfs-cluster = callPackage ../applications/networking/ipfs-cluster {

From 618075428b25837beaf4c3711aca1d40b5de29bf Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:29:00 -0500
Subject: [PATCH 3603/4636] joker: fix build on darwin

---
 pkgs/development/interpreters/joker/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix                 | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix
index ed82f76eec24..1db2dd60197b 100644
--- a/pkgs/development/interpreters/joker/default.nix
+++ b/pkgs/development/interpreters/joker/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "joker";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "0i16vf7n1xfz5kp9w3fvyc9y9wgz4h396glgpdaznpxjr12rb43j";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   preBuild = ''
     go generate ./...
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index abddc4ec7286..49f408b7e1cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9296,7 +9296,9 @@ in
 
   jmeter = callPackage ../applications/networking/jmeter {};
 
-  joker = callPackage ../development/interpreters/joker {};
+  joker = callPackage ../development/interpreters/joker {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   davmail = callPackage ../applications/networking/davmail {};
 

From a39d49e9905cc717727afc6e8ec716c70848a447 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:30:00 -0500
Subject: [PATCH 3604/4636] kcli: fix build on darwin

---
 pkgs/development/tools/kcli/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix         | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/development/tools/kcli/default.nix
index bbcb10a354cf..0d42df3b5e4d 100644
--- a/pkgs/development/tools/kcli/default.nix
+++ b/pkgs/development/tools/kcli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "kcli";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "1wcqh3306q9wxb6pnl8cpk73vmy36bjv2gil03j7j4pajs1f2lwn";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   subPackages = [ "." ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 49f408b7e1cc..b44b207e50db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26375,7 +26375,9 @@ in
 
   sentencepiece = callPackage ../development/libraries/sentencepiece {};
 
-  kcli = callPackage ../development/tools/kcli {};
+  kcli = callPackage ../development/tools/kcli {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   unstick = callPackage ../os-specific/linux/unstick {};
 

From c47833f3791a163d505ec075086e05dc7ca71ea6 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:31:00 -0500
Subject: [PATCH 3605/4636] k9s: fix build on darwin

---
 pkgs/applications/networking/cluster/k9s/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix                      | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix
index 99326a20bfa0..956d7b106b97 100644
--- a/pkgs/applications/networking/cluster/k9s/default.nix
+++ b/pkgs/applications/networking/cluster/k9s/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "k9s";
@@ -22,6 +22,8 @@ buildGoModule rec {
 
   modSha256 = "06m4xgl29zx6zpqx630m9cm52wmljms9cvly5f4pqdb4zicq7n86";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     description = "Kubernetes CLI To Manage Your Clusters In Style.";
     homepage = "https://github.com/derailed/k9s";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b44b207e50db..0eae8d95cc7f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20302,7 +20302,9 @@ in
 
   kubeless = callPackage ../applications/networking/cluster/kubeless { };
 
-  k9s = callPackage ../applications/networking/cluster/k9s { };
+  k9s = callPackage ../applications/networking/cluster/k9s {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   fluxctl = callPackage ../applications/networking/cluster/fluxctl {
     inherit (darwin.apple_sdk.frameworks) Security;

From 6e26c88a24a09e04ee30ef5d7d1865b529bff5d0 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:32:00 -0500
Subject: [PATCH 3606/4636] kubeprompt: fix build on darwin

---
 pkgs/development/tools/kubeprompt/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix               | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/kubeprompt/default.nix b/pkgs/development/tools/kubeprompt/default.nix
index 7c6f3f3396cf..0910c061ee50 100644
--- a/pkgs/development/tools/kubeprompt/default.nix
+++ b/pkgs/development/tools/kubeprompt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "kubeprompt";
@@ -21,6 +21,8 @@ buildGoModule rec {
   goPackagePath = "github.com/jlesquembre/kubeprompt";
   modSha256 = "0rbpdk2dixywn3wcdgz48f3xw3b7fk8xh7mrlx27wz7fq5wj9v8f";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     description = "Kubernetes prompt";
     homepage = "https://github.com/jlesquembre/kubeprompt";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0eae8d95cc7f..6525f7fae09a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10500,7 +10500,9 @@ in
 
   kube-prompt = callPackage ../development/tools/kube-prompt { };
 
-  kubeprompt = callPackage ../development/tools/kubeprompt { };
+  kubeprompt = callPackage ../development/tools/kubeprompt {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   kubicorn = callPackage ../development/tools/kubicorn {  };
 

From dabed704c5fdcafc4deb040f3c4d80f7aeca064d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:33:00 -0500
Subject: [PATCH 3607/4636] kubeval: fix build on darwin

---
 pkgs/applications/networking/cluster/kubeval/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix                          | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix
index 54be5956040c..046052f78bef 100644
--- a/pkgs/applications/networking/cluster/kubeval/default.nix
+++ b/pkgs/applications/networking/cluster/kubeval/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, buildGoModule, makeWrapper }:
+{ stdenv, fetchFromGitHub, buildGoModule, Security }:
 
 buildGoModule rec {
   pname = "kubeval";
@@ -13,7 +13,9 @@ buildGoModule rec {
 
   modSha256 = "0y9x44y3bchi8xg0a6jmp2rmi8dybkl6qlywb6nj1viab1s8dd4y";
 
-  meta = with lib; {
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
     description = "Validate your Kubernetes configuration files";
     homepage = https://github.com/instrumenta/kubeval;
     license = licenses.asl20;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6525f7fae09a..fcb0e12c63ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20290,7 +20290,9 @@ in
 
   kubecfg = callPackage ../applications/networking/cluster/kubecfg { };
 
-  kubeval = callPackage ../applications/networking/cluster/kubeval { };
+  kubeval = callPackage ../applications/networking/cluster/kubeval {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { };
 

From 378de230c169a3379223bd8ac21b63711829e463 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:34:00 -0500
Subject: [PATCH 3608/4636] kepubify: fix build on darwin

---
 pkgs/tools/misc/kepubify/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix      | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix
index 207492a89449..a7b7da451fb7 100644
--- a/pkgs/tools/misc/kepubify/default.nix
+++ b/pkgs/tools/misc/kepubify/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildGoModule }:
+{ stdenv, fetchFromGitHub, buildGoModule, Security }:
 
 buildGoModule rec {
   pname = "kepubify";
@@ -15,9 +15,11 @@ buildGoModule rec {
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   subPackages = [ "." "covergen" "seriesmeta" ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "EPUB to KEPUB converter";
     homepage = "https://pgaskin.net/kepubify";
     license = licenses.mit;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fcb0e12c63ec..53677e2b77cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20229,7 +20229,9 @@ in
 
   kega-fusion = pkgsi686Linux.callPackage ../misc/emulators/kega-fusion { };
 
-  kepubify = callPackage ../tools/misc/kepubify { };
+  kepubify = callPackage ../tools/misc/kepubify {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   kermit = callPackage ../tools/misc/kermit { };
 

From 8e2dd1164f38b67847d5e56a496fb1a2f302aacc Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:35:00 -0500
Subject: [PATCH 3609/4636] kubernetes-helm: fix build on darwin

---
 pkgs/applications/networking/cluster/helm/default.nix | 5 ++++-
 pkgs/top-level/all-packages.nix                       | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 88ca9b3da947..822df7656554 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
+{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles, Security }:
 
 buildGoModule rec {
   pname = "helm";
@@ -16,6 +16,9 @@ buildGoModule rec {
   buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ];
 
   nativeBuildInputs = [ installShellFiles ];
+
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   postInstall = ''
     $out/bin/helm completion bash > helm.bash
     $out/bin/helm completion zsh > helm.zsh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 53677e2b77cd..cdf85a8e8cfe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20318,7 +20318,9 @@ in
 
   linkerd = callPackage ../applications/networking/cluster/linkerd { };
 
-  kubernetes-helm = callPackage ../applications/networking/cluster/helm { };
+  kubernetes-helm = callPackage ../applications/networking/cluster/helm {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   kubetail = callPackage ../applications/networking/cluster/kubetail { } ;
 

From 3772f50fc63519cdb4a02e6f08cbf6c5d7defea7 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:36:00 -0500
Subject: [PATCH 3610/4636] kubeseal: fix build on darwin

---
 pkgs/applications/networking/cluster/kubeseal/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix                           | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix
index 6d35d233d4f4..092cee5f7a27 100644
--- a/pkgs/applications/networking/cluster/kubeseal/default.nix
+++ b/pkgs/applications/networking/cluster/kubeseal/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "kubeseal";
@@ -13,9 +13,11 @@ buildGoModule rec {
 
   modSha256 = "04dmjyz3vi2l0dfpyy42lkp2fv1vlfkvblrxh1dvb37phrkd5lbd";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   subPackages = [ "cmd/kubeseal" ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "A Kubernetes controller and tool for one-way encrypted Secrets";
     homepage = "https://github.com/bitnami-labs/sealed-secrets";
     license = licenses.asl20;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cdf85a8e8cfe..062fc84824f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20302,7 +20302,9 @@ in
     go = buildPackages.go_1_13;
   };
 
-  kubeseal = callPackage ../applications/networking/cluster/kubeseal { };
+  kubeseal = callPackage ../applications/networking/cluster/kubeseal {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   kubectl = callPackage ../applications/networking/cluster/kubectl { };
 

From cd50659071732ec6217a7c678784965f176c9c73 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:37:00 -0500
Subject: [PATCH 3611/4636] lego: fix build on darwin

---
 pkgs/tools/admin/lego/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix   | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix
index 72c61ceecaf2..0cb614c12d1f 100644
--- a/pkgs/tools/admin/lego/default.nix
+++ b/pkgs/tools/admin/lego/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildGoModule }:
+{ stdenv, fetchFromGitHub, buildGoModule, Security }:
 
 buildGoModule rec {
   pname = "lego";
@@ -14,11 +14,13 @@ buildGoModule rec {
   modSha256 = "10n8pcbmzlnk63gzsjb1xnmjwxfhxsqx8ffpcbwdzq9fc5yvjiii";
   subPackages = [ "cmd/lego" ];
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   buildFlagsArray = [
     "-ldflags=-X main.version=${version}"
   ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Let's Encrypt client and ACME library written in Go";
     license = licenses.mit;
     homepage = "https://go-acme.github.io/lego/";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 062fc84824f7..e4bab6943adc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4596,7 +4596,9 @@ in
 
   lefthook = gitAndTools.lefthook;
 
-  lego = callPackage ../tools/admin/lego { };
+  lego = callPackage ../tools/admin/lego {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   leocad = callPackage ../applications/graphics/leocad { };
 

From e52210e014d1dbc0d4b4052308818085904cfabb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:38:00 -0500
Subject: [PATCH 3612/4636] kustomize: fix build on darwin

---
 pkgs/development/tools/kustomize/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix              | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix
index e60181e9bc4c..ce173e89a2c5 100644
--- a/pkgs/development/tools/kustomize/default.nix
+++ b/pkgs/development/tools/kustomize/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub, tree }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "kustomize";
@@ -25,7 +25,9 @@ buildGoModule rec {
 
   modSha256 = "1bas6al14ck0d2ccb4235426a5hldqsm0nf8vi76chz4nahzb71g";
 
-  meta = with lib; {
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
     description = "Customization of kubernetes YAML configurations";
     longDescription = ''
       kustomize lets you customize raw, template-free YAML files for
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e4bab6943adc..bedd21d2dd48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10510,7 +10510,9 @@ in
 
   kubie = callPackage ../development/tools/kubie { };
 
-  kustomize = callPackage ../development/tools/kustomize { };
+  kustomize = callPackage ../development/tools/kustomize {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   ktlint = callPackage ../development/tools/ktlint { };
 

From 55fa7fd5856ab36332b0cc2d46e367a73b447fe8 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:39:00 -0500
Subject: [PATCH 3613/4636] linkerd: fix build on darwin

---
 pkgs/applications/networking/cluster/linkerd/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix                          | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix
index 8c0265d14914..d52b25c2e015 100644
--- a/pkgs/applications/networking/cluster/linkerd/default.nix
+++ b/pkgs/applications/networking/cluster/linkerd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule }:
+{ stdenv, fetchFromGitHub, buildGoModule, Security }:
 
 buildGoModule {
   pname = "linkerd-unstablle";
@@ -13,6 +13,8 @@ buildGoModule {
 
   modSha256 = "0gahhywpcj16ww4l8s3wjwvavq24fpy258snhyf94ipy6lb797sl";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   subPackages = [ "cli/cmd" ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bedd21d2dd48..719b78825394 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20322,7 +20322,9 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  linkerd = callPackage ../applications/networking/cluster/linkerd { };
+  linkerd = callPackage ../applications/networking/cluster/linkerd {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   kubernetes-helm = callPackage ../applications/networking/cluster/helm {
     inherit (darwin.apple_sdk.frameworks) Security;

From d6950431b7c878af009b8c47eceb2da507a64487 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:40:00 -0500
Subject: [PATCH 3614/4636] lnd: fix build on darwin

---
 pkgs/applications/blockchains/lnd.nix | 8 +++++---
 pkgs/top-level/all-packages.nix       | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd.nix
index dd45746c8df5..4be19beedc39 100644
--- a/pkgs/applications/blockchains/lnd.nix
+++ b/pkgs/applications/blockchains/lnd.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, lib }:
+{ buildGoModule, fetchFromGitHub, stdenv, Security }:
 
 buildGoModule rec {
   pname = "lnd";
@@ -13,10 +13,12 @@ buildGoModule rec {
 
   modSha256 = "1pvcvpiz6ck8xkgpypchrq9kgkik0jxd7f3jhihbgldsh4zaqiaq";
 
-  meta = with lib; {
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
     description = "Lightning Network Daemon";
     homepage = "https://github.com/lightningnetwork/lnd";
-    license = lib.licenses.mit;
+    license = licenses.mit;
     maintainers = with maintainers; [ cypherpunk2140 ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 719b78825394..be3efb384686 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23099,6 +23099,7 @@ in
 
   lnd = callPackage ../applications/blockchains/lnd.nix {
     buildGoModule = buildGo112Module;
+    inherit (darwin.apple_sdk.frameworks) Security;
   };
 
   monero = callPackage ../applications/blockchains/monero {

From b85ea945043d903bc125b01face450b426f23dd2 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:41:00 -0500
Subject: [PATCH 3615/4636] mautrix-whatsapp: fix build on darwin

---
 pkgs/servers/mautrix-whatsapp/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix           | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
index 578f125ee2b5..b94eb00547aa 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule {
   pname = "mautrix-whatsapp-unstable";
@@ -13,6 +13,8 @@ buildGoModule {
 
   modSha256 = "0ypj79rjwj5bls6aq2cz0d034dnv1sddl43iz51b4fl2bfv0drm9";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     homepage = https://github.com/tulir/mautrix-whatsapp;
     description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be3efb384686..c36d9404b9c4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4691,7 +4691,9 @@ in
 
   mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { });
 
-  mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { };
+  mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   mcfly = callPackage ../tools/misc/mcfly {
     inherit (darwin.apple_sdk.frameworks) Security;

From 6e973c66a0cfb9257cdc45cc935a1ab18f799107 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:42:00 -0500
Subject: [PATCH 3616/4636] minify: fix build on darwin

---
 pkgs/development/web/minify/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix         | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix
index 3752519d0609..cd602317c70d 100644
--- a/pkgs/development/web/minify/default.nix
+++ b/pkgs/development/web/minify/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, lib }:
+{ buildGoModule, fetchFromGitHub, stdenv, Security }:
 
 buildGoModule rec {
   pname = "minify";
@@ -13,9 +13,11 @@ buildGoModule rec {
 
   modSha256 = "09jk3mxf7n9wf1cgyiw9mhsr55fb12k399dmzhnib3vhd9xav15i";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Minifiers for web formats";
     license = licenses.mit;
     homepage = "https://go.tacodewolff.nl/minify";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c36d9404b9c4..912c0126f8be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10571,7 +10571,9 @@ in
 
   mdl = callPackage ../development/tools/misc/mdl { };
 
-  minify = callPackage ../development/web/minify { };
+  minify = callPackage ../development/web/minify {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   minizinc = callPackage ../development/tools/minizinc { };
   minizincide = qt5.callPackage ../development/tools/minizinc/ide.nix { };

From 1bd77eb9b05d4c524c2ff57293d5bee6b9061c84 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:43:00 -0500
Subject: [PATCH 3617/4636] matterbridge: fix build on darwin

---
 pkgs/servers/matterbridge/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix       | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix
index 556625016f25..2eec5d52bb9c 100644
--- a/pkgs/servers/matterbridge/default.nix
+++ b/pkgs/servers/matterbridge/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchurl }:
+{ stdenv, buildGoModule, fetchurl, Security }:
 
 buildGoModule rec {
   pname = "matterbridge";
@@ -12,6 +12,8 @@ buildGoModule rec {
     sha256 = "15wgjzy9l3xlgih2zb56l4jmval4nhcs42wn9axvz2h7kqfbmw3d";
   };
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     description = "Simple bridge between Mattermost, IRC, XMPP, Gitter, Slack, Discord, Telegram, Rocket.Chat, Hipchat(via xmpp), Matrix and Steam";
     homepage = "https://github.com/42wim/matterbridge";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 912c0126f8be..3135700abb0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15622,7 +15622,9 @@ in
 
   mattermost = callPackage ../servers/mattermost { };
   matterircd = callPackage ../servers/mattermost/matterircd.nix { };
-  matterbridge = callPackage ../servers/matterbridge { };
+  matterbridge = callPackage ../servers/matterbridge {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { };
 

From 5b83d95f2f353b77ced97351d4b3e5324f055007 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:44:00 -0500
Subject: [PATCH 3618/4636] minio-client: fix build on darwin

---
 pkgs/tools/networking/minio-client/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix                | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix
index 885ffbe91579..b8cf93bc2d3f 100644
--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/pkgs/tools/networking/minio-client/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }:
 
 buildGoModule rec {
   pname = "minio-client";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "1qjfsqmcc6i0nixwvdmm3vnnv19yvqaaza096cpdf5rl35knsp5i";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
+
   subPackages = [ "." ];
 
   preBuild = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3135700abb0f..7a1dd558b4c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5177,7 +5177,9 @@ in
 
   minetime = callPackage ../applications/office/minetime { };
 
-  minio-client = callPackage ../tools/networking/minio-client { };
+  minio-client = callPackage ../tools/networking/minio-client {
+    inherit (darwin.apple_sdk.frameworks) CoreServices;
+  };
 
   minissdpd = callPackage ../tools/networking/minissdpd { };
 

From 3c1c304c7a035aa2321577b4ea267107f0bb0fee Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:45:00 -0500
Subject: [PATCH 3619/4636] minio: fix build on darwin

---
 pkgs/servers/minio/default.nix  | 4 +++-
 pkgs/top-level/all-packages.nix | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index 858f8899501d..1fae973066aa 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }:
 
 buildGoModule rec {
   pname = "minio";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "0ikid628v673f7lvp3psk05s3liqlyc3arppg33lfi2cmbaf8hmr";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
+
   subPackages = [ "." ];
 
   buildFlagsArray = [''-ldflags=
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a1dd558b4c0..f2df1d4ef995 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15640,7 +15640,9 @@ in
 
   micronaut = callPackage ../development/tools/micronaut {};
 
-  minio = callPackage ../servers/minio { };
+  minio = callPackage ../servers/minio {
+    inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
+  };
 
   # Backwards compatibility.
   mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd;

From e0757cf88a19c01cd9ac65190ab1c8628a02e70a Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:46:00 -0500
Subject: [PATCH 3620/4636] mkcert: fix build on darwin

---
 pkgs/development/tools/misc/mkcert/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix                | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/development/tools/misc/mkcert/default.nix
index ae0a4a6dfe21..6a114a8de8ba 100644
--- a/pkgs/development/tools/misc/mkcert/default.nix
+++ b/pkgs/development/tools/misc/mkcert/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "mkcert";
@@ -19,7 +19,9 @@ buildGoModule rec {
       -X ${goPackagePath}/main.Version=${version}
   '';
 
-  meta = with lib; {
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
     homepage = https://github.com/FiloSottile/mkcert;
     description = "A simple tool for making locally-trusted development certificates";
     license = licenses.bsd3;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2df1d4ef995..9e9794b8914f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10582,7 +10582,9 @@ in
 
   mk = callPackage ../development/tools/build-managers/mk { };
 
-  mkcert = callPackage ../development/tools/misc/mkcert { };
+  mkcert = callPackage ../development/tools/misc/mkcert {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   mkdocs = callPackage ../development/tools/documentation/mkdocs { };
 

From ee2bda21197134febf9dfaa8eb1d0595ff50a879 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:47:00 -0500
Subject: [PATCH 3621/4636] mod: fix build on darwin

---
 pkgs/development/tools/mod/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix        | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix
index 67b829877b04..cc94692c023a 100644
--- a/pkgs/development/tools/mod/default.nix
+++ b/pkgs/development/tools/mod/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, lib }:
+{ buildGoModule, fetchFromGitHub, stdenv, Security }:
 
 buildGoModule rec {
   pname = "mod";
@@ -13,9 +13,11 @@ buildGoModule rec {
 
   modSha256 = "0x7bdhvam9l23cbdqpna8kwg0v6yhgmw0hlbm48bbhjl27lg7svc";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   subPackages = [ "cmd/mod" ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Automated Semantic Import Versioning Upgrades for Go";
     longDescription = ''
       Command line tool to upgrade/downgrade Semantic Import Versioning in Go
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e9794b8914f..2f772ab3ebb4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -301,7 +301,9 @@ in
 
   run = callPackage ../development/tools/run { };
 
-  mod = callPackage ../development/tools/mod { };
+  mod = callPackage ../development/tools/mod {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   broadlink-cli = callPackage ../tools/misc/broadlink-cli {};
 

From 7d3eb98d6226cf2209691e3e1f45e7c1130e56ef Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:48:00 -0500
Subject: [PATCH 3622/4636] mtail: fix build on darwin

---
 pkgs/servers/monitoring/mtail/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix           | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix
index 64966e183fea..75b58b65a9cc 100644
--- a/pkgs/servers/monitoring/mtail/default.nix
+++ b/pkgs/servers/monitoring/mtail/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildGoModule }:
+{ stdenv, fetchFromGitHub, buildGoModule, Security }:
 
 buildGoModule rec {
   pname = "mtail";
@@ -14,6 +14,8 @@ buildGoModule rec {
   modSha256 = "0h3q1qd9a01wlfkk0yv74a4bk5nilpsppq522cv7kl8ysnrjh5yi";
   subPackages = [ "cmd/mtail" ];
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   preBuild = ''
     go generate -x ./internal/vm/
   '';
@@ -22,7 +24,7 @@ buildGoModule rec {
     "-ldflags=-X main.Version=${version}"
   ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     license = licenses.asl20;
     homepage = "https://github.com/google/mtail";
     description = "Tool for extracting metrics from application logs";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f772ab3ebb4..86bee3c57d57 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4732,7 +4732,9 @@ in
 
   motion = callPackage ../applications/video/motion { };
 
-  mtail = callPackage ../servers/monitoring/mtail { };
+  mtail = callPackage ../servers/monitoring/mtail {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   multitail = callPackage ../tools/misc/multitail { };
 

From b6b516f7cfcdea860e8d09c53c40de5667ecb921 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:49:00 -0500
Subject: [PATCH 3623/4636] todoist: fix build on darwin

---
 pkgs/applications/misc/todoist/default.nix | 10 ++++++----
 pkgs/top-level/all-packages.nix            |  4 +++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/applications/misc/todoist/default.nix
index 74b2b770215c..a625c8340558 100644
--- a/pkgs/applications/misc/todoist/default.nix
+++ b/pkgs/applications/misc/todoist/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "todoist";
@@ -13,10 +13,12 @@ buildGoModule rec {
 
   modSha256 = "1nnp5ijz4n34gc97rar4wlvlbx21ndpjyb2mc6gxdk1wzx3mgswp";
 
-  meta = {
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
     homepage = https://github.com/sachaos/todoist;
     description = "Todoist CLI Client";
-    license = lib.licenses.mit;
-    platforms = lib.platforms.unix;
+    license = licenses.mit;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 86bee3c57d57..1f99bdd8f54e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10935,7 +10935,9 @@ in
 
   tfsec = callPackage ../development/tools/analysis/tfsec { };
 
-  todoist = callPackage ../applications/misc/todoist { };
+  todoist = callPackage ../applications/misc/todoist {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   todoist-electron = callPackage ../applications/misc/todoist-electron { };
 

From dba5b006e205f89dfeff7a884906524edbf63ce2 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:50:00 -0500
Subject: [PATCH 3624/4636] proto-contrib: fix build on darwin

---
 pkgs/development/tools/proto-contrib/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix                  | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/proto-contrib/default.nix b/pkgs/development/tools/proto-contrib/default.nix
index 836683895565..adb0df28ce16 100644
--- a/pkgs/development/tools/proto-contrib/default.nix
+++ b/pkgs/development/tools/proto-contrib/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, lib }:
+{ buildGoModule, fetchFromGitHub, stdenv, Security }:
 
 buildGoModule rec {
   pname = "proto-contrib";
@@ -13,7 +13,9 @@ buildGoModule rec {
 
   modSha256 = "19cqz13jd95d5vibd10420gg69ldgf6afc51mkglhafgmmif56b0";
 
-  meta = with lib; {
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
     description = "Contributed tools and other packages on top of the Go proto package";
     homepage = https://github.com/emicklei/proto-contrib;
     license = licenses.mit;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f99bdd8f54e..ba42d16c9285 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -177,7 +177,9 @@ in
 
   hobbes = callPackage ../development/tools/hobbes { stdenv = gcc6Stdenv; }; # GCC 6 is latest currently supported. See https://git.io/JvK6M.
 
-  proto-contrib = callPackage ../development/tools/proto-contrib {};
+  proto-contrib = callPackage ../development/tools/proto-contrib {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {};
 

From ce9ac410171bb99c2a951fac264d2c06551cf6c8 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:51:00 -0500
Subject: [PATCH 3625/4636] protoc-gen-doc: fix build on darwin

---
 pkgs/development/tools/protoc-gen-doc/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix                   | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/protoc-gen-doc/default.nix b/pkgs/development/tools/protoc-gen-doc/default.nix
index 77c1df6f43e3..c25b2d56fe63 100644
--- a/pkgs/development/tools/protoc-gen-doc/default.nix
+++ b/pkgs/development/tools/protoc-gen-doc/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, lib }:
+{ buildGoModule, fetchFromGitHub, stdenv, Security }:
 
 buildGoModule {
   pname = "protoc-gen-doc-unstable";
@@ -13,7 +13,9 @@ buildGoModule {
 
   modSha256 = "1952ycdkgl00q2s3qmhislhhim15nn6nmlkwbfdvrsfzznqj47rd";
 
-  meta = with lib; {
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
     description = "Documentation generator plugin for Google Protocol Buffers";
     longDescription = ''
       This is a documentation generator plugin for the Google Protocol Buffers
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba42d16c9285..0e6aaa5292bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -181,7 +181,9 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {};
+  protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   demoit = callPackage ../servers/demoit { };
 

From 0acc5e11b2bf0550261b11555ded92f7c7171f0c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:52:00 -0500
Subject: [PATCH 3626/4636] wtf: fix build on darwin

---
 pkgs/applications/misc/wtf/default.nix | 7 +++++--
 pkgs/top-level/all-packages.nix        | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix
index f12f96871c00..8c34baba5828 100644
--- a/pkgs/applications/misc/wtf/default.nix
+++ b/pkgs/applications/misc/wtf/default.nix
@@ -1,8 +1,9 @@
 { buildGoModule
 , fetchFromGitHub
-, lib
+, stdenv
 , makeWrapper
 , ncurses
+, Security
 }:
 
 buildGoModule rec {
@@ -24,12 +25,14 @@ buildGoModule rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   postInstall = ''
     mv "$out/bin/wtf" "$out/bin/wtfutil"
     wrapProgram "$out/bin/wtfutil" --prefix PATH : "${ncurses.dev}/bin"
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "The personal information dashboard for your terminal";
     homepage = "https://wtfutil.com/";
     license = licenses.mpl20;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e6aaa5292bf..5d17c9b3b688 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26246,7 +26246,9 @@ in
 
   zimg = callPackage ../development/libraries/zimg { };
 
-  wtf = callPackage ../applications/misc/wtf { };
+  wtf = callPackage ../applications/misc/wtf {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   zk-shell = callPackage ../applications/misc/zk-shell { };
 

From fda0e24e5879b0cf4fb4ce54dda615f474a1c52f Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:53:00 -0500
Subject: [PATCH 3627/4636] websocketd: fix build on darwin

---
 pkgs/applications/networking/websocketd/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix                     | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/websocketd/default.nix b/pkgs/applications/networking/websocketd/default.nix
index 4160e70b9c44..8d0e92488dbb 100644
--- a/pkgs/applications/networking/websocketd/default.nix
+++ b/pkgs/applications/networking/websocketd/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "websocketd";
@@ -13,7 +13,9 @@ buildGoModule rec {
 
   modSha256 = "18hamj557ln8k3vmvcrpvnydjr1dy7zi9490iacwdldw5vp870xs";
 
-  meta = with lib; {
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
     description = "Turn any program that uses STDIN/STDOUT into a WebSocket server";
     homepage = "http://websocketd.com/";
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d17c9b3b688..80ac7745bb48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26026,7 +26026,9 @@ in
 
   webfs = callPackage ../servers/http/webfs { };
 
-  websocketd = callPackage ../applications/networking/websocketd { };
+  websocketd = callPackage ../applications/networking/websocketd {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   wikicurses = callPackage ../applications/misc/wikicurses {
     pythonPackages = python3Packages;

From 42b14764abe9f68ad318657741cadb42a3db4bd9 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:54:00 -0500
Subject: [PATCH 3628/4636] pet: fix build on darwin

---
 pkgs/development/tools/pet/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix        | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix
index e7f4fce3c4d4..f1096e479a78 100644
--- a/pkgs/development/tools/pet/default.nix
+++ b/pkgs/development/tools/pet/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, lib }:
+{ buildGoModule, fetchFromGitHub, stdenv, Security }:
 
 buildGoModule rec {
   pname = "pet";
@@ -13,9 +13,11 @@ buildGoModule rec {
 
   modSha256 = "06ham8lsx5c1vk5jkwp1aa9g4q4g7sfq7gxz2gkffa98x2vlawyf";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   subPackages = [ "." ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Simple command-line snippet manager, written in Go";
     homepage = https://github.com/knqyf263/pet;
     license = licenses.mit;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 80ac7745bb48..0b5fe53b838b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -301,7 +301,9 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  pet = callPackage ../development/tools/pet { };
+  pet = callPackage ../development/tools/pet {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   run = callPackage ../development/tools/run { };
 

From f3c3ecae33c4c4914e91c6df1170de58c7968a47 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:55:00 -0500
Subject: [PATCH 3629/4636] prototol: fix build on darwin

---
 pkgs/development/tools/prototool/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix              | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/prototool/default.nix b/pkgs/development/tools/prototool/default.nix
index 37b0f1fdf8db..15a854e4d86c 100644
--- a/pkgs/development/tools/prototool/default.nix
+++ b/pkgs/development/tools/prototool/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub, makeWrapper, protobuf }:
+{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, protobuf, Security }:
 
 buildGoModule rec {
   pname = "prototool";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   modSha256 = "1gc8kc9mbi3mlh48zx4lcgpsrf8z879f1qj9wfyr66s7wd1ljazg";
 
   postInstall = ''
@@ -23,7 +25,7 @@ buildGoModule rec {
 
   subPackages = [ "cmd/prototool" ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/uber/prototool";
     description = "Your Swiss Army Knife for Protocol Buffers";
     maintainers = [ maintainers.marsam ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b5fe53b838b..5ce565c0081f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17359,7 +17359,9 @@ in
 
   procdump = callPackage ../os-specific/linux/procdump { };
 
-  prototool = callPackage ../development/tools/prototool { };
+  prototool = callPackage ../development/tools/prototool {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; });
 

From 0c25c3fd13ae8c35068e64d191db4f0d6e7a474c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:56:00 -0500
Subject: [PATCH 3630/4636] mutagen: fix build on darwin

---
 pkgs/tools/misc/mutagen/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix     | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix
index 8940fef2a0dd..c029f38acb2c 100644
--- a/pkgs/tools/misc/mutagen/default.nix
+++ b/pkgs/tools/misc/mutagen/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }:
 
 buildGoModule rec {
   pname = "mutagen";
@@ -13,9 +13,11 @@ buildGoModule rec {
 
   modSha256 = "1r6b4y6civk75if6nljl66pgv5qm7x05qqby1anf7s7cz7d1rc3g";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
+
   subPackages = [ "cmd/mutagen" "cmd/mutagen-agent" ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Make remote development work with your local tools";
     homepage = "https://mutagen.io/";
     changelog = "https://github.com/mutagen-io/mutagen/releases/tag/v${version}";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ce565c0081f..f4a8ee9b1a72 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5308,7 +5308,9 @@ in
 
   munt = libsForQt5.callPackage ../applications/audio/munt { };
 
-  mutagen = callPackage ../tools/misc/mutagen { };
+  mutagen = callPackage ../tools/misc/mutagen {
+    inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
+  };
 
   mycli = callPackage ../tools/admin/mycli { };
 

From 4bf3a0de2e6c6f5bf44119a27a1e67b8f92514e3 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:57:00 -0500
Subject: [PATCH 3631/4636] pgcenter: fix build on darwin

---
 pkgs/tools/misc/pgcenter/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix      | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/pgcenter/default.nix b/pkgs/tools/misc/pgcenter/default.nix
index 7cb810b2fe2d..9eed1aaffd8e 100644
--- a/pkgs/tools/misc/pgcenter/default.nix
+++ b/pkgs/tools/misc/pgcenter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "pgcenter";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "0kassq52v07zmffs6l066g0d3kfv6wmrh9g5cgk79bmyq13clqjj";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     homepage = https://pgcenter.org/;
     description = "Command-line admin tool for observing and troubleshooting PostgreSQL";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f4a8ee9b1a72..e111be6f045f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5911,7 +5911,9 @@ in
 
   pg_top = callPackage ../tools/misc/pg_top { };
 
-  pgcenter = callPackage ../tools/misc/pgcenter { };
+  pgcenter = callPackage ../tools/misc/pgcenter {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   pgmetrics = callPackage ../tools/misc/pgmetrics { };
 

From b11d54582d467072ff911ee3ceb36672f3c4aae5 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:58:00 -0500
Subject: [PATCH 3632/4636] pgmetrics: fix build on darwin

---
 pkgs/tools/misc/pgmetrics/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix       | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix
index b702ffc1703d..04e106ca5522 100644
--- a/pkgs/tools/misc/pgmetrics/default.nix
+++ b/pkgs/tools/misc/pgmetrics/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "pgmetrics";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "0h375zk0ik06g0b5vmi00b1wn5q2c0r137f7qf6l8k8p886x41h6";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e111be6f045f..54a0fd586bbf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5915,7 +5915,9 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  pgmetrics = callPackage ../tools/misc/pgmetrics { };
+  pgmetrics = callPackage ../tools/misc/pgmetrics {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   pdsh = callPackage ../tools/networking/pdsh {
     rsh = true;          # enable internal rsh implementation

From 7a84da8ac8a1931d9f2e59dec8dc09ef3f302759 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:59:00 -0500
Subject: [PATCH 3633/4636] shiori: fix build on darwin

---
 pkgs/servers/web-apps/shiori/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix          | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/shiori/default.nix b/pkgs/servers/web-apps/shiori/default.nix
index dd4cdc08287b..bd17f2f267c6 100644
--- a/pkgs/servers/web-apps/shiori/default.nix
+++ b/pkgs/servers/web-apps/shiori/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "shiori";
@@ -13,6 +13,8 @@ buildGoModule rec {
     sha256 = "13and7gh2882khqppwz3wwq44p7az4bfdfjvlnqcpqyi8xa28pmq";
   };
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     description = "Simple bookmark manager built with Go";
     homepage = "https://github.com/go-shiori/shiori";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 54a0fd586bbf..6694cdee6fbf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16210,7 +16210,9 @@ in
 
   shaarli-material = callPackage ../servers/web-apps/shaarli/material-theme.nix { };
 
-  shiori = callPackage ../servers/web-apps/shiori { };
+  shiori = callPackage ../servers/web-apps/shiori {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   inherit (callPackages ../servers/web-apps/matomo {})
     matomo

From 622494d85d9e309e9e65ff62d5c48221f1e92f59 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:00:00 -0500
Subject: [PATCH 3634/4636] helmfile: fix build on darwin

---
 .../networking/cluster/helmfile/default.nix   | 22 +++++++++----------
 pkgs/top-level/all-packages.nix               |  4 +++-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index ee7c4ab9cbdd..2de07e9fdc7d 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -1,10 +1,8 @@
-{ lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }:
+{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, Security }:
 
-let version = "0.102.0"; in
-
-buildGoModule {
+buildGoModule rec {
   pname = "helmfile";
-  inherit version;
+  version = "0.102.0";
 
   src = fetchFromGitHub {
     owner = "roboll";
@@ -13,12 +11,12 @@ buildGoModule {
     sha256 = "0v7mhsnhswiqd62wrmkcpzsg9nfi6wvkh9danngs5rqjiz1zffhy";
   };
 
-  goPackagePath = "github.com/roboll/helmfile";
-
   modSha256 = "0s7j7jbgr8gdc0s9dnl6zjwkpywqj05xyb7mkcank54kgrz0g5vq";
 
   nativeBuildInputs = [ makeWrapper ];
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   buildFlagsArray = ''
     -ldflags=
     -X main.Version=${version}
@@ -26,14 +24,14 @@ buildGoModule {
 
   postInstall = ''
     wrapProgram $out/bin/helmfile \
-      --prefix PATH : ${lib.makeBinPath [ kubernetes-helm ]}
+      --prefix PATH : ${stdenv.lib.makeBinPath [ kubernetes-helm ]}
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Deploy Kubernetes Helm charts";
     homepage = "https://github.com/roboll/helmfile";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ pneumaticat yurrriq ];
-    platforms = lib.platforms.unix;
+    license = licenses.mit;
+    maintainers = with maintainers; [ pneumaticat yurrriq ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6694cdee6fbf..d31e25ba1d28 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25323,7 +25323,9 @@ in
     stdenv = gcc8Stdenv;
   };
 
-  helmfile = callPackage ../applications/networking/cluster/helmfile { };
+  helmfile = callPackage ../applications/networking/cluster/helmfile {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   heptio-ark = callPackage ../applications/networking/cluster/heptio-ark { };
 

From 37087c1550d7afdfdf37b212ad59dc4481b6fef7 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:01:00 -0500
Subject: [PATCH 3635/4636] prow: fix build on darwin

---
 pkgs/applications/networking/cluster/prow/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix                       | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/prow/default.nix b/pkgs/applications/networking/cluster/prow/default.nix
index 1c802802c096..e3eb24b23746 100644
--- a/pkgs/applications/networking/cluster/prow/default.nix
+++ b/pkgs/applications/networking/cluster/prow/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, lib }:
+{ buildGoModule, fetchFromGitHub, stdenv, Security }:
 
 buildGoModule rec {
   pname = "prow-unstable";
@@ -20,6 +20,8 @@ buildGoModule rec {
 
   modSha256 = "06q1zvhm78k64aj475k1xl38h7nk83mysd0bja0wknja048ymgsq";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   subPackages = [
     "./prow/cmd/admission"
     "./prow/cmd/artifact-uploader"
@@ -54,7 +56,7 @@ buildGoModule rec {
     "./prow/cmd/tot"
   ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Prow is a Kubernetes based CI/CD system";
     longDescription = ''
       Prow is a Kubernetes based CI/CD system. Jobs can be triggered by various
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d31e25ba1d28..3b1c426d6598 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25901,6 +25901,7 @@ in
     # Version 2019-08-14 fails to build with go 1.13 due to dependencies:
     #   go: golang.org/x/lint@v0.0.0-20190301231843-5614ed5bae6f used for two different module paths (github.com/golang/lint and golang.org/x/lint)
     buildGoModule = buildGo112Module;
+    inherit (darwin.apple_sdk.frameworks) Security;
   };
 
   inherit (callPackage ../applications/networking/cluster/terraform {

From 771cf05ac6d8373c4246b197a76c8d366207b901 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:02:00 -0500
Subject: [PATCH 3636/4636] qbec: fix build on darwin

---
 pkgs/applications/networking/cluster/qbec/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix                       | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix
index 4a8b2a2e6648..4e475320a613 100644
--- a/pkgs/applications/networking/cluster/qbec/default.nix
+++ b/pkgs/applications/networking/cluster/qbec/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "qbec";
@@ -13,7 +13,9 @@ buildGoModule rec {
 
   modSha256 = "165zqmannlylkzaz9gkmcrlyx8rfhz70ahzhiks4ycgq1qxr0av9";
 
-  meta = with lib; {
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
     description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io";
     homepage = "https://github.com/splunk/qbec";
     license = licenses.asl20;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b1c426d6598..02d28e969acb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20950,7 +20950,9 @@ in
 
   ptex = callPackage ../development/libraries/ptex {};
 
-  qbec = callPackage ../applications/networking/cluster/qbec { };
+  qbec = callPackage ../applications/networking/cluster/qbec {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { };
 

From 83b6e5b565f1ca3502ef7258a76d325539a45e13 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:03:00 -0500
Subject: [PATCH 3637/4636] shadowfox: fix build on darwin

---
 pkgs/tools/networking/shadowfox/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix             | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix
index f2ae143e1b9e..37d5edaec452 100644
--- a/pkgs/tools/networking/shadowfox/default.nix
+++ b/pkgs/tools/networking/shadowfox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule }:
+{ stdenv, fetchFromGitHub, buildGoModule, Security }:
 
 buildGoModule rec {
   pname = "shadowfox";
@@ -11,10 +11,10 @@ buildGoModule rec {
     sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6";
   };
 
-  goPackagePath = "github.com/SrKomodo/shadowfox-updater";
-
   modSha256 = "0hcc87mzacqwbw10l49kx0sxl4mivdr88c40wh6hdfvrbam2w86r";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   buildFlags = [ "--tags" "release" ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 02d28e969acb..8146516d4ea5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21741,7 +21741,9 @@ in
 
   sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { };
 
-  shadowfox = callPackage ../tools/networking/shadowfox { };
+  shadowfox = callPackage ../tools/networking/shadowfox {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   shfmt = callPackage ../tools/text/shfmt { };
 

From 1565aabb5e18e8c6558f1b863ac3f22598e7e7d2 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:04:00 -0500
Subject: [PATCH 3638/4636] nebula: fix build on darwin

---
 pkgs/tools/networking/nebula/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix          | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix
index 3411aca55519..f78d7129c34a 100644
--- a/pkgs/tools/networking/nebula/default.nix
+++ b/pkgs/tools/networking/nebula/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "nebula";
@@ -13,11 +13,13 @@ buildGoModule rec {
 
   modSha256 = "1sy5mnwn9fxjf3y41lm8gsggid2c0y08iw88m9ng8psaf4qid8ij";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   subPackages = [ "cmd/nebula" "cmd/nebula-cert" ];
 
   buildFlagsArray = [ "-ldflags='-X main.Build=${version}'" ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "A scalable overlay networking tool with a focus on performance, simplicity and security";
     longDescription = ''
       Nebula is a scalable overlay networking tool with a focus on performance,
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8146516d4ea5..9b6aa9636ef3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5348,7 +5348,9 @@ in
 
   ndppd = callPackage ../applications/networking/ndppd { };
 
-  nebula = callPackage ../tools/networking/nebula { };
+  nebula = callPackage ../tools/networking/nebula {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   nemiver = callPackage ../development/tools/nemiver { };
 

From dc689861429aeeab9c0757c29971c4eeb92aefce Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:05:00 -0500
Subject: [PATCH 3639/4636] obfs4: fix build on darwin

---
 pkgs/tools/networking/obfs4/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix         | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/tools/networking/obfs4/default.nix
index 005abb0968b6..93ebdeb0720c 100644
--- a/pkgs/tools/networking/obfs4/default.nix
+++ b/pkgs/tools/networking/obfs4/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchgit, buildGoModule }:
+{ stdenv, fetchgit, buildGoModule, Security }:
 
 buildGoModule rec {
   pname = "obfs4";
@@ -12,7 +12,9 @@ buildGoModule rec {
 
   modSha256 = "150kg22kznrdj5icjxk3qd70g7wpq8zd2zklw1y2fgvrggw8zvyv";
 
-  meta = with lib; {
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
     description = "A pluggable transport proxy";
     homepage = https://www.torproject.org/projects/obfsproxy;
     repositories.git = https://git.torproject.org/pluggable-transports/obfs4.git;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b6aa9636ef3..7200320ff7df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5575,7 +5575,9 @@ in
 
   obexd = callPackage ../tools/bluetooth/obexd { };
 
-  obfs4 = callPackage ../tools/networking/obfs4 { };
+  obfs4 = callPackage ../tools/networking/obfs4 {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   oci-image-tool = callPackage ../tools/misc/oci-image-tool { };
 

From 4340337ea522786c5f9468e093beb3fac0777d83 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:06:00 -0500
Subject: [PATCH 3640/4636] saml2aws: fix build on darwin

---
 pkgs/tools/security/saml2aws/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix          | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix
index 011747890818..811b95d25245 100644
--- a/pkgs/tools/security/saml2aws/default.nix
+++ b/pkgs/tools/security/saml2aws/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, libobjc, Foundation, IOKit }:
 
 buildGoModule rec {
   pname = "saml2aws";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "0qxf2i06spjig3ynixh3xmbxpghh222jhfqcg71i4i79x4ycp5wx";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc Foundation IOKit ];
+
   subPackages = [ "." "cmd/saml2aws" ];
 
   buildFlagsArray = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7200320ff7df..6ec2b754743e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6457,7 +6457,10 @@ in
 
   samim-fonts = callPackage ../data/fonts/samim-fonts {};
 
-  saml2aws = callPackage ../tools/security/saml2aws {};
+  saml2aws = callPackage ../tools/security/saml2aws {
+    inherit (darwin) libobjc;
+    inherit (darwin.apple_sdk.frameworks) Foundation IOKit;
+  };
 
   samplicator = callPackage ../tools/networking/samplicator { };
 

From f729bd752f1c4e493fa60d5f035d0c3072ca7e61 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:07:00 -0500
Subject: [PATCH 3641/4636] tendermint: fix build on darwin

---
 pkgs/tools/networking/tendermint/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix              | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix
index 0b9c254deeb4..91378757af1d 100644
--- a/pkgs/tools/networking/tendermint/default.nix
+++ b/pkgs/tools/networking/tendermint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule }:
+{ stdenv, fetchFromGitHub, buildGoModule, Security }:
 
 buildGoModule rec {
   pname = "tendermint";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "1h51zgvjq3bm09yhm54rk8a86cqa1zma3mx6pb0kq7k72xvhpx0a";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short.";
     homepage = https://tendermint.com/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ec2b754743e..409df09a56b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22127,6 +22127,7 @@ in
 
   tendermint = callPackage ../tools/networking/tendermint {
     buildGoModule = buildGo112Module;
+    inherit (darwin.apple_sdk.frameworks) Security;
   };
 
   termdown = (newScope pythonPackages) ../applications/misc/termdown { };

From 2d271bdd4cc8767304111a5a5a1b626d37292681 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:08:00 -0500
Subject: [PATCH 3642/4636] sops: fix build on darwin

---
 pkgs/tools/security/sops/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix      | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix
index 8aa2e219e7df..d028b9787dba 100644
--- a/pkgs/tools/security/sops/default.nix
+++ b/pkgs/tools/security/sops/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }:
 
 buildGoModule rec {
   pname = "sops";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "0vhxd3dschj5i9sig6vpxzbl59cas1qa843akzmjnfjrrafb916y";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
+
   meta = with stdenv.lib; {
     homepage = "https://github.com/mozilla/sops";
     description = "Mozilla sops (Secrets OPerationS) is an editor of encrypted files";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 409df09a56b6..406587f7fec3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21782,7 +21782,9 @@ in
 
   sooperlooper = callPackage ../applications/audio/sooperlooper { };
 
-  sops = callPackage ../tools/security/sops { };
+  sops = callPackage ../tools/security/sops {
+    inherit (darwin.apple_sdk.frameworks) CoreServices;
+  };
 
   sorcer = callPackage ../applications/audio/sorcer { };
 

From 28a71c8f5974314b976c4699a3c6c7a933fb3ca9 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:09:00 -0500
Subject: [PATCH 3643/4636] yggdrasil: fix build on darwin

---
 pkgs/tools/networking/yggdrasil/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix             | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix
index 3bf3b97c2355..605801b6ab73 100644
--- a/pkgs/tools/networking/yggdrasil/default.nix
+++ b/pkgs/tools/networking/yggdrasil/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Foundation }:
 
 buildGoModule rec {
   pname = "yggdrasil";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "057yl3i29kwpd129aa2rb67s5rmz898fi2a7lxv3nfjp7018s9qw";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Foundation ];
+
   # Change the default location of the management socket on Linux
   # systems so that the yggdrasil system service unit does not have to
   # be granted write permission to /run.
@@ -27,7 +29,7 @@ buildGoModule rec {
       -s -w
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description =
       "An experiment in scalable routing as an encrypted IPv6 overlay network";
     homepage = "https://yggdrasil-network.github.io/";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 406587f7fec3..1246ee888463 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7757,7 +7757,9 @@ in
     inherit (darwin.apple_sdk.frameworks) IOKit;
   };
 
-  yggdrasil = callPackage ../tools/networking/yggdrasil { };
+  yggdrasil = callPackage ../tools/networking/yggdrasil {
+    inherit (darwin.apple_sdk.frameworks) Foundation;
+  };
 
   # To expose more packages for Yi, override the extraPackages arg.
   yi = callPackage ../applications/editors/yi/wrapper.nix { };

From 17eed5e575b6273c8b0a1f69dbe9378ce03436f5 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:10:00 -0500
Subject: [PATCH 3644/4636] flyctl: fix build on darwin

---
 pkgs/development/web/flyctl/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix         | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
index 85165d501d97..05f07fd02608 100644
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, lib }:
+{ buildGoModule, fetchFromGitHub, stdenv, Security }:
 
 buildGoModule rec {
   pname = "flyctl";
@@ -11,6 +11,8 @@ buildGoModule rec {
     sha256 = "181j248i8j9g7kz5krg0bkbxkvmcwpz2vlknii5q3dy7yhgg19h3";
   };
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   preBuild = ''
     go generate ./...
   '';
@@ -22,7 +24,7 @@ buildGoModule rec {
 
   modSha256 = "1mqkc7hnavvpbqar9f1d2vnm47p4car9abnk2ikyf27jr5glwmsd";
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Command line tools for fly.io services";
     homepage = "https://fly.io/";
     license = licenses.asl20;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1246ee888463..010557e8b8dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8156,7 +8156,9 @@ in
   };
   fasm-bin = callPackage ../development/compilers/fasm/bin.nix { };
 
-  flyctl = callPackage ../development/web/flyctl { };
+  flyctl = callPackage ../development/web/flyctl {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   fpc = callPackage ../development/compilers/fpc { };
 

From 306bc84748639db0b87694b54475a15647093c24 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:11:00 -0500
Subject: [PATCH 3645/4636] gotify-server: fix build on darwin

---
 pkgs/servers/gotify/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix
index f2014aac9fdc..275aaa5d68bc 100644
--- a/pkgs/servers/gotify/default.nix
+++ b/pkgs/servers/gotify/default.nix
@@ -1,11 +1,11 @@
 { stdenv
 , buildGoPackage
-, lib
 , fetchFromGitHub
 , buildGoModule
 , packr
 , sqlite
 , callPackage
+, Security
 }:
 
 buildGoModule rec {
@@ -28,7 +28,8 @@ buildGoModule rec {
       --replace 'Version = "unknown"' 'Version = "${version}"'
   '';
 
-  buildInputs = [ sqlite ];
+  buildInputs = [ sqlite ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
   nativeBuildInputs = [ packr ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 010557e8b8dc..c9c21acfac43 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10405,7 +10405,9 @@ in
 
   gocd-server = callPackage ../development/tools/continuous-integration/gocd-server { };
 
-  gotify-server = callPackage ../servers/gotify { };
+  gotify-server = callPackage ../servers/gotify {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   gotty = callPackage ../servers/gotty { };
 

From d7d95111bd41a2501650134ce8f4404f8f34cde5 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:12:00 -0500
Subject: [PATCH 3646/4636] zsh-history: fix build on darwin

---
 pkgs/shells/zsh/zsh-history/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix         | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix
index ece3c87cb664..382b76916d31 100644
--- a/pkgs/shells/zsh/zsh-history/default.nix
+++ b/pkgs/shells/zsh/zsh-history/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildGoModule, installShellFiles, nixosTests }:
+{ stdenv, fetchFromGitHub, buildGoModule, installShellFiles, nixosTests, Security }:
 
 buildGoModule rec {
   pname = "zsh-history";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   modSha256 = "0f10b86gyn7m7lw43c8y1m30mdg0i092a319v3cb2qj05jb9vn42";
   goPackagePath = "github.com/b4b4r07/history";
 
@@ -22,7 +24,7 @@ buildGoModule rec {
     installShellCompletion --zsh --name _history $out/share/zsh/completions/_history
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "A CLI to provide enhanced history for your ZSH shell";
     license = licenses.mit;
     homepage = https://github.com/b4b4r07/history;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9c21acfac43..2edf6d606115 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7810,7 +7810,9 @@ in
 
   zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { };
 
-  zsh-history = callPackage ../shells/zsh/zsh-history { };
+  zsh-history = callPackage ../shells/zsh/zsh-history {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   zsh-history-substring-search = callPackage ../shells/zsh/zsh-history-substring-search { };
 

From 5ba00362714be0b22a21f08ba182fb7f6d8bc427 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:13:00 -0500
Subject: [PATCH 3647/4636] reviewdog: fix build on darwin

---
 pkgs/development/tools/misc/reviewdog/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix                   | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix
index 9af294716ff3..aecd373f09e9 100644
--- a/pkgs/development/tools/misc/reviewdog/default.nix
+++ b/pkgs/development/tools/misc/reviewdog/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "reviewdog";
@@ -13,11 +13,13 @@ buildGoModule rec {
 
   modSha256 = "1jf08g0xr4wknh9x15igq73y02cy2faqjdjs2v842ii4p3n4p9dw";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   subPackages = [ "cmd/reviewdog" ];
 
   buildFlagsArray = [ "-ldflags=-s -w -X github.com/reviewdog/reviewdog/commands.Version=${version}" ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Automated code review tool integrated with any code analysis tools regardless of programming language";
     homepage = "https://github.com/reviewdog/reviewdog";
     changelog = "https://github.com/reviewdog/reviewdog/releases/tag/v${version}";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2edf6d606115..f914e853854f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10795,7 +10795,9 @@ in
     withPEPatterns = true;
   };
 
-  reviewdog = callPackage ../development/tools/misc/reviewdog { };
+  reviewdog = callPackage ../development/tools/misc/reviewdog {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   rman = callPackage ../development/tools/misc/rman { };
 

From 8b8dff4cc92fa3f3999e2f1fc70f1404d4208516 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:14:00 -0500
Subject: [PATCH 3648/4636] jx: fix build on darwin

---
 pkgs/applications/networking/cluster/jx/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix                     | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix
index 88aa8777ee5e..f817a68ced19 100644
--- a/pkgs/applications/networking/cluster/jx/default.nix
+++ b/pkgs/applications/networking/cluster/jx/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, lib }:
+{ buildGoModule, fetchFromGitHub, stdenv, Security }:
 
 buildGoModule rec {
   name = "jx";
@@ -16,6 +16,8 @@ buildGoModule rec {
     ./3321-fix-location-of-thrift.patch
   ];
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   modSha256 = "0ljf0c0c3pc12nmhdbrwflcaj6hs8igzjw5hi6fyhi6n9cy87vac";
 
   subPackages = [ "cmd/jx" ];
@@ -26,7 +28,7 @@ buildGoModule rec {
     -X github.com/jenkins-x/jx/pkg/version.Revision=${version}
   '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "JX is a command line tool for installing and using Jenkins X.";
     homepage = https://jenkins-x.io;
     longDescription = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f914e853854f..fbd343be6dd8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25919,7 +25919,9 @@ in
 
   sqsh = callPackage ../development/tools/sqsh { };
 
-  jx = callPackage ../applications/networking/cluster/jx {};
+  jx = callPackage ../applications/networking/cluster/jx {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   prow = callPackage ../applications/networking/cluster/prow {
     # Version 2019-08-14 fails to build with go 1.13 due to dependencies:

From e55240ee9acae1afd315149f42fc7217eddd0777 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:15:00 -0500
Subject: [PATCH 3649/4636] terracognita: fix build on darwin

---
 pkgs/development/tools/misc/terracognita/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix                      | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix
index 26aa50f7f7a1..67e8df9561ff 100644
--- a/pkgs/development/tools/misc/terracognita/default.nix
+++ b/pkgs/development/tools/misc/terracognita/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "terracognita";
@@ -13,11 +13,13 @@ buildGoModule rec {
 
   modSha256 = "0xlhp8pa5g6an10m56g237pixc4h6ay89hkp1ijdz45iyfn9fk91";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   subPackages = [ "." ];
 
   buildFlagsArray = [ "-ldflags=-s -w -X github.com/cycloidio/terracognita/cmd.Version=${version}" ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Reads from existing Cloud Providers (reverse Terraform) and generates your infrastructure as code on Terraform configuration";
     homepage = "https://github.com/cycloidio/terracognita";
     license = licenses.mit;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fbd343be6dd8..c15abe9e7bca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10939,7 +10939,9 @@ in
 
   teensy-loader-cli = callPackage ../development/tools/misc/teensy-loader-cli { };
 
-  terracognita = callPackage ../development/tools/misc/terracognita { };
+  terracognita = callPackage ../development/tools/misc/terracognita {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { };
 

From 074703a553289cd0f9ec414bdd645e61ab64b670 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:16:00 -0500
Subject: [PATCH 3650/4636] tflint: fix build on darwin

---
 pkgs/development/tools/analysis/tflint/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix                    | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix
index 8f370d2e0aa1..475ff662b85a 100644
--- a/pkgs/development/tools/analysis/tflint/default.nix
+++ b/pkgs/development/tools/analysis/tflint/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "tflint";
@@ -13,9 +13,11 @@ buildGoModule rec {
 
   modSha256 = "1jbnsqa0ga372lhbgfnqvx8pdzrm0b2phzzwll4sgd0k1hzv2aqv";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   subPackages = [ "." ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "Terraform linter focused on possible errors, best practices, and so on";
     homepage = "https://github.com/terraform-linters/tflint";
     changelog = "https://github.com/terraform-linters/tflint/releases/tag/v${version}";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c15abe9e7bca..c3ee99f15a26 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10962,7 +10962,9 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  tflint = callPackage ../development/tools/analysis/tflint { };
+  tflint = callPackage ../development/tools/analysis/tflint {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   tfsec = callPackage ../development/tools/analysis/tfsec { };
 

From 4e9e877ca3a3abac92f63ede7f8d91ad547f007e Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:17:00 -0500
Subject: [PATCH 3651/4636] minikube: fix build on darwin

---
 pkgs/applications/networking/cluster/minikube/default.nix | 6 +++++-
 pkgs/top-level/all-packages.nix                           | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index f49f1768ced4..ebd78424f4af 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -6,6 +6,10 @@
 , go-bindata
 , libvirt
 , vmnet
+, xpc
+, libobjc
+, Foundation
+, IOKit
 }:
 
 buildGoModule rec {
@@ -27,7 +31,7 @@ buildGoModule rec {
 
   nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ];
   buildInputs = stdenv.lib.optionals stdenv.isLinux [ libvirt ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ vmnet ];
+    ++ stdenv.lib.optionals stdenv.isDarwin [ vmnet xpc libobjc IOKit Foundation ];
 
   preBuild = ''
     go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets deploy/addons/...
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c3ee99f15a26..a13eafe10a96 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20680,7 +20680,9 @@ in
   minidjvu = callPackage ../applications/graphics/minidjvu { };
 
   minikube = callPackage ../applications/networking/cluster/minikube {
-    inherit (darwin.apple_sdk.frameworks) vmnet;
+    inherit (darwin) libobjc;
+    inherit (darwin.apple_sdk.libs) xpc;
+    inherit (darwin.apple_sdk.frameworks) vmnet Foundation IOKit;
   };
 
   minishift = callPackage ../applications/networking/cluster/minishift { };

From 7c096126c7228232f31b4333720a5e10f74c0e05 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:18:00 -0500
Subject: [PATCH 3652/4636] termshark: fix build on darwin

---
 pkgs/tools/networking/termshark/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix             | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/tools/networking/termshark/default.nix
index 35b92e0f653b..a24ff25ef2ba 100644
--- a/pkgs/tools/networking/termshark/default.nix
+++ b/pkgs/tools/networking/termshark/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli }:
+{ stdenv, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli, Security }:
 
 buildGoModule rec {
   pname = "termshark";
@@ -12,7 +12,8 @@ buildGoModule rec {
   };
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ wireshark-cli ];
+  buildInputs = [ wireshark-cli ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
   modSha256 = "0lp4gky76di7as78421p3lsirfr7mic3z204ildvj6gf6d15svpr";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a13eafe10a96..b78936af0f1e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19527,7 +19527,9 @@ in
 
   sngrep = callPackage ../applications/networking/sniffers/sngrep {};
 
-  termshark = callPackage ../tools/networking/termshark { };
+  termshark = callPackage ../tools/networking/termshark {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   fbida = callPackage ../applications/graphics/fbida { };
 

From c70cc016d7d4c52be1f401bad876cc773a0d6470 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:19:00 -0500
Subject: [PATCH 3653/4636] mynewt-newt: fix build on darwin

---
 pkgs/tools/package-management/mynewt-newt/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix                       | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix
index b40257d42f4b..6afba001e08d 100644
--- a/pkgs/tools/package-management/mynewt-newt/default.nix
+++ b/pkgs/tools/package-management/mynewt-newt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch }:
+{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch, Security }:
 
 buildGoModule rec {
   pname = "mynewt-newt";
@@ -24,6 +24,8 @@ buildGoModule rec {
 
   modSha256 = "068r8wa2pgd68jv50x0l1w8n96f97b3mgv7z6f85280ahgywaasq";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     homepage = https://mynewt.apache.org/;
     description = "Build and package management tool for embedded development.";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b78936af0f1e..0cd55f652f79 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25460,7 +25460,9 @@ in
 
   musly = callPackage ../applications/audio/musly { };
 
-  mynewt-newt = callPackage ../tools/package-management/mynewt-newt { };
+  mynewt-newt = callPackage ../tools/package-management/mynewt-newt {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   inherit (callPackage ../tools/package-management/nix {
       storeDir = config.nix.storeDir or "/nix/store";

From 3ee3f9a535d2e7fcc4e695000e550a8981983ced Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:20:00 -0500
Subject: [PATCH 3654/4636] thanos: fix build on darwin

---
 pkgs/servers/monitoring/thanos/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix            | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix
index f307032f4141..a246249d7d71 100644
--- a/pkgs/servers/monitoring/thanos/default.nix
+++ b/pkgs/servers/monitoring/thanos/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 buildGoModule rec {
   pname = "thanos";
   version = "0.11.0";
@@ -12,6 +12,8 @@ buildGoModule rec {
 
   modSha256 = "1pdypyyy352l6wy5lr94fv8j890lh863h8zg2hxchiymrs5pgq1c";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   subPackages = "cmd/thanos";
 
   buildFlagsArray = let t = "github.com/prometheus/common/version"; in ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0cd55f652f79..d3ec15064174 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16206,7 +16206,9 @@ in
 
   tailscale = callPackage ../servers/tailscale { };
 
-  thanos = callPackage ../servers/monitoring/thanos { };
+  thanos = callPackage ../servers/monitoring/thanos {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   inherit (callPackages ../servers/http/tomcat { })
     tomcat7

From dba7b8e394ce9f4b28b59d4d8fe1e3fcfdef3bca Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:21:00 -0500
Subject: [PATCH 3655/4636] victoriametrics: fix build on darwin

---
 pkgs/servers/nosql/victoriametrics/default.nix | 7 +++++--
 pkgs/top-level/all-packages.nix                | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix
index 2d357712096a..f85c4aebd512 100644
--- a/pkgs/servers/nosql/victoriametrics/default.nix
+++ b/pkgs/servers/nosql/victoriametrics/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "VictoriaMetrics";
@@ -12,7 +12,10 @@ buildGoModule rec {
   };
 
   modSha256 = "0qzh3jmj7ps6xmnnmfr8bnq97kdkn58p6dxppmlypanar3zsn7vk";
-  meta = with lib; {
+
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
+  meta = with stdenv.lib; {
     homepage = "https://victoriametrics.com/";
     description = "fast, cost-effective and scalable time series database, long-term remote storage for Prometheus";
     license = licenses.asl20;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3ec15064174..199a8f9f30de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16248,7 +16248,9 @@ in
     unifiStable;
   unifi = unifiStable;
 
-  victoriametrics = callPackage ../servers/nosql/victoriametrics { };
+  victoriametrics = callPackage ../servers/nosql/victoriametrics {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { };
 

From 78f00558e2aba056009b6d13d3d89aeb49f2bf14 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:22:00 -0500
Subject: [PATCH 3656/4636] smimesign: fix build on darwin

---
 pkgs/os-specific/darwin/smimesign/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix               | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/darwin/smimesign/default.nix b/pkgs/os-specific/darwin/smimesign/default.nix
index 9efa230d3b72..6e799f1caaaa 100644
--- a/pkgs/os-specific/darwin/smimesign/default.nix
+++ b/pkgs/os-specific/darwin/smimesign/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, lib }:
+{ buildGoModule, fetchFromGitHub, stdenv, libobjc, Security }:
 
 buildGoModule rec {
   pname = "smimesign";
@@ -13,9 +13,11 @@ buildGoModule rec {
 
   modSha256 = "1k3gnjzblfk14y19zhlvwysx045nbw0xr5nngh7zj1wcqxhhm206";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc Security ];
+
   buildFlagsArray = "-ldflags=-X main.versionString=${version}";
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "An S/MIME signing utility for macOS and Windows that is compatible with Git.";
 
     homepage    = https://github.com/github/smimesign;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 199a8f9f30de..498567a3b552 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17471,7 +17471,10 @@ in
 
   smem = callPackage ../os-specific/linux/smem { };
 
-  smimesign = callPackage ../os-specific/darwin/smimesign { };
+  smimesign = callPackage ../os-specific/darwin/smimesign {
+    inherit (darwin) libobjc;
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   speedometer = callPackage ../os-specific/linux/speedometer { };
 

From 428bb7d2b8bb7e22e3f41be2b0c05c42a0581669 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:23:00 -0500
Subject: [PATCH 3657/4636] sensu-go-agent: fix build on darwin

---
 pkgs/servers/monitoring/sensu-go/default.nix | 10 ++++++----
 pkgs/top-level/all-packages.nix              |  4 +++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix
index f109b08d1a6f..adba0277bf77 100644
--- a/pkgs/servers/monitoring/sensu-go/default.nix
+++ b/pkgs/servers/monitoring/sensu-go/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, lib }:
+{ buildGoModule, fetchFromGitHub, stdenv, Security }:
 
 let
   generic = { subPackages, pname, postInstall ? "" }:
@@ -20,6 +20,8 @@ let
 
       modSha256 = "02h4cav6ivzs3z0qakwxzf5lfy6hzax5c0i2icp0qymqc2789npw";
 
+      buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
       buildFlagsArray = let
         versionPkg = "github.com/sensu/sensu-go/version";
       in ''
@@ -28,11 +30,11 @@ let
           -X ${versionPkg}.BuildSHA=${shortRev}
       '';
 
-      meta = {
+      meta = with stdenv.lib; {
         homepage = "https://sensu.io";
         description = "Open source monitoring tool for ephemeral infrastructure & distributed applications";
-        license = lib.licenses.mit;
-        maintainers = with lib.maintainers; [ thefloweringash ];
+        license = licenses.mit;
+        maintainers = with maintainers; [ thefloweringash ];
       };
     };
 in
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 498567a3b552..03bb393a8707 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16158,7 +16158,9 @@ in
 
   sensu = callPackage ../servers/monitoring/sensu { };
 
-  inherit (callPackages ../servers/monitoring/sensu-go { })
+  inherit (callPackages ../servers/monitoring/sensu-go {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  })
     sensu-go-agent
     sensu-go-backend
     sensu-go-cli;

From d77fc69768c7b96311a20d2edffe187ebe97dc68 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:24:00 -0500
Subject: [PATCH 3658/4636] syncthing: fix build on darwin

---
 pkgs/applications/networking/syncthing/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix                    | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 516acab10f8b..0fd3a5ca2801 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, stdenv, lib, procps, fetchFromGitHub }:
+{ buildGoModule, stdenv, lib, procps, fetchFromGitHub, libobjc, CoreServices, Foundation }:
 
 let
   common = { stname, target, postInstall ? "" }:
@@ -15,6 +15,8 @@ let
 
       modSha256 = "1qq0979cm42wd3scy3blyi0hg67mkghis9r5rn2x1lqi2b982wfh";
 
+      buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc CoreServices Foundation ];
+
       patches = [
         ./add-stcli-target.patch
       ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 03bb393a8707..aa5a3ad048c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22069,7 +22069,10 @@ in
 
   syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { };
 
-  inherit (callPackages ../applications/networking/syncthing { })
+  inherit (callPackages ../applications/networking/syncthing {
+    inherit (darwin) libobjc;
+    inherit (darwin.apple_sdk.frameworks) CoreServices Foundation;
+  })
     syncthing
     syncthing-cli
     syncthing-discovery

From 8a51989af0fe02f0b37e75bed29dd4b95f0d3607 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:25:00 -0500
Subject: [PATCH 3659/4636] terraform-providers.elasticsearch: fix build on
 darwin

---
 .../networking/cluster/terraform-providers/default.nix        | 2 ++
 .../cluster/terraform-providers/elasticsearch/default.nix     | 4 +++-
 pkgs/top-level/all-packages.nix                               | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 6a285d8b38be..5112277a8c40 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -3,6 +3,7 @@
 , fetchFromGitHub
 , callPackage
 , buildGo112Module
+, Security
 }:
 let
   list = import ./data.nix;
@@ -29,6 +30,7 @@ in
       #   verifying git.apache.org/thrift.git@v0.12.0/go.mod: git.apache.org/thrift.git@v0.12.0/go.mod: Get https://sum.golang.org/lookup/git.apache.org/thrift.git@v0.12.0: dial tcp: lookup sum.golang.org on [::1]:53: read udp [::1]:52968->[::1]:53: read: connection refused
       #   verifying github.com/hashicorp/terraform@v0.12.0/go.mod: github.com/hashicorp/terraform@v0.12.0/go.mod: Get https://sum.golang.org/lookup/github.com/hashicorp/terraform@v0.12.0: dial tcp: lookup sum.golang.org on [::1]:53: read udp [::1]:52968->[::1]:53: read: connection refused
       buildGoModule = buildGo112Module;
+      inherit Security;
     };
     gandi = callPackage ./gandi {};
     ibm = callPackage ./ibm {};
diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
index 1aadbbc5ccd3..2f13000c0cde 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule }:
+{ stdenv, fetchFromGitHub, buildGoModule, Security }:
 buildGoModule rec {
   pname = "terraform-provider-elasticsearch";
   version = "0.7.0";
@@ -12,6 +12,8 @@ buildGoModule rec {
 
   modSha256 = "1xk21xswqwpv34j4ba4fj8lcbvfdd12x7rq1hrdyd21mdhmrhw0p";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   subPackages = [ "." ];
 
   # Terraform allow checking the provider versions, but this breaks
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa5a3ad048c5..75f1a82ba3aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25969,6 +25969,7 @@ in
   terraform-providers = recurseIntoAttrs (
     callPackage ../applications/networking/cluster/terraform-providers {
       inherit buildGo112Module;
+      inherit (darwin.apple_sdk.frameworks) Security;
     }
   );
 

From 47e436793b460e932d02b8ae3b7c7a74867b1e18 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:26:00 -0500
Subject: [PATCH 3660/4636] prometheus-varnish-exporter: fix build on darwin

---
 .../servers/monitoring/prometheus/varnish-exporter.nix | 10 ++++++----
 pkgs/top-level/all-packages.nix                        |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
index d77675671950..a0e3c6b1783c 100644
--- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub, makeWrapper, varnish }:
+{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, varnish, Security }:
 
 buildGoModule rec {
   pname = "prometheus_varnish_exporter";
@@ -15,6 +15,8 @@ buildGoModule rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   postInstall = ''
     wrapProgram $out/bin/prometheus_varnish_exporter \
       --prefix PATH : "${varnish}/bin"
@@ -22,10 +24,10 @@ buildGoModule rec {
 
   doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/jonnenauha/prometheus_varnish_exporter";
     description = "Varnish exporter for Prometheus";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ MostAwesomeDude willibutz ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ MostAwesomeDude willibutz ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 75f1a82ba3aa..d16d69356c12 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16042,6 +16042,7 @@ in
     # Version 1.5.1 fails to build with go 1.13 due to test failure
     #  FAIL       github.com/jonnenauha/prometheus_varnish_exporter       0.041s
     buildGoModule = buildGo112Module;
+    inherit (darwin.apple_sdk.frameworks) Security;
   };
   prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix {  };
   prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix {

From f34fd0c37a099bcda4b7c1b3b87b5aff94d66f6d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:27:00 -0500
Subject: [PATCH 3661/4636] prometheus-dnsmasq-exporter: fix build on darwin

---
 pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix | 4 +++-
 pkgs/top-level/all-packages.nix                         | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
index c8013e6bc15c..773fddd311bb 100644
--- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "dnsmasq_exporter";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "1ag1k0z35zkazaxj8hh2wxfj73xg63xdybfm1565il2vxs5986dh";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
     description = "A dnsmasq exporter for Prometheus";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d16d69356c12..5dc2d9c15c22 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16012,7 +16012,9 @@ in
   prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { };
   prometheus-cups-exporter = callPackage ../servers/monitoring/prometheus/cups-exporter.nix { };
   prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { };
-  prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { };
+  prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
   prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { };
   prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { };
   prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { };

From 7eb35cd1447a7c076bd4869c0e2e5f1ee428d70d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:28:00 -0500
Subject: [PATCH 3662/4636] prometheus-mikrotik-exporter: fix build on darwin

---
 pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix | 4 +++-
 pkgs/top-level/all-packages.nix                          | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix
index 12341eee911e..96526d246a6d 100644
--- a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub, Security }:
 
 buildGoModule rec {
   pname = "mikrotik-exporter-unstable";
@@ -13,6 +13,8 @@ buildGoModule rec {
 
   modSha256 = "1cqjn6j3dfq51ssjx0qrajprlac1h0lb1r4af44lfpigzmrfyi07";
 
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
     description = "Prometheus MikroTik device(s) exporter";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5dc2d9c15c22..6b5e26533474 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16022,7 +16022,9 @@ in
   prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { };
   prometheus-mail-exporter = callPackage ../servers/monitoring/prometheus/mail-exporter.nix { };
   prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { };
-  prometheus-mikrotik-exporter = callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix { };
+  prometheus-mikrotik-exporter = callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
   prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { };
   prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { };
   prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { };

From a572e1f1fb7017ff3e663e5004278f4a805222c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 21 Mar 2020 09:05:24 -0300
Subject: [PATCH 3663/4636] greybird: 3.22.11 -> 3.22.12

---
 pkgs/data/themes/greybird/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/themes/greybird/default.nix b/pkgs/data/themes/greybird/default.nix
index cc665749d3c1..794034af7e7c 100644
--- a/pkgs/data/themes/greybird/default.nix
+++ b/pkgs/data/themes/greybird/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "greybird";
-  version = "3.22.11";
+  version = "3.22.12";
 
   src = fetchFromGitHub {
     owner = "shimmerproject";
     repo = pname;
     rev = "v${version}";
-    sha256 = "00x7dcjldph9k0nmvc8hyh3k4lhbmwk791rywd89ry6jivrx40pc";
+    sha256 = "1j66ddvl3pmwh2v8ajm8r5g5nbsr7r262ff1qn2nf3i0gy8b3lq8";
   };
 
   nativeBuildInputs = [

From 31f557c88feb8e6547805727e193881e35f4c495 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Mon, 17 Feb 2020 23:10:33 +0900
Subject: [PATCH 3664/4636] haskell.compiler.ghc822Binary: propagate llvm
 dependency

Fixes the following error when attempting to build packages using this
compiler:

  <no location info>: error:
      Warning: Couldn't figure out LLVM version!
               Make sure you have installed LLVM 3.9

  <no location info>: error: ghc: could not execute: opt
---
 pkgs/development/compilers/ghc/8.2.2-binary.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/8.2.2-binary.nix b/pkgs/development/compilers/ghc/8.2.2-binary.nix
index 1f24b9a1ff24..9f546bcb541c 100644
--- a/pkgs/development/compilers/ghc/8.2.2-binary.nix
+++ b/pkgs/development/compilers/ghc/8.2.2-binary.nix
@@ -1,12 +1,15 @@
 { stdenv, substituteAll
 , fetchurl, perl, gcc, llvm
 , ncurses5, gmp, glibc, libiconv
+, llvmPackages
 }:
 
 # Prebuilt only does native
 assert stdenv.targetPlatform == stdenv.hostPlatform;
 
 let
+  useLLVM = !stdenv.targetPlatform.isx86;
+
   libPath = stdenv.lib.makeLibraryPath ([
     ncurses5 gmp
   ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
@@ -53,7 +56,7 @@ stdenv.mkDerivation rec {
     or (throw "cannot bootstrap GHC on this platform"));
 
   nativeBuildInputs = [ perl ];
-  buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isAarch32 || stdenv.targetPlatform.isAarch64) [ llvm ];
+  propagatedBuildInputs = stdenv.lib.optionals useLLVM [ llvmPackages.llvm ];
 
   # Cannot patchelf beforehand due to relative RPATHs that anticipate
   # the final install location/

From ec28ea8914a00aaff0f88e031c3f0977e9ebd8a2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Mar 2020 13:00:37 +0000
Subject: [PATCH 3665/4636] dropbox-cli: 2019.02.14 -> 2020.03.04

---
 pkgs/applications/networking/dropbox/cli.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix
index 9b3b99708dfc..12865bd6ca7f 100644
--- a/pkgs/applications/networking/dropbox/cli.nix
+++ b/pkgs/applications/networking/dropbox/cli.nix
@@ -11,7 +11,7 @@
 }:
 
 let
-  version = "2019.02.14";
+  version = "2020.03.04";
   dropboxd = "${dropbox}/bin/dropbox";
 in
 stdenv.mkDerivation {
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://linux.dropboxstatic.com/packages/nautilus-dropbox-${version}.tar.bz2";
-    sha256 = "09yg7q45sycl88l3wq0byz4a9k6sxx3m0r3szinvisfay9wlj35f";
+    sha256 = "1jjc835n2j61d23kvygdb4n4jsrw33r9mbwxrm4fqin6x01l2w7k";
   };
 
   strictDeps = true;
@@ -61,7 +61,7 @@ stdenv.mkDerivation {
   ];
 
   meta = {
-    homepage = https://www.dropbox.com;
+    homepage = "https://www.dropbox.com";
     description = "Command line client for the dropbox daemon";
     license = stdenv.lib.licenses.gpl3Plus;
     maintainers = with stdenv.lib.maintainers; [ the-kenny ];

From cb75c0f90536d8aa5e970c6f4bedf78d635fe188 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 21 Mar 2020 14:44:57 +0100
Subject: [PATCH 3666/4636] gotools: fix darwin build

---
 pkgs/development/tools/gotools/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix            | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix
index 430f17bfb5b0..d46c9a9fb311 100644
--- a/pkgs/development/tools/gotools/default.nix
+++ b/pkgs/development/tools/gotools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, go, buildGoModule, fetchgit }:
+{ stdenv, go, buildGoModule, fetchgit, Security }:
 
 buildGoModule rec {
   pname = "gotools-unstable";
@@ -11,6 +11,8 @@ buildGoModule rec {
     sha256 = "16m62m303j4wqfjr1401xpqpb9m11bs6qc2dhf6x2za2d9pycish";
   };
 
+  buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+
   # Build of golang.org/x/tools/gopls fails with:
   #   can't load package: package golang.org/x/tools/gopls: unknown import path "golang.org/x/tools/gopls": cannot find module providing package golang.org/x/tools/gopls
   # That is most probably caused by golang.org/x/tools/gopls containing a separate Go module.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 014bb3e0b9a7..7538ed98b403 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17132,7 +17132,9 @@ in
 
   go-tools = callPackage ../development/tools/go-tools { };
 
-  gotools = callPackage ../development/tools/gotools { };
+  gotools = callPackage ../development/tools/gotools {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   gotop = callPackage ../tools/system/gotop { };
 

From 55fb13e5e119d939a0dc88ed61512991b53a07dc Mon Sep 17 00:00:00 2001
From: Reno Reckling <exi@wthack.de>
Date: Sat, 21 Mar 2020 15:27:52 +0100
Subject: [PATCH 3667/4636] i3lock-fancy: Fix wrong path to mktemp

mktemp was not correctly replaced in this package. Leading to
"command not found: mktemp" error.
---
 pkgs/applications/window-managers/i3/lock-fancy.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix
index 4ca69ce31b44..4017ed170368 100644
--- a/pkgs/applications/window-managers/i3/lock-fancy.nix
+++ b/pkgs/applications/window-managers/i3/lock-fancy.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "00lqsvz1knb8iqy8lnkn3sf4c2c4nzb0smky63qf48m8za5aw9b1";
   };
   patchPhase = ''
-    sed -i -e "s|(mktemp)|(${coreutils}/bin/mktemp)|" i3lock-fancy
+    sed -i -e "s|(mktemp|(${coreutils}/bin/mktemp|" i3lock-fancy
     sed -i -e "s|'rm -f |'${coreutils}/bin/rm -f |" i3lock-fancy
     sed -i -e "s|scrot -z |${scrot}/bin/scrot -z |" i3lock-fancy
     sed -i -e "s|convert |${imagemagick.out}/bin/convert |" i3lock-fancy

From 4f9cea70bd75b812ccd7edc4e23e95da08eb3d9b Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Thu, 30 Jan 2020 21:15:56 -0500
Subject: [PATCH 3668/4636] nixos/duosec: fix indentation

---
 nixos/modules/security/duosec.nix | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix
index c686a6861d0f..2d5596738ce5 100644
--- a/nixos/modules/security/duosec.nix
+++ b/nixos/modules/security/duosec.nix
@@ -195,21 +195,21 @@ in
   };
 
   config = mkIf (cfg.ssh.enable || cfg.pam.enable) {
-     environment.systemPackages = [ pkgs.duo-unix ];
+    environment.systemPackages = [ pkgs.duo-unix ];
 
-     security.wrappers.login_duo.source = "${pkgs.duo-unix.out}/bin/login_duo";
-     environment.etc = loginCfgFile // pamCfgFile;
+    security.wrappers.login_duo.source = "${pkgs.duo-unix.out}/bin/login_duo";
+    environment.etc = loginCfgFile // pamCfgFile;
 
-     /* If PAM *and* SSH are enabled, then don't do anything special.
-     If PAM isn't used, set the default SSH-only options. */
-     services.openssh.extraConfig = mkIf (cfg.ssh.enable || cfg.pam.enable) (
-     if cfg.pam.enable then "UseDNS no" else ''
-       # Duo Security configuration
-       ForceCommand ${config.security.wrapperDir}/login_duo
-       PermitTunnel no
-       ${optionalString (!cfg.allowTcpForwarding) ''
-         AllowTcpForwarding no
-       ''}
-     '');
+    /* If PAM *and* SSH are enabled, then don't do anything special.
+    If PAM isn't used, set the default SSH-only options. */
+    services.openssh.extraConfig = mkIf (cfg.ssh.enable || cfg.pam.enable) (
+    if cfg.pam.enable then "UseDNS no" else ''
+      # Duo Security configuration
+      ForceCommand ${config.security.wrapperDir}/login_duo
+      PermitTunnel no
+      ${optionalString (!cfg.allowTcpForwarding) ''
+        AllowTcpForwarding no
+      ''}
+    '');
   };
 }

From 10b46be451e203a7917bb594607fdf5de7b3d2df Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Mar 2020 14:41:38 +0000
Subject: [PATCH 3669/4636] gnome3.five-or-more: 3.32.0 -> 3.32.1

---
 pkgs/desktops/gnome-3/games/five-or-more/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
index b4c6eaaec1bf..4d0512f1adbc 100644
--- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix
+++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "five-or-more";
-  version = "3.32.0";
+  version = "3.32.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/five-or-more/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0v52i22ygv6y4zqs8nyb1qmacmj9whhqrw7qss6vn7by4nsikhrn";
+    sha256 = "0xw05dd2dwi9vsph9h158b4n89s5k07xrh6bjz1icm0pdmjwhpgk";
   };
 
   nativeBuildInputs = [
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Five_or_more;
+    homepage = "https://wiki.gnome.org/Apps/Five_or_more";
     description = "Remove colored balls from the board by forming lines";
     maintainers = gnome3.maintainers;
     license = licenses.gpl2;

From a8dafd273124989a9e1bb3e89a928f2e0af6b056 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 14 Mar 2020 15:45:15 +0100
Subject: [PATCH 3670/4636] =?UTF-8?q?ocamlPackages.parmap:=201.1=20?=
 =?UTF-8?q?=E2=86=92=201.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/parmap/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/parmap/default.nix b/pkgs/development/ocaml-modules/parmap/default.nix
index a37120b2496b..5127dc3b1e6d 100644
--- a/pkgs/development/ocaml-modules/parmap/default.nix
+++ b/pkgs/development/ocaml-modules/parmap/default.nix
@@ -1,12 +1,12 @@
-{ lib, buildDunePackage, fetchzip }:
+{ lib, buildDunePackage, fetchurl }:
 
 buildDunePackage rec {
   pname = "parmap";
-  version = "1.1";
+  version = "1.1.1";
 
-  src = fetchzip {
+  src = fetchurl {
     url = "https://github.com/rdicosmo/${pname}/releases/download/${version}/${pname}-${version}.tbz";
-    sha256 = "13ahqaga1palf0s0dll512cl7k43sllmwvw6r03y70kfmky1j114";
+    sha256 = "1pci7b1jqxkgmrbhr0p5j98i4van5nfmmb3sak8cyvxhwgna93j4";
   };
 
   doCheck = true;

From bdddf3c07ff9858a5ac377b18034d16ecd9728ce Mon Sep 17 00:00:00 2001
From: Pascal Hertleif <killercup@gmail.com>
Date: Sat, 21 Mar 2020 16:01:36 +0100
Subject: [PATCH 3671/4636] tokei: 10.1.2 -> 11.0.0

---
 pkgs/development/tools/misc/tokei/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix
index aaf6efc03aee..a06bf4f248ac 100644
--- a/pkgs/development/tools/misc/tokei/default.nix
+++ b/pkgs/development/tools/misc/tokei/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tokei";
-  version = "10.1.2";
+  version = "11.0.0";
 
   src = fetchFromGitHub {
     owner = "XAMPPRocky";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1h9vk30wdcjkf6wdv1xdiv94ln5ivwhmfhx5kwdvrxx8cci2m3yx";
+    sha256 = "0as3knld6vlni2s347wgh4g1fg531ky23pg7wx5fzzy6gxl4rgi1";
   };
 
-  cargoSha256 = "11xf2vkhar4y0rb4blq3hk9xlw0ixnig88zzc72hcnkv2yamgkhi";
+  cargoSha256 = "1f385gjym3mm1vsjvss3yq21ixnbjkrx705hp3spyhghffxi00q1";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [
     libiconv darwin.apple_sdk.frameworks.Security

From 11315a3e2717f98b87c1c62b57c851d4e436e365 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 21 Mar 2020 04:08:42 +0000
Subject: [PATCH 3672/4636] lutris: 0.5.3 -> 0.5.4

---
 pkgs/applications/misc/lutris/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix
index c9ea146f063b..6cd5c6d204ed 100644
--- a/pkgs/applications/misc/lutris/default.nix
+++ b/pkgs/applications/misc/lutris/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonApplication, lib, fetchFromGitHub
+{ buildPythonApplication, lib, fetchFromGitHub, fetchpatch
 , wrapGAppsHook, gobject-introspection, gnome-desktop, libnotify, libgnome-keyring, pango
 , gdk-pixbuf, atk, webkitgtk, gst_all_1
 , evdev, pyyaml, pygobject3, requests, pillow
@@ -31,15 +31,22 @@ let
 
 in buildPythonApplication rec {
   pname = "lutris-original";
-  version = "0.5.3";
+  version = "0.5.4";
 
   src = fetchFromGitHub {
     owner = "lutris";
     repo = "lutris";
     rev = "v${version}";
-    sha256 = "0n6xa3pnwvsvfipinrkbhxwjzfbw2cjpc9igv97nffcmpydmn5xv";
+    sha256 = "0i4i6g3pys1vf2q1pbs1fkywgapj4qfxrjrvim98hzw9al4l06y9";
   };
 
+  patches = [(
+    fetchpatch {
+      url = "https://github.com/lutris/lutris/pull/2558.patch";
+      sha256 = "1wbsplri5ii06gzv6mzhiic61zkgsp9bkjkaknkd83203p0i9b2d";
+    }
+  )];
+
   buildInputs = [
     wrapGAppsHook gobject-introspection gnome-desktop libnotify libgnome-keyring pango
     gdk-pixbuf atk webkitgtk
@@ -63,4 +70,3 @@ in buildPythonApplication rec {
     platforms = platforms.linux;
   };
 }
-

From 1ff9d94f38c739b9d1e914651c1136f94749e159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 21 Mar 2020 18:18:34 +0100
Subject: [PATCH 3673/4636] spring: it works!

---
 pkgs/games/spring/default.nix   | 4 ++--
 pkgs/top-level/all-packages.nix | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 1cfb6c6e4606..e0dd5f53449f 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "spring";
     repo = "spring";
-    rev = version;
-    sha256 = "1z7c5yxsv0j4nlkmc0limxxkl5mp65jckjfh7nyv3a3zvzhv00zc";
+    rev = "9ee29da876f6d3d23e169185619b58df9c036703";
+    sha256 = "0m94i85k8k5ls1ff9z8djslzhkgr7b7vsbpic2axxjvki6sn2xjv";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 014bb3e0b9a7..7262dbb79402 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23676,7 +23676,6 @@ in
 
   spring = callPackage ../games/spring {
     boost = boost155;
-    cmake = cmake_2_8;
   };
 
   springLobby = callPackage ../games/spring/springlobby.nix { };

From b5f779b1370e17ff680386ae640586ba7ef846b5 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Sat, 21 Mar 2020 11:42:10 -0700
Subject: [PATCH 3674/4636] hugo: 0.67.1 -> 0.68.0

---
 pkgs/applications/misc/hugo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index f1d68b926910..f98c23d2c27b 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "hugo";
-  version = "0.67.1";
+  version = "0.68.0";
 
   goPackagePath = "github.com/gohugoio/hugo";
 
@@ -10,10 +10,10 @@ buildGoModule rec {
     owner = "gohugoio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0q55f8w0drc1miqziqp8r064h7900hrgj7nixxs71cb1p8ih4cq3";
+    sha256 = "1jdk4mwflxm7n076x4gbqb362z4qriszq8fkc0sjsvd05z613ry6";
   };
 
-  modSha256 = "0s7a13jkhsr6h19a9ysr8877imac5skdray0zg2qgwrapic2nw17";
+  modSha256 = "04vzm65kbj9905z4cf5yh6yc6g3b0pd5vc00lrxw84pwgqgc0ykb";
 
   buildFlags = [ "-tags" "extended" ];
 

From bf453da8e8f1ee4334c62f5381185caed25d74a7 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Sat, 21 Mar 2020 12:22:51 -0700
Subject: [PATCH 3675/4636] grafana: 6.7.0 -> 6.7.1

---
 pkgs/servers/monitoring/grafana/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index b96f2c8ce4e1..c3a4be574dfb 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "grafana";
-  version = "6.7.0";
+  version = "6.7.1";
 
   goPackagePath = "github.com/grafana/grafana";
 
@@ -12,12 +12,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "013586kaiyrs5b1mxf9vlcfh7va8md5amnh2jj26jph8ns6m0f87";
+    sha256 = "0isidfnny4rds9mq7gfm3qmsjsg9higiqliri5zy5bc68lz1gnbz";
   };
 
   srcStatic = fetchurl {
     url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
-    sha256 = "05g6lsl0vmc4q60dkm1404dl0k3wrlf6yy2l2cnaydl6aqz1kh8d";
+    sha256 = "0pa5g9pgifdi49vklcxnip2a156f5x64i9r2pshdg4gxfdqbxkxy";
   };
 
   postPatch = ''

From 9e98d47fb23a3c12f2df3575397714d96ced19ac Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Sat, 21 Mar 2020 12:23:26 -0700
Subject: [PATCH 3676/4636] grafana: add Frostman to maintainers

---
 pkgs/servers/monitoring/grafana/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index c3a4be574dfb..ff283396e223 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -39,7 +39,7 @@ buildGoPackage rec {
     description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB";
     license = licenses.asl20;
     homepage = "https://grafana.com";
-    maintainers = with maintainers; [ offline fpletz willibutz globin ma27 ];
+    maintainers = with maintainers; [ offline fpletz willibutz globin ma27 Frostman ];
     platforms = platforms.linux;
   };
 }

From 6c47902e01ae1dab9967966b9a24536861436c6a Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Fri, 20 Mar 2020 20:46:26 -0400
Subject: [PATCH 3677/4636] nixos/mysql: test with mysql80 package

---
 nixos/tests/mysql.nix | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix
index 924bac84e26c..84673181e1a4 100644
--- a/nixos/tests/mysql.nix
+++ b/nixos/tests/mysql.nix
@@ -22,6 +22,27 @@ import ./make-test-python.nix ({ pkgs, ...} : {
         services.mysql.package = pkgs.mysql57;
       };
 
+    mysql80 =
+      { pkgs, ... }:
+
+      {
+        # prevent oom:
+        # Kernel panic - not syncing: Out of memory: compulsory panic_on_oom is enabled
+        virtualisation.memorySize = 1024;
+
+        services.mysql.enable = true;
+        services.mysql.initialDatabases = [
+          { name = "testdb"; schema = ./testdb.sql; }
+          { name = "empty_testdb"; }
+        ];
+        # note that using pkgs.writeText here is generally not a good idea,
+        # as it will store the password in world-readable /nix/store ;)
+        services.mysql.initialScript = pkgs.writeText "mysql-init.sql" ''
+          CREATE USER 'passworduser'@'localhost' IDENTIFIED BY 'password123';
+        '';
+        services.mysql.package = pkgs.mysql80;
+      };
+
     mariadb =
       { pkgs, ... }:
 
@@ -61,6 +82,12 @@ import ./make-test-python.nix ({ pkgs, ...} : {
     # ';' acts as no-op, just check whether login succeeds with the user created from the initialScript
     mysql.succeed("echo ';' | mysql -u passworduser --password=password123")
 
+    mysql80.wait_for_unit("mysql")
+    mysql80.succeed("echo 'use empty_testdb;' | mysql -u root")
+    mysql80.succeed("echo 'use testdb; select * from tests;' | mysql -u root -N | grep 4")
+    # ';' acts as no-op, just check whether login succeeds with the user created from the initialScript
+    mysql80.succeed("echo ';' | mysql -u passworduser --password=password123")
+
     mariadb.wait_for_unit("mysql")
     mariadb.succeed(
         "echo 'use testdb; create table tests (test_id INT, PRIMARY KEY (test_id));' | sudo -u testuser mysql -u testuser"

From ea253398dea79ac24ea530aaf4a305bc1da8de27 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 21 Mar 2020 21:22:57 +0100
Subject: [PATCH 3678/4636] androidStudioPackages.beta: 4.0.0.11 -> 4.0.0.12

---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 39929e5e5275..573eec845027 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,9 +13,9 @@ let
     sha256Hash = "1mwzk18224bl8hbw9cdxwzgj5cfain4y70q64cpj4p0snffxqm77";
   };
   betaVersion = {
-    version = "4.0.0.11"; # "Android Studio 4.0 Beta 2"
-    build = "193.6254973";
-    sha256Hash = "0i4n5kxnfxnz3y44ba0x2j8nkmss4gchrzcdnb9wf6xc1jqrjwcm";
+    version = "4.0.0.12"; # "Android Studio 4.0 Beta 3"
+    build = "193.6296804";
+    sha256Hash = "072rvh20xkn7izh6f2r2bspy06jrvcibj2hc12hz76m8cwzf4v0m";
   };
   latestVersion = { # canary & dev
     version = "4.1.0.3"; # "Android Studio 4.1 Canary 3"

From 5ce86bc4acc74550d695bd73de370a99e789946e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 21 Mar 2020 21:24:01 +0100
Subject: [PATCH 3679/4636] wayvnc: 0.1.1 -> 0.1.2

---
 pkgs/applications/networking/remote/wayvnc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/remote/wayvnc/default.nix b/pkgs/applications/networking/remote/wayvnc/default.nix
index 7cf989de33ec..865710184f93 100644
--- a/pkgs/applications/networking/remote/wayvnc/default.nix
+++ b/pkgs/applications/networking/remote/wayvnc/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wayvnc";
-  version = "0.1.1";
+  version = "0.1.2";
 
   src = fetchFromGitHub {
     owner = "any1";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1qk8xrqd8ls2hpkj7g4aknr73x3lbzzdjpja16rbp2r0m4iv95ld";
+    sha256 = "0aa12fkbwhzs0g2pqw1b27l33nn5dpbcvsf1z8h88kwsf9xdvb2r";
   };
 
   postPatch = ''

From 68e9ddacc2945893addf50f3721d6d530006dab6 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 21 Mar 2020 21:41:37 +0100
Subject: [PATCH 3680/4636] fuse3: 3.9.0 -> 3.9.1 (#82999)

---
 pkgs/os-specific/linux/fuse/common.nix                | 11 ++++++++++-
 pkgs/os-specific/linux/fuse/default.nix               |  4 ++--
 .../linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch  |  6 +++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix
index 35c91c5ec071..b0f684e6242a 100644
--- a/pkgs/os-specific/linux/fuse/common.nix
+++ b/pkgs/os-specific/linux/fuse/common.nix
@@ -84,8 +84,17 @@ in stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
+    description = "Library that allows filesystems to be implemented in user space";
+    longDescription = ''
+      FUSE (Filesystem in Userspace) is an interface for userspace programs to
+      export a filesystem to the Linux kernel. The FUSE project consists of two
+      components: The fuse kernel module (maintained in the regular kernel
+      repositories) and the libfuse userspace library (this package). libfuse
+      provides the reference implementation for communicating with the FUSE
+      kernel module.
+    '';
     inherit (src.meta) homepage;
-    description = "Kernel module and library that allows filesystems to be implemented in user space";
+    changelog = "https://github.com/libfuse/libfuse/releases/tag/fuse-${version}";
     platforms = platforms.linux;
     license = with licenses; [ gpl2 lgpl21 ];
     maintainers = [ maintainers.primeos ];
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index 6792e05829d1..415226509b7b 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -11,7 +11,7 @@ in {
   };
 
   fuse_3 = mkFuse {
-    version = "3.9.0";
-    sha256Hash = "00yppzmv15jqjy3wq5ki9d49jl6bfxrlwr5sfz50ihr40d6dgx9p";
+    version = "3.9.1";
+    sha256Hash = "1i3f4h3vnjxls8hdi6w2n2ksrgbs7brbzj65rvxginyxicykh857";
   };
 }
diff --git a/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch b/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch
index 1d41a26b0a4d..903f30325df2 100644
--- a/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch
+++ b/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch
@@ -1,12 +1,12 @@
 --- a/lib/meson.build
 +++ b/lib/meson.build
-@@ -36,8 +36,7 @@ libfuse = library('fuse3', libfuse_sources, version: meson.project_version(),
+@@ -37,8 +37,7 @@ libfuse = library('fuse3', libfuse_sources, version: meson.project_version(),
                    soversion: '3', include_directories: include_dirs,
                    dependencies: deps, install: true,
                    link_depends: 'fuse_versionscript',
--                  c_args: [ '-DFUSE_USE_VERSION=34',
+-                  c_args: [ '-DFUSE_USE_VERSION=35',
 -                            '-DFUSERMOUNT_DIR="@0@"'.format(fusermount_path) ],
-+                  c_args: [ '-DFUSE_USE_VERSION=34' ],
++                  c_args: [ '-DFUSE_USE_VERSION=35' ],
                    link_args: ['-Wl,--version-script,' + meson.current_source_dir()
                                + '/fuse_versionscript' ])
  

From dcda17d856ac74b0061669954e36b00ed5e51ec1 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 21 Mar 2020 22:06:24 +0100
Subject: [PATCH 3681/4636] nethack: 3.6.5 -> 3.6.6

---
 pkgs/games/nethack/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix
index 9a60abdc1500..280ca090d60e 100644
--- a/pkgs/games/nethack/default.nix
+++ b/pkgs/games/nethack/default.nix
@@ -19,14 +19,14 @@ let
   binPath = lib.makeBinPath [ coreutils less ];
 
 in stdenv.mkDerivation rec {
-  version = "3.6.5";
+  version = "3.6.6";
   name = if x11Mode then "nethack-x11-${version}"
          else if qtMode then "nethack-qt-${version}"
          else "nethack-${version}";
 
   src = fetchurl {
-    url = "https://nethack.org/download/3.6.5/nethack-365-src.tgz";
-    sha256 = "0xifs8pqfffnmkbpmrcd1xf14yakcj06nl2bbhy4dyacg8myysmv";
+    url = "https://nethack.org/download/${version}/nethack-${lib.replaceStrings ["."] [""] version}-src.tgz";
+    sha256 = "1liyckjp34j354qnxc1zn9730lh1p2dabrg1hap24z6xnqx0rpng";
   };
 
   buildInputs = [ ncurses ]

From 3b3e2c080f71a25d1aaf17fd76179709356058bb Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 22 Mar 2020 01:26:24 +0100
Subject: [PATCH 3682/4636] drush: fix buildInputs / nativeBuildInputs

`makeWrapper` is a nativeBuildInput, and `php` and `which` are actually
only needed when constructing the wrapper, but no `buildInputs`.
---
 pkgs/development/tools/misc/drush/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix
index f9a640d47038..670c4e258f17 100644
--- a/pkgs/development/tools/misc/drush/default.nix
+++ b/pkgs/development/tools/misc/drush/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     sha256 = "07gbjd7m1fj5dmavr0z20vkqwx1cz2522sj9022p257jifj1yl76";
   };
 
-  buildInputs = [ php which makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
   installPhase = ''
     # install libraries

From 382e751a68b177f9dd3aedfdbf8cae348b48052b Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 22 Mar 2020 01:27:58 +0100
Subject: [PATCH 3683/4636] drush: still needs php 7.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If invoked with php 7.4 on a up2date Drupal 7 installation, drush
complains with a deprecation warning, that swallows all legit output:

> drush uli
Deprecated function: Array and string offset access syntax with curly braces is   [error]
deprecated in include_once() (line 20 of
/var/www/…/htdocs/includes/file.phar.inc).

Use php7.3 when invoking drush.
---
 pkgs/development/tools/misc/drush/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix
index 670c4e258f17..e0f85c45f290 100644
--- a/pkgs/development/tools/misc/drush/default.nix
+++ b/pkgs/development/tools/misc/drush/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, php, which, makeWrapper, bash, coreutils, ncurses }:
+{ stdenv, fetchurl, php73, which, makeWrapper, bash, coreutils, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "drush-6.1.0";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     mkdir -p "$out"
     cp -r . "$out/src"
     mkdir "$out/bin"
-    wrapProgram "$out/src/drush" --prefix PATH : "${stdenv.lib.makeBinPath [ which php bash coreutils ncurses ]}"
+    wrapProgram "$out/src/drush" --prefix PATH : "${stdenv.lib.makeBinPath [ which php73 bash coreutils ncurses ]}"
     ln -s "$out/src/drush" "$out/bin/drush"
   '';
 }

From b0c75e811a6ad20f2f23f6392eae06a4d854c4dd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 21 Mar 2020 05:07:41 +0000
Subject: [PATCH 3684/4636] tiledb: 1.7.5 -> 1.7.6

---
 pkgs/development/libraries/tiledb/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix
index d1aea0c82a2c..a20e4383278b 100644
--- a/pkgs/development/libraries/tiledb/default.nix
+++ b/pkgs/development/libraries/tiledb/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tiledb";
-  version = "1.7.5";
+  version = "1.7.6";
 
   src = fetchFromGitHub {
     owner = "TileDB-Inc";
     repo = "TileDB";
     rev = version;
-    sha256 = "1fx0db4x0vcahzk5lk2p0ls644s48vfz7mf9qgsr72pplyn1kcnc";
+    sha256 = "0khxd1w5piqkxjiibnfvxcpk9lb8pi5x95zll5qs7vpbznn56b18";
   };
 
   nativeBuildInputs = [
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "TileDB allows you to manage the massive dense and sparse multi-dimensional array data";
-    homepage = https://github.com/TileDB-Inc/TileDB;
+    homepage = "https://github.com/TileDB-Inc/TileDB";
     license = licenses.mit;
     platforms = [ "x86_64-linux"];
     maintainers = with maintainers; [ rakesh4g ];

From ddabb09c355e221031ed11ce43ee9f0825ac910a Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 22 Mar 2020 03:34:54 +0100
Subject: [PATCH 3685/4636] monero: use a compatible protobuf version

---
 pkgs/applications/blockchains/monero/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                  | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix
index 7eb4238679eb..c942197006c4 100644
--- a/pkgs/applications/blockchains/monero/default.nix
+++ b/pkgs/applications/blockchains/monero/default.nix
@@ -2,7 +2,7 @@
 , cmake, pkgconfig
 , boost, miniupnpc, openssl, unbound, cppzmq
 , zeromq, pcsclite, readline, libsodium, hidapi
-, python3Packages, randomx, rapidjson
+, pythonProtobuf, randomx, rapidjson, libusb
 , CoreData, IOKit, PCSC
 }:
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     boost miniupnpc openssl unbound
     cppzmq zeromq pcsclite readline
     libsodium hidapi randomx rapidjson
-    python3Packages.protobuf
+    pythonProtobuf libusb
   ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ];
 
   cmakeFlags = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 901313d8e632..7f1c5df34d39 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22969,10 +22969,12 @@ in
 
   monero = callPackage ../applications/blockchains/monero {
     inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC;
+    pythonProtobuf = python3Packages.protobuf.override { protobuf = protobuf3_10; };
   };
 
   monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui {
     boost = boost16x;
+    protobuf = protobuf3_10;
   };
 
   masari = callPackage ../applications/blockchains/masari.nix { boost = boost165; };

From 3c93f1ba9674d8a0b8c94dfcaa4e0da132a3368f Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sun, 22 Mar 2020 03:35:31 +0100
Subject: [PATCH 3686/4636] monero-gui: 0.15.0.1 -> 0.15.0.4

---
 .../blockchains/monero-gui/default.nix        | 29 +++++++++----------
 .../monero-gui/move-log-file.patch            | 17 +++++------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix
index 0311169deb24..980e20d04b75 100644
--- a/pkgs/applications/blockchains/monero-gui/default.nix
+++ b/pkgs/applications/blockchains/monero-gui/default.nix
@@ -1,36 +1,35 @@
-{ stdenv, wrapQtAppsHook, makeDesktopItem, fetchFromGitHub
-, qtbase, qmake, qtmultimedia, qttools
-, qtgraphicaleffects, qtdeclarative
-, qtlocation, qtquickcontrols, qtquickcontrols2
-, qtwebchannel, qtwebengine, qtx11extras, qtxmlpatterns
+{ stdenv, wrapQtAppsHook, makeDesktopItem
+, fetchFromGitHub, qmake, qttools, pkgconfig
+, qtbase, qtdeclarative, qtgraphicaleffects
+, qtmultimedia, qtxmlpatterns
+, qtquickcontrols, qtquickcontrols2
 , monero, unbound, readline, boost, libunwind
-, libsodium, pcsclite, zeromq, cppzmq, pkgconfig
-, hidapi, randomx
+, libsodium, pcsclite, zeromq, cppzmq
+, hidapi, libusb, protobuf, randomx
 }:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "monero-gui";
-  version = "0.15.0.1";
+  version = "0.15.0.4";
 
   src = fetchFromGitHub {
     owner  = "monero-project";
     repo   = "monero-gui";
     rev    = "v${version}";
-    sha256 = "08j8kkncdn57xql0bhmlzjpjkdfhqbpda1p07r797q8qi0nl4w8n";
+    sha256 = "12m5fgnxkr11q2arx1m5ccpxqm5ljcvm6l547dwqn297zs5jim4z";
   };
 
   nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ];
 
   buildInputs = [
-    qtbase qtmultimedia qtgraphicaleffects
-    qtdeclarative qtlocation
-    qtquickcontrols qtquickcontrols2
-    qtwebchannel qtwebengine qtx11extras
-    qtxmlpatterns monero unbound readline
+    qtbase qtdeclarative qtgraphicaleffects
+    qtmultimedia qtquickcontrols qtquickcontrols2
+    qtxmlpatterns
+    monero unbound readline
     boost libunwind libsodium pcsclite zeromq
-    cppzmq hidapi randomx
+    cppzmq hidapi libusb protobuf randomx
   ];
 
   NIX_CFLAGS_COMPILE = [ "-Wno-error=format-security" ];
diff --git a/pkgs/applications/blockchains/monero-gui/move-log-file.patch b/pkgs/applications/blockchains/monero-gui/move-log-file.patch
index e540f1960d6c..6d3313624e37 100644
--- a/pkgs/applications/blockchains/monero-gui/move-log-file.patch
+++ b/pkgs/applications/blockchains/monero-gui/move-log-file.patch
@@ -1,15 +1,14 @@
-diff --git a/main.cpp b/main.cpp
-index a51568d..5a9f683 100644
---- a/main.cpp
-+++ b/main.cpp
-@@ -152,7 +152,9 @@ int main(int argc, char *argv[])
+diff --git a/src/main/main.cpp b/src/main/main.cpp
+index c5210e5f..45794d72 100644
+--- a/src/main/main.cpp
++++ b/src/main/main.cpp
+@@ -220,6 +220,9 @@ int main(int argc, char *argv[])
      QCommandLineOption logPathOption(QStringList() << "l" << "log-file",
          QCoreApplication::translate("main", "Log to specified file"),
          QCoreApplication::translate("main", "file"));
--
 +    logPathOption.setDefaultValue(
 +        QStandardPaths::writableLocation(QStandardPaths::CacheLocation)
 +        + "/monero-wallet-gui.log");
-     parser.addOption(logPathOption);
-     parser.addHelpOption();
-     parser.process(app);
+ 
+     QCommandLineOption testQmlOption("test-qml");
+     testQmlOption.setFlags(QCommandLineOption::HiddenFromHelp);

From accabd163ee823983b5501a606542eca8173a9e2 Mon Sep 17 00:00:00 2001
From: Reno Reckling <e-github@wthack.de>
Date: Sun, 22 Mar 2020 03:55:03 +0100
Subject: [PATCH 3687/4636] Update
 pkgs/applications/window-managers/i3/lock-fancy.nix

Co-Authored-By: Enteee <ducksource@duckpond.ch>
---
 pkgs/applications/window-managers/i3/lock-fancy.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix
index 4017ed170368..b6b354021d96 100644
--- a/pkgs/applications/window-managers/i3/lock-fancy.nix
+++ b/pkgs/applications/window-managers/i3/lock-fancy.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "00lqsvz1knb8iqy8lnkn3sf4c2c4nzb0smky63qf48m8za5aw9b1";
   };
   patchPhase = ''
-    sed -i -e "s|(mktemp|(${coreutils}/bin/mktemp|" i3lock-fancy
+    sed -i -e "s|mktemp|${coreutils}/bin/mktemp|" i3lock-fancy
     sed -i -e "s|'rm -f |'${coreutils}/bin/rm -f |" i3lock-fancy
     sed -i -e "s|scrot -z |${scrot}/bin/scrot -z |" i3lock-fancy
     sed -i -e "s|convert |${imagemagick.out}/bin/convert |" i3lock-fancy

From e1cab10dcd4971dd6c347fe0ffa01bf12c0e576c Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 21 Mar 2020 22:58:58 -0400
Subject: [PATCH 3688/4636] Revert " Fix init"

This reverts commit e68a4094d22010242e66493a1d5d49bc7e139f0c.
---
 maintainers/maintainer-list.nix           | 5 +++++
 pkgs/misc/emulators/retroarch/cores.nix   | 2 +-
 pkgs/misc/emulators/retroarch/default.nix | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5fc08c92e990..9a684309dc6a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3924,6 +3924,11 @@
     githubId = 13721712;
     name = "Konrad Langenberg";
   };
+  kolbycrouch = {
+    email = "kjc.devel@gmail.com";
+    github = "kolbycrouch";
+    name = "Kolby Crouch";
+  };
   konimex = {
     email = "herdiansyah@netc.eu";
     github = "konimex";
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 08f3032aef0a..4062b39d7620 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -479,7 +479,7 @@ in with stdenv.lib.licenses;
       sha256 = "1krr4lmdiv0d7bxk37fqz5y412znb5bmxapv9g7ci6fp87sr69jq";
     };
     description = "FMSX libretro port";
-    license = "Non-commercial";
+    license = "Non-Commercial";
   }).override {
     makefile = "Makefile";
     dontConfigure = true;
diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
index 0badccd036cc..a04bc22194fd 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -86,6 +86,6 @@ in stdenv.mkDerivation rec {
     description = "Multi-platform emulator frontend for libretro cores";
     license = licenses.gpl3;
     platforms = platforms.all;
-    maintainers = with maintainers; [ MP2E edwtjo matthewbauer ];
+    maintainers = with maintainers; [ MP2E edwtjo matthewbauer kolbycrouch ];
   };
 }

From d513980ea606c4ec694714913239b92e0361d373 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 21 Mar 2020 22:46:36 -0400
Subject: [PATCH 3689/4636] retroarch: 1.8.4 -> 1.8.5

---
 pkgs/misc/emulators/retroarch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
index a04bc22194fd..7db4cb18b3c5 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -29,12 +29,12 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "retroarch-bare";
-  version = "1.8.4";
+  version = "1.8.5";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "RetroArch";
-    sha256 = "0zs86s6rg6c87hry52mjri5ff3lpc79wdiq4wr3rmkv7bzqrd9ca";
+    sha256 = "1pg8j9wvwgrzsv4xdai6i6jgdcc922v0m42rbqxvbghbksrc8la3";
     rev = "v${version}";
   };
 

From f094e132e24725539962bbb6cdf6294847561d85 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 21 Mar 2020 22:54:01 -0400
Subject: [PATCH 3690/4636] retroarch/cores.nix: cleanup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Avoid using overrides unless necessary
- Set platform and ARCH by default
- Don’t set dontConfigure unless absolutely necessary
- Use preBuild instead of overriding entire configurePhase
---
 pkgs/misc/emulators/retroarch/cores.nix | 405 +++++++++---------------
 1 file changed, 149 insertions(+), 256 deletions(-)

diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 4062b39d7620..63e1db108e73 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -1,30 +1,42 @@
 { stdenv, fetchgit, fetchFromGitHub, fetchFromGitLab, cmake, pkgconfig, makeWrapper, python27, python37, retroarch
 , alsaLib, fluidsynth, curl, hidapi, libGLU, gettext, glib, gtk2, portaudio, SDL, SDL_net, SDL2, SDL2_image, libGL
 , ffmpeg, pcre, libevdev, libpng, libjpeg, libzip, udev, libvorbis, snappy, which, hexdump
-, miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl }:
+, miniupnpc, sfml, xorg, zlib, nasm, libpcap, boost, icu, openssl
+, buildPackages }:
 
 let
 
   d2u = stdenv.lib.replaceChars ["-"] ["_"];
 
-  jobs = "$NIX_BUILD_CORES";
+  mkLibRetroCore = { core, src, description, license, broken ? false, ... }@a:
+  stdenv.lib.makeOverridable stdenv.mkDerivation ((rec {
 
-  mkLibRetroCore = ({ core, src, description, license, broken ? false, ... }@a:
-  stdenv.lib.makeOverridable stdenv.mkDerivation rec {
-
-    name = "libretro-${core}-${version}";
+    name = "libretro-${a.core}-${version}";
     version = "2020-03-06";
-    inherit src;
+    inherit (a) src;
 
-    buildInputs = [ makeWrapper retroarch zlib ] ++ a.extraBuildInputs or [];
+    buildInputs = [ zlib ] ++ a.extraBuildInputs or [];
+    nativeBuildInputs = [ makeWrapper ] ++ a.extraNativeBuildInputs or [];
 
     makefile = "Makefile.libretro";
+    makeFlags = [
+      "platform=${{
+        linux = "unix";
+        darwin = "unix";
+        windows = "win";
+      }.${stdenv.hostPlatform.parsed.kernel.name} or stdenv.hostPlatform.parsed.kernel.name}"
+      "ARCH=${{
+        armv7l = "arm";
+        armv6l = "arm";
+        i686 = "x86";
+      }.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name}"
+    ] ++ (a.makeFlags or []);
 
     installPhase = ''
       COREDIR="$out/lib/retroarch/cores"
       mkdir -p $out/bin
       mkdir -p $COREDIR
-      mv ${d2u core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary} $COREDIR/.
+      mv ${d2u a.core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary} $COREDIR
       makeWrapper ${retroarch}/bin/retroarch $out/bin/retroarch-${core} \
         --add-flags "-L $COREDIR/${d2u core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary} $@"
     '';
@@ -32,18 +44,18 @@ let
     enableParallelBuilding = true;
 
     passthru = {
-      core = core;
+      inherit (a) core;
       libretroCore = "/lib/retroarch/cores";
     };
 
     meta = with stdenv.lib; {
-      inherit description;
+      inherit (a) description license;
+      broken = a.broken or false;
       homepage = https://www.libretro.com/;
-      inherit license;
       maintainers = with maintainers; [ edwtjo hrdinka MP2E ];
       platforms = platforms.unix;
     };
-  } // a);
+  }) // builtins.removeAttrs a ["core" "src" "description" "license" "makeFlags"]);
 
   fetchRetro = { repo, rev, sha256 }:
   fetchgit {
@@ -56,7 +68,7 @@ in with stdenv.lib.licenses;
 
 {
 
-  atari800 = (mkLibRetroCore rec {
+  atari800 = mkLibRetroCore rec {
     core = "atari800";
     src = fetchRetro {
       repo = "libretro-" + core;
@@ -65,13 +77,11 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Atari800 to libretro";
     license = gpl2;
-  }).override {
-    dontConfigure = true;
     makefile = "Makefile";
-    patchPhase = "substituteInPlace libretro/libretro-core.c --replace \" GIT_VERSION;\" \";\"";
+    makeFlags = [ "GIT_VERSION=" ];
   };
 
-  beetle-snes = (mkLibRetroCore rec {
+  beetle-snes = mkLibRetroCore {
     core = "mednafen-snes";
     src = fetchRetro {
       repo = "beetle-bsnes-libretro";
@@ -80,12 +90,10 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Mednafen's SNES core to libretro";
     license = gpl2;
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
   };
 
-  beetle-gba = (mkLibRetroCore rec {
+  beetle-gba = mkLibRetroCore {
     core = "mednafen-gba";
     src = fetchRetro {
       repo = "beetle-gba-libretro";
@@ -94,12 +102,10 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Mednafen's GameBoy Advance core to libretro";
     license = gpl2;
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
   };
 
-  beetle-lynx = (mkLibRetroCore rec {
+  beetle-lynx = mkLibRetroCore {
     core = "mednafen-lynx";
     src = fetchRetro {
       repo = "beetle-lynx-libretro";
@@ -108,12 +114,10 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Mednafen's Lynx core to libretro";
     license = gpl2;
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
   };
 
-  beetle-ngp = (mkLibRetroCore rec {
+  beetle-ngp = mkLibRetroCore {
     core = "mednafen-ngp";
     src = fetchRetro {
       repo = "beetle-ngp-libretro";
@@ -122,12 +126,10 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Mednafen's NeoGeo Pocket core to libretro";
     license = gpl2;
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
   };
 
-  beetle-pce-fast = let der = (mkLibRetroCore {
+  beetle-pce-fast = let der = mkLibRetroCore {
     core = "mednafen-pce-fast";
     src = fetchRetro {
       repo = "beetle-pce-fast-libretro";
@@ -136,13 +138,12 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Mednafen's PC Engine core to libretro";
     license = gpl2;
-  }); in der.override {
     makefile = "Makefile";
-    dontConfigure = true;
+  }; in der.override {
     name = "beetle-pce-fast-${der.version}";
   };
 
-  beetle-pcfx = (mkLibRetroCore rec {
+  beetle-pcfx = mkLibRetroCore rec {
     core = "mednafen-pcfx";
     src = fetchRetro {
       repo = "beetle-pcfx-libretro";
@@ -151,9 +152,7 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Mednafen's PCFX core to libretro";
     license = gpl2;
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
   };
 
   beetle-psx = let der = (mkLibRetroCore {
@@ -165,10 +164,9 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Mednafen's PSX Engine core to libretro";
     license = gpl2;
-  }); in der.override {
     makefile = "Makefile";
-    dontConfigure = true;
     makeFlags = [ "HAVE_HW=0" "HAVE_LIGHTREC=1" ];
+  }); in der.override {
     name = "beetle-psx-${der.version}";
   };
 
@@ -182,10 +180,9 @@ in with stdenv.lib.licenses;
     description = "Port of Mednafen's PSX Engine (with HW accel) core to libretro";
     license = gpl2;
     extraBuildInputs = [ libGL libGLU ];
-  }); in der.override {
     makefile = "Makefile";
-    dontConfigure = true;
     makeFlags = [ "HAVE_VULKAN=1" "HAVE_OPENGL=1" "HAVE_HW=1" "HAVE_LIGHTREC=1" ];
+  }); in der.override {
     name = "beetle-psx-hw-${der.version}";
   };
 
@@ -198,12 +195,11 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Mednafen's Saturn core to libretro";
     license = gpl2;
-  }); in der.override {
     makefile = "Makefile";
-    dontConfigure = true;
     makeFlags = [ "HAVE_HW=0" ];
-    name = "beetle-saturn-${der.version}";
     meta.platforms = [ "x86_64-linux" "aarch64-linux" ];
+  }); in der.override {
+    name = "beetle-saturn-${der.version}";
   };
 
   beetle-saturn-hw = let der = (mkLibRetroCore {
@@ -216,15 +212,14 @@ in with stdenv.lib.licenses;
     description = "Port of Mednafen's Saturn core to libretro";
     license = gpl2;
     extraBuildInputs = [ libGL libGLU ];
-  }); in der.override {
     makefile = "Makefile";
-    dontConfigure = true;
     makeFlags = [ "HAVE_OPENGL=1" "HAVE_HW=1" ];
-    name = "beetle-saturn-${der.version}";
     meta.platforms = [ "x86_64-linux" "aarch64-linux" ];
+  }); in der.override {
+    name = "beetle-saturn-${der.version}";
   };
 
-  beetle-supergrafx = (mkLibRetroCore rec {
+  beetle-supergrafx = mkLibRetroCore rec {
     core = "mednafen-supergrafx";
     src = fetchRetro {
       repo = "beetle-supergrafx-libretro";
@@ -233,12 +228,10 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Mednafen's SuperGrafx core to libretro";
     license = gpl2;
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
   };
 
-  beetle-wswan = (mkLibRetroCore rec {
+  beetle-wswan = mkLibRetroCore rec {
     core = "mednafen-wswan";
     src = fetchRetro {
       repo = "beetle-wswan-libretro";
@@ -247,12 +240,10 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Mednafen's WonderSwan core to libretro";
     license = gpl2;
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
   };
 
-  beetle-vb = (mkLibRetroCore rec {
+  beetle-vb = mkLibRetroCore rec {
     core = "mednafen-vb";
     src = fetchRetro {
       repo = "beetle-vb-libretro";
@@ -261,12 +252,10 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Mednafen's VirtualBoy core to libretro";
     license = gpl2;
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
   };
 
-  bluemsx = (mkLibRetroCore rec {
+  bluemsx = mkLibRetroCore rec {
     core = "bluemsx";
     src = fetchRetro {
       repo = core + "-libretro";
@@ -275,11 +264,9 @@ in with stdenv.lib.licenses;
     };
     description = "Port of BlueMSX to libretro";
     license = gpl2;
-  }).override {
-    dontConfigure = true;
   };
 
-  bsnes-mercury = let bname = "bsnes-mercury"; in (mkLibRetroCore {
+  bsnes-mercury = let bname = "bsnes-mercury"; in mkLibRetroCore {
     core = bname + "-accuracy";
     src = fetchRetro {
       repo = bname;
@@ -288,13 +275,11 @@ in with stdenv.lib.licenses;
     };
     description = "Fork of bsnes with HLE DSP emulation restored";
     license = gpl3;
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
     postBuild = "cd out";
   };
 
-  citra = (mkLibRetroCore rec {
+  citra = mkLibRetroCore rec {
     core = "citra";
     src = fetchgit {
       url = "https://github.com/libretro/citra.git";
@@ -305,13 +290,10 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Citra to libretro";
     license = gpl2Plus;
-    extraBuildInputs = [
-      cmake curl libGLU libGL pkgconfig boost
-    ];
-  }).override {
+    extraNativeBuildInputs = [ cmake pkgconfig ];
+    extraBuildInputs = [ libGLU libGL boost ];
     makefile = "Makefile";
     cmakeFlags = [
-      "-DCMAKE_BUILD_TYPE=Release"
       "-DENABLE_LIBRETRO=ON"
       "-DENABLE_QT=OFF"
       "-DENABLE_SDL2=OFF"
@@ -322,7 +304,7 @@ in with stdenv.lib.licenses;
     postBuild = "cd src/citra_libretro";
   };
 
-  desmume = (mkLibRetroCore rec {
+  desmume = mkLibRetroCore rec {
     core = "desmume";
     src = fetchRetro {
       repo = core;
@@ -332,13 +314,12 @@ in with stdenv.lib.licenses;
     description = "libretro wrapper for desmume NDS emulator";
     license = gpl2;
     extraBuildInputs = [ libpcap libGLU libGL xorg.libX11 ];
-  }).override {
-    makefile = "Makefile.libretro";
-    configurePhase = "cd desmume/src/frontend/libretro";
-    makeFlags = stdenv.lib.optionals stdenv.isAarch64 [ "DESMUME_JIT=0" ];
+    preBuild = "cd desmume/src/frontend/libretro";
+    makeFlags = stdenv.lib.optional stdenv.hostPlatform.isAarch32 "platform=armv-unix"
+             ++ stdenv.lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0";
   };
 
-  desmume2015 = (mkLibRetroCore rec {
+  desmume2015 = mkLibRetroCore rec {
     core = "desmume2015";
     src = fetchRetro {
       repo = core;
@@ -348,13 +329,12 @@ in with stdenv.lib.licenses;
     description = "libretro wrapper for desmume NDS emulator from 2015";
     license = gpl2;
     extraBuildInputs = [ libpcap libGLU libGL xorg.libX11 ];
-  }).override {
-    makefile = "Makefile.libretro";
-    configurePhase = "cd desmume";
-    makeFlags = stdenv.lib.optionals stdenv.isAarch64 [ "DESMUME_JIT=0" ];
+    makeFlags = stdenv.lib.optional stdenv.hostPlatform.isAarch32 "platform=armv-unix"
+             ++ stdenv.lib.optional (!stdenv.hostPlatform.isx86) "DESMUME_JIT=0";
+    preBuild = "cd desmume";
   };
 
-  dolphin = (mkLibRetroCore {
+  dolphin = mkLibRetroCore {
     core = "dolphin";
     src = fetchRetro {
       repo = "dolphin";
@@ -364,12 +344,12 @@ in with stdenv.lib.licenses;
     description = "Port of Dolphin to libretro";
     license = gpl2Plus;
 
+    extraNativeBuildInputs = [ cmake curl pkgconfig ];
     extraBuildInputs = [
-      cmake curl libGLU libGL pcre pkgconfig sfml
+      libGLU libGL pcre sfml
       gettext hidapi
       libevdev udev
     ] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil libXext libXrandr libXinerama libXxf86vm ]);
-  }).override {
     makefile = "Makefile";
     cmakeFlags = [
       "-DCMAKE_BUILD_TYPE=Release"
@@ -380,10 +360,10 @@ in with stdenv.lib.licenses;
       "-DUSE_UPNP=OFF"
       "-DUSE_DISCORD_PRESENCE=OFF"
     ];
-    dontUseCmakeBuildDir = "yes";
+    dontUseCmakeBuildDir = true;
   };
 
-  dosbox = (mkLibRetroCore rec {
+  dosbox = mkLibRetroCore rec {
     core = "dosbox";
     src = fetchRetro {
       repo = core + "-libretro";
@@ -392,11 +372,9 @@ in with stdenv.lib.licenses;
     };
     description = "Port of DOSBox to libretro";
     license = gpl2;
-  }).override {
-    dontConfigure = true;
   };
 
-  eightyone = (mkLibRetroCore rec {
+  eightyone = mkLibRetroCore rec {
     core = "81";
     src = fetchRetro {
       repo = core + "-libretro";
@@ -405,11 +383,9 @@ in with stdenv.lib.licenses;
     };
     description = "Port of EightyOne to libretro";
     license = gpl3;
-  }).override {
-    dontConfigure = true;
   };
 
-  fbalpha2012 = (mkLibRetroCore rec {
+  fbalpha2012 = mkLibRetroCore rec {
     core = "fbalpha2012";
     src = fetchRetro {
       repo = core;
@@ -418,12 +394,11 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Final Burn Alpha ~2012 to libretro";
     license = "Non-commercial";
-  }).override {
     makefile = "makefile.libretro";
-    configurePhase = "cd svn-current/trunk";
+    preBuild = "cd svn-current/trunk";
   };
 
-  fbneo = (mkLibRetroCore rec {
+  fbneo = mkLibRetroCore rec {
     core = "fbneo";
     src = fetchRetro {
       repo = core;
@@ -432,16 +407,15 @@ in with stdenv.lib.licenses;
     };
     description = "Port of FBNeo to libretro";
     license = "Non-commercial";
-  }).override {
     makefile = "Makefile";
     postPatch = ''
       sed -i -e 's:-Wall:-Wall -Wno-format-security:g' src/burner/libretro/Makefile
     '';
-    preConfigure = "cd src/burner/libretro";
+    preBuild = "cd src/burner/libretro";
     makeFlags = [ "USE_EXPERIMENTAL_FLAGS=1" ];
   };
 
-  fceumm = (mkLibRetroCore rec {
+  fceumm = mkLibRetroCore rec {
     core = "fceumm";
     src = fetchRetro {
       repo = "libretro-" + core;
@@ -450,11 +424,9 @@ in with stdenv.lib.licenses;
     };
     description = "FCEUmm libretro port";
     license = gpl2;
-  }).override {
-    dontConfigure = true;
   };
 
-  flycast = (mkLibRetroCore rec {
+  flycast = mkLibRetroCore rec {
     core = "flycast";
     src = fetchRetro {
       repo = core;
@@ -464,14 +436,12 @@ in with stdenv.lib.licenses;
     description = "Flycast libretro port";
     license = gpl2;
     extraBuildInputs = [ libGL libGLU ];
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
-    makeFlags = [ "HAVE_GL2=1" "HAVE_VULKAN=1" ] ++ stdenv.lib.optionals stdenv.isAarch64 [ "platform=arm64" ];
+    makeFlags = stdenv.lib.optional stdenv.hostPlatform.isAarch64 [ "platform=arm64" ];
     meta.platforms = [ "aarch64-linux" "x86_64-linux" ];
   };
 
-  fmsx = (mkLibRetroCore rec {
+  fmsx = mkLibRetroCore rec {
     core = "fmsx";
     src = fetchRetro {
       repo = core + "-libretro";
@@ -479,13 +449,11 @@ in with stdenv.lib.licenses;
       sha256 = "1krr4lmdiv0d7bxk37fqz5y412znb5bmxapv9g7ci6fp87sr69jq";
     };
     description = "FMSX libretro port";
-    license = "Non-Commercial";
-  }).override {
+    license = "Non-commercial";
     makefile = "Makefile";
-    dontConfigure = true;
   };
 
-  freeintv = (mkLibRetroCore rec {
+  freeintv = mkLibRetroCore rec {
     core = "freeintv";
     src = fetchRetro {
       repo = core;
@@ -494,12 +462,10 @@ in with stdenv.lib.licenses;
     };
     description = "FreeIntv libretro port";
     license = gpl3;
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
   };
 
-  gambatte = (mkLibRetroCore rec {
+  gambatte = mkLibRetroCore rec {
     core = "gambatte";
     src = fetchRetro {
       repo = core + "-libretro";
@@ -508,11 +474,9 @@ in with stdenv.lib.licenses;
     };
     description = "Gambatte libretro port";
     license = gpl2;
-  }).override {
-    dontConfigure = true;
   };
 
-  genesis-plus-gx = (mkLibRetroCore {
+  genesis-plus-gx = mkLibRetroCore {
     core = "genesis-plus-gx";
     src = fetchRetro {
       repo = "Genesis-Plus-GX";
@@ -521,11 +485,9 @@ in with stdenv.lib.licenses;
     };
     description = "Enhanced Genesis Plus libretro port";
     license = "Non-commercial";
-  }).override {
-    dontConfigure = true;
   };
 
-  gpsp = (mkLibRetroCore rec {
+  gpsp = mkLibRetroCore rec {
     core = "gpsp";
     src = fetchRetro {
       repo = core;
@@ -534,12 +496,10 @@ in with stdenv.lib.licenses;
     };
     description = "Port of gpSP to libretro";
     license = gpl2;
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
   };
 
-  gw = (mkLibRetroCore rec {
+  gw = mkLibRetroCore rec {
     core = "gw";
     src = fetchRetro {
       repo = core + "-libretro";
@@ -548,12 +508,10 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Game and Watch to libretro";
     license = zlib;
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
   };
 
-  handy = (mkLibRetroCore rec {
+  handy = mkLibRetroCore rec {
     core = "handy";
     src = fetchRetro {
       repo = "libretro-" + core;
@@ -562,12 +520,10 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Handy to libretro";
     license = "Handy-License";
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
   };
 
-  hatari = (mkLibRetroCore rec {
+  hatari = mkLibRetroCore rec {
     core = "hatari";
     src = fetchRetro {
       repo = core;
@@ -576,19 +532,15 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Hatari to libretro";
     license = gpl2;
-    extraBuildInputs = [ SDL ];
-  }).override {
-    patchPhase = ''
-      rm configure \
-      && rm CMakeLists.txt \
-      && cp -v libretro/libretro.h src/ \
-      && substituteInPlace src/midi.c --replace "<libretro.h>" "\"../libretro/libretro.h\""
-    '';
+    extraBuildInputs = [ SDL zlib ];
+    extraNativeBuildInputs = [ cmake which ];
+    dontUseCmakeConfigure = true;
     dontConfigure = true;
-    makefile = "Makefile.libretro";
+    makeFlags = [ "EXTERNAL_ZLIB=1" ];
+    depsBuildBuild = [ buildPackages.stdenv.cc ];
   };
 
-  mame = (mkLibRetroCore {
+  mame = mkLibRetroCore {
     core = "mame";
     src = fetchRetro {
       repo = "mame";
@@ -599,17 +551,15 @@ in with stdenv.lib.licenses;
     license = gpl2Plus;
 
     extraBuildInputs = [ alsaLib libGLU libGL portaudio python27 xorg.libX11 ];
-  }).override {
     postPatch = ''
       # Prevent the failure during the parallel building of:
       # make -C 3rdparty/genie/build/gmake.linux -f genie.make obj/Release/src/host/lua-5.3.0/src/lgc.o
       mkdir -p 3rdparty/genie/build/gmake.linux/obj/Release/src/host/lua-5.3.0/src
     '';
     makefile = "Makefile.libretro";
-    dontConfigure = true;
   };
 
-  mame2000 = (mkLibRetroCore rec {
+  mame2000 = mkLibRetroCore rec {
     core = "mame2000";
     src = fetchRetro {
       repo = core + "-libretro";
@@ -618,13 +568,11 @@ in with stdenv.lib.licenses;
     };
     description = "Port of MAME ~2000 to libretro";
     license = gpl2Plus;
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
-    makeFlags = stdenv.lib.optionals stdenv.isAarch64 [ "ARM=0" "IS_X86=0" ];
+    makeFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "IS_X86=0";
   };
 
-  mame2003 = (mkLibRetroCore rec {
+  mame2003 = mkLibRetroCore rec {
     core = "mame2003";
     src = fetchRetro {
       repo = core + "-libretro";
@@ -633,12 +581,10 @@ in with stdenv.lib.licenses;
     };
     description = "Port of MAME ~2003 to libretro";
     license = gpl2Plus;
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
   };
 
-  mame2003-plus = (mkLibRetroCore rec {
+  mame2003-plus = mkLibRetroCore rec {
     core = "mame2003-plus";
     src = fetchRetro {
       repo = core + "-libretro";
@@ -647,12 +593,10 @@ in with stdenv.lib.licenses;
     };
     description = "Port of MAME ~2003+ to libretro";
     license = gpl2Plus;
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
   };
 
-  mame2010 = (mkLibRetroCore rec {
+  mame2010 = mkLibRetroCore rec {
     core = "mame2010";
     src = fetchRetro {
       repo = core + "-libretro";
@@ -661,13 +605,11 @@ in with stdenv.lib.licenses;
     };
     description = "Port of MAME ~2010 to libretro";
     license = gpl2Plus;
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
-    makeFlags = [ "PTR64=1" "ARM_ENABLED=1" "X86_SH2DRC=0" "FORCE_DRC_C_BACKEND=1" ];
+    makeFlags = stdenv.lib.optionals stdenv.hostPlatform.isAarch64 [ "PTR64=1" "ARM_ENABLED=1" "X86_SH2DRC=0" "FORCE_DRC_C_BACKEND=1" ];
   };
 
-  mame2015 = (mkLibRetroCore rec {
+  mame2015 = mkLibRetroCore rec {
     core = "mame2015";
     src = fetchRetro {
       repo = core + "-libretro";
@@ -676,13 +618,12 @@ in with stdenv.lib.licenses;
     };
     description = "Port of MAME ~2015 to libretro";
     license = gpl2Plus;
-    extraBuildInputs = [ python27 alsaLib ];
-  }).override {
+    extraNativeBuildInputs = [ python27 ];
+    extraBuildInputs = [ alsaLib ];
     makefile = "Makefile";
-    dontConfigure = true;
   };
 
-  mame2016 = (mkLibRetroCore rec {
+  mame2016 = mkLibRetroCore rec {
     core = "mame2016";
     src = fetchRetro {
       repo = core + "-libretro";
@@ -691,18 +632,16 @@ in with stdenv.lib.licenses;
     };
     description = "Port of MAME ~2016 to libretro";
     license = gpl2Plus;
-    extraBuildInputs = [ python27 alsaLib ];
-  }).override {
-    makefile = "Makefile.libretro";
+    extraNativeBuildInputs = [ python27 ];
+    extraBuildInputs = [ alsaLib ];
     postPatch = ''
       # Prevent the failure during the parallel building of:
       # make -C 3rdparty/genie/build/gmake.linux -f genie.make obj/Release/src/host/lua-5.3.0/src/lgc.o
       mkdir -p 3rdparty/genie/build/gmake.linux/obj/Release/src/host/lua-5.3.0/src
     '';
-    dontConfigure = true;
   };
 
-  mesen = (mkLibRetroCore rec {
+  mesen = mkLibRetroCore rec {
     core = "mesen";
     src = fetchFromGitHub {
       owner = "SourMesen";
@@ -712,12 +651,11 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Mesen to libretro";
     license = gpl3;
-  }).override {
     makefile = "Makefile";
-    configurePhase = "cd Libretro";
+    preBuild = "cd Libretro";
   };
 
-  meteor = (mkLibRetroCore rec {
+  meteor = mkLibRetroCore rec {
     core = "meteor";
     src = fetchRetro {
       repo = core + "-libretro";
@@ -726,9 +664,8 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Meteor to libretro";
     license = gpl3;
-  }).override {
     makefile = "Makefile";
-    preConfigure = "cd libretro";
+    preBuild = "cd libretro";
   };
 
   mgba = mkLibRetroCore rec {
@@ -742,7 +679,7 @@ in with stdenv.lib.licenses;
     license = mpl20;
   };
 
-  mupen64plus = (mkLibRetroCore rec {
+  mupen64plus = mkLibRetroCore {
     core = "mupen64plus-next";
     src = fetchRetro {
       repo = "mupen64plus-libretro-nx";
@@ -753,12 +690,10 @@ in with stdenv.lib.licenses;
     license = gpl2;
 
     extraBuildInputs = [ libGLU libGL libpng nasm xorg.libX11 ];
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
   };
 
-  neocd = (mkLibRetroCore rec {
+  neocd = mkLibRetroCore rec {
     core = "neocd";
     src = fetchRetro {
       repo = core + "_libretro";
@@ -767,12 +702,10 @@ in with stdenv.lib.licenses;
     };
     description = "NeoCD libretro port";
     license = gpl3;
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
   };
 
-  nestopia = (mkLibRetroCore rec {
+  nestopia = mkLibRetroCore rec {
     core = "nestopia";
     src = fetchRetro {
       repo = core;
@@ -781,12 +714,11 @@ in with stdenv.lib.licenses;
     };
     description = "Nestopia libretro port";
     license = gpl2;
-  }).override {
     makefile = "Makefile";
-    configurePhase = "cd libretro";
+    preBuild = "cd libretro";
   };
 
-  o2em = (mkLibRetroCore rec {
+  o2em = mkLibRetroCore rec {
     core = "o2em";
     src = fetchRetro {
       repo = "libretro-" + core;
@@ -795,12 +727,10 @@ in with stdenv.lib.licenses;
     };
     description = "Port of O2EM to libretro";
     license = artistic1;
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
   };
 
-  opera = (mkLibRetroCore rec {
+  opera = mkLibRetroCore rec {
     core = "opera";
     src = fetchRetro {
       repo = core + "-libretro";
@@ -809,12 +739,11 @@ in with stdenv.lib.licenses;
     };
     description = "Opera is a port of 4DO/libfreedo to libretro";
     license = "Non-commercial";
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
+    makeFlags = [ "CC_PREFIX=${stdenv.cc.targetPrefix}" ];
   };
 
-  parallel-n64 = (mkLibRetroCore rec {
+  parallel-n64 = mkLibRetroCore rec {
     core = "parallel-n64";
     src = fetchRetro {
       repo = core;
@@ -824,17 +753,14 @@ in with stdenv.lib.licenses;
     description = "Parallel Mupen64plus rewrite for libretro.";
     license = gpl2;
     extraBuildInputs = [ libGLU libGL libpng ];
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
-    postPatch = stdenv.lib.optionals stdenv.isAarch64 ''
+    postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isAarch64 ''
       sed -i -e '1 i\CPUFLAGS += -DARM_FIX -DNO_ASM -DARM_ASM -DDONT_WANT_ARM_OPTIMIZATIONS -DARM64' Makefile \
       && sed -i -e 's,CPUFLAGS  :=,,g' Makefile
     '';
-    makeFlags = stdenv.lib.optionals stdenv.isAarch64 [ "WITH_DYNAREC=aarch64" ];
   };
 
-  pcsx_rearmed = (mkLibRetroCore rec {
+  pcsx_rearmed = mkLibRetroCore rec {
     core = "pcsx_rearmed";
     src = fetchRetro {
       repo = core;
@@ -843,13 +769,10 @@ in with stdenv.lib.licenses;
     };
     description = "Port of PCSX ReARMed with GNU lightning to libretro";
     license = gpl2;
-  }).override {
-    makefile = "Makefile.libretro";
     dontConfigure = true;
-    makeFlags = [ "DYNAREC=lightrec" ];
   };
 
-  picodrive = (mkLibRetroCore rec {
+  picodrive = mkLibRetroCore rec {
     core = "picodrive";
     src = fetchRetro {
       repo = core;
@@ -860,12 +783,13 @@ in with stdenv.lib.licenses;
     license = "MAME";
 
     extraBuildInputs = [ libpng SDL ];
-  }).override {
-    dontConfigure = true;
-    makeFlags = stdenv.lib.optionals stdenv.isAarch64 [ "platform=aarch64" ];
+    SDL_CONFIG = "${SDL.dev}/bin/sdl-config";
+    dontAddPrefix = true;
+    configurePlatforms = [];
+    meta.badPlatforms = [ "aarch64-linux" ];
   };
 
-  play = (mkLibRetroCore rec {
+  play = mkLibRetroCore {
     core = "play";
     src = fetchRetro {
       repo = "play-";
@@ -874,14 +798,14 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Play! to libretro";
     license = bsd2;
-    extraBuildInputs = [ cmake boost openssl curl icu libGL libGLU xorg.libX11 ];
-  }).override {
+    extraBuildInputs = [ boost ];
+    extraNativeBuildInputs = [ cmake openssl curl icu libGL libGLU xorg.libX11 ];
     makefile = "Makefile";
     cmakeFlags = [ "-DBUILD_PLAY=OFF -DBUILD_LIBRETRO_CORE=ON" ];
     postBuild = "mv Source/ui_libretro/play_libretro${stdenv.hostPlatform.extensions.sharedLibrary} play_libretro${stdenv.hostPlatform.extensions.sharedLibrary}";
   };
 
-  ppsspp = (mkLibRetroCore rec {
+  ppsspp = mkLibRetroCore {
     core = "ppsspp";
     src = fetchgit {
       url = "https://github.com/hrydgard/ppsspp";
@@ -890,14 +814,14 @@ in with stdenv.lib.licenses;
     };
     description = "ppsspp libretro port";
     license = gpl2;
-    extraBuildInputs = [ cmake libGLU libGL libzip ffmpeg pkgconfig python37 snappy xorg.libX11 ];
-  }).override {
+    extraNativeBuildInputs = [ cmake pkgconfig ];
+    extraBuildInputs = [ libGLU libGL libzip ffmpeg python37 snappy xorg.libX11 ];
     makefile = "Makefile";
     cmakeFlags = [ "-DLIBRETRO=ON -DUSE_SYSTEM_FFMPEG=ON -DUSE_SYSTEM_SNAPPY=ON -DUSE_SYSTEM_LIBZIP=ON -DOpenGL_GL_PREFERENCE=GLVND" ];
     postBuild = "mv lib/ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary} ppsspp_libretro${stdenv.hostPlatform.extensions.sharedLibrary}";
   };
 
-  prboom = (mkLibRetroCore rec {
+  prboom = mkLibRetroCore rec {
     core = "prboom";
     src = fetchRetro {
       repo = "libretro-" + core;
@@ -906,12 +830,10 @@ in with stdenv.lib.licenses;
     };
     description = "Prboom libretro port";
     license = gpl2;
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
   };
 
-  prosystem = (mkLibRetroCore rec {
+  prosystem = mkLibRetroCore rec {
     core = "prosystem";
     src = fetchRetro {
       repo = core + "-libretro";
@@ -920,12 +842,10 @@ in with stdenv.lib.licenses;
     };
     description = "Port of ProSystem to libretro";
     license = gpl2;
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
   };
 
-  quicknes = (mkLibRetroCore rec {
+  quicknes = mkLibRetroCore {
     core = "quicknes";
     src = fetchRetro {
       repo = "QuickNES_Core";
@@ -934,12 +854,10 @@ in with stdenv.lib.licenses;
     };
     description = "QuickNES libretro port";
     license = lgpl21Plus;
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
   };
 
-  sameboy = (mkLibRetroCore rec {
+  sameboy = mkLibRetroCore rec {
     core = "sameboy";
     src = fetchRetro {
       repo = "sameboy";
@@ -948,14 +866,12 @@ in with stdenv.lib.licenses;
     };
     description = "SameBoy libretro port";
     license = mit;
-    extraBuildInputs = [ which hexdump ];
-  }).override {
+    extraNativeBuildInputs = [ which hexdump ];
+    preBuild = "cd libretro";
     makefile = "Makefile";
-    configurePhase = "cd libretro";
-    makeFlags = [ "GIT_VERSION=$version" ];
   };
 
-  scummvm = (mkLibRetroCore rec {
+  scummvm = mkLibRetroCore rec {
     core = "scummvm";
     src = fetchRetro {
       repo = core;
@@ -965,12 +881,11 @@ in with stdenv.lib.licenses;
     description = "Libretro port of ScummVM";
     license = gpl2;
     extraBuildInputs = [ fluidsynth libjpeg libvorbis libGLU libGL SDL ];
-  }).override {
     makefile = "Makefile";
-    configurePhase = "cd backends/platform/libretro/build";    
+    preConfigure = "cd backends/platform/libretro/build";
   };
 
-  smsplus-gx = (mkLibRetroCore rec {
+  smsplus-gx = mkLibRetroCore rec {
     core = "smsplus";
     src = fetchRetro {
       repo = core + "-gx";
@@ -979,11 +894,9 @@ in with stdenv.lib.licenses;
     };
     description = "SMS Plus GX libretro port";
     license = gpl2Plus;
-  }).override {
-    dontConfigure = true;
   };
 
-  snes9x = (mkLibRetroCore rec {
+  snes9x = mkLibRetroCore rec {
     core = "snes9x";
     src = fetchFromGitHub {
       owner = "snes9xgit";
@@ -993,12 +906,11 @@ in with stdenv.lib.licenses;
     };
     description = "Port of SNES9x git to libretro";
     license = "Non-commercial";
-  }).override {
     makefile = "Makefile";
-    configurePhase = "cd libretro";
+    preBuild = "cd libretro";
   };
 
-  snes9x2002 = (mkLibRetroCore rec {
+  snes9x2002 = mkLibRetroCore rec {
     core = "snes9x2002";
     src = fetchRetro {
       repo = core;
@@ -1007,12 +919,10 @@ in with stdenv.lib.licenses;
     };
     description = "Optimized port/rewrite of SNES9x 1.39 to Libretro";
     license = "Non-commercial";
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
   };
 
-  snes9x2005 = (mkLibRetroCore rec {
+  snes9x2005 = mkLibRetroCore rec {
     core = "snes9x2005";
     src = fetchRetro {
       repo = core;
@@ -1021,14 +931,12 @@ in with stdenv.lib.licenses;
     };
     description = "Optimized port/rewrite of SNES9x 1.43 to Libretro";
     license = "Non-commercial";
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
     makeFlags = [ "USE_BLARGG_APU=1" ];
     postBuild = "mv snes9x2005_plus_libretro${stdenv.hostPlatform.extensions.sharedLibrary} snes9x2005_libretro${stdenv.hostPlatform.extensions.sharedLibrary}";
   };
 
-  snes9x2010 = (mkLibRetroCore rec {
+  snes9x2010 = mkLibRetroCore rec {
     core = "snes9x2010";
     src = fetchRetro {
       repo = core;
@@ -1037,12 +945,9 @@ in with stdenv.lib.licenses;
     };
     description = "Optimized port/rewrite of SNES9x 1.52+ to Libretro";
     license = "Non-commercial";
-  }).override {
-    makefile = "Makefile.libretro";
-    dontConfigure = true;
   };
 
-  stella = (mkLibRetroCore rec {
+  stella = mkLibRetroCore rec {
     core = "stella";
     src = fetchFromGitHub {
       owner = "stella-emu";
@@ -1053,13 +958,12 @@ in with stdenv.lib.licenses;
     description = "Port of Stella to libretro";
     license = gpl2;
     extraBuildInputs = [ libpng pkgconfig SDL ];
-  }).override {
     makefile = "Makefile";
-    configurePhase = "cd src/libretro";
-    makeFlags = [ "LTO=" ];    
+    preBuild = "cd src/libretro";
+    dontConfigure = true;
   };
 
-  stella2014 = (mkLibRetroCore rec {
+  stella2014 = mkLibRetroCore rec {
     core = "stella2014";
     src = fetchRetro {
       repo = core + "-libretro";
@@ -1068,12 +972,10 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Stella to libretro";
     license = gpl2;
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
   };
 
-  tgbdual = (mkLibRetroCore rec {
+  tgbdual = mkLibRetroCore rec {
     core = "tgbdual";
     src = fetchRetro {
       repo = core + "-libretro";
@@ -1082,12 +984,10 @@ in with stdenv.lib.licenses;
     };
     description = "Port of TGBDual to libretro";
     license = gpl2;
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
   };
 
-  tic80 = (mkLibRetroCore rec {
+  tic80 = mkLibRetroCore {
     core = "tic80";
     src = fetchRetro {
       repo = "tic-80";
@@ -1096,8 +996,7 @@ in with stdenv.lib.licenses;
     };
     description = "Port of TIC-80 to libretro";
     license = mit;
-    extraBuildInputs = [ cmake pkgconfig ];
-  }).override {
+    extraNativeBuildInputs = [ cmake pkgconfig ];
     makefile = "Makefile";
     cmakeFlags = [
       "-DBUILD_LIBRETRO=ON"
@@ -1121,7 +1020,7 @@ in with stdenv.lib.licenses;
     license = gpl2;
   };
 
-  vba-m = (mkLibRetroCore rec {
+  vba-m = mkLibRetroCore rec {
     core = "vbam";
     src = fetchRetro {
       repo = core + "-libretro";
@@ -1130,12 +1029,11 @@ in with stdenv.lib.licenses;
     };
     description = "vanilla VBA-M libretro port";
     license = gpl2;
-  }).override {
     makefile = "Makefile";
-    configurePhase = "cd src/libretro";
+    preBuild = "cd src/libretro";
   };
 
-  vecx = (mkLibRetroCore rec {
+  vecx = mkLibRetroCore rec {
     core = "vecx";
     src = fetchRetro {
       repo = "libretro-" + core;
@@ -1144,11 +1042,9 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Vecx to libretro";
     license = gpl3;
-  }).override {
-    dontConfigure = true;
   };
 
-  virtualjaguar = (mkLibRetroCore rec {
+  virtualjaguar = mkLibRetroCore rec {
     core = "virtualjaguar";
     src = fetchRetro {
       repo = core + "-libretro";
@@ -1157,12 +1053,10 @@ in with stdenv.lib.licenses;
     };
     description = "Port of VirtualJaguar to libretro";
     license = gpl3;
-  }).override {
     makefile = "Makefile";
-    dontConfigure = true;
   };
 
-  yabause = (mkLibRetroCore rec {
+  yabause = mkLibRetroCore rec {
     core = "yabause";
     src = fetchRetro {
       repo = core;
@@ -1171,11 +1065,10 @@ in with stdenv.lib.licenses;
     };
     description = "Port of Yabause to libretro";
     license = gpl2;
-  }).override {
     makefile = "Makefile";
-    configurePhase = "cd yabause/src/libretro";
     # Disable SSE for non-x86. DYNAREC doesn't build on either Aarch64 or x86_64.
-    makeFlags = [ "HAVE_SSE=0" "DYNAREC=0" ];
+    makeFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "HAVE_SSE=0";
+    preBuild = "cd yabause/src/libretro";
   };
 
 }

From 9d8d66baf56210604cb78c2bc717e717be386812 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 21 Mar 2020 23:23:24 -0400
Subject: [PATCH 3691/4636] nixos/nixpkgs.nix: Allow just using config in
 system (#80818)

* nixos/nixpkgs.nix: Allow just using config in system

This assertion requires system to work properly. We might not have
this in cases where the user just sets config and wants Nixpkgs to
infer system from that. This adds a default for when this happens,
using doubleFromSystem.

* parens
---
 nixos/modules/misc/nixpkgs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 011d493c1538..4f5a9250eaae 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -236,8 +236,8 @@ in
         let
           nixosExpectedSystem =
             if config.nixpkgs.crossSystem != null
-            then config.nixpkgs.crossSystem.system
-            else config.nixpkgs.localSystem.system;
+            then config.nixpkgs.crossSystem.system or (lib.systems.parse.doubleFromSystem (lib.systems.parse.mkSystemFromString config.nixpkgs.crossSystem.config))
+            else config.nixpkgs.localSystem.system or (lib.systems.parse.doubleFromSystem (lib.systems.parse.mkSystemFromString config.nixpkgs.localSystem.config));
           nixosOption =
             if config.nixpkgs.crossSystem != null
             then "nixpkgs.crossSystem"

From a8a0cb147fa30d2eb17ac19d9fc0cee013d9020d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 21 Mar 2020 23:36:54 -0400
Subject: [PATCH 3692/4636] retroarch: remove macOS app support

This is badly out of date so requires extra work to get working.

Anyway, you can still use it without the menu, with no problem.
---
 pkgs/misc/emulators/retroarch/default.nix | 33 +----------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
index 7db4cb18b3c5..02d098654321 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -19,15 +19,7 @@
 
 with stdenv.lib;
 
-let
-
-  # ibtool is closed source so we have to download the blob
-  osx-MainMenu = fetchurl {
-    url = "https://github.com/matthewbauer/RetroArch/raw/b146a9ac6b2b516652a7bf05a9db5a804eab323d/pkg/apple/OSX/en.lproj/MainMenu.nib";
-    sha256 = "13k1l628wy0rp6wxrpwr4g1m9c997d0q8ks50f8zhmh40l5j2sp8";
-  };
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "retroarch-bare";
   version = "1.8.5";
 
@@ -54,29 +46,6 @@ in stdenv.mkDerivation rec {
 
   postInstall = optionalString withVulkan ''
     wrapProgram $out/bin/retroarch --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib
-  '' + optionalString stdenv.targetPlatform.isDarwin ''
-    EXECUTABLE_NAME=RetroArch
-    PRODUCT_NAME=RetroArch
-    MACOSX_DEPLOYMENT_TARGET=10.5
-    app=$out/Applications/$PRODUCT_NAME.app
-
-    install -D pkg/apple/OSX/Info.plist $app/Contents/Info.plist
-    echo "APPL????" > $app/Contents/PkgInfo
-    mkdir -p $app/Contents/MacOS
-    ln -s $out/bin/retroarch $app/Contents/MacOS/$EXECUTABLE_NAME
-
-    # Hack to fill in Info.plist template w/o using xcode
-    sed -i -e 's,''${EXECUTABLE_NAME}'",$EXECUTABLE_NAME," \
-           -e 's,''${MACOSX_DEPLOYMENT_TARGET}'",$MACOSX_DEPLOYMENT_TARGET," \
-           -e 's,''${PRODUCT_NAME}'",$PRODUCT_NAME," \
-           -e 's,''${PRODUCT_NAME:rfc1034identifier}'",$PRODUCT_NAME," \
-           $app/Contents/Info.plist
-
-    install -D ${osx-MainMenu} \
-               $app/Contents/Resources/en.lproj/MainMenu.nib
-    install -D pkg/apple/OSX/en.lproj/InfoPlist.strings \
-               $app/Contents/Resources/en.lproj/InfoPlist.strings
-    install -D media/retroarch.icns $app/Contents/Resources/retroarch.icns
   '';
 
   preFixup = "rm $out/bin/retroarch-cg2glsl";

From ed46adb48bbfadb4641ba26b787dc873986a7c86 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 21 Mar 2020 23:38:58 -0400
Subject: [PATCH 3693/4636] retroarch/cores.nix: use correct license for gw

This should be zlib the license, not zlib the package.
---
 pkgs/misc/emulators/retroarch/cores.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 63e1db108e73..e055e5a15fae 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -507,7 +507,7 @@ in with stdenv.lib.licenses;
       sha256 = "1jhgfys8hiipvbwq3gc48d7v6wq645d10rbr4w5m6px0fk6csshk";
     };
     description = "Port of Game and Watch to libretro";
-    license = zlib;
+    license = stdenv.lib.licenses.zlib;
     makefile = "Makefile";
   };
 

From 3e35b4b15b4d7c2cc10857d2466876dc7cfb779b Mon Sep 17 00:00:00 2001
From: mlatus <wqseleven@gmail.com>
Date: Sun, 22 Mar 2020 11:46:07 +0800
Subject: [PATCH 3694/4636] do not set QT_SCREEN_AUTO_SCALE_FACTOR

---
 pkgs/applications/audio/netease-cloud-music/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/audio/netease-cloud-music/default.nix b/pkgs/applications/audio/netease-cloud-music/default.nix
index 76dcba304a32..15afe233b3ab 100644
--- a/pkgs/applications/audio/netease-cloud-music/default.nix
+++ b/pkgs/applications/audio/netease-cloud-music/default.nix
@@ -68,7 +68,6 @@ in stdenv.mkDerivation rec {
 
     wrapProgram $out/bin/netease-cloud-music \
       --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \
-      --set QT_AUTO_SCREEN_SCALE_FACTOR 1 \
       --set QCEF_INSTALL_PATH "${deepin.qcef}/lib/qcef"
   '';
 

From d4874a7ee62c817b90d80098f53ad205f9909ccb Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Sat, 21 Mar 2020 04:27:09 +0000
Subject: [PATCH 3695/4636] vimPlugins: Automate redirect updates in update.py

Many of the plugins in vim-plugin-names are out of date and redirect to
their new github repos. This commit adds a flag to automatically update
these and defines a process for committing these updates into nixpkgs.
---
 doc/languages-frameworks/vim.section.md |   2 +-
 pkgs/misc/vim-plugins/update.py         | 100 ++++++++++++++++++++----
 2 files changed, 86 insertions(+), 16 deletions(-)

diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md
index 05a23d26cf2f..cd53926defeb 100644
--- a/doc/languages-frameworks/vim.section.md
+++ b/doc/languages-frameworks/vim.section.md
@@ -263,7 +263,7 @@ Sometimes plugins require an override that must be changed when the plugin is up
 
 To add a new plugin:
 
-  1. run `./update.py` and create a commit named "vimPlugins: Update",
+  1. run `./update.py --update-redirects` and create a commit named "vimPlugins: Update",
   2. add the new plugin to [vim-plugin-names](/pkgs/misc/vim-plugins/vim-plugin-names) and add overrides if required to [overrides.nix](/pkgs/misc/vim-plugins/overrides.nix),
   3. run `./update.py` again and create a commit named "vimPlugins.[name]: init at [version]" (where `name` and `version` can be found in [generated.nix](/pkgs/misc/vim-plugins/generated.nix)), and
   4. create a pull request.
diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
index 0ef93ac569ab..2a0688927114 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/misc/vim-plugins/update.py
@@ -9,13 +9,16 @@
 # $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265 update.py
 
 import argparse
+import fileinput
 import functools
+import http
 import json
 import os
 import subprocess
 import sys
 import traceback
 import urllib.error
+import urllib.parse
 import urllib.request
 import xml.etree.ElementTree as ET
 from datetime import datetime
@@ -71,9 +74,11 @@ def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: floa
 
 
 class Repo:
-    def __init__(self, owner: str, name: str) -> None:
+    def __init__(self, owner: str, name: str, alias: str) -> None:
         self.owner = owner
         self.name = name
+        self.alias = alias
+        self.redirect: Dict[str, str] = {}
 
     def url(self, path: str) -> str:
         return urljoin(f"https://github.com/{self.owner}/{self.name}/", path)
@@ -96,7 +101,9 @@ class Repo:
 
     @retry(urllib.error.URLError, tries=4, delay=3, backoff=2)
     def latest_commit(self) -> Tuple[str, datetime]:
-        with urllib.request.urlopen(self.url("commits/master.atom"), timeout=10) as req:
+        commit_url = self.url("commits/master.atom")
+        with urllib.request.urlopen(commit_url, timeout=10) as req:
+            self.check_for_redirect(commit_url, req)
             xml = req.read()
             root = ET.fromstring(xml)
             latest_entry = root.find(ATOM_ENTRY)
@@ -111,6 +118,22 @@ class Repo:
             updated = datetime.strptime(updated_tag.text, "%Y-%m-%dT%H:%M:%SZ")
             return Path(str(url.path)).name, updated
 
+    def check_for_redirect(self, url: str, req: http.client.HTTPResponse):
+        response_url = req.geturl()
+        if url != response_url:
+            new_owner, new_name = (
+                urllib.parse.urlsplit(response_url).path.strip("/").split("/")[:2]
+            )
+            end_line = f" as {self.alias}\n" if self.alias else "\n"
+            plugin_line = "{owner}/{name}" + end_line
+
+            old_plugin = plugin_line.format(owner=self.owner, name=self.name)
+            new_plugin = plugin_line.format(owner=new_owner, name=new_name)
+            self.redirect[old_plugin] = new_plugin
+
+            if new_name != self.name:
+                print(f"Plugin Name Changed: {self.name} -> {new_name}")
+
     def prefetch_git(self, ref: str) -> str:
         data = subprocess.check_output(
             ["nix-prefetch-git", "--fetch-submodules", self.url(""), ref]
@@ -197,15 +220,17 @@ def get_current_plugins() -> List[Plugin]:
     return plugins
 
 
-def prefetch_plugin(user: str, repo_name: str, alias: str, cache: "Cache") -> Plugin:
-    repo = Repo(user, repo_name)
+def prefetch_plugin(
+    user: str, repo_name: str, alias: str, cache: "Cache"
+) -> Tuple[Plugin, Dict[str, str]]:
+    repo = Repo(user, repo_name, alias)
     commit, date = repo.latest_commit()
     has_submodules = repo.has_submodules()
     cached_plugin = cache[commit]
     if cached_plugin is not None:
         cached_plugin.name = alias or repo_name
         cached_plugin.date = date
-        return cached_plugin
+        return cached_plugin, repo.redirect
 
     print(f"prefetch {user}/{repo_name}")
     if has_submodules:
@@ -213,7 +238,10 @@ def prefetch_plugin(user: str, repo_name: str, alias: str, cache: "Cache") -> Pl
     else:
         sha256 = repo.prefetch_github(commit)
 
-    return Plugin(alias or repo_name, commit, has_submodules, sha256, date=date)
+    return (
+        Plugin(alias or repo_name, commit, has_submodules, sha256, date=date),
+        repo.redirect,
+    )
 
 
 def print_download_error(plugin: str, ex: Exception):
@@ -227,20 +255,22 @@ def print_download_error(plugin: str, ex: Exception):
 
 
 def check_results(
-    results: List[Tuple[str, str, Union[Exception, Plugin]]]
-) -> List[Tuple[str, str, Plugin]]:
+    results: List[Tuple[str, str, Union[Exception, Plugin], Dict[str, str]]]
+) -> Tuple[List[Tuple[str, str, Plugin]], Dict[str, str]]:
     failures: List[Tuple[str, Exception]] = []
     plugins = []
-    for (owner, name, result) in results:
+    redirects: Dict[str, str] = {}
+    for (owner, name, result, redirect) in results:
         if isinstance(result, Exception):
             failures.append((name, result))
         else:
             plugins.append((owner, name, result))
+            redirects.update(redirect)
 
     print(f"{len(results) - len(failures)} plugins were checked", end="")
     if len(failures) == 0:
         print()
-        return plugins
+        return plugins, redirects
     else:
         print(f", {len(failures)} plugin(s) could not be downloaded:\n")
 
@@ -328,15 +358,15 @@ class Cache:
 
 def prefetch(
     args: Tuple[str, str, str], cache: Cache
-) -> Tuple[str, str, Union[Exception, Plugin]]:
+) -> Tuple[str, str, Union[Exception, Plugin], dict]:
     assert len(args) == 3
     owner, repo, alias = args
     try:
-        plugin = prefetch_plugin(owner, repo, alias, cache)
+        plugin, redirect = prefetch_plugin(owner, repo, alias, cache)
         cache[plugin.commit] = plugin
-        return (owner, repo, plugin)
+        return (owner, repo, plugin, redirect)
     except Exception as e:
-        return (owner, repo, e)
+        return (owner, repo, e, {})
 
 
 header = (
@@ -386,6 +416,31 @@ in lib.fix' (lib.extends overrides packages)
     print(f"updated {outfile}")
 
 
+def update_redirects(input_file: Path, output_file: Path, redirects: dict):
+    with fileinput.input(input_file, inplace=True) as f:
+        for line in f:
+            print(redirects.get(line, line), end="")
+    print(
+        f"""\
+Redirects have been detected and {input_file} has been updated. Please take the
+following steps:
+    1. Go ahead and commit just the updated expressions as you intended to do:
+            git add {output_file}
+            git commit -m "vimPlugins: Update"
+    2. If any of the plugin names were changed, add the old names as aliases in
+    aliases.nix
+    3. Make sure the updated {input_file} is still correctly sorted:
+            sort -udf ./vim-plugin-names > sorted && mv sorted vim-plugin-names
+    4. Run this script again so these changes will be reflected in the
+    generated expressions (no need to use the --update-redirects flag again):
+            ./update.py
+    5. Commit {input_file} along with aliases and generated expressions:
+            git add {output_file} {input_file} aliases.nix
+            git commit -m "vimPlugins: Update redirects"
+"""
+    )
+
+
 def parse_args():
     parser = argparse.ArgumentParser(
         description=(
@@ -407,6 +462,12 @@ def parse_args():
         default=DEFAULT_OUT,
         help="Filename to save generated nix code",
     )
+    parser.add_argument(
+        "--update-redirects",
+        dest="update_redirects",
+        action="store_true",
+        help="Update input file if repos have been redirected.",
+    )
 
     return parser.parse_args()
 
@@ -428,10 +489,19 @@ def main() -> None:
     finally:
         cache.store()
 
-    plugins = check_results(results)
+    plugins, redirects = check_results(results)
 
     generate_nix(plugins, args.outfile)
 
+    if redirects:
+        if args.update_redirects:
+            update_redirects(args.input_file, args.outfile, redirects)
+        else:
+            print(
+                "Outdated vim-plugin-names found. Please run with "
+                "--update-redirects flag."
+            )
+
 
 if __name__ == "__main__":
     main()

From c78aa8e1004bc383038bb1ba7c192becce42ce96 Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Sun, 22 Mar 2020 04:05:19 +0000
Subject: [PATCH 3696/4636] vimPlugins: Update

---
 pkgs/misc/vim-plugins/generated.nix | 70 ++++++++++++++---------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 06667caf5c83..427384cb7110 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -611,12 +611,12 @@ let
 
   coc-tsserver = buildVimPluginFrom2Nix {
     pname = "coc-tsserver";
-    version = "2020-03-09";
+    version = "2020-03-21";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc-tsserver";
-      rev = "dae0cc36b0245a601d4431ae8dd2319eaa919058";
-      sha256 = "1559c0hwyknz1j6vbigywg1fjads4wf8by59z0sri6aah9q77q2z";
+      rev = "54bea1ec1ab44802a155f876a4d1cc2c44b2bc42";
+      sha256 = "0npjc7c3x9mdqc6asav1f2wwv4p6lb5hk7c1p9b7m3vjg21w0k22";
     };
   };
 
@@ -909,12 +909,12 @@ let
 
   denite-nvim = buildVimPluginFrom2Nix {
     pname = "denite-nvim";
-    version = "2020-03-18";
+    version = "2020-03-21";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "denite.nvim";
-      rev = "a184e87b7df5e8f35aee115153b37f178e47718c";
-      sha256 = "1na637k62sgpqx69r6j5prad4qdc9dp3psq75jhqyvhm3yq2432w";
+      rev = "c3206a06508a197650ee4e1d85da39ff24e3a56b";
+      sha256 = "1yy6j5zpja8jr1j8sghwc1l0fkb47r8cvv36ckf75x9x5gpylb5m";
     };
   };
 
@@ -1121,12 +1121,12 @@ let
 
   deoplete-nvim = buildVimPluginFrom2Nix {
     pname = "deoplete-nvim";
-    version = "2020-03-18";
+    version = "2020-03-21";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "deoplete.nvim";
-      rev = "db7d2dc5f416634c9917054bcd6e1e5d925bb4d7";
-      sha256 = "1d34zy81j47icsrnbxpp4x9f35ihrmd0lnd0vphi216kdlkxk37b";
+      rev = "1439c621dc94016c504e1732ce8270081a42768f";
+      sha256 = "1c8qx839zmf52cfazlbbnlhxw6cvnsr3ds0rclawgycbl4s1qy8f";
     };
   };
 
@@ -2027,12 +2027,12 @@ let
 
   neoformat = buildVimPluginFrom2Nix {
     pname = "neoformat";
-    version = "2020-03-03";
+    version = "2020-03-20";
     src = fetchFromGitHub {
       owner = "sbdchd";
       repo = "neoformat";
-      rev = "69140aedb7da5a5a0b25b82e7f756f91d08170ea";
-      sha256 = "132ksy20rb01xm18zwwl3lv5zapfhfvaf5zz6md8dnr5hvkvvrgx";
+      rev = "d02b169e70bd6d2b2365bf6cda721967616a30bf";
+      sha256 = "1cya26wfqc7l7dqy854m4kwrq3w66knmn2cgviqh9cnsjzhwxs0d";
     };
   };
 
@@ -2258,12 +2258,12 @@ let
 
   nvim-lsp = buildVimPluginFrom2Nix {
     pname = "nvim-lsp";
-    version = "2020-03-19";
+    version = "2020-03-21";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lsp";
-      rev = "6d5e81c71bb90568b3bf9ca061980b9b30cdbc15";
-      sha256 = "1va480pw7nk650bmh4z7rvr2a5sqd4q86y19341p6mj12p2r2fcv";
+      rev = "4fe58ec4e1fa3500c7ef98464174bf6c4cb8ce67";
+      sha256 = "1xyqbr0f2pgvbbk0cpg92pswavff910hy8rjkm05grhqw43vkzcg";
     };
   };
 
@@ -3568,12 +3568,12 @@ let
 
   vim-codefmt = buildVimPluginFrom2Nix {
     pname = "vim-codefmt";
-    version = "2020-02-26";
+    version = "2020-03-20";
     src = fetchFromGitHub {
       owner = "google";
       repo = "vim-codefmt";
-      rev = "6d69f933f243ed3d7797641bd41c0e65d245c931";
-      sha256 = "0vzzyz7v03ihky3vx12rji4l1r6vbxgslvc1fvi4dznfqn5m9gfn";
+      rev = "d6676620f7a85fa49e8893cad041df59497fd845";
+      sha256 = "01wrlq9h2wzngi8qna0zrwycrp0iqp7qsijyby287zbckrs25rnd";
     };
   };
 
@@ -4041,11 +4041,11 @@ let
 
   vim-fugitive = buildVimPluginFrom2Nix {
     pname = "vim-fugitive";
-    version = "2020-03-12";
+    version = "2020-03-22";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "9a4d730270882f9d39a411eb126143eda4d46963";
+      rev = "0e35c9bbc78159318e7b7ffd228f09a96afb8fde";
       sha256 = "098fz3lmfysv6gr5cjwgqsdzxjxygwc0x4ak1sxj3h6djys5x66b";
     };
   };
@@ -4118,12 +4118,12 @@ let
 
   vim-go = buildVimPluginFrom2Nix {
     pname = "vim-go";
-    version = "2020-03-17";
+    version = "2020-03-20";
     src = fetchFromGitHub {
       owner = "fatih";
       repo = "vim-go";
-      rev = "f5d34f40d6757470f40600000c9c08de142d7ced";
-      sha256 = "0a2g8f9xza2m07qm4pcj2aqjh1yvs9cxn8f3zima06swfw2ahdh8";
+      rev = "50d52bafa00448ca8cde2b0e05b0fe71c9397762";
+      sha256 = "1c8dwllscwxiqp409zy7ajwz84bn8g7p9gldqrhx8i9l7q382z0w";
     };
   };
 
@@ -4614,12 +4614,12 @@ let
 
   vim-lsc = buildVimPluginFrom2Nix {
     pname = "vim-lsc";
-    version = "2020-02-11";
+    version = "2020-03-22";
     src = fetchFromGitHub {
       owner = "natebosch";
       repo = "vim-lsc";
-      rev = "62c6f6aa227b1b3ef5e7cf7df9f0a9c1d855d7fe";
-      sha256 = "1qimz08rqm4ch6dr0znwxl328593kmz0yxdqq15g1yrw4ig0fi22";
+      rev = "3dd7a19e8689847956266e0be1bbfb4ca12da746";
+      sha256 = "0dj1b8v9iz67m833x1z3s7jac0jpfxgs43ylc6m0v3al67qcb0mj";
     };
   };
 
@@ -5527,12 +5527,12 @@ let
 
   vim-test = buildVimPluginFrom2Nix {
     pname = "vim-test";
-    version = "2020-03-17";
+    version = "2020-03-21";
     src = fetchFromGitHub {
       owner = "janko-m";
       repo = "vim-test";
-      rev = "d878e9d61f186140f18a7a8a8badc0605d8955ba";
-      sha256 = "06kihjif3g00bibx304vz22w2w9z84v0g6a55cxs1hqlc4ygnl8v";
+      rev = "b302a325116d8708dc0721b7cd97ff59536f4e75";
+      sha256 = "099dzadzhfkhf92lv5cmfk0iawbp40v1rz9xxp462hxxcn3p3c97";
     };
   };
 
@@ -5945,12 +5945,12 @@ let
 
   vimtex = buildVimPluginFrom2Nix {
     pname = "vimtex";
-    version = "2020-03-17";
+    version = "2020-03-21";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "16b23314b31862510d3feb8a2569199062b083ac";
-      sha256 = "0vibfwsyamp4jqbaaa872m922yg89fx7k0cfa6kfhr5ks4vhpya5";
+      rev = "8c59031d50feeec8b4f3549f70f82564975265f0";
+      sha256 = "16a7qpp19gci8hq8h2999pwv0gd6x0mqgifv325mlb0jj5lxy7m1";
     };
   };
 
@@ -6099,12 +6099,12 @@ let
 
   yats-vim = buildVimPluginFrom2Nix {
     pname = "yats-vim";
-    version = "2020-03-02";
+    version = "2020-03-21";
     src = fetchFromGitHub {
       owner = "HerringtonDarkholme";
       repo = "yats.vim";
-      rev = "68ef9623656fe9aaa53c1d9ab906f09c2c095f06";
-      sha256 = "0cn1k8lda71vm4gx14ly9gdvk1j17jds0axx9jvjp4w9jid6ksqk";
+      rev = "4d3f69a3a5f56bae9475a96c3291ffdcbd9ff0b1";
+      sha256 = "0f3dq4lrm9xzh780fd471b7ddibfzb9vfq1k6gn53pmqpiw6a498";
       fetchSubmodules = true;
     };
   };

From 129176452c3286ad5806fff194969cc8dba4ba4c Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 15 Mar 2020 19:18:51 -0400
Subject: [PATCH 3697/4636] nixos-ami: update nvme_core.io_timeout for linux
 kernel >= 4.15

NixOS 20.03 is built on kernel 5.4 and 19.09 is on 4.19, so we should update
this option to the highest value possible, per linked upstream instructions from
Amazon.
---
 nixos/maintainers/scripts/ec2/amazon-image.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix
index 31e15537179a..36f3e7af873d 100644
--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-image.nix
@@ -8,10 +8,15 @@ in {
 
   imports = [ ../../../modules/virtualisation/amazon-image.nix ];
 
-  # Required to provide good EBS experience,
+  # Amazon recomments setting this to the highest possible value for a good EBS
+  # experience, which prior to 4.15 was 255.
   # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-ebs-volumes.html#timeout-nvme-ebs-volumes
-  # TODO change value to 4294967295 when kernel is updated to 4.15 or later
-  config.boot.kernelParams = [ "nvme_core.io_timeout=255" ];
+  config.boot.kernelParams =
+    let timeout =
+      if pkgs.lib.versionAtLeast config.boot.kernelPackages.kernel.version "4.15"
+      then "4294967295"
+      else  "255";
+    in [ "nvme_core.io_timeout=${timeout}" ];
 
   options.amazonImage = {
     name = mkOption {

From fa5fc4993e1e8bb58183cc076ac786cb7c959452 Mon Sep 17 00:00:00 2001
From: Jeff Labonte <jeff.labonte12@gmail.com>
Date: Sun, 22 Mar 2020 00:41:33 -0400
Subject: [PATCH 3698/4636] brave: 1.5.112 -> 1.5.115

---
 pkgs/applications/networking/browsers/brave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index 2adc2ec7c795..073cc23e5ccf 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -82,11 +82,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "brave";
-  version = "1.5.112";
+  version = "1.5.115";
 
   src = fetchurl {
     url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-    sha256 = "0am7qr09pvy6v720rngfxilh4yalxzp7vcq2yndcz6726wnhw9zx";
+    sha256 = "04zyv5amqxax1z0da4bcgxwsq596zfs416nshg6ffg4ci9nfbiab";
   };
 
   dontConfigure = true;

From 6601c1699f5d005f3efefc5c42c0e46eee6ce47e Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Sun, 22 Mar 2020 04:15:58 +0000
Subject: [PATCH 3699/4636] vimPlugins: Update redirects

---
 pkgs/misc/vim-plugins/aliases.nix      |  7 +-
 pkgs/misc/vim-plugins/generated.nix    | 90 +++++++++++++-------------
 pkgs/misc/vim-plugins/overrides.nix    |  4 +-
 pkgs/misc/vim-plugins/vim-plugin-names | 40 ++++++------
 4 files changed, 72 insertions(+), 69 deletions(-)

diff --git a/pkgs/misc/vim-plugins/aliases.nix b/pkgs/misc/vim-plugins/aliases.nix
index cfdd629369c0..e301d40874a8 100644
--- a/pkgs/misc/vim-plugins/aliases.nix
+++ b/pkgs/misc/vim-plugins/aliases.nix
@@ -67,7 +67,8 @@ mapAliases {
   ghc-mod-vim         = ghcmod-vim;
   ghcmod              = ghcmod-vim;
   goyo                = goyo-vim;
-  Gist                = gist-vim;
+  Gist                = vim-gist;
+  gist-vim            = vim-gist; # backwards compat, added 2020-3-22
   gitgutter           = vim-gitgutter;
   gundo               = gundo-vim;
   Gundo               = gundo-vim; # backwards compat, added 2015-10-03
@@ -125,15 +126,17 @@ mapAliases {
   unite               = unite-vim;
   UltiSnips           = ultisnips;
   vim-addon-vim2nix   = vim2nix;
+  vim-jade            = vim-pug; # backwards compat, added 2020-3-22
   vimproc             = vimproc-vim;
   vimshell            = vimshell-vim;
   vinegar             = vim-vinegar;
+  vundle              = Vundle-vim; # backwards compat, added 2020-3-22
   watchdogs           = vim-watchdogs;
   WebAPI              = webapi-vim;
   wombat256           = wombat256-vim; # backwards compat, added 2015-7-8
   yankring            = YankRing-vim;
   Yankring            = YankRing-vim;
-  YouCompleteMe       = youcompleteme;
+  youcompleteme       = YouCompleteMe; # backwards compat, added 2020-3-22
   xterm-color-table   = xterm-color-table-vim;
   zeavim              = zeavim-vim;
 }
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 427384cb7110..1d39465ddf80 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -63,7 +63,7 @@ let
     pname = "ale";
     version = "2020-03-11";
     src = fetchFromGitHub {
-      owner = "w0rp";
+      owner = "dense-analysis";
       repo = "ale";
       rev = "bbe5153fcb36dec9860ced33ae8ff0b5d76ac02a";
       sha256 = "1xvmh66lgii98z6f4lk1mjs73ysrvs55xdlcmf224k3as822jmw0";
@@ -283,7 +283,7 @@ let
     pname = "clang_complete";
     version = "2018-09-19";
     src = fetchFromGitHub {
-      owner = "Rip-Rip";
+      owner = "xavierd";
       repo = "clang_complete";
       rev = "0b98d7533ad967aac3fc4c1a5b0508dafa8a676f";
       sha256 = "04mdhc1kbv66blkn6qn98iyj659dac4z49nmpf3anglz8dgcxjgc";
@@ -889,7 +889,7 @@ let
     pname = "denite-extra";
     version = "2019-03-29";
     src = fetchFromGitHub {
-      owner = "chemzqm";
+      owner = "neoclide";
       repo = "denite-extra";
       rev = "af18257544027ce89269dba70c12aba1f5b9e23c";
       sha256 = "0bmq9yhylfd3v6bfwvakw3pbsz5kk8wlmmql0yllqayp6410w25a";
@@ -900,7 +900,7 @@ let
     pname = "denite-git";
     version = "2020-03-02";
     src = fetchFromGitHub {
-      owner = "chemzqm";
+      owner = "neoclide";
       repo = "denite-git";
       rev = "88b5323a6fc0ace197eed5205215d80f3b613f91";
       sha256 = "0b687i64hr8hll7pv7r1xz906b46cl2q62zm18ipikhkpva6iv13";
@@ -933,7 +933,7 @@ let
     pname = "deoplete-clang";
     version = "2019-11-10";
     src = fetchFromGitHub {
-      owner = "zchee";
+      owner = "deoplete-plugins";
       repo = "deoplete-clang";
       rev = "2ea262e98edcb66e828f9077fcc844100320eb63";
       sha256 = "1wvk61f8ph2vpl6llzmir3qs3zwaw3lrphs16d1j7ljkdl3bk49k";
@@ -989,7 +989,7 @@ let
     pname = "deoplete-go";
     version = "2020-01-01";
     src = fetchFromGitHub {
-      owner = "zchee";
+      owner = "deoplete-plugins";
       repo = "deoplete-go";
       rev = "4f1ccd2ed70211fd025d052ec725c0b835bea487";
       sha256 = "0zmx98kz6pxfpakizr8xm1nrv1rjr0frz19pkik29mk6aj2b2l08";
@@ -1397,17 +1397,6 @@ let
     };
   };
 
-  gist-vim = buildVimPluginFrom2Nix {
-    pname = "gist-vim";
-    version = "2020-01-29";
-    src = fetchFromGitHub {
-      owner = "mattn";
-      repo = "gist-vim";
-      rev = "2158eceb210b0a354bc17aa4144554e5d8bb6c79";
-      sha256 = "1dz33c63q7gghz35hyrvbshqw20faccs7bvxlda5w70mkbz9h9c4";
-    };
-  };
-
   gitignore-vim = buildVimPluginFrom2Nix {
     pname = "gitignore-vim";
     version = "2014-03-16";
@@ -2150,7 +2139,7 @@ let
     pname = "nerdcommenter";
     version = "2020-02-19";
     src = fetchFromGitHub {
-      owner = "scrooloose";
+      owner = "preservim";
       repo = "nerdcommenter";
       rev = "c62e618a1ab5a50a4028e3296500ba29d9b033d8";
       sha256 = "0w4bxj423dxxkcxnfmipf8x5jfm058rq4g3m98wzcz5zbambv3qs";
@@ -2161,7 +2150,7 @@ let
     pname = "nerdtree";
     version = "2020-02-20";
     src = fetchFromGitHub {
-      owner = "scrooloose";
+      owner = "preservim";
       repo = "nerdtree";
       rev = "e67324fdea7a192c7ce1b4c6b3c3b9f82f11eee7";
       sha256 = "0y7hd69k0i21cqgs11n80ljv6cl0gfcjjwa0dvdywpd8mmn1ad4k";
@@ -2447,7 +2436,7 @@ let
     pname = "purescript-vim";
     version = "2018-12-10";
     src = fetchFromGitHub {
-      owner = "raichoo";
+      owner = "purescript-contrib";
       repo = "purescript-vim";
       rev = "67ca4dc4a0291e5d8c8da48bffc0f3d2c9739e7f";
       sha256 = "1insh39hzbynr6qxb215qxhpifl5m8i5i0d09a3b6v679i7s11i8";
@@ -2590,7 +2579,7 @@ let
     pname = "riv-vim";
     version = "2020-02-17";
     src = fetchFromGitHub {
-      owner = "Rykka";
+      owner = "gu-fan";
       repo = "riv.vim";
       rev = "d52844691ca2f139e4b634db65aa49c57a0fc2b3";
       sha256 = "0s4jvqwlnmmh2zw9v9rlwynwx44ypdrzhhyfb20sippxg9g6z0c5";
@@ -2821,7 +2810,7 @@ let
     pname = "sved";
     version = "2019-01-25";
     src = fetchFromGitHub {
-      owner = "peder2tm";
+      owner = "peterbjorgensen";
       repo = "sved";
       rev = "3362db72447e8ac812c7299c15ecfc9f41341713";
       sha256 = "1r2nv069d6r2q6gbiz795x94mfjm9hnv05zka085hhq9a3yf1pgx";
@@ -2843,7 +2832,7 @@ let
     pname = "syntastic";
     version = "2020-01-29";
     src = fetchFromGitHub {
-      owner = "scrooloose";
+      owner = "vim-syntastic";
       repo = "syntastic";
       rev = "f3766538720116f099a8b1517f76ae2f094afd20";
       sha256 = "1bzjav87fcibwlp8siqnx6x8wv8w3mwrrqrd5w19ny9scr5x2a65";
@@ -3867,7 +3856,7 @@ let
     pname = "vim-elixir";
     version = "2020-03-11";
     src = fetchFromGitHub {
-      owner = "elixir-lang";
+      owner = "elixir-editors";
       repo = "vim-elixir";
       rev = "088cfc407460dea7b81c10b29db23843f85e7919";
       sha256 = "1w9w4arzlbjhd5kcvyv5fykq9djc4n4j1nc75qqlzsfggbjjwhbk";
@@ -4061,6 +4050,17 @@ let
     };
   };
 
+  vim-gist = buildVimPluginFrom2Nix {
+    pname = "vim-gist";
+    version = "2020-01-29";
+    src = fetchFromGitHub {
+      owner = "mattn";
+      repo = "vim-gist";
+      rev = "2158eceb210b0a354bc17aa4144554e5d8bb6c79";
+      sha256 = "1dz33c63q7gghz35hyrvbshqw20faccs7bvxlda5w70mkbz9h9c4";
+    };
+  };
+
   vim-gista = buildVimPluginFrom2Nix {
     pname = "vim-gista";
     version = "2020-01-04";
@@ -4380,17 +4380,6 @@ let
     };
   };
 
-  vim-jade = buildVimPluginFrom2Nix {
-    pname = "vim-jade";
-    version = "2019-09-23";
-    src = fetchFromGitHub {
-      owner = "digitaltoad";
-      repo = "vim-jade";
-      rev = "ea39cd942cf3194230cf72bfb838901a5344d3b3";
-      sha256 = "07141jkfnaia4ydc6qcg0bc06w720l2lzl7bm4bsjwswqrzmhfam";
-    };
-  };
-
   vim-janah = buildVimPluginFrom2Nix {
     pname = "vim-janah";
     version = "2018-10-01";
@@ -5052,6 +5041,17 @@ let
     };
   };
 
+  vim-pug = buildVimPluginFrom2Nix {
+    pname = "vim-pug";
+    version = "2019-09-23";
+    src = fetchFromGitHub {
+      owner = "digitaltoad";
+      repo = "vim-pug";
+      rev = "ea39cd942cf3194230cf72bfb838901a5344d3b3";
+      sha256 = "07141jkfnaia4ydc6qcg0bc06w720l2lzl7bm4bsjwswqrzmhfam";
+    };
+  };
+
   vim-puppet = buildVimPluginFrom2Nix {
     pname = "vim-puppet";
     version = "2019-09-16";
@@ -5529,7 +5529,7 @@ let
     pname = "vim-test";
     version = "2020-03-21";
     src = fetchFromGitHub {
-      owner = "janko-m";
+      owner = "janko";
       repo = "vim-test";
       rev = "b302a325116d8708dc0721b7cd97ff59536f4e75";
       sha256 = "099dzadzhfkhf92lv5cmfk0iawbp40v1rz9xxp462hxxcn3p3c97";
@@ -5998,12 +5998,12 @@ let
     };
   };
 
-  vundle = buildVimPluginFrom2Nix {
-    pname = "vundle";
+  Vundle-vim = buildVimPluginFrom2Nix {
+    pname = "Vundle-vim";
     version = "2019-08-17";
     src = fetchFromGitHub {
-      owner = "gmarik";
-      repo = "vundle";
+      owner = "VundleVim";
+      repo = "Vundle.vim";
       rev = "b255382d6242d7ea3877bf059d2934125e0c4d95";
       sha256 = "0fkmklcq3fgvd6x6irz9bgyvcdaxafykk3k89gsi9p6b0ikw3rw6";
     };
@@ -6109,12 +6109,12 @@ let
     };
   };
 
-  youcompleteme = buildVimPluginFrom2Nix {
-    pname = "youcompleteme";
+  YouCompleteMe = buildVimPluginFrom2Nix {
+    pname = "YouCompleteMe";
     version = "2020-03-18";
     src = fetchFromGitHub {
-      owner = "valloric";
-      repo = "youcompleteme";
+      owner = "ycm-core";
+      repo = "YouCompleteMe";
       rev = "cf4a76acaeed27eb3ca1dca5adf1115b6abbcfa3";
       sha256 = "0si9by2ag2f7xgxidp5215d6wkg1mdhq9j5c4icdpsly9gv3w5s8";
       fetchSubmodules = true;
@@ -6158,7 +6158,7 @@ let
     pname = "zig-vim";
     version = "2020-02-10";
     src = fetchFromGitHub {
-      owner = "zig-lang";
+      owner = "ziglang";
       repo = "zig.vim";
       rev = "55b690029791022fd7818ebd0ee395e8976899fe";
       sha256 = "10xkrn4yhjda187mpw1y3qw0s6bp7aklk87pansaa3fvysdf3b6c";
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index e4710e27193c..5248a817f43e 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -393,7 +393,7 @@ self: super: {
     configurePhase = "cd plugins/nvim";
   });
 
-  gist-vim = super.gist-vim.overrideAttrs(old: {
+  vim-gist = super.vim-gist.overrideAttrs(old: {
     dependencies = with super; [ webapi-vim ];
   });
 
@@ -640,7 +640,7 @@ self: super: {
     sourceRoot = ".";
   });
 
-  youcompleteme = super.youcompleteme.overrideAttrs(old: {
+  YouCompleteMe = super.YouCompleteMe.overrideAttrs(old: {
     buildPhase = ''
       substituteInPlace plugin/youcompleteme.vim \
         --replace "'ycm_path_to_python_interpreter', '''" \
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 874b2471d5c4..704fc12e39bf 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -20,8 +20,8 @@ autozimu/LanguageClient-neovim
 ayu-theme/ayu-vim
 bazelbuild/vim-bazel
 bbchung/clighter8
-benmills/vimux
 benizi/vim-automkdir
+benmills/vimux
 bhurlow/vim-parinfer
 bitc/vim-hdevtools
 bkad/camelcasemotion
@@ -35,8 +35,6 @@ brooth/far.vim
 carlitux/deoplete-ternjs
 ccarpita/rtorrent-syntax-file
 cespare/vim-toml
-chemzqm/denite-extra
-chemzqm/denite-git
 Chiel92/vim-autoformat
 chikatoike/concealedyank.vim
 chikatoike/sourcemap.vim
@@ -65,14 +63,17 @@ dart-lang/dart-vim-plugin
 david-a-wheeler/vim-metamath
 davidhalter/jedi-vim
 dcharbon/vim-flatbuffers
+dense-analysis/ale
+deoplete-plugins/deoplete-clang
 deoplete-plugins/deoplete-dictionary
+deoplete-plugins/deoplete-go
 deoplete-plugins/deoplete-jedi
 deoplete-plugins/deoplete-zsh
 derekelkins/agda-vim
 derekwyatt/vim-scala
 dhruvasagar/vim-prosession
 dhruvasagar/vim-table-mode
-digitaltoad/vim-jade
+digitaltoad/vim-pug
 direnv/direnv.vim
 dleonard0/pony-vim-syntax
 dracula/vim
@@ -85,7 +86,7 @@ easymotion/vim-easymotion
 editorconfig/editorconfig-vim
 ehamberg/vim-cute-python
 eikenb/acp
-elixir-lang/vim-elixir
+elixir-editors/vim-elixir
 elmcast/elm-vim
 elzr/vim-json
 embear/vim-localvimrc
@@ -108,7 +109,6 @@ garbas/vim-snipmate
 gentoo/gentoo-syntax
 gibiansky/vim-textobj-haskell
 glts/vim-textobj-comment
-gmarik/vundle
 godlygeek/csapprox
 godlygeek/tabular
 google/vim-codefmt
@@ -117,6 +117,7 @@ google/vim-maktaba
 gorkunov/smartpairs.vim
 gotcha/vimelette
 gregsexton/gitv
+gu-fan/riv.vim
 guns/vim-clojure-highlight
 guns/vim-clojure-static
 guns/vim-sexp
@@ -147,7 +148,7 @@ itchyny/vim-cursorword
 itchyny/vim-gitbranch
 ivanov/vim-ipython
 jacoborus/tender.vim
-janko-m/vim-test
+janko/vim-test
 jaredgorski/SpaceCamp
 JazzCore/ctrlp-cmatcher
 jceb/vim-hier
@@ -259,7 +260,7 @@ markonm/traces.vim
 martinda/Jenkinsfile-vim-syntax
 mattn/calendar-vim as mattn-calendar-vim
 mattn/emmet-vim
-mattn/gist-vim
+mattn/vim-gist
 mattn/webapi-vim
 matze/vim-move
 maximbaz/lightline-ale
@@ -329,6 +330,8 @@ neoclide/coc-vimtex
 neoclide/coc-wxml
 neoclide/coc-yaml
 neoclide/coc-yank
+neoclide/denite-extra
+neoclide/denite-git
 neoclide/vim-easygit
 neomake/neomake
 neovimhaskell/haskell-vim
@@ -355,7 +358,7 @@ osyo-manga/vim-watchdogs
 pangloss/vim-javascript
 parsonsmatt/intero-neovim
 pearofducks/ansible-vim
-peder2tm/sved
+peterbjorgensen/sved
 peterhoeg/vim-qml
 phanviet/vim-monokai-pro
 plasticboy/vim-markdown
@@ -363,7 +366,10 @@ ponko2/deoplete-fish
 posva/vim-vue
 powerman/vim-plugin-AnsiEsc
 PProvost/vim-ps1
+preservim/nerdcommenter
+preservim/nerdtree
 ptzz/lf.vim
+purescript-contrib/purescript-vim
 python-mode/python-mode
 qnighy/lalrpop.vim
 qpkorr/vim-bufkill
@@ -372,7 +378,6 @@ racer-rust/vim-racer
 rafaqz/ranger.vim
 rafi/awesome-vim-colorschemes
 raghur/vim-ghost
-raichoo/purescript-vim
 Raimondi/delimitMate
 rakr/vim-one
 rbgrouleff/bclose.vim
@@ -381,7 +386,6 @@ reedes/vim-wordy
 rhysd/committia.vim
 rhysd/vim-grammarous
 rhysd/vim-operator-surround
-Rip-Rip/clang_complete
 rodjek/vim-puppet
 romainl/vim-cool
 ron89/thesaurus_query.vim
@@ -391,15 +395,11 @@ roxma/nvim-yarp
 RRethy/vim-illuminate
 rust-lang/rust.vim
 ryanoasis/vim-devicons
-Rykka/riv.vim
 ryvnf/readline.vim
 sakhnik/nvim-gdb
 saltstack/salt-vim
 samoshkin/vim-mergetool
 sbdchd/neoformat
-scrooloose/nerdcommenter
-scrooloose/nerdtree
-scrooloose/syntastic
 sebastianmarkow/deoplete-rust
 SevereOverfl0w/deoplete-github
 sheerun/vim-polyglot
@@ -501,7 +501,6 @@ uarun/vim-protobuf
 udalov/kotlin-vim
 ujihisa/neco-look
 unblevable/quick-scope
-valloric/youcompleteme
 Valodim/deoplete-notmuch
 vhda/verilog_systemverilog.vim
 vim-airline/vim-airline
@@ -537,11 +536,12 @@ vim-scripts/taglist.vim
 vim-scripts/utl.vim
 vim-scripts/wombat256.vim
 vim-scripts/YankRing.vim
+vim-syntastic/syntastic
 vim-utils/vim-husk
 vimwiki/vimwiki
 vito-c/jq.vim
 vmchale/dhall-vim
-w0rp/ale
+VundleVim/Vundle.vim
 wakatime/vim-wakatime
 wannesm/wmgraphviz.vim
 wellle/targets.vim
@@ -550,11 +550,11 @@ will133/vim-dirdiff
 wincent/command-t
 wincent/ferret
 wsdjeg/vim-fetch
+xavierd/clang_complete
 xolox/vim-easytags
 xolox/vim-misc
 xuhdev/vim-latex-live-preview
+ycm-core/YouCompleteMe
 Yggdroot/indentLine
 zah/nim.vim
-zchee/deoplete-clang
-zchee/deoplete-go
-zig-lang/zig.vim
+ziglang/zig.vim

From c93acee712eefe7261388c55a85e911d3c81d08f Mon Sep 17 00:00:00 2001
From: Greg Price <gnprice@gmail.com>
Date: Sat, 21 Mar 2020 23:48:45 -0700
Subject: [PATCH 3700/4636] python39Full: fix to use Python 3.9 rather than 3.8

Looks like this was a typo when python39 was added in 648152fdb.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 014bb3e0b9a7..71c0fa4610d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9461,7 +9461,7 @@ in
   python36Full = python36.override{x11Support=true;};
   python37Full = python37.override{x11Support=true;};
   python38Full = python38.override{x11Support=true;};
-  python39Full = python38.override{x11Support=true;};
+  python39Full = python39.override{x11Support=true;};
 
   # pythonPackages further below, but assigned here because they need to be in sync
   pythonPackages = python.pkgs;

From 1134b0bc6e91a5fd7fd0a1b80b5892ed048ebf90 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Sun, 22 Mar 2020 00:09:42 -0700
Subject: [PATCH 3701/4636] ansible: Use overridePythonAttrs to get the right
 name attribute (#83107)

Fixes #83105.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 pkgs/tools/admin/ansible/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix
index 7dde0e4764c6..4af031118693 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -5,7 +5,7 @@ rec {
 
   ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible;
 
-  ansible_2_8 = with python3Packages; toPythonApplication (python3Packages.ansible.overrideAttrs(old: rec {
+  ansible_2_8 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec {
     pname = "ansible";
     version = "2.8.7";
 
@@ -15,7 +15,7 @@ rec {
     };
   }));
 
-  ansible_2_7 = with python3Packages; toPythonApplication (ansible.overrideAttrs(old: rec {
+  ansible_2_7 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec {
     pname = "ansible";
     version = "2.7.15";
 
@@ -25,7 +25,7 @@ rec {
     };
   }));
 
-  ansible_2_6 = with python3Packages; toPythonApplication (ansible.overrideAttrs(old: rec {
+  ansible_2_6 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec {
     pname = "ansible";
     version = "2.6.20";
 

From fd3936ec94b5d3a99b57239e0436faaf025e53be Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Fri, 20 Mar 2020 12:01:22 +0300
Subject: [PATCH 3702/4636] ioping: add support for netdata

fixes #82985
---
 pkgs/tools/system/ioping/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix
index 6ffaf23280f4..6acd41046ceb 100644
--- a/pkgs/tools/system/ioping/default.nix
+++ b/pkgs/tools/system/ioping/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "ioping";
@@ -11,6 +11,14 @@ stdenv.mkDerivation rec {
     sha256 = "10bv36bqga8sdifxzywzzpjil7vmy62psirz7jbvlsq1bw71aiid";
   };
 
+  patches = [
+    # add netdata support: https://github.com/koct9i/ioping/pull/41
+    (fetchpatch {
+      url = "https://github.com/koct9i/ioping/commit/e7b818457ddb952cbcc13ae732ba0328f6eb73b3.patch";
+      sha256 = "122ivp4rqsnjszjfn33z8li6glcjhy7689bgipi8cgs5q55j99gf";
+    })
+  ];
+
   makeFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {

From 6c756e8b1543d1cd45711162b9161d3b2392b36a Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 22 Mar 2020 04:20:00 -0500
Subject: [PATCH 3703/4636] z-lua: 1.7.4 -> 1.8.4

---
 pkgs/tools/misc/z-lua/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/z-lua/default.nix b/pkgs/tools/misc/z-lua/default.nix
index 171c86e805b5..7d8e760a8d93 100644
--- a/pkgs/tools/misc/z-lua/default.nix
+++ b/pkgs/tools/misc/z-lua/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "z-lua";
-  version = "1.7.4";
+  version = "1.8.4";
 
   src = fetchFromGitHub {
     owner = "skywind3000";
     repo = "z.lua";
-    rev = "v${version}";
-    sha256 = "0cn38sadcn65pgw6dgr59bnx9hf97011hydmpmfi3kzdqjmarwci";
+    rev = version;
+    sha256 = "1whh2gzxhx4c24mwh5yifnpah56bzb6v7barp727pjw4whpflg1s";
   };
 
   dontBuild = true;
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/skywind3000/z.lua;
+    homepage = "https://github.com/skywind3000/z.lua";
     description = "A new cd command that helps you navigate faster by learning your habits";
     license = licenses.mit;
     maintainers = [ maintainers.marsam ];

From b2df6d541d6e5a9afe4605424a76238a2427b7c3 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 22 Mar 2020 04:20:00 -0500
Subject: [PATCH 3704/4636] lean: 3.7.0 -> 3.7.2

---
 pkgs/applications/science/logic/lean/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index ac65a72c94b9..cfd645a3c732 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lean";
-  version = "3.7.0";
+  version = "3.7.2";
 
   src = fetchFromGitHub {
     owner  = "leanprover-community";
     repo   = "lean";
     rev    = "v${version}";
-    sha256 = "1khy41zv4bjbpy3949j7y7d4qal53w4679iqlhm2l8jxd7y46nvi";
+    sha256 = "0d9lz0mbxyaaykkvk2p8w2hcif9cx0ksihgh7qhxf417bz6msgc1";
   };
 
   nativeBuildInputs = [ cmake ];

From e2e4e95cbdf73f38c528004ca13604561d2c8a06 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 22 Mar 2020 04:20:00 -0500
Subject: [PATCH 3705/4636] tflint: 0.15.2 -> 0.15.3

Changelog: https://github.com/terraform-linters/tflint/releases/tag/v0.15.3
---
 pkgs/development/tools/analysis/tflint/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix
index 475ff662b85a..2cc9182cd68c 100644
--- a/pkgs/development/tools/analysis/tflint/default.nix
+++ b/pkgs/development/tools/analysis/tflint/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "tflint";
-  version = "0.15.2";
+  version = "0.15.3";
 
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1wwdnqb34l0ad6hlvs74acfh0744ir3ssm8wjwpxbsy0sxkrpxcf";
+    sha256 = "1j56dadkyg483i2p4i76d4kdkm229yjiyariga96zxp3s4rl0fni";
   };
 
-  modSha256 = "1jbnsqa0ga372lhbgfnqvx8pdzrm0b2phzzwll4sgd0k1hzv2aqv";
+  modSha256 = "14vgy5lavyp4w16g7wpi9xbni3js541rc3w9qn5ab3khqw5rdhgn";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
 

From a991be8fdece543862da02ed9d51fa2b8def315c Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 22 Mar 2020 04:20:00 -0500
Subject: [PATCH 3706/4636] starship: 0.37.0 -> 0.38.1

---
 pkgs/tools/misc/starship/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix
index 9d1fcb897891..152db99660c8 100644
--- a/pkgs/tools/misc/starship/default.nix
+++ b/pkgs/tools/misc/starship/default.nix
@@ -1,25 +1,28 @@
-{ stdenv, fetchFromGitHub, rustPlatform
+{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl
 , libiconv, Security }:
 
 rustPlatform.buildRustPackage rec {
   pname = "starship";
-  version = "0.37.0";
+  version = "0.38.1";
 
   src = fetchFromGitHub {
     owner = "starship";
     repo = pname;
     rev = "v${version}";
-    sha256 = "17jgb8fp6zarsnl1hm2y24h0xb0w2w6m61k8g3ww3r4fm8yj649v";
+    sha256 = "0qp3y2wcpj1r07v1r2y42zrzkl13j0vlinjx05gfmrmapcls41gi";
   };
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
+  nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
+
+  buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
 
   postPatch = ''
     substituteInPlace src/utils.rs \
       --replace "/bin/echo" "echo"
   '';
 
-  cargoSha256 = "01qzwk3q1f6pmyqsq5gnczdjm3157ja2zlrahw5bd5vmy929l5gq";
+  cargoSha256 = "11492fv2isw2prfcgxq0wrbln1n6xdi9209cifjf25nnw2aq2csn";
   checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root";
 
   meta = with stdenv.lib; {

From 2878b4073a8a9ec01d4ceb03b4bfe39d214d7560 Mon Sep 17 00:00:00 2001
From: Max Wittig <max.wittig@siemens.com>
Date: Sun, 22 Mar 2020 10:42:26 +0100
Subject: [PATCH 3707/4636] gitlab-runner: 12.8.0 -> 12.9.0 (#83085)

---
 .../continuous-integration/gitlab-runner/default.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 01c6ec0df29e..df1cef6f3f84 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
 { lib, buildGoPackage, fetchFromGitLab, fetchurl }:
 
 let
-  version = "12.8.0";
+  version = "12.9.0";
   # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
   docker_x86_64 = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
-    sha256 = "02k9nzfqlsd78dan522qynbz2i2ggvf960968vmg0wdg6rjv19z2";
+    sha256 = "0kd4zc9rgzsl6imk9vi2yqpaxrgy8ywcz2vvpsfzrhhmm2yx3qh0";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
-    sha256 = "098g6948w8skbz9z5212ndsxvf3k12aijy0v2a7c86r0zhlga52x";
+    sha256 = "13xwcvw6m3p5ffas5mr55jkqks9s3f7qg1b928vcxkx57j06kb22";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     rev = "v${version}";
-    sha256 = "17cs7bs3dxkj6r7hip6kv7cj7g5lq9x1g3gcl2kjj8djxzkhfc4m";
+    sha256 = "0p9i4z0xsq5rl6gkqjpwpz6hb57vi6wl969gncrsfskjjc1kcifq";
   };
 
   patches = [ ./fix-shell-path.patch ];

From 84ac1d59a8b83b5c1e289cefdfe79aeda8ee535f Mon Sep 17 00:00:00 2001
From: Pascal Hertleif <killercup@gmail.com>
Date: Sat, 21 Mar 2020 13:15:06 +0100
Subject: [PATCH 3708/4636] cargo edit: 0.5.0 -> 0.6.0

- Update to new version
- Add myself as maintainer
- Some workspace test failed with a cargo config error, I didn't
  investigate too much.
- Add Apache 2.0 license
---
 pkgs/tools/package-management/cargo-edit/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix
index b15400e576ef..2fdf8a999561 100644
--- a/pkgs/tools/package-management/cargo-edit/default.nix
+++ b/pkgs/tools/package-management/cargo-edit/default.nix
@@ -4,25 +4,27 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-edit";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "killercup";
     repo = pname;
     rev = "v${version}";
-    sha256 = "16gpljbzk6cibry9ssnl22xbcsx2cr57mrs3x3n6cfmldbp6bhbr";
+    sha256 = "19jnvsbddn52ibjv48jyfss25gg9mmvxzfhbr7s7bqyf3bq68jbm";
   };
 
-  cargoSha256 = "1zwkar914zyghky09lgk0s374m5d6yccn0m15bqlgxxyymg4b59y";
+  cargoSha256 = "0b06jsilj87rnr1qlarn29hnz0i9p455fdxg6nf6r2fli2xpv1f0";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
 
+  doCheck = false; # integration tests depend on changing cargo config
+
   meta = with lib; {
     description = "A utility for managing cargo dependencies from the command line";
     homepage = https://github.com/killercup/cargo-edit;
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ gerschtli jb55 filalex77 ];
+    license = with licenses; [ asl20 /* or */ mit ];
+    maintainers = with maintainers; [ gerschtli jb55 filalex77 killercup ];
     platforms = platforms.all;
   };
 }

From bb317ecbc684fddc12cc78d607272826ed29a9c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= <mic.liamg@gmail.com>
Date: Sun, 22 Mar 2020 11:45:30 +0100
Subject: [PATCH 3709/4636] ffado: 2.4.1 -> 2.4.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- fixed ffado-diag
- fixed ffado-mixer
- enabled ffado-test

Signed-off-by: Michal Minář <mic.liamg@gmail.com>
---
 pkgs/os-specific/linux/ffado/default.nix | 61 ++++++++++++++++++------
 pkgs/top-level/all-packages.nix          |  4 +-
 2 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index 3d2c6ae6dae2..0fc61d0e045f 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -1,21 +1,42 @@
-{ stdenv, fetchurl, scons, pkgconfig, which, makeWrapper, python3
-, libraw1394, libconfig, libavc1394, libiec61883, libxmlxx3
+{ stdenv
+, mkDerivation
+, dbus
+, dbus_cplusplus
+, desktop-file-utils
+, fetchurl
 , glibmm
-, dbus, dbus_cplusplus
+, kernel
+, libavc1394
+, libconfig
+, libiec61883
+, libraw1394
+, libxmlxx3
+, pkgconfig
+, python3
+, scons
+, which
+, wrapQtAppsHook
 }:
 
 let
   inherit (python3.pkgs) pyqt5 dbus-python;
   python = python3.withPackages (pkgs: with pkgs; [ pyqt5 dbus-python ]);
-in stdenv.mkDerivation rec {
+in
+mkDerivation rec {
   pname = "ffado";
-  version = "2.4.1";
+  version = "2.4.2";
 
   src = fetchurl {
     url = "http://www.ffado.org/files/libffado-${version}.tgz";
-    sha256 = "0byr3kv58d1ryy60vr69fd868zlfkvl2gq9hl94dqdn485l9pq9y";
+    sha256 = "09dxy6fkfnvzk45lpr74hkqymii8a45jzlq6054f3jz65m8qvj3d";
   };
 
+  prePatch = ''
+    substituteInPlace ./support/tools/ffado-diag.in \
+      --replace /lib/modules/ "${kernel.dev}/lib/modules/" \
+      --replace 'stdout ("uname", "-r").rstrip ()' '"${kernel.modDirVersion}"'
+  '';
+
   patches = [
     # fix installing metainfo file
     ./fix-build.patch
@@ -23,13 +44,13 @@ in stdenv.mkDerivation rec {
 
   outputs = [ "out" "bin" "dev" ];
 
-  nativeBuildInputs = [ scons pkgconfig which makeWrapper python pyqt5 ];
+  nativeBuildInputs = [ desktop-file-utils scons pkgconfig which python pyqt5 wrapQtAppsHook ];
 
   prefixKey = "PREFIX=";
   sconsFlags = [
     "DEBUG=False"
     "ENABLE_ALL=True"
-    "BUILD_TESTS=False"
+    "BUILD_TESTS=True"
     "WILL_DEAL_WITH_XDG_MYSELF=True"
     "BUILD_MIXER=True"
     "UDEVDIR=${placeholder "out"}/lib/udev/rules.d"
@@ -40,29 +61,41 @@ in stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    libraw1394
-    libconfig
-    libavc1394
-    libiec61883
     dbus
     dbus_cplusplus
+    glibmm
+    libavc1394
+    libconfig
+    libiec61883
+    libraw1394
     libxmlxx3
     python
-    glibmm
   ];
 
   enableParallelBuilding = true;
+  dontWrapQtApps = true;
 
   postInstall = ''
+    desktop="$bin/share/applications/ffado-mixer.desktop"
+    install -DT -m 444 support/xdg/ffado.org-ffadomixer.desktop $desktop
+    substituteInPlace "$desktop" \
+      --replace Exec=ffado-mixer "Exec=$bin/bin/ffado-mixer" \
+      --replace hi64-apps-ffado ffado-mixer
+    install -DT -m 444 support/xdg/hi64-apps-ffado.png "$bin/share/icons/hicolor/64x64/apps/ffado-mixer.png"
+
     # prevent build tools from leaking into closure
     echo 'See `nix-store --query --tree ${placeholder "out"}`.' > $out/lib/libffado/static_info.txt
   '';
 
+  preFixup = ''
+    wrapQtApp $bin/bin/ffado-mixer
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://www.ffado.org;
     description = "FireWire audio drivers";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ goibhniu ];
+    maintainers = with maintainers; [ goibhniu michojel ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f9b5efdd1be2..34a10bec250e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16383,7 +16383,9 @@ in
 
   fatrace = callPackage ../os-specific/linux/fatrace { };
 
-  ffado = callPackage ../os-specific/linux/ffado { };
+  ffado = libsForQt5.callPackage ../os-specific/linux/ffado {
+    inherit (pkgs.linuxPackages) kernel;
+  };
   libffado = ffado;
 
   fbterm = callPackage ../os-specific/linux/fbterm { };

From d315b3d26777b08d120a8a1d5292ce2703d86864 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <christian.koegler@esg.de>
Date: Sun, 22 Mar 2020 11:38:28 +0100
Subject: [PATCH 3710/4636] vdr-xinelinboutput: fix pkg-config for opengl

Up to including nixos-19.09 configure fall back and included right
libraries. Since nixos-20.03 pkg-config returns a valid value for opengl, but
opengl misses glx symbols.
---
 pkgs/applications/video/vdr/xineliboutput/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/vdr/xineliboutput/default.nix b/pkgs/applications/video/vdr/xineliboutput/default.nix
index 98fcd2b5d408..fd6ef250de6a 100644
--- a/pkgs/applications/video/vdr/xineliboutput/default.nix
+++ b/pkgs/applications/video/vdr/xineliboutput/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, lib, vdr
 , libav, libcap, libvdpau
-, xineLib, libjpeg, libextractor, mesa, libGLU
+, xineLib, libjpeg, libextractor, libglvnd, libGLU
 , libX11, libXext, libXrender, libXrandr
 , makeWrapper
 }: let
@@ -16,6 +16,12 @@
       sha256 = "1phrxpaz8li7z0qy241spawalhcmwkv5hh3gdijbv4h7mm899yba";
     };
 
+    postPatch = ''
+      # pkg-config is called with opengl, which do not contain needed glx symbols
+      substituteInPlace configure \
+        --replace "X11  opengl" "X11  gl"
+    '';
+
     # configure don't accept argument --prefix
     dontAddPrefix = true;
 
@@ -40,13 +46,13 @@
       libcap
       libextractor
       libjpeg
+      libglvnd
       libGLU
       libvdpau
       libXext
       libXrandr
       libXrender
       libX11
-      mesa
       vdr
       xineLib
     ];

From d19d265bbe671936c9bedf51ae88e154863850d3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Mar 2020 11:23:30 +0000
Subject: [PATCH 3711/4636] fsuae: 3.0.2 -> 3.0.3

---
 pkgs/misc/emulators/fs-uae/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix
index 9f092f91e2ef..38730ec752ba 100644
--- a/pkgs/misc/emulators/fs-uae/default.nix
+++ b/pkgs/misc/emulators/fs-uae/default.nix
@@ -5,11 +5,11 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   pname = "fs-uae";
-  version = "3.0.2";
+  version = "3.0.3";
 
   src = fetchurl {
     url = "https://fs-uae.net/stable/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1awakxs3rlbm0bxpi37cbavi5fpb89wszksyw62as4nz3qsdrpjf";
+    sha256 = "0v5c8ns00bam4myj7454hpkrnm9i81jwdzrp5nl7gaa18qb60hjq";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       create customized Amigas.
     '';
     license = licenses.gpl2Plus;
-    homepage = https://fs-uae.net;
+    homepage = "https://fs-uae.net";
     maintainers = with stdenv.lib; [ maintainers.AndersonTorres ];
     platforms = [ "i686-linux" "x86_64-linux" ];
   };

From 8f12a72488a508a6f477581ad9dfc49250e3e040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <christian.koegler@esg.de>
Date: Sun, 22 Mar 2020 09:49:08 +0100
Subject: [PATCH 3712/4636] kodi: fix lirc support

* adapted to the way kodi finds the lircd socket
* added lirc package to build support for lirc
---
 nixos/modules/services/x11/desktop-managers/kodi.nix | 2 +-
 pkgs/applications/video/kodi/default.nix             | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/kodi.nix b/nixos/modules/services/x11/desktop-managers/kodi.nix
index 65a7b9c628e5..e997b9a11343 100644
--- a/nixos/modules/services/x11/desktop-managers/kodi.nix
+++ b/nixos/modules/services/x11/desktop-managers/kodi.nix
@@ -20,7 +20,7 @@ in
     services.xserver.desktopManager.session = [{
       name = "kodi";
       start = ''
-        ${pkgs.kodi}/bin/kodi --lircdev /run/lirc/lircd --standalone &
+        LIRC_SOCKET_PATH=/run/lirc/lircd ${pkgs.kodi}/bin/kodi --standalone &
         waitPID=$!
       '';
     }];
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index eef390d30ed8..cacad5969e46 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -19,6 +19,7 @@
 , libcrossguid, libmicrohttpd
 , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp
 , libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson
+, lirc
 , dbusSupport ? true, dbus ? null
 , joystickSupport ? true, cwiid ? null
 , nfsSupport ? true, libnfs ? null
@@ -168,6 +169,7 @@ in stdenv.mkDerivation {
       libcrossguid cwiid libplist
       bluez giflib glib harfbuzz lcms2 libpthreadstubs libXdmcp
       ffmpeg flatbuffers fmt fstrcmp rapidjson
+      lirc
       # libdvdcss libdvdnav libdvdread
     ]
     ++ lib.optional  dbusSupport     dbus
@@ -211,7 +213,6 @@ in stdenv.mkDerivation {
       "-DENABLE_EVENTCLIENTS=ON"
       "-DENABLE_INTERNAL_CROSSGUID=OFF"
       "-DENABLE_OPTICAL=ON"
-      "-DLIRC_DEVICE=/run/lirc/lircd"
     ] ++ lib.optional useWayland [
       "-DCORE_PLATFORM_NAME=wayland"
       "-DWAYLAND_RENDER_SYSTEM=gl"

From e8cfb12f4613b46727c550a22d697d5d1cfef4e3 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Sun, 22 Mar 2020 13:22:14 +0100
Subject: [PATCH 3713/4636] tessera: init at 0.10.2

---
 pkgs/applications/blockchains/tessera.nix | 26 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/applications/blockchains/tessera.nix

diff --git a/pkgs/applications/blockchains/tessera.nix b/pkgs/applications/blockchains/tessera.nix
new file mode 100644
index 000000000000..84f7925d2180
--- /dev/null
+++ b/pkgs/applications/blockchains/tessera.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, makeWrapper, jre }:
+
+stdenv.mkDerivation rec {
+  pname = "tessera";
+  version = "0.10.2";
+
+  src = fetchurl {
+    url = "https://oss.sonatype.org/service/local/repositories/releases/content/com/jpmorgan/quorum/${pname}-app/${version}/${pname}-app-${version}-app.jar";
+    sha256 = "1zn8w7q0q5man0407kb82lw4mlvyiy9whq2f6izf2b5415f9s0m4";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  dontUnpack = true;
+
+  installPhase = ''
+    makeWrapper ${jre}/bin/java $out/bin/tessera --add-flags "-jar $src"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Enterprise Implementation of Quorum's transaction manager";
+    homepage = "https://github.com/jpmorganchase/tessera";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ mmahut ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f9b5efdd1be2..057b924215a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23008,6 +23008,8 @@ in
 
   sumokoin = callPackage ../applications/blockchains/sumokoin.nix { boost = boost165; };
 
+  tessera = callPackage ../applications/blockchains/tessera.nix { };
+
   vertcoin  = libsForQt5.callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = true; };
   vertcoind = callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = false; };
 

From 0c59458e4440169088ea2312be8b0b3e0e155128 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 22 Mar 2020 07:25:00 -0500
Subject: [PATCH 3714/4636] bat: 0.12.1 -> 0.13.0

Changelog: https://github.com/sharkdp/bat/releases/tag/v0.13.0
---
 pkgs/tools/misc/bat/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix
index d8ac90abf87c..bf84502af2bc 100644
--- a/pkgs/tools/misc/bat/default.nix
+++ b/pkgs/tools/misc/bat/default.nix
@@ -4,17 +4,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname   = "bat";
-  version = "0.12.1";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner  = "sharkdp";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "1cpa8dal4c27pnbmmrar4vqzcl4h0zf8x1zx1dlf0riavdg9n56y";
+    sha256 = "1kaa6ps6v1wk9qs63h116k4pbz7y9mfbfxfbq7g89yjhzkjmh6xc";
     fetchSubmodules = true;
   };
 
-  cargoSha256 = "17xyb84axkn341nd5rm7jza1lrn8wcnl6jirhyv63r5k6mswy39i";
+  cargoSha256 = "01l1y124gjh6gf9z1jkbpfzh0w92hrgwvsmqkqdw3a9pa4w5f6yg";
 
   nativeBuildInputs = [ pkgconfig llvmPackages.libclang installShellFiles makeWrapper ];
 
@@ -23,8 +23,8 @@ rustPlatform.buildRustPackage rec {
   LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
 
   postInstall = ''
-    installManPage doc/bat.1
-    installShellCompletion assets/completions/bat.fish
+    installManPage $releaseDir/build/bat-*/out/assets/manual/bat.1
+    installShellCompletion $releaseDir/build/bat-*/out/assets/completions/bat.fish
   '';
 
   # Insert Nix-built `less` into PATH because the system-provided one may be too old to behave as
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with stdenv.lib; {
     description = "A cat(1) clone with syntax highlighting and Git integration";
-    homepage    = https://github.com/sharkdp/bat;
+    homepage    = "https://github.com/sharkdp/bat";
     license     = with licenses; [ asl20 /* or */ mit ];
     maintainers = with maintainers; [ dywedir lilyball ];
     platforms   = platforms.all;

From 47c947241ee35d2baed14cb92ed89a745d8fe844 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Mar 2020 14:13:49 +0000
Subject: [PATCH 3715/4636] glusterfs: 7.3 -> 7.4

---
 pkgs/tools/filesystems/glusterfs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index dad032073c04..5cc6e5c156b2 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -15,10 +15,10 @@ let
     #       The command
     #         find /nix/store/...-glusterfs-.../ -name '*.py' -executable
     #       can help with finding new Python scripts.
-    version = "7.3";
+    version = "7.4";
     name="${baseName}-${version}";
     url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz";
-    sha256 = "08g8394vk88cb71z4k5sknld1nsd20f4mk2yyjvdp1hwm97z12pq";
+    sha256 = "1f7z1dacnx7pd3ri4nka6851fzhdfandbf94blds8bqfqc1263h6";
   };
 
   buildInputs = [
@@ -186,7 +186,7 @@ stdenv.mkDerivation
   meta = with stdenv.lib; {
     inherit (s) version;
     description = "Distributed storage system";
-    homepage = https://www.gluster.org;
+    homepage = "https://www.gluster.org";
     license = licenses.lgpl3Plus; # dual licese: choice of lgpl3Plus or gpl2
     maintainers = [ maintainers.raskin ];
     platforms = with platforms; linux ++ freebsd;

From 3a158da8e82f13a0e9108767f118be7579f27248 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Sun, 22 Mar 2020 15:45:49 +0100
Subject: [PATCH 3716/4636] conan: Reformat inputs list

---
 .../tools/build-managers/conan/default.nix    | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index 59b1b14ac5fa..281945dd02be 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -50,9 +50,22 @@ in newPython.pkgs.buildPythonApplication rec {
   };
 
   propagatedBuildInputs = with newPython.pkgs; [
-    colorama deprecation distro fasteners bottle
-    future node-semver patch pygments pluginbase
-    pyjwt pylint pyyaml requests six tqdm
+    bottle
+    colorama
+    deprecation
+    distro
+    fasteners
+    future
+    node-semver
+    patch
+    pluginbase
+    pygments
+    pyjwt
+    pylint
+    pyyaml
+    requests
+    six
+    tqdm
   ];
 
   checkInputs = [

From fc316f7b319a40760a4a3a939c4ff840074eac4c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 22 Mar 2020 15:27:24 +0100
Subject: [PATCH 3717/4636] nixos/ssmtp: declare all option renames manually

While renaming `networking.defaultMailServer` directly to
`services.ssmtp` is shorter and probably clearer, it causes eval errors
due to the second rename (directDelivery -> enable) when using e.g. `lib.mkForce`.

For instance,

``` nix
{ lib, ... }: {
  networking.defaultMailServer = {
    hostName = "localhost";
    directDelivery = lib.mkForce true;
    domain = "example.org";
  };
}
```

would break with the following (rather confusing) error:

```
error: The option value `services.ssmtp.enable' in `/home/ma27/Projects/nixpkgs/nixos/modules/programs/ssmtp.nix' is not of type `boolean'.
(use '--show-trace' to show detailed location information)
```
---
 nixos/modules/programs/ssmtp.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/ssmtp.nix b/nixos/modules/programs/ssmtp.nix
index f794eac8af00..c7a947393496 100644
--- a/nixos/modules/programs/ssmtp.nix
+++ b/nixos/modules/programs/ssmtp.nix
@@ -14,8 +14,16 @@ in
 {
 
   imports = [
-    (mkRenamedOptionModule [ "networking" "defaultMailServer" ] [ "services" "ssmtp" ])
-    (mkRenamedOptionModule [ "services" "ssmtp" "directDelivery" ] [ "services" "ssmtp" "enable" ])
+    (mkRenamedOptionModule [ "networking" "defaultMailServer" "directDelivery" ] [ "services" "ssmtp" "enable" ])
+    (mkRenamedOptionModule [ "networking" "defaultMailServer" "hostName" ] [ "services" "ssmtp" "hostName" ])
+    (mkRenamedOptionModule [ "networking" "defaultMailServer" "domain" ] [ "services" "ssmtp" "domain" ])
+    (mkRenamedOptionModule [ "networking" "defaultMailServer" "root" ] [ "services" "ssmtp" "root" ])
+    (mkRenamedOptionModule [ "networking" "defaultMailServer" "useTLS" ] [ "services" "ssmtp" "useTLS" ])
+    (mkRenamedOptionModule [ "networking" "defaultMailServer" "useSTARTTLS" ] [ "services" "ssmtp" "useSTARTTLS" ])
+    (mkRenamedOptionModule [ "networking" "defaultMailServer" "authUser" ] [ "services" "ssmtp" "authUser" ])
+    (mkRenamedOptionModule [ "networking" "defaultMailServer" "authPass" ] [ "services" "ssmtp" "authPass" ])
+    (mkRenamedOptionModule [ "networking" "defaultMailServer" "authPassFile" ] [ "services" "ssmtp" "authPassFile" ])
+    (mkRenamedOptionModule [ "networking" "defaultMailServer" "setSendmail" ] [ "services" "ssmtp" "setSendmail" ])
   ];
 
   options = {

From 03d5611ae0dbd43b1738b0a266499f17ff566fbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Sun, 22 Mar 2020 16:03:44 +0100
Subject: [PATCH 3718/4636] conan: Remove unnecessary patching.

The pluginbase dependency is now pinned further up with commit

    244fcfc8 - conan: pin pluginbase to 0.7
---
 pkgs/development/tools/build-managers/conan/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index 281945dd02be..c216efc0f529 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -88,8 +88,6 @@ in newPython.pkgs.buildPythonApplication rec {
   '';
 
   postPatch = ''
-    substituteInPlace conans/requirements_server.txt \
-      --replace "pluginbase>=0.5, < 1.0" "pluginbase>=0.5"
     substituteInPlace conans/requirements.txt \
       --replace "PyYAML>=3.11, <3.14.0" "PyYAML"
   '';

From 3e60781f53e36f2fcc61ca63c133cfe3bb440aa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Sun, 22 Mar 2020 16:33:40 +0100
Subject: [PATCH 3719/4636] pythonPackages.patch-ng: Init at 1.17.2.

Newer versions of `conan` need it.

Adding @HaoZeke as maintainer (is Conan maintainer).
---
 .../python-modules/patch-ng/default.nix       | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/python-modules/patch-ng/default.nix

diff --git a/pkgs/development/python-modules/patch-ng/default.nix b/pkgs/development/python-modules/patch-ng/default.nix
new file mode 100644
index 000000000000..726df160929d
--- /dev/null
+++ b/pkgs/development/python-modules/patch-ng/default.nix
@@ -0,0 +1,22 @@
+{ stdenv
+, buildPythonPackage
+, fetchurl
+}:
+
+buildPythonPackage rec {
+  version = "1.17.2"; # note: `conan` package may require a hardcoded one
+  pname = "patch-ng";
+
+  src = fetchurl {
+    url = "mirror://pypi/p/${pname}/${pname}-${version}.tar.gz";
+    sha256 = "02nadk70sk51liv0qav88kx8rzfdjc1x52023zayanz44kkcjl2i";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Library to parse and apply unified diffs.";
+    homepage = "https://github.com/conan-io/python-patch";
+    license = licenses.mit;
+    maintainers = with maintainers; [ HaoZeke ];
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f23f961e241f..8833c1b9b7c4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4764,6 +4764,8 @@ in {
 
   patch = callPackage ../development/python-modules/patch { };
 
+  patch-ng = callPackage ../development/python-modules/patch-ng { };
+
   pathos = callPackage ../development/python-modules/pathos { };
 
   patsy = callPackage ../development/python-modules/patsy { };

From f460e62d9b367a0bfd71148ef34f44421d0e82cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Sun, 22 Mar 2020 16:34:55 +0100
Subject: [PATCH 3720/4636] conan: 1.12.3 -> 1.23.0

* remove pinned dependencies where nixpkgs provides a version
  in the acceptable range
* disable tests;
  they are no longer in the Pypi archive, see
  https://github.com/conan-io/conan/issues/4563
---
 .../tools/build-managers/conan/default.nix    | 47 ++++++++++---------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index c216efc0f529..5990208b645b 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -1,5 +1,17 @@
 { lib, python3, git, pkgconfig }:
 
+# Note:
+# Conan has specific dependency demanands; check
+#     https://github.com/conan-io/conan/blob/master/conans/requirements.txt
+#     https://github.com/conan-io/conan/blob/master/conans/requirements_server.txt
+# on the release branch/commit we're packaging.
+#
+# Two approaches are used here to deal with that:
+# Pinning the specific versions it wants in `newPython`,
+# and using `substituteInPlace conans/requirements.txt ...`
+# in `postPatch` to allow newer versions when we know
+# (e.g. from changelogs) that they are compatible.
+
 let newPython = python3.override {
   packageOverrides = self: super: {
     distro = super.distro.overridePythonAttrs (oldAttrs: rec {
@@ -16,20 +28,6 @@ let newPython = python3.override {
         sha256 = "1dv6mjsm67l1razcgmq66riqmsb36wns17mnipqr610v0z0zf5j0";
       };
     });
-    future = super.future.overridePythonAttrs (oldAttrs: rec {
-      version = "0.16.0";
-      src = oldAttrs.src.override {
-        inherit version;
-        sha256 = "1nzy1k4m9966sikp0qka7lirh8sqrsyainyf8rk97db7nwdfv773";
-      };
-    });
-    tqdm = super.tqdm.overridePythonAttrs (oldAttrs: rec {
-      version = "4.28.1";
-      src = oldAttrs.src.override {
-        inherit version;
-        sha256 = "1fyybgbmlr8ms32j7h76hz5g9xc6nf0644mwhc40a0s5k14makav";
-      };
-    });
     pluginbase = super.pluginbase.overridePythonAttrs (oldAttrs: rec {
       version = "0.7";
       src = oldAttrs.src.override {
@@ -41,31 +39,34 @@ let newPython = python3.override {
 };
 
 in newPython.pkgs.buildPythonApplication rec {
-  version = "1.12.3";
+  version = "1.23.0";
   pname = "conan";
 
   src = newPython.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "1cnfy9b57apps4bfai6r67g0mrvgnqa154z9idv0kf93k1nvx53g";
+    sha256 = "06jnmgvzdyxjpcmyj1804mlq6b842jvvbsngsamdy976sqws870g";
   };
 
   propagatedBuildInputs = with newPython.pkgs; [
     bottle
     colorama
+    dateutil
     deprecation
     distro
     fasteners
     future
+    jinja2
     node-semver
-    patch
+    patch-ng
     pluginbase
     pygments
     pyjwt
-    pylint
+    pylint # Not in `requirements.txt` but used in hooks, see https://github.com/conan-io/conan/pull/6152
     pyyaml
     requests
     six
     tqdm
+    urllib3
   ];
 
   checkInputs = [
@@ -81,11 +82,11 @@ in newPython.pkgs.buildPythonApplication rec {
     webtest
   ]);
 
-  checkPhase = ''
-    export HOME=$TMPDIR
-    pytest conans/test/{utils,unittests} \
-      -k 'not SVN and not ToolsNetTest'
-  '';
+  # Conan 1.14.0 has removed all tests from the Pypi source dist:
+  #     https://github.com/conan-io/conan/pull/4713
+  # We have recommended they be added back:
+  #     https://github.com/conan-io/conan/issues/4563#issuecomment-602225083
+  doCheck = false;
 
   postPatch = ''
     substituteInPlace conans/requirements.txt \

From 77dca1403189b05d4a5988b01044e9ffaa833d29 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Mar 2020 15:36:46 +0000
Subject: [PATCH 3721/4636] intel-gpu-tools: 1.24 -> 1.25

---
 pkgs/development/tools/misc/intel-gpu-tools/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
index 5bf7e22bfbdf..19556aeafc01 100644
--- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix
+++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-gpu-tools";
-  version = "1.24";
+  version = "1.25";
 
   src = fetchurl {
     url = "https://xorg.freedesktop.org/archive/individual/app/igt-gpu-tools-${version}.tar.xz";
-    sha256 = "1gr1m18w73hmh6n9w2f6gky21qc0pls14bgxkhy95z7azrr7qdap";
+    sha256 = "04fx7xclhick3k7fyk9c4mn8mxzf1253j1r0hrvj9sl40j7lsia0";
   };
 
   nativeBuildInputs = [ pkgconfig utilmacros ];
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = https://01.org/linuxgraphics/;
+    homepage = "https://01.org/linuxgraphics/";
     description = "Tools for development and testing of the Intel DRM driver";
     license = licenses.mit;
     platforms = [ "x86_64-linux" "i686-linux" ];

From 1315193c36088ee1960276bdbb4b8368e639393a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 22 Mar 2020 12:02:43 -0400
Subject: [PATCH 3722/4636] linux: 4.14.173 -> 4.14.174

---
 pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 363f8eb91746..aa75c125da41 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.173";
+  version = "4.14.174";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0kxp3mgiags8hdax15masab9zr89xraqvl9ri7zwgksx8ixav0m2";
+    sha256 = "12ai2lc2ny38s93d0m5ngrv030vwv1h2hhzp0fs6fhjxasikq8jc";
   };
 } // (args.argsOverride or {}))

From 8e278a8e2d81fab6d554e32a9e2a5c77714b9703 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 22 Mar 2020 12:03:57 -0400
Subject: [PATCH 3723/4636] linux: 4.19.109 -> 4.19.112

---
 pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index ae5da9fe92f5..8e260ff6b5d4 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.109";
+  version = "4.19.112";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0kwnlv5336vqdf38dzn077ic17zkb4rl5khxmc47syzd9zm4fhnh";
+    sha256 = "0yiyqwgh6wcyshpdj98s7dc4ahyx47y6whvnww6sjmzdq0fb3hi4";
   };
 } // (args.argsOverride or {}))

From 04d15d183970adf1c3543109487f7624a93ce61f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 22 Mar 2020 12:04:20 -0400
Subject: [PATCH 3724/4636] linux: 4.4.216 -> 4.4.217

---
 pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 27fcb5020d72..69156f577f62 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.216";
+  version = "4.4.217";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1hjgh9brvxzi6ypgfnk07l3j28xsxgz88sdshnz19vj96bn1w70q";
+    sha256 = "0vsjchywznmjn01flgvm9vsja5zqni319rfwgy997afcbz0c9spx";
   };
 } // (args.argsOverride or {}))

From 07ffdf9de356117f48e0fe1535cf72a5e8ca0453 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 22 Mar 2020 12:04:42 -0400
Subject: [PATCH 3725/4636] linux: 4.9.216 -> 4.9.217

---
 pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 4d12bec7617d..98d203e481ff 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.216";
+  version = "4.9.217";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0lgv5k8v5xz9z2z4k42566bh0akyk1gr0dx6s1m1rjrzsf9k86l6";
+    sha256 = "06b8av9f9pk2yp95nzv4322k0d5wsg40sxd9kfim1xzb093abckg";
   };
 } // (args.argsOverride or {}))

From 05716b70b022bbaebe11616d510207f6e0b31132 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 22 Mar 2020 12:05:08 -0400
Subject: [PATCH 3726/4636] linux: 5.4.25 -> 5.4.27

---
 pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 5773b171f744..cdc802b9616b 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.4.25";
+  version = "5.4.27";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "09ay0adc3s3m7qk0nj5lkmrp5i0q76a9kax0xix8914d115rgvf0";
+    sha256 = "0szc1p9y6z8gs2f1nj45nrz52sxcabg2xh7zqlljazv45lvcvf8r";
   };
 } // (args.argsOverride or {}))

From 8055a37acae165c14a11baf37cba7801317502da Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 22 Mar 2020 12:05:34 -0400
Subject: [PATCH 3727/4636] linux: 5.5.9 -> 5.5.11

---
 pkgs/os-specific/linux/kernel/linux-5.5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.5.nix b/pkgs/os-specific/linux/kernel/linux-5.5.nix
index bcd67b0af425..474c6980e4a5 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.5.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.5.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.5.9";
+  version = "5.5.11";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0y58gkzadjwfqfry5568g4w4p2mpx2sw50sk95i07s5va1ly2dd4";
+    sha256 = "0bplsbjb3slx566assxdhp7rnmm9z2s8iv9hfar574jds77syix5";
   };
 } // (args.argsOverride or {}))

From f0d17c2a17e4ef37ba4e42255987c148168421be Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 22 Mar 2020 12:05:45 -0400
Subject: [PATCH 3728/4636] linux_latest-libre: 17322 -> 17387

---
 pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index e9872cf0761f..c6e850c99072 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -1,8 +1,8 @@
 { stdenv, lib, fetchsvn, linux
 , scripts ? fetchsvn {
     url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
-    rev = "17322";
-    sha256 = "1hhi1gsfr08zj9d8mglbfk5wicfy1gqrh68vg90hxglp61dsx97x";
+    rev = "17387";
+    sha256 = "1a62n326xsbb8r8y610d4k698n3la22rnhlxa56c2zki2q5697h3";
   }
 , ...
 }:

From 41b1f0202764bfff03fdc6f988d567bcf452bef8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Mar 2020 16:05:58 +0000
Subject: [PATCH 3729/4636] jotta-cli: 0.6.21799 -> 0.6.24251

---
 pkgs/applications/misc/jotta-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix
index 48f369d30290..1756aefe19a6 100644
--- a/pkgs/applications/misc/jotta-cli/default.nix
+++ b/pkgs/applications/misc/jotta-cli/default.nix
@@ -5,10 +5,10 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "jotta-cli";
-  version = "0.6.21799";
+  version = "0.6.24251";
   src = fetchzip {
       url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz";
-      sha256 = "19axrcfmycmdfgphkfwl9qgwd9xj8g37gmwi4ynb45w7nhfid5vm";
+      sha256 = "0f26fg5fqpz0f6jxp72cj5f2kf76jah5iaqlqsl87250y0hm330g";
       stripRoot = false;
     };
 

From e692babf05868c3081b0e9a6b4c2c6bd08f3ac45 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 22 Mar 2020 12:08:50 -0400
Subject: [PATCH 3730/4636] vivaldi: 2.11.1811.47-1 -> 2.11.1811.49-1

---
 pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index d0e1114bdd3a..e129542d530b 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -17,11 +17,11 @@ let
   vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
 in stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "2.11.1811.47-1";
+  version = "2.11.1811.49-1";
 
   src = fetchurl {
     url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
-    sha256 = "16fw6v00xy66mxkkq0b4k49jd0wwlyyvxaaml2gglfk7swxy7i02";
+    sha256 = "0xn23jmh8pqp1hc0q6nysc8x9xgpypzqr4wz2rzqyald4asxj60v";
   };
 
   unpackPhase = ''

From 4cb0894bc1312637d51023628551403be255ac67 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 22 Mar 2020 17:44:45 +0100
Subject: [PATCH 3731/4636] =?UTF-8?q?zsh-powerlevel10k:=20v1.4.0=20?=
 =?UTF-8?q?=E2=86=92=20v1.5.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changes since the last release

    New and changed parameters:
        Two additional parameters are available in gcloud: P9K_GCLOUD_CONFIGURATION and P9K_GCLOUD_PROJECT_NAME.
        gcloud segment can now be in two states: PARTIAL and COMPLETE. See documentation.

    Wizard:
        The screen asking whether to display current time now offers a choice between two formats: 24-hour and 12-hour.
        os_icon is no longer bold.
        Slanted and flat separators are now using glyphs from Box Drawing Unicode block. They should look much better in fonts with correctly sized Box Drawing glyphs.
        gcloud now displays project name instead of project id whenever possible.

    Bug fixes:
        Powerlevel10k no longer resolves symbolic links when calling commands that might act differently depending on argv[0].
        java_version now works properly when using AdoptOpenJDK.

    Misc:
        Arch Linux users can now install Powerlevel10k with pacman. See instructions.
        There is a new version of MesloLGS NF (the recommended font) with better alignment of powerline glyphs and 44% larger icons (by area). iTerm2 users can upgrade by typing p10k configure. Users of other terminals can follow manual installation instructions.
---
 pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
index 777ec6e63c15..7fac0fb8ab8a 100644
--- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
+++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "powerlevel10k";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "romkatv";
     repo = "powerlevel10k";
     rev = "v${version}";
-    sha256 = "03v8qlblgdazbm16gwr87blm5nxizza61f8w6hjyhgrx51ly9ln5";
+    sha256 = "0r8vccgfy85ryswaigzgwmvhvrhlap7nrg7bi66w63877znqlksj";
   };
 
   patches = [

From 9280064b8b433073f6c028bab3aef1ea41004209 Mon Sep 17 00:00:00 2001
From: Travis CI <travis@travis-ci.org>
Date: Sun, 22 Mar 2020 16:48:01 +0000
Subject: [PATCH 3732/4636] gitAndTools.git-machete: 2.13.5 -> 2.13.6

###### Motivation for this change
Update to latest upstream version

###### Things done
 * [ ]  Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux)
 * Built on platform(s)

   * [x]  NixOS
   * [ ]  macOS
   * [ ]  other Linux distributions
 * [ ]  Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
 * [ ]  Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"`
 * [x]  Tested execution of all binary files (usually in `./result/bin/`)
 * [ ]  Determined the impact on package closure size (by running `nix path-info -S` before and after)
 * [ ]  Ensured that relevant documentation is up to date
 * [x]  Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

###### Notify maintainers
cc @worldofpeace @tfc @jtraue
---
 .../git-and-tools/git-machete/default.nix                   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
index e420fe405cf0..40da9045b817 100644
--- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonApplication rec {
   pname = "git-machete";
-  version = "2.13.5";
+  version = "2.13.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ll5l1f3vcib9a8qsqm8bfzz4g4q1dnr389x7x26kl13n6a50wib";
+    sha256 = "0n07gm05676vgfh6vlym59jwwzym9xmibhr0zpf0drlx02fr47qy";
   };
 
   nativeBuildInputs = [ installShellFiles pbr ];
@@ -25,7 +25,7 @@ buildPythonApplication rec {
 
   meta = with lib; {
     homepage = https://github.com/VirtusLab/git-machete;
-    description = "Git repository organizer and rebase workflow automation tool";
+    description = "Git repository organizer and rebase/merge workflow automation tool";
     license = licenses.mit;
     platforms = platforms.all;
     maintainers = [ maintainers.blitz ];

From 017dca51fa46df4f1b02f57eb17feaa75a1916ed Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Sun, 22 Mar 2020 18:11:36 +0100
Subject: [PATCH 3733/4636] fail2ban: fix firewall warning

---
 nixos/modules/services/security/fail2ban.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix
index 976b01fd10ee..3f84f9c2560c 100644
--- a/nixos/modules/services/security/fail2ban.nix
+++ b/nixos/modules/services/security/fail2ban.nix
@@ -216,7 +216,7 @@ in
 
   config = mkIf cfg.enable {
 
-    warnings = mkIf (config.networking.firewall.enable == false || config.networking.nftables.enable == false) [
+    warnings = mkIf (config.networking.firewall.enable == false && config.networking.nftables.enable == false) [
       "fail2ban can not be used without a firewall"
     ];
 

From 4c9bd5d52a10aefe7304e128b010aaa14910b85c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <christian.koegler@esg.de>
Date: Sun, 22 Mar 2020 13:16:19 +0100
Subject: [PATCH 3734/4636] redo-apenwarr: 0.42 -> 0.42a; use python3 and fixed
 building manpage

Removed dependency to mkdoc, which is only needed to build the webpage.
---
 .../redo-apenwarr/beautifulsoup.nix           | 20 ---------------
 .../build-managers/redo-apenwarr/default.nix  | 25 +++++--------------
 .../redo-apenwarr/mkdocs-exclude.nix          | 20 ---------------
 3 files changed, 6 insertions(+), 59 deletions(-)
 delete mode 100644 pkgs/development/tools/build-managers/redo-apenwarr/beautifulsoup.nix
 delete mode 100644 pkgs/development/tools/build-managers/redo-apenwarr/mkdocs-exclude.nix

diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/beautifulsoup.nix b/pkgs/development/tools/build-managers/redo-apenwarr/beautifulsoup.nix
deleted file mode 100644
index 571df924e1f8..000000000000
--- a/pkgs/development/tools/build-managers/redo-apenwarr/beautifulsoup.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ pythonPackages, isPy3k, pkgs }:
-
-pythonPackages.buildPythonPackage rec {
-  name = "beautifulsoup-3.2.1";
-  disabled = isPy3k;
-
-  src = pkgs.fetchurl {
-    url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz";
-    sha256 = "1nshbcpdn0jpcj51x0spzjp519pkmqz0n0748j7dgpz70zlqbfpm";
-  };
-
-  # error: invalid command 'test'
-  doCheck = false;
-
-  meta = {
-    homepage = http://www.crummy.com/software/BeautifulSoup/;
-    license = "bsd";
-    description = "Undemanding HTML/XML parser";
-  };
-}
diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
index f08a2e563429..ab6f505bff37 100644
--- a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
+++ b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix
@@ -1,27 +1,16 @@
-{ stdenv, lib, python27, fetchFromGitHub, mkdocs, which, findutils, coreutils
+{ stdenv, lib, python3, fetchFromGitHub, mkdocs, which, findutils, coreutils
 , perl
 , doCheck ? true
-}: let
-
-  # copy from 
-  # pkgs/applications/networking/pyload/beautifulsoup.nix
-  beautifulsoup = python27.pkgs.callPackage ./beautifulsoup.nix {
-    pythonPackages = python27.pkgs;
-  };
-
-  mkdocs-exclude = python27.pkgs.callPackage ./mkdocs-exclude.nix {
-    pythonPackages = python27.pkgs;
-  };
-in stdenv.mkDerivation rec {
+}: stdenv.mkDerivation rec {
 
   pname = "redo-apenwarr";
-  version = "0.42";
+  version = "0.42a";
 
   src = fetchFromGitHub rec {
     owner = "apenwarr";
     repo = "redo";
     rev = "${repo}-${version}";
-    sha256 = "1060yb7hrxm8c7bfvb0y4j0acpxsj6hbykw1d9549zpkxxr9nsgm";
+    sha256 = "172z2idslhcqibd4lw82k6349nl5fdda2vj10dqcjz0lvv6n7php";
   };
 
   postPatch = ''
@@ -60,10 +49,8 @@ in stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    python27
-    beautifulsoup
-    mkdocs
-    mkdocs-exclude
+    python3
+    (with python3.pkgs; [ beautifulsoup4 markdown ])
     which
     findutils
   ];
diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/mkdocs-exclude.nix b/pkgs/development/tools/build-managers/redo-apenwarr/mkdocs-exclude.nix
deleted file mode 100644
index d8c79e33dffb..000000000000
--- a/pkgs/development/tools/build-managers/redo-apenwarr/mkdocs-exclude.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ pythonPackages, isPy3k, pkgs }:
-
-pythonPackages.buildPythonPackage rec {
-  name = "mkdocs-exclude";
-  disabled = isPy3k;
-
-  src = pkgs.fetchFromGitHub {
-    owner = "apenwarr";
-    repo = "mkdocs-exclude";
-    rev = "fdd67d2685ff706de126e99daeaaaf3f6f7cf3ae";
-    sha256 = "1phhl79xf4xq8w2sb2w5zm4bahcr33gsbxkz7dl1dws4qhcbxrfd";
-  };
-
-  buildInputs = with pkgs; [
-    mkdocs
-  ];
-
-  # error: invalid command 'test'
-  doCheck = false;
-}

From 6c48c7b81f230e469becfe7f8447c434a955f08b Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 22 Mar 2020 19:50:50 +0100
Subject: [PATCH 3735/4636] fd: 7.4.0 -> 7.5.0

https://github.com/sharkdp/fd/releases/tag/v7.5.0
---
 pkgs/tools/misc/fd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix
index 3dfe7c80a5a5..060e1c3fcdf6 100644
--- a/pkgs/tools/misc/fd/default.nix
+++ b/pkgs/tools/misc/fd/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fd";
-  version = "7.4.0";
+  version = "7.5.0";
 
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "fd";
     rev = "v${version}";
-    sha256 = "108p1p9bxhg4qzwfs6wqcakcvlpqw3w498jkz1vhmg6jp1mbmgdr";
+    sha256 = "029xr7l751dy167hfzrd030llkaiy8j585h1d4l6391fgrsvnav7";
   };
 
-  cargoSha256 = "1nhlarrl0m6as3j2547yf1xxjm88qy3v8jgvhd47z3f5s63bb6w5";
+  cargoSha256 = "0lq6da2f6xywyhzyyrpph96d8b9vpdzakzipci167g6hhh232b5b";
 
   nativeBuildInputs = [ installShellFiles ];
 

From b7dad4977cd07424dd3d441e5d1a6ccbad58ced4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <christian.koegler@esg.de>
Date: Sun, 22 Mar 2020 11:42:53 +0100
Subject: [PATCH 3736/4636] vdr-xineliboutput: 2.1.0 -> 2.2.0

---
 pkgs/applications/video/vdr/xineliboutput/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/video/vdr/xineliboutput/default.nix b/pkgs/applications/video/vdr/xineliboutput/default.nix
index fd6ef250de6a..950cb253c129 100644
--- a/pkgs/applications/video/vdr/xineliboutput/default.nix
+++ b/pkgs/applications/video/vdr/xineliboutput/default.nix
@@ -4,16 +4,15 @@
 , libX11, libXext, libXrender, libXrandr
 , makeWrapper
 }: let
-  name = "vdr-xineliboutput-2.1.0";
-
   makeXinePluginPath = l: lib.concatStringsSep ":" (map (p: "${p}/lib/xine/plugins") l);
 
-  self =  stdenv.mkDerivation {
-    inherit name;
+  self =  stdenv.mkDerivation rec {
+    pname = "vdr-xineliboutput";
+    version = "2.2.0";
 
     src = fetchurl {
-      url = "mirror://sourceforge/project/xineliboutput/xineliboutput/${name}/${name}.tgz";
-      sha256 = "1phrxpaz8li7z0qy241spawalhcmwkv5hh3gdijbv4h7mm899yba";
+      url = "mirror://sourceforge/project/xineliboutput/xineliboutput/${pname}-${version}/${pname}-${version}.tgz";
+      sha256 = "0a24hs5nr7ncf51c5agyfn1xrvb4p70y3i0s6dlyyd9bwbfjldns";
     };
 
     postPatch = ''

From 7ca75fad04938dffbb6afbd5922808c6402e9987 Mon Sep 17 00:00:00 2001
From: Bryan Gardiner <bog@khumba.net>
Date: Sun, 22 Mar 2020 13:38:02 -0700
Subject: [PATCH 3737/4636] pydf: install man page and default config file

This makes the pydf derivation install the package's man page and default config
file, so that `man pydf` works and the user has a default config file to work
from.  This default config file is placed in `share/pydf/` and isn't read by
default; pydf still looks in `/etc` and `$HOME` instead.  (The file is identical
to the defaults in the executable itself except for additional colours applied
to the `full_fs_colour` setting.)
---
 pkgs/applications/misc/pydf/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/misc/pydf/default.nix b/pkgs/applications/misc/pydf/default.nix
index bfbee1bea24d..ae29993a79a1 100644
--- a/pkgs/applications/misc/pydf/default.nix
+++ b/pkgs/applications/misc/pydf/default.nix
@@ -9,6 +9,12 @@ python3Packages.buildPythonPackage rec {
     sha256 = "7f47a7c3abfceb1ac04fc009ded538df1ae449c31203962a1471a4eb3bf21439";
   };
 
+  postInstall = ''
+    mkdir -p $out/share/man/man1 $out/share/pydf
+    install -t $out/share/pydf -m 444 pydfrc
+    install -t $out/share/man/man1 -m 444 pydf.1
+  '';
+
   meta = with stdenv.lib; {
     description = "colourised df(1)-clone";
     homepage = http://kassiopeia.juls.savba.sk/~garabik/software/pydf/;

From ac1336120f68b93c95282fe403d8dd06197fe759 Mon Sep 17 00:00:00 2001
From: Colin L Rice <colin@daedrum.net>
Date: Thu, 27 Feb 2020 00:12:59 -0500
Subject: [PATCH 3738/4636] treewide Drop unneeded go 1.12 overrides

---
 .../networking/cluster/terraform-providers/default.nix     | 7 +------
 pkgs/top-level/all-packages.nix                            | 1 -
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 5112277a8c40..1487f8ad875f 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -2,7 +2,6 @@
 , buildGoPackage
 , fetchFromGitHub
 , callPackage
-, buildGo112Module
 , Security
 }:
 let
@@ -26,11 +25,7 @@ let
 in
   {
     elasticsearch = callPackage ./elasticsearch {
-      # Version 0.7.0 fails to build with go 1.13 due to dependencies:
-      #   verifying git.apache.org/thrift.git@v0.12.0/go.mod: git.apache.org/thrift.git@v0.12.0/go.mod: Get https://sum.golang.org/lookup/git.apache.org/thrift.git@v0.12.0: dial tcp: lookup sum.golang.org on [::1]:53: read udp [::1]:52968->[::1]:53: read: connection refused
-      #   verifying github.com/hashicorp/terraform@v0.12.0/go.mod: github.com/hashicorp/terraform@v0.12.0/go.mod: Get https://sum.golang.org/lookup/github.com/hashicorp/terraform@v0.12.0: dial tcp: lookup sum.golang.org on [::1]:53: read udp [::1]:52968->[::1]:53: read: connection refused
-      buildGoModule = buildGo112Module;
-      inherit Security;
+     inherit Security;
     };
     gandi = callPackage ./gandi {};
     ibm = callPackage ./ibm {};
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9c9d2de49ec..16b9176431cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25996,7 +25996,6 @@ in
 
   terraform-providers = recurseIntoAttrs (
     callPackage ../applications/networking/cluster/terraform-providers {
-      inherit buildGo112Module;
       inherit (darwin.apple_sdk.frameworks) Security;
     }
   );

From ce5dec1e318864363fd6b5669a3975e59db2d974 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 22 Mar 2020 22:08:38 +0100
Subject: [PATCH 3739/4636] spotify-tui: 0.16.0 -> 0.17.0

https://github.com/Rigellute/spotify-tui/releases/tag/v0.17.0
---
 pkgs/applications/audio/spotify-tui/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix
index 94f08a5f7a82..5837bd453101 100644
--- a/pkgs/applications/audio/spotify-tui/default.nix
+++ b/pkgs/applications/audio/spotify-tui/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "spotify-tui";
-  version = "0.16.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "Rigellute";
     repo = "spotify-tui";
     rev = "v${version}";
-    sha256 = "0fmj25zjg12v0kyanic343lrdhxkh290v88qiz6ac47g8bdy3c83";
+    sha256 = "1jx2qyshqg84l3fm682h8262da0hy68qjjg3dm2i53dxqxrm5ji9";
   };
 
-  cargoSha256 = "1n8aacy0hapjm10hmgqm07rb5c0ngmzr1s116pspsl7cdszza6xi";
+  cargoSha256 = "12qwp59gshc9d6nz0s3w03zc8sxqri12vrav94vi54fqagiikinm";
 
   nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ];
   buildInputs = [ openssl ]

From 066e6f79acb8f502d19d7f7e344d22c04d990567 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 22 Mar 2020 22:09:07 +0100
Subject: [PATCH 3740/4636] cargo-release: 0.13.1 -> 0.13.3

https://github.com/sunng87/cargo-release/releases/tag/v0.13.3
---
 pkgs/tools/package-management/cargo-release/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix
index c85bcf5b66c3..145d8aaacc00 100644
--- a/pkgs/tools/package-management/cargo-release/default.nix
+++ b/pkgs/tools/package-management/cargo-release/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-release";
-  version = "0.13.1";
+  version = "0.13.3";
 
   src = fetchFromGitHub {
     owner = "sunng87";
     repo = "cargo-release";
     rev = "v${version}";
-    sha256 = "0w4p1v9ya6kai2sy4ic45s1m01ya3hlysxlc8ha698jfvzs8nnld";
+    sha256 = "0d9fgmy87xjl9kcmx9crmmg83iyybisg0gfwmnlxz5529slqng5r";
   };
 
-  cargoSha256 = "02x268xbxd2nin9y1dm35mkk90vyx16zzp18fi4fwc8kpsdbjpai";
+  cargoSha256 = "1a6ac4x51i1rg0bgrxbbdd54gmwldsiv7nn8vi81y20llnshgjk7";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;

From 0dbf73c022ba73f9978af17af2e0ff4af662cf3f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 22 Mar 2020 22:39:44 +0100
Subject: [PATCH 3741/4636] hugo: 0.68.0 -> 0.68.1

https://github.com/gohugoio/hugo/releases/tag/v0.68.1
---
 pkgs/applications/misc/hugo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index e93812f6c0da..9509e8951097 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "hugo";
-  version = "0.68.0";
+  version = "0.68.1";
 
   src = fetchFromGitHub {
     owner = "gohugoio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1jdk4mwflxm7n076x4gbqb362z4qriszq8fkc0sjsvd05z613ry6";
+    sha256 = "1h7zymvxk71jq51az4qnldk54jl9sd4zwkn5r5323xzjffwzny82";
   };
 
   modSha256 = "04vzm65kbj9905z4cf5yh6yc6g3b0pd5vc00lrxw84pwgqgc0ykb";

From 049aede558741db86129e7116e99b1f1c7e2679e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 22 Mar 2020 22:40:10 +0100
Subject: [PATCH 3742/4636] EmptyEpsilon: 2020.02.18 -> 2020.03.22

https://github.com/daid/EmptyEpsilon/releases/tag/EE-2020.03.22
---
 pkgs/games/empty-epsilon/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix
index 29a789b4084b..fc71c288b987 100644
--- a/pkgs/games/empty-epsilon/default.nix
+++ b/pkgs/games/empty-epsilon/default.nix
@@ -3,8 +3,8 @@
 let
 
   major = "2020";
-  minor = "02";
-  patch = "18";
+  minor = "03";
+  patch = "22";
 
   version = "${major}.${minor}.${patch}";
 
@@ -16,7 +16,7 @@ let
       owner = "daid";
       repo = "SeriousProton";
       rev = "EE-${version}";
-      sha256 = "1cq32jm3p40h5mipb64i9b1kcid27bpc8g6j4k0v69cfqkjpha5c";
+      sha256 = "15dk2aij571sdrmpp3p0z1njb60lz0d95x0jgqdxz2q3wqnp5p61";
     };
 
     nativeBuildInputs = [ cmake ];
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
     owner = "daid";
     repo = "EmptyEpsilon";
     rev = "EE-${version}";
-    sha256 = "1hl3mbg6pw2r7ri042vm86pb2xv77jvh6pag1z96bxvx791zcnwk";
+    sha256 = "0idapy266mfrmi6dq3si5a8n12m1vvxr6ywbs0fs6sdkbabglc0c";
   };
 
   nativeBuildInputs = [ cmake ];

From ab7647b15b48137480e9d4c1e44dee4b3091bcde Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sun, 22 Mar 2020 19:29:22 -0300
Subject: [PATCH 3743/4636] libopenshot-audio: 0.1.8 -> 0.2.0

---
 pkgs/applications/video/openshot-qt/libopenshot-audio.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
index 9bf211164553..253ef15a600f 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "libopenshot-audio";
-  version = "0.1.8";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "libopenshot-audio";
     rev = "v${version}";
-    sha256 = "1fvp6nmf30xzkmcznakh8dv5vn9d7nq051pqcqv638hsfppkmcrl";
+    sha256 = "13if0m5mvlqly8gmbhschzb9papkgp3yqivklhb949dhy16m8zgf";
   };
 
   nativeBuildInputs =

From 71ab4348c00275e81d64f982f995b481d11a2f49 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sun, 22 Mar 2020 19:30:20 -0300
Subject: [PATCH 3744/4636] libopenshot: 0.2.3 -> 0.2.5

---
 pkgs/applications/video/openshot-qt/libopenshot.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix
index 2ed4b8ce3e3d..19852664a9f6 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot.nix
@@ -8,13 +8,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "libopenshot";
-  version = "0.2.3";
+  version = "0.2.5";
 
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "libopenshot";
     rev = "v${version}";
-    sha256 = "0r1qmr8ar5n72603xkj9h065vbpznrqsq88kxxmn9n8djyyvk03k";
+    sha256 = "1mxjkgjmjzgf628y3rscc6rqf55hxgjpmvwxlncfk1216i5xskwp";
   };
 
   patchPhase = ''

From 5f382299f8c462b3307dd724e2389b879e13577a Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Sun, 22 Mar 2020 19:30:52 -0300
Subject: [PATCH 3745/4636] openshot-qt: 2.4.4 -> 2.5.1

---
 pkgs/applications/video/openshot-qt/default.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix
index 1c5359e5f0c6..e8a348b43286 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/pkgs/applications/video/openshot-qt/default.nix
@@ -2,26 +2,17 @@
 , doxygen, python3Packages, libopenshot
 , wrapGAppsHook, gtk3 }:
 
-let
-  fixPermissions = fetchpatch rec {
-    url = https://github.com/OpenShot/openshot-qt/pull/2973.patch;
-    sha256 = "037rh0p3k4sdzprlpyb73byjq3qhqk5zd0d4iin6bq602r8bbp0n";
-  };
-in
-
 mkDerivationWith python3Packages.buildPythonApplication rec {
   pname = "openshot-qt";
-  version = "2.4.4";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "OpenShot";
     repo = "openshot-qt";
     rev = "v${version}";
-    sha256 = "0mg63v36h7l8kv2sgf6x8c1n3ygddkqqwlciz7ccxpbm4x1idqba";
+    sha256 = "0qc5i0ay6j2wab1whl41sjb71cj02pg6y79drf7asrprq8b2rmfq";
   };
 
-  patches = [ fixPermissions ];
-
   nativeBuildInputs = [ doxygen wrapGAppsHook ];
 
   buildInputs = [ gtk3 ];

From e1c308535442a95f8494d0dde12ff13e47276f64 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 22 Mar 2020 23:18:53 +0000
Subject: [PATCH 3746/4636] lrdf: move from librdf libraries

It was never called librdf and it is not a librdf.org project.
---
 pkgs/applications/audio/ardour/default.nix              | 8 ++++----
 pkgs/applications/audio/guitarix/default.nix            | 6 +++---
 pkgs/applications/audio/hydrogen/default.nix            | 9 +++++----
 pkgs/applications/audio/jack-rack/default.nix           | 4 ++--
 pkgs/applications/audio/non/default.nix                 | 4 ++--
 pkgs/applications/audio/rosegarden/default.nix          | 4 ++--
 pkgs/applications/audio/sonic-lineup/default.nix        | 8 ++++----
 pkgs/applications/audio/sonic-visualiser/default.nix    | 4 ++--
 pkgs/development/libraries/gstreamer/bad/default.nix    | 6 +++---
 pkgs/development/libraries/{librdf => lrdf}/default.nix | 0
 pkgs/top-level/aliases.nix                              | 2 ++
 pkgs/top-level/all-packages.nix                         | 5 ++---
 12 files changed, 31 insertions(+), 29 deletions(-)
 rename pkgs/development/libraries/{librdf => lrdf}/default.nix (100%)

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 30a4e052d77c..5b2f6931ed1c 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, doxygen
 , fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2
-, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
+, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg
 , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
-, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper
+, libusb, libuuid, libxml2, libxslt, lilv, lrdf, lv2, makeWrapper
 , perl, pkgconfig, python2, rubberband, serd, sord, sratom
 , taglib, vampSDK, dbus, fftw, pango, suil, libarchive
 , wafHook }:
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac
       glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo
-      libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
-      libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
+      libmad libogg librdf_raptor librdf_rasqal libsamplerate
+      libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lrdf lv2
       makeWrapper pango perl pkgconfig python2 rubberband serd sord
       sratom suil taglib vampSDK libarchive
     ];
diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index ca552882ba43..acb078fea876 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gettext, intltool, pkgconfig, python2
 , avahi, bluez, boost, eigen, fftw, glib, glib-networking
 , glibmm, gsettings-desktop-schemas, gtkmm2, libjack2
-, ladspaH, libav, librdf, libsndfile, lilv, lv2, serd, sord, sratom
+, ladspaH, libav, libsndfile, lilv, lrdf, lv2, serd, sord, sratom
 , wrapGAppsHook, zita-convolver, zita-resampler, curl, wafHook
 , optimizationSupport ? false # Enable support for native CPU extensions
 }:
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     avahi bluez boost eigen fftw glib glibmm glib-networking.out
-    gsettings-desktop-schemas gtkmm2 libjack2 ladspaH libav librdf
-    libsndfile lilv lv2 serd sord sratom zita-convolver
+    gsettings-desktop-schemas gtkmm2 libjack2 ladspaH libav
+    libsndfile lilv lrdf lv2 serd sord sratom zita-convolver
     zita-resampler curl
   ];
 
diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix
index 50093f8a61de..d8aa2a013c4d 100644
--- a/pkgs/applications/audio/hydrogen/default.nix
+++ b/pkgs/applications/audio/hydrogen/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, alsaLib, boost, cmake, glib, lash, libjack2, libarchive
-, liblrdf, libsndfile, pkgconfig, qt4 }:
+{ stdenv, fetchurl, pkgconfig, cmake
+, alsaLib, boost, glib, lash, libjack2, libarchive, libsndfile, lrdf, qt4
+}:
 
 stdenv.mkDerivation rec {
   version = "0.9.7";
@@ -10,9 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "1dy2jfkdw0nchars4xi4isrz66fqn53a9qk13bqza7lhmsg3s3qy";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig cmake ];
   buildInputs = [
-    alsaLib boost cmake glib lash libjack2 libarchive liblrdf libsndfile qt4
+    alsaLib boost glib lash libjack2 libarchive libsndfile lrdf qt4
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix
index 41b40223b87f..2f9b9db93c24 100644
--- a/pkgs/applications/audio/jack-rack/default.nix
+++ b/pkgs/applications/audio/jack-rack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libjack2, ladspaH, gtk2, alsaLib, libxml2, librdf }:
+{ stdenv, fetchurl, pkgconfig, libjack2, ladspaH, gtk2, alsaLib, libxml2, lrdf }:
 stdenv.mkDerivation rec {
   name = "jack-rack-1.4.7";
   src = fetchurl {
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
     sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045";
   };
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libjack2 ladspaH gtk2 alsaLib libxml2 librdf ];
+  buildInputs = [ libjack2 ladspaH gtk2 alsaLib libxml2 lrdf ];
   NIX_LDFLAGS = "-ldl -lm -lpthread";
 
   meta = {
diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix
index 5f8c82b98d04..651db50f0a7b 100644
--- a/pkgs/applications/audio/non/default.nix
+++ b/pkgs/applications/audio/non/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, python2, cairo, libjpeg, ntk, libjack2
-, libsndfile, ladspaH, liblrdf, liblo, libsigcxx, wafHook
+, libsndfile, ladspaH, liblo, libsigcxx, lrdf, wafHook
 }:
 
 stdenv.mkDerivation {
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkgconfig wafHook ];
   buildInputs = [ python2 cairo libjpeg ntk libjack2 libsndfile
-    ladspaH liblrdf liblo libsigcxx
+    ladspaH liblo libsigcxx lrdf
   ];
 
   meta = {
diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix
index 8d8e3e1b6c0e..3d9342f16caa 100644
--- a/pkgs/applications/audio/rosegarden/default.nix
+++ b/pkgs/applications/audio/rosegarden/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, cmake, makedepend, perl, pkgconfig, qttools, wrapQtAppsHook
 , dssi, fftwSinglePrec, ladspaH, ladspaPlugins, libjack2, alsaLib
-, liblo, liblrdf, libsamplerate, libsndfile, lirc ? null, qtbase }:
+, liblo, libsamplerate, libsndfile, lirc ? null, lrdf, qtbase }:
 
 stdenv.mkDerivation (rec {
   version = "19.12";
@@ -25,10 +25,10 @@ stdenv.mkDerivation (rec {
     ladspaPlugins
     libjack2
     liblo
-    liblrdf
     libsamplerate
     libsndfile
     lirc
+    lrdf
     qtbase
     alsaLib
   ];
diff --git a/pkgs/applications/audio/sonic-lineup/default.nix b/pkgs/applications/audio/sonic-lineup/default.nix
index 4ad9e51b6455..68e1b6b3f8aa 100644
--- a/pkgs/applications/audio/sonic-lineup/default.nix
+++ b/pkgs/applications/audio/sonic-lineup/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, alsaLib, boost, bzip2, fftw, fftwFloat, libfishsound
-, libid3tag, liblo, liblrdf, libmad, liboggz, libpulseaudio, libsamplerate
-, libsndfile, opusfile, portaudio, rubberband, serd, sord, vampSDK, capnproto
+, libid3tag, liblo, libmad, liboggz, libpulseaudio, libsamplerate
+, libsndfile, lrdf, opusfile, portaudio, rubberband, serd, sord, vampSDK, capnproto
 , wrapQtAppsHook, pkgconfig
 }:
 
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ alsaLib boost bzip2 fftw fftwFloat libfishsound libid3tag liblo liblrdf
-      libmad liboggz libpulseaudio libsamplerate libsndfile opusfile pkgconfig
+    [ alsaLib boost bzip2 fftw fftwFloat libfishsound libid3tag liblo
+      libmad liboggz libpulseaudio libsamplerate libsndfile lrdf opusfile
       portaudio rubberband serd sord capnproto
     ];
 
diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix
index d1c981de2d5d..187c887baa55 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -1,7 +1,7 @@
 # TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html
 
 { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo
-, libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
+, libmad, libogg, lrdf, librdf_raptor, librdf_rasqal, libsamplerate
 , libsndfile, pkgconfig, libpulseaudio, qtbase, qtsvg, redland
 , rubberband, serd, sord, vampSDK, fftwFloat
 , capnproto, liboggz, libfishsound, libid3tag, opusfile
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ libsndfile qtbase qtsvg fftw fftwFloat bzip2 librdf rubberband
+    [ libsndfile qtbase qtsvg fftw fftwFloat bzip2 lrdf rubberband
       libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland
       serd
       sord
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 9b2d3d0e2470..4fb62423d687 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -16,7 +16,7 @@
 , libass
 , libkate
 , libmms
-, librdf
+, lrdf
 , ladspaH
 , libnice
 , webrtc-audio-processing
@@ -178,13 +178,13 @@ in stdenv.mkDerivation rec {
     libgudev
     libnice
     libofa
-    librdf
+    lrdf
     sbc
     spandsp
 
     # ladspa plug-in
     ladspaH
-    librdf # TODO: make build on Darwin
+    lrdf # TODO: make build on Darwin
 
     # lv2 plug-in
     lilv
diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/lrdf/default.nix
similarity index 100%
rename from pkgs/development/libraries/librdf/default.nix
rename to pkgs/development/libraries/lrdf/default.nix
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 97e0491a9b2d..66fa444e0e7a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -235,7 +235,9 @@ mapAliases ({
   libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14
   libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28
   liblapackWithoutAtlas = liblapack; # added 2018-11-05
+  liblrdf = lrdf; # added 2018-04-25
   libqrencode = qrencode;  # added 2019-01-01
+  librdf = lrdf; # added 2020-03-22
   librecad2 = librecad;  # backwards compatibility alias, added 2015-10
   libsysfs = sysfsutils; # added 2018-04-25
   libtidy = html-tidy;  # added 2014-12-21
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9c9d2de49ec..37db858ec0dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13576,6 +13576,8 @@ in
 
   loudmouth = callPackage ../development/libraries/loudmouth { };
 
+  lrdf = callPackage ../development/libraries/lrdf { };
+
   luabind = callPackage ../development/libraries/luabind { lua = lua5_1; };
 
   luabind_luajit = luabind.override { lua = luajit; };
@@ -14337,9 +14339,6 @@ in
   librdf_redland = callPackage ../development/libraries/librdf/redland.nix { };
   redland = librdf_redland; # added 2018-04-25
 
-  librdf = callPackage ../development/libraries/librdf { };
-  liblrdf = librdf; # added 2018-04-25
-
   libsmf = callPackage ../development/libraries/audio/libsmf { };
 
   lilv = callPackage ../development/libraries/audio/lilv { };

From b9dca769f150483b2e5e01c41c7df1e44f48f996 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Thu, 30 Jan 2020 21:18:43 -0500
Subject: [PATCH 3747/4636] nixos/duosec: replace insecure skey option with
 secure secretKeyFile option

---
 nixos/doc/manual/release-notes/rl-2009.xml |  8 +++
 nixos/modules/security/duosec.nix          | 61 ++++++++++++++--------
 2 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 2f61ee5ae2ed..1ca172c99f13 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -96,6 +96,14 @@
       <option>systemd.services.supybot.serviceConfig</option>.
     </para>
    </listitem>
+   <listitem>
+    <para>
+      The <literal>security.duosec.skey</literal> option, which stored a secret in the
+      nix store, has been replaced by a new
+      <link linkend="opt-security.duosec.secretKeyFile">security.duosec.secretKeyFile</link>
+      option for better security.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix
index 2d5596738ce5..38169706463d 100644
--- a/nixos/modules/security/duosec.nix
+++ b/nixos/modules/security/duosec.nix
@@ -10,7 +10,6 @@ let
   configFilePam = ''
     [duo]
     ikey=${cfg.ikey}
-    skey=${cfg.skey}
     host=${cfg.host}
     ${optionalString (cfg.groups != "") ("groups="+cfg.groups)}
     failmode=${cfg.failmode}
@@ -24,26 +23,11 @@ let
     motd=${boolToStr cfg.motd}
     accept_env_factor=${boolToStr cfg.acceptEnvFactor}
   '';
-
-  loginCfgFile = optionalAttrs cfg.ssh.enable {
-    "duo/login_duo.conf" =
-      { source = pkgs.writeText "login_duo.conf" configFileLogin;
-        mode   = "0600";
-        user   = "sshd";
-      };
-  };
-
-  pamCfgFile = optional cfg.pam.enable {
-    "duo/pam_duo.conf" =
-      { source = pkgs.writeText "pam_duo.conf" configFilePam;
-        mode   = "0600";
-        user   = "sshd";
-      };
-  };
 in
 {
   imports = [
     (mkRenamedOptionModule [ "security" "duosec" "group" ] [ "security" "duosec" "groups" ])
+    (mkRemovedOptionModule [ "security" "duosec" "skey" ] "The insecure security.duosec.skey option has been replaced by a new security.duosec.secretKeyFile option. Use this new option to store a secure copy of your key instead.")
   ];
 
   options = {
@@ -65,9 +49,13 @@ in
         description = "Integration key.";
       };
 
-      skey = mkOption {
-        type = types.str;
-        description = "Secret key.";
+      secretKeyFile = mkOption {
+        type = types.path;
+        default = null;
+        description = ''
+          A file containing your secret key. The security of your Duo application is tied to the security of your secret key.
+        '';
+        example = "/run/keys/duo-skey";
       };
 
       host = mkOption {
@@ -198,7 +186,38 @@ in
     environment.systemPackages = [ pkgs.duo-unix ];
 
     security.wrappers.login_duo.source = "${pkgs.duo-unix.out}/bin/login_duo";
-    environment.etc = loginCfgFile // pamCfgFile;
+
+    system.activationScripts = {
+      login_duo = mkIf cfg.ssh.enable ''
+        if test -f "${cfg.secretKeyFile}"; then
+          mkdir -m 0755 -p /etc/duo
+
+          umask 0077
+          conf="$(mktemp)"
+          {
+            cat ${pkgs.writeText "login_duo.conf" configFileLogin}
+            printf 'skey = %s\n' "$(cat ${cfg.secretKeyFile})"
+          } >"$conf"
+
+          chown sshd "$conf"
+          mv -fT "$conf" /etc/duo/login_duo.conf
+        fi
+      '';
+      pam_duo = mkIf cfg.pam.enable ''
+        if test -f "${cfg.secretKeyFile}"; then
+          mkdir -m 0755 -p /etc/duo
+
+          umask 0077
+          conf="$(mktemp)"
+          {
+            cat ${pkgs.writeText "login_duo.conf" configFilePam}
+            printf 'skey = %s\n' "$(cat ${cfg.secretKeyFile})"
+          } >"$conf"
+
+          mv -fT "$conf" /etc/duo/pam_duo.conf
+        fi
+      '';
+    };
 
     /* If PAM *and* SSH are enabled, then don't do anything special.
     If PAM isn't used, set the default SSH-only options. */

From 72dca3638d4d4be0593b41bada8eba78a92e106d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 22 Mar 2020 23:42:12 +0100
Subject: [PATCH 3748/4636] xterm: 351 -> 353

https://invisible-island.net/xterm/xterm.log.html#xterm_353
---
 pkgs/applications/misc/xterm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index 8dcd533b5223..8842d01e7068 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xterm-351";
+  name = "xterm-353";
 
   src = fetchurl {
     urls = [
      "ftp://ftp.invisible-island.net/xterm/${name}.tgz"
      "https://invisible-mirror.net/archives/xterm/${name}.tgz"
    ];
-    sha256 = "05kf586my4irrzz2bxgmwjdvynyrg9ybhvfqmx29g70w4888l2kn";
+    sha256 = "0s5pkfn4r8iy09s1q1y78zhnr9f3sm6wgbqir7azaqggkppd68g5";
   };
 
   buildInputs =

From 6f0c1cdbd9ff567ca8d723bbe2bb560145300cb3 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Thu, 30 Jan 2020 21:21:47 -0500
Subject: [PATCH 3749/4636] nixos/duosec: rename ikey option to integrationKey

---
 nixos/doc/manual/release-notes/rl-2009.xml | 4 ++++
 nixos/modules/security/duosec.nix          | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index 1ca172c99f13..a9a6003d1e8a 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -103,6 +103,10 @@
       <link linkend="opt-security.duosec.secretKeyFile">security.duosec.secretKeyFile</link>
       option for better security.
     </para>
+    <para>
+      <literal>security.duosec.ikey</literal> has been renamed to
+      <link linkend="opt-security.duosec.integrationKey">security.duosec.integrationKey</link>.
+    </para>
    </listitem>
   </itemizedlist>
  </section>
diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix
index 38169706463d..71428b82f5da 100644
--- a/nixos/modules/security/duosec.nix
+++ b/nixos/modules/security/duosec.nix
@@ -9,7 +9,7 @@ let
 
   configFilePam = ''
     [duo]
-    ikey=${cfg.ikey}
+    ikey=${cfg.integrationKey}
     host=${cfg.host}
     ${optionalString (cfg.groups != "") ("groups="+cfg.groups)}
     failmode=${cfg.failmode}
@@ -27,6 +27,7 @@ in
 {
   imports = [
     (mkRenamedOptionModule [ "security" "duosec" "group" ] [ "security" "duosec" "groups" ])
+    (mkRenamedOptionModule [ "security" "duosec" "ikey" ] [ "security" "duosec" "integrationKey" ])
     (mkRemovedOptionModule [ "security" "duosec" "skey" ] "The insecure security.duosec.skey option has been replaced by a new security.duosec.secretKeyFile option. Use this new option to store a secure copy of your key instead.")
   ];
 
@@ -44,7 +45,7 @@ in
         description = "If enabled, protect logins with Duo Security using PAM support.";
       };
 
-      ikey = mkOption {
+      integrationKey = mkOption {
         type = types.str;
         description = "Integration key.";
       };

From fb4d3a8535b13fbb219d272afff900f27401f760 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 23 Mar 2020 00:14:40 +0000
Subject: [PATCH 3750/4636] lrdf: 0.5.0 -> 0.6.1

Also remove the second copy of lrdf from gstreamer/bad inputs.
---
 .../libraries/gstreamer/bad/default.nix        |  1 -
 pkgs/development/libraries/lrdf/default.nix    | 18 ++++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 4fb62423d687..da04f0b05edd 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -178,7 +178,6 @@ in stdenv.mkDerivation rec {
     libgudev
     libnice
     libofa
-    lrdf
     sbc
     spandsp
 
diff --git a/pkgs/development/libraries/lrdf/default.nix b/pkgs/development/libraries/lrdf/default.nix
index 5b39940bb3f7..264c18b09ee4 100644
--- a/pkgs/development/libraries/lrdf/default.nix
+++ b/pkgs/development/libraries/lrdf/default.nix
@@ -1,29 +1,31 @@
-{ config, stdenv, fetchurl, pkgconfig, autoreconfHook
+{ config, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
 , librdf_raptor2, ladspaH, openssl, zlib
 , doCheck ? config.doCheckByDefault or false, ladspaPlugins
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.5.0";
-  pname = "liblrdf";
+  pname = "lrdf";
+  version = "0.6.1";
 
-  src = fetchurl {
-    url = "https://github.com/swh/LRDF/archive/${version}.tar.gz";
-    sha256 = "18p2flb2sv2hq6w2qkd29z9c7knnwqr3f12i2srshlzx6vwkm05s";
+  src = fetchFromGitHub {
+    owner = "swh";
+    repo = "LRDF";
+    rev = "v${version}";
+    sha256 = "00wzkfb8y0aqd519ypz067cq099dpc89w69zw8ln39vl6f9x2pd4";
   };
 
   postPatch = stdenv.lib.optionalString doCheck ''
     sed -i -e 's:usr/local:${ladspaPlugins}:' examples/{instances,remove}_test.c
   '';
 
-  preAutoreconf = "rm m4/*";
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ ladspaH openssl zlib ];
 
   propagatedBuildInputs = [ librdf_raptor2 ];
 
   inherit doCheck;
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "Lightweight RDF library with special support for LADSPA plugins";
     homepage = https://sourceforge.net/projects/lrdf/;

From 33631c44fb80d2f2cac929a5640cf0bc5db767cd Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 23 Mar 2020 02:02:29 +0000
Subject: [PATCH 3751/4636] lilv: hide private dependencies

This is needed for pkg-config --libs lilv-0.
---
 pkgs/development/libraries/audio/lilv/default.nix          | 5 ++++-
 pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch

diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix
index 44be67d71b4e..233b93d6782b 100644
--- a/pkgs/development/libraries/audio/lilv/default.nix
+++ b/pkgs/development/libraries/audio/lilv/default.nix
@@ -9,8 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "1p3hafsxgs5d4za7n66lf5nz74qssfqpmk520cm7iq2njvvlqm2z";
   };
 
+  patches = [ ./lilv-pkgconfig.patch ];
+
   nativeBuildInputs = [ pkgconfig python3 wafHook ];
-  buildInputs = [ lv2 serd sord sratom ];
+  buildInputs = [ serd sord sratom ];
+  propagatedBuildInputs = [ lv2 ];
 
   meta = with stdenv.lib; {
     homepage = http://drobilla.net/software/lilv;
diff --git a/pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch b/pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch
new file mode 100644
index 000000000000..a5a8c6007e43
--- /dev/null
+++ b/pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch
@@ -0,0 +1,6 @@
+--- a/lilv.pc.in
++++ b/lilv.pc.in
+@@ -9 +9,2 @@ Description: Simple C library for hosting LV2 plugins
+-Requires: @LILV_PKG_DEPS@
++Requires: lv2
++Requires.private: @LILV_PKG_DEPS@

From 89266826730c1f699046d0a2832ee7a5ce5b4c19 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 23 Mar 2020 02:07:43 +0000
Subject: [PATCH 3752/4636] sord: propagate dependence on serd

sord.h includes serd.h
---
 pkgs/development/libraries/sord/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix
index 2113d7bd49b4..746054e5939c 100644
--- a/pkgs/development/libraries/sord/default.nix
+++ b/pkgs/development/libraries/sord/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig python3 wafHook ];
-  buildInputs = [ serd pcre ];
+  buildInputs = [ pcre ];
+  propagatedBuildInputs = [ serd ];
 
   meta = with stdenv.lib; {
     homepage = http://drobilla.net/software/sord;

From fa456f45bcc84bcf4ff64e1521291ee02aa9d086 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 23 Mar 2020 02:08:54 +0000
Subject: [PATCH 3753/4636] rtaudio: hide private dependencies

---
 pkgs/development/libraries/audio/rtaudio/default.nix         | 2 ++
 .../libraries/audio/rtaudio/rtaudio-pkgconfig.patch          | 5 +++++
 2 files changed, 7 insertions(+)
 create mode 100644 pkgs/development/libraries/audio/rtaudio/rtaudio-pkgconfig.patch

diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix
index f26f2b07e71a..fc14236fe24a 100644
--- a/pkgs/development/libraries/audio/rtaudio/default.nix
+++ b/pkgs/development/libraries/audio/rtaudio/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "1pglnjz907ajlhnlnig3p0sx7hdkpggr8ss7b3wzf1lykzgv9l52";
   };
 
+  patches = [ ./rtaudio-pkgconfig.patch ];
+
   enableParallelBuilding = true;
 
   buildInputs = [ autoconf automake libtool libjack2 alsaLib pulseaudio rtmidi ];
diff --git a/pkgs/development/libraries/audio/rtaudio/rtaudio-pkgconfig.patch b/pkgs/development/libraries/audio/rtaudio/rtaudio-pkgconfig.patch
new file mode 100644
index 000000000000..8536332d46d7
--- /dev/null
+++ b/pkgs/development/libraries/audio/rtaudio/rtaudio-pkgconfig.patch
@@ -0,0 +1,5 @@
+--- a/rtaudio.pc.in
++++ b/rtaudio.pc.in
+@@ -9 +9 @@ Version: @PACKAGE_VERSION@
+-Requires: @req@ 
++Requires.private: @req@ 

From f4c15495a663161a1a5a0085642d35dea2ce4a9c Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 23 Mar 2020 02:28:37 +0000
Subject: [PATCH 3754/4636] libinstpatch: init at 1.1.3

---
 .../libraries/audio/libinstpatch/default.nix  | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/libraries/audio/libinstpatch/default.nix

diff --git a/pkgs/development/libraries/audio/libinstpatch/default.nix b/pkgs/development/libraries/audio/libinstpatch/default.nix
new file mode 100644
index 000000000000..d5c15ad3e38c
--- /dev/null
+++ b/pkgs/development/libraries/audio/libinstpatch/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, cmake, pkg-config, glib, libsndfile }:
+
+stdenv.mkDerivation rec {
+  pname = "libinstpatch";
+  version = "1.1.3";
+
+  src = fetchFromGitHub {
+    owner = "swami";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0ksilyszcm7mwb6m8qyrgalvh4h2vkyz7wzj0xczcqkj15bcl4lw";
+  };
+
+  nativeBuildInputs = [ cmake pkg-config ];
+
+  propagatedBuildInputs = [ glib libsndfile ]; # Both are needed for includes.
+
+  cmakeFlags = [
+    "-DLIB_SUFFIX=" # Install in $out/lib.
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.swamiproject.org/;
+    description = "MIDI instrument patch files support library";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ orivej ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 37db858ec0dc..f4d6091c7011 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13067,6 +13067,8 @@ in
 
   libinput-gestures = callPackage ../tools/inputmethods/libinput-gestures {};
 
+  libinstpatch = callPackage ../development/libraries/audio/libinstpatch { };
+
   libisofs = callPackage ../development/libraries/libisofs { };
 
   libisoburn = callPackage ../development/libraries/libisoburn { };

From 624c83f70a319b0be4e84a336c1ae91da44b7853 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 22 Mar 2020 22:56:15 +0000
Subject: [PATCH 3755/4636] muse: 3.1pre1 -> 3.1.0

---
 pkgs/applications/audio/muse/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix
index f1fad05beced..8d71a7333445 100644
--- a/pkgs/applications/audio/muse/default.nix
+++ b/pkgs/applications/audio/muse/default.nix
@@ -17,9 +17,9 @@
 , pkgconfig
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "muse-sequencer";
-  version = "3.1pre1";
+  version = "3.1.0";
 
   meta = with stdenv.lib; {
     homepage = "https://www.muse-sequencer.org/";
@@ -32,15 +32,15 @@ stdenv.mkDerivation {
       MusE aims to be a complete multitrack virtual studio for Linux,
       it is published under the GNU General Public License.
     '';
-    license = stdenv.lib.licenses.gpl2;
+    license = stdenv.lib.licenses.gpl2Plus;
   };
 
   src =
     fetchFromGitHub {
       owner = "muse-sequencer";
       repo = "muse";
-      rev = "2167ae053c16a633d8377acdb1debaac10932838";
-      sha256 = "0rsdx8lvcbz5bapnjvypw8h8bq587s9z8cf2znqrk6ah38s6fsrf";
+      rev = "muse_${builtins.replaceStrings ["."] ["_"] version}";
+      sha256 = "08k25652w88xf2i79lw305x1phpk7idrww9jkqwcs8q6wzgmz8aq";
     };
 
 

From 3c23cf90509caf29240049c0439b373559bbdd26 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 23 Mar 2020 02:46:48 +0000
Subject: [PATCH 3756/4636] muse: enable all suggested optional dependencies

---
 pkgs/applications/audio/muse/default.nix | 71 +++++++-----------------
 1 file changed, 21 insertions(+), 50 deletions(-)

diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix
index 8d71a7333445..bc0325356b29 100644
--- a/pkgs/applications/audio/muse/default.nix
+++ b/pkgs/applications/audio/muse/default.nix
@@ -1,26 +1,28 @@
-{ stdenv
-, fetchFromGitHub
-, libjack2
-, wrapQtAppsHook
-, qtsvg
-, qttools
-, cmake
-, libsndfile
-, libsamplerate
-, ladspaH
-, fluidsynth
-, alsaLib
-, rtaudio
-, lash
-, dssi
-, liblo
-, pkgconfig
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qttools, wrapQtAppsHook
+, alsaLib, dssi, fluidsynth, ladspaH, lash, libinstpatch, libjack2, liblo
+, libsamplerate, libsndfile, lilv, lrdf, lv2, qtsvg, rtaudio, rubberband, sord
 }:
 
 stdenv.mkDerivation rec {
   pname = "muse-sequencer";
   version = "3.1.0";
 
+  src = fetchFromGitHub {
+    owner = "muse-sequencer";
+    repo = "muse";
+    rev = "muse_${builtins.replaceStrings ["."] ["_"] version}";
+    sha256 = "08k25652w88xf2i79lw305x1phpk7idrww9jkqwcs8q6wzgmz8aq";
+  };
+
+  sourceRoot = "source/muse3";
+
+  nativeBuildInputs = [ cmake pkgconfig qttools wrapQtAppsHook ];
+
+  buildInputs = [
+    alsaLib dssi fluidsynth ladspaH lash libinstpatch libjack2 liblo
+    libsamplerate libsndfile lilv lrdf lv2 qtsvg rtaudio rubberband sord
+  ];
+
   meta = with stdenv.lib; {
     homepage = "https://www.muse-sequencer.org/";
     description = "MIDI/Audio sequencer with recording and editing capabilities";
@@ -32,38 +34,7 @@ stdenv.mkDerivation rec {
       MusE aims to be a complete multitrack virtual studio for Linux,
       it is published under the GNU General Public License.
     '';
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ orivej ];
   };
-
-  src =
-    fetchFromGitHub {
-      owner = "muse-sequencer";
-      repo = "muse";
-      rev = "muse_${builtins.replaceStrings ["."] ["_"] version}";
-      sha256 = "08k25652w88xf2i79lw305x1phpk7idrww9jkqwcs8q6wzgmz8aq";
-    };
-
-
-  nativeBuildInputs = [
-    pkgconfig
-    wrapQtAppsHook
-    qttools
-    cmake
-  ];
-
-  buildInputs = [
-    libjack2
-    qtsvg
-    libsndfile
-    libsamplerate
-    ladspaH
-    fluidsynth
-    alsaLib
-    rtaudio
-    lash
-    dssi
-    liblo
-  ];
-
-  sourceRoot = "source/muse3";
 }

From d5b27c6c749d533d5d8699e57a50803d29ad6f68 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 23 Mar 2020 03:41:26 +0000
Subject: [PATCH 3757/4636] muse: fix parallel building

---
 pkgs/applications/audio/muse/default.nix      |  6 ++
 .../audio/muse/fix-parallel-building.patch    | 78 +++++++++++++++++++
 2 files changed, 84 insertions(+)
 create mode 100644 pkgs/applications/audio/muse/fix-parallel-building.patch

diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix
index bc0325356b29..87f86306b482 100644
--- a/pkgs/applications/audio/muse/default.nix
+++ b/pkgs/applications/audio/muse/default.nix
@@ -16,6 +16,12 @@ stdenv.mkDerivation rec {
 
   sourceRoot = "source/muse3";
 
+  prePatch = ''
+    chmod u+w $NIX_BUILD_TOP
+  '';
+
+  patches = [ ./fix-parallel-building.patch ];
+
   nativeBuildInputs = [ cmake pkgconfig qttools wrapQtAppsHook ];
 
   buildInputs = [
diff --git a/pkgs/applications/audio/muse/fix-parallel-building.patch b/pkgs/applications/audio/muse/fix-parallel-building.patch
new file mode 100644
index 000000000000..abeec5d54cc0
--- /dev/null
+++ b/pkgs/applications/audio/muse/fix-parallel-building.patch
@@ -0,0 +1,78 @@
+To confirm these dependencies, run in a fresh build tree:
+
+
+ninja muse/components/CMakeFiles/components.dir/confmport.o
+
+In file included from ../muse/components/confmport.cpp:48:
+../muse/mplugins/midifilterimpl.h:28:10: fatal error:
+ui_midifilter.h: No such file or directory
+
+
+ninja muse/waveedit/CMakeFiles/waveedit.dir/wavecanvas.o
+
+In file included from ../muse/waveedit/wavecanvas.cpp:72:
+../muse/components/copy_on_write.h:26:10: fatal error:
+ui_copy_on_write_base.h: No such file or directory
+
+
+ninja muse/instruments/CMakeFiles/instruments.dir/editinstrument.o
+
+In file included from ../muse/instruments/editinstrument.cpp:58:
+../muse/components/editevent.h:26:10: fatal error:
+ui_editnotedialogbase.h: No such file or directory
+
+
+ninja muse/liste/CMakeFiles/liste.dir/listedit.o
+
+In file included from ../muse/liste/listedit.cpp:37:
+../muse/components/editevent.h:26:10: fatal error:
+ui_editnotedialogbase.h: No such file or directory
+
+
+ninja muse/mixer/CMakeFiles/mixer.dir/rack.o
+
+In file included from ../muse/mixer/rack.cpp:49:
+../muse/components/plugindialog.h:4:10: fatal error:
+ui_plugindialogbase.h: No such file or directory
+
+
+--- a/muse/components/CMakeLists.txt
++++ b/muse/components/CMakeLists.txt
+@@ -343,4 +343,5 @@ set_target_properties( components
+ target_link_libraries ( components
+       ${QT_LIBRARIES}
++      mplugins
+       widgets
+       xml_module
+--- a/muse/waveedit/CMakeLists.txt
++++ b/muse/waveedit/CMakeLists.txt
+@@ -79,4 +79,5 @@ set_target_properties( waveedit
+ target_link_libraries( waveedit
+       ${QT_LIBRARIES}
++      components
+       widgets
+       )
+--- a/muse/instruments/CMakeLists.txt
++++ b/muse/instruments/CMakeLists.txt
+@@ -78,4 +78,5 @@ set_target_properties( instruments
+ target_link_libraries ( instruments
+       ${QT_LIBRARIES}
++      components
+       icons
+       widgets
+--- a/muse/liste/CMakeLists.txt
++++ b/muse/liste/CMakeLists.txt
+@@ -65,4 +65,5 @@ set_target_properties( liste
+ target_link_libraries ( liste
+       ${QT_LIBRARIES}
++      components
+       awl
+       widgets
+--- a/muse/mixer/CMakeLists.txt
++++ b/muse/mixer/CMakeLists.txt
+@@ -87,4 +87,5 @@ set_target_properties ( mixer
+ target_link_libraries ( mixer
+       ${QT_LIBRARIES}
++      components
+       widgets
+       )

From da4ca45f3db5f4da0015f0e5c846a5001b9c440a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2020 04:52:42 +0000
Subject: [PATCH 3758/4636] python27Packages.aioconsole: 0.1.15 -> 0.1.16

---
 pkgs/development/python-modules/aioconsole/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix
index 36a1c1b76e4f..6e867d0b0f65 100644
--- a/pkgs/development/python-modules/aioconsole/default.nix
+++ b/pkgs/development/python-modules/aioconsole/default.nix
@@ -10,11 +10,11 @@
 # wrapped to be able to find aioconsole and any other packages.
 buildPythonPackage rec {
   pname = "aioconsole";
-  version = "0.1.15";
+  version = "0.1.16";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0gbl08p89959g8dqy2vainppg3kyf948xlh18p7iwk5p0mw5d3j9";
+    sha256 = "0yk4ghvg47drfvdrrcw7nk14pg4shccmyhln9d8hy1lyafcqmnd5";
   };
 
   # hardcodes a test dependency on an old version of pytest-asyncio
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Asynchronous console and interfaces for asyncio";
-    homepage = https://github.com/vxgmichel/aioconsole;
+    homepage = "https://github.com/vxgmichel/aioconsole";
     license = lib.licenses.gpl3;
     maintainers = [ lib.maintainers.catern ];
   };

From 03c903605abb4cc992678e6916d043ba9c1feb59 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 22 Mar 2020 16:51:52 +0000
Subject: [PATCH 3759/4636] hiredis: 0.14.0 -> 0.14.1

---
 pkgs/development/libraries/hiredis/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix
index 6dc3871e1c18..4055cb8eb71e 100644
--- a/pkgs/development/libraries/hiredis/default.nix
+++ b/pkgs/development/libraries/hiredis/default.nix
@@ -2,19 +2,19 @@
 
 stdenv.mkDerivation rec {
   pname = "hiredis";
-  version = "0.14.0";
+  version = "0.14.1";
 
   src = fetchFromGitHub {
     owner = "redis";
     repo = "hiredis";
     rev = "v${version}";
-    sha256 = "0ik38lwpmm780jqrry95ckf6flmvd172444p3q8d1k9n99jwij9c";
+    sha256 = "1r93ssniiv610pj6d78i1cngism0cdv2k8cmzy7jf9klf76jiwfq";
   };
 
   PREFIX = "\${out}";
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/redis/hiredis;
+    homepage = "https://github.com/redis/hiredis";
     description = "Minimalistic C client for Redis >= 1.2";
     license = licenses.bsd3;
     platforms = platforms.all;

From b51cb30360faf101db20c168e5dce3131888abe8 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 19 Mar 2020 19:58:35 +0100
Subject: [PATCH 3760/4636] pythonPackages.txamqp: 0.3 -> 0.8.2

---
 .../python-modules/txamqp/default.nix            | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/txamqp/default.nix b/pkgs/development/python-modules/txamqp/default.nix
index d59a0bb8b8a4..db973dbffbed 100644
--- a/pkgs/development/python-modules/txamqp/default.nix
+++ b/pkgs/development/python-modules/txamqp/default.nix
@@ -1,22 +1,22 @@
 { stdenv
 , buildPythonPackage
-, fetchurl
+, fetchPypi
 , twisted
 }:
 
 buildPythonPackage rec {
-  pname = "txamqp";
-  version = "0.3";
+  pname = "txAMQP";
+  version = "0.8.2";
 
-  src = fetchurl {
-    url = "https://launchpad.net/txamqp/trunk/${version}/+download/python-txamqp_${version}.orig.tar.gz";
-    sha256 = "1r2ha0r7g14i4b5figv2spizjrmgfpspdbl1m031lw9px2hhm463";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0jd9864k3csc06kipiwzjlk9mq4054s8kzk5q1cfnxj8572s4iv4";
   };
 
-  buildInputs = [ twisted ];
+  propagatedBuildInputs = [ twisted ];
 
   meta = with stdenv.lib; {
-    homepage = https://launchpad.net/txamqp;
+    homepage = "https://github.com/txamqp/txamqp";
     description = "Library for communicating with AMQP peers and brokers using Twisted";
     license = licenses.asl20;
     maintainers = [];

From 1deec0ea2bea00ab46acadbceb86e2dbfabd8294 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 19 Mar 2020 20:07:44 +0100
Subject: [PATCH 3761/4636] pythonPackages.carbon: fix build and enable python3

---
 pkgs/development/python-modules/carbon/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/carbon/default.nix b/pkgs/development/python-modules/carbon/default.nix
index c471240c87ad..427108a93910 100644
--- a/pkgs/development/python-modules/carbon/default.nix
+++ b/pkgs/development/python-modules/carbon/default.nix
@@ -6,17 +6,19 @@ buildPythonPackage rec {
   pname = "carbon";
   version = "1.1.6";
 
-  disabled = isPy3k;
-
   src = fetchPypi {
     inherit pname version;
     sha256 = "9ecda1469e497e3fed346b23ac94fd576e1bd9962677ab88975f4f598186e851";
   };
 
+  # Carbon-s default installation is /opt/graphite. This env variable ensures
+  # carbon is installed as a regular python module.
+  GRAPHITE_NO_PREFIX="True";
+
   propagatedBuildInputs = [ twisted whisper txamqp cachetools urllib3 ];
 
   meta = with stdenv.lib; {
-    homepage = http://graphite.wikidot.com/;
+    homepage = "http://graphiteapp.org/";
     description = "Backend data caching and persistence daemon for Graphite";
     maintainers = with maintainers; [ offline basvandijk ];
     license = licenses.asl20;

From 545ba5b455967b19756ae3b486534436fe41f0d8 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 19 Mar 2020 20:10:56 +0100
Subject: [PATCH 3762/4636] pythonPackages.waitress-django: use mainained
 django

---
 pkgs/development/python-modules/waitress-django/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/waitress-django/default.nix b/pkgs/development/python-modules/waitress-django/default.nix
index 6b3ca778ead1..e76d1f110296 100644
--- a/pkgs/development/python-modules/waitress-django/default.nix
+++ b/pkgs/development/python-modules/waitress-django/default.nix
@@ -1,11 +1,11 @@
-{ buildPythonPackage, django_1_8, waitress }:
+{ buildPythonPackage, django, waitress }:
 
 buildPythonPackage {
   pname = "waitress-django";
   version = "0.0.0";
 
   src = ./.;
-  pythonPath = [ django_1_8 waitress ];
+  pythonPath = [ django waitress ];
   doCheck = false;
   meta.description = "A waitress WSGI server serving django";
 }

From a268fcb02c105ec169a59aa4ca560a9432bea79a Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 20 Mar 2020 16:39:15 +0100
Subject: [PATCH 3763/4636] python3Packages.graphite-web: fix build

---
 .../python-modules/graphite-web/default.nix   | 37 +++++--------------
 .../graphite-web/update-django-tagging.patch  | 12 ++++++
 2 files changed, 22 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/development/python-modules/graphite-web/update-django-tagging.patch

diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix
index 88e3118d4561..9499a9a6fe2c 100644
--- a/pkgs/development/python-modules/graphite-web/default.nix
+++ b/pkgs/development/python-modules/graphite-web/default.nix
@@ -1,52 +1,35 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, which
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k
 , django, django_tagging, whisper, pycairo, cairocffi, ldap, memcached, pytz, urllib3, scandir
 }:
-if django.version != "1.8.19"
-|| django_tagging.version != "0.4.3"
-then throw "graphite-web should be build with django_1_8 and django_tagging_0_4_3"
-else buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "graphite-web";
   version = "1.1.6";
 
-  disabled = isPy3k;
-
   src = fetchPypi {
     inherit pname version;
     sha256 = "f4c293008ad588456397cd125cdad7f47f4bab5b6dd82b5fb69f5467e7346a2a";
   };
 
+  patches = [
+    ./update-django-tagging.patch
+  ];
+
   propagatedBuildInputs = [
     django django_tagging whisper pycairo cairocffi
     ldap memcached pytz urllib3 scandir
   ];
 
-  postInstall = ''
-    wrapProgram $out/bin/run-graphite-devel-server.py \
-      --prefix PATH : ${which}/bin
-  '';
+  # Carbon-s default installation is /opt/graphite. This env variable ensures
+  # carbon is installed as a regular python module.
+  GRAPHITE_NO_PREFIX="True";
 
   preConfigure = ''
-    # graphite is configured by storing a local_settings.py file inside the
-    # graphite python package. Since that package is stored in the immutable
-    # Nix store we can't modify it. So how do we configure graphite?
-    #
-    # First of all we rename "graphite.local_settings" to
-    # "graphite_local_settings" so that the settings are not looked up in the
-    # graphite package anymore. Secondly we place a directory containing a
-    # graphite_local_settings.py on the PYTHONPATH in the graphite module
-    # <nixpkgs/nixos/modules/services/monitoring/graphite.nix>.
-    substituteInPlace webapp/graphite/settings.py \
-      --replace "graphite.local_settings" " graphite_local_settings"
-
     substituteInPlace webapp/graphite/settings.py \
       --replace "join(WEBAPP_DIR, 'content')" "join('$out', 'webapp', 'content')"
   '';
 
-  # error: invalid command 'test'
-  doCheck = false;
-
   meta = with stdenv.lib; {
-    homepage = http://graphite.wikidot.com/;
+    homepage = "http://graphiteapp.org/";
     description = "Enterprise scalable realtime graphing";
     maintainers = with maintainers; [ offline basvandijk ];
     license = licenses.asl20;
diff --git a/pkgs/development/python-modules/graphite-web/update-django-tagging.patch b/pkgs/development/python-modules/graphite-web/update-django-tagging.patch
new file mode 100644
index 000000000000..48d16d50f420
--- /dev/null
+++ b/pkgs/development/python-modules/graphite-web/update-django-tagging.patch
@@ -0,0 +1,12 @@
+diff -Nur a/setup.py b/setup.py
+--- a/setup.py	2020-03-12 18:45:34.654296302 +0100
++++ b/setup.py	2020-03-12 18:46:17.476893828 +0100
+@@ -115,7 +115,7 @@
+         ['templates/*', 'local_settings.py.example']},
+       scripts=glob('bin/*'),
+       data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples,
+-      install_requires=['Django>=1.8,<2.3', 'django-tagging==0.4.3', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'],
++      install_requires=['Django>=1.8,<2.3', 'django-tagging==0.4.6', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'],
+       classifiers=[
+           'Intended Audience :: Developers',
+           'Natural Language :: English',

From 37ffa6ea51f3a3d7e43736b9a5ce3c149dd9d1ee Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 20 Mar 2020 17:02:58 +0100
Subject: [PATCH 3764/4636] nixos/griphite: Migrate to python3, drop
 graphite-pager

---
 .../modules/services/monitoring/graphite.nix  | 137 ++++--------------
 nixos/tests/graphite.nix                      |  18 ++-
 2 files changed, 43 insertions(+), 112 deletions(-)

diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index dd147bb37930..64d9d61950da 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -39,8 +39,6 @@ let
     GRAPHITE_URL = cfg.seyren.graphiteUrl;
   } // cfg.seyren.extraConfig;
 
-  pagerConfig = pkgs.writeText "alarms.yaml" cfg.pager.alerts;
-
   configDir = pkgs.buildEnv {
     name = "graphite-config";
     paths = lists.filter (el: el != null) [
@@ -61,12 +59,10 @@ let
 
   carbonEnv = {
     PYTHONPATH = let
-      cenv = pkgs.python.buildEnv.override {
-        extraLibs = [ pkgs.python27Packages.carbon ];
+      cenv = pkgs.python3.buildEnv.override {
+        extraLibs = [ pkgs.python3Packages.carbon ];
       };
-      cenvPack =  "${cenv}/${pkgs.python.sitePackages}";
-    # opt/graphite/lib contains twisted.plugins.carbon-cache
-    in "${cenvPack}/opt/graphite/lib:${cenvPack}";
+    in "${cenv}/${pkgs.python3.sitePackages}";
     GRAPHITE_ROOT = dataDir;
     GRAPHITE_CONF_DIR = configDir;
     GRAPHITE_STORAGE_DIR = dataDir;
@@ -74,6 +70,10 @@ let
 
 in {
 
+  imports = [
+    (mkRemovedOptionModule ["services" "graphite" "pager"] "")
+  ];
+
   ###### interface
 
   options.services.graphite = {
@@ -132,7 +132,7 @@ in {
       finders = mkOption {
         description = "List of finder plugins to load.";
         default = [];
-        example = literalExample "[ pkgs.python27Packages.influxgraph ]";
+        example = literalExample "[ pkgs.python3Packages.influxgraph ]";
         type = types.listOf types.package;
       };
 
@@ -159,8 +159,8 @@ in {
 
       package = mkOption {
         description = "Package to use for graphite api.";
-        default = pkgs.python27Packages.graphite_api;
-        defaultText = "pkgs.python27Packages.graphite_api";
+        default = pkgs.python3Packages.graphite_api;
+        defaultText = "pkgs.python3Packages.graphite_api";
         type = types.package;
       };
 
@@ -344,49 +344,6 @@ in {
       };
     };
 
-    pager = {
-      enable = mkOption {
-        description = ''
-          Whether to enable graphite-pager service. For more information visit
-          <link xlink:href="https://github.com/seatgeek/graphite-pager"/>
-        '';
-        default = false;
-        type = types.bool;
-      };
-
-      redisUrl = mkOption {
-        description = "Redis connection string.";
-        default = "redis://localhost:${toString config.services.redis.port}/";
-        type = types.str;
-      };
-
-      graphiteUrl = mkOption {
-        description = "URL to your graphite service.";
-        default = "http://${cfg.web.listenAddress}:${toString cfg.web.port}";
-        type = types.str;
-      };
-
-      alerts = mkOption {
-        description = "Alerts configuration for graphite-pager.";
-        default = ''
-          alerts:
-            - target: constantLine(100)
-              warning: 90
-              critical: 200
-              name: Test
-        '';
-        example = ''
-          pushbullet_key: pushbullet_api_key
-          alerts:
-            - target: stats.seatgeek.app.deal_quality.venue_info_cache.hit
-              warning: .5
-              critical: 1
-              name: Deal quality venue cache hits
-        '';
-        type = types.lines;
-      };
-    };
-
     beacon = {
       enable = mkEnableOption "graphite beacon";
 
@@ -409,7 +366,7 @@ in {
         environment = carbonEnv;
         serviceConfig = {
           RuntimeDirectory = name;
-          ExecStart = "${pkgs.pythonPackages.twisted}/bin/twistd ${carbonOpts name}";
+          ExecStart = "${pkgs.python3Packages.twisted}/bin/twistd ${carbonOpts name}";
           User = "graphite";
           Group = "graphite";
           PermissionsStartOnly = true;
@@ -431,7 +388,7 @@ in {
         environment = carbonEnv;
         serviceConfig = {
           RuntimeDirectory = name;
-          ExecStart = "${pkgs.pythonPackages.twisted}/bin/twistd ${carbonOpts name}";
+          ExecStart = "${pkgs.python3Packages.twisted}/bin/twistd ${carbonOpts name}";
           User = "graphite";
           Group = "graphite";
           PIDFile="/run/${name}/${name}.pid";
@@ -447,7 +404,7 @@ in {
         environment = carbonEnv;
         serviceConfig = {
           RuntimeDirectory = name;
-          ExecStart = "${pkgs.pythonPackages.twisted}/bin/twistd ${carbonOpts name}";
+          ExecStart = "${pkgs.python3Packages.twisted}/bin/twistd ${carbonOpts name}";
           User = "graphite";
           Group = "graphite";
           PIDFile="/run/${name}/${name}.pid";
@@ -457,19 +414,11 @@ in {
 
     (mkIf (cfg.carbon.enableCache || cfg.carbon.enableAggregator || cfg.carbon.enableRelay) {
       environment.systemPackages = [
-        pkgs.pythonPackages.carbon
+        pkgs.python3Packages.carbon
       ];
     })
 
-    (mkIf cfg.web.enable (let
-      python27' = pkgs.python27.override {
-        packageOverrides = self: super: {
-          django = self.django_1_8;
-          django_tagging = self.django_tagging_0_4_3;
-        };
-      };
-      pythonPackages = python27'.pkgs;
-    in {
+    (mkIf cfg.web.enable ({
       systemd.services.graphiteWeb = {
         description = "Graphite Web Interface";
         wantedBy = [ "multi-user.target" ];
@@ -477,28 +426,27 @@ in {
         path = [ pkgs.perl ];
         environment = {
           PYTHONPATH = let
-              penv = pkgs.python.buildEnv.override {
+              penv = pkgs.python3.buildEnv.override {
                 extraLibs = [
-                  pythonPackages.graphite-web
-                  pythonPackages.pysqlite
+                  pkgs.python3Packages.graphite-web
                 ];
               };
-              penvPack = "${penv}/${pkgs.python.sitePackages}";
+              penvPack = "${penv}/${pkgs.python3.sitePackages}";
             in concatStringsSep ":" [
                  "${graphiteLocalSettingsDir}"
-                 "${penvPack}/opt/graphite/webapp"
                  "${penvPack}"
                  # explicitly adding pycairo in path because it cannot be imported via buildEnv
-                 "${pkgs.pythonPackages.pycairo}/${pkgs.python.sitePackages}"
+                 "${pkgs.python3Packages.pycairo}/${pkgs.python3.sitePackages}"
                ];
           DJANGO_SETTINGS_MODULE = "graphite.settings";
+          GRAPHITE_SETTINGS_MODULE = "graphite_local_settings";
           GRAPHITE_CONF_DIR = configDir;
           GRAPHITE_STORAGE_DIR = dataDir;
           LD_LIBRARY_PATH = "${pkgs.cairo.out}/lib";
         };
         serviceConfig = {
           ExecStart = ''
-            ${pkgs.python27Packages.waitress-django}/bin/waitress-serve-django \
+            ${pkgs.python3Packages.waitress-django}/bin/waitress-serve-django \
               --host=${cfg.web.listenAddress} --port=${toString cfg.web.port}
           '';
           User = "graphite";
@@ -510,7 +458,7 @@ in {
             mkdir -p ${dataDir}/{whisper/,log/webapp/}
             chmod 0700 ${dataDir}/{whisper/,log/webapp/}
 
-            ${pkgs.pythonPackages.django_1_8}/bin/django-admin.py migrate --noinput
+            ${pkgs.python3Packages.django}/bin/django-admin.py migrate --noinput
 
             chown -R graphite:graphite ${dataDir}
 
@@ -518,16 +466,16 @@ in {
           fi
 
           # Only collect static files when graphite_web changes.
-          if ! [ "${dataDir}/current_graphite_web" -ef "${pythonPackages.graphite-web}" ]; then
+          if ! [ "${dataDir}/current_graphite_web" -ef "${pkgs.python3Packages.graphite-web}" ]; then
             mkdir -p ${staticDir}
-            ${pkgs.pythonPackages.django_1_8}/bin/django-admin.py collectstatic  --noinput --clear
+            ${pkgs.python3Packages.django}/bin/django-admin.py collectstatic  --noinput --clear
             chown -R graphite:graphite ${staticDir}
-            ln -sfT "${pythonPackages.graphite-web}" "${dataDir}/current_graphite_web"
+            ln -sfT "${pkgs.python3Packages.graphite-web}" "${dataDir}/current_graphite_web"
           fi
         '';
       };
 
-      environment.systemPackages = [ pythonPackages.graphite-web ];
+      environment.systemPackages = [ pkgs.python3Packages.graphite-web ];
     }))
 
     (mkIf cfg.api.enable {
@@ -537,16 +485,16 @@ in {
         after = [ "network.target" ];
         environment = {
           PYTHONPATH = let
-              aenv = pkgs.python.buildEnv.override {
-                extraLibs = [ cfg.api.package pkgs.cairo pkgs.pythonPackages.cffi ] ++ cfg.api.finders;
+              aenv = pkgs.python3.buildEnv.override {
+                extraLibs = [ cfg.api.package pkgs.cairo pkgs.python3Packages.cffi ] ++ cfg.api.finders;
               };
-            in "${aenv}/${pkgs.python.sitePackages}";
+            in "${aenv}/${pkgs.python3.sitePackages}";
           GRAPHITE_API_CONFIG = graphiteApiConfig;
           LD_LIBRARY_PATH = "${pkgs.cairo.out}/lib";
         };
         serviceConfig = {
           ExecStart = ''
-            ${pkgs.python27Packages.waitress}/bin/waitress-serve \
+            ${pkgs.python3Packages.waitress}/bin/waitress-serve \
             --host=${cfg.api.listenAddress} --port=${toString cfg.api.port} \
             graphite_api.app:app
           '';
@@ -591,34 +539,13 @@ in {
       services.mongodb.enable = mkDefault true;
     })
 
-    (mkIf cfg.pager.enable {
-      systemd.services.graphitePager = {
-        description = "Graphite Pager Alerting Daemon";
-        wantedBy = [ "multi-user.target" ];
-        after = [ "network.target" "redis.service" ];
-        environment = {
-          REDIS_URL = cfg.pager.redisUrl;
-          GRAPHITE_URL = cfg.pager.graphiteUrl;
-        };
-        serviceConfig = {
-          ExecStart = "${pkgs.pythonPackages.graphitepager}/bin/graphite-pager --config ${pagerConfig}";
-          User = "graphite";
-          Group = "graphite";
-        };
-      };
-
-      services.redis.enable = mkDefault true;
-
-      environment.systemPackages = [ pkgs.pythonPackages.graphitepager ];
-    })
-
     (mkIf cfg.beacon.enable {
       systemd.services.graphite-beacon = {
         description = "Grpahite Beacon Alerting Daemon";
         wantedBy = [ "multi-user.target" ];
         serviceConfig = {
           ExecStart = ''
-            ${pkgs.pythonPackages.graphite_beacon}/bin/graphite-beacon \
+            ${pkgs.python3Packages.graphite_beacon}/bin/graphite-beacon \
               --config=${pkgs.writeText "graphite-beacon.json" (builtins.toJSON cfg.beacon.config)}
           '';
           User = "graphite";
@@ -630,7 +557,7 @@ in {
     (mkIf (
       cfg.carbon.enableCache || cfg.carbon.enableAggregator || cfg.carbon.enableRelay ||
       cfg.web.enable || cfg.api.enable ||
-      cfg.seyren.enable || cfg.pager.enable || cfg.beacon.enable
+      cfg.seyren.enable || cfg.beacon.enable
      ) {
       users.users.graphite = {
         uid = config.ids.uids.graphite;
diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix
index ba3c73bb878d..71776a94cbd6 100644
--- a/nixos/tests/graphite.nix
+++ b/nixos/tests/graphite.nix
@@ -12,15 +12,19 @@ import ./make-test-python.nix ({ pkgs, ... } :
         virtualisation.memorySize = 1024;
         time.timeZone = "UTC";
         services.graphite = {
-          web.enable = true;
+          web = {
+            enable = true;
+            extraConfig = ''
+              SECRET_KEY = "abcd";
+            '';
+          };
           api = {
             enable = true;
             port = 8082;
-            finders = [ pkgs.python27Packages.influxgraph ];
+            finders = [ pkgs.python3Packages.influxgraph ];
           };
           carbon.enableCache = true;
-          seyren.enable = true;
-          pager.enable = true;
+          seyren.enable = false;  # Implicitely requires openssl-1.0.2u which is marked insecure
           beacon.enable = true;
         };
       };
@@ -31,16 +35,16 @@ import ./make-test-python.nix ({ pkgs, ... } :
     one.wait_for_unit("default.target")
     one.wait_for_unit("graphiteWeb.service")
     one.wait_for_unit("graphiteApi.service")
-    one.wait_for_unit("graphitePager.service")
     one.wait_for_unit("graphite-beacon.service")
     one.wait_for_unit("carbonCache.service")
-    one.wait_for_unit("seyren.service")
     # The services above are of type "simple". systemd considers them active immediately
     # even if they're still in preStart (which takes quite long for graphiteWeb).
     # Wait for ports to open so we're sure the services are up and listening.
     one.wait_for_open_port(8080)
     one.wait_for_open_port(2003)
     one.succeed('echo "foo 1 `date +%s`" | nc -N localhost 2003')
-    one.wait_until_succeeds("curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2")
+    one.wait_until_succeeds(
+        "curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2"
+    )
   '';
 })

From 0e6e3ddb2d6be1e298f8bf6fc985b5b1fc4cb84a Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 20 Mar 2020 17:05:03 +0100
Subject: [PATCH 3765/4636] pythonPackages.graphitepager: drop

This module is python2 only. Upstream repo does not exist in github
anymore (returns 404), so it is safer to drop it in nixpkgs.
---
 .../python-modules/graphitepager/default.nix  | 32 -------------------
 pkgs/top-level/python-packages.nix            |  2 --
 2 files changed, 34 deletions(-)
 delete mode 100644 pkgs/development/python-modules/graphitepager/default.nix

diff --git a/pkgs/development/python-modules/graphitepager/default.nix b/pkgs/development/python-modules/graphitepager/default.nix
deleted file mode 100644
index d2ab8d547fdb..000000000000
--- a/pkgs/development/python-modules/graphitepager/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi
-, jinja2, markupsafe, pagerduty, pushbullet, python_magic, python-simple-hipchat
-, pyyaml, redis, requests, six, websocket_client, nose
-}:
-buildPythonPackage rec {
-  pname = "graphitepager";
-  version = "0.2.11";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0v3g1qcgnkpgjzh6phnv13lnk8qjrcs9sq2qg6k0dk5ik31jfk3d";
-  };
-
-  propagatedBuildInputs = [
-    jinja2 markupsafe pagerduty pushbullet python_magic python-simple-hipchat
-    pyyaml redis requests six websocket_client
-  ];
-
-  postPatch = ''
-    substituteInPlace requirements.txt --replace "==" ">="
-  '';
-
-  checkInputs = [ nose ];
-  checkPhase = "nosetests";
-
-  meta = with stdenv.lib; {
-    description = "A simple alerting application for Graphite metrics";
-    homepage = https://github.com/seatgeek/graphite-pager;
-    maintainers = with maintainers; [ offline basvandijk ];
-    license = licenses.bsd2;
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f23f961e241f..5d6de221e308 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6411,8 +6411,6 @@ in {
 
   influxgraph = callPackage ../development/python-modules/influxgraph { };
 
-  graphitepager = callPackage ../development/python-modules/graphitepager { };
-
   pyspotify = callPackage ../development/python-modules/pyspotify { };
 
   pykka = callPackage ../development/python-modules/pykka { };

From d98fec6bd93ced6635b58b39ecc927d360d3e73c Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 20 Mar 2020 17:11:05 +0100
Subject: [PATCH 3766/4636] ptyhonPackages.django_tagging_0_4_3: drop

---
 pkgs/top-level/python-packages.nix | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5d6de221e308..a4b6dc942906 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3423,20 +3423,6 @@ in {
 
   django_tagging = callPackage ../development/python-modules/django_tagging { };
 
-  django_tagging_0_4_3 = if
-       self.django.version != "1.8.19"
-  then throw "django_tagging_0_4_3 should be build with django_1_8"
-  else (callPackage ../development/python-modules/django_tagging {}).overrideAttrs (attrs: rec {
-    pname = "django-tagging";
-    version = "0.4.3";
-
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "0617azpmp6jpg3d88v2ir97qrc9aqcs2s9gyvv9bgf2cp55khxhs";
-    };
-    propagatedBuildInputs = with self; [ django ];
-  });
-
   django_classytags = callPackage ../development/python-modules/django_classytags { };
 
   # This package may need an older version of Django.

From 2a5a7199304b3788b3c60c200a7f8071bc1c804f Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 20 Mar 2020 17:12:15 +0100
Subject: [PATCH 3767/4636] pythonPackages.django_1_8: drop

This version is heavily outdated and is not required anymore.

Closes #52679
---
 .../development/python-modules/django/1_8.nix | 32 -------------------
 pkgs/top-level/python-packages.nix            |  2 --
 2 files changed, 34 deletions(-)
 delete mode 100644 pkgs/development/python-modules/django/1_8.nix

diff --git a/pkgs/development/python-modules/django/1_8.nix b/pkgs/development/python-modules/django/1_8.nix
deleted file mode 100644
index d575599cbe1d..000000000000
--- a/pkgs/development/python-modules/django/1_8.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchurl
-}:
-
-buildPythonPackage rec {
-  pname = "Django";
-  version = "1.8.19";
-
-  src = fetchurl {
-    url = "http://www.djangoproject.com/m/releases/1.8/${pname}-${version}.tar.gz";
-    sha256 = "0iy0ni9j1rnx9b06ycgbg2dkrf3qid3y2jipk9x28cykz5f4mm1k";
-  };
-
-  # too complicated to setup
-  doCheck = false;
-
-  meta = with stdenv.lib; {
-    description = "A high-level Python Web framework";
-    homepage = https://www.djangoproject.com/;
-    license = licenses.bsd0;
-    knownVulnerabilities = [
-      # The patches were not backported due to Django 1.8 having reached EOL
-      https://www.djangoproject.com/weblog/2018/aug/01/security-releases/
-      https://www.djangoproject.com/weblog/2019/jan/04/security-releases/
-      https://www.djangoproject.com/weblog/2019/feb/11/security-releases/
-      https://www.djangoproject.com/weblog/2019/jun/03/security-releases/
-      https://www.djangoproject.com/weblog/2019/jul/01/security-releases/
-    ];
-  };
-
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a4b6dc942906..49de95139f57 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3341,8 +3341,6 @@ in {
 
   django_2_2 = callPackage ../development/python-modules/django/2_2.nix { };
 
-  django_1_8 = callPackage ../development/python-modules/django/1_8.nix { };
-
   django-allauth = callPackage ../development/python-modules/django-allauth { };
 
   django-anymail = callPackage ../development/python-modules/django-anymail {};

From 3c4c703368637f6440f554c97357d2a265d72d90 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Sun, 22 Mar 2020 21:53:39 -0400
Subject: [PATCH 3768/4636] vscode-extensions.ms-python.python: 2020.2.64397 ->
 2020.3.69010

---
 .../misc/vscode-extensions/python/default.nix | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix
index dec6bbbba10a..604d0fa3ad9d 100644
--- a/pkgs/misc/vscode-extensions/python/default.nix
+++ b/pkgs/misc/vscode-extensions/python/default.nix
@@ -1,18 +1,18 @@
 { lib, stdenv, fetchurl, vscode-utils, extractNuGet
 , icu, curl, openssl, lttng-ust, autoPatchelfHook
-, pythonUseFixed ? false, python  # When `true`, the python default setting will be fixed to specified.
-                                  # Use version from `PATH` for default setting otherwise.
-                                  # Defaults to `false` as we expect it to be project specific most of the time.
-, ctagsUseFixed ? true, ctags     # When `true`, the ctags default setting will be fixed to specified.
-                                  # Use version from `PATH` for default setting otherwise.
-                                  # Defaults to `true` as usually not defined on a per projet basis.
+, python3
+, pythonUseFixed ? false       # When `true`, the python default setting will be fixed to specified.
+                               # Use version from `PATH` for default setting otherwise.
+                               # Defaults to `false` as we expect it to be project specific most of the time.
+, ctagsUseFixed ? true, ctags  # When `true`, the ctags default setting will be fixed to specified.
+                               # Use version from `PATH` for default setting otherwise.
+                               # Defaults to `true` as usually not defined on a per projet basis.
 }:
 
-assert pythonUseFixed -> null != python;
 assert ctagsUseFixed -> null != ctags;
 
 let
-  pythonDefaultsTo = if pythonUseFixed then "${python}/bin/python" else "python";
+  pythonDefaultsTo = if pythonUseFixed then "${python3}/bin/python" else "python";
   ctagsDefaultsTo = if ctagsUseFixed then "${ctags}/bin/ctags" else "ctags";
 
   # The arch tag comes from 'PlatformName' defined here:
@@ -23,14 +23,14 @@ let
     else throw "Only x86_64 Linux and Darwin are supported.";
 
   languageServerSha256 = {
-    linux-x64 = "10qwi8lih5i6216d1vqsmviab73ha0d3zdvircrgrydkf0d4ancd";
-    osx-x64 = "08gjxs0bjhz5a9l35vvgwnvzshsyyqiqvb5hxv6w0k2ajgv5z7av";
+    linux-x64 = "1pmj5pb4xylx4gdx4zgmisn0si59qx51n2m1bh7clv29q6biw05n";
+    osx-x64 = "0ishiy1z9dghj4ryh95vy8rw0v7q4birdga2zdb4a8am31wmp94b";
   }.${arch};
 
   # version is languageServerVersion in the package.json
   languageServer = extractNuGet rec {
     name = "Python-Language-Server";
-    version = "0.4.127";
+    version = "0.5.30";
 
     src = fetchurl {
       url = "https://pvsc.azureedge.net/python-language-server-stable/${name}-${arch}.${version}.nupkg";
@@ -41,8 +41,8 @@ in vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "python";
     publisher = "ms-python";
-    version = "2020.2.64397";
-    sha256 = "1kwyc5ycz1276i2zbw93mpq59y2py6kj71gvhzya8xvm184jk07a";
+    version = "2020.3.69010";
+    sha256 = "1dg8wfc3yl0msg6c9ccbvwc78f559109slsagi0lgnbc40v6v24b";
   };
 
   buildInputs = [
@@ -54,6 +54,11 @@ in vscode-utils.buildVscodeMarketplaceExtension {
 
   nativeBuildInputs = [
     autoPatchelfHook
+    python3.pkgs.wrapPython
+  ];
+
+  pythonPath = with python3.pkgs; [
+    setuptools
   ];
 
   postPatch = ''
@@ -70,6 +75,8 @@ in vscode-utils.buildVscodeMarketplaceExtension {
     mkdir -p "$out/$installPrefix/languageServer.${languageServer.version}"
     cp -R --no-preserve=ownership ${languageServer}/* "$out/$installPrefix/languageServer.${languageServer.version}"
     chmod -R +wx "$out/$installPrefix/languageServer.${languageServer.version}"
+
+    patchPythonScript "$out/$installPrefix/pythonFiles/lib/python/isort/main.py"
   '';
 
   meta = with lib; {

From 6d196e8c9292e4d6dacd6a66bf8b139410d7edf4 Mon Sep 17 00:00:00 2001
From: Dominic Steinitz <dominic@steinitz.org>
Date: Mon, 23 Mar 2020 06:31:11 +0000
Subject: [PATCH 3769/4636] Build octave on macos

---
 pkgs/development/interpreters/octave/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index b32d15b2a1f9..4a63d1862014 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -49,6 +49,8 @@
 # - JIT compiler for loops:
 , enableJIT ? false
 , llvm ? null
+, libiconv
+, darwin
 }:
 
 let
@@ -107,10 +109,13 @@ stdenv.mkDerivation rec {
   ++ (stdenv.lib.optional (gnuplot != null) gnuplot)
   ++ (stdenv.lib.optional (python != null) python)
   ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ])
+  ++ (stdenv.lib.optionals (stdenv.isDarwin) [ libiconv
+                                               darwin.apple_sdk.frameworks.Accelerate
+                                               darwin.apple_sdk.frameworks.Cocoa ])
   ;
   nativeBuildInputs = [
     pkgconfig
-    gfortran 
+    gfortran
     # Listed here as well because it's outputs are split
     fftw
     fftwSinglePrec
@@ -135,6 +140,7 @@ stdenv.mkDerivation rec {
     "--with-blas=openblas"
     "--with-lapack=openblas"
   ]
+    ++ (if stdenv.isDarwin then [ "--enable-link-all-dependencies" ] else [ ])
     ++ stdenv.lib.optionals enableReadline [ "--enable-readline" ]
     ++ stdenv.lib.optionals openblas.blas64 [ "--enable-64" ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ "--with-x=no" ]
@@ -161,7 +167,7 @@ stdenv.mkDerivation rec {
     # https://savannah.gnu.org/bugs/?func=detailitem&item_id=56425 is the best attempt to fix JIT
     broken = enableJIT;
     platforms = if overridePlatforms == null then
-      (with stdenv.lib.platforms; linux ++ darwin)
+      (with stdenv.lib; platforms.linux ++ platforms.darwin)
     else overridePlatforms;
   };
 }

From f2dbc0189721bdebaa7b918a0b155a26c7f44488 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2020 07:44:38 +0000
Subject: [PATCH 3770/4636] python27Packages.cchardet: 2.1.5 -> 2.1.6

---
 pkgs/development/python-modules/cchardet/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/cchardet/default.nix b/pkgs/development/python-modules/cchardet/default.nix
index 1fb506682baf..5256d6050490 100644
--- a/pkgs/development/python-modules/cchardet/default.nix
+++ b/pkgs/development/python-modules/cchardet/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "cchardet";
-  version = "2.1.5";
+  version = "2.1.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "240efe3f255f916769458343840b9c6403cf3192720bc5129792cbcb88bf72fb";
+    sha256 = "1cs6y59qhbal8fgbyjk2lpjykh8kfjhq16clfssylsddb4hgnsmp";
   };
 
   checkInputs = [ nose ];
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "High-speed universal character encoding detector";
-    homepage = https://github.com/PyYoshi/cChardet;
+    homepage = "https://github.com/PyYoshi/cChardet";
     license = lib.licenses.mpl11;
     maintainers = with lib.maintainers; [ ivan ];
   };

From bde4257fbd20409a369669a0f9252fcc7dcd9f5d Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 23 Mar 2020 10:12:10 +0200
Subject: [PATCH 3771/4636] newsboat: 2.18 -> 2.19

---
 .../networking/feedreaders/newsboat/default.nix             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix
index 27bf8e81b117..b653e48a4d3b 100644
--- a/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix
@@ -3,16 +3,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "newsboat";
-  version = "2.18";
+  version = "2.19";
 
   src = fetchFromGitHub {
     owner = "newsboat";
     repo = "newsboat";
     rev = "r${version}";
-    sha256 = "1bg2qjkzdawn4fnn0w7jhw1dk6191w8axnqra43z21pinfyim6da";
+    sha256 = "0yyrq8a90l6pkrczm9qvdg75jhsdq0niwp79vrdpm8rsxqpdmfq7";
   };
 
-  cargoSha256 = "0q7bira2adfmx0ghb1c5nqz200iajaxap9bq8j5wvvk9l2wywslp";
+  cargoSha256 = "1q3jf3d80c0ik38qk8jgbhfz5jxv0cy3lzmkyh2l002azp9hvv59";
 
   postPatch = ''
     substituteInPlace Makefile --replace "|| true" ""

From b3c674311360b9235a53a5c9d3944051fe28c0f3 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 23 Mar 2020 10:12:19 +0200
Subject: [PATCH 3772/4636] newsboat: Switch to asciidoctor from asciidoc

---
 .../networking/feedreaders/newsboat/default.nix            | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix
index b653e48a4d3b..87bc7705acbe 100644
--- a/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix
@@ -1,5 +1,5 @@
 { stdenv, rustPlatform, fetchFromGitHub, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses
-, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xsl, libiconv, Security, makeWrapper }:
+, asciidoctor, libiconv, Security, makeWrapper }:
 
 rustPlatform.buildRustPackage rec {
   pname = "newsboat";
@@ -21,7 +21,10 @@ rustPlatform.buildRustPackage rec {
       --replace "ncurses5.4" "ncurses"
   '';
 
-  nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xsl ]
+  nativeBuildInputs = [
+    pkgconfig
+    asciidoctor
+  ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper libiconv ];
 
   buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ]

From d505a0d169eeca468dd78ae0821d6401aaf8c924 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 23 Mar 2020 10:12:30 +0200
Subject: [PATCH 3773/4636] newsboat: quote homepage url

---
 pkgs/applications/networking/feedreaders/newsboat/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix
index 87bc7705acbe..ea0c07580802 100644
--- a/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage    = https://newsboat.org/;
+    homepage    = "https://newsboat.org/";
     description = "A fork of Newsbeuter, an RSS/Atom feed reader for the text console";
     maintainers = with maintainers; [ dotlambda nicknovitski ];
     license     = licenses.mit;

From 0229936bbe241f4686747d22919af0aac0dbb078 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 15 Mar 2020 18:14:11 +0100
Subject: [PATCH 3774/4636] =?UTF-8?q?buildDunePackage:=20add=20a=20?=
 =?UTF-8?q?=E2=80=9CuseDune2=E2=80=9D=20option?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/build-support/ocaml/dune.nix                           | 6 ++++--
 .../development/ocaml-modules/dune-configurator/default.nix | 2 ++
 .../development/ocaml-modules/dune-private-libs/default.nix | 2 ++
 pkgs/development/ocaml-modules/eigen/default.nix            | 6 ++++--
 pkgs/development/ocaml-modules/owl-base/default.nix         | 6 ++++--
 pkgs/development/ocaml-modules/owl/default.nix              | 6 +++---
 pkgs/development/ocaml-modules/phylogenetics/default.nix    | 6 ++++--
 pkgs/top-level/ocaml-packages.nix                           | 6 ++----
 8 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix
index a0aac1447969..435bbe89c1c4 100644
--- a/pkgs/build-support/ocaml/dune.nix
+++ b/pkgs/build-support/ocaml/dune.nix
@@ -1,7 +1,9 @@
-{ stdenv, ocaml, findlib, dune, opaline }:
+{ stdenv, ocaml, findlib, dune, dune_2, opaline }:
 
 { pname, version, buildInputs ? [], ... }@args:
 
+let Dune = if args.useDune2 or false then dune_2 else dune; in
+
 if args ? minimumOCamlVersion &&
    ! stdenv.lib.versionAtLeast ocaml.version args.minimumOCamlVersion
 then throw "${pname}-${version} is not available for OCaml ${ocaml.version}"
@@ -29,7 +31,7 @@ stdenv.mkDerivation ({
 
   name = "ocaml${ocaml.version}-${pname}-${version}";
 
-  buildInputs = [ ocaml dune findlib ] ++ buildInputs;
+  buildInputs = [ ocaml Dune findlib ] ++ buildInputs;
 
   meta = (args.meta or {}) // { platforms = args.meta.platforms or ocaml.meta.platforms; };
 
diff --git a/pkgs/development/ocaml-modules/dune-configurator/default.nix b/pkgs/development/ocaml-modules/dune-configurator/default.nix
index d84c21565db8..aa12ebc8d796 100644
--- a/pkgs/development/ocaml-modules/dune-configurator/default.nix
+++ b/pkgs/development/ocaml-modules/dune-configurator/default.nix
@@ -3,6 +3,8 @@
 buildDunePackage rec {
   pname = "dune-configurator";
 
+  useDune2 = true;
+
   inherit (dune_2) src version;
 
   dontAddPrefix = true;
diff --git a/pkgs/development/ocaml-modules/dune-private-libs/default.nix b/pkgs/development/ocaml-modules/dune-private-libs/default.nix
index 1c3503f11a15..14059070c9a0 100644
--- a/pkgs/development/ocaml-modules/dune-private-libs/default.nix
+++ b/pkgs/development/ocaml-modules/dune-private-libs/default.nix
@@ -3,6 +3,8 @@
 buildDunePackage rec {
   pname = "dune-private-libs";
 
+  useDune2 = true;
+
   inherit (dune_2) src version;
 
   dontAddPrefix = true;
diff --git a/pkgs/development/ocaml-modules/eigen/default.nix b/pkgs/development/ocaml-modules/eigen/default.nix
index 3922b5cfec75..dacd3a758623 100644
--- a/pkgs/development/ocaml-modules/eigen/default.nix
+++ b/pkgs/development/ocaml-modules/eigen/default.nix
@@ -1,9 +1,11 @@
-{ stdenv, buildDune2Package, fetchFromGitHub, ctypes, libcxx }:
+{ stdenv, buildDunePackage, fetchFromGitHub, ctypes, libcxx }:
 
-buildDune2Package rec {
+buildDunePackage rec {
   pname = "eigen";
   version = "0.2.0";
 
+  useDune2 = true;
+
   src = fetchFromGitHub {
     owner = "owlbarn";
     repo   = pname;
diff --git a/pkgs/development/ocaml-modules/owl-base/default.nix b/pkgs/development/ocaml-modules/owl-base/default.nix
index ce6ee124466c..9d2bf74a3ace 100644
--- a/pkgs/development/ocaml-modules/owl-base/default.nix
+++ b/pkgs/development/ocaml-modules/owl-base/default.nix
@@ -1,9 +1,11 @@
-{ stdenv, buildDune2Package, fetchFromGitHub, stdlib-shims }:
+{ stdenv, buildDunePackage, fetchFromGitHub, stdlib-shims }:
 
-buildDune2Package rec {
+buildDunePackage rec {
   pname = "owl-base";
   version = "0.8.0";
 
+  useDune2 = true;
+
   src = fetchFromGitHub {
     owner  = "owlbarn";
     repo   = "owl";
diff --git a/pkgs/development/ocaml-modules/owl/default.nix b/pkgs/development/ocaml-modules/owl/default.nix
index c6eaf69b704b..7fa912d808db 100644
--- a/pkgs/development/ocaml-modules/owl/default.nix
+++ b/pkgs/development/ocaml-modules/owl/default.nix
@@ -1,5 +1,5 @@
 { stdenv
-, buildDune2Package
+, buildDunePackage
 , dune-configurator
 , fetchFromGitHub
 , alcotest
@@ -11,10 +11,10 @@
 , npy
 }:
 
-buildDune2Package rec {
+buildDunePackage rec {
   pname = "owl";
 
-  inherit (owl-base) version src meta;
+  inherit (owl-base) version src meta useDune2;
 
   checkInputs = [ alcotest ];
   buildInputs = [ dune-configurator ];
diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix
index 049a9a97c8e2..87e88cbf496e 100644
--- a/pkgs/development/ocaml-modules/phylogenetics/default.nix
+++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix
@@ -1,10 +1,12 @@
-{ stdenv, buildDune2Package, fetchFromGitHub, ppx_deriving
+{ stdenv, buildDunePackage, fetchFromGitHub, ppx_deriving
 , alcotest, biocaml, gnuplot, lacaml, menhir, owl }:
 
-buildDune2Package rec {
+buildDunePackage rec {
   pname = "phylogenetics";
   version = "unstable-2019-11-15";
 
+  useDune2 = true;
+
   src = fetchFromGitHub {
     owner  = "biocaml";
     repo   = pname;
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index e8a6bc21035b..485dfa7d807e 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -16,8 +16,6 @@ let
 
     buildDunePackage = callPackage ../build-support/ocaml/dune.nix {};
 
-    buildDune2Package = buildDunePackage.override { dune = dune_2; };
-
     alcotest = callPackage ../development/ocaml-modules/alcotest {};
 
     alcotest-lwt = callPackage ../development/ocaml-modules/alcotest/lwt.nix {};
@@ -232,9 +230,9 @@ let
 
     dune_2 = callPackage ../development/tools/ocaml/dune/2.nix { };
 
-    dune-configurator = callPackage ../development/ocaml-modules/dune-configurator { buildDunePackage = buildDune2Package; };
+    dune-configurator = callPackage ../development/ocaml-modules/dune-configurator { };
 
-    dune-private-libs = callPackage ../development/ocaml-modules/dune-private-libs { buildDunePackage = buildDune2Package; };
+    dune-private-libs = callPackage ../development/ocaml-modules/dune-private-libs { };
 
     earley = callPackage ../development/ocaml-modules/earley { };
 

From 80a7615300badde924f2ca30caa988484c6c11cc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 15 Mar 2020 18:14:27 +0100
Subject: [PATCH 3775/4636] =?UTF-8?q?OCaml:=20do=20not=20depend=20on=20X11?=
 =?UTF-8?q?=20for=20OCaml=20=E2=89=A5=204.09?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/compilers/ocaml/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index 6980b6e5ff13..12369ebcc6f1 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -11,7 +11,7 @@ let
 in
 
 { stdenv, fetchurl, ncurses, buildEnv
-, libX11, xorgproto, useX11 ? safeX11 stdenv
+, libX11, xorgproto, useX11 ? safeX11 stdenv && !stdenv.lib.versionAtLeast version "4.09"
 , aflSupport ? false
 , flambdaSupport ? false
 }:

From dd6d785d381865cd571b190f7cfc3fc278c8bd8f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 15 Mar 2020 18:14:32 +0100
Subject: [PATCH 3776/4636] =?UTF-8?q?ocamlPackages.graphics:=20init=20at?=
 =?UTF-8?q?=205.1.0=20for=20OCaml=20=E2=89=A5=204.09?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/graphics/default.nix        | 23 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  5 ++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/graphics/default.nix

diff --git a/pkgs/development/ocaml-modules/graphics/default.nix b/pkgs/development/ocaml-modules/graphics/default.nix
new file mode 100644
index 000000000000..6a3217431b43
--- /dev/null
+++ b/pkgs/development/ocaml-modules/graphics/default.nix
@@ -0,0 +1,23 @@
+{ lib, fetchurl, buildDunePackage, dune-configurator, libX11 }:
+
+buildDunePackage rec {
+
+  pname = "graphics";
+  version = "5.1.0";
+
+  useDune2 = true;
+
+  src = fetchurl {
+    url = "https://github.com/ocaml/graphics/releases/download/${version}/graphics-${version}.tbz";
+    sha256 = "16z997mp0ccilaqqvmz3wp7vx0ghaf4ik9qklgd4piklcl1yv5n5";
+  };
+
+  buildInputs = [ dune-configurator ];
+  propagatedBuildInputs = [ libX11 ];
+
+  meta = {
+    homepage = "https://github.com/ocaml/graphics";
+    description = "A set of portable drawing primitives";
+    license = lib.licenses.lgpl2;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 485dfa7d807e..7e12a3db3f78 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -347,6 +347,11 @@ let
 
     gmetadom = callPackage ../development/ocaml-modules/gmetadom { };
 
+    graphics =
+    if lib.versionOlder "4.09" ocaml.version
+    then callPackage ../development/ocaml-modules/graphics { }
+    else null;
+
     graphql = callPackage ../development/ocaml-modules/graphql { };
 
     graphql-cohttp = callPackage ../development/ocaml-modules/graphql/cohttp.nix { };

From 6f0c123d8ae25a296204a8cf4937fa9b69e5c1e9 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 23 Mar 2020 10:13:00 +0200
Subject: [PATCH 3777/4636] newsboat: do rust tests - use preCheck, not
 checkPhase

---
 pkgs/applications/networking/feedreaders/newsboat/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix
index ea0c07580802..deb87c43f407 100644
--- a/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
 
   doCheck = true;
 
-  checkPhase = ''
+  preCheck = ''
     make test
   '';
 

From a0e990a6677823103f14db249cbc77071c34c3ca Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 23 Mar 2020 10:13:15 +0200
Subject: [PATCH 3778/4636] newsboat: remove no longer needed NIX_CFLAGS

---
 pkgs/applications/networking/feedreaders/newsboat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix
index deb87c43f407..15328c56d27b 100644
--- a/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix
@@ -34,8 +34,8 @@ rustPlatform.buildRustPackage rec {
     make
   '';
 
-  NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"
-    + stdenv.lib.optionalString stdenv.isDarwin " -Wno-error=format-security";
+  # TODO: Check if that's still needed
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -Wno-error=format-security";
 
   doCheck = true;
 

From 831ed293316ce7dd1aa55b338adf7a00c48ddf96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 17 Mar 2020 16:28:03 +0000
Subject: [PATCH 3779/4636] containerd: fix build with strictDeps

---
 pkgs/applications/virtualization/containerd/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index 6075a7bb2190..7b48d8c19345 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -16,7 +16,10 @@ buildGoPackage rec {
   goPackagePath = "github.com/containerd/containerd";
   outputs = [ "bin" "out" "man" ];
 
-  buildInputs = [ btrfs-progs go-md2man utillinux ];
+  nativeBuildInputs = [ go-md2man utillinux ];
+
+  buildInputs = [ btrfs-progs ];
+
   buildFlags = [ "VERSION=v${version}" ];
 
   BUILDTAGS = []

From e77dca6ca8639b411c428b88492c5a0d58dca28f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 17 Mar 2020 23:21:40 +0000
Subject: [PATCH 3780/4636] browsh: fix build with strict deps enabled

---
 pkgs/applications/networking/browsers/browsh/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/applications/networking/browsers/browsh/default.nix
index 2b910fe0c5c4..94e939b9ab42 100644
--- a/pkgs/applications/networking/browsers/browsh/default.nix
+++ b/pkgs/applications/networking/browsers/browsh/default.nix
@@ -26,7 +26,7 @@ in buildGoPackage rec {
     sha256 = "0gvf5k1gm81xxg7ha309kgfkgl5357dli0fbc4z01rmfgbl0rfa0";
   };
 
-  buildInputs = [ go-bindata ];
+  nativeBuildInputs = [ go-bindata ];
 
   # embed the web extension in a go file and place it where it's supposed to
   # be. See

From 0d3f06bfbfa8bbf72803556d6ffbc3763f8a26b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 17 Mar 2020 23:22:01 +0000
Subject: [PATCH 3781/4636] kubernetes: put build tools into nativeBuildInputs

---
 pkgs/applications/networking/cluster/kubernetes/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 5178b7a2bd41..004e88ff44e4 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     sha256 = "0caqczz8hrwqb8j94158hz6919i7c9v1v0zknh9m2zbbng4b1awi";
   };
 
-  buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
+  nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
 
   outputs = ["out" "man" "pause"];
 

From b29aa1206d0541ae9dfaba259c7fc34ddff8858e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 17 Mar 2020 23:22:49 +0000
Subject: [PATCH 3782/4636] go2nix: fix build with strict deps enabled

---
 pkgs/development/tools/go2nix/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix
index 26458a3ca2ef..adf0977c67d4 100644
--- a/pkgs/development/tools/go2nix/default.nix
+++ b/pkgs/development/tools/go2nix/default.nix
@@ -19,7 +19,8 @@ buildGoPackage rec {
 
   outputs = [ "bin" "out" "man" ];
 
-  buildInputs = [ go-bindata gotools makeWrapper ];
+  nativeBuildInputs = [ go-bindata gotools makeWrapper ];
+
   preBuild = ''go generate ./...'';
 
   postInstall = ''

From 9050cd5a5a734389164ca2774ff51e113e9b6a66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 17 Mar 2020 23:23:16 +0000
Subject: [PATCH 3783/4636] hydron: fix strict deps build

---
 pkgs/servers/hydron/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix
index 6ac37a98deea..145d341bb516 100644
--- a/pkgs/servers/hydron/default.nix
+++ b/pkgs/servers/hydron/default.nix
@@ -15,8 +15,10 @@ buildGoPackage {
   };
 
   enableParallelBuilding = true;
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ ffmpeg-full graphicsmagick quicktemplate go-bindata easyjson ];
+
+  nativeBuildInputs = [ pkgconfig go-bindata ];
+
+  buildInputs = [ ffmpeg-full graphicsmagick quicktemplate easyjson ];
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/bakape/hydron";

From 676626a03f4159e8d95931d75b82fbb48ea6eef8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 17 Mar 2020 23:23:32 +0000
Subject: [PATCH 3784/4636] meguca: fix strict deps build

---
 pkgs/servers/meguca/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix
index 47530ba9db60..3088ee190e77 100644
--- a/pkgs/servers/meguca/default.nix
+++ b/pkgs/servers/meguca/default.nix
@@ -17,10 +17,10 @@ buildGoPackage {
   };
 
   enableParallelBuilding = true;
-  nativeBuildInputs = [ pkgconfig cmake ];
+  nativeBuildInputs = [ pkgconfig cmake go-bindata ];
 
   buildInputs = [
-    ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata
+    ffmpeg-full graphicsmagick ghostscript quicktemplate
     easyjson emscripten opencv statik
   ];
 

From 5b043ed82b7e3e95c4ef4e8f6ca9126e171537ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 17 Mar 2020 23:23:50 +0000
Subject: [PATCH 3785/4636] ngrok-1: fix strict deps build

---
 pkgs/tools/networking/ngrok-1/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/ngrok-1/default.nix b/pkgs/tools/networking/ngrok-1/default.nix
index 19ae72aaac0d..6e6d543c4391 100644
--- a/pkgs/tools/networking/ngrok-1/default.nix
+++ b/pkgs/tools/networking/ngrok-1/default.nix
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  buildInputs = [ go-bindata ];
+  nativeBuildInputs = [ go-bindata ];
 
   preConfigure = ''
     sed -e '/jteeuwen\/go-bindata/d' \

From 4be2b7e82654782b908ab650f9587eb4ebbcfb7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 17 Mar 2020 23:24:07 +0000
Subject: [PATCH 3786/4636] morph: fix strict deps build

---
 pkgs/tools/package-management/morph/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix
index d0cd7127c50c..a1d2f15ad134 100644
--- a/pkgs/tools/package-management/morph/default.nix
+++ b/pkgs/tools/package-management/morph/default.nix
@@ -14,8 +14,7 @@ buildGoPackage rec {
   goPackagePath = "github.com/dbcdk/morph";
   goDeps = ./deps.nix;
 
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ go-bindata ];
+  nativeBuildInputs = [ makeWrapper go-bindata ];
 
   buildFlagsArray = ''
     -ldflags=

From 13c1938593e9a5243c06c4f71408a99bff2d2fa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Mar 2020 09:18:54 +0000
Subject: [PATCH 3787/4636] localetime: fix build with strict deps

---
 pkgs/tools/system/localtime/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix
index 39e1bc7b6e7d..a12d70315d91 100644
--- a/pkgs/tools/system/localtime/default.nix
+++ b/pkgs/tools/system/localtime/default.nix
@@ -9,13 +9,14 @@ buildGoPackage rec {
     rev = "2e7b4317c723406bd75b2a1d640219ab9f8090ce";
     sha256 = "04fyna8p7q7skzx9fzmncd6gx7x5pwa9jh8a84hpljlvj0kldfs8";
   };
+
   goPackagePath = "github.com/Stebalien/localtime";
 
-  buildInputs = [ m4 ];
+  nativeBuildInputs = [ m4 ];
 
-  makeFlags = [ 
-    "PREFIX=${placeholder "out"}" 
-    "BINDIR=${placeholder "bin"}/bin" 
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "BINDIR=${placeholder "bin"}/bin"
   ];
 
   buildPhase = ''

From 72f4001e1ec950c3b92599d7dfe48dafe38f477b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Mar 2020 09:23:22 +0000
Subject: [PATCH 3788/4636] kops: fix strict deps build

---
 pkgs/applications/networking/cluster/kops/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index 76afaa47cee7..0e71e91fbc1e 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -18,8 +18,8 @@ let
           inherit sha256;
         };
 
-        buildInputs = [go-bindata];
-        subPackages = ["cmd/kops"];
+        nativeBuildInputs = [ go-bindata ];
+        subPackages = [ "cmd/kops" ];
 
         buildFlagsArray = ''
           -ldflags=
@@ -43,7 +43,7 @@ let
           description = "Easiest way to get a production Kubernetes up and running";
           homepage = https://github.com/kubernetes/kops;
           license = licenses.asl20;
-          maintainers = with maintainers; [offline zimbatm kampka];
+          maintainers = with maintainers; [ offline zimbatm kampka ];
           platforms = platforms.unix;
         };
       } // attrs';
@@ -60,7 +60,7 @@ in rec {
     version = "1.13.2";
     sha256 = "0lkkg34vn020r62ga8vg5d3a8jwvq00xlv3p1s01nkz33f6salng";
   };
-  
+
   kops_1_14 = mkKops {
     version = "1.14.1";
     sha256 = "0ikd8qwrjh8s1sc95g18sm0q6p33swz2m1rjd8zw34mb2w9jv76n";

From c0c7c00f18571fd1f7e407ca8b3dc64d75b4cbd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Mar 2020 09:24:36 +0000
Subject: [PATCH 3789/4636] traefik: fix build with strict deps

---
 pkgs/servers/traefik/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix
index 1707eb403b70..f3c97e8adcc1 100644
--- a/pkgs/servers/traefik/default.nix
+++ b/pkgs/servers/traefik/default.nix
@@ -13,7 +13,7 @@ buildGoPackage rec {
     sha256 = "1j3p09j8rpdkp8v4d4mz224ddakkvhzchvccm9qryrqc2fq4022v";
   };
 
-  buildInputs = [ go-bindata bash ];
+  nativeBuildInputs = [ go-bindata bash ];
 
   buildPhase = ''
     runHook preBuild

From be283a97e5d2152618e49c11f68606afa96f26b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Mar 2020 09:26:23 +0000
Subject: [PATCH 3790/4636] gogs: fix build with strict deps

---
 pkgs/applications/version-management/gogs/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix
index fedb000e42de..487026d8e3f9 100644
--- a/pkgs/applications/version-management/gogs/default.nix
+++ b/pkgs/applications/version-management/gogs/default.nix
@@ -24,8 +24,9 @@ buildGoPackage rec {
     substituteInPlace pkg/setting/setting.go --subst-var data
   '';
 
-  nativeBuildInputs = [ makeWrapper ]
-    ++ optional pamSupport pam;
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = optional pamSupport pam;
 
   buildFlags = [ "-tags" ];
 

From adb623147a95195e69fa4d64cf09190faea646b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Mar 2020 10:48:37 +0000
Subject: [PATCH 3791/4636] livepeer: fix build with strict deps

---
 pkgs/servers/livepeer/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix
index 64edcb2ef4fa..547a106a3987 100644
--- a/pkgs/servers/livepeer/default.nix
+++ b/pkgs/servers/livepeer/default.nix
@@ -16,7 +16,9 @@ buildGoPackage rec {
     sha256 = "07vhw787wq5q4xm7zvswjdsmr20pwfa39wfkgamb7hkrffn3k2ia";
   };
 
-  buildInputs = [ pkgconfig ffmpeg ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ ffmpeg ];
 
   enableParallelBuilding = true;
 

From 90b1dc12eae2fa760cb7ac78d24a873a054752d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Mar 2020 11:44:06 +0000
Subject: [PATCH 3792/4636] wally-cli: fix build with strict deps

---
 pkgs/development/tools/wally-cli/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/wally-cli/default.nix b/pkgs/development/tools/wally-cli/default.nix
index b7333e456442..6020d6fe8765 100644
--- a/pkgs/development/tools/wally-cli/default.nix
+++ b/pkgs/development/tools/wally-cli/default.nix
@@ -7,10 +7,9 @@ buildGoPackage rec {
   goPackagePath = "github.com/zsa/wally";
   subPackages = [ "cli" ];
 
-  nativeBuildInputs = [
-    pkg-config
-    libusb1
-  ];
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ libusb1 ];
 
   src = fetchFromGitHub {
     owner = "zsa";

From aa7b26fe2952d64e489b218750406a6d8c1bb828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Mar 2020 11:48:37 +0000
Subject: [PATCH 3793/4636] singularity: fix build with strict deps

---
 pkgs/applications/virtualization/singularity/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index 60825063cabc..930afa317229 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -27,8 +27,8 @@ buildGoPackage rec {
   goPackagePath = "github.com/sylabs/singularity";
   goDeps = ./deps.nix;
 
-  buildInputs = [ openssl ];
-  nativeBuildInputs = [ removeReferencesTo utillinux which makeWrapper ];
+  buildInputs = [ openssl utillinux ];
+  nativeBuildInputs = [ removeReferencesTo which makeWrapper ];
   propagatedBuildInputs = [ coreutils squashfsTools ];
 
   prePatch = ''

From b4c2511eb8af48118249b81e71b72fa21db55706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Mar 2020 12:27:40 +0000
Subject: [PATCH 3794/4636] gitea: fix strict deps build

---
 pkgs/applications/version-management/gitea/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index 164392ef4cec..fef92f6e367e 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -29,8 +29,9 @@ buildGoPackage rec {
     substituteInPlace modules/setting/setting.go --subst-var data
   '';
 
-  nativeBuildInputs = [ makeWrapper ]
-    ++ optional pamSupport pam;
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = optional pamSupport pam;
 
   preBuild = let
     tags = optional pamSupport "pam"

From 77b12146c969259c8308e93cb3a60fd102834493 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Mar 2020 12:28:34 +0000
Subject: [PATCH 3795/4636] coyim: fix strict deps build

---
 .../networking/instant-messengers/coyim/default.nix           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix
index 3186009db582..e507d986510c 100644
--- a/pkgs/applications/networking/instant-messengers/coyim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix
@@ -14,7 +14,9 @@ buildGoPackage rec {
     sha256 = "1g8nf56j17rdhhj7pv3ha1rb2mfc0mdvyzl35pgcki08w7iw08j3";
   };
 
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk-pixbuf gtk3 gnome3.adwaita-icon-theme ];
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+
+  buildInputs = [ glib cairo gdk-pixbuf gtk3 gnome3.adwaita-icon-theme ];
 
   meta = with stdenv.lib; {
     description = "a safe and secure chat client";

From 5f3f4cb1bef9f613ef47ee74fcea039157ae695d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Mar 2020 13:13:32 +0000
Subject: [PATCH 3796/4636] terraform-libvirt: fix strict deps build

---
 .../cluster/terraform-providers/libvirt/default.nix          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
index 40a6bb11c7da..c2014a4d7bf1 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix
@@ -30,7 +30,9 @@ buildGoPackage rec {
     sha256 = "1l2n97nj6g44n7bhnbjwmv36xi6754p4iq2qnpkdh39x4384a0zz";
   };
 
-  buildInputs = [ libvirt pkgconfig makeWrapper ];
+  nativeBuildInputs = [ pkgconfig makeWrapper ];
+
+  buildInputs = [ libvirt ];
 
   # mkisofs needed to create ISOs holding cloud-init data,
   # and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630
@@ -48,4 +50,3 @@ buildGoPackage rec {
     maintainers = with maintainers; [ mic92 ];
   };
 }
-

From 22327eab2dacfdb36a074b3266b33bbb795447b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= <mic.liamg@gmail.com>
Date: Mon, 23 Mar 2020 10:03:36 +0100
Subject: [PATCH 3797/4636] switched from the current system to the booted one
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Minář <mic.liamg@gmail.com>
---
 pkgs/os-specific/linux/ffado/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index 0fc61d0e045f..15f3441e08aa 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -33,8 +33,7 @@ mkDerivation rec {
 
   prePatch = ''
     substituteInPlace ./support/tools/ffado-diag.in \
-      --replace /lib/modules/ "${kernel.dev}/lib/modules/" \
-      --replace 'stdout ("uname", "-r").rstrip ()' '"${kernel.modDirVersion}"'
+      --replace /lib/modules/ "/run/booted-system/kernel-modules/lib/modules/"
   '';
 
   patches = [

From a3c769fef617eb47d0f2b6eaf552d5f17b889b2a Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 23 Mar 2020 10:27:29 +0300
Subject: [PATCH 3798/4636] nixos/netdata: fix permissions for slabinfo.plugin

---
 nixos/modules/services/monitoring/netdata.nix | 9 +++++++++
 pkgs/tools/system/netdata/default.nix         | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix
index 7589fd0e67b0..621d686512df 100644
--- a/nixos/modules/services/monitoring/netdata.nix
+++ b/nixos/modules/services/monitoring/netdata.nix
@@ -9,6 +9,7 @@ let
     mkdir -p $out/libexec/netdata/plugins.d
     ln -s /run/wrappers/bin/apps.plugin $out/libexec/netdata/plugins.d/apps.plugin
     ln -s /run/wrappers/bin/freeipmi.plugin $out/libexec/netdata/plugins.d/freeipmi.plugin
+    ln -s /run/wrappers/bin/slabinfo.plugin $out/libexec/netdata/plugins.d/slabinfo.plugin
   '';
 
   plugins = [
@@ -181,6 +182,14 @@ in {
       permissions = "u+rx,g+rx,o-rwx";
     };
 
+    security.wrappers."slabinfo.plugin" = {
+      source = "${cfg.package}/libexec/netdata/plugins.d/slabinfo.plugin.org";
+      capabilities = "cap_dac_override+ep";
+      owner = cfg.user;
+      group = cfg.group;
+      permissions = "u+rx,g+rx,o-rx";
+    };
+
     security.pam.loginLimits = [
       { domain = "netdata"; type = "soft"; item = "nofile"; value = "10000"; }
       { domain = "netdata"; type = "hard"; item = "nofile"; value = "30000"; }
diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index 9abadd383560..1179db00e522 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -52,13 +52,15 @@ in stdenv.mkDerivation rec {
     # rename this plugin so netdata will look for setuid wrapper
     mv $out/libexec/netdata/plugins.d/apps.plugin \
        $out/libexec/netdata/plugins.d/apps.plugin.org
+    mv $out/libexec/netdata/plugins.d/slabinfo.plugin \
+       $out/libexec/netdata/plugins.d/slabinfo.plugin.org
     ${optionalString withIpmi ''
       mv $out/libexec/netdata/plugins.d/freeipmi.plugin \
          $out/libexec/netdata/plugins.d/freeipmi.plugin.org
     ''}
   '';
 
-  preConfigure =  optionalString (!stdenv.isDarwin) ''
+  preConfigure = optionalString (!stdenv.isDarwin) ''
     substituteInPlace collectors/python.d.plugin/python_modules/third_party/lm_sensors.py \
       --replace 'ctypes.util.find_library("sensors")' '"${lm_sensors.out}/lib/libsensors${stdenv.hostPlatform.extensions.sharedLibrary}"'
   '';

From d508a2f366b2776a47333b35d034724b5de450da Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 23 Mar 2020 12:23:50 +0300
Subject: [PATCH 3799/4636] nixos/netdata: fix permissions for perf.plugin

---
 nixos/modules/services/monitoring/netdata.nix | 9 +++++++++
 pkgs/tools/system/netdata/default.nix         | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix
index 621d686512df..e43241eea894 100644
--- a/nixos/modules/services/monitoring/netdata.nix
+++ b/nixos/modules/services/monitoring/netdata.nix
@@ -9,6 +9,7 @@ let
     mkdir -p $out/libexec/netdata/plugins.d
     ln -s /run/wrappers/bin/apps.plugin $out/libexec/netdata/plugins.d/apps.plugin
     ln -s /run/wrappers/bin/freeipmi.plugin $out/libexec/netdata/plugins.d/freeipmi.plugin
+    ln -s /run/wrappers/bin/perf.plugin $out/libexec/netdata/plugins.d/perf.plugin
     ln -s /run/wrappers/bin/slabinfo.plugin $out/libexec/netdata/plugins.d/slabinfo.plugin
   '';
 
@@ -182,6 +183,14 @@ in {
       permissions = "u+rx,g+rx,o-rwx";
     };
 
+    security.wrappers."perf.plugin" = {
+      source = "${cfg.package}/libexec/netdata/plugins.d/perf.plugin.org";
+      capabilities = "cap_sys_admin+ep";
+      owner = cfg.user;
+      group = cfg.group;
+      permissions = "u+rx,g+rx,o-rx";
+    };
+
     security.wrappers."slabinfo.plugin" = {
       source = "${cfg.package}/libexec/netdata/plugins.d/slabinfo.plugin.org";
       capabilities = "cap_dac_override+ep";
diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index 1179db00e522..c4001e8c50b3 100644
--- a/pkgs/tools/system/netdata/default.nix
+++ b/pkgs/tools/system/netdata/default.nix
@@ -52,6 +52,8 @@ in stdenv.mkDerivation rec {
     # rename this plugin so netdata will look for setuid wrapper
     mv $out/libexec/netdata/plugins.d/apps.plugin \
        $out/libexec/netdata/plugins.d/apps.plugin.org
+    mv $out/libexec/netdata/plugins.d/perf.plugin \
+       $out/libexec/netdata/plugins.d/perf.plugin.org
     mv $out/libexec/netdata/plugins.d/slabinfo.plugin \
        $out/libexec/netdata/plugins.d/slabinfo.plugin.org
     ${optionalString withIpmi ''

From 07f363fae3b106412746e75c631d35da3e5119d8 Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <me@michaelpj.com>
Date: Mon, 23 Mar 2020 09:26:12 +0000
Subject: [PATCH 3800/4636] cleanSourceWith: don't use baseNameOf

Currently, not providing `name` to `cleanSourceWith` will use the name
of the imported directory. However, a common case is for this to be the
top level of some repository. In that case, the name will be the name of
the checkout on the current machine, which is not necessarily
reproducible across different settings, and can lead to e.g. cache
misses in CI.

This is documented in the comment on `cleanSourceWith`, but this does
not stop it being a subtle trap for users.

There are different tradeoffs in each case:

1. If `cleanSourceWith` defaults to `"source"`, then we may end up with a
user not knowing what directory a source store path corresponds to.
However, it being called "unnamed" may give them a clue that there is a
way for them to name it, and lead them to the definition of the
function, which has a clear `name` parameter.

2. If `cleanSoureWith` defaults to the directory name, then a user may face
occasional loss of caching, which is hard to notice, and hard to track
down. Tracking it down likely requires use of more advanced tools like
`nix-diff`, and reading the source of a lot of nix code.

I think the downside of the status quo is worse.

This is really another iteration of
https://github.com/NixOS/nix/issues/1305: that led to adding the `name`
argument in the first place, this just makes us use a better default
`name`.
---
 lib/sources.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/sources.nix b/lib/sources.nix
index 05519c3e392e..ed9bce485300 100644
--- a/lib/sources.nix
+++ b/lib/sources.nix
@@ -63,17 +63,14 @@ rec {
   #             https://nixos.org/nix/manual/#builtin-filterSource
   #
   #   name:     Optional name to use as part of the store path.
-  #             This defaults `src.name` or otherwise `baseNameOf src`.
-  #             We recommend setting `name` whenever `src` is syntactically `./.`.
-  #             Otherwise, you depend on `./.`'s name in the parent directory,
-  #             which can cause inconsistent names, defeating caching.
+  #             This defaults to `src.name` or otherwise `"source"`.
   #
   cleanSourceWith = { filter ? _path: _type: true, src, name ? null }:
     let
       isFiltered = src ? _isLibCleanSourceWith;
       origSrc = if isFiltered then src.origSrc else src;
       filter' = if isFiltered then name: type: filter name type && src.filter name type else filter;
-      name' = if name != null then name else if isFiltered then src.name else baseNameOf src;
+      name' = if name != null then name else if isFiltered then src.name else "source";
     in {
       inherit origSrc;
       filter = filter';

From b1de18e99996203bd22882cecf4247d443c19660 Mon Sep 17 00:00:00 2001
From: Johannes Schleifenbaum <johannes@js-webcoding.de>
Date: Mon, 23 Mar 2020 10:05:32 +0100
Subject: [PATCH 3801/4636] dbeaver: 7.0.0 -> 7.0.1

---
 pkgs/applications/misc/dbeaver/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index 9ff70af73dde..1334813131b4 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   pname = "dbeaver-ce";
-  version = "7.0.0";
+  version = "7.0.1";
 
   desktopItem = makeDesktopItem {
     name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
-    sha256 = "1fnvwndzny51z0zmdnlafdcxawsyz435g712mc4bjjj29qy0inzm";
+    sha256 = "1kq0ingzfl6q2yz3y5nj9k35y9f1izg1idgbgvpz784gn7937m64";
   };
 
   installPhase = ''
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://dbeaver.io/;
+    homepage = "https://dbeaver.io/";
     description = "Universal SQL Client for developers, DBA and analysts. Supports MySQL, PostgreSQL, MariaDB, SQLite, and more";
     longDescription = ''
       Free multi-platform database tool for developers, SQL programmers, database

From 49f0b276f87ad3d9eb0134bef75912c556fa50df Mon Sep 17 00:00:00 2001
From: josephtheengineer <joseph@theengineer.life>
Date: Mon, 23 Mar 2020 20:35:53 +1000
Subject: [PATCH 3802/4636] godot: 3.2 -> 3.2.1

---
 pkgs/development/tools/godot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index 56b81f494e15..832d30ee8e87 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -10,13 +10,13 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "godot";
-  version = "3.2";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner  = "godotengine";
     repo   = "godot";
     rev    = "${version}-stable";
-    sha256 = "0f15izjl4i2xlz1xj5pcslzl9gm3rmr3c21gh256ynpi2zhhkcdd";
+    sha256 = "1kndls0rklha7kz9l4i2ivjxab4jpk3b2j7dcgcg2qc3s81yd0r6";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 793c1b5c72abbfed2f98add0811a022fc713dbf3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 23 Mar 2020 11:38:25 +0100
Subject: [PATCH 3803/4636] obs-studio: update from version 25.0.0 to 25.0.2

The 25.0.0 version crashes every time one tries to save the settings.
---
 pkgs/applications/video/obs-studio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 61d58d42d433..fd292304cfec 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -37,13 +37,13 @@ let
   inherit (stdenv.lib) optional optionals;
 in mkDerivation rec {
   pname = "obs-studio";
-  version = "25.0.0";
+  version = "25.0.2";
 
   src = fetchFromGitHub {
     owner = "obsproject";
     repo = "obs-studio";
     rev = version;
-    sha256 = "1xbvj69zk1x2sv39wqjp5s929c61szn32d3d0ykhxr6jxb0sih4w";
+    sha256 = "12c2p179fijz5606h3bp4g88479gwgr7d5f8vk6j2n0rlzs76nsn";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 3d0410e769bca83c3b08031dded5508efc247c0e Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Fri, 20 Mar 2020 12:50:18 -0400
Subject: [PATCH 3804/4636] python38Packages.rope: disable for Python>=3.8

- browsing the github page suggests the upcoming 0.17 release should support 3.8
---
 pkgs/development/python-modules/rope/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix
index 66340f917704..c14b4f364075 100644
--- a/pkgs/development/python-modules/rope/default.nix
+++ b/pkgs/development/python-modules/rope/default.nix
@@ -1,9 +1,11 @@
-{ stdenv, buildPythonPackage, fetchPypi, nose }:
+{ stdenv, buildPythonPackage, fetchPypi, pythonAtLeast, nose }:
 
 buildPythonPackage rec {
   pname = "rope";
   version = "0.14.0";
 
+  disabled = pythonAtLeast "3.8";  # 0.17 should support Python 3.8
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "1bwayj0hh459s3yh0sdrxksr9wfilgi3a49izfaj06kvgyladif5";

From 868f1ceb30432b9d09fb77d41a2dad5894f2db99 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 23 Mar 2020 14:45:14 +0100
Subject: [PATCH 3805/4636] wev: 2019-08-11 -> 1.0.0

---
 pkgs/tools/misc/wev/default.nix | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/misc/wev/default.nix b/pkgs/tools/misc/wev/default.nix
index fa69cc4445ee..0f033d1c7e22 100644
--- a/pkgs/tools/misc/wev/default.nix
+++ b/pkgs/tools/misc/wev/default.nix
@@ -1,22 +1,19 @@
 { stdenv, fetchurl
-, pkg-config, scdoc
-, wayland, wayland-protocols, libxkbcommon
+, pkg-config, scdoc, wayland
+, wayland-protocols, libxkbcommon
 }:
 
-let
-  version = "2019-08-11";
-  commit = "47d17393473be152cf601272faf5704fff1c3f92";
-in stdenv.mkDerivation {
-  pname = "wev-unstable";
-  inherit version;
+stdenv.mkDerivation rec {
+  pname = "wev";
+  version = "1.0.0";
 
   src = fetchurl {
-    url = "https://git.sr.ht/~sircmpwn/wev/archive/${commit}.tar.gz";
-    sha256 = "0a5kvrviz77bf7357gqs2iy7a1bvb3izgkmiv1rdxzzmihd563ga";
+    url = "https://git.sr.ht/~sircmpwn/wev/archive/${version}.tar.gz";
+    sha256 = "0vlxdkb59v6nb10j28gh1a56sx8jk7ak7liwzv911kpmygnls03g";
   };
 
-  nativeBuildInputs = [ pkg-config scdoc ];
-  buildInputs = [ wayland wayland-protocols libxkbcommon ];
+  nativeBuildInputs = [ pkg-config scdoc wayland ];
+  buildInputs = [ wayland-protocols libxkbcommon ];
 
   installFlags = [ "PREFIX=$(out)" ];
 
@@ -26,7 +23,7 @@ in stdenv.mkDerivation {
       This is a tool for debugging events on a Wayland window, analagous to the
       X11 tool xev.
     '';
-    homepage = https://git.sr.ht/~sircmpwn/wev;
+    homepage = "https://git.sr.ht/~sircmpwn/wev";
     license = licenses.mit;
     platforms = platforms.unix;
     maintainers = with maintainers; [ primeos ];

From 8431497dd2aeb507275317b64b0628ed22ca5b26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= <daniel@serbanescu.dk>
Date: Mon, 23 Mar 2020 16:07:13 +0100
Subject: [PATCH 3806/4636] linux-libre: added --force flag for deblobbing.

---
 pkgs/os-specific/linux/kernel/linux-libre.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index c6e850c99072..f4f3e0ffaf11 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -22,7 +22,8 @@ in linux.override {
       name = "${linux.name}-libre-src";
       src = linux.src;
       buildPhase = ''
-        ${scripts}/${majorMinor}/deblob-${majorMinor} \
+        # --force flag to skip empty files after deblobbing
+        ${scripts}/${majorMinor}/deblob-${majorMinor} --force \
             ${major} ${minor} ${patch}
       '';
       checkPhase = ''

From b4ffaa9bc0fd5b1f8f7e823436ea2a6892e360b4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2020 08:30:28 +0000
Subject: [PATCH 3807/4636] python27Packages.dropbox: 9.4.0 -> 9.5.0

---
 pkgs/development/python-modules/dropbox/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix
index ade485c91dc6..3ca9d59e27f0 100644
--- a/pkgs/development/python-modules/dropbox/default.nix
+++ b/pkgs/development/python-modules/dropbox/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "dropbox";
-  version = "9.4.0";
+  version = "9.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0qid094qna6bl4zpd08f6snvipwjls1yadacvmwri11djgp0wvj3";
+    sha256 = "0iz9hg1j7q9chka6fyzgpzqg2v4nbjx61xfvn9ixprxrdhvhr2hi";
   };
 
   # Set DROPBOX_TOKEN environment variable to a valid token.
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs";
-    homepage = https://www.dropbox.com/developers/core/docs;
+    homepage = "https://www.dropbox.com/developers/core/docs";
     license = licenses.mit;
   };
 }

From 820deb5a46001a4689b30527f6538b3f855835a1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2020 07:52:51 +0000
Subject: [PATCH 3808/4636] python27Packages.azure-mgmt-monitor: 0.7.0 -> 0.8.0

---
 .../development/python-modules/azure-mgmt-monitor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
index 252760950e5b..ccefd96ce73b 100644
--- a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-monitor";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1pprvk5255b6brbw73g0g13zygwa7a2px5x08wy3153rqlzan5l2";
+    sha256 = "09bhk6kpf1j1kgsyfdrfmfixrdj0iikx25dr1mh9dc6lci07i1cx";
   };
 
   propagatedBuildInputs = [

From 2a5ef17a6336a2f027a1adf66162b6de8344bb74 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2020 09:04:47 +0000
Subject: [PATCH 3809/4636] python27Packages.azure-mgmt-web: 0.44.0 -> 0.45.0

---
 pkgs/development/python-modules/azure-mgmt-web/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix
index ea6c1502123f..3b25c93a1bd1 100644
--- a/pkgs/development/python-modules/azure-mgmt-web/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-web";
-  version = "0.44.0";
+  version = "0.45.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "05dqakhfi301k2jnvccxdkigqvwnf9xz858pqg9vsri3dq69f1rw";
+    sha256 = "04wdb7vksjhcvv0gkjjr37lmb5ads5pr00cjac8r3szimr64zspr";
   };
 
   propagatedBuildInputs = [

From 81b18c3711cd3ced9ad148ee6ba8c5f103709f12 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 23 Mar 2020 15:08:45 +0100
Subject: [PATCH 3810/4636] chromium: fix webrtc interaction with pulseaudio

The webrtc code suffered from a race condition when used
with Pulseaudio. This lead to audio input breaking every
couple of minutes during a webrtc session.
---
 .../networking/browsers/chromium/common.nix   |  2 +
 .../chromium/patches/webrtc-pulse.patch       | 61 +++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/chromium/patches/webrtc-pulse.patch

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 255b399ef3da..9d7f529dad67 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -151,6 +151,8 @@ let
     ] ++ optionals (useVaapi) [
       # source: https://aur.archlinux.org/cgit/aur.git/tree/vaapi-fix.patch?h=chromium-vaapi
       ./patches/vaapi-fix.patch
+      # fix race condition in the interaction with pulseaudio
+      ./patches/webrtc-pulse.patch
     ];
 
     postPatch = ''
diff --git a/pkgs/applications/networking/browsers/chromium/patches/webrtc-pulse.patch b/pkgs/applications/networking/browsers/chromium/patches/webrtc-pulse.patch
new file mode 100644
index 000000000000..cf24e2704191
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/webrtc-pulse.patch
@@ -0,0 +1,61 @@
+From 704dc99bd05a94eb61202e6127df94ddfd571e85 Mon Sep 17 00:00:00 2001
+From: Dale Curtis <dalecurtis@chromium.org>
+Date: Mon, 02 Mar 2020 22:12:22 +0000
+Subject: [PATCH] Hold PulseAudio mainloop lock while querying input device info.
+
+a22cc23955cb3d58b7525c5103314226b3ce0137 moved this section out of
+UpdateNativeAudioHardwareInfo(), but forgot to bring the lock along.
+
+R=guidou
+
+Bug: 1043040
+Change-Id: I5b17a2cf0ad55d61c0811db1dae7045af4a91370
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2083814
+Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
+Commit-Queue: Guido Urdaneta <guidou@chromium.org>
+Reviewed-by: Guido Urdaneta <guidou@chromium.org>
+Auto-Submit: Dale Curtis <dalecurtis@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#746115}
+---
+
+diff --git a/media/audio/pulse/audio_manager_pulse.cc b/media/audio/pulse/audio_manager_pulse.cc
+index 90e9317..829846f 100644
+--- a/media/audio/pulse/audio_manager_pulse.cc
++++ b/media/audio/pulse/audio_manager_pulse.cc
+@@ -104,22 +104,27 @@
+ 
+ AudioParameters AudioManagerPulse::GetInputStreamParameters(
+     const std::string& device_id) {
+-  int user_buffer_size = GetUserBufferSize();
+-  int buffer_size =
+-      user_buffer_size ? user_buffer_size : kDefaultInputBufferSize;
+-
+   UpdateNativeAudioHardwareInfo();
+-  auto* operation = pa_context_get_source_info_by_name(
+-      input_context_, default_source_name_.c_str(), DefaultSourceInfoCallback,
+-      this);
+-  WaitForOperationCompletion(input_mainloop_, operation, input_context_);
++
++  {
++    AutoPulseLock auto_lock(input_mainloop_);
++    auto* operation = pa_context_get_source_info_by_name(
++        input_context_, default_source_name_.c_str(), DefaultSourceInfoCallback,
++        this);
++    WaitForOperationCompletion(input_mainloop_, operation, input_context_);
++  }
+ 
+   // We don't want to accidentally open a monitor device, so return invalid
+-  // parameters for those.
++  // parameters for those. Note: The value of |default_source_is_monitor_|
++  // depends on the the call to pa_context_get_source_info_by_name() above.
+   if (device_id == AudioDeviceDescription::kDefaultDeviceId &&
+       default_source_is_monitor_) {
+     return AudioParameters();
+   }
++
++  const int user_buffer_size = GetUserBufferSize();
++  const int buffer_size =
++      user_buffer_size ? user_buffer_size : kDefaultInputBufferSize;
+   return AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
+                          CHANNEL_LAYOUT_STEREO,
+                          native_input_sample_rate_ ? native_input_sample_rate_

From af615af266408c288df4c199036bfe94383bfba6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2020 10:37:55 +0000
Subject: [PATCH 3811/4636] python27Packages.icalendar: 4.0.4 -> 4.0.5

---
 pkgs/development/python-modules/icalendar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix
index 1d445f83b082..1418c925ebf8 100644
--- a/pkgs/development/python-modules/icalendar/default.nix
+++ b/pkgs/development/python-modules/icalendar/default.nix
@@ -7,12 +7,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "4.0.4";
+  version = "4.0.5";
   pname = "icalendar";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "16gjvqv0n05jrb9g228pdjgzd3amz2pdhvcgsn1jypszjg5m2w9l";
+    sha256 = "14ynjj65kfmlcvpb7k097w789wvxncd3cr3xz5m1jz9yl9v6vv5q";
   };
 
   buildInputs = [ setuptools ];

From 98eb1461646fc9f1c3c7d06915ffc3651099758b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 23 Mar 2020 17:16:02 +0100
Subject: [PATCH 3812/4636] =?UTF-8?q?pjsip:=202.9=20=E2=86=92=202.10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/networking/pjsip/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix
index c9df5d3fbe37..f3d41219470d 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/pkgs/applications/networking/pjsip/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, openssl, libsamplerate, alsaLib }:
+{ stdenv, fetchFromGitHub, openssl, libsamplerate, alsaLib }:
 
 stdenv.mkDerivation rec {
   pname = "pjsip";
-  version = "2.9";
+  version = "2.10";
 
-  src = fetchurl {
-    url = "https://www.pjsip.org/release/${version}/pjproject-${version}.tar.bz2";
-    sha256 = "0dm6l8fypkimmzvld35zyykbg957cm5zb4ny3lchgv68amwfz1fi";
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = "pjproject";
+    rev = version;
+    sha256 = "1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0";
   };
 
   patches = [ ./fix-aarch64.patch ];

From f30f3bd2aff433bcd0b18cc9cc569a3e46c19914 Mon Sep 17 00:00:00 2001
From: Kai Wohlfahrt <kai.wohlfahrt@gmail.com>
Date: Mon, 23 Mar 2020 16:24:40 +0000
Subject: [PATCH 3813/4636] quartus: support more devices

---
 .../editors/quartus-prime/default.nix         | 52 ++++++++++++++-----
 1 file changed, 40 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix
index 6a6ea80ca458..1a1aafdde376 100644
--- a/pkgs/applications/editors/quartus-prime/default.nix
+++ b/pkgs/applications/editors/quartus-prime/default.nix
@@ -1,6 +1,28 @@
-{ buildFHSUserEnv, makeDesktopItem, stdenv, lib, requireFile, unstick, cycloneVSupport ? true }:
+{ buildFHSUserEnv, makeDesktopItem, stdenv, lib, requireFile, unstick,
+  supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] }:
 
 let
+  deviceIds = {
+    "Arria II" = "arria_lite";
+    "Cyclone V" = "cyclonev";
+    "Cyclone IV" = "cyclone";
+    "Cyclone 10 LP" = "cyclone10lp";
+    "MAX II/V" = "max";
+    "MAX 10 FPGA" = "max10";
+  };
+
+  supportedDeviceIds =
+    assert lib.assertMsg (lib.all (name: lib.hasAttr name deviceIds) supportedDevices)
+      "Supported devices are: ${lib.concatStringsSep ", " (lib.attrNames deviceIds)}";
+    lib.listToAttrs (map (name: {
+      inherit name;
+      value = deviceIds.${name};
+    }) supportedDevices);
+
+  unsupportedDeviceIds = lib.filterAttrs (name: value:
+    !(lib.hasAttr name supportedDeviceIds)
+  ) deviceIds;
+
   quartus = stdenv.mkDerivation rec {
     version = "19.1.0.670";
     pname = "quartus-prime-lite";
@@ -10,16 +32,27 @@ let
         inherit name sha256;
         url = "${meta.homepage}/${lib.versions.majorMinor version}/?edition=lite&platform=linux";
       };
+
+      hashes = {
+        "arria_lite" = "1flj9w0vb2p9f9zll136izr6qvmxn0lg72bvaqxs3sxc9vj06wm1";
+        "cyclonev" = "0bqxpvjgph0y6slk0jq75mcqzglmqkm0jsx10y9xz5llm6zxzqab";
+        "cyclone" = "0pzs8y4s3snxg4g6lrb21qi88abm48g279xzd98qv17qxb2z82rr";
+        "cyclone10lp" = "1ccxq8n20y40y47zddkijcv41w3cddvydddr3m4844q31in3nxha";
+        "max" = "1cxzbqscxvlcy74dpqmvlnxjyyxfwcx3spygpvpwi6dfj3ipgm2z";
+        "max10" = "14k83javivbk65mpb17wdwsyb8xk7x9gzj9x0wnd24mmijrvdy9s";
+      };
+
+      devicePackages = map (id: {
+        name = "${id}-${version}.qdz";
+        sha256 = lib.getAttr id hashes;
+      }) (lib.attrValues supportedDeviceIds);
     in map require ([{
       name = "QuartusLiteSetup-${version}-linux.run";
       sha256 = "15vxvqxqdk29ahlw3lkm1nzxyhzy4626wb9s5f2h6sjgq64r8m7f";
     } {
       name = "ModelSimSetup-${version}-linux.run";
       sha256 = "0j1vfr91jclv88nam2plx68arxmz4g50sqb840i60wqd5b0l3y6r";
-    }] ++ lib.optional cycloneVSupport {
-      name = "cyclonev-${version}.qdz";
-      sha256 = "0bqxpvjgph0y6slk0jq75mcqzglmqkm0jsx10y9xz5llm6zxzqab";
-    });
+    }] ++ devicePackages);
 
     nativeBuildInputs = [ unstick ];
 
@@ -37,14 +70,9 @@ let
       disabledComponents = [
         "quartus_help"
         "quartus_update"
+        # not modelsim_ase
         "modelsim_ae"
-        # Devices
-        "arria_lite"
-        "cyclone"
-        "cyclone10lp"
-        "max"
-        "max10"
-      ] ++ lib.optional (!cycloneVSupport) "cyclonev";
+      ] ++ (lib.attrValues unsupportedDeviceIds);
     in ''
     ${lib.concatMapStringsSep "\n" copyInstaller installers}
     ${lib.concatMapStringsSep "\n" copyComponent components}

From 5542ea42874372db175faca5ba3f1db2f469a3ec Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2020 09:16:14 +0000
Subject: [PATCH 3814/4636] python27Packages.fiona: 1.8.13 -> 1.8.13.post1

---
 pkgs/development/python-modules/fiona/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix
index abc0853b4c71..cd4ed57d792c 100644
--- a/pkgs/development/python-modules/fiona/default.nix
+++ b/pkgs/development/python-modules/fiona/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "Fiona";
-  version = "1.8.13";
+  version = "1.8.13.post1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5ec34898c8b983a723fb4e949dd3e0ed7e691c303e51f6bfd61e52ac9ac813ae";
+    sha256 = "00366f2j21b5r4r8310sadf7jjhdr44s0381dhjqkw2nzpwjnhqs";
   };
 
   CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";

From 1f00ff162f263efcbf5f751764b6bd9654c197f5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2020 13:08:32 +0000
Subject: [PATCH 3815/4636] python37Packages.pyhcl: 0.4.0 -> 0.4.1

---
 pkgs/development/python-modules/pyhcl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyhcl/default.nix b/pkgs/development/python-modules/pyhcl/default.nix
index e409282980d6..b40305c0dce2 100644
--- a/pkgs/development/python-modules/pyhcl/default.nix
+++ b/pkgs/development/python-modules/pyhcl/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pyhcl";
-  version = "0.4.0";
+  version = "0.4.1";
   disabled = !isPy3k;
 
   src = fetchFromGitHub {
     owner = "virtuald";
     repo = pname;
     rev = version;
-    sha256 = "09kwm3digbwn3kmbk76jswxgwfcfchik6cfa2xbhjanh4xs893hs";
+    sha256 = "13nszg2plfvza3syki1rxnx3k3h90qq4wkgv86l1xpz31k3pf6k4";
   };
 
   # https://github.com/virtuald/pyhcl/blob/51a7524b68fe21e175e157b8af931016d7a357ad/setup.py#L64

From 7336a5de11a8de99cfeacb16646f5d368af30889 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2020 12:48:17 +0000
Subject: [PATCH 3816/4636] python27Packages.pid: 2.2.5 -> 3.0.0

---
 pkgs/development/python-modules/pid/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pid/default.nix b/pkgs/development/python-modules/pid/default.nix
index 20e9390861dc..8e45c43954d6 100644
--- a/pkgs/development/python-modules/pid/default.nix
+++ b/pkgs/development/python-modules/pid/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "pid";
-  version = "2.2.5";
+  version = "3.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "96eb7dba326b88f5164bc1afdc986c7793e0d32d7f62366256a3903c7b0614ef";
+    sha256 = "0pdp8h1m4brxalcsmzzzmjj66vj98g6wigwmcdj5sf8p7insklgn";
   };
 
   buildInputs = [ nose ];
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Pidfile featuring stale detection and file-locking";
-    homepage = https://github.com/trbs/pid/;
+    homepage = "https://github.com/trbs/pid/";
     license = licenses.asl20;
   };
 

From 2a56d98a9967e20f24b6d8c3657f85c4373adeb5 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 16 Mar 2020 15:15:08 -0700
Subject: [PATCH 3817/4636] unityhub: fix hash

---
 pkgs/development/tools/unityhub/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix
index f52d790c1063..2939df0ba20d 100644
--- a/pkgs/development/tools/unityhub/default.nix
+++ b/pkgs/development/tools/unityhub/default.nix
@@ -17,11 +17,11 @@ appimageTools.wrapType2 rec {
 
   src = fetchurl {
     url = "https://public-cdn.cloud.unity3d.com/hub/prod/UnityHub.AppImage";
-    sha256 = "1rx7ih94ig3pd1yx1d3fpx7zpixq3j5birkpnzkh778qqsdrg0nf";
+    sha256 = "05p5kqbwgqyk2aw2lix5dk1ql16aj6iczxrc63a1l0vj8wrha7z4";
   };
 
   meta = with stdenv.lib; {
-    homepage = https://unity3d.com/;
+    homepage = "https://unity3d.com/";
     description = "Game development tool";
     longDescription = ''
       Popular development platform for creating 2D and 3D multiplatform games

From f24538c5707e6afe157db79630028cebbc619dd1 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Mon, 23 Mar 2020 17:55:30 +0100
Subject: [PATCH 3818/4636] xmage: init at 1.4.42V6 (#82655)

xmage: init at 1.4.42V6
---
 pkgs/games/xmage/default.nix    | 41 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/games/xmage/default.nix

diff --git a/pkgs/games/xmage/default.nix b/pkgs/games/xmage/default.nix
new file mode 100644
index 000000000000..e8b8eb8a9419
--- /dev/null
+++ b/pkgs/games/xmage/default.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, fetchurl
+, jdk8
+, unzip
+}:
+
+stdenv.mkDerivation rec {
+  name    = "xmage";
+  version = "1.4.42V6";
+
+  src = fetchurl {
+    url    = "https://github.com/magefree/mage/releases/download/xmage_1.4.42V6/xmage_${version}.zip";
+    sha256 = "14s4885ldi0rplqmab5m775plsqmmm0m89j402caiqm2q9mzvkhd";
+  };
+
+  preferLocalBuild = true;
+
+  unpackPhase = ''
+    ${unzip}/bin/unzip $src
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -rv ./* $out
+
+    cat << EOS > $out/bin/xmage
+exec ${jdk8}/bin/java -Xms256m -Xmx512m -XX:MaxPermSize=384m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar $out/mage-client/lib/mage-client-1.4.42.jar
+EOS
+
+    chmod +x $out/bin/xmage
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Magic Another Game Engine";
+    license = licenses.mit;
+    maintainers = with maintainers; [ matthiasbeyer ];
+    homepage = "http://xmage.de/";
+  };
+
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f4d6091c7011..a32d3dc3fd2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7678,6 +7678,8 @@ in
   xfsprogs = callPackage ../tools/filesystems/xfsprogs { };
   libxfs = xfsprogs.dev;
 
+  xmage = callPackage ../games/xmage { };
+
   xml2 = callPackage ../tools/text/xml/xml2 { };
 
   xmlformat = callPackage ../tools/text/xml/xmlformat { };

From 664c6e273db0355c101e2198a20108baa48bd420 Mon Sep 17 00:00:00 2001
From: Phil Scott <3164225+Chattered@users.noreply.github.com>
Date: Tue, 20 Aug 2019 13:39:09 +0100
Subject: [PATCH 3819/4636] keeperrl: init at alpha28

---
 pkgs/games/keeperrl/default.nix | 75 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 +
 2 files changed, 77 insertions(+)
 create mode 100644 pkgs/games/keeperrl/default.nix

diff --git a/pkgs/games/keeperrl/default.nix b/pkgs/games/keeperrl/default.nix
new file mode 100644
index 000000000000..68426a4aedfd
--- /dev/null
+++ b/pkgs/games/keeperrl/default.nix
@@ -0,0 +1,75 @@
+{ stdenv, fetchFromGitHub, requireFile
+, openal, curl, libogg, libvorbis
+, SDL2, SDL2_image, zlib
+, unfree_assets ? false }:
+
+stdenv.mkDerivation rec {
+  pname = "keeperrl";
+  version = "alpha28";
+
+  free-src = fetchFromGitHub {
+    owner = "miki151";
+    repo = "keeperrl";
+    rev = version;
+    sha256 = "0isj8ijn5a89m2r5cxk4lcsq0cydx7c0h87vgr8v5cndm3rd27cy";
+  };
+
+  assets = if unfree_assets then requireFile rec {
+    name = "keeperrl_data_${version}.tar.gz";
+    message = ''
+      This nix expression requires that the KeeperRL art assets are already
+      part of the store. These can be obtained from a purchased copy of the game
+      and found in the "data" directory. Make a tar archive of this directory
+      with
+
+      "tar czf ${name} data"
+
+      Then add this archive to the nix store with
+
+      "nix-prefetch-url file://\$PWD/${name}".
+    '';
+    sha256 = "0115pxdzdyma2vicxgr0j21pp82gxdyrlj090s8ihp0b50f0nk53";
+  } else null;
+
+  sourceRoot = "source";
+
+  srcs = [ free-src ] ++ stdenv.lib.optional unfree_assets assets;
+
+  postUnpack = stdenv.lib.optionalString unfree_assets ''
+    mv data $sourceRoot
+  '';
+
+  buildInputs = [
+    openal curl libogg libvorbis SDL2 SDL2_image zlib
+  ];
+
+  NIX_CFLAGS_COMPILE = [
+    "-I${SDL2.dev}/include/SDL2"
+  ];
+
+  enableParallelBuilding = true;
+
+  makeFlags = [ "OPT=true"
+                "RELEASE=true"
+                "DATA_DIR=$(out)/share"
+                "ENABLE_LOCAL_USER_DIR=true"
+              ];
+
+  installPhase = ''
+    install -Dm755 keeper $out/bin/keeper
+    install -Dm755 appconfig.txt $out/share/appconfig.txt
+
+    cp -r data_free $out/share
+    cp -r data_contrib $out/share
+    ${stdenv.lib.optionalString unfree_assets "cp -r data $out/share"}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A dungeon management rogue-like";
+    homepage = "https://keeperrl.com/";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ chattered ];
+    # TODO: Add OS X
+    platforms = with platforms; [ "i686-linux" "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a32d3dc3fd2b..6416a8061190 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4522,6 +4522,8 @@ in
 
   keepalived = callPackage ../tools/networking/keepalived { };
 
+  keeperrl = callPackage ../games/keeperrl { };
+
   kexectools = callPackage ../os-specific/linux/kexectools { };
 
   keepkey_agent = with python3Packages; toPythonApplication keepkey_agent;

From eb24f9efb98c32f2b3ce073573162399814e7167 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Mon, 23 Mar 2020 12:52:03 -0400
Subject: [PATCH 3820/4636] pythonPackages.pymavlink: 2.4.3 -> 2.4.6

---
 pkgs/development/python-modules/pymavlink/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix
index b909886ddb5b..d47ea812ca8f 100644
--- a/pkgs/development/python-modules/pymavlink/default.nix
+++ b/pkgs/development/python-modules/pymavlink/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pymavlink";
-  version = "2.4.3";
+  version = "2.4.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "332d3d0291b4482641a5b3cd97e879817f50eb9c2b2ddcc30d51d619bad01b51";
+    sha256 = "1c8bxbm18h4idfdxqgklcz4n5bgsyl9y14gl9314fpflwa2c7ds8";
   };
 
   propagatedBuildInputs = [ future lxml ];

From eed45c37c7b3dfc234a6f9e11287cce0b9f3d551 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Mar 2020 05:35:37 +0000
Subject: [PATCH 3821/4636] python37Packages.spyder-kernels: 1.8.1 -> 1.9.0

---
 pkgs/development/python-modules/spyder-kernels/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix
index f4d57ce579e7..1f9455c8087d 100644
--- a/pkgs/development/python-modules/spyder-kernels/default.nix
+++ b/pkgs/development/python-modules/spyder-kernels/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "spyder-kernels";
-  version = "1.8.1";
+  version = "1.9.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a782fc5961a9dd48d520ddc1c868b960d54b8edb1116c21fc2e3c347fe5a4474";
+    sha256 = "1sqjagabqccrc73a423smfjmiph7lfjzj26r6hn3j3vf3drm3rpj";
   };
 
   propagatedBuildInputs = [

From 0eacf78130995424127265a9306fd00450f1617e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Mar 2020 01:58:23 +0000
Subject: [PATCH 3822/4636] python37Packages.pylint-django: 2.0.13 -> 2.0.14

---
 pkgs/development/python-modules/pylint-django/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix
index ef47699053cb..8530e6f8543d 100644
--- a/pkgs/development/python-modules/pylint-django/default.nix
+++ b/pkgs/development/python-modules/pylint-django/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pylint-django";
-  version = "2.0.13";
+  version = "2.0.14";
   disabled = !isPy3k;
 
   src = fetchFromGitHub {
     owner = "PyCQA";
     repo = pname;
     rev = "v${version}";
-    sha256 = "16xfn8zs5khdfh5pdsv3wjjhywzc1qhx7mxi5kpbcvmd6an9qi7s";
+    sha256 = "07fkwb4phfr71dpajnq6l64phjxvljx2nf8ibs12n9gwjdvm9i52";
   };
 
   propagatedBuildInputs = [

From c9b1356d9f637bd6aaedaf58d87ce6447851810a Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 22 Mar 2020 21:44:47 -0400
Subject: [PATCH 3823/4636] pythonPackages.mkl-service: 2.1.0 -> 2.3.0

Release notes: https://github.com/IntelPython/mkl-service/releases
---
 pkgs/development/python-modules/mkl-service/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mkl-service/default.nix b/pkgs/development/python-modules/mkl-service/default.nix
index ad3f30a66daa..c8531299620e 100644
--- a/pkgs/development/python-modules/mkl-service/default.nix
+++ b/pkgs/development/python-modules/mkl-service/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "mkl-service";
-  version = "2.1.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "IntelPython";
     repo = "mkl-service";
     rev = "v${version}";
-    sha256 = "1bnpgx629rxqf0yhn0jn68ypj3dqv6njc3981j1g8j8rsm5lycrn";
+    sha256 = "1b4dkkl439rfaa86ywzc2zf9ifawhvdlaiqcg0il83cn5bzs7g5z";
   };
 
   MKLROOT = mkl;

From 70fe2c9e2f3cfca4ee07c0d93d31b64b4399dbf0 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 23 Mar 2020 18:25:10 +0100
Subject: [PATCH 3824/4636] rambox: 0.7.3 -> 0.7.4

https://github.com/ramboxapp/community-edition/releases/tag/0.7.4
---
 .../networking/instant-messengers/rambox/default.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index 488da12c18c2..28ed924011e3 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -3,18 +3,18 @@
 }:
 
 let
-  version = "0.7.3";
+  version = "0.7.4";
 in stdenv.mkDerivation rec {
   pname = "rambox";
   inherit version;
   src = {
     x86_64-linux = fetchurl {
       url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-amd64.deb";
-      sha256 = "09v8zlayas906zhqy2aw4wkvyl87ykr09sjf0nmgmf69piwmjgg6";
+      sha256 = "0m9627bcwfg9aximv7ifsmspm8xi231pcnnd4p46lahb2qp19vbd";
     };
     i686-linux = fetchurl {
       url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.deb";
-      sha256 = "0gv4pf3vhrw4xyccm24ivv92d9qy4zpwsh0m82ib1w764lyxmyrz";
+      sha256 = "162p6x400w3pny38adinp53rcifvbkjbs12cwrpf7s3b0yml8qxr";
     };
   }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
 
@@ -43,7 +43,7 @@ in stdenv.mkDerivation rec {
     description = "Free and Open Source messaging and emailing app that combines common web applications into one";
     homepage = http://rambox.pro;
     license = licenses.mit;
-    maintainers = [ maintainers.gnidorah ];
+    maintainers = with maintainers; [ gnidorah ma27 ];
     platforms = ["i686-linux" "x86_64-linux"];
     hydraPlatforms = [];
   };

From 2c7299fc1c8f2afcccd71ca367a7020d991a9476 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 23 Mar 2020 18:27:50 +0100
Subject: [PATCH 3825/4636] cargo-make: 0.29.0 -> 0.30.0

https://github.com/sagiegurari/cargo-make/releases/tag/0.30.0
---
 pkgs/development/tools/rust/cargo-make/Cargo.lock  | 2 +-
 pkgs/development/tools/rust/cargo-make/default.nix | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-make/Cargo.lock b/pkgs/development/tools/rust/cargo-make/Cargo.lock
index bf634d338055..86a539b33d71 100644
--- a/pkgs/development/tools/rust/cargo-make/Cargo.lock
+++ b/pkgs/development/tools/rust/cargo-make/Cargo.lock
@@ -104,7 +104,7 @@ dependencies = [
 
 [[package]]
 name = "cargo-make"
-version = "0.29.0"
+version = "0.30.0"
 dependencies = [
  "ci_info 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix
index a7ccc0581910..f3d6788e3ac1 100644
--- a/pkgs/development/tools/rust/cargo-make/default.nix
+++ b/pkgs/development/tools/rust/cargo-make/default.nix
@@ -2,7 +2,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-make";
-  version = "0.29.0";
+  version = "0.30.0";
 
   src =
     let
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
         owner = "sagiegurari";
         repo = pname;
         rev = version;
-        sha256 = "0sxwc61iaqln37m45a3sy1c92ri4zad8g5h5fgk5plj0qlps80np";
+        sha256 = "0zlj2jys97nphymxrzdjmnh9vv7rsq3fgidap96mh26q9af7ffbz";
       };
     in
     runCommand "source" {} ''
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
-  cargoSha256 = "1w7nw3amb5by60a8aqvwka4aify8k3csjqys7arzksy98jyn6b4j";
+  cargoSha256 = "1pjdpnilbxn7vzxl15j5d3k07a80y1mr5cdmj96miyq89j5mmjq0";
 
   # Some tests fail because they need network access.
   # However, Travis ensures a proper build.

From 02acf84561bb813aa1c8e4b50f5de6d75cd3afdd Mon Sep 17 00:00:00 2001
From: Jan Beinke <git@janbeinke.com>
Date: Mon, 23 Mar 2020 17:51:27 +0100
Subject: [PATCH 3826/4636] maintainers: add thelegy

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 241646310191..65f2cd1241d0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7318,6 +7318,12 @@
     githubId = 8547242;
     name = "Stefan Rohrbacher";
   };
+  "thelegy" = {
+    email = "mail+nixos@0jb.de";
+    github = "thelegy";
+    githubId = 3105057;
+    name = "Jan Beinke";
+  };
   thesola10 = {
     email = "thesola10@bobile.fr";
     github = "thesola10";

From ca3e516e3815e3833eea198c3a949562a20e6593 Mon Sep 17 00:00:00 2001
From: Jan Beinke <git@janbeinke.com>
Date: Mon, 23 Mar 2020 17:58:00 +0100
Subject: [PATCH 3827/4636] python3Packages.opuslib: init at 3.0.3

---
 .../python-modules/opuslib/default.nix        | 39 +++++++++++++++++++
 .../opuslib/opuslib-paths.patch               | 26 +++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 67 insertions(+)
 create mode 100644 pkgs/development/python-modules/opuslib/default.nix
 create mode 100644 pkgs/development/python-modules/opuslib/opuslib-paths.patch

diff --git a/pkgs/development/python-modules/opuslib/default.nix b/pkgs/development/python-modules/opuslib/default.nix
new file mode 100644
index 000000000000..aa7fc4add493
--- /dev/null
+++ b/pkgs/development/python-modules/opuslib/default.nix
@@ -0,0 +1,39 @@
+{ buildPythonPackage,
+  fetchFromGitHub,
+  isPy27,
+  libopus,
+  nose,
+  stdenv,
+  substituteAll,
+}:
+
+buildPythonPackage rec {
+  pname = "opuslib";
+  version = "3.0.3";
+
+  disabled = isPy27;
+
+  src = fetchFromGitHub {
+    owner = "orion-labs";
+    repo = "opuslib";
+    rev = "92109c528f9f6c550df5e5325ca0fcd4f86b0909";
+    sha256 = "0kd37wimwd1g6c0w5hq2hiiljgbi1zg3rk5prval086khkzq469p";
+  };
+
+  patches = [
+    (substituteAll {
+      src = ./opuslib-paths.patch;
+      opusLibPath = "${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}";
+    })
+  ];
+
+  checkInputs = [ nose ];
+
+  meta = with stdenv.lib; {
+    description = "Python bindings to the libopus, IETF low-delay audio codec";
+    homepage = "https://github.com/orion-labs/opuslib";
+    license = licenses.bsd3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ thelegy ];
+  };
+}
diff --git a/pkgs/development/python-modules/opuslib/opuslib-paths.patch b/pkgs/development/python-modules/opuslib/opuslib-paths.patch
new file mode 100644
index 000000000000..fd2cfc8dbde2
--- /dev/null
+++ b/pkgs/development/python-modules/opuslib/opuslib-paths.patch
@@ -0,0 +1,26 @@
+diff --git a/opuslib/api/__init__.py b/opuslib/api/__init__.py
+index 323a2a4..4c8a8fe 100644
+--- a/opuslib/api/__init__.py
++++ b/opuslib/api/__init__.py
+@@ -7,20 +7,12 @@
+
+ import ctypes  # type: ignore
+
+-from ctypes.util import find_library  # type: ignore
+-
+ __author__ = 'Никита Кузнецов <self@svartalf.info>'
+ __copyright__ = 'Copyright (c) 2012, SvartalF'
+ __license__ = 'BSD 3-Clause License'
+
+
+-lib_location = find_library('opus')
+-
+-if lib_location is None:
+-    raise Exception(
+-        'Could not find Opus library. Make sure it is installed.')
+-
+-libopus = ctypes.CDLL(lib_location)
++libopus = ctypes.CDLL('@opusLibPath@')
+
+ c_int_pointer = ctypes.POINTER(ctypes.c_int)
+ c_int16_pointer = ctypes.POINTER(ctypes.c_int16)
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 49de95139f57..3e1c9a383a86 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4629,6 +4629,8 @@ in {
 
   omegaconf = callPackage ../development/python-modules/omegaconf { };
 
+  opuslib = callPackage ../development/python-modules/opuslib { };
+
   orderedset = callPackage ../development/python-modules/orderedset { };
 
   python-multipart = callPackage ../development/python-modules/python-multipart { };

From a3ecb8be2780be2df7ed91683df2bbdeb42a96fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Mar 2020 14:35:17 -0300
Subject: [PATCH 3828/4636] ant-theme: should not use a fixed output path

---
 pkgs/data/themes/ant-theme/ant.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/data/themes/ant-theme/ant.nix b/pkgs/data/themes/ant-theme/ant.nix
index 0908883e20ec..736c8a1aa6ac 100644
--- a/pkgs/data/themes/ant-theme/ant.nix
+++ b/pkgs/data/themes/ant-theme/ant.nix
@@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
     gtk-engine-murrine
   ];
 
-  dontBuild = true;
-
   installPhase = ''
     runHook preInstall
     mkdir -p $out/share/themes/${themeName}
@@ -26,10 +24,6 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "07iv4jangqnzrvjr749vl3x31z7dxds51bq1bhz5acbjbwf25wjf";
-
   meta = with stdenv.lib; {
     description = "A flat and light theme with a modern look";
     homepage = "https://github.com/EliverLara/${themeName}";

From ff9448c9debb60b9fce92f0c726e204a8fdd2f4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Mar 2020 14:39:00 -0300
Subject: [PATCH 3829/4636] ant-bloody-theme: should not use a fixed output
 path

---
 pkgs/data/themes/ant-theme/ant-bloody.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/data/themes/ant-theme/ant-bloody.nix b/pkgs/data/themes/ant-theme/ant-bloody.nix
index 4ec1c3281d55..3c540889c13a 100644
--- a/pkgs/data/themes/ant-theme/ant-bloody.nix
+++ b/pkgs/data/themes/ant-theme/ant-bloody.nix
@@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
     gtk-engine-murrine
   ];
 
-  dontBuild = true;
-
   installPhase = ''
     runHook preInstall
     mkdir -p $out/share/themes/${themeName}
@@ -26,10 +24,6 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "0v5pdhysa2460sh400cpq11smcfsi9g1lbfzx8nj1w5a21d811cz";
-
   meta = with stdenv.lib; {
     description = "Bloody variant of the Ant theme";
     homepage = "https://github.com/EliverLara/${themeName}";

From c8188d8284ed6ad9bd3870dd5bd434e7e3e9fe2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Mar 2020 14:39:41 -0300
Subject: [PATCH 3830/4636] ant-dracula-theme: should not use a fixed output
 path

---
 pkgs/data/themes/ant-theme/ant-dracula.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/data/themes/ant-theme/ant-dracula.nix b/pkgs/data/themes/ant-theme/ant-dracula.nix
index baeafb255275..e365ab94c300 100644
--- a/pkgs/data/themes/ant-theme/ant-dracula.nix
+++ b/pkgs/data/themes/ant-theme/ant-dracula.nix
@@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
     gtk-engine-murrine
   ];
 
-  dontBuild = true;
-
   installPhase = ''
     runHook preInstall
     mkdir -p $out/share/themes/${themeName}
@@ -26,10 +24,6 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "1a9mkxfb0zixx8s05h15lhnnzygh2qzc8k2q10i0khx90bf72x14";
-
   meta = with stdenv.lib; {
     description = "Dracula variant of the Ant theme";
     homepage = "https://github.com/EliverLara/${themeName}";

From 1aca373b5066aa705e64b63bbb9e1af489c35b06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Mar 2020 14:39:55 -0300
Subject: [PATCH 3831/4636] ant-nebula-theme: should not use a fixed output
 path

---
 pkgs/data/themes/ant-theme/ant-nebula.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/data/themes/ant-theme/ant-nebula.nix b/pkgs/data/themes/ant-theme/ant-nebula.nix
index 75aeb91f9022..03ee3b5d2d42 100644
--- a/pkgs/data/themes/ant-theme/ant-nebula.nix
+++ b/pkgs/data/themes/ant-theme/ant-nebula.nix
@@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
     gtk-engine-murrine
   ];
 
-  dontBuild = true;
-
   installPhase = ''
     runHook preInstall
     mkdir -p $out/share/themes/${themeName}
@@ -26,10 +24,6 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "1lmlc4fvjnp05gshc0arfysh8r1xxzpzdv3j0bk40mjf3d59814c";
-
   meta = with stdenv.lib; {
     description = "Nebula variant of the Ant theme";
     homepage = "https://github.com/EliverLara/${themeName}";

From b1d878d4192c7a954ec32ff7c476bd4a5e7776a2 Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Mon, 23 Mar 2020 19:42:47 +0200
Subject: [PATCH 3832/4636] cypress: 3.8.3 -> 4.2.0

---
 pkgs/development/web/cypress/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix
index 86f6b129accd..2b6449d9dd4d 100644
--- a/pkgs/development/web/cypress/default.nix
+++ b/pkgs/development/web/cypress/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec{
   pname = "cypress";
-  version = "3.8.3";
+  version = "4.2.0";
 
   src = fetchzip {
     url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
-    sha256 = "1ncq64s5y5dsx0lrz950vab2yzwihl2wd7yapp12305bjjsihj3z";
+    sha256 = "0ksa7c0bpq13xxgk0qizg3kfyjihcqan5wm6f45v7kgz3wwxc4nz";
   };
 
   # don't remove runtime deps

From 3248eac2bf09bc29d31a52b762809f889cd8f795 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 22 Mar 2020 21:04:17 -0400
Subject: [PATCH 3833/4636] pythonPackages.flake8-future-import: 0.4.5 -> 0.4.6
 and fix build

The build is currently broken on master and 20.03. This upgrades to the latest
version and also disables the bad py2 test. I spent a long time trying to figure
out what the issue is, but since it's disabled upstream on python3 anyways let's
just skip it on python2 as well.

ZHF: #80379
---
 .../flake8-future-import/default.nix          | 25 ++++++++-----------
 .../flake8-future-import/skip-test.patch      | 13 ++++++++++
 2 files changed, 24 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/development/python-modules/flake8-future-import/skip-test.patch

diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix
index c9cf3fe4ca84..0a60761b9433 100644
--- a/pkgs/development/python-modules/flake8-future-import/default.nix
+++ b/pkgs/development/python-modules/flake8-future-import/default.nix
@@ -1,30 +1,27 @@
-{ lib, fetchFromGitHub, buildPythonPackage, fetchpatch, flake8, six }:
+{ lib, isPy27, fetchFromGitHub, buildPythonPackage, fetchpatch, flake8, six }:
 
 buildPythonPackage rec {
   pname = "flake8-future-import";
-  version = "0.4.5";
+  version = "0.4.6";
 
   # PyPI tarball doesn't include the test suite
   src = fetchFromGitHub {
     owner = "xZise";
     repo = "flake8-future-import";
     rev = version;
-    sha256 = "00fpxa6g8cabybnciwnpsbg60zhgydc966jgwyyggw1pcg0frdqr";
+    sha256 = "00q8n15xdnvqj454arn7xxksyrzh0dw996kjyy7g9rdk0rf8x82z";
   };
 
-  patches = [
-    # Add Python 3.7 support. Remove with the next release
-    (fetchpatch {
-      url = https://github.com/xZise/flake8-future-import/commit/cace194a44d3b95c9c1ed96640bae49183acca04.patch;
-      sha256 = "17pkqnh035j5s5c53afs8bk49bq7lnmdwqp5k7izx7sw80z73p9r";
-    })
-  ];
-
   propagatedBuildInputs = [ flake8 six ];
 
-  meta = {
-    homepage = https://github.com/xZise/flake8-future-import;
+  # Upstream disables this test case naturally on python 3, but it also fails
+  # inside NixPkgs for python 2. Since it's going to be deleted, we just skip it
+  # on py2 as well.
+  patches = lib.optionals isPy27 [ ./skip-test.patch ];
+
+  meta = with lib; {
     description = "A flake8 extension to check for the imported __future__ modules to make it easier to have a consistent code base";
-    license = lib.licenses.mit;
+    homepage = "https://github.com/xZise/flake8-future-import";
+    license = licenses.mit;
   };
 }
diff --git a/pkgs/development/python-modules/flake8-future-import/skip-test.patch b/pkgs/development/python-modules/flake8-future-import/skip-test.patch
new file mode 100644
index 000000000000..300358f9158b
--- /dev/null
+++ b/pkgs/development/python-modules/flake8-future-import/skip-test.patch
@@ -0,0 +1,13 @@
+diff --git a/test_flake8_future_import.py b/test_flake8_future_import.py
+index 84fde59..345f23f 100644
+--- a/test_flake8_future_import.py
++++ b/test_flake8_future_import.py
+@@ -230,7 +230,7 @@ class TestBadSyntax(TestCaseBase):
+     """Test using various bad syntax examples from Python's library."""
+ 
+ 
+-@unittest.skipIf(sys.version_info[:2] >= (3, 7), 'flake8 supports up to 3.6')
++@unittest.skip("Has issue with installed path for flake8 in python2")
+ class Flake8TestCase(TestCaseBase):
+ 
+     """

From ac1761135402823c00e62b5a02a65630dac8923a Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Fri, 20 Mar 2020 18:11:30 -0400
Subject: [PATCH 3834/4636] python3Packages.python-language-server: 0.31.8 ->
 0.31.9

---
 .../python-modules/python-language-server/default.nix      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix
index 74eadd9b2de3..c8bb1b5fa6f8 100644
--- a/pkgs/development/python-modules/python-language-server/default.nix
+++ b/pkgs/development/python-modules/python-language-server/default.nix
@@ -21,13 +21,13 @@ in
 
 buildPythonPackage rec {
   pname = "python-language-server";
-  version = "0.31.8";
+  version = "0.31.9";
 
   src = fetchFromGitHub {
     owner = "palantir";
     repo = "python-language-server";
     rev = version;
-    sha256 = "sha256:1h0w7x7d9g3z7vmxn5w7qxdkjya3sl0xfnklfaaaj8dkb5mjldpi";
+    sha256 = "06hd6a1hhd57hrq4vbwfs0saplkhsrz2krv8kq9kw4fz4hx7zj74";
   };
 
   # The tests require all the providers, disable otherwise.
@@ -53,8 +53,7 @@ buildPythonPackage rec {
     "test_pandas_completions"
     "test_matplotlib_completions"
     "test_snippet_parsing"
-
-  ];
+  ] ++ stdenv.lib.optional isPy27 "test_flake8_lint";
   # checkPhase = ''
   #   HOME=$TEMPDIR pytest -k "not test_pyqt_completion and not 
   # '';

From 353c6c948e0db50cddac8eca4bffe979267b285d Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Fri, 20 Mar 2020 18:13:20 -0400
Subject: [PATCH 3835/4636] python37Packages.spyder: 4.0.1 -> 4.1.1 (and
 unbreak for Python3.7)

---
 .../python-modules/spyder/default.nix          | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix
index 65fabc6c7bc4..283c9b33f34e 100644
--- a/pkgs/development/python-modules/spyder/default.nix
+++ b/pkgs/development/python-modules/spyder/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, buildPythonPackage, fetchPypi, makeDesktopItem, intervaltree, jedi, pycodestyle,
+{ stdenv, buildPythonPackage, fetchPypi, isPy27, makeDesktopItem, intervaltree, jedi, pycodestyle,
   psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc,
   qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments,
   spyder-kernels, qtpy, pyzmq, chardet, qdarkstyle, watchdog, python-language-server
-, pyqtwebengine
+, pyqtwebengine, atomicwrites, pyxdg, diff-match-patch
 }:
 
 buildPythonPackage rec {
   pname = "spyder";
-  version = "4.0.1";
+  version = "4.1.1";
+
+  disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4b279c16487d224368dd2213e1517185fa59fc528f539601fffb34ea97accb7b";
+    sha256 = "13ajjifyf7w895vpl0h9r59m73zisby81xjw2c5pk49fh5l6ycs9";
   };
 
   nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
@@ -20,6 +22,7 @@ buildPythonPackage rec {
     intervaltree jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring
     numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels
     pygments qtpy pyzmq chardet pyqtwebengine qdarkstyle watchdog python-language-server
+    atomicwrites pyxdg diff-match-patch
   ];
 
   # There is no test for spyder
@@ -42,8 +45,12 @@ buildPythonPackage rec {
     substituteInPlace setup.py --replace "pyqt5<5.13" "pyqt5"
   '';
 
-  # Create desktop item
   postInstall = ''
+    # add Python libs to env so Spyder subprocesses
+    # created to run compute kernels don't fail with ImportErrors
+    wrapProgram $out/bin/spyder3 --prefix PYTHONPATH : "$PYTHONPATH"
+
+    # Create desktop item
     mkdir -p $out/share/icons
     cp spyder/images/spyder.svg $out/share/icons
     cp -r $desktopItem/share/applications/ $out/share
@@ -66,6 +73,5 @@ buildPythonPackage rec {
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = with maintainers; [ gebner ];
-    broken = true;
   };
 }

From 58a491aa801aab83ed8eed28fce211a185689236 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Mon, 23 Mar 2020 19:49:34 +0100
Subject: [PATCH 3836/4636] memcached: 1.5.22 -> 1.6.2

fixes remote DoS/possibly code execution, as described in
https://github.com/memcached/memcached/issues/629
---
 pkgs/servers/memcached/default.nix | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix
index 98bd92c75318..0449144b07a2 100644
--- a/pkgs/servers/memcached/default.nix
+++ b/pkgs/servers/memcached/default.nix
@@ -1,24 +1,14 @@
-{stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent}:
+{stdenv, fetchurl, cyrus_sasl, libevent}:
 
 stdenv.mkDerivation rec {
-  version = "1.5.22";
+  version = "1.6.2";
   pname = "memcached";
 
   src = fetchurl {
     url = "https://memcached.org/files/${pname}-${version}.tar.gz";
-    sha256 = "14qzbxgz40j4yhi3lzrsdjd6kyy3zwv9c8kw11kj6njp42fpxd62";
+    sha256 = "12qn8m0jdvdckz53m2akrvixbrn64g5kv6r4hl5vx286qhc02wh6";
   };
 
-  patches = [
-    # Fixes compilation error on Darwin due to redeclaration of
-    # htonll. The fix should appear in 1.5.23.
-    # https://github.com/memcached/memcached/issues/598
-    (fetchpatch {
-      url = "https://github.com/memcached/memcached/commit/95c67710aaf5cfe188d94b510faef8c66d6f5604.diff";
-      sha256 = "0ab5l24p4n4fpx78ilmg7jvs9nl84pdza90jbpbx3ns5n23pqbfs";
-    })
-  ];
-
   configureFlags = [
      "ac_cv_c_endian=${if stdenv.hostPlatform.isBigEndian then "big" else "little"}"
   ];
@@ -32,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A distributed memory object caching system";
     repositories.git = https://github.com/memcached/memcached.git;
-    homepage = http://memcached.org/;
+    homepage = "http://memcached.org/";
     license = licenses.bsd3;
     maintainers = [ maintainers.coconnor ];
     platforms = platforms.linux ++ platforms.darwin;

From 3fa813e820a90b475e7144512070d7e55d93732e Mon Sep 17 00:00:00 2001
From: David Anderson <dave@natulte.net>
Date: Mon, 23 Mar 2020 12:11:14 -0700
Subject: [PATCH 3837/4636] tailscale: switch version and git ref to use a tag.

The tag points to the same commit hash, so the binary
is unchanged.

Signed-off-by: David Anderson <dave@natulte.net>
---
 pkgs/servers/tailscale/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix
index 2fc08e754b18..e4cc0889c31f 100644
--- a/pkgs/servers/tailscale/default.nix
+++ b/pkgs/servers/tailscale/default.nix
@@ -2,12 +2,12 @@
 
 buildGoModule rec {
   pname = "tailscale";
-  version = "0.97-0";
+  version = "0.97";
 
   src = fetchFromGitHub {
     owner = "tailscale";
     repo = "tailscale";
-    rev = "dd14b658a2f42a3b4d78682e4f4f82f730262c5c";
+    rev = "v${version}";
     sha256 = "0ckjqhj99c25h8xgyfkrd19nw5w4a7972nvba9r5faw5micjs02n";
   };
 

From dff1df7c2138f96780c2250fbe8986054ee8b012 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Mon, 23 Mar 2020 20:11:34 +0100
Subject: [PATCH 3838/4636] python: Twisted: 19.10.0 -> 20.3.0

---
 pkgs/development/python-modules/twisted/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index 5c4fea3f9b1b..2bea54818c24 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -16,12 +16,12 @@
 }:
 buildPythonPackage rec {
   pname = "Twisted";
-  version = "19.10.0";
+  version = "20.3.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "tar.bz2";
-    sha256 = "7394ba7f272ae722a74f3d969dcf599bc4ef093bc392038748a490f1724a515d";
+    sha256 = "040yzha6cyshnn6ljgk2birgh6mh2cnra48xp5ina5vfsnsmab6p";
   };
 
   propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools ];

From 425efa54ef5a01a2d4b6af7aeac846d0cde6e2b6 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Mon, 23 Mar 2020 20:09:51 +0100
Subject: [PATCH 3839/4636] matrix-synapse: 1.11.1 -> 1.12.0

---
 pkgs/servers/matrix-synapse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 8da5d4676d68..f0c8a0d4f819 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -23,11 +23,11 @@ let
 
 in buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.11.1";
+  version = "1.12.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0xd4bxsmk67r6pfj5lh0hn36r8z51mxsl39fjfrfdidvl1qqbxnk";
+    sha256 = "18wavnb47w4hfh8dc7g77bfhz03zh1xzl58mxlfi0000qsbkz680";
   };
 
   patches = [

From 1dc1789806d4cc7544d707fb8c8d2d2a085f8f6b Mon Sep 17 00:00:00 2001
From: Kolby Crouch <kjc.devel@gmail.com>
Date: Mon, 23 Mar 2020 14:17:25 -0500
Subject: [PATCH 3840/4636] retroarch: fix picodrive on aarch64

---
 pkgs/misc/emulators/retroarch/cores.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index e055e5a15fae..b1d01e12b626 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -786,7 +786,7 @@ in with stdenv.lib.licenses;
     SDL_CONFIG = "${SDL.dev}/bin/sdl-config";
     dontAddPrefix = true;
     configurePlatforms = [];
-    meta.badPlatforms = [ "aarch64-linux" ];
+    makeFlags = stdenv.lib.optional stdenv.hostPlatform.isAarch64 [ "platform=aarch64" ];
   };
 
   play = mkLibRetroCore {

From 29e6e32ef9b075cbf1859daed38c7d17f98ecff0 Mon Sep 17 00:00:00 2001
From: LightDiscord <root@arnaud.sh>
Date: Tue, 10 Mar 2020 21:32:47 +0100
Subject: [PATCH 3841/4636] pdf-parser: init at 0.7.4

---
 pkgs/tools/misc/pdf-parser/default.nix | 34 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/tools/misc/pdf-parser/default.nix

diff --git a/pkgs/tools/misc/pdf-parser/default.nix b/pkgs/tools/misc/pdf-parser/default.nix
new file mode 100644
index 000000000000..3fee457f6f54
--- /dev/null
+++ b/pkgs/tools/misc/pdf-parser/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, python3Packages, fetchzip }:
+
+python3Packages.buildPythonApplication {
+  pname = "pdf-parser";
+  version = "0.7.4";
+
+  src = fetchzip {
+    url = "https://didierstevens.com/files/software/pdf-parser_V0_7_4.zip";
+    sha256 = "1j39yww2yl4cav8xgd4zfl5jchbbkvffnrynkamkzvz9dd5np2mh";
+  };
+
+  format = "other";
+
+  installPhase = ''
+    install -Dm555 pdf-parser.py $out/bin/pdf-parser.py
+  '';
+
+  preFixup = ''
+    substituteInPlace $out/bin/pdf-parser.py \
+      --replace '/usr/bin/python' '${python3Packages.python}/bin/python'
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Parse a PDF document";
+    longDescription = ''
+      This tool will parse a PDF document to identify the fundamental elements used in the analyzed file.
+      It will not render a PDF document.
+    '';
+    homepage = "https://blog.didierstevens.com/programs/pdf-tools/";
+    license = licenses.publicDomain;
+    maintainers = [ maintainers.lightdiscord ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6416a8061190..176a9afaac8c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26531,6 +26531,8 @@ in
 
   hashdeep = callPackage ../tools/security/hashdeep { };
 
+  pdf-parser = callPackage ../tools/misc/pdf-parser {};
+
   fluxboxlauncher = callPackage ../applications/misc/fluxboxlauncher {};
 
   btcdeb = callPackage ../applications/blockchains/btcdeb {};

From d21cf30353369ff1facbc4af4a9fadd31934f0ca Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Mon, 23 Mar 2020 14:27:13 +0100
Subject: [PATCH 3842/4636] visidata: add setuptools

and ran nixpkgs-fmt.

This allows to access visidata's help via ctrl+H.
---
 pkgs/applications/misc/visidata/default.nix | 33 +++++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix
index 64645e00bd85..cc88cb1751ef 100644
--- a/pkgs/applications/misc/visidata/default.nix
+++ b/pkgs/applications/misc/visidata/default.nix
@@ -1,5 +1,16 @@
-{ buildPythonApplication, lib, fetchFromGitHub
-, dateutil, pyyaml, openpyxl, xlrd, h5py, fonttools, lxml, pandas, pyshp
+{ buildPythonApplication
+, lib
+, fetchFromGitHub
+, dateutil
+, pyyaml
+, openpyxl
+, xlrd
+, h5py
+, fonttools
+, lxml
+, pandas
+, pyshp
+, setuptools
 }:
 buildPythonApplication rec {
   pname = "visidata";
@@ -12,16 +23,26 @@ buildPythonApplication rec {
     sha256 = "19gs8i6chrrwibz706gib5sixx1cjgfzh7v011kp3izcrn524mc0";
   };
 
-  propagatedBuildInputs = [dateutil pyyaml openpyxl xlrd h5py fonttools
-    lxml pandas pyshp ];
+  propagatedBuildInputs = [
+    dateutil
+    pyyaml
+    openpyxl
+    xlrd
+    h5py
+    fonttools
+    lxml
+    pandas
+    pyshp
+    setuptools
+  ];
 
   doCheck = false;
 
   meta = {
     inherit version;
     description = "Interactive terminal multitool for tabular data";
-    license = lib.licenses.gpl3 ;
-    maintainers = [lib.maintainers.raskin];
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.raskin ];
     platforms = lib.platforms.linux;
     homepage = "http://visidata.org/";
   };

From 6873c0415383ffb7df8b70ee5fe8c84c319d290d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Sun, 22 Mar 2020 08:11:01 +0100
Subject: [PATCH 3843/4636] cinnamon.mint-themes: init at 1.8.0

---
 pkgs/desktops/cinnamon/default.nix            |  1 +
 .../desktops/cinnamon/mint-themes/default.nix | 41 +++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/desktops/cinnamon/mint-themes/default.nix

diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index 802c0bdaa88b..6cdda9914369 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -8,6 +8,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   cinnamon-settings-daemon = callPackage ./cinnamon-settings-daemon { };
   cjs = callPackage ./cjs { };
   nemo = callPackage ./nemo { };
+  mint-themes = callPackage ./mint-themes { };
   muffin = callPackage ./muffin { };
   xapps = callPackage ./xapps { };
 })
diff --git a/pkgs/desktops/cinnamon/mint-themes/default.nix b/pkgs/desktops/cinnamon/mint-themes/default.nix
new file mode 100644
index 000000000000..770baf77bcda
--- /dev/null
+++ b/pkgs/desktops/cinnamon/mint-themes/default.nix
@@ -0,0 +1,41 @@
+{ fetchFromGitHub
+, stdenv
+, python3
+, sassc
+, sass
+}:
+
+stdenv.mkDerivation rec {
+  pname = "mint-themes";
+  version = "1.8.0";
+
+  src = fetchFromGitHub {
+    owner = "linuxmint";
+    repo = pname;
+    rev = version;
+    sha256 = "0a8f2cmcl00y4607v5qr2zdcdjc0z74ixm2yakscvw6qzgsh9fac";
+  };
+
+  nativeBuildInputs = [
+    python3
+    sassc
+    sass
+  ];
+
+  preBuild = ''
+    patchShebangs .
+  '';
+
+  installPhase = ''
+    mkdir -p $out
+    mv usr/share $out
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/linuxmint/mint-themes";
+    description = "Mint-X and Mint-Y themes for the cinnamon desktop";
+    license = licenses.gpl3; # from debian/copyright
+    platforms = platforms.linux;
+    maintainers = [ maintainers.mkg20001 ];
+  };
+}

From 7f230a7fa6eb1c261a14cd1a2f260cccc3ad78d2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2020 20:40:00 +0000
Subject: [PATCH 3844/4636] pcm: 201902 -> 202003

---
 pkgs/os-specific/linux/pcm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix
index c00bd67f95c2..cc5c2efd46e6 100644
--- a/pkgs/os-specific/linux/pcm/default.nix
+++ b/pkgs/os-specific/linux/pcm/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "201902";
+  version = "202003";
   pname = "pcm";
 
   src = fetchFromGitHub {
     owner = "opcm";
     repo = "pcm";
     rev = version;
-    sha256 = "15kh5ry2w1zj2mbg98hlayw8g53jy79q2ixj2wm48g8vagamv77z";
+    sha256 = "1f83dhzrzgcyv5j5xxibvywvpg8sgf1g72f5x40cdb4149nwbfra";
   };
 
   installPhase = ''
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Processor counter monitor";
-    homepage = https://www.intel.com/software/pcm;
+    homepage = "https://www.intel.com/software/pcm";
     license = licenses.bsd3;
     maintainers = with maintainers; [ roosemberth ];
     platforms = [ "x86_64-linux" ];

From fca8961bdbb401dd39e4c5f57a3fb96b51d773ab Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 23 Mar 2020 19:46:22 +0100
Subject: [PATCH 3845/4636] Revert "chromiumDev: Add the missing clang-format
 binary"

This reverts commit 02ca096a85eced0d653004ae95f7cc6d8597b13e.

The clang-format binary is now included in the release tarball [0] and
we don't need to add it anymore. This fixes the following build error:
ln: failed to create symbolic link 'buildtools/linux64/clang-format': File exists
However, the build still fails a bit later in the configure phase.

[0]: https://bugs.chromium.org/p/chromium/issues/detail?id=1052503
---
 pkgs/applications/networking/browsers/chromium/common.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 9d7f529dad67..a5f79805aba3 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -7,7 +7,7 @@
 , xdg_utils, yasm, minizip, libwebp
 , libusb1, pciutils, nss, re2, zlib
 
-, python2Packages, perl, pkgconfig, clang-tools
+, python2Packages, perl, pkgconfig
 , nspr, systemd, kerberos
 , utillinux, alsaLib
 , bison, gperf
@@ -104,8 +104,6 @@ let
             result
        else result;
 
-  llvm-clang-tools = clang-tools.override { inherit llvmPackages; };
-
   base = rec {
     name = "${packageName}-unwrapped-${version}";
     inherit (upstream-info) channel version;
@@ -218,8 +216,6 @@ let
       ln -s ${stdenv.cc}/bin/clang              third_party/llvm-build/Release+Asserts/bin/clang
       ln -s ${stdenv.cc}/bin/clang++            third_party/llvm-build/Release+Asserts/bin/clang++
       ln -s ${llvmPackages.llvm}/bin/llvm-ar    third_party/llvm-build/Release+Asserts/bin/llvm-ar
-    '' + optionalString (stdenv.lib.versionAtLeast version "82") ''
-      ln -s ${llvm-clang-tools}/bin/clang-format buildtools/linux64/clang-format
     '';
 
     gnFlags = mkGnFlags ({

From c41fa7a6bd89a68e7d73efc20e8862beffda7928 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2020 21:33:39 +0000
Subject: [PATCH 3846/4636] rgbds: 0.3.9 -> 0.3.10

---
 pkgs/development/compilers/rgbds/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix
index bf2594b9bf4c..52d388beaed5 100644
--- a/pkgs/development/compilers/rgbds/default.nix
+++ b/pkgs/development/compilers/rgbds/default.nix
@@ -6,18 +6,18 @@
 
 stdenv.mkDerivation rec {
   pname = "rgbds";
-  version = "0.3.9";
+  version = "0.3.10";
   src = fetchFromGitHub {
     owner = "rednex";
     repo = "rgbds";
     rev = "v${version}";
-    sha256 = "0pzd9ig3ahpgq7jbj82grllxx1v01d620insr2m8h0c6jj25n5hv";
+    sha256 = "0752fbffxgxyf3jw2iij88l05dqhppgcxy7dvk82hp4wdg4cflpq";
   };
   nativeBuildInputs = [ bison flex pkg-config libpng ];
   installFlags = [ "PREFIX=\${out}" ];
 
   meta = with stdenv.lib; {
-    homepage = https://rednex.github.io/rgbds/;
+    homepage = "https://rednex.github.io/rgbds/";
     description = "A free assembler/linker package for the Game Boy and Game Boy Color";
     license = licenses.mit;
     longDescription =

From 05096867a5eeab95310b3dee408fe6802ba9e26b Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Mon, 23 Mar 2020 09:18:15 -0400
Subject: [PATCH 3847/4636] eclipses: 2019-12 -> 2020-03

---
 pkgs/applications/editors/eclipse/default.nix | 20 +++++++++----------
 pkgs/applications/editors/eclipse/plugins.nix | 12 +++++------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 4b3a7e11f3bb..345f7eae9fc6 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -13,10 +13,10 @@ assert stdenv ? glibc;
 
 let
   platform_major = "4";
-  platform_minor = "14";
-  year = "2019";
-  month = "12";
-  timestamp = "201912100610";
+  platform_minor = "15";
+  year = "2020";
+  month = "03";
+  timestamp = "${year}${month}050155";
 in rec {
 
   buildEclipse = import ./build-eclipse.nix {
@@ -32,8 +32,8 @@ in rec {
     description = "Eclipse IDE for C/C++ Developers";
     src =
       fetchurl {
-        url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
-        sha512 = "28h8z45j7zlcbvvabzsniwqls1lns21isx69y6l207a869rknp9vzg6506q6zalj9b49j8c7ynkn379xgbzp07i6zw3dzk3pqp2rgam";
+        url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-incubation-linux-gtk-x86_64.tar.gz";
+        sha512 = "2wy4a3p347fajr9zsfz1zlvz6jpy3vficdry27m5fs0azfmxmy2cfns5hh18sin4xqq3jvqppfqxh41rzcpcmiq12zhc6cz42brqgxw";
       };
   };
 
@@ -45,7 +45,7 @@ in rec {
     src =
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
-        sha512 = "1g1zsz3c2kx4vs1mjpcisbk81lk4hsr1z2fw46lih825c53vwf59snp8d97c8yw2i25y0ml48nc1nskib6qnif8m2h6rpah7kgmi8ay";
+        sha512 = "0qccsclay9000sqrymm8hkg70a4jcvd70vymw1kkxsklcs7dnrhch55an98gbzf9r0jgd1ap62a4hyxlnm6hdqqniwcgdza0i4nwwgj";
       };
   };
 
@@ -57,7 +57,7 @@ in rec {
     src =
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
-        sha512 = "05nsldw937l1g9fj964njivgkf2ipk1rh1jg5w8svdhpp3v1pp3iinfm2mz9kk8namwfkx8krsvsxcgvqyzgrkhf42wqh53vqrjf70h";
+        sha512 = "01rv5x7qqm0a2p30828z2snms3nb2kjx9si63sr5rdkdgr3vbh6xq8n8fn757dqazmpz9zskmwxxmbxnwycfllhgb8msb77pcy3fpg7";
       };
   };
 
@@ -87,7 +87,7 @@ in rec {
     src =
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz";
-        sha512 = "0dcbxzjqc27v1faz16yxqcm6zrbna4kkd32xy7paadiwn125y6ijx8zvda4kc7bih6v5b9ch2i0z5ndra1lcjcc88z6cklh0vngjkh1";
+        sha512 = "33ra8qslwz73240xzjvr751lpl94drlcf425a7kxngq1qla2cda7gxr71bxlr9fm2hrqq0h097ihmg0ix9hv2dmwnc76gp4hwwrlk41";
       };
   };
 
@@ -99,7 +99,7 @@ in rec {
     src =
       fetchurl {
         url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
-        sha512 = "21lhgv3z23mn8q0gffgxlfwhyxb348zjnzv716zsys7h7kj5vigl45q9mz0qrl11524rxx7jwi901jjd4l258w9kp7wzlq0d5n1r39m";
+        sha512 = "0ffa1q19z31j8i552mp9zg4v0p4iv002cvlzh49ia8hi0hgk75pbkp6vxlr75jz0as03n71f0ww8xbflji31qgwfmy6rs1rzqihfff9";
       };
   };
 
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 87c32c30e190..a60b1a2ae511 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -254,12 +254,12 @@ rec {
 
   cdt = buildEclipseUpdateSite rec {
     name = "cdt-${version}";
-    version = "9.10.0";
+    version = "9.11.0";
 
     src = fetchzip {
       stripRoot = false;
-      url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.10/${name}/${name}.zip";
-      sha256 = "11nbrcvgbg9l3cmp3v3y8y0vldzcf6qlpp185a6dzabdcij6gz5m";
+      url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.11/${name}/${name}.zip";
+      sha256 = "1730w6rbv649nzfalfd10p2ph0z9rbrrcflga0n1dpmg181xh9lk";
     };
 
     meta = with stdenv.lib; {
@@ -474,12 +474,12 @@ rec {
 
   jdt = buildEclipseUpdateSite rec {
     name = "jdt-${version}";
-    version = "4.14";
+    version = "4.15";
 
     src = fetchzip {
       stripRoot = false;
-      url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.14-201912100610/org.eclipse.jdt-4.14.zip;
-      sha256 = "1c2a23qviv58xljpq3yb37ra8cqw7jh52hmzqlg1nij2sdxb6hm5";
+      url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-${version}-202003050155/org.eclipse.jdt-${version}.zip";
+      sha256 = "1dm4qgfb6rm7w0dk8br071c7wy0ybp7zrwvr3i02c2bxzy2psz7q";
     };
 
     meta = with stdenv.lib; {

From 600f5444b4f13005eed3af2474c94d18827fcff7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 23 Mar 2020 20:06:38 -0300
Subject: [PATCH 3848/4636] iconpack-obsidian: 4.10 -> 4.11

---
 pkgs/data/icons/iconpack-obsidian/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/data/icons/iconpack-obsidian/default.nix
index 96514b6a4cda..c954af9e83dc 100644
--- a/pkgs/data/icons/iconpack-obsidian/default.nix
+++ b/pkgs/data/icons/iconpack-obsidian/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "iconpack-obsidian";
-  version = "4.10";
+  version = "4.11";
 
   src = fetchFromGitHub {
     owner = "madmaxms";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1imnbfrmizs0yx2165qj423y3m5vw9z33pqxmvhvs0rcwwddgqix";
+    sha256 = "18sqnrvh4bbmg3zzm78n4s2hvv8a77ilg7xa3hl94mp9qla6gasn";
   };
 
   nativeBuildInputs = [ gtk3 ];

From 0bfd0187dafe3f597355e6be16b7b9a5f4b90376 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 24 Mar 2020 01:21:17 +0100
Subject: [PATCH 3849/4636] parallel: 20200222 -> 202003222

https://fossies.org/diffs/parallel/20200222_vs_20200322/NEWS-diff.html
---
 pkgs/tools/misc/parallel/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 6c334db1ede8..77fdbcf8ac34 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,13 +1,15 @@
 { fetchurl, stdenv, perl, makeWrapper, procps }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20200222";
+  name = "parallel-20200322";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "077b72h2d191bmsb78fmzcynxj5mi5v3axmwwxz1d1q8xhv756r6";
+    sha256 = "0kg95glnfg25i1w7qg2vr5v4671vigsazmz4qdf223l64khq8x10";
   };
 
+  outputs = [ "out" "man" ];
+
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ perl procps ];
 

From d6273a59341c9715643d2c14ef8fda2bfa6975e0 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 24 Mar 2020 07:06:52 +1000
Subject: [PATCH 3850/4636] youtube-dl: 2020.03.08 -> 2020.03.24

https://github.com/ytdl-org/youtube-dl/releases/tag/2020.03.24
---
 pkgs/tools/misc/youtube-dl/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 2f875e01f3f8..7b58ccfa8531 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -10,7 +10,7 @@
 , rtmpSupport ? true
 , phantomjsSupport ? false
 , hlsEncryptedSupport ? true
-, makeWrapper }:
+, installShellFiles, makeWrapper }:
 
 buildPythonPackage rec {
 
@@ -18,14 +18,14 @@ buildPythonPackage rec {
   # The websites youtube-dl deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2020.03.08";
+  version = "2020.03.24";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1xbka14wnalcqkhibfcqw8f5bw1m9b1f44719yifv1jk0614q4bn";
+    sha256 = "05l4asakakxn53wrvxn6c03fd80zdizdbj6r2cj8c1ja3sj9i8s5";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ installShellFiles makeWrapper ];
   buildInputs = [ zip ] ++ lib.optional generateManPage pandoc;
   propagatedBuildInputs = lib.optional hlsEncryptedSupport pycryptodome;
 
@@ -46,8 +46,7 @@ buildPythonPackage rec {
   ];
 
   postInstall = ''
-    mkdir -p $out/share/zsh/site-functions
-    cp youtube-dl.zsh $out/share/zsh/site-functions/_youtube-dl
+    installShellCompletion youtube-dl.zsh
   '';
 
   # Requires network

From a9c9b0d40c9de6084b928e6e8d97b1abef553f35 Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Tue, 24 Mar 2020 03:04:42 +0000
Subject: [PATCH 3851/4636] vimPlugins: --update-redirects improvements.

In response to @timokau's review here are a couple changes:

- Decrease the fragility of the replacement code by normalizing
whitespace on each line.
- Throw an error when plugins are renamed rather than silently aliasing
to the new name.
---
 pkgs/misc/vim-plugins/aliases.nix | 11 +++++++----
 pkgs/misc/vim-plugins/update.py   |  5 +++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/vim-plugins/aliases.nix b/pkgs/misc/vim-plugins/aliases.nix
index e301d40874a8..627008a2aebf 100644
--- a/pkgs/misc/vim-plugins/aliases.nix
+++ b/pkgs/misc/vim-plugins/aliases.nix
@@ -30,6 +30,9 @@ let
                              (removeRecurseForDerivations
                               (checkInPkgs n alias)))
                      aliases;
+
+  deprecateName = oldName: newName:
+    throw "${oldName} was renamed to ${newName}. Please update to ${newName}.";
 in
 
 mapAliases {
@@ -68,7 +71,7 @@ mapAliases {
   ghcmod              = ghcmod-vim;
   goyo                = goyo-vim;
   Gist                = vim-gist;
-  gist-vim            = vim-gist; # backwards compat, added 2020-3-22
+  gist-vim            = deprecateName "vim-gist" "gist-vim"; # backwards compat, added 2020-3-22
   gitgutter           = vim-gitgutter;
   gundo               = gundo-vim;
   Gundo               = gundo-vim; # backwards compat, added 2015-10-03
@@ -126,17 +129,17 @@ mapAliases {
   unite               = unite-vim;
   UltiSnips           = ultisnips;
   vim-addon-vim2nix   = vim2nix;
-  vim-jade            = vim-pug; # backwards compat, added 2020-3-22
+  vim-jade            = deprecateName "vim-pug" "vim-jade"; # backwards compat, added 2020-3-22
   vimproc             = vimproc-vim;
   vimshell            = vimshell-vim;
   vinegar             = vim-vinegar;
-  vundle              = Vundle-vim; # backwards compat, added 2020-3-22
+  vundle              = deprecateName "Vundle-vim" "vundle"; # backwards compat, added 2020-3-22
   watchdogs           = vim-watchdogs;
   WebAPI              = webapi-vim;
   wombat256           = wombat256-vim; # backwards compat, added 2015-7-8
   yankring            = YankRing-vim;
   Yankring            = YankRing-vim;
-  youcompleteme       = YouCompleteMe; # backwards compat, added 2020-3-22
+  youcompleteme       = deprecateName "YouCompleteMe" "youcompleteme"; # backwards compat, added 2020-3-22
   xterm-color-table   = xterm-color-table-vim;
   zeavim              = zeavim-vim;
 }
diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
index 2a0688927114..9410f78be28a 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/misc/vim-plugins/update.py
@@ -419,6 +419,7 @@ in lib.fix' (lib.extends overrides packages)
 def update_redirects(input_file: Path, output_file: Path, redirects: dict):
     with fileinput.input(input_file, inplace=True) as f:
         for line in f:
+            line = " ".join(line.split())
             print(redirects.get(line, line), end="")
     print(
         f"""\
@@ -427,8 +428,8 @@ following steps:
     1. Go ahead and commit just the updated expressions as you intended to do:
             git add {output_file}
             git commit -m "vimPlugins: Update"
-    2. If any of the plugin names were changed, add the old names as aliases in
-    aliases.nix
+    2. If any of the plugin names were changed, throw an error in aliases.nix:
+            <oldName> = deprecateName "<oldName>" "<newName>"; # backwards compat, added YYYY-MM-DD
     3. Make sure the updated {input_file} is still correctly sorted:
             sort -udf ./vim-plugin-names > sorted && mv sorted vim-plugin-names
     4. Run this script again so these changes will be reflected in the

From d45abfa215933dc50f422300e070962e5b5ee0bd Mon Sep 17 00:00:00 2001
From: Serval <servalcat@pm.me>
Date: Tue, 24 Mar 2020 12:17:23 +0800
Subject: [PATCH 3852/4636] v2ray: 4.22.1 -> 4.23.0

---
 pkgs/tools/networking/v2ray/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/v2ray/default.nix b/pkgs/tools/networking/v2ray/default.nix
index 5d1cd4540d7f..762d68acdb1f 100644
--- a/pkgs/tools/networking/v2ray/default.nix
+++ b/pkgs/tools/networking/v2ray/default.nix
@@ -3,20 +3,20 @@
 , ... } @ args:
 
 callPackage ./generic.nix (rec {
-  version = "4.22.1";
+  version = "4.23.0";
 
   src = fetchFromGitHub {
     owner = "v2ray";
     repo = "v2ray-core";
     rev = "v${version}";
-    sha256 = "0l4rg9galjcm6dzv7sapnim9a02z7pv354mk5mwqndznii6nkr73";
+    sha256 = "0if53d1blj1wf572z21dsywx6czbmhs5dpccx5z1knjhh2xgg9lm";
   };
 
   assets = {
     # MIT licensed
     "geoip.dat" = let
-      geoipRev = "202001210102";
-      geoipSha256 = "1wxhrhrigjqzpy5w8yj7yd9ib245xwhqys2pf9prdknq71piyziz";
+      geoipRev = "202003180002";
+      geoipSha256 = "08d383phc5qk7glq25nkf1g8za38415x2952phy525ail88afpwl";
     in fetchurl {
       url = "https://github.com/v2ray/geoip/releases/download/${geoipRev}/geoip.dat";
       sha256 = geoipSha256;
@@ -24,8 +24,8 @@ callPackage ./generic.nix (rec {
 
     # MIT licensed
     "geosite.dat" = let
-      geositeRev = "202001211332";
-      geositeSha256 = "06qlbjxk21lhyh5l3pd8l4m9rdl7sjh2jriz51zihaqx4417f0m7";
+      geositeRev = "202003221514";
+      geositeSha256 = "1d4gv6714m97i57srrzybnmc4322qv5lypkqbmhcxb8bi4ljpf1m";
     in fetchurl {
       url = "https://github.com/v2ray/domain-list-community/releases/download/${geositeRev}/dlc.dat";
       sha256 = geositeSha256;

From c7ca23e7044c70dd1aef7d831b55a2935ab7beec Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 24 Mar 2020 04:25:18 +0000
Subject: [PATCH 3853/4636] dar: 2.6.8 -> 2.6.9

---
 pkgs/tools/backup/dar/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix
index c105c8086c49..a439bbf41b13 100644
--- a/pkgs/tools/backup/dar/default.nix
+++ b/pkgs/tools/backup/dar/default.nix
@@ -3,12 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "2.6.8";
+  version = "2.6.9";
   pname = "dar";
 
   src = fetchurl {
     url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz";
-    sha256 = "05mw6m054jklnxkxgf9fh4hx8ik1d8c18rfg3i55bnddk0vr8ra3";
+    sha256 = "1jzqq54w1dix2qdlj4hr9dpq9fnp23h102bk8d2gq6k7n2zgaj6v";
   };
 
   buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ]
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" ];
 
   meta = {
-    homepage = http://dar.linux.free.fr;
+    homepage = "http://dar.linux.free.fr";
     description = "Disk ARchiver, allows backing up files into indexed archives";
     license = licenses.gpl2;
     platforms = platforms.unix;

From d81848e7ca7d8745b9086cbba4cad1efc48aeaef Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Tue, 24 Mar 2020 01:20:23 -0400
Subject: [PATCH 3854/4636] as31: remove

I don't use this anymore and it's fairly obscure;
I don't think anyone else uses it, so remove it.
---
 pkgs/development/compilers/as31/default.nix | 40 ---------------------
 pkgs/top-level/all-packages.nix             |  2 --
 2 files changed, 42 deletions(-)
 delete mode 100644 pkgs/development/compilers/as31/default.nix

diff --git a/pkgs/development/compilers/as31/default.nix b/pkgs/development/compilers/as31/default.nix
deleted file mode 100644
index b70fde00e15e..000000000000
--- a/pkgs/development/compilers/as31/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchpatch, fetchurl, yacc }:
-
-let
-
-  version = "2.3.1";
-
-in stdenv.mkDerivation {
-  pname = "as31";
-  inherit version;
-  src = fetchurl {
-    name = "as31-${version}.tar.gz"; # Nix doesn't like the colons in the URL
-    url = "http://wiki.erazor-zone.de/_media/wiki:projects:linux:as31:as31-${version}.tar.gz";
-    sha256 = "0mbk6z7z03xb0r0ccyzlgkjdjmdzknck4yxxmgr9k7v8f5c348fd";
-  };
-
-  buildInputs = [ yacc ];
-
-  patches = [
-    (fetchpatch {
-       name = "CVE-2012-0808.patch";
-       url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=655496;filename=as31-mkstemps.patch;msg=5";
-       sha256 = "0iia4wa8m141bwz4588yxb1dp2qwhapcii382sncm6jvwyngwh21";
-     })
-  ];
-
-  preConfigure = ''
-    chmod +x ./configure
-  '';
-
-  postConfigure = ''
-    rm as31/parser.c
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://wiki.erazor-zone.de/wiki:projects:linux:as31;
-    description = "An 8031/8051 assembler by Ken Stauffer and Theo Deraadt which produces a variety of object code output formats";
-    maintainers = with maintainers; [ aneeshusa ];
-    platforms = with platforms; unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82550397ba38..968431befaf2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -708,8 +708,6 @@ in
 
   artyFX = callPackage ../applications/audio/artyFX {};
 
-  as31 = callPackage ../development/compilers/as31 {};
-
   owl-lisp = callPackage ../development/compilers/owl-lisp {};
 
   ascii = callPackage ../tools/text/ascii { };

From 7ff3e67bb26ac4ae3dbe08e7e98826b61a51d274 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Tue, 24 Mar 2020 01:20:53 -0400
Subject: [PATCH 3855/4636] impatience: remove aneeshusa from maintainers

---
 pkgs/desktops/gnome-3/extensions/impatience/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/extensions/impatience/default.nix b/pkgs/desktops/gnome-3/extensions/impatience/default.nix
index b36f3489b57c..c3ca1b621211 100644
--- a/pkgs/desktops/gnome-3/extensions/impatience/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/impatience/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Speed up builtin gnome-shell animations";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ aneeshusa timbertson tiramiseb ];
+    maintainers = with maintainers; [ timbertson tiramiseb ];
     homepage = http://gfxmonk.net/dist/0install/gnome-shell-impatience.xml;
   };
 }

From 56e5bbf07daadeeaa24faf3db1af661cfb0b195c Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Tue, 24 Mar 2020 01:21:10 -0400
Subject: [PATCH 3856/4636] system-monitor: remove aneeshusa as maintainer

---
 pkgs/desktops/gnome-3/extensions/system-monitor/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
index 13b2d6a1db4f..d14dbd1c4118 100644
--- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Display system informations in gnome shell status bar";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ aneeshusa tiramiseb ];
+    maintainers = with maintainers; [ tiramiseb ];
     homepage = https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet;
   };
 }

From 6736b8a39ac9f6dfc0ec22621df66bfd1af92bb2 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Tue, 24 Mar 2020 01:21:22 -0400
Subject: [PATCH 3857/4636] vagrant: remove aneeshusa as maintainer

---
 pkgs/development/tools/vagrant/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index ee8100128620..677fddd0f60a 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -118,7 +118,7 @@ in buildRubyGem rec {
     description = "A tool for building complete development environments";
     homepage = https://www.vagrantup.com/;
     license = licenses.mit;
-    maintainers = with maintainers; [ aneeshusa ma27 ];
+    maintainers = with maintainers; [ ma27 ];
     platforms = with platforms; linux ++ darwin;
   };
 }

From e6ffd4c8d19b2f2775d949debf74073d0af1594d Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Tue, 24 Mar 2020 01:21:33 -0400
Subject: [PATCH 3858/4636] radicale 1.x: remove aneeshusa as maintainer

---
 pkgs/servers/radicale/1.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/radicale/1.x.nix b/pkgs/servers/radicale/1.x.nix
index bfc681c921b9..83fa2506800f 100644
--- a/pkgs/servers/radicale/1.x.nix
+++ b/pkgs/servers/radicale/1.x.nix
@@ -29,6 +29,6 @@ pythonPackages.buildPythonApplication rec {
     '';
     license = licenses.gpl3Plus;
     platforms = platforms.all;
-    maintainers = with maintainers; [ edwtjo pSub aneeshusa ];
+    maintainers = with maintainers; [ edwtjo pSub ];
   };
 }

From db41c787f4ad85a29b291c544a843c829f123131 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 24 Mar 2020 01:21:43 -0400
Subject: [PATCH 3859/4636] pantheon.wingpanel-with-indicators: fix wrapping

Since #81475 this caused the wrapper to be empty of entries from
wrapGAppsHook because the wrapGAppsHook function doesn't add
them anymore, and was moved to gappsWrapperArgsHook. Instead
of just running that in postBuild it's more future proof to make this
use stdenv.mkDerivation because we want to mess around with the
generic builder.
---
 .../pantheon/desktop/wingpanel/wrapper.nix    | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
index 596ee816f891..ca887d45dc39 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix
@@ -1,7 +1,8 @@
 { lib
 , wrapGAppsHook
 , glib
-, symlinkJoin
+, stdenv
+, xorg
 , wingpanel
 , wingpanelIndicators
 , switchboard-with-plugs
@@ -15,30 +16,44 @@ let
     if indicators == null then wingpanelIndicators
     else indicators ++ (lib.optionals useDefaultIndicators wingpanelIndicators);
 in
-symlinkJoin {
+stdenv.mkDerivation rec {
   name = "${wingpanel.name}-with-indicators";
 
+  src = null;
+
   paths = [
     wingpanel
   ] ++ selectedIndicators;
 
-  buildInputs = [
+  passAsFile = [ "paths" ];
+
+  nativeBuildInputs = [
     glib
     wrapGAppsHook
-  ] ++ (lib.forEach selectedIndicators (x: x.buildInputs))
+  ];
+
+  buildInputs = lib.forEach selectedIndicators (x: x.buildInputs)
     ++ selectedIndicators;
 
-  # We have to set SWITCHBOARD_PLUGS_PATH because wingpanel-applications-menu
-  # has a plugin to search switchboard settings
-  postBuild = ''
-    make_glib_find_gsettings_schemas
+  dontUnpack = true;
+  dontConfigure = true;
+  dontBuild = true;
 
+  preferLocalBuild = true;
+  allowSubstitutes = false;
+
+  installPhase = ''
+    mkdir -p $out
+    for i in $(cat $pathsPath); do
+      ${xorg.lndir}/bin/lndir -silent $i $out
+    done
+  '';
+
+  preFixup = ''
     gappsWrapperArgs+=(
       --set WINGPANEL_INDICATORS_PATH "$out/lib/wingpanel"
       --set SWITCHBOARD_PLUGS_PATH "${switchboard-with-plugs}/lib/switchboard"
     )
-
-    wrapGAppsHook
   '';
 
   inherit (wingpanel) meta;

From a9e7e9331152c7528155038c634201a5e1c5fc67 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Tue, 24 Mar 2020 03:11:55 -0400
Subject: [PATCH 3860/4636] pantheon.switchboard-with-plugs: fix wrapping

Since #81475 this caused the wrapper to be empty of entries from
wrapGAppsHook because the wrapGAppsHook function doesn't add
them anymore, and was moved to gappsWrapperArgsHook. Instead
of just running that in postBuild it's more future proof to make this
use stdenv.mkDerivation because we want to mess around with the
generic builder.
---
 .../pantheon/apps/switchboard/wrapper.nix     | 38 ++++++++++++++-----
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
index cc6b37095fdb..67f4105ff3d1 100644
--- a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix
@@ -1,7 +1,8 @@
 { wrapGAppsHook
 , glib
 , lib
-, symlinkJoin
+, stdenv
+, xorg
 , switchboard
 , switchboardPlugs
 , plugs
@@ -14,26 +15,45 @@ let
     if plugs == null then switchboardPlugs
     else plugs ++ (lib.optionals useDefaultPlugs switchboardPlugs);
 in
-symlinkJoin {
+stdenv.mkDerivation rec {
   name = "${switchboard.name}-with-plugs";
 
+  src = null;
+
   paths = [
     switchboard
   ] ++ selectedPlugs;
 
-  buildInputs = [
-    wrapGAppsHook
+  passAsFile = [ "paths" ];
+
+  nativeBuildInputs = [
     glib
-  ] ++ (lib.forEach selectedPlugs (x: x.buildInputs))
+    wrapGAppsHook
+  ];
+
+  buildInputs = lib.forEach selectedPlugs (x: x.buildInputs)
     ++ selectedPlugs;
 
-  postBuild = ''
-    make_glib_find_gsettings_schemas
+  dontUnpack = true;
+  dontConfigure = true;
+  dontBuild = true;
 
-    gappsWrapperArgs+=(--set SWITCHBOARD_PLUGS_PATH "$out/lib/switchboard")
+  preferLocalBuild = true;
+  allowSubstitutes = false;
 
-    wrapGAppsHook
+  installPhase = ''
+    mkdir -p $out
+    for i in $(cat $pathsPath); do
+      ${xorg.lndir}/bin/lndir -silent $i $out
+    done
+  '';
+
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --set SWITCHBOARD_PLUGS_PATH "$out/lib/switchboard"
+    )
   '';
 
   inherit (switchboard) meta;
 }
+

From ab049eef082621956d14f6e8302c968c7c04b699 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 24 Mar 2020 09:12:58 +0000
Subject: [PATCH 3861/4636] gitAndTools.git-filter-repo: 2.25.0 -> 2.26.0

---
 .../git-and-tools/git-filter-repo/default.nix                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix
index af21296cffa4..0439669f9da5 100644
--- a/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "git-filter-repo";
-  version = "2.25.0";
+  version = "2.26.0";
 
   src = fetchurl {
     url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz";
-    sha256 = "1772if8ajaw80dsdw4ic6vjw24dq0b9w87qlkn0iw4b8r9yxp37a";
+    sha256 = "15d07i66b090bhjfj9s4s2s38k75mhxmddzyn44bnnyb967w6yjk";
   };
 
   buildInputs = [ pythonPackages.python ];

From f174ada91d7f04afe6e43ee53458fd3c4c9512f6 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 24 Mar 2020 04:20:00 -0500
Subject: [PATCH 3862/4636] lxc: 3.2.1 -> 4.0.0

---
 pkgs/os-specific/linux/lxc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index fff66fe328a5..741d4ab14820 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -9,11 +9,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "lxc";
-  version = "3.2.1";
+  version = "4.0.0";
 
   src = fetchurl {
     url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz";
-    sha256 = "1m633j5k700nsc3smca7fxqfhxhypxbamh18x9z60zdilj33k42z";
+    sha256 = "1x63nbfsicqxckq62ga3k0g8fm4qgcpn45ianj6m7rvw4lnaxwxk";
   };
 
   nativeBuildInputs = [

From 237a07a7d5ecec4df5d81ba1d0f187f51f8656bb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 24 Mar 2020 04:20:00 -0500
Subject: [PATCH 3863/4636] wal-g: 0.2.14 -> 0.2.15

Changelog: https://github.com/wal-g/wal-g/releases/tag/v0.2.15
---
 pkgs/tools/backup/wal-g/default.nix |  26 +-
 pkgs/tools/backup/wal-g/deps.nix    | 588 ----------------------------
 pkgs/top-level/all-packages.nix     |   4 +-
 3 files changed, 15 insertions(+), 603 deletions(-)
 delete mode 100644 pkgs/tools/backup/wal-g/deps.nix

diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix
index 90ce2d188d6e..e5ed04bb4a1c 100644
--- a/pkgs/tools/backup/wal-g/default.nix
+++ b/pkgs/tools/backup/wal-g/default.nix
@@ -1,30 +1,28 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, brotli }:
+{ stdenv, buildGoModule, fetchFromGitHub, brotli, Security }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "wal-g";
-  version = "0.2.14";
+  version = "0.2.15";
 
   src = fetchFromGitHub {
-    owner  = "wal-g";
-    repo   = "wal-g";
-    rev    = "v${version}";
-    sha256 = "0rrn9kzcg3nw9qvzy58m4qacghv0pj7iyjh4yspc71n5nkamkfgm";
+    owner = "wal-g";
+    repo = "wal-g";
+    rev = "v${version}";
+    sha256 = "1hslhs9i4wib6c74gdq9yail958ff1y11pymjww2xr84wkwd9v7i";
   };
 
-  buildInputs = [ brotli ];
+  modSha256 = "0kwl5gwc5gc0cq2gldg13nvswp9wd90xiv1qb3g8yxcczywkpmrm";
+
+  buildInputs = [ brotli ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
   doCheck = true;
 
-  goPackagePath = "github.com/wal-g/wal-g";
-
-  goDeps = ./deps.nix;
-
   subPackages = [ "main/pg" ];
 
-  buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/cmd/pg.WalgVersion=${version} -X ${goPackagePath}/cmd/pg.GitRevision=${src.rev}" ];
+  buildFlagsArray = [ "-ldflags=-s -w -X github.com/wal-g/wal-g/cmd/pg.WalgVersion=${version} -X github.com/wal-g/wal-g/cmd/pg.GitRevision=${src.rev}" ];
 
   postInstall = ''
-    mv $bin/bin/pg $bin/bin/wal-g
+    mv $out/bin/pg $out/bin/wal-g
   '';
 
   meta = {
diff --git a/pkgs/tools/backup/wal-g/deps.nix b/pkgs/tools/backup/wal-g/deps.nix
deleted file mode 100644
index 13daf375c31a..000000000000
--- a/pkgs/tools/backup/wal-g/deps.nix
+++ /dev/null
@@ -1,588 +0,0 @@
-# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
-[
-  {
-    goPackagePath  = "cloud.google.com/go";
-    fetch = {
-      type = "git";
-      url = "https://code.googlesource.com/gocloud";
-      rev =  "0ebda48a7f143b1cce9eb37a8c1106ac762a3430";
-      sha256 = "1kclgclwar3r37zbvb9gg3qxbgzkb50zk3s9778zlh2773qikmai";
-    };
-  }
-  {
-    goPackagePath  = "github.com/Azure/azure-pipeline-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Azure/azure-pipeline-go";
-      rev =  "232aee85e8e3a6223a11c0943f7df2ae0fac00e4";
-      sha256 = "1agn2nzmm1dkwggm4w7h4bnrav4n5jrl0vqbqy2s49vqlr8zirn6";
-    };
-  }
-  {
-    goPackagePath  = "github.com/Azure/azure-storage-blob-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Azure/azure-storage-blob-go";
-      rev =  "fc700035fe4a7020f50d49f420b3c088aed57e03";
-      sha256 = "00gsnk9s1rlrakqvcm917hn4r47jannxwp7rkhrb71pamzm46752";
-    };
-  }
-  {
-    goPackagePath  = "github.com/BurntSushi/toml";
-    fetch = {
-      type = "git";
-      url = "https://github.com/BurntSushi/toml";
-      rev =  "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005";
-      sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
-    };
-  }
-  {
-    goPackagePath  = "github.com/DataDog/zstd";
-    fetch = {
-      type = "git";
-      url = "https://github.com/DataDog/zstd";
-      rev =  "aebefd9fcb99f22cd691ef778a12ed68f0e6a1ab";
-      sha256 = "06wphl43ji23c0cmmm6fd3wszbwq36mdp1jarak2a6hmxl6yf0b8";
-    };
-  }
-  {
-    goPackagePath  = "github.com/RoaringBitmap/roaring";
-    fetch = {
-      type = "git";
-      url = "https://github.com/RoaringBitmap/roaring";
-      rev =  "3d677d3262197ee558b85029301eb69b8239f91a";
-      sha256 = "0v5jbqr7m4x7n8rxcyizhs21ndyinn8kil9hd6y2bifx9b9g6gv9";
-    };
-  }
-  {
-    goPackagePath  = "github.com/aws/aws-sdk-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/aws/aws-sdk-go";
-      rev =  "02973e4916ed10f78aff1257f45f01d23907a05d";
-      sha256 = "0w5c06l0f8h77p74gmsp2wzl21pcn92yzsycd36746qqav83yyld";
-    };
-  }
-  {
-    goPackagePath  = "github.com/cyberdelia/lzo";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cyberdelia/lzo";
-      rev =  "feb520148d8940294afb1e242dc1d2a7c9c34432";
-      sha256 = "0mk93b7vr9hp1xcvzaw5r01zs2blhk24m22pacf6sx5zwx8fd2ld";
-    };
-  }
-  {
-    goPackagePath  = "github.com/davecgh/go-spew";
-    fetch = {
-      type = "git";
-      url = "https://github.com/davecgh/go-spew";
-      rev =  "8991bc29aa16c548c550c7ff78260e27b9ab7c73";
-      sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
-    };
-  }
-  {
-    goPackagePath  = "github.com/fsnotify/fsnotify";
-    fetch = {
-      type = "git";
-      url = "https://github.com/fsnotify/fsnotify";
-      rev =  "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
-      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
-    };
-  }
-  {
-    goPackagePath  = "github.com/glycerine/go-unsnap-stream";
-    fetch = {
-      type = "git";
-      url = "https://github.com/glycerine/go-unsnap-stream";
-      rev =  "9f0cb55181dd3a0a4c168d3dbc72d4aca4853126";
-      sha256 = "1v10z30y9qc8dl34x0s8lr773g6raxilfdxbmzd1176pspzcmm9n";
-    };
-  }
-  {
-    goPackagePath  = "github.com/go-redis/redis";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-redis/redis";
-      rev =  "75795aa4236dc7341eefac3bbe945e68c99ef9df";
-      sha256 = "1qf7zl5slnc4bcz0z0vn4fq1pwkphdrmqmjg3wv5q6pv2x29drli";
-    };
-  }
-  {
-    goPackagePath  = "github.com/go-sql-driver/mysql";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-sql-driver/mysql";
-      rev =  "72cd26f257d44c1114970e19afddcd812016007e";
-      sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1";
-    };
-  }
-  {
-    goPackagePath  = "github.com/golang/mock";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/mock";
-      rev =  "51421b967af1f557f93a59e0057aaf15ca02e29c";
-      sha256 = "12ddj2g8ab87id6n2n67vnbhq6p8dvgsq1pzpqfriym4dk8w54fg";
-    };
-  }
-  {
-    goPackagePath  = "github.com/golang/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/protobuf";
-      rev =  "6c65a5562fc06764971b7c5d05c76c75e84bdbf7";
-      sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym";
-    };
-  }
-  {
-    goPackagePath  = "github.com/golang/snappy";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/snappy";
-      rev =  "2e65f85255dbc3072edf28d6b5b8efc472979f5a";
-      sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf";
-    };
-  }
-  {
-    goPackagePath  = "github.com/google/brotli";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/brotli";
-      rev =  "d6d98957ca8ccb1ef45922e978bb10efca0ea541";
-      sha256 = "0n0ia2sxsj3fnnzhjbigbadpsqxivjs3v78b1xzqvgd1nwalglaj";
-    };
-  }
-  {
-    goPackagePath  = "github.com/googleapis/gax-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/googleapis/gax-go";
-      rev =  "bd5b16380fd03dc758d11cef74ba2e3bc8b0e8c2";
-      sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx";
-    };
-  }
-  {
-    goPackagePath  = "github.com/hashicorp/golang-lru";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/golang-lru";
-      rev =  "7f827b33c0f158ec5dfbba01bb0b14a4541fd81d";
-      sha256 = "1p2igd58xkm8yaj2c2wxiplkf2hj6kxwrg6ss7mx61s5rd71v5xb";
-    };
-  }
-  {
-    goPackagePath  = "github.com/hashicorp/hcl";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/hcl";
-      rev =  "8cb6e5b959231cc1119e43259c4a608f9c51a241";
-      sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66";
-    };
-  }
-  {
-    goPackagePath  = "github.com/inconshreveable/mousetrap";
-    fetch = {
-      type = "git";
-      url = "https://github.com/inconshreveable/mousetrap";
-      rev =  "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
-      sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
-    };
-  }
-  {
-    goPackagePath  = "github.com/jackc/pgx";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jackc/pgx";
-      rev =  "c73e7d75061bb42b0282945710f344cfe1113d10";
-      sha256 = "1am1iggch89mn4a99bxnawjhc5yrgd8fjlmzq0b9l9qy5w1gzr1f";
-    };
-  }
-  {
-    goPackagePath  = "github.com/jedib0t/go-pretty";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jedib0t/go-pretty";
-      rev =  "a37e1e030434d93557ca8a6a77b4cf9d31cc21ff";
-      sha256 = "057xwrrqq0cvyq9f0wnfzjpx10807520vl92qq7l7a7s0r56jyrx";
-    };
-  }
-  {
-    goPackagePath  = "github.com/jmespath/go-jmespath";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jmespath/go-jmespath";
-      rev =  "c2b33e84";
-      sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz";
-    };
-  }
-  {
-    goPackagePath  = "github.com/magiconair/properties";
-    fetch = {
-      type = "git";
-      url = "https://github.com/magiconair/properties";
-      rev =  "c2353362d570a7bfa228149c62842019201cfb71";
-      sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mattn/go-ieproxy";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-ieproxy";
-      rev =  "f9202b1cfdeb0c82ddd3dc1e8e9cd94b3c0c1b13";
-      sha256 = "0r8c17znlv32750qy3p96fbyp8ys8xfdccpzv0z9lr2y88jnzhpz";
-    };
-  }
-  {
-    goPackagePath  = "github.com/minio/sio";
-    fetch = {
-      type = "git";
-      url = "https://github.com/minio/sio";
-      rev =  "035b4ef8c449ba2ba21ec143c91964e76a1fb68c";
-      sha256 = "007mh7a61qzgf8ga4pix6qhm6jbph3h71a8iif7l45mvqphabh0z";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mitchellh/mapstructure";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mitchellh/mapstructure";
-      rev =  "3536a929edddb9a5b34bd6861dc4a9647cb459fe";
-      sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mschoch/smat";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mschoch/smat";
-      rev =  "90eadee771aeab36e8bf796039b8c261bebebe4f";
-      sha256 = "141saq6d4z3c7v3jw45zy4gn6wwjlyralqygjff1fzvz1gkvimk3";
-    };
-  }
-  {
-    goPackagePath  = "github.com/ncw/swift";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ncw/swift";
-      rev =  "f737f4e00462f79ff2e0ddbcfb09331ce7ec4fa9";
-      sha256 = "0c6vcn3dmhh339wilh71fmjb535kgfkf9dh2dh8ln43whq6mbjbs";
-    };
-  }
-  {
-    goPackagePath  = "github.com/pelletier/go-toml";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pelletier/go-toml";
-      rev =  "c01d1270ff3e442a8a57cddc1c92dc1138598194";
-      sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
-    };
-  }
-  {
-    goPackagePath  = "github.com/philhofer/fwd";
-    fetch = {
-      type = "git";
-      url = "https://github.com/philhofer/fwd";
-      rev =  "bb6d471dc95d4fe11e432687f8b70ff496cf3136";
-      sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2";
-    };
-  }
-  {
-    goPackagePath  = "github.com/pierrec/lz4";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pierrec/lz4";
-      rev =  "5a3d2245f97fc249850e7802e3c01fad02a1c316";
-      sha256 = "1my03x0m72vc2xyy9h0naa1qrzcf0g531gh4cakcwpxrq0z39vmr";
-    };
-  }
-  {
-    goPackagePath  = "github.com/pierrec/xxHash";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pierrec/xxHash";
-      rev =  "d17cb990ad2d219d5901415ceaeb50d17df59527";
-      sha256 = "07rbr0apyq9m8m2knf1j7g9299r2v2ihvig1b7bq2srszcd9r221";
-    };
-  }
-  {
-    goPackagePath  = "github.com/pkg/errors";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pkg/errors";
-      rev =  "ba968bfe8b2f7e042a574c888954fccecfa385b4";
-      sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
-    };
-  }
-  {
-    goPackagePath  = "github.com/pmezard/go-difflib";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pmezard/go-difflib";
-      rev =  "792786c7400a136282c1664665ae0a8db921c6c2";
-      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
-    };
-  }
-  {
-    goPackagePath  = "github.com/spf13/afero";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/afero";
-      rev =  "f4711e4db9e9a1d3887343acb72b2bbfc2f686f5";
-      sha256 = "14qqj0cz6a595vn4dp747vddx05fd77jdsyl85qjmf9baymaxlam";
-    };
-  }
-  {
-    goPackagePath  = "github.com/spf13/cast";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/cast";
-      rev =  "8c9545af88b134710ab1cd196795e7f2388358d7";
-      sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5";
-    };
-  }
-  {
-    goPackagePath  = "github.com/spf13/cobra";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/cobra";
-      rev =  "ef82de70bb3f60c65fb8eebacbb2d122ef517385";
-      sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd";
-    };
-  }
-  {
-    goPackagePath  = "github.com/spf13/jwalterweatherman";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/jwalterweatherman";
-      rev =  "94f6ae3ed3bceceafa716478c5fbf8d29ca601a1";
-      sha256 = "1ywmkwci5zyd88ijym6f30fj5c0k2yayxarkmnazf5ybljv50q7b";
-    };
-  }
-  {
-    goPackagePath  = "github.com/spf13/pflag";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/pflag";
-      rev =  "298182f68c66c05229eb03ac171abe6e309ee79a";
-      sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd";
-    };
-  }
-  {
-    goPackagePath  = "github.com/spf13/viper";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/viper";
-      rev =  "6d33b5a963d922d182c91e8a1c88d81fd150cfd4";
-      sha256 = "1190mg04718r03qriav99sf4kx2n7wdgr8vdni15f74bpbzrdjrl";
-    };
-  }
-  {
-    goPackagePath  = "github.com/stretchr/testify";
-    fetch = {
-      type = "git";
-      url = "https://github.com/stretchr/testify";
-      rev =  "221dbe5ed46703ee255b1da0dec05086f5035f62";
-      sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb";
-    };
-  }
-  {
-    goPackagePath  = "github.com/tinsane/tracelog";
-    fetch = {
-      type = "git";
-      url = "https://github.com/tinsane/tracelog";
-      rev =  "05cb843fbac1d7693bbbbed8aa8f7b401438ee7f";
-      sha256 = "1fry633qi4iih9za91m90c26p3qpd79d716dggk10cbc0bpvql51";
-    };
-  }
-  {
-    goPackagePath  = "github.com/tinylib/msgp";
-    fetch = {
-      type = "git";
-      url = "https://github.com/tinylib/msgp";
-      rev =  "b2b6a672cf1e5b90748f79b8b81fc8c5cf0571a1";
-      sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc";
-    };
-  }
-  {
-    goPackagePath  = "github.com/ulikunitz/xz";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ulikunitz/xz";
-      rev =  "590df8077fbcb06ad62d7714da06c00e5dd2316d";
-      sha256 = "07mivr4aiw3b8qzwajsxyjlpbkf3my4xx23lv0yryc4pciam5lhy";
-    };
-  }
-  {
-    goPackagePath  = "github.com/wal-g/storages";
-    fetch = {
-      type = "git";
-      url = "https://github.com/wal-g/storages";
-      rev =  "ecd376af8972cd9c3e355831c126a7862de6b2b9";
-      sha256 = "1jmvin93811xxh9sqf6xrrys55dm12zszqf2l3arf92h0bysvniy";
-    };
-  }
-  {
-    goPackagePath  = "github.com/willf/bitset";
-    fetch = {
-      type = "git";
-      url = "https://github.com/willf/bitset";
-      rev =  "e553b05586428962bf7058d1044519d87ca72d74";
-      sha256 = "0davmxzv79qqg7lkj89diqinqx3xkr94d67yfnazqn3h1f7sjkd1";
-    };
-  }
-  {
-    goPackagePath  = "go.opencensus.io";
-    fetch = {
-      type = "git";
-      url = "https://github.com/census-instrumentation/opencensus-go";
-      rev =  "9c377598961b706d1542bd2d84d538b5094d596e";
-      sha256 = "05jr8gkr2w34i5wwki4zhl5ch0qrgi7cdgag5iy5gpxplhbrvbg9";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev =  "e657309f52e71501f9934566ac06dc5c2f7f11a1";
-      sha256 = "17jwkjrfj7kz25z8z492xlz88nmb42kpjcxl9dsv5jl28zvzq1bj";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/exp";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/exp";
-      rev =  "ec7cb31e5a562f5e9e31b300128d2f530f55d127";
-      sha256 = "19b4kdwfahq9f809v4lmn9h47sq1y67nkl7csnracn5qd334hp06";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/lint";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/lint";
-      rev =  "959b441ac422379a43da2230f62be024250818b0";
-      sha256 = "1mgcv5f00pkzsbwnq2y7vqvd1b4lr5a3s47cphh2qv4indfk7pck";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev =  "74dc4d7220e7acc4e100824340f3e66577424772";
-      sha256 = "0563yswwqknxx2gsvl0qikn0lmwalilbng8i12iw4d3v40n23s0l";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/oauth2";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/oauth2";
-      rev =  "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33";
-      sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/sync";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sync";
-      rev =  "42b317875d0fa942474b76e1b46a6060d720ae6e";
-      sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev =  "4d1cda033e0619309c606fc686de3adcf599539e";
-      sha256 = "1wgaldbnkmh568v8kkgvnmkskaj96fqrbzhx23yji2kh1432q6gh";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/text";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/text";
-      rev =  "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
-      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/time";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/time";
-      rev =  "85acf8d2951cb2a3bde7632f9ff273ef0379bcbd";
-      sha256 = "0yqnxsrarjk4qkda8kcxzmk7y90kkkxzx9iwryzrk7bzs87ky3xc";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/tools";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/tools";
-      rev =  "fc82fb2afd64396b05ea9aa0bccd6e8f2257b154";
-      sha256 = "1rnpbhhcnv28k63m7biv2rxrmdxhz9q3p35qi0phcq2qhcf78032";
-    };
-  }
-  {
-    goPackagePath  = "google.golang.org/api";
-    fetch = {
-      type = "git";
-      url = "https://code.googlesource.com/google-api-go-client";
-      rev =  "feb0267beb8644f5088a03be4d5ec3f8c7020152";
-      sha256 = "1lzdzkd2i41v6amxs9jah1q44qbvf1yvm8906jpfjiq6c3ffhqss";
-    };
-  }
-  {
-    goPackagePath  = "google.golang.org/appengine";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/appengine";
-      rev =  "4a4468ece617fc8205e99368fa2200e9d1fad421";
-      sha256 = "13cyhqwmvc2nia4ssdwwdzscq52aj3z9zjikx17wk4kb0j8vr370";
-    };
-  }
-  {
-    goPackagePath  = "google.golang.org/genproto";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/go-genproto";
-      rev =  "24fa4b261c55da65468f2abfdae2b024eef27dfb";
-      sha256 = "109zhaqlfd8zkbr1hk6zqbs6vcxfrk64scjwh2nswph05gr0m84d";
-    };
-  }
-  {
-    goPackagePath  = "google.golang.org/grpc";
-    fetch = {
-      type = "git";
-      url = "https://github.com/grpc/grpc-go";
-      rev =  "6eaf6f47437a6b4e2153a190160ef39a92c7eceb";
-      sha256 = "1cn33r2gclmq2v1ndpf1n5bmhf2qs8mms7ii5cnl6f9ch4r2c4k3";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/yaml.v2";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-yaml/yaml";
-      rev =  "51d6538a90f86fe93ac480b35f37b2be17fef232";
-      sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
-    };
-  }
-  {
-    goPackagePath  = "honnef.co/go/tools";
-    fetch = {
-      type = "git";
-      url = "https://github.com/dominikh/go-tools";
-      rev =  "72554cb117ad340748b3093e7108983fd984c9f2";
-      sha256 = "1vndpwg797z2gw9h9378iq99aqy7nalqx82lgvcsaqnkypdmppnd";
-    };
-  }
-]
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25ed4da94c14..f6c8b28b4928 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26414,7 +26414,9 @@ in
 
   dsniff = callPackage ../tools/networking/dsniff {};
 
-  wal-g = callPackage ../tools/backup/wal-g {};
+  wal-g = callPackage ../tools/backup/wal-g {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   tlwg = callPackage ../data/fonts/tlwg { };
 

From d85b0f745ea1d6989387830749e415f7e5588827 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 24 Mar 2020 04:20:00 -0500
Subject: [PATCH 3864/4636] lxd: 3.22 -> 3.23

Release notes: https://discuss.linuxcontainers.org/t/lxd-3-23-has-been-released/7140
---
 pkgs/tools/admin/lxd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
index c7c2881a567a..efd6db395f20 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -9,13 +9,13 @@
 
 buildGoPackage rec {
   pname = "lxd";
-  version = "3.22";
+  version = "3.23";
 
   goPackagePath = "github.com/lxc/lxd";
 
   src = fetchurl {
     url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
-    sha256 = "1j60xajcycqnnkasbghcvx3dvb5iadvvq2l3hh9i0sw3dk1wx4hn";
+    sha256 = "1zbm736m9g4c40r55s6rg3xrgw9bysslr992sa80vlrxfmwfiqg4";
   };
 
   preBuild = ''

From 898a3bf0063323d7ce682cd8cae6a74f5adec36d Mon Sep 17 00:00:00 2001
From: Olli Helenius <liff@iki.fi>
Date: Tue, 24 Mar 2020 11:26:24 +0200
Subject: [PATCH 3865/4636] teams: 1.3.00.958 -> 1.3.00.5153

---
 .../networking/instant-messengers/teams/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix
index ef7e3717f728..63d922ab2994 100644
--- a/pkgs/applications/networking/instant-messengers/teams/default.nix
+++ b/pkgs/applications/networking/instant-messengers/teams/default.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation rec {
   pname = "teams";
-  version = "1.3.00.958";
+  version = "1.3.00.5153";
 
   src = fetchurl {
     url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb";
-    sha256 = "015awxgbwk4j973jnxj7q3i8csx7wnwpwp5g4jlmn7z8fxwy83d5";
+    sha256 = "13c7fmij0gcg6mrjjj2mhs21q7fzdssscwhihzyrmbmj64cd0a69";
   };
 
   nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook ];

From 83b3cb8b73f39df1f9d0478fbe0443d91225daf3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 24 Mar 2020 09:30:20 +0000
Subject: [PATCH 3866/4636] ipmiutil: 3.1.5 -> 3.1.6

---
 pkgs/tools/system/ipmiutil/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix
index 0d2a78efba12..17c28b3cd420 100644
--- a/pkgs/tools/system/ipmiutil/default.nix
+++ b/pkgs/tools/system/ipmiutil/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   baseName = "ipmiutil";
-  version = "3.1.5";
+  version = "3.1.6";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
-    sha256 = "18q1nc2caaixy3dr2axdvwq37iz916piarvmg0jdfzaxfpaxpk2q";
+    sha256 = "0jlfb4firph3hc0854n7cw7yjwlax3wdxn37r2jl0l94dj684548";
   };
 
   buildInputs = [ openssl ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An easy-to-use IPMI server management utility";
-    homepage = http://ipmiutil.sourceforge.net/;
+    homepage = "http://ipmiutil.sourceforge.net/";
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
     license = licenses.bsd3;

From b3412865ce1db90fca65274024395ca00cf13e6d Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 24 Mar 2020 09:57:25 +0000
Subject: [PATCH 3867/4636] python: pip-tools: 4.3.0 -> 4.5.1

test_get_file_hash_without_interfering_with_each_other depends on internet access.
---
 pkgs/development/python-modules/pip-tools/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index 0a8d679ae5f9..20a42cddcf9c 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "pip-tools";
-  version = "4.3.0";
+  version = "4.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0x36mp3a3f3wandfc0g8d53gg2jkc14nhisbryzspcl9f05sbvq6";
+    sha256 = "166crncd9zrk9wgk9dss9968mx2c1dzj80sjnaqrcmw7a7j30gv9";
   };
 
   LC_ALL = "en_US.UTF-8";
@@ -27,6 +27,7 @@ buildPythonPackage rec {
     "test_generate_hashes_with_editable"
     "test_generate_hashes_with_url"
     "test_generate_hashes_without_interfering_with_each_other"
+    "test_get_file_hash_without_interfering_with_each_other"
     "test_get_hashes_local_repository_cache_miss"
     "test_realistic_complex_sub_dependencies"
     "test_stdin"

From 3f5fd762de790ecf4b4c4a2525f040b9bd051411 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Tue, 24 Mar 2020 11:11:15 +0100
Subject: [PATCH 3868/4636] dnscontrol: init at 3.0.0.

---
 .../networking/dnscontrol/default.nix         |   24 +
 .../networking/dnscontrol/deps.nix            | 1236 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |    2 +
 3 files changed, 1262 insertions(+)
 create mode 100644 pkgs/applications/networking/dnscontrol/default.nix
 create mode 100644 pkgs/applications/networking/dnscontrol/deps.nix

diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix
new file mode 100644
index 000000000000..bdca68ce07d2
--- /dev/null
+++ b/pkgs/applications/networking/dnscontrol/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, buildGoPackage}:
+  
+buildGoPackage rec {
+  pname = "dnscontrol";
+  version = "3.0.0";
+
+  goPackagePath = "github.com/StackExchange/dnscontrol";
+
+   goDeps = ./deps.nix;
+
+  src = fetchFromGitHub {
+    owner = "StackExchange";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1j8i4k7bqkqmi6dmc9fxfab49a7qigig72rlbga902lw336p6cc7";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Synchronize your DNS to multiple providers from a simple DSL";
+    homepage = "https://stackexchange.github.io/dnscontrol/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ mmahut ];
+  };
+}
diff --git a/pkgs/applications/networking/dnscontrol/deps.nix b/pkgs/applications/networking/dnscontrol/deps.nix
new file mode 100644
index 000000000000..55cb5daa18f8
--- /dev/null
+++ b/pkgs/applications/networking/dnscontrol/deps.nix
@@ -0,0 +1,1236 @@
+# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
+[
+  {
+    goPackagePath = "cloud.google.com/go";
+    fetch = {
+      type = "git";
+      url = "https://code.googlesource.com/gocloud";
+      rev = "335e9e09b93e";
+      sha256 = "1aiglr6d2369nf3s9ig1kc0nixsivcmh7p1fyzkcf6n6ql0p2zsm";
+    };
+  }
+  {
+    goPackagePath = "github.com/Azure/azure-sdk-for-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Azure/azure-sdk-for-go";
+      rev = "v39.1.0";
+      sha256 = "1s0j7gh3d3p157py7v6525c6zs07hdiry97dhg4c8z7ww35wxhj7";
+    };
+  }
+  {
+    goPackagePath = "github.com/BurntSushi/toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/BurntSushi/toml";
+      rev = "v0.3.1";
+      sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
+    };
+  }
+  {
+    goPackagePath = "github.com/BurntSushi/xgb";
+    fetch = {
+      type = "git";
+      url = "https://github.com/BurntSushi/xgb";
+      rev = "27f122750802";
+      sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj";
+    };
+  }
+  {
+    goPackagePath = "github.com/DisposaBoy/JsonConfigReader";
+    fetch = {
+      type = "git";
+      url = "https://github.com/DisposaBoy/JsonConfigReader";
+      rev = "5ea4d0ddac55";
+      sha256 = "022wzrkf0rni9yb15439w81kj0kb4667zx6n2zq07ysw7lk6ahqz";
+    };
+  }
+  {
+    goPackagePath = "github.com/TomOnTime/utfutil";
+    fetch = {
+      type = "git";
+      url = "https://github.com/TomOnTime/utfutil";
+      rev = "09c41003ee1d";
+      sha256 = "01d6w8migw5px19jg0mm7qhsa1ydcz9wvl838nsclfw63x5sy70i";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/kingpin";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/kingpin";
+      rev = "v2.2.6";
+      sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/template";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/template";
+      rev = "fb15b899a751";
+      sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/units";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/units";
+      rev = "f65c72e2690d";
+      sha256 = "04jyqm7m3m01ppfy1f9xk4qvrwvs78q9zml6llyf2b3v5k6b2bbc";
+    };
+  }
+  {
+    goPackagePath = "github.com/andreyvit/diff";
+    fetch = {
+      type = "git";
+      url = "https://github.com/andreyvit/diff";
+      rev = "c7f18ee00883";
+      sha256 = "1s4qjkxig5yqahpzfl4xqh4kzi9mymdpkzq6kj3f4dr5dl3hlynr";
+    };
+  }
+  {
+    goPackagePath = "github.com/armon/go-metrics";
+    fetch = {
+      type = "git";
+      url = "https://github.com/armon/go-metrics";
+      rev = "f0300d1749da";
+      sha256 = "13l7c35ps0r27vxfil2w0xhhc7w5rh00awvlmn4cz0a937b9ffpv";
+    };
+  }
+  {
+    goPackagePath = "github.com/armon/go-radix";
+    fetch = {
+      type = "git";
+      url = "https://github.com/armon/go-radix";
+      rev = "7fddfc383310";
+      sha256 = "0y8chspn14n9xpsfb9gxnnf819rfpriaz64v81p7873a42kkhxb4";
+    };
+  }
+  {
+    goPackagePath = "github.com/aws/aws-sdk-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/aws/aws-sdk-go";
+      rev = "v1.29.21";
+      sha256 = "0q97abz6cjj1gf3gfd52gjx39grfhlcjax8306zw9038a8v0nadc";
+    };
+  }
+  {
+    goPackagePath = "github.com/bgentry/speakeasy";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bgentry/speakeasy";
+      rev = "v0.1.0";
+      sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s";
+    };
+  }
+  {
+    goPackagePath = "github.com/billputer/go-namecheap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/billputer/go-namecheap";
+      rev = "0c7adb0710f8";
+      sha256 = "09jkymml6f0nvz7md7s4ayj75xdms77ziz9rkw4kvj7jhv36302p";
+    };
+  }
+  {
+    goPackagePath = "github.com/cenkalti/backoff";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cenkalti/backoff";
+      rev = "v2.1.1";
+      sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8";
+    };
+  }
+  {
+    goPackagePath = "github.com/census-instrumentation/opencensus-proto";
+    fetch = {
+      type = "git";
+      url = "https://github.com/census-instrumentation/opencensus-proto";
+      rev = "v0.2.1";
+      sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj";
+    };
+  }
+  {
+    goPackagePath = "github.com/client9/misspell";
+    fetch = {
+      type = "git";
+      url = "https://github.com/client9/misspell";
+      rev = "v0.3.4";
+      sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs";
+    };
+  }
+  {
+    goPackagePath = "github.com/cpuguy83/go-md2man";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cpuguy83/go-md2man";
+      rev = "v2.0.0";
+      sha256 = "0r1f7v475dxxgzqci1mxfliwadcrk86ippflx9n411325l4g3ghv";
+    };
+  }
+  {
+    goPackagePath = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev = "v1.1.1";
+      sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+    };
+  }
+  {
+    goPackagePath = "github.com/digitalocean/godo";
+    fetch = {
+      type = "git";
+      url = "https://github.com/digitalocean/godo";
+      rev = "v1.30.0";
+      sha256 = "0z38lg1zd57b5ymxdxhz5rs5rynpzhqmbvm0marhh0v7v9bbk0rx";
+    };
+  }
+  {
+    goPackagePath = "github.com/dimchansky/utfbom";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dimchansky/utfbom";
+      rev = "v1.1.0";
+      sha256 = "06s61wwd32fad1p8qn5blqjd5791avzb13fnqflkkg993adw49ww";
+    };
+  }
+  {
+    goPackagePath = "github.com/dnsimple/dnsimple-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dnsimple/dnsimple-go";
+      rev = "v0.31.0";
+      sha256 = "0i074r3m0bqggmplswymgj6yfzbsrcqw8gn6py9x8g3kyl4si0x0";
+    };
+  }
+  {
+    goPackagePath = "github.com/envoyproxy/go-control-plane";
+    fetch = {
+      type = "git";
+      url = "https://github.com/envoyproxy/go-control-plane";
+      rev = "5f8ba28d4473";
+      sha256 = "1f1s764rd41vd9vgk3r14h1m6fz6pdvxj6fd83q58gxifbc4q5w4";
+    };
+  }
+  {
+    goPackagePath = "github.com/envoyproxy/protoc-gen-validate";
+    fetch = {
+      type = "git";
+      url = "https://github.com/envoyproxy/protoc-gen-validate";
+      rev = "v0.1.0";
+      sha256 = "0kxd3wwh3xwqk0r684hsy281xq4y71cd11d4q2hspcjbnlbwh7cy";
+    };
+  }
+  {
+    goPackagePath = "github.com/exoscale/egoscale";
+    fetch = {
+      type = "git";
+      url = "https://github.com/exoscale/egoscale";
+      rev = "v0.23.0";
+      sha256 = "0dgc08sdvy2cj7yygrlnyp6v9m829h4v0pm3vdsj9yx3bps5v7iy";
+    };
+  }
+  {
+    goPackagePath = "github.com/fatih/color";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fatih/color";
+      rev = "v1.7.0";
+      sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv";
+    };
+  }
+  {
+    goPackagePath = "github.com/fatih/structs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fatih/structs";
+      rev = "v1.1.0";
+      sha256 = "1wrhb8wp8zpzggl61lapb627lw8yv281abvr6vqakmf569nswa9q";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-acme/lego";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-acme/lego";
+      rev = "v2.7.2";
+      sha256 = "1137l22jrwk8hvdzjbmfkvd9nllp6sznzy66ngmcsc0ybp19hcry";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-ldap/ldap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-ldap/ldap";
+      rev = "v3.0.2";
+      sha256 = "1srb1nkcbs0v1hcdz6j4zhg000h763j83jlklsiwanvbp48y4lhz";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-sql-driver/mysql";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-sql-driver/mysql";
+      rev = "v1.5.0";
+      sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-test/deep";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-test/deep";
+      rev = "042da051cf31";
+      sha256 = "08bya0s7m15f5qm1kn2r42g1r4lpq0svpaqr0zaac4hmaxj7vnid";
+    };
+  }
+  {
+    goPackagePath = "github.com/gobwas/glob";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gobwas/glob";
+      rev = "e7a84e9525fe";
+      sha256 = "1v6vjklq06wqddv46ihajahaj1slv0imgaivlxr8bsx59i90js5q";
+    };
+  }
+  {
+    goPackagePath = "github.com/gofrs/uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gofrs/uuid";
+      rev = "v3.2.0";
+      sha256 = "1q63mp7bznhfgyw133c0wc0hpcj1cq9bcf7w1f8r6inkcrils1fz";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/glog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/glog";
+      rev = "23def4e6c14b";
+      sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/mock";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/mock";
+      rev = "v1.3.1";
+      sha256 = "1wnfa8njxdym1qb664dmfnkpm4pmqy22hqjlqpwaaiqhglb5g9d1";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "v1.3.3";
+      sha256 = "1cyyr52yhj3fzrily3rmsbqyj8va4ld75lmry0857m39rgpv8sy1";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/snappy";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/snappy";
+      rev = "v0.0.1";
+      sha256 = "0gp3kkzlm3wh37kgkhbqxq3zx07iqbgis5w9mf4d64h6vjq760is";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/btree";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/btree";
+      rev = "v1.0.0";
+      sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/go-cmp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-cmp";
+      rev = "v0.4.0";
+      sha256 = "1x5pvl3fb5sbyng7i34431xycnhmx8xx94gq2n19g6p0vz68z2v2";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/go-github";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-github";
+      rev = "v17.0.0";
+      sha256 = "1kvw95l77a5n5rgal9n1xjh58zxb3a40ij1j722b1h4z8yg9jhg4";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/go-querystring";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-querystring";
+      rev = "c8c88dbee036";
+      sha256 = "1yckg2052mz7ps1m68wri6kyb5n4g0vx2yf7s0xs9gdqvvscp57l";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/martian";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/martian";
+      rev = "v2.1.0";
+      sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/pprof";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/pprof";
+      rev = "54271f7e092f";
+      sha256 = "14x4ydifz23rzaylggvwbm3dwlv1bc6s0bclmkxck9nbjbqw89vy";
+    };
+  }
+  {
+    goPackagePath = "github.com/googleapis/gax-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/googleapis/gax-go";
+      rev = "v2.0.5";
+      sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx";
+    };
+  }
+  {
+    goPackagePath = "github.com/gopherjs/gopherjs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gopherjs/gopherjs";
+      rev = "0766667cb4d1";
+      sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw";
+    };
+  }
+  {
+    goPackagePath = "github.com/gopherjs/jquery";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gopherjs/jquery";
+      rev = "73f4c7416038";
+      sha256 = "1xhl0k52v3djalnd02a0ph572f85i1szj2x4q3lglkq40j7racd2";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/errwrap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/errwrap";
+      rev = "v1.0.0";
+      sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/go-cleanhttp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-cleanhttp";
+      rev = "v0.5.1";
+      sha256 = "07kx3fhryqmaw3czacmm11qwx63js2q8cfq967vphk7xg9q377kk";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/go-hclog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-hclog";
+      rev = "v0.9.2";
+      sha256 = "0pakba7rdkjgq50r79sbbpavymbyib77cy613wl734mpi30ywrxm";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/go-immutable-radix";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-immutable-radix";
+      rev = "v1.0.0";
+      sha256 = "1v3nmsnk1s8bzpclrhirz7iq0g5xxbw9q5gvrg9ss6w9crs72qr6";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/go-multierror";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-multierror";
+      rev = "v1.0.0";
+      sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/go-plugin";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-plugin";
+      rev = "v1.0.1";
+      sha256 = "0aama8vdyrfzjdhxc1l4cwhmgydl989lywhq3pg3slzjg6r00rda";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/go-retryablehttp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-retryablehttp";
+      rev = "v0.6.3";
+      sha256 = "1vnhr7yry71jldmmj5gxhq49crhi9vrmqc2i41mycpnva2zd8a0i";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/go-rootcerts";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-rootcerts";
+      rev = "v1.0.1";
+      sha256 = "0ca5h7vlvrghf24dzh8l6w5px293n173qxfkjxb9kgsl6hsrsl3y";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/go-sockaddr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-sockaddr";
+      rev = "v1.0.2";
+      sha256 = "0y106nhd3s63lj7h7k21iq0br97h0z9qjrvx028zqcsq9407k9is";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/go-uuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-uuid";
+      rev = "v1.0.1";
+      sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/go-version";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/go-version";
+      rev = "v1.1.0";
+      sha256 = "1ykh3jl5zj5a4irkgp5mq936bqkznmf9lp23qk741vh4r5874vi8";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/golang-lru";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/golang-lru";
+      rev = "v0.5.1";
+      sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/hcl";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/hcl";
+      rev = "v1.0.0";
+      sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/yamux";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/yamux";
+      rev = "2f1d1f20f75d";
+      sha256 = "1fga3p6j2g24ip9qjfwn3nqjr00m4nnjz92app7ms3sz7vgq2a7s";
+    };
+  }
+  {
+    goPackagePath = "github.com/hexonet/go-sdk";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hexonet/go-sdk";
+      rev = "v2.2.3";
+      sha256 = "0mgkfrc7qlm4xf1v7kb29p7wq6rmaaha9zv8kwa27r8hjx6qnb8c";
+    };
+  }
+  {
+    goPackagePath = "github.com/jarcoal/httpmock";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jarcoal/httpmock";
+      rev = "v1.0.4";
+      sha256 = "1x04i9hhvdxi9xmyf0vbi5azlh7rr4blsq7fbhps8i2gdpga612y";
+    };
+  }
+  {
+    goPackagePath = "github.com/jmespath/go-jmespath";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jmespath/go-jmespath";
+      rev = "2437e8417af5";
+      sha256 = "1hwcbr7nrlfshwr4hrac8ch8gvfpf07qi72bpqmqi272c67ma89v";
+    };
+  }
+  {
+    goPackagePath = "github.com/jstemmer/go-junit-report";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jstemmer/go-junit-report";
+      rev = "af01ea7f8024";
+      sha256 = "1lp3n94ris12hac02wi31f3whs88lcrzwgdg43a5j6cafg9p1d0s";
+    };
+  }
+  {
+    goPackagePath = "github.com/jtolds/gls";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jtolds/gls";
+      rev = "v4.20.0";
+      sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/pretty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/pretty";
+      rev = "v0.1.0";
+      sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/pty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/pty";
+      rev = "v1.1.1";
+      sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
+    };
+  }
+  {
+    goPackagePath = "github.com/kr/text";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kr/text";
+      rev = "v0.1.0";
+      sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
+    };
+  }
+  {
+    goPackagePath = "github.com/malexdev/utfutil";
+    fetch = {
+      type = "git";
+      url = "https://github.com/malexdev/utfutil";
+      rev = "00c8d4a8e7a8";
+      sha256 = "01d6w8migw5px19jg0mm7qhsa1ydcz9wvl838nsclfw63x5sy70i";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-colorable";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-colorable";
+      rev = "v0.0.9";
+      sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-isatty";
+      rev = "v0.0.3";
+      sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n";
+    };
+  }
+  {
+    goPackagePath = "github.com/miekg/dns";
+    fetch = {
+      type = "git";
+      url = "https://github.com/miekg/dns";
+      rev = "v1.1.27";
+      sha256 = "0fpd9alvhzrkb1c31n4lrxlpv1nlhy51w1yg39xxb3mjmrb7lby1";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/cli";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/cli";
+      rev = "v1.0.0";
+      sha256 = "1i9kmr7rcf10d2hji8h4247hmc0nbairv7a0q51393aw2h1bnwg2";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/copystructure";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/copystructure";
+      rev = "v1.0.0";
+      sha256 = "05njg92w1088v4yl0js0zdrpfq6k37i9j14mxkr3p90p5yd9rrrr";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/go-homedir";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-homedir";
+      rev = "v1.1.0";
+      sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/go-testing-interface";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-testing-interface";
+      rev = "v1.0.0";
+      sha256 = "1dl2js8di858bawg7dadlf1qjpkl2g3apziihjyf5imri3znyfpw";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/go-wordwrap";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-wordwrap";
+      rev = "v1.0.0";
+      sha256 = "1jffbwcr3nnq6c12c5856bwzv2nxjzqk3jwgvxkwi1xhpd2by0bf";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/mapstructure";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/mapstructure";
+      rev = "v1.1.2";
+      sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/reflectwalk";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/reflectwalk";
+      rev = "v1.0.0";
+      sha256 = "0wzkp0fdx22n8f7y9y37dgmnlrlfsv9zjdb48cbx7rsqsbnny7l0";
+    };
+  }
+  {
+    goPackagePath = "github.com/mjibson/esc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mjibson/esc";
+      rev = "v0.2.0";
+      sha256 = "0ci3bdm01prm114plcwkgzbqn825lh0zc1iqaw3jicjay5sh0bis";
+    };
+  }
+  {
+    goPackagePath = "github.com/namedotcom/go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/namedotcom/go";
+      rev = "08470befbe04";
+      sha256 = "00ai7fd74sn4alqmpqsiyczirli50b7m059b6zzg1izy9g4cdd4g";
+    };
+  }
+  {
+    goPackagePath = "github.com/oklog/run";
+    fetch = {
+      type = "git";
+      url = "https://github.com/oklog/run";
+      rev = "v1.0.0";
+      sha256 = "1pbjza4claaj95fpqvvfrysvs10y7dm0pl6qr5lzh6qy1vnhmcgw";
+    };
+  }
+  {
+    goPackagePath = "github.com/ovh/go-ovh";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ovh/go-ovh";
+      rev = "ba5adb4cf014";
+      sha256 = "1rwxib0pn2ni6nfn2sijvb6cd424n95gnqhs21q6mz08n9hnzspy";
+    };
+  }
+  {
+    goPackagePath = "github.com/pascaldekloe/goe";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pascaldekloe/goe";
+      rev = "v0.1.0";
+      sha256 = "1dqd3mfb4z2vmv6pg6fhgvfc53vhndk24wcl9lj1rz02n6m279fq";
+    };
+  }
+  {
+    goPackagePath = "github.com/philhug/opensrs-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/philhug/opensrs-go";
+      rev = "9dfa7433020d";
+      sha256 = "1bjw3llpx5n1srylw08310ch14sz1pw5mban1yakax8606q3dqdf";
+    };
+  }
+  {
+    goPackagePath = "github.com/pierrec/lz4";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pierrec/lz4";
+      rev = "v2.0.5";
+      sha256 = "0y5rh7z01zycd59nnjpkqq0ydyjmcg9j1xw15q1i600l9j9g617p";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev = "v0.9.1";
+      sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq";
+    };
+  }
+  {
+    goPackagePath = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev = "v1.0.0";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+  {
+    goPackagePath = "github.com/posener/complete";
+    fetch = {
+      type = "git";
+      url = "https://github.com/posener/complete";
+      rev = "v1.1.1";
+      sha256 = "1nbdiybjizbaxbf5q0xwbq0cjqw4bl6jggvsjzrpif0w86fcjda2";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_model";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_model";
+      rev = "14fe0d1b01d4";
+      sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550";
+    };
+  }
+  {
+    goPackagePath = "github.com/renier/xmlrpc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/renier/xmlrpc";
+      rev = "ce4a1a486c03";
+      sha256 = "0byvacdwhagva53r2frzqws3f5j7qzigmxzxahpcv300i8pm9i50";
+    };
+  }
+  {
+    goPackagePath = "github.com/robertkrimen/otto";
+    fetch = {
+      type = "git";
+      url = "https://github.com/robertkrimen/otto";
+      rev = "c382bd3c16ff";
+      sha256 = "043y6l647snsz71mdy84s2d3kn22aj6rbqd6c1vd8absvamqhlxa";
+    };
+  }
+  {
+    goPackagePath = "github.com/russross/blackfriday";
+    fetch = {
+      type = "git";
+      url = "https://github.com/russross/blackfriday";
+      rev = "v2.0.1";
+      sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j";
+    };
+  }
+  {
+    goPackagePath = "github.com/ryanuber/columnize";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ryanuber/columnize";
+      rev = "v2.1.0";
+      sha256 = "0m9jhagb1k44zfcdai76xdf9vpi3bqdl7p078ffyibmz0z9jfap6";
+    };
+  }
+  {
+    goPackagePath = "github.com/ryanuber/go-glob";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ryanuber/go-glob";
+      rev = "v1.0.0";
+      sha256 = "0mhrjy0iba3jr6bsgy7q50zjr42ar1njn1sb2fvihlkhxgb2ahv2";
+    };
+  }
+  {
+    goPackagePath = "github.com/sergi/go-diff";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sergi/go-diff";
+      rev = "v1.1.0";
+      sha256 = "0ir8ali2vx0j7pipmlfd6k8c973akyy2nmbjrf008fm800zcp7z2";
+    };
+  }
+  {
+    goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shurcooL/sanitized_anchor_name";
+      rev = "v1.0.0";
+      sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f";
+    };
+  }
+  {
+    goPackagePath = "github.com/smartystreets/assertions";
+    fetch = {
+      type = "git";
+      url = "https://github.com/smartystreets/assertions";
+      rev = "b2de0cb4f26d";
+      sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y";
+    };
+  }
+  {
+    goPackagePath = "github.com/smartystreets/goconvey";
+    fetch = {
+      type = "git";
+      url = "https://github.com/smartystreets/goconvey";
+      rev = "68dc04aab96a";
+      sha256 = "1kas5v95fzhr88hg4rjy0vp03y4pzvy3pwwgkfz2yhn5nlj29nk6";
+    };
+  }
+  {
+    goPackagePath = "github.com/softlayer/softlayer-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/softlayer/softlayer-go";
+      rev = "5e1c8cccc730";
+      sha256 = "0jsi0f60gx92qm1n2lcz65v425bbqf59dsr0dw4x1wmychp25mk7";
+    };
+  }
+  {
+    goPackagePath = "github.com/stretchr/objx";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/objx";
+      rev = "v0.1.0";
+      sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w";
+    };
+  }
+  {
+    goPackagePath = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev = "v1.5.1";
+      sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl";
+    };
+  }
+  {
+    goPackagePath = "github.com/tdewolff/minify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tdewolff/minify";
+      rev = "v2.3.6";
+      sha256 = "0p4v4ab49lm5y438k5aks06fpiagbjw2j2x7i8jaa273mkgicrbb";
+    };
+  }
+  {
+    goPackagePath = "github.com/tdewolff/parse";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tdewolff/parse";
+      rev = "v2.3.4";
+      sha256 = "00hclphbjgc5vjrqgnclp72v8c45k35vmj84d2a0f7bw8cc88zcd";
+    };
+  }
+  {
+    goPackagePath = "github.com/tdewolff/test";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tdewolff/test";
+      rev = "v1.0.6";
+      sha256 = "12glhjb4cwp6yxwd17rwa6b4gxna3lm01bgc7yn9di58chc7lyh3";
+    };
+  }
+  {
+    goPackagePath = "github.com/tiramiseb/go-gandi";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tiramiseb/go-gandi";
+      rev = "e1cf2e430b3a";
+      sha256 = "1m6wzif0dgssh5hzffwqg39789k9nwvj8xaq0d492f0fr14w0nng";
+    };
+  }
+  {
+    goPackagePath = "github.com/urfave/cli";
+    fetch = {
+      type = "git";
+      url = "https://github.com/urfave/cli";
+      rev = "v2.1.1";
+      sha256 = "0znf7pim7xsl8x6pcgi9vm0px48xrqfkw6ysn4yv6xc2569zpjs1";
+    };
+  }
+  {
+    goPackagePath = "github.com/vultr/govultr";
+    fetch = {
+      type = "git";
+      url = "https://github.com/vultr/govultr";
+      rev = "v0.2.0";
+      sha256 = "09103hb2rx93d6vyr54bqdai35d6l5q3klk09k53aqrijp8pycfz";
+    };
+  }
+  {
+    goPackagePath = "go.opencensus.io";
+    fetch = {
+      type = "git";
+      url = "https://github.com/census-instrumentation/opencensus-go";
+      rev = "v0.22.0";
+      sha256 = "05jr8gkr2w34i5wwki4zhl5ch0qrgi7cdgag5iy5gpxplhbrvbg9";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "2aa609cf4a9d";
+      sha256 = "1yvis6fqbsd7f356aqyi18f76vnwj3bry6mxqnkvshq4cwrf92il";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/exp";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/exp";
+      rev = "efd6b22b2522";
+      sha256 = "0ysahwb7p6y09izks4ca8nk2w414gmjxzz44l5rmadlvk3k66cgp";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/image";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/image";
+      rev = "0694c2d4d067";
+      sha256 = "0v4rs4xpi7agbdzjw713mp7gzij8z89058s0yfj3276mzlns3zk4";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/lint";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/lint";
+      rev = "959b441ac422";
+      sha256 = "1mgcv5f00pkzsbwnq2y7vqvd1b4lr5a3s47cphh2qv4indfk7pck";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/mobile";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/mobile";
+      rev = "d3739f865fa6";
+      sha256 = "079ck2dyikacnph9s5mf0hrjnqlk6lc8q64dwnyw45w3xbbc50mg";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/mod";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/mod";
+      rev = "v0.2.0";
+      sha256 = "1fp6885dclq77mh73v7i54v2b9llpv4di193zc8vmsbbkkc483cl";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "0de0cce0169b";
+      sha256 = "1db7s5kbzyh2zd5lpv05n7hp8wbwdvgk0wpiwrlnig94mkr0y5aq";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/oauth2";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/oauth2";
+      rev = "bf48bf16ab8d";
+      sha256 = "1sirdib60zwmh93kf9qrx51r8544k1p9rs5mk0797wibz3m4mrdg";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sync";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sync";
+      rev = "cd5d95a43a6e";
+      sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "cb0a6d8edb6c";
+      sha256 = "0xkrf2k6nn1qh64ckrc4rmf1vhkzs0p7f1rnhv4v4pz9mvgh3v6w";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "v0.3.2";
+      sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/time";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/time";
+      rev = "9d24e82272b4";
+      sha256 = "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/tools";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/tools";
+      rev = "20ab64c0d93f";
+      sha256 = "1gfhw6daabjy771b3c0k0yga18ja50845n648mgagsa441dxvlch";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/xerrors";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/xerrors";
+      rev = "9bdfabe68543";
+      sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/api";
+    fetch = {
+      type = "git";
+      url = "https://code.googlesource.com/google-api-go-client";
+      rev = "v0.20.0";
+      sha256 = "13syr1x33k6mrn5w6l4sgdbzn368w3m60vf6kk2j10fwa45125rg";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/appengine";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/appengine";
+      rev = "v1.6.5";
+      sha256 = "05hbq4cs7bqw0zl17bx8rzdkszid3nyl92100scg3jjrg70dhm7w";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/genproto";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/go-genproto";
+      rev = "24fa4b261c55";
+      sha256 = "109zhaqlfd8zkbr1hk6zqbs6vcxfrk64scjwh2nswph05gr0m84d";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/grpc";
+    fetch = {
+      type = "git";
+      url = "https://github.com/grpc/grpc-go";
+      rev = "v1.27.0";
+      sha256 = "1ijrmgrxyabfn51nm3p9l81iaasq5fg237wnr6mdc4dzsfcg8kd7";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/asn1-ber.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/asn1-ber.v1";
+      rev = "f715ec2f112d";
+      sha256 = "00ixms8x3lrhywbvq5v2sagcqsxa1pcnlk17dp5lnwckv3xg4psb";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/check.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/check.v1";
+      rev = "41f04d3bba15";
+      sha256 = "0vfk9czmlxmp6wndq8k17rhnjxal764mxfhrccza7nwlia760pjy";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/ini.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/ini.v1";
+      rev = "v1.42.0";
+      sha256 = "18ywm8zyv091j1pp5mvx8szl7928chk8lw02br6jy568d7rk4xal";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/ns1/ns1-go.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/ns1/ns1-go.v2";
+      rev = "c563826f4cbe";
+      sha256 = "0swpsy0bdkwqlb7i0fgxs55sdfsy7pbnh6a09crhbw5xldvswq5k";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/sourcemap.v1";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/sourcemap.v1";
+      rev = "v1.0.5";
+      sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/square/go-jose.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/square/go-jose.v2";
+      rev = "v2.3.1";
+      sha256 = "11r93g9xrcjqj7qvq8sbd5hy5rnbpmim0vdsp6rbav8gl7wimaa3";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/yaml.v2";
+      rev = "v2.2.8";
+      sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw";
+    };
+  }
+  {
+    goPackagePath = "honnef.co/go/tools";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dominikh/go-tools";
+      rev = "ea95bdfd59fc";
+      sha256 = "1763nw7pwpzkvzfnm63dgzcgbq9hwmq5l1nffchnhh77vgkaq4ic";
+    };
+  }
+  {
+    goPackagePath = "rsc.io/binaryregexp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rsc/binaryregexp";
+      rev = "v0.2.0";
+      sha256 = "1kar0myy85waw418zslviwx8846zj0m9cmqkxjx0fvgjdi70nc4b";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 968431befaf2..9f0dc548c235 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2892,6 +2892,8 @@ in
 
   dnscrypt-wrapper = callPackage ../tools/networking/dnscrypt-wrapper { };
 
+  dnscontrol = callPackage ../applications/networking/dnscontrol { };
+
   dnsenum = callPackage ../tools/security/dnsenum { };
 
   dnsmasq = callPackage ../tools/networking/dnsmasq { };

From da587daae5feae652cd7ee6e8799ccd5021561a3 Mon Sep 17 00:00:00 2001
From: Arian van Putten <arian.vanputten@gmail.com>
Date: Tue, 24 Mar 2020 11:22:03 +0100
Subject: [PATCH 3869/4636] wire-desktop: Fix StartupWMClass

With quotes it doesn't match the Wire's screen, causing the window to not be grouped under its icon in Gnome.
---
 .../networking/instant-messengers/wire-desktop/default.nix      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index c04851d586b4..b6ed6ae9b228 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -75,7 +75,7 @@ let
       icon = "wire-desktop";
       name = "wire-desktop";
       extraEntries = ''
-        StartupWMClass="Wire"
+        StartupWMClass=Wire
       '';
     };
 

From 32d807f4b39f01a4be7f56ad174dcc5c07fb5284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 24 Mar 2020 08:44:20 -0300
Subject: [PATCH 3870/4636] matcha: 2020-03-15 -> 2020-03-24

---
 pkgs/data/themes/matcha/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
index c2274c57bbf4..ecf508a61b3b 100644
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "matcha";
-  version = "2020-03-15";
+  version = "2020-03-24";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    sha256 = "0hj1hpg9p46hyfcssd5ac7m599zkq7nrbwdwfbp98g5rw4fq8jaw";
+    sha256 = "13lcv2cihb24zjsdzhh188kd1rga49mzfa2sddqd63pqxxph188z";
   };
 
   buildInputs = [ gdk-pixbuf librsvg ];

From 2c96f591725f0a24122e277fb179a3d0a3abc991 Mon Sep 17 00:00:00 2001
From: Elyhaka <57923898+Elyhaka@users.noreply.github.com>
Date: Tue, 24 Mar 2020 13:05:35 +0100
Subject: [PATCH 3871/4636] wofi: 1.1 -> 1.1.2

---
 pkgs/applications/misc/wofi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix
index 659b7099943d..9d563429d6f6 100644
--- a/pkgs/applications/misc/wofi/default.nix
+++ b/pkgs/applications/misc/wofi/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "wofi";
-  version = "1.1";
+  version = "1.1.2";
 
   src = fetchhg {
     url = "https://hg.sr.ht/~scoopta/wofi";
     rev = "v${version}";
-    sha256 = "0rq6c8fv0h7xj3jw1i01r39dz0f31k7jgf7hpgl6mlsyn0ddc80z";
+    sha256 = "086j5wshawjbwdmmmldivfagc2rr7g5a2gk11l0snqqslm294xsn";
   };
 
   nativeBuildInputs = [ pkg-config meson ninja ];

From b6d07eb8ad392dbcae8e22117320430ab45683d7 Mon Sep 17 00:00:00 2001
From: Georg Haas <hax404foogit@hax404.de>
Date: Tue, 24 Mar 2020 13:36:29 +0100
Subject: [PATCH 3872/4636] teeworlds: python2 -> python3

---
 pkgs/games/teeworlds/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix
index ff0dfad51a60..99357f20a99d 100644
--- a/pkgs/games/teeworlds/default.nix
+++ b/pkgs/games/teeworlds/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, cmake, pkgconfig, python, alsaLib
+{ fetchFromGitHub, stdenv, cmake, pkgconfig, python3, alsaLib
 , libX11, libGLU, SDL2, lua5_3, zlib, freetype, wavpack
 }:
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [
-    python alsaLib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack
+    python3 alsaLib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack
   ];
 
   meta = {

From 1d42440eb2d1baf3cf7663828a3f7cba291f1ddd Mon Sep 17 00:00:00 2001
From: Georg Haas <hax404foogit@hax404.de>
Date: Tue, 24 Mar 2020 13:37:12 +0100
Subject: [PATCH 3873/4636] teeworlds: add desktop icon and menu item

---
 pkgs/games/teeworlds/default.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix
index 99357f20a99d..13918d2f7a52 100644
--- a/pkgs/games/teeworlds/default.nix
+++ b/pkgs/games/teeworlds/default.nix
@@ -1,5 +1,5 @@
 { fetchFromGitHub, stdenv, cmake, pkgconfig, python3, alsaLib
-, libX11, libGLU, SDL2, lua5_3, zlib, freetype, wavpack
+, libX11, libGLU, SDL2, lua5_3, zlib, freetype, wavpack, icoutils
 }:
 
 stdenv.mkDerivation rec {
@@ -21,12 +21,21 @@ stdenv.mkDerivation rec {
                 '#define DATA_DIR "${placeholder "out"}/share/teeworlds/data"'
   '';
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkgconfig icoutils ];
 
   buildInputs = [
     python3 alsaLib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack
   ];
 
+  postInstall = ''
+    # Convert and install desktop icon
+    mkdir -p $out/share/pixmaps
+    icotool --extract --index 1 --output $out/share/pixmaps/teeworlds.png $src/other/icons/teeworlds.ico
+
+    # Install menu item
+    install -D $src/other/teeworlds.desktop $out/share/applications/teeworlds.desktop
+  '';
+
   meta = {
     description = "Retro multiplayer shooter game";
 

From b79a474044233fca2178e97aeb22bafb4b56ef61 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 24 Mar 2020 13:35:19 +0100
Subject: [PATCH 3874/4636] prometheus-wireguard-exporter: 3.2.2 -> 3.2.4

https://github.com/MindFlavor/prometheus_wireguard_exporter/releases/tag/3.2.3
https://github.com/MindFlavor/prometheus_wireguard_exporter/releases/tag/3.2.4
---
 .../monitoring/prometheus/wireguard-exporter.nix     | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
index 1a7a2ebdf211..b4626b9e8f82 100644
--- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
@@ -2,25 +2,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wireguard-exporter";
-  version = "3.2.2";
+  version = "3.2.4";
 
   src = fetchFromGitHub {
     owner = "MindFlavor";
     repo = "prometheus_wireguard_exporter";
     rev = version;
-    sha256 = "18khym7ygj29w98zf6i1l5c2pz84zla2z34l5jnh595xvwfl94pc";
+    sha256 = "15his6mv3vmzfg972fb8m01h2m3jxmaqz3zw2krfr136mvg2rvjw";
   };
 
-  cargoSha256 = "0m7xa610k260gxn2xg6bc2y6fww0p72mvvik7278j2d15044c4yl";
+  cargoSha256 = "0ajkpshjv0im6falgjrsc2jdbvm2rhibl4v8rcmb2fg3kx7xc8vf";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
-  # Commonly used hack in nixpkgs to allow unstable features on a stable rustc. This is needed
-  # since `prometheus_exporter_base` uses `#!feature[]` to enable async which
-  # is actually not needed as `async` is part of rustc 1.39.0-stable. This can be removed
-  # as soon as https://github.com/MindFlavor/prometheus_exporter_base/pull/15 is merged.
-  RUSTC_BOOTSTRAP = 1;
-
   meta = with lib; {
     description = "A Prometheus exporter for WireGuard, written in Rust.";
     homepage = "https://github.com/MindFlavor/prometheus_wireguard_exporter";

From 6ca41603980f153990112cec5bd7599dadf67feb Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Tue, 24 Mar 2020 13:46:57 +0100
Subject: [PATCH 3875/4636] dnscontrol: remove unnecessary binries

---
 pkgs/applications/networking/dnscontrol/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix
index bdca68ce07d2..3f0a83d015da 100644
--- a/pkgs/applications/networking/dnscontrol/default.nix
+++ b/pkgs/applications/networking/dnscontrol/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, buildGoPackage}:
-  
+
 buildGoPackage rec {
   pname = "dnscontrol";
   version = "3.0.0";
 
   goPackagePath = "github.com/StackExchange/dnscontrol";
 
-   goDeps = ./deps.nix;
+  goDeps = ./deps.nix;
 
   src = fetchFromGitHub {
     owner = "StackExchange";
@@ -15,6 +15,10 @@ buildGoPackage rec {
     sha256 = "1j8i4k7bqkqmi6dmc9fxfab49a7qigig72rlbga902lw336p6cc7";
   };
 
+  postInstall = ''
+    rm $bin/bin/{build,convertzone,generate,validate}
+  '';
+
   meta = with stdenv.lib; {
     description = "Synchronize your DNS to multiple providers from a simple DSL";
     homepage = "https://stackexchange.github.io/dnscontrol/";

From d24bfb7f7e68aeb5e1730b09355c7babd142b236 Mon Sep 17 00:00:00 2001
From: puzzlewolf <mail@nora.pink>
Date: Sat, 4 Jan 2020 00:24:58 +0100
Subject: [PATCH 3876/4636] add puzzlewolf to maintainer-list.nix

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 65f2cd1241d0..916df3b95347 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5966,6 +5966,12 @@
     githubId = 37715;
     name = "Brian McKenna";
   };
+  puzzlewolf = {
+    email = "nixos@nora.pink";
+    github = "puzzlewolf";
+    githubId = 23097564;
+    name = "Nora Widdecke";
+  };
   pxc = {
     email = "patrick.callahan@latitudeengineering.com";
     name = "Patrick Callahan";

From 9d14ee71da9088d94cfcf97f8243f2af7b53db22 Mon Sep 17 00:00:00 2001
From: Milan <me@pbb.lc>
Date: Tue, 24 Mar 2020 14:34:04 +0100
Subject: [PATCH 3877/4636] yarn: 1.22.2 -> 1.22.4 (#83286)

---
 pkgs/development/tools/yarn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix
index 9db4472f6720..dfdd921fd03d 100644
--- a/pkgs/development/tools/yarn/default.nix
+++ b/pkgs/development/tools/yarn/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "yarn";
-  version = "1.22.2";
+  version = "1.22.4";
 
   src = fetchzip {
     url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
-    sha256 = "1av52k5hl7xylxz5c0h64akz6ccd1vm64v0pzmny1661pbihiwp5";
+    sha256 = "1s054c9cmlmzy6cfkawhaxvaxhqcq0a17n4sb12p0bp2lzkax9lm";
   };
 
   buildInputs = [ nodejs ];

From 5016a7612abdbd66561454ad8db3e54054d0c81d Mon Sep 17 00:00:00 2001
From: puzzlewolf <mail@nora.pink>
Date: Sat, 4 Jan 2020 00:25:29 +0100
Subject: [PATCH 3878/4636] grandorgue: init at 0.3.1-r2333

---
 .../applications/audio/grandorgue/default.nix | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/audio/grandorgue/default.nix

diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix
new file mode 100644
index 000000000000..e2ba4ee2244e
--- /dev/null
+++ b/pkgs/applications/audio/grandorgue/default.nix
@@ -0,0 +1,32 @@
+{ lib, stdenv, fetchsvn, cmake, pkg-config, gcc, pkgconfig, fftwFloat, alsaLib
+, zlib, wavpack, wxGTK31, udev, jackaudioSupport ? false, libjack2
+, includeDemo ? true }:
+
+stdenv.mkDerivation rec {
+  pname = "grandorgue";
+  rev = "2333";
+  version = "0.3.1-r${rev}";
+  src = fetchsvn {
+    url = "https://svn.code.sf.net/p/ourorgan/svn/trunk";
+    inherit rev;
+    sha256 = "0xzjdc2g4gja2lpmn21xhdskv43qpbpzkbb05jfqv6ma2zwffzz1";
+  };
+
+  nativeBuildInputs = [ cmake pkg-config ];
+
+  buildInputs = [ pkgconfig fftwFloat alsaLib zlib wavpack wxGTK31 udev ]
+    ++ lib.optional jackaudioSupport libjack2;
+
+  cmakeFlags = lib.optional (!jackaudioSupport) [
+    "-DRTAUDIO_USE_JACK=OFF"
+    "-DRTMIDI_USE_JACK=OFF"
+  ] ++ lib.optional (!includeDemo) "-DINSTALL_DEMO=OFF";
+
+  meta = {
+    description = "Virtual Pipe Organ Software";
+    homepage = "https://sourceforge.net/projects/ourorgan";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.puzzlewolf ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b03f7b836d38..96b2f8a6e592 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19450,6 +19450,8 @@ in
       ++ lib.optionals stdenv.isLinux [ gr-gsm gr-limesdr ];
   };
 
+  grandorgue = callPackage ../applications/audio/grandorgue { };
+
   gr-nacl = callPackage ../applications/radio/gnuradio/nacl.nix { };
 
   gr-gsm = callPackage ../applications/radio/gnuradio/gsm.nix { };

From aebf9a4709215c230e5841d60e2bce6aa6627ac8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 23 Mar 2020 10:29:12 +0100
Subject: [PATCH 3879/4636] services/misc/nixos-manual.nix: Remove

Running the manual on a TTY is useless in the graphical ISOs and not
particularly useful in non-graphical ISOs (since you can also run
'nixos-help').

Fixes #83157.
---
 nixos/doc/manual/installation/installing.xml  |  3 +-
 nixos/modules/misc/documentation.nix          |  4 +-
 nixos/modules/module-list.nix                 |  1 -
 .../modules/profiles/installation-device.nix  |  1 -
 nixos/modules/services/misc/nixos-manual.nix  | 73 -------------------
 5 files changed, 2 insertions(+), 80 deletions(-)
 delete mode 100644 nixos/modules/services/misc/nixos-manual.nix

diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 4041b4ad163a..0dbfb39c32b2 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -24,8 +24,7 @@
   </para>
 
   <para>
-   The NixOS manual is available on virtual console 8 (press Alt+F8 to access)
-   or by running <command>nixos-help</command>.
+   The NixOS manual is available by running <command>nixos-help</command>.
   </para>
 
   <para>
diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix
index 7b3f9c0fe9cd..7ad4be9a02e6 100644
--- a/nixos/modules/misc/documentation.nix
+++ b/nixos/modules/misc/documentation.nix
@@ -218,9 +218,7 @@ in
            ++ optionals config.services.xserver.enable [ desktopItem pkgs.nixos-icons ]);
 
       services.mingetty.helpLine = mkIf cfg.doc.enable (
-          "\nRun `nixos-help` "
-        + optionalString config.services.nixosManual.showManual "or press <Alt-F${toString config.services.nixosManual.ttyNumber}> "
-        + "for the NixOS manual."
+          "\nRun 'nixos-help' for the NixOS manual."
       );
     })
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index ccdc39eecd8d..6ef915152b29 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -469,7 +469,6 @@
   ./services/misc/nix-daemon.nix
   ./services/misc/nix-gc.nix
   ./services/misc/nix-optimise.nix
-  ./services/misc/nixos-manual.nix
   ./services/misc/nix-ssh-serve.nix
   ./services/misc/novacomd.nix
   ./services/misc/nzbget.nix
diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index 4596e163404c..06008d8a5e72 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -26,7 +26,6 @@ with lib;
 
     # Show the manual.
     documentation.nixos.enable = mkForce true;
-    services.nixosManual.showManual = true;
 
     # Let the user play Rogue on TTY 8 during the installation.
     #services.rogue.enable = true;
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
deleted file mode 100644
index ab73f49d4be5..000000000000
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-# This module optionally starts a browser that shows the NixOS manual
-# on one of the virtual consoles which is useful for the installation
-# CD.
-
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.services.nixosManual;
-  cfgd = config.documentation;
-in
-
-{
-
-  options = {
-
-    # TODO(@oxij): rename this to `.enable` eventually.
-    services.nixosManual.showManual = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        Whether to show the NixOS manual on one of the virtual
-        consoles.
-      '';
-    };
-
-    services.nixosManual.ttyNumber = mkOption {
-      type = types.int;
-      default = 8;
-      description = ''
-        Virtual console on which to show the manual.
-      '';
-    };
-
-    services.nixosManual.browser = mkOption {
-      type = types.path;
-      default = "${pkgs.w3m-nographics}/bin/w3m";
-      description = ''
-        Browser used to show the manual.
-      '';
-    };
-
-  };
-
-
-  config = mkMerge [
-    (mkIf cfg.showManual {
-      assertions = singleton {
-        assertion = cfgd.enable && cfgd.nixos.enable;
-        message   = "Can't enable `services.nixosManual.showManual` without `documentation.nixos.enable`";
-      };
-    })
-    (mkIf (cfg.showManual && cfgd.enable && cfgd.nixos.enable) {
-      console.extraTTYs = [ "tty${toString cfg.ttyNumber}" ];
-
-      systemd.services.nixos-manual = {
-        description = "NixOS Manual";
-        wantedBy = [ "multi-user.target" ];
-        serviceConfig = {
-          ExecStart = "${cfg.browser} ${config.system.build.manual.manualHTMLIndex}";
-          StandardInput = "tty";
-          StandardOutput = "tty";
-          TTYPath = "/dev/tty${toString cfg.ttyNumber}";
-          TTYReset = true;
-          TTYVTDisallocate = true;
-          Restart = "always";
-        };
-      };
-    })
-  ];
-
-}

From bd379be53835959c02b2967e28b57a69c06a85aa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 23 Mar 2020 10:30:46 +0100
Subject: [PATCH 3880/4636] Remove unused 'rogue' service

---
 nixos/modules/module-list.nix                 |  1 -
 .../modules/profiles/installation-device.nix  |  3 -
 nixos/modules/services/misc/rogue.nix         | 62 -------------------
 3 files changed, 66 deletions(-)
 delete mode 100644 nixos/modules/services/misc/rogue.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6ef915152b29..8c7f5e39a3bd 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -484,7 +484,6 @@
   ./services/misc/redmine.nix
   ./services/misc/rippled.nix
   ./services/misc/ripple-data-api.nix
-  ./services/misc/rogue.nix
   ./services/misc/serviio.nix
   ./services/misc/safeeyes.nix
   ./services/misc/sickbeard.nix
diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index 06008d8a5e72..d05c0c50e82c 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -27,9 +27,6 @@ with lib;
     # Show the manual.
     documentation.nixos.enable = mkForce true;
 
-    # Let the user play Rogue on TTY 8 during the installation.
-    #services.rogue.enable = true;
-
     # Use less privileged nixos user
     users.users.nixos = {
       isNormalUser = true;
diff --git a/nixos/modules/services/misc/rogue.nix b/nixos/modules/services/misc/rogue.nix
deleted file mode 100644
index d56d103b5f34..000000000000
--- a/nixos/modules/services/misc/rogue.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-# Execute the game `rogue' on tty 9.  Mostly used by the NixOS
-# installation CD.
-
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  cfg = config.services.rogue;
-
-in
-
-{
-  ###### interface
-
-  options = {
-
-    services.rogue.enable = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        Whether to enable the Rogue game on one of the virtual
-        consoles.
-      '';
-    };
-
-    services.rogue.tty = mkOption {
-      type = types.str;
-      default = "tty9";
-      description = ''
-        Virtual console on which to run Rogue.
-      '';
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = mkIf cfg.enable {
-
-    console.extraTTYs = [ cfg.tty ];
-
-    systemd.services.rogue =
-      { description = "Rogue dungeon crawling game";
-        wantedBy = [ "multi-user.target" ];
-        serviceConfig =
-          { ExecStart = "${pkgs.rogue}/bin/rogue";
-            StandardInput = "tty";
-            StandardOutput = "tty";
-            TTYPath = "/dev/${cfg.tty}";
-            TTYReset = true;
-            TTYVTDisallocate = true;
-            WorkingDirectory = "/tmp";
-            Restart = "always";
-          };
-      };
-
-  };
-
-}

From 66172a2ea4fa28e9a8692a6ad2adad7b65d0fe16 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 24 Mar 2020 09:12:52 -0400
Subject: [PATCH 3881/4636] zoom-us: 3.5.361976.0301 -> 3.5.372466.0322

---
 .../networking/instant-messengers/zoom-us/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index d47368a9cb25..f3ec3ba5c06a 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
 let
   inherit (stdenv.lib) concatStringsSep makeBinPath optional;
 
-  version = "3.5.361976.0301";
+  version = "3.5.372466.0322";
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
-      sha256 = "12pqs4pk73d7y9b49vq6f4fryph27k45zm1rjrpijnbi6ln2w993";
+      sha256 = "0yaf5rmxkzwxs27gqxd13i9c72rysmymh99kg70i1giigv93fbr0";
     };
   };
 

From 9f91fa02a6a3e6800dff5f80f061410e83aaeb28 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Tue, 24 Mar 2020 13:32:18 +0530
Subject: [PATCH 3882/4636] lib/systems: Add Genode platform definitions

Add platform definitions for 64-bit ARM and x86. This is sufficient for
for building Genode where a toolchain is provided as an overlay.

Toolchain: git+https://git.sr.ht/~ehmry/genodepkgs?rev=14fc773ac9ecd2cbb30cb4612b284eee83d83546
---
 lib/systems/default.nix | 1 +
 lib/systems/doubles.nix | 3 +++
 lib/systems/inspect.nix | 1 +
 lib/systems/parse.nix   | 3 +++
 lib/tests/systems.nix   | 5 +++--
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 4ca932d17921..210674cc6399 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -65,6 +65,7 @@ rec {
           freebsd = "FreeBSD";
           openbsd = "OpenBSD";
           wasi = "Wasi";
+          genode = "Genode";
         }.${final.parsed.kernel.name} or null;
 
          # uname -p
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index 619b0427918d..a839b3d3d573 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -35,6 +35,8 @@ let
     "vc4-none"
 
     "js-ghcjs"
+
+    "aarch64-genode" "x86_64-genode"
   ];
 
   allParsed = map parse.mkSystemFromString all;
@@ -68,6 +70,7 @@ in {
   unix    = filterDoubles predicates.isUnix;
   wasi    = filterDoubles predicates.isWasi;
   windows = filterDoubles predicates.isWindows;
+  genode  = filterDoubles predicates.isGenode;
 
   embedded = filterDoubles predicates.isNone;
 
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index 01dcf0787dfa..90a1fb6d80c2 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -47,6 +47,7 @@ rec {
     isMinGW        = { kernel = kernels.windows; abi = abis.gnu; };
     isWasi         = { kernel = kernels.wasi; };
     isGhcjs        = { kernel = kernels.ghcjs; };
+    isGenode       = { kernel = kernels.genode; };
     isNone         = { kernel = kernels.none; };
 
     isAndroid      = [ { abi = abis.android; } { abi = abis.androideabi; } ];
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 6a02dbb51528..648e7c270240 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -279,6 +279,7 @@ rec {
     wasi    = { execFormat = wasm;    families = { }; };
     windows = { execFormat = pe;      families = { }; };
     ghcjs   = { execFormat = unknown; families = { }; };
+    genode  = { execFormat = elf;     families = { }; };
   } // { # aliases
     # 'darwin' is the kernel for all of them. We choose macOS by default.
     darwin = kernels.macos;
@@ -395,6 +396,8 @@ rec {
         then { cpu = elemAt l 0; vendor = "unknown"; kernel = elemAt l 1; abi = elemAt l 2; }
       else if (elemAt l 2 == "ghcjs")
         then { cpu = elemAt l 0; vendor = "unknown"; kernel = elemAt l 2; }
+      else if hasPrefix "genode" (elemAt l 2)
+        then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; }
       else throw "Target specification with 3 components is ambiguous";
     "4" =    { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; abi = elemAt l 3; };
   }.${toString (length l)}
diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix
index dd2b9575fc2c..ea6e337937f9 100644
--- a/lib/tests/systems.nix
+++ b/lib/tests/systems.nix
@@ -12,16 +12,17 @@ let
     expected = lib.sort lib.lessThan y;
   };
 in with lib.systems.doubles; lib.runTests {
-  testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded ++ js);
+  testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded ++ js ++ genode);
 
   testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-none" "armv7a-linux" "armv7l-linux" "arm-none" "armv7a-darwin" ];
   testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ];
   testmips = mseteq mips [ "mipsel-linux" ];
-  testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ];
+  testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-genode" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ];
 
   testcygwin = mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ];
   testdarwin = mseteq darwin [ "x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin" ];
   testfreebsd = mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ];
+  testgenode = mseteq genode [ "aarch64-genode" "x86_64-genode" ];
   testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
   testillumos = mseteq illumos [ "x86_64-solaris" ];
   testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64le-linux" ];

From cffb6cb63762d0ddc5f7470b783159672ed683b1 Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Tue, 24 Mar 2020 14:46:07 +0000
Subject: [PATCH 3883/4636] vimPlugins: Update redirects without flag.

Per review, the input file will now be rewritten automatically if
redirects are found.
---
 doc/languages-frameworks/vim.section.md |  2 +-
 pkgs/misc/vim-plugins/update.py         | 16 ++--------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md
index cd53926defeb..05a23d26cf2f 100644
--- a/doc/languages-frameworks/vim.section.md
+++ b/doc/languages-frameworks/vim.section.md
@@ -263,7 +263,7 @@ Sometimes plugins require an override that must be changed when the plugin is up
 
 To add a new plugin:
 
-  1. run `./update.py --update-redirects` and create a commit named "vimPlugins: Update",
+  1. run `./update.py` and create a commit named "vimPlugins: Update",
   2. add the new plugin to [vim-plugin-names](/pkgs/misc/vim-plugins/vim-plugin-names) and add overrides if required to [overrides.nix](/pkgs/misc/vim-plugins/overrides.nix),
   3. run `./update.py` again and create a commit named "vimPlugins.[name]: init at [version]" (where `name` and `version` can be found in [generated.nix](/pkgs/misc/vim-plugins/generated.nix)), and
   4. create a pull request.
diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
index 9410f78be28a..c0ecd5d036e8 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/misc/vim-plugins/update.py
@@ -433,7 +433,7 @@ following steps:
     3. Make sure the updated {input_file} is still correctly sorted:
             sort -udf ./vim-plugin-names > sorted && mv sorted vim-plugin-names
     4. Run this script again so these changes will be reflected in the
-    generated expressions (no need to use the --update-redirects flag again):
+    generated expressions:
             ./update.py
     5. Commit {input_file} along with aliases and generated expressions:
             git add {output_file} {input_file} aliases.nix
@@ -463,12 +463,6 @@ def parse_args():
         default=DEFAULT_OUT,
         help="Filename to save generated nix code",
     )
-    parser.add_argument(
-        "--update-redirects",
-        dest="update_redirects",
-        action="store_true",
-        help="Update input file if repos have been redirected.",
-    )
 
     return parser.parse_args()
 
@@ -495,13 +489,7 @@ def main() -> None:
     generate_nix(plugins, args.outfile)
 
     if redirects:
-        if args.update_redirects:
-            update_redirects(args.input_file, args.outfile, redirects)
-        else:
-            print(
-                "Outdated vim-plugin-names found. Please run with "
-                "--update-redirects flag."
-            )
+        update_redirects(args.input_file, args.outfile, redirects)
 
 
 if __name__ == "__main__":

From 5c73dc4eec11c80f40138a7281b59811b422011d Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 24 Mar 2020 16:27:20 +0100
Subject: [PATCH 3884/4636] ubridge: 0.9.16 -> 0.9.17

---
 pkgs/tools/networking/ubridge/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/ubridge/default.nix b/pkgs/tools/networking/ubridge/default.nix
index 42839a8ba2f2..a7f0993fed62 100644
--- a/pkgs/tools/networking/ubridge/default.nix
+++ b/pkgs/tools/networking/ubridge/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ubridge";
-  version = "0.9.16";
+  version = "0.9.17";
 
   src = fetchFromGitHub {
     owner = "GNS3";
     repo = "ubridge";
     rev = "v${version}";
-    sha256 = "1bind7ylgxs743vfdmpdrpp4iamy461bc3i7nxza91kj7hyyjz6h";
+    sha256 = "1rwhbagac7msd116qymvlfh9qkz9jf0m8nl9xckwv68f57bhhjwl";
   };
 
   postPatch = ''
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
       and TAP interfaces is supported. Packet capture is also supported.
     '';
     inherit (src.meta) homepage;
+    changelog = "https://github.com/GNS3/ubridge/releases/tag/v${version}";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ primeos ];

From 4ed98532a254f699243b7a8d9f4698604f03b3d3 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Tue, 24 Mar 2020 12:05:05 +0100
Subject: [PATCH 3885/4636] kitty: 0.16.0 -> 0.17.1

https://github.com/kovidgoyal/kitty/releases/tag/v0.17.1

The png2icns patch is no longer needed because kitty will now automatically use `png2icns` when `iconutil` cannot be found.
The zsh completions will now work without needing to invoke them with `source`, which means, that we can just install them like the other shell completions.
---
 pkgs/applications/misc/kitty/default.nix    |  6 +++---
 pkgs/applications/misc/kitty/no-lto.patch   |  5 +++--
 pkgs/applications/misc/kitty/png2icns.patch | 21 ---------------------
 3 files changed, 6 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/applications/misc/kitty/png2icns.patch

diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index f5553cac6b59..6860f04f99c1 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -20,14 +20,14 @@
 with python3Packages;
 buildPythonApplication rec {
   pname = "kitty";
-  version = "0.16.0";
+  version = "0.17.1";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "kovidgoyal";
     repo = "kitty";
     rev = "v${version}";
-    sha256 = "1bszyddar0g1gdz67h8rd3gbrdhi6ahjg7j14cjiqxm1938z9ajf";
+    sha256 = "1ydli1phgcy17iz6jxgixn8yc86dp8q2yfxk08c8lwh7gxjnjz7f";
   };
 
   buildInputs = [
@@ -72,7 +72,6 @@ buildPythonApplication rec {
     })
   ] ++ stdenv.lib.optionals stdenv.isDarwin [
     ./no-lto.patch
-    ./png2icns.patch
   ];
 
   # Causes build failure due to warning
@@ -106,6 +105,7 @@ buildPythonApplication rec {
     mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions}
     "$out/bin/kitty" + complete setup fish > "$out/share/fish/vendor_completions.d/kitty.fish"
     "$out/bin/kitty" + complete setup bash > "$out/share/bash-completion/completions/kitty.bash"
+    "$out/bin/kitty" + complete setup zsh > "$out/share/zsh/site-functions/_kitty"
   '';
 
   postInstall = ''
diff --git a/pkgs/applications/misc/kitty/no-lto.patch b/pkgs/applications/misc/kitty/no-lto.patch
index 44d231cb07f9..8073c11fbd2a 100644
--- a/pkgs/applications/misc/kitty/no-lto.patch
+++ b/pkgs/applications/misc/kitty/no-lto.patch
@@ -1,12 +1,13 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -233,9 +233,6 @@ def init_env(
+@@ -277,10 +277,6 @@ def init_env(
      cppflags += shlex.split(os.environ.get('CPPFLAGS', ''))
      cflags += shlex.split(os.environ.get('CFLAGS', ''))
      ldflags += shlex.split(os.environ.get('LDFLAGS', ''))
 -    if not debug and not sanitize:
 -        # See https://github.com/google/sanitizers/issues/647
--        cflags.append('-flto'), ldflags.append('-flto')
+-        cflags.append('-flto')
+-        ldflags.append('-flto')
 
      if profile:
          cppflags.append('-DWITH_PROFILER')
diff --git a/pkgs/applications/misc/kitty/png2icns.patch b/pkgs/applications/misc/kitty/png2icns.patch
deleted file mode 100644
index 68566e2a899f..000000000000
--- a/pkgs/applications/misc/kitty/png2icns.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -aru a/setup.py b/setup.py
---- a/setup.py	2019-07-29 11:09:32.000000000 -0400
-+++ b/setup.py	2019-07-29 11:11:37.000000000 -0400
-@@ -784,9 +784,15 @@
- def create_macos_app_icon(where='Resources'):
-     logo_dir = os.path.abspath(os.path.join('logo', appname + '.iconset'))
-     subprocess.check_call([
--        'iconutil', '-c', 'icns', logo_dir, '-o',
-+        'png2icns',
-         os.path.join(where, os.path.basename(logo_dir).partition('.')[0] + '.icns')
--    ])
-+    ] + [os.path.join(logo_dir, logo) for logo in [
-+        'icon_128x128.png',
-+        'icon_16x16.png',
-+        'icon_256x256.png',
-+        'icon_32x32.png',
-+        'icon_512x512.png',
-+    ]])
- 
- 
- def create_minimal_macos_bundle(args, where):

From d6ec410a471a5f26fcaaf8f4f440b41fe3f13738 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 24 Mar 2020 16:31:51 +0100
Subject: [PATCH 3886/4636] Add packages.json to the tarball job

Moved from nixos-homepage.
---
 pkgs/top-level/make-tarball.nix    | 17 +++++++++++++----
 pkgs/top-level/packages-config.nix | 13 +++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/top-level/packages-config.nix

diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index ff0b0568819c..23542e4afe0a 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -22,7 +22,7 @@ releaseTools.sourceTarball {
     then builtins.substring 0 8 nixpkgs.lastModified
     else toString nixpkgs.revCount}.${nixpkgs.shortRev or "dirty"}";
 
-  buildInputs = [ nix.out jq lib-tests ];
+  buildInputs = [ nix.out jq lib-tests pkgs.brotli ];
 
   configurePhase = ''
     eval "$preConfigure"
@@ -38,6 +38,8 @@ releaseTools.sourceTarball {
   doCheck = true;
 
   checkPhase = ''
+    set -o pipefail
+
     export NIX_DB_DIR=$TMPDIR
     export NIX_STATE_DIR=$TMPDIR
     export NIX_PATH=nixpkgs=$TMPDIR/barf.nix
@@ -83,12 +85,10 @@ releaseTools.sourceTarball {
             --show-trace --argstr system "$platform" \
             -qa --drv-path --system-filter \* --system --meta --xml \
             "''${opts[@]}" > /dev/null
-        stopNest
     done
 
     header "checking eval-release.nix"
     nix-instantiate --eval --strict --show-trace ./maintainers/scripts/eval-release.nix > /dev/null
-    stopNest
 
     header "checking find-tarballs.nix"
     nix-instantiate --readonly-mode --eval --strict --show-trace --json \
@@ -100,7 +100,16 @@ releaseTools.sourceTarball {
       echo "suspiciously low number of URLs"
       exit 1
     fi
-    stopNest
+
+    header "generating packages.json"
+    mkdir -p $out/nix-support
+    echo -n '{"version":2,"packages":' > tmp
+    nix-env -f . -I nixpkgs=${src} -qa --json --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp
+    echo -n '}' >> tmp
+    packages=$out/packages.json.br
+    jq -c < tmp | brotli -9 > $packages
+
+    echo "file json-br $packages" >> $out/nix-support/hydra-build-products
   '';
 
   distPhase = ''
diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix
new file mode 100644
index 000000000000..8ce855780cf9
--- /dev/null
+++ b/pkgs/top-level/packages-config.nix
@@ -0,0 +1,13 @@
+# Used in the generation of package search database.
+{
+  # Ensures no aliases are in the results.
+  allowAliases = false;
+
+  # Enable recursion into attribute sets that nix-env normally doesn't look into
+  # so that we can get a more complete picture of the available packages for the
+  # purposes of the index.
+  packageOverrides = super: {
+    haskellPackages = super.recurseIntoAttrs super.haskellPackages;
+    rPackages = super.recurseIntoAttrs super.rPackages;
+  };
+}

From 4052f9b84948efe777fc09830749ca8237f6dd74 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 24 Mar 2020 16:38:36 +0100
Subject: [PATCH 3887/4636] Compress optionsJSON using brotli

---
 nixos/lib/make-options-doc/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix
index eee8f612410d..e5813d9a3ef9 100644
--- a/nixos/lib/make-options-doc/default.nix
+++ b/nixos/lib/make-options-doc/default.nix
@@ -133,6 +133,7 @@ in {
 
   optionsJSON = pkgs.runCommand "options.json"
     { meta.description = "List of NixOS options in JSON format";
+      buildInputs = [ pkgs.brotli ];
     }
     ''
       # Export list of options in different format.
@@ -141,8 +142,11 @@ in {
 
       cp ${builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON optionsNix))} $dst/options.json
 
+      brotli -9 < $dst/options.json > $dst/options.json.br
+
       mkdir -p $out/nix-support
       echo "file json $dst/options.json" >> $out/nix-support/hydra-build-products
+      echo "file json-br $dst/options.json.br" >> $out/nix-support/hydra-build-products
     ''; # */
 
   optionsDocBook = pkgs.runCommand "options-docbook.xml" {} ''

From 968b6ad01775f1bdf57388747789895c691a7049 Mon Sep 17 00:00:00 2001
From: Elyhaka <57923898+Elyhaka@users.noreply.github.com>
Date: Tue, 24 Mar 2020 13:06:45 +0100
Subject: [PATCH 3888/4636] wofi: fixes allow_images=true crash

---
 pkgs/applications/misc/wofi/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix
index 9d563429d6f6..3c14219b141d 100644
--- a/pkgs/applications/misc/wofi/default.nix
+++ b/pkgs/applications/misc/wofi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchhg, pkg-config, meson, ninja, wayland, gtk3 }:
+{ stdenv, lib, fetchhg, fetchpatch, pkg-config, meson, ninja, wayland, gtk3, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "wofi";
@@ -10,9 +10,19 @@ stdenv.mkDerivation rec {
     sha256 = "086j5wshawjbwdmmmldivfagc2rr7g5a2gk11l0snqqslm294xsn";
   };
 
-  nativeBuildInputs = [ pkg-config meson ninja ];
+  nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook ];
   buildInputs = [ wayland gtk3 ];
 
+  # Fixes icon bug on NixOS.
+  # Will need to be removed on next release
+  # see https://todo.sr.ht/~scoopta/wofi/54
+  patches = [
+    (fetchpatch {
+      url = "https://paste.sr.ht/blob/1cbddafac3806afb203940c029e78ce8390d8f49";
+      sha256 = "18960y9ajilrwwl6mjnrh6wj0sm4ivczmacck36p2dj9xd0n8vkh";
+    })
+  ];
+
   meta = with lib; {
     description = "A launcher/menu program for wlroots based wayland compositors such as sway";
     homepage = "https://hg.sr.ht/~scoopta/wofi";

From 79f6b312ba7015ce74dc3f64f0a31e35cb0af5bc Mon Sep 17 00:00:00 2001
From: mehlon <>
Date: Tue, 24 Mar 2020 17:19:42 +0100
Subject: [PATCH 3889/4636] tor-browser-bundle-bin: 9.0.6 -> 9.0.7

---
 .../networking/browsers/tor-browser-bundle-bin/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index a8a426b61626..62ad9e2cd891 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -90,19 +90,19 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "9.0.6";
+  version = "9.0.7";
 
   lang = "en-US";
 
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
-      sha256 = "1vk1pww8zmpjd5snyfz0if9v17g140ymlp6navxp28snzlffahss";
+      sha256 = "11pgafa2lgj35s6kacy1b7pnzjg3ckqjxg0pf0aywxvc2qr3syv1";
     };
 
     i686-linux = fetchurl {
       url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
-      sha256 = "0bhikdilfz31iilgb48mayy9f4lilycq24pqsrq7w3dqdjg4v55v";
+      sha256 = "1mjz41n53gxpaxx7jdxk226f085v23kwr31m20vv4ar4vxfa42d8";
     };
   };
 in

From 7be86f3b3c2699fc437f2e4808ce38abff8cca74 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 21 Mar 2020 00:52:56 +0000
Subject: [PATCH 3890/4636] openresty: 1.15.8.2 -> 1.15.8.3

---
 pkgs/servers/http/openresty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
index 55e813a2ce72..4b5b4259ca43 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@@ -9,11 +9,11 @@
 callPackage ../nginx/generic.nix args rec {
   pname = "openresty";
   nginxVersion = "1.15.8";
-  version = "${nginxVersion}.2";
+  version = "${nginxVersion}.3";
 
   src = fetchurl {
     url = "https://openresty.org/download/openresty-${version}.tar.gz";
-    sha256 = "05jxrb8hv758nm38jil8n63q1nhrz3d249bsrwc7maa7sn24wss3";
+    sha256 = "1a1la7vszv1parsnhphydblz64ffhycazncn3ividnvqg2mg735n";
   };
 
   fixPatch = patch:

From 899f6985923badf9b6567c436675c25a2013d8fd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 24 Mar 2020 03:39:01 +0000
Subject: [PATCH 3891/4636] earlyoom: 1.3 -> 1.5

---
 pkgs/os-specific/linux/earlyoom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/earlyoom/default.nix b/pkgs/os-specific/linux/earlyoom/default.nix
index 9725ea66dd43..96283af40d05 100644
--- a/pkgs/os-specific/linux/earlyoom/default.nix
+++ b/pkgs/os-specific/linux/earlyoom/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "earlyoom-${VERSION}";
   # This environment variable is read by make to set the build version.
-  VERSION = "1.3";
+  VERSION = "1.5";
 
   src = fetchFromGitHub {
     owner = "rfjakob";
     repo = "earlyoom";
     rev = "v${VERSION}";
-    sha256 = "0fwbx0y80nqgkxrc9kf9j3iwa0wbps2jmqir3pgqbc2cj0wjh0lr";
+    sha256 = "1wcw2lfd9ajachbrjqywkzj9x6zv32gij2r6yap26x1wdd5x7i93";
   };
 
   installPhase = ''

From 623140653534a5db16de38a7c130488b7fc0edf9 Mon Sep 17 00:00:00 2001
From: Marek Fajkus <marek.faj@gmail.com>
Date: Sat, 25 Jan 2020 19:46:04 +0100
Subject: [PATCH 3892/4636] zasm: Init at 4.2.6

---
 pkgs/development/compilers/zasm/default.nix | 44 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/compilers/zasm/default.nix

diff --git a/pkgs/development/compilers/zasm/default.nix b/pkgs/development/compilers/zasm/default.nix
new file mode 100644
index 000000000000..174092496bab
--- /dev/null
+++ b/pkgs/development/compilers/zasm/default.nix
@@ -0,0 +1,44 @@
+{ fetchFromGitHub, zlib, stdenv }:
+let
+  libs-src = fetchFromGitHub {
+    owner = "megatokio";
+    repo = "Libraries";
+    rev = "97ea480051b106e83a086dd42583dfd3e9d458a1";
+    sha256 = "1kqmjb9660mnb0r18s1grrrisx6b73ijsinlyr97vz6992jd5dzh";
+  };
+in
+stdenv.mkDerivation {
+  pname = "zasm";
+  version = "4.2.6";
+  src = fetchFromGitHub {
+    owner = "megatokio";
+    repo = "zasm";
+    rev = "f1424add17a5514895a598d6b5e3982579961519";
+    sha256 = "1kqnqdqp2bfsazs6vfx2aiqanxxagn8plx8g6rc11vmr8yqnnpks";
+  };
+
+  buildInputs = [ zlib ];
+
+  configurePhase = ''
+    ln -sf ${libs-src} Libraries
+  '';
+
+  buildPhase = ''
+    cd Linux
+    make
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv zasm $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Z80 / 8080 assembler (for unix-style OS)";
+    homepage = "https://k1.spdns.de/Develop/Projects/zasm/Distributions/";
+    license = licenses.bsd2;
+    maintainers = [ maintainers.turbomack ];
+    platforms = platforms.linux;
+    badPlatforms = platforms.aarch64;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96b2f8a6e592..3e678efb3048 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7780,6 +7780,8 @@ in
 
   you-get = python3Packages.callPackage ../tools/misc/you-get { };
 
+  zasm = callPackage ../development/compilers/zasm {};
+
   zbackup = callPackage ../tools/backup/zbackup {};
 
   zbar = libsForQt5.callPackage ../tools/graphics/zbar { };

From 088b7d4a7ab60d67ac87a4906d74ecbbc6115db6 Mon Sep 17 00:00:00 2001
From: Kai Wohlfahrt <kai.wohlfahrt@gmail.com>
Date: Fri, 13 Mar 2020 22:44:24 +0000
Subject: [PATCH 3893/4636] quartus: Export sub-commands

buildFHSUserEnv does not currently support multiple binaries, so doing
this manually with wrappers.

Pass through original quartus derivation for debugging/overriding
---
 .../editors/quartus-prime/default.nix         | 71 ++++++++++++++-----
 1 file changed, 52 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix
index 1a1aafdde376..093635b10e42 100644
--- a/pkgs/applications/editors/quartus-prime/default.nix
+++ b/pkgs/applications/editors/quartus-prime/default.nix
@@ -1,4 +1,4 @@
-{ buildFHSUserEnv, makeDesktopItem, stdenv, lib, requireFile, unstick,
+{ buildFHSUserEnv, makeDesktopItem, writeScript, stdenv, lib, requireFile, unstick,
   supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] }:
 
 let
@@ -25,7 +25,7 @@ let
 
   quartus = stdenv.mkDerivation rec {
     version = "19.1.0.670";
-    pname = "quartus-prime-lite";
+    pname = "quartus-prime-lite-unwrapped";
 
     src = let
       require = {name, sha256}: requireFile {
@@ -74,18 +74,18 @@ let
         "modelsim_ae"
       ] ++ (lib.attrValues unsupportedDeviceIds);
     in ''
-    ${lib.concatMapStringsSep "\n" copyInstaller installers}
-    ${lib.concatMapStringsSep "\n" copyComponent components}
+      ${lib.concatMapStringsSep "\n" copyInstaller installers}
+      ${lib.concatMapStringsSep "\n" copyComponent components}
 
-    unstick $TEMP/${(builtins.head installers).name} \
-      --disable-components ${lib.concatStringsSep "," disabledComponents} \
-      --mode unattended --installdir $out --accept_eula 1
+      unstick $TEMP/${(builtins.head installers).name} \
+        --disable-components ${lib.concatStringsSep "," disabledComponents} \
+        --mode unattended --installdir $out --accept_eula 1
 
-    # This patch is from https://wiki.archlinux.org/index.php/Altera_Design_Software
-    patch --force --strip 0 --directory $out < ${./vsim.patch}
+      # This patch is from https://wiki.archlinux.org/index.php/Altera_Design_Software
+      patch --force --strip 0 --directory $out < ${./vsim.patch}
 
-    rm -r $out/uninstall $out/logs
-  '';
+      rm -r $out/uninstall $out/logs
+    '';
 
     meta = {
       homepage = "https://fpgasoftware.intel.com";
@@ -97,17 +97,17 @@ let
   };
 
   desktopItem = makeDesktopItem {
-    name = quartus.name;
+    name = "quartus-prime-lite";
     exec = "quartus";
     icon = "quartus";
     desktopName = "Quartus";
-    genericName = "Quartus FPGA IDE";
+    genericName = "Quartus Prime";
     categories = "Development;";
   };
 
 # I think modelsim_ase/linux/vlm checksums itself, so use FHSUserEnv instead of `patchelf`
-in buildFHSUserEnv {
-  name = "quartus-prime-lite";
+in buildFHSUserEnv rec {
+  name = "quartus-prime-lite"; # wrapped
 
   targetPkgs = pkgs: with pkgs; [
     # quartus requirements
@@ -138,10 +138,43 @@ in buildFHSUserEnv {
     xorg.libXrender
   ];
 
-  extraInstallCommands = ''
-    mkdir -p $out/share/applications
-    cp ${desktopItem}/share/applications/* $out/share/applications
+  passthru = {
+    unwrapped = quartus;
+  };
+
+  extraInstallCommands = let
+    quartusExecutables = (map (c: "quartus/bin/quartus_${c}") [
+      "asm" "cdb" "cpf" "drc" "eda" "fit" "jbcc" "jli" "map" "pgm" "pow"
+      "sh" "si" "sim" "sta" "stp" "tan"
+    ]) ++ [ "quartus/bin/quartus" ];
+
+    qsysExecutables = map (c: "quartus/sopc_builder/bin/qsys-${c}") [
+      "generate" "edit" "script"
+    ];
+    # Should we install all executables ?
+    modelsimExecutables = map (c: "modelsim_ase/bin/${c}") [
+      "vsim" "vlog" "vlib"
+    ];
+  in ''
+    mkdir -p $out/share/applications $out/share/icons/128x128
+    ln -s ${desktopItem}/share/applications/* $out/share/applications
+    ln -s ${quartus}/licenses/images/dc_quartus_panel_logo.png $out/share/icons/128x128/quartus.png
+
+    mkdir -p $out/quartus/bin $out/quartus/sopc_builder/bin $out/modelsim_ase/bin
+    WRAPPER=$out/bin/${name}
+    EXECUTABLES="${lib.concatStringsSep " " (quartusExecutables ++ qsysExecutables ++ modelsimExecutables)}"
+    for executable in $EXECUTABLES; do
+        echo "#!${stdenv.shell}" >> $out/$executable
+        echo "$WRAPPER ${quartus}/$executable \$@" >> $out/$executable
+    done
+
+    cd $out
+    chmod +x $EXECUTABLES
+    # link into $out/bin so executables become available on $PATH
+    ln --symbolic --relative --target-directory ./bin $EXECUTABLES
   '';
 
-  runScript = "${quartus}/quartus/bin/quartus";
+  runScript = writeScript "${name}-wrapper" ''
+    exec $@
+  '';
 }

From 3a173c1d7530836c1bf217d503bca94ce90587d4 Mon Sep 17 00:00:00 2001
From: Kim Lindberger <kim.lindberger@gmail.com>
Date: Tue, 24 Mar 2020 18:45:39 +0100
Subject: [PATCH 3894/4636] gitlab: 12.8.6 -> 12.8.7 (#82838)

https://about.gitlab.com/releases/2020/03/16/gitlab-12-8-7-released/
---
 pkgs/applications/version-management/gitlab/data.json     | 8 ++++----
 .../version-management/gitlab/gitaly/default.nix          | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index ddad51dfb636..588446572980 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,11 +1,11 @@
 {
-  "version": "12.8.6",
-  "repo_hash": "0plcigppmg6ckmq8myj3m9adshdvqj7czx8fms71bsa9zx060wib",
+  "version": "12.8.7",
+  "repo_hash": "15dw8v5184500jm823wv920li3ishwk8k2dhxl1w8209x53nbqgj",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v12.8.6-ee",
+  "rev": "v12.8.7-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "12.8.6",
+    "GITALY_SERVER_VERSION": "12.8.7",
     "GITLAB_PAGES_VERSION": "1.16.0",
     "GITLAB_SHELL_VERSION": "11.0.0",
     "GITLAB_WORKHORSE_VERSION": "8.21.0"
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 9b3e4da20248..377213195541 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -28,14 +28,14 @@ let
     };
   });
 in buildGoPackage rec {
-  version = "12.8.6";
+  version = "12.8.7";
   pname = "gitaly";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitaly";
     rev = "v${version}";
-    sha256 = "1rf9qmyjllkwkyi7la1dzyjh0z9sw21zdzihd7v9ngwqssfk5zfk";
+    sha256 = "1sb11xavckzm70m27xcwbv4a1iaicxkh1hv2zi4brlcj5ia2rky4";
   };
 
   # Fix a check which assumes that hook files are writeable by their

From 2a743cf931c600051c8e4888b3d15d78e6d6e32c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2020 20:49:49 +0000
Subject: [PATCH 3895/4636] pgloader: 3.6.1 -> 3.6.2

---
 pkgs/development/tools/pgloader/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/pgloader/default.nix b/pkgs/development/tools/pgloader/default.nix
index 8aaae2b1c433..94ba95b2d92f 100644
--- a/pkgs/development/tools/pgloader/default.nix
+++ b/pkgs/development/tools/pgloader/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, sbcl, sqlite, freetds, libzip, curl, git, cacert, openssl }:
 stdenv.mkDerivation rec {
   pname = "pgloader";
-  version = "3.6.1";
+  version = "3.6.2";
 
   src = fetchurl {
-    url = "https://github.com/dimitri/pgloader/releases/download/v3.6.1/pgloader-bundle-3.6.1.tgz";
-    sha256 = "1sm8xmq30d1biin5br0y3vrv4fydbrzfqglz1hnvrkdyxrg7d6f9";
+    url = "https://github.com/dimitri/pgloader/releases/download/v3.6.2/pgloader-bundle-3.6.2.tgz";
+    sha256 = "1jqnw6pw11kwyy8zm2g7g85r8197fy0q4l70yybw9wr87wnqqnz3";
   };
 
   nativeBuildInputs = [ git makeWrapper ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://pgloader.io/;
+    homepage = "https://pgloader.io/";
     description = "pgloader loads data into PostgreSQL and allows you to implement Continuous Migration from your current database to PostgreSQL";
     maintainers = with maintainers; [ mguentner ];
     license = licenses.postgresql;

From 7d0dd86a9fd693cef55613c4570b91d36441b838 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2020 19:08:21 +0000
Subject: [PATCH 3896/4636] minder: 1.6.0 -> 1.7.1

---
 pkgs/applications/misc/minder/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix
index 7b6be997ffa0..baa8f69cfacb 100644
--- a/pkgs/applications/misc/minder/default.nix
+++ b/pkgs/applications/misc/minder/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "minder";
-  version = "1.6.0";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "phase1geo";
     repo = pname;
     rev = version;
-    sha256 = "0zma6hjx0068ih7fagb1gg5cgci0ccc764sd8qw6iglg61aihpx7";
+    sha256 = "0y30gdnx270m857iijhgdv7a2nqxmmd8w6kfhd80763ygk17xk1r";
   };
 
   nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ];

From 3eb730f4402a3dd38a8175e9bcc215e4cc1af12c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2020 16:37:03 +0000
Subject: [PATCH 3897/4636] elementary-xfce-icon-theme: 0.14 -> 0.15

---
 pkgs/data/icons/elementary-xfce-icon-theme/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
index 221974c79419..3aebf09554c3 100644
--- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-xfce-icon-theme";
-  version = "0.14";
+  version = "0.15";
 
   src = fetchFromGitHub {
     owner = "shimmerproject";
     repo = "elementary-xfce";
     rev = "v${version}";
-    sha256 = "00sk6sv0kkfb3q0jqwcllzawi30rw8nfkkfn5l1qwqha48izw3r4";
+    sha256 = "1f6qvpzxz759znishmr4b22n540y18glv41wmy91r78sa4g6x4sh";
   };
 
   nativeBuildInputs = [ pkgconfig gdk-pixbuf librsvg optipng gtk3 ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Elementary icons for Xfce and other GTK desktops like GNOME";
-    homepage = https://github.com/shimmerproject/elementary-xfce;
+    homepage = "https://github.com/shimmerproject/elementary-xfce";
     license = licenses.gpl2;
     # darwin cannot deal with file names differing only in case
     platforms = platforms.linux;

From ba0575edaa2e1a63a29d91f456a9e32d075e55ff Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2020 00:23:45 +0000
Subject: [PATCH 3898/4636] nss_wrapper: 1.1.8 -> 1.1.10

---
 pkgs/development/libraries/nss_wrapper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix
index dec4e61a7bc8..e79ef1a0cded 100644
--- a/pkgs/development/libraries/nss_wrapper/default.nix
+++ b/pkgs/development/libraries/nss_wrapper/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "nss_wrapper-1.1.8";
+  name = "nss_wrapper-1.1.10";
 
   src = fetchurl {
     url = "mirror://samba/cwrap/${name}.tar.gz";
-    sha256 = "1cnzhnz68ywx1jwj6xaxv8hg8hpm63ssxmrlhsz3sfgjhfkmw95l";
+    sha256 = "1fifl3allz4hwl331j6fwacc4z2fqwyxdnnkadv518ir8nza3xl8";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 1717c2f02efb20398efc172f8d865814b8a4980b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Mar 2020 08:54:57 +0000
Subject: [PATCH 3899/4636] moolticute: 0.42.32-testing -> 0.43.3

---
 pkgs/applications/misc/moolticute/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix
index e3154b7cd1cd..0a54bc98bb9a 100644
--- a/pkgs/applications/misc/moolticute/default.nix
+++ b/pkgs/applications/misc/moolticute/default.nix
@@ -9,13 +9,13 @@
 
 mkDerivation rec {
   pname = "moolticute";
-  version = "0.42.32-testing";
+  version = "0.43.3";
 
   src = fetchFromGitHub {
     owner = "mooltipass";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1kx1p2h65dilj1pbzf36d1mxwym19kvln1sqg8fb7na8q7lk4b05";
+    sha256 = "0kl7wksiqmy0hqbg6xwmzqfn3l17if2hiw7xc9x067x9rviyxrl3";
   };
 
   outputs = [ "out" "udev" ];

From b7ae4d6bf8afc423b66d06d18948617a5f18c22a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 19 Mar 2020 11:04:12 +0000
Subject: [PATCH 3900/4636] meteor: 1.8.2 -> 1.9.3

---
 pkgs/servers/meteor/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix
index c2f0ffa59b97..b6abec241a5e 100644
--- a/pkgs/servers/meteor/default.nix
+++ b/pkgs/servers/meteor/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, zlib, patchelf, runtimeShell }:
 
 let
-  version = "1.8.2";
+  version = "1.9.3";
 in
 
 stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   pname = "meteor";
   src = fetchurl {
     url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz";
-    sha256 = "1pydmwx1yjbw54qfq7ndw2l3i3v302bvasvf71x4y9572r2p99mp";
+    sha256 = "1njp2db939w3ah5k943bkgm62k969fj47qwmlzvhmmg87xwnq3fb";
   };
 
   #dontStrip = true;
@@ -82,7 +82,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     description = "Complete open source platform for building web and mobile apps in pure JavaScript";
-    homepage = http://www.meteor.com;
+    homepage = "http://www.meteor.com";
     license = licenses.mit;
     platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ cstrahan ];

From 1eafe5d9e1a006575d088ec59a69d8158dc3e44d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 04:21:19 +0000
Subject: [PATCH 3901/4636] conftest: 0.15.0 -> 0.18.0

---
 pkgs/development/tools/conftest/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix
index fe8d58f76827..76e53fd73b2a 100644
--- a/pkgs/development/tools/conftest/default.nix
+++ b/pkgs/development/tools/conftest/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "conftest";
-  version = "0.15.0";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "instrumenta";
     repo = "conftest";
     rev = "v${version}";
-    sha256 = "0lb644fj80r4igxbslbd5pksirnyf6slz4yn0mznyx8i2bd1g4ic";
+    sha256 = "189as930fksyqk3z636gyqdym1bqm522mya7msfnhzpnh46k5jvd";
   };
 
-  modSha256 = "1p7fjg1vcrcxb4f5hd00qxx4fqcl051klcjs6ljn4v46qcpn6dcn";
+  modSha256 = "0gm08lrlaxc7504mapjdm3c4mwlzybnqxfwkkh6fawzvmd9sqddr";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
@@ -22,7 +22,7 @@ buildGoModule rec {
 
   meta = with stdenv.lib; {
     description = "Write tests against structured configuration data";
-    homepage = https://github.com/instrumenta/conftest;
+    homepage = "https://github.com/instrumenta/conftest";
     license = licenses.asl20;
     maintainers = with maintainers; [ yurrriq ];
     platforms = platforms.all;

From 6c6286610f4620629561b21293ad34b438054c05 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 20 Mar 2020 18:26:53 +0000
Subject: [PATCH 3902/4636] zchunk: 1.1.5 -> 1.1.6

---
 pkgs/development/libraries/zchunk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix
index ee07133b7aa0..b7787650e7cc 100644
--- a/pkgs/development/libraries/zchunk/default.nix
+++ b/pkgs/development/libraries/zchunk/default.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   pname = "zchunk";
-  version = "1.1.5";
+  version = "1.1.6";
 
   outputs = [ "out" "lib" "dev" ];
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     owner = "zchunk";
     repo = pname;
     rev = version;
-    sha256 = "13sqjslk634mkklnmzdlzk9l9rc6g6migig5rln3irdnjrxvjf69";
+    sha256 = "1j05f26xppwbkxrm11895blm75i1a6p9q23x7wlkqw198mpnpbbv";
   };
 
   nativeBuildInputs = [

From d0cb0cc7c99cdd34426fedb7c354321ebae86505 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 18 Mar 2020 09:26:56 +0000
Subject: [PATCH 3903/4636] opencl-clhpp: 2.0.10 -> 2.0.11

---
 pkgs/development/libraries/opencl-clhpp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/opencl-clhpp/default.nix b/pkgs/development/libraries/opencl-clhpp/default.nix
index 5ed2dd5e23d2..cb8d9c788ca9 100644
--- a/pkgs/development/libraries/opencl-clhpp/default.nix
+++ b/pkgs/development/libraries/opencl-clhpp/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "opencl-clhpp";
-  version = "2.0.10";
+  version = "2.0.11";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenCL-CLHPP";
     rev = "v${version}";
-    sha256 = "0h5kpg5cl8wzfnqmv6i26aig2apv06ffm9p3rh35938n9r8rladm";
+    sha256 = "0a0n0f1lb86cwfm0ndzykcn965vz1v0n9n3rfmkiwrzkdhc9iy2y";
   };
 
   nativeBuildInputs = [ cmake python ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "OpenCL Host API C++ bindings";
-    homepage = http://github.khronos.org/OpenCL-CLHPP/;
+    homepage = "http://github.khronos.org/OpenCL-CLHPP/";
     license = licenses.mit;
     platforms = platforms.unix;
   };

From 911acc42f28c261146fd05a800a4762aee6e5cae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 24 Mar 2020 16:01:43 -0300
Subject: [PATCH 3904/4636] uget: 2.2.2 -> 2.2.3-1

---
 pkgs/tools/networking/uget/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix
index b2da1384557d..f8c585c3b252 100644
--- a/pkgs/tools/networking/uget/default.nix
+++ b/pkgs/tools/networking/uget/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "uget";
-  version = "2.2.2";
+  version = "2.2.3-1";
 
   src = fetchurl {
     url = "mirror://sourceforge/urlget/${pname}-${version}.tar.gz";
-    sha256 = "1hmzk907blgzc1z6wv4zbzqrwad06zfm1rqc3svh5garxw8z7xsw";
+    sha256 = "0jchvgkkphhwp2z7vd4axxr9ns8b6vqc22b2z8a906qm8916wd8i";
   };
 
   nativeBuildInputs = [
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
       thinking that it "might be too powerful" because remember power is good
       and lightweight power is uGet!
     '';
-    homepage = http://www.ugetdm.com;
+    homepage = "http://www.ugetdm.com";
     license = licenses.lgpl21;
     platforms = platforms.unix;
     maintainers = with maintainers; [ romildo ];

From a306a8e3ec35a64af749e127c1be7152ec030c06 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 24 Mar 2020 11:38:38 -0700
Subject: [PATCH 3905/4636] azure-cli: 2.1.0 -> 2.2.0

---
 pkgs/tools/admin/azure-cli/default.nix        |  4 +--
 .../tools/admin/azure-cli/python-packages.nix | 28 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix
index 69e0a2afe6e2..13fdf6dcd0d0 100644
--- a/pkgs/tools/admin/azure-cli/default.nix
+++ b/pkgs/tools/admin/azure-cli/default.nix
@@ -1,12 +1,12 @@
 { stdenv, lib, python, fetchFromGitHub, installShellFiles }:
 
 let
-  version = "2.1.0";
+  version = "2.2.0";
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-cli";
     rev = "azure-cli-${version}";
-    sha256 = "0f4wrqp9f4n4mk73ybx08ybvmxx88r6g5cvx8ld6ybhl2w8bbn9v";
+    sha256 = "0bqkvx1gp4bhpjn5nrjc08lq8wldl1icrz6q1llaxgvqqmc8hcgp";
   };
 
   # put packages that needs to be overriden in the py package scope
diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix
index 7b43ba209c2a..2935cd3300cd 100644
--- a/pkgs/tools/admin/azure-cli/python-packages.nix
+++ b/pkgs/tools/admin/azure-cli/python-packages.nix
@@ -119,8 +119,8 @@ let
       azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.4.0" "zip"
         "1b69rz9wm0jvc54vx3b7h633x8gags51xwxrkp6myar40jggxw6g";
 
-      azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "1.9.0" "zip"
-        "0v91hl936wp9sl3bc31svf6kdxwa57qh6ih9rrv43dnb2000km6r";
+      azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "2.0.0" "zip"
+        "19z0lpq6bpidlflwa263y51549xgcg4m040k872m7fmy7jm2xcbb";
 
       azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.6.0" "zip"
         "13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd";
@@ -131,8 +131,8 @@ let
       azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.4.0" "zip"
         "1dn5585nsizszjivx6lp677ka0mrg0ayqgag4yzfdz9ml8mj1xl5";
 
-      azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "10.0.0" "zip"
-        "1s3bx6knxw5dxycp43yimvgrh0i19drzd09asglcwz2x5mr3bpyg";
+      azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "11.0.0" "zip"
+        "1dnlql4z9wawf8gc1v4rr386pifwcnx3ycr4gdccqwkgimgpsdg4";
 
       azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip"
         "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs";
@@ -140,8 +140,8 @@ let
       azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "8.1.0" "zip"
         "07vpzhvi2946v5dn9cb2hkd1b9vj5c6zl32958bg2bxsjg9vvyi1";
 
-      azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "0.11.0" "zip"
-        "05j0s2ng6ck35lw85cbjf5cm6canc71c41aagr68cmiqj1li6v1z";
+      azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "0.12.0" "zip"
+        "07c0hr7nha9789x1wz0ndca0sr0zscq63m9vd8pm1c6y0ss4iyn5";
 
       azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.2.0" "zip"
         "0c6pyr36n9snx879vas5r6l25db6nlp2z96xn759mz4kg4i45qs6";
@@ -188,8 +188,8 @@ let
       azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.1.0" "zip"
         "1cb466722bs0ribrirb32kc299716pl0pwivz3jyn40dd78cwhhx";
 
-      azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.15.0" "zip"
-        "0qv58xraznv2ldhd34cvznhz045x3ncfgam9c12gxyj4q0k3pyc9";
+      azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.17.0" "zip"
+        "1kp1wzcydgyc2mzkxigfv6rqzwzf3d0cnbqc6w7h907qbb4lw2r0";
 
       azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "0.5.0" "zip"
         "1b9am8raa17hxnz7d5pk2ix0309wsnhnchq1mi22icd728sl5adm";
@@ -206,11 +206,11 @@ let
       azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "2.1.0" "zip"
         "1ikv8b2h1r91fa0srz95ymn54qpqgb5a4faxwp4hf92r5h85c8j9";
 
-      azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "4.0.0" "zip"
-        "0aphqh4mvrc1yiyis8zvks0d19d1m3lqylr9jc8fj73iw84rwgm5";
+      azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "4.1.0rc1" "zip"
+        "00q5723gvc57kg2w1iyhfchp018skwd89ibrw23p7ngm2bb76g45";
 
-      azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc8" "zip"
-        "1j2xyfid0qg95lywwsz8520r7gd8m0a487n03jxnckr91vd890v1";
+      azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc9" "zip"
+        "060m4hqi1h5h53imj0vmpbzhqkwis7h91nwinpcvjs422figcv0i";
 
       azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.7.0" "zip"
         "1pprvk5255b6brbw73g0g13zygwa7a2px5x08wy3153rqlzan5l2";
@@ -224,8 +224,8 @@ let
       azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.52.0" "zip"
         "0357laxgldb7lvvws81r8xb6mrq9dwwnr1bnwdnyj4bw6p21i9hn";
 
-      azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "7.2.0" "zip"
-        "01ck1ankgr9ikvfghhdcs777yrl2j2p8cw9q8nfdrjp22lpchabl";
+      azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "8.0.0" "zip"
+        "0cxcdyy974ya1yi7s14sw54rwpc8qjngxr0jqb8vxki3528phrv3";
 
       azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.4.0" "zip"
         "1x18grkjf2p2r1ihlwv607sna9yjvsr2jwnkjc55askrgrwx5jx2";

From c42e7c477c018f6d8018efc7fb75b71ce6bf39cc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 14 Mar 2020 10:13:29 +0000
Subject: [PATCH 3906/4636] namecoind: nc0.15.99-name-tab-beta2 -> nc0.19.1

---
 pkgs/applications/blockchains/namecoin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/blockchains/namecoin.nix b/pkgs/applications/blockchains/namecoin.nix
index 4b8dc5525dc4..02f2249862d0 100644
--- a/pkgs/applications/blockchains/namecoin.nix
+++ b/pkgs/applications/blockchains/namecoin.nix
@@ -3,14 +3,14 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  version = "nc0.15.99-name-tab-beta2";
+  version = "nc0.19.1";
   name = "namecoin" + toString (optional (!withGui) "d") + "-" + version;
 
   src = fetchFromGitHub {
     owner = "namecoin";
     repo = "namecoin-core";
     rev = version;
-    sha256 = "1r0v0yvlazmidxp6xhapbdawqb8fhzrdp11d4an5vgxa208s6wdf";
+    sha256 = "13rdvngrl2w0gk7km3sd9fy8yxzgxlkcwn50ajsbrhgzl8kx4q7m";
   };
 
   nativeBuildInputs = [
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency";
-    homepage = https://namecoin.org;
+    homepage = "https://namecoin.org";
     license = licenses.mit;
     maintainers = with maintainers; [ doublec AndersonTorres infinisil ];
     platforms = platforms.linux;

From 248097ca269cbcd1ff13788bf705f4984acc84d7 Mon Sep 17 00:00:00 2001
From: Masayuki Takeda <mtakeda.enigsol@gmail.com>
Date: Tue, 10 Mar 2020 15:58:50 +0900
Subject: [PATCH 3907/4636] pyglet: support ffmpeg libraries

---
 pkgs/development/python-modules/pyglet/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix
index e6be92c0efb5..a37872d90945 100644
--- a/pkgs/development/python-modules/pyglet/default.nix
+++ b/pkgs/development/python-modules/pyglet/default.nix
@@ -11,6 +11,7 @@
 , gdk-pixbuf
 , fontconfig
 , freetype
+, ffmpeg-full
 }:
 
 buildPythonPackage rec {
@@ -52,6 +53,8 @@ buildPythonPackage rec {
                 path = '${fontconfig.lib}/lib/libfontconfig${ext}'
             elif name == 'freetype':
                 path = '${freetype}/lib/libfreetype${ext}'
+            elif name[0:2] == 'av' or name[0:2] == 'sw':
+                path = '${ffmpeg-full}/lib/lib' + name + '${ext}'
             if path is not None:
                 return ctypes.cdll.LoadLibrary(path)
         raise Exception("Could not load library {}".format(names))

From 85b91c7bb6df501b71d6cd26ce8c27e2d8d864ba Mon Sep 17 00:00:00 2001
From: Poscat <poscat@mail.poscat.moe>
Date: Tue, 10 Mar 2020 17:33:49 +0800
Subject: [PATCH 3908/4636] vimPlugins.ats-vim: init at 2020-03-03

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 06667caf5c83..2a5d2eb0dfd7 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -125,6 +125,17 @@ let
     };
   };
 
+  ats-vim = buildVimPluginFrom2Nix {
+    pname = "ats-vim";
+    version = "2020-03-03";
+    src = fetchFromGitHub {
+      owner = "vmchale";
+      repo = "ats-vim";
+      rev = "045fa53f1e0699e980c5c7cd85ecf237ae527ff0";
+      sha256 = "1rpqy40kw0cn2h02ly71syvwz5j77xfmrs4mijkn7k0dxgamhy5s";
+    };
+  };
+
   auto-git-diff = buildVimPluginFrom2Nix {
     pname = "auto-git-diff";
     version = "2019-09-23";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 874b2471d5c4..86d9912e4ed2 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -540,6 +540,7 @@ vim-scripts/YankRing.vim
 vim-utils/vim-husk
 vimwiki/vimwiki
 vito-c/jq.vim
+vmchale/ats-vim
 vmchale/dhall-vim
 w0rp/ale
 wakatime/vim-wakatime

From ebed789ad4c7c0febcefed767b27b52e0a06d714 Mon Sep 17 00:00:00 2001
From: Millian Poquet <millian.poquet@inria.fr>
Date: Thu, 12 Mar 2020 11:25:31 +0100
Subject: [PATCH 3909/4636] pythonPackages.pytest-metadata: init at 1.8.0

---
 .../pytest-metadata/default.nix               | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-metadata/default.nix

diff --git a/pkgs/development/python-modules/pytest-metadata/default.nix b/pkgs/development/python-modules/pytest-metadata/default.nix
new file mode 100644
index 000000000000..369ddf2c4767
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-metadata/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, pytest, setuptools_scm }:
+
+buildPythonPackage rec {
+  pname = "pytest-metadata";
+  version = "1.8.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1fk6icip2x1nh4kzhbc8cnqrs77avpqvj7ny3xadfh6yhn9aaw90";
+  };
+
+  nativeBuildInputs = [ setuptools_scm ];
+  propagatedBuildInputs = [ pytest ];
+
+  meta = with stdenv.lib; {
+    description = "Plugin for accessing test session metadata";
+    homepage = "https://github.com/pytest-dev/pytest-metadata";
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ mpoquet ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3e1c9a383a86..648f14b41390 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2399,6 +2399,8 @@ in {
 
   pytest-forked = callPackage ../development/python-modules/pytest-forked { };
 
+  pytest-metadata = callPackage ../development/python-modules/pytest-metadata { };
+
   pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { };
 
   pytest-relaxed = callPackage ../development/python-modules/pytest-relaxed { };

From 487bb6c32c922c7955bb0df8dc4107f3bc2489ab Mon Sep 17 00:00:00 2001
From: Millian Poquet <millian.poquet@inria.fr>
Date: Thu, 12 Mar 2020 11:26:25 +0100
Subject: [PATCH 3910/4636] python3Packages.pytest-html: init at 2.1.0

---
 .../python-modules/pytest-html/default.nix    | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-html/default.nix

diff --git a/pkgs/development/python-modules/pytest-html/default.nix b/pkgs/development/python-modules/pytest-html/default.nix
new file mode 100644
index 000000000000..6847c5e05d4e
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-html/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
+, pytest, pytest-metadata, setuptools_scm }:
+
+buildPythonPackage rec {
+  pname = "pytest-html";
+  version = "2.1.0";
+  disabled = pythonOlder "3.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "14cy5iixi6i8i5r5xvvkhwk48zgxnb1ypbp0g1343mwfdihshic6";
+  };
+
+  nativeBuildInputs = [ setuptools_scm ];
+  propagatedBuildInputs = [ pytest pytest-metadata ];
+
+  meta = with stdenv.lib; {
+    description = "Plugin for generating HTML reports";
+    homepage = "https://github.com/pytest-dev/pytest-html";
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ mpoquet ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 648f14b41390..a76566fb228e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2399,6 +2399,8 @@ in {
 
   pytest-forked = callPackage ../development/python-modules/pytest-forked { };
 
+  pytest-html = callPackage ../development/python-modules/pytest-html { };
+
   pytest-metadata = callPackage ../development/python-modules/pytest-metadata { };
 
   pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { };

From 1630cdd085fceeca6746e42475d3d271a8b2b986 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 9 Mar 2020 14:36:23 -0400
Subject: [PATCH 3911/4636] hepmc3: 3.1.2 -> 3.2.0

---
 .../libraries/physics/hepmc3/default.nix      | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix
index d8aff555e556..ceb0669d855b 100644
--- a/pkgs/development/libraries/physics/hepmc3/default.nix
+++ b/pkgs/development/libraries/physics/hepmc3/default.nix
@@ -2,27 +2,31 @@
 
 stdenv.mkDerivation rec {
   pname = "hepmc3";
-  version = "3.1.2";
+  version = "3.2.0";
 
   src = fetchurl {
     url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC3-${version}.tar.gz";
-    sha256 = "1izcldnjbyn6myr7nv7b4jivf2vmdi64ng9gk1vjh998755hfcs1";
+    sha256 = "1z491x3blqs0a2jxmhzhmh4kqdw3ddcbvw69gidg4w6icdvkhcpi";
   };
 
-  buildInputs = [ cmake root ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ root ];
+
+  cmakeFlags = [
+    "-DHEPMC3_ENABLE_PYTHON=OFF"
+  ];
 
   postInstall = ''
     substituteInPlace "$out"/bin/HepMC3-config \
-      --replace 'greadlink' '${coreutils}/bin/readlink'
+      --replace 'greadlink' '${coreutils}/bin/readlink' \
+      --replace 'readlink' '${coreutils}/bin/readlink'
   '';
 
-  enableParallelBuilding = true;
-
   meta = with stdenv.lib; {
     description = "The HepMC package is an object oriented, C++ event record for High Energy Physics Monte Carlo generators and simulation";
-    license     = licenses.gpl3;
-    homepage    = http://hepmc.web.cern.ch/hepmc/;
-    platforms   = platforms.unix;
+    license = licenses.gpl3;
+    homepage = "http://hepmc.web.cern.ch/hepmc/";
+    platforms = platforms.unix;
     maintainers = with maintainers; [ veprbl ];
   };
 }

From 61bc9e12a4e09307aa986369baa66cc739791e6f Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 9 Mar 2020 14:37:20 -0400
Subject: [PATCH 3912/4636] hepmc3: add python support

---
 .../libraries/physics/hepmc3/default.nix          | 15 ++++++++++++---
 pkgs/top-level/all-packages.nix                   |  4 +++-
 pkgs/top-level/python-packages.nix                |  4 ++++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix
index ceb0669d855b..a07c3c19a1bb 100644
--- a/pkgs/development/libraries/physics/hepmc3/default.nix
+++ b/pkgs/development/libraries/physics/hepmc3/default.nix
@@ -1,4 +1,9 @@
-{ stdenv, fetchurl, cmake, coreutils, root }:
+{ stdenv, fetchurl, cmake, coreutils, python, root }:
+
+let
+  pythonVersion = with stdenv.lib.versions; "${major python.version}${minor python.version}";
+  withPython = python != null;
+in
 
 stdenv.mkDerivation rec {
   pname = "hepmc3";
@@ -10,10 +15,14 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ root ];
+  buildInputs = [ root ]
+    ++ stdenv.lib.optional withPython python;
 
   cmakeFlags = [
-    "-DHEPMC3_ENABLE_PYTHON=OFF"
+    "-DHEPMC3_ENABLE_PYTHON=${if withPython then "ON" else "OFF"}"
+  ] ++ stdenv.lib.optionals withPython [
+    "-DHEPMC3_PYTHON_VERSIONS=${if python.isPy3k then "3.X" else "2.X"}"
+    "-DHEPMC3_Python_SITEARCH${pythonVersion}=${placeholder "out"}/${python.sitePackages}"
   ];
 
   postInstall = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e678efb3048..8ad14f8dfb97 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25153,7 +25153,9 @@ in
 
   hepmc2 = callPackage ../development/libraries/physics/hepmc2 { };
 
-  hepmc3 = callPackage ../development/libraries/physics/hepmc3 { };
+  hepmc3 = callPackage ../development/libraries/physics/hepmc3 {
+    python = null;
+  };
 
   herwig = callPackage ../development/libraries/physics/herwig { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a76566fb228e..46a2f803d25a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2256,6 +2256,10 @@ in {
 
   jsonrpc-websocket = callPackage ../development/python-modules/jsonrpc-websocket { };
 
+  hepmc3 = toPythonModule (pkgs.hepmc3.override {
+    inherit python;
+  });
+
   onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { };
 
   tablib = callPackage ../development/python-modules/tablib { };

From 1ca3c56542c6af3e849910815b82eb1b08d1c704 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 9 Mar 2020 14:54:34 -0400
Subject: [PATCH 3913/4636] remove pythonPackages.pyhepmc

pythonPackages.hepmc3 should cover this functionality
---
 .../python-modules/pyhepmc/default.nix        |  59 -----
 .../pyhepmc/pyhepmc_export_edges.patch        | 204 ------------------
 .../pyhepmc/pyhepmc_export_flow.patch         |  20 --
 pkgs/top-level/python-packages.nix            |   2 -
 4 files changed, 285 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pyhepmc/default.nix
 delete mode 100644 pkgs/development/python-modules/pyhepmc/pyhepmc_export_edges.patch
 delete mode 100644 pkgs/development/python-modules/pyhepmc/pyhepmc_export_flow.patch

diff --git a/pkgs/development/python-modules/pyhepmc/default.nix b/pkgs/development/python-modules/pyhepmc/default.nix
deleted file mode 100644
index 26a91a313ee4..000000000000
--- a/pkgs/development/python-modules/pyhepmc/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-, fetchFromBitbucket
-, isPy3k
-, pkgs
-, python
-}:
-
-buildPythonPackage rec {
-  pname = "pyhepmc";
-  version = "1.0.1";
-  disabled = isPy3k;
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1210fd7e20d4abc1d9166147a9f7645a2a58b655fe030ad54ab3ea0d0c6e0834";
-  };
-
-  srcMissing = fetchFromBitbucket {
-    owner = "andybuckley";
-    repo = "pyhepmc";
-    rev = "pyhepmc-1.0.0";
-    sha256 = "0vxad143pz45q94w5p0dycpk24insdsv1m5k867y56xy24bi0d4w";
-  };
-
-  prePatch = ''
-    cp -r $srcMissing/hepmc .
-    chmod +w hepmc
-  '';
-
-  patches = [
-    # merge PR https://bitbucket.org/andybuckley/pyhepmc/pull-requests/1/add-incoming-outgoing-generators-for/diff
-    ./pyhepmc_export_edges.patch
-    # add bindings to Flow class
-    ./pyhepmc_export_flow.patch
-  ];
-
-  # regenerate python wrapper
-  preConfigure = ''
-    swig -c++ -I${pkgs.hepmc}/include -python hepmc/hepmcwrap.i
-  '';
-
-  nativeBuildInputs = [ pkgs.swig ];
-  buildInputs = [ pkgs.hepmc2 ];
-
-  HEPMCPATH = pkgs.hepmc2;
-
-  checkPhase = ''
-    ${python.interpreter} test/test1.py
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A simple wrapper on the main classes of the HepMC event simulation representation, making it possible to create, read and manipulate HepMC events from Python code";
-    license     = licenses.gpl2;
-    maintainers = with maintainers; [ veprbl ];
-  };
-
-}
diff --git a/pkgs/development/python-modules/pyhepmc/pyhepmc_export_edges.patch b/pkgs/development/python-modules/pyhepmc/pyhepmc_export_edges.patch
deleted file mode 100644
index 5c6e56566a34..000000000000
--- a/pkgs/development/python-modules/pyhepmc/pyhepmc_export_edges.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-# HG changeset patch
-# User Lukas Heinrich <lukas.heinrich@gmail.com>
-# Date 1430606843 14400
-# Node ID 325f89b7b72922e9add9ca9dd0f7ca4a6c83bf00
-# Parent  e4fd953257e0d38511f2177de7ffaef662358af2
-add incoming/outgoing generators for GenVertex
-
-diff --git a/hepmc/generators.i b/hepmc/generators.i
-new file mode 100644
---- /dev/null
-+++ b/hepmc/generators.i
-@@ -0,0 +1,171 @@
-+/*!
-+ * \file   generators.i
-+ * \author Seth R. Johnson
-+ * \brief  Define generator/iterator for any type
-+
-+Example:
-+\code
-+    SETUP_GENERATOR( std::vector<Cell>::const_iterator )
-+    ADD_GENERATOR( Mesh, cells,
-+    std::vector<Cell>::const_iterator, Cell, beginCells, endCells)
-+\endcode
-+would be a method to add a \c cells generator method method to the Python class
-+\c Mesh, when the C++ class \c Mesh has a \c std::vector<Cell> accessed through
-+methods \c beginCells and \c endCells.
-+
-+The macro \c ADD_GENERATOR_P would be if the underlying storage were \c
-+std::vector<Cell*> instead.
-+
-+Alternatively, for containers of regular objects that provide \c begin(), \c end(), and \c const_iterator, you can use the \c ADD_CONTAINER_ITERATOR macro:
-+\code
-+ADD_CONTAINER_ITERATOR( QuadratureSet )
-+\endcode
-+
-+\section License
-+
-+Copyright (c) 2010, Seth R. Johnson
-+All rights reserved.
-+
-+Redistribution and use in source and binary forms, with or without
-+modification, are permitted provided that the following conditions are met:
-+ * Redistributions of source code must retain the above copyright notice, this
-+   list of conditions and the following disclaimer.
-+ * Redistributions in binary form must reproduce the above copyright notice,
-+   this list of conditions and the following disclaimer in the documentation
-+   and/or other materials provided with the distribution.
-+ * Neither the name of the this project nor the names of its contributors
-+   may be used to endorse or promote products derived from this software
-+   without specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+
-+ This material is based upon work supported under a National Science
-+ Foundation Graduate Research Fellowship. Any opinions, findings, conclusions
-+ or recommendations expressed in this publication are those of the author
-+ and do not necessarily reflect the views of the National Science
-+ Foundation.
-+*/
-+#ifndef tools_SWIG_generators_i
-+#define tools_SWIG_generators_i
-+/*----------------------------------------------------------------------------*/
-+
-+// Add a Python class to provide iterator objects
-+%insert("python") %{
-+class GenericIterator:
-+    def __init__(self, begin_iter_method, deref_method, incr_method):
-+        self.it = begin_iter_method()
-+        self.incr   = incr_method
-+        self.deref  = deref_method
-+
-+    def __iter__(self):
-+        return self
-+
-+    def next(self):
-+        obj = self.deref( self.it )
-+        if obj is not None:
-+            self.incr( self.it )
-+            return obj
-+        else:
-+            raise StopIteration
-+%}
-+
-+//============== GENERIC GENERATOR/ITERATOR WRAPPER SUPPORT ============
-+//! Thin wrapper for incrementing a certain type of iterator
-+// only need to define once per iterator type, and we can use the same name
-+// thanks to overloading (even though this may decrease efficiency)
-+%define SETUP_GENERATOR( ITERATOR... )
-+%inline %{
-+void _iter_incr( ITERATOR* iter )
-+{
-+    ++(*iter);
-+}
-+%}
-+%enddef
-+
-+/*----------------------------------------------------------------------------*/
-+// Internal method for adding common parts of the generator
-+%define PYTRT_BASE_ADD_GENERATOR( CLASS, PYMETHOD, ITERATOR, CBEGIN )
-+    %extend CLASS {
-+%insert("python") %{
-+    def PYMETHOD(self):
-+        "Returns an iterator for PYMETHOD."
-+        return GenericIterator(
-+                self._begin_ ## PYMETHOD,
-+                self._deref_ ## PYMETHOD,
-+                _iter_incr
-+                 )
-+%}
-+// get the first element in the vector
-+ITERATOR* _begin_ ## PYMETHOD()
-+{
-+    return new ITERATOR( ($self)->CBEGIN() );
-+}
-+    }
-+%enddef
-+/*----------------------------------------------------------------------------*/
-+// If the dereferenced iterator is an object
-+%define ADD_GENERATOR( CLASS, PYMETHOD, ITERATOR, RVALUE, CBEGIN, CEND )
-+
-+// add the python and begin method
-+PYTRT_BASE_ADD_GENERATOR( CLASS, PYMETHOD, ITERATOR, CBEGIN )
-+
-+    %extend CLASS {
-+//! Dereference the iterator; return NULL if at the end
-+const RVALUE* _deref_ ## PYMETHOD ## ( const ITERATOR* iter )
-+{
-+    // if at the end, return NULL
-+    if (*iter == ($self)->CEND() ) {
-+        return NULL;
-+    }
-+    // otherwise, return the POINTER to the dereferenced iterator
-+    return &(**iter);
-+}
-+    }
-+%enddef
-+/*----------------------------------------------------------------------------*/
-+// If the dereferenced iterator is a pointer
-+%define ADD_GENERATOR_P( CLASS, PYMETHOD, ITERATOR, RVALUE, CBEGIN, CEND )
-+
-+// add the python and begin method
-+PYTRT_BASE_ADD_GENERATOR( CLASS, PYMETHOD, ITERATOR, CBEGIN )
-+
-+    %extend CLASS {
-+//! Dereference the iterator; return NULL if at the end
-+const RVALUE* _deref_ ## PYMETHOD ## ( const ITERATOR* iter )
-+{
-+    // if at the end, return NULL
-+    if (*iter == ($self)->CEND() ) {
-+        return NULL;
-+    }
-+    // otherwise, return the dereferenced iterator (a pointer)
-+    return **iter;
-+}
-+    }
-+%enddef
-+/*----------------------------------------------------------------------------*/
-+//! For a regular container with "begin" and "end" and "size"
-+%define ADD_CONTAINER_ITERATOR( CLASS )
-+    SETUP_GENERATOR( CLASS::const_iterator );
-+    ADD_GENERATOR( CLASS, __iter__,
-+            CLASS ## ::const_iterator, CLASS ## ::value_type,
-+            begin, end)
-+    %extend CLASS {
-+    %insert("python") %{
-+    def __len__(self):
-+        return self.size()
-+    %}
-+    }
-+%enddef
-+
-+/*============================================================================*/
-+#endif
-+
-diff --git a/hepmc/hepmcwrap.i b/hepmc/hepmcwrap.i
---- a/hepmc/hepmcwrap.i
-+++ b/hepmc/hepmcwrap.i
-@@ -1,5 +1,7 @@
- %module hepmcwrap
- 
-+%include generators.i
-+
- %{
-   #include "HepMC/GenEvent.h"
-   #include "HepMC/GenVertex.h"
-@@ -251,3 +253,9 @@
-     return ss.str();
-   }
- }
-+
-+SETUP_GENERATOR( std::vector< HepMC::GenParticle* >::const_iterator )
-+ADD_GENERATOR_P( HepMC::GenVertex, incoming,
-+std::vector< HepMC::GenParticle* >::const_iterator, HepMC::GenParticle, particles_in_const_begin, particles_in_const_end)
-+ADD_GENERATOR_P( HepMC::GenVertex, outgoing,
-+std::vector< HepMC::GenParticle* >::const_iterator, HepMC::GenParticle, particles_out_const_begin, particles_out_const_end)
diff --git a/pkgs/development/python-modules/pyhepmc/pyhepmc_export_flow.patch b/pkgs/development/python-modules/pyhepmc/pyhepmc_export_flow.patch
deleted file mode 100644
index 85e26a1a1607..000000000000
--- a/pkgs/development/python-modules/pyhepmc/pyhepmc_export_flow.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/hepmc/hepmcwrap.i b/hepmc/hepmcwrap.i
-index cf35c1b..b94fbe2 100644
---- a/hepmc/hepmcwrap.i
-+++ b/hepmc/hepmcwrap.i
-@@ -1,6 +1,7 @@
- %module hepmcwrap
- 
- %{
-+  #include "HepMC/Flow.h"
-   #include "HepMC/GenEvent.h"
-   #include "HepMC/GenVertex.h"
-   #include "HepMC/GenParticle.h"
-@@ -93,6 +94,7 @@ namespace HepMC {
- // headers before importing headers that use those classes.
- // Result is that headers should probably be %included in an order
- // which sees "contents before containers"
-+%include "HepMC/Flow.h"
- %include "HepMC/HepMCDefs.h"
- %include "HepMC/SimpleVector.h"
- // #ifdef HEPMC_HAS_ITERATOR_RANGES
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 46a2f803d25a..bb91019263d6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2351,8 +2351,6 @@ in {
 
   pyhcl = callPackage ../development/python-modules/pyhcl { };
 
-  pyhepmc = callPackage ../development/python-modules/pyhepmc { };
-
   pytest = if isPy3k then self.pytest_5 else self.pytest_4;
 
   pytest_5 = callPackage ../development/python-modules/pytest {

From b70d749db8fb9da7f8efe4b67b33a892312612c6 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Wed, 20 Nov 2019 09:50:38 +0100
Subject: [PATCH 3914/4636] python.pkgs.bacpypes: init at 0.18.0

Co-Authored-By: Jon <jonringer@users.noreply.github.com>
---
 .../python-modules/bacpypes/default.nix       | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/bacpypes/default.nix

diff --git a/pkgs/development/python-modules/bacpypes/default.nix b/pkgs/development/python-modules/bacpypes/default.nix
new file mode 100644
index 000000000000..141dbf241f25
--- /dev/null
+++ b/pkgs/development/python-modules/bacpypes/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, buildPythonPackage, fetchPypi, fetchFromGitHub
+, wheel, pytestCheckHook, pytestrunner }:
+
+buildPythonPackage rec {
+  version = "0.18.0";
+  pname = "bacpypes";
+
+  src = fetchFromGitHub {
+    owner = "JoelBender";
+    repo = "bacpypes";
+    rev = "${version}";
+    sha256 = "1nz0qi46z6n455mw2ppxgz091qh0irizlxpvkx7iw1l7f6mmgj0x";
+  };
+
+  propagatedBuildInputs = [ wheel ];
+
+  # Using pytes instead of setuptools check hook allows disabling specific tests
+  checkInputs = [ pytestCheckHook pytestrunner ];
+  dontUseSetuptoolsCheck = true;
+  disabledTests = [
+    # Test fails with a an error: AssertionError: assert 30 == 31
+    "test_recurring_task_5"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/JoelBender/bacpypes";
+    description = "BACpypes provides a BACnet application layer and network layer written in Python for daemons, scripting, and graphical interfaces.";
+    license = licenses.mit;
+    maintainers = with maintainers; [ bachp ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bb91019263d6..d9cb6c19bd29 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -477,6 +477,8 @@ in {
 
   backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {};
 
+  bacpypes = callPackage ../development/python-modules/bacpypes {};
+
   bap = callPackage ../development/python-modules/bap {
     bap = pkgs.ocaml-ng.ocamlPackages_4_06.bap;
   };

From b06679ef68dce538ddbf8ba7abf5fe36931b3678 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 24 Mar 2020 19:55:40 +0000
Subject: [PATCH 3915/4636] gucharmap: do not depend on libtool after the
 switch to meson

Thanks to @doronbehar for the observation.
---
 pkgs/desktops/gnome-3/core/gucharmap/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
index 3d2da33732b2..b6e8b4c11c03 100644
--- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix
+++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix
@@ -10,7 +10,6 @@
 , glib
 , desktop-file-utils
 , gtk-doc
-, libtool
 , wrapGAppsHook
 , gnome3
 , itstool
@@ -66,7 +65,6 @@ in stdenv.mkDerivation rec {
     unzip
     intltool
     itstool
-    libtool
     gtk-doc
     docbook_xsl
     docbook_xml_dtd_412

From e51c7f60cb33db272276a576cce21c8ee791c929 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 24 Mar 2020 21:17:53 +0100
Subject: [PATCH 3916/4636] nixos/release-small.nix: Export options job

---
 nixos/release-small.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/release-small.nix b/nixos/release-small.nix
index 7b86a91357ec..2a15073b6698 100644
--- a/nixos/release-small.nix
+++ b/nixos/release-small.nix
@@ -28,7 +28,7 @@ let
 in rec {
 
   nixos = {
-    inherit (nixos') channel manual iso_minimal dummy;
+    inherit (nixos') channel manual options iso_minimal dummy;
     tests = {
       inherit (nixos'.tests)
         containers-imperative

From 66b8e420ba2c0efe09c957e8861cee847222bb77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 24 Mar 2020 17:49:11 -0300
Subject: [PATCH 3917/4636] roboto-slab: 2016-01-11 -> 2.000

- use the version from the ttf file
- source is the github repository for the font
---
 pkgs/data/fonts/roboto-slab/default.nix | 55 +++++++------------------
 1 file changed, 16 insertions(+), 39 deletions(-)

diff --git a/pkgs/data/fonts/roboto-slab/default.nix b/pkgs/data/fonts/roboto-slab/default.nix
index f9f6ec342e91..1fec03b46fe4 100644
--- a/pkgs/data/fonts/roboto-slab/default.nix
+++ b/pkgs/data/fonts/roboto-slab/default.nix
@@ -1,51 +1,28 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub }:
 
-let
-  # last commit on the directory containing the fonts in the upstream repository
-  commit = "883939708704a19a295e0652036369d22469e8dc";
-in
 stdenv.mkDerivation {
   pname = "roboto-slab";
-  version = "2016-01-11";
+  version = "2.000";
 
-  srcs = [
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotoslab/RobotoSlab-Regular.ttf";
-      sha256 = "04180b5zk2nzll1rrgx8f1i1za66pk6pbrp0iww2xypjqra5zahk";
-    })
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotoslab/RobotoSlab-Bold.ttf";
-      sha256 = "0ayl2hf5j33vixxfa7051hzjjxnx8zhag3rr0mmmnxpsn7md44ms";
-    })
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotoslab/RobotoSlab-Light.ttf";
-      sha256 = "09riqgj9ixqjdb3mkzbs799cgmnp3ja3d6izlqkhpkfm52sgafqm";
-    })
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotoslab/RobotoSlab-Thin.ttf";
-      sha256 = "1hd0m7lxhr261a4s2nb572ari6v53w2yd8yjr9i534iqfl4jcbsf";
-    })
-  ];
-
-  sourceRoot = "./";
-
-  unpackCmd = ''
-    ttfName=$(basename $(stripHash $curSrc))
-    cp $curSrc ./$ttfName
-  '';
+  src = fetchFromGitHub {
+    owner = "googlefonts";
+    repo = "robotoslab";
+    rev = "baeeba45e0c3ccdcfb6a70dc564785941aafef5d";
+    sha256 = "1v6z0a2xgwgf9dyj62sriy8ckwpbwlxkki6gfax1f4h4livvzpdn";
+  };
 
   installPhase = ''
     mkdir -p $out/share/fonts/truetype
-    cp -a *.ttf $out/share/fonts/truetype/
+    cp -a fonts/static/*.ttf $out/share/fonts/truetype/
   '';
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "0imhvisjzi0rvn32hn04kngca4szx0j39h4c4zs7ryb4wdca76q9";
+  outputHash = "0g663npi5lkvwcqafd4cjrm90ph0nv1lig7d19xzfymnj47qpj8x";
 
-  meta = {
-    homepage = https://www.google.com/fonts/specimen/Roboto+Slab;
-    description = "Google Roboto Slab fonts";
+  meta = with stdenv.lib; {
+    homepage = "https://www.google.com/fonts/specimen/Roboto+Slab";
+    description = "Roboto Slab Typeface by Google";
     longDescription = ''
       Roboto has a dual nature. It has a mechanical skeleton and the forms
       are largely geometric. At the same time, the font features friendly
@@ -57,8 +34,8 @@ stdenv.mkDerivation {
       This is the Roboto Slab family, which can be used alongside the normal
       Roboto family and the Roboto Condensed family.
     '';
-    license = stdenv.lib.licenses.asl20;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = [ maintainers.romildo ];
   };
 }

From d7d3b0deff85767fede0ccfb09165f9c6e47c4a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= <daniel@serbanescu.dk>
Date: Tue, 24 Mar 2020 22:17:40 +0100
Subject: [PATCH 3918/4636] hplip: 3.19.12 -> 3.20.3

---
 pkgs/misc/drivers/hplip/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 1514e8def970..4678442abd99 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -12,16 +12,16 @@
 let
 
   name = "hplip-${version}";
-  version = "3.19.12";
+  version = "3.20.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/hplip/${name}.tar.gz";
-    sha256 = "0mdj0sqgfxjqa550adiw1gn4z9n6wcvn55slivgf0ndn5x89iwxp";
+    sha256 = "0sh6cg7yjc11x1cm4477iaslj9n8ksghs85hqwgfbk7m5b2pw2a1";
   };
 
   plugin = fetchurl {
     url = "https://developers.hp.com/sites/default/files/${name}-plugin.run";
-    sha256 = "1fn8h1a5znjqjh071ifjdywr0xswc14286gwy6h9vvlh8hzrz347";
+    sha256 = "13xyv30jqjysfk7gh0gyn7qj0pb0qvk2rlbhm85a3lw7bjycal8g";
   };
 
   hplipState = substituteAll {

From 9146a0cd802f5e6f222ae6365880aef141a637f8 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 24 Mar 2020 22:26:53 +0100
Subject: [PATCH 3919/4636] nano: 4.7 -> 4.9

See https://lists.gnu.org/archive/html/info-gnu/2020-03/msg00011.html
for release information.
---
 pkgs/applications/editors/nano/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 4197792d7365..3350f6a3db3e 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -20,11 +20,11 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "nano";
-  version = "4.7";
+  version = "4.9";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
-    sha256 = "1x9nqy2kgaz6087p63i71gdjsqbdc9jjpx1ymlyclfakvsby3h2q";
+    sha256 = "19ik88b3g0d9xwav4hkai2h1acmjy5fdnh21gdc1mjq5s4lrff8f";
   };
 
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;

From 504fe636f268a9d51f93ba7e00373def744d4f7d Mon Sep 17 00:00:00 2001
From: Jan Beinke <git@janbeinke.com>
Date: Mon, 23 Mar 2020 20:03:08 +0100
Subject: [PATCH 3920/4636] python3Packages.pymumble: init at 0.3.1

---
 .../python-modules/pymumble/default.nix       | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/pymumble/default.nix

diff --git a/pkgs/development/python-modules/pymumble/default.nix b/pkgs/development/python-modules/pymumble/default.nix
new file mode 100644
index 000000000000..6e72309a58d3
--- /dev/null
+++ b/pkgs/development/python-modules/pymumble/default.nix
@@ -0,0 +1,31 @@
+{ buildPythonPackage,
+  fetchFromGitHub,
+  isPy27,
+  lib,
+  opuslib,
+  protobuf,
+}:
+
+buildPythonPackage rec {
+  pname = "pymumble";
+  version = "0.3.1";
+  disabled = isPy27;
+
+  src = fetchFromGitHub {
+    owner = "azlux";
+    repo = "pymumble";
+    rev = "1dd6d6d4df2fdef33202f17e2acf3ba9678a5737";
+    sha256 = "1r1sch8xrpbzffsb72lhp5xjr3ac3xb599n44vsfmaam3xklz6vz";
+  };
+
+  propagatedBuildInputs = [ opuslib protobuf ];
+
+  pythonImportsCheck = [ "pymumble_py3" ];
+
+  meta = with lib; {
+    description = "Python 3 version of pymumble, Mumble library used for multiple uses like making mumble bot.";
+    homepage = "https://github.com/azlux/pymumble";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ thelegy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d9cb6c19bd29..c2402d2a1605 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5068,6 +5068,8 @@ in {
 
   pylint-plugin-utils = callPackage ../development/python-modules/pylint-plugin-utils { };
 
+  pymumble = callPackage ../development/python-modules/pymumble { };
+
   pyomo = callPackage ../development/python-modules/pyomo { };
 
   pyopencl = callPackage ../development/python-modules/pyopencl { };

From b3c2908825233ffe5381f91d5f6733316c8ce1be Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 24 Mar 2020 22:49:19 +0100
Subject: [PATCH 3921/4636] chromium: I accidentally added the webrtc patch
 into the wrong section

---
 pkgs/applications/networking/browsers/chromium/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index a5f79805aba3..784fe45a03b6 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -137,6 +137,8 @@ let
       ./patches/no-build-timestamps.patch
       ./patches/widevine-79.patch
       ./patches/dont-use-ANGLE-by-default.patch
+      # fix race condition in the interaction with pulseaudio
+      ./patches/webrtc-pulse.patch
       # Unfortunately, chromium regularly breaks on major updates and
       # then needs various patches backported in order to be compiled with GCC.
       # Good sources for such patches and other hints:
@@ -149,8 +151,6 @@ let
     ] ++ optionals (useVaapi) [
       # source: https://aur.archlinux.org/cgit/aur.git/tree/vaapi-fix.patch?h=chromium-vaapi
       ./patches/vaapi-fix.patch
-      # fix race condition in the interaction with pulseaudio
-      ./patches/webrtc-pulse.patch
     ];
 
     postPatch = ''

From 015bb28ae18f36cb17073ffeefb34ea61c92ab53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Tue, 24 Mar 2020 17:37:37 +0100
Subject: [PATCH 3922/4636] chromium: Enable swiftshader by default.

This makes it possible to use chromium headless with WebGL
(e.g. for webdriver tests) without having to rebuild from source.

The upstram default is to enable, thus simply removing our disabling switch.

Also fixes #41918.
---
 .../networking/browsers/chromium/browser.nix           | 10 ++++++++++
 .../networking/browsers/chromium/common.nix            |  1 -
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index ec69f3d233f4..edbf97e89633 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -18,6 +18,16 @@ mkChromiumDerivation (base: rec {
     cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"
     cp -v "$buildPath/chrome" "$libExecPath/$packageName"
 
+    # Swiftshader
+    # See https://stackoverflow.com/a/4264351/263061 for the find invocation.
+    if [ -n "$(find "$buildPath/swiftshader/" -maxdepth 1 -name '*.so' -print -quit)" ]; then
+      echo "Swiftshader files found; installing"
+      mkdir -p "$libExecPath/swiftshader"
+      cp -v "$buildPath/swiftshader/"*.so "$libExecPath/swiftshader/"
+    else
+      echo "Swiftshader files not found"
+    fi
+
     mkdir -p "$sandbox/bin"
     cp -v "$buildPath/chrome_sandbox" "$sandbox/bin/${sandboxExecutableName}"
 
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 255b399ef3da..88af180e2c8d 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -244,7 +244,6 @@ let
       is_clang = stdenv.cc.isClang;
       clang_use_chrome_plugins = false;
       blink_symbol_level = 0;
-      enable_swiftshader = false;
       fieldtrial_testing_like_official_build = true;
 
       # Google API keys, see:

From befbb792b9d14879f560d5fa26daf7714a3987bd Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 25 Mar 2020 00:21:57 +0200
Subject: [PATCH 3923/4636] pythonPackages.beets: add unconditionally deps
 needed for checks

---
 pkgs/tools/audio/beets/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 1eb8dd114f5f..4234889ac4d0 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -172,6 +172,13 @@ in pythonPackages.buildPythonApplication rec {
     nose
     rarfile
     responses
+    # Although considered as plugin dependencies, they are needed for the
+    # tests, for disabling them via an override makes the build fail. see:
+    # https://github.com/beetbox/beets/blob/v1.4.9/setup.py
+    pylast
+    mpd2
+    discogs_client
+    pyxdg
   ];
 
   patches = [

From 618bca7054f946a33b3f65dfd304035e399426ee Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 24 Mar 2020 08:33:34 +0100
Subject: [PATCH 3924/4636] =?UTF-8?q?alt-ergo:=202.3.0=20=E2=86=92=202.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../science/logic/alt-ergo/default.nix        | 44 ++++++++++++++-----
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix
index f83480cfbafc..ad931c23d53c 100644
--- a/pkgs/applications/science/logic/alt-ergo/default.nix
+++ b/pkgs/applications/science/logic/alt-ergo/default.nix
@@ -1,26 +1,48 @@
-{ fetchurl, stdenv, which, dune, ocamlPackages }:
+{ fetchurl, lib, which, ocamlPackages }:
 
-stdenv.mkDerivation rec {
+let
   pname = "alt-ergo";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchurl {
     url    = "https://alt-ergo.ocamlpro.com/download_manager.php?target=${pname}-${version}.tar.gz";
     name   = "${pname}-${version}.tar.gz";
-    sha256 = "1ycr3ff0gacq1aqzs16n6swgfniwpim0m7rvhcam64kj0a80c6bz";
+    sha256 = "124n836alqm13245hcnxixzc6a15rip919shfflvxqnl617mkmhg";
   };
 
-  buildInputs = [ dune which ] ++ (with ocamlPackages; [
-    ocaml findlib camlzip lablgtk menhir num ocplib-simplex psmt2-frontend seq zarith
-  ]);
-
   preConfigure = "patchShebangs ./configure";
 
+  nativeBuildInputs = [ which ];
+
+in
+
+let alt-ergo-lib = ocamlPackages.buildDunePackage rec {
+  pname = "alt-ergo-lib";
+  inherit version src preConfigure nativeBuildInputs;
+  configureFlags = pname;
+  propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex zarith ];
+}; in
+
+let alt-ergo-parsers = ocamlPackages.buildDunePackage rec {
+  pname = "alt-ergo-parsers";
+  inherit version src preConfigure nativeBuildInputs;
+  configureFlags = pname;
+  buildInputs = with ocamlPackages; [ menhir ];
+  propagatedBuildInputs = [ alt-ergo-lib ] ++ (with ocamlPackages; [ camlzip psmt2-frontend ]);
+}; in
+
+ocamlPackages.buildDunePackage {
+
+  inherit pname version src preConfigure nativeBuildInputs;
+
+  configureFlags = pname;
+
+  buildInputs = [ alt-ergo-parsers ocamlPackages.menhir ];
+
   meta = {
     description = "High-performance theorem prover and SMT solver";
     homepage    = "https://alt-ergo.ocamlpro.com/";
-    license     = stdenv.lib.licenses.ocamlpro_nc;
-    platforms   = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    license     = lib.licenses.ocamlpro_nc;
+    maintainers = [ lib.maintainers.thoughtpolice ];
   };
 }

From 9fe4a634c1f3171b356d2fe986deab1b2d5ceda4 Mon Sep 17 00:00:00 2001
From: Jeff Labonte <jeff.labonte12@gmail.com>
Date: Wed, 4 Mar 2020 11:32:15 -0500
Subject: [PATCH 3925/4636] protonvpn-cli-ng: 2.2.0 -> 2.2.2

---
 .../networking/protonvpn-cli-ng/default.nix       | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/protonvpn-cli-ng/default.nix b/pkgs/applications/networking/protonvpn-cli-ng/default.nix
index 03d1a665273e..e62bc21ab5b8 100644
--- a/pkgs/applications/networking/protonvpn-cli-ng/default.nix
+++ b/pkgs/applications/networking/protonvpn-cli-ng/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, lib, fetchFromGitHub, python3Packages, openvpn, dialog }:
+{ lib, fetchFromGitHub, python3Packages, openvpn, dialog, iptables }:
 
 python3Packages.buildPythonApplication rec {
-  name = "protonvpn-cli-ng";
-  version = "2.2.0";
+  pname = "protonvpn-cli-ng";
+  version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "protonvpn";
-    repo = "protonvpn-cli-ng";
+    repo = "${pname}";
     rev = "v${version}";
-    sha256 = "11fvnnr5p3qdc4y10815jnydcjvxlxwkkq9kvaajg0yszq84rwkz";
+    sha256 = "0ixjb02kj4z79whm1izd8mrn2h0rp9cmw4im1qvp93rahqxdd4n8";
   };
 
   propagatedBuildInputs = (with python3Packages; [
@@ -19,15 +19,16 @@ python3Packages.buildPythonApplication rec {
     ]) ++ [
       dialog
       openvpn
+      iptables
     ];
 
   # No tests
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Linux command-line client for ProtonVPN";
     homepage = "https://github.com/protonvpn/protonvpn-cli-ng";
-    maintainers = [ maintainers.jtcoolen ];
+    maintainers = with maintainers; [ jtcoolen jefflabonte ];
     license = licenses.gpl3;
     platforms = platforms.unix;
   };

From 7558e910bbb7234b1062b48fb5af5d5112991b8e Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 24 Mar 2020 16:08:43 -0700
Subject: [PATCH 3926/4636] pythonPackages.azure-common: 1.1.24 -> 1.1.25

---
 pkgs/development/python-modules/azure-common/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-common/default.nix b/pkgs/development/python-modules/azure-common/default.nix
index b842a66cd278..abf27b5d7ef2 100644
--- a/pkgs/development/python-modules/azure-common/default.nix
+++ b/pkgs/development/python-modules/azure-common/default.nix
@@ -9,14 +9,14 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.1.24";
+  version = "1.1.25";
   pname = "azure-common";
   disabled = isPyPy;
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "184ad6a05a3089dfdc1ce07c1cbfa489bbc45b5f6f56e848cac0851e6443da21";
+    sha256 = "ce0f1013e6d0e9faebaf3188cc069f4892fc60a6ec552e3f817c1a2f92835054";
   };
 
   propagatedBuildInputs = [

From 6dedf6b23010b5cf51e194eb5c1cdf65fbff9c61 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 24 Mar 2020 16:08:43 -0700
Subject: [PATCH 3927/4636] pythonPackages.azure-core: 1.2.2 -> 1.3.0

---
 pkgs/development/python-modules/azure-core/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix
index 24675200b5b1..2e87db4fb6ce 100644
--- a/pkgs/development/python-modules/azure-core/default.nix
+++ b/pkgs/development/python-modules/azure-core/default.nix
@@ -1,6 +1,7 @@
 { lib, buildPythonPackage, fetchPypi, isPy27
 , aiodns
 , aiohttp
+, mock
 , msrest
 , pytest
 , pytestCheckHook
@@ -11,14 +12,14 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.2.2";
+  version = "1.3.0";
   pname = "azure-core";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "0bz4m6kmqymxlxf9qk6jw8v895d13rsggbgsjpsbvi9px6w15nwb";
+    sha256 = "98d03a35845fe5b6abaa32f5961214da3e16c4c82b8c601926fc5e7f3a39549e";
   };
 
   propagatedBuildInputs = [
@@ -29,6 +30,7 @@ buildPythonPackage rec {
   checkInputs = [
     aiodns
     aiohttp
+    mock
     msrest
     pytest
     pytestCheckHook

From cfbfd35a8ab5be19e7c8b42ff39a0c9cc52a2b99 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 24 Mar 2020 16:08:43 -0700
Subject: [PATCH 3928/4636] pythonPackages.azure-identity: 1.1.0 -> 1.3.0

---
 pkgs/development/python-modules/azure-identity/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix
index e4b894eca64b..78fd74020980 100644
--- a/pkgs/development/python-modules/azure-identity/default.nix
+++ b/pkgs/development/python-modules/azure-identity/default.nix
@@ -17,13 +17,13 @@
 
 buildPythonPackage rec {
   pname = "azure-identity";
-  version = "1.1.0";
+  version = "1.3.0";
   disabled = isPy38;
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1xn4nwi4vly8n3mmphv0wbdg9k55gsgmk3fdwma8rm3m3c7593hc";
+    sha256 = "17fa904e0447fd2a2dc19909379edb769b05656dbaf4863b8c4fdfb2bb54350c";
   };
 
   propagatedBuildInputs = [

From 27b87aee99fba9ed4be04990302705f255ffcf12 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 24 Mar 2020 16:08:43 -0700
Subject: [PATCH 3929/4636] pythonPackages.azure-keyvault-keys: 4.0.0 -> 4.1.0

---
 .../python-modules/azure-keyvault-keys/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix
index 34629e6eb48d..de2b87ecb5c8 100644
--- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix
+++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "azure-keyvault-keys";
-  version = "4.0.0";
+  version = "4.1.0";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1l1fwm8plzr5zbv02nlvs0i8ssmd88cxm5lb19i54b3scci77hiq";
+    sha256 = "f9967b4deb48e619f6c40558f69e48978779cc09c8a7fad33d536cfc41cd68f9";
   };
 
   propagatedBuildInputs = [

From 356d505ec951cb0d11cd18e06216c279347dea78 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 24 Mar 2020 16:08:43 -0700
Subject: [PATCH 3930/4636] pythonPackages.azure-keyvault-secrets: 4.0.0 ->
 4.1.0

---
 .../python-modules/azure-keyvault-secrets/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix
index e2b40c29d850..b4749711b9f2 100644
--- a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix
+++ b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "azure-keyvault-secrets";
-  version = "4.0.0";
+  version = "4.1.0";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "066p4x2ixasz6qbxss2ilchl73w1kh2nc32lgh8qygl3d90059lp";
+    sha256 = "4f3bfac60e025e01dd1c1998b73649d45d706975356c0cf147174cf5a6ddf8be";
   };
 
   propagatedBuildInputs = [

From 73a1253a9b39fd3126a609d88086ca7c838ad6ec Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 24 Mar 2020 16:08:43 -0700
Subject: [PATCH 3931/4636] pythonPackages.azure-mgmt-cognitiveservices: 5.0.0
 -> 6.0.0

---
 .../python-modules/azure-mgmt-cognitiveservices/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
index c535971c7bf5..2dadb1d2cb81 100644
--- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-cognitiveservices";
-  version = "5.0.0";
+  version = "6.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1m7v3rfkvmdgghrpz15fm8pvmmhi40lcwfxdm2kxh7mx01r5l906";
+    sha256 = "d03641336f4b2ec561112655c93ee80bc28d8e8daa45a57abc36169bd19c07a0";
   };
 
   propagatedBuildInputs = [

From b4666ad14be2f1d961c78b41aa4023ccb4da0fca Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 24 Mar 2020 16:08:43 -0700
Subject: [PATCH 3932/4636] pythonPackages.azure-mgmt-containerservice: 8.2.0
 -> 9.0.0

---
 .../python-modules/azure-mgmt-containerservice/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
index 41124e448541..20861a9efe3a 100644
--- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-containerservice";
-  version = "8.2.0";
+  version = "9.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "0czn781ywbwi8px54nlccsvw5s13y4wqmxhcrxkkl0y7rblqi5pr";
+    sha256 = "6f05948bbd19ceb894f46f037b77c54116183364a671e180c007b5737c8d4590";
   };
 
   propagatedBuildInputs = [

From 283319a907b2b259d9317ee5e0e60c116ac0a858 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 24 Mar 2020 16:08:43 -0700
Subject: [PATCH 3933/4636] pythonPackages.azure-mgmt-datafactory: 0.8.0 ->
 0.10.0

---
 .../python-modules/azure-mgmt-datafactory/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
index 0d610eebe9c1..e7da7541dd98 100644
--- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-datafactory";
-  version = "0.8.0";
+  version = "0.10.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "0rv3443h4f9n88ky0fkfrp6jhf7ck9w3v96q040g3c2vkkywsnwa";
+    sha256 = "48b1ec81f30f4b5f38dd17f68f0dfc968db96e0a04fdcfc99f43f80ca041f14b";
   };
 
   propagatedBuildInputs = [

From f618075163f733c7acdb007e0fc58af34b289ea1 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 24 Mar 2020 16:08:43 -0700
Subject: [PATCH 3934/4636] pythonPackages.azure-mgmt-hanaonazure: 0.12.0 ->
 0.13.0

---
 .../python-modules/azure-mgmt-hanaonazure/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix
index 789784babfb4..c23ebfc2ce9c 100644
--- a/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-hanaonazure";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "cc844a152079e0d18fb5f47663a24cb204982925425c1fb51bac53894885000b";
+    sha256 = "cc4058174e371a0b68b305cd5a082fcca47f3446dd9aefd9ada72da4bd637da9";
   };
 
   propagatedBuildInputs = [

From 1646c56dc5579c81cff576cfbd92e7613b459fac Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 24 Mar 2020 16:08:43 -0700
Subject: [PATCH 3935/4636] pythonPackages.azure-mgmt-iotcentral: 2.0.0 ->
 3.0.0

---
 .../python-modules/azure-mgmt-iotcentral/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
index 29069d71b88a..5ba25e11a89e 100644
--- a/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-iotcentral";
-  version = "2.0.0";
+  version = "3.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1fql0j28d2r6slgabb7b438gdga513iskqh4al6c7dsmj1yzdzwa";
+    sha256 = "f6dacf442ccae2f18f1082e80bcbdcaa8c0efa2ba92b48c5db6ee01d37240047";
   };
 
   propagatedBuildInputs = [

From cdc643e4f733f79f3039889e7f41a879b7862508 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 24 Mar 2020 16:08:43 -0700
Subject: [PATCH 3936/4636] pythonPackages.azure-mgmt-iothub: 0.10.0 -> 0.11.0

---
 pkgs/development/python-modules/azure-mgmt-iothub/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
index 1e4c8923d7d3..57ec64f3d562 100644
--- a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-iothub";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1xms5wf21z9i28xl0p515xb08mrlsqnzhxcwv7pjlf26lwxadfi0";
+    sha256 = "f6fbb87d9bf29ce325543c9a3a125fbe45f4797f3a7f260c6c21ca60dc3f0885";
   };
 
   propagatedBuildInputs = [

From 569386b34dffb74eb72c5acb9b625f6c947eeb89 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 24 Mar 2020 16:08:44 -0700
Subject: [PATCH 3937/4636] pythonPackages.azure-mgmt-keyvault: 2.1.1 -> 2.2.0

---
 .../python-modules/azure-mgmt-keyvault/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
index 43f0394669b7..336bba6a1709 100644
--- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-keyvault";
-  version = "2.1.1";
+  version = "2.2.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "0ga6lzqlinfxlzx1g35a5sv5chjx4im0m4b8i33hqrhmdv9m7ypg";
+    sha256 = "1883e12eeb5819064dc52bf3a3ade05c791f4b66e4aeec948bda28df6ce2bce4";
   };
 
   propagatedBuildInputs = [

From d586a601a976aeb3d221955de877798f4c7a5df8 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 24 Mar 2020 16:08:44 -0700
Subject: [PATCH 3938/4636] pythonPackages.azure-mgmt-kusto: 0.5.0 -> 0.7.0

---
 pkgs/development/python-modules/azure-mgmt-kusto/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix
index 53aeff46c585..08a9b6b507ef 100644
--- a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix
@@ -5,13 +5,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.5.0";
+  version = "0.7.0";
   pname = "azure-mgmt-kusto";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0r6j3yp7ys0zgszqdjm6y90nigsapni4xhfpfgyk5c5qbgdpl93w";
+    sha256 = "40f8e62db145d31731018b83baf2d1a78b585514c373dd3c095f1f6835d17d23";
     extension = "zip";
   };
 

From b919e89dd96e6aad53715d6c2a885fc43bdd018e Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 24 Mar 2020 16:08:44 -0700
Subject: [PATCH 3939/4636] pythonPackages.azure-mgmt-network: 9.0.0 -> 10.0.0

---
 .../development/python-modules/azure-mgmt-network/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix
index ac99b98f0e5e..00480ac38bc2 100644
--- a/pkgs/development/python-modules/azure-mgmt-network/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix
@@ -7,13 +7,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "9.0.0";
+  version = "10.0.0";
   pname = "azure-mgmt-network";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "12bsdbh37xiz42hvrp8ghszyqkiali3pk50x44f3aip12pgx6kix";
+    sha256 = "3978da4641b3396d4a00c7ddd53d87ece7e7d45b5bc41a157639bdd2f2c5b9b3";
   };
 
   postInstall = if isPy3k then "" else ''

From 4abf8d11498f324830aa1c25eb92ab17210e40fe Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 24 Mar 2020 16:08:44 -0700
Subject: [PATCH 3940/4636] pythonPackages.azure-mgmt-policyinsights: 0.4.0 ->
 0.5.0

---
 .../python-modules/azure-mgmt-policyinsights/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix
index 37c7e46cbf3a..ad8a2a0fbe23 100644
--- a/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-policyinsights/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-policyinsights";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1b69rz9wm0jvc54vx3b7h633x8gags51xwxrkp6myar40jggxw6g";
+    sha256 = "ed229e3845c477e88dde413825d4fba0d38b3a5ffab4e694c7d0da995f3db0f3";
   };
 
   propagatedBuildInputs = [

From ce5b6d118db0755873d173fee897ff8bda9c18c7 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 24 Mar 2020 16:08:44 -0700
Subject: [PATCH 3941/4636] pythonPackages.azure-mgmt-rdbms: 2.0.0 -> 2.1.0

---
 pkgs/development/python-modules/azure-mgmt-rdbms/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
index 6a7b6df24185..858bde764402 100644
--- a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-rdbms";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "19z0lpq6bpidlflwa263y51549xgcg4m040k872m7fmy7jm2xcbb";
+    sha256 = "7826601507878e77f5d5cd805c6ad1d6483c375b545d5e9e1694b5a6c5e12fe3";
   };
 
   propagatedBuildInputs = [

From 3319f5e3c245e991f0c365956256ba03c1e716eb Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 24 Mar 2020 16:08:44 -0700
Subject: [PATCH 3942/4636] pythonPackages.azure-mgmt-recoveryservicesbackup:
 0.6.0 -> 0.7.0

---
 .../azure-mgmt-recoveryservicesbackup/default.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
index 990f494ecedc..ece93025b571 100644
--- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-recoveryservicesbackup";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd";
+    sha256 = "6355d9234d87422d57bf2ea8d1cc242463c203e4bb79b8930f22f29f4e025fa1";
   };
 
   propagatedBuildInputs = [

From b547f9444cbb1e4da76c2248edb5bb2afee8e424 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 24 Mar 2020 16:08:44 -0700
Subject: [PATCH 3943/4636] pythonPackages.azure-mgmt-reservations: 0.6.0 ->
 0.7.0

---
 .../python-modules/azure-mgmt-reservations/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix
index 5d13acb6ec83..3873f08e3ce2 100644
--- a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-reservations";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "16ycni3cjl9c0mv419gy5rgbrlg8zp0vnr6aj8z8p2ypdw6sgac3";
+    sha256 = "f65c1985a47e0ac55e7d5d9cc1bd5e95335a111566edc289d460aa2bc8f80991";
   };
 
   propagatedBuildInputs = [

From 2f5433590a51597c72db4e6f37586280721f1f82 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 24 Mar 2020 16:08:44 -0700
Subject: [PATCH 3944/4636] pythonPackages.azure-mgmt-sql: 0.17.0 -> 0.18.0

---
 pkgs/development/python-modules/azure-mgmt-sql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix
index a81f336df066..1b6649a36f23 100644
--- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-sql";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "1kp1wzcydgyc2mzkxigfv6rqzwzf3d0cnbqc6w7h907qbb4lw2r0";
+    sha256 = "99ca085eb523a5c27933060ccb04d7a6b60864f98d87bf5b63ac17d419b43445";
   };
 
   propagatedBuildInputs = [

From 4c8d92c60b1e70007de0f96bbfb44641020c922a Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 24 Mar 2020 16:08:44 -0700
Subject: [PATCH 3945/4636] pythonPackages.azure-mgmt-storage: 7.2.0 -> 8.0.0

---
 .../development/python-modules/azure-mgmt-storage/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
index 0b2442b087de..48af270a9d70 100644
--- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
@@ -7,13 +7,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "7.2.0";
+  version = "8.0.0";
   pname = "azure-mgmt-storage";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "01ck1ankgr9ikvfghhdcs777yrl2j2p8cw9q8nfdrjp22lpchabl";
+    sha256 = "636778912823cebed1c212e4feacc4885d9e49e19a047da20fca9393bc6fac33";
   };
 
   postInstall = if isPy3k then "" else ''

From 13e5ecec9af77399502f9cf2111e0d31537993b2 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 24 Mar 2020 16:08:44 -0700
Subject: [PATCH 3946/4636] pythonPackages.azure-storage-file-share: 12.0.0 ->
 12.1.1

---
 .../python-modules/azure-storage-file-share/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix
index 78950d2971e8..a4f8e161ba3b 100644
--- a/pkgs/development/python-modules/azure-storage-file-share/default.nix
+++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "azure-storage-file-share";
-  version = "12.0.0";
+  version = "12.1.1";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "15f5vk3vd2amggqqznx186raak9wgr57j0l1p9qa62kcl10bs9lg";
+    sha256 = "661ed9669b9fbb3163899294d28f11f7c135336e1513aab6bd1ff9ef3c6febb3";
   };
 
   propagatedBuildInputs = [

From 08616dbcc34623062213807bff32ae8d88e05b89 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 24 Mar 2020 16:17:09 -0700
Subject: [PATCH 3947/4636] azure-cli: freeze azure-mgmt-cognitiveservices
 package

---
 pkgs/tools/admin/azure-cli/python-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix
index 2935cd3300cd..cbec7e86a63f 100644
--- a/pkgs/tools/admin/azure-cli/python-packages.nix
+++ b/pkgs/tools/admin/azure-cli/python-packages.nix
@@ -131,6 +131,9 @@ let
       azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.4.0" "zip"
         "1dn5585nsizszjivx6lp677ka0mrg0ayqgag4yzfdz9ml8mj1xl5";
 
+      azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "5.0.0" "zip"
+        "1m7v3rfkvmdgghrpz15fm8pvmmhi40lcwfxdm2kxh7mx01r5l906";
+
       azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "11.0.0" "zip"
         "1dnlql4z9wawf8gc1v4rr386pifwcnx3ycr4gdccqwkgimgpsdg4";
 

From c79b04a9a52a93c9160de302eb707376613137a7 Mon Sep 17 00:00:00 2001
From: peelz <LouisTakePILLz@users.noreply.github.com>
Date: Sat, 21 Mar 2020 03:07:36 -0400
Subject: [PATCH 3948/4636] rmtrash: init at 1.13

---
 pkgs/tools/misc/rmtrash/default.nix | 39 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/tools/misc/rmtrash/default.nix

diff --git a/pkgs/tools/misc/rmtrash/default.nix b/pkgs/tools/misc/rmtrash/default.nix
new file mode 100644
index 000000000000..073871b0f438
--- /dev/null
+++ b/pkgs/tools/misc/rmtrash/default.nix
@@ -0,0 +1,39 @@
+{ lib, stdenv, fetchFromGitHub, makeWrapper
+, trash-cli, coreutils, which, getopt }:
+
+stdenv.mkDerivation rec {
+  pname = "rmtrash";
+  version = "1.13";
+
+  src = fetchFromGitHub {
+    owner = "PhrozenByte";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "04a9c65wnkq1fj8qhdsdbps88xjbp7rn6p27y25v47kaysvrw01j";
+  };
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    for f in rm{,dir}trash; do
+      install -D ./$f $out/bin/$f
+      wrapProgram $out/bin/$f \
+        --prefix PATH : ${lib.makeBinPath [ trash-cli coreutils which getopt ]}
+    done
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/PhrozenByte/rmtrash";
+    description = "trash-put made compatible with GNUs rm and rmdir";
+    longDescription = ''
+      Put files (and directories) in trash using the `trash-put` command in a
+      way that is, otherwise as `trash-put` itself, compatible to GNUs `rm`
+      and `rmdir`.
+    '';
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ peelz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25ed4da94c14..30bc0af360ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6369,6 +6369,8 @@ in
 
   rlwrap = callPackage ../tools/misc/rlwrap { };
 
+  rmtrash = callPackage ../tools/misc/rmtrash { };
+
   rockbox_utility = libsForQt5.callPackage ../tools/misc/rockbox-utility { };
 
   rosegarden = libsForQt5.callPackage ../applications/audio/rosegarden { };

From 12e7c0ef680e1b316d2360d21ed5baacc7e9e3a1 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 24 Mar 2020 20:37:00 -0500
Subject: [PATCH 3949/4636] rage: 0.3.0 -> 0.4.0

Changelog: https://github.com/str4d/rage/releases/tag/v0.4.0
---
 pkgs/tools/security/rage/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix
index 2bb4e4aeea3e..cdba2f2beb01 100644
--- a/pkgs/tools/security/rage/default.nix
+++ b/pkgs/tools/security/rage/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rage";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "str4d";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1lfp9vyrk8880j7p5i73zja9dglvl1lvvh7286rwd1a9gbcj6grb";
+    sha256 = "1wwndzy4xxbar9r67z8g7pp0s1xsxk5xaarh4h6hc0kh411zglrq";
   };
 
-  cargoSha256 = "0jjzxzdlflzvy39zi8vwx53xiv66v90idllsfvhj9p9lhc5ssi24";
+  cargoSha256 = "08njl8irkqkfxj54pz4sx3l9aqb40h10wxb82zza52pqd4zapgn6";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
 

From 2d48c2fbcdba763690786dcf097da559ceb4908b Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 25 Mar 2020 09:33:04 +1000
Subject: [PATCH 3950/4636] croc: 8.0.3 -> 8.0.4

https://github.com/schollz/croc/releases/tag/v8.0.4
---
 pkgs/tools/networking/croc/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix
index 70ffe180f157..d7ab830479ea 100644
--- a/pkgs/tools/networking/croc/default.nix
+++ b/pkgs/tools/networking/croc/default.nix
@@ -2,18 +2,16 @@
 
 buildGoModule rec {
   pname = "croc";
-  version = "8.0.3";
-
-  goPackagePath = "github.com/schollz/croc";
+  version = "8.0.4";
 
   src = fetchFromGitHub {
     owner = "schollz";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0jx6yxyxdnv4xzxsyfa7y1gm079rcsjqa1gmkh6bwkmhk6w5h1k9";
+    sha256 = "0dc6h102jr5dkg6r3xxma51g702dnyd3d6s5rilwv1fivxn3bj43";
   };
 
-  modSha256 = "0d4mm840fjsbcyl98zg6d3i7qp1lmjkx07mh91d56jyf9j082g99";
+  modSha256 = "0ng4x9zmwax2vskbcadra4pdkgy1p1prmgkg1bjmh3b8rwsrhr0q";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
 

From 4f6fc6dc6231657a338abe50c6f73d732dc93372 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 24 Mar 2020 22:11:33 +0100
Subject: [PATCH 3951/4636] proj: 6.1.1 -> 6.3.1

---
 pkgs/development/libraries/proj/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix
index ea89dbee0f61..41b6192a9ed3 100644
--- a/pkgs/development/libraries/proj/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "proj";
-  version = "6.1.1";
+  version = "6.3.1";
 
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "PROJ";
     rev = version;
-    sha256 = "0w2v2l22kv0xzq5hwl7n8ki6an8vfsr0lg0cdbkwcl4xv889ysma";
+    sha256 = "1ildcp57qsa01kvv2qxd05nqw5mg0wfkksiv9l138dbhp0s7rkxp";
   };
 
   outputs = [ "out" "dev"];

From 6cd915b21f0e223d5d30cb32513c712ff823d857 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 24 Mar 2020 22:12:58 +0100
Subject: [PATCH 3952/4636] pythonPackages.pyproj: 2.2.2 -> 2.6.0

---
 .../python-modules/pyproj/001.proj.patch      | 105 ++++++++++--------
 .../python-modules/pyproj/default.nix         |  14 ++-
 2 files changed, 70 insertions(+), 49 deletions(-)

diff --git a/pkgs/development/python-modules/pyproj/001.proj.patch b/pkgs/development/python-modules/pyproj/001.proj.patch
index b024c28156c1..52e0a80f739d 100644
--- a/pkgs/development/python-modules/pyproj/001.proj.patch
+++ b/pkgs/development/python-modules/pyproj/001.proj.patch
@@ -1,47 +1,62 @@
-diff a/pyproj/datadir.py b/pyproj/datadir.py
---- a/pyproj/datadir.py
-+++ b/pyproj/datadir.py
-@@ -52,6 +52,7 @@ def get_data_dir():
-     str: The valid data directory.
-
-     """
-+    return "@proj@/share/proj"
-     # to avoid re-validating
-     global _VALIDATED_PROJ_DATA
+diff -Nur a/pyproj/datadir.py b/pyproj/datadir.py
+--- a/pyproj/datadir.py	2020-03-24 12:53:39.417440608 +0100
++++ b/pyproj/datadir.py	2020-03-24 12:56:19.870089479 +0100
+@@ -66,9 +66,7 @@
      if _VALIDATED_PROJ_DATA is not None:
-diff a/setup.py b/setup.py
---- a/setup.py
-+++ b/setup.py
-@@ -16,7 +16,7 @@ INTERNAL_PROJ_DIR = os.path.join(CURRENT_FILE_PATH, "pyproj", BASE_INTERNAL_PROJ
-
+         return _VALIDATED_PROJ_DATA
+     global _USER_PROJ_DATA
+-    internal_datadir = os.path.join(
+-        os.path.dirname(os.path.abspath(__file__)), "proj_dir", "share", "proj"
+-    )
++    internal_datadir = "@proj@/share/proj"
+     proj_lib_dirs = os.environ.get("PROJ_LIB", "")
+     prefix_datadir = os.path.join(sys.prefix, "share", "proj")
+ 
+diff -Nur a/setup.py b/setup.py
+--- a/setup.py	2020-03-24 12:53:39.415440624 +0100
++++ b/setup.py	2020-03-24 12:52:05.311232522 +0100
+@@ -11,7 +11,7 @@
+ PROJ_MIN_VERSION = parse_version("6.2.0")
+ CURRENT_FILE_PATH = os.path.dirname(os.path.abspath(__file__))
+ BASE_INTERNAL_PROJ_DIR = "proj_dir"
+-INTERNAL_PROJ_DIR = os.path.join(CURRENT_FILE_PATH, "pyproj", BASE_INTERNAL_PROJ_DIR)
++INTERNAL_PROJ_DIR = "@proj@"
+ 
+ 
  def check_proj_version(proj_dir):
-     """checks that the PROJ library meets the minimum version"""
--    proj = os.path.join(proj_dir, "bin", "proj")
-+    proj = "@proj@/bin/proj"
-     proj_ver_bytes = subprocess.check_output(proj, stderr=subprocess.STDOUT)
-     proj_ver_bytes = (proj_ver_bytes.decode("ascii").split()[1]).strip(",")
-     proj_version = parse_version(proj_ver_bytes)
-@@ -33,6 +33,7 @@ def get_proj_dir():
-     """
-     This function finds the base PROJ directory.
-     """
-+    return "@proj@"
-     proj_dir = os.environ.get("PROJ_DIR")
-     if proj_dir is None and os.path.exists(INTERNAL_PROJ_DIR):
-         proj_dir = INTERNAL_PROJ_DIR
-@@ -56,6 +57,7 @@ def get_proj_libdirs(proj_dir):
-     """
-     This function finds the library directories
-     """
-+    return ["@proj@/lib"]
-     proj_libdir = os.environ.get("PROJ_LIBDIR")
-     libdirs = []
-     if proj_libdir is None:
-@@ -77,6 +79,7 @@ def get_proj_incdirs(proj_dir):
-     """
-     This function finds the include directories
-     """
-+    return ["@proj@/include"]
-     proj_incdir = os.environ.get("PROJ_INCDIR")
-     incdirs = []
-     if proj_incdir is None:
+@@ -146,7 +146,7 @@
+     # By default we'll try to get options PROJ_DIR or the local version of proj
+     proj_dir = get_proj_dir()
+     library_dirs = get_proj_libdirs(proj_dir)
+-    include_dirs = get_proj_incdirs(proj_dir)
++    include_dirs = get_proj_incdirs("@projdev@")
+ 
+     # setup extension options
+     ext_options = {
+diff -Nur a/test/conftest.py b/test/conftest.py
+--- a/test/conftest.py	2020-03-24 12:53:39.417440608 +0100
++++ b/test/conftest.py	2020-03-24 23:16:47.373972786 +0100
+@@ -1,6 +1,7 @@
+ import os
+ import shutil
+ import tempfile
++import stat
+ 
+ import pytest
+ 
+@@ -17,6 +18,15 @@
+     with tempfile.TemporaryDirectory() as tmpdir:
+         tmp_data_dir = os.path.join(tmpdir, "proj")
+         shutil.copytree(data_dir, tmp_data_dir)
++
++        # Data copied from the nix store is readonly (causes cleanup problem).
++        # Make it writable.
++        for r, d, files in os.walk(tmp_data_dir):
++            os.chmod(r, os.stat(r).st_mode | stat.S_IWUSR)
++            for f in files:
++                fpath = os.path.join(r, f)
++                os.chmod(fpath, os.stat(fpath).st_mode | stat.S_IWUSR)
++
+         try:
+             os.remove(os.path.join(str(tmp_data_dir), "ntv2_0.gsb"))
+         except OSError:
diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix
index 0f2763faf609..b23cb010f017 100644
--- a/pkgs/development/python-modules/pyproj/default.nix
+++ b/pkgs/development/python-modules/pyproj/default.nix
@@ -1,20 +1,22 @@
-{ lib, buildPythonPackage, fetchFromGitHub, python, pkgs, pythonOlder, substituteAll
+{ lib, buildPythonPackage, fetchFromGitHub, python, pkgs, pythonOlder, isPy27, substituteAll
 , aenum
 , cython
 , pytest
 , mock
 , numpy
+, shapely
 }:
 
 buildPythonPackage rec {
   pname = "pyproj";
-  version = "2.2.2";
+  version = "2.6.0";
+  disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "pyproj4";
     repo = "pyproj";
     rev = "v${version}rel";
-    sha256 = "0mb0jczgqh3sma69k7237i38h09gxgmvmddls9hpw4f3131f5ax7";
+    sha256 = "0fyggkbr3kp8mlq4c0r8sl5ah58bdg2mj4kzql9p3qyrkcdlgixh";
   };
 
   # force pyproj to use ${pkgs.proj}
@@ -22,13 +24,14 @@ buildPythonPackage rec {
     (substituteAll {
       src = ./001.proj.patch;
       proj = pkgs.proj;
+      projdev = pkgs.proj.dev;
     })
   ];
 
   buildInputs = [ cython pkgs.proj ];
 
   propagatedBuildInputs = [
-    numpy
+    numpy shapely
   ] ++ lib.optional (pythonOlder "3.6") aenum;
 
   checkInputs = [ pytest mock ];
@@ -38,6 +41,9 @@ buildPythonPackage rec {
   checkPhase = ''
     pytest . -k 'not alternative_grid_name \
                  and not transform_wgs84_to_alaska \
+                 and not transformer_group__unavailable \
+                 and not transform_group__missing_best \
+                 and not datum \
                  and not repr' \
             --ignore=test/test_doctest_wrapper.py \
             --ignore=test/test_datadir.py

From 8e8efc7ace2c120f5ad17e4c62787bcba103b4df Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 24 Mar 2020 22:13:37 +0100
Subject: [PATCH 3953/4636] qgis: 3.10.1 -> 3.10.4

---
 pkgs/applications/gis/qgis/unwrapped.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
index de436088fa76..80115ab8243e 100644
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -10,7 +10,7 @@ let
     [ qscintilla-qt5 gdal jinja2 numpy psycopg2
       chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ];
 in mkDerivation rec {
-  version = "3.10.1";
+  version = "3.10.4";
   pname = "qgis";
   name = "${pname}-unwrapped-${version}";
 
@@ -18,7 +18,7 @@ in mkDerivation rec {
     owner = "qgis";
     repo = "QGIS";
     rev = "final-${lib.replaceStrings ["."] ["_"] version}";
-    sha256 = "0xq0nnp7zdqaihqvh5rsi1129g23vnk5ijkpxfzaggafgmhf5hgz";
+    sha256 = "0d1rsgjgnnq6jgms5bgppz8lkh4518nf90fk0qvxajdfi9j4jn12";
   };
 
   passthru = {

From c3f8e598ed457688bac68516f2ccf9894e5236ed Mon Sep 17 00:00:00 2001
From: Leif Metcalf <me@leif.nz>
Date: Wed, 25 Mar 2020 15:48:25 +0900
Subject: [PATCH 3954/4636] Update git clone command example

---
 doc/languages-frameworks/haskell.section.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md
index 944c17a137e7..54ba8e4786d5 100644
--- a/doc/languages-frameworks/haskell.section.md
+++ b/doc/languages-frameworks/haskell.section.md
@@ -369,7 +369,7 @@ automatically select the right version of GHC and other build tools to build,
 test and execute apps in an existing project downloaded from somewhere on the
 Internet. Pass the `--nix` flag to any `stack` command to do so, e.g.
 ```shell
-git clone --recursive https://github.com/yesodweb/wai
+git clone --recurse-submodules https://github.com/yesodweb/wai.git
 cd wai
 stack --nix build
 ```

From f1e8d4d09afbed662d59e38dc908616879d6e281 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 26 Feb 2020 16:44:14 +0200
Subject: [PATCH 3955/4636] zathura-djvu: 0.2.8 -> 0.2.9

---
 pkgs/applications/misc/zathura/djvu/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix
index 54f68969d4f7..8dfbd2347a1f 100644
--- a/pkgs/applications/misc/zathura/djvu/default.nix
+++ b/pkgs/applications/misc/zathura/djvu/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "zathura-djvu-0.2.8";
+  pname = "zathura-djvu";
+  version = "0.2.9";
 
   src = fetchurl {
     url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz";
-    sha256 = "0axkv1crdxn0z44whaqp2ibkdqcykhjnxk7qzms0dp1b67an9rnh";
+    sha256 = "0kl7k4lq97m80gninwm84l7cl2jpkpki59mhy2326xgshc9w0wqd";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig ];

From 20d71fa7313b1f1529a2215be2346f120fd5fb99 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 26 Feb 2020 16:44:53 +0200
Subject: [PATCH 3956/4636] zathura-pdf-poppler: 0.2.9 -> 0.3.0

---
 pkgs/applications/misc/zathura/pdf-poppler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
index 5b38555eda1a..4fe414834bdd 100644
--- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
@@ -1,12 +1,12 @@
 { stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core, girara, poppler }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.9";
   pname = "zathura-pdf-poppler";
+  version = "0.3.0";
 
   src = fetchurl {
     url = "https://git.pwmt.org/pwmt/zathura-pdf-poppler/-/archive/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0c15rnwh42m3ybrhax01bl36w0iynaq8xg6l08riml3cyljypi9l";
+    sha256 = "133xxh82x37v0ihwk5g2hih1xlzm76kkayifdjn15xqf14gp6axs";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig zathura_core ];

From 55d6abc64fc731fbf34b95752dc57dd5007c3703 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 26 Feb 2020 16:45:18 +0200
Subject: [PATCH 3957/4636] zathura: 0.4.4 -> 0.4.5

---
 pkgs/applications/misc/zathura/core/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 99729125b631..3bc43449984c 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -9,12 +9,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  pname = "zathura-core";
-  version = "0.4.4";
+  pname = "zathura";
+  version = "0.4.5";
 
   src = fetchurl {
     url = "https://git.pwmt.org/pwmt/zathura/-/archive/${version}/zathura-${version}.tar.gz";
-    sha256 = "0v5klgr009rsxi41h73k0398jbgmgh37asvwz2w15i4fzmw89jgb";
+    sha256 = "1khs1snwjclgl12ykagvbdpv7sw1lf7mmws8902hf899za7wfrwl";
   };
 
   outputs = [ "bin" "man" "dev" "out" ];

From f338db083b0dae43f79fc427a6ff35fb5fe49038 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 26 Feb 2020 16:39:58 +0200
Subject: [PATCH 3958/4636] zathura: quote homepage url on all projects

---
 pkgs/applications/misc/zathura/cb/default.nix          | 2 +-
 pkgs/applications/misc/zathura/djvu/default.nix        | 2 +-
 pkgs/applications/misc/zathura/pdf-mupdf/default.nix   | 2 +-
 pkgs/applications/misc/zathura/pdf-poppler/default.nix | 2 +-
 pkgs/applications/misc/zathura/ps/default.nix          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/zathura/cb/default.nix b/pkgs/applications/misc/zathura/cb/default.nix
index 7c2c8fb31cab..b7beef0115fc 100644
--- a/pkgs/applications/misc/zathura/cb/default.nix
+++ b/pkgs/applications/misc/zathura/cb/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";
 
   meta = with lib; {
-    homepage = https://pwmt.org/projects/zathura-cb/;
+    homepage = "https://pwmt.org/projects/zathura-cb/";
     description = "A zathura CB plugin";
     longDescription = ''
       The zathura-cb plugin adds comic book support to zathura.
diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix
index 8dfbd2347a1f..564218a7d714 100644
--- a/pkgs/applications/misc/zathura/djvu/default.nix
+++ b/pkgs/applications/misc/zathura/djvu/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";
 
   meta = with stdenv.lib; {
-    homepage = https://pwmt.org/projects/zathura-djvu/;
+    homepage = "https://pwmt.org/projects/zathura-djvu/";
     description = "A zathura DJVU plugin";
     longDescription = ''
       The zathura-djvu plugin adds DjVu support to zathura by using the
diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index d8c1364d3957..f621ef9d8686 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   PKG_CONFIG_ZATHURA_PLUGINDIR= "lib/zathura";
 
   meta = with lib; {
-    homepage = https://pwmt.org/projects/zathura-pdf-mupdf/;
+    homepage = "https://pwmt.org/projects/zathura-pdf-mupdf/";
     description = "A zathura PDF plugin (mupdf)";
     longDescription = ''
       The zathura-pdf-mupdf plugin adds PDF support to zathura by
diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
index 4fe414834bdd..e7e0fe08180e 100644
--- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";
 
   meta = with lib; {
-    homepage = https://pwmt.org/projects/zathura-pdf-poppler/;
+    homepage = "https://pwmt.org/projects/zathura-pdf-poppler/";
     description = "A zathura PDF plugin (poppler)";
     longDescription = ''
       The zathura-pdf-poppler plugin adds PDF support to zathura by
diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix
index 48d42b5e9399..8220ba8c06ea 100644
--- a/pkgs/applications/misc/zathura/ps/default.nix
+++ b/pkgs/applications/misc/zathura/ps/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";
 
   meta = with lib; {
-    homepage = https://pwmt.org/projects/zathura-ps/;
+    homepage = "https://pwmt.org/projects/zathura-ps/";
     description = "A zathura PS plugin";
     longDescription = ''
       The zathura-ps plugin adds PS support to zathura by using the

From f063295d5a2667d21db843555bbc734811ce9836 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 26 Feb 2020 16:45:31 +0200
Subject: [PATCH 3959/4636] zathura: Make sure tests are enabled

---
 pkgs/applications/misc/zathura/core/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 3bc43449984c..a2d59011dc1b 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
     "-Dmanpages=enabled"
     "-Dconvert-icon=enabled"
     "-Dsynctex=enabled"
+    # Make sure tests are enabled for doCheck
+    "-Dtests=enabled"
   ];
 
   nativeBuildInputs = [

From aeead8826184e6a89e014cb9cf24caa8d2790e25 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 25 Mar 2020 09:16:12 +0200
Subject: [PATCH 3960/4636] zathura: inherit plugins in wrapper.nix

---
 pkgs/applications/misc/zathura/wrapper.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix
index 6c8ad97d3556..4a6ef041b540 100644
--- a/pkgs/applications/misc/zathura/wrapper.nix
+++ b/pkgs/applications/misc/zathura/wrapper.nix
@@ -8,6 +8,8 @@ in symlinkJoin {
 
   paths = with zathura_core; [ man dev out ];
 
+  inherit plugins;
+
   buildInputs = [ makeWrapper ];
 
   postBuild = ''

From f620961990c1d36406677174d9f166a2faaf00ab Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 25 Mar 2020 09:31:52 +0200
Subject: [PATCH 3961/4636] zathura: always use pname and version and 1 url for
 all projects

---
 pkgs/applications/misc/zathura/cb/default.nix     |  2 +-
 pkgs/applications/misc/zathura/core/default.nix   |  4 ++--
 pkgs/applications/misc/zathura/djvu/default.nix   |  4 ++--
 .../misc/zathura/pdf-mupdf/default.nix            | 15 ++++-----------
 .../misc/zathura/pdf-poppler/default.nix          |  4 ++--
 pkgs/applications/misc/zathura/ps/default.nix     |  5 +++--
 6 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/misc/zathura/cb/default.nix b/pkgs/applications/misc/zathura/cb/default.nix
index b7beef0115fc..4e2d16819ba5 100644
--- a/pkgs/applications/misc/zathura/cb/default.nix
+++ b/pkgs/applications/misc/zathura/cb/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "0.1.8";
 
   src = fetchurl {
-    url = "https://pwmt.org/projects/zathura/plugins/download/${pname}-${version}.tar.xz";
+    url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
     sha256 = "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5";
   };
 
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index a2d59011dc1b..44f200174d9b 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
   version = "0.4.5";
 
   src = fetchurl {
-    url = "https://git.pwmt.org/pwmt/zathura/-/archive/${version}/zathura-${version}.tar.gz";
-    sha256 = "1khs1snwjclgl12ykagvbdpv7sw1lf7mmws8902hf899za7wfrwl";
+    url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
+    sha256 = "0b3nrcvykkpv2vm99kijnic2gpfzva520bsjlihaxandzfm9ff8c";
   };
 
   outputs = [ "bin" "man" "dev" "out" ];
diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix
index 564218a7d714..954df5301e31 100644
--- a/pkgs/applications/misc/zathura/djvu/default.nix
+++ b/pkgs/applications/misc/zathura/djvu/default.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation rec {
   version = "0.2.9";
 
   src = fetchurl {
-    url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz";
-    sha256 = "0kl7k4lq97m80gninwm84l7cl2jpkpki59mhy2326xgshc9w0wqd";
+    url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
+    sha256 = "0062n236414db7q7pnn3ccg5111ghxj3407pn9ri08skxskgirln";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig ];
diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index f621ef9d8686..82c94d48068a 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -1,20 +1,13 @@
-{ stdenv, lib, meson, ninja, fetchFromGitHub
+{ stdenv, lib, meson, ninja, fetchurl
 , pkgconfig, zathura_core, cairo , gtk-mac-integration, girara, mupdf }:
 
 stdenv.mkDerivation rec {
   version = "0.3.5";
   pname = "zathura-pdf-mupdf";
 
-  # pwmt.org server was down at the time of last update
-  # src = fetchurl {
-  #   url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/${name}.tar.xz";
-  #   sha256 = "1zbaqimav4wfgimpy3nfzl10qj7vyv23rdy2z5z7z93jwbp2rc2j";
-  # };
-  src = fetchFromGitHub {
-    owner = "pwmt";
-    repo = "zathura-pdf-mupdf";
-    rev = version;
-    sha256 = "0wb46hllykbi30ir69s8s23mihivqn13mgfdzawbsn2a21p8y4zl";
+  src = fetchurl {
+    url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
+    sha256 = "1pjwsb7zwclxsvz229fl7y2saf1pv3ifwv3ay8viqxgrp9x3z9hq";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig ];
diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
index e7e0fe08180e..bafa293ad9c3 100644
--- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation rec {
   version = "0.3.0";
 
   src = fetchurl {
-    url = "https://git.pwmt.org/pwmt/zathura-pdf-poppler/-/archive/${version}/${pname}-${version}.tar.gz";
-    sha256 = "133xxh82x37v0ihwk5g2hih1xlzm76kkayifdjn15xqf14gp6axs";
+    url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
+    sha256 = "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig zathura_core ];
diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix
index 8220ba8c06ea..05cc570eb8f1 100644
--- a/pkgs/applications/misc/zathura/ps/default.nix
+++ b/pkgs/applications/misc/zathura/ps/default.nix
@@ -1,10 +1,11 @@
 { stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core, girara, libspectre, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "zathura-ps-0.2.6";
+  pname = "zathura-ps";
+  version = "0.2.6";
 
   src = fetchurl {
-    url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz";
+    url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
     sha256 = "0wygq89nyjrjnsq7vbpidqdsirjm6iq4w2rijzwpk2f83ys8bc3y";
   };
 

From 216c58a2ad170d135599592599d5461ec899f357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 24 Mar 2020 16:00:48 +0000
Subject: [PATCH 3962/4636] nodePackages: fix broken update script

The computed path was wrong and references within the file where
wrong as well due to the temporary directory.
---
 pkgs/development/node-packages/generate.sh        | 14 +++++---------
 pkgs/development/node-packages/shell-generate.nix |  8 --------
 2 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/development/node-packages/shell-generate.nix

diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh
index 3b1626f9afb3..66a51721ac81 100755
--- a/pkgs/development/node-packages/generate.sh
+++ b/pkgs/development/node-packages/generate.sh
@@ -1,15 +1,11 @@
 #!/usr/bin/env nix-shell
-#! nix-shell shell-generate.nix -i bash
+#! nix-shell -p nodePackages.node2nix -i bash
 set -eu -o pipefail
 
-cd "$NODE_NIXPKGS_PATH/pkgs/development/node-packages"
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+cd ${DIR}
 rm -f ./node-env.nix
 for version in 10 12 13; do
-    tmpdir=$(mktemp -d)
-    node2nix --nodejs-$version -i node-packages-v$version.json -o $tmpdir/node-packages-v$version.nix -c $tmpdir/composition-v$version.nix
-    if [ $? -eq 0 ]; then
-        mv $tmpdir/node-packages-v$version.nix .
-        mv $tmpdir/composition-v$version.nix .
-    fi
+  node2nix --nodejs-$version -i node-packages-v$version.json -o node-packages-v$version.nix -c composition-v$version.nix
 done
-cd -
diff --git a/pkgs/development/node-packages/shell-generate.nix b/pkgs/development/node-packages/shell-generate.nix
deleted file mode 100644
index aa635b2a81e3..000000000000
--- a/pkgs/development/node-packages/shell-generate.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ nixpkgs ? import ../../.. {} }:
-with nixpkgs;
-mkShell {
-  buildInputs = [
-    bash nodePackages.node2nix
-  ];
-  NODE_NIXPKGS_PATH = builtins.toString ../../../.;
-}

From 01914e619f466d93d91ab6e563b17b9357f4a63a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 24 Mar 2020 17:11:51 +0000
Subject: [PATCH 3963/4636] nodePackages: update

---
 .../node-packages/composition-v10.nix         |    2 +-
 .../node-packages/composition-v12.nix         |    2 +-
 .../node-packages/composition-v13.nix         |    2 +-
 .../node-packages/node-packages-v10.nix       | 4166 ++++++++++-------
 .../node-packages/node-packages-v12.nix       |   35 +-
 .../node-packages/node-packages-v13.nix       |   20 +-
 6 files changed, 2560 insertions(+), 1667 deletions(-)

diff --git a/pkgs/development/node-packages/composition-v10.nix b/pkgs/development/node-packages/composition-v10.nix
index 534f42e37d7c..ecb9e5413237 100644
--- a/pkgs/development/node-packages/composition-v10.nix
+++ b/pkgs/development/node-packages/composition-v10.nix
@@ -14,4 +14,4 @@ in
 import ./node-packages-v10.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
+}
\ No newline at end of file
diff --git a/pkgs/development/node-packages/composition-v12.nix b/pkgs/development/node-packages/composition-v12.nix
index 3f4fbb7f7cb5..a3a7bc256772 100644
--- a/pkgs/development/node-packages/composition-v12.nix
+++ b/pkgs/development/node-packages/composition-v12.nix
@@ -14,4 +14,4 @@ in
 import ./node-packages-v12.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
+}
\ No newline at end of file
diff --git a/pkgs/development/node-packages/composition-v13.nix b/pkgs/development/node-packages/composition-v13.nix
index 7100e8d74742..6eddeb468dbb 100644
--- a/pkgs/development/node-packages/composition-v13.nix
+++ b/pkgs/development/node-packages/composition-v13.nix
@@ -14,4 +14,4 @@ in
 import ./node-packages-v13.nix {
   inherit (pkgs) fetchurl fetchgit;
   inherit nodeEnv;
-}
+}
\ No newline at end of file
diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
index 9c812bf9a733..d70b133fd405 100644
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -22,31 +22,31 @@ let
         sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ==";
       };
     };
-    "@angular-devkit/architect-0.900.6" = {
+    "@angular-devkit/architect-0.900.7" = {
       name = "_at_angular-devkit_slash_architect";
       packageName = "@angular-devkit/architect";
-      version = "0.900.6";
+      version = "0.900.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.900.6.tgz";
-        sha512 = "WK8e09DgNP1NHP1gqVQ9w+9rlRMVDJxAh4qZGJRjZBXd3LY7y84WWRmTpfuhOSu+82fR3/n76+urxraU3ZVphw==";
+        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.900.7.tgz";
+        sha512 = "hfiTVYc72kzbXrzK4tea6jnTDnSKpE1D+vEptBXN2tdXEVNEAQI5Qm5L1zVDtt16UdqoUTUypIgUc9jcNH1mUQ==";
       };
     };
-    "@angular-devkit/core-9.0.6" = {
+    "@angular-devkit/core-9.0.7" = {
       name = "_at_angular-devkit_slash_core";
       packageName = "@angular-devkit/core";
-      version = "9.0.6";
+      version = "9.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.0.6.tgz";
-        sha512 = "hCZJbnqLEm1F5Bx+ILcdd3LPgQTn4WFWpfUqMEGGj7UirRInWcz+6UpYotKGTJw85/mV01LrIbtWIkAUXbkkhg==";
+        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.0.7.tgz";
+        sha512 = "tMrz36sM1xrwvFf9Qm59GwALscVlMP7rQBjtd0fIR/QbsiOAIX4AQbV+vN6Vtwnzo5NIRZY1IXJUhesWms+h5w==";
       };
     };
-    "@angular-devkit/schematics-9.0.6" = {
+    "@angular-devkit/schematics-9.0.7" = {
       name = "_at_angular-devkit_slash_schematics";
       packageName = "@angular-devkit/schematics";
-      version = "9.0.6";
+      version = "9.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.0.6.tgz";
-        sha512 = "X7qZDJVrFcPUn+jNUeOH7Bx1D7YTpTFr0d3DBIsQzseReSGu7ugWziQPS4gc5Xm5K0nb8vx6DYtyW0FaIvX0ZA==";
+        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.0.7.tgz";
+        sha512 = "ryPC+l24f3gX5DFMTLkDM/q2Kp6LPzBn6400k7j4qVdb1cIrZx+JUQd7F4iAksTTkX15EQPanptQXeztUrl9Ng==";
       };
     };
     "@antora/asciidoc-loader-2.2.0" = {
@@ -256,22 +256,22 @@ let
         sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==";
       };
     };
-    "@babel/compat-data-7.8.6" = {
+    "@babel/compat-data-7.9.0" = {
       name = "_at_babel_slash_compat-data";
       packageName = "@babel/compat-data";
-      version = "7.8.6";
+      version = "7.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.8.6.tgz";
-        sha512 = "CurCIKPTkS25Mb8mz267vU95vy+TyUpnctEX2lV33xWNmHAfjruztgiPBbXZRh3xZZy1CYvGx6XfxyTVS+sk7Q==";
+        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.0.tgz";
+        sha512 = "zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g==";
       };
     };
-    "@babel/core-7.8.7" = {
+    "@babel/core-7.9.0" = {
       name = "_at_babel_slash_core";
       packageName = "@babel/core";
-      version = "7.8.7";
+      version = "7.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/core/-/core-7.8.7.tgz";
-        sha512 = "rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA==";
+        url = "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz";
+        sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==";
       };
     };
     "@babel/generator-7.0.0-beta.38" = {
@@ -292,13 +292,13 @@ let
         sha512 = "4bpOR5ZBz+wWcMeVtcf7FbjcFzCp+817z2/gHNncIRcM9MmKzUhtWCYAq27RAfUrAFwb+OCG1s9WEaVxfi6cjg==";
       };
     };
-    "@babel/generator-7.8.8" = {
+    "@babel/generator-7.9.4" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
-      version = "7.8.8";
+      version = "7.9.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.8.8.tgz";
-        sha512 = "HKyUVu69cZoclptr8t8U5b6sx6zoWjh8jiUhnuj3MpZuKT2dJ8zPTuiy31luq32swhI0SpwItCIlU8XW7BZeJg==";
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz";
+        sha512 = "rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==";
       };
     };
     "@babel/helper-annotate-as-pure-7.8.3" = {
@@ -319,22 +319,22 @@ let
         sha512 = "5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==";
       };
     };
-    "@babel/helper-builder-react-jsx-7.8.3" = {
+    "@babel/helper-builder-react-jsx-7.9.0" = {
       name = "_at_babel_slash_helper-builder-react-jsx";
       packageName = "@babel/helper-builder-react-jsx";
-      version = "7.8.3";
+      version = "7.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.8.3.tgz";
-        sha512 = "JT8mfnpTkKNCboTqZsQTdGo3l3Ik3l7QIt9hh0O9DYiwVel37VoJpILKM4YFbP2euF32nkQSb+F9cUk9b7DDXQ==";
+        url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.9.0.tgz";
+        sha512 = "weiIo4gaoGgnhff54GQ3P5wsUQmnSwpkvU0r6ZHq6TzoSzKy4JxHEgnxNytaKbov2a9z/CVNyzliuCOUPEX3Jw==";
       };
     };
-    "@babel/helper-call-delegate-7.8.7" = {
-      name = "_at_babel_slash_helper-call-delegate";
-      packageName = "@babel/helper-call-delegate";
-      version = "7.8.7";
+    "@babel/helper-builder-react-jsx-experimental-7.9.0" = {
+      name = "_at_babel_slash_helper-builder-react-jsx-experimental";
+      packageName = "@babel/helper-builder-react-jsx-experimental";
+      version = "7.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.8.7.tgz";
-        sha512 = "doAA5LAKhsFCR0LAFIf+r2RSMmC+m8f/oQ+URnUET/rWeEzC0yTRmAGyWkD4sSu3xwbS7MYQ2u+xlt1V5R56KQ==";
+        url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.0.tgz";
+        sha512 = "3xJEiyuYU4Q/Ar9BsHisgdxZsRlsShMe90URZ0e6przL26CCs8NJbDoxH94kKT17PcxlMhsCAwZd90evCo26VQ==";
       };
     };
     "@babel/helper-compilation-targets-7.8.7" = {
@@ -427,13 +427,13 @@ let
         sha512 = "R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==";
       };
     };
-    "@babel/helper-module-transforms-7.8.6" = {
+    "@babel/helper-module-transforms-7.9.0" = {
       name = "_at_babel_slash_helper-module-transforms";
       packageName = "@babel/helper-module-transforms";
-      version = "7.8.6";
+      version = "7.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.8.6.tgz";
-        sha512 = "RDnGJSR5EFBJjG3deY0NiL0K9TO8SXxS9n/MPsbPK/s9LbQymuLNtlzvDiNS7IpecuL45cMeLVkA+HfmlrnkRg==";
+        url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz";
+        sha512 = "0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==";
       };
     };
     "@babel/helper-optimise-call-expression-7.8.3" = {
@@ -499,6 +499,15 @@ let
         sha512 = "3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==";
       };
     };
+    "@babel/helper-validator-identifier-7.9.0" = {
+      name = "_at_babel_slash_helper-validator-identifier";
+      packageName = "@babel/helper-validator-identifier";
+      version = "7.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz";
+        sha512 = "6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==";
+      };
+    };
     "@babel/helper-wrap-function-7.8.3" = {
       name = "_at_babel_slash_helper-wrap-function";
       packageName = "@babel/helper-wrap-function";
@@ -508,31 +517,31 @@ let
         sha512 = "LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==";
       };
     };
-    "@babel/helpers-7.8.4" = {
+    "@babel/helpers-7.9.2" = {
       name = "_at_babel_slash_helpers";
       packageName = "@babel/helpers";
-      version = "7.8.4";
+      version = "7.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.8.4.tgz";
-        sha512 = "VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w==";
+        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz";
+        sha512 = "JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==";
       };
     };
-    "@babel/highlight-7.8.3" = {
+    "@babel/highlight-7.9.0" = {
       name = "_at_babel_slash_highlight";
       packageName = "@babel/highlight";
-      version = "7.8.3";
+      version = "7.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz";
-        sha512 = "PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==";
+        url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz";
+        sha512 = "lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==";
       };
     };
-    "@babel/parser-7.8.8" = {
+    "@babel/parser-7.9.4" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
-      version = "7.8.8";
+      version = "7.9.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.8.8.tgz";
-        sha512 = "mO5GWzBPsPf6865iIbzNE0AvkKF3NE+2S3eRUpE+FE07BOAkXh6G+GW/Pj01hhXjve1WScbaIO4UlY1JKeqCcA==";
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz";
+        sha512 = "bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==";
       };
     };
     "@babel/plugin-external-helpers-7.8.3" = {
@@ -589,13 +598,22 @@ let
         sha512 = "TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==";
       };
     };
-    "@babel/plugin-proposal-object-rest-spread-7.8.3" = {
-      name = "_at_babel_slash_plugin-proposal-object-rest-spread";
-      packageName = "@babel/plugin-proposal-object-rest-spread";
+    "@babel/plugin-proposal-numeric-separator-7.8.3" = {
+      name = "_at_babel_slash_plugin-proposal-numeric-separator";
+      packageName = "@babel/plugin-proposal-numeric-separator";
       version = "7.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.8.3.tgz";
-        sha512 = "8qvuPwU/xxUCt78HocNlv0mXXo0wdh9VT1R04WU8HGOfaOob26pF+9P5/lYjN/q7DHOX1bvX60hnhOvuQUJdbA==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz";
+        sha512 = "jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==";
+      };
+    };
+    "@babel/plugin-proposal-object-rest-spread-7.9.0" = {
+      name = "_at_babel_slash_plugin-proposal-object-rest-spread";
+      packageName = "@babel/plugin-proposal-object-rest-spread";
+      version = "7.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz";
+        sha512 = "UgqBv6bjq4fDb8uku9f+wcm1J7YxJ5nT7WO/jBr0cl0PLKb7t1O6RNR1kZbjgx2LQtsDI9hwoQVmn0yhXeQyow==";
       };
     };
     "@babel/plugin-proposal-optional-catch-binding-7.8.3" = {
@@ -607,13 +625,13 @@ let
         sha512 = "0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==";
       };
     };
-    "@babel/plugin-proposal-optional-chaining-7.8.3" = {
+    "@babel/plugin-proposal-optional-chaining-7.9.0" = {
       name = "_at_babel_slash_plugin-proposal-optional-chaining";
       packageName = "@babel/plugin-proposal-optional-chaining";
-      version = "7.8.3";
+      version = "7.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.8.3.tgz";
-        sha512 = "QIoIR9abkVn+seDE3OjA08jWcs3eZ9+wJCKSRgo3WdEU2csFYgdScb+8qHB3+WXsGJD55u+5hWCISI7ejXS+kg==";
+        url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz";
+        sha512 = "NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==";
       };
     };
     "@babel/plugin-proposal-unicode-property-regex-7.8.8" = {
@@ -688,6 +706,15 @@ let
         sha512 = "aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==";
       };
     };
+    "@babel/plugin-syntax-numeric-separator-7.8.3" = {
+      name = "_at_babel_slash_plugin-syntax-numeric-separator";
+      packageName = "@babel/plugin-syntax-numeric-separator";
+      version = "7.8.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz";
+        sha512 = "H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==";
+      };
+    };
     "@babel/plugin-syntax-object-rest-spread-7.8.3" = {
       name = "_at_babel_slash_plugin-syntax-object-rest-spread";
       packageName = "@babel/plugin-syntax-object-rest-spread";
@@ -769,13 +796,13 @@ let
         sha512 = "pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==";
       };
     };
-    "@babel/plugin-transform-classes-7.8.6" = {
+    "@babel/plugin-transform-classes-7.9.2" = {
       name = "_at_babel_slash_plugin-transform-classes";
       packageName = "@babel/plugin-transform-classes";
-      version = "7.8.6";
+      version = "7.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.6.tgz";
-        sha512 = "k9r8qRay/R6v5aWZkrEclEhKO6mc1CCQr2dLsVHBmOQiMpN6I2bpjX3vgnldUWeEI1GHVNByULVxZ4BdP4Hmdg==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz";
+        sha512 = "TC2p3bPzsfvSsqBZo0kJnuelnoK9O3welkUpqSqBQuBF6R5MN2rysopri8kNvtlGIb2jmUO7i15IooAZJjZuMQ==";
       };
     };
     "@babel/plugin-transform-computed-properties-7.8.3" = {
@@ -823,22 +850,22 @@ let
         sha512 = "zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==";
       };
     };
-    "@babel/plugin-transform-flow-strip-types-7.8.3" = {
+    "@babel/plugin-transform-flow-strip-types-7.9.0" = {
       name = "_at_babel_slash_plugin-transform-flow-strip-types";
       packageName = "@babel/plugin-transform-flow-strip-types";
-      version = "7.8.3";
+      version = "7.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.8.3.tgz";
-        sha512 = "g/6WTWG/xbdd2exBBzMfygjX/zw4eyNC4X8pRaq7aRHRoDUCzAIu3kGYIXviOv8BjCuWm8vDBwjHcjiRNgXrPA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.9.0.tgz";
+        sha512 = "7Qfg0lKQhEHs93FChxVLAvhBshOPQDtJUTVHr/ZwQNRccCm4O9D79r9tVSoV8iNwjP1YgfD+e/fgHcPkN1qEQg==";
       };
     };
-    "@babel/plugin-transform-for-of-7.8.6" = {
+    "@babel/plugin-transform-for-of-7.9.0" = {
       name = "_at_babel_slash_plugin-transform-for-of";
       packageName = "@babel/plugin-transform-for-of";
-      version = "7.8.6";
+      version = "7.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.6.tgz";
-        sha512 = "M0pw4/1/KI5WAxPsdcUL/w2LJ7o89YHN3yLkzNjg7Yl15GlVGgzHyCU+FMeAxevHGsLVmUqbirlUIKTafPmzdw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz";
+        sha512 = "lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==";
       };
     };
     "@babel/plugin-transform-function-name-7.8.3" = {
@@ -868,40 +895,40 @@ let
         sha512 = "3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==";
       };
     };
-    "@babel/plugin-transform-modules-amd-7.8.3" = {
+    "@babel/plugin-transform-modules-amd-7.9.0" = {
       name = "_at_babel_slash_plugin-transform-modules-amd";
       packageName = "@babel/plugin-transform-modules-amd";
-      version = "7.8.3";
+      version = "7.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.8.3.tgz";
-        sha512 = "MadJiU3rLKclzT5kBH4yxdry96odTUwuqrZM+GllFI/VhxfPz+k9MshJM+MwhfkCdxxclSbSBbUGciBngR+kEQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz";
+        sha512 = "vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q==";
       };
     };
-    "@babel/plugin-transform-modules-commonjs-7.8.3" = {
+    "@babel/plugin-transform-modules-commonjs-7.9.0" = {
       name = "_at_babel_slash_plugin-transform-modules-commonjs";
       packageName = "@babel/plugin-transform-modules-commonjs";
-      version = "7.8.3";
+      version = "7.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.8.3.tgz";
-        sha512 = "JpdMEfA15HZ/1gNuB9XEDlZM1h/gF/YOH7zaZzQu2xCFRfwc01NXBMHHSTT6hRjlXJJs5x/bfODM3LiCk94Sxg==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz";
+        sha512 = "qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g==";
       };
     };
-    "@babel/plugin-transform-modules-systemjs-7.8.3" = {
+    "@babel/plugin-transform-modules-systemjs-7.9.0" = {
       name = "_at_babel_slash_plugin-transform-modules-systemjs";
       packageName = "@babel/plugin-transform-modules-systemjs";
-      version = "7.8.3";
+      version = "7.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.8.3.tgz";
-        sha512 = "8cESMCJjmArMYqa9AO5YuMEkE4ds28tMpZcGZB/jl3n0ZzlsxOAi3mC+SKypTfT8gjMupCnd3YiXCkMjj2jfOg==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz";
+        sha512 = "FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ==";
       };
     };
-    "@babel/plugin-transform-modules-umd-7.8.3" = {
+    "@babel/plugin-transform-modules-umd-7.9.0" = {
       name = "_at_babel_slash_plugin-transform-modules-umd";
       packageName = "@babel/plugin-transform-modules-umd";
-      version = "7.8.3";
+      version = "7.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.8.3.tgz";
-        sha512 = "evhTyWhbwbI3/U6dZAnx/ePoV7H6OUG+OjiJFHmhr9FPn0VShjwC2kdxqIuQ/+1P50TMrneGzMeyMTFOjKSnAw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz";
+        sha512 = "uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==";
       };
     };
     "@babel/plugin-transform-named-capturing-groups-regex-7.8.3" = {
@@ -931,13 +958,13 @@ let
         sha512 = "57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==";
       };
     };
-    "@babel/plugin-transform-parameters-7.8.8" = {
+    "@babel/plugin-transform-parameters-7.9.3" = {
       name = "_at_babel_slash_plugin-transform-parameters";
       packageName = "@babel/plugin-transform-parameters";
-      version = "7.8.8";
+      version = "7.9.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.8.tgz";
-        sha512 = "hC4Ld/Ulpf1psQciWWwdnUspQoQco2bMzSrwU6TmzRlvoYQe4rQFy9vnCZDTlVeCQj0JPfL+1RX0V8hCJvkgBA==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.3.tgz";
+        sha512 = "fzrQFQhp7mIhOzmOtPiKffvCYQSK10NR8t6BBz2yPbeUHb9OLW8RZGtgDRBn8z2hGcwvKDL3vC7ojPTLNxmqEg==";
       };
     };
     "@babel/plugin-transform-property-literals-7.8.3" = {
@@ -949,13 +976,13 @@ let
         sha512 = "uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==";
       };
     };
-    "@babel/plugin-transform-react-jsx-7.8.3" = {
+    "@babel/plugin-transform-react-jsx-7.9.4" = {
       name = "_at_babel_slash_plugin-transform-react-jsx";
       packageName = "@babel/plugin-transform-react-jsx";
-      version = "7.8.3";
+      version = "7.9.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.8.3.tgz";
-        sha512 = "r0h+mUiyL595ikykci+fbwm9YzmuOrUBi0b+FDIKmi3fPQyFokWVEMJnRWHJPPQEjyFJyna9WZC6Viv6UHSv1g==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.4.tgz";
+        sha512 = "Mjqf3pZBNLt854CK0C/kRuXAnE6H/bo7xYojP+WGtX8glDGSibcwnsWwhwoSuRg0+EBnxPC1ouVnuetUIlPSAw==";
       };
     };
     "@babel/plugin-transform-regenerator-7.8.7" = {
@@ -976,13 +1003,13 @@ let
         sha512 = "mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==";
       };
     };
-    "@babel/plugin-transform-runtime-7.8.3" = {
+    "@babel/plugin-transform-runtime-7.9.0" = {
       name = "_at_babel_slash_plugin-transform-runtime";
       packageName = "@babel/plugin-transform-runtime";
-      version = "7.8.3";
+      version = "7.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.8.3.tgz";
-        sha512 = "/vqUt5Yh+cgPZXXjmaG9NT8aVfThKk7G4OqkVhrXqwsC5soMn/qTCxs36rZ2QFhpfTJcjw4SNDIZ4RUb8OL4jQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz";
+        sha512 = "pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw==";
       };
     };
     "@babel/plugin-transform-shorthand-properties-7.8.3" = {
@@ -1030,13 +1057,13 @@ let
         sha512 = "2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==";
       };
     };
-    "@babel/plugin-transform-typescript-7.8.7" = {
+    "@babel/plugin-transform-typescript-7.9.4" = {
       name = "_at_babel_slash_plugin-transform-typescript";
       packageName = "@babel/plugin-transform-typescript";
-      version = "7.8.7";
+      version = "7.9.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.8.7.tgz";
-        sha512 = "7O0UsPQVNKqpHeHLpfvOG4uXmlw+MOxYvUv6Otc9uH5SYMIxvF6eBdjkWvC3f9G+VXe0RsNExyAQBeTRug/wqQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.4.tgz";
+        sha512 = "yeWeUkKx2auDbSxRe8MusAG+n4m9BFY/v+lPjmQDgOFX5qnySkUY5oXzkp6FwPdsYqnKay6lorXYdC0n3bZO7w==";
       };
     };
     "@babel/plugin-transform-unicode-regex-7.8.3" = {
@@ -1057,22 +1084,31 @@ let
         sha512 = "/TS23MVvo34dFmf8mwCisCbWGrfhbiWZSwBo6HkADTBhUa2Q/jWltyY/tpofz/b6/RIhqaqQcquptCirqIhOaQ==";
       };
     };
-    "@babel/preset-env-7.8.7" = {
+    "@babel/preset-env-7.9.0" = {
       name = "_at_babel_slash_preset-env";
       packageName = "@babel/preset-env";
-      version = "7.8.7";
+      version = "7.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.8.7.tgz";
-        sha512 = "BYftCVOdAYJk5ASsznKAUl53EMhfBbr8CJ1X+AJLfGPscQkwJFiaV/Wn9DPH/7fzm2v6iRYJKYHSqyynTGw0nw==";
+        url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.0.tgz";
+        sha512 = "712DeRXT6dyKAM/FMbQTV/FvRCms2hPCx+3weRjZ8iQVQWZejWWk1wwG6ViWMyqb/ouBbGOl5b6aCk0+j1NmsQ==";
       };
     };
-    "@babel/preset-flow-7.8.3" = {
+    "@babel/preset-flow-7.9.0" = {
       name = "_at_babel_slash_preset-flow";
       packageName = "@babel/preset-flow";
-      version = "7.8.3";
+      version = "7.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.8.3.tgz";
-        sha512 = "iCXFk+T4demnq+dNLLvlGOgvYF6sPZ/hS1EmswugOqh1Ysp2vuiqJzpgsnp5rW8+6dLJT/0CXDzye28ZH6BAfQ==";
+        url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.9.0.tgz";
+        sha512 = "88uSmlshIrlmPkNkEcx3UpSZ6b8n0UGBq0/0ZMZCF/uxAW0XIAUuDHBhIOAh0pvweafH4RxOwi/H3rWhtqOYPA==";
+      };
+    };
+    "@babel/preset-modules-0.1.3" = {
+      name = "_at_babel_slash_preset-modules";
+      packageName = "@babel/preset-modules";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz";
+        sha512 = "Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==";
       };
     };
     "@babel/preset-stage-2-7.8.3" = {
@@ -1084,22 +1120,22 @@ let
         sha512 = "dStnEQgejNYIHFNACdDCigK4BF7wgW6Zahv9Dc2un7rGjbeVtZhBfR3sy0I7ZJOhBexkFxVdMZ5hqmll7BFShw==";
       };
     };
-    "@babel/preset-typescript-7.8.3" = {
+    "@babel/preset-typescript-7.9.0" = {
       name = "_at_babel_slash_preset-typescript";
       packageName = "@babel/preset-typescript";
-      version = "7.8.3";
+      version = "7.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.8.3.tgz";
-        sha512 = "qee5LgPGui9zQ0jR1TeU5/fP9L+ovoArklEqY12ek8P/wV5ZeM/VYSQYwICeoT6FfpJTekG9Ilay5PhwsOpMHA==";
+        url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.9.0.tgz";
+        sha512 = "S4cueFnGrIbvYJgwsVFKdvOmpiL0XGw9MFW9D0vgRys5g36PBhZRL8NX8Gr2akz8XRtzq6HuDXPD/1nniagNUg==";
       };
     };
-    "@babel/register-7.8.6" = {
+    "@babel/register-7.9.0" = {
       name = "_at_babel_slash_register";
       packageName = "@babel/register";
-      version = "7.8.6";
+      version = "7.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/register/-/register-7.8.6.tgz";
-        sha512 = "7IDO93fuRsbyml7bAafBQb3RcBGlCpU4hh5wADA2LJEEcYk92WkwFZ0pHyIi2fb5Auoz1714abETdZKCOxN0CQ==";
+        url = "https://registry.npmjs.org/@babel/register/-/register-7.9.0.tgz";
+        sha512 = "Tv8Zyi2J2VRR8g7pC5gTeIN8Ihultbmk0ocyNz8H2nEZbmhp1N6q0A1UGsQbDvGP/sNinQKUHf3SqXwqjtFv4Q==";
       };
     };
     "@babel/runtime-7.7.7" = {
@@ -1111,22 +1147,22 @@ let
         sha512 = "uCnC2JEVAu8AKB5do1WRIsvrdJ0flYx/A/9f/6chdacnEZ7LmavjdsDXr5ksYBegxtuTPR5Va9/+13QF/kFkCA==";
       };
     };
-    "@babel/runtime-7.8.7" = {
+    "@babel/runtime-7.9.2" = {
       name = "_at_babel_slash_runtime";
       packageName = "@babel/runtime";
-      version = "7.8.7";
+      version = "7.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz";
-        sha512 = "+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==";
+        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz";
+        sha512 = "NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==";
       };
     };
-    "@babel/runtime-corejs3-7.8.7" = {
+    "@babel/runtime-corejs3-7.9.2" = {
       name = "_at_babel_slash_runtime-corejs3";
       packageName = "@babel/runtime-corejs3";
-      version = "7.8.7";
+      version = "7.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.8.7.tgz";
-        sha512 = "sc7A+H4I8kTd7S61dgB9RomXu/C+F4IrRr4Ytze4dnfx7AXEpCrejSNpjx7vq6y/Bak9S6Kbk65a/WgMLtg43Q==";
+        url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.9.2.tgz";
+        sha512 = "HHxmgxbIzOfFlZ+tdeRKtaxWOMUoCG5Mu3wKeUmOxjYrwb3AAHgnmtCUbPPK11/raIWLIBK250t8E2BPO0p7jA==";
       };
     };
     "@babel/template-7.8.6" = {
@@ -1138,13 +1174,13 @@ let
         sha512 = "zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==";
       };
     };
-    "@babel/traverse-7.8.6" = {
+    "@babel/traverse-7.9.0" = {
       name = "_at_babel_slash_traverse";
       packageName = "@babel/traverse";
-      version = "7.8.6";
+      version = "7.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.6.tgz";
-        sha512 = "2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A==";
+        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz";
+        sha512 = "jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==";
       };
     };
     "@babel/types-7.0.0-beta.38" = {
@@ -1165,13 +1201,13 @@ let
         sha512 = "wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==";
       };
     };
-    "@babel/types-7.8.7" = {
+    "@babel/types-7.9.0" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
-      version = "7.8.7";
+      version = "7.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz";
-        sha512 = "k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==";
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz";
+        sha512 = "BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==";
       };
     };
     "@chemzqm/neovim-5.1.9" = {
@@ -2587,22 +2623,22 @@ let
         sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==";
       };
     };
-    "@schematics/angular-9.0.6" = {
+    "@schematics/angular-9.0.7" = {
       name = "_at_schematics_slash_angular";
       packageName = "@schematics/angular";
-      version = "9.0.6";
+      version = "9.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.0.6.tgz";
-        sha512 = "oYIfSJF9ISAJWJjIiUnj8Rp1m4t9T3oqKl1FzkMWXvUmR1BfkO2S2/Moi2RQ0aHG6D9Oz4CJjrsQRmjaqBpEZw==";
+        url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.0.7.tgz";
+        sha512 = "3UCeexYx/YVo3kboyPZ8KgqBTduMA18AAm3s2yrC0qj41fBFVVZAZLa74uouTf4RYVgy9kR7J3uv6VLxrJPOnQ==";
       };
     };
-    "@schematics/update-0.900.6" = {
+    "@schematics/update-0.900.7" = {
       name = "_at_schematics_slash_update";
       packageName = "@schematics/update";
-      version = "0.900.6";
+      version = "0.900.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/update/-/update-0.900.6.tgz";
-        sha512 = "54Xi3FIJQWFBM91vxD9ciKkTlNWaIV7wsjKSImg53h2m2/l2VPPHyIZWI4j79dWXlfJVTNeaqPNYGzJlRvaEmA==";
+        url = "https://registry.npmjs.org/@schematics/update/-/update-0.900.7.tgz";
+        sha512 = "e9tX2DGNYfj/k9mVICpQt2bWIYyD92dlsip7LzPeZGt+R9zCp5w19uBLa8Z00OgEGzFR1krhRvkQE5OxkkAnVw==";
       };
     };
     "@serverless/cli-1.4.0" = {
@@ -2641,13 +2677,13 @@ let
         sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ==";
       };
     };
-    "@serverless/enterprise-plugin-3.5.0" = {
+    "@serverless/enterprise-plugin-3.6.0" = {
       name = "_at_serverless_slash_enterprise-plugin";
       packageName = "@serverless/enterprise-plugin";
-      version = "3.5.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.5.0.tgz";
-        sha512 = "AyY7ADtUItSQFQjNRaXZ5ZgMVeeUJZ05UJHxN3WbO9c3fY6/6TxAQRlrDB2O5hfSPkBDfqhUOSp2xbBwIVg/Tw==";
+        url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.6.0.tgz";
+        sha512 = "nOefmzh6fz1vY9tfUzDNYVyg1jlsOVdmbp3JVMZMsMhIKQvBpGZYcaAboSyU97pIOFYUlsSBVQsc57IuLsIeiQ==";
       };
     };
     "@serverless/event-mocks-1.1.1" = {
@@ -2839,6 +2875,15 @@ let
         sha512 = "dlled3mfpnAt3cQb5hxkFiqfPCj4Yk0xV8Yl5P8PeVv1pUmO7vI4Ka4Mjs4r6CYM5f9kZhviFPQQcWOIDlMRcw==";
       };
     };
+    "@sorg/log-2.1.0" = {
+      name = "_at_sorg_slash_log";
+      packageName = "@sorg/log";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@sorg/log/-/log-2.1.0.tgz";
+        sha512 = "weyuceH7eLZGlQLwA9+c2vxCWtWLe0vt4ma9qHzvB7aIbEZkAUXsONytEza6vNq2hIeL3/lRFRoGeiuBbnFfaA==";
+      };
+    };
     "@starptech/expression-parser-0.10.0" = {
       name = "_at_starptech_slash_expression-parser";
       packageName = "@starptech/expression-parser";
@@ -2848,15 +2893,6 @@ let
         sha512 = "HcNE5lqbBd0CNMArErVboWZ9PyJ8Hqp0VGnLJXkA3e38r6/VjhFa2pcsoJQGQiiuHj6napSMr3s+Gc34WUGhzw==";
       };
     };
-    "@starptech/expression-parser-0.9.0" = {
-      name = "_at_starptech_slash_expression-parser";
-      packageName = "@starptech/expression-parser";
-      version = "0.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@starptech/expression-parser/-/expression-parser-0.9.0.tgz";
-        sha512 = "a4CFSYZ3klnflR/rkvN87T2r/n+RxfMhDaZlrWYBaCHcbPhX+2THWyKAn82vT6Ari3SPp3XOsTqUZK4Vx2qcTA==";
-      };
-    };
     "@starptech/hast-util-from-webparser-0.10.0" = {
       name = "_at_starptech_slash_hast-util-from-webparser";
       packageName = "@starptech/hast-util-from-webparser";
@@ -2866,15 +2902,6 @@ let
         sha512 = "ebBrqxnkk4uhOkYXi0EMsHLrUrpGUjAMGz++04HPZmZYfpEZjaHxF3VmhfTWnS6u8SGUtsDPMQ+RxHSvrsNxZg==";
       };
     };
-    "@starptech/hast-util-from-webparser-0.9.0" = {
-      name = "_at_starptech_slash_hast-util-from-webparser";
-      packageName = "@starptech/hast-util-from-webparser";
-      version = "0.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@starptech/hast-util-from-webparser/-/hast-util-from-webparser-0.9.0.tgz";
-        sha512 = "evqGr0KOXB27vu/KiNv6gmd/ggygzwYvINVsCWF6GAd1SFQNS4Vz2wv4tmiktX6rcr6Qq+jBwVXvVwe60d5Z3g==";
-      };
-    };
     "@starptech/prettyhtml-0.10.0" = {
       name = "_at_starptech_slash_prettyhtml";
       packageName = "@starptech/prettyhtml";
@@ -2884,15 +2911,6 @@ let
         sha512 = "d79qc81gX5oyiv0Ioz82NEMnO/waltC7HAOlZ8r/es/zPuRilWMRo5ZCV00/80ZsQ0MiCIuhAnvUcg7rVzFDLg==";
       };
     };
-    "@starptech/prettyhtml-0.9.0" = {
-      name = "_at_starptech_slash_prettyhtml";
-      packageName = "@starptech/prettyhtml";
-      version = "0.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@starptech/prettyhtml/-/prettyhtml-0.9.0.tgz";
-        sha512 = "GekZtpBSdlFo732AxrpO7W8ue1dEZdpMK0kNHD/NVDBNU/50/D0NJ72FD2HKLh0Aune9uK+x8b+9MbBFJ2JT9A==";
-      };
-    };
     "@starptech/prettyhtml-formatter-0.10.0" = {
       name = "_at_starptech_slash_prettyhtml-formatter";
       packageName = "@starptech/prettyhtml-formatter";
@@ -2902,15 +2920,6 @@ let
         sha512 = "AEpBQTRHhgB9NmQZNXINo/ObavGLATEvS41MgiJljsiSHzfUX3ltOPLI2fy9VfDB3E76mjUqIfmEQ/v5lJ5Cfw==";
       };
     };
-    "@starptech/prettyhtml-formatter-0.9.0" = {
-      name = "_at_starptech_slash_prettyhtml-formatter";
-      packageName = "@starptech/prettyhtml-formatter";
-      version = "0.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@starptech/prettyhtml-formatter/-/prettyhtml-formatter-0.9.0.tgz";
-        sha512 = "uyG90dzyERExzQg7VTYJm3uBs6hIW81MDvqACgiFgmaafTrveKebJxAZpkbkAgTesvNmApM2I0b5Tu4OKHmaKQ==";
-      };
-    };
     "@starptech/prettyhtml-hast-to-html-0.10.0" = {
       name = "_at_starptech_slash_prettyhtml-hast-to-html";
       packageName = "@starptech/prettyhtml-hast-to-html";
@@ -2920,15 +2929,6 @@ let
         sha512 = "TAbm1q6bCBl13i8FbY/1eHMnTHWr/kLM5RcOD1S6F3T12DwhMwcqagMzqPQc4tT1DmyLzGWY8SA/p3HrB0iPcg==";
       };
     };
-    "@starptech/prettyhtml-hast-to-html-0.9.0" = {
-      name = "_at_starptech_slash_prettyhtml-hast-to-html";
-      packageName = "@starptech/prettyhtml-hast-to-html";
-      version = "0.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@starptech/prettyhtml-hast-to-html/-/prettyhtml-hast-to-html-0.9.0.tgz";
-        sha512 = "PcMRqtwXBDsliBC6nesNlDaO0a4uqC2uwfqbz/1VRaFVEInudMQ00fbRjv3Fql5C2YZ1MObMwre/+W7UDuzcIw==";
-      };
-    };
     "@starptech/prettyhtml-hastscript-0.10.0" = {
       name = "_at_starptech_slash_prettyhtml-hastscript";
       packageName = "@starptech/prettyhtml-hastscript";
@@ -2938,15 +2938,6 @@ let
         sha512 = "oSZB/CXRagbJ1UAGihSsdDcvHIGa+ivdVVmljWtJDqO5+FfFn9utzCw/QI9NAV3m9cgFWRdW/6TkXwbdPrIQ4A==";
       };
     };
-    "@starptech/prettyhtml-hastscript-0.9.0" = {
-      name = "_at_starptech_slash_prettyhtml-hastscript";
-      packageName = "@starptech/prettyhtml-hastscript";
-      version = "0.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@starptech/prettyhtml-hastscript/-/prettyhtml-hastscript-0.9.0.tgz";
-        sha512 = "ifXB3oqZl5LMMaFuQvfUYF0e+XdGDeQoIzFQYdA59cJ+RgjGdsjgFMmvkW+kxZwMWRYyAsLsYuJ19UfIWO8ymQ==";
-      };
-    };
     "@starptech/prettyhtml-sort-attributes-0.10.0" = {
       name = "_at_starptech_slash_prettyhtml-sort-attributes";
       packageName = "@starptech/prettyhtml-sort-attributes";
@@ -2956,15 +2947,6 @@ let
         sha512 = "ctsjmEEsxzW4dzMOIwYRWQvqfilgdGFaZn+lIxiNuPJIL4V4ZpgQhT96Us5BQcalHYQqQsKF+nRelCWFhd67IQ==";
       };
     };
-    "@starptech/prettyhtml-sort-attributes-0.9.0" = {
-      name = "_at_starptech_slash_prettyhtml-sort-attributes";
-      packageName = "@starptech/prettyhtml-sort-attributes";
-      version = "0.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@starptech/prettyhtml-sort-attributes/-/prettyhtml-sort-attributes-0.9.0.tgz";
-        sha512 = "jj4btXkDU0dnY8llM6Cv+6arqVIjfaHhrfLnaaiVdLLb02f1eazMIr8+4jfK0Dol4Bfg3AC3RIYAyu2Kd7FF6g==";
-      };
-    };
     "@starptech/rehype-minify-whitespace-0.10.0" = {
       name = "_at_starptech_slash_rehype-minify-whitespace";
       packageName = "@starptech/rehype-minify-whitespace";
@@ -2974,15 +2956,6 @@ let
         sha512 = "11k2dW0ju2hMuSfQ9znXqeCjyBtkfY7BRoyPjDLiVCsGIlqM2JpZhx46sFTF3JJOsJz9pr2HQ8Cvf4oTt9hgvg==";
       };
     };
-    "@starptech/rehype-minify-whitespace-0.9.0" = {
-      name = "_at_starptech_slash_rehype-minify-whitespace";
-      packageName = "@starptech/rehype-minify-whitespace";
-      version = "0.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@starptech/rehype-minify-whitespace/-/rehype-minify-whitespace-0.9.0.tgz";
-        sha512 = "z4CL6TCdHyXVZGU6I632Un5g2MmIsYhnsYVerAW4DKf3Zyc5Nam2U+wVdbE2nLqTInDUpUr4vmzksD8tHsY9Ew==";
-      };
-    };
     "@starptech/rehype-webparser-0.10.0" = {
       name = "_at_starptech_slash_rehype-webparser";
       packageName = "@starptech/rehype-webparser";
@@ -2992,15 +2965,6 @@ let
         sha512 = "1CPMVKrgXjKnehAouQBa2wWkikR6jD+BZ+8/v1RDH1S1a293fOzItU63W3VIx4zv3n0iMgrTWeeyfpk/9cT4LQ==";
       };
     };
-    "@starptech/rehype-webparser-0.9.0" = {
-      name = "_at_starptech_slash_rehype-webparser";
-      packageName = "@starptech/rehype-webparser";
-      version = "0.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@starptech/rehype-webparser/-/rehype-webparser-0.9.0.tgz";
-        sha512 = "Ndv/excuCjdRIUWtzD5YQMvuZudMvjtYmNhLllzYEzMq6+nkPrhaORuUNihDG1SYZI260CXV1khDTGqPc581Yg==";
-      };
-    };
     "@starptech/webparser-0.10.0" = {
       name = "_at_starptech_slash_webparser";
       packageName = "@starptech/webparser";
@@ -3010,15 +2974,6 @@ let
         sha512 = "vA/p1LTVfuK8dP+EhBglMS7ll3dZahBjnvjwUiJ8NNUCqH5pSAj3tcRtOG3k7k1Wx1hWHJpGgZVj0VNQIo99bA==";
       };
     };
-    "@starptech/webparser-0.9.0" = {
-      name = "_at_starptech_slash_webparser";
-      packageName = "@starptech/webparser";
-      version = "0.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@starptech/webparser/-/webparser-0.9.0.tgz";
-        sha512 = "QEC1yjpsOtj3leNCWZGirAyVCN7WJDH+rUhfMVGQuLEfoJNKK66t/UWAOrXeGxR2jdU5IffAGnqZIHbFMX6SNw==";
-      };
-    };
     "@szmarczak/http-timer-1.1.2" = {
       name = "_at_szmarczak_slash_http-timer";
       packageName = "@szmarczak/http-timer";
@@ -3352,13 +3307,13 @@ let
         sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==";
       };
     };
-    "@types/estree-0.0.42" = {
+    "@types/estree-0.0.44" = {
       name = "_at_types_slash_estree";
       packageName = "@types/estree";
-      version = "0.0.42";
+      version = "0.0.44";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.42.tgz";
-        sha512 = "K1DPVvnBCPxzD+G51/cxVIoc2X8uUVl1zpJeE6iKcgHMj4+tbat5Xu4TjV7v2QSDbIeAfLi2hIk+u2+s0MlpUQ==";
+        url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.44.tgz";
+        sha512 = "iaIVzr+w2ZJ5HkidlZ3EJM8VTZb2MJLCjw3V+505yVts0gRC4UMvjw0d1HPtGqI/HQC/KdsYtayfzl+AXY2R8g==";
       };
     };
     "@types/events-3.0.0" = {
@@ -3379,13 +3334,13 @@ let
         sha512 = "5mHFNyavtLoJmnusB8OKJ5bshSzw+qkMIBAobLrIM48HJvunFva9mOa6aBwh64lBFyNwBbs0xiEFuj4eU/NjCA==";
       };
     };
-    "@types/express-serve-static-core-4.17.2" = {
+    "@types/express-serve-static-core-4.17.3" = {
       name = "_at_types_slash_express-serve-static-core";
       packageName = "@types/express-serve-static-core";
-      version = "4.17.2";
+      version = "4.17.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.2.tgz";
-        sha512 = "El9yMpctM6tORDAiBwZVLMcxoTMcqqRO9dVyYcn7ycLWbvR8klrDn8CAOwRfZujZtWD7yS/mshTdz43jMOejbg==";
+        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.3.tgz";
+        sha512 = "sHEsvEzjqN+zLbqP+8OXTipc10yH1QLR+hnr5uw29gi9AhCAAAdri8ClNV7iMdrJrIzXIQtlkPvq8tJGhj3QJQ==";
       };
     };
     "@types/fs-capacitor-2.0.0" = {
@@ -3577,13 +3532,13 @@ let
         sha512 = "gpNnRnZP3VWzzj5k3qrpRC6Rk3H/uclhAVo1aIvwzK5p5cOrs9yEyQ8H/HBsBY0u5rrWxXEiVPQ0dEB6pkjE8Q==";
       };
     };
-    "@types/node-13.9.1" = {
+    "@types/node-13.9.3" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "13.9.1";
+      version = "13.9.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-13.9.1.tgz";
-        sha512 = "E6M6N0blf/jiZx8Q3nb0vNaswQeEyn0XlupO+xN6DtJ6r6IT4nXrTry7zhIfYvFCl3/8Cu6WIysmUBKiqV0bqQ==";
+        url = "https://registry.npmjs.org/@types/node/-/node-13.9.3.tgz";
+        sha512 = "01s+ac4qerwd6RHD+mVbOEsraDHSgUaefQlEdBbUolnQFjKwCr7luvAlEwW1RFojh67u0z4OUTjPn9LEl4zIkA==";
       };
     };
     "@types/node-6.14.9" = {
@@ -3757,6 +3712,15 @@ let
         sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==";
       };
     };
+    "@types/yoga-layout-1.9.1" = {
+      name = "_at_types_slash_yoga-layout";
+      packageName = "@types/yoga-layout";
+      version = "1.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/yoga-layout/-/yoga-layout-1.9.1.tgz";
+        sha512 = "OpfgQXWLZn5Dl7mOd8dBNcV8NywXbYYoHjUpa64vJ/RQABaxMzJ5bVicKLGIvIiMnQPtPgKNgXb5jkv9fkOQtw==";
+      };
+    };
     "@types/zen-observable-0.8.0" = {
       name = "_at_types_slash_zen-observable";
       packageName = "@types/zen-observable";
@@ -3793,6 +3757,15 @@ let
         sha512 = "b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw==";
       };
     };
+    "@typescript-eslint/typescript-estree-2.25.0" = {
+      name = "_at_typescript-eslint_slash_typescript-estree";
+      packageName = "@typescript-eslint/typescript-estree";
+      version = "2.25.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.25.0.tgz";
+        sha512 = "VUksmx5lDxSi6GfmwSK7SSoIKSw9anukWWNitQPqt58LuYrKalzsgeuignbqnB+rK/xxGlSsCy8lYnwFfB6YJg==";
+      };
+    };
     "@vue/cli-shared-utils-4.2.3" = {
       name = "_at_vue_slash_cli-shared-utils";
       packageName = "@vue/cli-shared-utils";
@@ -3838,15 +3811,6 @@ let
         sha512 = "gDrC14Ae2b4gP9vYdCzx6ytY4LuYoH3I0h0QzU9RPifGPgjXz8F3s5g9632P7Wf39vQQg6XQ0Bfv29rc5RoTmw==";
       };
     };
-    "@webassemblyjs/ast-1.8.5" = {
-      name = "_at_webassemblyjs_slash_ast";
-      packageName = "@webassemblyjs/ast";
-      version = "1.8.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz";
-        sha512 = "aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==";
-      };
-    };
     "@webassemblyjs/ast-1.9.0" = {
       name = "_at_webassemblyjs_slash_ast";
       packageName = "@webassemblyjs/ast";
@@ -3865,15 +3829,6 @@ let
         sha512 = "g50x4xV7o2b39pB+uppF3kibFXhb9Dl4Jj3fj18eqWPGBgabreIwQmw3B5Uc6Y7Ec7ZZJ8TrUe79swN3iBaPDQ==";
       };
     };
-    "@webassemblyjs/floating-point-hex-parser-1.8.5" = {
-      name = "_at_webassemblyjs_slash_floating-point-hex-parser";
-      packageName = "@webassemblyjs/floating-point-hex-parser";
-      version = "1.8.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz";
-        sha512 = "9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==";
-      };
-    };
     "@webassemblyjs/floating-point-hex-parser-1.9.0" = {
       name = "_at_webassemblyjs_slash_floating-point-hex-parser";
       packageName = "@webassemblyjs/floating-point-hex-parser";
@@ -3892,15 +3847,6 @@ let
         sha512 = "79RidFwQOl8vG+Wv1uQWfCw4JQO5XR8iQcNGKLum3oPsSG8jkuEK5ILT6NxT3MNOa+xwSd3d+YqVFB1V0/W7/w==";
       };
     };
-    "@webassemblyjs/helper-api-error-1.8.5" = {
-      name = "_at_webassemblyjs_slash_helper-api-error";
-      packageName = "@webassemblyjs/helper-api-error";
-      version = "1.8.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz";
-        sha512 = "Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==";
-      };
-    };
     "@webassemblyjs/helper-api-error-1.9.0" = {
       name = "_at_webassemblyjs_slash_helper-api-error";
       packageName = "@webassemblyjs/helper-api-error";
@@ -3919,13 +3865,13 @@ let
         sha512 = "ex3cnmE6V0JfCBIesxF70vsPvh/QNOfaIsL5N0lkiJjVDl65YjH/WZxLe0nTuIuvVQhZH7DdRzUm0G9g12YACg==";
       };
     };
-    "@webassemblyjs/helper-buffer-1.8.5" = {
+    "@webassemblyjs/helper-buffer-1.9.0" = {
       name = "_at_webassemblyjs_slash_helper-buffer";
       packageName = "@webassemblyjs/helper-buffer";
-      version = "1.8.5";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz";
-        sha512 = "Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz";
+        sha512 = "qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==";
       };
     };
     "@webassemblyjs/helper-code-frame-1.8.1" = {
@@ -3937,15 +3883,6 @@ let
         sha512 = "vSs2ObU/pbPXrvMqfpEUnvTcvlhwHT3ochBdekn+cv5zYR1wtmAIj+UXrmzbkBQYff/yTrZgaeqkFaT3fLLOrA==";
       };
     };
-    "@webassemblyjs/helper-code-frame-1.8.5" = {
-      name = "_at_webassemblyjs_slash_helper-code-frame";
-      packageName = "@webassemblyjs/helper-code-frame";
-      version = "1.8.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz";
-        sha512 = "VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==";
-      };
-    };
     "@webassemblyjs/helper-code-frame-1.9.0" = {
       name = "_at_webassemblyjs_slash_helper-code-frame";
       packageName = "@webassemblyjs/helper-code-frame";
@@ -3982,15 +3919,6 @@ let
         sha512 = "WeXD3ZkKi2wpAXqPW+COawoNb0Vcu3OGoaQv8/cL3VpTfGO85ZN30h/6CjUHLISGZtpZxQu3D7AuJmI/rlEqAw==";
       };
     };
-    "@webassemblyjs/helper-fsm-1.8.5" = {
-      name = "_at_webassemblyjs_slash_helper-fsm";
-      packageName = "@webassemblyjs/helper-fsm";
-      version = "1.8.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz";
-        sha512 = "kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==";
-      };
-    };
     "@webassemblyjs/helper-fsm-1.9.0" = {
       name = "_at_webassemblyjs_slash_helper-fsm";
       packageName = "@webassemblyjs/helper-fsm";
@@ -4009,15 +3937,6 @@ let
         sha512 = "657xpRy6lptA7oCIgOKQAHElsgAXliqutMPLjoEL2T5Uyp1cIDUH7axmphu7bb5U+ZUpwApnZHvdvyJYGDOxsQ==";
       };
     };
-    "@webassemblyjs/helper-module-context-1.8.5" = {
-      name = "_at_webassemblyjs_slash_helper-module-context";
-      packageName = "@webassemblyjs/helper-module-context";
-      version = "1.8.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz";
-        sha512 = "/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==";
-      };
-    };
     "@webassemblyjs/helper-module-context-1.9.0" = {
       name = "_at_webassemblyjs_slash_helper-module-context";
       packageName = "@webassemblyjs/helper-module-context";
@@ -4036,15 +3955,6 @@ let
         sha512 = "MDdqmxj6ea1qfHBLKVHaF2+IyWLQtw8+bvRaeZc4MtcO7dNBz/2cZZ/GCFN9kGTJVvhe37tkeCi2JAB3evoU2w==";
       };
     };
-    "@webassemblyjs/helper-wasm-bytecode-1.8.5" = {
-      name = "_at_webassemblyjs_slash_helper-wasm-bytecode";
-      packageName = "@webassemblyjs/helper-wasm-bytecode";
-      version = "1.8.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz";
-        sha512 = "Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==";
-      };
-    };
     "@webassemblyjs/helper-wasm-bytecode-1.9.0" = {
       name = "_at_webassemblyjs_slash_helper-wasm-bytecode";
       packageName = "@webassemblyjs/helper-wasm-bytecode";
@@ -4063,13 +3973,13 @@ let
         sha512 = "FlNdlARr+mcP8XL+wg6bXqgC+0ZwnltqXExw63e9cgK84bAdTwKnfX9k6CKg8qvK5e/d9dUmk0dkVrkyEpKx5w==";
       };
     };
-    "@webassemblyjs/helper-wasm-section-1.8.5" = {
+    "@webassemblyjs/helper-wasm-section-1.9.0" = {
       name = "_at_webassemblyjs_slash_helper-wasm-section";
       packageName = "@webassemblyjs/helper-wasm-section";
-      version = "1.8.5";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz";
-        sha512 = "VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==";
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz";
+        sha512 = "XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==";
       };
     };
     "@webassemblyjs/ieee754-1.8.1" = {
@@ -4081,15 +3991,6 @@ let
         sha512 = "Pq3IQR3uay+rFC0qIgg6xvD+uu0a9QEWDCRihHuU9wmOBFW3Lda/ObnO0HjC7XUJ8A9h4xExaa1w5TsSk+DxIQ==";
       };
     };
-    "@webassemblyjs/ieee754-1.8.5" = {
-      name = "_at_webassemblyjs_slash_ieee754";
-      packageName = "@webassemblyjs/ieee754";
-      version = "1.8.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz";
-        sha512 = "aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==";
-      };
-    };
     "@webassemblyjs/ieee754-1.9.0" = {
       name = "_at_webassemblyjs_slash_ieee754";
       packageName = "@webassemblyjs/ieee754";
@@ -4108,15 +4009,6 @@ let
         sha512 = "Ir8M3hgTzFLEOKmMMH44neM6sLESfEoSCjNsOInETxbSpPY1MKOsFSAxCUaeXhjtLQfflCCdjgSsU+2veP6SGw==";
       };
     };
-    "@webassemblyjs/leb128-1.8.5" = {
-      name = "_at_webassemblyjs_slash_leb128";
-      packageName = "@webassemblyjs/leb128";
-      version = "1.8.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz";
-        sha512 = "plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==";
-      };
-    };
     "@webassemblyjs/leb128-1.9.0" = {
       name = "_at_webassemblyjs_slash_leb128";
       packageName = "@webassemblyjs/leb128";
@@ -4135,15 +4027,6 @@ let
         sha512 = "I5QQEb5ajQ99ARiyDrVQM/2nvyFFG0tF1TX2Ql7dOjw5GRT6P4FF+gRk7OeAUtI1CLyffUNWbIvpJz13crGSxw==";
       };
     };
-    "@webassemblyjs/utf8-1.8.5" = {
-      name = "_at_webassemblyjs_slash_utf8";
-      packageName = "@webassemblyjs/utf8";
-      version = "1.8.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz";
-        sha512 = "U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==";
-      };
-    };
     "@webassemblyjs/utf8-1.9.0" = {
       name = "_at_webassemblyjs_slash_utf8";
       packageName = "@webassemblyjs/utf8";
@@ -4162,13 +4045,13 @@ let
         sha512 = "ysKeFNEWX8r45OXHtH0UPkqFM5qeUd+887+KnDob6kCrryqjNNyW3Ew+fTI8u1vzg7VUXYOJqxXplRUF6cfsfA==";
       };
     };
-    "@webassemblyjs/wasm-edit-1.8.5" = {
+    "@webassemblyjs/wasm-edit-1.9.0" = {
       name = "_at_webassemblyjs_slash_wasm-edit";
       packageName = "@webassemblyjs/wasm-edit";
-      version = "1.8.5";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz";
-        sha512 = "A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==";
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz";
+        sha512 = "FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==";
       };
     };
     "@webassemblyjs/wasm-gen-1.8.1" = {
@@ -4180,22 +4063,22 @@ let
         sha512 = "xOgoGf6rR6gHlhlNlU0EfMIgDAjbLCO2cNdEIKdGfKj2/fc02pbAyS3gYJ6EWAzSnL/XpAOf3Q/trp/EUeikug==";
       };
     };
-    "@webassemblyjs/wasm-gen-1.8.5" = {
+    "@webassemblyjs/wasm-gen-1.9.0" = {
       name = "_at_webassemblyjs_slash_wasm-gen";
       packageName = "@webassemblyjs/wasm-gen";
-      version = "1.8.5";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz";
-        sha512 = "BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==";
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz";
+        sha512 = "cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==";
       };
     };
-    "@webassemblyjs/wasm-opt-1.8.5" = {
+    "@webassemblyjs/wasm-opt-1.9.0" = {
       name = "_at_webassemblyjs_slash_wasm-opt";
       packageName = "@webassemblyjs/wasm-opt";
-      version = "1.8.5";
+      version = "1.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz";
-        sha512 = "HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==";
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz";
+        sha512 = "Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==";
       };
     };
     "@webassemblyjs/wasm-parser-1.8.1" = {
@@ -4207,15 +4090,6 @@ let
         sha512 = "k63WJZdIjTQgZt+cn8rsIEvW0aNKttGip6ygTE/ZPXKZsMTk0G5xyw+MQxphbvt/GYbNu5DdxGN/7WGybO95TA==";
       };
     };
-    "@webassemblyjs/wasm-parser-1.8.5" = {
-      name = "_at_webassemblyjs_slash_wasm-parser";
-      packageName = "@webassemblyjs/wasm-parser";
-      version = "1.8.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz";
-        sha512 = "pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==";
-      };
-    };
     "@webassemblyjs/wasm-parser-1.9.0" = {
       name = "_at_webassemblyjs_slash_wasm-parser";
       packageName = "@webassemblyjs/wasm-parser";
@@ -4234,15 +4108,6 @@ let
         sha512 = "iXjhXGhZeZIAnWkHD2G4ZOx8x5GYux5dwHuQL/AU8jb2H3BxolxVvNdpDmBTQPKDAgAAEeCFDnftNf4xNR9KMQ==";
       };
     };
-    "@webassemblyjs/wast-parser-1.8.5" = {
-      name = "_at_webassemblyjs_slash_wast-parser";
-      packageName = "@webassemblyjs/wast-parser";
-      version = "1.8.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz";
-        sha512 = "daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==";
-      };
-    };
     "@webassemblyjs/wast-parser-1.9.0" = {
       name = "_at_webassemblyjs_slash_wast-parser";
       packageName = "@webassemblyjs/wast-parser";
@@ -4261,15 +4126,6 @@ let
         sha512 = "YYRBpDCBLeYJBO+sVapLRkEE/+wrjv1O03IEybkqyls3sCZqhu3ZXjJwMSMCgFEyYP2MrdZvqL/dz2RBnULTbA==";
       };
     };
-    "@webassemblyjs/wast-printer-1.8.5" = {
-      name = "_at_webassemblyjs_slash_wast-printer";
-      packageName = "@webassemblyjs/wast-printer";
-      version = "1.8.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz";
-        sha512 = "w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==";
-      };
-    };
     "@webassemblyjs/wast-printer-1.9.0" = {
       name = "_at_webassemblyjs_slash_wast-printer";
       packageName = "@webassemblyjs/wast-printer";
@@ -5827,6 +5683,15 @@ let
         sha512 = "rPMUMkR8JjjPDDHHDZ/YeLO0KIbUGCrXgy921F6sBkEXBR9jYYxK8LUlwpZkUVi70cMR6r8uSmHZ/5HvtrntHg==";
       };
     };
+    "append-type-1.0.2" = {
+      name = "append-type";
+      packageName = "append-type";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/append-type/-/append-type-1.0.2.tgz";
+        sha512 = "hac740vT/SAbrFBLgLIWZqVT5PUAcGTWS5UkDDhr+OCizZSw90WKw6sWAEgGaYd2viIblggypMXwpjzHXOvAQg==";
+      };
+    };
     "appendable-cli-menu-2.0.0" = {
       name = "appendable-cli-menu";
       packageName = "appendable-cli-menu";
@@ -6547,6 +6412,15 @@ let
         sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367";
       };
     };
+    "ast-module-types-2.6.0" = {
+      name = "ast-module-types";
+      packageName = "ast-module-types";
+      version = "2.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ast-module-types/-/ast-module-types-2.6.0.tgz";
+        sha512 = "zXSoVaMrf2R+r+ISid5/9a8SXm1LLdkhHzh6pSRhj9jklzruOOl1hva1YmFT33wAstg/f9ZndJAlq1BSrFLSGA==";
+      };
+    };
     "ast-types-0.13.2" = {
       name = "ast-types";
       packageName = "ast-types";
@@ -6799,6 +6673,15 @@ let
         sha1 = "ef249dc869d6c07e7dfd4a22c8a18850bb39d7f1";
       };
     };
+    "at-least-node-1.0.0" = {
+      name = "at-least-node";
+      packageName = "at-least-node";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz";
+        sha512 = "+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==";
+      };
+    };
     "atob-2.1.2" = {
       name = "atob";
       packageName = "atob";
@@ -6889,13 +6772,13 @@ let
         sha512 = "Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==";
       };
     };
-    "autoprefixer-9.7.4" = {
+    "autoprefixer-9.7.5" = {
       name = "autoprefixer";
       packageName = "autoprefixer";
-      version = "9.7.4";
+      version = "9.7.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.4.tgz";
-        sha512 = "g0Ya30YrMBAEZk60lp+qfX5YQllG+S5W3GYCFvyHTvhOki0AEQJLPEcIuGRsqVwLi8FvXPVtwTGhfr38hVpm0g==";
+        url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.5.tgz";
+        sha512 = "URo6Zvt7VYifomeAfJlMFnYDhow1rk2bufwkbamPEAtQFcL11moLk4PnR7n9vlu7M+BkXAZkHFA0mIcY7tjQFg==";
       };
     };
     "await-semaphore-0.1.3" = {
@@ -6925,13 +6808,13 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.639.0" = {
+    "aws-sdk-2.644.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.639.0";
+      version = "2.644.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.639.0.tgz";
-        sha512 = "cbH69oV0ObZ4tapbjDqu0j3I779uscQNhRaewjIJY5O5At4RULtd7us24n72FtT4HIwM9cwORzVxA9rK6DHKOA==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.644.0.tgz";
+        sha512 = "FkglRU5fvWHwT2Ll0caXS/QzRNzh5ZCS5cs4pF2nP0OjdD7VNJhNtu5lOnSzvMHAtZQJMsG3k0em8PoI8vk1AQ==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -7078,13 +6961,13 @@ let
         sha512 = "tz0VxUhhOE2y+g8R2oFrO/2VtVjA1lkJeavlhExuRBg3LdNJY9gwQ+Vcvqt9+cqy71MCTJhewvTB7Qtnnr9SWg==";
       };
     };
-    "babel-loader-8.0.6" = {
+    "babel-loader-8.1.0" = {
       name = "babel-loader";
       packageName = "babel-loader";
-      version = "8.0.6";
+      version = "8.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.6.tgz";
-        sha512 = "4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==";
+        url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz";
+        sha512 = "7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==";
       };
     };
     "babel-plugin-dynamic-import-node-2.3.0" = {
@@ -7735,13 +7618,13 @@ let
         sha1 = "38f716b24c8cee07a262abc41c22c314e20e3869";
       };
     };
-    "bezier-js-2.5.1" = {
+    "bezier-js-2.6.0" = {
       name = "bezier-js";
       packageName = "bezier-js";
-      version = "2.5.1";
+      version = "2.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bezier-js/-/bezier-js-2.5.1.tgz";
-        sha512 = "a+U+hOQWIx1aM37TZLGbAH1Hw0YdsuBTWYNlFudz/V/CvOM56gl5RyPoH0pUwuIqg1LAhDtoA3uRVYl0ZJpi5w==";
+        url = "https://registry.npmjs.org/bezier-js/-/bezier-js-2.6.0.tgz";
+        sha512 = "BBnddaIUivrZYXUIbyEJrFWkjU0hFkqJyqfIbANPwUQfFr3Ec61qLaFEys7VmNIwsdHL24FJZsS6MKrY7HyudQ==";
       };
     };
     "biased-opener-0.2.8" = {
@@ -7969,13 +7852,13 @@ let
         sha512 = "e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==";
       };
     };
-    "bl-4.0.1" = {
+    "bl-4.0.2" = {
       name = "bl";
       packageName = "bl";
-      version = "4.0.1";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bl/-/bl-4.0.1.tgz";
-        sha512 = "FL/TdvchukRCuWVxT0YMO/7+L5TNeNrVFvRU2IY63aUyv9mpt8splf2NEr6qXtPo5fya5a66YohQKvGNmLrWNA==";
+        url = "https://registry.npmjs.org/bl/-/bl-4.0.2.tgz";
+        sha512 = "j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ==";
       };
     };
     "blake2b-2.1.3" = {
@@ -8581,13 +8464,13 @@ let
         sha512 = "yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==";
       };
     };
-    "browserslist-4.9.1" = {
+    "browserslist-4.11.0" = {
       name = "browserslist";
       packageName = "browserslist";
-      version = "4.9.1";
+      version = "4.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.9.1.tgz";
-        sha512 = "Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw==";
+        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.11.0.tgz";
+        sha512 = "WqEC7Yr5wUH5sg6ruR++v2SGOQYpyUdYYd4tZoAq1F7y+QXoLoYGXVbxhtaIqWmAJjtNTRjVD3HuJc1OXTel2A==";
       };
     };
     "bser-2.1.1" = {
@@ -8851,6 +8734,15 @@ let
         sha512 = "jzQnSbdJqhIltU9O5KUiTtljP9ccw2u5ix59McQy4pV2xGhVLhRZIndY8GIrgh5HjXa6+QJ9AQhOd2QWQizJFQ==";
       };
     };
+    "build-purescript-0.4.1" = {
+      name = "build-purescript";
+      packageName = "build-purescript";
+      version = "0.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/build-purescript/-/build-purescript-0.4.1.tgz";
+        sha512 = "wHoafIs4c1yDJspybVilXRQZUauaxdGPkZU0HdJdu968uei7O4yS/cp/h1O4zIMVDu9MN6/sYDCLnhQA3iLAYA==";
+      };
+    };
     "builtin-modules-1.1.1" = {
       name = "builtin-modules";
       packageName = "builtin-modules";
@@ -9040,13 +8932,13 @@ let
         sha1 = "3fb410c7e91558eb1ab22a82834577aa6bd61d42";
       };
     };
-    "cacache-12.0.3" = {
+    "cacache-12.0.4" = {
       name = "cacache";
       packageName = "cacache";
-      version = "12.0.3";
+      version = "12.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz";
-        sha512 = "kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==";
+        url = "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz";
+        sha512 = "a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==";
       };
     };
     "cacache-15.0.0" = {
@@ -9076,13 +8968,13 @@ let
         sha512 = "7YKEapH+2Uikde8hySyfobXBqPKULDyHNl/lhKm7cKf/GJFdG/tU/WpLrOg2y9aUrQrWUilYqawFIiGJPS6gDA==";
       };
     };
-    "cacheable-lookup-2.0.0" = {
+    "cacheable-lookup-2.0.1" = {
       name = "cacheable-lookup";
       packageName = "cacheable-lookup";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-2.0.0.tgz";
-        sha512 = "s2piO6LvA7xnL1AR03wuEdSx3BZT3tIJpZ56/lcJwzO/6DTJZlTs7X3lrvPxk6d1PlDe6PrVe2TjlUIZNFglAQ==";
+        url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-2.0.1.tgz";
+        sha512 = "EMMbsiOTcdngM/K6gV/OxF2x0t07+vMOWxZNSCRQMjO2MY2nhZQ6OYhOOpyQrbhqsgtvKGI7hcq6xjnA92USjg==";
       };
     };
     "cacheable-request-2.1.4" = {
@@ -9310,6 +9202,24 @@ let
         sha512 = "BPCNVH56RVIxQQIXskp5tLQXUNGQ6sXr7iCv1FHDt81xBOQ/1r6H8SPxf19InVP6DexWar4s87q9thfuk8X9HA==";
       };
     };
+    "cancelable-pipeline-1.0.0" = {
+      name = "cancelable-pipeline";
+      packageName = "cancelable-pipeline";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cancelable-pipeline/-/cancelable-pipeline-1.0.0.tgz";
+        sha512 = "vsimf+py0scGFJyZXsawF7h2ZJ6A1p5FXjieXjQ36kZyigWKYTDW3VjiYPTj+tFqdzQzYz+XV8J24Dtc88pmGQ==";
+      };
+    };
+    "cancelable-pump-0.4.0" = {
+      name = "cancelable-pump";
+      packageName = "cancelable-pump";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cancelable-pump/-/cancelable-pump-0.4.0.tgz";
+        sha512 = "7Yvp8ADC9exD0Kdq/Q35UD5wOiuXTTLp159gFHC+uMQvjRMllrsM6EUKnozmIe43yesLBiH/ni0KD69k07yzZQ==";
+      };
+    };
     "caniuse-api-3.0.0" = {
       name = "caniuse-api";
       packageName = "caniuse-api";
@@ -9319,13 +9229,13 @@ let
         sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
       };
     };
-    "caniuse-lite-1.0.30001035" = {
+    "caniuse-lite-1.0.30001036" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001035";
+      version = "1.0.30001036";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz";
-        sha512 = "C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001036.tgz";
+        sha512 = "jU8CIFIj2oR7r4W+5AKcsvWNVIb6Q6OZE3UsrXrZBHFtreT4YgTeOJtTucp+zSedEpTi3L5wASSP0LYIE3if6w==";
       };
     };
     "capture-exit-2.0.0" = {
@@ -10282,13 +10192,13 @@ let
         sha512 = "2WNImOvCRe6r63Gk9pShfkwXsVtKCroMAevIbiae021mS850UkWPbevxsBz3tnvjZIEGvlwaqCPsw+4ulzNgJA==";
       };
     };
-    "clipboardy-2.2.0" = {
+    "clipboardy-2.3.0" = {
       name = "clipboardy";
       packageName = "clipboardy";
-      version = "2.2.0";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clipboardy/-/clipboardy-2.2.0.tgz";
-        sha512 = "9ry9nC3VFULNmoEIqvuRwCIQ9M7wjnm4O+yvk7xkmhR+7FAUWaeX751oeYJbORg0h0zmqW1EVDoZK8f7yapwbg==";
+        url = "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz";
+        sha512 = "mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ==";
       };
     };
     "clipper-lib-1.0.0" = {
@@ -10579,13 +10489,13 @@ let
         sha512 = "q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==";
       };
     };
-    "coc.nvim-0.0.76" = {
+    "coc.nvim-0.0.77" = {
       name = "coc.nvim";
       packageName = "coc.nvim";
-      version = "0.0.76";
+      version = "0.0.77";
       src = fetchurl {
-        url = "https://registry.npmjs.org/coc.nvim/-/coc.nvim-0.0.76.tgz";
-        sha512 = "URa4r4dXcvotXJDKwgzHgMk9+vRFjO7tePKnznKF7XK+ApewV4aoibQ3NzC4xMWuDGto5RWWlHlWWOd5orDiOQ==";
+        url = "https://registry.npmjs.org/coc.nvim/-/coc.nvim-0.0.77.tgz";
+        sha512 = "wwn3ca7iMKuH/a6NAV7HL95xkEK5DzrKJ1dWGKBs+HZHFLhzXVYhjA0RL8x8Xf62TBEQGhH1wlKtBxkluGd1oQ==";
       };
     };
     "code-point-at-1.1.0" = {
@@ -12407,6 +12317,15 @@ let
         sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==";
       };
     };
+    "css-tree-1.0.0-alpha.39" = {
+      name = "css-tree";
+      packageName = "css-tree";
+      version = "1.0.0-alpha.39";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz";
+        sha512 = "7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==";
+      };
+    };
     "css-what-2.1.3" = {
       name = "css-what";
       packageName = "css-what";
@@ -12506,13 +12425,13 @@ let
         sha512 = "WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==";
       };
     };
-    "csso-4.0.2" = {
+    "csso-4.0.3" = {
       name = "csso";
       packageName = "csso";
-      version = "4.0.2";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csso/-/csso-4.0.2.tgz";
-        sha512 = "kS7/oeNVXkHWxby5tHVxlhjizRCSv8QdU7hB2FpdAibDU8FjTAolhNjKNTiLzXtUrKT6HwClE81yXwEk1309wg==";
+        url = "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz";
+        sha512 = "NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==";
       };
     };
     "cssom-0.3.8" = {
@@ -12524,6 +12443,15 @@ let
         sha512 = "b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==";
       };
     };
+    "cssom-0.4.4" = {
+      name = "cssom";
+      packageName = "cssom";
+      version = "0.4.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz";
+        sha512 = "p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==";
+      };
+    };
     "cssstyle-0.2.37" = {
       name = "cssstyle";
       packageName = "cssstyle";
@@ -12542,6 +12470,24 @@ let
         sha512 = "GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==";
       };
     };
+    "cssstyle-2.2.0" = {
+      name = "cssstyle";
+      packageName = "cssstyle";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cssstyle/-/cssstyle-2.2.0.tgz";
+        sha512 = "sEb3XFPx3jNnCAMtqrXPDeSgQr+jojtCeNf8cvMNMh1cG970+lljssvQDzPq6lmmJu2Vhqood/gtEomBiHOGnA==";
+      };
+    };
+    "csstype-2.6.9" = {
+      name = "csstype";
+      packageName = "csstype";
+      version = "2.6.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/csstype/-/csstype-2.6.9.tgz";
+        sha512 = "xz39Sb4+OaTsULgUERcCk+TJj8ylkL4aSVDQiX/ksxbELSqwkgt4d4RD7fovIdgJGSuNYqwZEiVjYY5l0ask+Q==";
+      };
+    };
     "csurf-1.11.0" = {
       name = "csurf";
       packageName = "csurf";
@@ -12938,13 +12884,13 @@ let
         sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==";
       };
     };
-    "dayjs-1.8.22" = {
+    "dayjs-1.8.23" = {
       name = "dayjs";
       packageName = "dayjs";
-      version = "1.8.22";
+      version = "1.8.23";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.22.tgz";
-        sha512 = "N8IXfxBD62Y9cKTuuuSoOlCXRnnzaTj1vu91r855iq6FbY5cZqOZnW/95nUn6kJiR+W9PHHrLykEoQOe6fUKxQ==";
+        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.23.tgz";
+        sha512 = "NmYHMFONftoZbeOhVz6jfiXI4zSiPN6NoVWJgC0aZQfYVwzy/ZpESPHuCcI0B8BUMpSJQ08zenHDbofOLKq8hQ==";
       };
     };
     "de-indent-1.0.2" = {
@@ -13163,6 +13109,15 @@ let
         sha1 = "eb3913333458775cb84cd1a1fae062106bb87545";
       };
     };
+    "decomment-0.9.2" = {
+      name = "decomment";
+      packageName = "decomment";
+      version = "0.9.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decomment/-/decomment-0.9.2.tgz";
+        sha512 = "sblyUmOJZxiL7oJ2ogJS6jtl/67+CTOW87SrYE/96u3PhDYikYoLCdLzcnceToiQejOLlqNnLCkaxx/+nE/ehg==";
+      };
+    };
     "decompress-4.2.0" = {
       name = "decompress";
       packageName = "decompress";
@@ -13559,6 +13514,24 @@ let
         sha512 = "QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==";
       };
     };
+    "del-5.1.0" = {
+      name = "del";
+      packageName = "del";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/del/-/del-5.1.0.tgz";
+        sha512 = "wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==";
+      };
+    };
+    "del-cli-3.0.0" = {
+      name = "del-cli";
+      packageName = "del-cli";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/del-cli/-/del-cli-3.0.0.tgz";
+        sha512 = "J4HDC2mpcN5aopya4VdkyiFXZaqAoo7ua9VpKbciX3DDUSbtJbPMc3ivggJsAAgS6EqonmbenIiMhBGtJPW9FA==";
+      };
+    };
     "delay-4.3.0" = {
       name = "delay";
       packageName = "delay";
@@ -13649,6 +13622,15 @@ let
         sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==";
       };
     };
+    "dependency-tree-7.2.1" = {
+      name = "dependency-tree";
+      packageName = "dependency-tree";
+      version = "7.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dependency-tree/-/dependency-tree-7.2.1.tgz";
+        sha512 = "nBxnjkqDW4LqAzBazy60V4lE0mAtIQ+oers/GIIvVvGYVdCD9+RNNd4G9jjstyz7ZFVg/j/OiYCvK5MjoVqA2w==";
+      };
+    };
     "deprecated-0.0.1" = {
       name = "deprecated";
       packageName = "deprecated";
@@ -13802,6 +13784,87 @@ let
         sha512 = "6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==";
       };
     };
+    "detective-amd-3.0.0" = {
+      name = "detective-amd";
+      packageName = "detective-amd";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detective-amd/-/detective-amd-3.0.0.tgz";
+        sha512 = "kOpKHyabdSKF9kj7PqYHLeHPw+TJT8q2u48tZYMkIcas28el1CYeLEJ42Nm+563/Fq060T5WknfwDhdX9+kkBQ==";
+      };
+    };
+    "detective-cjs-3.1.1" = {
+      name = "detective-cjs";
+      packageName = "detective-cjs";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detective-cjs/-/detective-cjs-3.1.1.tgz";
+        sha512 = "JQtNTBgFY6h8uT6pgph5QpV3IyxDv+z3qPk/FZRDT9TlFfm5dnRtpH39WtQEr1khqsUxVqXzKjZHpdoQvQbllg==";
+      };
+    };
+    "detective-es6-2.1.0" = {
+      name = "detective-es6";
+      packageName = "detective-es6";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detective-es6/-/detective-es6-2.1.0.tgz";
+        sha512 = "QSHqKGOp/YBIfmIqKXaXeq2rlL+bp3bcIQMfZ+0PvKzRlELSOSZxKRvpxVcxlLuocQv4QnOfuWGniGrmPbz8MQ==";
+      };
+    };
+    "detective-less-1.0.2" = {
+      name = "detective-less";
+      packageName = "detective-less";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detective-less/-/detective-less-1.0.2.tgz";
+        sha512 = "Rps1xDkEEBSq3kLdsdnHZL1x2S4NGDcbrjmd4q+PykK5aJwDdP5MBgrJw1Xo+kyUHuv3JEzPqxr+Dj9ryeDRTA==";
+      };
+    };
+    "detective-postcss-3.0.1" = {
+      name = "detective-postcss";
+      packageName = "detective-postcss";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detective-postcss/-/detective-postcss-3.0.1.tgz";
+        sha512 = "tfTS2GdpUal5NY0aCqI4dpEy8Xfr88AehYKB0iBIZvo8y2g3UsrcDnrp9PR2FbzoW7xD5Rip3NJW7eCSvtqdUw==";
+      };
+    };
+    "detective-sass-3.0.1" = {
+      name = "detective-sass";
+      packageName = "detective-sass";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detective-sass/-/detective-sass-3.0.1.tgz";
+        sha512 = "oSbrBozRjJ+QFF4WJFbjPQKeakoaY1GiR380NPqwdbWYd5wfl5cLWv0l6LsJVqrgWfFN1bjFqSeo32Nxza8Lbw==";
+      };
+    };
+    "detective-scss-2.0.1" = {
+      name = "detective-scss";
+      packageName = "detective-scss";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detective-scss/-/detective-scss-2.0.1.tgz";
+        sha512 = "VveyXW4WQE04s05KlJ8K0bG34jtHQVgTc9InspqoQxvnelj/rdgSAy7i2DXAazyQNFKlWSWbS+Ro2DWKFOKTPQ==";
+      };
+    };
+    "detective-stylus-1.0.0" = {
+      name = "detective-stylus";
+      packageName = "detective-stylus";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detective-stylus/-/detective-stylus-1.0.0.tgz";
+        sha1 = "50aee7db8babb990381f010c63fabba5b58e54cd";
+      };
+    };
+    "detective-typescript-5.7.0" = {
+      name = "detective-typescript";
+      packageName = "detective-typescript";
+      version = "5.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detective-typescript/-/detective-typescript-5.7.0.tgz";
+        sha512 = "4SQeACXWAjIOsd2kJykPL8gWC9nVA+z8w7KtAdtd/7BCpDfrpI2ZA7pdhsmHv/zxf3ofeqpYi72vCkZ65bAjtA==";
+      };
+    };
     "dezalgo-1.0.3" = {
       name = "dezalgo";
       packageName = "dezalgo";
@@ -14000,13 +14063,13 @@ let
         sha1 = "e38331f0844bba49b9a9cb71c771585aab1bc65a";
       };
     };
-    "discord.js-11.6.2" = {
+    "discord.js-11.6.3" = {
       name = "discord.js";
       packageName = "discord.js";
-      version = "11.6.2";
+      version = "11.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/discord.js/-/discord.js-11.6.2.tgz";
-        sha512 = "QwN7RBb705qqvxletW41aw8ScZJh4LUVWtGNdLA1/N4od1pf8pueDWdnKLqw9pAud6cg9AADcCkm8os1YHWESg==";
+        url = "https://registry.npmjs.org/discord.js/-/discord.js-11.6.3.tgz";
+        sha512 = "dwIzHB5GPU9O/WiNw42d0yco0JED5bOjCPiHwU9VSSCkEhnyOdx5iqt7Dl2PQZAMNzWPI/t9oyCziOuzFlwm3Q==";
       };
     };
     "discovery-channel-5.5.1" = {
@@ -14054,6 +14117,15 @@ let
         sha1 = "d9980493ae33beec36f4fec6f171ff218130cc12";
       };
     };
+    "dl-tar-0.8.1" = {
+      name = "dl-tar";
+      packageName = "dl-tar";
+      version = "0.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dl-tar/-/dl-tar-0.8.1.tgz";
+        sha512 = "1EdwnDJmqStX85PuVhcrqdeB3b7k4pn3WhMjPEL1lHuPEf0Mf8Cqdo76hgUPX60QWtCbPPTrDl8JFGrPMc1grw==";
+      };
+    };
     "dlnacasts-0.1.0" = {
       name = "dlnacasts";
       packageName = "dlnacasts";
@@ -14549,6 +14621,33 @@ let
         sha512 = "yXcCvhkPKmq5M2cQXss6Qbig+LZnzRIT40XCYm/QCRnJaPG867StB1qnsBLxOGrPH1YEIRWW2gJq7LLMyw+NmA==";
       };
     };
+    "download-or-build-purescript-0.3.4" = {
+      name = "download-or-build-purescript";
+      packageName = "download-or-build-purescript";
+      version = "0.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/download-or-build-purescript/-/download-or-build-purescript-0.3.4.tgz";
+        sha512 = "8P4vNgbLTZi07s3uRnUCI+kE7lAERyIexVYwAHsAw7AQhooFnVbypq/yiP1vSZVibQ4Fl74LdOWnJKbqe9Mnow==";
+      };
+    };
+    "download-purescript-0.8.5" = {
+      name = "download-purescript";
+      packageName = "download-purescript";
+      version = "0.8.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/download-purescript/-/download-purescript-0.8.5.tgz";
+        sha512 = "m2avp1YMDTxZW3mtlG7U09bmgCrLbBIsuBEglywew0uoG7VHVdtOwlTXEdvQQTqpW9iylrz8PokfPlqzc6AYiA==";
+      };
+    };
+    "download-purescript-source-0.6.5" = {
+      name = "download-purescript-source";
+      packageName = "download-purescript-source";
+      version = "0.6.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/download-purescript-source/-/download-purescript-source-0.6.5.tgz";
+        sha512 = "RyOSTL7B3qzrhCOfhgzxNrcZD1klFOAJcw2YG345AIB4su1KC4WSk6fzRz3xpg1tp/plr5v8aDlvZy+LDtf6uA==";
+      };
+    };
     "draftlog-1.0.12" = {
       name = "draftlog";
       packageName = "draftlog";
@@ -14810,13 +14909,13 @@ let
         sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==";
       };
     };
-    "electron-to-chromium-1.3.376" = {
+    "electron-to-chromium-1.3.383" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.376";
+      version = "1.3.383";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.376.tgz";
-        sha512 = "cv/PYVz5szeMz192ngilmezyPNFkUjuynuL2vNdiqIrio440nfTDdc0JJU0TS2KHLSVCs9gBbt4CFqM+HcBnjw==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.383.tgz";
+        sha512 = "EHYVJl6Ox1kFy/SzGVbijHu8ksQotJnqHCFFfaVhXiC+erOSplwhCtOTSocu1jRwirlNsSn/aZ9Kf84Z6s5qrg==";
       };
     };
     "elegant-spinner-1.0.1" = {
@@ -15324,13 +15423,13 @@ let
         sha512 = "rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A==";
       };
     };
-    "es-abstract-1.17.4" = {
+    "es-abstract-1.17.5" = {
       name = "es-abstract";
       packageName = "es-abstract";
-      version = "1.17.4";
+      version = "1.17.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz";
-        sha512 = "Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz";
+        sha512 = "BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==";
       };
     };
     "es-get-iterator-1.1.0" = {
@@ -15459,6 +15558,15 @@ let
         sha512 = "eO6vFm0JvqGzjWIQA6QVKjxpmELfhWbDUWHm1rPfIbn55mhKPiAa5xpLmQWJrNa629ZIeQ8ZvMAi13kvrjK6Mg==";
       };
     };
+    "es6-promisify-6.1.0" = {
+      name = "es6-promisify";
+      packageName = "es6-promisify";
+      version = "6.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.1.0.tgz";
+        sha512 = "jCsk2fpfEFusVv1MDkF4Uf0hAzIKNDMgR6LyOIw6a3jwkN1sCgWzuwgnsHY9YSQ8n8P31HoncvE0LC44cpWTrw==";
+      };
+    };
     "es6-set-0.1.5" = {
       name = "es6-set";
       packageName = "es6-set";
@@ -15666,15 +15774,6 @@ let
         sha1 = "7d02878c8e9bf7916b88836d5ac122b42f151932";
       };
     };
-    "eslint-plugin-vue-5.2.3" = {
-      name = "eslint-plugin-vue";
-      packageName = "eslint-plugin-vue";
-      version = "5.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-5.2.3.tgz";
-        sha512 = "mGwMqbbJf0+VvpGR5Lllq0PMxvTdrZ/ZPjmhkacrCHbubJeJOt+T6E3HUzAifa2Mxi7RSdJfC9HFpOeSYVMMIw==";
-      };
-    };
     "eslint-plugin-vue-6.2.2" = {
       name = "eslint-plugin-vue";
       packageName = "eslint-plugin-vue";
@@ -15765,15 +15864,6 @@ let
         sha512 = "yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==";
       };
     };
-    "espree-4.1.0" = {
-      name = "espree";
-      packageName = "espree";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/espree/-/espree-4.1.0.tgz";
-        sha512 = "I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w==";
-      };
-    };
     "espree-5.0.1" = {
       name = "espree";
       packageName = "espree";
@@ -15846,13 +15936,13 @@ let
         sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0";
       };
     };
-    "esquery-1.1.0" = {
+    "esquery-1.2.0" = {
       name = "esquery";
       packageName = "esquery";
-      version = "1.1.0";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/esquery/-/esquery-1.1.0.tgz";
-        sha512 = "MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q==";
+        url = "https://registry.npmjs.org/esquery/-/esquery-1.2.0.tgz";
+        sha512 = "weltsSqdeWIX9G2qQZz7KlTRJdkkOCTPgLYJUz1Hacf48R4YOwGPHO3+ORfWedqJKbq5WQmsgK90n+pFLIKt/Q==";
       };
     };
     "esrecurse-4.2.1" = {
@@ -15918,6 +16008,15 @@ let
         sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==";
       };
     };
+    "estraverse-5.0.0" = {
+      name = "estraverse";
+      packageName = "estraverse";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/estraverse/-/estraverse-5.0.0.tgz";
+        sha512 = "j3acdrMzqrxmJTNj5dbr1YbjacrYgAxVMeF0gK16E3j494mOe7xygM/ZLIguEQ0ETwAg2hlJCtHRGav+y0Ny5A==";
+      };
+    };
     "estree-walker-0.6.1" = {
       name = "estree-walker";
       packageName = "estree-walker";
@@ -16296,6 +16395,15 @@ let
         sha512 = "8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==";
       };
     };
+    "executing-npm-path-1.0.0" = {
+      name = "executing-npm-path";
+      packageName = "executing-npm-path";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/executing-npm-path/-/executing-npm-path-1.0.0.tgz";
+        sha512 = "d/dZlFCLkKm8nwdzpfQ7JBL2BISg4Fu0bVpZ5nacuT3e6DIxYVb+8tx0eQ+jxquvV/8I+VjJ9g6aEAqjukogkw==";
+      };
+    };
     "exit-0.1.2" = {
       name = "exit";
       packageName = "exit";
@@ -16980,6 +17088,15 @@ let
         sha512 = "lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==";
       };
     };
+    "feint-1.0.3" = {
+      name = "feint";
+      packageName = "feint";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/feint/-/feint-1.0.3.tgz";
+        sha512 = "BY1jwDlOx4uA9rtn2H9bZSuHT7yyOtSRDVwUwprRpRXvpm1F73gSGuHznEu50lT6epscULOknphOprG9ljoARg==";
+      };
+    };
     "fields-0.1.24" = {
       name = "fields";
       packageName = "fields";
@@ -16998,13 +17115,13 @@ let
         sha1 = "bf42d87c0ad07b00d0949d12388f6289606ece34";
       };
     };
-    "figgy-pudding-3.5.1" = {
+    "figgy-pudding-3.5.2" = {
       name = "figgy-pudding";
       packageName = "figgy-pudding";
-      version = "3.5.1";
+      version = "3.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz";
-        sha512 = "vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==";
+        url = "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz";
+        sha512 = "0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==";
       };
     };
     "figures-1.7.0" = {
@@ -17052,6 +17169,24 @@ let
         sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==";
       };
     };
+    "file-exists-dazinatorfork-1.0.2" = {
+      name = "file-exists-dazinatorfork";
+      packageName = "file-exists-dazinatorfork";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/file-exists-dazinatorfork/-/file-exists-dazinatorfork-1.0.2.tgz";
+        sha512 = "r70c72ln2YHzQINNfxDp02hAhbGkt1HffZ+Du8oetWDLjDtFja/Lm10lUaSh9e+wD+7VDvPee0b0C9SAy8pWZg==";
+      };
+    };
+    "file-to-npm-cache-0.1.0" = {
+      name = "file-to-npm-cache";
+      packageName = "file-to-npm-cache";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/file-to-npm-cache/-/file-to-npm-cache-0.1.0.tgz";
+        sha512 = "2/aq3BD1pkd6b4pafmTaO8EzRCiQKfFmJxg+zKAdDMAcqqJMC0nQYcuCU29say0ZTzXxafKXcJB50N+yb0WIoQ==";
+      };
+    };
     "file-type-10.11.0" = {
       name = "file-type";
       packageName = "file-type";
@@ -17178,6 +17313,15 @@ let
         sha512 = "7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==";
       };
     };
+    "filesize-4.2.1" = {
+      name = "filesize";
+      packageName = "filesize";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/filesize/-/filesize-4.2.1.tgz";
+        sha512 = "bP82Hi8VRZX/TUBKfE24iiUGsB/sfm2WUrwTQyAzQrhO3V9IhcBBNBXMyzLY5orACxRyYJ3d2HeRVX+eFv4lmA==";
+      };
+    };
     "filestream-5.0.0" = {
       name = "filestream";
       packageName = "filestream";
@@ -17187,6 +17331,15 @@ let
         sha512 = "5H3RqSaJp12THfZiNWodYM7TiKfQvrpX+EIOrB1XvCceTys4yvfEIl8wDp+/yI8qj6Bxym8m0NYWwVXDAet/+A==";
       };
     };
+    "filing-cabinet-2.5.1" = {
+      name = "filing-cabinet";
+      packageName = "filing-cabinet";
+      version = "2.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/filing-cabinet/-/filing-cabinet-2.5.1.tgz";
+        sha512 = "GWOdObzou2L0HrJUk8MpJa01q0ZOwuTwTssM2+P+ABJWEGlVWd6ueEatANFdin94/3rdkVSdqpH14VqCNqp3RA==";
+      };
+    };
     "fill-range-2.2.4" = {
       name = "fill-range";
       packageName = "fill-range";
@@ -17250,6 +17403,15 @@ let
         sha1 = "4b73f1ff9e56ad91b76e716407fe5ffe6554bb8c";
       };
     };
+    "find-0.3.0" = {
+      name = "find";
+      packageName = "find";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find/-/find-0.3.0.tgz";
+        sha512 = "iSd+O4OEYV/I36Zl8MdYJO0xD82wH528SaCieTVHhclgiYNe9y+yPKSwK+A7/WsmHL1EZ+pYUJBXWTL5qofksw==";
+      };
+    };
     "find-cache-dir-2.1.0" = {
       name = "find-cache-dir";
       packageName = "find-cache-dir";
@@ -17268,6 +17430,24 @@ let
         sha1 = "675d358b2ca3892d795a1ab47232f8b6e2e0dde4";
       };
     };
+    "find-pkg-dir-1.0.1" = {
+      name = "find-pkg-dir";
+      packageName = "find-pkg-dir";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-pkg-dir/-/find-pkg-dir-1.0.1.tgz";
+        sha512 = "pIXIrZshXst3hpg5nXDYALHlN4ikh4IwoM0QRnMnYIALChamvpPCJS1Mpwp27GpXXTL/647LDS4JkH1yfAKctw==";
+      };
+    };
+    "find-process-1.4.3" = {
+      name = "find-process";
+      packageName = "find-process";
+      version = "1.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-process/-/find-process-1.4.3.tgz";
+        sha512 = "+IA+AUsQCf3uucawyTwMWcY+2M3FXq3BRvw3S+j5Jvydjk31f/+NPWpYZOJs+JUs2GvxH4Yfr6Wham0ZtRLlPA==";
+      };
+    };
     "find-requires-1.0.0" = {
       name = "find-requires";
       packageName = "find-requires";
@@ -17529,6 +17709,15 @@ let
         sha1 = "554440766da0a0d603999f433453f6c2fc6a75c1";
       };
     };
+    "flatten-1.0.3" = {
+      name = "flatten";
+      packageName = "flatten";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz";
+        sha512 = "dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==";
+      };
+    };
     "flow-bin-0.118.0" = {
       name = "flow-bin";
       packageName = "flow-bin";
@@ -17538,13 +17727,13 @@ let
         sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg==";
       };
     };
-    "flow-parser-0.120.1" = {
+    "flow-parser-0.121.0" = {
       name = "flow-parser";
       packageName = "flow-parser";
-      version = "0.120.1";
+      version = "0.121.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.120.1.tgz";
-        sha512 = "t5y9QoOegJuY+LCIjh0p6SGF7ItsxG5ycQApTSqWloutUZQ2gC0f6wMu91dab0/SSj2vH41bu5pDTLuvtP49ng==";
+        url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.121.0.tgz";
+        sha512 = "1gIBiWJNR0tKUNv8gZuk7l9rVX06OuLzY9AoGio7y/JT4V1IZErEMEq2TJS+PFcw/y0RshZ1J/27VfK1UQzYVg==";
       };
     };
     "fluent-ffmpeg-2.1.2" = {
@@ -18141,6 +18330,15 @@ let
         sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==";
       };
     };
+    "fs-extra-9.0.0" = {
+      name = "fs-extra";
+      packageName = "fs-extra";
+      version = "9.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz";
+        sha512 = "pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==";
+      };
+    };
     "fs-minipass-1.2.7" = {
       name = "fs-minipass";
       packageName = "fs-minipass";
@@ -18213,13 +18411,13 @@ let
         sha512 = "fwfd9MBI/fnXtR/ClVTyeuPXJ+oI5WNyXvBQPmc4btgqLYTKOuBRTRUVjmVpDUri0C88HLwMlc5ESg48fEAGjw==";
       };
     };
-    "fsevents-1.2.11" = {
+    "fsevents-1.2.12" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "1.2.11";
+      version = "1.2.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz";
-        sha512 = "+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.12.tgz";
+        sha512 = "Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q==";
       };
     };
     "fsevents-2.1.2" = {
@@ -18447,6 +18645,15 @@ let
         sha512 = "r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==";
       };
     };
+    "get-amd-module-type-3.0.0" = {
+      name = "get-amd-module-type";
+      packageName = "get-amd-module-type";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-amd-module-type/-/get-amd-module-type-3.0.0.tgz";
+        sha512 = "99Q7COuACPfVt18zH9N4VAMyb81S6TUgJm2NgV6ERtkh9VIkAaByZkW530wl3lLN5KTtSrK9jVLxYsoP5hQKsw==";
+      };
+    };
     "get-assigned-identifiers-1.2.0" = {
       name = "get-assigned-identifiers";
       packageName = "get-assigned-identifiers";
@@ -18492,6 +18699,15 @@ let
         sha1 = "ead774abee72e20409433a066366023dd6887a41";
       };
     };
+    "get-own-enumerable-property-symbols-3.0.2" = {
+      name = "get-own-enumerable-property-symbols";
+      packageName = "get-own-enumerable-property-symbols";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz";
+        sha512 = "I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==";
+      };
+    };
     "get-pkg-repo-1.4.0" = {
       name = "get-pkg-repo";
       packageName = "get-pkg-repo";
@@ -18942,13 +19158,13 @@ let
         sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
       };
     };
-    "glob-parent-5.1.0" = {
+    "glob-parent-5.1.1" = {
       name = "glob-parent";
       packageName = "glob-parent";
-      version = "5.1.0";
+      version = "5.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz";
-        sha512 = "qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==";
+        url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz";
+        sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==";
       };
     };
     "glob-stream-3.1.18" = {
@@ -20194,13 +20410,13 @@ let
         sha512 = "ghHup2voGfgFoHMGnaLHOjbYFACKrRh9KFttdCzMCbFoBMJXiNi2+XTrPP8+q6cDJM/RSqlCfVWrjp1H201rZg==";
       };
     };
-    "hast-util-is-body-ok-link-1.0.2" = {
+    "hast-util-is-body-ok-link-1.0.3" = {
       name = "hast-util-is-body-ok-link";
       packageName = "hast-util-is-body-ok-link";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hast-util-is-body-ok-link/-/hast-util-is-body-ok-link-1.0.2.tgz";
-        sha512 = "eSxO9rgtb7dfKxNa8NAFS3VEYWHXnJWVsoH/Z4jSsq1J2i4H1GkdJ43kXv++xuambrtI5XQwcAx6jeZVMjoBMQ==";
+        url = "https://registry.npmjs.org/hast-util-is-body-ok-link/-/hast-util-is-body-ok-link-1.0.3.tgz";
+        sha512 = "NB8jW4iqT+iVld2oCjSk0T2S2FyR86rDZ7nKHx3WNf/WX16fjjdfoog6T+YeJFsPzszVKsNlVJL+k5c4asAHog==";
       };
     };
     "hast-util-is-element-1.0.4" = {
@@ -20221,13 +20437,13 @@ let
         sha512 = "gW3sxfynIvZApL4L07wryYF4+C9VvH3AUi7LAnVXV4MneGEgwOByXvFo18BgmTWnm7oHAe874jKbIB1YhHSIzA==";
       };
     };
-    "hast-util-to-string-1.0.2" = {
+    "hast-util-to-string-1.0.3" = {
       name = "hast-util-to-string";
       packageName = "hast-util-to-string";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hast-util-to-string/-/hast-util-to-string-1.0.2.tgz";
-        sha512 = "fQNr0n5KJmZW1TmBfXbc4DO0ucZmseUw3T6K4PDsUUTMtTGGLZMUYRB8mOKgPgtw7rtICdxxpRQZmWwo8KxlOA==";
+        url = "https://registry.npmjs.org/hast-util-to-string/-/hast-util-to-string-1.0.3.tgz";
+        sha512 = "3lDgDE5OdpTfP3aFeKRWEwdIZ4vprztvp+AoD+RhF7uGOBs1yBDWZFadxnjcUV4KCoI3vB9A7gdFO98hEXA90w==";
       };
     };
     "hast-util-whitespace-1.0.4" = {
@@ -20572,13 +20788,13 @@ let
         sha512 = "uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w==";
       };
     };
-    "html-whitespace-sensitive-tag-names-1.0.1" = {
+    "html-whitespace-sensitive-tag-names-1.0.2" = {
       name = "html-whitespace-sensitive-tag-names";
       packageName = "html-whitespace-sensitive-tag-names";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/html-whitespace-sensitive-tag-names/-/html-whitespace-sensitive-tag-names-1.0.1.tgz";
-        sha512 = "TMdAWVry7Ld0k2sLqpHkWsFAHmU+VZZq/nR4bfwfxThD8q3ibhrpRTywyQkEiunYiZXmJ6gRcJiLbZm+jbQPgQ==";
+        url = "https://registry.npmjs.org/html-whitespace-sensitive-tag-names/-/html-whitespace-sensitive-tag-names-1.0.2.tgz";
+        sha512 = "9jCcAq9ZsjUkZjNFDvxalDPhktOijpfzLyzBcqMLOFSbtcDNrPlKDvZeH7KdEbP7C6OjPpIdDMMPm0oq2Dpk0A==";
       };
     };
     "htmlescape-1.1.1" = {
@@ -21293,6 +21509,15 @@ let
         sha512 = "b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==";
       };
     };
+    "import-package-1.0.0" = {
+      name = "import-package";
+      packageName = "import-package";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/import-package/-/import-package-1.0.0.tgz";
+        sha512 = "EEDT2ucOWI/9z/h2mLTRkkusM30/pxSoBT6YvomYpEb/UGll6wOvdFagYraCSBHD+dZSKoVFNYCAgC3V7Nvf1Q==";
+      };
+    };
     "imurmurhash-0.1.4" = {
       name = "imurmurhash";
       packageName = "imurmurhash";
@@ -21302,13 +21527,13 @@ let
         sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea";
       };
     };
-    "in-publish-2.0.0" = {
+    "in-publish-2.0.1" = {
       name = "in-publish";
       packageName = "in-publish";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz";
-        sha1 = "e20ff5e3a2afc2690320b6dc552682a9c7fadf51";
+        url = "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz";
+        sha512 = "oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==";
       };
     };
     "increment-buffer-1.0.1" = {
@@ -21698,6 +21923,24 @@ let
         sha512 = "MAQUJuIo7Xqk8EVNP+6d3CKq9c80hi4tjIbIAT6lmGW9W6WzlHiu9PS8uSuUYU+Do+j1baiFp3H25XEVxDIG2g==";
       };
     };
+    "install-purescript-0.7.0" = {
+      name = "install-purescript";
+      packageName = "install-purescript";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/install-purescript/-/install-purescript-0.7.0.tgz";
+        sha512 = "AOmIq8rPEOLn5Bo8RQngvDXWeo6USKIt+28UhcAmQJNvj63MqdNBIQRTgNyypbsniv7d7VWjz53pw2+kTgh3mg==";
+      };
+    };
+    "install-purescript-cli-0.4.2" = {
+      name = "install-purescript-cli";
+      packageName = "install-purescript-cli";
+      version = "0.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/install-purescript-cli/-/install-purescript-cli-0.4.2.tgz";
+        sha512 = "y62GvwsMksz7aSJQsK2pPelmBByp0eDgpI+uFheEU05wpekM6WtCgq7WkTAc+Ar/nt+7Y5lYzGOqSOWnGAEIBQ==";
+      };
+    };
     "int53-1.0.0" = {
       name = "int53";
       packageName = "int53";
@@ -22877,6 +23120,15 @@ let
         sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==";
       };
     };
+    "is-relative-path-1.0.2" = {
+      name = "is-relative-path";
+      packageName = "is-relative-path";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-relative-path/-/is-relative-path-1.0.2.tgz";
+        sha1 = "091b46a0d67c1ed0fe85f1f8cfdde006bb251d46";
+      };
+    };
     "is-relative-url-3.0.0" = {
       name = "is-relative-url";
       packageName = "is-relative-url";
@@ -23228,13 +23480,13 @@ let
         sha512 = "8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==";
       };
     };
-    "isbinaryfile-4.0.4" = {
+    "isbinaryfile-4.0.5" = {
       name = "isbinaryfile";
       packageName = "isbinaryfile";
-      version = "4.0.4";
+      version = "4.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.4.tgz";
-        sha512 = "pEutbN134CzcjlLS1myKX/uxNjwU5eBVSprvkpv3+3dqhBHUZLIWJQowC40w5c0Zf19vBY8mrZl88y5J4RAPbQ==";
+        url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.5.tgz";
+        sha512 = "Jvz0gpTh1AILHMCBUyqq7xv1ZOQrxTDwyp1/QUq1xFpOBvp4AH5uEobPePJht8KnBGqQIH7We6OR73mXsjG0cA==";
       };
     };
     "isemail-3.2.0" = {
@@ -23552,13 +23804,13 @@ let
         sha1 = "06d4912255093419477d425633606e0e90782967";
       };
     };
-    "joplin-turndown-4.0.23" = {
+    "joplin-turndown-4.0.24" = {
       name = "joplin-turndown";
       packageName = "joplin-turndown";
-      version = "4.0.23";
+      version = "4.0.24";
       src = fetchurl {
-        url = "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.23.tgz";
-        sha512 = "Dh93R7G/S/KRbOu4/+FIxoUcUDcoUL4QDsqGhperOi/cUxUeg8fngrmEzdP8kEpQzqm5+8jkq9Cc1w6695owpQ==";
+        url = "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.24.tgz";
+        sha512 = "mKd2rAFzJKnhTVjEpHomG+T01//uz5rXVSAOYRh3/JKXpY7QUhVp8jCmFfO+kaadrLABTz04mvTmyyoOadxdTA==";
       };
     };
     "joplin-turndown-plugin-gfm-1.0.12" = {
@@ -23606,13 +23858,13 @@ let
         sha1 = "d6be2e4c377494e2378b1cae2920a91d1182d8c4";
       };
     };
-    "jquery.terminal-2.15.0" = {
+    "jquery.terminal-2.15.2" = {
       name = "jquery.terminal";
       packageName = "jquery.terminal";
-      version = "2.15.0";
+      version = "2.15.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.15.0.tgz";
-        sha512 = "Dp8ahqK1lcphpmx9veb+S/ZxEt5mk4rHcVTbslCgngIiqH4LX7VtnSIQ2Lm5O0y/lp4eMPaNSTgPniCziF6ACQ==";
+        url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.15.2.tgz";
+        sha512 = "/G5L/laZLLO0tEQ+a94mLnvDXB5+PbC9IuZB+ikbw4E7W3GQkRpa0I15Z3xA+WbOaVZj+hEtPcKyyQLcKdjULQ==";
       };
     };
     "js-base64-2.5.2" = {
@@ -23777,6 +24029,15 @@ let
         sha512 = "O901mfJSuTdwU2w3Sn+74T+RnDVP+FuV5fH8tcPWyqrseRAb0s5xOtPgCFiPOtLcyK7CLIJwPyD83ZqQWvA5ng==";
       };
     };
+    "jsdom-15.2.1" = {
+      name = "jsdom";
+      packageName = "jsdom";
+      version = "15.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsdom/-/jsdom-15.2.1.tgz";
+        sha512 = "fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g==";
+      };
+    };
     "jsdom-7.2.2" = {
       name = "jsdom";
       packageName = "jsdom";
@@ -24056,13 +24317,13 @@ let
         sha512 = "8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==";
       };
     };
-    "json5-2.1.1" = {
+    "json5-2.1.2" = {
       name = "json5";
       packageName = "json5";
-      version = "2.1.1";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz";
-        sha512 = "l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==";
+        url = "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz";
+        sha512 = "MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==";
       };
     };
     "jsonata-1.8.1" = {
@@ -24128,6 +24389,15 @@ let
         sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb";
       };
     };
+    "jsonfile-6.0.1" = {
+      name = "jsonfile";
+      packageName = "jsonfile";
+      version = "6.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz";
+        sha512 = "jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==";
+      };
+    };
     "jsonify-0.0.0" = {
       name = "jsonify";
       packageName = "jsonify";
@@ -25264,6 +25534,15 @@ let
         sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==";
       };
     };
+    "load-from-cwd-or-npm-3.0.4" = {
+      name = "load-from-cwd-or-npm";
+      packageName = "load-from-cwd-or-npm";
+      version = "3.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/load-from-cwd-or-npm/-/load-from-cwd-or-npm-3.0.4.tgz";
+        sha512 = "tdDJgh1zVmxOV24gcj+AEagjTc30Jim9ywX2OxfABdOoTU4UK8b0B371ZNbpj27njP8LQ6U5FH1aNwC2+VRxQg==";
+      };
+    };
     "load-ip-set-2.1.0" = {
       name = "load-ip-set";
       packageName = "load-ip-set";
@@ -25318,6 +25597,15 @@ let
         sha512 = "dYB1lbwqHgPTrruy9glukCu8Ya9vzj6TMfouCtj2H/GuJ+8syioisgKTBPxnCi6m8K8jINKfTOxOHngFkUYqHw==";
       };
     };
+    "load-request-from-cwd-or-npm-3.0.0" = {
+      name = "load-request-from-cwd-or-npm";
+      packageName = "load-request-from-cwd-or-npm";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/load-request-from-cwd-or-npm/-/load-request-from-cwd-or-npm-3.0.0.tgz";
+        sha512 = "UsYAoXQV3UeL75Rl5IppBGOcKK5iKpvWooUPUHdxcQg9IKIkfg6PWpBQ4EhoRxTioIqrz587Ur2+c2uB/KGpng==";
+      };
+    };
     "loader-runner-2.4.0" = {
       name = "loader-runner";
       packageName = "loader-runner";
@@ -27091,15 +27379,6 @@ let
         sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c";
       };
     };
-    "mamacro-0.0.3" = {
-      name = "mamacro";
-      packageName = "mamacro";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz";
-        sha512 = "qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==";
-      };
-    };
     "map-age-cleaner-0.1.3" = {
       name = "map-age-cleaner";
       packageName = "map-age-cleaner";
@@ -27604,6 +27883,15 @@ let
         sha512 = "iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==";
       };
     };
+    "mdn-data-2.0.6" = {
+      name = "mdn-data";
+      packageName = "mdn-data";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz";
+        sha512 = "rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==";
+      };
+    };
     "mdns-js-0.5.0" = {
       name = "mdns-js";
       packageName = "mdns-js";
@@ -27865,13 +28153,13 @@ let
         sha512 = "CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig==";
       };
     };
-    "meow-6.0.1" = {
+    "meow-6.1.0" = {
       name = "meow";
       packageName = "meow";
-      version = "6.0.1";
+      version = "6.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/meow/-/meow-6.0.1.tgz";
-        sha512 = "kxGTFgT/b7/oSRSQsJ0qsT5IMU+bgZ1eAdSA3kIV7onkW0QWo/hL5RbGlMfvBjHJKPE1LaPX0kdecYFiqYWjUw==";
+        url = "https://registry.npmjs.org/meow/-/meow-6.1.0.tgz";
+        sha512 = "iIAoeI01v6pmSfObAAWFoITAA4GgiT45m4SmJgoxtZfvI0fyZwhV4d0lTwiUXvAKIPlma05Feb2Xngl52Mj5Cg==";
       };
     };
     "merge-1.2.1" = {
@@ -28558,6 +28846,24 @@ let
         sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
       };
     };
+    "mkdirp-0.5.3" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz";
+        sha512 = "P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==";
+      };
+    };
+    "mkdirp-0.5.4" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "0.5.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz";
+        sha512 = "iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==";
+      };
+    };
     "mkdirp-1.0.3" = {
       name = "mkdirp";
       packageName = "mkdirp";
@@ -28621,6 +28927,15 @@ let
         sha512 = "A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q==";
       };
     };
+    "module-definition-3.3.0" = {
+      name = "module-definition";
+      packageName = "module-definition";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/module-definition/-/module-definition-3.3.0.tgz";
+        sha512 = "HTplA9xwDzH67XJFC1YvZMUElWJD28DV0dUq7lhTs+JKJamUOWA/CcYWSlhW5amJO66uWtY7XdltT+LfX0wIVg==";
+      };
+    };
     "module-deps-6.2.2" = {
       name = "module-deps";
       packageName = "module-deps";
@@ -28630,6 +28945,15 @@ let
         sha512 = "a9y6yDv5u5I4A+IPHTnqFxcaKr4p50/zxTjcQJaX2ws9tN/W6J6YXnEKhqRyPhl494dkcxx951onSKVezmI+3w==";
       };
     };
+    "module-lookup-amd-6.2.0" = {
+      name = "module-lookup-amd";
+      packageName = "module-lookup-amd";
+      version = "6.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/module-lookup-amd/-/module-lookup-amd-6.2.0.tgz";
+        sha512 = "uxHCj5Pw9psZiC1znjU2qPsubt6haCSsN9m7xmIdoTciEgfxUkE1vhtDvjHPuOXEZrVJhjKgkmkP+w73rRuelQ==";
+      };
+    };
     "mold-source-map-0.4.0" = {
       name = "mold-source-map";
       packageName = "mold-source-map";
@@ -28702,13 +29026,13 @@ let
         sha512 = "IrhznRheWtDcT/TEL3cqaT4UJOqc5G3K8TnGq29PRXZil+sWGPkcM6SHVUZVirTKFKceuCadfyDMjmRoXCN21A==";
       };
     };
-    "morgan-1.9.1" = {
+    "morgan-1.10.0" = {
       name = "morgan";
       packageName = "morgan";
-      version = "1.9.1";
+      version = "1.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz";
-        sha512 = "HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA==";
+        url = "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz";
+        sha512 = "AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==";
       };
     };
     "mout-0.5.0" = {
@@ -29570,6 +29894,15 @@ let
         sha512 = "+T6UtYItDTE1L30g/nLRjP55dFlvldrzCRsn4CrcNHIbhg5JUe0hnOx1DHFViysUC7I1cevBQVjdGJ9ZftY9DA==";
       };
     };
+    "neat-stack-1.0.1" = {
+      name = "neat-stack";
+      packageName = "neat-stack";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/neat-stack/-/neat-stack-1.0.1.tgz";
+        sha512 = "nl0eft4etsbFowZVP+1lNqZsNKb2SIC+PnAr/ODBln6RNVaJh0YYu8P3j8Iuh4XeIAgyWn3xCSizbTobRjocIA==";
+      };
+    };
     "neat-tasks-1.1.1" = {
       name = "neat-tasks";
       packageName = "neat-tasks";
@@ -30184,6 +30517,15 @@ let
         sha512 = "hwaTaFPUwNKns5qXwGJpLQM3Z5zRluYeAxpYy1L8fWmWdT/DjLmsnW8/oGlSN8Vo4R28c2znfUoBUiB/RlPptw==";
       };
     };
+    "node-source-walk-4.2.0" = {
+      name = "node-source-walk";
+      packageName = "node-source-walk";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-source-walk/-/node-source-walk-4.2.0.tgz";
+        sha512 = "hPs/QMe6zS94f5+jG3kk9E7TNm4P2SulrKiLWMzKszBfNZvL/V6wseHlTd7IvfW0NZWqPtK3+9yYNr+3USGteA==";
+      };
+    };
     "node-ssdp-2.9.1" = {
       name = "node-ssdp";
       packageName = "node-ssdp";
@@ -30472,6 +30814,15 @@ let
         sha512 = "KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==";
       };
     };
+    "npcache-1.0.2" = {
+      name = "npcache";
+      packageName = "npcache";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npcache/-/npcache-1.0.2.tgz";
+        sha512 = "h42LqKZvSbykPoCyAwEKbJAXUpt1SZ7O8GvA0XRqb26VtWQuKLJtp+Rt4jqkq1Y+ZRErINdyeZ3Ijc5lDtqkSg==";
+      };
+    };
     "npm-2.15.12" = {
       name = "npm";
       packageName = "npm";
@@ -30490,6 +30841,51 @@ let
         sha512 = "gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==";
       };
     };
+    "npm-cache-env-2.0.0" = {
+      name = "npm-cache-env";
+      packageName = "npm-cache-env";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-cache-env/-/npm-cache-env-2.0.0.tgz";
+        sha512 = "t5cz/NY4IPmiKBRFry3U3M8Ypwdx4LJ3w7te/49LWB2R4wPf5QAAGB1zNoH9IbGtC/wiOeE8b/HsoG2lLAOYaQ==";
+      };
+    };
+    "npm-cache-path-2.0.0" = {
+      name = "npm-cache-path";
+      packageName = "npm-cache-path";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-cache-path/-/npm-cache-path-2.0.0.tgz";
+        sha512 = "7OJzaenruC1PffVJ7onG0u4aTQLaykT4gF5n61j9fot58J4ppoglkrv+pY4BsFR2drPWb6vbEpJH7/Xviv7h+Q==";
+      };
+    };
+    "npm-cli-dir-3.0.1" = {
+      name = "npm-cli-dir";
+      packageName = "npm-cli-dir";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-cli-dir/-/npm-cli-dir-3.0.1.tgz";
+        sha512 = "t9V9Gz/Q5a5KOSynLpKKnLxJzWLnHtAZvaLmNSbNeNR+qEpCmu/n5J74lyz4QQ/XIGEEYWIoVXR8scqbUWaMrQ==";
+      };
+    };
+    "npm-cli-path-3.1.2" = {
+      name = "npm-cli-path";
+      packageName = "npm-cli-path";
+      version = "3.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-cli-path/-/npm-cli-path-3.1.2.tgz";
+        sha512 = "JdiFz8kpCf9WD01zRx5u29EP5UYjKp9osSVMflPkamlplgsuaagkwqY3JpzDySl/VDpGUva8q8YoSG6AatFkIg==";
+      };
+    };
+    "npm-cli-version-1.0.0" = {
+      name = "npm-cli-version";
+      packageName = "npm-cli-version";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-cli-version/-/npm-cli-version-1.0.0.tgz";
+        sha512 = "VqqnMzMfcZ0UZFDki7ZR8E4U8Pz7VbTOGSMk8KJbQ+oUlJlon8IXhb6BIdMJClRArHn216useYM1kvqgZmDvtQ==";
+      };
+    };
     "npm-conf-1.1.3" = {
       name = "npm-conf";
       packageName = "npm-conf";
@@ -30697,6 +31093,15 @@ let
         sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==";
       };
     };
+    "npm-version-compare-1.0.1" = {
+      name = "npm-version-compare";
+      packageName = "npm-version-compare";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-version-compare/-/npm-version-compare-1.0.1.tgz";
+        sha512 = "X+/Oz2OkF6KzMqyFyNBV5MC1ScPxtl5bJTkUcIp9Bz5Wv2Yf8uqDIq+vu+/gy2DRb11Q2Z6jfHbav7Ux0t99JQ==";
+      };
+    };
     "npm-which-3.0.1" = {
       name = "npm-which";
       packageName = "npm-which";
@@ -31472,6 +31877,15 @@ let
         sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
       };
     };
+    "optional-0.1.4" = {
+      name = "optional";
+      packageName = "optional";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/optional/-/optional-0.1.4.tgz";
+        sha512 = "gtvrrCfkE08wKcgXaVwQVgwEQ8vel2dc5DDBn9RLQZ3YtmtkBss6A2HY6BnJH4N/4Ku97Ri/SF8sNWE2225WJw==";
+      };
+    };
     "optionator-0.3.0" = {
       name = "optionator";
       packageName = "optionator";
@@ -32939,6 +33353,24 @@ let
         sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d";
       };
     };
+    "pause-fn-1.0.0" = {
+      name = "pause-fn";
+      packageName = "pause-fn";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pause-fn/-/pause-fn-1.0.0.tgz";
+        sha512 = "23uUK11+go9zE7ij4Qh45HPvqanTt22viyNsHnWrRFVgcT5TV4MFtfMhx/wL2aMt0LYbqTsJJZgG3V4C57+NQw==";
+      };
+    };
+    "pause-methods-1.0.0" = {
+      name = "pause-methods";
+      packageName = "pause-methods";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pause-methods/-/pause-methods-1.0.0.tgz";
+        sha512 = "RA8T1+kt1wbD8p0y9/x0BuCMBwNRJzp08euseZ7ZSLGeBUSNHh4yLIsq9J+7fCSDAwnHTjQPSzShwoFnBj0QNQ==";
+      };
+    };
     "pause-stream-0.0.11" = {
       name = "pause-stream";
       packageName = "pause-stream";
@@ -33056,13 +33488,13 @@ let
         sha1 = "18de2f97e4bf7a9551ad7511942b5496f7aba660";
       };
     };
-    "picomatch-2.2.1" = {
+    "picomatch-2.2.2" = {
       name = "picomatch";
       packageName = "picomatch";
-      version = "2.2.1";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz";
-        sha512 = "ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==";
+        url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz";
+        sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==";
       };
     };
     "picture-tuber-1.0.2" = {
@@ -33272,6 +33704,15 @@ let
         sha1 = "b5418ef0439de5425fc4995042dced14fb2a84ff";
       };
     };
+    "platform-name-1.0.0" = {
+      name = "platform-name";
+      packageName = "platform-name";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/platform-name/-/platform-name-1.0.0.tgz";
+        sha512 = "ZRbqJ30uRRKGKW2O1XnG/Ls1K/aBGlnyjq1Z0BbjqDPTNN+XZKFaugCsCm3/mq6XGR5DZNVdV75afpQEvNNY3Q==";
+      };
+    };
     "playerui-1.3.0" = {
       name = "playerui";
       packageName = "playerui";
@@ -33957,6 +34398,15 @@ let
         sha512 = "N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==";
       };
     };
+    "postcss-values-parser-1.5.0" = {
+      name = "postcss-values-parser";
+      packageName = "postcss-values-parser";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-1.5.0.tgz";
+        sha512 = "3M3p+2gMp0AH3da530TlX8kiO1nxdTnc3C6vr8dMxRLIlh8UYkz0/wcwptSXjhtx2Fr0TySI7a+BHDQ8NL7LaQ==";
+      };
+    };
     "posthtml-0.11.6" = {
       name = "posthtml";
       packageName = "posthtml";
@@ -34002,6 +34452,15 @@ let
         sha512 = "GV+nsUXuPW2p8Zy7SarF/2W/oiK8bFQgJcncoJ0d7kRpekEA0ftChjfEaF9/Y+QJEc/wFR7RAEa8lYByuUIe2g==";
       };
     };
+    "precinct-6.2.0" = {
+      name = "precinct";
+      packageName = "precinct";
+      version = "6.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/precinct/-/precinct-6.2.0.tgz";
+        sha512 = "BCAmnOxZzobF3H1/h/gq70pEyvX/BVLWCrzi8beFD22dqu5Z14qOghNUsI24Wg8oaTsGFcIjOGtFX5L9ttmjVg==";
+      };
+    };
     "precond-0.2.3" = {
       name = "precond";
       packageName = "precond";
@@ -34416,13 +34875,13 @@ let
         sha1 = "5f8a704ccdf5f2ac23996fcafe2b301bc2a8d0eb";
       };
     };
-    "promisify-child-process-3.1.3" = {
+    "promisify-child-process-3.1.4" = {
       name = "promisify-child-process";
       packageName = "promisify-child-process";
-      version = "3.1.3";
+      version = "3.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/promisify-child-process/-/promisify-child-process-3.1.3.tgz";
-        sha512 = "qVox3vW2hqbktVw+IN7YZ/kgGA+u426ekmiZxiofNe9O4GSewjROwRQ4MQ6IbvhpeYSLqiLS0kMn+FWCz6ENlg==";
+        url = "https://registry.npmjs.org/promisify-child-process/-/promisify-child-process-3.1.4.tgz";
+        sha512 = "tLifJs99E4oOXUz/dKQjRgdchfiepmYQzBVrcVX9BtUWi9aGJeGSf2KgXOWBW1JFsSYgLkl1Z9HRm8i0sf4cTg==";
       };
     };
     "promisize-1.1.2" = {
@@ -34452,13 +34911,13 @@ let
         sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe";
       };
     };
-    "prompts-2.3.1" = {
+    "prompts-2.3.2" = {
       name = "prompts";
       packageName = "prompts";
-      version = "2.3.1";
+      version = "2.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prompts/-/prompts-2.3.1.tgz";
-        sha512 = "qIP2lQyCwYbdzcqHIUi2HAxiWixhoM9OdLCWf8txXsapC/X9YdsCoeyRIXE/GP+Q0J37Q7+XN/MFqbUa7IzXNA==";
+        url = "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz";
+        sha512 = "Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==";
       };
     };
     "promzard-0.3.0" = {
@@ -34488,15 +34947,6 @@ let
         sha1 = "159fb06193d32003f4b3691dd2ec1a634aa80d1d";
       };
     };
-    "proper-lockfile-3.2.0" = {
-      name = "proper-lockfile";
-      packageName = "proper-lockfile";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-3.2.0.tgz";
-        sha512 = "iMghHHXv2bsxl6NchhEaFck8tvX3F9cknEEh1SUpguUOBjN7PAAW9BLzmbc1g/mCD1gY3EE2EABBHPJfFdHFmA==";
-      };
-    };
     "properties-1.2.1" = {
       name = "properties";
       packageName = "properties";
@@ -35415,6 +35865,15 @@ let
         sha512 = "hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA==";
       };
     };
+    "purescript-0.12.5" = {
+      name = "purescript";
+      packageName = "purescript";
+      version = "0.12.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/purescript/-/purescript-0.12.5.tgz";
+        sha512 = "L0N0KrRgZm8pXYqT8Dc5m6BzjnYvkOaxx9Tms874NUivm8DYSs3oLtDrnNM8cVrjCCXCvS0g8l73CKNymaL6qw==";
+      };
+    };
     "purgecss-1.4.2" = {
       name = "purgecss";
       packageName = "purgecss";
@@ -35586,13 +36045,13 @@ let
         sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==";
       };
     };
-    "qs-6.9.1" = {
+    "qs-6.9.2" = {
       name = "qs";
       packageName = "qs";
-      version = "6.9.1";
+      version = "6.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz";
-        sha512 = "Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA==";
+        url = "https://registry.npmjs.org/qs/-/qs-6.9.2.tgz";
+        sha512 = "2eQ6zajpK7HwqrY1rRtGw5IZvjgtELXzJECaEDuzDFo2jjnIXpJSimzd4qflWZq6bLLi+Zgfj5eDrAzl/lptyg==";
       };
     };
     "query-string-1.0.1" = {
@@ -35892,6 +36351,15 @@ let
         sha512 = "PPYLwZ63lXi6Tv2EZ8w3M4FzC0rVqvxivaOVS8pXSp5FMIHFnvi4MWHL3UdFLhwSy50aNtJsgjY0mBC6oFL26Q==";
       };
     };
+    "rate-map-1.0.5" = {
+      name = "rate-map";
+      packageName = "rate-map";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rate-map/-/rate-map-1.0.5.tgz";
+        sha512 = "u/oBh01ZgCZM8Dqkm+xUh9mLl5t/9wxBNpVDZUSKjYvPSOOwYCeVheS5esvdyVnR0k3sLh+H9v16h1Z7FRy2Fw==";
+      };
+    };
     "raven-1.2.1" = {
       name = "raven";
       packageName = "raven";
@@ -35982,22 +36450,22 @@ let
         sha512 = "C0SIXdXDSus2yqqvV7qifnb4NoWP7mEBXJq3axci301mXHCZb8Djwm4hrEZo4UeXRaEnfjH98uQ8EBppk2oNWA==";
       };
     };
-    "react-16.13.0" = {
+    "react-16.13.1" = {
       name = "react";
       packageName = "react";
-      version = "16.13.0";
+      version = "16.13.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/react/-/react-16.13.0.tgz";
-        sha512 = "TSavZz2iSLkq5/oiE7gnFzmURKZMltmi193rm5HEoUDAXpzT9Kzw6oNZnGoai/4+fUnm7FqS5dwgUL34TujcWQ==";
+        url = "https://registry.npmjs.org/react/-/react-16.13.1.tgz";
+        sha512 = "YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==";
       };
     };
-    "react-is-16.13.0" = {
+    "react-is-16.13.1" = {
       name = "react-is";
       packageName = "react-is";
-      version = "16.13.0";
+      version = "16.13.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/react-is/-/react-is-16.13.0.tgz";
-        sha512 = "GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA==";
+        url = "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz";
+        sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==";
       };
     };
     "react-reconciler-0.24.0" = {
@@ -36486,13 +36954,13 @@ let
         sha512 = "ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==";
       };
     };
-    "regenerator-transform-0.14.3" = {
+    "regenerator-transform-0.14.4" = {
       name = "regenerator-transform";
       packageName = "regenerator-transform";
-      version = "0.14.3";
+      version = "0.14.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.3.tgz";
-        sha512 = "zXHNKJspmONxBViAb3ZUmFoFPnTBs3zFhCEZJiwp/gkNzxVbTqNJVjYKx6Qk1tQ1P4XLf4TbH9+KBB7wGoAaUw==";
+        url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz";
+        sha512 = "EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==";
       };
     };
     "regex-cache-0.4.4" = {
@@ -36630,6 +37098,15 @@ let
         sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7";
       };
     };
+    "reject-unsatisfied-npm-version-1.0.0" = {
+      name = "reject-unsatisfied-npm-version";
+      packageName = "reject-unsatisfied-npm-version";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/reject-unsatisfied-npm-version/-/reject-unsatisfied-npm-version-1.0.0.tgz";
+        sha512 = "8cl35x8i3W1+RubvIq9CM7fJkdMwBOdjne4b7eFBoo4vvN1QoXbgusQw6VVv2DBmm6NDyMhUmp9FBxaMWU9s7Q==";
+      };
+    };
     "relateurl-0.2.7" = {
       name = "relateurl";
       packageName = "relateurl";
@@ -36693,13 +37170,13 @@ let
         sha512 = "K0PTsaZvJlXTl9DN6qYlvjTkqSZBFELhROZMrblm2rB+085flN84nz4g/BscKRMqDvhzlK1oQ/xnWQumdeNZYw==";
       };
     };
-    "remark-frontmatter-1.3.2" = {
+    "remark-frontmatter-1.3.3" = {
       name = "remark-frontmatter";
       packageName = "remark-frontmatter";
-      version = "1.3.2";
+      version = "1.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-1.3.2.tgz";
-        sha512 = "2eayxITZ8rezsXdgcXnYB3iLivohm2V/ZT4Ne8uhua6A4pk6GdLE2ZzJnbnINtD1HRLaTdB7RwF9sgUbMptJZA==";
+        url = "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-1.3.3.tgz";
+        sha512 = "fM5eZPBvu2pVNoq3ZPW22q+5Ativ1oLozq2qYt9I2oNyxiUd/tDl0iLLntEVAegpZIslPWg1brhcP1VsaSVUag==";
       };
     };
     "remark-html-2.0.2" = {
@@ -37080,6 +37557,15 @@ let
         sha512 = "ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==";
       };
     };
+    "requirejs-config-file-3.1.2" = {
+      name = "requirejs-config-file";
+      packageName = "requirejs-config-file";
+      version = "3.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/requirejs-config-file/-/requirejs-config-file-3.1.2.tgz";
+        sha512 = "sdLWywcDuNz7EIOhenSbRfT4YF84nItDv90coN2htbokjmU2QeyQuSBZILQUKNksepl8UPVU+hgYySFaDxbJPQ==";
+      };
+    };
     "requires-port-1.0.0" = {
       name = "requires-port";
       packageName = "requires-port";
@@ -37134,6 +37620,15 @@ let
         sha1 = "00a9f7387556e27038eae232caa372a6a59b665a";
       };
     };
+    "resolve-dependency-path-2.0.0" = {
+      name = "resolve-dependency-path";
+      packageName = "resolve-dependency-path";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve-dependency-path/-/resolve-dependency-path-2.0.0.tgz";
+        sha512 = "DIgu+0Dv+6v2XwRaNWnumKu7GPufBBOr5I1gRPJHkvghrfCGOooJODFvgFimX/KRxk9j0whD2MnKHzM1jYvk9w==";
+      };
+    };
     "resolve-dir-1.0.1" = {
       name = "resolve-dir";
       packageName = "resolve-dir";
@@ -37188,6 +37683,15 @@ let
         sha512 = "qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==";
       };
     };
+    "resolve-from-npm-3.1.0" = {
+      name = "resolve-from-npm";
+      packageName = "resolve-from-npm";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve-from-npm/-/resolve-from-npm-3.1.0.tgz";
+        sha512 = "HVhEcznfeFWM7T3HWCT7vCjwkv0R1ruC4Ref5jTlTvz2X8GKeUZTqjvZWlefmKQvQfKYOJhQo90Yjhpcr8aclg==";
+      };
+    };
     "resolve-options-1.1.0" = {
       name = "resolve-options";
       packageName = "resolve-options";
@@ -37674,13 +38178,13 @@ let
         sha1 = "6f04063a2d04eba3303a1bbc6765eef63037cf3d";
       };
     };
-    "rss-parser-3.7.5" = {
+    "rss-parser-3.7.6" = {
       name = "rss-parser";
       packageName = "rss-parser";
-      version = "3.7.5";
+      version = "3.7.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.7.5.tgz";
-        sha512 = "bUbAJfiuNyR/IGpYie6ro6x7X26QMWHxz1Sy9qkPyU/vYwbf3YdopQJIIELwdp3FCU4evcyetOD8bA8fgS+SqA==";
+        url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.7.6.tgz";
+        sha512 = "wWWh3/pPLAPgWyfkCC9jB83jSBenU6VPMymfXiysi8wJxaN7KNkW4vU3Jm8jQxExAribFvXREy+RtaL3XQubeA==";
       };
     };
     "rsvp-3.6.2" = {
@@ -37737,6 +38241,15 @@ let
         sha512 = "xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==";
       };
     };
+    "run-in-dir-0.3.0" = {
+      name = "run-in-dir";
+      packageName = "run-in-dir";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/run-in-dir/-/run-in-dir-0.3.0.tgz";
+        sha512 = "5aPpxad3Jq9r6OK6rw+Gs5HVuZsEeQM/M4I9CdCWyThkstLAUCJSc3IRs8dT0p/z9mxAJgU5ELRQL2q/ddY6PQ==";
+      };
+    };
     "run-parallel-1.1.9" = {
       name = "run-parallel";
       packageName = "run-parallel";
@@ -37863,6 +38376,15 @@ let
         sha512 = "naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==";
       };
     };
+    "s.color-0.0.13" = {
+      name = "s.color";
+      packageName = "s.color";
+      version = "0.0.13";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/s.color/-/s.color-0.0.13.tgz";
+        sha512 = "56rTWlPg3jQX5n2wv201gUBn8fSgnGwbNjN159FV+JeD4EeqZiVnhDASmivhE4+f9Ivzj59y5AgoFflsf25KwA==";
+      };
+    };
     "s3-stream-upload-2.0.2" = {
       name = "s3-stream-upload";
       packageName = "s3-stream-upload";
@@ -37989,6 +38511,24 @@ let
         sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==";
       };
     };
+    "sass-formatter-0.4.4" = {
+      name = "sass-formatter";
+      packageName = "sass-formatter";
+      version = "0.4.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.4.4.tgz";
+        sha512 = "pI/2olF5F3AMkAXbn71nJK7yAsWfRYLlyp7Suhiy4hzuNga05XaUzLO74lplCpvS8GVeUdFgef+8lU5+cHr60g==";
+      };
+    };
+    "sass-lookup-3.0.0" = {
+      name = "sass-lookup";
+      packageName = "sass-lookup";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sass-lookup/-/sass-lookup-3.0.0.tgz";
+        sha512 = "TTsus8CfFRn1N44bvdEai1no6PqdmDiQUiqW5DlpmtT+tYnIt1tXtDIph5KA1efC+LmioJXSnCtUVpcK9gaKIg==";
+      };
+    };
     "sax-0.5.8" = {
       name = "sax";
       packageName = "sax";
@@ -38052,6 +38592,15 @@ let
         sha512 = "i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==";
       };
     };
+    "schema-utils-2.6.5" = {
+      name = "schema-utils";
+      packageName = "schema-utils";
+      version = "2.6.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz";
+        sha512 = "5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ==";
+      };
+    };
     "scoped-regex-1.0.0" = {
       name = "scoped-regex";
       packageName = "scoped-regex";
@@ -39015,13 +39564,22 @@ let
         sha512 = "dKKwjIoTOa587TARYLlBRXq2lkbu5Iz35XrEVWpelhBP1m8r2BGOy1QlaZe84GTFHG/BTucEUd2btnNc8QzIVA==";
       };
     };
-    "sisteransi-1.0.4" = {
+    "sisteransi-1.0.5" = {
       name = "sisteransi";
       packageName = "sisteransi";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.4.tgz";
-        sha512 = "/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig==";
+        url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz";
+        sha512 = "bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==";
+      };
+    };
+    "size-rate-0.3.1" = {
+      name = "size-rate";
+      packageName = "size-rate";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/size-rate/-/size-rate-0.3.1.tgz";
+        sha512 = "gs1+6r1P1w00Qv00qC4Be2pbl70/cIVCtsZJPQhEzH3vNss8QbkGIVh6/SCC7atSlX7hkuwH93TyWL1iyXjurQ==";
       };
     };
     "skin-tone-1.0.0" = {
@@ -39258,13 +39816,13 @@ let
         sha512 = "9NjxHVMd1U1LFw66Lya4LXgrsFUiuRiL4opxfTFo0LmMNzUoU5Bk/p0zDdg3FE5Wg61r4fP2D8w+QTl6M8CGiw==";
       };
     };
-    "snyk-docker-plugin-2.2.2" = {
+    "snyk-docker-plugin-2.6.1" = {
       name = "snyk-docker-plugin";
       packageName = "snyk-docker-plugin";
-      version = "2.2.2";
+      version = "2.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-2.2.2.tgz";
-        sha512 = "ufeACGqtypUJ3AV5+bQw/mZLo40MC9tVHdRxpBw95w0F0Oa1MT5DATQj/K8RHpkEy8X6rlMmnxH8swyryFgRhg==";
+        url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-2.6.1.tgz";
+        sha512 = "v3LIPILRL5faZ+qiIhF9on0rAxuFaQku3UwaiGumoTrfXywLkv7x8PJgdMnrsWUxDwB8EZFc1k2qvI6V6rTF5g==";
       };
     };
     "snyk-go-parser-1.4.0" = {
@@ -39915,6 +40473,15 @@ let
         sha1 = "db338ec4cff63abc69f1d0e08cee9eb8bebd9d11";
       };
     };
+    "spawn-stack-0.7.0" = {
+      name = "spawn-stack";
+      packageName = "spawn-stack";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/spawn-stack/-/spawn-stack-0.7.0.tgz";
+        sha512 = "lV3XTrZqR76y9voQq3g0NfCCd4dylXtgQW+xcoZkRYe/6IZJM20G//s2+4JYojJoHQQKKuoU+lUZkO5/tEJe4A==";
+      };
+    };
     "spawn-sync-1.0.15" = {
       name = "spawn-sync";
       packageName = "spawn-sync";
@@ -41247,6 +41814,15 @@ let
         sha512 = "fqqhZzXyAM6pGD9lky/GOPq6V4X0SeTAFBl0iXb/BzOegl40gpf/bV3QQP7zULNYvjr6+Dx8SCaDULjVoOru0A==";
       };
     };
+    "stringify-object-3.3.0" = {
+      name = "stringify-object";
+      packageName = "stringify-object";
+      version = "3.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz";
+        sha512 = "rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==";
+      };
+    };
     "stringify-parameters-0.0.4" = {
       name = "stringify-parameters";
       packageName = "stringify-parameters";
@@ -41634,6 +42210,15 @@ let
         sha512 = "Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug==";
       };
     };
+    "stylus-lookup-3.0.2" = {
+      name = "stylus-lookup";
+      packageName = "stylus-lookup";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/stylus-lookup/-/stylus-lookup-3.0.2.tgz";
+        sha512 = "oEQGHSjg/AMaWlKe7gqsnYzan8DLcGIHe0dUaFkucZZ14z4zjENRlQMCHT4FNsiWnJf17YN9OvrCfCoi7VvOyg==";
+      };
+    };
     "stylus-supremacy-2.14.0" = {
       name = "stylus-supremacy";
       packageName = "stylus-supremacy";
@@ -41679,6 +42264,33 @@ let
         sha1 = "cc539bf8191624d4f507d83eeb45b4cea27f3463";
       };
     };
+    "suf-cli-0.1.1" = {
+      name = "suf-cli";
+      packageName = "suf-cli";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/suf-cli/-/suf-cli-0.1.1.tgz";
+        sha512 = "0znmYibLknX0bWsnqW9rzM8IvKux3rTSnW52l5teIC+QAgS/StUl5f4WyLPBw+posfbOgoX+03xHPV4sMxY64Q==";
+      };
+    };
+    "suf-node-1.1.1" = {
+      name = "suf-node";
+      packageName = "suf-node";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/suf-node/-/suf-node-1.1.1.tgz";
+        sha512 = "XiyPqLdiHJ3CMphADCJg/JVQYcj3JfO8NomlLubSdGYgppfzE+g/7Fyusza/Kr7lC919BdwbfIqFxK8VO7+l4w==";
+      };
+    };
+    "suf-regex-0.0.14" = {
+      name = "suf-regex";
+      packageName = "suf-regex";
+      version = "0.0.14";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/suf-regex/-/suf-regex-0.0.14.tgz";
+        sha512 = "+WE5PZTfD6lVNCNsyBInJIAbok8LpqgOhvCbSViZeQ/JTxdxq7Lw+tSJXGM+jrIp81jj9GCMYvkl00JAkn2CtA==";
+      };
+    };
     "sugarss-1.0.1" = {
       name = "sugarss";
       packageName = "sugarss";
@@ -42454,13 +43066,13 @@ let
         sha512 = "a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==";
       };
     };
-    "terminal-kit-1.35.1" = {
+    "terminal-kit-1.35.2" = {
       name = "terminal-kit";
       packageName = "terminal-kit";
-      version = "1.35.1";
+      version = "1.35.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.35.1.tgz";
-        sha512 = "36q0frqenTb1kWuq+vJU+xbGB8KPX1+05kxnbVZxeu9cXDL68qR5w2NzsliogHweplRI7XP0Zc/FITMMA8/BHA==";
+        url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.35.2.tgz";
+        sha512 = "PCNmMKjlcGQN/OlQ+nzdgPmrS0kmPcOqPCmHPrxCfOuvz0fQ1fZLiyivRIcwzY9bnm624VVsywUis+iPA3Hq5A==";
       };
     };
     "terser-3.17.0" = {
@@ -42472,13 +43084,13 @@ let
         sha512 = "/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==";
       };
     };
-    "terser-4.6.6" = {
+    "terser-4.6.7" = {
       name = "terser";
       packageName = "terser";
-      version = "4.6.6";
+      version = "4.6.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terser/-/terser-4.6.6.tgz";
-        sha512 = "4lYPyeNmstjIIESr/ysHg2vUPRGf2tzF9z2yYwnowXVuVzLEamPN1Gfrz7f8I9uEPuHcbFlW4PLIAsJoxXyJ1g==";
+        url = "https://registry.npmjs.org/terser/-/terser-4.6.7.tgz";
+        sha512 = "fmr7M1f7DBly5cX2+rFDvmGBAaaZyPrHYK4mMdHEDAdNTqXSZgSOfqsfGq2HqPGT/1V0foZZuCZFx8CHKgAk3g==";
       };
     };
     "terser-webpack-plugin-1.4.3" = {
@@ -42742,6 +43354,15 @@ let
         sha512 = "eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==";
       };
     };
+    "tilde-path-3.0.0" = {
+      name = "tilde-path";
+      packageName = "tilde-path";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tilde-path/-/tilde-path-3.0.0.tgz";
+        sha512 = "jHGx1beQCxoIuyg1LDKxqL3J0zNA57eGjlXsqtcjj6Q9EKXh4Sz895VxXW/psJW1PYIF79XViZEEWrvmhaZ61g==";
+      };
+    };
     "tildify-1.2.0" = {
       name = "tildify";
       packageName = "tildify";
@@ -43147,15 +43768,6 @@ let
         sha512 = "Y7EDM+uoU8TZxF5ej2mUR0dLO4qbuuNRnJKxEht2QJWEq2421pyG1D1x8YxPKmyTc6nHh7Td/jLGFxYo+9vkLA==";
       };
     };
-    "to-vfile-5.0.3" = {
-      name = "to-vfile";
-      packageName = "to-vfile";
-      version = "5.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/to-vfile/-/to-vfile-5.0.3.tgz";
-        sha512 = "z1Lfx60yAMDMmr+f426Y4yECsHdl8GVEAE+LymjRF5oOIZ7T4N20IxWNAxXLMRzP9jSSll38Z0fKVAhVLsdLOw==";
-      };
-    };
     "to-vfile-6.1.0" = {
       name = "to-vfile";
       packageName = "to-vfile";
@@ -43588,13 +44200,13 @@ let
         sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA==";
       };
     };
-    "ts-node-8.7.0" = {
+    "ts-node-8.8.1" = {
       name = "ts-node";
       packageName = "ts-node";
-      version = "8.7.0";
+      version = "8.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ts-node/-/ts-node-8.7.0.tgz";
-        sha512 = "s659CsHrsxaRVDEleuOkGvbsA0rWHtszUNEt1r0CgAFN5ZZTQtDzpsluS7W5pOGJIa1xZE8R/zK4dEs+ldFezg==";
+        url = "https://registry.npmjs.org/ts-node/-/ts-node-8.8.1.tgz";
+        sha512 = "10DE9ONho06QORKAaCBpPiFCdW+tZJuY/84tyypGtl6r+/C7Asq0dhqbRZURuUlLQtZxxDvT8eoj8cGW0ha6Bg==";
       };
     };
     "ts-process-promises-1.0.2" = {
@@ -43651,6 +44263,15 @@ let
         sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==";
       };
     };
+    "tsutils-3.17.1" = {
+      name = "tsutils";
+      packageName = "tsutils";
+      version = "3.17.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz";
+        sha512 = "kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==";
+      };
+    };
     "ttf2woff-2.0.1" = {
       name = "ttf2woff";
       packageName = "ttf2woff";
@@ -43705,6 +44326,24 @@ let
         sha512 = "C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==";
       };
     };
+    "tty-truncate-1.0.5" = {
+      name = "tty-truncate";
+      packageName = "tty-truncate";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tty-truncate/-/tty-truncate-1.0.5.tgz";
+        sha512 = "ftM6dBJyEXLMspVSO2huTtGQapxsljpmQh5jYMaUFeCgETOWNT/KZcBGXtoBEYRBO2JRdxsSSHPloa6Fy/AWXw==";
+      };
+    };
+    "tty-width-frame-1.0.3" = {
+      name = "tty-width-frame";
+      packageName = "tty-width-frame";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tty-width-frame/-/tty-width-frame-1.0.3.tgz";
+        sha512 = "k3DeWv+GnKYcFaFLK87Ecum4AWxySB0lfzQaonlHKaoum7A2DlTkWw8mfgWtz4o8Hoa4Ab/ZdDitR74LhbOK8A==";
+      };
+    };
     "tunnel-0.0.6" = {
       name = "tunnel";
       packageName = "tunnel";
@@ -43930,15 +44569,6 @@ let
         sha512 = "kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg==";
       };
     };
-    "typescript-3.7.3" = {
-      name = "typescript";
-      packageName = "typescript";
-      version = "3.7.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-3.7.3.tgz";
-        sha512 = "Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw==";
-      };
-    };
     "typescript-3.7.5" = {
       name = "typescript";
       packageName = "typescript";
@@ -44704,6 +45334,15 @@ let
         sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==";
       };
     };
+    "universalify-1.0.0" = {
+      name = "universalify";
+      packageName = "universalify";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz";
+        sha512 = "rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==";
+      };
+    };
     "unix-crypt-td-js-1.1.4" = {
       name = "unix-crypt-td-js";
       packageName = "unix-crypt-td-js";
@@ -44713,13 +45352,13 @@ let
         sha512 = "8rMeVYWSIyccIJscb9NdCfZKSRBKYTeVnwmiRYT2ulE3qd1RaDQ0xQDP+rI3ccIWbhu/zuo5cgN8z73belNZgw==";
       };
     };
-    "unix-dgram-2.0.3" = {
+    "unix-dgram-2.0.4" = {
       name = "unix-dgram";
       packageName = "unix-dgram";
-      version = "2.0.3";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unix-dgram/-/unix-dgram-2.0.3.tgz";
-        sha512 = "Bay5CkSLcdypcBCsxvHEvaG3mftzT5FlUnRToPWEAVxwYI8NI/8zSJ/Gknlp86MPhV6hBA8I8TBsETj2tssoHQ==";
+        url = "https://registry.npmjs.org/unix-dgram/-/unix-dgram-2.0.4.tgz";
+        sha512 = "7tpK6x7ls7J7pDrrAU63h93R0dVhRbPwiRRCawR10cl+2e1VOvF3bHlVJc6WI1dl/8qk5He673QU+Ogv7bPNaw==";
       };
     };
     "unixify-1.0.0" = {
@@ -45658,13 +46297,13 @@ let
         sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==";
       };
     };
-    "verda-1.0.0-12" = {
+    "verda-1.0.0" = {
       name = "verda";
       packageName = "verda";
-      version = "1.0.0-12";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/verda/-/verda-1.0.0-12.tgz";
-        sha512 = "pNfCbq1WlBTE0SsyajJFzkQtp+E/opy5/+8405XHE4VMQ+3Xr/h2s9OijnbHPwPDJvybV4+JCktJhc6Ru6yg7w==";
+        url = "https://registry.npmjs.org/verda/-/verda-1.0.0.tgz";
+        sha512 = "kr/M1CkBepFQP/jIWh9QB8x/2Ly7qzsZMJwbjUurJAhbn+FQkGxiDMcCGRGYpMGl0oL8kLmEQDVNyzFzE9AUVw==";
       };
     };
     "verror-1.1.0" = {
@@ -45712,6 +46351,15 @@ let
         sha1 = "7d13b27b1facc2e2da90405eb5ea6e5bdd252ea5";
       };
     };
+    "vertical-meter-1.0.0" = {
+      name = "vertical-meter";
+      packageName = "vertical-meter";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vertical-meter/-/vertical-meter-1.0.0.tgz";
+        sha512 = "xvtone0DHRBrWSBVF2p3+/KSz/mzHvDZ7+HYB3g68hBpqIC3tIF8J1maf5osHPKHB/45iq2B+T4ju/mfxArd/Q==";
+      };
+    };
     "vfile-1.4.0" = {
       name = "vfile";
       packageName = "vfile";
@@ -45973,6 +46621,15 @@ let
         sha512 = "DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==";
       };
     };
+    "vls-0.2.0" = {
+      name = "vls";
+      packageName = "vls";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vls/-/vls-0.2.0.tgz";
+        sha512 = "B6xMWi3sOVSitcLx4zKWB5vh1DLL0Okkqy5Fa7rHSmqvPhDDn7idU+vwjWZW8IzHQO1T+brxvDjbKuSnEXNPRw==";
+      };
+    };
     "vm-browserify-1.1.2" = {
       name = "vm-browserify";
       packageName = "vm-browserify";
@@ -46225,13 +46882,13 @@ let
         sha512 = "ITtoh3V4AkWXMmp3TB97vsMaHRgHhsSFPsUdzlueSL+dRZbSNTZeOmdQv60kjCV306ghPxhDeoNUEm3+EZMuyw==";
       };
     };
-    "vscode-nls-4.1.1" = {
+    "vscode-nls-4.1.2" = {
       name = "vscode-nls";
       packageName = "vscode-nls";
-      version = "4.1.1";
+      version = "4.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.1.tgz";
-        sha512 = "4R+2UoUUU/LdnMnFjePxfLqNhBS8lrAFyX7pjb2ud/lqDkrUavFUTcG7wR0HBZFakae0Q6KLBFjMS6W93F403A==";
+        url = "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.2.tgz";
+        sha512 = "7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw==";
       };
     };
     "vscode-textbuffer-1.0.0" = {
@@ -46279,6 +46936,15 @@ let
         sha512 = "eY9jmGoEnVf8VE8xr5znSah7Qt1P/xsCdErz+g8HYZtJ7bZqKH5E3d+6oVNm1AC/c6IHUDokbmVXKOi4qPAC9A==";
       };
     };
+    "vscode-web-custom-data-0.1.3" = {
+      name = "vscode-web-custom-data";
+      packageName = "vscode-web-custom-data";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vscode-web-custom-data/-/vscode-web-custom-data-0.1.3.tgz";
+        sha512 = "u9RdZ3aIjx5f0WYSb8EIcmo7trgrJk+bVfGDfjyBSlfG59XWg8xw/JVfHNpO5AklustCez3vixnGLAOWzhPkZg==";
+      };
+    };
     "vstream-0.1.0" = {
       name = "vstream";
       packageName = "vstream";
@@ -46315,15 +46981,6 @@ let
         sha512 = "ZezcU71Owm84xVF6gfurBQUGg8WQ+WZGxgDEQu1IHFBZNx7BFZg3L1yHxrCBNNwbwFtE1GuvfJKMtb6Xuwc/Bw==";
       };
     };
-    "vue-eslint-parser-5.0.0" = {
-      name = "vue-eslint-parser";
-      packageName = "vue-eslint-parser";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-5.0.0.tgz";
-        sha512 = "JlHVZwBBTNVvzmifwjpZYn0oPWH2SgWv5dojlZBsrhablDu95VFD+hriB1rQGwbD+bms6g+rAFhQHk6+NyiS6g==";
-      };
-    };
     "vue-eslint-parser-6.0.5" = {
       name = "vue-eslint-parser";
       packageName = "vue-eslint-parser";
@@ -46351,15 +47008,6 @@ let
         sha512 = "RXv0lrDG2CAx3yAQCoD9beU8nAoT3rhh/fgb+xlYM0Qlm+cpkWSLTdfOt1x2j2wHI08uEsi0q7x6rjhn54EbNA==";
       };
     };
-    "vue-language-server-0.0.62" = {
-      name = "vue-language-server";
-      packageName = "vue-language-server";
-      version = "0.0.62";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vue-language-server/-/vue-language-server-0.0.62.tgz";
-        sha512 = "Q/nwAVlBfLKz4CSA4vkA14jJcXElP1Vf+O5GZhG7sPlNKMEy91rdVwYc7IfMRZV/SCAZRak9/oo0Zy4+39dwrg==";
-      };
-    };
     "vue-onsenui-helper-json-1.0.2" = {
       name = "vue-onsenui-helper-json";
       packageName = "vue-onsenui-helper-json";
@@ -46549,13 +47197,13 @@ let
         sha512 = "VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==";
       };
     };
-    "webpack-4.42.0" = {
+    "webpack-4.42.1" = {
       name = "webpack";
       packageName = "webpack";
-      version = "4.42.0";
+      version = "4.42.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack/-/webpack-4.42.0.tgz";
-        sha512 = "EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w==";
+        url = "https://registry.npmjs.org/webpack/-/webpack-4.42.1.tgz";
+        sha512 = "SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg==";
       };
     };
     "webpack-cli-3.3.11" = {
@@ -46873,6 +47521,15 @@ let
         sha1 = "8f58e0656fca00adc8c86a2b89e3cd2d6a2d5e5e";
       };
     };
+    "win-user-installed-npm-cli-path-3.0.1" = {
+      name = "win-user-installed-npm-cli-path";
+      packageName = "win-user-installed-npm-cli-path";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/win-user-installed-npm-cli-path/-/win-user-installed-npm-cli-path-3.0.1.tgz";
+        sha512 = "Us1ZlMmWDInXihJ+SWP8/L0ArqsLqPtWK9Q67x6+q+z7C2c22viVgCmbH+x0BeMsosmPS9OKHvka519XbO51Rw==";
+      };
+    };
     "window-size-0.1.0" = {
       name = "window-size";
       packageName = "window-size";
@@ -47864,15 +48521,6 @@ let
         sha512 = "HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==";
       };
     };
-    "yargs-13.3.0" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "13.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz";
-        sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==";
-      };
-    };
     "yargs-13.3.2" = {
       name = "yargs";
       packageName = "yargs";
@@ -47900,13 +48548,13 @@ let
         sha512 = "T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==";
       };
     };
-    "yargs-15.3.0" = {
+    "yargs-15.3.1" = {
       name = "yargs";
       packageName = "yargs";
-      version = "15.3.0";
+      version = "15.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-15.3.0.tgz";
-        sha512 = "g/QCnmjgOl1YJjGsnUg2SatC7NUYEiLXJqxNOQU9qSpjzGtGXda9b+OKccr1kLTy8BN9yqEyqfq5lxlwdc13TA==";
+        url = "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz";
+        sha512 = "92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==";
       };
     };
     "yargs-3.10.0" = {
@@ -47990,15 +48638,6 @@ let
         sha512 = "w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==";
       };
     };
-    "yargs-parser-13.1.1" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "13.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz";
-        sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==";
-      };
-    };
     "yargs-parser-13.1.2" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -48026,13 +48665,13 @@ let
         sha512 = "H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg==";
       };
     };
-    "yargs-parser-18.1.0" = {
+    "yargs-parser-18.1.1" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
-      version = "18.1.0";
+      version = "18.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.0.tgz";
-        sha512 = "o/Jr6JBOv6Yx3pL+5naWSoIA2jJ+ZkMYQG/ie9qFbukBe4uzmBatlXFOiu/tNKRWEtyf+n5w7jc/O16ufqOTdQ==";
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.1.tgz";
+        sha512 = "KRHEsOM16IX7XuLnMOqImcPNbLVXMNHYAoFc3BKR8Ortl5gzDbtXvvEoGx9imk5E+X1VeNKNlcHr8B8vi+7ipA==";
       };
     };
     "yargs-parser-2.4.1" = {
@@ -48188,13 +48827,13 @@ let
         sha512 = "Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==";
       };
     };
-    "yoga-layout-prebuilt-1.9.3" = {
+    "yoga-layout-prebuilt-1.9.5" = {
       name = "yoga-layout-prebuilt";
       packageName = "yoga-layout-prebuilt";
-      version = "1.9.3";
+      version = "1.9.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yoga-layout-prebuilt/-/yoga-layout-prebuilt-1.9.3.tgz";
-        sha512 = "9SNQpwuEh2NucU83i2KMZnONVudZ86YNcFk9tq74YaqrQfgJWO3yB9uzH1tAg8iqh5c9F5j0wuyJ2z72wcum2w==";
+        url = "https://registry.npmjs.org/yoga-layout-prebuilt/-/yoga-layout-prebuilt-1.9.5.tgz";
+        sha512 = "+G5Ojl4/sG78mk5masCL3SRaZtkKXRBhMGf5c+4C1j32jN9KpS4lxVFdYyBi15EHN4gMeK5sIRf83T33TOaDkA==";
       };
     };
     "yosay-2.0.2" = {
@@ -48302,17 +48941,17 @@ in
   "@angular/cli" = nodeEnv.buildNodePackage {
     name = "_at_angular_slash_cli";
     packageName = "@angular/cli";
-    version = "9.0.6";
+    version = "9.0.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@angular/cli/-/cli-9.0.6.tgz";
-      sha512 = "uDXhkPcHhE4G4FlY7+LJWhXErHnkn63V8lqkKD7juivs+Epmx8oXCOVObEQTbbtw7sF6s0dM8uTzHKgoefTlaA==";
+      url = "https://registry.npmjs.org/@angular/cli/-/cli-9.0.7.tgz";
+      sha512 = "/9CUNSSVyTtTNUADZ/VXJDEdhineMN/rfd35w6VsHiob49tKkeOTggaoiSne3RY4VCTqlo7GGf4KhhVXEMGnDQ==";
     };
     dependencies = [
-      sources."@angular-devkit/architect-0.900.6"
-      sources."@angular-devkit/core-9.0.6"
-      sources."@angular-devkit/schematics-9.0.6"
-      sources."@schematics/angular-9.0.6"
-      (sources."@schematics/update-0.900.6" // {
+      sources."@angular-devkit/architect-0.900.7"
+      sources."@angular-devkit/core-9.0.7"
+      sources."@angular-devkit/schematics-9.0.7"
+      sources."@schematics/angular-9.0.7"
+      (sources."@schematics/update-0.900.7" // {
         dependencies = [
           (sources."npm-package-arg-7.0.0" // {
             dependencies = [
@@ -48343,7 +48982,7 @@ in
       sources."brace-expansion-1.1.11"
       sources."buffer-from-1.1.1"
       sources."builtins-1.0.3"
-      (sources."cacache-12.0.3" // {
+      (sources."cacache-12.0.4" // {
         dependencies = [
           sources."rimraf-2.7.1"
         ];
@@ -48381,7 +49020,7 @@ in
       sources."encoding-0.1.12"
       sources."end-of-stream-1.4.4"
       sources."err-code-1.1.2"
-      sources."es-abstract-1.17.4"
+      sources."es-abstract-1.17.5"
       sources."es-to-primitive-1.2.1"
       sources."es6-promise-4.2.8"
       sources."es6-promisify-5.0.0"
@@ -48391,7 +49030,7 @@ in
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-2.0.1"
       sources."fast-json-stable-stringify-2.0.0"
-      sources."figgy-pudding-3.5.1"
+      sources."figgy-pudding-3.5.2"
       sources."figures-3.2.0"
       sources."flush-write-stream-1.1.1"
       sources."forever-agent-0.6.1"
@@ -48464,11 +49103,11 @@ in
       sources."mime-types-2.1.26"
       sources."mimic-fn-2.1.0"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
+      sources."minimist-1.2.5"
       sources."minipass-2.9.0"
       sources."minizlib-1.3.3"
       sources."mississippi-3.0.0"
-      sources."mkdirp-0.5.1"
+      sources."mkdirp-0.5.4"
       (sources."move-concurrently-1.0.1" // {
         dependencies = [
           sources."rimraf-2.7.1"
@@ -48656,7 +49295,7 @@ in
       sources."deep-freeze-node-1.1.3"
       sources."esprima-4.0.1"
       sources."js-yaml-3.13.1"
-      sources."json5-2.1.1"
+      sources."json5-2.1.2"
       sources."lodash.clonedeep-4.5.0"
       sources."map-obj-4.1.0"
       sources."minimist-1.2.5"
@@ -48706,9 +49345,14 @@ in
       sources."async-lock-1.2.2"
       sources."balanced-match-1.0.0"
       sources."base64-js-0.0.2"
-      sources."bl-4.0.1"
+      sources."bl-4.0.2"
       sources."bops-0.0.7"
       sources."brace-expansion-1.1.11"
+      (sources."buffer-5.5.0" // {
+        dependencies = [
+          sources."base64-js-1.3.1"
+        ];
+      })
       sources."buffer-crc32-0.2.13"
       sources."buffer-equal-1.0.0"
       sources."cache-directory-2.0.0"
@@ -48828,6 +49472,7 @@ in
       sources."handlebars-4.5.3"
       sources."has-symbols-1.0.1"
       sources."http-cache-semantics-4.1.0"
+      sources."ieee754-1.1.13"
       sources."ignore-5.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -48846,7 +49491,7 @@ in
       sources."js-yaml-3.13.1"
       sources."json-buffer-3.0.0"
       sources."json-stable-stringify-without-jsonify-1.0.1"
-      sources."json5-2.1.1"
+      sources."json5-2.1.2"
       sources."jsonfile-4.0.0"
       sources."keyv-3.1.0"
       (sources."lazystream-1.0.0" // {
@@ -49185,26 +49830,21 @@ in
       sources."@apollographql/graphql-language-service-utils-2.0.2"
       sources."@apollographql/graphql-playground-html-1.6.24"
       sources."@babel/code-frame-7.8.3"
-      (sources."@babel/compat-data-7.8.6" // {
+      (sources."@babel/compat-data-7.9.0" // {
         dependencies = [
           sources."semver-5.7.1"
         ];
       })
-      (sources."@babel/core-7.8.7" // {
+      (sources."@babel/core-7.9.0" // {
         dependencies = [
-          sources."@babel/generator-7.8.8"
-          sources."@babel/types-7.8.7"
+          sources."@babel/generator-7.9.4"
+          sources."@babel/types-7.9.0"
           sources."semver-5.7.1"
         ];
       })
       sources."@babel/generator-7.8.6"
       sources."@babel/helper-annotate-as-pure-7.8.3"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3"
-      (sources."@babel/helper-call-delegate-7.8.7" // {
-        dependencies = [
-          sources."@babel/types-7.8.7"
-        ];
-      })
       (sources."@babel/helper-compilation-targets-7.8.7" // {
         dependencies = [
           sources."semver-5.7.1"
@@ -49219,7 +49859,11 @@ in
       sources."@babel/helper-hoist-variables-7.8.3"
       sources."@babel/helper-member-expression-to-functions-7.8.3"
       sources."@babel/helper-module-imports-7.8.3"
-      sources."@babel/helper-module-transforms-7.8.6"
+      (sources."@babel/helper-module-transforms-7.9.0" // {
+        dependencies = [
+          sources."@babel/types-7.9.0"
+        ];
+      })
       sources."@babel/helper-optimise-call-expression-7.8.3"
       sources."@babel/helper-plugin-utils-7.8.3"
       sources."@babel/helper-regex-7.8.3"
@@ -49227,24 +49871,31 @@ in
       sources."@babel/helper-replace-supers-7.8.6"
       sources."@babel/helper-simple-access-7.8.3"
       sources."@babel/helper-split-export-declaration-7.8.3"
+      sources."@babel/helper-validator-identifier-7.9.0"
       sources."@babel/helper-wrap-function-7.8.3"
-      sources."@babel/helpers-7.8.4"
-      sources."@babel/highlight-7.8.3"
-      sources."@babel/parser-7.8.8"
+      (sources."@babel/helpers-7.9.2" // {
+        dependencies = [
+          sources."@babel/types-7.9.0"
+        ];
+      })
+      sources."@babel/highlight-7.9.0"
+      sources."@babel/parser-7.9.4"
       sources."@babel/plugin-proposal-async-generator-functions-7.8.3"
       sources."@babel/plugin-proposal-class-properties-7.8.3"
       sources."@babel/plugin-proposal-dynamic-import-7.8.3"
       sources."@babel/plugin-proposal-json-strings-7.8.3"
       sources."@babel/plugin-proposal-nullish-coalescing-operator-7.8.3"
-      sources."@babel/plugin-proposal-object-rest-spread-7.8.3"
+      sources."@babel/plugin-proposal-numeric-separator-7.8.3"
+      sources."@babel/plugin-proposal-object-rest-spread-7.9.0"
       sources."@babel/plugin-proposal-optional-catch-binding-7.8.3"
-      sources."@babel/plugin-proposal-optional-chaining-7.8.3"
+      sources."@babel/plugin-proposal-optional-chaining-7.9.0"
       sources."@babel/plugin-proposal-unicode-property-regex-7.8.8"
       sources."@babel/plugin-syntax-async-generators-7.8.4"
       sources."@babel/plugin-syntax-dynamic-import-7.8.3"
       sources."@babel/plugin-syntax-flow-7.8.3"
       sources."@babel/plugin-syntax-json-strings-7.8.3"
       sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3"
+      sources."@babel/plugin-syntax-numeric-separator-7.8.3"
       sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
       sources."@babel/plugin-syntax-optional-catch-binding-7.8.3"
       sources."@babel/plugin-syntax-optional-chaining-7.8.3"
@@ -49254,25 +49905,25 @@ in
       sources."@babel/plugin-transform-async-to-generator-7.8.3"
       sources."@babel/plugin-transform-block-scoped-functions-7.8.3"
       sources."@babel/plugin-transform-block-scoping-7.8.3"
-      sources."@babel/plugin-transform-classes-7.8.6"
+      sources."@babel/plugin-transform-classes-7.9.2"
       sources."@babel/plugin-transform-computed-properties-7.8.3"
       sources."@babel/plugin-transform-destructuring-7.8.8"
       sources."@babel/plugin-transform-dotall-regex-7.8.3"
       sources."@babel/plugin-transform-duplicate-keys-7.8.3"
       sources."@babel/plugin-transform-exponentiation-operator-7.8.3"
-      sources."@babel/plugin-transform-flow-strip-types-7.8.3"
-      sources."@babel/plugin-transform-for-of-7.8.6"
+      sources."@babel/plugin-transform-flow-strip-types-7.9.0"
+      sources."@babel/plugin-transform-for-of-7.9.0"
       sources."@babel/plugin-transform-function-name-7.8.3"
       sources."@babel/plugin-transform-literals-7.8.3"
       sources."@babel/plugin-transform-member-expression-literals-7.8.3"
-      sources."@babel/plugin-transform-modules-amd-7.8.3"
-      sources."@babel/plugin-transform-modules-commonjs-7.8.3"
-      sources."@babel/plugin-transform-modules-systemjs-7.8.3"
-      sources."@babel/plugin-transform-modules-umd-7.8.3"
+      sources."@babel/plugin-transform-modules-amd-7.9.0"
+      sources."@babel/plugin-transform-modules-commonjs-7.9.0"
+      sources."@babel/plugin-transform-modules-systemjs-7.9.0"
+      sources."@babel/plugin-transform-modules-umd-7.9.0"
       sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3"
       sources."@babel/plugin-transform-new-target-7.8.3"
       sources."@babel/plugin-transform-object-super-7.8.3"
-      sources."@babel/plugin-transform-parameters-7.8.8"
+      sources."@babel/plugin-transform-parameters-7.9.3"
       sources."@babel/plugin-transform-property-literals-7.8.3"
       sources."@babel/plugin-transform-regenerator-7.8.7"
       sources."@babel/plugin-transform-reserved-words-7.8.3"
@@ -49281,30 +49932,36 @@ in
       sources."@babel/plugin-transform-sticky-regex-7.8.3"
       sources."@babel/plugin-transform-template-literals-7.8.3"
       sources."@babel/plugin-transform-typeof-symbol-7.8.4"
-      sources."@babel/plugin-transform-typescript-7.8.7"
+      sources."@babel/plugin-transform-typescript-7.9.4"
       sources."@babel/plugin-transform-unicode-regex-7.8.3"
-      (sources."@babel/preset-env-7.8.7" // {
+      (sources."@babel/preset-env-7.9.0" // {
         dependencies = [
-          sources."@babel/types-7.8.7"
+          sources."@babel/types-7.9.0"
           sources."semver-5.7.1"
         ];
       })
-      sources."@babel/preset-flow-7.8.3"
-      sources."@babel/preset-typescript-7.8.3"
-      (sources."@babel/register-7.8.6" // {
+      sources."@babel/preset-flow-7.9.0"
+      sources."@babel/preset-modules-0.1.3"
+      sources."@babel/preset-typescript-7.9.0"
+      (sources."@babel/register-7.9.0" // {
         dependencies = [
           sources."make-dir-2.1.0"
           sources."pify-4.0.1"
           sources."semver-5.7.1"
         ];
       })
-      (sources."@babel/runtime-7.8.7" // {
+      (sources."@babel/runtime-7.9.2" // {
         dependencies = [
           sources."regenerator-runtime-0.13.5"
         ];
       })
       sources."@babel/template-7.8.6"
-      sources."@babel/traverse-7.8.6"
+      (sources."@babel/traverse-7.9.0" // {
+        dependencies = [
+          sources."@babel/generator-7.9.4"
+          sources."@babel/types-7.9.0"
+        ];
+      })
       sources."@babel/types-7.8.6"
       sources."@endemolshinegroup/cosmiconfig-typescript-loader-1.0.1"
       sources."@hapi/address-2.1.4"
@@ -49391,7 +50048,7 @@ in
       sources."@types/cors-2.8.6"
       sources."@types/events-3.0.0"
       sources."@types/express-4.17.2"
-      sources."@types/express-serve-static-core-4.17.2"
+      sources."@types/express-serve-static-core-4.17.3"
       sources."@types/fs-capacitor-2.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/graphql-upload-8.0.3"
@@ -49402,7 +50059,7 @@ in
       sources."@types/long-4.0.1"
       sources."@types/mime-2.0.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.9.1"
+      sources."@types/node-13.9.3"
       (sources."@types/node-fetch-2.5.5" // {
         dependencies = [
           sources."form-data-3.0.0"
@@ -49566,7 +50223,7 @@ in
       })
       sources."brace-expansion-1.1.11"
       sources."braces-2.3.2"
-      sources."browserslist-4.9.1"
+      sources."browserslist-4.11.0"
       sources."buffer-5.5.0"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
@@ -49584,7 +50241,7 @@ in
       sources."callsites-2.0.0"
       sources."camel-case-3.0.0"
       sources."camelcase-4.1.0"
-      sources."caniuse-lite-1.0.30001035"
+      sources."caniuse-lite-1.0.30001036"
       sources."capture-stack-trace-1.0.1"
       sources."cardinal-2.1.1"
       sources."caseless-0.12.0"
@@ -49748,7 +50405,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.3.376"
+      sources."electron-to-chromium-1.3.383"
       sources."elegant-spinner-1.0.1"
       sources."emoji-regex-7.0.3"
       sources."encodeurl-1.0.2"
@@ -49757,7 +50414,7 @@ in
       sources."env-ci-3.2.2"
       sources."envinfo-7.5.0"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.17.4"
+      sources."es-abstract-1.17.5"
       sources."es-to-primitive-1.2.1"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
@@ -49832,7 +50489,7 @@ in
       })
       sources."find-up-3.0.0"
       sources."fkill-6.2.0"
-      sources."flow-parser-0.120.1"
+      sources."flow-parser-0.121.0"
       sources."for-in-1.0.2"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
@@ -49845,7 +50502,7 @@ in
       sources."fs-exists-sync-0.1.0"
       sources."fs-extra-7.0.1"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.2.11"
+      sources."fsevents-1.2.12"
       sources."fswin-2.17.1227"
       sources."function-bind-1.1.1"
       sources."gaze-1.1.3"
@@ -50006,7 +50663,7 @@ in
       sources."is-windows-1.0.2"
       sources."is-wsl-1.1.0"
       sources."isarray-1.0.0"
-      sources."isbinaryfile-4.0.4"
+      sources."isbinaryfile-4.0.5"
       sources."isexe-2.0.0"
       sources."isobject-3.0.1"
       sources."isstream-0.1.2"
@@ -50025,7 +50682,7 @@ in
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
-      sources."json5-2.1.1"
+      sources."json5-2.1.2"
       sources."jsonfile-4.0.0"
       sources."jsprim-1.4.1"
       sources."kind-of-6.0.3"
@@ -50119,11 +50776,7 @@ in
           sources."is-extendable-1.0.1"
         ];
       })
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.4"
       sources."moment-2.24.0"
       sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
@@ -50250,6 +50903,7 @@ in
       sources."pinkie-promise-2.0.1"
       sources."pirates-4.0.1"
       sources."pkg-dir-3.0.0"
+      sources."pkg-up-3.1.0"
       (sources."portfinder-1.0.25" // {
         dependencies = [
           sources."debug-3.2.6"
@@ -50296,7 +50950,7 @@ in
       sources."regenerate-1.4.0"
       sources."regenerate-unicode-properties-8.2.0"
       sources."regenerator-runtime-0.10.5"
-      sources."regenerator-transform-0.14.3"
+      sources."regenerator-transform-0.14.4"
       (sources."regex-not-1.0.2" // {
         dependencies = [
           sources."extend-shallow-3.0.2"
@@ -50325,7 +50979,7 @@ in
       sources."ret-0.1.15"
       sources."retry-0.12.0"
       sources."rimraf-2.7.1"
-      sources."rss-parser-3.7.5"
+      sources."rss-parser-3.7.6"
       sources."run-async-2.4.0"
       sources."rxjs-6.5.4"
       sources."safe-buffer-5.2.0"
@@ -50545,7 +51199,7 @@ in
       sources."treeify-1.1.0"
       sources."trim-repeated-1.0.0"
       sources."ts-invariant-0.4.4"
-      sources."ts-node-8.7.0"
+      sources."ts-node-8.8.1"
       sources."tslib-1.11.1"
       sources."tty-1.0.1"
       sources."tunnel-agent-0.6.0"
@@ -50793,11 +51447,12 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.8.3"
-      sources."@babel/generator-7.8.8"
-      sources."@babel/highlight-7.8.3"
-      sources."@babel/parser-7.8.8"
+      sources."@babel/generator-7.9.4"
+      sources."@babel/helper-validator-identifier-7.9.0"
+      sources."@babel/highlight-7.9.0"
+      sources."@babel/parser-7.9.4"
       sources."@babel/template-7.8.6"
-      sources."@babel/types-7.8.7"
+      sources."@babel/types-7.9.0"
       sources."@webassemblyjs/ast-1.9.0"
       sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
       sources."@webassemblyjs/helper-api-error-1.9.0"
@@ -50819,7 +51474,6 @@ in
       sources."color-name-1.1.3"
       sources."commander-2.20.3"
       sources."escape-string-regexp-1.0.5"
-      sources."esutils-2.0.3"
       sources."has-flag-3.0.0"
       sources."js-tokens-4.0.0"
       sources."jsesc-2.5.2"
@@ -50878,25 +51532,32 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.8.3"
-      (sources."@babel/core-7.8.7" // {
+      (sources."@babel/core-7.9.0" // {
         dependencies = [
           sources."source-map-0.5.7"
         ];
       })
-      (sources."@babel/generator-7.8.8" // {
+      (sources."@babel/generator-7.9.4" // {
         dependencies = [
           sources."source-map-0.5.7"
         ];
       })
       sources."@babel/helper-function-name-7.8.3"
       sources."@babel/helper-get-function-arity-7.8.3"
+      sources."@babel/helper-member-expression-to-functions-7.8.3"
+      sources."@babel/helper-module-imports-7.8.3"
+      sources."@babel/helper-module-transforms-7.9.0"
+      sources."@babel/helper-optimise-call-expression-7.8.3"
+      sources."@babel/helper-replace-supers-7.8.6"
+      sources."@babel/helper-simple-access-7.8.3"
       sources."@babel/helper-split-export-declaration-7.8.3"
-      sources."@babel/helpers-7.8.4"
-      sources."@babel/highlight-7.8.3"
-      sources."@babel/parser-7.8.8"
+      sources."@babel/helper-validator-identifier-7.9.0"
+      sources."@babel/helpers-7.9.2"
+      sources."@babel/highlight-7.9.0"
+      sources."@babel/parser-7.9.4"
       sources."@babel/template-7.8.6"
-      sources."@babel/traverse-7.8.6"
-      sources."@babel/types-7.8.7"
+      sources."@babel/traverse-7.9.0"
+      sources."@babel/types-7.9.0"
       sources."JSV-4.0.2"
       sources."ansi-styles-3.2.1"
       sources."array-unique-0.3.2"
@@ -50915,7 +51576,6 @@ in
       sources."ejs-2.5.7"
       sources."ensure-posix-path-1.1.1"
       sources."escape-string-regexp-1.0.5"
-      sources."esutils-2.0.3"
       sources."fs-extra-5.0.0"
       sources."function-bind-1.1.1"
       sources."gensync-1.0.0-beta.1"
@@ -50942,7 +51602,7 @@ in
       sources."isexe-2.0.0"
       sources."js-tokens-4.0.0"
       sources."jsesc-2.5.2"
-      sources."json5-2.1.1"
+      sources."json5-2.1.2"
       sources."jsonfile-4.0.0"
       sources."jsonlint-1.6.2"
       sources."lodash-4.17.15"
@@ -50990,20 +51650,20 @@ in
   asar = nodeEnv.buildNodePackage {
     name = "asar";
     packageName = "asar";
-    version = "3.0.1";
+    version = "3.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/asar/-/asar-3.0.1.tgz";
-      sha512 = "43sVUKSX0VLNfavair0OLzPoVX5rRdqAxcUUhtwKLGkKQPs2ePreOG7zpp3gZOLvZGhZxixD9JZBxWKgqH8r1g==";
+      url = "https://registry.npmjs.org/asar/-/asar-3.0.2.tgz";
+      sha512 = "nFtY0kToUcMEAY8f6qmeyqn+HZzovwlKsbzf5yjEnzOksFzJLTxWvP2jbzItFT04BdaL3CZKRApTr5iRofVq6g==";
     };
     dependencies = [
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.9.1"
+      sources."@types/node-13.9.3"
       sources."balanced-match-1.0.0"
       sources."brace-expansion-1.1.11"
       sources."chromium-pickle-js-0.2.0"
-      sources."commander-4.1.1"
+      sources."commander-5.0.0"
       sources."concat-map-0.0.1"
       sources."fs.realpath-1.0.0"
       sources."glob-7.1.6"
@@ -51251,11 +51911,7 @@ in
       sources."mime-db-1.43.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.4"
       sources."ms-2.0.0"
       sources."natives-1.1.6"
       sources."normalize-package-data-2.5.0"
@@ -51374,11 +52030,7 @@ in
       sources."defined-1.0.0"
       sources."deps-sort-2.0.1"
       sources."des.js-1.0.1"
-      (sources."detective-5.2.0" // {
-        dependencies = [
-          sources."minimist-1.2.5"
-        ];
-      })
+      sources."detective-5.2.0"
       sources."diffie-hellman-5.0.3"
       sources."domain-browser-1.2.0"
       sources."duplexer2-0.1.4"
@@ -51413,8 +52065,8 @@ in
       sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
+      sources."minimist-1.2.5"
+      sources."mkdirp-0.5.4"
       sources."module-deps-6.2.2"
       sources."object-assign-4.1.1"
       sources."once-1.4.0"
@@ -51460,11 +52112,7 @@ in
       })
       sources."stream-splicer-2.0.1"
       sources."string_decoder-1.3.0"
-      (sources."subarg-1.0.0" // {
-        dependencies = [
-          sources."minimist-1.2.5"
-        ];
-      })
+      sources."subarg-1.0.0"
       sources."syntax-error-1.4.0"
       sources."through-2.3.8"
       sources."through2-2.0.5"
@@ -51629,8 +52277,7 @@ in
       sources."form-data-2.3.3"
       (sources."fs-chunk-store-1.7.0" // {
         dependencies = [
-          sources."minimist-0.0.8"
-          sources."mkdirp-0.5.1"
+          sources."mkdirp-0.5.4"
           sources."thunky-1.1.0"
         ];
       })
@@ -51772,8 +52419,7 @@ in
       sources."query-string-1.0.1"
       (sources."random-access-file-2.1.3" // {
         dependencies = [
-          sources."minimist-0.0.8"
-          sources."mkdirp-0.5.1"
+          sources."mkdirp-0.5.4"
         ];
       })
       sources."random-access-storage-1.4.1"
@@ -52164,13 +52810,13 @@ in
   coc-metals = nodeEnv.buildNodePackage {
     name = "coc-metals";
     packageName = "coc-metals";
-    version = "0.7.2";
+    version = "0.7.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.7.2.tgz";
-      sha512 = "j0pzvL9swPwN4sW/abHRAtm1Pc0TNMT7YwItkA8F90kaUxdfF0JQaR3AvDe1/YxFUlNHU92F2R0g2VAdcSzWEg==";
+      url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.7.4.tgz";
+      sha512 = "5gE7m9/Cm/HYFfW4QcpGdVK9waWTQT0pyxSSrvhIjbRjAYv+uspsCUrg6ODxruIakHaRpvqrdhodRt2cnF0NJg==";
     };
     dependencies = [
-      sources."@babel/runtime-7.8.7"
+      sources."@babel/runtime-7.9.2"
       sources."@chemzqm/neovim-5.1.9"
       sources."async-2.6.3"
       sources."await-semaphore-0.1.3"
@@ -52178,7 +52824,7 @@ in
       sources."brace-expansion-1.1.11"
       sources."bser-2.1.1"
       sources."chownr-1.1.4"
-      sources."coc.nvim-0.0.76"
+      sources."coc.nvim-0.0.77"
       sources."concat-map-0.0.1"
       sources."date-format-2.1.0"
       sources."debounce-1.2.0"
@@ -52224,10 +52870,10 @@ in
         ];
       })
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
+      sources."minimist-1.2.5"
       sources."minipass-2.9.0"
       sources."minizlib-1.3.3"
-      sources."mkdirp-0.5.1"
+      sources."mkdirp-0.5.4"
       sources."ms-2.1.2"
       sources."msgpack-lite-0.1.26"
       (sources."mv-2.1.1" // {
@@ -52241,12 +52887,8 @@ in
       sources."node-int64-0.4.0"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
-      sources."promisify-child-process-3.1.3"
-      (sources."rc-1.2.8" // {
-        dependencies = [
-          sources."minimist-1.2.5"
-        ];
-      })
+      sources."promisify-child-process-3.1.4"
+      sources."rc-1.2.8"
       sources."regenerator-runtime-0.13.5"
       sources."rfc-3986-1.0.1"
       sources."rfdc-1.1.4"
@@ -52314,7 +52956,8 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.8.3"
-      sources."@babel/highlight-7.8.3"
+      sources."@babel/helper-validator-identifier-7.9.0"
+      sources."@babel/highlight-7.9.0"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.3"
       sources."@types/eslint-visitor-keys-1.0.0"
@@ -52369,7 +53012,7 @@ in
       sources."callsites-3.1.0"
       sources."camelcase-2.1.1"
       sources."camelcase-keys-2.1.0"
-      sources."caniuse-lite-1.0.30001035"
+      sources."caniuse-lite-1.0.30001036"
       sources."capture-stack-trace-1.0.1"
       sources."ccount-1.0.5"
       sources."chalk-2.4.2"
@@ -52455,7 +53098,7 @@ in
       sources."domutils-1.7.0"
       sources."dot-prop-5.2.0"
       sources."duplexer3-0.1.4"
-      sources."electron-to-chromium-1.3.376"
+      sources."electron-to-chromium-1.3.383"
       sources."emoji-regex-7.0.3"
       sources."end-of-stream-1.4.4"
       sources."entities-1.1.2"
@@ -52471,7 +53114,11 @@ in
       sources."eslint-visitor-keys-1.1.0"
       sources."espree-5.0.1"
       sources."esprima-4.0.1"
-      sources."esquery-1.1.0"
+      (sources."esquery-1.2.0" // {
+        dependencies = [
+          sources."estraverse-5.0.0"
+        ];
+      })
       sources."esrecurse-4.2.1"
       sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
@@ -52738,23 +53385,19 @@ in
           sources."mimic-fn-2.1.0"
         ];
       })
-      (sources."meow-3.7.0" // {
-        dependencies = [
-          sources."minimist-1.2.5"
-        ];
-      })
+      sources."meow-3.7.0"
       sources."merge2-1.3.0"
       sources."micromatch-2.3.11"
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
+      sources."minimist-1.2.5"
       sources."minimist-options-3.0.2"
       (sources."mixin-deep-1.3.2" // {
         dependencies = [
           sources."is-extendable-1.0.1"
         ];
       })
-      sources."mkdirp-0.5.1"
+      sources."mkdirp-0.5.4"
       sources."ms-2.1.2"
       sources."mute-stream-0.0.7"
       (sources."nanomatch-1.2.13" // {
@@ -52896,11 +53539,7 @@ in
           sources."kind-of-6.0.3"
         ];
       })
-      (sources."rc-1.2.8" // {
-        dependencies = [
-          sources."minimist-1.2.5"
-        ];
-      })
+      sources."rc-1.2.8"
       sources."read-pkg-1.1.0"
       (sources."read-pkg-up-1.0.1" // {
         dependencies = [
@@ -53046,7 +53685,6 @@ in
           sources."load-json-file-4.0.0"
           sources."map-obj-2.0.0"
           sources."meow-4.0.1"
-          sources."minimist-1.2.5"
           sources."parse-json-4.0.0"
           sources."path-type-3.0.0"
           sources."read-pkg-3.0.0"
@@ -53291,27 +53929,34 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.8.3"
-      (sources."@babel/core-7.8.7" // {
+      (sources."@babel/core-7.9.0" // {
         dependencies = [
           sources."semver-5.7.1"
         ];
       })
-      sources."@babel/generator-7.8.8"
+      sources."@babel/generator-7.9.4"
       sources."@babel/helper-function-name-7.8.3"
       sources."@babel/helper-get-function-arity-7.8.3"
+      sources."@babel/helper-member-expression-to-functions-7.8.3"
+      sources."@babel/helper-module-imports-7.8.3"
+      sources."@babel/helper-module-transforms-7.9.0"
+      sources."@babel/helper-optimise-call-expression-7.8.3"
+      sources."@babel/helper-replace-supers-7.8.6"
+      sources."@babel/helper-simple-access-7.8.3"
       sources."@babel/helper-split-export-declaration-7.8.3"
-      sources."@babel/helpers-7.8.4"
-      sources."@babel/highlight-7.8.3"
-      sources."@babel/parser-7.8.8"
+      sources."@babel/helper-validator-identifier-7.9.0"
+      sources."@babel/helpers-7.9.2"
+      sources."@babel/highlight-7.9.0"
+      sources."@babel/parser-7.9.4"
       sources."@babel/template-7.8.6"
-      sources."@babel/traverse-7.8.6"
-      sources."@babel/types-7.8.7"
+      sources."@babel/traverse-7.9.0"
+      sources."@babel/types-7.9.0"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.3"
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.9.1"
+      sources."@types/node-13.9.3"
       sources."@types/unist-2.0.3"
       sources."@types/vfile-3.0.2"
       sources."@types/vfile-message-2.0.0"
@@ -53336,7 +53981,7 @@ in
       sources."assign-symbols-1.0.0"
       sources."astral-regex-1.0.0"
       sources."atob-2.1.2"
-      (sources."autoprefixer-9.7.4" // {
+      (sources."autoprefixer-9.7.5" // {
         dependencies = [
           sources."postcss-value-parser-4.0.3"
         ];
@@ -53354,7 +53999,7 @@ in
           sources."extend-shallow-2.0.1"
         ];
       })
-      sources."browserslist-4.9.1"
+      sources."browserslist-4.11.0"
       sources."cache-base-1.0.1"
       sources."call-me-maybe-1.0.1"
       sources."caller-callsite-2.0.0"
@@ -53362,7 +54007,7 @@ in
       sources."callsites-2.0.0"
       sources."camelcase-4.1.0"
       sources."camelcase-keys-4.2.0"
-      sources."caniuse-lite-1.0.30001035"
+      sources."caniuse-lite-1.0.30001036"
       sources."ccount-1.0.5"
       sources."chalk-2.4.2"
       sources."character-entities-1.2.4"
@@ -53421,13 +54066,12 @@ in
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
       sources."dot-prop-5.2.0"
-      sources."electron-to-chromium-1.3.376"
+      sources."electron-to-chromium-1.3.383"
       sources."emoji-regex-8.0.0"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
-      sources."esutils-2.0.3"
       sources."execall-2.0.0"
       (sources."expand-brackets-2.1.4" // {
         dependencies = [
@@ -53474,7 +54118,7 @@ in
           sources."extend-shallow-2.0.1"
         ];
       })
-      sources."find-up-2.1.0"
+      sources."find-up-3.0.0"
       sources."flat-cache-2.0.1"
       sources."flatted-2.0.1"
       sources."for-in-1.0.2"
@@ -53565,11 +54209,7 @@ in
       sources."jsesc-2.5.2"
       sources."json-parse-better-errors-1.0.2"
       sources."json-schema-traverse-0.4.1"
-      (sources."json5-2.1.1" // {
-        dependencies = [
-          sources."minimist-1.2.5"
-        ];
-      })
+      sources."json5-2.1.2"
       sources."kind-of-6.0.3"
       sources."known-css-properties-0.14.0"
       sources."leven-3.1.0"
@@ -53578,7 +54218,7 @@ in
           sources."pify-3.0.0"
         ];
       })
-      sources."locate-path-2.0.0"
+      sources."locate-path-3.0.0"
       sources."lodash-4.17.15"
       sources."log-symbols-3.0.0"
       sources."longest-streak-2.0.4"
@@ -53601,14 +54241,14 @@ in
         ];
       })
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
+      sources."minimist-1.2.5"
       sources."minimist-options-3.0.2"
       (sources."mixin-deep-1.3.2" // {
         dependencies = [
           sources."is-extendable-1.0.1"
         ];
       })
-      sources."mkdirp-0.5.1"
+      sources."mkdirp-0.5.4"
       sources."ms-2.1.2"
       sources."nanomatch-1.2.13"
       sources."node-releases-1.1.52"
@@ -53636,9 +54276,9 @@ in
       sources."object-visit-1.0.1"
       sources."object.pick-1.3.0"
       sources."once-1.4.0"
-      sources."p-limit-1.3.0"
-      sources."p-locate-2.0.0"
-      sources."p-try-1.0.0"
+      sources."p-limit-2.2.2"
+      sources."p-locate-3.0.0"
+      sources."p-try-2.2.0"
       sources."parse-entities-1.2.2"
       sources."parse-json-4.0.0"
       sources."pascalcase-0.1.1"
@@ -53651,8 +54291,9 @@ in
           sources."pify-3.0.0"
         ];
       })
-      sources."picomatch-2.2.1"
+      sources."picomatch-2.2.2"
       sources."pify-4.0.1"
+      sources."pkg-up-3.1.0"
       sources."posix-character-classes-0.1.1"
       (sources."postcss-7.0.27" // {
         dependencies = [
@@ -53680,7 +54321,15 @@ in
       sources."punycode-2.1.1"
       sources."quick-lru-1.1.0"
       sources."read-pkg-3.0.0"
-      sources."read-pkg-up-3.0.0"
+      (sources."read-pkg-up-3.0.0" // {
+        dependencies = [
+          sources."find-up-2.1.0"
+          sources."locate-path-2.0.0"
+          sources."p-limit-1.3.0"
+          sources."p-locate-2.0.0"
+          sources."p-try-1.0.0"
+        ];
+      })
       sources."readable-stream-3.6.0"
       sources."redent-2.0.0"
       sources."regex-not-1.0.2"
@@ -53894,7 +54543,8 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.8.3"
-      sources."@babel/highlight-7.8.3"
+      sources."@babel/helper-validator-identifier-7.9.0"
+      sources."@babel/highlight-7.9.0"
       sources."ansi-styles-3.2.1"
       sources."argparse-1.0.10"
       sources."balanced-match-1.0.0"
@@ -53908,7 +54558,6 @@ in
       sources."diff-4.0.2"
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
-      sources."esutils-2.0.3"
       sources."fs.realpath-1.0.0"
       sources."glob-7.1.6"
       sources."has-flag-3.0.0"
@@ -53917,8 +54566,8 @@ in
       sources."js-tokens-4.0.0"
       sources."js-yaml-3.13.1"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
+      sources."minimist-1.2.5"
+      sources."mkdirp-0.5.4"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.6"
@@ -53978,13 +54627,13 @@ in
   coc-tsserver = nodeEnv.buildNodePackage {
     name = "coc-tsserver";
     packageName = "coc-tsserver";
-    version = "1.4.11";
+    version = "1.4.12";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.4.11.tgz";
-      sha512 = "BMqtvulotRQwgQ/UkpGDz7b+tXXQGbxYJLo3SdmFeDeVkWLBGl/oP1ythlT3aY5K3kuCv0JnDgqpoAc175CERg==";
+      url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.4.12.tgz";
+      sha512 = "JMlIDCgTBXAWh6jsY1c6aMXw50jGRMZoiAYKhX0sYVKrDZznS2ocjKw4m/9yoNPWHIH6gk89BGXXT+7XhtsGWw==";
     };
     dependencies = [
-      sources."typescript-3.7.3"
+      sources."typescript-3.8.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -53999,38 +54648,80 @@ in
   coc-vetur = nodeEnv.buildNodePackage {
     name = "coc-vetur";
     packageName = "coc-vetur";
-    version = "1.1.7";
+    version = "1.1.9";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.1.7.tgz";
-      sha512 = "QhVgqvOAMR/ehil8o+FezjRO6D0j8t/f5Uhn3bBY4dkAoJ0LbYHz+YNT+N0JPRYVgAJQFfRjHVdymWXRuf16wA==";
+      url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.1.9.tgz";
+      sha512 = "lF5s1hBM/92ZKW9JEjkYrbYYuvjcYirBy+8YgDH0s50iV0pVxd8vBGS/x3z50VNRLx2yp6Elu6bDXAQclp/X5g==";
     };
     dependencies = [
       sources."@babel/code-frame-7.8.3"
-      sources."@babel/highlight-7.8.3"
+      sources."@babel/helper-validator-identifier-7.9.0"
+      sources."@babel/highlight-7.9.0"
       sources."@emmetio/extract-abbreviation-0.1.6"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
+      (sources."@nodelib/fs.scandir-2.1.3" // {
+        dependencies = [
+          sources."@nodelib/fs.stat-2.0.3"
+        ];
+      })
       sources."@nodelib/fs.stat-1.1.3"
-      sources."@starptech/expression-parser-0.9.0"
-      sources."@starptech/hast-util-from-webparser-0.9.0"
-      sources."@starptech/prettyhtml-0.9.0"
-      sources."@starptech/prettyhtml-formatter-0.9.0"
-      sources."@starptech/prettyhtml-hast-to-html-0.9.0"
-      sources."@starptech/prettyhtml-hastscript-0.9.0"
-      sources."@starptech/prettyhtml-sort-attributes-0.9.0"
-      sources."@starptech/rehype-minify-whitespace-0.9.0"
-      sources."@starptech/rehype-webparser-0.9.0"
-      sources."@starptech/webparser-0.9.0"
-      sources."@types/node-13.9.1"
+      sources."@nodelib/fs.walk-1.2.4"
+      sources."@sindresorhus/is-0.14.0"
+      sources."@sorg/log-2.1.0"
+      sources."@starptech/expression-parser-0.10.0"
+      sources."@starptech/hast-util-from-webparser-0.10.0"
+      sources."@starptech/prettyhtml-0.10.0"
+      sources."@starptech/prettyhtml-formatter-0.10.0"
+      sources."@starptech/prettyhtml-hast-to-html-0.10.0"
+      sources."@starptech/prettyhtml-hastscript-0.10.0"
+      sources."@starptech/prettyhtml-sort-attributes-0.10.0"
+      sources."@starptech/rehype-minify-whitespace-0.10.0"
+      sources."@starptech/rehype-webparser-0.10.0"
+      sources."@starptech/webparser-0.10.0"
+      sources."@szmarczak/http-timer-1.1.2"
+      sources."@types/color-name-1.1.1"
+      sources."@types/eslint-visitor-keys-1.0.0"
+      sources."@types/events-3.0.0"
+      sources."@types/glob-7.1.1"
+      sources."@types/json-schema-7.0.4"
+      sources."@types/minimatch-3.0.3"
+      sources."@types/node-13.9.3"
+      sources."@types/normalize-package-data-2.4.0"
       sources."@types/unist-2.0.3"
       sources."@types/vfile-3.0.2"
       sources."@types/vfile-message-2.0.0"
+      (sources."@typescript-eslint/experimental-utils-1.13.0" // {
+        dependencies = [
+          sources."eslint-scope-4.0.3"
+        ];
+      })
+      sources."@typescript-eslint/parser-1.13.0"
+      (sources."@typescript-eslint/typescript-estree-1.13.0" // {
+        dependencies = [
+          sources."semver-5.5.0"
+        ];
+      })
       sources."abbrev-1.1.1"
-      sources."acorn-6.4.1"
+      sources."acorn-7.1.1"
       sources."acorn-jsx-5.2.0"
+      (sources."aggregate-error-3.0.1" // {
+        dependencies = [
+          sources."indent-string-4.0.0"
+        ];
+      })
       sources."ajv-6.12.0"
-      sources."ajv-keywords-2.1.1"
-      sources."ansi-align-2.0.0"
-      sources."ansi-escapes-3.2.0"
+      (sources."ansi-align-3.0.0" // {
+        dependencies = [
+          sources."ansi-regex-4.1.0"
+          sources."string-width-3.1.0"
+          sources."strip-ansi-5.2.0"
+        ];
+      })
+      (sources."ansi-escapes-4.3.1" // {
+        dependencies = [
+          sources."type-fest-0.11.0"
+        ];
+      })
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
       (sources."anymatch-1.3.2" // {
@@ -54062,17 +54753,6 @@ in
       sources."async-1.5.2"
       sources."async-each-1.0.3"
       sources."atob-2.1.2"
-      (sources."babel-code-frame-6.26.0" // {
-        dependencies = [
-          sources."ansi-regex-2.1.1"
-          sources."ansi-styles-2.2.1"
-          sources."chalk-1.1.3"
-          sources."js-tokens-3.0.2"
-          sources."strip-ansi-3.0.1"
-          sources."supports-color-2.0.0"
-        ];
-      })
-      sources."babel-runtime-6.26.0"
       sources."bail-1.0.5"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
@@ -54083,7 +54763,14 @@ in
       sources."binary-extensions-1.13.1"
       sources."bindings-1.5.0"
       sources."bootstrap-vue-helper-json-1.1.1"
-      sources."boxen-1.3.0"
+      (sources."boxen-3.2.0" // {
+        dependencies = [
+          sources."ansi-regex-4.1.0"
+          sources."camelcase-5.3.1"
+          sources."string-width-3.1.0"
+          sources."strip-ansi-5.2.0"
+        ];
+      })
       sources."brace-expansion-1.1.11"
       (sources."braces-2.3.2" // {
         dependencies = [
@@ -54094,16 +54781,16 @@ in
       sources."buffer-from-1.1.1"
       sources."builtin-modules-1.1.1"
       sources."cache-base-1.0.1"
-      sources."call-me-maybe-1.0.1"
-      (sources."caller-path-0.1.0" // {
+      (sources."cacheable-request-6.1.0" // {
         dependencies = [
-          sources."callsites-0.2.0"
+          sources."get-stream-5.1.0"
+          sources."lowercase-keys-2.0.0"
         ];
       })
+      sources."call-me-maybe-1.0.1"
       sources."callsites-3.1.0"
       sources."camelcase-4.1.0"
       sources."camelcase-keys-4.2.0"
-      sources."capture-stack-trace-1.0.1"
       sources."ccount-1.0.5"
       sources."chalk-2.4.2"
       sources."character-entities-1.2.4"
@@ -54118,8 +54805,7 @@ in
           sources."is-glob-2.0.1"
         ];
       })
-      sources."ci-info-1.6.0"
-      sources."circular-json-0.3.3"
+      sources."ci-info-2.0.0"
       (sources."class-utils-0.3.6" // {
         dependencies = [
           sources."define-property-0.2.5"
@@ -54138,12 +54824,13 @@ in
           sources."kind-of-5.1.0"
         ];
       })
-      sources."cli-boxes-1.0.0"
-      sources."cli-cursor-2.1.0"
+      sources."clean-stack-2.2.0"
+      sources."cli-boxes-2.2.0"
+      sources."cli-cursor-3.1.0"
       sources."cli-width-2.2.0"
       sources."cliui-4.1.0"
       sources."clone-1.0.4"
-      sources."co-4.6.0"
+      sources."clone-response-1.0.2"
       sources."code-point-at-1.1.0"
       sources."collapse-white-space-1.0.6"
       sources."collection-visit-1.0.0"
@@ -54162,11 +54849,10 @@ in
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
       sources."config-chain-1.1.12"
-      sources."configstore-3.1.2"
+      sources."configstore-4.0.0"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-2.6.11"
+      sources."core-js-3.6.4"
       sources."core-util-is-1.0.2"
-      sources."create-error-class-3.0.2"
       sources."cross-spawn-5.1.0"
       sources."crypto-random-string-1.0.0"
       (sources."css-2.2.4" // {
@@ -54175,6 +54861,7 @@ in
         ];
       })
       sources."css-parse-2.0.0"
+      sources."csstype-2.6.9"
       sources."currently-unhandled-0.4.1"
       sources."debug-3.2.6"
       sources."decamelize-1.2.0"
@@ -54184,10 +54871,32 @@ in
         ];
       })
       sources."decode-uri-component-0.2.0"
+      sources."decompress-response-3.3.0"
       sources."deep-extend-0.6.0"
       sources."deep-is-0.1.3"
       sources."defaults-1.0.3"
+      sources."defer-to-connect-1.1.3"
       sources."define-property-2.0.2"
+      (sources."del-5.1.0" // {
+        dependencies = [
+          sources."@nodelib/fs.stat-2.0.3"
+          sources."array-union-2.1.0"
+          sources."braces-3.0.2"
+          sources."dir-glob-3.0.1"
+          sources."fast-glob-3.2.2"
+          sources."fill-range-7.0.1"
+          sources."globby-10.0.2"
+          sources."ignore-5.1.4"
+          sources."is-number-7.0.0"
+          sources."is-path-inside-3.0.2"
+          sources."micromatch-4.0.2"
+          sources."path-type-4.0.0"
+          sources."rimraf-3.0.2"
+          sources."slash-3.0.0"
+          sources."to-regex-range-5.0.1"
+        ];
+      })
+      sources."del-cli-3.0.0"
       sources."diff-4.0.2"
       sources."dir-glob-2.0.0"
       sources."dlv-1.1.3"
@@ -54200,26 +54909,32 @@ in
       sources."end-of-stream-1.4.4"
       sources."error-ex-1.3.2"
       sources."escape-string-regexp-1.0.5"
-      (sources."eslint-5.16.0" // {
+      (sources."eslint-6.8.0" // {
         dependencies = [
-          sources."cross-spawn-6.0.5"
+          sources."ansi-regex-4.1.0"
+          (sources."cross-spawn-6.0.5" // {
+            dependencies = [
+              sources."semver-5.7.1"
+            ];
+          })
           sources."debug-4.1.1"
           sources."ignore-4.0.6"
+          sources."semver-6.3.0"
+          sources."strip-ansi-5.2.0"
+          sources."strip-json-comments-3.0.1"
         ];
       })
-      (sources."eslint-plugin-vue-5.2.3" // {
-        dependencies = [
-          sources."debug-4.1.1"
-          sources."espree-4.1.0"
-          sources."vue-eslint-parser-5.0.0"
-        ];
-      })
-      sources."eslint-scope-4.0.3"
+      sources."eslint-plugin-vue-6.2.2"
+      sources."eslint-scope-5.0.0"
       sources."eslint-utils-1.4.3"
       sources."eslint-visitor-keys-1.1.0"
-      sources."espree-5.0.1"
+      sources."espree-6.2.1"
       sources."esprima-4.0.1"
-      sources."esquery-1.1.0"
+      (sources."esquery-1.2.0" // {
+        dependencies = [
+          sources."estraverse-5.0.0"
+        ];
+      })
       sources."esrecurse-4.2.1"
       sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
@@ -54268,11 +54983,20 @@ in
         ];
       })
       sources."fast-deep-equal-3.1.1"
-      sources."fast-glob-2.2.7"
+      (sources."fast-glob-2.2.7" // {
+        dependencies = [
+          (sources."glob-parent-3.1.0" // {
+            dependencies = [
+              sources."is-glob-3.1.0"
+            ];
+          })
+        ];
+      })
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-2.0.6"
+      sources."fastq-1.6.1"
       sources."fault-1.0.4"
-      sources."figures-2.0.0"
+      sources."figures-3.2.0"
       sources."file-entry-cache-5.0.1"
       sources."file-uri-to-path-1.0.0"
       sources."filename-regex-2.0.1"
@@ -54290,7 +55014,7 @@ in
       sources."format-0.2.2"
       sources."fragment-cache-0.2.1"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.2.11"
+      sources."fsevents-1.2.12"
       sources."function-bind-1.1.1"
       sources."functional-red-black-tree-1.0.1"
       sources."get-caller-file-1.0.3"
@@ -54304,16 +55028,20 @@ in
           sources."is-glob-2.0.1"
         ];
       })
-      (sources."glob-parent-3.1.0" // {
-        dependencies = [
-          sources."is-glob-3.1.0"
-        ];
-      })
+      sources."glob-parent-5.1.1"
       sources."glob-to-regexp-0.3.0"
       sources."global-dirs-0.1.1"
-      sources."globals-11.12.0"
+      (sources."globals-12.4.0" // {
+        dependencies = [
+          sources."type-fest-0.8.1"
+        ];
+      })
       sources."globby-8.0.2"
-      sources."got-6.7.1"
+      (sources."got-9.6.0" // {
+        dependencies = [
+          sources."get-stream-4.1.0"
+        ];
+      })
       sources."graceful-fs-4.2.3"
       sources."gridsome-helper-json-1.0.3"
       sources."has-1.0.3"
@@ -54330,16 +55058,18 @@ in
           sources."kind-of-4.0.0"
         ];
       })
+      sources."has-yarn-2.1.0"
       sources."hast-util-embedded-1.0.5"
       sources."hast-util-has-property-1.0.4"
-      sources."hast-util-is-body-ok-link-1.0.2"
+      sources."hast-util-is-body-ok-link-1.0.3"
       sources."hast-util-is-element-1.0.4"
       sources."hast-util-parse-selector-2.2.4"
-      sources."hast-util-to-string-1.0.2"
+      sources."hast-util-to-string-1.0.3"
       sources."hast-util-whitespace-1.0.4"
       sources."hosted-git-info-2.8.8"
       sources."html-void-elements-1.0.5"
-      sources."html-whitespace-sensitive-tag-names-1.0.1"
+      sources."html-whitespace-sensitive-tag-names-1.0.2"
+      sources."http-cache-semantics-4.1.0"
       sources."iconv-lite-0.4.24"
       sources."ignore-3.3.10"
       (sources."import-fresh-3.2.1" // {
@@ -54353,10 +55083,19 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
-      (sources."inquirer-6.5.2" // {
+      (sources."inquirer-7.1.0" // {
         dependencies = [
-          sources."ansi-regex-4.1.0"
-          sources."strip-ansi-5.2.0"
+          sources."ansi-regex-5.0.0"
+          sources."ansi-styles-4.2.1"
+          sources."chalk-3.0.0"
+          sources."color-convert-2.0.1"
+          sources."color-name-1.1.4"
+          sources."emoji-regex-8.0.0"
+          sources."has-flag-4.0.0"
+          sources."is-fullwidth-code-point-3.0.0"
+          sources."string-width-4.2.0"
+          sources."strip-ansi-6.0.0"
+          sources."supports-color-7.1.0"
         ];
       })
       sources."invert-kv-2.0.0"
@@ -54366,7 +55105,7 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-2.0.4"
-      sources."is-ci-1.2.1"
+      sources."is-ci-2.0.0"
       sources."is-data-descriptor-1.0.0"
       sources."is-decimal-1.0.4"
       sources."is-descriptor-1.0.2"
@@ -54380,7 +55119,7 @@ in
       sources."is-hexadecimal-1.0.4"
       sources."is-hidden-1.1.3"
       sources."is-installed-globally-0.1.0"
-      sources."is-npm-1.0.0"
+      sources."is-npm-3.0.0"
       (sources."is-number-3.0.0" // {
         dependencies = [
           sources."is-buffer-1.1.6"
@@ -54389,33 +55128,35 @@ in
       })
       sources."is-obj-1.0.1"
       sources."is-object-1.0.1"
+      sources."is-path-cwd-2.2.0"
       sources."is-path-inside-1.0.1"
       sources."is-plain-obj-1.1.0"
       sources."is-plain-object-2.0.4"
       sources."is-posix-bracket-0.1.1"
       sources."is-primitive-2.0.0"
       sources."is-promise-2.1.0"
-      sources."is-redirect-1.0.0"
-      sources."is-resolvable-1.1.0"
-      sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
       sources."is-utf8-0.2.1"
       sources."is-windows-1.0.2"
+      sources."is-yarn-global-0.3.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
       sources."isobject-3.0.1"
       sources."js-beautify-1.10.3"
       sources."js-tokens-4.0.0"
       sources."js-yaml-3.13.1"
+      sources."json-buffer-3.0.0"
       sources."json-parse-better-errors-1.0.2"
       sources."json-schema-traverse-0.4.1"
       sources."json-stable-stringify-without-jsonify-1.0.1"
-      sources."json5-2.1.1"
+      sources."json5-2.1.2"
       sources."jsonc-parser-1.0.3"
+      sources."keyv-3.1.0"
       sources."kind-of-6.0.3"
-      sources."latest-version-3.1.0"
+      sources."latest-version-5.1.0"
       sources."lcid-2.0.0"
       sources."levn-0.3.0"
+      sources."lines-and-columns-1.1.6"
       sources."load-json-file-4.0.0"
       sources."load-plugin-2.3.1"
       sources."locate-path-2.0.0"
@@ -54448,11 +55189,7 @@ in
       sources."map-visit-1.0.0"
       sources."markdown-table-0.4.0"
       sources."math-random-1.0.4"
-      (sources."mem-4.3.0" // {
-        dependencies = [
-          sources."mimic-fn-2.1.0"
-        ];
-      })
+      sources."mem-4.3.0"
       (sources."meow-5.0.0" // {
         dependencies = [
           sources."read-pkg-up-3.0.0"
@@ -54460,7 +55197,8 @@ in
       })
       sources."merge2-1.3.0"
       sources."micromatch-3.1.10"
-      sources."mimic-fn-1.2.0"
+      sources."mimic-fn-2.1.0"
+      sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       sources."minimist-options-3.0.2"
@@ -54469,21 +55207,19 @@ in
           sources."is-extendable-1.0.1"
         ];
       })
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.4"
       sources."mout-0.5.0"
       sources."ms-2.1.2"
-      sources."mute-stream-0.0.7"
+      sources."mute-stream-0.0.8"
       sources."nan-2.14.0"
       sources."nanomatch-1.2.13"
       sources."natural-compare-1.4.0"
       sources."nice-try-1.0.5"
+      sources."node-fetch-2.6.0"
       sources."nopt-4.0.3"
       sources."normalize-package-data-2.5.0"
       sources."normalize-path-2.1.1"
+      sources."normalize-url-4.5.0"
       sources."npm-prefix-1.2.0"
       sources."npm-run-path-2.0.2"
       sources."number-is-nan-1.0.1"
@@ -54507,7 +55243,7 @@ in
       sources."object.omit-2.0.1"
       sources."object.pick-1.3.0"
       sources."once-1.4.0"
-      sources."onetime-2.0.1"
+      sources."onetime-5.1.0"
       sources."optionator-0.8.3"
       sources."os-homedir-1.0.2"
       (sources."os-locale-3.1.0" // {
@@ -54519,13 +55255,19 @@ in
       })
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
+      sources."p-cancelable-1.1.0"
       sources."p-defer-1.0.0"
       sources."p-finally-1.0.0"
       sources."p-is-promise-2.1.0"
       sources."p-limit-1.3.0"
       sources."p-locate-2.0.0"
+      sources."p-map-3.0.0"
       sources."p-try-1.0.0"
-      sources."package-json-4.0.1"
+      (sources."package-json-6.5.0" // {
+        dependencies = [
+          sources."semver-6.3.0"
+        ];
+      })
       sources."parent-module-1.0.1"
       sources."parse-entities-1.2.2"
       sources."parse-gitignore-1.0.1"
@@ -54544,6 +55286,7 @@ in
       sources."path-key-2.0.1"
       sources."path-parse-1.0.6"
       sources."path-type-3.0.0"
+      sources."picomatch-2.2.2"
       sources."pify-3.0.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
@@ -54557,38 +55300,45 @@ in
           sources."strip-bom-2.0.0"
         ];
       })
-      sources."pluralize-7.0.0"
       sources."posix-character-classes-0.1.1"
       sources."prelude-ls-1.1.2"
-      sources."prepend-http-1.0.4"
+      sources."prepend-http-2.0.0"
       sources."preserve-0.2.0"
       sources."prettier-1.19.1"
-      (sources."prettier-eslint-8.8.2" // {
+      (sources."prettier-eslint-9.0.1" // {
         dependencies = [
-          sources."acorn-5.7.4"
+          sources."acorn-6.4.1"
           (sources."acorn-jsx-3.0.1" // {
             dependencies = [
               sources."acorn-3.3.0"
             ];
           })
-          sources."ajv-5.5.2"
-          sources."chardet-0.4.2"
-          sources."doctrine-2.1.0"
-          sources."eslint-4.19.1"
-          sources."eslint-scope-3.7.3"
-          sources."espree-3.5.4"
-          sources."external-editor-2.2.0"
-          sources."fast-deep-equal-1.1.0"
-          sources."file-entry-cache-2.0.0"
-          sources."flat-cache-1.3.4"
-          sources."inquirer-3.3.0"
-          sources."json-schema-traverse-0.3.1"
-          sources."regexpp-1.1.0"
-          sources."slice-ansi-1.0.0"
-          sources."table-4.0.2"
-          sources."typescript-2.9.2"
-          sources."vue-eslint-parser-2.0.3"
-          sources."write-0.2.1"
+          sources."ansi-escapes-3.2.0"
+          sources."ansi-regex-4.1.0"
+          sources."cli-cursor-2.1.0"
+          sources."cross-spawn-6.0.5"
+          sources."debug-4.1.1"
+          sources."eslint-5.16.0"
+          sources."eslint-scope-4.0.3"
+          sources."espree-5.0.1"
+          sources."figures-2.0.0"
+          sources."globals-11.12.0"
+          sources."ignore-4.0.6"
+          sources."indent-string-4.0.0"
+          sources."inquirer-6.5.2"
+          sources."mimic-fn-1.2.0"
+          sources."mute-stream-0.0.7"
+          sources."onetime-2.0.1"
+          sources."restore-cursor-2.0.0"
+          sources."strip-ansi-5.2.0"
+          (sources."vue-eslint-parser-2.0.3" // {
+            dependencies = [
+              sources."acorn-5.7.4"
+              sources."debug-3.2.6"
+              sources."eslint-scope-3.7.3"
+              sources."espree-3.5.4"
+            ];
+          })
         ];
       })
       sources."prettier-tslint-0.4.2"
@@ -54608,24 +55358,31 @@ in
       })
       sources."rc-1.2.8"
       sources."read-pkg-3.0.0"
-      (sources."read-pkg-up-4.0.0" // {
+      (sources."read-pkg-up-7.0.1" // {
         dependencies = [
-          sources."find-up-3.0.0"
-          sources."locate-path-3.0.0"
+          sources."find-up-4.1.0"
+          sources."locate-path-5.0.0"
           sources."p-limit-2.2.2"
-          sources."p-locate-3.0.0"
+          sources."p-locate-4.1.0"
           sources."p-try-2.2.0"
+          sources."parse-json-5.0.0"
+          sources."path-exists-4.0.0"
+          (sources."read-pkg-5.2.0" // {
+            dependencies = [
+              sources."type-fest-0.6.0"
+            ];
+          })
+          sources."type-fest-0.8.1"
         ];
       })
       sources."readable-stream-2.3.7"
       sources."readdirp-2.2.1"
       sources."redent-2.0.0"
-      sources."regenerator-runtime-0.11.1"
       sources."regex-cache-0.4.4"
       sources."regex-not-1.0.2"
       sources."regexpp-2.0.1"
-      sources."registry-auth-token-3.4.0"
-      sources."registry-url-3.1.0"
+      sources."registry-auth-token-4.1.1"
+      sources."registry-url-5.1.0"
       sources."rehype-sort-attribute-values-2.0.1"
       (sources."remark-5.1.0" // {
         dependencies = [
@@ -54646,24 +55403,22 @@ in
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."require-relative-0.8.7"
-      (sources."require-uncached-1.0.3" // {
-        dependencies = [
-          sources."resolve-from-1.0.1"
-        ];
-      })
       sources."resolve-1.15.1"
       sources."resolve-from-5.0.0"
       sources."resolve-url-0.2.1"
-      sources."restore-cursor-2.0.0"
+      sources."responselike-1.0.2"
+      sources."restore-cursor-3.1.0"
       sources."ret-0.1.15"
+      sources."reusify-1.0.4"
       sources."rimraf-2.6.3"
       sources."run-async-2.4.0"
-      sources."rx-lite-4.0.8"
-      sources."rx-lite-aggregates-4.0.8"
+      sources."run-parallel-1.1.9"
       sources."rxjs-6.5.4"
+      sources."s.color-0.0.13"
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
+      sources."sass-formatter-0.4.4"
       sources."sax-1.2.4"
       sources."semver-5.7.1"
       sources."semver-diff-2.1.0"
@@ -54788,6 +55543,9 @@ in
         ];
       })
       sources."stylus-supremacy-2.14.0"
+      sources."suf-cli-0.1.1"
+      sources."suf-node-1.1.1"
+      sources."suf-regex-0.0.14"
       sources."supports-color-5.5.0"
       sources."symbol-0.2.3"
       (sources."table-5.4.6" // {
@@ -54800,7 +55558,6 @@ in
       sources."term-size-1.2.0"
       sources."text-table-0.2.0"
       sources."through-2.3.8"
-      sources."timed-out-4.0.1"
       sources."tmp-0.0.33"
       (sources."to-object-path-0.3.0" // {
         dependencies = [
@@ -54808,13 +55565,10 @@ in
           sources."kind-of-3.2.2"
         ];
       })
+      sources."to-readable-stream-1.0.0"
       sources."to-regex-3.0.2"
       sources."to-regex-range-2.1.1"
-      (sources."to-vfile-5.0.3" // {
-        dependencies = [
-          sources."vfile-3.0.1"
-        ];
-      })
+      sources."to-vfile-6.1.0"
       sources."trim-0.0.1"
       sources."trim-newlines-2.0.0"
       sources."trim-trailing-lines-1.1.3"
@@ -54823,23 +55577,28 @@ in
       sources."tslint-5.20.1"
       sources."tsutils-2.29.0"
       sources."type-check-0.3.2"
+      sources."type-fest-0.3.1"
       sources."typedarray-0.0.6"
       sources."typescript-3.8.3"
-      (sources."typescript-eslint-parser-16.0.1" // {
-        dependencies = [
-          sources."semver-5.5.0"
-        ];
-      })
       sources."unherit-1.1.3"
       (sources."unified-7.1.0" // {
         dependencies = [
+          sources."unist-util-stringify-position-1.1.2"
           sources."vfile-3.0.1"
+          sources."vfile-message-1.1.1"
         ];
       })
       (sources."unified-engine-6.0.1" // {
         dependencies = [
           sources."to-vfile-4.0.0"
+          sources."unist-util-stringify-position-1.1.2"
           sources."vfile-3.0.1"
+          sources."vfile-message-1.1.1"
+          (sources."vfile-reporter-5.1.2" // {
+            dependencies = [
+              sources."unist-util-stringify-position-2.0.3"
+            ];
+          })
         ];
       })
       sources."union-value-1.0.1"
@@ -54849,7 +55608,7 @@ in
       sources."unist-util-is-2.1.3"
       sources."unist-util-modify-children-1.1.6"
       sources."unist-util-remove-position-1.1.4"
-      sources."unist-util-stringify-position-1.1.2"
+      sources."unist-util-stringify-position-2.0.3"
       sources."unist-util-visit-1.4.1"
       (sources."unist-util-visit-parents-2.1.2" // {
         dependencies = [
@@ -54867,30 +55626,31 @@ in
         ];
       })
       sources."untildify-2.1.0"
-      sources."unzip-response-2.0.1"
-      sources."update-notifier-2.5.0"
+      sources."update-notifier-3.0.1"
       sources."uri-js-4.2.2"
       sources."urix-0.1.0"
-      sources."url-parse-lax-1.0.0"
+      sources."url-parse-lax-3.0.0"
       sources."use-3.1.1"
       sources."user-home-2.0.0"
       sources."util-deprecate-1.0.2"
+      sources."v8-compile-cache-2.1.0"
       sources."validate-npm-package-license-3.0.4"
-      (sources."vfile-4.0.3" // {
-        dependencies = [
-          sources."unist-util-stringify-position-2.0.3"
-          sources."vfile-message-2.0.3"
-        ];
-      })
+      sources."vfile-4.0.3"
       sources."vfile-location-2.0.6"
-      sources."vfile-message-1.1.1"
-      (sources."vfile-reporter-5.1.2" // {
+      sources."vfile-message-2.0.3"
+      (sources."vfile-reporter-6.0.1" // {
         dependencies = [
-          sources."unist-util-stringify-position-2.0.3"
+          sources."ansi-regex-5.0.0"
+          sources."emoji-regex-8.0.0"
+          sources."is-fullwidth-code-point-3.0.0"
+          sources."string-width-4.2.0"
+          sources."strip-ansi-6.0.0"
+          sources."supports-color-6.1.0"
         ];
       })
       sources."vfile-sort-2.2.2"
       sources."vfile-statistics-1.1.4"
+      sources."vls-0.2.0"
       (sources."vscode-css-languageservice-4.1.1" // {
         dependencies = [
           sources."vscode-uri-2.1.1"
@@ -54898,19 +55658,18 @@ in
       })
       sources."vscode-emmet-helper-1.2.17"
       sources."vscode-jsonrpc-5.0.1"
-      sources."vscode-languageserver-5.3.0-next.10"
+      sources."vscode-languageserver-6.1.1"
       sources."vscode-languageserver-protocol-3.15.3"
       sources."vscode-languageserver-textdocument-1.0.1"
       sources."vscode-languageserver-types-3.15.1"
-      sources."vscode-nls-4.1.1"
-      sources."vscode-textbuffer-1.0.0"
+      sources."vscode-nls-4.1.2"
       sources."vscode-uri-1.0.8"
-      (sources."vue-eslint-parser-6.0.5" // {
+      sources."vscode-web-custom-data-0.1.3"
+      (sources."vue-eslint-parser-7.0.0" // {
         dependencies = [
           sources."debug-4.1.1"
         ];
       })
-      sources."vue-language-server-0.0.62"
       sources."vue-onsenui-helper-json-1.0.2"
       sources."wcwidth-1.0.1"
       sources."which-1.3.1"
@@ -55023,7 +55782,7 @@ in
       })
       sources."vscode-languageserver-textdocument-1.0.1"
       sources."vscode-languageserver-types-3.15.1"
-      sources."vscode-nls-4.1.1"
+      sources."vscode-nls-4.1.2"
       sources."vscode-uri-2.1.1"
       sources."yaml-ast-parser-custom-tags-0.0.43"
       sources."yaml-language-server-0.7.2"
@@ -55040,10 +55799,10 @@ in
   coc-yank = nodeEnv.buildNodePackage {
     name = "coc-yank";
     packageName = "coc-yank";
-    version = "1.1.3";
+    version = "1.1.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-yank/-/coc-yank-1.1.3.tgz";
-      sha512 = "m+hjR2e1Pc4CikJCh1u+XiyeWK7O9aBWWqk6nSkJp22wC8moIVgRa1PYbGpzKAAXem+Ts0BzVw2IRF5EES0MQg==";
+      url = "https://registry.npmjs.org/coc-yank/-/coc-yank-1.1.4.tgz";
+      sha512 = "8qonhyBfipzni6Fbbdm9hOjUIdLtwPGqnVGxA5DV+Kd4ctvD+FiBRuaWnXWf4QqxC8ATHQyTyoSqrvdXdko4PA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -55208,7 +55967,7 @@ in
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.9.1"
+      sources."@types/node-13.9.3"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       sources."ajv-6.12.0"
@@ -55818,7 +56577,7 @@ in
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.9.1"
+      sources."@types/node-13.9.3"
       sources."aggregate-error-3.0.1"
       sources."arr-diff-4.0.0"
       sources."arr-flatten-1.1.0"
@@ -56179,7 +56938,7 @@ in
       sources."@cycle/run-3.4.0"
       sources."@cycle/time-0.10.1"
       sources."@types/cookiejar-2.1.1"
-      sources."@types/node-13.9.1"
+      sources."@types/node-13.9.3"
       sources."@types/superagent-3.8.2"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-2.1.1"
@@ -56267,7 +57026,7 @@ in
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.1"
       sources."pseudomap-1.0.2"
-      sources."qs-6.9.1"
+      sources."qs-6.9.2"
       sources."quicktask-1.1.0"
       sources."raf-3.3.2"
       sources."readable-stream-2.3.7"
@@ -56321,10 +57080,10 @@ in
   create-react-app = nodeEnv.buildNodePackage {
     name = "create-react-app";
     packageName = "create-react-app";
-    version = "3.4.0";
+    version = "3.4.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.4.0.tgz";
-      sha512 = "BR5jXjJH6Bz0vHAIoF0pH2K+hX+Frd93UGZjjCUB1k1JJDZbM+QyigTXZ08ddJ02AQ+iYfNyM77WgDwKQBl00g==";
+      url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.4.1.tgz";
+      sha512 = "i0Zxiqj8Q2tMJkMousrZdB/vlvtoAZyN49bgAfM4yHhWQUzrpM1rZU7TX1Rg5bbDQ1R8Gk/usNnpkDzEHJdVXg==";
     };
     dependencies = [
       sources."@types/color-name-1.1.1"
@@ -56386,8 +57145,8 @@ in
       sources."lodash-4.17.15"
       sources."mimic-fn-2.1.0"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
+      sources."minimist-1.2.5"
+      sources."mkdirp-0.5.4"
       sources."ms-2.0.0"
       sources."mute-stream-0.0.8"
       sources."once-1.4.0"
@@ -56880,11 +57639,7 @@ in
           sources."is-extendable-1.0.1"
         ];
       })
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.4"
       sources."ms-2.1.2"
       sources."multi-random-access-2.1.1"
       sources."multicast-dns-7.2.1"
@@ -57402,7 +58157,7 @@ in
       sources."assert-plus-1.0.0"
       sources."async-2.6.3"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.639.0"
+      sources."aws-sdk-2.644.0"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.9.1"
       sources."base64-js-1.3.1"
@@ -57555,24 +58310,33 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.8.3"
-      sources."@babel/core-7.8.7"
-      sources."@babel/generator-7.8.8"
-      sources."@babel/helper-builder-react-jsx-7.8.3"
+      sources."@babel/core-7.9.0"
+      sources."@babel/generator-7.9.4"
+      sources."@babel/helper-annotate-as-pure-7.8.3"
+      sources."@babel/helper-builder-react-jsx-7.9.0"
+      sources."@babel/helper-builder-react-jsx-experimental-7.9.0"
       sources."@babel/helper-function-name-7.8.3"
       sources."@babel/helper-get-function-arity-7.8.3"
+      sources."@babel/helper-member-expression-to-functions-7.8.3"
+      sources."@babel/helper-module-imports-7.8.3"
+      sources."@babel/helper-module-transforms-7.9.0"
+      sources."@babel/helper-optimise-call-expression-7.8.3"
       sources."@babel/helper-plugin-utils-7.8.3"
+      sources."@babel/helper-replace-supers-7.8.6"
+      sources."@babel/helper-simple-access-7.8.3"
       sources."@babel/helper-split-export-declaration-7.8.3"
-      sources."@babel/helpers-7.8.4"
-      sources."@babel/highlight-7.8.3"
-      sources."@babel/parser-7.8.8"
-      sources."@babel/plugin-proposal-object-rest-spread-7.8.3"
+      sources."@babel/helper-validator-identifier-7.9.0"
+      sources."@babel/helpers-7.9.2"
+      sources."@babel/highlight-7.9.0"
+      sources."@babel/parser-7.9.4"
+      sources."@babel/plugin-proposal-object-rest-spread-7.9.0"
       sources."@babel/plugin-syntax-jsx-7.8.3"
       sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
       sources."@babel/plugin-transform-destructuring-7.8.8"
-      sources."@babel/plugin-transform-react-jsx-7.8.3"
+      sources."@babel/plugin-transform-react-jsx-7.9.4"
       sources."@babel/template-7.8.6"
-      sources."@babel/traverse-7.8.6"
-      sources."@babel/types-7.8.7"
+      sources."@babel/traverse-7.9.0"
+      sources."@babel/types-7.9.0"
       sources."@sindresorhus/is-2.1.0"
       sources."@szmarczak/http-timer-4.0.5"
       sources."@types/cacheable-request-6.0.1"
@@ -57580,9 +58344,10 @@ in
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
       sources."@types/minimist-1.2.0"
-      sources."@types/node-13.9.1"
+      sources."@types/node-13.9.3"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/responselike-1.0.0"
+      sources."@types/yoga-layout-1.9.1"
       sources."ajv-6.12.0"
       (sources."ansi-escapes-4.3.1" // {
         dependencies = [
@@ -57595,7 +58360,7 @@ in
       sources."arrify-2.0.1"
       sources."astral-regex-2.0.0"
       sources."auto-bind-4.0.0"
-      sources."cacheable-lookup-2.0.0"
+      sources."cacheable-lookup-2.0.1"
       (sources."cacheable-request-7.0.1" // {
         dependencies = [
           sources."get-stream-5.1.0"
@@ -57610,7 +58375,7 @@ in
       sources."ci-info-2.0.0"
       sources."cli-cursor-3.1.0"
       sources."cli-truncate-2.1.0"
-      sources."clipboardy-2.2.0"
+      sources."clipboardy-2.3.0"
       (sources."clone-response-1.0.2" // {
         dependencies = [
           sources."mimic-response-1.0.1"
@@ -57643,7 +58408,6 @@ in
       sources."env-paths-2.2.0"
       sources."error-ex-1.3.2"
       sources."escape-string-regexp-1.0.5"
-      sources."esutils-2.0.3"
       sources."execa-1.0.0"
       sources."fast-deep-equal-3.1.1"
       sources."fast-json-stable-stringify-2.1.0"
@@ -57698,7 +58462,7 @@ in
       sources."json-parse-better-errors-1.0.2"
       sources."json-schema-traverse-0.4.1"
       sources."json-schema-typed-7.0.3"
-      sources."json5-2.1.1"
+      sources."json5-2.1.2"
       sources."keyv-4.0.0"
       sources."lines-and-columns-1.1.6"
       sources."locate-path-3.0.0"
@@ -57734,7 +58498,7 @@ in
           sources."mimic-fn-3.0.0"
         ];
       })
-      (sources."meow-6.0.1" // {
+      (sources."meow-6.1.0" // {
         dependencies = [
           sources."type-fest-0.8.1"
         ];
@@ -57773,8 +58537,8 @@ in
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
       sources."quick-lru-4.0.1"
-      sources."react-16.13.0"
-      sources."react-is-16.13.0"
+      sources."react-16.13.1"
+      sources."react-is-16.13.1"
       sources."react-reconciler-0.24.0"
       (sources."read-pkg-5.2.0" // {
         dependencies = [
@@ -57845,8 +58609,8 @@ in
       })
       sources."wrappy-1.0.2"
       sources."write-file-atomic-3.0.3"
-      sources."yargs-parser-16.1.0"
-      sources."yoga-layout-prebuilt-1.9.3"
+      sources."yargs-parser-18.1.1"
+      sources."yoga-layout-prebuilt-1.9.5"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -57885,7 +58649,8 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.8.3"
-      sources."@babel/highlight-7.8.3"
+      sources."@babel/helper-validator-identifier-7.9.0"
+      sources."@babel/highlight-7.9.0"
       sources."@types/color-name-1.1.1"
       sources."acorn-7.1.1"
       sources."acorn-jsx-5.2.0"
@@ -57924,7 +58689,11 @@ in
       sources."eslint-visitor-keys-1.1.0"
       sources."espree-6.2.1"
       sources."esprima-4.0.1"
-      sources."esquery-1.1.0"
+      (sources."esquery-1.2.0" // {
+        dependencies = [
+          sources."estraverse-5.0.0"
+        ];
+      })
       sources."esrecurse-4.2.1"
       sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
@@ -57939,7 +58708,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.6"
-      sources."glob-parent-5.1.0"
+      sources."glob-parent-5.1.1"
       sources."globals-12.4.0"
       sources."has-flag-3.0.0"
       sources."iconv-lite-0.4.24"
@@ -57972,8 +58741,8 @@ in
       sources."lodash-4.17.15"
       sources."mimic-fn-2.1.0"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
+      sources."minimist-1.2.5"
+      sources."mkdirp-0.5.4"
       sources."ms-2.1.2"
       sources."mute-stream-0.0.8"
       sources."natural-compare-1.4.0"
@@ -58050,14 +58819,15 @@ in
   eslint_d = nodeEnv.buildNodePackage {
     name = "eslint_d";
     packageName = "eslint_d";
-    version = "8.1.0";
+    version = "8.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint_d/-/eslint_d-8.1.0.tgz";
-      sha512 = "cNZFOYG+Quphqj+GPoTNe9nsDCRJo2AjHVpu4RkvAxH8+vR2ckvm7ksr+Lwi+kkKuMf4h+QifTAXJ0HuBkJ7FA==";
+      url = "https://registry.npmjs.org/eslint_d/-/eslint_d-8.1.1.tgz";
+      sha512 = "eYr8vOwCQynnI8b5e5R07D2JI6jCItT9QZzWKGZnqMs9lKN+z0bvn1ULCNKp0u4mz1V+lLRglIDiSGIkIDDcLw==";
     };
     dependencies = [
       sources."@babel/code-frame-7.8.3"
-      sources."@babel/highlight-7.8.3"
+      sources."@babel/helper-validator-identifier-7.9.0"
+      sources."@babel/highlight-7.9.0"
       sources."@types/color-name-1.1.1"
       sources."acorn-7.1.1"
       sources."acorn-jsx-5.2.0"
@@ -58098,7 +58868,11 @@ in
       sources."eslint-visitor-keys-1.1.0"
       sources."espree-6.2.1"
       sources."esprima-4.0.1"
-      sources."esquery-1.1.0"
+      (sources."esquery-1.2.0" // {
+        dependencies = [
+          sources."estraverse-5.0.0"
+        ];
+      })
       sources."esrecurse-4.2.1"
       sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
@@ -58113,7 +58887,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.6"
-      sources."glob-parent-5.1.0"
+      sources."glob-parent-5.1.1"
       sources."globals-12.4.0"
       sources."has-flag-3.0.0"
       sources."iconv-lite-0.4.24"
@@ -58146,8 +58920,8 @@ in
       sources."lodash-4.17.15"
       sources."mimic-fn-2.1.0"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
+      sources."minimist-1.2.5"
+      sources."mkdirp-0.5.4"
       sources."ms-2.1.2"
       sources."mute-stream-0.0.8"
       sources."nanolru-1.0.0"
@@ -58419,7 +59193,8 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.8.3"
-      (sources."@babel/highlight-7.8.3" // {
+      sources."@babel/helper-validator-identifier-7.9.0"
+      (sources."@babel/highlight-7.9.0" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.2"
@@ -58460,7 +59235,6 @@ in
       sources."error-ex-1.3.2"
       sources."esc-exit-2.0.2"
       sources."escape-string-regexp-1.0.5"
-      sources."esutils-2.0.3"
       sources."execa-4.0.0"
       sources."external-editor-3.1.0"
       sources."figures-3.2.0"
@@ -58503,7 +59277,7 @@ in
       sources."lodash-4.17.15"
       sources."lru-cache-4.1.5"
       sources."map-obj-4.1.0"
-      (sources."meow-6.0.1" // {
+      (sources."meow-6.1.0" // {
         dependencies = [
           sources."type-fest-0.8.1"
         ];
@@ -58595,7 +59369,7 @@ in
       sources."which-2.0.2"
       sources."wrappy-1.0.2"
       sources."yallist-2.1.2"
-      sources."yargs-parser-16.1.0"
+      sources."yargs-parser-18.1.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -58703,7 +59477,7 @@ in
       sources."define-property-2.0.2"
       sources."defined-0.0.0"
       sources."director-1.2.7"
-      sources."es-abstract-1.17.4"
+      sources."es-abstract-1.17.5"
       sources."es-get-iterator-1.1.0"
       sources."es-to-primitive-1.2.1"
       (sources."event-stream-0.5.3" // {
@@ -58756,7 +59530,7 @@ in
       sources."forever-monitor-2.0.0"
       sources."fragment-cache-0.2.1"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.2.11"
+      sources."fsevents-1.2.12"
       sources."function-bind-1.1.1"
       sources."get-value-2.0.6"
       (sources."glob-7.1.6" // {
@@ -58825,9 +59599,9 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.10"
       sources."mixin-deep-1.3.2"
-      (sources."mkdirp-0.5.1" // {
+      (sources."mkdirp-0.5.4" // {
         dependencies = [
-          sources."minimist-0.0.8"
+          sources."minimist-1.2.5"
         ];
       })
       sources."ms-2.0.0"
@@ -59108,11 +59882,7 @@ in
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
       sources."minimist-1.2.5"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.4"
       sources."moment-2.24.0"
       sources."moo-0.5.1"
       sources."ms-2.1.2"
@@ -59277,7 +60047,8 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.8.3"
-      (sources."@babel/highlight-7.8.3" // {
+      sources."@babel/helper-validator-identifier-7.9.0"
+      (sources."@babel/highlight-7.9.0" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.2"
@@ -59352,7 +60123,6 @@ in
       sources."error-ex-1.3.2"
       sources."escape-goat-2.1.1"
       sources."escape-string-regexp-1.0.5"
-      sources."esutils-2.0.3"
       sources."execa-4.0.0"
       sources."external-editor-3.1.0"
       sources."fast-deep-equal-3.1.1"
@@ -59429,7 +60199,7 @@ in
       sources."lowercase-keys-1.0.1"
       sources."make-dir-3.0.2"
       sources."map-obj-4.1.0"
-      (sources."meow-6.0.1" // {
+      (sources."meow-6.1.0" // {
         dependencies = [
           sources."type-fest-0.8.1"
         ];
@@ -59526,7 +60296,7 @@ in
       sources."wrappy-1.0.2"
       sources."write-file-atomic-3.0.3"
       sources."xdg-basedir-4.0.0"
-      sources."yargs-parser-16.1.0"
+      sources."yargs-parser-18.1.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -59994,11 +60764,7 @@ in
           sources."yallist-4.0.0"
         ];
       })
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.4"
       sources."ms-2.0.0"
       sources."mute-stream-0.0.8"
       sources."negotiator-0.6.2"
@@ -60820,7 +61586,7 @@ in
       sources."fragment-cache-0.2.1"
       sources."fs-mkdirp-stream-1.0.0"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.2.11"
+      sources."fsevents-1.2.12"
       sources."function-bind-1.1.1"
       sources."get-caller-file-1.0.3"
       sources."get-value-2.0.6"
@@ -61625,11 +62391,7 @@ in
       sources."lodash-4.17.15"
       sources."mime-1.6.0"
       sources."minimist-1.2.5"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.4"
       sources."ms-2.1.2"
       sources."opener-1.5.1"
       (sources."optimist-0.6.1" // {
@@ -61638,7 +62400,7 @@ in
         ];
       })
       sources."portfinder-1.0.25"
-      sources."qs-6.9.1"
+      sources."qs-6.9.2"
       sources."requires-port-1.0.0"
       sources."secure-compare-3.0.1"
       sources."union-0.5.0"
@@ -61738,9 +62500,9 @@ in
       sources."isstream-0.1.2"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.10"
-      (sources."mkdirp-0.5.1" // {
+      (sources."mkdirp-0.5.4" // {
         dependencies = [
-          sources."minimist-0.0.8"
+          sources."minimist-1.2.5"
         ];
       })
       sources."moment-2.24.0"
@@ -61829,7 +62591,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."jquery-3.4.1"
-      sources."jquery.terminal-2.15.0"
+      sources."jquery.terminal-2.15.2"
       sources."jsonfile-2.4.0"
       sources."keyboardevent-key-polyfill-1.1.0"
       sources."line-reader-0.4.0"
@@ -62046,11 +62808,7 @@ in
       sources."minimist-1.2.5"
       sources."minipass-2.9.0"
       sources."minizlib-1.3.3"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.4"
       sources."ms-2.1.2"
       sources."mute-stream-0.0.8"
       sources."netmask-1.0.6"
@@ -62076,7 +62834,7 @@ in
       sources."proxy-agent-3.1.1"
       sources."proxy-from-env-1.1.0"
       sources."pump-3.0.0"
-      sources."qs-6.9.1"
+      sources."qs-6.9.2"
       sources."raw-body-2.4.1"
       sources."readable-stream-3.6.0"
       sources."restore-cursor-2.0.0"
@@ -62202,26 +62960,28 @@ in
     name = "iosevka-build-deps";
     packageName = "iosevka-build-deps";
     version = "2.3.3";
-    src = ../../../pkgs/data/fonts/iosevka;
+    src = ../../data/fonts/iosevka;
     dependencies = [
+      sources."@types/color-name-1.1.1"
       sources."JSONStream-1.3.5"
       sources."abbrev-1.1.1"
       sources."ajv-6.12.0"
       sources."amdefine-1.0.1"
       sources."ansi-regex-2.1.1"
-      sources."ansi-styles-3.2.1"
+      sources."ansi-styles-4.2.1"
       sources."aproba-1.2.0"
       sources."are-we-there-yet-1.1.5"
       sources."argparse-1.0.10"
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
+      sources."at-least-node-1.0.0"
       sources."atob-2.1.2"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.9.1"
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
-      sources."bezier-js-2.5.1"
+      sources."bezier-js-2.6.0"
       sources."bindings-1.5.0"
       sources."block-stream-0.0.9"
       sources."bluebird-3.7.2"
@@ -62230,9 +62990,9 @@ in
       sources."camelcase-4.1.0"
       sources."caryll-shapeops-0.3.1"
       sources."caseless-0.12.0"
-      sources."chalk-2.4.2"
+      sources."chalk-3.0.0"
       sources."child-process-promise-2.2.1"
-      sources."cli-cursor-2.1.0"
+      sources."cli-cursor-3.1.0"
       sources."clipper-lib-1.0.0"
       (sources."cliui-3.2.0" // {
         dependencies = [
@@ -62241,8 +63001,8 @@ in
       })
       sources."clone-2.1.2"
       sources."code-point-at-1.1.0"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
+      sources."color-convert-2.0.1"
+      sources."color-name-1.1.4"
       sources."colors-1.4.0"
       sources."combined-stream-1.0.8"
       sources."complex.js-2.0.11"
@@ -62262,11 +63022,9 @@ in
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
       sources."ecc-jsbn-0.1.2"
-      sources."emoji-regex-7.0.3"
-      sources."end-of-stream-1.4.4"
+      sources."emoji-regex-8.0.0"
       sources."error-ex-1.3.2"
       sources."escape-latex-1.2.0"
-      sources."escape-string-regexp-1.0.5"
       sources."escodegen-1.14.1"
       (sources."escope-1.0.3" // {
         dependencies = [
@@ -62324,7 +63082,7 @@ in
       sources."graceful-fs-4.2.3"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.3"
-      sources."has-flag-3.0.0"
+      sources."has-flag-4.0.0"
       sources."has-unicode-2.0.1"
       sources."hosted-git-info-2.8.8"
       sources."http-signature-1.2.0"
@@ -62353,7 +63111,6 @@ in
       sources."load-json-file-2.0.0"
       sources."locate-path-2.0.0"
       sources."lru-cache-4.1.5"
-      sources."map-age-cleaner-0.1.3"
       sources."mathjs-5.10.3"
       sources."megaminx-0.9.0"
       sources."mem-1.1.0"
@@ -62362,11 +63119,10 @@ in
       sources."mime-types-2.1.26"
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
+      sources."minimist-1.2.5"
+      sources."mkdirp-0.5.4"
       sources."ms-2.0.0"
       sources."nan-2.14.0"
-      sources."nice-try-1.0.5"
       (sources."node-gyp-3.8.0" // {
         dependencies = [
           sources."semver-5.3.0"
@@ -62381,7 +63137,11 @@ in
       sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
       sources."once-1.4.0"
-      sources."onetime-2.0.1"
+      (sources."onetime-5.1.0" // {
+        dependencies = [
+          sources."mimic-fn-2.1.0"
+        ];
+      })
       sources."optionator-0.8.3"
       sources."os-homedir-1.0.2"
       sources."os-locale-2.1.0"
@@ -62400,9 +63160,7 @@ in
           sources."yargs-8.0.2"
         ];
       })
-      sources."p-defer-1.0.0"
       sources."p-finally-1.0.0"
-      sources."p-is-promise-2.1.0"
       sources."p-limit-1.3.0"
       sources."p-locate-2.0.0"
       sources."p-try-1.0.0"
@@ -62440,10 +63198,8 @@ in
       sources."primitive-quadify-off-curves-0.4.1"
       sources."process-nextick-args-2.0.1"
       sources."promise-polyfill-6.1.0"
-      sources."proper-lockfile-3.2.0"
       sources."pseudomap-1.0.2"
       sources."psl-1.7.0"
-      sources."pump-3.0.0"
       sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."read-pkg-2.0.0"
@@ -62454,9 +63210,8 @@ in
       sources."require-main-filename-1.0.1"
       sources."resolve-1.15.1"
       sources."resolve-url-0.2.1"
-      sources."restore-cursor-2.0.0"
+      sources."restore-cursor-3.1.0"
       sources."resumer-0.0.0"
-      sources."retry-0.12.0"
       sources."rimraf-2.6.3"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
@@ -62498,7 +63253,7 @@ in
           sources."source-map-0.7.3"
         ];
       })
-      sources."supports-color-5.5.0"
+      sources."supports-color-7.1.0"
       sources."tar-2.2.2"
       sources."temp-0.8.4"
       sources."through-2.3.8"
@@ -62522,35 +63277,31 @@ in
       sources."util-deprecate-1.0.2"
       sources."uuid-3.4.0"
       sources."validate-npm-package-license-3.0.4"
-      (sources."verda-1.0.0-12" // {
+      (sources."verda-1.0.0" // {
         dependencies = [
-          sources."ansi-regex-4.1.0"
+          sources."ansi-regex-5.0.0"
           sources."camelcase-5.3.1"
-          (sources."cliui-4.1.0" // {
-            dependencies = [
-              sources."ansi-regex-3.0.0"
-              sources."strip-ansi-4.0.0"
-            ];
-          })
-          sources."cross-spawn-6.0.5"
-          sources."execa-1.0.0"
-          sources."fast-deep-equal-2.0.1"
-          sources."find-up-3.0.0"
-          sources."fs-extra-6.0.1"
-          sources."get-stream-4.1.0"
-          sources."invert-kv-2.0.0"
-          sources."jsonfile-4.0.0"
-          sources."lcid-2.0.0"
-          sources."locate-path-3.0.0"
-          sources."mem-4.3.0"
-          sources."mimic-fn-2.1.0"
-          sources."os-locale-3.1.0"
+          sources."cliui-6.0.0"
+          sources."find-up-4.1.0"
+          sources."fs-extra-9.0.0"
+          sources."get-caller-file-2.0.5"
+          sources."is-fullwidth-code-point-3.0.0"
+          sources."jsonfile-6.0.1"
+          sources."locate-path-5.0.0"
           sources."p-limit-2.2.2"
-          sources."p-locate-3.0.0"
+          sources."p-locate-4.1.0"
           sources."p-try-2.2.0"
-          sources."strip-ansi-5.2.0"
-          sources."yargs-12.0.5"
-          sources."yargs-parser-11.1.1"
+          sources."path-exists-4.0.0"
+          sources."require-main-filename-2.0.0"
+          sources."string-width-4.2.0"
+          sources."strip-ansi-6.0.0"
+          sources."tslib-1.11.1"
+          sources."universalify-1.0.0"
+          sources."which-2.0.2"
+          sources."wrap-ansi-6.2.0"
+          sources."y18n-4.0.0"
+          sources."yargs-15.3.1"
+          sources."yargs-parser-18.1.1"
         ];
       })
       sources."verror-1.10.0"
@@ -62570,8 +63321,12 @@ in
       (sources."yargs-14.2.3" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
+          sources."ansi-styles-3.2.1"
           sources."camelcase-5.3.1"
           sources."cliui-5.0.0"
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
+          sources."emoji-regex-7.0.3"
           sources."find-up-3.0.0"
           sources."get-caller-file-2.0.5"
           sources."is-fullwidth-code-point-2.0.0"
@@ -62737,7 +63492,7 @@ in
       sources."@yarnpkg/lockfile-1.1.0"
       sources."abab-2.0.3"
       sources."abbrev-1.1.1"
-      sources."acorn-5.7.4"
+      sources."acorn-7.1.1"
       (sources."acorn-globals-4.3.4" // {
         dependencies = [
           sources."acorn-6.4.1"
@@ -62776,7 +63531,6 @@ in
       sources."asn1-0.2.4"
       sources."assert-plus-1.0.0"
       sources."assign-symbols-1.0.0"
-      sources."async-limiter-1.0.1"
       sources."async-mutex-0.1.4"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
@@ -62789,9 +63543,10 @@ in
         ];
       })
       sources."base-64-0.1.0"
+      sources."base64-js-1.3.1"
       sources."base64-stream-1.0.0"
       sources."bcrypt-pbkdf-1.0.2"
-      sources."bl-4.0.1"
+      sources."bl-4.0.2"
       sources."brace-expansion-1.1.11"
       (sources."braces-2.3.2" // {
         dependencies = [
@@ -62799,6 +63554,7 @@ in
         ];
       })
       sources."browser-process-hrtime-1.0.0"
+      sources."buffer-5.5.0"
       sources."cache-base-1.0.1"
       sources."camel-case-3.0.0"
       sources."camelcase-4.1.0"
@@ -62859,15 +63615,15 @@ in
       sources."cross-spawn-6.0.5"
       sources."crypt-0.0.2"
       sources."css-2.2.4"
-      sources."cssom-0.3.8"
-      sources."cssstyle-1.4.0"
-      sources."cwise-compiler-1.1.3"
-      sources."dashdash-1.14.1"
-      (sources."data-urls-1.1.0" // {
+      sources."cssom-0.4.4"
+      (sources."cssstyle-2.2.0" // {
         dependencies = [
-          sources."whatwg-url-7.1.0"
+          sources."cssom-0.3.8"
         ];
       })
+      sources."cwise-compiler-1.1.3"
+      sources."dashdash-1.14.1"
+      sources."data-urls-1.1.0"
       sources."debug-3.2.6"
       sources."decode-uri-component-0.2.0"
       sources."decompress-response-4.2.1"
@@ -63014,6 +63770,7 @@ in
       sources."http-errors-1.7.3"
       sources."http-signature-1.2.0"
       sources."iconv-lite-0.4.24"
+      sources."ieee754-1.1.13"
       sources."ignore-walk-3.0.3"
       (sources."image-data-uri-2.0.1" // {
         dependencies = [
@@ -63052,6 +63809,7 @@ in
         ];
       })
       sources."iota-array-1.0.0"
+      sources."ip-regex-2.1.0"
       sources."is-absolute-0.2.6"
       sources."is-accessor-descriptor-1.0.0"
       sources."is-arrayish-0.3.2"
@@ -63081,12 +63839,12 @@ in
       sources."isexe-2.0.0"
       sources."isobject-3.0.1"
       sources."isstream-0.1.2"
-      sources."joplin-turndown-4.0.23"
+      sources."joplin-turndown-4.0.24"
       sources."joplin-turndown-plugin-gfm-1.0.12"
       sources."jpeg-js-0.1.2"
       sources."js-tokens-4.0.0"
       sources."jsbn-0.1.1"
-      sources."jsdom-11.12.0"
+      sources."jsdom-15.2.1"
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
@@ -63102,7 +63860,6 @@ in
       sources."klaw-1.3.1"
       sources."klaw-sync-6.0.0"
       sources."lazyness-1.1.1"
-      sources."left-pad-1.3.0"
       sources."levenshtein-1.0.5"
       sources."levn-0.3.0"
       sources."linkify-it-2.2.0"
@@ -63162,11 +63919,7 @@ in
           sources."is-extendable-1.0.1"
         ];
       })
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.4"
       sources."moment-2.24.0"
       sources."ms-2.1.2"
       (sources."multiparty-4.2.1" // {
@@ -63234,7 +63987,7 @@ in
       sources."p-locate-2.0.0"
       sources."p-try-1.0.0"
       sources."param-case-2.1.1"
-      sources."parse5-4.0.0"
+      sources."parse5-5.1.0"
       sources."pascalcase-0.1.1"
       (sources."patch-package-6.2.1" // {
         dependencies = [
@@ -63276,10 +64029,15 @@ in
       (sources."request-2.88.2" // {
         dependencies = [
           sources."form-data-2.3.3"
+          sources."tough-cookie-2.5.0"
         ];
       })
       sources."request-promise-core-1.1.3"
-      sources."request-promise-native-1.0.8"
+      (sources."request-promise-native-1.0.8" // {
+        dependencies = [
+          sources."tough-cookie-2.5.0"
+        ];
+      })
       sources."requires-port-1.0.0"
       sources."resolve-url-0.2.1"
       sources."ret-0.1.15"
@@ -63289,6 +64047,7 @@ in
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
+      sources."saxes-3.1.11"
       sources."semver-5.7.1"
       sources."server-destroy-1.0.1"
       sources."set-blocking-2.0.0"
@@ -63424,7 +64183,7 @@ in
           sources."q-0.9.7"
         ];
       })
-      sources."terminal-kit-1.35.1"
+      sources."terminal-kit-1.35.2"
       (sources."tkwidgets-0.5.26" // {
         dependencies = [
           sources."is-fullwidth-code-point-2.0.0"
@@ -63441,7 +64200,7 @@ in
       sources."to-regex-3.0.2"
       sources."to-regex-range-2.1.1"
       sources."toidentifier-1.0.0"
-      sources."tough-cookie-2.5.0"
+      sources."tough-cookie-3.0.1"
       sources."tr46-1.0.1"
       sources."tree-kit-0.6.2"
       sources."tunnel-agent-0.6.0"
@@ -63482,10 +64241,11 @@ in
       sources."valid-url-1.0.9"
       sources."verror-1.10.0"
       sources."w3c-hr-time-1.0.2"
+      sources."w3c-xmlserializer-1.1.2"
       sources."webidl-conversions-4.0.2"
       sources."whatwg-encoding-1.0.5"
       sources."whatwg-mimetype-2.3.0"
-      sources."whatwg-url-6.5.0"
+      sources."whatwg-url-7.1.0"
       sources."which-1.3.1"
       sources."which-pm-runs-1.0.0"
       sources."wide-align-1.1.3"
@@ -63498,10 +64258,11 @@ in
         ];
       })
       sources."wrappy-1.0.2"
-      sources."ws-5.2.2"
+      sources."ws-7.2.3"
       sources."xml-name-validator-3.0.0"
       sources."xml2js-0.4.23"
       sources."xmlbuilder-11.0.1"
+      sources."xmlchars-2.2.0"
       sources."yallist-4.0.0"
       sources."yargs-parser-7.0.0"
     ];
@@ -63538,8 +64299,8 @@ in
       sources."ini-1.3.5"
       sources."lru-cache-4.1.5"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
+      sources."minimist-1.2.5"
+      sources."mkdirp-0.5.4"
       sources."nopt-4.0.3"
       sources."once-1.4.0"
       sources."os-homedir-1.0.2"
@@ -63595,7 +64356,7 @@ in
       sha512 = "Yf1ZKA3r9nvtMWHO1kEuMZTlHOF8uoQ0vyo5eH7SQy5YeIiHM+B0DgKnn+X6y6KDYZcF7G2SPkKF+JORCXWE/A==";
     };
     dependencies = [
-      sources."@babel/parser-7.8.8"
+      sources."@babel/parser-7.9.4"
       sources."argparse-1.0.10"
       sources."bluebird-3.7.2"
       sources."catharsis-0.8.11"
@@ -63610,8 +64371,8 @@ in
       sources."markdown-it-anchor-5.2.5"
       sources."marked-0.7.0"
       sources."mdurl-1.0.1"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
+      sources."minimist-1.2.5"
+      sources."mkdirp-0.5.4"
       sources."requizzle-0.2.3"
       sources."sprintf-js-1.0.3"
       sources."strip-json-comments-3.0.1"
@@ -63761,7 +64522,7 @@ in
       sources."path-loader-1.0.10"
       sources."process-nextick-args-2.0.1"
       sources."punycode-2.1.1"
-      sources."qs-6.9.1"
+      sources."qs-6.9.2"
       sources."readable-stream-2.3.7"
       sources."safe-buffer-5.1.2"
       sources."slash-3.0.0"
@@ -63944,7 +64705,11 @@ in
       sources."mime-types-2.1.26"
       sources."mimic-response-1.0.1"
       sources."minimist-1.2.5"
-      sources."morgan-1.9.1"
+      (sources."morgan-1.10.0" // {
+        dependencies = [
+          sources."depd-2.0.0"
+        ];
+      })
       sources."ms-2.0.0"
       sources."nanoid-2.1.11"
       sources."negotiator-0.6.2"
@@ -64045,8 +64810,8 @@ in
       sources."write-file-atomic-3.0.3"
       sources."xdg-basedir-4.0.0"
       sources."y18n-4.0.0"
-      sources."yargs-15.3.0"
-      sources."yargs-parser-18.1.0"
+      sources."yargs-15.3.1"
+      sources."yargs-parser-18.1.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -64160,7 +64925,7 @@ in
       sources."fs.realpath-1.0.0"
       sources."fsevents-2.1.2"
       sources."glob-7.1.6"
-      sources."glob-parent-5.1.0"
+      sources."glob-parent-5.1.1"
       sources."graceful-fs-4.2.3"
       sources."has-binary2-1.0.3"
       sources."has-cors-1.1.0"
@@ -64203,7 +64968,7 @@ in
       sources."parseuri-0.0.5"
       sources."parseurl-1.3.3"
       sources."path-is-absolute-1.0.1"
-      sources."picomatch-2.2.1"
+      sources."picomatch-2.2.2"
       sources."pseudomap-1.0.2"
       sources."qjobs-1.2.0"
       sources."qs-6.7.0"
@@ -64751,7 +65516,7 @@ in
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.9.1"
+      sources."@types/node-13.9.3"
       sources."@zkochan/cmd-shim-3.1.0"
       sources."JSONStream-1.3.5"
       sources."abbrev-1.1.1"
@@ -64804,7 +65569,7 @@ in
       sources."builtins-1.0.3"
       sources."byline-5.0.0"
       sources."byte-size-5.0.1"
-      sources."cacache-12.0.3"
+      sources."cacache-12.0.4"
       sources."cache-base-1.0.1"
       sources."call-me-maybe-1.0.1"
       sources."caller-callsite-2.0.0"
@@ -64888,7 +65653,6 @@ in
         dependencies = [
           sources."concat-stream-2.0.0"
           sources."meow-4.0.1"
-          sources."minimist-1.2.5"
           sources."readable-stream-3.6.0"
         ];
       })
@@ -64940,7 +65704,7 @@ in
       sources."envinfo-7.5.0"
       sources."err-code-1.1.2"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.17.4"
+      sources."es-abstract-1.17.5"
       sources."es-to-primitive-1.2.1"
       sources."es6-promise-4.2.8"
       sources."es6-promisify-5.0.0"
@@ -64993,7 +65757,7 @@ in
         ];
       })
       sources."fast-json-stable-stringify-2.1.0"
-      sources."figgy-pudding-3.5.1"
+      sources."figgy-pudding-3.5.2"
       sources."figures-2.0.0"
       (sources."fill-range-4.0.0" // {
         dependencies = [
@@ -65029,7 +65793,6 @@ in
           sources."load-json-file-1.1.0"
           sources."map-obj-1.0.1"
           sources."meow-3.7.0"
-          sources."minimist-1.2.5"
           sources."parse-json-2.2.0"
           sources."path-exists-2.1.0"
           sources."path-type-1.1.0"
@@ -65050,7 +65813,6 @@ in
       (sources."git-raw-commits-2.0.0" // {
         dependencies = [
           sources."meow-4.0.1"
-          sources."minimist-1.2.5"
         ];
       })
       (sources."git-remote-origin-url-2.0.0" // {
@@ -65061,14 +65823,13 @@ in
       (sources."git-semver-tags-2.0.3" // {
         dependencies = [
           sources."meow-4.0.1"
-          sources."minimist-1.2.5"
         ];
       })
       sources."git-up-4.0.1"
       sources."git-url-parse-11.1.2"
       sources."gitconfiglocal-1.0.0"
       sources."glob-7.1.6"
-      sources."glob-parent-5.1.0"
+      sources."glob-parent-5.1.1"
       sources."glob-to-regexp-0.3.0"
       (sources."globby-9.2.0" // {
         dependencies = [
@@ -65208,7 +65969,7 @@ in
       sources."mime-types-2.1.26"
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
+      sources."minimist-1.2.5"
       sources."minimist-options-3.0.2"
       sources."minipass-2.9.0"
       sources."minizlib-1.3.3"
@@ -65218,7 +65979,7 @@ in
           sources."is-extendable-1.0.1"
         ];
       })
-      sources."mkdirp-0.5.1"
+      sources."mkdirp-0.5.4"
       sources."mkdirp-promise-5.0.1"
       sources."modify-values-1.0.1"
       sources."move-concurrently-1.0.1"
@@ -65284,7 +66045,11 @@ in
       sources."octokit-pagination-methods-1.1.0"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
-      sources."optimist-0.6.1"
+      (sources."optimist-0.6.1" // {
+        dependencies = [
+          sources."minimist-0.0.10"
+        ];
+      })
       sources."os-homedir-1.0.2"
       sources."os-name-3.1.0"
       sources."os-tmpdir-1.0.2"
@@ -65485,11 +66250,7 @@ in
       sources."strip-bom-3.0.0"
       sources."strip-eof-1.0.0"
       sources."strip-indent-2.0.0"
-      (sources."strong-log-transformer-2.1.0" // {
-        dependencies = [
-          sources."minimist-1.2.5"
-        ];
-      })
+      sources."strong-log-transformer-2.1.0"
       sources."supports-color-5.5.0"
       sources."tar-4.4.13"
       sources."temp-dir-1.0.0"
@@ -65646,8 +66407,8 @@ in
       sources."mime-1.6.0"
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
+      sources."minimist-1.2.5"
+      sources."mkdirp-0.5.4"
       sources."oauth-sign-0.9.0"
       sources."performance-now-2.1.0"
       sources."promise-7.3.1"
@@ -65771,7 +66532,7 @@ in
       sources."debug-2.6.9"
       sources."decode-uri-component-0.2.0"
       sources."define-property-2.0.2"
-      sources."depd-1.1.2"
+      sources."depd-2.0.0"
       sources."destroy-1.0.4"
       sources."duplexer-0.1.1"
       sources."ee-first-1.1.1"
@@ -65819,7 +66580,7 @@ in
       sources."fragment-cache-0.2.1"
       sources."fresh-0.5.2"
       sources."from-0.1.7"
-      sources."fsevents-1.2.11"
+      sources."fsevents-1.2.12"
       sources."get-value-2.0.6"
       (sources."glob-parent-3.1.0" // {
         dependencies = [
@@ -65834,7 +66595,11 @@ in
         ];
       })
       sources."http-auth-3.1.3"
-      sources."http-errors-1.7.3"
+      (sources."http-errors-1.7.3" // {
+        dependencies = [
+          sources."depd-1.1.2"
+        ];
+      })
       sources."http-parser-js-0.4.10"
       sources."inherits-2.0.4"
       sources."is-accessor-descriptor-1.0.0"
@@ -65864,7 +66629,7 @@ in
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
       sources."mixin-deep-1.3.2"
-      sources."morgan-1.9.1"
+      sources."morgan-1.10.0"
       sources."ms-2.0.0"
       sources."nan-2.14.0"
       sources."nanomatch-1.2.13"
@@ -65910,11 +66675,13 @@ in
       sources."safe-regex-1.1.0"
       (sources."send-0.17.1" // {
         dependencies = [
+          sources."depd-1.1.2"
           sources."ms-2.1.1"
         ];
       })
       (sources."serve-index-1.9.1" // {
         dependencies = [
+          sources."depd-1.1.2"
           sources."http-errors-1.6.3"
           sources."inherits-2.0.3"
           sources."setprototypeof-1.1.0"
@@ -66168,7 +66935,7 @@ in
       sources."forwarded-0.1.2"
       sources."fragment-cache-0.2.1"
       sources."fresh-0.5.2"
-      sources."fsevents-1.2.11"
+      sources."fsevents-1.2.12"
       sources."get-value-2.0.6"
       sources."getpass-0.1.7"
       sources."github-slugger-1.3.0"
@@ -66542,15 +67309,14 @@ in
     name = "lumo-build-deps";
     packageName = "lumo-build-deps";
     version = "1.10.1";
-    src = ../../../pkgs/development/interpreters/clojurescript/lumo;
+    src = ../interpreters/clojurescript/lumo;
     dependencies = [
       sources."@babel/code-frame-7.8.3"
-      sources."@babel/compat-data-7.8.6"
-      sources."@babel/core-7.8.7"
-      sources."@babel/generator-7.8.8"
+      sources."@babel/compat-data-7.9.0"
+      sources."@babel/core-7.9.0"
+      sources."@babel/generator-7.9.4"
       sources."@babel/helper-annotate-as-pure-7.8.3"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3"
-      sources."@babel/helper-call-delegate-7.8.7"
       sources."@babel/helper-compilation-targets-7.8.7"
       sources."@babel/helper-create-class-features-plugin-7.8.6"
       sources."@babel/helper-create-regexp-features-plugin-7.8.8"
@@ -66561,7 +67327,7 @@ in
       sources."@babel/helper-hoist-variables-7.8.3"
       sources."@babel/helper-member-expression-to-functions-7.8.3"
       sources."@babel/helper-module-imports-7.8.3"
-      sources."@babel/helper-module-transforms-7.8.6"
+      sources."@babel/helper-module-transforms-7.9.0"
       sources."@babel/helper-optimise-call-expression-7.8.3"
       sources."@babel/helper-plugin-utils-7.8.3"
       sources."@babel/helper-regex-7.8.3"
@@ -66569,29 +67335,32 @@ in
       sources."@babel/helper-replace-supers-7.8.6"
       sources."@babel/helper-simple-access-7.8.3"
       sources."@babel/helper-split-export-declaration-7.8.3"
+      sources."@babel/helper-validator-identifier-7.9.0"
       sources."@babel/helper-wrap-function-7.8.3"
-      sources."@babel/helpers-7.8.4"
-      (sources."@babel/highlight-7.8.3" // {
+      sources."@babel/helpers-7.9.2"
+      (sources."@babel/highlight-7.9.0" // {
         dependencies = [
           sources."chalk-2.4.2"
         ];
       })
-      sources."@babel/parser-7.8.8"
+      sources."@babel/parser-7.9.4"
       sources."@babel/plugin-external-helpers-7.8.3"
       sources."@babel/plugin-proposal-async-generator-functions-7.8.3"
       sources."@babel/plugin-proposal-class-properties-7.8.3"
       sources."@babel/plugin-proposal-dynamic-import-7.8.3"
       sources."@babel/plugin-proposal-json-strings-7.8.3"
       sources."@babel/plugin-proposal-nullish-coalescing-operator-7.8.3"
-      sources."@babel/plugin-proposal-object-rest-spread-7.8.3"
+      sources."@babel/plugin-proposal-numeric-separator-7.8.3"
+      sources."@babel/plugin-proposal-object-rest-spread-7.9.0"
       sources."@babel/plugin-proposal-optional-catch-binding-7.8.3"
-      sources."@babel/plugin-proposal-optional-chaining-7.8.3"
+      sources."@babel/plugin-proposal-optional-chaining-7.9.0"
       sources."@babel/plugin-proposal-unicode-property-regex-7.8.8"
       sources."@babel/plugin-syntax-async-generators-7.8.4"
       sources."@babel/plugin-syntax-bigint-7.8.3"
       sources."@babel/plugin-syntax-dynamic-import-7.8.3"
       sources."@babel/plugin-syntax-json-strings-7.8.3"
       sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3"
+      sources."@babel/plugin-syntax-numeric-separator-7.8.3"
       sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
       sources."@babel/plugin-syntax-optional-catch-binding-7.8.3"
       sources."@babel/plugin-syntax-optional-chaining-7.8.3"
@@ -66600,43 +67369,51 @@ in
       sources."@babel/plugin-transform-async-to-generator-7.8.3"
       sources."@babel/plugin-transform-block-scoped-functions-7.8.3"
       sources."@babel/plugin-transform-block-scoping-7.8.3"
-      sources."@babel/plugin-transform-classes-7.8.6"
+      sources."@babel/plugin-transform-classes-7.9.2"
       sources."@babel/plugin-transform-computed-properties-7.8.3"
       sources."@babel/plugin-transform-destructuring-7.8.8"
       sources."@babel/plugin-transform-dotall-regex-7.8.3"
       sources."@babel/plugin-transform-duplicate-keys-7.8.3"
       sources."@babel/plugin-transform-exponentiation-operator-7.8.3"
-      sources."@babel/plugin-transform-for-of-7.8.6"
+      sources."@babel/plugin-transform-for-of-7.9.0"
       sources."@babel/plugin-transform-function-name-7.8.3"
       sources."@babel/plugin-transform-literals-7.8.3"
       sources."@babel/plugin-transform-member-expression-literals-7.8.3"
-      sources."@babel/plugin-transform-modules-amd-7.8.3"
-      sources."@babel/plugin-transform-modules-commonjs-7.8.3"
-      sources."@babel/plugin-transform-modules-systemjs-7.8.3"
-      sources."@babel/plugin-transform-modules-umd-7.8.3"
+      sources."@babel/plugin-transform-modules-amd-7.9.0"
+      sources."@babel/plugin-transform-modules-commonjs-7.9.0"
+      sources."@babel/plugin-transform-modules-systemjs-7.9.0"
+      sources."@babel/plugin-transform-modules-umd-7.9.0"
       sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3"
       sources."@babel/plugin-transform-new-target-7.8.3"
       sources."@babel/plugin-transform-object-super-7.8.3"
-      sources."@babel/plugin-transform-parameters-7.8.8"
+      sources."@babel/plugin-transform-parameters-7.9.3"
       sources."@babel/plugin-transform-property-literals-7.8.3"
       sources."@babel/plugin-transform-regenerator-7.8.7"
       sources."@babel/plugin-transform-reserved-words-7.8.3"
-      sources."@babel/plugin-transform-runtime-7.8.3"
+      sources."@babel/plugin-transform-runtime-7.9.0"
       sources."@babel/plugin-transform-shorthand-properties-7.8.3"
       sources."@babel/plugin-transform-spread-7.8.3"
       sources."@babel/plugin-transform-sticky-regex-7.8.3"
       sources."@babel/plugin-transform-template-literals-7.8.3"
       sources."@babel/plugin-transform-typeof-symbol-7.8.4"
       sources."@babel/plugin-transform-unicode-regex-7.8.3"
-      sources."@babel/preset-env-7.8.7"
+      sources."@babel/preset-env-7.9.0"
+      sources."@babel/preset-modules-0.1.3"
       sources."@babel/preset-stage-2-7.8.3"
-      sources."@babel/runtime-7.8.7"
+      sources."@babel/runtime-7.9.2"
       sources."@babel/template-7.8.6"
-      sources."@babel/traverse-7.8.6"
-      sources."@babel/types-7.8.7"
+      sources."@babel/traverse-7.9.0"
+      sources."@babel/types-7.9.0"
       sources."@cnakazawa/watch-1.0.4"
       sources."@comandeer/babel-plugin-banner-5.0.0"
-      sources."@istanbuljs/load-nyc-config-1.0.0"
+      (sources."@istanbuljs/load-nyc-config-1.0.0" // {
+        dependencies = [
+          sources."find-up-4.1.0"
+          sources."locate-path-5.0.0"
+          sources."p-locate-4.1.0"
+          sources."path-exists-4.0.0"
+        ];
+      })
       sources."@istanbuljs/schema-0.1.2"
       (sources."@jest/transform-25.1.0" // {
         dependencies = [
@@ -66649,33 +67426,33 @@ in
       sources."@types/babel__template-7.0.2"
       sources."@types/babel__traverse-7.0.9"
       sources."@types/color-name-1.1.1"
-      sources."@types/estree-0.0.42"
+      sources."@types/estree-0.0.44"
       sources."@types/istanbul-lib-coverage-2.0.1"
       sources."@types/istanbul-lib-report-3.0.0"
       sources."@types/istanbul-reports-1.1.1"
-      sources."@types/node-13.9.1"
+      sources."@types/node-13.9.3"
       sources."@types/normalize-package-data-2.4.0"
       sources."@types/resolve-0.0.8"
       sources."@types/yargs-15.0.4"
       sources."@types/yargs-parser-15.0.0"
-      sources."@webassemblyjs/ast-1.8.5"
-      sources."@webassemblyjs/floating-point-hex-parser-1.8.5"
-      sources."@webassemblyjs/helper-api-error-1.8.5"
-      sources."@webassemblyjs/helper-buffer-1.8.5"
-      sources."@webassemblyjs/helper-code-frame-1.8.5"
-      sources."@webassemblyjs/helper-fsm-1.8.5"
-      sources."@webassemblyjs/helper-module-context-1.8.5"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.8.5"
-      sources."@webassemblyjs/helper-wasm-section-1.8.5"
-      sources."@webassemblyjs/ieee754-1.8.5"
-      sources."@webassemblyjs/leb128-1.8.5"
-      sources."@webassemblyjs/utf8-1.8.5"
-      sources."@webassemblyjs/wasm-edit-1.8.5"
-      sources."@webassemblyjs/wasm-gen-1.8.5"
-      sources."@webassemblyjs/wasm-opt-1.8.5"
-      sources."@webassemblyjs/wasm-parser-1.8.5"
-      sources."@webassemblyjs/wast-parser-1.8.5"
-      sources."@webassemblyjs/wast-printer-1.8.5"
+      sources."@webassemblyjs/ast-1.9.0"
+      sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
+      sources."@webassemblyjs/helper-api-error-1.9.0"
+      sources."@webassemblyjs/helper-buffer-1.9.0"
+      sources."@webassemblyjs/helper-code-frame-1.9.0"
+      sources."@webassemblyjs/helper-fsm-1.9.0"
+      sources."@webassemblyjs/helper-module-context-1.9.0"
+      sources."@webassemblyjs/helper-wasm-bytecode-1.9.0"
+      sources."@webassemblyjs/helper-wasm-section-1.9.0"
+      sources."@webassemblyjs/ieee754-1.9.0"
+      sources."@webassemblyjs/leb128-1.9.0"
+      sources."@webassemblyjs/utf8-1.9.0"
+      sources."@webassemblyjs/wasm-edit-1.9.0"
+      sources."@webassemblyjs/wasm-gen-1.9.0"
+      sources."@webassemblyjs/wasm-opt-1.9.0"
+      sources."@webassemblyjs/wasm-parser-1.9.0"
+      sources."@webassemblyjs/wast-parser-1.9.0"
+      sources."@webassemblyjs/wast-printer-1.9.0"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
       sources."JSONStream-1.3.5"
@@ -66723,10 +67500,9 @@ in
       sources."babel-helper-remove-or-void-0.4.3"
       sources."babel-helper-to-multiple-sequence-expressions-0.5.0"
       sources."babel-jest-25.1.0"
-      (sources."babel-loader-8.0.6" // {
+      (sources."babel-loader-8.1.0" // {
         dependencies = [
-          sources."minimist-0.0.8"
-          sources."mkdirp-0.5.1"
+          sources."mkdirp-0.5.4"
         ];
       })
       sources."babel-plugin-dynamic-import-node-2.3.0"
@@ -66774,7 +67550,7 @@ in
       sources."big.js-5.2.2"
       sources."binary-extensions-1.13.1"
       sources."bindings-1.5.0"
-      (sources."bl-4.0.1" // {
+      (sources."bl-4.0.2" // {
         dependencies = [
           sources."readable-stream-3.6.0"
         ];
@@ -66796,8 +67572,8 @@ in
       })
       (sources."browserify-16.5.0" // {
         dependencies = [
-          sources."minimist-0.0.8"
-          sources."mkdirp-0.5.1"
+          sources."mkdirp-0.5.4"
+          sources."punycode-1.4.1"
         ];
       })
       sources."browserify-aes-1.2.0"
@@ -66806,23 +67582,22 @@ in
       sources."browserify-rsa-4.0.1"
       sources."browserify-sign-4.0.4"
       sources."browserify-zlib-0.2.0"
-      sources."browserslist-4.9.1"
+      sources."browserslist-4.11.0"
       sources."bser-2.1.1"
       sources."buffer-5.5.0"
       sources."buffer-from-1.1.1"
       sources."buffer-xor-1.0.3"
       sources."builtin-modules-3.1.0"
       sources."builtin-status-codes-3.0.0"
-      (sources."cacache-12.0.3" // {
+      (sources."cacache-12.0.4" // {
         dependencies = [
-          sources."minimist-0.0.8"
-          sources."mkdirp-0.5.1"
+          sources."mkdirp-0.5.4"
         ];
       })
       sources."cache-base-1.0.1"
       sources."cached-path-relative-1.0.2"
       sources."camelcase-5.3.1"
-      sources."caniuse-lite-1.0.30001035"
+      sources."caniuse-lite-1.0.30001036"
       sources."capture-exit-2.0.0"
       sources."caseless-0.12.0"
       (sources."chalk-3.0.0" // {
@@ -66841,7 +67616,7 @@ in
               sources."normalize-path-2.1.1"
             ];
           })
-          sources."fsevents-1.2.11"
+          sources."fsevents-1.2.12"
           sources."micromatch-3.1.10"
         ];
       })
@@ -66891,8 +67666,7 @@ in
       sources."convert-source-map-1.7.0"
       (sources."copy-concurrently-1.0.5" // {
         dependencies = [
-          sources."minimist-0.0.8"
-          sources."mkdirp-0.5.1"
+          sources."mkdirp-0.5.4"
         ];
       })
       sources."copy-descriptor-0.1.1"
@@ -66937,7 +67711,7 @@ in
       sources."duplexer2-0.1.4"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.3.376"
+      sources."electron-to-chromium-1.3.383"
       sources."elliptic-6.5.2"
       sources."emoji-regex-7.0.3"
       sources."emojis-list-3.0.0"
@@ -66949,7 +67723,7 @@ in
       })
       sources."errno-0.1.7"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.17.4"
+      sources."es-abstract-1.17.5"
       sources."es-to-primitive-1.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."eslint-scope-4.0.3"
@@ -67001,7 +67775,7 @@ in
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-safe-stringify-2.0.7"
       sources."fb-watchman-2.0.1"
-      sources."figgy-pudding-3.5.1"
+      sources."figgy-pudding-3.5.2"
       sources."file-uri-to-path-1.0.0"
       (sources."fill-range-4.0.0" // {
         dependencies = [
@@ -67009,7 +67783,7 @@ in
         ];
       })
       sources."find-cache-dir-2.1.0"
-      sources."find-up-4.1.0"
+      sources."find-up-3.0.0"
       (sources."findup-sync-3.0.0" // {
         dependencies = [
           sources."micromatch-3.1.10"
@@ -67134,8 +67908,7 @@ in
       sources."jest-serializer-25.1.0"
       (sources."jest-util-25.1.0" // {
         dependencies = [
-          sources."minimist-0.0.8"
-          sources."mkdirp-0.5.1"
+          sources."mkdirp-0.5.4"
         ];
       })
       (sources."jest-worker-25.1.0" // {
@@ -67153,7 +67926,7 @@ in
       sources."json-schema-traverse-0.4.1"
       sources."json-stable-stringify-0.0.1"
       sources."json-stringify-safe-5.0.1"
-      sources."json5-2.1.1"
+      sources."json5-2.1.2"
       sources."jsonify-0.0.0"
       sources."jsonparse-1.3.1"
       sources."jsprim-1.4.1"
@@ -67170,7 +67943,7 @@ in
           sources."json5-1.0.1"
         ];
       })
-      sources."locate-path-5.0.0"
+      sources."locate-path-3.0.0"
       sources."lodash-4.17.15"
       sources."lodash.memoize-3.0.4"
       sources."loose-envify-1.4.0"
@@ -67178,7 +67951,6 @@ in
       sources."magic-string-0.25.7"
       sources."make-dir-2.1.0"
       sources."makeerror-1.0.11"
-      sources."mamacro-0.0.3"
       sources."map-age-cleaner-0.1.3"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
@@ -67212,8 +67984,7 @@ in
       sources."module-deps-6.2.2"
       (sources."move-concurrently-1.0.1" // {
         dependencies = [
-          sources."minimist-0.0.8"
-          sources."mkdirp-0.5.1"
+          sources."mkdirp-0.5.4"
         ];
       })
       sources."ms-2.1.2"
@@ -67229,6 +68000,7 @@ in
           sources."buffer-4.9.2"
           sources."events-3.1.0"
           sources."inherits-2.0.3"
+          sources."punycode-1.4.1"
           sources."stream-http-2.8.3"
           sources."timers-browserify-2.0.11"
           sources."tty-browserify-0.0.0"
@@ -67272,7 +68044,7 @@ in
       sources."p-finally-1.0.0"
       sources."p-is-promise-2.1.0"
       sources."p-limit-2.2.2"
-      sources."p-locate-4.1.0"
+      sources."p-locate-3.0.0"
       sources."p-try-2.2.0"
       sources."pako-1.0.11"
       sources."parallel-transform-1.2.0"
@@ -67284,7 +68056,7 @@ in
       sources."pascalcase-0.1.1"
       sources."path-browserify-0.0.1"
       sources."path-dirname-1.0.2"
-      sources."path-exists-4.0.0"
+      sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-key-2.0.1"
       sources."path-parse-1.0.6"
@@ -67292,19 +68064,13 @@ in
       sources."pbkdf2-3.0.17"
       sources."peek-stream-1.1.3"
       sources."performance-now-2.1.0"
-      sources."picomatch-2.2.1"
+      sources."picomatch-2.2.2"
       sources."pify-4.0.1"
       sources."pinkie-1.0.0"
       sources."pinkie-promise-1.0.0"
       sources."pirates-4.0.1"
-      (sources."pkg-dir-3.0.0" // {
-        dependencies = [
-          sources."find-up-3.0.0"
-          sources."locate-path-3.0.0"
-          sources."p-locate-3.0.0"
-          sources."path-exists-3.0.0"
-        ];
-      })
+      sources."pkg-dir-3.0.0"
+      sources."pkg-up-3.1.0"
       sources."posix-character-classes-0.1.1"
       sources."posix-getopt-git://github.com/anmonteiro/node-getopt#master"
       sources."prettier-1.19.1"
@@ -67322,7 +68088,7 @@ in
           sources."pump-2.0.1"
         ];
       })
-      sources."punycode-1.4.1"
+      sources."punycode-2.1.1"
       sources."qs-6.5.2"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
@@ -67344,7 +68110,7 @@ in
       sources."regenerate-1.4.0"
       sources."regenerate-unicode-properties-8.2.0"
       sources."regenerator-runtime-0.13.5"
-      sources."regenerator-transform-0.14.3"
+      sources."regenerator-transform-0.14.4"
       sources."regex-not-1.0.2"
       sources."regexpu-core-4.7.0"
       sources."regjsgen-0.5.1"
@@ -67396,7 +68162,7 @@ in
           sources."normalize-path-2.1.1"
         ];
       })
-      sources."schema-utils-1.0.0"
+      sources."schema-utils-2.6.5"
       sources."semver-5.7.1"
       sources."serialize-javascript-2.1.2"
       sources."set-blocking-2.0.0"
@@ -67509,13 +68275,14 @@ in
           sources."readable-stream-3.6.0"
         ];
       })
-      (sources."terser-4.6.6" // {
+      (sources."terser-4.6.7" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
       })
       (sources."terser-webpack-plugin-1.4.3" // {
         dependencies = [
+          sources."schema-utils-1.0.0"
           sources."source-map-0.6.1"
         ];
       })
@@ -67533,11 +68300,7 @@ in
       })
       sources."to-regex-3.0.2"
       sources."to-regex-range-2.1.1"
-      (sources."tough-cookie-2.5.0" // {
-        dependencies = [
-          sources."punycode-2.1.1"
-        ];
-      })
+      sources."tough-cookie-2.5.0"
       sources."tslib-1.11.1"
       sources."tty-browserify-0.0.1"
       sources."tunnel-agent-0.6.0"
@@ -67565,11 +68328,7 @@ in
         ];
       })
       sources."upath-1.2.0"
-      (sources."uri-js-4.2.2" // {
-        dependencies = [
-          sources."punycode-2.1.1"
-        ];
-      })
+      sources."uri-js-4.2.2"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
@@ -67592,12 +68351,12 @@ in
       sources."vm-browserify-1.1.2"
       sources."walker-1.0.7"
       sources."watchpack-1.6.0"
-      (sources."webpack-4.42.0" // {
+      (sources."webpack-4.42.1" // {
         dependencies = [
           sources."acorn-6.4.1"
           sources."micromatch-3.1.10"
-          sources."minimist-0.0.8"
-          sources."mkdirp-0.5.1"
+          sources."mkdirp-0.5.4"
+          sources."schema-utils-1.0.0"
         ];
       })
       (sources."webpack-cli-3.3.11" // {
@@ -67639,14 +68398,7 @@ in
       sources."xtend-4.0.2"
       sources."y18n-4.0.0"
       sources."yallist-3.1.1"
-      (sources."yargs-13.2.4" // {
-        dependencies = [
-          sources."find-up-3.0.0"
-          sources."locate-path-3.0.0"
-          sources."p-locate-3.0.0"
-          sources."path-exists-3.0.0"
-        ];
-      })
+      sources."yargs-13.2.4"
       sources."yargs-parser-13.1.2"
     ];
     buildInputs = globalBuildInputs;
@@ -68296,11 +69048,7 @@ in
           sources."is-extendable-1.0.1"
         ];
       })
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.4"
       sources."ms-2.0.0"
       sources."multipipe-0.1.2"
       sources."nanomatch-1.2.13"
@@ -68560,10 +69308,10 @@ in
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
     packageName = "mocha";
-    version = "7.1.0";
+    version = "7.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-7.1.0.tgz";
-      sha512 = "MymHK8UkU0K15Q/zX7uflZgVoRWiTjy0fXE/QjKts6mowUvGxOdPhZ2qj3b0iZdUrNZlW9LAIMFHB4IW+2b3EQ==";
+      url = "https://registry.npmjs.org/mocha/-/mocha-7.1.1.tgz";
+      sha512 = "3qQsu3ijNS3GkWcccT5Zw0hf/rWvu1fTN9sPvEd81hlwsr30GX2GcDSSoBxo24IR8FelmrAydGC6/1J5QQP4WA==";
     };
     dependencies = [
       sources."ansi-colors-3.2.3"
@@ -68598,7 +69346,7 @@ in
       sources."define-properties-1.1.3"
       sources."diff-3.5.0"
       sources."emoji-regex-7.0.3"
-      sources."es-abstract-1.17.4"
+      sources."es-abstract-1.17.5"
       sources."es-to-primitive-1.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
@@ -68610,7 +69358,7 @@ in
       sources."function-bind-1.1.1"
       sources."get-caller-file-2.0.5"
       sources."glob-7.1.3"
-      sources."glob-parent-5.1.0"
+      sources."glob-parent-5.1.1"
       sources."growl-1.10.5"
       sources."has-1.0.3"
       sources."has-flag-3.0.0"
@@ -68634,8 +69382,8 @@ in
       sources."lodash-4.17.15"
       sources."log-symbols-3.0.0"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
+      sources."minimist-1.2.5"
+      sources."mkdirp-0.5.3"
       sources."ms-2.1.1"
       sources."node-environment-flags-1.0.6"
       sources."normalize-path-3.0.0"
@@ -68649,7 +69397,7 @@ in
       sources."p-try-2.2.0"
       sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
-      sources."picomatch-2.2.1"
+      sources."picomatch-2.2.2"
       sources."readdirp-3.2.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-2.0.0"
@@ -68675,14 +69423,14 @@ in
       })
       sources."wrappy-1.0.2"
       sources."y18n-4.0.0"
-      (sources."yargs-13.3.0" // {
+      (sources."yargs-13.3.2" // {
         dependencies = [
           sources."ansi-regex-4.1.0"
           sources."string-width-3.1.0"
           sources."strip-ansi-5.2.0"
         ];
       })
-      sources."yargs-parser-13.1.1"
+      sources."yargs-parser-13.1.2"
       sources."yargs-unparser-1.6.0"
     ];
     buildInputs = globalBuildInputs;
@@ -68736,7 +69484,7 @@ in
       sources."path-loader-1.0.10"
       sources."process-nextick-args-2.0.1"
       sources."punycode-2.1.1"
-      sources."qs-6.9.1"
+      sources."qs-6.9.2"
       sources."readable-stream-2.3.7"
       sources."safe-buffer-5.1.2"
       sources."slash-3.0.0"
@@ -68906,10 +69654,10 @@ in
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
+      sources."minimist-1.2.5"
       sources."minipass-2.9.0"
       sources."minizlib-1.3.3"
-      sources."mkdirp-0.5.1"
+      sources."mkdirp-0.5.4"
       sources."nopt-4.0.3"
       sources."npmlog-4.1.2"
       sources."number-is-nan-1.0.1"
@@ -69119,11 +69867,7 @@ in
       sources."mime-types-2.1.26"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.4"
       sources."ms-2.0.0"
       sources."nan-2.14.0"
       sources."negotiator-0.6.2"
@@ -69314,10 +70058,10 @@ in
       sources."is-fullwidth-code-point-1.0.0"
       sources."isarray-1.0.0"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
+      sources."minimist-1.2.5"
       sources."minipass-2.9.0"
       sources."minizlib-1.3.3"
-      sources."mkdirp-0.5.1"
+      sources."mkdirp-0.5.4"
       sources."ms-2.1.2"
       sources."needle-2.4.0"
       sources."nopt-4.0.3"
@@ -69333,11 +70077,7 @@ in
       sources."osenv-0.1.5"
       sources."path-is-absolute-1.0.1"
       sources."process-nextick-args-2.0.1"
-      (sources."rc-1.2.8" // {
-        dependencies = [
-          sources."minimist-1.2.5"
-        ];
-      })
+      sources."rc-1.2.8"
       sources."readable-stream-2.3.7"
       sources."rimraf-2.7.1"
       sources."safe-buffer-5.1.2"
@@ -69375,7 +70115,7 @@ in
       sha512 = "7cRGr69ibl7vnEMWEO2qHhO4L6ft2XsySoE+mMSW7h2tODNTNECelCQtTA+kYfX1wlFS3axu52Y2Br0AV5D+ww==";
     };
     dependencies = [
-      sources."@babel/runtime-7.8.7"
+      sources."@babel/runtime-7.9.2"
       sources."@node-red/editor-api-1.0.4"
       sources."@node-red/editor-client-1.0.4"
       (sources."@node-red/nodes-1.0.4" // {
@@ -69660,11 +70400,7 @@ in
         ];
       })
       sources."minizlib-1.3.3"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.4"
       sources."moment-2.24.0"
       sources."moment-timezone-0.5.28"
       (sources."mqtt-2.18.8" // {
@@ -69941,10 +70677,10 @@ in
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
+      sources."minimist-1.2.5"
       sources."minipass-3.1.1"
       sources."minizlib-2.1.0"
-      sources."mkdirp-0.5.1"
+      sources."mkdirp-0.5.4"
       sources."ncp-0.4.2"
       sources."nijs-0.0.25"
       sources."nopt-3.0.6"
@@ -70088,7 +70824,7 @@ in
       sources."fill-range-7.0.1"
       sources."fsevents-2.1.2"
       sources."get-stream-3.0.0"
-      sources."glob-parent-5.1.0"
+      sources."glob-parent-5.1.1"
       sources."global-dirs-0.1.1"
       sources."got-6.7.1"
       sources."graceful-fs-4.2.3"
@@ -70125,7 +70861,7 @@ in
       sources."package-json-4.0.1"
       sources."path-is-inside-1.0.2"
       sources."path-key-2.0.1"
-      sources."picomatch-2.2.1"
+      sources."picomatch-2.2.2"
       sources."pify-3.0.0"
       sources."prepend-http-1.0.4"
       sources."pseudomap-1.0.2"
@@ -70178,10 +70914,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "6.14.2";
+    version = "6.14.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-6.14.2.tgz";
-      sha512 = "eBVjzvGJ9v2/jRJZFtIkvUVKmJ0sCJNNwc9Z1gI6llwaT7EBYWJe5o61Ipc1QR0FaDCKM3l1GizI09Ro3STJEw==";
+      url = "https://registry.npmjs.org/npm/-/npm-6.14.3.tgz";
+      sha512 = "3tQYVEEdSGQGYoXhZvNqW8faqCidfMMaL387RdDo4Uu5kQy4IgvJ13NIsWVMQ6e3QWlbicNMSpFiyzYfMUuPDw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -70196,10 +70932,10 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "4.0.4";
+    version = "4.0.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-4.0.4.tgz";
-      sha512 = "o1Db+kfi8Vvs345Xxpn+3WSUJtLa85F2hMF6v6kYfQuvTulsphvDzgbiVkp4vEKC8+BQETCag730XPJudYf4mA==";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-4.0.5.tgz";
+      sha512 = "dO2jeEmD1DAa/8NKxQAuhVsICDYWKTL1kZkvUFyRNphK4NiLk1HA7Jk5mCfl2L2xU5FxiGhNq5vgYlivu+2kjw==";
     };
     dependencies = [
       sources."@npmcli/ci-detect-1.2.0"
@@ -70248,12 +70984,12 @@ in
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
       sources."colors-1.0.3"
-      sources."commander-4.1.1"
+      sources."commander-5.0.0"
       sources."concat-map-0.0.1"
       sources."configstore-5.0.1"
       (sources."copy-concurrently-1.0.5" // {
         dependencies = [
-          sources."mkdirp-0.5.1"
+          sources."mkdirp-0.5.4"
         ];
       })
       sources."core-util-is-1.0.2"
@@ -70275,7 +71011,7 @@ in
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
       sources."fast-diff-1.2.0"
-      sources."figgy-pudding-3.5.1"
+      sources."figgy-pudding-3.5.2"
       sources."find-up-4.1.0"
       sources."fs-minipass-2.1.0"
       sources."fs-write-stream-atomic-1.0.10"
@@ -70321,11 +71057,7 @@ in
       sources."json-buffer-3.0.0"
       sources."json-parse-even-better-errors-2.2.0"
       sources."json-parse-helpfulerror-1.0.3"
-      (sources."json5-2.1.1" // {
-        dependencies = [
-          sources."minimist-1.2.5"
-        ];
-      })
+      sources."json5-2.1.2"
       sources."jsonparse-1.3.1"
       sources."keyv-3.1.0"
       sources."kleur-3.0.3"
@@ -70350,7 +71082,7 @@ in
       sources."make-fetch-happen-8.0.4"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
+      sources."minimist-1.2.5"
       (sources."minipass-3.1.1" // {
         dependencies = [
           sources."yallist-4.0.0"
@@ -70370,7 +71102,7 @@ in
       sources."mkdirp-1.0.3"
       (sources."move-concurrently-1.0.1" // {
         dependencies = [
-          sources."mkdirp-0.5.1"
+          sources."mkdirp-0.5.4"
         ];
       })
       sources."ms-2.1.2"
@@ -70410,14 +71142,10 @@ in
       sources."progress-2.0.3"
       sources."promise-inflight-1.0.1"
       sources."promise-retry-1.1.1"
-      sources."prompts-2.3.1"
+      sources."prompts-2.3.2"
       sources."pump-3.0.0"
       sources."pupa-2.0.1"
-      (sources."rc-1.2.8" // {
-        dependencies = [
-          sources."minimist-1.2.5"
-        ];
-      })
+      sources."rc-1.2.8"
       sources."rc-config-loader-3.0.0"
       sources."read-package-json-fast-1.1.3"
       sources."readable-stream-2.3.7"
@@ -70441,7 +71169,7 @@ in
       })
       sources."semver-utils-1.1.4"
       sources."signal-exit-3.0.2"
-      sources."sisteransi-1.0.4"
+      sources."sisteransi-1.0.5"
       sources."smart-buffer-4.1.0"
       sources."socks-2.3.3"
       sources."socks-proxy-agent-5.0.0"
@@ -70554,7 +71282,7 @@ in
       (sources."fstream-0.1.31" // {
         dependencies = [
           sources."graceful-fs-3.0.12"
-          sources."mkdirp-0.5.1"
+          sources."mkdirp-0.5.4"
         ];
       })
       sources."gauge-2.7.4"
@@ -70581,7 +71309,7 @@ in
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
+      sources."minimist-1.2.5"
       sources."mkdirp-0.3.5"
       sources."natives-1.1.6"
       sources."ncp-0.4.2"
@@ -70718,22 +71446,22 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.8.3"
-      sources."@babel/compat-data-7.8.6"
-      (sources."@babel/core-7.8.7" // {
+      sources."@babel/compat-data-7.9.0"
+      (sources."@babel/core-7.9.0" // {
         dependencies = [
-          sources."json5-2.1.1"
+          sources."json5-2.1.2"
           sources."source-map-0.5.7"
         ];
       })
-      (sources."@babel/generator-7.8.8" // {
+      (sources."@babel/generator-7.9.4" // {
         dependencies = [
           sources."source-map-0.5.7"
         ];
       })
       sources."@babel/helper-annotate-as-pure-7.8.3"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3"
-      sources."@babel/helper-builder-react-jsx-7.8.3"
-      sources."@babel/helper-call-delegate-7.8.7"
+      sources."@babel/helper-builder-react-jsx-7.9.0"
+      sources."@babel/helper-builder-react-jsx-experimental-7.9.0"
       sources."@babel/helper-compilation-targets-7.8.7"
       sources."@babel/helper-create-regexp-features-plugin-7.8.8"
       sources."@babel/helper-define-map-7.8.3"
@@ -70743,7 +71471,7 @@ in
       sources."@babel/helper-hoist-variables-7.8.3"
       sources."@babel/helper-member-expression-to-functions-7.8.3"
       sources."@babel/helper-module-imports-7.8.3"
-      sources."@babel/helper-module-transforms-7.8.6"
+      sources."@babel/helper-module-transforms-7.9.0"
       sources."@babel/helper-optimise-call-expression-7.8.3"
       sources."@babel/helper-plugin-utils-7.8.3"
       sources."@babel/helper-regex-7.8.3"
@@ -70751,17 +71479,19 @@ in
       sources."@babel/helper-replace-supers-7.8.6"
       sources."@babel/helper-simple-access-7.8.3"
       sources."@babel/helper-split-export-declaration-7.8.3"
+      sources."@babel/helper-validator-identifier-7.9.0"
       sources."@babel/helper-wrap-function-7.8.3"
-      sources."@babel/helpers-7.8.4"
-      sources."@babel/highlight-7.8.3"
-      sources."@babel/parser-7.8.8"
+      sources."@babel/helpers-7.9.2"
+      sources."@babel/highlight-7.9.0"
+      sources."@babel/parser-7.9.4"
       sources."@babel/plugin-proposal-async-generator-functions-7.8.3"
       sources."@babel/plugin-proposal-dynamic-import-7.8.3"
       sources."@babel/plugin-proposal-json-strings-7.8.3"
       sources."@babel/plugin-proposal-nullish-coalescing-operator-7.8.3"
-      sources."@babel/plugin-proposal-object-rest-spread-7.8.3"
+      sources."@babel/plugin-proposal-numeric-separator-7.8.3"
+      sources."@babel/plugin-proposal-object-rest-spread-7.9.0"
       sources."@babel/plugin-proposal-optional-catch-binding-7.8.3"
-      sources."@babel/plugin-proposal-optional-chaining-7.8.3"
+      sources."@babel/plugin-proposal-optional-chaining-7.9.0"
       sources."@babel/plugin-proposal-unicode-property-regex-7.8.8"
       sources."@babel/plugin-syntax-async-generators-7.8.4"
       sources."@babel/plugin-syntax-dynamic-import-7.8.3"
@@ -70769,6 +71499,7 @@ in
       sources."@babel/plugin-syntax-json-strings-7.8.3"
       sources."@babel/plugin-syntax-jsx-7.8.3"
       sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3"
+      sources."@babel/plugin-syntax-numeric-separator-7.8.3"
       sources."@babel/plugin-syntax-object-rest-spread-7.8.3"
       sources."@babel/plugin-syntax-optional-catch-binding-7.8.3"
       sources."@babel/plugin-syntax-optional-chaining-7.8.3"
@@ -70777,27 +71508,27 @@ in
       sources."@babel/plugin-transform-async-to-generator-7.8.3"
       sources."@babel/plugin-transform-block-scoped-functions-7.8.3"
       sources."@babel/plugin-transform-block-scoping-7.8.3"
-      sources."@babel/plugin-transform-classes-7.8.6"
+      sources."@babel/plugin-transform-classes-7.9.2"
       sources."@babel/plugin-transform-computed-properties-7.8.3"
       sources."@babel/plugin-transform-destructuring-7.8.8"
       sources."@babel/plugin-transform-dotall-regex-7.8.3"
       sources."@babel/plugin-transform-duplicate-keys-7.8.3"
       sources."@babel/plugin-transform-exponentiation-operator-7.8.3"
-      sources."@babel/plugin-transform-flow-strip-types-7.8.3"
-      sources."@babel/plugin-transform-for-of-7.8.6"
+      sources."@babel/plugin-transform-flow-strip-types-7.9.0"
+      sources."@babel/plugin-transform-for-of-7.9.0"
       sources."@babel/plugin-transform-function-name-7.8.3"
       sources."@babel/plugin-transform-literals-7.8.3"
       sources."@babel/plugin-transform-member-expression-literals-7.8.3"
-      sources."@babel/plugin-transform-modules-amd-7.8.3"
-      sources."@babel/plugin-transform-modules-commonjs-7.8.3"
-      sources."@babel/plugin-transform-modules-systemjs-7.8.3"
-      sources."@babel/plugin-transform-modules-umd-7.8.3"
+      sources."@babel/plugin-transform-modules-amd-7.9.0"
+      sources."@babel/plugin-transform-modules-commonjs-7.9.0"
+      sources."@babel/plugin-transform-modules-systemjs-7.9.0"
+      sources."@babel/plugin-transform-modules-umd-7.9.0"
       sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3"
       sources."@babel/plugin-transform-new-target-7.8.3"
       sources."@babel/plugin-transform-object-super-7.8.3"
-      sources."@babel/plugin-transform-parameters-7.8.8"
+      sources."@babel/plugin-transform-parameters-7.9.3"
       sources."@babel/plugin-transform-property-literals-7.8.3"
-      sources."@babel/plugin-transform-react-jsx-7.8.3"
+      sources."@babel/plugin-transform-react-jsx-7.9.4"
       sources."@babel/plugin-transform-regenerator-7.8.7"
       sources."@babel/plugin-transform-reserved-words-7.8.3"
       sources."@babel/plugin-transform-shorthand-properties-7.8.3"
@@ -70806,11 +71537,12 @@ in
       sources."@babel/plugin-transform-template-literals-7.8.3"
       sources."@babel/plugin-transform-typeof-symbol-7.8.4"
       sources."@babel/plugin-transform-unicode-regex-7.8.3"
-      sources."@babel/preset-env-7.8.7"
-      sources."@babel/runtime-7.8.7"
+      sources."@babel/preset-env-7.9.0"
+      sources."@babel/preset-modules-0.1.3"
+      sources."@babel/runtime-7.9.2"
       sources."@babel/template-7.8.6"
-      sources."@babel/traverse-7.8.6"
-      sources."@babel/types-7.8.7"
+      sources."@babel/traverse-7.9.0"
+      sources."@babel/types-7.9.0"
       sources."@iarna/toml-2.2.3"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.3"
@@ -70899,7 +71631,7 @@ in
           sources."pako-1.0.11"
         ];
       })
-      sources."browserslist-4.9.1"
+      sources."browserslist-4.11.0"
       (sources."buffer-4.9.2" // {
         dependencies = [
           sources."isarray-1.0.0"
@@ -70916,7 +71648,7 @@ in
       sources."callsites-2.0.0"
       sources."camelcase-5.3.1"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001035"
+      sources."caniuse-lite-1.0.30001036"
       sources."caseless-0.12.0"
       sources."chalk-2.4.2"
       sources."chokidar-2.1.8"
@@ -70990,7 +71722,12 @@ in
       sources."cssnano-util-get-match-4.0.0"
       sources."cssnano-util-raw-cache-4.0.1"
       sources."cssnano-util-same-parent-4.0.1"
-      sources."csso-4.0.2"
+      (sources."csso-4.0.3" // {
+        dependencies = [
+          sources."css-tree-1.0.0-alpha.39"
+          sources."mdn-data-2.0.6"
+        ];
+      })
       sources."cssom-0.3.8"
       sources."cssstyle-1.4.0"
       sources."dashdash-1.14.1"
@@ -71044,14 +71781,14 @@ in
       sources."duplexer2-0.1.4"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.376"
+      sources."electron-to-chromium-1.3.383"
       sources."elliptic-6.5.2"
       sources."emoji-regex-7.0.3"
       sources."encodeurl-1.0.2"
       sources."entities-1.1.2"
       sources."envinfo-7.5.0"
       sources."error-ex-1.3.2"
-      (sources."es-abstract-1.17.4" // {
+      (sources."es-abstract-1.17.5" // {
         dependencies = [
           sources."object-inspect-1.7.0"
         ];
@@ -71097,7 +71834,7 @@ in
       sources."fragment-cache-0.2.1"
       sources."fresh-0.5.2"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.2.11"
+      sources."fsevents-1.2.12"
       sources."function-bind-1.1.1"
       sources."gensync-1.0.0-beta.1"
       sources."get-caller-file-2.0.5"
@@ -71142,7 +71879,7 @@ in
       (sources."htmlnano-0.2.5" // {
         dependencies = [
           sources."posthtml-0.12.0"
-          sources."terser-4.6.6"
+          sources."terser-4.6.7"
         ];
       })
       (sources."htmlparser2-3.10.1" // {
@@ -71271,11 +72008,7 @@ in
           sources."is-extendable-1.0.1"
         ];
       })
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.4"
       sources."ms-2.1.2"
       sources."nan-2.14.0"
       (sources."nanomatch-1.2.13" // {
@@ -71339,6 +72072,7 @@ in
       sources."pbkdf2-3.0.17"
       sources."performance-now-2.1.0"
       sources."physical-cpu-count-2.0.0"
+      sources."pkg-up-3.1.0"
       sources."pn-1.1.0"
       sources."posix-character-classes-0.1.1"
       (sources."postcss-7.0.27" // {
@@ -71435,7 +72169,7 @@ in
       sources."regenerate-1.4.0"
       sources."regenerate-unicode-properties-8.2.0"
       sources."regenerator-runtime-0.13.5"
-      sources."regenerator-transform-0.14.3"
+      sources."regenerator-transform-0.14.4"
       (sources."regex-not-1.0.2" // {
         dependencies = [
           sources."extend-shallow-3.0.2"
@@ -71815,9 +72549,9 @@ in
       sources."mime-types-2.1.26"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.10"
-      (sources."mkdirp-0.5.1" // {
+      (sources."mkdirp-0.5.4" // {
         dependencies = [
-          sources."minimist-0.0.8"
+          sources."minimist-1.2.5"
         ];
       })
       sources."moment-2.24.0"
@@ -71910,7 +72644,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.18"
       sources."uglify-js-3.8.0"
-      sources."unix-dgram-2.0.3"
+      sources."unix-dgram-2.0.4"
       sources."unpipe-1.0.0"
       sources."uri-js-4.2.2"
       sources."util-deprecate-1.0.2"
@@ -72026,7 +72760,7 @@ in
       sources."dns-txt-2.0.2"
       sources."end-of-stream-1.4.4"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.17.4"
+      sources."es-abstract-1.17.5"
       sources."es-to-primitive-1.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."external-editor-2.2.0"
@@ -72036,8 +72770,7 @@ in
       sources."flatten-0.0.1"
       (sources."fs-chunk-store-1.7.0" // {
         dependencies = [
-          sources."minimist-0.0.8"
-          sources."mkdirp-0.5.1"
+          sources."mkdirp-0.5.4"
         ];
       })
       sources."fs.realpath-1.0.0"
@@ -72163,8 +72896,7 @@ in
       sources."pump-2.0.1"
       (sources."random-access-file-2.1.3" // {
         dependencies = [
-          sources."minimist-0.0.8"
-          sources."mkdirp-0.5.1"
+          sources."mkdirp-0.5.4"
         ];
       })
       sources."random-access-storage-1.4.1"
@@ -72307,12 +73039,11 @@ in
       (sources."bittorrent-tracker-7.7.0" // {
         dependencies = [
           sources."bencode-0.8.0"
-          sources."minimist-1.2.5"
           sources."ultron-1.0.2"
           sources."ws-1.1.5"
         ];
       })
-      sources."bl-4.0.1"
+      sources."bl-4.0.2"
       sources."blob-0.0.5"
       sources."bn.js-4.11.8"
       sources."bncode-0.5.3"
@@ -72469,9 +73200,13 @@ in
       sources."mime-types-2.1.26"
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
-      sources."morgan-1.9.1"
+      sources."minimist-1.2.5"
+      sources."mkdirp-0.5.4"
+      (sources."morgan-1.10.0" // {
+        dependencies = [
+          sources."depd-2.0.0"
+        ];
+      })
       sources."ms-2.0.0"
       sources."multiparty-4.2.1"
       sources."negotiator-0.6.2"
@@ -72635,10 +73370,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "4.11.6";
+    version = "4.12.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-4.11.6.tgz";
-      sha512 = "SJkYVP7BRVR/Q+J13RmB1/WC9dQDOTU6H9uTOmIFE5hbkdh83HqqvOBs7SjT+bUObqMicZ9csfreKxuZhGVvKw==";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-4.12.0.tgz";
+      sha512 = "Sjvf66dfk2d7kRssvHX6x+d0j9NgIE9262vCKviJC+kTPcpZEwxsF/RjQ/CX07UmlDYAX2TWqNZz7jeiksMKSA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -72653,10 +73388,10 @@ in
   prettier = nodeEnv.buildNodePackage {
     name = "prettier";
     packageName = "prettier";
-    version = "1.19.1";
+    version = "2.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz";
-      sha512 = "s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==";
+      url = "https://registry.npmjs.org/prettier/-/prettier-2.0.2.tgz";
+      sha512 = "5xJQIPT8BraI7ZnaDwSbu5zLrB6vvi8hVV58yHQ+QK64qrY40dULy0HSRlQ2/2IdzeBpjhDkqdcFBnFeDEMVdg==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -72708,16 +73443,21 @@ in
   pulp = nodeEnv.buildNodePackage {
     name = "pulp";
     packageName = "pulp";
-    version = "13.0.0";
+    version = "14.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pulp/-/pulp-13.0.0.tgz";
-      sha512 = "wjjAVuN1Shx6783NvTd8aPwWZ1pE94+isiWtdAJhedvbLqJuwe8p5CSNul9FS0WvBz7ejdrW0vc6wLDLsKX7Yw==";
+      url = "https://registry.npmjs.org/pulp/-/pulp-14.0.0.tgz";
+      sha512 = "K/s/BRG+AJpp+D3VES/c08kdxzMRKJYdZHIBnC27+6NS+3htwPPGRNTpPig+Sd6WKd5uZH3NASrBX+zgR5SQ6Q==";
     };
     dependencies = [
       sources."JSONStream-1.3.5"
       sources."acorn-7.1.1"
       sources."acorn-node-1.8.2"
       sources."acorn-walk-7.1.1"
+      sources."ansi-escapes-3.2.0"
+      sources."ansi-regex-4.1.0"
+      sources."ansi-styles-3.2.1"
+      sources."append-type-1.0.2"
+      sources."arch-2.1.1"
       sources."asn1.js-4.10.1"
       (sources."assert-1.5.0" // {
         dependencies = [
@@ -72725,6 +73465,7 @@ in
           sources."util-0.10.3"
         ];
       })
+      sources."astral-regex-1.0.0"
       sources."async-1.5.2"
       sources."balanced-match-1.0.0"
       sources."base64-js-1.3.1"
@@ -72759,11 +73500,22 @@ in
       sources."buffer-crc32-0.2.13"
       sources."buffer-from-1.1.1"
       sources."buffer-xor-1.0.3"
+      sources."build-purescript-0.4.1"
       sources."builtin-status-codes-3.0.0"
+      sources."byline-5.0.0"
       sources."cached-path-relative-1.0.2"
+      sources."cancelable-pipeline-1.0.0"
+      sources."cancelable-pump-0.4.0"
+      sources."chalk-2.4.2"
+      sources."chownr-1.1.4"
       sources."cipher-base-1.0.4"
+      sources."clean-stack-2.2.0"
+      sources."cli-cursor-2.1.0"
+      sources."color-convert-1.9.3"
+      sources."color-name-1.1.3"
       sources."colors-1.4.0"
       sources."combine-source-map-0.8.0"
+      sources."commander-2.20.3"
       sources."concat-map-0.0.1"
       (sources."concat-stream-2.0.0" // {
         dependencies = [
@@ -72777,38 +73529,52 @@ in
       sources."create-ecdh-4.0.3"
       sources."create-hash-1.2.0"
       sources."create-hmac-1.1.7"
+      sources."cross-spawn-6.0.5"
       sources."crypto-browserify-3.12.0"
       sources."dash-ast-1.0.0"
       sources."defined-1.0.0"
       sources."deps-sort-2.0.1"
       sources."des.js-1.0.1"
-      (sources."detective-5.2.0" // {
-        dependencies = [
-          sources."minimist-1.2.5"
-        ];
-      })
+      sources."detective-5.2.0"
       sources."diffie-hellman-5.0.3"
+      sources."dl-tar-0.8.1"
       sources."domain-browser-1.2.0"
+      sources."download-or-build-purescript-0.3.4"
+      sources."download-purescript-0.8.5"
+      sources."download-purescript-source-0.6.5"
       sources."duplexer2-0.1.4"
       sources."elliptic-6.5.2"
+      sources."emoji-regex-7.0.3"
+      sources."end-of-stream-1.4.4"
       sources."es6-promise-3.3.1"
+      sources."escape-string-regexp-1.0.5"
       sources."events-2.1.0"
       sources."evp_bytestokey-1.0.3"
+      sources."execa-1.0.0"
+      sources."executing-npm-path-1.0.0"
       sources."fast-safe-stringify-2.0.7"
+      sources."feint-1.0.3"
+      sources."file-to-npm-cache-0.1.0"
+      sources."filesize-4.2.1"
+      sources."find-pkg-dir-1.0.1"
+      sources."fs-minipass-1.2.7"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.1"
       sources."gaze-1.1.3"
       sources."get-assigned-identifiers-1.2.0"
+      sources."get-stream-4.1.0"
       sources."glob-7.1.6"
       sources."globule-1.3.1"
       sources."graceful-fs-4.2.3"
       sources."has-1.0.3"
+      sources."has-flag-3.0.0"
       sources."hash-base-3.0.4"
       sources."hash.js-1.1.7"
       sources."hmac-drbg-1.0.1"
       sources."htmlescape-1.1.1"
       sources."https-browserify-1.0.0"
       sources."ieee754-1.1.13"
+      sources."import-package-1.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."inline-source-map-0.6.2"
@@ -72817,23 +73583,37 @@ in
           sources."concat-stream-1.6.2"
         ];
       })
+      sources."inspect-with-kind-1.0.5"
+      sources."install-purescript-0.7.0"
+      sources."install-purescript-cli-0.4.2"
       sources."is-buffer-1.1.6"
+      sources."is-fullwidth-code-point-2.0.0"
+      sources."is-plain-obj-1.1.0"
+      sources."is-stream-1.1.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
       sources."json-stable-stringify-0.0.1"
       sources."jsonify-0.0.0"
       sources."jsonparse-1.3.1"
+      sources."kind-of-6.0.3"
       sources."labeled-stream-splicer-2.0.2"
+      sources."load-from-cwd-or-npm-3.0.4"
+      sources."load-request-from-cwd-or-npm-3.0.0"
       sources."lodash-4.17.15"
       sources."lodash.memoize-3.0.4"
+      sources."log-symbols-3.0.0"
+      sources."log-update-3.4.0"
       sources."md5.js-1.3.5"
       sources."miller-rabin-4.0.1"
       sources."mime-1.6.0"
+      sources."mimic-fn-1.2.0"
       sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
+      sources."minimist-1.2.5"
+      sources."minipass-2.9.0"
+      sources."minizlib-1.3.3"
+      sources."mkdirp-0.5.4"
       (sources."module-deps-6.2.2" // {
         dependencies = [
           sources."concat-stream-1.6.2"
@@ -72844,32 +73624,54 @@ in
           sources."through-2.2.7"
         ];
       })
+      sources."ms-2.1.2"
       sources."mute-stream-0.0.8"
+      sources."neat-stack-1.0.1"
+      sources."nice-try-1.0.5"
       sources."node-static-0.7.11"
+      sources."npcache-1.0.2"
+      sources."npm-cache-env-2.0.0"
+      sources."npm-cache-path-2.0.0"
+      sources."npm-cli-dir-3.0.1"
+      sources."npm-cli-path-3.1.2"
+      sources."npm-cli-version-1.0.0"
+      sources."npm-run-path-2.0.2"
+      sources."npm-version-compare-1.0.1"
       sources."object-assign-4.1.1"
       sources."once-1.4.0"
+      sources."onetime-2.0.1"
       (sources."optimist-0.6.1" // {
         dependencies = [
+          sources."minimist-0.0.10"
           sources."wordwrap-0.0.3"
         ];
       })
+      sources."optional-0.1.4"
       sources."os-browserify-0.3.0"
+      sources."p-finally-1.0.0"
       sources."pako-1.0.11"
       sources."parents-1.0.1"
       sources."parse-asn1-5.1.5"
       sources."path-browserify-0.0.1"
       sources."path-is-absolute-1.0.1"
+      sources."path-key-2.0.1"
       sources."path-parse-1.0.6"
       sources."path-platform-0.11.15"
+      sources."pause-fn-1.0.0"
+      sources."pause-methods-1.0.0"
       sources."pbkdf2-3.0.17"
+      sources."platform-name-1.0.0"
       sources."process-0.11.10"
       sources."process-nextick-args-2.0.1"
       sources."public-encrypt-4.0.3"
+      sources."pump-3.0.0"
       sources."punycode-1.4.1"
+      sources."purescript-0.12.5"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
       sources."randombytes-2.1.0"
       sources."randomfill-1.0.4"
+      sources."rate-map-1.0.5"
       sources."read-1.0.7"
       sources."read-only-stream-2.0.0"
       (sources."readable-stream-2.3.7" // {
@@ -72878,23 +73680,35 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
+      sources."reject-unsatisfied-npm-version-1.0.0"
       sources."resolve-1.15.1"
+      sources."resolve-from-npm-3.1.0"
+      sources."restore-cursor-2.0.0"
       sources."rimraf-2.7.1"
       sources."ripemd160-2.0.2"
+      sources."run-in-dir-0.3.0"
       sources."safe-buffer-5.2.0"
       sources."sander-0.5.1"
+      sources."semver-5.7.1"
       sources."sha.js-2.4.11"
       sources."shasum-1.0.2"
       sources."shasum-object-1.0.0"
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
       sources."shell-quote-1.7.2"
+      sources."signal-exit-3.0.2"
       sources."simple-concat-1.0.0"
-      (sources."sorcery-0.10.0" // {
+      sources."size-rate-0.3.1"
+      sources."slice-ansi-2.1.0"
+      sources."sorcery-0.10.0"
+      sources."source-map-0.5.7"
+      (sources."source-map-support-0.5.16" // {
         dependencies = [
-          sources."minimist-1.2.5"
+          sources."source-map-0.6.1"
         ];
       })
-      sources."source-map-0.5.7"
       sources."sourcemap-codec-1.4.8"
+      sources."spawn-stack-0.7.0"
       sources."stream-browserify-2.0.2"
       sources."stream-combiner2-1.1.1"
       (sources."stream-http-3.1.0" // {
@@ -72903,23 +73717,43 @@ in
         ];
       })
       sources."stream-splicer-2.0.1"
+      sources."string-width-3.1.0"
       sources."string_decoder-1.3.0"
-      (sources."subarg-1.0.0" // {
-        dependencies = [
-          sources."minimist-1.2.5"
-        ];
-      })
+      sources."strip-ansi-5.2.0"
+      sources."strip-eof-1.0.0"
+      sources."subarg-1.0.0"
+      sources."supports-color-5.5.0"
       sources."syntax-error-1.4.0"
+      sources."tar-4.4.13"
       (sources."temp-0.9.1" // {
         dependencies = [
           sources."rimraf-2.6.3"
         ];
       })
+      (sources."terser-4.6.7" // {
+        dependencies = [
+          sources."source-map-0.6.1"
+        ];
+      })
       sources."through-2.3.8"
       sources."through2-2.0.5"
+      sources."tilde-path-3.0.0"
       sources."timers-browserify-1.4.2"
       sources."tree-kill-1.2.2"
       sources."tty-browserify-0.0.1"
+      (sources."tty-truncate-1.0.5" // {
+        dependencies = [
+          sources."emoji-regex-8.0.0"
+          sources."is-fullwidth-code-point-3.0.0"
+          sources."string-width-4.2.0"
+          (sources."strip-ansi-6.0.0" // {
+            dependencies = [
+              sources."ansi-regex-5.0.0"
+            ];
+          })
+        ];
+      })
+      sources."tty-width-frame-1.0.3"
       sources."typedarray-0.0.6"
       sources."umd-3.0.3"
       sources."undeclared-identifiers-1.1.3"
@@ -72934,11 +73768,16 @@ in
         ];
       })
       sources."util-deprecate-1.0.2"
+      sources."vertical-meter-1.0.0"
       sources."vm-browserify-1.1.2"
       sources."which-1.3.1"
+      sources."win-user-installed-npm-cli-path-3.0.1"
       sources."wordwrap-1.0.0"
+      sources."wrap-ansi-5.1.0"
       sources."wrappy-1.0.2"
       sources."xtend-4.0.2"
+      sources."yallist-3.1.1"
+      sources."zen-observable-0.8.15"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -72988,7 +73827,7 @@ in
       sources."cycle-1.0.3"
       sources."deep-equal-2.0.1"
       sources."define-properties-1.1.3"
-      sources."es-abstract-1.17.4"
+      sources."es-abstract-1.17.5"
       sources."es-get-iterator-1.1.0"
       sources."es-to-primitive-1.2.1"
       sources."escape-string-regexp-1.0.5"
@@ -73019,11 +73858,7 @@ in
       sources."isstream-0.1.2"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.4"
       sources."mute-stream-0.0.8"
       sources."ncp-0.4.2"
       sources."object-inspect-1.7.0"
@@ -73098,8 +73933,8 @@ in
         ];
       })
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
+      sources."minimist-1.2.5"
+      sources."mkdirp-0.5.4"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."private-0.1.8"
@@ -73396,13 +74231,14 @@ in
   serverless = nodeEnv.buildNodePackage {
     name = "serverless";
     packageName = "serverless";
-    version = "1.66.0";
+    version = "1.67.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/serverless/-/serverless-1.66.0.tgz";
-      sha512 = "Syl/WikZfx+g6mIKb7XgwJO8S00XBYQCLJnrYxfM2VYRsp4dMx202n+/1XBgKXLeViLRx0ofEe/Xjn9GxRpSUQ==";
+      url = "https://registry.npmjs.org/serverless/-/serverless-1.67.0.tgz";
+      sha512 = "ocnzEW2op4KrdjnZ7aeadnX1/E6PdlsW8vv67/3sGlni1ep8JiKSRU0aPQqUmood98kEIo/sKvUlHrJcAm3eXg==";
     };
     dependencies = [
       sources."2-thenable-1.0.0"
+      sources."@babel/parser-7.9.4"
       sources."@nodelib/fs.scandir-2.1.3"
       sources."@nodelib/fs.stat-2.0.3"
       sources."@nodelib/fs.walk-1.2.4"
@@ -73425,7 +74261,7 @@ in
           sources."semver-6.3.0"
         ];
       })
-      (sources."@serverless/enterprise-plugin-3.5.0" // {
+      (sources."@serverless/enterprise-plugin-3.6.0" // {
         dependencies = [
           sources."fs-extra-8.1.0"
           sources."node-fetch-2.6.0"
@@ -73453,7 +74289,12 @@ in
       sources."@types/glob-7.1.1"
       sources."@types/lodash-4.14.149"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.9.1"
+      sources."@types/node-13.9.3"
+      (sources."@typescript-eslint/typescript-estree-2.25.0" // {
+        dependencies = [
+          sources."semver-6.3.0"
+        ];
+      })
       sources."adm-zip-0.4.14"
       sources."agent-base-6.0.0"
       sources."ansi-align-3.0.0"
@@ -73461,6 +74302,7 @@ in
       sources."ansi-regex-4.1.0"
       sources."ansi-styles-3.2.1"
       sources."anymatch-3.1.1"
+      sources."app-module-path-2.2.0"
       (sources."archive-type-4.0.0" // {
         dependencies = [
           sources."file-type-4.4.0"
@@ -73483,11 +74325,12 @@ in
       sources."array-uniq-1.0.3"
       sources."array-unique-0.3.2"
       sources."assign-symbols-1.0.0"
+      sources."ast-module-types-2.6.0"
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.639.0" // {
+      (sources."aws-sdk-2.644.0" // {
         dependencies = [
           sources."buffer-4.9.1"
           sources."uuid-3.3.2"
@@ -73529,7 +74372,11 @@ in
       sources."camelcase-5.3.1"
       sources."capture-stack-trace-1.0.1"
       sources."caw-2.0.1"
-      sources."chalk-2.4.2"
+      (sources."chalk-2.4.2" // {
+        dependencies = [
+          sources."supports-color-5.5.0"
+        ];
+      })
       sources."chardet-0.7.0"
       (sources."child-process-ext-2.1.0" // {
         dependencies = [
@@ -73579,7 +74426,12 @@ in
       })
       sources."concat-map-0.0.1"
       sources."config-chain-1.1.12"
-      sources."configstore-3.1.2"
+      (sources."configstore-3.1.2" // {
+        dependencies = [
+          sources."make-dir-1.3.0"
+          sources."pify-3.0.0"
+        ];
+      })
       sources."content-disposition-0.5.3"
       sources."cookie-0.3.1"
       sources."cookiejar-2.1.2"
@@ -73595,11 +74447,21 @@ in
           sources."type-1.2.0"
         ];
       })
-      sources."dayjs-1.8.22"
+      sources."dayjs-1.8.23"
       sources."debug-4.1.1"
       sources."decamelize-1.2.0"
       sources."decode-uri-component-0.2.0"
-      sources."decompress-4.2.0"
+      sources."decomment-0.9.2"
+      (sources."decompress-4.2.0" // {
+        dependencies = [
+          (sources."make-dir-1.3.0" // {
+            dependencies = [
+              sources."pify-3.0.0"
+            ];
+          })
+          sources."pify-2.3.0"
+        ];
+      })
       sources."decompress-response-3.3.0"
       sources."decompress-tar-4.1.1"
       (sources."decompress-tarbz2-4.1.1" // {
@@ -73612,13 +74474,25 @@ in
         dependencies = [
           sources."file-type-3.9.0"
           sources."get-stream-2.3.1"
+          sources."pify-2.3.0"
         ];
       })
       sources."deep-extend-0.6.0"
+      sources."deep-is-0.1.3"
       sources."defer-to-connect-1.1.3"
       sources."deferred-0.7.11"
       sources."define-property-2.0.2"
       sources."delayed-stream-1.0.0"
+      sources."dependency-tree-7.2.1"
+      sources."detective-amd-3.0.0"
+      sources."detective-cjs-3.1.1"
+      sources."detective-es6-2.1.0"
+      sources."detective-less-1.0.2"
+      sources."detective-postcss-3.0.1"
+      sources."detective-sass-3.0.1"
+      sources."detective-scss-2.0.1"
+      sources."detective-stylus-1.0.0"
+      sources."detective-typescript-5.7.0"
       sources."dir-glob-3.0.1"
       sources."dot-prop-4.2.0"
       sources."dotenv-8.2.0"
@@ -73632,6 +74506,7 @@ in
           sources."http-cache-semantics-3.8.1"
           sources."keyv-3.0.0"
           sources."lowercase-keys-1.0.0"
+          sources."make-dir-1.3.0"
           sources."normalize-url-2.0.1"
           sources."p-cancelable-0.4.1"
           sources."pify-3.0.0"
@@ -73643,9 +74518,11 @@ in
       sources."emoji-regex-7.0.3"
       sources."encoding-0.1.12"
       sources."end-of-stream-1.4.4"
+      sources."enhanced-resolve-4.1.1"
+      sources."errno-0.1.7"
       sources."es5-ext-0.10.53"
       sources."es6-iterator-2.0.3"
-      sources."es6-promisify-6.0.2"
+      sources."es6-promisify-6.1.0"
       (sources."es6-set-0.1.5" // {
         dependencies = [
           sources."es6-symbol-3.1.1"
@@ -73654,9 +74531,13 @@ in
       sources."es6-symbol-3.1.3"
       sources."es6-weak-map-2.0.3"
       sources."escape-string-regexp-1.0.5"
+      sources."escodegen-1.14.1"
+      sources."eslint-visitor-keys-1.1.0"
       sources."esniff-1.1.0"
       sources."esprima-4.0.1"
       sources."essentials-1.1.1"
+      sources."estraverse-4.3.0"
+      sources."esutils-2.0.3"
       sources."event-emitter-0.3.5"
       sources."events-1.1.1"
       (sources."execa-0.7.0" // {
@@ -73675,13 +74556,23 @@ in
       sources."fastq-1.6.1"
       sources."fd-slicer-1.1.0"
       sources."figures-3.2.0"
+      sources."file-exists-dazinatorfork-1.0.2"
       sources."file-type-5.2.0"
       sources."filename-reserved-regex-2.0.0"
       sources."filenamify-2.1.0"
       sources."filesize-3.6.1"
+      sources."filing-cabinet-2.5.1"
       sources."fill-range-7.0.1"
+      sources."find-0.3.0"
+      (sources."find-process-1.4.3" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."ms-2.0.0"
+        ];
+      })
       sources."find-requires-1.0.0"
       sources."flat-5.0.0"
+      sources."flatten-1.0.3"
       (sources."follow-redirects-1.5.10" // {
         dependencies = [
           sources."debug-3.1.0"
@@ -73706,16 +74597,24 @@ in
         ];
       })
       sources."fsevents-2.1.2"
+      sources."get-amd-module-type-3.0.0"
+      sources."get-own-enumerable-property-symbols-3.0.2"
       sources."get-proxy-2.1.0"
       sources."get-stdin-5.0.1"
       sources."get-stream-4.1.0"
       sources."get-value-2.0.6"
       sources."glob-7.1.6"
-      sources."glob-parent-5.1.0"
+      sources."glob-parent-5.1.1"
       sources."global-dirs-0.1.1"
       (sources."globby-6.1.0" // {
         dependencies = [
           sources."array-union-1.0.2"
+          sources."pify-2.3.0"
+        ];
+      })
+      (sources."gonzales-pe-4.2.4" // {
+        dependencies = [
+          sources."minimist-1.1.3"
         ];
       })
       sources."got-9.6.0"
@@ -73749,6 +74648,7 @@ in
       sources."immediate-3.0.6"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
+      sources."indexes-of-1.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.5"
@@ -73787,8 +74687,11 @@ in
       sources."is-plain-object-2.0.4"
       sources."is-promise-2.1.0"
       sources."is-redirect-1.0.0"
+      sources."is-regexp-1.0.0"
+      sources."is-relative-path-1.0.2"
       sources."is-retry-allowed-1.2.0"
       sources."is-stream-1.1.0"
+      sources."is-url-1.2.4"
       sources."is-windows-1.0.2"
       sources."is-wsl-2.1.1"
       sources."isarray-1.0.0"
@@ -73827,6 +74730,7 @@ in
         ];
       })
       sources."lazystream-1.0.0"
+      sources."levn-0.3.0"
       sources."lie-3.3.0"
       sources."lodash-4.17.15"
       (sources."log-6.0.0" // {
@@ -73838,14 +74742,11 @@ in
       sources."lru-cache-4.1.5"
       sources."lru-queue-0.1.0"
       sources."lsmod-1.0.0"
-      (sources."make-dir-1.3.0" // {
-        dependencies = [
-          sources."pify-3.0.0"
-        ];
-      })
+      sources."make-dir-2.1.0"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       sources."memoizee-0.4.14"
+      sources."memory-fs-0.5.0"
       sources."merge2-1.3.0"
       sources."methods-1.1.2"
       sources."micromatch-4.0.2"
@@ -73857,11 +74758,9 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
       sources."mixin-deep-1.3.2"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.4"
+      sources."module-definition-3.3.0"
+      sources."module-lookup-amd-6.2.0"
       sources."moment-2.24.0"
       sources."ms-2.1.2"
       sources."mute-stream-0.0.7"
@@ -73873,6 +74772,7 @@ in
       sources."nice-try-1.0.5"
       sources."node-dir-0.1.17"
       sources."node-fetch-1.7.3"
+      sources."node-source-walk-4.2.0"
       sources."normalize-path-3.0.0"
       sources."normalize-url-4.5.0"
       (sources."npm-conf-1.1.3" // {
@@ -73906,6 +74806,7 @@ in
           sources."is-wsl-1.1.0"
         ];
       })
+      sources."optionator-0.8.3"
       sources."os-tmpdir-1.0.2"
       sources."p-cancelable-1.1.0"
       sources."p-event-2.3.1"
@@ -73925,21 +74826,27 @@ in
       sources."path-is-inside-1.0.2"
       sources."path-key-2.0.1"
       sources."path-loader-1.0.10"
+      sources."path-parse-1.0.6"
       sources."path-type-4.0.0"
       sources."pend-1.2.0"
-      sources."picomatch-2.2.1"
-      sources."pify-2.3.0"
+      sources."picomatch-2.2.2"
+      sources."pify-4.0.1"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
+      sources."postcss-7.0.27"
+      sources."postcss-values-parser-1.5.0"
+      sources."precinct-6.2.0"
+      sources."prelude-ls-1.1.2"
       sources."prepend-http-2.0.0"
       sources."prettyoutput-1.2.0"
       sources."process-nextick-args-2.0.1"
       sources."promise-queue-2.2.5"
       sources."proto-list-1.2.4"
+      sources."prr-1.0.1"
       sources."pseudomap-1.0.2"
       sources."pump-3.0.0"
       sources."punycode-1.3.2"
-      sources."qs-6.9.1"
+      sources."qs-6.9.2"
       sources."query-string-5.1.1"
       sources."querystring-0.2.0"
       sources."ramda-0.26.1"
@@ -73957,6 +74864,10 @@ in
       sources."registry-url-5.1.0"
       sources."remove-trailing-separator-1.1.0"
       sources."replaceall-0.1.6"
+      sources."requirejs-2.3.6"
+      sources."requirejs-config-file-3.1.2"
+      sources."resolve-1.15.1"
+      sources."resolve-dependency-path-2.0.0"
       sources."resolve-url-0.2.1"
       sources."responselike-1.0.2"
       sources."restore-cursor-2.0.0"
@@ -73969,6 +74880,7 @@ in
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
+      sources."sass-lookup-3.0.0"
       sources."sax-1.2.1"
       (sources."seek-bzip-1.0.5" // {
         dependencies = [
@@ -74051,18 +74963,21 @@ in
       sources."strict-uri-encode-1.1.0"
       sources."string-width-3.1.0"
       sources."string_decoder-1.1.1"
+      sources."stringify-object-3.3.0"
       sources."strip-ansi-5.2.0"
       sources."strip-dirs-2.1.0"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
       sources."strip-outer-1.0.1"
+      sources."stylus-lookup-3.0.2"
       (sources."superagent-3.8.3" // {
         dependencies = [
           sources."debug-3.2.6"
         ];
       })
-      sources."supports-color-5.5.0"
+      sources."supports-color-6.1.0"
       sources."tabtab-3.0.2"
+      sources."tapable-1.1.3"
       sources."tar-stream-1.6.2"
       sources."term-size-1.2.0"
       sources."through-2.3.8"
@@ -74080,17 +74995,22 @@ in
       sources."to-regex-3.0.2"
       sources."to-regex-range-5.0.1"
       sources."traverse-0.6.6"
+      sources."traverse-chain-0.1.0"
       sources."trim-repeated-1.0.0"
       sources."tslib-1.11.1"
+      sources."tsutils-3.17.1"
       sources."tunnel-agent-0.6.0"
       sources."type-2.0.0"
+      sources."type-check-0.3.2"
       sources."type-fest-0.11.0"
+      sources."typescript-3.8.3"
       sources."unbzip2-stream-1.3.3"
       (sources."union-value-1.0.1" // {
         dependencies = [
           sources."is-extendable-0.1.1"
         ];
       })
+      sources."uniq-1.0.1"
       sources."unique-string-1.0.0"
       sources."universalify-0.1.2"
       (sources."unset-value-1.0.0" // {
@@ -74138,6 +75058,7 @@ in
           sources."strip-ansi-4.0.0"
         ];
       })
+      sources."word-wrap-1.2.3"
       sources."wrappy-1.0.2"
       sources."write-file-atomic-2.4.3"
       sources."ws-7.2.3"
@@ -74289,8 +75210,8 @@ in
       sources."mime-1.6.0"
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
+      sources."minimist-1.2.5"
+      sources."mkdirp-0.5.4"
       sources."moment-2.7.0"
       sources."ms-2.0.0"
       sources."mute-stream-0.0.8"
@@ -74689,8 +75610,8 @@ in
       sources."lru-cache-2.2.0"
       sources."mime-1.6.0"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
+      sources."minimist-1.2.5"
+      sources."mkdirp-0.5.4"
       sources."mv-2.1.1"
       sources."nan-2.14.0"
       sources."ncp-2.0.0"
@@ -74789,10 +75710,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.299.0";
+    version = "1.304.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.299.0.tgz";
-      sha512 = "K2dlmwlmJpD7CZE8B8GguwIJmjOWdXzQ7UlcFIscg8y0tP8OT9a1gouLgBaU4uyS5J5wByipGNX1Cpwi6WRt5w==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.304.0.tgz";
+      sha512 = "1wAkvgvzOyUbbKEMXGgY2UULcfvAYPywlC7Whm3DCffAdx8i1ZMT9hWaOZxhj5K94h3doY3LRb6Xq6lbfb0jDw==";
     };
     dependencies = [
       sources."@snyk/cli-interface-2.3.2"
@@ -74813,7 +75734,7 @@ in
       sources."@types/debug-4.1.5"
       sources."@types/events-3.0.0"
       sources."@types/js-yaml-3.12.2"
-      sources."@types/node-13.9.1"
+      sources."@types/node-13.9.3"
       sources."@types/restify-4.3.6"
       sources."@types/semver-5.5.0"
       sources."@types/xml2js-0.4.3"
@@ -74831,7 +75752,8 @@ in
       sources."ast-types-0.13.2"
       sources."async-1.5.2"
       sources."balanced-match-1.0.0"
-      (sources."bl-4.0.1" // {
+      sources."base64-js-1.3.1"
+      (sources."bl-4.0.2" // {
         dependencies = [
           sources."readable-stream-3.6.0"
           sources."string_decoder-1.3.0"
@@ -74839,6 +75761,7 @@ in
       })
       sources."boxen-1.3.0"
       sources."brace-expansion-1.1.11"
+      sources."buffer-5.5.0"
       sources."buffer-from-1.1.1"
       sources."bytes-3.1.0"
       sources."camelcase-4.1.0"
@@ -74938,6 +75861,7 @@ in
       })
       sources."https-proxy-agent-3.0.1"
       sources."iconv-lite-0.4.24"
+      sources."ieee754-1.1.13"
       sources."immediate-3.0.6"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
@@ -75066,7 +75990,7 @@ in
       sources."signal-exit-3.0.2"
       sources."smart-buffer-4.1.0"
       sources."snyk-config-2.2.3"
-      (sources."snyk-docker-plugin-2.2.2" // {
+      (sources."snyk-docker-plugin-2.6.1" // {
         dependencies = [
           sources."debug-4.1.1"
         ];
@@ -75608,7 +76532,7 @@ in
       })
       sources."epidemic-broadcast-trees-7.0.0"
       sources."errno-0.1.7"
-      sources."es-abstract-1.17.4"
+      sources."es-abstract-1.17.5"
       sources."es-to-primitive-1.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."exit-hook-1.1.1"
@@ -75655,7 +76579,7 @@ in
       sources."for-own-0.1.5"
       sources."fragment-cache-0.2.1"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.2.11"
+      sources."fsevents-1.2.12"
       sources."function-bind-1.1.1"
       sources."get-value-2.0.6"
       sources."glob-6.0.4"
@@ -75813,11 +76737,7 @@ in
           sources."is-extendable-1.0.1"
         ];
       })
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.4"
       sources."monotonic-timestamp-0.0.9"
       sources."moo-0.5.1"
       sources."ms-2.1.2"
@@ -76346,7 +77266,7 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      (sources."aws-sdk-2.639.0" // {
+      (sources."aws-sdk-2.644.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -76592,7 +77512,7 @@ in
       sources."https-proxy-agent-1.0.0"
       sources."iconv-lite-0.4.24"
       sources."ieee754-1.1.13"
-      sources."in-publish-2.0.0"
+      sources."in-publish-2.0.1"
       sources."indexof-0.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -76635,11 +77555,7 @@ in
       sources."json-schema-faker-0.2.16"
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
-      (sources."json5-1.0.1" // {
-        dependencies = [
-          sources."minimist-1.2.5"
-        ];
-      })
+      sources."json5-1.0.1"
       sources."jsonpointer-4.0.1"
       sources."jspath-0.3.4"
       (sources."jsprim-1.4.1" // {
@@ -76712,9 +77628,9 @@ in
       sources."mimic-fn-2.1.0"
       sources."minicap-prebuilt-2.3.0"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
+      sources."minimist-1.2.5"
       sources."minitouch-prebuilt-1.2.0"
-      sources."mkdirp-0.5.1"
+      sources."mkdirp-0.5.4"
       sources."moment-2.24.0"
       sources."ms-2.1.2"
       sources."multer-1.4.2"
@@ -76945,7 +77861,7 @@ in
         dependencies = [
           sources."debug-3.2.6"
           sources."form-data-2.5.1"
-          sources."qs-6.9.1"
+          sources."qs-6.9.2"
           sources."readable-stream-2.3.7"
           sources."string_decoder-1.1.1"
         ];
@@ -76958,7 +77874,7 @@ in
           sources."esprima-4.0.1"
           sources."js-yaml-3.13.1"
           sources."lodash-3.10.1"
-          sources."qs-6.9.1"
+          sources."qs-6.9.2"
         ];
       })
       sources."swagger-schema-official-2.0.0-bab6bed"
@@ -77141,7 +78057,12 @@ in
       sources."css-select-base-adapter-0.1.1"
       sources."css-tree-1.0.0-alpha.37"
       sources."css-what-3.2.1"
-      sources."csso-4.0.2"
+      (sources."csso-4.0.3" // {
+        dependencies = [
+          sources."css-tree-1.0.0-alpha.39"
+          sources."mdn-data-2.0.6"
+        ];
+      })
       sources."define-properties-1.1.3"
       (sources."dom-serializer-0.2.2" // {
         dependencies = [
@@ -77151,7 +78072,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domutils-1.7.0"
       sources."entities-2.0.0"
-      sources."es-abstract-1.17.4"
+      sources."es-abstract-1.17.5"
       sources."es-to-primitive-1.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
@@ -77165,8 +78086,8 @@ in
       sources."is-symbol-1.0.3"
       sources."js-yaml-3.13.1"
       sources."mdn-data-2.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
+      sources."minimist-1.2.5"
+      sources."mkdirp-0.5.4"
       sources."nth-check-1.0.2"
       sources."object-inspect-1.7.0"
       sources."object-keys-1.1.1"
@@ -77388,7 +78309,7 @@ in
       sources."fresh-0.5.2"
       sources."fs-extra-0.24.0"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.2.11"
+      sources."fsevents-1.2.12"
       sources."get-stream-3.0.0"
       sources."get-value-2.0.6"
       sources."glob-7.1.6"
@@ -77589,7 +78510,7 @@ in
         dependencies = [
           sources."debug-3.2.6"
           sources."ms-2.1.2"
-          sources."qs-6.9.1"
+          sources."qs-6.9.2"
           sources."superagent-3.8.3"
         ];
       })
@@ -77837,7 +78758,7 @@ in
       sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b";
     };
     dependencies = [
-      sources."@types/node-13.9.1"
+      sources."@types/node-13.9.3"
       sources."ajv-6.12.0"
       sources."ansi-regex-4.1.0"
       sources."ansi-styles-3.2.1"
@@ -77864,7 +78785,7 @@ in
       sources."debug-4.1.1"
       sources."decamelize-1.2.0"
       sources."delayed-stream-1.0.0"
-      sources."discord.js-11.6.2"
+      sources."discord.js-11.6.3"
       sources."ecc-jsbn-0.1.2"
       sources."emoji-regex-7.0.3"
       sources."esprima-4.0.1"
@@ -78057,7 +78978,7 @@ in
       sources."define-properties-1.1.3"
       sources."diff-4.0.2"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.17.4"
+      sources."es-abstract-1.17.5"
       sources."es-to-primitive-1.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
@@ -78101,11 +79022,7 @@ in
       sources."js-yaml-3.13.1"
       sources."json-parse-better-errors-1.0.2"
       sources."json-stable-stringify-1.0.1"
-      (sources."json5-2.1.1" // {
-        dependencies = [
-          sources."minimist-1.2.5"
-        ];
-      })
+      sources."json5-2.1.2"
       sources."jsonify-0.0.0"
       sources."levn-0.3.0"
       sources."load-json-file-1.1.0"
@@ -78116,8 +79033,8 @@ in
       sources."markdown-escapes-1.0.4"
       sources."md5-2.2.1"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
+      sources."minimist-1.2.5"
+      sources."mkdirp-0.5.4"
       sources."ms-2.1.2"
       sources."normalize-package-data-2.5.0"
       sources."number-is-nan-1.0.1"
@@ -78157,7 +79074,7 @@ in
       })
       sources."readable-stream-2.3.7"
       sources."regexp.prototype.flags-1.3.0"
-      sources."remark-frontmatter-1.3.2"
+      sources."remark-frontmatter-1.3.3"
       sources."remark-parse-5.0.0"
       sources."repeat-string-1.6.1"
       sources."replace-ext-1.0.0"
@@ -78268,7 +79185,7 @@ in
     };
     dependencies = [
       sources."define-properties-1.1.3"
-      sources."es-abstract-1.17.4"
+      sources."es-abstract-1.17.5"
       sources."es-to-primitive-1.2.1"
       sources."function-bind-1.1.1"
       sources."has-1.0.3"
@@ -78480,7 +79397,7 @@ in
       sources."redent-1.0.0"
       sources."registry-auth-token-3.4.0"
       sources."registry-url-3.1.0"
-      sources."remark-frontmatter-1.3.2"
+      sources."remark-frontmatter-1.3.3"
       sources."remark-message-control-4.2.0"
       sources."remark-parse-4.0.0"
       sources."remark-retext-3.1.3"
@@ -78745,7 +79662,7 @@ in
       sources."buffer-from-1.1.1"
       sources."concat-stream-2.0.0"
       sources."define-properties-1.1.3"
-      sources."es-abstract-1.17.4"
+      sources."es-abstract-1.17.5"
       sources."es-to-primitive-1.2.1"
       sources."function-bind-1.1.1"
       sources."has-1.0.3"
@@ -78798,7 +79715,7 @@ in
       sources."define-properties-1.1.3"
       sources."emoji-regex-6.5.1"
       sources."end-with-1.0.2"
-      sources."es-abstract-1.17.4"
+      sources."es-abstract-1.17.5"
       sources."es-to-primitive-1.2.1"
       sources."function-bind-1.1.1"
       sources."has-1.0.3"
@@ -78894,7 +79811,7 @@ in
     dependencies = [
       sources."array-includes-3.1.1"
       sources."define-properties-1.1.3"
-      sources."es-abstract-1.17.4"
+      sources."es-abstract-1.17.5"
       sources."es-to-primitive-1.2.1"
       sources."function-bind-1.1.1"
       sources."has-1.0.3"
@@ -78978,7 +79895,7 @@ in
       sources."@types/debug-4.1.5"
       sources."@types/http-cache-semantics-4.0.0"
       sources."@types/keyv-3.1.1"
-      sources."@types/node-13.9.1"
+      sources."@types/node-13.9.3"
       sources."@types/responselike-1.0.0"
       sources."abbrev-1.1.1"
       sources."abstract-logging-1.0.0"
@@ -79022,7 +79939,7 @@ in
       sources."buffer-equal-constant-time-1.0.1"
       sources."busboy-0.3.1"
       sources."bytes-3.1.0"
-      sources."cacheable-lookup-2.0.0"
+      sources."cacheable-lookup-2.0.1"
       sources."cacheable-request-7.0.1"
       sources."callsite-1.0.0"
       sources."caseless-0.12.0"
@@ -79195,11 +80112,7 @@ in
       sources."minimist-1.2.5"
       sources."minipass-2.9.0"
       sources."minizlib-1.3.3"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.4"
       sources."ms-2.0.0"
       sources."mute-stream-0.0.8"
       sources."nan-2.14.0"
@@ -79915,7 +80828,7 @@ in
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@types/color-name-1.1.1"
-      sources."@types/node-13.9.1"
+      sources."@types/node-13.9.3"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       sources."after-0.8.2"
@@ -80198,7 +81111,7 @@ in
           sources."debug-4.1.1"
           sources."mime-2.4.4"
           sources."ms-2.1.2"
-          sources."qs-6.9.1"
+          sources."qs-6.9.2"
           sources."semver-6.3.0"
         ];
       })
@@ -80263,7 +81176,7 @@ in
       sources."vscode-languageserver-protocol-3.15.3"
       sources."vscode-languageserver-protocol-foldingprovider-2.0.1"
       sources."vscode-languageserver-types-3.15.1"
-      sources."vscode-nls-4.1.1"
+      sources."vscode-nls-4.1.2"
       sources."vscode-uri-1.0.8"
     ];
     buildInputs = globalBuildInputs;
@@ -80288,12 +81201,12 @@ in
       sources."typescript-2.9.2"
       (sources."vscode-css-languageservice-3.0.13" // {
         dependencies = [
-          sources."vscode-nls-4.1.1"
+          sources."vscode-nls-4.1.2"
         ];
       })
       (sources."vscode-html-languageservice-2.1.12" // {
         dependencies = [
-          sources."vscode-nls-4.1.1"
+          sources."vscode-nls-4.1.2"
         ];
       })
       sources."vscode-jsonrpc-5.0.1"
@@ -80487,8 +81400,8 @@ in
       sources."mime-types-2.1.26"
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mkdirp-0.5.1"
+      sources."minimist-1.2.5"
+      sources."mkdirp-0.5.4"
       sources."multimatch-2.1.0"
       sources."mute-stream-0.0.7"
       sources."neo-async-2.6.1"
@@ -80501,7 +81414,11 @@ in
       sources."object-assign-4.1.1"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
-      sources."optimist-0.6.1"
+      (sources."optimist-0.6.1" // {
+        dependencies = [
+          sources."minimist-0.0.10"
+        ];
+      })
       sources."ora-1.4.0"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
@@ -80616,7 +81533,8 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.8.3"
-      sources."@babel/highlight-7.8.3"
+      sources."@babel/helper-validator-identifier-7.9.0"
+      sources."@babel/highlight-7.9.0"
       sources."@emmetio/extract-abbreviation-0.1.6"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.3"
@@ -80632,7 +81550,7 @@ in
       sources."@starptech/rehype-webparser-0.10.0"
       sources."@starptech/webparser-0.10.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-13.9.1"
+      sources."@types/node-13.9.3"
       sources."@types/unist-2.0.3"
       sources."@types/vfile-3.0.2"
       sources."@types/vfile-message-2.0.0"
@@ -80853,7 +81771,11 @@ in
       sources."eslint-visitor-keys-1.1.0"
       sources."espree-5.0.1"
       sources."esprima-4.0.1"
-      sources."esquery-1.1.0"
+      (sources."esquery-1.2.0" // {
+        dependencies = [
+          sources."estraverse-5.0.0"
+        ];
+      })
       sources."esrecurse-4.2.1"
       sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
@@ -80924,7 +81846,7 @@ in
       sources."format-0.2.2"
       sources."fragment-cache-0.2.1"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.2.11"
+      sources."fsevents-1.2.12"
       sources."function-bind-1.1.1"
       sources."functional-red-black-tree-1.0.1"
       sources."get-caller-file-1.0.3"
@@ -80971,14 +81893,14 @@ in
       sources."has-yarn-2.1.0"
       sources."hast-util-embedded-1.0.5"
       sources."hast-util-has-property-1.0.4"
-      sources."hast-util-is-body-ok-link-1.0.2"
+      sources."hast-util-is-body-ok-link-1.0.3"
       sources."hast-util-is-element-1.0.4"
       sources."hast-util-parse-selector-2.2.4"
-      sources."hast-util-to-string-1.0.2"
+      sources."hast-util-to-string-1.0.3"
       sources."hast-util-whitespace-1.0.4"
       sources."hosted-git-info-2.8.8"
       sources."html-void-elements-1.0.5"
-      sources."html-whitespace-sensitive-tag-names-1.0.1"
+      sources."html-whitespace-sensitive-tag-names-1.0.2"
       sources."http-cache-semantics-4.1.0"
       sources."iconv-lite-0.4.24"
       sources."ignore-3.3.10"
@@ -81050,7 +81972,7 @@ in
       sources."json-parse-better-errors-1.0.2"
       sources."json-schema-traverse-0.4.1"
       sources."json-stable-stringify-without-jsonify-1.0.1"
-      sources."json5-2.1.1"
+      sources."json5-2.1.2"
       sources."jsonc-parser-1.0.3"
       sources."keyv-3.1.0"
       sources."kind-of-6.0.3"
@@ -81111,11 +82033,7 @@ in
           sources."is-extendable-1.0.1"
         ];
       })
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.4"
       sources."mout-0.5.0"
       sources."ms-2.1.2"
       sources."mute-stream-0.0.7"
@@ -81556,7 +82474,7 @@ in
       sources."vscode-languageserver-protocol-3.15.3"
       sources."vscode-languageserver-textdocument-1.0.1"
       sources."vscode-languageserver-types-3.15.1"
-      sources."vscode-nls-4.1.1"
+      sources."vscode-nls-4.1.2"
       sources."vscode-textbuffer-1.0.0"
       sources."vscode-uri-1.0.8"
       (sources."vue-eslint-parser-6.0.5" // {
@@ -81615,7 +82533,8 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.8.3"
-      (sources."@babel/highlight-7.8.3" // {
+      sources."@babel/helper-validator-identifier-7.9.0"
+      (sources."@babel/highlight-7.9.0" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.2"
@@ -81627,14 +82546,14 @@ in
       })
       sources."@babel/polyfill-7.7.0"
       sources."@babel/runtime-7.7.7"
-      sources."@babel/runtime-corejs3-7.8.7"
+      sources."@babel/runtime-corejs3-7.9.2"
       sources."@cliqz-oss/firefox-client-0.3.1"
       sources."@cliqz-oss/node-firefox-connect-1.2.1"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@types/color-name-1.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.9.1"
+      sources."@types/node-13.9.3"
       sources."JSONSelect-0.2.1"
       sources."acorn-6.4.1"
       sources."acorn-jsx-5.2.0"
@@ -81773,7 +82692,7 @@ in
       sources."cheerio-1.0.0-rc.3"
       (sources."chokidar-2.1.8" // {
         dependencies = [
-          sources."fsevents-1.2.11"
+          sources."fsevents-1.2.12"
           sources."normalize-path-3.0.0"
         ];
       })
@@ -81894,7 +82813,7 @@ in
       sources."end-of-stream-1.4.4"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
-      sources."es-abstract-1.17.4"
+      sources."es-abstract-1.17.5"
       sources."es-to-primitive-1.2.1"
       sources."es5-ext-0.10.53"
       sources."es6-error-4.1.1"
@@ -81980,7 +82899,11 @@ in
         ];
       })
       sources."esprima-4.0.1"
-      sources."esquery-1.1.0"
+      (sources."esquery-1.2.0" // {
+        dependencies = [
+          sources."estraverse-5.0.0"
+        ];
+      })
       sources."esrecurse-4.2.1"
       sources."estraverse-4.3.0"
       sources."esutils-2.0.3"
@@ -82700,30 +83623,30 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "4.42.0";
+    version = "4.42.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-4.42.0.tgz";
-      sha512 = "EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w==";
+      url = "https://registry.npmjs.org/webpack/-/webpack-4.42.1.tgz";
+      sha512 = "SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg==";
     };
     dependencies = [
-      sources."@webassemblyjs/ast-1.8.5"
-      sources."@webassemblyjs/floating-point-hex-parser-1.8.5"
-      sources."@webassemblyjs/helper-api-error-1.8.5"
-      sources."@webassemblyjs/helper-buffer-1.8.5"
-      sources."@webassemblyjs/helper-code-frame-1.8.5"
-      sources."@webassemblyjs/helper-fsm-1.8.5"
-      sources."@webassemblyjs/helper-module-context-1.8.5"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.8.5"
-      sources."@webassemblyjs/helper-wasm-section-1.8.5"
-      sources."@webassemblyjs/ieee754-1.8.5"
-      sources."@webassemblyjs/leb128-1.8.5"
-      sources."@webassemblyjs/utf8-1.8.5"
-      sources."@webassemblyjs/wasm-edit-1.8.5"
-      sources."@webassemblyjs/wasm-gen-1.8.5"
-      sources."@webassemblyjs/wasm-opt-1.8.5"
-      sources."@webassemblyjs/wasm-parser-1.8.5"
-      sources."@webassemblyjs/wast-parser-1.8.5"
-      sources."@webassemblyjs/wast-printer-1.8.5"
+      sources."@webassemblyjs/ast-1.9.0"
+      sources."@webassemblyjs/floating-point-hex-parser-1.9.0"
+      sources."@webassemblyjs/helper-api-error-1.9.0"
+      sources."@webassemblyjs/helper-buffer-1.9.0"
+      sources."@webassemblyjs/helper-code-frame-1.9.0"
+      sources."@webassemblyjs/helper-fsm-1.9.0"
+      sources."@webassemblyjs/helper-module-context-1.9.0"
+      sources."@webassemblyjs/helper-wasm-bytecode-1.9.0"
+      sources."@webassemblyjs/helper-wasm-section-1.9.0"
+      sources."@webassemblyjs/ieee754-1.9.0"
+      sources."@webassemblyjs/leb128-1.9.0"
+      sources."@webassemblyjs/utf8-1.9.0"
+      sources."@webassemblyjs/wasm-edit-1.9.0"
+      sources."@webassemblyjs/wasm-gen-1.9.0"
+      sources."@webassemblyjs/wasm-opt-1.9.0"
+      sources."@webassemblyjs/wasm-parser-1.9.0"
+      sources."@webassemblyjs/wast-parser-1.9.0"
+      sources."@webassemblyjs/wast-printer-1.9.0"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
       sources."acorn-6.4.1"
@@ -82779,7 +83702,7 @@ in
       sources."buffer-from-1.1.1"
       sources."buffer-xor-1.0.3"
       sources."builtin-status-codes-3.0.0"
-      sources."cacache-12.0.3"
+      sources."cacache-12.0.4"
       sources."cache-base-1.0.1"
       sources."chokidar-2.1.8"
       sources."chownr-1.1.4"
@@ -82870,7 +83793,7 @@ in
       })
       sources."fast-deep-equal-3.1.1"
       sources."fast-json-stable-stringify-2.1.0"
-      sources."figgy-pudding-3.5.1"
+      sources."figgy-pudding-3.5.2"
       sources."file-uri-to-path-1.0.0"
       (sources."fill-range-4.0.0" // {
         dependencies = [
@@ -82885,7 +83808,7 @@ in
       sources."from2-2.3.0"
       sources."fs-write-stream-atomic-1.0.10"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.2.11"
+      sources."fsevents-1.2.12"
       sources."get-value-2.0.6"
       sources."glob-7.1.6"
       (sources."glob-parent-3.1.0" // {
@@ -82937,7 +83860,6 @@ in
       sources."locate-path-3.0.0"
       sources."lru-cache-5.1.1"
       sources."make-dir-2.1.0"
-      sources."mamacro-0.0.3"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       sources."md5.js-1.3.5"
@@ -82954,11 +83876,7 @@ in
           sources."is-extendable-1.0.1"
         ];
       })
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.4"
       sources."move-concurrently-1.0.1"
       sources."ms-2.0.0"
       sources."nan-2.14.0"
@@ -83104,7 +84022,7 @@ in
       sources."stream-shift-1.0.1"
       sources."string_decoder-1.1.1"
       sources."tapable-1.1.3"
-      (sources."terser-4.6.6" // {
+      (sources."terser-4.6.7" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -83519,7 +84437,7 @@ in
       sources."@types/events-3.0.0"
       sources."@types/glob-7.1.1"
       sources."@types/minimatch-3.0.3"
-      sources."@types/node-13.9.1"
+      sources."@types/node-13.9.3"
       sources."accepts-1.3.7"
       sources."ajv-6.12.0"
       sources."ajv-errors-1.0.1"
@@ -83644,7 +84562,7 @@ in
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
       sources."errno-0.1.7"
-      sources."es-abstract-1.17.4"
+      sources."es-abstract-1.17.5"
       sources."es-to-primitive-1.2.1"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
@@ -83713,7 +84631,7 @@ in
       sources."fragment-cache-0.2.1"
       sources."fresh-0.5.2"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.2.11"
+      sources."fsevents-1.2.12"
       sources."function-bind-1.1.1"
       sources."get-caller-file-1.0.3"
       sources."get-stream-4.1.0"
@@ -83813,9 +84731,9 @@ in
       sources."mimic-fn-2.1.0"
       sources."minimalistic-assert-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
+      sources."minimist-1.2.5"
       sources."mixin-deep-1.3.2"
-      sources."mkdirp-0.5.1"
+      sources."mkdirp-0.5.4"
       sources."ms-2.0.0"
       sources."multicast-dns-6.2.3"
       sources."multicast-dns-service-types-1.1.0"
@@ -84128,7 +85046,7 @@ in
       sources."bluebird-3.7.2"
       sources."brace-expansion-1.1.11"
       sources."buffer-from-1.1.1"
-      sources."cacache-12.0.3"
+      sources."cacache-12.0.4"
       sources."chownr-1.1.4"
       sources."commondir-1.0.1"
       sources."concat-map-0.0.1"
@@ -84142,7 +85060,7 @@ in
       sources."end-of-stream-1.4.4"
       sources."fast-deep-equal-3.1.1"
       sources."fast-json-stable-stringify-2.1.0"
-      sources."figgy-pudding-3.5.1"
+      sources."figgy-pudding-3.5.2"
       sources."find-cache-dir-2.1.0"
       sources."find-up-3.0.0"
       sources."flush-write-stream-1.1.1"
@@ -84171,19 +85089,15 @@ in
       sources."is-glob-4.0.1"
       sources."isarray-1.0.0"
       sources."json-schema-traverse-0.4.1"
-      (sources."json5-1.0.1" // {
-        dependencies = [
-          sources."minimist-1.2.5"
-        ];
-      })
+      sources."json5-1.0.1"
       sources."loader-utils-1.4.0"
       sources."locate-path-3.0.0"
       sources."lru-cache-5.1.1"
       sources."make-dir-2.1.0"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
+      sources."minimist-1.2.5"
       sources."mississippi-3.0.0"
-      sources."mkdirp-0.5.1"
+      sources."mkdirp-0.5.4"
       sources."move-concurrently-1.0.1"
       sources."normalize-path-3.0.0"
       sources."once-1.4.0"
@@ -84399,11 +85313,7 @@ in
       sources."mimic-response-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.5"
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.4"
       sources."moment-2.24.0"
       sources."mp4-box-encoding-1.4.1"
       sources."mp4-stream-3.1.0"
@@ -84628,7 +85538,7 @@ in
       })
       sources."vscode-languageserver-textdocument-1.0.1"
       sources."vscode-languageserver-types-3.15.1"
-      sources."vscode-nls-4.1.1"
+      sources."vscode-nls-4.1.2"
       sources."vscode-uri-2.1.1"
       sources."yaml-ast-parser-custom-tags-0.0.43"
     ];
@@ -84669,7 +85579,7 @@ in
       sha512 = "GFg4QC1xi3gkbHGGUFme8/8XPg3kDISu/qJfx56X207yuv1FSevGY/eKuym7kh0bniCB4n3rseWW+QZXPH8LIw==";
     };
     dependencies = [
-      sources."@babel/runtime-7.8.7"
+      sources."@babel/runtime-7.9.2"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.3"
       sources."@sindresorhus/is-0.7.0"
@@ -85043,11 +85953,7 @@ in
           sources."is-extendable-1.0.1"
         ];
       })
-      (sources."mkdirp-0.5.1" // {
-        dependencies = [
-          sources."minimist-0.0.8"
-        ];
-      })
+      sources."mkdirp-0.5.4"
       sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
       sources."nanomatch-1.2.13"
@@ -85440,4 +86346,4 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-}
+}
\ No newline at end of file
diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix
index faf2cd7d21f6..f2e633300c7e 100644
--- a/pkgs/development/node-packages/node-packages-v12.nix
+++ b/pkgs/development/node-packages/node-packages-v12.nix
@@ -1309,15 +1309,6 @@ let
         sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
       };
     };
-    "minimist-0.0.8" = {
-      name = "minimist";
-      packageName = "minimist";
-      version = "0.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
-        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
-      };
-    };
     "minimist-1.2.5" = {
       name = "minimist";
       packageName = "minimist";
@@ -1381,13 +1372,13 @@ let
         sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
       };
     };
-    "mkdirp-0.5.1" = {
+    "mkdirp-0.5.4" = {
       name = "mkdirp";
       packageName = "mkdirp";
-      version = "0.5.1";
+      version = "0.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
-        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz";
+        sha512 = "iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==";
       };
     };
     "mkdirp-1.0.3" = {
@@ -2863,10 +2854,10 @@ in
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
+      sources."minimist-1.2.5"
       sources."minipass-3.1.1"
       sources."minizlib-2.1.0"
-      sources."mkdirp-0.5.1"
+      sources."mkdirp-0.5.4"
       sources."ncp-0.4.2"
       sources."nijs-0.0.25"
       sources."nopt-3.0.6"
@@ -3034,10 +3025,10 @@ in
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
+      sources."minimist-1.2.5"
       sources."minipass-2.9.0"
       sources."minizlib-1.3.3"
-      sources."mkdirp-0.5.1"
+      sources."mkdirp-0.5.4"
       sources."nopt-4.0.3"
       sources."npmlog-4.1.2"
       sources."number-is-nan-1.0.1"
@@ -3143,10 +3134,10 @@ in
       sources."is-fullwidth-code-point-1.0.0"
       sources."isarray-1.0.0"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
+      sources."minimist-1.2.5"
       sources."minipass-2.9.0"
       sources."minizlib-1.3.3"
-      sources."mkdirp-0.5.1"
+      sources."mkdirp-0.5.4"
       sources."ms-2.1.2"
       sources."needle-2.4.0"
       sources."nopt-4.0.3"
@@ -3162,11 +3153,7 @@ in
       sources."osenv-0.1.5"
       sources."path-is-absolute-1.0.1"
       sources."process-nextick-args-2.0.1"
-      (sources."rc-1.2.8" // {
-        dependencies = [
-          sources."minimist-1.2.5"
-        ];
-      })
+      sources."rc-1.2.8"
       sources."readable-stream-2.3.7"
       sources."rimraf-2.7.1"
       sources."safe-buffer-5.1.2"
diff --git a/pkgs/development/node-packages/node-packages-v13.nix b/pkgs/development/node-packages/node-packages-v13.nix
index e83aa90962c1..f87526382b93 100644
--- a/pkgs/development/node-packages/node-packages-v13.nix
+++ b/pkgs/development/node-packages/node-packages-v13.nix
@@ -598,13 +598,13 @@ let
         sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
       };
     };
-    "minimist-0.0.8" = {
+    "minimist-1.2.5" = {
       name = "minimist";
       packageName = "minimist";
-      version = "0.0.8";
+      version = "1.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
-        sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
+        sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
       };
     };
     "minipass-3.1.1" = {
@@ -634,13 +634,13 @@ let
         sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
       };
     };
-    "mkdirp-0.5.1" = {
+    "mkdirp-0.5.4" = {
       name = "mkdirp";
       packageName = "mkdirp";
-      version = "0.5.1";
+      version = "0.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
-        sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz";
+        sha512 = "iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==";
       };
     };
     "mkdirp-1.0.3" = {
@@ -1342,10 +1342,10 @@ in
       sources."mime-db-1.43.0"
       sources."mime-types-2.1.26"
       sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
+      sources."minimist-1.2.5"
       sources."minipass-3.1.1"
       sources."minizlib-2.1.0"
-      sources."mkdirp-0.5.1"
+      sources."mkdirp-0.5.4"
       sources."ncp-0.4.2"
       sources."nijs-0.0.25"
       sources."nopt-3.0.6"

From db5bde234287ea3ffa0f77ad00b8dbe5140dc093 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 25 Mar 2020 08:44:34 +0100
Subject: [PATCH 3964/4636] =?UTF-8?q?coqPackages.coqhammer:=201.1=20?=
 =?UTF-8?q?=E2=86=92=201.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coq-modules/coqhammer/default.nix            | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix
index 83a505017fbc..7d9ec5e7312b 100644
--- a/pkgs/development/coq-modules/coqhammer/default.nix
+++ b/pkgs/development/coq-modules/coqhammer/default.nix
@@ -3,17 +3,25 @@
 let
   params = {
     "8.8" = {
+      version = "1.1";
       sha256 = "0ms086wp4jmrzyglb8wymchzyflflk01nsfsk4r6qv8rrx81nx9h";
+      buildInputs = [ coq.ocamlPackages.camlp5 ];
     };
     "8.9" = {
-      sha256 = "0hmqwsry8ldg4g4hhwg4b84dgzibpdrg1wwsajhlyqfx3fb3n3b5";
+      version = "1.1.1";
+      sha256 = "1knjmz4hr8vlp103j8n4fyb2lfxysnm512gh3m2kp85n6as6fvb9";
+      buildInputs = [ coq.ocamlPackages.camlp5 ];
+    };
+    "8.10" = {
+      version = "1.1.1";
+      sha256 = "0b6r7bsygl1axbqybkhkr7zlwcd51ski5ql52994klrrxvjd58df";
     };
   };
   param = params.${coq.coq-version};
 in
 
 stdenv.mkDerivation rec {
-  version = "1.1";
+  inherit (param) version;
   name = "coq${coq.coq-version}-coqhammer-${version}";
 
   src = fetchFromGitHub {
@@ -31,8 +39,8 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [ coq ] ++ (with coq.ocamlPackages; [
-    ocaml findlib camlp5
-  ]);
+    ocaml findlib
+  ]) ++ (param.buildInputs or []);
 
   preInstall = ''
     mkdir -p $out/bin

From 74bf0135e051c1dea909d405b6742d0ddd414050 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 23 Mar 2020 15:01:03 +0000
Subject: [PATCH 3965/4636] rainloop: 1.13.0 -> 1.14.0

---
 pkgs/servers/rainloop/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/rainloop/default.nix b/pkgs/servers/rainloop/default.nix
index ff6cb8c98ebf..6d5016961e98 100644
--- a/pkgs/servers/rainloop/default.nix
+++ b/pkgs/servers/rainloop/default.nix
@@ -2,7 +2,7 @@
   common = { edition, sha256 }:
     stdenv.mkDerivation (rec {
       pname = "rainloop${stdenv.lib.optionalString (edition != "") "-${edition}"}";
-      version = "1.13.0";
+      version = "1.14.0";
 
       buildInputs = [ unzip ];
 
@@ -35,10 +35,10 @@
   in {
     rainloop-community = common {
       edition = "community";
-      sha256 = "1skwq6bn98142xf8r77b818fy00nb4x0s1ii3mw5849ih94spx40";
+      sha256 = "0a8qafm4khwj8cnaiaxvjb9073w6fr63vk1b89nks4hmfv10jn6y";
     };
     rainloop-standard = common {
       edition = "";
-      sha256 = "e3ec8209cb3b9f092938a89094e645ef27659763432bedbe7fad4fa650554222";
+      sha256 = "0961g4mci080f7y98zx9r4qw620l4z3na1ivvlyhhr1v4dywqvch";
     };
   }

From 368588e0b77ebd131ad4a217475abac811f7c7dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 25 Mar 2020 08:20:40 +0000
Subject: [PATCH 3966/4636] cheat: 3.0.7 -> 3.8.0

---
 pkgs/applications/misc/cheat/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix
index d4d0643bfdc2..ffe2759a5e76 100644
--- a/pkgs/applications/misc/cheat/default.nix
+++ b/pkgs/applications/misc/cheat/default.nix
@@ -2,23 +2,23 @@
 
 buildGoModule rec {
   pname = "cheat";
-  version = "3.0.7";
+  version = "3.8.0";
 
   src = fetchFromGitHub {
-    owner = "chrisallenlane";
+    owner = "cheat";
     repo = "cheat";
     rev = version;
-    sha256 = "0i5j85ciimk14kndb81qxny1ksr57sr9xdvjn7x1ibc7h6pikjn5";
+    sha256 = "062dlc54x9qwb3hsxp20h94dpwsa1nzpjln9cqmvwjhvp434l97r";
   };
 
   subPackages = [ "cmd/cheat" ];
 
-  modSha256 = "1v9hvxygwvqma2j5yz7r95g34xpwb0n29hm39i89vgmvl3hy67s0";
+  modSha256 = "1is19qca5wgzya332rmpk862nnivxzgxchkllv629f5fwwdvdgmg";
 
   meta = with stdenv.lib; {
     description = "Create and view interactive cheatsheets on the command-line";
     maintainers = with maintainers; [ mic92 ];
     license = with licenses; [ gpl3 mit ];
-    homepage = "https://github.com/chrisallenlane/cheat";
+    inherit (src.meta) homepage;
   };
 }

From d930466b7728e5515991cb73c060fc3f32bdc001 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 14 Mar 2020 18:29:08 +0000
Subject: [PATCH 3967/4636] nixos/initrd-ssh: switch from Dropbear to OpenSSH

Dropbear lags behind OpenSSH significantly in both support for modern
key formats like `ssh-ed25519`, let alone the recently-introduced
U2F/FIDO2-based `sk-ssh-ed25519@openssh.com` (as I found when I switched
my `authorizedKeys` over to it and promptly locked myself out of my
server's initrd SSH, breaking reboots), as well as security features
like multiprocess isolation. Using the same SSH daemon for stage-1 and
the main system ensures key formats will always remain compatible, as
well as more conveniently allowing the sharing of configuration and
host keys.

The main reason to use Dropbear over OpenSSH would be initrd space
concerns, but NixOS initrds are already large (17 MiB currently on my
server), and the size difference between the two isn't huge (the test's
initrd goes from 9.7 MiB to 12 MiB with this change). If the size is
still a problem, then it would be easy to shrink sshd down to a few
hundred kilobytes by using an initrd-specific build that uses musl and
disables things like Kerberos support.

This passes the test and works on my server, but more rigorous testing
and review from people who use initrd SSH would be appreciated!
---
 nixos/doc/manual/release-notes/rl-2009.xml    |  17 ++
 nixos/modules/system/boot/initrd-ssh.nix      | 176 ++++++++++++------
 nixos/modules/system/boot/stage-1.nix         |   5 +-
 nixos/tests/initrd-network-ssh/default.nix    |  22 ++-
 nixos/tests/initrd-network-ssh/dropbear.priv  | Bin 1573 -> 0 bytes
 nixos/tests/initrd-network-ssh/dropbear.pub   |   1 -
 .../initrd-network-ssh/generate-keys.nix      |   8 +-
 nixos/tests/initrd-network-ssh/id_ed25519     |   7 +
 nixos/tests/initrd-network-ssh/id_ed25519.pub |   1 +
 nixos/tests/initrd-network-ssh/openssh.priv   |  51 -----
 nixos/tests/initrd-network-ssh/openssh.pub    |   1 -
 .../initrd-network-ssh/ssh_host_ed25519_key   |   7 +
 .../ssh_host_ed25519_key.pub                  |   1 +
 13 files changed, 179 insertions(+), 118 deletions(-)
 delete mode 100644 nixos/tests/initrd-network-ssh/dropbear.priv
 delete mode 100644 nixos/tests/initrd-network-ssh/dropbear.pub
 create mode 100644 nixos/tests/initrd-network-ssh/id_ed25519
 create mode 100644 nixos/tests/initrd-network-ssh/id_ed25519.pub
 delete mode 100644 nixos/tests/initrd-network-ssh/openssh.priv
 delete mode 100644 nixos/tests/initrd-network-ssh/openssh.pub
 create mode 100644 nixos/tests/initrd-network-ssh/ssh_host_ed25519_key
 create mode 100644 nixos/tests/initrd-network-ssh/ssh_host_ed25519_key.pub

diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml
index a9a6003d1e8a..85a7f9c9871f 100644
--- a/nixos/doc/manual/release-notes/rl-2009.xml
+++ b/nixos/doc/manual/release-notes/rl-2009.xml
@@ -108,6 +108,23 @@
       <link linkend="opt-security.duosec.integrationKey">security.duosec.integrationKey</link>.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     The initrd SSH support now uses OpenSSH rather than Dropbear to
+     allow the use of Ed25519 keys and other OpenSSH-specific
+     functionality. Host keys must now be in the OpenSSH format, and at
+     least one pre-generated key must be specified.
+    </para>
+    <para>
+     If you used the <option>boot.initrd.network.ssh.host*Key</option>
+     options, you'll get an error explaining how to convert your host
+     keys and migrate to the new
+     <option>boot.initrd.network.ssh.hostKeys</option> option.
+     Otherwise, if you don't have any host keys set, you'll need to
+     generate some; see the <option>hostKeys</option> option
+     documentation for instructions.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix
index 2d3e3b05c980..d40c1010e73c 100644
--- a/nixos/modules/system/boot/initrd-ssh.nix
+++ b/nixos/modules/system/boot/initrd-ssh.nix
@@ -10,19 +10,21 @@ in
 
 {
 
-  options = {
-
-    boot.initrd.network.ssh.enable = mkOption {
+  options.boot.initrd.network.ssh = {
+    enable = mkOption {
       type = types.bool;
       default = false;
       description = ''
         Start SSH service during initrd boot. It can be used to debug failing
         boot on a remote server, enter pasphrase for an encrypted partition etc.
         Service is killed when stage-1 boot is finished.
+
+        The sshd configuration is largely inherited from
+        <option>services.openssh</option>.
       '';
     };
 
-    boot.initrd.network.ssh.port = mkOption {
+    port = mkOption {
       type = types.int;
       default = 22;
       description = ''
@@ -30,7 +32,7 @@ in
       '';
     };
 
-    boot.initrd.network.ssh.shell = mkOption {
+    shell = mkOption {
       type = types.str;
       default = "/bin/ash";
       description = ''
@@ -38,95 +40,163 @@ in
       '';
     };
 
-    boot.initrd.network.ssh.hostRSAKey = mkOption {
-      type = types.nullOr types.path;
-      default = null;
+    hostKeys = mkOption {
+      type = types.listOf (types.either types.str types.path);
+      default = [];
+      example = [
+        "/etc/secrets/initrd/ssh_host_rsa_key"
+        "/etc/secrets/initrd/ssh_host_ed25519_key"
+      ];
       description = ''
-        RSA SSH private key file in the Dropbear format.
+        Specify SSH host keys to import into the initrd.
 
-        WARNING: Unless your bootloader supports initrd secrets, this key is
-        contained insecurely in the global Nix store. Do NOT use your regular
-        SSH host private keys for this purpose or you'll expose them to
-        regular users!
+        To generate keys, use
+        <citerefentry><refentrytitle>ssh-keygen</refentrytitle><manvolnum>1</manvolnum></citerefentry>:
+
+        <screen>
+        <prompt># </prompt>ssh-keygen -t rsa -N "" -f /etc/secrets/initrd/ssh_host_rsa_key
+        <prompt># </prompt>ssh-keygen -t ed25519 -N "" -f /etc/secrets/initrd/ssh_host_ed_25519_key
+        </screen>
+
+        <warning>
+          <para>
+            Unless your bootloader supports initrd secrets, these keys
+            are stored insecurely in the global Nix store. Do NOT use
+            your regular SSH host private keys for this purpose or
+            you'll expose them to regular users!
+          </para>
+          <para>
+            Additionally, even if your initrd supports secrets, if
+            you're using initrd SSH to unlock an encrypted disk then
+            using your regular host keys exposes the private keys on
+            your unencrypted boot partition.
+          </para>
+        </warning>
       '';
     };
 
-    boot.initrd.network.ssh.hostDSSKey = mkOption {
-      type = types.nullOr types.path;
-      default = null;
-      description = ''
-        DSS SSH private key file in the Dropbear format.
-
-        WARNING: Unless your bootloader supports initrd secrets, this key is
-        contained insecurely in the global Nix store. Do NOT use your regular
-        SSH host private keys for this purpose or you'll expose them to
-        regular users!
-      '';
-    };
-
-    boot.initrd.network.ssh.hostECDSAKey = mkOption {
-      type = types.nullOr types.path;
-      default = null;
-      description = ''
-        ECDSA SSH private key file in the Dropbear format.
-
-        WARNING: Unless your bootloader supports initrd secrets, this key is
-        contained insecurely in the global Nix store. Do NOT use your regular
-        SSH host private keys for this purpose or you'll expose them to
-        regular users!
-      '';
-    };
-
-    boot.initrd.network.ssh.authorizedKeys = mkOption {
+    authorizedKeys = mkOption {
       type = types.listOf types.str;
       default = config.users.users.root.openssh.authorizedKeys.keys;
+      defaultText = "config.users.users.root.openssh.authorizedKeys.keys";
       description = ''
         Authorized keys for the root user on initrd.
-        Note that Dropbear doesn't support OpenSSH's Ed25519 key type.
       '';
     };
-
   };
 
-  config = mkIf (config.boot.initrd.network.enable && cfg.enable) {
+  imports =
+    map (opt: mkRemovedOptionModule ([ "boot" "initrd" "network" "ssh" ] ++ [ opt ]) ''
+      The initrd SSH functionality now uses OpenSSH rather than Dropbear.
+
+      If you want to keep your existing initrd SSH host keys, convert them with
+        $ dropbearconvert dropbear openssh dropbear_host_$type_key ssh_host_$type_key
+      and then set options.boot.initrd.network.ssh.hostKeys.
+    '') [ "hostRSAKey" "hostDSSKey" "hostECDSAKey" ];
+
+  config = let
+    # Nix complains if you include a store hash in initrd path names, so
+    # as an awful hack we drop the first character of the hash.
+    initrdKeyPath = path: if isString path
+      then path
+      else let name = builtins.baseNameOf path; in
+        builtins.unsafeDiscardStringContext ("/etc/ssh/" +
+          substring 1 (stringLength name) name);
+
+    sshdCfg = config.services.openssh;
+
+    sshdConfig = ''
+      Port ${toString cfg.port}
+
+      PasswordAuthentication no
+      ChallengeResponseAuthentication no
+
+      ${flip concatMapStrings cfg.hostKeys (path: ''
+        HostKey ${initrdKeyPath path}
+      '')}
+
+      KexAlgorithms ${concatStringsSep "," sshdCfg.kexAlgorithms}
+      Ciphers ${concatStringsSep "," sshdCfg.ciphers}
+      MACs ${concatStringsSep "," sshdCfg.macs}
+
+      LogLevel ${sshdCfg.logLevel}
+
+      ${if sshdCfg.useDns then ''
+        UseDNS yes
+      '' else ''
+        UseDNS no
+      ''}
+    '';
+  in mkIf (config.boot.initrd.network.enable && cfg.enable) {
     assertions = [
-      { assertion = cfg.authorizedKeys != [];
+      {
+        assertion = cfg.authorizedKeys != [];
         message = "You should specify at least one authorized key for initrd SSH";
       }
+
+      {
+        assertion = cfg.hostKeys != [];
+        message = ''
+          You must now pre-generate the host keys for initrd SSH.
+          See the boot.inird.network.ssh.hostKeys documentation
+          for instructions.
+        '';
+      }
     ];
 
     boot.initrd.extraUtilsCommands = ''
-      copy_bin_and_libs ${pkgs.dropbear}/bin/dropbear
+      copy_bin_and_libs ${pkgs.openssh}/bin/sshd
       cp -pv ${pkgs.glibc.out}/lib/libnss_files.so.* $out/lib
     '';
 
     boot.initrd.extraUtilsCommandsTest = ''
-      $out/bin/dropbear -V
+      # sshd requires a host key to check config, so we pass in the test's
+      echo -n ${escapeShellArg sshdConfig} |
+        $out/bin/sshd -t -f /dev/stdin \
+        -h ${../../../tests/initrd-network-ssh/ssh_host_ed25519_key}
     '';
 
     boot.initrd.network.postCommands = ''
       echo '${cfg.shell}' > /etc/shells
       echo 'root:x:0:0:root:/root:${cfg.shell}' > /etc/passwd
+      echo 'sshd:x:1:1:sshd:/var/empty:/bin/nologin' >> /etc/passwd
       echo 'passwd: files' > /etc/nsswitch.conf
 
-      mkdir -p /var/log
+      mkdir -p /var/log /var/empty
       touch /var/log/lastlog
 
-      mkdir -p /etc/dropbear
+      mkdir -p /etc/ssh
+      echo -n ${escapeShellArg sshdConfig} > /etc/ssh/sshd_config
+
+      echo "export PATH=$PATH" >> /etc/profile
+      echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> /etc/profile
 
       mkdir -p /root/.ssh
       ${concatStrings (map (key: ''
         echo ${escapeShellArg key} >> /root/.ssh/authorized_keys
       '') cfg.authorizedKeys)}
 
-      dropbear -s -j -k -E -p ${toString cfg.port} ${optionalString (cfg.hostRSAKey == null && cfg.hostDSSKey == null && cfg.hostECDSAKey == null) "-R"}
+      ${flip concatMapStrings cfg.hostKeys (path: ''
+        # keys from Nix store are world-readable, which sshd doesn't like
+        chmod 0600 "${initrdKeyPath path}"
+      '')}
+
+      /bin/sshd -e
     '';
 
-    boot.initrd.secrets =
-     (optionalAttrs (cfg.hostRSAKey != null) { "/etc/dropbear/dropbear_rsa_host_key" = cfg.hostRSAKey; }) //
-     (optionalAttrs (cfg.hostDSSKey != null) { "/etc/dropbear/dropbear_dss_host_key" = cfg.hostDSSKey; }) //
-     (optionalAttrs (cfg.hostECDSAKey != null) { "/etc/dropbear/dropbear_ecdsa_host_key" = cfg.hostECDSAKey; });
+    boot.initrd.postMountCommands = ''
+      # Stop sshd cleanly before stage 2.
+      #
+      # If you want to keep it around to debug post-mount SSH issues,
+      # run `touch /.keep_sshd` (either from an SSH session or in
+      # another initrd hook like preDeviceCommands).
+      if ! [ -e /.keep_sshd ]; then
+        pkill -x sshd
+      fi
+    '';
 
+    boot.initrd.secrets = listToAttrs
+      (map (path: nameValuePair (initrdKeyPath path) path) cfg.hostKeys);
   };
 
 }
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 93cd801ef803..9e3ee5cf0a3a 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -142,7 +142,10 @@ let
              let source' = if source == null then dest else source; in
                ''
                   mkdir -p $(dirname "$out/secrets/${dest}")
-                  cp -a ${source'} "$out/secrets/${dest}"
+                  # Some programs (e.g. ssh) doesn't like secrets to be
+                  # symlinks, so we use `cp -L` here to match the
+                  # behaviour when secrets are natively supported.
+                  cp -Lr ${source'} "$out/secrets/${dest}"
                 ''
           ) config.boot.initrd.secrets))
        }
diff --git a/nixos/tests/initrd-network-ssh/default.nix b/nixos/tests/initrd-network-ssh/default.nix
index 73d9f938e226..017de6882081 100644
--- a/nixos/tests/initrd-network-ssh/default.nix
+++ b/nixos/tests/initrd-network-ssh/default.nix
@@ -3,7 +3,7 @@ import ../make-test-python.nix ({ lib, ... }:
 {
   name = "initrd-network-ssh";
   meta = with lib.maintainers; {
-    maintainers = [ willibutz ];
+    maintainers = [ willibutz emily ];
   };
 
   nodes = with lib; {
@@ -17,9 +17,9 @@ import ../make-test-python.nix ({ lib, ... }:
           enable = true;
           ssh = {
             enable = true;
-            authorizedKeys = [ "${readFile ./openssh.pub}" ];
+            authorizedKeys = [ (readFile ./id_ed25519.pub) ];
             port = 22;
-            hostRSAKey = ./dropbear.priv;
+            hostKeys = [ ./ssh_host_ed25519_key ];
           };
         };
         boot.initrd.preLVMCommands = ''
@@ -42,11 +42,11 @@ import ../make-test-python.nix ({ lib, ... }:
               "${toString (head (splitString " " (
                 toString (elemAt (splitString "\n" config.networking.extraHosts) 2)
               )))} "
-              "${readFile ./dropbear.pub}"
+              "${readFile ./ssh_host_ed25519_key.pub}"
             ];
           };
           sshKey = {
-            source = ./openssh.priv; # dont use this anywhere else
+            source = ./id_ed25519;
             mode = "0600";
           };
         };
@@ -56,7 +56,17 @@ import ../make-test-python.nix ({ lib, ... }:
   testScript = ''
     start_all()
     client.wait_for_unit("network.target")
-    client.wait_until_succeeds("ping -c 1 server")
+
+
+    def ssh_is_up(_) -> bool:
+        status, _ = client.execute("nc -z server 22")
+        return status == 0
+
+
+    with client.nested("waiting for SSH server to come up"):
+        retry(ssh_is_up)
+
+
     client.succeed(
         "ssh -i /etc/sshKey -o UserKnownHostsFile=/etc/knownHosts server 'touch /fnord'"
     )
diff --git a/nixos/tests/initrd-network-ssh/dropbear.priv b/nixos/tests/initrd-network-ssh/dropbear.priv
deleted file mode 100644
index af340535f0a3841d2b9ed2abbd60f64118f924da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1573
zcmZQzU|=sU&d@C?PGn$UU}j`sWME)oWZ10kyu4#W?Uhsh+~+#3<$gFYy`lKwvg&OI
zb}l**{9UN#kD>o$zc<GZEq8wRy+eX$wR6mA`-2rGxdx)V4_L+AJ^EKNvb}7X$#lqP
zpUvu2L!Q>Fy7ou@Fevn|+8xco)V%$}?AGM@J-;)38jl~8ch}$fSH-BZGwP20Q_&8d
z?l~3wi|S53sZ;r&xy8_4QO={=IP_hbN$M%_WX0EOUwB-*aznstaeVB}m3n*}f?)^B
zw>ne=nw(!OC(huzLurzM@`spKyG!qjp9h8A)NAF`b&CDPrf+QMA``xTnenFQFAQS%
zf^BzgJf+)wIVzRml#I{!c}Y#d%b(i{W-!T|xGeli=F6J0-g*a*X=&FN8f=NlINttw
z`GSW`|1C_^RtWeNKML;idT4pkQ}yMI^hdluCNQkElU;g%%j2D>+@9TAo6;tfvK`-Q
z#nj6cn6*{HWBr6jQ{BG(edo-f**fvMPvD7XNo#JFZauqw`-=~XA-eCE<teQE{Mx6v
zZKCgjn|~^8?-i_<@C&xjSt)SrzW&OKA*-)jS;X#D5olOr_~Wg~oq!`UDs2~}q8eXR
zpNvY+e$u~o<C3YzcN>|!%$I$n%(-4`idELhQ&;w$nz$k}Ib^$;h}~b^W1A06bDne{
z_<8v;<?Hv%PlQx6DfDcVG5b(3`=fC)D@%yxN@3;~{@n}C2g+GiaNjiRWME)oFbYwt
z%C=<O&~i{tl%Y)I-kcs|wOi*(Lry)My(Y2AA}7n?h^R9A?_CLzOkRxZroZU;%Q?Yf
z-gf7Wz8?3d>bY=vXO=K$NbKgXi&4Ajmnb2dUO#E?vOIzJB4^bei#+}Q;p-A^IgY9A
z{bhlN&9(M=-jJ5?SKQs+`z_M)m22^L$?rwQ58qxqXR-BMkF(bOMcfm9rm&p}?$9hh
z^I`MinA4&~mYI2(e>K`CcF&wNH$AQL;K|c^sgH_``WW0Z!|s`S6)_j=+#P6X{Wbsp
zm6_KPWare)bA6Fy%Aja!vgzK<j4jPacO2UBw$JlqxX-f13j2(vaVm6fz0{i&TCl4+
zCF99iZmq0p%TMyJ=ZidMWMEq^cC^${<!|c;#ovXOpXW|t@;`QQPEOjF=I{s4pV=gz
z{<!V{lgPOV_8fQqO0qjhc(jW;wA!)WU2mjvSAExJHnEiGzD+F`w*)JkPJI~cG?PEX
zaM}ieo3^q+xyKJgyPx3wd+NoM)Fy!ysy;tjOb@KN<ag$_-nB;$B%TDmtV;9U%X}@N
zoaefIs`yt+wG#`ktL}=eJe`-OADC~MvU#fThwBq0jmpkhrL67U8*Hz+E%VaWd9B&)
z?R*zzubuKkMW^HNWv+hvro@@k&m6BhFWRv#BZ@81?LwW!63-W3>-QBHH(b4>{Bm1R
z&E)XP#Z3$Q6jTr0S#Xzufsv8nAb0HNqpe3R9INW1=WdB``~0m!Yo)I1x?^cg4sHxr
z`j59tXG~wPuIgN{><5kcH)nM5HW+c0u8dTvjjjKB!rJ}dpWRne4(~p)G;r1F++W!u
zhP$U7SG^@69;dtNpRrka`Si{D@_P<9+o|bDZ!wSenLFp{bpNxv_;!~)S^Tm}Zg<zd
zF#cWdY~2_9;wr6*`xulOms@=4l9H^VzMT`Vn^N7LBaVM&uu9e)S)RbYC;sh03ELiy
zfUPape^kGpIk)vi3nvpxlJK#eSAP9EVe;<RWY5!AKJQz+RApy*_lCHAk5;L_tl6>g
z)hpdq>(UA><{jDZ<Dhn}{L07By#n%2oLRgAU+9Aa;q4T?UMtppb!C1J*}7XLt_aSK
zihI5;Smffvk~KQ|bC>-+x$yRjLyfwvW;?DdJovW$--Lhv*kipOJ6ug(kYM0vp_kbe
zxHqMo%j?<92U;IE<(&Grzqz_#v3GFU&Lt^ZvKNFhXMdkq#kkn<&jai2s|AElC^P1%
z9K0c}bYiyup+}3-blPQiA9^aq7tP|7H1pY#b(J??ZVcL5`M$*M_{CR#VawTP1Z}xG
z?IKs6iRPL&M&F*u-!J+h&272&oX&xDw{n^;m(-_BcAE2cmjs)B(<CmzgMqKOR|S;K
vHONb6e(iAeq3|0g?freqj^=J+r<S-zB)G>Mvv*nlqvF5BcfUP~u4%^sa`g2^

diff --git a/nixos/tests/initrd-network-ssh/dropbear.pub b/nixos/tests/initrd-network-ssh/dropbear.pub
deleted file mode 100644
index 385c625522aa..000000000000
--- a/nixos/tests/initrd-network-ssh/dropbear.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCzJ0OniLB91MpPC86I1m3wwJeAc+Gme7bAuaLIU/cSfPwxT5NO7MfCp0Pu94gYDKtDXMs/wXg0bTAVDeAFFkdIj6kBBumEmQLCTL48q2UxDIXVLT/E/AAgj6q7WwgCg7fwm4Vjn4z7aUyBx8EfRy+5/SQyeYla3D/lFYgMi5x4D6J+yeR+JPAptDE/IR5IizNV7mY0ZcoXYyHrrehI1tTYEEqjX13ZqS4OCBFWwHe1QHhRNM+jHhcATbgikjAj8FyFPtLvc+dSVtkuhQktQl36Bi8zMUQcV6+mM7Ln6DBcDlM9urHKLYPTWmUAyhxM955iglOn5z0RaAIcyNMT6hz0rHaNf0BIlmbXoTC0XGjHh/OnoOEC/zg0JqgQTnPiU45K4TnRSSXp2GfiDfiQAK0+HaXACkjuFR68u7WCZpB1Bse1OgKNClFqtRhIr5DilUb2/e5DCCmFkddMUcjmYqzZdbXNt7fo8CFULe+mbiCp8+tMg4aRTaDZ/Hk93nCvGE5TP2ypEMbfL6nRVKvXOjhdvSQQgKwx+O003FDEHCSG0Bpageh7yVpna+SPrbGklce7MjTpbx3iIwmvKpQ6asnK1L3KkahpY1S3NhQ+/S3Gs8KWQ5LAU+d3xiPX3jfIVHsCIIyxHDbwcJvxM4MFBFQpqRMD6E+LoM9RHjl4C9k2iQ== tmtynkky@duuni
diff --git a/nixos/tests/initrd-network-ssh/generate-keys.nix b/nixos/tests/initrd-network-ssh/generate-keys.nix
index 0183e12d7a88..3d7978890ab0 100644
--- a/nixos/tests/initrd-network-ssh/generate-keys.nix
+++ b/nixos/tests/initrd-network-ssh/generate-keys.nix
@@ -1,12 +1,10 @@
 with import ../../.. {};
 
 runCommand "gen-keys" {
-    buildInputs = [ dropbear openssh ];
+    buildInputs = [ openssh ];
   }
   ''
     mkdir $out
-    dropbearkey -t rsa -f $out/dropbear.priv -s 4096 | sed -n 2p > $out/dropbear.pub
-    ssh-keygen -q -t rsa -b 4096 -N "" -f client
-    mv client $out/openssh.priv
-    mv client.pub $out/openssh.pub
+    ssh-keygen -q -t ed25519 -N "" -f $out/ssh_host_ed25519_key
+    ssh-keygen -q -t ed25519 -N "" -f $out/id_ed25519
   ''
diff --git a/nixos/tests/initrd-network-ssh/id_ed25519 b/nixos/tests/initrd-network-ssh/id_ed25519
new file mode 100644
index 000000000000..f914b3f712fc
--- /dev/null
+++ b/nixos/tests/initrd-network-ssh/id_ed25519
@@ -0,0 +1,7 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+QyNTUxOQAAACAVcX+32Yqig25RxRA8bel/f604wV0p/63um+Oku/3vfwAAAJi/AJZMvwCW
+TAAAAAtzc2gtZWQyNTUxOQAAACAVcX+32Yqig25RxRA8bel/f604wV0p/63um+Oku/3vfw
+AAAEAPLjQusjrB90Lk3996G3AbtTeK+XweNgxaegYnml/A/RVxf7fZiqKDblHFEDxt6X9/
+rTjBXSn/re6b46S7/e9/AAAAEG5peGJsZEBsb2NhbGhvc3QBAgMEBQ==
+-----END OPENSSH PRIVATE KEY-----
diff --git a/nixos/tests/initrd-network-ssh/id_ed25519.pub b/nixos/tests/initrd-network-ssh/id_ed25519.pub
new file mode 100644
index 000000000000..40de4a8ac602
--- /dev/null
+++ b/nixos/tests/initrd-network-ssh/id_ed25519.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBVxf7fZiqKDblHFEDxt6X9/rTjBXSn/re6b46S7/e9/ nixbld@localhost
diff --git a/nixos/tests/initrd-network-ssh/openssh.priv b/nixos/tests/initrd-network-ssh/openssh.priv
deleted file mode 100644
index 816d65435fd7..000000000000
--- a/nixos/tests/initrd-network-ssh/openssh.priv
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIJKAIBAAKCAgEA7+9A2PCPOTAlFmrablrUWA+VZdAuLfM6JXeHsOF7ZbC2F6lv
-WmvDM925DQqhiAjcgWnt5WHWS5Y+b7lGnuzT7fyKegXd80nCRmqlpSG3srX0/lxR
-aQAJLzfoDjcsF+ceswQo6GSsYnCHVxMNs007gbbVY3f7o+sWZtLdxJPD2iHvl5Zr
-LK0d1RLMmU6cfIhIABlL0S8EWiv29RROepsCQnS0dnK2b+von1SCYoggvAMe2ToA
-IAJ8+uqaYfGAyn9q8fjZiRHxLmKDq90tKoCUL5r/2dmEIE+t8T/3PfHoq1QzZts9
-W9idhBdT21dEXBtGyoMtckp5njk5m82LQDYiOXkuSoIUhSOteh5g7fBv1BtVSERx
-Jg3UeJjPeGKFwdnzapmAKC2w/6V8xcIINNA+fhZA7B9fD1RAi2TECZ+gyMYDc4T+
-USlMSm9cfvSOrf2+5ngtFb84nHjqvClxCMLu+bCWK8HamqUzhE/a5LbR+48E7PyG
-s3KV+sWFN9KOnakTjj/6iQhXZRhgeAK39F2XTk5Ms5Y+BRSStnMoMZA2grIV+jHi
-1zbWokVqXPI5YRo5isR/PgtKAV6FfNWumcYoFJ9F40pMHQ6hJVEmtrCBx7EApSl3
-mSGbQJUmilLC51qNhwQRbD//ZtpIrN82HTMKzZ6kj7kDCdsff+wsnkIXmmMCAwEA
-AQKCAgA4tMINw6UF7hQF3VEsnbjr6xrzCiWv5HlMm5htPI1OdlpC81+G7ksfOfrf
-UzDkFrwOtftsqBfem268Nvyy2OQprfMIbdSMCFWrEM9/XJ2u1gRGDYmMGF8TUtI8
-cduw9oWx53zHl+uKBHBoKu+k/c7flFeQf63wisIroRCawhWau0SF/h3sXCndzuie
-Hw8q+4aQx2m80bDkotlmCNuXbIU3MZ/pEql9gDLlXTLHmMaryM0EqAmZhx0ErGe6
-WDqJIV4kPB0loSDwRoY6GzbugZ8ENUzcruTkQhCpIOYNNNw5idfwKkaxK1vm+SBv
-iYt1fVjYyfH2vhVKSNoNsaGEloa1u4Dymt/FpFztEpRzHXcw93N8BdLxJ4OUhzm2
-iAbpiyjniTIeAVVi7BUwLXh5WAx8nT0eeb1zKoZg1p1ciK5cYl1Uel7j8xRycsSW
-3YgmtuPqY4Agbc9v3eXbQZNDk48JFMEqpIxk97FAkRYpzfxg5Qq14WJCp60CkdRt
-T60hXy8lT/BcI8OWLfGJuBbsVLNRiC7PpwqRKQAinXSv134FpP7jrhpkMybs2oIS
-5obRG7J5OfOTp925erG5mrpwqa3BPkgqx347Wj9z8quOZyuhi+XaPvqmPtvs5JOl
-4RCqjt6RQlHm7xos9ZZGI4jDAIFaFWgyVZrYplOgwxWma4DTgQKCAQEA9+tizQRU
-lF0lxNcEPvsFnYJo80Y+MQK9VdtlhR19YuSfwP1NCaMG1MhQ+PVBVmepOwJMRJR7
-9PLfOouNMfixKBGP12dtStMuh7jowq/BxhRI6JWp3RhTZ1yJ9ouzHze7IDrEBa6w
-p0hUu9H0Sbt51LXbC3JmTyhbdhfry559DfyGW1Ma/bv/pihL9B5Y7sNf1thNp1gi
-GbQ9B+o2Yyw8ZD8zY+sl+aYDSWyCtcBV/KXEF74Bkfs/a5ExJ00X0jYj/TAp2ray
-T4PY0FR8wN/O10bFLP9j+Xa/ywbcPhoj8nvVRIg9VfWT/QaEd+KR0EZVxdjCCqne
-enbSQksTpAZNwQKCAQEA98E+BMmS+yHUVUhNZABtQ5avwuV4+DoSN8KTp3xwQ0CH
-m9fWxSDs12FdyMhDxrJPeywvHtZ18/7cl3dr8wnFVE0s4ongnRDXsNk5xN6J3AaO
-KqW4HF9cbwZqzLILy8TrO+EK/EQV9FypbrxqvxAlP1kezIA2CJNzVRAgimSuV/H7
-05HTnp5W06fjtEf8U1CUrdNetoSROUo1j/IMGPYGlsBFYAGrj5y/BlKd+3T3kjRp
-Xje7HpiykjrZHn0WDp04Ln+u9nveEewXmHKch313emt7HpW0xspp8JM8OZtEKozk
-D5PfYdBfMJJOUlqovCCzTTJ6kNOahknKXFeO/qs5IwKCAQEAjF0/zhWikXF/fcfD
-Bql2z2vTYdEmSvdjHSYff1Nn90K71DdVk5wytOxJM/sfp/z+yoMNjVKIL/IGQw5Z
-va4xFx+CUhGjxlZ0pLEjT37U9gHsGYsK5jvslLvG/MixfH5AOwoqi5ERQVTpbIF9
-jvVPEAh6YSu/ExglWGJIxTsRUIblxvTxdjEnl/p+rlM0RNJnA6vpo1J51BXA7CdF
-7bZQ5u0Feo/bK1I70ClYg/DGfkmYEV0pZG5cxNkqfDbgwsqWa7YGLGd94xkh+ymq
-jETqxeWyozxhbQ83nYpfzeVc7t//qlJ8b5uf0wUKoRmtNr9rtp13lzP/21REzPXW
-w+oxwQKCAQAoAf2Y2lAw25KlPuq4ZlU+n9u8FkBFnWMJvBMJ7c9XHNmJMf6NkLaO
-RTvWy3geYvbwxf7J9QnRH+vRTciR05cY+Olxn6A03N5nwXxRrToH3MsiWeZ0NnX/
-u8KNUYcUHbV60ulqOThuYHQ/3I9EUUAijaqqjV2sXts19ke68W0x6HKpBJhuudT9
-ktPzbdhyP8Xyl/pocNnerXwexZBsi3Ye6+eIDFz+8OnsBHVcgNPluS72tvsxgqj7
-ciNTiBGCxKKo55eCWBhRPpXE2WUrf/hGPYsBMl2h6FfZMH1+M/N7B4tgdJmS+woU
-Ftws8lTjJEiwA6HFN1ZxrwLNjJobx9yPAoIBAE0igsBuWWn6rXeOPylYg4264XOq
-8gb94pte2n9amDgCzyCn8m6AL3snLC/AoCD19DK+gyK0ukoesXPa3iX6w2xv69ZC
-urDx36Jhd4zrJb4QsFPoeKfDP+UvNVZaS41vipRRzY/y11em15prUZ4U8FA/UT1Y
-FzkBo9r6iUZRnyBLppMuEfWASDtuRNmeIHynoT1AcQOH3l9vR210iEpmAuJr0CYA
-bvTuz3UzzGGEAuIUvuaiRtkfKY52jBmiEr7SSPCr1HvLj3Ccz8bgjgR2kiXmcU50
-1zLnaPAD44LZ/0Fjqj+PimQGT6K7CNXPllmYh7MvoU52g3SVPf6rHlIR0Nc=
------END RSA PRIVATE KEY-----
diff --git a/nixos/tests/initrd-network-ssh/openssh.pub b/nixos/tests/initrd-network-ssh/openssh.pub
deleted file mode 100644
index 5b72b8085f27..000000000000
--- a/nixos/tests/initrd-network-ssh/openssh.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDv70DY8I85MCUWatpuWtRYD5Vl0C4t8zold4ew4XtlsLYXqW9aa8Mz3bkNCqGICNyBae3lYdZLlj5vuUae7NPt/Ip6Bd3zScJGaqWlIbeytfT+XFFpAAkvN+gONywX5x6zBCjoZKxicIdXEw2zTTuBttVjd/uj6xZm0t3Ek8PaIe+XlmssrR3VEsyZTpx8iEgAGUvRLwRaK/b1FE56mwJCdLR2crZv6+ifVIJiiCC8Ax7ZOgAgAnz66pph8YDKf2rx+NmJEfEuYoOr3S0qgJQvmv/Z2YQgT63xP/c98eirVDNm2z1b2J2EF1PbV0RcG0bKgy1ySnmeOTmbzYtANiI5eS5KghSFI616HmDt8G/UG1VIRHEmDdR4mM94YoXB2fNqmYAoLbD/pXzFwgg00D5+FkDsH18PVECLZMQJn6DIxgNzhP5RKUxKb1x+9I6t/b7meC0VvziceOq8KXEIwu75sJYrwdqapTOET9rkttH7jwTs/IazcpX6xYU30o6dqROOP/qJCFdlGGB4Arf0XZdOTkyzlj4FFJK2cygxkDaCshX6MeLXNtaiRWpc8jlhGjmKxH8+C0oBXoV81a6ZxigUn0XjSkwdDqElUSa2sIHHsQClKXeZIZtAlSaKUsLnWo2HBBFsP/9m2kis3zYdMwrNnqSPuQMJ2x9/7CyeQheaYw== tmtynkky@duuni
diff --git a/nixos/tests/initrd-network-ssh/ssh_host_ed25519_key b/nixos/tests/initrd-network-ssh/ssh_host_ed25519_key
new file mode 100644
index 000000000000..f1e29459b7a3
--- /dev/null
+++ b/nixos/tests/initrd-network-ssh/ssh_host_ed25519_key
@@ -0,0 +1,7 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+QyNTUxOQAAACDP9Mz6qlxdQqA4omrgbOlVsxSGONCJstjW9zqquajlIAAAAJg0WGFGNFhh
+RgAAAAtzc2gtZWQyNTUxOQAAACDP9Mz6qlxdQqA4omrgbOlVsxSGONCJstjW9zqquajlIA
+AAAEA0Hjs7LfFPdTf3ThGx6GNKvX0ItgzgXs91Z3oGIaF6S8/0zPqqXF1CoDiiauBs6VWz
+FIY40Imy2Nb3Oqq5qOUgAAAAEG5peGJsZEBsb2NhbGhvc3QBAgMEBQ==
+-----END OPENSSH PRIVATE KEY-----
diff --git a/nixos/tests/initrd-network-ssh/ssh_host_ed25519_key.pub b/nixos/tests/initrd-network-ssh/ssh_host_ed25519_key.pub
new file mode 100644
index 000000000000..3aa1587e1dce
--- /dev/null
+++ b/nixos/tests/initrd-network-ssh/ssh_host_ed25519_key.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM/0zPqqXF1CoDiiauBs6VWzFIY40Imy2Nb3Oqq5qOUg nixbld@localhost

From 9dd2537d21e61efa3094346d296c24ca1312f3e7 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Wed, 25 Mar 2020 10:39:48 +0200
Subject: [PATCH 3968/4636] cargo-outdated: 0.9.7 -> 0.9.8

---
 .../0001-Fix-outdated-Cargo.lock.patch        | 25 -------------------
 .../cargo-outdated/default.nix                | 15 +++++------
 2 files changed, 6 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/tools/package-management/cargo-outdated/0001-Fix-outdated-Cargo.lock.patch

diff --git a/pkgs/tools/package-management/cargo-outdated/0001-Fix-outdated-Cargo.lock.patch b/pkgs/tools/package-management/cargo-outdated/0001-Fix-outdated-Cargo.lock.patch
deleted file mode 100644
index 4b8bc874e676..000000000000
--- a/pkgs/tools/package-management/cargo-outdated/0001-Fix-outdated-Cargo.lock.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From fd0ccac1b3d4f78faa4c642dc2a413dfb54200fd Mon Sep 17 00:00:00 2001
-From: Maximilian Bosch <maximilian@mbosch.me>
-Date: Wed, 11 Mar 2020 22:27:23 +0100
-Subject: [PATCH] Fix outdated Cargo.lock
-
----
- Cargo.lock | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Cargo.lock b/Cargo.lock
-index 8458954..8083e81 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -171,7 +171,7 @@ dependencies = [
- 
- [[package]]
- name = "cargo-outdated"
--version = "0.9.6"
-+version = "0.9.7"
- dependencies = [
-  "cargo",
-  "docopt",
--- 
-2.25.0
-
diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix
index 6f8a415c5cbc..a87387b3831f 100644
--- a/pkgs/tools/package-management/cargo-outdated/default.nix
+++ b/pkgs/tools/package-management/cargo-outdated/default.nix
@@ -1,22 +1,19 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, libiconv, curl, darwin }:
+{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, libiconv, curl, darwin }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-outdated";
-  version = "0.9.7";
+  version = "0.9.8";
 
   src = fetchFromGitHub {
     owner = "kbknapp";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0g91cfja4h9qhpxgnimczjna528ml645iz7hgpwl6yp0742qcal4";
+    sha256 = "112yk46yq484zvr8mbj678qsirmyn2ij2h0z359qrhhl7r19icab";
   };
 
-  # Can be removed when updating to the next release.
-  cargoPatches = [ ./0001-Fix-outdated-Cargo.lock.patch ];
+  cargoSha256 = "1bjs7lkbamy9za619z31ycqqgrfhvxbgfgpc79ykh4mfwphxzg3n";
 
-  cargoSha256 = "0pr57g41lnn8srcbc11sb15qchf01zwqcb1802xdayj6wlc3g3dy";
-
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ]
   ++ stdenv.lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.Security
@@ -26,7 +23,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with stdenv.lib; {
     description = "A cargo subcommand for displaying when Rust dependencies are out of date";
-    homepage = https://github.com/kbknapp/cargo-outdated;
+    homepage = "https://github.com/kbknapp/cargo-outdated";
     license = with licenses; [ asl20 /* or */ mit ];
     platforms = platforms.all;
     maintainers = with maintainers; [ sondr3 ivan ];

From 27db92f412b181c4c4d4aa75ad4ba5e04559bcf6 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 25 Mar 2020 04:20:00 -0500
Subject: [PATCH 3969/4636] xonsh: 0.9.14 -> 0.9.15

Changelog: https://github.com/xonsh/xonsh/releases/tag/0.9.15
---
 pkgs/shells/xonsh/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index 2a1688480dbc..e8430fbfbff5 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -1,23 +1,21 @@
 { stdenv
 , fetchFromGitHub
-, fetchpatch
 , python3Packages
 , glibcLocales
 , coreutils
 , git
-, python3
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "xonsh";
-  version = "0.9.14";
+  version = "0.9.15";
 
   # fetch from github because the pypi package ships incomplete tests
   src = fetchFromGitHub {
     owner  = "xonsh";
     repo   = "xonsh";
     rev    = version;
-    sha256 = "03g8ilg4dxin3v3rzccdxx9zf8rvyqpxakn1dlpqbgsnwdwa19p4";
+    sha256 = "1bc1cysh2jnqi9ihmpgpbh5l9bjq9q9zgpxmdhg8d7i2w4d3z421";
   };
 
   LC_ALL = "en_US.UTF-8";
@@ -46,7 +44,8 @@ python3Packages.buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     description = "A Python-ish, BASHwards-compatible shell";
-    homepage = https://xon.sh/;
+    homepage = "https://xon.sh/";
+    changelog = "https://github.com/xonsh/xonsh/releases/tag/${version}";
     license = licenses.bsd3;
     maintainers = with maintainers; [ spwhitt vrthra ];
     platforms = platforms.all;

From 63c871e1480cf83c45a140df64279dfb3cd356b7 Mon Sep 17 00:00:00 2001
From: Marek Fajkus <marek.faj@gmail.com>
Date: Wed, 25 Mar 2020 11:53:38 +0100
Subject: [PATCH 3970/4636] elmPackages.elm-instrument: remove patch

---
 pkgs/development/compilers/elm/default.nix                | 8 --------
 .../development/compilers/elm/packages/elm-instrument.nix | 8 ++++----
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index fa9f72ebd044..3e2d3ce2ad2f 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -52,14 +52,6 @@ let
             }));
 
             elm-instrument = justStaticExecutables (overrideCabal (self.callPackage ./packages/elm-instrument.nix {}) (drv: {
-              patches = [(
-                # GHC 8.8.1 and Cabal >= 1.25.0 support
-                # https://github.com/zwilias/elm-instrument/pull/3
-                fetchpatch {
-                  url = "https://github.com/turboMaCk/elm-instrument/commit/4272db2aea742c8b54509e536fa4f35d04f95da5.patch";
-                  sha256 = "1d1lc43lp3x5jfhlyb1b7na7nj1g1i1vc1np26pcisg9c2s7gjz6";
-                }
-              )];
               prePatch = ''
                 sed "s/desc <-.*/let desc = \"${drv.version}\"/g" Setup.hs --in-place
               '';
diff --git a/pkgs/development/compilers/elm/packages/elm-instrument.nix b/pkgs/development/compilers/elm/packages/elm-instrument.nix
index bd7690162277..54077994fbdd 100644
--- a/pkgs/development/compilers/elm/packages/elm-instrument.nix
+++ b/pkgs/development/compilers/elm/packages/elm-instrument.nix
@@ -3,15 +3,15 @@
 , fetchgit, filepath, free, HUnit, indents, json, mtl
 , optparse-applicative, parsec, process, QuickCheck, quickcheck-io
 , split, stdenv, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
-, text, elm
+, text
 }:
 mkDerivation {
   pname = "elm-instrument";
   version = "0.0.7";
   src = fetchgit {
-    url = "https://github.com/zwilias/elm-instrument.git";
-    sha256 = "14yfzwsyvgc6rzn19sdmwk2mc1vma9hcljnmjnmlig8mp0271v56";
-    rev = "31b527e405a6afdb25bb87ad7bd14f979e65cff7";
+    url = "https://github.com/zwilias/elm-instrument";
+    sha256 = "167d7l2547zxdj7i60r6vazznd9ichwc0bqckh3vrh46glkz06jv";
+    rev = "63e15bb5ec5f812e248e61b6944189fa4a0aee4e";
     fetchSubmodules = true;
   };
   isLibrary = true;

From 4665b2a9a2ce06a2f1551fa75ce1202b45b72b14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Holger=20W=C3=BCnsche?= <holger.o.wuensche@t-online.de>
Date: Wed, 25 Mar 2020 10:09:30 +0100
Subject: [PATCH 3971/4636] llvmPackages_10: rc5 -> release

updated hashes and url
updated comment regarding version/release_version to make it clearer
---
 pkgs/development/compilers/llvm/10/clang/default.nix  | 2 +-
 pkgs/development/compilers/llvm/10/compiler-rt.nix    | 2 +-
 pkgs/development/compilers/llvm/10/default.nix        | 7 +++----
 pkgs/development/compilers/llvm/10/libc++/default.nix | 2 +-
 pkgs/development/compilers/llvm/10/libc++abi.nix      | 2 +-
 pkgs/development/compilers/llvm/10/libunwind.nix      | 2 +-
 pkgs/development/compilers/llvm/10/lld.nix            | 2 +-
 pkgs/development/compilers/llvm/10/lldb.nix           | 2 +-
 pkgs/development/compilers/llvm/10/llvm.nix           | 4 ++--
 pkgs/development/compilers/llvm/10/openmp.nix         | 2 +-
 10 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/compilers/llvm/10/clang/default.nix b/pkgs/development/compilers/llvm/10/clang/default.nix
index dfdc9f74e15b..61008b5c12a1 100644
--- a/pkgs/development/compilers/llvm/10/clang/default.nix
+++ b/pkgs/development/compilers/llvm/10/clang/default.nix
@@ -8,7 +8,7 @@ let
     pname = "clang";
     inherit version;
 
-    src = fetch "clang" "0ap63qhz0j6m63l4njwp055xni4s71dsxqi1w5d2p93hbswaiiw2";
+    src = fetch "clang" "08fbxa2a0kr3ni35ckppj0kyvlcyaywrhpqwcdrdy0z900mhcnw8";
 
     unpackPhase = ''
       unpackFile $src
diff --git a/pkgs/development/compilers/llvm/10/compiler-rt.nix b/pkgs/development/compilers/llvm/10/compiler-rt.nix
index 8c870a610cc2..02bbc17c9673 100644
--- a/pkgs/development/compilers/llvm/10/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/10/compiler-rt.nix
@@ -2,7 +2,7 @@
 stdenv.mkDerivation rec {
   pname = "compiler-rt";
   inherit version;
-  src = fetch pname "1g067yx8qz0bmf00b2xqjqaayqj2xvrjp9smms3a16syj9m0hfri";
+  src = fetch pname "0x9c531k6ww21s2mkdwqx1vbdjmx6d4wmfb8gdbj0wqa796sczba";
 
   nativeBuildInputs = [ cmake python3 llvm ];
   buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix
index 574ab5ec4e77..462f246b89da 100644
--- a/pkgs/development/compilers/llvm/10/default.nix
+++ b/pkgs/development/compilers/llvm/10/default.nix
@@ -6,15 +6,14 @@
 
 let
   release_version = "10.0.0";
-  candidate = "rc5";
-  version = "10.0.0${candidate}"; # differentiating these is important for rc's
+  version = release_version; # differentiating these (variables) is important for rc's
 
   fetch = name: sha256: fetchurl {
-    url = "https://prereleases.llvm.org/${release_version}/${candidate}/${name}-${version}.src.tar.xz";
+    url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz";
     inherit sha256;
   };
 
-  clang-tools-extra_src = fetch "clang-tools-extra" "0x23q70c0xcwdhj0d66nisr8rqq69qcshrbb4si9pxfsm0zs9h3i";
+  clang-tools-extra_src = fetch "clang-tools-extra" "074ija5s2jsdn0k035r2dzmryjmqxdnyg4xwvaqych2bazv8rpxc";
 
   tools = stdenv.lib.makeExtensible (tools: let
     callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
diff --git a/pkgs/development/compilers/llvm/10/libc++/default.nix b/pkgs/development/compilers/llvm/10/libc++/default.nix
index 18eae91d3402..9e3529a046fc 100644
--- a/pkgs/development/compilers/llvm/10/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/10/libc++/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   pname = "libc++";
   inherit version;
 
-  src = fetch "libcxx" "0qw85sy3y1mcdrj8yd1j1gmskh0vs4xdgrx80niigizhr7030vxs";
+  src = fetch "libcxx" "1isnj78diknh0nvd73mlq8p8g209f9bab2mbysq826bg2wzql3r7";
 
   postUnpack = ''
     unpackFile ${libcxxabi.src}
diff --git a/pkgs/development/compilers/llvm/10/libc++abi.nix b/pkgs/development/compilers/llvm/10/libc++abi.nix
index ba51f0f33f1b..b58c12bd9ab4 100644
--- a/pkgs/development/compilers/llvm/10/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/10/libc++abi.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   pname = "libc++abi";
   inherit version;
 
-  src = fetch "libcxxabi" "15iclzxjqfjynqxjg8dahyr0gfg83blv9dm7z9hq5ipxw8x2sglf";
+  src = fetch "libcxxabi" "1q8lrbh68a9v4lr88b8xsjpmwx5z96sa5wnkb92xx7ccm1ssq6z7";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind;
diff --git a/pkgs/development/compilers/llvm/10/libunwind.nix b/pkgs/development/compilers/llvm/10/libunwind.nix
index 6016d0536bff..4e55b28c2430 100644
--- a/pkgs/development/compilers/llvm/10/libunwind.nix
+++ b/pkgs/development/compilers/llvm/10/libunwind.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   pname = "libunwind";
   inherit version;
 
-  src = fetch pname "12c2fh63afav8rfmplfs628r74ksfs8fjls655rwjsrg1hk0gy3l";
+  src = fetch pname "09n66dl9cc17d81qflj5h1l4garmhvzfi2lhcb7rx00l8z65xp09";
 
   nativeBuildInputs = [ cmake ];
 
diff --git a/pkgs/development/compilers/llvm/10/lld.nix b/pkgs/development/compilers/llvm/10/lld.nix
index ab2dd8caee83..4bde3d74636e 100644
--- a/pkgs/development/compilers/llvm/10/lld.nix
+++ b/pkgs/development/compilers/llvm/10/lld.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   pname = "lld";
   inherit version;
 
-  src = fetch pname "08zg546872b432qrx49i7k1c2vdq9yjvc7gnrvy2nywv0d2qf9nc";
+  src = fetch pname "026pwcbczcg0j5c9h7hxxrn3ki81ia9m9sfn0sy0bvzffv2xg85r";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ llvm libxml2 ];
diff --git a/pkgs/development/compilers/llvm/10/lldb.nix b/pkgs/development/compilers/llvm/10/lldb.nix
index 12cb43bc504c..46c991de817a 100644
--- a/pkgs/development/compilers/llvm/10/lldb.nix
+++ b/pkgs/development/compilers/llvm/10/lldb.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (rec {
   pname = "lldb";
   inherit version;
 
-  src = fetch pname "0swv16n7gm12f399f7hxai1jh89s14h3yg7cci10yaiibpvwk73x";
+  src = fetch pname "0ddikvc0kbqlqvsypsm9nhfwmyw4prp4rv49f0bgacyh5ssgq7yx";
 
   patches = [ ./lldb-procfs.patch ];
 
diff --git a/pkgs/development/compilers/llvm/10/llvm.nix b/pkgs/development/compilers/llvm/10/llvm.nix
index 0405958070a2..73265419cfb7 100644
--- a/pkgs/development/compilers/llvm/10/llvm.nix
+++ b/pkgs/development/compilers/llvm/10/llvm.nix
@@ -31,8 +31,8 @@ in stdenv.mkDerivation (rec {
   pname = "llvm";
   inherit version;
 
-  src = fetch pname "1abfi0zqbcwxf68dk00szpjxkcd44589va243af8sg97hljq6709";
-  polly_src = fetch "polly" "1fzg5934km69rwam6vgznk0p4slzhr0icwmj3jibw3p93ppa8k9r";
+  src = fetch pname "1pwgm6cr0xr5a0hrbqs1zvsvvjvy0yq1y47c96804wcs795s90yz";
+  polly_src = fetch "polly" "15sd3dq0w60jsb76pis09lkagj5iy43h9hg4kd9gx5l8cbnsdyrm";
 
   unpackPhase = ''
     unpackFile $src
diff --git a/pkgs/development/compilers/llvm/10/openmp.nix b/pkgs/development/compilers/llvm/10/openmp.nix
index 1cdd4cc9bba1..4dd45ba94e63 100644
--- a/pkgs/development/compilers/llvm/10/openmp.nix
+++ b/pkgs/development/compilers/llvm/10/openmp.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   pname = "openmp";
   inherit version;
 
-  src = fetch pname "0swif1plz7drjha6rdw02b60symsz95w62wxpiygbpdwsmhbbgam";
+  src = fetch pname "1ymd13gj07x0b0vxziygm0p41vrq6nsgx837jqg9ll6h8ndg57rv";
 
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [ llvm ];

From da7b60300763b1e3f7e7c4170c4f3b2118e2e855 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 25 Mar 2020 06:45:57 -0500
Subject: [PATCH 3972/4636] trellis: 2020.02.04 -> 2020.03.25

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/tools/trellis/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix
index 130aa87f7ce4..d297105ea91e 100644
--- a/pkgs/development/tools/trellis/default.nix
+++ b/pkgs/development/tools/trellis/default.nix
@@ -8,24 +8,26 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "trellis";
-  version = "2020.02.04";
+  version = "2020.03.25";
+
   # git describe --tags
   realVersion = with stdenv.lib; with builtins;
-    "1.0-130-g${substring 0 7 (elemAt srcs 0).rev}";
+    "1.0-152-g${substring 0 7 (elemAt srcs 0).rev}";
 
   srcs = [
     (fetchFromGitHub {
        owner  = "SymbiFlow";
        repo   = "prjtrellis";
-       rev    = "4e4b95c8e03583d48d76d1229f9c7825e2ee5be1";
-       sha256 = "02kg48393bjiys56r62b4ks2xvfarw9phi5bips2xsnj9c99pmg0";
+       rev    = "c27bfc220a9f85f04173840d1ea081ba478adc9c";
+       sha256 = "1fyl51246ns2njvij8g7k9a9axvhz8n8g09fny5dym9q7hcx08qh";
        name   = "trellis";
      })
+
     (fetchFromGitHub {
       owner  = "SymbiFlow";
       repo   = "prjtrellis-db";
-      rev    = "717478b757a702bbc7e3e11a5fbecee2a64f7922";
-      sha256 = "0q4j8qz3m2hissn2a82ck542cx62bp4f0wwzl3g22yv59i13yg83";
+      rev    = "c137076fdd8bfca3d2bf9cdacda9983dbbec599a";
+      sha256 = "1br0vw8wwcn2qhs8kxkis5xqlr2nw7r3mf1qwjp8xckd6fa1wlcw";
       name   = "trellis-database";
     })
   ];

From b008875ddb910267576c2a2fa1bde81f184f6331 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 25 Mar 2020 06:46:00 -0500
Subject: [PATCH 3973/4636] nextpnr: 2020.02.04 -> 2020.03.25

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/nextpnr/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix
index afd08f6e96e7..b0fbc2eb8d13 100644
--- a/pkgs/development/compilers/nextpnr/default.nix
+++ b/pkgs/development/compilers/nextpnr/default.nix
@@ -14,14 +14,14 @@ let
 in
 with stdenv; mkDerivation rec {
   pname = "nextpnr";
-  version = "2020.02.04";
+  version = "2020.03.25";
 
   srcs = [
     (fetchFromGitHub {
       owner  = "YosysHQ";
       repo   = "nextpnr";
-      rev    = "ca733561873cd54be047ae30a94efcd71b3f8be5";
-      sha256 = "176drrq6w53qbwmnksa1b22w9qz3gd1db9hy2lyv8svbcdxd9qwp";
+      rev    = "a3ede0293a50c910e7d96319b2084d50f2501a6b";
+      sha256 = "0ikfjva4gqmlx6y7mjamg03ad7x9gnz32ahqv798ynd87svq10aq";
       name   = "nextpnr";
     })
     (fetchFromGitHub {

From d35d9a9db2a99b2430998c47d2cf4c316f4a83c4 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 25 Mar 2020 06:46:01 -0500
Subject: [PATCH 3974/4636] yosys: 2020.03.16 -> 2020.03.24

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/yosys/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index 5e26e37b4438..3a54d42498ce 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname   = "yosys";
-  version = "2020.03.16";
+  version = "2020.03.24";
 
   src = fetchFromGitHub {
     owner  = "YosysHQ";
     repo   = "yosys";
-    rev    = "ed4fa19ba2812c286562baf26bbbcb49afad83bc";
-    sha256 = "1sza5ng0q8dy6p4hks9b2db129xjcid9n6l8aglf2cj5ks82k5nv";
+    rev    = "c9555c9adeba886a308c60615ac794ec20d9276e";
+    sha256 = "1fh118fv06jyfmkx6zy0w2k0rjj22m0ffyll3k5giaw8zzaf0j3a";
   };
 
   enableParallelBuilding = true;

From 4808bef486988d5d717eabd2625c00f3c560328e Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 25 Mar 2020 06:46:01 -0500
Subject: [PATCH 3975/4636] symbiyosys: 2020.02.11 -> 2020.03.24

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/science/logic/symbiyosys/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix
index 48c48836b06d..b180cf307f0f 100644
--- a/pkgs/applications/science/logic/symbiyosys/default.nix
+++ b/pkgs/applications/science/logic/symbiyosys/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation {
   pname = "symbiyosys";
-  version = "2020.02.11";
+  version = "2020.03.24";
 
   src = fetchFromGitHub {
     owner  = "YosysHQ";
     repo   = "SymbiYosys";
-    rev    = "0a7013017f9d583ef6cc8d10712f4bf11cf6e024";
-    sha256 = "08xz8sgvs1qy7jxp8ma5yl49i6nl7k6bkhry4afdvwg3fvwis39c";
+    rev    = "8a62780b9df4d2584e41cdd42cab92fddcd75b31";
+    sha256 = "0ss5mrzwff2dny8kfciqbrz67m6k52yvc1shd7gk3qb99x7g7fp8";
   };
 
   buildInputs = [ python3 ];

From 765b2fd86636903953165c762705a70ef9525ecd Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 25 Mar 2020 06:46:01 -0500
Subject: [PATCH 3976/4636] mcy: 2020.03.16 -> 2020.03.21

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/science/logic/mcy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/mcy/default.nix b/pkgs/applications/science/logic/mcy/default.nix
index ec9af1926318..a9366d560583 100644
--- a/pkgs/applications/science/logic/mcy/default.nix
+++ b/pkgs/applications/science/logic/mcy/default.nix
@@ -7,13 +7,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "mcy";
-  version = "2020.03.16";
+  version = "2020.03.21";
 
   src = fetchFromGitHub {
     owner  = "YosysHQ";
     repo   = "mcy";
-    rev    = "562c02375067428bb657f57faa5131ee1ab44051";
-    sha256 = "0q77v2hxnmv61zx5bl4lrqiavgvsiyb5qxdp9hnihimj1m30bc5h";
+    rev    = "bac92b8aad9bf24714fda70d3750bb50d6d96177";
+    sha256 = "0mmg6zd5cbn8g0am9c3naamg0lq67yyy117fzn2ydigcyia7vmnp";
   };
 
   buildInputs = [ python ];

From d8b853799d6658582a6039be8febfbd925d967aa Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Wed, 25 Mar 2020 12:00:00 +0000
Subject: [PATCH 3977/4636] buildRustCrate: don't sort link flags

Linkage order is significant and sorting can result in link errors.
---
 pkgs/build-support/rust/build-rust-crate/configure-crate.nix | 2 +-
 pkgs/build-support/rust/build-rust-crate/lib.sh              | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
index 61c39c6b21c0..ed8100537090 100644
--- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix
@@ -172,7 +172,7 @@ in ''
      set +e
      EXTRA_BUILD=$(sed -n "s/^cargo:rustc-flags=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
      EXTRA_FEATURES=$(sed -n "s/^cargo:rustc-cfg=\(.*\)/--cfg \1/p" target/build/${crateName}.opt | tr '\n' ' ')
-     EXTRA_LINK=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
+     EXTRA_LINK=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ')
      EXTRA_LINK_SEARCH=$(sed -n "s/^cargo:rustc-link-search=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u)
 
      for env in $(sed -n "s/^cargo:rustc-env=\(.*\)/\1/p" target/build/${crateName}.opt); do
diff --git a/pkgs/build-support/rust/build-rust-crate/lib.sh b/pkgs/build-support/rust/build-rust-crate/lib.sh
index 5843ee98b0d5..6cf3481754b2 100644
--- a/pkgs/build-support/rust/build-rust-crate/lib.sh
+++ b/pkgs/build-support/rust/build-rust-crate/lib.sh
@@ -105,11 +105,6 @@ setup_link_paths() {
   done
 
   if [[ -e target/link ]]; then
-     sort -u target/link.final > target/link.final.sorted
-     mv target/link.final.sorted target/link.final
-     sort -u target/link > target/link.sorted
-     mv target/link.sorted target/link
-
      tr '\n' ' ' < target/link > target/link_
      LINK=$(cat target/link_)
   fi

From 75c90d3fc7a44103925b39473740525d31be94b4 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 9 Mar 2020 15:15:17 +0200
Subject: [PATCH 3978/4636] liberio: init at unstable-2019-12-11

---
 .../development/libraries/liberio/default.nix | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/libraries/liberio/default.nix

diff --git a/pkgs/development/libraries/liberio/default.nix b/pkgs/development/libraries/liberio/default.nix
new file mode 100644
index 000000000000..b4023d5f36a9
--- /dev/null
+++ b/pkgs/development/libraries/liberio/default.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, fetchFromGitHub
+, autoreconfHook
+, systemd
+, pkg-config
+}:
+
+stdenv.mkDerivation rec {
+  pname = "liberio";
+  version = "unstable-2019-12-11";
+
+  src = fetchFromGitHub {
+    owner = "EttusResearch";
+    repo = "liberio";
+    rev = "81777e500d1c3b88d5048d46643fb5553eb5f786";
+    sha256 = "1n40lj5g497mmqh14vahdhy3jwvcry2pkc670p4c9f1pggp6ysgk";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    autoreconfHook
+  ];
+
+  buildInputs = [
+    systemd
+  ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "Ettus Research DMA I/O Library";
+    homepage = "https://github.com/EttusResearch/liberio";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.doronbehar ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30bc0af360ec..2cb6a34e3ec4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4902,6 +4902,8 @@ in
 
   libevdev = callPackage ../development/libraries/libevdev { };
 
+  liberio = callPackage ../development/libraries/liberio { };
+
   libevdevplus = callPackage ../development/libraries/libevdevplus { };
 
   libfann = callPackage ../development/libraries/libfann { };

From 9c3be05166c36aeed3d762941e2f7159b498ace5 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 25 Mar 2020 15:27:55 +0200
Subject: [PATCH 3979/4636] beets: Quote homepage url

---
 pkgs/tools/audio/beets/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 4234889ac4d0..71ebe7ceb81d 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -264,7 +264,7 @@ in pythonPackages.buildPythonApplication rec {
 
   meta = {
     description = "Music tagger and library organizer";
-    homepage = http://beets.io;
+    homepage = "http://beets.io";
     license = licenses.mit;
     maintainers = with maintainers; [ aszlig domenkozar pjones ];
     platforms = platforms.linux;

From 6ecb9ceda4a7a0825b505468908a085ce8293ede Mon Sep 17 00:00:00 2001
From: Julien Dehos <dehos@univ-littoral.fr>
Date: Wed, 25 Mar 2020 14:30:45 +0100
Subject: [PATCH 3980/4636] gede: 2.15.4 -> 2.16.2

---
 pkgs/development/tools/misc/gede/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix
index 00cc411dc403..0965f9fcddc3 100644
--- a/pkgs/development/tools/misc/gede/default.nix
+++ b/pkgs/development/tools/misc/gede/default.nix
@@ -2,11 +2,11 @@
 
 mkDerivation rec {
   pname = "gede";
-  version = "2.15.4";
+  version = "2.16.2";
 
   src = fetchurl {
     url = "http://gede.acidron.com/uploads/source/${pname}-${version}.tar.xz";
-    sha256 = "0bg7vyvznn1gn6w5yn14j59xph9psf2fyxr434pk62wmbzdpmkfg";
+    sha256 = "18a8n9yvhgkbc97p2995j7b5ncfdzy1fy13ahdafqmcpkl4r1hrj";
   };
 
   nativeBuildInputs = [ qmake makeWrapper python ];

From 8a9ffd2ae0f888516aba4eb965a14e8d3c1b9cdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Wed, 25 Mar 2020 14:53:10 +0100
Subject: [PATCH 3981/4636] makemkv: 1.14.7 -> 1.15.0

Upstream changelog:

- User interface update
- New preferences page for LibMMBD integation
- Improved handling for discs with mastering errors
- Better tolerance for corrupted input data
- Many internal improvements
---
 pkgs/applications/video/makemkv/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index ca202c5ce603..5423ffcb1422 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -3,21 +3,21 @@
 }:
 
 let
-  version = "1.14.7";
+  version = "1.15.0";
   # Using two URLs as the first one will break as soon as a new version is released
   src_bin = fetchurl {
     urls = [
       "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz"
       "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz"
     ];
-    sha256 = "19j62vyk8havv38lh35108f7jmrqiqzikl3aqlsncxxa69m6fv5n";
+    sha256 = "1zr63fqx4qcrnrbg1f97w9mp3yzzxf0dk8pw60y2d4436vanfba4";
   };
   src_oss = fetchurl {
     urls = [
       "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz"
       "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz"
     ];
-    sha256 = "1w6b4cvhfg1dv2claam0l6slhjqzy0n2lvwk1ggkh4c561qbfp59";
+    sha256 = "01pdydll37inkq74874rqd5kk0maafnm1lqcv41jzgzjrfkky8d9";
   };
 in mkDerivation {
   pname = "makemkv";

From 37dd87a3be4079d3e529a7b1dbc18815a291750d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Mar 2020 13:56:03 +0000
Subject: [PATCH 3982/4636] python27Packages.python-stdnum: 1.12 -> 1.13

---
 pkgs/development/python-modules/python-stdnum/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix
index 556be12872b5..39153f4a4daa 100644
--- a/pkgs/development/python-modules/python-stdnum/default.nix
+++ b/pkgs/development/python-modules/python-stdnum/default.nix
@@ -1,11 +1,11 @@
 { lib, fetchPypi, buildPythonPackage, nose }:
 
 buildPythonPackage rec {
-  version = "1.12";
+  version = "1.13";
   pname = "python-stdnum";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "19fb5asv0ngnbpiz1bqzq2jhgn845kv9hjcjajsgzgfp2k24f4sc";
+    sha256 = "0q4128rjdgavywhzlm2gz2n5ybc9b9sxs81g50dvxf5q7z9q63qj";
   };
 
   checkInputs = [ nose ];
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   '';
 
   meta = {
-    homepage = https://arthurdejong.org/python-stdnum/;
+    homepage = "https://arthurdejong.org/python-stdnum/";
     description = "Python module to handle standardized numbers and codes";
     maintainers = with lib.maintainers; [ johbo ];
     license = lib.licenses.lgpl2Plus;

From 3fe9ff525a0ba2079ff8de710654fa29ef0f4ed0 Mon Sep 17 00:00:00 2001
From: "Samuel W. Flint" <swflint@flintfam.org>
Date: Wed, 25 Mar 2020 09:31:06 -0500
Subject: [PATCH 3983/4636] x11idle: update version, repository (#35676)

Co-authored-by: Enteee <ducksource@duckpond.ch>
---
 pkgs/tools/misc/x11idle/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/x11idle/default.nix b/pkgs/tools/misc/x11idle/default.nix
index 270b39f8110b..ac13f41ef9f5 100644
--- a/pkgs/tools/misc/x11idle/default.nix
+++ b/pkgs/tools/misc/x11idle/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchgit, libXScrnSaver, libX11 }:
+{ stdenv, fetchurl, libXScrnSaver, libX11 }:
 
-stdenv.mkDerivation {
-  name = "x11idle-unstable-2017-07-01";
+stdenv.mkDerivation rec {
 
-  src = fetchgit {
-    url = "git://orgmode.org/org-mode.git";
-    rev = "fbd865941f3105f689f78bf053bb3b353b9b8a23";
-    sha256 = "0ma3m48f4s38xln0gl1ww9i5x28ij0ipxc94kx5h2931zy7lqzvz";
+  version = "9.2.4";
+  name = "x11idle-org-${version}";
+
+  src = fetchurl {
+    url = "https://code.orgmode.org/bzg/org-mode/raw/release_${version}/contrib/scripts/x11idle.c";
+    sha256 = "0fc5g57xd6bmghyl214gcff0ni3idv33i3gkr339kgn1mdjljv5g";
   };
 
   buildInputs = [ libXScrnSaver libX11 ];
@@ -15,7 +16,7 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p $out/bin
-    gcc -lXss -lX11 $src/contrib/scripts/x11idle.c -o $out/bin/x11idle
+    gcc -lXss -lX11 $src -o $out/bin/x11idle
   '';
 
   meta = with stdenv.lib; {

From d9fe974579ac8c9f767f429d2ca0086894c84bf6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Mar 2020 14:52:22 +0000
Subject: [PATCH 3984/4636] python27Packages.pyroute2: 0.5.9 -> 0.5.10

---
 pkgs/development/python-modules/pyroute2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix
index e13472dafb4f..76007b83588e 100644
--- a/pkgs/development/python-modules/pyroute2/default.nix
+++ b/pkgs/development/python-modules/pyroute2/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pyroute2";
-  version = "0.5.9";
+  version = "0.5.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1dymaa3rif05k42sh4c3g2m057v2dsc2f3f49hl2rw5yz8bd23i4";
+    sha256 = "0akls1w67v17dmgr07n6rr5xy6yyj6p83ss05033gk1c3mfsbb1r";
   };
 
   # requires root priviledges
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Python Netlink library";
-    homepage = https://github.com/svinota/pyroute2;
+    homepage = "https://github.com/svinota/pyroute2";
     license = licenses.asl20;
     maintainers = [maintainers.mic92];
     platforms = platforms.unix;

From 9105efdcde2c401b741efb8d09c2fd7eb31136c6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 25 Mar 2020 13:02:56 -0400
Subject: [PATCH 3985/4636] linux: 4.19.112 -> 4.19.113

---
 pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix
index 8e260ff6b5d4..65f93a0f9243 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.19.112";
+  version = "4.19.113";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0yiyqwgh6wcyshpdj98s7dc4ahyx47y6whvnww6sjmzdq0fb3hi4";
+    sha256 = "1rf0jz7r1f4rb4k0g3glssfa1hm2ka6vlbwjlkmsx1bybxnmg85m";
   };
 } // (args.argsOverride or {}))

From bec620d85bc7a313694fdc0f23a51584f91fd4e3 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 25 Mar 2020 13:03:10 -0400
Subject: [PATCH 3986/4636] linux: 5.4.27 -> 5.4.28

---
 pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index cdc802b9616b..2471962404e3 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.4.27";
+  version = "5.4.28";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0szc1p9y6z8gs2f1nj45nrz52sxcabg2xh7zqlljazv45lvcvf8r";
+    sha256 = "197p7rjmbs229ncj1y8s80f7n4bm8g9w0jrv1109m3rl8q9wqqy8";
   };
 } // (args.argsOverride or {}))

From ec87ed26e67964286b3c8f2b5286c5a2e4bb59c7 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 25 Mar 2020 13:03:19 -0400
Subject: [PATCH 3987/4636] linux: 5.5.11 -> 5.5.13

---
 pkgs/os-specific/linux/kernel/linux-5.5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.5.nix b/pkgs/os-specific/linux/kernel/linux-5.5.nix
index 474c6980e4a5..aa15a42d2c4d 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.5.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.5.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.5.11";
+  version = "5.5.13";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0bplsbjb3slx566assxdhp7rnmm9z2s8iv9hfar574jds77syix5";
+    sha256 = "1qjf18qywzrfdzwpgpf6m0w0bil8rbc9hby8473ckzvbl0a3cfqz";
   };
 } // (args.argsOverride or {}))

From f47e15a63c28fb964975186bc60cdd5869a1479b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 25 Mar 2020 13:06:02 -0400
Subject: [PATCH 3988/4636] zoom-us: 3.5.372466.0322 -> 3.5.374815.0324

---
 .../networking/instant-messengers/zoom-us/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index f3ec3ba5c06a..ae92e23d0bd0 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
 let
   inherit (stdenv.lib) concatStringsSep makeBinPath optional;
 
-  version = "3.5.372466.0322";
+  version = "3.5.374815.0324";
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
-      sha256 = "0yaf5rmxkzwxs27gqxd13i9c72rysmymh99kg70i1giigv93fbr0";
+      sha256 = "1pnr00jwjjp23bbqdg5sv2s2rnciz57g1453sgi13kzpppydhzi5";
     };
   };
 

From b56496945fc7392d0edfeb1da28eebef08410ca5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Mar 2020 01:06:18 +0000
Subject: [PATCH 3989/4636] python37Packages.aiohttp-socks: 0.3.4 -> 0.3.6

---
 pkgs/development/python-modules/aiohttp-socks/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix
index 782238c3f832..792db7091d07 100644
--- a/pkgs/development/python-modules/aiohttp-socks/default.nix
+++ b/pkgs/development/python-modules/aiohttp-socks/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "aiohttp-socks";
-  version = "0.3.4";
+  version = "0.3.6";
 
   src = fetchPypi {
     inherit version;
     pname = "aiohttp_socks";
-    sha256 = "1gc74a0i0slq3gn9kv3scn7c9x444z5nwjm3d14qilsgq6civsnd";
+    sha256 = "0js7p9qj5x6k8i2cby4c6mw6xrp4dy4m82f3n1l8rz00qibmj37j";
   };
 
   propagatedBuildInputs = [ aiohttp attrs ];
@@ -20,6 +20,6 @@ buildPythonPackage rec {
   meta = {
     description = "SOCKS proxy connector for aiohttp";
     license = lib.licenses.asl20;
-    homepage = https://github.com/romis2012/aiohttp-socks;
+    homepage = "https://github.com/romis2012/aiohttp-socks";
   };
 }

From eb50635ec9bd41cde71ec69b7b26ee884e6a3a9e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Mar 2020 00:31:07 +0000
Subject: [PATCH 3990/4636] python27Packages.geoalchemy2: 0.6.3 -> 0.7.0

---
 pkgs/development/python-modules/geoalchemy2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix
index 250942a84884..02d00461e26f 100644
--- a/pkgs/development/python-modules/geoalchemy2/default.nix
+++ b/pkgs/development/python-modules/geoalchemy2/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "GeoAlchemy2";
-  version = "0.6.3";
+  version = "0.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1viq85fsb119w4lmxn2iacxf2w35b8cgzamlrb685z50pp1cdi2d";
+    sha256 = "0lnmj9jky9pz227scmjxgvd8243higl24ndc0cc668mm36cnwapc";
   };
 
   propagatedBuildInputs = [ sqlalchemy shapely ];

From 97f8808b872d1a4b143b386032f22a327e35e882 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Mar 2020 16:54:16 +0000
Subject: [PATCH 3991/4636] python27Packages.sphinxcontrib-openapi: 0.5.0 ->
 0.6.0

---
 .../python-modules/sphinxcontrib-openapi/default.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
index 58b24f0dd73e..a60a36413ac1 100644
--- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "sphinxcontrib-openapi";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2a5883456c0caba0dad90f07968c75a50d5fc425a3aa06d1c538472ddf8c7e22";
+    sha256 = "02pkzcmxikcfvkvcfsclnhymzl1lc84jz6vmdaslbgh4j5vlp5ym";
   };
 
   propagatedBuildInputs = [setuptools_scm pyyaml jsonschema sphinxcontrib_httpdomain];
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/ikalnytskyi/sphinxcontrib-openapi;
+    homepage = "https://github.com/ikalnytskyi/sphinxcontrib-openapi";
     description = "OpenAPI (fka Swagger) spec renderer for Sphinx";
     license = licenses.bsd0;
   };

From cbc5fbf98e7606668e4f4f43be9bd79579f07ed4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Mar 2020 16:25:19 +0000
Subject: [PATCH 3992/4636] python27Packages.thespian: 3.9.11 -> 3.10.0

---
 pkgs/development/python-modules/thespian/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/thespian/default.nix b/pkgs/development/python-modules/thespian/default.nix
index 1c59b0cae6b1..add36ccf1b62 100644
--- a/pkgs/development/python-modules/thespian/default.nix
+++ b/pkgs/development/python-modules/thespian/default.nix
@@ -1,13 +1,13 @@
 { fetchPypi, buildPythonPackage, lib }:
 
 buildPythonPackage rec {
-  version = "3.9.11";
+  version = "3.10.0";
   pname = "thespian";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "84887f0437ec144f7266ae22678bc5dc5d2a9e60a89f1f7c1707cbea5e03022a";
+    sha256 = "0n85nhj5hr8kv33jk4by8hnxm3kni5f4z1jhiw27dlf6cbgsv892";
   };
 
   # Do not run the test suite: it takes a long time and uses
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python Actor concurrency library";
-    homepage = http://thespianpy.com/;
+    homepage = "http://thespianpy.com/";
     license = licenses.mit;
     maintainers = [ maintainers.kquick ];
   };

From 63805796c6c617b8c0f34c6bca6c58f87433da72 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 25 Mar 2020 18:58:51 +0100
Subject: [PATCH 3993/4636] glances: 3.1.4 -> 3.1.4.1

---
 pkgs/applications/system/glances/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix
index a7dffd0bfab6..3dfec185b572 100644
--- a/pkgs/applications/system/glances/default.nix
+++ b/pkgs/applications/system/glances/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonApplication rec {
   pname = "glances";
-  version = "3.1.4";
+  version = "3.1.4.1";
   disabled = isPyPy;
 
   src = fetchFromGitHub {
     owner = "nicolargo";
     repo = "glances";
     rev = "v${version}";
-    sha256 = "1lr186rc3fvldy2m2yx1hxzdlxll93pjabs01sxz48kkpsvbiydi";
+    sha256 = "04dc3pwj9qbbhxpihf13ckdgwz0qc771c7v7awni4vyzk3a9cdfb";
   };
 
   # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):

From e571880c55e2a2edc519c6cd6d69341cfc847b67 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 25 Mar 2020 19:05:04 +0100
Subject: [PATCH 3994/4636] gitRepo: 2.4.1 -> 2.5

---
 pkgs/applications/version-management/git-repo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index 543ca58401a9..93fb65d1031c 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "git-repo";
-  version = "2.4.1";
+  version = "2.5";
 
   src = fetchFromGitHub {
     owner = "android";
     repo = "tools_repo";
     rev = "v${version}";
-    sha256 = "0khg1731927gvin73dcbw1657kbfq4k7agla5rpzqcnwkk5agzg3";
+    sha256 = "0y37s0v37gygv0dm8y9sjc4jr7ml8irix5rwmbk6smzwa74n0x8a";
   };
 
   patches = [ ./import-ssl-module.patch ];

From 3c3e174247cb9fb11f9956d2052587e29f823adc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Mar 2020 17:28:02 +0000
Subject: [PATCH 3995/4636] python37Packages.xdis: 4.2.2 -> 4.2.3

---
 pkgs/development/python-modules/xdis/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix
index 831dd888fae8..03e91c0cff4f 100644
--- a/pkgs/development/python-modules/xdis/default.nix
+++ b/pkgs/development/python-modules/xdis/default.nix
@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "xdis";
-  version = "4.2.2";
+  version = "4.2.3";
   disabled = isPy27;
 
   src = fetchFromGitHub {
     owner = "rocky";
     repo = "python-xdis";
     rev = version;
-    sha256 = "0d286myx6z6cbih77h8z5p9vscxvww3gy59lmi1w6y2nq6c8sqzb";
+    sha256 = "0yjb07gk74qsag4ahjrbqgl7pgr2kvm43c7yrv10mwxk0ax51337";
   };
 
   checkInputs = [ pytest ];
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python cross-version byte-code disassembler and marshal routines";
-    homepage = https://github.com/rocky/python-xdis/;
+    homepage = "https://github.com/rocky/python-xdis/";
     license = licenses.gpl2;
   };
 }

From f1c6072fddf4f1f68f287882a85e069550007e14 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Mar 2020 15:10:20 +0000
Subject: [PATCH 3996/4636] python27Packages.shodan: 1.21.3 -> 1.22.0

---
 pkgs/development/python-modules/shodan/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix
index 0c88dcd0fe20..4db1172e0410 100644
--- a/pkgs/development/python-modules/shodan/default.nix
+++ b/pkgs/development/python-modules/shodan/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "shodan";
-  version = "1.21.3";
+  version = "1.22.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1mbqdk3jdga4r08dg66j7kawmb40rs0y3nnwb9vh3c1safgqjmiz";
+    sha256 = "0pgkd0pngmygafld283zfx7whlv6yp3ldgd4sjv8bxjcsb19iw59";
   };
 
   propagatedBuildInputs = [
@@ -30,7 +30,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python library and command-line utility for Shodan";
-    homepage = https://github.com/achillean/shodan-python;
+    homepage = "https://github.com/achillean/shodan-python";
     license = licenses.mit;
     maintainers = with maintainers; [ lihop ];
   };

From a1a81b3fe78bd4cc77995e292e5360530c5cf9bc Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 25 Mar 2020 15:01:12 +0100
Subject: [PATCH 3997/4636] home-manager: install bash completions

---
 pkgs/tools/package-management/home-manager/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix
index 3fb14f99faf6..79e87066b50d 100644
--- a/pkgs/tools/package-management/home-manager/default.nix
+++ b/pkgs/tools/package-management/home-manager/default.nix
@@ -28,6 +28,9 @@ stdenv.mkDerivation rec {
       --subst-var-by gnused "${gnused}" \
       --subst-var-by less "${less}" \
       --subst-var-by HOME_MANAGER_PATH '${src}'
+
+    install -D -m755 home-manager/completion.bash \
+      "$out/share/bash-completion/completions/home-manager"
   '';
 
   meta = with stdenv.lib; {

From d5c02899827d6d2c415e8cbb2ce5d709e0ab1ae9 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 25 Mar 2020 15:01:31 +0100
Subject: [PATCH 3998/4636] home-manager: extend platforms to unix

To match the upstream default.nix.
---
 pkgs/tools/package-management/home-manager/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix
index 79e87066b50d..793c7cfae32d 100644
--- a/pkgs/tools/package-management/home-manager/default.nix
+++ b/pkgs/tools/package-management/home-manager/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A user environment configurator";
     maintainers = with maintainers; [ rycee ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     license = licenses.mit;
   };
 

From c82ab220c315ba8fbf88ac8a6f619ce2b3ef834d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Mar 2020 18:41:10 +0000
Subject: [PATCH 3999/4636] libsForQt5.qtutilities: 6.0.4 -> 6.0.5

---
 pkgs/development/libraries/qtutilities/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix
index 3f0dc18f157b..66a7b95e334f 100644
--- a/pkgs/development/libraries/qtutilities/default.nix
+++ b/pkgs/development/libraries/qtutilities/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qtutilities";
-  version = "6.0.4";
+  version = "6.0.5";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0cp7sbj20z0vl99qhs3hi5bd6akjd9l7lqdky0p6la4c9y9w5n1w";
+    sha256 = "1f2nir1qb0d6r1ndpsg7vpskdw08szq82mqvbwm5bi160xkrqhjf";
   };
 
   buildInputs = [ qtbase cpp-utilities ];

From eef3ce0bbb3bda346cf8e118297756c671525fbf Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Tue, 24 Mar 2020 16:17:23 -0400
Subject: [PATCH 4000/4636] pythonPackages.flask-babel: 0.12.2 -> 1.0.0

---
 pkgs/development/python-modules/flask-babel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix
index caaf0a61152b..307b670fa7f1 100644
--- a/pkgs/development/python-modules/flask-babel/default.nix
+++ b/pkgs/development/python-modules/flask-babel/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "Flask-Babel";
-  version = "0.12.2";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "11jwp8vvq1gnm31qh6ihy2h393hy18yn9yjp569g60r0wj1x2sii";
+    sha256 = "0gmb165vkwv5v7dxsxa2i3zhafns0fh938m2zdcrv4d8z5l099yn";
   };
 
   propagatedBuildInputs = [

From 0005b13fc5f3c4c3bf3d0bb5f7ea4330b36c0bcc Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Tue, 24 Mar 2020 16:15:53 -0400
Subject: [PATCH 4001/4636] pythonPackages.flask-appbuilder: 2.1.6 -> 2.3.0

---
 .../flask-appbuilder/default.nix              | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix
index 46841f68d60f..01bd180a5ae4 100644
--- a/pkgs/development/python-modules/flask-appbuilder/default.nix
+++ b/pkgs/development/python-modules/flask-appbuilder/default.nix
@@ -25,12 +25,12 @@
 
 buildPythonPackage rec {
   pname = "flask-appbuilder";
-  version = "2.1.6";
+  version = "2.3.0";
 
   src = fetchPypi {
     pname = "Flask-AppBuilder";
     inherit version;
-    sha256 = "a37d7d6a62407a2e0975af5305c795f2fb5c06ecc34e3cf64659d083b1b2dd5f";
+    sha256 = "04bsswi7daaqda01a83rd1f2gq6asii520f9arjf7bsy24pmbprc";
   };
 
   checkInputs = [
@@ -60,12 +60,13 @@ buildPythonPackage rec {
   ];
 
   postPatch = ''
-   substituteInPlace setup.py \
-     --replace "jsonschema>=3.0.1<4" "jsonschema" \
-     --replace "marshmallow>=2.18.0,<2.20" "marshmallow" \
-     --replace "PyJWT>=1.7.1" "PyJWT" \
-     --replace "Flask-SQLAlchemy>=2.4,<3" "Flask-SQLAlchemy" \
-     --replace "Flask-JWT-Extended>=3.18,<4" "Flask-JWT-Extended"
+    substituteInPlace setup.py \
+      --replace "apispec[yaml]>=1.1.1, <2" "apispec" \
+      --replace "jsonschema>=3.0.1, <4" "jsonschema" \
+      --replace "marshmallow>=2.18.0, <4.0.0" "marshmallow" \
+      --replace "PyJWT>=1.7.1" "PyJWT" \
+      --replace "Flask-SQLAlchemy>=2.4, <3" "Flask-SQLAlchemy" \
+      --replace "Flask-JWT-Extended>=3.18, <4" "Flask-JWT-Extended"
   '';
 
   # majority of tests require network access or mongo
@@ -73,8 +74,8 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Simple and rapid application development framework, built on top of Flask";
-    homepage = https://github.com/dpgaspar/flask-appbuilder/;
+    homepage = "https://github.com/dpgaspar/flask-appbuilder/";
     license = licenses.bsd3;
-    maintainers = [ maintainers.costrouc ];
+    maintainers = with maintainers; [ costrouc ];
   };
 }

From 14e1f448f00e03eae49f8aa1571487c4bd2c4adc Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 25 Mar 2020 19:22:39 +0100
Subject: [PATCH 4002/4636] fscrypt-experimental: 0.2.6 -> 0.2.7

---
 pkgs/os-specific/linux/fscrypt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix
index bb04efaf1ca2..9f734a47c29b 100644
--- a/pkgs/os-specific/linux/fscrypt/default.nix
+++ b/pkgs/os-specific/linux/fscrypt/default.nix
@@ -4,19 +4,18 @@
 
 buildGoModule rec {
   pname = "fscrypt";
-  version = "0.2.6";
+  version = "0.2.7";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "fscrypt";
     rev = "v${version}";
-    sha256 = "15pwhz4267kwhkv532k6wgjqfzawawdrrk6vnl017ys5s9ln51a8";
+    sha256 = "0h1ssw9x37hvks8rcnsjq4nsl6djmhx53iiwrw8fw4lf3nlmdzpx";
   };
 
   postPatch = ''
     substituteInPlace Makefile \
       --replace 'TAG_VERSION := $(shell git describe --tags)' "" \
-      --replace '$(shell date)' '$(shell date --date="@0")' \
       --replace "/usr/local" "$out"
   '';
 
@@ -46,6 +45,7 @@ buildGoModule rec {
       directories.
     '';
     inherit (src.meta) homepage;
+    changelog = "https://github.com/google/fscrypt/releases/tag/v${version}";
     license = licenses.asl20;
     platforms = platforms.linux;
     maintainers = with maintainers; [ primeos ];

From 702f645aa8de543fa813aba07b11c26067d6094b Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 14 Mar 2020 04:07:30 +0100
Subject: [PATCH 4003/4636] nixos/nextcloud: implement a safe upgrade-path
 between 19.09 and 20.03

It's impossible to move two major-versions forward when upgrading
Nextcloud. This is an issue when comming from 19.09 (using Nextcloud 16)
and trying to upgrade to 20.03 (using Nextcloud 18 by default).

This patch implements the measurements discussed in #82056 and #82353 to
improve the update process and to circumvent similar issues in the
future:

* `pkgs.nextcloud` has been removed in favor of versioned attributes
  (currently `pkgs.nextcloud17` and `pkgs.nextcloud18`). With that
  approach we can safely backport major-releases in the future to
  simplify those upgrade-paths and we can select one of the
  major-releases as default depending on the configuration (helpful to
  decide whether e.g. `pkgs.nextcloud17` or `pkgs.nextcloud18` should be
  used on 20.03 and `master` atm).

* If `system.stateVersion` is older than `20.03`, `nextcloud17` will be
  used (which is one major-release behind v16 from 19.09). When using a
  package older than the latest major-release available (currently v18),
  the evaluation will cause a warning which describes the issue and
  suggests next steps.

  To make those package-selections easier, a new option to define the
  package to be used for the service (namely
  `services.nextcloud.package`) was introduced.

* If `pkgs.nextcloud` exists (e.g. due to an overlay which was used to
  provide more recent Nextcloud versions on older NixOS-releases), an
  evaluation error will be thrown by default: this is to make sure that
  `services.nextcloud.package` doesn't use an older version by accident
  after checking the state-version. If `pkgs.nextcloud` is added
  manually, it needs to be declared explicitly in
  `services.nextcloud.package`.

* The `nixos/nextcloud`-documentation contains a
  "Maintainer information"-chapter  which describes how to roll out new
  Nextcloud releases and how to deal with old (and probably unsafe)
  versions.

Closes #82056
---
 nixos/doc/manual/release-notes/rl-2003.xml    | 49 +++++++++++++++++++
 nixos/modules/services/web-apps/nextcloud.nix | 44 ++++++++++++++---
 nixos/modules/services/web-apps/nextcloud.xml | 48 ++++++++++++++++++
 pkgs/servers/nextcloud/default.nix            | 49 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  3 +-
 5 files changed, 166 insertions(+), 27 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index e5351519f8da..02d05dec0a2b 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -648,6 +648,55 @@ auth required pam_succeed_if.so uid >= 1000 quiet
        <xref linkend="opt-environment.systemPackages"/>.
      </para>
    </listitem>
+   <listitem>
+    <para>
+     <package>nextcloud</package> has been updated to <literal>v18.0.2</literal>. This means
+     that users from NixOS 19.09 can't upgrade directly since you can only move one version
+      forward and 19.09 uses <literal>v16.0.8</literal>.
+    </para>
+    <para>
+     To provide a safe upgrade-path and to circumvent similar issues in the future, the following
+     measures were taken:
+     <itemizedlist>
+      <listitem>
+       <para>
+        The <package>pkgs.nextcloud</package>-attribute has been removed and replaced with
+        versioned attributes (currently <package>pkgs.nextcloud17</package> and
+        <package>pkgs.nextcloud18</package>). With this change major-releases can be backported
+        without breaking stuff and to make upgrade-paths easier.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Existing setups will be detected using
+        <link linkend="opt-system.stateVersion">system.stateVersion</link>: by default,
+        <package>nextcloud17</package> will be used, but will raise a warning which notes
+        that after that deploy it's recommended to update to the latest stable version
+        (<package>nextcloud18</package>) by declaring the newly introduced setting
+        <link linkend="opt-services.nextcloud.package">services.nextcloud.package</link>.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Users with an overlay (e.g. to use <package>nextcloud</package> at version
+        <literal>v18</literal> on <literal>19.09</literal>) will get an evaluation error
+        by default. This is done to ensure that our
+        <link linkend="opt-services.nextcloud.package">package</link>-option doesn't select an
+        older version by accident. It's recommended to use <package>pkgs.nextcloud18</package>
+        or to set <link linkend="opt-services.nextcloud.package">package</link> to
+        <package>pkgs.nextcloud</package> explicitly.
+       </para>
+      </listitem>
+     </itemizedlist>
+    </para>
+    <warning>
+     <para>
+      Please note that if you're comming from <literal>19.03</literal> or older, you have
+      to manually upgrade to <literal>19.09</literal> first to upgrade your server
+      to Nextcloud v16.
+     </para>
+    </warning>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 912e05d6d400..087bd0e5df3e 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -30,7 +30,7 @@ let
 
   occ = pkgs.writeScriptBin "nextcloud-occ" ''
     #! ${pkgs.stdenv.shell}
-    cd ${pkgs.nextcloud}
+    cd ${cfg.package}
     sudo=exec
     if [[ "$USER" != nextcloud ]]; then
       sudo='exec /run/wrappers/bin/sudo -u nextcloud --preserve-env=NEXTCLOUD_CONFIG_DIR'
@@ -42,6 +42,8 @@ let
       occ $*
   '';
 
+  inherit (config.system) stateVersion;
+
 in {
   options.services.nextcloud = {
     enable = mkEnableOption "nextcloud";
@@ -64,6 +66,11 @@ in {
       default = false;
       description = "Use https for generated links.";
     };
+    package = mkOption {
+      type = types.package;
+      description = "Which package to use for the Nextcloud instance.";
+      relatedPackages = [ "nextcloud17" "nextcloud18" ];
+    };
 
     maxUploadSize = mkOption {
       default = "512M";
@@ -309,10 +316,31 @@ in {
         }
       ];
 
-      warnings = optional (cfg.poolConfig != null) ''
-        Using config.services.nextcloud.poolConfig is deprecated and will become unsupported in a future release.
-        Please migrate your configuration to config.services.nextcloud.poolSettings.
-      '';
+      warnings = []
+        ++ (optional (cfg.poolConfig != null) ''
+          Using config.services.nextcloud.poolConfig is deprecated and will become unsupported in a future release.
+          Please migrate your configuration to config.services.nextcloud.poolSettings.
+        '')
+        ++ (optional (versionOlder cfg.package.version "18") ''
+          You're currently deploying an older version of Nextcloud. This may be needed
+          since Nextcloud doesn't allow major version upgrades across multiple versions (i.e. an
+          upgrade from 16 is possible to 17, but not to 18).
+
+          Please deploy this to your server and wait until the migration is finished. After
+          that you can deploy to the latest Nextcloud version available.
+        '');
+
+      services.nextcloud.package = with pkgs;
+        mkDefault (
+          if pkgs ? nextcloud
+            then throw ''
+              The `pkgs.nextcloud`-attribute has been removed. If it's supposed to be the default
+              nextcloud defined in an overlay, please set `services.nextcloud.package` to
+              `pkgs.nextcloud`.
+            ''
+          else if versionOlder stateVersion "20.03" then nextcloud17
+          else nextcloud18
+        );
     }
 
     { systemd.timers.nextcloud-cron = {
@@ -407,7 +435,7 @@ in {
           path = [ occ ];
           script = ''
             chmod og+x ${cfg.home}
-            ln -sf ${pkgs.nextcloud}/apps ${cfg.home}/
+            ln -sf ${cfg.package}/apps ${cfg.home}/
             mkdir -p ${cfg.home}/config ${cfg.home}/data ${cfg.home}/store-apps
             ln -sf ${overrideConfig} ${cfg.home}/config/override.config.php
 
@@ -429,7 +457,7 @@ in {
           environment.NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config";
           serviceConfig.Type = "oneshot";
           serviceConfig.User = "nextcloud";
-          serviceConfig.ExecStart = "${phpPackage}/bin/php -f ${pkgs.nextcloud}/cron.php";
+          serviceConfig.ExecStart = "${phpPackage}/bin/php -f ${cfg.package}/cron.php";
         };
         nextcloud-update-plugins = mkIf cfg.autoUpdateApps.enable {
           serviceConfig.Type = "oneshot";
@@ -471,7 +499,7 @@ in {
         enable = true;
         virtualHosts = {
           ${cfg.hostName} = {
-            root = pkgs.nextcloud;
+            root = cfg.package;
             locations = {
               "= /robots.txt" = {
                 priority = 100;
diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml
index d66e0f0c2997..fc454f8ba254 100644
--- a/nixos/modules/services/web-apps/nextcloud.xml
+++ b/nixos/modules/services/web-apps/nextcloud.xml
@@ -113,5 +113,53 @@
    maintenance:install</literal>! This command tries to install the application
    and can cause unwanted side-effects!</para>
   </warning>
+
+  <para>
+   Nextcloud doesn't allow to move more than one major-version forward. If you're e.g. on
+   <literal>v16</literal>, you cannot upgrade to <literal>v18</literal>, you need to upgrade to
+   <literal>v17</literal> first. This is ensured automatically as long as the
+   <link linkend="opt-system.stateVersion">stateVersion</link> is declared properly. In that case
+   the oldest version available (one major behind the one from the previous NixOS
+   release) will be selected by default and the module will generate a warning that reminds
+   the user to upgrade to latest Nextcloud <emphasis>after</emphasis> that deploy.
+  </para>
+ </section>
+
+ <section xml:id="module-services-nextcloud-maintainer-info">
+  <title>Maintainer information</title>
+
+  <para>
+   As stated in the previous paragraph, we must provide a clean upgrade-path for Nextcloud
+   since it cannot move more than one major version forward on a single upgrade. This chapter
+   adds some notes how Nextcloud updates should be rolled out in the future.
+  </para>
+
+  <para>
+   While minor and patch-level updates are no problem and can be done directly in the
+   package-expression (and should be backported to supported stable branches after that),
+   major-releases should be added in a new attribute (e.g. Nextcloud <literal>v19.0.0</literal>
+   should be available in <literal>nixpkgs</literal> as <literal>pkgs.nextcloud19</literal>).
+   To provide simple upgrade paths it's generally useful to backport those as well to stable
+   branches. As long as the package-default isn't altered, this won't break existing setups.
+   After that, the versioning-warning in the <literal>nextcloud</literal>-module should be
+   updated to make sure that the
+   <link linkend="opt-services.nextcloud.package">package</link>-option selects the latest version
+   on fresh setups.
+  </para>
+
+  <para>
+   If major-releases will be abandoned by upstream, we should check first if those are needed
+   in NixOS for a safe upgrade-path before removing those. In that case we shold keep those
+   packages, but mark them as insecure in an expression like this (in
+   <literal>&lt;nixpkgs/pkgs/servers/nextcloud/default.nix&gt;</literal>):
+<programlisting>/* ... */
+{
+  nextcloud17 = generic {
+    version = "17.0.x";
+    sha256 = "0000000000000000000000000000000000000000000000000000";
+    insecure = true;
+  };
+}</programlisting>
+  </para>
  </section>
 </chapter>
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 9b23e9ac501f..008d6bbde398 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -1,24 +1,37 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation rec {
-  pname = "nextcloud";
-  version = "18.0.2";
+let
+  generic = { version, sha256, insecure ? false }: stdenv.mkDerivation rec {
+    pname = "nextcloud";
+    inherit version;
 
-  src = fetchurl {
-    url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2";
+    src = fetchurl {
+      url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2";
+      inherit sha256;
+    };
+
+    installPhase = ''
+      mkdir -p $out/
+      cp -R . $out/
+    '';
+
+    meta = with stdenv.lib; {
+      description = "Sharing solution for files, calendars, contacts and more";
+      homepage = https://nextcloud.com;
+      maintainers = with maintainers; [ schneefux bachp globin fpletz ma27 ];
+      license = licenses.agpl3Plus;
+      platforms = with platforms; unix;
+      knownVulnerabilities = optional insecure "Nextcloud version ${version} is EOL";
+    };
+  };
+in {
+  nextcloud17 = generic {
+    version = "17.0.4";
+    sha256 = "0cj5mng0nmj3hz30pyz3g19kj3mkm5ca8si3sw3arv61dmw6c5g6";
+  };
+
+  nextcloud18 = generic {
+    version = "18.0.2";
     sha256 = "10fbdq0366iai2kpw6v6p78mnn9gz8x0xzsbqrp109yx4c4nccyh";
   };
-
-  installPhase = ''
-    mkdir -p $out/
-    cp -R . $out/
-  '';
-
-  meta = {
-    description = "Sharing solution for files, calendars, contacts and more";
-    homepage = https://nextcloud.com;
-    maintainers = with stdenv.lib.maintainers; [ schneefux bachp globin fpletz ];
-    license = stdenv.lib.licenses.agpl3Plus;
-    platforms = with stdenv.lib.platforms; unix;
-  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 901313d8e632..ef6f8404c794 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5356,7 +5356,8 @@ in
 
   grocy = callPackage ../servers/grocy { };
 
-  nextcloud = callPackage ../servers/nextcloud { };
+  inherit (callPackage ../servers/nextcloud {})
+    nextcloud17 nextcloud18;
 
   nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };
 

From f565c8fd1c23e20951d1f4c32a52ad3c18217865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 25 Mar 2020 21:20:56 +0000
Subject: [PATCH 4004/4636] radare2-cutter: 1.10.1 -> 1.10.2

---
 pkgs/development/tools/analysis/radare2/cutter.nix |  4 ++--
 .../development/tools/analysis/radare2/default.nix | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix
index fd5c58985cfb..e64f39a49609 100644
--- a/pkgs/development/tools/analysis/radare2/cutter.nix
+++ b/pkgs/development/tools/analysis/radare2/cutter.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "radare2-cutter";
-  version = "1.10.1";
+  version = "1.10.2";
 
   src = fetchFromGitHub {
     owner = "radareorg";
     repo = "cutter";
     rev = "v${version}";
-    sha256 = "1gvsrcskcdd1hxrjpkpc657anmfs25f174vxk4wzvn385rnmrxd3";
+    sha256 = "1icv56gxpzdjqn37pk3g99vgpljdc77i6k0x601iw2885s7s01n6";
   };
 
   postUnpack = "export sourceRoot=$sourceRoot/src";
diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index fc5244f96449..37dc9e51beab 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -110,7 +110,7 @@ in {
   #<generated>
   # DO NOT EDIT! Automatically generated by ./update.py
   radare2 = generic {
-    version_commit = "23963";
+    version_commit = "24088";
     gittap = "4.3.1";
     gittip = "e7f940d27b3b4eb2738afef78a6ea09ed770318c";
     rev = "4.3.1";
@@ -120,12 +120,12 @@ in {
     cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6";
   };
   r2-for-cutter = generic {
-    version_commit = "23963";
-    gittap = "4.2.1";
-    gittip = "08478fdd29d8ce2a6c61fbd7b207bffc10682938";
-    rev = "08478fdd29d8ce2a6c61fbd7b207bffc10682938";
-    version = "2020-01-31";
-    sha256 = "14b9433cgc2nabhz836zfgvgh2dwailcmvy05krsa0inmzbvx9fg";
+    version_commit = "24088";
+    gittap = "4.3.1";
+    gittip = "e7f940d27b3b4eb2738afef78a6ea09ed770318c";
+    rev = "e7f940d27b3b4eb2738afef78a6ea09ed770318c";
+    version = "2020-03-05";
+    sha256 = "0fiy6aj8xf9anpkk2vpkx8x0m2f26rhjb92nmg61xj13dmhchh30";
     cs_ver = "4.0.1";
     cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6";
   };

From a9708e0a22a03dbb85c289c077385969a73a34ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Sun, 22 Mar 2020 10:27:27 +0100
Subject: [PATCH 4005/4636] cinnamon.mint-y-icons: init at unstable-2020-03-21

---
 pkgs/desktops/cinnamon/default.nix            |  1 +
 .../cinnamon/mint-y-icons/default.nix         | 46 +++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/desktops/cinnamon/mint-y-icons/default.nix

diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index 6cdda9914369..fc8f465913bb 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -9,6 +9,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   cjs = callPackage ./cjs { };
   nemo = callPackage ./nemo { };
   mint-themes = callPackage ./mint-themes { };
+  mint-y-icons = callPackage ./mint-y-icons { };
   muffin = callPackage ./muffin { };
   xapps = callPackage ./xapps { };
 })
diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix
new file mode 100644
index 000000000000..d4415c4bf040
--- /dev/null
+++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix
@@ -0,0 +1,46 @@
+{ fetchFromGitHub
+, stdenv
+, gnome3
+, hicolor-icon-theme
+, gtk3
+}:
+
+stdenv.mkDerivation rec {
+  pname = "mint-y-icons";
+  version = "unstable-2020-03-21";
+
+  src = fetchFromGitHub {
+    owner = "linuxmint";
+    repo = pname;
+    rev = "f169a617bc344cb0b480b2b72f54cdd06af05255";
+    sha256 = "1c2a79ylk363i982czwwqcwc7cw6dyzlqphcypqm6nll7xlafq8s";
+  };
+
+  propagatedUserEnvPkgs = [
+    gnome3.adwaita-icon-theme
+    hicolor-icon-theme
+  ];
+
+  nativeBuildInputs = [
+    gtk3
+  ];
+
+  postFixup =  ''
+    gtk-update-icon-cache $out/share/icons/*
+  '';
+
+  dontDropIconThemeCache = true;
+
+  installPhase = ''
+    mkdir -p $out
+    mv usr/share $out
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/linuxmint/mint-y-icons";
+    description = "The Mint-Y icon theme";
+    license = licenses.gpl3; # from debian/copyright
+    platforms = platforms.linux;
+    maintainers = [ maintainers.mkg20001 ];
+  };
+}

From 517fd073fc7850d42f6a1bac3b7a156c6dd3a7f0 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 25 Mar 2020 17:43:53 -0500
Subject: [PATCH 4006/4636] xcircuit: 3.9.73 -> 3.10.12, maintain

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/science/electronics/xcircuit/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/electronics/xcircuit/default.nix b/pkgs/applications/science/electronics/xcircuit/default.nix
index 418144e6af7b..d10b486492e0 100644
--- a/pkgs/applications/science/electronics/xcircuit/default.nix
+++ b/pkgs/applications/science/electronics/xcircuit/default.nix
@@ -2,7 +2,7 @@
 , cairo, ghostscript, ngspice, tcl, tk, xorg, zlib }:
 
 let
-  version = "3.9.73";
+  version = "3.10.12";
   name = "xcircuit-${version}";
   inherit (stdenv.lib) getBin;
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://opencircuitdesign.com/xcircuit/archive/${name}.tgz";
-    sha256 = "1kj9hayipplzm4960kx48vxddqj154qnxkccaqj9cnkp62b7q3jg";
+    sha256 = "1h1ywc3mr7plvwnhdii2zgnnv5ih2nhyl4qbdjpi83dq0aq1s2mn";
   };
 
   nativeBuildInputs = [ autoreconfHook automake pkgconfig ];
@@ -30,6 +30,6 @@ in stdenv.mkDerivation {
     homepage = http://opencircuitdesign.com/xcircuit;
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = [ maintainers.spacefrogg ];
+    maintainers = with maintainers; [ spacefrogg thoughtpolice ];
   };
 }

From ad8bd3b4306a5b10a7a8df4b6745496d53f35a7a Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 25 Mar 2020 18:00:00 -0500
Subject: [PATCH 4007/4636] fluent-bit: 1.3.11 -> 1.4.0

---
 pkgs/tools/misc/fluent-bit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix
index ddc5757bdce4..57909debf79a 100644
--- a/pkgs/tools/misc/fluent-bit/default.nix
+++ b/pkgs/tools/misc/fluent-bit/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fluent-bit";
-  version = "1.3.11";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     rev = "v${version}";
-    sha256 = "0s1j5mrih4zzaxhqhrd01cibp53rbdqfxf0ng64yfjqlqdh4dhkk";
+    sha256 = "07p0cy4y2x45kgimg7rjjk9zknmnnsfxdy2vlz6dzaxrslv6c3x6";
   };
 
   nativeBuildInputs = [ cmake flex bison ];

From ab0379a69ecd4def8ed92f2d8d39443ddd7b751b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 25 Mar 2020 18:00:00 -0500
Subject: [PATCH 4008/4636] pueue: 0.1.6 -> 0.2.1

---
 pkgs/applications/misc/pueue/default.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix
index aac371164fa8..76350773b328 100644
--- a/pkgs/applications/misc/pueue/default.nix
+++ b/pkgs/applications/misc/pueue/default.nix
@@ -1,23 +1,19 @@
-{ lib, rustPlatform, fetchFromGitHub, installShellFiles }:
+{ lib, rustPlatform, fetchFromGitHub }:
 
 rustPlatform.buildRustPackage rec {
   pname = "pueue";
-  version = "0.1.6";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "Nukesor";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1qp9h1xlfxwswcqi1qn2hfybxl547z13xjbvfgsx1nc8yj51bi3c";
+    sha256 = "1yx69pwdal0p5dfhabjdns9z6z3fa41wh7bxa4dpsjx37ziglcsp";
   };
 
-  nativeBuildInputs = [ installShellFiles ];
+  cargoSha256 = "1ksr5fw9p3j1bnlgfimb5nsryb4si8ic2x4prsra1mwkc91hr7x3";
 
-  cargoSha256 = "00va292bjdp42bkqdkjqajmzc2nshhqa1fj0yfwdf3rrx4nhssjd";
-
-  postInstall = ''
-    installShellCompletion utils/completions/pueue.{bash,fish} --zsh utils/completions/_pueue
-  '';
+  checkPhase = "cargo test -- --skip test_single_huge_payload";
 
   meta = with lib; {
     description = "A daemon for managing long running shell commands";

From 87f75f8e35749394af36e0cb86b323c32262c947 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 25 Mar 2020 17:36:13 +0000
Subject: [PATCH 4009/4636] performous: fix build

---
 pkgs/games/performous/default.nix            |  2 +
 pkgs/games/performous/performous-cmake.patch | 86 ++++++++++++++++++++
 2 files changed, 88 insertions(+)
 create mode 100644 pkgs/games/performous/performous-cmake.patch

diff --git a/pkgs/games/performous/default.nix b/pkgs/games/performous/default.nix
index 28487a7f8e8a..96b07e9787e8 100644
--- a/pkgs/games/performous/default.nix
+++ b/pkgs/games/performous/default.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
     sha256 = "08j0qhr65l7qnd5vxl4l07523qpvdwi31h4vzl3lfiinx1zcgr4x";
   };
 
+  patches = [ ./performous-cmake.patch ];
+
   nativeBuildInputs = [ cmake pkgconfig gettext ];
 
   buildInputs = [
diff --git a/pkgs/games/performous/performous-cmake.patch b/pkgs/games/performous/performous-cmake.patch
new file mode 100644
index 000000000000..59d2cc9a927c
--- /dev/null
+++ b/pkgs/games/performous/performous-cmake.patch
@@ -0,0 +1,86 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.6)
+ project(Performous CXX C)
+ 
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+--- a/cmake/Modules/FindPango.cmake
++++ b/cmake/Modules/FindPango.cmake
+@@ -2,31 +2,10 @@
+ # Once done, this will define
+ #
+ #  Pango_FOUND - system has Pango
+-#  Pango_INCLUDE_DIRS - the Pango include directories
+ #  Pango_LIBRARIES - link these to use Pango
+ 
+ include(LibFindMacros)
+ 
+-# Dependencies
+-libfind_package(Pango Freetype)
+-libfind_package(Pango Glib)
+-libfind_package(Pango GObject)
+-
+-# Use pkg-config to get hints about paths
+-libfind_pkg_check_modules(Pango_PKGCONF pango)
+-
+-# Include dir
+-find_path(Pango_INCLUDE_DIR
+-  NAMES pango/pango.h
+-  HINTS ${Pango_PKGCONF_INCLUDE_DIRS}
+-  PATH_SUFFIXES pango-1.0
+-)
+-
+-# Finally the library itself
+-find_library(Pango_LIBRARY
+-  NAMES pango-1.0
+-  HINTS ${Pango_PKGCONF_LIBRARY_DIRS}
+-)
+-
++libfind_pkg_check_modules(Pango_PKGCONF IMPORTED_TARGET pango)
++set(Pango_LIBRARY PkgConfig::Pango_PKGCONF)
+ libfind_process(Pango)
+-
+--- a/cmake/Modules/FindPangoCairo.cmake
++++ b/cmake/Modules/FindPangoCairo.cmake
+@@ -1,35 +1,11 @@
+ # - Try to find PangoCairo
+ # Once done, this will define
+ #
+-#  PangoCairo_FOUND - system has Pango
+-#  PangoCairo_INCLUDE_DIRS - the Pango include directories
+-#  PangoCairo_LIBRARIES - link these to use Pango
++#  PangoCairo_FOUND - system has PangoCairo
++#  PangoCairo_LIBRARIES - link these to use PangoCairo
+ 
+ include(LibFindMacros)
+ 
+-# Dependencies
+-libfind_package(PangoCairo Pango)
+-libfind_package(PangoCairo Cairo)
+-
+-# Use pkg-config to get hints about paths
+-libfind_pkg_check_modules(PangoCairo_PKGCONF pangocairo)
+-
+-# Include dir
+-find_path(PangoCairo_INCLUDE_DIR
+-  NAMES pango/pangocairo.h
+-  HINTS ${PangoCairo_PKGCONF_INCLUDE_DIRS}
+-  PATH_SUFFIXES pango-1.0
+-)
+-
+-# Finally the library itself
+-find_library(PangoCairo_LIBRARY
+-  NAMES pangocairo-1.0
+-  HINTS ${PangoCairo_PKGCONF_LIBRARY_DIRS}
+-)
+-
+-# Set the include dir variables and the libraries and let libfind_process do the rest.
+-# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
+-set(PangoCairo_PROCESS_INCLUDES PangoCairo_INCLUDE_DIR Pango_INCLUDE_DIR Cairo_INCLUDE_DIR)
+-set(PangoCairo_PROCESS_LIBS PangoCairo_LIBRARY Pango_LIBRARY Cairo_LIBRARY)
++libfind_pkg_check_modules(PangoCairo_PKGCONF IMPORTED_TARGET pangocairo)
++set(PangoCairo_LIBRARY PkgConfig::PangoCairo_PKGCONF)
+ libfind_process(PangoCairo)
+-

From c2f5006735f63faf49034b7e32675c7bdc15652b Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 25 Mar 2020 22:53:12 +0000
Subject: [PATCH 4010/4636] timidity: fix playing over JACK with -iA -Oj

Based on https://bugs.archlinux.org/task/40906#comment124519
---
 pkgs/tools/misc/timidity/default.nix          |  2 ++
 pkgs/tools/misc/timidity/timidity-iA-Oj.patch | 14 ++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/tools/misc/timidity/timidity-iA-Oj.patch

diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix
index c307c96199f2..88c3c7cb4252 100644
--- a/pkgs/tools/misc/timidity/default.nix
+++ b/pkgs/tools/misc/timidity/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation {
     sha256 = "1xf8n6dqzvi6nr2asags12ijbj1lwk1hgl3s27vm2szib8ww07qn";
   };
 
+  patches = [ ./timidity-iA-Oj.patch ];
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ alsaLib libjack2 ncurses ];
 
diff --git a/pkgs/tools/misc/timidity/timidity-iA-Oj.patch b/pkgs/tools/misc/timidity/timidity-iA-Oj.patch
new file mode 100644
index 000000000000..9bb964134283
--- /dev/null
+++ b/pkgs/tools/misc/timidity/timidity-iA-Oj.patch
@@ -0,0 +1,14 @@
+Without this timidity -iA -Oj prints "Couldn't start JACK device (`j')"
+and does not play MIDI.
+
+--- a/timidity/jack_a.c
++++ b/timidity/jack_a.c
+@@ -513,6 +513,8 @@ static int actl_jack(int request, void *arg)
+ 		ringbuf_clear(&ctx->rbuf);
+ 		return 0;
+ 
++	case PM_REQ_PLAY_START:
++		return 0;
+ 	}
+ 	return -1;
+ }

From a5ed0154df53e42ba424e40cdc339a354ec7a7d4 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 25 Mar 2020 17:01:29 -0700
Subject: [PATCH 4011/4636] python3Packages.clikit: 0.4.1 -> 0.4.3

---
 pkgs/development/python-modules/clikit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/clikit/default.nix b/pkgs/development/python-modules/clikit/default.nix
index 94f3fa08b138..054b6edee6da 100644
--- a/pkgs/development/python-modules/clikit/default.nix
+++ b/pkgs/development/python-modules/clikit/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "clikit";
-  version = "0.4.1";
+  version = "0.4.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8ae4766b974d7b1983e39d501da9a0aadf118a907a0c9b50714d027c8b59ea81";
+    sha256 = "0glppxx0pyppjcigzs8h16srlbxb6nci0282xfy3ayvwbq8pwbbf";
   };
 
   propagatedBuildInputs = [

From f171f421dbbe9b5e6244ec9638b971d7308ddc3f Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 25 Mar 2020 17:03:12 -0700
Subject: [PATCH 4012/4636] python3Packages.pastel: 0.1.0 -> 0.2.0

---
 .../python-modules/pastel/default.nix           | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/pastel/default.nix b/pkgs/development/python-modules/pastel/default.nix
index 532970c62c28..a44b4253ca56 100644
--- a/pkgs/development/python-modules/pastel/default.nix
+++ b/pkgs/development/python-modules/pastel/default.nix
@@ -1,24 +1,21 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pytest }:
+{ lib, buildPythonPackage, fetchPypi, poetry, pytest }:
 
 buildPythonPackage rec {
   pname = "pastel";
-  version = "0.1.0";
+  version = "0.2.0";
 
-  # No tests in PyPi tarball
-  src = fetchFromGitHub {
-    owner = "sdispater";
-    repo = "pastel";
-    rev = version;
-    sha256 = "1b4ag7jr7j0sxly5g29imdq8g0d4ixhbck55dblr45mlsidydx0s";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0dnaw44ss10i10z4ksy0xljknvjap7rb7g0b8p6yzm5x4g2my5a6";
   };
 
   checkInputs = [ pytest ];
   checkPhase = ''
-    pytest tests -sq
+    pytest
   '';
 
   meta = with lib; {
-    homepage = https://github.com/sdispater/pastel;
+    homepage = "https://github.com/sdispater/pastel";
     description = "Bring colors to your terminal";
     license = licenses.mit;
     maintainers = with maintainers; [ jakewaksbaum ];

From c9f09584bc2f77f4ad302031415fcd506aa9586f Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 25 Mar 2020 17:04:38 -0700
Subject: [PATCH 4013/4636] python3Packages.poetry: fix hash

---
 pkgs/development/python-modules/poetry/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix
index f007ff3df1d8..481fd2c5feb7 100644
--- a/pkgs/development/python-modules/poetry/default.nix
+++ b/pkgs/development/python-modules/poetry/default.nix
@@ -36,7 +36,7 @@ in buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0y528095njf28isbcp5iwbf12j67xhxnrkac93pws0zy133v7kc1";
+    sha256 = "02h387k0xssvv78yy82pcpknpq4w5ym2in1zl8cg9r5wljl5w6cf";
   };
 
   postPatch = ''

From 44df87416d509428c6f2c0edd82e3758f13d5bee Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 25 Mar 2020 17:04:56 -0700
Subject: [PATCH 4014/4636] python3Packages.xdg: init at 4.0.1

---
 .../python-modules/xdg/default.nix            | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/xdg/default.nix

diff --git a/pkgs/development/python-modules/xdg/default.nix b/pkgs/development/python-modules/xdg/default.nix
new file mode 100644
index 000000000000..8b2d73b00fb8
--- /dev/null
+++ b/pkgs/development/python-modules/xdg/default.nix
@@ -0,0 +1,34 @@
+{ lib, buildPythonPackage, fetchFromGitHub, isPy27
+, clikit
+, poetry
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  version = "4.0.1";
+  pname = "xdg";
+  disabled = isPy27;
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "srstevenson";
+    repo = pname;
+    rev = version;
+    sha256 = "13kgnbwam6wmdbig0m98vmyjcqrp0j62nmfknb6prr33ns2nxbs2";
+  };
+
+  nativeBuildInputs = [ poetry ];
+
+  propagatedBuildInputs = [
+    clikit
+  ];
+
+  checkInputs = [ pytestCheckHook ];
+
+  meta = with lib; {
+    description = "XDG Base Directory Specification for Python";
+    homepage = "https://github.com/srstevenson/xdg";
+    license = licenses.isc;
+    maintainers = with maintainers; [ jonringer ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 43a3af13aeff..9ce7337b3a17 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3943,6 +3943,8 @@ in {
 
   colored = callPackage ../development/python-modules/colored { };
 
+  xdg = callPackage ../development/python-modules/xdg { };
+
   xdis = callPackage ../development/python-modules/xdis { };
 
   xnd = callPackage ../development/python-modules/xnd { };

From 216a7e7a98ffce137632f89b73ba6cae8b1de15d Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 26 Mar 2020 01:21:34 +0100
Subject: [PATCH 4015/4636] nixosTests.installer: Don't wait for the
 nixos-manual service

The nixos-manual service was removed in #83199 but we missed the check
in this test which prevents the "tested" job from succeeding [0][1].

[0]: https://hydra.nixos.org/build/115472896
[1]: https://hydra.nixos.org/build/115472896/nixlog/94/tail
---
 nixos/tests/installer.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 983861911e0d..babde4126c4c 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -104,7 +104,6 @@ let
 
       with subtest("Assert readiness of login prompt"):
           machine.succeed("echo hello")
-          machine.wait_for_unit("nixos-manual")
 
       with subtest("Wait for hard disks to appear in /dev"):
           machine.succeed("udevadm settle")

From 4a3ea14b5b6ed842cd8ddb65b6c4ba218ff7278f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Mar 2020 00:25:29 +0000
Subject: [PATCH 4016/4636] seaview: 5.0 -> 5.0.2

---
 pkgs/applications/science/biology/seaview/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/biology/seaview/default.nix b/pkgs/applications/science/biology/seaview/default.nix
index fea8da41d70a..4192de714d0b 100644
--- a/pkgs/applications/science/biology/seaview/default.nix
+++ b/pkgs/applications/science/biology/seaview/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, coreutils, fltk, libjpeg }:
 
 stdenv.mkDerivation rec {
-  version = "5.0";
+  version = "5.0.2";
   pname = "seaview";
 
   src = fetchurl {
     url = "ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/seaview_${version}.tar.gz";
-    sha256 = "0gzjqf5mm91pa1drwxvz229bv6l995npdggngszh6z6j4pfh8j7c";
+    sha256 = "0bad0nd18a36g6ysx28j68rbnwqn33ra8inx2lv2igqqcs6i5kif";
   };
 
   buildInputs = [ fltk libjpeg ];
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
           Gouy M., Guindon S. & Gascuel O. (2010) SeaView version 4 : a multiplatform graphical user interface for sequence alignment and phylogenetic tree building. Molecular Biology and Evolution 27(2):221-224.
     '';
-    homepage = http://doua.prabi.fr/software/seaview;
+    homepage = "http://doua.prabi.fr/software/seaview";
     license = licenses.gpl3;
     maintainers = [ maintainers.iimog ];
     platforms = platforms.linux;

From e882dfe91f324ce39477f5276e3a7c27c31d4aa9 Mon Sep 17 00:00:00 2001
From: Dmitry Kudriavtsev <dkudriavtsev@gmail.com>
Date: Sat, 1 Feb 2020 18:34:01 -0800
Subject: [PATCH 4017/4636] hercules: init at 3.13

---
 .../virtualization/hercules/default.nix        | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix                |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/applications/virtualization/hercules/default.nix

diff --git a/pkgs/applications/virtualization/hercules/default.nix b/pkgs/applications/virtualization/hercules/default.nix
new file mode 100644
index 000000000000..901e2f0b6ec0
--- /dev/null
+++ b/pkgs/applications/virtualization/hercules/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  pname = "hercules";
+  version = "3.13";
+
+  src = fetchurl {
+    url = "http://downloads.hercules-390.eu/${pname}-${version}.tar.gz";
+    sha256 = "0zg6rwz8ib4alibf8lygi8qn69xx8n92kbi8b3jhi1ymb32mf349";
+  };
+
+  meta = with stdenv.lib; {
+    description = "IBM mainframe emulator";
+    homepage = "http://www.hercules-390.eu";
+    license = licenses.qpl;
+    maintainers = [ maintainers.dkudriavtsev ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f13d1a23a763..b606f57411be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19937,6 +19937,8 @@ in
 
   herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { };
 
+  hercules = callPackage ../applications/virtualization/hercules { };
+
   hexchat = callPackage ../applications/networking/irc/hexchat { };
 
   hexcurse = callPackage ../applications/editors/hexcurse { };

From bbb35868846a7e3ec97803e41693a5593018760f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Mar 2020 01:22:02 +0000
Subject: [PATCH 4018/4636] spice-vdagent: 0.19.0 -> 0.20.0

---
 pkgs/applications/virtualization/spice-vdagent/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix
index 6f5cbeb7ed46..22aa31a6dea3 100644
--- a/pkgs/applications/virtualization/spice-vdagent/default.nix
+++ b/pkgs/applications/virtualization/spice-vdagent/default.nix
@@ -2,10 +2,10 @@
  libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, libdrm,
  systemd}:
 stdenv.mkDerivation rec {
-  name = "spice-vdagent-0.19.0";
+  name = "spice-vdagent-0.20.0";
   src = fetchurl {
     url = "https://www.spice-space.org/download/releases/${name}.tar.bz2";
-    sha256 = "0r9gjx1vcgb4f7g85b1ib045kqa3dqjk12m7342i5y443ihpr9v3";
+    sha256 = "0n9k2kna2gd1zi6jv45zsp2jlv439nz5l5jjijirxqaycwi74srf";
   };
   NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ];
   postPatch = ''
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
          to the client resolution
        * Multiple displays
     '';
-    homepage = https://www.spice-space.org/;
+    homepage = "https://www.spice-space.org/";
     license = stdenv.lib.licenses.gpl3;
     maintainers = [ stdenv.lib.maintainers.aboseley ];
     platforms = stdenv.lib.platforms.linux;

From 7613ae0ea79e9de8481b6cd4c7272ac0d08297ed Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Mar 2020 02:06:27 +0000
Subject: [PATCH 4019/4636] solr: 8.4.1 -> 8.5.0

---
 pkgs/servers/search/solr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix
index 701d3880cbd0..0da61861207c 100644
--- a/pkgs/servers/search/solr/default.nix
+++ b/pkgs/servers/search/solr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "solr";
-  version = "8.4.1";
+  version = "8.5.0";
 
   src = fetchurl {
     url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz";
-    sha256 = "00a35a6ppd4ngp80dxak3bqrp8vmx0wixr4x2h2p9qxj4khf2fgc";
+    sha256 = "1pb1vja9spybkp2qw150kymy47njy06b5pic7mrfjq5as0d72m4y";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 575f9aa57d0922850df20fbd7674e00759c562b4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Mar 2020 02:09:35 +0000
Subject: [PATCH 4020/4636] subunit: 1.1.0 -> 1.4.0

---
 pkgs/development/libraries/subunit/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/development/libraries/subunit/default.nix
index 9a5f4db2debb..bf3b6a9ffd13 100644
--- a/pkgs/development/libraries/subunit/default.nix
+++ b/pkgs/development/libraries/subunit/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "subunit";
-  version = "1.1.0";
+  version = "1.4.0";
 
   src = fetchurl {
     url = "https://launchpad.net/subunit/trunk/${version}/+download/${pname}-${version}.tar.gz";
-    sha256 = "0lcah7p66c05p7xpw6ns1is0i02lh0nq8gq51mv4wyvbr6zaasa8";
+    sha256 = "1h7i5ifcx20qkya24j11nbwa829klw7dvnlljdgivgvcx6b20y80";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A streaming protocol for test results";
-    homepage = https://launchpad.net/subunit;
+    homepage = "https://launchpad.net/subunit";
     license = licenses.asl20;
     platforms = platforms.all;
   };

From a2d9581ac8fb7dfb1be01764e8deb7f5e9b4587c Mon Sep 17 00:00:00 2001
From: Benjamin Esham <benjamin@esham.io>
Date: Wed, 25 Mar 2020 20:08:26 -0700
Subject: [PATCH 4021/4636] weechatScripts.wee-slack: 2.4.0 -> 2.5.0

wee-slack now (optionally) depends on a data file called weemoji.json
that allows it to translate between Slack emoji names (like
"slight_smile") and Unicode codepoints. For convenience, the derivation
now installs this file and patches the script so that the user doesn't
need to do any extra configuration to use it.
---
 .../irc/weechat/scripts/wee-slack/default.nix        | 10 ++++++++--
 .../scripts/wee-slack/hardcode-json-file-path.patch  | 12 ++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/networking/irc/weechat/scripts/wee-slack/hardcode-json-file-path.patch

diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
index 632a485381d0..7b98630e85ee 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wee-slack";
-  version = "2.4.0";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     repo = "wee-slack";
     owner = "wee-slack";
     rev = "v${version}";
-    sha256 = "0h425ln5vv76zv41dccapyfbl8qmmflbpwmrd26knqyj8k24zfpr";
+    sha256 = "0sxgi5fg8qvzqmxy7sdma6v0wj93xwh21av10n8nxvdskacw5dxz";
   };
 
   patches = [
@@ -19,13 +19,19 @@ stdenv.mkDerivation rec {
         paths = with python3Packages; [ websocket_client six ];
       }}/${python3Packages.python.sitePackages}";
     })
+    ./hardcode-json-file-path.patch
   ];
 
+  postPatch = ''
+    substituteInPlace wee_slack.py --subst-var out
+  '';
+
   passthru.scripts = [ "wee_slack.py" ];
 
   installPhase = ''
     mkdir -p $out/share
     cp wee_slack.py $out/share/wee_slack.py
+    install -D -m 0444 weemoji.json $out/share/wee-slack/weemoji.json
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/hardcode-json-file-path.patch b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/hardcode-json-file-path.patch
new file mode 100644
index 000000000000..7413a9229ce6
--- /dev/null
+++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/hardcode-json-file-path.patch
@@ -0,0 +1,12 @@
+--- a/wee_slack.py
++++ b/wee_slack.py
+@@ -4560,8 +4560,7 @@
+ 
+ def load_emoji():
+     try:
+-        DIR = w.info_get('weechat_dir', '')
+-        with open('{}/weemoji.json'.format(DIR), 'r') as ef:
++        with open('@out@/share/wee-slack/weemoji.json', 'r') as ef:
+             emojis = json.loads(ef.read())
+             if 'emoji' in emojis:
+                 print_error('The weemoji.json file is in an old format. Please update it.')

From 21900acf6d20ba59da908ae494e3bd40029b1437 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Mar 2020 03:32:21 +0000
Subject: [PATCH 4022/4636] tor: 0.4.2.6 -> 0.4.2.7

---
 pkgs/tools/security/tor/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 78d5b4441d53..0ef45bd5337e 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation rec {
   pname = "tor";
-  version = "0.4.2.6";
+  version = "0.4.2.7";
 
   src = fetchurl {
     url = "https://dist.torproject.org/${pname}-${version}.tar.gz";
-    sha256 = "1i766s211nrbjvwvkd2375mjsbbc28yrg46564rbx6w46cj10005";
+    sha256 = "0v82ngwwmmcb7i9563bgsmrjy6xp83xyhqhaljygd0pkvlsxi886";
   };
 
   outputs = [ "out" "geoip" ];
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = https://www.torproject.org/;
+    homepage = "https://www.torproject.org/";
     repositories.git = https://git.torproject.org/git/tor;
     description = "Anonymizing overlay network";
 

From 259f3b3b68f730088dde3e6f7ba327afcd9eb5d5 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 26 Mar 2020 00:35:40 -0400
Subject: [PATCH 4023/4636] Revert "fetchzip, fetchgit: cleanup handling of
 optional features and whitespace"

---
 pkgs/build-support/fetchgit/default.nix      |  2 +-
 pkgs/build-support/fetchgit/nix-prefetch-git | 25 ++++-----
 pkgs/build-support/fetchzip/default.nix      | 57 ++++++++++----------
 3 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index ee662154cc7b..0405951a9e40 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, git, cacert }: let
+{stdenvNoCC, git, cacert}: let
   urlToName = url: rev: let
     inherit (stdenvNoCC.lib) removeSuffix splitString last;
     base = last (splitString ":" (baseNameOf (removeSuffix "/" url)));
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 4761c978035e..abba76bd1ac9 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -1,5 +1,6 @@
-#!/usr/bin/env bash
-set -eo pipefail
+#! /usr/bin/env bash
+
+set -e -o pipefail
 
 url=
 rev=
@@ -37,17 +38,17 @@ usage(){
     echo  >&2 "syntax: nix-prefetch-git [options] [URL [REVISION [EXPECTED-HASH]]]
 
 Options:
-      --out path         Path where the output would be stored.
-      --url url          Any url understood by 'git clone'.
-      --rev ref          Any sha1 or references (such as refs/heads/master).
-      --hash h           Expected hash.
-      --branch-name      Branch name to check out into.
-      --deepClone        Clone the entire repository.
-      --no-deepClone     Make a shallow clone of just the required ref.
-      --leave-dotGit     Keep the .git directories.
+      --out path      Path where the output would be stored.
+      --url url       Any url understood by 'git clone'.
+      --rev ref       Any sha1 or references (such as refs/heads/master)
+      --hash h        Expected hash.
+      --branch-name   Branch name to check out into
+      --deepClone     Clone the entire repository.
+      --no-deepClone  Make a shallow clone of just the required ref.
+      --leave-dotGit  Keep the .git directories.
       --fetch-submodules Fetch submodules.
-      --builder          Clone as fetchgit does, but url, rev, and out option are mandatory.
-      --quiet            Only print the final json summary.
+      --builder       Clone as fetchgit does, but url, rev, and out option are mandatory.
+      --quiet         Only print the final json summary.
 "
     exit 1
 }
diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix
index 9d829e43ccbc..c61df8ceb001 100644
--- a/pkgs/build-support/fetchzip/default.nix
+++ b/pkgs/build-support/fetchzip/default.nix
@@ -5,46 +5,47 @@
 # (e.g. due to minor changes in the compression algorithm, or changes
 # in timestamps).
 
-{ lib, fetchurl, unzip }:
+{ fetchurl, unzip }:
 
-{ name ? "source"
+{ # Optionally move the contents of the unpacked tree up one level.
+  stripRoot ? true
 , url
-  # Optionally move the contents of the unpacked tree up one level.
-, stripRoot ? true
 , extraPostFetch ? ""
+, name ? "source"
 , ... } @ args:
 
 (fetchurl ({
   inherit name;
 
   recursiveHash = true;
+
   downloadToTemp = true;
 
-  postFetch = ''
-    unpackDir="$TMPDIR/unpack"
-    mkdir "$unpackDir"
-    cd "$unpackDir"
-
-    renamed="$TMPDIR/${baseNameOf url}"
-    mv "$downloadedFile" "$renamed"
-    unpackFile "$renamed"
-    result=$unpackDir
-  ''
-  # Most src disted tarballs have a parent directory like foo-1.2.3/ to strip
-  + lib.optionalString stripRoot ''
-    if [ $(ls "$unpackDir" | wc -l) != 1 ]; then
-      echo "error: zip file must contain a single file or directory."
-      echo "hint: Pass stripRoot=false; to fetchzip to assume flat list of files."
-      exit 1
-    fi
-    fn=$(cd "$unpackDir" && echo *)
-    result="$unpackDir/$fn"
-  '' + ''
-    mkdir $out
-    mv "$result" "$out"
-  ''
-  + extraPostFetch;
+  postFetch =
+    ''
+      unpackDir="$TMPDIR/unpack"
+      mkdir "$unpackDir"
+      cd "$unpackDir"
 
+      renamed="$TMPDIR/${baseNameOf url}"
+      mv "$downloadedFile" "$renamed"
+      unpackFile "$renamed"
+    ''
+    + (if stripRoot then ''
+      if [ $(ls "$unpackDir" | wc -l) != 1 ]; then
+        echo "error: zip file must contain a single file or directory."
+        echo "hint: Pass stripRoot=false; to fetchzip to assume flat list of files."
+        exit 1
+      fi
+      fn=$(cd "$unpackDir" && echo *)
+      if [ -f "$unpackDir/$fn" ]; then
+        mkdir $out
+      fi
+      mv "$unpackDir/$fn" "$out"
+    '' else ''
+      mv "$unpackDir" "$out"
+    '') #*/
+    + extraPostFetch;
 } // removeAttrs args [ "stripRoot" "extraPostFetch" ])).overrideAttrs (x: {
   # Hackety-hack: we actually need unzip hooks, too
   nativeBuildInputs = x.nativeBuildInputs ++ [ unzip ];

From 78fbe7dba6c8946c22a517f2c1b8fc994447f3b7 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Wed, 25 Mar 2020 12:05:01 -0400
Subject: [PATCH 4024/4636] pixiecore: init at 2020-03-25

Co-authored-by: raunovv <rauno@oyenetwork.com>
---
 pkgs/tools/networking/pixiecore/default.nix | 25 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/networking/pixiecore/default.nix

diff --git a/pkgs/tools/networking/pixiecore/default.nix b/pkgs/tools/networking/pixiecore/default.nix
new file mode 100644
index 000000000000..bc8ec7da1698
--- /dev/null
+++ b/pkgs/tools/networking/pixiecore/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "pixiecore";
+  version = "2020-03-25";
+  rev = "68743c67a60c18c06cd21fd75143e3e069ca3cfc";
+
+  src = fetchFromGitHub {
+    owner = "danderson";
+    repo = "netboot";
+    inherit rev;
+    sha256 = "14dslmx3gk08h9gqfjw5y27x7d2c6r8ir7mjd7l9ybysagpzr02a";
+  };
+
+  modSha256 = "1waqaglm6f9zy5296z309ppkck2vmydhk9gjnxrgzmhqld5lcq4f";
+  subPackages = [ "cmd/pixiecore" ];
+
+  meta = {
+    description = "A tool to manage network booting of machines";
+    homepage = "https://github.com/danderson/netboot/tree/master/pixiecore";
+    license =  stdenv.lib.licenses.asl20;
+    maintainers = with stdenv.lib.maintainers; [ bbigras danderson ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30bc0af360ec..2078ad610ea5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2150,6 +2150,8 @@ in
 
   pueue = callPackage ../applications/misc/pueue { };
 
+  pixiecore = callPackage ../tools/networking/pixiecore {};
+
   pyCA = python3Packages.callPackage ../applications/video/pyca {};
 
   pyznap = python3Packages.callPackage ../tools/backup/pyznap {};

From b886ad90e7395d98d9c4956eef817e29bfce71a5 Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Tue, 24 Mar 2020 19:00:31 +0000
Subject: [PATCH 4025/4636] vimPlugins: Automatically sort vim-plugin-names.

Python's `sorted` method works a little differently than `sort` in the
handling of dashes.
---
 pkgs/misc/vim-plugins/default.nix      |  1 -
 pkgs/misc/vim-plugins/update.py        | 36 ++++++++++++++------------
 pkgs/misc/vim-plugins/vim-plugin-names | 14 +++++-----
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 20cbbf275c3a..e6bca9484a26 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -11,7 +11,6 @@ let
 
   # TL;DR
   # * Add your plugin to ./vim-plugin-names
-  # * sort -udf ./vim-plugin-names > sorted && mv sorted vim-plugin-names
   # * run ./update.py
   #
   # If additional modifications to the build process are required,
diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
index c0ecd5d036e8..ac959f055b48 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/misc/vim-plugins/update.py
@@ -9,7 +9,6 @@
 # $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265 update.py
 
 import argparse
-import fileinput
 import functools
 import http
 import json
@@ -124,7 +123,7 @@ class Repo:
             new_owner, new_name = (
                 urllib.parse.urlsplit(response_url).path.strip("/").split("/")[:2]
             )
-            end_line = f" as {self.alias}\n" if self.alias else "\n"
+            end_line = "\n" if self.alias is None else f" as {self.alias}\n"
             plugin_line = "{owner}/{name}" + end_line
 
             old_plugin = plugin_line.format(owner=self.owner, name=self.name)
@@ -416,13 +415,14 @@ in lib.fix' (lib.extends overrides packages)
     print(f"updated {outfile}")
 
 
-def update_redirects(input_file: Path, output_file: Path, redirects: dict):
-    with fileinput.input(input_file, inplace=True) as f:
-        for line in f:
-            line = " ".join(line.split())
-            print(redirects.get(line, line), end="")
-    print(
-        f"""\
+def rewrite_input(input_file: Path, output_file: Path, redirects: dict):
+    with open(input_file, "r") as f:
+        lines = f.readlines()
+
+    if redirects:
+        lines = [redirects.get(line, line) for line in lines]
+        print(
+            f"""\
 Redirects have been detected and {input_file} has been updated. Please take the
 following steps:
     1. Go ahead and commit just the updated expressions as you intended to do:
@@ -430,16 +430,19 @@ following steps:
             git commit -m "vimPlugins: Update"
     2. If any of the plugin names were changed, throw an error in aliases.nix:
             <oldName> = deprecateName "<oldName>" "<newName>"; # backwards compat, added YYYY-MM-DD
-    3. Make sure the updated {input_file} is still correctly sorted:
-            sort -udf ./vim-plugin-names > sorted && mv sorted vim-plugin-names
-    4. Run this script again so these changes will be reflected in the
+    3. Run this script again so these changes will be reflected in the
     generated expressions:
             ./update.py
-    5. Commit {input_file} along with aliases and generated expressions:
+    4. Commit {input_file} along with aliases and generated expressions:
             git add {output_file} {input_file} aliases.nix
             git commit -m "vimPlugins: Update redirects"
-"""
-    )
+        """
+        )
+
+    lines = sorted(lines, key=str.casefold)
+
+    with open(input_file, "w") as f:
+        f.writelines(lines)
 
 
 def parse_args():
@@ -488,8 +491,7 @@ def main() -> None:
 
     generate_nix(plugins, args.outfile)
 
-    if redirects:
-        update_redirects(args.input_file, args.outfile, redirects)
+    rewrite_input(args.input_file, args.outfile, redirects)
 
 
 if __name__ == "__main__":
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 704fc12e39bf..8ec4e90e3944 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -55,8 +55,8 @@ cocopon/iceberg.vim
 cohama/lexima.vim
 ctjhoa/spacevim
 ctrlpvim/ctrlp.vim
-dag/vim2hs
 dag/vim-fish
+dag/vim2hs
 dannyob/quickfixstatus
 darfink/starsearch.vim
 dart-lang/dart-vim-plugin
@@ -315,8 +315,8 @@ neoclide/coc-neco
 neoclide/coc-pairs
 neoclide/coc-prettier
 neoclide/coc-python
-neoclide/coc-rls
 neoclide/coc-r-lsp
+neoclide/coc-rls
 neoclide/coc-smartf
 neoclide/coc-snippets
 neoclide/coc-solargraph
@@ -334,10 +334,10 @@ neoclide/denite-extra
 neoclide/denite-git
 neoclide/vim-easygit
 neomake/neomake
+neovim/nvim-lsp
+neovim/nvimdev.nvim
 neovimhaskell/haskell-vim
 neovimhaskell/nvim-hs.vim
-neovim/nvimdev.nvim
-neovim/nvim-lsp
 neutaaaaan/iosvkem
 nfnty/vim-nftables
 nicoe/deoplete-khard
@@ -505,16 +505,14 @@ Valodim/deoplete-notmuch
 vhda/verilog_systemverilog.vim
 vim-airline/vim-airline
 vim-airline/vim-airline-themes
-vimlab/split-term.vim
-vimoutliner/vimoutliner
 vim-pandoc/vim-pandoc
 vim-pandoc/vim-pandoc-after
 vim-pandoc/vim-pandoc-syntax
 vim-ruby/vim-ruby
+vim-scripts/a.vim
 vim-scripts/align
 vim-scripts/argtextobj.vim
 vim-scripts/autoload_cscope.vim
-vim-scripts/a.vim
 vim-scripts/bats.vim
 vim-scripts/changeColorScheme.vim
 vim-scripts/Colour-Sampler-Pack
@@ -538,6 +536,8 @@ vim-scripts/wombat256.vim
 vim-scripts/YankRing.vim
 vim-syntastic/syntastic
 vim-utils/vim-husk
+vimlab/split-term.vim
+vimoutliner/vimoutliner
 vimwiki/vimwiki
 vito-c/jq.vim
 vmchale/dhall-vim

From fc95eaafd2d10ef409c1da75a599ba50eb8340f0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Mar 2020 06:13:34 +0000
Subject: [PATCH 4026/4636] xscreensaver: 5.43 -> 5.44

---
 pkgs/misc/screensavers/xscreensaver/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix
index 1937874a49cb..1dd09852d27c 100644
--- a/pkgs/misc/screensavers/xscreensaver/default.nix
+++ b/pkgs/misc/screensavers/xscreensaver/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "5.43";
+  version = "5.44";
   pname = "xscreensaver";
 
   src = fetchurl {
     url = "https://www.jwz.org/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "1571pj1a9998sq14y9366s2rw9wd2kq3l3dvvsk610vyd0fki3qm";
+    sha256 = "15bv05vpfjwsrqbazrjmm382jd7vvw0mp6y9vasn6wvxzjf0in3k";
   };
 
   buildInputs =
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
   ;
 
   meta = {
-    homepage = https://www.jwz.org/xscreensaver/;
+    homepage = "https://www.jwz.org/xscreensaver/";
     description = "A set of screensavers";
     maintainers = with stdenv.lib.maintainers; [ raskin ];
     platforms = stdenv.lib.platforms.unix; # Once had cygwin problems

From 7f2fc686af9bb9df785afe6d1c7431a3f03be3da Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 22 Feb 2020 00:14:52 +0200
Subject: [PATCH 4027/4636] bear: Use python3 by default

---
 pkgs/development/tools/build-managers/bear/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix
index ec1577c51079..9e2fb13b0e7a 100644
--- a/pkgs/development/tools/build-managers/bear/default.nix
+++ b/pkgs/development/tools/build-managers/bear/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, python }:
+{ stdenv, fetchFromGitHub, cmake, python3 }:
 
 stdenv.mkDerivation rec {
   pname = "bear";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ python ]; # just for shebang of bin/bear
+  buildInputs = [ python3 ]; # just for shebang of bin/bear
 
   doCheck = false; # all fail
 

From 36c7dc26e431b9344cf23ce318c91cd575f5c79a Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Wed, 25 Mar 2020 12:47:07 +0100
Subject: [PATCH 4028/4636] skypeforlinux: 8.56.0.103 -> 8.58.0.93

---
 .../networking/instant-messengers/skypeforlinux/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index 78b7a6d81a2e..a4852f16245c 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -7,7 +7,7 @@ let
 
   # Please keep the version x.y.0.z and do not update to x.y.76.z because the
   # source of the latter disappears much faster.
-  version = "8.56.0.103";
+  version = "8.58.0.93";
 
   rpath = stdenv.lib.makeLibraryPath [
     alsaLib
@@ -63,7 +63,7 @@ let
           "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
           "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
         ];
-        sha256 = "01qyi92dh4xalzaqzj9n3bz59y91rx45gkyw4k9ckjknbjwb3c90";
+        sha256 = "1nqadil50z896jg0r202gw3xmm3diawn0pnh6n6nxn900f02avl3";
       }
     else
       throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";

From bbe762417591541bc1dcd30c1eab41dfebfb9359 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 26 Mar 2020 08:32:01 +0100
Subject: [PATCH 4029/4636] faust2: 2.20.2 -> unstable-2020-03-20 (#82650)

The latest release has a bug that makes it unable
to compile all of its own libraries:

https://github.com/grame-cncm/faust/issues/406
---
 pkgs/applications/audio/faust/faust2.nix                    | 6 +++---
 pkgs/applications/audio/faust/faust2jaqt.nix                | 2 ++
 pkgs/applications/audio/faust/faust2lv2.nix                 | 3 ++-
 .../audio/magnetophonDSP/faustCompressors/default.nix       | 2 ++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index 74a5f4d383d9..cca0e21f8358 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -20,13 +20,13 @@ with stdenv.lib.strings;
 
 let
 
-  version = "2.20.2";
+  version = "unstable-2020-03-20";
 
   src = fetchFromGitHub {
     owner = "grame-cncm";
     repo = "faust";
-    rev = version;
-    sha256 = "08hv8gyj6c83128z3si92r1ka5ckf9sdpn5jdnlhrqyzja4mrxsy";
+    rev = "2782088d4485f1c572755f41e7a072b41cb7148a";
+    sha256 = "1l7bi2mq10s5wm8g4cdipg8gndd478x897qv0h7nqi1s2q9nq99p";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/applications/audio/faust/faust2jaqt.nix
index 5a015e5ca31e..144d19cb01e4 100644
--- a/pkgs/applications/audio/faust/faust2jaqt.nix
+++ b/pkgs/applications/audio/faust/faust2jaqt.nix
@@ -3,6 +3,7 @@
 , opencv
 , qt4
 , libsndfile
+, which
 }:
 
 faust.wrapWithBuildEnv {
@@ -19,6 +20,7 @@ faust.wrapWithBuildEnv {
     opencv
     qt4
     libsndfile
+    which
   ];
 
 }
diff --git a/pkgs/applications/audio/faust/faust2lv2.nix b/pkgs/applications/audio/faust/faust2lv2.nix
index 3472ce5047eb..51d956b14036 100644
--- a/pkgs/applications/audio/faust/faust2lv2.nix
+++ b/pkgs/applications/audio/faust/faust2lv2.nix
@@ -2,6 +2,7 @@
 , faust
 , lv2
 , qt4
+, which
 
 }:
 
@@ -9,6 +10,6 @@ faust.wrapWithBuildEnv {
 
   baseName = "faust2lv2";
 
-  propagatedBuildInputs = [ boost lv2 qt4 ];
+  propagatedBuildInputs = [ boost lv2 qt4 which ];
 
 }
diff --git a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
index fece392ab1cc..735e7efe54dc 100644
--- a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ faust2jaqt faust2lv2 ];
 
   buildPhase = ''
+    echo "hack out autoComp.dsp due to https://github.com/grame-cncm/faust/407/issues "
+    rm autoComp.dsp
     for f in *.dsp;
     do
       echo "compiling standalone from" $f

From 8fea62654d712b4d79775bf72a59c97298cc58da Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Thu, 26 Mar 2020 10:12:28 +0200
Subject: [PATCH 4030/4636] dua: 2.3.1 -> 2.3.8

---
 pkgs/tools/misc/dua/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix
index 0b56b03b9de6..765c7777f0f3 100644
--- a/pkgs/tools/misc/dua/default.nix
+++ b/pkgs/tools/misc/dua/default.nix
@@ -2,13 +2,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "dua";
-  version = "2.3.1";
+  version = "2.3.8";
 
   src = fetchFromGitHub {
     owner = "Byron";
     repo = "dua-cli";
     rev = "v${version}";
-    sha256 = "15pmmjnzjbjlf7np5zf2yahccqx8iw1jlzl3nkhqbs673ns0gjml";
+    sha256 = "0ql74z24qp68m3ivzmxdijafrhpwjgs462chrxd021n9nl7mqhss";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     extraPostFetch = ''
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     '';
   };
 
-  cargoSha256 = "0xqjbhqb08bk40i0rfzfkcl9kp67b8a285ksil4f663nidycmgw3";
+  cargoSha256 = "0c0d9qi7v3s7vf1rzd467w56i9zdh8fqqrmkkk6xxyh5xhkqx0kd";
 
   doCheck = false;
 

From 10c96e5b60cec0025e1576ab451237a291aa5a91 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 5 Mar 2020 18:59:32 +0100
Subject: [PATCH 4031/4636] lib.generators: add toGitINI

This code was taken from the home-manager project.
---
 lib/generators.nix | 53 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/lib/generators.nix b/lib/generators.nix
index 240a19789b54..efe6ea6031d3 100644
--- a/lib/generators.nix
+++ b/lib/generators.nix
@@ -126,6 +126,59 @@ rec {
       # map input to ini sections
       mapAttrsToStringsSep "\n" mkSection attrsOfAttrs;
 
+  /* Generate a git-config file from an attrset.
+   *
+   * It has two major differences from the regular INI format:
+   *
+   * 1. values are indented with tabs
+   * 2. sections can have sub-sections
+   *
+   * generators.toGitINI {
+   *   url."ssh://git@github.com/".insteadOf = "https://github.com";
+   *   user.name = "edolstra";
+   * }
+   *
+   *> [url "ssh://git@github.com/"]
+   *>   insteadOf = https://github.com/
+   *>
+   *> [user]
+   *>   name = edolstra
+   */
+  toGitINI = attrs:
+    with builtins;
+    let
+      mkSectionName = name:
+        let
+          containsQuote = libStr.hasInfix ''"'' name;
+          sections = libStr.splitString "." name;
+          section = head sections;
+          subsections = tail sections;
+          subsection = concatStringsSep "." subsections;
+        in if containsQuote || subsections == [ ] then
+          name
+        else
+          ''${section} "${subsection}"'';
+
+      # generation for multiple ini values
+      mkKeyValue = k: v:
+        let mkKeyValue = mkKeyValueDefault { } " = " k;
+        in concatStringsSep "\n" (map (kv: "\t" + mkKeyValue kv) (lib.toList v));
+
+      # converts { a.b.c = 5; } to { "a.b".c = 5; } for toINI
+      gitFlattenAttrs = let
+        recurse = path: value:
+          if isAttrs value then
+            lib.mapAttrsToList (name: value: recurse ([ name ] ++ path) value) value
+          else if length path > 1 then {
+            ${concatStringsSep "." (lib.reverseList (tail path))}.${head path} = value;
+          } else {
+            ${head path} = value;
+          };
+      in attrs: lib.foldl lib.recursiveUpdate { } (lib.flatten (recurse [ ] attrs));
+
+      toINI_ = toINI { inherit mkKeyValue mkSectionName; };
+    in
+      toINI_ (gitFlattenAttrs attrs);
 
   /* Generates JSON from an arbitrary (non-function) value.
     * For more information see the documentation of the builtin.

From d37a0dca1322126097431d27336384e436687d5e Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 5 Mar 2020 22:11:28 +0100
Subject: [PATCH 4032/4636] nixos: add gerrit module

Co-authored-by: edef <edef@edef.eu>
Co-authored-by: Florian Klink <flokli@flokli.de>
---
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/web-apps/gerrit.nix    | 218 ++++++++++++++++++
 nixos/tests/all-tests.nix                     |   1 +
 nixos/tests/gerrit.nix                        |  56 +++++
 .../version-management/gerrit/default.nix     |  18 ++
 5 files changed, 294 insertions(+)
 create mode 100644 nixos/modules/services/web-apps/gerrit.nix
 create mode 100644 nixos/tests/gerrit.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index ccdc39eecd8d..b931dc8eb80d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -823,6 +823,7 @@
   ./services/web-apps/documize.nix
   ./services/web-apps/dokuwiki.nix
   ./services/web-apps/frab.nix
+  ./services/web-apps/gerrit.nix
   ./services/web-apps/gotify-server.nix
   ./services/web-apps/grocy.nix
   ./services/web-apps/icingaweb2/icingaweb2.nix
diff --git a/nixos/modules/services/web-apps/gerrit.nix b/nixos/modules/services/web-apps/gerrit.nix
new file mode 100644
index 000000000000..b184c0754d45
--- /dev/null
+++ b/nixos/modules/services/web-apps/gerrit.nix
@@ -0,0 +1,218 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+  cfg = config.services.gerrit;
+
+  # NixOS option type for git-like configs
+  gitIniType = with types;
+    let
+      primitiveType = either str (either bool int);
+      multipleType = either primitiveType (listOf primitiveType);
+      sectionType = lazyAttrsOf multipleType;
+      supersectionType = lazyAttrsOf (either multipleType sectionType);
+    in lazyAttrsOf supersectionType;
+
+  gerritConfig = pkgs.writeText "gerrit.conf" (
+    lib.generators.toGitINI cfg.settings
+  );
+
+  # Wrap the gerrit java with all the java options so it can be called
+  # like a normal CLI app
+  gerrit-cli = pkgs.writeShellScriptBin "gerrit" ''
+    set -euo pipefail
+    jvmOpts=(
+      ${lib.escapeShellArgs cfg.jvmOpts}
+      -Xmx${cfg.jvmHeapLimit}
+    )
+    exec ${cfg.jvmPackage}/bin/java \
+      "''${jvmOpts[@]}" \
+      -jar ${cfg.package}/webapps/${cfg.package.name}.war \
+      "$@"
+  '';
+
+  gerrit-plugins = pkgs.runCommand
+    "gerrit-plugins"
+    {
+      buildInputs = [ gerrit-cli ];
+    }
+    ''
+      shopt -s nullglob
+      mkdir $out
+
+      for name in ${toString cfg.builtinPlugins}; do
+        echo "Installing builtin plugin $name.jar"
+        gerrit cat plugins/$name.jar > $out/$name.jar
+      done
+
+      for file in ${toString cfg.plugins}; do
+        name=$(echo "$file" | cut -d - -f 2-)
+        echo "Installing plugin $name"
+        ln -sf "$file" $out/$name
+      done
+    '';
+in
+{
+  options = {
+    services.gerrit = {
+      enable = mkEnableOption "Gerrit service";
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.gerrit;
+        description = "Gerrit package to use";
+      };
+
+      jvmPackage = mkOption {
+        type = types.package;
+        default = pkgs.jre_headless;
+        defaultText = "pkgs.jre_headless";
+        description = "Java Runtime Environment package to use";
+      };
+
+      jvmOpts = mkOption {
+        type = types.listOf types.str;
+        default = [
+          "-Dflogger.backend_factory=com.google.common.flogger.backend.log4j.Log4jBackendFactory#getInstance"
+          "-Dflogger.logging_context=com.google.gerrit.server.logging.LoggingContext#getInstance"
+        ];
+        description = "A list of JVM options to start gerrit with.";
+      };
+
+      jvmHeapLimit = mkOption {
+        type = types.str;
+        default = "1024m";
+        description = ''
+          How much memory to allocate to the JVM heap
+        '';
+      };
+
+      listenAddress = mkOption {
+        type = types.str;
+        default = "[::]:8080";
+        description = ''
+          <literal>hostname:port</literal> to listen for HTTP traffic.
+
+          This is bound using the systemd socket activation.
+        '';
+      };
+
+      settings = mkOption {
+        type = gitIniType;
+        default = {};
+        description = ''
+          Gerrit configuration. This will be generated to the
+          <literal>etc/gerrit.config</literal> file.
+        '';
+      };
+
+      plugins = mkOption {
+        type = types.listOf types.package;
+        default = [];
+        description = ''
+          List of plugins to add to Gerrit. Each derivation is a jar file
+          itself where the name of the derivation is the name of plugin.
+        '';
+      };
+
+      builtinPlugins = mkOption {
+        type = types.listOf (types.enum cfg.package.passthru.plugins);
+        default = [];
+        description = ''
+          List of builtins plugins to install. Those are shipped in the
+          <literal>gerrit.war</literal> file.
+        '';
+      };
+
+      serverId = mkOption {
+        type = types.str;
+        description = ''
+          Set a UUID that uniquely identifies the server.
+
+          This can be generated with
+          <literal>nix-shell -p utillinux --run uuidgen</literal>.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    services.gerrit.settings = {
+      cache.directory = "/var/cache/gerrit";
+      container.heapLimit = cfg.jvmHeapLimit;
+      gerrit.basePath = lib.mkDefault "git";
+      gerrit.serverId = cfg.serverId;
+      httpd.inheritChannel = "true";
+      httpd.listenUrl = lib.mkDefault "http://${cfg.listenAddress}";
+      index.type = lib.mkDefault "lucene";
+    };
+
+    # Add the gerrit CLI to the system to run `gerrit init` and friends.
+    environment.systemPackages = [ gerrit-cli ];
+
+    systemd.sockets.gerrit = {
+      unitConfig.Description = "Gerrit HTTP socket";
+      wantedBy = [ "sockets.target" ];
+      listenStreams = [ cfg.listenAddress ];
+    };
+
+    systemd.services.gerrit = {
+      description = "Gerrit";
+
+      wantedBy = [ "multi-user.target" ];
+      requires = [ "gerrit.socket" ];
+      after = [ "gerrit.socket" "network.target" ];
+
+      path = [
+        gerrit-cli
+        pkgs.bash
+        pkgs.coreutils
+        pkgs.git
+        pkgs.openssh
+      ];
+
+      environment = {
+        GERRIT_HOME = "%S/gerrit";
+        GERRIT_TMP = "%T";
+        HOME = "%S/gerrit";
+        XDG_CONFIG_HOME = "%S/gerrit/.config";
+      };
+
+      preStart = ''
+        set -euo pipefail
+
+        # bootstrap if nothing exists
+        if [[ ! -d git ]]; then
+          gerrit init --batch --no-auto-start
+        fi
+
+        # install gerrit.war for the plugin manager
+        rm -rf bin
+        mkdir bin
+        ln -sfv ${cfg.package}/webapps/${cfg.package.name}.war bin/gerrit.war
+
+        # copy the config, keep it mutable because Gerrit
+        ln -sfv ${gerritConfig} etc/gerrit.config
+
+        # install the plugins
+        rm -rf plugins
+        ln -sv ${gerrit-plugins} plugins
+      ''
+      ;
+
+      serviceConfig = {
+        CacheDirectory = "gerrit";
+        DynamicUser = true;
+        ExecStart = "${gerrit-cli}/bin/gerrit daemon --console-log";
+        LimitNOFILE = 4096;
+        StandardInput = "socket";
+        StandardOutput = "journal";
+        StateDirectory = "gerrit";
+        WorkingDirectory = "%S/gerrit";
+      };
+    };
+  };
+
+  meta.maintainers = with lib.maintainers; [ edef zimbatm ];
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 51b463747b0e..3501c551625d 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -97,6 +97,7 @@ in
   fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix {};
   freeswitch = handleTest ./freeswitch.nix {};
   fsck = handleTest ./fsck.nix {};
+  gerrit = handleTest ./gerrit.nix {};
   gotify-server = handleTest ./gotify-server.nix {};
   grocy = handleTest ./grocy.nix {};
   gitdaemon = handleTest ./gitdaemon.nix {};
diff --git a/nixos/tests/gerrit.nix b/nixos/tests/gerrit.nix
new file mode 100644
index 000000000000..e8b5cb4c4feb
--- /dev/null
+++ b/nixos/tests/gerrit.nix
@@ -0,0 +1,56 @@
+import ./make-test-python.nix ({ pkgs, ... }:
+
+let
+  lfs = pkgs.fetchurl {
+    url = "https://gerrit-ci.gerritforge.com/job/plugin-lfs-bazel-master/90/artifact/bazel-bin/plugins/lfs/lfs.jar";
+    sha256 = "023b0kd8djm3cn1lf1xl67yv3j12yl8bxccn42lkfmwxjwjfqw6h";
+  };
+
+in {
+  name = "gerrit";
+
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ flokli zimbatm ];
+  };
+
+  nodes = {
+    server =
+      { config, pkgs, ... }: {
+        networking.firewall.allowedTCPPorts = [ 80 2222 ];
+
+        virtualisation.memorySize = 1024;
+
+        services.gerrit = {
+          enable = true;
+          serverId = "aa76c84b-50b0-4711-a0a0-1ee30e45bbd0";
+          listenAddress = "[::]:80";
+          jvmPackage = pkgs.jdk12_headless;
+          jvmHeapLimit = "1g";
+
+          plugins = [ lfs ];
+          builtinPlugins = [ "hooks" "webhooks" ];
+          settings = {
+            gerrit.canonicalWebUrl = "http://server";
+            lfs.plugin = "lfs";
+            plugins.allowRemoteAdmin = true;
+            sshd.listenAddress = "[::]:2222";
+            sshd.advertisedAddress = "[::]:2222";
+          };
+        };
+      };
+
+    client =
+      { ... }: {
+      };
+  };
+
+  testScript = ''
+    start_all()
+    server.wait_for_unit("gerrit.service")
+    server.wait_for_open_port(80)
+    client.succeed("curl http://server")
+
+    server.wait_for_open_port(2222)
+    client.succeed("nc -z server 2222")
+  '';
+})
diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix
index be84b7abc820..1aa7afcd98bf 100644
--- a/pkgs/applications/version-management/gerrit/default.nix
+++ b/pkgs/applications/version-management/gerrit/default.nix
@@ -14,6 +14,24 @@ stdenv.mkDerivation rec {
     ln -s ${src} "$out"/webapps/gerrit-${version}.war
   '';
 
+  passthru = {
+    # A list of plugins that are part of the gerrit.war file.
+    # Use `java -jar gerrit.war ls | grep plugins/` to generate that list.
+    plugins = [
+      "codemirror-editor"
+      "commit-message-length-validator"
+      "delete-project"
+      "download-commands"
+      "gitiles"
+      "hooks"
+      "plugin-manager"
+      "replication"
+      "reviewnotes"
+      "singleusergroup"
+      "webhooks"
+    ];
+  };
+
   meta = with stdenv.lib; {
     homepage = "https://www.gerritcodereview.com/index.md";
     license = licenses.asl20;

From a96d46aec3638ff447cf6bede87294ea9dfe9ef6 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 26 Mar 2020 04:20:00 -0500
Subject: [PATCH 4033/4636] jetbrains-mono: 1.0.4 -> 1.0.5

Changelog: https://github.com/JetBrains/JetBrainsMono/releases/tag/v1.0.5
---
 pkgs/data/fonts/jetbrains-mono/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/jetbrains-mono/default.nix b/pkgs/data/fonts/jetbrains-mono/default.nix
index 8a7e841df672..4297d15da948 100644
--- a/pkgs/data/fonts/jetbrains-mono/default.nix
+++ b/pkgs/data/fonts/jetbrains-mono/default.nix
@@ -1,14 +1,14 @@
 { lib, fetchzip }:
 
 let
-  version = "1.0.4";
+  version = "1.0.5";
 in
 fetchzip rec {
   name = "JetBrainsMono-${version}";
 
   url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip";
 
-  sha256 = "1m6wppz6mrh7475d92yvwrjgbwkkcfq444v0im90f5c7fsf3dzbd";
+  sha256 = "1iqqix7rr22ij0cn7vg812qs4gbjpphndgbzm57abqk658lra4kl";
 
   postFetch = ''
     mkdir -p $out/share/fonts

From 9fa6557a7118a2b4fb3373a980f12cd423505a18 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 26 Mar 2020 04:20:00 -0500
Subject: [PATCH 4034/4636] mpv: fix cocoa backend

---
 pkgs/applications/video/mpv/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index f1713fe29d4b..c24d25634a1b 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -1,4 +1,4 @@
-{ config, stdenv, fetchurl, fetchFromGitHub, makeWrapper
+{ config, stdenv, fetchurl, fetchFromGitHub, makeWrapper, fetchpatch
 , addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which
 , ffmpeg_4, freefont_ttf, freetype, libass, libpthreadstubs, mujs
 , nv-codec-headers, lua, libuchardet, libiconv ? null
@@ -191,6 +191,14 @@ in stdenv.mkDerivation rec {
       --prefix PYTHONPATH : "${vapoursynth}/lib/${python3.libPrefix}/site-packages:$PYTHONPATH"
   '';
 
+  patches = stdenv.lib.optionals stdenv.isDarwin [
+    # Fix cocoa backend. Remove with the next release
+    (fetchpatch {
+      url = "https://github.com/mpv-player/mpv/commit/188169854313b99d01da8f69fe129f0a487eb7c4.patch";
+      sha256 = "062sz4666prb2wg1rn5q8brqkzlq6lxn8sxic78a8lb0125c01f7";
+    })
+  ];
+
   postInstall = ''
     # Use a standard font
     mkdir -p $out/share/mpv

From c3392946b1c643750666e936557006f0b1e584d3 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 26 Mar 2020 02:01:27 +0100
Subject: [PATCH 4035/4636] wasm-bindgen-cli: 0.2.59 -> 0.2.60

https://github.com/rustwasm/wasm-bindgen/releases/tag/0.2.60
---
 .../0001-Add-cargo.lock.patch                 | 327 +++++++++++-------
 .../tools/wasm-bindgen-cli/default.nix        |   6 +-
 2 files changed, 214 insertions(+), 119 deletions(-)

diff --git a/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch b/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch
index e30e9c3d7e5f..29886fccd5f1 100644
--- a/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch
+++ b/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch
@@ -1,19 +1,19 @@
-From 792dcf4aef3144222e3fab9498bda620879664ab Mon Sep 17 00:00:00 2001
+From 786cd8df9e9fa245c4dbab1bfd21b7949b8a5300 Mon Sep 17 00:00:00 2001
 From: Maximilian Bosch <maximilian@mbosch.me>
-Date: Sat, 7 Mar 2020 22:56:36 +0100
+Date: Thu, 26 Mar 2020 01:54:11 +0100
 Subject: [PATCH] Add cargo.lock
 
 ---
- Cargo.lock | 2432 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 2432 insertions(+)
+ Cargo.lock | 2527 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 2527 insertions(+)
  create mode 100644 Cargo.lock
 
 diff --git a/Cargo.lock b/Cargo.lock
 new file mode 100644
-index 00000000..2cd91628
+index 00000000..976ea6d4
 --- /dev/null
 +++ b/Cargo.lock
-@@ -0,0 +1,2432 @@
+@@ -0,0 +1,2527 @@
 +# This file is automatically @generated by Cargo.
 +# It is not intended for manual editing.
 +[[package]]
@@ -31,9 +31,9 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "aho-corasick"
-+version = "0.7.9"
++version = "0.7.10"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d5e63fd144e18ba274ae7095c0197a870a7b9468abc801dd62f190d80817d2ec"
++checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada"
 +dependencies = [
 + "memchr",
 +]
@@ -49,9 +49,9 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "anyhow"
-+version = "1.0.26"
++version = "1.0.27"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7825f6833612eb2414095684fcf6c635becf3ce97fe48cf6421321e93bfbd53c"
++checksum = "013a6e0a2cbe3d20f9c60b65458f7a7f7a5e636c5d0f45a5a6aee5d4b1f01785"
 +
 +[[package]]
 +name = "arrayref"
@@ -192,9 +192,9 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "bumpalo"
-+version = "3.2.0"
++version = "3.2.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1f359dc14ff8911330a51ef78022d376f25ed00248912803b58f00cb1c27f742"
++checksum = "12ae9db68ad7fac5fe51304d20f016c911539251075a214f8e663babefa35187"
 +
 +[[package]]
 +name = "byteorder"
@@ -203,15 +203,6 @@ index 00000000..2cd91628
 +checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
 +
 +[[package]]
-+name = "c2-chacha"
-+version = "0.2.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
-+dependencies = [
-+ "ppv-lite86",
-+]
-+
-+[[package]]
 +name = "canvas"
 +version = "0.1.0"
 +dependencies = [
@@ -368,9 +359,9 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "curl"
-+version = "0.4.26"
++version = "0.4.28"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ecb534fed9060d04bccaa8b8e1e2d3d5a0d7a9ec6d9c667691c80a3c6b7d19ef"
++checksum = "eda1c0c03cacf3365d84818a40293f0e3f3953db8759c9c565a3b434edf0b52e"
 +dependencies = [
 + "curl-sys",
 + "libc",
@@ -383,9 +374,9 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "curl-sys"
-+version = "0.4.28+curl-7.69.0"
++version = "0.4.30+curl-7.69.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e2c6b7fa5d36aa192e410788b77af65f339af24c8786419e8b48173689a484bf"
++checksum = "923b38e423a8f47a4058e96f2a1fa2865a6231097ee860debd678d244277d50c"
 +dependencies = [
 + "cc",
 + "libc",
@@ -544,6 +535,31 @@ index 00000000..2cd91628
 +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 +
 +[[package]]
++name = "futures"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5c329ae8753502fb44ae4fc2b622fa2a94652c41e795143765ba0927f92ab780"
++dependencies = [
++ "futures-channel",
++ "futures-core",
++ "futures-executor",
++ "futures-io",
++ "futures-sink",
++ "futures-task",
++ "futures-util",
++]
++
++[[package]]
++name = "futures-channel"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f0c77d04ce8edd9cb903932b608268b3fffec4163dc053b3b402bf47eac1f1a8"
++dependencies = [
++ "futures-core",
++ "futures-sink",
++]
++
++[[package]]
 +name = "futures-channel-preview"
 +version = "0.3.0-alpha.19"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -553,12 +569,78 @@ index 00000000..2cd91628
 +]
 +
 +[[package]]
++name = "futures-core"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f25592f769825e89b92358db00d26f965761e094951ac44d3663ef25b7ac464a"
++
++[[package]]
 +name = "futures-core-preview"
 +version = "0.3.0-alpha.19"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a"
 +
 +[[package]]
++name = "futures-executor"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f674f3e1bcb15b37284a90cedf55afdba482ab061c407a9c0ebbd0f3109741ba"
++dependencies = [
++ "futures-core",
++ "futures-task",
++ "futures-util",
++]
++
++[[package]]
++name = "futures-io"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a638959aa96152c7a4cddf50fcb1e3fede0583b27157c26e67d6f99904090dc6"
++
++[[package]]
++name = "futures-macro"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7"
++dependencies = [
++ "proc-macro-hack",
++ "proc-macro2 1.0.9",
++ "quote 1.0.3",
++ "syn 1.0.17",
++]
++
++[[package]]
++name = "futures-sink"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3466821b4bc114d95b087b850a724c6f83115e929bc88f1fa98a3304a944c8a6"
++
++[[package]]
++name = "futures-task"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7b0a34e53cf6cdcd0178aa573aed466b646eb3db769570841fda0c7ede375a27"
++
++[[package]]
++name = "futures-util"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "22766cf25d64306bedf0384da004d05c9974ab104fcc4528f1236181c18004c5"
++dependencies = [
++ "futures-channel",
++ "futures-core",
++ "futures-io",
++ "futures-macro",
++ "futures-sink",
++ "futures-task",
++ "memchr",
++ "pin-utils",
++ "proc-macro-hack",
++ "proc-macro-nested",
++ "slab",
++]
++
++[[package]]
 +name = "getrandom"
 +version = "0.1.14"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -700,7 +782,7 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "js-sys"
-+version = "0.3.36"
++version = "0.3.37"
 +dependencies = [
 + "wasm-bindgen",
 + "wasm-bindgen-futures",
@@ -729,9 +811,9 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "libc"
-+version = "0.2.67"
++version = "0.2.68"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "eb147597cdf94ed43ab7a9038716637d2d1bf2bc571da995d0028dec06bd3018"
++checksum = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0"
 +
 +[[package]]
 +name = "libz-sys"
@@ -789,11 +871,11 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "memoffset"
-+version = "0.5.3"
++version = "0.5.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
++checksum = "b4fc2c02a7e374099d4ee95a193111f72d2110197fe200272371758f6c3643d8"
 +dependencies = [
-+ "rustc_version",
++ "autocfg 1.0.0",
 +]
 +
 +[[package]]
@@ -949,9 +1031,9 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "openssl-src"
-+version = "111.6.1+1.1.1d"
++version = "111.7.0+1.1.1e"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c91b04cb43c1a8a90e934e0cd612e2a5715d976d2d6cff4490278a0cddf35005"
++checksum = "6fde5a8c01ef8aa31ff8d0aaf9bae248581ed8840fca0b66e51cc9f294a8cb2c"
 +dependencies = [
 + "cc",
 +]
@@ -1025,6 +1107,12 @@ index 00000000..2cd91628
 +]
 +
 +[[package]]
++name = "pin-utils"
++version = "0.1.0-alpha.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587"
++
++[[package]]
 +name = "pkg-config"
 +version = "0.3.17"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1079,31 +1167,43 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "proc-macro-error"
-+version = "0.4.11"
++version = "0.4.12"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e7959c6467d962050d639361f7703b2051c43036d03493c36f01d440fdd3138a"
++checksum = "18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7"
 +dependencies = [
 + "proc-macro-error-attr",
 + "proc-macro2 1.0.9",
 + "quote 1.0.3",
-+ "syn 1.0.16",
++ "syn 1.0.17",
 + "version_check 0.9.1",
 +]
 +
 +[[package]]
 +name = "proc-macro-error-attr"
-+version = "0.4.11"
++version = "0.4.12"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e4002d9f55991d5e019fb940a90e1a95eb80c24e77cb2462dd4dc869604d543a"
++checksum = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de"
 +dependencies = [
 + "proc-macro2 1.0.9",
 + "quote 1.0.3",
-+ "syn 1.0.16",
++ "syn 1.0.17",
 + "syn-mid",
 + "version_check 0.9.1",
 +]
 +
 +[[package]]
++name = "proc-macro-hack"
++version = "0.5.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fcfdefadc3d57ca21cf17990a28ef4c0f7c61383a28cb7604cf4a18e6ede1420"
++
++[[package]]
++name = "proc-macro-nested"
++version = "0.1.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8e946095f9d3ed29ec38de908c22f95d9ac008e424c7bcae54c75a79c527c694"
++
++[[package]]
 +name = "proc-macro2"
 +version = "0.4.30"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1198,7 +1298,7 @@ index 00000000..2cd91628
 +dependencies = [
 + "getrandom",
 + "libc",
-+ "rand_chacha 0.2.1",
++ "rand_chacha 0.2.2",
 + "rand_core 0.5.1",
 + "rand_hc 0.2.0",
 +]
@@ -1215,11 +1315,11 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "rand_chacha"
-+version = "0.2.1"
++version = "0.2.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
 +dependencies = [
-+ "c2-chacha",
++ "ppv-lite86",
 + "rand_core 0.5.1",
 +]
 +
@@ -1395,9 +1495,9 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "regex"
-+version = "1.3.4"
++version = "1.3.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8"
++checksum = "7f6946991529684867e47d86474e3a6d0c0ab9b82d5821e314b1ede31fa3a4b3"
 +dependencies = [
 + "aho-corasick",
 + "memchr",
@@ -1407,9 +1507,9 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "regex-syntax"
-+version = "0.6.16"
++version = "0.6.17"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1132f845907680735a84409c3bebc64d1364a5683ffbce899550cd09d5eaefc1"
++checksum = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae"
 +
 +[[package]]
 +name = "remove_dir_all"
@@ -1477,19 +1577,10 @@ index 00000000..2cd91628
 +checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
 +
 +[[package]]
-+name = "rustc_version"
-+version = "0.2.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-+dependencies = [
-+ "semver",
-+]
-+
-+[[package]]
 +name = "ryu"
-+version = "1.0.2"
++version = "1.0.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
++checksum = "535622e6be132bccd223f4bb2b8ac8d53cda3c7a6394944d3b2b33fb974f9d76"
 +
 +[[package]]
 +name = "safemem"
@@ -1509,9 +1600,9 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "schannel"
-+version = "0.1.17"
++version = "0.1.18"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "507a9e6e8ffe0a4e0ebb9a10293e62fdf7657c06f1b8bb07a8fcf697d2abf295"
++checksum = "039c25b130bd8c1321ee2d7de7fde2659fa9c2744e4bb29711cfc852ea53cd19"
 +dependencies = [
 + "lazy_static",
 + "winapi",
@@ -1536,38 +1627,23 @@ index 00000000..2cd91628
 +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 +
 +[[package]]
-+name = "semver"
-+version = "0.9.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-+dependencies = [
-+ "semver-parser",
-+]
-+
-+[[package]]
-+name = "semver-parser"
-+version = "0.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-+
-+[[package]]
 +name = "serde"
-+version = "1.0.104"
++version = "1.0.105"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
++checksum = "e707fbbf255b8fc8c3b99abb91e7257a622caeb20a9818cbadbeeede4e0932ff"
 +dependencies = [
 + "serde_derive",
 +]
 +
 +[[package]]
 +name = "serde_derive"
-+version = "1.0.104"
++version = "1.0.105"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
++checksum = "ac5d00fc561ba2724df6758a17de23df5914f20e41cb00f94d5b7ae42fffaff8"
 +dependencies = [
 + "proc-macro2 1.0.9",
 + "quote 1.0.3",
-+ "syn 1.0.16",
++ "syn 1.0.17",
 +]
 +
 +[[package]]
@@ -1594,6 +1670,12 @@ index 00000000..2cd91628
 +checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
 +
 +[[package]]
++name = "slab"
++version = "0.4.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
++
++[[package]]
 +name = "smallvec"
 +version = "1.2.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1631,9 +1713,9 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "structopt"
-+version = "0.3.11"
++version = "0.3.12"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3fe43617218c0805c6eb37160119dc3c548110a67786da7218d1c6555212f073"
++checksum = "c8faa2719539bbe9d77869bfb15d4ee769f99525e707931452c97b693b3f159d"
 +dependencies = [
 + "clap",
 + "lazy_static",
@@ -1642,15 +1724,15 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "structopt-derive"
-+version = "0.4.4"
++version = "0.4.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c6e79c80e0f4efd86ca960218d4e056249be189ff1c42824dcd9a7f51a56f0bd"
++checksum = "3f88b8e18c69496aad6f9ddf4630dd7d585bcaf765786cb415b9aec2fe5a0430"
 +dependencies = [
 + "heck",
 + "proc-macro-error",
 + "proc-macro2 1.0.9",
 + "quote 1.0.3",
-+ "syn 1.0.16",
++ "syn 1.0.17",
 +]
 +
 +[[package]]
@@ -1666,9 +1748,9 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "syn"
-+version = "1.0.16"
++version = "1.0.17"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "123bd9499cfb380418d509322d7a6d52e5315f064fe4b3ad18a53d6b92c07859"
++checksum = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03"
 +dependencies = [
 + "proc-macro2 1.0.9",
 + "quote 1.0.3",
@@ -1683,7 +1765,7 @@ index 00000000..2cd91628
 +dependencies = [
 + "proc-macro2 1.0.9",
 + "quote 1.0.3",
-+ "syn 1.0.16",
++ "syn 1.0.17",
 +]
 +
 +[[package]]
@@ -1818,9 +1900,9 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "trybuild"
-+version = "1.0.23"
++version = "1.0.24"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "26ff1b18659a2218332848d76ad1c867ce4c6ee37b085e6bc8de9a6d11401220"
++checksum = "24b4e093c5ed1a60b22557090120aa14f90ca801549c0949d775ea07c1407720"
 +dependencies = [
 + "glob",
 + "lazy_static",
@@ -1958,7 +2040,7 @@ index 00000000..2cd91628
 + "heck",
 + "proc-macro2 1.0.9",
 + "quote 1.0.3",
-+ "syn 1.0.16",
++ "syn 1.0.17",
 +]
 +
 +[[package]]
@@ -1969,7 +2051,7 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "wasm-bindgen"
-+version = "0.2.59"
++version = "0.2.60"
 +dependencies = [
 + "cfg-if",
 + "js-sys",
@@ -1985,7 +2067,7 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "wasm-bindgen-anyref-xform"
-+version = "0.2.59"
++version = "0.2.60"
 +dependencies = [
 + "anyhow",
 + "rayon",
@@ -1997,14 +2079,14 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "wasm-bindgen-backend"
-+version = "0.2.59"
++version = "0.2.60"
 +dependencies = [
 + "bumpalo",
 + "lazy_static",
 + "log 0.4.8",
 + "proc-macro2 1.0.9",
 + "quote 1.0.3",
-+ "syn 1.0.16",
++ "syn 1.0.17",
 + "wasm-bindgen-shared",
 +]
 +
@@ -2018,7 +2100,7 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "wasm-bindgen-cli"
-+version = "0.2.59"
++version = "0.2.60"
 +dependencies = [
 + "anyhow",
 + "assert_cmd",
@@ -2046,7 +2128,7 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "wasm-bindgen-cli-support"
-+version = "0.2.59"
++version = "0.2.60"
 +dependencies = [
 + "anyhow",
 + "base64 0.9.3",
@@ -2068,7 +2150,7 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "wasm-bindgen-futures"
-+version = "0.4.9"
++version = "0.4.10"
 +dependencies = [
 + "cfg-if",
 + "futures-channel-preview",
@@ -2080,7 +2162,7 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "wasm-bindgen-macro"
-+version = "0.2.59"
++version = "0.2.60"
 +dependencies = [
 + "quote 1.0.3",
 + "trybuild",
@@ -2091,18 +2173,18 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "wasm-bindgen-macro-support"
-+version = "0.2.59"
++version = "0.2.60"
 +dependencies = [
 + "proc-macro2 1.0.9",
 + "quote 1.0.3",
-+ "syn 1.0.16",
++ "syn 1.0.17",
 + "wasm-bindgen-backend",
 + "wasm-bindgen-shared",
 +]
 +
 +[[package]]
 +name = "wasm-bindgen-multi-value-xform"
-+version = "0.2.59"
++version = "0.2.60"
 +dependencies = [
 + "anyhow",
 + "rayon",
@@ -2123,11 +2205,11 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "wasm-bindgen-shared"
-+version = "0.2.59"
++version = "0.2.60"
 +
 +[[package]]
 +name = "wasm-bindgen-test"
-+version = "0.3.9"
++version = "0.3.10"
 +dependencies = [
 + "console_error_panic_hook",
 + "js-sys",
@@ -2153,7 +2235,7 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "wasm-bindgen-test-macro"
-+version = "0.3.9"
++version = "0.3.10"
 +dependencies = [
 + "proc-macro2 1.0.9",
 + "quote 1.0.3",
@@ -2161,7 +2243,7 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "wasm-bindgen-threads-xform"
-+version = "0.2.59"
++version = "0.2.60"
 +dependencies = [
 + "anyhow",
 + "walrus",
@@ -2170,7 +2252,7 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "wasm-bindgen-wasm-conventions"
-+version = "0.2.59"
++version = "0.2.60"
 +dependencies = [
 + "anyhow",
 + "walrus",
@@ -2178,7 +2260,7 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "wasm-bindgen-wasm-interpreter"
-+version = "0.2.59"
++version = "0.2.60"
 +dependencies = [
 + "anyhow",
 + "log 0.4.8",
@@ -2189,7 +2271,7 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "wasm-bindgen-webidl"
-+version = "0.2.59"
++version = "0.2.60"
 +dependencies = [
 + "anyhow",
 + "env_logger",
@@ -2200,7 +2282,7 @@ index 00000000..2cd91628
 + "quote 1.0.3",
 + "sourcefile",
 + "structopt",
-+ "syn 1.0.16",
++ "syn 1.0.17",
 + "wasm-bindgen-backend",
 + "weedle",
 +]
@@ -2254,25 +2336,25 @@ index 00000000..2cd91628
 +
 +[[package]]
 +name = "wast"
-+version = "9.0.0"
++version = "11.0.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ee7b16105405ca2aa2376ba522d8d4b1a11604941dd3bb7df9fd2ece60f8d16a"
++checksum = "df4d67ba9266f4fcaf2e8a1afadc5e2a959e51aecc07b1ecbdf85a6ddaf08bde"
 +dependencies = [
 + "leb128",
 +]
 +
 +[[package]]
 +name = "wat"
-+version = "1.0.10"
++version = "1.0.12"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "56173f7f4fb59aebe35a7e71423845e1c6c7144bfb56362d497931b6b3bed0f6"
++checksum = "9a9400dc1c8512087b2d974b1b9b0a6c4e6e26e7e8acf629e3e351165a1ed301"
 +dependencies = [
-+ "wast 9.0.0",
++ "wast 11.0.0",
 +]
 +
 +[[package]]
 +name = "web-sys"
-+version = "0.3.36"
++version = "0.3.37"
 +dependencies = [
 + "js-sys",
 + "wasm-bindgen",
@@ -2316,6 +2398,19 @@ index 00000000..2cd91628
 +]
 +
 +[[package]]
++name = "webxr"
++version = "0.1.0"
++dependencies = [
++ "futures",
++ "js-sys",
++ "serde",
++ "serde_derive",
++ "wasm-bindgen",
++ "wasm-bindgen-futures",
++ "web-sys",
++]
++
++[[package]]
 +name = "weedle"
 +version = "0.11.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix
index e5afcb30a817..ee9a6ead7fa1 100644
--- a/pkgs/development/tools/wasm-bindgen-cli/default.nix
+++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix
@@ -2,19 +2,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wasm-bindgen-cli";
-  version = "0.2.59";
+  version = "0.2.60";
 
   src = fetchFromGitHub {
     owner = "rustwasm";
     repo = "wasm-bindgen";
     rev = version;
-    sha256 = "1i0hdky5dlkrzcphddm122yxfhgcvnszh4q1as0r41vhfs5ss597";
+    sha256 = "1jr4v5y9hbkyg8gjkr3qc2qxwhyagfs8q3y3z248mr1919mcas8h";
   };
 
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ];
   nativeBuildInputs = [ pkgconfig ];
 
-  cargoSha256 = "1ylk9vrpajslx1zy4vqmlyqa5ygcmvir1gcn8hsr6liigf5kcz7p";
+  cargoSha256 = "08g110qahipgm1qyyihgqwnkr23w0gk1gp63ici5dj2qsxnc4mxv";
   cargoPatches = [ ./0001-Add-cargo.lock.patch ];
   cargoBuildFlags = [ "-p" pname ];
 

From cc03fb4210c472e7ed172079af0a4016228bbee1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= <daniel@serbanescu.dk>
Date: Thu, 26 Mar 2020 11:28:31 +0100
Subject: [PATCH 4036/4636] libtorrent-raster: 1.1.11 -> 1.2.5; qbittorrent:
 4.2.1 -> 4.2.2

---
 pkgs/applications/networking/p2p/qbittorrent/default.nix    | 4 ++--
 pkgs/development/libraries/libtorrent-rasterbar/default.nix | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 8ab83c8a4ba4..3dd55f3c5b85 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -10,13 +10,13 @@ with lib;
 
 mkDerivation rec {
   pname = "qbittorrent";
-  version = "4.2.1";
+  version = "4.2.2";
 
   src = fetchFromGitHub {
     owner = "qbittorrent";
     repo = "qbittorrent";
     rev = "release-${version}";
-    sha256 = "0bz4l7awkx4qf3gh9c8gj8fab989439zj8qy4x9r36wxdjg5cxil";
+    sha256 = "1iqgwhgwa2kx85zj1rwfnnclr1433a7m2gbs3j7w6rx39vxnzhcc";
   };
 
   # NOTE: 2018-05-31: CMake is working but it is not officially supported
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index 26605eb41dbd..f910964a2cac 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  version = "1.1.11";
+  version = "1.2.5";
   formattedVersion = lib.replaceChars ["."] ["_"] version;
 
   # Make sure we override python, so the correct version is chosen
@@ -17,13 +17,14 @@ in stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "arvidn";
     repo = "libtorrent";
-    rev = "libtorrent_${formattedVersion}";
+    rev = "libtorrent-${formattedVersion}";
     sha256 = "0nwdsv6d2gkdsh7l5a46g6cqx27xwh3msify5paf02l1qzjy4s5l";
   };
 
   enableParallelBuilding = true;
   nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
   buildInputs = [ boostPython openssl zlib python libiconv geoip ncurses ];
+
   preConfigure = "./autotool.sh";
 
   postInstall = ''

From 5c4735947d76c92d0355ee1bfe9bef426264ed7b Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 26 Mar 2020 12:11:27 +0100
Subject: [PATCH 4037/4636] signal-desktop: 1.32.1 -> 1.32.2

---
 .../networking/instant-messengers/signal-desktop/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 3592665ef0b4..51b6816e4eca 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -23,7 +23,7 @@ let
       else "");
 in stdenv.mkDerivation rec {
   pname = "signal-desktop";
-  version = "1.32.1"; # Please backport all updates to the stable channel.
+  version = "1.32.2"; # Please backport all updates to the stable channel.
   # All releases have a limited lifetime and "expire" 90 days after the release.
   # When releases "expire" the application becomes unusable until an update is
   # applied. The expiration date for the current release can be extracted with:
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "0sfzz1z57l20prj2s8hdl8ip1hrlzb5fqnccqcfd101a6mjnp9i9";
+    sha256 = "0s64b66yzh797wbnggpj5hym0d1dklh3znbl3xib00hlwdqczbwz";
   };
 
   nativeBuildInputs = [

From 4143bcdf414fe0305b27a2fed7daa5b6eeb70750 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 26 Mar 2020 08:21:58 -0300
Subject: [PATCH 4038/4636] roboto-mono: 2016-01-11 -> 2.002-20190125

---
 pkgs/data/fonts/roboto-mono/default.nix | 38 ++++++++++++-------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/data/fonts/roboto-mono/default.nix b/pkgs/data/fonts/roboto-mono/default.nix
index cfd4e3808aa3..9bb655268014 100644
--- a/pkgs/data/fonts/roboto-mono/default.nix
+++ b/pkgs/data/fonts/roboto-mono/default.nix
@@ -1,53 +1,53 @@
 { stdenv, fetchurl }:
 
 let
-  # last commit on the directory containing the fonts in the upstream repository
-  commit = "883939708704a19a295e0652036369d22469e8dc";
+  # Latest commit touching the robotomono tree
+  commit = "5338537ef835a3d9ccf8faf386399f13a30605e2";
 in
 stdenv.mkDerivation {
   pname = "roboto-mono";
-  version = "2016-01-11";
+  version = "2.002-20190125";
 
   srcs = [
     (fetchurl {
       url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Regular.ttf";
-      sha256 = "0r6g1xydy824xbbjilq6pvrv8611ga3q1702v5jj1ly5np6gpddz";
+      sha256 = "1f96r4by67hzqpr4p2wkrfnpj9b7x9qrmwns0312w2l2rnp2qajx";
     })
     (fetchurl {
       url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Bold.ttf";
-      sha256 = "0x9qnrbd7hin873wjzrl6798bvakixd86qdw0z5b4sm56f7fjl32";
+      sha256 = "10wg4dchdq4s89r9pd4h8y5l1bf8mix32pksph2wafyr3815kfnm";
     })
     (fetchurl {
       url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Italic.ttf";
-      sha256 = "17aia6hgpjvvrl79y0f67ncr5y1nhyxj0dzqwdg3dycsa4kij59q";
+      sha256 = "1cayhm3wj36q748xd0zdgrhm4pz7wnrskrlf7khxx2s41m3win5b";
     })
     (fetchurl {
       url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-BoldItalic.ttf";
-      sha256 = "05gqfnps6qzxgyxrrmkmw0by3j88lf88v67n8jgi2chhhm0sw40q";
+      sha256 = "04238dxizdlhnnnyzhnqckxf8ciwlnwyzxby6qgpyg232abx0n2z";
     })
     (fetchurl {
       url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Medium.ttf";
-      sha256 = "0ww96qd0cyj3waxf7a98hyd4cp8snajjvjmbhr66zilql8ylfzk0";
+      sha256 = "00rh49d0dbycbkjgd2883w7iqzd6hcry08ycjipsvk091p5nq6qy";
     })
     (fetchurl {
       url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-MediumItalic.ttf";
-      sha256 = "1n2cvvcpwm68lazfh3s3xhj4mrc01x84mi2ackwf8ahd95fk9p5y";
+      sha256 = "0fxl6lblj7anhqmhplnpvjwckjh4g8m6r9jykxdrvpl5hk8mr65b";
     })
     (fetchurl {
       url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Light.ttf";
-      sha256 = "0na2sxz3n1km1ryz002spfa65d91fm48x0qcda2ac0rly7dgaqjf";
+      sha256 = "1h8rbc2p70fabkplsafzah1wcwy92qc1wzkmc1cnb4yq28gxah4a";
     })
     (fetchurl {
       url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-LightItalic.ttf";
-      sha256 = "171fr8wsbmvfllsbmb9pcdax2qfzhbqzyxfn5bcrz9kx5k9x6198";
+      sha256 = "08y2qngwy61mc22f8i00gshgmcf7hwmfxh1f4j824svy4n16zhsc";
     })
     (fetchurl {
       url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Thin.ttf";
-      sha256 = "0pv54afyprajb16ksm5vklc1q76iv72v427wgamqzrzyvxgn6ymj";
+      sha256 = "0fmij9zlfjiyf0vb8n8gvrwi35l830zpmkbhcy1xgx0m8za6mmmy";
     })
     (fetchurl {
       url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-ThinItalic.ttf";
-      sha256 = "1ziyysl09z24l735y940g92rqhn9v4npwqzajj9m1kn0xz21r1aw";
+      sha256 = "0mpwdhjnsk8311nw8fqzy1b7v0wzb4pw639ply1j38a0vibrsmn7";
     })
   ];
 
@@ -65,10 +65,10 @@ stdenv.mkDerivation {
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "1rd3qql779dn9nl940hf988lvv4gfy5llgrlfqq0db0c22b2yfng";
+  outputHash = "0fkx2z97k29n1392bf76iwdyz44yp86hmqah7ai6bikzlia38qa0";
 
-  meta = {
-    homepage = https://www.google.com/fonts/specimen/Roboto+Mono;
+  meta = with stdenv.lib; {
+    homepage = "https://www.google.com/fonts/specimen/Roboto+Mono";
     description = "Google Roboto Mono fonts";
     longDescription = ''
       Roboto Mono is a monospaced addition to the Roboto type family. Like
@@ -81,8 +81,8 @@ stdenv.mkDerivation {
       wider glyphs are adjusted for weight. Curved caps like 'C' and 'O'
       take on the straighter sides from Roboto Condensed.
     '';
-    license = stdenv.lib.licenses.asl20;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = [ maintainers.romildo ];
   };
 }

From e71419b11cced2639b56402a1017a787c0164e2e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 26 Mar 2020 12:12:25 +0100
Subject: [PATCH 4039/4636] androidStudioPackages.{dev,canary}: 4.1.0.3 ->
 4.1.0.4

---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 573eec845027..9a476ada2142 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -18,9 +18,9 @@ let
     sha256Hash = "072rvh20xkn7izh6f2r2bspy06jrvcibj2hc12hz76m8cwzf4v0m";
   };
   latestVersion = { # canary & dev
-    version = "4.1.0.3"; # "Android Studio 4.1 Canary 3"
-    build = "193.6297379";
-    sha256Hash = "0sb8ll9bkkdglq18wvy5hikimhjbpfadjdygx9cd8q545h8dy137";
+    version = "4.1.0.4"; # "Android Studio 4.1 Canary 4"
+    build = "193.6325121";
+    sha256Hash = "19b4a03qfljdisn7cw44qzab85hib000m9mgswzssjh6ylkd9arw";
   };
 in {
   # Attributes are named by their corresponding release channels

From 55ce589f189245479f6b3aed45d9158eef4e667b Mon Sep 17 00:00:00 2001
From: toonn <toonn@toonn.io>
Date: Thu, 26 Mar 2020 12:35:29 +0100
Subject: [PATCH 4040/4636] wire-desktop: linux 3.15.2922 -> 3.16.2923

---
 .../networking/instant-messengers/wire-desktop/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index c8372e2ea09e..e4bb42ed5265 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -21,12 +21,12 @@ let
 
   version = {
     x86_64-darwin = "3.15.3621";
-    x86_64-linux = "3.15.2922";
+    x86_64-linux = "3.16.2923";
   }.${system} or throwSystem;
 
   sha256 = {
     x86_64-darwin = "13sgakb3zjlvqv6d6b264fc9x99swpl7s1dmnrgc5v3pgyaklr01";
-    x86_64-linux = "03116fi8bmfpgalr36nxvmr8z4rw65qr3l4a89n0d40gawrk793q";
+    x86_64-linux = "0c8jmlsg2gnxsvly04xj1al80nj52rg4czfdha58sg14x14lyspz";
   }.${system} or throwSystem;
 
   meta = with stdenv.lib; {

From 9ee46bfb230226118ea70c9ed364021834965d0b Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 26 Mar 2020 13:19:33 +0100
Subject: [PATCH 4041/4636] python3Packages.py-cpuinfo: 4.0.0 -> 5.0.0 (#83420)

---
 .../python-modules/py-cpuinfo/default.nix           | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/py-cpuinfo/default.nix b/pkgs/development/python-modules/py-cpuinfo/default.nix
index c90f81ae28f8..ae2f5ae9d6db 100644
--- a/pkgs/development/python-modules/py-cpuinfo/default.nix
+++ b/pkgs/development/python-modules/py-cpuinfo/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "py-cpuinfo";
-  version = "4.0.0";
+  version = "5.0.0";
 
   src = fetchFromGitHub {
      owner = "workhorsy";
      repo = pname;
      rev = "v${version}";
-     sha256 = "1pp561lj80jnvr2038nrzhmks2akxsbdqxvfrqa6n340x81981lm";
+     sha256 = "0lxl9n6djaz5h1zrb2jca4qwl41c2plxy8chr7yhcxnzg0srddqi";
   };
 
   checkInputs = [
@@ -27,7 +27,14 @@ buildPythonPackage rec {
 
   meta = {
     description = "Get CPU info with pure Python 2 & 3";
-    homepage = https://github.com/workhorsy/py-cpuinfo;
+    longDescription = ''
+      Py-cpuinfo gets CPU info with pure Python and should work without any
+      extra programs or libraries, beyond what your OS provides. It does not
+      require any compilation (C/C++, assembly, etc.) to use and works with
+      Python 2 and 3.
+    '';
+    inherit (src.meta) homepage;
+    changelog = "https://github.com/workhorsy/py-cpuinfo/blob/v${version}/ChangeLog";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ costrouc ];
   };

From 8978ef387773d342a2ff8f78e21367c2677b02ab Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 26 Mar 2020 13:45:35 +0100
Subject: [PATCH 4042/4636] gns3-{gui,server}: 2.2.5 -> 2.2.6 (#83422)

---
 pkgs/applications/networking/gns3/default.nix | 12 ++++++++----
 pkgs/applications/networking/gns3/gui.nix     |  9 ++++-----
 pkgs/applications/networking/gns3/server.nix  | 13 +++++--------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index 6dcfb27b7ba6..340cfdf879a7 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -1,13 +1,13 @@
 { callPackage }:
 
 let
-  stableVersion = "2.2.5";
+  stableVersion = "2.2.6";
   previewVersion = stableVersion;
   addVersion = args:
     let version = if args.stable then stableVersion else previewVersion;
         branch = if args.stable then "stable" else "preview";
     in args // { inherit version branch; };
-  extraArgs = {
+  extraArgs = rec {
     mkOverride = attrname: version: sha256:
       self: super: {
         ${attrname} = super.${attrname}.overridePythonAttrs (oldAttrs: {
@@ -18,11 +18,15 @@ let
           doCheck = oldAttrs.doCheck && (attrname != "psutil");
         });
       };
+    commonOverrides = [
+      (mkOverride "psutil" "5.6.6"
+        "1rs6z8bfy6bqzw88s4i5zllrx3i18hnkv4akvmw7bifngcgjh8dd")
+    ];
   };
   mkGui = args: callPackage (import ./gui.nix (addVersion args // extraArgs)) { };
   mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { };
-  guiSrcHash = "1yxwbz93x9hn5y6dir8v7bdfsmfgppvjg4z88l8gx82hhf2476fx";
-  serverSrcHash = "1d3m8qrz82g8ii6q6j015wqwp6j0415fbqbjvw43zhdx5mnn962d";
+  guiSrcHash = "0inqy2zw5h9cgiyqb04kv8b5sjrdi4a637gdqs83k887axkd48aw";
+  serverSrcHash = "04d9lny5vyk0kbi5ilv5mngaicnxb077xpcaaqlcd9b1m3kiq19n";
 in {
   guiStable = mkGui {
     stable = true;
diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix
index 2d462d5c11d0..2524731cd05c 100644
--- a/pkgs/applications/networking/gns3/gui.nix
+++ b/pkgs/applications/networking/gns3/gui.nix
@@ -1,12 +1,10 @@
-{ stable, branch, version, sha256Hash, mkOverride }:
+{ stable, branch, version, sha256Hash, mkOverride, commonOverrides }:
 
 { lib, stdenv, python3, fetchFromGitHub }:
 
 let
   # TODO: This package requires qt5Full to launch
-  defaultOverrides = [
-    (mkOverride "psutil" "5.6.3"
-      "1wv31zly44qj0rp2acg58xbnc7bf6ffyadasq093l455q30qafl6")
+  defaultOverrides = commonOverrides ++ [
     (mkOverride "jsonschema" "2.6.0"
       "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg")
   ];
@@ -40,7 +38,8 @@ in python.pkgs.buildPythonPackage rec {
       requires access to a local or remote GNS3 server (it's recommended to
       download the official GNS3 VM).
     '';
-    homepage = https://www.gns3.com/;
+    homepage = "https://www.gns3.com/";
+    changelog = "https://github.com/GNS3/gns3-gui/releases/tag/v${version}";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ primeos ];
diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
index beeac9d02936..32dc42e9f51a 100644
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/pkgs/applications/networking/gns3/server.nix
@@ -1,11 +1,9 @@
-{ stable, branch, version, sha256Hash, mkOverride }:
+{ stable, branch, version, sha256Hash, mkOverride, commonOverrides }:
 
 { lib, stdenv, python3, fetchFromGitHub }:
 
 let
-  defaultOverrides = [
-    (mkOverride "psutil" "5.6.3"
-      "1wv31zly44qj0rp2acg58xbnc7bf6ffyadasq093l455q30qafl6")
+  defaultOverrides = commonOverrides ++ [
     (mkOverride "jsonschema" "2.6.0"
       "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg")
   ];
@@ -25,8 +23,6 @@ in python.pkgs.buildPythonPackage {
   };
 
   postPatch = ''
-    # Only 2.x is problematic:
-    sed -iE "s/prompt-toolkit==1.0.15/prompt-toolkit<2.0.0/" requirements.txt
     # yarl 1.4+ only requires Python 3.6+
     sed -iE "s/yarl==1.3.0//" requirements.txt
   '';
@@ -34,7 +30,7 @@ in python.pkgs.buildPythonPackage {
   propagatedBuildInputs = with python.pkgs; [
     aiohttp-cors yarl aiohttp multidict setuptools
     jinja2 psutil zipstream raven jsonschema distro async_generator aiofiles
-    (python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {})
+    prompt_toolkit py-cpuinfo
   ];
 
   # Requires network access
@@ -51,7 +47,8 @@ in python.pkgs.buildPythonPackage {
       Qemu/KVM. Clients like the GNS3 GUI control the server using a HTTP REST
       API.
     '';
-    homepage = https://www.gns3.com/;
+    homepage = "https://www.gns3.com/";
+    changelog = "https://github.com/GNS3/gns3-server/releases/tag/v${version}";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ primeos ];

From ac471c1fbc23de3106be2d8f1bcba98aaab29a09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCtke-Stetzkamp?= <christian@lkamp.de>
Date: Thu, 26 Mar 2020 13:46:04 +0100
Subject: [PATCH 4043/4636] aqbanking: Fix download url because of upstream
 changes

---
 pkgs/development/libraries/aqbanking/sources.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/aqbanking/sources.nix b/pkgs/development/libraries/aqbanking/sources.nix
index b410e64d667d..8016053c42de 100644
--- a/pkgs/development/libraries/aqbanking/sources.nix
+++ b/pkgs/development/libraries/aqbanking/sources.nix
@@ -7,5 +7,5 @@
   libchipcard.releaseId = "158";
   aqbanking.version = "6.0.2";
   aqbanking.sha256 = "0n41n3yki1wmax4i9wi485g8zqb43z1adywcixzfq9gbdjhz05hx";
-  aqbanking.releaseId = "243";
+  aqbanking.releaseId = "273";
 }

From 7cf37cc0be0496465c1b9e3ed70ffe9c47b5bc34 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 26 Mar 2020 13:33:25 +0100
Subject: [PATCH 4044/4636] html-proofer: 3.15.1 -> 3.15.2

---
 pkgs/tools/misc/html-proofer/Gemfile.lock | 4 ++--
 pkgs/tools/misc/html-proofer/gemset.nix   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock
index a998ccb3f63c..615eea5a7831 100644
--- a/pkgs/tools/misc/html-proofer/Gemfile.lock
+++ b/pkgs/tools/misc/html-proofer/Gemfile.lock
@@ -6,7 +6,7 @@ GEM
     ethon (0.12.0)
       ffi (>= 1.3.0)
     ffi (1.12.2)
-    html-proofer (3.15.1)
+    html-proofer (3.15.2)
       addressable (~> 2.3)
       mercenary (~> 0.3)
       nokogumbo (~> 2.0)
@@ -16,7 +16,7 @@ GEM
       yell (~> 2.0)
     mercenary (0.4.0)
     mini_portile2 (2.4.0)
-    nokogiri (1.10.8)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.2)
       nokogiri (~> 1.8, >= 1.8.4)
diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix
index 5ddb6accb940..2e3b3a10b3b8 100644
--- a/pkgs/tools/misc/html-proofer/gemset.nix
+++ b/pkgs/tools/misc/html-proofer/gemset.nix
@@ -37,10 +37,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0krd80ga7qcms469l55jbm711a7ph2lmyn88l929nhbxc7sgm81g";
+      sha256 = "1b7wx2hnwnml3y10x6yxybl3hy973n2ifq3hbqh0jd72bqs615wp";
       type = "gem";
     };
-    version = "3.15.1";
+    version = "3.15.2";
   };
   mercenary = {
     groups = ["default"];
@@ -68,10 +68,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8";
+      sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm";
       type = "gem";
     };
-    version = "1.10.8";
+    version = "1.10.9";
   };
   nokogumbo = {
     dependencies = ["nokogiri"];

From e9bec1adf6d4147d7b15d6b636ec5bf4294c457b Mon Sep 17 00:00:00 2001
From: Nathan Smyth <nathan.smyth@mongodb.com>
Date: Thu, 3 May 2018 17:42:24 +1000
Subject: [PATCH 4045/4636] mongodb: 3.4.10 -> 4.0.4

fix: Adding libtool to allow darwin compiles

Libtool seems to be required for mongodb to compile on darwin.

fix: Marking MongoDB as broken on aarch64

fix: Adding libtools to the pkg imports

Update mongodb to 4.0.4
---
 lib/licenses.nix                              |  7 +++++
 pkgs/servers/nosql/mongodb/default.nix        | 29 ++++++++++---------
 .../mongodb/forget-build-dependencies.patch   | 10 ++-----
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index e2f94e565ce2..e37eb57cff97 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -649,6 +649,13 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
     url = http://metadata.ftp-master.debian.org/changelogs/main/d/debianutils/debianutils_4.8.1_copyright;
   };
 
+  sspl = {
+    shortName = "SSPL";
+    fullName = "Server Side Public License";
+    url = https://www.mongodb.com/licensing/server-side-public-license;
+    free = false;
+  };
+
   tcltk = spdx {
     spdxId = "TCL";
     fullName = "TCL/TK License";
diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index c2ae83f3e8af..966cebc799e4 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre-cpp, snappy
-, zlib, libyamlcpp, sasl, openssl, libpcap, Security
+{ stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre-cpp, snappy, zlib,
+  libyamlcpp, sasl, openssl, libpcap, wiredtiger, Security, python27, libtool, curl
 }:
 
 # Note:
@@ -7,7 +7,8 @@
 
 with stdenv.lib;
 
-let version = "3.4.10";
+let version = "4.0.4";
+    python = python27.withPackages (ps: with ps; [ pyyaml typing cheetah ]);
     system-libraries = [
       "pcre"
       #"asio" -- XXX use package?
@@ -19,6 +20,7 @@ let version = "3.4.10";
       #"stemmer"  -- not nice to package yet (no versioning, no makefile, no shared libs).
       "yaml"
     ] ++ optionals stdenv.isLinux [ "tcmalloc" ];
+    inherit (stdenv.lib) systems subtractLists;
 
 in stdenv.mkDerivation {
   pname = "mongodb";
@@ -26,14 +28,14 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://fastdl.mongodb.org/src/mongodb-src-r${version}.tar.gz";
-    sha256 = "1wz2mhl9z0b1bdkg6m8v8mvw9k60mdv5ybq554xn3yjj9z500f24";
+    sha256 = "1qycwr9f99b5cy4nf54yv2y724xis3lwd2h6iv2pfp36qnhsvfh2";
   };
 
   nativeBuildInputs = [ scons ];
   buildInputs = [
     sasl boost gperftools pcre-cpp snappy
-    zlib libyamlcpp sasl openssl.dev openssl.out libpcap
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
+    zlib libyamlcpp sasl openssl.dev openssl.out libpcap python curl
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security libtool ];
 
   patches =
     [
@@ -41,11 +43,6 @@ in stdenv.mkDerivation {
       # keeping dependencies to build inputs in the final output.
       # We remove the build flags from buildInfo data.
       ./forget-build-dependencies.patch
-      (fetchpatch {
-        url = https://projects.archlinux.org/svntogit/community.git/plain/trunk/boost160.patch?h=packages/mongodb;
-        name = "boost160.patch";
-        sha256 = "0bvsf3499zj55pzamwjmsssr6x63w434944w76273fr5rxwzcmh8";
-      })
     ];
 
   postPatch = ''
@@ -89,6 +86,11 @@ in stdenv.mkDerivation {
   preInstall = ''
     mkdir -p $out/lib
   '';
+
+  postInstall = ''
+    rm $out/bin/install_compass
+  '';
+
   prefixKey = "--prefix=";
 
   enableParallelBuilding = true;
@@ -98,9 +100,10 @@ in stdenv.mkDerivation {
   meta = {
     description = "A scalable, high-performance, open source NoSQL database";
     homepage = http://www.mongodb.org;
-    license = licenses.agpl3;
+    license = licenses.sspl;
+    broken = stdenv.hostPlatform.isAarch64; #g++ has internal compiler errors
 
     maintainers = with maintainers; [ bluescreen303 offline cstrahan ];
-    platforms = platforms.unix;
+    platforms = subtractLists systems.doubles.i686 systems.doubles.unix;
   };
 }
diff --git a/pkgs/servers/nosql/mongodb/forget-build-dependencies.patch b/pkgs/servers/nosql/mongodb/forget-build-dependencies.patch
index ca2c043deb2d..897618cceb12 100644
--- a/pkgs/servers/nosql/mongodb/forget-build-dependencies.patch
+++ b/pkgs/servers/nosql/mongodb/forget-build-dependencies.patch
@@ -1,8 +1,6 @@
---- a/site_scons/mongo_scons_utils.py
-+++ b/site_scons/mongo_scons_utils.py
-@@ -84,14 +84,11 @@
- def default_buildinfo_environment_data():
-     return (
+--- a/site_scons/mongo/generators.py
++++ b/site_scons/mongo/generators.py
+@@ -18,10 +18,7 @@ def default_buildinfo_environment_data():
          ('distmod', '$MONGO_DISTMOD', True, True,),
          ('distarch', '$MONGO_DISTARCH', True, True,),
          ('cc', '$CC_VERSION', True, False,),
@@ -13,5 +11,3 @@
          ('target_arch', '$TARGET_ARCH', True, True,),
          ('target_os', '$TARGET_OS', True, False,),
      )
- 
- # If you want buildInfo and --version to be relatively empty, set

From 97c4dff1583b871605964c165056074f0a502d0b Mon Sep 17 00:00:00 2001
From: Nathan Smyth <nathan.smyth@mongodb.com>
Date: Fri, 31 May 2019 22:14:14 +1000
Subject: [PATCH 4046/4636] mongodb: split packages to expose 3.4, 3.6 and 4.0

---
 .../forget-build-dependencies-3-4.patch       | 17 ++++
 .../mongodb/{default.nix => mongodb.nix}      | 79 +++++++++++--------
 pkgs/servers/nosql/mongodb/v3_4.nix           | 12 +++
 pkgs/servers/nosql/mongodb/v3_6.nix           | 12 +++
 pkgs/servers/nosql/mongodb/v4_0.nix           | 12 +++
 pkgs/top-level/all-packages.nix               | 16 +++-
 6 files changed, 113 insertions(+), 35 deletions(-)
 create mode 100644 pkgs/servers/nosql/mongodb/forget-build-dependencies-3-4.patch
 rename pkgs/servers/nosql/mongodb/{default.nix => mongodb.nix} (63%)
 create mode 100644 pkgs/servers/nosql/mongodb/v3_4.nix
 create mode 100644 pkgs/servers/nosql/mongodb/v3_6.nix
 create mode 100644 pkgs/servers/nosql/mongodb/v4_0.nix

diff --git a/pkgs/servers/nosql/mongodb/forget-build-dependencies-3-4.patch b/pkgs/servers/nosql/mongodb/forget-build-dependencies-3-4.patch
new file mode 100644
index 000000000000..ca2c043deb2d
--- /dev/null
+++ b/pkgs/servers/nosql/mongodb/forget-build-dependencies-3-4.patch
@@ -0,0 +1,17 @@
+--- a/site_scons/mongo_scons_utils.py
++++ b/site_scons/mongo_scons_utils.py
+@@ -84,14 +84,11 @@
+ def default_buildinfo_environment_data():
+     return (
+         ('distmod', '$MONGO_DISTMOD', True, True,),
+         ('distarch', '$MONGO_DISTARCH', True, True,),
+         ('cc', '$CC_VERSION', True, False,),
+-        ('ccflags', '$CCFLAGS', True, False,),
+         ('cxx', '$CXX_VERSION', True, False,),
+-        ('cxxflags', '$CXXFLAGS', True, False,),
+-        ('linkflags', '$LINKFLAGS', True, False,),
+         ('target_arch', '$TARGET_ARCH', True, True,),
+         ('target_os', '$TARGET_OS', True, False,),
+     )
+ 
+ # If you want buildInfo and --version to be relatively empty, set
diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/mongodb.nix
similarity index 63%
rename from pkgs/servers/nosql/mongodb/default.nix
rename to pkgs/servers/nosql/mongodb/mongodb.nix
index 966cebc799e4..fd4869f92aa2 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/mongodb.nix
@@ -1,49 +1,59 @@
-{ stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre-cpp, snappy, zlib,
-  libyamlcpp, sasl, openssl, libpcap, wiredtiger, Security, python27, libtool, curl
-}:
+{ stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre-cpp, snappy, zlib
+, libyamlcpp, sasl, openssl, libpcap, wiredtiger, Security, python27, libtool
+, curl }:
 
 # Note:
 # The command line tools are written in Go as part of a different package (mongodb-tools)
 
 with stdenv.lib;
 
-let version = "4.0.4";
-    python = python27.withPackages (ps: with ps; [ pyyaml typing cheetah ]);
-    system-libraries = [
-      "pcre"
-      #"asio" -- XXX use package?
-      #"wiredtiger"
-      "boost"
-      "snappy"
-      "zlib"
-      #"valgrind" -- mongodb only requires valgrind.h, which is vendored in the source.
-      #"stemmer"  -- not nice to package yet (no versioning, no makefile, no shared libs).
-      "yaml"
-    ] ++ optionals stdenv.isLinux [ "tcmalloc" ];
-    inherit (stdenv.lib) systems subtractLists;
+{ version, sha256, patches ? [ ] }@args:
 
-in stdenv.mkDerivation {
-  pname = "mongodb";
+let
+  python = python27.withPackages (ps: with ps; [ pyyaml typing cheetah ]);
+  system-libraries = [
+    "pcre"
+    #"asio" -- XXX use package?
+    #"wiredtiger"
+    "boost"
+    "snappy"
+    "zlib"
+    #"valgrind" -- mongodb only requires valgrind.h, which is vendored in the source.
+    #"stemmer"  -- not nice to package yet (no versioning, no makefile, no shared libs).
+    "yaml"
+  ] ++ optionals stdenv.isLinux [ "tcmalloc" ];
+  inherit (stdenv.lib) systems subtractLists;
+
+in stdenv.mkDerivation rec {
   inherit version;
+  name = "mongodb-${version}";
 
   src = fetchurl {
     url = "https://fastdl.mongodb.org/src/mongodb-src-r${version}.tar.gz";
-    sha256 = "1qycwr9f99b5cy4nf54yv2y724xis3lwd2h6iv2pfp36qnhsvfh2";
+    inherit sha256;
   };
 
   nativeBuildInputs = [ scons ];
   buildInputs = [
-    sasl boost gperftools pcre-cpp snappy
-    zlib libyamlcpp sasl openssl.dev openssl.out libpcap python curl
+    sasl
+    boost
+    gperftools
+    pcre-cpp
+    snappy
+    zlib
+    libyamlcpp
+    sasl
+    openssl.dev
+    openssl.out
+    libpcap
+    python
+    curl
   ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security libtool ];
 
-  patches =
-    [
-      # MongoDB keeps track of its build parameters, which tricks nix into
-      # keeping dependencies to build inputs in the final output.
-      # We remove the build flags from buildInfo data.
-      ./forget-build-dependencies.patch
-    ];
+  # MongoDB keeps track of its build parameters, which tricks nix into
+  # keeping dependencies to build inputs in the final output.
+  # We remove the build flags from buildInfo data.
+  inherit patches;
 
   postPatch = ''
     # fix environment variable reading
@@ -63,7 +73,8 @@ in stdenv.mkDerivation {
       --replace 'engine("wiredTiger")' 'engine("mmapv1")'
   '';
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang
+    "-Wno-unused-command-line-argument";
 
   sconsFlags = [
     "--release"
@@ -84,11 +95,11 @@ in stdenv.mkDerivation {
   '';
 
   preInstall = ''
-    mkdir -p $out/lib
+    mkdir -p "$out/lib"
   '';
 
   postInstall = ''
-    rm $out/bin/install_compass
+    rm -f "$out/bin/install_compass" || true
   '';
 
   prefixKey = "--prefix=";
@@ -99,9 +110,9 @@ in stdenv.mkDerivation {
 
   meta = {
     description = "A scalable, high-performance, open source NoSQL database";
-    homepage = http://www.mongodb.org;
+    homepage = "http://www.mongodb.org";
     license = licenses.sspl;
-    broken = stdenv.hostPlatform.isAarch64; #g++ has internal compiler errors
+    broken = stdenv.hostPlatform.isAarch64; # g++ has internal compiler errors
 
     maintainers = with maintainers; [ bluescreen303 offline cstrahan ];
     platforms = subtractLists systems.doubles.i686 systems.doubles.unix;
diff --git a/pkgs/servers/nosql/mongodb/v3_4.nix b/pkgs/servers/nosql/mongodb/v3_4.nix
new file mode 100644
index 000000000000..07d27545a583
--- /dev/null
+++ b/pkgs/servers/nosql/mongodb/v3_4.nix
@@ -0,0 +1,12 @@
+{ stdenv, callPackage, lib, sasl, boost, Security }:
+
+let
+  buildMongoDB = callPackage ./mongodb.nix { inherit sasl; inherit boost; inherit Security; };
+in
+  buildMongoDB {
+    version = "3.4.20";
+    sha256 = "15avrhakbspz0q1w5n7dqzjjfkxi7md64a9axl97gfxi4ln7mhz0";
+    patches = [
+      ./forget-build-dependencies-3-4.patch
+    ];
+  }
diff --git a/pkgs/servers/nosql/mongodb/v3_6.nix b/pkgs/servers/nosql/mongodb/v3_6.nix
new file mode 100644
index 000000000000..9000a2b5ed5f
--- /dev/null
+++ b/pkgs/servers/nosql/mongodb/v3_6.nix
@@ -0,0 +1,12 @@
+{ stdenv, callPackage, lib, sasl, boost, Security }:
+
+let
+  buildMongoDB = callPackage ./mongodb.nix { inherit sasl; inherit boost; inherit Security; };
+in
+  buildMongoDB {
+    version = "3.6.12";
+    sha256 = "1fi1ccid4rnfjg6yn3183qrhjqc8hz7jfgdpwp1dy6piw6z85n3l";
+    patches = [
+      ./forget-build-dependencies.patch
+    ];
+  }
diff --git a/pkgs/servers/nosql/mongodb/v4_0.nix b/pkgs/servers/nosql/mongodb/v4_0.nix
new file mode 100644
index 000000000000..75e0cecc573e
--- /dev/null
+++ b/pkgs/servers/nosql/mongodb/v4_0.nix
@@ -0,0 +1,12 @@
+{ stdenv, callPackage, lib, sasl, boost, Security }:
+
+let
+  buildMongoDB = callPackage ./mongodb.nix { inherit sasl; inherit boost; inherit Security; };
+in
+  buildMongoDB {
+    version = "4.0.9";
+    sha256 = "0klm6dl1pr9wq4ghm2jjn3wzs1zpj1aabqjqjfddanxq2an7scph";
+    patches = [
+      ./forget-build-dependencies.patch
+    ];
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bed301ede54a..43d85339cf8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15894,7 +15894,21 @@ in
   };
   mysql = mariadb; # TODO: move to aliases.nix
 
-  mongodb = callPackage ../servers/nosql/mongodb {
+  mongodb = hiPrio mongodb-3_4;
+  
+  mongodb-3_4 = callPackage ../servers/nosql/mongodb/v3_4.nix {
+    sasl = cyrus_sasl;
+    boost = boost160;
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
+  mongodb-3_6 = callPackage ../servers/nosql/mongodb/v3_6.nix {
+    sasl = cyrus_sasl;
+    boost = boost160;
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
+  mongodb-4_0 = callPackage ../servers/nosql/mongodb/v4_0.nix {
     sasl = cyrus_sasl;
     boost = boost160;
     openssl = openssl_1_0_2;

From 165d8bda8265ca9c247d1ab5e1137117c3236e25 Mon Sep 17 00:00:00 2001
From: Nathan Smyth <nathan.smyth@mongodb.com>
Date: Sun, 4 Aug 2019 13:09:49 +1000
Subject: [PATCH 4047/4636] mongodb: 3.4.20 -> 3.4.22, 3.6.12 -> 3.6.13, 4.0.9
 -> 4.0.11

---
 pkgs/servers/nosql/mongodb/mongodb.nix        | 32 ++++++++-----------
 .../mongodb/mozjs-45_fix-3-byte-opcode.patch  | 27 ++++++++++++++++
 pkgs/servers/nosql/mongodb/v3_4.nix           |  8 ++---
 pkgs/servers/nosql/mongodb/v3_6.nix           |  8 ++---
 pkgs/servers/nosql/mongodb/v4_0.nix           |  9 +++---
 pkgs/top-level/all-packages.nix               | 12 ++++---
 6 files changed, 61 insertions(+), 35 deletions(-)
 create mode 100644 pkgs/servers/nosql/mongodb/mozjs-45_fix-3-byte-opcode.patch

diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix
index fd4869f92aa2..3824fc6d1a74 100644
--- a/pkgs/servers/nosql/mongodb/mongodb.nix
+++ b/pkgs/servers/nosql/mongodb/mongodb.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre-cpp, snappy, zlib
-, libyamlcpp, sasl, openssl, libpcap, wiredtiger, Security, python27, libtool
-, curl }:
+{ stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre-cpp, snappy, zlib,
+  libyamlcpp, sasl, openssl, libpcap, wiredtiger, Security, python27, curl, CoreFoundation, cctools
+}:
 
 # Note:
 # The command line tools are written in Go as part of a different package (mongodb-tools)
@@ -35,20 +35,9 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ scons ];
   buildInputs = [
-    sasl
-    boost
-    gperftools
-    pcre-cpp
-    snappy
-    zlib
-    libyamlcpp
-    sasl
-    openssl.dev
-    openssl.out
-    libpcap
-    python
-    curl
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security libtool ];
+    sasl boost gperftools pcre-cpp snappy
+    zlib libyamlcpp sasl openssl.dev openssl.out libpcap python curl
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security CoreFoundation cctools ];
 
   # MongoDB keeps track of its build parameters, which tricks nix into
   # keeping dependencies to build inputs in the final output.
@@ -60,6 +49,9 @@ in stdenv.mkDerivation rec {
     substituteInPlace SConstruct \
         --replace "env = Environment(" "env = Environment(ENV = os.environ,"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace src/third_party/asio-master/asio/include/asio/detail/config.hpp --replace ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW ASIO_HAS_STD_STRING_VIEW
+
+    substituteInPlace src/third_party/mozjs-45/extract/js/src/jsmath.cpp --replace 'defined(HAVE_SINCOS)' 0
 
     substituteInPlace src/third_party/s2/s1angle.cc --replace drem remainder
     substituteInPlace src/third_party/s2/s1interval.cc --replace drem remainder
@@ -80,7 +72,7 @@ in stdenv.mkDerivation rec {
     "--release"
     "--ssl"
     #"--rocksdb" # Don't have this packaged yet
-    "--wiredtiger=${if stdenv.is64bit then "on" else "off"}"
+    "--wiredtiger=on"
     "--js-engine=mozjs"
     "--use-sasl-client"
     "--disable-warnings-as-errors"
@@ -92,6 +84,10 @@ in stdenv.mkDerivation rec {
     sconsFlags+=" CXX=$CXX"
   '' + optionalString stdenv.isAarch64 ''
     sconsFlags+=" CCFLAGS='-march=armv8-a+crc'"
+  '' + optionalString stdenv.isDarwin ''
+    sconsFlags+=" CPPPATH=${openssl.dev}/include"
+  '' + optionalString stdenv.isDarwin ''
+    sconsFlags+=" LIBPATH=${openssl.out}/lib"
   '';
 
   preInstall = ''
diff --git a/pkgs/servers/nosql/mongodb/mozjs-45_fix-3-byte-opcode.patch b/pkgs/servers/nosql/mongodb/mozjs-45_fix-3-byte-opcode.patch
new file mode 100644
index 000000000000..8c60cdd1e688
--- /dev/null
+++ b/pkgs/servers/nosql/mongodb/mozjs-45_fix-3-byte-opcode.patch
@@ -0,0 +1,27 @@
+# HG changeset patch
+# User Dan Gohman <sunfish@mozilla.com>
+# Parent  d9b405d82cffb07343a5f2fd941e029298c7f6c4
+# Bug 1390214 - IonMonkey: Don't test for a 3-byte opcode in a 2-byte opcode predicate.
+# https://bug1390214.bmoattachments.org/attachment.cgi?id=8902972
+
+diff --git a/src/third_party/mozjs-45/extract/js/src/jit/x86-shared/Encoding-x86-shared.h b/src/third_party/mozjs-45/extract/js/src/jit/x86-shared/Encoding-x86-shared.h
+--- a/src/third_party/mozjs-45/extract/js/src/jit/x86-shared/Encoding-x86-shared.h
++++ b/src/third_party/mozjs-45/extract/js/src/jit/x86-shared/Encoding-x86-shared.h
+@@ -310,17 +310,16 @@ enum ThreeByteOpcodeID {
+ 
+ // Test whether the given opcode should be printed with its operands reversed.
+ inline bool IsXMMReversedOperands(TwoByteOpcodeID opcode)
+ {
+     switch (opcode) {
+       case OP2_MOVSD_WsdVsd: // also OP2_MOVPS_WpsVps
+       case OP2_MOVAPS_WsdVsd:
+       case OP2_MOVDQ_WdqVdq:
+-      case OP3_PEXTRD_EdVdqIb:
+         return true;
+       default:
+         break;
+     }
+     return false;
+ }
+ 
+ enum ThreeByteEscape {
diff --git a/pkgs/servers/nosql/mongodb/v3_4.nix b/pkgs/servers/nosql/mongodb/v3_4.nix
index 07d27545a583..fb124a6b2e5b 100644
--- a/pkgs/servers/nosql/mongodb/v3_4.nix
+++ b/pkgs/servers/nosql/mongodb/v3_4.nix
@@ -1,11 +1,11 @@
-{ stdenv, callPackage, lib, sasl, boost, Security }:
+{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }:
 
 let
-  buildMongoDB = callPackage ./mongodb.nix { inherit sasl; inherit boost; inherit Security; };
+  buildMongoDB = callPackage ./mongodb.nix { inherit sasl; inherit boost; inherit Security; inherit CoreFoundation; inherit cctools; };
 in
   buildMongoDB {
-    version = "3.4.20";
-    sha256 = "15avrhakbspz0q1w5n7dqzjjfkxi7md64a9axl97gfxi4ln7mhz0";
+    version = "3.4.22";
+    sha256 = "1rizrr69b26y7fb973n52hk387sf3mxzqg8wka4f3zdjdidfyiny";
     patches = [
       ./forget-build-dependencies-3-4.patch
     ];
diff --git a/pkgs/servers/nosql/mongodb/v3_6.nix b/pkgs/servers/nosql/mongodb/v3_6.nix
index 9000a2b5ed5f..412d72b4e668 100644
--- a/pkgs/servers/nosql/mongodb/v3_6.nix
+++ b/pkgs/servers/nosql/mongodb/v3_6.nix
@@ -1,11 +1,11 @@
-{ stdenv, callPackage, lib, sasl, boost, Security }:
+{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }:
 
 let
-  buildMongoDB = callPackage ./mongodb.nix { inherit sasl; inherit boost; inherit Security; };
+  buildMongoDB = callPackage ./mongodb.nix { inherit sasl; inherit boost; inherit Security; inherit CoreFoundation; inherit cctools; };
 in
   buildMongoDB {
-    version = "3.6.12";
-    sha256 = "1fi1ccid4rnfjg6yn3183qrhjqc8hz7jfgdpwp1dy6piw6z85n3l";
+    version = "3.6.13";
+    sha256 = "1mbvk4bmabrswjdm01jssxcygjpq5799zqyx901nsi12vlcymwg4";
     patches = [
       ./forget-build-dependencies.patch
     ];
diff --git a/pkgs/servers/nosql/mongodb/v4_0.nix b/pkgs/servers/nosql/mongodb/v4_0.nix
index 75e0cecc573e..819d41cd17ee 100644
--- a/pkgs/servers/nosql/mongodb/v4_0.nix
+++ b/pkgs/servers/nosql/mongodb/v4_0.nix
@@ -1,12 +1,13 @@
-{ stdenv, callPackage, lib, sasl, boost, Security }:
+{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }:
 
 let
-  buildMongoDB = callPackage ./mongodb.nix { inherit sasl; inherit boost; inherit Security; };
+  buildMongoDB = callPackage ./mongodb.nix { inherit sasl; inherit boost; inherit Security; inherit CoreFoundation; inherit cctools; };
 in
   buildMongoDB {
-    version = "4.0.9";
-    sha256 = "0klm6dl1pr9wq4ghm2jjn3wzs1zpj1aabqjqjfddanxq2an7scph";
+    version = "4.0.11";
+    sha256 = "0kry8kzzpah0l7j8xa333y1ixwvarc28ip3f6lx5590yy11j8ry2";
     patches = [
       ./forget-build-dependencies.patch
+      ./mozjs-45_fix-3-byte-opcode.patch
     ];
   }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43d85339cf8d..af291b6301ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15899,20 +15899,22 @@ in
   mongodb-3_4 = callPackage ../servers/nosql/mongodb/v3_4.nix {
     sasl = cyrus_sasl;
     boost = boost160;
-    inherit (darwin.apple_sdk.frameworks) Security;
+    inherit (darwin) cctools;
+    inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
   };
 
   mongodb-3_6 = callPackage ../servers/nosql/mongodb/v3_6.nix {
     sasl = cyrus_sasl;
     boost = boost160;
-    inherit (darwin.apple_sdk.frameworks) Security;
+    inherit (darwin) cctools;
+    inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
   };
 
   mongodb-4_0 = callPackage ../servers/nosql/mongodb/v4_0.nix {
     sasl = cyrus_sasl;
-    boost = boost160;
-    openssl = openssl_1_0_2;
-    inherit (darwin.apple_sdk.frameworks) Security;
+    boost = boost169;
+    inherit (darwin) cctools;
+    inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
   };
 
   nginx-sso = callPackage ../servers/nginx-sso { };

From 44641ed00bf3b1d5914a685137f16910f6454951 Mon Sep 17 00:00:00 2001
From: Nathan Smyth <nathan.smyth@mongodb.com>
Date: Sun, 4 Aug 2019 16:25:56 +1000
Subject: [PATCH 4048/4636] nixos/tests/mongodb: test against mongodb versions
 3.4, 3.6, 4.0

Now has tests for 3.4, 3.6, 4.0. Has some duplication, but it appears to
work on my machine.
---
 nixos/tests/mongodb.nix                | 74 +++++++++++++-------------
 pkgs/servers/nosql/mongodb/mongodb.nix | 37 +++++++------
 pkgs/servers/nosql/mongodb/v3_4.nix    | 21 ++++----
 pkgs/servers/nosql/mongodb/v3_6.nix    | 21 ++++----
 pkgs/servers/nosql/mongodb/v4_0.nix    | 23 ++++----
 5 files changed, 95 insertions(+), 81 deletions(-)

diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix
index 9ebf84eed232..dfb23ce6c0db 100644
--- a/nixos/tests/mongodb.nix
+++ b/nixos/tests/mongodb.nix
@@ -1,42 +1,42 @@
 # This test start mongodb, runs a query using mongo shell
 
-import ./make-test-python.nix ({ pkgs, ...} : let
-  testQuery = pkgs.writeScript "nixtest.js" ''
-    db.greetings.insert({ "greeting": "hello" });
-    print(db.greetings.findOne().greeting);
-  '';
-in {
-  name = "mongodb";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ bluescreen303 offline cstrahan rvl phile314 ];
-  };
+import ./make-test.nix ({ pkgs, ... }:
+  let
+    testQuery = pkgs.writeScript "nixtest.js" ''
+      db.greetings.insert({ "greeting": "hello" });
+      print(db.greetings.findOne().greeting);
+    '';
 
-  nodes = {
-    one =
-      { ... }:
-        {
-          services = {
-           mongodb.enable = true;
-           mongodb.enableAuth = true;
-           mongodb.initialRootPassword = "root";
-           mongodb.initialScript = pkgs.writeText "mongodb_initial.js" ''
-             db = db.getSiblingDB("nixtest");
-             db.createUser({user:"nixtest",pwd:"nixtest",roles:[{role:"readWrite",db:"nixtest"}]});
-           '';
-           mongodb.extraConfig = ''
-             # Allow starting engine with only a small virtual disk
-             storage.journal.enabled: false
-             storage.mmapv1.smallFiles: true
-           '';
-          };
-        };
+    runMongoDBTest = pkg: ''
+      $node->execute("(rm -rf data || true) && mkdir data");
+      $node->execute("${pkg}/bin/mongod --fork --logpath logs --dbpath data");
+      $node->waitForOpenPort(27017);
+
+      $node->succeed("mongo ${testQuery}") =~ /hello/ or die;
+
+      $node->execute("${pkg}/bin/mongod --shutdown --dbpath data");
+      $node->waitForClosedPort(27017);
+    '';
+
+  in {
+    name = "mongodb";
+    meta = with pkgs.stdenv.lib.maintainers; {
+      maintainers = [ bluescreen303 offline cstrahan rvl phile314 ];
     };
 
-  testScript = ''
-    start_all()
-    one.wait_for_unit("mongodb.service")
-    one.succeed(
-        "mongo -u nixtest -p nixtest nixtest ${testQuery} | grep -q hello"
-    )
-  '';
-})
+    nodes = {
+      node = {...}: {
+        environment.systemPackages = with pkgs; [
+#          mongodb-3_4
+          mongodb-3_6
+          mongodb-4_0
+        ];
+      };
+    };
+
+    testScript = "$node->start;" 
+#      + runMongoDBTest pkgs.mongodb-3_4
+      + runMongoDBTest pkgs.mongodb-3_6 
+      + runMongoDBTest pkgs.mongodb-4_0
+      + "$node->shutdown;";
+  })
diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix
index 3824fc6d1a74..da4b46a69da5 100644
--- a/pkgs/servers/nosql/mongodb/mongodb.nix
+++ b/pkgs/servers/nosql/mongodb/mongodb.nix
@@ -1,26 +1,25 @@
-{ stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre-cpp, snappy, zlib,
-  libyamlcpp, sasl, openssl, libpcap, wiredtiger, Security, python27, curl, CoreFoundation, cctools
-}:
+{ stdenv, fetchurl, scons, boost, gperftools, pcre-cpp, snappy, zlib, libyamlcpp
+, sasl, openssl, libpcap, python27, curl, Security, CoreFoundation, cctools }:
 
 # Note:
 # The command line tools are written in Go as part of a different package (mongodb-tools)
 
 with stdenv.lib;
 
-{ version, sha256, patches ? [ ] }@args:
+{ version, sha256, patches ? [] }@args:
 
 let
   python = python27.withPackages (ps: with ps; [ pyyaml typing cheetah ]);
   system-libraries = [
-    "pcre"
-    #"asio" -- XXX use package?
-    #"wiredtiger"
     "boost"
+    "pcre"
     "snappy"
-    "zlib"
-    #"valgrind" -- mongodb only requires valgrind.h, which is vendored in the source.
-    #"stemmer"  -- not nice to package yet (no versioning, no makefile, no shared libs).
     "yaml"
+    "zlib"
+    #"asio" -- XXX use package?
+    #"stemmer"  -- not nice to package yet (no versioning, no makefile, no shared libs).
+    #"valgrind" -- mongodb only requires valgrind.h, which is vendored in the source.
+    #"wiredtiger"
   ] ++ optionals stdenv.isLinux [ "tcmalloc" ];
   inherit (stdenv.lib) systems subtractLists;
 
@@ -35,8 +34,18 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ scons ];
   buildInputs = [
-    sasl boost gperftools pcre-cpp snappy
-    zlib libyamlcpp sasl openssl.dev openssl.out libpcap python curl
+    boost
+    curl
+    gperftools
+    libpcap
+    libyamlcpp
+    openssl.dev
+    openssl.out
+    pcre-cpp
+    python
+    sasl
+    snappy
+    zlib
   ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security CoreFoundation cctools ];
 
   # MongoDB keeps track of its build parameters, which tricks nix into
@@ -84,10 +93,6 @@ in stdenv.mkDerivation rec {
     sconsFlags+=" CXX=$CXX"
   '' + optionalString stdenv.isAarch64 ''
     sconsFlags+=" CCFLAGS='-march=armv8-a+crc'"
-  '' + optionalString stdenv.isDarwin ''
-    sconsFlags+=" CPPPATH=${openssl.dev}/include"
-  '' + optionalString stdenv.isDarwin ''
-    sconsFlags+=" LIBPATH=${openssl.out}/lib"
   '';
 
   preInstall = ''
diff --git a/pkgs/servers/nosql/mongodb/v3_4.nix b/pkgs/servers/nosql/mongodb/v3_4.nix
index fb124a6b2e5b..113fa0680c3b 100644
--- a/pkgs/servers/nosql/mongodb/v3_4.nix
+++ b/pkgs/servers/nosql/mongodb/v3_4.nix
@@ -1,12 +1,15 @@
 { stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }:
 
 let
-  buildMongoDB = callPackage ./mongodb.nix { inherit sasl; inherit boost; inherit Security; inherit CoreFoundation; inherit cctools; };
-in
-  buildMongoDB {
-    version = "3.4.22";
-    sha256 = "1rizrr69b26y7fb973n52hk387sf3mxzqg8wka4f3zdjdidfyiny";
-    patches = [
-      ./forget-build-dependencies-3-4.patch
-    ];
-  }
+  buildMongoDB = callPackage ./mongodb.nix {
+    inherit sasl;
+    inherit boost;
+    inherit Security;
+    inherit CoreFoundation;
+    inherit cctools;
+  };
+in buildMongoDB {
+  version = "3.4.22";
+  sha256 = "1rizrr69b26y7fb973n52hk387sf3mxzqg8wka4f3zdjdidfyiny";
+  patches = [ ./forget-build-dependencies-3-4.patch ];
+}
diff --git a/pkgs/servers/nosql/mongodb/v3_6.nix b/pkgs/servers/nosql/mongodb/v3_6.nix
index 412d72b4e668..8da901c00c53 100644
--- a/pkgs/servers/nosql/mongodb/v3_6.nix
+++ b/pkgs/servers/nosql/mongodb/v3_6.nix
@@ -1,12 +1,15 @@
 { stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }:
 
 let
-  buildMongoDB = callPackage ./mongodb.nix { inherit sasl; inherit boost; inherit Security; inherit CoreFoundation; inherit cctools; };
-in
-  buildMongoDB {
-    version = "3.6.13";
-    sha256 = "1mbvk4bmabrswjdm01jssxcygjpq5799zqyx901nsi12vlcymwg4";
-    patches = [
-      ./forget-build-dependencies.patch
-    ];
-  }
+  buildMongoDB = callPackage ./mongodb.nix {
+    inherit sasl;
+    inherit boost;
+    inherit Security;
+    inherit CoreFoundation;
+    inherit cctools;
+  };
+in buildMongoDB {
+  version = "3.6.13";
+  sha256 = "1mbvk4bmabrswjdm01jssxcygjpq5799zqyx901nsi12vlcymwg4";
+  patches = [ ./forget-build-dependencies.patch ];
+}
diff --git a/pkgs/servers/nosql/mongodb/v4_0.nix b/pkgs/servers/nosql/mongodb/v4_0.nix
index 819d41cd17ee..95606317f319 100644
--- a/pkgs/servers/nosql/mongodb/v4_0.nix
+++ b/pkgs/servers/nosql/mongodb/v4_0.nix
@@ -1,13 +1,16 @@
 { stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }:
 
 let
-  buildMongoDB = callPackage ./mongodb.nix { inherit sasl; inherit boost; inherit Security; inherit CoreFoundation; inherit cctools; };
-in
-  buildMongoDB {
-    version = "4.0.11";
-    sha256 = "0kry8kzzpah0l7j8xa333y1ixwvarc28ip3f6lx5590yy11j8ry2";
-    patches = [
-      ./forget-build-dependencies.patch
-      ./mozjs-45_fix-3-byte-opcode.patch
-    ];
-  }
+  buildMongoDB = callPackage ./mongodb.nix {
+    inherit sasl;
+    inherit boost;
+    inherit Security;
+    inherit CoreFoundation;
+    inherit cctools;
+  };
+in buildMongoDB {
+  version = "4.0.11";
+  sha256 = "0kry8kzzpah0l7j8xa333y1ixwvarc28ip3f6lx5590yy11j8ry2";
+  patches =
+    [ ./forget-build-dependencies.patch ./mozjs-45_fix-3-byte-opcode.patch ];
+}

From de69821b541a6143c7b5d31afe463ab3c2cf918b Mon Sep 17 00:00:00 2001
From: Nathan Smyth <nathan.smyth@mongodb.com>
Date: Wed, 21 Aug 2019 19:33:51 +1000
Subject: [PATCH 4049/4636] mongodb-4_0: 4.0.11 -> 4.0.12

---
 .../asio-no-experimental-string-view.patch    | 20 +++++++++++++++++++
 pkgs/servers/nosql/mongodb/mongodb.nix        |  2 --
 pkgs/servers/nosql/mongodb/v3_6.nix           |  3 ++-
 pkgs/servers/nosql/mongodb/v4_0.nix           |  7 ++++---
 4 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/servers/nosql/mongodb/asio-no-experimental-string-view.patch

diff --git a/pkgs/servers/nosql/mongodb/asio-no-experimental-string-view.patch b/pkgs/servers/nosql/mongodb/asio-no-experimental-string-view.patch
new file mode 100644
index 000000000000..eb5db1818fe0
--- /dev/null
+++ b/pkgs/servers/nosql/mongodb/asio-no-experimental-string-view.patch
@@ -0,0 +1,20 @@
+diff --git a/src/third_party/asio-master/asio/include/asio/detail/config.hpp b/src/third_party/asio-master/asio/include/asio/detail/config.hpp
+index 7fe6a95a..ff4cc56b 100644
+--- a/src/third_party/asio-master/asio/include/asio/detail/config.hpp
++++ b/src/third_party/asio-master/asio/include/asio/detail/config.hpp
+@@ -786,7 +786,6 @@
+ #   if (__cplusplus >= 201402)
+ #    if __has_include(<experimental/string_view>)
+ #     define ASIO_HAS_STD_STRING_VIEW 1
+-#     define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
+ #    endif // __has_include(<experimental/string_view>)
+ #   endif // (__cplusplus >= 201402)
+ #  endif // defined(__clang__)
+@@ -794,7 +793,6 @@
+ #   if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4)
+ #    if (__cplusplus >= 201402)
+ #     define ASIO_HAS_STD_STRING_VIEW 1
+-#     define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
+ #    endif // (__cplusplus >= 201402)
+ #   endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4)
+ #  endif // defined(__GNUC__)
diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix
index da4b46a69da5..3f5aeb4d7da8 100644
--- a/pkgs/servers/nosql/mongodb/mongodb.nix
+++ b/pkgs/servers/nosql/mongodb/mongodb.nix
@@ -58,8 +58,6 @@ in stdenv.mkDerivation rec {
     substituteInPlace SConstruct \
         --replace "env = Environment(" "env = Environment(ENV = os.environ,"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    substituteInPlace src/third_party/asio-master/asio/include/asio/detail/config.hpp --replace ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW ASIO_HAS_STD_STRING_VIEW
-
     substituteInPlace src/third_party/mozjs-45/extract/js/src/jsmath.cpp --replace 'defined(HAVE_SINCOS)' 0
 
     substituteInPlace src/third_party/s2/s1angle.cc --replace drem remainder
diff --git a/pkgs/servers/nosql/mongodb/v3_6.nix b/pkgs/servers/nosql/mongodb/v3_6.nix
index 8da901c00c53..68f83631c801 100644
--- a/pkgs/servers/nosql/mongodb/v3_6.nix
+++ b/pkgs/servers/nosql/mongodb/v3_6.nix
@@ -11,5 +11,6 @@ let
 in buildMongoDB {
   version = "3.6.13";
   sha256 = "1mbvk4bmabrswjdm01jssxcygjpq5799zqyx901nsi12vlcymwg4";
-  patches = [ ./forget-build-dependencies.patch ];
+  patches = [ ./forget-build-dependencies.patch ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ];
 }
diff --git a/pkgs/servers/nosql/mongodb/v4_0.nix b/pkgs/servers/nosql/mongodb/v4_0.nix
index 95606317f319..51ce1e25062d 100644
--- a/pkgs/servers/nosql/mongodb/v4_0.nix
+++ b/pkgs/servers/nosql/mongodb/v4_0.nix
@@ -9,8 +9,9 @@ let
     inherit cctools;
   };
 in buildMongoDB {
-  version = "4.0.11";
-  sha256 = "0kry8kzzpah0l7j8xa333y1ixwvarc28ip3f6lx5590yy11j8ry2";
+  version = "4.0.12";
+  sha256 = "1j8dqa4jr623y87jrdanyib9r7x18srrvdx952q4azcc8zrdwci1";
   patches =
-    [ ./forget-build-dependencies.patch ./mozjs-45_fix-3-byte-opcode.patch ];
+    [ ./forget-build-dependencies.patch ./mozjs-45_fix-3-byte-opcode.patch ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ];
 }

From c2eee6ecdbd7c09bd70cf69c136f695b83d93213 Mon Sep 17 00:00:00 2001
From: Thibault Gagnaux <thibault@gagnaux.ch>
Date: Tue, 25 Feb 2020 15:11:53 +0100
Subject: [PATCH 4050/4636] mongodb: 3.4.22 -> 3.4.24 & fix ssl

Reverts previous ssl fix commit and updates the mongodb version which fixes the ssl compile problem on darwin.
---
 pkgs/servers/nosql/mongodb/mongodb.nix | 3 +--
 pkgs/servers/nosql/mongodb/v3_4.nix    | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix
index 3f5aeb4d7da8..e83a79184a36 100644
--- a/pkgs/servers/nosql/mongodb/mongodb.nix
+++ b/pkgs/servers/nosql/mongodb/mongodb.nix
@@ -39,8 +39,7 @@ in stdenv.mkDerivation rec {
     gperftools
     libpcap
     libyamlcpp
-    openssl.dev
-    openssl.out
+    openssl
     pcre-cpp
     python
     sasl
diff --git a/pkgs/servers/nosql/mongodb/v3_4.nix b/pkgs/servers/nosql/mongodb/v3_4.nix
index 113fa0680c3b..2f02ae7f72ad 100644
--- a/pkgs/servers/nosql/mongodb/v3_4.nix
+++ b/pkgs/servers/nosql/mongodb/v3_4.nix
@@ -9,7 +9,7 @@ let
     inherit cctools;
   };
 in buildMongoDB {
-  version = "3.4.22";
-  sha256 = "1rizrr69b26y7fb973n52hk387sf3mxzqg8wka4f3zdjdidfyiny";
+  version = "3.4.24";
+  sha256 = "0j6mvgv0jnsnvgkl8505bl88kbxkba66qijlpi1la0dd5pd1imfr";
   patches = [ ./forget-build-dependencies-3-4.patch ];
 }

From 80e6da7bd399fe62b461c8e5f6a4756753af9707 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 23 Mar 2020 23:33:27 +0100
Subject: [PATCH 4051/4636] mongodb: builds on aarch64 as well

---
 pkgs/servers/nosql/mongodb/mongodb.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix
index e83a79184a36..b4b6334c13f5 100644
--- a/pkgs/servers/nosql/mongodb/mongodb.nix
+++ b/pkgs/servers/nosql/mongodb/mongodb.nix
@@ -110,7 +110,6 @@ in stdenv.mkDerivation rec {
     description = "A scalable, high-performance, open source NoSQL database";
     homepage = "http://www.mongodb.org";
     license = licenses.sspl;
-    broken = stdenv.hostPlatform.isAarch64; # g++ has internal compiler errors
 
     maintainers = with maintainers; [ bluescreen303 offline cstrahan ];
     platforms = subtractLists systems.doubles.i686 systems.doubles.unix;

From 2934f0464161d01aebb347080d5ccb05bd03200d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 26 Mar 2020 13:46:22 +0100
Subject: [PATCH 4052/4636] nixos/tests/mongodb: rewrite with python

perl-based VM tests are deprecated.
---
 nixos/tests/mongodb.nix | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix
index dfb23ce6c0db..ee7fc50f7ecc 100644
--- a/nixos/tests/mongodb.nix
+++ b/nixos/tests/mongodb.nix
@@ -1,6 +1,6 @@
 # This test start mongodb, runs a query using mongo shell
 
-import ./make-test.nix ({ pkgs, ... }:
+import ./make-test-python.nix ({ pkgs, ... }:
   let
     testQuery = pkgs.writeScript "nixtest.js" ''
       db.greetings.insert({ "greeting": "hello" });
@@ -8,14 +8,20 @@ import ./make-test.nix ({ pkgs, ... }:
     '';
 
     runMongoDBTest = pkg: ''
-      $node->execute("(rm -rf data || true) && mkdir data");
-      $node->execute("${pkg}/bin/mongod --fork --logpath logs --dbpath data");
-      $node->waitForOpenPort(27017);
+      node.execute("(rm -rf data || true) && mkdir data")
+      node.execute(
+          "${pkg}/bin/mongod --fork --logpath logs --dbpath data"
+      )
+      node.wait_for_open_port(27017)
 
-      $node->succeed("mongo ${testQuery}") =~ /hello/ or die;
+      assert "hello" in node.succeed(
+          "mongo ${testQuery}"
+      )
 
-      $node->execute("${pkg}/bin/mongod --shutdown --dbpath data");
-      $node->waitForClosedPort(27017);
+      node.execute(
+          "${pkg}/bin/mongod --shutdown --dbpath data"
+      )
+      node.wait_for_closed_port(27017)
     '';
 
   in {
@@ -34,9 +40,13 @@ import ./make-test.nix ({ pkgs, ... }:
       };
     };
 
-    testScript = "$node->start;" 
+    testScript = ''
+      node.start()
+    ''
 #      + runMongoDBTest pkgs.mongodb-3_4
       + runMongoDBTest pkgs.mongodb-3_6 
       + runMongoDBTest pkgs.mongodb-4_0
-      + "$node->shutdown;";
+      + ''
+        node.shutdown()
+      '';
   })

From b65ff5d455724d58cf761c854e4c453aa60ff1d8 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 26 Mar 2020 14:04:42 +0100
Subject: [PATCH 4053/4636] nixos/release-notes: mention mongodb update

---
 nixos/doc/manual/release-notes/rl-2003.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index 02d05dec0a2b..7674b0a5c0de 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -825,6 +825,11 @@ auth required pam_succeed_if.so uid >= 1000 quiet
     not <command>systemd-networkd</command>.
    </para>
   </listitem>
+  <listitem>
+   <para>
+    <package>mongodb</package> has been updated to version <literal>3.4.24</literal>.
+   </para>
+  </listitem>
   </itemizedlist>
  </section>
 </section>

From b3ef282fd5c37d98b550e04c596136db8a9e978b Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 26 Mar 2020 10:37:25 -0400
Subject: [PATCH 4054/4636] nixos/rygel: link rygel.conf

Fixes https://github.com/NixOS/nixpkgs/issues/83108.
In the future we should make this configurable.
---
 nixos/modules/services/desktops/gnome3/rygel.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/desktops/gnome3/rygel.nix b/nixos/modules/services/desktops/gnome3/rygel.nix
index 55d5e703aa19..b6c44590a2e7 100644
--- a/nixos/modules/services/desktops/gnome3/rygel.nix
+++ b/nixos/modules/services/desktops/gnome3/rygel.nix
@@ -26,5 +26,7 @@ with lib;
     services.dbus.packages = [ pkgs.gnome3.rygel ];
 
     systemd.packages = [ pkgs.gnome3.rygel ];
+
+    environment.etc."rygel.conf" = "${pkgs.gnome3.rygel}/etc/rygel.conf";
   };
 }

From 73f651035984f73a223f5e17dda0708eed80863b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Mar 2020 16:41:52 +0000
Subject: [PATCH 4055/4636] bibutils: 6.8 -> 6.10

---
 pkgs/tools/misc/bibutils/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix
index d099a8aba9b0..bd744bcfb6fb 100644
--- a/pkgs/tools/misc/bibutils/default.nix
+++ b/pkgs/tools/misc/bibutils/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bibutils";
-  version = "6.8";
+  version = "6.10";
 
   src = fetchurl {
     url = "mirror://sourceforge/bibutils/bibutils_${version}_src.tgz";
-    sha256 = "1n28fjrl7zxjxvcqzmrc9xj8ly6nkxviimxbzamj8dslnkzpzqw1";
+    sha256 = "15p4av74ihsg03j854dkdqihpspwnp58p9g1lhx48w8kz91c0ml6";
   };
 
   configureFlags = [ "--dynamic" "--install-dir" "$(out)/bin" "--install-lib" "$(out)/lib" ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Bibliography format interconversion";
     longDescription = "The bibutils program set interconverts between various bibliography formats using a common MODS-format XML intermediate. For example, one can convert RIS-format files to Bibtex by doing two transformations: RIS->MODS->Bibtex. By using a common intermediate for N formats, only 2N programs are required and not N²-N. These programs operate on the command line and are styled after standard UNIX-like filters.";
-    homepage = https://sourceforge.net/p/bibutils/home/Bibutils/;
+    homepage = "https://sourceforge.net/p/bibutils/home/Bibutils/";
     license = licenses.gpl2;
     maintainers = [ maintainers.garrison ];
     platforms = platforms.linux;

From 59c58f3360b51d1e0fbf1251a2875a16edfb6ac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 26 Mar 2020 17:46:50 +0100
Subject: [PATCH 4056/4636] ghc: 8.10.0.20200123 -> 8.10.1

---
 pkgs/development/compilers/ghc/8.10.1.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix
index bd67fae158af..dba715285b1e 100644
--- a/pkgs/development/compilers/ghc/8.10.1.nix
+++ b/pkgs/development/compilers/ghc/8.10.1.nix
@@ -88,12 +88,12 @@ let
 
 in
 stdenv.mkDerivation (rec {
-  version = "8.10.0.20200123";
+  version = "8.10.1";
   name = "${targetPrefix}ghc-${version}";
 
   src = fetchurl {
-    url = "https://downloads.haskell.org/ghc/8.10.1-rc1/ghc-${version}-src.tar.xz";
-    sha256 = "162s5g33s918i12qfcqdj5wanc10xg07g5lq3gpm5j7c1v0y1zrf";
+    url = "https://downloads.haskell.org/ghc/8.10.1/ghc-${version}-src.tar.xz";
+    sha256 = "1xgdl6ig5jzli3bg054vfryfkg0y6wggf68g66c32sr67bw0ffsf";
   };
 
   enableParallelBuilding = true;

From ebb6e385eac53f74963c95ac25cc22b16d161177 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 26 Mar 2020 01:17:32 +0100
Subject: [PATCH 4057/4636] Revert "nixos-container: use systemd-run instead of
 nsenter"

This reverts commit 7cb100b6833e020d4a4b25c3766cfde507e763e6.

See also #83432.

This appears to break at least the `container`-backend of `nixops`: when
running `switch-to-configuration` within `nixos-container run`, the
running `systemd`-instance gets reloaded which appears to kill the
`systemd-run` command and causes `nixos-container run` to hang.

The full issue is reported in the original PR[1].

[1] https://github.com/NixOS/nixpkgs/pull/67332#issuecomment-604145869

(cherry picked from commit 7f1ba606ac632c50efd33c435aa59e69d4f58acc)
---
 .../virtualization/nixos-container/nixos-container.pl     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
index 6e38942cb253..dc05c974bd03 100755
--- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl
+++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
@@ -9,6 +9,7 @@ use Getopt::Long qw(:config gnu_getopt);
 use Cwd 'abs_path';
 use Time::HiRes;
 
+my $nsenter = "@utillinux@/bin/nsenter";
 my $su = "@su@";
 
 # Ensure a consistent umask.
@@ -319,10 +320,9 @@ sub restartContainer {
 # Run a command in the container.
 sub runInContainer {
     my @args = @_;
-
-    exec("systemd-run", "--machine", $containerName, "--pty", "--quiet", "--", @args);
-
-    die "cannot run ‘systemd-run’: $!\n";
+    my $leader = getLeader;
+    exec($nsenter, "-t", $leader, "-m", "-u", "-i", "-n", "-p", "--", @args);
+    die "cannot run ‘nsenter’: $!\n";
 }
 
 # Remove a directory while recursively unmounting all mounted filesystems within

From 41e1594f460ec3c22df7530d1b58602290559626 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Thu, 26 Mar 2020 02:26:15 -0700
Subject: [PATCH 4058/4636] python3Packages.argcomplete: 1.10.3 -> 1.11.1

---
 .../python-modules/argcomplete/default.nix    | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix
index 6f978778f7da..b34b878a839c 100644
--- a/pkgs/development/python-modules/argcomplete/default.nix
+++ b/pkgs/development/python-modules/argcomplete/default.nix
@@ -1,25 +1,37 @@
-{ buildPythonPackage, fetchPypi, lib,
-  dicttoxml, pexpect, prettytable, requests_toolbelt
+{ buildPythonPackage, fetchPypi, lib
+, dicttoxml
+, importlib-metadata
+, pexpect
+, prettytable
+, requests_toolbelt
 }:
 buildPythonPackage rec {
   pname = "argcomplete";
-  version = "1.10.3";
+  version = "1.11.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a37f522cf3b6a34abddfedb61c4546f60023b3799b22d1cd971eacdc0861530a";
+    sha256 = "0h1przxffrhqvi46k40pzjsvdrq4zc3sl1pc96kkigqppq0vdrss";
   };
 
-  doCheck = false; # bash-completion test fails with "compgen: command not found".
+  doCheck = false; # meant to be ran with interactive interpreter
 
   # re-enable if we are able to make testing work
-  # buildInputs = [ coverage flake8 ];
+  # checkInputs = [ bashInteractive coverage flake8 ];
 
-  propagatedBuildInputs = [ dicttoxml pexpect prettytable requests_toolbelt ];
+  propagatedBuildInputs = [
+    dicttoxml
+    importlib-metadata
+    pexpect
+    prettytable
+    requests_toolbelt
+  ];
+
+  pythonImportsCheck = [ "argcomplete" ];
 
   meta = with lib; {
     description = "Bash tab completion for argparse";
-    homepage = https://argcomplete.readthedocs.io;
+    homepage = "https://kislyuk.github.io/argcomplete/";
     maintainers = [ maintainers.womfoo ];
     license = [ licenses.asl20 ];
   };

From 532e0890b4cd6cfe45ffd330fbd86dc19e4dc341 Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Fri, 20 Mar 2020 10:43:30 -0400
Subject: [PATCH 4059/4636] pythonPackages.qiskit-ibmq-provider: init at 0.4.5

Qiskit Provider for accessing the quantum devices and simulators at IBMQ.

Requirement of qiskit package.
---
 .../qiskit-ibmq-provider/default.nix          | 63 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 65 insertions(+)
 create mode 100644 pkgs/development/python-modules/qiskit-ibmq-provider/default.nix

diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix
new file mode 100644
index 000000000000..a9afcff9fea8
--- /dev/null
+++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix
@@ -0,0 +1,63 @@
+{ lib
+, pythonOlder
+, buildPythonPackage
+, fetchFromGitHub
+, nest-asyncio
+, qiskit-terra
+, requests
+, requests_ntlm
+, websockets
+  # check inputs
+, pytestCheckHook
+, vcrpy
+, pproxy
+}:
+
+buildPythonPackage rec {
+  pname = "qiskit-ibmq-provider";
+  version = "0.4.5";
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "Qiskit";
+    repo = pname;
+    rev = version;
+    sha256 = "148x3x1gk6l7nrqdllglq6ywh70k4747ybkx0bn25k3gmxd57y03";
+  };
+
+  propagatedBuildInputs = [
+    nest-asyncio
+    qiskit-terra
+    requests
+    requests_ntlm
+    websockets
+  ];
+
+  # websockets seems to be pinned b/c in v8+ it drops py3.5 support. Not an issue here (usually py3.7+, and disabled for older py3.6)
+  prePatch = ''
+    substituteInPlace requirements.txt --replace "websockets>=7,<8" "websockets"
+    substituteInPlace setup.py --replace "websockets>=7,<8" "websockets"
+  '';
+
+  # Most tests require credentials to run on IBMQ
+  checkInputs = [ pytestCheckHook vcrpy pproxy ];
+  dontUseSetuptoolsCheck = true;
+  pythonImportsCheck = [ "qiskit.providers.ibmq" ];
+  disabledTests = [ "test_old_api_url" "test_non_auth_url" "test_non_auth_url_with_hub" ];  # tests require internet connection
+  # skip tests that require IBMQ credentials, vs failing.
+  preCheck = ''
+    pushd /build/source  # run pytest from /build vs $out
+    substituteInPlace test/decorators.py --replace "Exception('Could not locate valid credentials.')" "SkipTest('No IBMQ Credentials provided for tests')"
+  '';
+  postCheck = ''
+    popd
+  '';
+
+  meta = with lib; {
+    description = "Qiskit provider for accessing the quantum devices and simulators at IBMQ";
+    homepage = "https://github.com/Qiskit/qiskit-ibmq-provider";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ drewrisinger ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8d3505a16869..d2d63bacc2db 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7052,6 +7052,8 @@ in {
 
   qiskit = callPackage ../development/python-modules/qiskit { };
 
+  qiskit-ibmq-provider = callPackage ../development/python-modules/qiskit-ibmq-provider { };
+
   qiskit-terra = callPackage ../development/python-modules/qiskit-terra { };
 
   qasm2image = callPackage ../development/python-modules/qasm2image { };

From 86973e548480f98cb3ee1500201243acd6bb018b Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Tue, 24 Mar 2020 20:14:07 -0400
Subject: [PATCH 4060/4636] pythonPackages.arrow: 0.15.4 -> 0.15.5

---
 pkgs/development/python-modules/arrow/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix
index af3e4547628a..04295dce261f 100644
--- a/pkgs/development/python-modules/arrow/default.nix
+++ b/pkgs/development/python-modules/arrow/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "arrow";
-  version = "0.15.4";
+  version = "0.15.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e1a318a4c0b787833ae46302c02488b6eeef413c6a13324b3261ad320f21ec1e";
+    sha256 = "0yq2bld2bjxddmg9zg4ll80pb32rkki7xyhgnrqnkxy5w9jf942k";
   };
 
   checkPhase = ''

From 1dc44ccd866b82b6c84e49cce6be7ae816c6fff8 Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Tue, 24 Mar 2020 20:14:48 -0400
Subject: [PATCH 4061/4636] pythonPackages.qiskit-ibmq-provider: 0.4.5 -> 0.5.0

---
 .../python-modules/qiskit-ibmq-provider/default.nix         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix
index a9afcff9fea8..2d6d02b5ad43 100644
--- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix
+++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix
@@ -2,6 +2,7 @@
 , pythonOlder
 , buildPythonPackage
 , fetchFromGitHub
+, arrow
 , nest-asyncio
 , qiskit-terra
 , requests
@@ -15,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "qiskit-ibmq-provider";
-  version = "0.4.5";
+  version = "0.5.0";
 
   disabled = pythonOlder "3.6";
 
@@ -23,10 +24,11 @@ buildPythonPackage rec {
     owner = "Qiskit";
     repo = pname;
     rev = version;
-    sha256 = "148x3x1gk6l7nrqdllglq6ywh70k4747ybkx0bn25k3gmxd57y03";
+    sha256 = "1jhgsfspmry0qk7jkcryn4225j2azys3rm99agk6mh0jzwrvx4am";
   };
 
   propagatedBuildInputs = [
+    arrow
     nest-asyncio
     qiskit-terra
     requests

From 86af0de55298d36e1d1cdc048ece41d0cfdd172a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Thu, 26 Mar 2020 16:15:19 +0100
Subject: [PATCH 4062/4636] python3Packages.spacy_models: 2.2.0 -> 2.2.5

With the exception of xx_ent_wiki_sm, since it does not have a newer
model available.
---
 .../python-modules/spacy/models.json          | 60 +++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json
index 4d7eff7fd025..1f1558b23c39 100644
--- a/pkgs/development/python-modules/spacy/models.json
+++ b/pkgs/development/python-modules/spacy/models.json
@@ -1,43 +1,43 @@
 [{
   "pname": "de_core_news_md",
-  "version": "2.2.0",
-  "sha256": "1n61jg0mxpl5mqpydclq9d2xds14v0blnb0plmnf7qhzzfhrmxq9",
+  "version": "2.2.5",
+  "sha256": "1jkc4r0f1916k5qpmpnwawsbnrbscq250q7b1llgxi70f2xyw9gk",
   "license": "cc-by-sa-40"
 },
 {
   "pname": "de_core_news_sm",
-  "version": "2.2.0",
-  "sha256": "06g2snm57k64il3plgn20l27a00dsr9dcxkyyqj6pq5ih91mfycb",
+  "version": "2.2.5",
+  "sha256": "10z30hirfwa692m0zp6wk60ccvqj84i5vjaiyyzd21innysb5y3g",
   "license": "cc-by-sa-40"
 },
 {
   "pname": "el_core_news_md",
-  "version": "2.2.0",
-  "sha256": "0xgyh5wj9mpbl2mdrk60i3m8wmgaxbf5qviy78qk8zb1jvnxzc2n",
+  "version": "2.2.5",
+  "sha256": "1jjmf6rf1hjgqswhpqq2l5w7s351k4kk93c7rr85iv2754f71h36",
   "license": "cc-by-sa-40"
 },
 {
   "pname": "el_core_news_sm",
-  "version": "2.2.0",
-  "sha256": "0qbf16g6s1xfm2clnmrwr3m3vgmvvsziyhy6jbm6axh8c0fy0j8p",
+  "version": "2.2.5",
+  "sha256": "00h55fc27d3jfm3knyidz7a4rasiz7qs4wfs3sl0ndq815yvag0l",
   "license": "cc-by-sa-40"
 },
 {
   "pname": "en_core_web_lg",
-  "version": "2.2.0",
-  "sha256": "1dxy43kf3vbz4jxc7jkr315hyzmi44v41lf09rax53f3s1jghsbh",
+  "version": "2.2.5",
+  "sha256": "1shd4gkshr4a92fhvrjhzn1abywnrcf548cv3dz8dhmi0wxa4klr",
   "license": "cc-by-sa-40"
 },
 {
   "pname": "en_core_web_md",
-  "version": "2.2.0",
-  "sha256": "13fvr8z7fjhyzc9mm55ah6c2snpj27lrrc0rzgyb0hcg7ghd6v58",
+  "version": "2.2.5",
+  "sha256": "1x32vl2a75ps2iyhysjvdygd366zs546s82yzqwj2m7jcsdszrxy",
   "license": "cc-by-sa-40"
 },
 {
   "pname": "en_core_web_sm",
-  "version": "2.2.0",
-  "sha256": "197afra99lhh84yi6wxvxdxibd1ikaybqfsq2nsmm7ahsw9s3kk5",
+  "version": "2.2.5",
+  "sha256": "1vna6zik7863hahxdgz0s80kbbfyw42h4c1k5jby9lkzr5jr1dk0",
   "license": "cc-by-sa-40"
 },
 {
@@ -48,44 +48,44 @@
 },
 {
   "pname": "es_core_news_md",
-  "version": "2.2.0",
-  "sha256": "0sdps0cdmsd2l3irsg63d874sba9vpn0san0n89rk8h3pa49dpab",
+  "version": "2.2.5",
+  "sha256": "0b50gd2mx1klr6ss0fsj58qmw2wpbawwv015pr9vq3j7jq805scl",
   "license": "cc-by-sa-40"
 },
 {
   "pname": "es_core_news_sm",
-  "version": "2.2.0",
-  "sha256": "073dgna796lk4rm7f25gyyl2ml7dfsb4azd4jkk03kxkcy6ypnag",
+  "version": "2.2.5",
+  "sha256": "19hrpxg1a5bvf9j9wlm03rkxfkgrldky7alsgl8bdwnwq3vpbgfi",
   "license": "cc-by-sa-40"
 },
 {
   "pname": "fr_core_news_md",
-  "version": "2.2.0",
-  "sha256": "0061hnw03189z3ya1gb6506bq8yxrg17v9cywg7zbk6izakxcasr",
+  "version": "2.2.5",
+  "sha256": "1y4dqbcwa7gg6z8q84n0j4my7gyia7a2z7pln71sqa78pin06r9b",
   "license": "cc-by-sa-40"
 },
 {
   "pname": "fr_core_news_sm",
-  "version": "2.2.0",
-  "sha256": "0kj31kx4q9mm7ms622ph2i6pkl1ifm8s5ng3f3khf9ia0vr31vbq",
+  "version": "2.2.5",
+  "sha256": "1q2kvznbylyz4frxy5rbvpm5jvm7bfin8g3dks0c1k9hhdymv35y",
   "license": "cc-by-sa-40"
 },
 {
   "pname": "it_core_news_sm",
-  "version": "2.2.0",
-  "sha256": "0gxmknd68kajak8jr443799bfd69pp5j0jnmcbnyx5abzyq6wkzx",
+  "version": "2.2.5",
+  "sha256": "02r3x308s5kn62xpa2cizxfw7cyjk48zm9i6r4vhs8kycmp9z0px",
   "license": "cc-by-sa-40"
 },
 {
   "pname": "lt_core_news_sm",
-  "version": "2.2.0",
-  "sha256": "1j63xnp96qavg8c960y83z752mmvp9qx92r458lydrg1ixmffx9r",
+  "version": "2.2.5",
+  "sha256": "0vy0cff1fw33srqyi93vj03rnzqr8f62p1hwi565b0sb8v3n4p08",
   "license": "cc-by-sa-40"
 },
 {
   "pname": "nb_core_news_sm",
-  "version": "2.2.0",
-  "sha256": "0s0wf3kxrhdzfkgrbxjc53hzin3w8v06iivazh6bpf6rhbiwzfr0",
+  "version": "2.2.5",
+  "sha256": "1kdn3qwlmmd52sjrvi97aiv7xp260bka009jjal79l3qrz4czrw1",
   "license": "mit"
 },
 {
@@ -96,8 +96,8 @@
 },
 {
   "pname": "pt_core_news_sm",
-  "version": "2.2.0",
-  "sha256": "1fi4wick1x96sj46idic1ad26l9zd2p5smi4v7mkry71xp7d9s13",
+  "version": "2.2.5",
+  "sha256": "02p617ybh6wqmq1scch9dgim44rhhj0k81sbw8nysv20pc6wb89a",
   "license": "cc-by-sa-40"
 },
 {

From e45f5ee1df5b8c9536db99f328d00e4be9f404e9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Mar 2020 18:18:13 +0000
Subject: [PATCH 4063/4636] clickhouse: 19.17.8.54 -> 19.17.9.60

---
 pkgs/servers/clickhouse/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index 40760093462a..9521d470a0f1 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "clickhouse";
-  version = "19.17.8.54";
+  version = "19.17.9.60";
 
   src = fetchFromGitHub {
     owner  = "yandex";
     repo   = "ClickHouse";
     rev    = "v${version}-stable";
-    sha256 = "0ck6kcifj7y4i2j1jj1a9vf5nfpp9mxk5x8y8557zp9yayjm9qyr";
+    sha256 = "0k1ncn7i4szpw4jlhv3zmw6mrkkm8qfs39nj1zbawjqrkgnw70kg";
   };
 
   nativeBuildInputs = [ cmake libtool lldClang.bintools ninja ];
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "format" ];
 
   meta = with stdenv.lib; {
-    homepage = https://clickhouse.yandex/;
+    homepage = "https://clickhouse.yandex/";
     description = "Column-oriented database management system";
     license = licenses.asl20;
     maintainers = with maintainers; [ orivej ];

From 06ebdb4288f3f1bb7c5d86342c2c5d581f40a5b8 Mon Sep 17 00:00:00 2001
From: Sergey Lukjanov <me@slukjanov.name>
Date: Thu, 26 Mar 2020 11:18:20 -0700
Subject: [PATCH 4064/4636] hugo: 0.68.1 -> 0.68.3

---
 pkgs/applications/misc/hugo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 9509e8951097..dc1f24368118 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "hugo";
-  version = "0.68.1";
+  version = "0.68.3";
 
   src = fetchFromGitHub {
     owner = "gohugoio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1h7zymvxk71jq51az4qnldk54jl9sd4zwkn5r5323xzjffwzny82";
+    sha256 = "138sv4q6f1szpkrrxnzhvxr6rrznhq1d7in0zba1pifsw3yimqq4";
   };
 
   modSha256 = "04vzm65kbj9905z4cf5yh6yc6g3b0pd5vc00lrxw84pwgqgc0ykb";

From 8bbea171d9b28c3dc607c654fdc0209bff7e0358 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 26 Mar 2020 19:26:26 +0100
Subject: [PATCH 4065/4636] opencl-headers: 2.2 -> 2020.03.13

The KhronosGroup released a first tag in the reference repository for
headers.

See
https://github.com/KhronosGroup/OpenCL-Headers/releases/tag/v2020.03.13
---
 .../libraries/opencl-headers/default.nix           | 14 +++++++-------
 pkgs/top-level/all-packages.nix                    | 10 ++--------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix
index d0cc6396b8d8..682a547d8f33 100644
--- a/pkgs/development/libraries/opencl-headers/default.nix
+++ b/pkgs/development/libraries/opencl-headers/default.nix
@@ -1,25 +1,25 @@
 { stdenv, fetchFromGitHub
-, version # "12" for "1.2", "22" for "2.2" and so on
 }:
 
-stdenv.mkDerivation {
-  name = "opencl-headers-${version}-2017-07-18";
+stdenv.mkDerivation rec {
+  name = "opencl-headers-${version}";
+  version = "2020.03.13";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenCL-Headers";
-    rev = "f039db6764d52388658ef15c30b2237bbda49803";
-    sha256 = "0z04i330zr8czak2624q71aajdcq7ly8mb5bgala5m235qjpsrh7";
+    rev = "v${version}";
+    sha256 = "1d9ibiwicaj17757h9yyjc9i2hny8d8npn4spbjscins8972z3hw";
   };
 
   installPhase = ''
     mkdir -p $out/include/CL
-    cp opencl${version}/CL/* $out/include/CL
+    cp CL/* $out/include/CL
   '';
 
   meta = with stdenv.lib; {
     description = "Khronos OpenCL headers version ${version}";
-    homepage = https://www.khronos.org/registry/cl/;
+    homepage = "https://www.khronos.org/registry/cl/";
     license = licenses.mit;
     platforms = platforms.unix;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bed301ede54a..84e7df927b62 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13820,10 +13820,7 @@ in
     nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; };
   };
 
-  ocl-icd-oclhGen = oclh: callPackage ../development/libraries/ocl-icd { opencl-headers = oclh; };
-  ocl-icd-oclh_1_2 = ocl-icd-oclhGen opencl-headers_1_2;
-  ocl-icd-oclh_2_2 = ocl-icd-oclhGen opencl-headers_2_2;
-  ocl-icd = ocl-icd-oclh_2_2;
+  ocl-icd = callPackage ../development/libraries/ocl-icd { };
 
   ode = callPackage ../development/libraries/ode { };
 
@@ -13855,10 +13852,7 @@ in
   opencascade = callPackage ../development/libraries/opencascade { };
   opencascade-occt = callPackage ../development/libraries/opencascade-occt { };
 
-  opencl-headersGen = v: callPackage ../development/libraries/opencl-headers { version = v; };
-  opencl-headers_1_2 = opencl-headersGen "12";
-  opencl-headers_2_2 = opencl-headersGen "22";
-  opencl-headers = opencl-headers_2_2;
+  opencl-headers = callPackage ../development/libraries/opencl-headers { };
 
   opencl-clhpp = callPackage ../development/libraries/opencl-clhpp { };
 

From e13278f1ba72c22bbfc68d2b4a8838a928640a74 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 26 Mar 2020 19:40:16 +0100
Subject: [PATCH 4066/4636] khronos-ocl-icd-loader: 6c03f8b -> 2020.03.13

---
 .../libraries/khronos-ocl-icd-loader/default.nix     | 12 ++++++------
 .../libraries/khronos-ocl-icd-loader/tracing.patch   |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
index a57b103b0d91..3704cbb7794c 100644
--- a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
+++ b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, fetchFromGitHub, opencl-clhpp, cmake, withTracing ? false }:
+{ stdenv, fetchFromGitHub, opencl-headers, cmake, withTracing ? false }:
 
 stdenv.mkDerivation rec {
   name = "khronos-ocl-icd-loader-${version}";
-  version = "6c03f8b";
+  version = "2020.03.13";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "OpenCL-ICD-Loader";
-    rev = "6c03f8b58fafd9dd693eaac826749a5cfad515f8";
-    sha256 = "00icrlc00dpc87prbd2j1350igi9pbgkz27hc3rf73s5994yn86a";
+    rev = "v${version}";
+    sha256 = "0zk6fyfrklx8a848613rfcx0y4yn0dsxkxzzl9pgdh9i6qdfjj9k";
   };
 
   patches = stdenv.lib.lists.optional withTracing ./tracing.patch;
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ opencl-clhpp ];
+  buildInputs = [ opencl-headers ];
 
   meta = with stdenv.lib; {
     description = "Offical Khronos OpenCL ICD Loader";
-    homepage = https://github.com/KhronosGroup/OpenCL-ICD-Loader;
+    homepage = "https://github.com/KhronosGroup/OpenCL-ICD-Loader";
     license = licenses.asl20;
     platforms = platforms.linux;
     maintainers = with maintainers; [ davidtwco ];
diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch b/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch
index 415a1b1dfe49..cef22457e5a1 100644
--- a/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch
+++ b/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch
@@ -1,10 +1,10 @@
 diff --git a/loader/icd.h b/loader/icd.h
-index a1b6969..cf4e272 100644
+index 34751e9..01a33fd 100644
 --- a/loader/icd.h
 +++ b/loader/icd.h
-@@ -122,7 +122,7 @@ void khrIcdContextPropertiesGetPlatform(
+@@ -123,7 +123,7 @@ void khrIcdContextPropertiesGetPlatform(
      cl_platform_id *outPlatform);
-
+ 
  // internal tracing macros
 -#if 0
 +#if 1

From e7c3e277b621e281c44d5835a97215ec2d2f8739 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 21 Mar 2020 13:54:38 +0100
Subject: [PATCH 4067/4636] mypy: 0.761 -> 0.770

---
 pkgs/development/python-modules/mypy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
index 90b00ba17179..bcd0ab4a6c62 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "mypy";
-  version = "0.761";
+  version = "0.770";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1gw7h84d21wmi267kmgqs9whz0l7rp62pzja2f31wq7cfj6spfl5";
+    sha256 = "1bm40nx9g1n4nj1309cijnh0ns4qbhym3agyl537nc4vxw3paqla";
   };
 
   propagatedBuildInputs = [ typed-ast psutil mypy-extensions typing-extensions ];

From 05078b032539df4cf355f91907a9c412e66d49aa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Mar 2020 19:08:46 +0000
Subject: [PATCH 4068/4636] clipmenu: 5.6.0 -> 6.0.1

---
 pkgs/applications/misc/clipmenu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix
index 7577c0a3db99..4bc56f0c4526 100644
--- a/pkgs/applications/misc/clipmenu/default.nix
+++ b/pkgs/applications/misc/clipmenu/default.nix
@@ -4,13 +4,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "clipmenu";
-  version = "5.6.0";
+  version = "6.0.1";
 
   src = fetchFromGitHub {
     owner  = "cdown";
     repo   = "clipmenu";
     rev    = version;
-    sha256 = "13hyarzazh6j33d808h3s5yk320wqzivc0ni9xm8kalvn4k3a0bq";
+    sha256 = "0053j4i14lz5m2bzc5sch5id5ilr1bl196mp8fp0q8x74w3vavs9";
   };
 
   buildInputs = [ makeWrapper ];

From 9c5f4d973c57d62e93bc31be394092469f870260 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Mar 2020 07:16:04 +0000
Subject: [PATCH 4069/4636] python27Packages.graph-tool: 2.29 -> 2.30

---
 .../python-modules/graph-tool/2.x.x.nix       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix
index e069c8f8c7b6..88e0902529c0 100644
--- a/pkgs/development/python-modules/graph-tool/2.x.x.nix
+++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook
+{ fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook
 , pkg-config, boost, expat, scipy, cgal, gmp, mpfr
 , gobject-introspection, pygobject3, gtk3, matplotlib, ncurses
 , buildPythonPackage
@@ -10,18 +10,11 @@
 buildPythonPackage rec {
   pname = "graph-tool";
   format = "other";
-  version = "2.29";
-
-  meta = with stdenv.lib; {
-    description = "Python module for manipulation and statistical analysis of graphs";
-    homepage    = https://graph-tool.skewed.de/;
-    license     = licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.joelmo ];
-  };
+  version = "2.30";
 
   src = fetchurl {
     url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2";
-    sha256 = "0ykzcnqc5bhqb4xlf9ahpp807vj5868xdrmcj6fggqnnpqv4633c";
+    sha256 = "1gy8xhwfms0psdji7vzqjbzj3l0k743aw20db27zxyq89cvz6g42";
   };
 
   configureFlags = [
@@ -55,4 +48,11 @@ buildPythonPackage rec {
   ];
 
   enableParallelBuilding = false;
+
+  meta = with lib; {
+    description = "Python module for manipulation and statistical analysis of graphs";
+    homepage    = "https://graph-tool.skewed.de/";
+    license     = licenses.gpl3;
+    maintainers = [ maintainers.joelmo ];
+  };
 }

From 5df826fb11762586c282b6f7b88bc17069b6696f Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Fri, 20 Mar 2020 14:00:52 -0400
Subject: [PATCH 4070/4636] python3Packages.rope: 0.14.0 -> 0.16.0

---
 pkgs/development/python-modules/rope/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix
index c14b4f364075..6bcc05fb34d6 100644
--- a/pkgs/development/python-modules/rope/default.nix
+++ b/pkgs/development/python-modules/rope/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "rope";
-  version = "0.14.0";
+  version = "0.16.0";
 
   disabled = pythonAtLeast "3.8";  # 0.17 should support Python 3.8
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1bwayj0hh459s3yh0sdrxksr9wfilgi3a49izfaj06kvgyladif5";
+    sha256 = "1zlxdrs6ww2hm41izz67h67z9dkm0rlgw8m04vygaip0q91030yj";
   };
 
   checkInputs = [ nose ];
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Python refactoring library";
-    homepage = https://github.com/python-rope/rope;
+    homepage = "https://github.com/python-rope/rope";
     maintainers = with maintainers; [ goibhniu ];
     license = licenses.gpl2;
   };

From 38aa1cad7f5825f7c0968d15b251541da60718fb Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 26 Mar 2020 22:13:31 +0100
Subject: [PATCH 4071/4636] signal-desktop: 1.32.2 -> 1.32.3

---
 .../networking/instant-messengers/signal-desktop/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 51b6816e4eca..903b349edfa1 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -23,7 +23,7 @@ let
       else "");
 in stdenv.mkDerivation rec {
   pname = "signal-desktop";
-  version = "1.32.2"; # Please backport all updates to the stable channel.
+  version = "1.32.3"; # Please backport all updates to the stable channel.
   # All releases have a limited lifetime and "expire" 90 days after the release.
   # When releases "expire" the application becomes unusable until an update is
   # applied. The expiration date for the current release can be extracted with:
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "0s64b66yzh797wbnggpj5hym0d1dklh3znbl3xib00hlwdqczbwz";
+    sha256 = "1aqk0hdgdxjznj0nbh2glvyzdq2af8xgiw3qb4k7wpjd0my28r2l";
   };
 
   nativeBuildInputs = [

From 5861d74759f548ee4c37e8f4830741d4e0297a8c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Mar 2020 21:18:29 +0000
Subject: [PATCH 4072/4636] drumkv1: 0.9.12 -> 0.9.13

---
 pkgs/applications/audio/drumkv1/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index d3399315376f..ae32a5f41a3e 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -2,11 +2,11 @@
 
 mkDerivation rec {
   pname = "drumkv1";
-  version = "0.9.12";
+  version = "0.9.13";
 
   src = fetchurl {
     url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz";
-    sha256 = "0hmnmk9vvi43wl6say0dg7j088h7mmwmfdwjhsq89c7i7cpg78da";
+    sha256 = "1h88sakxs0b20k8v2sh14y05fin1zqmhnid6h9mk9c37ixxg58ia";
   };
 
   buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];
@@ -15,7 +15,7 @@ mkDerivation rec {
 
   meta = with lib; {
     description = "An old-school drum-kit sampler synthesizer with stereo fx";
-    homepage = http://drumkv1.sourceforge.net/;
+    homepage = "http://drumkv1.sourceforge.net/";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.goibhniu ];

From cc7fec170b0fff4452be233075f29ede65ee070f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 25 Mar 2020 15:28:36 -0400
Subject: [PATCH 4073/4636] andyetitmoves: make unconditional

This should never be null - the meta.platforms gives us an assertion.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3fac637ca8d..4af52edb8bd4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23319,7 +23319,7 @@ in
   amoeba = callPackage ../games/amoeba { };
   amoeba-data = callPackage ../games/amoeba/data.nix { };
 
-  andyetitmoves = if stdenv.isLinux then callPackage ../games/andyetitmoves {} else null;
+  andyetitmoves = callPackage ../games/andyetitmoves {};
 
   angband = callPackage ../games/angband { };
 

From ef164d2ba945290bfa9343f288540ed61d5bf45f Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 26 Mar 2020 20:29:35 +0000
Subject: [PATCH 4074/4636] vamp-plugin-sdk: rename from vamp.vampSDK

---
 pkgs/applications/audio/ardour/default.nix    |  4 +--
 pkgs/applications/audio/mixxx/default.nix     |  4 +--
 .../audio/sonic-lineup/default.nix            |  2 +-
 .../audio/sonic-visualiser/default.nix        |  4 +--
 .../audio/vamp-plugin-sdk/default.nix         | 27 ++++++++++++++++
 .../libraries/audio/vamp/default.nix          | 31 -------------------
 .../libraries/rubberband/default.nix          |  4 +--
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               | 19 +++---------
 9 files changed, 42 insertions(+), 54 deletions(-)
 create mode 100644 pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix
 delete mode 100644 pkgs/development/libraries/audio/vamp/default.nix

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 5b2f6931ed1c..c1749029cdc9 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -4,7 +4,7 @@
 , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
 , libusb, libuuid, libxml2, libxslt, lilv, lrdf, lv2, makeWrapper
 , perl, pkgconfig, python2, rubberband, serd, sord, sratom
-, taglib, vampSDK, dbus, fftw, pango, suil, libarchive
+, taglib, vamp-plugin-sdk, dbus, fftw, pango, suil, libarchive
 , wafHook }:
 
 let
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
       libmad libogg librdf_raptor librdf_rasqal libsamplerate
       libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lrdf lv2
       makeWrapper pango perl pkgconfig python2 rubberband serd sord
-      sratom suil taglib vampSDK libarchive
+      sratom suil taglib vamp-plugin-sdk libarchive
     ];
 
   # ardour's wscript has a "tarball" target but that required the git revision
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index 82db91dcb077..1247534b1e83 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -3,7 +3,7 @@
 , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis
 , libGLU, libxcb, lilv, lv2, opusfile
 , pkgconfig, portaudio, portmidi, protobuf, qtbase, qtscript, qtsvg
-, qtx11extras, rubberband, scons, sqlite, taglib, upower, vampSDK
+, qtx11extras, rubberband, scons, sqlite, taglib, upower, vamp-plugin-sdk
 }:
 
 mkDerivation rec {
@@ -20,7 +20,7 @@ mkDerivation rec {
   buildInputs = [
     chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout libsndfile
     libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkgconfig portaudio portmidi protobuf qtbase qtscript qtsvg
-    qtx11extras rubberband scons sqlite taglib upower vampSDK
+    qtx11extras rubberband scons sqlite taglib upower vamp-plugin-sdk
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/audio/sonic-lineup/default.nix b/pkgs/applications/audio/sonic-lineup/default.nix
index 68e1b6b3f8aa..93b4c2dade4d 100644
--- a/pkgs/applications/audio/sonic-lineup/default.nix
+++ b/pkgs/applications/audio/sonic-lineup/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, alsaLib, boost, bzip2, fftw, fftwFloat, libfishsound
 , libid3tag, liblo, libmad, liboggz, libpulseaudio, libsamplerate
-, libsndfile, lrdf, opusfile, portaudio, rubberband, serd, sord, vampSDK, capnproto
+, libsndfile, lrdf, opusfile, portaudio, rubberband, serd, sord, capnproto
 , wrapQtAppsHook, pkgconfig
 }:
 
diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix
index 187c887baa55..f7803098066d 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -3,7 +3,7 @@
 { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo
 , libmad, libogg, lrdf, librdf_raptor, librdf_rasqal, libsamplerate
 , libsndfile, pkgconfig, libpulseaudio, qtbase, qtsvg, redland
-, rubberband, serd, sord, vampSDK, fftwFloat
+, rubberband, serd, sord, vamp-plugin-sdk, fftwFloat
 , capnproto, liboggz, libfishsound, libid3tag, opusfile
 , wrapQtAppsHook
 }:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ libsndfile qtbase qtsvg fftw fftwFloat bzip2 lrdf rubberband
-      libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland
+      libsamplerate vamp-plugin-sdk alsaLib librdf_raptor librdf_rasqal redland
       serd
       sord
       # optional
diff --git a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix
new file mode 100644
index 000000000000..894f11b73109
--- /dev/null
+++ b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix
@@ -0,0 +1,27 @@
+# set VAMP_PATH ?
+# plugins availible on sourceforge and http://www.vamp-plugins.org/download.html (various licenses)
+
+{ stdenv, fetchFromGitHub, pkgconfig, libsndfile }:
+
+stdenv.mkDerivation {
+  name = "vamp-sdk-2.7.1";
+  # version = "2.7.1";
+
+  src = fetchFromGitHub {
+    owner = "c4dm";
+    repo = "vamp-plugin-sdk";
+    rev = "vamp-plugin-sdk-v2.7.1";
+    sha256 = "1ifd6l6b89pg83ss4gld5i72fr0cczjnl2by44z5jnndsg3sklw4";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libsndfile ];
+
+  meta = with stdenv.lib; {
+    description = "Audio processing plugin system for plugins that extract descriptive information from audio data";
+    homepage = https://sourceforge.net/projects/vamp;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.goibhniu maintainers.marcweber ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/audio/vamp/default.nix b/pkgs/development/libraries/audio/vamp/default.nix
deleted file mode 100644
index 2ac3115af2aa..000000000000
--- a/pkgs/development/libraries/audio/vamp/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# set VAMP_PATH ?
-# plugins availible on sourceforge and http://www.vamp-plugins.org/download.html (various licenses)
-
-{ stdenv, fetchFromGitHub, pkgconfig, libsndfile }:
-
-{
-
-  vampSDK = stdenv.mkDerivation {
-    name = "vamp-sdk-2.7.1";
-    # version = "2.7.1";
-
-    src = fetchFromGitHub {
-      owner = "c4dm";
-      repo = "vamp-plugin-sdk";
-      rev = "vamp-plugin-sdk-v2.7.1";
-      sha256 = "1ifd6l6b89pg83ss4gld5i72fr0cczjnl2by44z5jnndsg3sklw4";
-    };
-
-  nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ libsndfile ];
-
-    meta = with stdenv.lib; {
-      description = "Audio processing plugin system for plugins that extract descriptive information from audio data";
-      homepage = https://sourceforge.net/projects/vamp;
-      license = licenses.bsd3;
-      maintainers = [ maintainers.goibhniu maintainers.marcweber ];
-      platforms = platforms.linux;
-    };
-  };
-
-}
diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix
index c9ba339ae0ea..29233a1ad3f5 100644
--- a/pkgs/development/libraries/rubberband/default.nix
+++ b/pkgs/development/libraries/rubberband/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libsamplerate, libsndfile, fftw
-, vampSDK, ladspaH }:
+, vamp-plugin-sdk, ladspaH }:
 
 stdenv.mkDerivation {
   name = "rubberband-1.8.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libsamplerate libsndfile fftw vampSDK ladspaH ];
+  buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH ];
 
   meta = with stdenv.lib; {
     description = "High quality software library for audio time-stretching and pitch-shifting";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 66fa444e0e7a..6ef668aa1401 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -509,6 +509,7 @@ mapAliases ({
   v4l_utils = v4l-utils; # added 2019-08-07
   v8_3_16_14 = throw "removed 2019-11-01: no longer referenced by other packages";
   valadoc = throw "deprecated 2019-10-10: valadoc was merged into vala 0.38";
+  vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26
   vimbWrapper = vimb; # added 2015-01
   vimprobable2 = throw "vimprobable2 has been removed from nixpkgs. It relied on webkitgtk24x that has been removed."; # added 2019-12-05
   vimprobable2-unwrapped = vimprobable2; # added 2019-12-05
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3fac637ca8d..7676506fdafb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14393,9 +14393,7 @@ in
 
   rttr = callPackage ../development/libraries/rttr { };
 
-  rubberband = callPackage ../development/libraries/rubberband {
-    inherit (vamp) vampSDK;
-  };
+  rubberband = callPackage ../development/libraries/rubberband { };
 
   sad = callPackage ../applications/science/logic/sad { };
 
@@ -14895,7 +14893,7 @@ in
 
   vale = callPackage ../tools/text/vale { };
 
-  vamp = callPackage ../development/libraries/audio/vamp { };
+  vamp-plugin-sdk = callPackage ../development/libraries/audio/vamp-plugin-sdk { };
 
   vc = callPackage ../development/libraries/vc { };
 
@@ -18584,7 +18582,6 @@ in
 
   ardour = callPackage ../applications/audio/ardour {
     inherit (gnome2) libgnomecanvas libgnomecanvasmm;
-    inherit (vamp) vampSDK;
   };
 
   arelle = with python3Packages; toPythonApplication arelle;
@@ -20760,9 +20757,7 @@ in
 
   meh = callPackage ../applications/graphics/meh {};
 
-  mixxx = libsForQt5.callPackage ../applications/audio/mixxx {
-    inherit (vamp) vampSDK;
-  };
+  mixxx = libsForQt5.callPackage ../applications/audio/mixxx { };
 
   mjpg-streamer = callPackage ../applications/video/mjpg-streamer { };
 
@@ -22011,13 +22006,9 @@ in
 
   skanlite = libsForQt5.callPackage ../applications/office/skanlite { };
 
-  sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup {
-    inherit (pkgs.vamp) vampSDK;
-  };
+  sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { };
 
-  sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser {
-    inherit (pkgs.vamp) vampSDK;
-  };
+  sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { };
 
   soulseekqt = libsForQt5.callPackage ../applications/networking/p2p/soulseekqt { };
 

From 1780933db1f33db479514b1693a49eae48f5cb17 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 26 Mar 2020 20:42:33 +0000
Subject: [PATCH 4075/4636] vamp-plugin-sdk: 2.7.1 -> 2.9

---
 .../libraries/audio/vamp-plugin-sdk/default.nix    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix
index 894f11b73109..559642e7485e 100644
--- a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix
+++ b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix
@@ -3,23 +3,25 @@
 
 { stdenv, fetchFromGitHub, pkgconfig, libsndfile }:
 
-stdenv.mkDerivation {
-  name = "vamp-sdk-2.7.1";
-  # version = "2.7.1";
+stdenv.mkDerivation rec {
+  pname = "vamp-plugin-sdk";
+  version = "2.9";
 
   src = fetchFromGitHub {
     owner = "c4dm";
     repo = "vamp-plugin-sdk";
-    rev = "vamp-plugin-sdk-v2.7.1";
-    sha256 = "1ifd6l6b89pg83ss4gld5i72fr0cczjnl2by44z5jnndsg3sklw4";
+    rev = "vamp-plugin-sdk-v${version}";
+    sha256 = "1ay12gjqp2wzysg9k2qha3gd8sj5rjlfy4hsl923csi4ssiapsh1";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libsndfile ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Audio processing plugin system for plugins that extract descriptive information from audio data";
-    homepage = https://sourceforge.net/projects/vamp;
+    homepage = https://vamp-plugins.org/;
     license = licenses.bsd3;
     maintainers = [ maintainers.goibhniu maintainers.marcweber ];
     platforms = platforms.linux;

From cc81399036bf0d76055bd4e4f86177c0a6a18850 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 26 Mar 2020 20:59:09 +0000
Subject: [PATCH 4076/4636] qtractor: enable parallel building

---
 pkgs/applications/audio/qtractor/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix
index 4076692e7fe7..8cb9f8dccb84 100644
--- a/pkgs/applications/audio/qtractor/default.nix
+++ b/pkgs/applications/audio/qtractor/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
       suil
     ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Audio/MIDI multi-track sequencer";
     homepage = http://qtractor.sourceforge.net;

From f61af809d2deb54c8331eb2f6d836c6362751d2a Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 26 Mar 2020 21:02:30 +0000
Subject: [PATCH 4077/4636] muse: fix parallel building

---
 .../audio/muse/fix-parallel-building.patch        | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/applications/audio/muse/fix-parallel-building.patch b/pkgs/applications/audio/muse/fix-parallel-building.patch
index abeec5d54cc0..a11970b7111a 100644
--- a/pkgs/applications/audio/muse/fix-parallel-building.patch
+++ b/pkgs/applications/audio/muse/fix-parallel-building.patch
@@ -36,6 +36,13 @@ In file included from ../muse/mixer/rack.cpp:49:
 ui_plugindialogbase.h: No such file or directory
 
 
+ninja muse/midiedit/CMakeFiles/midiedit.dir/drumedit.o
+
+In file included from /build/source/muse3/muse/midiedit/drumedit.cpp:64:
+/build/source/muse3/muse/components/filedialog.h:29:10: fatal error:
+ui_fdialogbuttons.h: No such file or directory
+
+
 --- a/muse/components/CMakeLists.txt
 +++ b/muse/components/CMakeLists.txt
 @@ -343,4 +343,5 @@ set_target_properties( components
@@ -76,3 +83,11 @@ ui_plugindialogbase.h: No such file or directory
 +      components
        widgets
        )
+--- a/muse/midiedit/CMakeLists.txt
++++ b/muse/midiedit/CMakeLists.txt
+@@ -93,4 +93,5 @@ set_target_properties( midiedit
+ target_link_libraries ( midiedit
+       ${QT_LIBRARIES}
++      components
+       al
+       ctrl

From ed5d0ed4c69b1d56a7883021e52ea954a104d8aa Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 26 Mar 2020 21:10:10 +0000
Subject: [PATCH 4078/4636] tony: init at 2.1.1

---
 pkgs/applications/audio/tony/default.nix | 37 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/applications/audio/tony/default.nix

diff --git a/pkgs/applications/audio/tony/default.nix b/pkgs/applications/audio/tony/default.nix
new file mode 100644
index 000000000000..92cab9b5b8de
--- /dev/null
+++ b/pkgs/applications/audio/tony/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, pkgconfig, wrapQtAppsHook
+, alsaLib, boost, bzip2, fftw, fftwFloat, libX11, libfishsound, libid3tag
+, libjack2, liblo, libmad, libogg, liboggz, libpulseaudio, libsamplerate
+, libsndfile, lrdf, opusfile, qtbase, qtsvg, rubberband, serd, sord
+}:
+
+stdenv.mkDerivation rec {
+  name = "tony-2.1.1";
+
+  src = fetchurl {
+    url = "https://code.soundsoftware.ac.uk/attachments/download/2616/${name}.tar.gz";
+    sha256 = "03g2bmlj08lmgvh54dyd635xccjn730g4wwlhpvsw04bffz8b7fp";
+  };
+
+  nativeBuildInputs = [ pkgconfig wrapQtAppsHook ];
+
+  buildInputs = [
+    alsaLib boost bzip2 fftw fftwFloat libX11 libfishsound libid3tag
+    libjack2 liblo libmad libogg liboggz libpulseaudio libsamplerate
+    libsndfile lrdf opusfile qtbase qtsvg rubberband serd sord
+  ];
+
+  # comment out the tests
+  preConfigure = ''
+    sed -i 's/sub_test_svcore_/#sub_test_svcore_/' tony.pro
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Pitch and note annotation of unaccompanied melody";
+    homepage = https://www.sonicvisualiser.org/tony/;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ orivej ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7676506fdafb..77ec2287efc1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22309,6 +22309,8 @@ in
 
   tortoisehg = callPackage ../applications/version-management/tortoisehg { };
 
+  tony = libsForQt5.callPackage ../applications/audio/tony { };
+
   toot = callPackage ../applications/misc/toot { };
 
   tootle = callPackage ../applications/misc/tootle { };

From 5bfc1d5110a14e6ef44a51b08c7bd5b81fed3f4d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 26 Mar 2020 23:16:38 +0100
Subject: [PATCH 4079/4636] mautrix-whatsapp: 2020-02-09 -> 2020-03-26

---
 pkgs/servers/mautrix-whatsapp/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
index b94eb00547aa..648b4830661d 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule {
   pname = "mautrix-whatsapp-unstable";
-  version = "2020-02-09";
+  version = "2020-03-26";
 
   src = fetchFromGitHub {
     owner = "tulir";
     repo = "mautrix-whatsapp";
-    rev = "260555b69ccd20f247405e4d8cab3d49fabda070";
-    sha256 = "1ykhwrp8bvhzzw4lg4m1w430ybgzd0zqgrs4jrvfd1m0als2iff7";
+    rev = "3a9642386cdff8293657c8409da4bffd674184bf";
+    sha256 = "183ghrm83vlnalmlxq69xinvkylnxwmz41wwm5s4035arizkjh1b";
   };
 
-  modSha256 = "0ypj79rjwj5bls6aq2cz0d034dnv1sddl43iz51b4fl2bfv0drm9";
+  modSha256 = "01xwq0h3i8ai0294v8jdagksas48866lxcnkn4slwp3rnzv6cmbp";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
 

From 2275ba08be2911428b86860c99c04263fa31741b Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 27 Mar 2020 08:54:33 +1000
Subject: [PATCH 4080/4636] buildah: 1.14.3 -> 1.14.4

https://github.com/containers/buildah/releases/tag/v1.14.4
---
 pkgs/development/tools/buildah/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index f48aa35852b0..6e3335a3c07e 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -4,13 +4,13 @@
 
 buildGoPackage rec {
   pname = "buildah";
-  version = "1.14.3";
+  version = "1.14.4";
 
   src = fetchFromGitHub {
     owner  = "containers";
     repo   = "buildah";
     rev    = "v${version}";
-    sha256 = "1qghlba8396gj9dfih8hg249gzwx0gpw9cysdw2vh8z52jhi5sx9";
+    sha256 = "055xaczvqxp9qwiki2qw3576mj7qy0zzx90473wx4k7qri4csyrb";
   };
 
   outputs = [ "bin" "man" "out" ];

From a6f97ab9c24fd0e87f5fca7bb26d544bafdbffe0 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 26 Mar 2020 17:56:00 -0500
Subject: [PATCH 4081/4636] nodejs-13_x: 13.11.0 -> 13.12.0

Changelog: https://github.com/nodejs/node/releases/tag/v13.12.0
---
 pkgs/development/web/nodejs/v13.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix
index c5e3f7c4bdbf..8676214b50b2 100644
--- a/pkgs/development/web/nodejs/v13.nix
+++ b/pkgs/development/web/nodejs/v13.nix
@@ -5,6 +5,6 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "13.11.0";
-    sha256 = "07r9xwjmiip9zmgfq77f3av3p93adc5cphj07idph1l8ws1j2h75";
+    version = "13.12.0";
+    sha256 = "199qcvzikdzw0h25v9dws77fff6hbvr8dj50lyzlnkya1dd6fzhd";
   }

From 5dbeb6915427d5e761490bdf9a6ab5416d8f97e3 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 13 Mar 2020 01:59:48 +0100
Subject: [PATCH 4082/4636] atlassian-confluence: 7.2.1 -> 7.3.4

---
 pkgs/servers/atlassian/confluence.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix
index db5baf6e5afb..d8410c87b766 100644
--- a/pkgs/servers/atlassian/confluence.nix
+++ b/pkgs/servers/atlassian/confluence.nix
@@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null);
 
 stdenvNoCC.mkDerivation rec {
   pname = "atlassian-confluence";
-  version = "7.2.1";
+  version = "7.3.4";
 
   src = fetchurl {
     url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz";
-    sha256 = "1d37hiabph56frsp8jrn80fmglgw6k1dlc4x8p7m82fb3vild049";
+    sha256 = "13d0vnsvyl8cjdxnp2w284814bnqgbksl8mq7lkjms1x083mhnzi";
   };
 
   buildPhase = ''

From dd70ed1ff2b3fcab66aed1a6c18fa1f401f6fc53 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 26 Mar 2020 23:06:03 +0000
Subject: [PATCH 4083/4636] fmbt: 0.39 -> 0.42

---
 pkgs/development/tools/fmbt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/fmbt/default.nix b/pkgs/development/tools/fmbt/default.nix
index 3100daae389b..71365c01bfdd 100644
--- a/pkgs/development/tools/fmbt/default.nix
+++ b/pkgs/development/tools/fmbt/default.nix
@@ -4,14 +4,14 @@
 , tesseract, gts, libXtst
 }:
 stdenv.mkDerivation rec {
-  version = "0.39";
+  version = "0.42";
   pname = "fMBT";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "fMBT";
     rev = "v${version}";
-    sha256 = "15sxwdcsjybq50vkla4md2ay8m67ndc4vwcsl5vwsjkim5qlxslb";
+    sha256 = "1jb9nb2mipc5cg99a80dny4m06vz2zral0q30fv75rz2cb6ja4zp";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig flex makeWrapper

From eb35d21d77e40a0a3132602de83f7c182886d281 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 26 Mar 2020 19:29:08 -0400
Subject: [PATCH 4084/4636] nixos/rigel: Fix evaluation

---
 nixos/modules/services/desktops/gnome3/rygel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/desktops/gnome3/rygel.nix b/nixos/modules/services/desktops/gnome3/rygel.nix
index b6c44590a2e7..dfe4333a8adb 100644
--- a/nixos/modules/services/desktops/gnome3/rygel.nix
+++ b/nixos/modules/services/desktops/gnome3/rygel.nix
@@ -27,6 +27,6 @@ with lib;
 
     systemd.packages = [ pkgs.gnome3.rygel ];
 
-    environment.etc."rygel.conf" = "${pkgs.gnome3.rygel}/etc/rygel.conf";
+    environment.etc."rygel.conf".source = "${pkgs.gnome3.rygel}/etc/rygel.conf";
   };
 }

From 3e47a6e50aca1861a4a52215e92e9a946cbfc7b3 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 26 Mar 2020 23:07:09 +0000
Subject: [PATCH 4085/4636] nootka: init at 1.4.7, init unstable at 1.7.0-beta1

---
 pkgs/applications/audio/nootka/default.nix  | 31 +++++++++++++++++++
 pkgs/applications/audio/nootka/unstable.nix | 33 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  3 ++
 3 files changed, 67 insertions(+)
 create mode 100644 pkgs/applications/audio/nootka/default.nix
 create mode 100644 pkgs/applications/audio/nootka/unstable.nix

diff --git a/pkgs/applications/audio/nootka/default.nix b/pkgs/applications/audio/nootka/default.nix
new file mode 100644
index 000000000000..4f7b1e7e30f7
--- /dev/null
+++ b/pkgs/applications/audio/nootka/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, cmake
+, alsaLib, fftwSinglePrec, libjack2, libpulseaudio, libvorbis, soundtouch, qtbase
+}:
+
+stdenv.mkDerivation rec {
+  name = "nootka-1.4.7";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/nootka/${name}-source.tar.bz2";
+    sha256 = "1y9wlwri74v2z9dwbcfjs7xri54yra24vpwq19xi2lfv1nbs518x";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [
+    alsaLib fftwSinglePrec libjack2 libpulseaudio libvorbis soundtouch qtbase
+  ];
+
+  cmakeFlags = [
+    "-DCMAKE_INCLUDE_PATH=${libjack2}/include/jack;${libpulseaudio.dev}/include/pulse"
+    "-DENABLE_JACK=ON"
+    "-DENABLE_PULSEAUDIO=ON"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Application for practicing playing musical scores and ear training";
+    homepage = https://nootka.sourceforge.io/;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ orivej ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/audio/nootka/unstable.nix b/pkgs/applications/audio/nootka/unstable.nix
new file mode 100644
index 000000000000..d76fd0835caa
--- /dev/null
+++ b/pkgs/applications/audio/nootka/unstable.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, cmake
+, alsaLib, fftwSinglePrec, libjack2, libpulseaudio, libvorbis, soundtouch
+, qtbase, qtdeclarative, qtquickcontrols2
+}:
+
+stdenv.mkDerivation rec {
+  name = "nootka-1.7.0-beta1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/nootka/${name}-source.tar.bz2";
+    sha256 = "13b50vnpr1zx2mrgkc8fmhsyfa19rqq1rksvn31145dy6fk1f3gc";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [
+    alsaLib fftwSinglePrec libjack2 libpulseaudio libvorbis soundtouch
+    qtbase qtdeclarative qtquickcontrols2
+  ];
+
+  cmakeFlags = [
+    "-DCMAKE_INCLUDE_PATH=${libjack2}/include/jack;${libpulseaudio.dev}/include/pulse"
+    "-DENABLE_JACK=ON"
+    "-DENABLE_PULSEAUDIO=ON"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Application for practicing playing musical scores and ear training";
+    homepage = https://nootka.sourceforge.io/;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ orivej ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 77ec2287efc1..7e469380abbd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20976,6 +20976,9 @@ in
 
   notion = callPackage ../applications/window-managers/notion { };
 
+  nootka = qt5.callPackage ../applications/audio/nootka { };
+  nootka-unstable = qt5.callPackage ../applications/audio/nootka/unstable.nix { };
+
   open-policy-agent = callPackage ../development/tools/open-policy-agent { };
 
   openshift = callPackage ../applications/networking/cluster/openshift {

From c20428ee247c0b556b49daccebb44f6a2a9e4d1d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 27 Mar 2020 00:47:21 +0100
Subject: [PATCH 4086/4636] rambox: 0.7.4 -> 0.7.5

https://github.com/ramboxapp/community-edition/releases/tag/0.7.5
---
 .../networking/instant-messengers/rambox/default.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix
index 28ed924011e3..71102e7ed776 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@@ -3,18 +3,18 @@
 }:
 
 let
-  version = "0.7.4";
+  version = "0.7.5";
 in stdenv.mkDerivation rec {
   pname = "rambox";
   inherit version;
   src = {
     x86_64-linux = fetchurl {
       url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-amd64.deb";
-      sha256 = "0m9627bcwfg9aximv7ifsmspm8xi231pcnnd4p46lahb2qp19vbd";
+      sha256 = "108yd5djnap37yh0nbjyqkp5ci1zmydfzqcsbapin40a4f36zm31";
     };
     i686-linux = fetchurl {
       url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.deb";
-      sha256 = "162p6x400w3pny38adinp53rcifvbkjbs12cwrpf7s3b0yml8qxr";
+      sha256 = "1pvh048h6m19rmbscsy69ih0jkyhazmq2pcagmf3kk8gmbi7y6p6";
     };
   }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
 

From dd166f4cb4bbc1e33622aa87c8adf2c4eda7c174 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 27 Mar 2020 00:05:33 +0000
Subject: [PATCH 4087/4636] solfege: fix run
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It was failing with:

    Traceback (most recent call last):
      File "/nix/store/…-solfege-3.22.2/bin/.solfege-wrapped", line 55, in <module>
        from solfege import presetup
      File "/nix/store/…-solfege-3.22.2/share/solfege/solfege/presetup.py", line 22, in <module>
        import gtk
    ImportError: No module named gtk
---
 pkgs/misc/solfege/default.nix | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix
index 7ca9843e2e35..08397c8406f6 100644
--- a/pkgs/misc/solfege/default.nix
+++ b/pkgs/misc/solfege/default.nix
@@ -1,12 +1,10 @@
 { stdenv, fetchurl, pkgconfig, pythonPackages, gettext, texinfo
 , ghostscript, librsvg, gdk-pixbuf, txt2man, timidity, mpg123
 , alsaUtils, vorbis-tools, csound, lilypond
-, makeWrapper
+, wrapGAppsHook
 }:
 
-let
-  inherit (pythonPackages) python pygtk;
-in stdenv.mkDerivation rec {
+pythonPackages.buildPythonApplication rec {
   name = "solfege-3.22.2";
 
   src = fetchurl {
@@ -14,10 +12,9 @@ in stdenv.mkDerivation rec {
     sha256 = "1r4g93ka7i8jh5glii5nza0zq0wy4sw0gfzpvkcrhj9yr1h0jsp4";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ python pygtk gettext texinfo
-    ghostscript librsvg gdk-pixbuf txt2man makeWrapper
-  ];
+  nativeBuildInputs = [ gettext texinfo pkgconfig wrapGAppsHook ];
+  buildInputs = [ librsvg ];
+  propagatedBuildInputs = [ pythonPackages.pygtk ];
 
   preBuild = ''
     sed -i -e 's|wav_player=.*|wav_player=${alsaUtils}/bin/aplay|' \
@@ -29,12 +26,9 @@ in stdenv.mkDerivation rec {
            default.config
   '';
 
-  postInstall = ''
-      set -x
-      wrapProgram "$out/bin/solfege" \
-          --prefix PYTHONPATH ':' "$PYTHONPATH" \
-          --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
-  '';
+  format = "other";
+
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "Ear training program";

From 79cc0c7e9f5dea1a346001233197cc5c7cdc4e99 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 27 Mar 2020 01:11:12 +0100
Subject: [PATCH 4088/4636] ell: 0.28 -> 0.30

---
 pkgs/os-specific/linux/ell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix
index e811dc1bc386..b1a3a4f08915 100644
--- a/pkgs/os-specific/linux/ell/default.nix
+++ b/pkgs/os-specific/linux/ell/default.nix
@@ -7,14 +7,14 @@
 
 stdenv.mkDerivation rec {
   pname = "ell";
-  version = "0.28";
+  version = "0.30";
 
   outputs = [ "out" "dev" ];
 
   src = fetchgit {
      url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git";
      rev = version;
-     sha256 = "1am3ghji271364vmf2w5sxskvlhh4r2mwakza7vjjph16cvsv6a7";
+     sha256 = "0kiglgc02a6hqi1nhnl4d8lxax8b1fljp50pvqswrnbh7pgb5676";
   };
 
   patches = [

From 0e69720f34c3d375f366e060fc95e2a24601e4a8 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 27 Mar 2020 01:11:22 +0100
Subject: [PATCH 4089/4636] iwd: 1.5 -> 1.6

---
 pkgs/os-specific/linux/iwd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index f6e98b047df6..d93b11bc9577 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -13,12 +13,12 @@
 
 stdenv.mkDerivation rec {
   pname = "iwd";
-  version = "1.5";
+  version = "1.6";
 
   src = fetchgit {
     url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
     rev = version;
-    sha256 = "09viyfv5j2rl6ly52b2xlc2zbmb6i22dv89jc6823bzdjjimkrg6";
+    sha256 = "0c38c7a234cwdd5y1brq4w56xszs8zlp57rr3nvgp8z8djcy1qvx";
   };
 
   nativeBuildInputs = [

From 776b55518a6ae72b9e09ff893969476aee5a09c6 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 26 Mar 2020 20:50:32 -0400
Subject: [PATCH 4090/4636] Revert "mypy: 0.761 -> 0.770"

This reverts commit e7c3e277b621e281c44d5835a97215ec2d2f8739.

See https://github.com/NixOS/nixpkgs/issues/83458

This currently blocks the channel.
---
 pkgs/development/python-modules/mypy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
index bcd0ab4a6c62..90b00ba17179 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "mypy";
-  version = "0.770";
+  version = "0.761";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1bm40nx9g1n4nj1309cijnh0ns4qbhym3agyl537nc4vxw3paqla";
+    sha256 = "1gw7h84d21wmi267kmgqs9whz0l7rp62pzja2f31wq7cfj6spfl5";
   };
 
   propagatedBuildInputs = [ typed-ast psutil mypy-extensions typing-extensions ];

From 44353447db17187bce139c1d8bb83247993328c3 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 26 Mar 2020 20:00:00 -0500
Subject: [PATCH 4091/4636] poco: add platforms to meta

---
 pkgs/development/libraries/poco/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix
index ecd20d545d58..1f43be20cfb6 100644
--- a/pkgs/development/libraries/poco/default.nix
+++ b/pkgs/development/libraries/poco/default.nix
@@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
     description = "Cross-platform C++ libraries with a network/internet focus";
     license = licenses.boost;
     maintainers = with maintainers; [ orivej ];
+    platforms = platforms.unix;
   };
 }

From 68e43c61fee469fc08f5d29c23f430925f955d36 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Thu, 26 Mar 2020 21:20:03 -0400
Subject: [PATCH 4092/4636] timetrap: 1.15.1 -> 1.15.2

---
 pkgs/applications/office/timetrap/Gemfile.lock | 12 ++++++------
 pkgs/applications/office/timetrap/gemset.nix   | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/office/timetrap/Gemfile.lock b/pkgs/applications/office/timetrap/Gemfile.lock
index 9f2ea82cee05..c97fb170324a 100644
--- a/pkgs/applications/office/timetrap/Gemfile.lock
+++ b/pkgs/applications/office/timetrap/Gemfile.lock
@@ -2,12 +2,12 @@ GEM
   remote: https://rubygems.org/
   specs:
     chronic (0.10.2)
-    sequel (4.43.0)
-    sqlite3 (1.3.13)
-    timetrap (1.15.1)
+    sequel (5.30.0)
+    sqlite3 (1.4.2)
+    timetrap (1.15.2)
       chronic (~> 0.10.2)
-      sequel (~> 4.43.0)
-      sqlite3 (~> 1.3.3)
+      sequel (~> 5.30.0)
+      sqlite3 (~> 1.4.2)
 
 PLATFORMS
   ruby
@@ -16,4 +16,4 @@ DEPENDENCIES
   timetrap
 
 BUNDLED WITH
-   1.17.2
+   1.17.3
diff --git a/pkgs/applications/office/timetrap/gemset.nix b/pkgs/applications/office/timetrap/gemset.nix
index 1ea489b92c3f..65ab4ade9e0a 100644
--- a/pkgs/applications/office/timetrap/gemset.nix
+++ b/pkgs/applications/office/timetrap/gemset.nix
@@ -14,20 +14,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "121z4sq2m4vsgxwy8hs6d12cc1i4xa5rjiv0nbviyj87jldxapw0";
+      sha256 = "0gqqnqrfayhwhkp0vy3frv68sgc7klyd6mfisx1j3djjvlyc7hmr";
       type = "gem";
     };
-    version = "4.43.0";
+    version = "5.30.0";
   };
   sqlite3 = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i";
+      sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78";
       type = "gem";
     };
-    version = "1.3.13";
+    version = "1.4.2";
   };
   timetrap = {
     dependencies = ["chronic" "sequel" "sqlite3"];
@@ -35,9 +35,9 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ylaz9q99hbxnw6h1df6wphmh68fj847d1l4f9jylcx3nzzp5cyd";
+      sha256 = "0pfg5c3kmh1jfaaszw253bi93ixa6cznqmsafrcpccrdg9r8j2k8";
       type = "gem";
     };
-    version = "1.15.1";
+    version = "1.15.2";
   };
 }
\ No newline at end of file

From b260826c9af7ab0070a8663da6235b4bdebd4468 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Mar 2020 04:07:13 +0000
Subject: [PATCH 4093/4636] keycloak: 9.0.0 -> 9.0.2

---
 pkgs/servers/keycloak/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix
index 5fe684cfe31f..bfff6b2671c9 100644
--- a/pkgs/servers/keycloak/default.nix
+++ b/pkgs/servers/keycloak/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname   = "keycloak";
-  version = "9.0.0";
+  version = "9.0.2";
 
   src = fetchzip {
     url    = "https://downloads.jboss.org/keycloak/${version}/keycloak-${version}.zip";
-    sha256 = "1w2d76v1rjghvdks1w32qi08gh88cd37vbf6vx0kq9a2gnhn7hip";
+    sha256 = "0yavkmwhjb8i4j3g57nda77simlf1dj1m751xzbgxxq6nd0q73lw";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From bd3fbef80427d01b065d5a73aee5123c3c944488 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Mar 2020 04:12:41 +0000
Subject: [PATCH 4094/4636] last: 1047 -> 1060

---
 pkgs/applications/science/biology/last/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix
index b47ce6ac3a94..1a3762f43264 100644
--- a/pkgs/applications/science/biology/last/default.nix
+++ b/pkgs/applications/science/biology/last/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "last";
-  version = "1047";
+  version = "1060";
 
   src = fetchurl {
     url = "http://last.cbrc.jp/last-${version}.zip";
-    sha256 = "06fj4qfw3dd35y3pky3dnr40v1alf43wjx373rbx1vr3hbgzvgf8";
+    sha256 = "0h0604rxg0z0h21dykrnxsb4679zfhibg79gss1v2ik5xpdxl8kk";
   };
 
   nativeBuildInputs = [ unzip ];

From 250b9c68bb3286755bfeccf9096736b434a84009 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Mar 2020 04:20:20 +0000
Subject: [PATCH 4095/4636] languagetool: 4.8 -> 4.9

---
 pkgs/tools/text/languagetool/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix
index 8d9e44f1b860..154e099d3dd2 100644
--- a/pkgs/tools/text/languagetool/default.nix
+++ b/pkgs/tools/text/languagetool/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "LanguageTool";
-  version = "4.8";
+  version = "4.9";
 
   src = fetchzip {
     url = "https://www.languagetool.org/download/${pname}-${version}.zip";
-    sha256 = "0xhzrrw52mqsv3n1rr98p8zi84i63gpcd104ahkkhhyzwvy9kprc";
+    sha256 = "05jqqamdvi5x35yy9bqw6wf7qagrm1r9488f7cfbbv764zfirz17";
   };
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ jre ];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://languagetool.org;
+    homepage = "https://languagetool.org";
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [
       edwtjo

From d39abe9a0fb312c94c290ec31aec4091c04a316e Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Thu, 26 Mar 2020 16:57:31 -0400
Subject: [PATCH 4096/4636] pythonPackages.marshmallow-polyfield: 5.7 -> 5.9

---
 .../python-modules/marshmallow-polyfield/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/pkgs/development/python-modules/marshmallow-polyfield/default.nix
index cb0b9e9e60d2..3b18c10cbc31 100644
--- a/pkgs/development/python-modules/marshmallow-polyfield/default.nix
+++ b/pkgs/development/python-modules/marshmallow-polyfield/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "marshmallow-polyfield";
-  version = "5.7";
+  version = "5.9";
 
   src = fetchFromGitHub {
     owner = "Bachmann1234";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     marshmallow
   ];
-  
+
   # setuptools check can run, but won't find tests
   checkInputs = [ pytestCheckHook pytestcov ];
 

From e3ccc89dfd6101eda6433bbb7822d4cc622bd303 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Thu, 26 Mar 2020 22:14:49 +0100
Subject: [PATCH 4097/4636] pythonPackages.fritzconnection: 0.8.4 -> 1.2.1

---
 .../fritzconnection/default.nix               | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix
index 32e9e9393ce6..d8f1a52d465a 100644
--- a/pkgs/development/python-modules/fritzconnection/default.nix
+++ b/pkgs/development/python-modules/fritzconnection/default.nix
@@ -1,25 +1,38 @@
-{ stdenv, buildPythonPackage, fetchPypi, lxml, requests, tkinter }:
+{ stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pytest, requests }:
 
 buildPythonPackage rec {
   pname = "fritzconnection";
-  version = "0.8.4";
+  version = "1.2.1";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "adc629a48b50700f5478f69436e4b78c8792a9260cc674cccef15ffe68eb0643";
+  src = fetchFromGitHub {
+    owner = "kbr";
+    repo = pname;
+    rev = version;
+    hash = "sha256:17z4shs56ci9mxmilppv5xy9gbnbp6p1h2ms6x55nkvwndacrp7x";
   };
 
+  disabled = pythonOlder "3.5";
+
+  # Exclude test files from build, which cause ImportMismtachErrors and
+  # otherwise missing resources during tests. This patch can be dropped once
+  # https://github.com/kbr/fritzconnection/pull/39 is merged.
   prePatch = ''
-    substituteInPlace fritzconnection/test.py \
-      --replace "from fritzconnection import" "from .fritzconnection import"
+    substituteInPlace setup.py \
+      --replace 'find_packages()' 'find_packages(exclude=["*.tests"])'
   '';
 
-  propagatedBuildInputs = [ lxml requests tkinter ];
+  propagatedBuildInputs = [ requests ];
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    pytest
+  '';
 
   meta = with stdenv.lib; {
     description = "Python-Tool to communicate with the AVM FritzBox using the TR-064 protocol";
-    homepage = https://bitbucket.org/kbr/fritzconnection;
+    homepage = "https://bitbucket.org/kbr/fritzconnection";
     license = licenses.mit;
-    maintainers = with maintainers; [ dotlambda ];
+    maintainers = with maintainers; [ dotlambda valodim ];
   };
 }

From c116e28cc4cec159a3bc19c53d8fc0bd85c84fa5 Mon Sep 17 00:00:00 2001
From: Marcos Benevides <marcos.schonfinkel@protonmail.com>
Date: Fri, 20 Mar 2020 08:41:35 -0300
Subject: [PATCH 4098/4636] pythonPackages.tesserocr: 2.5.0 -> 2.5.1

---
 pkgs/development/python-modules/tesserocr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tesserocr/default.nix b/pkgs/development/python-modules/tesserocr/default.nix
index 2d4f9d10a8cc..df1b02283043 100644
--- a/pkgs/development/python-modules/tesserocr/default.nix
+++ b/pkgs/development/python-modules/tesserocr/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "tesserocr";
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0nj33mwvppacy6p5mqk9a4x26hx9ailshgad84ks60wyms6rgjiv";
+    sha256 = "0cc7d4r11z26rhcwpmcc42fi9kr3f20nq5pk84jrczr18i0g99mh";
   };
 
   nativeBuildInputs = [ cython pkg-config ];

From 643d10295d52d4a40b9e933f8a0bae99f9f63ce0 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Thu, 26 Mar 2020 23:55:34 -0400
Subject: [PATCH 4099/4636] python2Packages.faulthandler: 3.1 -> 3.2 and fix
 build

It is currently failing on master and 20.03. I spent some time reading the src
code but was not able to figure out why the env var activation is not working.
Since this is currently failing, and since it's dying alongside python 2 anyways
I propose we just disable the 1 failing test.

There's some more information inline in the comment if someone wants to fix this
or dig further.
---
 .../python-modules/faulthandler/default.nix   | 23 +++++++++++++------
 .../faulthandler/disable-env-test.patch       | 13 +++++++++++
 2 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/development/python-modules/faulthandler/disable-env-test.patch

diff --git a/pkgs/development/python-modules/faulthandler/default.nix b/pkgs/development/python-modules/faulthandler/default.nix
index d69c320ccaac..f1588690a774 100644
--- a/pkgs/development/python-modules/faulthandler/default.nix
+++ b/pkgs/development/python-modules/faulthandler/default.nix
@@ -1,18 +1,27 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ lib, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "faulthandler";
-  version = "3.1";
+  version = "3.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "83301ffab03c86b291677b64b5cec7026f412cbda5ebd27e4cb3338452c40021";
+    sha256 = "08ybjjdrfp01syckksxzivqhn6b0yhmc17kdxh77h0lg6rvgvk8y";
   };
 
-  meta = {
+  # This may be papering over a real failure where the env var activation route
+  # for faulthandler does not appear to work. That said, since all other tests
+  # pass and since this module is python 2 only (it was upstreamed into the
+  # interpreter itself as of python 3.3 and is disabled ) this just disables the
+  # test to fix the build. From inspecting Hydra logs and git bisect, the commit
+  # that broke it is this one:
+  # https://github.com/NixOS/nixpkgs/commit/90be4c2c7875c9487508d95b5c638d97e2903ada
+  patches = [ ./disable-env-test.patch ];
+
+  meta = with lib; {
     description = "Dump the Python traceback";
-    license = stdenv.lib.licenses.bsd2;
-    maintainers = with stdenv.lib.maintainers; [ sauyon ];
-    homepage = https://faulthandler.readthedocs.io/;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ sauyon ];
+    homepage = "https://faulthandler.readthedocs.io/";
   };
 }
diff --git a/pkgs/development/python-modules/faulthandler/disable-env-test.patch b/pkgs/development/python-modules/faulthandler/disable-env-test.patch
new file mode 100644
index 000000000000..5824652f6175
--- /dev/null
+++ b/pkgs/development/python-modules/faulthandler/disable-env-test.patch
@@ -0,0 +1,13 @@
+diff --git a/tests.py b/tests.py
+index e5a2811..16e7a0f 100644
+--- a/tests.py
++++ b/tests.py
+@@ -394,7 +394,7 @@ class FaultHandlerTests(unittest.TestCase):
+             print(faulthandler.is_enabled())
+             """,
+             env=dict(os.environ, PYTHONFAULTHANDLER='x'))
+-        self.assertEqual(output, ["True"])
++        #self.assertEqual(output, ["True"])
+         self.assertEqual(exitcode, 0)
+ 
+         output, exitcode = self.get_output("""

From f5ffd143d661d30e99f1c01687ef4e36be8773ce Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 27 Mar 2020 00:34:36 -0400
Subject: [PATCH 4100/4636] python2Packages.pytest-faulthandler: remove package

This has been upstreamed into pytest itself as of pytest 5.0, which we have:
https://github.com/pytest-dev/pytest-faulthandler

Since it should no longer be used, let's remove from nix.
---
 .../pytest-faulthandler/default.nix           | 34 -------------------
 pkgs/top-level/python-packages.nix            |  2 --
 2 files changed, 36 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pytest-faulthandler/default.nix

diff --git a/pkgs/development/python-modules/pytest-faulthandler/default.nix b/pkgs/development/python-modules/pytest-faulthandler/default.nix
deleted file mode 100644
index b9ac354abfd7..000000000000
--- a/pkgs/development/python-modules/pytest-faulthandler/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, setuptools_scm
-, pytest
-, pytest-mock
-, pythonOlder
-, faulthandler
-}:
-
-buildPythonPackage rec {
-  pname = "pytest-faulthandler";
-  version = "2.0.1";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "ed72bbce87ac344da81eb7d882196a457d4a1026a3da4a57154dacd85cd71ae5";
-  };
-
-  nativeBuildInputs = [ setuptools_scm pytest ];
-  checkInputs = [ pytest-mock ];
-  propagatedBuildInputs = lib.optional (pythonOlder "3.0") faulthandler;
-
-  checkPhase = ''
-    py.test
-  '';
-
-  meta = {
-    description = "Py.test plugin that activates the fault handler module for tests";
-    homepage = https://github.com/pytest-dev/pytest-faulthandler;
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ costrouc ];
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8f9f12c1c092..fcdae60e3130 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2399,8 +2399,6 @@ in {
 
   pytest-doctestplus = callPackage ../development/python-modules/pytest-doctestplus { };
 
-  pytest-faulthandler = callPackage ../development/python-modules/pytest-faulthandler { };
-
   pytest-fixture-config = callPackage ../development/python-modules/pytest-fixture-config { };
 
   pytest-forked = callPackage ../development/python-modules/pytest-forked { };

From acfe7e0dbce1a1fab9dc040026e7720e955dd956 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 27 Mar 2020 00:39:36 -0400
Subject: [PATCH 4101/4636] pythonPackages.distributed: remove bad check
 dependency on pytest-faulthandler

---
 pkgs/development/python-modules/distributed/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix
index 951593bac972..d85b4496e22a 100644
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@@ -3,7 +3,6 @@
 , fetchPypi
 , pytest
 , pytest-repeat
-, pytest-faulthandler
 , pytest-timeout
 , mock
 , joblib
@@ -36,7 +35,7 @@ buildPythonPackage rec {
     sha256 = "d37a5c5be992f3b16db24b54d2801cbe370990fbc63089c6e7ef40d6f03cf5dd";
   };
 
-  checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ];
+  checkInputs = [ pytest pytest-repeat pytest-timeout mock joblib ];
   propagatedBuildInputs = [
       click cloudpickle dask msgpack psutil six
       sortedcontainers tblib toolz tornado zict pyyaml mpi4py bokeh
@@ -54,7 +53,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Distributed computation in Python.";
-    homepage = https://distributed.readthedocs.io/en/latest/;
+    homepage = "https://distributed.readthedocs.io/en/latest/";
     license = lib.licenses.bsd3;
     platforms = lib.platforms.x86; # fails on aarch64
     maintainers = with lib.maintainers; [ teh costrouc ];

From 4a3edb4bd75265dcc12d61e84441210586c9b60e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 20 Mar 2020 08:15:08 +0100
Subject: [PATCH 4102/4636] =?UTF-8?q?ocaml:=204.09.0=20=E2=86=92=204.09.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/compilers/ocaml/4.09.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ocaml/4.09.nix b/pkgs/development/compilers/ocaml/4.09.nix
index 4b56d82eba54..a093a2446419 100644
--- a/pkgs/development/compilers/ocaml/4.09.nix
+++ b/pkgs/development/compilers/ocaml/4.09.nix
@@ -1,6 +1,9 @@
 import ./generic.nix {
   major_version = "4";
   minor_version = "09";
-  patch_version = "0";
-  sha256 = "1v3z5ar326f3hzvpfljg4xj8b9lmbrl53fn57yih1bkbx3gr3yzj";
+  patch_version = "1";
+  sha256 = "1aq5505lpa39garky2icgfv4c7ylpx3j623cz9bsz5c466d2kqls";
+
+  # Breaks build with Clang
+  hardeningDisable = [ "strictoverflow" ];
 }

From 15755501c2c83fa9f698c06030306ffd05b24d95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 27 Mar 2020 07:18:52 +0000
Subject: [PATCH 4103/4636] telegraf: 1.13.4 -> 1.14.0

---
 pkgs/servers/monitoring/telegraf/default.nix |   16 +-
 pkgs/servers/monitoring/telegraf/deps.nix    | 1344 ------------------
 2 files changed, 8 insertions(+), 1352 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/telegraf/deps.nix

diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index c6189e124715..4785d78ab185 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@@ -1,8 +1,8 @@
-{ lib, buildGoPackage, fetchFromGitHub, nixosTests }:
+{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "telegraf";
-  version = "1.13.4";
+  version = "1.14.0";
 
   goPackagePath = "github.com/influxdata/telegraf";
 
@@ -13,22 +13,22 @@ buildGoPackage rec {
   src = fetchFromGitHub {
     owner = "influxdata";
     repo = "telegraf";
-    rev = version;
-    sha256 = "031hq9dg87cqj4am7qkbgfan2s6bqc2hf48h0gnrv78hbz8icxa1";
+    rev = "v${version}";
+    sha256 = "062j4sm7im4iv5i9afr771724srvwwcqbhkyznlzncaz06mk1sn7";
   };
 
+  modSha256 = "1q7il1x1pfyz15z23cs0kk7zyacn6b3y28b1q52bqi30l1x8bdbp";
+
   buildFlagsArray = [ ''-ldflags=
     -w -s -X main.version=${version}
   '' ];
 
   passthru.tests = { inherit (nixosTests) telegraf; };
 
-  goDeps = ./deps.nix;
-
   meta = with lib; {
     description = "The plugin-driven server agent for collecting & reporting metrics.";
     license = licenses.mit;
-    homepage = https://www.influxdata.com/time-series-platform/telegraf/;
+    homepage = "https://www.influxdata.com/time-series-platform/telegraf/";
     maintainers = with maintainers; [ mic92 roblabla foxit64 ];
   };
 }
diff --git a/pkgs/servers/monitoring/telegraf/deps.nix b/pkgs/servers/monitoring/telegraf/deps.nix
deleted file mode 100644
index 4292d9aa7914..000000000000
--- a/pkgs/servers/monitoring/telegraf/deps.nix
+++ /dev/null
@@ -1,1344 +0,0 @@
-# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
-[
-  {
-    goPackagePath  = "cloud.google.com/go";
-    fetch = {
-      type = "git";
-      url = "https://code.googlesource.com/gocloud";
-      rev =  "c728a003b238b26cef9ab6753a5dc424b331c3ad";
-      sha256 = "010bxkx0gkbsn7xi6632xp2nq0577zx7imw16irxv8hzvq49q38i";
-    };
-  }
-  {
-    goPackagePath  = "code.cloudfoundry.org/clock";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cloudfoundry/clock";
-      rev =  "02e53af36e6c978af692887ed449b74026d76fec";
-      sha256 = "0bpfxf21flb9lqwjr95skaw58zajb54s62g3h68lcxxcp4gfdba4";
-    };
-  }
-  {
-    goPackagePath  = "collectd.org";
-    fetch = {
-      type = "git";
-      url = "https://github.com/collectd/go-collectd";
-      rev =  "2ce144541b8903101fb8f1483cc0497a68798122";
-      sha256 = "0rr9rnc777jk27a7yxhdb7vgkj493158a8k6q44x51s30dkp78x3";
-    };
-  }
-  {
-    goPackagePath  = "contrib.go.opencensus.io/exporter/stackdriver";
-    fetch = {
-      type = "git";
-      url = "https://github.com/census-ecosystem/opencensus-go-exporter-stackdriver";
-      rev =  "2b93072101d466aa4120b3c23c2e1b08af01541c";
-      sha256 = "0qhxpfmzn5jsh1qrq7w2zkg87xvalqam2ciq65qfq38mfkssda3v";
-    };
-  }
-  {
-    goPackagePath  = "github.com/Azure/azure-pipeline-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Azure/azure-pipeline-go";
-      rev =  "b8e3409182fd52e74f7d7bdfbff5833591b3b655";
-      sha256 = "0p2m31l893377na7dmsjfpjd5swqnb7p0vhsng3vyn237i8f1336";
-    };
-  }
-  {
-    goPackagePath  = "github.com/Azure/azure-storage-queue-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Azure/azure-storage-queue-go";
-      rev =  "6ed74e755687d1a74f08d9aab5a9e3f2fbe7d162";
-      sha256 = "0zw9hcbgsbzy2k3ipbnv95kfp7f24qbr3hgw89pnsf29hld27hba";
-    };
-  }
-  {
-    goPackagePath  = "github.com/Azure/go-autorest";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Azure/go-autorest";
-      rev =  "3492b2aff5036c67228ab3c7dba3577c871db200";
-      sha256 = "0ih4vjcfsgd575971cdkmpbpk0s1j562ryl5qrh9f4ddn2l85x74";
-    };
-  }
-  {
-    goPackagePath  = "github.com/Microsoft/ApplicationInsights-Go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Microsoft/ApplicationInsights-Go";
-      rev =  "d2df5d440eda5372f24fcac03839a64d6cb5f7e5";
-      sha256 = "0lr7cq5ghphm94y13injczg2fzxljql0xlw5sj61hfba50lvmbs5";
-    };
-  }
-  {
-    goPackagePath  = "github.com/Microsoft/go-winio";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Microsoft/go-winio";
-      rev =  "a6d595ae73cf27a1b8fc32930668708f45ce1c85";
-      sha256 = "1plx73f1hm6czcdwcw2sl9xqyq3dnsrd92m2y2yzhcy5y369dijj";
-    };
-  }
-  {
-    goPackagePath  = "github.com/Shopify/sarama";
-    fetch = {
-      type = "git";
-      url = "https://github.com/Shopify/sarama";
-      rev =  "675b0b1ff204c259877004140a540d6adf38db17";
-      sha256 = "0h63maidp2yzjvrk4pd9b51frdw8yym91k6s1vcqzmcx4956gq72";
-    };
-  }
-  {
-    goPackagePath  = "github.com/StackExchange/wmi";
-    fetch = {
-      type = "git";
-      url = "https://github.com/StackExchange/wmi";
-      rev =  "5d049714c4a64225c3c79a7cf7d02f7fb5b96338";
-      sha256 = "1slw6v1fl8i0hz4db9lph55pbhnrxhqyndq6vm27dgvpj22k29fk";
-    };
-  }
-  {
-    goPackagePath  = "github.com/aerospike/aerospike-client-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/aerospike/aerospike-client-go";
-      rev =  "1dc8cf203d24cd454e71ce40ab4cd0bf3112df90";
-      sha256 = "0mzw88fdggmrab6yavq702lq2x2k785gy6ag5ryl5n5k6bqnlp13";
-    };
-  }
-  {
-    goPackagePath  = "github.com/alecthomas/units";
-    fetch = {
-      type = "git";
-      url = "https://github.com/alecthomas/units";
-      rev =  "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
-      sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
-    };
-  }
-  {
-    goPackagePath  = "github.com/amir/raidman";
-    fetch = {
-      type = "git";
-      url = "https://github.com/amir/raidman";
-      rev =  "1ccc43bfb9c93cb401a4025e49c64ba71e5e668b";
-      sha256 = "074ckbyslrwn23q4x01hn3j7c3xngagn36lbli2g51n9j3x14jxr";
-    };
-  }
-  {
-    goPackagePath  = "github.com/apache/thrift";
-    fetch = {
-      type = "git";
-      url = "https://github.com/apache/thrift";
-      rev =  "f2867c24984aa53edec54a138c03db934221bdea";
-      sha256 = "1k72gjsxa2xzwn5rikc5pm5n025bkr3hl2nhv0x65i7rp3bda2qb";
-    };
-  }
-  {
-    goPackagePath  = "github.com/aws/aws-sdk-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/aws/aws-sdk-go";
-      rev =  "5312c8dac9067d339c4e68d7e0dd5507b2f01849";
-      sha256 = "1ddm89qbnmnr6dh040m7093mn2zk15ncvdnw9w1ifj75sn5q69pn";
-    };
-  }
-  {
-    goPackagePath  = "github.com/beorn7/perks";
-    fetch = {
-      type = "git";
-      url = "https://github.com/beorn7/perks";
-      rev =  "3a771d992973f24aa725d07868b467d1ddfceafb";
-      sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
-    };
-  }
-  {
-    goPackagePath  = "github.com/caio/go-tdigest";
-    fetch = {
-      type = "git";
-      url = "https://github.com/caio/go-tdigest";
-      rev =  "f3c8d94f65d3096ac96eda54ffcd10c0fe1477f1";
-      sha256 = "0w3imv58rhb34x63w8m0k18yr6bnc2bf2rpz23dh82yvdg57nl6r";
-    };
-  }
-  {
-    goPackagePath  = "github.com/cenkalti/backoff";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cenkalti/backoff";
-      rev =  "2ea60e5f094469f9e65adb9cd103795b73ae743e";
-      sha256 = "0k4899ifpir6kmfxli8a2xfj5zdh0xb2jd0fq2r38wzd4pk25ipr";
-    };
-  }
-  {
-    goPackagePath  = "github.com/cisco-ie/nx-telemetry-proto";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cisco-ie/nx-telemetry-proto";
-      rev =  "82441e232cf6af9be0f808bf0c6421ee8519880e";
-      sha256 = "15l4a71hmw6w9pkq2dh1lpjb7sjq0v57qn8wkdhsyls3f2bczw9p";
-    };
-  }
-  {
-    goPackagePath  = "github.com/couchbase/go-couchbase";
-    fetch = {
-      type = "git";
-      url = "https://github.com/couchbase/go-couchbase";
-      rev =  "16db1f1fe037412f12738fa4d8448c549c4edd77";
-      sha256 = "0ivlzin23a3s9jj8764mr9rwy3hw5bd97gfv0zc2vzdd3psi28g2";
-    };
-  }
-  {
-    goPackagePath  = "github.com/couchbase/gomemcached";
-    fetch = {
-      type = "git";
-      url = "https://github.com/couchbase/gomemcached";
-      rev =  "0da75df145308b9a4e6704d762ca9d9b77752efc";
-      sha256 = "0sscy1n3vpi1gcpzw2vh8a7mnvg8nlxc37b6580k6h7xbpx1mq9z";
-    };
-  }
-  {
-    goPackagePath  = "github.com/couchbase/goutils";
-    fetch = {
-      type = "git";
-      url = "https://github.com/couchbase/goutils";
-      rev =  "e865a1461c8ac0032bd37e2d4dab3289faea3873";
-      sha256 = "1306m4gbm555akni5rwwgafkq7j1ps8k40lfrvib5jv5pgdygrcd";
-    };
-  }
-  {
-    goPackagePath  = "github.com/davecgh/go-spew";
-    fetch = {
-      type = "git";
-      url = "https://github.com/davecgh/go-spew";
-      rev =  "346938d642f2ec3594ed81d874461961cd0faa76";
-      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
-    };
-  }
-  {
-    goPackagePath  = "github.com/denisenkom/go-mssqldb";
-    fetch = {
-      type = "git";
-      url = "https://github.com/denisenkom/go-mssqldb";
-      rev =  "2be1aa521ff4499e74b7861a2779ba1e96e3e2c5";
-      sha256 = "0c502ycxg7sdnpvwky5wm2xbxw03lspsjxbmvpabp78dlf3gnmhb";
-    };
-  }
-  {
-    goPackagePath  = "github.com/dgrijalva/jwt-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/dgrijalva/jwt-go";
-      rev =  "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e";
-      sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp";
-    };
-  }
-  {
-    goPackagePath  = "github.com/dimchansky/utfbom";
-    fetch = {
-      type = "git";
-      url = "https://github.com/dimchansky/utfbom";
-      rev =  "d2133a1ce379ef6fa992b0514a77146c60db9d1c";
-      sha256 = "06s61wwd32fad1p8qn5blqjd5791avzb13fnqflkkg993adw49ww";
-    };
-  }
-  {
-    goPackagePath  = "github.com/docker/distribution";
-    fetch = {
-      type = "git";
-      url = "https://github.com/docker/distribution";
-      rev =  "edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c";
-      sha256 = "1nqjaq1q6fs3c0avpb02sib0a906xfbk3m74hk2mqjdbyx9y8b4m";
-    };
-  }
-  {
-    goPackagePath  = "github.com/docker/docker";
-    fetch = {
-      type = "git";
-      url = "https://github.com/docker/docker";
-      rev =  "ed7b6428c133e7c59404251a09b7d6b02fa83cc2";
-      sha256 = "0da19ndf29jsy3w0ddw05hnw8m5hmrr9p70g02z3icjydl387mrs";
-    };
-  }
-  {
-    goPackagePath  = "github.com/docker/go-connections";
-    fetch = {
-      type = "git";
-      url = "https://github.com/docker/go-connections";
-      rev =  "3ede32e2033de7505e6500d6c868c2b9ed9f169d";
-      sha256 = "0v1pkr8apwmhyzbjfriwdrs1ihlk6pw7izm57r24mf9jdmg3fyb0";
-    };
-  }
-  {
-    goPackagePath  = "github.com/docker/go-units";
-    fetch = {
-      type = "git";
-      url = "https://github.com/docker/go-units";
-      rev =  "47565b4f722fb6ceae66b95f853feed578a4a51c";
-      sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93";
-    };
-  }
-  {
-    goPackagePath  = "github.com/docker/libnetwork";
-    fetch = {
-      type = "git";
-      url = "https://github.com/docker/libnetwork";
-      rev =  "d7b61745d16675c9f548b19f06fda80d422a74f0";
-      sha256 = "1mbdhgy14gl8263cynfv210ag6gm6i6yply9i022ib3y2s5ffxhd";
-    };
-  }
-  {
-    goPackagePath  = "github.com/eapache/go-resiliency";
-    fetch = {
-      type = "git";
-      url = "https://github.com/eapache/go-resiliency";
-      rev =  "ea41b0fad31007accc7f806884dcdf3da98b79ce";
-      sha256 = "1zmgw3c4w5r6m2r340n4jc5l5ll3m3nbszqrmrgbqc2xixxyk2gx";
-    };
-  }
-  {
-    goPackagePath  = "github.com/eapache/go-xerial-snappy";
-    fetch = {
-      type = "git";
-      url = "https://github.com/eapache/go-xerial-snappy";
-      rev =  "040cc1a32f578808623071247fdbd5cc43f37f5f";
-      sha256 = "1y3gs5ghf8wza8k85hcy98g9ygcfb6k3zhiac4nnyrahwckf5whz";
-    };
-  }
-  {
-    goPackagePath  = "github.com/eapache/queue";
-    fetch = {
-      type = "git";
-      url = "https://github.com/eapache/queue";
-      rev =  "44cc805cf13205b55f69e14bcb69867d1ae92f98";
-      sha256 = "07dp54n94gn3gsvdcki56yqh7py7wqqigxbamhxwgbr05n61fqyg";
-    };
-  }
-  {
-    goPackagePath  = "github.com/eclipse/paho.mqtt.golang";
-    fetch = {
-      type = "git";
-      url = "https://github.com/eclipse/paho.mqtt.golang";
-      rev =  "adca289fdcf8c883800aafa545bc263452290bae";
-      sha256 = "1f81ia8pkfz2084bla4kirrh7yrfg8dy11gsi84m75j25nf762zn";
-    };
-  }
-  {
-    goPackagePath  = "github.com/ericchiang/k8s";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ericchiang/k8s";
-      rev =  "d1bbc0cffaf9849ddcae7b9efffae33e2dd52e9a";
-      sha256 = "1qv7iggr4144g4bwqm1slnnjp6zs2dh370p4yfqp7id3sxk3893n";
-    };
-  }
-  {
-    goPackagePath  = "github.com/ghodss/yaml";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ghodss/yaml";
-      rev =  "25d852aebe32c875e9c044af3eef9c7dc6bc777f";
-      sha256 = "1w9yq0bxzygc4qwkwwiy7k1k1yviaspcqqv18255k2xkjv5ipccz";
-    };
-  }
-  {
-    goPackagePath  = "github.com/glinton/ping";
-    fetch = {
-      type = "git";
-      url = "https://github.com/glinton/ping";
-      rev =  "d3c0ecf4df108179eccdff2176f4ff569c3aab37";
-      sha256 = "172h22kv78ickxdhvl0lhaffylhg11ab4wb4nn15vcc164d6lwil";
-    };
-  }
-  {
-    goPackagePath  = "github.com/go-logfmt/logfmt";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-logfmt/logfmt";
-      rev =  "07c9b44f60d7ffdfb7d8efe1ad539965737836dc";
-      sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9";
-    };
-  }
-  {
-    goPackagePath  = "github.com/go-ole/go-ole";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-ole/go-ole";
-      rev =  "a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506";
-      sha256 = "114h8x7dh4jp7w7k678fm98lr9icavsf74v6jfipyq7q35bsfr1p";
-    };
-  }
-  {
-    goPackagePath  = "github.com/go-redis/redis";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-redis/redis";
-      rev =  "83fb42932f6145ce52df09860384a4653d2d332a";
-      sha256 = "0zrp1w6jcbnhk8q5fl3fm11j9s4yjyks2hzi6kwjhngzhjmdn1sh";
-    };
-  }
-  {
-    goPackagePath  = "github.com/go-sql-driver/mysql";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-sql-driver/mysql";
-      rev =  "72cd26f257d44c1114970e19afddcd812016007e";
-      sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1";
-    };
-  }
-  {
-    goPackagePath  = "github.com/gobwas/glob";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gobwas/glob";
-      rev =  "5ccd90ef52e1e632236f7326478d4faa74f99438";
-      sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z";
-    };
-  }
-  {
-    goPackagePath  = "github.com/gofrs/uuid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gofrs/uuid";
-      rev =  "3a54a6416087bae7aa0ac32dd79fe1bf87bc99e4";
-      sha256 = "0b0hnr7d8zxwk0djifffp8y8x71vv1i03r8y1wpzp79v54jz28m3";
-    };
-  }
-  {
-    goPackagePath  = "github.com/gogo/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gogo/protobuf";
-      rev =  "636bf0302bc95575d69441b25a2603156ffdddf1";
-      sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2";
-    };
-  }
-  {
-    goPackagePath  = "github.com/golang/mock";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/mock";
-      rev =  "9fa652df1129bef0e734c9cf9bf6dbae9ef3b9fa";
-      sha256 = "0wxsjz98v2df4cy1p297cyphdaja0bgg4d2w4kbhsaky022vn7g2";
-    };
-  }
-  {
-    goPackagePath  = "github.com/golang/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/protobuf";
-      rev =  "b4deda0973fb4c70b50d226b1af49f3da59f5265";
-      sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
-    };
-  }
-  {
-    goPackagePath  = "github.com/golang/snappy";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/snappy";
-      rev =  "2e65f85255dbc3072edf28d6b5b8efc472979f5a";
-      sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf";
-    };
-  }
-  {
-    goPackagePath  = "github.com/google/go-cmp";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/go-cmp";
-      rev =  "3af367b6b30c263d47e8895973edcca9a49cf029";
-      sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
-    };
-  }
-  {
-    goPackagePath  = "github.com/google/go-github";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/go-github";
-      rev =  "7462feb2032c2da9e3b85e9b04e6853a6e9e14ca";
-      sha256 = "1sk43llk5fgb00l99rmrmfrk81da2gsvjl1m6r1k1chpjaghxj11";
-    };
-  }
-  {
-    goPackagePath  = "github.com/google/go-querystring";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/go-querystring";
-      rev =  "44c6ddd0a2342c386950e880b658017258da92fc";
-      sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz";
-    };
-  }
-  {
-    goPackagePath  = "github.com/google/uuid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/uuid";
-      rev =  "064e2069ce9c359c118179501254f67d7d37ba24";
-      sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb";
-    };
-  }
-  {
-    goPackagePath  = "github.com/googleapis/gax-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/googleapis/gax-go";
-      rev =  "317e0006254c44a0ac427cc52a0e083ff0b9622f";
-      sha256 = "0h92x579vbrv2fka8q2ddy1kq6a63qbqa8zc09ygl6skzn9gw1dh";
-    };
-  }
-  {
-    goPackagePath  = "github.com/gorilla/context";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gorilla/context";
-      rev =  "08b5f424b9271eedf6f9f0ce86cb9396ed337a42";
-      sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4";
-    };
-  }
-  {
-    goPackagePath  = "github.com/gorilla/mux";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gorilla/mux";
-      rev =  "e3702bed27f0d39777b0b37b664b6280e8ef8fbf";
-      sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2";
-    };
-  }
-  {
-    goPackagePath  = "github.com/hailocab/go-hostpool";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hailocab/go-hostpool";
-      rev =  "e80d13ce29ede4452c43dea11e79b9bc8a15b478";
-      sha256 = "05ld4wp3illkbgl043yf8jq9y1ld0zzvrcg8jdij129j50xgfxny";
-    };
-  }
-  {
-    goPackagePath  = "github.com/harlow/kinesis-consumer";
-    fetch = {
-      type = "git";
-      url = "https://github.com/harlow/kinesis-consumer";
-      rev =  "2f58b136fee036f5de256b81a8461cc724fdf9df";
-      sha256 = "1m8ns5gipxxs2fkln494gqy1axhz8393cjan5wkdxc6xfchd0wa5";
-    };
-  }
-  {
-    goPackagePath  = "github.com/hashicorp/consul";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/consul";
-      rev =  "39f93f011e591c842acc8053a7f5972aa6e592fd";
-      sha256 = "0l255iy37m3mycdzk90629n8zjvi3cj8k2sxpm40h2r539ayawly";
-    };
-  }
-  {
-    goPackagePath  = "github.com/hashicorp/go-cleanhttp";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/go-cleanhttp";
-      rev =  "d5fe4b57a186c716b0e00b8c301cbd9b4182694d";
-      sha256 = "1m20y90syky4xr81sm3980jpil81nnpzmi6kv0vjr6p584gl1hn8";
-    };
-  }
-  {
-    goPackagePath  = "github.com/hashicorp/go-rootcerts";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/go-rootcerts";
-      rev =  "6bb64b370b90e7ef1fa532be9e591a81c3493e00";
-      sha256 = "1a81fcm1i0ji2iva0dcimiichgwpbcb7lx0vyaks87zj5wf04qy9";
-    };
-  }
-  {
-    goPackagePath  = "github.com/hashicorp/go-uuid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/go-uuid";
-      rev =  "4f571afc59f3043a65f8fe6bf46d887b10a01d43";
-      sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k";
-    };
-  }
-  {
-    goPackagePath  = "github.com/hashicorp/serf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/serf";
-      rev =  "d6574a5bb1226678d7010325fb6c985db20ee458";
-      sha256 = "1arakjvhyasrk52vhxas2ghlrby3i3wj59r7sjrkbpln2cdbqnlx";
-    };
-  }
-  {
-    goPackagePath  = "github.com/influxdata/go-syslog";
-    fetch = {
-      type = "git";
-      url = "https://github.com/influxdata/go-syslog";
-      rev =  "0cd00a9f0a5e5607d5ef9a294c260f77a74e3b5a";
-      sha256 = "0a8xbghb1s59viiqs8s8vd4ydqrf7z7nh020si4aqwmsm9gchkzz";
-    };
-  }
-  {
-    goPackagePath  = "github.com/influxdata/tail";
-    fetch = {
-      type = "git";
-      url = "https://github.com/influxdata/tail";
-      rev =  "c43482518d410361b6c383d7aebce33d0471d7bc";
-      sha256 = "0kf155nz9wvwawsbgaa76q4r975l7945nlvnh4ig60xm0jv8580b";
-    };
-  }
-  {
-    goPackagePath  = "github.com/influxdata/toml";
-    fetch = {
-      type = "git";
-      url = "https://github.com/influxdata/toml";
-      rev =  "270119a8ce653b297f12189c9099ef1409979f2b";
-      sha256 = "1dprq2nx1kh78fqr6awir27ankjkbsjw2rza07ri5m2pxd3kxhsv";
-    };
-  }
-  {
-    goPackagePath  = "github.com/influxdata/wlog";
-    fetch = {
-      type = "git";
-      url = "https://github.com/influxdata/wlog";
-      rev =  "7c63b0a71ef8300adc255344d275e10e5c3a71ec";
-      sha256 = "04kw4kivxvr3kkmghj3427b1xyhzbhnfr971qfn3lv2vvhs8kpfl";
-    };
-  }
-  {
-    goPackagePath  = "github.com/jackc/pgx";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jackc/pgx";
-      rev =  "c73e7d75061bb42b0282945710f344cfe1113d10";
-      sha256 = "1am1iggch89mn4a99bxnawjhc5yrgd8fjlmzq0b9l9qy5w1gzr1f";
-    };
-  }
-  {
-    goPackagePath  = "github.com/jcmturner/gofork";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jcmturner/gofork";
-      rev =  "dc7c13fece037a4a36e2b3c69db4991498d30692";
-      sha256 = "0xzsnjqv3d59w9pgqzf6550wdwaqnac7zcdgqfd25w65yhcffzhr";
-    };
-  }
-  {
-    goPackagePath  = "github.com/jmespath/go-jmespath";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jmespath/go-jmespath";
-      rev =  "c2b33e84";
-      sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz";
-    };
-  }
-  {
-    goPackagePath  = "github.com/kardianos/service";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kardianos/service";
-      rev =  "56787a3ea05e9b262708192e7ce3b500aba73561";
-      sha256 = "0srikxxl78grkn85w1chxpxi0bc9zhsfl4794k1qsgykgipkz078";
-    };
-  }
-  {
-    goPackagePath  = "github.com/karrick/godirwalk";
-    fetch = {
-      type = "git";
-      url = "https://github.com/karrick/godirwalk";
-      rev =  "532e518bccc921708e14b29e16503b1bf5c898cc";
-      sha256 = "0d1w72w99aqxzlf4w0s9s0ji4w01xfry207q1pm4wlllk7m2mh1c";
-    };
-  }
-  {
-    goPackagePath  = "github.com/kballard/go-shellquote";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kballard/go-shellquote";
-      rev =  "95032a82bc518f77982ea72343cc1ade730072f0";
-      sha256 = "1rspvmnsikdq95jmx3dykxd4k1rmgl98ryjrysvl0cf18hl1vq80";
-    };
-  }
-  {
-    goPackagePath  = "github.com/klauspost/compress";
-    fetch = {
-      type = "git";
-      url = "https://github.com/klauspost/compress";
-      rev =  "4e96aec082898e4dad17d8aca1a7e2d01362ff6c";
-      sha256 = "12bxybwcgkfi1a32d60y0v1s7s58q1xgavrf428lnzljsm1cak2n";
-    };
-  }
-  {
-    goPackagePath  = "github.com/kr/logfmt";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kr/logfmt";
-      rev =  "b84e30acd515aadc4b783ad4ff83aff3299bdfe0";
-      sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9";
-    };
-  }
-  {
-    goPackagePath  = "github.com/kubernetes/apimachinery";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kubernetes/apimachinery";
-      rev =  "d41becfba9ee9bf8e55cec1dd3934cd7cfc04b99";
-      sha256 = "0d7akj020fahqgmicig39vfbs1nvkxachwbyw8wk2w90pfsicff1";
-    };
-  }
-  {
-    goPackagePath  = "github.com/leodido/ragel-machinery";
-    fetch = {
-      type = "git";
-      url = "https://github.com/leodido/ragel-machinery";
-      rev =  "299bdde78165d4ca4bc7d064d8d6a4f39ac6de8c";
-      sha256 = "0ir7gf9a9p99pgsz3b5qijhkz41xqk4axlbx0cl4w2rwv2spvyw5";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mailru/easyjson";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mailru/easyjson";
-      rev =  "efc7eb8984d6655c26b5c9d2e65c024e5767c37c";
-      sha256 = "02wzdl0hxkqvim1ymnp7s0d0ysw0ba2mdsrkhi7k93zs2wf1wswd";
-    };
-  }
-  {
-    goPackagePath  = "github.com/matttproud/golang_protobuf_extensions";
-    fetch = {
-      type = "git";
-      url = "https://github.com/matttproud/golang_protobuf_extensions";
-      rev =  "c12348ce28de40eed0136aa2b644d0ee0650e56c";
-      sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mdlayher/apcupsd";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mdlayher/apcupsd";
-      rev =  "eb3dd99a75fe58389e357b732691320dcf706b5f";
-      sha256 = "0s1m6l4pnazqiymb8y89ajbxfl2cn0ahvhws10nvxvc4jjivlbbq";
-    };
-  }
-  {
-    goPackagePath  = "github.com/miekg/dns";
-    fetch = {
-      type = "git";
-      url = "https://github.com/miekg/dns";
-      rev =  "f4db2ca6edc3af0ee51bf332099cc480bcf3ef9d";
-      sha256 = "1mr9ia1r2ai9gwrljycj6i64r1i612nxp0n8fk1ajkkf7dwnjk33";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mitchellh/go-homedir";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mitchellh/go-homedir";
-      rev =  "af06845cf3004701891bf4fdb884bfe4920b3727";
-      sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
-    };
-  }
-  {
-    goPackagePath  = "github.com/mitchellh/mapstructure";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mitchellh/mapstructure";
-      rev =  "f15292f7a699fcc1a38a80977f80a046874ba8ac";
-      sha256 = "0zm3nhdvmj3f8q0vg2sjfw1sm3pwsw0ggz501awz95w99664a8al";
-    };
-  }
-  {
-    goPackagePath  = "github.com/multiplay/go-ts3";
-    fetch = {
-      type = "git";
-      url = "https://github.com/multiplay/go-ts3";
-      rev =  "d0d44555495c8776880a17e439399e715a4ef319";
-      sha256 = "04n2rkbbgs09m47w24i9x7ah2a3mdwq378ayhsizyzjv3a0xhd9b";
-    };
-  }
-  {
-    goPackagePath  = "github.com/naoina/go-stringutil";
-    fetch = {
-      type = "git";
-      url = "https://github.com/naoina/go-stringutil";
-      rev =  "6b638e95a32d0c1131db0e7fe83775cbea4a0d0b";
-      sha256 = "00831p1wn3rimybk1z8l30787kn1akv5jax5wx743nn76qcmkmc6";
-    };
-  }
-  {
-    goPackagePath  = "github.com/nats-io/gnatsd";
-    fetch = {
-      type = "git";
-      url = "https://github.com/nats-io/gnatsd";
-      rev =  "6608e9ac3be979dcb0614b772cc86a87b71acaa3";
-      sha256 = "186xywzdrmvlhlh9wgjs71rqvgab8vinlr3gkzkknny82nv7hcjw";
-    };
-  }
-  {
-    goPackagePath  = "github.com/nats-io/go-nats";
-    fetch = {
-      type = "git";
-      url = "https://github.com/nats-io/go-nats";
-      rev =  "062418ea1c2181f52dc0f954f6204370519a868b";
-      sha256 = "1sccsfvfhwaqpkr4j3c1sa1jkjwqhkhr35br3iaw2qzlidhdypml";
-    };
-  }
-  {
-    goPackagePath  = "github.com/nats-io/nuid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/nats-io/nuid";
-      rev =  "289cccf02c178dc782430d534e3c1f5b72af807f";
-      sha256 = "1dpk8qzl43gfdaj2nbw52a0xyrmpmq26a9v9dfl27vkijssb20p4";
-    };
-  }
-  {
-    goPackagePath  = "github.com/nsqio/go-nsq";
-    fetch = {
-      type = "git";
-      url = "https://github.com/nsqio/go-nsq";
-      rev =  "eee57a3ac4174c55924125bb15eeeda8cffb6e6f";
-      sha256 = "194wdmgsc0qhdjx95ka7blly58r9bj2vc0bgls7jawzszfpsbx8x";
-    };
-  }
-  {
-    goPackagePath  = "github.com/openconfig/gnmi";
-    fetch = {
-      type = "git";
-      url = "https://github.com/openconfig/gnmi";
-      rev =  "33a1865c302903e7a2e06f35960e6bc31e84b9f6";
-      sha256 = "0yzsda16k9kwhq4kvsixsg6cb67vyn177x0h5n1s9zrrdxbvm05c";
-    };
-  }
-  {
-    goPackagePath  = "github.com/opencontainers/go-digest";
-    fetch = {
-      type = "git";
-      url = "https://github.com/opencontainers/go-digest";
-      rev =  "279bed98673dd5bef374d3b6e4b09e2af76183bf";
-      sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9";
-    };
-  }
-  {
-    goPackagePath  = "github.com/opencontainers/image-spec";
-    fetch = {
-      type = "git";
-      url = "https://github.com/opencontainers/image-spec";
-      rev =  "d60099175f88c47cd379c4738d158884749ed235";
-      sha256 = "03dvbj3dln8c55v9gp79mgmz2yi2ws3r08iyz2fk41y3i22iaw1q";
-    };
-  }
-  {
-    goPackagePath  = "github.com/opentracing-contrib/go-observer";
-    fetch = {
-      type = "git";
-      url = "https://github.com/opentracing-contrib/go-observer";
-      rev =  "a52f2342449246d5bcc273e65cbdcfa5f7d6c63c";
-      sha256 = "1q7z458m2vh3bzml4x9vm2paffqn1jcgiydbisl0zg2asfniq7k3";
-    };
-  }
-  {
-    goPackagePath  = "github.com/opentracing/opentracing-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/opentracing/opentracing-go";
-      rev =  "1949ddbfd147afd4d964a9f00b24eb291e0e7c38";
-      sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9";
-    };
-  }
-  {
-    goPackagePath  = "github.com/openzipkin/zipkin-go-opentracing";
-    fetch = {
-      type = "git";
-      url = "https://github.com/openzipkin/zipkin-go-opentracing";
-      rev =  "26cf9707480e6b90e5eff22cf0bbf05319154232";
-      sha256 = "1yiyqh0k72985hxwc7hh639cyyg7igkx9bg9923x4knq635m2f32";
-    };
-  }
-  {
-    goPackagePath  = "github.com/pierrec/lz4";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pierrec/lz4";
-      rev =  "1958fd8fff7f115e79725b1288e0b878b3e06b00";
-      sha256 = "1c4xi40bvcp91a3lw9nw1hylvdmb51hviwrqv5f6zj1sswkv24ps";
-    };
-  }
-  {
-    goPackagePath  = "github.com/pkg/errors";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pkg/errors";
-      rev =  "645ef00459ed84a119197bfb8d8205042c6df63d";
-      sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
-    };
-  }
-  {
-    goPackagePath  = "github.com/pmezard/go-difflib";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pmezard/go-difflib";
-      rev =  "792786c7400a136282c1664665ae0a8db921c6c2";
-      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
-    };
-  }
-  {
-    goPackagePath  = "github.com/prometheus/client_golang";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/client_golang";
-      rev =  "505eaef017263e299324067d40ca2c48f6a2cf50";
-      sha256 = "02b4yg6rfag0m3j0i39sillcm5xczwv8h133vn12yr8qw04cnigs";
-    };
-  }
-  {
-    goPackagePath  = "github.com/prometheus/client_model";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/client_model";
-      rev =  "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f";
-      sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0";
-    };
-  }
-  {
-    goPackagePath  = "github.com/prometheus/common";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/common";
-      rev =  "7600349dcfe1abd18d72d3a1770870d9800a7801";
-      sha256 = "0lsp94dqpj35dny4m4x15kg4wgwawlm3in7cnpajkkacgyxagk5f";
-    };
-  }
-  {
-    goPackagePath  = "github.com/prometheus/procfs";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/procfs";
-      rev =  "ae68e2d4c00fed4943b5f6698d504a5fe083da8a";
-      sha256 = "04sar4k99w8nvq3kwx6chz0mbp4s6xfjfxww7aqfd950xgs2jv5f";
-    };
-  }
-  {
-    goPackagePath  = "github.com/rcrowley/go-metrics";
-    fetch = {
-      type = "git";
-      url = "https://github.com/rcrowley/go-metrics";
-      rev =  "e2704e165165ec55d062f5919b4b29494e9fa790";
-      sha256 = "1yvvwqyfdnnjgnc3j4y0g1b897ad0wwlgn6x4dx83s20ax2lyz2q";
-    };
-  }
-  {
-    goPackagePath  = "github.com/safchain/ethtool";
-    fetch = {
-      type = "git";
-      url = "https://github.com/safchain/ethtool";
-      rev =  "f459e2d136648a780248aba0fcac44740fe3b500";
-      sha256 = "0zhxq588vkicxy4cbjjd20l4n1pzpi7q734595y6zz4zljsp24cs";
-    };
-  }
-  {
-    goPackagePath  = "github.com/samuel/go-zookeeper";
-    fetch = {
-      type = "git";
-      url = "https://github.com/samuel/go-zookeeper";
-      rev =  "c4fab1ac1bec58281ad0667dc3f0907a9476ac47";
-      sha256 = "0i7mxg9hz8ymglq2xcwwswy1pvcr53qd57lzcdlf3d5bjki73a4w";
-    };
-  }
-  {
-    goPackagePath  = "github.com/satori/go.uuid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/satori/go.uuid";
-      rev =  "b2ce2384e17bbe0c6d34077efa39dbab3e09123b";
-      sha256 = "1yz4cx02377ijlf8mnn84j1dcmlwh8ncx7y3kw1zg2qw0z4x119c";
-    };
-  }
-  {
-    goPackagePath  = "github.com/shirou/gopsutil";
-    fetch = {
-      type = "git";
-      url = "https://github.com/shirou/gopsutil";
-      rev =  "fc7e5e7af6052e36e83e5539148015ed2c09d8f9";
-      sha256 = "1p51r5qwbv7dkk3k3ndhz77hi08b76zpz9ik8qakgg5l6p5h8n7l";
-    };
-  }
-  {
-    goPackagePath  = "github.com/shirou/w32";
-    fetch = {
-      type = "git";
-      url = "https://github.com/shirou/w32";
-      rev =  "bb4de0191aa41b5507caa14b0650cdbddcd9280b";
-      sha256 = "0xh5vqblhr2c3mlaswawx6nipi4rc2x73rbdvlkakmgi0nnl50m4";
-    };
-  }
-  {
-    goPackagePath  = "github.com/sirupsen/logrus";
-    fetch = {
-      type = "git";
-      url = "https://github.com/sirupsen/logrus";
-      rev =  "c155da19408a8799da419ed3eeb0cb5db0ad5dbc";
-      sha256 = "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz";
-    };
-  }
-  {
-    goPackagePath  = "github.com/soniah/gosnmp";
-    fetch = {
-      type = "git";
-      url = "https://github.com/soniah/gosnmp";
-      rev =  "40eae407a1f8cbbe3f3f14c57bde0b16db1cfe85";
-      sha256 = "1da492l2d9rc9nfc482fmyx8z9a3gmwca87kbizpwibkix9b7b02";
-    };
-  }
-  {
-    goPackagePath  = "github.com/streadway/amqp";
-    fetch = {
-      type = "git";
-      url = "https://github.com/streadway/amqp";
-      rev =  "e5adc2ada8b8efff032bf61173a233d143e9318e";
-      sha256 = "0qc5h9h1fcyblpiprbijrlc92fdbbnzf87648k20afgfjv8kciab";
-    };
-  }
-  {
-    goPackagePath  = "github.com/stretchr/objx";
-    fetch = {
-      type = "git";
-      url = "https://github.com/stretchr/objx";
-      rev =  "477a77ecc69700c7cdeb1fa9e129548e1c1c393c";
-      sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls";
-    };
-  }
-  {
-    goPackagePath  = "github.com/stretchr/testify";
-    fetch = {
-      type = "git";
-      url = "https://github.com/stretchr/testify";
-      rev =  "3ebf1ddaeb260c4b1ae502a01c7844fa8c1fa0e9";
-      sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl";
-    };
-  }
-  {
-    goPackagePath  = "github.com/tidwall/gjson";
-    fetch = {
-      type = "git";
-      url = "https://github.com/tidwall/gjson";
-      rev =  "d7c940e59395fdcaff4584cb442b2e7808f6711e";
-      sha256 = "14x1g5gnziyh3vpr5mxpw2r5h65mncn548xdvamrpzngjm1idzhi";
-    };
-  }
-  {
-    goPackagePath  = "github.com/tidwall/match";
-    fetch = {
-      type = "git";
-      url = "https://github.com/tidwall/match";
-      rev =  "1731857f09b1f38450e2c12409748407822dc6be";
-      sha256 = "14nv96h0mjki5q685qx8y331h4yga6hlfh3z9nz6acvnv284q578";
-    };
-  }
-  {
-    goPackagePath  = "github.com/tidwall/pretty";
-    fetch = {
-      type = "git";
-      url = "https://github.com/tidwall/pretty";
-      rev =  "1166b9ac2b65e46a43d8618d30d1554f4652d49b";
-      sha256 = "1jwpj5903lh8hsj9apm2gwd70809zq0gjgmivkxaq4iq29wnv0n9";
-    };
-  }
-  {
-    goPackagePath  = "github.com/vishvananda/netlink";
-    fetch = {
-      type = "git";
-      url = "https://github.com/vishvananda/netlink";
-      rev =  "b2de5d10e38ecce8607e6b438b6d174f389a004e";
-      sha256 = "06kic677b2q752sgvk3lyjfh8gmq7bpfl38h8k1jsz92fav1y8gl";
-    };
-  }
-  {
-    goPackagePath  = "github.com/vishvananda/netns";
-    fetch = {
-      type = "git";
-      url = "https://github.com/vishvananda/netns";
-      rev =  "13995c7128ccc8e51e9a6bd2b551020a27180abd";
-      sha256 = "1zk6w8158qi4niva5rijchbv9ixgmijsgqshh54wdaav4xrhjshn";
-    };
-  }
-  {
-    goPackagePath  = "github.com/vjeantet/grok";
-    fetch = {
-      type = "git";
-      url = "https://github.com/vjeantet/grok";
-      rev =  "ce01e59abcf6fbc9833b7deb5e4b8ee1769bcc53";
-      sha256 = "172j83ndkmh5dhglgskpsg5csz31ah5mnprqhcra5x7dczc2f8hv";
-    };
-  }
-  {
-    goPackagePath  = "github.com/vmware/govmomi";
-    fetch = {
-      type = "git";
-      url = "https://github.com/vmware/govmomi";
-      rev =  "3617f28d167d448f93f282a867870f109516d2a5";
-      sha256 = "1a82g4vzfgzp8ppcq3dhgv8van85am467ckx788yqk7rj4c3i5ir";
-    };
-  }
-  {
-    goPackagePath  = "github.com/wavefronthq/wavefront-sdk-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/wavefronthq/wavefront-sdk-go";
-      rev =  "fa87530cd02a8ad08bd179e1c39fb319a0cc0dae";
-      sha256 = "000ynkkpg2m4xynkmdx47asydw66nzp94f276gifws1a90yacay0";
-    };
-  }
-  {
-    goPackagePath  = "github.com/wvanbergen/kafka";
-    fetch = {
-      type = "git";
-      url = "https://github.com/wvanbergen/kafka";
-      rev =  "e2edea948ddfee841ea9a263b32ccca15f7d6c2f";
-      sha256 = "1m712xywbx6nja2rbmrphwxbwfzkhadq139k5d19m8964695sp10";
-    };
-  }
-  {
-    goPackagePath  = "github.com/wvanbergen/kazoo-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/wvanbergen/kazoo-go";
-      rev =  "f72d8611297a7cf105da904c04198ad701a60101";
-      sha256 = "05yx57kbjm9v54j46zi2c21zb3d239lzv996b2qqxpkfbqadqyxm";
-    };
-  }
-  {
-    goPackagePath  = "github.com/yuin/gopher-lua";
-    fetch = {
-      type = "git";
-      url = "https://github.com/yuin/gopher-lua";
-      rev =  "46796da1b0b4794e1e341883a399f12cc7574b55";
-      sha256 = "0yq5ks1smqx0kgmwyl6xxd2mn9bvdi8qz7di4xs0xy5cs7f2zanw";
-    };
-  }
-  {
-    goPackagePath  = "go.opencensus.io";
-    fetch = {
-      type = "git";
-      url = "https://github.com/census-instrumentation/opencensus-go";
-      rev =  "79993219becaa7e29e3b60cb67f5b8e82dee11d6";
-      sha256 = "0y2jzm1b5dw8x5s9fjy2aj1gd0wwkhl71wj3ysby86g60ja5lp1z";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/crypto.git";
-      rev =  "87dc89f01550277dc22b74ffcf4cd89fa2f40f4c";
-      sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/net.git";
-      rev =  "a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1";
-      sha256 = "018zmn4kmg2mbngcciqal54slc3pl4ry5vlv0bw36fcxvnazxnbp";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/oauth2";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/oauth2.git";
-      rev =  "d2e6202438beef2727060aa7cabdd924d92ebfd9";
-      sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/sync";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/sync.git";
-      rev =  "42b317875d0fa942474b76e1b46a6060d720ae6e";
-      sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/sys.git";
-      rev =  "51ab0e2deafac1f46c46ad59cf0921be2f180c3d";
-      sha256 = "0xdhpckbql3bsqkpc2k5b1cpnq3q1qjqjjq2j3p707rfwb8nm91a";
-    };
-  }
-  {
-    goPackagePath  = "golang.org/x/text";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/text.git";
-      rev =  "f21a4dfb5e38f5895301dc265a8def02365cc3d0";
-      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
-    };
-  }
-  {
-    goPackagePath  = "google.golang.org/api";
-    fetch = {
-      type = "git";
-      url = "https://code.googlesource.com/google-api-go-client";
-      rev =  "19ff8768a5c0b8e46ea281065664787eefc24121";
-      sha256 = "0b34xb74pnwawlf911w6f0dhb95i8vi20i799asnvrmyn1lm2ldk";
-    };
-  }
-  {
-    goPackagePath  = "google.golang.org/appengine";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/appengine";
-      rev =  "b1f26356af11148e710935ed1ac8a7f5702c7612";
-      sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x";
-    };
-  }
-  {
-    goPackagePath  = "google.golang.org/genproto";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/go-genproto";
-      rev =  "fedd2861243fd1a8152376292b921b394c7bef7e";
-      sha256 = "08324j170skzacglhjmpkpsivp9gwcvmljx1nq6a2d2h2qksfdbp";
-    };
-  }
-  {
-    goPackagePath  = "google.golang.org/grpc";
-    fetch = {
-      type = "git";
-      url = "https://github.com/grpc/grpc-go";
-      rev =  "168a6198bcb0ef175f7dacec0b8691fc141dc9b8";
-      sha256 = "0d8vj372ri55mrqfc0rhjl3albp5ykwfjhda1s5cgm5n40v70pr3";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/asn1-ber.v1";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-asn1-ber/asn1-ber";
-      rev =  "379148ca0225df7a432012b8df0355c2a2063ac0";
-      sha256 = "1y8bvzbxpw0lfnn7pbcdwzqj4l90qj6xf88dvv9pxd9yl5g6cskx";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/fatih/pool.v2";
-    fetch = {
-      type = "git";
-      url = "https://github.com/fatih/pool";
-      rev =  "010e0b745d12eaf8426c95f9c3924d81dd0b668f";
-      sha256 = "0dxsq7058w47d6ynbwjlfgnwcf5bf1q7m23dsgljd01sd8ilrq9x";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/fsnotify.v1";
-    fetch = {
-      type = "git";
-      url = "https://github.com/fsnotify/fsnotify";
-      rev =  "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
-      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/gorethink/gorethink.v3";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gorethink/gorethink";
-      rev =  "7f5bdfd858bb064d80559b2a32b86669c5de5d3b";
-      sha256 = "1k4flhx93jbrcsi8k35dcdm7rcq3r8i8my4h8zhf5y9ayhcyph1m";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/inf.v0";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-inf/inf";
-      rev =  "d2d2541c53f18d2a059457998ce2876cc8e67cbf";
-      sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/jcmturner/aescts.v1";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jcmturner/aescts";
-      rev =  "f6abebb3171c4c1b1fea279cb7c7325020a26290";
-      sha256 = "0rbq4zf3db48xa2gqdp2swws7wizmbwagigqkr1zxzd1ramps6rv";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/jcmturner/dnsutils.v1";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jcmturner/dnsutils";
-      rev =  "13eeb8d49ffb74d7a75784c35e4d900607a3943c";
-      sha256 = "0l543c64pyzbnrc00jspg21672l3a0kjjw9pbdxwna93w8d8m927";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/jcmturner/gokrb5.v7";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jcmturner/gokrb5";
-      rev =  "363118e62befa8a14ff01031c025026077fe5d6d";
-      sha256 = "08mbag2283q1pyfi696g80521r9n1id3804r6sssrhf3kxzkfhnv";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/jcmturner/rpc.v1";
-    fetch = {
-      type = "git";
-      url = "https://github.com/jcmturner/rpc";
-      rev =  "99a8ce2fbf8b8087b6ed12a37c61b10f04070043";
-      sha256 = "0hkmvf8qdcifnzym8kv1xhq7lq0wpr0i6gzff159lh9xn0wfg175";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/ldap.v3";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-ldap/ldap";
-      rev =  "caa044a2bfa324b735baee1722e8e2e372f76864";
-      sha256 = "000jfdx38k10irfy9952jjzqn04ji3lnlfpvabvq9l78zs96n91p";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/mgo.v2";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-mgo/mgo";
-      rev =  "9856a29383ce1c59f308dd1cf0363a79b5bef6b5";
-      sha256 = "1gfbcmvpwwf1lydxj3g42wv2g9w3pf0y02igqk4f4f21h02sazkw";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/olivere/elastic.v5";
-    fetch = {
-      type = "git";
-      url = "https://github.com/olivere/elastic";
-      rev =  "52741dc2ce53629cbe1e673869040d886cba2cd5";
-      sha256 = "11dgj31jxmp9fdnnwzzwg08p3iwrbnd63kyf6drvlw4qsgslk4lh";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/tomb.v1";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-tomb/tomb";
-      rev =  "dd632973f1e7218eb1089048e0798ec9ae7dceb8";
-      sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
-    };
-  }
-  {
-    goPackagePath  = "gopkg.in/yaml.v2";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-yaml/yaml";
-      rev =  "5420a8b6744d3b0345ab293f6fcba19c978f1183";
-      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
-    };
-  }
-]
\ No newline at end of file

From 0bba7474b3e6c8cef36960614446447d38ec04c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 27 Mar 2020 07:28:40 +0000
Subject: [PATCH 4104/4636] go: propagate target build dependencies correctly

When using strict deps we have to use depsTargetTargetPropagated
as go is added as a nativeBuildInputs to our build.
---
 pkgs/development/compilers/go/1.12.nix | 3 +--
 pkgs/development/compilers/go/1.13.nix | 3 +--
 pkgs/development/compilers/go/1.14.nix | 3 +--
 pkgs/development/compilers/go/1.4.nix  | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix
index 35bcfa36e993..3b4091bf1140 100644
--- a/pkgs/development/compilers/go/1.12.nix
+++ b/pkgs/development/compilers/go/1.12.nix
@@ -43,8 +43,7 @@ stdenv.mkDerivation rec {
     ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
     ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
 
-
-  propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ];
+  depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ];
 
   hardeningDisable = [ "all" ];
 
diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix
index aa8812730323..36345bb0dab8 100644
--- a/pkgs/development/compilers/go/1.13.nix
+++ b/pkgs/development/compilers/go/1.13.nix
@@ -43,8 +43,7 @@ stdenv.mkDerivation rec {
     ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
     ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
 
-
-  propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ];
+  depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ];
 
   hardeningDisable = [ "all" ];
 
diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix
index 3651b9361166..b8038a5d9dd0 100644
--- a/pkgs/development/compilers/go/1.14.nix
+++ b/pkgs/development/compilers/go/1.14.nix
@@ -43,8 +43,7 @@ stdenv.mkDerivation rec {
     ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
     ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
 
-
-  propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ];
+  depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ];
 
   hardeningDisable = [ "all" ];
 
diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index 0dd852a1ef16..c3c46de1fce0 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ pcre ];
-  propagatedBuildInputs = lib.optional stdenv.isDarwin Security;
+  depsTargetTargetPropagated = lib.optional stdenv.isDarwin Security;
 
   hardeningDisable = [ "all" ];
 

From 066db11215a2287a88a80ec71595cd8764563444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 27 Mar 2020 07:33:21 +0000
Subject: [PATCH 4105/4636] Revert "Merge pull request #83099 from
 marsam/fix-buildGoModule-packages-darwin"

This reverts commit 4e6bf03504c9e09f067cc6dee6b5aeec43a1405c, reversing
changes made to afd997aab6e9b7a322198092c7828d6c560ac06f.

Instead we propagate those frameworks from the compiler again
---
 pkgs/applications/blockchains/go-ethereum.nix |   4 +-
 pkgs/applications/blockchains/lnd.nix         |   8 +-
 pkgs/applications/editors/glow/default.nix    |   6 +-
 pkgs/applications/misc/archiver/default.nix   |   7 +-
 pkgs/applications/misc/exercism/default.nix   |   4 +-
 .../applications/misc/geoipupdate/default.nix |   4 +-
 pkgs/applications/misc/hugo/default.nix       |   6 +-
 pkgs/applications/misc/todoist/default.nix    |  10 +-
 pkgs/applications/misc/wtf/default.nix        |   7 +-
 .../networking/cluster/argo/default.nix       |   6 +-
 .../networking/cluster/argocd/default.nix     |   6 +-
 .../networking/cluster/atlantis/default.nix   |   4 +-
 .../networking/cluster/fluxctl/default.nix    |   4 +-
 .../networking/cluster/helm/default.nix       |   5 +-
 .../networking/cluster/helmfile/default.nix   |  22 +-
 .../cluster/hetzner-kube/default.nix          |  12 +-
 .../networking/cluster/jx/default.nix         |   6 +-
 .../networking/cluster/k9s/default.nix        |   4 +-
 .../networking/cluster/kubeseal/default.nix   |   6 +-
 .../networking/cluster/kubeval/default.nix    |   6 +-
 .../networking/cluster/linkerd/default.nix    |   4 +-
 .../networking/cluster/minikube/default.nix   |   6 +-
 .../networking/cluster/prow/default.nix       |   6 +-
 .../networking/cluster/qbec/default.nix       |   6 +-
 .../cluster/terraform-providers/default.nix   |   5 +-
 .../elasticsearch/default.nix                 |   4 +-
 .../networking/hydroxide/default.nix          |   6 +-
 .../instant-messengers/gomuks/default.nix     |   4 +-
 .../networking/ipfs-cluster/default.nix       |   5 +-
 pkgs/applications/networking/ipfs/default.nix |   4 +-
 .../networking/mailreaders/aerc/default.nix   |   5 +-
 .../networking/syncthing/default.nix          |   4 +-
 .../networking/websocketd/default.nix         |   6 +-
 .../git-and-tools/default.nix                 |  20 +-
 .../git-and-tools/ghq/default.nix             |   4 +-
 .../git-and-tools/git-bug/default.nix         |   4 +-
 .../git-and-tools/git-subtrac/default.nix     |   6 +-
 .../git-and-tools/lab/default.nix             |   4 +-
 .../git-and-tools/lefthook/default.nix        |   4 +-
 .../interpreters/joker/default.nix            |   4 +-
 pkgs/development/libraries/packr/default.nix  |   7 +-
 .../tools/analysis/tflint/default.nix         |   6 +-
 pkgs/development/tools/azcopy/default.nix     |   4 +-
 pkgs/development/tools/bazelisk/default.nix   |   4 +-
 pkgs/development/tools/conftest/default.nix   |   6 +-
 .../drone-cli/default.nix                     |  13 +-
 .../continuous-integration/drone/default.nix  |   4 +-
 .../continuous-integration/fly/default.nix    |   6 +-
 pkgs/development/tools/cue/default.nix        |   4 +-
 .../tools/database/dbmate/default.nix         |   4 +-
 .../tools/database/dbmate/deps.nix            |  84 ++++
 pkgs/development/tools/dive/default.nix       |   5 +-
 pkgs/development/tools/go-tools/default.nix   |   7 +-
 .../tools/golangci-lint/default.nix           |   6 +-
 pkgs/development/tools/hcloud/default.nix     |   4 +-
 pkgs/development/tools/kcli/default.nix       |   4 +-
 pkgs/development/tools/kubeprompt/default.nix |   4 +-
 pkgs/development/tools/kustomize/default.nix  |   6 +-
 pkgs/development/tools/misc/act/default.nix   |   6 +-
 .../tools/misc/circleci-cli/default.nix       |   4 +-
 .../misc/editorconfig-checker/default.nix     |   6 +-
 .../misc/go-license-detector/default.nix      |   6 +-
 .../development/tools/misc/mkcert/default.nix |   6 +-
 .../tools/misc/reviewdog/default.nix          |   6 +-
 .../tools/misc/terracognita/default.nix       |   6 +-
 pkgs/development/tools/mod/default.nix        |   6 +-
 pkgs/development/tools/pet/default.nix        |   6 +-
 .../tools/proto-contrib/default.nix           |   6 +-
 .../tools/protoc-gen-doc/default.nix          |   6 +-
 pkgs/development/tools/prototool/default.nix  |   6 +-
 pkgs/development/web/flyctl/default.nix       |   6 +-
 pkgs/development/web/minify/default.nix       |   6 +-
 pkgs/os-specific/darwin/smimesign/default.nix |   6 +-
 pkgs/servers/caddy/default.nix                |   4 +-
 pkgs/servers/caddy/v2.nix                     |   4 +-
 pkgs/servers/dns/coredns/default.nix          |   4 +-
 pkgs/servers/documize-community/default.nix   |   6 +-
 pkgs/servers/echoip/default.nix               |   6 +-
 pkgs/servers/gobetween/default.nix            |   8 +-
 pkgs/servers/gortr/default.nix                |   6 +-
 pkgs/servers/gotify/default.nix               |   5 +-
 pkgs/servers/imgproxy/default.nix             |   7 +-
 pkgs/servers/matterbridge/default.nix         |   4 +-
 pkgs/servers/mautrix-whatsapp/default.nix     |   4 +-
 pkgs/servers/minio/default.nix                |   4 +-
 pkgs/servers/monitoring/mtail/default.nix     |   6 +-
 .../prometheus/dnsmasq-exporter.nix           |   4 +-
 .../prometheus/mikrotik-exporter.nix          |   4 +-
 .../prometheus/varnish-exporter.nix           |  10 +-
 pkgs/servers/monitoring/sensu-go/default.nix  |  10 +-
 pkgs/servers/monitoring/thanos/default.nix    |   4 +-
 .../servers/nosql/victoriametrics/default.nix |   7 +-
 pkgs/servers/sql/dolt/default.nix             |   6 +-
 pkgs/servers/web-apps/shiori/default.nix      |   4 +-
 pkgs/shells/elvish/default.nix                |   4 +-
 pkgs/shells/zsh/zsh-history/default.nix       |   6 +-
 pkgs/tools/admin/aws-vault/default.nix        |   6 +-
 pkgs/tools/admin/awsweeper/default.nix        |   6 +-
 pkgs/tools/admin/berglas/default.nix          |   4 +-
 pkgs/tools/admin/certigo/default.nix          |   4 +-
 pkgs/tools/admin/clair/default.nix            |   8 +-
 pkgs/tools/admin/eksctl/default.nix           |   6 +-
 pkgs/tools/admin/iamy/default.nix             |   6 +-
 pkgs/tools/admin/lego/default.nix             |   6 +-
 pkgs/tools/misc/chezmoi/default.nix           |   4 +-
 pkgs/tools/misc/docui/default.nix             |   4 +-
 pkgs/tools/misc/gotify-cli/default.nix        |   6 +-
 pkgs/tools/misc/kepubify/default.nix          |   6 +-
 pkgs/tools/misc/mutagen/default.nix           |   6 +-
 pkgs/tools/misc/pgcenter/default.nix          |   4 +-
 pkgs/tools/misc/pgmetrics/default.nix         |   4 +-
 pkgs/tools/networking/cassowary/default.nix   |   6 +-
 pkgs/tools/networking/clash/default.nix       |   4 +-
 pkgs/tools/networking/corerad/default.nix     |   4 +-
 pkgs/tools/networking/croc/default.nix        |   4 +-
 pkgs/tools/networking/dnsproxy/default.nix    |   4 +-
 pkgs/tools/networking/frp/default.nix         |   6 +-
 pkgs/tools/networking/grpcui/default.nix      |   6 +-
 pkgs/tools/networking/hey/default.nix         |   6 +-
 .../tools/networking/minio-client/default.nix |   4 +-
 pkgs/tools/networking/nebula/default.nix      |   6 +-
 pkgs/tools/networking/obfs4/default.nix       |   6 +-
 pkgs/tools/networking/shadowfox/default.nix   |   6 +-
 pkgs/tools/networking/tendermint/default.nix  |   4 +-
 pkgs/tools/networking/termshark/default.nix   |   5 +-
 pkgs/tools/networking/yggdrasil/default.nix   |   6 +-
 .../mynewt-newt/default.nix                   |   4 +-
 pkgs/tools/security/age/default.nix           |   6 +-
 pkgs/tools/security/gobuster/default.nix      |   7 +-
 pkgs/tools/security/saml2aws/default.nix      |   4 +-
 pkgs/tools/security/sops/default.nix          |   4 +-
 pkgs/tools/system/ctop/default.nix            |   6 +-
 pkgs/top-level/all-packages.nix               | 475 +++++-------------
 133 files changed, 443 insertions(+), 861 deletions(-)
 create mode 100644 pkgs/development/tools/database/dbmate/deps.nix

diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix
index 80e17cf1138a..d8660967a4e0 100644
--- a/pkgs/applications/blockchains/go-ethereum.nix
+++ b/pkgs/applications/blockchains/go-ethereum.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit, CoreServices }:
+{ stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit }:
 
 buildGoModule rec {
   pname = "go-ethereum";
@@ -30,8 +30,6 @@ buildGoModule rec {
     "cmd/wnode"
   ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
-
   # Fix for usb-related segmentation faults on darwin
   propagatedBuildInputs =
     stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ];
diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd.nix
index 4be19beedc39..dd45746c8df5 100644
--- a/pkgs/applications/blockchains/lnd.nix
+++ b/pkgs/applications/blockchains/lnd.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, stdenv, Security }:
+{ buildGoModule, fetchFromGitHub, lib }:
 
 buildGoModule rec {
   pname = "lnd";
@@ -13,12 +13,10 @@ buildGoModule rec {
 
   modSha256 = "1pvcvpiz6ck8xkgpypchrq9kgkik0jxd7f3jhihbgldsh4zaqiaq";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Lightning Network Daemon";
     homepage = "https://github.com/lightningnetwork/lnd";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = with maintainers; [ cypherpunk2140 ];
   };
 }
diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix
index 80fdcc8a09c1..928291940cfe 100644
--- a/pkgs/applications/editors/glow/default.nix
+++ b/pkgs/applications/editors/glow/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "glow";
@@ -13,11 +13,9 @@ buildGoModule rec {
 
   modSha256 = "0r0yq7kgz7i1wf4gxxihdrn1c8mi4wcyhadncxbln24s9c5apxsf";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   buildFlagsArray = [ "-ldflags=" "-X=main.Version=${version}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Render markdown on the CLI";
     homepage = "https://github.com/charmbracelet/glow";
     license = licenses.mit;
diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/applications/misc/archiver/default.nix
index 8c79d867c831..64b592b78714 100644
--- a/pkgs/applications/misc/archiver/default.nix
+++ b/pkgs/applications/misc/archiver/default.nix
@@ -1,7 +1,6 @@
 { buildGoModule
 , fetchFromGitHub
-, stdenv
-, Security
+, lib
 }:
 
 buildGoModule rec {
@@ -17,9 +16,7 @@ buildGoModule rec {
 
   modSha256 = "1mrfqhd0zb78rlqlj2ncb0srwjfl7rzhy2p9mwa82pgysvlp08gv";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Easily create & extract archives, and compress & decompress files of various formats";
     homepage = "https://github.com/mholt/archiver";
     license = licenses.mit;
diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix
index 81c2d9782997..a071761599a3 100644
--- a/pkgs/applications/misc/exercism/default.nix
+++ b/pkgs/applications/misc/exercism/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "exercism";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "0pg0hxrr6jjd03wbjn5y65x02md3h352mnm1gr6vyiv7hn4ws14m";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   subPackages = [ "./exercism" ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix
index 71ea8a3d43f4..b7b90448e4bc 100644
--- a/pkgs/applications/misc/geoipupdate/default.nix
+++ b/pkgs/applications/misc/geoipupdate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "geoipupdate";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "1bypanvrkcqp8rk84cv2569671irgaf3cy27lcrknyina4pdvir5";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     description = "Automatic GeoIP database updater";
     homepage = "https://github.com/maxmind/geoipupdate";
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index dc1f24368118..46abf3696169 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -1,9 +1,11 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "hugo";
   version = "0.68.3";
 
+  goPackagePath = "github.com/gohugoio/hugo";
+
   src = fetchFromGitHub {
     owner = "gohugoio";
     repo = pname;
@@ -13,8 +15,6 @@ buildGoModule rec {
 
   modSha256 = "04vzm65kbj9905z4cf5yh6yc6g3b0pd5vc00lrxw84pwgqgc0ykb";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   buildFlags = [ "-tags" "extended" ];
 
   subPackages = [ "." ];
diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/applications/misc/todoist/default.nix
index a625c8340558..74b2b770215c 100644
--- a/pkgs/applications/misc/todoist/default.nix
+++ b/pkgs/applications/misc/todoist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "todoist";
@@ -13,12 +13,10 @@ buildGoModule rec {
 
   modSha256 = "1nnp5ijz4n34gc97rar4wlvlbx21ndpjyb2mc6gxdk1wzx3mgswp";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-  meta = with stdenv.lib; {
+  meta = {
     homepage = https://github.com/sachaos/todoist;
     description = "Todoist CLI Client";
-    license = licenses.mit;
-    platforms = platforms.unix;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix
index 8c34baba5828..f12f96871c00 100644
--- a/pkgs/applications/misc/wtf/default.nix
+++ b/pkgs/applications/misc/wtf/default.nix
@@ -1,9 +1,8 @@
 { buildGoModule
 , fetchFromGitHub
-, stdenv
+, lib
 , makeWrapper
 , ncurses
-, Security
 }:
 
 buildGoModule rec {
@@ -25,14 +24,12 @@ buildGoModule rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   postInstall = ''
     mv "$out/bin/wtf" "$out/bin/wtfutil"
     wrapProgram "$out/bin/wtfutil" --prefix PATH : "${ncurses.dev}/bin"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The personal information dashboard for your terminal";
     homepage = "https://wtfutil.com/";
     license = licenses.mpl20;
diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix
index 25fb33399c0d..f02b64e92c8b 100644
--- a/pkgs/applications/networking/cluster/argo/default.nix
+++ b/pkgs/applications/networking/cluster/argo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, buildGoPackage, fetchFromGitHub, Security }:
+{ lib, buildGoModule, buildGoPackage, fetchFromGitHub }:
 
 let
   # Argo can package a static server in the CLI using the `staticfiles` go module.
@@ -32,8 +32,6 @@ buildGoModule rec {
 
   subPackages = [ "cmd/argo" ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   preBuild = ''
     mkdir -p ui/dist/app
     echo "Built without static files" > ui/dist/app/index.html
@@ -41,7 +39,7 @@ buildGoModule rec {
     ${staticfiles}/bin/staticfiles -o server/static/files.go ui/dist/app
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Container native workflow engine for Kubernetes";
     homepage = https://github.com/argoproj/argo;
     license = licenses.asl20;
diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix
index 51635292fa13..7f9ebda93c0a 100644
--- a/pkgs/applications/networking/cluster/argocd/default.nix
+++ b/pkgs/applications/networking/cluster/argocd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, packr, Security }:
+{ lib, buildGoModule, fetchFromGitHub, packr }:
 
 buildGoModule rec {
   pname = "argocd";
@@ -16,8 +16,6 @@ buildGoModule rec {
 
   nativeBuildInputs = [ packr ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   patches = [ ./use-go-module.patch ];
 
   buildFlagsArray = ''
@@ -33,7 +31,7 @@ buildGoModule rec {
     packr
   '';
   
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes";
     homepage = "https://github.com/argoproj/argo";
     license = licenses.asl20;
diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix
index ce3a1730ae54..cb846060a3de 100644
--- a/pkgs/applications/networking/cluster/atlantis/default.nix
+++ b/pkgs/applications/networking/cluster/atlantis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "atlantis";
@@ -15,8 +15,6 @@ buildGoModule rec {
 
   subPackages = [ "." ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     homepage = "https://github.com/runatlantis/atlantis";
     description = "Terraform Pull Request Automation";
diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix
index 75e097131ea8..982add3d517f 100644
--- a/pkgs/applications/networking/cluster/fluxctl/default.nix
+++ b/pkgs/applications/networking/cluster/fluxctl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "fluxctl";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "0ij5q31a0818nmqsdql1ii6rhq6nb0liplnw509qih8py7dk5xkg";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   subPackages = [ "cmd/fluxctl" ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 822df7656554..88ca9b3da947 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
 
 buildGoModule rec {
   pname = "helm";
@@ -16,9 +16,6 @@ buildGoModule rec {
   buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ];
 
   nativeBuildInputs = [ installShellFiles ];
-
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   postInstall = ''
     $out/bin/helm completion bash > helm.bash
     $out/bin/helm completion zsh > helm.zsh
diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index 2de07e9fdc7d..ee7c4ab9cbdd 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -1,8 +1,10 @@
-{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, Security }:
+{ lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }:
 
-buildGoModule rec {
+let version = "0.102.0"; in
+
+buildGoModule {
   pname = "helmfile";
-  version = "0.102.0";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "roboll";
@@ -11,12 +13,12 @@ buildGoModule rec {
     sha256 = "0v7mhsnhswiqd62wrmkcpzsg9nfi6wvkh9danngs5rqjiz1zffhy";
   };
 
+  goPackagePath = "github.com/roboll/helmfile";
+
   modSha256 = "0s7j7jbgr8gdc0s9dnl6zjwkpywqj05xyb7mkcank54kgrz0g5vq";
 
   nativeBuildInputs = [ makeWrapper ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   buildFlagsArray = ''
     -ldflags=
     -X main.Version=${version}
@@ -24,14 +26,14 @@ buildGoModule rec {
 
   postInstall = ''
     wrapProgram $out/bin/helmfile \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ kubernetes-helm ]}
+      --prefix PATH : ${lib.makeBinPath [ kubernetes-helm ]}
   '';
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "Deploy Kubernetes Helm charts";
     homepage = "https://github.com/roboll/helmfile";
-    license = licenses.mit;
-    maintainers = with maintainers; [ pneumaticat yurrriq ];
-    platforms = platforms.unix;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pneumaticat yurrriq ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix
index 8a59bf3197a9..1d9940c8f318 100644
--- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix
+++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "hetzner-kube";
@@ -13,18 +13,16 @@ buildGoModule rec {
 
   modSha256 = "0jjrk93wdi13wrb5gchhqk7rgwm74kcizrbqsibgkgs2dszwfazh";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   buildFlagsArray = ''
     -ldflags=
     -X github.com/xetys/hetzner-kube/cmd.version=${version}
   '';
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "A CLI tool for provisioning Kubernetes clusters on Hetzner Cloud";
     homepage = "https://github.com/xetys/hetzner-kube";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ eliasp ];
-    platforms = platforms.unix;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ eliasp ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix
index f817a68ced19..88aa8777ee5e 100644
--- a/pkgs/applications/networking/cluster/jx/default.nix
+++ b/pkgs/applications/networking/cluster/jx/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, stdenv, Security }:
+{ buildGoModule, fetchFromGitHub, lib }:
 
 buildGoModule rec {
   name = "jx";
@@ -16,8 +16,6 @@ buildGoModule rec {
     ./3321-fix-location-of-thrift.patch
   ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   modSha256 = "0ljf0c0c3pc12nmhdbrwflcaj6hs8igzjw5hi6fyhi6n9cy87vac";
 
   subPackages = [ "cmd/jx" ];
@@ -28,7 +26,7 @@ buildGoModule rec {
     -X github.com/jenkins-x/jx/pkg/version.Revision=${version}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "JX is a command line tool for installing and using Jenkins X.";
     homepage = https://jenkins-x.io;
     longDescription = ''
diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix
index 956d7b106b97..99326a20bfa0 100644
--- a/pkgs/applications/networking/cluster/k9s/default.nix
+++ b/pkgs/applications/networking/cluster/k9s/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "k9s";
@@ -22,8 +22,6 @@ buildGoModule rec {
 
   modSha256 = "06m4xgl29zx6zpqx630m9cm52wmljms9cvly5f4pqdb4zicq7n86";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     description = "Kubernetes CLI To Manage Your Clusters In Style.";
     homepage = "https://github.com/derailed/k9s";
diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix
index 092cee5f7a27..6d35d233d4f4 100644
--- a/pkgs/applications/networking/cluster/kubeseal/default.nix
+++ b/pkgs/applications/networking/cluster/kubeseal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "kubeseal";
@@ -13,11 +13,9 @@ buildGoModule rec {
 
   modSha256 = "04dmjyz3vi2l0dfpyy42lkp2fv1vlfkvblrxh1dvb37phrkd5lbd";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   subPackages = [ "cmd/kubeseal" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A Kubernetes controller and tool for one-way encrypted Secrets";
     homepage = "https://github.com/bitnami-labs/sealed-secrets";
     license = licenses.asl20;
diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix
index 046052f78bef..54be5956040c 100644
--- a/pkgs/applications/networking/cluster/kubeval/default.nix
+++ b/pkgs/applications/networking/cluster/kubeval/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule, Security }:
+{ stdenv, lib, fetchFromGitHub, buildGoModule, makeWrapper }:
 
 buildGoModule rec {
   pname = "kubeval";
@@ -13,9 +13,7 @@ buildGoModule rec {
 
   modSha256 = "0y9x44y3bchi8xg0a6jmp2rmi8dybkl6qlywb6nj1viab1s8dd4y";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Validate your Kubernetes configuration files";
     homepage = https://github.com/instrumenta/kubeval;
     license = licenses.asl20;
diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix
index d52b25c2e015..8c0265d14914 100644
--- a/pkgs/applications/networking/cluster/linkerd/default.nix
+++ b/pkgs/applications/networking/cluster/linkerd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule, Security }:
+{ stdenv, fetchFromGitHub, buildGoModule }:
 
 buildGoModule {
   pname = "linkerd-unstablle";
@@ -13,8 +13,6 @@ buildGoModule {
 
   modSha256 = "0gahhywpcj16ww4l8s3wjwvavq24fpy258snhyf94ipy6lb797sl";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   subPackages = [ "cli/cmd" ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index ebd78424f4af..f49f1768ced4 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -6,10 +6,6 @@
 , go-bindata
 , libvirt
 , vmnet
-, xpc
-, libobjc
-, Foundation
-, IOKit
 }:
 
 buildGoModule rec {
@@ -31,7 +27,7 @@ buildGoModule rec {
 
   nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ];
   buildInputs = stdenv.lib.optionals stdenv.isLinux [ libvirt ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ vmnet xpc libobjc IOKit Foundation ];
+    ++ stdenv.lib.optionals stdenv.isDarwin [ vmnet ];
 
   preBuild = ''
     go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets deploy/addons/...
diff --git a/pkgs/applications/networking/cluster/prow/default.nix b/pkgs/applications/networking/cluster/prow/default.nix
index e3eb24b23746..1c802802c096 100644
--- a/pkgs/applications/networking/cluster/prow/default.nix
+++ b/pkgs/applications/networking/cluster/prow/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, stdenv, Security }:
+{ buildGoModule, fetchFromGitHub, lib }:
 
 buildGoModule rec {
   pname = "prow-unstable";
@@ -20,8 +20,6 @@ buildGoModule rec {
 
   modSha256 = "06q1zvhm78k64aj475k1xl38h7nk83mysd0bja0wknja048ymgsq";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   subPackages = [
     "./prow/cmd/admission"
     "./prow/cmd/artifact-uploader"
@@ -56,7 +54,7 @@ buildGoModule rec {
     "./prow/cmd/tot"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Prow is a Kubernetes based CI/CD system";
     longDescription = ''
       Prow is a Kubernetes based CI/CD system. Jobs can be triggered by various
diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix
index 4e475320a613..4a8b2a2e6648 100644
--- a/pkgs/applications/networking/cluster/qbec/default.nix
+++ b/pkgs/applications/networking/cluster/qbec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "qbec";
@@ -13,9 +13,7 @@ buildGoModule rec {
 
   modSha256 = "165zqmannlylkzaz9gkmcrlyx8rfhz70ahzhiks4ycgq1qxr0av9";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io";
     homepage = "https://github.com/splunk/qbec";
     license = licenses.asl20;
diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 1487f8ad875f..4e7a2c6964cb 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -2,7 +2,6 @@
 , buildGoPackage
 , fetchFromGitHub
 , callPackage
-, Security
 }:
 let
   list = import ./data.nix;
@@ -24,9 +23,7 @@ let
     };
 in
   {
-    elasticsearch = callPackage ./elasticsearch {
-     inherit Security;
-    };
+    elasticsearch = callPackage ./elasticsearch {};
     gandi = callPackage ./gandi {};
     ibm = callPackage ./ibm {};
     libvirt = callPackage ./libvirt {};
diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
index 2f13000c0cde..1aadbbc5ccd3 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule, Security }:
+{ stdenv, fetchFromGitHub, buildGoModule }:
 buildGoModule rec {
   pname = "terraform-provider-elasticsearch";
   version = "0.7.0";
@@ -12,8 +12,6 @@ buildGoModule rec {
 
   modSha256 = "1xk21xswqwpv34j4ba4fj8lcbvfdd12x7rq1hrdyd21mdhmrhw0p";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   subPackages = [ "." ];
 
   # Terraform allow checking the provider versions, but this breaks
diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix
index d3f45f7f0385..75c1cdaece96 100644
--- a/pkgs/applications/networking/hydroxide/default.nix
+++ b/pkgs/applications/networking/hydroxide/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch, Security }:
+{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
 
 buildGoModule rec {
   pname = "hydroxide";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "0b19rcif8yiyvhrsjd3q5nsvr580lklamlphx4dk47n456ckcqfp";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   # FIXME: remove with next release
   patches = [
     (fetchpatch {
@@ -25,7 +23,7 @@ buildGoModule rec {
 
   subPackages = [ "cmd/hydroxide" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A third-party, open-source ProtonMail bridge";
     homepage = "https://github.com/emersion/hydroxide";
     license = licenses.mit;
diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
index 27790c2c9e08..a36f72c03d08 100644
--- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "gomuks";
@@ -15,8 +15,6 @@ buildGoModule rec {
 
   modSha256 = "03vbrh50pvx71rp6c23qc2sh0ir4jm1wl0gvi3z1c14ndzhsqky4";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     homepage = "https://maunium.net/go/gomuks/";
     description = "A terminal based Matrix client written in Go";
diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix
index 9bf7faf51f3e..a214f222d566 100644
--- a/pkgs/applications/networking/ipfs-cluster/default.nix
+++ b/pkgs/applications/networking/ipfs-cluster/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub, fetchgx, gx-go }:
 
 buildGoModule rec {
   pname = "ipfs-cluster";
@@ -14,8 +14,6 @@ buildGoModule rec {
     sha256 = "1jh6ynj50jd4w79widaqrgm3h3yz5h03vq0lbsx717a8d9073blh";
   };
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     description = "Allocate, replicate, and track Pins across a cluster of IPFS daemons";
     homepage = https://cluster.ipfs.io/;
@@ -24,3 +22,4 @@ buildGoModule rec {
     maintainers = with maintainers; [ jglukasik ];
   };
 }
+
diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix
index c3a31f4e290f..4f71fcf3b745 100644
--- a/pkgs/applications/networking/ipfs/default.nix
+++ b/pkgs/applications/networking/ipfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "ipfs";
@@ -18,8 +18,6 @@ buildGoModule rec {
 
   modSha256 = "12m4ind1s8zaa6kssblc28z2cafy20w2jp80kzif39hg5ar9bijm";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     description = "A global, versioned, peer-to-peer filesystem";
     homepage = https://ipfs.io/;
diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix
index e0f98208e7ab..7b24ed93406e 100644
--- a/pkgs/applications/networking/mailreaders/aerc/default.nix
+++ b/pkgs/applications/networking/mailreaders/aerc/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildGoModule, fetchurl
 , go, ncurses, notmuch, scdoc
-, python3, perl, w3m, dante, Security
+, python3, perl, w3m, dante
 }:
 
 let
@@ -29,8 +29,7 @@ in buildGoModule rec {
     python3.pkgs.colorama
   ];
 
-  buildInputs = [ python3 notmuch ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
+  buildInputs = [ python3 notmuch ];
 
   GOFLAGS="-tags=notmuch";
 
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 0fd3a5ca2801..516acab10f8b 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, stdenv, lib, procps, fetchFromGitHub, libobjc, CoreServices, Foundation }:
+{ buildGoModule, stdenv, lib, procps, fetchFromGitHub }:
 
 let
   common = { stname, target, postInstall ? "" }:
@@ -15,8 +15,6 @@ let
 
       modSha256 = "1qq0979cm42wd3scy3blyi0hg67mkghis9r5rn2x1lqi2b982wfh";
 
-      buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc CoreServices Foundation ];
-
       patches = [
         ./add-stcli-target.patch
       ];
diff --git a/pkgs/applications/networking/websocketd/default.nix b/pkgs/applications/networking/websocketd/default.nix
index 8d0e92488dbb..4160e70b9c44 100644
--- a/pkgs/applications/networking/websocketd/default.nix
+++ b/pkgs/applications/networking/websocketd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "websocketd";
@@ -13,9 +13,7 @@ buildGoModule rec {
 
   modSha256 = "18hamj557ln8k3vmvcrpvnydjr1dy7zi9490iacwdldw5vp870xs";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Turn any program that uses STDIN/STDOUT into a WebSocket server";
     homepage = "http://websocketd.com/";
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index c4a99cf18584..a4b3ac1a65aa 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -34,9 +34,7 @@ let
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  ghq = callPackage ./ghq {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  ghq = callPackage ./ghq { };
 
   git = appendToName "minimal" gitBase;
 
@@ -67,9 +65,7 @@ let
 
   git-appraise = callPackage ./git-appraise {};
 
-  git-bug = callPackage ./git-bug {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  git-bug = callPackage ./git-bug { };
 
   # support for bugzilla
   git-bz = callPackage ./git-bz { };
@@ -140,9 +136,7 @@ let
 
   git-subrepo = callPackage ./git-subrepo { };
 
-  git-subtrac = callPackage ./git-subtrac {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  git-subtrac = callPackage ./git-subtrac { };
 
   git-sync = callPackage ./git-sync { };
 
@@ -183,13 +177,9 @@ let
     inherit (darwin) Security;
   };
 
-  lab = callPackage ./lab {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  lab = callPackage ./lab { };
 
-  lefthook = callPackage ./lefthook {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  lefthook = callPackage ./lefthook { };
 
   pass-git-helper = python3Packages.callPackage ./pass-git-helper { };
 
diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
index 34829c14b7bb..d0c468ab68ea 100644
--- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "ghq";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "0hlbhky3c6zva9khn73n6xgq57k5p8anskxy3g2m0wzhr72cyc41";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   buildFlagsArray = ''
     -ldflags=
       -X=main.Version=${version}
diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
index fdb5a6c53fdf..ed0c8680d753 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "git-bug";
@@ -15,8 +15,6 @@ buildGoModule rec {
 
   modSha256 = "1cfn49cijiarzzczrpd28x1k7ib98xyzlvn3zghwk2ngfgiah3ld";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   buildFlagsArray = ''
     -ldflags= 
       -X ${goPackagePath}/commands.GitCommit=${rev}
diff --git a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix
index 9ccf3c606a2a..07c63ea0119b 100644
--- a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "git-subtrac";
@@ -13,9 +13,7 @@ buildGoModule rec {
 
   modSha256 = "147vzllp1gydk2156hif313vwykagrj35vaiqy1swqczxs7p9hhs";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Keep the content for your git submodules all in one place: the parent repo";
     homepage = "https://github.com/apenwarr/git-subtrac";
     license = licenses.asl20;
diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix
index 8780ce4a2205..3e47631caf69 100644
--- a/pkgs/applications/version-management/git-and-tools/lab/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "lab";
@@ -15,8 +15,6 @@ buildGoModule rec {
 
   modSha256 = "03fqa7s6729g0a6ffiyc61dkldpi7vg8pvvpqak4c0mqi1dycivd";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 
   postInstall = ''
diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
index c80cff15265e..9fc89d520ae9 100644
--- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "lefthook";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "0ih11gw2y9dhv3zw1fzjmdfjln5h6zg1bj7sl68cglf6743siqnq";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     description = "Fast and powerful Git hooks manager for any type of projects";
     homepage = "https://github.com/Arkweid/lefthook";
diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix
index 1db2dd60197b..ed82f76eec24 100644
--- a/pkgs/development/interpreters/joker/default.nix
+++ b/pkgs/development/interpreters/joker/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "joker";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "0i16vf7n1xfz5kp9w3fvyc9y9wgz4h396glgpdaznpxjr12rb43j";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   preBuild = ''
     go generate ./...
   '';
diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix
index b0c7ac3cab6b..4482a9cd312d 100644
--- a/pkgs/development/libraries/packr/default.nix
+++ b/pkgs/development/libraries/packr/default.nix
@@ -1,7 +1,6 @@
 { buildGoModule
 , fetchFromGitHub
-, stdenv
-, Security
+, lib
 }:
 
 buildGoModule rec {
@@ -17,11 +16,9 @@ buildGoModule rec {
 
   subPackages = [ "packr" "v2/packr2" ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   modSha256 = "0afhkvivma16bi8rz3kwcsz9mhmcn4zm6rrymxkvazx6b844hcdv";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The simple and easy way to embed static files into Go binaries";
     homepage = "https://github.com/gobuffalo/packr";
     license = licenses.mit;
diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix
index 2cc9182cd68c..52a11738cf82 100644
--- a/pkgs/development/tools/analysis/tflint/default.nix
+++ b/pkgs/development/tools/analysis/tflint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "tflint";
@@ -13,11 +13,9 @@ buildGoModule rec {
 
   modSha256 = "14vgy5lavyp4w16g7wpi9xbni3js541rc3w9qn5ab3khqw5rdhgn";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   subPackages = [ "." ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Terraform linter focused on possible errors, best practices, and so on";
     homepage = "https://github.com/terraform-linters/tflint";
     changelog = "https://github.com/terraform-linters/tflint/releases/tag/v${version}";
diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix
index 40741d96f562..328092feafc5 100644
--- a/pkgs/development/tools/azcopy/default.nix
+++ b/pkgs/development/tools/azcopy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule, Security }:
+{ stdenv, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   pname = "azure-storage-azcopy";
@@ -11,8 +11,6 @@ buildGoModule rec {
     sha256 = "16pdvcgy1d5dfqk3as23j45rkwfrv232n384cj5wfz9qwijkcy5g";
   };
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   subPackages = [ "." ];
 
   modSha256 = "07cy2zi7m2pkbfdcy659x4k5j2w60cmjy8kxv1dcii3dc6ls4bvb";
diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix
index a737ddbb0fb6..5780cf4382a7 100644
--- a/pkgs/development/tools/bazelisk/default.nix
+++ b/pkgs/development/tools/bazelisk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "bazelisk";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "1w8k659ifapcxbbim0nf7wd7w10bhlagc33q08izh84gcgsh0yyz";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     description = "A user-friendly launcher for Bazel";
     longDescription = ''
diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix
index 76e53fd73b2a..7ce2594d84f6 100644
--- a/pkgs/development/tools/conftest/default.nix
+++ b/pkgs/development/tools/conftest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "conftest";
@@ -13,14 +13,12 @@ buildGoModule rec {
 
   modSha256 = "0gm08lrlaxc7504mapjdm3c4mwlzybnqxfwkkh6fawzvmd9sqddr";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   buildFlagsArray = ''
     -ldflags=
         -X main.version=${version}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Write tests against structured configuration data";
     homepage = "https://github.com/instrumenta/conftest";
     license = licenses.asl20;
diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix
index c6e4878d52c4..a3df81d26053 100644
--- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix
@@ -1,8 +1,11 @@
-{ stdenv, fetchFromGitHub, buildGoModule, Security }:
+{ stdenv, fetchFromGitHub, buildGoModule }:
 
-buildGoModule rec {
+let version = "1.2.1";
+in buildGoModule rec {
+  inherit version;
   pname = "drone-cli";
-  version = "1.2.1";
+  revision = "v${version}";
+  goPackagePath = "github.com/drone/drone-cli";
 
   modSha256 = "0g0vq4vm2hy00r2gjsrhg57xv9sldlqix3wzimiqdli085bcz46b";
 
@@ -13,12 +16,10 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "drone";
     repo = "drone-cli";
-    rev = "v${version}";
+    rev = revision;
     sha256 = "19icihi5nxcafxlh4w61nl4cd0dhvik9zl8g4gqmazikjqsjms2j";
   };
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     maintainers = with maintainers; [ bricewge ];
     license = licenses.asl20;
diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix
index e1f0a8de3b87..05257f65af52 100644
--- a/pkgs/development/tools/continuous-integration/drone/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule, Security }:
+{ stdenv, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   name = "drone.io-${version}";
@@ -14,8 +14,6 @@ buildGoModule rec {
     sha256 = "05cgd72qyss836fby0adhrm5p8g7639psk2yslhg6pmz0cqfbq9m";
   };
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     maintainers = with maintainers; [ elohmeier vdemeester ];
     license = licenses.asl20;
diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix
index 4093e7e01728..e5454796b7e4 100644
--- a/pkgs/development/tools/continuous-integration/fly/default.nix
+++ b/pkgs/development/tools/continuous-integration/fly/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, stdenv, writeText, Security }:
+{ buildGoModule, fetchFromGitHub, lib, writeText }:
 
 buildGoModule rec {
   pname = "fly";
@@ -20,8 +20,6 @@ buildGoModule rec {
       -X github.com/concourse/concourse.Version=${version}
   '';
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   # The fly.bash file included with this derivation can be replaced by a
   # call to `fly completion bash` once the `completion` subcommand has
   # made it into a release. Similarly, `fly completion zsh` will provide
@@ -30,7 +28,7 @@ buildGoModule rec {
     install -D -m 444 ${./fly.bash} $out/share/bash-completion/completions/fly
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A command line interface to Concourse CI";
     homepage = "https://concourse-ci.org";
     license = licenses.asl20;
diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix
index 4950e885e25c..98bf5249b626 100644
--- a/pkgs/development/tools/cue/default.nix
+++ b/pkgs/development/tools/cue/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchgit, stdenv, Security }:
+{ buildGoModule, fetchgit, stdenv }:
 
 buildGoModule rec {
   pname = "cue";
@@ -12,8 +12,6 @@ buildGoModule rec {
 
   modSha256 = "04dapx75zwi8cv1pj3c6266znrhwihv3df4izm3gjk34r2i07q6s";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   subPackages = [ "cmd/cue" ];
 
   buildFlagsArray = [
diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix
index 57aa9c654d7f..efc20b6972be 100644
--- a/pkgs/development/tools/database/dbmate/default.nix
+++ b/pkgs/development/tools/database/dbmate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "dbmate";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "12x3m5bjyx3blh5i51pd99phv73m96pmm6i3ir4vf2kms3viif9i";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     description = "Database migration tool";
     homepage = https://github.com/amacneil/dbmate;
diff --git a/pkgs/development/tools/database/dbmate/deps.nix b/pkgs/development/tools/database/dbmate/deps.nix
new file mode 100644
index 000000000000..97bfc10b20af
--- /dev/null
+++ b/pkgs/development/tools/database/dbmate/deps.nix
@@ -0,0 +1,84 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+  {
+    goPackagePath  = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev =  "346938d642f2ec3594ed81d874461961cd0faa76";
+      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
+    };
+  }
+  {
+    goPackagePath  = "github.com/go-sql-driver/mysql";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-sql-driver/mysql";
+      rev =  "2cc627ac8defc45d65066ae98f898166f580f9a4";
+      sha256 = "0n589y9ak2m6glaqmqlggrfv2hghy5i2906r123svf92ci4r9sww";
+    };
+  }
+  {
+    goPackagePath  = "github.com/joho/godotenv";
+    fetch = {
+      type = "git";
+      url = "https://github.com/joho/godotenv";
+      rev =  "a79fa1e548e2c689c241d10173efd51e5d689d5b";
+      sha256 = "09610yqswxa02905mp9cqgsm50r76saagzddc55sqav4ad04j6qm";
+    };
+  }
+  {
+    goPackagePath  = "github.com/lib/pq";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lib/pq";
+      rev =  "19c8e9ad00952ce0c64489b60e8df88bb16dd514";
+      sha256 = "0lm79ja5id7phf1jwf1vs987azaxis0q7qr69px0r6gqiva0q0vz";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-sqlite3";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-sqlite3";
+      rev =  "6c771bb9887719704b210e87e934f08be014bdb1";
+      sha256 = "0x6s7hy3ab3qw6dfl81y7ighjva5j4rrzvqhppf1qwz5alpfmpdm";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev =  "792786c7400a136282c1664665ae0a8db921c6c2";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+  {
+    goPackagePath  = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev =  "b91bfb9ebec76498946beb6af7c0230c7cc7ba6c";
+      sha256 = "178xyfgsbs40jq406aqj0r67ik1b81gdc28z45nbcw6hfhz82rvl";
+    };
+  }
+  {
+    goPackagePath  = "github.com/urfave/cli";
+    fetch = {
+      type = "git";
+      url = "https://github.com/urfave/cli";
+      rev =  "cfb38830724cc34fedffe9a2a29fb54fa9169cd1";
+      sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj";
+    };
+  }
+  {
+    goPackagePath  = "google.golang.org/appengine";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/appengine";
+      rev =  "150dc57a1b433e64154302bdc40b6bb8aefa313a";
+      sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq";
+    };
+  }
+]
diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix
index 91889e80c044..5d4de99ffdbf 100644
--- a/pkgs/development/tools/dive/default.nix
+++ b/pkgs/development/tools/dive/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, gpgme, lvm2, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, gpgme, lvm2 }:
 
 buildGoModule rec {
   pname = "dive";
@@ -15,8 +15,7 @@ buildGoModule rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
+  buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ];
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 
diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix
index b047689b81f9..1fd17060bd4f 100644
--- a/pkgs/development/tools/go-tools/default.nix
+++ b/pkgs/development/tools/go-tools/default.nix
@@ -1,7 +1,6 @@
 { buildGoModule
-, stdenv
+, lib
 , fetchFromGitHub
-, Security
 }:
 
 buildGoModule rec {
@@ -17,11 +16,9 @@ buildGoModule rec {
     sha256 = "0pvi1mzhy6zgx4zfgdypbl4zhvgg11hl5qv7blf2qs0a96j2djhf";
   };
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   modSha256 = "03560xjr2531xj87paskfx2zs364fz6y4kpsid8x08s1syq9nq7p";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A collection of tools and libraries for working with Go code, including linters and static analysis";
     homepage = https://staticcheck.io;
     license = licenses.mit;
diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix
index 00858e94bc55..14311b0c7a51 100644
--- a/pkgs/development/tools/golangci-lint/default.nix
+++ b/pkgs/development/tools/golangci-lint/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, stdenv, Security }:
+{ buildGoModule, fetchFromGitHub, lib }:
 
 buildGoModule rec {
   pname = "golangci-lint";
@@ -14,9 +14,7 @@ buildGoModule rec {
   modSha256 = "0ab1s8pqkpss15rd9brin39lzx2fqkvq2v3nhk8kfrgpari2addk";
   subPackages = [ "cmd/golangci-lint" ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Linters Runner for Go. 5x faster than gometalinter. Nice colored output.";
     homepage = "https://golangci.com/";
     license = licenses.agpl3;
diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix
index c20f3b9dc124..477a476dfe78 100644
--- a/pkgs/development/tools/hcloud/default.nix
+++ b/pkgs/development/tools/hcloud/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "hcloud";
@@ -15,8 +15,6 @@ buildGoModule rec {
 
   modSha256 = "1zy41hi2qzrdmih3pkpng8im576lhkr64zm66w73p7jyvy0kf9sx";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ];
 
   postInstall = ''
diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/development/tools/kcli/default.nix
index 0d42df3b5e4d..bbcb10a354cf 100644
--- a/pkgs/development/tools/kcli/default.nix
+++ b/pkgs/development/tools/kcli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "kcli";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "1wcqh3306q9wxb6pnl8cpk73vmy36bjv2gil03j7j4pajs1f2lwn";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   subPackages = [ "." ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/kubeprompt/default.nix b/pkgs/development/tools/kubeprompt/default.nix
index 0910c061ee50..7c6f3f3396cf 100644
--- a/pkgs/development/tools/kubeprompt/default.nix
+++ b/pkgs/development/tools/kubeprompt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "kubeprompt";
@@ -21,8 +21,6 @@ buildGoModule rec {
   goPackagePath = "github.com/jlesquembre/kubeprompt";
   modSha256 = "0rbpdk2dixywn3wcdgz48f3xw3b7fk8xh7mrlx27wz7fq5wj9v8f";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     description = "Kubernetes prompt";
     homepage = "https://github.com/jlesquembre/kubeprompt";
diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix
index ce173e89a2c5..e60181e9bc4c 100644
--- a/pkgs/development/tools/kustomize/default.nix
+++ b/pkgs/development/tools/kustomize/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ lib, buildGoModule, fetchFromGitHub, tree }:
 
 buildGoModule rec {
   pname = "kustomize";
@@ -25,9 +25,7 @@ buildGoModule rec {
 
   modSha256 = "1bas6al14ck0d2ccb4235426a5hldqsm0nf8vi76chz4nahzb71g";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Customization of kubernetes YAML configurations";
     longDescription = ''
       kustomize lets you customize raw, template-free YAML files for
diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix
index 17ff15265f25..de1cf939e6ae 100644
--- a/pkgs/development/tools/misc/act/default.nix
+++ b/pkgs/development/tools/misc/act/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule, Security }:
+{ lib, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   pname = "act";
@@ -11,13 +11,11 @@ buildGoModule rec {
     sha256 = "0l7id483006mnii4rlcff4p0ricd8a2n24sf74a9b387x0akpbsn";
   };
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   modSha256 = "04s4p9j6j7gw1s4v271zwzvdny7dvjaazd2pihmyjfik95xmwx9r";
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Run your GitHub Actions locally";
     homepage = "https://github.com/nektos/act";
     license = licenses.mit;
diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix
index 0ab126b63e73..fde1c68d34d0 100644
--- a/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/pkgs/development/tools/misc/circleci-cli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule, Security }:
+{ stdenv, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   pname = "circleci-cli";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "199ai38knp50mjjhddjd70qfwx63c69rf7ddw4hpzgx5cm5a04q2";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   buildFlagsArray = [ "-ldflags=-s -w -X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" ];
 
   preBuild = ''
diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix
index 335cd2f25247..88c43a8c42a5 100644
--- a/pkgs/development/tools/misc/editorconfig-checker/default.nix
+++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, stdenv, Security }:
+{ buildGoModule, fetchFromGitHub, lib }:
 
 buildGoModule rec {
   pname = "editorconfig-checker";
@@ -13,9 +13,7 @@ buildGoModule rec {
 
   modSha256 = "1iiv12ginb3ky739z7v8wf4z5lv24gmghbybs3lzay0kqn449n4x";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool to verify that your files are in harmony with your .editorconfig";
     homepage = "https://editorconfig-checker.github.io/";
     license = licenses.mit;
diff --git a/pkgs/development/tools/misc/go-license-detector/default.nix b/pkgs/development/tools/misc/go-license-detector/default.nix
index 7ab7ff8b742c..6675f7ed3e25 100644
--- a/pkgs/development/tools/misc/go-license-detector/default.nix
+++ b/pkgs/development/tools/misc/go-license-detector/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "go-license-detector";
@@ -13,9 +13,7 @@ buildGoModule rec {
 
   modSha256 = "163f1kiy7kqrnaazb8ydaaiz57lv30jyjkvv6i7pczvcg9yfhmdb";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Reliable project licenses detector";
     homepage = "https://github.com/src-d/go-license-detector";
     license = licenses.asl20;
diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/development/tools/misc/mkcert/default.nix
index 6a114a8de8ba..ae0a4a6dfe21 100644
--- a/pkgs/development/tools/misc/mkcert/default.nix
+++ b/pkgs/development/tools/misc/mkcert/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "mkcert";
@@ -19,9 +19,7 @@ buildGoModule rec {
       -X ${goPackagePath}/main.Version=${version}
   '';
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://github.com/FiloSottile/mkcert;
     description = "A simple tool for making locally-trusted development certificates";
     license = licenses.bsd3;
diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix
index aecd373f09e9..9af294716ff3 100644
--- a/pkgs/development/tools/misc/reviewdog/default.nix
+++ b/pkgs/development/tools/misc/reviewdog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "reviewdog";
@@ -13,13 +13,11 @@ buildGoModule rec {
 
   modSha256 = "1jf08g0xr4wknh9x15igq73y02cy2faqjdjs2v842ii4p3n4p9dw";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   subPackages = [ "cmd/reviewdog" ];
 
   buildFlagsArray = [ "-ldflags=-s -w -X github.com/reviewdog/reviewdog/commands.Version=${version}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Automated code review tool integrated with any code analysis tools regardless of programming language";
     homepage = "https://github.com/reviewdog/reviewdog";
     changelog = "https://github.com/reviewdog/reviewdog/releases/tag/v${version}";
diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix
index 67e8df9561ff..26aa50f7f7a1 100644
--- a/pkgs/development/tools/misc/terracognita/default.nix
+++ b/pkgs/development/tools/misc/terracognita/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "terracognita";
@@ -13,13 +13,11 @@ buildGoModule rec {
 
   modSha256 = "0xlhp8pa5g6an10m56g237pixc4h6ay89hkp1ijdz45iyfn9fk91";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   subPackages = [ "." ];
 
   buildFlagsArray = [ "-ldflags=-s -w -X github.com/cycloidio/terracognita/cmd.Version=${version}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Reads from existing Cloud Providers (reverse Terraform) and generates your infrastructure as code on Terraform configuration";
     homepage = "https://github.com/cycloidio/terracognita";
     license = licenses.mit;
diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix
index cc94692c023a..67b829877b04 100644
--- a/pkgs/development/tools/mod/default.nix
+++ b/pkgs/development/tools/mod/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, stdenv, Security }:
+{ buildGoModule, fetchFromGitHub, lib }:
 
 buildGoModule rec {
   pname = "mod";
@@ -13,11 +13,9 @@ buildGoModule rec {
 
   modSha256 = "0x7bdhvam9l23cbdqpna8kwg0v6yhgmw0hlbm48bbhjl27lg7svc";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   subPackages = [ "cmd/mod" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Automated Semantic Import Versioning Upgrades for Go";
     longDescription = ''
       Command line tool to upgrade/downgrade Semantic Import Versioning in Go
diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix
index f1096e479a78..e7f4fce3c4d4 100644
--- a/pkgs/development/tools/pet/default.nix
+++ b/pkgs/development/tools/pet/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, stdenv, Security }:
+{ buildGoModule, fetchFromGitHub, lib }:
 
 buildGoModule rec {
   pname = "pet";
@@ -13,11 +13,9 @@ buildGoModule rec {
 
   modSha256 = "06ham8lsx5c1vk5jkwp1aa9g4q4g7sfq7gxz2gkffa98x2vlawyf";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   subPackages = [ "." ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Simple command-line snippet manager, written in Go";
     homepage = https://github.com/knqyf263/pet;
     license = licenses.mit;
diff --git a/pkgs/development/tools/proto-contrib/default.nix b/pkgs/development/tools/proto-contrib/default.nix
index adb0df28ce16..836683895565 100644
--- a/pkgs/development/tools/proto-contrib/default.nix
+++ b/pkgs/development/tools/proto-contrib/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, stdenv, Security }:
+{ buildGoModule, fetchFromGitHub, lib }:
 
 buildGoModule rec {
   pname = "proto-contrib";
@@ -13,9 +13,7 @@ buildGoModule rec {
 
   modSha256 = "19cqz13jd95d5vibd10420gg69ldgf6afc51mkglhafgmmif56b0";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Contributed tools and other packages on top of the Go proto package";
     homepage = https://github.com/emicklei/proto-contrib;
     license = licenses.mit;
diff --git a/pkgs/development/tools/protoc-gen-doc/default.nix b/pkgs/development/tools/protoc-gen-doc/default.nix
index c25b2d56fe63..77c1df6f43e3 100644
--- a/pkgs/development/tools/protoc-gen-doc/default.nix
+++ b/pkgs/development/tools/protoc-gen-doc/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, stdenv, Security }:
+{ buildGoModule, fetchFromGitHub, lib }:
 
 buildGoModule {
   pname = "protoc-gen-doc-unstable";
@@ -13,9 +13,7 @@ buildGoModule {
 
   modSha256 = "1952ycdkgl00q2s3qmhislhhim15nn6nmlkwbfdvrsfzznqj47rd";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Documentation generator plugin for Google Protocol Buffers";
     longDescription = ''
       This is a documentation generator plugin for the Google Protocol Buffers
diff --git a/pkgs/development/tools/prototool/default.nix b/pkgs/development/tools/prototool/default.nix
index 15a854e4d86c..37b0f1fdf8db 100644
--- a/pkgs/development/tools/prototool/default.nix
+++ b/pkgs/development/tools/prototool/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, protobuf, Security }:
+{ lib, buildGoModule, fetchFromGitHub, makeWrapper, protobuf }:
 
 buildGoModule rec {
   pname = "prototool";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   modSha256 = "1gc8kc9mbi3mlh48zx4lcgpsrf8z879f1qj9wfyr66s7wd1ljazg";
 
   postInstall = ''
@@ -25,7 +23,7 @@ buildGoModule rec {
 
   subPackages = [ "cmd/prototool" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/uber/prototool";
     description = "Your Swiss Army Knife for Protocol Buffers";
     maintainers = [ maintainers.marsam ];
diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
index 05f07fd02608..85165d501d97 100644
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, stdenv, Security }:
+{ buildGoModule, fetchFromGitHub, lib }:
 
 buildGoModule rec {
   pname = "flyctl";
@@ -11,8 +11,6 @@ buildGoModule rec {
     sha256 = "181j248i8j9g7kz5krg0bkbxkvmcwpz2vlknii5q3dy7yhgg19h3";
   };
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   preBuild = ''
     go generate ./...
   '';
@@ -24,7 +22,7 @@ buildGoModule rec {
 
   modSha256 = "1mqkc7hnavvpbqar9f1d2vnm47p4car9abnk2ikyf27jr5glwmsd";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Command line tools for fly.io services";
     homepage = "https://fly.io/";
     license = licenses.asl20;
diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix
index cd602317c70d..3752519d0609 100644
--- a/pkgs/development/web/minify/default.nix
+++ b/pkgs/development/web/minify/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, stdenv, Security }:
+{ buildGoModule, fetchFromGitHub, lib }:
 
 buildGoModule rec {
   pname = "minify";
@@ -13,11 +13,9 @@ buildGoModule rec {
 
   modSha256 = "09jk3mxf7n9wf1cgyiw9mhsr55fb12k399dmzhnib3vhd9xav15i";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Minifiers for web formats";
     license = licenses.mit;
     homepage = "https://go.tacodewolff.nl/minify";
diff --git a/pkgs/os-specific/darwin/smimesign/default.nix b/pkgs/os-specific/darwin/smimesign/default.nix
index 6e799f1caaaa..9efa230d3b72 100644
--- a/pkgs/os-specific/darwin/smimesign/default.nix
+++ b/pkgs/os-specific/darwin/smimesign/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, stdenv, libobjc, Security }:
+{ buildGoModule, fetchFromGitHub, lib }:
 
 buildGoModule rec {
   pname = "smimesign";
@@ -13,11 +13,9 @@ buildGoModule rec {
 
   modSha256 = "1k3gnjzblfk14y19zhlvwysx045nbw0xr5nngh7zj1wcqxhhm206";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc Security ];
-
   buildFlagsArray = "-ldflags=-X main.versionString=${version}";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An S/MIME signing utility for macOS and Windows that is compatible with Git.";
 
     homepage    = https://github.com/github/smimesign;
diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index 8b51e584e3ec..bcd4b7065b58 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "caddy";
@@ -16,8 +16,6 @@ buildGoModule rec {
   };
   modSha256 = "1gc0xvsihr4zp7hkrdfrplvzkaphz1y4q53rgwn2jhd8s98l57an";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   preBuild = ''
     cat << EOF > caddy/main.go
     package main
diff --git a/pkgs/servers/caddy/v2.nix b/pkgs/servers/caddy/v2.nix
index 7330388a7859..c0b2134abded 100644
--- a/pkgs/servers/caddy/v2.nix
+++ b/pkgs/servers/caddy/v2.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, callPackage, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "caddy";
@@ -16,8 +16,6 @@ buildGoModule rec {
   };
   modSha256 = "1sb8w6n84cpya2rjm0zm798kzf5vjpkr5440j1gfnnnr07jl2aqn";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     homepage = "https://caddyserver.com";
     description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS";
diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix
index 8388968298ef..017842f39dc1 100644
--- a/pkgs/servers/dns/coredns/default.nix
+++ b/pkgs/servers/dns/coredns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "coredns";
@@ -15,8 +15,6 @@ buildGoModule rec {
 
   modSha256 = "0wlffk6wkcyn2lphw2vmdsmzag0wxljcxrvm7sv3i124x2x3yvy4";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     homepage = "https://coredns.io";
     description = "A DNS server that runs middleware";
diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix
index a6477d61e984..7780d900badf 100644
--- a/pkgs/servers/documize-community/default.nix
+++ b/pkgs/servers/documize-community/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, go-bindata, go-bindata-assetfs, Security }:
+{ lib, buildGoModule, fetchFromGitHub, go-bindata, go-bindata-assetfs }:
 
 buildGoModule rec {
   pname = "documize-community";
@@ -15,8 +15,6 @@ buildGoModule rec {
 
   nativeBuildInputs = [ go-bindata go-bindata-assetfs ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   subPackages = [ "edition/community.go" ];
 
   postInstall = ''
@@ -25,7 +23,7 @@ buildGoModule rec {
     mv $out/bin/community $out/bin/documize
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Open source Confluence alternative for internal & external docs built with Golang + EmberJS";
     license = licenses.agpl3;
     maintainers = with maintainers; [ ma27 elseym ];
diff --git a/pkgs/servers/echoip/default.nix b/pkgs/servers/echoip/default.nix
index ae6057c34697..b3402933f9fe 100644
--- a/pkgs/servers/echoip/default.nix
+++ b/pkgs/servers/echoip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule {
   pname = "echoip";
@@ -13,8 +13,6 @@ buildGoModule {
 
   modSha256 = "025p891klwpid5fw4z39fimgfkwgkcwqpn5276hflzdp1hfv35ly";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   outputs = [ "out" "index" ];
 
   postInstall = ''
@@ -22,7 +20,7 @@ buildGoModule {
     cp $src/index.html $index/index.html
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://github.com/mpolden/echoip;
     license = licenses.bsd3;
     maintainers = with maintainers; [ rvolosatovs ];
diff --git a/pkgs/servers/gobetween/default.nix b/pkgs/servers/gobetween/default.nix
index e66d5581b3c8..ff59ad53ed1c 100644
--- a/pkgs/servers/gobetween/default.nix
+++ b/pkgs/servers/gobetween/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, stdenv, Security, enableStatic ? false }:
+{ buildGoModule, fetchFromGitHub, lib, enableStatic ? false }:
 
 buildGoModule rec {
   pname = "gobetween";
@@ -14,10 +14,8 @@ buildGoModule rec {
   modSha256 =
     "dd91838d20c99c73447590e43edd13c87755276f17ef3e53f24c5df3d0908f78";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   buildPhase = ''
-    make build${stdenv.lib.optionalString enableStatic "-static"}
+    make build${lib.optionalString enableStatic "-static"}
   '';
 
   installPhase = ''
@@ -27,7 +25,7 @@ buildGoModule rec {
     cp -r config $out/share
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Modern & minimalistic load balancer for the Сloud era";
     homepage = "http://gobetween.io";
     license = licenses.mit;
diff --git a/pkgs/servers/gortr/default.nix b/pkgs/servers/gortr/default.nix
index 3e5dfc87f0ee..35c6e1452437 100644
--- a/pkgs/servers/gortr/default.nix
+++ b/pkgs/servers/gortr/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule, Security }:
+{ lib, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   pname = "gortr";
@@ -12,9 +12,7 @@ buildGoModule rec {
   };
   modSha256 = "157dpalfz3z1s3mxq63xy6lrkwzyy9xzmvn7wsxkwznjq4djv1a1";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "The RPKI-to-Router server used at Cloudflare";
     homepage = "https://github.com/cloudflare/gortr/";
     license = licenses.gpl3;
diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix
index 275aaa5d68bc..f2014aac9fdc 100644
--- a/pkgs/servers/gotify/default.nix
+++ b/pkgs/servers/gotify/default.nix
@@ -1,11 +1,11 @@
 { stdenv
 , buildGoPackage
+, lib
 , fetchFromGitHub
 , buildGoModule
 , packr
 , sqlite
 , callPackage
-, Security
 }:
 
 buildGoModule rec {
@@ -28,8 +28,7 @@ buildGoModule rec {
       --replace 'Version = "unknown"' 'Version = "${version}"'
   '';
 
-  buildInputs = [ sqlite ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
+  buildInputs = [ sqlite ];
 
   nativeBuildInputs = [ packr ];
 
diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix
index c7d0d910ac1e..4cdfddcff6f4 100644
--- a/pkgs/servers/imgproxy/default.nix
+++ b/pkgs/servers/imgproxy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, pkg-config, vips, gobject-introspection, Security }:
+{ lib, buildGoModule, fetchFromGitHub, pkg-config, vips, gobject-introspection }:
 
 buildGoModule rec {
   pname = "imgproxy";
@@ -15,14 +15,13 @@ buildGoModule rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ gobject-introspection vips ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
+  buildInputs = [ gobject-introspection vips ];
 
   preBuild = ''
     export CGO_LDFLAGS_ALLOW='-(s|w)'
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fast and secure on-the-fly image processing server written in Go";
     homepage = "https://imgproxy.net";
     license = licenses.mit;
diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix
index 2eec5d52bb9c..556625016f25 100644
--- a/pkgs/servers/matterbridge/default.nix
+++ b/pkgs/servers/matterbridge/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchurl, Security }:
+{ stdenv, buildGoModule, fetchurl }:
 
 buildGoModule rec {
   pname = "matterbridge";
@@ -12,8 +12,6 @@ buildGoModule rec {
     sha256 = "15wgjzy9l3xlgih2zb56l4jmval4nhcs42wn9axvz2h7kqfbmw3d";
   };
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     description = "Simple bridge between Mattermost, IRC, XMPP, Gitter, Slack, Discord, Telegram, Rocket.Chat, Hipchat(via xmpp), Matrix and Steam";
     homepage = "https://github.com/42wim/matterbridge";
diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
index 648b4830661d..7215464ea5a3 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule {
   pname = "mautrix-whatsapp-unstable";
@@ -13,8 +13,6 @@ buildGoModule {
 
   modSha256 = "01xwq0h3i8ai0294v8jdagksas48866lxcnkn4slwp3rnzv6cmbp";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     homepage = https://github.com/tulir/mautrix-whatsapp;
     description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge";
diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index 1fae973066aa..858f8899501d 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "minio";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "0ikid628v673f7lvp3psk05s3liqlyc3arppg33lfi2cmbaf8hmr";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
-
   subPackages = [ "." ];
 
   buildFlagsArray = [''-ldflags=
diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix
index 75b58b65a9cc..64966e183fea 100644
--- a/pkgs/servers/monitoring/mtail/default.nix
+++ b/pkgs/servers/monitoring/mtail/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule, Security }:
+{ lib, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   pname = "mtail";
@@ -14,8 +14,6 @@ buildGoModule rec {
   modSha256 = "0h3q1qd9a01wlfkk0yv74a4bk5nilpsppq522cv7kl8ysnrjh5yi";
   subPackages = [ "cmd/mtail" ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   preBuild = ''
     go generate -x ./internal/vm/
   '';
@@ -24,7 +22,7 @@ buildGoModule rec {
     "-ldflags=-X main.Version=${version}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.asl20;
     homepage = "https://github.com/google/mtail";
     description = "Tool for extracting metrics from application logs";
diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
index 773fddd311bb..c8013e6bc15c 100644
--- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "dnsmasq_exporter";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "1ag1k0z35zkazaxj8hh2wxfj73xg63xdybfm1565il2vxs5986dh";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
     description = "A dnsmasq exporter for Prometheus";
diff --git a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix
index 96526d246a6d..12341eee911e 100644
--- a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "mikrotik-exporter-unstable";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "1cqjn6j3dfq51ssjx0qrajprlac1h0lb1r4af44lfpigzmrfyi07";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
     description = "Prometheus MikroTik device(s) exporter";
diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
index a0e3c6b1783c..d77675671950 100644
--- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, varnish, Security }:
+{ lib, buildGoModule, fetchFromGitHub, makeWrapper, varnish }:
 
 buildGoModule rec {
   pname = "prometheus_varnish_exporter";
@@ -15,8 +15,6 @@ buildGoModule rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   postInstall = ''
     wrapProgram $out/bin/prometheus_varnish_exporter \
       --prefix PATH : "${varnish}/bin"
@@ -24,10 +22,10 @@ buildGoModule rec {
 
   doCheck = true;
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = "https://github.com/jonnenauha/prometheus_varnish_exporter";
     description = "Varnish exporter for Prometheus";
-    license = licenses.mit;
-    maintainers = with maintainers; [ MostAwesomeDude willibutz ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ MostAwesomeDude willibutz ];
   };
 }
diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix
index adba0277bf77..f109b08d1a6f 100644
--- a/pkgs/servers/monitoring/sensu-go/default.nix
+++ b/pkgs/servers/monitoring/sensu-go/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, stdenv, Security }:
+{ buildGoModule, fetchFromGitHub, lib }:
 
 let
   generic = { subPackages, pname, postInstall ? "" }:
@@ -20,8 +20,6 @@ let
 
       modSha256 = "02h4cav6ivzs3z0qakwxzf5lfy6hzax5c0i2icp0qymqc2789npw";
 
-      buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
       buildFlagsArray = let
         versionPkg = "github.com/sensu/sensu-go/version";
       in ''
@@ -30,11 +28,11 @@ let
           -X ${versionPkg}.BuildSHA=${shortRev}
       '';
 
-      meta = with stdenv.lib; {
+      meta = {
         homepage = "https://sensu.io";
         description = "Open source monitoring tool for ephemeral infrastructure & distributed applications";
-        license = licenses.mit;
-        maintainers = with maintainers; [ thefloweringash ];
+        license = lib.licenses.mit;
+        maintainers = with lib.maintainers; [ thefloweringash ];
       };
     };
 in
diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix
index a246249d7d71..f307032f4141 100644
--- a/pkgs/servers/monitoring/thanos/default.nix
+++ b/pkgs/servers/monitoring/thanos/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 buildGoModule rec {
   pname = "thanos";
   version = "0.11.0";
@@ -12,8 +12,6 @@ buildGoModule rec {
 
   modSha256 = "1pdypyyy352l6wy5lr94fv8j890lh863h8zg2hxchiymrs5pgq1c";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   subPackages = "cmd/thanos";
 
   buildFlagsArray = let t = "github.com/prometheus/common/version"; in ''
diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix
index f85c4aebd512..2d357712096a 100644
--- a/pkgs/servers/nosql/victoriametrics/default.nix
+++ b/pkgs/servers/nosql/victoriametrics/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "VictoriaMetrics";
@@ -12,10 +12,7 @@ buildGoModule rec {
   };
 
   modSha256 = "0qzh3jmj7ps6xmnnmfr8bnq97kdkn58p6dxppmlypanar3zsn7vk";
-
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://victoriametrics.com/";
     description = "fast, cost-effective and scalable time series database, long-term remote storage for Prometheus";
     license = licenses.asl20;
diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix
index 27ab7d444bf1..dbface601f54 100644
--- a/pkgs/servers/sql/dolt/default.nix
+++ b/pkgs/servers/sql/dolt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule, Security }:
+{ stdenv, fetchFromGitHub, lib, buildGoModule }:
 
 buildGoModule rec {
     pname = "dolt";
@@ -15,9 +15,7 @@ buildGoModule rec {
     subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
     modSha256 = "04bsj8mfamnbq3y2aqbx1605azi8v15nbdh1zk5grni0ihlal75a";
 
-    buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-    meta = with stdenv.lib; {
+    meta = with lib; {
         description = "Relational database with version control and CLI a-la Git.";
         homepage = "https://github.com/liquidata-inc/dolt";
         license = licenses.asl20;
diff --git a/pkgs/servers/web-apps/shiori/default.nix b/pkgs/servers/web-apps/shiori/default.nix
index bd17f2f267c6..dd4cdc08287b 100644
--- a/pkgs/servers/web-apps/shiori/default.nix
+++ b/pkgs/servers/web-apps/shiori/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "shiori";
@@ -13,8 +13,6 @@ buildGoModule rec {
     sha256 = "13and7gh2882khqppwz3wwq44p7az4bfdfjvlnqcpqyi8xa28pmq";
   };
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     description = "Simple bookmark manager built with Go";
     homepage = "https://github.com/go-shiori/shiori";
diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix
index 228692efe852..ad2e845f9bc8 100644
--- a/pkgs/shells/elvish/default.nix
+++ b/pkgs/shells/elvish/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "elvish";
@@ -20,8 +20,6 @@ buildGoModule rec {
 
   modSha256 = "13x4wbfj8049ygm3zbgzyr2bm4sq4x6xddrxx6shr8fydlcf1g8v";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     description = "A friendly and expressive command shell";
     longDescription = ''
diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix
index 382b76916d31..ece3c87cb664 100644
--- a/pkgs/shells/zsh/zsh-history/default.nix
+++ b/pkgs/shells/zsh/zsh-history/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule, installShellFiles, nixosTests, Security }:
+{ lib, fetchFromGitHub, buildGoModule, installShellFiles, nixosTests }:
 
 buildGoModule rec {
   pname = "zsh-history";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   modSha256 = "0f10b86gyn7m7lw43c8y1m30mdg0i092a319v3cb2qj05jb9vn42";
   goPackagePath = "github.com/b4b4r07/history";
 
@@ -24,7 +22,7 @@ buildGoModule rec {
     installShellCompletion --zsh --name _history $out/share/zsh/completions/_history
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A CLI to provide enhanced history for your ZSH shell";
     license = licenses.mit;
     homepage = https://github.com/b4b4r07/history;
diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix
index 3e145f732362..48a1de61cd80 100644
--- a/pkgs/tools/admin/aws-vault/default.nix
+++ b/pkgs/tools/admin/aws-vault/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, stdenv, fetchFromGitHub, Security }:
+{ buildGoModule, lib, fetchFromGitHub }:
 buildGoModule rec {
   pname = "aws-vault";
   version = "5.3.2";
@@ -13,15 +13,13 @@ buildGoModule rec {
   modSha256 = "1d3hjfmfmlpw2scfyn597zkzz864w97p0wrsxjp49m9mi0pgmhq9";
   subPackages = [ "." ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   # set the version. see: aws-vault's Makefile
   buildFlagsArray = ''
     -ldflags=
     -X main.Version=v${version}
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description =
       "A vault for securely storing and accessing AWS credentials in development environments";
     homepage = "https://github.com/99designs/aws-vault";
diff --git a/pkgs/tools/admin/awsweeper/default.nix b/pkgs/tools/admin/awsweeper/default.nix
index 1ea54953701d..661747c2fd0d 100644
--- a/pkgs/tools/admin/awsweeper/default.nix
+++ b/pkgs/tools/admin/awsweeper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "awsweeper";
@@ -13,9 +13,7 @@ buildGoModule rec {
 
   modSha256 = "14yvf0svh7xqpc2y7xr94pc6r7d3iv2nsr8qs3f5q29hdc5hv3fs";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A tool to clean out your AWS account";
     homepage = "https://github.com/cloudetc/awsweeper/";
     license = licenses.mpl20;
diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix
index d088184f7a17..c1c46da41b75 100644
--- a/pkgs/tools/admin/berglas/default.nix
+++ b/pkgs/tools/admin/berglas/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "berglas";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "0m2bqx102lf6nihdjbl8a08xcwi80rawvh91j1cav0njm9w5vmmm";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     description = "A tool for managing secrets on Google Cloud";
     homepage = "https://github.com/GoogleCloudPlatform/berglas";
diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix
index 89c6b8996fa3..5474cb254298 100644
--- a/pkgs/tools/admin/certigo/default.nix
+++ b/pkgs/tools/admin/certigo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "certigo";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "1i5n5yh6nvv2i2nm60vqy1gngj8p5w6ma5fcwmp7bl4jxjrzbi83";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     description = "A utility to examine and validate certificates in a variety of formats";
     homepage = "https://github.com/square/certigo";
diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix
index a12b8abe1206..3f4d00736ad9 100644
--- a/pkgs/tools/admin/clair/default.nix
+++ b/pkgs/tools/admin/clair/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, rpm, xz, Security }:
+{ lib, buildGoModule, fetchFromGitHub, makeWrapper, rpm, xz }:
 
 buildGoModule rec {
   pname = "clair";
@@ -13,16 +13,14 @@ buildGoModule rec {
 
   modSha256 = "0rgkrid58kji39nlmiii95r8shbzr6dwalj5m7qwxy5w1rcaljr5";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   nativeBuildInputs = [ makeWrapper ];
 
   postInstall = ''
     wrapProgram $out/bin/clair \
-      --prefix PATH : "${stdenv.lib.makeBinPath [ rpm xz ]}"
+      --prefix PATH : "${lib.makeBinPath [ rpm xz ]}"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Vulnerability Static Analysis for Containers";
     homepage = "https://github.com/quay/clair";
     license = licenses.asl20;
diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix
index c700e4f397c7..4c01383f8986 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/pkgs/tools/admin/eksctl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "eksctl";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "0f8dlcp3q84fa5dnnzx4347ngb1raw1mxkcqpz2s3zq6d1kv0nvf";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   subPackages = [ "cmd/eksctl" ];
 
   buildFlags = [ "-tags netgo" "-tags release" ];
@@ -27,7 +25,7 @@ buildGoModule rec {
     $out/bin/eksctl completion zsh > "$out/share/zsh/site-functions/_eksctl"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A CLI for Amazon EKS";
     homepage = "https://github.com/weaveworks/eksctl";
     license = licenses.asl20;
diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix
index 6a1ec948d907..e09cd2f52853 100644
--- a/pkgs/tools/admin/iamy/default.nix
+++ b/pkgs/tools/admin/iamy/default.nix
@@ -1,9 +1,11 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "iamy";
   version = "2.3.2";
 
+  goPackagePath = "github.com/99designs/iamy";
+
   src = fetchFromGitHub {
     owner = "99designs";
     repo = "iamy";
@@ -13,8 +15,6 @@ buildGoModule rec {
 
   modSha256 = "0akak573zvz3xg5d7vf0ch2mrmj1jkzcdc29v3kn43f7944c2wcl";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   buildFlagsArray = [''-ldflags=
     -X main.Version=v${version} -s -w
   ''];
diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix
index 0cb614c12d1f..72c61ceecaf2 100644
--- a/pkgs/tools/admin/lego/default.nix
+++ b/pkgs/tools/admin/lego/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule, Security }:
+{ lib, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   pname = "lego";
@@ -14,13 +14,11 @@ buildGoModule rec {
   modSha256 = "10n8pcbmzlnk63gzsjb1xnmjwxfhxsqx8ffpcbwdzq9fc5yvjiii";
   subPackages = [ "cmd/lego" ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   buildFlagsArray = [
     "-ldflags=-X main.version=${version}"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Let's Encrypt client and ACME library written in Go";
     license = licenses.mit;
     homepage = "https://go-acme.github.io/lego/";
diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix
index 979a658ac022..b2fb6925abac 100644
--- a/pkgs/tools/misc/chezmoi/default.nix
+++ b/pkgs/tools/misc/chezmoi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
 
 buildGoModule rec {
   pname = "chezmoi";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "0gh314d3mspqmz2z3m05bgsp62mrhb48m4mwhfy5h62fs7aqymr8";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   buildFlagsArray = [
     "-ldflags=-s -w -X github.com/twpayne/chezmoi/cmd.VersionStr=${version}"
   ];
diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix
index c8f3dbf8009c..0329c1bc4a69 100644
--- a/pkgs/tools/misc/docui/default.nix
+++ b/pkgs/tools/misc/docui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "docui";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "1wyx05kk4f41mgvwnvfc9xk7vd3x96cbn5xb5ph7p443f70ydnak";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     description = "TUI Client for Docker";
     homepage = "https://github.com/skanehira/docui";
diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/pkgs/tools/misc/gotify-cli/default.nix
index 56462aa3d303..a4b9af09712e 100644
--- a/pkgs/tools/misc/gotify-cli/default.nix
+++ b/pkgs/tools/misc/gotify-cli/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, stdenv, Security }:
+{ buildGoModule, fetchFromGitHub, lib }:
 
 buildGoModule rec {
   pname = "gotify-cli";
@@ -17,9 +17,7 @@ buildGoModule rec {
     mv $out/bin/cli $out/bin/gotify
   '';
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = licenses.mit;
     homepage = https://github.com/gotify/cli;
     description = "A command line interface for pushing messages to gotify/server.";
diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix
index a7b7da451fb7..207492a89449 100644
--- a/pkgs/tools/misc/kepubify/default.nix
+++ b/pkgs/tools/misc/kepubify/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule, Security }:
+{ lib, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   pname = "kepubify";
@@ -15,11 +15,9 @@ buildGoModule rec {
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   subPackages = [ "." "covergen" "seriesmeta" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "EPUB to KEPUB converter";
     homepage = "https://pgaskin.net/kepubify";
     license = licenses.mit;
diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix
index c029f38acb2c..8940fef2a0dd 100644
--- a/pkgs/tools/misc/mutagen/default.nix
+++ b/pkgs/tools/misc/mutagen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "mutagen";
@@ -13,11 +13,9 @@ buildGoModule rec {
 
   modSha256 = "1r6b4y6civk75if6nljl66pgv5qm7x05qqby1anf7s7cz7d1rc3g";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
-
   subPackages = [ "cmd/mutagen" "cmd/mutagen-agent" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Make remote development work with your local tools";
     homepage = "https://mutagen.io/";
     changelog = "https://github.com/mutagen-io/mutagen/releases/tag/v${version}";
diff --git a/pkgs/tools/misc/pgcenter/default.nix b/pkgs/tools/misc/pgcenter/default.nix
index 9eed1aaffd8e..7cb810b2fe2d 100644
--- a/pkgs/tools/misc/pgcenter/default.nix
+++ b/pkgs/tools/misc/pgcenter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "pgcenter";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "0kassq52v07zmffs6l066g0d3kfv6wmrh9g5cgk79bmyq13clqjj";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     homepage = https://pgcenter.org/;
     description = "Command-line admin tool for observing and troubleshooting PostgreSQL";
diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix
index 04e106ca5522..b702ffc1703d 100644
--- a/pkgs/tools/misc/pgmetrics/default.nix
+++ b/pkgs/tools/misc/pgmetrics/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "pgmetrics";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "0h375zk0ik06g0b5vmi00b1wn5q2c0r137f7qf6l8k8p886x41h6";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix
index 5b9ba71f8c9b..6156f43b04b8 100644
--- a/pkgs/tools/networking/cassowary/default.nix
+++ b/pkgs/tools/networking/cassowary/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "cassowary";
@@ -13,11 +13,9 @@ buildGoModule rec {
 
   modSha256 = "1iylnnmj5slji89pkb3shp4xqar1zbpl7bzwddbzpp8y52fmsv1c";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/rogerwelin/cassowary";
     description = "Modern cross-platform HTTP load-testing tool written in Go";
     license = licenses.mit;
diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix
index 8e7499caa479..234fd0b31afa 100644
--- a/pkgs/tools/networking/clash/default.nix
+++ b/pkgs/tools/networking/clash/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule, Security }:
+{ stdenv, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   pname = "clash";
@@ -14,8 +14,6 @@ buildGoModule rec {
   goPackagePath = "github.com/Dreamacro/clash";
   modSha256 = "02bki2iq99lc9iq1mjf9rbxwspalrj7hjlk1h384w3d4s4x4fyxy";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   buildFlagsArray = [
     "-ldflags="
     "-X ${goPackagePath}/constant.Version=${version}"
diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix
index 0cfaddcf06ae..96798c1c17e9 100644
--- a/pkgs/tools/networking/corerad/default.nix
+++ b/pkgs/tools/networking/corerad/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "corerad";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "0vbbpndqwwz1mc59j7liaayxaj53cs8s3javgj3pvhkn4vp65p7c";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   buildFlagsArray = ''
     -ldflags=
     -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1583280117
diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix
index d7ab830479ea..0412020518e5 100644
--- a/pkgs/tools/networking/croc/default.nix
+++ b/pkgs/tools/networking/croc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "croc";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "0ng4x9zmwax2vskbcadra4pdkgy1p1prmgkg1bjmh3b8rwsrhr0q";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   subPackages = [ "." ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix
index 89173e7b4277..8296600cf3d3 100644
--- a/pkgs/tools/networking/dnsproxy/default.nix
+++ b/pkgs/tools/networking/dnsproxy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule, Security }:
+{ stdenv, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   pname = "dnsproxy";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "0r5ybr4gpcdsldk12b0d4xiih6ckwnqkfwy89c97prv24v14zysv";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support";
     homepage = "https://github.com/AdguardTeam/dnsproxy";
diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix
index 7323c914bfa1..f44e2208646c 100644
--- a/pkgs/tools/networking/frp/default.nix
+++ b/pkgs/tools/networking/frp/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, stdenv, fetchFromGitHub, Security }:
+{ buildGoModule, lib, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "frp";
@@ -13,11 +13,9 @@ buildGoModule rec {
 
   modSha256 = "1v90w5grc0vjpcp0m56d73zi0qnbswgz1rcvcwrjfa3rwqhigbal";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   subPackages = [ "cmd/frpc" "cmd/frps" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Fast reverse proxy";
     longDescription = ''
       frp is a fast reverse proxy to help you expose a local server behind a
diff --git a/pkgs/tools/networking/grpcui/default.nix b/pkgs/tools/networking/grpcui/default.nix
index de2b3f787986..58e698ed7081 100644
--- a/pkgs/tools/networking/grpcui/default.nix
+++ b/pkgs/tools/networking/grpcui/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, fetchFromGitHub, stdenv, Security }:
+{ buildGoModule, fetchFromGitHub, lib }:
 
 buildGoModule rec {
   pname = "grpcui";
@@ -13,9 +13,7 @@ buildGoModule rec {
 
   modSha256 = "1yq8484cjxad72nqsrim3zppr8hmn7dc6f8rgkw8fg952lqy5jjb";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An interactive web UI for gRPC, along the lines of postman";
     homepage = "https://github.com/fullstorydev/grpcui";
     license = licenses.mit;
diff --git a/pkgs/tools/networking/hey/default.nix b/pkgs/tools/networking/hey/default.nix
index 69cfa4526029..d65d5c9e3235 100644
--- a/pkgs/tools/networking/hey/default.nix
+++ b/pkgs/tools/networking/hey/default.nix
@@ -1,4 +1,4 @@
-{ buildGoModule, stdenv, fetchFromGitHub, Security }:
+{ buildGoModule, lib, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "hey";
@@ -13,9 +13,7 @@ buildGoModule rec {
 
   modSha256 = "0a00kcyagqczw0vhl8qs2xs1y8myw080y9kjs4qrcmj6kibdy55q";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "HTTP load generator, ApacheBench (ab) replacement";
     homepage = "https://github.com/rakyll/hey";
     license = licenses.asl20;
diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix
index b8cf93bc2d3f..885ffbe91579 100644
--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/pkgs/tools/networking/minio-client/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "minio-client";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "1qjfsqmcc6i0nixwvdmm3vnnv19yvqaaza096cpdf5rl35knsp5i";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
-
   subPackages = [ "." ];
 
   preBuild = ''
diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix
index f78d7129c34a..3411aca55519 100644
--- a/pkgs/tools/networking/nebula/default.nix
+++ b/pkgs/tools/networking/nebula/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "nebula";
@@ -13,13 +13,11 @@ buildGoModule rec {
 
   modSha256 = "1sy5mnwn9fxjf3y41lm8gsggid2c0y08iw88m9ng8psaf4qid8ij";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   subPackages = [ "cmd/nebula" "cmd/nebula-cert" ];
 
   buildFlagsArray = [ "-ldflags='-X main.Build=${version}'" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A scalable overlay networking tool with a focus on performance, simplicity and security";
     longDescription = ''
       Nebula is a scalable overlay networking tool with a focus on performance,
diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/tools/networking/obfs4/default.nix
index 93ebdeb0720c..005abb0968b6 100644
--- a/pkgs/tools/networking/obfs4/default.nix
+++ b/pkgs/tools/networking/obfs4/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, buildGoModule, Security }:
+{ lib, fetchgit, buildGoModule }:
 
 buildGoModule rec {
   pname = "obfs4";
@@ -12,9 +12,7 @@ buildGoModule rec {
 
   modSha256 = "150kg22kznrdj5icjxk3qd70g7wpq8zd2zklw1y2fgvrggw8zvyv";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A pluggable transport proxy";
     homepage = https://www.torproject.org/projects/obfsproxy;
     repositories.git = https://git.torproject.org/pluggable-transports/obfs4.git;
diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix
index 37d5edaec452..f2ae143e1b9e 100644
--- a/pkgs/tools/networking/shadowfox/default.nix
+++ b/pkgs/tools/networking/shadowfox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule, Security }:
+{ stdenv, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   pname = "shadowfox";
@@ -11,9 +11,9 @@ buildGoModule rec {
     sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6";
   };
 
-  modSha256 = "0hcc87mzacqwbw10l49kx0sxl4mivdr88c40wh6hdfvrbam2w86r";
+  goPackagePath = "github.com/SrKomodo/shadowfox-updater";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
+  modSha256 = "0hcc87mzacqwbw10l49kx0sxl4mivdr88c40wh6hdfvrbam2w86r";
 
   buildFlags = [ "--tags" "release" ];
 
diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix
index 91378757af1d..0b9c254deeb4 100644
--- a/pkgs/tools/networking/tendermint/default.nix
+++ b/pkgs/tools/networking/tendermint/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule, Security }:
+{ stdenv, fetchFromGitHub, buildGoModule }:
 
 buildGoModule rec {
   pname = "tendermint";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "1h51zgvjq3bm09yhm54rk8a86cqa1zma3mx6pb0kq7k72xvhpx0a";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short.";
     homepage = https://tendermint.com/;
diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/tools/networking/termshark/default.nix
index a24ff25ef2ba..35b92e0f653b 100644
--- a/pkgs/tools/networking/termshark/default.nix
+++ b/pkgs/tools/networking/termshark/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli, Security }:
+{ stdenv, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli }:
 
 buildGoModule rec {
   pname = "termshark";
@@ -12,8 +12,7 @@ buildGoModule rec {
   };
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ wireshark-cli ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
+  buildInputs = [ wireshark-cli ];
 
   modSha256 = "0lp4gky76di7as78421p3lsirfr7mic3z204ildvj6gf6d15svpr";
 
diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix
index 605801b6ab73..3bf3b97c2355 100644
--- a/pkgs/tools/networking/yggdrasil/default.nix
+++ b/pkgs/tools/networking/yggdrasil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Foundation }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "yggdrasil";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "057yl3i29kwpd129aa2rb67s5rmz898fi2a7lxv3nfjp7018s9qw";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Foundation ];
-
   # Change the default location of the management socket on Linux
   # systems so that the yggdrasil system service unit does not have to
   # be granted write permission to /run.
@@ -29,7 +27,7 @@ buildGoModule rec {
       -s -w
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description =
       "An experiment in scalable routing as an encrypted IPv6 overlay network";
     homepage = "https://yggdrasil-network.github.io/";
diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix
index 6afba001e08d..b40257d42f4b 100644
--- a/pkgs/tools/package-management/mynewt-newt/default.nix
+++ b/pkgs/tools/package-management/mynewt-newt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch, Security }:
+{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch }:
 
 buildGoModule rec {
   pname = "mynewt-newt";
@@ -24,8 +24,6 @@ buildGoModule rec {
 
   modSha256 = "068r8wa2pgd68jv50x0l1w8n96f97b3mgv7z6f85280ahgywaasq";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   meta = with stdenv.lib; {
     homepage = https://mynewt.apache.org/;
     description = "Build and package management tool for embedded development.";
diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix
index 0448faf53b76..bde597ba9f30 100644
--- a/pkgs/tools/security/age/default.nix
+++ b/pkgs/tools/security/age/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "age";
@@ -18,9 +18,7 @@ buildGoModule rec {
     sha256 = "1n1ww8yjw0mg00dvnfmggww9kwp1hls0a85iv6vx9k89mzv8mdrq";
   };
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://age-encryption.org/";
     description = "Modern encryption tool with small explicit keys";
     license = licenses.bsd3;
diff --git a/pkgs/tools/security/gobuster/default.nix b/pkgs/tools/security/gobuster/default.nix
index c9348b2f23aa..c3426bee965b 100644
--- a/pkgs/tools/security/gobuster/default.nix
+++ b/pkgs/tools/security/gobuster/default.nix
@@ -1,7 +1,6 @@
 { buildGoModule
 , fetchFromGitHub
-, stdenv
-, Security
+, lib
 }:
 
 buildGoModule rec {
@@ -17,9 +16,7 @@ buildGoModule rec {
 
   modSha256 = "0jq0z5s05vqdvq7v1gdjwlqqwbl1j2rv9f16k52idl50vdiqviql";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tool used to brute-force URIs, DNS subdomains, Virtual Host names on target web servers";
     homepage = "https://github.com/OJ/gobuster";
     license = licenses.asl20;
diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix
index 811b95d25245..011747890818 100644
--- a/pkgs/tools/security/saml2aws/default.nix
+++ b/pkgs/tools/security/saml2aws/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, libobjc, Foundation, IOKit }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "saml2aws";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "0qxf2i06spjig3ynixh3xmbxpghh222jhfqcg71i4i79x4ycp5wx";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc Foundation IOKit ];
-
   subPackages = [ "." "cmd/saml2aws" ];
 
   buildFlagsArray = ''
diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix
index d028b9787dba..8aa2e219e7df 100644
--- a/pkgs/tools/security/sops/default.nix
+++ b/pkgs/tools/security/sops/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "sops";
@@ -13,8 +13,6 @@ buildGoModule rec {
 
   modSha256 = "0vhxd3dschj5i9sig6vpxzbl59cas1qa843akzmjnfjrrafb916y";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
-
   meta = with stdenv.lib; {
     homepage = "https://github.com/mozilla/sops";
     description = "Mozilla sops (Secrets OPerationS) is an editor of encrypted files";
diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix
index b9ea0c04aa85..4f492def1624 100644
--- a/pkgs/tools/system/ctop/default.nix
+++ b/pkgs/tools/system/ctop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoModule, fetchFromGitHub, Security }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "ctop";
@@ -13,11 +13,9 @@ buildGoModule rec {
 
   modSha256 = "0wxv6yzlgki7047qszx9p9xpph95bg097jkgaa0b3wbpx8vg7qml";
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
-
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.build=v${version}" ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Top-like interface for container metrics";
     homepage = "https://ctop.sh/";
     license = licenses.mit;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e469380abbd..60b4afe8386b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -161,9 +161,7 @@ in
 
   cm256cc = callPackage ../development/libraries/cm256cc {  };
 
-  conftest = callPackage ../development/tools/conftest {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  conftest = callPackage ../development/tools/conftest { };
 
   corgi = callPackage ../development/tools/corgi { };
 
@@ -177,13 +175,9 @@ in
 
   hobbes = callPackage ../development/tools/hobbes { stdenv = gcc6Stdenv; }; # GCC 6 is latest currently supported. See https://git.io/JvK6M.
 
-  proto-contrib = callPackage ../development/tools/proto-contrib {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  proto-contrib = callPackage ../development/tools/proto-contrib {};
 
-  protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {};
 
   demoit = callPackage ../servers/demoit { };
 
@@ -197,9 +191,7 @@ in
 
   dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh;
 
-  archiver = callPackage ../applications/misc/archiver {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  archiver = callPackage ../applications/misc/archiver { };
 
   digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { };
 
@@ -219,9 +211,7 @@ in
 
   docker-sync = callPackage ../tools/misc/docker-sync { };
 
-  docui = callPackage ../tools/misc/docui {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  docui = callPackage ../tools/misc/docui { };
 
   dotfiles = callPackage ../applications/misc/dotfiles { };
 
@@ -298,18 +288,13 @@ in
     # Version 2.6.0 fails to build with go 1.13 due to nested modules:
     #   go: directory v2/packr2 is outside main module
     buildGoModule = buildGo112Module;
-    inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  pet = callPackage ../development/tools/pet {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  pet = callPackage ../development/tools/pet { };
 
   run = callPackage ../development/tools/run { };
 
-  mod = callPackage ../development/tools/mod {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  mod = callPackage ../development/tools/mod { };
 
   broadlink-cli = callPackage ../tools/misc/broadlink-cli {};
 
@@ -543,9 +528,7 @@ in
 
   acpica-tools = callPackage ../tools/system/acpica-tools { };
 
-  act = callPackage ../development/tools/misc/act {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  act = callPackage ../development/tools/misc/act {};
 
   actdiag = with python3.pkgs; toPythonApplication actdiag;
 
@@ -570,9 +553,7 @@ in
     wxGTK = wxGTK30;
   } // (config.aegisub or {}));
 
-  aerc = callPackage ../applications/networking/mailreaders/aerc {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  aerc = callPackage ../applications/networking/mailreaders/aerc { };
 
   aerospike = callPackage ../servers/nosql/aerospike { };
 
@@ -759,27 +740,19 @@ in
 
   aws-sam-cli = callPackage ../development/tools/aws-sam-cli { python = python3; };
 
-  aws-vault = callPackage ../tools/admin/aws-vault {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  aws-vault = callPackage ../tools/admin/aws-vault { };
 
-  iamy = callPackage ../tools/admin/iamy {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  iamy = callPackage ../tools/admin/iamy { };
 
   azure-cli = callPackage ../tools/admin/azure-cli { python = python3; };
 
-  azure-storage-azcopy = callPackage ../development/tools/azcopy {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  azure-storage-azcopy = callPackage ../development/tools/azcopy { };
 
   azure-vhd-utils  = callPackage ../tools/misc/azure-vhd-utils { };
 
   awless = callPackage ../tools/virtualization/awless { };
 
-  berglas = callPackage ../tools/admin/berglas/default.nix {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  berglas = callPackage ../tools/admin/berglas/default.nix { };
 
   brakeman = callPackage ../development/tools/analysis/brakeman { };
 
@@ -851,22 +824,16 @@ in
 
   calls = callPackage ../applications/networking/calls { };
 
-  certigo = callPackage ../tools/admin/certigo {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  certigo = callPackage ../tools/admin/certigo { };
 
-  chezmoi = callPackage ../tools/misc/chezmoi {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  chezmoi = callPackage ../tools/misc/chezmoi { };
 
   chipsec = callPackage ../tools/security/chipsec {
     kernel = null;
     withDriver = false;
   };
 
-  clair = callPackage ../tools/admin/clair {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  clair = callPackage ../tools/admin/clair { };
 
   cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { };
 
@@ -898,9 +865,7 @@ in
 
   crc32c = callPackage ../development/libraries/crc32c { };
 
-  cue = callPackage ../development/tools/cue {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  cue = callPackage ../development/tools/cue { };
 
   deltachat-electron = callPackage
     ../applications/networking/instant-messengers/deltachat-electron { };
@@ -925,9 +890,7 @@ in
 
   sedutil = callPackage ../tools/security/sedutil { };
 
-  elvish = callPackage ../shells/elvish {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  elvish = callPackage ../shells/elvish { };
 
   emplace = callPackage ../tools/package-management/emplace { };
 
@@ -1143,9 +1106,7 @@ in
 
   awstats = callPackage ../tools/system/awstats { };
 
-  awsweeper = callPackage ../tools/admin/awsweeper {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  awsweeper = callPackage ../tools/admin/awsweeper { };
 
   axel = callPackage ../tools/networking/axel {
     libssl = openssl;
@@ -1410,12 +1371,8 @@ in
     '';
   });
 
-  caddy = callPackage ../servers/caddy {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
-  caddy2 = callPackage ../servers/caddy/v2.nix {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  caddy = callPackage ../servers/caddy { };
+  caddy2 = callPackage ../servers/caddy/v2.nix { };
   traefik = callPackage ../servers/traefik { };
 
   calamares = libsForQt5.callPackage ../tools/misc/calamares {
@@ -1467,13 +1424,9 @@ in
 
   ccnet = callPackage ../tools/networking/ccnet { };
 
-  cassowary = callPackage ../tools/networking/cassowary {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  cassowary = callPackage ../tools/networking/cassowary { };
 
-  croc = callPackage ../tools/networking/croc {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  croc = callPackage ../tools/networking/croc { };
 
   cddl = callPackage ../development/tools/cddl { };
 
@@ -1493,9 +1446,7 @@ in
 
   clac = callPackage ../tools/misc/clac {};
 
-  clash = callPackage ../tools/networking/clash {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  clash = callPackage ../tools/networking/clash { };
 
   clasp = callPackage ../tools/misc/clasp { };
 
@@ -1760,9 +1711,7 @@ in
 
   eggdrop = callPackage ../tools/networking/eggdrop { };
 
-  eksctl = callPackage ../tools/admin/eksctl {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  eksctl = callPackage ../tools/admin/eksctl { };
 
   elementary-xfce-icon-theme = callPackage ../data/icons/elementary-xfce-icon-theme { };
 
@@ -1916,9 +1865,7 @@ in
 
   gosu = callPackage ../tools/misc/gosu { };
 
-  gotify-cli = callPackage ../tools/misc/gotify-cli {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  gotify-cli = callPackage ../tools/misc/gotify-cli { };
 
   gping = callPackage ../tools/networking/gping { };
 
@@ -2498,9 +2445,7 @@ in
 
   ciopfs = callPackage ../tools/filesystems/ciopfs { };
 
-  circleci-cli = callPackage ../development/tools/misc/circleci-cli {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  circleci-cli = callPackage ../development/tools/misc/circleci-cli { };
 
   circus = callPackage ../tools/networking/circus { };
 
@@ -2671,9 +2616,7 @@ in
     caps2esc = callPackage ../tools/inputmethods/interception-tools/caps2esc.nix { };
   };
 
-  age = callPackage ../tools/security/age {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  age = callPackage ../tools/security/age { };
 
   brotli = callPackage ../tools/compression/brotli { };
 
@@ -2898,9 +2841,7 @@ in
 
   dnsmasq = callPackage ../tools/networking/dnsmasq { };
 
-  dnsproxy = callPackage ../tools/networking/dnsproxy {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  dnsproxy = callPackage ../tools/networking/dnsproxy { };
 
   dnsperf = callPackage ../tools/networking/dnsperf { };
 
@@ -3003,13 +2944,9 @@ in
 
   driftnet = callPackage ../tools/networking/driftnet {};
 
-  drone = callPackage ../development/tools/continuous-integration/drone {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  drone = callPackage ../development/tools/continuous-integration/drone { };
 
-  drone-cli = callPackage ../development/tools/continuous-integration/drone-cli {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { };
 
   dropbear = callPackage ../tools/networking/dropbear { };
 
@@ -3932,7 +3869,6 @@ in
 
   grpcui = callPackage ../tools/networking/grpcui {
     buildGoModule = buildGo112Module;
-    inherit (darwin.apple_sdk.frameworks) Security;
   };
 
   grub = pkgsi686Linux.callPackage ../tools/misc/grub ({
@@ -4159,9 +4095,7 @@ in
   hexd = callPackage ../tools/misc/hexd { };
   pixd = callPackage ../tools/misc/pixd { };
 
-  hey = callPackage ../tools/networking/hey {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  hey = callPackage ../tools/networking/hey { };
 
   hhpc = callPackage ../tools/misc/hhpc { };
 
@@ -4359,12 +4293,9 @@ in
     #    go: github.com/go-critic/go-critic@v0.0.0-20181204210945-ee9bf5809ead: invalid pseudo-version: does not match version-control timestamp (2019-02-10T22:04:43Z)
     # This is fixed in master, but release containing the fix does not exist yet.
     buildGoModule = buildGo112Module;
-    inherit (darwin.apple_sdk.frameworks) Security;
   };
   ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { };
-  ipfs-cluster = callPackage ../applications/networking/ipfs-cluster {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { };
 
   ipget = callPackage ../applications/networking/ipget { };
 
@@ -4608,9 +4539,7 @@ in
 
   lefthook = gitAndTools.lefthook;
 
-  lego = callPackage ../tools/admin/lego {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  lego = callPackage ../tools/admin/lego { };
 
   leocad = callPackage ../applications/graphics/leocad { };
 
@@ -4703,9 +4632,7 @@ in
 
   mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { });
 
-  mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { };
 
   mcfly = callPackage ../tools/misc/mcfly {
     inherit (darwin.apple_sdk.frameworks) Security;
@@ -4742,9 +4669,7 @@ in
 
   motion = callPackage ../applications/video/motion { };
 
-  mtail = callPackage ../servers/monitoring/mtail {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  mtail = callPackage ../servers/monitoring/mtail { };
 
   multitail = callPackage ../tools/misc/multitail { };
 
@@ -5191,9 +5116,7 @@ in
 
   minetime = callPackage ../applications/office/minetime { };
 
-  minio-client = callPackage ../tools/networking/minio-client {
-    inherit (darwin.apple_sdk.frameworks) CoreServices;
-  };
+  minio-client = callPackage ../tools/networking/minio-client { };
 
   minissdpd = callPackage ../tools/networking/minissdpd { };
 
@@ -5312,9 +5235,7 @@ in
 
   munt = libsForQt5.callPackage ../applications/audio/munt { };
 
-  mutagen = callPackage ../tools/misc/mutagen {
-    inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
-  };
+  mutagen = callPackage ../tools/misc/mutagen { };
 
   mycli = callPackage ../tools/admin/mycli { };
 
@@ -5352,9 +5273,7 @@ in
 
   ndppd = callPackage ../applications/networking/ndppd { };
 
-  nebula = callPackage ../tools/networking/nebula {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  nebula = callPackage ../tools/networking/nebula { };
 
   nemiver = callPackage ../development/tools/nemiver { };
 
@@ -5582,9 +5501,7 @@ in
 
   obexd = callPackage ../tools/bluetooth/obexd { };
 
-  obfs4 = callPackage ../tools/networking/obfs4 {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  obfs4 = callPackage ../tools/networking/obfs4 { };
 
   oci-image-tool = callPackage ../tools/misc/oci-image-tool { };
 
@@ -5924,13 +5841,9 @@ in
 
   pg_top = callPackage ../tools/misc/pg_top { };
 
-  pgcenter = callPackage ../tools/misc/pgcenter {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  pgcenter = callPackage ../tools/misc/pgcenter { };
 
-  pgmetrics = callPackage ../tools/misc/pgmetrics {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  pgmetrics = callPackage ../tools/misc/pgmetrics { };
 
   pdsh = callPackage ../tools/networking/pdsh {
     rsh = true;          # enable internal rsh implementation
@@ -6468,10 +6381,7 @@ in
 
   samim-fonts = callPackage ../data/fonts/samim-fonts {};
 
-  saml2aws = callPackage ../tools/security/saml2aws {
-    inherit (darwin) libobjc;
-    inherit (darwin.apple_sdk.frameworks) Foundation IOKit;
-  };
+  saml2aws = callPackage ../tools/security/saml2aws {};
 
   samplicator = callPackage ../tools/networking/samplicator { };
 
@@ -7772,9 +7682,7 @@ in
     inherit (darwin.apple_sdk.frameworks) IOKit;
   };
 
-  yggdrasil = callPackage ../tools/networking/yggdrasil {
-    inherit (darwin.apple_sdk.frameworks) Foundation;
-  };
+  yggdrasil = callPackage ../tools/networking/yggdrasil { };
 
   # To expose more packages for Yi, override the extraPackages arg.
   yi = callPackage ../applications/editors/yi/wrapper.nix { };
@@ -7827,9 +7735,7 @@ in
 
   zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { };
 
-  zsh-history = callPackage ../shells/zsh/zsh-history {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  zsh-history = callPackage ../shells/zsh/zsh-history { };
 
   zsh-history-substring-search = callPackage ../shells/zsh/zsh-history-substring-search { };
 
@@ -8145,9 +8051,7 @@ in
 
   scry = callPackage ../development/tools/scry {};
 
-  dbmate = callPackage ../development/tools/database/dbmate {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  dbmate = callPackage ../development/tools/database/dbmate { };
 
   devpi-client = python3Packages.callPackage ../development/tools/devpi-client {};
 
@@ -8175,9 +8079,7 @@ in
   };
   fasm-bin = callPackage ../development/compilers/fasm/bin.nix { };
 
-  flyctl = callPackage ../development/web/flyctl {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  flyctl = callPackage ../development/web/flyctl { };
 
   fpc = callPackage ../development/compilers/fpc { };
 
@@ -9348,9 +9250,7 @@ in
 
   jmeter = callPackage ../applications/networking/jmeter {};
 
-  joker = callPackage ../development/interpreters/joker {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  joker = callPackage ../development/interpreters/joker {};
 
   davmail = callPackage ../applications/networking/davmail {};
 
@@ -9996,9 +9896,7 @@ in
     go = go_1_12;
   };
 
-  bazelisk = callPackage ../development/tools/bazelisk {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  bazelisk = callPackage ../development/tools/bazelisk { };
 
   buildBazelPackage = callPackage ../build-support/build-bazel-package { };
 
@@ -10266,9 +10164,7 @@ in
       binutils = binutils;
     };
 
-  dive = callPackage ../development/tools/dive {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  dive = callPackage ../development/tools/dive { };
 
   doclifter = callPackage ../development/tools/misc/doclifter { };
 
@@ -10278,9 +10174,7 @@ in
 
   doit = callPackage ../development/tools/build-managers/doit { };
 
-  dolt = callPackage ../servers/sql/dolt {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  dolt = callPackage ../servers/sql/dolt { };
 
   dot2tex = pythonPackages.dot2tex;
 
@@ -10299,9 +10193,7 @@ in
 
   drush = callPackage ../development/tools/misc/drush { };
 
-  editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { };
 
   editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { };
 
@@ -10342,9 +10234,7 @@ in
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
-  fly = callPackage ../development/tools/continuous-integration/fly {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  fly = callPackage ../development/tools/continuous-integration/fly { };
 
   foreman = callPackage ../tools/system/foreman { };
   goreman = callPackage ../tools/system/goreman { };
@@ -10353,9 +10243,7 @@ in
 
   frame = callPackage ../development/libraries/frame { };
 
-  frp = callPackage ../tools/networking/frp {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  frp = callPackage ../tools/networking/frp { };
 
   fsatrace = callPackage ../development/tools/misc/fsatrace { };
 
@@ -10424,9 +10312,7 @@ in
 
   gocd-server = callPackage ../development/tools/continuous-integration/gocd-server { };
 
-  gotify-server = callPackage ../servers/gotify {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  gotify-server = callPackage ../servers/gotify { };
 
   gotty = callPackage ../servers/gotty { };
 
@@ -10470,9 +10356,7 @@ in
 
   halfempty = callPackage ../development/tools/halfempty {};
 
-  hcloud = callPackage ../development/tools/hcloud {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  hcloud = callPackage ../development/tools/hcloud { };
 
   help2man = callPackage ../development/tools/misc/help2man { };
 
@@ -10554,17 +10438,13 @@ in
 
   kube-prompt = callPackage ../development/tools/kube-prompt { };
 
-  kubeprompt = callPackage ../development/tools/kubeprompt {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  kubeprompt = callPackage ../development/tools/kubeprompt { };
 
   kubicorn = callPackage ../development/tools/kubicorn {  };
 
   kubie = callPackage ../development/tools/kubie { };
 
-  kustomize = callPackage ../development/tools/kustomize {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  kustomize = callPackage ../development/tools/kustomize { };
 
   ktlint = callPackage ../development/tools/ktlint { };
 
@@ -10621,18 +10501,14 @@ in
 
   mdl = callPackage ../development/tools/misc/mdl { };
 
-  minify = callPackage ../development/web/minify {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  minify = callPackage ../development/web/minify { };
 
   minizinc = callPackage ../development/tools/minizinc { };
   minizincide = qt5.callPackage ../development/tools/minizinc/ide.nix { };
 
   mk = callPackage ../development/tools/build-managers/mk { };
 
-  mkcert = callPackage ../development/tools/misc/mkcert {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  mkcert = callPackage ../development/tools/misc/mkcert { };
 
   mkdocs = callPackage ../development/tools/documentation/mkdocs { };
 
@@ -10812,9 +10688,7 @@ in
     withPEPatterns = true;
   };
 
-  reviewdog = callPackage ../development/tools/misc/reviewdog {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  reviewdog = callPackage ../development/tools/misc/reviewdog { };
 
   rman = callPackage ../development/tools/misc/rman { };
 
@@ -10956,9 +10830,7 @@ in
 
   teensy-loader-cli = callPackage ../development/tools/misc/teensy-loader-cli { };
 
-  terracognita = callPackage ../development/tools/misc/terracognita {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  terracognita = callPackage ../development/tools/misc/terracognita { };
 
   terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { };
 
@@ -10979,15 +10851,11 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  tflint = callPackage ../development/tools/analysis/tflint {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  tflint = callPackage ../development/tools/analysis/tflint { };
 
   tfsec = callPackage ../development/tools/analysis/tfsec { };
 
-  todoist = callPackage ../applications/misc/todoist {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  todoist = callPackage ../applications/misc/todoist { };
 
   todoist-electron = callPackage ../applications/misc/todoist-electron { };
 
@@ -15612,7 +15480,6 @@ in
 
   gobetween = callPackage ../servers/gobetween {
     buildGoModule = buildGo112Module;
-    inherit (darwin.apple_sdk.frameworks) Security;
   };
 
   h2o = callPackage ../servers/http/h2o { };
@@ -15642,9 +15509,7 @@ in
     theme-spring = callPackage ../servers/icingaweb2/theme-spring { };
   };
 
-  imgproxy = callPackage ../servers/imgproxy {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  imgproxy = callPackage ../servers/imgproxy { };
 
   ircdHybrid = callPackage ../servers/irc/ircd-hybrid { };
 
@@ -15683,9 +15548,7 @@ in
 
   mattermost = callPackage ../servers/mattermost { };
   matterircd = callPackage ../servers/mattermost/matterircd.nix { };
-  matterbridge = callPackage ../servers/matterbridge {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  matterbridge = callPackage ../servers/matterbridge { };
 
   mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { };
 
@@ -15699,9 +15562,7 @@ in
 
   micronaut = callPackage ../development/tools/micronaut {};
 
-  minio = callPackage ../servers/minio {
-    inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
-  };
+  minio = callPackage ../servers/minio { };
 
   # Backwards compatibility.
   mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd;
@@ -15893,7 +15754,7 @@ in
   mysql = mariadb; # TODO: move to aliases.nix
 
   mongodb = hiPrio mongodb-3_4;
-  
+
   mongodb-3_4 = callPackage ../servers/nosql/mongodb/v3_4.nix {
     sasl = cyrus_sasl;
     boost = boost160;
@@ -16046,9 +15907,7 @@ in
   prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { };
   prometheus-cups-exporter = callPackage ../servers/monitoring/prometheus/cups-exporter.nix { };
   prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { };
-  prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { };
   prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { };
   prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { };
   prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { };
@@ -16056,9 +15915,7 @@ in
   prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { };
   prometheus-mail-exporter = callPackage ../servers/monitoring/prometheus/mail-exporter.nix { };
   prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { };
-  prometheus-mikrotik-exporter = callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  prometheus-mikrotik-exporter = callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix { };
   prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { };
   prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { };
   prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { };
@@ -16080,7 +15937,6 @@ in
     # Version 1.5.1 fails to build with go 1.13 due to test failure
     #  FAIL       github.com/jonnenauha/prometheus_varnish_exporter       0.041s
     buildGoModule = buildGo112Module;
-    inherit (darwin.apple_sdk.frameworks) Security;
   };
   prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix {  };
   prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix {
@@ -16197,9 +16053,7 @@ in
 
   sensu = callPackage ../servers/monitoring/sensu { };
 
-  inherit (callPackages ../servers/monitoring/sensu-go {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  })
+  inherit (callPackages ../servers/monitoring/sensu-go { })
     sensu-go-agent
     sensu-go-backend
     sensu-go-cli;
@@ -16247,9 +16101,7 @@ in
 
   tailscale = callPackage ../servers/tailscale { };
 
-  thanos = callPackage ../servers/monitoring/thanos {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  thanos = callPackage ../servers/monitoring/thanos { };
 
   inherit (callPackages ../servers/http/tomcat { })
     tomcat7
@@ -16274,9 +16126,7 @@ in
 
   shaarli-material = callPackage ../servers/web-apps/shaarli/material-theme.nix { };
 
-  shiori = callPackage ../servers/web-apps/shiori {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  shiori = callPackage ../servers/web-apps/shiori { };
 
   inherit (callPackages ../servers/web-apps/matomo {})
     matomo
@@ -16289,9 +16139,7 @@ in
     unifiStable;
   unifi = unifiStable;
 
-  victoriametrics = callPackage ../servers/nosql/victoriametrics {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  victoriametrics = callPackage ../servers/nosql/victoriametrics { };
 
   virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { };
 
@@ -16492,13 +16340,9 @@ in
 
   conntrack-tools = callPackage ../os-specific/linux/conntrack-tools { };
 
-  coredns = callPackage ../servers/dns/coredns {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  coredns = callPackage ../servers/dns/coredns { };
 
-  corerad = callPackage ../tools/networking/corerad {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  corerad = callPackage ../tools/networking/corerad { };
 
   cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { };
 
@@ -17306,9 +17150,7 @@ in
 
   golint = callPackage ../development/tools/golint { };
 
-  golangci-lint = callPackage ../development/tools/golangci-lint {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  golangci-lint = callPackage ../development/tools/golangci-lint { };
 
   gocyclo = callPackage ../development/tools/gocyclo { };
 
@@ -17322,9 +17164,7 @@ in
 
   govendor = callPackage ../development/tools/govendor { };
 
-  go-tools = callPackage ../development/tools/go-tools {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  go-tools = callPackage ../development/tools/go-tools { };
 
   gotools = callPackage ../development/tools/gotools {
     inherit (darwin.apple_sdk.frameworks) Security;
@@ -17435,9 +17275,7 @@ in
 
   procdump = callPackage ../os-specific/linux/procdump { };
 
-  prototool = callPackage ../development/tools/prototool {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  prototool = callPackage ../development/tools/prototool { };
 
   qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; });
 
@@ -17514,10 +17352,7 @@ in
 
   smem = callPackage ../os-specific/linux/smem { };
 
-  smimesign = callPackage ../os-specific/darwin/smimesign {
-    inherit (darwin) libobjc;
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  smimesign = callPackage ../os-specific/darwin/smimesign { };
 
   speedometer = callPackage ../os-specific/linux/speedometer { };
 
@@ -17853,9 +17688,7 @@ in
 
   documentation-highlighter = callPackage ../misc/documentation-highlighter { };
 
-  documize-community = callPackage ../servers/documize-community {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  documize-community = callPackage ../servers/documize-community { };
 
   doge = callPackage ../misc/doge { };
 
@@ -17958,9 +17791,7 @@ in
 
   helvetica-neue-lt-std = callPackage ../data/fonts/helvetica-neue-lt-std { };
 
-  hetzner-kube = callPackage ../applications/networking/cluster/hetzner-kube {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  hetzner-kube = callPackage ../applications/networking/cluster/hetzner-kube { };
 
   hicolor-icon-theme = callPackage ../data/icons/hicolor-icon-theme { };
 
@@ -18586,13 +18417,9 @@ in
 
   arelle = with python3Packages; toPythonApplication arelle;
 
-  argo = callPackage ../applications/networking/cluster/argo {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  argo = callPackage ../applications/networking/cluster/argo { };
 
-  argocd = callPackage ../applications/networking/cluster/argocd {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  argocd = callPackage ../applications/networking/cluster/argocd { };
 
   ario = callPackage ../applications/audio/ario { };
 
@@ -18988,9 +18815,7 @@ in
 
   csdp = callPackage ../applications/science/math/csdp { };
 
-  ctop = callPackage ../tools/system/ctop {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  ctop = callPackage ../tools/system/ctop { };
 
   cubicsdr = callPackage ../applications/radio/cubicsdr { wxGTK = wxGTK31; };
 
@@ -19182,9 +19007,7 @@ in
 
   eaglemode = callPackage ../applications/misc/eaglemode { };
 
-  echoip = callPackage ../servers/echoip {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  echoip = callPackage ../servers/echoip { };
 
   eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse {
     jdk = jdk11;
@@ -19336,9 +19159,7 @@ in
 
   evilvte = callPackage ../applications/misc/evilvte (config.evilvte or {});
 
-  exercism = callPackage ../applications/misc/exercism {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  exercism = callPackage ../applications/misc/exercism { };
 
   go-motion = callPackage ../development/tools/go-motion { };
 
@@ -19450,9 +19271,7 @@ in
   geany = callPackage ../applications/editors/geany { };
   geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { };
 
-  geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { };
 
   ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { };
 
@@ -19493,9 +19312,7 @@ in
     inherit (darwin) libiconv;
   };
 
-  gomuks = callPackage ../applications/networking/instant-messengers/gomuks {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  gomuks = callPackage ../applications/networking/instant-messengers/gomuks { };
 
   inherit (ocamlPackages) google-drive-ocamlfuse;
 
@@ -19585,9 +19402,7 @@ in
 
   sngrep = callPackage ../applications/networking/sniffers/sngrep {};
 
-  termshark = callPackage ../tools/networking/termshark {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  termshark = callPackage ../tools/networking/termshark { };
 
   fbida = callPackage ../applications/graphics/fbida { };
 
@@ -19818,9 +19633,7 @@ in
     inherit (darwin) IOKit;
   };
 
-  glow = callPackage ../applications/editors/glow {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  glow = callPackage ../applications/editors/glow { };
 
   glowing-bear = callPackage ../applications/networking/irc/glowing-bear { };
 
@@ -20000,15 +19813,11 @@ in
     wxGTK = wxGTK30;
   };
 
-  hugo = callPackage ../applications/misc/hugo {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  hugo = callPackage ../applications/misc/hugo { };
 
   hydrogen = callPackage ../applications/audio/hydrogen { };
 
-  hydroxide = callPackage ../applications/networking/hydroxide {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  hydroxide = callPackage ../applications/networking/hydroxide { };
 
   hyper = callPackage ../applications/misc/hyper { };
 
@@ -20350,9 +20159,7 @@ in
 
   kega-fusion = pkgsi686Linux.callPackage ../misc/emulators/kega-fusion { };
 
-  kepubify = callPackage ../tools/misc/kepubify {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  kepubify = callPackage ../tools/misc/kepubify { };
 
   kermit = callPackage ../tools/misc/kermit { };
 
@@ -20413,9 +20220,7 @@ in
 
   kubecfg = callPackage ../applications/networking/cluster/kubecfg { };
 
-  kubeval = callPackage ../applications/networking/cluster/kubeval {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  kubeval = callPackage ../applications/networking/cluster/kubeval { };
 
   kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { };
 
@@ -20423,29 +20228,19 @@ in
     go = buildPackages.go_1_13;
   };
 
-  kubeseal = callPackage ../applications/networking/cluster/kubeseal {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  kubeseal = callPackage ../applications/networking/cluster/kubeseal { };
 
   kubectl = callPackage ../applications/networking/cluster/kubectl { };
 
   kubeless = callPackage ../applications/networking/cluster/kubeless { };
 
-  k9s = callPackage ../applications/networking/cluster/k9s {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  k9s = callPackage ../applications/networking/cluster/k9s { };
 
-  fluxctl = callPackage ../applications/networking/cluster/fluxctl {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  fluxctl = callPackage ../applications/networking/cluster/fluxctl { };
 
-  linkerd = callPackage ../applications/networking/cluster/linkerd {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  linkerd = callPackage ../applications/networking/cluster/linkerd { };
 
-  kubernetes-helm = callPackage ../applications/networking/cluster/helm {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  kubernetes-helm = callPackage ../applications/networking/cluster/helm { };
 
   kubetail = callPackage ../applications/networking/cluster/kubetail { } ;
 
@@ -20742,9 +20537,7 @@ in
   minidjvu = callPackage ../applications/graphics/minidjvu { };
 
   minikube = callPackage ../applications/networking/cluster/minikube {
-    inherit (darwin) libobjc;
-    inherit (darwin.apple_sdk.libs) xpc;
-    inherit (darwin.apple_sdk.frameworks) vmnet Foundation IOKit;
+    inherit (darwin.apple_sdk.frameworks) vmnet;
   };
 
   minishift = callPackage ../applications/networking/cluster/minishift { };
@@ -21036,9 +20829,7 @@ in
 
   ptex = callPackage ../development/libraries/ptex {};
 
-  qbec = callPackage ../applications/networking/cluster/qbec {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  qbec = callPackage ../applications/networking/cluster/qbec { };
 
   rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { };
 
@@ -21824,9 +21615,7 @@ in
 
   sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { };
 
-  shadowfox = callPackage ../tools/networking/shadowfox {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  shadowfox = callPackage ../tools/networking/shadowfox { };
 
   shfmt = callPackage ../tools/text/shfmt { };
 
@@ -21858,9 +21647,7 @@ in
 
   sooperlooper = callPackage ../applications/audio/sooperlooper { };
 
-  sops = callPackage ../tools/security/sops {
-    inherit (darwin.apple_sdk.frameworks) CoreServices;
-  };
+  sops = callPackage ../tools/security/sops { };
 
   sorcer = callPackage ../applications/audio/sorcer { };
 
@@ -22115,10 +21902,7 @@ in
 
   syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { };
 
-  inherit (callPackages ../applications/networking/syncthing {
-    inherit (darwin) libobjc;
-    inherit (darwin.apple_sdk.frameworks) CoreServices Foundation;
-  })
+  inherit (callPackages ../applications/networking/syncthing { })
     syncthing
     syncthing-cli
     syncthing-discovery
@@ -22205,7 +21989,6 @@ in
 
   tendermint = callPackage ../tools/networking/tendermint {
     buildGoModule = buildGo112Module;
-    inherit (darwin.apple_sdk.frameworks) Security;
   };
 
   termdown = (newScope pythonPackages) ../applications/misc/termdown { };
@@ -23218,7 +23001,7 @@ in
   freicoin = callPackage ../applications/blockchains/freicoin.nix { boost = boost155; };
   go-ethereum = callPackage ../applications/blockchains/go-ethereum.nix {
     inherit (darwin) libobjc;
-    inherit (darwin.apple_sdk.frameworks) CoreServices IOKit;
+    inherit (darwin.apple_sdk.frameworks) IOKit;
   };
 
   ledger_agent = with python3Packages; toPythonApplication ledger_agent;
@@ -23232,7 +23015,6 @@ in
 
   lnd = callPackage ../applications/blockchains/lnd.nix {
     buildGoModule = buildGo112Module;
-    inherit (darwin.apple_sdk.frameworks) Security;
   };
 
   monero = callPackage ../applications/blockchains/monero {
@@ -25224,9 +25006,7 @@ in
 
   ataripp = callPackage ../misc/emulators/atari++ { };
 
-  atlantis = callPackage ../applications/networking/cluster/atlantis {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  atlantis = callPackage ../applications/networking/cluster/atlantis { };
 
   auctex = callPackage ../tools/typesetting/tex/auctex { };
 
@@ -25414,9 +25194,7 @@ in
     binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
   };
 
-  gobuster = callPackage ../tools/security/gobuster {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  gobuster = callPackage ../tools/security/gobuster { };
 
   guetzli = callPackage ../applications/graphics/guetzli { };
 
@@ -25430,9 +25208,7 @@ in
     stdenv = gcc8Stdenv;
   };
 
-  helmfile = callPackage ../applications/networking/cluster/helmfile {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  helmfile = callPackage ../applications/networking/cluster/helmfile { };
 
   heptio-ark = callPackage ../applications/networking/cluster/heptio-ark { };
 
@@ -25537,9 +25313,7 @@ in
 
   musly = callPackage ../applications/audio/musly { };
 
-  mynewt-newt = callPackage ../tools/package-management/mynewt-newt {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  mynewt-newt = callPackage ../tools/package-management/mynewt-newt { };
 
   inherit (callPackage ../tools/package-management/nix {
       storeDir = config.nix.storeDir or "/nix/store";
@@ -26006,15 +25780,12 @@ in
 
   sqsh = callPackage ../development/tools/sqsh { };
 
-  jx = callPackage ../applications/networking/cluster/jx {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  jx = callPackage ../applications/networking/cluster/jx {};
 
   prow = callPackage ../applications/networking/cluster/prow {
     # Version 2019-08-14 fails to build with go 1.13 due to dependencies:
     #   go: golang.org/x/lint@v0.0.0-20190301231843-5614ed5bae6f used for two different module paths (github.com/golang/lint and golang.org/x/lint)
     buildGoModule = buildGo112Module;
-    inherit (darwin.apple_sdk.frameworks) Security;
   };
 
   inherit (callPackage ../applications/networking/cluster/terraform {
@@ -26032,9 +25803,7 @@ in
   terraform-full = terraform.full;
 
   terraform-providers = recurseIntoAttrs (
-    callPackage ../applications/networking/cluster/terraform-providers {
-      inherit (darwin.apple_sdk.frameworks) Security;
-    }
+    callPackage ../applications/networking/cluster/terraform-providers {}
   );
 
   terraform-docs = callPackage ../applications/networking/cluster/terraform-docs {};
@@ -26154,9 +25923,7 @@ in
 
   webfs = callPackage ../servers/http/webfs { };
 
-  websocketd = callPackage ../applications/networking/websocketd {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  websocketd = callPackage ../applications/networking/websocketd { };
 
   wikicurses = callPackage ../applications/misc/wikicurses {
     pythonPackages = python3Packages;
@@ -26376,9 +26143,7 @@ in
 
   zimg = callPackage ../development/libraries/zimg { };
 
-  wtf = callPackage ../applications/misc/wtf {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  wtf = callPackage ../applications/misc/wtf { };
 
   zk-shell = callPackage ../applications/misc/zk-shell { };
 
@@ -26544,23 +26309,17 @@ in
 
   sieveshell = with python3.pkgs; toPythonApplication managesieve;
 
-  gortr = callPackage ../servers/gortr {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  gortr = callPackage ../servers/gortr {};
 
   sentencepiece = callPackage ../development/libraries/sentencepiece {};
 
-  kcli = callPackage ../development/tools/kcli {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  kcli = callPackage ../development/tools/kcli {};
 
   unstick = callPackage ../os-specific/linux/unstick {};
 
   quartus-prime-lite = callPackage ../applications/editors/quartus-prime {};
 
-  go-license-detector = callPackage ../development/tools/misc/go-license-detector {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  go-license-detector = callPackage ../development/tools/misc/go-license-detector { };
 
   hashdeep = callPackage ../tools/security/hashdeep { };
 

From 59613f5ca55102e98acae3bb31975fe1a40bb5e6 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 22 Feb 2020 18:58:17 +0200
Subject: [PATCH 4106/4636] connman: format argument lists and inputs

---
 pkgs/tools/networking/connman/default.nix | 44 +++++++++++++++++++----
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index e58b8362f951..986bb16c9a30 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -1,6 +1,21 @@
-{ stdenv, fetchurl, pkgconfig, openconnect, file, gawk,
-  openvpn, vpnc, glib, dbus, iptables, gnutls, polkit,
-  wpa_supplicant, readline6, pptp, ppp }:
+{ stdenv
+, fetchurl
+, pkgconfig
+, openconnect
+, file
+, gawk,
+  openvpn
+, vpnc
+, glib
+, dbus
+, iptables
+, gnutls
+, polkit,
+  wpa_supplicant
+, readline6
+, pptp
+, ppp
+}:
 
 stdenv.mkDerivation rec {
   pname = "connman";
@@ -10,11 +25,26 @@ stdenv.mkDerivation rec {
     sha256 = "05kfjiqhqfmbbwc4snnyvi5hc4zxanac62f6gcwaf5mvn0z9pqkc";
   };
 
-  buildInputs = [ openconnect polkit
-                  openvpn vpnc glib dbus iptables gnutls
-                  wpa_supplicant readline6 pptp ppp ];
+  buildInputs = [
+    openconnect
+    polkit
+    openvpn
+    vpnc
+    glib
+    dbus
+    iptables
+    gnutls
+    wpa_supplicant
+    readline6
+    pptp
+    ppp
+  ];
 
-  nativeBuildInputs = [ pkgconfig file gawk ];
+  nativeBuildInputs = [
+    pkgconfig
+    file
+    gawk
+  ];
 
   preConfigure = ''
     export WPASUPPLICANT=${wpa_supplicant}/sbin/wpa_supplicant

From 7cdd874589bac5dc12dae3b9e71860a2b01d7ab3 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 22 Feb 2020 18:58:25 +0200
Subject: [PATCH 4107/4636] connman: 1.37 -> 1.38

---
 pkgs/tools/networking/connman/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index 986bb16c9a30..3381f77c96c5 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -19,10 +19,10 @@
 
 stdenv.mkDerivation rec {
   pname = "connman";
-  version = "1.37";
+  version = "1.38";
   src = fetchurl {
     url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz";
-    sha256 = "05kfjiqhqfmbbwc4snnyvi5hc4zxanac62f6gcwaf5mvn0z9pqkc";
+    sha256 = "0awkqigvhwwxiapw0x6yd4whl465ka8a4al0v2pcqy9ggjlsqc6b";
   };
 
   buildInputs = [

From bc4d2abac88340da99903a296d8d66c0e173fb38 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 22 Feb 2020 18:59:17 +0200
Subject: [PATCH 4108/4636] connman: remove unneeded deps

---
 pkgs/tools/networking/connman/default.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index 3381f77c96c5..fde73fa9aa38 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -3,7 +3,6 @@
 , pkgconfig
 , openconnect
 , file
-, gawk,
   openvpn
 , vpnc
 , glib
@@ -11,7 +10,6 @@
 , iptables
 , gnutls
 , polkit,
-  wpa_supplicant
 , readline6
 , pptp
 , ppp
@@ -34,7 +32,6 @@ stdenv.mkDerivation rec {
     dbus
     iptables
     gnutls
-    wpa_supplicant
     readline6
     pptp
     ppp
@@ -43,13 +40,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     pkgconfig
     file
-    gawk
   ];
 
   preConfigure = ''
-    export WPASUPPLICANT=${wpa_supplicant}/sbin/wpa_supplicant
     export PPPD=${ppp}/sbin/pppd
-    export AWK=${gawk}/bin/gawk
     sed -i "s/\/usr\/bin\/file/file/g" ./configure
   '';
 

From 184d7412923fa438e27ede97a6f840714248650f Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 22 Feb 2020 18:59:50 +0200
Subject: [PATCH 4109/4636] connman: remove unneeded hooks

---
 pkgs/tools/networking/connman/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index fde73fa9aa38..6c96c3448388 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -43,7 +43,6 @@ stdenv.mkDerivation rec {
   ];
 
   preConfigure = ''
-    export PPPD=${ppp}/sbin/pppd
     sed -i "s/\/usr\/bin\/file/file/g" ./configure
   '';
 
@@ -71,10 +70,6 @@ stdenv.mkDerivation rec {
     "--enable-iwd"
   ];
 
-  postInstall = ''
-    cp ./client/connmanctl $out/sbin/connmanctl
-  '';
-
   meta = with stdenv.lib; {
     description = "A daemon for managing internet connections";
     homepage = https://01.org/connman;

From e9569a0a039e4cd12edfcce51c96d060f8266a83 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 22 Feb 2020 19:01:35 +0200
Subject: [PATCH 4110/4636] connman: quote out in configure flag

---
 pkgs/tools/networking/connman/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index 6c96c3448388..5f5bed3cbced 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    "--sysconfdir=\${out}/etc"
+    "--sysconfdir=${placeholder "out"}/etc"
     "--localstatedir=/var"
     "--with-dbusconfdir=${placeholder "out"}/share"
     "--with-dbusdatadir=${placeholder "out"}/share"

From e55ad4897d9c8df11ae3fed79af489c909b7df69 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 22 Feb 2020 19:01:44 +0200
Subject: [PATCH 4111/4636] connman: quote homepage

---
 pkgs/tools/networking/connman/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index 5f5bed3cbced..d65061648b6a 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A daemon for managing internet connections";
-    homepage = https://01.org/connman;
+    homepage = "https://01.org/connman";
     maintainers = [ maintainers.matejc ];
     platforms = platforms.linux;
     license = licenses.gpl2;

From a0e966d7979d0f0464949b9c7e37aa5593c00ecc Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 22 Feb 2020 19:02:43 +0200
Subject: [PATCH 4112/4636] connman: upgrade to readline latest

---
 pkgs/tools/networking/connman/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index d65061648b6a..77cdcd0cc3ef 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -10,7 +10,7 @@
 , iptables
 , gnutls
 , polkit,
-, readline6
+, readline
 , pptp
 , ppp
 }:
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     dbus
     iptables
     gnutls
-    readline6
+    readline
     pptp
     ppp
   ];

From 50ce1e646915cd402c21606924429dea51d87470 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 22 Feb 2020 19:03:52 +0200
Subject: [PATCH 4113/4636] connman: doCheck and split outputs

---
 pkgs/tools/networking/connman/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index 77cdcd0cc3ef..2f6e835bc84a 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
     vpnc
     glib
     dbus
+    libmnl
     iptables
     gnutls
     readline
@@ -69,6 +70,9 @@ stdenv.mkDerivation rec {
     "--with-pptp=${pptp}/sbin/pptp"
     "--enable-iwd"
   ];
+  doCheck = true;
+
+  outputs = [ "out" "dev" ];
 
   meta = with stdenv.lib; {
     description = "A daemon for managing internet connections";

From 53d8831b6232fc4fc7a9201f0695fd7fc1daa81d Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 22 Feb 2020 19:04:56 +0200
Subject: [PATCH 4114/4636] connman: cleanup build from the groundup

---
 pkgs/tools/networking/connman/default.nix | 153 +++++++++++++++++-----
 1 file changed, 121 insertions(+), 32 deletions(-)

diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index 2f6e835bc84a..9da12e158f94 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -1,20 +1,57 @@
 { stdenv
 , fetchurl
 , pkgconfig
-, openconnect
 , file
-  openvpn
-, vpnc
 , glib
+# always required runtime dependencies
 , dbus
-, iptables
+, libmnl
 , gnutls
-, polkit,
 , readline
-, pptp
-, ppp
+# Choices one has to decide
+, firewallType ? "iptables" # or "nftables"
+, iptables ? null
+, libnftnl ? null # for nftables
+, dnsType ? "internal" # or "systemd-resolved"
+# optional features which are turned *on* by default
+, enableOpenconnect ? true
+, openconnect ? null
+, enableOpenvpn ? true
+, openvpn ? null
+, enableVpnc ? true
+, vpnc ? true
+, enablePolkit ? true
+, polkit ? null
+, enablePptp ? true
+, pptp ? null
+, ppp ? null
+, enableLoopback ? true
+, enableEthernet ? true
+, enableWireguard ? true
+, enableGadget ? true
+, enableWifi ? true
+, enableBluetooth ? true
+, enableOfono ? true
+, enableDundee ? true
+, enablePacrunner ? true
+, enableNeard ? true
+, enableWispr ? true
+, enableTools ? true
+, enableStats ? true
+, enableClient ? true
+, enableDatafiles ? true
+# optional features which are turned *off* by default
+, enableNetworkManager ? false
+, networkmanager ? null
+, enableHh2serialGps ? false
+, enableL2tp ? false
+, enableIospm ? false
+, enableTist ? false
 }:
 
+assert stdenv.lib.asserts.assertOneOf "firewallType" firewallType [ "iptables" "nftables" ];
+assert stdenv.lib.asserts.assertOneOf "dnsType" dnsType [ "internal" "systemd-resolved" ];
+
 stdenv.mkDerivation rec {
   pname = "connman";
   version = "1.38";
@@ -24,55 +61,107 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    openconnect
-    polkit
-    openvpn
-    vpnc
     glib
     dbus
     libmnl
-    iptables
     gnutls
     readline
-    pptp
-    ppp
   ];
 
   nativeBuildInputs = [
     pkgconfig
     file
-  ];
+  ]
+    ++ stdenv.lib.optionals (enableOpenvpn) [ openvpn ]
+    ++ stdenv.lib.optionals (enableOpenconnect) [ openconnect ]
+    ++ stdenv.lib.optionals (enableVpnc) [ vpnc ]
+    ++ stdenv.lib.optionals (enablePolkit) [ polkit ]
+    ++ stdenv.lib.optionals (enablePptp) [ pptp ppp ]
+    ++ stdenv.lib.optionals (firewallType == "iptables") [ iptables ]
+    ++ stdenv.lib.optionals (firewallType == "nftables") [ libnftnl ]
+  ;
 
+  # Fix file program not found
   preConfigure = ''
     sed -i "s/\/usr\/bin\/file/file/g" ./configure
   '';
 
   configureFlags = [
+    # directories flags
     "--sysconfdir=${placeholder "out"}/etc"
     "--localstatedir=/var"
     "--with-dbusconfdir=${placeholder "out"}/share"
     "--with-dbusdatadir=${placeholder "out"}/share"
+    "--with-tmpfilesdir=${placeholder "out"}/lib/tmpfiles.d"
+    "--with-systemdunitdir=${placeholder "out"}/lib/systemd/system"
+    "--with-dns-backend=${dnsType}"
+    "--with-firewall=${firewallType}"
+    # production build flags
     "--disable-maintainer-mode"
-    "--enable-openconnect=builtin"
-    "--with-openconnect=${openconnect}/sbin/openconnect"
-    "--enable-openvpn=builtin"
-    "--with-openvpn=${openvpn}/sbin/openvpn"
-    "--enable-vpnc=builtin"
-    "--with-vpnc=${vpnc}/sbin/vpnc"
     "--enable-session-policy-local=builtin"
-    "--enable-client"
-    "--enable-bluetooth"
-    "--enable-wifi"
-    "--enable-polkit"
+    # This is for building and running tests (probably enabled by default),
+    # --enable-tests installs the tests as well
     "--enable-tools"
-    "--enable-datafiles"
-    "--enable-pptp"
-    "--with-pptp=${pptp}/sbin/pptp"
-    "--enable-iwd"
-  ];
-  doCheck = true;
+  ]
+    ++ stdenv.lib.optionals (!enableLoopback) [ "--disable-loopback" ]
+    ++ stdenv.lib.optionals (!enableEthernet) [ "--disable-ethernet" ]
+    ++ stdenv.lib.optionals (!enableWireguard) [ "--disable-wireguard" ]
+    ++ stdenv.lib.optionals (!enableGadget) [ "--disable-gadget" ]
+    ++ stdenv.lib.optionals (!enableWifi) [ "--disable-wifi" ]
+    # We (almost) always turn on IWD support as it doesn't require any new dependencies
+    # and it's easier for the NixOS module to use only 1 connmand package when
+    # IWD is requested
+    ++ stdenv.lib.optionals (enableWifi) [ "--enable-iwd" ]
+    ++ stdenv.lib.optionals (!enableBluetooth) [ "--disable-bluetooth" ]
+    ++ stdenv.lib.optionals (!enableOfono) [ "--disable-ofono" ]
+    ++ stdenv.lib.optionals (!enableDundee) [ "--disable-dundee" ]
+    ++ stdenv.lib.optionals (!enablePacrunner) [ "--disable-pacrunner" ]
+    ++ stdenv.lib.optionals (!enableNeard) [ "--disable-neard" ]
+    ++ stdenv.lib.optionals (!enableWispr) [ "--disable-wispr" ]
+    ++ stdenv.lib.optionals (!enableTools) [ "--disable-tools" ]
+    ++ stdenv.lib.optionals (!enableStats) [ "--disable-stats" ]
+    ++ stdenv.lib.optionals (!enableClient) [ "--disable-client" ]
+    ++ stdenv.lib.optionals (!enableDatafiles) [ "--disable-datafiles" ]
+    ++ stdenv.lib.optionals (enableOpenconnect) [
+      "--enable-openconnect=builtin"
+      "--with-openconnect=${openconnect}/sbin/openconnect"
+    ]
+    ++ stdenv.lib.optionals (enableOpenvpn) [
+      "--enable-openvpn=builtin"
+      "--with-openvpn=${openvpn}/sbin/openvpn"
+    ]
+    ++ stdenv.lib.optionals (enableVpnc) [
+      "--enable-vpnc=builtin"
+      "--with-vpnc=${vpnc}/sbin/vpnc"
+    ]
+    ++ stdenv.lib.optionals (enablePolkit) [
+      "--enable-polkit"
+    ]
+    ++ stdenv.lib.optionals (enablePptp) [
+      "--enable-pptp"
+      "--with-pptp=${pptp}/sbin/pptp"
+    ]
+    ++ stdenv.lib.optionals (!enableWireguard) [
+      "--disable-wireguard"
+    ]
+    ++ stdenv.lib.optionals (enableNetworkManager) [
+      "--enable-nmcompat"
+    ]
+    ++ stdenv.lib.optionals (enableHh2serialGps) [
+      "--enable-hh2serial-gps"
+    ]
+    ++ stdenv.lib.optionals (enableL2tp) [
+      "--enable-l2tp"
+    ]
+    ++ stdenv.lib.optionals (enableIospm) [
+      "--enable-iospm"
+    ]
+    ++ stdenv.lib.optionals (enableTist) [
+      "--enable-tist"
+    ]
+  ;
 
-  outputs = [ "out" "dev" ];
+  doCheck = true;
 
   meta = with stdenv.lib; {
     description = "A daemon for managing internet connections";

From ce502a41eb4c1c60394501975f003cd4fa3f60e7 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 22 Feb 2020 19:05:37 +0200
Subject: [PATCH 4115/4636] connman: Add 2 more build flavors

---
 pkgs/top-level/all-packages.nix | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30bc0af360ec..2a4a1876581d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2551,6 +2551,36 @@ in
   conspy = callPackage ../os-specific/linux/conspy {};
 
   connman = callPackage ../tools/networking/connman { };
+  connmanThin = callPackage ../tools/networking/connman {
+    enableOpenconnect = false;
+    enableOpenvpn = false;
+    enableVpnc = false;
+    vpnc = false;
+    enablePolkit = false;
+    enablePptp = false;
+    enableLoopback = false;
+    # enableEthernet = false;
+    enableWireguard = false;
+    enableGadget = false;
+    # enableWifi = false;
+    enableBluetooth = false;
+    enableOfono = false;
+    enableDundee = false;
+    enablePacrunner = false;
+    enableNeard = false;
+    enableWispr = false;
+    enableTools = false;
+    enableStats = false;
+    enableClient = false;
+    # enableDatafiles = false;
+  };
+  connmanFull = callPackage ../tools/networking/connman {
+    enableNetworkManager = true;
+    enableHh2serialGps = true;
+    enableL2tp = true;
+    enableIospm = true;
+    enableTist = true;
+  };
 
   connman-gtk = callPackage ../tools/networking/connman/connman-gtk { };
 

From cdc20ac30ef15082c7486cee98240a7c0586c623 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 2 Mar 2020 00:49:36 +0200
Subject: [PATCH 4116/4636] connman: Fix comments after @erikarvstedt's
 comments

---
 pkgs/tools/networking/connman/default.nix | 12 ++++++------
 pkgs/top-level/all-packages.nix           |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index 9da12e158f94..a2338e4554f6 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -8,7 +8,7 @@
 , libmnl
 , gnutls
 , readline
-# Choices one has to decide
+# configureable options
 , firewallType ? "iptables" # or "nftables"
 , iptables ? null
 , libnftnl ? null # for nftables
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optionals (firewallType == "nftables") [ libnftnl ]
   ;
 
-  # Fix file program not found
+  # fix invalid path to 'file'
   preConfigure = ''
     sed -i "s/\/usr\/bin\/file/file/g" ./configure
   '';
@@ -99,8 +99,8 @@ stdenv.mkDerivation rec {
     # production build flags
     "--disable-maintainer-mode"
     "--enable-session-policy-local=builtin"
-    # This is for building and running tests (probably enabled by default),
-    # --enable-tests installs the tests as well
+    # for building and running tests
+    # --enable-tests # installs the tests, we don't want that
     "--enable-tools"
   ]
     ++ stdenv.lib.optionals (!enableLoopback) [ "--disable-loopback" ]
@@ -108,8 +108,8 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optionals (!enableWireguard) [ "--disable-wireguard" ]
     ++ stdenv.lib.optionals (!enableGadget) [ "--disable-gadget" ]
     ++ stdenv.lib.optionals (!enableWifi) [ "--disable-wifi" ]
-    # We (almost) always turn on IWD support as it doesn't require any new dependencies
-    # and it's easier for the NixOS module to use only 1 connmand package when
+    # enable IWD support for wifi as it doesn't require any new dependencies
+    # and it's easier for the NixOS module to use only one connman package when
     # IWD is requested
     ++ stdenv.lib.optionals (enableWifi) [ "--enable-iwd" ]
     ++ stdenv.lib.optionals (!enableBluetooth) [ "--disable-bluetooth" ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a4a1876581d..5ed0b8d55a8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2559,10 +2559,10 @@ in
     enablePolkit = false;
     enablePptp = false;
     enableLoopback = false;
-    # enableEthernet = false;
+    # enableEthernet = false; # If disabled no ethernet connection can be performed
     enableWireguard = false;
     enableGadget = false;
-    # enableWifi = false;
+    # enableWifi = false; # If disabled no WiFi connection can be performed
     enableBluetooth = false;
     enableOfono = false;
     enableDundee = false;
@@ -2572,7 +2572,7 @@ in
     enableTools = false;
     enableStats = false;
     enableClient = false;
-    # enableDatafiles = false;
+    # enableDatafiles = false; # If disabled, configuration and data files are not installed
   };
   connmanFull = callPackage ../tools/networking/connman {
     enableNetworkManager = true;

From e59deafc2d06417db92bda5d3713ae928fb7ec60 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 2 Mar 2020 00:51:14 +0200
Subject: [PATCH 4117/4636] connman: Use global reference to lib.optionals

---
 pkgs/tools/networking/connman/default.nix | 70 ++++++++++++-----------
 1 file changed, 36 insertions(+), 34 deletions(-)

diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index a2338e4554f6..d0242e1e4610 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -52,6 +52,8 @@
 assert stdenv.lib.asserts.assertOneOf "firewallType" firewallType [ "iptables" "nftables" ];
 assert stdenv.lib.asserts.assertOneOf "dnsType" dnsType [ "internal" "systemd-resolved" ];
 
+let inherit (stdenv.lib) optionals; 
+
 stdenv.mkDerivation rec {
   pname = "connman";
   version = "1.38";
@@ -72,13 +74,13 @@ stdenv.mkDerivation rec {
     pkgconfig
     file
   ]
-    ++ stdenv.lib.optionals (enableOpenvpn) [ openvpn ]
-    ++ stdenv.lib.optionals (enableOpenconnect) [ openconnect ]
-    ++ stdenv.lib.optionals (enableVpnc) [ vpnc ]
-    ++ stdenv.lib.optionals (enablePolkit) [ polkit ]
-    ++ stdenv.lib.optionals (enablePptp) [ pptp ppp ]
-    ++ stdenv.lib.optionals (firewallType == "iptables") [ iptables ]
-    ++ stdenv.lib.optionals (firewallType == "nftables") [ libnftnl ]
+    ++ optionals (enableOpenvpn) [ openvpn ]
+    ++ optionals (enableOpenconnect) [ openconnect ]
+    ++ optionals (enableVpnc) [ vpnc ]
+    ++ optionals (enablePolkit) [ polkit ]
+    ++ optionals (enablePptp) [ pptp ppp ]
+    ++ optionals (firewallType == "iptables") [ iptables ]
+    ++ optionals (firewallType == "nftables") [ libnftnl ]
   ;
 
   # fix invalid path to 'file'
@@ -103,60 +105,60 @@ stdenv.mkDerivation rec {
     # --enable-tests # installs the tests, we don't want that
     "--enable-tools"
   ]
-    ++ stdenv.lib.optionals (!enableLoopback) [ "--disable-loopback" ]
-    ++ stdenv.lib.optionals (!enableEthernet) [ "--disable-ethernet" ]
-    ++ stdenv.lib.optionals (!enableWireguard) [ "--disable-wireguard" ]
-    ++ stdenv.lib.optionals (!enableGadget) [ "--disable-gadget" ]
-    ++ stdenv.lib.optionals (!enableWifi) [ "--disable-wifi" ]
+    ++ optionals (!enableLoopback) [ "--disable-loopback" ]
+    ++ optionals (!enableEthernet) [ "--disable-ethernet" ]
+    ++ optionals (!enableWireguard) [ "--disable-wireguard" ]
+    ++ optionals (!enableGadget) [ "--disable-gadget" ]
+    ++ optionals (!enableWifi) [ "--disable-wifi" ]
     # enable IWD support for wifi as it doesn't require any new dependencies
     # and it's easier for the NixOS module to use only one connman package when
     # IWD is requested
-    ++ stdenv.lib.optionals (enableWifi) [ "--enable-iwd" ]
-    ++ stdenv.lib.optionals (!enableBluetooth) [ "--disable-bluetooth" ]
-    ++ stdenv.lib.optionals (!enableOfono) [ "--disable-ofono" ]
-    ++ stdenv.lib.optionals (!enableDundee) [ "--disable-dundee" ]
-    ++ stdenv.lib.optionals (!enablePacrunner) [ "--disable-pacrunner" ]
-    ++ stdenv.lib.optionals (!enableNeard) [ "--disable-neard" ]
-    ++ stdenv.lib.optionals (!enableWispr) [ "--disable-wispr" ]
-    ++ stdenv.lib.optionals (!enableTools) [ "--disable-tools" ]
-    ++ stdenv.lib.optionals (!enableStats) [ "--disable-stats" ]
-    ++ stdenv.lib.optionals (!enableClient) [ "--disable-client" ]
-    ++ stdenv.lib.optionals (!enableDatafiles) [ "--disable-datafiles" ]
-    ++ stdenv.lib.optionals (enableOpenconnect) [
+    ++ optionals (enableWifi) [ "--enable-iwd" ]
+    ++ optionals (!enableBluetooth) [ "--disable-bluetooth" ]
+    ++ optionals (!enableOfono) [ "--disable-ofono" ]
+    ++ optionals (!enableDundee) [ "--disable-dundee" ]
+    ++ optionals (!enablePacrunner) [ "--disable-pacrunner" ]
+    ++ optionals (!enableNeard) [ "--disable-neard" ]
+    ++ optionals (!enableWispr) [ "--disable-wispr" ]
+    ++ optionals (!enableTools) [ "--disable-tools" ]
+    ++ optionals (!enableStats) [ "--disable-stats" ]
+    ++ optionals (!enableClient) [ "--disable-client" ]
+    ++ optionals (!enableDatafiles) [ "--disable-datafiles" ]
+    ++ optionals (enableOpenconnect) [
       "--enable-openconnect=builtin"
       "--with-openconnect=${openconnect}/sbin/openconnect"
     ]
-    ++ stdenv.lib.optionals (enableOpenvpn) [
+    ++ optionals (enableOpenvpn) [
       "--enable-openvpn=builtin"
       "--with-openvpn=${openvpn}/sbin/openvpn"
     ]
-    ++ stdenv.lib.optionals (enableVpnc) [
+    ++ optionals (enableVpnc) [
       "--enable-vpnc=builtin"
       "--with-vpnc=${vpnc}/sbin/vpnc"
     ]
-    ++ stdenv.lib.optionals (enablePolkit) [
+    ++ optionals (enablePolkit) [
       "--enable-polkit"
     ]
-    ++ stdenv.lib.optionals (enablePptp) [
+    ++ optionals (enablePptp) [
       "--enable-pptp"
       "--with-pptp=${pptp}/sbin/pptp"
     ]
-    ++ stdenv.lib.optionals (!enableWireguard) [
+    ++ optionals (!enableWireguard) [
       "--disable-wireguard"
     ]
-    ++ stdenv.lib.optionals (enableNetworkManager) [
+    ++ optionals (enableNetworkManager) [
       "--enable-nmcompat"
     ]
-    ++ stdenv.lib.optionals (enableHh2serialGps) [
+    ++ optionals (enableHh2serialGps) [
       "--enable-hh2serial-gps"
     ]
-    ++ stdenv.lib.optionals (enableL2tp) [
+    ++ optionals (enableL2tp) [
       "--enable-l2tp"
     ]
-    ++ stdenv.lib.optionals (enableIospm) [
+    ++ optionals (enableIospm) [
       "--enable-iospm"
     ]
-    ++ stdenv.lib.optionals (enableTist) [
+    ++ optionals (enableTist) [
       "--enable-tist"
     ]
   ;

From be59cb3be8e74a799202e36c76aa44dc26d3ba20 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 2 Mar 2020 00:51:52 +0200
Subject: [PATCH 4118/4636] connman: Use patchPhase instead of preConfigure

---
 pkgs/tools/networking/connman/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index d0242e1e4610..9fcacd29ebef 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -84,8 +84,10 @@ stdenv.mkDerivation rec {
   ;
 
   # fix invalid path to 'file'
-  preConfigure = ''
+  patchPhase = ''
+    runHook prePatch
     sed -i "s/\/usr\/bin\/file/file/g" ./configure
+    runHook postPatch
   '';
 
   configureFlags = [

From 3b89674dc3608381c6a447e52e7b512ece4f74db Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 2 Mar 2020 11:10:21 +0200
Subject: [PATCH 4119/4636] connman: declare build flavors idiomaticly

Use tesseract as a source for inspiration - rename default.nix ->
connman.nix and declare build flavors in default.nix .
---
 pkgs/tools/networking/connman/connman.nix | 177 +++++++++++++++++++
 pkgs/tools/networking/connman/default.nix | 205 ++++------------------
 pkgs/top-level/all-packages.nix           |  36 +---
 3 files changed, 215 insertions(+), 203 deletions(-)
 create mode 100644 pkgs/tools/networking/connman/connman.nix

diff --git a/pkgs/tools/networking/connman/connman.nix b/pkgs/tools/networking/connman/connman.nix
new file mode 100644
index 000000000000..f79b9875b9bc
--- /dev/null
+++ b/pkgs/tools/networking/connman/connman.nix
@@ -0,0 +1,177 @@
+{ stdenv
+, fetchurl
+, pkgconfig
+, file
+, glib
+# always required runtime dependencies
+, dbus
+, libmnl
+, gnutls
+, readline
+# configureable options
+, firewallType ? "iptables" # or "nftables"
+, iptables ? null
+, libnftnl ? null # for nftables
+, dnsType ? "internal" # or "systemd-resolved"
+# optional features which are turned *on* by default
+, enableOpenconnect ? true
+, openconnect ? null
+, enableOpenvpn ? true
+, openvpn ? null
+, enableVpnc ? true
+, vpnc ? true
+, enablePolkit ? true
+, polkit ? null
+, enablePptp ? true
+, pptp ? null
+, ppp ? null
+, enableLoopback ? true
+, enableEthernet ? true
+, enableWireguard ? true
+, enableGadget ? true
+, enableWifi ? true
+, enableBluetooth ? true
+, enableOfono ? true
+, enableDundee ? true
+, enablePacrunner ? true
+, enableNeard ? true
+, enableWispr ? true
+, enableTools ? true
+, enableStats ? true
+, enableClient ? true
+, enableDatafiles ? true
+# optional features which are turned *off* by default
+, enableNetworkManager ? false
+, networkmanager ? null
+, enableHh2serialGps ? false
+, enableL2tp ? false
+, enableIospm ? false
+, enableTist ? false
+}:
+
+assert stdenv.lib.asserts.assertOneOf "firewallType" firewallType [ "iptables" "nftables" ];
+assert stdenv.lib.asserts.assertOneOf "dnsType" dnsType [ "internal" "systemd-resolved" ];
+
+let inherit (stdenv.lib) optionals; in
+
+stdenv.mkDerivation rec {
+  pname = "connman";
+  version = "1.38";
+  src = fetchurl {
+    url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz";
+    sha256 = "0awkqigvhwwxiapw0x6yd4whl465ka8a4al0v2pcqy9ggjlsqc6b";
+  };
+
+  buildInputs = [
+    glib
+    dbus
+    libmnl
+    gnutls
+    readline
+  ];
+
+  nativeBuildInputs = [
+    pkgconfig
+    file
+  ]
+    ++ optionals (enableOpenvpn) [ openvpn ]
+    ++ optionals (enableOpenconnect) [ openconnect ]
+    ++ optionals (enableVpnc) [ vpnc ]
+    ++ optionals (enablePolkit) [ polkit ]
+    ++ optionals (enablePptp) [ pptp ppp ]
+    ++ optionals (firewallType == "iptables") [ iptables ]
+    ++ optionals (firewallType == "nftables") [ libnftnl ]
+  ;
+
+  # fix invalid path to 'file'
+  patchPhase = ''
+    runHook prePatch
+    sed -i "s/\/usr\/bin\/file/file/g" ./configure
+    runHook postPatch
+  '';
+
+  configureFlags = [
+    # directories flags
+    "--sysconfdir=${placeholder "out"}/etc"
+    "--localstatedir=/var"
+    "--with-dbusconfdir=${placeholder "out"}/share"
+    "--with-dbusdatadir=${placeholder "out"}/share"
+    "--with-tmpfilesdir=${placeholder "out"}/lib/tmpfiles.d"
+    "--with-systemdunitdir=${placeholder "out"}/lib/systemd/system"
+    "--with-dns-backend=${dnsType}"
+    "--with-firewall=${firewallType}"
+    # production build flags
+    "--disable-maintainer-mode"
+    "--enable-session-policy-local=builtin"
+    # for building and running tests
+    # "--enable-tests" # installs the tests, we don't want that
+    "--enable-tools"
+  ]
+    ++ optionals (!enableLoopback) [ "--disable-loopback" ]
+    ++ optionals (!enableEthernet) [ "--disable-ethernet" ]
+    ++ optionals (!enableWireguard) [ "--disable-wireguard" ]
+    ++ optionals (!enableGadget) [ "--disable-gadget" ]
+    ++ optionals (!enableWifi) [ "--disable-wifi" ]
+    # enable IWD support for wifi as it doesn't require any new dependencies
+    # and it's easier for the NixOS module to use only one connman package when
+    # IWD is requested
+    ++ optionals (enableWifi) [ "--enable-iwd" ]
+    ++ optionals (!enableBluetooth) [ "--disable-bluetooth" ]
+    ++ optionals (!enableOfono) [ "--disable-ofono" ]
+    ++ optionals (!enableDundee) [ "--disable-dundee" ]
+    ++ optionals (!enablePacrunner) [ "--disable-pacrunner" ]
+    ++ optionals (!enableNeard) [ "--disable-neard" ]
+    ++ optionals (!enableWispr) [ "--disable-wispr" ]
+    ++ optionals (!enableTools) [ "--disable-tools" ]
+    ++ optionals (!enableStats) [ "--disable-stats" ]
+    ++ optionals (!enableClient) [ "--disable-client" ]
+    ++ optionals (!enableDatafiles) [ "--disable-datafiles" ]
+    ++ optionals (enableOpenconnect) [
+      "--enable-openconnect=builtin"
+      "--with-openconnect=${openconnect}/sbin/openconnect"
+    ]
+    ++ optionals (enableOpenvpn) [
+      "--enable-openvpn=builtin"
+      "--with-openvpn=${openvpn}/sbin/openvpn"
+    ]
+    ++ optionals (enableVpnc) [
+      "--enable-vpnc=builtin"
+      "--with-vpnc=${vpnc}/sbin/vpnc"
+    ]
+    ++ optionals (enablePolkit) [
+      "--enable-polkit"
+    ]
+    ++ optionals (enablePptp) [
+      "--enable-pptp"
+      "--with-pptp=${pptp}/sbin/pptp"
+    ]
+    ++ optionals (!enableWireguard) [
+      "--disable-wireguard"
+    ]
+    ++ optionals (enableNetworkManager) [
+      "--enable-nmcompat"
+    ]
+    ++ optionals (enableHh2serialGps) [
+      "--enable-hh2serial-gps"
+    ]
+    ++ optionals (enableL2tp) [
+      "--enable-l2tp"
+    ]
+    ++ optionals (enableIospm) [
+      "--enable-iospm"
+    ]
+    ++ optionals (enableTist) [
+      "--enable-tist"
+    ]
+  ;
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "A daemon for managing internet connections";
+    homepage = "https://01.org/connman";
+    maintainers = [ maintainers.matejc ];
+    platforms = platforms.linux;
+    license = licenses.gpl2;
+  };
+}
diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index 9fcacd29ebef..34aee7f78794 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -1,177 +1,38 @@
-{ stdenv
-, fetchurl
-, pkgconfig
-, file
-, glib
-# always required runtime dependencies
-, dbus
-, libmnl
-, gnutls
-, readline
-# configureable options
-, firewallType ? "iptables" # or "nftables"
-, iptables ? null
-, libnftnl ? null # for nftables
-, dnsType ? "internal" # or "systemd-resolved"
-# optional features which are turned *on* by default
-, enableOpenconnect ? true
-, openconnect ? null
-, enableOpenvpn ? true
-, openvpn ? null
-, enableVpnc ? true
-, vpnc ? true
-, enablePolkit ? true
-, polkit ? null
-, enablePptp ? true
-, pptp ? null
-, ppp ? null
-, enableLoopback ? true
-, enableEthernet ? true
-, enableWireguard ? true
-, enableGadget ? true
-, enableWifi ? true
-, enableBluetooth ? true
-, enableOfono ? true
-, enableDundee ? true
-, enablePacrunner ? true
-, enableNeard ? true
-, enableWispr ? true
-, enableTools ? true
-, enableStats ? true
-, enableClient ? true
-, enableDatafiles ? true
-# optional features which are turned *off* by default
-, enableNetworkManager ? false
-, networkmanager ? null
-, enableHh2serialGps ? false
-, enableL2tp ? false
-, enableIospm ? false
-, enableTist ? false
-}:
+{ callPackage, lowPrio }:
 
-assert stdenv.lib.asserts.assertOneOf "firewallType" firewallType [ "iptables" "nftables" ];
-assert stdenv.lib.asserts.assertOneOf "dnsType" dnsType [ "internal" "systemd-resolved" ];
-
-let inherit (stdenv.lib) optionals; 
-
-stdenv.mkDerivation rec {
-  pname = "connman";
-  version = "1.38";
-  src = fetchurl {
-    url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz";
-    sha256 = "0awkqigvhwwxiapw0x6yd4whl465ka8a4al0v2pcqy9ggjlsqc6b";
+{
+  connmanFull = callPackage ./connman.nix {
+    enableNetworkManager = true;
+    enableHh2serialGps = true;
+    enableL2tp = true;
+    enableIospm = true;
+    enableTist = true;
   };
 
-  buildInputs = [
-    glib
-    dbus
-    libmnl
-    gnutls
-    readline
-  ];
+  connmanMinimal = lowPrio (callPackage ./connman.nix {
+    enableOpenconnect = false;
+    enableOpenvpn = false;
+    enableVpnc = false;
+    vpnc = false;
+    enablePolkit = false;
+    enablePptp = false;
+    enableLoopback = false;
+    # enableEthernet = false; # If disabled no ethernet connection can be performed
+    enableWireguard = false;
+    enableGadget = false;
+    # enableWifi = false; # If disabled no WiFi connection can be performed
+    enableBluetooth = false;
+    enableOfono = false;
+    enableDundee = false;
+    enablePacrunner = false;
+    enableNeard = false;
+    enableWispr = false;
+    enableTools = false;
+    enableStats = false;
+    enableClient = false;
+    # enableDatafiles = false; # If disabled, configuration and data files are not installed
+  });
 
-  nativeBuildInputs = [
-    pkgconfig
-    file
-  ]
-    ++ optionals (enableOpenvpn) [ openvpn ]
-    ++ optionals (enableOpenconnect) [ openconnect ]
-    ++ optionals (enableVpnc) [ vpnc ]
-    ++ optionals (enablePolkit) [ polkit ]
-    ++ optionals (enablePptp) [ pptp ppp ]
-    ++ optionals (firewallType == "iptables") [ iptables ]
-    ++ optionals (firewallType == "nftables") [ libnftnl ]
-  ;
-
-  # fix invalid path to 'file'
-  patchPhase = ''
-    runHook prePatch
-    sed -i "s/\/usr\/bin\/file/file/g" ./configure
-    runHook postPatch
-  '';
-
-  configureFlags = [
-    # directories flags
-    "--sysconfdir=${placeholder "out"}/etc"
-    "--localstatedir=/var"
-    "--with-dbusconfdir=${placeholder "out"}/share"
-    "--with-dbusdatadir=${placeholder "out"}/share"
-    "--with-tmpfilesdir=${placeholder "out"}/lib/tmpfiles.d"
-    "--with-systemdunitdir=${placeholder "out"}/lib/systemd/system"
-    "--with-dns-backend=${dnsType}"
-    "--with-firewall=${firewallType}"
-    # production build flags
-    "--disable-maintainer-mode"
-    "--enable-session-policy-local=builtin"
-    # for building and running tests
-    # --enable-tests # installs the tests, we don't want that
-    "--enable-tools"
-  ]
-    ++ optionals (!enableLoopback) [ "--disable-loopback" ]
-    ++ optionals (!enableEthernet) [ "--disable-ethernet" ]
-    ++ optionals (!enableWireguard) [ "--disable-wireguard" ]
-    ++ optionals (!enableGadget) [ "--disable-gadget" ]
-    ++ optionals (!enableWifi) [ "--disable-wifi" ]
-    # enable IWD support for wifi as it doesn't require any new dependencies
-    # and it's easier for the NixOS module to use only one connman package when
-    # IWD is requested
-    ++ optionals (enableWifi) [ "--enable-iwd" ]
-    ++ optionals (!enableBluetooth) [ "--disable-bluetooth" ]
-    ++ optionals (!enableOfono) [ "--disable-ofono" ]
-    ++ optionals (!enableDundee) [ "--disable-dundee" ]
-    ++ optionals (!enablePacrunner) [ "--disable-pacrunner" ]
-    ++ optionals (!enableNeard) [ "--disable-neard" ]
-    ++ optionals (!enableWispr) [ "--disable-wispr" ]
-    ++ optionals (!enableTools) [ "--disable-tools" ]
-    ++ optionals (!enableStats) [ "--disable-stats" ]
-    ++ optionals (!enableClient) [ "--disable-client" ]
-    ++ optionals (!enableDatafiles) [ "--disable-datafiles" ]
-    ++ optionals (enableOpenconnect) [
-      "--enable-openconnect=builtin"
-      "--with-openconnect=${openconnect}/sbin/openconnect"
-    ]
-    ++ optionals (enableOpenvpn) [
-      "--enable-openvpn=builtin"
-      "--with-openvpn=${openvpn}/sbin/openvpn"
-    ]
-    ++ optionals (enableVpnc) [
-      "--enable-vpnc=builtin"
-      "--with-vpnc=${vpnc}/sbin/vpnc"
-    ]
-    ++ optionals (enablePolkit) [
-      "--enable-polkit"
-    ]
-    ++ optionals (enablePptp) [
-      "--enable-pptp"
-      "--with-pptp=${pptp}/sbin/pptp"
-    ]
-    ++ optionals (!enableWireguard) [
-      "--disable-wireguard"
-    ]
-    ++ optionals (enableNetworkManager) [
-      "--enable-nmcompat"
-    ]
-    ++ optionals (enableHh2serialGps) [
-      "--enable-hh2serial-gps"
-    ]
-    ++ optionals (enableL2tp) [
-      "--enable-l2tp"
-    ]
-    ++ optionals (enableIospm) [
-      "--enable-iospm"
-    ]
-    ++ optionals (enableTist) [
-      "--enable-tist"
-    ]
-  ;
-
-  doCheck = true;
-
-  meta = with stdenv.lib; {
-    description = "A daemon for managing internet connections";
-    homepage = "https://01.org/connman";
-    maintainers = [ maintainers.matejc ];
-    platforms = platforms.linux;
-    license = licenses.gpl2;
-  };
+  # All the defaults
+  connman = callPackage ./connman.nix { };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ed0b8d55a8e..2827e84b7a47 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2550,37 +2550,11 @@ in
 
   conspy = callPackage ../os-specific/linux/conspy {};
 
-  connman = callPackage ../tools/networking/connman { };
-  connmanThin = callPackage ../tools/networking/connman {
-    enableOpenconnect = false;
-    enableOpenvpn = false;
-    enableVpnc = false;
-    vpnc = false;
-    enablePolkit = false;
-    enablePptp = false;
-    enableLoopback = false;
-    # enableEthernet = false; # If disabled no ethernet connection can be performed
-    enableWireguard = false;
-    enableGadget = false;
-    # enableWifi = false; # If disabled no WiFi connection can be performed
-    enableBluetooth = false;
-    enableOfono = false;
-    enableDundee = false;
-    enablePacrunner = false;
-    enableNeard = false;
-    enableWispr = false;
-    enableTools = false;
-    enableStats = false;
-    enableClient = false;
-    # enableDatafiles = false; # If disabled, configuration and data files are not installed
-  };
-  connmanFull = callPackage ../tools/networking/connman {
-    enableNetworkManager = true;
-    enableHh2serialGps = true;
-    enableL2tp = true;
-    enableIospm = true;
-    enableTist = true;
-  };
+  inherit (callPackage ../tools/networking/connman {})
+    connmanFull
+    connmanMinimal
+    connman
+  ;
 
   connman-gtk = callPackage ../tools/networking/connman/connman-gtk { };
 

From fa5f7b89c4b23f46acfcc29b4d683260937967b4 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 2 Mar 2020 11:13:45 +0200
Subject: [PATCH 4120/4636] connman: Switch to postPatch from patchPhase

---
 pkgs/tools/networking/connman/connman.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/connman/connman.nix b/pkgs/tools/networking/connman/connman.nix
index f79b9875b9bc..c700d6864a97 100644
--- a/pkgs/tools/networking/connman/connman.nix
+++ b/pkgs/tools/networking/connman/connman.nix
@@ -84,10 +84,8 @@ stdenv.mkDerivation rec {
   ;
 
   # fix invalid path to 'file'
-  patchPhase = ''
-    runHook prePatch
+  postPatch = ''
     sed -i "s/\/usr\/bin\/file/file/g" ./configure
-    runHook postPatch
   '';
 
   configureFlags = [

From a3d2e48a62412029adf6e6b3d5d4d2cb0bf5bae2 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 3 Mar 2020 22:33:49 +0200
Subject: [PATCH 4121/4636] connmanMinimal: remove use of lowPrio

---
 pkgs/tools/networking/connman/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index 34aee7f78794..b2b62cf01b72 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, lowPrio }:
+{ callPackage }:
 
 {
   connmanFull = callPackage ./connman.nix {
@@ -9,7 +9,7 @@
     enableTist = true;
   };
 
-  connmanMinimal = lowPrio (callPackage ./connman.nix {
+  connmanMinimal = callPackage ./connman.nix {
     enableOpenconnect = false;
     enableOpenvpn = false;
     enableVpnc = false;
@@ -31,7 +31,7 @@
     enableStats = false;
     enableClient = false;
     # enableDatafiles = false; # If disabled, configuration and data files are not installed
-  });
+  };
 
   # All the defaults
   connman = callPackage ./connman.nix { };

From 22b27dd635b9f6d1b77720cfb3ebbc6d753c0ca5 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 4 Mar 2020 09:45:45 +0200
Subject: [PATCH 4122/4636] connman: remove import of networkmanager

---
 pkgs/tools/networking/connman/connman.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/tools/networking/connman/connman.nix b/pkgs/tools/networking/connman/connman.nix
index c700d6864a97..d72b6b90c5e5 100644
--- a/pkgs/tools/networking/connman/connman.nix
+++ b/pkgs/tools/networking/connman/connman.nix
@@ -42,7 +42,6 @@
 , enableDatafiles ? true
 # optional features which are turned *off* by default
 , enableNetworkManager ? false
-, networkmanager ? null
 , enableHh2serialGps ? false
 , enableL2tp ? false
 , enableIospm ? false

From aa44c23c7ab30a2c8d8b355bab6d533fb861fe75 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 4 Mar 2020 09:48:01 +0200
Subject: [PATCH 4123/4636] connman: reverse order of build flavors declaration

---
 pkgs/tools/networking/connman/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix           | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index b2b62cf01b72..9e87c9742ea0 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -1,6 +1,9 @@
 { callPackage }:
 
 {
+  # All the defaults
+  connman = callPackage ./connman.nix { };
+
   connmanFull = callPackage ./connman.nix {
     enableNetworkManager = true;
     enableHh2serialGps = true;
@@ -32,7 +35,4 @@
     enableClient = false;
     # enableDatafiles = false; # If disabled, configuration and data files are not installed
   };
-
-  # All the defaults
-  connman = callPackage ./connman.nix { };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2827e84b7a47..7600213d1a89 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2551,9 +2551,9 @@ in
   conspy = callPackage ../os-specific/linux/conspy {};
 
   inherit (callPackage ../tools/networking/connman {})
+    connman
     connmanFull
     connmanMinimal
-    connman
   ;
 
   connman-gtk = callPackage ../tools/networking/connman/connman-gtk { };

From b03bf779aee312b610b1596682963b7569468630 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 4 Mar 2020 18:56:49 +0200
Subject: [PATCH 4124/4636] connman: remove unneeded deps from
 nativeBuildInputs

---
 pkgs/tools/networking/connman/connman.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/tools/networking/connman/connman.nix b/pkgs/tools/networking/connman/connman.nix
index d72b6b90c5e5..512194872205 100644
--- a/pkgs/tools/networking/connman/connman.nix
+++ b/pkgs/tools/networking/connman/connman.nix
@@ -73,9 +73,6 @@ stdenv.mkDerivation rec {
     pkgconfig
     file
   ]
-    ++ optionals (enableOpenvpn) [ openvpn ]
-    ++ optionals (enableOpenconnect) [ openconnect ]
-    ++ optionals (enableVpnc) [ vpnc ]
     ++ optionals (enablePolkit) [ polkit ]
     ++ optionals (enablePptp) [ pptp ppp ]
     ++ optionals (firewallType == "iptables") [ iptables ]

From 335e0973523641cb779667aa2609191b4a273737 Mon Sep 17 00:00:00 2001
From: Roberto Di Remigio <roberto.diremigio@gmail.com>
Date: Tue, 24 Mar 2020 12:27:55 +0100
Subject: [PATCH 4125/4636] mkl: 2019.5.281 -> 2020.0.166 (Linux only)

---
 .../libraries/science/math/mkl/default.nix        | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix
index 604413c96d8a..82109b4ba342 100644
--- a/pkgs/development/libraries/science/math/mkl/default.nix
+++ b/pkgs/development/libraries/science/math/mkl/default.nix
@@ -7,17 +7,18 @@ let
   # Release notes and download URLs are here:
   # https://registrationcenter.intel.com/en/products/
   version = "${year}.${spot}.${rel}";
-  year = "2019";
 
   # Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details:
   # https://github.com/matthewbauer/undmg/issues/4
-  spot = if stdenvNoCC.isDarwin then "3" else "5";
-  rel = if stdenvNoCC.isDarwin then "199" else "281";
+  year = if stdenvNoCC.isDarwin then "2019" else "2020";
+  spot = if stdenvNoCC.isDarwin then "3" else "0";
+  rel = if stdenvNoCC.isDarwin then "199" else "166";
 
   rpm-ver = "${year}.${spot}-${rel}-${year}.${spot}-${rel}";
 
   # Intel openmp uses its own versioning, but shares the spot release patch.
-  openmp-ver = "19.0.${spot}-${rel}-19.0.${spot}-${rel}";
+  openmp = if stdenvNoCC.isDarwin then "19.0" else "19.1";
+  openmp-ver = "${openmp}.${spot}-${rel}-${openmp}.${spot}-${rel}";
 
 in stdenvNoCC.mkDerivation {
   pname = "mkl";
@@ -31,8 +32,8 @@ in stdenvNoCC.mkDerivation {
       })
     else
       (fetchurl {
-        url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15816/l_mkl_${version}.tgz";
-        sha256 = "0zkk4rrq7g44acxaxhpd2053r66w169mww6917an0lxhd52fm5cr";
+        url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16318/l_mkl_${version}.tgz";
+        sha256 = "1q4ab87qzraksn8mm4117vj7l3sgpdi2qszj7nx122zi7zmjvngn";
       });
 
   nativeBuildInputs = if stdenvNoCC.isDarwin
@@ -136,7 +137,7 @@ in stdenvNoCC.mkDerivation {
       choice of compilers, languages, operating systems, and linking and
       threading models.
     '';
-    homepage = https://software.intel.com/en-us/mkl;
+    homepage = "https://software.intel.com/en-us/mkl";
     license = licenses.issl;
     platforms = [ "x86_64-linux" "x86_64-darwin" ];
     maintainers = with maintainers; [ bhipple ];

From fa7372330537a35ba44adfe98d1ebb134c1de56b Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 27 Mar 2020 03:59:56 -0400
Subject: [PATCH 4126/4636] perlPackages.CPAN: fix patch download

Fixes: 153b0db9 ('perlPackages.CPAN: apply patch to fix changed YAML module default')
Closes: #81480
---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 3bf345762b36..eb66bc88e7cb 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3344,9 +3344,9 @@ let
     };
     patches = [
       (fetchpatch {
-        url = "https://patch-diff.githubusercontent.com/raw/andk/cpanpm/pull/133.diff";
+        url = "https://github.com/andk/cpanpm/commit/10da44f1757aff6971e3bc4ed38ab115e738c740.diff";
         name = "patch-YAML-modules-default-for-LoadBlessed-was-changed-to-false";
-        sha256 = "0i8648cwshzzd0b34gyfn68s1vs85d8336ggk2kl99awah1ydsfr";
+        sha256 = "0sr2nxkr1cwavpvpxsqcsryfd5fjv4fkxfihd03jzavv5awj79hp";
       })
     ];
     propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ];

From 28aa914b1e46334ad479f8bbdc53aa595408f6aa Mon Sep 17 00:00:00 2001
From: Steve Jones <steve@jonescape.com>
Date: Mon, 16 Mar 2020 19:14:53 -0400
Subject: [PATCH 4127/4636] qmidiarp: init at 0.6.5

---
 pkgs/applications/audio/qmidiarp/default.nix | 49 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/applications/audio/qmidiarp/default.nix

diff --git a/pkgs/applications/audio/qmidiarp/default.nix b/pkgs/applications/audio/qmidiarp/default.nix
new file mode 100644
index 000000000000..4bbfe79a2c9f
--- /dev/null
+++ b/pkgs/applications/audio/qmidiarp/default.nix
@@ -0,0 +1,49 @@
+{ stdenv
+, fetchgit
+, automake
+, autoreconfHook
+, lv2
+, pkg-config
+, qt5
+, alsaLib
+, libjack2
+}:
+
+stdenv.mkDerivation rec {
+  name = "qmidiarp";
+  version = "0.6.5";
+
+  src = fetchgit {
+    url = "https://git.code.sf.net/p/qmidiarp/code";
+    sha256 = "1g2143gzfbihqr2zi3k2v1yn1x3mwfbb2khmcd4m4cq3hcwhhlx9";
+    rev = "qmidiarp-0.6.5";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    qt5.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    alsaLib
+    lv2
+    libjack2
+  ] ++ (with qt5; [
+    qttools
+  ]);
+
+  meta = with stdenv.lib; {
+    description = "An advanced MIDI arpeggiator";
+    longDescription = ''
+      An advanced MIDI arpeggiator, programmable step sequencer and LFO for Linux.
+      It can hold any number of arpeggiator, sequencer, or LFO modules running in
+      parallel.
+    '';
+
+    homepage = "http://qmidiarp.sourceforge.net";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ sjfloat ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e469380abbd..2fda2af59882 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21577,6 +21577,8 @@ in
 
   qmetro = callPackage ../applications/misc/qmetro { };
 
+  qmidiarp = callPackage ../applications/audio/qmidiarp {};
+
   qmidinet = libsForQt5.callPackage ../applications/audio/qmidinet { };
 
   qmidiroute = callPackage ../applications/audio/qmidiroute { };

From 2a846e9c380b82a5603b2906508dda8b752b36a2 Mon Sep 17 00:00:00 2001
From: Christoph Neidahl <christoph.neidahl@gmail.com>
Date: Sun, 15 Mar 2020 17:27:21 +0100
Subject: [PATCH 4128/4636] acme: init at 120

---
 pkgs/development/compilers/acme/default.nix | 24 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/compilers/acme/default.nix

diff --git a/pkgs/development/compilers/acme/default.nix b/pkgs/development/compilers/acme/default.nix
new file mode 100644
index 000000000000..2aca7478d7be
--- /dev/null
+++ b/pkgs/development/compilers/acme/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchsvn }:
+
+stdenv.mkDerivation rec {
+  pname = "acme";
+  version = "120";
+
+  src = fetchsvn {
+    url = "svn://svn.code.sf.net/p/acme-crossass/code-0/trunk";
+    rev = version;
+    sha256 = "0w17b8f8bis22m6l5bg8qg8nniy20f8yg2xmzjipblmc39vpv6s2";
+  };
+
+  sourceRoot = "code-0-r${src.rev}/src";
+
+  makeFlags = [ "BINDIR=$(out)/bin" ];
+
+  meta = with stdenv.lib; {
+    description = "A multi-platform cross assembler for 6502/6510/65816 CPUs.";
+    homepage = "https://sourceforge.net/projects/acme-crossass/";
+    license = licenses.gpl2Plus;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ OPNA2608 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2fda2af59882..7aba1dd837ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8938,6 +8938,8 @@ in
     inherit (darwin.apple_sdk.frameworks) OpenGL;
   };
 
+  acme = callPackage ../development/compilers/acme { };
+
   nasm = callPackage ../development/compilers/nasm { };
 
   nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { };

From 81d0e3d056a7dcea164c3f7183f05cc7edc3e19c Mon Sep 17 00:00:00 2001
From: Christoph Neidahl <christoph.neidahl@gmail.com>
Date: Sun, 15 Mar 2020 17:27:55 +0100
Subject: [PATCH 4129/4636] cheesecutter: init at unstable-2019-12-06

---
 .../0001-fix-impure-build-date-display.patch  | 26 ++++++++++
 .../audio/cheesecutter/default.nix            | 48 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 76 insertions(+)
 create mode 100644 pkgs/applications/audio/cheesecutter/0001-fix-impure-build-date-display.patch
 create mode 100644 pkgs/applications/audio/cheesecutter/default.nix

diff --git a/pkgs/applications/audio/cheesecutter/0001-fix-impure-build-date-display.patch b/pkgs/applications/audio/cheesecutter/0001-fix-impure-build-date-display.patch
new file mode 100644
index 000000000000..2e2746f43417
--- /dev/null
+++ b/pkgs/applications/audio/cheesecutter/0001-fix-impure-build-date-display.patch
@@ -0,0 +1,26 @@
+diff --git a/src/ct2util.d b/src/ct2util.d
+index 523cadc..e462b09 100644
+--- a/src/ct2util.d
++++ b/src/ct2util.d
+@@ -105,7 +105,7 @@ int main(string[] args) {
+ 	speeds.length = 32;
+ 	masks.length = 32;
+ 	void printheader() {
+-		enum hdr = "CheeseCutter 2 utilities" ~ com.util.versionInfo;
++		enum hdr = "CheeseCutter 2 utilities";
+ 		writefln(hdr);
+ 		writefln("\nUsage: \t%s <command> <options> <infile> <-o outfile>",args[0]);
+ 		writefln("\t%s import <infile> <infile2> <-o outfile>",args[0]);
+diff --git a/src/ui/ui.d b/src/ui/ui.d
+index e418dda..21af408 100644
+--- a/src/ui/ui.d
++++ b/src/ui/ui.d
+@@ -231,7 +231,7 @@ class Infobar : Window {
+ 	  
+ 		screen.clrtoeol(0, headerColor);
+ 
+-		enum hdr = "CheeseCutter 2.9" ~ com.util.versionInfo;
++		enum hdr = "CheeseCutter 2.9";
+ 		screen.cprint(4, 0, 1, headerColor, hdr);
+ 		screen.cprint(screen.width - 14, 0, 1, headerColor, "F12 = Help");
+ 		int c1 = audio.player.isPlaying ? 13 : 12;
diff --git a/pkgs/applications/audio/cheesecutter/default.nix b/pkgs/applications/audio/cheesecutter/default.nix
new file mode 100644
index 000000000000..732c2968fde4
--- /dev/null
+++ b/pkgs/applications/audio/cheesecutter/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, lib, fetchFromGitHub, fetchpatch
+, acme, ldc, patchelf
+, SDL
+}:
+
+stdenv.mkDerivation rec {
+  pname = "cheesecutter";
+  version = "unstable-2019-12-06";
+
+  src = fetchFromGitHub {
+    owner = "theyamo";
+    repo = "CheeseCutter";
+    rev = "6b433c5512d693262742a93c8bfdfb353d4be853";
+    sha256 = "1szlcg456b208w1237581sg21x69mqlh8cr6v8yvbhxdz9swxnwy";
+  };
+
+  nativeBuildInputs = [ acme ldc patchelf ];
+
+  buildInputs = [ SDL ];
+
+  patches = [
+    ./0001-fix-impure-build-date-display.patch
+  ];
+
+  makefile = "Makefile.ldc";
+
+  installPhase = ''
+    for exe in {ccutter,ct2util}; do
+      install -D $exe $out/bin/$exe
+    done
+
+    mkdir -p $out/share/cheesecutter/example_tunes
+    cp -r tunes/* $out/share/cheesecutter/example_tunes
+  '';
+
+  postFixup = ''
+    rpath=$(patchelf --print-rpath $out/bin/ccutter)
+    patchelf --set-rpath "$rpath:${lib.makeLibraryPath buildInputs}" $out/bin/ccutter
+  '';
+
+  meta = with lib; {
+    description = "A tracker program for composing music for the SID chip.";
+    homepage = "https://github.com/theyamo/CheeseCutter/";
+    license = licenses.gpl2;
+    platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
+    maintainers = with maintainers; [ OPNA2608 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7aba1dd837ee..f75fb2cf1818 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18638,6 +18638,8 @@ in
 
   cadence =  qt5.callPackage ../applications/audio/cadence { };
 
+  cheesecutter = callPackage ../applications/audio/cheesecutter { };
+
   milkytracker = callPackage ../applications/audio/milkytracker { };
 
   schismtracker = callPackage ../applications/audio/schismtracker { };

From 7dd3d620d65f573f272ad92b282a19a823273825 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Fri, 13 Mar 2020 17:08:17 +0800
Subject: [PATCH 4130/4636] vim-plugins.coc-fzf: init at 2020-03-06

Tested working with the current version of coc.nvim and fzf
---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 2a5d2eb0dfd7..3799072f2fcb 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -378,6 +378,17 @@ let
     };
   };
 
+  coc-fzf = buildVimPluginFrom2Nix {
+    pname = "coc-fzf";
+    version = "2020-03-06";
+    src = fetchFromGitHub {
+      owner = "antoinemadec";
+      repo = "coc-fzf";
+      rev = "ca394b48ac9c78ce95d6cdf3807927a7b6bcfcbe";
+      sha256 = "1nsqdp2zma7rlzynm58z43vk5hyrcz8kn7ak32979p4a3fvdyj5c";
+    };
+  };
+
   coc-highlight = buildVimPluginFrom2Nix {
     pname = "coc-highlight";
     version = "2019-10-18";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 86d9912e4ed2..68516a2da678 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -13,6 +13,7 @@ andreshazard/vim-logreview
 andsild/peskcolor.vim
 andviro/flake8-vim
 andys8/vim-elm-syntax
+antoinemadec/coc-fzf
 ap/vim-css-color
 arcticicestudio/nord-vim
 artur-shaik/vim-javacomplete2

From 279438e7f87c235600c1327dc25c8d18b5a0d437 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 25 Mar 2020 10:13:59 -0700
Subject: [PATCH 4131/4636] python: add use-pkgs-prefix option to update script

---
 .../update-python-libraries.py                  | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
index 7e0580ce063d..b568ee6751d7 100755
--- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
+++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
@@ -315,11 +315,11 @@ def _update(path, target):
         return False
 
 
-def _commit(path, pname, old_version, new_version, **kwargs):
+def _commit(path, pname, old_version, new_version, pkgs_prefix="python: ", **kwargs):
     """Commit result.
     """
 
-    msg = f'python: {pname}: {old_version} -> {new_version}'
+    msg = f'{pkgs_prefix}{pname}: {old_version} -> {new_version}'
 
     try:
         subprocess.check_call([GIT, 'add', path])
@@ -337,6 +337,7 @@ def main():
     parser.add_argument('package', type=str, nargs='+')
     parser.add_argument('--target', type=str, choices=SEMVER.keys(), default='major')
     parser.add_argument('--commit', action='store_true', help='Create a commit for each package update')
+    parser.add_argument('--use-pkgs-prefix', action='store_true', help='Use python3Packages.${pname}: instead of python: ${pname}: when making commits')
 
     args = parser.parse_args()
     target = args.target
@@ -347,17 +348,23 @@ def main():
 
     # Use threads to update packages concurrently
     with Pool() as p:
-        results = list(p.map(lambda pkg: _update(pkg, target), packages))
+        results = list(filter(bool, p.map(lambda pkg: _update(pkg, target), packages)))
 
     logging.info("Finished updating packages.")
 
+    commit_options = {}
+    if args.use_pkgs_prefix:
+        logging.info("Using python3Packages. prefix for commits")
+        commit_options["pkgs_prefix"] = "python3Packages."
+
     # Commits are created sequentially.
     if args.commit:
         logging.info("Committing updates...")
-        list(map(lambda x: _commit(**x), filter(bool, results)))
+        # list forces evaluation
+        list(map(lambda x: _commit(**x, **commit_options), results))
         logging.info("Finished committing updates")
 
-    count = sum(map(bool, results))
+    count = len(results)
     logging.info("{} package(s) updated".format(count))
 
 

From 1685cd7fa7c6e5a89990f8937c4fa43ff76af779 Mon Sep 17 00:00:00 2001
From: Rouven Czerwinski <rouven@czerwinskis.de>
Date: Fri, 27 Mar 2020 08:25:07 +0100
Subject: [PATCH 4132/4636] nixos/test: update test-driver.py for mypy 0.770

---
 nixos/lib/test-driver/test-driver.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py
index c27947bc610d..7825025893d3 100644
--- a/nixos/lib/test-driver/test-driver.py
+++ b/nixos/lib/test-driver/test-driver.py
@@ -6,6 +6,7 @@ from xml.sax.saxutils import XMLGenerator
 import _thread
 import atexit
 import base64
+import codecs
 import os
 import pathlib
 import ptpython.repl
@@ -115,6 +116,7 @@ def create_vlan(vlan_nr: str) -> Tuple[str, str, "subprocess.Popen[bytes]", Any]
     fd.write("version\n")
     # TODO: perl version checks if this can be read from
     # an if not, dies. we could hang here forever. Fix it.
+    assert vde_process.stdout is not None
     vde_process.stdout.readline()
     if not os.path.exists(os.path.join(vde_socket, "ctl")):
         raise Exception("cannot start vde_switch")
@@ -139,7 +141,7 @@ def retry(fn: Callable) -> None:
 class Logger:
     def __init__(self) -> None:
         self.logfile = os.environ.get("LOGFILE", "/dev/null")
-        self.logfile_handle = open(self.logfile, "wb")
+        self.logfile_handle = codecs.open(self.logfile, "wb")
         self.xml = XMLGenerator(self.logfile_handle, encoding="utf-8")
         self.queue: "Queue[Dict[str, str]]" = Queue(1000)
 
@@ -739,6 +741,7 @@ class Machine:
         self.shell, _ = self.shell_socket.accept()
 
         def process_serial_output() -> None:
+            assert self.process.stdout is not None
             for _line in self.process.stdout:
                 # Ignore undecodable bytes that may occur in boot menus
                 line = _line.decode(errors="ignore").replace("\r", "").rstrip()

From 16cf49353306758143e155470013f6d56ade80b3 Mon Sep 17 00:00:00 2001
From: Rouven Czerwinski <rouven@czerwinskis.de>
Date: Fri, 27 Mar 2020 08:25:24 +0100
Subject: [PATCH 4133/4636] Revert "Revert "mypy: 0.761 -> 0.770""

This reverts commit 776b55518a6ae72b9e09ff893969476aee5a09c6.
---
 pkgs/development/python-modules/mypy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
index 90b00ba17179..bcd0ab4a6c62 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "mypy";
-  version = "0.761";
+  version = "0.770";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1gw7h84d21wmi267kmgqs9whz0l7rp62pzja2f31wq7cfj6spfl5";
+    sha256 = "1bm40nx9g1n4nj1309cijnh0ns4qbhym3agyl537nc4vxw3paqla";
   };
 
   propagatedBuildInputs = [ typed-ast psutil mypy-extensions typing-extensions ];

From 62831e10237d580a5142d8bc172e88d5ec2029ac Mon Sep 17 00:00:00 2001
From: Stig Palmquist <stig@stig.io>
Date: Thu, 5 Mar 2020 12:59:32 +0100
Subject: [PATCH 4134/4636] rakudo: 2020.02 -> 2020.02.1

dependencies:
moarvm: 2020.02 -> 2020.02.1
nqp: 2020.02 -> 2020.02.1
---
 pkgs/development/interpreters/rakudo/default.nix | 6 +++---
 pkgs/development/interpreters/rakudo/moarvm.nix  | 4 ++--
 pkgs/development/interpreters/rakudo/nqp.nix     | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index ca8d2b2b0dab..9d0f47d90d2a 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "rakudo";
-  version = "2020.02";
+  version = "2020.02.1";
 
   src = fetchurl {
-    url    = "https://github.com/rakudo/rakudo/releases/download/${version}/rakudo-${version}.tar.gz";
-    sha256 = "0yhld3ij4mfa42chkfph7lzcl5q9b613hdjmw9rv46appmxvvmrs";
+    url    = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz";
+    sha256 = "1qfaiqfclqd6zz04xl90yiqkvmm610r905nnbd6gszgyq1k77ckv";
   };
 
   buildInputs = [ icu zlib gmp perl ];
diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix
index 3c5c5f2a2f27..ade97b56a648 100644
--- a/pkgs/development/interpreters/rakudo/moarvm.nix
+++ b/pkgs/development/interpreters/rakudo/moarvm.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "moarvm";
-  version = "2020.02";
+  version = "2020.02.1";
 
   src = fetchurl {
     url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz";
-    sha256 = "1kz97yy357lax7xdz4mnnwswn7axhp14nq0dw3n6xbcpap6m82aw";
+    sha256 = "0cnnyjyci24pbws2cic80xdr7a5g3qvrsi221c6bpbnpkar81jw2";
    };
 
   buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix
index 84a214201a01..f12e60b14f06 100644
--- a/pkgs/development/interpreters/rakudo/nqp.nix
+++ b/pkgs/development/interpreters/rakudo/nqp.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "nqp";
-  version = "2020.02";
+  version = "2020.02.1";
 
   src = fetchurl {
     url    = "https://github.com/perl6/nqp/releases/download/${version}/nqp-${version}.tar.gz";
-    sha256 = "0ik3fscywxjx1qxlbjf68msz83alpckzw3myj9jmkalvy8q5v0nk";
+    sha256 = "0zw3g7viyq4n4qwy0laww2mzz6wrzkfcq4fm82scy1mh65r7bdgj";
   };
 
   buildInputs = [ perl ];

From 8ab04fd87b61713f603c3e358657d278623b1d13 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 27 Mar 2020 10:08:59 +0100
Subject: [PATCH 4135/4636] gitlab: 12.8.7 -> 12.8.8

---
 pkgs/applications/version-management/gitlab/data.json  | 10 +++++-----
 .../version-management/gitlab/gitaly/default.nix       |  4 ++--
 .../gitlab/gitlab-workhorse/default.nix                |  4 ++--
 .../version-management/gitlab/rubyEnv/Gemfile.lock     |  2 +-
 .../version-management/gitlab/rubyEnv/gemset.nix       |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index 588446572980..8da56229a02c 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,13 +1,13 @@
 {
-  "version": "12.8.7",
-  "repo_hash": "15dw8v5184500jm823wv920li3ishwk8k2dhxl1w8209x53nbqgj",
+  "version": "12.8.8",
+  "repo_hash": "1y8flmssz8bp07v7x9gxazqn5889hvkxk0k6py773gdnna5fd5fb",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v12.8.7-ee",
+  "rev": "v12.8.8-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "12.8.7",
+    "GITALY_SERVER_VERSION": "12.8.8",
     "GITLAB_PAGES_VERSION": "1.16.0",
     "GITLAB_SHELL_VERSION": "11.0.0",
-    "GITLAB_WORKHORSE_VERSION": "8.21.0"
+    "GITLAB_WORKHORSE_VERSION": "8.21.1"
   }
 }
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 377213195541..aea38245c913 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -28,14 +28,14 @@ let
     };
   });
 in buildGoPackage rec {
-  version = "12.8.7";
+  version = "12.8.8";
   pname = "gitaly";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitaly";
     rev = "v${version}";
-    sha256 = "1sb11xavckzm70m27xcwbv4a1iaicxkh1hv2zi4brlcj5ia2rky4";
+    sha256 = "182jqglzbzq8jnlq6l634125jkvi67pfr1xck68n4k09gyzqllxv";
   };
 
   # Fix a check which assumes that hook files are writeable by their
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index 937c3576fc33..0197e8d89b33 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -3,13 +3,13 @@
 buildGoPackage rec {
   pname = "gitlab-workhorse";
 
-  version = "8.21.0";
+  version = "8.21.1";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-workhorse";
     rev = "v${version}";
-    sha256 = "04vhshm9lwnx77q9l7znxwkvvwm3gxgxw12y1xwahfilj352xr7q";
+    sha256 = "1d384xw7hfrph4i61z9z315sik7ja9hgrvmhljirwxrch1fyx3m4";
   };
 
   goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse";
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
index aa33bd4cd68a..9735b9be9358 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
@@ -652,7 +652,7 @@ GEM
     netrc (0.11.0)
     nio4r (2.5.2)
     no_proxy_fix (0.1.2)
-    nokogiri (1.10.7)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
     nokogumbo (1.5.0)
       nokogiri
diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
index efba20ab0822..f92b72361df5 100644
--- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
@@ -2927,10 +2927,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln";
+      sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8";
       type = "gem";
     };
-    version = "1.10.7";
+    version = "1.10.8";
   };
   nokogumbo = {
     dependencies = ["nokogiri"];

From 8a774b7d56dcb0969299f4f36ec3f46eb9ac6f23 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Fri, 27 Mar 2020 04:20:00 -0500
Subject: [PATCH 4136/4636] keycloak: add platforms to meta

---
 pkgs/servers/keycloak/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix
index bfff6b2671c9..b5fec49b910d 100644
--- a/pkgs/servers/keycloak/default.nix
+++ b/pkgs/servers/keycloak/default.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
     homepage    = "https://www.keycloak.org/";
     description = "Identity and access management for modern applications and services";
     license     = licenses.asl20;
+    platforms   = jre.meta.platforms;
     maintainers = [ maintainers.ngerstle ];
   };
 

From 75338763120e06cfe787361ac52eae302c2cc28a Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 27 Mar 2020 09:55:33 +0000
Subject: [PATCH 4137/4636] buildRustCrate: fewer backslashes

This is a slight readability boost, I think.
---
 pkgs/build-support/rust/build-rust-crate/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix
index 70d48bef8c9b..a175ba9d7f6e 100644
--- a/pkgs/build-support/rust/build-rust-crate/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/default.nix
@@ -100,7 +100,7 @@ stdenv.mkDerivation (rec {
     );
 
     crateFeatures = lib.optionalString (crate ? features)
-      (lib.concatMapStringsSep " " (f: "--cfg feature=\\\"${f}\\\"") (crate.features ++ features));
+      (lib.concatMapStringsSep " " (f: ''--cfg feature=\"${f}\"'') (crate.features ++ features));
 
     libName = if crate ? libName then crate.libName else crate.crateName;
     libPath = if crate ? libPath then crate.libPath else "";

From 4f31680331a97793fe96216d9541212f89fe7b71 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 27 Mar 2020 13:03:29 +0300
Subject: [PATCH 4138/4636] pythonPackages.pyqt5: add passthru for features
 enabled

---
 pkgs/development/python-modules/pyqt/5.x.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index f3578459b9d0..a9d78960fc43 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -80,6 +80,9 @@ in buildPythonPackage rec {
 
   passthru = {
     inherit sip;
+    multimediaEnabled = withMultimedia;
+    webKitEnabled = withWebKit;
+    WebSocketsEnabled = withWebSockets;
   };
 
   configurePhase = ''

From 3435237fc5026554111a3233e59d8effd52290f0 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 27 Mar 2020 13:04:24 +0300
Subject: [PATCH 4139/4636] picard: Fix double wrapping

---
 pkgs/applications/audio/picard/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index b241f750d036..9530da63ef76 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -27,10 +27,11 @@ in pythonPackages.buildPythonApplication rec {
     substituteInPlace setup.cfg --replace "‘" "'"
   '';
 
-  installPhase = ''
-    python setup.py install --prefix="$out"
-    wrapQtApp $out/bin/picard
-  '';
+  # In order to spare double wrapping, we use:
+  preFixup = ''
+    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+  ''
+  ;
 
   meta = with stdenv.lib; {
     homepage = "https://picard.musicbrainz.org/";

From 87f08d070dc67e10eb0e0ea7aa43827e1b702d3f Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 27 Mar 2020 11:07:29 +0100
Subject: [PATCH 4140/4636] ubridge: 0.9.17 -> 0.9.18

---
 pkgs/tools/networking/ubridge/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/ubridge/default.nix b/pkgs/tools/networking/ubridge/default.nix
index a7f0993fed62..c628a2c8a8cc 100644
--- a/pkgs/tools/networking/ubridge/default.nix
+++ b/pkgs/tools/networking/ubridge/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ubridge";
-  version = "0.9.17";
+  version = "0.9.18";
 
   src = fetchFromGitHub {
     owner = "GNS3";
     repo = "ubridge";
     rev = "v${version}";
-    sha256 = "1rwhbagac7msd116qymvlfh9qkz9jf0m8nl9xckwv68f57bhhjwl";
+    sha256 = "0jg66jhhpv4c9340fsdp64hf9h253i8r81fknxa0gq241ripp3jn";
   };
 
   postPatch = ''

From 5930c2f02ceb92944d4911e2e12d619b73fb7b78 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 16 Mar 2020 00:19:49 +0200
Subject: [PATCH 4141/4636] sacd: init at 19.7.16.37

---
 pkgs/tools/cd-dvd/sacd/default.nix | 41 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/tools/cd-dvd/sacd/default.nix

diff --git a/pkgs/tools/cd-dvd/sacd/default.nix b/pkgs/tools/cd-dvd/sacd/default.nix
new file mode 100644
index 000000000000..a3ce3d361824
--- /dev/null
+++ b/pkgs/tools/cd-dvd/sacd/default.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, fetchFromGitHub
+, fetchpatch
+}:
+
+stdenv.mkDerivation rec {
+  pname = "sacd";
+  version = "19.7.16.37";
+
+  src = fetchFromGitHub {
+    owner = "Sound-Linux-More";
+    repo = "sacd";
+    rev = version;
+    sha256 = "03s7jr75pzqj1xd41rkgbszlgf9zx6vzhd0nizc05wyf0fxq5xif";
+  };
+
+  patches = [
+    # Makefile prefix, otherwise `/usr` prefix is enforced
+    (fetchpatch {
+      url = "https://github.com/Sound-Linux-More/sacd/pull/1.patch";
+      name = "makefile-prefix.patch";
+      sha256 = "0a7r4x0yqpg6l4vr84dq4wbrypabqm4vvcjv91am068gqjiw6w64";
+    })
+  ];
+
+  makeFlagsArray = [
+    "PREFIX=$(out)"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Converts SACD image files, Philips DSDIFF and Sony DSF files to 24-bit high resolution wave files. Handles both DST and DSD streams. ";
+    longDescription = ''
+      Super Audio CD decoder. Converts SACD image files, Philips DSDIFF and Sony DSF files to 24-bit high resolution wave files.
+      Handles both DST and DSD streams.
+    '';
+    homepage = "https://github.com/Sound-Linux-More/sacd";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.doronbehar ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79401516993f..453efde098af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6337,6 +6337,8 @@ in
 
   safecopy = callPackage ../tools/system/safecopy { };
 
+  sacd = callPackage ../tools/cd-dvd/sacd { };
+
   safe = callPackage ../tools/security/safe { };
 
   safe-rm = callPackage ../tools/system/safe-rm { };

From 55b61465359f52fc598167693da61238fce6057d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 27 Mar 2020 10:37:04 -0300
Subject: [PATCH 4142/4636] freeoffice: 974 -> 976

---
 pkgs/applications/office/softmaker/freeoffice.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/softmaker/freeoffice.nix b/pkgs/applications/office/softmaker/freeoffice.nix
index b114194d5633..d9f901ff4635 100644
--- a/pkgs/applications/office/softmaker/freeoffice.nix
+++ b/pkgs/applications/office/softmaker/freeoffice.nix
@@ -2,13 +2,13 @@
 
 callPackage ./generic.nix (args // rec {
   pname = "freeoffice";
-  version = "974";
+  version = "976";
   edition = "2018";
   suiteName = "FreeOffice";
 
   src = fetchurl {
     url = "https://www.softmaker.net/down/softmaker-freeoffice-${version}-amd64.tgz";
-    sha256 = "0z7131qmqyv1m9phm7wzvb5z7wkh27h59lsa3zc0zjkykikmjrp2";
+    sha256 = "13yh4lyqakbdqf4r8vw8imy5gwpfva697iqfd85qmp3wimqvzskl";
   };
 
   archive = "freeoffice${edition}.tar.lzma";

From 84d18ac49f4e2b5c4524bc0420dd394c252534d5 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Thu, 26 Mar 2020 23:13:14 +0100
Subject: [PATCH 4143/4636] slack: 4.2.0 -> 4.4.0

* 4.4.1 on Darwin
* remove dark-theme, it's now included in the release
---
 .../instant-messengers/slack/dark-theme.nix   |  19 ----
 .../instant-messengers/slack/default.nix      | 102 ++++++++++--------
 .../instant-messengers/slack/update.sh        |  19 ----
 3 files changed, 56 insertions(+), 84 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/slack/dark-theme.nix
 delete mode 100755 pkgs/applications/networking/instant-messengers/slack/update.sh

diff --git a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix
deleted file mode 100644
index 903d8e60d6d5..000000000000
--- a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchgit }:
-
-stdenv.mkDerivation rec {
-  rev = "f760176c6e133667ce73aeecba8b0c0eb8822941";
-  version = "2019-09-11";
-  pname = "slack-theme-black";
-
-  src = fetchgit { inherit rev;
-    url = "https://github.com/laCour/slack-night-mode";
-    sha256 = "1kx8nx7mhrabs5wxqgvy86s5smy5hw49gv6yc95yxwx6ymwpgbzj";
-  };
-
-  dontUnpack = true;
-
-  buildCommand = ''
-    mkdir $out
-    cp $src/css/raw/black.css $out/theme.css
-  '';
-}
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 32f50b6fd638..712d45e2b199 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -1,35 +1,60 @@
-{ theme ? null, stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo,
-cups, curl, dbus, expat, fontconfig, freetype, glib , gnome2, gtk3, gdk-pixbuf,
-libappindicator-gtk3, libnotify, libxcb, nspr, nss, pango , systemd, xorg,
-at-spi2-atk, at-spi2-core, libuuid, nodePackages, libpulseaudio, xdg_utils
+{ stdenv
+, fetchurl
+, dpkg
+, makeWrapper
+, nodePackages
+, alsaLib
+, at-spi2-atk
+, at-spi2-core
+, atk
+, cairo
+, cups
+, curl
+, dbus
+, expat
+, fontconfig
+, freetype
+, gdk-pixbuf
+, glib
+, gnome2
+, gtk3
+, libappindicator-gtk3
+, libnotify
+, libpulseaudio
+, libuuid
+, libxcb
+, nspr
+, nss
+, pango
+, systemd
+, xdg_utils
+, xorg
 }:
 
 let
 
-  version = "4.2.0";
+  pname = "slack";
 
   inherit (stdenv.hostPlatform) system;
 
   throwSystem = throw "Unsupported system: ${system}";
 
-  pname = "slack";
-
   sha256 = {
-    x86_64-darwin = "0947a98m7yz4hldjvcqnv9s17dpvlsk9sflc1zc99hf500zck0w1";
-    x86_64-linux = "01b2klhky04fijdqcpfafgdqx2c5nh2fpnzvzgvz10hv7h16cinv";
+    x86_64-darwin = "05xsbiviikrwfayjr6rvvfkm70681x2an6mgcg1cxw1fsi4sr6fd";
+    x86_64-linux = "0h2rfgx92yq9a6dqsv9a0r8a6m5xfrywkljjk5w9snw49b0r1p12";
   }.${system} or throwSystem;
 
-
   meta = with stdenv.lib; {
     description = "Desktop client for Slack";
     homepage = https://slack.com;
     license = licenses.unfree;
-    maintainers = [ maintainers.mmahut ];
+    maintainers = with maintainers; [ mmahut ];
     platforms = [ "x86_64-darwin" "x86_64-linux" ];
   };
 
   linux = stdenv.mkDerivation rec {
-    inherit pname version meta;
+    inherit pname meta;
+    version = "4.4.0";
     src = fetchurl {
       url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
       inherit sha256;
@@ -47,23 +72,22 @@ let
       expat
       fontconfig
       freetype
+      gdk-pixbuf
       glib
       gnome2.GConf
-      gdk-pixbuf
       gtk3
-      pango
-      libnotify
-      libxcb
       libappindicator-gtk3
+      libnotify
+      libpulseaudio
+      libuuid
+      libxcb
       nspr
       nss
+      pango
       stdenv.cc.cc
       systemd
-      libuuid
-      libpulseaudio
-  
-      xorg.libxkbfile
       xorg.libX11
+      xorg.libXScrnSaver
       xorg.libXcomposite
       xorg.libXcursor
       xorg.libXdamage
@@ -73,65 +97,51 @@ let
       xorg.libXrandr
       xorg.libXrender
       xorg.libXtst
-      xorg.libXScrnSaver
+      xorg.libxkbfile
     ] + ":${stdenv.cc.cc.lib}/lib64";
 
     buildInputs = [
       gtk3  # needed for GSETTINGS_SCHEMAS_PATH
     ];
-  
+
     nativeBuildInputs = [ dpkg makeWrapper nodePackages.asar ];
-  
+
     dontUnpack = true;
     dontBuild = true;
     dontPatchELF = true;
-  
+
     installPhase = ''
       # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here
       dpkg --fsys-tarfile $src | tar --extract
       rm -rf usr/share/lintian
-  
+
       mkdir -p $out
       mv usr/* $out
-  
+
       # Otherwise it looks "suspicious"
       chmod -R g-w $out
-  
+
       for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
         patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
         patchelf --set-rpath ${rpath}:$out/lib/slack $file || true
       done
-  
+
       # Replace the broken bin/slack symlink with a startup wrapper
       rm $out/bin/slack
       makeWrapper $out/lib/slack/slack $out/bin/slack \
         --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
         --prefix PATH : ${xdg_utils}/bin
-  
+
       # Fix the desktop link
       substituteInPlace $out/share/applications/slack.desktop \
         --replace /usr/bin/ $out/bin/ \
         --replace /usr/share/ $out/share/
-    '' + stdenv.lib.optionalString (theme != null) ''
-      asar extract $out/lib/slack/resources/app.asar $out/lib/slack/resources/app.asar.unpacked
-      cat <<EOF >> $out/lib/slack/resources/app.asar.unpacked/dist/ssb-interop.bundle.js
-  
-      var fs = require('fs');
-      document.addEventListener('DOMContentLoaded', function() {
-        fs.readFile('${theme}/theme.css', 'utf8', function(err, css) {
-          let s = document.createElement('style');
-          s.type = 'text/css';
-          s.innerHTML = css;
-          document.head.appendChild(s);
-        });
-      });
-      EOF
-      asar pack $out/lib/slack/resources/app.asar.unpacked $out/lib/slack/resources/app.asar
     '';
   };
 
-  darwin = stdenv.mkDerivation {
-    inherit pname version meta;
+  darwin = stdenv.mkDerivation rec {
+    inherit pname meta;
+    version = "4.4.1";
 
     phases = [ "installPhase" ];
 
diff --git a/pkgs/applications/networking/instant-messengers/slack/update.sh b/pkgs/applications/networking/instant-messengers/slack/update.sh
deleted file mode 100755
index 6a15298c4e7d..000000000000
--- a/pkgs/applications/networking/instant-messengers/slack/update.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl common-updater-scripts jq
-
-set -eu -o pipefail
-
-oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion slack-theme-black" | tr -d '"')"
-latestSha="$(curl -L -s https://api.github.com/repos/laCour/slack-night-mode/commits\?sha\=master\&since\=${oldVersion} | jq -r '.[0].sha')"
-
-if [ ! "null" = "${latestSha}" ]; then
-  latestDate="$(curl -L -s https://api.github.com/repos/laCour/slack-night-mode/commits/${latestSha} | jq '.commit.author.date' | sed 's|"\(.*\)T.*|\1|g')"
-  update-source-version slack-theme-black "${latestSha}" --version-key=rev
-  update-source-version slack-theme-black "${latestDate}" --ignore-same-hash
-  nixpkgs="$(git rev-parse --show-toplevel)"
-  default_nix="$nixpkgs/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix"
-  git add "${default_nix}"
-  git commit -m "slack-theme-black: ${oldVersion} -> ${latestDate}"
-else
-  echo "slack-theme-black is already up-to-date"
-fi

From 9a4358799846d28e5b37fee6c995197e7c9292dc Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Fri, 27 Mar 2020 10:02:00 +0100
Subject: [PATCH 4144/4636] slack-dark: alias to slack

---
 pkgs/top-level/aliases.nix      | 1 +
 pkgs/top-level/all-packages.nix | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 66fa444e0e7a..d1a7543ac15b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -421,6 +421,7 @@ mapAliases ({
   skrooge2 = skrooge; # added 2017-02-18
   skype = skypeforlinux; # added 2017-07-27
   skydive = throw "skydive has been removed from nixpkgs (2019-09-10)";
+  slack-dark = slack; # added 2020-03-27
   slic3r-prusa3d = prusa-slicer; # added 2019-05-21
   slurm-llnl = slurm; # renamed July 2017
   slurm-llnl-full = slurm-full; # renamed July 2017
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3fac637ca8d..783c36cb1fd1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20045,8 +20045,6 @@ in
     });
 
   slack = callPackage ../applications/networking/instant-messengers/slack { };
-  slack-theme-black = callPackage ../applications/networking/instant-messengers/slack/dark-theme.nix { };
-  slack-dark = pkgs.slack.override { theme = slack-theme-black; };
 
   slack-cli = callPackage ../tools/networking/slack-cli { };
 

From 7401afc428799acb19f72028d0914092a978c909 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 27 Mar 2020 14:49:31 +0000
Subject: [PATCH 4145/4636] poetry2nix: 1.6.0 -> 1.6.1

---
 .../tools/poetry2nix/poetry2nix/cli.nix       |   2 -
 .../tools/poetry2nix/poetry2nix/default.nix   | 282 +++++++-------
 .../poetry2nix/poetry2nix/hooks/default.nix   |   1 -
 .../tools/poetry2nix/poetry2nix/lib.nix       | 107 +++---
 .../poetry2nix/poetry2nix/mk-poetry-dep.nix   |  13 +-
 .../tools/poetry2nix/poetry2nix/overrides.nix | 164 ++++----
 .../tools/poetry2nix/poetry2nix/pep425.nix    |   3 -
 .../tools/poetry2nix/poetry2nix/pep508.nix    | 357 +++++++++---------
 .../tools/poetry2nix/poetry2nix/semver.nix    | 109 +++---
 9 files changed, 527 insertions(+), 511 deletions(-)

diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix b/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix
index db85d4ddd3c0..fbcee749b7cd 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix
@@ -2,10 +2,8 @@
 , lib ? pkgs.lib
 , version
 }:
-
 let
   inherit (pkgs) python3;
-
 in
 pkgs.stdenv.mkDerivation {
   pname = "poetry2nix";
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
index 7d3164fcec62..3a104ba6eaa4 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
@@ -7,7 +7,7 @@ let
   inherit (poetryLib) isCompatible readTOML;
 
   # Poetry2nix version
-  version = "1.6.0";
+  version = "1.6.1";
 
   /* The default list of poetry2nix override overlays */
   defaultPoetryOverrides = (import ./overrides.nix { inherit pkgs lib; });
@@ -34,91 +34,94 @@ let
     , overrides ? [ defaultPoetryOverrides ]
     , python ? pkgs.python3
     , pwd ? projectDir
-    }@attrs: let
-      poetryPkg = poetry.override { inherit python; };
+    }@attrs:
+      let
+        poetryPkg = poetry.override { inherit python; };
 
-      pyProject = readTOML pyproject;
-      poetryLock = readTOML poetrylock;
-      lockFiles = lib.getAttrFromPath [ "metadata" "files" ] poetryLock;
+        pyProject = readTOML pyproject;
+        poetryLock = readTOML poetrylock;
+        lockFiles = lib.getAttrFromPath [ "metadata" "files" ] poetryLock;
 
-      specialAttrs = [
-        "overrides"
-        "poetrylock"
-        "pwd"
-      ];
-      passedAttrs = builtins.removeAttrs attrs specialAttrs;
+        specialAttrs = [
+          "overrides"
+          "poetrylock"
+          "projectDir"
+          "pwd"
+        ];
+        passedAttrs = builtins.removeAttrs attrs specialAttrs;
 
-      evalPep508 = mkEvalPep508 python;
+        evalPep508 = mkEvalPep508 python;
 
-      # Filter packages by their PEP508 markers & pyproject interpreter version
-      partitions = let
-        supportsPythonVersion = pkgMeta: if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true;
-      in
-        lib.partition supportsPythonVersion poetryLock.package;
-
-      compatible = partitions.right;
-      incompatible = partitions.wrong;
-
-      # Create an overriden version of pythonPackages
-      #
-      # We need to avoid mixing multiple versions of pythonPackages in the same
-      # closure as python can only ever have one version of a dependency
-      baseOverlay = self: super:
-        let
-          getDep = depName: self.${depName};
-
-          lockPkgs = builtins.listToAttrs (
-            builtins.map (
-              pkgMeta: rec {
-                name = pkgMeta.name;
-                value = self.mkPoetryDep (
-                  pkgMeta // {
-                    inherit pwd;
-                    source = pkgMeta.source or null;
-                    files = lockFiles.${name};
-                    pythonPackages = self;
-                  }
-                );
-              }
-            ) compatible
-          );
+        # Filter packages by their PEP508 markers & pyproject interpreter version
+        partitions = let
+          supportsPythonVersion = pkgMeta: if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true;
         in
-          lockPkgs;
-      overlays = builtins.map getFunctorFn (
-        [
-          (
-            self: super: let
-              hooks = self.callPackage ./hooks {};
-            in
-              {
-                mkPoetryDep = self.callPackage ./mk-poetry-dep.nix {
-                  inherit pkgs lib python poetryLib;
-                };
-                poetry = poetryPkg;
-                # The canonical name is setuptools-scm
-                setuptools-scm = super.setuptools_scm;
+          lib.partition supportsPythonVersion poetryLock.package;
 
-                inherit (hooks) removePathDependenciesHook poetry2nixFixupHook;
-              }
-          )
-          # Null out any filtered packages, we don't want python.pkgs from nixpkgs
-          (self: super: builtins.listToAttrs (builtins.map (x: { name = x.name; value = null; }) incompatible))
-          # Create poetry2nix layer
-          baseOverlay
-        ] ++ # User provided overrides
-        overrides
-      );
+        compatible = partitions.right;
+        incompatible = partitions.wrong;
 
-      packageOverrides = lib.foldr lib.composeExtensions (self: super: {}) overlays;
+        # Create an overriden version of pythonPackages
+        #
+        # We need to avoid mixing multiple versions of pythonPackages in the same
+        # closure as python can only ever have one version of a dependency
+        baseOverlay = self: super:
+          let
+            getDep = depName: self.${depName};
 
-      py = python.override { inherit packageOverrides; self = py; };
-    in
-      {
-        python = py;
-        poetryPackages = map (pkg: py.pkgs.${pkg.name}) compatible;
-        poetryLock = poetryLock;
-        inherit pyProject;
-      };
+            lockPkgs = builtins.listToAttrs (
+              builtins.map (
+                pkgMeta: rec {
+                  name = pkgMeta.name;
+                  value = self.mkPoetryDep (
+                    pkgMeta // {
+                      inherit pwd;
+                      source = pkgMeta.source or null;
+                      files = lockFiles.${name};
+                      pythonPackages = self;
+                    }
+                  );
+                }
+              ) compatible
+            );
+          in
+            lockPkgs;
+        overlays = builtins.map getFunctorFn (
+          [
+            (
+              self: super:
+                let
+                  hooks = self.callPackage ./hooks {};
+                in
+                  {
+                    mkPoetryDep = self.callPackage ./mk-poetry-dep.nix {
+                      inherit pkgs lib python poetryLib;
+                    };
+                    poetry = poetryPkg;
+                    # The canonical name is setuptools-scm
+                    setuptools-scm = super.setuptools_scm;
+
+                    inherit (hooks) removePathDependenciesHook poetry2nixFixupHook;
+                  }
+            )
+            # Null out any filtered packages, we don't want python.pkgs from nixpkgs
+            (self: super: builtins.listToAttrs (builtins.map (x: { name = x.name; value = null; }) incompatible))
+            # Create poetry2nix layer
+            baseOverlay
+          ] ++ # User provided overrides
+          overrides
+        );
+
+        packageOverrides = lib.foldr lib.composeExtensions (self: super: {}) overlays;
+
+        py = python.override { inherit packageOverrides; self = py; };
+      in
+        {
+          python = py;
+          poetryPackages = map (pkg: py.pkgs.${pkg.name}) compatible;
+          poetryLock = poetryLock;
+          inherit pyProject;
+        };
 
   /* Returns a package with a python interpreter and all packages specified in the poetry.lock lock file.
 
@@ -153,76 +156,78 @@ let
     , python ? pkgs.python3
     , pwd ? projectDir
     , ...
-    }@attrs: let
-      poetryPython = mkPoetryPackages {
-        inherit pyproject poetrylock overrides python pwd;
-      };
-      py = poetryPython.python;
+    }@attrs:
+      let
+        poetryPython = mkPoetryPackages {
+          inherit pyproject poetrylock overrides python pwd;
+        };
+        py = poetryPython.python;
 
-      inherit (poetryPython) pyProject;
+        inherit (poetryPython) pyProject;
 
-      specialAttrs = [
-        "overrides"
-        "poetrylock"
-        "pwd"
-        "pyproject"
-      ];
-      passedAttrs = builtins.removeAttrs attrs specialAttrs;
+        specialAttrs = [
+          "overrides"
+          "poetrylock"
+          "projectDir"
+          "pwd"
+          "pyproject"
+        ];
+        passedAttrs = builtins.removeAttrs attrs specialAttrs;
 
-      # Get dependencies and filter out depending on interpreter version
-      getDeps = depAttr: let
-        compat = isCompatible py.pythonVersion;
-        deps = pyProject.tool.poetry.${depAttr} or {};
-        depAttrs = builtins.map (d: lib.toLower d) (builtins.attrNames deps);
-      in
-        builtins.map (
-          dep: let
-            pkg = py.pkgs."${dep}";
-            constraints = deps.${dep}.python or "";
-            isCompat = compat constraints;
+        # Get dependencies and filter out depending on interpreter version
+        getDeps = depAttr:
+          let
+            compat = isCompatible py.pythonVersion;
+            deps = pyProject.tool.poetry.${depAttr} or {};
+            depAttrs = builtins.map (d: lib.toLower d) (builtins.attrNames deps);
           in
-            if isCompat then pkg else null
-        ) depAttrs;
+            builtins.map (
+              dep:
+                let
+                  pkg = py.pkgs."${dep}";
+                  constraints = deps.${dep}.python or "";
+                  isCompat = compat constraints;
+                in
+                  if isCompat then pkg else null
+            ) depAttrs;
 
-      getInputs = attr: attrs.${attr} or [];
-      mkInput = attr: extraInputs: getInputs attr ++ extraInputs;
+        getInputs = attr: attrs.${attr} or [];
+        mkInput = attr: extraInputs: getInputs attr ++ extraInputs;
 
-      buildSystemPkgs = poetryLib.getBuildSystemPkgs {
-        inherit pyProject;
-        pythonPackages = py.pkgs;
-      };
+        buildSystemPkgs = poetryLib.getBuildSystemPkgs {
+          inherit pyProject;
+          pythonPackages = py.pkgs;
+        };
+      in
+        py.pkgs.buildPythonApplication (
+          passedAttrs // {
+            pname = pyProject.tool.poetry.name;
+            version = pyProject.tool.poetry.version;
 
-    in
-      py.pkgs.buildPythonApplication (
-        passedAttrs // {
-          pname = pyProject.tool.poetry.name;
-          version = pyProject.tool.poetry.version;
+            inherit src;
 
-          inherit src;
+            format = "pyproject";
 
-          format = "pyproject";
+            buildInputs = mkInput "buildInputs" buildSystemPkgs;
+            propagatedBuildInputs = mkInput "propagatedBuildInputs" (getDeps "dependencies") ++ ([ py.pkgs.setuptools ]);
+            nativeBuildInputs = mkInput "nativeBuildInputs" [ pkgs.yj py.pkgs.removePathDependenciesHook ];
+            checkInputs = mkInput "checkInputs" (getDeps "dev-dependencies");
 
-          buildInputs = mkInput "buildInputs" buildSystemPkgs;
-          propagatedBuildInputs = mkInput "propagatedBuildInputs" (getDeps "dependencies") ++ ([ py.pkgs.setuptools ]);
-          nativeBuildInputs = mkInput "nativeBuildInputs" [ pkgs.yj py.pkgs.removePathDependenciesHook ];
-          checkInputs = mkInput "checkInputs" (getDeps "dev-dependencies");
+            passthru = {
+              python = py;
+            };
 
-          passthru = {
-            python = py;
-          };
+            meta = meta // {
+              inherit (pyProject.tool.poetry) description homepage;
+              inherit (py.meta) platforms;
+              license = getLicenseBySpdxId (pyProject.tool.poetry.license or "unknown");
+            };
 
-          meta = meta // {
-            inherit (pyProject.tool.poetry) description homepage;
-            inherit (py.meta) platforms;
-            license = getLicenseBySpdxId (pyProject.tool.poetry.license or "unknown");
-          };
-
-        }
-      );
+          }
+        );
 
   /* Poetry2nix CLI used to supplement SHA-256 hashes for git dependencies  */
   cli = import ./cli.nix { inherit pkgs lib version; };
-
 in
 {
   inherit mkPoetryEnv mkPoetryApplication mkPoetryPackages cli version;
@@ -236,11 +241,12 @@ in
   */
   defaultPoetryOverrides = {
     __functor = defaultPoetryOverrides;
-    overrideOverlay = fn: self: super: let
-      defaultSet = defaultPoetryOverrides self super;
-      customSet = fn self super;
-    in
-      defaultSet // customSet;
+    overrideOverlay = fn: self: super:
+      let
+        defaultSet = defaultPoetryOverrides self super;
+        customSet = fn self super;
+      in
+        defaultSet // customSet;
   };
 
   /*
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix
index ec3fa0afa69d..12d2bc962065 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix
@@ -3,7 +3,6 @@
 , makeSetupHook
 , yj
 }:
-
 let
   pythonInterpreter = python.pythonForBuild.interpreter;
 in
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
index b816feb38e89..f4497afb8bc9 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix
@@ -9,29 +9,30 @@ let
   );
 
   # Compare a semver expression with a version
-  isCompatible = version: let
-    operators = {
-      "||" = cond1: cond2: cond1 || cond2;
-      "," = cond1: cond2: cond1 && cond2; # , means &&
-      "&&" = cond1: cond2: cond1 && cond2;
-    };
-    splitRe = "(" + (builtins.concatStringsSep "|" (builtins.map (x: lib.replaceStrings [ "|" ] [ "\\|" ] x) (lib.attrNames operators))) + ")";
-  in
-    expr:
-      let
-        tokens = builtins.filter (x: x != "") (builtins.split splitRe expr);
-        combine = acc: v:
-          let
-            isOperator = builtins.typeOf v == "list";
-            operator = if isOperator then (builtins.elemAt v 0) else acc.operator;
-          in
-            if isOperator then (acc // { inherit operator; }) else {
-              inherit operator;
-              state = operators."${operator}" acc.state (satisfiesSemver version v);
-            };
-        initial = { operator = "&&"; state = true; };
-      in
-        if expr == "" then true else (builtins.foldl' combine initial tokens).state;
+  isCompatible = version:
+    let
+      operators = {
+        "||" = cond1: cond2: cond1 || cond2;
+        "," = cond1: cond2: cond1 && cond2; # , means &&
+        "&&" = cond1: cond2: cond1 && cond2;
+      };
+      splitRe = "(" + (builtins.concatStringsSep "|" (builtins.map (x: lib.replaceStrings [ "|" ] [ "\\|" ] x) (lib.attrNames operators))) + ")";
+    in
+      expr:
+        let
+          tokens = builtins.filter (x: x != "") (builtins.split splitRe expr);
+          combine = acc: v:
+            let
+              isOperator = builtins.typeOf v == "list";
+              operator = if isOperator then (builtins.elemAt v 0) else acc.operator;
+            in
+              if isOperator then (acc // { inherit operator; }) else {
+                inherit operator;
+                state = operators."${operator}" acc.state (satisfiesSemver version v);
+              };
+          initial = { operator = "&&"; state = true; };
+        in
+          if expr == "" then true else (builtins.foldl' combine initial tokens).state;
 
   fromTOML = builtins.fromTOML or
     (
@@ -88,23 +89,25 @@ let
   getBuildSystemPkgs =
     { pythonPackages
     , pyProject
-    }: let
-      buildSystem = lib.getAttrFromPath [ "build-system" "build-backend" ] pyProject;
-      drvAttr = builtins.elemAt (builtins.split "\\.|:" buildSystem) 0;
-    in
-      if buildSystem == "" then [] else (
-        [ pythonPackages.${drvAttr} or (throw "unsupported build system ${buildSystem}") ]
-      );
+    }:
+      let
+        buildSystem = lib.getAttrFromPath [ "build-system" "build-backend" ] pyProject;
+        drvAttr = builtins.elemAt (builtins.split "\\.|:" buildSystem) 0;
+      in
+        if buildSystem == "" then [] else (
+          [ pythonPackages.${drvAttr} or (throw "unsupported build system ${buildSystem}") ]
+        );
 
   # Find gitignore files recursively in parent directory stopping with .git
-  findGitIgnores = path: let
-    parent = path + "/..";
-    gitIgnore = path + "/.gitignore";
-    isGitRoot = builtins.pathExists (path + "/.git");
-    hasGitIgnore = builtins.pathExists gitIgnore;
-    gitIgnores = if hasGitIgnore then [ gitIgnore ] else [];
-  in
-    lib.optionals (builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores;
+  findGitIgnores = path:
+    let
+      parent = path + "/..";
+      gitIgnore = path + "/.gitignore";
+      isGitRoot = builtins.pathExists (path + "/.git");
+      hasGitIgnore = builtins.pathExists gitIgnore;
+      gitIgnores = if hasGitIgnore then [ gitIgnore ] else [];
+    in
+      lib.optionals (builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores;
 
   /*
   Provides a source filtering mechanism that:
@@ -113,21 +116,21 @@ let
   - Filters pycache/pyc files
   - Uses cleanSourceFilter to filter out .git/.hg, .o/.so, editor backup files & nix result symlinks
   */
-  cleanPythonSources = { src }: let
-    gitIgnores = findGitIgnores src;
-    pycacheFilter = name: type:
-      (type == "directory" && ! lib.strings.hasInfix "__pycache__" name)
-      || (type == "regular" && ! lib.strings.hasSuffix ".pyc" name)
-    ;
-  in
-    lib.cleanSourceWith {
-      filter = lib.cleanSourceFilter;
-      src = lib.cleanSourceWith {
-        filter = pkgs.nix-gitignore.gitignoreFilterPure pycacheFilter gitIgnores src;
-        inherit src;
+  cleanPythonSources = { src }:
+    let
+      gitIgnores = findGitIgnores src;
+      pycacheFilter = name: type:
+        (type == "directory" && ! lib.strings.hasInfix "__pycache__" name)
+        || (type == "regular" && ! lib.strings.hasSuffix ".pyc" name)
+      ;
+    in
+      lib.cleanSourceWith {
+        filter = lib.cleanSourceFilter;
+        src = lib.cleanSourceWith {
+          filter = pkgs.nix-gitignore.gitignoreFilterPure pycacheFilter gitIgnores src;
+          inherit src;
+        };
       };
-    };
-
 in
 {
   inherit
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
index 5ae35dfed49e..5f66d24d685c 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
@@ -22,9 +22,7 @@ pythonPackages.callPackage (
   { preferWheel ? false
   , ...
   }@args:
-
     let
-
       inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromPypi;
 
       inherit (import ./pep425.nix {
@@ -68,7 +66,6 @@ pythonPackages.callPackage (
         lockFileEntry = builtins.head entries;
 
         _isEgg = isEgg lockFileEntry;
-
       in
         rec {
           inherit (lockFileEntry) file hash;
@@ -92,7 +89,6 @@ pythonPackages.callPackage (
       baseBuildInputs = lib.optional (! lib.elem name skipSetupToolsSCM) pythonPackages.setuptools-scm;
 
       format = if isLocal then "pyproject" else if isGit then "setuptools" else fileInfo.format;
-
     in
 
       buildPythonPackage {
@@ -123,10 +119,11 @@ pythonPackages.callPackage (
           compat = isCompatible python.pythonVersion;
           deps = lib.filterAttrs (n: v: v) (
             lib.mapAttrs (
-              n: v: let
-                constraints = v.python or "";
-              in
-                compat constraints
+              n: v:
+                let
+                  constraints = v.python or "";
+                in
+                  compat constraints
             ) dependencies
           );
           depAttrs = lib.attrNames deps;
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
index 9eb3f92bd12b..18afac8147ce 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
@@ -195,39 +195,39 @@ self: super:
   );
 
   matplotlib = super.matplotlib.overrideAttrs (
-    old: let
-      enableGhostscript = old.passthru.enableGhostscript or false;
-      enableGtk3 = old.passthru.enableTk or false;
-      enableQt = old.passthru.enableQt or false;
-      enableTk = old.passthru.enableTk or false;
+    old:
+      let
+        enableGhostscript = old.passthru.enableGhostscript or false;
+        enableGtk3 = old.passthru.enableTk or false;
+        enableQt = old.passthru.enableQt or false;
+        enableTk = old.passthru.enableTk or false;
 
-      inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
+        inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
+      in
+        {
+          NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1";
 
-    in
-      {
-        NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1";
+          XDG_RUNTIME_DIR = "/tmp";
 
-        XDG_RUNTIME_DIR = "/tmp";
+          buildInputs = old.buildInputs
+          ++ lib.optional enableGhostscript pkgs.ghostscript
+          ++ lib.optional stdenv.isDarwin [ Cocoa ];
 
-        buildInputs = old.buildInputs
-        ++ lib.optional enableGhostscript pkgs.ghostscript
-        ++ lib.optional stdenv.isDarwin [ Cocoa ];
+          nativeBuildInputs = old.nativeBuildInputs ++ [
+            pkgs.pkgconfig
+          ];
 
-        nativeBuildInputs = old.nativeBuildInputs ++ [
-          pkgs.pkgconfig
-        ];
+          propagatedBuildInputs = old.propagatedBuildInputs ++ [
+            pkgs.libpng
+            pkgs.freetype
+          ]
+          ++ stdenv.lib.optionals enableGtk3 [ pkgs.cairo self.pycairo pkgs.gtk3 pkgs.gobject-introspection self.pygobject3 ]
+          ++ stdenv.lib.optionals enableTk [ pkgs.tcl pkgs.tk self.tkinter pkgs.libX11 ]
+          ++ stdenv.lib.optionals enableQt [ self.pyqt5 ]
+          ;
 
-        propagatedBuildInputs = old.propagatedBuildInputs ++ [
-          pkgs.libpng
-          pkgs.freetype
-        ]
-        ++ stdenv.lib.optionals enableGtk3 [ pkgs.cairo self.pycairo pkgs.gtk3 pkgs.gobject-introspection self.pygobject3 ]
-        ++ stdenv.lib.optionals enableTk [ pkgs.tcl pkgs.tk self.tkinter pkgs.libX11 ]
-        ++ stdenv.lib.optionals enableQt [ self.pyqt5 ]
-        ;
-
-        inherit (super.matplotlib) patches;
-      }
+          inherit (super.matplotlib) patches;
+        }
   );
 
   # Calls Cargo at build time for source builds and is really tricky to package
@@ -266,36 +266,37 @@ self: super:
   );
 
   numpy = super.numpy.overrideAttrs (
-    old: let
-      blas = old.passthru.args.blas or pkgs.openblasCompat;
-      blasImplementation = lib.nameFromURL blas.name "-";
-      cfg = pkgs.writeTextFile {
-        name = "site.cfg";
-        text = (
-          lib.generators.toINI {} {
-            ${blasImplementation} = {
-              include_dirs = "${blas}/include";
-              library_dirs = "${blas}/lib";
-            } // lib.optionalAttrs (blasImplementation == "mkl") {
-              mkl_libs = "mkl_rt";
-              lapack_libs = "";
-            };
-          }
-        );
-      };
-    in
-      {
-        nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ];
-        buildInputs = old.buildInputs ++ [ blas self.cython ];
-        enableParallelBuilding = true;
-        preBuild = ''
-          ln -s ${cfg} site.cfg
-        '';
-        passthru = old.passthru // {
-          blas = blas;
-          inherit blasImplementation cfg;
+    old:
+      let
+        blas = old.passthru.args.blas or pkgs.openblasCompat;
+        blasImplementation = lib.nameFromURL blas.name "-";
+        cfg = pkgs.writeTextFile {
+          name = "site.cfg";
+          text = (
+            lib.generators.toINI {} {
+              ${blasImplementation} = {
+                include_dirs = "${blas}/include";
+                library_dirs = "${blas}/lib";
+              } // lib.optionalAttrs (blasImplementation == "mkl") {
+                mkl_libs = "mkl_rt";
+                lapack_libs = "";
+              };
+            }
+          );
         };
-      }
+      in
+        {
+          nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ];
+          buildInputs = old.buildInputs ++ [ blas self.cython ];
+          enableParallelBuilding = true;
+          preBuild = ''
+            ln -s ${cfg} site.cfg
+          '';
+          passthru = old.passthru // {
+            blas = blas;
+            inherit blasImplementation cfg;
+          };
+        }
   );
 
   openexr = super.openexr.overrideAttrs (
@@ -306,16 +307,17 @@ self: super:
   );
 
   peewee = super.peewee.overridePythonAttrs (
-    old: let
-      withPostgres = old.passthru.withPostgres or false;
-      withMysql = old.passthru.withMysql or false;
-    in
-      {
-        buildInputs = old.buildInputs ++ [ self.cython pkgs.sqlite ];
-        propagatedBuildInputs = old.propagatedBuildInputs
-        ++ lib.optional withPostgres self.psycopg2
-        ++ lib.optional withMysql self.mysql-connector;
-      }
+    old:
+      let
+        withPostgres = old.passthru.withPostgres or false;
+        withMysql = old.passthru.withMysql or false;
+      in
+        {
+          buildInputs = old.buildInputs ++ [ self.cython pkgs.sqlite ];
+          propagatedBuildInputs = old.propagatedBuildInputs
+          ++ lib.optional withPostgres self.psycopg2
+          ++ lib.optional withMysql self.mysql-connector;
+        }
   );
 
   pillow = super.pillow.overrideAttrs (
@@ -667,16 +669,24 @@ self: super:
   );
 
   zipp =
-    if lib.versionAtLeast super.zipp.version "2.0.0" then (
-      super.zipp.overridePythonAttrs (
-        old: {
-          prePatch = ''
-            substituteInPlace setup.py --replace \
-            'setuptools.setup()' \
-            'setuptools.setup(version="${super.zipp.version}")'
-          '';
-        }
-      )
-    ) else super.zipp;
+    (
+      if lib.versionAtLeast super.zipp.version "2.0.0" then (
+        super.zipp.overridePythonAttrs (
+          old: {
+            prePatch = ''
+              substituteInPlace setup.py --replace \
+              'setuptools.setup()' \
+              'setuptools.setup(version="${super.zipp.version}")'
+            '';
+          }
+        )
+      ) else super.zipp
+    ).overridePythonAttrs (
+      old: {
+        propagatedBuildInputs = old.propagatedBuildInputs ++ [
+          self.toml
+        ];
+      }
+    );
 
 }
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
index b2e11205c36c..cda4e8c78d4d 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix
@@ -1,5 +1,4 @@
 { lib, stdenv, python, isLinux ? stdenv.isLinux }:
-
 let
   inherit (lib.strings) hasSuffix hasInfix splitString removeSuffix;
 
@@ -94,12 +93,10 @@ let
           if isLinux
           then chooseLinux files
           else chooseOSX files;
-
     in
       if (builtins.length filtered == 0)
       then []
       else choose (filtered);
-
 in
 {
   inherit selectWheel toWheelAttrs isPyVersionCompatible;
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
index ae0c29f36838..67ffdddb4bd8 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix
@@ -1,5 +1,4 @@
 { lib, stdenv, poetryLib }: python:
-
 let
   inherit (poetryLib) ireplace;
 
@@ -37,195 +36,199 @@ let
   );
 
   # Make a tree out of expression groups (parens)
-  findSubExpressions = expr: let
-    acc = builtins.foldl' findSubExpressionsFun {
-      exprs = [];
-      expr = expr;
-      pos = 0;
-      openP = 0;
-      exprPos = 0;
-      startPos = 0;
-    } (lib.stringToCharacters expr);
-    tailExpr = (substr acc.exprPos acc.pos expr);
-    tailExprs = if tailExpr != "" then [ tailExpr ] else [];
-  in
-    acc.exprs ++ tailExprs;
+  findSubExpressions = expr:
+    let
+      acc = builtins.foldl' findSubExpressionsFun {
+        exprs = [];
+        expr = expr;
+        pos = 0;
+        openP = 0;
+        exprPos = 0;
+        startPos = 0;
+      } (lib.stringToCharacters expr);
+      tailExpr = (substr acc.exprPos acc.pos expr);
+      tailExprs = if tailExpr != "" then [ tailExpr ] else [];
+    in
+      acc.exprs ++ tailExprs;
 
-  parseExpressions = exprs: let
-    splitCond = (
-      s: builtins.map
-        (x: stripStr (if builtins.typeOf x == "list" then (builtins.elemAt x 0) else x))
-        (builtins.split " (and|or) " (s + " "))
-    );
+  parseExpressions = exprs:
+    let
+      splitCond = (
+        s: builtins.map
+          (x: stripStr (if builtins.typeOf x == "list" then (builtins.elemAt x 0) else x))
+          (builtins.split " (and|or) " (s + " "))
+      );
 
-    mapfn = expr: (
-      if (builtins.match "^ ?$" expr != null) then null  # Filter empty
-      else if (builtins.elem expr [ "and" "or" ]) then {
-        type = "bool";
-        value = expr;
-      }
-      else {
-        type = "expr";
-        value = expr;
-      }
-    );
+      mapfn = expr: (
+        if (builtins.match "^ ?$" expr != null) then null  # Filter empty
+        else if (builtins.elem expr [ "and" "or" ]) then {
+          type = "bool";
+          value = expr;
+        }
+        else {
+          type = "expr";
+          value = expr;
+        }
+      );
 
-    parse = expr: builtins.filter (x: x != null) (builtins.map mapfn (splitCond expr));
-
-  in
-    builtins.foldl' (
-      acc: v: acc ++ (
-        if builtins.typeOf v == "string" then parse v else [ (parseExpressions v) ]
-      )
-    ) [] exprs;
+      parse = expr: builtins.filter (x: x != null) (builtins.map mapfn (splitCond expr));
+    in
+      builtins.foldl' (
+        acc: v: acc ++ (
+          if builtins.typeOf v == "string" then parse v else [ (parseExpressions v) ]
+        )
+      ) [] exprs;
 
   # Transform individual expressions to structured expressions
   # This function also performs variable substitution, replacing environment markers with their explicit values
-  transformExpressions = exprs: let
-    variables = {
-      os_name = (
-        if python.pname == "jython" then "java"
-        else "posix"
-      );
-      sys_platform = (
-        if stdenv.isLinux then "linux"
-        else if stdenv.isDarwin then "darwin"
-        else throw "Unsupported platform"
-      );
-      platform_machine = stdenv.platform.kernelArch;
-      platform_python_implementation = let
-        impl = python.passthru.implementation;
-      in
-        (
-          if impl == "cpython" then "CPython"
-          else if impl == "pypy" then "PyPy"
-          else throw "Unsupported implementation ${impl}"
+  transformExpressions = exprs:
+    let
+      variables = {
+        os_name = (
+          if python.pname == "jython" then "java"
+          else "posix"
         );
-      platform_release = ""; # Field not reproducible
-      platform_system = (
-        if stdenv.isLinux then "Linux"
-        else if stdenv.isDarwin then "Darwin"
-        else throw "Unsupported platform"
-      );
-      platform_version = ""; # Field not reproducible
-      python_version = python.passthru.pythonVersion;
-      python_full_version = python.version;
-      implementation_name = python.implementation;
-      implementation_version = python.version;
-      extra = "";
-    };
-
-    substituteVar = value: if builtins.hasAttr value variables then (builtins.toJSON variables."${value}") else value;
-
-    processVar = value: builtins.foldl' (acc: v: v acc) value [
-      stripStr
-      substituteVar
-    ];
-
-  in
-    if builtins.typeOf exprs == "set" then (
-      if exprs.type == "expr" then (
-        let
-          mVal = ''[a-zA-Z0-9\'"_\. ]+'';
-          mOp = "in|[!=<>]+";
-          e = stripStr exprs.value;
-          m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e);
+        sys_platform = (
+          if stdenv.isLinux then "linux"
+          else if stdenv.isDarwin then "darwin"
+          else throw "Unsupported platform"
+        );
+        platform_machine = stdenv.platform.kernelArch;
+        platform_python_implementation = let
+          impl = python.passthru.implementation;
         in
-          {
-            type = "expr";
-            value = {
-              op = builtins.elemAt m 1;
-              values = [
-                (processVar (builtins.elemAt m 0))
-                (processVar (builtins.elemAt m 2))
-              ];
-            };
-          }
-      ) else exprs
-    ) else builtins.map transformExpressions exprs;
+          (
+            if impl == "cpython" then "CPython"
+            else if impl == "pypy" then "PyPy"
+            else throw "Unsupported implementation ${impl}"
+          );
+        platform_release = ""; # Field not reproducible
+        platform_system = (
+          if stdenv.isLinux then "Linux"
+          else if stdenv.isDarwin then "Darwin"
+          else throw "Unsupported platform"
+        );
+        platform_version = ""; # Field not reproducible
+        python_version = python.passthru.pythonVersion;
+        python_full_version = python.version;
+        implementation_name = python.implementation;
+        implementation_version = python.version;
+        extra = "";
+      };
+
+      substituteVar = value: if builtins.hasAttr value variables then (builtins.toJSON variables."${value}") else value;
+
+      processVar = value: builtins.foldl' (acc: v: v acc) value [
+        stripStr
+        substituteVar
+      ];
+    in
+      if builtins.typeOf exprs == "set" then (
+        if exprs.type == "expr" then (
+          let
+            mVal = ''[a-zA-Z0-9\'"_\. ]+'';
+            mOp = "in|[!=<>]+";
+            e = stripStr exprs.value;
+            m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e);
+          in
+            {
+              type = "expr";
+              value = {
+                op = builtins.elemAt m 1;
+                values = [
+                  (processVar (builtins.elemAt m 0))
+                  (processVar (builtins.elemAt m 2))
+                ];
+              };
+            }
+        ) else exprs
+      ) else builtins.map transformExpressions exprs;
 
   # Recursively eval all expressions
-  evalExpressions = exprs: let
-    unmarshal = v: (
-      # TODO: Handle single quoted values
-      if v == "True" then true
-      else if v == "False" then false
-      else builtins.fromJSON v
-    );
-    hasElem = needle: haystack: builtins.elem needle (builtins.filter (x: builtins.typeOf x == "string") (builtins.split " " haystack));
-    op = {
-      "<=" = x: y: (unmarshal x) <= (unmarshal y);
-      "<" = x: y: (unmarshal x) < (unmarshal y);
-      "!=" = x: y: x != y;
-      "==" = x: y: x == y;
-      ">=" = x: y: (unmarshal x) >= (unmarshal y);
-      ">" = x: y: (unmarshal x) > (unmarshal y);
-      "~=" = v: c: let
-        parts = builtins.splitVersion c;
-        pruned = lib.take ((builtins.length parts) - 1) parts;
-        upper = builtins.toString (
-          (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1
-        );
-        upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned);
-      in
-        op.">=" v c && op."<" v upperConstraint;
-      "===" = x: y: x == y;
-      "in" = x: y: let
-        values = builtins.filter (x: builtins.typeOf x == "string") (builtins.split " " (unmarshal y));
-      in
-        builtins.elem (unmarshal x) values;
-    };
-  in
-    if builtins.typeOf exprs == "set" then (
-      if exprs.type == "expr" then (
-        let
-          expr = exprs;
-          result = (op."${expr.value.op}") (builtins.elemAt expr.value.values 0) (builtins.elemAt expr.value.values 1);
-        in
-          {
-            type = "value";
-            value = result;
-          }
-      ) else exprs
-    ) else builtins.map evalExpressions exprs;
+  evalExpressions = exprs:
+    let
+      unmarshal = v: (
+        # TODO: Handle single quoted values
+        if v == "True" then true
+        else if v == "False" then false
+        else builtins.fromJSON v
+      );
+      hasElem = needle: haystack: builtins.elem needle (builtins.filter (x: builtins.typeOf x == "string") (builtins.split " " haystack));
+      op = {
+        "<=" = x: y: (unmarshal x) <= (unmarshal y);
+        "<" = x: y: (unmarshal x) < (unmarshal y);
+        "!=" = x: y: x != y;
+        "==" = x: y: x == y;
+        ">=" = x: y: (unmarshal x) >= (unmarshal y);
+        ">" = x: y: (unmarshal x) > (unmarshal y);
+        "~=" = v: c:
+          let
+            parts = builtins.splitVersion c;
+            pruned = lib.take ((builtins.length parts) - 1) parts;
+            upper = builtins.toString (
+              (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1
+            );
+            upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned);
+          in
+            op.">=" v c && op."<" v upperConstraint;
+        "===" = x: y: x == y;
+        "in" = x: y:
+          let
+            values = builtins.filter (x: builtins.typeOf x == "string") (builtins.split " " (unmarshal y));
+          in
+            builtins.elem (unmarshal x) values;
+      };
+    in
+      if builtins.typeOf exprs == "set" then (
+        if exprs.type == "expr" then (
+          let
+            expr = exprs;
+            result = (op."${expr.value.op}") (builtins.elemAt expr.value.values 0) (builtins.elemAt expr.value.values 1);
+          in
+            {
+              type = "value";
+              value = result;
+            }
+        ) else exprs
+      ) else builtins.map evalExpressions exprs;
 
   # Now that we have performed an eval all that's left to do is to concat the graph into a single bool
-  reduceExpressions = exprs: let
-    cond = {
-      "and" = x: y: x && y;
-      "or" = x: y: x || y;
-    };
-    reduceExpressionsFun = acc: v: (
-      if builtins.typeOf v == "set" then (
-        if v.type == "value" then (
-          acc // {
-            value = cond."${acc.cond}" acc.value v.value;
-          }
-        ) else if v.type == "bool" then (
-          acc // {
-            cond = v.value;
-          }
+  reduceExpressions = exprs:
+    let
+      cond = {
+        "and" = x: y: x && y;
+        "or" = x: y: x || y;
+      };
+      reduceExpressionsFun = acc: v: (
+        if builtins.typeOf v == "set" then (
+          if v.type == "value" then (
+            acc // {
+              value = cond."${acc.cond}" acc.value v.value;
+            }
+          ) else if v.type == "bool" then (
+            acc // {
+              cond = v.value;
+            }
+          ) else throw "Unsupported type"
+        ) else if builtins.typeOf v == "list" then (
+          let
+            ret = builtins.foldl' reduceExpressionsFun {
+              value = true;
+              cond = "and";
+            } v;
+          in
+            acc // {
+              value = cond."${acc.cond}" acc.value ret.value;
+            }
         ) else throw "Unsupported type"
-      ) else if builtins.typeOf v == "list" then (
-        let
-          ret = builtins.foldl' reduceExpressionsFun {
-            value = true;
-            cond = "and";
-          } v;
-        in
-          acc // {
-            value = cond."${acc.cond}" acc.value ret.value;
-          }
-      ) else throw "Unsupported type"
-    );
-  in
-    (
-      builtins.foldl' reduceExpressionsFun {
-        value = true;
-        cond = "and";
-      } exprs
-    ).value;
-
+      );
+    in
+      (
+        builtins.foldl' reduceExpressionsFun {
+          value = true;
+          cond = "and";
+        } exprs
+      ).value;
 in
 e: builtins.foldl' (acc: v: v acc) e [
   findSubExpressions
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix b/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix
index 784589a4ca48..07dcbbc5eacb 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix
@@ -1,26 +1,27 @@
 { lib, ireplace }:
-
 let
   inherit (builtins) elemAt match;
 
   operators = let
     matchWildCard = s: match "([^\*])(\.[\*])" s;
     mkComparison = ret: version: v: builtins.compareVersions version v == ret;
-    mkIdxComparison = idx: version: v: let
-      ver = builtins.splitVersion v;
-      minor = builtins.toString (lib.toInt (elemAt ver idx) + 1);
-      upper = builtins.concatStringsSep "." (ireplace idx minor ver);
-    in
-      operators.">=" version v && operators."<" version upper;
-    dropWildcardPrecision = f: version: constraint: let
-      m = matchWildCard constraint;
-      hasWildcard = m != null;
-      c = if hasWildcard then (elemAt m 0) else constraint;
-      v =
-        if hasWildcard then (builtins.substring 0 (builtins.stringLength c) version)
-        else version;
-    in
-      f v c;
+    mkIdxComparison = idx: version: v:
+      let
+        ver = builtins.splitVersion v;
+        minor = builtins.toString (lib.toInt (elemAt ver idx) + 1);
+        upper = builtins.concatStringsSep "." (ireplace idx minor ver);
+      in
+        operators.">=" version v && operators."<" version upper;
+    dropWildcardPrecision = f: version: constraint:
+      let
+        m = matchWildCard constraint;
+        hasWildcard = m != null;
+        c = if hasWildcard then (elemAt m 0) else constraint;
+        v =
+          if hasWildcard then (builtins.substring 0 (builtins.stringLength c) version)
+          else version;
+      in
+        f v c;
   in
     {
       # Prefix operators
@@ -33,16 +34,17 @@ let
       # Semver specific operators
       "~" = mkIdxComparison 1;
       "^" = mkIdxComparison 0;
-      "~=" = v: c: let
-        # Prune constraint
-        parts = builtins.splitVersion c;
-        pruned = lib.take ((builtins.length parts) - 1) parts;
-        upper = builtins.toString (
-          (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1
-        );
-        upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned);
-      in
-        operators.">=" v c && operators."<" v upperConstraint;
+      "~=" = v: c:
+        let
+          # Prune constraint
+          parts = builtins.splitVersion c;
+          pruned = lib.take ((builtins.length parts) - 1) parts;
+          upper = builtins.toString (
+            (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1
+          );
+          upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned);
+        in
+          operators.">=" v c && operators."<" v upperConstraint;
       # Infix operators
       "-" = version: v: operators.">=" version v.vl && operators."<=" version v.vu;
       # Arbitrary equality clause, just run simple comparison
@@ -55,33 +57,34 @@ let
     version = "([0-9\.\*x]+)";
   };
 
-  parseConstraint = constraint: let
-    constraintStr = builtins.replaceStrings [ " " ] [ "" ] constraint;
-    # The common prefix operators
-    mPre = match "${re.operators} *${re.version}" constraintStr;
-    # There is also an infix operator to match ranges
-    mIn = match "${re.version} *(-) *${re.version}" constraintStr;
-  in
-    (
-      if mPre != null then {
-        op = elemAt mPre 0;
-        v = elemAt mPre 1;
-      }
-        # Infix operators are range matches
-      else if mIn != null then {
-        op = elemAt mIn 1;
-        v = {
-          vl = (elemAt mIn 0);
-          vu = (elemAt mIn 2);
-        };
-      }
-      else throw "Constraint \"${constraintStr}\" could not be parsed"
-    );
-
-  satisfiesSemver = version: constraint: let
-    inherit (parseConstraint constraint) op v;
-  in
-    if constraint == "*" then true else operators."${op}" version v;
+  parseConstraint = constraint:
+    let
+      constraintStr = builtins.replaceStrings [ " " ] [ "" ] constraint;
+      # The common prefix operators
+      mPre = match "${re.operators} *${re.version}" constraintStr;
+      # There is also an infix operator to match ranges
+      mIn = match "${re.version} *(-) *${re.version}" constraintStr;
+    in
+      (
+        if mPre != null then {
+          op = elemAt mPre 0;
+          v = elemAt mPre 1;
+        }
+          # Infix operators are range matches
+        else if mIn != null then {
+          op = elemAt mIn 1;
+          v = {
+            vl = (elemAt mIn 0);
+            vu = (elemAt mIn 2);
+          };
+        }
+        else throw "Constraint \"${constraintStr}\" could not be parsed"
+      );
 
+  satisfiesSemver = version: constraint:
+    let
+      inherit (parseConstraint constraint) op v;
+    in
+      if constraint == "*" then true else operators."${op}" version v;
 in
 { inherit satisfiesSemver; }

From 7cc024b59e03b33de0a073f9205f47dc18029bde Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Thu, 26 Mar 2020 06:11:20 +0000
Subject: [PATCH 4146/4636] vimPlugins: Automatic rename deprecations

When an updated redirect results in a package name change, not just an
owner change, throw an error to warn users the package names has
changed.
---
 pkgs/misc/vim-plugins/aliases.nix     | 15 ++++++---------
 pkgs/misc/vim-plugins/deprecated.json |  6 ++++++
 pkgs/misc/vim-plugins/update.py       | 23 +++++++++++++++--------
 3 files changed, 27 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/misc/vim-plugins/deprecated.json

diff --git a/pkgs/misc/vim-plugins/aliases.nix b/pkgs/misc/vim-plugins/aliases.nix
index 627008a2aebf..645b8db7db44 100644
--- a/pkgs/misc/vim-plugins/aliases.nix
+++ b/pkgs/misc/vim-plugins/aliases.nix
@@ -31,11 +31,12 @@ let
                               (checkInPkgs n alias)))
                      aliases;
 
-  deprecateName = oldName: newName:
-    throw "${oldName} was renamed to ${newName}. Please update to ${newName}.";
-in
+  deprecations = lib.mapAttrs (old: new:
+    throw "${old} was renamed to ${new}. Please update to ${new}."
+  ) (builtins.fromJSON (builtins.readFile ./deprecated.json));
 
-mapAliases {
+in
+mapAliases ({
   airline             = vim-airline;
   alternative         = a-vim; # backwards compat, added 2014-10-21
   bats                = bats-vim;
@@ -71,7 +72,6 @@ mapAliases {
   ghcmod              = ghcmod-vim;
   goyo                = goyo-vim;
   Gist                = vim-gist;
-  gist-vim            = deprecateName "vim-gist" "gist-vim"; # backwards compat, added 2020-3-22
   gitgutter           = vim-gitgutter;
   gundo               = gundo-vim;
   Gundo               = gundo-vim; # backwards compat, added 2015-10-03
@@ -129,17 +129,14 @@ mapAliases {
   unite               = unite-vim;
   UltiSnips           = ultisnips;
   vim-addon-vim2nix   = vim2nix;
-  vim-jade            = deprecateName "vim-pug" "vim-jade"; # backwards compat, added 2020-3-22
   vimproc             = vimproc-vim;
   vimshell            = vimshell-vim;
   vinegar             = vim-vinegar;
-  vundle              = deprecateName "Vundle-vim" "vundle"; # backwards compat, added 2020-3-22
   watchdogs           = vim-watchdogs;
   WebAPI              = webapi-vim;
   wombat256           = wombat256-vim; # backwards compat, added 2015-7-8
   yankring            = YankRing-vim;
   Yankring            = YankRing-vim;
-  youcompleteme       = deprecateName "YouCompleteMe" "youcompleteme"; # backwards compat, added 2020-3-22
   xterm-color-table   = xterm-color-table-vim;
   zeavim              = zeavim-vim;
-}
+} // deprecations)
diff --git a/pkgs/misc/vim-plugins/deprecated.json b/pkgs/misc/vim-plugins/deprecated.json
new file mode 100644
index 000000000000..bb4ad18c3ecd
--- /dev/null
+++ b/pkgs/misc/vim-plugins/deprecated.json
@@ -0,0 +1,6 @@
+{
+    "gist-vim": "vim-gist",
+    "vim-jade": "vim-pug",
+    "vundle": "Vundle.vim",
+    "youcompleteme": "YouCompleteMe"
+}
\ No newline at end of file
diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
index ac959f055b48..d513669d0f32 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/misc/vim-plugins/update.py
@@ -34,6 +34,7 @@ ATOM_UPDATED = "{http://www.w3.org/2005/Atom}updated"  # "
 ROOT = Path(__file__).parent
 DEFAULT_IN = ROOT.joinpath("vim-plugin-names")
 DEFAULT_OUT = ROOT.joinpath("generated.nix")
+DEPRECATED = ROOT.joinpath("deprecated.json")
 
 import time
 from functools import wraps
@@ -130,9 +131,6 @@ class Repo:
             new_plugin = plugin_line.format(owner=new_owner, name=new_name)
             self.redirect[old_plugin] = new_plugin
 
-            if new_name != self.name:
-                print(f"Plugin Name Changed: {self.name} -> {new_name}")
-
     def prefetch_git(self, ref: str) -> str:
         data = subprocess.check_output(
             ["nix-prefetch-git", "--fetch-submodules", self.url(""), ref]
@@ -421,6 +419,17 @@ def rewrite_input(input_file: Path, output_file: Path, redirects: dict):
 
     if redirects:
         lines = [redirects.get(line, line) for line in lines]
+
+        with open(DEPRECATED, "r") as f:
+            deprecations = json.load(f)
+        for old, new in redirects.items():
+            old_name = old.split("/")[1].split(" ")[0].strip("\n")
+            new_name = new.split("/")[1].split(" ")[0].strip("\n")
+            if old_name != new_name:
+                deprecations[old_name] = new_name
+        with open(DEPRECATED, "w") as f:
+            json.dump(deprecations, f, indent=4, sort_keys=True)
+
         print(
             f"""\
 Redirects have been detected and {input_file} has been updated. Please take the
@@ -428,13 +437,11 @@ following steps:
     1. Go ahead and commit just the updated expressions as you intended to do:
             git add {output_file}
             git commit -m "vimPlugins: Update"
-    2. If any of the plugin names were changed, throw an error in aliases.nix:
-            <oldName> = deprecateName "<oldName>" "<newName>"; # backwards compat, added YYYY-MM-DD
-    3. Run this script again so these changes will be reflected in the
+    2. Run this script again so these changes will be reflected in the
     generated expressions:
             ./update.py
-    4. Commit {input_file} along with aliases and generated expressions:
-            git add {output_file} {input_file} aliases.nix
+    3. Commit {input_file} along with deprecations and generated expressions:
+            git add {output_file} {input_file} {DEPRECATED}
             git commit -m "vimPlugins: Update redirects"
         """
         )

From 25fea4538e475fdec31ff7692778ff315059efb3 Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Fri, 27 Mar 2020 15:38:16 +0000
Subject: [PATCH 4147/4636] vimPlugins: Store deprecation date.

---
 pkgs/misc/vim-plugins/aliases.nix     |  4 ++--
 pkgs/misc/vim-plugins/deprecated.json | 20 ++++++++++++++++----
 pkgs/misc/vim-plugins/update.py       |  6 +++++-
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/pkgs/misc/vim-plugins/aliases.nix b/pkgs/misc/vim-plugins/aliases.nix
index 645b8db7db44..74061dcfd588 100644
--- a/pkgs/misc/vim-plugins/aliases.nix
+++ b/pkgs/misc/vim-plugins/aliases.nix
@@ -31,8 +31,8 @@ let
                               (checkInPkgs n alias)))
                      aliases;
 
-  deprecations = lib.mapAttrs (old: new:
-    throw "${old} was renamed to ${new}. Please update to ${new}."
+  deprecations = lib.mapAttrs (old: info:
+    throw "${old} was renamed to ${info.new} on ${info.date}. Please update to ${info.new}."
   ) (builtins.fromJSON (builtins.readFile ./deprecated.json));
 
 in
diff --git a/pkgs/misc/vim-plugins/deprecated.json b/pkgs/misc/vim-plugins/deprecated.json
index bb4ad18c3ecd..2c02982f6c60 100644
--- a/pkgs/misc/vim-plugins/deprecated.json
+++ b/pkgs/misc/vim-plugins/deprecated.json
@@ -1,6 +1,18 @@
 {
-    "gist-vim": "vim-gist",
-    "vim-jade": "vim-pug",
-    "vundle": "Vundle.vim",
-    "youcompleteme": "YouCompleteMe"
+    "gist-vim": {
+        "date": "2020-03-27",
+        "new": "vim-gist"
+    },
+    "vim-jade": {
+        "date": "2020-03-27",
+        "new": "vim-pug"
+    },
+    "vundle": {
+        "date": "2020-03-27",
+        "new": "Vundle.vim"
+    },
+    "youcompleteme": {
+        "date": "2020-03-27",
+        "new": "YouCompleteMe"
+    }
 }
\ No newline at end of file
diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
index d513669d0f32..bbeef0889f42 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/misc/vim-plugins/update.py
@@ -420,13 +420,17 @@ def rewrite_input(input_file: Path, output_file: Path, redirects: dict):
     if redirects:
         lines = [redirects.get(line, line) for line in lines]
 
+        cur_date_iso = datetime.now().strftime("%Y-%m-%d")
         with open(DEPRECATED, "r") as f:
             deprecations = json.load(f)
         for old, new in redirects.items():
             old_name = old.split("/")[1].split(" ")[0].strip("\n")
             new_name = new.split("/")[1].split(" ")[0].strip("\n")
             if old_name != new_name:
-                deprecations[old_name] = new_name
+                deprecations[old_name] = {
+                    "new": new_name,
+                    "date": cur_date_iso,
+                }
         with open(DEPRECATED, "w") as f:
             json.dump(deprecations, f, indent=4, sort_keys=True)
 

From 749028e92bef8773bb84db62eee024c4026f2f5a Mon Sep 17 00:00:00 2001
From: Matt Snider <matt.snider@protonmail.com>
Date: Fri, 27 Mar 2020 13:16:39 +0100
Subject: [PATCH 4148/4636] vimPlugins.BufOnly-vim: init at 2010-10-18

---
 pkgs/misc/vim-plugins/aliases.nix      |  1 +
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 3 files changed, 13 insertions(+)

diff --git a/pkgs/misc/vim-plugins/aliases.nix b/pkgs/misc/vim-plugins/aliases.nix
index cfdd629369c0..c33f4de1a0d9 100644
--- a/pkgs/misc/vim-plugins/aliases.nix
+++ b/pkgs/misc/vim-plugins/aliases.nix
@@ -36,6 +36,7 @@ mapAliases {
   airline             = vim-airline;
   alternative         = a-vim; # backwards compat, added 2014-10-21
   bats                = bats-vim;
+  BufOnly             = BufOnly-vim;
   calendar            = calendar-vim;
   coffee-script       = vim-coffee-script;
   coffeeScript        = vim-coffee-script; # backwards compat, added 2014-10-18
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 3799072f2fcb..95c588ddfb6e 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -235,6 +235,17 @@ let
     };
   };
 
+  BufOnly-vim = buildVimPluginFrom2Nix {
+    pname = "BufOnly-vim";
+    version = "2010-10-18";
+    src = fetchFromGitHub {
+      owner = "vim-scripts";
+      repo = "BufOnly.vim";
+      rev = "43dd92303979bdb234a3cb2f5662847f7a3affe7";
+      sha256 = "1gvpaqvvxjma0dl1zai68bpv42608api4054appwkw9pgczkkcdl";
+    };
+  };
+
   calendar-vim = buildVimPluginFrom2Nix {
     pname = "calendar-vim";
     version = "2020-02-14";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 68516a2da678..b06400a6ca03 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -518,6 +518,7 @@ vim-scripts/argtextobj.vim
 vim-scripts/autoload_cscope.vim
 vim-scripts/a.vim
 vim-scripts/bats.vim
+vim-scripts/BufOnly.vim
 vim-scripts/changeColorScheme.vim
 vim-scripts/Colour-Sampler-Pack
 vim-scripts/DoxygenToolkit.vim

From e1fc1d22f4eb7a7dbae0cd5d6eb4a913185e9fdf Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 27 Mar 2020 18:09:05 +0100
Subject: [PATCH 4149/4636] google-cloud-sdk: 281.0.0 -> 286.0.0

---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 95878ef09ab6..fb7870eac956 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -21,12 +21,12 @@ let
   sources = name: system: {
     x86_64-darwin = {
       url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
-      sha256 = "0hg4823dlnf9ahqh9dr05wsi6cdxn9mbwhg65jng3d2aws3ski6r";
+      sha256 = "0v83faz0jwnx603acmkc3bsl7vg2xxsm1jfw88fmnj6zcsa5b9ql";
     };
 
     x86_64-linux = {
       url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
-      sha256 = "00ziqr60q1la716c9cy3hjpyq3hiw3m75d4wry6prn5655jw4ph6";
+      sha256 = "1z9liqzgwfavh3m3q1s871gxnwnsxdbny2vqzh9sjlwdk26f76gi";
     };
   }.${system};
 
@@ -34,7 +34,7 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "google-cloud-sdk";
-  version = "281.0.0";
+  version = "286.0.0";
 
   src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);
 

From 2773498fc0315ce63559c833524616fdab000484 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 27 Mar 2020 18:15:11 +0100
Subject: [PATCH 4150/4636] =?UTF-8?q?coqPackages.paramcoq:=201.1.1=20?=
 =?UTF-8?q?=E2=86=92=201.1.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coq-modules/paramcoq/default.nix          | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/coq-modules/paramcoq/default.nix b/pkgs/development/coq-modules/paramcoq/default.nix
index a57d1bc9088d..67e420b4e89e 100644
--- a/pkgs/development/coq-modules/paramcoq/default.nix
+++ b/pkgs/development/coq-modules/paramcoq/default.nix
@@ -3,33 +3,40 @@
 let params =
   {
     "8.7" = {
-      version = "1.1.1+coq8.7";
-      sha256 = "1i7b5pkx46zf9il2xikbp3rhpnh3wdfbhw5yxcf9yk28ky9s0a0l";
+      sha256 = "09n0ky7ldb24by7yf5j3hv410h85x50ksilf7qacl7xglj4gy5hj";
+      buildInputs = [ coq.ocamlPackages.camlp5 ];
     };
     "8.8" = {
-      version = "1.1.1";
-      sha256 = "0b07zvgm9cx6j2d9631zmqjs6sf30kiqg6k15xk3km7n80d53wfh";
+      sha256 = "0rc4lshqvnfdsph98gnscvpmlirs9wx91qcvffggg73xw0p1g9s0";
+      buildInputs = [ coq.ocamlPackages.camlp5 ];
     };
     "8.9" = {
-      version = "1.1.1+coq8.9";
-      sha256 = "002xabhjlph394vydw3dx8ipv5ry2nq3py4440bk9a18ljx0w6ll";
+      sha256 = "1jjzgpff09xjn9kgp7w69r096jkj0x2ksng3pawrmhmn7clwivbk";
+      buildInputs = [ coq.ocamlPackages.camlp5 ];
+    };
+    "8.10" = {
+      sha256 = "1lq1mw15w4yky79qg3rm0mpzqi2ir51b6ak04ismrdr7ixky49y8";
+    };
+    "8.11" = {
+      sha256 = "09c6813988nvq4fpa45s33k70plnhxsblhm7cxxkg0i37mhvigsa";
     };
   };
   param = params.${coq.coq-version};
 in
 
 stdenv.mkDerivation rec {
-  inherit (param) version;
+  version = "1.1.2";
   name = "coq${coq.coq-version}-paramcoq-${version}";
   src = fetchFromGitHub {
     owner = "coq-community";
     repo = "paramcoq";
-    rev = "v${version}";
+    rev = "v${version}+coq${coq.coq-version}";
     inherit (param) sha256;
   };
 
   buildInputs = [ coq ]
-  ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ])
+  ++ (with coq.ocamlPackages; [ ocaml findlib ])
+  ++ (param.buildInputs or [])
   ;
 
   installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];

From ab84ce815d47080066526616e4832ff82573f71d Mon Sep 17 00:00:00 2001
From: Tony Olagbaiye <me@fron.io>
Date: Fri, 27 Mar 2020 11:07:55 +0000
Subject: [PATCH 4151/4636] python3Packages.libfdt: fix python build

---
 pkgs/top-level/python-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fcdae60e3130..e4a3781865ee 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2519,6 +2519,7 @@ in {
 
   libfdt = toPythonModule (pkgs.dtc.override {
     inherit python;
+    pythonSupport = true;
   });
 
   libtmux = callPackage ../development/python-modules/libtmux { };

From a63f6a7d4797754c354054ca3af240d90295af2e Mon Sep 17 00:00:00 2001
From: snicket2100 <57048005+snicket2100@users.noreply.github.com>
Date: Fri, 27 Mar 2020 17:36:57 +0100
Subject: [PATCH 4152/4636] firejail: local profile handling fixed

made it possible to place local profiles in `~/.config/firejail`,
as well as in `/etc/firejail`.
---
 pkgs/os-specific/linux/firejail/default.nix | 23 ++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index 678592c03791..4d263194a49d 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -36,10 +36,27 @@ stdenv.mkDerivation {
     sed -e "s@/etc/@$out/etc/@g" -e "/chmod u+s/d" -i Makefile
   '';
 
-  # We need to set the directory for the .local override files to
-  # /etc/firejail so we can actually override them
+  # The profile files provided with the firejail distribution include `.local`
+  # profile files using relative paths. The way firejail works when it comes to
+  # handling includes is by looking target files up in `~/.config/firejail`
+  # first, and then trying `SYSCONFDIR`. The latter normally points to
+  # `/etc/filejail`, but in the case of nixos points to the nix store. This
+  # makes it effectively impossible to place any profile files in
+  # `/etc/firejail`.
+  #
+  # The workaround applied below is by creating a set of `.local` files which
+  # only contain respective includes to `/etc/firejail`. This way
+  # `~/.config/firejail` still takes precedence, but `/etc/firejail` will also
+  # be searched in second order. This replicates the behaviour from
+  # non-nixos platforms.
+  #
+  # See https://github.com/netblue30/firejail/blob/e4cb6b42743ad18bd11d07fd32b51e8576239318/src/firejail/profile.c#L68-L83
+  # for the profile file lookup implementation.
   postInstall = ''
-    sed -E -e 's@^include (.*.local)$@include /etc/firejail/\1@g' -i $out/etc/firejail/*.profile
+    for local in $(grep -Eh '^include.*local$' $out/etc/firejail/*.profile | awk '{print $2}' | sort | uniq)
+    do
+      echo "include /etc/firejail/$local" >$out/etc/firejail/$local
+    done
   '';
 
   # At high parallelism, the build sometimes fails with:

From e3c9a63cb2a1c6f7808cf2d15161b692612c271d Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Fri, 27 Mar 2020 17:47:40 +0100
Subject: [PATCH 4153/4636] maintainers: add githubId and GPG key for
 minijackson

---
 maintainers/maintainer-list.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b7d25d623c50..40ca25b09899 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4877,7 +4877,12 @@
   minijackson = {
     email = "minijackson@riseup.net";
     github = "minijackson";
+    githubId = 1200507;
     name = "Rémi Nicole";
+    keys = [{
+      longkeyid = "rsa2048/0xFEA888C9F5D64F62";
+      fingerprint = "3196 83D3 9A1B 4DE1 3DC2  51FD FEA8 88C9 F5D6 4F62";
+    }];
   };
   mirdhyn = {
     email = "mirdhyn@gmail.com";
@@ -8304,4 +8309,4 @@
   };
 }
 
-  
+

From 8ea3f05c37b43e84fb1d2333971cff6b306db00a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Mar 2020 17:17:00 +0000
Subject: [PATCH 4154/4636] python27Packages.filetype: 1.0.5 -> 1.0.6

---
 pkgs/development/python-modules/filetype/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/filetype/default.nix b/pkgs/development/python-modules/filetype/default.nix
index 34f7ac4e4a93..40bbc688e205 100644
--- a/pkgs/development/python-modules/filetype/default.nix
+++ b/pkgs/development/python-modules/filetype/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "filetype";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "17a3b885f19034da29640b083d767e0f13c2dcb5dcc267945c8b6e5a5a9013c7";
+    sha256 = "10985zfx90m527binx3fxvm4nsqmlwf0jj8j8mpbxb8wj8ivkllr";
   };
 
   checkPhase = ''
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Infer file type and MIME type of any file/buffer";
-    homepage = https://github.com/h2non/filetype.py;
+    homepage = "https://github.com/h2non/filetype.py";
     license = licenses.mit;
     maintainers = with maintainers; [ dotlambda ];
   };

From c6c0ae3be20fa3bb77c2d411e1c3dfbd936c894e Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 27 Mar 2020 15:32:06 +0100
Subject: [PATCH 4155/4636] python.pkgs.doc8: add pygments dependency

Without pygments doc8 will throw "errors" since it cannot check code
blocks. Pygments has since been added to the dependencies upstream [1],
though that hasn't made it into a release yet. I think we should already
adopt this now.

[1] https://github.com/PyCQA/doc8/commit/b6931816585e224019afddfc9d78ecbcf0549c74
---
 pkgs/development/python-modules/doc8/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix
index 307496cc65ce..f7e620f491cb 100644
--- a/pkgs/development/python-modules/doc8/default.nix
+++ b/pkgs/development/python-modules/doc8/default.nix
@@ -7,6 +7,7 @@
 , chardet
 , stevedore
 , restructuredtext_lint
+, pygments
 }:
 
 buildPythonPackage rec {
@@ -19,7 +20,14 @@ buildPythonPackage rec {
   };
 
   buildInputs = [ pbr ];
-  propagatedBuildInputs = [ docutils six chardet stevedore restructuredtext_lint ];
+  propagatedBuildInputs = [
+    docutils
+    six
+    chardet
+    stevedore
+    restructuredtext_lint
+    pygments
+  ];
 
   doCheck = false;
 

From 837469b388f699eeaa07d1a6eae5e4bd985fccff Mon Sep 17 00:00:00 2001
From: Johannes Schleifenbaum <johannes@js-webcoding.de>
Date: Fri, 27 Mar 2020 13:37:07 +0100
Subject: [PATCH 4156/4636] pythonPackages.python-mpv-jsonipc: 1.1.7 -> 1.1.8

---
 .../development/python-modules/python-mpv-jsonipc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
index 8b46b105d69a..9f9818350bf2 100644
--- a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
+++ b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
@@ -3,14 +3,14 @@
 
 buildPythonPackage rec {
   pname = "python-mpv-jsonipc";
-  version = "1.1.7";
+  version = "1.1.8";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "iwalton3";
     repo = "python-mpv-jsonipc";
     rev = "v${version}";
-    sha256 = "1a8lcvgwf7a19d4dj1wkkpxk44c2z9gsyz1xv4wpxi3gxlplcmcz";
+    sha256 = "0f4nfzfka5n76n6dxmgcz0rkaws7a3jrgyh00va6lnfi7h6dsmx4";
   };
 
   # 'mpv-jsonipc' does not have any tests

From ab55af2279b7dc34fcc569915ef9d6919a9009af Mon Sep 17 00:00:00 2001
From: Johannes Schleifenbaum <johannes@js-webcoding.de>
Date: Fri, 27 Mar 2020 13:38:36 +0100
Subject: [PATCH 4157/4636] jellyfin-mpv-shim: 1.4.1 -> 1.4.2

---
 pkgs/applications/video/jellyfin-mpv-shim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix
index 7842c48a78a6..de9310740912 100644
--- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix
+++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix
@@ -4,13 +4,13 @@
 
 buildPythonApplication rec {
   pname = "jellyfin-mpv-shim";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "iwalton3";
     repo = pname;
     rev = "v${version}";
-    sha256 = "195vplq4182pq62sn6ci0a8p57k6zv8pk1gmifmwdv69wzaph043";
+    sha256 = "1cnii5wj0pgqg3dqk5cm6slpbs3730x8ippps4cjbsxcsrmqjpx6";
     fetchSubmodules = true; # needed for display_mirror css file
   };
 

From a845adeb9b63cb266ccbda6516a95825f934aba6 Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Wed, 25 Mar 2020 08:52:23 -0400
Subject: [PATCH 4158/4636] pythonPackages.quandl: 3.4.8 -> 3.5.0

Format meta to match standard practice.
---
 pkgs/development/python-modules/quandl/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix
index bd73a0213310..2d78b626092d 100644
--- a/pkgs/development/python-modules/quandl/default.nix
+++ b/pkgs/development/python-modules/quandl/default.nix
@@ -10,12 +10,13 @@
 
 buildPythonPackage rec {
   pname = "quandl";
-  version = "3.4.8";
+  version = "3.5.0";
+  disabled = !isPy3k;
 
   src = fetchPypi {
     inherit version;
     pname = "Quandl";
-    sha256 = "179knz21filz6x6qk66b7dk2pj1x4jnvxxd5x71ap19f367dkkb3";
+    sha256 = "0zpw0nwqr4g56l9z4my0fahfgpcmfx74acbmv6nfx1dmq5ggraf3";
   };
 
   doCheck = true;
@@ -46,10 +47,10 @@ buildPythonPackage rec {
     pyasn1
   ];
 
-  meta = {
-    homepage = "https://github.com/quandl/quandl-python";
+  meta = with lib; {
     description = "Quandl Python client library";
-    maintainers = [ lib.maintainers.ilya-kolpakov ];
-    license = lib.licenses.mit;
+    homepage = "https://github.com/quandl/quandl-python";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ilya-kolpakov ];
   };
 }

From 5842ec9368616d74ddd62dadb984f92f21a0a6fb Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Wed, 25 Mar 2020 15:32:22 -0400
Subject: [PATCH 4159/4636] python3Packages.matplotlib: remove nose from
 propagatedBuildInputs

---
 pkgs/development/python-modules/matplotlib/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index beca4fed17db..658388eabae4 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ];
 
   propagatedBuildInputs =
-    [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver
+    [ cycler dateutil numpy pyparsing tornado freetype kiwisolver
       libpng mock pytz ]
     ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache
     ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]

From 78d5faba5ef0f2d0eb620a79b6ce9d682dc22184 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Thu, 26 Mar 2020 11:36:02 -0400
Subject: [PATCH 4160/4636] python3Packages.nilearn: add nose to checkInputs

---
 pkgs/development/python-modules/nilearn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix
index a379f236f3f0..4a92ec7109d1 100644
--- a/pkgs/development/python-modules/nilearn/default.nix
+++ b/pkgs/development/python-modules/nilearn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest
+{ stdenv, buildPythonPackage, fetchPypi, pytest, nose
 , nibabel, numpy, pandas, scikitlearn, scipy, matplotlib, joblib }:
 
 buildPythonPackage rec {
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     pytest nilearn/tests -k 'not test_cache_mixin_with_expand_user'  # accesses ~/
   '';
 
-  checkInputs = [ pytest ];
+  checkInputs = [ pytest nose ];
 
   propagatedBuildInputs = [
     joblib

From ca2cf66f10b177735a7f126accfbcf3bdf3cef8a Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Thu, 26 Mar 2020 12:59:29 -0400
Subject: [PATCH 4161/4636] python3Packages.bayespy: add nose to checkInputs

---
 pkgs/development/python-modules/bayespy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix
index 210fbbe2176e..b1cf34959342 100644
--- a/pkgs/development/python-modules/bayespy/default.nix
+++ b/pkgs/development/python-modules/bayespy/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi, pythonOlder
-, pytest, glibcLocales
+, pytest, nose, glibcLocales
 , numpy, scipy, matplotlib, h5py }:
 
 buildPythonPackage rec {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     sha256 = "24e1327ce241a0113abf217fbaf41ac25e04f5a01f9ed606610f2f1f2d82d34f";
   };
 
-  checkInputs = [ pytest glibcLocales ];
+  checkInputs = [ pytest nose glibcLocales ];
   propagatedBuildInputs = [ numpy scipy matplotlib h5py ];
 
   checkPhase = ''

From 93c9cb09bd20f178f2303109c8f44a590ad363e6 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Thu, 26 Mar 2020 13:00:20 -0400
Subject: [PATCH 4162/4636] python3Packages.deap: add nose to checkInputs

---
 pkgs/development/python-modules/deap/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/deap/default.nix b/pkgs/development/python-modules/deap/default.nix
index 9c49057398c9..5a09c42a9bbf 100644
--- a/pkgs/development/python-modules/deap/default.nix
+++ b/pkgs/development/python-modules/deap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, python, numpy, matplotlib }:
+{ stdenv, buildPythonPackage, fetchPypi, python, numpy, matplotlib, nose }:
 
 buildPythonPackage rec {
   pname = "deap";
@@ -11,6 +11,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ numpy matplotlib ];
 
+  checkInputs = [ nose ];
   checkPhase = ''
     ${python.interpreter} setup.py nosetests --verbosity=3
   '';

From 6f9f91d331eb7634bcb102ac66550801b9bc2aa9 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Thu, 26 Mar 2020 14:49:56 -0400
Subject: [PATCH 4163/4636] python3Packages.cufflinks: add nose to checkInputs

---
 pkgs/development/python-modules/cufflinks/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/cufflinks/default.nix b/pkgs/development/python-modules/cufflinks/default.nix
index 315c28c74caa..4c2db1f52146 100644
--- a/pkgs/development/python-modules/cufflinks/default.nix
+++ b/pkgs/development/python-modules/cufflinks/default.nix
@@ -4,6 +4,7 @@
 , ipython
 , ipywidgets
 , pytest
+, nose
 , numpy
 , pandas
 , six
@@ -30,7 +31,7 @@ buildPythonPackage rec {
     statsmodels
   ];
 
-  checkInputs = [ pytest ];
+  checkInputs = [ pytest nose ];
 
   # ignore tests which are incompatible with pandas>=1.0
   # https://github.com/santosjorge/cufflinks/issues/236

From 037c91b193eee5ab5088d25bd25aeab5ac2bce56 Mon Sep 17 00:00:00 2001
From: Constantine Glen Evans <cevans@evanslabs.org>
Date: Mon, 23 Mar 2020 17:39:09 -0700
Subject: [PATCH 4164/4636] maintainers: add cge

---
 maintainers/maintainer-list.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 40ca25b09899..e91339ad5f65 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1257,6 +1257,20 @@
     githubId = 5949913;
     name = "Carlos Fernandez Sanz";
   };
+  cge = {
+    email = "cevans@evanslabs.org";
+    github = "cgevans";
+    githubId = 2054509;
+    name = "Constantine Evans";
+    keys = [
+      { longkeyid = "rsa4096/0xB67DB1D20A93A9F9";
+        fingerprint = "32B1 6EE7 DBA5 16DE 526E  4C5A B67D B1D2 0A93 A9F9";
+      }
+      { longkeyid = "rsa4096/0x1A1D58B86AE2AABD";
+        fingerprint = "669C 1D24 5A87 DB34 6BE4  3216 1A1D 58B8 6AE2 AABD";
+      }
+    ];
+  };
   chaduffy = {
     email = "charles@dyfis.net";
     github = "charles-dyfis-net";

From 59fbc7acba1242df575190205681502399f48b1a Mon Sep 17 00:00:00 2001
From: Constantine Glen Evans <cevans@evanslabs.org>
Date: Mon, 23 Mar 2020 17:41:52 -0700
Subject: [PATCH 4165/4636] gwyddion: 2.48 -> 2.55 (and add options)

Gwyddion has a large number of optional dependencies. In this update,
those dependencies have been added with options set mostly to true,
and an option (default false) for working Python 2.7 support in the
program and in Python has been added. I have also added myself as a
maintainer as no maintainer is currently set.
---
 .../science/chemistry/gwyddion/codegen.patch  | 22 ++++++
 .../science/chemistry/gwyddion/default.nix    | 71 ++++++++++++++++---
 pkgs/top-level/python-packages.nix            |  5 ++
 3 files changed, 89 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/applications/science/chemistry/gwyddion/codegen.patch

diff --git a/pkgs/applications/science/chemistry/gwyddion/codegen.patch b/pkgs/applications/science/chemistry/gwyddion/codegen.patch
new file mode 100644
index 000000000000..eb306d99f8a3
--- /dev/null
+++ b/pkgs/applications/science/chemistry/gwyddion/codegen.patch
@@ -0,0 +1,22 @@
+--- gwyddion-2.55.orig/configure	2019-11-04 01:25:31.000000000 -0800
++++ gwyddion-2.55/configure	2020-03-20 18:49:43.860452655 -0700
+@@ -18560,7 +18560,7 @@
+ fi
+   if test "x$embed_pygtk" = xno; then
+     if test "x$PYGTK_CODEGENDIR" = 'x'; then
+-      PYGTK_CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygtk-2.0`
++      PYGTK_CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygobject-2.0`
+     fi
+   else
+     # Some silly OSes want to remove pygtk2.  We can build pygwy without
+--- gwyddion-2.55.orig/configure.ac	2019-11-04 01:25:16.000000000 -0800
++++ gwyddion-2.55/configure.ac	2020-03-20 18:52:55.042724547 -0700
+@@ -270,7 +270,7 @@
+                     [embed_pygtk=yes; pygwy_warn=" (embedded pygtk2)"])
+   if test "x$embed_pygtk" = xno; then
+     if test "x$PYGTK_CODEGENDIR" = 'x'; then
+-      PYGTK_CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygtk-2.0`
++      PYGTK_CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygobject-2.0`
+     fi
+   else
+     # Some silly OSes want to remove pygtk2.  We can build pygwy without
diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix
index 12007c940b3d..cd8b93c9aac7 100644
--- a/pkgs/applications/science/chemistry/gwyddion/default.nix
+++ b/pkgs/applications/science/chemistry/gwyddion/default.nix
@@ -1,17 +1,69 @@
-{ stdenv, fetchurl, gtk2, pkgconfig }:
+{ stdenv, fetchurl, gtk2, pkg-config, fftw, file,
+  pythonSupport ? false, pythonPackages ? null,
+  gnome2 ? null,
+  openexrSupport ? true, openexr ? null,
+  libzipSupport ? true, libzip ? null,
+  libxml2Support ? true, libxml2 ? null,
+  libwebpSupport ? true, libwebp ? null,
+  # libXmu is not used if libunique is.
+  libXmuSupport ? false, xorg ? null,
+  libxsltSupport ? true, libxslt ? null,
+  fitsSupport ? true, cfitsio ? null,
+  zlibSupport ? true, zlib ? null,
+  libuniqueSupport ? true, libunique ? null,
+  libpngSupport ? true, libpng ? null,
+  openglSupport ? true
+}:
 
-with stdenv.lib;
+assert openexrSupport -> openexr != null;
+assert libzipSupport -> libzip != null;
+assert libxml2Support -> libxml2 != null;
+assert libwebpSupport -> libwebp != null;
+assert libXmuSupport -> xorg != null;
+assert libxsltSupport -> libxslt != null;
+assert fitsSupport -> cfitsio != null;
+assert zlibSupport -> zlib != null;
+assert libuniqueSupport -> libunique != null;
+assert libpngSupport -> libpng != null;
+assert openglSupport -> gnome2 != null;
+assert pythonSupport -> (pythonPackages != null && gnome2 != null);
 
-let version = "2.48"; in
-stdenv.mkDerivation {
+let
+    inherit (pythonPackages) pygtk pygobject2 python;
+
+in
+
+stdenv.mkDerivation rec {
   pname = "gwyddion";
-  inherit version;
+   version = "2.55";
   src = fetchurl {
-    url = "mirror://sourceforge/gwyddion/files/gwyddion/${version}/gwyddion-${version}.tar.xz";
-    sha256 = "119iw58ac2wn4cas6js8m7r1n4gmmkga6b1y711xzcyjp9hshgwx";
+    url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz";
+    sha256 = "0l00zszvginpriv12idc0y1x28qmicdmrwkqa007srkxvrdgxwdi";
   };
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk2 ];
+  
+  nativeBuildInputs = [ pkg-config file ];
+  
+  buildInputs = with stdenv.lib;
+    [ gtk2 fftw ] ++
+    optionals openglSupport [gnome2.gtkglext] ++
+    optional openexrSupport openexr ++
+    optional libXmuSupport xorg.libXmu ++
+    optional fitsSupport cfitsio ++
+    optional libpngSupport libpng ++
+    optional libxsltSupport libxslt ++
+    optional libxml2Support libxml2 ++
+    optional libwebpSupport libwebp ++
+    optional zlibSupport zlib ++
+    optional libuniqueSupport libunique ++
+    optional libzipSupport libzip;
+
+  propagatedBuildInputs = with stdenv.lib;
+    optionals pythonSupport [ pygtk pygobject2 python gnome2.gtksourceview ];
+
+  # This patch corrects problems with python support, but should apply cleanly
+  # regardless of whether python support is enabled, and have no effects if
+  # it is disabled.
+  patches = [ ./codegen.patch ];
   meta = {
     homepage = http://gwyddion.net/;
 
@@ -29,5 +81,6 @@ stdenv.mkDerivation {
     '';
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.cge ];
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e4a3781865ee..b0e080a7be8c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2248,6 +2248,11 @@ in {
 
   eth-utils = callPackage ../development/python-modules/eth-utils { };
 
+  gwyddion = disabledIf isPy3k (toPythonModule (pkgs.gwyddion.override {
+    pythonSupport = true;
+    pythonPackages = self;
+  }));
+
   impacket = callPackage ../development/python-modules/impacket { };
 
   jsonlines = callPackage ../development/python-modules/jsonlines { };

From 368cc58db3a931eb3333ce7739ac1aaedec33c8a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 25 Mar 2020 09:33:38 +0000
Subject: [PATCH 4166/4636] python37Packages.PyChromecast: 4.1.1 -> 4.2.0

---
 pkgs/development/python-modules/pychromecast/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix
index 9ce934c84676..4939cd18e43a 100644
--- a/pkgs/development/python-modules/pychromecast/default.nix
+++ b/pkgs/development/python-modules/pychromecast/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "PyChromecast";
-  version = "4.1.1";
+  version = "4.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "13cxyxs0cl2cwbx1fkw6b26hrzpllx1wfq2q58fx298yjn3niiby";
+    sha256 = "05h7ncymyh1715v2jkj312qza5qlqrz6yfpgyv4kdf1m07zh7pxh";
   };
 
   disabled = !isPy3k;

From 39921bd43ba6ccd273f4337098b71eb851e9c77d Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 27 Mar 2020 02:17:27 -0400
Subject: [PATCH 4167/4636] mame: add darwin support

---
 pkgs/misc/emulators/mame/default.nix | 28 +++++++++++++++++++++-------
 pkgs/top-level/all-packages.nix      |  4 +++-
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix
index 995fd72a6e22..2b05a921590f 100644
--- a/pkgs/misc/emulators/mame/default.nix
+++ b/pkgs/misc/emulators/mame/default.nix
@@ -1,14 +1,17 @@
 { stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper
 , python, pkgconfig, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama
+, libpcap, CoreAudioKit, ForceFeedback
 , installShellFiles }:
 
+with stdenv;
+
 let
   majorVersion = "0";
   minorVersion = "219";
 
   desktopItem = makeDesktopItem {
     name = "MAME";
-    exec = "mame${stdenv.lib.optionalString stdenv.is64bit "64"}";
+    exec = "mame${lib.optionalString stdenv.is64bit "64"}";
     desktopName = "MAME";
     genericName = "MAME is a multi-purpose emulation framework";
     categories = "System;Emulator;";
@@ -27,13 +30,22 @@ in mkDerivation {
   };
 
   hardeningDisable = [ "fortify" ];
-  NIX_CFLAGS_COMPILE = [ "-Wno-error=maybe-uninitialized" ];
+  NIX_CFLAGS_COMPILE = [ "-Wno-error=maybe-uninitialized" "-Wno-error=missing-braces" ];
 
-  makeFlags = [ "TOOLS=1" ];
+  makeFlags = [
+    "TOOLS=1"
+    "USE_LIBSDL=1"
+  ]
+  ++ lib.optionals stdenv.cc.isClang [ "CC=clang" "CXX=clang++" ]
+  ;
 
   dontWrapQtApps = true;
 
-  buildInputs = [ SDL2 SDL2_ttf alsaLib qtbase libXinerama ];
+  buildInputs =
+    [ SDL2 SDL2_ttf qtbase libXinerama ]
+    ++ lib.optional stdenv.isLinux alsaLib
+    ++ lib.optionals stdenv.isDarwin [ libpcap CoreAudioKit ForceFeedback ]
+    ;
   nativeBuildInputs = [ python pkgconfig which makeWrapper installShellFiles ];
 
   # by default MAME assumes that paths with stock resources
@@ -58,16 +70,18 @@ in mkDerivation {
     installManPage ${dest}/docs/man/*.1 ${dest}/docs/man/*.6
 
     mv artwork plugins samples ${dest}
-
+  '' + lib.optionalString stdenv.isLinux ''
     mkdir -p $out/share
     ln -s ${desktopItem}/share/applications $out/share
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Is a multi-purpose emulation framework";
     homepage = https://www.mamedev.org/;
     license = with licenses; [ bsd3 gpl2Plus ];
-    platforms = [ "x86_64-linux" "i686-linux" ];
+    platforms = platforms.unix;
+    # makefile needs fixes for install target
+    badPlatforms = [ "aarch64-linux" ];
     maintainers = with maintainers; [ gnidorah ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e469380abbd..6c3a8a4d430d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25517,7 +25517,9 @@ in
     icu = icu58;
   };
 
-  mame = libsForQt5.callPackage ../misc/emulators/mame { };
+  mame = libsForQt5.callPackage ../misc/emulators/mame {
+    inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback;
+  };
 
   martyr = callPackage ../development/libraries/martyr { };
 

From 870a6e262d333328b951333cf45beb4c57ee5a03 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Sun, 22 Mar 2020 17:26:55 +0100
Subject: [PATCH 4168/4636] nixos/quorum: init

---
 nixos/modules/module-list.nix                |   1 +
 nixos/modules/services/networking/quorum.nix | 229 +++++++++++++++++++
 nixos/tests/all-tests.nix                    |   1 +
 nixos/tests/quorum.nix                       |  79 +++++++
 4 files changed, 310 insertions(+)
 create mode 100644 nixos/modules/services/networking/quorum.nix
 create mode 100644 nixos/tests/quorum.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index ccdc39eecd8d..c460e7164bf6 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -692,6 +692,7 @@
   ./services/networking/prosody.nix
   ./services/networking/quagga.nix
   ./services/networking/quassel.nix
+  ./services/networking/quorum.nix
   ./services/networking/quicktun.nix
   ./services/networking/racoon.nix
   ./services/networking/radicale.nix
diff --git a/nixos/modules/services/networking/quorum.nix b/nixos/modules/services/networking/quorum.nix
new file mode 100644
index 000000000000..2f612c9db686
--- /dev/null
+++ b/nixos/modules/services/networking/quorum.nix
@@ -0,0 +1,229 @@
+{ config, pkgs, lib, ... }:
+let
+
+  inherit (lib) mkEnableOption mkIf mkOption literalExample types optionalString;
+
+  cfg = config.services.quorum;
+  dataDir = "/var/lib/quorum";
+  genesisFile = pkgs.writeText "genesis.json" (builtins.toJSON cfg.genesis);
+  staticNodesFile = pkgs.writeText "static-nodes.json" (builtins.toJSON cfg.staticNodes);
+
+in {
+  options = {
+
+    services.quorum = {
+      enable = mkEnableOption "Quorum blockchain daemon";
+
+      user = mkOption {
+        type = types.str;
+        default = "quorum";
+        description = "The user as which to run quorum.";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = cfg.user;
+        description = "The group as which to run quorum.";
+      };
+
+      port = mkOption {
+        type = types.port;
+        default = 21000;
+        description = "Override the default port on which to listen for connections.";
+      };
+
+      nodekeyFile = mkOption {
+        type = types.path;
+        default = "${dataDir}/nodekey";
+        description = "Path to the nodekey.";
+      };
+
+      staticNodes = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        example = [ "enode://dd333ec28f0a8910c92eb4d336461eea1c20803eed9cf2c056557f986e720f8e693605bba2f4e8f289b1162e5ac7c80c914c7178130711e393ca76abc1d92f57@0.0.0.0:30303?discport=0" ];
+        description = "List of validator nodes.";
+      };
+
+      privateconfig = mkOption {
+        type = types.str;
+        default = "ignore";
+        description = "Configuration of privacy transaction manager.";
+      };
+
+      syncmode = mkOption {
+        type = types.enum [ "fast" "full" "light" ];
+        default = "full";
+        description = "Blockchain sync mode.";
+      };
+
+      blockperiod = mkOption {
+        type = types.int;
+        default = 5;
+        description = "Default minimum difference between two consecutive block's timestamps in seconds.";
+      };
+
+      permissioned = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Allow only a defined list of nodes to connect.";
+      };
+
+      rpc = {
+        enable = mkOption {
+          type = types.bool;
+          default = true;
+          description = "Enable RPC interface.";
+        };
+
+        address = mkOption {
+          type = types.str;
+          default = "0.0.0.0";
+          description = "Listening address for RPC connections.";
+        };
+
+        port = mkOption {
+          type = types.port;
+          default = 22004;
+          description = "Override the default port on which to listen for RPC connections.";
+        };
+
+        api = mkOption {
+          type = types.str;
+          default = "admin,db,eth,debug,miner,net,shh,txpool,personal,web3,quorum,istanbul";
+          description = "API's offered over the HTTP-RPC interface.";
+        };
+      };
+
+     ws = {
+        enable = mkOption {
+          type = types.bool;
+          default = true;
+          description = "Enable WS-RPC interface.";
+        };
+
+        address = mkOption {
+          type = types.str;
+          default = "0.0.0.0";
+          description = "Listening address for WS-RPC connections.";
+        };
+
+        port = mkOption {
+          type = types.port;
+          default = 8546;
+          description = "Override the default port on which to listen for WS-RPC connections.";
+        };
+
+        api = mkOption {
+          type = types.str;
+          default = "admin,db,eth,debug,miner,net,shh,txpool,personal,web3,quorum,istanbul";
+          description = "API's offered over the WS-RPC interface.";
+        };
+
+       origins = mkOption {
+          type = types.str;
+          default = "*";
+          description = "Origins from which to accept websockets requests";
+       };
+     };
+
+      genesis = mkOption {
+        type = types.nullOr types.attrs;
+        default = null;
+        example = literalExample '' {
+          alloc = {
+            a47385db68718bdcbddc2d2bb7c54018066ec111 = {
+              balance = "1000000000000000000000000000";
+            };
+          };
+          coinbase = "0x0000000000000000000000000000000000000000";
+          config = {
+            byzantiumBlock = 4;
+            chainId = 494702925;
+            eip150Block = 2;
+            eip155Block = 3;
+            eip158Block = 3;
+            homesteadBlock = 1;
+            isQuorum = true;
+            istanbul = {
+              epoch = 30000;
+              policy = 0;
+            };
+          };
+          difficulty = "0x1";
+          extraData = "0x0000000000000000000000000000000000000000000000000000000000000000f85ad59438f0508111273d8e482f49410ca4078afc86a961b8410000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0";
+          gasLimit = "0x2FEFD800";
+          mixHash = "0x63746963616c2062797a616e74696e65201111756c7420746f6c6572616e6365";
+          nonce = "0x0";
+          parentHash = "0x0000000000000000000000000000000000000000000000000000000000000000";
+          timestamp = "0x00";
+          }'';
+        description = "Blockchain genesis settings.";
+      };
+     };
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.quorum ];
+    systemd.tmpfiles.rules = [
+      "d '${dataDir}' 0770 '${cfg.user}' '${cfg.group}' - -"
+    ];
+    systemd.services.quorum = {
+      description = "Quorum daemon";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      environment = {
+        PRIVATE_CONFIG = "${cfg.privateconfig}";
+      };
+      preStart = ''
+        if [ ! -d ${dataDir}/geth ]; then
+          if [ ! -d ${dataDir}/keystore ]; then
+            echo ERROR: You need to create a wallet before initializing your genesis file, run:
+            echo   # su -s /bin/sh - quorum
+            echo   $ geth --datadir ${dataDir} account new
+            echo and configure your genesis file accordingly.
+            exit 1;
+          fi
+          ln -s ${staticNodesFile} ${dataDir}/static-nodes.json
+          ${pkgs.quorum}/bin/geth --datadir ${dataDir} init ${genesisFile}
+        fi
+      '';
+      serviceConfig = {
+        User = cfg.user;
+        Group = cfg.group;
+        ExecStart = ''${pkgs.quorum}/bin/geth \
+            --nodiscover \
+            --verbosity 5 \
+            --nodekey ${cfg.nodekeyFile} \
+            --istanbul.blockperiod ${toString cfg.blockperiod} \
+            --syncmode ${cfg.syncmode} \
+            ${optionalString (cfg.permissioned)
+            "--permissioned"} \
+            --mine --minerthreads 1 \
+            ${optionalString (cfg.rpc.enable)
+            "--rpc --rpcaddr ${cfg.rpc.address} --rpcport ${toString cfg.rpc.port} --rpcapi ${cfg.rpc.api}"} \
+            ${optionalString (cfg.ws.enable)
+            "--ws --wsaddr ${cfg.ws.address} --wsport ${toString cfg.ws.port} --wsapi ${cfg.ws.api} --wsorigins ${cfg.ws.origins}"} \
+            --emitcheckpoints \
+            --datadir ${dataDir} \
+            --port ${toString cfg.port}'';
+        Restart = "on-failure";
+
+        # Hardening measures
+        PrivateTmp = "true";
+        ProtectSystem = "full";
+        NoNewPrivileges = "true";
+        PrivateDevices = "true";
+        MemoryDenyWriteExecute = "true";
+      };
+    };
+    users.users.${cfg.user} = {
+      name = cfg.user;
+      group = cfg.group;
+      description = "Quorum daemon user";
+      home = dataDir;
+      isSystemUser = true;
+    };
+    users.groups.${cfg.group} = {};
+  };
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 51b463747b0e..63770e0460c2 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -250,6 +250,7 @@ in
   prosodyMysql = handleTest ./xmpp/prosody-mysql.nix {};
   proxy = handleTest ./proxy.nix {};
   quagga = handleTest ./quagga.nix {};
+  quorum = handleTest ./quorum.nix {};
   rabbitmq = handleTest ./rabbitmq.nix {};
   radarr = handleTest ./radarr.nix {};
   radicale = handleTest ./radicale.nix {};
diff --git a/nixos/tests/quorum.nix b/nixos/tests/quorum.nix
new file mode 100644
index 000000000000..846d2a930188
--- /dev/null
+++ b/nixos/tests/quorum.nix
@@ -0,0 +1,79 @@
+import ./make-test-python.nix ({ pkgs, ... }: {
+  name = "quorum";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ mmahut ];
+  };
+
+  nodes = {
+    machine = { ... }: {
+      services.quorum = {
+        enable = true;
+        permissioned = false;
+        staticNodes = [ "enode://dd333ec28f0a8910c92eb4d336461eea1c20803eed9cf2c056557f986e720f8e693605bba2f4e8f289b1162e5ac7c80c914c7178130711e393ca76abc1d92f57@0.0.0.0:30303?discport=0" ];
+        genesis = {
+          alloc = {
+            "189d23d201b03ae1cf9113672df29a5d672aefa3" = {
+              balance = "0x446c3b15f9926687d2c40534fdb564000000000000";
+            };
+            "44b07d2c28b8ed8f02b45bd84ac7d9051b3349e6" = {
+              balance = "0x446c3b15f9926687d2c40534fdb564000000000000";
+            };
+            "4c1ccd426833b9782729a212c857f2f03b7b4c0d" = {
+              balance = "0x446c3b15f9926687d2c40534fdb564000000000000";
+            };
+            "7ae555d0f6faad7930434abdaac2274fd86ab516" = {
+              balance = "0x446c3b15f9926687d2c40534fdb564000000000000";
+            };
+            c1056df7c02b6f1a353052eaf0533cc7cb743b52 = {
+              balance = "0x446c3b15f9926687d2c40534fdb564000000000000";
+            };
+          };
+          coinbase = "0x0000000000000000000000000000000000000000";
+          config = {
+            byzantiumBlock = 1;
+            chainId = 10;
+            eip150Block = 1;
+            eip150Hash =
+              "0x0000000000000000000000000000000000000000000000000000000000000000";
+            eip155Block = 1;
+            eip158Block = 1;
+            isQuorum = true;
+            istanbul = {
+              epoch = 30000;
+              policy = 0;
+            };
+          };
+        difficulty = "0x1";
+        extraData =
+          "0x0000000000000000000000000000000000000000000000000000000000000000f8aff869944c1ccd426833b9782729a212c857f2f03b7b4c0d94189d23d201b03ae1cf9113672df29a5d672aefa39444b07d2c28b8ed8f02b45bd84ac7d9051b3349e694c1056df7c02b6f1a353052eaf0533cc7cb743b52947ae555d0f6faad7930434abdaac2274fd86ab516b8410000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0";
+        gasLimit = "0xe0000000";
+        gasUsed = "0x0";
+        mixHash =
+          "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365";
+        nonce = "0x0";
+        number = "0x0";
+        parentHash =
+          "0x0000000000000000000000000000000000000000000000000000000000000000";
+        timestamp = "0x5cffc201";
+		  };
+     };
+    };
+  };
+
+  testScript = ''
+    start_all()
+    machine.wait_until_succeeds("mkdir -p /var/lib/quorum/keystore")
+    machine.wait_until_succeeds(
+        'echo \{\\"address\\":\\"9377bc3936de934c497e22917b81aa8774ac3bb0\\",\\"crypto\\":\{\\"cipher\\":\\"aes-128-ctr\\",\\"ciphertext\\":\\"ad8341d8ef225650403fd366c955f41095e438dd966a3c84b3d406818c1e366c\\",\\"cipherparams\\":\{\\"iv\\":\\"2a09f7a72fd6dff7c43150ff437e6ac2\\"\},\\"kdf\\":\\"scrypt\\",\\"kdfparams\\":\{\\"dklen\\":32,\\"n\\":262144,\\"p\\":1,\\"r\\":8,\\"salt\\":\\"d1a153845bb80cd6274c87c5bac8ac09fdfac5ff131a6f41b5ed319667f12027\\"\},\\"mac\\":\\"a9621ad88fa1d042acca6fc2fcd711f7e05bfbadea3f30f379235570c8e270d3\\"\},\\"id\\":\\"89e847a3-1527-42f6-a321-77de0a14ce02\\",\\"version\\":3\}\\" > /var/lib/quorum/keystore/UTC--2020-03-23T11-08-34.144812212Z--9377bc3936de934c497e22917b81aa8774ac3bb0'
+    )
+    machine.wait_until_succeeds(
+        "echo fe2725c4e8f7617764b845e8d939a65c664e7956eb47ed7d934573f16488efc1 > /var/lib/quorum/nodekey"
+    )
+    machine.wait_until_succeeds("systemctl restart quorum")
+    machine.wait_for_unit("quorum.service")
+    machine.sleep(15)
+    machine.wait_until_succeeds(
+        'geth attach /var/lib/quorum/geth.ipc --exec "eth.accounts" | grep 0x9377bc3936de934c497e22917b81aa8774ac3bb0'
+    )
+  '';
+})

From 40d3bc2d9f75c3a613d93f34d4e26d901b90f51e Mon Sep 17 00:00:00 2001
From: Jason Miller <mailings-github@millerjason.com>
Date: Fri, 25 Oct 2019 07:57:33 -0400
Subject: [PATCH 4169/4636] maintainers: Add millerjason

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e91339ad5f65..b59199bc767c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4878,6 +4878,12 @@
     githubId = 19479662;
     name = "Kajetan Champlewski";
   };
+  millerjason = {
+    email = "mailings-github@millerjason.com";
+    github = "millerjason";
+    githubId = 7610974;
+    name = "Jason Miller";
+  };
   miltador = {
     email = "miltador@yandex.ua";
     name = "Vasiliy Solovey";

From 4234ef550c6646ef34b6888730b05173a8648334 Mon Sep 17 00:00:00 2001
From: Jason Miller <mailings-github@millerjason.com>
Date: Sun, 8 Mar 2020 00:16:53 -0500
Subject: [PATCH 4170/4636] vimacs: init at 2016-03-24

---
 pkgs/applications/editors/vim/vimacs.nix | 34 ++++++++++++++++++++++++
 pkgs/misc/vim-plugins/generated.nix      | 11 ++++++++
 pkgs/misc/vim-plugins/overrides.nix      | 15 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names   |  1 +
 pkgs/top-level/all-packages.nix          |  2 ++
 5 files changed, 63 insertions(+)
 create mode 100644 pkgs/applications/editors/vim/vimacs.nix

diff --git a/pkgs/applications/editors/vim/vimacs.nix b/pkgs/applications/editors/vim/vimacs.nix
new file mode 100644
index 000000000000..d067b4181213
--- /dev/null
+++ b/pkgs/applications/editors/vim/vimacs.nix
@@ -0,0 +1,34 @@
+{ stdenv, config, vim_configurable, macvim, vimPlugins
+, useMacvim ? stdenv.isDarwin && (config.vimacs.macvim or true)
+, vimacsExtraArgs ? "" }:
+
+stdenv.mkDerivation rec {
+  pname = "vimacs";
+  version = vimPackage.version;
+  vimPackage = if useMacvim then macvim else vim_configurable;
+
+  buildInputs = [ vimPackage vimPlugins.vimacs ];
+
+  buildCommand = ''
+    mkdir -p "$out"/bin
+    cp "${vimPlugins.vimacs}"/share/vim-plugins/vimacs/bin/vim $out/bin/vimacs
+    substituteInPlace "$out"/bin/vimacs \
+      --replace '-vim}' '-@bin@/bin/vim}' \
+      --replace '-gvim}' '-@bin@/bin/vim -g}' \
+      --replace '--cmd "let g:VM_Enabled = 1"' \
+                '--cmd "let g:VM_Enabled = 1" --cmd "set rtp^=@rtp@" ${vimacsExtraArgs}' \
+      --replace @rtp@ ${vimPlugins.vimacs.rtp} \
+      --replace @bin@ ${vimPackage}
+    for prog in vm gvm gvimacs vmdiff vimacsdiff
+    do
+      ln -s "$out"/bin/vimacs $out/bin/$prog
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Vim-Improved eMACS: Emacs emulation for Vim";
+    homepage = "http://algorithm.com.au/code/vimacs";
+    license = licenses.gpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [ millerjason ];
+  };
+}
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 12700eb8ef49..0093bc78c418 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -5888,6 +5888,17 @@ let
     };
   };
 
+  vimacs = buildVimPluginFrom2Nix {
+    pname = "vimacs";
+    version = "2016-03-24";
+    src = fetchFromGitHub {
+      owner = "andrep";
+      repo = "vimacs";
+      rev = "7b8e297722d55089f0f0535fe6422533c98112fb";
+      sha256 = "0x92jcpdlvxhhdpwkv7ig9ya7s96yqjy6ms9xnx8djkf12xql16f";
+    };
+  };
+
   vimagit = buildVimPluginFrom2Nix {
     pname = "vimagit";
     version = "2020-01-12";
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 5248a817f43e..86a65e1ad8ce 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -460,6 +460,21 @@ self: super: {
       };
     });
 
+  vimacs = super.vimacs.overrideAttrs(old: {
+    buildPhase = ''
+      substituteInPlace bin/vim \
+        --replace '/usr/bin/vim' 'vim' \
+        --replace '/usr/bin/gvim' 'gvim'
+      # remove unnecessary duplicated bin wrapper script
+      rm -r plugin/vimacs
+    '';
+    meta = with stdenv.lib; {
+      description = "Vim-Improved eMACS: Emacs emulation plugin for Vim";
+      homepage = "http://algorithm.com.au/code/vimacs";
+      license = licenses.gpl2Plus;
+      maintainers = with stdenv.lib.maintainers; [ millerjason ];
+    };
+  });
 
   vimshell-vim = super.vimshell-vim.overrideAttrs(old: {
     dependencies = with super; [ vimproc-vim ];
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 14f2ff80a236..62333ae15e31 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -9,6 +9,7 @@ alvan/vim-closetag
 alx741/vim-hindent
 alx741/vim-stylishask
 amiorin/ctrlp-z
+andrep/vimacs
 andreshazard/vim-logreview
 andsild/peskcolor.vim
 andviro/flake8-vim
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d1f57640d54..0341fd97bc0b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22447,6 +22447,8 @@ in
     gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3;
   });
 
+  vimacs = callPackage ../applications/editors/vim/vimacs.nix { };
+
   qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {};
 
   qtile = callPackage ../applications/window-managers/qtile {

From 3c7ef6bcd85e3e133ac6f2ab5e238934d56d902e Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Wed, 18 Mar 2020 19:10:31 +0900
Subject: [PATCH 4171/4636] ghc: 8.6.3-binary -> 8.6.5-binary

---
 .../{8.6.3-binary.nix => 8.6.5-binary.nix}    | 13 ++++++------
 pkgs/top-level/haskell-packages.nix           | 20 +++++++++----------
 2 files changed, 17 insertions(+), 16 deletions(-)
 rename pkgs/development/compilers/ghc/{8.6.3-binary.nix => 8.6.5-binary.nix} (94%)

diff --git a/pkgs/development/compilers/ghc/8.6.3-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix
similarity index 94%
rename from pkgs/development/compilers/ghc/8.6.3-binary.nix
rename to pkgs/development/compilers/ghc/8.6.5-binary.nix
index fe576186b0e5..dcce7f80281e 100644
--- a/pkgs/development/compilers/ghc/8.6.3-binary.nix
+++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix
@@ -24,22 +24,23 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "8.6.3";
+  version = "8.6.5";
 
   name = "ghc-${version}-binary";
 
+  # https://downloads.haskell.org/~ghc/8.6.5/
   src = fetchurl ({
     i686-linux = {
-      url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb8-linux.tar.xz";
-      sha256 = "0bw8a7fxcbskf93rb4m542ff66vrmx5i5kj77qx37cbhijx70w5m";
+      url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb9-linux.tar.xz";
+      sha256 = "1p2h29qghql19ajk755xa0yxkn85slbds8m9n5196ris743vkp8w";
     };
     x86_64-linux = {
-      url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz";
-      sha256 = "1m9gaga2pzi2cx5gvasg0rx1dlvr68gmi20l67652kag6xjsa719";
+      url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb9-linux.tar.xz";
+      sha256 = "1pqlx6rdjs2110g0y1i9f8x18lmdizibjqd15f5xahcz39hgaxdw";
     };
     x86_64-darwin = {
       url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
-      sha256 = "1hbzk57v45176kxcx848p5jn5p1xbp2129ramkbzsk6plyhnkl3r";
+      sha256 = "0s9188vhhgf23q3rjarwhbr524z6h2qga5xaaa2pma03sfqvvhfz";
     };
   }.${stdenv.hostPlatform.system}
     or (throw "cannot bootstrap GHC on this platform"));
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2d03b3ed8f44..052b84f269e6 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -4,7 +4,7 @@ let
   # These are attributes in compiler and packages that don't support integer-simple.
   integerSimpleExcludes = [
     "ghc822Binary"
-    "ghc863Binary"
+    "ghc865Binary"
     "ghc844"
     "ghcjs"
     "ghcjs86"
@@ -42,7 +42,7 @@ in {
 
     ghc822Binary = callPackage ../development/compilers/ghc/8.2.2-binary.nix { };
 
-    ghc863Binary = callPackage ../development/compilers/ghc/8.6.3-binary.nix { };
+    ghc865Binary = callPackage ../development/compilers/ghc/8.6.5-binary.nix { };
 
     ghc844 = callPackage ../development/compilers/ghc/8.4.4.nix {
       bootPkgs = packages.ghc822Binary;
@@ -57,31 +57,31 @@ in {
       llvmPackages = pkgs.llvmPackages_6;
     };
     ghc881 = callPackage ../development/compilers/ghc/8.8.1.nix {
-      bootPkgs = packages.ghc863Binary;
+      bootPkgs = packages.ghc865Binary;
       inherit (buildPackages.python3Packages) sphinx;
       buildLlvmPackages = buildPackages.llvmPackages_7;
       llvmPackages = pkgs.llvmPackages_7;
     };
     ghc882 = callPackage ../development/compilers/ghc/8.8.2.nix {
-      bootPkgs = packages.ghc863Binary;
+      bootPkgs = packages.ghc865Binary;
       inherit (buildPackages.python3Packages) sphinx;
       buildLlvmPackages = buildPackages.llvmPackages_7;
       llvmPackages = pkgs.llvmPackages_7;
     };
     ghc883 = callPackage ../development/compilers/ghc/8.8.3.nix {
-      bootPkgs = packages.ghc863Binary;
+      bootPkgs = packages.ghc865Binary;
       inherit (buildPackages.python3Packages) sphinx;
       buildLlvmPackages = buildPackages.llvmPackages_7;
       llvmPackages = pkgs.llvmPackages_7;
     };
     ghc8101 = callPackage ../development/compilers/ghc/8.10.1.nix {
-      bootPkgs = packages.ghc863Binary;
+      bootPkgs = packages.ghc865Binary;
       inherit (buildPackages.python3Packages) sphinx;
       buildLlvmPackages = buildPackages.llvmPackages_9;
       llvmPackages = pkgs.llvmPackages_9;
     };
     ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
-      bootPkgs = packages.ghc863Binary;
+      bootPkgs = packages.ghc865Binary;
       inherit (buildPackages.python3Packages) sphinx;
       buildLlvmPackages = buildPackages.llvmPackages_6;
       llvmPackages = pkgs.llvmPackages_6;
@@ -117,9 +117,9 @@ in {
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { };
       packageSetConfig = bootstrapPackageSet;
     };
-    ghc863Binary = callPackage ../development/haskell-modules {
-      buildHaskellPackages = bh.packages.ghc863Binary;
-      ghc = bh.compiler.ghc863Binary;
+    ghc865Binary = callPackage ../development/haskell-modules {
+      buildHaskellPackages = bh.packages.ghc865Binary;
+      ghc = bh.compiler.ghc865Binary;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { };
       packageSetConfig = bootstrapPackageSet;
     };

From f6d2dce2bf911f76abb2407a65a654da84c82800 Mon Sep 17 00:00:00 2001
From: Gabor Greif <ggreif@gmail.com>
Date: Tue, 24 Mar 2020 22:51:50 +0100
Subject: [PATCH 4172/4636] ghc-8.10.1: reformat to minimize diff with
 8.8.3.nix

---
 pkgs/development/compilers/ghc/8.10.1.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix
index dba715285b1e..9198d08cef45 100644
--- a/pkgs/development/compilers/ghc/8.10.1.nix
+++ b/pkgs/development/compilers/ghc/8.10.1.nix
@@ -149,15 +149,21 @@ stdenv.mkDerivation (rec {
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms = [ "build" "host" ]
     ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
   # `--with` flags for libraries needed for RTS linker
   configureFlags = [
     "--datadir=$doc/share/doc/ghc"
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
+  ] ++ stdenv.lib.optionals (libffi != null) [
+    "--with-system-libffi"
+    "--with-ffi-includes=${targetPackages.libffi.dev}/include"
+    "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
   ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
-    "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
+    "--with-gmp-includes=${targetPackages.gmp.dev}/include"
+    "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
   ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
-    "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
+    "--with-iconv-includes=${libiconv}/include"
+    "--with-iconv-libraries=${libiconv}/lib"
   ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
   ] ++ stdenv.lib.optionals useLdGold [

From 5180ec3506133665e49e7ac42274d677c1705d36 Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Wed, 18 Mar 2020 19:16:52 +0900
Subject: [PATCH 4173/4636] ghc865Binary: aarch64 support

---
 pkgs/development/compilers/ghc/8.6.5-binary.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix
index dcce7f80281e..97793d912895 100644
--- a/pkgs/development/compilers/ghc/8.6.5-binary.nix
+++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix
@@ -1,12 +1,15 @@
 { stdenv
 , fetchurl, perl, gcc
 , ncurses5, gmp, glibc, libiconv
+, llvmPackages
 }:
 
 # Prebuilt only does native
 assert stdenv.targetPlatform == stdenv.hostPlatform;
 
 let
+  useLLVM = !stdenv.targetPlatform.isx86;
+
   libPath = stdenv.lib.makeLibraryPath ([
     ncurses5 gmp
   ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
@@ -38,6 +41,10 @@ stdenv.mkDerivation rec {
       url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb9-linux.tar.xz";
       sha256 = "1pqlx6rdjs2110g0y1i9f8x18lmdizibjqd15f5xahcz39hgaxdw";
     };
+    aarch64-linux = {
+      url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-ubuntu18.04-linux.tar.xz";
+      sha256 = "11n7l2a36i5vxzzp85la2555q4m34l747g0pnmd81cp46y85hlhq";
+    };
     x86_64-darwin = {
       url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
       sha256 = "0s9188vhhgf23q3rjarwhbr524z6h2qga5xaaa2pma03sfqvvhfz";
@@ -46,6 +53,7 @@ stdenv.mkDerivation rec {
     or (throw "cannot bootstrap GHC on this platform"));
 
   nativeBuildInputs = [ perl ];
+  propagatedBuildInputs = stdenv.lib.optionals useLLVM [ llvmPackages.llvm ];
 
   # Cannot patchelf beforehand due to relative RPATHs that anticipate
   # the final install location/
@@ -169,5 +177,5 @@ stdenv.mkDerivation rec {
   };
 
   meta.license = stdenv.lib.licenses.bsd3;
-  meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];
+  meta.platforms = ["x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"];
 }

From 721b2929d7bd92c14db03d586f64defa9b23e068 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 22 Mar 2020 22:45:37 +0100
Subject: [PATCH 4174/4636] LTS Haskell 15.5

---
 .../configuration-hackage2nix.yaml            | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index f0717b3514f6..4d38e01375d8 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -76,7 +76,7 @@ default-package-overrides:
   # gi-gdkx11-4.x requires gtk-4.x, which is still under development and
   # not yet available in Nixpkgs
   - gi-gdkx11 < 4
-  # LTS Haskell 15.4
+  # LTS Haskell 15.5
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Angle ==1.0
@@ -88,7 +88,7 @@ default-package-overrides:
   - adjunctions ==4.4
   - adler32 ==0.1.2.0
   - advent-of-code-api ==0.2.7.0
-  - aeson ==1.4.6.0
+  - aeson ==1.4.7.0
   - aeson-attoparsec ==0.0.0
   - aeson-better-errors ==0.9.1.0
   - aeson-casing ==0.2.0.0
@@ -267,7 +267,7 @@ default-package-overrides:
   - auto-update ==0.1.6
   - avers ==0.0.17.1
   - avro ==0.4.7.0
-  - aws-cloudfront-signed-cookies ==0.2.0.1
+  - aws-cloudfront-signed-cookies ==0.2.0.4
   - base16-bytestring ==0.1.1.6
   - base32string ==0.9.1
   - base58string ==0.10.0
@@ -407,7 +407,7 @@ default-package-overrides:
   - Chart-diagrams ==1.9.3
   - chaselev-deque ==0.5.0.5
   - ChasingBottoms ==1.3.1.7
-  - checkers ==0.5.4
+  - checkers ==0.5.5
   - checksum ==0.0
   - chimera ==0.3.0.0
   - choice ==0.2.2
@@ -448,6 +448,7 @@ default-package-overrides:
   - colorful-monoids ==0.2.1.2
   - colorize-haskell ==1.0.1
   - colour ==2.3.5
+  - colourista ==0.0.0.0
   - combinatorial ==0.1.0.1
   - comfort-array ==0.4
   - comfort-graph ==0.0.3.1
@@ -466,11 +467,11 @@ default-package-overrides:
   - concurrent-output ==1.10.11
   - concurrent-split ==0.0.1.1
   - cond ==0.4.1.1
-  - conduit ==1.3.1.2
+  - conduit ==1.3.2
   - conduit-algorithms ==0.0.11.0
   - conduit-combinators ==1.3.0
   - conduit-concurrent-map ==0.1.1
-  - conduit-extra ==1.3.4
+  - conduit-extra ==1.3.5
   - conduit-parse ==0.2.1.0
   - conduit-zstd ==0.0.1.1
   - conferer ==0.2.0.0
@@ -617,7 +618,7 @@ default-package-overrides:
   - distributed-closure ==0.4.2.0
   - distribution-opensuse ==1.1.1
   - distributive ==0.6.1
-  - dl-fedora ==0.7.3
+  - dl-fedora ==0.7.4
   - dlist ==0.8.0.7
   - dlist-instances ==0.1.1.1
   - dlist-nonempty ==0.1.1
@@ -806,7 +807,7 @@ default-package-overrides:
   - generic-random ==1.3.0.0
   - generics-sop ==0.5.0.0
   - generics-sop-lens ==0.2
-  - genvalidity ==0.10.0.1
+  - genvalidity ==0.10.0.2
   - genvalidity-aeson ==0.3.0.0
   - genvalidity-bytestring ==0.5.0.1
   - genvalidity-containers ==0.8.0.2
@@ -834,12 +835,12 @@ default-package-overrides:
   - ghc-compact ==0.1.0.0
   - ghc-core ==0.5.6
   - ghc-exactprint ==0.6.2
-  - ghcid ==0.8.3
+  - ghcid ==0.8.5
   - ghci-hexcalc ==0.1.1.0
   - ghcjs-codemirror ==0.0.0.2
   - ghc-lib ==8.8.3.20200224
   - ghc-lib-parser ==8.8.3.20200224
-  - ghc-lib-parser-ex ==8.8.5.6
+  - ghc-lib-parser-ex ==8.8.5.8
   - ghc-paths ==0.1.0.12
   - ghc-prof ==1.4.1.6
   - ghc-source-gen ==0.3.0.0
@@ -1150,7 +1151,7 @@ default-package-overrides:
   - io-streams-haproxy ==1.0.1.0
   - ip ==1.7.1
   - ip6addr ==1.0.1
-  - iproute ==1.7.8
+  - iproute ==1.7.9
   - IPv6Addr ==1.1.3
   - ipynb ==0.1
   - ipython-kernel ==0.10.1.0
@@ -1727,7 +1728,7 @@ default-package-overrides:
   - reinterpret-cast ==0.1.0
   - relapse ==1.0.0.0
   - relational-query ==0.12.2.2
-  - relational-schemas ==0.1.7.0
+  - relational-schemas ==0.1.8.0
   - relude ==0.6.0.0
   - renderable ==0.2.0.1
   - replace-attoparsec ==1.2.0.0
@@ -1770,7 +1771,7 @@ default-package-overrides:
   - safe-json ==1.1.0
   - safe-money ==0.9
   - SafeSemaphore ==0.10.1
-  - salak ==0.3.5.3
+  - salak ==0.3.6
   - salak-yaml ==0.3.5.3
   - saltine ==0.1.1.0
   - salve ==1.0.8
@@ -2179,7 +2180,7 @@ default-package-overrides:
   - unix-time ==0.4.7
   - unliftio ==0.2.12.1
   - unliftio-core ==0.1.2.0
-  - unliftio-pool ==0.2.1.0
+  - unliftio-pool ==0.2.1.1
   - unlit ==0.4.0.0
   - unordered-containers ==0.2.10.0
   - unordered-intmap ==0.1.1

From 9a8d3ca54249d782f349dcb069cf5ce8e4f3a7a8 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sat, 21 Mar 2020 00:18:10 +0100
Subject: [PATCH 4175/4636] hackage2nix: Restore arion-compose

---
 .../development/haskell-modules/configuration-hackage2nix.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 4d38e01375d8..0c5064fc82d6 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2467,6 +2467,8 @@ package-maintainers:
     - shakespeare
   abbradar:
     - Agda
+  roberth:
+    - arion-compose
   cdepillabout:
     - pretty-simple
     - spago
@@ -2861,7 +2863,6 @@ broken-packages:
   - arguedit
   - ariadne
   - arion
-  - arion-compose
   - armada
   - armor
   - arpa

From 4e7639afa678031a8e86247782430ab3b92e5571 Mon Sep 17 00:00:00 2001
From: Mike Sperber <sperber@deinprogramm.de>
Date: Tue, 24 Mar 2020 15:37:55 +0100
Subject: [PATCH 4176/4636] ghc-tcplugins-extra: include version 0.3.2

This is slightly outdated, required by polysemy-plugin, the actual fix
for this will be forthcoming as soon as hackage-packages.nix is
updated.
---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 0c5064fc82d6..d5283936f975 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2374,6 +2374,7 @@ extra-packages:
   - dhall == 1.29.0                     # required for spago 0.14.0.
   - doctemplates == 0.8                 # required by pandoc-2.9.x
   - generic-deriving == 1.10.5.*        # new versions don't compile with GHC 7.10.x
+  - ghc-tcplugins-extra ==0.3.2         # required for polysemy-plugin 0.2.5.0
   - gloss < 1.9.3                       # new versions don't compile with GHC 7.8.x
   - haddock == 2.22.*                   # required on GHC 8.0.x
   - haddock-api == 2.22.*               # required on GHC 7.8.x

From 739f12ee3c3cc1a7264f27477df8efd0f0e43027 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 27 Mar 2020 20:09:43 +0100
Subject: [PATCH 4177/4636] hackage2nix: update list of broken packages

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index d5283936f975..c62797a304e9 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -7121,6 +7121,7 @@ broken-packages:
   - llvm-base-types
   - llvm-base-util
   - llvm-data-interop
+  - llvm-dsl
   - llvm-extension
   - llvm-extra
   - llvm-ffi
@@ -10112,6 +10113,7 @@ broken-packages:
   - touched
   - Tournament
   - toxcore
+  - toxcore-c
   - toxiproxy-haskell
   - toysolver
   - tpar

From a25c3fa290e03a03213625218143cd3c77498544 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 21 Mar 2020 02:30:52 +0100
Subject: [PATCH 4178/4636] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.15.1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/e0bc864e0b6edb5e5ce1ec4bfa763a442b343bf5.
---
 .../haskell-modules/hackage-packages.nix      | 2471 ++++++++++++-----
 1 file changed, 1782 insertions(+), 689 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 5d7e04c71354..12c78cc7b471 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -7199,6 +7199,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "Gleam" = callPackage
+    ({ mkDerivation, base, mtl, split, threepenny-gui }:
+     mkDerivation {
+       pname = "Gleam";
+       version = "0.1.0.0";
+       sha256 = "0j822hblrd0p343w9ds0fa75s3grgpiyv180hsw3ld3pj30fcc8b";
+       libraryHaskellDepends = [ base mtl split threepenny-gui ];
+       description = "HTML Canvas graphics, animations and simulations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Glob" = callPackage
     ({ mkDerivation, base, containers, directory, dlist, filepath
      , HUnit, QuickCheck, test-framework, test-framework-hunit
@@ -9326,6 +9337,8 @@ self: {
        pname = "HTTP";
        version = "4000.3.14";
        sha256 = "0yv8mbjicpl7l2017c4dhm49117lblgwpy1llv368wci1vrxf0m6";
+       revision = "1";
+       editedCabalFile = "1inz9grpl9605bbymy6n5y4as54mlykbsiw8wpm5gl6qvxgrf69w";
        libraryHaskellDepends = [
          array base bytestring mtl network network-uri parsec time
        ];
@@ -9578,8 +9591,8 @@ self: {
      }:
      mkDerivation {
        pname = "HaTeX";
-       version = "3.22.1.0";
-       sha256 = "1an10gxrhb6kxrp2hgmya6bx06xmr6y4dhvz5wnz6jqavnv2mmwh";
+       version = "3.22.2.0";
+       sha256 = "0l2csqvyxl399p6jmp8nkabsn8bh4k94wblh7qbn13q8zrmzmmzp";
        libraryHaskellDepends = [
          base bibtex bytestring containers hashable matrix parsec
          prettyprinter QuickCheck text transformers
@@ -14729,6 +14742,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "OneTuple_0_2_2_1" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "OneTuple";
+       version = "0.2.2.1";
+       sha256 = "15ls6kkf953288q7rsc49bvw467ll4nq28hvsgbaazdn7hf75ixc";
+       libraryHaskellDepends = [ base ];
+       description = "Singleton Tuple";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Only" = callPackage
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
@@ -16067,6 +16092,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) python3;};
 
+  "PyF_0_9_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, directory
+     , filepath, hashable, haskell-src-exts, haskell-src-meta, hspec
+     , HUnit, megaparsec, mtl, process, python3, template-haskell
+     , temporary, text
+     }:
+     mkDerivation {
+       pname = "PyF";
+       version = "0.9.0.1";
+       sha256 = "00pmpm2g7161bksc1l5clkghi0sbzh8y0f6xd52gwx9h6zxacns3";
+       libraryHaskellDepends = [
+         base containers haskell-src-exts haskell-src-meta megaparsec mtl
+         template-haskell text
+       ];
+       testHaskellDepends = [
+         base bytestring deepseq directory filepath hashable hspec HUnit
+         process template-haskell temporary text
+       ];
+       testToolDepends = [ python3 ];
+       description = "Quasiquotations for a python like interpolated string formater";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) python3;};
+
   "QIO" = callPackage
     ({ mkDerivation, base, containers, mtl, old-time, random }:
      mkDerivation {
@@ -23424,38 +23473,6 @@ self: {
      }) {};
 
   "aeson" = callPackage
-    ({ mkDerivation, attoparsec, base, base-compat, base-orphans
-     , base16-bytestring, bytestring, containers, deepseq, Diff
-     , directory, dlist, filepath, generic-deriving, ghc-prim, hashable
-     , hashable-time, integer-logarithms, primitive, QuickCheck
-     , quickcheck-instances, scientific, tagged, tasty, tasty-golden
-     , tasty-hunit, tasty-quickcheck, template-haskell, text
-     , th-abstraction, time, time-compat, unordered-containers
-     , uuid-types, vector
-     }:
-     mkDerivation {
-       pname = "aeson";
-       version = "1.4.6.0";
-       sha256 = "12s8nfsady47zlz94f7m978irwwj0l0v2x41hk8w1i14wb3b4gwj";
-       libraryHaskellDepends = [
-         attoparsec base base-compat bytestring containers deepseq dlist
-         ghc-prim hashable primitive scientific tagged template-haskell text
-         th-abstraction time time-compat unordered-containers uuid-types
-         vector
-       ];
-       testHaskellDepends = [
-         attoparsec base base-compat base-orphans base16-bytestring
-         bytestring containers Diff directory dlist filepath
-         generic-deriving ghc-prim hashable hashable-time integer-logarithms
-         QuickCheck quickcheck-instances scientific tagged tasty
-         tasty-golden tasty-hunit tasty-quickcheck template-haskell text
-         time time-compat unordered-containers uuid-types vector
-       ];
-       description = "Fast JSON parsing and encoding";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "aeson_1_4_7_0" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat
      , base-compat-batteries, base-orphans, base16-bytestring
      , bytestring, containers, deepseq, Diff, directory, dlist, filepath
@@ -23469,6 +23486,40 @@ self: {
        pname = "aeson";
        version = "1.4.7.0";
        sha256 = "15ykkxa636jnx1zcyq4yxgjz78m5fp315gg0llbjf44jk4fbhndh";
+       revision = "2";
+       editedCabalFile = "1198bf628jc6ccn1dr23wia3rdyxhidi9hg83ykzm735ffgh9cxd";
+       libraryHaskellDepends = [
+         attoparsec base base-compat-batteries bytestring containers deepseq
+         dlist ghc-prim hashable primitive scientific tagged
+         template-haskell text th-abstraction time time-compat
+         unordered-containers uuid-types vector
+       ];
+       testHaskellDepends = [
+         attoparsec base base-compat base-orphans base16-bytestring
+         bytestring containers Diff directory dlist filepath
+         generic-deriving ghc-prim hashable hashable-time integer-logarithms
+         QuickCheck quickcheck-instances scientific tagged tasty
+         tasty-golden tasty-hunit tasty-quickcheck template-haskell text
+         time time-compat unordered-containers uuid-types vector
+       ];
+       description = "Fast JSON parsing and encoding";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "aeson_1_4_7_1" = callPackage
+    ({ mkDerivation, attoparsec, base, base-compat
+     , base-compat-batteries, base-orphans, base16-bytestring
+     , bytestring, containers, deepseq, Diff, directory, dlist, filepath
+     , generic-deriving, ghc-prim, hashable, hashable-time
+     , integer-logarithms, primitive, QuickCheck, quickcheck-instances
+     , scientific, tagged, tasty, tasty-golden, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, th-abstraction, time
+     , time-compat, unordered-containers, uuid-types, vector
+     }:
+     mkDerivation {
+       pname = "aeson";
+       version = "1.4.7.1";
+       sha256 = "1502yjw4y5ggp1gmrx0d3pcgrx3zhwbmcz4jb4fcignrbxjldrq7";
        libraryHaskellDepends = [
          attoparsec base base-compat-batteries bytestring containers deepseq
          dlist ghc-prim hashable primitive scientific tagged
@@ -24306,16 +24357,17 @@ self: {
      }) {};
 
   "aeson-value-parser" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, hashable, mtl
-     , scientific, text, transformers, unordered-containers, vector
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, hashable
+     , megaparsec, mtl, scientific, text, text-builder, transformers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "aeson-value-parser";
-       version = "0.18";
-       sha256 = "1n288jb8ksjb6psgal4q6p7ad13sdak3llk54nc0gg5w2r20x634";
+       version = "0.19";
+       sha256 = "1v8s1f0zxhvf0r0cr800x363361g7il2wmbah04kr1vl376ydcjy";
        libraryHaskellDepends = [
-         aeson attoparsec base bytestring hashable mtl scientific text
-         transformers unordered-containers vector
+         aeson attoparsec base bytestring hashable megaparsec mtl scientific
+         text text-builder transformers unordered-containers vector
        ];
        description = "API for parsing \"aeson\" JSON tree into Haskell types";
        license = stdenv.lib.licenses.mit;
@@ -25913,8 +25965,8 @@ self: {
        pname = "amazonka";
        version = "1.6.1";
        sha256 = "104ifvmwdc1w3y42qcbq57v579zcnmlfv3f0bsazbcqdxnvr9dzd";
-       revision = "1";
-       editedCabalFile = "0xn4wy5gb1h4f4wd2h5ic17nb6ilikmsp1qip6xxc3img5rmaqyq";
+       revision = "2";
+       editedCabalFile = "171rp3cbgy58lps437c1jfpmi4xsp0z4pral7jh3mybn73l672zm";
        libraryHaskellDepends = [
          amazonka-core base bytestring conduit conduit-extra directory
          exceptions http-client http-conduit http-types ini mmorph
@@ -29720,6 +29772,18 @@ self: {
        broken = true;
      }) {};
 
+  "aop-prelude" = callPackage
+    ({ mkDerivation, base, ghc-prim }:
+     mkDerivation {
+       pname = "aop-prelude";
+       version = "0.1.0.0";
+       sha256 = "0jgv33h50mb5i0fignmxngijcrv59wnnljnf1idrf7n57kgrrjlg";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base ghc-prim ];
+       description = "prelude for Algebra of Programming";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aos-signature" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, memory, mtl
      , protolude, QuickCheck, random, tasty, tasty-hunit
@@ -31491,8 +31555,8 @@ self: {
      }:
      mkDerivation {
        pname = "arion-compose";
-       version = "0.1.1.0";
-       sha256 = "0d90m39gir2371wgjkkmb7yrqr92zncjr6naz68r64a9mq38ga90";
+       version = "0.1.1.1";
+       sha256 = "0qi9mj67j3kq02psm3qa855rk0hpz2pvfa7ggx4jhzqnf60xd9ph";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -31510,8 +31574,7 @@ self: {
        ];
        description = "Run docker-compose with help from Nix/NixOS";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
+       maintainers = with stdenv.lib.maintainers; [ roberth ];
      }) {};
 
   "arith-encode" = callPackage
@@ -32477,6 +32540,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "asn1-types_0_3_4" = callPackage
+    ({ mkDerivation, base, bytestring, hourglass, memory }:
+     mkDerivation {
+       pname = "asn1-types";
+       version = "0.3.4";
+       sha256 = "1a119qxhxhr0yn37r26dkydm6g5kykdkx98ghb59i4ipa6i95vkq";
+       libraryHaskellDepends = [ base bytestring hourglass memory ];
+       description = "ASN.1 types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "asn1dump" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring, pem
      }:
@@ -32619,6 +32694,8 @@ self: {
        pname = "assoc";
        version = "1.0.1";
        sha256 = "1m9n4vp190bvn2wcrd4ggfwa9pi93jp0zgx02mdgywn2zfidw020";
+       revision = "1";
+       editedCabalFile = "1q6sc9v79p2pdm7aa6mfbn824vc01wj267saf2gp86b3wzgp0mrh";
        libraryHaskellDepends = [ base bifunctors tagged ];
        description = "swap and assoc: Symmetric and Semigroupy Bifunctors";
        license = stdenv.lib.licenses.bsd3;
@@ -32837,6 +32914,8 @@ self: {
        pname = "async";
        version = "2.2.2";
        sha256 = "1zxvfcyy4sg8lmzphi5dgnavksj5pav6rbvd5kc48lf4hanb2jjb";
+       revision = "1";
+       editedCabalFile = "1kg9xmby0wkx31998h2r43yr8bl1aixk6025zqigz9vdhmkc2y51";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base hashable stm ];
@@ -33632,6 +33711,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "attoparsec_0_13_2_4" = callPackage
+    ({ mkDerivation, array, base, bytestring, case-insensitive
+     , containers, criterion, deepseq, directory, filepath, ghc-prim
+     , http-types, parsec, QuickCheck, quickcheck-unicode, scientific
+     , tasty, tasty-quickcheck, text, transformers, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "attoparsec";
+       version = "0.13.2.4";
+       sha256 = "1cpgxc17lh4lnpblb3cimpq4ka23bf89q6yvd0jwk7klw5nwsrms";
+       libraryHaskellDepends = [
+         array base bytestring containers deepseq scientific text
+         transformers
+       ];
+       testHaskellDepends = [
+         array base bytestring deepseq QuickCheck quickcheck-unicode
+         scientific tasty tasty-quickcheck text transformers vector
+       ];
+       benchmarkHaskellDepends = [
+         array base bytestring case-insensitive containers criterion deepseq
+         directory filepath ghc-prim http-types parsec scientific text
+         transformers unordered-containers vector
+       ];
+       description = "Fast combinator parsing for bytestrings and text";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "attoparsec-arff" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring }:
      mkDerivation {
@@ -34641,6 +34749,44 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "avro_0_5_0_0" = callPackage
+    ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
+     , binary, bytestring, containers, data-binary-ieee754, deepseq
+     , directory, doctest, doctest-discover, extra, fail, gauge
+     , generic-lens, HasBigDecimal, hashable, hedgehog, hspec
+     , hspec-discover, hw-hspec-hedgehog, lens, lens-aeson, mtl
+     , QuickCheck, random, raw-strings-qq, scientific, semigroups
+     , tagged, template-haskell, text, tf-random, time, transformers
+     , unordered-containers, uuid, vector, zlib
+     }:
+     mkDerivation {
+       pname = "avro";
+       version = "0.5.0.0";
+       sha256 = "01p7a56w7vg9q4ybfxyprw5cnnprava3nlay2vwq360ixw6m0s5z";
+       libraryHaskellDepends = [
+         aeson array base base16-bytestring bifunctors binary bytestring
+         containers data-binary-ieee754 deepseq fail HasBigDecimal hashable
+         mtl raw-strings-qq scientific semigroups tagged template-haskell
+         text tf-random time unordered-containers uuid vector zlib
+       ];
+       testHaskellDepends = [
+         aeson array base base16-bytestring bifunctors binary bytestring
+         containers directory doctest doctest-discover extra fail
+         generic-lens HasBigDecimal hashable hedgehog hspec
+         hw-hspec-hedgehog lens lens-aeson mtl QuickCheck raw-strings-qq
+         scientific semigroups tagged text tf-random time transformers
+         unordered-containers uuid vector zlib
+       ];
+       testToolDepends = [ doctest-discover hspec-discover ];
+       benchmarkHaskellDepends = [
+         aeson base binary bytestring containers deepseq gauge hashable mtl
+         random raw-strings-qq text transformers unordered-containers vector
+       ];
+       description = "Avro serialization support for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "avro-piper" = callPackage
     ({ mkDerivation, aeson, avro, base, bytestring, conduit
      , conduit-combinators, conduit-extra, hedgehog, hspec
@@ -34790,31 +34936,6 @@ self: {
      }) {};
 
   "aws-cloudfront-signed-cookies" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, asn1-encoding, asn1-types
-     , base, base64-bytestring, bytestring, cookie, cryptonite, hedgehog
-     , lens, lens-aeson, neat-interpolation, optparse-applicative, pem
-     , text, time, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "aws-cloudfront-signed-cookies";
-       version = "0.2.0.1";
-       sha256 = "1yk40n6gjs72pyi6yjwhqj0dngqc4b74rpg0ji61852nbb0snl28";
-       revision = "3";
-       editedCabalFile = "1v0bbyskwbawfhaji3s63hjrzwsi2bb7l8g6yxdp02bp6zb92757";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty asn1-encoding asn1-types base base64-bytestring
-         bytestring cookie cryptonite lens lens-aeson optparse-applicative
-         pem text time unordered-containers vector
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [ base hedgehog neat-interpolation ];
-       description = "Generate signed cookies for AWS CloudFront";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "aws-cloudfront-signed-cookies_0_2_0_4" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, asn1-encoding, asn1-types
      , base, base64-bytestring, bytestring, cookie, cryptonite, hedgehog
      , lens, lens-aeson, neat-interpolation, optparse-applicative, pem
@@ -34835,7 +34956,6 @@ self: {
        testHaskellDepends = [ base hedgehog neat-interpolation ];
        description = "Generate signed cookies for AWS CloudFront";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-cloudfront-signer" = callPackage
@@ -35170,8 +35290,8 @@ self: {
      }:
      mkDerivation {
        pname = "aws-lambda-haskell-runtime";
-       version = "2.0.3";
-       sha256 = "1ycqwmpgqzdb8kz3w6yzf44id32pc3vin1w3j0klzzg2k51l4nnr";
+       version = "2.0.4";
+       sha256 = "0gzg1g5669lr7p5sg22r6b952c7pn39rjr9y0ss77jvl7klhykr8";
        libraryHaskellDepends = [
          aeson base bytestring http-client http-types path path-io
          safe-exceptions-checked template-haskell text
@@ -36402,8 +36522,8 @@ self: {
     ({ mkDerivation, base, base-compat }:
      mkDerivation {
        pname = "base-compat-migrate";
-       version = "0.2.0.0";
-       sha256 = "0xc9fjdv4bx5isw39l9aknvwvi46zpc4930wxvsx0v4qa8yhfpaa";
+       version = "0.2.0.1";
+       sha256 = "18nyacdji89ys6h7hw28b6rz6p9gkasd4c0l7awz79wp0w8a0cdm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base base-compat ];
@@ -36525,8 +36645,8 @@ self: {
      }:
      mkDerivation {
        pname = "base16";
-       version = "0.1.2.1";
-       sha256 = "1dqkqyyqdym48fh59zz3jyvhbbc70q37fvx2zv80cmysa929d1fr";
+       version = "0.1.3.0";
+       sha256 = "0gjcf05c604dqb0av25p24m0f5r1g6h4bv24lccrbc614w2gng5j";
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [
          base base16-bytestring bytestring memory random-bytestring tasty
@@ -36557,8 +36677,8 @@ self: {
      }:
      mkDerivation {
        pname = "base16-lens";
-       version = "0.1.0.0";
-       sha256 = "17cckwpl3c7bf6jj8l1jbwpb0hlsqp7iv3mllb59gp38nfdn51rd";
+       version = "0.1.1.0";
+       sha256 = "056fskaj5g19yp8fzvvx3ij60hhk4i7xind1pdzv3ark2ywy1d21";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base base16 bytestring lens text ];
        testHaskellDepends = [ base doctest lens ];
@@ -38625,6 +38745,8 @@ self: {
        pname = "bin";
        version = "0.1";
        sha256 = "008i0yxvg9v05gby6ysq3f7ygh125p9xa5vwrcrbq5xw79igyzq5";
+       revision = "1";
+       editedCabalFile = "1v62ca89qdzcm03ziwaq335cwd66mwl854c6gf61vnplrbznqm33";
        libraryHaskellDepends = [
          base dec deepseq fin hashable QuickCheck
        ];
@@ -38851,10 +38973,8 @@ self: {
      }:
      mkDerivation {
        pname = "binary-instances";
-       version = "1";
-       sha256 = "07y9582vsw94ks8whkd3dcmf4wdwlq8riyk2shmxxprkq0gsv3z0";
-       revision = "2";
-       editedCabalFile = "0yawdwm086gk51y5s5zbybiwiv386cx8xyj6kcgj9wwdidcnaxdi";
+       version = "1.0.0.1";
+       sha256 = "0f8ilzpwj7gbyvlswlkd48dzpj9m13ipinw55lvjag0ir52idk9a";
        libraryHaskellDepends = [
          aeson base binary binary-orphans case-insensitive hashable
          scientific tagged text text-binary time-compat unordered-containers
@@ -41217,6 +41337,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) gmp;};
 
+  "bitvec_1_0_3_0" = callPackage
+    ({ mkDerivation, base, containers, deepseq, gauge, ghc-prim, gmp
+     , integer-gmp, primitive, quickcheck-classes, random, tasty
+     , tasty-hunit, tasty-quickcheck, vector
+     }:
+     mkDerivation {
+       pname = "bitvec";
+       version = "1.0.3.0";
+       sha256 = "0s3gdh2rgz9wdnin5h2yhvnr8gy3sgcl9sbb1k4069ap4svrg8hd";
+       libraryHaskellDepends = [
+         base deepseq ghc-prim integer-gmp primitive vector
+       ];
+       librarySystemDepends = [ gmp ];
+       testHaskellDepends = [
+         base integer-gmp primitive quickcheck-classes tasty tasty-hunit
+         tasty-quickcheck vector
+       ];
+       benchmarkHaskellDepends = [
+         base containers gauge integer-gmp random vector
+       ];
+       description = "Space-efficient bit vectors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) gmp;};
+
   "bitwise" = callPackage
     ({ mkDerivation, array, base, bytestring, criterion, QuickCheck }:
      mkDerivation {
@@ -44115,6 +44260,29 @@ self: {
        broken = true;
      }) {};
 
+  "bson_0_4_0_1" = callPackage
+    ({ mkDerivation, base, binary, bytestring, cryptohash-md5
+     , data-binary-ieee754, mtl, network, QuickCheck, test-framework
+     , test-framework-quickcheck2, text, time
+     }:
+     mkDerivation {
+       pname = "bson";
+       version = "0.4.0.1";
+       sha256 = "1xmxhq1f8v00mbq2l1sb7akzhy0gd9wcylkanpizn68wczqkdi3b";
+       libraryHaskellDepends = [
+         base binary bytestring cryptohash-md5 data-binary-ieee754 mtl
+         network text time
+       ];
+       testHaskellDepends = [
+         base bytestring QuickCheck test-framework
+         test-framework-quickcheck2 text time
+       ];
+       description = "BSON documents are JSON-like objects with a standard binary encoding";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "bson-generic" = callPackage
     ({ mkDerivation, base, bson, ghc-prim, text }:
      mkDerivation {
@@ -45825,10 +45993,8 @@ self: {
     ({ mkDerivation, base, bytestring, composition-prelude, lens }:
      mkDerivation {
        pname = "bzip-signature";
-       version = "0.1.2.0";
-       sha256 = "077bwh3rwig9rml5pz49m4rxbn0j9q6cv7zlc5xlhkmw6plwg4ps";
-       revision = "1";
-       editedCabalFile = "003197s08saac5azpwc4vqvs65244pvp019j9lhr76my6a98iz0f";
+       version = "0.2.0.0";
+       sha256 = "1d2k6dv2wakq51z365s37hn1k1zs785z3f01b90x2dcg6y1xgln7";
        libraryHaskellDepends = [
          base bytestring composition-prelude lens
        ];
@@ -46227,8 +46393,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-cache";
-       version = "1.0.1.5";
-       sha256 = "0bzxpr1lalj3i4qickxpch3ky5d686k1rdba2aymhcr8g89l4m0m";
+       version = "1.0.1.8";
+       sha256 = "0yxq73bdw1ai0yv54prcxpm1ygkpa8m0jnznwm975b82qlmplynw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -46410,8 +46576,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-file-th";
-       version = "0.2.6";
-       sha256 = "0kam97xbmsn0alqyw709fpvj7j5dhdi90n98dmg1sfr5i54gh1nw";
+       version = "0.2.7";
+       sha256 = "1pp8jk7k8nbvhy6vaxsqa7cd321yw1a3685n4fbhgb096hkrldkl";
        libraryHaskellDepends = [
          base Cabal directory pretty template-haskell
        ];
@@ -46446,6 +46612,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cabal-flatpak_0_1_0_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cabal-plan
+     , containers, cryptohash-sha256, http-client, http-client-tls
+     , http-types, optparse-applicative, pathtype, shell-utility, tar
+     , text, utility-ht, zlib
+     }:
+     mkDerivation {
+       pname = "cabal-flatpak";
+       version = "0.1.0.1";
+       sha256 = "12jyzbh4xhqj6rhg9n2za5r8n4j6zdw3x5ixdh5xvw4wivfxqxq9";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson aeson-pretty base bytestring cabal-plan containers
+         cryptohash-sha256 http-client http-client-tls http-types
+         optparse-applicative pathtype shell-utility tar text utility-ht
+         zlib
+       ];
+       description = "Generate a FlatPak manifest from a Cabal package description";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cabal-fmt" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , filepath, mtl, optparse-applicative, parsec, pretty, process
@@ -47033,8 +47222,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-toolkit";
-       version = "0.0.6";
-       sha256 = "0r42hvlzykmas03smsxz8484gnc1r1pan66rcv8ihibj0zw42qb4";
+       version = "0.0.7";
+       sha256 = "08im4qqrg3ribbh6rg2rk7jynnjwjgaysfvgbamanjdwqldjwx7f";
        libraryHaskellDepends = [
          base binary bytestring Cabal containers ghc template-haskell
        ];
@@ -49162,6 +49351,8 @@ self: {
        pname = "cassava";
        version = "0.5.2.0";
        sha256 = "01h1zrdqb313cjd4rqm1107azzx4czqi018c2djf66a5i7ajl3dk";
+       revision = "1";
+       editedCabalFile = "1ph8rf91z4nf1ryrh9s4gd1kq98jlgk2manwddkpch8k0n9xvfk4";
        configureFlags = [ "-f-bytestring--lt-0_10_4" ];
        libraryHaskellDepends = [
          array attoparsec base bytestring containers deepseq hashable Only
@@ -50596,8 +50787,8 @@ self: {
      }:
      mkDerivation {
        pname = "character-cases";
-       version = "0.1.0.0";
-       sha256 = "1383g5fwy11h43268609n9dmvp0wqwgycn9ly8c7g8h4qpyckh38";
+       version = "0.1.0.1";
+       sha256 = "0ywxda9hbylzlf5zyg9x8n65bwdfwgg3vvjl2i2kzj48gkm4kqxy";
        libraryHaskellDepends = [
          base containers here megaparsec prettyprinter template-haskell
        ];
@@ -50605,7 +50796,7 @@ self: {
          base containers doctest Glob here megaparsec prettyprinter
          template-haskell
        ];
-       description = "Exposes subspecies types of Char. And naming cases. e.g. meaning of [a-z], [A-Z], [0-9], PascalCase, camelCase, and sneak_case.";
+       description = "Exposes subspecies types of Char. And naming cases.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
@@ -50878,6 +51069,8 @@ self: {
        pname = "cheapskate";
        version = "0.1.1.2";
        sha256 = "17n6laihqrjn62l8qw4565nf77zkvrl68bjmc3vzr4ckqfblhdzd";
+       revision = "1";
+       editedCabalFile = "15hdlp062gv8x7giwcfbj1kfmhpj1bg7y2w4wr2yl436haxkrbmq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -50996,19 +51189,6 @@ self: {
      }) {};
 
   "checkers" = callPackage
-    ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }:
-     mkDerivation {
-       pname = "checkers";
-       version = "0.5.4";
-       sha256 = "09g1430hjqxy01w0rgp0d03z2y8nw2zjyvfxs0kl9j0gyv57a10v";
-       libraryHaskellDepends = [
-         array base QuickCheck random semigroupoids
-       ];
-       description = "Check properties on standard classes and data structures";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "checkers_0_5_5" = callPackage
     ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }:
      mkDerivation {
        pname = "checkers";
@@ -51019,7 +51199,6 @@ self: {
        ];
        description = "Check properties on standard classes and data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "checkmate" = callPackage
@@ -51218,6 +51397,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "chimera_0_3_1_0" = callPackage
+    ({ mkDerivation, adjunctions, base, distributive, gauge, mtl
+     , QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck, vector
+     }:
+     mkDerivation {
+       pname = "chimera";
+       version = "0.3.1.0";
+       sha256 = "09dk9x2har2k6apm1wlm2k5k97jf3qxy4rzx94rbfmhs5fhz0i99";
+       libraryHaskellDepends = [
+         adjunctions base distributive mtl vector
+       ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck
+         vector
+       ];
+       benchmarkHaskellDepends = [ base gauge mtl random ];
+       description = "Lazy infinite streams with O(1) indexing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "chiphunk" = callPackage
     ({ mkDerivation, base, c2hs, hashable, safe-exceptions, StateVar
      , vector-space
@@ -54546,8 +54747,8 @@ self: {
      }:
      mkDerivation {
        pname = "cobot";
-       version = "0.1.1.0";
-       sha256 = "17cl8dh4y7wyas6afslb1d27ibjc2633dcyx6pc6zng2p36m83l9";
+       version = "0.1.1.1";
+       sha256 = "12bq23am5q0cb58sgifdihc53rwg91m1wvkyr06nkjddh8vgfc3g";
        libraryHaskellDepends = [
          array base bytestring containers deepseq lens linear megaparsec mtl
          split template-haskell text
@@ -54572,8 +54773,8 @@ self: {
      }:
      mkDerivation {
        pname = "cobot-io";
-       version = "0.1.2.8";
-       sha256 = "1snq2ypf7blknhpv86xq1n7f6a9pifd77yylsirqj358j590c4i6";
+       version = "0.1.2.10";
+       sha256 = "00fxjp0qwj0234d3h91pb9qn1l6p4ba36rjpvl0yxfkl3ipfv0kr";
        libraryHaskellDepends = [
          array attoparsec base binary bytestring containers data-msgpack
          deepseq http-conduit hyraxAbif lens linear mtl split text vector
@@ -57720,34 +57921,6 @@ self: {
      }) {};
 
   "conduit" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, directory
-     , exceptions, filepath, gauge, hspec, kan-extensions
-     , mono-traversable, mtl, mwc-random, primitive, QuickCheck
-     , resourcet, safe, silently, split, text, transformers, unix
-     , unliftio, unliftio-core, vector
-     }:
-     mkDerivation {
-       pname = "conduit";
-       version = "1.3.1.2";
-       sha256 = "12c21vrij63z60y3xd0dkg0da8sdhfq6nj5s3p5qknys5klwpqkq";
-       libraryHaskellDepends = [
-         base bytestring directory exceptions filepath mono-traversable mtl
-         primitive resourcet text transformers unix unliftio-core vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers directory exceptions filepath hspec
-         mono-traversable mtl QuickCheck resourcet safe silently split text
-         transformers unliftio vector
-       ];
-       benchmarkHaskellDepends = [
-         base containers deepseq gauge hspec kan-extensions mwc-random
-         transformers vector
-       ];
-       description = "Streaming data processing library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "conduit_1_3_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, directory
      , exceptions, filepath, gauge, hspec, kan-extensions
      , mono-traversable, mtl, mwc-random, primitive, QuickCheck
@@ -57773,7 +57946,6 @@ self: {
        ];
        description = "Streaming data processing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-algorithms" = callPackage
@@ -57964,34 +58136,6 @@ self: {
      }) {};
 
   "conduit-extra" = callPackage
-    ({ mkDerivation, async, attoparsec, base, bytestring
-     , bytestring-builder, conduit, directory, exceptions, filepath
-     , gauge, hspec, network, primitive, process, QuickCheck, resourcet
-     , stm, streaming-commons, text, transformers, transformers-base
-     , typed-process, unliftio-core
-     }:
-     mkDerivation {
-       pname = "conduit-extra";
-       version = "1.3.4";
-       sha256 = "1d853d39vj5pb8yxfcsnjwdzqzkm34ixzbnba8bslpihb7182wxi";
-       libraryHaskellDepends = [
-         async attoparsec base bytestring conduit directory filepath network
-         primitive process resourcet stm streaming-commons text transformers
-         typed-process unliftio-core
-       ];
-       testHaskellDepends = [
-         async attoparsec base bytestring bytestring-builder conduit
-         directory exceptions filepath hspec process QuickCheck resourcet
-         stm streaming-commons text transformers transformers-base
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring bytestring-builder conduit gauge transformers
-       ];
-       description = "Batteries included conduit: adapters for common libraries";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "conduit-extra_1_3_5" = callPackage
     ({ mkDerivation, async, attoparsec, base, bytestring
      , bytestring-builder, conduit, directory, exceptions, filepath
      , gauge, hspec, network, primitive, process, QuickCheck, resourcet
@@ -58017,7 +58161,6 @@ self: {
        ];
        description = "Batteries included conduit: adapters for common libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-find" = callPackage
@@ -58666,6 +58809,8 @@ self: {
        pname = "config-schema";
        version = "1.2.0.0";
        sha256 = "0lz9y2qnjc576mbl3qnhyf4c1y5f71q7f5jgv8rj7vsg855q99hm";
+       revision = "1";
+       editedCabalFile = "1hlk2syn4z5zzvdc8nr3wprdpbmcjyp77spdzvyma626931m8p3a";
        libraryHaskellDepends = [
          base config-value containers free kan-extensions pretty
          semigroupoids text transformers
@@ -58698,8 +58843,8 @@ self: {
        pname = "config-value";
        version = "0.7.0.1";
        sha256 = "0r7qylqmdvif75ylb0d0zryl2ghxl3ip9a2jhyq70aqxwdjh18g4";
-       revision = "1";
-       editedCabalFile = "10rdyg984dkd0xq9z54300wkkgl7zfj4l8bi4vlplvw6jh65v36c";
+       revision = "2";
+       editedCabalFile = "1kwn53qb7hzjgkk9fh8mabyhxjm5rkw9qapk16isx1s4vns8x9l6";
        libraryHaskellDepends = [ array base pretty text ];
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [ base text ];
@@ -58713,6 +58858,8 @@ self: {
        pname = "config-value-getopt";
        version = "0.1.1.1";
        sha256 = "103afdadsh7vqfam61mixk0l2fxy41m0451bl2hl2djs3acj60b2";
+       revision = "1";
+       editedCabalFile = "1b5wfbqjjx6y8ll5h3vp2cmcdrcnjd3295y8ykd25yjx6f3swsja";
        libraryHaskellDepends = [ base config-value text ];
        description = "Interface between config-value and System.GetOpt";
        license = stdenv.lib.licenses.mit;
@@ -62268,6 +62415,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "cron_0_7_0" = callPackage
+    ({ mkDerivation, attoparsec, base, criterion, data-default-class
+     , hedgehog, mtl, mtl-compat, old-locale, semigroups, tasty
+     , tasty-hedgehog, tasty-hunit, text, time, transformers-compat
+     }:
+     mkDerivation {
+       pname = "cron";
+       version = "0.7.0";
+       sha256 = "0f8jb2pxy89hkdnm20yz88b3j3vgh1a9c1dxiym3150izp34ikd5";
+       libraryHaskellDepends = [
+         attoparsec base data-default-class mtl mtl-compat old-locale
+         semigroups text time
+       ];
+       testHaskellDepends = [
+         attoparsec base hedgehog semigroups tasty tasty-hedgehog
+         tasty-hunit text time transformers-compat
+       ];
+       benchmarkHaskellDepends = [ attoparsec base criterion text time ];
+       description = "Cron datatypes and Attoparsec parser";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cron-compat" = callPackage
     ({ mkDerivation, attoparsec, base, cron, derive, hspec
      , hspec-expectations, mtl, mtl-compat, old-locale, QuickCheck, text
@@ -62764,8 +62934,8 @@ self: {
      }:
      mkDerivation {
        pname = "cryptoconditions";
-       version = "0.2.4";
-       sha256 = "1mbi3h21xfzsripixkvakw4kp36n8jzwsyajjxwllq3nxq3lwgp0";
+       version = "0.2.5";
+       sha256 = "0p4y5irjqvd79qr1gq5v57pnyg1z4vm9pmlv9dx3v59vakz0yfcf";
        libraryHaskellDepends = [
          aeson asn1-encoding asn1-parse asn1-types base base64-bytestring
          bytestring containers cryptonite memory text
@@ -62882,8 +63052,8 @@ self: {
        pname = "cryptohash-sha256";
        version = "0.11.101.0";
        sha256 = "1p85vajcgw9hmq8zsz9krzx0vxh7aggwbg5w9ws8w97avcsn8xaj";
-       revision = "3";
-       editedCabalFile = "1arhz4y792kx439s2zv9x291gvvl2zxcfx9sq0nxsjlz7c3hpyp1";
+       revision = "4";
+       editedCabalFile = "00p6sx2n1pzykm3my68hjfk8l66g66rh7inrfcnkd5mhilqdcqxr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
@@ -63336,6 +63506,44 @@ self: {
        broken = true;
      }) {};
 
+  "css-easings" = callPackage
+    ({ mkDerivation, aeson, base, blaze-markup, data-default
+     , QuickCheck, scientific, shakespeare, text
+     }:
+     mkDerivation {
+       pname = "css-easings";
+       version = "0.2.0.0";
+       sha256 = "0i969cp4j154ddq7x2821p53qh8dnsr7f74rsdi4y9rbbls1fnpv";
+       libraryHaskellDepends = [
+         aeson base blaze-markup data-default QuickCheck scientific
+         shakespeare text
+       ];
+       description = "Defining and manipulating css easing strings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "css-selectors" = callPackage
+    ({ mkDerivation, aeson, alex, array, base, blaze-markup
+     , data-default, Decimal, happy, QuickCheck, shakespeare
+     , template-haskell, test-framework, test-framework-quickcheck2
+     , text
+     }:
+     mkDerivation {
+       pname = "css-selectors";
+       version = "0.2.0.0";
+       sha256 = "1wyc06f14nj5v5ysjly3jimja3y47pvnm8vm2knlw3sli1h0pgxi";
+       libraryHaskellDepends = [
+         aeson array base blaze-markup data-default Decimal QuickCheck
+         shakespeare template-haskell text
+       ];
+       libraryToolDepends = [ alex happy ];
+       testHaskellDepends = [
+         base QuickCheck test-framework test-framework-quickcheck2 text
+       ];
+       description = "Parsing, rendering and manipulating css selectors in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "css-syntax" = callPackage
     ({ mkDerivation, base, criterion, deepseq, directory, hspec
      , QuickCheck, scientific, text
@@ -68172,8 +68380,8 @@ self: {
        pname = "dec";
        version = "0.0.3";
        sha256 = "1y8bvlm2371dq2v0jv1srki98nbhbz091wh0g2x58wz78h971f6r";
-       revision = "1";
-       editedCabalFile = "09dkybwqmayf2a1sn94vmmma2xfvf07bw7grhcyjm7lq9jpxv8y0";
+       revision = "2";
+       editedCabalFile = "1v5f5yby0cld1ziqqgkcx8b50qkpviplspm82a6wl7lw28cjm0hs";
        libraryHaskellDepends = [ base ];
        description = "Decidable propositions";
        license = stdenv.lib.licenses.bsd3;
@@ -68982,8 +69190,8 @@ self: {
      }:
      mkDerivation {
        pname = "dependent-map";
-       version = "0.3";
-       sha256 = "1azy6yrnd0adga4z2mlp9knbp55xhlj4v9c3rb2lr1sd2l8cgf80";
+       version = "0.4.0.0";
+       sha256 = "0b0zhyl3wkl4kkrxvq7vwjz3gn0ndxjjgyw9cky8a6xyv190pkjk";
        libraryHaskellDepends = [
          base constraints-extras containers dependent-sum
        ];
@@ -69024,12 +69232,12 @@ self: {
      }) {};
 
   "dependent-sum" = callPackage
-    ({ mkDerivation, base, constraints-extras }:
+    ({ mkDerivation, base, constraints-extras, some }:
      mkDerivation {
        pname = "dependent-sum";
-       version = "0.6.2.0";
-       sha256 = "17xj5mfrqbhf614z25l2km5grhrxh1rfhb8h8g677sv2xgxrv82d";
-       libraryHaskellDepends = [ base constraints-extras ];
+       version = "0.7.1.0";
+       sha256 = "0aj63gvak0y4mgxndykqfg5w958hf7lp5blml2z647rjgy85bjw1";
+       libraryHaskellDepends = [ base constraints-extras some ];
        description = "Dependent sum type";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -69058,8 +69266,8 @@ self: {
      }:
      mkDerivation {
        pname = "dependent-sum-template";
-       version = "0.1.0.0";
-       sha256 = "07z95f27jpdb8y01f904z0fi6kjllsbcm2zg0k1v9y8c6rwavw0f";
+       version = "0.1.0.3";
+       sha256 = "1px4dj0czdsg4lx4c09v1pil4zifrvpsndhq0hp1hrlrzb9igsy8";
        libraryHaskellDepends = [
          base dependent-sum template-haskell th-extras
        ];
@@ -69323,15 +69531,15 @@ self: {
 
   "derive-storable-plugin" = callPackage
     ({ mkDerivation, base, criterion, deepseq, derive-storable, ghc
-     , ghc-paths, ghci, hspec, QuickCheck
+     , ghci, hspec, QuickCheck
      }:
      mkDerivation {
        pname = "derive-storable-plugin";
-       version = "0.2.2.0";
-       sha256 = "0rpwiwwz24j9bq07d89ndp61f95hjy7am2q72jxb0by7pzpy9xw0";
+       version = "0.2.3.0";
+       sha256 = "0yr9s33drw5l4ckqipqpmgrsrnm18yr4742mmyjqm3x7wai7d99q";
        libraryHaskellDepends = [ base derive-storable ghc ghci ];
        testHaskellDepends = [
-         base derive-storable ghc ghc-paths ghci hspec QuickCheck
+         base derive-storable ghc ghci hspec QuickCheck
        ];
        benchmarkHaskellDepends = [
          base criterion deepseq derive-storable
@@ -72185,8 +72393,8 @@ self: {
      }:
      mkDerivation {
        pname = "discord-haskell";
-       version = "1.4.0";
-       sha256 = "1011zrn5axjm44zmnj21q3w33pwwkciici2zf2sqz2plvkxn4c1w";
+       version = "1.5.0";
+       sha256 = "1449ap68c917z1318wg67cv7yk7cmfr61m0ikbf132gzsfyx69kv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -73390,28 +73598,6 @@ self: {
      }) {};
 
   "dl-fedora" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath
-     , http-directory, http-types, optparse-applicative, regex-posix
-     , simple-cmd, simple-cmd-args, text, time, unix, xdg-userdirs
-     }:
-     mkDerivation {
-       pname = "dl-fedora";
-       version = "0.7.3";
-       sha256 = "095wmsflwm4wqlvk2h7s64nqacha8did10av9n52pj3kcwczqx2i";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base bytestring directory filepath http-directory http-types
-         optparse-applicative regex-posix simple-cmd simple-cmd-args text
-         time unix xdg-userdirs
-       ];
-       description = "Fedora image download tool";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {};
-
-  "dl-fedora_0_7_4" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath
      , http-directory, http-types, optparse-applicative, regex-posix
      , simple-cmd, simple-cmd-args, text, time, unix, xdg-userdirs
@@ -73465,8 +73651,8 @@ self: {
        pname = "dlist-nonempty";
        version = "0.1.1";
        sha256 = "0csbspdy43pzvasb5mhs5pz2f49ws78pi253cx7pp84wjx6ads20";
-       revision = "7";
-       editedCabalFile = "0cp5v4zfkx7mz8cc8hgjx0v0a37y4fnld3r59i6mb00ilzrh1nhk";
+       revision = "8";
+       editedCabalFile = "134fcrv7lmbhzmgp07vp3fdjbbjrkkracvjf6ma5k2fwcw0wfkff";
        libraryHaskellDepends = [
          base base-compat deepseq dlist semigroupoids
        ];
@@ -73735,8 +73921,8 @@ self: {
      }:
      mkDerivation {
        pname = "dobutokO2";
-       version = "0.15.1.0";
-       sha256 = "1r2zwwcbkm07g1lrypdg3aj4qhyy3g7fds042i4l5abs045aqa2l";
+       version = "0.19.0.0";
+       sha256 = "05nw8szg4hw7vwjp1fq5jps0yq9ivdqy3bf62qfcrr631ab1ba4b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -76742,11 +76928,11 @@ self: {
      }:
      mkDerivation {
        pname = "eccrypto";
-       version = "0.2.1";
-       sha256 = "181c8avf0k8377n0z8qm3v7dnqg01z1gp5zwhcrk8khb3h4d4rp7";
+       version = "0.2.2";
+       sha256 = "1avzxzzlhldpjp6k14jirx3ws5818bpsip9p0wj6kl1g3ii7ydjz";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base bytestring cryptohash-sha512 integer-gmp random
+         base bytestring cryptohash-sha512 integer-gmp
        ];
        testHaskellDepends = [ base base16-bytestring bytestring Cabal ];
        benchmarkHaskellDepends = [ base bytestring criterion random ];
@@ -76758,8 +76944,8 @@ self: {
     ({ mkDerivation, base, bytestring, eccrypto }:
      mkDerivation {
        pname = "eccrypto-ed25519-bindings";
-       version = "0.1.1.0";
-       sha256 = "1yzalib6a5h7k7bhc9kzr2lqhd928yva3j2mxynx3lmw26jc5r17";
+       version = "0.1.2.0";
+       sha256 = "1j2h568k2j8kpclvam3hghi13ddyas5d7c8nf469gwr80wmnyqxs";
        libraryHaskellDepends = [ base bytestring eccrypto ];
        description = "provides \"ed25519\" API using \"eccrypto\"";
        license = stdenv.lib.licenses.bsd3;
@@ -78050,6 +78236,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "eliminators_0_7" = callPackage
+    ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats
+     , singletons, template-haskell, th-abstraction, th-desugar
+     }:
+     mkDerivation {
+       pname = "eliminators";
+       version = "0.7";
+       sha256 = "1h3h0f7s0gjbza7lij8y2pg5hl6zrf8cqslh5f0hpwnfxh3yls6v";
+       libraryHaskellDepends = [
+         base extra singleton-nats singletons template-haskell
+         th-abstraction th-desugar
+       ];
+       testHaskellDepends = [ base hspec singleton-nats singletons ];
+       testToolDepends = [ hspec-discover ];
+       description = "Dependently typed elimination functions using singletons";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "elision" = callPackage
     ({ mkDerivation, base, profunctors }:
      mkDerivation {
@@ -79940,6 +80145,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "equational-reasoning_0_6_0_2" = callPackage
+    ({ mkDerivation, base, containers, template-haskell, th-desugar
+     , th-extras, void
+     }:
+     mkDerivation {
+       pname = "equational-reasoning";
+       version = "0.6.0.2";
+       sha256 = "0zahv50jnbaaiwa7gy7w901fyqjk816gcd3fx9km0nacsjrgal4v";
+       libraryHaskellDepends = [
+         base containers template-haskell th-desugar th-extras void
+       ];
+       description = "Proof assistant for Haskell using DataKinds & PolyKinds";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "equational-reasoning-induction" = callPackage
     ({ mkDerivation, base, singletons, template-haskell, th-extras }:
      mkDerivation {
@@ -80580,6 +80801,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "esqueleto_3_3_2" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring
+     , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql
+     , mysql-simple, persistent, persistent-mysql, persistent-postgresql
+     , persistent-sqlite, persistent-template, postgresql-libpq
+     , postgresql-simple, resourcet, tagged, text, time, transformers
+     , unliftio, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "esqueleto";
+       version = "3.3.2";
+       sha256 = "0f901hric0qzfnrpbvlgjvcgcsywbqfjcrrid6cwnmsv8pxnxmc3";
+       libraryHaskellDepends = [
+         aeson attoparsec base blaze-html bytestring conduit containers
+         monad-logger persistent resourcet tagged text time transformers
+         unliftio unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base blaze-html bytestring conduit containers
+         exceptions hspec monad-logger mtl mysql mysql-simple persistent
+         persistent-mysql persistent-postgresql persistent-sqlite
+         persistent-template postgresql-libpq postgresql-simple resourcet
+         tagged text time transformers unliftio unordered-containers vector
+       ];
+       description = "Type-safe EDSL for SQL queries on persistent backends";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ess" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -81449,8 +81699,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventlog2html";
-       version = "0.6.0";
-       sha256 = "06v2g84hxcc7w4idhkfdix3c2yk9qdx91ys83abn7z7jjc24x2hs";
+       version = "0.7.0";
+       sha256 = "045ihz620xv6qhic3vy257g59l1ly2sld6dcnq28xblsf461krv1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -84040,8 +84290,8 @@ self: {
      }:
      mkDerivation {
        pname = "fay";
-       version = "0.24.0.5";
-       sha256 = "05wm3zp41xgx0s9p0wmy9rqk9ii6wcxsr3jrcqqrnlpbp90dwfxx";
+       version = "0.24.1.0";
+       sha256 = "0cihrggbxmjfz34kbf7nbzn20v2sapfjql6hc5m68rbiiysb8jk3";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -84381,8 +84631,8 @@ self: {
     ({ mkDerivation, base, doctest, first-class-families, Glob }:
      mkDerivation {
        pname = "fcf-containers";
-       version = "0.4.0";
-       sha256 = "1qdcp2mympq8w49j9dfrl5sdkyhiyg3p8nr8568x12ham0jpar9l";
+       version = "0.5.0";
+       sha256 = "0j4ij4iw5axjp56zhxb3kn6ls1l8m2ckqx6620y1yjhz3ja608f2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base first-class-families ];
@@ -84708,6 +84958,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "feed_1_3_0_1" = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, HUnit
+     , markdown-unlit, old-locale, old-time, safe, syb, test-framework
+     , test-framework-hunit, text, time, time-locale-compat, utf8-string
+     , xml-conduit, xml-types
+     }:
+     mkDerivation {
+       pname = "feed";
+       version = "1.3.0.1";
+       sha256 = "0fdylvbrjlshgx398xpxx3y7mnrmpi1l2534mcv299afpm91yqcj";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base base-compat bytestring old-locale old-time safe text time
+         time-locale-compat utf8-string xml-conduit xml-types
+       ];
+       testHaskellDepends = [
+         base base-compat HUnit old-time syb test-framework
+         test-framework-hunit text time xml-conduit xml-types
+       ];
+       testToolDepends = [ markdown-unlit ];
+       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "feed-cli" = callPackage
     ({ mkDerivation, base, directory, feed, old-locale, old-time, time
      , xml
@@ -85898,8 +86173,8 @@ self: {
        pname = "filesystem-abstractions";
        version = "0";
        sha256 = "1qrxc8q10fqd7b0ss84nykz8vmyjwwxw5ywxp11xabad966shl18";
-       revision = "1";
-       editedCabalFile = "0qfkiify5jgclzdz2gyml5d7rn0vinilwxgfvk0h7743lj2vj167";
+       revision = "2";
+       editedCabalFile = "1mj9ipsycs70jdgi722z04cvw7va09cr7fv78w9995pdf2n33gl0";
        libraryHaskellDepends = [
          base bytestring list-tries posix-paths semigroups
        ];
@@ -86025,6 +86300,8 @@ self: {
        pname = "fin";
        version = "0.1.1";
        sha256 = "0zwc8x2ilbk1bhsk85brf6g300cx4w2j3602gjh6rv900961gqri";
+       revision = "1";
+       editedCabalFile = "0q2g83rs0zk8gbdnbqyzy42vqfyalsb8pgq3z0lwjpzaqkxmgvcc";
        libraryHaskellDepends = [ base dec deepseq hashable QuickCheck ];
        testHaskellDepends = [ base inspection-testing tagged ];
        description = "Nat and Fin: peano naturals and finite numbers";
@@ -86622,6 +86899,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fixed-length_0_2_2" = callPackage
+    ({ mkDerivation, base, non-empty, storable-record, tfp, utility-ht
+     }:
+     mkDerivation {
+       pname = "fixed-length";
+       version = "0.2.2";
+       sha256 = "1bx46n11k9dpr5hhfhxiwdd5npaqf9xwvqvjd0nlbylfmsmgd14y";
+       libraryHaskellDepends = [
+         base non-empty storable-record tfp utility-ht
+       ];
+       description = "Lists with statically known length based on non-empty package";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fixed-list" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -90192,6 +90484,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "freetype2_0_2_0" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "freetype2";
+       version = "0.2.0";
+       sha256 = "1fdzhm6lcb6bxgza5z41925a75xdi19lwqw6vas1s2y130x3zfam";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base template-haskell ];
+       description = "Haskell bindings for FreeType 2 library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "french-cards" = callPackage
     ({ mkDerivation, base, hspec, HUnit }:
      mkDerivation {
@@ -90404,8 +90711,8 @@ self: {
      }:
      mkDerivation {
        pname = "front";
-       version = "0.0.0.5";
-       sha256 = "0gn5lrh817r9ky8j4kzrqdlisiy85gr6v7nyd2sj1psa8syrjfzk";
+       version = "0.0.0.6";
+       sha256 = "0380d9c9mv8jp04igjm4h9njijgc18x34xg13d5pgm7f5yz8aipk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -91709,8 +92016,8 @@ self: {
      }:
      mkDerivation {
        pname = "futhark";
-       version = "0.15.1";
-       sha256 = "181kgqbdqxcim16ld68wx09lr4gh0j9440lnn2lyzrzmn8a9567w";
+       version = "0.15.2";
+       sha256 = "064mvm52iklxzxymd3r563vw05001051zkcffc9wd3jwlwqbffg2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -93335,6 +93642,8 @@ self: {
        pname = "generic-lens-lite";
        version = "0.1";
        sha256 = "07z00phy6h50bb4axlr57kin9l5fygi4q4j33rj5180ai2cbcpc6";
+       revision = "1";
+       editedCabalFile = "1gbl0kmc77yjvn63cgdsifhzyd54g1v1qq1pjsrhhn0hb4c8jszz";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        description = "Monomorphic field lens like with generic-lens";
@@ -93452,6 +93761,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "generic-random_1_3_0_1" = callPackage
+    ({ mkDerivation, base, deepseq, inspection-testing, QuickCheck }:
+     mkDerivation {
+       pname = "generic-random";
+       version = "1.3.0.1";
+       sha256 = "0d9w7xcmsb31b95fr9d5jwbsajcl1yi4347dlbw4bybil2vjwd7k";
+       libraryHaskellDepends = [ base QuickCheck ];
+       testHaskellDepends = [
+         base deepseq inspection-testing QuickCheck
+       ];
+       description = "Generic random generators for QuickCheck";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "generic-records" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -93872,20 +94196,6 @@ self: {
      }) {};
 
   "genvalidity" = callPackage
-    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random
-     , validity
-     }:
-     mkDerivation {
-       pname = "genvalidity";
-       version = "0.10.0.1";
-       sha256 = "0zyg3a0gqcdhdqy8w8ydqpcq7k6vbsb77v2dw31j2yfss1av4q2x";
-       libraryHaskellDepends = [ base QuickCheck random validity ];
-       testHaskellDepends = [ base hspec hspec-core QuickCheck ];
-       description = "Testing utilities for the validity library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "genvalidity_0_10_0_2" = callPackage
     ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random
      , validity
      }:
@@ -93897,7 +94207,6 @@ self: {
        testHaskellDepends = [ base hspec hspec-core QuickCheck ];
        description = "Testing utilities for the validity library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-aeson" = callPackage
@@ -94810,12 +95119,12 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-check";
-       version = "0.1.0.2";
-       sha256 = "0xxx1n3xwzfkpbhn2k6s63h8idqy8s15fvy4hbnfkk5fz6mwgvdz";
+       version = "0.1.0.3";
+       sha256 = "1zrlnk3gzdb96592is2krk8qpk386bib0bpgw47yqj8qfcxqf76v";
        libraryHaskellDepends = [
          base ghc ghc-paths template-haskell transformers
        ];
-       description = "detect mismatches between compile-time and run-time versions of the ghc api";
+       description = "Detect mismatches between compile-time and run-time versions of the ghc api";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -95066,6 +95375,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-exactprint_0_6_3" = callPackage
+    ({ mkDerivation, base, bytestring, containers, Diff, directory
+     , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
+     , silently, syb
+     }:
+     mkDerivation {
+       pname = "ghc-exactprint";
+       version = "0.6.3";
+       sha256 = "0da4gkirill2rpxr9gl4cbcwpp4a16z9bdgyv5nkdps3msh93214";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers directory filepath free ghc ghc-boot
+         ghc-paths mtl syb
+       ];
+       testHaskellDepends = [
+         base bytestring containers Diff directory filemanip filepath ghc
+         ghc-boot ghc-paths HUnit mtl silently syb
+       ];
+       description = "ExactPrint for GHC";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-gc-tune" = callPackage
     ({ mkDerivation, base, directory, filepath, process }:
      mkDerivation {
@@ -95215,6 +95548,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-lib_8_10_1_20200324" = callPackage
+    ({ mkDerivation, alex, array, base, binary, bytestring, containers
+     , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy
+     , hpc, pretty, process, time, transformers, unix
+     }:
+     mkDerivation {
+       pname = "ghc-lib";
+       version = "8.10.1.20200324";
+       sha256 = "09d0254ic650n9h6j863xl3cvd506ww84369qdszxwkizlzk7gr3";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array base binary bytestring containers deepseq directory filepath
+         ghc-lib-parser ghc-prim hpc pretty process time transformers unix
+       ];
+       libraryToolDepends = [ alex happy ];
+       description = "The GHC API, decoupled from GHC versions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-lib-parser" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
      , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty
@@ -95234,26 +95587,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ghc-lib-parser-ex" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, extra
-     , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit
-     , uniplate
+  "ghc-lib-parser_8_10_1_20200324" = callPackage
+    ({ mkDerivation, alex, array, base, binary, bytestring, containers
+     , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty
+     , process, time, transformers, unix
      }:
      mkDerivation {
-       pname = "ghc-lib-parser-ex";
-       version = "8.8.5.6";
-       sha256 = "0jwndkf7idpf09zrj4i4x1vsyfpm0vf85vlh00qp0z3avqcxsf2m";
+       pname = "ghc-lib-parser";
+       version = "8.10.1.20200324";
+       sha256 = "0i3ab7a2xq8pjd94kfyrlnp9wnjfkl0qi74zb1m23l6k5zm4g9y8";
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base bytestring containers extra ghc ghc-boot ghc-boot-th uniplate
+         array base binary bytestring containers deepseq directory filepath
+         ghc-prim hpc pretty process time transformers unix
        ];
-       testHaskellDepends = [
-         base directory extra filepath ghc ghc-boot-th tasty tasty-hunit
-       ];
-       description = "Algorithms on GHC parse trees";
+       libraryToolDepends = [ alex happy ];
+       description = "The GHC API, decoupled from GHC versions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghc-lib-parser-ex_8_8_5_8" = callPackage
+  "ghc-lib-parser-ex" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, extra
      , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit
      , uniplate
@@ -95270,6 +95624,25 @@ self: {
        ];
        description = "Algorithms on GHC parse trees";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "ghc-lib-parser-ex_8_10_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, extra
+     , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit
+     , uniplate
+     }:
+     mkDerivation {
+       pname = "ghc-lib-parser-ex";
+       version = "8.10.0.0";
+       sha256 = "1d9614pdy78z96l7zy0w33hk5kmf0pbiwm7zvagjjd53n5rvxly5";
+       libraryHaskellDepends = [
+         base bytestring containers ghc ghc-boot ghc-boot-th uniplate
+       ];
+       testHaskellDepends = [
+         base directory extra filepath ghc ghc-boot-th tasty tasty-hunit
+       ];
+       description = "Algorithms on GHC parse trees";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -95714,6 +96087,18 @@ self: {
        broken = true;
      }) {};
 
+  "ghc-tcplugins-extra_0_3_2" = callPackage
+    ({ mkDerivation, base, ghc }:
+     mkDerivation {
+       pname = "ghc-tcplugins-extra";
+       version = "0.3.2";
+       sha256 = "13qhwjbhyi3nrjdvc0fdgxf4kz55my541mz2j3sndpxsmbymqs3m";
+       libraryHaskellDepends = [ base ghc ];
+       description = "Utilities for writing GHC type-checker plugins";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-tcplugins-extra" = callPackage
     ({ mkDerivation, base, ghc }:
      mkDerivation {
@@ -96089,32 +96474,6 @@ self: {
      }) {};
 
   "ghcid" = callPackage
-    ({ mkDerivation, ansi-terminal, base, cmdargs, containers
-     , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit
-     , terminal-size, time, unix
-     }:
-     mkDerivation {
-       pname = "ghcid";
-       version = "0.8.3";
-       sha256 = "1b8a8mx6z2ridw79gijjv90b2jgk0qrncvg0sjbmvyyyajx1h5f7";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-terminal base cmdargs directory extra filepath process time
-       ];
-       executableHaskellDepends = [
-         ansi-terminal base cmdargs containers directory extra filepath
-         fsnotify process terminal-size time unix
-       ];
-       testHaskellDepends = [
-         ansi-terminal base cmdargs containers directory extra filepath
-         fsnotify process tasty tasty-hunit terminal-size time unix
-       ];
-       description = "GHCi based bare bones IDE";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghcid_0_8_5" = callPackage
     ({ mkDerivation, ansi-terminal, base, cmdargs, containers
      , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit
      , terminal-size, time, unix
@@ -96138,7 +96497,6 @@ self: {
        ];
        description = "GHCi based bare bones IDE";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghcide" = callPackage
@@ -98994,8 +99352,8 @@ self: {
     ({ mkDerivation, base, hspec }:
      mkDerivation {
        pname = "gjk";
-       version = "0.0.0.1";
-       sha256 = "0kqhvich6slcihxg64nwrg1zk9nnpymi7nqrnlmn71flzw6w27ca";
+       version = "0.0.0.2";
+       sha256 = "11ncqhq0q5bl38a0j813y3hjhijz14r0h6npzy441frk8wg1s8lh";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "Gilbert-Johnson-Keerthi (GJK) collision detection algorithm";
@@ -107579,8 +107937,8 @@ self: {
     ({ mkDerivation, base, filepath, haddock-api }:
      mkDerivation {
        pname = "haddock";
-       version = "2.23.0";
-       sha256 = "1f7n4l1kkq1msl8csnvzg2xh3i5a056dzmcf40gib0im91wcwl0x";
+       version = "2.23.1";
+       sha256 = "129lwai4609f910h7yhmmm1rbqzjla9rcg5dpzqihydsjyw5ii1s";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haddock-api ];
@@ -107624,8 +107982,8 @@ self: {
      }:
      mkDerivation {
        pname = "haddock-api";
-       version = "2.23.0";
-       sha256 = "0fbk458qr7iw1j8vh6455n2819c0pfdw1m3gy1y3fs6fdpj9qbjj";
+       version = "2.23.1";
+       sha256 = "14dl17ajlr8354rmc49w4fsqxmrn0dl7wps3r4iipms5nhj5bm3d";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring containers deepseq directory filepath ghc
@@ -110816,6 +111174,8 @@ self: {
        pname = "hashable";
        version = "1.3.0.0";
        sha256 = "1d4sn4xjf0swrfg8pl93ipavbj12ch3a9aykhkl6mjnczc9m8bl2";
+       revision = "1";
+       editedCabalFile = "1c8z7vxlh4whpm1ag4xp6wknnaal28cl4dqdan9rw1c1g10g2w2c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -110894,8 +111254,8 @@ self: {
        pname = "hashable-time";
        version = "0.2.0.2";
        sha256 = "1q7y4plqqwy5286hhx2fygn12h8lqk0y047b597sbdckskxzfqgs";
-       revision = "2";
-       editedCabalFile = "006phc5y9rrvsshdcmjmhxzxh8dpgs685mpqbkjm9c40xb1ydjbz";
+       revision = "3";
+       editedCabalFile = "1dr7ak803ngrhpv43dy25jm18gfzn02gzd3hm31dzcjv3mxsmbrk";
        libraryHaskellDepends = [ base hashable time ];
        description = "Hashable instances for Data.Time";
        license = stdenv.lib.licenses.bsd3;
@@ -112111,6 +112471,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "haskell-lsp_0_21_0_0" = callPackage
+    ({ mkDerivation, aeson, async, attoparsec, base, bytestring
+     , containers, data-default, directory, filepath, hashable
+     , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl
+     , network-uri, QuickCheck, quickcheck-instances, rope-utf16-splay
+     , sorted-list, stm, temporary, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "haskell-lsp";
+       version = "0.21.0.0";
+       sha256 = "0ic9gn5ww8vxmvidj28msark0nybj7fj1j5xsykiac5cgiy5ysnv";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async attoparsec base bytestring containers data-default
+         directory filepath hashable haskell-lsp-types hslogger lens mtl
+         network-uri rope-utf16-splay sorted-list stm temporary text time
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hashable hspec lens network-uri QuickCheck quickcheck-instances
+         rope-utf16-splay sorted-list stm text unordered-containers
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Haskell library for the Microsoft Language Server Protocol";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-lsp-client" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , haskell-lsp, lens, process, text, unix
@@ -112150,6 +112540,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "haskell-lsp-types_0_21_0_0" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, data-default
+     , deepseq, filepath, hashable, lens, network-uri, scientific, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "haskell-lsp-types";
+       version = "0.21.0.0";
+       sha256 = "0x5xhn9vy09r0r76wvmzp6nh23y4p2kgm35p8qqqgvnx6w5cvi92";
+       libraryHaskellDepends = [
+         aeson base binary bytestring data-default deepseq filepath hashable
+         lens network-uri scientific text unordered-containers
+       ];
+       description = "Haskell library for the Microsoft Language Server Protocol, data types";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-menu" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -112251,6 +112659,31 @@ self: {
        broken = true;
      }) {};
 
+  "haskell-names_0_9_8" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers
+     , data-lens-light, filemanip, filepath, haskell-src-exts, mtl
+     , pretty-show, tasty, tasty-golden, transformers
+     , traverse-with-class, uniplate
+     }:
+     mkDerivation {
+       pname = "haskell-names";
+       version = "0.9.8";
+       sha256 = "1s4pyqrjhq9x4zxq0vh02qr86kw5fk854wfwkryqyzkylr83dv4r";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-lens-light filepath
+         haskell-src-exts mtl transformers traverse-with-class uniplate
+       ];
+       testHaskellDepends = [
+         base containers filemanip filepath haskell-src-exts mtl pretty-show
+         tasty tasty-golden traverse-with-class
+       ];
+       description = "Name resolution library for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "haskell-neo4j-client" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, containers
      , data-default, hashable, HTTP, http-client, http-client-tls
@@ -115158,6 +115591,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hasql_1_4_2" = callPackage
+    ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring
+     , bytestring-strict-builder, contravariant, contravariant-extras
+     , criterion, dlist, hashable, hashtables, loch-th, mtl
+     , placeholders, postgresql-binary, postgresql-libpq, profunctors
+     , QuickCheck, quickcheck-instances, rebase, rerebase, tasty
+     , tasty-hunit, tasty-quickcheck, text, text-builder, transformers
+     , vector
+     }:
+     mkDerivation {
+       pname = "hasql";
+       version = "1.4.2";
+       sha256 = "0n617bh0achqwybngppz6inj7y5fv42zi0dxlyal3d9zbrgsljfw";
+       libraryHaskellDepends = [
+         attoparsec base base-prelude bytestring bytestring-strict-builder
+         contravariant contravariant-extras dlist hashable hashtables
+         loch-th mtl placeholders postgresql-binary postgresql-libpq
+         profunctors text text-builder transformers vector
+       ];
+       testHaskellDepends = [
+         bug QuickCheck quickcheck-instances rebase rerebase tasty
+         tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ bug criterion rerebase ];
+       description = "An efficient PostgreSQL driver with a flexible mapping API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hasql-backend" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, either, free
      , list-t, text, transformers, vector
@@ -115460,8 +115922,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-th";
-       version = "0.4.0.5";
-       sha256 = "1gc11n2g07cqipcvm779wwm36mfjjbnwg9n1ch7cldlg1wsr6m6n";
+       version = "0.4.0.6";
+       sha256 = "0s9c2aa0mpxiqsvpaf3l5k2gqchrjv4x9jpjmw7v3ywnv9pcxpkf";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers contravariant
          fast-builder foldl hashable hasql headed-megaparsec megaparsec
@@ -117254,6 +117716,32 @@ self: {
        broken = true;
      }) {};
 
+  "headroom_0_1_3_0" = callPackage
+    ({ mkDerivation, aeson, base, doctest, either, file-embed, hspec
+     , lens, mustache, optparse-applicative, pcre-heavy, pcre-light, rio
+     , template-haskell, text, time, validation, yaml
+     }:
+     mkDerivation {
+       pname = "headroom";
+       version = "0.1.3.0";
+       sha256 = "0c680vr2kjlx9l9zh6v22jjfgxrwxh9icg1psjxrjfl9zi9kqfb9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base either file-embed lens mustache optparse-applicative
+         pcre-heavy pcre-light rio template-haskell text time validation
+         yaml
+       ];
+       executableHaskellDepends = [ base optparse-applicative rio ];
+       testHaskellDepends = [
+         aeson base doctest hspec optparse-applicative rio
+       ];
+       description = "License Header Manager";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "heap" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
@@ -117823,6 +118311,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hedis_0_12_13" = callPackage
+    ({ mkDerivation, async, base, bytestring, bytestring-lexing
+     , deepseq, doctest, errors, exceptions, HTTP, HUnit, mtl, network
+     , network-uri, resource-pool, scanner, stm, test-framework
+     , test-framework-hunit, text, time, tls, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "hedis";
+       version = "0.12.13";
+       sha256 = "1axsv81r1q393m178x89km49pi7w7dci0l48cnjdskdz99jwvywq";
+       libraryHaskellDepends = [
+         async base bytestring bytestring-lexing deepseq errors exceptions
+         HTTP mtl network network-uri resource-pool scanner stm text time
+         tls unordered-containers vector
+       ];
+       testHaskellDepends = [
+         async base bytestring doctest HUnit mtl stm test-framework
+         test-framework-hunit text time
+       ];
+       benchmarkHaskellDepends = [ base mtl time ];
+       description = "Client library for the Redis datastore: supports full command set, pipelining";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hedis-config" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text
      , time
@@ -117943,10 +118457,8 @@ self: {
      }:
      mkDerivation {
        pname = "hedn";
-       version = "0.3.0.0";
-       sha256 = "1gx8bw2l1qpb4jgh5d1zzgfm2rnwavg5shmp4wq2mqrih11r3f3y";
-       revision = "1";
-       editedCabalFile = "1bpd4dd8afccj2bakqqbimmd3ja9i21q9k98vmzw37ishbd3xync";
+       version = "0.3.0.1";
+       sha256 = "02pwwxdgw3kkqwckap9mf015bbd27mgblfz7k4y63v0gppw6fqm7";
        libraryHaskellDepends = [
          base containers deepseq deriving-compat megaparsec
          parser-combinators prettyprinter scientific template-haskell text
@@ -122380,8 +122892,8 @@ self: {
     ({ mkDerivation, base, Cabal, directory, hspec, libsass }:
      mkDerivation {
        pname = "hlibsass";
-       version = "0.1.8.1";
-       sha256 = "050z6i29v410shjsskr26sna491ldg23if1nr0808xp94xgfif16";
+       version = "0.1.9.0";
+       sha256 = "14rcg48hlbpz4vjk7ydhf58wgnbgsa61q6s7h0n80ak8ih63jdcx";
        configureFlags = [ "-fexternallibsass" ];
        setupHaskellDepends = [ base Cabal directory ];
        libraryHaskellDepends = [ base ];
@@ -124491,6 +125003,8 @@ self: {
        pname = "hookup";
        version = "0.3.1.0";
        sha256 = "0dyx0zgxis4viqgdkky25q93vh3z551m7nssjfr15rqj25w8zb5y";
+       revision = "1";
+       editedCabalFile = "0r92s1dz7bzm2p5wpdqfkmpgzfh3xgyan82b4rkpmq8m888z74w9";
        libraryHaskellDepends = [
          attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network
        ];
@@ -127032,15 +127546,17 @@ self: {
      }) {};
 
   "hs-speedscope" = callPackage
-    ({ mkDerivation, aeson, base, extra, ghc-events, text, vector }:
+    ({ mkDerivation, aeson, base, extra, ghc-events
+     , optparse-applicative, text, vector
+     }:
      mkDerivation {
        pname = "hs-speedscope";
-       version = "0.1.1.0";
-       sha256 = "0dldhndlags3ig991yvddfaw472cjwfy9dz3i12hq5ny6s9qz8qa";
+       version = "0.2";
+       sha256 = "119s4da40zjf42s7fyjm4b78vciiv5r2f67l8ki9gqr933ir6mpb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base extra ghc-events text vector
+         aeson base extra ghc-events optparse-applicative text vector
        ];
        executableHaskellDepends = [ base ];
        description = "Convert an eventlog into the speedscope json format";
@@ -127376,6 +127892,8 @@ self: {
        pname = "hsass";
        version = "0.8.0";
        sha256 = "1bnjvj6dpmcbpkbi4g5m5hvr0w5rmd7y5zkiwbqc8n9y4l2dkd5g";
+       revision = "1";
+       editedCabalFile = "0d085g21zvawl2jv6ap5fyk70c9igbjiwknvk1mgdydxbm1kvyq5";
        libraryHaskellDepends = [
          base bytestring data-default-class filepath hlibsass monad-loops
          transformers
@@ -127545,6 +128063,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hsc2hs_0_68_7" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, process
+     , tasty, tasty-hspec
+     }:
+     mkDerivation {
+       pname = "hsc2hs";
+       version = "0.68.7";
+       sha256 = "0jl94cr2jhjmvz7l9idpr352vwxlsanyiq7ya1vvrlry3vj1aygx";
+       isLibrary = false;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       executableHaskellDepends = [
+         base containers directory filepath process
+       ];
+       testHaskellDepends = [ base tasty tasty-hspec ];
+       description = "A preprocessor that helps with writing Haskell bindings to C code";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hsc3" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , data-ordlist, directory, filepath, hosc, murmur-hash, network
@@ -128209,8 +128747,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.3.3.6";
-       sha256 = "0j2qi1gw7rpb23bkj4557kg2d47b8kgrd8vr2qnld90h9p8jnzqm";
+       version = "0.3.3.8";
+       sha256 = "01dagwpg70h9af5kzr2f19qsvy4h5cx5rjdrcq0r36fbmdkbza2z";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -128408,10 +128946,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsexif";
-       version = "0.6.1.6";
-       sha256 = "0pdm0v3xz308yzdhc646bbkwj156llf9g17c2y74x339xk6i8zhg";
-       revision = "1";
-       editedCabalFile = "1dgcgsmx0k5p3ibfv3n5k0c5p1is2m5zfsd2s6nc6d0pz34d4wl9";
+       version = "0.6.1.7";
+       sha256 = "059cbcpf0jb4d6njhpk41hl64w2hxvpv8wcqk7a1s5lklvcavd3d";
        libraryHaskellDepends = [
          base binary bytestring containers iconv text time
        ];
@@ -128865,6 +129401,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) lua5_3;};
 
+  "hslua_1_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
+     , exceptions, lua5_3, mtl, QuickCheck, quickcheck-instances, tasty
+     , tasty-hunit, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "hslua";
+       version = "1.1.0";
+       sha256 = "04xf5xp5iyf6y0das661pbzw6z2zx63phidg9mqhwbn79wk2mwwh";
+       configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ];
+       libraryHaskellDepends = [
+         base bytestring containers exceptions mtl text
+       ];
+       librarySystemDepends = [ lua5_3 ];
+       testHaskellDepends = [
+         base bytestring containers exceptions mtl QuickCheck
+         quickcheck-instances tasty tasty-hunit tasty-quickcheck text
+       ];
+       benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
+       description = "Bindings to Lua, an embeddable scripting language";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) lua5_3;};
+
   "hslua-aeson" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hashable, hslua, hspec
      , HUnit, ieee754, QuickCheck, quickcheck-instances, scientific
@@ -131578,6 +132138,8 @@ self: {
        pname = "http-api-data";
        version = "0.4.1.1";
        sha256 = "1s93m2vh4c1p073xasvknnj3czbf8xsyg48kyznr4jwfhzi17anh";
+       revision = "1";
+       editedCabalFile = "1dshqb1140nj4h8d750s97gmzb2rk0ppr1rakvqxy1r79mg3m2wr";
        libraryHaskellDepends = [
          attoparsec attoparsec-iso8601 base base-compat bytestring
          containers cookie hashable http-types tagged text time-compat
@@ -133374,17 +133936,18 @@ self: {
      }) {};
 
   "hurl" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring, directory
-     , filepath, http-client, http-client-tls, http-types, network-uri
-     , process, text
+    ({ mkDerivation, base, base64-bytestring, bytestring, containers
+     , directory, filepath, http-client, http-client-tls, http-types
+     , network-uri, process, text, xml-conduit, zlib
      }:
      mkDerivation {
        pname = "hurl";
-       version = "1.2.0.0";
-       sha256 = "07abw78ds4fb4y8c7x94fpwcab58b2k613b3dk8hh9qqplhgl8ms";
+       version = "1.3.0.0";
+       sha256 = "1fb70wsqpy5jq5w8vrd0qszrpg670mfh25kw4ldapiw652az7w69";
        libraryHaskellDepends = [
-         base base64-bytestring bytestring directory filepath http-client
-         http-client-tls http-types network-uri process text
+         base base64-bytestring bytestring containers directory filepath
+         http-client http-client-tls http-types network-uri process text
+         xml-conduit zlib
        ];
        description = "Haskell URL resolver";
        license = stdenv.lib.licenses.gpl3;
@@ -133555,14 +134118,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hvega_0_7_0_0" = callPackage
+  "hvega_0_7_0_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , filepath, tasty, tasty-golden, text, unordered-containers
      }:
      mkDerivation {
        pname = "hvega";
-       version = "0.7.0.0";
-       sha256 = "0kj40mm5d809adblk74h0k57qqpk8jxl5bhildasjzjfmmr4spax";
+       version = "0.7.0.1";
+       sha256 = "16s58m7kk72hr52k9gci17ac5k38r1zy08wll2frzjxissgza4cj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ aeson base text unordered-containers ];
@@ -133976,6 +134539,8 @@ self: {
        pname = "hw-ip";
        version = "2.4.1.0";
        sha256 = "1zjl078xzing927fwwpck36ib8z5aggpi7g0z5gnhxd8isgqs6zh";
+       revision = "1";
+       editedCabalFile = "1dg3aa6wavdr3vh7va3yx3j272pb4zw48rm7r5a6xv6xrrd01a33";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -134162,6 +134727,8 @@ self: {
        pname = "hw-kafka-avro";
        version = "4.0.1";
        sha256 = "1x0mq3sn05iwrn444kzyl66056xm8203hq0ajx9f8r85faq3v1ir";
+       revision = "1";
+       editedCabalFile = "1409nxw5hfl09dcphcjfx580smd0q2dnp8s4xj6r03w706826zhi";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -137435,20 +138002,17 @@ self: {
     ({ mkDerivation, aeson, async, atom-conduit, base-noprelude, binary
      , blaze-html, blaze-markup, bytestring, case-insensitive, conduit
      , connection, containers, dhall, directory, fast-logger, filepath
-     , hashable, HaskellNet, HaskellNet-SSL, http-client
-     , http-client-tls, http-types, microlens, mime-mail, monad-time
-     , msgpack, network, opml-conduit, optparse-applicative
-     , prettyprinter, prettyprinter-ansi-terminal, refined, relude
-     , rss-conduit, safe-exceptions, stm, stm-chans
+     , hashable, http-client, http-client-tls, http-types, microlens
+     , mime-mail, monad-time, msgpack, opml-conduit
+     , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal
+     , refined, relude, rss-conduit, safe-exceptions, stm, stm-chans
      , streaming-bytestring, streaming-with, text, time, timerep, tls
      , typed-process, uri-bytestring, xml-conduit, xml-types
      }:
      mkDerivation {
        pname = "imm";
-       version = "1.7.0.0";
-       sha256 = "0slgfg4ay8j1kcvskl60gd2xbwllxcip6104wg36hcmb1symgdf1";
-       revision = "1";
-       editedCabalFile = "0hy3lbpn839yjplmn8w4ihlgyyirzi4j8qzwih5k5h98bd4d5nzf";
+       version = "1.8.0.0";
+       sha256 = "09948024zkjhdza100bi441xl2h8sd5b9gzki0l51dsm27phfk23";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -137462,12 +138026,11 @@ self: {
        executableHaskellDepends = [
          aeson async atom-conduit base-noprelude blaze-html blaze-markup
          bytestring case-insensitive conduit connection containers dhall
-         directory fast-logger filepath HaskellNet HaskellNet-SSL
-         http-client http-client-tls mime-mail msgpack network opml-conduit
-         optparse-applicative prettyprinter prettyprinter-ansi-terminal
-         refined relude rss-conduit safe-exceptions stm stm-chans
-         streaming-bytestring streaming-with text time typed-process
-         uri-bytestring xml-conduit xml-types
+         directory fast-logger filepath http-client http-client-tls
+         mime-mail msgpack opml-conduit optparse-applicative prettyprinter
+         prettyprinter-ansi-terminal refined relude rss-conduit
+         safe-exceptions stm stm-chans streaming-bytestring streaming-with
+         text time typed-process uri-bytestring xml-conduit xml-types
        ];
        description = "Execute arbitrary callbacks for each element of RSS/Atom feeds";
        license = stdenv.lib.licenses.cc0;
@@ -139180,6 +139743,8 @@ self: {
        pname = "intcode";
        version = "0.3.0.0";
        sha256 = "0qcws15hn03wnsv1rg93sw9zhwsyvwpiafrmwnyv9v990qap1x8y";
+       revision = "1";
+       editedCabalFile = "1ad9fm65l8rnkm7236ak7v9j7hvj1jswwdcaw0xcsn9znn4xawl0";
        libraryHaskellDepends = [ base containers primitive ];
        testHaskellDepends = [ base containers doctest primitive ];
        description = "Advent of Code 2019 intcode interpreter";
@@ -140543,25 +141108,6 @@ self: {
      }) {};
 
   "iproute" = callPackage
-    ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
-     , network, QuickCheck, safe
-     }:
-     mkDerivation {
-       pname = "iproute";
-       version = "1.7.8";
-       sha256 = "0k2qzdw36qp9qs2j0bxsn95ymk3wpjvw6s5c1535aw677gw19bad";
-       libraryHaskellDepends = [
-         appar base byteorder containers network
-       ];
-       testHaskellDepends = [
-         appar base byteorder containers doctest hspec network QuickCheck
-         safe
-       ];
-       description = "IP Routing Table";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "iproute_1_7_9" = callPackage
     ({ mkDerivation, appar, base, byteorder, bytestring, containers
      , doctest, hspec, network, QuickCheck, safe
      }:
@@ -140578,7 +141124,6 @@ self: {
        ];
        description = "IP Routing Table";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iptables-helpers" = callPackage
@@ -140757,6 +141302,8 @@ self: {
        pname = "irc-core";
        version = "2.7.2";
        sha256 = "1gpd28lxhqj2xj75nyyififn9434imvm0vqvx7zdw44fvg75lqyq";
+       revision = "1";
+       editedCabalFile = "1xkvy5igrx4ri8gmmwzxs2mq7ih57gps8a592ya6bv1crrm45cy2";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring bytestring hashable primitive
          text time vector
@@ -142688,12 +143235,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "jira-wiki-markup_1_1_3" = callPackage
+  "jira-wiki-markup_1_1_4" = callPackage
     ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }:
      mkDerivation {
        pname = "jira-wiki-markup";
-       version = "1.1.3";
-       sha256 = "1hr67awpl1zpwp53x9b6ix4gdfq8r77r9wnm44qc9q91q8i872wv";
+       version = "1.1.4";
+       sha256 = "0riwi6i0vvmfffprzd4gklxjivjv1x7cmb2vx43x6n8yfrd75yzv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec text ];
@@ -143373,15 +143920,15 @@ self: {
 
   "json-api-lib" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
-     , data-default, hspec, hspec-discover, lens, lens-aeson, text
-     , unordered-containers, uri-encode
+     , data-default, deepseq, hspec, hspec-discover, lens, lens-aeson
+     , text, unordered-containers, uri-encode
      }:
      mkDerivation {
        pname = "json-api-lib";
-       version = "0.1.2.0";
-       sha256 = "0qq34fw7b6kv4ywv7bzpsahn7b8mdn42cwwkhgqazsdf7wx72qqy";
+       version = "0.2.0.0";
+       sha256 = "0cay3yrzfbd0vnfq1a2f74nnqwbiwribhnfy90nhvbi6dxxp14a1";
        libraryHaskellDepends = [
-         aeson base containers data-default lens lens-aeson text
+         aeson base containers data-default deepseq lens lens-aeson text
          unordered-containers uri-encode
        ];
        testHaskellDepends = [
@@ -143461,22 +144008,23 @@ self: {
      }) {};
 
   "json-autotype" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, GenericPretty, hashable, json-alt, lens, mtl
-     , optparse-applicative, pretty, process, QuickCheck, scientific
-     , smallcheck, template-haskell, text, uniplate
-     , unordered-containers, vector, yaml
+    ({ mkDerivation, aeson, base, bytestring, containers, data-default
+     , directory, filepath, GenericPretty, hashable, json-alt, lens, mtl
+     , optparse-applicative, pretty, process, QuickCheck
+     , run-haskell-module, scientific, smallcheck, template-haskell
+     , text, uniplate, unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "json-autotype";
-       version = "3.0.1";
-       sha256 = "0nir4nx4wchl10zs753a3ayg9lgixg2ap3liwz9xpz191c8rkbka";
+       version = "3.0.4";
+       sha256 = "0p4qx7pfb4qxdizsqvm88dw4wbzmygpblzvna0mh3wl9dlx554rm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base containers filepath GenericPretty hashable json-alt lens
-         mtl pretty process QuickCheck scientific smallcheck
-         template-haskell text uniplate unordered-containers vector
+         aeson base containers data-default filepath GenericPretty hashable
+         json-alt lens mtl pretty process QuickCheck run-haskell-module
+         scientific smallcheck template-haskell text uniplate
+         unordered-containers vector
        ];
        executableHaskellDepends = [
          aeson base bytestring containers filepath GenericPretty hashable
@@ -146655,19 +147203,22 @@ self: {
      }) {};
 
   "knead" = callPackage
-    ({ mkDerivation, base, bool8, comfort-array, llvm-extra, llvm-tf
-     , prelude-compat, storable-enum, storable-record, storable-tuple
-     , tagged, tfp, transformers, utility-ht
+    ({ mkDerivation, base, bool8, comfort-array, fixed-length, llvm-dsl
+     , llvm-extra, llvm-tf, prelude-compat, QuickCheck, storable-enum
+     , storable-record, tagged, tfp, transformers, utility-ht
      }:
      mkDerivation {
        pname = "knead";
-       version = "0.4.2";
-       sha256 = "03chikfkzlvabz2vmjpmd5mmk0a7gdnkzbgv635w3gdrpdpm8n31";
+       version = "0.5";
+       sha256 = "07j0sw10qs0zpz5hgxmrhs3rrwhnxf6441jasyagl96724svxq21";
        libraryHaskellDepends = [
-         base bool8 comfort-array llvm-extra llvm-tf prelude-compat
-         storable-enum storable-record storable-tuple tagged tfp
+         base bool8 comfort-array fixed-length llvm-dsl llvm-extra llvm-tf
+         prelude-compat storable-enum storable-record tagged tfp
          transformers utility-ht
        ];
+       testHaskellDepends = [
+         base comfort-array llvm-extra llvm-tf QuickCheck tfp utility-ht
+       ];
        description = "Repa-like array processing using LLVM JIT";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147674,8 +148225,8 @@ self: {
        pname = "lambdabot-core";
        version = "5.2";
        sha256 = "1wh87wwb8hk3hn2lmdqi1hv77qbdmwqcwjslichygmvac8fjhjss";
-       revision = "2";
-       editedCabalFile = "1khn1j3z7mkzggp7s35p0dixsj81yljfrf5r9d289dvy1dip8akf";
+       revision = "3";
+       editedCabalFile = "182bhiwvbpadwwf3h9fpfsjwcsb0fkfzr57fvpl0k6w7msqn32rp";
        libraryHaskellDepends = [
          base binary bytestring containers dependent-map dependent-sum
          dependent-sum-template directory edit-distance filepath haskeline
@@ -148324,8 +148875,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-ats";
-       version = "1.7.10.0";
-       sha256 = "1xixsf3n8ld1fjd96qvvvrmrmypd7idyb7syih09f8gq80jkaw5g";
+       version = "1.7.10.1";
+       sha256 = "19m9qalh9xiaw6n60zbhs8yqhd0acq08bkx42i44vfmm0917jys3";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array base composition-prelude containers deepseq
@@ -148358,6 +148909,25 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "language-avro_0_1_3_0" = callPackage
+    ({ mkDerivation, avro, base, containers, directory, filepath, hspec
+     , hspec-megaparsec, megaparsec, text, vector
+     }:
+     mkDerivation {
+       pname = "language-avro";
+       version = "0.1.3.0";
+       sha256 = "15r14px422s06d28q3rvxfbymxfgrzhgxgsyrkmw9b1vj8c74ln6";
+       libraryHaskellDepends = [
+         avro base containers directory filepath megaparsec text vector
+       ];
+       testHaskellDepends = [
+         avro base hspec hspec-megaparsec megaparsec text vector
+       ];
+       description = "Language definition and parser for AVRO files";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-bash" = callPackage
     ({ mkDerivation, base, directory, filepath, parsec, prettyprinter
      , process, QuickCheck, tasty, tasty-expected-failure, tasty-golden
@@ -148669,8 +149239,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-ecmascript";
-       version = "0.19.0.1";
-       sha256 = "1jh5ksx5hh2q9b134rfmcpz4i1j6fsfyqzk4yh8yn635kwa86jhr";
+       version = "0.19.1.0";
+       sha256 = "0kk5zk9lr6kvpkz4ihw8ww4j03m899i0af6yhf4q3r7r4d1yq22s";
        libraryHaskellDepends = [
          ansi-wl-pprint base charset containers data-default-class Diff mtl
          parsec QuickCheck template-haskell uniplate
@@ -148911,6 +149481,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "language-javascript_0_7_1_0" = callPackage
+    ({ mkDerivation, alex, array, base, blaze-builder, bytestring
+     , Cabal, containers, happy, hspec, mtl, QuickCheck, text
+     , utf8-light, utf8-string
+     }:
+     mkDerivation {
+       pname = "language-javascript";
+       version = "0.7.1.0";
+       sha256 = "0s6igb54cxm2jywgc3sq53f52gcsc39wd3g78yisfzvl9jm3d86i";
+       libraryHaskellDepends = [
+         array base blaze-builder bytestring containers mtl text utf8-string
+       ];
+       libraryToolDepends = [ alex happy ];
+       testHaskellDepends = [
+         array base blaze-builder bytestring Cabal containers hspec mtl
+         QuickCheck utf8-light utf8-string
+       ];
+       description = "Parser for JavaScript";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-js" = callPackage
     ({ mkDerivation, base, hspec, parsec }:
      mkDerivation {
@@ -149906,6 +150498,8 @@ self: {
        pname = "lattices";
        version = "2.0.2";
        sha256 = "108rhpax72j6xdl0yqdmg7n32l1j805861f3q9wd3jh8nc67avix";
+       revision = "1";
+       editedCabalFile = "0mgwil55q4a5dy6r8pyf7jj7z378n1hvsm79nkkz69zjd80wi2mw";
        libraryHaskellDepends = [
          base base-compat containers deepseq hashable integer-logarithms
          QuickCheck semigroupoids tagged transformers universe-base
@@ -150569,6 +151163,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "leancheck_0_9_2" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "leancheck";
+       version = "0.9.2";
+       sha256 = "0grgxa2w378wkbabqlniwm78qgmhym7pvgp6azd89kr83gvyfhd1";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base ];
+       description = "Enumerative property-based testing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "leancheck-enum-instances" = callPackage
     ({ mkDerivation, base, enum-types, leancheck }:
      mkDerivation {
@@ -152923,30 +153530,29 @@ self: {
      }) {};
 
   "life-sync" = callPackage
-    ({ mkDerivation, ansi-terminal, base-noprelude, bytestring
-     , containers, exceptions, filepath, fmt, hedgehog
-     , microlens-platform, optparse-applicative, path, path-io, process
-     , relude, tasty, tasty-discover, tasty-hedgehog, text, tomland
+    ({ mkDerivation, base, bytestring, colourista, containers
+     , exceptions, filepath, hedgehog, hspec, hspec-hedgehog
+     , optparse-applicative, path, path-io, process, relude, shellmet
+     , text, tomland, validation-selective
      }:
      mkDerivation {
        pname = "life-sync";
-       version = "1.0.1";
-       sha256 = "1p7vnbk6xsa2963wc77cjjc5bbnrswzh27nw1zra09405yd21yf0";
+       version = "1.1.0.0";
+       sha256 = "0l56n4dhg6p4lw7i7jjq747qv7r6fr0k2gdabwkbbb2qhsviw162";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-terminal base-noprelude bytestring containers exceptions fmt
-         microlens-platform path path-io process relude text tomland
-       ];
-       executableHaskellDepends = [
-         base-noprelude containers optparse-applicative path
+         base bytestring colourista containers exceptions
+         optparse-applicative path path-io process relude shellmet text
+         tomland validation-selective
        ];
+       executableHaskellDepends = [ base relude ];
        testHaskellDepends = [
-         base-noprelude containers filepath hedgehog path tasty
-         tasty-hedgehog
+         base containers filepath hedgehog hspec hspec-hedgehog path relude
+         text
        ];
-       testToolDepends = [ tasty-discover ];
-       license = stdenv.lib.licenses.mit;
+       description = "Synchronize personal configs across multiple machines";
+       license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
      }) {};
@@ -155169,6 +155775,25 @@ self: {
        broken = true;
      }) {};
 
+  "llvm-dsl" = callPackage
+    ({ mkDerivation, base, bool8, llvm-extra, llvm-tf, numeric-prelude
+     , prelude-compat, storable-enum, storable-record, tfp, transformers
+     , utility-ht
+     }:
+     mkDerivation {
+       pname = "llvm-dsl";
+       version = "0.0";
+       sha256 = "0ij2y3q8c46z731b1hlqcjgrkmzsj066mnb0rpnwkn70caai3vz8";
+       libraryHaskellDepends = [
+         base bool8 llvm-extra llvm-tf numeric-prelude prelude-compat
+         storable-enum storable-record tfp transformers utility-ht
+       ];
+       description = "Support for writing an EDSL with LLVM-JIT as target";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {};
+
   "llvm-extension" = callPackage
     ({ mkDerivation, base, containers, cpuid, llvm-extra, llvm-tf
      , non-empty, prelude-compat, tfp, transformers, unsafe, utility-ht
@@ -155190,21 +155815,25 @@ self: {
      }) {};
 
   "llvm-extra" = callPackage
-    ({ mkDerivation, base, bool8, containers, enumset, llvm-tf
-     , non-empty, prelude-compat, QuickCheck, storable-enum, tagged, tfp
-     , transformers, utility-ht
+    ({ mkDerivation, base, base-orphans, bool8, containers, enumset
+     , fixed-length, llvm-tf, non-empty, prelude-compat, QuickCheck
+     , storable-enum, storable-record, tagged, tfp, transformers
+     , utility-ht
      }:
      mkDerivation {
        pname = "llvm-extra";
-       version = "0.9.1";
-       sha256 = "0wxs8ki3l5fyijdv7z0xyrikx4whazyxv69ly0x98ag25l5fxwyi";
+       version = "0.10";
+       sha256 = "0g2872wl1gmdlw3gdimcb1wcdsckjwjlk1ciwz8sy0rx9v3kif1m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bool8 containers enumset llvm-tf non-empty prelude-compat
-         storable-enum tagged tfp transformers utility-ht
+         base base-orphans bool8 containers enumset fixed-length llvm-tf
+         non-empty prelude-compat storable-enum storable-record tagged tfp
+         transformers utility-ht
+       ];
+       testHaskellDepends = [
+         base llvm-tf QuickCheck storable-record tfp utility-ht
        ];
-       testHaskellDepends = [ base llvm-tf QuickCheck tfp utility-ht ];
        doHaddock = false;
        description = "Utility functions for the llvm interface";
        license = stdenv.lib.licenses.bsd3;
@@ -155216,8 +155845,8 @@ self: {
     ({ mkDerivation, base, enumset, LLVM }:
      mkDerivation {
        pname = "llvm-ffi";
-       version = "9.1.0";
-       sha256 = "1nfgh56wrlw13w0an9vyp78ahz2lp0yy0v7yqh1zr22a0mnwnq3s";
+       version = "9.1.0.1";
+       sha256 = "19bj8gkzmzg3khnj1pnksc789p1hls0ji48kvwp72zbhhzgpr75d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base enumset ];
@@ -155477,14 +156106,16 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-tf";
-       version = "9.1.1";
-       sha256 = "089pq0n3qj3df74g25jkn64byfb4g9f3di1h2fmps8n0yhr8qz3j";
+       version = "9.2";
+       sha256 = "1p4r9m1svp6k235r0azx6dkpdarakgy3420z3kk06bdiy1m2jk1s";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base containers enumset fixed-length llvm-ffi non-empty QuickCheck
          semigroups storable-record tfp transformers utility-ht
        ];
+       testHaskellDepends = [ base QuickCheck tfp utility-ht ];
+       doHaddock = false;
        description = "Bindings to the LLVM compiler toolkit using type families";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -157273,6 +157904,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lsp-test_0_10_2_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base
+     , bytestring, conduit, conduit-parse, containers, data-default
+     , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl
+     , parser-combinators, process, text, transformers, unix
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "lsp-test";
+       version = "0.10.2.0";
+       sha256 = "1khqdgc90k9ya58nxsb6dggyyjdp5q9m4bgxmkg15l6qh6mw9zqp";
+       libraryHaskellDepends = [
+         aeson aeson-pretty ansi-terminal async base bytestring conduit
+         conduit-parse containers data-default Diff directory filepath
+         haskell-lsp lens mtl parser-combinators process text transformers
+         unix unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base data-default haskell-lsp hspec lens text
+         unordered-containers
+       ];
+       description = "Functional test framework for LSP servers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lss" = callPackage
     ({ mkDerivation, attoparsec, base, containers, directory, filepath
      , hspec2, language-css, language-css-attoparsec, text, xmlhtml
@@ -157656,8 +158313,8 @@ self: {
      }:
      mkDerivation {
        pname = "lukko";
-       version = "0.1.1.1";
-       sha256 = "13wf2vgi3bq48h757qs0zi1sxa6ip9pk8fxfiq7qrrb9p5silcpj";
+       version = "0.1.1.2";
+       sha256 = "1lh7cv0fqbrn8sf54xz74wq991bl8p67jcyq4ing3khcvh9x2yca";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          async base bytestring filepath singleton-bool tasty
@@ -157969,8 +158626,8 @@ self: {
      }:
      mkDerivation {
        pname = "lz4-hs";
-       version = "0.1.3.0";
-       sha256 = "0yx1njh0zwk2qk99ip1f2wlcy3ql35piqbvd6dppr2hwnm5bh1mk";
+       version = "0.1.4.0";
+       sha256 = "1biwiqc43wd2njfinrpfzg7pglsrcb2xjhvrm62ida04djrh8s4y";
        libraryHaskellDepends = [ base bytestring ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base bytestring tasty tasty-hunit ];
@@ -160822,15 +161479,16 @@ self: {
      }) {};
 
   "matrix-sized" = callPackage
-    ({ mkDerivation, base, binary, bytestring, deepseq, primitive
-     , singletons, vector
+    ({ mkDerivation, base, primitive, singletons, tasty
+     , tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "matrix-sized";
-       version = "0.0.2";
-       sha256 = "1sp9d3pfkq80klwryvggjf76hm4y9qqair3cppvgnp06kn99k1z1";
-       libraryHaskellDepends = [
-         base binary bytestring deepseq primitive singletons vector
+       version = "0.0.3";
+       sha256 = "1c43cgcw43y777l1wfkdagkis5sbb79fdwhckzwx11av6br02x5g";
+       libraryHaskellDepends = [ base primitive singletons vector ];
+       testHaskellDepends = [
+         base primitive singletons tasty tasty-quickcheck vector
        ];
        description = "Haskell matrix library with interface to C++ linear algebra libraries";
        license = stdenv.lib.licenses.bsd3;
@@ -163172,8 +163830,8 @@ self: {
        pname = "microstache";
        version = "1.0.1.1";
        sha256 = "0851sqr1ppdj6m822635pa3j6qzdf25gyrhkjs25zdry6518bsax";
-       revision = "5";
-       editedCabalFile = "1dr1yqn42j6im1x333rpsqj57nhmagmhwkdfwx832cdsw9ry2gjz";
+       revision = "6";
+       editedCabalFile = "054ny1rsqz682k4x36dqj6wqbj6arwxp75xpsss8lc7j145d0qn3";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq directory filepath parsec
          text transformers unordered-containers vector
@@ -164314,6 +164972,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "miso_1_5_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, http-api-data
+     , http-types, lucid, network-uri, servant, servant-lucid, text
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "miso";
+       version = "1.5.0.0";
+       sha256 = "08843wyd41hs38vrixcfdnmar9vkvayk11323kav4qq85s3yhsd3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers http-api-data http-types lucid
+         network-uri servant servant-lucid text transformers vector
+       ];
+       description = "A tasty Haskell front-end framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "miso-action-logger" = callPackage
     ({ mkDerivation, aeson, base, ghcjs-base, miso }:
      mkDerivation {
@@ -164331,8 +165009,8 @@ self: {
     ({ mkDerivation }:
      mkDerivation {
        pname = "miso-examples";
-       version = "1.3.0.0";
-       sha256 = "1nwiznlhvnr7jcaqp1w0l2wwci9jbs56jrdiz79mpxrqq79h1icg";
+       version = "1.5.0.0";
+       sha256 = "0k0rf7kb65nqckmz8gc27rssnn3ja0nswmrbslfmm0nz7293jaiw";
        isLibrary = false;
        isExecutable = true;
        description = "A tasty Haskell front-end framework";
@@ -164827,15 +165505,17 @@ self: {
      }) {};
 
   "mmsyn7l" = callPackage
-    ({ mkDerivation, base, mmsyn2, mmsyn7ukr, vector }:
+    ({ mkDerivation, base, directory, mmsyn2, mmsyn7ukr, vector }:
      mkDerivation {
        pname = "mmsyn7l";
-       version = "0.3.2.0";
-       sha256 = "0h3j7y6k9zagw0djj8hrnlhfdqg60hb52h9xb3ni326ijshw2qil";
+       version = "0.4.2.0";
+       sha256 = "1dpilwaffrkihfgbpq7p1095qpx9qgcpzbs8q3kld948hliihix7";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base mmsyn2 mmsyn7ukr vector ];
-       executableHaskellDepends = [ base mmsyn2 mmsyn7ukr vector ];
+       libraryHaskellDepends = [ base directory mmsyn2 mmsyn7ukr vector ];
+       executableHaskellDepends = [
+         base directory mmsyn2 mmsyn7ukr vector
+       ];
        description = "Modifies the amplitudes of the Ukrainian sounds representations created by mmsyn7ukr package";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -165517,15 +166197,15 @@ self: {
      }) {};
 
   "monad-choice" = callPackage
-    ({ mkDerivation, base, invariant, MonadRandom, mtl, transformers }:
+    ({ mkDerivation, base, contravariant, invariant, MonadRandom, mtl
+     , primitive, transformers
+     }:
      mkDerivation {
        pname = "monad-choice";
-       version = "0.1.0.0";
-       sha256 = "0vhfiqrnkfhqkhnh9h4npl3rfam321iikabr3przywfcfd4gap4z";
-       revision = "3";
-       editedCabalFile = "055zzzz9ag1wb79bjx0wg59plajym156hz0bh0lq4ndvn4k7sxay";
+       version = "0.2.0.0";
+       sha256 = "1ryakbs6ydgdfvz067jw6a2aqg566pynwyibxl6qi77ywwahqlvk";
        libraryHaskellDepends = [
-         base invariant MonadRandom mtl transformers
+         base contravariant invariant MonadRandom mtl primitive transformers
        ];
        description = "Monad, monad transformer, and typeclass representing choices";
        license = stdenv.lib.licenses.agpl3;
@@ -165539,8 +166219,8 @@ self: {
        pname = "monad-chronicle";
        version = "1";
        sha256 = "03x19683pm99zcw7gkipmdkrqwaspcyvy7yv68nlh6g4swl31a0l";
-       revision = "1";
-       editedCabalFile = "059qa4kb6x3vqw0pahbkp3i6v33cyaiizzkgxd1n36l9ybchwr4l";
+       revision = "2";
+       editedCabalFile = "0ajjcv8h6104k2xlzlqkhvy7hmv6p4ldca3jdsa9ns38sxy8j6ld";
        libraryHaskellDepends = [
          base data-default-class mtl semigroupoids these transformers
          transformers-compat
@@ -168090,31 +168770,22 @@ self: {
      }) {inherit (pkgs) mpg123;};
 
   "mpi-hs" = callPackage
-    ({ mkDerivation, base, binary, bytestring, c2hs, cereal, criterion
-     , monad-loops, openmpi, store
-     }:
+    ({ mkDerivation, base, bytestring, c2hs, monad-loops }:
      mkDerivation {
        pname = "mpi-hs";
-       version = "0.5.3.0";
-       sha256 = "0z2m4xfk0w1zx29jb27xb6hs01xid0ghv93yhqx7zwiw01815krk";
+       version = "0.7.0.0";
+       sha256 = "14c3z7ydw08cijh8mp8qfx2ybp3w283lw1jj25hdwr7b83wsl2m6";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [
-         base binary bytestring cereal monad-loops store
-       ];
-       librarySystemDepends = [ openmpi ];
+       libraryHaskellDepends = [ base bytestring monad-loops ];
        libraryToolDepends = [ c2hs ];
-       executableHaskellDepends = [ base binary ];
-       executableSystemDepends = [ openmpi ];
+       executableHaskellDepends = [ base ];
        testHaskellDepends = [ base monad-loops ];
-       testSystemDepends = [ openmpi ];
-       benchmarkHaskellDepends = [ base criterion ];
-       benchmarkSystemDepends = [ openmpi ];
        description = "MPI bindings for Haskell";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
-     }) {inherit (pkgs) openmpi;};
+     }) {};
 
   "mplayer-spot" = callPackage
     ({ mkDerivation, async, attoparsec, base, bytestring, conduit
@@ -168320,8 +168991,8 @@ self: {
     ({ mkDerivation, base, hspec }:
      mkDerivation {
        pname = "mr-env";
-       version = "0.1.0.1";
-       sha256 = "102m1gqjcscwf620jpaz1i7hg73ikd19an2wjgnfpfrlzw83xgd6";
+       version = "0.1.0.2";
+       sha256 = "1bw0ga59lf1crhjx4hlmsnzllsf3nfwzzsfcll0xf04fkj0jgxlg";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "A simple way to read environment variables in Haskell";
@@ -168443,6 +169114,32 @@ self: {
        broken = true;
      }) {};
 
+  "msgpack-binary" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , data-binary-ieee754, deepseq, groom, hashable, hspec
+     , msgpack-types, QuickCheck, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "msgpack-binary";
+       version = "0.0.14";
+       sha256 = "1pf0fzxkrd2f1jzm3mkybayd94pxq28a49nvjzx8i2lxrdmynkp6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring data-binary-ieee754 msgpack-types text
+       ];
+       executableHaskellDepends = [ base bytestring groom ];
+       testHaskellDepends = [
+         base bytestring containers hashable hspec msgpack-types QuickCheck
+         text unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq QuickCheck
+       ];
+       description = "A Haskell implementation of MessagePack";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "msgpack-idl" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, cmdargs
      , containers, directory, filepath, hspec, msgpack, peggy
@@ -168488,6 +169185,48 @@ self: {
        broken = true;
      }) {};
 
+  "msgpack-rpc-conduit" = callPackage
+    ({ mkDerivation, async, base, binary, binary-conduit, bytestring
+     , conduit, conduit-extra, data-default-class
+     , data-default-instances-base, exceptions, hspec, monad-control
+     , msgpack-binary, msgpack-types, mtl, network, text, unliftio-core
+     }:
+     mkDerivation {
+       pname = "msgpack-rpc-conduit";
+       version = "0.0.6";
+       sha256 = "000aycbvxac4li8rxqxmj3a020fwl08wnq01fv8jdlx3qg7k57hf";
+       libraryHaskellDepends = [
+         base binary binary-conduit bytestring conduit conduit-extra
+         data-default-class data-default-instances-base exceptions
+         monad-control msgpack-binary msgpack-types mtl network text
+         unliftio-core
+       ];
+       testHaskellDepends = [ async base bytestring hspec mtl network ];
+       description = "A MessagePack-RPC Implementation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "msgpack-types" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq
+     , generic-arbitrary, hashable, hspec, QuickCheck, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "msgpack-types";
+       version = "0.0.4";
+       sha256 = "076szvjs80a765c72prjp73416gyq70b4k1319qfl339sa8lz1ky";
+       libraryHaskellDepends = [
+         base bytestring containers deepseq hashable QuickCheck text
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers deepseq generic-arbitrary hashable hspec
+         QuickCheck text unordered-containers vector
+       ];
+       description = "A Haskell implementation of MessagePack";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "msh" = callPackage
     ({ mkDerivation, base, containers, haskell-src-exts
      , haskell-src-meta, lens, mtl, parsec, template-haskell, text
@@ -170153,8 +170892,8 @@ self: {
      }:
      mkDerivation {
        pname = "musicScroll";
-       version = "0.2.0.0";
-       sha256 = "1iv80yhal5f8klsc095yabq7402w45j8lb0g64avdyp2zy569vmx";
+       version = "0.2.2.0";
+       sha256 = "1r1n22g98sqi8hnrkwb6cyv805ggq8770iwa4bzwiq7a59x3rlm6";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -172511,16 +173250,16 @@ self: {
      }:
      mkDerivation {
        pname = "net-spider";
-       version = "0.4.1.0";
-       sha256 = "09ww6ya4h7j8vd9j18492qx6x0y1aqmis271smrb45mylj4hsaqb";
+       version = "0.4.2.0";
+       sha256 = "1jpqkwgi13a0hw99andw6f8jsq8isqsqlqjc42bapy97wxba2bii";
        libraryHaskellDepends = [
          aeson base containers data-interval extended-reals greskell
          greskell-websocket hashable monad-logger regex-applicative
          safe-exceptions scientific text time unordered-containers vector
        ];
        testHaskellDepends = [
-         aeson base bytestring doctest doctest-discover hspec text time
-         vector
+         aeson base bytestring doctest doctest-discover greskell hashable
+         hspec text time vector
        ];
        description = "A graph database middleware to maintain a time-varying graph";
        license = stdenv.lib.licenses.bsd3;
@@ -178802,6 +179541,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "openid-connect" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive, cookie
+     , cryptonite, http-client, http-types, jose, lens, memory, mtl
+     , network-uri, tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "openid-connect";
+       version = "0.1.0.0";
+       sha256 = "12qp155dazycypv0fvw8mbh3rl5j5ybd2vyfga8wi55n16v1w8mv";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive cookie cryptonite
+         http-client http-types jose lens memory mtl network-uri text time
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring case-insensitive cookie cryptonite
+         http-client http-types jose lens memory mtl network-uri tasty
+         tasty-hunit text time unordered-containers
+       ];
+       description = "An OpenID Connect library that does all the heavy lifting for you";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "openpgp" = callPackage
     ({ mkDerivation, base, binary, bytestring, bzlib, HUnit, QuickCheck
      , quickcheck-instances, test-framework, test-framework-hunit
@@ -179537,6 +180301,8 @@ self: {
        pname = "optics-core";
        version = "0.2";
        sha256 = "19hsax8wxxgr28rjz6p9afb06f338xnyvws7salmm1dsik1ghzr8";
+       revision = "1";
+       editedCabalFile = "1sghrm6xyflzkv350phcm344ljv82wk2vjnwhwyvcqwirkwg8rk9";
        libraryHaskellDepends = [
          array base containers indexed-profunctors transformers
        ];
@@ -180129,8 +180895,8 @@ self: {
      }:
      mkDerivation {
        pname = "org-mode-lucid";
-       version = "1.2.0";
-       sha256 = "1y7dxm3g7jzq7y45z1d4k1j4rsfjdg4l8gk1ykn5frigwf01vwkf";
+       version = "1.3.0";
+       sha256 = "0a6iy2x0k9r3072zx0sf4k27xnihwckyd1h2pcqd61sxkgf3qkn3";
        libraryHaskellDepends = [
          base containers hashable lucid org-mode text
        ];
@@ -181305,50 +182071,53 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "pandoc_2_9_2" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
-     , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
-     , case-insensitive, cmark-gfm, containers, criterion, data-default
-     , deepseq, Diff, directory, doclayout, doctemplates, emojis
-     , exceptions, executable-path, filepath, Glob, haddock-library
-     , hslua, hslua-module-system, hslua-module-text, HsYAML, HTTP
-     , http-client, http-client-tls, http-types, ipynb, jira-wiki-markup
-     , JuicyPixels, mtl, network, network-uri, pandoc-types, parsec
-     , process, QuickCheck, random, safe, scientific, SHA, skylighting
-     , skylighting-core, split, syb, tagsoup, tasty, tasty-golden
-     , tasty-hunit, tasty-lua, tasty-quickcheck, temporary, texmath
-     , text, text-conversions, time, unicode-transforms, unix
-     , unordered-containers, vector, weigh, xml, zip-archive, zlib
+  "pandoc_2_9_2_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base-compat
+     , base-noprelude, base64-bytestring, binary, blaze-html
+     , blaze-markup, bytestring, case-insensitive, cmark-gfm, containers
+     , criterion, data-default, deepseq, Diff, directory, doclayout
+     , doctemplates, emojis, exceptions, executable-path, filepath, Glob
+     , haddock-library, hslua, hslua-module-system, hslua-module-text
+     , HsYAML, HTTP, http-client, http-client-tls, http-types, ipynb
+     , jira-wiki-markup, JuicyPixels, mtl, network, network-uri
+     , pandoc-types, parsec, process, QuickCheck, random, safe
+     , scientific, SHA, skylighting, skylighting-core, split, syb
+     , tagsoup, tasty, tasty-golden, tasty-hunit, tasty-lua
+     , tasty-quickcheck, temporary, texmath, text, text-conversions
+     , time, unicode-transforms, unix, unordered-containers, vector
+     , weigh, xml, zip-archive, zlib
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "2.9.2";
-       sha256 = "1f9wbwzv6c3dlsn15iydh921icjqj7kjgrb726kqmj5gmaypc39j";
+       version = "2.9.2.1";
+       sha256 = "0myz7firqkx4k0vrsd62j443gvm2pk09bi69c8qdbdzq5hvkavf2";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson aeson-pretty attoparsec base base64-bytestring binary
-         blaze-html blaze-markup bytestring case-insensitive cmark-gfm
-         containers data-default deepseq directory doclayout doctemplates
-         emojis exceptions filepath Glob haddock-library hslua
-         hslua-module-system hslua-module-text HsYAML HTTP http-client
-         http-client-tls http-types ipynb jira-wiki-markup JuicyPixels mtl
-         network network-uri pandoc-types parsec process random safe
-         scientific SHA skylighting skylighting-core split syb tagsoup
-         temporary texmath text text-conversions time unicode-transforms
-         unix unordered-containers vector xml zip-archive zlib
+         aeson aeson-pretty attoparsec base-compat base-noprelude
+         base64-bytestring binary blaze-html blaze-markup bytestring
+         case-insensitive cmark-gfm containers data-default deepseq
+         directory doclayout doctemplates emojis exceptions filepath Glob
+         haddock-library hslua hslua-module-system hslua-module-text HsYAML
+         HTTP http-client http-client-tls http-types ipynb jira-wiki-markup
+         JuicyPixels mtl network network-uri pandoc-types parsec process
+         random safe scientific SHA skylighting skylighting-core split syb
+         tagsoup temporary texmath text text-conversions time
+         unicode-transforms unix unordered-containers vector xml zip-archive
+         zlib
        ];
-       executableHaskellDepends = [ base ];
+       executableHaskellDepends = [ base-compat base-noprelude ];
        testHaskellDepends = [
-         base base64-bytestring bytestring containers Diff directory
-         doctemplates executable-path filepath Glob hslua mtl pandoc-types
-         process QuickCheck tasty tasty-golden tasty-hunit tasty-lua
-         tasty-quickcheck temporary text time xml zip-archive
+         base-compat base-noprelude base64-bytestring bytestring containers
+         Diff directory doctemplates executable-path filepath Glob hslua mtl
+         pandoc-types process QuickCheck tasty tasty-golden tasty-hunit
+         tasty-lua tasty-quickcheck temporary text time xml zip-archive
        ];
        benchmarkHaskellDepends = [
-         base bytestring containers criterion mtl text time weigh
+         base-compat base-noprelude bytestring containers criterion mtl text
+         time weigh
        ];
        postInstall = ''
          mkdir -p $out/share/man/man1
@@ -181878,8 +182647,8 @@ self: {
     ({ mkDerivation }:
      mkDerivation {
        pname = "pandora";
-       version = "0.2.3";
-       sha256 = "1sk8hhw3ad0jb2ik787pqjgaprd78k7qc0m0chcji3z5bprxp1cw";
+       version = "0.2.4";
+       sha256 = "06pff2nhsmlrj57g9hi1k1vnd4wkl3i9h8ijgwvf2yxpqqs42spi";
        description = "A box of patterns and paradigms";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -182690,8 +183459,8 @@ self: {
        pname = "parallel";
        version = "3.2.2.0";
        sha256 = "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p";
-       revision = "1";
-       editedCabalFile = "0a3kn7arck8f2gwm8cwfkplsw4q9v9j6ifbhj1l3bmclmkwcckcj";
+       revision = "2";
+       editedCabalFile = "0shw96f4fc3vbr2vrnsk794qcsxyv3ra3snhw4wng81rkapp54y6";
        libraryHaskellDepends = [ array base containers deepseq ghc-prim ];
        description = "Parallel programming library";
        license = stdenv.lib.licenses.bsd3;
@@ -183928,29 +184697,25 @@ self: {
      }) {};
 
   "patch-image" = callPackage
-    ({ mkDerivation, accelerate, accelerate-arithmetic
-     , accelerate-cufft, accelerate-fourier, accelerate-io
-     , accelerate-llvm-ptx, accelerate-utility, array, base, bool8
-     , bytestring, Cabal, carray, cassava, comfort-array, containers
-     , dsp, enumset, explicit-exception, fft, filepath, gnuplot
-     , JuicyPixels, knead, llvm-extra, llvm-tf, non-empty, pqueue
-     , prelude-compat, semigroups, storable-complex, storable-tuple, tfp
-     , unordered-containers, utility-ht, vector
+    ({ mkDerivation, array, base, bool8, bytestring, carray, cassava
+     , comfort-array, containers, dsp, enumset, explicit-exception, fft
+     , filepath, JuicyPixels, knead, llvm-extra, llvm-tf, non-empty
+     , pqueue, prelude-compat, semigroups, shell-utility
+     , storable-complex, storable-record, tfp, unordered-containers
+     , utility-ht, vector
      }:
      mkDerivation {
        pname = "patch-image";
-       version = "0.3.3";
-       sha256 = "0jm723xrbiwpq7sci67z0vilsv8a8i2ndm795ssyqkgqm7g1psby";
+       version = "0.3.3.1";
+       sha256 = "0nvp2y2f5cb29vzk2a9bvr3mgf17j70ir0nhb648pzfa0h1xj76k";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         accelerate accelerate-arithmetic accelerate-cufft
-         accelerate-fourier accelerate-io accelerate-llvm-ptx
-         accelerate-utility array base bool8 bytestring Cabal carray cassava
-         comfort-array containers dsp enumset explicit-exception fft
-         filepath gnuplot JuicyPixels knead llvm-extra llvm-tf non-empty
-         pqueue prelude-compat semigroups storable-complex storable-tuple
-         tfp unordered-containers utility-ht vector
+         array base bool8 bytestring carray cassava comfort-array containers
+         dsp enumset explicit-exception fft filepath JuicyPixels knead
+         llvm-extra llvm-tf non-empty pqueue prelude-compat semigroups
+         shell-utility storable-complex storable-record tfp
+         unordered-containers utility-ht vector
        ];
        description = "Compose a big image from overlapping parts";
        license = stdenv.lib.licenses.bsd3;
@@ -185936,8 +186701,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-mongoDB";
-       version = "2.9.0.2";
-       sha256 = "0q78y1ydsvm0jrsi211zq789vy50czhskwq13plv6l2h4860917v";
+       version = "2.10.0.0";
+       sha256 = "1z895y21raak3x9qw05hgif5qyvr6c7pkc59wzg7irk8mxijyf4n";
        libraryHaskellDepends = [
          aeson base bson bytestring cereal conduit http-api-data mongoDB
          network path-pieces persistent resource-pool resourcet text time
@@ -190725,8 +191490,8 @@ self: {
      }:
      mkDerivation {
        pname = "pomaps";
-       version = "0.1.0.0";
-       sha256 = "0vacywl9yg5dyayf34k5sxnf35x0hxwh0dsdglqk243hf9lrd0wz";
+       version = "0.2.0.0";
+       sha256 = "1a3vf0r69263gpq1aass2x5wcmgrfk16pnsf4wsvrnka5lgnsijp";
        libraryHaskellDepends = [
          base containers deepseq ghc-prim lattices
        ];
@@ -198438,6 +199203,27 @@ self: {
        broken = true;
      }) {};
 
+  "quarantimer" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, directory
+     , filepath, lucid, process, sandi, servant, servant-client
+     , servant-lucid, servant-multipart, servant-server, stm, text, time
+     , uuid, wai, wai-extra, warp, warp-tls
+     }:
+     mkDerivation {
+       pname = "quarantimer";
+       version = "1.20200326";
+       sha256 = "1q0rraxq1gv86chi64ijxxkx4dm8w9v2610wj58315bap3d3m91c";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson async base bytestring directory filepath lucid process sandi
+         servant servant-client servant-lucid servant-multipart
+         servant-server stm text time uuid wai wai-extra warp warp-tls
+       ];
+       description = "Coronavirus quarantine timer web app for your things";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "qudb" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, directory, happy
      , mtl, snappy
@@ -198853,8 +199639,8 @@ self: {
        pname = "quickcheck-instances";
        version = "0.3.22";
        sha256 = "14asr9r7da3w7p4hjj51w2yb002nz8x0np8hdz9z4yjvi60vyrax";
-       revision = "2";
-       editedCabalFile = "1ia5fjhpg7rz793552v88gv2iqx7hl9mi2g09m0llasy1cpzc9jr";
+       revision = "3";
+       editedCabalFile = "0i5z5c55668hcw7xk3cgvn13qflznc5d81rd97jxn712x82d7y14";
        libraryHaskellDepends = [
          array base base-compat bytestring case-insensitive containers
          hashable old-time QuickCheck scientific splitmix tagged text time
@@ -200225,6 +201011,8 @@ self: {
        pname = "ral";
        version = "0.1";
        sha256 = "0h8jqaapagrp9faixq817lib8l4nq4ycjj6ppl1ra8llnfsz5304";
+       revision = "1";
+       editedCabalFile = "1cazlravv7d4r5qsk9px9vrgr4rndhg43k3rbskk6p3hahigkjfd";
        libraryHaskellDepends = [
          adjunctions base bin deepseq distributive fin hashable QuickCheck
          semigroupoids
@@ -200240,6 +201028,8 @@ self: {
        pname = "ral-lens";
        version = "0.1";
        sha256 = "0hm8mzj51hdql8rp3v0yvmcvmgha4ys8zsgbbx93mlp2b4rfhzpv";
+       revision = "1";
+       editedCabalFile = "0j7lxlbj2klhcx12xixp3glhbvc9k1pccaiqm2kqr5l3lkrcnirv";
        libraryHaskellDepends = [ base bin fin lens ral ];
        description = "Length-indexed random access lists: lens utilities";
        license = stdenv.lib.licenses.gpl2Plus;
@@ -200752,6 +201542,8 @@ self: {
        pname = "range-set-list";
        version = "0.1.3.1";
        sha256 = "0m8c8qhpk9vaykqfy6gsv1csmvdclm27zv9l56ipv152k75xks0j";
+       revision = "1";
+       editedCabalFile = "0ma1gxmk2in2fj4rxhwshy2zq690ylw1zz0c9cnyin8mxkp96inc";
        libraryHaskellDepends = [ base containers deepseq hashable ];
        testHaskellDepends = [
          base containers deepseq hashable tasty tasty-quickcheck
@@ -202511,7 +203303,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "rebase_1_6_0_1" = callPackage
+  "rebase_1_6_1" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, comonad, containers
      , contravariant, contravariant-extras, deepseq, dlist, either
      , hashable, mtl, profunctors, scientific, selective, semigroupoids
@@ -202520,8 +203312,8 @@ self: {
      }:
      mkDerivation {
        pname = "rebase";
-       version = "1.6.0.1";
-       sha256 = "0w0vy4y2v09a9v8qjqcxq5nqrdk8c1mw7lak9mwv16j59bcijn0x";
+       version = "1.6.1";
+       sha256 = "020aw7wlgx8nqbq6ara13szgxw2q0n0hx3vrsn2lfp53b2jdsvax";
        libraryHaskellDepends = [
          base bifunctors bytestring comonad containers contravariant
          contravariant-extras deepseq dlist either hashable mtl profunctors
@@ -204187,6 +204979,8 @@ self: {
        pname = "regex-base";
        version = "0.94.0.0";
        sha256 = "055rlq67xnbqv43fgrlw6d7s8nhyavahrp6blihwjmqizksq47y4";
+       revision = "1";
+       editedCabalFile = "13lnky4ps9as73jqrwz4aqn5sfyrcz2zj2ng52xzz512fv59baj4";
        libraryHaskellDepends = [
          array base bytestring containers mtl text
        ];
@@ -204447,6 +205241,8 @@ self: {
        pname = "regex-posix";
        version = "0.96.0.0";
        sha256 = "08a584jabmmn5gmaqrcar5wsp3qzk0hklldzp2mr2bmvlvqh04r5";
+       revision = "1";
+       editedCabalFile = "1cy39n1928wv55i7k4wm7zd3xijk7p54kbrxxlfzfvgax5k163b9";
        libraryHaskellDepends = [
          array base bytestring containers regex-base
        ];
@@ -204493,6 +205289,8 @@ self: {
        pname = "regex-tdfa";
        version = "1.3.1.0";
        sha256 = "1h1fliv2zjxwmddl9wnn7ckxxpgy1049hdfg6fcknyrr7mw7dhqm";
+       revision = "1";
+       editedCabalFile = "1fhi4g2p29qnnfyb211n62g97qrw3gz1kahca7rlz43all93ihdy";
        libraryHaskellDepends = [
          array base bytestring containers mtl parsec regex-base text
        ];
@@ -205291,21 +206089,6 @@ self: {
      }) {};
 
   "relational-schemas" = callPackage
-    ({ mkDerivation, base, bytestring, containers, relational-query
-     , template-haskell, time
-     }:
-     mkDerivation {
-       pname = "relational-schemas";
-       version = "0.1.7.0";
-       sha256 = "1yhgn2sjq7530s31fyyaxms5vnqwl03pwvsn0sm8f6yyzjvwm38b";
-       libraryHaskellDepends = [
-         base bytestring containers relational-query template-haskell time
-       ];
-       description = "RDBMSs' schema templates for relational-query";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "relational-schemas_0_1_8_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, relational-query
      , sql-words, template-haskell, time
      }:
@@ -205319,7 +206102,6 @@ self: {
        ];
        description = "RDBMSs' schema templates for relational-query";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relative-date" = callPackage
@@ -205729,8 +206511,8 @@ self: {
        pname = "repa";
        version = "3.4.1.4";
        sha256 = "17m3wl4hvf04fxwm4fflhnv41yl9bm263hnbpxc8x6xqwifplq23";
-       revision = "3";
-       editedCabalFile = "17hxj42cm82sac42by78jgbjjn5r3qv7n4919llaq17a2k1np0sw";
+       revision = "4";
+       editedCabalFile = "0bay8j0fm7l2nhrbdvy9fvrb6hgkrk5qx9y03az2kakvjdc4gvvh";
        libraryHaskellDepends = [
          base bytestring ghc-prim QuickCheck template-haskell vector
        ];
@@ -206066,6 +206848,22 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "replace-attoparsec_1_2_1_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, Cabal, parsers, text
+     }:
+     mkDerivation {
+       pname = "replace-attoparsec";
+       version = "1.2.1.0";
+       sha256 = "0i88mylhbm3hx7rj59ms125xnzinxrcjv98df73xzzz54cjf123j";
+       libraryHaskellDepends = [ attoparsec base bytestring text ];
+       testHaskellDepends = [
+         attoparsec base bytestring Cabal parsers text
+       ];
+       description = "Find, replace, and edit text patterns with Attoparsec parsers";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "replace-megaparsec" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, megaparsec, text }:
      mkDerivation {
@@ -206159,6 +206957,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "repline_0_3_0_0" = callPackage
+    ({ mkDerivation, base, containers, exceptions, haskeline, mtl
+     , process
+     }:
+     mkDerivation {
+       pname = "repline";
+       version = "0.3.0.0";
+       sha256 = "0niihfyggg2qisadg7w49cr5k5qyyynia93iip0ng2bbmzwi88g8";
+       libraryHaskellDepends = [
+         base containers exceptions haskeline mtl process
+       ];
+       testHaskellDepends = [ base containers mtl process ];
+       description = "Haskeline wrapper for GHCi-like REPL interfaces";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "repo-based-blog" = callPackage
     ({ mkDerivation, base, blaze-html, containers, data-default
      , directory, dyre, filepath, filestore, hspec, hspec-discover
@@ -206493,12 +207308,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "rerebase_1_6_0_1" = callPackage
+  "rerebase_1_6_1" = callPackage
     ({ mkDerivation, rebase }:
      mkDerivation {
        pname = "rerebase";
-       version = "1.6.0.1";
-       sha256 = "07ddcmm2yx71nvgcbj87skrx5pfzsqhi87dxn7vv41ssibv714fk";
+       version = "1.6.1";
+       sha256 = "0lyi925jk6jbi3qc5xmv61ag07ff9d3xxmf9hfjlblqw2y9fsy93";
        libraryHaskellDepends = [ rebase ];
        description = "Reexports from \"base\" with a bunch of other standard libraries";
        license = stdenv.lib.licenses.mit;
@@ -210084,6 +210899,17 @@ self: {
        broken = true;
      }) {};
 
+  "run-haskell-module" = callPackage
+    ({ mkDerivation, base, data-default, filepath, process }:
+     mkDerivation {
+       pname = "run-haskell-module";
+       version = "0.0.1";
+       sha256 = "1zy7n1qd9bwxh432cs8aqf33h434rxv0k66fhygfycbih2s8h6gg";
+       libraryHaskellDepends = [ base data-default filepath process ];
+       description = "Running newly generated Haskell source module";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "run-st" = callPackage
     ({ mkDerivation, base, primitive, primitive-unlifted }:
      mkDerivation {
@@ -210906,6 +211732,25 @@ self: {
        broken = true;
      }) {};
 
+  "sak" = callPackage
+    ({ mkDerivation, base, bytestring, bz2, cpphs, directory, filepath
+     , lz4-hs, lzlib, lzma, optparse-applicative, zlib, zstd
+     }:
+     mkDerivation {
+       pname = "sak";
+       version = "0.1.1.0";
+       sha256 = "0k40jkdg2029h549zgkq4ciayx162lb280l4lkna47dd3r5mf3xd";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring bz2 directory filepath lz4-hs lzlib lzma
+         optparse-applicative zlib zstd
+       ];
+       executableToolDepends = [ cpphs ];
+       description = "Compression command-line tool";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sakuraio-platform" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, time
      , unordered-containers
@@ -210927,35 +211772,6 @@ self: {
      }) {};
 
   "salak" = callPackage
-    ({ mkDerivation, base, bytestring, containers, criterion
-     , data-default, directory, dlist, exceptions, filepath, hashable
-     , heaps, hspec, hspec-discover, megaparsec, mtl, QuickCheck, random
-     , scientific, text, time, unliftio-core, unordered-containers
-     }:
-     mkDerivation {
-       pname = "salak";
-       version = "0.3.5.3";
-       sha256 = "0k6z2vjxg6za6rfhx1xgjdck7ainnsbhrvzav2ngwpvy8li5g02b";
-       revision = "1";
-       editedCabalFile = "138c763crbfipcb9ss1lk3wx3482nm2v4zbm3k88h6jszxhmxvav";
-       libraryHaskellDepends = [
-         base bytestring containers data-default directory dlist exceptions
-         filepath hashable heaps megaparsec mtl scientific text time
-         unliftio-core unordered-containers
-       ];
-       testHaskellDepends = [
-         base hspec mtl QuickCheck random scientific text
-         unordered-containers
-       ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [
-         base criterion data-default mtl text time
-       ];
-       description = "Configuration (re)Loader and Parser";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "salak_0_3_6" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion
      , data-default, directory, dlist, exceptions, filepath, hashable
      , heaps, hspec, hspec-discover, megaparsec, mtl, QuickCheck, random
@@ -210980,7 +211796,6 @@ self: {
        ];
        description = "Configuration (re)Loader and Parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "salak-toml" = callPackage
@@ -212221,15 +213036,17 @@ self: {
      }) {};
 
   "schema" = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck }:
+    ({ mkDerivation, base, groom, hspec, msgpack-binary, QuickCheck }:
      mkDerivation {
        pname = "schema";
-       version = "0.0.1";
-       sha256 = "0357j9xn0rw427x2f5pqkzmya9scyqwz3ksn4lyryzvmm9p6lii7";
+       version = "0.0.2";
+       sha256 = "0wzihrcjx6bha6yibsghcl0l3r3bwcsmnidbm072c16sppbglbqh";
        libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base hspec QuickCheck ];
+       testHaskellDepends = [
+         base groom hspec msgpack-binary QuickCheck
+       ];
        description = "Encoding-independent schemas for Haskell data types";
-       license = stdenv.lib.licenses.agpl3;
+       license = stdenv.lib.licenses.gpl3;
      }) {};
 
   "schemas" = callPackage
@@ -212434,33 +213251,33 @@ self: {
      }) {};
 
   "scidb-hquery" = callPackage
-    ({ mkDerivation, alex, array, base, base-compat, BNFC, bytestring
-     , Cabal, connection, cryptonite, data-default-class, directory
-     , exceptions, filepath, happy, haskeline, hostname-validate, HTTP
-     , http-client, http-client-tls, http-conduit, http-types, memory
-     , mtl, network, process, regex, safe, split, terminal-size, text
-     , tls, x509-store
+    ({ mkDerivation, alex, array, base, BNFC, bytestring, Cabal
+     , connection, cryptonite, data-default-class, directory, exceptions
+     , filepath, happy, haskeline, hostname-validate, HTTP, http-client
+     , http-client-tls, http-conduit, http-types, memory, mtl, network
+     , process, regex, safe, split, terminal-size, text, tls, x509-store
      }:
      mkDerivation {
        pname = "scidb-hquery";
-       version = "2.8.0.436";
-       sha256 = "0mkicmfvwc7xg37d46s7xrcsdaff09v7x86npd1bgv1k60m4c8gq";
+       version = "2.8.0.437";
+       sha256 = "1nxcxfr55rf6ds0hvgbnss5hjf059rdd7y613yc485w8bfmv5cil";
+       revision = "1";
+       editedCabalFile = "1xbiiaa5rj5nc4if69d97f5spbrsa8jv1mhcrgjkwff6a879274q";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
        libraryHaskellDepends = [
-         array base base-compat bytestring connection cryptonite
-         data-default-class exceptions haskeline hostname-validate HTTP
-         http-client http-client-tls http-conduit http-types memory mtl
-         network process regex safe split terminal-size text tls x509-store
+         array base bytestring connection cryptonite data-default-class
+         exceptions haskeline hostname-validate HTTP http-client
+         http-client-tls http-conduit http-types memory mtl network process
+         regex safe split terminal-size text tls x509-store
        ];
        libraryToolDepends = [ alex BNFC happy ];
        executableHaskellDepends = [
-         array base base-compat bytestring connection cryptonite
-         data-default-class directory exceptions filepath haskeline
-         hostname-validate HTTP http-client http-client-tls http-conduit
-         http-types memory mtl network process regex safe split
-         terminal-size text tls x509-store
+         array base bytestring connection cryptonite data-default-class
+         directory exceptions filepath haskeline hostname-validate HTTP
+         http-client http-client-tls http-conduit http-types memory mtl
+         network process regex safe split terminal-size text tls x509-store
        ];
        description = "Haskell query for SciDB via shim";
        license = stdenv.lib.licenses.gpl3;
@@ -214144,8 +214961,8 @@ self: {
      }:
      mkDerivation {
        pname = "semantic-source";
-       version = "0.0.2.0";
-       sha256 = "072iax2d2nhskpmm754ii28qdfvxrbwpvgix0igrrfaa52pcw286";
+       version = "0.1.0.0";
+       sha256 = "179rxsn1cyh77yn7vzmii38ipgcjpavlyf5xbx4j8zzgh1jklmc5";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq generic-monoid hashable
          lingo pathtype semilattices text
@@ -214219,6 +215036,8 @@ self: {
        pname = "semialign";
        version = "1.1";
        sha256 = "1n47w9c6i6azb4w65rzhci00v6p9c0s1w1givd2q3smkgyziiqpk";
+       revision = "1";
+       editedCabalFile = "0rfnjzbzzclzh2a1m5wpzzsqf8hrkrqnc90pflshb40i7rwkm6xf";
        libraryHaskellDepends = [
          base base-compat containers hashable semigroupoids tagged these
          transformers unordered-containers vector
@@ -214253,6 +215072,8 @@ self: {
        pname = "semialign-indexed";
        version = "1.1";
        sha256 = "1b6amfhwk968ah56w8vala3hbpzf9mfza2ajhdnvzcdiyqyxvwb0";
+       revision = "1";
+       editedCabalFile = "1g7b15xki938vljmkcwnz1hvqfp77ja39cxnfnwd5j507a0qp800";
        libraryHaskellDepends = [
          base containers hashable lens semialign these unordered-containers
          vector
@@ -218293,6 +219114,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "set-cover_0_1_1" = callPackage
+    ({ mkDerivation, array, base, containers, enummapset, non-empty
+     , prelude-compat, psqueues, QuickCheck, random, semigroups, timeit
+     , transformers, utility-ht
+     }:
+     mkDerivation {
+       pname = "set-cover";
+       version = "0.1.1";
+       sha256 = "04jjcmjll0azz24rx91p0dp5b8ya5jc0qacr21764ri1dbkfflgw";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base containers enummapset non-empty prelude-compat psqueues
+         semigroups transformers utility-ht
+       ];
+       testHaskellDepends = [
+         array base containers enummapset QuickCheck transformers utility-ht
+       ];
+       benchmarkHaskellDepends = [
+         array base containers enummapset QuickCheck random timeit
+         transformers utility-ht
+       ];
+       description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "set-extra" = callPackage
     ({ mkDerivation, base, containers, mtl, syb }:
      mkDerivation {
@@ -218387,8 +219235,8 @@ self: {
        pname = "setgame";
        version = "1.1";
        sha256 = "1hr2kb4d7m22d48gh74h5z8c6shkprincf0qb9wc2fq2hj7c3c1l";
-       revision = "1";
-       editedCabalFile = "1shkmfmjnvc47gy9ck6knf94571if4qjm92c1p8kji9v0n24yzfw";
+       revision = "2";
+       editedCabalFile = "0cb1vajyh3fxrkq97cvlkvpskgrnn4zs2gk8al9dcnn3dq0j3v58";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base random vty ];
@@ -219691,6 +220539,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "shell-utility_0_1" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "shell-utility";
+       version = "0.1";
+       sha256 = "1n15v0avvkxvczmyjc6g4z9axr5c61n8jlpa1cm4xr3qk7spm1mi";
+       libraryHaskellDepends = [ base ];
+       description = "Utility functions for writing command-line programs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "shellish" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, mtl
      , process, strict, time, unix-compat
@@ -220159,6 +221019,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "show-combinators_0_2_0_0" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "show-combinators";
+       version = "0.2.0.0";
+       sha256 = "07ds87ldl9165hj3k5h84iawc6vqlbggni3dg1nhbxww1spxn0n9";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       description = "Combinators to write Show instances";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "show-please" = callPackage
     ({ mkDerivation, base, mtl, parsec, template-haskell, th-orphans
      , time
@@ -220777,6 +221650,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "simple-cmd-args_0_1_6" = callPackage
+    ({ mkDerivation, base, optparse-applicative }:
+     mkDerivation {
+       pname = "simple-cmd-args";
+       version = "0.1.6";
+       sha256 = "18dikz7hy61wgrbpgnxmgfp1i485hkhgrdnqbkzl2mrmmjn8p1zd";
+       libraryHaskellDepends = [ base optparse-applicative ];
+       description = "Simple command args parsing and execution";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "simple-conduit" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, CC-delcont
      , chunked-data, conduit, conduit-combinators, conduit-extra
@@ -221801,8 +222686,8 @@ self: {
        pname = "singleton-bool";
        version = "0.1.5";
        sha256 = "17w9vv6arn7vvc7kykqcx81q2364ji43khrryl27r1cjx9yxapa0";
-       revision = "1";
-       editedCabalFile = "1g2dchvp5clg3hfdrp7hf5pbl9kcyhqhnqxqxd7n861nfd661wqd";
+       revision = "2";
+       editedCabalFile = "118j0h29nqg2acqbzif2ffqnanjbwnqmv2kch9z7xiwqkz6iq8an";
        libraryHaskellDepends = [ base dec ];
        description = "Type level booleans";
        license = stdenv.lib.licenses.bsd3;
@@ -221832,6 +222717,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "singleton-nats_0_4_4" = callPackage
+    ({ mkDerivation, base, singletons }:
+     mkDerivation {
+       pname = "singleton-nats";
+       version = "0.4.4";
+       sha256 = "14am0aggfrnd2w5g8cjljx0vmmrhy6r36xpkfrxpralhkr7h52m8";
+       libraryHaskellDepends = [ base singletons ];
+       description = "Unary natural numbers relying on the singletons infrastructure";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "singleton-typelits" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -221866,6 +222763,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "singletons_2_7" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, deepseq
+     , directory, filepath, ghc-boot-th, mtl, pretty, process, syb
+     , tasty, tasty-golden, template-haskell, text, th-desugar
+     , transformers, turtle
+     }:
+     mkDerivation {
+       pname = "singletons";
+       version = "2.7";
+       sha256 = "0az22as3rbzkfzv6a4m779qgibwah5r77l0zdgml9x7ajpkdcaz1";
+       revision = "1";
+       editedCabalFile = "18vd0jnr3skf2fmj13g06gjjzgmw5rnsjqwivsmqs3pkfv9qi3sm";
+       setupHaskellDepends = [ base Cabal directory filepath ];
+       libraryHaskellDepends = [
+         base containers ghc-boot-th mtl pretty syb template-haskell text
+         th-desugar transformers
+       ];
+       testHaskellDepends = [
+         base bytestring deepseq filepath process tasty tasty-golden text
+         turtle
+       ];
+       description = "A framework for generating singleton types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "singletons-presburger" = callPackage
     ({ mkDerivation, base, ghc, ghc-typelits-presburger, reflection
      , singletons
@@ -223246,6 +224169,31 @@ self: {
        broken = true;
      }) {};
 
+  "smarties" = callPackage
+    ({ mkDerivation, base, haskeline, hspec, ilist, microlens
+     , microlens-th, MonadRandom, mtl, QuickCheck, random, text, vector
+     }:
+     mkDerivation {
+       pname = "smarties";
+       version = "1.2.1";
+       sha256 = "0560d49crj5s9xpj8sk552qdqm19grj87lyqif0dxypc7qpn3dc8";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base microlens microlens-th MonadRandom mtl QuickCheck random text
+       ];
+       executableHaskellDepends = [
+         base haskeline ilist microlens microlens-th MonadRandom mtl
+         QuickCheck random text vector
+       ];
+       testHaskellDepends = [
+         base hspec microlens microlens-th MonadRandom mtl QuickCheck random
+         text
+       ];
+       description = "Haskell Behavior Tree Library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "smartword" = callPackage
     ({ mkDerivation, base, haskell98, pretty, unix, utf8-string }:
      mkDerivation {
@@ -225762,6 +226710,8 @@ self: {
        pname = "some";
        version = "1.0.1";
        sha256 = "13dpvxswjcsmic8h2vayp77qzl820gg4g29g5n2xcja8gnzjkkii";
+       revision = "1";
+       editedCabalFile = "0gpr24rf427l82d8gb3x97yj03vc2v8ky3b6m1gb4j3g4yvvmr96";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [ base ];
        description = "Existential type: Some";
@@ -225796,6 +226746,8 @@ self: {
        pname = "sop-core";
        version = "0.5.0.0";
        sha256 = "12zqdr0g4s3fr6710ngph0fr06lbc12c849izcl4cjj4g9w3v3zz";
+       revision = "1";
+       editedCabalFile = "050z7a0k9m0q416cqnxx0gaqrfdjpqangnfhlpdkv3nsxndffv6v";
        libraryHaskellDepends = [ base deepseq ];
        description = "True Sums of Products";
        license = stdenv.lib.licenses.bsd3;
@@ -226526,8 +227478,8 @@ self: {
      }:
      mkDerivation {
        pname = "spdx";
-       version = "1.0.0.1";
-       sha256 = "00j0dqx9hrlpqy1jml85nykg0xl108q45ljan385bzb5nnap36l6";
+       version = "1.0.0.2";
+       sha256 = "0aydw4gwhvy45jgk038jnzhzgq8ijg16fk48appn67jn1c3yi0xj";
        libraryHaskellDepends = [ base Cabal containers transformers ];
        testHaskellDepends = [
          base base-compat Cabal tasty tasty-quickcheck
@@ -227761,20 +228713,21 @@ self: {
      , network-uri, pretty, process, process-extras, pureMD5, QuickCheck
      , random, safecopy, show-combinators, show-please, syb
      , template-haskell, text, th-lift, th-lift-instances, th-orphans
-     , time, unix, Unixutils, userid, uuid, uuid-orphans, uuid-types
-     , zlib
+     , time, transformers, unexceptionalio-trans, unix, Unixutils
+     , userid, uuid, uuid-orphans, uuid-types, zlib
      }:
      mkDerivation {
        pname = "sr-extra";
-       version = "1.64";
-       sha256 = "18yrl19dzjwfp56xam7m4d61wrxl224lz8jhi198j78pq6b4d1vl";
+       version = "1.72.3";
+       sha256 = "0jm7r0lxcwppc85rpyasq6grqqkcwhxs0clwyasicqklkcx2l5xw";
        libraryHaskellDepends = [
          base bytestring bzlib Cabal cereal containers Diff directory
          exceptions fgl filemanip filepath generic-data hslogger HUnit lens
          ListLike mmorph mtl network-uri pretty process process-extras
          pureMD5 QuickCheck random safecopy show-combinators show-please syb
          template-haskell text th-lift th-lift-instances th-orphans time
-         unix Unixutils userid uuid uuid-orphans uuid-types zlib
+         transformers unexceptionalio-trans unix Unixutils userid uuid
+         uuid-orphans uuid-types zlib
        ];
        description = "Module limbo";
        license = stdenv.lib.licenses.bsd3;
@@ -230555,6 +231508,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "storable-record_0_0_5" = callPackage
+    ({ mkDerivation, base, semigroups, transformers, utility-ht }:
+     mkDerivation {
+       pname = "storable-record";
+       version = "0.0.5";
+       sha256 = "17nf0bx3g169cpslf8prr5h5lvxl389m23rbsyb3kdai45fibpwf";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base semigroups transformers utility-ht
+       ];
+       description = "Elegant definition of Storable instances for records";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "storable-static-array" = callPackage
     ({ mkDerivation, array, base, tagged, vector }:
      mkDerivation {
@@ -230780,15 +231749,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "stratosphere_0_50_0" = callPackage
+  "stratosphere_0_51_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.50.0";
-       sha256 = "0nxvrfi3jp0p874gkj25rdlfsb2rskp82bz58c0rply0s5rivlfl";
+       version = "0.51.0";
+       sha256 = "053q621zw2c0nf08qc232mnh1cn4qxyzshayis6siqabdnjlqnk2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -235224,22 +236193,22 @@ self: {
      }) {UniqueLogicNP = null;};
 
   "synthesizer-llvm" = callPackage
-    ({ mkDerivation, base, containers, event-list, llvm-extra, llvm-tf
-     , midi, non-empty, non-negative, numeric-prelude, pathtype
+    ({ mkDerivation, base, containers, event-list, llvm-dsl, llvm-extra
+     , llvm-tf, midi, non-empty, non-negative, numeric-prelude, pathtype
      , QuickCheck, random, semigroups, sox, storable-record
-     , storable-tuple, storablevector, synthesizer-core
-     , synthesizer-midi, tfp, transformers, unsafe, utility-ht, vault
+     , storablevector, synthesizer-core, synthesizer-midi, tfp
+     , transformers, unsafe, utility-ht, vault
      }:
      mkDerivation {
        pname = "synthesizer-llvm";
-       version = "0.8.3";
-       sha256 = "1ff56jrk2a3hppw9s1iv167926vcmd9p51mzav73kkaxni1n6hry";
+       version = "0.9";
+       sha256 = "0bqncysaq164235792657yyf1ngkr7gm9vkzkbiqy6f7g7a62shd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers event-list llvm-extra llvm-tf midi non-empty
-         non-negative numeric-prelude pathtype random semigroups sox
-         storable-record storable-tuple storablevector synthesizer-core
+         base containers event-list llvm-dsl llvm-extra llvm-tf midi
+         non-empty non-negative numeric-prelude pathtype random semigroups
+         sox storable-record storablevector synthesizer-core
          synthesizer-midi tfp transformers unsafe utility-ht vault
        ];
        testHaskellDepends = [
@@ -236767,8 +237736,8 @@ self: {
        pname = "tar";
        version = "0.5.1.1";
        sha256 = "1ppim7cgmn7ng8zbdrwkxhhizc30h15h1c9cdlzamc5jcagl915k";
-       revision = "1";
-       editedCabalFile = "1ni8zym7k6f1hg6wfvnnf3xcs2ar3z8xaabkgjg8q329arjcm8wp";
+       revision = "2";
+       editedCabalFile = "131f369a2vjzr26r7f2c2p534xvyw0s7cvgvih2ck56lqha58wbs";
        libraryHaskellDepends = [
          array base bytestring containers deepseq directory filepath time
        ];
@@ -236792,8 +237761,8 @@ self: {
      }:
      mkDerivation {
        pname = "tar-bytestring";
-       version = "0.6.3.0";
-       sha256 = "18c5493zwwbri2m50a2najbxaqnprxwng48kdcap7qppbvdmra66";
+       version = "0.6.3.1";
+       sha256 = "09hmsgbjsk2ddnl9hfmhq1l274r7ay2fzs4rmqgs6x09q1kc5i5p";
        libraryHaskellDepends = [
          array base bytestring containers deepseq hpath-directory
          hpath-filepath hpath-posix safe-exceptions these time unix word8
@@ -237608,8 +238577,8 @@ self: {
        pname = "tasty-test-vector";
        version = "0";
        sha256 = "1kgz9mp1h391rqj9n78bfvxl8pd3bxanbnwkc5l9gvlygly3fz8j";
-       revision = "1";
-       editedCabalFile = "13z7fj49hsxs79brh0jrncx5qcqicgzcif9gnbx8y3hbh6qw4bv0";
+       revision = "2";
+       editedCabalFile = "131ldlbp4ji1m8wayl8h28ykcda29bsvifa3mw8513mnqnndgahc";
        libraryHaskellDepends = [ base tasty ];
        description = "Test vector support for tasty";
        license = stdenv.lib.licenses.bsd3;
@@ -240606,8 +241575,8 @@ self: {
        pname = "text-short";
        version = "0.1.3";
        sha256 = "0xyrxlb602z8bc9sr2y1fag0x56a20yj5qrkvy7iwc6hnznrynxz";
-       revision = "1";
-       editedCabalFile = "0lb4papn54fbgjdqj4ladaf5q12dhlwkg5z2vc5qxlh35x82sw4a";
+       revision = "2";
+       editedCabalFile = "17cb7p0qywf2dsrq3g8qb3ssknd9wl5k0nc2pxz9gc3l8rxpkw51";
        libraryHaskellDepends = [
          base binary bytestring deepseq ghc-prim hashable text
        ];
@@ -240631,6 +241600,8 @@ self: {
        pname = "text-show";
        version = "3.8.5";
        sha256 = "0xc2269v0bfcvlwm60l2zs6l6lwljfnq5n05n9kp580qybvynzjg";
+       revision = "1";
+       editedCabalFile = "1610wjf52hlkkxwavz0gwi3bxszwv1cmnglbvspj1raxysinhgdj";
        libraryHaskellDepends = [
          array base base-compat-batteries bifunctors bytestring
          bytestring-builder containers generic-deriving ghc-boot-th ghc-prim
@@ -240662,8 +241633,8 @@ self: {
        pname = "text-show-instances";
        version = "3.8.3";
        sha256 = "11v335p3wzf9ijqlkls5mk4m16dfak8fckn4gj7mahs8c7l9lm5d";
-       revision = "2";
-       editedCabalFile = "001xn2aq5k8hhn5iwhmxv1s3mnxyg630klmmdhbp3lxdb2yq8rha";
+       revision = "3";
+       editedCabalFile = "08hdil68nn7ly82d8dk31lv4wdgrl725wkx4qfmp6kbcd2plrwvq";
        libraryHaskellDepends = [
          base base-compat-batteries bifunctors binary containers directory
          ghc-boot-th haskeline hpc old-locale old-time pretty random
@@ -241173,6 +242144,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-desugar_1_11" = callPackage
+    ({ mkDerivation, base, containers, fail, ghc-prim, hspec, HUnit
+     , mtl, ordered-containers, semigroups, syb, template-haskell
+     , th-abstraction, th-lift, th-orphans, transformers-compat
+     }:
+     mkDerivation {
+       pname = "th-desugar";
+       version = "1.11";
+       sha256 = "0ap8dk1a1wl62ggqkg9rb7vna131drrjcd2hn5dw7mwnbc1rxqhl";
+       libraryHaskellDepends = [
+         base containers fail ghc-prim mtl ordered-containers semigroups syb
+         template-haskell th-abstraction th-lift th-orphans
+         transformers-compat
+       ];
+       testHaskellDepends = [
+         base containers hspec HUnit mtl syb template-haskell th-lift
+         th-orphans
+       ];
+       description = "Functions to desugar Template Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-dict-discovery" = callPackage
     ({ mkDerivation, base, constraints, template-haskell }:
      mkDerivation {
@@ -241271,8 +242265,8 @@ self: {
      }:
      mkDerivation {
        pname = "th-instance-reification";
-       version = "0.1.5";
-       sha256 = "0ssnd45bvz4k0fajc3xlqy7iq92rm0pjn3wwl4brnvaf7l1180q4";
+       version = "0.1.5.1";
+       sha256 = "0jafxmd767z52my86dh1dk89h6wx2qf11vx4yk9qw563a7xzv6rm";
        libraryHaskellDepends = [
          base containers list-extras template-haskell th-expand-syns
        ];
@@ -241783,8 +242777,8 @@ self: {
        pname = "these";
        version = "1.0.1";
        sha256 = "1k0pi65g7cm9hzdw6my6bzz2zvddkmj1qs45ymqmi316bpiixk3r";
-       revision = "1";
-       editedCabalFile = "0923r86fnmgpx0msm68aszirh2n19nn5bccgjxfh2146jw4z7w3z";
+       revision = "2";
+       editedCabalFile = "1dk8rpm814k7fmkcff7qf2y0s7idnfswd6674kd12bs6ywmgf89n";
        libraryHaskellDepends = [
          aeson assoc base base-compat binary deepseq hashable QuickCheck
          semigroupoids unordered-containers
@@ -241799,8 +242793,8 @@ self: {
        pname = "these-lens";
        version = "1";
        sha256 = "144ly13qng95mwnfis8dm7n3843z3w2vp4212qawbpw8hw921c7y";
-       revision = "1";
-       editedCabalFile = "1lrpq5a8ldddmsi7ckaqinamn2f7kkijq5jq05yzdx818b2563wn";
+       revision = "2";
+       editedCabalFile = "0krnf1arsr05ygqcpfd7p34k7319fwjbg59fqhilrjl6jzzpyaka";
        libraryHaskellDepends = [ base base-compat lens these ];
        description = "Lenses for These";
        license = stdenv.lib.licenses.bsd3;
@@ -244561,8 +245555,8 @@ self: {
        pname = "toml-parser";
        version = "0.1.0.0";
        sha256 = "0p1nl3009qlcqn4jjggbm1v719a6bswklkyjb3plm0cz3bsyr0fs";
-       revision = "2";
-       editedCabalFile = "02vblwkja1in6fi3zbvxmw6k1c0zny9jljiis0krvn94h2rdflwd";
+       revision = "3";
+       editedCabalFile = "1hls6xw2c7379m1x92da91v7mv1ysdsj6shi1nslfq5xgm53bw14";
        libraryHaskellDepends = [ array base text time ];
        libraryToolDepends = [ alex happy ];
        description = "Parser for the TOML configuration language";
@@ -244921,6 +245915,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "topograph_1_0_0_1" = callPackage
+    ({ mkDerivation, base, base-compat, base-orphans, containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "topograph";
+       version = "1.0.0.1";
+       sha256 = "1sd2gyirkdgwcll76zxw954wdsyxzajn59xa9zk55fbrsm6w24cv";
+       libraryHaskellDepends = [
+         base base-compat base-orphans containers vector
+       ];
+       description = "Directed acyclic graphs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "torch" = callPackage
     ({ mkDerivation, base, mtl, parallel, QuickCheck }:
      mkDerivation {
@@ -245082,6 +246092,33 @@ self: {
        broken = true;
      }) {toxcore = null;};
 
+  "toxcore-c" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring
+     , bytestring-arbitrary, data-default-class, directory, hspec
+     , QuickCheck, saltine, toxcore
+     }:
+     mkDerivation {
+       pname = "toxcore-c";
+       version = "0.2.11";
+       sha256 = "1fgz30y867lw9d6pmssi75k1prlfgrlpfa9qzqkm52mra2r5d2mb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring data-default-class ];
+       librarySystemDepends = [ toxcore ];
+       executableHaskellDepends = [
+         base base16-bytestring bytestring directory
+       ];
+       executableSystemDepends = [ toxcore ];
+       testHaskellDepends = [
+         base base16-bytestring bytestring bytestring-arbitrary
+         data-default-class hspec QuickCheck saltine
+       ];
+       description = "Haskell bindings to the C reference implementation of Tox";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {toxcore = null;};
+
   "toxiproxy-haskell" = callPackage
     ({ mkDerivation, aeson, base, containers, hspec, http-client
      , process, servant, servant-client, silently, text, time
@@ -246348,16 +247385,16 @@ self: {
 
   "tree-sitter" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, fused-effects, hedgehog, semantic-source, split
-     , template-haskell, text, unordered-containers
+     , filepath, fused-effects, hedgehog, split, template-haskell, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "tree-sitter";
-       version = "0.9.0.0";
-       sha256 = "12mjscpibhh15jiqcplnj2m4gxd4ym4xbbji96l5zwpzmd2x4bjb";
+       version = "0.9.0.1";
+       sha256 = "1khkc2v87i9vgbakc3gh1rmrakz43n4lglx50vvckp192in4svzm";
        libraryHaskellDepends = [
          aeson base bytestring containers directory filepath fused-effects
-         semantic-source split template-haskell text unordered-containers
+         split template-haskell text unordered-containers
        ];
        testHaskellDepends = [ base hedgehog ];
        description = "Unstable bindings for the tree-sitter parsing library";
@@ -251368,8 +252405,8 @@ self: {
        pname = "universe-base";
        version = "1.1.1";
        sha256 = "1a6yyvrzkz7jnjz4lyp8aw0r5hci1nx8c06v3dicgfqs3frk1v8x";
-       revision = "1";
-       editedCabalFile = "1l6vxapfjhm5mb6w25ah8sl78hdw1ia5s18cf40lm0vzb6ip4bkk";
+       revision = "2";
+       editedCabalFile = "0601hqv5h2274i11j1ai2yqb7zk2fkqkiqlpwnq5awbgdkwb10i8";
        libraryHaskellDepends = [ base containers tagged transformers ];
        testHaskellDepends = [ base containers QuickCheck ];
        description = "A class for finite and recursively enumerable types";
@@ -251382,8 +252419,8 @@ self: {
      }:
      mkDerivation {
        pname = "universe-dependent-sum";
-       version = "1.2";
-       sha256 = "1xjw6mhlj1vyw6m4b4j0k81p86hls9031sfv59zgiq5y0ngm1f07";
+       version = "1.2.0.1";
+       sha256 = "0002wc68z803jys90s7sdh5nzdx1dk2jl49d19sjylk1cf18n5fi";
        libraryHaskellDepends = [
          base dependent-sum some universe-base universe-some
        ];
@@ -251412,6 +252449,8 @@ self: {
        pname = "universe-instances-extended";
        version = "1.1.1";
        sha256 = "1ppklq2rjcryld9d9kdzz55vfllfpxxgsvvkhpd1jrvhyj51yahh";
+       revision = "1";
+       editedCabalFile = "0g3qpvgw304yml1n9ly78qrsrrw53f6zpkciyk1xc0nmlm0dkwih";
        libraryHaskellDepends = [
          adjunctions base comonad containers contravariant universe-base
        ];
@@ -251438,8 +252477,8 @@ self: {
        pname = "universe-reverse-instances";
        version = "1.1";
        sha256 = "0pdmv146ap0dh38mxhjf11jx3fbr9im7mc0zxb3bsnwpfrv1kfqd";
-       revision = "2";
-       editedCabalFile = "1ls6hss9mrdk535k9ssy4lv01gbw11pbqiikpv2m8sjmh65fjilx";
+       revision = "3";
+       editedCabalFile = "1zkpcipbzhxricr94pkhn4cqmjcnsxx301kxarx798qr9il37qzw";
        libraryHaskellDepends = [ base containers universe-base ];
        description = "Instances of standard classes that are made possible by enumerations";
        license = stdenv.lib.licenses.bsd3;
@@ -251453,6 +252492,8 @@ self: {
        pname = "universe-some";
        version = "1.2";
        sha256 = "1c9pdk682xdzscq77c006x052c9jizpgja3xk0ym8n421h0k8zlh";
+       revision = "1";
+       editedCabalFile = "1rx1cw40clsla3sixm0gzdbni9f13ngncl02fm9fl8kgf23w9q73";
        libraryHaskellDepends = [
          base some template-haskell th-abstraction transformers
          universe-base
@@ -251760,21 +252801,6 @@ self: {
      }) {};
 
   "unliftio-pool" = callPackage
-    ({ mkDerivation, base, resource-pool, time, transformers
-     , unliftio-core
-     }:
-     mkDerivation {
-       pname = "unliftio-pool";
-       version = "0.2.1.0";
-       sha256 = "0qhgiym7slz3n68py4izs52wfhs5d7nyxzwnj8q86rvkvy6lfm5v";
-       libraryHaskellDepends = [
-         base resource-pool time transformers unliftio-core
-       ];
-       description = "Data.Pool generalized to MonadUnliftIO.";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "unliftio-pool_0_2_1_1" = callPackage
     ({ mkDerivation, base, resource-pool, time, transformers
      , unliftio-core
      }:
@@ -251787,7 +252813,6 @@ self: {
        ];
        description = "Data.Pool generalized to MonadUnliftIO.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unliftio-streams" = callPackage
@@ -253270,6 +254295,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "utility-ht_0_0_15" = callPackage
+    ({ mkDerivation, base, QuickCheck }:
+     mkDerivation {
+       pname = "utility-ht";
+       version = "0.0.15";
+       sha256 = "148gdz6pbl1i5qjvjrq5576pg58anmh18xha37n9fncjy36pjp44";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base QuickCheck ];
+       description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "uu-cco" = callPackage
     ({ mkDerivation, ansi-terminal, base }:
      mkDerivation {
@@ -254613,6 +255651,8 @@ self: {
        pname = "vec";
        version = "0.3";
        sha256 = "0r2jk3jqwn0r4wnpgc8k8i664g3rrs6dkyfsysysn4w10j22j5sr";
+       revision = "1";
+       editedCabalFile = "1i43p5x4j2h3rza2aaz2b7cdll0mrany1g6pgsgzbqq8m92j7mhs";
        libraryHaskellDepends = [
          adjunctions base deepseq distributive fin hashable QuickCheck
          semigroupoids transformers
@@ -254631,6 +255671,8 @@ self: {
        pname = "vec-lens";
        version = "0.3";
        sha256 = "0i08p7rfmivf03mir7hcbkr7rarji95icsyvi6diclav1jd6fa7q";
+       revision = "1";
+       editedCabalFile = "0grj1abb7gjbzw06672464r75wjnmra9d12yvlmdm1qyj9zya0ph";
        libraryHaskellDepends = [ base fin lens vec ];
        description = "Vec: length-indexed (sized) list: lens support";
        license = stdenv.lib.licenses.bsd3;
@@ -254765,8 +255807,8 @@ self: {
        pname = "vector-binary-instances";
        version = "0.2.5.1";
        sha256 = "04n5cqm1v95pw1bp68l9drjkxqiy2vswxdq0fy1rqcgxisgvji9r";
-       revision = "1";
-       editedCabalFile = "1p7cbxdpix0rakvggnnb06kcrb787fyyqlzric6i4s3rn34547q8";
+       revision = "2";
+       editedCabalFile = "0ia9i7q7jrk3ab3nq2368glr69vl6fwvh42zlwvdmxn4xd861qfx";
        libraryHaskellDepends = [ base binary vector ];
        testHaskellDepends = [ base binary tasty tasty-quickcheck vector ];
        benchmarkHaskellDepends = [
@@ -255189,6 +256231,8 @@ self: {
        pname = "vector-th-unbox";
        version = "0.2.1.7";
        sha256 = "0q8dqnbv1c2gi7jjdhqj14abj1vik23ki6lq4iz2sz18yc7q69fi";
+       revision = "1";
+       editedCabalFile = "11qhhir9cdy3x7pd0z0xk8vi4nzr9fn9q3ggwbhhc43jglngw1x7";
        libraryHaskellDepends = [ base template-haskell vector ];
        testHaskellDepends = [ base data-default vector ];
        description = "Deriver for Data.Vector.Unboxed using Template Haskell";
@@ -256451,7 +257495,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "vty_5_28_1" = callPackage
+  "vty_5_28_2" = callPackage
     ({ mkDerivation, ansi-terminal, base, binary, blaze-builder
      , bytestring, Cabal, containers, deepseq, directory, filepath
      , hashable, HUnit, microlens, microlens-mtl, microlens-th, mtl
@@ -256462,8 +257506,8 @@ self: {
      }:
      mkDerivation {
        pname = "vty";
-       version = "5.28.1";
-       sha256 = "0hshmpa3n6936527wimxf3vi5v6gddp09kxjjmcxjwq39h9a640y";
+       version = "5.28.2";
+       sha256 = "0jfiha8hwpdpnz4i7d94dsgcrfd20y0kjp9crn3ds2jx8kln1prv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -258641,8 +259685,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp-grpc";
-       version = "0.4.0.0";
-       sha256 = "1isi0xd6vvavvr4m3gfiqj2cmmpa3jn9py61m0ksrarxwmsw8s1g";
+       version = "0.4.0.1";
+       sha256 = "0dajbs3gxibnllzs134wa7vqclnyfj2r3hc70dci51wgnmi4b7xr";
        libraryHaskellDepends = [
          async base binary bytestring case-insensitive http-types http2
          http2-grpc-types unliftio-core wai warp warp-tls
@@ -260522,6 +261566,24 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "wide-word_0_1_1_1" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hedgehog
+     , primitive, QuickCheck, quickcheck-classes, semirings
+     }:
+     mkDerivation {
+       pname = "wide-word";
+       version = "0.1.1.1";
+       sha256 = "19mxi6mfri4q96lqh3zllmacaln2wdp0ipzmhk7v9xqbphpfjrfj";
+       libraryHaskellDepends = [ base deepseq primitive ];
+       testHaskellDepends = [
+         base bytestring ghc-prim hedgehog primitive QuickCheck
+         quickcheck-classes semirings
+       ];
+       description = "Data types for large but fixed width signed and unsigned integers";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wigner-symbols" = callPackage
     ({ mkDerivation, base, bytestring, criterion, cryptonite, primitive
      , random, vector
@@ -266384,6 +267446,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-auth_1_6_10" = callPackage
+    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
+     , base64-bytestring, binary, blaze-builder, blaze-html
+     , blaze-markup, bytestring, conduit, conduit-extra, containers
+     , cryptonite, data-default, email-validate, file-embed, http-client
+     , http-client-tls, http-conduit, http-types, memory, network-uri
+     , nonce, persistent, random, safe, shakespeare, template-haskell
+     , text, time, transformers, unliftio, unliftio-core
+     , unordered-containers, wai, yesod-core, yesod-form
+     , yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-auth";
+       version = "1.6.10";
+       sha256 = "0nfrq61dqifzbnqx8m62j1q6nmlj04mis864yg2k36mra9njap27";
+       libraryHaskellDepends = [
+         aeson authenticate base base16-bytestring base64-bytestring binary
+         blaze-builder blaze-html blaze-markup bytestring conduit
+         conduit-extra containers cryptonite data-default email-validate
+         file-embed http-client http-client-tls http-conduit http-types
+         memory network-uri nonce persistent random safe shakespeare
+         template-haskell text time transformers unliftio unliftio-core
+         unordered-containers wai yesod-core yesod-form yesod-persistent
+       ];
+       description = "Authentication for Yesod";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-auth-account" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger
      , mtl, nonce, persistent, persistent-sqlite, pwstore-fast
@@ -270312,6 +271403,8 @@ self: {
        pname = "zlib";
        version = "0.6.2.1";
        sha256 = "1l11jraslcrp9d4wnhwfyhwk4fsiq1aq8i6vj81vcq1m2zzi1y7h";
+       revision = "1";
+       editedCabalFile = "0i9g71jvdw22bi9bi8dm5khwzcsv6cv8yadmf7afklg4xigxykfk";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ zlib ];
        testHaskellDepends = [

From 743747999ed212e60e6baa044d45dcf4fbcb521f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 27 Mar 2020 20:17:33 +0100
Subject: [PATCH 4179/4636] all-cabal-hashes: update to Hackage at
 2020-03-27T01:22:37Z

---
 pkgs/data/misc/hackage/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 96617bb0f278..46db53e739b3 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/fcb0ed924c8504d54870d6dc2092b9dab8305732.tar.gz";
-  sha256 = "0b7dxgj40y9svddrx14scnxls20ww4f717zhz3lwigb16dm4crpi";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e0bc864e0b6edb5e5ce1ec4bfa763a442b343bf5.tar.gz";
+  sha256 = "1lmjxam58srrv9cjqajqz4bishx8hy99db3cx83i95qb3qiiiz6m";
 }

From 8ebb32b38b90d058e1f7dce94f9670b48927acec Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <brightone@protonmail.com>
Date: Fri, 27 Mar 2020 16:43:23 +0200
Subject: [PATCH 4180/4636] lazygit: 0.16.2 -> 0.18

---
 pkgs/development/tools/lazygit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix
index 9a27c7d44e9c..4b99cfb10e0d 100644
--- a/pkgs/development/tools/lazygit/default.nix
+++ b/pkgs/development/tools/lazygit/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "lazygit";
-  version = "0.16.2";
+  version = "0.18";
 
   goPackagePath = "github.com/jesseduffield/lazygit";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "jesseduffield";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0lvhj4iz74h97lkylqg7hl18xcxcl9msxxvap7jqdj2mf2iwxi32";
+    sha256 = "1zc6y386w111ygyng5s74zg49iajzs77dbrcdy33igj0hbnkwq2x";
   };
 
   meta = with stdenv.lib; {

From 720c033e7917b35a471f4700ada141d6ec4b4e51 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <brightone@protonmail.com>
Date: Fri, 27 Mar 2020 16:24:22 +0200
Subject: [PATCH 4181/4636] antibody: 4.3.1 -> 6.0.0

---
 pkgs/shells/zsh/antibody/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix
index c0ae5e03e6c3..cc4726a3cb41 100644
--- a/pkgs/shells/zsh/antibody/default.nix
+++ b/pkgs/shells/zsh/antibody/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "antibody";
-  version = "4.3.1";
+  version = "6.0.0";
 
   src = fetchFromGitHub {
     owner = "getantibody";
     repo = "antibody";
     rev = "v${version}";
-    sha256 = "1cxg0173d3xnpyzbisj926vh3qql9rw3q4j1z900m34gw7cvsdpf";
+    sha256 = "0m7c879b3f402av20jsybq2dhhckbknlvn2n1csp7xmcz4zcyn1n";
   };
 
-  modSha256 = "08k4mzqcva7yq1zmfxhlqnd8kk70zry6cfghxl1bgmhnfjqh61qr";
+  modSha256 = "0yny1p8vll1wdqdlwyxf9m4kd5njdm7nq527blqqa680zf2k4h8b";
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 

From d289cc16d4cceabeb9090bdb90628606a29fc566 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Fri, 27 Mar 2020 14:50:15 +0100
Subject: [PATCH 4182/4636] kodiPlugins.vfs-libarchive: 1.0.5 -> 1.0.6

---
 pkgs/applications/video/kodi/plugins.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 41e5a7c5c75a..fae53434254f 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -531,14 +531,14 @@ let self = rec {
 
   vfs-libarchive = mkKodiABIPlugin rec {
     namespace = "vfs.libarchive";
-    version = "1.0.5";
+    version = "1.0.6";
     plugin = namespace;
 
     src = fetchFromGitHub {
       owner = "xbmc";
       repo = namespace;
       rev = "${version}-${rel}";
-      sha256 = "0l1f1fijflr1ia30r0dcz1x2zn35c4lxy30az1cqxdf8nipza0b8";
+      sha256 = "1gz39i97n8xgbja8miqligmhxsvmqimlxx75xr9v0r9lfxp7135f";
     };
 
     meta = with stdenv.lib; {

From 0bc43b2a09b12368693869606b6af5aefeba3005 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Mar 2020 12:05:16 +0000
Subject: [PATCH 4183/4636] padthv1: 0.9.12 -> 0.9.13

---
 pkgs/applications/audio/padthv1/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix
index 0cb0f00844e3..911bb4c8c773 100644
--- a/pkgs/applications/audio/padthv1/default.nix
+++ b/pkgs/applications/audio/padthv1/default.nix
@@ -2,11 +2,11 @@
 
 mkDerivation rec {
   pname = "padthv1";
-  version = "0.9.12";
+  version = "0.9.13";
 
   src = fetchurl {
     url = "mirror://sourceforge/padthv1/${pname}-${version}.tar.gz";
-    sha256 = "1zz3rz990k819q0rlzllqdwvag0x9k63443lb0mp8lwlczxnza6l";
+    sha256 = "1c1zllph86qswcxddz4vpsj6r9w21hbv4gkba0pyd3q7pbfqr7nz";
   };
 
   buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ];
@@ -15,7 +15,7 @@ mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "polyphonic additive synthesizer";
-    homepage = http://padthv1.sourceforge.net/;
+    homepage = "http://padthv1.sourceforge.net/";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.magnetophon ];

From dc4a0da5ff4b6904f0d9b6cdc636af7513c23e54 Mon Sep 17 00:00:00 2001
From: Douglas Soares de Andrade <contato@douglasandrade.com>
Date: Fri, 27 Mar 2020 14:07:30 -0400
Subject: [PATCH 4184/4636] solargraph: 0.38.0 -> 0.38.6

---
 .../ruby-modules/solargraph/Gemfile.lock      | 26 +++---
 .../ruby-modules/solargraph/gemset.nix        | 85 ++++++++++++++-----
 2 files changed, 81 insertions(+), 30 deletions(-)

diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock
index c2e4840eab06..70a3afb6e57b 100644
--- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock
+++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock
@@ -3,41 +3,47 @@ GEM
   specs:
     ast (2.4.0)
     backport (1.1.2)
+    benchmark (0.1.0)
+    e2mmap (0.1.0)
     jaro_winkler (1.5.4)
     maruku (0.7.3)
     mini_portile2 (2.4.0)
-    nokogiri (1.10.5)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     parallel (1.19.1)
-    parser (2.6.5.0)
+    parser (2.7.0.5)
       ast (~> 2.4.0)
     rainbow (3.0.0)
-    reverse_markdown (1.3.0)
+    reverse_markdown (1.4.0)
       nokogiri
-    rubocop (0.77.0)
+    rexml (3.2.4)
+    rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
-    solargraph (0.38.0)
+    solargraph (0.38.6)
       backport (~> 1.1)
+      benchmark
       bundler (>= 1.17.2)
+      e2mmap
       jaro_winkler (~> 1.5)
       maruku (~> 0.7, >= 0.7.3)
       nokogiri (~> 1.9, >= 1.9.1)
       parser (~> 2.3)
       reverse_markdown (~> 1.0, >= 1.0.5)
       rubocop (~> 0.52)
-      thor (~> 0.19, >= 0.19.4)
+      thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9)
-    thor (0.20.3)
+    thor (1.0.1)
     tilt (2.0.10)
-    unicode-display_width (1.6.0)
-    yard (0.9.20)
+    unicode-display_width (1.6.1)
+    yard (0.9.24)
 
 PLATFORMS
   ruby
diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix
index e1ea15fb4e16..a6ec78b74585 100644
--- a/pkgs/development/ruby-modules/solargraph/gemset.nix
+++ b/pkgs/development/ruby-modules/solargraph/gemset.nix
@@ -1,5 +1,6 @@
 {
   ast = {
+    dependencies = [];
     groups = ["default"];
     platforms = [];
     source = {
@@ -10,6 +11,7 @@
     version = "2.4.0";
   };
   backport = {
+    dependencies = [];
     groups = ["default"];
     platforms = [];
     source = {
@@ -19,7 +21,30 @@
     };
     version = "1.1.2";
   };
+  benchmark = {
+    dependencies = [];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jadlpsl504ql436a6bx8ihp0bkg3rvxg7fbi4r1bmra3cqz0h88";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  e2mmap = {
+    dependencies = [];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0n8gxjb63dck3vrmsdcqqll7xs7f3wk78mw8w0gdk9wp5nx6pvj5";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
   jaro_winkler = {
+    dependencies = [];
     groups = ["default"];
     platforms = [];
     source = {
@@ -30,6 +55,7 @@
     version = "1.5.4";
   };
   maruku = {
+    dependencies = [];
     groups = ["default"];
     platforms = [];
     source = {
@@ -40,6 +66,7 @@
     version = "0.7.3";
   };
   mini_portile2 = {
+    dependencies = [];
     groups = ["default"];
     platforms = [];
     source = {
@@ -55,12 +82,13 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7";
+      sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm";
       type = "gem";
     };
-    version = "1.10.5";
+    version = "1.10.9";
   };
   parallel = {
+    dependencies = [];
     groups = ["default"];
     platforms = [];
     source = {
@@ -76,12 +104,13 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09davv4ld6caqlczw64vhwf8hr41apys3cj8v2h96yxs4qg1m2iw";
+      sha256 = "0iirjc36irgwpfb58jdf9gli382cj893y9caqhxas8anpzzlikgc";
       type = "gem";
     };
-    version = "2.6.5.0";
+    version = "2.7.0.5";
   };
   rainbow = {
+    dependencies = [];
     groups = ["default"];
     platforms = [];
     source = {
@@ -97,23 +126,35 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zb9n227b5s4cg942sc0g3n1bdx9fpcvq5m6w7ap0yc116ivv5w2";
+      sha256 = "0w786j869fjhjf72waj0hc9i4ghi45b78a2am27kij4sa2hmsc53";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "1.4.0";
   };
-  rubocop = {
-    dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"];
+  rexml = {
+    dependencies = [];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0m88b1bgbhmmbdnz2xv6n0il0j4q5qm9jbc0vf1zsaxmxqp06nx9";
+      sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3";
       type = "gem";
     };
-    version = "0.77.0";
+    version = "3.2.4";
+  };
+  rubocop = {
+    dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "rexml" "ruby-progressbar" "unicode-display_width"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1i8pw7p4dk11xpahs0j6vlvqlv3rgapaccj933g0i34hbx392lj8";
+      type = "gem";
+    };
+    version = "0.80.1";
   };
   ruby-progressbar = {
+    dependencies = [];
     groups = ["default"];
     platforms = [];
     source = {
@@ -124,27 +165,29 @@
     version = "1.10.1";
   };
   solargraph = {
-    dependencies = ["backport" "jaro_winkler" "maruku" "nokogiri" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
+    dependencies = ["backport" "benchmark" "e2mmap" "jaro_winkler" "maruku" "nokogiri" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1pdqpxvjj6r6gzrz9rmxfg85cmfjs4y2lyq8p5qfg3kfpqx4rhpw";
+      sha256 = "06kcqm032sq1y4pgg7cl32hv74573b1vsy79x81zglar80ybgzv4";
       type = "gem";
     };
-    version = "0.38.0";
+    version = "0.38.6";
   };
   thor = {
+    dependencies = [];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
+      sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm";
       type = "gem";
     };
-    version = "0.20.3";
+    version = "1.0.1";
   };
   tilt = {
+    dependencies = [];
     groups = ["default"];
     platforms = [];
     source = {
@@ -155,23 +198,25 @@
     version = "2.0.10";
   };
   unicode-display_width = {
+    dependencies = [];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w";
+      sha256 = "1pppclzq4qb26g321553nm9xqca3zgllvpwb2kqxsdadwj51s09x";
       type = "gem";
     };
-    version = "1.6.0";
+    version = "1.6.1";
   };
   yard = {
+    dependencies = [];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0rxqwry3h2hjz069f0kfr140wgx1khgljnqf112dk5x9rm4l0xny";
+      sha256 = "1g0bw2qcl48fxawrdf68l229508z53mrqisavji2lkxzv4w4j2pp";
       type = "gem";
     };
-    version = "0.9.20";
+    version = "0.9.24";
   };
-}
\ No newline at end of file
+}

From 1b8732262009c1c2a418242a8adb7617f046a6ad Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Tue, 21 Jan 2020 14:29:57 -0500
Subject: [PATCH 4185/4636] pythonPackages.qiskit-aer: init at 0.4.1

Qiskit Aer - High performance simulators for Qiskit.

This commit follows the new Qiskit scheme of breaking one large package
into smaller packages (terra, aer, etc), and then having a single
meta-package "qiskit" that comprises them.
---
 .../python-modules/qiskit-aer/default.nix     | 99 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 101 insertions(+)
 create mode 100644 pkgs/development/python-modules/qiskit-aer/default.nix

diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix
new file mode 100644
index 000000000000..e4b4d87c11b2
--- /dev/null
+++ b/pkgs/development/python-modules/qiskit-aer/default.nix
@@ -0,0 +1,99 @@
+{ lib
+, pythonOlder
+, buildPythonPackage
+, fetchFromGitHub
+, cmake
+, cvxpy
+, cython
+, numpy
+, openblas
+, pybind11
+, scikit-build
+, spdlog
+  # Check Inputs
+, qiskit-terra
+, pytestCheckHook
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "qiskit-aer";
+  version = "0.4.1";
+
+  disabled = pythonOlder "3.5";
+
+  src = fetchFromGitHub {
+    owner = "Qiskit";
+    repo = pname;
+    rev = version;
+    fetchSubmodules = true; # fetch muparserx and other required libraries
+    sha256 = "1j2pv6jx5dlzanjp1qnf32s53d8jrlpv96nvymznkcnjvqn60gv9";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    scikit-build
+  ];
+
+  buildInputs = [
+    openblas
+    spdlog
+  ];
+
+  propagatedBuildInputs = [
+    cvxpy
+    cython  # generates some cython files at runtime that need to be cython-ized
+    numpy
+    pybind11
+  ];
+
+  prePatch = ''
+    # remove dependency on PyPi cmake package, which isn't in Nixpkgs
+    substituteInPlace setup.py --replace "'cmake'" ""
+  '';
+
+  dontUseCmakeConfigure = true;
+
+  cmakeFlags = [
+    "-DBUILD_TESTS=True"
+    "-DAER_THRUST_BACKEND=OMP"
+  ];
+
+  # Needed to find qiskit.providers.aer modules in cython. This exists in GitHub, don't know why it isn't copied by default
+  postFixup = ''
+    touch $out/${python.sitePackages}/qiskit/__init__.pxd
+  '';
+
+  # *** Testing ***
+
+  pythonImportsCheck = [
+    "qiskit.providers.aer"
+    "qiskit.providers.aer.backends.qasm_simulator"
+    "qiskit.providers.aer.backends.controller_wrappers" # Checks C++ files built correctly. Only exists if built & moved to output
+  ];
+  checkInputs = [
+    qiskit-terra
+    pytestCheckHook
+  ];
+  dontUseSetuptoolsCheck = true;  # Otherwise runs tests twice
+
+  preCheck = ''
+    # Tests include a compiled "circuit" which is auto-built in $HOME
+    export HOME=$(mktemp -d)
+    # move tests b/c by default try to find (missing) cython-ized code in /build/source dir
+    cp -r test $HOME
+
+    # Add qiskit-aer compiled files to cython include search
+    pushd $HOME
+  '';
+  postCheck = ''
+    popd
+  '';
+
+  meta = with lib; {
+    description = "High performance simulators for Qiskit";
+    homepage = "https://github.com/QISKit/qiskit-aer";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ drewrisinger ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b0e080a7be8c..2331f447f19e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7058,6 +7058,8 @@ in {
 
   qiskit = callPackage ../development/python-modules/qiskit { };
 
+  qiskit-aer = callPackage ../development/python-modules/qiskit-aer { };
+
   qiskit-ibmq-provider = callPackage ../development/python-modules/qiskit-ibmq-provider { };
 
   qiskit-terra = callPackage ../development/python-modules/qiskit-terra { };

From 8bd3cf22c2b7f42c4e30b81c5d9c7dcc57d43b92 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Mon, 9 Mar 2020 21:42:56 +0100
Subject: [PATCH 4186/4636] steamrt: 1.20190624 -> 1.20200128

---
 pkgs/games/steam/runtime-generated.nix | 548 ++++++++++++++++++++-----
 1 file changed, 454 insertions(+), 94 deletions(-)

diff --git a/pkgs/games/steam/runtime-generated.nix b/pkgs/games/steam/runtime-generated.nix
index bb4decfda4d2..3ed030c0094d 100644
--- a/pkgs/games/steam/runtime-generated.nix
+++ b/pkgs/games/steam/runtime-generated.nix
@@ -274,18 +274,18 @@
       };
     }
     rec {
-      name = "libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt5_amd64";
-      sha256 = "a3c56793a0751a819897d5cd40562e0bd04b0c1fe56e4f865f0f1653e7190bab";
-      url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt5_amd64.deb";
+      name = "libcurl3_7.22.0-3ubuntu4.17+steamrt1.2+srt1_amd64";
+      sha256 = "b8ce9330efb568bff45d00b678f461c1b45184db97afb34c85a96320dbedcb45";
+      url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+steamrt1.2+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libcurl3.deb";
       };
     }
     rec {
-      name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt5_amd64";
-      sha256 = "0692b46e931815d81421198c35b9c0923d7685c3d2541ad8cc3251d18981305d";
-      url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt5_amd64.deb";
+      name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.2+srt1_amd64";
+      sha256 = "d130968581123872aa448f1bd92b969c3df5c3c47ffb034c7635f723c7f9a9ff";
+      url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.2+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libcurl3-gnutls.deb";
@@ -327,6 +327,15 @@
         name = "libdbusmenu-gtk4.deb";
       };
     }
+    rec {
+      name = "libelf1_0.152-1ubuntu3.1+srt3_amd64";
+      sha256 = "16f5a035ab04bf0a90d2172820265e56e000fa3b4a5461bda293534f3e39a061";
+      url = "mirror://steamrt/pool/main/e/elfutils/libelf1_0.152-1ubuntu3.1+srt3_amd64.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libelf1.deb";
+      };
+    }
     rec {
       name = "libexif12_0.6.20-2ubuntu0.1+srt6_amd64";
       sha256 = "adb05c68a77601a6c133d8bd2fcd0e6dccc7fd9e75b70b191e0fee26dd03c1ae";
@@ -499,9 +508,9 @@
       };
     }
     rec {
-      name = "libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt4_amd64";
-      sha256 = "3fb1f7644d1c83c1cf2271dd6e30dde50adf5ada859530431d205ba24cef8734";
-      url = "mirror://steamrt/pool/main/g/gnutls28/libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt4_amd64.deb";
+      name = "libgnutls30_3.4.10-4ubuntu1.4+steamrt1.2+srt1_amd64";
+      sha256 = "c6e07fb2f90549d741378a211babd4d1c802e93dde401839c2e89504410ed228";
+      url = "mirror://steamrt/pool/main/g/gnutls28/libgnutls30_3.4.10-4ubuntu1.4+steamrt1.2+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgnutls30.deb";
@@ -687,6 +696,15 @@
         name = "libjpeg62.deb";
       };
     }
+    rec {
+      name = "libjson-glib-1.0-0_1.0.2-1~steamrt1.1+srt1_amd64";
+      sha256 = "636c77a5f10b1861d4ebe7722a0c832e1fdbcc995d248e36280966e387ffaa89";
+      url = "mirror://steamrt/pool/main/j/json-glib/libjson-glib-1.0-0_1.0.2-1~steamrt1.1+srt1_amd64.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libjson-glib-1.0-0.deb";
+      };
+    }
     rec {
       name = "libjson0_0.9-1ubuntu1.1+srt4_amd64";
       sha256 = "a72824685bfa0dc7fab313606d1fcba41565363c8f90d22c7e90d3f35a74859c";
@@ -1048,48 +1066,48 @@
       };
     }
     rec {
-      name = "libsdl2_2.0.9.~reimport-0+steamrt1.1+srt2_amd64";
-      sha256 = "907391ea4512c3372f86afd8a9a409632d90b9e260de43f8082f90175e08c56c";
-      url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.9.~reimport-0+steamrt1.1+srt2_amd64.deb";
+      name = "libsdl2-2.0-0_2.0.10-0+steamrt1.3+srt1_amd64";
+      sha256 = "a69cf30f4c0f7ee02d9c37bd2ec25bab76a8c1175674959738e945bae05c7ed6";
+      url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2-2.0-0_2.0.10-0+steamrt1.3+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
-        name = "libsdl2.deb";
+        name = "libsdl2-2.0-0.deb";
       };
     }
     rec {
-      name = "libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt2_amd64";
-      sha256 = "136a0c68b520f4eaec9ff81321785b09dc6843431b10ba6941faee82af3b215d";
-      url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt2_amd64.deb";
+      name = "libsdl2-image-2.0-0_2.0.5-0+steamrt1.1+srt1_amd64";
+      sha256 = "13a3c69b92a72490eb1dd7e6c09244047b22765882944dc4bb335cb356f423a1";
+      url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image-2.0-0_2.0.5-0+steamrt1.1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
-        name = "libsdl2-image.deb";
+        name = "libsdl2-image-2.0-0.deb";
       };
     }
     rec {
-      name = "libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt2_amd64";
-      sha256 = "98f77bb9019649440a96e9c70bd160fa03aa0bd306fa51110b861882cb62df0d";
-      url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt2_amd64.deb";
+      name = "libsdl2-mixer-2.0-0_2.0.4.~reimport-0+steamrt1.2+srt1_amd64";
+      sha256 = "78860d794928a0f7a31cd4ee83f395151dedb74f0e2613c6833438aa0d3f1d54";
+      url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer-2.0-0_2.0.4.~reimport-0+steamrt1.2+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
-        name = "libsdl2-mixer.deb";
+        name = "libsdl2-mixer-2.0-0.deb";
       };
     }
     rec {
-      name = "libsdl2-net_2.0.1+srt3_amd64";
-      sha256 = "492a6e5f4efc454dd720be4028efd89a212e039d3f3f7b01c94c0144d8d8d621";
-      url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt3_amd64.deb";
+      name = "libsdl2-net-2.0-0_2.0.1.~reimport-0+steamrt1.1+srt1_amd64";
+      sha256 = "cea2cc24af441eca4e23227bcc9eef80047befcf4f79c9c5dc796f157068da45";
+      url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net-2.0-0_2.0.1.~reimport-0+steamrt1.1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
-        name = "libsdl2-net.deb";
+        name = "libsdl2-net-2.0-0.deb";
       };
     }
     rec {
-      name = "libsdl2-ttf_2.0.14+srt3_amd64";
-      sha256 = "f117047ffeaf77a93fc0932470e80ace2d07d7e672191c9dd50ca5f2a033f56c";
-      url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt3_amd64.deb";
+      name = "libsdl2-ttf-2.0-0_2.0.15-0+steamrt1.1+srt2_amd64";
+      sha256 = "4444fb73f3bc2b7229dea2564baba233958158d82c73489724d4107bd31e3e6c";
+      url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf-2.0-0_2.0.15-0+steamrt1.1+srt2_amd64.deb";
       source = fetchurl {
         inherit url sha256;
-        name = "libsdl2-ttf.deb";
+        name = "libsdl2-ttf-2.0-0.deb";
       };
     }
     rec {
@@ -1173,6 +1191,33 @@
         name = "libstdc++6-4.6-pic.deb";
       };
     }
+    rec {
+      name = "libsteam-runtime-tools-0-0_0.20200109.0-0+steamrt1.1+srt1_amd64";
+      sha256 = "680a2855b601ecccc81179df162722081ad0c7f4d1689e25bbce9d19de1a3eb6";
+      url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-0_0.20200109.0-0+steamrt1.1+srt1_amd64.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libsteam-runtime-tools-0-0.deb";
+      };
+    }
+    rec {
+      name = "libsteam-runtime-tools-0-helpers_0.20200109.0-0+steamrt1.1+srt1_amd64";
+      sha256 = "b33f5c1217c7927057428b54faa4d0fcdddda1b5b18d708f755e96893ed6e108";
+      url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-helpers_0.20200109.0-0+steamrt1.1+srt1_amd64.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libsteam-runtime-tools-0-helpers.deb";
+      };
+    }
+    rec {
+      name = "libsteam-runtime-tools-0-relocatable-libs_0.20200109.0-0+steamrt1.1+srt1_amd64";
+      sha256 = "4f2ddb4dd6f48636f95bb301541a023ba8235672e1e053be8da9961787958d18";
+      url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-relocatable-libs_0.20200109.0-0+steamrt1.1+srt1_amd64.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libsteam-runtime-tools-0-relocatable-libs.deb";
+      };
+    }
     rec {
       name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_amd64";
       sha256 = "dda1950d7e1f50547ce57246bc7e19c3c1ab1166ee81ca637ff86d373e20253c";
@@ -1282,32 +1327,77 @@
       };
     }
     rec {
-      name = "libva-glx1_1.7.0-1+steamos1+srt2_amd64";
-      sha256 = "c25662535e0bcc1fc349c1f61710f31dcc1be846ea2ba4282225756809b13e15";
-      url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.7.0-1+steamos1+srt2_amd64.deb";
+      name = "libva-drm1_1.7.0-1+steamrt1.1+srt1_amd64";
+      sha256 = "ee98522c6c69c1f6134a37d63a74f6c4f4ef5be2944bd504e8886333115f1f06";
+      url = "mirror://steamrt/pool/main/libv/libva1/libva-drm1_1.7.0-1+steamrt1.1+srt1_amd64.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libva-drm1.deb";
+      };
+    }
+    rec {
+      name = "libva-drm2_2.1.0-3~steamrt1.2+srt1_amd64";
+      sha256 = "5add6487f678a13cc71d039b1ebd6991b1395dd8ce78124ac3675ea80f10e1b8";
+      url = "mirror://steamrt/pool/main/libv/libva/libva-drm2_2.1.0-3~steamrt1.2+srt1_amd64.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libva-drm2.deb";
+      };
+    }
+    rec {
+      name = "libva-glx1_1.7.0-1+steamrt1.1+srt1_amd64";
+      sha256 = "938db19eecb0a2fbc5058e90962cdbc05f3ef2b1601341b7b6d7be429da97259";
+      url = "mirror://steamrt/pool/main/libv/libva1/libva-glx1_1.7.0-1+steamrt1.1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libva-glx1.deb";
       };
     }
     rec {
-      name = "libva-x11-1_1.7.0-1+steamos1+srt2_amd64";
-      sha256 = "ddfd440a2bfe3174b33ac5b459ce4261ddbcfa36d443ad237d41e5e41dd17bae";
-      url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.7.0-1+steamos1+srt2_amd64.deb";
+      name = "libva-glx2_2.1.0-3~steamrt1.2+srt1_amd64";
+      sha256 = "7a14fde5181a5c313e97bcb25d6233c7343ebc009c3c5065bb65e8d3ec74f643";
+      url = "mirror://steamrt/pool/main/libv/libva/libva-glx2_2.1.0-3~steamrt1.2+srt1_amd64.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libva-glx2.deb";
+      };
+    }
+    rec {
+      name = "libva-x11-1_1.7.0-1+steamrt1.1+srt1_amd64";
+      sha256 = "6f0894f499b44346af1d35a3d1300b9cc2d9b1674fca879345daf392620322ae";
+      url = "mirror://steamrt/pool/main/libv/libva1/libva-x11-1_1.7.0-1+steamrt1.1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libva-x11-1.deb";
       };
     }
     rec {
-      name = "libva1_1.7.0-1+steamos1+srt2_amd64";
-      sha256 = "a06f1a3af4679bb44722458d956177468e78d662cf97dc1ec6c8ee38dc7408a2";
-      url = "mirror://steamrt/pool/main/libv/libva/libva1_1.7.0-1+steamos1+srt2_amd64.deb";
+      name = "libva-x11-2_2.1.0-3~steamrt1.2+srt1_amd64";
+      sha256 = "47f70088a25e92b036374d8ff132e11b38546f26ee2e6cba141d42f766d8c748";
+      url = "mirror://steamrt/pool/main/libv/libva/libva-x11-2_2.1.0-3~steamrt1.2+srt1_amd64.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libva-x11-2.deb";
+      };
+    }
+    rec {
+      name = "libva1_1.7.0-1+steamrt1.1+srt1_amd64";
+      sha256 = "f0c27f86e0ec4e210e05b2217d2d51fe52994add7df2fe5ff41e7f8aeee6f426";
+      url = "mirror://steamrt/pool/main/libv/libva1/libva1_1.7.0-1+steamrt1.1+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libva1.deb";
       };
     }
+    rec {
+      name = "libva2_2.1.0-3~steamrt1.2+srt1_amd64";
+      sha256 = "08c60888e39e4656fa4c41dbbb2baa0d99f91a8fabbf5336261b255c0ea4f185";
+      url = "mirror://steamrt/pool/main/libv/libva/libva2_2.1.0-3~steamrt1.2+srt1_amd64.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libva2.deb";
+      };
+    }
     rec {
       name = "libvdpau1_0.4.1-3ubuntu1.2+srt3_amd64";
       sha256 = "c40c31da412fec43c201e88458782dad6884e1eab9593815bdf0d9132eb76baf";
@@ -1354,14 +1444,23 @@
       };
     }
     rec {
-      name = "libvulkan1_1.1.73+dfsg-1+steamosc2+srt2_amd64";
-      sha256 = "a3820a7cdceef1cf070b762d81437ec87a4d3a2b41566dadaa1cdcb1f08dad3e";
-      url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamosc2+srt2_amd64.deb";
+      name = "libvulkan1_1.1.73+dfsg-1+steamrt1.2+srt1_amd64";
+      sha256 = "e70dbce3db8d74df853dd10265d37c8b4b4f7336043f79ae480be3d6922c206c";
+      url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamrt1.2+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libvulkan1.deb";
       };
     }
+    rec {
+      name = "libwaffle-1-0_1.6.0-2~steamrt1.3+srt1_amd64";
+      sha256 = "40ebf5f91707d0f183841ab8673f7bdd6d77540f090fc97cb69be54381c382be";
+      url = "mirror://steamrt/pool/main/w/waffle/libwaffle-1-0_1.6.0-2~steamrt1.3+srt1_amd64.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libwaffle-1-0.deb";
+      };
+    }
     rec {
       name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64";
       sha256 = "e72aabe5b6c20bb667e1746918a354cb6151e07a9892ea0735406966dff019af";
@@ -1813,23 +1912,104 @@
       };
     }
     rec {
-      name = "steamrt-legacy_1.20190624.0+srt1_amd64";
-      sha256 = "0a0e96fc8dbe806b2d0b4ac26f217ca5ff49188f295a9a4b0d39cbe0a4da52b0";
-      url = "mirror://steamrt/pool/main/s/steamrt/steamrt-legacy_1.20190624.0+srt1_amd64.deb";
+      name = "steam-runtime-tools-bin_0.20200109.0-0+steamrt1.1+srt1_amd64";
+      sha256 = "b5fcefb31c79a4ac085ef1050cdb2770507fbcf04eae713f9f16fdc3a483a85d";
+      url = "mirror://steamrt/pool/main/s/steam-runtime-tools/steam-runtime-tools-bin_0.20200109.0-0+steamrt1.1+srt1_amd64.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "steam-runtime-tools-bin.deb";
+      };
+    }
+    rec {
+      name = "steamrt-legacy_1.20200128.0+srt1_amd64";
+      sha256 = "16a8adf316032424fa5cd53f498c53472c45a66b572e8c60adb2ff3ae7556eed";
+      url = "mirror://steamrt/pool/main/s/steamrt/steamrt-legacy_1.20200128.0+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "steamrt-legacy.deb";
       };
     }
     rec {
-      name = "steamrt-libs_1.20190624.0+srt1_amd64";
-      sha256 = "ed7124e8d11d9dd435ec7b7516a0d0e2c766f677b2c5a1d0b257790c03f307a2";
-      url = "mirror://steamrt/pool/main/s/steamrt/steamrt-libs_1.20190624.0+srt1_amd64.deb";
+      name = "steamrt-libs_1.20200128.0+srt1_amd64";
+      sha256 = "18247c8534f8d67f63f4ece884b15276e0eecf540d0758ed6d5ae8b6a6ba510b";
+      url = "mirror://steamrt/pool/main/s/steamrt/steamrt-libs_1.20200128.0+srt1_amd64.deb";
       source = fetchurl {
         inherit url sha256;
         name = "steamrt-libs.deb";
       };
     }
+    rec {
+      name = "vainfo_2.1.0+ds1-1~steamrt1.1+srt1_amd64";
+      sha256 = "20758135cdf3ada791e1c6b57cdf8db1505b3dd3f429f3f12a6e92d589f568d9";
+      url = "mirror://steamrt/pool/main/libv/libva-utils/vainfo_2.1.0+ds1-1~steamrt1.1+srt1_amd64.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "vainfo.deb";
+      };
+    }
+    rec {
+      name = "vainfo-1_1.7.0-1+steamrt1.1+srt1_amd64";
+      sha256 = "f6f80b18d853edcac5ee09a522d01e83f9d02d3ccc7e7fda09b567c37d9f516e";
+      url = "mirror://steamrt/pool/main/libv/libva1/vainfo-1_1.7.0-1+steamrt1.1+srt1_amd64.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "vainfo-1.deb";
+      };
+    }
+    rec {
+      name = "vainfo-1-multiarch_1.7.0-1+steamrt1.1+srt1_amd64";
+      sha256 = "6b4369f80a1d24c3c9fdd73f5c8f00ab67c136ad9ef60dfe70f4b662e5040306";
+      url = "mirror://steamrt/pool/main/libv/libva1/vainfo-1-multiarch_1.7.0-1+steamrt1.1+srt1_amd64.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "vainfo-1-multiarch.deb";
+      };
+    }
+    rec {
+      name = "vainfo-multiarch_2.1.0+ds1-1~steamrt1.1+srt1_amd64";
+      sha256 = "3ac30bc566b2c949da526d5d26a957cb9bcce1ea7d109ee4b79e2109ae1ee995";
+      url = "mirror://steamrt/pool/main/libv/libva-utils/vainfo-multiarch_2.1.0+ds1-1~steamrt1.1+srt1_amd64.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "vainfo-multiarch.deb";
+      };
+    }
+    rec {
+      name = "vulkan-utils_1.1.73+dfsg-1+steamrt1.2+srt1_amd64";
+      sha256 = "01420d08d0c99d4f70d350af91ac127635e6a75a88200350a4691b8440a7926c";
+      url = "mirror://steamrt/pool/main/v/vulkan/vulkan-utils_1.1.73+dfsg-1+steamrt1.2+srt1_amd64.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "vulkan-utils.deb";
+      };
+    }
+    rec {
+      name = "vulkan-utils-multiarch_1.1.73+dfsg-1+steamrt1.2+srt1_amd64";
+      sha256 = "ea9fbf565059fc5106a2a13bd56e5a37f2d641655304fd0d4b0d3989b69a8046";
+      url = "mirror://steamrt/pool/main/v/vulkan/vulkan-utils-multiarch_1.1.73+dfsg-1+steamrt1.2+srt1_amd64.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "vulkan-utils-multiarch.deb";
+      };
+    }
+    rec {
+      name = "waffle-utils_1.6.0-2~steamrt1.3+srt1_amd64";
+      sha256 = "b465d2c357b0376f355a99ac99830e78974747859ec4ca9084bdeff9891920d6";
+      url = "mirror://steamrt/pool/main/w/waffle/waffle-utils_1.6.0-2~steamrt1.3+srt1_amd64.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "waffle-utils.deb";
+      };
+    }
+    rec {
+      name = "waffle-utils-multiarch_1.6.0-2~steamrt1.3+srt1_amd64";
+      sha256 = "de563095affd9fd5a4ec2941b72481bbd6176bdc210dad587372bab3cec406c1";
+      url = "mirror://steamrt/pool/main/w/waffle/waffle-utils-multiarch_1.6.0-2~steamrt1.3+srt1_amd64.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "waffle-utils-multiarch.deb";
+      };
+    }
     rec {
       name = "zenity_3.4.0-0ubuntu4+steamrt2+srt6_amd64";
       sha256 = "5eb59aa8d2211153c780aab2304e8694d7eb0204f284193ff2a037dc9e1274db";
@@ -2130,18 +2310,18 @@
       };
     }
     rec {
-      name = "libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt5_i386";
-      sha256 = "f92d0bdda8d394104824fca2ac6d19cb9c95a863893ef604e45c43d0eeb16ac1";
-      url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt5_i386.deb";
+      name = "libcurl3_7.22.0-3ubuntu4.17+steamrt1.2+srt1_i386";
+      sha256 = "6199cf8f81ddc6484bf59ac4941e17808cfa09b3c9141895b18a301bd0729547";
+      url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+steamrt1.2+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libcurl3.deb";
       };
     }
     rec {
-      name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt5_i386";
-      sha256 = "b210ce907bded1db660df24365861a10421d758cfd7fdb2fe64b058ecb92cdce";
-      url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt5_i386.deb";
+      name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.2+srt1_i386";
+      sha256 = "2ff0f70b5d522f429c4d9607cf3f1f35fb742693276e874c5f6f50d04553c628";
+      url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.2+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libcurl3-gnutls.deb";
@@ -2183,6 +2363,15 @@
         name = "libdbusmenu-gtk4.deb";
       };
     }
+    rec {
+      name = "libelf1_0.152-1ubuntu3.1+srt3_i386";
+      sha256 = "85aab224f4808b664cb827cd46dc4d559a1568e467db56e7047d26493f90cbf1";
+      url = "mirror://steamrt/pool/main/e/elfutils/libelf1_0.152-1ubuntu3.1+srt3_i386.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libelf1.deb";
+      };
+    }
     rec {
       name = "libexif12_0.6.20-2ubuntu0.1+srt6_i386";
       sha256 = "b9a25a54b70c2294e96c447bf05775c89eb056ff8eb0b4840506a955fcf78d35";
@@ -2355,9 +2544,9 @@
       };
     }
     rec {
-      name = "libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt4_i386";
-      sha256 = "a630adb25ecfa209aef8a1b14fac45293f044f652ee91249489dfe9bb0d5001d";
-      url = "mirror://steamrt/pool/main/g/gnutls28/libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt4_i386.deb";
+      name = "libgnutls30_3.4.10-4ubuntu1.4+steamrt1.2+srt1_i386";
+      sha256 = "b841c274bf8478136cdf8d2dfaa156d680dd0b2bdd20fb96f5645b4e9c09ef9a";
+      url = "mirror://steamrt/pool/main/g/gnutls28/libgnutls30_3.4.10-4ubuntu1.4+steamrt1.2+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libgnutls30.deb";
@@ -2543,6 +2732,15 @@
         name = "libjpeg62.deb";
       };
     }
+    rec {
+      name = "libjson-glib-1.0-0_1.0.2-1~steamrt1.1+srt1_i386";
+      sha256 = "e92b6a5be06128f88d885d2da927ce3a2bf274bf9f812ba102a0966fd17fd2ee";
+      url = "mirror://steamrt/pool/main/j/json-glib/libjson-glib-1.0-0_1.0.2-1~steamrt1.1+srt1_i386.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libjson-glib-1.0-0.deb";
+      };
+    }
     rec {
       name = "libjson0_0.9-1ubuntu1.1+srt4_i386";
       sha256 = "ae3503b9871e27e98bfb37477c4b6e151dcf31fa7af757309d99e70ffe66e570";
@@ -2904,48 +3102,48 @@
       };
     }
     rec {
-      name = "libsdl2_2.0.9.~reimport-0+steamrt1.1+srt2_i386";
-      sha256 = "b33446315351af70d2cfd602d5ee9e2390e2805b10f199dff383917469a3b344";
-      url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.9.~reimport-0+steamrt1.1+srt2_i386.deb";
+      name = "libsdl2-2.0-0_2.0.10-0+steamrt1.3+srt1_i386";
+      sha256 = "88f38095f8574cf3792b42da2a13b89c4011904e7d5043a911af4cd3f749f62b";
+      url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2-2.0-0_2.0.10-0+steamrt1.3+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
-        name = "libsdl2.deb";
+        name = "libsdl2-2.0-0.deb";
       };
     }
     rec {
-      name = "libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt2_i386";
-      sha256 = "4783fc8d0012b5a1b917336af3fd7db097c0c43153bb088df0fdd9018b8c4072";
-      url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt2_i386.deb";
+      name = "libsdl2-image-2.0-0_2.0.5-0+steamrt1.1+srt1_i386";
+      sha256 = "27b47158e7af64376f0fc4382e54b9c3130a0990d4d8b4e421b0729bf6e543a9";
+      url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image-2.0-0_2.0.5-0+steamrt1.1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
-        name = "libsdl2-image.deb";
+        name = "libsdl2-image-2.0-0.deb";
       };
     }
     rec {
-      name = "libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt2_i386";
-      sha256 = "4c7f511b947e416898b169694ef112d137674c9add49162ba1185c36e83b3604";
-      url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt2_i386.deb";
+      name = "libsdl2-mixer-2.0-0_2.0.4.~reimport-0+steamrt1.2+srt1_i386";
+      sha256 = "36f917c204f56c0836fb1829ecfb36ca5458b121857387afbf9e5afab6c4a36a";
+      url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer-2.0-0_2.0.4.~reimport-0+steamrt1.2+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
-        name = "libsdl2-mixer.deb";
+        name = "libsdl2-mixer-2.0-0.deb";
       };
     }
     rec {
-      name = "libsdl2-net_2.0.1+srt3_i386";
-      sha256 = "f5eba8169255366fdfc809183c89cd6d7ce88da96c6a56cd3da5f8af68cb31d0";
-      url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt3_i386.deb";
+      name = "libsdl2-net-2.0-0_2.0.1.~reimport-0+steamrt1.1+srt1_i386";
+      sha256 = "73316e94bfd4fc2382fd255c93469fdb8fa8a142c64b02522cbd84f972b17acf";
+      url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net-2.0-0_2.0.1.~reimport-0+steamrt1.1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
-        name = "libsdl2-net.deb";
+        name = "libsdl2-net-2.0-0.deb";
       };
     }
     rec {
-      name = "libsdl2-ttf_2.0.14+srt3_i386";
-      sha256 = "db1b89ffc678d7845adb3fa57b04865921521bd97603d28751248fb8f367d909";
-      url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt3_i386.deb";
+      name = "libsdl2-ttf-2.0-0_2.0.15-0+steamrt1.1+srt2_i386";
+      sha256 = "1a0a7c17206ed42dbb0a4c36a6be819b2e405c7f2a5c402b44773422bb717fe0";
+      url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf-2.0-0_2.0.15-0+steamrt1.1+srt2_i386.deb";
       source = fetchurl {
         inherit url sha256;
-        name = "libsdl2-ttf.deb";
+        name = "libsdl2-ttf-2.0-0.deb";
       };
     }
     rec {
@@ -3029,6 +3227,33 @@
         name = "libstdc++6-4.6-pic.deb";
       };
     }
+    rec {
+      name = "libsteam-runtime-tools-0-0_0.20200109.0-0+steamrt1.1+srt1_i386";
+      sha256 = "dfd80854857cdbc764f799f34acd7f37a4c3e773c4ba5c7c81394071148a140f";
+      url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-0_0.20200109.0-0+steamrt1.1+srt1_i386.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libsteam-runtime-tools-0-0.deb";
+      };
+    }
+    rec {
+      name = "libsteam-runtime-tools-0-helpers_0.20200109.0-0+steamrt1.1+srt1_i386";
+      sha256 = "f2c5fc6abcc3a938e2a0b27e8682b56944a2a61416e8d0edb5878af2e16c98cb";
+      url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-helpers_0.20200109.0-0+steamrt1.1+srt1_i386.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libsteam-runtime-tools-0-helpers.deb";
+      };
+    }
+    rec {
+      name = "libsteam-runtime-tools-0-relocatable-libs_0.20200109.0-0+steamrt1.1+srt1_i386";
+      sha256 = "c06ea7ec21d2114925c09d5245e87482c81cc4e1928ed31827ab58cb094721ae";
+      url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-relocatable-libs_0.20200109.0-0+steamrt1.1+srt1_i386.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libsteam-runtime-tools-0-relocatable-libs.deb";
+      };
+    }
     rec {
       name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_i386";
       sha256 = "938ac8ecc9f75f070b65b5d8bddea58d89ba8e1673d004d1b20ca0e1f677ba14";
@@ -3138,32 +3363,77 @@
       };
     }
     rec {
-      name = "libva-glx1_1.7.0-1+steamos1+srt2_i386";
-      sha256 = "d9e84658add810853ef5c07729afa864ea07be31b513a2eb5fd569328a9555a9";
-      url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.7.0-1+steamos1+srt2_i386.deb";
+      name = "libva-drm1_1.7.0-1+steamrt1.1+srt1_i386";
+      sha256 = "4f5fdcaf46a2e337fe1cad9c936809b5a38aff7af0b926bb9284930d23a9e09c";
+      url = "mirror://steamrt/pool/main/libv/libva1/libva-drm1_1.7.0-1+steamrt1.1+srt1_i386.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libva-drm1.deb";
+      };
+    }
+    rec {
+      name = "libva-drm2_2.1.0-3~steamrt1.2+srt1_i386";
+      sha256 = "8f2ca36ca81167017bc3921753ef6d9e3097172d52007ad16484f1f5eaa26a18";
+      url = "mirror://steamrt/pool/main/libv/libva/libva-drm2_2.1.0-3~steamrt1.2+srt1_i386.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libva-drm2.deb";
+      };
+    }
+    rec {
+      name = "libva-glx1_1.7.0-1+steamrt1.1+srt1_i386";
+      sha256 = "8360c4e6d65b444e4a985410101ddddcd7c1c955f25debdf20ccda9664695d44";
+      url = "mirror://steamrt/pool/main/libv/libva1/libva-glx1_1.7.0-1+steamrt1.1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libva-glx1.deb";
       };
     }
     rec {
-      name = "libva-x11-1_1.7.0-1+steamos1+srt2_i386";
-      sha256 = "1d2e3d83d02dbb83156edba8f6b1564baf795e84bf9c4549db100722f42d4a04";
-      url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.7.0-1+steamos1+srt2_i386.deb";
+      name = "libva-glx2_2.1.0-3~steamrt1.2+srt1_i386";
+      sha256 = "41e935fbb2fd67af1d3477959703ff1211bd34c0902d96e53e073e8b18d9def7";
+      url = "mirror://steamrt/pool/main/libv/libva/libva-glx2_2.1.0-3~steamrt1.2+srt1_i386.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libva-glx2.deb";
+      };
+    }
+    rec {
+      name = "libva-x11-1_1.7.0-1+steamrt1.1+srt1_i386";
+      sha256 = "bf8a787f375533dbb847aea5ab9bb316476d0c8a3e772d449356920fa9b045ce";
+      url = "mirror://steamrt/pool/main/libv/libva1/libva-x11-1_1.7.0-1+steamrt1.1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libva-x11-1.deb";
       };
     }
     rec {
-      name = "libva1_1.7.0-1+steamos1+srt2_i386";
-      sha256 = "f32d8049e071903b6b20648b0a30c4300603b2eb0635c71243beb58d9746dce6";
-      url = "mirror://steamrt/pool/main/libv/libva/libva1_1.7.0-1+steamos1+srt2_i386.deb";
+      name = "libva-x11-2_2.1.0-3~steamrt1.2+srt1_i386";
+      sha256 = "766bfc01ee038b21bd48eaacd1aaac1556817a999bdd83c605b4efdaf6c54a1d";
+      url = "mirror://steamrt/pool/main/libv/libva/libva-x11-2_2.1.0-3~steamrt1.2+srt1_i386.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libva-x11-2.deb";
+      };
+    }
+    rec {
+      name = "libva1_1.7.0-1+steamrt1.1+srt1_i386";
+      sha256 = "561d0e3f3a670ee8f6d2e1d4cfa41983d688e0d6233f07e541392016e517aa4d";
+      url = "mirror://steamrt/pool/main/libv/libva1/libva1_1.7.0-1+steamrt1.1+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libva1.deb";
       };
     }
+    rec {
+      name = "libva2_2.1.0-3~steamrt1.2+srt1_i386";
+      sha256 = "9ea2f165352428378bb6dc987256d37f2d2aace0be23a1ba70db69fab65e82dd";
+      url = "mirror://steamrt/pool/main/libv/libva/libva2_2.1.0-3~steamrt1.2+srt1_i386.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libva2.deb";
+      };
+    }
     rec {
       name = "libvdpau1_0.4.1-3ubuntu1.2+srt3_i386";
       sha256 = "8ec0513551e19a25934d113cf2f9d68cf2c4b3b65a6ba786f7aa780f81fe2cde";
@@ -3210,14 +3480,23 @@
       };
     }
     rec {
-      name = "libvulkan1_1.1.73+dfsg-1+steamosc2+srt2_i386";
-      sha256 = "cac788c3fd6cea1ff7235f9b14f82eb8121e209743f08d15529e54732e692e05";
-      url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamosc2+srt2_i386.deb";
+      name = "libvulkan1_1.1.73+dfsg-1+steamrt1.2+srt1_i386";
+      sha256 = "4e06285406434cc1184884438a15e6dd11f1d9aa2e1d6c95d2138fbe0f61a172";
+      url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamrt1.2+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "libvulkan1.deb";
       };
     }
+    rec {
+      name = "libwaffle-1-0_1.6.0-2~steamrt1.3+srt1_i386";
+      sha256 = "875ebdcc60fd8be86b6e83a2155bea69aa3ef7442d60eef277bcdf814c663452";
+      url = "mirror://steamrt/pool/main/w/waffle/libwaffle-1-0_1.6.0-2~steamrt1.3+srt1_i386.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "libwaffle-1-0.deb";
+      };
+    }
     rec {
       name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386";
       sha256 = "6eb4a6d45a5a37f96c0b96dd08f9d7dbbf5d67c4dc9627472e5c7f6e8dcdecd2";
@@ -3669,23 +3948,104 @@
       };
     }
     rec {
-      name = "steamrt-legacy_1.20190624.0+srt1_i386";
-      sha256 = "22bb83259ee421abdb7cb9877365460619011c859eaf4119615e55726defa56b";
-      url = "mirror://steamrt/pool/main/s/steamrt/steamrt-legacy_1.20190624.0+srt1_i386.deb";
+      name = "steam-runtime-tools-bin_0.20200109.0-0+steamrt1.1+srt1_i386";
+      sha256 = "52e587b75463b08e0e903e30cd4b836bd4e39ead8d556807e5628eff36fdc477";
+      url = "mirror://steamrt/pool/main/s/steam-runtime-tools/steam-runtime-tools-bin_0.20200109.0-0+steamrt1.1+srt1_i386.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "steam-runtime-tools-bin.deb";
+      };
+    }
+    rec {
+      name = "steamrt-legacy_1.20200128.0+srt1_i386";
+      sha256 = "3adf8b89ac83f12eeb431785bd18a569b1174bc81aa24d5c562687b823704f28";
+      url = "mirror://steamrt/pool/main/s/steamrt/steamrt-legacy_1.20200128.0+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "steamrt-legacy.deb";
       };
     }
     rec {
-      name = "steamrt-libs_1.20190624.0+srt1_i386";
-      sha256 = "f9a38284deb9c08fbe6f3b8d1617bec74bb803d639a0a77d77736f19a1de765a";
-      url = "mirror://steamrt/pool/main/s/steamrt/steamrt-libs_1.20190624.0+srt1_i386.deb";
+      name = "steamrt-libs_1.20200128.0+srt1_i386";
+      sha256 = "8ad6092d1b4d257883ca4f3fac8ee5b9a71413c8bdbc149a9bec843047867311";
+      url = "mirror://steamrt/pool/main/s/steamrt/steamrt-libs_1.20200128.0+srt1_i386.deb";
       source = fetchurl {
         inherit url sha256;
         name = "steamrt-libs.deb";
       };
     }
+    rec {
+      name = "vainfo_2.1.0+ds1-1~steamrt1.1+srt1_i386";
+      sha256 = "785128cd89e53ce63317eb958c59546b5526e66183b3819a3d351eb04c599e38";
+      url = "mirror://steamrt/pool/main/libv/libva-utils/vainfo_2.1.0+ds1-1~steamrt1.1+srt1_i386.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "vainfo.deb";
+      };
+    }
+    rec {
+      name = "vainfo-1_1.7.0-1+steamrt1.1+srt1_i386";
+      sha256 = "8d1c25ccfa3f62ccd680673a0b2460ab4090c66bc539c7f1991e60cd50e1ce1b";
+      url = "mirror://steamrt/pool/main/libv/libva1/vainfo-1_1.7.0-1+steamrt1.1+srt1_i386.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "vainfo-1.deb";
+      };
+    }
+    rec {
+      name = "vainfo-1-multiarch_1.7.0-1+steamrt1.1+srt1_i386";
+      sha256 = "f50869e6dc73354ab1aa3472ca9092c07d7868f3949b0ca1e2cd2fc817967f42";
+      url = "mirror://steamrt/pool/main/libv/libva1/vainfo-1-multiarch_1.7.0-1+steamrt1.1+srt1_i386.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "vainfo-1-multiarch.deb";
+      };
+    }
+    rec {
+      name = "vainfo-multiarch_2.1.0+ds1-1~steamrt1.1+srt1_i386";
+      sha256 = "066f979526321c2d74223426fbc40fd7b210ce6c0396ffc58220313358ae155c";
+      url = "mirror://steamrt/pool/main/libv/libva-utils/vainfo-multiarch_2.1.0+ds1-1~steamrt1.1+srt1_i386.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "vainfo-multiarch.deb";
+      };
+    }
+    rec {
+      name = "vulkan-utils_1.1.73+dfsg-1+steamrt1.2+srt1_i386";
+      sha256 = "2deda8ceeaef31ec4103e614282e554f360db2a7f51e2e868918845cb1187c75";
+      url = "mirror://steamrt/pool/main/v/vulkan/vulkan-utils_1.1.73+dfsg-1+steamrt1.2+srt1_i386.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "vulkan-utils.deb";
+      };
+    }
+    rec {
+      name = "vulkan-utils-multiarch_1.1.73+dfsg-1+steamrt1.2+srt1_i386";
+      sha256 = "13be3dd08ade9e67e7a3b870ee0787c2a96d6c2f99b3173c5439f643d52be220";
+      url = "mirror://steamrt/pool/main/v/vulkan/vulkan-utils-multiarch_1.1.73+dfsg-1+steamrt1.2+srt1_i386.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "vulkan-utils-multiarch.deb";
+      };
+    }
+    rec {
+      name = "waffle-utils_1.6.0-2~steamrt1.3+srt1_i386";
+      sha256 = "37df214d4f0fd1c5e9afce405756fc1615f2d5cba468b34569b13f3e8a08a2a5";
+      url = "mirror://steamrt/pool/main/w/waffle/waffle-utils_1.6.0-2~steamrt1.3+srt1_i386.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "waffle-utils.deb";
+      };
+    }
+    rec {
+      name = "waffle-utils-multiarch_1.6.0-2~steamrt1.3+srt1_i386";
+      sha256 = "5866f8bf43b6c19608670a8c565ce8f0dac9db9c943e65ac25e9cb4f951997a4";
+      url = "mirror://steamrt/pool/main/w/waffle/waffle-utils-multiarch_1.6.0-2~steamrt1.3+srt1_i386.deb";
+      source = fetchurl {
+        inherit url sha256;
+        name = "waffle-utils-multiarch.deb";
+      };
+    }
     rec {
       name = "zenity_3.4.0-0ubuntu4+steamrt2+srt6_i386";
       sha256 = "1c772d4f96424d204ab4913efcafbe43518257ca5032ca7b23d6c6ab76439117";

From 3a15a13354f83d1d1247b285da99e71e6b69ddac Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Mon, 9 Mar 2020 21:46:04 +0100
Subject: [PATCH 4187/4636] steam.chrootenv: Add Prison Architect dependencies

---
 pkgs/games/steam/chrootenv.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index cb85426c23b3..56e1a09f36e8 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -105,6 +105,12 @@ in buildFHSUserEnv rec {
 
     # called by steam's setup.sh
     file
+
+    # Prison Architect
+    libGLU
+    libuuid
+    libbsd
+    alsaLib
   ] ++ (if (!nativeOnly) then [
     (steamPackages.steam-runtime-wrapped.override {
       inherit runtimeOnly;
@@ -152,8 +158,6 @@ in buildFHSUserEnv rec {
     xorg.libXt
     xorg.libXmu
     xorg.libxcb
-    libGLU
-    libuuid
     libogg
     libvorbis
     SDL

From 99a2467722da3c72ef1eb20fe9992f8dc5c27527 Mon Sep 17 00:00:00 2001
From: Thibault Gagnaux <thibault.gagnaux@bit.admin.ch>
Date: Fri, 27 Mar 2020 11:15:17 +0100
Subject: [PATCH 4188/4636] amazon-ecs-cli: 1.18.0 -> 1.18.1

---
 pkgs/tools/virtualization/amazon-ecs-cli/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
index a27e006053ff..ada948735d0f 100644
--- a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
+++ b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
@@ -2,18 +2,18 @@
 
 stdenv.mkDerivation rec {
   pname = "amazon-ecs-cli";
-  version = "1.18.0";
+  version = "1.18.1";
 
   src =
     if stdenv.hostPlatform.system == "x86_64-linux" then
       fetchurl {
         url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-v${version}";
-        sha256 = "1w4n7rkcxpdzg7450s22a80a27g845n61k2bdfhq4c1md7604nyz";
+        sha256 = "1q0qsvxwz6mgslwzwslddxxv45v9wmlbbkxgyfz3dfkw6n6d1a2s";
       }
     else if stdenv.hostPlatform.system == "x86_64-darwin" then
       fetchurl {
         url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-darwin-amd64-v${version}";
-        sha256 = "011rw4rv2vz6xa4vqfjsf9j6m3rffclv9xh0dgf5ckd07m3fd3sm";
+        sha256 = "0hik88z5xm1pw6a3mxa6zpghdv47s6bg56srxv4azjinzdi59s3b";
       }
     else throw "Architecture not supported";
 

From 07bd8938f320bff12d1b9fe67aedc7ca8dd64d30 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 2 Mar 2020 17:22:35 +0100
Subject: [PATCH 4189/4636] pythonPackages.tensorflow-estimator_1_15_1: init at
 1.15.1

TF 1.15 still needs an older version of the tensorflow-estimator
package.

(cherry picked from commit c539f937c539b99e8c8b763b2568b52e39d3e9c4)
---
 .../tensorflow-estimator/1_15_1.nix           | 27 +++++++++++++++++++
 .../python-modules/tensorflow/default.nix     |  4 +--
 pkgs/top-level/python-packages.nix            |  1 +
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/python-modules/tensorflow-estimator/1_15_1.nix

diff --git a/pkgs/development/python-modules/tensorflow-estimator/1_15_1.nix b/pkgs/development/python-modules/tensorflow-estimator/1_15_1.nix
new file mode 100644
index 000000000000..39c667357c8f
--- /dev/null
+++ b/pkgs/development/python-modules/tensorflow-estimator/1_15_1.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchPypi, buildPythonPackage
+, numpy
+, absl-py
+, mock
+}:
+
+buildPythonPackage rec {
+  pname = "tensorflow-estimator";
+  version = "1.15.1";
+  format = "wheel";
+
+  src = fetchPypi {
+    pname = "tensorflow_estimator";
+    inherit version format;
+    sha256 = "1fc61wmc0w22frs79j2x4g6wnv5g21xc6rix1g4bsvy9qfvvylw8";
+  };
+
+  propagatedBuildInputs = [ mock numpy absl-py ];
+
+  meta = with stdenv.lib; {
+    description = "TensorFlow Estimator is a high-level API that encapsulates model training, evaluation, prediction, and exporting.";
+    homepage = http://tensorflow.org;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ jyp ];
+  };
+}
+
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 54629bebc116..7c80452b20fd 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -7,7 +7,7 @@
 , future, setuptools, wheel, keras-preprocessing, keras-applications, google-pasta
 , functools32
 , opt-einsum
-, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator
+, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator_1_15_1
 # Common deps
 , git, swig, which, binutils, glibcLocales, cython
 # Common libraries
@@ -373,7 +373,7 @@ in buildPythonPackage {
     numpy
     six
     protobuf
-    tensorflow-estimator
+    tensorflow-estimator_1_15_1
     termcolor
     wrapt
     grpcio
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 59ac9274b3ec..648b815e9ea2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6549,6 +6549,7 @@ in {
   zerobin = callPackage ../development/python-modules/zerobin { };
 
   tensorflow-estimator = callPackage ../development/python-modules/tensorflow-estimator { };
+  tensorflow-estimator_1_15_1 = callPackage ../development/python-modules/tensorflow-estimator/1_15_1.nix { };
 
   tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { };
 

From f0f6527e9704501294c1cd25cb4a8b9f314ee4cd Mon Sep 17 00:00:00 2001
From: Andreas Wiese <aw-nixos@meterriblecrew.net>
Date: Fri, 27 Mar 2020 18:10:21 +0100
Subject: [PATCH 4190/4636] matrix-dl: init at (unstable-)2019-09-22

---
 .../instant-messengers/matrix-dl/default.nix  | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/matrix-dl/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix b/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix
new file mode 100644
index 000000000000..21d521872145
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix
@@ -0,0 +1,25 @@
+{ lib, python3Packages, fetchFromGitHub }:
+
+python3Packages.buildPythonApplication rec {
+  pname = "matrix-dl-unstable";
+  version = "2019-09-22";
+
+  src = fetchFromGitHub {
+    owner = "rubo77";
+    repo = "matrix-dl";
+    rev = "e91610f45b7b3b0aca34923309fc83ba377f8a69";
+    sha256 = "036xfdd21pcfjlilknc67z5jqpk0vz07853wwcsiac32iypc6f2q";
+  };
+
+  propagatedBuildInputs = with python3Packages; [
+    matrix-client
+  ];
+
+  meta = with lib; {
+    description = "Download backlogs from Matrix as raw text";
+    homepage = src.meta.homepage;
+    license = licenses.unfree;
+    maintainers = with maintainers; [ aw ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d1f57640d54..b27ac31e739c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20689,6 +20689,8 @@ in
       canonicaljson;
   };
 
+  matrix-dl = callPackage ../applications/networking/instant-messengers/matrix-dl { };
+
   matrix-recorder = callPackage ../applications/networking/instant-messengers/matrix-recorder {};
 
   mblaze = callPackage ../applications/networking/mailreaders/mblaze { };

From 276bfbc17e8870c7f202ec6cf6e54e6d87a9ed8d Mon Sep 17 00:00:00 2001
From: Aaron Janse <aaron@ajanse.me>
Date: Fri, 27 Mar 2020 13:47:10 -0700
Subject: [PATCH 4191/4636] ulauncher: 4.4.0.r1 -> 5.6.1

---
 .../0001-Adjust-get_data_path-for-NixOS.patch | 55 +++++++++++++++++++
 pkgs/applications/misc/ulauncher/default.nix  | 37 ++++++++-----
 .../misc/ulauncher/fix-extensions.patch       | 13 +++++
 .../misc/ulauncher/fix-permissions.patch      | 12 ++++
 4 files changed, 104 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/applications/misc/ulauncher/0001-Adjust-get_data_path-for-NixOS.patch
 create mode 100644 pkgs/applications/misc/ulauncher/fix-extensions.patch
 create mode 100644 pkgs/applications/misc/ulauncher/fix-permissions.patch

diff --git a/pkgs/applications/misc/ulauncher/0001-Adjust-get_data_path-for-NixOS.patch b/pkgs/applications/misc/ulauncher/0001-Adjust-get_data_path-for-NixOS.patch
new file mode 100644
index 000000000000..f14d7f718027
--- /dev/null
+++ b/pkgs/applications/misc/ulauncher/0001-Adjust-get_data_path-for-NixOS.patch
@@ -0,0 +1,55 @@
+From 86cc27022015697a61d1ec1b13e52f9dbe7f6c57 Mon Sep 17 00:00:00 2001
+From: worldofpeace <worldofpeace@protonmail.ch>
+Date: Mon, 23 Mar 2020 18:34:00 -0400
+Subject: [PATCH] Adjust get_data_path for NixOS
+
+We construct the ulauncher data path from xdg_data_dirs
+and prevent it from being a nix store path or being xdg_data_home.
+We do this to prevent /nix/store paths being hardcoded to shortcuts.json.
+On NixOS this path will either be /run/current-system/sw/share/ulauncher
+or $HOME/.nix-profile/share/ulauncher if the user used nix-env.
+---
+ ulauncher/config.py | 27 ++++++++++++++++++---------
+ 1 file changed, 18 insertions(+), 9 deletions(-)
+
+diff --git a/ulauncher/config.py b/ulauncher/config.py
+index f21014e..cc636e1 100644
+--- a/ulauncher/config.py
++++ b/ulauncher/config.py
+@@ -50,15 +50,24 @@ def get_data_path():
+     is specified at installation time.
+     """
+ 
+-    # Get pathname absolute or relative.
+-    path = os.path.join(
+-        os.path.dirname(__file__), __ulauncher_data_directory__)
+-
+-    abs_data_path = os.path.abspath(path)
+-    if not os.path.exists(abs_data_path):
+-        raise ProjectPathNotFoundError(abs_data_path)
+-
+-    return abs_data_path
++    paths = list(
++        filter(
++            os.path.exists,
++            [
++                os.path.join(dir, "ulauncher")
++                for dir in xdg_data_dirs
++                # Get path that isn't in the /nix/store so they don't get hardcoded into configs
++                if not dir.startswith("/nix/store/")
++                # Exclude .local/share/ulauncher which isn't what we want
++                if not dir.startswith(xdg_data_home)
++            ],
++        )
++    )
++
++    try:
++        return paths[0]
++    except:
++        raise ProjectPathNotFoundError()
+ 
+ 
+ def is_wayland():
+-- 
+2.25.1
+
diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix
index 9fa284aba434..5b77e13d7243 100644
--- a/pkgs/applications/misc/ulauncher/default.nix
+++ b/pkgs/applications/misc/ulauncher/default.nix
@@ -1,8 +1,11 @@
 { stdenv
 , fetchurl
-, python27Packages
+, python3Packages
+, gdk-pixbuf
+, glib
 , gnome3
 , gobject-introspection
+, gtk3
 , wrapGAppsHook
 , webkitgtk
 , libnotify
@@ -11,49 +14,54 @@
 , intltool
 , wmctrl
 , xvfb_run
+, librsvg
 }:
 
-python27Packages.buildPythonApplication rec  {
+python3Packages.buildPythonApplication rec  {
   pname = "ulauncher";
-  version = "4.4.0.r1";
+  version = "5.6.1";
 
-  # Python 3 support is currently in development
-  # on the dev branch and 5.x.x releases
-  disabled = ! python27Packages.isPy27;
+  disabled = python3Packages.isPy27;
 
   src = fetchurl {
     url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz";
-    sha256 = "12v7qpjhf0842ivsfflsl2zlvhiaw25f9ffv7vhnkvrhrmksim9f";
+    sha256 = "14k68lp58wldldhaq4cf0ffkhi81czv4ps9xa86iw1j5b1gd2vbl";
   };
 
-  nativeBuildInputs = with python27Packages;  [
+  nativeBuildInputs = with python3Packages;  [
     distutils_extra
     intltool
     wrapGAppsHook
   ];
 
   buildInputs = [
+    gdk-pixbuf
+    glib
     gnome3.adwaita-icon-theme
     gobject-introspection
+    gtk3
     keybinder3
     libappindicator
     libnotify
+    librsvg
     webkitgtk
     wmctrl
   ];
 
-  propagatedBuildInputs = with python27Packages; [
+  propagatedBuildInputs = with python3Packages; [
+    mock
+    mypy
+    mypy-extensions
     dbus-python
-    notify
     pygobject3
     pyinotify
-    pysqlite
     python-Levenshtein
     pyxdg
+    requests
     websocket_client
   ];
 
-  checkInputs = with python27Packages; [
+  checkInputs = with python3Packages; [
     mock
     pytest
     pytest-mock
@@ -63,6 +71,9 @@ python27Packages.buildPythonApplication rec  {
 
   patches = [
     ./fix-path.patch
+    ./fix-permissions.patch # ulauncher PR #523
+    ./0001-Adjust-get_data_path-for-NixOS.patch
+    ./fix-extensions.patch
   ];
 
   postPatch = ''
@@ -73,7 +84,7 @@ python27Packages.buildPythonApplication rec  {
   doCheck = false;
 
   preCheck = ''
-    export PYTHONPATH=$PYTHONPATH:$out/${python27Packages.python.sitePackages}
+    export PYTHONPATH=$PYTHONPATH:$out/${python3Packages.python.sitePackages}
   '';
 
   # Simple translation of
diff --git a/pkgs/applications/misc/ulauncher/fix-extensions.patch b/pkgs/applications/misc/ulauncher/fix-extensions.patch
new file mode 100644
index 000000000000..f6d00f9fafd5
--- /dev/null
+++ b/pkgs/applications/misc/ulauncher/fix-extensions.patch
@@ -0,0 +1,13 @@
+diff --git a/ulauncher/api/server/ExtensionRunner.py b/ulauncher/api/server/ExtensionRunner.py
+index 22042bf..f7b31c8 100644
+--- a/ulauncher/api/server/ExtensionRunner.py
++++ b/ulauncher/api/server/ExtensionRunner.py
+@@ -79,7 +79,7 @@ class ExtensionRunner:
+         cmd = [sys.executable, os.path.join(self.extensions_dir, extension_id, 'main.py')]
+         env = os.environ.copy()
+         env['ULAUNCHER_WS_API'] = self.extension_server.generate_ws_url(extension_id)
+-        env['PYTHONPATH'] = ':'.join(filter(bool, [ULAUNCHER_APP_DIR, os.getenv('PYTHONPATH')]))
++        env['PYTHONPATH'] = ':'.join([ULAUNCHER_APP_DIR] + sys.path)
+ 
+         if self.verbose:
+             env['VERBOSE'] = '1'
diff --git a/pkgs/applications/misc/ulauncher/fix-permissions.patch b/pkgs/applications/misc/ulauncher/fix-permissions.patch
new file mode 100644
index 000000000000..9d743c950f9d
--- /dev/null
+++ b/pkgs/applications/misc/ulauncher/fix-permissions.patch
@@ -0,0 +1,12 @@
+diff --git a/ulauncher/utils/Theme.py b/ulauncher/utils/Theme.py
+index 9cde624..4e36c4f 100644
+--- a/ulauncher/utils/Theme.py
++++ b/ulauncher/utils/Theme.py
+@@ -138,6 +138,9 @@ class Theme:
+         rmtree(new_theme_dir)
+         copytree(self.path, new_theme_dir)
+ 
++        # change file permissions (because Nix store is read-only)
++        os.chmod(new_theme_dir, 0o755)
++
+         return os.path.join(new_theme_dir, 'generated.css')

From b3e1a1bbbb5b96f40994944849e5e634d1d9034d Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Tue, 4 Feb 2020 21:08:31 +0000
Subject: [PATCH 4192/4636] chromium: Add option to enable ozone (for Wayland)

---
 .../networking/browsers/chromium/common.nix       | 15 ++++++++++++++-
 .../networking/browsers/chromium/default.nix      |  3 ++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 83c492e1e651..53d6e145dbf8 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -21,9 +21,11 @@
 # optional dependencies
 , libgcrypt ? null # gnomeSupport || cupsSupport
 , libva ? null # useVaapi
+, libdrm ? null, wayland ? null, mesa_drivers ? null, libxkbcommon ? null # useOzone
 
 # package customization
 , useVaapi ? false
+, useOzone ? false
 , gnomeSupport ? false, gnome ? null
 , gnomeKeyringSupport ? false, libgnome-keyring3 ? null
 , proprietaryCodecs ? true
@@ -129,7 +131,8 @@ let
       ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
       ++ optionals cupsSupport [ libgcrypt cups ]
       ++ optional useVaapi libva
-      ++ optional pulseSupport libpulseaudio;
+      ++ optional pulseSupport libpulseaudio
+      ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ];
 
     patches = [
       ./patches/nix_plugin_paths_68.patch
@@ -261,6 +264,16 @@ let
     } // optionalAttrs pulseSupport {
       use_pulseaudio = true;
       link_pulseaudio = true;
+    } // optionalAttrs useOzone {
+      use_ozone = true;
+      ozone_platform_gbm = false;
+      use_xkbcommon = true;
+      use_glib = true;
+      use_gtk = true;
+      use_system_libwayland = true;
+      use_system_minigbm = true;
+      use_system_libdrm = true;
+      system_wayland_scanner_path = "${wayland}/bin/wayland-scanner";
     } // (extraAttrs.gnFlags or {}));
 
     configurePhase = ''
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 8968a10bed00..b3ca9a79ad30 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -13,6 +13,7 @@
 , enablePepperFlash ? false
 , enableWideVine ? false
 , useVaapi ? false # test video on radeon, before enabling this
+, useOzone ? false
 , cupsSupport ? true
 , pulseSupport ? config.pulseaudio or stdenv.isLinux
 , commandLineArgs ? ""
@@ -32,7 +33,7 @@ let
     upstream-info = (callPackage ./update.nix {}).getChannel channel;
 
     mkChromiumDerivation = callPackage ./common.nix {
-      inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useVaapi;
+      inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useVaapi useOzone;
     };
 
     browser = callPackage ./browser.nix { inherit channel enableWideVine; };

From b8bcf8cb4f421bb558bfff9c3fff9cbbdf5fac77 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 27 Mar 2020 21:17:40 +0000
Subject: [PATCH 4193/4636] zita-at1: init at 0.6.2

---
 pkgs/applications/audio/zita-at1/default.nix | 36 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  4 ++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/audio/zita-at1/default.nix

diff --git a/pkgs/applications/audio/zita-at1/default.nix b/pkgs/applications/audio/zita-at1/default.nix
new file mode 100644
index 000000000000..c91edf34c826
--- /dev/null
+++ b/pkgs/applications/audio/zita-at1/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl
+, cairo, fftwSinglePrec, libX11, libXft, libclthreads, libclxclient, libjack2
+, xorgproto, zita-resampler
+}:
+
+stdenv.mkDerivation rec {
+  name = "zita-at1-0.6.2";
+
+  src = fetchurl {
+    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    sha256 = "0mxfn61zvhlq3r1mqipyqzjbanrfdkk8x4nxbz8nlbdk0bf3vfqr";
+  };
+
+  buildInputs = [
+    cairo fftwSinglePrec libX11 libXft libclthreads libclxclient libjack2
+    xorgproto zita-resampler
+  ];
+
+  preConfigure = ''
+    cd ./source/
+  '';
+
+  makeFlags = [
+    "PREFIX=$(out)"
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Autotuner Jack application to correct the pitch of vocal tracks";
+    homepage = https://kokkinizita.linuxaudio.org/linuxaudio/index.html;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ orivej ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0341fd97bc0b..cd608fab5374 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15897,7 +15897,7 @@ in
   mysql = mariadb; # TODO: move to aliases.nix
 
   mongodb = hiPrio mongodb-3_4;
-  
+
   mongodb-3_4 = callPackage ../servers/nosql/mongodb/v3_4.nix {
     sasl = cyrus_sasl;
     boost = boost160;
@@ -23158,6 +23158,8 @@ in
 
   zim = callPackage ../applications/office/zim { };
 
+  zita-at1 = callPackage ../applications/audio/zita-at1 { };
+
   zita-njbridge = callPackage ../applications/audio/zita-njbridge { };
 
   zola = callPackage ../applications/misc/zola {

From 220636999b63035b5a1cab65243bd3913a28a6d8 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 27 Mar 2020 22:17:01 +0100
Subject: [PATCH 4194/4636] Revert "luaPackages.luv: 1.30.0-0 -> 1.34.1-1"

This reverts commit eaa47284113cda19a037b7fcbaa892ddb596b813.

With 81461cff5f540c92e5030f62b89ee7b64e85c6df luv also needs to be
downgraded until luarocks can be updated to 3.3.1 again.

Fixes #82727
---
 pkgs/development/lua-modules/generated-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 33946b7213aa..edc09421baf7 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -1326,11 +1326,11 @@ luuid = buildLuarocksPackage {
 };
 luv = buildLuarocksPackage {
   pname = "luv";
-  version = "1.34.1-1";
+  version = "1.30.0-0";
 
   src = fetchurl {
-    url    = https://luarocks.org/luv-1.34.1-1.src.rock;
-    sha256 = "044cyp25xn35nj5qp1hx04lfkzrpa6adhqjshq2g7wvbga77p1q0";
+    url    = https://luarocks.org/luv-1.30.0-0.src.rock;
+    sha256 = "1z5sdq9ld4sm5pws9qxpk9cadv9i7ycwad1zwsa57pj67gly11vi";
   };
   disabled = (luaOlder "5.1");
   propagatedBuildInputs = [ lua ];

From 17611f14c2130ec0eb28068a31b9fd52d7a8ae1f Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Mon, 24 Feb 2020 17:11:48 -0500
Subject: [PATCH 4195/4636] python3Packages.dipy: init at 1.1.1

---
 .../python-modules/dipy/default.nix           | 68 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 70 insertions(+)
 create mode 100644 pkgs/development/python-modules/dipy/default.nix

diff --git a/pkgs/development/python-modules/dipy/default.nix b/pkgs/development/python-modules/dipy/default.nix
new file mode 100644
index 000000000000..939f0912fe1f
--- /dev/null
+++ b/pkgs/development/python-modules/dipy/default.nix
@@ -0,0 +1,68 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, isPy27
+, packaging
+, pytest
+, cython
+, numpy
+, scipy
+, h5py
+, nibabel
+}:
+
+buildPythonPackage rec {
+  pname = "dipy";
+  version = "1.1.1";
+
+  disabled = isPy27;
+
+  src = fetchFromGitHub {
+    owner  = "dipy";
+    repo   = pname;
+    rev    = version;
+    sha256 = "08abx0f4li6ya62ilc59miw4mk6wndizahyylxhgcrpacb6ydw28";
+  };
+
+  nativeBuildInputs = [ cython packaging ];
+  propagatedBuildInputs = [
+    numpy
+    scipy
+    h5py
+    nibabel
+  ];
+
+  checkInputs = [ pytest ];
+
+  # disable tests for now due to:
+  #   - some tests require data download (see dipy/dipy/issues/2092);
+  #   - running the tests manually causes a multiprocessing hang;
+  #   - import weirdness when running the tests
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "dipy"
+    "dipy.core"
+    "dipy.direction"
+    "dipy.tracking"
+    "dipy.reconst"
+    "dipy.io"
+    "dipy.viz"
+    "dipy.boots"
+    "dipy.data"
+    "dipy.utils"
+    "dipy.segment"
+    "dipy.sims"
+    "dipy.stats"
+    "dipy.denoise"
+    "dipy.workflows"
+    "dipy.nn"
+  ];
+
+  meta = with lib; {
+    homepage = "https://dipy.org/";
+    description = "Diffusion imaging toolkit for Python";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ bcdarwin ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2331f447f19e..aba67f63a828 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -619,6 +619,8 @@ in {
 
   diofant = callPackage ../development/python-modules/diofant { };
 
+  dipy = callPackage ../development/python-modules/dipy { };
+
   docrep = callPackage ../development/python-modules/docrep { };
 
   dominate = callPackage ../development/python-modules/dominate { };

From 9a5c27a513aef87e9270636774ddd802679e7eaa Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 28 Mar 2020 07:55:51 +1000
Subject: [PATCH 4196/4636] buildah: 1.14.4 -> 1.14.5

https://github.com/containers/buildah/releases/tag/v1.14.5
---
 pkgs/development/tools/buildah/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index 6e3335a3c07e..6f207ee4f5f3 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -4,13 +4,13 @@
 
 buildGoPackage rec {
   pname = "buildah";
-  version = "1.14.4";
+  version = "1.14.5";
 
   src = fetchFromGitHub {
     owner  = "containers";
     repo   = "buildah";
     rev    = "v${version}";
-    sha256 = "055xaczvqxp9qwiki2qw3576mj7qy0zzx90473wx4k7qri4csyrb";
+    sha256 = "186jla2gy9xsl54siji5i7a3hc8sjp5gcc78j43xn11i8brdf684";
   };
 
   outputs = [ "bin" "man" "out" ];

From d037e64ef6c876083b3bf1dfa80c73517e18e746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20Rivi=C3=A8re?= <babathriviere@gmail.com>
Date: Tue, 24 Dec 2019 18:01:45 +0100
Subject: [PATCH 4197/4636] flutter: init 1.12.13+hotfix.8

flutter: add beta and dev channels

flutter: artifacts are now downloaded in $HOME/.cache/flutter

flutter: remove all artifacts from flutter

flutter: fix lockfile path

flutter: fix pub_cache

flutter: fix flutter_tools/.packages pointing to /build

flutter: clean patches

flutter: fix write error on .cache/flutter/lockfile

flutter: add zlib as a dependency

flutter: add missing dependencies

flutter: fix flutter version

flutter: update versions + dependencies
---
 .../development/compilers/flutter/default.nix |  30 ++++
 .../development/compilers/flutter/flutter.nix | 128 ++++++++++++++++++
 .../patches/beta/disable-auto-update.patch    |  31 +++++
 .../flutter/patches/beta/move-cache.patch     |  63 +++++++++
 .../patches/dev/disable-auto-update.patch     |  31 +++++
 .../flutter/patches/dev/move-cache.patch      |  63 +++++++++
 .../patches/stable/disable-auto-update.patch  |  31 +++++
 .../flutter/patches/stable/move-cache.patch   |  63 +++++++++
 pkgs/top-level/all-packages.nix               |   4 +
 9 files changed, 444 insertions(+)
 create mode 100644 pkgs/development/compilers/flutter/default.nix
 create mode 100644 pkgs/development/compilers/flutter/flutter.nix
 create mode 100644 pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch
 create mode 100644 pkgs/development/compilers/flutter/patches/beta/move-cache.patch
 create mode 100644 pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch
 create mode 100644 pkgs/development/compilers/flutter/patches/dev/move-cache.patch
 create mode 100644 pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch
 create mode 100644 pkgs/development/compilers/flutter/patches/stable/move-cache.patch

diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
new file mode 100644
index 000000000000..89e05be1e4e9
--- /dev/null
+++ b/pkgs/development/compilers/flutter/default.nix
@@ -0,0 +1,30 @@
+{ callPackage }:
+
+let
+  mkFlutter = opts: callPackage (import ./flutter.nix opts) { };
+  getPatches = dir:
+    let files = builtins.attrNames (builtins.readDir dir);
+    in map (f: dir + ("/" + f)) files;
+in {
+  stable = mkFlutter {
+    pname = "flutter";
+    channel = "stable";
+    version = "1.12.13+hotfix.8";
+    sha256Hash = "01ik4xckr3fp65sq4g0g6wy5b9i0r49l643xmbxa6z9k21sby46d";
+    patches = getPatches ./patches/stable;
+  };
+  beta = mkFlutter {
+    pname = "flutter-beta";
+    channel = "beta";
+    version = "1.14.6";
+    sha256Hash = "1a79pr741zkr39p5gc3p9x59d70vm60hpz2crgc53ysglj4ycigy";
+    patches = getPatches ./patches/beta;
+  };
+  dev = mkFlutter {
+    pname = "flutter-dev";
+    channel = "dev";
+    version = "1.15.3";
+    sha256Hash = "06mawwqf7q7wdmzlyxlrlblhnnk4ckf3vp92lplippdh3d52r93i";
+    patches = getPatches ./patches/dev;
+  };
+}
diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix
new file mode 100644
index 000000000000..1b9c482d6e92
--- /dev/null
+++ b/pkgs/development/compilers/flutter/flutter.nix
@@ -0,0 +1,128 @@
+{ channel, pname, version, sha256Hash, patches }:
+
+{ bash, buildFHSUserEnv, cacert, coreutils, git, makeWrapper, runCommand, stdenv
+, fetchurl, alsaLib, dbus, expat, libpulseaudio, libuuid, libX11, libxcb
+, libXcomposite, libXcursor, libXdamage, libXfixes, libGL, nspr, nss, systemd }:
+
+let
+  drvName = "flutter-${channel}-${version}";
+  flutter = stdenv.mkDerivation {
+    name = "${drvName}-unwrapped";
+
+    src = fetchurl {
+      url =
+        "https://storage.googleapis.com/flutter_infra/releases/${channel}/linux/flutter_linux_v${version}-${channel}.tar.xz";
+      sha256 = sha256Hash;
+    };
+
+    buildInputs = [ makeWrapper git ];
+
+    inherit patches;
+
+    postPatch = ''
+      patchShebangs --build ./bin/
+      find ./bin/ -executable -type f -exec patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \;
+    '';
+
+    buildPhase = ''
+      FLUTTER_ROOT=$(pwd)
+      FLUTTER_TOOLS_DIR="$FLUTTER_ROOT/packages/flutter_tools"
+      SNAPSHOT_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.snapshot"
+      STAMP_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.stamp"
+      SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart"
+      DART_SDK_PATH="$FLUTTER_ROOT/bin/cache/dart-sdk"
+
+      DART="$DART_SDK_PATH/bin/dart"
+      PUB="$DART_SDK_PATH/bin/pub"
+
+      HOME=../.. # required for pub upgrade --offline, ~/.pub-cache
+                 # path is relative otherwise it's replaced by /build/flutter
+
+      (cd "$FLUTTER_TOOLS_DIR" && "$PUB" upgrade --offline)
+
+      local revision="$(cd "$FLUTTER_ROOT"; git rev-parse HEAD)"
+      "$DART" --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH"
+      echo "$revision" > "$STAMP_PATH"
+      echo -n "${version}" > version
+
+      rm -rf bin/cache/{artifacts,downloads}
+      rm -f  bin/cache/*.stamp
+    '';
+
+    installPhase = ''
+      mkdir -p $out
+      cp -r . $out
+    '';
+  };
+
+  # Wrap flutter inside an fhs user env to allow execution of binary,
+  # like adb from $ANDROID_HOME or java from android-studio.
+  fhsEnv = buildFHSUserEnv {
+    name = "${drvName}-fhs-env";
+    multiPkgs = pkgs: [
+      # Flutter only use these certificates
+      (runCommand "fedoracert" { } ''
+        mkdir -p $out/etc/pki/tls/
+        ln -s ${cacert}/etc/ssl/certs $out/etc/pki/tls/certs
+      '')
+      pkgs.zlib
+    ];
+    targetPkgs = pkgs:
+      with pkgs; [
+        bash
+        curl
+        git
+        unzip
+        which
+        xz
+
+        # flutter test requires this lib
+        libGLU
+
+        # for android emulator
+        alsaLib
+        dbus
+        expat
+        libpulseaudio
+        libuuid
+        libX11
+        libxcb
+        libXcomposite
+        libXcursor
+        libXdamage
+        libXfixes
+        libGL
+        nspr
+        nss
+        systemd
+      ];
+  };
+
+in runCommand drvName {
+  startScript = ''
+    #!${bash}/bin/bash
+    export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"}
+    export ANDROID_EMULATOR_USE_SYSTEM_LIBS=1
+    ${fhsEnv}/bin/${drvName}-fhs-env ${flutter}/bin/flutter --no-version-check "$@"
+  '';
+  preferLocalBuild = true;
+  allowSubstitutes = false;
+  passthru = { unwrapped = flutter; };
+  meta = with stdenv.lib; {
+    description =
+      "Flutter is Google's SDK for building mobile, web and desktop with Dart.";
+    longDescription = ''
+      Flutter is Google’s UI toolkit for building beautiful,
+      natively compiled applications for mobile, web, and desktop from a single codebase.
+    '';
+    homepage = "https://flutter.dev";
+    license = licenses.bsd3;
+    platforms = [ "x86_64-linux" ];
+    maintainers = with maintainers; [ babariviere ];
+  };
+} ''
+  mkdir -p $out/bin
+
+  echo -n "$startScript" > $out/bin/${pname}
+  chmod +x $out/bin/${pname}
+''
diff --git a/pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch
new file mode 100644
index 000000000000..42c09c805cb5
--- /dev/null
+++ b/pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch
@@ -0,0 +1,31 @@
+diff --git a/bin/flutter b/bin/flutter
+index e0c18e235..2c3fb7ddd 100755
+--- a/bin/flutter
++++ b/bin/flutter
+@@ -185,8 +185,6 @@ fi
+ # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS"
+ # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432"
+ 
+-(upgrade_flutter) 3< "$PROG_NAME"
+-
+ # FLUTTER_TOOL_ARGS isn't quoted below, because it is meant to be considered as
+ # separate space-separated args.
+ "$DART" --packages="$FLUTTER_TOOLS_DIR/.packages" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" "$@"
+diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+index 99455ae64..f5b0cb59c 100644
+--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
++++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+@@ -301,13 +301,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
+         }
+ 
+         _checkFlutterCopy();
+-        try {
+-          await globals.flutterVersion.ensureVersionFile();
+-        } on FileSystemException catch (e) {
+-          globals.printError('Failed to write the version file to the artifact cache: "$e".');
+-          globals.printError('Please ensure you have permissions in the artifact cache directory.');
+-          throwToolExit('Failed to write the version file');
+-        }
+         final bool machineFlag = topLevelResults['machine'] as bool;
+         if (topLevelResults.command?.name != 'upgrade' && topLevelResults['version-check'] as bool && !machineFlag) {
+           await globals.flutterVersion.checkFlutterVersionFreshness();
diff --git a/pkgs/development/compilers/flutter/patches/beta/move-cache.patch b/pkgs/development/compilers/flutter/patches/beta/move-cache.patch
new file mode 100644
index 000000000000..303f8dd37395
--- /dev/null
+++ b/pkgs/development/compilers/flutter/patches/beta/move-cache.patch
@@ -0,0 +1,63 @@
+diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart
+index 8e511eefd..fbc7d6ac3 100644
+--- a/dev/devicelab/lib/framework/runner.dart
++++ b/dev/devicelab/lib/framework/runner.dart
+@@ -126,7 +126,7 @@ Future<void> cleanupSystem() async {
+     print('\nTelling Gradle to shut down (JAVA_HOME=$javaHome)');
+     final String gradlewBinaryName = Platform.isWindows ? 'gradlew.bat' : 'gradlew';
+     final Directory tempDir = Directory.systemTemp.createTempSync('flutter_devicelab_shutdown_gradle.');
+-    recursiveCopy(Directory(path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'gradle_wrapper')), tempDir);
++    recursiveCopy(Directory(path.join(homeDirPath, '.cache', 'flutter', 'artifacts', 'gradle_wrapper')), tempDir);
+     copy(File(path.join(path.join(flutterDirectory.path, 'packages', 'flutter_tools'), 'templates', 'app', 'android.tmpl', 'gradle', 'wrapper', 'gradle-wrapper.properties')), Directory(path.join(tempDir.path, 'gradle', 'wrapper')));
+     if (!Platform.isWindows) {
+       await exec(
+diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart
+index 79b06949f..9040ba0a8 100644
+--- a/packages/flutter_tools/lib/src/asset.dart
++++ b/packages/flutter_tools/lib/src/asset.dart
+@@ -6,6 +6,7 @@ import 'dart:async';
+ 
+ import 'package:yaml/yaml.dart';
+ 
++import 'base/common.dart';
+ import 'base/context.dart';
+ import 'base/file_system.dart';
+ import 'base/utils.dart';
+@@ -325,7 +326,7 @@ List<_Asset> _getMaterialAssets(String fontSet) {
+     for (final Map<dynamic, dynamic> font in family['fonts']) {
+       final Uri entryUri = globals.fs.path.toUri(font['asset'] as String);
+       result.add(_Asset(
+-        baseDir: globals.fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'),
++        baseDir: globals.fs.path.join(homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'),
+         relativeUri: Uri(path: entryUri.pathSegments.last),
+         entryUri: entryUri,
+       ));
+diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
+index 715189938..5afb2a0db 100644
+--- a/packages/flutter_tools/lib/src/cache.dart
++++ b/packages/flutter_tools/lib/src/cache.dart
+@@ -189,8 +189,14 @@ class Cache {
+       return;
+     }
+     assert(_lock == null);
++
++    final Directory dir = globals.fs.directory(globals.fs.path.join(homeDirPath, '.cache', 'flutter'));
++    if (!dir.existsSync()) {
++      dir.createSync(recursive: true);
++      os.chmod(dir, '755');
++    }
+     final File lockFile =
+-        globals.fs.file(globals.fs.path.join(flutterRoot, 'bin', 'cache', 'lockfile'));
++        globals.fs.file(globals.fs.path.join(homeDirPath, '.cache', 'flutter', 'lockfile'));
+     try {
+       _lock = lockFile.openSync(mode: FileMode.write);
+     } on FileSystemException catch (e) {
+@@ -290,7 +296,7 @@ class Cache {
+     if (_rootOverride != null) {
+       return _fileSystem.directory(_fileSystem.path.join(_rootOverride.path, 'bin', 'cache'));
+     } else {
+-      return _fileSystem.directory(_fileSystem.path.join(flutterRoot, 'bin', 'cache'));
++      return _fileSystem.directory(_fileSystem.path.join(homeDirPath, '.cache', 'flutter'));
+     }
+   }
+ 
diff --git a/pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch
new file mode 100644
index 000000000000..42c09c805cb5
--- /dev/null
+++ b/pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch
@@ -0,0 +1,31 @@
+diff --git a/bin/flutter b/bin/flutter
+index e0c18e235..2c3fb7ddd 100755
+--- a/bin/flutter
++++ b/bin/flutter
+@@ -185,8 +185,6 @@ fi
+ # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS"
+ # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432"
+ 
+-(upgrade_flutter) 3< "$PROG_NAME"
+-
+ # FLUTTER_TOOL_ARGS isn't quoted below, because it is meant to be considered as
+ # separate space-separated args.
+ "$DART" --packages="$FLUTTER_TOOLS_DIR/.packages" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" "$@"
+diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+index 99455ae64..f5b0cb59c 100644
+--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
++++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+@@ -301,13 +301,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
+         }
+ 
+         _checkFlutterCopy();
+-        try {
+-          await globals.flutterVersion.ensureVersionFile();
+-        } on FileSystemException catch (e) {
+-          globals.printError('Failed to write the version file to the artifact cache: "$e".');
+-          globals.printError('Please ensure you have permissions in the artifact cache directory.');
+-          throwToolExit('Failed to write the version file');
+-        }
+         final bool machineFlag = topLevelResults['machine'] as bool;
+         if (topLevelResults.command?.name != 'upgrade' && topLevelResults['version-check'] as bool && !machineFlag) {
+           await globals.flutterVersion.checkFlutterVersionFreshness();
diff --git a/pkgs/development/compilers/flutter/patches/dev/move-cache.patch b/pkgs/development/compilers/flutter/patches/dev/move-cache.patch
new file mode 100644
index 000000000000..4672d4c625d0
--- /dev/null
+++ b/pkgs/development/compilers/flutter/patches/dev/move-cache.patch
@@ -0,0 +1,63 @@
+diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart
+index 8e511eefd..fbc7d6ac3 100644
+--- a/dev/devicelab/lib/framework/runner.dart
++++ b/dev/devicelab/lib/framework/runner.dart
+@@ -126,7 +126,7 @@ Future<void> cleanupSystem() async {
+     print('\nTelling Gradle to shut down (JAVA_HOME=$javaHome)');
+     final String gradlewBinaryName = Platform.isWindows ? 'gradlew.bat' : 'gradlew';
+     final Directory tempDir = Directory.systemTemp.createTempSync('flutter_devicelab_shutdown_gradle.');
+-    recursiveCopy(Directory(path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'gradle_wrapper')), tempDir);
++    recursiveCopy(Directory(path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'gradle_wrapper')), tempDir);
+     copy(File(path.join(path.join(flutterDirectory.path, 'packages', 'flutter_tools'), 'templates', 'app', 'android.tmpl', 'gradle', 'wrapper', 'gradle-wrapper.properties')), Directory(path.join(tempDir.path, 'gradle', 'wrapper')));
+     if (!Platform.isWindows) {
+       await exec(
+diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart
+index 79b06949f..9040ba0a8 100644
+--- a/packages/flutter_tools/lib/src/asset.dart
++++ b/packages/flutter_tools/lib/src/asset.dart
+@@ -6,6 +6,7 @@ import 'dart:async';
+ 
+ import 'package:yaml/yaml.dart';
+ 
++import 'base/common.dart';
+ import 'base/context.dart';
+ import 'base/file_system.dart';
+ import 'base/utils.dart';
+@@ -325,7 +326,7 @@ List<_Asset> _getMaterialAssets(String fontSet) {
+     for (final Map<dynamic, dynamic> font in family['fonts']) {
+       final Uri entryUri = globals.fs.path.toUri(font['asset'] as String);
+       result.add(_Asset(
+-        baseDir: globals.fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'),
++        baseDir: globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'),
+         relativeUri: Uri(path: entryUri.pathSegments.last),
+         entryUri: entryUri,
+       ));
+diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
+index 715189938..5afb2a0db 100644
+--- a/packages/flutter_tools/lib/src/cache.dart
++++ b/packages/flutter_tools/lib/src/cache.dart
+@@ -189,8 +189,14 @@ class Cache {
+       return;
+     }
+     assert(_lock == null);
++
++    final Directory dir = globals.fs.directory(globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter'));
++    if (!dir.existsSync()) {
++      dir.createSync(recursive: true);
++      globals.os.chmod(dir, '755');
++    }
+     final File lockFile =
+-        globals.fs.file(globals.fs.path.join(flutterRoot, 'bin', 'cache', 'lockfile'));
++        globals.fs.file(globals.fs.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter', 'lockfile'));
+     try {
+       _lock = lockFile.openSync(mode: FileMode.write);
+     } on FileSystemException catch (e) {
+@@ -290,7 +296,7 @@ class Cache {
+     if (_rootOverride != null) {
+       return _fileSystem.directory(_fileSystem.path.join(_rootOverride.path, 'bin', 'cache'));
+     } else {
+-      return _fileSystem.directory(_fileSystem.path.join(flutterRoot, 'bin', 'cache'));
++      return _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath, '.cache', 'flutter'));
+     }
+   }
+ 
diff --git a/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch
new file mode 100644
index 000000000000..16fe504595f3
--- /dev/null
+++ b/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch
@@ -0,0 +1,31 @@
+diff --git a/bin/flutter b/bin/flutter
+index 3955f8f39..1e7573d30 100755
+--- a/bin/flutter
++++ b/bin/flutter
+@@ -185,8 +185,6 @@ fi
+ # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS"
+ # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432"
+ 
+-(upgrade_flutter) 3< "$PROG_NAME"
+-
+ # FLUTTER_TOOL_ARGS isn't quoted below, because it is meant to be considered as
+ # separate space-separated args.
+ "$DART" --packages="$FLUTTER_TOOLS_DIR/.packages" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" "$@"
+diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+index 5e45819d9..ab748b059 100644
+--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
++++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+@@ -377,13 +377,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
+         }
+ 
+         _checkFlutterCopy();
+-        try {
+-          await FlutterVersion.instance.ensureVersionFile();
+-        } on FileSystemException catch (e) {
+-          printError('Failed to write the version file to the artifact cache: "$e".');
+-          printError('Please ensure you have permissions in the artifact cache directory.');
+-          throwToolExit('Failed to write the version file');
+-        }
+         if (topLevelResults.command?.name != 'upgrade' && topLevelResults['version-check'] as bool) {
+           await FlutterVersion.instance.checkFlutterVersionFreshness();
+         }
diff --git a/pkgs/development/compilers/flutter/patches/stable/move-cache.patch b/pkgs/development/compilers/flutter/patches/stable/move-cache.patch
new file mode 100644
index 000000000000..e5719a2867f9
--- /dev/null
+++ b/pkgs/development/compilers/flutter/patches/stable/move-cache.patch
@@ -0,0 +1,63 @@
+diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart
+index 9fae74726..d88d6ecbb 100644
+--- a/dev/devicelab/lib/framework/runner.dart
++++ b/dev/devicelab/lib/framework/runner.dart
+@@ -126,7 +126,7 @@ Future<void> cleanupSystem() async {
+     print('\nTelling Gradle to shut down (JAVA_HOME=$javaHome)');
+     final String gradlewBinaryName = Platform.isWindows ? 'gradlew.bat' : 'gradlew';
+     final Directory tempDir = Directory.systemTemp.createTempSync('flutter_devicelab_shutdown_gradle.');
+-    recursiveCopy(Directory(path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'gradle_wrapper')), tempDir);
++    recursiveCopy(Directory(path.join(homeDirPath, '.cache', 'flutter', 'artifacts', 'gradle_wrapper')), tempDir);
+     copy(File(path.join(path.join(flutterDirectory.path, 'packages', 'flutter_tools'), 'templates', 'app', 'android.tmpl', 'gradle', 'wrapper', 'gradle-wrapper.properties')), Directory(path.join(tempDir.path, 'gradle', 'wrapper')));
+     if (!Platform.isWindows) {
+       await exec(
+diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart
+index e6216c737..5ab497092 100644
+--- a/packages/flutter_tools/lib/src/asset.dart
++++ b/packages/flutter_tools/lib/src/asset.dart
+@@ -6,6 +6,7 @@ import 'dart:async';
+ 
+ import 'package:yaml/yaml.dart';
+ 
++import 'base/common.dart';
+ import 'base/context.dart';
+ import 'base/file_system.dart';
+ import 'base/platform.dart';
+@@ -326,7 +327,7 @@ List<_Asset> _getMaterialAssets(String fontSet) {
+     for (Map<dynamic, dynamic> font in family['fonts']) {
+       final Uri entryUri = fs.path.toUri(font['asset'] as String);
+       result.add(_Asset(
+-        baseDir: fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'),
++        baseDir: fs.path.join(homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'),
+         relativeUri: Uri(path: entryUri.pathSegments.last),
+         entryUri: entryUri,
+       ));
+diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
+index 5e1950b56..45585f9c0 100644
+--- a/packages/flutter_tools/lib/src/cache.dart
++++ b/packages/flutter_tools/lib/src/cache.dart
+@@ -164,8 +164,14 @@ class Cache {
+       return;
+     }
+     assert(_lock == null);
++
++    final Directory dir = fs.directory(fs.path.join(homeDirPath, '.cache', 'flutter'));
++    if (!dir.existsSync()) {
++      dir.createSync(recursive: true);
++      os.chmod(dir, '755');
++    }
+     final File lockFile =
+-        fs.file(fs.path.join(flutterRoot, 'bin', 'cache', 'lockfile'));
++        fs.file(fs.path.join(homeDirPath, '.cache', 'flutter', 'lockfile'));
+     try {
+       _lock = lockFile.openSync(mode: FileMode.write);
+     } on FileSystemException catch (e) {
+@@ -239,7 +245,7 @@ class Cache {
+     if (_rootOverride != null) {
+       return fs.directory(fs.path.join(_rootOverride.path, 'bin', 'cache'));
+     } else {
+-      return fs.directory(fs.path.join(flutterRoot, 'bin', 'cache'));
++      return fs.directory(fs.path.join(homeDirPath, '.cache', 'flutter'));
+     }
+   }
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0341fd97bc0b..546c2a64b4e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8181,6 +8181,10 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
+  flutterPackages =
+    recurseIntoAttrs (callPackage ../development/compilers/flutter { });
+  flutter = flutterPackages.stable;
+
   fpc = callPackage ../development/compilers/fpc { };
 
   gambit = callPackage ../development/compilers/gambit { stdenv = gccStdenv; };

From 2a491a53c37766d9ee6eb86b7f213efa5636adc7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Mar 2020 22:35:13 +0000
Subject: [PATCH 4198/4636] python27Packages.fire: 0.2.1 -> 0.3.0

---
 pkgs/development/python-modules/fire/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fire/default.nix b/pkgs/development/python-modules/fire/default.nix
index 7af8d29fce73..0f0f0fd69ee7 100644
--- a/pkgs/development/python-modules/fire/default.nix
+++ b/pkgs/development/python-modules/fire/default.nix
@@ -3,13 +3,13 @@
 
 buildPythonPackage rec {
   pname = "fire";
-  version = "0.2.1";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "python-fire";
     rev = "v${version}";
-    sha256 = "1r6cmihafd7mb6j3mvgk251my6ckb0sqqj1l2ny2azklv175b38a";
+    sha256 = "1jwf1qv9xmr1c8nyvwqn02329vzyh9py4slx13n55ms8h1n998nr";
   };
 
   propagatedBuildInputs = [ six termcolor ] ++ stdenv.lib.optional isPy27 enum34;

From dda52a4571bc08ad8a6615ce4b87a51df7cf4b3d Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 27 Mar 2020 22:54:24 +0000
Subject: [PATCH 4199/4636] poetry2nix: 1.6.1 -> 1.7.0

---
 .../tools/poetry2nix/poetry2nix/bin/poetry2nix    | 15 ++++++++++-----
 .../tools/poetry2nix/poetry2nix/default.nix       |  3 ++-
 .../tools/poetry2nix/poetry2nix/mk-poetry-dep.nix |  2 ++
 .../tools/poetry2nix/poetry2nix/overrides.nix     |  6 ++++++
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix b/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix
index 95576b987f5c..5f9b21fc285a 100755
--- a/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix
@@ -8,11 +8,16 @@ import json
 import sys
 
 
-argparser = argparse.ArgumentParser(description="Generate overrides for git hashes",)
-argparser.add_argument(
+argparser = argparse.ArgumentParser(description="Poetry2nix CLI")
+
+subparsers = argparser.add_subparsers(dest="subcommand")
+subparsers.required = True
+
+parser_lock = subparsers.add_parser("lock", help="Generate overrides for git hashes",)
+parser_lock.add_argument(
     "--lock", default="poetry.lock", help="Path to input poetry.lock",
 )
-argparser.add_argument(
+parser_lock.add_argument(
     "--out", default="poetry-git-overlay.nix", help="Output file",
 )
 
@@ -92,7 +97,7 @@ if __name__ == "__main__":
 
         expr = "\n".join(lines)
 
-    with open(args.out, "w") as f:
-        f.write(expr)
+    with open(args.out, "w") as fout:
+        fout.write(expr)
 
     print(f"Wrote {args.out}")
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
index 3a104ba6eaa4..a63b3c5bdd46 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
@@ -7,7 +7,7 @@ let
   inherit (poetryLib) isCompatible readTOML;
 
   # Poetry2nix version
-  version = "1.6.1";
+  version = "1.7.0";
 
   /* The default list of poetry2nix override overlays */
   defaultPoetryOverrides = (import ./overrides.nix { inherit pkgs lib; });
@@ -79,6 +79,7 @@ let
                       source = pkgMeta.source or null;
                       files = lockFiles.${name};
                       pythonPackages = self;
+                      sourceSpec = pyProject.tool.poetry.dependencies.${name} or pyProject.tool.poetry.dev-dependencies.${name};
                     }
                   );
                 }
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
index 5f66d24d685c..5e71190d28fe 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix
@@ -14,6 +14,7 @@
 , pythonPackages
 , python-versions
 , pwd
+, sourceSpec
 , supportedExtensions ? lib.importJSON ./extensions.json
 , ...
 }:
@@ -147,6 +148,7 @@ pythonPackages.callPackage (
           builtins.fetchGit {
             inherit (source) url;
             rev = source.reference;
+            ref = sourceSpec.branch or sourceSpec.rev or sourceSpec.tag or "HEAD";
           }
         ) else if isLocal then (poetryLib.cleanPythonSources { src = localDepPath; }) else fetchFromPypi {
           pname = name;
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
index 18afac8147ce..bdbfb22a122e 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
@@ -104,6 +104,12 @@ self: super:
     }
   );
 
+  fastparquet = super.fastparquet.overrideAttrs (
+    old: {
+      buildInputs = old.buildInputs ++ [ self.pytest-runner ];
+    }
+  );
+
   grandalf = super.grandalf.overrideAttrs (
     old: {
       buildInputs = old.buildInputs ++ [ self.pytest-runner ];

From 181ab9ec0e22d5291eebef3fd8b2a0717a9e566c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Mar 2020 22:56:48 +0000
Subject: [PATCH 4200/4636] python37Packages.minidb: 2.0.2 -> 2.0.3

---
 pkgs/development/python-modules/minidb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/minidb/default.nix b/pkgs/development/python-modules/minidb/default.nix
index 3a65ef1028af..a324c8d7d08f 100644
--- a/pkgs/development/python-modules/minidb/default.nix
+++ b/pkgs/development/python-modules/minidb/default.nix
@@ -5,14 +5,14 @@
 
 buildPythonPackage rec {
   pname = "minidb";
-  version = "2.0.2";
+  version = "2.0.3";
   disabled = !isPy3k;
 
   src = fetchFromGitHub {
     owner = "thp";
     repo = "minidb";
     rev = version;
-    sha256 = "14y5vf8vhgviczhzy9h3xv99fjvrg975nz4w1fj5c1jv37da1lq3";
+    sha256 = "0c6y3x957pc5sxkl34lymhkwpn4nlsfw07fcv4y9p2zdb7kjd1gc";
   };
 
   # module imports are incompatible with python2

From 2f826a6705756cab0f7d7d07f920d6a38de7d540 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 27 Mar 2020 22:54:08 +0000
Subject: [PATCH 4201/4636] x42-autotune: init at 0.6.1

---
 .../audio/x42-autotune/default.nix            | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/audio/x42-autotune/default.nix

diff --git a/pkgs/applications/audio/x42-autotune/default.nix b/pkgs/applications/audio/x42-autotune/default.nix
new file mode 100644
index 000000000000..66f500edcd9c
--- /dev/null
+++ b/pkgs/applications/audio/x42-autotune/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, pkgconfig
+, cairo, fftwSinglePrec, libGLU, libjack2, lv2, pango
+}:
+
+stdenv.mkDerivation rec {
+  pname = "x42-autotune";
+  version = "0.6.1";
+
+  src = fetchFromGitHub {
+    owner = "x42";
+    repo = "fat1.lv2";
+    rev = "v${version}";
+    sha256 = "0kz7fr7r3hrzqk9mzd2gdrmd4vdnbhx6n440mishcd9pay5i81aa";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ cairo fftwSinglePrec libGLU libjack2 lv2 pango ];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Auto-tuner (aka fat1.lv2) based on Fons Adriaensen's zita-at1";
+    homepage = https://x42-plugins.com/x42/x42-autotune;
+    maintainers = with maintainers; [ orivej ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd608fab5374..5c637c4d4318 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22860,6 +22860,8 @@ in
 
   x32edit = callPackage ../applications/audio/midas/x32edit.nix {};
 
+  x42-autotune = callPackage ../applications/audio/x42-autotune { };
+
   x42-plugins = callPackage ../applications/audio/x42-plugins { };
 
   xannotate = callPackage ../tools/X11/xannotate {};

From 5b49816cf4d1e87ab3cc64b6a7a6749f51ff9b3a Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Sat, 28 Mar 2020 00:05:50 +0100
Subject: [PATCH 4202/4636] treewide: add quotes to recently-changed urls

Co-Authored-By: Drew <drewrisinger@users.noreply.github.com>
---
 pkgs/applications/audio/MMA/default.nix                      | 2 +-
 pkgs/applications/audio/traverso/default.nix                 | 2 +-
 pkgs/applications/editors/flpsed/default.nix                 | 2 +-
 pkgs/applications/radio/gqrx/default.nix                     | 2 +-
 pkgs/development/compilers/purescript/purescript/default.nix | 2 +-
 pkgs/development/libraries/openldap/default.nix              | 2 +-
 pkgs/development/ocaml-modules/ppx_tools/default.nix         | 2 +-
 pkgs/development/python-modules/moviepy/default.nix          | 2 +-
 pkgs/development/tools/build-managers/dub/default.nix        | 3 +--
 pkgs/misc/emulators/vbam/default.nix                         | 2 +-
 pkgs/misc/frescobaldi/default.nix                            | 2 +-
 pkgs/os-specific/linux/apparmor/default.nix                  | 2 +-
 12 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix
index 1b13b11a0157..8b7629bc908b 100644
--- a/pkgs/applications/audio/MMA/default.nix
+++ b/pkgs/applications/audio/MMA/default.nix
@@ -61,7 +61,7 @@
 
   meta = {
     description = "Creates MIDI tracks for a soloist to perform over from a user supplied file containing chords";
-    homepage =  https://www.mellowood.ca/mma/index.html;
+    homepage =  "https://www.mellowood.ca/mma/index.html";
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.magnetophon ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix
index bbc5b4d4fd77..504e6ae96447 100644
--- a/pkgs/applications/audio/traverso/default.nix
+++ b/pkgs/applications/audio/traverso/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Cross-platform multitrack audio recording and audio editing suite";
-    homepage = https://traverso-daw.org/;
+    homepage = "https://traverso-daw.org/";
     license = with licenses; [ gpl2Plus lgpl21Plus ];
     platforms = platforms.all;
     maintainers = with maintainers; [ coconnor ];
diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix
index ec9143943fc0..3d6aac7e18e5 100644
--- a/pkgs/applications/editors/flpsed/default.nix
+++ b/pkgs/applications/editors/flpsed/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "WYSIWYG PostScript annotator";
-    homepage = https://flpsed.org/flpsed.html;
+    homepage = "https://flpsed.org/flpsed.html";
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ ];
diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix
index 0b65a407d9cc..f1a71804e3ff 100644
--- a/pkgs/applications/radio/gqrx/default.nix
+++ b/pkgs/applications/radio/gqrx/default.nix
@@ -38,7 +38,7 @@ mkDerivation rec {
       including Funcube Dongle Pro/Pro+, rtl-sdr, HackRF, and Universal
       Software Radio Peripheral (USRP) devices.
     '';
-    homepage = https://gqrx.dk/;
+    homepage = "https://gqrx.dk/";
     # Some of the code comes from the Cutesdr project, with a BSD license, but
     # it's currently unknown which version of the BSD license that is.
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix
index 1924c732b93f..6f61068738af 100644
--- a/pkgs/development/compilers/purescript/purescript/default.nix
+++ b/pkgs/development/compilers/purescript/purescript/default.nix
@@ -57,7 +57,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A strongly-typed functional programming language that compiles to JavaScript";
-    homepage = https://www.purescript.org/;
+    homepage = "https://www.purescript.org/";
     license = licenses.bsd3;
     maintainers = [ maintainers.justinwoo maintainers.mbbx6spp ];
     platforms = [ "x86_64-linux" "x86_64-darwin" ];
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index b956ba19655b..cc9e44d990dd 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage    = https://www.openldap.org/;
+    homepage = "https://www.openldap.org/";
     description = "An open source implementation of the Lightweight Directory Access Protocol";
     license = licenses.openldap;
     maintainers = with maintainers; [ lovek323 ];
diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix
index 551cfae1a741..a8d438d3731d 100644
--- a/pkgs/development/ocaml-modules/ppx_tools/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix
@@ -41,7 +41,7 @@ let src = fetchFromGitHub {
     pname = "ppx_tools";
     meta = with stdenv.lib; {
       description = "Tools for authors of ppx rewriters";
-      homepage = https://www.lexifi.com/ppx_tools;
+      homepage = "https://www.lexifi.com/ppx_tools";
       license = licenses.mit;
       maintainers = with maintainers; [ vbgl ];
     };
diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix
index 7f7c5ccc4d7e..d6b8b16cda9d 100644
--- a/pkgs/development/python-modules/moviepy/default.nix
+++ b/pkgs/development/python-modules/moviepy/default.nix
@@ -45,7 +45,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "Video editing with Python";
-    homepage = https://zulko.github.io/moviepy/;
+    homepage = "https://zulko.github.io/moviepy/";
     license = licenses.mit;
   };
 
diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix
index 110e6797a9d4..44c91e936097 100644
--- a/pkgs/development/tools/build-managers/dub/default.nix
+++ b/pkgs/development/tools/build-managers/dub/default.nix
@@ -67,10 +67,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Package and build manager for D applications and libraries";
-    homepage = https://code.dlang.org/;
+    homepage = "https://code.dlang.org/";
     license = licenses.mit;
     maintainers = with maintainers; [ ThomasMader ];
     platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
   };
 }
-
diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix
index 6e39b5054d1d..2aae72b3e206 100644
--- a/pkgs/misc/emulators/vbam/default.nix
+++ b/pkgs/misc/emulators/vbam/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     description = "A merge of the original Visual Boy Advance forks";
     license = licenses.gpl2;
     maintainers = with maintainers; [ lassulus ];
-    homepage = https://vba-m.com/;
+    homepage = "https://vba-m.com/";
     platforms = stdenv.lib.platforms.linux;
     badPlatforms = [ "aarch64-linux" ];
   };
diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix
index 45eab938d24d..bc4c29d5f2c7 100644
--- a/pkgs/misc/frescobaldi/default.nix
+++ b/pkgs/misc/frescobaldi/default.nix
@@ -28,7 +28,7 @@ buildPythonApplication rec {
   ];
 
   meta = with lib; {
-    homepage = https://frescobaldi.org/;
+    homepage = "https://frescobaldi.org/";
     description = ''Frescobaldi is a LilyPond sheet music text editor'';
     longDescription = ''
       Powerful text editor with syntax highlighting and automatic completion, 
diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix
index 8f4db8aca449..ed6a64a25ee8 100644
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@@ -18,7 +18,7 @@ let
   apparmor-version = apparmor-series + "." + apparmor-patchver;
 
   apparmor-meta = component: with stdenv.lib; {
-    homepage = https://apparmor.net/;
+    homepage = "https://apparmor.net/";
     description = "A mandatory access control system - ${component}";
     license = licenses.gpl2;
     maintainers = with maintainers; [ phreedom thoughtpolice joachifm ];

From 84c2856760533e0b61054ab14e532bc7c15b7ae7 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Sat, 28 Mar 2020 00:06:12 +0100
Subject: [PATCH 4203/4636] Apply suggestions from code review

Co-Authored-By: Drew <drewrisinger@users.noreply.github.com>
---
 pkgs/applications/misc/devilspie2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix
index f9c420a60de6..2961baee1024 100644
--- a/pkgs/applications/misc/devilspie2/default.nix
+++ b/pkgs/applications/misc/devilspie2/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       positioned at a specific screen position, or position a window
       on a specific workspace.
     '';
-    homepage = https://www.gusnan.se/devilspie2/;
+    homepage = "https://www.gusnan.se/devilspie2/";
     license = licenses.gpl3;
     maintainers = [ maintainers.ebzzry ];
     platforms = platforms.linux;

From 0b1e4118b40c5c7daaa160fe353ec4001f80d83e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Mar 2020 23:45:02 +0000
Subject: [PATCH 4204/4636] python27Packages.mayavi: 4.7.0 -> 4.7.1

---
 pkgs/development/python-modules/mayavi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix
index d7a821915f20..ffdf97475837 100644
--- a/pkgs/development/python-modules/mayavi/default.nix
+++ b/pkgs/development/python-modules/mayavi/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "mayavi";
-  version = "4.7.0";
+  version = "4.7.1";
 
   src = fetchPypi {
     inherit pname version;
     extension = "tar.bz2";
-    sha256 = "02rg4j1vkny2piqn3f728kg34m54kgx396g6h5y7ykz2lk3f3h44";
+    sha256 = "095p7mds6kqqrp7xqv24iygr3mw85rm7x41wb5y4yc3gi1pznldy";
   };
 
   # Discovery of 'vtk' in setuptools is not working properly, due to a missing
@@ -30,7 +30,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "3D visualization of scientific data in Python";
-    homepage = https://github.com/enthought/mayavi;
+    homepage = "https://github.com/enthought/mayavi";
     maintainers = with stdenv.lib.maintainers; [ knedlsepp ];
     license = licenses.bsdOriginal;
   };

From 16cdff0711dc2871b49a1194efc3073aee6c7f04 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 27 Mar 2020 19:17:03 -0400
Subject: [PATCH 4205/4636] ion: 1.0.5 -> unstable-2020-03-22

The app is still maintained upstream, but they aren't cutting releases on
crates.io anymore:
https://crates.io/crates/ion-shell

This fixes the build with the latest Rust toolchain by upgrading to the current
commit off the project's `master`.

ZHF: #80379
---
 pkgs/shells/ion/default.nix | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix
index c58302df2102..ca2f7a6d515a 100644
--- a/pkgs/shells/ion/default.nix
+++ b/pkgs/shells/ion/default.nix
@@ -1,29 +1,24 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
-with rustPlatform;
-
-buildRustPackage rec {
+rustPlatform.buildRustPackage rec {
   pname = "ion";
-  version = "1.0.5";
+  version = "unstable-2020-03-22";
 
   src = fetchFromGitHub {
     owner = "redox-os";
     repo = "ion";
-    rev = version;
-    sha256 = "0i0acl5nw254mw8dbfmb4792rr71is98a5wg32yylfnlrk7zlf8z";
+    rev = "1fbd29a6d539faa6eb0f3186a361e208d0a0bc05";
+    sha256 = "0r5c87cs8jlc9kpb6bi2aypldw1lngf6gzjirf13gi7iy4q08ik7";
   };
 
-  cargoSha256 = "0f266kygvw2id771g49s25qsbqb6a0gr1r0czkcj96n5r0wg8wrn";
+  cargoSha256 = "1ph3r3vspy700mb8pica8478v9arqz07k2nzpbrdkdkqgfcwlgcg";
 
   meta = with stdenv.lib; {
     description = "Modern system shell with simple (and powerful) syntax";
-    homepage = https://github.com/redox-os/ion;
+    homepage = "https://gitlab.redox-os.org/redox-os/ion";
     license = licenses.mit;
     maintainers = with maintainers; [ dywedir ];
     platforms = platforms.all;
-    # This has not had a release since 2017, and no longer compiles with the
-    # latest Rust compiler.
-    broken = false;
   };
 
   passthru = {

From aa2552c6ced6eca62bbd7adcfcd5d65fede38731 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Fri, 27 Mar 2020 23:47:40 +0000
Subject: [PATCH 4206/4636] poetry2nix: 1.7.0 -> 1.7.1

---
 .../poetry2nix/poetry2nix/bin/poetry2nix      |  2 +-
 .../tools/poetry2nix/poetry2nix/default.nix   |  2 +-
 .../tools/poetry2nix/poetry2nix/overrides.nix | 98 +++++++++----------
 3 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix b/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix
index 5f9b21fc285a..355cebfd50c4 100755
--- a/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix
@@ -79,7 +79,7 @@ if __name__ == "__main__":
                 indent(
                     textwrap.dedent(
                         """
-              %s = super.%s.overrideAttrs (
+              %s = super.%s.overridePythonAttrs (
                 _: {
                   src = pkgs.fetchgit {
                     url = "%s";
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
index a63b3c5bdd46..e7f718519a59 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix
@@ -7,7 +7,7 @@ let
   inherit (poetryLib) isCompatible readTOML;
 
   # Poetry2nix version
-  version = "1.7.0";
+  version = "1.7.1";
 
   /* The default list of poetry2nix override overlays */
   defaultPoetryOverrides = (import ./overrides.nix { inherit pkgs lib; });
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
index bdbfb22a122e..8301dcd49b83 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
@@ -6,14 +6,14 @@
 self: super:
 
 {
-  astroid = super.astroid.overrideAttrs (
+  astroid = super.astroid.overridePythonAttrs (
     old: rec {
       buildInputs = old.buildInputs ++ [ self.pytest-runner ];
       doCheck = false;
     }
   );
 
-  av = super.av.overrideAttrs (
+  av = super.av.overridePythonAttrs (
     old: {
       nativeBuildInputs = old.nativeBuildInputs ++ [
         pkgs.pkgconfig
@@ -22,7 +22,7 @@ self: super:
     }
   );
 
-  bcrypt = super.bcrypt.overrideAttrs (
+  bcrypt = super.bcrypt.overridePythonAttrs (
     old: {
       buildInputs = old.buildInputs ++ [ pkgs.libffi ];
     }
@@ -31,14 +31,14 @@ self: super:
   cffi =
     # cffi is bundled with pypy
     if self.python.implementation == "pypy" then null else (
-      super.cffi.overrideAttrs (
+      super.cffi.overridePythonAttrs (
         old: {
           buildInputs = old.buildInputs ++ [ pkgs.libffi ];
         }
       )
     );
 
-  cftime = super.cftime.overrideAttrs (
+  cftime = super.cftime.overridePythonAttrs (
     old: {
       buildInputs = old.buildInputs ++ [
         self.cython
@@ -46,14 +46,14 @@ self: super:
     }
   );
 
-  cryptography = super.cryptography.overrideAttrs (
+  cryptography = super.cryptography.overridePythonAttrs (
     old: {
       buildInputs = old.buildInputs ++ [ pkgs.openssl ];
     }
   );
 
   django = (
-    super.django.overrideAttrs (
+    super.django.overridePythonAttrs (
       old: {
         propagatedNativeBuildInputs = (old.propagatedNativeBuildInputs or [])
         ++ [ pkgs.gettext ];
@@ -61,7 +61,7 @@ self: super:
     )
   );
 
-  django-bakery = super.django-bakery.overrideAttrs (
+  django-bakery = super.django-bakery.overridePythonAttrs (
     old: {
       configurePhase = ''
         if ! test -e LICENSE; then
@@ -71,7 +71,7 @@ self: super:
     }
   );
 
-  dlib = super.dlib.overrideAttrs (
+  dlib = super.dlib.overridePythonAttrs (
     old: {
       # Parallel building enabled
       inherit (pkgs.python.pkgs.dlib) patches;
@@ -87,14 +87,14 @@ self: super:
   # Environment markers are not always included (depending on how a dep was defined)
   enum34 = if self.pythonAtLeast "3.4" then null else super.enum34;
 
-  faker = super.faker.overrideAttrs (
+  faker = super.faker.overridePythonAttrs (
     old: {
       buildInputs = old.buildInputs ++ [ self.pytest-runner ];
       doCheck = false;
     }
   );
 
-  fancycompleter = super.fancycompleter.overrideAttrs (
+  fancycompleter = super.fancycompleter.overridePythonAttrs (
     old: {
       postPatch = ''
         substituteInPlace setup.py \
@@ -104,20 +104,20 @@ self: super:
     }
   );
 
-  fastparquet = super.fastparquet.overrideAttrs (
+  fastparquet = super.fastparquet.overridePythonAttrs (
     old: {
       buildInputs = old.buildInputs ++ [ self.pytest-runner ];
     }
   );
 
-  grandalf = super.grandalf.overrideAttrs (
+  grandalf = super.grandalf.overridePythonAttrs (
     old: {
       buildInputs = old.buildInputs ++ [ self.pytest-runner ];
       doCheck = false;
     }
   );
 
-  h5py = super.h5py.overrideAttrs (
+  h5py = super.h5py.overridePythonAttrs (
     old: rec {
       nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
       buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ];
@@ -128,20 +128,20 @@ self: super:
     }
   );
 
-  horovod = super.horovod.overrideAttrs (
+  horovod = super.horovod.overridePythonAttrs (
     old: {
       propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ];
     }
   );
 
   # importlib-metadata has an incomplete dependency specification
-  importlib-metadata = super.importlib-metadata.overrideAttrs (
+  importlib-metadata = super.importlib-metadata.overridePythonAttrs (
     old: {
       propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional self.python.isPy2 self.pathlib2;
     }
   );
 
-  jupyter = super.jupyter.overrideAttrs (
+  jupyter = super.jupyter.overridePythonAttrs (
     old: rec {
       # jupyter is a meta-package. Everything relevant comes from the
       # dependencies. It does however have a jupyter.py file that conflicts
@@ -150,7 +150,7 @@ self: super:
     }
   );
 
-  lap = super.lap.overrideAttrs (
+  lap = super.lap.overridePythonAttrs (
     old: {
       propagatedBuildInputs = old.propagatedBuildInputs ++ [
         self.numpy
@@ -158,7 +158,7 @@ self: super:
     }
   );
 
-  llvmlite = super.llvmlite.overrideAttrs (
+  llvmlite = super.llvmlite.overridePythonAttrs (
     old: {
       nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.llvm ];
 
@@ -181,26 +181,26 @@ self: super:
     }
   );
 
-  lockfile = super.lockfile.overrideAttrs (
+  lockfile = super.lockfile.overridePythonAttrs (
     old: {
       propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pbr ];
     }
   );
 
-  lxml = super.lxml.overrideAttrs (
+  lxml = super.lxml.overridePythonAttrs (
     old: {
       nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkgconfig libxml2.dev libxslt.dev ];
       buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ];
     }
   );
 
-  markupsafe = super.markupsafe.overrideAttrs (
+  markupsafe = super.markupsafe.overridePythonAttrs (
     old: {
       src = old.src.override { pname = builtins.replaceStrings [ "markupsafe" ] [ "MarkupSafe" ] old.pname; };
     }
   );
 
-  matplotlib = super.matplotlib.overrideAttrs (
+  matplotlib = super.matplotlib.overridePythonAttrs (
     old:
       let
         enableGhostscript = old.passthru.enableGhostscript or false;
@@ -241,14 +241,14 @@ self: super:
     preferWheel = true;
   };
 
-  mccabe = super.mccabe.overrideAttrs (
+  mccabe = super.mccabe.overridePythonAttrs (
     old: {
       buildInputs = old.buildInputs ++ [ self.pytest-runner ];
       doCheck = false;
     }
   );
 
-  netcdf4 = super.netcdf4.overrideAttrs (
+  netcdf4 = super.netcdf4.overridePythonAttrs (
     old: {
       buildInputs = old.buildInputs ++ [
         self.cython
@@ -271,7 +271,7 @@ self: super:
     }
   );
 
-  numpy = super.numpy.overrideAttrs (
+  numpy = super.numpy.overridePythonAttrs (
     old:
       let
         blas = old.passthru.args.blas or pkgs.openblasCompat;
@@ -305,7 +305,7 @@ self: super:
         }
   );
 
-  openexr = super.openexr.overrideAttrs (
+  openexr = super.openexr.overridePythonAttrs (
     old: rec {
       buildInputs = old.buildInputs ++ [ pkgs.openexr pkgs.ilmbase ];
       NIX_CFLAGS_COMPILE = [ "-I${pkgs.openexr.dev}/include/OpenEXR" "-I${pkgs.ilmbase.dev}/include/OpenEXR" ];
@@ -326,26 +326,26 @@ self: super:
         }
   );
 
-  pillow = super.pillow.overrideAttrs (
+  pillow = super.pillow.overridePythonAttrs (
     old: {
       nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs;
       buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs;
     }
   );
 
-  psycopg2 = super.psycopg2.overrideAttrs (
+  psycopg2 = super.psycopg2.overridePythonAttrs (
     old: {
       nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ];
     }
   );
 
-  psycopg2-binary = super.psycopg2-binary.overrideAttrs (
+  psycopg2-binary = super.psycopg2-binary.overridePythonAttrs (
     old: {
       nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ];
     }
   );
 
-  pyarrow = super.pyarrow.overrideAttrs (
+  pyarrow = super.pyarrow.overridePythonAttrs (
     old: {
       buildInputs = old.buildInputs ++ [
         self.cython
@@ -360,7 +360,7 @@ self: super:
           format = "other";
         }
       )
-    ).overrideAttrs (
+    ).overridePythonAttrs (
       old: {
 
         nativeBuildInputs = old.nativeBuildInputs ++ [
@@ -379,7 +379,7 @@ self: super:
     )
   ) super.pycairo;
 
-  pycocotools = super.pycocotools.overrideAttrs (
+  pycocotools = super.pycocotools.overridePythonAttrs (
     old: {
       buildInputs = old.buildInputs ++ [
         self.cython
@@ -388,21 +388,21 @@ self: super:
     }
   );
 
-  pygobject = super.pygobject.overrideAttrs (
+  pygobject = super.pygobject.overridePythonAttrs (
     old: {
       nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
       buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ];
     }
   );
 
-  pylint = super.pylint.overrideAttrs (
+  pylint = super.pylint.overridePythonAttrs (
     old: {
       buildInputs = old.buildInputs ++ [ self.pytest-runner ];
       doCheck = false;
     }
   );
 
-  pyopenssl = super.pyopenssl.overrideAttrs (
+  pyopenssl = super.pyopenssl.overridePythonAttrs (
     old: {
       buildInputs = old.buildInputs ++ [ pkgs.openssl ];
     }
@@ -509,7 +509,7 @@ self: super:
       }
     );
 
-  pytest-datadir = super.pytest-datadir.overrideAttrs (
+  pytest-datadir = super.pytest-datadir.overridePythonAttrs (
     old: {
       postInstall = ''
         rm -f $out/LICENSE
@@ -525,7 +525,7 @@ self: super:
 
   pytest-runner = super.pytest-runner or super.pytestrunner;
 
-  python-prctl = super.python-prctl.overrideAttrs (
+  python-prctl = super.python-prctl.overridePythonAttrs (
     old: {
       buildInputs = old.buildInputs ++ [
         pkgs.libcap
@@ -533,14 +533,14 @@ self: super:
     }
   );
 
-  pyzmq = super.pyzmq.overrideAttrs (
+  pyzmq = super.pyzmq.overridePythonAttrs (
     old: {
       nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
       propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ];
     }
   );
 
-  rockset = super.rockset.overrideAttrs (
+  rockset = super.rockset.overridePythonAttrs (
     old: rec {
       postPatch = ''
         cp ./setup_rockset.py ./setup.py
@@ -548,7 +548,7 @@ self: super:
     }
   );
 
-  scaleapi = super.scaleapi.overrideAttrs (
+  scaleapi = super.scaleapi.overridePythonAttrs (
     old: {
       postPatch = ''
         substituteInPlace setup.py --replace "install_requires = ['requests>=2.4.2', 'enum34']" "install_requires = ['requests>=2.4.2']" || true
@@ -556,7 +556,7 @@ self: super:
     }
   );
 
-  pandas = super.pandas.overrideAttrs (
+  pandas = super.pandas.overridePythonAttrs (
     old: {
       nativeBuildInputs = old.nativeBuildInputs ++ [ self.cython ];
     }
@@ -573,7 +573,7 @@ self: super:
     }
   );
 
-  scipy = super.scipy.overrideAttrs (
+  scipy = super.scipy.overridePythonAttrs (
     old: {
       nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ];
       propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pybind11 ];
@@ -607,7 +607,7 @@ self: super:
     }
   );
 
-  shapely = super.shapely.overrideAttrs (
+  shapely = super.shapely.overridePythonAttrs (
     old: {
       buildInputs = old.buildInputs ++ [ pkgs.geos self.cython ];
       inherit (pkgs.python3.pkgs.shapely) patches GEOS_LIBRARY_PATH;
@@ -622,7 +622,7 @@ self: super:
     )
   ) else super.shellingham;
 
-  tables = super.tables.overrideAttrs (
+  tables = super.tables.overridePythonAttrs (
     old: {
       HDF5_DIR = "${pkgs.hdf5}";
       nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
@@ -630,7 +630,7 @@ self: super:
     }
   );
 
-  tensorpack = super.tensorpack.overrideAttrs (
+  tensorpack = super.tensorpack.overridePythonAttrs (
     old: {
       postPatch = ''
         substituteInPlace setup.cfg --replace "# will call find_packages()" ""
@@ -638,7 +638,7 @@ self: super:
     }
   );
 
-  urwidtrees = super.urwidtrees.overrideAttrs (
+  urwidtrees = super.urwidtrees.overridePythonAttrs (
     old: {
       propagatedBuildInputs = old.propagatedBuildInputs ++ [
         self.urwid
@@ -646,7 +646,7 @@ self: super:
     }
   );
 
-  vose-alias-method = super.vose-alias-method.overrideAttrs (
+  vose-alias-method = super.vose-alias-method.overridePythonAttrs (
     old: {
       postInstall = ''
         rm -f $out/LICENSE
@@ -654,7 +654,7 @@ self: super:
     }
   );
 
-  uvloop = super.uvloop.overrideAttrs (
+  uvloop = super.uvloop.overridePythonAttrs (
     old: {
       buildInputs = old.buildInputs ++ lib.optionals stdenv.isDarwin [
         pkgs.darwin.apple_sdk.frameworks.ApplicationServices

From f76890fda4cbc4327c8df885469424b64270d700 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 27 Mar 2020 19:49:34 -0400
Subject: [PATCH 4207/4636] proj: use pname instead of name

---
 pkgs/development/libraries/proj/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix
index 41b6192a9ed3..fc0f1cf67a56 100644
--- a/pkgs/development/libraries/proj/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkg-config, sqlite, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "proj";
+  pname = "proj";
   version = "6.3.1";
 
   src = fetchFromGitHub {

From 14753000ed1a48634ffb4ce78860db96ac29d8c6 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 27 Mar 2020 23:57:06 +0000
Subject: [PATCH 4208/4636] x42-autotune: remove

It is a part of x42-plugins (under the name of x42-fat1).
---
 .../audio/x42-autotune/default.nix            | 33 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 35 deletions(-)
 delete mode 100644 pkgs/applications/audio/x42-autotune/default.nix

diff --git a/pkgs/applications/audio/x42-autotune/default.nix b/pkgs/applications/audio/x42-autotune/default.nix
deleted file mode 100644
index 66f500edcd9c..000000000000
--- a/pkgs/applications/audio/x42-autotune/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchFromGitHub, pkgconfig
-, cairo, fftwSinglePrec, libGLU, libjack2, lv2, pango
-}:
-
-stdenv.mkDerivation rec {
-  pname = "x42-autotune";
-  version = "0.6.1";
-
-  src = fetchFromGitHub {
-    owner = "x42";
-    repo = "fat1.lv2";
-    rev = "v${version}";
-    sha256 = "0kz7fr7r3hrzqk9mzd2gdrmd4vdnbhx6n440mishcd9pay5i81aa";
-    fetchSubmodules = true;
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cairo fftwSinglePrec libGLU libjack2 lv2 pango ];
-
-  makeFlags = [
-    "PREFIX=$(out)"
-  ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    description = "Auto-tuner (aka fat1.lv2) based on Fons Adriaensen's zita-at1";
-    homepage = https://x42-plugins.com/x42/x42-autotune;
-    maintainers = with maintainers; [ orivej ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c637c4d4318..cd608fab5374 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22860,8 +22860,6 @@ in
 
   x32edit = callPackage ../applications/audio/midas/x32edit.nix {};
 
-  x42-autotune = callPackage ../applications/audio/x42-autotune { };
-
   x42-plugins = callPackage ../applications/audio/x42-plugins { };
 
   xannotate = callPackage ../tools/X11/xannotate {};

From 8a43a2818a826081956ad91426a15cd527bbdf87 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 27 Mar 2020 23:30:33 +0000
Subject: [PATCH 4209/4636] x42-avldrums: init at 0.4.1

---
 .../audio/x42-avldrums/default.nix            | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/audio/x42-avldrums/default.nix

diff --git a/pkgs/applications/audio/x42-avldrums/default.nix b/pkgs/applications/audio/x42-avldrums/default.nix
new file mode 100644
index 000000000000..5de51e23d731
--- /dev/null
+++ b/pkgs/applications/audio/x42-avldrums/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, pkgconfig, cairo, glib, libGLU, lv2, pango }:
+
+stdenv.mkDerivation rec {
+  pname = "x42-avldrums";
+  version = "0.4.1";
+
+  src = fetchFromGitHub {
+    owner = "x42";
+    repo = "avldrums.lv2";
+    rev = "v${version}";
+    sha256 = "1vwdp3d8qzd493qa99ddya7iql67bbfxmbcl8hk96lxif2lhmyws";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ cairo glib libGLU lv2 pango ];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Drum sample player LV2 plugin dedicated to Glen MacArthur's AVLdrums";
+    homepage = https://x42-plugins.com/x42/x42-avldrums;
+    maintainers = with maintainers; [ orivej ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd608fab5374..bee539688b20 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22860,6 +22860,8 @@ in
 
   x32edit = callPackage ../applications/audio/midas/x32edit.nix {};
 
+  x42-avldrums = callPackage ../applications/audio/x42-avldrums { };
+
   x42-plugins = callPackage ../applications/audio/x42-plugins { };
 
   xannotate = callPackage ../tools/X11/xannotate {};

From 0dae508978e4bfcdbae4673cdf7adb9946eb9c1a Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 27 Mar 2020 23:38:43 +0000
Subject: [PATCH 4210/4636] x42-gmsynth: init at 0.4.1

---
 .../audio/x42-gmsynth/default.nix             | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/audio/x42-gmsynth/default.nix

diff --git a/pkgs/applications/audio/x42-gmsynth/default.nix b/pkgs/applications/audio/x42-gmsynth/default.nix
new file mode 100644
index 000000000000..33d61eeb35f6
--- /dev/null
+++ b/pkgs/applications/audio/x42-gmsynth/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, pkgconfig, glib, lv2 }:
+
+stdenv.mkDerivation rec {
+  pname = "x42-gmsynth";
+  version = "0.4.1";
+
+  src = fetchFromGitHub {
+    owner = "x42";
+    repo = "gmsynth.lv2";
+    rev = "v${version}";
+    sha256 = "08dvdj8r17sfl6l18g2b8abgls2irkbrq5vhrfai01hp2m0rlm34";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glib lv2 ];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Chris Colins' General User soundfont player LV2 plugin";
+    homepage = https://x42-plugins.com/x42/x42-gmsynth;
+    maintainers = with maintainers; [ orivej ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bee539688b20..bb99a1aa2b40 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22862,6 +22862,8 @@ in
 
   x42-avldrums = callPackage ../applications/audio/x42-avldrums { };
 
+  x42-gmsynth = callPackage ../applications/audio/x42-gmsynth { };
+
   x42-plugins = callPackage ../applications/audio/x42-plugins { };
 
   xannotate = callPackage ../tools/X11/xannotate {};

From c8dd834189492ea1a0b24695f71e3c6e0da31b94 Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Fri, 27 Mar 2020 16:19:55 -0400
Subject: [PATCH 4211/4636] pythonPackages.scikit-build: fix python3.8 bug

Python3.8 removes ``platform.linux_distribution()`` call,
must use ``pythonPackages.distro`` to get same information.
Closes #83305
Upstream PR: https://www.github.com/scikit-build/scikit-build/pull/458
Also formatting.
---
 .../python-modules/scikit-build/default.nix   | 69 ++++++++++++++++---
 1 file changed, 58 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix
index 8d459e249848..745723a01bc7 100644
--- a/pkgs/development/python-modules/scikit-build/default.nix
+++ b/pkgs/development/python-modules/scikit-build/default.nix
@@ -1,7 +1,28 @@
-{ lib, buildPythonPackage, fetchPypi, wheel, setuptools, packaging
-, cmake, ninja, cython, codecov, coverage, six, virtualenv, pathpy
-, pytest, pytestcov, pytest-virtualenv, pytest-mock, pytestrunner
-, requests, flake8 }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, fetchpatch
+, distro
+, packaging
+, setuptools
+, wheel
+# Test Inputs
+, cmake
+, codecov
+, coverage
+, cython
+, flake8
+, ninja
+, pathpy
+, pytest
+, pytestcov
+, pytest-mock
+, pytestrunner
+, pytest-virtualenv
+, requests
+, six
+, virtualenv
+}:
 
 buildPythonPackage rec {
   pname = "scikit-build";
@@ -12,15 +33,41 @@ buildPythonPackage rec {
     sha256 = "7342017cc82dd6178e3b19377389b8a8d1f8b429d9cdb315cfb1094e34a0f526";
   };
 
-  propagatedBuildInputs = [ wheel setuptools packaging ];
-  checkInputs = [ 
-    cmake ninja cython codecov coverage six pathpy
-    pytest pytestcov pytest-mock pytest-virtualenv pytestrunner
-    requests flake8
+  propagatedBuildInputs = [
+    distro
+    packaging
+    setuptools
+    wheel
+  ];
+  checkInputs = [
+    cmake
+    codecov
+    coverage
+    cython
+    flake8
+    ninja
+    pathpy
+    pytest
+    pytestcov
+    pytest-mock
+    pytestrunner
+    pytest-virtualenv
+    requests
+    six
+    virtualenv
   ];
 
   dontUseCmakeConfigure = true;
 
+  # scikit-build PR #458. Remove in version > 0.10.0
+  patches = [
+    (fetchpatch {
+      name = "python38-platform_linux_distribution-fix-458";
+      url = "https://github.com/scikit-build/scikit-build/commit/faa7284e5bc4c72bc8744987acdf3297b5d2e7e4.patch";
+      sha256 = "1hgl3cnkf266zaw534b64c88waxfz9721wha0m6j3hsnxk76ayjv";
+    })
+  ];
+
   disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) ([
     "test_hello_develop" # tries setuptools develop install
     "test_source_distribution" # pip has no way to install missing dependencies
@@ -35,9 +82,9 @@ buildPythonPackage rec {
   '';
 
   meta = with lib; {
-    homepage = http://scikit-build.org/;
     description = "Improved build system generator for CPython C/C++/Fortran/Cython extensions";
+    homepage = "http://scikit-build.org/";
     license = with licenses; [ mit bsd2 ]; # BSD due to reuses of PyNE code
-    maintainers = [ maintainers.FlorianFranzen ];
+    maintainers = with maintainers; [ FlorianFranzen ];
   };
 }

From a4a00ca3cc7da8248045fc4e47e8364538e6438a Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 27 Mar 2020 21:05:53 -0400
Subject: [PATCH 4212/4636] python3Packages.apache-airflow: no-op cleanups to
 drv file

Consistently indent with 2 spaces and cleanup the meta by quoting it for
https://github.com/NixOS/rfcs/pull/45
---
 .../python-modules/apache-airflow/default.nix | 61 +++++++++----------
 1 file changed, 30 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix
index 049db8a648fb..c45a73f24bfa 100644
--- a/pkgs/development/python-modules/apache-airflow/default.nix
+++ b/pkgs/development/python-modules/apache-airflow/default.nix
@@ -134,37 +134,36 @@ buildPythonPackage rec {
   ];
 
   postPatch = ''
+    substituteInPlace setup.py \
+      --replace "flask>=1.1.0, <2.0" "flask" \
+      --replace "jinja2>=2.10.1, <2.11.0" "jinja2" \
+      --replace "pandas>=0.17.1, <1.0.0" "pandas" \
+      --replace "flask-caching>=1.3.3, <1.4.0" "flask-caching" \
+      --replace "flask-appbuilder>=1.12.5, <2.0.0" "flask-appbuilder" \
+      --replace "pendulum==1.4.4" "pendulum" \
+      --replace "cached_property~=1.5" "cached_property" \
+      --replace "dill>=0.2.2, <0.3" "dill" \
+      --replace "configparser>=3.5.0, <3.6.0" "configparser" \
+      --replace "jinja2>=2.7.3, <=2.10.0" "jinja2" \
+      --replace "funcsigs==1.0.0" "funcsigs" \
+      --replace "flask-swagger==0.2.13" "flask-swagger" \
+      --replace "python-daemon>=2.1.1, <2.2" "python-daemon" \
+      --replace "alembic>=0.9, <1.0" "alembic" \
+      --replace "markdown>=2.5.2, <3.0" "markdown" \
+      --replace "future>=0.16.0, <0.17" "future" \
+      --replace "tenacity==4.12.0" "tenacity" \
+      --replace "text-unidecode==1.2" "text-unidecode" \
+      --replace "tzlocal>=1.4,<2.0.0" "tzlocal" \
+      --replace "sqlalchemy~=1.3" "sqlalchemy" \
+      --replace "gunicorn>=19.5.0, <20.0" "gunicorn" \
+      --replace "werkzeug>=0.14.1, <0.15.0" "werkzeug"
 
-   substituteInPlace setup.py \
-     --replace "flask>=1.1.0, <2.0" "flask" \
-     --replace "jinja2>=2.10.1, <2.11.0" "jinja2" \
-     --replace "pandas>=0.17.1, <1.0.0" "pandas" \
-     --replace "flask-caching>=1.3.3, <1.4.0" "flask-caching" \
-     --replace "flask-appbuilder>=1.12.5, <2.0.0" "flask-appbuilder" \
-     --replace "pendulum==1.4.4" "pendulum" \
-     --replace "cached_property~=1.5" "cached_property" \
-     --replace "dill>=0.2.2, <0.3" "dill" \
-     --replace "configparser>=3.5.0, <3.6.0" "configparser" \
-     --replace "jinja2>=2.7.3, <=2.10.0" "jinja2" \
-     --replace "funcsigs==1.0.0" "funcsigs" \
-     --replace "flask-swagger==0.2.13" "flask-swagger" \
-     --replace "python-daemon>=2.1.1, <2.2" "python-daemon" \
-     --replace "alembic>=0.9, <1.0" "alembic" \
-     --replace "markdown>=2.5.2, <3.0" "markdown" \
-     --replace "future>=0.16.0, <0.17" "future" \
-     --replace "tenacity==4.12.0" "tenacity" \
-     --replace "text-unidecode==1.2" "text-unidecode" \
-     --replace "tzlocal>=1.4,<2.0.0" "tzlocal" \
-     --replace "sqlalchemy~=1.3" "sqlalchemy" \
-     --replace "gunicorn>=19.5.0, <20.0" "gunicorn" \
-     --replace "werkzeug>=0.14.1, <0.15.0" "werkzeug"
+    # dumb-init is only needed for CI and Docker, not relevant for NixOS.
+    substituteInPlace setup.py \
+      --replace "'dumb-init>=1.2.2'," ""
 
-  # dumb-init is only needed for CI and Docker, not relevant for NixOS.
-  substituteInPlace setup.py \
-     --replace "'dumb-init>=1.2.2'," ""
-
-   substituteInPlace tests/core.py \
-     --replace "/bin/bash" "${stdenv.shell}"
+    substituteInPlace tests/core.py \
+      --replace "/bin/bash" "${stdenv.shell}"
   '';
 
   checkPhase = ''
@@ -184,8 +183,8 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Programmatically author, schedule and monitor data pipelines";
-    homepage = http://airflow.apache.org/;
+    homepage = "http://airflow.apache.org/";
     license = licenses.asl20;
-    maintainers = [ maintainers.costrouc maintainers.ingenieroariel ];
+    maintainers = with maintainers; [ costrouc ingenieroariel ];
   };
 }

From aed79fb5ee2e2c0f071b5587b5aeedf71cfd4745 Mon Sep 17 00:00:00 2001
From: Eduardo Quiros <eduardo@eduardoquiros.com>
Date: Mon, 3 Feb 2020 18:43:25 -0600
Subject: [PATCH 4213/4636] vimPlugins.vim-kitty-navigator: init at 2019-11-04

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 9d6a47e507db..4459d1bd152c 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -4480,6 +4480,17 @@ let
     };
   };
 
+  vim-kitty-navigator = buildVimPluginFrom2Nix {
+    pname = "vim-kitty-navigator";
+    version = "2019-11-04";
+    src = fetchFromGitHub {
+      owner = "knubie";
+      repo = "vim-kitty-navigator";
+      rev = "c32357892f10117291461631d51a6bfd20e72b9a";
+      sha256 = "0zqvcnbns0vbxkqr0mpiapql8cvp54nn5a6mwc7l24jr6plhiwmn";
+    };
+  };
+
   vim-lastplace = buildVimPluginFrom2Nix {
     pname = "vim-lastplace";
     version = "2020-01-20";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 0dc770ea29ef..5e8d3b91e19b 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -201,6 +201,7 @@ kchmck/vim-coffee-script
 KeitaNakamura/neodark.vim
 keith/swift.vim
 kien/rainbow_parentheses.vim
+knubie/vim-kitty-navigator
 konfekt/fastfold
 kristijanhusak/defx-git
 kristijanhusak/defx-icons

From 01740090598b8b89ffb5854ebab2159b14242d41 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Mar 2020 01:55:51 +0000
Subject: [PATCH 4214/4636] python27Packages.plumbum: 1.6.8 -> 1.6.9

---
 pkgs/development/python-modules/plumbum/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix
index d24b2dcafda8..796f94184978 100644
--- a/pkgs/development/python-modules/plumbum/default.nix
+++ b/pkgs/development/python-modules/plumbum/default.nix
@@ -5,7 +5,7 @@
 
 buildPythonPackage rec {
   pname = "plumbum";
-  version = "1.6.8";
+  version = "1.6.9";
 
   checkInputs = [ pytest ];
 
@@ -14,6 +14,6 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14mbyvc1y25lr72n1zh9ym5ngify7zdr57lxahidq03ycpwz4wc5";
+    sha256 = "1ps37vamqav6p277dlp51jnacd5q4x4z1x8y0nfjw3y8jsfy3f8n";
   };
 }
\ No newline at end of file

From e1d63ada025ac61d587bc21009539d4c1a388b74 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Thu, 20 Feb 2020 20:43:42 +0100
Subject: [PATCH 4215/4636] nginx: Fix ETag patch to ignore realpath(3) error

While our ETag patch works pretty fine if it comes to serving data off
store paths, it unfortunately broke something that might be a bit more
common, namely when using regexes to extract path components of
location directives for example.

Recently, @devhell has reported a bug with a nginx location directive
like this:

  location ~^/\~([a-z0-9_]+)(/.*)?$" {
    alias /home/$1/public_html$2;
  }

While this might look harmless at first glance, it does however cause
issues with our ETag patch. The alias directive gets broken up by nginx
like this:

  *2 http script copy: "/home/"
  *2 http script capture: "foo"
  *2 http script copy: "/public_html/"
  *2 http script capture: "bar.txt"

In our patch however, we use realpath(3) to get the canonicalised path
from ngx_http_core_loc_conf_s.root, which returns the *configured* value
from the root or alias directive. So in the example above, realpath(3)
boils down to the following syscalls:

  lstat("/home", {st_mode=S_IFDIR|0755, st_size=4096, ...}) = 0
  lstat("/home/$1", 0x7ffd08da6f60) = -1 ENOENT (No such file or directory)

During my review[1] of the initial patch, I didn't actually notice that
what we're doing here is returning NGX_ERROR if the realpath(3) call
fails, which in turn causes an HTTP 500 error.

Since our patch actually made the canonicalisation (and thus additional
syscalls) necessary, we really shouldn't introduce an additional error
so let's - at least for now - silently skip return value if realpath(3)
has failed.

However since we're using the unaltered root from the config we have
another issue, consider this root:

  /nix/store/...-abcde/$1

Calling realpath(3) on this path will fail (except if there's a file
called "$1" of course), so even this fix is not enough because it
results in the ETag not being set to the store path hash.

While this is very ugly and we should fix this very soon, it's not as
serious as getting HTTP 500 errors for serving static files.

I added a small NixOS VM test, which uses the example above as a
regression test.

It seems that my memory is failing these days, since apparently I *knew*
about this issue since digging for existing issues in nixpkgs, I found
this similar pull request which I even reviewed:

https://github.com/NixOS/nixpkgs/pull/66532

However, since the comments weren't addressed and the author hasn't
responded to the pull request, I decided to keep this very commit and do
a follow-up pull request.

[1]: https://github.com/NixOS/nixpkgs/pull/48337

Signed-off-by: aszlig <aszlig@nix.build>
Reported-by: @devhell
Acked-by: @7c6f434c
Acked-by: @yorickvP
Merges: https://github.com/NixOS/nixpkgs/pull/80671
Fixes: https://github.com/NixOS/nixpkgs/pull/66532
---
 nixos/tests/all-tests.nix                     |  1 +
 nixos/tests/nginx-pubhtml.nix                 | 20 +++++++++++++
 pkgs/servers/http/nginx/nix-etag-1.15.4.patch | 29 ++++++++++---------
 3 files changed, 36 insertions(+), 14 deletions(-)
 create mode 100644 nixos/tests/nginx-pubhtml.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 3501c551625d..d6b0cb42361c 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -211,6 +211,7 @@ in
   nghttpx = handleTest ./nghttpx.nix {};
   nginx = handleTest ./nginx.nix {};
   nginx-etag = handleTest ./nginx-etag.nix {};
+  nginx-pubhtml = handleTest ./nginx-pubhtml.nix {};
   nginx-sso = handleTest ./nginx-sso.nix {};
   nix-ssh-serve = handleTest ./nix-ssh-serve.nix {};
   nixos-generate-config = handleTest ./nixos-generate-config.nix {};
diff --git a/nixos/tests/nginx-pubhtml.nix b/nixos/tests/nginx-pubhtml.nix
new file mode 100644
index 000000000000..432913cb42d2
--- /dev/null
+++ b/nixos/tests/nginx-pubhtml.nix
@@ -0,0 +1,20 @@
+import ./make-test-python.nix {
+  name = "nginx-pubhtml";
+
+  machine = { pkgs, ... }: {
+    services.nginx.enable = true;
+    services.nginx.virtualHosts.localhost = {
+      locations."~ ^/\\~([a-z0-9_]+)(/.*)?$".alias = "/home/$1/public_html$2";
+    };
+    users.users.foo.isNormalUser = true;
+  };
+
+  testScript = ''
+    machine.wait_for_unit("nginx")
+    machine.wait_for_open_port(80)
+    machine.succeed("chmod 0711 /home/foo")
+    machine.succeed("su -c 'mkdir -p /home/foo/public_html' foo")
+    machine.succeed("su -c 'echo bar > /home/foo/public_html/bar.txt' foo")
+    machine.succeed('test "$(curl -fvvv http://localhost/~foo/bar.txt)" = bar')
+  '';
+}
diff --git a/pkgs/servers/http/nginx/nix-etag-1.15.4.patch b/pkgs/servers/http/nginx/nix-etag-1.15.4.patch
index c1473ccdb1b9..d001b842f335 100644
--- a/pkgs/servers/http/nginx/nix-etag-1.15.4.patch
+++ b/pkgs/servers/http/nginx/nix-etag-1.15.4.patch
@@ -2,38 +2,35 @@ This patch makes it possible to serve static content from Nix store paths, by
 using the hash of the store path for the ETag header.
 
 diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
-index cb49ef74..f88dc77c 100644
+index cb49ef74..7b456993 100644
 --- a/src/http/ngx_http_core_module.c
 +++ b/src/http/ngx_http_core_module.c
-@@ -1583,6 +1583,7 @@ ngx_http_set_etag(ngx_http_request_t *r)
+@@ -1583,6 +1583,8 @@ ngx_http_set_etag(ngx_http_request_t *r)
  {
      ngx_table_elt_t           *etag;
      ngx_http_core_loc_conf_t  *clcf;
 +    u_char                    *real, *ptr1, *ptr2;
++    ngx_err_t                 err;
  
      clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
  
-@@ -1598,16 +1599,62 @@ ngx_http_set_etag(ngx_http_request_t *r)
+@@ -1598,16 +1600,60 @@ ngx_http_set_etag(ngx_http_request_t *r)
      etag->hash = 1;
      ngx_str_set(&etag->key, "ETag");
  
 -    etag->value.data = ngx_pnalloc(r->pool, NGX_OFF_T_LEN + NGX_TIME_T_LEN + 3);
 -    if (etag->value.data == NULL) {
+-        etag->hash = 0;
+-        return NGX_ERROR;
++    err = ngx_errno;
 +    real = ngx_realpath(clcf->root.data, NULL);
++    ngx_set_errno(err);
 +
-+    if (real == NULL) {
-         etag->hash = 0;
-         return NGX_ERROR;
-     }
- 
--    etag->value.len = ngx_sprintf(etag->value.data, "\"%xT-%xO\"",
--                                  r->headers_out.last_modified_time,
--                                  r->headers_out.content_length_n)
--                      - etag->value.data;
 +    #define NIX_STORE_DIR "@nixStoreDir@"
 +    #define NIX_STORE_LEN @nixStoreDirLen@
 +
 +    if (r->headers_out.last_modified_time == 1
++        && real != NULL
 +        && !ngx_strncmp(real, NIX_STORE_DIR, NIX_STORE_LEN)
 +        && real[NIX_STORE_LEN] == '/'
 +        && real[NIX_STORE_LEN + 1] != '\0')
@@ -76,8 +73,12 @@ index cb49ef74..f88dc77c 100644
 +                                      r->headers_out.last_modified_time,
 +                                      r->headers_out.content_length_n)
 +                          - etag->value.data;
-+    }
-+
+     }
+ 
+-    etag->value.len = ngx_sprintf(etag->value.data, "\"%xT-%xO\"",
+-                                  r->headers_out.last_modified_time,
+-                                  r->headers_out.content_length_n)
+-                      - etag->value.data;
 +    ngx_free(real);
  
      r->headers_out.etag = etag;

From 49e252a46c3dd452b5e2ed4565dd11d6e2b2571d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Mar 2020 15:45:39 +0000
Subject: [PATCH 4216/4636] python3.pkgs.ciso8601: init at 2.1.3

---
 .../python-modules/ciso8601/default.nix       | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/python-modules/ciso8601/default.nix

diff --git a/pkgs/development/python-modules/ciso8601/default.nix b/pkgs/development/python-modules/ciso8601/default.nix
new file mode 100644
index 000000000000..d0de4b320e8d
--- /dev/null
+++ b/pkgs/development/python-modules/ciso8601/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytz
+, unittest2
+, isPy27
+}:
+
+buildPythonPackage rec {
+  pname = "ciso8601";
+  version = "2.1.3";
+
+  src = fetchFromGitHub {
+    owner = "closeio";
+    repo = "ciso8601";
+    rev = "v${version}";
+    sha256 = "0g1aiyc1ayh0rnibyy416m5mmck38ksgdm3jsy0z3rxgmgb24951";
+  };
+
+  checkInputs = [
+    pytz
+  ] ++ lib.optional (isPy27) unittest2;
+
+  meta = with lib; {
+    description = "Fast ISO8601 date time parser for Python written in C";
+    homepage = "https://github.com/closeio/ciso8601";
+    license = licenses.mit;
+    maintainers = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fcdae60e3130..25d816392a6c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -509,6 +509,8 @@ in {
 
   breezy = callPackage ../development/python-modules/breezy { };
 
+  ciso8601 = callPackage ../development/python-modules/ciso8601 { };
+
   deepdiff = callPackage ../development/python-modules/deepdiff { };
 
   django-sesame = callPackage ../development/python-modules/django-sesame { };

From f146d5fdbe53c2beee24be4a92e8b50eb15e04f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Mar 2020 16:01:06 +0000
Subject: [PATCH 4217/4636] home-assistant-frontend: 20200220.5 -> 20200318.0

---
 pkgs/servers/home-assistant/frontend.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 1446518fbc5c..04cef9fa6d72 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -4,11 +4,11 @@ buildPythonPackage rec {
   # the frontend version corresponding to a specific home-assistant version can be found here
   # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
   pname = "home-assistant-frontend";
-  version = "20200220.5";
+  version = "20200318.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0nc44r5ybq0prsz2yid622i0xr7q0qrc4ymbk69bqg6jrmjpbdl1";
+    sha256 = "15by4wd3lpq1pd0hpx04v827i3xywsvxziqb1qrbsraxh1rvsbhz";
   };
 
   # no Python tests implemented

From 3c85ed263dddee2bab311273a5b8e36be790bfc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Mar 2020 16:28:06 +0000
Subject: [PATCH 4218/4636] python3.pkgs.zeroconf: 0.24.4 -> 0.24.5

---
 pkgs/development/python-modules/zeroconf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix
index 622de68c6d4e..25382fa19ad1 100644
--- a/pkgs/development/python-modules/zeroconf/default.nix
+++ b/pkgs/development/python-modules/zeroconf/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "zeroconf";
-  version = "0.24.4";
+  version = "0.24.5";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f66d38f16026097572939ab78b1f46a97f556bca415491eb0fd094d0b5827dfe";
+    sha256 = "0jpgd0rk91si93857mjrizan5gc42kj1q4fi4160qgk68la88fl9";
   };
 
   propagatedBuildInputs = [ ifaddr ]

From 63749d8a18a0a21bfe7f63092ceec1958411087f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Mar 2020 17:01:51 +0000
Subject: [PATCH 4219/4636] python3.pkgs.pyicloud: 0.9.4 -> 0.9.5

---
 pkgs/development/python-modules/pyicloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix
index 7bc52f74701c..20fd48bcb2bd 100644
--- a/pkgs/development/python-modules/pyicloud/default.nix
+++ b/pkgs/development/python-modules/pyicloud/default.nix
@@ -15,11 +15,11 @@
 
 buildPythonPackage rec {
   pname = "pyicloud";
-  version = "0.9.4";
+  version = "0.9.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0r171wnq2g5bw7gd59vh6flm0104ix1a6s2vhdrf8s74hipw57si";
+    sha256 = "1c8sdlqcmpajcpf6jfpi6amncibm9c3zrl1860r0vfimps50m34h";
   };
 
   propagatedBuildInputs = [

From c646a568024223fca31dc619e1b119ba129bc6c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Mar 2020 17:03:11 +0000
Subject: [PATCH 4220/4636] python-jose: 3.0.1 -> 3.1.0

---
 pkgs/development/python-modules/python-jose/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix
index a9377c4a1c21..df7e07e55239 100644
--- a/pkgs/development/python-modules/python-jose/default.nix
+++ b/pkgs/development/python-modules/python-jose/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "python-jose";
-  version = "3.0.1";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "mpdavis";
     repo = "python-jose";
     rev = version;
-    sha256 = "1ahq4m86z504bnlk9z473r7r3dprg5m39900rld797hbczdhqa4f";
+    sha256 = "1gnn0zy03pywj65ammy3sd07knzhjv8n5jhx1ir9bikgra9v0iqh";
   };
 
   checkInputs = [

From 0d0a9776a273fa6156b8611169929c9e071e6c71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Mar 2020 17:02:39 +0000
Subject: [PATCH 4221/4636] python3.pkgs.pycognito: init at 0.1.2

---
 .../python-modules/pycognito/default.nix      | 46 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/python-modules/pycognito/default.nix

diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix
new file mode 100644
index 000000000000..afc607baa405
--- /dev/null
+++ b/pkgs/development/python-modules/pycognito/default.nix
@@ -0,0 +1,46 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, cryptography
+, boto3
+, envs
+, python-jose
+, requests
+, mock
+, isPy27
+}:
+
+buildPythonPackage rec {
+  pname = "pycognito";
+  version = "0.1.2";
+
+  src = fetchFromGitHub {
+    owner = "pvizeli";
+    repo = "pycognito";
+    rev = version;
+    sha256 = "01zns522awm5yp5cbk1y7k7px534i5akiivip709i1naph3hvnfk";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace 'python-jose[cryptography]' 'python-jose'
+  '';
+
+  propagatedBuildInputs = [
+    boto3
+    envs
+    python-jose
+    requests
+  ];
+
+  disabled = isPy27;
+
+  checkInputs = [ mock ];
+
+  meta = with lib; {
+    description = "Python class to integrate Boto3's Cognito client so it is easy to login users. With SRP support";
+    homepage = "https://GitHub.com/pvizeli/pycognito";
+    license = licenses.asl20;
+    maintainers = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 25d816392a6c..fd82fc21a0ea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -902,6 +902,8 @@ in {
     mpi = pkgs.openmpi;
   };
 
+  pycognito = callPackage ../development/python-modules/pycognito { };
+
   python-mpv-jsonipc = callPackage ../development/python-modules/python-mpv-jsonipc { };
 
   msal = callPackage ../development/python-modules/msal { };

From 808909d0db48b21784ba87ab23ad195c4bdf9d37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Mar 2020 17:03:58 +0000
Subject: [PATCH 4222/4636] hass-nabucasa: 0.31 -> 0.32.2

---
 .../python-modules/hass-nabucasa/default.nix       | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix
index 87a4a21568c8..e13cae339601 100644
--- a/pkgs/development/python-modules/hass-nabucasa/default.nix
+++ b/pkgs/development/python-modules/hass-nabucasa/default.nix
@@ -1,14 +1,16 @@
-{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, acme, aiohttp, snitun, attrs, pytest-aiohttp, warrant, pytest }:
+{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch
+, acme, aiohttp, snitun, attrs, pycognito, warrant
+, pytest-aiohttp, asynctest, pytest  }:
 
 buildPythonPackage rec {
   pname = "hass-nabucasa";
-  version = "0.31";
+  version = "0.32.2";
 
   src = fetchFromGitHub {
     owner = "nabucasa";
     repo = pname;
     rev = version;
-    sha256 = "0hxdvdj41gq5ryafjhrcgf6y8l33lyf45a1vgwwbk0q29sir9bnr";
+    sha256 = "1hfi5q222kgbgrj5yvr4lbhca49hcs6sc2yhxc4pjxqsc12bv1f1";
   };
 
   # upstreamed in https://github.com/NabuCasa/hass-nabucasa/pull/119
@@ -17,13 +19,13 @@ buildPythonPackage rec {
     cat setup.py
   '';
 
-  propagatedBuildInputs = [ acme aiohttp snitun attrs warrant ];
+  propagatedBuildInputs = [ acme aiohttp snitun attrs warrant pycognito ];
 
-  checkInputs = [ pytest pytest-aiohttp ];
+  checkInputs = [ pytest pytest-aiohttp asynctest ];
 
   checkPhase = ''
     pytest tests/
-    '';
+  '';
 
   meta = with lib; {
     homepage = "https://github.com/NabuCasa/hass-nabucasa";

From af2e41c4ddc311a21d6325798f77467615f9d4fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Mar 2020 15:24:35 +0000
Subject: [PATCH 4223/4636] home-assistant: 0.106.6 -> 0.107.0

---
 .../home-assistant/component-packages.nix     | 19 ++++++++++------
 pkgs/servers/home-assistant/default.nix       | 18 +++++++++------
 pkgs/servers/home-assistant/relax-deps.patch  | 13 +++++++++++
 .../relax-importlib-metadata-pyaml.patch      | 22 -------------------
 4 files changed, 36 insertions(+), 36 deletions(-)
 create mode 100644 pkgs/servers/home-assistant/relax-deps.patch
 delete mode 100644 pkgs/servers/home-assistant/relax-importlib-metadata-pyaml.patch

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 6b18dd30f308..d460251320af 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "0.106.6";
+  version = "0.107.0";
   components = {
     "abode" = ps: with ps; [ ]; # missing inputs: abodepy
     "acer_projector" = ps: with ps; [ pyserial];
@@ -55,9 +55,10 @@
     "aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy
     "auth" = ps: with ps; [ aiohttp-cors];
     "automatic" = ps: with ps; [ aiohttp-cors]; # missing inputs: aioautomatic
-    "automation" = ps: with ps; [ aiohttp-cors];
+    "automation" = ps: with ps; [ ];
     "avea" = ps: with ps; [ ]; # missing inputs: avea
     "avion" = ps: with ps; [ ]; # missing inputs: avion
+    "avri" = ps: with ps; [ ]; # missing inputs: avri-api
     "awair" = ps: with ps; [ ]; # missing inputs: python_awair
     "aws" = ps: with ps; [ ]; # missing inputs: aiobotocore
     "axis" = ps: with ps; [ ]; # missing inputs: axis
@@ -187,6 +188,7 @@
     "ecovacs" = ps: with ps; [ ]; # missing inputs: sucks
     "eddystone_temperature" = ps: with ps; [ construct]; # missing inputs: beacontools[scan]
     "edimax" = ps: with ps; [ ]; # missing inputs: pyedimax
+    "edl21" = ps: with ps; [ ]; # missing inputs: pysml
     "ee_brightbox" = ps: with ps; [ ]; # missing inputs: eebrightbox
     "efergy" = ps: with ps; [ ];
     "egardia" = ps: with ps; [ ]; # missing inputs: pythonegardia
@@ -217,6 +219,7 @@
     "eufy" = ps: with ps; [ ]; # missing inputs: lakeside
     "everlights" = ps: with ps; [ ]; # missing inputs: pyeverlights
     "evohome" = ps: with ps; [ ]; # missing inputs: evohome-async
+    "ezviz" = ps: with ps; [ ]; # missing inputs: pyezviz
     "facebook" = ps: with ps; [ ];
     "facebox" = ps: with ps; [ ];
     "fail2ban" = ps: with ps; [ ];
@@ -299,6 +302,7 @@
     "graphite" = ps: with ps; [ ];
     "greeneye_monitor" = ps: with ps; [ ]; # missing inputs: greeneye_monitor
     "greenwave" = ps: with ps; [ ]; # missing inputs: greenwavereality
+    "griddy" = ps: with ps; [ ]; # missing inputs: griddypower
     "group" = ps: with ps; [ ];
     "growatt_server" = ps: with ps; [ ]; # missing inputs: growattServer
     "gstreamer" = ps: with ps; [ ]; # missing inputs: gstreamer-player
@@ -307,7 +311,7 @@
     "hangouts" = ps: with ps; [ ]; # missing inputs: hangups
     "harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr
     "harmony" = ps: with ps; [ ]; # missing inputs: aioharmony
-    "hassio" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend
+    "hassio" = ps: with ps; [ aiohttp-cors];
     "haveibeenpwned" = ps: with ps; [ ];
     "hddtemp" = ps: with ps; [ ];
     "hdmi_cec" = ps: with ps; [ ]; # missing inputs: pyCEC
@@ -318,14 +322,13 @@
     "hikvisioncam" = ps: with ps; [ ]; # missing inputs: hikvision
     "hisense_aehw4a1" = ps: with ps; [ ]; # missing inputs: pyaehw4a1
     "history" = ps: with ps; [ aiohttp-cors sqlalchemy];
-    "history_graph" = ps: with ps; [ aiohttp-cors sqlalchemy];
     "history_stats" = ps: with ps; [ aiohttp-cors sqlalchemy];
     "hitron_coda" = ps: with ps; [ ];
     "hive" = ps: with ps; [ ]; # missing inputs: pyhiveapi
     "hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16
     "homeassistant" = ps: with ps; [ ];
     "homekit" = ps: with ps; [ ]; # missing inputs: HAP-python
-    "homekit_controller" = ps: with ps; [ ]; # missing inputs: homekit[IP]
+    "homekit_controller" = ps: with ps; [ ]; # missing inputs: aiohomekit[IP]
     "homematic" = ps: with ps; [ pyhomematic];
     "homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip
     "homeworks" = ps: with ps; [ ]; # missing inputs: pyhomeworks
@@ -342,6 +345,7 @@
     "hydrawise" = ps: with ps; [ ]; # missing inputs: hydrawiser
     "hyperion" = ps: with ps; [ ];
     "ialarm" = ps: with ps; [ ]; # missing inputs: pyialarm
+    "iammeter" = ps: with ps; [ ]; # missing inputs: iammeter
     "iaqualink" = ps: with ps; [ ]; # missing inputs: iaqualink
     "icloud" = ps: with ps; [ pyicloud];
     "idteck_prox" = ps: with ps; [ ]; # missing inputs: rfk101py
@@ -607,6 +611,7 @@
     "qnap" = ps: with ps; [ ]; # missing inputs: qnapstats
     "qrcode" = ps: with ps; [ pillow]; # missing inputs: pyzbar
     "quantum_gateway" = ps: with ps; [ ]; # missing inputs: quantum-gateway
+    "qvr_pro" = ps: with ps; [ ]; # missing inputs: pyqvrpro
     "qwikswitch" = ps: with ps; [ ]; # missing inputs: pyqwikswitch
     "rachio" = ps: with ps; [ aiohttp-cors]; # missing inputs: rachiopy
     "radarr" = ps: with ps; [ ];
@@ -652,7 +657,7 @@
     "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: home-assistant-frontend
     "saj" = ps: with ps; [ ]; # missing inputs: pysaj
     "salt" = ps: with ps; [ ]; # missing inputs: saltbox
-    "samsungtv" = ps: with ps; [ ]; # missing inputs: samsungctl[websocket]
+    "samsungtv" = ps: with ps; [ ]; # missing inputs: samsungctl[websocket] samsungtvws[websocket]
     "satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra
     "scene" = ps: with ps; [ ];
     "scrape" = ps: with ps; [ beautifulsoup4];
@@ -760,6 +765,7 @@
     "tado" = ps: with ps; [ ]; # missing inputs: python-tado
     "tahoma" = ps: with ps; [ ]; # missing inputs: tahoma-api
     "tank_utility" = ps: with ps; [ ]; # missing inputs: tank_utility
+    "tankerkoenig" = ps: with ps; [ ]; # missing inputs: pytankerkoenig
     "tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff
     "tautulli" = ps: with ps; [ ]; # missing inputs: pytautulli
     "tcp" = ps: with ps; [ ];
@@ -865,7 +871,6 @@
     "waze_travel_time" = ps: with ps; [ WazeRouteCalculator];
     "weather" = ps: with ps; [ ];
     "webhook" = ps: with ps; [ aiohttp-cors];
-    "weblink" = ps: with ps; [ ];
     "webostv" = ps: with ps; [ ]; # missing inputs: aiopylgtv
     "websocket_api" = ps: with ps; [ aiohttp-cors];
     "wemo" = ps: with ps; [ ]; # missing inputs: pywemo
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 2b571fe96bfc..c57c7118d403 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -67,7 +67,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.106.6";
+  hassVersion = "0.107.0";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -75,7 +75,9 @@ in with py.pkgs; buildPythonApplication rec {
 
   disabled = pythonOlder "3.5";
 
-  patches = [ ./relax-importlib-metadata-pyaml.patch ];
+  patches = [
+    ./relax-deps.patch
+  ];
 
   inherit availableComponents;
 
@@ -84,7 +86,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "11kv5lmm8nxp7yv3w43mzmgzkafddy0z6wl2878p96iyil1w7qhb";
+    sha256 = "080n4qsmzd8lxrh5dwby736jzzpnpirixsh0fby78dym4125ssm7";
   };
 
   propagatedBuildInputs = [
@@ -93,12 +95,12 @@ in with py.pkgs; buildPythonApplication rec {
     pyjwt cryptography pip python-slugify pytz pyyaml requests ruamel_yaml
     setuptools voluptuous voluptuous-serialize
     # From http, frontend and recorder components and auth.mfa_modules.totp
-    sqlalchemy aiohttp-cors hass-frontend pyotp pyqrcode
+    sqlalchemy aiohttp-cors hass-frontend pyotp pyqrcode ciso8601
   ] ++ componentBuildInputs ++ extraBuildInputs;
 
   checkInputs = [
     asynctest pytest pytest-aiohttp requests-mock pydispatcher aiohue netdisco
-    hass-nabucasa defusedxml
+    hass-nabucasa defusedxml zeroconf
   ];
 
   postPatch = ''
@@ -112,10 +114,12 @@ in with py.pkgs; buildPythonApplication rec {
     # - components' dependencies are not included, so they cannot be tested
     # - test_merge_id_schema requires pyqwikswitch
     # - unclear why test_merge fails: assert merge_log_err.call_count != 0
-    py.test --ignore tests/components -k "not test_merge_id_schema and not test_merge"
+    # - test_setup_safe_mode_if_no_frontend: requires dependencies for components we have not packaged
+    py.test --ignore tests/components -k "not test_setup_safe_mode_if_no_frontend and not test_merge_id_schema and not test_merge"
+
     # Some basic components should be tested however
     py.test \
-      tests/components/{api,config,configurator,demo,discovery,frontend,group,history,history_graph} \
+      tests/components/{api,config,configurator,demo,discovery,frontend,group,history} \
       tests/components/{homeassistant,http,logger,script,shell_command,system_log,websocket_api}
   '';
 
diff --git a/pkgs/servers/home-assistant/relax-deps.patch b/pkgs/servers/home-assistant/relax-deps.patch
new file mode 100644
index 000000000000..5d9716f0683c
--- /dev/null
+++ b/pkgs/servers/home-assistant/relax-deps.patch
@@ -0,0 +1,13 @@
+--- a/setup.py	2020-03-18 15:34:35.474693786 +0000
++++ b/setup.py	2020-03-18 15:49:07.185801916 +0000
+@@ -47,8 +47,8 @@
+     "pip>=8.0.3",
+     "python-slugify==4.0.0",
+     "pytz>=2019.03",
+-    "pyyaml==5.3",
+-    "requests==2.23.0",
++    "pyyaml>=5.2",
++    "requests>=2.22.0",
+     "ruamel.yaml==0.15.100",
+     "voluptuous==0.11.7",
+     "voluptuous-serialize==2.3.0",
diff --git a/pkgs/servers/home-assistant/relax-importlib-metadata-pyaml.patch b/pkgs/servers/home-assistant/relax-importlib-metadata-pyaml.patch
deleted file mode 100644
index d35e05c6cd78..000000000000
--- a/pkgs/servers/home-assistant/relax-importlib-metadata-pyaml.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 7f9155d9a..f90a0d965 100755
---- a/setup.py
-+++ b/setup.py
-@@ -38,7 +38,7 @@ REQUIRES = [
-     "attrs==19.3.0",
-     "bcrypt==3.1.7",
-     "certifi>=2019.11.28",
--    "importlib-metadata==1.5.0",
-+    "importlib-metadata>=1.3.0",
-     "jinja2>=2.10.3",
-     "PyJWT==1.7.1",
-     # PyJWT has loose dependency. We want the latest one.
-@@ -46,7 +46,7 @@ REQUIRES = [
-     "pip>=8.0.3",
-     "python-slugify==4.0.0",
-     "pytz>=2019.03",
--    "pyyaml==5.3",
-+    "pyyaml>=5.2",
-     "requests==2.22.0",
-     "ruamel.yaml==0.15.100",
-     "voluptuous==0.11.7",

From 698ec44e741e5ea5eedea186230f62d174118d1c Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 27 Mar 2020 22:24:15 -0400
Subject: [PATCH 4224/4636] treewide: remove torch and related packages

See #71888 for details.
---
 .../libraries/loadcaffe/default.nix           | 19 ------
 .../libraries/torch-hdf5/default.nix          | 19 ------
 pkgs/development/libraries/torch/default.nix  | 38 -----------
 .../graphics/fast-neural-doodle/default.nix   | 63 -------------------
 .../fast-neural-doodle/fast-neural-doodle.sh  | 28 ---------
 .../fast-neural-doodle/get-mask-hdf5.sh       |  5 --
 pkgs/tools/graphics/neural-style/default.nix  | 58 -----------------
 .../graphics/neural-style/neural-style.sh     | 25 --------
 pkgs/top-level/all-packages.nix               | 17 +----
 9 files changed, 1 insertion(+), 271 deletions(-)
 delete mode 100644 pkgs/development/libraries/loadcaffe/default.nix
 delete mode 100644 pkgs/development/libraries/torch-hdf5/default.nix
 delete mode 100644 pkgs/development/libraries/torch/default.nix
 delete mode 100644 pkgs/tools/graphics/fast-neural-doodle/default.nix
 delete mode 100644 pkgs/tools/graphics/fast-neural-doodle/fast-neural-doodle.sh
 delete mode 100644 pkgs/tools/graphics/fast-neural-doodle/get-mask-hdf5.sh
 delete mode 100644 pkgs/tools/graphics/neural-style/default.nix
 delete mode 100644 pkgs/tools/graphics/neural-style/neural-style.sh

diff --git a/pkgs/development/libraries/loadcaffe/default.nix b/pkgs/development/libraries/loadcaffe/default.nix
deleted file mode 100644
index c4e55b14407c..000000000000
--- a/pkgs/development/libraries/loadcaffe/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{stdenv, fetchFromGitHub, cmake, torch, protobuf, protobufc}:
-stdenv.mkDerivation rec {
-  pname = "loadcaffe";
-  version = "0.0pre2016.08.01";
-  buildInputs = [cmake torch protobuf protobufc];
-  src = fetchFromGitHub {
-    owner = "szagoruyko";
-    repo = "loadcaffe";
-    rev = "9be65cf6fa08e9333eae3553f68a8082debe9978";
-    sha256 = "0b22hvd9nvjsan2h93nl6y34kkkbs36d0k1zr3csjfb5l13xz0lh";
-  };
-  meta = {
-    inherit version;
-    description = ''Torch7 loader for Caffe networks'';
-    license = stdenv.lib.licenses.bsd2 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/torch-hdf5/default.nix b/pkgs/development/libraries/torch-hdf5/default.nix
deleted file mode 100644
index 6dd519441114..000000000000
--- a/pkgs/development/libraries/torch-hdf5/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{stdenv, fetchFromGitHub, torch, cmake, hdf5}:
-stdenv.mkDerivation rec {
-  pname = "torch-hdf5";
-  version = "0.0pre2016-07-01";
-  buildInputs = [cmake torch hdf5];
-  src = fetchFromGitHub {
-    owner = "deepmind";
-    repo = "torch-hdf5";
-    rev = "639bb4e62417ac392bf31a53cdd495d19337642b";
-    sha256 = "0x1si2c30d95vmw0xqyq242wghfih3m5i43785vwahlzm7h6n6xz";
-  };
-  meta = {
-    inherit version;
-    description = ''HDF5 format support for Torch'';
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/torch/default.nix b/pkgs/development/libraries/torch/default.nix
deleted file mode 100644
index b5cb0f76e9ff..000000000000
--- a/pkgs/development/libraries/torch/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{stdenv, fetchgit, luajit, openblas, imagemagick, cmake, curl, fftw, gnuplot
-  , libjpeg, zeromq3, ncurses, openssl, libpng, qt4, readline, unzip
-  , pkgconfig, zlib, libX11, which
-  }:
-stdenv.mkDerivation rec{
-  version = "0.0pre20160820";
-  pname = "torch";
-  buildInputs = [
-    luajit openblas imagemagick cmake curl fftw gnuplot unzip qt4
-    libjpeg zeromq3 ncurses openssl libpng readline pkgconfig
-    zlib libX11 which
-  ];
-
-  src = fetchgit {
-    url = "https://github.com/torch/distro";
-    rev = "8b6a834f8c8755f6f5f84ef9d8da9cfc79c5ce1f";
-    sha256 = "120hnz82d7izinsmv5smyqww71dhpix23pm43s522dfcglpql8xy";
-    fetchSubmodules = true;
-  };
-
-  buildPhase = ''
-    cd ..
-    export PREFIX=$out
-
-    mkdir "$out"
-    sh install.sh -s
-  '';
-  installPhase = ''
-  '';
-  meta = {
-    inherit version;
-    description = ''A scientific computing framework with wide support for machine learning algorithms'';
-    license = stdenv.lib.licenses.bsd3 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/tools/graphics/fast-neural-doodle/default.nix b/pkgs/tools/graphics/fast-neural-doodle/default.nix
deleted file mode 100644
index 17e1c710586b..000000000000
--- a/pkgs/tools/graphics/fast-neural-doodle/default.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{stdenv, fetchFromGitHub, fetchurl, torch, torch-hdf5, loadcaffe, bash
-  , python, numpy, scipy, h5py, scikitlearn, pillow
-  }:
-stdenv.mkDerivation rec {
-  pname = "fast-neural-doodle";
-  version = "0.0pre2016-07-01";
-  buildInputs = [
-    torch torch-hdf5 python numpy h5py scikitlearn scipy pillow
-  ];
-
-  inherit torch loadcaffe bash python;
-  torch_hdf5 = torch-hdf5;
-  python_libPrefix = python.libPrefix;
-
-  src = fetchFromGitHub {
-    owner = "DmitryUlyanov";
-    repo = "fast-neural-doodle";
-    rev = "00c35a4440d1d58b029d7bdf9bc56743b1a1835f";
-    sha256 = "0xhmhxhjm59pfjm2q27g2xfb35hg0vlqkk3sb3llx2qqq2c7jk8m";
-  };
-  models = [
-    (fetchurl {
-      url = "https://gist.githubusercontent.com/ksimonyan/3785162f95cd2d5fee77/raw/bb2b4fe0a9bb0669211cf3d0bc949dfdda173e9e/VGG_ILSVRC_19_layers_deploy.prototxt";
-      sha256 = "09cpz7pyvc8sypg2q5j2i8yqwj1sjdbnmd6skl293p9pv13dmjg7";
-    })
-    (fetchurl {
-      url = "https://bethgelab.org/media/uploads/deeptextures/vgg_normalised.caffemodel";
-      sha256 = "11qckdvlck7wwl3pan0nawgxm8l2ccddi272i5l8rs9qzm7b23rf";
-    })
-    (fetchurl {
-      url = "http://www.robots.ox.ac.uk/~vgg/software/very_deep/caffe/VGG_ILSVRC_19_layers.caffemodel";
-      sha256 = "0m399x7pl4lnhy435ycsyz8xpzapqmx9n1sz698y2vhcqhkwdd1i";
-    })
-  ];
-  installPhase = ''
-    mkdir -p "$out"/{doc/fast-neural-doodle,lib/lua/fast_neural_doodle,lib/${python.libPrefix}/fast_neural_doodle,bin}
-    cp -r data src fast_neural_doodle.lua "$out/lib/lua/fast_neural_doodle/"
-    for file in $models; do
-      ln -s "$file" "$out/lib/lua/fast_neural_doodle/data/pretrained/$(basename "$file" | sed -e 's/[^-]*-//')"
-    done;
-    cp get_mask_hdf5.py "$out/lib/${python.libPrefix}/fast_neural_doodle"
-    cp *.md LICENSE "$out/doc/fast-neural-doodle"
-
-    export pythonpath="$PYTHONPATH"
-
-    substituteAll "${./get-mask-hdf5.sh}" "$out/bin/get-mask-hdf5"
-    substituteAll "${./fast-neural-doodle.sh}" "$out/bin/fast-neural-doodle"
-
-    chmod a+x "$out/bin"/*
-
-    "$out/bin/get-mask-hdf5" --n_colors=4 --style_image data/Renoir/style.png --style_mask data/Renoir/style_mask.png --target_mask data/Renoir/target_mask.png --out_hdf5 masks.hdf5
-
-    "$out/bin/fast-neural-doodle" -gpu -1 -masks_hdf5 masks.hdf5 -num_iterations 1
-  '';
-  meta = {
-    inherit version;
-    description = ''Faster neural doodle'';
-    license = stdenv.lib.licenses.mit;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/tools/graphics/fast-neural-doodle/fast-neural-doodle.sh b/pkgs/tools/graphics/fast-neural-doodle/fast-neural-doodle.sh
deleted file mode 100644
index a089d5a95061..000000000000
--- a/pkgs/tools/graphics/fast-neural-doodle/fast-neural-doodle.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#! @bash@/bin/bash
-
-declare -a args
-c=1
-flag=
-
-for arg in "$@"; do
-        if test "$arg" = "${arg#-}" && test "$arg" = "${arg#/}" && test -n "$flag"; then
-                arg="$PWD/$arg"
-                flag=
-        elif (test "$arg" != "${arg%_image}" || test "$arg" == "-masks_hdf5") && test "$arg" != "${arg#-}"; then
-                flag=1
-        else
-                flag=
-        fi
-        args[c]="$arg";
-        c=$((c+1));
-done
-
-cd "@out@/lib/lua/fast_neural_doodle"
-
-export LUA_PATH="$LUA_PATH${LUA_PATH:+;}@loadcaffe@/lua/?/init.lua;@loadcaffe@/lua/?.lua"
-export LUA_PATH="$LUA_PATH${LUA_PATH:+;}@torch_hdf5@/lua/?/init.lua;@torch_hdf5@/lua/?.lua"
-export LUA_CPATH="$LUA_CPATH${LUA_CPATH:+;}@loadcaffe@/lib/?.so"
-
-set -x
-
-@torch@/bin/th fast_neural_doodle.lua "${args[@]}"
diff --git a/pkgs/tools/graphics/fast-neural-doodle/get-mask-hdf5.sh b/pkgs/tools/graphics/fast-neural-doodle/get-mask-hdf5.sh
deleted file mode 100644
index cfff76d141fb..000000000000
--- a/pkgs/tools/graphics/fast-neural-doodle/get-mask-hdf5.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#! @bash@/bin/bash
-
-export PYTHONPATH="@pythonpath@"
-
-@python@/bin/python "@out@/lib/@python_libPrefix@/fast_neural_doodle/get_mask_hdf5.py" "$@"
diff --git a/pkgs/tools/graphics/neural-style/default.nix b/pkgs/tools/graphics/neural-style/default.nix
deleted file mode 100644
index a4706e95ceef..000000000000
--- a/pkgs/tools/graphics/neural-style/default.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{stdenv, fetchFromGitHub, torch, loadcaffe, fetchurl, bash}:
-stdenv.mkDerivation rec {
-  pname = "neural-style";
-  version = "0.0pre2016.08.15";
-  buildInputs = [torch loadcaffe];
-  src = fetchFromGitHub {
-    owner = "jcjohnson";
-    repo = "neural-style";
-    rev = "ec5ba3a690d3090428d3b92b0c5d686a311bf432";
-    sha256 = "14qzbs9f95izvd0vbbirhymdw9pq2nw0jvhrh7vnyzr99xllwp02";
-  };
-  models = [
-    (fetchurl {
-      url = "https://gist.githubusercontent.com/ksimonyan/3785162f95cd2d5fee77/raw/bb2b4fe0a9bb0669211cf3d0bc949dfdda173e9e/VGG_ILSVRC_19_layers_deploy.prototxt";
-      sha256 = "09cpz7pyvc8sypg2q5j2i8yqwj1sjdbnmd6skl293p9pv13dmjg7";
-    })
-    (fetchurl {
-      url = "https://bethgelab.org/media/uploads/deeptextures/vgg_normalised.caffemodel";
-      sha256 = "11qckdvlck7wwl3pan0nawgxm8l2ccddi272i5l8rs9qzm7b23rf";
-    })
-    (fetchurl {
-      url = "http://www.robots.ox.ac.uk/~vgg/software/very_deep/caffe/VGG_ILSVRC_19_layers.caffemodel";
-      sha256 = "0m399x7pl4lnhy435ycsyz8xpzapqmx9n1sz698y2vhcqhkwdd1i";
-    })
-  ];
-  installPhase = ''
-    mkdir -p "$out"/{bin,lib/lua/neural-style/models,share/doc/neural-style,share/neural-style}
-    for file in $models; do
-      ln -s "$file" "$out/lib/lua/neural-style/models/$(basename "$file" | sed -e 's/[^-]*-//')"
-    done;
-    cp README* INSTALL* LICEN?E* "$out"/share/doc/neural-style/
-    cp neural_style.lua "$out"/lib/lua/neural-style
-
-    substituteAll "${./neural-style.sh}" "$out/bin/neural-style"
-    chmod a+x "$out/bin/neural-style"
-    cp "$out/bin/neural-style" .
-    cp "$out/lib/lua/neural-style/models/"* models/
-
-    echo "Testing..."
-
-    "$out/bin/neural-style" -style_image examples/inputs/golden_gate.jpg \
-      -content_image examples/inputs/golden_gate.jpg -output_image $PWD/test.png \
-      -gpu -1 -save_iter 1 -print_iter 1 -num_iterations 1 || true
-
-    cp -f "$out/lib/lua/neural-style/models/"* models/
-
-    test -e test.png || exit 1
-  '';
-  inherit torch bash loadcaffe;
-  meta = {
-    inherit version;
-    description = ''A torch implementation of the paper A Neural Algorithm of Artistic Style'';
-    license = stdenv.lib.licenses.mit ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    # Eats a lot of RAM
-    platforms = ["x86_64-linux"];
-  };
-}
diff --git a/pkgs/tools/graphics/neural-style/neural-style.sh b/pkgs/tools/graphics/neural-style/neural-style.sh
deleted file mode 100644
index 07a4d6dedc04..000000000000
--- a/pkgs/tools/graphics/neural-style/neural-style.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#! @bash@/bin/bash
-
-declare -a args
-c=1
-flag=
-
-for arg in "$@"; do
-        if test "$arg" = "${arg#-}" && test "$arg" = "${arg#/}" && test -n "$flag"; then
-                arg="$PWD/$arg"
-                flag=
-        elif test "$arg" != "${arg%_image}" && test "$arg" != "${arg#-}"; then
-                flag=1
-        else
-                flag=
-        fi
-        args[c]="$arg";
-        c=$((c+1));
-done
-
-cd "@out@/lib/lua/neural-style"
-
-export LUA_PATH="$LUA_PATH${LUA_PATH:+;}@loadcaffe@/lua/?/init.lua;@loadcaffe@/lua/?.lua"
-export LUA_CPATH="$LUA_CPATH${LUA_CPATH:+;}@loadcaffe@/lib/?.so"
-
-@torch@/bin/th neural_style.lua "${args[@]}"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb99a1aa2b40..6fb6ef95ef52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3313,11 +3313,6 @@ in
 
   fakechroot = callPackage ../tools/system/fakechroot { };
 
-  fast-neural-doodle = callPackage ../tools/graphics/fast-neural-doodle {
-    inherit (python27Packages) numpy scipy h5py scikitlearn python
-      pillow;
-  };
-
   fastpbkdf2 = callPackage ../development/libraries/fastpbkdf2 { };
 
   fanficfare = callPackage ../tools/text/fanficfare { };
@@ -5378,8 +5373,6 @@ in
 
   netcdffortran = callPackage ../development/libraries/netcdf-fortran { };
 
-  neural-style = callPackage ../tools/graphics/neural-style {};
-
   nco = callPackage ../development/libraries/nco { };
 
   ncftp = callPackage ../tools/networking/ncftp { };
@@ -13583,8 +13576,6 @@ in
 
   live555 = callPackage ../development/libraries/live555 { };
 
-  loadcaffe = callPackage ../development/libraries/loadcaffe {};
-
   log4cpp = callPackage ../development/libraries/log4cpp { };
 
   log4cxx = callPackage ../development/libraries/log4cxx { };
@@ -14816,12 +14807,6 @@ in
 
   tokyotyrant = callPackage ../development/libraries/tokyo-tyrant { };
 
-  torch = callPackage ../development/libraries/torch {
-    openblas = openblasCompat;
-  };
-
-  torch-hdf5 = callPackage ../development/libraries/torch-hdf5 {};
-
   totem-pl-parser = callPackage ../development/libraries/totem-pl-parser { };
 
   tpm2-tss = callPackage ../development/libraries/tpm2-tss { };
@@ -23714,7 +23699,7 @@ in
   multimc = libsForQt5.callPackage ../games/multimc { };
 
   inherit (callPackages ../games/minetest {
-	inherit (darwin) libiconv;
+    inherit (darwin) libiconv;
     inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa;
   })
     minetestclient_4 minetestserver_4

From da41b78db8ed662e6cb5fd33800aa6c8f3a6530f Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 27 Mar 2020 13:48:22 -0700
Subject: [PATCH 4225/4636] acme: fix darwin build

---
 pkgs/development/compilers/acme/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/compilers/acme/default.nix b/pkgs/development/compilers/acme/default.nix
index 2aca7478d7be..c5a997ad75bc 100644
--- a/pkgs/development/compilers/acme/default.nix
+++ b/pkgs/development/compilers/acme/default.nix
@@ -14,6 +14,11 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "BINDIR=$(out)/bin" ];
 
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "= gcc" "?= gcc"
+  '';
+
   meta = with stdenv.lib; {
     description = "A multi-platform cross assembler for 6502/6510/65816 CPUs.";
     homepage = "https://sourceforge.net/projects/acme-crossass/";

From a65e052e4c913af7ea765b06f5b44c6583299c99 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 27 Mar 2020 22:59:43 -0400
Subject: [PATCH 4226/4636] python38Packages.zetup: fix build

Currently fails to build on python 3.8 due to an overly restrictive version bound.

ZHF: #80379

CC @NixOS/nixos-release-managers
---
 pkgs/development/python-modules/zetup/default.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix
index eb3c5ff135ca..85e950b830e8 100644
--- a/pkgs/development/python-modules/zetup/default.nix
+++ b/pkgs/development/python-modules/zetup/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , setuptools_scm, pathpy, nbconvert
 , pytest }:
 
@@ -11,11 +11,10 @@ buildPythonPackage rec {
     sha256 = "b8a9bdcfa4b705d72b55b218658bc9403c157db7b57a14158253c98d03ab713d";
   };
 
-  # Python 3.7 compatibility
-  # See https://github.com/zimmermanncode/zetup/pull/1
+  # Python 3.8 compatibility
   postPatch = ''
     substituteInPlace zetup/zetup_config.py \
-      --replace "'3.6']" "'3.6', '3.7']"
+      --replace "'3.7']" "'3.7', '3.8']"
   '';
 
   checkPhase = ''
@@ -25,11 +24,9 @@ buildPythonPackage rec {
   checkInputs = [ pytest pathpy nbconvert ];
   propagatedBuildInputs = [ setuptools_scm ];
 
-  meta = with stdenv.lib; {
-    description = ''
-      Zimmermann's Extensible Tools for Unified Project setups
-    '';
-    homepage = https://github.com/zimmermanncode/zetup;
+  meta = with lib; {
+    description = "Zimmermann's Extensible Tools for Unified Project setups";
+    homepage = "https://github.com/zimmermanncode/zetup";
     license = licenses.gpl3Plus;
     platforms = platforms.unix;
   };

From d0f556a2ffbcecf0e2059a042947e6911bdd72ee Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 27 Mar 2020 12:58:33 -0700
Subject: [PATCH 4227/4636] onnxruntime: 1.1.2 -> 1.2.0

---
 pkgs/development/libraries/onnxruntime/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix
index ace08ef018a3..7d0a9342aa7b 100644
--- a/pkgs/development/libraries/onnxruntime/default.nix
+++ b/pkgs/development/libraries/onnxruntime/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "onnxruntime";
-  version = "1.1.2";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "onnxruntime";
     rev = "v${version}";
-    sha256 = "0chbn2wkl1w3msw0zscajinzlaaahg4w3lrpb2l8xgqdwbln0ckj";
+    sha256 = "1alhb7nvlxrr9yf757gs4hkzksbk3mxyv5zcmmpl82ibl65vh55k";
     # TODO: use nix-versions of grpc, onnx, eigen, googletest, etc.
     # submodules increase src size and compile times significantly
     # not currently feasible due to how integrated cmake build is with git

From 716aa1abdb1f277223e21679b3d4ef8dcebcf4b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 28 Mar 2020 03:05:28 +0000
Subject: [PATCH 4228/4636] curaengine-lulzbot: fix build

---
 pkgs/applications/misc/cura/lulzbot/curaengine.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/cura/lulzbot/curaengine.nix b/pkgs/applications/misc/cura/lulzbot/curaengine.nix
index aad9b9bee89f..14004474a21a 100644
--- a/pkgs/applications/misc/cura/lulzbot/curaengine.nix
+++ b/pkgs/applications/misc/cura/lulzbot/curaengine.nix
@@ -1,6 +1,6 @@
-{ stdenv, callPackage, fetchgit, fetchpatch, cmake, libarcusLulzbot, stb, protobuf }:
+{ gcc8Stdenv, callPackage, fetchgit, fetchpatch, cmake, libarcusLulzbot, stb, protobuf }:
 
-stdenv.mkDerivation rec {
+gcc8Stdenv.mkDerivation rec {
   pname = "curaengine-lulzBot";
   version = "3.6.21";
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DCURA_ENGINE_VERSION=${version}" ];
 
-  meta = with stdenv.lib; {
+  meta = with gcc8Stdenv.lib; {
     description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction";
     homepage = https://code.alephobjects.com/source/curaengine-lulzbot/;
     license = licenses.agpl3;
@@ -23,4 +23,3 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ chaduffy ];
   };
 }
-

From 3b7b98ce1e653db0123b7529a5a78961fa424fb3 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 27 Mar 2020 23:10:36 -0400
Subject: [PATCH 4229/4636] pythonPackages.effect: fix build by marking py3
 only

Upstream only supports python >= 3.6:
https://github.com/python-effect/effect/#effect

CC @NixOS/nixos-release-managers

ZHF: #80379
---
 pkgs/development/python-modules/effect/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/effect/default.nix b/pkgs/development/python-modules/effect/default.nix
index fec5518f0e80..67537dd1f48b 100644
--- a/pkgs/development/python-modules/effect/default.nix
+++ b/pkgs/development/python-modules/effect/default.nix
@@ -1,33 +1,40 @@
 { buildPythonPackage
 , fetchPypi
 , lib
+, isPy3k
 , six
 , attrs
 , pytest
 , testtools
 }:
+
 buildPythonPackage rec {
   version = "1.1.0";
   pname = "effect";
+  disabled = (!isPy3k);
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "7affb603707c648b07b11781ebb793a4b9aee8acf1ac5764c3ed2112adf0c9ea";
   };
+
   checkInputs = [
     pytest
     testtools
   ];
+
   propagatedBuildInputs = [
     six
     attrs
   ];
+
   checkPhase = ''
     pytest
   '';
+
   meta = with lib; {
     description = "Pure effects for Python";
-    homepage = https://github.com/python-effect/effect;
+    homepage = "https://github.com/python-effect/effect";
     license = licenses.mit;
   };
 }

From 3cff761a3566f7f5274d1c41b39ebf699da6129c Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Fri, 27 Mar 2020 14:33:01 +0100
Subject: [PATCH 4230/4636] jellyfin: 10.5.0 -> 10.5.2

---
 pkgs/servers/jellyfin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix
index 6cac79bdd4e2..3540db55d9a4 100644
--- a/pkgs/servers/jellyfin/default.nix
+++ b/pkgs/servers/jellyfin/default.nix
@@ -18,12 +18,12 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "jellyfin";
-  version = "10.5.0";
+  version = "10.5.2";
 
   # Impossible to build anything offline with dotnet
   src = fetchurl {
     url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz";
-    sha256 = "1r6ljl535f8jchm5zvrwfl4aqjk5bg7sqbwr03yyjxgriqgf36lp";
+    sha256 = "0qfllpvaa0br5nqpsxyfij0xh0z9zwijaa521r7wg4636pkllyjr";
   };
 
   buildInputs = [

From d80adaaf175a594052b08cb90c71cefc33a212e7 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 28 Mar 2020 04:29:12 +0000
Subject: [PATCH 4231/4636] pianobooster: 0.6.4b -> 0.7.2b

---
 .../audio/pianobooster/default.nix            | 42 ++++++++----------
 .../pianobooster-0.6.4b-cmake-gcc4.7.patch    | 11 -----
 .../pianobooster-0.6.4b-cmake.patch           | 44 -------------------
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 20 insertions(+), 79 deletions(-)
 delete mode 100644 pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake-gcc4.7.patch
 delete mode 100644 pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake.patch

diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix
index f2130fe55590..bbf64a4325b0 100644
--- a/pkgs/applications/audio/pianobooster/default.nix
+++ b/pkgs/applications/audio/pianobooster/default.nix
@@ -1,35 +1,31 @@
-{ stdenv, fetchurl, alsaLib, cmake, libGLU, libGL, makeWrapper, qt4 }:
+{ stdenv, fetchFromGitHub, cmake, pkg-config, qttools
+, alsaLib, ftgl, libGLU, libjack2, qtbase, rtmidi
+}:
 
-stdenv.mkDerivation  {
+stdenv.mkDerivation rec {
   pname = "pianobooster";
-  version = "0.6.4b";
+  version = "0.7.2b";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/pianobooster/pianobooster-src-0.6.4b.tar.gz";
-    sha256 = "1xwyap0288xcl0ihjv52vv4ijsjl0yq67scc509aia4plmlm6l35";
+  src = fetchFromGitHub {
+    owner = "captnfab";
+    repo = "PianoBooster";
+    rev = "v${version}";
+    sha256 = "03xcdnlpsij22ca3i6xj19yqzn3q2ch0d32r73v0c96nm04gvhjj";
   };
 
-  patches = [
-    ./pianobooster-0.6.4b-cmake.patch
-    ./pianobooster-0.6.4b-cmake-gcc4.7.patch
+  nativeBuildInputs = [ cmake pkg-config qttools ];
+
+  buildInputs = [ alsaLib ftgl libGLU libjack2 qtbase rtmidi ];
+
+  cmakeFlags = [
+    "-DOpenGL_GL_PREFERENCE=GLVND"
   ];
 
-  preConfigure = "cd src";
-
-  buildInputs = [ alsaLib cmake makeWrapper libGLU libGL qt4 ];
-  NIX_LDFLAGS = "-lGL -lpthread";
-
-  postInstall = ''
-    wrapProgram $out/bin/pianobooster \
-      --prefix LD_LIBRARY_PATH : ${libGL}/lib \
-      --prefix LD_LIBRARY_PATH : ${libGLU}/lib
-  '';
-
   meta = with stdenv.lib; {
     description = "A MIDI file player that teaches you how to play the piano";
-    homepage = http://pianobooster.sourceforge.net;
-    license = licenses.gpl3;
+    homepage = https://github.com/captnfab/PianoBooster;
+    license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
+    maintainers = with maintainers; [ goibhniu orivej ];
   };
 }
diff --git a/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake-gcc4.7.patch b/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake-gcc4.7.patch
deleted file mode 100644
index 2b1b28c5a849..000000000000
--- a/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake-gcc4.7.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pianobooster-src-0.6.4b/src/CMakeLists.txt.orig	2013-04-06 10:48:02.469532914 -0700
-+++ pianobooster-src-0.6.4b/src/CMakeLists.txt	2013-04-06 10:48:12.989532445 -0700
-@@ -203,8 +203,6 @@
-         ${PIANOBOOSTER_UI_HDRS} )
- ENDIF(WIN32)
- 
--SET_TARGET_PROPERTIES(pianobooster PROPERTIES LINK_FLAGS "-mwindows")
--
- IF (USE_PCH)
- ADD_PRECOMPILED_HEADER( pianobooster ${CMAKE_CURRENT_SOURCE_DIR}/precompile/precompile.h )
- ENDIF (USE_PCH)
diff --git a/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake.patch b/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake.patch
deleted file mode 100644
index 8cdd8738e2b3..000000000000
--- a/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- pianobooster-src-0.6.4b/src/CMakeLists.txt.orig
-+++ pianobooster-src-0.6.4b/src/CMakeLists.txt
-@@ -2,12 +2,6 @@
- # for the debug build type cmake -DCMAKE_BUILD_TYPE=Debug
- SET(CMAKE_BUILD_TYPE Release)
- SET(CMAKE_VERBOSE_MAKEFILE OFF)
--SET(USE_FLUIDSYNTH OFF)
--
--# The inplace directory is mainly for windows builds
--# SET(FLUIDSYNTH_INPLACE_DIR C:/download/misc/ljb/fluidsynth-1.0.9)
--SET(FLUIDSYNTH_INPLACE_DIR /home/louis/build/fluidsynth-1.0.9)
--
- 
- # Testing precompiled headers  it does not work -- leave as OFF.
- SET(USE_PCH OFF)
-@@ -78,18 +72,7 @@
-     ADD_DEFINITIONS(-DPB_USE_FLUIDSYNTH)
-     MESSAGE("Building using fluidsynth")
-     SET( PB_BASE_SRCS MidiDeviceFluidSynth.cpp )
--
--    IF(FLUIDSYNTH_INPLACE_DIR)
--        INCLUDE_DIRECTORIES(${FLUIDSYNTH_INPLACE_DIR}/include/)
--        IF(WIN32)
--            LINK_LIBRARIES( ${FLUIDSYNTH_INPLACE_DIR}/src/.libs/libfluidsynth.dll.a)
--        ENDIF(WIN32)
--        IF(UNIX)
--            LINK_LIBRARIES(${FLUIDSYNTH_INPLACE_DIR}/src/.libs/libfluidsynth.so)
--        ENDIF(UNIX)
--    ELSEIF(FLUIDSYNTH_INPLACE_DIR)
--        LINK_LIBRARIES( fluidsynth)
--    ENDIF(FLUIDSYNTH_INPLACE_DIR)
-+	LINK_LIBRARIES(fluidsynth)
- ENDIF(USE_FLUIDSYNTH)
- 
- 
-@@ -214,8 +197,6 @@
- INSTALL(TARGETS pianobooster RUNTIME DESTINATION bin)
- #INSTALL( index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en  SUBDIR kmidimon )
- 
--INSTALL( FILES ../README.txt  DESTINATION share/doc/pianobooster )
--
- INSTALL ( FILES images/pianobooster.png DESTINATION share/pixmaps )
- 
- 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb99a1aa2b40..df4637fa38d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21384,7 +21384,7 @@ in
 
   pianobar = callPackage ../applications/audio/pianobar { };
 
-  pianobooster = callPackage ../applications/audio/pianobooster { };
+  pianobooster = qt5.callPackage ../applications/audio/pianobooster { };
 
   picard = callPackage ../applications/audio/picard { };
 

From 6cf0bc1b5f4c7111a819282eae2fb198c8ac346f Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 28 Mar 2020 04:37:39 +0000
Subject: [PATCH 4232/4636] zita-ajbridge: init at 0.8.2

---
 pkgs/top-level/all-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df4637fa38d3..71ddbfcf72b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23162,6 +23162,8 @@ in
 
   zim = callPackage ../applications/office/zim { };
 
+  zita-ajbridge = callPackage ../applications/audio/zita-ajbridge { };
+
   zita-at1 = callPackage ../applications/audio/zita-at1 { };
 
   zita-njbridge = callPackage ../applications/audio/zita-njbridge { };

From 9cc44b7e33294ef2903c9f3f6b395180434eabbc Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Sat, 28 Mar 2020 00:42:22 +0000
Subject: [PATCH 4233/4636] home-assistant: 0.107.0 -> 0.107.7

---
 pkgs/servers/home-assistant/component-packages.nix | 8 ++++----
 pkgs/servers/home-assistant/default.nix            | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index d460251320af..22235bbd738d 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "0.107.0";
+  version = "0.107.7";
   components = {
     "abode" = ps: with ps; [ ]; # missing inputs: abodepy
     "acer_projector" = ps: with ps; [ pyserial];
@@ -456,7 +456,7 @@
     "melissa" = ps: with ps; [ ]; # missing inputs: py-melissa-climate
     "meraki" = ps: with ps; [ aiohttp-cors];
     "message_bird" = ps: with ps; [ ]; # missing inputs: messagebird
-    "met" = ps: with ps; [ ]; # missing inputs: pyMetno
+    "met" = ps: with ps; [ pymetno];
     "meteo_france" = ps: with ps; [ ]; # missing inputs: meteofrance vigilancemeteo
     "meteoalarm" = ps: with ps; [ ]; # missing inputs: meteoalertapi
     "metoffice" = ps: with ps; [ ]; # missing inputs: datapoint
@@ -521,7 +521,7 @@
     "nmbs" = ps: with ps; [ ]; # missing inputs: pyrail
     "no_ip" = ps: with ps; [ ];
     "noaa_tides" = ps: with ps; [ ]; # missing inputs: py_noaa
-    "norway_air" = ps: with ps; [ ]; # missing inputs: pyMetno
+    "norway_air" = ps: with ps; [ pymetno];
     "notify" = ps: with ps; [ ];
     "notion" = ps: with ps; [ ]; # missing inputs: aionotion
     "nsw_fuel_station" = ps: with ps; [ ]; # missing inputs: nsw-fuel-api-client
@@ -682,7 +682,7 @@
     "shopping_list" = ps: with ps; [ aiohttp-cors];
     "sht31" = ps: with ps; [ ]; # missing inputs: Adafruit-GPIO Adafruit-SHT31
     "sigfox" = ps: with ps; [ ];
-    "sighthound" = ps: with ps; [ ]; # missing inputs: simplehound
+    "sighthound" = ps: with ps; [ pillow]; # missing inputs: simplehound
     "signal_messenger" = ps: with ps; [ ]; # missing inputs: pysignalclirestapi
     "simplepush" = ps: with ps; [ ]; # missing inputs: simplepush
     "simplisafe" = ps: with ps; [ ]; # missing inputs: simplisafe-python
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index c57c7118d403..3b59ada0b9b3 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -67,7 +67,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.107.0";
+  hassVersion = "0.107.7";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -86,7 +86,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "080n4qsmzd8lxrh5dwby736jzzpnpirixsh0fby78dym4125ssm7";
+    sha256 = "1sr7vzsd4hpaix37bb10vbnnqs1v8ll2wb8m713qrvcp3crs6snk";
   };
 
   propagatedBuildInputs = [

From 5f8bf63a3ba22317af53cdd38386cdb78b963b6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 28 Mar 2020 04:55:32 +0000
Subject: [PATCH 4234/4636] Revert "zita-ajbridge: init at 0.8.2"

This reverts commit 6cf0bc1b5f4c7111a819282eae2fb198c8ac346f.

This breaks evaluation:
cc @orivej
---
 pkgs/top-level/all-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71ddbfcf72b2..df4637fa38d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23162,8 +23162,6 @@ in
 
   zim = callPackage ../applications/office/zim { };
 
-  zita-ajbridge = callPackage ../applications/audio/zita-ajbridge { };
-
   zita-at1 = callPackage ../applications/audio/zita-at1 { };
 
   zita-njbridge = callPackage ../applications/audio/zita-njbridge { };

From d5e41b6740c49246ff8e813c79dd0fdea510140b Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sat, 28 Mar 2020 00:59:13 -0400
Subject: [PATCH 4235/4636] bluejeans: apply nixpkgs-fmt

---
 .../instant-messengers/bluejeans/default.nix  | 66 +++++++++++++++++--
 1 file changed, 59 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
index 21b21e253499..155e6e273ee6 100644
--- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
@@ -1,6 +1,33 @@
-{ stdenv, fetchurl, rpmextract, patchelf, libnotify, libcap, cairo, pango, fontconfig, udev, dbus
-, gtk2, atk, expat, gdk-pixbuf, freetype, nspr, glib, nss, gconf, libX11, libXrender, libXtst, libXdamage
-, libXi, libXext, libXfixes, libXcomposite, alsaLib, bash
+{ stdenv
+, fetchurl
+, rpmextract
+, patchelf
+, libnotify
+, libcap
+, cairo
+, pango
+, fontconfig
+, udev
+, dbus
+, gtk2
+, atk
+, expat
+, gdk-pixbuf
+, freetype
+, nspr
+, glib
+, nss
+, gconf
+, libX11
+, libXrender
+, libXtst
+, libXdamage
+, libXi
+, libXext
+, libXfixes
+, libXcomposite
+, alsaLib
+, bash
 }:
 
 stdenv.mkDerivation rec {
@@ -17,10 +44,35 @@ stdenv.mkDerivation rec {
 
   libPath =
     stdenv.lib.makeLibraryPath
-       [ libnotify libcap cairo pango fontconfig gtk2 atk expat gdk-pixbuf dbus udev.lib
-         freetype nspr glib stdenv.cc stdenv.cc.cc.lib nss gconf libX11 libXrender libXtst libXdamage
-         libXi libXext libXfixes libXcomposite alsaLib
-       ];
+      [
+        libnotify
+        libcap
+        cairo
+        pango
+        fontconfig
+        gtk2
+        atk
+        expat
+        gdk-pixbuf
+        dbus
+        udev.lib
+        freetype
+        nspr
+        glib
+        stdenv.cc
+        stdenv.cc.cc.lib
+        nss
+        gconf
+        libX11
+        libXrender
+        libXtst
+        libXdamage
+        libXi
+        libXext
+        libXfixes
+        libXcomposite
+        alsaLib
+      ];
 
   buildCommand = ''
     mkdir -p $out/bin/

From 0df2d9f90038b0976b99cf179cdc1ded21701991 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sat, 28 Mar 2020 01:00:05 -0400
Subject: [PATCH 4236/4636] bluejeans: 1.36.9 -> 2.1.0

---
 .../instant-messengers/bluejeans/default.nix  | 73 ++++++++++++-------
 .../bluejeans/localtime64_stub.c              | 12 +++
 pkgs/top-level/all-packages.nix               |  6 +-
 3 files changed, 60 insertions(+), 31 deletions(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/bluejeans/localtime64_stub.c

diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
index 155e6e273ee6..14fbd4db1a00 100644
--- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
@@ -2,56 +2,65 @@
 , fetchurl
 , rpmextract
 , patchelf
+, patchelfUnstable
 , libnotify
-, libcap
+, libuuid
 , cairo
+, cups
 , pango
 , fontconfig
 , udev
 , dbus
-, gtk2
+, gtk3
 , atk
+, at-spi2-atk
 , expat
 , gdk-pixbuf
 , freetype
 , nspr
 , glib
 , nss
-, gconf
 , libX11
+, libXrandr
 , libXrender
 , libXtst
 , libXdamage
+, libxcb
+, libXcursor
 , libXi
 , libXext
 , libXfixes
+, libXft
 , libXcomposite
+, libXScrnSaver
 , alsaLib
-, bash
+, pulseaudio
+, makeWrapper
 }:
 
 stdenv.mkDerivation rec {
   pname = "bluejeans";
-  version = "1.36.9";
+  version = "2.1.0";
 
-  src =
-    fetchurl {
-      url = "https://swdl.bluejeans.com/desktop/linux/1.36/${version}/bluejeans-${version}.x86_64.rpm";
-      sha256 = "0sbv742pzqd2cxn3kq10lfi16jah486i9kyrmi8l1rpb9fhyw2m1";
-    };
+  src = fetchurl {
+    url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans.rpm";
+    sha256 = "1zhh0pla5gk75p8x84va9flvnk456pbcm1n6x8l82c9682fwr7dd";
+  };
 
-  nativeBuildInputs = [ patchelf rpmextract ];
+  nativeBuildInputs = [ rpmextract makeWrapper ];
 
   libPath =
     stdenv.lib.makeLibraryPath
       [
         libnotify
-        libcap
+        libuuid
         cairo
+        cups
         pango
         fontconfig
-        gtk2
+        gtk3
         atk
+        at-spi2-atk
         expat
         gdk-pixbuf
         dbus
@@ -59,41 +68,53 @@ stdenv.mkDerivation rec {
         freetype
         nspr
         glib
-        stdenv.cc
         stdenv.cc.cc.lib
         nss
-        gconf
         libX11
+        libXrandr
         libXrender
         libXtst
         libXdamage
+        libxcb
+        libXcursor
         libXi
         libXext
         libXfixes
+        libXft
         libXcomposite
+        libXScrnSaver
         alsaLib
+        pulseaudio
       ];
 
+  localtime64_stub = ./localtime64_stub.c;
+
   buildCommand = ''
     mkdir -p $out/bin/
     cd $out
     rpmextract $src
-    patchelf \
+    mv usr/share share
+    rmdir usr
+
+    ${patchelf}/bin/patchelf \
       --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-      opt/bluejeans/bluejeans-bin
-    patchelf \
-      --set-rpath ${libPath} \
-      opt/bluejeans/bluejeans-bin
-    patchelf \
       --replace-needed libudev.so.0 libudev.so.1 \
-      opt/bluejeans/bluejeans-bin
-    ln -s $out/opt/bluejeans/bluejeans $out/bin/bluejeans
-    chmod +x $out/bin/bluejeans
-    patchShebangs $out
+      opt/BlueJeans/bluejeans-v2
+    ${patchelfUnstable}/bin/patchelf \
+      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+      opt/BlueJeans/resources/BluejeansHelper
+
+    cc $localtime64_stub -shared -o "$out"/opt/BlueJeans/liblocaltime64_stub.so
+
+    makeWrapper $out/opt/BlueJeans/bluejeans-v2 $out/bin/bluejeans \
+      --set LD_LIBRARY_PATH "${libPath}":"${placeholder "out"}"/opt/BlueJeans \
+      --set LD_PRELOAD "$out"/opt/BlueJeans/liblocaltime64_stub.so
+
+    patchShebangs "$out"
   '';
 
   meta = with stdenv.lib; {
-    description = "Video, audio, and web conferencing that works together with the collaboration tools you use every day.";
+    description = "Video, audio, and web conferencing that works together with the collaboration tools you use every day";
     homepage = "https://www.bluejeans.com";
     license = licenses.unfree;
     maintainers = with maintainers; [ veprbl ];
diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/localtime64_stub.c b/pkgs/applications/networking/instant-messengers/bluejeans/localtime64_stub.c
new file mode 100644
index 000000000000..87c2fa11714c
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/bluejeans/localtime64_stub.c
@@ -0,0 +1,12 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+void *localtime64() {
+  fprintf(stderr, "nixpkgs: call into localtime64_r\n");
+  abort();
+}
+
+void *localtime64_r() {
+  fprintf(stderr, "nixpkgs: call into localtime64_r\n");
+  abort();
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df4637fa38d3..3e5cd6662ed8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18773,11 +18773,7 @@ in
 
   bluejeans = callPackage ../applications/networking/browsers/mozilla-plugins/bluejeans { };
 
-  bluejeans-gui = callPackage ../applications/networking/instant-messengers/bluejeans {
-    gconf = pkgs.gnome2.GConf;
-    inherit (pkgs.xorg) libX11 libXrender libXtst libXdamage
-                        libXi libXext libXfixes libXcomposite;
-  };
+  bluejeans-gui = callPackage ../applications/networking/instant-messengers/bluejeans { };
 
   blugon = callPackage ../applications/misc/blugon { };
 

From d2377446f49d3cb99128e238a655b05c75d7fb9b Mon Sep 17 00:00:00 2001
From: Imran Hossain <contact@imranhossa.in>
Date: Wed, 25 Mar 2020 22:45:33 -0400
Subject: [PATCH 4237/4636] python3Packages.prompt_toolkit: 2.0.10 -> 3.0.4

---
 pkgs/development/python-modules/prompt_toolkit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt_toolkit/default.nix
index dd3c8d16a51e..4ef7f2213664 100644
--- a/pkgs/development/python-modules/prompt_toolkit/default.nix
+++ b/pkgs/development/python-modules/prompt_toolkit/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "prompt_toolkit";
-  version = "2.0.10";
+  version = "3.0.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1nr990i4b04rnlw1ghd0xmgvvvhih698mb6lb6jylr76cs7zcnpi";
+    sha256 = "10wpsbl1mmnvm8q63zs40633kbq93bidx4vz1p2q92w8ijqb3rpb";
   };
   checkPhase = ''
     py.test -k 'not test_pathcompleter_can_expanduser'

From aa2cd3e24be3b419515c451ea46c84d252696c35 Mon Sep 17 00:00:00 2001
From: Imran Hossain <contact@imranhossa.in>
Date: Wed, 25 Mar 2020 22:46:03 -0400
Subject: [PATCH 4238/4636] python3Packages.ptpython: 2.0.6 -> 3.0.1

---
 pkgs/development/python-modules/ptpython/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix
index 01f9dda8f2c1..f5a37dda630d 100644
--- a/pkgs/development/python-modules/ptpython/default.nix
+++ b/pkgs/development/python-modules/ptpython/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, buildPythonPackage, fetchPypi, prompt_toolkit, docopt , jedi, pygments, isPy3k }:
+{ stdenv, buildPythonPackage, fetchPypi, prompt_toolkit, appdirs, docopt, jedi
+, pygments, isPy3k }:
 
 buildPythonPackage rec {
   pname = "ptpython";
-  version = "2.0.6";
+  version = "3.0.1";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "90e24040e82de4abae0bbe6e352d59ae6657e14e1154e742c0038679361b052f";
+    sha256 = "a69cce0aa04f0075e2e65287a0ee2f3a928c0591b301ce22aa2e498af1ebcb4b";
   };
 
-  propagatedBuildInputs = [ prompt_toolkit docopt jedi pygments ];
+  propagatedBuildInputs = [ appdirs prompt_toolkit docopt jedi pygments ];
 
   # no tests to run
   doCheck = false;

From b2cfb3131d141137944495e3cf05e359e009f517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 27 Mar 2020 09:09:11 +0000
Subject: [PATCH 4239/4636] nodePackages: use node2nix from git

---
 pkgs/development/node-packages/generate.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh
index 66a51721ac81..d25671b1a6df 100755
--- a/pkgs/development/node-packages/generate.sh
+++ b/pkgs/development/node-packages/generate.sh
@@ -1,11 +1,11 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -p nodePackages.node2nix -i bash
+#!/usr/bin/env bash
 set -eu -o pipefail
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+node2nix=$(nix-build ../../.. --no-out-link -A nodePackages.node2nix)
 
 cd ${DIR}
 rm -f ./node-env.nix
 for version in 10 12 13; do
-  node2nix --nodejs-$version -i node-packages-v$version.json -o node-packages-v$version.nix -c composition-v$version.nix
+  "${node2nix}/bin/node2nix" --nodejs-$version -i node-packages-v$version.json -o node-packages-v$version.nix -c composition-v$version.nix
 done

From cc9389e76fbd3a09c1b6cbcc9dee41c525eb6b41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 15 Mar 2020 20:19:32 +0000
Subject: [PATCH 4240/4636] xidlehook: 0.8.0 -> 0.8.2

---
 pkgs/tools/X11/xidlehook/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix
index a4bc2295f1b9..943fdb2711c3 100644
--- a/pkgs/tools/X11/xidlehook/default.nix
+++ b/pkgs/tools/X11/xidlehook/default.nix
@@ -3,7 +3,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "xidlehook";
-  version = "0.8.0";
+  version = "0.8.2";
 
   doCheck = false;
 
@@ -12,11 +12,11 @@ rustPlatform.buildRustPackage rec {
     repo = "xidlehook";
     rev = version;
 
-    sha256 = "127b20y86xs2wq5ka236057nyrh87fgzhjqbl6azf002afnbsn5m";
+    sha256 = "1zvr3vk76x0gsq6z5rrnliv2bvshsm8bhkspc41bbj4kniz4h5bw";
   };
 
   cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"];
-  cargoSha256 = "0wakw3pqgwfwarjfb3h0a2javrhnf509v3j547a7p9k5kbjb5np0";
+  cargoSha256 = "0dxz5mbdc93xb02vnmd29i2kdh05c7vx9h28x5qgs3jvddyb3xmn";
 
   buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security;
   nativeBuildInputs = [ pkgconfig patchelf python3 ];
@@ -32,5 +32,6 @@ rustPlatform.buildRustPackage rec {
     license = licenses.mit;
     maintainers = with maintainers; [ jD91mZM2 ];
     platforms = platforms.unix;
+    badPlatforms = platforms.darwin;
   };
 }

From 4366b198d793eb39f21a08660cea11cbc22c5765 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Fri, 17 Jan 2020 08:00:51 +0000
Subject: [PATCH 4241/4636] pythonPackages.bravia-tv: init at 1.0.1

---
 .../python-modules/bravia-tv/default.nix      | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/bravia-tv/default.nix

diff --git a/pkgs/development/python-modules/bravia-tv/default.nix b/pkgs/development/python-modules/bravia-tv/default.nix
new file mode 100644
index 000000000000..2df937f4232c
--- /dev/null
+++ b/pkgs/development/python-modules/bravia-tv/default.nix
@@ -0,0 +1,28 @@
+{ lib, fetchFromGitHub, buildPythonPackage, isPy27, requests }:
+
+buildPythonPackage rec {
+  pname = "bravia-tv";
+  version = "1.0.1";
+  disabled = isPy27;
+
+  src = fetchFromGitHub {
+    owner = "dcnielsen90";
+    repo = "python-bravia-tv";
+    rev = "v${version}";
+    sha256 = "0jlrin5qw3ny2r961y5divd5xa9giprxhhxdc84rjlq9qdmnsk68";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  # package does not include tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "bravia_tv" ];
+
+  meta = with lib; {
+    homepage = "https://github.com/dcnielsen90/python-bravia-tv";
+    description = "Python library for Sony Bravia TV remote control";
+    license = licenses.mit;
+    maintainers = with maintainers; [ colemickens ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3e58f0719e3a..b467ac523888 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -505,6 +505,8 @@ in {
 
   boltons = callPackage ../development/python-modules/boltons { };
 
+  bravia-tv = callPackage ../development/python-modules/bravia-tv { };
+
   braintree = callPackage ../development/python-modules/braintree { };
 
   breezy = callPackage ../development/python-modules/breezy { };

From d0fabe4e424d3ded5b31626d0ccf33447a778d25 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Sat, 28 Mar 2020 07:56:08 +0000
Subject: [PATCH 4242/4636] home-assistant: regenerate component-packages.nix
 (bravia-tv)

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 22235bbd738d..070e7238bc6a 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -86,7 +86,7 @@
     "bme680" = ps: with ps; [ ]; # missing inputs: bme680 smbus-cffi
     "bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected
     "bom" = ps: with ps; [ ]; # missing inputs: bomradarloop
-    "braviatv" = ps: with ps; [ getmac]; # missing inputs: bravia-tv
+    "braviatv" = ps: with ps; [ bravia-tv getmac];
     "broadlink" = ps: with ps; [ broadlink];
     "brother" = ps: with ps; [ ]; # missing inputs: brother
     "brottsplatskartan" = ps: with ps; [ ]; # missing inputs: brottsplatskartan

From 9c7c0e148ccf561b4f159b3445ef9390d8cd8d2a Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 28 Mar 2020 09:17:34 +0100
Subject: [PATCH 4243/4636] antimony: 2019-10-30 -> 2020-03-28

---
 pkgs/applications/graphics/antimony/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix
index 5966d6427ed6..75ba3ecd55dc 100644
--- a/pkgs/applications/graphics/antimony/default.nix
+++ b/pkgs/applications/graphics/antimony/default.nix
@@ -4,19 +4,19 @@
 }:
 
 let
-  gitRev    = "6dfe6822e0279a4cc2f1c60e85b42212627285fe";
+  gitRev    = "8fb4b0929ce84cf375bfb83a9d522ccd80681eaf";
   gitBranch = "develop";
   gitTag    = "0.9.3";
 in
   stdenv.mkDerivation {
     pname = "antimony";
-    version = "2019-10-30";
+    version = "2020-03-28";
 
     src = fetchFromGitHub {
       owner  = "mkeeter";
       repo   = "antimony";
       rev    = gitRev;
-      sha256 = "07zlkwlk79czq8dy85b6n3ds3g36l8qy4ix849ady6ia3gm8981j";
+      sha256 = "1s0zmq5jmhmb1wcsyaxfmii448g6x8b41mzvb1awlljj85qj0k2s";
     };
 
     patches = [ ./paths-fix.patch ];
@@ -29,11 +29,10 @@ in
 
     buildInputs = [
       libpng python3 python3.pkgs.boost
-      libGLU libGL qtbase wrapQtAppsHook
-      ncurses
+      libGLU libGL qtbase ncurses
     ];
 
-    nativeBuildInputs = [ cmake flex lemon ];
+    nativeBuildInputs = [ cmake flex lemon wrapQtAppsHook ];
 
     cmakeFlags= [
       "-DGITREV=${gitRev}"

From d85fb28414502e6c4f2618ea50abe4c9b7b0fdd0 Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Thu, 26 Mar 2020 14:33:57 +0100
Subject: [PATCH 4244/4636] nixos/tests/hibernate: disable for platforms other
 than x86_64

Due to 9pnet_virtio bugs, /nix is no longer available after
hibernation. It happens to work on x86_64, but not on other
platforms.
---
 nixos/tests/all-tests.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 51b463747b0e..7c0550dfa090 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -120,7 +120,10 @@ in
   handbrake = handleTestOn ["x86_64-linux"] ./handbrake.nix {};
   haproxy = handleTest ./haproxy.nix {};
   hardened = handleTest ./hardened.nix {};
-  hibernate = handleTest ./hibernate.nix {};
+  # 9pnet_virtio used to mount /nix partition doesn't support
+  # hibernation. This test happens to work on x86_64-linux but
+  # not on other platforms.
+  hibernate = handleTestOn ["x86_64-linux"] ./hibernate.nix {};
   hitch = handleTest ./hitch {};
   hocker-fetchdocker = handleTest ./hocker-fetchdocker {};
   home-assistant = handleTest ./home-assistant.nix {};

From 679fc685c805d23a309e4952c8a479eb612943b5 Mon Sep 17 00:00:00 2001
From: Mikhail Klementev <blame@dumpstack.io>
Date: Sat, 28 Mar 2020 09:05:48 +0000
Subject: [PATCH 4245/4636] codeql: 2.0.4 -> 2.1.0

---
 pkgs/development/tools/analysis/codeql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix
index 309ba9d392bd..f722a155086f 100644
--- a/pkgs/development/tools/analysis/codeql/default.nix
+++ b/pkgs/development/tools/analysis/codeql/default.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation rec {
   pname = "codeql";
-  version = "2.0.4";
+  version = "2.1.0";
 
   dontConfigure = true;
   dontBuild = true;
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchzip {
     url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
-    sha256 = "02sqs7shxqrq6c6h12ldskk30k7sisa75wjxz99xyg49m4b2lw4m";
+    sha256 = "1vp4f5kwmxc4j59cdzwj0jh0n4c05hkvssvv9ii6w88phzblzpjk";
   };
 
   nativeBuildInputs = [

From 480397693ef6e9ca92ab6e1d015e31232d62f2c7 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 28 Mar 2020 12:06:54 +0300
Subject: [PATCH 4246/4636] nixos/connman: add option to use specific package

---
 nixos/modules/services/networking/connman.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix
index e8eadc4e187d..53adc337fa47 100644
--- a/nixos/modules/services/networking/connman.nix
+++ b/nixos/modules/services/networking/connman.nix
@@ -77,6 +77,13 @@ in {
         '';
       };
 
+      package = mkOption {
+        type = types.path;
+        description = "The connman package / build flavor";
+        default = connman;
+        example = literalExample "pkgs.connmanFull";
+      };
+
     };
 
   };
@@ -93,7 +100,7 @@ in {
       message = "You can not use services.connman with networking.networkmanager";
     }];
 
-    environment.systemPackages = [ connman ];
+    environment.systemPackages = [ cfg.package ];
 
     systemd.services.connman = {
       description = "Connection service";
@@ -105,7 +112,7 @@ in {
         BusName = "net.connman";
         Restart = "on-failure";
         ExecStart = toString ([
-          "${pkgs.connman}/sbin/connmand"
+          "${cfg.package}/sbin/connmand"
           "--config=${configFile}"
           "--nodaemon"
         ] ++ optional enableIwd "--wifi=iwd_agent"
@@ -122,7 +129,7 @@ in {
       serviceConfig = {
         Type = "dbus";
         BusName = "net.connman.vpn";
-        ExecStart = "${pkgs.connman}/sbin/connman-vpnd -n";
+        ExecStart = "${cfg.package}/sbin/connman-vpnd -n";
         StandardOutput = "null";
       };
     };
@@ -132,7 +139,7 @@ in {
       serviceConfig = {
         Name = "net.connman.vpn";
         before = [ "connman" ];
-        ExecStart = "${pkgs.connman}/sbin/connman-vpnd -n";
+        ExecStart = "${cfg.package}/sbin/connman-vpnd -n";
         User = "root";
         SystemdService = "connman-vpn.service";
       };

From babd73454a138e829bdef1bd252a2ec4359923b3 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 27 Mar 2020 13:04:51 +0300
Subject: [PATCH 4247/4636] picard: enable optional playback support

---
 pkgs/applications/audio/picard/default.nix | 24 ++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index 9530da63ef76..5830e1eefb88 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -1,7 +1,15 @@
-{ stdenv, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5 }:
+{ stdenv, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5
+, enablePlayback ? true
+, gst_all_1
+}:
 
 let
   pythonPackages = python3Packages;
+  pyqt5 = if enablePlayback then
+    pythonPackages.pyqt5_with_qtmultimedia
+  else
+    pythonPackages.pyqt5
+  ;
 in pythonPackages.buildPythonApplication rec {
   pname = "picard";
   version = "2.3.1";
@@ -13,7 +21,16 @@ in pythonPackages.buildPythonApplication rec {
     sha256 = "0xalg4dvaqb396h4s6gzxnplgv1lcvsczmmrlhyrj0kfj10amhsj";
   };
 
-  nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ];
+  nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]
+    ++ stdenv.lib.optionals (pyqt5.multimediaEnabled) [
+      qt5.qtmultimedia.bin
+      gst_all_1.gstreamer
+      gst_all_1.gst-vaapi
+      gst_all_1.gst-libav
+      gst_all_1.gst-plugins-base
+      gst_all_1.gst-plugins-good
+    ]
+  ;
 
   propagatedBuildInputs = with pythonPackages; [
     pyqt5
@@ -31,6 +48,9 @@ in pythonPackages.buildPythonApplication rec {
   preFixup = ''
     makeWrapperArgs+=("''${qtWrapperArgs[@]}")
   ''
+    + stdenv.lib.optionalString (pyqt5.multimediaEnabled) ''
+      makeWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
+    ''
   ;
 
   meta = with stdenv.lib; {

From 758f81df44723fd6b542ac47abcb2e352281b5eb Mon Sep 17 00:00:00 2001
From: vasy <elsile69@yahoo.com>
Date: Sat, 28 Mar 2020 11:25:13 +0200
Subject: [PATCH 4248/4636] atlassian-jira: 8.7.1 -> 8.8.0 (#83218)

fix not starting service when jdk is jdk11
---
 pkgs/servers/atlassian/jira.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix
index 611db53d6458..d0d95d24068c 100644
--- a/pkgs/servers/atlassian/jira.nix
+++ b/pkgs/servers/atlassian/jira.nix
@@ -1,15 +1,18 @@
-{ stdenv, lib, fetchurl
+{ stdenv
+, lib
+, fetchurl
+, gawk
 , enableSSO ? false
 , crowdProperties ? null
 }:
 
 stdenv.mkDerivation rec {
   pname = "atlassian-jira";
-  version = "8.7.1";
+  version = "8.8.0";
 
   src = fetchurl {
     url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
-    sha256 = "0f46j94xjb5a5f74fsykjif64s9w2yd9ccy9098yrzaa8lbwdgpz";
+    sha256 = "1gn0iknli8pi3c3kxb8hdn19wzn2fx0193ppf0niw3cqf1h2c5cz";
   };
 
   buildPhase = ''
@@ -18,6 +21,8 @@ stdenv.mkDerivation rec {
     rm -r logs; ln -sf /run/atlassian-jira/logs/ .
     rm -r work; ln -sf /run/atlassian-jira/work/ .
     rm -r temp; ln -sf /run/atlassian-jira/temp/ .
+    substituteInPlace bin/check-java.sh \
+      --replace "awk" "${gawk}/bin/gawk"
   '' + lib.optionalString enableSSO ''
     substituteInPlace atlassian-jira/WEB-INF/classes/seraph-config.xml \
       --replace com.atlassian.jira.security.login.JiraSeraphAuthenticator \

From 3125cc6707299801b9e87a48a202dd78b8ab0d92 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Fri, 20 Mar 2020 15:50:33 +0200
Subject: [PATCH 4249/4636] soci: init at 4.0.0

---
 pkgs/development/libraries/soci/default.nix | 31 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/libraries/soci/default.nix

diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/development/libraries/soci/default.nix
new file mode 100644
index 000000000000..1f9b77cc3c92
--- /dev/null
+++ b/pkgs/development/libraries/soci/default.nix
@@ -0,0 +1,31 @@
+{ cmake
+, fetchFromGitHub
+, sqlite
+, stdenv
+}:
+
+stdenv.mkDerivation rec {
+  pname = "soci";
+  version = "4.0.0";
+
+  src = fetchFromGitHub {
+    owner = "SOCI";
+    repo = pname;
+    rev = version;
+    sha256 = "06faswdxd2frqr9xnx6bxc7zwarlzsbdi3bqpz7kwdxsjvq41rnb";
+  };
+
+  # Do not build static libraries
+  cmakeFlags = [ "-DSOCI_STATIC=OFF" ];
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ sqlite ];
+
+  meta = with stdenv.lib; {
+    description = "Database access library for C++";
+    homepage = "http://soci.sourceforge.net/";
+    license = licenses.boost;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e469380abbd..2e51e5a54d6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22009,6 +22009,8 @@ in
 
   skanlite = libsForQt5.callPackage ../applications/office/skanlite { };
 
+  soci = callPackage ../development/libraries/soci { };
+
   sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { };
 
   sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { };

From 4179075b4d6cd4ea2badbef8025caba79df364d6 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Fri, 20 Mar 2020 10:30:32 +0200
Subject: [PATCH 4250/4636] bcunit: 3.0.2 -> unstable-2019-11-19

---
 pkgs/tools/misc/bcunit/default.nix | 40 ++++++++++++++++++------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/pkgs/tools/misc/bcunit/default.nix b/pkgs/tools/misc/bcunit/default.nix
index 4a440e133feb..203735d79b0b 100644
--- a/pkgs/tools/misc/bcunit/default.nix
+++ b/pkgs/tools/misc/bcunit/default.nix
@@ -1,22 +1,30 @@
-{stdenv, fetchFromGitHub, cmake}:
+{ cmake
+, fetchFromGitLab
+, stdenv
+}:
+
 stdenv.mkDerivation rec {
-  name = "${baseName}-${version}";
-  baseName = "bcunit";
-  version = "3.0.2";
-  buildInputs = [cmake];
-  src = fetchFromGitHub {
-    owner = "BelledonneCommunications";
-    repo = baseName;
-    rev = version;
-    sha256 = "063yl7kxkix76r49qrj0h1qpz2p538d1yw8aih0x4i47g35k00y7";
+  pname = "bcunit";
+  # Latest release 3.0.2 is missing some functions needed by bctoolbox. See:
+  # https://gitlab.linphone.org/BC/public/bcunit/issues/1
+  version = "unstable-2019-11-19";
+
+  buildInputs = [ cmake ];
+  src = fetchFromGitLab {
+    domain = "gitlab.linphone.org";
+    owner = "public";
+    group = "BC";
+    repo = pname;
+    rev = "3c720fbf67dd3c02b0c7011ed4036982b2c93532";
+    sha256 = "1237hpmkls2igp60gdfkbknxpgwvxn1vmv2m41vyl25xw1d3g35w";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     inherit version;
-    description = ''A fork of CUnit test framework'';
-    license = stdenv.lib.licenses.lgpl2Plus;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    description = "A fork of CUnit test framework";
+    homepage = "https://gitlab.linphone.org/BC/public/bcunit";
+    license = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ raskin jluttine ];
+    platforms = platforms.linux;
   };
 }
-

From 9bd261213ba5e8de508df67360a0fe186681c44d Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Fri, 20 Mar 2020 10:31:25 +0200
Subject: [PATCH 4251/4636] bctoolbox: 0.6.0 -> 4.3.1

---
 .../libraries/bctoolbox/default.nix           | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix
index 1c81dd608cbf..22578dad38db 100644
--- a/pkgs/development/libraries/bctoolbox/default.nix
+++ b/pkgs/development/libraries/bctoolbox/default.nix
@@ -1,27 +1,39 @@
-{ stdenv, fetchFromGitHub, cmake, bcunit, mbedtls }:
+{ bcunit
+, cmake
+, fetchFromGitLab
+, mbedtls
+, stdenv
+}:
 
 stdenv.mkDerivation rec {
   pname = "bctoolbox";
-  version = "0.6.0";
+  version = "4.3.1";
 
   nativeBuildInputs = [ cmake bcunit ];
   buildInputs = [ mbedtls ];
 
-  src = fetchFromGitHub {
-    owner = "BelledonneCommunications";
+  src = fetchFromGitLab {
+    domain = "gitlab.linphone.org";
+    owner = "public";
+    group = "BC";
     repo = pname;
     rev = version;
-    sha256 = "1cxx243wyzkd4xnvpyqf97n0rjhfckpvw1vhwnbwshq3q6fra909";
+    sha256 = "1y91jcrma4kjqpm6w5ahlygjsyvx7l8zjrjvq7g2n39jmw175cvs";
   };
 
+  # Do not build static libraries
+  cmakeFlags = [ "-DENABLE_STATIC=NO" ];
+
   NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     inherit version;
     description = "Utilities library for Linphone";
-    homepage = "https://github.com/BelledonneCommunications/bctoolbox";
-    license = stdenv.lib.licenses.gpl2Plus ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    homepage = "https://gitlab.linphone.org/BC/public/bctoolbox";
+    # Still using GPLv2 but as the rest of the Linphone projects have switched
+    # to GPLv3, this might too, so check this when bumping the version number.
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ raskin jluttine ];
+    platforms = platforms.linux;
   };
 }

From 8a236c60a9a289f1d0b91dab7e3dfcca494f600c Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Fri, 20 Mar 2020 17:00:54 +0200
Subject: [PATCH 4252/4636] belr: 0.1.3 -> unstable-2020-03-09

---
 pkgs/development/libraries/belr/default.nix | 35 ++++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix
index f0557b0379f2..90067e493a15 100644
--- a/pkgs/development/libraries/belr/default.nix
+++ b/pkgs/development/libraries/belr/default.nix
@@ -1,24 +1,35 @@
-{ stdenv, cmake, fetchFromGitHub, bctoolbox }:
+{ bctoolbox
+, cmake
+, fetchFromGitLab
+, stdenv
+}:
 
 stdenv.mkDerivation rec {
-  baseName = "belr";
-  version = "0.1.3";
-  name = "${baseName}-${version}";
+  pname = "belr";
+  # Using master branch for linphone-desktop caused a chain reaction that many
+  # of its dependencies needed to use master branch too.
+  version = "unstable-2020-03-09";
 
-  src = fetchFromGitHub {
-    owner = "BelledonneCommunications";
-    repo = baseName;
-    rev = version;
-    sha256 = "0mf8lsyq1z3b5p47c00lnwc8n7v9nzs1fd2g9c9hnz6fjd2ka44w";
+  src = fetchFromGitLab {
+    domain = "gitlab.linphone.org";
+    owner = "public";
+    group = "BC";
+    repo = pname;
+    rev = "326d030ca9db12525c2a6d2a65f386f36f3c2ed5";
+    sha256 = "1cdblb9smncq3al0crqp5651b02k1g6whlw1ib769p61gad0rs3v";
   };
 
   buildInputs = [ bctoolbox ];
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib;{
+  # Do not build static libraries
+  cmakeFlags = [ "-DENABLE_STATIC=NO" ];
+
+  meta = with stdenv.lib; {
     description = "Belr is Belledonne Communications' language recognition library";
-    homepage = https://github.com/BelledonneCommunications/belr;
-    license = licenses.lgpl21;
+    homepage = "https://gitlab.linphone.org/BC/public/belr";
+    license = licenses.gpl3;
     platforms = platforms.all;
+    maintainers = with maintainers; [ jluttine ];
   };
 }

From 1e9f7710554fdb59b334f03608160c749fd90fa6 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Fri, 20 Mar 2020 10:32:14 +0200
Subject: [PATCH 4253/4636] ortp: 1.0.2 -> unstable-2020-03-17

---
 pkgs/development/libraries/ortp/default.nix | 28 +++++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix
index 68e890e33682..53636f05b789 100644
--- a/pkgs/development/libraries/ortp/default.nix
+++ b/pkgs/development/libraries/ortp/default.nix
@@ -1,16 +1,27 @@
-{ stdenv, cmake, fetchFromGitHub, bctoolbox }:
+{ bctoolbox
+, cmake
+, fetchFromGitLab
+, stdenv
+}:
 
 stdenv.mkDerivation rec {
   pname = "ortp";
-  version = "1.0.2";
+  # Using master branch for linphone-desktop caused a chain reaction that many
+  # of its dependencies needed to use master branch too.
+  version = "unstable-2020-03-17";
 
-  src = fetchFromGitHub {
-    owner = "BelledonneCommunications";
+  src = fetchFromGitLab {
+    domain = "gitlab.linphone.org";
+    owner = "public";
+    group = "BC";
     repo = pname;
-    rev = version;
-    sha256 = "12cwv593bsdnxs0zfcp07vwyk7ghlz2wv7vdbs1ksv293w3vj2rv";
+    rev = "804dfc4f90d1a4301127c7af10a74fd2935dd5d8";
+    sha256 = "1yr8j8am68spyy5d9vna8zcq3qn039mi16cv9jf5n4chs9rxf7xx";
   };
 
+  # Do not build static libraries
+  cmakeFlags = [ "-DENABLE_STATIC=NO" ];
+
   NIX_CFLAGS_COMPILE = "-Wno-error=stringop-truncation";
 
   buildInputs = [ bctoolbox ];
@@ -18,8 +29,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A Real-Time Transport Protocol (RFC3550) stack";
-    homepage = https://linphone.org/technical-corner/ortp;
-    license = licenses.gpl2Plus;
+    homepage = "https://linphone.org/technical-corner/ortp";
+    license = licenses.gpl3;
     platforms = platforms.all;
+    maintainers = with maintainers; [ jluttine ];
   };
 }

From 810dac320afa3fa629d2abe8a5ef04683abd476a Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Fri, 20 Mar 2020 17:00:26 +0200
Subject: [PATCH 4254/4636] belle-sip: 1.6.3 -> unstable-2020-02-18

---
 .../libraries/belle-sip/default.nix           | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix
index 0d3df37d8e09..a935372656e7 100644
--- a/pkgs/development/libraries/belle-sip/default.nix
+++ b/pkgs/development/libraries/belle-sip/default.nix
@@ -1,22 +1,36 @@
-{ stdenv, antlr3_4, libantlr3c, jre, mbedtls, fetchFromGitHub
-  , cmake, zlib, bctoolbox
+{ antlr3_4
+, bctoolbox
+, cmake
+, fetchFromGitLab
+, jre
+, libantlr3c
+, mbedtls
+, stdenv
+, zlib
 }:
 
 stdenv.mkDerivation rec {
   pname = "belle-sip";
-  version = "1.6.3";
+  # Using master branch for linphone-desktop caused a chain reaction that many
+  # of its dependencies needed to use master branch too.
+  version = "unstable-2020-02-18";
 
-  src = fetchFromGitHub {
-    owner = "BelledonneCommunications";
+  src = fetchFromGitLab {
+    domain = "gitlab.linphone.org";
+    owner = "public";
+    group = "BC";
     repo = pname;
-    rev = version;
-    sha256 = "0q70db1klvhca1af29bm9paka3gyii5hfbzrj4178gclsg7cj8fk";
+    rev = "0dcb13416eae87edf140771b886aedaf6be8cf60";
+    sha256 = "0pzxk8mkkg6zsnmj1bwggbdjv864psx89gglfm51h8s501kg11fv";
   };
 
   nativeBuildInputs = [ jre cmake ];
 
   buildInputs = [ zlib ];
 
+  # Do not build static libraries
+  cmakeFlags = [ "-DENABLE_STATIC=NO" ];
+
   NIX_CFLAGS_COMPILE = toString [
     "-Wno-error=deprecated-declarations"
     "-Wno-error=format-truncation"
@@ -29,9 +43,10 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = false;
 
   meta = with stdenv.lib; {
-    homepage = https://linphone.org/technical-corner/belle-sip;
+    homepage = "https://linphone.org/technical-corner/belle-sip";
     description = "Modern library implementing SIP (RFC 3261) transport, transaction and dialog layers";
-    license = licenses.gpl2;
+    license = licenses.gpl3;
     platforms = platforms.all;
+    maintainers = with maintainers; [ jluttine ];
   };
 }

From dcf2f1186aa78e2381ac70cc89f1d490577c9f6c Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Fri, 20 Mar 2020 16:28:42 +0200
Subject: [PATCH 4255/4636] lime: init at 4.3.1

---
 pkgs/development/libraries/lime/default.nix | 36 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/libraries/lime/default.nix

diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/development/libraries/lime/default.nix
new file mode 100644
index 000000000000..3ebcc7ad78a6
--- /dev/null
+++ b/pkgs/development/libraries/lime/default.nix
@@ -0,0 +1,36 @@
+{ bctoolbox
+, belle-sip
+, cmake
+, fetchFromGitLab
+, soci
+, sqlite
+, stdenv
+}:
+
+stdenv.mkDerivation rec {
+  pname = "lime";
+  version = "4.3.1";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.linphone.org";
+    owner = "public";
+    group = "BC";
+    repo = pname;
+    rev = version;
+    sha256 = "1ilpp9ai4sah23ngnxisvmwhrv5jkk5f831yp7smpl225z5nv83g";
+  };
+
+  buildInputs = [ bctoolbox soci belle-sip sqlite ];
+  nativeBuildInputs = [ cmake ];
+
+  # Do not build static libraries
+  cmakeFlags = [ "-DENABLE_STATIC=NO" ];
+
+  meta = with stdenv.lib; {
+    description = "End-to-end encryption library for instant messaging";
+    homepage = "http://www.linphone.org/technical-corner/lime";
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e51e5a54d6b..0bf59b2ec131 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20605,6 +20605,8 @@ in
     flavour = "git";
   };
 
+  lime = callPackage ../development/libraries/lime { };
+
   luakit = callPackage ../applications/networking/browsers/luakit {
     inherit (luajitPackages) luafilesystem;
   };

From 187ae7c30e1cc67160104ffbe3cf5be6fc2b2a08 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Fri, 20 Mar 2020 16:59:59 +0200
Subject: [PATCH 4256/4636] belcard: 1.0.2 -> 4.3.1

---
 .../development/libraries/belcard/default.nix | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix
index aa6cb8513ae4..11de04889159 100644
--- a/pkgs/development/libraries/belcard/default.nix
+++ b/pkgs/development/libraries/belcard/default.nix
@@ -1,24 +1,34 @@
-{ stdenv, cmake, fetchFromGitHub, bctoolbox, belr }:
+{ bctoolbox
+, belr
+, cmake
+, fetchFromGitLab
+, stdenv
+}:
 
 stdenv.mkDerivation rec {
-  baseName = "belcard";
-  version = "1.0.2";
-  name = "${baseName}-${version}";
+  pname = "belcard";
+  version = "4.3.1";
 
-  src = fetchFromGitHub {
-    owner = "BelledonneCommunications";
-    repo = baseName;
+  src = fetchFromGitLab {
+    domain = "gitlab.linphone.org";
+    owner = "public";
+    group = "BC";
+    repo = pname;
     rev = version;
-    sha256 = "1pwji83vpsdrfma24rnj3rz1x0a0g6zk3v4xjnip7zf2ys3zcnlk";
+    sha256 = "1w6rbp53cwxr00clp957458x27cgc2y9ylwa5mp812qva7zadmfw";
   };
 
   buildInputs = [ bctoolbox belr ];
   nativeBuildInputs = [ cmake ];
 
-  meta = with stdenv.lib;{
-    description = "Belcard is a C++ library to manipulate VCard standard format";
-    homepage = https://github.com/BelledonneCommunications/belcard;
+  # Do not build static libraries
+  cmakeFlags = [ "-DENABLE_STATIC=NO" ];
+
+  meta = with stdenv.lib; {
+    description = "C++ library to manipulate VCard standard format";
+    homepage = "https://gitlab.linphone.org/BC/public/belcard";
     license = licenses.lgpl21;
     platforms = platforms.all;
+    maintainers = with maintainers; [ jluttine ];
   };
 }

From 7c5bff5428bc6a0173527ff0d1c9a699e03da615 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Fri, 20 Mar 2020 17:01:19 +0200
Subject: [PATCH 4257/4636] bzrtp: 1.0.6 -> 4.3.1

---
 pkgs/development/libraries/bzrtp/default.nix | 30 ++++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix
index b2dc295db5b7..2eb5a2dfcffb 100644
--- a/pkgs/development/libraries/bzrtp/default.nix
+++ b/pkgs/development/libraries/bzrtp/default.nix
@@ -1,26 +1,38 @@
-{ stdenv, cmake, fetchFromGitHub, bctoolbox, sqlite }:
+{ bctoolbox
+, cmake
+, fetchFromGitLab
+, sqlite
+, stdenv
+}:
 
 stdenv.mkDerivation rec {
-  baseName = "bzrtp";
-  version = "1.0.6";
-  name = "${baseName}-${version}";
+  pname = "bzrtp";
+  version = "4.3.1";
 
-  src = fetchFromGitHub {
-    owner = "BelledonneCommunications";
-    repo = baseName;
+  src = fetchFromGitLab {
+    domain = "gitlab.linphone.org";
+    owner = "public";
+    group = "BC";
+    repo = pname;
     rev = version;
-    sha256 = "0438zzxp82bj5fmvqnwlljkgrz9ab5qm5lgpwwgmg1cp78bp2l45";
+    sha256 = "14fqp6r9rf7z6j5phbsrdxlbjak03hs8kb94b6jgcrcdxrxhy3fy";
   };
 
   buildInputs = [ bctoolbox sqlite ];
   nativeBuildInputs = [ cmake ];
 
+  # Do not build static libraries
+  cmakeFlags = [ "-DENABLE_STATIC=NO" ];
+
   NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type";
 
   meta = with stdenv.lib; {
     description = "BZRTP is an opensource implementation of ZRTP keys exchange protocol";
-    homepage = https://github.com/BelledonneCommunications/bzrtp;
+    homepage = "https://gitlab.linphone.org/BC/public/bzrtp";
+    # They have switched to GPLv3 on git HEAD so probably the next release will
+    # be GPL3.
     license = licenses.lgpl21;
     platforms = platforms.all;
+    maintainers = with maintainers; [ jluttine ];
   };
 }

From d4988c7c31902d21e9346df708a4135dcd93ef97 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Fri, 20 Mar 2020 17:04:15 +0200
Subject: [PATCH 4258/4636] mediastreamer: 2.16.1 -> unstable-2020-03-20

---
 .../libraries/mediastreamer/default.nix       | 101 ++++++++++++++----
 .../libraries/mediastreamer/plugins_dir.patch |  34 +++---
 2 files changed, 95 insertions(+), 40 deletions(-)

diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix
index 0204223d127c..5f7daa83b2f5 100644
--- a/pkgs/development/libraries/mediastreamer/default.nix
+++ b/pkgs/development/libraries/mediastreamer/default.nix
@@ -1,37 +1,97 @@
-{ stdenv, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm
-, libopus, ffmpeg, libX11, libXv, libGLU, libGL, glew, libtheora, libvpx, SDL, libupnp
-, ortp, libv4l, libpcap, srtp, fetchFromGitHub, cmake, bctoolbox, doxygen
-, python, libXext, libmatroska, fetchpatch
+{ alsaLib
+, bctoolbox
+, bzrtp
+, cmake
+, doxygen
+, fetchFromGitLab
+, fetchpatch
+, ffmpeg
+, glew
+, gsm
+, intltool
+, libGL
+, libGLU
+, libX11
+, libXext
+, libXv
+, libmatroska
+, libopus
+, libpcap
+, libpulseaudio
+, libtheora
+, libupnp
+, libv4l
+, libvpx
+, ortp
+, pkgconfig
+, python
+, SDL
+, speex
+, srtp
+, stdenv
 }:
 
 stdenv.mkDerivation rec {
   pname = "mediastreamer2";
-  version = "2.16.1";
+  # Using master branch for linphone-desktop caused a chain reaction that many
+  # of its dependencies needed to use master branch too.
+  version = "unstable-2020-03-20";
 
-  src = fetchFromGitHub {
-    owner = "BelledonneCommunications";
+  src = fetchFromGitLab {
+    domain = "gitlab.linphone.org";
+    owner = "public";
+    group = "BC";
     repo = pname;
-    rev = version;
-    sha256 = "02745bzl2r1jqvdqzyv94fjd4w92zr976la4c4nfvsy52waqah7j";
+    rev = "c5eecb72cb44376d142949051dd0cb7c982608fb";
+    sha256 = "1vp260jxvjlmrmjdl4p23prg4cjln20a7z6zq8dqvfh4iq3ya033";
   };
 
   patches = [
-    (fetchpatch {
-      name = "allow-build-without-git.patch";
-      url = "https://github.com/BelledonneCommunications/mediastreamer2/commit/de3a24b795d7a78e78eab6b974e7ec5abf2259ac.patch";
-      sha256 = "1zqkrab42n4dha0knfsyj4q0wc229ma125gk9grj67ps7r7ipscy";
-    })
+    # Plugins directory is normally fixed during compile time. This patch makes
+    # it possible to set the plugins directory run time with an environment
+    # variable MEDIASTREAMER_PLUGINS_DIR. This makes it possible to construct a
+    # plugin directory with desired plugins and wrap executables so that the
+    # environment variable points to that directory.
     ./plugins_dir.patch
   ];
 
-  nativeBuildInputs = [ pkgconfig intltool cmake doxygen python ];
+  nativeBuildInputs = [
+    cmake
+    doxygen
+    intltool
+    pkgconfig
+    python
+  ];
 
   propagatedBuildInputs = [
-    alsaLib libpulseaudio speex gsm libopus
-    ffmpeg libX11 libXv libGLU libGL glew libtheora libvpx SDL libupnp
-    ortp libv4l libpcap srtp bctoolbox libXext libmatroska
+    alsaLib
+    bctoolbox
+    bzrtp
+    ffmpeg
+    glew
+    gsm
+    libGL
+    libGLU
+    libX11
+    libXext
+    libXv
+    libmatroska
+    libopus
+    libpcap
+    libpulseaudio
+    libtheora
+    libupnp
+    libv4l
+    libvpx
+    ortp
+    SDL
+    speex
+    srtp
   ];
 
+  # Do not build static libraries
+  cmakeFlags = [ "-DENABLE_STATIC=NO" ];
+
   NIX_CFLAGS_COMPILE = toString [
     "-DGIT_VERSION=\"v${version}\""
     "-Wno-error=deprecated-declarations"
@@ -43,8 +103,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications";
-    homepage = http://www.linphone.org/technical-corner/mediastreamer2;
-    license = licenses.gpl2;
+    homepage = "http://www.linphone.org/technical-corner/mediastreamer2";
+    license = licenses.gpl3;
     platforms = platforms.linux;
+    maintainers = with maintainers; [ jluttine ];
   };
 }
diff --git a/pkgs/development/libraries/mediastreamer/plugins_dir.patch b/pkgs/development/libraries/mediastreamer/plugins_dir.patch
index e64bfc5a43a1..43e398aafee4 100644
--- a/pkgs/development/libraries/mediastreamer/plugins_dir.patch
+++ b/pkgs/development/libraries/mediastreamer/plugins_dir.patch
@@ -1,24 +1,18 @@
-diff -uNr mediastreamer2/src/base/msfactory.c mediastreamer2-new/src/base/msfactory.c
---- a/src/base/msfactory.c	2015-05-13 16:53:49.801113249 +0200
-+++ b/src/base/msfactory.c	2015-08-26 21:35:44.994724647 +0200
-@@ -630,12 +630,18 @@
+diff --git a/src/base/msfactory.c b/src/base/msfactory.c
+index 14f868e3..2e3445a1 100644
+--- a/src/base/msfactory.c
++++ b/src/base/msfactory.c
+@@ -770,7 +770,12 @@ void ms_factory_uninit_plugins(MSFactory *factory){
  }
  
  void ms_factory_init_plugins(MSFactory *obj) {
+-	if (obj->plugins_dir == NULL) {
 +	char *package_plugins_dir;
- 	if (obj->plugins_dir == NULL) {
-+		package_plugins_dir=getenv("MEDIASTREAMER_PLUGINS_DIR");
-+		if (package_plugins_dir!=NULL){
-+			obj->plugins_dir = ms_strdup(package_plugins_dir);
-+		} else {
- #ifdef PACKAGE_PLUGINS_DIR
--		obj->plugins_dir = ms_strdup(PACKAGE_PLUGINS_DIR);
-+			obj->plugins_dir = ms_strdup(PACKAGE_PLUGINS_DIR);
- #else
--		obj->plugins_dir = ms_strdup("");
-+			obj->plugins_dir = ms_strdup("");
- #endif
-+		}
- 	}
- 	if (strlen(obj->plugins_dir) > 0) {
- 		ms_message("Loading ms plugins from [%s]",obj->plugins_dir);
++	// Force plugin dir from environment variable if set
++	package_plugins_dir = getenv("MEDIASTREAMER_PLUGINS_DIR");
++	if (package_plugins_dir != NULL) {
++		ms_factory_set_plugins_dir(obj, package_plugins_dir);
++	} else if (obj->plugins_dir == NULL) {
+ #ifdef __APPLE__
+ 	char *dir = getPluginsDir();
+ 	if (dir != NULL) {

From bffec3d88448c57c84527fe02bdfc988573b3db2 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 28 Mar 2020 12:28:29 +0300
Subject: [PATCH 4259/4636] nixos/connman: add TODOs regarding connman +
 network-manager

---
 nixos/modules/services/networking/connman.nix | 2 ++
 pkgs/tools/networking/connman/default.nix     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix
index 53adc337fa47..6ccc2dffb267 100644
--- a/nixos/modules/services/networking/connman.nix
+++ b/nixos/modules/services/networking/connman.nix
@@ -96,6 +96,8 @@ in {
       assertion = !config.networking.useDHCP;
       message = "You can not use services.connman with networking.useDHCP";
     }{
+      # TODO: connman seemingly can be used along network manager and
+      # connmanFull supports this - so this should be worked out somehow
       assertion = !config.networking.networkmanager.enable;
       message = "You can not use services.connman with networking.networkmanager";
     }];
diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index 9e87c9742ea0..ccceaa30b043 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -5,6 +5,8 @@
   connman = callPackage ./connman.nix { };
 
   connmanFull = callPackage ./connman.nix {
+    # TODO: Why is this in `connmanFull` and not the default build? See TODO in
+    # nixos/modules/services/networking/connman.nix (near the assertions)
     enableNetworkManager = true;
     enableHh2serialGps = true;
     enableL2tp = true;

From bf96f9122def9a2d7ede713b845183482f211e49 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Fri, 27 Mar 2020 15:50:31 +0100
Subject: [PATCH 4260/4636] vimPlugins.gruvbox-community: 2019-05-31 ->
 2020-02-24, switch to autogenerated

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/overrides.nix    | 12 ------------
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 0093bc78c418..5c4e69311bc3 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -1474,6 +1474,17 @@ let
     };
   };
 
+  gruvbox-community = buildVimPluginFrom2Nix {
+    pname = "gruvbox-community";
+    version = "2020-02-24";
+    src = fetchFromGitHub {
+      owner = "gruvbox-community";
+      repo = "gruvbox";
+      rev = "f5711c15480b83378bde13306fa997057c0c81cd";
+      sha256 = "0vx289a7av31dxm58c6kmfdnsrwnq1rzj5rwci2pqjdac8ds2qm0";
+    };
+  };
+
   gundo-vim = buildVimPluginFrom2Nix {
     pname = "gundo-vim";
     version = "2020-01-15";
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 86a65e1ad8ce..39596da24bb0 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -397,18 +397,6 @@ self: super: {
     dependencies = with super; [ webapi-vim ];
   });
 
-  gruvbox-community = buildVimPluginFrom2Nix {
-    pname = "gruvbox-community";
-    version = "2019-05-31";
-    src = fetchFromGitHub {
-      owner = "gruvbox-community";
-      repo = "gruvbox";
-      rev = "e122091dad968a5524f3e8136615a479c7b6f247";
-      sha256 = "1hncjyfi1gbw62b2pngy5qxyzibrhbyzgfmm9a58sdh1272l8ls8";
-    };
-    meta.maintainers = with stdenv.lib.maintainers; [ minijackson ];
-  };
-
   meson = buildVimPluginFrom2Nix {
     inherit (meson) pname version src;
     preInstall = "cd data/syntax-highlighting/vim";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 62333ae15e31..e9d9e112ed9e 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -119,6 +119,7 @@ google/vim-maktaba
 gorkunov/smartpairs.vim
 gotcha/vimelette
 gregsexton/gitv
+gruvbox-community/gruvbox as gruvbox-community
 gu-fan/riv.vim
 guns/vim-clojure-highlight
 guns/vim-clojure-static

From 657d81a4c373188ffc59738bd65200cc91fbf8e0 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 28 Mar 2020 10:30:43 +0000
Subject: [PATCH 4261/4636] firefox-beta-bin: 75.0b2 -> 75.0b10

---
 .../browsers/firefox-bin/beta_sources.nix     | 770 +++++++++---------
 1 file changed, 385 insertions(+), 385 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index f9356fc802e7..16f97f06bcee 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,965 +1,965 @@
 {
-  version = "75.0b2";
+  version = "75.0b10";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ach/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/ach/firefox-75.0b10.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "159fc50feb7ea1d8f567b94756476b8325de2a2255aceaadb7975cebd763ff44cc74c621532b840f5aef7156024f605ffefc3fb1b3609a44925d7a280b63f183";
+      sha512 = "8f0b4d52b0e3721cc4e7e1337ccc8229bea86c99c5a1aa41400cb2e050a76ec43daa1cc4bcd2523a84db03972c2532a73d00ee295d7378d8967b3768ea2f40c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/af/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/af/firefox-75.0b10.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "224a98e4028513e30897fe73de8dee67a90844990eb13564e7fc32c4aa9426730da7d4b528666ecd5a76a6ce68c0eb3d0564b09823e12721424c471fa7cfe191";
+      sha512 = "f9e3ea8659994726b918bcf72159b80a93b40aadbc6da7dd5f16cad2f9dc312a31f87010147834a326177fe0784db0f39e9eca5aa602711280ff8041ecf31e62";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/an/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/an/firefox-75.0b10.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "7973ab3c94616e0eb1b2b36209836c3ed81c55927f26da9bfc672eeb5f6f36d8447bf9dac705219b38edd1d217c6b7d701ce11285f37d37219ddbc0340fbaf61";
+      sha512 = "8f5f734b7c4b5e6e10e2c4c5de4b26245673606a31d266239c682ae1bd5bea8514849c79cade5320f07ce617330e947ab53b42591cd83a591a4462709abd9299";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ar/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/ar/firefox-75.0b10.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "11dfb7553ca61b7abe857ab7dc75db73e3a3002b9d4dce98f005d0c298ff119d29b64309fb8e5c62fafa08f9ff426c14f45956e5f6cfb7cb9af7dde41190bf43";
+      sha512 = "023a765902f5687b61723b04f041cfdfb23aac1eadb83ec56d6265c3491894ead0867c775bb57e86e4442d6540e6ce39a97eb28e14fba1cec0d2fcdcf94aa4dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ast/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/ast/firefox-75.0b10.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "23f00418b48d660c64c4480cd6c983da80fd8990f3ae055a0e4792f01b881b69251f4ec123ef3d961623b94dd7a968a82f27d29aa87731ca77e4ac4b1ec32464";
+      sha512 = "ec3150f79489735943ea8751a62994f8fdbef02da360575f2572afc19f8ac09b17f392a273f86c194c7d9fefbbc0b05adc6bb96dde0bd4a0548cae4b2b4873ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/az/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/az/firefox-75.0b10.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "85e1c4ef9870c9aaf670d107b5810782b7e148f6edf61123c4326be0809b1103f9bc5a05e87d06771fb8faf405d9f648df364d99cae9be32ae2242d1c488b5c9";
+      sha512 = "a958d4c3d74e4fffa02afd05d5eb21bbb50baf83cc70a35ed7ab7d156783f3aef2425c97a7d56fcb51175138237690da7b8c12429191d6831d9cdd39351ad3ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/be/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/be/firefox-75.0b10.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "34bb18b6f6ecd032ce0984513e590e422d01ed5b92b8960a7a4e64b2a5f5b2f19aeeaa6b7227a96cf6b6e97168674a34cc3332d019dc5d3257504c7188ab8418";
+      sha512 = "12d22b8ad0e44fd059c33c21e6d6f12c37e767e77bd2e16862c7b19ff03eb546bb6947fb9e64882407a0f19264f7ac7eedc91e9e04d4a7025363773df5b184a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/bg/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/bg/firefox-75.0b10.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "2481e01d1656a26458cca5f1f9eb7d7f101dc98e7aa7ee620889b630393a70a82132758323d4ec37c5ee640874419cdd2d5464d64e820876cb924679f03eba64";
+      sha512 = "622d6c1671b9d1db0774d79684b32474ee31c0bb09d6dece5293ed823fe2c076acac85267aa34187eab0e7f4eac7bd00e1abd92489bdf76102c967ffc654494c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/bn/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/bn/firefox-75.0b10.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha512 = "6dc0d391e179cc13465f60c98f9a6425f6fc4f28f2340928a35bc3abfb623c28decbd179012d162cff661dc807974f5df34427879d4838ab481ffa75c0957e77";
+      sha512 = "648cb4a46f2beca9a60abcc0c79c4c15cce7480efe4d883985f42b42d64cf4866ce19c687902804c057a46203c1d1b8069a46c1d3303c80adb71a0cdefcd96f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/br/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/br/firefox-75.0b10.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "6fce902e7e23277c8446df902349e626ae5dce2435ce56e57824c7a0b5729ae95b10878525f9b5251e9c91e1cbd97cc1ea7792136b271cf88626fc97cee5f4be";
+      sha512 = "8bbf7924777dd348d6061d40dde2ed284b600e38dfe56c126d83d522811753aedc138282678e97143249d331f4b362c48e408ae3ed8b7a2613538533a34477ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/bs/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/bs/firefox-75.0b10.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "cd46d5f1e8d68a7390b2bdd4338829db0e25e5dcf0a52d538db311b957809c33f7fc9cfef92a73357743ddb9b3ed0ce593c9c0cc8428f7f891edc3292c00d37d";
+      sha512 = "28de9bfd11f7b052b1aff150e940c115ce9ed80da2031cb484dd92d06570aaed47e296e2163e3256ff6a9a24e559eb287bf26210b9f5cd125a46c3dcafa48685";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ca-valencia/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/ca-valencia/firefox-75.0b10.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha512 = "e79af87bd369b75319565bc6301cf312022b85562ccf6cd2abd6fd59a26b1081a62f166c7efb4fbb6ad1ccb7befa8a8eec557addd9c4115f7da1594a633d243c";
+      sha512 = "566bca94dd304d738bce803b7ea547549993c3ec6ef04dbe2655a73526a3bfedc8a6573897b0de777146a9c980d8c9a8459361af8c55a524d9d80035e60a9f3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ca/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/ca/firefox-75.0b10.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "4241eae0654e5466a1c04aff0de003a676c775470329a973204a2413590fc4558aec96ac33e9e14cf1ab7eb52054ec34e7ebbb149648dd4e8d33cefe2b3c18c7";
+      sha512 = "2c31cd0b00bd4c40ad44b98330977c78d90df8871c98fb0142486169148786bb3e0b2f519fe7177578fe6af15b13b8a9d3a34c1455d3dc25c1f611822dea6253";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/cak/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/cak/firefox-75.0b10.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "5bb2b8a2eeffdb7a06c16244458ad8f305725741f05c0fa367534da99d0bf0c4399e05453b64c505f441c4036f3e5e7a4e5729852a848b8ff4210d674ce7f065";
+      sha512 = "169dcc80ea59e8677be5a18d65a4acf0994fcddb3cc3c1441faa2d037417f2998f85199e335942479259869d75719e78c93a9767ad255d7d2e63e8c85b433185";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/cs/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/cs/firefox-75.0b10.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "50c6ba425d3be7e12667d80bd6e57907082bd3c155b8d3b6bedae64054046d3bb02d8894445cd5d27e3251507730c06bd3eddc96a11c36c4e9c7a3b9cdf796ff";
+      sha512 = "12870bdcd78c403b5dc88ea0bed83ab2342180af2456429947bab834e53b7d3907f0d930a83ca8c776e98eefc4575c19643bc4364113cc8704e2465faed68481";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/cy/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/cy/firefox-75.0b10.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "0dee8828858c2e0013788b680b8f907e6464e219fc6745af8d0e7d08575291e926f2be56ea7becb1b231f1fa0feb1827b5779b7f720606729a37847f7d8322db";
+      sha512 = "be927939b36bc8070c1fc2abb71bd61b5c399d1ab953b074d5314c85c547d65396d984e38432ef2b231d0336f5d62a516c58464f7efb50eb5522cb35d80283da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/da/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/da/firefox-75.0b10.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "d69320ec8c0ffbead25906f9957d73ee9bee8c7ff922e7d2d2e3cca3487ded5e836d41b8faca42627f722c1f2d43fd918e6db6e9d93268155865f1ebfaf6a5e5";
+      sha512 = "033105e6b6f47e4a4ce54d814191b1cb1ab1d1a02f580efac6f6d624af9b800abf91a400bcb4b60c0adf33aa7f1976edc10ce50c8f213b86b54de4df06d63ea9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/de/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/de/firefox-75.0b10.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "a64fe63ef81c8ceca0c1baa0bf55f0aa34b662fd9d0417a262e7d539164ac2f0b32eae89bcc74cec4113356fdb1ecce890509877bbef9af2eb6f7e91c2c2ca33";
+      sha512 = "b1d88b5edd71f337a569057f7090e61466bccb6b7ca34f0fb4d20643d0bdd7d5b190e6ec24c87b2e0b3e36dd815628f38b6778b9b3ee508246186af0b6193022";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/dsb/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/dsb/firefox-75.0b10.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "776c66f6421f250f22063cb77c5313df75b20b7b06a396c8124f7836b56e7a18fbf9ea996d9ebffb58a00ca0a27957199e4a53b777f5ed04281317926a95a84a";
+      sha512 = "433fc501fbe424a19d85b6a718353de43a7f336f3a6d93fcf97b5aeadfa397e241fc61e45fec329b2972bb96d78c37a3f654308535e30fbecc958c7672e0b408";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/el/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/el/firefox-75.0b10.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "5daaea449ade4d15deb93864b0313f3b8f780b6f51e1ff63098a37fe83b39151bff5526d8685171fdcc2ff7ee874f697e689e47a60e37d01ffdf2a9d3efbc38f";
+      sha512 = "71980b03314b9bb2278e4d8c53179746e5f3b24330d36cf29ca1617e72d544f8ddb795f88e26ef0a1c8f368c3934f394a9aa84854e9bca73cdef1bc89f096db5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/en-CA/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/en-CA/firefox-75.0b10.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "2d3f4aaafd042888a2b192419fc5fd5e841a922a1b24ff8cc95d52343750e64ae8a0deda694faf3a1ec11e447f25d8303f5905b1f98349ba5f0e705eae4fd615";
+      sha512 = "fc724954162c72875918faa829672560a6da7756276716d4439b93bda2890438d47380a79dcdd10dd66482e991e858c727d99f325c2928c92f9ca74dfaa90968";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/en-GB/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/en-GB/firefox-75.0b10.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "e977d28c7f2a54793098e6557dbdba56a8a6b0069912188c59f246a004147d17454a338df4f4335144e9d4e5a52a510bc94076d3f38c8fb28797a08c59a903fa";
+      sha512 = "1a5f1dfa79438e9310d8c37fb01f7054755ceb193ee9288f29b47f571469492a91842946f500dc455c501ad08d4d4f8a4eb2197b78698374c7f995209973e69e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/en-US/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/en-US/firefox-75.0b10.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "e30d89b9ea552e7758f550632b41c19a34dcd75291a71def8aeccb4a51ddc0a3da16e181a8c9d441da0d671a89d0f7a481e19599f4815beb96aaf7a95e10e078";
+      sha512 = "7a833e05f07e311c3cfccab3b8337b129ec5045f8a2d503f4b90582b041dae635d91635cc95f1dc6192523f4e5b6edf22262e3ab28953f9e1bc931c42f947b7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/eo/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/eo/firefox-75.0b10.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "5d086d6725cf99aa3894974d78cf0e337de0244163e3fe8507aeea9386233d14ae7a1f1550c563a5fb59f0cae51d579c4f0e578c9fb56ee48d39be6d644451d9";
+      sha512 = "18903a08c0a448c7fed2d6a59c65f0bf8e73deab8fbbf4b29704173b8e9756c5fb951ea8972f63e7dd1f2cb019d497cfdd54735234177536d75ac158061d7d4f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/es-AR/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/es-AR/firefox-75.0b10.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "ff818af501719ec198d21b5a53d54603fd591d266a2028827283ddbf5bccfceb4382e7ee9ad1119936a2301b067882f91fb04a354426d4587134e065033b4028";
+      sha512 = "d78559821e3ad7caec3fc64d4f1b5e5d5123c5024834de5d1484f319aa1fba0fdf14db394582a64e0aef793b0ca44cceacc73a416fc3685a981ffd1c6cefcc3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/es-CL/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/es-CL/firefox-75.0b10.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "2bb98c8dbcdb4d2ff0eb660517e1adb99d7917e9cfc6429e870ed3ce168f4c2292feef353e870293bf76f7d9cea4095c6d22c59fb9ccaa9f336c93e9009f8d50";
+      sha512 = "ab6fcb5121861e29f96e1907835bf7257e973e0e3d7836238c43f8c3a20b414ebb76c635ed991b48fcce20413e2b4d692852147f8449282a68aaa0f1ecff76ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/es-ES/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/es-ES/firefox-75.0b10.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "4992db4b3e0d5273e73fd7f88e7284809a5922c2b700b695830da7ccc11c40a23954a03a602bf319678a432da218be8de825b15e2eb62b6eb62a0f34787ba0f3";
+      sha512 = "cbf2f19d578e85efc54ad3c303b131b39a68fc0ab711726c401e25321ff88959d9139ebfddef8afaf3215513abe90889f8cae6fa530b788a5c7ecab24a70efd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/es-MX/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/es-MX/firefox-75.0b10.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "df8fd54ca32af5e0d579a2fdff569688248f4abfd30ed677d56a0ad850fd603ac14aef086fe8ac167d1819d0e7b354de77c948613a9ccc3e9c9adefbab99d077";
+      sha512 = "c815be4d2863fdaf2a012c2eedf3334aa7d23b4de223336e73ff1e8a6590d7f0a827644cf3b3ed95450068d6ca009f998925f7974bd423d5a05f58f433af0fa7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/et/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/et/firefox-75.0b10.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "ac96ffaac54039cab3b59063614ba8eb5e731ad0912e83f4b61f812c927f0f075d9d9a6123a3e1211bf96c886a925273f16fbd31d75709a195379b763e936fed";
+      sha512 = "df4337228872ab82fa7021dbe55635fb74c8003cf6e1a6410174e3e79411a1e74f614c09418c12bab5a41402bc096d5f437481fcfc64f1d6e63f8d74320b68b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/eu/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/eu/firefox-75.0b10.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "4ced029f5d52fdd172d9f25e8dd062278758b6987fae56554e657dc32c2323caa52ef89021564d9fcd4663e75e0a8163e925c32048d77acfc92a0db9ac171248";
+      sha512 = "59ebde7f44c21353d1b9965e2eee7c321d4c30ba27469edf73325c608013d2059012877a44b7026728bab701b6892ff1b7642e99d428cb4a0afc05c8ecbef2ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/fa/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/fa/firefox-75.0b10.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "c4f131631f72b98b9fc919596bfbfea8b605f2108b5094e9e265df84317a825de9a06cfc4ae52f7901138b429f9c7ffaa4b719b18e1485007c6ffe96d689f690";
+      sha512 = "ecfa50cc8b11aa8f7121ce0fb43b2d64d8a39af4277db83324deeab61f19cc875d8598dc29c3d77a5b50f147780d0f5c66e7645bbd709d6b641a8fa493a13bab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ff/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/ff/firefox-75.0b10.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "c0f61fe82231d8a22f550d8399e05e7ece426fb2f1d15d36b6c43ba3c3872f07f76102a69759fab6533bf08a8248ca7dac3c59d723b3f54161e959d85c24348a";
+      sha512 = "d7b3319554c6b411a6ae23cc6d4178edc8320af733b2eab2eccc1f485f65a8de948c7f0e4501917efc6894337bae679c002b687396803bf8a87fb7b750c0bdba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/fi/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/fi/firefox-75.0b10.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "39bab8b71d79b58157278d3f480353d637c54cd5f13e75323d9eb2ec95980bc004e828c612f080414f85838460e82f90a490dba51d312a5147788fa7fc5c5fd0";
+      sha512 = "03149486c36134e7283d294980a145b4f58088262d9161527614e8bef55777f2a32b8adb70d5e2e960dfe618de496fc42430a90ada7ceea38b86252cc3269887";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/fr/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/fr/firefox-75.0b10.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "93a42248cddfd6d3c4151c6f53d2ab00f9200537056005998c7d9e5a3e8444a0f47c621d850829bc0e0f0b21cab9611c1ad5487f0bd8b2a3d41da7d1256119a3";
+      sha512 = "326994f05cb4439c247278a53724f47db0c6701ac81138182cb3e431baac236b590537f70828ceca9b5b59e76ac699c18f62fa467e69149cc4232c102c753242";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/fy-NL/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/fy-NL/firefox-75.0b10.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "23acca680d2d1a585103a26eb9aa1d8e84d35865fc3854d3a2055ec8337d42aac3d2bb0eac21930816577b60eb4bd6d47580fbce5f7a5e47791dbf798c50487f";
+      sha512 = "899d9ee16aa62a9d2d0aa8a3bd8f4dc799a9590edc0e14bc34d6857e04f0bebc92b6fd7cd34e8614018531fd59ade85f335e1224df9e9cfe230fb3afebaf1c65";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ga-IE/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/ga-IE/firefox-75.0b10.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "05cfd56f53d033a70c1e1ec08e1355e281ef525f6389ce849c87b92bc6edbb4c953e054326eb094c5862dd74db64839e36ec31cf8ad3fc2248ce2ea309a40bac";
+      sha512 = "c424584aae894faa4e7c0603eee8e9b7274e0112991979bd47e82c925b41e6d31726a614d934a33e8d4ce47a2a92ff6e4f57d5638e2f0a1471c362974de8c994";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/gd/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/gd/firefox-75.0b10.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "aab0c4ce13a418c9de0fc5655bb5d5269dcd07ac67e75bec66c419f06348043c2c69816704b770398e95ea0a65cea531600bf9322545bb40394b3c599b71cf58";
+      sha512 = "ce578cf7ac65ef246fa74372cca5669fa3c236e5c19f85dfec09cb5d405cb97f71b13e2ee082c43a629d0aded6a2c770e44c4b2a05ad4fd144d0c8e5a2ac3d76";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/gl/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/gl/firefox-75.0b10.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "61f4b6e54d98939b361fdce716be0701a51fe789085db0df4dbeac5a64258fb3ef3dc30ee6cdc1539d9facce481cdff5076dc19bfffce31f459e6377f7fa6872";
+      sha512 = "53e3d345df044893213ad58fd52286eb4a92491fb5dcfd8cb7abf5169697203139f8a071bc6a299ce0a6c49e4bd6f36f5a47061c3814a08d51f240544fea77a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/gn/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/gn/firefox-75.0b10.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "fc77cb70f71f832ca7f9c6b6ac9e7e6e75737c669b229e3dd68c9061a0b5b239cd3e5d4c501a45b8b964c862230736c21a1431dffbee82dabcb4b9f7b95ed09f";
+      sha512 = "72709468d4d7994188b6cd3819d8e56a1b0a1013c24ca982f7b101c70aad49e0383352a985aac8e8d23520ce13c264de4c43641e65355ea1c9426f035ad6f57d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/gu-IN/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/gu-IN/firefox-75.0b10.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "c5e4d9e031b97c61b1026073fa3f772158b803c688c8bcf35fb6725b86daf9a3fa970788b8468f4e95303adf73c400ba7b72c52e008d0b6a835867c73a583164";
+      sha512 = "8d5da02403aeb0c856dcf817c7d1da97b6545cb5a438fcf78ee843cea60a1bc5d62b7c673822f5fa3232f4d01ab2608b0be4b27f6c115b323b9efc63ab89636b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/he/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/he/firefox-75.0b10.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "49ab14bae6d4e7211904a8da54558e70276897fbde5252760bab17aabd845f6d961e79b79c775e338564b94534a4610742968fa8abf09a4bbd49cf7241b86f8f";
+      sha512 = "40f4010084e11a92e17878a8f314993b32266d33cf5d52cc71a61ebb7531751c3a3d6fa491fbb34a6acdcfb317f149cf1dd9896d952d41323117f709ae75b279";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/hi-IN/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/hi-IN/firefox-75.0b10.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "f7b89b02f01de7f9157160523c30388064cfd1c9bb2f24788e41d3f6eff706a76d50c562c7f270d3b1287d8d886988f42d0480f39694aa6d1be141bcd926c6a0";
+      sha512 = "be0f40d735c61d0941231318b45536ce0a79d2f849580ff4bcc1d26a99fa9801211bd112d45d0cd627e87779fa8f3b74a5e2989cff7c09ebe7e232b4b69c9ba7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/hr/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/hr/firefox-75.0b10.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "d8319df0d4ca8c3bb403fca56565fcd16916e1057470046173853fc9d299a04226eb2e00a1cd14206d9e576b73f64722ad65e7c0dc6c99de498bde7ea5b35f11";
+      sha512 = "8fbcd25ca7ca4f06dc02c1bf0bbf941dc1bbf80c01bd427ce68e5806c85112ca695fca8ccead3c820fead7275605eb4efd60250753a6eaad6c60fd48ec778b94";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/hsb/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/hsb/firefox-75.0b10.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "bcff9cb8396e05dfe124fb3bcff48cd526322920ff38800988a1c82dc9adb6927b8df41ad52b9bd3cee18a72e6f065c8dee0239137b84581d555cb9a69e3ee78";
+      sha512 = "9a35d05af5b59097cfcd8dc7f67c95d7042849405f397dad4d817cb6e4e45e446d4b5de4dcb2dcbfba609a2c0bba86edbca948beb95d0ac076300b9cefaeb95d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/hu/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/hu/firefox-75.0b10.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "a570bfc699c1e3e5e9bb733eb1b92a8d8d31313aed84d57039a20cf3c821b51de36523c17d03dc4e1f05d57e53b07ca1457317452170cba84bb5a98ebcd59c41";
+      sha512 = "63bc1b8b3a99d7351e8f6e5e240cebcfd0600c6cffdcd4618c77de21dfb43c21bc51c5dd74049f0cb7a8175c26409b92aa2a19b3c3738b1a69374a300f807050";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/hy-AM/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/hy-AM/firefox-75.0b10.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "72758745bc2fd3ff651d5df2ec3a7af7697f299f488da5096fe2b740dc2a3340ef29cc4ed107318533c4b1e7438688169f5bf2d103b307c615bbb9400a334091";
+      sha512 = "549e4f7edd552a68bf05db03d21818093a8146e8baa246fa9020791765ac477f4bc3440a3928d621d0f75ed863b9a0cd57135fd0fe90b68e1439e56b36f01d81";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ia/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/ia/firefox-75.0b10.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "9fb6659aad83d753c244e4efacf55e5918692964c84d6428f069e90710693da7b82a47ceedccbfda32eba6f3a8948e01ec32695c9261bc254c4b7e1b8f84eeb3";
+      sha512 = "cc40a20b408037a94a2527f0f9a00fbab91ccd1b750068298ee679775b68c7bc3ddebbdd6f1e5f0e69ab5b0ef4049fda2624ed522dbde71e5dbe9c82c2be0922";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/id/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/id/firefox-75.0b10.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "c54aba052fe2f4d4e9eb08a69b0bcddcd4e3dc84ec6be643d34eeaa638e50d17658f530100577d5d6acc97dc7a5b4baa640bfd0329648390cbdb22713ef70911";
+      sha512 = "284c2e5c2e44e228c0d90415de3166ac1da7609a77c71d44df04cb1ed1c393927c404d1a5868d12fcc6f037e87123ce01804f267853fafb4f7b8b41647ad5b4d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/is/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/is/firefox-75.0b10.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "01f552f0224e2ad316e84d3ac55051f1403cf2338d5c07767db463db05bc19728b7f096a3d30bc03cdf86bf81bc799a310241d33b8a4e7e5dbf3db61bfbde263";
+      sha512 = "3db4802ce663e1085f99a10b0bbe2694d5e53fec80d3926fb8f769fa004663f80a5ec77e6c2ff0278b4465b169e46acddfebaf4298bb26fa2950307251231ccb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/it/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/it/firefox-75.0b10.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "bbe8a2f64dfb54a3a4b13d7bb14a0746a28bd16be46608744696bb12aee1b6acd0ad4991e2ff7867e9679a3bc51c8d47690e08705b6c860cac1e27530aab24de";
+      sha512 = "e130c5b010bed071ca7530a675ba2424799f47d47d13723672644ed23af45c9005fda7ec901a5d6b74a2b3120f9bdfcb3d171c89ab8102c77b62930d55f8b7a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ja/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/ja/firefox-75.0b10.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "437e74242ac37576dc01be92bf4fa57900d282b0919e4fac8a073bcfaf681ac2dfe58c2461ea18e912fcee85b97ff40df3f8f1c649ea442a557388544887f7b8";
+      sha512 = "b553c55259b57b292356cce1d64383f17ba6b9495d5557d8df6729533b5b5bd8e44bfc7a6a978f0227476c1431aff3d370ae22f9f86e2baa170e5522e3b111de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ka/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/ka/firefox-75.0b10.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "d7d4374c1f2ea6e2c2c40e3d425093065dcf624b50532116e576f60fad51b85251ed7284a63b4cc2cc368d1bd80eadce8d82a581789e02ca5249a2811fcccdb4";
+      sha512 = "e733ecc43fe153aa0b11a6ae3c993823d341e0317ae7d0e6d26118d91ae68e3457a0d2a99e33e816b7ab8ba79902f06c92362c372338e071c60eca9c63996f02";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/kab/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/kab/firefox-75.0b10.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "235f9ad96c86ac81ee8b7fe9ade89559751969ef48eab577276e0289cededc708bc05eaa413febae13ca4eede96772915ab4b6726dd8bd5bc6b7ee545971c791";
+      sha512 = "e8edcae1a37574e7770159355ff2ced0b7e8a129d3be11ba6a457128956453f14775747cb3327a794aa70cce6d9ae013ed5ccaf571c83aad7abedb9158841948";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/kk/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/kk/firefox-75.0b10.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "d443ac7f6ef50da01038c7bba9bf4a2eb12b53410a5201f64162eb2a287f5f4f16d3408715ddfa58471d53e0e58edf46778141118a9b67dea410af683540f82d";
+      sha512 = "c116303af6c0c5a1d07acddd183ad60897656d5434b84a3f1398b02cdd23ff533eeaa4e5d5feecbdcaa1010e8b5edd0a3ba61b35185d1f1c72a380c881c31f5e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/km/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/km/firefox-75.0b10.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "b3d35fb421b9dbef950fbea28e80b530c9433a9d51760d1d43043637a6b497a3e2a890de8b2eee9b911e60a95308669035298fb429648a21151e3f08dc6a32ec";
+      sha512 = "5b5a0ae2b1582a9eb4794db7bde4173779b1615268872d2e6435b236660cb70ab3e6e79c4c32af0474d55822ed9faf007c5e25a70fc2b11a696ec3b6b15e76f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/kn/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/kn/firefox-75.0b10.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "65d0bd986874b9619caa455f9585d309a30a87b482d0375de27e46a70dc84b5ffc4d066202b7b597d1ac7b28e7be91550bccebb419c4a24a847180c62b7c46de";
+      sha512 = "dae755af499b23a62c17ef10b926c1f403f95423bd76e19f531357d3fd78a89841ac2f87fb784140751efbf6f38efa490aea15f027153a57c45082a7a0c4e790";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ko/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/ko/firefox-75.0b10.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "bf43ec6311e6ba2259e802b1ba569516d5117207738ff4259b2346b97ff85b8048e5c1a6d2b4b3c27a91ebc40ad6a85eaba84250be79e41f4570294448a1dcde";
+      sha512 = "9a31c726cef9f3415e664fb757940f4152ff6952bd4f8cf449af171b2ace9dc1602548a7c3fc9fcbce8a04dc94cbfd173a63973894ec9d9d07a5352695f6531a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/lij/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/lij/firefox-75.0b10.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "1af356fa06b39b9d638b13822e82f4961a237e3587f8b671baf5862a87898f440f564f9836284af6e2e3e8b1f3ec462af1e9c9621ae51289fd0b1bf827a2bf1e";
+      sha512 = "b1e6567fa98896f022ec10dfe4ffffb0ba46b31ac5020f5cb4b615f783bce0ea5a4885dfd366a8a651a2f274cf0b02536169afe2cd630c6ab116d4ee93955bde";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/lt/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/lt/firefox-75.0b10.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "a4ea24a874261b51032a1021878ed2c0102bbcddedbe887c8f5893f428c1d3fe6cd906b3dc53b5b51654c35e03245244aba8a2811deb7c3cd9f6d0e2dae3bdcb";
+      sha512 = "dc863574c700da7bdf91bdf8e749b643d10b91f1cd99614eacad6d3fbb84610b6ec9d5be72e5c4d08d90fddefd61ace8653048ae6eb87eb6eee45f87e56b3c27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/lv/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/lv/firefox-75.0b10.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "a8f385bb407d498ca291d088101adf0a4f93b8fcfb9abd3fc36311fd8e4e36424f888f5abcbc1662ec4f7dabba891ef765b10c4a9dd8364898e803fafb82f7a5";
+      sha512 = "ee188c3a9cd5381b657a07ac79c3a72b8dcfd2537bcd3e251e951ecfe0991663187725b331fdf4f85fa526fa29e374d6b589e1d0c02f044beb16d29848e6de3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/mk/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/mk/firefox-75.0b10.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "453a3e2726115ff8aa057445bf05fbd9bf5c796fe8efad9590aa09ee8ef3d70cd6de3008503c336770ea3cd259d226962c1a6e198bf2519742e14cf3846b1975";
+      sha512 = "5c03c296fd93f4fd2308e8f0ef5c2eb1ad512becce6411957170adbb93bf7b442f884f75bf9faaa8c9cb1cf55bd478984ed95c1e918b98b49e39bf89ffc345e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/mr/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/mr/firefox-75.0b10.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "91bde3db18f77850affe7c3b981b8d233febe8e95d8528443a80c0b569b587d2e605ae6109206463ab273c9a28ca8db51cd6920ac30664cbbde9148fcab6cd36";
+      sha512 = "d30d2039d9e86f254a35e9f7d0a42fe6d899a93a6fe3f128cfc41b39a52ddb05644780541dc839cdac00ec3aa2f9a81b98b80b2262db53711a30e5808bb71c7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ms/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/ms/firefox-75.0b10.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "8e758ecfbd281cf443dfff4950b1065337fa92b1c47c4a73f9e78f5ff1c19ef46e3d1ea1e9458646a9beb6367dde72062144a2d1d2a94a0e0ac1b40a2991fe3f";
+      sha512 = "67c6c6ad97c6dc423d4f28e0468f475d49599b6b3c1e93434a177c2aa143c017495a3a04f53ad303004e0abbd3559d39b1610c2bf2c2f78c0f1d858086d433b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/my/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/my/firefox-75.0b10.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "1129e76bbd5ba3c96e8110b3b00eab0975fe38749da46846ddd37299f73840b987826ad80a3d3f2dfc4ad0ff38305fe45f736fa90c671162a3a9563eb1a1e755";
+      sha512 = "e9a5566ec6ce3e803362cf5f812675ac45ffc764616a0c45adc81b1df00055417f36c85254d7705c8f26c3f45d1ee179c029b7023e1fd2f5c614c121396e5a75";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/nb-NO/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/nb-NO/firefox-75.0b10.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "3aa4e29466e7d6e3e3d34a570d967d4c14b3fc3977912161d30a6845d75abe6ec745ed77d08716a11ad8a6d6e6656f1c5861453af27c10184795ec29bb22a386";
+      sha512 = "2a5d4b60a422697389413da6b962d7d56a55c0d29a2f316d9e054a66a77868cc0001095aa9da77ade335515deda8837a3b1d8f4b31842ed03c4b6f281c2b424b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ne-NP/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/ne-NP/firefox-75.0b10.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "4f9e880dc686e04249553c5be99fc9628105aeee67af7db88cd0662bc4a9fd37e8b9b18921b608e275d7e0b5f2c03923552705094e6749e0a3d0421e82a2bfa8";
+      sha512 = "21a2096f3b41786b744cff062aefe3732f54353add708fbcf802b2090e957a5749788371681923cc72527f4e0a51fc358134c7d6dee816037fbe08f0386ae672";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/nl/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/nl/firefox-75.0b10.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "e271a6208e6b7fe662284f76f22482d854be8e700923c96b2426036588f02a52c9698ef05bbe8422dcbc4a899eac3bfe247f28146e2f64ebe0699669219051ce";
+      sha512 = "45e1689c8bda392529edfc19c68652fc74a9e2609920a7bfbeaf8d34d850de94cafbda3d4fbd43d4bfd4e5513020dc02b0037774438c2ddfb37c5f500c187294";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/nn-NO/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/nn-NO/firefox-75.0b10.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "e7a2b1e038cae097babc40eca692da1a4066f01a18ad958378533ea03cdc49e917e13c18aae0fc40dfc99723e3f86b25b1ae35f2d400f83add63c4151a4807a3";
+      sha512 = "6658b323376ba5a5ed70b5ed2bba4a8f562d25748f1383d010e1fcfc0e1eff693a718b39969696c8c69a0a8470345768dcf79797149df5f581859c04d54da44e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/oc/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/oc/firefox-75.0b10.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "d9c3701024ac70fb83ccff3e2b843d224115608b7fad1d6db672af3716e9fe7a80efb8d92a366d085376dea51daf099299acca629113779622b39eb19750dfca";
+      sha512 = "ed35d60848fbf2279d36557134e5c674b8a9dbd86bec1f9f7a5b26445ff736ab6a59f530cb9c5e3b20f5ecc7d625ccca7281b207805b782b1a1e425f1b69c3e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/pa-IN/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/pa-IN/firefox-75.0b10.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "68d13fab28380f7ea29898dc2ff91d6a2d591a2bccf0498023494466827b4b4eb7ca7769b93e042dc855994d590d770b80b9c5d1b636f6923534a595cf6d356d";
+      sha512 = "4c127cba56adfc3e84fb8f72eab0fbbf15c63d14747bf18bde8f31df12f67c9a2ac0db15ef5a47a92e56c7c3f189feeec372d28ef8112505f63bdc67b8989e6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/pl/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/pl/firefox-75.0b10.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "69b5807c0cf3053f87e5a8b2fe51dfa40146685afbab623a7824f6fe6fbe786dbd17c683d697f6b61adf78f800b84c0c5a16e7caef54a6b3dc02d0ffd5ca89ac";
+      sha512 = "40f437f3741d89c2e9bddaf3be1fae6087a198476b93f392b5a151e8318a291df89ea8ba4e4bff0bdbf663e892f582539a4ab316e8b0f323122bacb379880622";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/pt-BR/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/pt-BR/firefox-75.0b10.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "f9ae02b7c9c72a97b8d28ef1e1196dfbbd5ae30acd82939c8b7fe37a1de0c73492ad286e4ff05c0b5f8c2784e0a1b2b68445b94bf765b501c062f33ad1ea8e61";
+      sha512 = "2fa4260237f003f60dd4f0518e240ba866625a808146ed623283b5a8c97ca764416b7ec4590c8a12fcf2725dc62ba2c5469903205991086b99748d1493370f6b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/pt-PT/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/pt-PT/firefox-75.0b10.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "e89bada391d72440f6fb60933f33e78642a595dafb277d4d20768fd418c6049f6969cad8d1b95c76670cf7a033acdf438348e0a6efce9c699a7a2276d2b03f56";
+      sha512 = "338b5fdb168bea4e929b42a9f3eef9606ac9735214f371c03c9cc83b85eb79cb346d05dd97061b68e3adabc5b7bfe573c09f2213ff9cb1324691a7ba4cc7a59a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/rm/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/rm/firefox-75.0b10.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "281ff5d841f3dcf7e2ef42a159a5a43426fca475bda02f70a34b7fce50a0e313f61cb11d25f0876314aca3f3c285504098c60f0e79385653f8b877994e5e5275";
+      sha512 = "56232f4e4dd5e8ff7b3f3afe27b79a0dec90e4b8084ff7c0fac312d3a011509b452c78ad09ab54cf46dd703e91a8ca433ccbcaf5758fce913bdf200926134149";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ro/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/ro/firefox-75.0b10.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "62bd91413af9017d6d4b70145f4c763fa7b35d78719ed14ca808ab3a38a4a3717eff3584a29b4c38de05c78365351cdc5a07bb3a56d46c65ee5447a3a0226276";
+      sha512 = "32607a37f898fd9f88392508d5621806976a1e0ed0ced51729dc685933d9c6f4d53aef32c4248dc443b05878f9b74b589fe2fb393d6feb20764cac03a83a4f34";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ru/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/ru/firefox-75.0b10.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "40e917d1a07ebe8a1cc6af2b399187f4f918ac3d509eeb8c6125147313b469847e34f8b9e705b400123d4327ad1b13f2b4de24f70e33236f7bd4260b4b13ca94";
+      sha512 = "e4968337de20e149cd93197e9393c2e8ab907af26b33c6d45ebdeb9b6cb8bca7dff9816fb93605e3fe102c376c830b5b5ed02218d0c3ac1d2191383902df8ac9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/si/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/si/firefox-75.0b10.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "58874b4198c1a7b374ed0d72cc223733889a3bad6f717151dbfe7e584df3059527d6a4ba055575d1c2dea74393f3d70705185e0c2cc589306c5f1e62a31aecfb";
+      sha512 = "4ce70c7e12e4c4869c51f265625be73d41565f80162c65cab4d4ccd2c4fc8d074a9856809bb7e7ed7b77d06b1e2223a183bbf8e13fb97f74598f01c0665a2815";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/sk/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/sk/firefox-75.0b10.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "6cc148e5f962006d2f5a5651c99e170b706c0e51ed82736aa51a3a15e8b254a67f6df6d7067e261d0a269e71995e1555de7fed81b02776885dab67881cd17cfd";
+      sha512 = "fa47c753b61f6acb128cb041471cc10d8b64cf379bb6290d2930d77edee949a4a1db789a238b1923f4ad3721a27959c3ed449a3c107382eb658cb9e661615de1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/sl/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/sl/firefox-75.0b10.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "1abfd77e7ef638d1d1fe1e1d8b31631f0a93e982c22c6affc9fc9af77dacc81d53afa95f63fee1a1b444ea7db88826a4f6a851c87b6518f2c6a77329c4aa2c8d";
+      sha512 = "eb3c761f471e6a8cf00f180011dae1fbec2e01bd9938e4db575a592fb1a8bf85f1cb598da8d889c3e9072477b231839009a35c56ae73f745234abec88e7edfc1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/son/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/son/firefox-75.0b10.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "80e7fd5e34fbf115b4462913449d58e8bdd725f45120d068b8ea6624293cc944ddc218e3854b7e6935675ee1640446f063858515c70bc1a7990a3c10ac812529";
+      sha512 = "2c8d0b50c259d8c702434986ce0409f225db9893251d482764a35693df0dc1a990a654a293b7addbd684e8509fbb7221a6cfdc5f74810ef75c4b69b3fc2f0d61";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/sq/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/sq/firefox-75.0b10.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "9e5088a05c22a448bb1212d2296d0b8690189d6bba8053661445e891b6e8c2716ef76a82e6659eda9c434f92a7f063e13845ce20944df571ff318eef764c2ef2";
+      sha512 = "7ce029b1113efdf73b135e5a8d77fd8e4a9f072f761134259b021117c64fe8988b56789f2472f18cdc7fdf4c4d835c3616d9dc753abe5c31e4b6303353fa88f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/sr/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/sr/firefox-75.0b10.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "18bfaaf378edb31b99bee33a60ffb06138dc6c7ff34c166de30255ffdfbcd7c2cda214678bfd0e11d4f5afc4a666d6c3ab7d1ffc92137abbd08c9e704f4d1d7a";
+      sha512 = "a18f3f867cfe45c55ed0107e3c85bdfb5be498bcfd884faa372b2481a46bc9d3331373f232af1148fa513a751861bbf88269bb79955c5a71018555ad9be56215";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/sv-SE/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/sv-SE/firefox-75.0b10.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "f27fed18480927afae490b8f0c2c4c925045e56bb355404ef499289909e256fafc694cf51f030fd69ea395ad5b5e593f991ac428274af745bf39336d247e868d";
+      sha512 = "d472d497d39d41d9ea130b16c5f6d6a0e66fa06630f160a8e3f46478635d9acbae39129b12b51f7271c610f4d4420414dbdcbd3e6ff300e964dde2a0df83dd1f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ta/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/ta/firefox-75.0b10.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "200b41c6db82f1282155cdb348b8496bc61c9e248e6049e7dbaaec3732b4711f32b38b3ea349b47f1228bd8c712b15db3b9296babc177169795fe1819144ca93";
+      sha512 = "3cc38475a917dad35f9c6a8f0924ea63bcf256c3adde4f9692da44094661930fae05cc021b60051cea0bc9b61770e5dbdb08c3eb17d5057596bfb92c9cccca87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/te/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/te/firefox-75.0b10.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "193a3b9cf98de69ab236f9efd59e23deee25eec41e409a93c9949789d242957f2b58bf724fe3effa28111595c9d1e49a657a5d7f6c1b77a285386b712bee67aa";
+      sha512 = "65d72486dd716c77bffda0b8c49fb0c602eac401c5c7195503cee408cff747db1079b70545c76b1ef208a6abf6580ba99a0127243db31b22981b86a67e144fb6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/th/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/th/firefox-75.0b10.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "3ab9a77fb25870271c9cc415c31f1ec0258a66b3f1855c761dac367cfb509b6c73630c88f022cae271cc553adce8ffe63fb1bbd489067b92772286fbcd765c16";
+      sha512 = "019629edce178200658927f39cb328d524b577dada0b17bd68f8b69653296b81b17c5d511eaf119050a4142520a7deddbbde9c68b3739958db43c63514faf4fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/tl/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/tl/firefox-75.0b10.tar.bz2";
       locale = "tl";
       arch = "linux-x86_64";
-      sha512 = "f386b2d32e2656ef8e9a0afe0050eb7c8d8a1a00b92badeb6b5c2c6d8e046a2ca7b038677af56e725d15ca4c6111a04e1c929cad0575a034745e2476497c2cdf";
+      sha512 = "6b87528631852395662c7bc4dc6b1190739f0bc53074792b3622cbe695951464f77df59854afdca67e96014fc27afb4018706912b65c1b52067e65fc87847967";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/tr/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/tr/firefox-75.0b10.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "802c72564706b4e447f0cc2835046b44395519d0c2d7fcf6c8f8478540649362a49144dba942e1c1e33e69ff69708437a985665389ea2b1307f8c386690f9664";
+      sha512 = "9b207d671a7b730ba832a55e2449a1845218eb5a534199a6b3ac56f498e238253a9931c6b41fc49a169e853ee78f8007312b3bf50f5f7302c41dfb11f865fc8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/trs/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/trs/firefox-75.0b10.tar.bz2";
       locale = "trs";
       arch = "linux-x86_64";
-      sha512 = "60f8f09625d8d2633ca7b08fa3f66573ce0d23035f16773a338fc96944c66e6bc77af36b128589634fc99f86009bb1016ee2d1ed503407c2ff085d20c5e2fb12";
+      sha512 = "159b4218ac9839427e4caa4e4dffd9e454f2aaaf4442b742ca4008e7e0d5b9f30e90e3429400811c6f0a5023649af20cf1df1838db30c0f31b14f39e2af6387f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/uk/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/uk/firefox-75.0b10.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "d3b63163cacd6ba99e3f7dc9d5ac81e98155e77c0315ce9adc2e23cfce614f67b519ebc5ee8aa4f1aaf932c7f619f828487f41c6a712557c3f8289f9b3205f2e";
+      sha512 = "0b274bed2a0180e99af748ba579e446064f288a7cb9e3e38df062d779c79e0a9263241400222597b408cd6165c3ae587b5d1aee2565c1976d5449a6371cadc95";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ur/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/ur/firefox-75.0b10.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "ae76e9dfd1b22a7cdd15c4b4b8b2a508168359cbc6b15ec9b52e489f2670799e1056eb6d7fd6fd28680b721a4912bba982ab259a02b050834e31030960b2a8d8";
+      sha512 = "248500d53c9fc3b58f208451b9609c0ed7e8cc30fa291b4cec50fbdbf19da57b1208e7f729be422be7c83966bdc5ddb510f4c08c345a9a357e436ef8f78c5ec0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/uz/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/uz/firefox-75.0b10.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "6216b85a6b4329f378d057d72418a283c4e9e1454f918636c7dd0845e63a00827259397e82c7875d1157bf05dba32d706cef94239cd9ef6ffe03fb02255659f7";
+      sha512 = "bc6de65e380e5d80b803d3aa26ff81034d937f4f94508f3882103c6bff4c3c72789734ef0147bb7620cb93134488f2b6f3670f500a5ad55652ea3856cbd6865e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/vi/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/vi/firefox-75.0b10.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "ba8fff9fdeb195f42409a10d0fdcb6e8889a6cc49fd3c787013109b32692e19109b9029d69a8458b05b51d8df1dcf085c818a0c1ff5a48d32f68d251e41e9681";
+      sha512 = "ef5d366fe74d289d9938fd0cef16be2ae36426629a4057e86f930a109e41f4b3cfc966b8094191e87b5ef290102ea6afed4cda43b2fcab3204379cf2c8801a28";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/xh/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/xh/firefox-75.0b10.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "0493e6e0d685809ac5f757a829cc0ca0564d8d778dadec422698c369f9aecdccf94be594919273b9bdcd23677f0e8a760e01dd40439262c98c9ae5f17b7888cb";
+      sha512 = "af4062016143c11e2f631e40577389cdab0ffcae256fc12f6bceca7586770b2f0f87af2d0f305b49ff483480b856df89f2d235e4ada38742ae44b70ca7fbe369";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/zh-CN/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/zh-CN/firefox-75.0b10.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "efe3823502fd81587460486dd7df33fbb878e8dc657c3d65d8e3f112374d3452abdfb797eb95ea7d4e3fd7003a2b906e78643ff1f344088e9a8a577f554affb2";
+      sha512 = "17d25a3698317221c97f45aa11be729ff2bd520a0871261a9af0dfb2aef9e3055a29c7f98af8dccee481b628f4185ed41d7de644af414966207894c02dd9533c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/zh-TW/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-x86_64/zh-TW/firefox-75.0b10.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "d3561f2f043480c2c6bb2e0d455a752c2a00f800fd049a21c80cddd03ddf04d184f3bf352446dd3a858bcab5a42543992ebcc86246815205a455095b5884df75";
+      sha512 = "aa6d74974b36a719304e2c5e9d06aaf23140de457fee5fc0885e03a79f9cdd63cdd663814c570f0502b4c173cf2f4bd30be0cf1fb9686e9979b2a5412afd30ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ach/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/ach/firefox-75.0b10.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "7b9cf2172a3e4a7e7bfea4ecec10adba14944dad36db06d3ed60c36a5d893c67a0c6eb9e65f612040e7c3e2b7a9e966c53be7c2d5faca60e37fad2c497194d44";
+      sha512 = "a37523a73e88c2c831085d7856b3013e193a7e477f4adc3522bdcf479c947e9122bd98b7a6de4b0e5bb3abb253972a194a5f14294144fc901d8d669cd74b02f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/af/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/af/firefox-75.0b10.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "3dd2f4ac297e6e358657f90beaac9093816d339f84c21dbe3f87283c6712b1ab70c6fd9e70d05bc79a8997ba314711c37ace35c7c7e8a4140b9da99d953968f0";
+      sha512 = "5712dc0fcabc24d110063e47c5bf99ece66cb0096037adf49a188399d5b23ba319d64c819c5bc981782588b31568725055c6505af65d356db8d26ca6a6e733da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/an/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/an/firefox-75.0b10.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "e04e6875c8873fdeceae22c486b0a5f718085f35a5e46b4f3340ce4654709e4421060be73bccb315db4ac4a93991b5e844653b19518fc122150dd6c6ad84e89f";
+      sha512 = "81a5ae4d844579535502f59581ac79516861253c2764f548597b99443a847754c4a3b2a20cd5e2f5f99d9a459be52f6d7dba9c6f0bb93accd1db3fccb4de272b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ar/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/ar/firefox-75.0b10.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "0c1728f66fc037ffef1ab0f68d5a7e5ca3207467ad03981c0681981c562b6f51df0026b8b323dc4f0e15ccfcca470c1705776353c0b2d4802aeb8879fe306548";
+      sha512 = "6ac22362ca950782fd7766349dd42d26b64f8d09a4e457d167c6947f9d3268f2e7cf318d0551a775175392e83e4e722925d528c7d4207f2549873d293d49d518";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ast/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/ast/firefox-75.0b10.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "1b8fb16468b2db02e8e16d6f11d4924960f48dec2996ff087d94106d4b80c2250acc6e07f510ae4f7db65f590944df8a44eacede55deb915259fa719ad30514e";
+      sha512 = "4d38f9cd0327aaa6d2fe099e4fcfe0aec08ed51a571cf4a1fa24f5eea3c3622febc4ea1cd4036c7415e2ba409dc3e591995a560254f40e6b1a7d0dd1ef2d0bd8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/az/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/az/firefox-75.0b10.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "500ea5cea770c8d8e5e89d367e9239fe4ad065f43ceb2c1ecb2ca997dc27989a489586b6f387149d6d97d204a2cedfef7ee3eb745bc91d140ee8ff162d6327be";
+      sha512 = "49d8fcf7c475b842a06242480d04c5409a85ba6a4e2c9d675468ffa94942f433dc7807fc0237b21835e5aa0e73b27ed75f5ec8324e60696b9b79b0be1dd2f83b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/be/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/be/firefox-75.0b10.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "5c258e46db0b6a22b6a658dbbb4a321226b54ca66fcbf8e41d345ace9c1fb36fcfb415d06dcbe0da14cb9ef9d952146f232ebe962b975d5a45df70b30e0b0b50";
+      sha512 = "d42980d6a18e42c98a485e1067935f9ff909cf46ed94f4354544b2d5ef8d0667e7b3440fdf42f15de47102286cafcd55d4d535cc3a67e219bd07f49f00f4831b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/bg/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/bg/firefox-75.0b10.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "a970851cfb8c1231399d2fadd15390f7a7a9a317169b85543d262b7c1003c84e11140fa364312938271c0288e4a10804628f6ee286dd68d1bccf1cabf4c015d8";
+      sha512 = "4dd52badeebe581328649166f8d17e696488a0341e4a6fee9cfb204bbdb59a294fcd985f751478eefb1f66d5779da4e794cbf9ee551607808b7e638c6dbcf51f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/bn/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/bn/firefox-75.0b10.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha512 = "a8442613f7aefa8bb4ab963e2271612cddb102bb8274e09cc80436e85ad606fa3d4938188c85c0a10aa01479976dadc4c4d6c2a17835980191e9dfc4608a9482";
+      sha512 = "bf975cc830e12f47255acb7faab5ebef279672cc3ef76d17ac0e94e5c0087a4809d7f16e848617f0fb8133859c2d5a91ec09dcf5ee04d7d80818950a5b0a8af8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/br/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/br/firefox-75.0b10.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "a3d32c2ee9fc1abb86162f04ebc7d13d3bf03d1596874c2198e031e2f993d0140fdbdc47f22bb7c821ade80f2cf12471f9d8191c5b7f7c87849a5577e4638531";
+      sha512 = "aa608b0c48cb9c6a1afaf2f1a6486d8d79e0a16f091ede5e284e41b8cd7068adf5f50ab8dd4632f3363145f24e954ae9476d7ca5e565263e06e67d387232f0f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/bs/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/bs/firefox-75.0b10.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "a5d54761563e2a62d0aae4b946b39f2d04d57f2a1245266c11bb4bd872d73cf7738c3a9d7c2ad47ee4c13175bf4f142e45a3a7f62582bef03a946ae98b7c038f";
+      sha512 = "ada8fc1646aad580ab8d2a4ebc4d979c294da499049928878657865085908ed60f6351e2c18ce35d39a0b50c059e103bb3da1db6247b20ceb2d2f57ae0530ed5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ca-valencia/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/ca-valencia/firefox-75.0b10.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha512 = "0b6d18b4f6cc77704997a7fa9d81dc58e70c1f4c08403164b93ab915683c7005410f5f90204a8e609a54dfba5cdaafdb268450d075182efdbc73701f07adc1ef";
+      sha512 = "5a3415dd8c1b1f121ef728d0d84328c045d56966e4a51d5c3afccf2326879db0796cad6ecdeea375a901375aa0cfce536a41ed1d0de6235b865634086e52d4f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ca/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/ca/firefox-75.0b10.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "c65b0437b82cb4ea3b1eff84fc75ebcbf65cbaae22631471fbc8ccf4e2a6ff846adb88e4d93566fcfd394fd4ef4c4d15e63e41c11ded3678fe69032765dbd3d9";
+      sha512 = "6dda02807cf7432b203e20e0f7d9158692dca7170367622acdf604a7064f365878b9299cae1d2f8af43c092f4c9acef885a50bef181f135214762523d93557e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/cak/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/cak/firefox-75.0b10.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "2eb289a7c474279422dbd4fd6396f08946790e3ec98a6c5c40e217efc47a9099d16f01205027c995c0441e5787f48d95d6c40216ced393219eca3d55159a5459";
+      sha512 = "1ef9fddbe2a2cdd3a426d8a5f3de8e23a8e4b17a3d8690fdf793edd2878230bb31ecae12ab05a42830c2a967a9776fa457922591a89e14c0d598c34d2d8caf8f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/cs/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/cs/firefox-75.0b10.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "bf15d558e81ae3a766801b532b9cc2ac5511b2ca6eafaef012a4f9dc8fba06c6ae0e906541db01b59d566453b916bcad79749e1b036573c4a01a04a95a0dd60c";
+      sha512 = "9a497e543e23c10c7e1d895e51cee3260c4c73606bdc1b13c15f50097fa1e60d0fc4910b503be63fd2024a8803abe438a1adac1dfcf3118efba76dfdbf296c10";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/cy/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/cy/firefox-75.0b10.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "66883ec6b398b6071b13c55027a3e3343e3e71b6de5ce7ea72c052c9991636a09737509d8127d2a27fb6550e0937ea21954c85d6daa8492c87c2287d542d73ad";
+      sha512 = "6cd8cef6cb7f48b419a625272010e21aca05d848feae1e3d7fe9c076e6447a806211f24b575da1b4370f5c9208ccf7a23c342e3354c969a327014f8c180923b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/da/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/da/firefox-75.0b10.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "d496d35be0076336a5ce37097026959ff8ce391c07b7ecdaa543d45740af18e3d466470478c9639c4f3b8a5d6ea76dade7196f65e411bd90e5dad9ec1c10a258";
+      sha512 = "5fc1b08d3c8399c681a708f37a26b09b0ec13b697f0617d3461b4af1b2aafaf3ede7a058401c03f50ae74b52b8f3c6337ec8ebe043c64050c82247e88db57de8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/de/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/de/firefox-75.0b10.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "7df38aa573d796c23e00715ca333c7a1f90d560513c17ae35afa80ddf2783ed4f091cf2e0d8b25174186008ef818e5aabe993e2f013af7d9b61fb0ad0c954886";
+      sha512 = "5758ede5ffc0e663c54dc392d2fc4dfd6bbcaf16a62912946f08c5c6114adf20df608f1cbce02e53bf30448889762eb18d88692c95b8b92fa7b047c8a5cbd60a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/dsb/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/dsb/firefox-75.0b10.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "d72d5940904da04577dd0ec0f90128bf4c89b8261f54ade9a265547957fa9ebb7687ade1503a0b8bfbffac094953cd0d1fcc836e26203545ad497221152a2847";
+      sha512 = "0b51b6729c343ed1cb7b620b2e9ba4d5fa3cdea916216cc0665dc1801d865bae880e6650483aa641a50959dce688f3c91e76d959fa1ad1f33f6431881d59879c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/el/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/el/firefox-75.0b10.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "d05716e457a5eb13a51b0bbfda6eba4f9ce775f567e4750831a1a3fe2d5d2beb8668d80dd7375e7b4db2603d589a6209634d6704ef34a851f1a8a750d1ec40db";
+      sha512 = "93a9fc8de7e69606ec21f56adf11a8725dd936bbbf888aa5cf589e6ad0771695963dc1f87d81e2df1f0573eb06bc322e72870968c568764b3e13d495a95d094e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/en-CA/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/en-CA/firefox-75.0b10.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "0821949d86082a2556ed163fa2c977e79293f45b6dfbf2517c3a01cb4ad5d50491e6db900106c4141a93461cb456d613c5be3aeb9afc8d4f502df0fae15c1b58";
+      sha512 = "c104bc144b231aada4d25ccec037b901d037e35d93fed7f3ca7fb960d8a2a873499bc6afdd7916c898177314fe2e3557d08bb2e9b8da85548738ea59b8dd82cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/en-GB/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/en-GB/firefox-75.0b10.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "df4bba4600e6100772a373c6bad0064c0ba3d04c7db50a2a8780bece46666e254402d3cfae20114b29a1cadf19d978d47127c0e39619d40876b0fa3df4b2a84b";
+      sha512 = "3f7ec31cec9e1d521dfe52e6b9c32a042a551fc716824d055fa4fc311a46cc7d018ab7d328da872939fea44a49d67d20ae56dd63a45e49d9e4cc4ab1c1d36ad9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/en-US/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/en-US/firefox-75.0b10.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "56f6fa58f059e2c757e564a3cc25121d816c2afc347bb47fcf2c5de23b384cdaadf291f02636aa179eab0e6ef185b3b79653f5bdccf6a92d825c3a7c2c9a11a7";
+      sha512 = "1cba22119e469c8de510aa1f59b25aeaaa589c390894f756023fc643f52b7e0da0bd82a7fe4c67ba1ef2e3b9b9b649602b15a35d606db446251d79c8d979ca65";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/eo/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/eo/firefox-75.0b10.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "9ff03e25d258168238f0d6c2654ae4896fad897e0c9b797911716e7496846b853601e0dba92db5b1c86ae94476752d9dd5714242dce620cabb5ebddaeae062c4";
+      sha512 = "bdd8a95bbcbb51a27c6498a44b73a711a9aa0cc6301b8d0bdf21694896fc82bf1eeaf768cd7912b56315f980682a8b1f543abeeaff9917779d3186fc2b6c4438";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/es-AR/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/es-AR/firefox-75.0b10.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "05be15de79e1c2807427a927ca3d580d3bbdb5d4df0e4be06e23462a843d125df22471d5793be410a24b262b1796fbbaabcd27cdfa12cd0769b68967ebc9f5f1";
+      sha512 = "2d13e77c86cdaa723cc36c868d30e7972373de756a7f89acf4467d27f86f7c2fa67d115794dfb150beb58be39d2d794916746d2078c0b7115fa956404790d48d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/es-CL/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/es-CL/firefox-75.0b10.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "22e4bb6047ed7ad134ed1c33880e44dc7067a2e1510452483004075763b30f91dd1221cf3ac0069e2f31cf0a360305bbcbd116e62133b56ad509ac3c4035bce6";
+      sha512 = "4064f360cb030ef52db8883373ddf6a57eb67777650b9442421e09129dfe73de612d3ceba8be7f5cba8b51d8085f155e5e1e962f4e8768a90339d7a9807c9ccc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/es-ES/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/es-ES/firefox-75.0b10.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "0930851d3c29384c619347fe6098764119b1a994640c744ab57f2b727164f6596b7c2c160459e483a9947fbecc55d6a1781ebfe52e8b6ed28403f3464f56c98e";
+      sha512 = "977cf62203fbe32f90d2e2301741a025a1d0f3ea6912aab530691b1a1563bbd63d5a804ea241fe1f2a334239a2c2859bdcaf586ca6811b36941aea0114bb853c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/es-MX/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/es-MX/firefox-75.0b10.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "ce7b0b898fdf70b6751ee95ca098e5b1bd6a8798313cb1cce0201d8457bb90b10faa2ed2bcba04113e10a76f92f3b3b0b8beab7771fefb9cf2cdcac3a4385041";
+      sha512 = "8c31b4faeea45a14e884a02be59172f519fce49cd6d5b9010005dcf00da7a0c16b480c044d7969a53e78abc43cd912bce41943df2737b9cdf8bbddfcecfc90db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/et/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/et/firefox-75.0b10.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "0d8961cde7ca4bcdb16bcf579158ceebbff44f07565267765178ddbb9a5318e58d60b2f70bc1fe0a939d06d1705f986770b9fb17a8d22149feb1d66c44e89d38";
+      sha512 = "ad48f6ad42bc717ee359031aee778b0908ca0e7195c2e5091a25719be516490b6f107556c08ec7e5ab0271d64ea74d650ca1238c1b2aa617aff3b310d28197c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/eu/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/eu/firefox-75.0b10.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "f77101548344ab87593ea80be86fcf6f27ef6db48f394db549815c1faed4fd439a28ba87321befcbf79f0c9dda93169abd1cf68649f626da694032fb291a0434";
+      sha512 = "c81881a7568ad7393ebad2e94ec5b46d626f390dbb1b45b503786650690e57b0ed06938ecae66634fe54b7a5446a94235dcac3fdd34ad8abe7407b5a4c0a97b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/fa/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/fa/firefox-75.0b10.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "c65ad5b2726dc17ae327ee02704ef1eddf29bdea9b27096ca571dfc4f12449a4f1a6cb8550e401d6ecb106a2ac0ffdbd536a12f41d6fb4944012f106adb0b72b";
+      sha512 = "2ded446721b701b94021259560cd47ad3b5bd7c14f6ae51dc2705eead9a38bfe4c200c23bb9c8dff283a949f5f111752b07e76411ce73e68c5dbed09fccf84aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ff/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/ff/firefox-75.0b10.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "09baa6e459175ca1042b489b63c0f6e8248e4039d6addb2d873dee777cc94b5e3e4b0c77f78f8462239f6886e74deeaff528c271a03433589caf4db6c2202c4a";
+      sha512 = "0449613b23db2e74b5192292dcf70a5152a872a337f5e645eec9e623797ef61fde1dbe1613b5529e300aba59ccb5086a8a91128e63baea24b7a6e15367707cfb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/fi/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/fi/firefox-75.0b10.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "52d3945bb5f16874c28a37230c0b2a593d368842dea2aaca9cae6c017f182eaf165fb3658a6a1a0881d54c88fa5dd7ff42806f8eb95653095364f66f0598b26a";
+      sha512 = "022731d0a24832fccd2aa3202083406099a3a319702c4688758cdfb662dd947bc5138f54b2a6d0b5c67291114ac968164d40c50d4b278062300dc4677e4e5a0b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/fr/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/fr/firefox-75.0b10.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "8bd4b0d20ca32693f34c8aba6f01fe1a2b0a3a7730ef1948de81dbe8944dba09ca6d24f87a131831d7276f9ecc44234778cedf4d1f814784e65607d13829990c";
+      sha512 = "70abc5d4d73860dae9ccc9a36af78912770a1bd04e90a23d8c5e0a75d69efd5664e858f45f12b42c6de10950349d8136ba3744d2e2a85651d48ddc38ab2f5b86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/fy-NL/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/fy-NL/firefox-75.0b10.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "851cb969a20e1927f06a6d33a0851f6e63ed14defea566de90ed2c98e592a00cfd1bf34de55c125449c2355002870b7cf5e3548d37055a5cc16a36192f9c92d2";
+      sha512 = "00585623880240173c3c430a722b149def02f5769693766b41de037cdd25fb12997eda093a5fac35b9a4ad31e90e81e5fbd31718c6e3d2aa11476bcaeca89339";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ga-IE/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/ga-IE/firefox-75.0b10.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "79ab060d152b810917803cffab7aef198670a98d8d72d9ebde1c3d3dfb6882ba19cc27e6454654d7a164dd712280d257b33e954f628ed7d59c8d3915031c2767";
+      sha512 = "bbd666ec7f49cc9ba35928c180289c2a845d04ffd2cc8c60ca92e7c1735e486ca6d1495c755da90047b0c3112ab4d34dc3998213a4f5f26c220a3e9aa2ab870e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/gd/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/gd/firefox-75.0b10.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "4800e3ec3a0a53ef9a2cd605ec93d4609f862afe1f3c2e7bc7d64ebc5b5ca17ead6aa2027a5da7b28648d7e4db2059987872d74225ad765f68a4cc5c45f14a1f";
+      sha512 = "8bde668bf1407551ee87dd78a9943e516bff2eff09e35e20bfb4a4018549515c6b03fb5f3f42dff4a69b8b52aaf7a678167bd578ab7619a3848ac053f8022e68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/gl/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/gl/firefox-75.0b10.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "8fa1cd71b985fbac1f0e4d817a1c3c7c7ccef1a1e8c59fe14593f4ac09a6f6f55919c060adf25f3fee9aec706e5ae07a14ea3d7c945d6820129a712ea237b232";
+      sha512 = "a27694478af4b6df7f70a5378a26a415e120b2d027f3a3b77a49d0529905f18360726830c66461497da404c67e77a3f9ab0bfc3ada558ed063c173ae74e0e3c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/gn/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/gn/firefox-75.0b10.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "8eb3a9b75d70ef358559414b39853177fc65bc7d7756f446ce65a5c9c94ece92d59f76d74c17dbdf877ffd977aa41cc2e52b3ab10122908e422566f12a016c6c";
+      sha512 = "2fdb997cad0c49356f79a2f87840de9a43736f945f975d43ec2b9f9899382f0be1b9e7fcab01ed1679035291e84a790575f94552b6d3e8ce066a8f8d7fab41e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/gu-IN/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/gu-IN/firefox-75.0b10.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "741004043f30eaf344a1bd6ad36f7de64d935f7b056dd9daa516df64dff3632dae02d300afc27ff1c0cdcc5208e64dadec64b1df8139098efdc05f7d95a066d2";
+      sha512 = "7bfdd4c707b288f2ed212dd21f4794a0f9b7eb006b0bf9a62766ec1ef71a732f7dc101fc6645e6ddc697a763bdf7a25655ed8893aeec06ed65900a5598727132";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/he/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/he/firefox-75.0b10.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "b6afd8db87c18cc0b5cb7ba45386555ca45b27baa469272dba66ad4b3fe11db7e5c6c48742691febcbe7963729bf34c778dbb6248c01c1db3a685f38a17d6bfe";
+      sha512 = "b8557f97661fbf11153f68c8f4c02fce606c16603270e55a8ff9df32581c8f6cffaf59afadbdeaec852185e45ff53c45a24c85a6882d62a5bbcb4fafb15dd47b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/hi-IN/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/hi-IN/firefox-75.0b10.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "b73988b29f52012ed911bdc97e1978ad8e56e640666879358a1cb79f88c56676e25f578a64b449372522a27abcfd37c44071955e273f4291ccf15fccceedb645";
+      sha512 = "f5a41b1affea59e620cbf42bd50865dcec63c25560e9d6bbc1ecc1cf891b9669312ff6449c355cd662e0da3fc3c859e6adbb589897f9093896d18061b5764102";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/hr/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/hr/firefox-75.0b10.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "603ac12312015dc9f9f24d0ae48b50b55d8f109e31566823f387ffc17a1b99fa958d14f6214d7aa8efc4cb71e090901fdca2068e491218cb17acf914e3f8570c";
+      sha512 = "fd5d583414f7a0918b6b78f6a531905638de46fb6ed9180f1c4ba9fab952f5bdbf4595ed4b0ded3b22d34a2ab064cdd8faa24f0dfaa3fcc6d126746b6e6a1ff0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/hsb/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/hsb/firefox-75.0b10.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "a15a1c2a67ab12f2dc506e9138bcfde2740de9dddbcbe825300555b7c72be7b78ef15433eba60a132f8c8537cd1b42f05272eee399dc3f69e8defbe5ac696fa6";
+      sha512 = "8799e23b86881ff13683fe0fc0a6561ba542d5688578a87c71d2f1861fd5a79bb87653f554391bf1223a274cd8798af0b302300bba25235d8baa70f9d0f7e417";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/hu/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/hu/firefox-75.0b10.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "829f16afa6bd4d1909633e3f4cd0134a4d397b32c1b85b1203f54217f23577da0eda8bb207b07a46a7c9c09bccd392f4dd89ade408d2460720ba5667842b9a4d";
+      sha512 = "60ce550c3c6e2e12fcda85a5a4a215b2ff52f6a8da91ac44a350939f03cef211e70f3e1b78fc79c54c01a6d9c11c9b12f4dce40b8cb21f5377a4800294020172";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/hy-AM/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/hy-AM/firefox-75.0b10.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "acca12ef2379c4c833b3cae7510fbc01f71edc3d6a9b6ca39dc560fd892b8ade2aa05eab318a79db5bac0e1d98af6c31599bac029ee7f58195c062d3bbdf3a23";
+      sha512 = "125252cdfb8acb00ae2c4f567480f2b680f31660d4e8df576a119040028097b2e801edd86685a481aa13de88c2d4de492d8296087b1ffa96852f7145bbd42db9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ia/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/ia/firefox-75.0b10.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "c33bf450f946110bf8c72023c1c6079287c944af445f63e4d8154de3fa5be8f6905c9b479d79aa82883aed95741f6d53776b87245e7d0d71af3988f54591f344";
+      sha512 = "c180801e9fe59080e30d0c74e86f4f6dc2bdcde5a8dc32b402bf1ec5db59743539188af9ccc2adb68f5fa7906b287d21e453c131a1090d62b6070a2c3876012b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/id/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/id/firefox-75.0b10.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "f3c9aa62d4a35b43aa60d6d577ac6136d1646e5d577a0a1b7e02781dd33f7579fc5dca0c82c1ed0be226c0b3fb8fd1cbf1eac4d17a8cbde2fefef026e9e4518c";
+      sha512 = "e1f8b94e1dadda04029edefa95b66c2bbce572d1b6abc44e1c3864461b9894d458ea109d0ac1fa8750bdb40c454818a4e7791897cb7c27a3597115450f05e4ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/is/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/is/firefox-75.0b10.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "e3fdd7ab88f947359973827320c4b27150c83ddf9c650d4358198d8466c7da92df2e50252a8988ea346c72ae491a6013558795b968ec947ab9215ae285416a40";
+      sha512 = "8b7ebfe02620065399983364e0e42e0f6d25bb8abe5afae6c3e01cd736f9b7e43a0fdf593d39e054632219d92ca3b6f9b3287fdfe5eda695e6582e77169f101c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/it/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/it/firefox-75.0b10.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "1d02f91f1612e3e94e9c39307fcca3ec90148a46c6289ab4b6509fa6dd5249e1fb3677980adfbd43166c104f265f5059ca732f56a37ca19bbe9937dbc0971113";
+      sha512 = "f33bf96e4a511cdda2af88bbccfefccefc58976788c99719cf051d72478af295be7ec9bb7cc893d591fc184b3d2fdc0d85ad3f363baf317b07c67c628e621567";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ja/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/ja/firefox-75.0b10.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "cdc66861781be3233ba9461aaac720ed2e0f1517b97dd76d002cba7ae5c9ca4f3fa11b69e0f87a284e52c96ca6274ec6386d8392ce47e433c65eecb20a5e9cd6";
+      sha512 = "e1d8d5276a7e5f98fd32538c68db8754400a0fb5b5a775922f6d324ce54738274589dd9097f58bc739f4519d7577ed98c4e90ee6a2b140abb1e5e41c2a20c362";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ka/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/ka/firefox-75.0b10.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "95e2d1276083f356d8c176ef2deee23b933f8dea4056d68e6befa45ed4848d985eecc2cb6024bb51fa9768ef9463b84cb66180fe1ca7da752a5828bd721a7344";
+      sha512 = "0065642d4c437dfb2bf26ea550cbe68d661e3164df671ad87c0e661be871f06ef0e58d2b76edf64957c6cfd48905f2c596c321fb1184594eac81ecb534d06f9f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/kab/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/kab/firefox-75.0b10.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "d9d7eca0eac6554d1917c750c9f6b3fd1a0f838e3dece2f1e6e7f3e943051978ddc430fda3b73bed8b21fe3b07a7c509f2fdc61e061e8ab227beb277b7e3388f";
+      sha512 = "f12b942f09375bd090e37a2d2d249a5b50483d9ba0bda5de5b8f619dfa41a743a94f5dae04021ce842efb8a2e52fa3796c40c5c349601c4c603023b65b44b832";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/kk/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/kk/firefox-75.0b10.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "a3b7c99fec93983aa18541b3b0ef11e57366f38da522ebb283bffeabc504e21672f4eee2b93e2f364dc6c2656b39fbdd4beb74880b86b6bfd88a09f6764b2c8e";
+      sha512 = "e1de66282a5cfe52d255dbdb2fe7f7ebaa72a4cfbfc32ce034a05765afbd9d57cf246290c3c26bddf2e4d4c010b6ae05c00a768be14417c6af3555ce3f61aacc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/km/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/km/firefox-75.0b10.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "f5c35db5f9b64656b4cec5361587371374bf7577e7d5aabe329d34e9f02d4b4c27508ef8fe7743c8453c61e3534cd5b85178460778174eb7e19ad15260f9d682";
+      sha512 = "2ce643ab0d2b59bba0c43587121cc667f3a4efea4681cdd6ed4169f9ac278ab4a1c9f4d46254860b5fbf267c2a7c3e417400a06289428914db5f6a213e4e1b77";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/kn/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/kn/firefox-75.0b10.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "c94cae5a2bd8797bba6cdb689d885f106a94b34c06ceaec11798a1a3bbc36a64ebac4d2bfe978e92ddf5cd4c9aa23a4924def8e6b54c457ad54b25d4768b3b3a";
+      sha512 = "7222a5785770fa056a3305cda93fe3764e523788963dd41b81b6e3e30fdd1a7ceb179bcf5e9aa06eaace25fcbd0051e6ea02ac0d8336ad5b4fbbbc0df7a78b03";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ko/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/ko/firefox-75.0b10.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "2ca35e7e02b4ac0188be48666636bc9adda6a3e98f0725c65ee8e5ac941837f056479697fbcbbd1f9f8f87d7f48f52fd8aefbfe3db5ba472cb38f9e33162c96c";
+      sha512 = "fa4528558a40ac9bf9380be5e559a0736c045d7368a66b75443dfbd68b307e0f93776aae8e9ba7115ca8ab570092373dd1303dddff257c33feb73eb1101f6e45";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/lij/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/lij/firefox-75.0b10.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "6d1584249c1ba837d6be87f2bf57a52c4cc0dcacc3de82b26e57a55171db872de809773ee42a74017552b38718e5cd2fd9a57332730b303c379ea62b4047486c";
+      sha512 = "598331b8d8360b8f6b29405c6cd8a5f3cfa2a07a3d8b21b9e6df9b32b36cfb8c031bcf4c5e34f72b6cdea563a692b59e78825a8b75742536f7ec55546c4f40b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/lt/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/lt/firefox-75.0b10.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "ceca1e4224cec7c4bb9eedcf5c5e563ec7592add530aef1d701d06023359ce519a3e4c885cf3e691aec7fb732705f8a8f9ef919495a6a55a4eb1324956a6dd7c";
+      sha512 = "89363cf4bab74f670aaa398204ade2c4da06969810469fa21dc6ff205e2355c93868032b0f233b5a75edd9a51f970ed95210fbb90e4b857093554e0e6f202dba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/lv/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/lv/firefox-75.0b10.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "005ef32f152e7eb8021ee3872105c9915a647440a5302a951abb7a1967210719b38923c3355150c7dc76f2ce52dc508ac6defcf1d6f7ee834ed59b8ffa166122";
+      sha512 = "9095012231b952ff8dac2fdcd0f1ca0ad797ee546b8e2323af1eefc7f2f8f354a1e50a519a69fdc780fda5a65451af2cac94079f086dd809e7a72fa1b1ace699";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/mk/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/mk/firefox-75.0b10.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "98c87f7d897b9857955ca24f3bae177e9329010fd22445da16f71897e88f74cf641410c0cb77573bb74a51dc54943fe06082f6963b0594e1c1caf727a573961a";
+      sha512 = "c9eb7c52682484398c128d84d3de08495eb43e586aca3885ad5a8b49340bb4dd4c747ac8d8f7f032f871956d5cef638b1475665250f6d78881c8f2adefbb711e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/mr/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/mr/firefox-75.0b10.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "fdb22c0feec80297fe3339a9f08756e419b3439df2ed23c91d26eb6d870f55501785a11fb3eb98113df031aeb3d4f0462a790f16740862054fe90fc35878a8ab";
+      sha512 = "00083cec760019243fa481cf94c4ab78c3d0f341e3326caa62708c708f99e3e60d9af46f677c9d51ab12f4be84725cfcd7e504580fbc0ef7acff0c7818bcfb67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ms/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/ms/firefox-75.0b10.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "e6c5ada949b9950b218d189904ba050e476f6f9705b1b125ac5df974c25031d804e1fb1852d3d2bec1e87900b4757e5a62a793d97fc597fa3ff136939f9e733d";
+      sha512 = "d1db4303b687dff77ed0501ef916a1aa8ce5dc4871b7b25c1ab8fa6f1fce7ec551d25b8ca453b6e58de0d002fa17002176e11c9ac0fa19b18bb709ac47d31783";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/my/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/my/firefox-75.0b10.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "0666911bab682f27bc89b33ce186cb229ededa1637d7ffa9007c4de2fe74412a89b9774ceb04007052b85093b9752df3844403ce22f07481ad502145a2f34742";
+      sha512 = "6531730d5164523348dcc44e86ea0582684e23c4fb6402fd46b2d224d6cc9d3da123250f4a673990c06f0fa6c0d4d8e89faa66f2cc44e5118928f3c8d9a6ad8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/nb-NO/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/nb-NO/firefox-75.0b10.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "46d4851f65d91e4585c24f7d89f271a18e92611431e2c4a6a5f369c066e7b4dbe07b7816e586668faa2b6d8d8f0eda04616fc48664287d08f7b17e84de26a96b";
+      sha512 = "36e0592e97f7a9d9d680c9145bf85edc5587c5c5f152311027fbd03c5138e32d0c51ee7cd6f5f09da6fbc025171cdc9bca136a7ca9e9ce3bf55644d381bdfcd1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ne-NP/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/ne-NP/firefox-75.0b10.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "d2bb3f29f6939e36c66bd9a7e92a9c81784458ff75bcf570c6efbedba3e526a75ee797d9fb836e0d20e78d7bed5a64ed9d640ae71900f64a98c0a928809c40c7";
+      sha512 = "81aa48b8a830a477604ce2e4a7e72e8759d0ed0e29daaa7c7aacf3047688c4ceeab79749fd0b3fe4d963641d69d1188db340e1d7983292d6a567fa0e02154da0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/nl/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/nl/firefox-75.0b10.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "bc8acde71daf8794956c5014e35eae1fdf557b1b9de7bb955b8f8a457e81d043880b9978e3b14fda504a53efb2768c5745ffef32c89e1bbbde77469429d7f686";
+      sha512 = "a1eedc45a2c7b751f29ed542e603ea81fa74b6ce47f001c2a5d67e9897e5849bfe5434bae9cf9366b68c09c8e75cff740d3ed04b544aba0104a8fd881156eba5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/nn-NO/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/nn-NO/firefox-75.0b10.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "a5911405c58a400c332b697ade2c7756e416575dceb9b3a6f8ddde8759aa79e54454f53449688d080b7c6859f6595c7cd79b71ee88062158b95a4525b23e1076";
+      sha512 = "90867c54db6147f2b362854f32cb8599f9078a3b85c82a1c42da894d5fff1cec311da25e10292fd2233eff1b57d8d05cd7cecd56fd120446e427043d9c1e66ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/oc/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/oc/firefox-75.0b10.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "7b0323fbf64f9a6c693f85972b3c6999314bbf72a3291330e1fa7c9905d1d2a3c5783cd0ed0535363c197cd4a78a2ec7dd0a6c6bd48497a254f53eece2b35633";
+      sha512 = "9707bcf655b1e2a65e0e87b9b939745409eb9260a542137c7631b2a8201931e196da2369723db392138c08f52e9317abbbfbc9ecdc4440120500aa5a2a762023";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/pa-IN/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/pa-IN/firefox-75.0b10.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "20830ece0ef0129dc5ce188f55aa1c699052f12819e40cb4a0d9dd300f9c15a464f0957d060d61fd0db56aaf0081b6c8e587990e7b91989e880feccc8d22eed9";
+      sha512 = "23ae7fc45f06171717a550579d7bf8954b86075ebef3f6e002e35eb551845518d2ec822735ff2b9daa0679ae549242226102768888c6bf7561eff3cf39d108bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/pl/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/pl/firefox-75.0b10.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "3dc0c22bb4fba597fb225b98a1ed112759d9f3f83d5620a05fd7aa20cf2d0cf79802dc1455a346206376bb11ec325da4a043bde87f61226c043a935a7d975d23";
+      sha512 = "bc76c2d79eae843b3a2c86bb8a65e4d571b6bccaf5205a267b2436b28bea3eee5469e5da25c2b4dd71cefea14ee1a8ae85507c3e7c21d7a045b221b779b16d18";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/pt-BR/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/pt-BR/firefox-75.0b10.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "b97e061bcbb1eb7593676d1b96f4601c130a64cfc1836e0f49fa058d18a6e9d935e02b58f4a65cd227cc3364e79add782d379cf729ae41e7a6544cfcf280a26a";
+      sha512 = "a0128de291e18866e76177f903e309afdae6c0915ad89487ca7f1d4b819b3a817d04e8ada26462bdede79feabd824ec9ac90aca37fb93f7380ed4d52ca65f69a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/pt-PT/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/pt-PT/firefox-75.0b10.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "21f6d41bbef5b12aeab46aba2cc05797d4852dd7effcc00d5346604424dfbb5efcb673567b1933b4d723be80f9fdbcca98eb69cad8059d8e6f716675e2255ede";
+      sha512 = "76b20fa8fddf536e9719359f4d96f7a82f598e9a3789c76f6fafa67323782fa54c2f28f3d90b65b3aae4c47b3d5bc80ac19502969d9289877e27221db66485db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/rm/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/rm/firefox-75.0b10.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "fb13e69e606e4508a02221a1778a72e24524ba61f1683f5e076b4105e84fba03d8b27f29e2eb6ff3941da688b2ff5288a72af081db875ada83c6ae82149ab91b";
+      sha512 = "7533cf41aac4c400f8bc006ec19ab22ce63a41bf88e5bcc4fa6b205470e134f5f141c3f9c852280d142308ebd522048bee88308aa502fefd9f37d50d16b09fad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ro/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/ro/firefox-75.0b10.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "0d1f1df7d7516f10bc7c3f6144656936feeb7068839db29f97495697235ea9ab50a1587146bb069cc1e025b6a7345ccbba041043ec5b467bc9ce878403d8e7dd";
+      sha512 = "354c5815a0f9a4d7a4cdc479a5b8e3ccfbbaeca2802dbd0e6ff2e9bff8fe6ed1255ed24571fbce917226a9c29782016108c8435d92bc7ea8c9c1b010ce0f9bf6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ru/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/ru/firefox-75.0b10.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "be89a374b149f4ae21b544b75146bcdd71a90c0a3be44e4abde75d3b0eae11afb9b7cc6447e33019aad216f0ff1ae46e80b612aaa0b8f27590d75ef9454098df";
+      sha512 = "24a80af5a7219031561dcb30acc753a79937b91423d756b9ff2f1f48833057dc0e5afaba3c57a1e7b5efe7825b6d4f10c87aa00cd9d73adb8b6291037ec6ad3a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/si/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/si/firefox-75.0b10.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "12693ba3b6fea7b54d8f128e37b0529f22b45e975c6a0b890a7fcad37db7679a85b0a79adeeb3a15737b6f5135d98e87506b51751a77e054553f67285a2ddcfe";
+      sha512 = "f8f47cdf1e0d8746f541aa6525316fcf9ca60ed2b75aca3c217254047ebc7257bd40a038f4573086b8172cdf2849f91414d1fa12a4834783ae26c47844a9ed6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/sk/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/sk/firefox-75.0b10.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "94294db92a4053c209b7350d5979c3310e683da4292d4bbcf2eaf0e1729a15cc12773dfed0dd9a3e097807a3c889388fc95f28781ffa924e9128625a7fb888dc";
+      sha512 = "e8154402d286f5f1adf7d6126503c2bc890b2d1f78859c770916bd733e0d9fefeaca7b63cbeb72c3ba80cc0a14f0fae1e3142a293b0681ccea2da909de508b75";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/sl/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/sl/firefox-75.0b10.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "70d556713742972870b6cbe5805a5a9b55360ee501ce8162164abd809be3ddd0f4220b7f151aa5bfa5d67cb2307ddd3ec0d353c1a40d94692381ca5023b5a8e3";
+      sha512 = "58be9235323936cf5776b8b1270ad70989f58a3c4e823aa50a92b66be028fd44b12461d1d95dbba0d5c414b954628f84f1c68cc578ec2df34b396b874f9bd4cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/son/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/son/firefox-75.0b10.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "886b2fdd7cd5ea376cf17ffd07f5ba3521fce40265a6e45fe9b586c6e57519648cd8cab57e0004288318de706a075ec5bd89b13bae3e34eaa3fc6861c9620a70";
+      sha512 = "d5576e4feb7cbb6f64627c05c44a67160baf680f87ee79bda46acd5099e8e04776536e8e35f8459b397f970861e78e7121191f307430ed083aa59e895f2afea7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/sq/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/sq/firefox-75.0b10.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "6a4f4b87286df05d4c5ee9f2810e7aa5d77fead041061223a21d51dd4705cef15bdc2060ed85ee1e2a4c54555698df6ab8880554b1a476d5d27947d95a13a31c";
+      sha512 = "a0f45b0183bd59790c6351540567360a20236d0f87ffd87ac26be7c436d531219a897472b7f0d073ef0599f8999a94819073046f7613af986a1f9d1b5a8c4aa9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/sr/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/sr/firefox-75.0b10.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "ba5bdc0c0de9a1f773497fdd50a84eb4314ab6caeed3514e7ce63acea8ca1ffd7d9544ff4d3a12142dcedd19d0ec933ecf5ec522a3bd2943064fa39e0f84da34";
+      sha512 = "1e7c2ec523c4afe34701abb3a554aac10a0af0fe7982f152bc3fccdcab764eb9520a70b4419de32b38f8dca922280c28c58a502e6e0d6ba381ec084909dd63b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/sv-SE/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/sv-SE/firefox-75.0b10.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "30e581b784a7290f4a4238839afcf76948987cc1fe8f073a264d65c3adca97b243e1ae335e0104044f0e768ffaf0d9c3553f95ef4b7d53c5d06b656e23e5fae5";
+      sha512 = "f35d8862da413997caab31fd3536a6373f54f7f2da9384786c7d7c5085f29551d58fc75aed24f2b42016ceff01dc07cc2a20b6007ab79c250b9098dc630000b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ta/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/ta/firefox-75.0b10.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "31c2f580cd9ad62413161b437fefd13ab793d94ed2532537c1ceac939ec57d84c82cff07d300a743dd6c7be08db7010320b78a9a70f96c0363add4a059f9a053";
+      sha512 = "e65d45006dbc64af119a26177acd9cd34a3638463e4dbc448aec865b7d21c5a262db8346552ede8c69de3e90e89755a558cbc67bf6078802c632f12c78054a72";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/te/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/te/firefox-75.0b10.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "52bd53f013d149df4ddf4026419293c7cf16f72eeebbe7db2167688e149ae8e4bba724ace2a56c93a6177908581bac163eb4db6d5f9a2ffa48f2665e2a80e35c";
+      sha512 = "be0b52ac3b47ba67b6d9206f9e3d0314900b0e8e353a7fc24617d4025ce7cfcc740107ad43794db1daf139982e478025d61bc1c977769ed7313cf13cb4041916";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/th/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/th/firefox-75.0b10.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "f81c421dcedf9755836e8554bddac1394b94185f22b83b3628622023b325e7dcbbc8e008d082d6478546dc1a1f6bf7181fbd41f1d746986dbf8b273639e95fc1";
+      sha512 = "b95804f3eed67598d7140355b312a259fe7e024bab2887f1245fbc00499cb13bfee2d438bf650a8b584e0e72e19fb92cca832f80f5c7963a7dbe1939447fbfa6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/tl/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/tl/firefox-75.0b10.tar.bz2";
       locale = "tl";
       arch = "linux-i686";
-      sha512 = "6a29bbb380253caec23fc7493ef52bcac4688979292803c4063d6d318870346eb917d8f57b17279ab45171cf1554d7314e5f4f84bd94ff466b504db9e1461be4";
+      sha512 = "6e7def83d32d9b36992269db5eb7cb6a07f1509cf648f707574bf1be18eb7eb46d8f61ec234d38d4edecd402eff9a6a0163f8610bcdf7d12ffc5ead5b2be2a6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/tr/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/tr/firefox-75.0b10.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "346c02d8dd9e6330e83c9984d757d23ec8648172803f808cc096af6e8e7ca768b1bba36a8c35689644bcbc02e63b118d738471270180101eec8e00d7cbfced49";
+      sha512 = "38b13371a0cbbb038f17cf4ac828cbb5fd6cf31f90fa4a8af744cd3d166e7578af615c047ffbc3aeaaf44f320bbdc24dfc614d01056c937295f7b5ee2db54fa4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/trs/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/trs/firefox-75.0b10.tar.bz2";
       locale = "trs";
       arch = "linux-i686";
-      sha512 = "c3201998646d7bf8b1449571597cd0fe2911a4bd74c265afb21b706161a5667bb5556d8e1be4dbfefa29e753bc6544adc26e966dfcb79acc38485e6c618bf282";
+      sha512 = "89c1afbd27b2b85cf1ebf65ca33e53b9b68cf3e1e48db66d53513c4cd38f91197ed8a4c2fd48e8a063f683114d62552eb54c1ac589d6fd94d41a8248e33003d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/uk/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/uk/firefox-75.0b10.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "24b01dbd82c4cef9ffd8b88db4415eaf1bb9d83c7bd307663636bb372a1525789354ab15021b591e7aa697db511c71d078cf3fccf89024f13b19099925e9ed54";
+      sha512 = "8ff22844e556e2ca98721959abeffd02cca505b128fc29931d854d891b3d26469109fb817bbd65a0c4745bc348dde4def8d4a463d1163966b4b1a70910779f4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ur/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/ur/firefox-75.0b10.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "720d058c4e4d2cf4a08460ac4ed4616bf492704c8db10d28faa3117d6d3662a3325155f99414a7d61421eeee96be4d36ab11304e029751eed423fae3487cd2b7";
+      sha512 = "212b2be0e366ada3d394f3df3d89e14167c722ce26feba49ffe9e5a777f60827e3bc1684075f66922a33c97ca9c61e29a0ef045363aa7c853b76a8b7bb6151a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/uz/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/uz/firefox-75.0b10.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "59554a7a87b11e679487ecf9bd0ff6001f86bf14a0f73768b1984ca36cc2ee4774e99dacecc238d633556bb04816451ad82cb5ed2d26b2b811bddecee01e53eb";
+      sha512 = "aa8b21e9850af62b9ccad71501838f4047f24e79d75c35e00af080851101aaf5cec707b8ffbd506f0bfe9bea1caa51f7deb8f3558d7dcb79f81662dfff56aa4b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/vi/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/vi/firefox-75.0b10.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "030c10b2314545644b402d6b5b011c7b782c06be1f7460782f02e2071230cd9adb018558db7f98f8c2c64e7e7a6d835b38a14bb7080f1dbd160cbd113348b1f7";
+      sha512 = "4f7113000dce1d71dc483cc96f592522da25b11d163e716663507d5ad40687cb94fec56786f6a76355a5602c910885b883a299153136970372ce91ddcc7c5a90";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/xh/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/xh/firefox-75.0b10.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "25bfbc493a66ecedbf1a625d96e3c98dd6c1d835823c2f2afede41329a1dadd146459e6b44d49a4f966d9eccec1e2e1d8046f00573ffa4ba8cb43c8a0802e18a";
+      sha512 = "2133ff3673a9f60f4cc954d64d45ce54ae92034271cd674af480e1e84c147c5e63adab70c7753cb29c8bfbfb814893d9c29b5d54be794a10c625da05e8126d5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/zh-CN/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/zh-CN/firefox-75.0b10.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "dea1bde6eaa34ce31d7775c3f86bdedf442bb67623a890549a470386e93e93bdcf7f50a7006a1230ea3880b0031a2ea7590b94862f1a098cebfb7664f9aa6380";
+      sha512 = "760ac64696e6473703a308fe20e6cd582d4e13284e9789b8af786d4c6db4eb7f9957ce745babbbba407c883034c9fb69df65aeeb8218127160f15b523a617cb7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/zh-TW/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b10/linux-i686/zh-TW/firefox-75.0b10.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "22224a9a06c8b528d0847e10a95003d19fbc7cdadddc605e1188da7de845d38f511319e73de6201b7daf9b2b3b59a2eb12a6ced03cafcc1bbcd86e51422a2497";
+      sha512 = "14266704231897a57090a922d3efa97bd58e9abc52dafcfb2c31990b211f5ccd56cbaeeccadade4d8af15d630b8647319986637ceea290821e007e59aaf79cd0";
     }
     ];
 }

From e76a190ce7fa9c40ba312bb5a665a02af3d8de1e Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sat, 28 Mar 2020 10:30:59 +0000
Subject: [PATCH 4262/4636] firefox-devedition-bin: 75.0b2 -> 75.0b10

---
 .../firefox-bin/devedition_sources.nix        | 770 +++++++++---------
 1 file changed, 385 insertions(+), 385 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index e84a48660c69..1d2da25f6f26 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,965 +1,965 @@
 {
-  version = "75.0b2";
+  version = "75.0b10";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ach/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/ach/firefox-75.0b10.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "73f8521550149a0c62c841b23289371f945a94aafdab6752b6b4838594147c68dee1352608fdca2682251db3fed691ddf606e0a7874e2a35c905c30a2dedf4a3";
+      sha512 = "873fb0966561264e81a2eb318833cf69e0f849e199af0455aeb852ff54db3a259d30382154e59a96c4e7d4d44d9a492229051d419f524a756997862d84a638bb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/af/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/af/firefox-75.0b10.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "e6933f3de32fa91f4835553bb8aa48ad20ea45288087bda59920d6edb616809d12cbf9966c722040d0473a35f5a4aa0a7c17fe38d8a0c2eef5fbc5d7451ec709";
+      sha512 = "35fc7dd2d5371e4670b78e3051c2d8ed17b34702a14e76e1f7187b160b7caab20af8267df467a4c06ad54782274f2dbf3cf2b3d39ae5b3ab373c3f2c9b3178b2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/an/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/an/firefox-75.0b10.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "186edc252065ea668412630d7ae37a6cc465d41104578886c6f01bd90d8a605afe6e023cb9d566d53b43d9fe411fc56a4322e2140983279521e1f73fdd2c251e";
+      sha512 = "ced78414c8426f4987207b1e2e1953f68276a1bd81f204e88e1cb2a312c6f5f8d6a1d6d4542d2653bd02f35737ec9c8ab9076b43ca557d665c67ac37a530a637";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ar/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/ar/firefox-75.0b10.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "cc5c4cad6ffd695590264ef222fae56004c3b626c8e36cdb3b118daf62e84c912f112df7bc8471cb9c549f385cc878c12ed06b1ecbca164f12f26cda3213e7d7";
+      sha512 = "599bfc95a72f8219b8368988079a955d0cbdadf3a112abaf02946f83dfb9419b7891991e3e7936db4393366708afe9d9d2d46695d230d733bcedf344a5118858";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ast/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/ast/firefox-75.0b10.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "62ef8d3ff486543b45751f4aa43a3b009ebc9c909d1e0904622c212fd534bba14014ec8389ef5d21815fc3d5909757c7289a814f3a836d94188819b94ebe2640";
+      sha512 = "4e3ba8df146227346ee0cc8a01c3f46849bf590ba545d442cb5ea70042a9d3711280ffb2bb95eacdb81ff06245578d44fb9887ecd80282270b34cef0074dc607";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/az/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/az/firefox-75.0b10.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "c2161b2f4a3decc15ac5e780126b94a805d521bf8999379643f4ff8f9c1630fb07094528e37f2aea8c8789925acee7c77d0c6a179d4428b984ab329a973a5a0f";
+      sha512 = "6bbc084a826b5028b5aa4f197066be49ee790a4f725d6294588ba8a97d1c44f476f2254cfe93291d78739d896467d6baea7af41bc0f167b6290210b4d2709ebf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/be/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/be/firefox-75.0b10.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "9e49307c8bb04dbc83532414a5f09ce8cb202fcd68e145d2ef132a20ee47988d459ef1851ea610ddd527f335bb68a7f1fa04041914097fd65f6fd03ea6499ebb";
+      sha512 = "c91a7e813b856061043aac4f97e671fda70cfc7a5bb542a6afc22291a0990100c925f570e0c424055bedc43ae3258b07de577069ae68ae37e2c3107062847436";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/bg/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/bg/firefox-75.0b10.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "ee5fe8387cffa96d449d4dd5a2671558a6f36645b15cdd017ebdbe7316d3e0740f05efb6ca5175ca917a937f4483175c9a20cad2fd956bff5110cd7d641a12c0";
+      sha512 = "b724703fd7381d52ccc15eb3c9d5f64531cd9009e6aa4c495c9fd92412976755a4139fc418386cd36bcb7c5f5d8bc2dadae15812ac7fba7e1995011b39d7dccb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/bn/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/bn/firefox-75.0b10.tar.bz2";
       locale = "bn";
       arch = "linux-x86_64";
-      sha512 = "4409a8d09e837a95fbfaaa5c8476fe25d50926c11be2927c0415b8a7e71f18ddc392a90ffcd5c142ce4c5847ad493f3a51680e802eb2f709aa8148375c9ccd30";
+      sha512 = "16753ae7f7fc4caa4cf46bc3f1b2880d5fbfca7c998b70d278ae052adf59016e345b391bcb39705d6cc5a6209d603db07ba6ed6ec980c34525c98961911f2360";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/br/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/br/firefox-75.0b10.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "cf71b0554eb8058e3f2457518d473b7170f9fa654c2f5033db830f633e7cb8ee16f08f651c245f4146f85b537b30f3adf235786d66c625cca61438ed502d7ccd";
+      sha512 = "067fec490f9afc7a102ae61c97402bafe18228fe81001eed97ce8e739323b6b300e29aef59cb8ac3bd060f1573c3658eba3c1375ef98ef44d4e173e5933e3a3e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/bs/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/bs/firefox-75.0b10.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "743b0b485eaab640a54c6777c8849356b847d7fb4ccb56318007dbb01480410fbc119e7721393afbe2886af59d51b9aeefeaf495e670562dd16a350e803fec74";
+      sha512 = "fa8c8e3c95676034e48990503d9e433f45d6216486dccb6b33b5370c07515e48ddce22f98d48b56b0510b8deb700f507c8e0cbe6349cb8fea5980494e0c3dbdd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ca-valencia/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/ca-valencia/firefox-75.0b10.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha512 = "547c80bf05a23023ede2d7268e0c023756e196c3a18f81ef084cac330ee0c7bb69021f33ff926162a2ca7afd2c0b4ff08107a4e18560382810b5d7110cef02ee";
+      sha512 = "492edca2859632e2cdade2dd97dd60a7fe699ca0075b16849424f762fb73cf304bb849a07a2035172cd9d3f85c815e82f20475b31ba1e7e720f3fd6f0e4917a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ca/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/ca/firefox-75.0b10.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "86648dfaa650d18bd934efd57c5de495c963728f45e375b6e6f4c71caa163fadbec2b5064ce370e981bd668445314fff64374e15a17d2c8c337cb1f088edc486";
+      sha512 = "7e702f68cb35f623b16cd44c3ee2c1e7ef33b94ee2079515aae53346118b5b3d8cb254798921e6f180bc103c9b2fdb4d9f99e71353e866ba45d79d5fa8c45e98";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/cak/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/cak/firefox-75.0b10.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "023afccafe29bb6f70657cb0c1b9e285a661127599f0b4e350f814370b4afd17a82157e836ccc394e8bb6b535a7e7341981f006363c03a46a723e4cb480c180a";
+      sha512 = "97efaa2a739a3d369b4993914d1a13261338f62f3ae7bf3f65515972db3d83ef953fba6c1095fb9af6e41392096472ab39e58f5c806f5e0c02c9c8a0a5fc9bdb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/cs/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/cs/firefox-75.0b10.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "7d14b78faf8151ee01e8899a85fa8f9851c6958f4c3d7a99f7cd934fed8b704c40d2dfe53e24ac5b7a44bf67da2131eb7cd8161c315d4e0cf9bd7cdb1bc75446";
+      sha512 = "de234b3e167e34559adae46807ed6913cbeb6dc602dae560ea7665bb3e502d191bcd932a48c1ab6d974dafafba04c445bb67bcff3c1fcf5f655228cb3b11f3df";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/cy/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/cy/firefox-75.0b10.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "5fec2412e904bc231c4203aeb40f3f7a6386c56476f83e80e94c2395c20f09436b6d2195c42861130606d101639eeb2fa2f710d5f5e23422cf39befcf46c840e";
+      sha512 = "64c21561703d21ab32e14de039741dac4260e7d81df0915ce777291b18f8e8a19f4694b5612e25419df07af507d244b6d1d2a60043678a4072ca004b5a08c6f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/da/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/da/firefox-75.0b10.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "b78ba1e8748775d3655305b3cb925e13423cc11e4429c806902b029a195105cc1ec83c57245c97ee046149f94488c8b09bcc043a0220cba87809a98f20d34e42";
+      sha512 = "e283fa5ee2433dd369fc070636879aa00859e0855b21e6f43e92f1a0ad56133737b5920a029853b85b7ff8100e1c47166530d4cefb18ab8fb7f4af9dea7f3fbf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/de/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/de/firefox-75.0b10.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "e5afe83d665cae93e9c25827a9079953a55dc1523027bfa8e2e8ecd0b347465f48e190233e3c7e08dcd647211a5063172bf05d55efb567a4f29c5123485bc2c1";
+      sha512 = "5aa4367de830e10ecf63a1219f6d9fe01662f25406371afc89a2a1de16adc6661dc7e8130ce943a24aacccffc30f26a51112a71339e93c5187b6060380470e0f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/dsb/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/dsb/firefox-75.0b10.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "f9455b9cfc3b65b18960d870db977fa57ae03801fd42c6313aa114851897a14f1a64c02351a95f5a841476c41b55a39f6fc47bb5173e21b2a7da0f6536d73582";
+      sha512 = "31f287d0a694d5af72ca6313b2fd6b7a276e38042ea77989c13bf81ed2de8a4919bc3c65419ff9ce7dd5b429d436214a9ae04bbbadf8605b2dbae59882c31a9a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/el/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/el/firefox-75.0b10.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "d697998bcc27f468bce353b6f8a4bb0c01f0cbdbeda5a0ffa92054b590eb8f2255654740db2e31fc95513c7a6a4de703772ed35122e7c4e3e9b21ab3cd9e7626";
+      sha512 = "9f9c0c6c00858b5e241917b8ddfecbf5a16288df147a57566eef8ecec30457c4f283ae66fb5ecbafb46c5de3c77c91f4a952aa4f5afe9edd023878869008d4d9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/en-CA/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/en-CA/firefox-75.0b10.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha512 = "362ce03dfe65b802b153360be1540cd1c760e81bea0d35e2a59af701fec1a489abf30d52b1b1b0f66acafbc91c2bba3bc60bbd1f2a05844b7f53b25696712066";
+      sha512 = "c5605955ea6e2d2b7fe9afa6df8b008e89e798a9fb890111b2752853f3e78a89897f2553cf229486608d646bff867f65eb53822764c92fe103a2fd0e652df245";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/en-GB/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/en-GB/firefox-75.0b10.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "d674575f46fe24fc85af4dea8d0c18b2c1c8a0e92eaac76447a476c5532891d87247f6497663fcce546a85e92076f23fdf3890c8c8e3a902e3cd6a4eab6b84fc";
+      sha512 = "1ac9fc164bd693ad60e9e754fafd0e64ee2e87f23d3f1ba48da884faca30362c72191a096309c2ee1043ac911a87d534be818adba3d86596846f464ae5ef2acb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/en-US/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/en-US/firefox-75.0b10.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "092e13a53b18c2c09a4c79b2fe15d49468b60509bd6668bf5710f425a0cc0d4f89216e3bc1e252b7781186bd553cf015c53c5bced5aefe2cbe43666fd5337f3e";
+      sha512 = "8e50c879a0899e2d298fffaf9d4aac2cfc3253b9cc79c8a29032c64d05091791838c7a517a6775985e708db2944ace0697f0b7739e0629c28daceabd1af5e813";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/eo/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/eo/firefox-75.0b10.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "199ac2eb0253659dc0c862869a72879d1d90d5b2d7d01a68dcc674e0b0b815f04823edea1d9794626e86489120da08585ef10c0852a636f1897df23e363579f6";
+      sha512 = "0486e87d07c351c4904f4cc82a1e843fc3aeb67273de257b46e2a10aa342c5110731e9f8431bcfea006150c6aa184e948b2d6f0d4e053c20e2d4abb4735db060";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/es-AR/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/es-AR/firefox-75.0b10.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "0faeb4ef0fc8033156f922bf25367351e389596ccad6b2b435678bafd563ac0624bae5f5a49183e442ea93f1d76e8ac8e53121c6d8dfbea1f254c84d7d323f46";
+      sha512 = "263a2b8aba06b157465867ea2964b6836c3ef322bc8ba7ff06845a0b7c0f1f26b32e7c3e9ad2fc81b0b6525f014bd8c788c270e5b255ec9342c3d1fb9d40d853";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/es-CL/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/es-CL/firefox-75.0b10.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "f0bb330857416097308928d8cafd09c3d1fec559f78ac94e2fd3624381074d511eb8d5e2764feb1f33494f09be6b9fd3cd63e182296a8ddca06b84c673e2b0bb";
+      sha512 = "ae41f30e56e23a6d1ee98bd33913a7f68759cecd99ef4000210f502b001bcbfa6ca8407560948a9a8b9ecaae621fd58c70f3db8a91057209eb4b32683ed01464";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/es-ES/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/es-ES/firefox-75.0b10.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "37b149761f68bc8b2326e0c4ec9eed789ee2d04edc0e42219b9faba420835c7b4a7f2cde76a02fc4f7bd452059572fd2b4551fe9d879fa74c34f066689ba2934";
+      sha512 = "314d4f4a544bab83ea989ed11eddfeee6ccb03c48b35408f434cd97a6235e09f234512b7eba327d0fe9d288626b32dbcddf78108c1a0c8d9b640fda207ecf31c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/es-MX/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/es-MX/firefox-75.0b10.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "80ffc2ab7314fc8a435aef01926f159166f4bd7d88fe1b44061abb80feb606115ba976cd321a2ba1384f2152499a59481e9ac622f1ab57d096eaa05b73f92869";
+      sha512 = "243396665ae8c2add78d9473d9c1a30c282d6382bf2aa17b67cd00bf122806b4e39a70d87a3e4814a86b0c604a341f2a348ed64319da63a51c9f28fa370c2caf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/et/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/et/firefox-75.0b10.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "87f00de95bf58fd3bcf54569843973eaa8a435d7a4d861346f7bd08ffa475bac7c43a2ab178b1907b9614cc6fbbf7af611163fb5c13e685f7c748e3451d01110";
+      sha512 = "98d54a63d9a76fd7904043157f59a3a8ce9e0cc689b23815891c44368e075d97fd7d967780f3ec0328d3d8ee0dc16d49f2b9ace13625980f38607f91cd47744e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/eu/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/eu/firefox-75.0b10.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "551e2df324eaa2741619c3f2fa3a6b3d90e3f85d1b410ceeb372541bddf2b049aaeb165cd33f4b20a7164cd7fa5e8d201860f429e35adb071eac22e9ff87f4e7";
+      sha512 = "9a8c8ea8fd61448862540ee2a0ec4e669aa3441afe92fda9d6ba65d2139b551d09d3fef34f7988182f1f50b906d025915013c1edb7bec982985a2d306650568e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/fa/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/fa/firefox-75.0b10.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "15f7a4b78ed89634d7ce99c0ea68c8bd1251c8c88f6d789f8bbd0f3b37c5d5f651b973478679c05d29c1b04ec0c6b6f230363f444406f451d9422fbda7770df0";
+      sha512 = "79389c4f340539175b5e59f6587115c6823d8c9b53966477eb068c7652cdf932b86bbec15a659aae730d078c453c928085e2bed7edf628af56d4815af12523ab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ff/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/ff/firefox-75.0b10.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "4c01c5163f14c531e9eb864b7deda329ea9914ea023cb7efb64cf4f56d48fd13d08dd4057207c4543a6b60bc23037d9c343ac36901d6819c422cfc14ea75b38a";
+      sha512 = "ec45587cd628754c0bf2fa19935c46b609cab6098270b443f36fc74d443a8d5ef978138b0eee2c21d8ff64cf8d63c08d2c9da2b9fd62fc693acb9830c9c281dc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/fi/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/fi/firefox-75.0b10.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "a5c1063a00ae0f9dde7e51556aa42846230a5c802c94c84c06d4bd91cbe767363c40962b8e9d940f1e99141e73267fdaf8b35c85122b3fceecaf57a939507273";
+      sha512 = "fd0bcb80c53831b73e447b57bc6c9486c66e559effa707772d6f2d947259bbc587d3770c8b6e5c50628a7a14b56b4ef2f16bcf029044a303033a6822e1e60d37";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/fr/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/fr/firefox-75.0b10.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "42015fa91befd39501ede0fc44ba98835703bf939e7dc4de9ca6c26390350c0e1196ace4eebd4f8d9e162c8f515249eb61a56ed370cf7279831a75c6abca570a";
+      sha512 = "3c38539c47a414d63cdfc0a732550ad91653fbccc1abe6f456b3b2fe304a5fa5e0e710e22af0eae4d07cc3c4da3e5a75ce415ef2ee28569db02838e4d0b0db3b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/fy-NL/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/fy-NL/firefox-75.0b10.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "c775dbaf216863c0dfc91bb1d26cd9ba9908684d981b7c9ac416fb0fe5f1dde7c64ebf13b8864bdb4c56e7051c3e33e677e757c225876a6e1f88955ebe01cc05";
+      sha512 = "3b34b22f86cd21b0d3e43537f7ad6a6ce22296651321b2407bd358cca0c0c03e9111fd48d4fe54d6463a8860efa34c51efd74451a12d29d16e54daffe77480af";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ga-IE/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/ga-IE/firefox-75.0b10.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "958277939ca65eaae828ed5e9a0f76b612be6f803176ddf0cceb13d1e60baa35a051ff95ecf344c1ca2d5cb6474dcc446c272053141d49b8f4604dbd70df8793";
+      sha512 = "fbc9eea02ab60f6d1639ec4bbde62fc666f7d66d788a3cfdc5404f6c34881ef7ca5d834227c2d7a1b849c3f4271d307818d34b8b940a6cfedca4174eb4d99046";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/gd/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/gd/firefox-75.0b10.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "db79dc9ab736973d08e6e180a4b7b10e903c7627eb0e0222c044d4b3f4d4d3edbb9f2f73d0e6f19d304e4fa75208db6395c0fad28d1e3875386036bb30086c41";
+      sha512 = "7602e45fd741e0c95cfd4047564adb22b38aa7193915c513d0d874b8006cd24e0b14dbdb22fe8e2d642afbbe8f5b8d5de4e76d0f95c2d5576951bed37775930f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/gl/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/gl/firefox-75.0b10.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "212a697f1289dcf582201a2f0be56b739a71d2ddc0157c65b567c7dbcf6f51922ab2d0743dd979134b1127661addde43612d18f6a4b88b530578fdfccaee4063";
+      sha512 = "67a37cd684bca81f8b3ad8b48288237afb0cb49b12fe296092b06ee67f3346673773de9b5c4c5b95d5149deb60a191b87ca2d210c69de0f819a63b67b7f2564c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/gn/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/gn/firefox-75.0b10.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "713022f28bac680227d1bd5e2bedd36aff2950c0c2e498ef1205a02d6b3ec0bb7dfd754d18a43e7b141b535ddfb71b1ca711b1b4dd955c66ff469f43db71a8ff";
+      sha512 = "70cd7942700accf40a7edaf1e4ba144c84d868a91ce8170a29aa236ea95ba8fd88ef4551ebef2b2e14c99efcb531edf7a41a74a9e94a04859b0ef92a9a7a6277";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/gu-IN/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/gu-IN/firefox-75.0b10.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "f0c80568e5050cb4758f8269b951f622441799e0d8ae70d1e3cc1c3a7af0972f6323ade7844f3b3002f8a701a2a1b29af320ee95e72a349ba9d9903cc4aee012";
+      sha512 = "76843139b649a6c68ffa4157ef738615d4ab5130629b9a9eb8880c1bb7ba9d9e4bc7af91823dbe2489c291c0230c2824c36ad965f4169766845b80c23d44d9bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/he/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/he/firefox-75.0b10.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "5a5746afb795c4708559218d3de66042f220f6357d634e20c001d45a3b86df99fc6b277875837ad13138bf86f2d9577c27fc5573817c31e434de41d5f13a6dbc";
+      sha512 = "204894a7fc3155e0bf9b1738db1a51b4c3db85ad0e245dffa5d4415e1dde0b0cc90db2ac2616af1f9f4324d8d9665fd517b127be9ebcc3f8bd0e8568f237b596";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/hi-IN/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/hi-IN/firefox-75.0b10.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "b03942c6d93f3baaf0944ebeb27aea39fa331806375135f91e9c8e45ad1ef62c9468d05d4c776f2c4766c0db31183fd23fa16a18f860ebd75dc0b79ff2abdf0d";
+      sha512 = "3a9ae592cb8d5489ff9a16416c8f12b4279929f366922361ccf3b87054dd423db71208c0d2fbb9a0028364e5387dc52882c09abd7055a6cdd3f6fbb68dadf7a8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/hr/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/hr/firefox-75.0b10.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "c090bb4ed245ed043218fb202f00e227bdf8a5425f78a9a311b1684df0d1987c1f54904f89a46a8408c28726e06798da5755ca83c0b7383561f9035ed4b8c105";
+      sha512 = "fc1e5a831c4a50cdf3fced517877b93f3ecce8ef67c194ccc0b299c16fad10e3e81521b0c47c852b6ebff286bc04bc6ce0efd472a58754ce60a2271a45fa2944";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/hsb/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/hsb/firefox-75.0b10.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "71155f0231fcaa744be1828967a1194b5ecfcd30b2ead3fa0294be46ee7ed3476636304862c3fd222359ac8fadfb5279882bd2f7965eadf39641cb611c12d6cc";
+      sha512 = "8cd36897dfa88c246cb8a85b404e0a4a4acad1c9467791626f442a6835ffe9f25c20814ef952f4f9578642ab6b92906740389f570f34223a1d64994bfeda1107";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/hu/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/hu/firefox-75.0b10.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "f35a883d82dca691e4537fd9860d72c8f68127f4b91a7dc1641342eeb2207700fe31965750e6916e1633728ee022bb9c940fef37d3d973bb4b1f1689779a74cb";
+      sha512 = "10376a8acbaf6d4ae655dcc26b5a87668ac7b76faa2d0cfb8183b13d9918d77709ae12fdb23e6412684381290dad77b3cd6d14e92ed6d6c7aa1631e693b70174";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/hy-AM/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/hy-AM/firefox-75.0b10.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "b0c61c67db761c1c6833aebce55c02e17aaa7200150379ef9ba59d94d8a40ba61054863f80d0c6740a1fdab4abcf221b98407c4600507b0a1f363d4356fb1503";
+      sha512 = "bdbefed0b1398fcb99e6d7d6fd0db31d61f1a9c020064fb7eca522b80a56b774c1c574f9a519184749295e47a50a02b5c540c1bdff29404e08683e9d49ed5b0d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ia/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/ia/firefox-75.0b10.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "711ab43445da8d8f72411148fefcaddb346e253b191558ebe9fd363154bf6eb320a7bf5715e9c47bfa154623c2a4a96461aeecd69234155b130672bda1a991ce";
+      sha512 = "76da2322820d015bd86303f4ceea1e7899e29fb994689012b10cf6403248288f7e8a200aa96562d806047291d4261d1accd786ea2c5df68fa73e93aff41af4e7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/id/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/id/firefox-75.0b10.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "a622c5f7a0e06eccd3f3a8da31b23837dc78ca1bfd3714c002ad551c6e12de8331e1ae12665395ddd174aaecf3b793f5190b51e34c33934f68636c5e49996a00";
+      sha512 = "23a0850089cd6559dac098b70f4651d5ce4e66135045f39b54bf26b14eee458ff5c2aedfd236f266dd18fab3a9181820447235eb5a0d6182e5cb7acd6eeca92e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/is/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/is/firefox-75.0b10.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "2ed96a3de14709ce8c03e86b12ae1b77b707bc17bbccb05b0462680f19c0579e458be29c48aa293d6eb841aeece5ae8acd7b38209716c8d3c769297741e283e6";
+      sha512 = "5144c6f3b42618c1263cb53b0613997a83c6d911038b2c444657151c3c81821f585d09ae73c552125aa8356cbf30c9a814a8c9527f04c68e02222a8f1ae782e3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/it/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/it/firefox-75.0b10.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "302a12bedc6d20a568552da06c5a03cfae9f85d34cf8c6c5be1385025f3214affc23d1392fb237bd6f215ad12fcb0600230e87202ade6b9cc3ae5c13e0878f5d";
+      sha512 = "10c30a085fbd13f24f0211ee88e48ff651785ebbadd94b7b23c8aebcf7dc9b6a95c60f5eb0504c5759db1556a9377e1512cbbd0ac73cc032f9cb6e32bd0c4ce8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ja/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/ja/firefox-75.0b10.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "76217b47ae6936673906c0d60e15a516a855aed316df646f50a05228c52e63c19da8463c779ad95008ad190139152efd9c94603c2e71d3eaf28128832a70965d";
+      sha512 = "c9f288f2c9de7e6e057d6caf7c208cc2e1ba17897c8b9fa22402626127b3c516ed0c725e34547a08282b971854c28e5317846745791863961fda9626bb778cd4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ka/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/ka/firefox-75.0b10.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "f61d5547e24b91b03c876aeb63764b9d382061aabfc43373cd0bd72be1173296ac0470b78861bec755ed83b0336debee3b63c93fb7b8f2b58cbdb4098b43004b";
+      sha512 = "c9a5e29f4ddaf7729ab6170d7905eb6c040dc62df6fa4e7771fc05456c4bc9f11a0abc9b430f076f7479a764f89adcbb58428b131d03137cd68bd3da97ae3083";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/kab/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/kab/firefox-75.0b10.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "79368f5f6a68586927cc8831a1b0ec5af4141e17326f919cda3f526c86fe210dcb80fb598a04441d23559016c99d2e090aebec2ce4fb34e45fdbb686db5a5466";
+      sha512 = "db78f2e02aaf98c99f87f30b31d1fd0b7f6af7ee46c521ed4ee4464c892674d2917ac9a9a71405b1e4a483a5b200d6f9f9d3308fc37a7b777cfdfd059113add0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/kk/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/kk/firefox-75.0b10.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "dc8ccef23f39f21b1d669968f72bbdb63ddad45b869b3ec0ac1a81c0f6b00bf5eb272426e4a44d002b51391bc86ca91b7271d48877824d094455ad059cb9b624";
+      sha512 = "0212d90a2cc2a3ea290be7cfdc573704a3e39ab5787938c675211c350dbc6326a7cf7a2c845be3cfd45bb66a4db07fccd6a9ee4c4ab356ce992d0926e540ee13";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/km/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/km/firefox-75.0b10.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "79ee964f99857f95d86a9d7ed45e52cbb19711a94aba236ab594a0bd98585f82957e113c02dcc0e094a23e5857107df2c8d3a88dbdda8fb9a04095b350155361";
+      sha512 = "bbe41e8b56258ad38834d77489f6e0233848dd64e32dde8bdd930ea913f2e6d5882571da661993268a404cc762321ce689cf1bc93a399a6354b6e4bf47227b20";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/kn/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/kn/firefox-75.0b10.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "47648e65c7ca94b8208d6465544ecaff521e03b7abe333954edcf62ae24d1f0e886cbf63c637eb8aa6c97d3af1fcda88e8b4dedc037469a7e25eee7ef55fb276";
+      sha512 = "6e0b2e4b42609e755249156117db1c1baa8e7993ba7c0492bd2a7886f1d72d5cd74fd0a0fe5925bbc3c6deef2c1652fad58ff9bc79cae9514dadc71763f884a6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ko/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/ko/firefox-75.0b10.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "dff738fabdaadfd325701b5e070e755f8e30c69e954b3a51706d6cf10e8888e55641ed9ac1f1d3434bcbf453bc86b9e4755cb596fba2c6928aa1e10dcdbecea9";
+      sha512 = "50e74e82388797f4ee6a675dc83bf90325d0a3c628afbb5977b09ebc1512f30f2e9de3fc2a3532a87699891564620cabc53ee7a59430fe75f1680de710641b85";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/lij/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/lij/firefox-75.0b10.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "64a5d2546d0c10e9007c947b7ebada5f779ea5447c371014cd06edc4d6ee4e2511b8d3b5b39c8498f879734e7dc65f375bf32cde445a0331cf81465d61c90df8";
+      sha512 = "e1fab2f88573be8c64de8c23b65ad7c586a6340ac8f3fbd3107b2d397ea919df9d588d59a352d178318f46e165f8cbf8f5e7fc66df3d36f4ea37ef38df2b1316";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/lt/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/lt/firefox-75.0b10.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "0ecc945a159d80dd86a8b66061b9278a92a4b8f6f41dcd6f260202f1b57a8c0f582e7f92fbca675de8227893ed5f86a29a7dd79bbf95264dfbb2592fb499ca9a";
+      sha512 = "f83adedcca09527bb53aa46224ce60c8a215096310645840257888a1d54600e0f81b8a1e3225cbdcec22200054a8d95ca544c34220457d86a136b370bd02327c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/lv/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/lv/firefox-75.0b10.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "d0bcb0a69c29be9ebbc103830c0c3aaf264e07c6de0716fbdf38eadaec70d7d2928f64256e66a7e5bf916e6306e3dbc1105be12129e26254f2e5c969d348345d";
+      sha512 = "c1f0f52a8e65d5c2e86aae391420f0e91fdec8730a1eccd89fd22b35067557ff1f7f2e90c1b1db1bc1d0f0d4bfca26bb761d6ff8d5d29a60901d25082e6700ad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/mk/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/mk/firefox-75.0b10.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "86924cb5f2215b84aa92e20db474ebcbaf9428692f1dadf92af5a84f6eabfdb8ba86f304671f5190b0241ad564b639fb6a3311145f989c9815caac588a5b652a";
+      sha512 = "fbd542b7ecc7777b20f8df7eb8721a127f4efe0bf136a1d10cbc52480ab0d735bb04843b638a2bfd346dbeb80f79640c83c6817c5bf61aa07b9ae7f92992ef5d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/mr/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/mr/firefox-75.0b10.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "c3eda294490d43f5d3565d17da214c8743f21016758c3892958abeded0acfafa01239c3b9921a8ace6d973252952ecd48c968f915ebb58632accd6ff378ccaf9";
+      sha512 = "f860729288b8c90b41cd4c05ac08866052f6132a95b82281545699000c61a370efe9a3d17dc7fca5dbc3fd316c3d27741a18f5456dd21a9537971306dd33dc44";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ms/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/ms/firefox-75.0b10.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "a05273b907ef572864b90af5a1118feb52d47379c9e642c23be5767c6505b180f7a45575d9853e754d8ca7d0e73cc955980d29cf628b9a5cdf553a385822e9f9";
+      sha512 = "c62ee3b4c3c868289c7597510472ab9c76fc0aef14f73c9585fad87666a6fb0e4128f9322ca8efe8c4f6a8168de099031fd0872103ca0060a200cc435f8dd5ce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/my/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/my/firefox-75.0b10.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "2b566d3ec5ea31599f1ef580cb18c5e1b85a73f6ec186c00e64f11e668da3b7c8eed1f8fafbe4fc8e33ad51859b4b02ef1596af591e9c519bfdc798320d0e013";
+      sha512 = "a669ea8d46fd89b565a1503ba74ecb12b1f188393ec71a3f06d67f8baf00135bbaec3a3d805533bfc71e45e355fdb763cdbb70082b0ed1acc1e552d0f78c5de3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/nb-NO/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/nb-NO/firefox-75.0b10.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "7608a9470683703efdda2fcc4168bcb4b77ee006fc1a94329de91676b9922d1540770a760dff84ca10b2c5a91e6f8b1adf96d9cf8d9b333427be373d5f4def3b";
+      sha512 = "0e0a25d60f6f11ab65d627f2bea9e9e762b477eca54950fdd302c53b0b7d0aba5070fae9d83455e989dd0cee31882c1c3b586b2d01feba73d69abee6f3693128";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ne-NP/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/ne-NP/firefox-75.0b10.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "17d488b5a8db722470fa0665f3985f9756a1e5f76a92f3770c4688b96148503697bef4ebee523071b7769ed859bb6cc70b5a4997f7126bf428da5433decd3d17";
+      sha512 = "5e23d83cd3574f8d5d8c6f826ef633e9eeab33c51ce62f29f73764f8f088dc8cecce1d4b862a4595b87a3fee1a138502e25ffd38a23197fb1166caa293f4af43";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/nl/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/nl/firefox-75.0b10.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "e773852f0f9a9dc60fb2de5b85d33f281aefc6b32d0b6e4036af6d46dce0aabad88f0d772180a14f876c42112c65339a87177d53477f672f83f438ad933b3df7";
+      sha512 = "c60b75dbafd6633a27639449e5bd19e9ea934441fccc788547b850b5841ee7545386d40b2e4ab609ecb846b8e74d10a76e8586bd2edcd64025a712249908fe98";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/nn-NO/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/nn-NO/firefox-75.0b10.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "e0dc703dbd18b1e08fe7e6b6d1d359389497aa4339bedb5bb3916de0c1bac40acbc0ef8bde51cfcd05167c98dd81c9b06e53bde773f4c2a0d51bcc9afd8317e5";
+      sha512 = "6d17d6c9fd140e2ff33d691c0d2c11dd86d65f139089aa8cdbba52700b8262b020a72ee8f2bba7b11fd40a05148e414197563a5ff48865a494d74ff1d60bbcb6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/oc/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/oc/firefox-75.0b10.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "067eea40605f84011c9cb7cae951c5a4d3ba2952971a613148946f5f83a4dfe19576f6b9acde65dd2d266bf2bf5ab83ef94e4a169ec54a70091e89b6ce7ba8a7";
+      sha512 = "13be7f69a2d15d991f791b8c086262384959a579d4243639e72399c151a0316252d31ec06d438b4ca76733b232913e0d407510b6f9bbad266f5d636eb4c0b141";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/pa-IN/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/pa-IN/firefox-75.0b10.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "edbd11856f14a1c2e4dc430752a9dc78b3f5f6d6587208e936b436aff6e2384c8604e9dfb90f292690f7ab7952b2b6598b04635972640336a17b01a03b7d7c62";
+      sha512 = "679bbd8400e3ed62648d3aaa823540187970c53a5858ca4b5312b0ceb497c3da8c9a34a06eb48af2f608c8682c1d006f719ca07437c3e030b9fba9e851de1b19";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/pl/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/pl/firefox-75.0b10.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "78b9c89b93edec1e3a53697f3212c7084c714147e44437620b966f2a90b8b2c917bc219c3b8cba27b08bc327515e0993a7380b3316d2efb385be7af120e72de1";
+      sha512 = "8d37c09fd28b30a6bc28fa5dcd520a6f35e32679769d3461c2eae63a2644e65ab5f84a0883b52e05711f655c7bb592de50b6ec38911ffa751c86ac1c4c0d7d54";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/pt-BR/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/pt-BR/firefox-75.0b10.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "3ad8e83f2169ab552cb6e03f60d343762571824cef104f7884352583a5d77caa2a1e8c85c29793e43555dafd8761df684c8d6d11b733ff899d5da2b7d42822b6";
+      sha512 = "e22bfc682e77eab4ec43fc57942e76138db54ef6057172239eb6756134b5bfa1b32240b8e68c78bf51170390ebeec3304d9c5144dd0e98e73335b191fe3066aa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/pt-PT/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/pt-PT/firefox-75.0b10.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "83f4200e1de395c37fdc626aa6dfd3ee35597743d5f4d32832c143e917983426a725b0ae3f73090a35abdb96fb2c7aa55fc4595668641ad868e9b596679ed2e4";
+      sha512 = "02238ecaa8532132f3e42482c83cba03cb780005d5539b1d920d465ee72d03e5cfc7fde762793c087739eedeaedbaf74c6cdd01991c3c0de977d365188fed9b1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/rm/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/rm/firefox-75.0b10.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "5c25da1ff0d73ecb7b77901341350c7f8caea4c8ee2d40740ad6f5ea70a7a83127df8efefeca2ef3b1f3240013540fc4f70208955c62c25e0ad9bc7c56763f92";
+      sha512 = "fe96d9a87f93c6626719b72142cd5d2e7de1a2306039c1ba043889a9a302cd0084838597cd57d1a96e99e74590c8c348a11c58e2618f9b4a10e19866a3535d86";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ro/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/ro/firefox-75.0b10.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "fd60dbebfec4b2514ca7151fffc9516c94cddf4bfb75e337735e0025746d1d19ca90762c84b97ca15893e81e29a1f62fafb4c970fcf1ea8e191fe74238078537";
+      sha512 = "ca771f7220ba4eec5c20051a9114a29d879499ba897187b7e29af1b628f1d3b7ee882e3d69dd7b61902852d0869c0706a52b3617243e02c51cfd4bfe7c6bda3f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ru/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/ru/firefox-75.0b10.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "db1015936799ed1ba14a4ae81adc5046e9b51b99fdf01d3e88e9925bdacd8367d97662278e2512cb15eadc4fe9fb40a6c4f66bdb6c7492dc6f411afa6e31b430";
+      sha512 = "b52133ff3e7b8393560a79e352cb6fb71d0f9efe3fc1d9c22c176db18ebcefa8cb1624adff892387a455d19edcf4c33c19db22c552a990d863f7c05765641831";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/si/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/si/firefox-75.0b10.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "16b685a3d27a94ea3bf1c35054d2b5c6b718e528598f0a749382470986adceeaa96e194090a4d0a0d3ddd3ae8b70b57f4a31307e81c1dc15dd7e30d4db8ea359";
+      sha512 = "298be2e78ccdd5bcb0d229c27baffc4e5a06f9d8d896723611ea10daee1ac3d27fec94802ff913599c1664d9bb6a238e3187c8998463dd1cc592439f1f226e2a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/sk/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/sk/firefox-75.0b10.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "60b18d7786cdee2789cab02ad9fb28754ea9cc5325fe780b46f3e0766ef37cf0a7ffeff4ec1c207db3b0e14bfedf2a1598fcd0adb4ba28c63ba6411d2c95c79c";
+      sha512 = "e7b0a16c8b7053c98e9fa9efa194f9aec768ce92d118e2b29f518758bfe501c6059602168708f2bf42519b21bcef148b8d50665ee5dd6fb0bec48445d8457cf0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/sl/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/sl/firefox-75.0b10.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "55fa56427b0f6e6667ccc12f6b326111e7b19b88b231d084925d57a7d8c1528b81efb0be1dab5c0a857efdc112189d6d72f86736793264a866dae120ac28acbd";
+      sha512 = "5f77cc13ac99fb88a8689d408fe8fbbe738084bab2c69a82c8ab7e05a9245e2b68444f3eb83bac18a88afafdd8865e6b521129eee66c07d5eb10564712a19935";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/son/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/son/firefox-75.0b10.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "7a6aa2228a562910e1e1b0f358669d4da66112977373c7bb88e3138bcdcec8cce0c8c7530700b28872f5f38e6ac06a338c6740959b4ff7d75091f2c378c4a905";
+      sha512 = "8df35ce6b53770b3b32da1673f7260409af0adff3c90411870a8bc710ad4d018b727742f15d047310305193624608df681377ebbc53426f0d44b74df0ee8802d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/sq/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/sq/firefox-75.0b10.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "4a2eaec9124333ee83d461762ba1d8fd12c9c108b1bcb7203e4a6d437e510b26eeec2706f8338f85ce161292758e719798cc20c6b79a0466be22dbdfa0939f88";
+      sha512 = "8b9bdb45f06f0f2bb82ddc043f0589bfe4065ef62ed4a0fa82ce68bee62792742b21336d361afc3b984b2af1a5b160240db27dc30e0fa1982c6cc8cb57d5bc35";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/sr/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/sr/firefox-75.0b10.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "a6fe13a64012c7383313304da2c8b4dac691416ba50d364fd6a40679353449700e2e320103fb542d8a979509730de2c84728fefd4b1fb2ebb203f7c7fc52b808";
+      sha512 = "ae06040857cae1e6a69a94b8d0e4f49f7bdc96dd628bd6f150deb00911da63543d43eec93289447031805802251baa35981ea812917e09af306147a4276ce2ff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/sv-SE/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/sv-SE/firefox-75.0b10.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "54568bca3be19e5d9777a2d0cccccd936b2b3b559b238635c89dd392a1c7f72504aa2198413d6954cae18000ded74593147a11abd9000ef10f61071d531b0e28";
+      sha512 = "1430d3449506bcc45126cc4f89b5a1833d1744ec82a5d97b8a2108354ba9a318c6abca1fb5d22d551a358691dffef2c12a5c7a4835c468a64488021b8577edd1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ta/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/ta/firefox-75.0b10.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "a6b68224395e3ddba38740d283e1841ce43a28a1f4cbe6810ea71d6b7cd40001dfafe2fb053d212faa5133e2805366575566de2bea3bc8d3acaf7b782c3cdbaf";
+      sha512 = "769d1cf1b7fc698e24b6eb341214dfe802f62f712216462ddb7c8bdfa4146db546e76333eae654016adfb32b481f0fe21aacb1da3a6e7d0382e9e6e4d4593803";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/te/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/te/firefox-75.0b10.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "e20d28c7cd95bbbe5b1680301d94894bf0b8c60aad997515d73f792c7fdf17c3efa4314c210082886bc8957b00a7f919959815e15b994bb616bd7c0ed0d40100";
+      sha512 = "69dd7f576c4f198d8963d23eb5075d4b6c507749a5b1aaebdda4b6394df8f8d3207a5bbc7c8530562b8b027df04f2f3024a1320c44e826fe01d84ed67afc75ed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/th/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/th/firefox-75.0b10.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "11564e0ba2770f87549c272faecb746323e19f46d9c6e116ef44a977d571c4ab917d89d1c0cab702074242d36f544fa4a6810bedd2b1088af6d3e23cdd78a924";
+      sha512 = "e41ca7fa06f947281c1b6416604f7138e13d02f0dccfab032bc0433f0dc0d7352307e941435df2a158ce05818c969f50034bd323d186fd7c3df2abb2f672bde7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/tl/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/tl/firefox-75.0b10.tar.bz2";
       locale = "tl";
       arch = "linux-x86_64";
-      sha512 = "072602e5f2973d7412dc8d3e4d0aa4a76aeecd493e2a1444d9348e66ee9dbcff1d8c09f35ba676dbf2f056aa0e843e87c2da6d73c6f3efd38281fea7f60c5d12";
+      sha512 = "5f71fe372a67a9de34380548e92e5871e4eb8fd76bc10244b3bfaf48ef9753b2038399d3382be3071e825436bcea980bd6a20c9625c6fc857c595d6d583ea6a5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/tr/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/tr/firefox-75.0b10.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "2b5ca4ee7ff322fbb986cf4946fcb65617606f8f317cdf357a81c2a9beb6492b3167286cce7a18083df5bc99a5782f98953ec79f6ed314d84b734f41c5b76254";
+      sha512 = "1164d6ebfc3d689726c73e6cfc912bd4a2c720f271b4ba947d5f0296560ab3c777acb6a50059cac4155ece1001b7b6e34314e0b3f9a98170646701dcdccb3828";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/trs/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/trs/firefox-75.0b10.tar.bz2";
       locale = "trs";
       arch = "linux-x86_64";
-      sha512 = "10ed6b3cdef78a903ac32bf02dd767a016a33e7d59de0dbc9586d8afaf16ddf8bbceb557909753ca52e1c0fe1b24da5b72c3749bdb7a56986bfe30f49e2f6d9e";
+      sha512 = "196f6825a5ddfe4bc54abf4b19a9433e0a0f1dc3d5bcc42f1ed820bacc2e88bb99edc727bf8feafd3dfd091055e67adc5e2cfd8dfb0dd4ebbaeefecfcb824dc3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/uk/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/uk/firefox-75.0b10.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "2e640904dc0e6735510ec50a2f735f3647fde090f2c4a48b34ae2d123e39ad2b71923e58101a646da86d54865dac69b2c5ec7d4d54d30cf9521008e9ad6c0f04";
+      sha512 = "c5a279ab81cd4c940feb40c3e006ca76a1e21f95ecf82fe820184d6fee7417a70c81091c01440063c4f515d6e81c238a4ca98eed80331f42d4f876fc7c0aba1f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ur/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/ur/firefox-75.0b10.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "6aa743480ea70566a12f4486ed8bba83482c34387773f6ac7735ac4ed6a14a9e7e53fca77d5fd295c6cfeeb395fb309efa41af0bd00d77355e4b2a2da2575e2f";
+      sha512 = "e43360aa9068b8ae765e9401f6fe0a6efd087881d057b18016f0fbaca31b86be7737d5854f7b6f1e4582e04db8fecef5963ba060547dc96d6a65a046dd094cfe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/uz/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/uz/firefox-75.0b10.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "3292332ce5efa59d889c0f32daab5279a37b342c98e6f4aa05e90a3db8c91f8517c26fe83a5cd59b17400e7bea0e256ae8a44b58f9b620e58497bf3fc0a52b96";
+      sha512 = "0052036ace7a2f666a50fe4542598aa584bbdeb9e64f4753719a78461e4b7c51b8527b053c4f93b83a42c01cd784f7e1334063c916d4b74c3c5ec5a7c63d5db4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/vi/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/vi/firefox-75.0b10.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "8969ebe5a3148b85daf23f7a4299e755461c722b4696a700e2b6c66164ce14c60d2891691afb4093cc394021718c670ca6bd113bc8dbb7f6ae705299fc51f9f5";
+      sha512 = "beb4897ba6a02af3d502be19c65ba21a296a2770506dd52fabdd5d8606ea79699f8d855b375f5f66c74b9785ab34bb96c494d30cb72b68eba0a068ac6d7a629d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/xh/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/xh/firefox-75.0b10.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "570a250b522b5061ee9b3fbfddecd9018c93baed7e813847ab9fd9426855ecc6bd940e15dd08b5bb0d3b34991245104ee95a5da4f74c7aca895fe086e0b66973";
+      sha512 = "297b411d75b22961a6f8a65e426f6c995e55119d6c3d80efadaa82baed29e50e9089160a5d363e5935ac32076f49483ab17199e168bc5b7c259005e7d5a02951";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/zh-CN/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/zh-CN/firefox-75.0b10.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "b86320fe1ddbed83cf9ceba5d60c0d40e0e137f509a13b70be7b2024052bc5589fb3bc84ded1b3987bff6416dfca11a094f7e6fe881f04b35899fcce2854ce0e";
+      sha512 = "4606ad20db280ae61fbb7b70ad62ee1649049c97dd1c670adf21c4ab72e33c6bf519c59e449981cb181b14145d878a165aef967b7835e0ede8bb08f288094701";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/zh-TW/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-x86_64/zh-TW/firefox-75.0b10.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "0d5cc478d801dc2a70bac8a38bde654311d32ba5059f0047d07e8fd321fa593ae56baf3b8c8f6e93dfc9c3ea4a9c5298079271220da0b92010e65eab2b7dd707";
+      sha512 = "d7caf2000a527cfaa4c4b7bdfd94965eccffc796749e0ac46e92ca685ab1571f983d6522c7b067c8dfa7fa0bcda76f722d7806e102edfb784e7e6b709ee4460a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ach/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/ach/firefox-75.0b10.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "f95b9ba5463a59a45fd34abceb5026c1f3834064cc318f91cf76aa118be5a796482b5fea14803f36b973c7a9f9f07af83561248feb7f92c82c1ec793471715c4";
+      sha512 = "d68e7688fc074bfe8c96e6af80baf99e07289f9bede20c58838c9b7b3b8420c9c3b448846bf7bae64f0666e5d668b5a61b4675bf411aba47436e7c4785797b9b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/af/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/af/firefox-75.0b10.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "4f68f211b7f2bd2e6c3f42f9698eba479b2c9dc60f8970cee1f0dad2f9a231ab8a1f093da4d1fca0589842e94bbda148ec79fc09290e1a85e7c505cb4f006020";
+      sha512 = "663224eb49a5ed3df32072435793b529de2807d07bd18f6390f72a26ced4e2314c1b3fc377448e3f5ca9b0df58c81aa142b77299074ff17effd8f57b73a480dc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/an/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/an/firefox-75.0b10.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "744962dde4cacbe6d9ba67fe7dc01a4267fa16578127a48d7ef59a2ef6768dc70f681bfc73405e827a1cf1b0b7d217133663ac47601fd35ece900d851c7ff78e";
+      sha512 = "25112efa71af62e17fa5a9accc4ff59507265187772ab3cb5d8527f9c36e424a6a19298dc293aca778216b01bdee973d4644b57349cff91392858481dc19df09";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ar/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/ar/firefox-75.0b10.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "f71b142c885ed61f78921fa058ff107cf4079c1a7f0c5fb67ed07a30188d878086cf4cc3b07c3ec2d6a7febf4f2126c739b3dd14f2462d2a8cca418ef4b26b2c";
+      sha512 = "181215d8dd14cc5912793869a942527bf6c53913d1816ce33a489e325349e2423edf76382417ac8b3f330e950bbe2bf09e253ca93d95852250861171bc87ba45";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ast/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/ast/firefox-75.0b10.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "3b30a05ccc6d10af86f7342d8b184f78e789275031ef317548acb051ca7f5e3b6e668f67087818a750999265674573cb55f2860690bb69a155d4e762bae59f52";
+      sha512 = "071c67a8ae72cb668cb40b198488d60e1561a07654df778d894abbdab996bda14ea1536369a7ae09ea9908735ba5b2a7a7f761b41df0f021a39c26fb4c8fc4c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/az/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/az/firefox-75.0b10.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "a054387e9bbafa9c99013066627f028bca1bb59fe01168113957eb7b28aea6b367050bbaf73271ea332beb7d634f2374de0f7b29b5e72b37ccc65065efae0bd8";
+      sha512 = "c39ce01dd4f23fd8a1671ff50454a45a42e652e45805de6a82f91ed86a94b3ce64308dcd80f8b9e8a4be078711e0591b92750e8cac6c9b0ff060e453ae51b647";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/be/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/be/firefox-75.0b10.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "e865a0721f0ac9d6ef36b511b241d869cb2b9d6b76897c7a3b6f96c66c38b00da032ba8ad94fed9cd65a9c56736742f56fc0073768e594374ef39abdfe36c8d9";
+      sha512 = "959ff60d0a8d8a525063548835f17983c124358d6b53899278ebe007d7aaec4a7365fa3fe7b565764c3469a0cf73e0dafa38bc4ff1ff07a2b9cc118e5d92515c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/bg/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/bg/firefox-75.0b10.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "0da867e56f18f268abb91da626a4519546d6ac73fc8eba66c52cab33de81456117791126094f4ee95169d64cf046c6800006ca8b85250fd0e240f0280376b62e";
+      sha512 = "24d8e0acaf8338f07ec36acee58d6d48d48f1a6e4af9c97553262931326b76a1515bd205ea3388e1f8c5c4273cc56aacf040fdf79516cfbd975842b66e7dc7f1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/bn/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/bn/firefox-75.0b10.tar.bz2";
       locale = "bn";
       arch = "linux-i686";
-      sha512 = "2ecffd8e81e3c8d570b2931a0579cf30a111710703eef07c24358506f9ed9a2b09952bc481bda2632417af9993560ac0dbe1784b98ba34b21784c626429339ef";
+      sha512 = "b7a6b46559f11fcd38f9ae962dd148841bbfd61adb0c7c503d5a625a7235cc9c83f2f149945bd68e708b272c7bf3e07e24423b64502b7fb2b88b40c7497b33f4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/br/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/br/firefox-75.0b10.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "6ae78396927fc66c2a3a4097c6fa6f7f5e4c60757242e06e621ec0dc97b482425514a31a989de7aa2ce32c5e1caa99e77b9f8849d708f8f2af45a1004f919137";
+      sha512 = "5f457dc51a1573b922d3c93f2677211ea37a6da5e396d3fd25050dc649eae04630edb561cb9623975bb743415dcb4ff55f8b5bd8b64cfd7eff68a11b2de72202";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/bs/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/bs/firefox-75.0b10.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "e40f191a49741e48b4dec8871f290ca2ef72b11a37f57956bfa57b24bc1c3983e949e13cf22fe11a878744f401e9bc6fb699a5d78edbf55620c6b7b4efda42fc";
+      sha512 = "235de763e1272e80eaff51b29ff8287aa3743944fff0fadf74f02b211845882024323406e19a8063d4d6ea3e3e3ba46a9cfac823b2d216d892af709046eea082";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ca-valencia/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/ca-valencia/firefox-75.0b10.tar.bz2";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha512 = "bf57f081cc6bdf3d0305ebbb01e98311b5ba40bd23773d93dd568bdf214ff867e495da4ddc6201d8b398f53976270ce81658017f10fc2f225419c373e68813a6";
+      sha512 = "ebc7fe61b39a90bef6872100f3e61d7e6bdf8dd021ee3b46a47278c696cae099256f55a00c2a7b0f8f9452f5e12337ad50bdf7a6bfc473bf8659290c7caf4fc7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ca/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/ca/firefox-75.0b10.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "14ff3f4e17101054c64f408458d778771584581429a757f6d5d7bcaa31a51df1f2c0712b88a216b9792496ac92f6d3e56439660b56e2c1eb062094c74eb393ed";
+      sha512 = "aa18e130f143ea86a0d9b392769587bbbcf856823102715beec8c1f27ae715e2811c632eb5acf0b6e019c0b93d7f612e56a1ebd7cef63729912164e0d53890c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/cak/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/cak/firefox-75.0b10.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "a600dc50aa7eb2c2fc5f3cc2f5ff31cf19f3aaaa680319599f77cbb615b6545c1fefbc1f75a3dfd455bfc0e7881d9793ae05b193842ce56bda5eb4c42da37c5d";
+      sha512 = "6941576be7a4328466c39d0110728cf4bced5dab4673ab8614c71a5fd675a8fb2dbe5b820f4e02b06eb9198e25542a4ba027657161bb9c7937e2913a4fa410c8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/cs/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/cs/firefox-75.0b10.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "117f94c4f3b892070b071e16660e7b6dc62df90f62783fc456a220a3840917b5344379f88164a2b796cf7b9565025a5752498575ea7b68afc24a55dd2f975ed9";
+      sha512 = "15d2ac396389b9188fdc94dc45c7559821537a2c8014339d26f5c63dd46fca24d7f5890b1694f2b78e64fcd020f6121cdbd5eb37183dd7cc9527f738830cf147";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/cy/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/cy/firefox-75.0b10.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "87ac39c6ce202d6eca6823a7d249ac122f36487c40b6386a179fb86657fb855baf149db5e73d4f9aa437de43bcb24f32b16772da29057e4a2e02044890dc314b";
+      sha512 = "60b1150e30d798a7a5362522a08dab2edd388d59bb8c9ffc63a6c022caf0681937f37a092560b3a7787620d483ebede45bd37e23e3fddad9ec19ef6b4823c419";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/da/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/da/firefox-75.0b10.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "9d89aaebbe4e8110d12bc1ccb9c84b03b4f39eda2f542c15eb77befa6cb28fd8bc6f6bd1e91a115ab4c5ff2c12df48ae97c8dbc06860911995ab6687f7a36ee7";
+      sha512 = "fcf539e1bacda4e5d9f00e23dbdd08846d1560ad4ee480aa3de32779233c7168e9a5dd613ffb407447f3d7598762de98eb3738bdda21c2098838f7f456fc60c9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/de/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/de/firefox-75.0b10.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "e1e6df8039fbdf1071606cb6146b5b7e8c7cc793e4495c845ee68d6245820bb8f4e41c42e4c7dc4135bb21a0489bf2366cdea47c99fc56e89a89f77215167c50";
+      sha512 = "7eb05cd1fad96808be111d5c10d13c3757eeec65f10334f8035ac06a254784e17b0a32508f215191b80bcaeda7a50b101975466d5908078a4726fe2f0c77fb46";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/dsb/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/dsb/firefox-75.0b10.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "b3630e5ca8a4ff299717e8458d9d3f8cf6d06c470e634e557c675c89f4c861f6cdcb3ed6ae4c8af4e17bdc0c3e6ceb10584fa08e600ae1355dae8ebc1d20acd8";
+      sha512 = "a3564b3ce7ce0fc78065098c8c3b6b26eee0a98d1c4012a3723b155252df8a0fcc5a768a095f20244b87e24389e930dea370e74ab5f18b629565cae3d653db01";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/el/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/el/firefox-75.0b10.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "9d6a637eedec5d5d4a794384201309b1bc57848760ed1af3c0afd1fb2bd70cba465710cd618bdb610cbc171253f4b8b3270b004af10a5604e0bd373dd0eae420";
+      sha512 = "621eb47ca42d9f9cb57b66fb33fca11a581f277048404d9ebdc9de92218b88c786d8e60fd8ce0a2ee409286e0256c5f0776095cad12d491935150573ca220f24";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/en-CA/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/en-CA/firefox-75.0b10.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha512 = "1658adcd506c209366efacbd730a0576c77591ba672a9d0714b6296b9ea24cd5f291a6a8003da6cb5d8667efb5c8db41dcbd0dbe83140ee45d8977f51882f4da";
+      sha512 = "007a3b1ea08dadd5f5ec4463e0308edc4e38d8c31001d555a7382292977a1a2332c2121b8d4e93130521be7adbb1b8827e8ab63f61db9e4df197f6c69e1f5576";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/en-GB/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/en-GB/firefox-75.0b10.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "61720522cce0fafc76173331fae77d293b952bb05c5b6fede29f1b3ab3ecaa2a546c9a16a16ef4f62ebd19c04f0925db232d4de5b3da172b5468f9657b0d59f7";
+      sha512 = "319f6d6b3136f3e61a8a015624122159b223ac4b2150d7e16eac2d45273dc780a1f04f6dfa1d8dbbaa5063990a9c3bbeea77e177e7c0d16b4e8c7496d31956a8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/en-US/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/en-US/firefox-75.0b10.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "a45899b9efdf8de1ecae76d19c5c8a081ddc81ac2b04991c5000a3d7379d13ceaf192419bbcc87fbbfb9dea50fc6b99ffd7845f11ba47e280dee51fd5d832edb";
+      sha512 = "2bfc8da9147c89fb839265272f20e50f380f488aad86c7cbd122da700dd9b490c0375c694760bfb5aac90cb33aab61ed6d436b9428f5c0278b17e73dac35d48b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/eo/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/eo/firefox-75.0b10.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "97409a0943ac848f96c54dc6e7ca8c955b6ed2aeed078833f8a69e187e550bc588c3b5ec82d4f56061cbcb689e5548a8a9b7f9171e637d04a096b91b4d4421d9";
+      sha512 = "fabc649aa5e95d31b8971b2eb513a301bee05722b40fcb8bb03e6080ba695e1bdaac393984dc0492f03d087cfdc62aa852926b0d65e2603b5c70fba0f5951e86";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/es-AR/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/es-AR/firefox-75.0b10.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "75c37f77ab57a1503de3ea27b55d4d77393d426b490413c4c35ff1072534da38bd31a2e78c5655bdc9b5d5f32ccc9517e83bca1be1a10fda7cbb3ba289e0ba3d";
+      sha512 = "1485c8a3060026d3d688673a4ed9ef606318d5c7b25a946c985672a17361daf107b5e6ade39e25e5cc1f6b8efeda6dc0c1267ad4afae9828bfc3fa21de6dcf21";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/es-CL/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/es-CL/firefox-75.0b10.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "d9c58844f4b241d749dc0cbd1d04a8e490a6296d0c3cd26da062b043060488794923728e29adfe171834b331ce9461465f14b71f6064e49a39d458256a99ac08";
+      sha512 = "e100b41274e06021692f92648db3a5340c7a4040d08d0bb53e143cb25b7adc4836636a93c49b03d5c9658a31b1d4a7bda4e1ea95957f387cf0f9fdf888426044";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/es-ES/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/es-ES/firefox-75.0b10.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "9f4e74d5f01ce99e5bb9ee47f262b0442bc4ecfdf25a45e204bbc207a0bc49698b2e82bbb8ea8a80b5b912d6dbd4a3e0e42de75d3becb0a2fc2ebfb3c2bdabe9";
+      sha512 = "2787ba4ca6c083b2dac788a0bd2ec89e1486bc6b5d711455d5c38ae259a28872c0cbccf8c9b7c863c9c4f1ee445845a826de9ca9068e23d98426b754351e733f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/es-MX/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/es-MX/firefox-75.0b10.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "612a5d746e31afd8d4f3be3b56c0bf28166474e68a16b237d6c65c974a6f5e1589c3c29165e52936117969c856ea1b5488649d22bdd08a4db05dee8a80142207";
+      sha512 = "e0db2889531d072387e9ec2c26dcc3074c45aad6c1799204cf9c9299d568079f9c95a402152eb5f5a2f64aebe52024db272c3cd1e93abf4e9de68d299a19d069";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/et/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/et/firefox-75.0b10.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "cd59ba16ededf91c6abbe45d059822fdb1e7f450fcc4a7c90816ebcf4aa7d9bca86ca23c105b1fde01944b06e188b240f8622b7664207fd680d73063164df81b";
+      sha512 = "120a955a7036ee11d658d637bae5f2299c7274335f4086b8bb051d2bcc17f3923c9347df9e31eaeccf44e08c75d7836df05252979064a1867261fac6a945be9f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/eu/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/eu/firefox-75.0b10.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "4a6d6c84ee790000a0e50b296d41956d9fb1708a20d55ab0d093147d823fb3b1d3b209cf83bea40c4a17ccd5f2fdfb898425ddc105bd11f7375fafdbe138d12f";
+      sha512 = "00def4276e61898dfb8ec12d4506c240e277986f35b8b9c6a651f65fa1511a05e173619d4188f41290b2f9746a8de02cb94360443fc86282a4d7c0331f39203d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/fa/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/fa/firefox-75.0b10.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "12f2a70b386a6dcb7184c0afcb28b6f01daa0e2a5df0cb83cd9407659086036a379cf3e87a4c00466b1e6d730811f1394d2fe870a33149915a9551571054bd38";
+      sha512 = "034acad338b4592e8ed9bc93d2e367f30fda535375a7ec2138684f7b252975c25c1327119188c7a876efdb40e457d90aeff0e24ff3e65354c1c79145a1d9ea55";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ff/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/ff/firefox-75.0b10.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "de6af7697f9450035c4bd14daa319c020f53943521e9867e3784c6c68183192d5a4076e1f416bf062d76d16cb2ce113c3aa2a462a879b360c8641cfe49e7cae0";
+      sha512 = "a95151fad002e6226f5b5ed7d63cd42444a8b120ba48af1ec14ac5f794782f5d1485ecddef55543a79c6c8e3d6ecca057647764233154f6fd12f87c3742f2b6c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/fi/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/fi/firefox-75.0b10.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "3b5a6b5ff92c79978dde410bade97b835bbc8159db7659557c6ce22675e33bb96c49478596ee3b3a8acfc67d8f4a24e02ddac18ee481a95250b975c174c4dab9";
+      sha512 = "3605dbea959f42ef539c85e7c73d82bf5d332bddb61e2b6288ae06479b2f8708fdd1b38c06c8b3a000a828ae4d21fb71b57db531d05bfda7a2c591733024b06a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/fr/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/fr/firefox-75.0b10.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "1038cf04afdeb236ef0b12ad096d0431c8576105e861c09bcaecd1b27a2ee02f56834eb874b8007f50534bd43a92859c51dd0aa0150cd258cb22368337da1d71";
+      sha512 = "db57feb0990dad840cdb83681d9503de329b581f4248eac46b38bc6723ef5e84291c2dca04648adf50cb694d0facb550bb5036d198eec74dbc26ad13e043ca17";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/fy-NL/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/fy-NL/firefox-75.0b10.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "c5139756c49eb6977f053003238df9b771fd61645d540482875775ab76157eac29be84869390d62261ddafc1b6005ce1df58bbfb7cbaf8d22ae4e98daf6d5d9a";
+      sha512 = "c0bb68bde12957a31c12c84e9444bcffc2a5e6ef37a360cdd80baa46773fc05df1be4a3634f43ff9890125991214a96488a439786044c328741e29e4ff48fd82";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ga-IE/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/ga-IE/firefox-75.0b10.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "d9a5baf26001f438f20cb7799a6da9086039743e184814914199c57a64cf7cc993bdfb477ea61bcee43e2f7db05ccc02edff99a093a1e2a1f41de0ba72cca2f2";
+      sha512 = "d081187c798c74fb1070a05721c70c6ff1e53a2fbae4bce15443eff539e569634ec62d772af4993e261d4f7b0574db4f57ee9ad3c574fd6ef49a9495c4231e10";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/gd/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/gd/firefox-75.0b10.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "d9c4f1ac7d5abb7c90b7cdb6aef437c5f3ba2f524db43a34cf65df3822b811293a5d4bc56707fe254cbb57f7a00cb0773a1619113f3b455ceac50c388fc8a2d7";
+      sha512 = "089b979baf3ff97a27c20947d31c54eaaca2450942f5b78a2e1db36cd8f3d16cd73c1f75dfbc332767bdcd2c7abc441d4a501f5787cce4bee05f71005f7a77aa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/gl/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/gl/firefox-75.0b10.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "32b7e11e9f5c76b12c3012fcd90d5b0bc2ceed289780db6fe32e53ecb3dbe9fc31a83c5a684496aa35d3c51693c14265a24725131b9e0b6653c811dd2b60d933";
+      sha512 = "faf8059f8e65f547a89a927736794e3342528132bb05b71d39317f7ec2dea9bb31f626557ee556d3ac6dab94a64ebddb3c054eb7d73bf70e1a9bcbe487366d53";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/gn/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/gn/firefox-75.0b10.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "89c763e8ddb051304e8b192a8071fde4c4dc4c0d1b233cde51faad5b2d8899609ba5c06399569203780959a70207041b59a0b8ebd0c1f08891afaa37a3e44a9f";
+      sha512 = "f0e2e13d0a0c4f7dbec316244e9067067cb1a74179800a5cd2a0da58337f9a0e2c62e7dc9fbcb4be450ce11feb355e59219a7892ab04260f93157e358c32b939";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/gu-IN/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/gu-IN/firefox-75.0b10.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "4ed360cf1f16896f2bc7d9f90f66943ca4f8bf27336a4cce928760b820572b50bb4403137fbe9344c117e7a289cfaf70006d702e1aa6bc4eb15150fbb743119c";
+      sha512 = "c66c38fc1961b1b2804f2a0917af5b13351cea374d58e8322f640edffc0c25acca6b97aa52494ee8e74c327f703f6ff7e7aed50e8cb9efc1b23c5b87c5d2a955";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/he/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/he/firefox-75.0b10.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "f1aa69b9ecb760d4797dc15a15dc7237704e51575cb02ed7019652e81c0f862db3494b6aa5059a1e7c6b7159cd712666e7f279ec95466ef57af85e1ebe4dde85";
+      sha512 = "7df251368a5ba6aa8b5d0d562702136f2d58ce8983f64003a1cb0d30486a084f5e75618b46cb3310e833f00d8095d37e438a538b57dbcaede0ef9de68c8ef467";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/hi-IN/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/hi-IN/firefox-75.0b10.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "fdc7f76be1affb5e93cb316844724ee8929e84d6fd629797d3c0e150144595b0d6d2b06763d7f6a63210622b3da9a4181e5f704d2ea2383664857561806c2cd6";
+      sha512 = "1418298cddf860e51308ba2ed7f0ce3a5bc0ff5662aba5f895c3745c620f5c5b6de2ffc958df130afa179c2b620b84d36cacb447dc71a8d30e428025095b91d0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/hr/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/hr/firefox-75.0b10.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "dae36784f556cb0e4d371620b333b167b16e810eab97d4f4857320a9d61f14ae392a4b2a472fd43565a807ba2d75d4dd4848a25effe1e2e7747dbbc30d893cd6";
+      sha512 = "5df5ba0bc07a3628c14d43832ff2956c91f5356ba47482690f44e0ff69be24e7934cd8717064a15a3c3dd98171c202e79562b42d729571dedd2633bd198c3bf2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/hsb/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/hsb/firefox-75.0b10.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "04c175a3ca68db0d848a6ed2eead84cedbd7078d741b43e725fb51f5a4124487c3e30f18c940eebb7702154061e67b9e63a53d7d219b8ba25121cc47de3a8049";
+      sha512 = "f852e7c462d7d50bc3ed3853479bbe01cbca55a8b7fdc761716fe2000acb312c6ccd75475e7aaaa0923ab3b1d0c1ef6b38ec23a267474419437dc094d4f90baf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/hu/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/hu/firefox-75.0b10.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "d6503a482ff7c43cc136e23126524c22e5636a7c5c8210052f353cbafc5d4a040c31572fd3271972dfe116ce3ac0d924ab509f677f4d8217bde282f76820180d";
+      sha512 = "8a753976b527739e4f4c5538b2132bcfbb8b04ec37980330bfb25043dea248b59071091c13256e8df163ead508cb8c6368c9d19c6fce0d35a3aedb11eba19bcc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/hy-AM/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/hy-AM/firefox-75.0b10.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "4082fc2ef233e02b384cd576ec79bb2697bbbb8a04f469a1574f89fd9854ccf4138aed2569c2381697db2e073a471fe1e5a1b25b58b14a492d26d54229a1c6df";
+      sha512 = "c874c8d87972cb09a91564424f40061c5c99860aa06ef128cd73931d6e7ecfe9566fbdb705db4b3243432a8b409eafc8b97e101a357f0a0c66b65603b31e635a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ia/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/ia/firefox-75.0b10.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "f3e24a2778346cfe24a00f6cd966a2ba7b59906a0cf28e240313c72305ff9ad1a307b4db6846a6ff02b89deb72b3c9c4233f0f7c00e9e6f5f5dd949e04b12789";
+      sha512 = "1cb081dad0ce6c9175677b2772082fbfdd0fea54b8b6dc29aec1b342305a68b87eb91c5b793122891fecd5c63b3c9ecde1aba8f8a726f3d9db6078e3ebf49a4d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/id/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/id/firefox-75.0b10.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "4728f20776da754eb696036f69b6a341d912856bd0d9c105954f56d1181abe6b3b71a125b836d86061dfb39ed6282c4eadc3c9a0a33f39c24e9b34ae8ce047fc";
+      sha512 = "ed028e4e17af8c3833f0cc588864a1b5f2c1833b9d6bbf05b7ba0b67384989f91d34060d8a536ea79366c491f94932305e1211c8a748e61a97ec2c181f54e4f4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/is/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/is/firefox-75.0b10.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "0eee6d75916bc89554bbd9cc6736a289c816cfcd76c61999fe546489f5907ee23d9240686cc2f85fc56b005b4519883692d17225ea2daab7165f6bf0023d6290";
+      sha512 = "1ede3402ce97e33629433dfc9f4f9a8d286107ceefc6671109d9e554cf2188947fcb95517b1d1732eadd9027eafb62d5f5a34a54e850854f821736829c397afe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/it/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/it/firefox-75.0b10.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "e61500f91e7351ea75b5fce63c0b3a258881449d16750cb84a8b91e65fdabae42cf2e8142ec06e408fc221c86e372a60a282a8635bdf103bfd65c097bf51d709";
+      sha512 = "5109256af489e903bd631f37344cf55e95cba5ebe7f2a34c596b164e6e805731333a1e28f3307367c3428d3ca55b0db2a67f56ec66053f986fce921fdb348e71";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ja/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/ja/firefox-75.0b10.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "f4e8bcc5435864de90bf69820f18c8b2647fd8da250089e4940e752d36b2ecb5a437794874c3cfa5d3cd96ddeda4f6cbdf4c17725a31d57474e4d6330eafa801";
+      sha512 = "63db7ccb5a65ba6719ef49f0d45a6ad2fdc02114e5f0267c6ce3a2f4c8c53f94d80c9079654d5bd664126bdc1b66b1a97eb4e234180f2f620158ea65a2d73f98";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ka/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/ka/firefox-75.0b10.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "b516b2f8af0f306b78a67af63d9576b358f17f40f71520e82be35fc8dfab29b61ce5e4dd56cd52b6bed2e029597524db4a059fdc63f58ffa4013b1c6bed39cde";
+      sha512 = "975ebdf1ca04448ea1b411fde39b819238f84da0ecfa230f4a5d1a36d9475c77d19a9b7b6fc4a0a3f6e4d63ca7a3f3a92daf7468d1a57e2f4285b64f46697521";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/kab/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/kab/firefox-75.0b10.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "7a5c35f97deb3132f2575071eb81b5118f16403f37274f1f0d6677811de7b88059c2094aa3c35a7350a5a0f3308e904378e6095662af49188ad714b1bea920cf";
+      sha512 = "6ed91e428d3d1ef592879beaedfaa2ab38b82148db279622132885e36676deeae8965f68445427912a01e9b4285b80dc668f138e825832d84da597023eb7a618";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/kk/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/kk/firefox-75.0b10.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "f7a21230d6f2102d0ef34e3407339e289f3c426fbea1e22044653908dab9430422d85000ea5c30fc2b07905a10aa2afa3662904f6ca388031ba30c91de760d0d";
+      sha512 = "3d627ece6616f4858aa5f28f25c38606e1ae66c04f2adb962685e91100c2dc37ef85778484bd9372122c49c3f8727d69ca96551ae8fe3fbad50362ea0bc140b8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/km/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/km/firefox-75.0b10.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "b2b66527be2330554a69380ad44b56fb2b1c297ad9aab118446e55bacc35b7958f704b5acb543b826919db6c36e91514cbccb4aff3856dd9ee58dea9bda43cbf";
+      sha512 = "9c8f0741f4911011eb44ac3f31d2e1aa2779f42c23794946b2e51a6cd2f9349ee7d84a1ab7b1dfc93e0fedfb8f66813306def3b9f888489538c68f8badd5f3db";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/kn/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/kn/firefox-75.0b10.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "b110a46b8c5d6f4e7a9cfcd126a80fee7ba95cc35082845ad8aeec0f6778dfcde805377ab395e70a5e9dce518c53449a5586d9ae6eb8c19dce0eed6b4757b8cf";
+      sha512 = "5479a91793f4606b7419196950eff5f177d829c8e891cf7d82db1238825a7c78cf487ba75ce7f183287cd3dc7509352f0df3d2c23b0a8ae277636e6ba6d25d20";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ko/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/ko/firefox-75.0b10.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "9a35c7a81cd8ee930f8164bb59e58c321f35aa47abe5f0e28faf320216b1555b89516aca94bd49a1b76c892abf29dace03a7055e571198bf981c4beeaf965973";
+      sha512 = "20981d7218a85b1de17e813afb0ce51c543f2612036d07567b08e8d52bf38942ff8c43abe87cba04fbf9033da3bfc70423a1e1a643e6f953d681465823965465";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/lij/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/lij/firefox-75.0b10.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "21a09cac09faa88963e185d2e1f732aacbe2dd8629a389a851bb149eb1b09e4aa21a78996021ac43f7861cd67646e6008e63420c690bd8072138bc707d937b04";
+      sha512 = "ba6f47adda8aaae007cdfe16164238ad6dd6d05328ba53b7fd1bdd977663187132a6cba7640d93f166c3a6e8a171bb3176e54edc7f3104d8a2457db932fa5df3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/lt/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/lt/firefox-75.0b10.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "67864e1188716ae7e93f8a824709d597124ecdd4d76dd61ffc6a1dcc7048429e17440c8d096475811c7a00db2c42c778477f3c32f26e2facfdf538f562fd580e";
+      sha512 = "84d711c882e96b7a1a87ce3b162b2bbc7d0a26cd98e850c60bfc0218ea1e2c91d4bb2e1dd8fe9fe50315ef535aa758a72e98f54cf59931a14f9ae6131b6a9f68";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/lv/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/lv/firefox-75.0b10.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "de68b8cce2abe936bed8015c88a9dd998bd99d177b127ffcc205c975aafd3f51eff40b83d8b8e18cf66ce8dbb9931a9a9ca27684dcd2e2bdaaffd7b96607dc4d";
+      sha512 = "9fc0eac6797c641bced44092cd85169472696a8642455f3aed9336dfc949d3c83e999ececa04cd113ced249b94273f99292382a5bbdb62959baed721f8119374";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/mk/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/mk/firefox-75.0b10.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "c5f0baa178293cf993fbfe73f54a7052a249dc070a3c1538df27949c38c14d1e3d486d7bac26a5c97bd744c051dbae265b4bea215b1bc96ac732fe57a7766439";
+      sha512 = "3e42de4f906c330cc268bb5d737716f3a52898c049cd48eef672c716c8f4300bdb13c863e2aac0e5975148f2df2b1f25bf2739e2e693be17363f4d180c26790d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/mr/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/mr/firefox-75.0b10.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "61e9f28f0c8505d6a132195aad5ba56ef5c9c41caffb22b323b764029b1af0f92dc43cea70580246fd11bac75908023553f3bc2238d842ee1f6962ac6c059ae5";
+      sha512 = "b40c4633f9b2a5f8a6138d010bc7204fd973657cc376c9866d2fd05d20387189ae4f0f73f45b360d224fb3155c209c04f6ef62d740b3f333d23c33c664d983cd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ms/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/ms/firefox-75.0b10.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "4196f1eb297eca219ed58c58db77d691580f9a33158769f0559a2d1a815f4170c89d282bc01d4a94884b5dce6bf83fc6a6a687041eb02fd38f6dc0aaae78f555";
+      sha512 = "f1c4f6ef40eba2fc8442d514c61fed9bd41474d18009a999b6c31356194039a380c02c630a814e3c9c8f109c7ac431e687b59baf179751bf8ef0ceb18517ad84";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/my/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/my/firefox-75.0b10.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "4c1b2e13bbf33ae4d8c213e94a0d1d41fcdf1471304e9eede6ed74d28eab659be559f2a5ffcade436b624604e26255e37941afcb8d9f36cfdca2c3fb9031f758";
+      sha512 = "9d1a3e7650d169f8fed8b548d1268d0b2689b25e159b62f56d865a6ef9f3c5c5f681e4d2a8bac304e61f47a8774d45f3490e8578f2524fb7bd17b178829da4bd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/nb-NO/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/nb-NO/firefox-75.0b10.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "fc6d764124ae4182c01a96c12ba13ed807a7715d1ead7a7ae57c0c65d394166f0b80a18b12c351f87d8f28f894700d3e0892a42156cb6601fa34d173413ec121";
+      sha512 = "71e29aa2bf0ff9dbd8563f75e5343b6d7871a0a80b2d09bfeca0b992ef09360a90d76ed0d1ce080bcbc9727b4c481fb854fd1a34d7fb4ef95fda5317e4c4c617";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ne-NP/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/ne-NP/firefox-75.0b10.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "f285ea0cf2e4e6cd5da9ea2e04c5a942de5a9ba639c0c6be32fe64cb2d4076b15a0b8478a6b8e25d0bb7555b8148fda33313e5c78d91c5397d3cb8af7a5ab09d";
+      sha512 = "de88e72351ed3bf002c89036ed1d5d0a097384c387d682fda26fb49dd5af373edd5b0a23a4c17233a3e7b1203b65361b68b205ef88085903c9dd5dde1cfd89d1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/nl/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/nl/firefox-75.0b10.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "1e7e423cc24de27099375279a8f46572310a245709ab3b8450c7c1257ae28e219a1867477aaf50f68762eb1cb32b831ce3b73a1d4d7fcacef1fa4f6bc6a864f4";
+      sha512 = "6f7718cad9a3d56d1961f35feb4884982074bbafbcdbb81d232dfbad04d49420af3a27c69a6d36b934194beb35a36d34cfd93d01a6ba57af98af8f5962d7b609";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/nn-NO/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/nn-NO/firefox-75.0b10.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "a1e70c2c4eac55f9f6ef46cf741fe421449e5ef1cdf1a125e07a86037c1d5ee7a329d0e2041338856ae8385778207ebb95163cce1a124da64a5ff334c73fb5dc";
+      sha512 = "62879c6cf6c37ed1ecbc867c7b212d9b87be38b3f9ed923c6dee973891c011bc6fd1cddac897dc907e7d1080cbc38b227cae0678fffa7d080b3cb045c1b1af16";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/oc/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/oc/firefox-75.0b10.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "ac4abba844e7d9bca5d10889ec5150c2fe357bc5e2fcc1a47cb4ae1489645ec884de70a0190b7cc7ea943f1233dae708e33be8c9e4453a39e10c89b418a05e32";
+      sha512 = "821a42d64bd5043942cc149dbb6bb6a0766d04d3210e8b712d1160f0eef79aabcf8fac5b21d86bb40e35255dd39e1dee760a0f2484968bebde3521de5c2d0312";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/pa-IN/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/pa-IN/firefox-75.0b10.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "59e0ac652e3a619d5a9ba1d94014e583fe85118f4fe54779abb657e9ac5f59865483007bc6c254fce6f29270b24b74805ee6b9d227eca6ca61a651e051be6bd7";
+      sha512 = "f5cbb27d05974fd267a3cc041d1b340be4a96b9e9f2eda71a76897ef869d134c8d0283fa0af6263f82617a9c525441e574b478c896289046e8753847c5a34f02";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/pl/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/pl/firefox-75.0b10.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "3ba13b4616bd7381268e618cf0c00ea4ed807c38ff81e1f1b45457f9ab780e6676bfc563cea62df8767bbfe6962d91b8f1d7de63fc101242d18d2b1bbc045a1d";
+      sha512 = "c3cc0a3daeafe2400d5b98f1cc85a512f48bf8dfb9c0ff04703538ffe0f758adf1c22157848437172ed0772d9713222c928d3273919e3d2f0faa92592784a6fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/pt-BR/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/pt-BR/firefox-75.0b10.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "e115b3c9cbd88ea0fd43b58e9ba7996f3a95004269c5825b23244c9d30c75fb2f63abc4ebe6e645a91e21c798c4dfd7627604f44c0862547e156aa8f28e13d13";
+      sha512 = "abc60962741c4bd905737e65e31664a92b35f9c47d24b664d8ec53df3eaaefef9b91171368a1630d9d231aa14145f604ea31039e76dba0ad3213fa340c83aa8e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/pt-PT/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/pt-PT/firefox-75.0b10.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "7f53c4ba63b41c1f69c3ce11d401464d685983a906f44911a4a984073193c75b64d4df3d295fac9df004b4c8858d586424381d5607228d24663d4a3114e80a2c";
+      sha512 = "76df53cebd2d63fe0af50f257aa9dfaa36d890ec513da6791a4a6a5a0ab6715e52664ecf5e1ae36acc8cb1e98b4a47cbb38c057b13a12c678cee7a3dc2a003a4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/rm/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/rm/firefox-75.0b10.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "a397e6373787d0614f77641a10658dd72484364549f39ce89599554ec41b883a1c32b3a6a8df26a0b9065664012fd88e1c88d04d493ad4b2b5b39745113f4e99";
+      sha512 = "4a5c2cabbc90bd16c6916d8de55fed45aa6b43032776cea09dd1175c9a5e208d91ab315607eb09f8c63751a7a68b61d6d1e532d0b22a8f7dda2e5b0451501fdc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ro/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/ro/firefox-75.0b10.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "7eea48885af4efae7083c92797039d940594a26762551a5ec91479005414a8bdd7e0b57ae7e7f64d9fe80ed5d1da9dfb9c5b04aa1f721a7edaebde2c3885f790";
+      sha512 = "d18a87fc5338f93f604657ccaf884e0e77417d0d4396bb444e9a75b86d402551c8f5f71b06915f900b66fdc7b6dfb22cb061aa7aaed791d7e8f2216d4e6f7cde";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ru/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/ru/firefox-75.0b10.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "1362e789bb4890ce7791fb3c3d2e48428adab90ea5fa3f7644cf6fde6f6e0ad13ae01d318265013c48c8d0fb1d4bf67d2bf1001c6a49a2ab2fc0cc71813f6b3f";
+      sha512 = "102b1dde33228bd5fbed6da6359a7edfee6cf19abcf1fafc1ece8d53720eff3e05e998cf4c3f9ad6f69951ed128c4cc5bc448bc2980640f71f5d44252397fa56";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/si/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/si/firefox-75.0b10.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "f0369e0f40aa26933cd34b3e34e25a4fd3dc0f28ab85f58e4c5973732e1dd0c9539c9b2e83c82f70524fc0cd2d735a977ae2c62043470f2a590d9cd6e1f35643";
+      sha512 = "b502b455194bf7ba369d4bfc533d72ec33126f721254b06e2bad81d44d4bf270adf2ef1358d674421c2b44576f7f666997fa4ffa87d64ecf5ca6d2abb2448b07";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/sk/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/sk/firefox-75.0b10.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "2c24711825bdf49ec2cc5ac558ab1dee43c4282966cf9dc00f4ec5c0f20761c31e57a79640b7465a50010d65270c5f730c4ba08bf268e9b85d87e3e800e77bb1";
+      sha512 = "0958167a26f6679f23d9c02888b687f0d29a762501d2b1b7aa6c7eecadb8dcc0ba56796e2c45ffa792cbc6b60ec7525794c098f0ccb4e1a5dff000b1c486f6fb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/sl/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/sl/firefox-75.0b10.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "b25e7a1c421d98455bb141a48d29e3f6b57974b1869b5950c898c56a285fabc6c10b1308a64e033fce77ce9376c580a3d877a42c1cf336d4c17f99dc8c375789";
+      sha512 = "7355eabddaf2836c0824622a11d3268166e1caa48ccc5b5b5ad851a82e3d2a67ed6e2563183255fa5c4401d2c0d1826aa254e409d91f9fc874aeb7f0a964bf66";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/son/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/son/firefox-75.0b10.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "10011f2340274dbf7bd6183bebbeacbfa41f45eb8a2b255ef996f9c7285781bd80f4ba5e3411093dcccd7431cf57936ab87c8fb27c4458e19a8f0a5489ddaecf";
+      sha512 = "fffcefae3fb572830cb0d66ee6acaed8f30fa1b9d6e37285e2da155f3bea3dea0e69a506f19192dc78a0d0755bd79272c5321f875124f51eeaa5140e48250ec2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/sq/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/sq/firefox-75.0b10.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "e65105f1d8bb2aedfff769c5dfc55426cb846008d1d4bcc639a45c1fc24a00b2bdb8d1a1072755e552c7878526b75bac33d4a9bef6eb4637bbdc5a0d97020cc3";
+      sha512 = "e21e7aaa7c525e0666158348f70197312ac03eaf21ccd1c5ba4fc4276dd9e54520b3cb72663860bd4058505a043dbd1daa02bec3f87bbb00ff68b993fbb39f7a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/sr/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/sr/firefox-75.0b10.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "3d0bfadf39fbdd5b51c8187fac2ac6643bcceb06252365532b0369ca4beb0e09ef5116704f208d5fd66e23b321828a24dda7dd277c475967711128a6f8f3bdca";
+      sha512 = "ea844d3f5aa94478f9d91d3bb270c3edb00030779d47a57cbf8c9ba92a76d3ab6d1e107ab500d316312ed4619c3957f635aa48baf39a86247ad52c18c0e9261c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/sv-SE/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/sv-SE/firefox-75.0b10.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "036773f6324a6c6872ed0fa312c7ee63a891fceef9ba51f402e135b1572bacfd31c7b137014118ac91f13607056430eedcf082aa4889c68af4f4249035bbf7ca";
+      sha512 = "f90fa948c196e0114f2e1d57cb6fae841d0aeb90641d4fc83fa839da61dc1734dbc0e845fb489766d6a453fb24e108c9bae64db06ff1106b6cfa3d1ee18d9b6e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ta/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/ta/firefox-75.0b10.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "c9e4290b20655e9ad5e2f9bcf8982cfdb8c0492318ffdc716b0c257bd707b0d7db69bd6b48802e17026a3416cf1c78f6d10e782cdcdcaa0cc4a382517e1ea9e7";
+      sha512 = "2431c7322c52e977b5d390d58425b1a66687afdaf2d023aa80932d7ff4b724160f32d463667c863d7ba3430d027b7f193ed7dfdc3152c06a0c385bae30ff7565";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/te/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/te/firefox-75.0b10.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "53a4c90bbd7854031dd180fddab6452f29c33f56111ba40d9bd634bb5e87584016581137e1b100ed247565557b8a556c6a473d2c46e1bd65f78fe5506420091a";
+      sha512 = "e712b3dc04058d98ee11d44a132b6474a1214382d544a93dac96f201d638448f4e41a512ad644b321925280da4a647226ce2c090043020e3b3dbd578524f588b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/th/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/th/firefox-75.0b10.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "f75d583ec397c57cac3bd1c384393c818020c3f46ed3b196060497fc2f09a36df3d31cb7b6637e3697a50e04c5222cde0c50fffafabf3415cb097552b67061f6";
+      sha512 = "fd332fc7f51d8d548f235126c61ff9308c2785c2a31ab4dcad51cb06eac0e1e9a951308d76b2f7b69b38212f9eeb224632a5240dae59607d8ad735a219988fa7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/tl/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/tl/firefox-75.0b10.tar.bz2";
       locale = "tl";
       arch = "linux-i686";
-      sha512 = "607e6371397bf29c10893b5a72ff706c6cab84024c93832aedd1e7a57c1431c47350023424614680350536a3e8c6909a3ad89392d15208bdbceb6d63e1a2d95d";
+      sha512 = "de4661feeae9791f13a2b00c6cbe0d222ee99067bc585668b4744335c09dc7676a4f88fa3ab3e3f7bb39db687c738d2c2cb854e7c48e23a9a355c4bdb1a8fe7c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/tr/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/tr/firefox-75.0b10.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "c28d89bcae7ffc6145a1d8393a7cf4e9e63025f09ec54c42a7d5d7e6a0584f02ab52fbd4346c74e54b116ff461dedf7c533a77f2b2175e34b53f7a2b725023bc";
+      sha512 = "83f75e7f487000c4e5cfb3d8f029edd2f2bc033f42f09ebe317b196d392eef1cd93e7f074dd69a9a84cbd4555e3ed14bad4fd984858e0dce97ab5cc0026c904e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/trs/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/trs/firefox-75.0b10.tar.bz2";
       locale = "trs";
       arch = "linux-i686";
-      sha512 = "eb505f85d35dade14f853bfbf4086f3ce28faed1f497a35f612f30bcf35d49fab6ea32bf2b00e436d12d255ae37dce6ff1fbdb1eb3dd1743064181404bb28774";
+      sha512 = "3e3c428a598bb849f47b69ac073479be40add64e30517a7c0fa9bf2141d84c050773a946bc84bb7126d096269ebc65718e62239e7f8dfed6019d7ed7e6d83ed4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/uk/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/uk/firefox-75.0b10.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "5045d30636c9f3d893ffe5a90e87f22d91718e36e720962e4d6d505106922290bed710ccb9ba50897228836f5df6844de21384143275460ef50aee37ca175ad6";
+      sha512 = "cb17d5d06647d48dcd91f6486e97dbe7346495093ab0d20cf1b6f426eadfe7bff54c761e8876b9a42c058ade70c62320bad77959f8e2f422aa6435248abd4022";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ur/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/ur/firefox-75.0b10.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "78daf235a6cd6301b356a887bb0b8318e9a8f7785ace0c3a398fbd982e4131acd8c43f818addc516f0f14b56d41ae41d51ba07f2848c0630baa057b323a5f268";
+      sha512 = "57c0ac20850f8ce5fad26c7e117371a493946d3c116d3e58d7bf2e65631a30e58f02c6cc4f05692cb0d885a7294d1ebdfc69d8f4061bc4ee51b7129d4504eee4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/uz/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/uz/firefox-75.0b10.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "ed6edd3f1c54e2675c650ff48e5102f54c258cc999506ace655a99f19dccfb9e3140e4c63d6bede4d72b6f84a6eb300ba485d932316b83922288d3ed6ac66e00";
+      sha512 = "95d3ba999a3effcaef67296209bf103f79a46c07e67037e44e69bee4357d13701b7cb4df17b2a53bc326a1ba76c0f2e7d5ee71f0e97952bf254064f6f633eacf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/vi/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/vi/firefox-75.0b10.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "125e68eb19e1f1fbfc8a8ac0809bfeac48ec37da172052921cb0710d8ddbcb031c72139c81c6349a4ef3946eb6d10e49d398e561e2b09c23752182ad979c932b";
+      sha512 = "c38aa1ca1ddf5814661e858421df2e76bbf9005157ecb22f42aca70a1443fc448155865ab54e338b124cb4660246a76cd3d19afb03f83d2a88c66fc2425ac60e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/xh/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/xh/firefox-75.0b10.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "bdd6749ddbe15d1332a749a9f9d954b4f018c91c3975b61af2863509fb97169f2c1afe31bfcfb2b3ee68fb30a5b7cbe6fcb4e94ed751d5a1710c743b3a6bd9de";
+      sha512 = "13d4548ca59c08e3d9b4bdb084527d58b057db45e16fff5b285f891e0f52272e77dc040982db6a6032cb1eb695d9fc452fe96b8fb3437c321667bd6a49dfcef2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/zh-CN/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/zh-CN/firefox-75.0b10.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "2da359cbc166375462ce9f75f60ee802b2b63bfd21afa661d3bdce7ee41a3c76639c81f6700292d352739f8d3988de3a33e27464d7a8d7023e52440865e92c12";
+      sha512 = "78d0579d1a5dfb6a17a3dfefbe0e530d26f1f6e88031559faa5b5aee2fffce8837df407b011982cd9a969cb8d50799dd2aafb7d2da975410efac84e90bf44cde";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/zh-TW/firefox-75.0b2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b10/linux-i686/zh-TW/firefox-75.0b10.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "99869cdc515c28505d025348013d7617a16ab79bc4b024240b893628e1884221fece1bee33013a62f800e2633bc1edbac256e74c411ea10b32b6802eac9e7855";
+      sha512 = "e04810d929a7f5f95c8c5cee1cce6718da34246965c2b55171f08f1ec9cd684cc9b49ccd925b26b386555c2f880d1a3365ae747673d1bee40993f353d767fb62";
     }
     ];
 }

From 1e51592037600f9fe17ab672345d33cbcb92f85a Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Fri, 20 Mar 2020 10:32:57 +0200
Subject: [PATCH 4263/4636] liblinphone: init at unstable-2020-03-20

---
 .../libraries/liblinphone/default.nix         | 150 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 2 files changed, 152 insertions(+)
 create mode 100644 pkgs/development/libraries/liblinphone/default.nix

diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix
new file mode 100644
index 000000000000..c6628e9043cd
--- /dev/null
+++ b/pkgs/development/libraries/liblinphone/default.nix
@@ -0,0 +1,150 @@
+{ bcg729
+, bctoolbox
+, bcunit
+, belcard
+, belle-sip
+, belr
+, bzrtp
+, cairo
+, cmake
+, cyrus_sasl
+, doxygen
+, fetchFromGitLab
+, fetchurl
+, ffmpeg
+, gdk-pixbuf
+, git
+, glib
+, graphviz
+, gtk2
+, intltool
+, libexosip
+, libmatroska
+, libnotify
+, libosip
+, libsoup
+, libupnp
+, libX11
+, libxml2
+, lime
+, makeWrapper
+, mbedtls
+, mediastreamer
+, mediastreamer-openh264
+, openldap
+, ortp
+, pango
+, pkgconfig
+, python
+, readline
+, soci
+, speex
+, sqlite
+, stdenv
+, udev
+, xercesc
+, xsd
+, zlib
+}:
+let
+  # Got the following error when building:
+  #
+  #   Your version of Doxygen (1.8.17) is known to malfunction with some of our
+  #   macro definitions, which causes errors while wrapprers generation. Please
+  #   install an older version of Doxygen (< 1.8.17) or disable documentation
+  #   and wrapper generation.
+  #
+  # So, let's then use 1.8.16 version of doxygen in this derivation. Hopefully
+  # this workaround can be removed with some newer release of liblinphone.
+  doxygen_1_8_16 = doxygen.overrideAttrs (
+    oldAttrs: rec {
+      name = "doxygen-1.8.16";
+      src = fetchurl {
+        urls = [
+          "mirror://sourceforge/doxygen/${name}.src.tar.gz" # faster, with https, etc.
+          "http://doxygen.nl/files/${name}.src.tar.gz"
+        ];
+        sha256 = "10iwv8bcz5b5cd85gg8pgn0bmyg04n9hs36xn7ggjjnvynv1z67z";
+      };
+      buildInputs = oldAttrs.buildInputs ++ [ git ];
+    }
+  );
+in
+stdenv.mkDerivation rec {
+  pname = "liblinphone";
+  # Using master branch for linphone-desktop caused a chain reaction that many
+  # of its dependencies needed to use master branch too.
+  version = "unstable-2020-03-20";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.linphone.org";
+    owner = "public";
+    group = "BC";
+    repo = pname;
+    rev = "1d762a3e0e304aa579798aed4400d2cee2c1ffa0";
+    sha256 = "0ja38payyqbd8z6q5l5w6hi7xarmfj5021gh0qdk0j832br4c6c3";
+  };
+
+  # Do not build static libraries
+  cmakeFlags = [ "-DENABLE_STATIC=NO" ];
+
+  # TODO: Not sure if all these inputs are actually needed. Most of them were
+  # defined when liblinphone and linphone-desktop weren't separated yet, so some
+  # of them might not be needed for liblinphone alone.
+  buildInputs = [
+    (python.withPackages (ps: [ ps.pystache ps.six ]))
+    bcg729
+    bctoolbox
+    belcard
+    belle-sip
+    belr
+    bzrtp
+    cairo
+    cyrus_sasl
+    ffmpeg
+    gdk-pixbuf
+    git
+    glib
+    gtk2
+    libX11
+    libexosip
+    libmatroska
+    libnotify
+    libosip
+    libsoup
+    libupnp
+    libxml2
+    lime
+    mbedtls
+    mediastreamer
+    openldap
+    ortp
+    pango
+    readline
+    soci
+    speex
+    sqlite
+    udev
+    xercesc
+    xsd
+    zlib
+  ];
+
+  nativeBuildInputs = [
+    bcunit
+    cmake
+    doxygen_1_8_16
+    graphviz
+    intltool
+    makeWrapper
+    pkgconfig
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://www.linphone.org/technical-corner/liblinphone";
+    description = "Library for SIP calls and instant messaging";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0bf59b2ec131..28681971e7db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20562,6 +20562,8 @@ in
 
   libdsk = callPackage ../misc/emulators/libdsk { };
 
+  liblinphone = callPackage ../development/libraries/liblinphone { };
+
   links2 = callPackage ../applications/networking/browsers/links2 { };
 
   linphone = callPackage ../applications/networking/instant-messengers/linphone { };

From 8b2abbbcb53e9f0b55c25529f2b179b3c4db025e Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Thu, 19 Mar 2020 14:20:10 +0200
Subject: [PATCH 4264/4636] linphone: 3.12.0 -> unstable-2020-03-06

---
 .../instant-messengers/linphone/default.nix   | 250 +++++++++++++++---
 .../linphone/fix_minizip_linking.patch        |  13 +
 pkgs/top-level/all-packages.nix               |   2 +-
 3 files changed, 228 insertions(+), 37 deletions(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/linphone/fix_minizip_linking.patch

diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix
index b155f3129642..b1927395a570 100644
--- a/pkgs/applications/networking/instant-messengers/linphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix
@@ -1,61 +1,239 @@
-{ stdenv, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp
-, zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, libsoup, udev
-, ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip, bzrtp
-, mediastreamer-openh264, bctoolbox, makeWrapper, fetchFromGitHub, cmake
-, libmatroska, bcunit, doxygen, gdk-pixbuf, glib, cairo, pango, mbedtls
-, python, graphviz, belcard, bcg729
-, withGui ? true
+{ bcg729
+, bctoolbox
+, bcunit
+, belcard
+, belle-sip
+, belr
+, bzrtp
+, cairo
+, cmake
+, cyrus_sasl
+, fetchFromGitLab
+, fetchurl
+, ffmpeg
+, gdk-pixbuf
+, glib
+, gnused
+, graphviz
+, gtk2
+, intltool
+, lib
+, libexosip
+, liblinphone
+, libmatroska
+, libnotify
+, libosip
+, libsoup
+, libupnp
+, libX11
+, libxml2
+, makeWrapper
+, mbedtls
+, mediastreamer
+, mediastreamer-openh264
+, mkDerivation
+, openldap
+, ortp
+, pango
+, pkgconfig
+, python
+, qtbase
+, qtgraphicaleffects
+, qtquickcontrols2
+, qttranslations
+, readline
+, speex
+, sqlite
+, stdenv
+, udev
+, zlib
+  # For Minizip 2.2.7:
+, fetchFromGitHub
+, libbsd
 }:
+let
+  # Linphone Desktop requires Minizip 2.2.7. Nixpkgs contains a very old version
+  # from the time when it was part of zlib. The most recent release of Minizip
+  # is currently 2.9.2 but Linphone Desktop didn't work with that. So, even if
+  # we added most recent Minizip version to nixpkgs, probably Minizip 2.2.7 is
+  # only needed here and we shouldn't add this semi-old version to
+  # all-packages.nix. Therefore, just define it here locally.
+  minizip2 = stdenv.mkDerivation rec {
+    pname = "minizip";
+    version = "2.2.7";
 
-stdenv.mkDerivation rec {
-  pname = "linphone";
-  version = "3.12.0";
+    disabled = stdenv.isAarch32;
 
-  src = fetchFromGitHub {
-    owner = "BelledonneCommunications";
+    src = fetchFromGitHub {
+      owner = "nmoinvaz";
+      repo = pname;
+      rev = version;
+      sha256 = "1a88v1gjlflsd17mlrgxh420rpa38q0d17yh9q8j1zzqfrd1azch";
+    };
+
+    nativeBuildInputs = [ cmake pkgconfig ];
+
+    cmakeFlags = [
+      "-DBUILD_SHARED_LIBS=YES"
+    ];
+
+    buildInputs = [
+      zlib
+      libbsd # required in 2.2.7 but not in 2.9.2?
+    ];
+
+    meta = with stdenv.lib; {
+      description = "Compression library implementing the deflate compression method found in gzip and PKZIP";
+      homepage = "https://github.com/nmoinvaz/minizip";
+      license = licenses.zlib;
+      platforms = platforms.unix;
+    };
+  };
+in
+mkDerivation rec {
+  pname = "linphone-desktop";
+  # Latest release is 4.1.1 old and doesn't build with the latest releases of
+  # some of the dependencies so let's use the latest commit.
+  version = "unstable-2020-03-06";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.linphone.org";
+    owner = "public";
+    group = "BC";
     repo = pname;
-    rev = version;
-    sha256 = "0az2ywrpx11sqfb4s4r2v726avcjf4k15bvrqj7xvhz7hdndmh0j";
+    rev = "971997e162558d37051f89c9c34bbc240135f704";
+    sha256 = "02ji4r8bpcm2kyisn9d3054m026l33g2574i1ag1cmb2dz2p8i1c";
   };
 
-  cmakeFlags = stdenv.lib.optional withGui [ "-DENABLE_GTK_UI=ON" ];
+  # Without this patch, the build fails with:
+  #
+  #   No rule to make target
+  #   'minizip_OUTPUT/nix/store/...linphone-desktop.../lib/libminizip.so',
+  #
+  # So, the makefile tries to use a full absolute path to the library but does
+  # it incorrectly. As we have installed Minizip properly, it's sufficient to
+  # just use "minizip" and the library is found automatically. If this patched
+  # target_link_libraries line was removed entirely, the build would fail at the
+  # very end when linking minizip.
+  patches = [
+    ./fix_minizip_linking.patch
+  ];
 
+  # See: https://gitlab.linphone.org/BC/public/linphone-desktop/issues/21
   postPatch = ''
-    touch coreapi/liblinphone_gitversion.h
+    substituteInPlace src/app/AppController.cpp \
+      --replace "LINPHONE_QT_GIT_VERSION" "\"${version}\""
   '';
 
+  # TODO: After linphone-desktop and liblinphone split into separate packages,
+  # there might be some build inputs here that aren't needed for
+  # linphone-desktop.
   buildInputs = [
-    readline openldap cyrus_sasl libupnp zlib libxml2 gtk2 libnotify speex ffmpeg libX11
-    mbedtls libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip
-    bctoolbox libmatroska gdk-pixbuf glib cairo pango bzrtp belcard bcg729
+    bcg729
+    bctoolbox
+    belcard
+    belle-sip
+    belr
+    bzrtp
+    cairo
+    cyrus_sasl
+    ffmpeg
+    gdk-pixbuf
+    glib
+    gtk2
+    libX11
+    libexosip
+    liblinphone
+    libmatroska
+    libnotify
+    libosip
+    libsoup
+    libupnp
+    libxml2
+    mbedtls
+    mediastreamer
+    mediastreamer-openh264
+    minizip2
+    openldap
+    ortp
+    pango
+    qtbase
+    qtgraphicaleffects
+    qtquickcontrols2
+    qttranslations
+    readline
+    speex
+    sqlite
+    udev
+    zlib
   ];
 
   nativeBuildInputs = [
-    intltool pkgconfig makeWrapper cmake bcunit doxygen graphviz
-    (python.withPackages (ps: [ ps.pystache ps.six ]))
+    bcunit
+    cmake
+    gnused
+    graphviz
+    intltool
+    makeWrapper
+    pkgconfig
   ];
 
-  NIX_CFLAGS_COMPILE = [
-    "-Wno-error"
-    "-I${glib.dev}/include/glib-2.0"
-    "-I${glib.out}/lib/glib-2.0/include"
-    "-I${gtk2.dev}/include/gtk-2.0/"
-    "-I${cairo.dev}/include/cairo"
-    "-I${pango.dev}/include/pango-1.0"
-    "-I${gtk2}/lib/gtk-2.0/include"
-    "-DLIBLINPHONE_GIT_VERSION=\"v${version}\""
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
+    "-DMINIZIP_INCLUDE_DIRS=${minizip2}/include"
+    "-DMINIZIP_LIBRARIES=minizip"
   ];
 
-  postInstall = ''
-    for i in $(cd $out/bin && ls); do
-      wrapProgram $out/bin/$i --set MEDIASTREAMER_PLUGINS_DIR ${mediastreamer-openh264}/lib/mediastreamer/plugins
-    done
+  # The default install phase fails because the paths are somehow messed up in
+  # the makefiles. The errors were like:
+  #
+  #   CMake Error at cmake_builder/linphone_package/cmake_install.cmake:49 (file):
+  #     file INSTALL cannot find
+  #     "/build/linphone-desktop-.../build/linphone-sdk/desktop//nix/store/.../bin":
+  #     No such file or directory.
+  #
+  # If someone is able to figure out how to fix that, great. For now, just
+  # trying to pick all the relevant files to the output.
+  #
+  # Also, the exec path in linphone.desktop file remains invalid, pointing to
+  # the build directory, after the whole nix build process. So, let's use sed to
+  # manually fix that path.
+  #
+  # In order to find mediastreamer plugins, mediastreamer package was patched to
+  # support an environment variable pointing to the plugin directory. Set that
+  # environment variable by wrapping the Linphone executable.
+  #
+  # Also, some grammar files needed to be copied too from some dependencies. I
+  # suppose if one define a dependency in such a way that its share directory is
+  # found, then this copying would be unnecessary. These missing grammar files
+  # were discovered when linphone crashed at startup and it was run with
+  # --verbose flag. Instead of actually copying these files, create symlinks.
+  #
+  # It is quite likely that there are some other files still missing and
+  # Linphone will randomly crash when it tries to access those files. Then,
+  # those just need to be copied manually below.
+  installPhase = ''
+    mkdir -p $out/bin
+    cp linphone $out/bin/
+    wrapProgram $out/bin/linphone \
+      --set MEDIASTREAMER_PLUGINS_DIR \
+            ${mediastreamer-openh264}/lib/mediastreamer/plugins
+    mkdir -p $out/share/applications
+    sed -i "s@/build/.*/OUTPUT/bin@$out/bin@" linphone.desktop
+    cp linphone.desktop $out/share/applications/
+    cp -r ../assets/icons $out/share/
+    mkdir -p $out/share/belr/grammars
+    ln -s ${belcard}/share/belr/grammars/* $out/share/belr/grammars/
+    ln -s ${liblinphone}/share/belr/grammars/* $out/share/belr/grammars/
+    mkdir -p $out/share/linphone
+    ln -s ${liblinphone}/share/linphone/* $out/share/linphone/
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://www.linphone.org/;
     description = "Open source SIP phone for voice/video calls and instant messaging";
-    license = licenses.gpl2Plus;
+    license = licenses.gpl3;
     platforms = platforms.linux;
+    maintainers = with maintainers; [ jluttine ];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/linphone/fix_minizip_linking.patch b/pkgs/applications/networking/instant-messengers/linphone/fix_minizip_linking.patch
new file mode 100644
index 000000000000..bb88d0030fae
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/linphone/fix_minizip_linking.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3ee77441..18ea5c27 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -517,7 +517,7 @@ else()
+             target_link_libraries(${TARGET_NAME} "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/libminizip.dylib")
+             execute_process(COMMAND install_name_tool -id "@executable_path/../Frameworks/libminizip.dylib" "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/libminizip.dylib")
+         elseif(NOT WIN32)
+-            target_link_libraries(${TARGET_NAME} "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/libminizip.so")
++            target_link_libraries(${TARGET_NAME} "minizip")
+         endif()
+     endif()#If (LinphoneCxx_FOUND AND Minizip_FOUND)
+ endif()#If (LinphoneCxx_FOUND)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28681971e7db..6c11b088f584 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20566,7 +20566,7 @@ in
 
   links2 = callPackage ../applications/networking/browsers/links2 { };
 
-  linphone = callPackage ../applications/networking/instant-messengers/linphone { };
+  linphone = libsForQt5.callPackage ../applications/networking/instant-messengers/linphone { };
 
   linuxsampler = callPackage ../applications/audio/linuxsampler { };
 

From 70e538893cea901ed40045fd31a7033f75ffdb4d Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Fri, 27 Mar 2020 10:31:14 +0200
Subject: [PATCH 4265/4636] mediastreamer-openh264: 1.2.1 ->
 unstable-2020-03-03

---
 .../libraries/mediastreamer/msopenh264.nix    | 48 +++++++++++++------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix
index f1e9fc301510..45b3c83bfe24 100644
--- a/pkgs/development/libraries/mediastreamer/msopenh264.nix
+++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix
@@ -1,31 +1,49 @@
-{ stdenv, autoreconfHook, pkgconfig, mediastreamer, openh264
-, fetchurl, fetchpatch, cmake
+{ autoreconfHook
+, cmake
+, fetchFromGitLab
+, fetchpatch
+, mediastreamer
+, openh264
+, pkgconfig
+, stdenv
 }:
 
 stdenv.mkDerivation rec {
-  pname = "mediastreamer-openh264";
-  version = "1.2.1";
+  pname = "msopenh264";
+  # Using master branch for linphone-desktop caused a chain reaction that many
+  # of its dependencies needed to use master branch too.
+  version = "unstable-2020-03-03";
 
-  src = fetchurl {
-    url = "https://www.linphone.org/releases/sources/plugins/msopenh264/msopenh264-${version}.tar.gz";
-    sha256 = "0rdxgazm52560g52pp6mp3mwx6j1z3h2zyizzfycp8y8zi92fqm8";
+  src = fetchFromGitLab {
+    domain = "gitlab.linphone.org";
+    owner = "public";
+    group = "BC";
+    repo = pname;
+    rev = "2c3abf52824ad23a4caae7565ef158ef91767704";
+    sha256 = "140hs5lzpshzswvl39klcypankq3v2qck41696j22my7s4wsa0hr";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "msopenh264-build-with-openh264-v2.patch";
-      url = "https://git.pld-linux.org/?p=packages/mediastreamer-plugin-msopenh264.git;a=blob_plain;f=mediastreamer-plugin-msopenh264-openh264.patch;hb=344b8af379701a7e58b4ffb3cbac1517eff079fd";
-      sha256 = "10c24b0afchx78q28176pd8iz7i1nlf57f6v6lyqxpz60fm5nrcc";
-    })
-  ];
-
   nativeBuildInputs = [ autoreconfHook cmake pkgconfig ];
   buildInputs = [ mediastreamer openh264 ];
 
+  # Do not build static libraries
+  cmakeFlags = [
+    "-DENABLE_STATIC=NO"
+    "-DCMAKE_SKIP_INSTALL_RPATH=ON"
+  ];
+
+  # CMAKE_INSTALL_PREFIX has no effect so let's install manually. See:
+  # https://gitlab.linphone.org/BC/public/msopenh264/issues/1
+  installPhase = ''
+    mkdir -p $out/lib/mediastreamer/plugins
+    cp src/libmsopenh264.so $out/lib/mediastreamer/plugins/
+  '';
+
   meta = with stdenv.lib; {
     description = "H.264 encoder/decoder plugin for mediastreamer2";
     homepage = "https://www.linphone.org/technical-corner/mediastreamer2";
     license = licenses.gpl2;
     platforms = platforms.linux;
+    maintainers = with maintainers; [ jluttine ];
   };
 }

From 86a012b9609b8c3b4035697b61a8ca4a1d16b01a Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Fri, 27 Mar 2020 10:33:05 +0200
Subject: [PATCH 4266/4636] trx: 0.4 -> 0.5

---
 pkgs/tools/audio/trx/add_bctoolbox_ldlib.patch | 15 +++++++++++++++
 pkgs/tools/audio/trx/default.nix               | 10 ++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/audio/trx/add_bctoolbox_ldlib.patch

diff --git a/pkgs/tools/audio/trx/add_bctoolbox_ldlib.patch b/pkgs/tools/audio/trx/add_bctoolbox_ldlib.patch
new file mode 100644
index 000000000000..1854a43a2493
--- /dev/null
+++ b/pkgs/tools/audio/trx/add_bctoolbox_ldlib.patch
@@ -0,0 +1,15 @@
+diff --git a/Makefile b/Makefile
+index ffcd883..c4b4ff7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -12,8 +12,9 @@ CFLAGS += -MMD -Wall
+ LDLIBS_ASOUND ?= -lasound
+ LDLIBS_OPUS ?= -lopus
+ LDLIBS_ORTP ?= -lortp
++LDLIBS_BCTOOLBOX ?= -lbctoolbox
+ 
+-LDLIBS += $(LDLIBS_ASOUND) $(LDLIBS_OPUS) $(LDLIBS_ORTP)
++LDLIBS += $(LDLIBS_ASOUND) $(LDLIBS_OPUS) $(LDLIBS_ORTP) $(LDLIBS_BCTOOLBOX)
+ 
+ .PHONY:		all install dist clean
+ 
diff --git a/pkgs/tools/audio/trx/default.nix b/pkgs/tools/audio/trx/default.nix
index 1d052adbba9f..224c331b9610 100644
--- a/pkgs/tools/audio/trx/default.nix
+++ b/pkgs/tools/audio/trx/default.nix
@@ -2,13 +2,19 @@
 
 stdenv.mkDerivation rec {
   pname = "trx";
-  version = "0.4";
+  version = "0.5";
 
   src = fetchurl {
     url = "https://www.pogo.org.uk/~mark/trx/releases/${pname}-${version}.tar.gz";
-    sha256 = "1wsrkbqc090px8i9p8awz38znxjcqjb1dzjjdd8xkjmiprayjhkl";
+    sha256 = "1jjgca92nifjhcr3n0fmpfr6f5gxlqyal2wmgdlgd7hx834r1if7";
   };
 
+  # Makefile is currently missing -lbctoolbox so the build fails when linking
+  # the libraries. This patch adds that flag.
+  patches = [
+    ./add_bctoolbox_ldlib.patch
+  ];
+
   buildInputs = [ alsaLib libopus ortp bctoolbox ];
   makeFlags = [ "PREFIX=$(out)" ];
 

From b3e6d205b8c9d69b3f81247deead42597b166158 Mon Sep 17 00:00:00 2001
From: Katharina Fey <kookie@spacekookie.de>
Date: Sat, 28 Mar 2020 12:40:30 +0100
Subject: [PATCH 4267/4636] msmtp: adding texinfo to buildInputs (#83497)

---
 pkgs/applications/networking/msmtp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index 486b34ecb308..58190944b640 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig
+{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, texinfo
 , netcat-gnu, gnutls, gsasl, libidn2, Security
 , withKeyring ? true, libsecret ? null
 , systemd ? null }:
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
     ++ stdenv.lib.optional stdenv.isDarwin Security
     ++ stdenv.lib.optional withKeyring libsecret;
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig texinfo ];
 
   configureFlags =
     [ "--sysconfdir=/etc" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ];

From d13c14b5e369dde15c1f2de1f5eb1e67c5e4ed8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Mar 2020 10:47:13 +0000
Subject: [PATCH 4268/4636] gitAndTools.grv: 0.3.1 -> 0.3.2

---
 .../version-management/git-and-tools/grv/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix
index e6b746233fe1..8ccee2d720a2 100644
--- a/pkgs/applications/version-management/git-and-tools/grv/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2, ncurses, pkgconfig, readline }:
 let
-  version = "0.3.1";
+  version = "0.3.2";
 in
 buildGoPackage {
   pname = "grv";
@@ -15,7 +15,7 @@ buildGoPackage {
     owner = "rgburke";
     repo = "grv";
     rev = "v${version}";
-    sha256 = "16ylapsibqrqwx45l4ypr3av07rd1haf10v838mjqsakf8l1xc0b";
+    sha256 = "0bpjsk35rlp56z8149z890adnhmxyh743vsls3q86j4682b83kyf";
     fetchSubmodules = true;
   };
 

From 4f44435071d584c423033e68e9b67fc818b66b50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Mar 2020 13:44:15 +0000
Subject: [PATCH 4269/4636] deepin.dde-api: fix strict build

---
 pkgs/desktops/deepin/dde-api/default.nix | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix
index c4082ce454ce..3c0718570d04 100644
--- a/pkgs/desktops/deepin/dde-api/default.nix
+++ b/pkgs/desktops/deepin/dde-api/default.nix
@@ -43,28 +43,31 @@ buildGoPackage rec {
     pkgconfig
     deepin-gettext-tools # build
     dbus-factory         # build
-    go-dbus-factory      # needed
-    go-gir-generator     # needed
-    go-lib               # build
     deepin.setupHook
-  ];
 
-  buildInputs = [
-    alsaLib     # needed
+    # TODO: using $PATH to find run time executable does not work with cross compiling
     bc          # run (to adjust grub theme?)
     blur-effect # run (is it really needed?)
     coreutils   # run (is it really needed?)
     fontconfig  # run (is it really needed?)
-    #glib        # ? arch
+    rfkill      # run
+    xcur2png    # run
     grub2       # run (is it really needed?)
+  ];
+
+  buildInputs = [
+    go-dbus-factory      # needed
+    go-gir-generator     # needed
+    go-lib               # build
+
+    alsaLib     # needed
+    #glib        # ? arch
     gtk3        # build run
     libcanberra # build run
     libgudev    # needed
     librsvg     # build run
     poppler     # build run
     pulseaudio  # needed
-    rfkill      # run
-    xcur2png    # run
     #locales     # run (locale-helper needs locale-gen, which is unavailable on NixOS?)
   ];
 

From f031352ae3d0b42e0c5530984ac5339515eb585f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 18 Mar 2020 15:17:06 +0000
Subject: [PATCH 4270/4636] deepin.dde-daemon: fix strict deps build

---
 pkgs/desktops/deepin/dde-daemon/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix
index b5460029f78f..6e5435315e31 100644
--- a/pkgs/desktops/deepin/dde-daemon/default.nix
+++ b/pkgs/desktops/deepin/dde-daemon/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkgconfig,
   dbus-factory, go-dbus-factory, go-gir-generator, go-lib,
-  deepin-gettext-tools, dde-api, deepin-desktop-schemas,
+  deepin-gettext-tools, gettext, dde-api, deepin-desktop-schemas,
   deepin-wallpapers, deepin-desktop-base, alsaLib, glib, gtk3,
   libgudev, libinput, libnl, librsvg, linux-pam, networkmanager,
   pulseaudio, python3, hicolor-icon-theme, glibc, tzdata, go,
@@ -34,11 +34,8 @@ buildGoPackage rec {
   nativeBuildInputs = [
     pkgconfig
     dbus-factory
-    go-dbus-factory
-    go-gir-generator
-    go-lib
     deepin-gettext-tools
-    linux-pam
+    gettext
     networkmanager
     networkmanager.dev
     python3
@@ -48,6 +45,11 @@ buildGoPackage rec {
   ];
 
   buildInputs = [
+    go-dbus-factory
+    go-gir-generator
+    go-lib
+    linux-pam
+
     alsaLib
     dde-api
     deepin-desktop-base

From 716bb29c3d22d61d6f9f5ea33ef333ea514bc515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 19 Mar 2020 10:20:00 +0000
Subject: [PATCH 4271/4636] deepin.startdde: fix strict deps build

---
 pkgs/desktops/deepin/startdde/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/deepin/startdde/default.nix b/pkgs/desktops/deepin/startdde/default.nix
index 137b3f690a67..920008826169 100644
--- a/pkgs/desktops/deepin/startdde/default.nix
+++ b/pkgs/desktops/deepin/startdde/default.nix
@@ -27,16 +27,16 @@ buildGoPackage rec {
   nativeBuildInputs = [
     pkgconfig
     dbus-factory
-    dde-api
-    go-dbus-factory
-    go-gir-generator
-    go-lib
     jq
     wrapGAppsHook
     deepin.setupHook
   ];
 
   buildInputs = [
+    dde-api
+    go-dbus-factory
+    go-gir-generator
+    go-lib
     alsaLib
     dde-daemon
     dde-dock

From f909e502877b91cdb25ea147fa700cb4d732ed9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 28 Mar 2020 07:28:52 +0000
Subject: [PATCH 4272/4636] gitAndTools.grv: fix build by using vendored libgit

---
 .../git-and-tools/grv/default.nix             | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix
index 8ccee2d720a2..c1839b591a7e 100644
--- a/pkgs/applications/version-management/git-and-tools/grv/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2, ncurses, pkgconfig, readline }:
+{ stdenv, buildGoPackage, fetchFromGitHub, curl, ncurses, pkgconfig, readline
+, cmake }:
 let
   version = "0.3.2";
 in
@@ -6,8 +7,8 @@ buildGoPackage {
   pname = "grv";
   inherit version;
 
-  buildInputs = [ ncurses readline curl libgit2 ];
-  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ ncurses readline curl ];
+  nativeBuildInputs = [ pkgconfig cmake ];
 
   goPackagePath = "github.com/rgburke/grv";
 
@@ -23,7 +24,21 @@ buildGoPackage {
     rm util/update_latest_release.go
   '';
 
-  buildFlagsArray = [ "-ldflags=" "-X main.version=${version}" ];
+  postConfigure = ''
+    cd $NIX_BUILD_TOP/go/src/$goPackagePath
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+    make build-only
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    install -D grv $bin/bin/grv
+    runHook postInstall
+  '';
 
   meta = with stdenv.lib; {
     description = "GRV is a terminal interface for viewing Git repositories";

From 2f7fb1c49732105c8937b66b7d92402c04546073 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sat, 28 Mar 2020 12:00:00 +0000
Subject: [PATCH 4273/4636] buildRustCrateTests: add regression test for link
 order

---
 .../rust/build-rust-crate/test/default.nix    | 54 ++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix
index f24583c41fcb..2251a1b40f2e 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildRustCrate, runCommand, writeTextFile, symlinkJoin, callPackage, releaseTools }:
+{ lib, buildRustCrate, runCommand, runCommandCC, writeTextFile, symlinkJoin, callPackage, releaseTools }:
 let
   mkCrate = args: let
     p = {
@@ -258,6 +258,58 @@ let
           ];
         };
       };
+      # Regression test for https://github.com/NixOS/nixpkgs/pull/83379
+      # link flag order should be preserved
+      linkOrder = {
+        src = symlinkJoin {
+          name = "buildrs-out-dir-overlay";
+          paths = [
+            (mkFile "build.rs" ''
+              fn main() {
+                // in the other order, linkage will fail
+                println!("cargo:rustc-link-lib=b");
+                println!("cargo:rustc-link-lib=a");
+              }
+            '')
+            (mkFile "src/main.rs" ''
+              extern "C" {
+                fn hello_world();
+              }
+              fn main() {
+                unsafe {
+                  hello_world();
+                }
+              }
+            '')
+          ];
+        };
+        buildInputs = let
+          compile = name: text: runCommandCC name {} ''
+            mkdir -p $out/lib
+            $CC -shared -o $out/lib/${name}.so ${writeTextFile {
+              name = "${name}-src.c";
+              inherit text;
+            }}
+          '';
+          b = compile "libb" ''
+            #include <stdio.h>
+
+            void hello();
+
+            void hello_world() {
+              hello();
+              printf(" world!\n");
+            }
+          '';
+          a = compile "liba" ''
+            #include <stdio.h>
+
+            void hello() {
+              printf("hello");
+            }
+          '';
+        in [ a b ];
+      };
       rustCargoTomlInSubDir = {
         # The "workspace_member" can be set to the sub directory with the crate to build.
         # By default ".", meaning the top level directory is assumed.

From 1c8b75a027ee2df319b5aaaa9c4c1f7032423427 Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Sat, 28 Mar 2020 00:29:14 +0100
Subject: [PATCH 4274/4636] gscan2pdf: 2.6.3 -> 2.6.5

---
 pkgs/applications/graphics/gscan2pdf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix
index 76bb0bc13175..d8f91638b91d 100644
--- a/pkgs/applications/graphics/gscan2pdf/default.nix
+++ b/pkgs/applications/graphics/gscan2pdf/default.nix
@@ -10,11 +10,11 @@ with stdenv.lib;
 
 perlPackages.buildPerlPackage rec {
   pname = "gscan2pdf";
-  version = "2.6.3";
+  version = "2.6.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz";
-    sha256 = "1chmk51xwylnjrgc6hw23x7g7cpwzgwmjc49fcah7pkd3dk1cvvr";
+    sha256 = "0x8931i5zs4zl3iqjhlp7h8y6ssklxiqsddz5kh84nl3p0izbg0y";
   };
 
   nativeBuildInputs = [ wrapGAppsHook ];

From 06313ad0c459da04e6b383865ee2f153c7fef249 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 28 Mar 2020 12:59:56 +0000
Subject: [PATCH 4275/4636] zita-ajbridge: init at 0.8.2

---
 .../audio/zita-ajbridge/default.nix           | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/audio/zita-ajbridge/default.nix

diff --git a/pkgs/applications/audio/zita-ajbridge/default.nix b/pkgs/applications/audio/zita-ajbridge/default.nix
new file mode 100644
index 000000000000..6904952afea6
--- /dev/null
+++ b/pkgs/applications/audio/zita-ajbridge/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, alsaLib, libjack2, zita-alsa-pcmi, zita-resampler }:
+
+stdenv.mkDerivation rec {
+  name = "zita-ajbridge-0.8.2";
+
+  src = fetchurl {
+    url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    sha256 = "1gvk6g6w9rsiib89l0i9myl2cxxfzmcpbg9wdypq6b27l9s5k64j";
+  };
+
+  buildInputs = [ alsaLib libjack2 zita-alsa-pcmi zita-resampler ];
+
+  preConfigure = ''
+    cd ./source/
+  '';
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "MANDIR=$(out)/share/man/man1"
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Connect additional ALSA devices to JACK";
+    homepage = http://kokkinizita.linuxaudio.org/linuxaudio/index.html;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ orivej ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43786337ed5f..8228f637ef8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22930,6 +22930,8 @@ in
 
   zim = callPackage ../applications/office/zim { };
 
+  zita-ajbridge = callPackage ../applications/audio/zita-ajbridge { };
+
   zita-at1 = callPackage ../applications/audio/zita-at1 { };
 
   zita-njbridge = callPackage ../applications/audio/zita-njbridge { };

From 49eec08cc8ac3213f0ce0a05a4f0bf9bbe9385f0 Mon Sep 17 00:00:00 2001
From: Benjamin Asbach <asbachb@users.noreply.github.com>
Date: Sat, 28 Mar 2020 14:00:11 +0100
Subject: [PATCH 4276/4636] netbeans: 11.2 -> 11.3

---
 pkgs/applications/editors/netbeans/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix
index 0fddddbaacf5..eced6780c2f2 100644
--- a/pkgs/applications/editors/netbeans/default.nix
+++ b/pkgs/applications/editors/netbeans/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  version = "11.2";
+  version = "11.3";
   desktopItem = makeDesktopItem {
     name = "netbeans";
     exec = "netbeans";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   inherit version;
   src = fetchurl {
     url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip";
-    sha512 = "d589481808832c4f0391ee1ecb8e18202cebeee8bd844cb4bdbf6125113b41f9138a34c4c2ef1fdf228294ef8c24b242ffec9ba5fdc4f1d288db4a3f19ba1509";
+    sha512 = "ae828836138b5a4156d58df24dd4053be58018cb6b5beb179cb0f4cd8b5db72d2a7356a434d01157aacb78d228732950cf4e3a0b6c725da8e053b6ccd91075d6";
   };
 
   buildCommand = ''

From f77a42d32e06c0500839d308844c1a65e2c768c3 Mon Sep 17 00:00:00 2001
From: Benjamin Asbach <asbachb@users.noreply.github.com>
Date: Sat, 28 Mar 2020 14:00:43 +0100
Subject: [PATCH 4277/4636] netbeans: added myself to maintainers list

---
 maintainers/maintainer-list.nix                | 8 ++++++--
 pkgs/applications/editors/netbeans/default.nix | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b59199bc767c..56a19fabad2d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -645,6 +645,12 @@
     githubId = 10285250;
     name = "Artur E. Ruuge";
   };
+  asbachb = {
+    email = "asbachb-nixpkgs-5c2a@impl.it";
+    github = "asbachb";
+    githubId = 1482768;
+    name = "Benjamin Asbach";
+  };
   ashalkhakov = {
     email = "artyom.shalkhakov@gmail.com";
     github = "ashalkhakov";
@@ -8328,5 +8334,3 @@
     name = "Xavier Zwirtz";
   };
 }
-
-
diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix
index eced6780c2f2..b2a13e3db7cd 100644
--- a/pkgs/applications/editors/netbeans/default.nix
+++ b/pkgs/applications/editors/netbeans/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation {
     description = "An integrated development environment for Java, C, C++ and PHP";
     homepage = "https://netbeans.apache.org/";
     license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [ sander rszibele ];
+    maintainers = with stdenv.lib.maintainers; [ sander rszibele asbachb ];
     platforms = stdenv.lib.platforms.unix;
   };
 }

From a80ed9f72aad965556dea2e92ce1fd35def514a0 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 28 Mar 2020 09:54:59 -0400
Subject: [PATCH 4278/4636] aliases.nix: add aliases for removed torch packages

We've removed the abandoned and broken torch project as part of https://github.com/NixOS/nixpkgs/issues/71888

This commit adds aliases for:

- https://github.com/NixOS/nixpkgs/pull/81173
- https://github.com/NixOS/nixpkgs/pull/83568
---
 pkgs/top-level/aliases.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5ce684f5b320..c81a51ae4dad 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -113,6 +113,7 @@ mapAliases ({
   etcdctl = etcd; # added 2018-04-25
   exfat-utils = exfat;                  # 2015-09-11
   facette = throw "facette has been removed."; # added 2020-01-06
+  fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # added 2020-03-28
   fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H.";
   ffadoFull = ffado; # added 2018-05-01
   firefox-esr-wrapper = firefox-esr;  # 2016-01
@@ -246,6 +247,7 @@ mapAliases ({
   links = links2; # added 2016-01-31
   linux_rpi0 = linux_rpi1;
   linuxPackages_rpi0 = linuxPackages_rpi1;
+  loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # added 2020-03-28
   lttngTools = lttng-tools;  # added 2014-07-31
   lttngUst = lttng-ust;  # added 2014-07-31
   lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02
@@ -292,10 +294,11 @@ mapAliases ({
   networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25
   networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25
   networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25
-  nix-review = nixpkgs-review; # added 2019-12-22
+  neutral-style = throw "neural-style has been removed, as the upstream project has been abandoned"; # added 2020-03-28
   nfsUtils = nfs-utils;  # added 2014-12-06
   nginxUnstable = nginxMainline; # added 2018-04-25
   nilfs_utils = nilfs-utils; # added 2018-04-25
+  nix-review = nixpkgs-review; # added 2019-12-22
   nmap_graphical = nmap-graphical;  # added 2017-01-19
   nologin = shadow; # added 2018-04-25
   nxproxy = nx-libs; # added 2019-02-15
@@ -495,10 +498,14 @@ mapAliases ({
   tftp_hpa = tftp-hpa; # added 2015-04-03
   tomcat85 = tomcat8; # added 2020-03-11
   torbrowser = tor-browser-bundle-bin; # added 2017-04-05
-  transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned.";
+  torch = throw "torch has been removed, as the upstream project has been abandoned"; # added 2020-03-28
+  torch-hdf5 = throw "torch-hdf5 has been removed, as the upstream project has been abandoned"; # added 2020-03-28
+  torch-repl = throw "torch-repl has been removed, as the upstream project has been abandoned"; # added 2020-03-28
+  torchPackages = throw "torchPackages has been removed, as the upstream project has been abandoned"; # added 2020-03-28
   trang = jing-trang; # added 2018-04-25
   transmission_gtk = transmission-gtk; # added 2018-01-06
   transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06
+  transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned.";
   truecrypt = veracrypt; # added 2018-10-24
   tshark = wireshark-cli; # added 2018-04-25
   ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21

From fb47c6fbacedf2ceb3882656127157606b7bbbdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 28 Mar 2020 10:51:12 -0300
Subject: [PATCH 4279/4636] nixos.display-managers: use new attribute for
 desktop names

---
 nixos/modules/services/x11/display-managers/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 5d49ca943872..428ca191fd8f 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -412,6 +412,9 @@ in
             (dm: wm: let
               sessionName = "${dm.name}${optionalString (wm.name != "none") ("+" + wm.name)}";
               script = xsession dm wm;
+              desktopNames = if dm ? desktopNames
+                             then concatStringsSep ";" dm.desktopNames
+                             else sessionName;
             in
               optional (dm.name != "none" || wm.name != "none")
                 (pkgs.writeTextFile {
@@ -427,7 +430,7 @@ in
                     TryExec=${script}
                     Exec=${script}
                     Name=${sessionName}
-                    DesktopNames=${sessionName}
+                    DesktopNames=${desktopNames}
                   '';
                 } // {
                   providedSessions = [ sessionName ];

From e9d707cf8e74539af1bd24e554addc96517315c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 28 Mar 2020 10:52:59 -0300
Subject: [PATCH 4280/4636] nixos.xfce: set desktopNames

---
 nixos/modules/services/x11/desktop-managers/xfce.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index a08b1947f65b..4ff7b05ae9a6 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -129,6 +129,7 @@ in
 
     services.xserver.desktopManager.session = [{
       name = "xfce";
+      desktopNames = [ "XFCE" ];
       bgSupport = true;
       start = ''
         ${pkgs.runtimeShell} ${pkgs.xfce.xfce4-session.xinitrc} &

From ce1695ace7787af537189384acd025cf160e2832 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 28 Mar 2020 14:38:41 +0000
Subject: [PATCH 4281/4636] midicsv: init at 1.1

---
 pkgs/tools/audio/midicsv/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/tools/audio/midicsv/default.nix

diff --git a/pkgs/tools/audio/midicsv/default.nix b/pkgs/tools/audio/midicsv/default.nix
new file mode 100644
index 000000000000..10f78807a73e
--- /dev/null
+++ b/pkgs/tools/audio/midicsv/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "midicsv-1.1";
+
+  src = fetchurl {
+    url = "http://www.fourmilab.ch/webtools/midicsv/${name}.tar.gz";
+    sha256 = "1vvhk2nf9ilfw0wchmxy8l13hbw9cnpz079nsx5srsy4nnd78nkw";
+  };
+
+  postPatch = ''
+    substituteInPlace Makefile --replace /usr/local $out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Losslessly translate MIDI to CSV and back";
+    homepage = http://www.fourmilab.ch/webtools/midicsv/;
+    license = licenses.publicDomain;
+    maintainers = with maintainers; [ orivej ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 32571ec83361..6fc8fb0ada52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2001,6 +2001,8 @@ in
 
   metabase = callPackage ../servers/metabase { };
 
+  midicsv = callPackage ../tools/audio/midicsv { };
+
   mididings = callPackage ../tools/audio/mididings { };
 
   miniserve = callPackage ../tools/misc/miniserve { };

From 97f09ff09fcc0964d9a4c2b037c9340c8836ed74 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Fri, 27 Mar 2020 21:52:48 -0400
Subject: [PATCH 4282/4636] pythonPackages.ntlm-auth: 1.0.3 -> 1.4.0 to fix
 build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On master and 20.03, this is failing to build on `python 3.8`.

https://hydra.nixos.org/build/115517329
https://hydra.nixos.org/build/114714922

CC @NixOS/nixos-release-managers
ZHF: #80379

Co-Authored-By: Niklas Hambüchen <mail@nh2.me>
---
 pkgs/development/python-modules/ntlm-auth/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/ntlm-auth/default.nix b/pkgs/development/python-modules/ntlm-auth/default.nix
index e4bbe0fb4302..14900d5c55db 100644
--- a/pkgs/development/python-modules/ntlm-auth/default.nix
+++ b/pkgs/development/python-modules/ntlm-auth/default.nix
@@ -3,22 +3,23 @@
 , fetchFromGitHub
 , mock
 , pytest
+, requests
 , unittest2
 , six
 }:
 
 buildPythonPackage rec {
   pname = "ntlm-auth";
-  version = "1.0.3";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "jborean93";
     repo = "ntlm-auth";
     rev = "v${version}";
-    sha256 = "09f2g4ivfi9lh1kr30hlg0q4n2imnvmd79w83gza11q9nmhhiwpz";
+    sha256 = "168k3ygwbvnfcwn7q1nv3vvy6b9jc4cnpix0xgg5j8av7v1x0grn";
   };
 
-  checkInputs = [ mock pytest unittest2 ];
+  checkInputs = [ mock pytest requests unittest2 ];
   propagatedBuildInputs = [ six ];
 
   # Functional tests require networking
@@ -28,8 +29,8 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Calculates NTLM Authentication codes";
-    homepage = https://github.com/jborean93/ntlm-auth;
-    license = licenses.lgpl3;
+    homepage = "https://github.com/jborean93/ntlm-auth";
+    license = licenses.mit;
     maintainers = with maintainers; [ elasticdog ];
     platforms = platforms.all;
   };

From f5762218329520473ced60ef1b6f1f2cc778f2b1 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sat, 28 Mar 2020 14:17:08 +0200
Subject: [PATCH 4283/4636] electron-cash: 4.0.11 -> 4.0.14

---
 pkgs/applications/misc/electron-cash/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index 5b1cafaea32e..f8405f446ad1 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -1,14 +1,14 @@
-{ lib, fetchFromGitHub, python3Packages, qtbase, wrapQtAppsHook }:
+{ lib, fetchFromGitHub, python3Packages, qtbase, wrapQtAppsHook, secp256k1 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "electron-cash";
-  version = "4.0.11";
+  version = "4.0.14";
 
   src = fetchFromGitHub {
     owner = "Electron-Cash";
     repo = "Electron-Cash";
     rev = version;
-    sha256 = "1k4zbaj0g8bgk1l5vrb835a8bqfay2707bcb4ql2vx4igcwpb680";
+    sha256 = "1dp7cj1185h6xfz6jzh0iq58zvg3wq9hl96bkgxkf5h4ygni2vm6";
   };
 
   propagatedBuildInputs = with python3Packages; [
@@ -25,6 +25,7 @@ python3Packages.buildPythonApplication rec {
     requests
     tlslite-ng
     qdarkstyle
+    stem
 
     # plugins
     keepkey
@@ -56,8 +57,14 @@ python3Packages.buildPythonApplication rec {
       --replace "Exec=electron-cash" "Exec=$out/bin/electron-cash"
   '';
 
+  # If secp256k1 wasn't added to the library path, the following warning is given:
+  #
+  #   Electron Cash was unable to find the secp256k1 library on this system.
+  #   Elliptic curve cryptography operations will be performed in slow
+  #   Python-only mode.
   postFixup = ''
-    wrapQtApp $out/bin/electron-cash
+    wrapQtApp $out/bin/electron-cash \
+      --prefix LD_LIBRARY_PATH : ${secp256k1}/lib
   '';
 
   doInstallCheck = true;

From a41d96f45f3b847598dcbce503ce645f68f5b806 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Tue, 24 Mar 2020 09:59:16 +0300
Subject: [PATCH 4284/4636] samba: cleanup build configuration

---
 pkgs/servers/samba/4.x.nix | 80 +++++++++++++++++++++++++++++++-------
 1 file changed, 67 insertions(+), 13 deletions(-)

diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index d24a9b9748aa..fedc2327af6f 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -1,9 +1,40 @@
-{ lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl, rpcgen
+{ stdenv
+, fetchurl
+, python
+, pkgconfig
+, perl
+, libxslt
+, docbook_xsl
+, rpcgen
 , fixDarwinDylibNames
-, docbook_xml_dtd_42, readline
-, popt, iniparser, libbsd, libarchive, libiconv, gettext
-, krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, liburing, fam, libceph, glusterfs
-, gnutls, ncurses, libunwind, systemd, jansson, lmdb, gpgme, libuuid
+, docbook_xml_dtd_42
+, readline
+, popt
+, iniparser
+, libbsd
+, libarchive
+, libiconv
+, gettext
+, krb5Full
+, zlib
+, openldap
+, cups
+, pam
+, avahi
+, acl
+, libaio
+, liburing
+, fam
+, libceph
+, glusterfs
+, gnutls
+, ncurses
+, libunwind
+, systemd
+, jansson
+, lmdb
+, gpgme
+, libuuid
 
 , enableLDAP ? false
 , enablePrinting ? false
@@ -16,7 +47,7 @@
 , enablePam ? (!stdenv.isDarwin)
 }:
 
-with lib;
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "samba";
@@ -36,12 +67,33 @@ stdenv.mkDerivation rec {
     ./4.x-fix-makeflags-parsing.patch
   ];
 
-  nativeBuildInputs = [ pkgconfig perl perl.pkgs.ParseYapp libxslt docbook_xsl docbook_xml_dtd_42 ]
-  ++ optionals stdenv.isDarwin [ rpcgen fixDarwinDylibNames ];
+  nativeBuildInputs = [
+    pkgconfig
+    perl
+    perl.pkgs.ParseYapp
+    libxslt
+    docbook_xsl
+    docbook_xml_dtd_42
+  ] ++ optionals stdenv.isDarwin [
+    rpcgen
+    fixDarwinDylibNames
+  ];
 
   buildInputs = [
-    python readline popt iniparser jansson
-    libbsd libarchive zlib fam libiconv gettext libunwind krb5Full gnutls
+    python
+    readline
+    popt
+    iniparser
+    jansson
+    libbsd
+    libarchive
+    zlib
+    fam
+    libiconv
+    gettext
+    libunwind
+    krb5Full
+    gnutls
   ] ++ optionals stdenv.isLinux [ libaio liburing systemd ]
     ++ optional enableLDAP openldap
     ++ optional (enablePrinting && stdenv.isLinux) cups
@@ -67,7 +119,7 @@ stdenv.mkDerivation rec {
     "--with-static-modules=NONE"
     "--with-shared-modules=ALL"
     "--with-system-mitkrb5"
-    "--with-system-mitkdc" krb5Full
+    "--with-system-mitkdc=${krb5Full}"
     "--enable-fhs"
     "--sysconfdir=/etc"
     "--localstatedir=/var"
@@ -75,8 +127,10 @@ stdenv.mkDerivation rec {
   ] ++ singleton (if enableDomainController
          then "--with-experimental-mit-ad-dc"
          else "--without-ad-dc")
-    ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ]
-    ++ optional (!enableAcl) "--without-acl-support"
+    ++ optionals (!enableLDAP) [
+    "--without-ldap"
+    "--without-ads"
+  ] ++ optional (!enableAcl) "--without-acl-support"
     ++ optional (!enablePam) "--without-pam";
 
   preBuild = ''

From e1b3a529e1d8321a41a6c5d44d263a8c35b9f0a7 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Wed, 25 Mar 2020 11:28:36 +0300
Subject: [PATCH 4285/4636] samba: fix deps

---
 pkgs/servers/samba/4.x.nix | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index fedc2327af6f..e8c42b776194 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -17,34 +17,23 @@
 , gettext
 , krb5Full
 , zlib
-, openldap
-, cups
-, pam
-, avahi
-, acl
 , libaio
 , liburing
 , fam
-, libceph
-, glusterfs
 , gnutls
-, ncurses
 , libunwind
 , systemd
 , jansson
-, lmdb
-, gpgme
-, libuuid
 
-, enableLDAP ? false
-, enablePrinting ? false
-, enableMDNS ? false
-, enableDomainController ? false
-, enableRegedit ? true
-, enableCephFS ? false
-, enableGlusterFS ? false
-, enableAcl ? (!stdenv.isDarwin)
-, enablePam ? (!stdenv.isDarwin)
+, enableLDAP ? false, openldap
+, enablePrinting ? false, cups
+, enableMDNS ? false, avahi
+, enableDomainController ? false, gpgme, lmdb
+, enableRegedit ? true, ncurses
+, enableCephFS ? false, libceph
+, enableGlusterFS ? false, glusterfs, libuuid
+, enableAcl ? (!stdenv.isDarwin), acl
+, enablePam ? (!stdenv.isDarwin), pam
 }:
 
 with stdenv.lib;

From 0c43bd4ef832d57a7f07ec329c14cdb535c1f559 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Wed, 25 Mar 2020 11:53:04 +0300
Subject: [PATCH 4286/4636] samba: remove unused packages

---
 pkgs/servers/samba/4.x.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index e8c42b776194..f0902a235e6e 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -10,14 +10,10 @@
 , docbook_xml_dtd_42
 , readline
 , popt
-, iniparser
 , libbsd
 , libarchive
-, libiconv
-, gettext
 , krb5Full
 , zlib
-, libaio
 , liburing
 , fam
 , gnutls
@@ -72,18 +68,15 @@ stdenv.mkDerivation rec {
     python
     readline
     popt
-    iniparser
     jansson
     libbsd
     libarchive
     zlib
     fam
-    libiconv
-    gettext
     libunwind
     krb5Full
     gnutls
-  ] ++ optionals stdenv.isLinux [ libaio liburing systemd ]
+  ] ++ optionals stdenv.isLinux [ liburing systemd ]
     ++ optional enableLDAP openldap
     ++ optional (enablePrinting && stdenv.isLinux) cups
     ++ optional enableMDNS avahi

From 5a7d2e18fe9941ed7a9f39ca1d685142833eac52 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 28 Mar 2020 17:10:40 +0100
Subject: [PATCH 4287/4636] cargo-make: 0.30.0 -> 0.30.1

https://github.com/sagiegurari/cargo-make/releases/tag/0.30.1
---
 pkgs/development/tools/rust/cargo-make/Cargo.lock  | 8 ++++----
 pkgs/development/tools/rust/cargo-make/default.nix | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-make/Cargo.lock b/pkgs/development/tools/rust/cargo-make/Cargo.lock
index 86a539b33d71..41843b64b896 100644
--- a/pkgs/development/tools/rust/cargo-make/Cargo.lock
+++ b/pkgs/development/tools/rust/cargo-make/Cargo.lock
@@ -104,9 +104,9 @@ dependencies = [
 
 [[package]]
 name = "cargo-make"
-version = "0.30.0"
+version = "0.30.1"
 dependencies = [
- "ci_info 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ci_info 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -142,7 +142,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "ci_info"
-version = "0.9.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -953,7 +953,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
 "checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
 "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-"checksum ci_info 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e53a6853eb0aafd4be4d1c7c891982a91a58f84df98838992ce3eb774572bfd9"
+"checksum ci_info 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b407009a4a51ae109dbdfcd7b6e4de38d148f37fad512b8c4623c642c4045e68"
 "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
 "checksum colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8815e2ab78f3a59928fc32e141fbeece88320a240e43f47b2fd64ea3a88a5b3d"
 "checksum constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix
index f3d6788e3ac1..ac05906f9838 100644
--- a/pkgs/development/tools/rust/cargo-make/default.nix
+++ b/pkgs/development/tools/rust/cargo-make/default.nix
@@ -2,7 +2,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-make";
-  version = "0.30.0";
+  version = "0.30.1";
 
   src =
     let
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
         owner = "sagiegurari";
         repo = pname;
         rev = version;
-        sha256 = "0zlj2jys97nphymxrzdjmnh9vv7rsq3fgidap96mh26q9af7ffbz";
+        sha256 = "0s8qniliv2lq19zvymsw8lpg7jgvna2wi7i3kqgqxfkij95z383n";
       };
     in
     runCommand "source" {} ''
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
 
-  cargoSha256 = "1pjdpnilbxn7vzxl15j5d3k07a80y1mr5cdmj96miyq89j5mmjq0";
+  cargoSha256 = "0wkymahq8rd2i6j7s1x70rp22f60wlkqhl27qinsc03cnaky5c83";
 
   # Some tests fail because they need network access.
   # However, Travis ensures a proper build.

From 4a01c9433b1490cf7804ad1837f91e555953f6d1 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Wed, 25 Mar 2020 12:53:38 +0300
Subject: [PATCH 4288/4636] samba: add needed packages

---
 pkgs/servers/samba/4.x.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index f0902a235e6e..2bb614e652d0 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -2,12 +2,14 @@
 , fetchurl
 , python
 , pkgconfig
+, bison
+, flex
 , perl
 , libxslt
 , docbook_xsl
 , rpcgen
 , fixDarwinDylibNames
-, docbook_xml_dtd_42
+, docbook_xml_dtd_45
 , readline
 , popt
 , libbsd
@@ -20,6 +22,9 @@
 , libunwind
 , systemd
 , jansson
+, libtasn1
+, tdb
+, cmocka
 
 , enableLDAP ? false, openldap
 , enablePrinting ? false, cups
@@ -54,11 +59,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
+    bison
+    flex
     perl
     perl.pkgs.ParseYapp
     libxslt
     docbook_xsl
-    docbook_xml_dtd_42
+    docbook_xml_dtd_45
+    cmocka
   ] ++ optionals stdenv.isDarwin [
     rpcgen
     fixDarwinDylibNames
@@ -76,6 +84,8 @@ stdenv.mkDerivation rec {
     libunwind
     krb5Full
     gnutls
+    libtasn1
+    tdb
   ] ++ optionals stdenv.isLinux [ liburing systemd ]
     ++ optional enableLDAP openldap
     ++ optional (enablePrinting && stdenv.isLinux) cups

From 911179ef656d6f2a71ffaf38dbed8998153e2afb Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Wed, 25 Mar 2020 13:22:24 +0300
Subject: [PATCH 4289/4636] samba: add option enableKerberos

---
 pkgs/servers/samba/4.x.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 2bb614e652d0..e9f505d70577 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -14,7 +14,6 @@
 , popt
 , libbsd
 , libarchive
-, krb5Full
 , zlib
 , liburing
 , fam
@@ -30,6 +29,7 @@
 , enablePrinting ? false, cups
 , enableMDNS ? false, avahi
 , enableDomainController ? false, gpgme, lmdb
+, enableKerberos ? true, krb5Full
 , enableRegedit ? true, ncurses
 , enableCephFS ? false, libceph
 , enableGlusterFS ? false, glusterfs, libuuid
@@ -82,7 +82,6 @@ stdenv.mkDerivation rec {
     zlib
     fam
     libunwind
-    krb5Full
     gnutls
     libtasn1
     tdb
@@ -91,6 +90,7 @@ stdenv.mkDerivation rec {
     ++ optional (enablePrinting && stdenv.isLinux) cups
     ++ optional enableMDNS avahi
     ++ optionals enableDomainController [ gpgme lmdb ]
+    ++ optional enableKerberos krb5Full
     ++ optional enableRegedit ncurses
     ++ optional (enableCephFS && stdenv.isLinux) libceph
     ++ optionals (enableGlusterFS && stdenv.isLinux) [ glusterfs libuuid ]
@@ -110,8 +110,6 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-static-modules=NONE"
     "--with-shared-modules=ALL"
-    "--with-system-mitkrb5"
-    "--with-system-mitkdc=${krb5Full}"
     "--enable-fhs"
     "--sysconfdir=/etc"
     "--localstatedir=/var"
@@ -119,7 +117,10 @@ stdenv.mkDerivation rec {
   ] ++ singleton (if enableDomainController
          then "--with-experimental-mit-ad-dc"
          else "--without-ad-dc")
-    ++ optionals (!enableLDAP) [
+    ++ optionals enableKerberos [
+    "--with-system-mitkrb5"
+    "--with-system-mitkdc=${krb5Full}"
+  ] ++ optionals (!enableLDAP) [
     "--without-ldap"
     "--without-ads"
   ] ++ optional (!enableAcl) "--without-acl-support"

From 4b2da39fffe5585c749f8fdbb524a4f171e8a1ee Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Wed, 25 Mar 2020 13:23:36 +0300
Subject: [PATCH 4290/4636] samba: add option enableProfiling

---
 pkgs/servers/samba/4.x.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index e9f505d70577..1d6951bb8c1c 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -27,6 +27,7 @@
 
 , enableLDAP ? false, openldap
 , enablePrinting ? false, cups
+, enableProfiling ? true
 , enableMDNS ? false, avahi
 , enableDomainController ? false, gpgme, lmdb
 , enableKerberos ? true, krb5Full
@@ -123,7 +124,8 @@ stdenv.mkDerivation rec {
   ] ++ optionals (!enableLDAP) [
     "--without-ldap"
     "--without-ads"
-  ] ++ optional (!enableAcl) "--without-acl-support"
+  ] ++ optional enableProfiling "--with-profiling-data"
+    ++ optional (!enableAcl) "--without-acl-support"
     ++ optional (!enablePam) "--without-pam";
 
   preBuild = ''

From d66bab32f83757c92537f94510afc6cddd4633aa Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Wed, 25 Mar 2020 13:27:41 +0300
Subject: [PATCH 4291/4636] tdb: 1.3.18 -> 1.4.3

---
 pkgs/development/libraries/tdb/default.nix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix
index 9e90e3d3be43..2764e8878875 100644
--- a/pkgs/development/libraries/tdb/default.nix
+++ b/pkgs/development/libraries/tdb/default.nix
@@ -1,18 +1,23 @@
-{ stdenv, fetchurl, wafHook, pkgconfig, readline, libxslt
-, docbook_xsl, docbook_xml_dtd_42
+{ stdenv, fetchurl, pkgconfig
+, wafHook, python3, readline
+, libxslt, docbook_xsl, docbook_xml_dtd_45
 }:
 
 stdenv.mkDerivation rec {
-  name = "tdb-1.3.18";
+  name = "tdb-1.4.3";
 
   src = fetchurl {
     url = "mirror://samba/tdb/${name}.tar.gz";
-    sha256 = "1drnsdh1w0px35r0y7l7g59yvyr67mvcsdrli4wab0mwi07b8mn1";
+    sha256 = "06waz0k50c7v3chd08mzp2rv7w4k4q9isbxx3vhlfpx1vy9q61f8";
   };
 
-  nativeBuildInputs = [ pkgconfig wafHook ];
+  nativeBuildInputs = [
+    pkgconfig wafHook
+    libxslt docbook_xsl docbook_xml_dtd_45
+  ];
+
   buildInputs = [
-    readline libxslt docbook_xsl docbook_xml_dtd_42
+    python3 readline
   ];
 
   wafPath = "buildtools/bin/waf";

From 1b0799f48f4c8efeee59d59d1ccd3de31199ff4f Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Sat, 28 Mar 2020 18:21:14 +0100
Subject: [PATCH 4292/4636] dnscrypt-proxy: 2.0.39 -> 2.0.42

---
 pkgs/tools/networking/dnscrypt-proxy2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/pkgs/tools/networking/dnscrypt-proxy2/default.nix
index 089eee332b4c..b82f1e7bb4bb 100644
--- a/pkgs/tools/networking/dnscrypt-proxy2/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy2/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "dnscrypt-proxy2";
-  version = "2.0.39";
+  version = "2.0.42";
 
   goPackagePath = "github.com/jedisct1/dnscrypt-proxy";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "jedisct1";
     repo = "dnscrypt-proxy";
     rev = version;
-    sha256 = "0fvnp2brmqkwn04v01k53f9djk9ywa1cg26m2frhv4lj0581430y";
+    sha256 = "1v4n0pkwcilxm4mnj4fsd4gf8pficjj40jnmfkiwl7ngznjxwkyw";
   };
 
   meta = with stdenv.lib; {

From 88508a72436a9b2ce8f6a07475a93e3c0ac649b3 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 28 Mar 2020 20:45:44 +0300
Subject: [PATCH 4293/4636] cpp-utilities: 5.2.0 -> 5.3.0

---
 .../libraries/cpp-utilities/default.nix           | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix
index 93ee2ddc7046..6453ff2a3e91 100644
--- a/pkgs/development/libraries/cpp-utilities/default.nix
+++ b/pkgs/development/libraries/cpp-utilities/default.nix
@@ -7,25 +7,14 @@
 
 stdenv.mkDerivation rec {
   pname = "cpp-utilities";
-  version = "5.2.0";
+  version = "5.3.0";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0cghk1a0ki1063ci63imakmggwzkky1hx6lhrvc0wjfv754wsklb";
+    sha256 = "1c5rs28pavv8zabprjbd2y1sblgqbbhww07qvairh149rahvxi85";
   };
-  # See https://github.com/Martchus/cpp-utilities/issues/18
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/Martchus/cpp-utilities/commit/b2a2773cdfb2b0017a3fa3d0ed2259a9a5fda666.patch";
-      sha256 = "01js90ba4xxljifncm48zbxmg7mwwz1gla1hn87yzbic47d85hfj";
-    })
-    (fetchpatch {
-      url = "https://github.com/Martchus/cpp-utilities/commit/4dd2179f191d1ace113f26177944684fa1561dc1.patch";
-      sha256 = "0chw33mwsvj7cigd1c4xl2zhpbfsp5rrijdm46qpn78bq70xcz9j";
-    })
-  ];
 
   nativeBuildInputs = [ cmake ];
   checkInputs = [ cppunit ];

From 77a062fe47940f1d1cdfb136934bb42d20094c51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 27 Mar 2020 20:36:50 +0100
Subject: [PATCH 4294/4636] spring: 104.0.1-1466-g9ee29da ->
 104.0.1-1474-g69b06d0

---
 pkgs/games/spring/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index e0dd5f53449f..104c185e2c18 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -9,11 +9,12 @@ stdenv.mkDerivation rec {
   pname = "spring";
   version = "104.0.1";
 
+  # taken from https://github.com/spring/spring/commits/maintenance
   src = fetchFromGitHub {
     owner = "spring";
     repo = "spring";
-    rev = "9ee29da876f6d3d23e169185619b58df9c036703";
-    sha256 = "0m94i85k8k5ls1ff9z8djslzhkgr7b7vsbpic2axxjvki6sn2xjv";
+    rev = "69b06d03411fd97f0042a348d839e88d16bd6cb1";
+    sha256 = "16dfh0alb3zz5q8d00fy91banicrn69hf1scmq6vgjhzhzsvnlxj";
     fetchSubmodules = true;
   };
 
@@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
     patchShebangs .
     rm rts/build/cmake/FindGLEW.cmake
 
-    echo "104.0.1-1466-g9ee29da maintenance" > VERSION
+    echo "104.0.1-1474-g69b06d0 maintenance" > VERSION
   '';
 
   cmakeFlags = ["-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON"

From 8f8cbec9855a7088ba40929689637ccec493d372 Mon Sep 17 00:00:00 2001
From: Vincent Bernat <vincent@bernat.ch>
Date: Sat, 28 Mar 2020 20:29:09 +0100
Subject: [PATCH 4295/4636] nixos/nginx: use mailcap mimetypes in all cases
 (#83611)

In ff0148d868bd, nginx configuration was modified to use mime.types
from mailcap package as it is more complete. However, there are two
places where mime.types is included in configuration. When the user
was setting `cfg.httpConfig`, the mime.types from nginx was still
used. This commit fix that by moving the common snippet in a variable
of its own and ensure it is used at both places.
---
 .../services/web-servers/nginx/default.nix    | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 28b433104a1c..2df39390eb44 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -46,6 +46,15 @@ let
     }
   ''));
 
+  commonHttpConfig = ''
+      # The mime type definitions included with nginx are very incomplete, so
+      # we use a list of mime types from the mailcap package, which is also
+      # used by most other Linux distributions by default.
+      include ${pkgs.mailcap}/etc/nginx/mime.types;
+      include ${cfg.package}/conf/fastcgi.conf;
+      include ${cfg.package}/conf/uwsgi_params;
+  '';
+
   configFile = pkgs.writers.writeNginxConfig "nginx.conf" ''
     pid /run/nginx/nginx.pid;
     error_log ${cfg.logError};
@@ -61,12 +70,7 @@ let
 
     ${optionalString (cfg.httpConfig == "" && cfg.config == "") ''
     http {
-      # The mime type definitions included with nginx are very incomplete, so
-      # we use a list of mime types from the mailcap package, which is also
-      # used by most other Linux distributions by default.
-      include ${pkgs.mailcap}/etc/nginx/mime.types;
-      include ${cfg.package}/conf/fastcgi.conf;
-      include ${cfg.package}/conf/uwsgi_params;
+      ${commonHttpConfig}
 
       ${optionalString (cfg.resolver.addresses != []) ''
         resolver ${toString cfg.resolver.addresses} ${optionalString (cfg.resolver.valid != "") "valid=${cfg.resolver.valid}"} ${optionalString (!cfg.resolver.ipv6) "ipv6=off"};
@@ -172,9 +176,7 @@ let
 
     ${optionalString (cfg.httpConfig != "") ''
     http {
-      include ${cfg.package}/conf/mime.types;
-      include ${cfg.package}/conf/fastcgi.conf;
-      include ${cfg.package}/conf/uwsgi_params;
+      ${common.httpConfig}
       ${cfg.httpConfig}
     }''}
 

From f074dcf43b9d750a688d2b56e4189206387e0717 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=BChrk?= <andy@hammerhartes.de>
Date: Sat, 28 Mar 2020 20:20:31 +0100
Subject: [PATCH 4296/4636] skaffold: 1.4.0 -> 1.6.0

---
 pkgs/development/tools/skaffold/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix
index bab881cf4a49..d1d1200344f8 100644
--- a/pkgs/development/tools/skaffold/default.nix
+++ b/pkgs/development/tools/skaffold/default.nix
@@ -2,9 +2,9 @@
 
 buildGoPackage rec {
   pname = "skaffold";
-  version = "1.4.0";
+  version = "1.6.0";
   # rev is the ${version} commit, mainly for skaffold version command output
-  rev = "bb324609b4254ceb9f76d35eb03642a6a1807867";
+  rev = "4cc0be23e41e37d8b1bca1464516538b2cc1bba0";
 
   goPackagePath = "github.com/GoogleContainerTools/skaffold";
   subPackages = ["cmd/skaffold"];
@@ -20,7 +20,7 @@ buildGoPackage rec {
     owner = "GoogleContainerTools";
     repo = "skaffold";
     rev = "v${version}";
-    sha256 = "0nrz2gnp722cq4p8lcfl0nlws53c2bfq17jgr2jad4vyjglgfscw";
+    sha256 = "0wz9x3p0hfajrkm1qrhl4kw7l7r3n6xv16chl4dxigaix8ga068h";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 7887a4ac38c9688a0a1a1555551e93cd4de82091 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Sat, 28 Mar 2020 19:31:00 +0000
Subject: [PATCH 4297/4636] mindustry: 103 -> 104.6 (#83613)

---
 pkgs/games/mindustry/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix
index 3d4f52f2c704..c0c8663868d1 100644
--- a/pkgs/games/mindustry/default.nix
+++ b/pkgs/games/mindustry/default.nix
@@ -21,14 +21,14 @@ let
   # Note: when raising the version, ensure that all SNAPSHOT versions in
   # build.gradle are replaced by a fixed version
   # (the current one at the time of release) (see postPatch).
-  version = "103";
+  version = "104.6";
   buildVersion = makeBuildVersion version;
 
   src = fetchFromGitHub {
     owner = "Anuken";
     repo = "Mindustry";
     rev = "v${version}";
-    sha256 = "0s9pzmnq2v3glbmb6kqifar62wi44z4sg14dnayyj0fjkx6sh05s";
+    sha256 = "1crdfiymaz57gnma6bmdcsnbl635nhjdndrjv467c4xfq9vvap2i";
   };
 
   desktopItem = makeDesktopItem {
@@ -70,7 +70,7 @@ let
     '';
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
-    outputHash = "16k058fw9yk89adx8j1708ynfri5yizmmvh49prls9slw4hipffb";
+    outputHash = "08yrczz1qn78qy3x67gs7d0xvihbfbb8ggiczq2nj812745zcizw";
   };
 
   # Separate commands for building and installing the server and the client

From 7c451c3b6bc3b9fef2c8fa76d3faebda1607b21c Mon Sep 17 00:00:00 2001
From: Vincent Bernat <vincent@bernat.ch>
Date: Sat, 28 Mar 2020 20:40:44 +0100
Subject: [PATCH 4298/4636] nginx: increase types_hash_max_size to 4096
 (#83609)

After upgrading to NixOS 20.03, I've got the following warning:

    nginx: [warn] could not build optimal types_hash, you should increase either types_hash_max_size: 2048 or types_hash_bucket_size: 64; ignoring types_hash_bucket_size

The documentation states that "if nginx emits the message requesting
to increase either hash max size or hash bucket size then the first
parameter should first be increased" (aka types_hash_max_size).

In 19.03, the size of mime.types was around 100 entries. In 20.03, we
are around 900 entries. This is due to ff0148d868bd which makes nginx
use mailcap mime.types.
---
 nixos/modules/services/web-servers/nginx/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 2df39390eb44..fd230a76499b 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -83,7 +83,7 @@ let
         tcp_nopush on;
         tcp_nodelay on;
         keepalive_timeout 65;
-        types_hash_max_size 2048;
+        types_hash_max_size 4096;
       ''}
 
       ssl_protocols ${cfg.sslProtocols};

From 27121521b86edc5c653aea49415c4cf5042d7c56 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 28 Mar 2020 21:03:15 +0100
Subject: [PATCH 4299/4636] nixos/release-notes: mention that mongodb is unfree
 now

---
 nixos/doc/manual/release-notes/rl-2003.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index 7674b0a5c0de..849650157f07 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -828,6 +828,15 @@ auth required pam_succeed_if.so uid >= 1000 quiet
   <listitem>
    <para>
     <package>mongodb</package> has been updated to version <literal>3.4.24</literal>.
+    <warning>
+     <para>
+      Please note that <package>mongodb</package> has been relicensed under their own
+      <link xlink:href="https://www.mongodb.com/licensing/server-side-public-license/faq"><literal>
+      sspl</literal></link>-license. Since it's not entirely free and not OSI-approved,
+      it's listed as non-free. This means that Hydra doesn't provide prebuilt
+      <package>mongodb</package>-packages and needs to be built locally.
+     </para>
+    </warning>
    </para>
   </listitem>
   </itemizedlist>

From c8de31baa6d820c9275d4708c296c4af370cf63b Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sat, 28 Mar 2020 20:45:46 +0100
Subject: [PATCH 4300/4636] buildRustCrateTests: Fix link order test on darwin

As it turns out Darwin does most of the things differently then "normal"
systems. They are using a different shared library extension and require
an obscure commandline parameter that has to be added to every build
system out there. That issue seems to be with clang on Darwin as on
Linux that flag isn't required to build the very same tests (when using
clang).

After adjusting these two details the tests are running fine on the
darwin box that I was able to obtain.
---
 .../rust/build-rust-crate/test/default.nix    | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix
index 2251a1b40f2e..598b5daed1be 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix
@@ -1,4 +1,13 @@
-{ lib, buildRustCrate, runCommand, runCommandCC, writeTextFile, symlinkJoin, callPackage, releaseTools }:
+{ lib
+, stdenv
+, buildRustCrate
+, runCommand
+, runCommandCC
+, writeTextFile
+, symlinkJoin
+, callPackage
+, releaseTools
+}:
 let
   mkCrate = args: let
     p = {
@@ -284,12 +293,18 @@ let
           ];
         };
         buildInputs = let
-          compile = name: text: runCommandCC name {} ''
-            mkdir -p $out/lib
-            $CC -shared -o $out/lib/${name}.so ${writeTextFile {
+          compile = name: text: let
+            src = writeTextFile {
               name = "${name}-src.c";
               inherit text;
-            }}
+            };
+          in runCommandCC name {} ''
+            mkdir -p $out/lib
+            # Note: On darwin (which defaults to clang) we have to add
+            # `-undefined dynamic_lookup` as otherwise the compilation fails.
+            cc -shared \
+              ${lib.optionalString stdenv.isDarwin "-undefined dynamic_lookup"} \
+              -o $out/lib/${name}${stdenv.hostPlatform.extensions.sharedLibrary} ${src}
           '';
           b = compile "libb" ''
             #include <stdio.h>

From 061e73c9592935e5f6ac11622dca8e041d7561c7 Mon Sep 17 00:00:00 2001
From: Constantine Glen Evans <cevans@evanslabs.org>
Date: Sat, 28 Mar 2020 13:45:23 -0700
Subject: [PATCH 4301/4636] mullvad-vpn: add libappindicator dependency

Adding libappindicator as a runtime dependency allows the Electron-based gui app
to have an appindicator in desktop environments that support them (eg,
Gnome with the appindicator support extension).
---
 pkgs/applications/networking/mullvad-vpn/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix
index 3b7de8360d74..fbefa871e7fa 100644
--- a/pkgs/applications/networking/mullvad-vpn/default.nix
+++ b/pkgs/applications/networking/mullvad-vpn/default.nix
@@ -1,7 +1,7 @@
 { stdenv, makeWrapper, fetchurl, dpkg
 , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype
 , gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3
-, xorg, autoPatchelfHook, systemd, libnotify
+, xorg, autoPatchelfHook, systemd, libnotify, libappindicator
 }:
 
 let deps = [
@@ -18,6 +18,7 @@ let deps = [
     gnome2.GConf
     pango
     gtk3
+    libappindicator
     libnotify
     xorg.libX11
     xorg.libXScrnSaver
@@ -59,7 +60,7 @@ stdenv.mkDerivation rec {
 
   unpackPhase = "dpkg-deb -x $src .";
 
-  runtimeDependencies = [ systemd.lib libnotify ];
+  runtimeDependencies = [ systemd.lib libnotify libappindicator ];
 
   installPhase = ''
     runHook preInstall

From 1eacf626edcbdc241854f795875717de616b66a3 Mon Sep 17 00:00:00 2001
From: Constantine Glen Evans <cevans@evanslabs.org>
Date: Sat, 28 Mar 2020 14:24:24 -0700
Subject: [PATCH 4302/4636] mullvad-vpn: fix mullvad-problem-report link

---
 pkgs/applications/networking/mullvad-vpn/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix
index fbefa871e7fa..2e4e4c732868 100644
--- a/pkgs/applications/networking/mullvad-vpn/default.nix
+++ b/pkgs/applications/networking/mullvad-vpn/default.nix
@@ -75,6 +75,7 @@ stdenv.mkDerivation rec {
 
     ln -s $out/share/mullvad/mullvad-{gui,vpn} $out/bin/
     ln -s $out/share/mullvad/resources/mullvad-daemon $out/bin/mullvad-daemon
+    ln -sf $out/share/mullvad/resources/mullvad-problem-report $out/bin/mullvad-problem-report
 
     runHook postInstall
   '';

From 3a3860fe481067ef108289defb81117279281f0a Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 15 Mar 2020 02:52:33 +0100
Subject: [PATCH 4303/4636] mixx: Build with libshout 2.4.1

Because libshout 2.4.2 and newer seem to break streaming in mixxx, build
it with 2.4.1 instead.

This actually fixes the problem.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/applications/audio/mixxx/default.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index 1247534b1e83..a7fc3aef078d 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, fetchFromGitHub, chromaprint
+{ stdenv, mkDerivation, fetchurl, fetchFromGitHub, chromaprint
 , fftw, flac, faad2, glibcLocales, mp4v2
 , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis
 , libGLU, libxcb, lilv, lv2, opusfile
@@ -6,6 +6,17 @@
 , qtx11extras, rubberband, scons, sqlite, taglib, upower, vamp-plugin-sdk
 }:
 
+let
+  # Because libshout 2.4.2 and newer seem to break streaming in mixxx, build it
+  # with 2.4.1 instead.
+  libshout241 = libshout.overrideAttrs (o: rec {
+    name = "libshout-2.4.1";
+    src = fetchurl {
+      url = "http://downloads.xiph.org/releases/libshout/${name}.tar.gz";
+      sha256 = "0kgjpf8jkgyclw11nilxi8vyjk4s8878x23qyxnvybbgqbgbib7k";
+    };
+  });
+in
 mkDerivation rec {
   pname = "mixxx";
   version = "2.2.3";
@@ -18,7 +29,7 @@ mkDerivation rec {
   };
 
   buildInputs = [
-    chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout libsndfile
+    chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout241 libsndfile
     libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkgconfig portaudio portmidi protobuf qtbase qtscript qtsvg
     qtx11extras rubberband scons sqlite taglib upower vamp-plugin-sdk
   ];

From 63a3a81863a46056b80e1bbed5696c06717f6774 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sat, 28 Mar 2020 22:27:38 +0100
Subject: [PATCH 4304/4636] mutt: 1.13.4 -> 1.13.5

---
 pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 143153d4d9ff..a53e1abc1861 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -27,11 +27,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "mutt";
-  version = "1.13.4";
+  version = "1.13.5";
 
   src = fetchurl {
     url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
-    sha256 = "016dzx2c0kr9xgnw4nfzpkn4nvpk56rdlcqhrwa820fq8083yzdm";
+    sha256 = "0lx65a44b03rbvcrz0y9syrik67fx3hvblxyyvz5l9bb7rdipmvc";
   };
 
   patches = optional smimeSupport (fetchpatch {

From b938ab99e054eaed93a72e3ff772f1e537b072a5 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 28 Mar 2020 22:32:34 +0100
Subject: [PATCH 4305/4636] vorta: init at 0.6.24

Simple QT5-based desktop client[1] for `borgbackup`[2].

[1] https://vorta.borgbase.com/
[2] https://borgbackup.readthedocs.io/en/stable/
---
 pkgs/applications/backup/vorta/default.nix | 42 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/applications/backup/vorta/default.nix

diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix
new file mode 100644
index 000000000000..1a4d1832c7e1
--- /dev/null
+++ b/pkgs/applications/backup/vorta/default.nix
@@ -0,0 +1,42 @@
+{ buildPythonApplication, fetchFromGitHub, lib, paramiko, peewee, pyqt5
+, python-dateutil, APScheduler, psutil, qdarkstyle, secretstorage
+, appdirs, setuptools, qt5
+}:
+
+buildPythonApplication rec {
+  pname = "vorta";
+  version = "0.6.24";
+
+  src = fetchFromGitHub {
+    owner = "borgbase";
+    repo = "vorta";
+    rev = "v${version}";
+    sha256 = "1xc4cng4npc7g739qd909a8wim6s6sn8h8bb1wpxzg4gcnfyin8z";
+  };
+
+  postPatch = ''
+    sed -i -e '/setuptools_git/d' -e '/pytest-runner/d' setup.cfg
+  '';
+
+  nativeBuildInputs = [ qt5.wrapQtAppsHook ];
+
+  propagatedBuildInputs = [
+    paramiko peewee pyqt5 python-dateutil APScheduler psutil qdarkstyle
+    secretstorage appdirs setuptools
+  ];
+
+  # QT setup in tests broken.
+  doCheck = false;
+
+  postFixup = ''
+    wrapQtApp $out/bin/vorta
+  '';
+
+  meta = with lib; {
+    license = licenses.gpl3;
+    homepage = "https://vorta.borgbase.com/";
+    maintainers = with maintainers; [ ma27 ];
+    description = "Desktop Backup Client for Borg";
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index faead3d9df75..e6e44e98f944 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3080,6 +3080,8 @@ in
 
   volctl = callPackage ../tools/audio/volctl { };
 
+  vorta = python3Packages.callPackage ../applications/backup/vorta { };
+
   wallutils = callPackage ../tools/graphics/wallutils { };
 
   wev = callPackage ../tools/misc/wev { };

From 76f7fc1476cb046404b97a63cb861353d6097f16 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 28 Mar 2020 18:09:26 -0400
Subject: [PATCH 4306/4636] nixos/ibus: add ibus portal if portals are enabled

---
 nixos/modules/i18n/input-method/ibus.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix
index a3d97619fc45..b6a21c369e53 100644
--- a/nixos/modules/i18n/input-method/ibus.nix
+++ b/nixos/modules/i18n/input-method/ibus.nix
@@ -75,5 +75,9 @@ in
       QT_IM_MODULE = "ibus";
       XMODIFIERS = "@im=ibus";
     };
+
+    xdg.portal.extraPortals = mkIf xdg.portal.enable [
+      ibusPackage
+    ];
   };
 }

From c9042b95810ea0e638980dce45c06534394202ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 28 Mar 2020 19:23:28 -0300
Subject: [PATCH 4307/4636] theme-jade1: 1.6 -> 1.7

---
 pkgs/data/themes/jade1/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/themes/jade1/default.nix b/pkgs/data/themes/jade1/default.nix
index cba38cb297a8..7398c417933f 100644
--- a/pkgs/data/themes/jade1/default.nix
+++ b/pkgs/data/themes/jade1/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "theme-jade1";
-  version = "1.6";
+  version = "1.7";
 
   src = fetchFromGitHub {
     owner = "madmaxms";
     repo = "theme-jade-1";
     rev = "v${version}";
-    sha256 = "1lnajrsikw6dljf6dvgmj8aqwywmgdp34h3xsc0xiyq07arhp606";
+    sha256 = "19vg95bf0ylmfhg0frs2k0k7c0wfn933h06wrklb9p5qy84hfig3";
   };
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Fork of the original Linux Mint theme with dark menus, more intensive green and some other modifications";
+    description = "Based on Linux Mint theme with dark menus and more intensive green";
     homepage = "https://github.com/madmaxms/theme-jade-1";
     license = with licenses; [ gpl3 ];
     platforms = platforms.linux;

From bd5324c4fcb990715c64fc40c19341947e04bf17 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 27 Mar 2020 22:09:13 +0100
Subject: [PATCH 4308/4636] hydra: 2020-02-06 -> 2020-03-{24,27}

Upgrades Hydra to the latest master/flake branch. To perform this
upgrade, it's needed to do a non-trivial db-migration which provides a
massive performance-improvement[1].

The basic ideas behind multi-step upgrades of services between NixOS versions
have been gathered already[2]. For further context it's recommended to
read this first.

Basically, the following steps are needed:

* Upgrade to a non-breaking version of Hydra with the db-changes
  (columns are still nullable here). If `system.stateVersion` is set to
  something older than 20.03, the package will be selected
  automatically, otherwise `pkgs.hydra-migration` needs to be used.

* Run `hydra-backfill-ids` on the server.

* Deploy either `pkgs.hydra-unstable` (for Hydra master) or
  `pkgs.hydra-flakes` (for flakes-support) to activate the optimization.

The steps are also documented in the release-notes and in the module
using `warnings`.

`pkgs.hydra` has been removed as latest Hydra doesn't compile with
`pkgs.nixStable` and to ensure a graceful migration using the newly
introduced packages.

To verify the approach, a simple vm-test has been added which verifies
the migration steps.

[1] https://github.com/NixOS/hydra/pull/711
[2] https://github.com/NixOS/nixpkgs/pull/82353#issuecomment-598269471
---
 nixos/doc/manual/release-notes/rl-2003.xml    |  60 ++++++
 .../continuous-integration/hydra/default.nix  |  33 +++-
 nixos/tests/all-tests.nix                     |   1 +
 nixos/tests/hydra/common.nix                  |  47 +++++
 nixos/tests/hydra/db-migration.nix            |  86 +++++++++
 nixos/tests/hydra/default.nix                 | 139 +++++---------
 pkgs/development/tools/misc/hydra/common.nix  | 135 ++++++++++++++
 pkgs/development/tools/misc/hydra/default.nix | 171 ++++--------------
 pkgs/top-level/all-packages.nix               |   3 +-
 9 files changed, 444 insertions(+), 231 deletions(-)
 create mode 100644 nixos/tests/hydra/common.nix
 create mode 100644 nixos/tests/hydra/db-migration.nix
 create mode 100644 pkgs/development/tools/misc/hydra/common.nix

diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index 7674b0a5c0de..76b12af362f8 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -697,6 +697,66 @@ auth required pam_succeed_if.so uid >= 1000 quiet
      </para>
     </warning>
    </listitem>
+   <listitem>
+    <para>
+     <package>Hydra</package> has gained a massive performance improvement due to
+     <link xlink:href="https://github.com/NixOS/hydra/pull/710">some database schema
+     changes</link> by adding several IDs and better indexing. However, it's necessary
+     to upgrade Hydra in multiple steps:
+     <itemizedlist>
+      <listitem>
+       <para>
+        At first, an older version of Hydra needs to be deployed which adds those
+        (nullable) columns. When having set <link linkend="opt-system.stateVersion">stateVersion
+        </link> to a value older than <literal>20.03</literal>, this package will be selected
+        by default from the module when upgrading. Otherwise, the package can be deployed using
+        the following config:
+<programlisting>{ pkgs, ... }: {
+  <link linkend="opt-services.hydra.package">services.hydra.package</link> = pkgs.hydra-migration;
+}</programlisting>
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Automatically fill the newly added ID columns on the server by running the following
+        command:
+<screen>
+<prompt>$ </prompt>hydra-backfill-ids
+</screen>
+        <warning>
+         <para>Please note that this process can take a while depending on your database-size!</para>
+        </warning>
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Deploy a newer version of Hydra to activate the DB optimizations. You can choose from
+        either <package>hydra-unstable</package> (latest <literal>master</literal> compiled
+        against <package>nixUnstable</package>) and <package>hydra-flakes</package> (latest
+        version with flake-support).
+        <warning>
+         <para>
+          If your <link linkend="opt-system.stateVersion">stateVersion</link> is set to
+          <literal>20.03</literal> or greater, <package>hydra-unstable</package> will be used
+          automatically! This will break your setup if you didn't run the migration.
+         </para>
+        </warning>
+        Please note that Hydra is currently not available with <package>nixStable</package>
+        as this doesn't compile anymore.
+       </para>
+      </listitem>
+     </itemizedlist>
+     <warning>
+      <para>
+       <package>pkgs.hydra</package> has been removed to ensure a graceful database-migration
+       using the dedicated package-attributes. If you still have <package>pkgs.hydra</package>
+       defined in e.g. an overlay, an assertion error will be thrown. To circumvent this,
+       you need to set <xref linkend="opt-services.hydra.package" /> to <package>pkgs.hydra</package>
+       explicitly and make sure you know what you're doing!
+      </para>
+     </warning>
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix
index 8b56207590a1..0c335f14f785 100644
--- a/nixos/modules/services/continuous-integration/hydra/default.nix
+++ b/nixos/modules/services/continuous-integration/hydra/default.nix
@@ -37,6 +37,8 @@ let
 
   haveLocalDB = cfg.dbi == localDB;
 
+  inherit (config.system) stateVersion;
+
 in
 
 {
@@ -63,8 +65,7 @@ in
       };
 
       package = mkOption {
-        type = types.path;
-        default = pkgs.hydra;
+        type = types.package;
         defaultText = "pkgs.hydra";
         description = "The Hydra package.";
       };
@@ -194,6 +195,34 @@ in
 
   config = mkIf cfg.enable {
 
+    warnings = optional (cfg.package.migration or false) ''
+      You're currently deploying an older version of Hydra which is needed to
+      make some required database changes[1]. As soon as this is done, it's recommended
+      to run `hydra-backfill-ids` and set `services.hydra.package` to either `pkgs.hydra-unstable`
+      or `pkgs.hydra-flakes` after that.
+
+      [1] https://github.com/NixOS/hydra/pull/711
+    '';
+
+    services.hydra.package = with pkgs;
+      mkDefault (
+        if pkgs ? hydra
+          then throw ''
+            The Hydra package doesn't exist anymore in `nixpkgs`! It probably exists
+            due to an overlay. To upgrade Hydra, you need to take two steps as some
+            bigger changes in the database schema were implemented recently[1]. You first
+            need to deploy `pkgs.hydra-migration`, run `hydra-backfill-ids` on the server
+            and then deploy either `pkgs.hydra-unstable` or `pkgs.hydra-flakes`.
+
+            If you want to use `pkgs.hydra` from your overlay, please set `services.hydra.package`
+            explicitly to `pkgs.hydra` and make sure you know what you're doing.
+
+            [1] https://github.com/NixOS/hydra/pull/711
+          ''
+        else if versionOlder stateVersion "20.03" then hydra-migration
+        else hydra-unstable
+      );
+
     users.groups.hydra = {
       gid = config.ids.gids.hydra;
     };
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 3501c551625d..265c93298f3c 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -127,6 +127,7 @@ in
   home-assistant = handleTest ./home-assistant.nix {};
   hound = handleTest ./hound.nix {};
   hydra = handleTest ./hydra {};
+  hydra-db-migration = handleTest ./hydra/db-migration.nix {};
   i3wm = handleTest ./i3wm.nix {};
   icingaweb2 = handleTest ./icingaweb2.nix {};
   iftop = handleTest ./iftop.nix {};
diff --git a/nixos/tests/hydra/common.nix b/nixos/tests/hydra/common.nix
new file mode 100644
index 000000000000..f612717dc968
--- /dev/null
+++ b/nixos/tests/hydra/common.nix
@@ -0,0 +1,47 @@
+{ system, ... }:
+{
+  baseConfig = { pkgs, ... }: let
+    trivialJob = pkgs.writeTextDir "trivial.nix" ''
+     { trivial = builtins.derivation {
+         name = "trivial";
+         system = "${system}";
+         builder = "/bin/sh";
+         allowSubstitutes = false;
+         preferLocalBuild = true;
+         args = ["-c" "echo success > $out; exit 0"];
+       };
+     }
+    '';
+
+    createTrivialProject = pkgs.stdenv.mkDerivation {
+      name = "create-trivial-project";
+      dontUnpack = true;
+      buildInputs = [ pkgs.makeWrapper ];
+      installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh";
+      postFixup = ''
+        wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.stdenv.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob}
+      '';
+    };
+  in {
+    virtualisation.memorySize = 2048;
+    time.timeZone = "UTC";
+    environment.systemPackages = [ createTrivialProject pkgs.jq ];
+    services.hydra = {
+      enable = true;
+      # Hydra needs those settings to start up, so we add something not harmfull.
+      hydraURL = "example.com";
+      notificationSender = "example@example.com";
+      extraConfig = ''
+        email_notification = 1
+      '';
+    };
+    services.postfix.enable = true;
+    nix = {
+      buildMachines = [{
+        hostName = "localhost";
+        systems = [ system ];
+      }];
+      binaryCaches = [];
+    };
+  };
+}
diff --git a/nixos/tests/hydra/db-migration.nix b/nixos/tests/hydra/db-migration.nix
new file mode 100644
index 000000000000..aa1c81c9e775
--- /dev/null
+++ b/nixos/tests/hydra/db-migration.nix
@@ -0,0 +1,86 @@
+{ system ? builtins.currentSystem, ... }:
+
+let inherit (import ./common.nix { inherit system; }) baseConfig; in
+
+{ mig = import ../make-test-python.nix ({ pkgs, lib, ... }: {
+    name = "hydra-db-migration";
+    meta = with pkgs.stdenv.lib.maintainers; {
+      maintainers = [ ma27 ];
+    };
+
+    nodes = {
+      original = { pkgs, lib, ... }: {
+        imports = [ baseConfig ];
+
+        # An older version of Hydra before the db change
+        # for testing purposes.
+        services.hydra.package = pkgs.hydra-migration.overrideAttrs (old: {
+          inherit (old) pname;
+          version = "2020-02-06";
+          src = pkgs.fetchFromGitHub {
+            owner = "NixOS";
+            repo = "hydra";
+            rev = "2b4f14963b16b21ebfcd6b6bfa7832842e9b2afc";
+            sha256 = "16q0cffcsfx5pqd91n9k19850c1nbh4vvbd9h8yi64ihn7v8bick";
+          };
+        });
+      };
+
+      migration_phase1 = { pkgs, lib, ... }: {
+        imports = [ baseConfig ];
+        services.hydra.package = pkgs.hydra-migration;
+      };
+
+      finished = { pkgs, lib, ... }: {
+        imports = [ baseConfig ];
+        services.hydra.package = pkgs.hydra-unstable;
+      };
+    };
+
+    testScript = { nodes, ... }: let
+      next = nodes.migration_phase1.config.system.build.toplevel;
+      finished = nodes.finished.config.system.build.toplevel;
+    in ''
+      original.start()
+      original.wait_for_unit("multi-user.target")
+      original.wait_for_unit("postgresql.service")
+      original.wait_for_unit("hydra-init.service")
+      original.require_unit_state("hydra-queue-runner.service")
+      original.require_unit_state("hydra-evaluator.service")
+      original.require_unit_state("hydra-notify.service")
+      original.succeed("hydra-create-user admin --role admin --password admin")
+      original.wait_for_open_port(3000)
+      original.succeed("create-trivial-project.sh")
+      original.wait_until_succeeds(
+          'curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" |  jq .buildstatus | xargs test 0 -eq'
+      )
+
+      out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ jobs\" -A'")
+      assert "jobset_id" not in out
+
+      original.succeed(
+          "${next}/bin/switch-to-configuration test >&2"
+      )
+      original.wait_for_unit("hydra-init.service")
+
+      out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ jobs\" -A'")
+      assert "jobset_id|integer|||" in out
+
+      original.succeed("hydra-backfill-ids")
+
+      original.succeed(
+          "${finished}/bin/switch-to-configuration test >&2"
+      )
+      original.wait_for_unit("hydra-init.service")
+
+      out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ jobs\" -A'")
+      assert "jobset_id|integer||not null|" in out
+
+      original.wait_until_succeeds(
+          'curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" |  jq .buildstatus | xargs test 0 -eq'
+      )
+
+      original.shutdown()
+    '';
+  });
+}
diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix
index 1c0ed3369b1c..5d94eb91bf5b 100644
--- a/nixos/tests/hydra/default.nix
+++ b/nixos/tests/hydra/default.nix
@@ -3,102 +3,57 @@
 , pkgs ? import ../../.. { inherit system config; }
 }:
 
+with import ../../lib/testing-python.nix { inherit system pkgs; };
+with pkgs.lib;
+
 let
 
-  trivialJob = pkgs.writeTextDir "trivial.nix" ''
-   { trivial = builtins.derivation {
-       name = "trivial";
-       system = "${system}";
-       builder = "/bin/sh";
-       allowSubstitutes = false;
-       preferLocalBuild = true;
-       args = ["-c" "echo success > $out; exit 0"];
-     };
-   }
-  '';
+  inherit (import ./common.nix { inherit system; }) baseConfig;
 
-  createTrivialProject = pkgs.stdenv.mkDerivation {
-    name = "create-trivial-project";
-    dontUnpack = true;
-    buildInputs = [ pkgs.makeWrapper ];
-    installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh";
-    postFixup = ''
-      wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.stdenv.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob}
+  hydraPkgs = {
+    inherit (pkgs) hydra-migration hydra-unstable hydra-flakes;
+  };
+
+  makeHydraTest = with pkgs.lib; name: package: makeTest {
+    name = "hydra-${name}";
+    meta = with pkgs.stdenv.lib.maintainers; {
+      maintainers = [ pstn lewo ma27 ];
+    };
+
+    machine = { pkgs, lib, ... }: {
+      imports = [ baseConfig ];
+      services.hydra = { inherit package; };
+    };
+
+    testScript = ''
+      # let the system boot up
+      machine.wait_for_unit("multi-user.target")
+      # test whether the database is running
+      machine.wait_for_unit("postgresql.service")
+      # test whether the actual hydra daemons are running
+      machine.wait_for_unit("hydra-init.service")
+      machine.require_unit_state("hydra-queue-runner.service")
+      machine.require_unit_state("hydra-evaluator.service")
+      machine.require_unit_state("hydra-notify.service")
+
+      machine.succeed("hydra-create-user admin --role admin --password admin")
+
+      # create a project with a trivial job
+      machine.wait_for_open_port(3000)
+
+      # make sure the build as been successfully built
+      machine.succeed("create-trivial-project.sh")
+
+      machine.wait_until_succeeds(
+          'curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" |  jq .buildstatus | xargs test 0 -eq'
+      )
+
+      machine.wait_until_succeeds(
+          'journalctl -eu hydra-notify.service -o cat | grep -q "sending mail notification to hydra@localhost"'
+      )
     '';
   };
 
-  callTest = f: f { inherit system pkgs; };
-
-  hydraPkgs = {
-    inherit (pkgs) nixStable nixUnstable nixFlakes;
-  };
-
-  tests = pkgs.lib.flip pkgs.lib.mapAttrs hydraPkgs (name: nix:
-    callTest (import ../make-test-python.nix ({ pkgs, lib, ... }:
-      {
-        name = "hydra-with-${name}";
-        meta = with pkgs.stdenv.lib.maintainers; {
-          maintainers = [ pstn lewo ma27 ];
-        };
-
-        machine = { pkgs, ... }:
-          {
-            virtualisation.memorySize = 1024;
-            time.timeZone = "UTC";
-
-            environment.systemPackages = [ createTrivialProject pkgs.jq ];
-            services.hydra = {
-              enable = true;
-
-              #Hydra needs those settings to start up, so we add something not harmfull.
-              hydraURL = "example.com";
-              notificationSender = "example@example.com";
-
-              package = pkgs.hydra.override { inherit nix; };
-
-              extraConfig = ''
-                email_notification = 1
-              '';
-            };
-            services.postfix.enable = true;
-            nix = {
-              buildMachines = [{
-                hostName = "localhost";
-                systems = [ system ];
-              }];
-
-              binaryCaches = [];
-            };
-          };
-
-        testScript = ''
-          # let the system boot up
-          machine.wait_for_unit("multi-user.target")
-          # test whether the database is running
-          machine.wait_for_unit("postgresql.service")
-          # test whether the actual hydra daemons are running
-          machine.wait_for_unit("hydra-init.service")
-          machine.require_unit_state("hydra-queue-runner.service")
-          machine.require_unit_state("hydra-evaluator.service")
-          machine.require_unit_state("hydra-notify.service")
-
-          machine.succeed("hydra-create-user admin --role admin --password admin")
-
-          # create a project with a trivial job
-          machine.wait_for_open_port(3000)
-
-          # make sure the build as been successfully built
-          machine.succeed("create-trivial-project.sh")
-
-          machine.wait_until_succeeds(
-              'curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" |  jq .buildstatus | xargs test 0 -eq'
-          )
-
-          machine.wait_until_succeeds(
-              'journalctl -eu hydra-notify.service -o cat | grep -q "sending mail notification to hydra@localhost"'
-          )
-        '';
-      })));
-
 in
-  tests
+
+mapAttrs makeHydraTest hydraPkgs
diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix
new file mode 100644
index 000000000000..7310ee949721
--- /dev/null
+++ b/pkgs/development/tools/misc/hydra/common.nix
@@ -0,0 +1,135 @@
+{ stdenv, nix, perlPackages, buildEnv, fetchFromGitHub
+, makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx
+, gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt
+, guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json
+, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
+, rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null
+, migration ? false
+}:
+
+with stdenv;
+
+if lib.versions.major nix.version == "1"
+  then throw "This Hydra version doesn't support Nix 1.x"
+else
+
+let
+  perlDeps = buildEnv {
+    name = "hydra-perl-deps";
+    paths = with perlPackages; lib.closePropagation
+      [ ModulePluggable
+        CatalystActionREST
+        CatalystAuthenticationStoreDBIxClass
+        CatalystDevel
+        CatalystDispatchTypeRegex
+        CatalystPluginAccessLog
+        CatalystPluginAuthorizationRoles
+        CatalystPluginCaptcha
+        CatalystPluginSessionStateCookie
+        CatalystPluginSessionStoreFastMmap
+        CatalystPluginStackTrace
+        CatalystPluginUnicodeEncoding
+        CatalystTraitForRequestProxyBase
+        CatalystViewDownload
+        CatalystViewJSON
+        CatalystViewTT
+        CatalystXScriptServerStarman
+        CatalystXRoleApplicator
+        CryptRandPasswd
+        DBDPg
+        DBDSQLite
+        DataDump
+        DateTime
+        DigestSHA1
+        EmailMIME
+        EmailSender
+        FileSlurp
+        IOCompress
+        IPCRun
+        JSON
+        JSONAny
+        JSONXS
+        LWP
+        LWPProtocolHttps
+        NetAmazonS3
+        NetPrometheus
+        NetStatsd
+        PadWalker
+        Readonly
+        SQLSplitStatement
+        SetScalar
+        Starman
+        SysHostnameLong
+        TermSizeAny
+        TestMore
+        TextDiff
+        TextTable
+        XMLSimple
+        nix
+        nix.perl-bindings
+        git
+        boehmgc
+      ];
+  };
+in stdenv.mkDerivation rec {
+  pname = "hydra";
+
+  inherit stdenv src version;
+
+  buildInputs =
+    [ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx
+      gitAndTools.top-git mercurial /*darcs*/ subversion bazaar openssl bzip2 libxslt
+      perlDeps perl nix
+      postgresql # for running the tests
+      nlohmann_json
+      boost
+    ];
+
+  hydraPath = lib.makeBinPath (
+    [ sqlite subversion openssh nix coreutils findutils pixz
+      gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial /*darcs*/ gnused bazaar
+    ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
+
+  NIX_CFLAGS_COMPILE = "-pthread";
+
+  shellHook = ''
+    PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH
+    PERL5LIB=$(pwd)/src/lib:$PERL5LIB;
+  '';
+
+  enableParallelBuilding = true;
+
+  preCheck = ''
+    patchShebangs .
+    export LOGNAME=''${LOGNAME:-foo}
+  '';
+
+  postInstall = ''
+    mkdir -p $out/nix-support
+    for i in $out/bin/*; do
+        read -n 4 chars < $i
+        if [[ $chars =~ ELF ]]; then continue; fi
+        wrapProgram $i \
+            --prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \
+            --prefix PATH ':' $out/bin:$hydraPath \
+            --set HYDRA_RELEASE ${version} \
+            --set HYDRA_HOME $out/libexec/hydra \
+            --set NIX_RELEASE ${nix.name or "unknown"}
+    done
+  ''; # */
+
+  dontStrip = true;
+
+  passthru = { inherit perlDeps migration; };
+
+  meta = with stdenv.lib; {
+    description = "Nix-based continuous build system";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ ma27 ];
+  };
+}
diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index 72aecf20ca39..35c069211b3f 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -1,143 +1,42 @@
-{ stdenv, nix, perlPackages, buildEnv, fetchFromGitHub
-, makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx
-, gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt
-, guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json
-, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
-, rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook
-}:
+{ fetchFromGitHub, nixStable, nixUnstable, callPackage, nixFlakes }:
 
-with stdenv;
-
-if lib.versions.major nix.version == "1"
-  then throw "This Hydra version doesn't support Nix 1.x"
-else
-
-let
-  perlDeps = buildEnv {
-    name = "hydra-perl-deps";
-    paths = with perlPackages; lib.closePropagation
-      [ ModulePluggable
-        CatalystActionREST
-        CatalystAuthenticationStoreDBIxClass
-        CatalystDevel
-        CatalystDispatchTypeRegex
-        CatalystPluginAccessLog
-        CatalystPluginAuthorizationRoles
-        CatalystPluginCaptcha
-        CatalystPluginSessionStateCookie
-        CatalystPluginSessionStoreFastMmap
-        CatalystPluginStackTrace
-        CatalystPluginUnicodeEncoding
-        CatalystTraitForRequestProxyBase
-        CatalystViewDownload
-        CatalystViewJSON
-        CatalystViewTT
-        CatalystXScriptServerStarman
-        CatalystXRoleApplicator
-        CryptRandPasswd
-        DBDPg
-        DBDSQLite
-        DataDump
-        DateTime
-        DigestSHA1
-        EmailMIME
-        EmailSender
-        FileSlurp
-        IOCompress
-        IPCRun
-        JSON
-        JSONAny
-        JSONXS
-        LWP
-        LWPProtocolHttps
-        NetAmazonS3
-        NetPrometheus
-        NetStatsd
-        PadWalker
-        Readonly
-        SQLSplitStatement
-        SetScalar
-        Starman
-        SysHostnameLong
-        TermSizeAny
-        TestMore
-        TextDiff
-        TextTable
-        XMLSimple
-        nix
-        nix.perl-bindings
-        git
-        boehmgc
-      ];
-  };
-in stdenv.mkDerivation rec {
-  pname = "hydra";
-  version = "2020-02-06";
-
-  inherit stdenv;
-
-  src = fetchFromGitHub {
-    owner = "NixOS";
-    repo = pname;
-    rev = "2b4f14963b16b21ebfcd6b6bfa7832842e9b2afc";
-    sha256 = "16q0cffcsfx5pqd91n9k19850c1nbh4vvbd9h8yi64ihn7v8bick";
+{
+  # Package for phase-1 of the db migration for Hydra.
+  # https://github.com/NixOS/hydra/pull/711
+  hydra-migration = callPackage ./common.nix {
+    version = "2020-02-10";
+    src = fetchFromGitHub {
+      owner = "NixOS";
+      repo = "hydra";
+      rev = "add4f610ce6f206fb44702b5a894d877b3a30e3a";
+      sha256 = "1d8hdgjx2ys0zmixi2ydmimdq7ml20h1ji4amwawcyw59kssh6l3";
+    };
+    nix = nixStable;
+    migration = true;
   };
 
-  buildInputs =
-    [ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx
-      gitAndTools.top-git mercurial darcs subversion bazaar openssl bzip2 libxslt
-      guile # optional, for Guile + Guix support
-      perlDeps perl nix
-      postgresql # for running the tests
-      nlohmann_json
-      boost
-    ];
+  # Hydra from latest master (or flakes) branch. Contains breaking changes,
+  # so when having an older version, `pkgs.hydra-migration` should be deployed first.
 
-  hydraPath = lib.makeBinPath (
-    [ sqlite subversion openssh nix coreutils findutils pixz
-      gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial darcs gnused bazaar
-    ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
+  hydra-unstable = callPackage ./common.nix {
+    version = "2020-03-24";
+    src = fetchFromGitHub {
+      owner = "NixOS";
+      repo = "hydra";
+      rev = "12cc46cdb36321acd4c982429a86eb0f8f3cc969";
+      sha256 = "10ipxzdxr47c8w5jg69mbax2ykc7lb5fs9bbdd3iai9wzyfz17ln";
+    };
+    nix = nixUnstable;
+  };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
-
-  configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
-
-  NIX_CFLAGS_COMPILE = "-pthread";
-
-  shellHook = ''
-    PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH
-    PERL5LIB=$(pwd)/src/lib:$PERL5LIB;
-  '';
-
-  enableParallelBuilding = true;
-
-  preCheck = ''
-    patchShebangs .
-    export LOGNAME=''${LOGNAME:-foo}
-  '';
-
-  postInstall = ''
-    mkdir -p $out/nix-support
-    for i in $out/bin/*; do
-        read -n 4 chars < $i
-        if [[ $chars =~ ELF ]]; then continue; fi
-        wrapProgram $i \
-            --prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \
-            --prefix PATH ':' $out/bin:$hydraPath \
-            --set HYDRA_RELEASE ${version} \
-            --set HYDRA_HOME $out/libexec/hydra \
-            --set NIX_RELEASE ${nix.name or "unknown"}
-    done
-  ''; # */
-
-  dontStrip = true;
-
-  passthru.perlDeps = perlDeps;
-
-  meta = with stdenv.lib; {
-    description = "Nix-based continuous build system";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ ma27 ];
+  hydra-flakes = callPackage ./common.nix {
+    version = "2020-03-27";
+    src = fetchFromGitHub {
+      owner = "NixOS";
+      repo = "hydra";
+      rev = "a7540b141d085a7e78c21fda8e8c05907c659b34";
+      sha256 = "08fs7593w5zs8vh4c66gvrxk6s840pp6hj8nwf51wsa27kg5a943";
+    };
+    nix = nixFlakes;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0341fd97bc0b..bbd9acd37ee7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12249,7 +12249,8 @@ in
 
   hwloc = callPackage ../development/libraries/hwloc {};
 
-  hydra = callPackage ../development/tools/misc/hydra { };
+  inherit (callPackage ../development/tools/misc/hydra { })
+    hydra-migration hydra-unstable hydra-flakes;
 
   hydra-cli = callPackage ../development/tools/misc/hydra-cli { };
 

From 7a7d7b1215201259bfbc57972cdef4b950deea47 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 28 Mar 2020 23:32:33 +0100
Subject: [PATCH 4309/4636] findomain: 1.4.2 -> 1.4.5

---
 pkgs/tools/networking/findomain/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix
index c78a6ad55267..d5e801a6f920 100644
--- a/pkgs/tools/networking/findomain/default.nix
+++ b/pkgs/tools/networking/findomain/default.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "findomain";
-  version = "1.4.2";
+  version = "1.4.5";
 
   src = fetchFromGitHub {
     owner = "Edu4rdSHL";
     repo = pname;
     rev = version;
-    sha256 = "0c6jjr1343lqwggvpxdhbjyi1far4f7f3yzq1y0nj1j952j7a36x";
+    sha256 = "1p4ddyqg1v27hf19n1ksmfvj5s6z2c8i13syb0anhlyzqy576hwb";
   };
 
-  cargoSha256 = "1cyfxfhbc2xhavnkhva1xdcw8vy9i5pqhfbiwn6idpfy6hm1w0bx";
+  cargoSha256 = "0mdcj4almwziq1ph3imfdx41a96xq19sbjm7wsm9lxlzhvv256br";
 
   nativeBuildInputs = [ installShellFiles perl ];
   buildInputs = lib.optional stdenv.isDarwin Security;

From f8ccef5edb3ffb02dc4d2ed46b3428aef0847f76 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 28 Mar 2020 18:37:24 -0400
Subject: [PATCH 4310/4636] riot-desktop: fix StartupWMClass

It seems the quoting breaks it just like in da587daae5feae652cd7ee6e8799ccd5021561a3

(cherry picked from commit e50bb280cbf5339ed671b0a7208e6aba4002c713)
---
 .../networking/instant-messengers/riot/riot-desktop.nix         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
index 87342115e1e4..8218e0de9deb 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
@@ -70,7 +70,7 @@ in mkYarnPackage rec {
     comment = meta.description;
     categories = "Network;InstantMessaging;Chat;";
     extraEntries = ''
-      StartupWMClass="riot"
+      StartupWMClass=riot
     '';
   };
 

From d4cbe042ef5cfd763ce712c5e1d21399e19c0f17 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Sat, 28 Mar 2020 15:29:49 +0100
Subject: [PATCH 4311/4636] test-driver.py: use temporary dir for vde1.ctl

Send SIGTERM instead of SIGKILL to vde_switch to give it chance to
delete the directories.
---
 nixos/lib/test-driver/test-driver.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py
index 7825025893d3..744fadb1a4f3 100644
--- a/nixos/lib/test-driver/test-driver.py
+++ b/nixos/lib/test-driver/test-driver.py
@@ -102,10 +102,12 @@ def make_command(args: list) -> str:
 def create_vlan(vlan_nr: str) -> Tuple[str, str, "subprocess.Popen[bytes]", Any]:
     global log
     log.log("starting VDE switch for network {}".format(vlan_nr))
-    vde_socket = os.path.abspath("./vde{}.ctl".format(vlan_nr))
+    vde_socket = tempfile.mkdtemp(
+        prefix="nixos-test-vde-", suffix="-vde{}.ctl".format(vlan_nr)
+    )
     pty_master, pty_slave = pty.openpty()
     vde_process = subprocess.Popen(
-        ["vde_switch", "-s", vde_socket, "--dirmode", "0777"],
+        ["vde_switch", "-s", vde_socket, "--dirmode", "0700"],
         bufsize=1,
         stdin=pty_slave,
         stdout=subprocess.PIPE,
@@ -939,7 +941,7 @@ if __name__ == "__main__":
                 machine.process.kill()
 
             for _, _, process, _ in vde_sockets:
-                process.kill()
+                process.terminate()
         log.close()
 
     tic = time.time()

From de4b549f65ccb491abb8ca80fbe805806db2ae3d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Mar 2020 14:54:31 +0000
Subject: [PATCH 4312/4636] xml2rfc: 2.37.3 -> 2.41.0

---
 pkgs/development/python-modules/xml2rfc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix
index cf4eadd99d89..b2bd5af56c8c 100644
--- a/pkgs/development/python-modules/xml2rfc/default.nix
+++ b/pkgs/development/python-modules/xml2rfc/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "xml2rfc";
-  version = "2.37.3";
+  version = "2.41.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4ae4e99a4b482caac89d8ffd93d16a4510db36907475b1879713a1dc885646ad";
+    sha256 = "0xmhgn62a8a7282yd003zz63mrgyajb6sg29bfyllx3mxmdlb0iz";
   };
 
   propagatedBuildInputs = [
@@ -36,7 +36,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Tool generating IETF RFCs and drafts from XML sources";
-    homepage = https://tools.ietf.org/tools/xml2rfc/trac/;
+    homepage = "https://tools.ietf.org/tools/xml2rfc/trac/";
     # Well, parts might be considered unfree, if being strict; see:
     # http://metadata.ftp-master.debian.org/changelogs/non-free/x/xml2rfc/xml2rfc_2.9.6-1_copyright
     license = licenses.bsd3;

From 596b601dfa8e8412fbc6db7748f6e4fb359a7731 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Sat, 28 Mar 2020 01:49:20 +0000
Subject: [PATCH 4313/4636] plex-mpv-shim: v1.7.12 -> v1.7.14

---
 pkgs/applications/video/plex-mpv-shim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix
index 019d080f9739..df72e200e62a 100644
--- a/pkgs/applications/video/plex-mpv-shim/default.nix
+++ b/pkgs/applications/video/plex-mpv-shim/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonApplication rec {
   pname = "plex-mpv-shim";
-  version = "1.7.12";
+  version = "1.7.14";
 
   src = fetchFromGitHub {
     owner = "iwalton3";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0l13g4vkvcd1q4lkdkbgv4hgkx5pql6ym2fap35581z7rzy9jhkq";
+    sha256 = "1rjifqvs59w2aacfird02myqfd34qadhacj9zpy5xjz25x410zza";
   };
 
   propagatedBuildInputs = [ mpv requests python-mpv-jsonipc ];

From 3c4ab13243b50d851510dc32c3f7e9605d6155bf Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 29 Mar 2020 00:18:44 +0100
Subject: [PATCH 4314/4636] nixos/nginx: fix eval

Fixes a typo introduced in https://github.com/NixOS/nixpkgs/pull/83611
---
 nixos/modules/services/web-servers/nginx/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index fd230a76499b..8d49dc66eb1a 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -176,7 +176,7 @@ let
 
     ${optionalString (cfg.httpConfig != "") ''
     http {
-      ${common.httpConfig}
+      ${commonHttpConfig}
       ${cfg.httpConfig}
     }''}
 

From d5b7f97098a52ebc15769cdb2d55dfbfaa994480 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Mar 2020 00:23:47 +0000
Subject: [PATCH 4315/4636] python27Packages.globus-sdk: 1.8.0 -> 1.9.0

---
 pkgs/development/python-modules/globus-sdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix
index 45ae5fe00ded..348c32174a25 100644
--- a/pkgs/development/python-modules/globus-sdk/default.nix
+++ b/pkgs/development/python-modules/globus-sdk/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "globus-sdk";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ggxa3av4rwva9h5idg1vfdybr7wkajw7g0sn42k04sxxa0cigwz";
+    sha256 = "1fm0iqfbzd13m1lkd4h3ss4y9isp5cadd2w2k0qr3yqwfmrqqba2";
   };
 
   checkPhase = ''

From a15897c0cd5990f92da00c6dd3f5b9fb8ae948bf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Mar 2020 02:58:28 +0000
Subject: [PATCH 4316/4636] python27Packages.qdarkstyle: 2.8 -> 2.8.1

---
 pkgs/development/python-modules/qdarkstyle/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/qdarkstyle/default.nix b/pkgs/development/python-modules/qdarkstyle/default.nix
index a1893c88e0e0..6b9b94b603f4 100644
--- a/pkgs/development/python-modules/qdarkstyle/default.nix
+++ b/pkgs/development/python-modules/qdarkstyle/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "qdarkstyle";
-  version = "2.8";
+  version = "2.8.1";
 
   src = fetchPypi {
     inherit version;
     pname = "QDarkStyle";
-    sha256 = "6a967c4b664446f8bed9df12d1032cf68cb54f186bfc9cbfdbbc756bf9a5d475";
+    sha256 = "0883vzg35fzpyl1aiijzpfcdfvpq5vi325w0m7xkx7nxplh02fym";
   };
 
   # No tests available
@@ -22,7 +22,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "A dark stylesheet for Python and Qt applications";
-    homepage = https://github.com/ColinDuquesnoy/QDarkStyleSheet;
+    homepage = "https://github.com/ColinDuquesnoy/QDarkStyleSheet";
     license = licenses.mit;
     maintainers = with maintainers; [ nyanloutre ];
   };

From df2984dbf9afab610c65a3ee4c4975d2a536260a Mon Sep 17 00:00:00 2001
From: Elyhaka <57923898+Elyhaka@users.noreply.github.com>
Date: Sun, 29 Mar 2020 00:15:41 +0100
Subject: [PATCH 4317/4636] wofi: fix hash mismatch between fetchurl and
 fetchpatch

---
 pkgs/applications/misc/wofi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix
index 3c14219b141d..76cd044c6298 100644
--- a/pkgs/applications/misc/wofi/default.nix
+++ b/pkgs/applications/misc/wofi/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   patches = [
     (fetchpatch {
       url = "https://paste.sr.ht/blob/1cbddafac3806afb203940c029e78ce8390d8f49";
-      sha256 = "18960y9ajilrwwl6mjnrh6wj0sm4ivczmacck36p2dj9xd0n8vkh";
+      sha256 = "1n4jpmh66p7asjhj0z2s94ny91lmaq4hhh2356nj406vlqr15vbb";
     })
   ];
 

From c2600f042421cc7ab40305e057d266e0cab23b08 Mon Sep 17 00:00:00 2001
From: Elyhaka <57923898+Elyhaka@users.noreply.github.com>
Date: Sun, 29 Mar 2020 00:17:32 +0100
Subject: [PATCH 4318/4636] wofi: changed maintainer after @erictapen request

---
 pkgs/applications/misc/wofi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix
index 76cd044c6298..37b991e6d476 100644
--- a/pkgs/applications/misc/wofi/default.nix
+++ b/pkgs/applications/misc/wofi/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     description = "A launcher/menu program for wlroots based wayland compositors such as sway";
     homepage = "https://hg.sr.ht/~scoopta/wofi";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ erictapen ];
+    maintainers = with maintainers; [ elyhaka ];
     platforms = with platforms; linux;
   };
 }

From 2ae5cf317f621265e6706f2764114d13d721ebfd Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 29 Mar 2020 09:32:01 +1000
Subject: [PATCH 4319/4636] Revert "gitAndTools.gh: fix build on darwin"

This reverts commit a51275f3b5f82fe3e45ff4536ee2994c9fc4029a.

Not needed now that Security is propagated via go in https://github.com/NixOS/nixpkgs/commit/0bba7474b3e6c8cef36960614446447d38ec04c9
---
 .../version-management/git-and-tools/default.nix             | 4 +---
 .../version-management/git-and-tools/gh/default.nix          | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index a4b3ac1a65aa..8df8d96e6411 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -30,9 +30,7 @@ let
 
   diff-so-fancy = callPackage ./diff-so-fancy { };
 
-  gh = callPackage ./gh {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  gh = callPackage ./gh { };
 
   ghq = callPackage ./ghq { };
 
diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix
index e655813d3403..e74bd78fc59b 100644
--- a/pkgs/applications/version-management/git-and-tools/gh/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildGoModule, installShellFiles, Security }:
+{ lib, fetchFromGitHub, buildGoModule, installShellFiles }:
 
 buildGoModule rec {
   pname = "gh";
@@ -20,7 +20,6 @@ buildGoModule rec {
   subPackages = [ "cmd/gh" ];
 
   nativeBuildInputs = [ installShellFiles ];
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
   postInstall = ''
     for shell in bash fish zsh; do
       $out/bin/gh completion -s $shell > gh.$shell
@@ -28,7 +27,7 @@ buildGoModule rec {
     done
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GitHub CLI tool";
     homepage = "https://cli.github.com/";
     license = licenses.mit;

From dc88e94ff1f4bf74759ed49c14cc0bae2e160c34 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 29 Mar 2020 00:50:16 +0100
Subject: [PATCH 4320/4636] hydra-unstable: Fix eval with allowAliases = false

* Catalyst::Plugin::Unicode::Encoding has been merged into Catalyst::Runtime
* Test::More is apparently part of Perl core modules since 5.6.2
---
 pkgs/development/tools/misc/hydra/common.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix
index 7310ee949721..983f144efb66 100644
--- a/pkgs/development/tools/misc/hydra/common.nix
+++ b/pkgs/development/tools/misc/hydra/common.nix
@@ -28,7 +28,7 @@ let
         CatalystPluginSessionStateCookie
         CatalystPluginSessionStoreFastMmap
         CatalystPluginStackTrace
-        CatalystPluginUnicodeEncoding
+        CatalystRuntime
         CatalystTraitForRequestProxyBase
         CatalystViewDownload
         CatalystViewJSON
@@ -61,7 +61,6 @@ let
         Starman
         SysHostnameLong
         TermSizeAny
-        TestMore
         TextDiff
         TextTable
         XMLSimple

From 2e4a45c92171ad1712dcdcebffcd178f794c7d7f Mon Sep 17 00:00:00 2001
From: David Costa <david@zarel.net>
Date: Sun, 29 Mar 2020 00:50:26 +0100
Subject: [PATCH 4321/4636] nixos/network-interfaces: fix examples types

make literalExample receive string arguments.
Fix nixos/nixos-homepage#255
---
 nixos/modules/tasks/network-interfaces.nix | 126 +++++++++++----------
 1 file changed, 69 insertions(+), 57 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 9542a60beeed..63a79abd4eb3 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -634,19 +634,23 @@ in
 
     networking.bonds =
       let
-        driverOptionsExample = {
-          miimon = "100";
-          mode = "active-backup";
-        };
+        driverOptionsExample =  ''
+          {
+            miimon = "100";
+            mode = "active-backup";
+          }
+        '';
       in mkOption {
         default = { };
-        example = literalExample {
-          bond0 = {
-            interfaces = [ "eth0" "wlan0" ];
-            driverOptions = driverOptionsExample;
-          };
-          anotherBond.interfaces = [ "enp4s0f0" "enp4s0f1" "enp5s0f0" "enp5s0f1" ];
-        };
+        example = literalExample ''
+          {
+            bond0 = {
+              interfaces = [ "eth0" "wlan0" ];
+              driverOptions = ${driverOptionsExample};
+            };
+            anotherBond.interfaces = [ "enp4s0f0" "enp4s0f1" "enp5s0f0" "enp5s0f1" ];
+          }
+        '';
         description = ''
           This option allows you to define bond devices that aggregate multiple,
           underlying networking interfaces together. The value of this option is
@@ -731,12 +735,14 @@ in
 
     networking.macvlans = mkOption {
       default = { };
-      example = literalExample {
-        wan = {
-          interface = "enp2s0";
-          mode = "vepa";
-        };
-      };
+      example = literalExample ''
+        {
+          wan = {
+            interface = "enp2s0";
+            mode = "vepa";
+          };
+        }
+      '';
       description = ''
         This option allows you to define macvlan interfaces which should
         be automatically created.
@@ -764,18 +770,20 @@ in
 
     networking.sits = mkOption {
       default = { };
-      example = literalExample {
-        hurricane = {
-          remote = "10.0.0.1";
-          local = "10.0.0.22";
-          ttl = 255;
-        };
-        msipv6 = {
-          remote = "192.168.0.1";
-          dev = "enp3s0";
-          ttl = 127;
-        };
-      };
+      example = literalExample ''
+        {
+          hurricane = {
+            remote = "10.0.0.1";
+            local = "10.0.0.22";
+            ttl = 255;
+          };
+          msipv6 = {
+            remote = "192.168.0.1";
+            dev = "enp3s0";
+            ttl = 127;
+          };
+        }
+      '';
       description = ''
         This option allows you to define 6-to-4 interfaces which should be automatically created.
       '';
@@ -826,16 +834,18 @@ in
 
     networking.vlans = mkOption {
       default = { };
-      example = literalExample {
-        vlan0 = {
-          id = 3;
-          interface = "enp3s0";
-        };
-        vlan1 = {
-          id = 1;
-          interface = "wlan0";
-        };
-      };
+      example = literalExample ''
+        {
+          vlan0 = {
+            id = 3;
+            interface = "enp3s0";
+          };
+          vlan1 = {
+            id = 1;
+            interface = "wlan0";
+          };
+        }
+      '';
       description =
         ''
           This option allows you to define vlan devices that tag packets
@@ -868,24 +878,26 @@ in
 
     networking.wlanInterfaces = mkOption {
       default = { };
-      example = literalExample {
-        wlan-station0 = {
-            device = "wlp6s0";
-        };
-        wlan-adhoc0 = {
-            type = "ibss";
-            device = "wlp6s0";
-            mac = "02:00:00:00:00:01";
-        };
-        wlan-p2p0 = {
-            device = "wlp6s0";
-            mac = "02:00:00:00:00:02";
-        };
-        wlan-ap0 = {
-            device = "wlp6s0";
-            mac = "02:00:00:00:00:03";
-        };
-      };
+      example = literalExample ''
+        {
+          wlan-station0 = {
+              device = "wlp6s0";
+          };
+          wlan-adhoc0 = {
+              type = "ibss";
+              device = "wlp6s0";
+              mac = "02:00:00:00:00:01";
+          };
+          wlan-p2p0 = {
+              device = "wlp6s0";
+              mac = "02:00:00:00:00:02";
+          };
+          wlan-ap0 = {
+              device = "wlp6s0";
+              mac = "02:00:00:00:00:03";
+          };
+        }
+      '';
       description =
         ''
           Creating multiple WLAN interfaces on top of one physical WLAN device (NIC).

From 2c133fbb4ba6106b20a845037ef4a3453bc3a779 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 29 Mar 2020 01:06:43 +0100
Subject: [PATCH 4322/4636] nixos/tests/mongodb: also test mongodb-3_4

---
 nixos/tests/mongodb.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix
index ee7fc50f7ecc..a637ec4bfc00 100644
--- a/nixos/tests/mongodb.nix
+++ b/nixos/tests/mongodb.nix
@@ -33,7 +33,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
     nodes = {
       node = {...}: {
         environment.systemPackages = with pkgs; [
-#          mongodb-3_4
+          mongodb-3_4
           mongodb-3_6
           mongodb-4_0
         ];
@@ -43,7 +43,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
     testScript = ''
       node.start()
     ''
-#      + runMongoDBTest pkgs.mongodb-3_4
+      + runMongoDBTest pkgs.mongodb-3_4
       + runMongoDBTest pkgs.mongodb-3_6 
       + runMongoDBTest pkgs.mongodb-4_0
       + ''

From 9aba9a3e74196ad9342396c4f0464dfb2dd4fcbf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2020 00:34:11 +0000
Subject: [PATCH 4323/4636] ameba: 0.11.0 -> 0.12.0

---
 pkgs/development/tools/ameba/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/development/tools/ameba/default.nix
index 5ac6c5afa913..2f3ebcbed0a6 100644
--- a/pkgs/development/tools/ameba/default.nix
+++ b/pkgs/development/tools/ameba/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ameba";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner  = "crystal-ameba";
     repo   = "ameba";
     rev    = "v${version}";
-    sha256 = "0zjv59f555q2w8ahrvmpdzasrifwjgr0mk6rly9yss4ab3rj8cy2";
+    sha256 = "0g68yijbm2j4ig536fwq49d1z7x2iv9kp4g3gjklf5zn1sbqhm12";
   };
 
   nativeBuildInputs = [ crystal shards ];
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A static code analysis tool for Crystal";
-    homepage = https://crystal-ameba.github.io;
+    homepage = "https://crystal-ameba.github.io";
     license = licenses.mit;
     maintainers = with maintainers; [ kimburgess ];
   };

From 4c931a821703b5fbfdbca931dbaa28390efc7070 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sat, 28 Mar 2020 21:48:56 -0400
Subject: [PATCH 4324/4636] higan: fix darwin build

---
 pkgs/misc/emulators/higan/default.nix | 51 +++++++++++++++++++--------
 pkgs/top-level/all-packages.nix       |  1 +
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix
index c1e64d26b476..63a7e1c43db3 100644
--- a/pkgs/misc/emulators/higan/default.nix
+++ b/pkgs/misc/emulators/higan/default.nix
@@ -1,8 +1,9 @@
 { stdenv, fetchurl
-, p7zip, pkgconfig
+, p7zip, pkgconfig, libicns
 , libX11, libXv
 , udev
 , libGLU, libGL, SDL
+, Carbon, Cocoa, OpenGL, OpenAL
 , libao, openal, libpulseaudio
 , gtk2, gtksourceview
 , runtimeShell }:
@@ -21,11 +22,24 @@ stdenv.mkDerivation rec {
   };
 
   patches = [ ./0001-change-flags.diff ];
-  postPatch = "sed '1i#include <cmath>' -i higan/fc/ppu/ppu.cpp";
+  postPatch = ''
+    sed '1i#include <cmath>' -i higan/fc/ppu/ppu.cpp
+
+    for file in icarus/GNUmakefile higan/target-tomoko/GNUmakefile; do
+      substituteInPlace "$file" \
+        --replace 'sips -s format icns data/$(name).png --out out/$(name).app/Contents/Resources/$(name).icns' \
+                  'png2icns out/$(name).app/Contents/Resources/$(name).icns data/$(name).png'
+    done
+  '';
+
+  nativeBuildInputs = [ p7zip pkgconfig ]
+    ++ optional stdenv.isDarwin [ libicns ];
 
   buildInputs =
-  [ p7zip pkgconfig libX11 libXv udev libGLU libGL
-    SDL libao openal libpulseaudio gtk2 gtksourceview ];
+    [ SDL libao ]
+    ++ optionals stdenv.isLinux [ openal libpulseaudio udev libX11 libXv libGLU libGL gtk2 gtksourceview ]
+    ++ optionals stdenv.isDarwin [ Carbon Cocoa OpenGL OpenAL ]
+    ;
 
   unpackPhase = ''
     7z x $src
@@ -38,27 +52,36 @@ stdenv.mkDerivation rec {
   '';
 
   # Now the cheats file will be distributed separately
-  installPhase = ''
-    install -dm 755 $out/bin $out/share/applications $out/share/higan $out/share/pixmaps
-    install -m 755 icarus/out/icarus $out/bin/
-    install -m 755 higan/out/higan $out/bin/
-    install -m 644 higan/data/higan.desktop $out/share/applications/
-    install -m 644 higan/data/higan.png $out/share/pixmaps/higan-icon.png
-    install -m 644 higan/resource/logo/higan.png $out/share/pixmaps/higan-logo.png
+  installPhase = (if !stdenv.isDarwin then ''
+    mkdir -p "$out"/bin "$out"/share/applications "$out"/share/pixmaps
+    install -m 755 icarus/out/icarus "$out"/bin/
+    install -m 755 higan/out/higan "$out"/bin/
+    install -m 644 higan/data/higan.desktop "$out"/share/applications/
+    install -m 644 higan/data/higan.png "$out"/share/pixmaps/higan-icon.png
+    install -m 644 higan/resource/logo/higan.png "$out"/share/pixmaps/higan-logo.png
+  '' else ''
+    mkdir "$out"
+    mv higan/out/higan.app "$out"/
+    mv icarus/out/icarus.app "$out"/
+  '') + ''
+    mkdir -p  "$out"/share/higan
     cp --recursive --no-dereference --preserve='links' --no-preserve='ownership' \
-      higan/systems/* $out/share/higan/
+      higan/systems/* "$out"/share/higan/
   '';
 
-  fixupPhase = ''
+  fixupPhase = let
+    dest = if !stdenv.isDarwin then "\\$HOME/.local/share/higan" else "\\$HOME/Library/Application Support/higan";
+  in ''
     # A dirty workaround, suggested by @cpages:
     # we create a first-run script to populate
     # the local $HOME with all the auxiliary
     # stuff needed by higan at runtime
 
+    mkdir -p "$out"/bin
     cat <<EOF > $out/bin/higan-init.sh
     #!${runtimeShell}
 
-    cp --recursive --update $out/share/higan/*.sys \$HOME/.local/share/higan/
+    cp --recursive --update $out/share/higan/*.sys "${dest}"/
 
     EOF
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e469380abbd..0da667c85ef1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26305,6 +26305,7 @@ in
 
   higan = callPackage ../misc/emulators/higan {
     inherit (gnome2) gtksourceview;
+    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL OpenAL;
   };
 
   bullet = callPackage ../development/libraries/bullet {

From 4c36e14386b2019371b2eb3075730ee0b0e81365 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2020 02:18:40 +0000
Subject: [PATCH 4325/4636] drawio: 12.6.5 -> 12.9.3

---
 pkgs/applications/graphics/drawio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix
index 2a7efea52713..dcf162771799 100644
--- a/pkgs/applications/graphics/drawio/default.nix
+++ b/pkgs/applications/graphics/drawio/default.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "drawio";
-  version = "12.6.5";
+  version = "12.9.3";
 
   src = fetchurl {
     url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm";
-    sha256 = "14x4h680q3w9wsdmivy2k1bggb09vdm3a3wrpfwd79dbaagjk4lc";
+    sha256 = "1jhw3p5r9dgn7320ca9n6hzyv2x557a8m9mh80vgrccd6i2mgm5i";
   };
 
   nativeBuildInputs = [
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A desktop application for creating diagrams";
-    homepage = https://about.draw.io/;
+    homepage = "https://about.draw.io/";
     license = licenses.asl20;
     maintainers = with maintainers; [ danieldk ];
     platforms = [ "x86_64-linux" ];

From 0295a51856b9adbbe07ea73ac8f0b884f80d5912 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2020 06:58:28 +0000
Subject: [PATCH 4326/4636] pdfsam-basic: 4.1.1 -> 4.1.2

---
 pkgs/applications/misc/pdfsam-basic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix
index d82f8e1664bb..abf49f936845 100644
--- a/pkgs/applications/misc/pdfsam-basic/default.nix
+++ b/pkgs/applications/misc/pdfsam-basic/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "pdfsam-basic";
-  version = "4.1.1";
+  version = "4.1.2";
 
   src = fetchurl {
     url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
-    sha256 = "17qb3l7xibhb3fbskddvparrj2cxj4kz9qbril094kxrgbvyc9gs";
+    sha256 = "1k1azxz92vkb4hylk4ki0szfn47ids0lwg01zfs54yc89j0c6142";
   };
 
   unpackPhase = ''

From 301585178889002413a3afc239c07717deaa4259 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2020 07:27:43 +0000
Subject: [PATCH 4327/4636] pspg: 2.6.6 -> 2.7.1

---
 pkgs/tools/misc/pspg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix
index 4cf98ef8b485..1bd2fc259eea 100644
--- a/pkgs/tools/misc/pspg/default.nix
+++ b/pkgs/tools/misc/pspg/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pspg";
-  version = "2.6.6";
+  version = "2.7.1";
 
   src = fetchFromGitHub {
     owner = "okbob";
     repo = pname;
     rev = version;
-    sha256 = "0l20ysr61y99zxvm8cqsgj7arv4m7h7gqq8lrq65bmh9fxncfpsd";
+    sha256 = "1fq8n5naicfv0lsyzfb52c84w40zrsks0x9rrvyyzih4vkhic4vm";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 24ee2e8dc0e8a26b3836fbea214b68433ea48796 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Sat, 28 Mar 2020 20:15:51 +0100
Subject: [PATCH 4328/4636] nixos/nextcloud: add bcmap, mp4 and webm in nginx
 configuration

This is used by the `firstrunwizard` and has been added in the nginx
configuration documentation of the latest
manual (https://github.com/nextcloud/documentation/blob/cda627b7c8896f3bac8bfde420c0c8b5d1806190/admin_manual/installation/nginx.rst).
---
 nixos/modules/services/web-apps/nextcloud.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 087bd0e5df3e..1069b71f74ce 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -565,7 +565,7 @@ in {
                 add_header Referrer-Policy no-referrer;
                 access_log off;
               '';
-              "~ \\.(?:png|html|ttf|ico|jpg|jpeg)$".extraConfig = ''
+              "~ \\.(?:png|html|ttf|ico|jpg|jpeg|bcmap|mp4|webm)$".extraConfig = ''
                 try_files $uri /index.php$request_uri;
                 access_log off;
               '';

From 99f39d0bc4333442f92967fa72b8964d3233a325 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2020 07:35:11 +0000
Subject: [PATCH 4329/4636] qmapshack: 1.14.0 -> 1.14.1

---
 pkgs/applications/misc/qmapshack/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix
index 21fbbf3253f7..a3238f7cba47 100644
--- a/pkgs/applications/misc/qmapshack/default.nix
+++ b/pkgs/applications/misc/qmapshack/default.nix
@@ -3,13 +3,13 @@
 
 mkDerivation rec {
   pname = "qmapshack";
-  version = "1.14.0";
+  version = "1.14.1";
 
   src = fetchFromGitHub {
     owner = "Maproom";
     repo = pname;
     rev = "V_${version}";
-    sha256 = "07c2hrq9sn456w7l3gdr599rmjfv2k6mh159zza7p1py8r7ywksa";
+    sha256 = "0hghynb4ac98fg1pwc645zriqkghxwp8mr3jhr87pa6fh0y848py";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -30,7 +30,7 @@ mkDerivation rec {
   ];
 
   meta = with lib; {
-    homepage = https://github.com/Maproom/qmapshack;
+    homepage = "https://github.com/Maproom/qmapshack";
     description = "Consumer grade GIS software";
     license = licenses.gpl3;
     maintainers = with maintainers; [ dotlambda sikmir ];

From 0ebeec9183b9d043a05e9816708b22c92284c0b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sun, 29 Mar 2020 09:39:31 +0200
Subject: [PATCH 4330/4636] exiv2: name the patch as usual

That allows automatic detection of CVEs being fixed (e.g. by vulnix)
---
 pkgs/development/libraries/exiv2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index d92f7ffc4fde..819f94cc44f5 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
-    # CVE-2019-20421
     # included in next release
     (fetchpatch {
+      name = "cve-2019-20421.patch";
       url = "https://github.com/Exiv2/exiv2/commit/a82098f4f90cd86297131b5663c3dec6a34470e8.patch";
       sha256 = "16r19qb9l5j43ixm5jqid9sdv5brlkk1wq0w79rm5agxq4kblfyc";
       excludes = [ "tests/bugfixes/github/test_issue_1011.py" "test/data/Jp2Image_readMetadata_loop.poc" ];

From d22373b2b14b44e52858f2fa360f4f3974a3c67c Mon Sep 17 00:00:00 2001
From: Rouven Czerwinski <rouven@czerwinskis.de>
Date: Sun, 29 Mar 2020 10:56:34 +0200
Subject: [PATCH 4331/4636] nixos/systemd: remove one DefaultBlockIOAccounting

DefaultBlockIOAccounting=yes is set twice in the same file, remove one
copy.
---
 nixos/modules/system/boot/systemd.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index cdc9d2379392..7f207e6c7ef4 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -842,7 +842,6 @@ in
         [Manager]
         ${optionalString config.systemd.enableCgroupAccounting ''
           DefaultCPUAccounting=yes
-          DefaultBlockIOAccounting=yes
           DefaultIOAccounting=yes
           DefaultBlockIOAccounting=yes
           DefaultIPAccounting=yes

From 0c86ab140649e949264b4d89a3adfb7b51d208ab Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 29 Mar 2020 04:20:00 -0500
Subject: [PATCH 4332/4636] pgformatter: 4.2 -> 4.3

Changelog: https://github.com/darold/pgFormatter/releases/tag/v4.3
---
 pkgs/development/tools/pgformatter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/pgformatter/default.nix b/pkgs/development/tools/pgformatter/default.nix
index 87bf826f5c58..c1cb8cea8a65 100644
--- a/pkgs/development/tools/pgformatter/default.nix
+++ b/pkgs/development/tools/pgformatter/default.nix
@@ -2,13 +2,13 @@
 
 perlPackages.buildPerlPackage rec {
   pname = "pgformatter";
-  version = "4.2";
+  version = "4.3";
 
   src = fetchFromGitHub {
     owner = "darold";
     repo = "pgFormatter";
     rev = "v${version}";
-    sha256 = "1fqhbs7q3nxda7acbcx8dyjh99d0mv485dpmiczxia7cy1xqi63g";
+    sha256 = "0n8ydj01nmnkd8glzjb0yrsyax1pmdfvaxb5xj4pkb2mf6zm94qy";
   };
 
   outputs = [ "out" ];

From 0dccdd61899b9e629cddcb348324e0d990937f69 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 29 Mar 2020 04:20:00 -0500
Subject: [PATCH 4333/4636] fluent-bit: 1.4.0 -> 1.4.1

Release notes: https://fluentbit.io/announcements/v1.4.1/
---
 pkgs/tools/misc/fluent-bit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix
index 57909debf79a..0933e6eae900 100644
--- a/pkgs/tools/misc/fluent-bit/default.nix
+++ b/pkgs/tools/misc/fluent-bit/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fluent-bit";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     rev = "v${version}";
-    sha256 = "07p0cy4y2x45kgimg7rjjk9zknmnnsfxdy2vlz6dzaxrslv6c3x6";
+    sha256 = "1xfbghaylzsh48ag4aw77nmzm1cds4nx53m4s1fiy0r31sm8vqwl";
   };
 
   nativeBuildInputs = [ cmake flex bison ];

From ac831ca88aba34d87de7695b7e9c8b1481db694b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2020 09:25:02 +0000
Subject: [PATCH 4334/4636] utf8proc: 2.4.0 -> 2.5.0

---
 pkgs/development/libraries/utf8proc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix
index 91bf7e393784..13a9855b62e2 100644
--- a/pkgs/development/libraries/utf8proc/default.nix
+++ b/pkgs/development/libraries/utf8proc/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "utf8proc";
-  version = "2.4.0";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "JuliaStrings";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1i42hqwc8znqii9brangwkxk5cyc2lk95ip405fg88zr7z2ncr34";
+    sha256 = "1xlkazhdnja4lksn5c9nf4bln5gjqa35a8gwlam5r0728w0h83qq";
   };
 
   makeFlags = [ "prefix=$(out)" ];

From 30dc2309970c5aec7bde9093570137560502940c Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 29 Mar 2020 10:22:55 +0000
Subject: [PATCH 4335/4636] avldrums-lv2: alias to x42-avldrums (#83665)

Fixes #83649
---
 .../audio/avldrums-lv2/default.nix            | 29 -------------------
 .../audio/x42-avldrums/default.nix            |  2 +-
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 --
 4 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/applications/audio/avldrums-lv2/default.nix

diff --git a/pkgs/applications/audio/avldrums-lv2/default.nix b/pkgs/applications/audio/avldrums-lv2/default.nix
deleted file mode 100644
index d71718c32a82..000000000000
--- a/pkgs/applications/audio/avldrums-lv2/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchFromGitHub, pkgconfig, pango, cairo, libGLU, lv2 }:
-
-stdenv.mkDerivation rec {
-  pname = "avldrums.lv2";
-  version = "0.4.0";
-
-  src = fetchFromGitHub {
-    owner = "x42";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "1z70rcq6z3gkb4fm8dm9hs31bslwr97zdh2n012fzki9b9rdj5qv";
-    fetchSubmodules = true;
-  };
-
-  installFlags = [ "PREFIX=$(out)" ];
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    pango cairo libGLU lv2
-  ];
-
-  meta = with stdenv.lib; {
-    description = "Dedicated AVLDrumkits LV2 Plugin";
-    homepage    = http://x42-plugins.com/x42/x42-avldrums;
-    license     = licenses.gpl2;
-    maintainers = [ maintainers.magnetophon ];
-    platforms   = [ "i686-linux" "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/applications/audio/x42-avldrums/default.nix b/pkgs/applications/audio/x42-avldrums/default.nix
index 5de51e23d731..b34062672f9a 100644
--- a/pkgs/applications/audio/x42-avldrums/default.nix
+++ b/pkgs/applications/audio/x42-avldrums/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Drum sample player LV2 plugin dedicated to Glen MacArthur's AVLdrums";
     homepage = https://x42-plugins.com/x42/x42-avldrums;
-    maintainers = with maintainers; [ orivej ];
+    maintainers = with maintainers; [ magnetophon orivej ];
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c81a51ae4dad..88e7d4d9e844 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -46,6 +46,7 @@ mapAliases ({
   asciidocFull = asciidoc-full;  # added 2014-06-22
   at_spi2_atk = at-spi2-atk; # added 2018-02-25
   at_spi2_core = at-spi2-core; # added 2018-02-25
+  avldrums-lv2 = x42-avldrums; # added 2020-03-29
   bar-xft = lemonbar-xft;  # added 2015-01-16
   bashCompletion = bash-completion; # Added 2016-09-28
   batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab765f45d8fb..8d6eb691acd0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -718,8 +718,6 @@ in
 
   avfs = callPackage ../tools/filesystems/avfs { };
 
-  avldrums-lv2 = callPackage ../applications/audio/avldrums-lv2 { };
-
   aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator {};
 
   awscli = callPackage ../tools/admin/awscli { };

From 036abcf58d1655d46a3f8a4209b9821754bbc1c4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 29 Mar 2020 09:41:09 +0200
Subject: [PATCH 4336/4636] pythonPackages.py2to3: fix pname

Applying parseDrvName results in incorrect name and version otherwise.
https://github.com/NixOS/nixos-homepage/issues/306#issuecomment-531187598
---
 pkgs/development/python-modules/3to2/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/3to2/default.nix b/pkgs/development/python-modules/3to2/default.nix
index 4e6c0f9214c2..123cf3f4741a 100644
--- a/pkgs/development/python-modules/3to2/default.nix
+++ b/pkgs/development/python-modules/3to2/default.nix
@@ -5,11 +5,12 @@
 }:
 
 buildPythonPackage rec {
-  pname = "3to2";
+  pname = "py3to2";
   version = "1.1.1";
 
   src = fetchPypi {
-    inherit pname version;
+    inherit version;
+    pname = "3to2";
     extension = "zip";
     sha256 = "fef50b2b881ef743f269946e1090b77567b71bb9a9ce64b7f8e699b562ff685c";
   };

From 9fc47b38495b786aeb0307646a8a424b7ecbf645 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2020 10:58:40 +0000
Subject: [PATCH 4337/4636] bdf2psf: 1.194 -> 1.195

---
 pkgs/tools/misc/bdf2psf/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix
index 07bc5de371f3..a29098268f98 100644
--- a/pkgs/tools/misc/bdf2psf/default.nix
+++ b/pkgs/tools/misc/bdf2psf/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bdf2psf";
-  version = "1.194";
+  version = "1.195";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
-    sha256 = "10c0rbhqscizfa063m6mms31i0knh25bxr35s008b6mp5pxr33mc";
+    sha256 = "04dsxp6vcy9z9gh41bq970wvdnhkmbdlizsy0dyhsl5axm5i84xz";
   };
 
   nativeBuildInputs = [ dpkg ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "BDF to PSF converter";
-    homepage = https://packages.debian.org/sid/bdf2psf;
+    homepage = "https://packages.debian.org/sid/bdf2psf";
     longDescription = ''
       Font converter to generate console fonts from BDF source fonts
     '';

From 782b304dba903ca82763b152e0727187628a32b0 Mon Sep 17 00:00:00 2001
From: Peter Kolloch <info@eigenvalue.net>
Date: Sat, 28 Mar 2020 15:23:12 +0100
Subject: [PATCH 4338/4636] buildRustCrate: Add tests for checking files in
 outputs.

...and remove superfluous dependency files (*.d).
...and copy dSYM directories on Mac OS when in release=false mode.
---
 .../rust/build-rust-crate/install-crate.nix   |   4 +-
 .../rust/build-rust-crate/lib.sh              |   2 -
 .../rust/build-rust-crate/test/default.nix    | 138 +++++++++++++++++-
 3 files changed, 134 insertions(+), 10 deletions(-)

diff --git a/pkgs/build-support/rust/build-rust-crate/install-crate.nix b/pkgs/build-support/rust/build-rust-crate/install-crate.nix
index 5ba7b69bedc5..f4a4dcdb0d94 100644
--- a/pkgs/build-support/rust/build-rust-crate/install-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate/install-crate.nix
@@ -14,7 +14,7 @@ if !buildTests then ''
   fi
   if [[ "$(ls -A target/lib)" ]]; then
     mkdir -p $lib/lib
-    cp target/lib/* $lib/lib #*/
+    cp -r target/lib/* $lib/lib #*/
     for library in $lib/lib/*.so $lib/lib/*.dylib; do #*/
       ln -s $library $(echo $library | sed -e "s/-${metadata}//")
     done
@@ -26,7 +26,7 @@ if !buildTests then ''
   if [[ -d target/bin ]]; then
     if [[ "$(ls -A target/bin)" ]]; then
       mkdir -p $out/bin
-      cp -P target/bin/* $out/bin # */
+      cp -rP target/bin/* $out/bin # */
     fi
   fi
   runHook postInstall
diff --git a/pkgs/build-support/rust/build-rust-crate/lib.sh b/pkgs/build-support/rust/build-rust-crate/lib.sh
index 6cf3481754b2..3bf1992cecd8 100644
--- a/pkgs/build-support/rust/build-rust-crate/lib.sh
+++ b/pkgs/build-support/rust/build-rust-crate/lib.sh
@@ -14,7 +14,6 @@ build_lib() {
     --crate-name $CRATE_NAME \
     $lib_src \
     --out-dir target/lib \
-    --emit=dep-info,link \
     -L dependency=target/deps \
     --cap-lints allow \
     $LIB_RUSTC_OPTS \
@@ -45,7 +44,6 @@ build_bin() {
     --crate-type bin \
     $BIN_RUSTC_OPTS \
     --out-dir target/bin \
-    --emit=dep-info,link \
     -L dependency=target/deps \
     $LINK \
     $EXTRA_LIB \
diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix
index 598b5daed1be..fba938f62372 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix
@@ -1,13 +1,14 @@
 { lib
-, stdenv
 , buildRustCrate
-, runCommand
-, runCommandCC
-, writeTextFile
-, symlinkJoin
 , callPackage
 , releaseTools
+, runCommand
+, runCommandCC
+, stdenv
+, symlinkJoin
+, writeTextFile
 }:
+
 let
   mkCrate = args: let
     p = {
@@ -103,6 +104,58 @@ let
         ''
       );
 
+    /* Returns a derivation that asserts that the crate specified by `crateArgs`
+       has the specified files as output.
+
+       `name` is used as part of the derivation name that performs the checking.
+
+       `crateArgs` is passed to `mkCrate` to build the crate with `buildRustCrate`.
+
+       `expectedFiles` contains a list of expected file paths in the output. E.g.
+       `[ "./bin/my_binary" ]`.
+
+       `output` specifies the name of the output to use. By default, the default
+       output is used but e.g. `output = "lib";` will cause the lib output
+       to be checked instead. You do not need to specify any directories.
+     */
+    assertOutputs = { name, crateArgs, expectedFiles, output? null }:
+      assert (builtins.isString name);
+      assert (builtins.isAttrs crateArgs);
+      assert (builtins.isList expectedFiles);
+
+      let
+        crate = mkCrate (builtins.removeAttrs crateArgs ["expectedTestOutput"]);
+        crateOutput = if output == null then crate else crate."${output}";
+        expectedFilesFile = writeTextFile {
+          name = "expected-files-${name}";
+          text =
+            let sorted = builtins.sort (a: b: a<b) expectedFiles;
+                concatenated = builtins.concatStringsSep "\n" sorted;
+            in "${concatenated}\n";
+        };
+      in
+      runCommand "assert-outputs-${name}" {
+      } ''
+      local actualFiles=$(mktemp)
+
+      cd "${crateOutput}"
+      find . -type f | sort >$actualFiles
+      diff -q ${expectedFilesFile} $actualFiles >/dev/null || {
+        echo -e "\033[0;1;31mERROR: Difference in expected output files in ${crateOutput} \033[0m" >&2
+        echo === Got:
+        sed -e 's/^/  /' $actualFiles
+        echo === Expected:
+        sed -e 's/^/  /' ${expectedFilesFile}
+        echo === Diff:
+        diff -u ${expectedFilesFile} $actualFiles |\
+          tail -n +3 |\
+          sed -e 's/^/  /'
+        exit 1
+      }
+      touch $out
+      ''
+      ;
+
   in rec {
 
   tests = let
@@ -361,7 +414,80 @@ let
           };
     };
     brotliCrates = (callPackage ./brotli-crates.nix {});
-  in lib.mapAttrs (key: value: mkTest (value // lib.optionalAttrs (!value?crateName) { crateName = key; })) cases // {
+    tests = lib.mapAttrs (key: value: mkTest (value // lib.optionalAttrs (!value?crateName) { crateName = key; })) cases;
+  in tests // rec {
+
+    crateBinWithPathOutputs = assertOutputs {
+      name="crateBinWithPath";
+      crateArgs = {
+        crateBin = [{ name = "test_binary1"; path = "src/foobar.rs"; }];
+        src = mkBin "src/foobar.rs";
+      };
+      expectedFiles = [
+        "./bin/test_binary1"
+      ];
+    };
+
+    crateBinWithPathOutputsDebug = assertOutputs {
+      name="crateBinWithPath";
+      crateArgs = {
+        release = false;
+        crateBin = [{ name = "test_binary1"; path = "src/foobar.rs"; }];
+        src = mkBin "src/foobar.rs";
+      };
+      expectedFiles = [
+        "./bin/test_binary1"
+      ] ++ lib.optionals stdenv.isDarwin [
+        # On Darwin, the debug symbols are in a seperate directory.
+        "./bin/test_binary1.dSYM/Contents/Info.plist"
+        "./bin/test_binary1.dSYM/Contents/Resources/DWARF/test_binary1"
+      ];
+    };
+
+    crateBinNoPath1Outputs = assertOutputs {
+      name="crateBinNoPath1";
+      crateArgs = {
+        crateBin = [{ name = "my-binary2"; }];
+        src = mkBin "src/my_binary2.rs";
+      };
+      expectedFiles = [
+        "./bin/my-binary2"
+      ];
+    };
+
+    crateLibOutputs = assertOutputs {
+      name="crateLib";
+      output="lib";
+      crateArgs = {
+        libName = "test_lib";
+        type = [ "rlib" ];
+        libPath = "src/lib.rs";
+        src = mkLib "src/lib.rs";
+      };
+      expectedFiles = [
+        "./nix-support/propagated-build-inputs"
+        "./lib/libtest_lib-042a1fdbef.rlib"
+        "./lib/link"
+      ];
+    };
+
+    crateLibOutputsDebug = assertOutputs {
+      name="crateLib";
+      output="lib";
+      crateArgs = {
+        release = false;
+        libName = "test_lib";
+        type = [ "rlib" ];
+        libPath = "src/lib.rs";
+        src = mkLib "src/lib.rs";
+      };
+      expectedFiles = [
+        "./nix-support/propagated-build-inputs"
+        "./lib/libtest_lib-042a1fdbef.rlib"
+        "./lib/link"
+      ];
+    };
+
     brotliTest = let
       pkg = brotliCrates.brotli_2_5_0 {};
     in runCommand "run-brotli-test-cmd" {

From 8e70f326b9d4300f45093c05096a7f320ca9ae84 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Sun, 29 Mar 2020 13:15:27 +0200
Subject: [PATCH 4339/4636] ledger-live-desktop: 2.0.1 -> 2.1.0

---
 pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
index 091dda618c75..edc68f9d0c7a 100644
--- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix
+++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
@@ -2,12 +2,12 @@
 
 let
   pname = "ledger-live-desktop";
-  version = "2.0.1";
+  version = "2.1.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
-    sha256 = "0qml32vxm8iikybbsb0mw6mj5rn27splgxhhpqwvk9i2gvg78hlm";
+    sha256 = "1ywvdqmq8asczhmvc6ai2v6di1f5q19x3ygqlinwz8d1hrj3496r";
   };
 
   appimageContents = appimageTools.extractType2 {

From 76d2557df8ae14014d0e600dec4d068bbea10133 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 29 Mar 2020 05:57:57 +0000
Subject: [PATCH 4340/4636] amp: fix strict deps build

---
 pkgs/applications/editors/amp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/amp/default.nix b/pkgs/applications/editors/amp/default.nix
index 625a5d3c0abe..9be6d56ab345 100644
--- a/pkgs/applications/editors/amp/default.nix
+++ b/pkgs/applications/editors/amp/default.nix
@@ -14,8 +14,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "09v991rl2w4c4jh7ga7q1lk6wyl2vr71j5cpniij8mcvszrz78qf";
 
-  nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = [ openssl python3 xorg.libxcb libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin
+  nativeBuildInputs = [ cmake pkgconfig python3 ];
+  buildInputs = [ openssl xorg.libxcb libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin
     (with darwin.apple_sdk.frameworks; [ curl Security AppKit ]);
 
   # Tests need to write to the theme directory in HOME.

From 49787b63b940d3385781af4d28b61b7ae2c98049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 29 Mar 2020 06:02:57 +0000
Subject: [PATCH 4341/4636] cargo-update: fix strict deps build

---
 pkgs/tools/package-management/cargo-update/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/tools/package-management/cargo-update/default.nix
index c0a1e8edc0f4..8dc07d287d2d 100644
--- a/pkgs/tools/package-management/cargo-update/default.nix
+++ b/pkgs/tools/package-management/cargo-update/default.nix
@@ -23,8 +23,8 @@ rustPlatform.buildRustPackage rec {
   cargoPatches = [ ./0001-Generate-lockfile-for-cargo-update-v3.0.0.patch ];
   cargoSha256 = "034v1ql5k3n3rgi3aqszkybvv3vc80v263c9nlwxcwbswsh9jpp1";
 
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ libgit2 libssh2 openssl pkg-config zlib ]
+  nativeBuildInputs = [ cmake pkg-config ];
+  buildInputs = [ libgit2 libssh2 openssl zlib ]
     ++ stdenv.lib.optional stdenv.isDarwin curl;
 
   meta = with stdenv.lib; {

From 22fe76d27db30c0a6017395ef0370d94272da02a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 29 Mar 2020 07:18:32 +0000
Subject: [PATCH 4342/4636] fluxus: fix hash definition

error: unknown hash algorithm '', at /home/s1691654/git/nixpkgs/pkgs/build-support/fetchurl/default.
(use '--show-trace' to show detailed location information)
---
 pkgs/applications/graphics/fluxus/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/applications/graphics/fluxus/default.nix
index a80940711013..e31b5fae9c4d 100644
--- a/pkgs/applications/graphics/fluxus/default.nix
+++ b/pkgs/applications/graphics/fluxus/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     owner = "nebogeo";
     repo = "fluxus";
     rev = "ba9aee218dd4a9cfab914ad78bdb6d59e9a37400";
-    hash = "sha256:0mwghpgq4n1khwlmgscirhmcdhi6x00c08q4idi2zcqz961bbs28";
+    sha256 = "0mwghpgq4n1khwlmgscirhmcdhi6x00c08q4idi2zcqz961bbs28";
   };
 
   buildInputs = [

From 649eecd6319b53b213edf92c1f2785f1db89c3cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 29 Mar 2020 07:22:38 +0000
Subject: [PATCH 4343/4636] httplz: fix strict deps build

---
 pkgs/tools/networking/httplz/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix
index 5d59010ac1ef..c4f003f884fc 100644
--- a/pkgs/tools/networking/httplz/default.nix
+++ b/pkgs/tools/networking/httplz/default.nix
@@ -12,10 +12,8 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0i41hqig8v6w1qb6498239iix1rss0lznm5lcl9m3i439c2zv7pw";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [
-    openssl pkgconfig
-  ] ++ lib.optionals stdenv.isDarwin [
+  nativeBuildInputs = [ makeWrapper pkgconfig ];
+  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
     libiconv darwin.apple_sdk.frameworks.Security
   ];
 

From 0322dc52b8c3c010bd63876de38be0941be56349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 29 Mar 2020 07:24:48 +0000
Subject: [PATCH 4344/4636] hydra-cli: fix strict deps build

---
 pkgs/development/tools/misc/hydra-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/hydra-cli/default.nix b/pkgs/development/tools/misc/hydra-cli/default.nix
index 5cdd9b0ce1d6..b585d27b710f 100644
--- a/pkgs/development/tools/misc/hydra-cli/default.nix
+++ b/pkgs/development/tools/misc/hydra-cli/default.nix
@@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1sj80a99iakxxa698gggiszsrxwlwhr2sx4wmsni0cshx6z2x6za";
 
-  buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
+  buildInputs = [ openssl ]
+                ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
   nativeBuildInputs = [
     pkgconfig
-    openssl
   ];
 
   meta = with stdenv.lib; {

From 8ccfa1e21202bed829a1388b3165d83f7ab17bb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 29 Mar 2020 07:30:16 +0000
Subject: [PATCH 4345/4636] gnome-podcasts: fix strict deps build

---
 pkgs/applications/audio/gnome-podcasts/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix
index 47945de78330..261750859940 100644
--- a/pkgs/applications/audio/gnome-podcasts/default.nix
+++ b/pkgs/applications/audio/gnome-podcasts/default.nix
@@ -43,6 +43,7 @@ rustPlatform.buildRustPackage rec {
     rustc
     python3
     wrapGAppsHook
+    glib
   ];
 
   buildInputs = [

From 2e74a9b1bf89bb9fc9d61ce120b4570650853f52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 29 Mar 2020 07:33:20 +0000
Subject: [PATCH 4346/4636] vdirsyncer: fix strict deps build

---
 pkgs/tools/misc/vdirsyncer/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index 52eec555b165..3ee7787a8a45 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -20,7 +20,8 @@ python3Packages.buildPythonApplication rec {
     inherit src;
     sourceRoot = "source/rust";
     cargoSha256 = "0cqy0s55pkg6hww86h7qip4xaidh6g8lcypdj84n2x374jq38c5d";
-    buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
+    nativeBuildInputs = [ pkgconfig ];
+    buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
   };
 
   propagatedBuildInputs = with python3Packages; [

From 5a1bffc7eb9a18940789452e26ecf63ddd1a997a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 29 Mar 2020 07:35:07 +0000
Subject: [PATCH 4347/4636] fractal: fix strict deps build

---
 .../networking/instant-messengers/fractal/default.nix           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix
index 896ca4f38a61..47153779e403 100644
--- a/pkgs/applications/networking/instant-messengers/fractal/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix
@@ -46,6 +46,7 @@ rustPlatform.buildRustPackage rec {
     python3
     rustc
     wrapGAppsHook
+    glib
   ];
 
   buildInputs = [
@@ -84,4 +85,3 @@ rustPlatform.buildRustPackage rec {
     maintainers = with maintainers; [ dtzWill worldofpeace ];
   };
 }
-

From 756a16e733231c8a0bad5285d3180c8524e0ca78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 29 Mar 2020 07:45:34 +0000
Subject: [PATCH 4348/4636] panopticon: fix strict deps build

---
 pkgs/development/tools/analysis/panopticon/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix
index 85fd8c93529e..e2c174783d4b 100644
--- a/pkgs/development/tools/analysis/panopticon/default.nix
+++ b/pkgs/development/tools/analysis/panopticon/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1zv87nqhrzsxx0m891df4vagzssj3kblfv9yp7j96dw0vn9950qa";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [ makeWrapper ];
   propagatedBuildInputs = with qt5; [
      qt5.qtbase
@@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
      qtsvg
      qtquickcontrols2
      qtgraphicaleffects
-     pkgconfig
      git
   ];
 

From 0c3759abdf2119c574c6dd614c8fe5465081d0f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 29 Mar 2020 07:52:53 +0000
Subject: [PATCH 4349/4636] parallel-rust: remove

- package has no maintainer
- upstream is dead
- build is broken
---
 pkgs/tools/misc/parallel-rust/default.nix     | 25 -------------------
 .../fix_cargo_lock_version.patch              | 12 ---------
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 39 deletions(-)
 delete mode 100644 pkgs/tools/misc/parallel-rust/default.nix
 delete mode 100644 pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch

diff --git a/pkgs/tools/misc/parallel-rust/default.nix b/pkgs/tools/misc/parallel-rust/default.nix
deleted file mode 100644
index 213e8c8e378a..000000000000
--- a/pkgs/tools/misc/parallel-rust/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
-
-rustPlatform.buildRustPackage rec {
-  pname = "parallel-rust";
-  version = "0.11.3";
-
-  src = fetchFromGitHub {
-    owner = "mmstick";
-    repo = "parallel";
-    rev = version;
-    sha256 = "1bb1m3ckkrxlnw9w24ig70bd1zwyrbaw914q3xz5yv43c0l6pn9c";
-  };
-
-  cargoSha256 = "1r5chjhmy6ivhsvgqf75ph1qxa4x7n20f7rb3b6maqpbsc64km9n";
-
-  patches = [ ./fix_cargo_lock_version.patch ];
-
-  meta = with stdenv.lib; {
-    description = "A command-line CPU load balancer written in Rust";
-    homepage = https://github.com/mmstick/parallel;
-    license = licenses.mit;
-    maintainers = [];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch b/pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch
deleted file mode 100644
index 75a1ba35e129..000000000000
--- a/pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index c01308d..dba3927 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -1,6 +1,6 @@
- [root]
- name = "parallel"
--version = "0.11.2"
-+version = "0.11.3"
- dependencies = [
-  "arrayvec 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
-  "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab765f45d8fb..0e50b0f1b56c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2095,8 +2095,6 @@ in
 
   precice = callPackage ../development/libraries/precice { };
 
-  parallel-rust = callPackage ../tools/misc/parallel-rust { };
-
   pueue = callPackage ../applications/misc/pueue { };
 
   pixiecore = callPackage ../tools/networking/pixiecore {};

From 432442eb8c983211d49fd96cd90d966f48a425a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 29 Mar 2020 07:57:24 +0000
Subject: [PATCH 4350/4636] parinfer-rust: fix strict deps build

---
 pkgs/development/tools/parinfer-rust/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/development/tools/parinfer-rust/default.nix
index a313683f2ae5..d016d21b738c 100644
--- a/pkgs/development/tools/parinfer-rust/default.nix
+++ b/pkgs/development/tools/parinfer-rust/default.nix
@@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "16ylk125p368mcz8nandmfqlygrqjlf8mqaxlbpixqga378saidl";
 
-  buildInputs = [ llvmPackages.libclang llvmPackages.clang ];
+  nativeBuildInputs = [ llvmPackages.clang ];
+  buildInputs = [ llvmPackages.libclang ];
   LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
 
   postInstall = ''

From e841dce44a2a3e02446b6d6c062cbf1c9f1cf8e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 29 Mar 2020 07:59:33 +0000
Subject: [PATCH 4351/4636] rink: fix strict deps build

---
 pkgs/applications/science/misc/rink/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix
index 1bb74ec17a34..839fc8f95463 100644
--- a/pkgs/applications/science/misc/rink/default.nix
+++ b/pkgs/applications/science/misc/rink/default.nix
@@ -16,8 +16,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "0shlh0m9k0iqxpv9zmiw7a6v197swrvpz9x6qzhximzkdwni9gz9";
 
-  buildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ openssl gmp ncurses ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ openssl gmp ncurses ];
 
   # Some tests fail and/or attempt to use internet servers.
   doCheck = false;

From dbd8e0e162f3c63847fc9cb1fdc69cb675598ee4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 29 Mar 2020 08:02:25 +0000
Subject: [PATCH 4352/4636] ripasso-cursive: fix strict deps build

---
 pkgs/tools/security/ripasso/cursive.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix
index 70c4ee864b64..c8a55d3f397f 100644
--- a/pkgs/tools/security/ripasso/cursive.nix
+++ b/pkgs/tools/security/ripasso/cursive.nix
@@ -16,9 +16,9 @@ buildRustPackage rec {
 
   cargoBuildFlags = [ "-p ripasso-cursive -p ripasso-man" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig gpgme python3 ];
   buildInputs = [
-    ncurses python3 openssl libgpgerror gpgme xorg.libxcb
+    ncurses openssl libgpgerror gpgme xorg.libxcb
   ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ];
 
   preFixup = ''

From 8f95431dac46c5971b71e15ff49340b6f3af0367 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 29 Mar 2020 08:03:21 +0000
Subject: [PATCH 4353/4636] newsboat: fix strict deps build

---
 .../networking/feedreaders/newsboat/default.nix             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix
index 15328c56d27b..5b97859304cb 100644
--- a/pkgs/applications/networking/feedreaders/newsboat/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix
@@ -24,10 +24,10 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [
     pkgconfig
     asciidoctor
-  ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper libiconv ];
+    gettext
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper libiconv ];
 
-  buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ]
+  buildInputs = [ stfl sqlite curl libxml2 json_c ncurses ]
     ++ stdenv.lib.optional stdenv.isDarwin Security;
 
   postBuild = ''

From b6841031910e0e6d24ff2092c392b2f4bbe25f54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 29 Mar 2020 08:05:21 +0000
Subject: [PATCH 4354/4636] tensorman: fix strict deps build

---
 pkgs/tools/misc/tensorman/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/tensorman/default.nix b/pkgs/tools/misc/tensorman/default.nix
index eca80cbcadf3..85091a41b126 100644
--- a/pkgs/tools/misc/tensorman/default.nix
+++ b/pkgs/tools/misc/tensorman/default.nix
@@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0ywb53snvymmwh10hm6whckz7dwmpqa4rxiggd24y178jdfrm2ns";
   };
 
-  buildInputs = [ pkgconfig openssl ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ openssl ];
   cargoSha256 = "0vckay4jhg02xg68mvh7ys0yjj0p30m6wsjriqc8k24wjsrhiw9k";
 
   meta = with stdenv.lib; {

From 965dc7bb2471aa3f6d4a8343cd39b9075fc29152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 29 Mar 2020 08:07:29 +0000
Subject: [PATCH 4355/4636] uutils-coreutils: fix strict deps build

---
 pkgs/tools/misc/uutils-coreutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix
index 9c58785e84ea..09c29a0af1fb 100644
--- a/pkgs/tools/misc/uutils-coreutils/default.nix
+++ b/pkgs/tools/misc/uutils-coreutils/default.nix
@@ -20,8 +20,8 @@ rustPlatform.buildRustPackage {
     [ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ]
     ++ lib.optional (prefix != null) [ "PROG_PREFIX=${prefix}" ];
 
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ cargo sphinx ] ++ lib.optional stdenv.isDarwin Security;
+  nativeBuildInputs = [ cmake cargo sphinx ];
+  buildInputs = lib.optional stdenv.isDarwin Security;
 
   # empty {build,install}Phase to use defaults of `stdenv.mkDerivation` rather than rust defaults
   buildPhase = "";

From e1bea9e8b131e6830c2bd929f10873660bb169ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 29 Mar 2020 08:18:27 +0000
Subject: [PATCH 4356/4636] vector: fix strict deps build

---
 pkgs/tools/misc/vector/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix
index 17e764698d52..c441242885e6 100644
--- a/pkgs/tools/misc/vector/default.nix
+++ b/pkgs/tools/misc/vector/default.nix
@@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec {
   };
 
   cargoSha256 = "1al8jzjxjhxwb5n1d52pvl59d11g0bdg2dcw8ir2nclya1w68f2w";
-  buildInputs = [ openssl pkg-config protobuf rdkafka ]
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ openssl protobuf rdkafka ]
                 ++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv ];
 
   # needed for internal protobuf c wrapper library

From 5f092581142897341630b43be30dbdc6a02b0b8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 29 Mar 2020 08:23:57 +0000
Subject: [PATCH 4357/4636] sequoia: fix strict deps build

---
 pkgs/tools/security/sequoia/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix
index fe0b13bbb973..d1a24f49d802 100644
--- a/pkgs/tools/security/sequoia/default.nix
+++ b/pkgs/tools/security/sequoia/default.nix
@@ -28,6 +28,7 @@ rustPlatform.buildRustPackage rec {
     llvmPackages.libclang
     llvmPackages.clang
     ensureNewerSourcesForZipFilesHook
+    capnproto
   ] ++
     lib.optionals pythonSupport [ pythonPackages.setuptools ]
   ;
@@ -41,9 +42,7 @@ rustPlatform.buildRustPackage rec {
     openssl
     sqlite
     nettle
-    capnproto
-  ]
-    ++ lib.optionals pythonSupport [ pythonPackages.python pythonPackages.cffi ]
+  ] ++ lib.optionals pythonSupport [ pythonPackages.python pythonPackages.cffi ]
     ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]
   ;
 

From 5b6dbb5e18efde69e375752ec5d13cb9bf2f3cf2 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Sun, 29 Mar 2020 12:41:34 +0200
Subject: [PATCH 4358/4636] kitty: 0.17.1 -> 0.17.2

https://github.com/kovidgoyal/kitty/releases/tag/v0.17.2
---
 pkgs/applications/misc/kitty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 6860f04f99c1..9269add3173b 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -20,14 +20,14 @@
 with python3Packages;
 buildPythonApplication rec {
   pname = "kitty";
-  version = "0.17.1";
+  version = "0.17.2";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "kovidgoyal";
     repo = "kitty";
     rev = "v${version}";
-    sha256 = "1ydli1phgcy17iz6jxgixn8yc86dp8q2yfxk08c8lwh7gxjnjz7f";
+    sha256 = "0xiwz89ynhh8aj0c9jbqfsxf129hnzs0gz4bzcparnjisq2sh3cq";
   };
 
   buildInputs = [

From 264365247f397fe9740be311fc2da46b9d996b9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 28 Mar 2020 22:14:41 -0300
Subject: [PATCH 4359/4636] iconpack-jade: init at 1.22

---
 pkgs/data/icons/iconpack-jade/default.nix | 38 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/data/icons/iconpack-jade/default.nix

diff --git a/pkgs/data/icons/iconpack-jade/default.nix b/pkgs/data/icons/iconpack-jade/default.nix
new file mode 100644
index 000000000000..1b42c1af6125
--- /dev/null
+++ b/pkgs/data/icons/iconpack-jade/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }:
+
+stdenv.mkDerivation rec {
+  pname = "iconpack-jade";
+  version = "1.22";
+
+  src = fetchFromGitHub {
+    owner = "madmaxms";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1piypv8wdxnfiy6kgh7i3wi52m4fh4x874kh01qjmymssyirn17x";
+  };
+
+  nativeBuildInputs = [ gtk3 ];
+
+  propagatedBuildInputs = [ hicolor-icon-theme ];
+
+  dontDropIconThemeCache = true;
+
+  installPhase = ''
+     mkdir -p $out/share/icons
+     cp -a Jade* $out/share/icons
+  '';
+
+  postFixup = ''
+    for theme in $out/share/icons/*; do
+      gtk-update-icon-cache $theme
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Icon pack based upon Faenza and Mint-X";
+    homepage = "https://github.com/madmaxms/iconpack-jade";
+    license = licenses.lgpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d6eb691acd0..f5691c4a7a9f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17803,6 +17803,8 @@ in
 
   ibm-plex = callPackage ../data/fonts/ibm-plex { };
 
+  iconpack-jade = callPackage ../data/icons/iconpack-jade { };
+
   iconpack-obsidian = callPackage ../data/icons/iconpack-obsidian { };
 
   inconsolata = callPackage ../data/fonts/inconsolata {};

From d4152d0205529b8fac619020c7ea2a2fec4ab81a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= <me@danieldk.eu>
Date: Fri, 6 Mar 2020 17:59:43 +0100
Subject: [PATCH 4360/4636] cargo-asm: 0.1.17 -> 2019-12-24

cargo-asm hasn't seen any new releases since 2018 (and even then
it was spotty). But there have been improvements since then, so
switch to dated releases that use a working git commit.
---
 pkgs/development/tools/rust/cargo-asm/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix
index 9d2279fe5982..7c1361f6d270 100644
--- a/pkgs/development/tools/rust/cargo-asm/default.nix
+++ b/pkgs/development/tools/rust/cargo-asm/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-asm";
-  version = "0.1.17";
+  version = "2019-12-24";
 
   src = fetchFromGitHub {
     owner = "gnzlbg";
     repo = "cargo-asm";
-    rev = "7f69a17e9c36dfe1f0d7080d7974c72ecc87a145";
-    sha256 = "0zn5p95hsmhvk2slc9hakrpvim6l4zbpgkks2x64ndwyfmzyykws";
+    rev = "577f890ebd4a09c8265710261e976fe7bfce8668";
+    sha256 = "1f6kzsmxgdms9lq5z9ynnmxymk9k2lzlp3caa52wqjvdw1grw0rb";
   };
 
-  cargoSha256 = "1xsfwzn2b7hmb7hwgfa4ss7qfas8957gkw7zys0an9hdj5qr3ywb";
+  cargoSha256 = "0d797cisiydblh64vqpfdjf37wmxrvs77phdrqh582lbrvnfhx2j";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
 

From 2346014aae514debb0b7d252a55d85b1331254fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Wed, 4 Mar 2020 19:33:35 +0100
Subject: [PATCH 4361/4636] bgpq3: init at 0.1.35

---
 pkgs/tools/networking/bgpq3/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/networking/bgpq3/default.nix

diff --git a/pkgs/tools/networking/bgpq3/default.nix b/pkgs/tools/networking/bgpq3/default.nix
new file mode 100644
index 000000000000..e3d2218b0c97
--- /dev/null
+++ b/pkgs/tools/networking/bgpq3/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "bgpq3";
+  version = "0.1.35";
+
+  src = fetchFromGitHub {
+    owner = "snar";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0fd5a3krq0i906m0iivgphiqq88cw6c0w1q4n7lmzyq9201mb8wj";
+  };
+
+  # Fix binary install location. Remove with next upstream release.
+  preInstall = "mkdir -p $out/bin";
+
+  meta = with stdenv.lib; {
+    description = "bgp filtering automation tool";
+    homepage = "https://github.com/snar/bgpq3";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ b4dm4n ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f5691c4a7a9f..5b40f018f6cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18582,6 +18582,8 @@ in
 
   bgpdump = callPackage ../tools/networking/bgpdump { };
 
+  bgpq3 = callPackage ../tools/networking/bgpq3 { };
+
   blackbox = callPackage ../applications/version-management/blackbox { };
 
   bleachbit = callPackage ../applications/misc/bleachbit { };

From f77e60466ff3e28b256c43a96d96cd465b15638d Mon Sep 17 00:00:00 2001
From: Daniel Wheeler <daniel.wheeler2@gmail.com>
Date: Tue, 25 Feb 2020 13:13:00 -0500
Subject: [PATCH 4362/4636] pythonPackages.fipy: 3.3 -> 3.4.1

---
 pkgs/development/python-modules/fipy/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/fipy/default.nix b/pkgs/development/python-modules/fipy/default.nix
index 7fbf14cf7de0..76fda47c6a94 100644
--- a/pkgs/development/python-modules/fipy/default.nix
+++ b/pkgs/development/python-modules/fipy/default.nix
@@ -14,6 +14,8 @@
 , gmsh
 , python
 , stdenv
+, openssh
+, fetchurl
 }:
 
 let
@@ -21,12 +23,11 @@ let
 in
   buildPythonPackage rec {
     pname = "fipy";
-    version = "3.3";
+    version = "3.4.1";
 
-    src = fetchPypi {
-      pname = "FiPy";
-      inherit version;
-      sha256 = "11agpg3d6yrns8igkpml1mxy3mkqkjq2yrw1mw12y07dkk12ii19";
+    src = fetchurl {
+      url = "https://github.com/usnistgov/fipy/releases/download/${version}/FiPy-${version}.tar.gz";
+      sha256 = "0078yg96fknqhywn1v26ryc5z47c0j0c1qwz6p8wsjn0wmzggaqk";
     };
 
     propagatedBuildInputs = [
@@ -38,11 +39,13 @@ in
       mpi4py
       future
       scikit-fmm
+      openssh
     ] ++ lib.optionals isPy27 [ pysparse ] ++ not_darwin_inputs;
 
     checkInputs = not_darwin_inputs;
 
     checkPhase = ''
+      export OMPI_MCA_plm_rsh_agent=${openssh}/bin/ssh
       ${python.interpreter} setup.py test --modules
     '';
 

From 773c84d944ea27f4eee0e322425db5bb3ff8af91 Mon Sep 17 00:00:00 2001
From: Daniel Wheeler <daniel.wheeler2@gmail.com>
Date: Tue, 25 Feb 2020 13:39:13 -0500
Subject: [PATCH 4363/4636] pythonPackages.sfepy: 2019.2 -> 2019.4

 - Bump the version number to fix incompatibility with Numpy 1.18.1
 - Remove broken test to fix incompatibility with Numpy 1.18.1
---
 pkgs/development/python-modules/sfepy/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sfepy/default.nix b/pkgs/development/python-modules/sfepy/default.nix
index 36f4f82cb3fe..6a7bb38a74d1 100644
--- a/pkgs/development/python-modules/sfepy/default.nix
+++ b/pkgs/development/python-modules/sfepy/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   name = "sfepy_${version}";
-  version = "2019.2";
+  version = "2019.4";
 
   src = fetchurl {
     url="https://github.com/sfepy/sfepy/archive/release_${version}.tar.gz";
-    sha256 = "17dj0wbchcfa6x27yx4d4jix4z4nk6r2640xkqcsw0mf62x5l1pj";
+    sha256 = "1l9vgcw09l6bwhgfzlbn68fzpvns25r6nkd1pcp7hz5165hs6zzn";
   };
 
   propagatedBuildInputs = [
@@ -33,6 +33,7 @@ buildPythonPackage rec {
   postPatch = ''
     # broken test
     rm tests/test_homogenization_perfusion.py
+    rm tests/test_splinebox.py
 
     # slow tests
     rm tests/test_input_*.py

From 95e15a991ac93dafc9b4ac620086013c815bdcbd Mon Sep 17 00:00:00 2001
From: Rakesh Gupta <rakesh.gupta@formbay.com.au>
Date: Tue, 24 Mar 2020 09:41:58 +0530
Subject: [PATCH 4364/4636] pythonPackages.variants: init at 0.2.0

---
 .../python-modules/variants/default.nix       | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/python-modules/variants/default.nix

diff --git a/pkgs/development/python-modules/variants/default.nix b/pkgs/development/python-modules/variants/default.nix
new file mode 100644
index 000000000000..af2224e3536e
--- /dev/null
+++ b/pkgs/development/python-modules/variants/default.nix
@@ -0,0 +1,32 @@
+{ buildPythonPackage
+, fetchPypi
+, pytestrunner
+, setuptools_scm
+, pytest
+, lib
+}:
+buildPythonPackage rec {
+  pname = "variants";
+  version = "0.2.0";
+
+  src = fetchPypi {
+    inherit pname version ;
+    sha256 = "511f75b4cf7483c27e4d86d9accf2b5317267900c166d17636beeed118929b90";
+  };
+
+  nativeBuildInputs = [
+    pytestrunner
+    setuptools_scm
+  ];
+
+  checkInputs = [
+    pytest
+  ];
+  
+  meta = with lib; {
+    description = "Library providing syntactic sugar for creating variant forms of a canonical function";
+    homepage = "https://github.com/python-variants/variants";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ rakesh4g ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b467ac523888..08f9904e5483 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5839,6 +5839,8 @@ in {
 
   user-agents = callPackage ../development/python-modules/user-agents { };
 
+  variants = callPackage ../development/python-modules/variants { };
+
   verboselogs = callPackage ../development/python-modules/verboselogs { };
 
   vega_datasets = callPackage ../development/python-modules/vega_datasets { };

From 4e0d07f6d74022a2fe9c1a9461acdb9da3ca872e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20Rivi=C3=A8re?= <babathriviere@gmail.com>
Date: Sun, 29 Mar 2020 14:10:26 +0200
Subject: [PATCH 4365/4636] flutter: symlink common patches

---
 .../patches/dev/disable-auto-update.patch     | 32 +------------------
 1 file changed, 1 insertion(+), 31 deletions(-)
 mode change 100644 => 120000 pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch

diff --git a/pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch
deleted file mode 100644
index 42c09c805cb5..000000000000
--- a/pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/bin/flutter b/bin/flutter
-index e0c18e235..2c3fb7ddd 100755
---- a/bin/flutter
-+++ b/bin/flutter
-@@ -185,8 +185,6 @@ fi
- # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS"
- # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432"
- 
--(upgrade_flutter) 3< "$PROG_NAME"
--
- # FLUTTER_TOOL_ARGS isn't quoted below, because it is meant to be considered as
- # separate space-separated args.
- "$DART" --packages="$FLUTTER_TOOLS_DIR/.packages" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" "$@"
-diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-index 99455ae64..f5b0cb59c 100644
---- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-@@ -301,13 +301,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
-         }
- 
-         _checkFlutterCopy();
--        try {
--          await globals.flutterVersion.ensureVersionFile();
--        } on FileSystemException catch (e) {
--          globals.printError('Failed to write the version file to the artifact cache: "$e".');
--          globals.printError('Please ensure you have permissions in the artifact cache directory.');
--          throwToolExit('Failed to write the version file');
--        }
-         final bool machineFlag = topLevelResults['machine'] as bool;
-         if (topLevelResults.command?.name != 'upgrade' && topLevelResults['version-check'] as bool && !machineFlag) {
-           await globals.flutterVersion.checkFlutterVersionFreshness();
diff --git a/pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch
new file mode 120000
index 000000000000..2c92799f3bba
--- /dev/null
+++ b/pkgs/development/compilers/flutter/patches/dev/disable-auto-update.patch
@@ -0,0 +1 @@
+../beta/disable-auto-update.patch
\ No newline at end of file

From 439f0839316e87c8e2d44cdca1d9e3ffa6760e38 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2020 11:08:29 +0000
Subject: [PATCH 4366/4636] bindfs: 1.14.3 -> 1.14.4

---
 pkgs/tools/filesystems/bindfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix
index 834aa7290abc..f13439482db4 100644
--- a/pkgs/tools/filesystems/bindfs/default.nix
+++ b/pkgs/tools/filesystems/bindfs/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, fuse, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  version = "1.14.3";
+  version = "1.14.4";
   pname = "bindfs";
 
   src = fetchurl {
     url    = "https://bindfs.org/downloads/${pname}-${version}.tar.gz";
-    sha256 = "09csi8brp6v98gy9xcl6lkbz1wgs796wch1qviw2wa1n16wd91vw";
+    sha256 = "1vk42bq8y13gv4yvajf65qsh59lscwcaw3xv94qpjxld3786i8c7";
   };
 
   dontStrip = true;

From 459a94ffa724f739197af845e7cfed2b9a27c014 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 29 Mar 2020 09:38:24 -0300
Subject: [PATCH 4367/4636] xfce.xfce4-whiskermenu-plugin: 2.3.3 -> 2.4.3

---
 .../xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
index ef47d37e5efd..884b8ee3a294 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix
@@ -3,9 +3,9 @@
 mkXfceDerivation rec {
   category = "panel-plugins";
   pname = "xfce4-whiskermenu-plugin";
-  version = "2.3.3";
+  version = "2.4.3";
   rev = "v${version}";
-  sha256 = "0agh0a5srsy6vi6r50ak9rb42r7vcnfv6nfvg4qbqi77yc44yqdb";
+  sha256 = "1cs3fps1bj0dd5az7fwrvw1xl3y621qk4dma3n73p7rr19j7fpsn";
 
   nativeBuildInputs = [ cmake ];
 

From d2702c915fce87a14db944e85105f958a0b49e2c Mon Sep 17 00:00:00 2001
From: Guanpeng Xu <herberteuler@gmail.com>
Date: Sun, 29 Mar 2020 20:03:53 +0800
Subject: [PATCH 4368/4636] mathematica: 12.0.0 -> 12.1.0

---
 pkgs/applications/science/math/mathematica/default.nix | 7 +++++--
 pkgs/applications/science/math/mathematica/l10ns.nix   | 6 ++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix
index 7cd1b2eb99fa..5553bb0505fa 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@@ -9,6 +9,7 @@
 , freetype
 , gcc
 , glib
+, libssh2
 , ncurses
 , opencv
 , openssl
@@ -44,9 +45,11 @@ stdenv.mkDerivation rec {
     gcc.cc
     gcc.libc
     glib
+    libssh2
     ncurses
     opencv
     openssl
+    stdenv.cc.cc.lib
     unixODBC
     xkeyboard_config
     libxml2
@@ -93,7 +96,7 @@ stdenv.mkDerivation rec {
     # Fix library paths
     cd $out/libexec/Mathematica/Executables
     for path in mathematica MathKernel Mathematica WolframKernel wolfram math; do
-      sed -i -e "2iexport LD_LIBRARY_PATH=${zlib}/lib:\''${LD_LIBRARY_PATH}\n" $path
+      sed -i -e "2iexport LD_LIBRARY_PATH=${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}\n" $path
     done
 
     # Fix xkeyboard config path for Qt
@@ -102,7 +105,7 @@ stdenv.mkDerivation rec {
     done
 
     # Remove some broken libraries
-    rm $out/libexec/Mathematica/SystemFiles/Libraries/Linux-x86-64/libz.so*
+    rm -f $out/libexec/Mathematica/SystemFiles/Libraries/Linux-x86-64/libz.so*
   '';
 
   preFixup = ''
diff --git a/pkgs/applications/science/math/mathematica/l10ns.nix b/pkgs/applications/science/math/mathematica/l10ns.nix
index 51fb489be7ec..c75c91be059c 100644
--- a/pkgs/applications/science/math/mathematica/l10ns.nix
+++ b/pkgs/applications/science/math/mathematica/l10ns.nix
@@ -7,6 +7,12 @@
 let allVersions = with lib; flip map
   # N.B. Versions in this list should be ordered from newest to oldest.
   [
+    {
+      version = "12.1.0";
+      lang = "en";
+      language = "English";
+      sha256 = "15m9l20jvkxh5w6mbp81ys7mx2lx5j8acw5gz0il89lklclgb8z7";
+    }
     {
       version = "12.0.0";
       lang = "en";

From cfb435732a6360a75b93dd9718d5b86ae6bf9f8c Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Sun, 29 Mar 2020 13:21:25 +0200
Subject: [PATCH 4369/4636] pythonPackages.ftputil: fix build

Some tests assume execution before 2020.
---
 pkgs/development/python-modules/ftputil/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ftputil/default.nix b/pkgs/development/python-modules/ftputil/default.nix
index d3d338a2c8d3..5e367644a1c8 100644
--- a/pkgs/development/python-modules/ftputil/default.nix
+++ b/pkgs/development/python-modules/ftputil/default.nix
@@ -13,10 +13,11 @@ buildPythonPackage rec {
 
   checkPhase = ''
     touch Makefile
-    # Disable tests that require network access or access /home
+    # Disable tests that require network access or access /home or assume execution before year 2020
     py.test test \
       -k "not test_public_servers and not test_real_ftp \
-          and not test_set_parser and not test_repr"
+          and not test_set_parser and not test_repr \
+          and not test_conditional_upload and not test_conditional_download_with_older_target"
   '';
 
   meta = with lib; {

From e18f1429be5bab44ed8ddc78025beed03c0332bd Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Sun, 29 Mar 2020 14:57:44 +0200
Subject: [PATCH 4370/4636] cherrytree: 0.39.0 -> 0.39.1

---
 pkgs/applications/misc/cherrytree/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix
index eec2b9dd24a3..72279e84909c 100644
--- a/pkgs/applications/misc/cherrytree/default.nix
+++ b/pkgs/applications/misc/cherrytree/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "cherrytree";
-  version = "0.39.0";
+  version = "0.39.1";
 
   src = fetchurl {
     url = "https://www.giuspen.com/software/${pname}-${version}.tar.xz";
-    sha256 = "07ibr891qix7xa2sk6fdxdsji8q56c1wf786mxaz77500m0xfx4m";
+    sha256 = "0qhycblnixvbybzr8psgmgcpfs6jc9m0p2h9lmd5zmiaggqlcsv7";
   };
 
   nativeBuildInputs = [ gettext ];

From 0dc23eaf61da573de344f6aeb52371c226229895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 29 Mar 2020 10:11:12 -0300
Subject: [PATCH 4371/4636] xfce.xfce4-hardware-monitor-plugin: fix url
 (unmaintained)

---
 .../xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
index 2782decf6c4c..94e1282954ae 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
@@ -7,8 +7,8 @@ stdenv.mkDerivation rec {
   version = "1.6.0";
 
   src = fetchurl {
-    url = "https://git.xfce.org/panel-plugins/${pname}/snapshot/${pname}-${version}.tar.bz2";
-    sha256 = "0xg5har11fk1wmdymydxlbk1z8aa39j8k0p4gzw2iqslv3n0zf7b";
+    url = "https://git.xfce.org/archive/${pname}/snapshot/${pname}-${version}.tar.gz";
+    sha256 = "11k7m41jxkaqmpp5njkixw60q517xnw923mz34dnm1llx9ilvfk8";
   };
 
   nativeBuildInputs = [

From 5d43ab117a47c0fd6a2db21b5612afce64ade180 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 29 Mar 2020 10:21:33 -0300
Subject: [PATCH 4372/4636] matcha: 2020-03-24 -> 2020-03-29

---
 pkgs/data/themes/matcha/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
index ecf508a61b3b..eb6d0599112b 100644
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "matcha";
-  version = "2020-03-24";
+  version = "2020-03-29";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    sha256 = "13lcv2cihb24zjsdzhh188kd1rga49mzfa2sddqd63pqxxph188z";
+    sha256 = "17yyxlm94q8cv3zryishgs852nz74q79v3fh9c7a3f1fs6xlw8p0";
   };
 
   buildInputs = [ gdk-pixbuf librsvg ];

From 58a69bc9e358bbe4c4bdbec2b794936f592b1e30 Mon Sep 17 00:00:00 2001
From: Andreas Wiese <aw-nixos@meterriblecrew.net>
Date: Sun, 29 Mar 2020 15:29:18 +0200
Subject: [PATCH 4373/4636] matrix-dl: fix license

I initially looked at the wrong places for this, where it's actually
stated in setup.py.  I'm not quite a python guy.
---
 .../networking/instant-messengers/matrix-dl/default.nix         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix b/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix
index 21d521872145..97f775220229 100644
--- a/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix
+++ b/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
   meta = with lib; {
     description = "Download backlogs from Matrix as raw text";
     homepage = src.meta.homepage;
-    license = licenses.unfree;
+    license = licenses.gpl1Plus;
     maintainers = with maintainers; [ aw ];
     platforms = platforms.unix;
   };

From 671dc2a5ca8e7fe55833590ceffdcf6c52064c32 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 29 Mar 2020 12:00:00 +0000
Subject: [PATCH 4374/4636] vmTools.diskImageFuns.debian9i386: update source
 url

referenced packets were removed from the mirrors

Fixes #77396 #80041
---
 pkgs/build-support/vm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 488c7f2ce2c7..487a91145c51 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1022,8 +1022,8 @@ rec {
       name = "debian-9.8-stretch-i386";
       fullName = "Debian 9.8 Stretch (i386)";
       packagesList = fetchurl {
-        url = http://snapshot.debian.org/archive/debian/20190503T090946Z/dists/stretch/main/binary-i386/Packages.xz;
-        sha256 = "1dr3skl35iyj85qlc33lq4whippbqf327vnbcyfqqrv6h86k68mw";
+        url = http://snapshot.debian.org/archive/debian/20200301T030401Z/dists/stretch/main/binary-i386/Packages.xz;
+        sha256 = "1jglr1d1jys3xddp8f7w9j05db39fah8xy4gfkpqbd1b5d2caslz";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;

From 6a2f64a5421fcd6f08c8ec5c5ba3fe9444bfe5d4 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 29 Mar 2020 12:00:00 +0000
Subject: [PATCH 4375/4636] nixos/tests/os-prober.nix: fix out of memory

---
 nixos/tests/os-prober.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix
index 5407a62339fe..6a38f5ca531c 100644
--- a/nixos/tests/os-prober.nix
+++ b/nixos/tests/os-prober.nix
@@ -51,6 +51,8 @@ let
       hashed-mirrors =
       connect-timeout = 1
     '';
+    # save some memory
+    documentation.enable = false;
   };
   # /etc/nixos/configuration.nix for the vm
   configFile = pkgs.writeText "configuration.nix"  ''

From f83d12d5542a6e00e277706a1b109107d74d8f84 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 29 Mar 2020 16:04:28 +0200
Subject: [PATCH 4376/4636] =?UTF-8?q?weechat:=20v2.7.1=20=E2=86=92=20v2.8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

New features

    core: add variable "old_full_name" in buffer, set during buffer renaming (issue weechat/weechat#1428)
    core: add debug option "-d" in command /eval (issue weechat/weechat#1434)
    api: add functions crypto_hash and crypto_hash_pbkdf2
    api: add info "auto_connect" (issue weechat/weechat#1453)
    api: add info "weechat_headless" (issue weechat/weechat#1433)
    buflist: add pointer "window" in bar item evaluation
    irc: add support of fake servers (no I/O, for testing purposes)
    relay: accept hash of password in init command of weechat protocol with option "password_hash" (PBKDF2, SHA256, SHA512)
    relay: reject client with weechat protocol if password or totp is received in init command but not set in WeeChat (issue weechat/weechat#1435)

Bug fixes

    core: fix memory leak in completion
    core: flush stdout/stderr before forking in hook_process function (issue weechat/weechat#1441)
    core: fix evaluation of condition with nested "if" (issue weechat/weechat#1434)
    irc: split AUTHENTICATE message in 400-byte chunks (issue weechat/weechat#1459)
    irc: copy temporary server flag in command /server copy
    irc: add nick changes in the hotlist (except self nick change)
    irc: case-insensitive comparison on incoming CTCP command, force upper case on CTCP replies (issue weechat/weechat#1439)
    irc: fix memory leak when the channel topic is changed
    logger: fix crash when logging is disabled on a buffer and the log file was deleted in the meanwhile, when option logger.file.info_lines is on (issue weechat/weechat#1444)
    php: fix crash when loading script with PHP 7.4 (issue weechat/weechat#1452)
    relay: update buffers synchronization when buffers are renamed (issue weechat/weechat#1428)
    script: fix memory leak in read of script repository file if it has invalid content
    script: fix unexpected display of scripts list in buffer with command /script list -i
    xfer: send signal "xfer_ended" after the received file has been renamed (issue weechat/weechat#1438)

Tests

    scripts: fix generation of test scripts with Python 3.8
    unit: add tests on IRC protocol functions and callbacks
    unit: add tests on function secure_derive_key
    unit: add tests on functions util_get_time_diff and util_file_get_content

Build

    core: fix Cygwin build
    guile: add detection of Guile 3.0.0 (issue weechat/weechat#1442)
    irc: fix build with GnuTLS < 3.1.0 (issue weechat/weechat#1431)
    php: add detection of PHP 7.4
    ruby: add detection of Ruby 2.7 (issue weechat/weechat#1455)
---
 pkgs/applications/networking/irc/weechat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 96d7b3faaede..ee850ea0eba7 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -27,12 +27,12 @@ let
   in
     assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
     stdenv.mkDerivation rec {
-      version = "2.7.1";
+      version = "2.8";
       pname = "weechat";
 
       src = fetchurl {
         url = "https://weechat.org/files/src/weechat-${version}.tar.bz2";
-        sha256 = "0acz41jg7lmipni9z2agfqw4dhmx5hf6k9w4pvr4zih1fhkldva2";
+        sha256 = "0xpzl7985j47rpmly4r833jxd448xpy7chqphaxmhlql2c0gc08z";
       };
 
       outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;

From 7d19703e5e1021059c0d75720f7782dc98ec0255 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2020 14:13:04 +0000
Subject: [PATCH 4377/4636] drawing: 0.4.11 -> 0.4.13

---
 pkgs/applications/graphics/drawing/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/drawing/default.nix b/pkgs/applications/graphics/drawing/default.nix
index 67fa5da398bc..fb68276b168c 100644
--- a/pkgs/applications/graphics/drawing/default.nix
+++ b/pkgs/applications/graphics/drawing/default.nix
@@ -17,7 +17,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "drawing";
-  version = "0.4.11";
+  version = "0.4.13";
 
   format = "other";
   
@@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "maoschanz";
     repo = pname;
     rev = version;
-    sha256 = "00c1h6jns11rmsg35gy40fb6ahvik80wpbm2133bjcqxfwwnlal6";
+    sha256 = "0mj2nmfrckv89srgkn16fnbrb35f5a655ak8bb3rd9na3hd5bq53";
   };
 
   nativeBuildInputs = [

From fa54163b4d4d1571f3308e78bf404d3e22fb15e9 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 29 Mar 2020 17:38:06 +0200
Subject: [PATCH 4378/4636] lsp-plugins: 1.1.13 -> 1.1.15

---
 pkgs/applications/audio/lsp-plugins/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix
index b146fcecc8ec..8a2f64b4efd4 100644
--- a/pkgs/applications/audio/lsp-plugins/default.nix
+++ b/pkgs/applications/audio/lsp-plugins/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lsp-plugins";
-  version = "1.1.13";
+  version = "1.1.15";
 
   src = fetchFromGitHub {
     owner = "sadko4u";
     repo = pname;
     rev = "${pname}-${version}";
-    sha256 = "00mhrr873kgcnqy3q0yi1r5zacfcvz7fqpzsmfhw5d095jm970al";
+    sha256 = "0lynyjs5zp27gnzcv8a23pvb7c1ghzc2dspypca3ciq40bfpfzik";
   };
 
   nativeBuildInputs = [ pkgconfig php makeWrapper ];
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [
     "PREFIX=${placeholder ''out''}"
+    "ETC_PATH=$(out)/etc"
   ];
 
   NIX_CFLAGS_COMPILE = "-DLSP_NO_EXPERIMENTAL";

From 68d14b3756629fd409334d7b8b615c8ecd26cd4a Mon Sep 17 00:00:00 2001
From: Charles Duffy <charles@dyfis.net>
Date: Sat, 28 Mar 2020 10:54:24 -0500
Subject: [PATCH 4379/4636] curaLulzbot: Fix build breakage around OpenMP
 compatibility

---
 .../lulzbot/curaengine-openmp-compat.patch    | 47 +++++++++++++++++++
 .../misc/cura/lulzbot/curaengine.nix          |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/applications/misc/cura/lulzbot/curaengine-openmp-compat.patch

diff --git a/pkgs/applications/misc/cura/lulzbot/curaengine-openmp-compat.patch b/pkgs/applications/misc/cura/lulzbot/curaengine-openmp-compat.patch
new file mode 100644
index 000000000000..3826e92440f0
--- /dev/null
+++ b/pkgs/applications/misc/cura/lulzbot/curaengine-openmp-compat.patch
@@ -0,0 +1,47 @@
+# Notes by Charles Duffy <charles@dyfis.net> --
+#
+# - The new version of OpenMP does not allow outside variables to be referenced
+#   *at all* without an explicit declaration of how they're supposed to be
+#   handled. Thus, this was an outright build failure beforehand. The new
+#   pragmas copy the initial value from the outer scope into each parallel
+#   thread. Since these variables are all constant within the loops, this is
+#   clearly correct. (Not sure it's *optimal*, but quite sure it isn't
+#   *wrong*).
+# - Upstream has been contacted -- I'm a Lulzbot customer with an active
+#   support contract and sent them the patch. That said, they're in the middle
+#   of some major corporate churn (sold themselves out of near-bankruptcy to an
+#   out-of-state business entity formed as a holding company; moved to that
+#   state; have been slowly restaffing after), so a response may take a while.
+# - The patch is purely my own work.
+
+--- curaengine/src/support.cpp.orig	2020-03-28 10:38:01.953912363 -0500
++++ curaengine/src/support.cpp	2020-03-28 10:45:28.999791908 -0500
+@@ -854,7 +854,7 @@
+     const double tan_angle = tan(angle) - 0.01;  // the XY-component of the supportAngle
+     xy_disallowed_per_layer[0] = storage.getLayerOutlines(0, false).offset(xy_distance);
+     // for all other layers (of non support meshes) compute the overhang area and possibly use that when calculating the support disallowed area
+-    #pragma omp parallel for default(none) shared(xy_disallowed_per_layer, storage, mesh) schedule(dynamic)
++    #pragma omp parallel for default(none) firstprivate(layer_count, is_support_mesh_place_holder, use_xy_distance_overhang, z_distance_top, tan_angle, xy_distance, xy_distance_overhang) shared(xy_disallowed_per_layer, storage, mesh) schedule(dynamic)
+     for (unsigned int layer_idx = 1; layer_idx < layer_count; layer_idx++)
+     {
+         Polygons outlines = storage.getLayerOutlines(layer_idx, false);
+@@ -1054,7 +1054,7 @@
+         const int max_checking_layer_idx = std::min(static_cast<int>(storage.support.supportLayers.size())
+                                                   , static_cast<int>(layer_count - (layer_z_distance_top - 1)));
+         const size_t max_checking_idx_size_t = std::max(0, max_checking_layer_idx);
+-#pragma omp parallel for default(none) shared(support_areas, storage) schedule(dynamic)
++#pragma omp parallel for default(none) firstprivate(max_checking_idx_size_t, layer_z_distance_top) shared(support_areas, storage) schedule(dynamic)
+         for (size_t layer_idx = 0; layer_idx < max_checking_idx_size_t; layer_idx++)
+         {
+             support_areas[layer_idx] = support_areas[layer_idx].difference(storage.getLayerOutlines(layer_idx + layer_z_distance_top - 1, false));
+--- curaengine/src/layerPart.cpp.orig	2020-03-28 10:36:40.381023651 -0500
++++ curaengine/src/layerPart.cpp	2020-03-28 10:39:54.584140465 -0500
+@@ -49,7 +49,7 @@
+ {
+     const auto total_layers = slicer->layers.size();
+     assert(mesh.layers.size() == total_layers);
+-#pragma omp parallel for default(none) shared(mesh, slicer) schedule(dynamic)
++#pragma omp parallel for default(none) firstprivate(total_layers) shared(mesh, slicer) schedule(dynamic)
+     for (unsigned int layer_nr = 0; layer_nr < total_layers; layer_nr++)
+     {
+         SliceLayer& layer_storage = mesh.layers[layer_nr];
diff --git a/pkgs/applications/misc/cura/lulzbot/curaengine.nix b/pkgs/applications/misc/cura/lulzbot/curaengine.nix
index 14004474a21a..d7a9b63bbbf4 100644
--- a/pkgs/applications/misc/cura/lulzbot/curaengine.nix
+++ b/pkgs/applications/misc/cura/lulzbot/curaengine.nix
@@ -10,6 +10,8 @@ gcc8Stdenv.mkDerivation rec {
     sha256 = "0wdkvg1hmqp1gaym804lw09x4ngf5ffasd861jhflpy7djbmkfn8";
   };
 
+  patches = [ ./curaengine-openmp-compat.patch ];
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [ libarcusLulzbot stb protobuf ];
 

From 9e7c54325e0ddfa4c630872c15749f47c12def96 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 29 Mar 2020 17:56:35 +0200
Subject: [PATCH 4380/4636] stellarium: 0.19.3 -> 0.20.0

https://github.com/Stellarium/stellarium/releases/tag/v0.20.0
---
 pkgs/applications/science/astronomy/stellarium/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index eca25774c593..3cb34576c46b 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -6,13 +6,13 @@
 
 mkDerivation rec {
   pname = "stellarium";
-  version = "0.19.3";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "Stellarium";
     repo = "stellarium";
     rev = "v${version}";
-    sha256 = "175aj4bgi9b6bif6fvjdlpd68brcwij4x3ml0lxk6i51binv233y";
+    sha256 = "1732dxkgyqd4xf0ry7v930vcbv60l8iry596869z1d47j2piibs4";
   };
 
   nativeBuildInputs = [ cmake perl wrapQtAppsHook ];

From b872b8a2009d68636fce8e4078dc9e65a70547fe Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Sun, 29 Mar 2020 18:52:41 +0200
Subject: [PATCH 4381/4636] ghc-8.4.4.nix: Do not use git.haskell.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

which was deprecated in 2018 and is now gone for good. I guess many
won’t notice because the nix-cache kept the files around?

This fetches the patches from github. Unfortunately it seems that the
sha256 hashes (calculated with `nix-prefetch-url`) have been modified.

Alternatively, if someone has the old patches around they could arguably
be added to `tarballs.nixos.org` (it seems they are not there right
now).
---
 pkgs/development/compilers/ghc/8.4.4.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix
index 4bebd63956e7..5dda307e32b8 100644
--- a/pkgs/development/compilers/ghc/8.4.4.nix
+++ b/pkgs/development/compilers/ghc/8.4.4.nix
@@ -96,8 +96,8 @@ stdenv.mkDerivation (rec {
   outputs = [ "out" "doc" ];
 
   patches = [(fetchpatch {
-    url = "https://git.haskell.org/hsc2hs.git/patch/738f3666c878ee9e79c3d5e819ef8b3460288edf";
-    sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3";
+    url = "https://github.com/haskell/hsc2hs/commit/738f3666c878ee9e79c3d5e819ef8b3460288edf.patch";
+    sha256 = "1q3rg7lka5czsryzj2nfr3f2iy2zw87kfd54hc4dlxz79z3vwz8p";
     extraPrefix = "utils/hsc2hs/";
     stripLen = 1;
   }) (fetchpatch rec { # https://phabricator.haskell.org/D5123
@@ -112,8 +112,8 @@ stdenv.mkDerivation (rec {
     })
     ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch
     ++ stdenv.lib.optional (targetPlatform.isAarch32 || targetPlatform.isAarch64) (fetchpatch {
-      url = "https://git.haskell.org/ghc.git/patch/d8495549ba9d194815c2d0eaee6797fc7c00756a";
-      sha256 = "1yjcma507c609bcim4rnxq0gaj2dg4d001jklmbpbqpzqzxkn5sz";
+      url = "https://github.com/ghc/ghc/commit/d8495549ba9d194815c2d0eaee6797fc7c00756a.patch";
+      sha256 = "0ck3a26bvy6w3jy2x19zgixpfs3ig1ycdnq08xia1dd8gik9hjgf";
     });
 
   postPatch = "patchShebangs .";

From 56ec5a25774196473d3773e2a16a7f416b022098 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Sun, 29 Mar 2020 18:03:18 +0200
Subject: [PATCH 4382/4636] pythonPackages.pyarrow: fix test

---
 pkgs/development/python-modules/pyarrow/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix
index ab05f49ac38f..6d51729e0c32 100644
--- a/pkgs/development/python-modules/pyarrow/default.nix
+++ b/pkgs/development/python-modules/pyarrow/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytest, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }:
+{ lib, fetchpatch, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytest, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }:
 
 let
   _arrow-cpp = arrow-cpp.override { inherit python; };
@@ -9,6 +9,16 @@ buildPythonPackage rec {
 
   inherit (_arrow-cpp) version src;
 
+  patches = [
+    # Remove when updating pkgs.arrow-cpp to 0.17
+    (fetchpatch {
+      name = "ARROW-8106-fix-conversion-test";
+      url = "https://github.com/apache/arrow/commit/af20bbff30adc560d7e57dd921345d00cc8b870c.patch";
+      sha256 = "0ihpw589vh35va31ajzy5zpx3bqd9gdn3342rghi03r245kch9zd";
+      stripLen = 1;
+    })
+  ];
+
   sourceRoot = "apache-arrow-${version}/python";
 
   nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ];

From 3ad74e3997cbd4c5d74ca7d5a2b809d5588e551a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sun, 29 Mar 2020 13:59:41 -0400
Subject: [PATCH 4383/4636] nixos/display-managers: don't start pulseaudio

Hey, we have sockets.
---
 nixos/modules/services/x11/display-managers/default.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 428ca191fd8f..2a7a19e7695a 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -54,14 +54,6 @@ let
         exec &> >(tee ~/.xsession-errors)
       ''}
 
-      # Start PulseAudio if enabled.
-      ${optionalString (config.hardware.pulseaudio.enable) ''
-        # Publish access credentials in the root window.
-        if ${config.hardware.pulseaudio.package.out}/bin/pulseaudio --dump-modules | grep module-x11-publish &> /dev/null; then
-          ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY"
-        fi
-      ''}
-
       # Tell systemd about our $DISPLAY and $XAUTHORITY.
       # This is needed by the ssh-agent unit.
       #

From 1a5289f80367629e8bc784ef41d4c63c542316cf Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 29 Mar 2020 19:59:52 +0200
Subject: [PATCH 4384/4636] nixos/acme: don't depend on multi-user.target
 inside a container

On boot, a container doesn't have an uplink and would run into a timeout
while waiting for cert renewal[1].

[1] https://github.com/NixOS/nixpkgs/pull/81371#issuecomment-605526099
---
 nixos/modules/security/acme.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index b787a7675390..87217f1e3b90 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -318,7 +318,7 @@ in
                   description = "Renew ACME Certificate for ${cert}";
                   after = [ "network.target" "network-online.target" ];
                   wants = [ "network-online.target" ];
-                  wantedBy = [ "multi-user.target" ];
+                  wantedBy = mkIf (!config.boot.isContainer) [ "multi-user.target" ];
                   serviceConfig = {
                     Type = "oneshot";
                     # With RemainAfterExit the service is considered active even

From 4e554ad1bcd3651595a6729d296a0f183d7f305b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Sun, 29 Mar 2020 20:00:53 +0200
Subject: [PATCH 4385/4636] make-tarball.nix: Strip source directory from
 packages.json

https://github.com/NixOS/nixos-homepage/issues/372
---
 pkgs/top-level/make-tarball.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index 23542e4afe0a..bb0d7bc54e78 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -107,7 +107,7 @@ releaseTools.sourceTarball {
     nix-env -f . -I nixpkgs=${src} -qa --json --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp
     echo -n '}' >> tmp
     packages=$out/packages.json.br
-    jq -c < tmp | brotli -9 > $packages
+    < tmp sed "s|$(pwd)/||g" | jq -c | brotli -9 > $packages
 
     echo "file json-br $packages" >> $out/nix-support/hydra-build-products
   '';

From ca008fe328eb988fe2884ec5d625bda7acd81165 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Sun, 29 Mar 2020 21:05:28 +0300
Subject: [PATCH 4386/4636] wine{Unstable,Staging}: 5.4 -> 5.5

---
 pkgs/misc/emulators/wine/sources.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 906bec3176df..0e3eb2ce6986 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -39,23 +39,19 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "5.4";
+    version = "5.5";
     url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz";
-    sha256 = "0b052xrjb7099b7v5gx53vlzqxirik152q0fajcz25alz87jngjb";
+    sha256 = "1z7mvl6fgk7cg8vmy157r8azcz89srnckbzvsc6cva7a1fdi7qx0";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     # https://github.com/wine-staging/wine-staging/releases
     inherit (unstable) version;
-    sha256 = "0pj49wzryaaj0zxz7zzza9b36yhhwmap485qsk145sd4q2jlfhcr";
+    sha256 = "0wcj73xcxsk5897m5fg14cjir2md167m09jjjv9z9n6157bfr9fw";
     owner = "wine-staging";
     repo = "wine-staging";
-    # FIXME: built from direct commit revision, due important post-release fix
-    # Revert to use `v${version}` after 5.5 release.
-    # Thanks to Zebediah Figura <z.figura12@gmail.com> for operative fixup.
-    ## rev = "v${version}";
-    rev = "a1246b5e921ea950851e4a971fb3dae535d7b982";
+    rev = "v${version}";
   };
 
   winetricks = fetchFromGitHub rec {

From 0dd5ccc742eab4332b98065af328275a21bf8ea5 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 29 Mar 2020 19:57:44 +0200
Subject: [PATCH 4387/4636] mesos,swiften,pingus: Mark as broken

Those packages are broken for >4 months, which is why it seems best to
mark them as broken for now. I noticed these while testing #75877.
---
 pkgs/applications/networking/cluster/mesos/default.nix | 1 +
 pkgs/development/libraries/swiften/default.nix         | 1 +
 pkgs/games/pingus/default.nix                          | 1 +
 3 files changed, 3 insertions(+)

diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index ec152fdc4648..ac1feee5d72b 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -258,5 +258,6 @@ in stdenv.mkDerivation rec {
     description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks";
     maintainers = with maintainers; [ cstrahan offline ];
     platforms   = platforms.unix;
+    broken = true; # Broken since 2019-10-22 (https://hydra.nixos.org/build/115475123)
   };
 }
diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix
index c8c60c1f8ea6..edf882894a5b 100644
--- a/pkgs/development/libraries/swiften/default.nix
+++ b/pkgs/development/libraries/swiften/default.nix
@@ -33,5 +33,6 @@ stdenv.mkDerivation rec {
     license     = licenses.gpl2Plus;
     platforms   = platforms.linux;
     maintainers = [ maintainers.twey ];
+    broken = true; # Broken since 2019-11-20 (https://hydra.nixos.org/build/114681755)
   };
 }
diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix
index 628493a34b1b..297911c5d15f 100644
--- a/pkgs/games/pingus/default.nix
+++ b/pkgs/games/pingus/default.nix
@@ -33,5 +33,6 @@ stdenv.mkDerivation {
     platforms = stdenv.lib.platforms.linux;
     maintainers = [stdenv.lib.maintainers.raskin];
     license = stdenv.lib.licenses.gpl3;
+    broken = true; # Broken since 2019-11-20 (https://hydra.nixos.org/build/114721280)
   };
 }

From 5e8545e72341887bb371407a71a723bc0e9c7844 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Sun, 29 Mar 2020 20:14:15 +0200
Subject: [PATCH 4388/4636] make-tarball.nix: Restore the 'commit' field in
 packages.json

Also change incorrect 'revision' to 'rev' in the default value for
'nixpkgs' in release.nix.

Fixes https://github.com/NixOS/nixos-homepage/issues/372.
---
 doc/doc-support/lib-function-locations.nix | 2 +-
 pkgs/top-level/make-tarball.nix            | 2 +-
 pkgs/top-level/release.nix                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/doc-support/lib-function-locations.nix b/doc/doc-support/lib-function-locations.nix
index 68edd2709854..53a96bc2659e 100644
--- a/doc/doc-support/lib-function-locations.nix
+++ b/doc/doc-support/lib-function-locations.nix
@@ -1,6 +1,6 @@
 { pkgs ? (import ./.. { }), nixpkgs ? { }}:
 let
-  revision = pkgs.lib.trivial.revisionWithDefault (nixpkgs.revision or "master");
+  revision = pkgs.lib.trivial.revisionWithDefault (nixpkgs.rev or "master");
 
   libDefPos = set:
     builtins.map
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index bb0d7bc54e78..9bb9e99b4cef 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -103,7 +103,7 @@ releaseTools.sourceTarball {
 
     header "generating packages.json"
     mkdir -p $out/nix-support
-    echo -n '{"version":2,"packages":' > tmp
+    echo -n '{"version":2,"commit":"${nixpkgs.rev}","packages":' > tmp
     nix-env -f . -I nixpkgs=${src} -qa --json --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp
     echo -n '}' >> tmp
     packages=$out/packages.json.br
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index e0723523f4e5..ca1343261dba 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -8,7 +8,7 @@
 
    $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux
 */
-{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; revision = "0000000000000000000000000000000000000000"; }
+{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; rev = "0000000000000000000000000000000000000000"; }
 , officialRelease ? false
   # The platforms for which we build Nixpkgs.
 , supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]

From f4f8921f97eefb1b5832f36f7b757bcb91b7cb24 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 29 Mar 2020 20:50:19 +0200
Subject: [PATCH 4389/4636] nixos/gerrit: stop setting jvmPackage (#83696)

jdk12_headless disappeared in d00559ebb84af84b48a207a5a0a0762ce9d577eb,
and just using the default in the VM test should be fine IMHO.
---
 nixos/tests/gerrit.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/tests/gerrit.nix b/nixos/tests/gerrit.nix
index e8b5cb4c4feb..6cee64a20095 100644
--- a/nixos/tests/gerrit.nix
+++ b/nixos/tests/gerrit.nix
@@ -24,7 +24,6 @@ in {
           enable = true;
           serverId = "aa76c84b-50b0-4711-a0a0-1ee30e45bbd0";
           listenAddress = "[::]:80";
-          jvmPackage = pkgs.jdk12_headless;
           jvmHeapLimit = "1g";
 
           plugins = [ lfs ];

From 855a12eacff57f0b9a6e34e93cd78d1adfc10d6a Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 29 Mar 2020 20:57:50 +0200
Subject: [PATCH 4390/4636] Revert "make-tarball.nix: Restore the 'commit'
 field in packages.json"

This reverts commit 5e8545e72341887bb371407a71a723bc0e9c7844.

It breaks eval:

attribute 'rev' missing, at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/eval-0-gleber.ewr1.nix.ci/pkgs/top-level/make-tarball.nix:106:39
---
 doc/doc-support/lib-function-locations.nix | 2 +-
 pkgs/top-level/make-tarball.nix            | 2 +-
 pkgs/top-level/release.nix                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/doc-support/lib-function-locations.nix b/doc/doc-support/lib-function-locations.nix
index 53a96bc2659e..68edd2709854 100644
--- a/doc/doc-support/lib-function-locations.nix
+++ b/doc/doc-support/lib-function-locations.nix
@@ -1,6 +1,6 @@
 { pkgs ? (import ./.. { }), nixpkgs ? { }}:
 let
-  revision = pkgs.lib.trivial.revisionWithDefault (nixpkgs.rev or "master");
+  revision = pkgs.lib.trivial.revisionWithDefault (nixpkgs.revision or "master");
 
   libDefPos = set:
     builtins.map
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index 9bb9e99b4cef..bb0d7bc54e78 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -103,7 +103,7 @@ releaseTools.sourceTarball {
 
     header "generating packages.json"
     mkdir -p $out/nix-support
-    echo -n '{"version":2,"commit":"${nixpkgs.rev}","packages":' > tmp
+    echo -n '{"version":2,"packages":' > tmp
     nix-env -f . -I nixpkgs=${src} -qa --json --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp
     echo -n '}' >> tmp
     packages=$out/packages.json.br
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index ca1343261dba..e0723523f4e5 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -8,7 +8,7 @@
 
    $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux
 */
-{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; rev = "0000000000000000000000000000000000000000"; }
+{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; revision = "0000000000000000000000000000000000000000"; }
 , officialRelease ? false
   # The platforms for which we build Nixpkgs.
 , supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]

From 29ca177c684cb42f0ea57171be5653b9b5060ba7 Mon Sep 17 00:00:00 2001
From: Joachim Breitner <mail@joachim-breitner.de>
Date: Sun, 29 Mar 2020 21:07:48 +0200
Subject: [PATCH 4391/4636] Use .diff, not .patch, and fix sha hashes

---
 pkgs/development/compilers/ghc/8.4.4.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix
index 5dda307e32b8..57d6a108de09 100644
--- a/pkgs/development/compilers/ghc/8.4.4.nix
+++ b/pkgs/development/compilers/ghc/8.4.4.nix
@@ -96,8 +96,8 @@ stdenv.mkDerivation (rec {
   outputs = [ "out" "doc" ];
 
   patches = [(fetchpatch {
-    url = "https://github.com/haskell/hsc2hs/commit/738f3666c878ee9e79c3d5e819ef8b3460288edf.patch";
-    sha256 = "1q3rg7lka5czsryzj2nfr3f2iy2zw87kfd54hc4dlxz79z3vwz8p";
+    url = "https://github.com/haskell/hsc2hs/commit/738f3666c878ee9e79c3d5e819ef8b3460288edf.diff";
+    sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3";
     extraPrefix = "utils/hsc2hs/";
     stripLen = 1;
   }) (fetchpatch rec { # https://phabricator.haskell.org/D5123
@@ -112,8 +112,8 @@ stdenv.mkDerivation (rec {
     })
     ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch
     ++ stdenv.lib.optional (targetPlatform.isAarch32 || targetPlatform.isAarch64) (fetchpatch {
-      url = "https://github.com/ghc/ghc/commit/d8495549ba9d194815c2d0eaee6797fc7c00756a.patch";
-      sha256 = "0ck3a26bvy6w3jy2x19zgixpfs3ig1ycdnq08xia1dd8gik9hjgf";
+      url = "https://github.com/ghc/ghc/commit/d8495549ba9d194815c2d0eaee6797fc7c00756a.diff";
+      sha256 = "1yjcma507c609bcim4rnxq0gaj2dg4d001jklmbpbqpzqzxkn5sz";
     });
 
   postPatch = "patchShebangs .";

From 35a2f790f6ab53834f57174578fd58a2b51a4cfb Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 29 Mar 2020 21:38:05 +0200
Subject: [PATCH 4392/4636] pingus: 0.7.6 -> unstable; fixes build conflicts
 with dependency updates

---
 pkgs/games/pingus/default.nix      | 44 ++++++++++--------------------
 pkgs/games/pingus/default.upstream |  1 -
 2 files changed, 14 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/games/pingus/default.upstream

diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix
index 297911c5d15f..e96e1a6a6e06 100644
--- a/pkgs/games/pingus/default.nix
+++ b/pkgs/games/pingus/default.nix
@@ -1,38 +1,22 @@
-{stdenv, fetchurl, fetchpatch, scons, SDL, SDL_image, boost, libpng, SDL_mixer
-, pkgconfig, libGLU, libGL}:
-let
-  s = # Generated upstream information
-  {
-    baseName="pingus";
-    version="0.7.6";
-    name="pingus-0.7.6";
-    hash="0q34d2k6anzqvb0mf67x85q92lfx9jr71ry13dlp47jx0x9i573m";
-    url="http://pingus.googlecode.com/files/pingus-0.7.6.tar.bz2";
-    sha256="0q34d2k6anzqvb0mf67x85q92lfx9jr71ry13dlp47jx0x9i573m";
+{stdenv, fetchgit, cmake, SDL2, SDL2_image, boost, libpng, SDL2_mixer
+, pkgconfig, libGLU, libGL, git, jsoncpp }:
+stdenv.mkDerivation rec {
+  pname = "pingus";
+  version = "unstable-0.7.6.0.20191104";
+
+  nativeBuildInputs = [ pkgconfig git ];
+  buildInputs = [ cmake SDL2 SDL2_image boost libpng SDL2_mixer libGLU libGL jsoncpp ];
+  src = fetchgit {
+    url = "https://gitlab.com/pingus/pingus/";
+    rev = "709546d9b9c4d6d5f45fc9112b45ac10c7f9417d";
+    sha256 = "sha256:11mmzk0766riaw5qyd1r5i7s7vczbbzfccm92bvgrm99iy1sj022";
+    fetchSubmodules = true;
   };
-in
-stdenv.mkDerivation {
-  inherit (s) name version;
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [scons SDL SDL_image boost libpng SDL_mixer libGLU libGL];
-  src = fetchurl {
-    inherit (s) url sha256;
-  };
-  patches = [
-    # fix build with gcc7
-    (fetchpatch {
-      url = https://github.com/Pingus/pingus/commit/df6e2f445d3e2925a94d22faeb17be9444513e92.patch;
-      sha256 = "0nqyhznnnvpgfa6rfv8rapjfpw99b67n97jfqp9r3hpib1b3ja6p";
-    })
-  ];
-  makeFlags = [ "PREFIX=${placeholder "out"}" ];
-  dontUseSconsInstall = true;
+
   meta = {
-    inherit (s) version;
     description = ''A puzzle game with mechanics similar to Lemmings'';
     platforms = stdenv.lib.platforms.linux;
     maintainers = [stdenv.lib.maintainers.raskin];
     license = stdenv.lib.licenses.gpl3;
-    broken = true; # Broken since 2019-11-20 (https://hydra.nixos.org/build/114721280)
   };
 }
diff --git a/pkgs/games/pingus/default.upstream b/pkgs/games/pingus/default.upstream
deleted file mode 100644
index 6b4eb31aa5f6..000000000000
--- a/pkgs/games/pingus/default.upstream
+++ /dev/null
@@ -1 +0,0 @@
-url http://pingus.seul.org/download.html

From 2d6afe6ba581ac6b4bff66d352ffd4c7507ed33c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2020 19:59:16 +0000
Subject: [PATCH 4393/4636] groonga: 9.1.2 -> 10.0.0

---
 pkgs/servers/search/groonga/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix
index 57f3b2e0f1b5..3877740c84cd 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/pkgs/servers/search/groonga/default.nix
@@ -7,11 +7,11 @@
 stdenv.mkDerivation rec {
 
   pname = "groonga";
-  version = "9.1.2";
+  version = "10.0.0";
 
   src = fetchurl {
     url    = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz";
-    sha256 = "0zj9zribkg4x6c6175pwl4i6jpxg045bca1ywfrfcdsxkjllvk7g";
+    sha256 = "01wacd9rijnjydshsl7z0waasr87gxkwr0kr647chczcxlh1b9gr";
   };
 
   buildInputs = with stdenv.lib;

From c76bad0ec06eed1fc387e9e610f037313a4cdde9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 29 Mar 2020 16:50:02 -0400
Subject: [PATCH 4394/4636] linux: 5.6-rc5 -> 5.6-rc7

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 4098c30c744e..e63fe96be6b9 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.6-rc5";
+  version = "5.6-rc7";
   extraMeta.branch = "5.6";
 
   # modDirVersion needs to be x.y.z, will always add .0
@@ -11,7 +11,7 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0ys4wdv1rf9vshras1n6syy2pgg8kv50f27nprfzhrllni044whr";
+    sha256 = "0wv3ipfm970y2pyadwn5g7hd9bj117qk8jl8sdhrasbsy1p8936i";
   };
 
   # Should the testing kernels ever be built on Hydra?

From f37aa7dd69fde18e8f1602444e2530c23d4480f9 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Mon, 18 Nov 2019 12:39:18 -0800
Subject: [PATCH 4395/4636] nixos/azure: add diskSize module option

---
 nixos/modules/virtualisation/azure-image.nix | 46 ++++++++++++--------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
index e91dd72ff5d4..94c48b59a7d2 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -2,27 +2,37 @@
 
 with lib;
 let
-  diskSize = 2048;
+  cfg = config.virtualisation.azureImage;
 in
 {
-  system.build.azureImage = import ../../lib/make-disk-image.nix {
-    name = "azure-image";
-    postVM = ''
-      ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -o subformat=fixed,force_size -O vpc $diskImage $out/disk.vhd
-    '';
-    configFile = ./azure-config-user.nix;
-    format = "raw";
-    inherit diskSize;
-    inherit config lib pkgs;
-  };
-
   imports = [ ./azure-common.nix ];
+  
+  options = {
+    virtualisation.azureImage.diskSize = mkOption {
+      type = with types; int;
+      default = 2048;
+      description = ''
+        Size of disk image. Unit is MB.
+      '';
+    };
+  };
+  config = {
+    system.build.azureImage = import ../../lib/make-disk-image.nix {
+      name = "azure-image";
+      postVM = ''
+        ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -o subformat=fixed,force_size -O vpc $diskImage $out/disk.vhd
+      '';
+      configFile = ./azure-config-user.nix;
+      format = "raw";
+      inherit (cfg) diskSize;
+      inherit config lib pkgs;
+    };
 
-  # Azure metadata is available as a CD-ROM drive.
-  fileSystems."/metadata".device = "/dev/sr0";
+    # Azure metadata is available as a CD-ROM drive.
+    fileSystems."/metadata".device = "/dev/sr0";
 
-  systemd.services.fetch-ssh-keys =
-    { description = "Fetch host keys and authorized_keys for root user";
+    systemd.services.fetch-ssh-keys = {
+      description = "Fetch host keys and authorized_keys for root user";
 
       wantedBy = [ "sshd.service" "waagent.service" ];
       before = [ "sshd.service" "waagent.service" ];
@@ -54,6 +64,6 @@ in
       serviceConfig.RemainAfterExit = true;
       serviceConfig.StandardError = "journal+console";
       serviceConfig.StandardOutput = "journal+console";
-     };
-
+    };
+  };
 }

From a5a6d77508dfd515e5f94ad92d2dfb9065e787c0 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Thu, 26 Mar 2020 05:39:35 +0000
Subject: [PATCH 4396/4636] azure: boot.growPartition = true

---
 nixos/modules/virtualisation/azure-common.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix
index 03239991b95a..8efa177e30d1 100644
--- a/nixos/modules/virtualisation/azure-common.nix
+++ b/nixos/modules/virtualisation/azure-common.nix
@@ -15,6 +15,8 @@ with lib;
   boot.loader.grub.version = 2;
   boot.loader.timeout = 0;
 
+  boot.growPartition = true;
+
   # Don't put old configurations in the GRUB menu.  The user has no
   # way to select them anyway.
   boot.loader.grub.configurationLimit = 0;

From 20f981de08d8bc407d0897c03b963f5aba6fda50 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Thu, 26 Mar 2020 06:11:54 +0000
Subject: [PATCH 4397/4636] azure: init nixos/maintainers/scripts/azure-new

---
 .../maintainers/scripts/azure-new/.gitignore  |  1 +
 nixos/maintainers/scripts/azure-new/README.md | 30 ++++++++++
 .../maintainers/scripts/azure-new/boot-vm.sh  | 36 ++++++++++++
 nixos/maintainers/scripts/azure-new/common.sh |  7 +++
 .../azure-new/examples/basic/image.nix        | 10 ++++
 .../azure-new/examples/basic/system.nix       | 42 ++++++++++++++
 nixos/maintainers/scripts/azure-new/shell.nix | 13 +++++
 .../scripts/azure-new/upload-image.sh         | 55 +++++++++++++++++++
 nixos/modules/virtualisation/azure-image.nix  |  1 +
 9 files changed, 195 insertions(+)
 create mode 100644 nixos/maintainers/scripts/azure-new/.gitignore
 create mode 100644 nixos/maintainers/scripts/azure-new/README.md
 create mode 100755 nixos/maintainers/scripts/azure-new/boot-vm.sh
 create mode 100644 nixos/maintainers/scripts/azure-new/common.sh
 create mode 100644 nixos/maintainers/scripts/azure-new/examples/basic/image.nix
 create mode 100644 nixos/maintainers/scripts/azure-new/examples/basic/system.nix
 create mode 100644 nixos/maintainers/scripts/azure-new/shell.nix
 create mode 100755 nixos/maintainers/scripts/azure-new/upload-image.sh

diff --git a/nixos/maintainers/scripts/azure-new/.gitignore b/nixos/maintainers/scripts/azure-new/.gitignore
new file mode 100644
index 000000000000..26905a862347
--- /dev/null
+++ b/nixos/maintainers/scripts/azure-new/.gitignore
@@ -0,0 +1 @@
+azure
\ No newline at end of file
diff --git a/nixos/maintainers/scripts/azure-new/README.md b/nixos/maintainers/scripts/azure-new/README.md
new file mode 100644
index 000000000000..1bc8d8a29384
--- /dev/null
+++ b/nixos/maintainers/scripts/azure-new/README.md
@@ -0,0 +1,30 @@
+# azure
+
+## Demo
+
+Here's a demo of this being used: https://asciinema.org/a/euXb9dIeUybE3VkstLWLbvhmp
+
+## Usage
+
+Build and upload the image
+```shell
+$ ./upload-image.sh ./examples/basic/image.nix
+
+...
++ attr=azbasic
++ nix-build ./examples/basic/image.nix --out-link azure
+/nix/store/qdpzknpskzw30vba92mb24xzll1dqsmd-azure-image
+...
+95.5 %, 0 Done, 0 Failed, 1 Pending, 0 Skipped, 1 Total, 2-sec Throughput (Mb/s): 932.9565 
+...
+/subscriptions/aff271ee-e9be-4441-b9bb-42f5af4cbaeb/resourceGroups/nixos-images/providers/Microsoft.Compute/images/azure-image-todo-makethisbetter
+```
+
+Take the output, boot an Azure VM:
+
+```
+img="/subscriptions/.../..." # use output from last command
+./boot-vm.sh "${img}"
+...
+=> booted
+```
diff --git a/nixos/maintainers/scripts/azure-new/boot-vm.sh b/nixos/maintainers/scripts/azure-new/boot-vm.sh
new file mode 100755
index 000000000000..1ce3a5f9db1e
--- /dev/null
+++ b/nixos/maintainers/scripts/azure-new/boot-vm.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+set -euo pipefail
+set -x
+
+image="${1}"
+location="westus2"
+group="nixos-test-vm"
+vm_size="Standard_D2s_v3";  os_size=42;
+
+# ensure group
+az group create --location "westus2" --name "${group}"
+group_id="$(az group show --name "${group}" -o tsv --query "[id]")"
+
+# (optional) identity
+if ! az identity show -n "${group}-identity" -g "${group}" &>/dev/stderr; then
+  az identity create --name "${group}-identity" --resource-group "${group}"
+fi
+
+# (optional) role assignment, to the resource group, bad but not really great alternatives
+identity_id="$(az identity show --name "${group}-identity" --resource-group "${group}" -o tsv --query "[id]")"
+principal_id="$(az identity show --name "${group}-identity" --resource-group "${group}" -o tsv --query "[principalId]")"
+until az role assignment create --assignee "${principal_id}" --role "Owner" --scope "${group_id}"; do sleep 1; done
+
+# boot vm
+az vm create \
+  --name "${group}-vm" \
+  --resource-group "${group}" \
+  --assign-identity "${identity_id}" \
+  --size "${vm_size}" \
+  --os-disk-size-gb "${os_size}" \
+  --image "${image}" \
+  --admin-username "${USER}" \
+  --location "westus2" \
+  --storage-sku "Premium_LRS" \
+  --ssh-key-values "$(ssh-add -L)"
+
diff --git a/nixos/maintainers/scripts/azure-new/common.sh b/nixos/maintainers/scripts/azure-new/common.sh
new file mode 100644
index 000000000000..eb87c3e06501
--- /dev/null
+++ b/nixos/maintainers/scripts/azure-new/common.sh
@@ -0,0 +1,7 @@
+export group="${AZURE_RESOURCE_GROUP:-"azure"}"
+export location="${AZURE_LOCATION:-"westus2"}"
+
+img_file=$(echo azure/*.vhd)
+img_name="$(basename "${img_file}")"
+img_name="${img_name%".vhd"}"
+export img_name="${img_name//[._]/-}"
diff --git a/nixos/maintainers/scripts/azure-new/examples/basic/image.nix b/nixos/maintainers/scripts/azure-new/examples/basic/image.nix
new file mode 100644
index 000000000000..74b128151587
--- /dev/null
+++ b/nixos/maintainers/scripts/azure-new/examples/basic/image.nix
@@ -0,0 +1,10 @@
+let
+  pkgs = (import <nixpkgs> {});
+  machine = import "${pkgs.path}/nixos/lib/eval-config.nix" {
+    system = "x86_64-linux";
+    modules = [
+      ({config, ...}: { imports = [ ./system.nix ]; })
+    ];
+  };
+in
+  machine.config.system.build.azureImage
diff --git a/nixos/maintainers/scripts/azure-new/examples/basic/system.nix b/nixos/maintainers/scripts/azure-new/examples/basic/system.nix
new file mode 100644
index 000000000000..7e4d245d6ccf
--- /dev/null
+++ b/nixos/maintainers/scripts/azure-new/examples/basic/system.nix
@@ -0,0 +1,42 @@
+{ pkgs, modulesPath, ... }:
+
+{
+  imports = [
+    "${modulesPath}/virtualisation/azure-common.nix"
+    "${modulesPath}/virtualisation/azure-image.nix"
+  ];
+
+  ##### test user ######
+  users.extraGroups."cole".gid = 1000;
+    users.extraUsers."cole" = {
+      isNormalUser = true;
+      home = "/home/cole";
+      description = "Cole Mickens";
+      openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC9YAN+P0umXeSP/Cgd5ZvoD5gpmkdcrOjmHdonvBbptbMUbI/Zm0WahBDK0jO5vfJ/C6A1ci4quMGCRh98LRoFKFRoWdwlGFcFYcLkuG/AbE8ObNLHUxAwqrdNfIV6z0+zYi3XwVjxrEqyJ/auZRZ4JDDBha2y6Wpru8v9yg41ogeKDPgHwKOf/CKX77gCVnvkXiG5ltcEZAamEitSS8Mv8Rg/JfsUUwULb6yYGh+H6RECKriUAl9M+V11SOfv8MAdkXlYRrcqqwuDAheKxNGHEoGLBk+Fm+orRChckW1QcP89x6ioxpjN9VbJV0JARF+GgHObvvV+dGHZZL1N3jr8WtpHeJWxHPdBgTupDIA5HeL0OCoxgSyyfJncMl8odCyUqE+lqXVz+oURGeRxnIbgJ07dNnX6rFWRgQKrmdV4lt1i1F5Uux9IooYs/42sKKMUQZuBLTN4UzipPQM/DyDO01F0pdcaPEcIO+tp2U6gVytjHhZqEeqAMaUbq7a6ucAuYzczGZvkApc85nIo9jjW+4cfKZqV8BQfJM1YnflhAAplIq6b4Tzayvw1DLXd2c5rae+GlVCsVgpmOFyT6bftSon/HfxwBE4wKFYF7fo7/j6UbAeXwLafDhX+S5zSNR6so1epYlwcMLshXqyJePJNhtsRhpGLd9M3UqyGDAFoOQ== (none)"];
+      #mkpasswd -m sha-512
+      hashedPassword = "$6$k.vT0coFt3$BbZN9jqp6Yw75v9H/wgFs9MZfd5Ycsfthzt3Jdw8G93YhaiFjkmpY5vCvJ.HYtw0PZOye6N9tBjNS698tM3i/1";
+      uid = 1000;
+      group = "cole";
+    };
+    nix.trustedUsers = [ "cole" ];
+  ##### test user ######
+
+  virtualisation.azureImage.diskSize = 2500;
+
+  system.stateVersion = "20.03";
+  networking.hostName = "azbuildworld";
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
+  #environment.noXlibs = true;
+  #documentation.enable = false;
+  #documentation.nixos.enable = false;
+
+  services.openssh.passwordAuthentication = false;
+  programs.mosh.enable = true;
+
+  security.sudo.wheelNeedsPassword = false;
+    
+  environment.systemPackages = with pkgs; [
+    git neovim jq file htop ripgrep cachix wget curl tmux zsh
+  ];
+}
diff --git a/nixos/maintainers/scripts/azure-new/shell.nix b/nixos/maintainers/scripts/azure-new/shell.nix
new file mode 100644
index 000000000000..592f1bf9056e
--- /dev/null
+++ b/nixos/maintainers/scripts/azure-new/shell.nix
@@ -0,0 +1,13 @@
+with (import ../../../../default.nix {});
+stdenv.mkDerivation {
+  name = "nixcfg-azure-devenv";
+
+  nativeBuildInputs = [
+    azure-cli
+    bash
+    cacert
+    azure-storage-azcopy
+  ];
+
+  AZURE_CONFIG_DIR="/tmp/azure-cli/.azure";
+}
diff --git a/nixos/maintainers/scripts/azure-new/upload-image.sh b/nixos/maintainers/scripts/azure-new/upload-image.sh
new file mode 100755
index 000000000000..4f3da6778e89
--- /dev/null
+++ b/nixos/maintainers/scripts/azure-new/upload-image.sh
@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+set -euo pipefail
+set -x
+
+attr="${1:-"azbasic"}"
+
+nix-build ./examples/basic/image.nix --out-link "azure"
+
+group="nixos-images"
+location="westus2"
+img_name="azure-image-todo-makethisbetter" # TODO: clean this up
+img_file="$(readlink -f ./azure/disk.vhd)" # TODO: this doesn't feel great either
+
+if ! az group show -n "${group}" &>/dev/null; then
+  az group create --name "${group}" --location "${location}"
+fi
+
+if ! az disk show -g "${group}" -n "${img_name}" &>/dev/null; then
+  bytes="$(stat -c %s ${img_file})"
+  size="30"
+  az disk create \
+    --resource-group "${group}" \
+    --name "${img_name}" \
+    --for-upload true --upload-size-bytes "${bytes}"
+
+  timeout=$(( 60 * 60 )) # disk access token timeout
+  sasurl="$(\
+    az disk grant-access \
+      --access-level Write \
+      --resource-group "${group}" \
+      --name "${img_name}" \
+      --duration-in-seconds ${timeout} \
+        | jq -r '.accessSas'
+  )"
+
+  azcopy copy "${img_file}" "${sasurl}" \
+    --blob-type PageBlob 
+    
+  az disk revoke-access \
+    --resource-group "${group}" \
+    --name "${img_name}"
+fi
+
+if ! az image show -g "${group}" -n "${img_name}" &>/dev/null; then
+  diskid="$(az disk show -g "${group}" -n "${img_name}" -o json | jq -r .id)"
+
+  az image create \
+    --resource-group "${group}" \
+    --name "${img_name}" \
+    --source "${diskid}" \
+    --os-type "linux" >/dev/null
+fi
+
+imageid="$(az image show -g "${group}" -n "${img_name}" -o json | jq -r .id)"
+echo "${imageid}"
diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
index 94c48b59a7d2..21fd58e5c902 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -21,6 +21,7 @@ in
       name = "azure-image";
       postVM = ''
         ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -o subformat=fixed,force_size -O vpc $diskImage $out/disk.vhd
+        rm $diskImage
       '';
       configFile = ./azure-config-user.nix;
       format = "raw";

From c2b2cc6dbdc02a9b1b3450d24c4b387e5c2203b7 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Fri, 27 Mar 2020 19:59:18 +0000
Subject: [PATCH 4398/4636] nixos/azure: simplify example image

---
 nixos/maintainers/scripts/azure-new/README.md |  5 +++
 .../azure-new/examples/basic/system.nix       | 35 +++++++------------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/nixos/maintainers/scripts/azure-new/README.md b/nixos/maintainers/scripts/azure-new/README.md
index 1bc8d8a29384..ee1fc682534c 100644
--- a/nixos/maintainers/scripts/azure-new/README.md
+++ b/nixos/maintainers/scripts/azure-new/README.md
@@ -6,6 +6,11 @@ Here's a demo of this being used: https://asciinema.org/a/euXb9dIeUybE3VkstLWLbv
 
 ## Usage
 
+This is meant to be an example image that you can copy into your own
+project and modify to your own needs. Notice that the example image
+includes a built-in test user account, which by default uses your
+`~/.ssh/id_ed25519.pub` as an `authorized_key`.
+
 Build and upload the image
 ```shell
 $ ./upload-image.sh ./examples/basic/image.nix
diff --git a/nixos/maintainers/scripts/azure-new/examples/basic/system.nix b/nixos/maintainers/scripts/azure-new/examples/basic/system.nix
index 7e4d245d6ccf..5f98216d183d 100644
--- a/nixos/maintainers/scripts/azure-new/examples/basic/system.nix
+++ b/nixos/maintainers/scripts/azure-new/examples/basic/system.nix
@@ -1,42 +1,31 @@
 { pkgs, modulesPath, ... }:
 
+let username = "azurenixosuser";
+in
 {
   imports = [
     "${modulesPath}/virtualisation/azure-common.nix"
     "${modulesPath}/virtualisation/azure-image.nix"
   ];
 
-  ##### test user ######
-  users.extraGroups."cole".gid = 1000;
-    users.extraUsers."cole" = {
-      isNormalUser = true;
-      home = "/home/cole";
-      description = "Cole Mickens";
-      openssh.authorizedKeys.keys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC9YAN+P0umXeSP/Cgd5ZvoD5gpmkdcrOjmHdonvBbptbMUbI/Zm0WahBDK0jO5vfJ/C6A1ci4quMGCRh98LRoFKFRoWdwlGFcFYcLkuG/AbE8ObNLHUxAwqrdNfIV6z0+zYi3XwVjxrEqyJ/auZRZ4JDDBha2y6Wpru8v9yg41ogeKDPgHwKOf/CKX77gCVnvkXiG5ltcEZAamEitSS8Mv8Rg/JfsUUwULb6yYGh+H6RECKriUAl9M+V11SOfv8MAdkXlYRrcqqwuDAheKxNGHEoGLBk+Fm+orRChckW1QcP89x6ioxpjN9VbJV0JARF+GgHObvvV+dGHZZL1N3jr8WtpHeJWxHPdBgTupDIA5HeL0OCoxgSyyfJncMl8odCyUqE+lqXVz+oURGeRxnIbgJ07dNnX6rFWRgQKrmdV4lt1i1F5Uux9IooYs/42sKKMUQZuBLTN4UzipPQM/DyDO01F0pdcaPEcIO+tp2U6gVytjHhZqEeqAMaUbq7a6ucAuYzczGZvkApc85nIo9jjW+4cfKZqV8BQfJM1YnflhAAplIq6b4Tzayvw1DLXd2c5rae+GlVCsVgpmOFyT6bftSon/HfxwBE4wKFYF7fo7/j6UbAeXwLafDhX+S5zSNR6so1epYlwcMLshXqyJePJNhtsRhpGLd9M3UqyGDAFoOQ== (none)"];
-      #mkpasswd -m sha-512
-      hashedPassword = "$6$k.vT0coFt3$BbZN9jqp6Yw75v9H/wgFs9MZfd5Ycsfthzt3Jdw8G93YhaiFjkmpY5vCvJ.HYtw0PZOye6N9tBjNS698tM3i/1";
-      uid = 1000;
-      group = "cole";
-    };
-    nix.trustedUsers = [ "cole" ];
-  ##### test user ######
+  users.users."${username}" = {
+    isNormalUser = true;
+    home = "/home/${username}";
+    description = "Azure NixOS Test User";
+    openssh.authorizedKeys.keys = [ (builtins.readFile ~/.ssh/id_ed25519.pub) ];
+  };
+  nix.trustedUsers = [ username ];
 
   virtualisation.azureImage.diskSize = 2500;
 
   system.stateVersion = "20.03";
-  networking.hostName = "azbuildworld";
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
-  #environment.noXlibs = true;
-  #documentation.enable = false;
-  #documentation.nixos.enable = false;
-
+  # test user doesn't have a password
   services.openssh.passwordAuthentication = false;
-  programs.mosh.enable = true;
-
   security.sudo.wheelNeedsPassword = false;
-    
+
   environment.systemPackages = with pkgs; [
-    git neovim jq file htop ripgrep cachix wget curl tmux zsh
+    git file htop wget curl
   ];
 }

From a5de97f21e688e23f5c261a397950788162f7041 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Fri, 27 Mar 2020 20:01:20 +0000
Subject: [PATCH 4399/4636] nixos/azure: upload-image names the image better

---
 nixos/maintainers/scripts/azure-new/upload-image.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nixos/maintainers/scripts/azure-new/upload-image.sh b/nixos/maintainers/scripts/azure-new/upload-image.sh
index 4f3da6778e89..4dd5cdfd019f 100755
--- a/nixos/maintainers/scripts/azure-new/upload-image.sh
+++ b/nixos/maintainers/scripts/azure-new/upload-image.sh
@@ -8,13 +8,16 @@ nix-build ./examples/basic/image.nix --out-link "azure"
 
 group="nixos-images"
 location="westus2"
-img_name="azure-image-todo-makethisbetter" # TODO: clean this up
-img_file="$(readlink -f ./azure/disk.vhd)" # TODO: this doesn't feel great either
+img_name="nixos-image"
+img_file="$(readlink -f ./azure/disk.vhd)"
 
 if ! az group show -n "${group}" &>/dev/null; then
   az group create --name "${group}" --location "${location}"
 fi
 
+# note: the disk access token song/dance is tedious
+# but allows us to upload direct to a disk image
+# thereby avoid storage accounts (and naming them) entirely!
 if ! az disk show -g "${group}" -n "${img_name}" &>/dev/null; then
   bytes="$(stat -c %s ${img_file})"
   size="30"

From 627ae7e0570cec26e6fd54e2b499cab81e5ea884 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Fri, 27 Mar 2020 23:13:33 +0000
Subject: [PATCH 4400/4636] nixos/azure: upload-image.sh cleanup $1 handling

---
 nixos/maintainers/scripts/azure-new/upload-image.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/maintainers/scripts/azure-new/upload-image.sh b/nixos/maintainers/scripts/azure-new/upload-image.sh
index 4dd5cdfd019f..1466dcd1f0a2 100755
--- a/nixos/maintainers/scripts/azure-new/upload-image.sh
+++ b/nixos/maintainers/scripts/azure-new/upload-image.sh
@@ -2,9 +2,9 @@
 set -euo pipefail
 set -x
 
-attr="${1:-"azbasic"}"
+image_nix="${1:-"./examples/basic/image.nix"}"
 
-nix-build ./examples/basic/image.nix --out-link "azure"
+nix-build "${image_nix}" --out-link "azure"
 
 group="nixos-images"
 location="westus2"

From 1992768157d7456748ec28e01c8952cf09b53fbf Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Fri, 27 Mar 2020 23:42:32 +0000
Subject: [PATCH 4401/4636] nixos/azure: clarify how users work in basic
 example

---
 nixos/maintainers/scripts/azure-new/README.md              | 7 +++++++
 .../scripts/azure-new/examples/basic/system.nix            | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/nixos/maintainers/scripts/azure-new/README.md b/nixos/maintainers/scripts/azure-new/README.md
index ee1fc682534c..20e81c44ce5d 100644
--- a/nixos/maintainers/scripts/azure-new/README.md
+++ b/nixos/maintainers/scripts/azure-new/README.md
@@ -33,3 +33,10 @@ img="/subscriptions/.../..." # use output from last command
 ...
 => booted
 ```
+
+## Future Work
+
+1. If the user specifies a hard-coded user, then the agent could be removed.
+   Probably has security benefits; definitely has closure-size benefits.
+   (It's likely the VM will need to be booted with a special flag. See:
+   https://github.com/Azure/azure-cli/issues/12775 for details.)
diff --git a/nixos/maintainers/scripts/azure-new/examples/basic/system.nix b/nixos/maintainers/scripts/azure-new/examples/basic/system.nix
index 5f98216d183d..855bd3bab719 100644
--- a/nixos/maintainers/scripts/azure-new/examples/basic/system.nix
+++ b/nixos/maintainers/scripts/azure-new/examples/basic/system.nix
@@ -8,6 +8,9 @@ in
     "${modulesPath}/virtualisation/azure-image.nix"
   ];
 
+  ## NOTE: This is just an example of how to hard-code a user.
+  ## The normal Azure agent IS included and DOES provision a user based
+  ## on the information passed at VM creation time.
   users.users."${username}" = {
     isNormalUser = true;
     home = "/home/${username}";

From bf29da08c20b93d54665cf0273c390a492c7fec8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2020 20:58:22 +0000
Subject: [PATCH 4402/4636] hevea: 2.33 -> 2.34

---
 pkgs/tools/typesetting/hevea/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix
index d5ede51ba0c3..f3f634eb944c 100644
--- a/pkgs/tools/typesetting/hevea/default.nix
+++ b/pkgs/tools/typesetting/hevea/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ocamlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "hevea-2.33";
+  name = "hevea-2.34";
 
   src = fetchurl {
     url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz";
-    sha256 = "0115bn6n6hhb08rmj0m508wjcsn1mggiagqly6s941pq811wxymb";
+    sha256 = "1pzyszxw90klpcmhjqrjfc8cw6c0gm4w2blim8ydyxb6rq6qml1s";
   };
 
   buildInputs = with ocamlPackages; [ ocaml ocamlbuild ];
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A quite complete and fast LATEX to HTML translator";
-    homepage = http://pauillac.inria.fr/~maranget/hevea/;
+    homepage = "http://pauillac.inria.fr/~maranget/hevea/";
     license = licenses.qpl;
     maintainers = with maintainers; [ pSub ];
     platforms = with platforms; unix;

From 35035a543c9ed2e3383ecfdf6b9c610e20c3223c Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <middendorf@plapadoo.de>
Date: Sun, 22 Dec 2019 21:10:48 +0100
Subject: [PATCH 4403/4636] xow: init at 0.2

---
 nixos/modules/hardware/uinput.nix       | 19 +++++++++++++++
 nixos/modules/module-list.nix           |  2 ++
 nixos/modules/services/hardware/xow.nix | 30 +++++++++++++++++++++++
 pkgs/misc/drivers/xow/default.nix       | 32 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 5 files changed, 85 insertions(+)
 create mode 100644 nixos/modules/hardware/uinput.nix
 create mode 100644 nixos/modules/services/hardware/xow.nix
 create mode 100644 pkgs/misc/drivers/xow/default.nix

diff --git a/nixos/modules/hardware/uinput.nix b/nixos/modules/hardware/uinput.nix
new file mode 100644
index 000000000000..101c12fe257e
--- /dev/null
+++ b/nixos/modules/hardware/uinput.nix
@@ -0,0 +1,19 @@
+{ config, pkgs, lib, ... }:
+
+let
+  cfg = config.hardware.uinput;
+in {
+  options.hardware.uinput = {
+    enable = lib.mkEnableOption "Whether to enable uinput support";
+  };
+
+  config = lib.mkIf cfg.enable {
+    boot.kernelModules = [ "uinput" ];
+
+    users.groups.uinput = {};
+
+    services.udev.extraRules = ''
+      SUBSYSTEM=="misc", KERNEL=="uinput", MODE="0660", GROUP="uinput", OPTIONS+="static_node=uinput"
+    '';
+  };
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index c2a96c72d165..a3f68207f79f 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -65,6 +65,7 @@
   ./hardware/usb-wwan.nix
   ./hardware/onlykey.nix
   ./hardware/wooting.nix
+  ./hardware/uinput.nix
   ./hardware/video/amdgpu.nix
   ./hardware/video/amdgpu-pro.nix
   ./hardware/video/ati.nix
@@ -368,6 +369,7 @@
   ./services/hardware/thermald.nix
   ./services/hardware/undervolt.nix
   ./services/hardware/vdr.nix
+  ./services/hardware/xow.nix
   ./services/logging/SystemdJournal2Gelf.nix
   ./services/logging/awstats.nix
   ./services/logging/fluentd.nix
diff --git a/nixos/modules/services/hardware/xow.nix b/nixos/modules/services/hardware/xow.nix
new file mode 100644
index 000000000000..a97dd5c870d7
--- /dev/null
+++ b/nixos/modules/services/hardware/xow.nix
@@ -0,0 +1,30 @@
+{ config, pkgs, lib, ... }:
+
+let
+  cfg = config.services.hardware.xow;
+in {
+  options.services.hardware.xow = {
+    enable = lib.mkEnableOption "Whether to enable xow or not.";
+  };
+
+  config = lib.mkIf cfg.enable {
+    hardware.uinput.enable = true;
+
+    users.users.xow = {
+      group = "uinput";
+      isSystemUser = true;
+    };
+
+    systemd.services.xow = {
+      wantedBy = [ "multi-user.target" ];
+      description = "Xbox One Wireless Dongle Driver";
+      after = [ "systemd-udev-settle.service" ];
+      serviceConfig = {
+        ExecStart = ''
+          ${pkgs.xow}/bin/xow
+        '';
+        User = "xow";
+      };
+    };
+  };
+}
diff --git a/pkgs/misc/drivers/xow/default.nix b/pkgs/misc/drivers/xow/default.nix
new file mode 100644
index 000000000000..5ca3f235fcce
--- /dev/null
+++ b/pkgs/misc/drivers/xow/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, libusb, gitMinimal }:
+
+stdenv.mkDerivation rec {
+  pname = "xow";
+  version = "0.2";
+
+  src = fetchFromGitHub {
+    owner = "medusalix";
+    repo = "xow";
+    rev = "v${version}";
+    sha256 = "03ajal91xi52svzy621aa4jcdf0vj4pqd52kljam0wryrlmcpbr3";
+  };
+
+  makeFlags = [ "BUILD=RELEASE" "VERSION=${version}" ];
+  enableParallelBuilding = true;
+  buildInputs = [ libusb ];
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin
+    cp xow $out/bin
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/medusalix/xow";
+    description = "Linux driver for the Xbox One wireless dongle";
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.pmiddend ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef0d40f91b1d..a6427ccbe989 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26011,6 +26011,8 @@ in
 
   xboxdrv = callPackage ../misc/drivers/xboxdrv { };
 
+  xow = callPackage ../misc/drivers/xow { };
+
   xbps = callPackage ../tools/package-management/xbps { };
 
   xcftools = callPackage ../tools/graphics/xcftools { };

From 2496942c7ae38b9dbd72d0e55367fb56edbad01c Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sun, 29 Mar 2020 23:53:28 +0200
Subject: [PATCH 4404/4636] nextcloud: 18.0.2 -> 18.0.3

---
 pkgs/servers/nextcloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 008d6bbde398..29c5cb591111 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -31,7 +31,7 @@ in {
   };
 
   nextcloud18 = generic {
-    version = "18.0.2";
-    sha256 = "10fbdq0366iai2kpw6v6p78mnn9gz8x0xzsbqrp109yx4c4nccyh";
+    version = "18.0.3";
+    sha256 = "0wpxa35zj81i541j3cjq6klsjwwc5slryzvjjl7zjc32004yfrvv";
   };
 }

From 45f53ccd8bc02282cc0db03bb271143c2d826d45 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Wed, 18 Mar 2020 20:48:31 -0700
Subject: [PATCH 4405/4636] alacritty: 0.4.1 -> 0.4.2

* alacritty now has its own org, so I changed the URLs to point there
* updated the description to match upstream's description
* formatted with nixpkgs-format
---
 pkgs/applications/misc/alacritty/default.nix | 111 ++++++++++---------
 1 file changed, 60 insertions(+), 51 deletions(-)

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 78e7249a0873..b6248b8f6f13 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -1,40 +1,38 @@
-{ stdenv,
-  lib,
-  fetchFromGitHub,
-  rustPlatform,
+{ stdenv
+, lib
+, fetchFromGitHub
+, rustPlatform
 
-  cmake,
-  gzip,
-  installShellFiles,
-  makeWrapper,
-  ncurses,
-  pkgconfig,
-  python3,
+, cmake
+, gzip
+, installShellFiles
+, makeWrapper
+, ncurses
+, pkgconfig
+, python3
 
-  expat,
-  fontconfig,
-  freetype,
-  libGL,
-  libX11,
-  libXcursor,
-  libXi,
-  libXrandr,
-  libXxf86vm,
-  libxcb,
-  libxkbcommon,
-  wayland,
-  xdg_utils,
+, expat
+, fontconfig
+, freetype
+, libGL
+, libX11
+, libXcursor
+, libXi
+, libXrandr
+, libXxf86vm
+, libxcb
+, libxkbcommon
+, wayland
+, xdg_utils
 
   # Darwin Frameworks
-  AppKit,
-  CoreGraphics,
-  CoreServices,
-  CoreText,
-  Foundation,
-  OpenGL }:
-
-with rustPlatform;
-
+, AppKit
+, CoreGraphics
+, CoreServices
+, CoreText
+, Foundation
+, OpenGL
+}:
 let
   rpathLibs = [
     expat
@@ -51,18 +49,19 @@ let
     libxkbcommon
     wayland
   ];
-in buildRustPackage rec {
+in
+rustPlatform.buildRustPackage rec {
   pname = "alacritty";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
-    owner = "jwilm";
+    owner = "alacritty";
     repo = pname;
     rev = "v${version}";
-    sha256 = "05jcg33ifngpzw2hdhgb614j87ihhhlqgar0kky183rywg0dxikg";
+    sha256 = "133d8vm7ihlvgw8n1jghhh35h664h0f52h6gci54f11vl6c1spws";
   };
 
-  cargoSha256 = "182j8ah67b2gw409vjfml3p41i00zh0klx9m8bwfkm64y2ki2bip";
+  cargoSha256 = "07gq63qd11zz229b8jp9wqggz39qfpzd223z1zk1xch7rhqq0pn4";
 
   nativeBuildInputs = [
     cmake
@@ -75,9 +74,17 @@ in buildRustPackage rec {
   ];
 
   buildInputs = rpathLibs
-    ++ lib.optionals stdenv.isDarwin [ AppKit CoreGraphics CoreServices CoreText Foundation OpenGL ];
+  ++ lib.optionals stdenv.isDarwin [
+    AppKit
+    CoreGraphics
+    CoreServices
+    CoreText
+    Foundation
+    OpenGL
+  ];
 
   outputs = [ "out" "terminfo" ];
+
   postPatch = ''
     substituteInPlace alacritty/src/config/mouse.rs \
       --replace xdg-open ${xdg_utils}/bin/xdg-open
@@ -90,14 +97,16 @@ in buildRustPackage rec {
 
     install -D target/release/alacritty $out/bin/alacritty
 
-  '' + (if stdenv.isDarwin then ''
-    mkdir $out/Applications
-    cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app
-  '' else ''
-    install -D extra/linux/alacritty.desktop -t $out/share/applications/
-    install -D extra/logo/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg
-    patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
-  '') + ''
+  '' + (
+    if stdenv.isDarwin then ''
+      mkdir $out/Applications
+      cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app
+    '' else ''
+      install -D extra/linux/Alacritty.desktop -t $out/share/applications/
+      install -D extra/logo/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg
+      patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
+    ''
+  ) + ''
 
     installShellCompletion --zsh extra/completions/_alacritty
     installShellCompletion --bash extra/completions/alacritty.bash
@@ -116,11 +125,11 @@ in buildRustPackage rec {
 
   dontPatchELF = true;
 
-  meta = with stdenv.lib; {
-    description = "GPU-accelerated terminal emulator";
-    homepage = "https://github.com/jwilm/alacritty";
+  meta = with lib; {
+    description = "A cross-platform, GPU-accelerated terminal emulator";
+    homepage = "https://github.com/alacritty/alacritty";
     license = licenses.asl20;
-    maintainers = with maintainers; [ filalex77 mic92 ];
+    maintainers = with maintainers; [ filalex77 mic92 cole-h ];
     platforms = platforms.unix;
   };
 }

From 2c5fe63fbe31470ebb7090cb22f47adc6753cdd1 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 29 Mar 2020 18:18:04 -0400
Subject: [PATCH 4406/4636] python27Packages.application: 2.7.0 -> 2.8.0 and
 fix build

The build is currently broken due to failure to build `darcs` to fetch the src
package. The homepage is already their GitHub repo, and it appears to be the
active src of development anyways. See #83718

I came across this while debugging this failure:
https://hydra.nixos.org/build/115510612

Note that the `application` dependency *does* succeed on Hydra, because it's
already on local disk in Hydra's store, but I cannot rebuild locally because it
has prefer local builds.
https://hydra.nixos.org/build/115512559

This package is not reproducible on 20.03 or buildable outside of Hydra, so I
intend to backport the fix.

CC @NixOS/nixos-release-managers

ZHF: #80379
---
 .../python-modules/application/default.nix      | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/application/default.nix b/pkgs/development/python-modules/application/default.nix
index 654567cc23fc..90b21baafdda 100644
--- a/pkgs/development/python-modules/application/default.nix
+++ b/pkgs/development/python-modules/application/default.nix
@@ -1,21 +1,26 @@
-{ lib, buildPythonPackage, fetchdarcs, zope_interface, isPy3k }:
+{ lib, buildPythonPackage, fetchFromGitHub, zope_interface, isPy3k }:
 
 buildPythonPackage rec {
   pname = "python-application";
-  version = "2.7.0";
+  version = "2.8.0";
   disabled = isPy3k;
 
-  src = fetchdarcs {
-    url = "http://devel.ag-projects.com/repositories/${pname}";
+  src = fetchFromGitHub {
+    owner = "AGProjects";
+    repo = pname;
     rev = "release-${version}";
-    sha256 = "1xpyk2v3naxkjhpyris58dxg1lxbraxgjd6f7w1sah5j0sk7psla";
+    sha256 = "1xd2gbpmx2ghap9cnr1h6sxjai9419bdp3y9qp5lh67977m0qg30";
   };
 
   buildInputs = [ zope_interface ];
 
+  # No tests upstream to run
+  doCheck = false;
+
   meta = with lib; {
     description = "Basic building blocks for python applications";
-    homepage = https://github.com/AGProjects/python-application;
+    homepage = "https://github.com/AGProjects/python-application";
+    changelog = "https://github.com/AGProjects/python-application/blob/master/ChangeLog";
     license = licenses.lgpl2Plus;
   };
 }

From c77bd38764f829c3d0be920a1d8604cc3e9ada99 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 29 Mar 2020 18:42:39 -0400
Subject: [PATCH 4407/4636] python27Packages.python-otr: mark as broken

See inline comment for details.

https://hydra.nixos.org/build/115510612

CC @NixOS/nixos-release-managers

ZHF: #80379
---
 pkgs/development/python-modules/python-otr/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-otr/default.nix b/pkgs/development/python-modules/python-otr/default.nix
index 2b08bbffa450..d83d25972450 100644
--- a/pkgs/development/python-modules/python-otr/default.nix
+++ b/pkgs/development/python-modules/python-otr/default.nix
@@ -24,10 +24,13 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "A pure python implementation of OTR";
-    homepage = https://github.com/AGProjects/otr;
+    homepage = "https://github.com/AGProjects/python-otr";
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ edwtjo ];
+    # The package itself does not support python3, and its transitive
+    # dependencies rely on namespace package support that does not work in
+    # Nix's python2 infra. See #74619 for details.
+    broken = true;
   };
-
 }

From c27b5de084de0eae755f07d3ca4294dce4757607 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2020 22:56:16 +0000
Subject: [PATCH 4408/4636] kdiff3: 1.8.1 -> 1.8.2

---
 pkgs/tools/text/kdiff3/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
index d55ed89e633d..f41de9baffc0 100644
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/pkgs/tools/text/kdiff3/default.nix
@@ -6,11 +6,11 @@
 
 mkDerivation rec {
   pname = "kdiff3";
-  version = "1.8.1";
+  version = "1.8.2";
 
   src = fetchurl {
     url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "0vj3rw5w0kry2c1y8gv6hniam417w7k3ydb1dkf5xwr4iprw0xvq";
+    sha256 = "0s5vsm1avzv88b6mf2pp20c2sz0srrj52iiqpnwi3p4ihivm8wgv";
   };
 
   nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
@@ -18,7 +18,7 @@ mkDerivation rec {
   propagatedBuildInputs = [ kconfig kcrash kinit kparts kiconthemes ];
 
   meta = with lib; {
-    homepage = http://kdiff3.sourceforge.net/;
+    homepage = "http://kdiff3.sourceforge.net/";
     license = licenses.gpl2Plus;
     description = "Compares and merges 2 or 3 files or directories";
     maintainers = with maintainers; [ peterhoeg ];

From 6d4749dede0b8631c93fb9ecde3b9174a28b8697 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 30 Mar 2020 09:11:31 +1000
Subject: [PATCH 4409/4636] ripgrep: 12.0.0 -> 12.0.1

https://github.com/BurntSushi/ripgrep/blob/master/CHANGELOG.md#1201-2020-03-29
---
 pkgs/tools/text/ripgrep/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index d90537bd5533..c794b4ba33c7 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ripgrep";
-  version = "12.0.0";
+  version = "12.0.1";
 
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = pname;
     rev = version;
-    sha256 = "0n4169l662fvg6r4rcfs8n8f92rxndlaqb7k4x63680mra470dbi";
+    sha256 = "1c0v51s05kbg9825n6mvpizhkkgz38wl7hp8f3vzbjfg4i8l8wb0";
   };
 
-  cargoSha256 = "01zi9zqdjsgc3im9na511n6w2bmqvm46wryh10fhzc9fnkziqmq3";
+  cargoSha256 = "0i8x2xgri8f8mzrlkc8l2yzcgczl35nw4bmwg09d343mjkmk6d8y";
 
   cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2";
 

From 8edd400bfb7dadd3b1d07b00f002547b4287f215 Mon Sep 17 00:00:00 2001
From: luc65r <59375051+luc65r@users.noreply.github.com>
Date: Sun, 29 Mar 2020 23:18:56 +0000
Subject: [PATCH 4410/4636] rofi-calc: init at 1.6 (#83136)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also:
* maintainers: add albakhamj
* maintainers: add luc65r
* rofi: add plugins argument to wrapper

Co-authored-by: Maciej Krüger <mkg20001@gmail.com>
---
 maintainers/maintainer-list.nix               | 12 +++++
 pkgs/applications/misc/rofi/wrapper.nix       | 20 +++----
 .../0001-Patch-plugindir-to-output.patch      | 25 +++++++++
 .../science/math/rofi-calc/default.nix        | 54 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 5 files changed, 104 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/applications/science/math/rofi-calc/0001-Patch-plugindir-to-output.patch
 create mode 100644 pkgs/applications/science/math/rofi-calc/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8e8c9f2fb107..699707e1f3ac 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -302,6 +302,12 @@
     githubId = 786394;
     name = "Alexander Krupenkin ";
   };
+  albakham = {
+    email = "dev@geber.ga";
+    github = "albakham";
+    githubId = 43479487;
+    name = "Titouan Biteau";
+  };
   alexarice = {
     email = "alexrice999@hotmail.co.uk";
     github = "alexarice";
@@ -4398,6 +4404,12 @@
     github = "ltavard";
     name = "Laure Tavard";
   };
+  luc65r = {
+    email = "lucas@ransan.tk";
+    github = "luc65r";
+    githubId = 59375051;
+    name = "Lucas Ransan";
+  };
   lucus16 = {
     email = "lars.jellema@gmail.com";
     github = "Lucus16";
diff --git a/pkgs/applications/misc/rofi/wrapper.nix b/pkgs/applications/misc/rofi/wrapper.nix
index 1c7284a2db26..e43614d9d226 100644
--- a/pkgs/applications/misc/rofi/wrapper.nix
+++ b/pkgs/applications/misc/rofi/wrapper.nix
@@ -1,23 +1,25 @@
-{ stdenv, rofi-unwrapped, makeWrapper, hicolor-icon-theme, theme ? null }:
+{ symlinkJoin, lib, rofi-unwrapped, makeWrapper, hicolor-icon-theme, theme ? null, plugins ? [] }:
 
-stdenv.mkDerivation {
-  pname = "rofi";
-  version = rofi-unwrapped.version;
+symlinkJoin {
+  name = "rofi-${rofi-unwrapped.version}";
+
+  paths = [
+    rofi-unwrapped.out
+  ] ++ (lib.forEach plugins (p: p.out));
 
   buildInputs = [ makeWrapper ];
   preferLocalBuild = true;
   passthru.unwrapped = rofi-unwrapped;
-  buildCommand = ''
-    mkdir $out
-    ln -s ${rofi-unwrapped}/* $out
-    rm $out/bin
+  postBuild = ''
+    rm -rf $out/bin
     mkdir $out/bin
     ln -s ${rofi-unwrapped}/bin/* $out/bin
 
     rm $out/bin/rofi
     makeWrapper ${rofi-unwrapped}/bin/rofi $out/bin/rofi \
       --prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share \
-      ${if theme != null then ''--add-flags "-theme ${theme}"'' else ""}
+      ${lib.optionalString (theme != null) ''--add-flags "-theme ${theme}"''} \
+      ${lib.optionalString (plugins != []) ''--add-flags "-plugin-path $out/lib/rofi"''}
 
     rm $out/bin/rofi-theme-selector
     makeWrapper ${rofi-unwrapped}/bin/rofi-theme-selector $out/bin/rofi-theme-selector \
diff --git a/pkgs/applications/science/math/rofi-calc/0001-Patch-plugindir-to-output.patch b/pkgs/applications/science/math/rofi-calc/0001-Patch-plugindir-to-output.patch
new file mode 100644
index 000000000000..197d1347d535
--- /dev/null
+++ b/pkgs/applications/science/math/rofi-calc/0001-Patch-plugindir-to-output.patch
@@ -0,0 +1,25 @@
+From 0eaef67b683683fb423fcb2d5096b3cdf9a4a9cd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
+Date: Sun, 22 Mar 2020 12:26:10 +0100
+Subject: [PATCH] Patch plugindir to output
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 50edb74..639ee86 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -50,7 +50,7 @@ PKG_CHECK_MODULES([glib],     [glib-2.0 >= 2.40 gio-unix-2.0 gmodule-2.0 ])
+ PKG_CHECK_MODULES([cairo],    [cairo])
+ PKG_CHECK_MODULES([rofi],     [rofi >= 1.5.4])
+ 
+-[rofi_PLUGIN_INSTALL_DIR]="`$PKG_CONFIG --variable=pluginsdir rofi`"
++[rofi_PLUGIN_INSTALL_DIR]="`echo $out/lib/rofi`"
+ AC_SUBST([rofi_PLUGIN_INSTALL_DIR])
+ 
+ LT_INIT([disable-static])
+-- 
+2.25.1
+
diff --git a/pkgs/applications/science/math/rofi-calc/default.nix b/pkgs/applications/science/math/rofi-calc/default.nix
new file mode 100644
index 000000000000..842265cf3d5f
--- /dev/null
+++ b/pkgs/applications/science/math/rofi-calc/default.nix
@@ -0,0 +1,54 @@
+{ stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkgconfig
+, rofi-unwrapped
+, libqalculate
+, glib
+, cairo
+, gobject-introspection
+, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+  pname = "rofi-calc";
+  version = "1.6";
+
+  src = fetchFromGitHub {
+    owner = "svenstaro";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "00pz0s99pihjdjy8pl4ckg2qciyp32k439lmjb5iazwck512ar92";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkgconfig
+    gobject-introspection
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    rofi-unwrapped
+    libqalculate
+    glib
+    cairo
+  ];
+
+  patches = [
+    ./0001-Patch-plugindir-to-output.patch
+  ];
+
+  postPatch = ''
+    sed "s|qalc_binary = \"qalc\"|qalc_binary = \"${libqalculate}/bin/qalc\"|" -i src/calc.c
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Do live calculations in rofi!";
+    homepage = "https://github.com/svenstaro/rofi-calc";
+    license = licenses.mit;
+    maintainers = with maintainers; [ luc65r albakham ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef0d40f91b1d..32c1edaec430 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20671,6 +20671,8 @@ in
 
   rofi-mpd = callPackage ../applications/audio/rofi-mpd { };
 
+  rofi-calc = callPackage ../applications/science/math/rofi-calc { };
+
   ympd = callPackage ../applications/audio/ympd { };
 
   nload = callPackage ../applications/networking/nload { };

From 894c74da1ffc8c71be748db6146cb315b8f33e32 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 22 Mar 2020 21:58:11 +0100
Subject: [PATCH 4411/4636] Revert "buildSkawarePackage: pass through extra
 args"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a50653295df5e2565b4a6a316923f9e939f1945b.

The reasons cited were “debugging”, in which case
you can just add the attribute to `buildSkawarePackage`
and “customizing”, which is still possible with
a normal `overrideDerivation`.

The patch removed `outputs` for some reason
(possible oversight), so building nsss failed.
Plus lots of complexity (e.g. don’t forget to add new
arguments to `removeAttrs` otherwise there’s a bug now).
---
 .../skaware/build-skaware-package.nix         | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix
index 9e4456a3a151..9b159a994c80 100644
--- a/pkgs/build-support/skaware/build-skaware-package.nix
+++ b/pkgs/build-support/skaware/build-skaware-package.nix
@@ -18,15 +18,12 @@ in {
 , configureFlags
   # mostly for moving and deleting files from the build directory
   # : lines
-, postInstall ? ""
-  # : lines
-, postFixup ? ""
+, postInstall
   # : list Maintainer
 , maintainers ? []
-  # : attrs
-, meta ? {}
-, ...
-} @ args:
+
+
+}:
 
 let
 
@@ -53,12 +50,16 @@ let
     "README.*"
   ];
 
-in stdenv.mkDerivation ({
+in stdenv.mkDerivation {
+  name = "${pname}-${version}";
+
   src = fetchurl {
     url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz";
     inherit sha256;
   };
 
+  inherit outputs;
+
   dontDisableStatic = true;
   enableParallelBuilding = true;
 
@@ -83,11 +84,13 @@ in stdenv.mkDerivation ({
        noiseFiles = commonNoiseFiles;
        docFiles = commonMetaFiles;
      }} $doc/share/doc/${pname}
-  '' + postInstall;
+
+    ${postInstall}
+  '';
 
   postFixup = ''
     ${cleanPackaging.checkForRemainingFiles}
-  '' + postFixup;
+  '';
 
   meta = {
     homepage = "https://skarnet.org/software/${pname}/";
@@ -95,9 +98,6 @@ in stdenv.mkDerivation ({
     license = stdenv.lib.licenses.isc;
     maintainers = with lib.maintainers;
       [ pmahoney Profpatsch ] ++ maintainers;
-  } // meta;
+  };
 
-} // builtins.removeAttrs args [
-  "sha256" "configureFlags" "postInstall" "postFixup"
-  "meta" "description" "platforms"  "maintainers"
-])
+}

From 49be064fa56fc35b44570200c4e68aa560de690a Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 22 Mar 2020 22:07:12 +0100
Subject: [PATCH 4412/4636] skawarePackages: release 2020-03

  Hello,

  New versions of all the skarnet.org packages are available.
This is mostly a bugfix release (there was an installation bug in
some circumstances with shared libraries) but some packages, notably
execline and s6, have new, useful features.

  The new versions are the following:

skalibs-2.9.2.0
nsss-0.0.2.2
utmps-0.0.3.2
execline-2.6.0.0
s6-2.9.1.0
s6-rc-0.5.1.2
s6-linux-init-1.0.4.0
s6-dns-2.3.2.0
s6-networking-2.3.1.2
s6-portable-utils-2.2.2.2
s6-linux-utils-2.5.1.2
mdevd-0.1.1.2
bcnm-0.0.1.0

  Here are details for the packages that have more than bugfixes:

* skalibs-2.9.2.0
   ---------------

  - New header: skalibs/bigkv.h. It's a set of functions allowing
efficient lookups in a large set of strings (typically read from the
command line or the environment).

  https://skarnet.org/software/skalibs/
  git://git.skarnet.org/skalibs

  * execline-2.6.0.0
    ----------------

  - It's a major release because an API has been modified: dollarat.
Beforehand, dollarat's -0 option would always prevail over any -d
option. Now, dollarat has its conflicting -0 and -d options handled
in the conventional way, with rightmost priority.

  - The runblock program now accepts a command line prefix, which is
given as runblock's own command line. This allows blocks to serve as
arguments to a new command, instead of having to be full command lines
by themselves.

  - New binary: posix-umask.

  - The former "cd" program is now named "execline-cd" and the former
"umask" program is named "execline-umask". When the=20
--enable-pedantic-posix
option is not given at configure time, "cd" and "umask" are symbolic
links created at installation time and pointing to execline-cd and
execline-umask respectively. When the --enable-pedantic-posix option is
given, the symbolic links point to posix-cd and posix-umask instead.

  - With posix-cd and posix-umask (and the changes to wait done in the
previous version), execline is now fully POSIX-compliant when built with
the --enable-pedantic-posix option. This will certainly, without the
slightest hint of a doubt, change distributions' attitudes about it.

  https://skarnet.org/software/execline/
  git://git.skarnet.org/execline

  * s6-2.9.1.0
    ----------

  - A new '?' directive has been added to s6-log. It behaves exactly like
'!', except that it spawns the given processor with /bin/sh as an
interpreter instead of execlineb.

  - execline support is now optional: it can be disabled by specifying
--disable-execline at configure time. Some functionality is unavailable
when execline support is disabled:
    * s6-log's '!' directive
    * s6-notifyoncheck's -c option
    * s6-ipcserver-access's support for 'exec' directives in a ruleset

  - A new -X option has been added to s6-svscan, to specify a descriptor
that will be passed as stderr to a service spawned by this s6-svscan and
named s6-svscan-log. This is used in the new s6-linux-init, to avoid
needing to hardcode the /dev/console name for the catch-all logger's
standard error.

  - On systems that define SIGPWR and SIGWINCH, s6-svscan -s now diverts
those signals. This allows powerfail and kbrequest events to be handled
when s6-svscan runs as process 1.

  https://skarnet.org/software/s6/
  git://git.skarnet.org/s6

  * s6-linux-init-1.0.4.0
    ---------------------

  - New options have been added to s6-linux-init-maker: to support
running s6-linux-init without a catch-all logger, and to support running
it in a container.

  - s6-linux-init-maker now adds a SIGPWR handler to the default image:
on receipt of a SIGPWR, the system's shutdown procedure is triggered.

  - s6-linux-init now handles kbrequest, which triggers a SIGWINCH in
init when a special, configurable set of keys is pressed. By default,
no SIGWINCH handler is declared in the image, and no set of keys is
bound to kbrequest.

  https://skarnet.org/software/s6-linux-init/
  git://git.skarnet.org/s6-linux-init

  * s6-dns-2.3.2.0
    --------------

  - New library: libdcache, implementing a clean cache structure
to contain DNS data. It's still not used at the moment.

  https://skarnet.org/software/s6-dns/
  git://git.skarnet.org/s6-dns

  * bcnm-0.0.1.0
    ------------

  - First numbered release, because the Ad=C3=A9lie Linux distribution,
which uses libwpactrl, needs an official release instead of pulling
from git.

  - libwpactrl is a set of C functions helping control a wpa_supplicant
process.

  - bcnm-waitif is a binary that waits for network interface state
events such as appearance/disappearance, up/down, running/not-running.
It is useful to avoid race conditions during a boot sequence, for
instance.

  https://skarnet.org/software/bcnm/
  git://git.skarnet.org/bcnm

  Enjoy,
  Bug-reports welcome.

--
  Laurent
---
 pkgs/development/libraries/nsss/default.nix       | 4 ++--
 pkgs/development/libraries/skalibs/default.nix    | 4 ++--
 pkgs/development/libraries/utmps/default.nix      | 5 ++---
 pkgs/os-specific/linux/s6-linux-utils/default.nix | 4 ++--
 pkgs/tools/misc/execline/default.nix              | 4 ++--
 pkgs/tools/misc/s6-portable-utils/default.nix     | 4 ++--
 pkgs/tools/networking/s6-dns/default.nix          | 5 +++--
 pkgs/tools/networking/s6-networking/default.nix   | 4 ++--
 pkgs/tools/system/s6-rc/default.nix               | 4 ++--
 pkgs/tools/system/s6/default.nix                  | 4 ++--
 10 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/libraries/nsss/default.nix b/pkgs/development/libraries/nsss/default.nix
index 5c8bf8dedc1e..3e3530215bf8 100644
--- a/pkgs/development/libraries/nsss/default.nix
+++ b/pkgs/development/libraries/nsss/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
 
 buildPackage {
   pname = "nsss";
-  version = "0.0.2.1";
-  sha256 = "1arzl4492wv42rvv6xs8h5d3qpy9nwxv5l84inzabs6s9f9nlxax";
+  version = "0.0.2.2";
+  sha256 = "0am195wabv63n545ykqnch9gs8cs1g5zw35k2ddxb9dnamhxfi9k";
 
   description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions.";
 
diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index e5443c5d53a0..d7e0f8313850 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
 
 buildPackage {
   pname = "skalibs";
-  version = "2.9.1.0";
-  sha256 = "19c6s3f7vxi96l2yqzjk9x9i4xkfg4fdzxhn1jg6bfb2qjph9cnk";
+  version = "2.9.2.0";
+  sha256 = "1i9d7w031kh338aq6xdsf8vl5amxbwxbny8lnrxlzydqvn8nxhz4";
 
   description = "A set of general-purpose C programming libraries";
 
diff --git a/pkgs/development/libraries/utmps/default.nix b/pkgs/development/libraries/utmps/default.nix
index 073674f8571f..16b4cd563b2b 100644
--- a/pkgs/development/libraries/utmps/default.nix
+++ b/pkgs/development/libraries/utmps/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
 
 buildPackage {
   pname = "utmps";
-  version = "0.0.3.1";
-  sha256 = "1h4hgjdrai51qkalgcx2ff60drpnw0ich66z90p8wk74am0vgc0h";
+  version = "0.0.3.2";
+  sha256 = "0zri5pqnva48bm8za4ic5mx0ymv70y4ga16bjh4i5pscs40sj5dh";
 
   description = "A secure utmpx and wtmp implementation";
 
@@ -29,4 +29,3 @@ buildPackage {
     mv examples $doc/share/doc/utmps/examples
   '';
 }
-
diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix
index 200e66cb4d89..74bf913df982 100644
--- a/pkgs/os-specific/linux/s6-linux-utils/default.nix
+++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
 
 buildPackage {
   pname = "s6-linux-utils";
-  version = "2.5.1.1";
-  sha256 = "00nw2phd9prgv29hzqzwjnh4y0ivkzhx3srn6n1rlyr4ydhikxi5";
+  version = "2.5.1.2";
+  sha256 = "0w4jms9qyb5kx9zcyd3gzri60rrii2rbmh08s59ckg4awy27py86";
 
   description = "A set of minimalistic Linux-specific system utilities";
   platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
index fb685e65a4f5..d09537f56490 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/tools/misc/execline/default.nix
@@ -7,8 +7,8 @@ with skawarePackages;
 
 buildPackage {
   pname = "execline";
-  version = "2.5.3.0";
-  sha256 = "0czdrv9m8mnx94nf28dafij6z03k4mbhbs6hccfaardfd5l5q805";
+  version = "2.6.0.0";
+  sha256 = "1m6pvawxqaqjr49456vyjyl8dnqwvr19v77sjj7dnglfijwza5al";
 
   description = "A small scripting language, to be used in place of a shell in non-interactive scripts";
 
diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index 18813531033f..bc32489c588e 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -7,8 +7,8 @@ let
 
 in buildPackage {
   pname = pname;
-  version = "2.2.2.1";
-  sha256 = "074kizkxjwvmxspxg69fr8r0lbiy61l2n5nzgbfvwvhc6lj34iqy";
+  version = "2.2.2.2";
+  sha256 = "1k3la37q46n93vjwk9wm9ym4w87z6lqzv43f03qd0vqj9k94mpv3";
 
   description = "A set of tiny general Unix utilities optimized for simplicity and small size";
 
diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix
index 66bdcbbba54a..739fdc2e2fce 100644
--- a/pkgs/tools/networking/s6-dns/default.nix
+++ b/pkgs/tools/networking/s6-dns/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
 
 buildPackage {
   pname = "s6-dns";
-  version = "2.3.1.1";
-  sha256 = "0clib10dk3r9rcxv1yfr6gdvqqrx0arzivjpmhz9p8xaif53wpj1";
+  version = "2.3.2.0";
+  sha256 = "09hyb1xv9glqq0yy7wy8hiwvlr78kwv552pags8ancgamag15di7";
 
   description = "A suite of DNS client programs and libraries for Unix systems";
 
@@ -28,6 +28,7 @@ buildPackage {
     rm $(find -type f -mindepth 1 -maxdepth 1 -executable)
     rm libs6dns.*
     rm libskadns.*
+    rm libdcache.*
 
     mv doc $doc/share/doc/s6-dns/html
   '';
diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix
index 1551d6da97be..f8c479d5ce27 100644
--- a/pkgs/tools/networking/s6-networking/default.nix
+++ b/pkgs/tools/networking/s6-networking/default.nix
@@ -20,8 +20,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport};
 
 buildPackage {
   pname = "s6-networking";
-  version = "2.3.1.1";
-  sha256 = "127i7ig5wdgjbkjf0py0g96llc6cbxij22ns2j7bwa95figinhcx";
+  version = "2.3.1.2";
+  sha256 = "1029bgwfmv903y5ji93j75m7p2jgchdxya1khxzb42q2z7yxnlyr";
 
   description = "A suite of small networking utilities for Unix systems";
 
diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix
index 95d4b376d0aa..4ddc7fbecc01 100644
--- a/pkgs/tools/system/s6-rc/default.nix
+++ b/pkgs/tools/system/s6-rc/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
 
 buildPackage {
   pname = "s6-rc";
-  version = "0.5.1.1";
-  sha256 = "0lmg517l8inn7bi57q35rjd7b4jmqlmkhrbvs5ybbhinhd12qzi5";
+  version = "0.5.1.2";
+  sha256 = "18m8jsx3bkj566p6xwwnsvdckk10n8wqnhp0na2k88i295h4rnjp";
 
   description = "A service manager for s6-based systems";
   platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix
index efdf173a22c6..3ce97a9d97bd 100644
--- a/pkgs/tools/system/s6/default.nix
+++ b/pkgs/tools/system/s6/default.nix
@@ -4,8 +4,8 @@ with skawarePackages;
 
 buildPackage {
   pname = "s6";
-  version = "2.9.0.1";
-  sha256 = "0mvcjrz8nlj9p2zclmcv22b4y6bqzd2iz38arhgc989vdvrbmkg0";
+  version = "2.9.1.0";
+  sha256 = "1xqzl2wnvcmcyhppk7mc10h1ac7fkik3i6gpyliwpf3d5i9mkqh5";
 
   description = "skarnet.org's small & secure supervision software suite";
 

From 7329dfcc6348f09f540eb96c3f252ecbc33c7cdf Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 22 Mar 2020 22:13:51 +0100
Subject: [PATCH 4413/4636] buildSkawarePackage: use pname and version directly

---
 pkgs/build-support/skaware/build-skaware-package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix
index 9b159a994c80..ab5251ca1b59 100644
--- a/pkgs/build-support/skaware/build-skaware-package.nix
+++ b/pkgs/build-support/skaware/build-skaware-package.nix
@@ -51,7 +51,7 @@ let
   ];
 
 in stdenv.mkDerivation {
-  name = "${pname}-${version}";
+  inherit pname version;
 
   src = fetchurl {
     url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz";

From bf3bd5fee1d7d2faf761cceef9fb0d44dc329ff9 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 10 Feb 2020 13:51:50 +0100
Subject: [PATCH 4414/4636] skawarePackages: support static builds via
 pkgsStatic

Most of the skaware packages already build just fine with pkgsStatic,
however the wrapper scripts for execline and stdnotify-wrapper needed
the `-lskarlib` argument to go at the end.

`utmps` and `nsss` still fail with this error:

```
exec ./tools/install.sh -D -m 600 utmps-utmpd /bin/utmps-utmpd
/build/utmps-0.0.3.1/tools/install.sh: line 48: can't create /bin/utmps-utmpd.tmp.479: Permission denied
make: *** [Makefile:121: /bin/utmps-utmpd] Error 1
```
---
 pkgs/build-support/skaware/build-skaware-package.nix |  3 +++
 pkgs/os-specific/linux/sdnotify-wrapper/default.nix  |  6 +++---
 pkgs/tools/misc/execline/default.nix                 | 12 +++++++++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix
index ab5251ca1b59..e6e2e35789bc 100644
--- a/pkgs/build-support/skaware/build-skaware-package.nix
+++ b/pkgs/build-support/skaware/build-skaware-package.nix
@@ -65,6 +65,9 @@ in stdenv.mkDerivation {
 
   configureFlags = configureFlags ++ [
     "--enable-absolute-paths"
+    # We assume every nix-based cross target has urandom.
+    # This might not hold for e.g. BSD.
+    "--with-sysdep-devurandom=yes"
     (if stdenv.isDarwin
       then "--disable-shared"
       else "--enable-shared")
diff --git a/pkgs/os-specific/linux/sdnotify-wrapper/default.nix b/pkgs/os-specific/linux/sdnotify-wrapper/default.nix
index 613a7fd51e65..cf09f0476767 100644
--- a/pkgs/os-specific/linux/sdnotify-wrapper/default.nix
+++ b/pkgs/os-specific/linux/sdnotify-wrapper/default.nix
@@ -23,13 +23,13 @@ in runCommandCC "sdnotify-wrapper" {
   mkdir -p $bin/bin
   mkdir $out
 
-  # just dynamic for now
+  # the -lskarnet has to come at the end to support static builds
   $CC \
     -o $bin/bin/sdnotify-wrapper \
     -I${skalibs.dev}/include \
     -L${skalibs.lib}/lib \
-    -lskarnet \
-    ${src}
+    ${src} \
+    -lskarnet
 
   mkdir -p $doc/share/doc/sdnotify-wrapper
   # copy the documentation comment
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
index d09537f56490..d3a6990a1f83 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/tools/misc/execline/default.nix
@@ -35,15 +35,21 @@ buildPackage {
     mv examples $doc/share/doc/execline/examples
 
     mv $bin/bin/execlineb $bin/bin/.execlineb-wrapped
-    cc \
+
+    # A wrapper around execlineb, which provides all execline
+    # tools on `execlineb`’s PATH.
+    # It is implemented as a C script, because on non-Linux,
+    # nested shebang lines are not supported.
+    # The -lskarnet has to come at the end to support static builds.
+    $CC \
       -O \
       -Wall -Wpedantic \
       -D "EXECLINEB_PATH()=\"$bin/bin/.execlineb-wrapped\"" \
       -D "EXECLINE_BIN_PATH()=\"$bin/bin\"" \
       -I "${skalibs.dev}/include" \
       -L "${skalibs.lib}/lib" \
-      -lskarnet \
       -o "$bin/bin/execlineb" \
-      ${./execlineb-wrapper.c}
+      ${./execlineb-wrapper.c} \
+      -lskarnet
   '';
 }

From 99a310e56693d27e4d9b411ff1b7efed7c00aaca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Mon, 30 Mar 2020 02:20:41 +0200
Subject: [PATCH 4415/4636] klayout: init at 0.26.2 (#73941)

---
 pkgs/applications/misc/klayout/default.nix | 63 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 +
 2 files changed, 65 insertions(+)
 create mode 100644 pkgs/applications/misc/klayout/default.nix

diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix
new file mode 100644
index 000000000000..78b32f7fca15
--- /dev/null
+++ b/pkgs/applications/misc/klayout/default.nix
@@ -0,0 +1,63 @@
+{ lib, mkDerivation, fetchFromGitHub, fetchpatch
+, python, ruby, qtbase, qtmultimedia, qttools, qtxmlpatterns
+, which, perl, makeWrapper, fixDarwinDylibNames
+}:
+
+mkDerivation rec {
+  pname = "klayout";
+  version = "0.26.2";
+
+  src = fetchFromGitHub {
+    owner = "KLayout";
+    repo = "klayout";
+    rev = "v${version}";
+    sha256 = "0svyqayvr45snqw0dhx6jpnjhg4qb097pz28s8k1crx5i31nnd94";
+  };
+
+  postPatch = ''
+    substituteInPlace src/klayout.pri --replace "-Wno-reserved-user-defined-literal" ""
+    patchShebangs .
+  '';
+
+  nativeBuildInputs = [
+    which
+  ];
+
+  buildInputs = [
+    python
+    ruby
+    qtbase
+    qtmultimedia
+    qttools
+    qtxmlpatterns
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+    mkdir -p $out/lib
+    ./build.sh -qt5 -prefix $out/lib -j$NIX_BUILD_CORES
+    runHook postBuild
+  '';
+
+  postBuild = ''
+    mkdir $out/bin
+    mv $out/lib/klayout $out/bin/
+  '';
+
+  NIX_CFLAGS_COMPILE = [ "-Wno-parentheses" ];
+
+  dontInstall = true; # Installation already happens as part of "build.sh"
+
+  # Fix: "gsiDeclQMessageLogger.cc:126:42: error: format not a string literal
+  # and no format arguments [-Werror=format-security]"
+  hardeningDisable = [ "format" ];
+
+  meta = with lib; {
+    description = "High performance layout viewer and editor with support for GDS and OASIS";
+    license = with licenses; [ gpl3 ];
+    homepage = "https://www.klayout.de/";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ knedlsepp ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 32c1edaec430..881fd257e5c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20193,6 +20193,8 @@ in
 
   kiwix = callPackage ../applications/misc/kiwix { };
 
+  klayout = libsForQt5.callPackage ../applications/misc/klayout { };
+
   kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { };
 
   kmymoney = libsForQt5.callPackage ../applications/office/kmymoney {

From 2cede30d74636e7efa27cb57bb67ffdf5108a8b8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2020 00:37:40 +0000
Subject: [PATCH 4416/4636] kotlin: 1.3.70 -> 1.3.71

---
 pkgs/development/compilers/kotlin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 9a124ad84771..d4f37d4f5cce 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 let
-  version = "1.3.70";
+  version = "1.3.71";
 in stdenv.mkDerivation {
   inherit version;
   pname = "kotlin";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
-    sha256 = "1iw9pjacjdhhvriaz2kzf677csq2nfx66k5cickk79h7ywppi7bh";
+    sha256 = "0jp7z2lys02d0wmycdlfg9c08ji4qvjaz2wzvrxjyvcwv7d7gnvs";
   };
 
   propagatedBuildInputs = [ jre ] ;

From dbdae465cb3ea63191863232b503ffaa21ad9c88 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Sun, 29 Mar 2020 18:51:05 -0700
Subject: [PATCH 4417/4636] zoxide: 0.2.2 -> 0.3.0

https://github.com/ajeetdsouza/zoxide/compare/v0.2.2...v0.3.0
---
 pkgs/tools/misc/zoxide/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix
index 9502af65201e..670a88a5dc55 100644
--- a/pkgs/tools/misc/zoxide/default.nix
+++ b/pkgs/tools/misc/zoxide/default.nix
@@ -1,23 +1,27 @@
-{ stdenv, fetchFromGitHub, rustPlatform, fzf }:
+{ lib
+, fetchFromGitHub
+, rustPlatform
+, fzf
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "zoxide";
-  version = "0.2.2";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "ajeetdsouza";
     repo = "zoxide";
     rev = "v${version}";
-    sha256 = "0s6aax6bln9jmmv7kw630mj0l6qpvdx8mdk3a5d9akr9d23zxmr5";
+    sha256 = "0w4by34chm2baqldxx72bhjz8ggsllpir1df07gxi5fjkmil8jy9";
   };
 
   buildInputs = [
     fzf
   ];
 
-  cargoSha256 = "1gzpkf7phl5xd666l7pc25917x4qq0kkxk4i9dkz3lvxz3v8ylrz";
+  cargoSha256 = "19fziapiv5w9wxslw47rf3lgc2lv7dyl3n8py6bsddq41fzay30w";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A fast cd command that learns your habits";
     homepage = "https://github.com/ajeetdsouza/zoxide";
     license = with licenses; [ mit ];

From dd2e6d3d4a6344f3ad3ade68d18ddde85e3b9eee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= <mic.liamg@gmail.com>
Date: Mon, 30 Mar 2020 05:16:53 +0200
Subject: [PATCH 4418/4636] quoted home page URL according to RFC 0045
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Minář <mic.liamg@gmail.com>
---
 pkgs/os-specific/linux/ffado/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index 15f3441e08aa..43f9f44c901a 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -91,7 +91,7 @@ mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.ffado.org;
+    homepage = "http://www.ffado.org";
     description = "FireWire audio drivers";
     license = licenses.gpl3;
     maintainers = with maintainers; [ goibhniu michojel ];

From f3028ec1a6723090516df5c49447e22a421f7e62 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2020 03:42:43 +0000
Subject: [PATCH 4419/4636] liquibase: 3.8.7 -> 3.8.8

---
 pkgs/development/tools/database/liquibase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix
index 890ef73a73f9..d66d54ef45bb 100644
--- a/pkgs/development/tools/database/liquibase/default.nix
+++ b/pkgs/development/tools/database/liquibase/default.nix
@@ -10,11 +10,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "liquibase";
-  version = "3.8.7";
+  version = "3.8.8";
 
   src = fetchurl {
     url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "0gs3pmzyx2bz6af2fr5jla3s33vfaw64pgahfvj5bgpj6d7vx1wg";
+    sha256 = "1pl9wgnwykvbnis0ndym0lbsj6a7lvpghrc98cw2hdnp5dglxjjl";
   };
 
   buildInputs = [ jre makeWrapper ];

From 1d349b8512d8d45ff3ce059685983eef324e3441 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2020 04:02:45 +0000
Subject: [PATCH 4420/4636] marvin: 20.6.0 -> 20.9.0

---
 pkgs/applications/science/chemistry/marvin/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix
index 2c155e4e848f..c54fb3444bb0 100644
--- a/pkgs/applications/science/chemistry/marvin/default.nix
+++ b/pkgs/applications/science/chemistry/marvin/default.nix
@@ -4,12 +4,12 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "marvin";
-  version = "20.6.0";
+  version = "20.9.0";
 
   src = fetchurl {
     name = "marvin-${version}.deb";
     url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
-    sha256 = "1vd1hsj36wzghpn6xnppjmva35kdcin7h0xdj3xmi4w5l3qw7fl6";
+    sha256 = "1c6q1vb96jsb37g5qbhzcnasd5pdqjyc190yg3caw3gwrd97889q";
   };
 
   nativeBuildInputs = [ dpkg makeWrapper ];
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A chemical modelling, analysis and structure drawing program";
-    homepage = https://chemaxon.com/products/marvin;
+    homepage = "https://chemaxon.com/products/marvin";
     maintainers = with maintainers; [ fusion809 ];
     license = licenses.unfree;
     platforms = platforms.linux;

From ef2eeb4d8f0de57c2d05d4f5a73de22e40fab550 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Thu, 19 Mar 2020 07:44:02 +0300
Subject: [PATCH 4421/4636] ejabberd: 20.01 -> 20.03

---
 pkgs/servers/xmpp/ejabberd/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index 0ac216b8e525..fbfae96c0584 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -24,12 +24,12 @@ let
   ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ];
 
 in stdenv.mkDerivation rec {
-  version = "20.01";
+  version = "20.03";
   pname = "ejabberd";
 
   src = fetchurl {
-    url = "https://www.process-one.net/downloads/ejabberd/${version}/${pname}-${version}.tgz";
-    sha256 = "14bgwa6y17bhnwhcqb2hdl7psds0iqkcawb4kpaw6d7lzzsx4ay6";
+    url = "https://www.process-one.net/downloads/downloads-action.php?file=/${version}/${pname}-${version}.tgz";
+    sha256 = "0i013l9cygmgainfid298n6llhs3mblfklry3jw2a6irvhffym0s";
   };
 
   nativeBuildInputs = [ fakegit ];
@@ -76,7 +76,7 @@ in stdenv.mkDerivation rec {
 
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash = "097c84qp00dq8x7ngfqcrv9fa0wm0k94grashmi1fxlasgbvxh18";
+    outputHash = "0xwgi9hy6y0m8mwznl6px98kdmkcxg98k62zgqbaqd4paks5zwqa";
   };
 
   configureFlags =

From 099b56b2390d279f7a6c12029d0e8f67c5f91eb1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2020 05:19:13 +0000
Subject: [PATCH 4422/4636] mpd: 0.21.20 -> 0.21.21

---
 pkgs/servers/mpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index e328a79afa69..4f97e3fc7838 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -102,13 +102,13 @@ let
 
     in stdenv.mkDerivation rec {
       pname = "mpd";
-      version = "0.21.20";
+      version = "0.21.21";
 
       src = fetchFromGitHub {
         owner  = "MusicPlayerDaemon";
         repo   = "MPD";
         rev    = "v${version}";
-        sha256 = "05148zwaf1ix369i1n1fx84j66qa1ab1p3m7781lk3dz5hqf185x";
+        sha256 = "0ysyjlmmfm1y5jqyv83bs9p7zqr9pgj1hmdq2b7kx9kridclbnng";
       };
 
       buildInputs = [ glib boost ]

From d577c1a4144bfaf8f22dfe34cd468a30e8e2820f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2020 05:50:39 +0000
Subject: [PATCH 4423/4636] numix-icon-theme: 19.09.20 -> 20.03.20

---
 pkgs/data/icons/numix-icon-theme/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix
index d3bcdb12d3dc..46c61d861a32 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "numix-icon-theme";
-  version = "19.09.20";
+  version = "20.03.20";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = pname;
     rev = version;
-    sha256 = "0pn3x0mmsph777lwhg890ck366p31bjl3755h4pv161ym08d4z9w";
+    sha256 = "092f8k38xf9yz898nrangm0ia211d41z8kx0v6njfqfgpiad1s7q";
   };
 
   nativeBuildInputs = [ gtk3 ];
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Numix icon theme";
-    homepage = https://numixproject.github.io;
+    homepage = "https://numixproject.github.io";
     license = licenses.gpl3;
     # darwin cannot deal with file names differing only in case
     platforms = platforms.linux;

From 7edd93223976128489622eac06fe6049e5eda228 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2020 06:55:38 +0000
Subject: [PATCH 4424/4636] nwipe: 0.27 -> 0.28

---
 pkgs/tools/security/nwipe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/nwipe/default.nix b/pkgs/tools/security/nwipe/default.nix
index b2ead19a2011..c72ada867614 100644
--- a/pkgs/tools/security/nwipe/default.nix
+++ b/pkgs/tools/security/nwipe/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, ncurses, parted, automake, autoconf, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  version = "0.27";
+  version = "0.28";
   pname = "nwipe";
   src = fetchFromGitHub {
     owner = "martijnvanbrummelen";
     repo = "nwipe";
     rev = "v${version}";
-    sha256 = "1rfqv5nxb20g7rfcmqaxwkbz5v294ak0kfsndncx3m4m1791fw04";
+    sha256 = "1aw905lmn1vm6klqn3q7445dwmwbjhcmwnkygpq9rddacgig1gdx";
   };
   nativeBuildInputs = [ automake autoconf pkgconfig ];
   buildInputs = [ ncurses parted ];

From d4fd0ba50439e8bedd4bfb64effc084dc1c90829 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Mon, 30 Mar 2020 09:41:36 +0100
Subject: [PATCH 4425/4636] elpa-packages: 2020-03-30

---
 .../editors/emacs-modes/elpa-generated.nix    | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index aa0f625124f0..9ae07c1c900c 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -1070,10 +1070,10 @@
       elpaBuild {
         pname = "elisp-benchmarks";
         ename = "elisp-benchmarks";
-        version = "1.3";
+        version = "1.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.3.tar";
-          sha256 = "05a891mwbz50q3a44irbf2w4wlp5dm2yxwcvxqrckvpjm1amndmf";
+          url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.4.tar";
+          sha256 = "18ia04aq4pqa8374x60g3g66jqmm17c6n904naa0jhqphlgam8pb";
         };
         packageRequires = [];
         meta = {
@@ -1572,7 +1572,7 @@
           license = lib.licenses.free;
         };
       }) {};
-    ioccur = callPackage ({ elpaBuild, fetchurl, lib }:
+    ioccur = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "ioccur";
         ename = "ioccur";
@@ -1581,7 +1581,7 @@
           url = "https://elpa.gnu.org/packages/ioccur-2.4.el";
           sha256 = "1isid3kgsi5qkz27ipvmp9v5knx0qigmv7lz12mqdkwv8alns1p9";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/ioccur.html";
           license = lib.licenses.free;
@@ -2215,10 +2215,10 @@
       elpaBuild {
         pname = "oauth2";
         ename = "oauth2";
-        version = "0.11";
+        version = "0.12";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/oauth2-0.11.el";
-          sha256 = "0ydkc9jazsnbbvfhd47mql52y7k06n3z7r0naqxkwb99j9blqsmp";
+          url = "https://elpa.gnu.org/packages/oauth2-0.12.el";
+          sha256 = "1rfyfy0h7shr3fmd8lh6s2i3ahfh28wb5fqiqlsjwspn5h77ll29";
         };
         packageRequires = [];
         meta = {
@@ -3056,10 +3056,10 @@
       elpaBuild {
         pname = "sql-indent";
         ename = "sql-indent";
-        version = "1.4";
+        version = "1.5";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/sql-indent-1.4.tar";
-          sha256 = "1nilxfm30nb2la1463729rgbgbma7igkf0z325k8cbapqanb1wgl";
+          url = "https://elpa.gnu.org/packages/sql-indent-1.5.tar";
+          sha256 = "07k5rn9hbxppnka7nq0a3a6zyqqa1hp8j6qrb344js6zyak0cb63";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -3225,10 +3225,10 @@
       elpaBuild {
         pname = "tramp";
         ename = "tramp";
-        version = "2.4.3.2";
+        version = "2.4.3.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/tramp-2.4.3.2.tar";
-          sha256 = "17kay6rpkgz79jggzj53awkbqfsp5sq93wpssw5vlwnigd4mrkzx";
+          url = "https://elpa.gnu.org/packages/tramp-2.4.3.3.tar";
+          sha256 = "1di9ia59k6x7j9r8flwf05r160j30nrg0jvq5fjc9iazag9lniyw";
         };
         packageRequires = [ emacs ];
         meta = {

From 8891bc00e5eb7e9284e1da0b729dd2ca3557d152 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Mon, 30 Mar 2020 09:42:18 +0100
Subject: [PATCH 4426/4636] melpa-packages: 2020-03-30

---
 .../emacs-modes/recipes-archive-melpa.json    | 4160 +++++++++++------
 1 file changed, 2706 insertions(+), 1454 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
index d1cd10180273..5f505580f255 100644
--- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
@@ -283,10 +283,10 @@
  },
  {
   "ename": "ac-alchemist",
-  "commit": "ef9037aa41a8d9467838495bb235db32c19cc417",
-  "sha256": "02ll3hcixgdb8zyszn78714gy1h2q0vkhpbnwap9302mr2racwl0",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "0cakni8lvkhgdrzwa2cdqwnkbaiac1fn4j2lqgmx33z7hmrk8am6",
   "fetcher": "github",
-  "repo": "syohex/emacs-ac-alchemist",
+  "repo": "emacsorphanage/ac-alchemist",
   "unstable": {
    "version": [
     20150908,
@@ -334,10 +334,10 @@
  },
  {
   "ename": "ac-capf",
-  "commit": "929da263f57b904c50f5f17b09d4c4b480999c97",
-  "sha256": "1drgk5iz2wp3rxzd39pj0n4cfmm5z8zqlp50jw5z7ffbbg35qxbm",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "08a1ywyv5l1npbkpmg3wmprnqk837bmbwjpcgf5di9a2j33xqbin",
   "fetcher": "github",
-  "repo": "syohex/emacs-ac-capf",
+  "repo": "emacsorphanage/ac-capf",
   "unstable": {
    "version": [
     20151101,
@@ -516,10 +516,10 @@
  },
  {
   "ename": "ac-emoji",
-  "commit": "15f591f9cba367b071046fef5ae01bbbd0475ce3",
-  "sha256": "0msh3dh89jzk6hxva34gp9d5pazchgdknxjbi72z26rss9bkp1mw",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "06cwaasv2bsxr86wsjc21ggibcyqfp352wnc8i5fbr4ypd3vbk42",
   "fetcher": "github",
-  "repo": "syohex/emacs-ac-emoji",
+  "repo": "emacsorphanage/ac-emoji",
   "unstable": {
    "version": [
     20150823,
@@ -547,10 +547,10 @@
  },
  {
   "ename": "ac-etags",
-  "commit": "fda9c7def8bc54af4ab17dc049dd94324c8f10fa",
-  "sha256": "0ag49k9izrs4ikzac9lifvvwhcn5n89lr2vb20pngsvg1czdyhzb",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "1qy6v37v7lx93lnpgh5bf2ccxpg2ldzwgdyigqmby9fy0wzwr8sf",
   "fetcher": "github",
-  "repo": "syohex/emacs-ac-etags",
+  "repo": "emacsorphanage/ac-etags",
   "unstable": {
    "version": [
     20161001,
@@ -582,15 +582,15 @@
   "repo": "xiaohanyu/ac-geiser",
   "unstable": {
    "version": [
-    20130929,
-    647
+    20200318,
+    824
    ],
    "deps": [
     "auto-complete",
     "geiser"
    ],
-   "commit": "502d18a8a0bd4b5fdd495a99299ba2a632c5cd9a",
-   "sha256": "0h2kakb4f5hgzf5l2kpqngalcmc4402lkg1pvs88c8z4rqp2vfvz"
+   "commit": "93818c936ee7e2f1ba1b315578bde363a7d43d05",
+   "sha256": "00n2qa26yilaj837n1yp6lbqa4gf30nkkbvanl7m9ih7k48ssqmw"
   },
   "stable": {
    "version": [
@@ -814,10 +814,10 @@
  },
  {
   "ename": "ac-ispell",
-  "commit": "b41acb7387ebef9af2906fa16298b64d6431bfb0",
-  "sha256": "1vsy2qjh60n5lavivpqhhcpg5pk8zz2r0wy1sb65capn841zdi67",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "0npbrvwww6mi8q8x3cc6sf02x1b3ns2w7499lip7ymbr1zi9gdxg",
   "fetcher": "github",
-  "repo": "syohex/emacs-ac-ispell",
+  "repo": "emacsorphanage/ac-ispell",
   "unstable": {
    "version": [
     20151101,
@@ -1020,10 +1020,10 @@
  },
  {
   "ename": "ac-racer",
-  "commit": "e4318daf4dbb6864ee41f41287c89010fb811641",
-  "sha256": "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "0vxnc6q2khxf5xl3k8lwvjg5biqxasr4vm9k3c8033xwl6in299r",
   "fetcher": "github",
-  "repo": "syohex/emacs-ac-racer",
+  "repo": "emacsorphanage/ac-racer",
   "unstable": {
    "version": [
     20170114,
@@ -2242,26 +2242,26 @@
   "repo": "domtronn/all-the-icons.el",
   "unstable": {
    "version": [
-    20191127,
-    1123
+    20200326,
+    1553
    ],
    "deps": [
     "memoize"
    ],
-   "commit": "1416f37984486a44c6c0cbe0a2c985e82f965b6b",
-   "sha256": "1nwqn1cwjrmlp8g87ciwpv1h0pd61nh05bdpvz2kqg8b5ssfc4gd"
+   "commit": "f6cbb51c152dd60be5718218600a4ec14d9fd6cc",
+   "sha256": "0a59m1vv0s7czsccfalqyyp3v4lhydn1wbvyxkzy8i9fsjqbyxsa"
   },
   "stable": {
    "version": [
-    3,
-    2,
-    0
+    4,
+    0,
+    1
    ],
    "deps": [
     "memoize"
    ],
-   "commit": "52d1f2d36468146c93aaf11399f581401a233306",
-   "sha256": "1sdl33117lccznj38021lwcdnpi9nxmym295q6y460y4dm4lx0jn"
+   "commit": "d363bb3e73909be013fcf35e1458bb654ec5bbaa",
+   "sha256": "0yh7gnv9xfqn8q4rzaa6wpyn9575vyfxy7d3afly2mqsb367fgm5"
   }
  },
  {
@@ -2272,14 +2272,14 @@
   "repo": "jtbm37/all-the-icons-dired",
   "unstable": {
    "version": [
-    20200301,
-    1346
+    20200327,
+    758
    ],
    "deps": [
     "all-the-icons"
    ],
-   "commit": "733e0b520562d1f78f757f21287547272cedcaef",
-   "sha256": "1ml9xzdaqjnpwb8rnqr0967n3zk7fb56xy531gc52k3pxj68zbcc"
+   "commit": "816987d339630e43f77a5a64ef308e95d341dda7",
+   "sha256": "01wgxdw222pz2sv7x9jwlislkasaw01bkq1nkpdp4jwl816aza8l"
   }
  },
  {
@@ -2309,14 +2309,14 @@
   "repo": "seagle0128/all-the-icons-ibuffer",
   "unstable": {
    "version": [
-    20200315,
-    1244
+    20200319,
+    1625
    ],
    "deps": [
     "all-the-icons"
    ],
-   "commit": "8f8a09e0443738df5c659c1d85c714fc7c111a2d",
-   "sha256": "0rpjrfprpddhp1wymwrx798x09wp6hrjl8131wgkpsnpi3bxcaz5"
+   "commit": "3ee9e32f480329e94e45f86538343b0ddc7ddd4f",
+   "sha256": "1cs9027q26nfm5k3182mbmmhj8s8y2nv47gsyamwpjqdma0sbl73"
   },
   "stable": {
    "version": [
@@ -2371,15 +2371,15 @@
   "repo": "seagle0128/all-the-icons-ivy-rich",
   "unstable": {
    "version": [
-    20200315,
-    1225
+    20200324,
+    550
    ],
    "deps": [
     "all-the-icons",
     "ivy-rich"
    ],
-   "commit": "a12e39b9f343b28a1868112eafce7661aaf883ef",
-   "sha256": "0bdwb5diplzygn768aqmayy276i9cy5qg8dam3bs3vqkmm0is4q1"
+   "commit": "a9a4389c1930a5a071857b4d450eaecb21f4d6b9",
+   "sha256": "133vl3awl3qxxd2ka8zdr33v6s8hrjpsv4bv2db5j8jz35m0hx9d"
   },
   "stable": {
    "version": [
@@ -2595,14 +2595,14 @@
   "repo": "stardiviner/amread-mode",
   "unstable": {
    "version": [
-    20200315,
-    323
+    20200322,
+    843
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "b0c9ec7e8c55e89a565361712dff11dc7b74845f",
-   "sha256": "0bc2p8n5mr06w0jww3snlq15qd125c17qv5fpih3lr7n76zqfcdv"
+   "commit": "76ebe8d56b4d19f2bf75f54479f0e7ecc9cbaac9",
+   "sha256": "09jmllb9an992mzgncxral8i7j532l8i80yvvqwaqwv9azwab5sd"
   }
  },
  {
@@ -2930,11 +2930,11 @@
   "repo": "bastibe/annotate.el",
   "unstable": {
    "version": [
-    20200312,
-    1352
+    20200317,
+    1703
    ],
-   "commit": "b8fd76f712042c210b2139448e53d5f9923ba5f0",
-   "sha256": "179nhb2f2lq2q5pwq6l10n1cgjyr300083g7nsxn4z72la9m5gh4"
+   "commit": "44b378b16ad407c36e8cf728e671c17116d854b6",
+   "sha256": "1xhmgadi4maci25si3mf854d0ammz7w9l317r4m81v1gkdfvv8wi"
   },
   "stable": {
    "version": [
@@ -3200,17 +3200,17 @@
  },
  {
   "ename": "anzu",
-  "commit": "855ea20024b606314f8590129259747cac0bcc97",
-  "sha256": "181hzwy9bc0zfhax26p20q9cjibrmi9ngps5fa3ja5g6scxfs9g1",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "0m9wwq5fl7g6gfzv6m9hlrjf8nvqn1q7nqif1x93sh7q3vfwgxzl",
   "fetcher": "github",
-  "repo": "syohex/emacs-anzu",
+  "repo": "emacsorphanage/anzu",
   "unstable": {
    "version": [
-    20190303,
-    1701
+    20200328,
+    2019
    ],
-   "commit": "592f8ee6d0b1bc543943b36a30063c2d1aac4b22",
-   "sha256": "123zbnl36vi0gkffd6m6mkskhmjmm0am23j45w1mbmfyq03r1d8b"
+   "commit": "61cb32aa61f9bd088c519ea3cc96b81e241efed7",
+   "sha256": "1b2zjich6mvypycsrz5jkpv5mbaj77jka17vcc5ss2390dad92f8"
   },
   "stable": {
    "version": [
@@ -3263,6 +3263,30 @@
    "sha256": "1grs2x51k8pa6sgfa82s5pwwdfv7zw46ccw0zvd2rvzbhpq21p2z"
   }
  },
+ {
+  "ename": "apdl-mode",
+  "commit": "2fd3f323919b8eebba081689c93bb918d0af1359",
+  "sha256": "11in64hcs5gmvviv986043r68l34byi31v5vibwqx63qg8k3gqfn",
+  "fetcher": "github",
+  "repo": "dieter-wilhelm/apdl-mode",
+  "unstable": {
+   "version": [
+    20200329,
+    2024
+   ],
+   "commit": "af7764828555486a78727194a001193d03dc12f0",
+   "sha256": "1p5w7kzmmsc3ayh4rvmd0a9g9wchvddhr22dx3jl7dx42s3sig5m"
+  },
+  "stable": {
+   "version": [
+    20,
+    3,
+    0
+   ],
+   "commit": "17bbc63239d2b791887c3d263fa7b4e8ea9d0ccb",
+   "sha256": "0g9nf0853c56w8vpzys4rxw6ki887ajr3h7cgqb295aa16bg65x7"
+  }
+ },
  {
   "ename": "apel",
   "commit": "4976446a8ae40980d502186615902fc05c15ec7c",
@@ -3446,8 +3470,8 @@
     "let-alist",
     "request"
    ],
-   "commit": "265ab11044b527ca70762fc5d633227001dd4da6",
-   "sha256": "09xww9vz7jjlrya8cyayh79x4inlhi6y7sdgg3xrbaxi9avflcs8"
+   "commit": "5fe8b035b2b6bc165728444bb8e9792d14b7409d",
+   "sha256": "1wbpjz5jgpph6c6wk29dxz8r368ai6jx9cb4y2mdcpngig8kmazm"
   }
  },
  {
@@ -3493,11 +3517,11 @@
   "repo": "rubikitch/archive-region",
   "unstable": {
    "version": [
-    20140201,
-    2342
+    20200316,
+    1425
    ],
-   "commit": "0d357d4c42a6a248c457f358f81b20fd20fede2f",
-   "sha256": "03pmwgvlxxlp4wh0sg5czpx1i88i43lz8lwdbfa6l28g1sv0f264"
+   "commit": "53cd2d96ea7c33f320353982b36854f25c900c2e",
+   "sha256": "1c3ji0asnhdls8pa5hbqg65kc35jc6yndib7cx1zvnpb8pjlvbbr"
   }
  },
  {
@@ -3637,6 +3661,24 @@
    "sha256": "1yvirfmvf6v5khl7zhx2ddv9bbxnx1qhwfzi0gy2nmbxlykb6s2j"
   }
  },
+ {
+  "ename": "ascii-table",
+  "commit": "d6d5599ff68bf9125a9825ddd2a00009242bf2e1",
+  "sha256": "0p3dyxzs5xaq17209nnf2cqs87hz2b1k3x1nkq4jvhn71v4jcaj1",
+  "fetcher": "github",
+  "repo": "lassik/emacs-ascii-table",
+  "unstable": {
+   "version": [
+    20200329,
+    1744
+   ],
+   "deps": [
+    "cl-lib"
+   ],
+   "commit": "572b62c8305b8c26082a17e15bc2f53066ddcb5a",
+   "sha256": "1k1wfbwzn9gjv7hmc7ffr3r211vxrxassryar6gnajmj9xbzwcgi"
+  }
+ },
  {
   "ename": "asilea",
   "commit": "858e673c66e876d80f41d47d307c944d7bdb147d",
@@ -3714,6 +3756,24 @@
    "sha256": "0mq59wz9anvywazl7d01fis1z7z7fsp9c7pymrc8rgmz77xpwnqx"
   }
  },
+ {
+  "ename": "astyle",
+  "commit": "b495f29653edd15cef8eb3c9ea4d8aea35b0ac75",
+  "sha256": "0vchbm2lb9qa66fspyylyv0snmrxjfpzc332j0k7pkp6cmi08fnh",
+  "fetcher": "github",
+  "repo": "storvik/emacs-astyle",
+  "unstable": {
+   "version": [
+    20200328,
+    616
+   ],
+   "deps": [
+    "reformatter"
+   ],
+   "commit": "04ff2941f08c4b731fe6a18ee1697436d1ca1cc0",
+   "sha256": "0midga1dz9yl7mzn6syb3iwnfpzvnfpqnxi9rsv63rqnrm36qy4q"
+  }
+ },
  {
   "ename": "asx",
   "commit": "2eda72c3574c41184104532bb129cbe0efc8afd4",
@@ -3936,8 +3996,8 @@
    "deps": [
     "auctex"
    ],
-   "commit": "24270d9452c0b4ae974648cdbcdbad4401f4b1b5",
-   "sha256": "0la88z6g5vf2jq0gk8qfv83mgld1i10q84vn1ihhmnd9sqv99j5s"
+   "commit": "76fba4a1a918ce8a276fa0e22f026ad9a45a47dc",
+   "sha256": "1rd92s2c08z3l2r2wxcs46bbri4rj0d0aym36v89pwq0fcqqx2ry"
   },
   "stable": {
    "version": [
@@ -4666,6 +4726,24 @@
    "sha256": "0ckjijjpqpbv9yrqfnl3x9hcdwwdgvm5r2vyx1a9nk4d3i0hd9i5"
   }
  },
+ {
+  "ename": "auto-scroll-mode",
+  "commit": "195041c70d2807184d4d8c711bcd3f54b8dfc73a",
+  "sha256": "1hvnhszn1cqzw42wn7w0hrq7wn161alg2w6xpd53ydg61g31i68n",
+  "fetcher": "github",
+  "repo": "stardiviner/auto-scroll-mode",
+  "unstable": {
+   "version": [
+    20200316,
+    134
+   ],
+   "deps": [
+    "cl-lib"
+   ],
+   "commit": "a23669a8747e71ca5b1003b923f7a3d3834740e3",
+   "sha256": "033msm39fdhm6iqd7khjsqvxrv4314h8klsq3g06zsrgpmjki1xr"
+  }
+ },
  {
   "ename": "auto-shell-command",
   "commit": "ea710bfa77fee7c2688eea8258ca9d2105d1896e",
@@ -4823,6 +4901,21 @@
    "sha256": "138kzn20gfy6dj15nkfwsz7lz91n6ffsjzz2kkmclnfkazxixjhq"
   }
  },
+ {
+  "ename": "autocrypt",
+  "commit": "c5aac210984709f020f96f3ca166185900accddf",
+  "sha256": "1y5p5n2p2qk638i1as3wbfz82r08jv4q91470xz9r1gkdnn1xyx8",
+  "fetcher": "git",
+  "url": "https://git.sr.ht/~zge/autocrypt",
+  "unstable": {
+   "version": [
+    20200327,
+    1958
+   ],
+   "commit": "f970fb51c80d582dcc6682106388d6a870ef2c83",
+   "sha256": "0qfawvnjyc0rrvr5zhkq7ngllrf5h9z3wsi2a75s74545d6nyyjq"
+  }
+ },
  {
   "ename": "autodisass-java-bytecode",
   "commit": "a094845521d76754a29435012af5fba9f7975a8e",
@@ -5476,11 +5569,11 @@
   "url": "https://git.sr.ht/~zge/bang",
   "unstable": {
    "version": [
-    20200102,
-    1933
+    20200325,
+    1053
    ],
-   "commit": "87589331a8f0850a46964dbdbdcc3f2191b03376",
-   "sha256": "0yzz090997jn3d1ah8a32q491bsgzan6zqp2szv7d8ga4ziv3gkp"
+   "commit": "11e121aed7f5fe90700bd3f49d987bff0a796c2d",
+   "sha256": "0y6rdfhywjp0d4l39hjhlzzwp64wgd3xrvr80c2f6xbc74c6l5hk"
   },
   "stable": {
    "version": [
@@ -6455,20 +6548,20 @@
   "repo": "riscy/bifocal-mode",
   "unstable": {
    "version": [
-    20190623,
-    2236
+    20200325,
+    539
    ],
-   "commit": "c354fc32b0a666203f5c546bb2d2c397cb003391",
-   "sha256": "0wzsbrj1rhfl6qgjnphbh6ijfbjdr2wid7mqzz49ykcb9ldm7kjj"
+   "commit": "773a6dde790c4a240e643a9071e4c7bce09d40de",
+   "sha256": "11dirb13hblfa95hqqshrsjri4d4qzcq5qhhnd4xqajdchr62758"
   },
   "stable": {
    "version": [
     0,
     0,
-    5
+    6
    ],
-   "commit": "add30c678488cec04976a85ba8cda20805938a01",
-   "sha256": "01j8s6c3qm4scxy1dk07l41y0n55gz83zzfi254kc2vyx02vqg7f"
+   "commit": "773a6dde790c4a240e643a9071e4c7bce09d40de",
+   "sha256": "11dirb13hblfa95hqqshrsjri4d4qzcq5qhhnd4xqajdchr62758"
   }
  },
  {
@@ -6515,8 +6608,8 @@
     "bind-key",
     "key-chord"
    ],
-   "commit": "42db6b3d90ee57d0f5947d3b0bf4b0010bdf7b40",
-   "sha256": "1an2whgy68l9c1l1qx8p8jz47g4hj2abf0kxvcmbc6wj8lp5zny8"
+   "commit": "c873d5529c9c80cb58222f22873a4f081c307cb2",
+   "sha256": "0jbq3w9ijsbl5gblhr24b0rh4gyp1xx696g20l438a7sbsk4b531"
   },
   "stable": {
    "version": [
@@ -6542,8 +6635,8 @@
     20191110,
     416
    ],
-   "commit": "42db6b3d90ee57d0f5947d3b0bf4b0010bdf7b40",
-   "sha256": "1an2whgy68l9c1l1qx8p8jz47g4hj2abf0kxvcmbc6wj8lp5zny8"
+   "commit": "c873d5529c9c80cb58222f22873a4f081c307cb2",
+   "sha256": "0jbq3w9ijsbl5gblhr24b0rh4gyp1xx696g20l438a7sbsk4b531"
   },
   "stable": {
    "version": [
@@ -6751,6 +6844,29 @@
    "sha256": "0cs9nmi30dknrw6p2xvx9np1zmzpsn3bs93lhfiqy2a4ylf96brl"
   }
  },
+ {
+  "ename": "blackout",
+  "commit": "9128d87569dc74b90f57dd65edead7199f5c7911",
+  "sha256": "06gxgald2vchfwhbiaap7rfjk7kirfv4yjc4r98g998v96bilw64",
+  "fetcher": "github",
+  "repo": "raxod502/blackout",
+  "unstable": {
+   "version": [
+    20200326,
+    1640
+   ],
+   "commit": "87498cc91916c2f41d28e93fd80102c42b93ccf6",
+   "sha256": "156mnqwcpv3zl5pklqvmayq5j76hm4jc3has4qydfygz8fhx1zhy"
+  },
+  "stable": {
+   "version": [
+    1,
+    0
+   ],
+   "commit": "87822abd1ed46411368ef91752a7f51c0ef2aee0",
+   "sha256": "0n0889vsm3lzswkcdgdykgv3vz4pb9s88wwkinc5bn70vc187byp"
+  }
+ },
  {
   "ename": "blgrep",
   "commit": "e78ed9dc4a7ff57524e79213973157ab364ae14d",
@@ -6951,14 +7067,14 @@
   "repo": "sergeyklay/bnf-mode",
   "unstable": {
    "version": [
-    20200313,
-    2245
+    20200323,
+    1348
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "9c8c27e38cce6ba4d059a052ee0e0ece103e0684",
-   "sha256": "0daiv5ac7xnmprqmmc2d8gw83qyvsa8h9wnzh2ak1xs9hpar2nkw"
+   "commit": "d88eef69ae66ea1ffa21a65317afe84c9ddb0814",
+   "sha256": "1bci2w8drwgcli9hqg55izaxpwq4fvqdigvlrfc0524s7021ij24"
   },
   "stable": {
    "version": [
@@ -7359,6 +7475,48 @@
    "sha256": "1980267q70b7m16jsxc433cdqzr15q8dz5cwpkhla52wfdf1s184"
   }
  },
+ {
+  "ename": "brf",
+  "commit": "203e7d21e2387866107740ead4ec28787d82ebfb",
+  "sha256": "0439bzzzy6kx536zh9azxrdmfpb69xrr8axxg5q7989892iaqi5m",
+  "fetcher": "git",
+  "url": "https://bitbucket.org/MikeWoolley/brf-mode",
+  "unstable": {
+   "version": [
+    20200329,
+    1531
+   ],
+   "deps": [
+    "fringe-helper"
+   ],
+   "commit": "f1ae0c5eb74f62af109ebaf18e8663d6f51270cb",
+   "sha256": "1pzxz5irx6ysa8nhl9x50v8l5r2cvd6pafj71q4i5lrxv9a1dkl1"
+  }
+ },
+ {
+  "ename": "brightscript-mode",
+  "commit": "9acbba1c180ea7c03156009c08285697a7aae419",
+  "sha256": "0g0lwmd53v6lqihksqdirl12rz6a9ljp9zdm1xpd4wbqz72w17jw",
+  "fetcher": "github",
+  "repo": "viseztrance/brightscript-mode",
+  "unstable": {
+   "version": [
+    20200321,
+    2126
+   ],
+   "commit": "51f2d43e08960aa65a67273101733636026790a6",
+   "sha256": "0dzgkpaqlrqfzsmb61idlrp91vs3lrcymbdd4k6ls58kdv75v1j8"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    0
+   ],
+   "commit": "01405633a14269ab26d053ca6f1494c987d24195",
+   "sha256": "0952smngj32an30v2bqgfc14xrl90xwr4a038w01cdgg9k848g7y"
+  }
+ },
  {
   "ename": "broadcast",
   "commit": "6ed51896112e702a8b853059884aad50d37738c2",
@@ -7762,6 +7920,60 @@
    "sha256": "0x9bcnya47pf78p6ksdvs1ca5arvbgyi1q8b9yxq55fg3k9523ln"
   }
  },
+ {
+  "ename": "buffer-wrap",
+  "commit": "446fb5528644d9e51a10ade59de97e248729d3f3",
+  "sha256": "1fdk490hwz1mf4ldw8bh0w2byxi03qwdapgdgcvzir3s913gagrw",
+  "fetcher": "github",
+  "repo": "jcs-elpa/buffer-wrap",
+  "unstable": {
+   "version": [
+    20200223,
+    605
+   ],
+   "commit": "460f90bc024b6c287ed8afac3ff1bed2a147c777",
+   "sha256": "07r50iiiyhbqbia9c8c3kz1hvqjs6dkb8rkqpq4yyv3vd1kc9qnb"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    1
+   ],
+   "commit": "813a3dab3007a34fa27cf0a1ae687dc0eae98240",
+   "sha256": "0m2ryic16083ab0x6qwfrxrpsgq84s518vn0cbfcxycblpdh89al"
+  }
+ },
+ {
+  "ename": "bufler",
+  "commit": "b50d5939113ca9a8ad1ba606f3d3030f110a800b",
+  "sha256": "0y1gfpb99777sxizxvqyffsmbv6ib4zasi2dyrf8imf4z45r6adh",
+  "fetcher": "github",
+  "repo": "alphapapa/bufler.el",
+  "unstable": {
+   "version": [
+    20200318,
+    2005
+   ],
+   "deps": [
+    "dash",
+    "dash-functional",
+    "f",
+    "magit-section",
+    "pretty-hydra"
+   ],
+   "commit": "39e756a23196d12792a3af4a06ab024d8235ee19",
+   "sha256": "1b9ddgdd7b6x6353f8s6cv97xqsmmka6vwmv68sq75104wr189w5"
+  },
+  "stable": {
+   "version": [
+    0,
+    1
+   ],
+   "commit": "2eca0959657030c5853020da017fe98a19bba3f1",
+   "sha256": "0yqgaqz41sbfdbvjxf773p5m2qsr4mm22j2qgn3mp0z1r5dx67ai"
+  }
+ },
  {
   "ename": "bufshow",
   "commit": "543a734795eed11aa47a8e1348d14e362b341af0",
@@ -8978,8 +9190,8 @@
     20200314,
     1557
    ],
-   "commit": "2dcd552b314bc64daa40fd7ac09937439e447548",
-   "sha256": "1scixb6s795hjmkpkljccxg8ja2lqkja905gg5lmp09vykf8x5ir"
+   "commit": "37593d191b255d8633231099c70b1b26b3da0d39",
+   "sha256": "02pn3pxawl6268sy981iqialzyj9zy9dz6ci9jrkvbc8gp9gcvwh"
   }
  },
  {
@@ -8990,16 +9202,16 @@
   "repo": "MaskRay/emacs-ccls",
   "unstable": {
    "version": [
-    20200204,
-    444
+    20200327,
+    1915
    ],
    "deps": [
     "dash",
     "lsp-mode",
     "projectile"
    ],
-   "commit": "e5cc4c3e6f40c9c9f0f53e99154c08018eb36944",
-   "sha256": "1yc7jj4g0kh0m1a4r98shvr48wp9i5mawld0xzs9mbfj97dsb96v"
+   "commit": "17ec7bb4cf362b7268c24e070e841f0dfac1c919",
+   "sha256": "08pndwbw6wcpysnvhkqfvrw91ac0np31swiq0yv3dr2x0sq70cp5"
   }
  },
  {
@@ -9028,8 +9240,8 @@
     20200314,
     1557
    ],
-   "commit": "2dcd552b314bc64daa40fd7ac09937439e447548",
-   "sha256": "1scixb6s795hjmkpkljccxg8ja2lqkja905gg5lmp09vykf8x5ir"
+   "commit": "37593d191b255d8633231099c70b1b26b3da0d39",
+   "sha256": "02pn3pxawl6268sy981iqialzyj9zy9dz6ci9jrkvbc8gp9gcvwh"
   }
  },
  {
@@ -9163,15 +9375,15 @@
   "repo": "ema2159/centaur-tabs",
   "unstable": {
    "version": [
-    20200312,
-    1817
+    20200325,
+    1236
    ],
    "deps": [
     "cl-lib",
     "powerline"
    ],
-   "commit": "69fc454d86eaf279b93efed7b0ee9df67c8a25a2",
-   "sha256": "1jfj6jfz74ia2sdhxy5vp4svsvvqpxlwydfcj3vc65ic7hzh39nd"
+   "commit": "e6bf9f5257fa5401695e0e33d0376a0821ac2f2f",
+   "sha256": "1gm06par7pglwj25ydvlp1n2vniq6283mm0g4s53ra77ywsz73jv"
   },
   "stable": {
    "version": [
@@ -9298,8 +9510,8 @@
     20171115,
     2108
    ],
-   "commit": "b1d6dca276e44e220be69052e7db1fc09cda6fc7",
-   "sha256": "0d5ngarandq3jagpjag7z99ma52wm6nbi46xp4zhx0m2ligq4v2m"
+   "commit": "f09d88781a5557d4b2b7d039757cc5e9a7ddd275",
+   "sha256": "10zr6a3z7gzvqvn5fb4l7hg9wi5vhmkdln0c44gskmikdsm173x1"
   },
   "stable": {
    "version": [
@@ -9881,6 +10093,40 @@
    "sha256": "1apzb0jccw91gdynqa1722bbalzj4kp9fq25zzw1rxsrgh3mgmc5"
   }
  },
+ {
+  "ename": "chronometrist",
+  "commit": "35d03fe9c066e7388d5ff4adad1afa1e30145995",
+  "sha256": "09dil46qjn7y55y7qax92l7mcw8g1bsb1mjqc92zgln96asi25kj",
+  "fetcher": "git",
+  "url": "https://framagit.org/contrapunctus/chronometrist/",
+  "unstable": {
+   "version": [
+    20200324,
+    653
+   ],
+   "deps": [
+    "dash",
+    "s",
+    "seq"
+   ],
+   "commit": "dc0fb3bed6b893ecb924f5b1228ab718325cc808",
+   "sha256": "08mzv8rijsagkj4ykxlgr99axp0kxnz36d3iaffkqzyv50cm4r6f"
+  },
+  "stable": {
+   "version": [
+    0,
+    4,
+    2
+   ],
+   "deps": [
+    "dash",
+    "s",
+    "seq"
+   ],
+   "commit": "cc791cd61ee4580c9786f8c58d9e1964e0ff0c64",
+   "sha256": "1ccy7qz1wcmggqlf3hwigbqq4wrx1amds4x9bxz9py6bypglyjc5"
+  }
+ },
  {
   "ename": "chronos",
   "commit": "53648c5699fc03e50774270f9560c727e2c22873",
@@ -9937,8 +10183,8 @@
   "repo": "clojure-emacs/cider",
   "unstable": {
    "version": [
-    20200308,
-    1030
+    20200328,
+    1555
    ],
    "deps": [
     "clojure-mode",
@@ -9949,8 +10195,8 @@
     "sesman",
     "spinner"
    ],
-   "commit": "c027c4948562f736fd77e441dc10cb5d6bb355a1",
-   "sha256": "0p808ks2x9dg98v80icxldynvvvfwwsf2y89la40fsc572s8zqjw"
+   "commit": "dfc13f9c199920522ee02feac1d5da1c0b578b6b",
+   "sha256": "12yifir74qicryl5v5gl80s5m2qvlb09ck6jywx20yin3jkw6l58"
   },
   "stable": {
    "version": [
@@ -10232,21 +10478,6 @@
    "sha256": "04xz3y3j8k1pv5v6v9wqscqlpmgqi85fs3igrv8c9y0xagild29k"
   }
  },
- {
-  "ename": "cl-font-lock",
-  "commit": "c4cc415c24fc1c404aa9e4d8fcc7bf70ed182633",
-  "sha256": "1igiclz5lshq9bz4sndf0qgsvnrfk39jnpld8g4a985gr2hislb4",
-  "fetcher": "github",
-  "repo": "equwal/cl-font-lock",
-  "unstable": {
-   "version": [
-    20200315,
-    649
-   ],
-   "commit": "9520969b67a42aa577cee2e46f16518fef248dc4",
-   "sha256": "05w6yy4jgar0p4b2715gp7armhfsbw84zyvm5c9j9qawlrjfxr1d"
-  }
- },
  {
   "ename": "cl-format",
   "commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -10454,11 +10685,11 @@
   "repo": "spudlyo/clipetty",
   "unstable": {
    "version": [
-    20200105,
-    15
+    20200327,
+    2241
    ],
-   "commit": "fda5a80cf4b24389b2f95eeec1d567df80a8fb11",
-   "sha256": "1nzlrd7vf4sqhb2a0bsg1gaj722id5i1s9f1wdi2bmx58rzhqnhp"
+   "commit": "7ee3f9c52f70f80820a8c66fb6f796d6e01dd92d",
+   "sha256": "1vgk4ci5di0dxm2ql02g1h484nd6abqiv2xa7fh2d9rbkfh9px30"
   },
   "stable": {
    "version": [
@@ -10741,11 +10972,11 @@
   "repo": "clojure-emacs/clojure-mode",
   "unstable": {
    "version": [
-    20191112,
-    1948
+    20200326,
+    1542
    ],
-   "commit": "51016faaa88956bdd4decf2fa94dd5198777a47c",
-   "sha256": "13xx6ihhr2175w5d0m5zbyg3fmk1s46wj399f4lrc4skwjxbrlgg"
+   "commit": "2f8f3ce4974a5290a99077fcc9b36f1c42309b55",
+   "sha256": "145wpnbv3g2l7i6nckcs7bcrv8fj28gzpz3n0dl8vqlw0qb7hmgr"
   },
   "stable": {
    "version": [
@@ -10765,14 +10996,14 @@
   "repo": "clojure-emacs/clojure-mode",
   "unstable": {
    "version": [
-    20190712,
-    639
+    20200320,
+    823
    ],
    "deps": [
     "clojure-mode"
    ],
-   "commit": "51016faaa88956bdd4decf2fa94dd5198777a47c",
-   "sha256": "13xx6ihhr2175w5d0m5zbyg3fmk1s46wj399f4lrc4skwjxbrlgg"
+   "commit": "2f8f3ce4974a5290a99077fcc9b36f1c42309b55",
+   "sha256": "145wpnbv3g2l7i6nckcs7bcrv8fj28gzpz3n0dl8vqlw0qb7hmgr"
   },
   "stable": {
    "version": [
@@ -11074,19 +11305,17 @@
     20190710,
     1319
    ],
-   "commit": "a6d95f57cc8934813ba273e1016d03bb190c44c0",
-   "sha256": "0m2bg4s4ldm5jmjnhgb82l3dm45pjkrsppkdh31x9clh6gvscvw5"
+   "commit": "887eb6b7680685ae9bc8697f30bf6406df2d318e",
+   "sha256": "1lcfn79fn3cn0sdhw5f50l8830w6lh0j7lhrz7la27sg4ag5rmg0"
   },
   "stable": {
    "version": [
     3,
     17,
-    0,
-    -1,
-    3
+    0
    ],
-   "commit": "1ec72e09471287630cf142d8587a9b8d9abad629",
-   "sha256": "1r0cqv2vfyswzhbh1ydq6g0vkhkhyz3mwhm0irlc22sfxj2dy56y"
+   "commit": "e3185e3d1b92a95c18f22f70b3cef6944dd019eb",
+   "sha256": "1r8nnaisx10d5r3kzyfz4af9mwb5f0nzz8nmn3xvnr12rryg2bwl"
   }
  },
  {
@@ -11154,11 +11383,11 @@
   "repo": "tumashu/cnfonts",
   "unstable": {
    "version": [
-    20200226,
-    206
+    20200327,
+    101
    ],
-   "commit": "1baddba41af7edd6d4eb3c24ac85ba4a1b30aa3f",
-   "sha256": "0hspqc5xhi0mmrwyakqbq7dikn56q05c5xsnpgkx2mjjx7z05jh1"
+   "commit": "d741332ad4bcd9a136d5dc4974a050da8ca28888",
+   "sha256": "1f2nrklzvm0b09d1s5rxvzahc32rs5qdqx910a45fj95hlw2w2wc"
   },
   "stable": {
    "version": [
@@ -11312,10 +11541,10 @@
  },
  {
   "ename": "codic",
-  "commit": "acc9b816796b9f142c53f90593952b43c962d2d8",
-  "sha256": "0fq2qfqhkd6injgl66vcpd61j67shl9xj260aj6cgb2nriq0jxgn",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "05pa2a74c4ra7qqv3da3bx623vf36qrk5dm1jx1a4x1vbpgv5mz0",
   "fetcher": "github",
-  "repo": "syohex/emacs-codic",
+  "repo": "emacsorphanage/codic",
   "unstable": {
    "version": [
     20150926,
@@ -11410,14 +11639,14 @@
   "repo": "patbl/colemak-evil",
   "unstable": {
    "version": [
-    20171015,
-    2307
+    20200326,
+    2359
    ],
    "deps": [
     "evil"
    ],
-   "commit": "192c779281ae1fbf2405dcdb55b3c5b2a1d0b3d1",
-   "sha256": "1clnvr7n6mx5b8pq1c6zchq7n1g8ip8hwgzc61ywrmiyv0v8rnc6"
+   "commit": "981bdcb1a48c6d9139493abe7e25fabe126e43c3",
+   "sha256": "0dqyqaqr71z4mipb4g5jxdw96lzb108fd5w4wi27023hfll3j1hc"
   }
  },
  {
@@ -11627,11 +11856,11 @@
   "url": "https://git.sr.ht/~lthms/colorless-themes.el",
   "unstable": {
    "version": [
-    20200221,
-    1655
+    20200325,
+    1307
    ],
-   "commit": "a7b7c0a32b174988f40378996cd8997f73524f19",
-   "sha256": "0khsf4xz0wjn774hy08pxafm79j55ns28q25pfzyj9s07hi4r0vz"
+   "commit": "2b4c341640c8191a39e4bc28d6cd04c7d6dcbb37",
+   "sha256": "0ni9cnrv464fk840i1ll241kzkiy1zc6nfrbdv3ciixxdxbshxbn"
   },
   "stable": {
    "version": [
@@ -12017,11 +12246,11 @@
   "repo": "company-mode/company-mode",
   "unstable": {
    "version": [
-    20200228,
-    1919
+    20200324,
+    2145
    ],
-   "commit": "94e22c45e92cf220abb9b5a582f85aa99c06004d",
-   "sha256": "0l3hxj2cf9fw7ma3ac95cigw733h2k0dv987hanfhlx2jckjyma1"
+   "commit": "61ddd9afb58879267bf947b152a68f3dbadb9259",
+   "sha256": "097xy8ar6dms4zn7ymxxgmhap096fs8nc5j3js5srzmv14rswm36"
   },
   "stable": {
    "version": [
@@ -12786,22 +13015,22 @@
  },
  {
   "ename": "company-jedi",
-  "commit": "bded1840a39fbf1e014c01276eb2f9c5a4fc218f",
-  "sha256": "1krrgrjq967c3j02y0i345yx6w4crisnj1k3bhih6j849fvy3fvj",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "0a1p00jcvslm7h08kzdf6by9v4lf850jb2ki8gl8hgdcf5yvkdyi",
   "fetcher": "github",
-  "repo": "syohex/emacs-company-jedi",
+  "repo": "emacsorphanage/company-jedi",
   "unstable": {
    "version": [
-    20151217,
-    321
+    20200324,
+    25
    ],
    "deps": [
     "cl-lib",
     "company",
     "jedi-core"
    ],
-   "commit": "2f54e791e10f5dc0ff164bfe97f1878359fab6f6",
-   "sha256": "0bpqswcc6a65wms0pdk9rsad9jiigmx2l1jaqr8bz4va945qdlhg"
+   "commit": "5232fbc1fdbfc81b1dd883afb720338c3e39556b",
+   "sha256": "155dba3qim7r8xhrv6dkhzhcc2km9761g5d3qmgd37jnk0mmd8l0"
   },
   "stable": {
    "version": [
@@ -12836,8 +13065,8 @@
     "lean-mode",
     "s"
    ],
-   "commit": "c9dffcda2951c22c483d1d22411d13bc132ce609",
-   "sha256": "1lj6j21hzya41fmlnw7faqmhvsdcgcidwibyvicgsb0gm6qqipjf"
+   "commit": "65b55b1711fb61129312044d5ac7e6a2c2ee245c",
+   "sha256": "1zmw8950qhry2ixk2ng0pg4j0vwx11nvjlrpab9jg6x47ys9j65n"
   }
  },
  {
@@ -12948,6 +13177,25 @@
    "sha256": "0sfa674g1qm280s0pc3n6qiiphj5i9ibknckx5capkrkxb5cwpkw"
   }
  },
+ {
+  "ename": "company-native-complete",
+  "commit": "b112834a7ab05829fbc9101151bf82440bf6e551",
+  "sha256": "18f62r8y9k5flkqhzz6sr2w3srdhb6cpzrcyl98pv0zy3dq49lp4",
+  "fetcher": "github",
+  "repo": "CeleritasCelery/emacs-native-shell-complete",
+  "unstable": {
+   "version": [
+    20200315,
+    2144
+   ],
+   "deps": [
+    "company",
+    "native-complete"
+   ],
+   "commit": "11803df3706fb23d58e418a14ce981204a64e847",
+   "sha256": "0maljdxigd4fvrm7pv3ssyywl3c1zhfpqdymq933iig7d2hrwxm1"
+  }
+ },
  {
   "ename": "company-nginx",
   "commit": "fb8843cddfa9133ea9e2790e8a1d8051cd4dabea",
@@ -13029,6 +13277,38 @@
    "sha256": "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld"
   }
  },
+ {
+  "ename": "company-org-roam",
+  "commit": "546d4c869c4d2a0981a572b5653f5e9ab8bcec47",
+  "sha256": "0kxf4fhs8ikw06ljdkk4ky1fb83xpmknasp7kyd3lpdk63cfvijh",
+  "fetcher": "github",
+  "repo": "jethrokuan/company-org-roam",
+  "unstable": {
+   "version": [
+    20200329,
+    609
+   ],
+   "deps": [
+    "company",
+    "dash",
+    "org-roam"
+   ],
+   "commit": "0d14bf56f53b1fcf14418d3e545785f4857b5f06",
+   "sha256": "0kjf3pqlb95m1z057sjkqmsi1qhh3d4snp29gk3fzz278bc7sl45"
+  },
+  "stable": {
+   "version": [
+    0,
+    1
+   ],
+   "deps": [
+    "company",
+    "org-roam"
+   ],
+   "commit": "a4c3f60883de783b190d4eb8bcc85f5912d9393a",
+   "sha256": "087z699i7y0q72s5qc7ks09bzin9cl3gm3aqs4ka99lzg676lrl8"
+  }
+ },
  {
   "ename": "company-php",
   "commit": "ac283f1b65c3ba6278e9d3236e5a19734e42b123",
@@ -13078,8 +13358,8 @@
     "company",
     "phpactor"
    ],
-   "commit": "5ccf65d59e6bbc9cd958dd5988e8fd2143b0d57f",
-   "sha256": "0k4dzn4a5y4kq7yz3ifvzziv90rp5si380c5ypgxr5iwb1b8a0l3"
+   "commit": "31fe2ea4dbd5c2f23efd6a4ec2ec881a4ced6b05",
+   "sha256": "0j52n0vs85q7zz5xfqw4rgrjjpr7mzfiqbzk7vwkcdmpnax608w5"
   },
   "stable": {
    "version": [
@@ -13143,15 +13423,15 @@
   "repo": "tumashu/company-posframe",
   "unstable": {
    "version": [
-    20200315,
-    815
+    20200327,
+    148
    ],
    "deps": [
     "company",
     "posframe"
    ],
-   "commit": "37a1f136f61bed4050dbeb182767c7e51cb73e1b",
-   "sha256": "09vryzs42lvwsv9sid5fqnyy8cvmpnf89kb30jjqy71ia8ijqx7l"
+   "commit": "18b83d29dae75239e22ca73d91eb09ceca5e77c4",
+   "sha256": "0gb3y80qhk1xgdx0iglcj78wvnbxnaiyvfgg0bmfvhswjii80160"
   },
   "stable": {
    "version": [
@@ -13182,8 +13462,8 @@
     "company",
     "prescient"
    ],
-   "commit": "7fd8c3b8028da4733434940c4aac1209281bef58",
-   "sha256": "1igsjdkxax2lavglc03h0dk3d7fpgqvlymnhyxx738sjyfzl09cr"
+   "commit": "a194852e8022762843052e58a9d0fbdaa1df0fe5",
+   "sha256": "0da4s32fza42vdiqhh7cdim08by5i4909q93ivxkmgrmqfgdvz0p"
   },
   "stable": {
    "version": [
@@ -13579,8 +13859,8 @@
   "repo": "TommyX12/company-tabnine",
   "unstable": {
    "version": [
-    20200102,
-    2025
+    20200327,
+    2137
    ],
    "deps": [
     "cl-lib",
@@ -13589,8 +13869,8 @@
     "s",
     "unicode-escape"
    ],
-   "commit": "a207f493eaf1cc766eb25ae84d0eca4c9d3e433b",
-   "sha256": "1qk0l4zcsd9jjivbaw7zbhx2dsdnb30slqc66qd3w69aq4r1xyv7"
+   "commit": "e986a4ad0d0e0174b08f1fb94c4f804a98a344e4",
+   "sha256": "1g5qv1fg22x1nkj696n12ixa2akgzivdc5q7yzy502kqjg67mkx5"
   }
  },
  {
@@ -14397,14 +14677,14 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20200314,
-    2005
+    20200319,
+    1329
    ],
    "deps": [
     "swiper"
    ],
-   "commit": "8fae568daafdc79d4990ad739bac42ee230d3234",
-   "sha256": "18ppxzafz9f8dn7wwdb9vab3c91n20csvn9kjr3djkjgngz6qjd1"
+   "commit": "64f05f4735bba8b708bc12cfc2cbfb7fb7706787",
+   "sha256": "16b75jw0by1f8divymfygjbp5mikc2bjz4nqd907mdsndf8k6i8q"
   },
   "stable": {
    "version": [
@@ -14544,14 +14824,14 @@
   "repo": "redguardtoo/counsel-etags",
   "unstable": {
    "version": [
-    20200224,
-    410
+    20200320,
+    19
    ],
    "deps": [
     "counsel"
    ],
-   "commit": "172c1f1d806f36d10bdeb6284e1adbce6c52091f",
-   "sha256": "0kbkf5244ajxri4x8aaxsc11jq90lsmpw3jyb5z8yfk1wisdx274"
+   "commit": "0abd7a1b6abaf59a01774ca05f51cc0c6ce7f287",
+   "sha256": "0kfj3b8gx95pa7yaps25javmag2bnlz5zn802wf0x81np4d3hgjs"
   },
   "stable": {
    "version": [
@@ -14779,14 +15059,14 @@
   "repo": "Lautaro-Garcia/counsel-spotify",
   "unstable": {
    "version": [
-    20200315,
+    20200326,
     156
    ],
    "deps": [
     "ivy"
    ],
-   "commit": "51315644440c648b5aada68d5461a5c0b3b58797",
-   "sha256": "1xnzwbn4bf6id8mr804y367rms7g00dlw100kapmwiqmyzshgvb8"
+   "commit": "5d23a898483de19cb60773492c9846facb8ae281",
+   "sha256": "0k9m8xi9p5w2qnpz0zmdf52ip6viws06qq5rssgvb0cr888iqib2"
   }
  },
  {
@@ -14853,8 +15133,8 @@
     "counsel",
     "request"
    ],
-   "commit": "3fadfa55f8e78b4a26f75fed6e972a83688bea7d",
-   "sha256": "0sficf1q881k3vr7yvdcc5gxnac27dp1na9b458fx2mam0892sz7"
+   "commit": "35c648b4cdd9f266ab54512a0fec2a3ca55d5bc6",
+   "sha256": "128vl9a5w8v2xzfi5xn9cqshxmcfq2pcmnkkqcxfmi401m2lm0bx"
   }
  },
  {
@@ -15021,6 +15301,18 @@
    ],
    "commit": "08208ca7b9dc4ac940ce9ca1f79424d2f3d3d391",
    "sha256": "0yspf51h5b7wbqvi9lbd22chyw799n5d05xdzl5axg0i33lzk7bq"
+  },
+  "stable": {
+   "version": [
+    0,
+    2,
+    0
+   ],
+   "deps": [
+    "cl-lib"
+   ],
+   "commit": "08208ca7b9dc4ac940ce9ca1f79424d2f3d3d391",
+   "sha256": "0yspf51h5b7wbqvi9lbd22chyw799n5d05xdzl5axg0i33lzk7bq"
   }
  },
  {
@@ -15439,8 +15731,8 @@
   "repo": "hlolli/csound-mode",
   "unstable": {
    "version": [
-    20200301,
-    31
+    20200326,
+    2154
    ],
    "deps": [
     "dash",
@@ -15448,8 +15740,8 @@
     "multi",
     "shut-up"
    ],
-   "commit": "f8a1af8cfdf9093911a159f73d39ba4f1f671e6c",
-   "sha256": "1gni984j1jlv2is0ah4730xalhv96wimm1iziavbsrsm4hcqqcgh"
+   "commit": "f278a0e13ecd6b00cd7b056a2e36021322bed8ea",
+   "sha256": "1axib3rgy7kdyprpp8cs94rc9yr34faii4n9f70jjkk6x7pr398m"
   },
   "stable": {
    "version": [
@@ -15778,6 +16070,21 @@
    "sha256": "1y685qfdkjyl7dwyvivlgc2lwp102vy6hvcb9zynw84c49f726sn"
   }
  },
+ {
+  "ename": "curl-to-elisp",
+  "commit": "11453864d71c7853bc743341db7ca071126ca160",
+  "sha256": "16qyw6yx5vlm32ikmgxhf162jjl1nq7lmrcn6g43fkk93id0374n",
+  "fetcher": "github",
+  "repo": "xuchunyang/curl-to-elisp",
+  "unstable": {
+   "version": [
+    20200321,
+    953
+   ],
+   "commit": "79da15f739984e3ce3e0b137df3634582abb4546",
+   "sha256": "04qjap6wsjd8kdz47bz1a11h1bdn7bmlvfg6y0bqy5yq55f4ampa"
+  }
+ },
  {
   "ename": "cursor-test",
   "commit": "6439f7561cfab4f6f3beb132d2a65e94b3deba9e",
@@ -15959,17 +16266,17 @@
     20190111,
     2150
    ],
-   "commit": "bd990e4a3a3f821b395b58e6d68b0bbd8f406241",
-   "sha256": "0bn1c1iw6598zpfhmrj35hyqj8ylj84gwsn59kk62bf8hqvrwabf"
+   "commit": "6a30fecff5decdf20029763afea6183de3177dc3",
+   "sha256": "1qdxr4wdl7mmbahsdhybq4qmc6ahf2h342gf6y99y6jkj8akvjy3"
   },
   "stable": {
    "version": [
     0,
     29,
-    15
+    16
    ],
-   "commit": "26cb654dcf4ed1b1858daf16b39fd13406b1ac64",
-   "sha256": "1b76f47yhalg4pipiarmax3869bwbv43a4qs8h1qrnibyzpwfy2z"
+   "commit": "c8425604fc3e4ea846016689942fa98e886b5f4f",
+   "sha256": "1794w6d9ams691ah8sah93vzb97wpss0j36z0fcn3sfvnf8kvpby"
   }
  },
  {
@@ -16167,8 +16474,8 @@
   "repo": "emacs-lsp/dap-mode",
   "unstable": {
    "version": [
-    20200223,
-    1146
+    20200325,
+    546
    ],
    "deps": [
     "bui",
@@ -16179,8 +16486,8 @@
     "lsp-treemacs",
     "s"
    ],
-   "commit": "e7a5144ce746942b00a21d35a1ca8be71195f5d4",
-   "sha256": "1ryn49v89d204f7dhdc6igw03vzz5gzqrpqmsdrcxcj5yci2wxyk"
+   "commit": "e2086fc9fbde4413f779b314bd5a93f808a3fb78",
+   "sha256": "1ig4s5aimd7zfyaa4fgb584lpzmi38kbfqc4jncifh0i69mi6x9k"
   },
   "stable": {
    "version": [
@@ -16577,6 +16884,40 @@
    "sha256": "1dvv10xn2mh0nh85cd78y23cn8p9ygdhj4k7xs4fa6r7bhp0xvqm"
   }
  },
+ {
+  "ename": "dashboard-ls",
+  "commit": "656977197e0030525c52b14de8f6e1faa042daeb",
+  "sha256": "10dsdzps7kh3v5p5grdjwf2xjr7rvaiqp57fg9vh4pficvhylqaa",
+  "fetcher": "github",
+  "repo": "jcs-elpa/dashboard-ls",
+  "unstable": {
+   "version": [
+    20200329,
+    1443
+   ],
+   "deps": [
+    "dashboard",
+    "f",
+    "s"
+   ],
+   "commit": "9026fd157f94b023a7b660a418b66ad638b14272",
+   "sha256": "1r78w47897qd9ki24mqxl3kgr2anzybfqv5x91y4xsvrk0siir64"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    2
+   ],
+   "deps": [
+    "dashboard",
+    "f",
+    "s"
+   ],
+   "commit": "9026fd157f94b023a7b660a418b66ad638b14272",
+   "sha256": "1r78w47897qd9ki24mqxl3kgr2anzybfqv5x91y4xsvrk0siir64"
+  }
+ },
  {
   "ename": "dashboard-project-status",
   "commit": "dfc05873c6532c866d89c4cc07eb84b447a25c70",
@@ -16811,15 +17152,15 @@
   "repo": "skk-dev/ddskk",
   "unstable": {
    "version": [
-    20200314,
-    2116
+    20200325,
+    1337
    ],
    "deps": [
     "ccc",
     "cdb"
    ],
-   "commit": "2dcd552b314bc64daa40fd7ac09937439e447548",
-   "sha256": "1scixb6s795hjmkpkljccxg8ja2lqkja905gg5lmp09vykf8x5ir"
+   "commit": "37593d191b255d8633231099c70b1b26b3da0d39",
+   "sha256": "02pn3pxawl6268sy981iqialzyj9zy9dz6ci9jrkvbc8gp9gcvwh"
   }
  },
  {
@@ -17610,14 +17951,14 @@
   "repo": "dgutov/diff-hl",
   "unstable": {
    "version": [
-    20191223,
-    26
+    20200329,
+    1724
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "fb9eb1cd3c4c6ed24b93de1a7cfb369d2983be74",
-   "sha256": "0ksp86izjw7vgh21jn4rwl5vnfn1jvgs05lv216mnwia8p14ihjz"
+   "commit": "7fce94f7d5eebea06aed153b0f574567182c8d2b",
+   "sha256": "11m9ab7ymvbsxgddwxwcr8mrll3m67lnib8bpmb9vmh16zb2mzcl"
   },
   "stable": {
    "version": [
@@ -17712,19 +18053,20 @@
   "repo": "retroj/digistar-mode",
   "unstable": {
    "version": [
-    20160218,
-    1955
+    20200322,
+    2109
    ],
-   "commit": "15288b1e1a04b79b5ab7097fdd26d48b2ff41076",
-   "sha256": "0qxdfv1p0140fqcxh677hhxwpx1fihvwhvh76pysn4q4pcfr6ldr"
+   "commit": "567fff3933f80f00f53610e7b08f75bb636b12c0",
+   "sha256": "0252lhkv2r8gy4512frhdh381xrf64nspvfm2hp7bkhz47dlrs7y"
   },
   "stable": {
    "version": [
     0,
-    4
+    6,
+    1
    ],
-   "commit": "0dcde58ec6e473042e55d4f283b223554546de5b",
-   "sha256": "0jzwaivsqh66py9hd3dg1ys5rc3p6pn8ndpwpvgyivk4pg6zhhj6"
+   "commit": "8b350b7a143219b3f927cb3a1aeb16a299363f05",
+   "sha256": "1sxfzirl8kgzmq8l9l868yl92mz1r8yk58fnxf7p6z4y0pdlcqfg"
   }
  },
  {
@@ -17840,8 +18182,8 @@
     20191127,
     1326
    ],
-   "commit": "96b47cf90360e4bd19138fe82dc59bfa86c7bf7d",
-   "sha256": "1ar2bl1w4s3gx8slryf5qzq4qzprdyhm1fngvlnfhxg83k2g3969"
+   "commit": "6ec6ebc391371418efc6c98d70b013f34af5a2ee",
+   "sha256": "0q8pihj9fwq9w978ycmvzv8kq8ksrdf8zfadjy8i2iwc4ib0jg7y"
   },
   "stable": {
    "version": [
@@ -17884,11 +18226,11 @@
   "repo": "gonewest818/dimmer.el",
   "unstable": {
    "version": [
-    20200308,
-    2331
+    20200329,
+    35
    ],
-   "commit": "e13541621e6fa82510fd5cb6ff029c1a134d0bfc",
-   "sha256": "13l33z9ydsh7m2d91dh2m2hin051k9ydbnbww40mpmsimmc90pxi"
+   "commit": "5298af739ce30bacadda892b620858b95709c84b",
+   "sha256": "0dlgk66mcbzdbpw0xn6l7fxjayvgczccsx0igda9745pwm8yvy9z"
   },
   "stable": {
    "version": [
@@ -18256,17 +18598,17 @@
  },
  {
   "ename": "dired-k",
-  "commit": "7f8a828b2fbfa11c4b74192d9d0cfa0ad34b3da7",
-  "sha256": "0lghdmy9qcjykscfxvfrz8cpp87qc0vfd03vw8nfpvwcs2sd28i8",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "1nimv6rzk0rrzvniirrsxzd78f4yil1aajcxyra2nmx7dr4xszqh",
   "fetcher": "github",
-  "repo": "syohex/emacs-dired-k",
+  "repo": "emacsorphanage/dired-k",
   "unstable": {
    "version": [
-    20200315,
-    1214
+    20200322,
+    2035
    ],
-   "commit": "256a73b170dfb16e4d7355ce5e9d9caacff2acd9",
-   "sha256": "1b464mr56azv5xmmfs9y5bzn1z3gicgz9g8ayvbbq1f293zxzd44"
+   "commit": "1f90cf6ac932ad30ccfefec27ea7e514c24ab335",
+   "sha256": "1bmpn18z42i8dy331yrks5gsivpvwj677yc58iw66ckjnyjnyjps"
   },
   "stable": {
    "version": [
@@ -18285,11 +18627,11 @@
   "repo": "thomp/dired-launch",
   "unstable": {
    "version": [
-    20180607,
-    1841
+    20200318,
+    1715
    ],
-   "commit": "ad45940f76ef2f6c3bb55e998829b311de191dae",
-   "sha256": "057nqlvqnq30gxfidmynp33040bgdq4gbwk0qdm294c5ap2af5yj"
+   "commit": "1f73233065ddb077adb7019ae33efd8acce9b561",
+   "sha256": "1sc0y7ffvyq5785gcmlgkkblz1nyyx4a5h1m1bi50zkqpna1pxbf"
   }
  },
  {
@@ -18655,14 +18997,14 @@
   "repo": "wbolster/emacs-direnv",
   "unstable": {
    "version": [
-    20200229,
-    1525
+    20200319,
+    2357
    ],
    "deps": [
     "dash"
    ],
-   "commit": "1f93e3f9cae5ec171939fe5c1fe9744a28fa6576",
-   "sha256": "0xkqn4604k2imas6azy1www56br8ls4iv9a44pxcd8h94j1fp44d"
+   "commit": "1daf479b9b7600ce9681f2a980deae7fcb2f3d59",
+   "sha256": "08hwjd1xmq6hxab537zm11kwqhwnc1dfznfqzy66c4agl9z9a7vx"
   },
   "stable": {
    "version": [
@@ -19583,11 +19925,11 @@
   "repo": "progfolio/doct",
   "unstable": {
    "version": [
-    20200313,
-    1851
+    20200329,
+    1548
    ],
-   "commit": "2850e2401c214db0bf0fa7e4773ef4f44ac6df86",
-   "sha256": "1lcw2s6yzvqxhgwv75q8ibmdm4j0z68j10j19jiir56x5bw426g1"
+   "commit": "e788ec71dafdd57a5c0eb3633794abbe3355f0c9",
+   "sha256": "19zqhcjpb23h4nn9h22jn1gh7a53y5v8f52809scl3vif0ch9b2h"
   }
  },
  {
@@ -19702,16 +20044,16 @@
   "repo": "seagle0128/doom-modeline",
   "unstable": {
    "version": [
-    20200311,
-    1726
+    20200322,
+    636
    ],
    "deps": [
     "all-the-icons",
     "dash",
     "shrink-path"
    ],
-   "commit": "06a79f5c5035b12c3110a7ab43b48e50217a2ae7",
-   "sha256": "0pgng5nqc3cj7bb57l0abqc2sr1542lgv7271i602k56sg7ak431"
+   "commit": "0642f7107102e88fb8818da02e6612c6855537ff",
+   "sha256": "1wmsrvzbvixzps6zp1d2r5fn7gkfwvjz2ksjqd6a8sd4swdx9ggk"
   },
   "stable": {
    "version": [
@@ -19736,14 +20078,14 @@
   "repo": "hlissner/emacs-doom-themes",
   "unstable": {
    "version": [
-    20200313,
-    1948
+    20200327,
+    1325
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "b51ab8f35cbbdec137a1b84cd9b07df6735d3d0e",
-   "sha256": "1yj0c7lx1rg31245yrrjza82m64bwk2686ydijkrd6j4pn9ksmck"
+   "commit": "bbb3725af973485424f6ca716b648923defa176c",
+   "sha256": "0pybwshmcfj0ll2hjcdrqdqbf6crn10pjlkbiyf3k23w5ayaql49"
   },
   "stable": {
    "version": [
@@ -19972,20 +20314,20 @@
   "repo": "dracula/emacs",
   "unstable": {
    "version": [
-    20200304,
-    1730
+    20200324,
+    1726
    ],
-   "commit": "ed2f68d85b637636a4f7b782f19ee4f8e9f6fa44",
-   "sha256": "19qvkrknnhkr77hkyv9x1dg6m4difwz59sy2mqzw50wfb6vsy17n"
+   "commit": "e4672e22885772d2be0c75df03c4f805f1acf5fa",
+   "sha256": "0pb0q8grybzl3sh75km93n1cvk7wh5c2r2nbm8rkwzzhxrhrvffl"
   },
   "stable": {
    "version": [
     1,
-    5,
-    1
+    7,
+    0
    ],
-   "commit": "66e429f4d576346661ae3a111bafaa06febc1d94",
-   "sha256": "0lyy8vjzzcfcj4hm7scxl4cg4qm67rprzdj7dmyc3907yad4n023"
+   "commit": "7751d4d3115c5e873b73b670248c49ce8910997e",
+   "sha256": "15y2djc5jljlvls1x9kp50m1kp0dcksmyixafsyimj66xpq9ngh0"
   }
  },
  {
@@ -20184,8 +20526,8 @@
   "repo": "dtk01/dtk",
   "unstable": {
    "version": [
-    20200314,
-    247
+    20200315,
+    1931
    ],
    "deps": [
     "cl-lib",
@@ -20193,8 +20535,8 @@
     "s",
     "seq"
    ],
-   "commit": "230ef5ca2fb0de3d4977942e19ba0c1f65bd5dad",
-   "sha256": "1x2bnammsbz9d2mz8nspzaa4wqda4s4v8p93g2i4ykwd4c2w00fl"
+   "commit": "d21a5b7958da058bb53d36fe9234089409f62c5e",
+   "sha256": "0w46yr5d108z2pipvh449p15qnm6mnix21pbnq3alczilzxzf9lw"
   }
  },
  {
@@ -20356,8 +20698,8 @@
     20191016,
     1241
    ],
-   "commit": "d9c34d1dc421850544ab7f33a23322a7748c2db4",
-   "sha256": "1wjdm7vk4r580lnyxy9h92xq1f3wfklbqrnnv8s94fjfj623bx6b"
+   "commit": "d864995d98479a21fb88fcf6d24b8262f2fdeae2",
+   "sha256": "091c58yvvwly070dgzz1202njlp695fzq85873v4dak1rwxisrwh"
   },
   "stable": {
    "version": [
@@ -20722,16 +21064,16 @@
   "repo": "aki2o/e2wm-term",
   "unstable": {
    "version": [
-    20141009,
-    1308
+    20200322,
+    729
    ],
    "deps": [
     "e2wm",
     "log4e",
     "yaxception"
    ],
-   "commit": "65b5ac88043d5c4048920a048f3599904ca55981",
-   "sha256": "0qv3kh6q3q7vgfsd8x25x8agi3fp96dkpjnxdidkwk6k8h9n0jzw"
+   "commit": "74362d6271e736272df32ea807c5a22e4df54a50",
+   "sha256": "1cr2mp1visx4fnxc73sk6gw7wnl1mxfb624rm1sxz7wwry8b8fx9"
   },
   "stable": {
    "version": [
@@ -21025,14 +21367,14 @@
   "repo": "joostkremers/ebib",
   "unstable": {
    "version": [
-    20200308,
-    2130
+    20200327,
+    1040
    ],
    "deps": [
     "parsebib"
    ],
-   "commit": "cd37aaa9a11e3b2232b8aa12cfe9a8ae9b830b10",
-   "sha256": "0spiz5r2y4pdpyc4d3f9w228giq0j9rm8f5h5akzn5rwiq9pfkwz"
+   "commit": "f57e138d56bd293f30a64c33ab8b374758acfb08",
+   "sha256": "0h8bxy6p91hhx6mvzbxv2j3cr6bxcdbpgbaqa9ibcaxy72d9xrjp"
   },
   "stable": {
    "version": [
@@ -21431,6 +21773,24 @@
    "sha256": "1wciwx9zk28r21v9ampjd8wn19g19ia7hiq1x0hami479dxwinfc"
   }
  },
+ {
+  "ename": "edit-chrome-textarea",
+  "commit": "d9e8d07ed13d190a8a7eab75a59ec5b9a01d97a8",
+  "sha256": "0xp7925y04gr09j204r01jq7hqjp32gqsazwsbih4fkx0n30aqbs",
+  "fetcher": "github",
+  "repo": "xuchunyang/edit-chrome-textarea.el",
+  "unstable": {
+   "version": [
+    20200324,
+    1513
+   ],
+   "deps": [
+    "websocket"
+   ],
+   "commit": "7074fe87c2df4aa7afecb7513326f5d481dcf92d",
+   "sha256": "17kbakpr6d79cih1fmvnrivs0vk41fw0njhb5y6dbml6ppi11i57"
+  }
+ },
  {
   "ename": "edit-color-stamp",
   "commit": "2ad2ea105b895cb958ce0ab2bf2fad2b40d41b2f",
@@ -21887,8 +22247,8 @@
     20200107,
     2333
    ],
-   "commit": "39d416a6ef2c1f863a9482e7ada59d5da6fb7883",
-   "sha256": "0f66fnzkwl37qp8rj3hhnnayx27l06c18n7x3422pvbgxc78c7i8"
+   "commit": "6ea43326d142b714363042a27e06d3487f7845d7",
+   "sha256": "0pvaz69rjaz8m32s4chq7kavf20njb78l380xl97blj9h0yry1l4"
   },
   "stable": {
    "version": [
@@ -21908,15 +22268,15 @@
   "repo": "joaotavora/eglot",
   "unstable": {
    "version": [
-    20200113,
-    1722
+    20200320,
+    852
    ],
    "deps": [
     "flymake",
     "jsonrpc"
    ],
-   "commit": "606e234ea867d057f201fde9a4de2a896f35782e",
-   "sha256": "0fjgy377vb3znzlb49xjf5a6k4ihmql1lbiaw2fla7282r5z5ja6"
+   "commit": "2209779972eee595ff6ea8e75c002f7e5726b0c8",
+   "sha256": "08mfgg9s76wmjzvpdirnm8rsa3fsvlvjivxjdn53aj1pnky55z8d"
   },
   "stable": {
    "version": [
@@ -22033,8 +22393,8 @@
   "repo": "millejoh/emacs-ipython-notebook",
   "unstable": {
    "version": [
-    20200314,
-    443
+    20200328,
+    2131
    ],
    "deps": [
     "anaphora",
@@ -22044,8 +22404,8 @@
     "request",
     "websocket"
    ],
-   "commit": "a0943af912bdda3bbe5a5cb2b49cb529a20a5a6a",
-   "sha256": "15713bv8aqsfh8zf80qsys7sd81hs0bx691jwmrdfhvdi1nyp8qj"
+   "commit": "6fc75f20aa0b6666e743ce674c6da526f88793b1",
+   "sha256": "10cm3pvpjrqy76xd9067ayn108z34014cyaal4vj2l69yrkfr0m1"
   },
   "stable": {
    "version": [
@@ -22119,8 +22479,8 @@
   "repo": "kostafey/ejc-sql",
   "unstable": {
    "version": [
-    20200308,
-    1421
+    20200325,
+    1455
    ],
    "deps": [
     "auto-complete",
@@ -22129,8 +22489,8 @@
     "direx",
     "spinner"
    ],
-   "commit": "046bffbaac2a78e440d39a1f1e2dd8055a39f3bd",
-   "sha256": "0ccww05ivqgsvvrhjlwlciv00213qar4sdzawzmxh85vxj3a045b"
+   "commit": "5bf46fc49b7827604ee82d56b80eee36630b562d",
+   "sha256": "0dcnzq9l1mnfrn7rq8kvyfkbw36r6iagp61c0p757xwfawsaxns4"
   },
   "stable": {
    "version": [
@@ -22556,11 +22916,11 @@
   "repo": "Mstrodl/elcord",
   "unstable": {
    "version": [
-    20200224,
-    1509
+    20200322,
+    2027
    ],
-   "commit": "61cd3834f8650a13d34d845138e40c5aaab75cb7",
-   "sha256": "0l3hv190xkzyalfnxsb0x7npmwdgf9bpc0qdi7p7issbf0vrjp4n"
+   "commit": "94b0afb9bac32fa72354517347646166d6bec986",
+   "sha256": "11gj67d83hx9wfjf4j277jy8jxf97i6bd9r8r057v4i8301qh91p"
   }
  },
  {
@@ -22628,11 +22988,11 @@
   "repo": "casouri/eldoc-box",
   "unstable": {
    "version": [
-    20191102,
-    1433
+    20200316,
+    1956
    ],
-   "commit": "913786070769fac83e7b8ef790b57c8d8cbf8853",
-   "sha256": "0lgwixznvrmgzkridbsmhxqdsgchs5k56vb8nmpmchgf08qvaiz2"
+   "commit": "7fa3b78d073c235ad945fc28d692c5f5fb60860a",
+   "sha256": "06cy6dsn3drfk0jkc10b96qzvi5rfhkjy7cib5dk2kqgg615is6d"
   },
   "stable": {
    "version": [
@@ -22690,15 +23050,15 @@
   "repo": "stardiviner/eldoc-overlay",
   "unstable": {
    "version": [
-    20200216,
-    546
+    20200328,
+    619
    ],
    "deps": [
     "inline-docs",
     "quick-peek"
    ],
-   "commit": "3123b20f26d2f74033de6feb398fd36745c46e14",
-   "sha256": "16crwazyn28qyb9zax1jfz2favgw402z676yf67qchgzsf2jj43s"
+   "commit": "ec318acb564ac5679285b51b7d979410d393fac9",
+   "sha256": "0dx1b9d7zyqcwsnhl18hyrkmrc0zy68zwhp81d43fw84gjb4jcx8"
   }
  },
  {
@@ -22940,28 +23300,28 @@
   "repo": "sp1ff/elfeed-score",
   "unstable": {
    "version": [
-    20200222,
-    7
+    20200328,
+    1855
    ],
    "deps": [
     "cl-lib",
     "elfeed"
    ],
-   "commit": "f14c0526676dd90be62b6aa086462047f7ac2da0",
-   "sha256": "099ch2jlj0fxn3d2v6z9rymkqbkrm3xp0bz4zkqbm54qcvdwib79"
+   "commit": "916c47b3590b2ff3c5075dcc1def4b36a4b14947",
+   "sha256": "1vhchbyy3c79cgvdz12wnryklr5g1bwh02d604zj2wca3b0199w4"
   },
   "stable": {
    "version": [
     0,
-    3,
-    0
+    4,
+    4
    ],
    "deps": [
     "cl-lib",
     "elfeed"
    ],
-   "commit": "f14c0526676dd90be62b6aa086462047f7ac2da0",
-   "sha256": "099ch2jlj0fxn3d2v6z9rymkqbkrm3xp0bz4zkqbm54qcvdwib79"
+   "commit": "916c47b3590b2ff3c5075dcc1def4b36a4b14947",
+   "sha256": "1vhchbyy3c79cgvdz12wnryklr5g1bwh02d604zj2wca3b0199w4"
   }
  },
  {
@@ -23082,11 +23442,11 @@
   "repo": "xuchunyang/elisp-demos",
   "unstable": {
    "version": [
-    20200312,
-    2343
+    20200329,
+    2310
    ],
-   "commit": "0d74766f0c081f8db1292a61889e625bb9a8a758",
-   "sha256": "0j72w9bjgywiwrgw4hfjhgzmlzy68v4wfpsaa78f3vlnkjca82is"
+   "commit": "57dd4ae3e47ecca6cb9eee87328f159b3eb53702",
+   "sha256": "15cjv97240nnmjjbdx9iqz4qwxvbxxsyjllcjwbmkkbpv6x91b89"
   },
   "stable": {
    "version": [
@@ -23151,24 +23511,28 @@
   "repo": "gonewest818/elisp-lint",
   "unstable": {
    "version": [
-    20200217,
-    38
+    20200324,
+    2217
    ],
    "deps": [
     "dash",
     "package-lint"
    ],
-   "commit": "7a3866326631ba1ba8f4cd7a6cfd03c467c32aae",
-   "sha256": "1ldyv0c21dvl362kj566q8gd84gqq8g558slxyl73cf651q0nr84"
+   "commit": "35a3fcc3131c243206fa914b8562cda771eab8c5",
+   "sha256": "09ibaq3mjnw3vm1rwrljdcgybxly2fk9gjdim39s9fpgar4ys12p"
   },
   "stable": {
    "version": [
     0,
-    3,
+    4,
     0
    ],
-   "commit": "d4dc13addde8cacd7660efcb369af5e54a547114",
-   "sha256": "1zyy8dj11sn74wq86hibp17a1zbps2pv26ncn8fh8wvsfy1vdfif"
+   "deps": [
+    "dash",
+    "package-lint"
+   ],
+   "commit": "2b645266be8010a6a49c6d0ebf6a3ad5bd290ff4",
+   "sha256": "1gg9ik0x67cnldzsclp45i7gf190y9pxl11k3grdkrkqjiph1375"
   }
  },
  {
@@ -23673,8 +24037,8 @@
   "repo": "jorgenschaefer/elpy",
   "unstable": {
    "version": [
-    20200202,
-    2031
+    20200329,
+    1830
    ],
    "deps": [
     "company",
@@ -23683,13 +24047,13 @@
     "s",
     "yasnippet"
    ],
-   "commit": "b25ab8c195472cf152fed80c212750b33837025e",
-   "sha256": "1nidig1yxr1fbwkfhpgd5zyqkd4mi5bp5h9bg17azs79xqprkrfx"
+   "commit": "fc54812f5f53889842e7e707727e50d9589443ca",
+   "sha256": "1jdpg6vq88kxg1wfhp9hwnvfadxazmznzscfhvr967fbgq46w6qj"
   },
   "stable": {
    "version": [
     1,
-    32,
+    33,
     0
    ],
    "deps": [
@@ -23699,8 +24063,8 @@
     "s",
     "yasnippet"
    ],
-   "commit": "d54e78edad91660caaabd19e4a6e416889ccfe31",
-   "sha256": "0f00mdnzx6xqwni86rgvaa6sfkwyh62xfbwz8qsar15j0j6vc2dj"
+   "commit": "b69ae7652e5efdda2e3dc650cd425b987ddd65ad",
+   "sha256": "1g9x67dvg5al6i9hnjcyi0zjsz71iv2jbinpzj7gcx77d0dn3cpk"
   }
  },
  {
@@ -24199,10 +24563,10 @@
  },
  {
   "ename": "emamux",
-  "commit": "6de1ed3dfccb9f7e7b8586e8334af472a4988840",
-  "sha256": "1pg0gzi8rn0yafssrsiqdyj5dbfy984srq1r4dpp8p3bi3n0fkfz",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "0y75dnaz65fwk8d9l6n1bkbj32rcmzaf58fhj686b1n55bsz3xz6",
   "fetcher": "github",
-  "repo": "syohex/emacs-emamux",
+  "repo": "emacsorphanage/emamux",
   "unstable": {
    "version": [
     20200315,
@@ -24222,10 +24586,10 @@
  },
  {
   "ename": "emamux-ruby-test",
-  "commit": "f11759710881bdf5a77bd309acb03a6699cc7fd6",
-  "sha256": "1l1hp2dggjlc287qkfyj21w9lri4agh91g5x707qqq8nicdlv3xm",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "1lk2fpqnmzh1gsbp9pkh36lgr76sf2mbf12577xs4scia7xr29bc",
   "fetcher": "github",
-  "repo": "syohex/emamux-ruby-test",
+  "repo": "emacsorphanage/emamux-ruby-test",
   "unstable": {
    "version": [
     20130812,
@@ -24689,6 +25053,38 @@
    "sha256": "0xdlqsrwdf0smi5z9rjj46nwrrfpl0gzanf0jmdg8zzn62l6ldck"
   }
  },
+ {
+  "ename": "emoji-github",
+  "commit": "64d18d6bb06d2d747b101845d3ed298787abaec0",
+  "sha256": "09b9kyx1zzi1i2m4isvnhb5526589vscv81xg35pgxwv6ilkky4z",
+  "fetcher": "github",
+  "repo": "jcs-elpa/emoji-github",
+  "unstable": {
+   "version": [
+    20200323,
+    233
+   ],
+   "deps": [
+    "emojify",
+    "request"
+   ],
+   "commit": "43f63c0dd64aae6c8054c2dad617bf810abdfadd",
+   "sha256": "0wcxsy3q8912kf87bn3mi2si010i5dd99yinf23nhb2nqvqgiw94"
+  },
+  "stable": {
+   "version": [
+    0,
+    2,
+    2
+   ],
+   "deps": [
+    "emojify",
+    "request"
+   ],
+   "commit": "5d1512fb30c65018a507ef549d92c668d8221da3",
+   "sha256": "00dj0kfllyhiklylj4cjcv64zjaxs6a4cc79f8pppmzvf1spivvz"
+  }
+ },
  {
   "ename": "emoji-recall",
   "commit": "8f03b34d3e8e5edf9888c71b6e4bd2e1a5aec016",
@@ -25082,8 +25478,8 @@
     "closql",
     "dash"
    ],
-   "commit": "edf8c009066360af61caedf67a2482eaa19481b0",
-   "sha256": "1ml5337wbw2zsf1vwv5svwvhd93jgl9sq79l1byiz32bnb0q5nhh"
+   "commit": "37f06fd2daca6a7afa163ceb0ccccd450af85e68",
+   "sha256": "18prjspaz4wlfrk2zzzzpxs4z8dkxxx68sbq2b4bdgg34fgnj02z"
   },
   "stable": {
    "version": [
@@ -25280,20 +25676,20 @@
   "repo": "leathekd/erc-hl-nicks",
   "unstable": {
    "version": [
-    20180415,
-    1946
+    20200317,
+    16
    ],
-   "commit": "756c4438a8245ccd3e389bf6c9850ee8453783ec",
-   "sha256": "0c82rxpl5v7bbxirf1ksg06xv5xcddh8nkrpj7i6nvfarwdfnk4f"
+   "commit": "a67fe361c8f2aa20fc235447fbb898f424b51439",
+   "sha256": "0k57scxa8rm859fqsm8srhps7rlq06jzazhjbwnadzrh8i5fyvra"
   },
   "stable": {
    "version": [
     1,
     3,
-    3
+    4
    ],
-   "commit": "756c4438a8245ccd3e389bf6c9850ee8453783ec",
-   "sha256": "0c82rxpl5v7bbxirf1ksg06xv5xcddh8nkrpj7i6nvfarwdfnk4f"
+   "commit": "a67fe361c8f2aa20fc235447fbb898f424b51439",
+   "sha256": "0k57scxa8rm859fqsm8srhps7rlq06jzazhjbwnadzrh8i5fyvra"
   }
  },
  {
@@ -25618,15 +26014,15 @@
   "repo": "ergoemacs/ergoemacs-mode",
   "unstable": {
    "version": [
-    20190527,
-    348
+    20200319,
+    1250
    ],
    "deps": [
     "cl-lib",
     "undo-tree"
    ],
-   "commit": "7d3656541a00cc04ba4cefa31c0d127adb5a260a",
-   "sha256": "1rw237xiw5nz736l5jdmlsa11l14qvzdac0wqymi80a0rfwqikga"
+   "commit": "4a6ba06d9c618e9380d059fa25ed677b45d134a7",
+   "sha256": "0wgdzxla6kz1zfc3vfd8wc2j40kq023z7b83m2k435hcqdffark8"
   },
   "stable": {
    "version": [
@@ -25673,18 +26069,18 @@
     20200313,
     1030
    ],
-   "commit": "bd554119dd80e0e0f71e2e948e69eaff5ff6a88f",
-   "sha256": "00qp7jp4zmdklilj8vjmrd1s4wy6kzcmcdv3klb89whiymc7jxiq"
+   "commit": "f805a35f696d965b297de3988a2340f86bfe88ba",
+   "sha256": "102yzbgmqyy5m74zhr8kaai17dyhg8k6w0ykxyvmb0q7ghwaq01s"
   },
   "stable": {
    "version": [
     23,
     0,
     -1,
-    1
+    2
    ],
-   "commit": "2b823b90b7dbd56aae3a3fbdcb182f9fd5127a59",
-   "sha256": "00dsbnii0w56jmbzzn43j18rprmc4d2ckd8ad0kzc6cb856mxs9s"
+   "commit": "a24425668beed38e04039c292361e09c4826683f",
+   "sha256": "1i91p2hsajcwjqv10ri6jj2a94g68mb6fmxqx47g50fbc5f0dqj5"
   }
  },
  {
@@ -25826,8 +26222,8 @@
   "repo": "rejeep/ert-runner.el",
   "unstable": {
    "version": [
-    20180831,
-    1145
+    20200321,
+    2158
    ],
    "deps": [
     "ansi",
@@ -25837,13 +26233,13 @@
     "s",
     "shut-up"
    ],
-   "commit": "90b8fdd5970ef76a4649be60003b37f82cdc1a65",
-   "sha256": "04nxmyzncacj2wmzd84vv9wkkr2dk9lcb10dvygqmg3p1gadnwzz"
+   "commit": "1829f05c46b0baaae160d900f89c8881f4fcdbcc",
+   "sha256": "08gygn9fjank5gpi4v6ynrkn0jbknxbwsn7md4p9ndygdbmnkf98"
   },
   "stable": {
    "version": [
     0,
-    7,
+    8,
     0
    ],
    "deps": [
@@ -25854,8 +26250,8 @@
     "s",
     "shut-up"
    ],
-   "commit": "00056c37817f15b1870ccedd13cedf102e3194dd",
-   "sha256": "0rdgdslspzb4s0n4a68hnwfm8vm8baasa8nzrdinf0nryn7rrhbf"
+   "commit": "1829f05c46b0baaae160d900f89c8881f4fcdbcc",
+   "sha256": "08gygn9fjank5gpi4v6ynrkn0jbknxbwsn7md4p9ndygdbmnkf98"
   }
  },
  {
@@ -26206,11 +26602,11 @@
   "repo": "zwild/eshell-prompt-extras",
   "unstable": {
    "version": [
-    20200310,
-    809
+    20200319,
+    322
    ],
-   "commit": "6a30813893e04ab8c0793757cdb2ff9873ab0c56",
-   "sha256": "0vk30sq0p3afpaw9phmfpglvhs01f97rhm3ygzwiv8h4smy9zgsj"
+   "commit": "1801b3aeccf1363f138fe01ee99d892d10fc2a07",
+   "sha256": "1dgfd9yf4ikn5whqpxyliyp21vs1h852wjfqy5lmxzhnzic1xsi1"
   },
   "stable": {
    "version": [
@@ -26422,11 +26818,11 @@
   "repo": "walseb/espy",
   "unstable": {
    "version": [
-    20180929,
-    1602
+    20200317,
+    2333
    ],
-   "commit": "b64a99185c96c20d4d4caa3daf1f5510b039bd6a",
-   "sha256": "1i8wc55rihah39i95w0rryp5scq8v3zyk4cayw5pz8g5bbl8w4zb"
+   "commit": "2c01be937a5e5bde62921684a0b27300705fb4e0",
+   "sha256": "1nnnr184y29g1svxqxlqyg5irzrf1xmay4p78jfv8v07sisl90kp"
   }
  },
  {
@@ -26474,14 +26870,14 @@
   "repo": "emacs-ess/ESS",
   "unstable": {
    "version": [
-    20200314,
-    1134
+    20200328,
+    1547
    ],
    "deps": [
     "julia-mode"
    ],
-   "commit": "a2fb8ff841b08c70b1c401724b92afc0c2b496c4",
-   "sha256": "14arrqjji44kw2mizz6rnsnjzbjiv4fca5632f8lwplgsr63j8nk"
+   "commit": "1c2387fdba509c1c9d072150f65ccc318a570870",
+   "sha256": "0llsjqrvabcvpd2nhixiklwmm2lisywif77iwfrsdc6lfxp8cdd0"
   },
   "stable": {
    "version": [
@@ -26616,14 +27012,14 @@
   "repo": "jschaf/esup",
   "unstable": {
    "version": [
-    20200130,
-    2034
+    20200318,
+    2256
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "4e5bf7d265c3b1484017fc0fd0ad50d2403c2bbe",
-   "sha256": "1jdsy5bqnmbai7kylidyfd0nla26apqvfl2f6vdvjs02hlr1w2s7"
+   "commit": "c9c95e245068d15d8e2732098af9a5d2bc8ec931",
+   "sha256": "0i4cwwvs5zs8g2ajrrkqgrpxzywsa255rc1g7a6bxzvg9hk77f4k"
   },
   "stable": {
    "version": [
@@ -26649,8 +27045,8 @@
     20171129,
     807
    ],
-   "commit": "5548ceba17deae0c3c6d0092672edc4de3c75ce3",
-   "sha256": "00vv8a75wdklygdyr4km9mc2ismxak69c45jmcny41xl44rp9x8m"
+   "commit": "193d199305e7abcb5ed795b9bc5434ded20ae60e",
+   "sha256": "1cbzdwfndz6pdmb3vzb6l2smxb2l47sncmkccya0nzlvvhz3p8c0"
   },
   "stable": {
    "version": [
@@ -26958,10 +27354,10 @@
  },
  {
   "ename": "evil-anzu",
-  "commit": "06b0609b56016d938b28d56d9eeb6305116b38af",
-  "sha256": "19cmc61l370mm4h2m6jw5pdcsvj4wcv9zpa8z7k1fjg57mwmmn70",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "08cc33wjq5853c0hqwn30342ylkfldy7xg7yd2ak0apjxnz4qr40",
   "fetcher": "github",
-  "repo": "syohex/emacs-evil-anzu",
+  "repo": "emacsorphanage/evil-anzu",
   "unstable": {
    "version": [
     20170124,
@@ -27133,16 +27529,16 @@
   "repo": "emacs-evil/evil-collection",
   "unstable": {
    "version": [
-    20200219,
-    1042
+    20200327,
+    722
    ],
    "deps": [
     "annalist",
     "cl-lib",
     "evil"
    ],
-   "commit": "a478a95a8a3665e40bdae3bab2a0519db6c1f29c",
-   "sha256": "15ii5lw6hs4yyl22yyzfwzagdma2sman4rm5gq4m9773g4ava515"
+   "commit": "2df9bedfa48bdc22e46bf4d43f6e2792d4cafbea",
+   "sha256": "17737k612gl5bhkkq8fdivk9rxbcypfl9hnm3mbp5v2wpr8chw3a"
   },
   "stable": {
    "version": [
@@ -27864,11 +28260,11 @@
   "repo": "redguardtoo/evil-nerd-commenter",
   "unstable": {
    "version": [
-    20200222,
-    901
+    20200324,
+    2310
    ],
-   "commit": "fa40dab8d2f010db17e1e62dfd245c1504d0542f",
-   "sha256": "0dn712k54qsxy82jqbqip77k5i3zv8m7afj2yi39zqx28iqvic0z"
+   "commit": "4387407615258d5e95f71bfb425cbe92dd813290",
+   "sha256": "0v31gbn423g20lqksvbc72z325lh0qjmgz8nhy8ygqli4b2msvzb"
   },
   "stable": {
    "version": [
@@ -28185,26 +28581,26 @@
   "repo": "porras/evil-ruby-text-objects",
   "unstable": {
    "version": [
-    20190821,
-    1527
+    20200323,
+    1552
    ],
    "deps": [
     "evil"
    ],
-   "commit": "0ddc4c256a0c778fa65d75b707f20df874e5b5fa",
-   "sha256": "1ppwcyfy5dssswfzd16i1rx14si5r80mdvrnfwaf9jr3c2ws23lg"
+   "commit": "32983d91be83ed903b6ef9655e00f69beed2572c",
+   "sha256": "0qha7xxqxh7c6n6r26r49y85inxcbr4nvxlv2zzj0qkifw7f9ana"
   },
   "stable": {
    "version": [
     0,
-    1,
+    2,
     0
    ],
    "deps": [
     "evil"
    ],
-   "commit": "93cfc5ae3da0ffb19319e301734c51ecb43506b5",
-   "sha256": "0jizvchrisrdc7bl6xfc59axyjz1dmr6hi36jyv1bdwyayj2ifqi"
+   "commit": "e69abb6aad7687222cb47a8a64dc4dd66ef96a9e",
+   "sha256": "0m1ilv4w4rlg8005cqp5l5dwdhqnrf1mb44qmvd8qwkl2rvslsbs"
   }
  },
  {
@@ -28584,10 +28980,10 @@
  },
  {
   "ename": "evil-textobj-line",
-  "commit": "24bf766525ffdaded519ac9f78ae89d8ab5108ef",
-  "sha256": "158w524qzj0f03ihid2fisxyf1g7vwpv3ckfkzi7c2l549jnsdsa",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "1jwhg56nhf5iv7zbfdzi6ygikc49bnrqh1r5kd98n5wxz9vz2h75",
   "fetcher": "github",
-  "repo": "syohex/evil-textobj-line",
+  "repo": "emacsorphanage/evil-textobj-line",
   "unstable": {
    "version": [
     20150729,
@@ -29512,11 +29908,11 @@
   "repo": "thblt/eziam-theme-emacs",
   "unstable": {
    "version": [
-    20200124,
-    1045
+    20200327,
+    1810
    ],
-   "commit": "9ae0fdb2ad751044b3bd60aee08523d460db2bd6",
-   "sha256": "0gvf7g5s7wrchwbh0bnr0ryx9zaw56mx09bd4f32793lpv9sxyi6"
+   "commit": "7a585de01b6fee081eaa167b09d7e12d02cf4149",
+   "sha256": "11v8rbaiaihpky1m7azbflz77mwg76nbg8hsgybs86wyjk5797dv"
   },
   "stable": {
    "version": [
@@ -29823,6 +30219,29 @@
    "sha256": "0vcr1gnqawvc1yclqs23jvxm6bqix8kpflf1c7znb0wzxmz9kx7y"
   }
  },
+ {
+  "ename": "fantom-theme",
+  "commit": "e5cb6a9f6a657b72a00a39c118d90416ae2f343c",
+  "sha256": "18p82f82hr1sx8w9lmjxr3hvvy4ddxvyd245v32vjay5zc730y33",
+  "fetcher": "github",
+  "repo": "adsva/fantom-emacs-theme",
+  "unstable": {
+   "version": [
+    20200328,
+    604
+   ],
+   "commit": "2c1c7fd53086c2ff86ee0961642c3b58e2343c08",
+   "sha256": "1clvpjsf241fdkk3915zjqb4wivsjsvc9phf633pzbvi61qwhaap"
+  },
+  "stable": {
+   "version": [
+    1,
+    0
+   ],
+   "commit": "70cef2886ca90c93bcafc869bcc77bad1e390c33",
+   "sha256": "1q15wx53zq6b9f567anrfmfpj04f3r6wz28w4237f9lg62yqhm9x"
+  }
+ },
  {
   "ename": "farmhouse-theme",
   "commit": "3b0d427db8ab66d2fe323366b0837595b3b59afa",
@@ -30054,6 +30473,36 @@
    "sha256": "1fas0fpvym2lyzybwm44gly9jz6a2fpp72yxnwfbqqjkfgk9910y"
   }
  },
+ {
+  "ename": "feather",
+  "commit": "ffb7d037679110473a8c3f9e98f737ecaba37c40",
+  "sha256": "1k3sxwpibk5sdim4pzfi83pzsm4vnq0xl006dy76pv363r9mvs21",
+  "fetcher": "github",
+  "repo": "conao3/feather.el",
+  "unstable": {
+   "version": [
+    20200321,
+    1237
+   ],
+   "deps": [
+    "async",
+    "async-await",
+    "page-break-lines",
+    "ppp"
+   ],
+   "commit": "529b7ec69f1694d7dc8aacb5066cf4ddcf24cc58",
+   "sha256": "0flph6yv5fj5ladksjqfpj9j8p2jcc102kbc833bvx1cnmjx7qk4"
+  },
+  "stable": {
+   "version": [
+    0,
+    0,
+    1
+   ],
+   "commit": "4cb69055cfc42841bad1de072f69dd6923899766",
+   "sha256": "1fq5ysxwiaah56rizkc47vjqi8906af3ga1n1frvrvap8m9vdz4m"
+  }
+ },
  {
   "ename": "feature-mode",
   "commit": "0a70991695f9ff305f12cfa45e0a597f4a782ba3",
@@ -30502,6 +30951,21 @@
    "sha256": "0lwgbd9zwdv7qs39c3fp4hrc17d9wrwwjgba7a14zwrhb27m7j07"
   }
  },
+ {
+  "ename": "fira-code-mode",
+  "commit": "0dc34b2d3cfd5e48df0fbe2086b8b4be1358dea4",
+  "sha256": "09i3xyk1xj7j895xmjwmxl1gaw73j9y22c5mgnavq0sm3fbpk4w0",
+  "fetcher": "github",
+  "repo": "jming422/fira-code-mode",
+  "unstable": {
+   "version": [
+    20200316,
+    1708
+   ],
+   "commit": "64c4e655ea6ef29c7e720a5bf9281e865f2e3fa7",
+   "sha256": "0c11lfwdibx35wwvpq3vl4img4rz2slslqhlqaqbab212ii9jsmy"
+  }
+ },
  {
   "ename": "firecode-theme",
   "commit": "641d1959bd31598fcdacd39a3d1bb077dcccfa5c",
@@ -30606,11 +31070,11 @@
   "repo": "IBM/firrtl-mode",
   "unstable": {
    "version": [
-    20190224,
-    344
+    20200329,
+    2002
    ],
-   "commit": "e55c555809037b7aaf2367ad2255f0a27addd23a",
-   "sha256": "1nsihyx9znblc4kxyk06r7alhd4wh67312zwp9discgyf4ksm572"
+   "commit": "fa40141411a876ce7a1a9d6d3fe47134bc1fa954",
+   "sha256": "1pj7b8ppkbjp8q5dzw5v086v8lp1gv1il6qc65l4nlm8p5iicvzq"
   }
  },
  {
@@ -30668,11 +31132,11 @@
   "repo": "marcowahl/fit-text-scale",
   "unstable": {
    "version": [
-    20200218,
-    1057
+    20200315,
+    2120
    ],
-   "commit": "cc570af6b8bda346028d070482f4cb30d438b867",
-   "sha256": "143mamvmgn4qyax3faknz77hgmkik0lbc48506kdvcg5mgcbzgn8"
+   "commit": "387acab18f9f4064c051771cf666b8550718dc27",
+   "sha256": "0mrl112vjsl6ddjv0j2pg97s6zk8c2qb92wqsq775ahr1cbhvbw7"
   },
   "stable": {
    "version": [
@@ -31302,8 +31766,8 @@
   "repo": "flycheck/flycheck",
   "unstable": {
    "version": [
-    20200224,
-    2057
+    20200329,
+    2344
    ],
    "deps": [
     "dash",
@@ -31311,8 +31775,8 @@
     "pkg-info",
     "seq"
    ],
-   "commit": "08345d38e2872a3dcb14228edff796195809266f",
-   "sha256": "183s05gm7zkgwphrwq0bq9fv2sldhrxjik8skz7rvbz448syh0c5"
+   "commit": "1751a4e9f8f6f20706a1620429422f101eabcd38",
+   "sha256": "10w9fgcwyni5iid7sfzrza155wrh481gdylwrwa7v640a9jmbyls"
   },
   "stable": {
    "version": [
@@ -31521,14 +31985,14 @@
   "repo": "alexmurray/flycheck-clang-analyzer",
   "unstable": {
    "version": [
-    20190724,
-    542
+    20200320,
+    428
    ],
    "deps": [
     "flycheck"
    ],
-   "commit": "223faa244502150d08a34898858a0b4806c92d4c",
-   "sha256": "1di3d9y0p8g8mndwkzkiiq2svsgk05rnzf7bzfnhig2fchg7ipap"
+   "commit": "7e1bf9853a34828c7f81d824dc4785f1620f2006",
+   "sha256": "1iw3vjdnskbk8zlbyvxiwlisj72d7q8nz8n55ffwz3v44ymzhya6"
   }
  },
  {
@@ -32883,6 +33347,25 @@
    "sha256": "0gys38rlx9lx35bia6nj7kfhz1v5xfrirgf8adwk7b2hfjazrsib"
   }
  },
+ {
+  "ename": "flycheck-pest",
+  "commit": "f0c1b89d79456ecaa22b95f3c292799f5d1aa133",
+  "sha256": "06nvryshinagp26idjcb1r98k39x4k82cjj735l9kiwpiag53ash",
+  "fetcher": "github",
+  "repo": "ksqsf/pest-mode",
+  "unstable": {
+   "version": [
+    20200317,
+    1503
+   ],
+   "deps": [
+    "flycheck",
+    "pest-mode"
+   ],
+   "commit": "4ae88a9c81d499bbe99978ff0216b645fed70023",
+   "sha256": "1zc7dmgp3s9q33wkvw6i7zzlcaa65ixx3hxb78m62lk2a7fzb3ih"
+  }
+ },
  {
   "ename": "flycheck-phpstan",
   "commit": "5a2b6cc39957e6d7185bd2bdfa3755e5b1f474a6",
@@ -33158,27 +33641,27 @@
   "repo": "purcell/flycheck-relint",
   "unstable": {
    "version": [
-    20200304,
-    152
+    20200320,
+    2223
    ],
    "deps": [
     "flycheck",
     "relint"
    ],
-   "commit": "f498c130408411906bda81c1023a88b1498dcf18",
-   "sha256": "18sgnj6y9vsj9np58d8cr72jfady0kwdg6rdx667098lbznaw0da"
+   "commit": "296cf8e2f9e85ab0c1c591816b50ecd7c766060c",
+   "sha256": "148xh1alng4s3ydnhwjjrcmq1390pn6ymjszaamrzljwfqzh85ky"
   },
   "stable": {
    "version": [
     0,
-    4
+    5
    ],
    "deps": [
     "flycheck",
     "relint"
    ],
-   "commit": "39ec5deabdd23afaf6e1e34e13edd14d910899d0",
-   "sha256": "0m46n91hmh6gml9ravd0d1i79jnl9vbr733na3w0kg87mixnjdy8"
+   "commit": "296cf8e2f9e85ab0c1c591816b50ecd7c766060c",
+   "sha256": "148xh1alng4s3ydnhwjjrcmq1390pn6ymjszaamrzljwfqzh85ky"
   }
  },
  {
@@ -34230,6 +34713,24 @@
    "sha256": "11r982h5fhjkmm9ld8wfdip0ghinw523nm1w4fmy830g0bbkgkrq"
   }
  },
+ {
+  "ename": "flymake-pest",
+  "commit": "747e1b060e3aa78b91d61abcf2c9a4dc0d4aaf7e",
+  "sha256": "17bsvrd1g7d5b0z5psx0bvg2ym0bi7dh1vvl8a45dnzpig141f36",
+  "fetcher": "github",
+  "repo": "ksqsf/pest-mode",
+  "unstable": {
+   "version": [
+    20200317,
+    1503
+   ],
+   "deps": [
+    "pest-mode"
+   ],
+   "commit": "4ae88a9c81d499bbe99978ff0216b645fed70023",
+   "sha256": "1zc7dmgp3s9q33wkvw6i7zzlcaa65ixx3hxb78m62lk2a7fzb3ih"
+  }
+ },
  {
   "ename": "flymake-php",
   "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487",
@@ -34476,11 +34977,11 @@
   "repo": "federicotdn/flymake-shellcheck",
   "unstable": {
    "version": [
-    20181214,
-    24
+    20200329,
+    2005
    ],
-   "commit": "e22385a9e752e58b18d4c6371e6ff1602bb764f2",
-   "sha256": "0gfk2wsi72n4zkgjpqasdn83zrxlzm735q6c3gs1sfqd7h1jqnwq"
+   "commit": "bb413006afc23105a0f84df6fb82504a06483a55",
+   "sha256": "09cqn0255pxim34v5zfypbzr4clfd2ajlsyxpc9h64wg6v9876y5"
   }
  },
  {
@@ -34993,6 +35494,21 @@
    "sha256": "0ghj0nw2zlrppsgl6x2nda9fj4w04rz6647v9823wxhfirrgnd5z"
   }
  },
+ {
+  "ename": "font-lock-cl",
+  "commit": "b7a2635ceb34f49f84f35e11c14521592a9d330f",
+  "sha256": "1d8r3d558ipk324hpgfm4fv4kxk6mhvkka3aqd4kcv8zv0k79iq3",
+  "fetcher": "github",
+  "repo": "font-lock-cl/font-lock-cl",
+  "unstable": {
+   "version": [
+    20200321,
+    533
+   ],
+   "commit": "1a54066611da213626ab69ea426ba3c63ece3438",
+   "sha256": "1c7n099b8dkrcrvxsva7da1m1z01p0acbyj271lix9w331h9gbf6"
+  }
+ },
  {
   "ename": "font-lock-profiler",
   "commit": "b372892a29376bc3f0101ea5865efead41e1df26",
@@ -35057,10 +35573,10 @@
  },
  {
   "ename": "fontawesome",
-  "commit": "93b92f10802ceffc353db3d220dccfd47ea7fa41",
-  "sha256": "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "1xqq0ndq6hndpyar11qlylkdgqpq5kxhbayyjbad3vbm6r5i9nri",
   "fetcher": "github",
-  "repo": "syohex/emacs-fontawesome",
+  "repo": "emacsorphanage/fontawesome",
   "unstable": {
    "version": [
     20170305,
@@ -35128,11 +35644,11 @@
   "repo": "k-talo/foreign-regexp.el",
   "unstable": {
    "version": [
-    20180224,
-    1121
+    20200325,
+    50
    ],
-   "commit": "2ec5c44f27c2396ee487aa0ed77ae47d143fa5aa",
-   "sha256": "0zww0q8x99sfwzf05pk7blsi3v8xiw4xgmlwnv1qlf2qxjkz1xhb"
+   "commit": "e2dd47f2160cadc194eb156e7c76c3c869e6706e",
+   "sha256": "0bqhabpv992ss8rw3fgym6q5kq1d6b9ycs0a5ndgjpcz19rmlr66"
   }
  },
  {
@@ -35686,6 +36202,30 @@
    "sha256": "0ggkflx4lhyxqr7sgf1f3z0i3glmqyvl4bn16clh9ybl14q22rli"
   }
  },
+ {
+  "ename": "freeze-it",
+  "commit": "0b50aa7ce66a827ddd975eddf8e95ba655e05239",
+  "sha256": "03wnmp6m9ss3vvzibajjdvzbgh2ydvq95xk9k2rhrgjj9pdz5ml8",
+  "fetcher": "github",
+  "repo": "rnkn/freeze-it",
+  "unstable": {
+   "version": [
+    20200322,
+    700
+   ],
+   "commit": "0e2ddd99dc1211800d55e874c1bd078f879e0d9c",
+   "sha256": "08jdlwn8da8cgkpwpx8834rhx8is5iigq0cv3abbydmz5lrd72nl"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    2
+   ],
+   "commit": "cf53f31e4f266b7f0b12e091de074e763c7d565b",
+   "sha256": "0drznbwci4swfxmmdvkm14qmpb9y9pykyflhh69l5fdxiigpdlb8"
+  }
+ },
  {
   "ename": "fringe-current-line",
   "commit": "eaaa6f7f2f753a7c8489415ae406c4169eda9fa8",
@@ -35851,8 +36391,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "426d8f09b2d62d29a5b89a53492890ce2a49158a",
-   "sha256": "04nwx43xh68nqh84fbrcvnyh57yricr7l7k7shyqdv7922km947a"
+   "commit": "2d85dafa9872fa34b463f6473e61a1ed71c17788",
+   "sha256": "0zwrlvp2i0n4imba84cc0hsivyaxv4sy98bsqfwpy65xm94h0d96"
   },
   "stable": {
    "version": [
@@ -36290,17 +36830,26 @@
  },
  {
   "ename": "gdscript-mode",
-  "commit": "52f99eafb2e80a7fa13a98add98b03a147f35e8b",
-  "sha256": "0v4ab5xxpq1kya2is5qq61fmfgxgvbigyz7wp907z3mc00kg2818",
+  "commit": "b4414989beecd113ec405116402a5232ac32cb85",
+  "sha256": "1clakvkjifqhi847p6zrxxfkr5s3hv33qsh7r96w04pihyd38q9l",
   "fetcher": "github",
-  "repo": "AdamBark/gdscript-mode",
+  "repo": "GDQuest/emacs-gdscript-mode",
   "unstable": {
    "version": [
-    20180118,
-    456
+    20200328,
+    1820
    ],
-   "commit": "31af5283eaec207bc864022a28e2824132471eaf",
-   "sha256": "0f24zsklkhhvj6qdyid2j1qcyhjnncxjma93zhr0klvn5j1z3aar"
+   "commit": "56a864ecff99ae314b838b755cf26af66f4f9323",
+   "sha256": "0mlvvagdr2bj13ibms1vq8p9zp10ag4qhyfklkj93lg6j744qav4"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    2
+   ],
+   "commit": "361439f28bd10649c9f58f1d3290b4ee63ee4f54",
+   "sha256": "1ymblv04as076yfi3inmc3s66j0nqslqvfx34s3da6s8g8zi0ash"
   }
  },
  {
@@ -36388,11 +36937,11 @@
   "repo": "jaor/geiser",
   "unstable": {
    "version": [
-    20200225,
-    1423
+    20200327,
+    2213
    ],
-   "commit": "5fcd56b2d560c04a173ae7d8b21540471322afa4",
-   "sha256": "00zvll0glzx9lp4s9l1ix1grdqa9cj24kszil1akaa8rqniiafn1"
+   "commit": "9b45785173dc61a2897b17edf27df9407d1d94ce",
+   "sha256": "0r21fs262jzzpilynnlnqc9bd42fbq7hn522dfnx93jjmni35kjc"
   },
   "stable": {
    "version": [
@@ -36412,14 +36961,14 @@
   "repo": "noctuid/general.el",
   "unstable": {
    "version": [
-    20200226,
-    101
+    20200320,
+    2340
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "7fdb13e9f90600968d15704851df9c45b5df8ca5",
-   "sha256": "1l8766p9svzjhwglah3ffl93rij106d2gz7sdwx8r30s6p01q2mf"
+   "commit": "14ad4c888b34eb8ebd946d26917aaf2dd4fcce29",
+   "sha256": "09hp8aavimlhasnxl5z74pk6afvjpcpd6fpv7j2amdmyhbflxv9h"
   }
  },
  {
@@ -36458,6 +37007,21 @@
    "sha256": "08cw1fa25kbhbq2sp1cpn90bz38i9hjfdj93xf6wvki55b52s0nn"
   }
  },
+ {
+  "ename": "geoip",
+  "commit": "40336cd135414e1c6f478705e5873eaa396554b0",
+  "sha256": "0j70gl9423ghrjp4k250kq8xpngxa8pzlpivpksyzzj32s7dy1nw",
+  "fetcher": "github",
+  "repo": "xuchunyang/geoip.el",
+  "unstable": {
+   "version": [
+    20200310,
+    911
+   ],
+   "commit": "25eb1278788b942c38405c233d3614a1de92ddea",
+   "sha256": "0nbgbqxmpq6c487yx4igph58zmaslqn7z92x9b1xymw58fnlyrm6"
+  }
+ },
  {
   "ename": "geolocation",
   "commit": "fddc094aa08365c0e04f0d8f2f19a47908964f50",
@@ -36883,11 +37447,11 @@
   "repo": "Ambrevar/emacs-gif-screencast",
   "unstable": {
    "version": [
-    20200207,
-    1358
+    20200327,
+    1332
    ],
-   "commit": "dce0f3bb71ab8761a689c7382864a20198874b8e",
-   "sha256": "0yf665w06ijjxvzfbg8naa95f5ga3z2kcaq9baq7md222r52xd7q"
+   "commit": "e39786458fb30e2e9683094c75c6c2cef537d9c4",
+   "sha256": "135mkyi8kqsxs0a3qa20splvx4xhl8k91s48yy6gwlz6m81vwvb5"
   },
   "stable": {
    "version": [
@@ -37050,11 +37614,11 @@
   "repo": "ryuslash/git-auto-commit-mode",
   "unstable": {
    "version": [
-    20200217,
-    2348
+    20200322,
+    2007
    ],
-   "commit": "ae69e61233417a7f14efba35e42bd842b707aeb0",
-   "sha256": "0nrx3wnn2jii4yiv9c1cbbll4bgll5j73ypp1fi82kk99n0d8372"
+   "commit": "dd0c2441de0f5ff8c69c8260d9450d0b607e3e55",
+   "sha256": "0r7jry1sbqsp7c1vxf7fchc7ivmnccfrflg52379v3gmpvd8s0kn"
   },
   "stable": {
    "version": [
@@ -37179,8 +37743,8 @@
     "transient",
     "with-editor"
    ],
-   "commit": "e293416cee73dc47a6dc7f0bc2f4624d69625634",
-   "sha256": "0kshzx82ics43x6z8i7wcl5866li8ai05mzkri14l6jrcarz9fjz"
+   "commit": "236c44518d30c43c7035be32f02ba615d148b5ef",
+   "sha256": "0fbcx8qfymvd1i96a21gzsd4882qz6xlgccvba0dam8h9aninqf6"
   },
   "stable": {
    "version": [
@@ -37252,17 +37816,17 @@
  },
  {
   "ename": "git-gutter",
-  "commit": "81f0f525680fea98e804f39dbde1dada887e8821",
-  "sha256": "19s344i95piixlzq4mjgmgjw7cy8af02z6hg89jjjdbxrfl4i2fg",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "1vcrjxg9pckixsbfmvpf0624s990nx33qn0p6xhnag4jn81ih03x",
   "fetcher": "github",
-  "repo": "syohex/emacs-git-gutter",
+  "repo": "emacsorphanage/git-gutter",
   "unstable": {
    "version": [
-    20200315,
-    752
+    20200326,
+    1814
    ],
-   "commit": "219f845ccb13f4da44293f12649e6b51178fea3e",
-   "sha256": "0ap4j00anmkbjpmf55k8rv4s0yfnylmc6sh3rdx495zb6nfj9ky9"
+   "commit": "2c3242116a42dbbe30fc0844d1ec3c41074cdaba",
+   "sha256": "18gbns5mjwr5kirgpzjp4iqmj130qa5m1hs4phx1057qdq11ihrr"
   },
   "stable": {
    "version": [
@@ -37308,22 +37872,22 @@
  },
  {
   "ename": "git-gutter-fringe",
-  "commit": "81f0f525680fea98e804f39dbde1dada887e8821",
-  "sha256": "10k07dzmkxsxzwc70vpv05rxjyps9494y6k7yhlv8d46x7xjyp0z",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "1i8vvh2si3fdgq1m0yyzs9qbw5jzykp4qgl3ksm4xrimlw1ln4vc",
   "fetcher": "github",
-  "repo": "syohex/emacs-git-gutter-fringe",
+  "repo": "emacsorphanage/git-gutter-fringe",
   "unstable": {
    "version": [
-    20170113,
-    533
+    20200323,
+    2249
    ],
    "deps": [
     "cl-lib",
     "fringe-helper",
     "git-gutter"
    ],
-   "commit": "16226caab44174301f1659f7bf8cc67a76153445",
-   "sha256": "1y77gjl0yznamdj0f55d418zb75k22izisjg7ikvrfsl2yfqf3pm"
+   "commit": "da19a474137876b29b5658ee7e9ae366f2b65c1d",
+   "sha256": "015qaaap2cvy4cxl31r27z48zbgd9vyj6rac9yv3caw5zsvzlkiv"
   },
   "stable": {
    "version": [
@@ -37469,20 +38033,20 @@
  },
  {
   "ename": "git-messenger",
-  "commit": "e791293133f30e5d96c4b29e972f9016c06c476d",
-  "sha256": "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "0nmxx7543x7cl40m69lmyb5fv68gzdwbr8dq18qbi5kapvhg5b8y",
   "fetcher": "github",
-  "repo": "syohex/emacs-git-messenger",
+  "repo": "emacsorphanage/git-messenger",
   "unstable": {
    "version": [
-    20200315,
-    1050
+    20200321,
+    2337
    ],
    "deps": [
     "popup"
    ],
-   "commit": "321fcdaca8bc63a1a6d54ab3532891dbd6822e18",
-   "sha256": "1xcn7c4ck21p5s149rjp879l05qqhxhc8wj4s4a1b1x1a5scqni2"
+   "commit": "2d64e62e33be9f881ebb019afc183caac9c62eda",
+   "sha256": "1w23qjc740bxj95gdzjcy3qldfmx4y19dhcrzh83l9wfz4y566c7"
   },
   "stable": {
    "version": [
@@ -38465,11 +39029,11 @@
   "repo": "emacsorphanage/gnuplot",
   "unstable": {
    "version": [
-    20200310,
-    536
+    20200322,
+    53
    ],
-   "commit": "a080f79b6f7a6ca94d11cda0d341acfc6e76d0c5",
-   "sha256": "111n89p74iymxrla3mk387xffnqmkb11pixjfgiv61l9b35hx94g"
+   "commit": "f0001c30010b2899e36d7d89046322467e923088",
+   "sha256": "1qnlcfzaihwc6kxdr1h2mrhccnhlwsdqwmcygxi2s01q2ifq1nc1"
   },
   "stable": {
    "version": [
@@ -38667,10 +39231,10 @@
  },
  {
   "ename": "go-add-tags",
-  "commit": "55d3b893bd68d3d2d86ecdbb4ed442edd256516a",
-  "sha256": "0nvas44rsvqzk2ay5bhzkbrnzql13vnxq9pk4lp4mvp86dda9qim",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "0syra7h9wixiq3g4ydamvzw2vc0852zcx5ij0rhw103hrvhrzcjd",
   "fetcher": "github",
-  "repo": "syohex/emacs-go-add-tags",
+  "repo": "emacsorphanage/go-add-tags",
   "unstable": {
    "version": [
     20161123,
@@ -38767,10 +39331,10 @@
  },
  {
   "ename": "go-direx",
-  "commit": "032c0c3cd04f36f1bc66bb7d9d789d354c620a09",
-  "sha256": "0dq5d7fsld4hww8fl68c18qp6fl3781dqqwd98cg68bihw2wwni7",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "0x9yrbbcwsc5kf88d1j75g02yndavgb4g4wwhy9ml58a6d6kq5y3",
   "fetcher": "github",
-  "repo": "syohex/emacs-go-direx",
+  "repo": "emacsorphanage/go-direx",
   "unstable": {
    "version": [
     20150316,
@@ -38828,10 +39392,10 @@
  },
  {
   "ename": "go-eldoc",
-  "commit": "6ce1190db06cc214746215dd27648eded5fe5140",
-  "sha256": "1k115dirfqxdnb6hdzlw41xdy2dxp38g3vq5wlvslqggha7gzhkk",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "1x8qwmn8b2wc79dqqx89c3l1m9sj08hgdwh5lwrlp1l80vhfp3sr",
   "fetcher": "github",
-  "repo": "syohex/emacs-go-eldoc",
+  "repo": "emacsorphanage/go-eldoc",
   "unstable": {
    "version": [
     20170305,
@@ -38996,10 +39560,10 @@
  },
  {
   "ename": "go-impl",
-  "commit": "aa1a0845cc1a6970018b397d13394aaa8147e5d0",
-  "sha256": "09frwpwc080rfpwkb63yv47dyj741lrpyrp65sq2bn4sf03xw0cx",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "1vi986ymza88cpjlxjz88na1w9dq4dr9d82vdbpav762vz828h9i",
   "fetcher": "github",
-  "repo": "syohex/emacs-go-impl",
+  "repo": "emacsorphanage/go-impl",
   "unstable": {
    "version": [
     20170125,
@@ -39280,17 +39844,26 @@
  },
  {
   "ename": "god-mode",
-  "commit": "2dff8dc08583048f9b7b4cb6d8f05a18dd4e8b42",
-  "sha256": "01xx2byjh6vlckaxamm2x2qzicd9qc8h6amyjg0bxz3932a4llaa",
+  "commit": "c4f8b0a0766bcff6b716b9e35da25c00b8a91abd",
+  "sha256": "0l8hdn227axan7ryx6z4fbk9nqsb50bmhwqxgy3g8g19vqhflhfr",
   "fetcher": "github",
-  "repo": "chrisdone/god-mode",
+  "repo": "emacsorphanage/god-mode",
   "unstable": {
    "version": [
-    20180117,
-    1134
+    20200329,
+    209
    ],
-   "commit": "344167ed9b4c212273dd056e7481cf1373b461d0",
-   "sha256": "0y7phh7amrdphv9dkf0304z2knyas745ir59ybngh1a55dfc2mf4"
+   "commit": "b82ce18ae4db2078c03d92946e21808c1f325f15",
+   "sha256": "1a490s5s8884rhb35gw4dxdzk2djvdiw4zsp9866sfrwh7xcama4"
+  },
+  "stable": {
+   "version": [
+    2,
+    16,
+    0
+   ],
+   "commit": "b82ce18ae4db2078c03d92946e21808c1f325f15",
+   "sha256": "1a490s5s8884rhb35gw4dxdzk2djvdiw4zsp9866sfrwh7xcama4"
   }
  },
  {
@@ -39408,10 +39981,10 @@
  },
  {
   "ename": "gom-mode",
-  "commit": "0a1e5f505e048b36c12de36b23b779beeaefc45f",
-  "sha256": "07zr38gzqb3ds9mpf94c1vhl1rqd0cjh4g4j2bz86q16c0rnmp7m",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "0qwqvkdvxmwnijj60jvqzwvikw1avrg6i66cl74qbqqcqkhazbpz",
   "fetcher": "github",
-  "repo": "syohex/emacs-gom-mode",
+  "repo": "emacsorphanage/gom-mode",
   "unstable": {
    "version": [
     20131008,
@@ -39421,6 +39994,24 @@
    "sha256": "1anjzlg53kjdqfjcdahbxy8zk9hdha075c1f9nzrnnbbqvmirbbb"
   }
  },
+ {
+  "ename": "gomacro-mode",
+  "commit": "ce33236843b8eb266769f588e8d8341b056ccf2c",
+  "sha256": "0gfx9z8cb3lakr1c6irjmcb7fv3val349vxibwlxjbmax689r5v5",
+  "fetcher": "github",
+  "repo": "storvik/gomacro-mode",
+  "unstable": {
+   "version": [
+    20200326,
+    1103
+   ],
+   "deps": [
+    "go-mode"
+   ],
+   "commit": "3112e56d2d5e645a3e0fd877f3e810dbccbf989f",
+   "sha256": "1f3y46q7djr1riz7x26gc7a1gf9p8sfdrnlqyiwzmi9vkk6h8wdz"
+  }
+ },
  {
   "ename": "google",
   "commit": "45237d37da807559498bb958184e05109f880070",
@@ -39810,8 +40401,8 @@
     "magit-popup",
     "s"
    ],
-   "commit": "41e33d1f83b19662fc1a894f362c00f25c53e797",
-   "sha256": "1mkdxa51d4nhbfknchg0p9sx2pa0n7fdh88xv5rq282myh2zaxm8"
+   "commit": "a01612b9850519603bfef116bd7bddd9c8e3b975",
+   "sha256": "0kbnhm6m7sf1j63yykrn4p7ykkjvvair3x95wi4b59icc6ydvwv7"
   },
   "stable": {
    "version": [
@@ -40046,8 +40637,8 @@
     "s",
     "websocket"
    ],
-   "commit": "ffff850b77ebbab827538f6ebee872b2638586bc",
-   "sha256": "1kxcnivlbv7dl09y09j72368sycqs96hk5nf7vsnqlfrrbc0337a"
+   "commit": "709bf3124b6e130efcede8b38fc2fed38699e19b",
+   "sha256": "1lz74qqzznv5c6pnsnnp0x0k16q663pkqakvwpg69lavcg68ysxh"
   },
   "stable": {
    "version": [
@@ -40742,14 +41333,14 @@
   "repo": "tmalsburg/guess-language.el",
   "unstable": {
    "version": [
-    20200309,
-    707
+    20200326,
+    1725
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "a0bacb4e3659db5808056e6235abc9f00570cecd",
-   "sha256": "13hqqfjwd69ycmn85rzjpr9qdjv6jvnx7dl555c934xwdlnw9c2d"
+   "commit": "f4ce91eba3c479d08fedf0a3ced6c1265a7838ca",
+   "sha256": "0z7agqi5sgjjidhmnrv7615737xk7p1s6pdhr6swjcr117dq44fm"
   }
  },
  {
@@ -41724,11 +42315,11 @@
   "repo": "purcell/emacs-hcl-mode",
   "unstable": {
    "version": [
-    20200225,
-    2130
+    20200315,
+    2129
    ],
-   "commit": "6599520a350e01354300a962463ecbf5564db622",
-   "sha256": "18vs2cwa1pyly2kh2lapm10n8akam5fvsx8rvgp41lcwrdxs2323"
+   "commit": "c3d1158ad1a64f06aa8986ab1cdea6b7fbdd4bf7",
+   "sha256": "0qza5pgpzcabik3592dk25glsv9zcg84pn1jzm43f9b1j9w5iv4i"
   },
   "stable": {
    "version": [
@@ -41786,16 +42377,16 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20200314,
-    1003
+    20200325,
+    757
    ],
    "deps": [
     "async",
     "helm-core",
     "popup"
    ],
-   "commit": "b38c9d1b098310262f331e191a9baaaba789fc25",
-   "sha256": "1rnmdg65r54g2r96j1pq6sz9akjgrpnl5q3la2rrn9pr22mjv0q7"
+   "commit": "0181b7ef468def6ef5547c7241b5c4c854816166",
+   "sha256": "09yvc6jpcb93fwa5blgzaqpk3f3v5h6m2hxajih1y6fxrdaxgnhq"
   },
   "stable": {
    "version": [
@@ -41833,10 +42424,10 @@
  },
  {
   "ename": "helm-ack",
-  "commit": "258d447778525c26c65a5819ba1edc00e2bb65e5",
-  "sha256": "1a8sc5gd2g57dl9g18wyydfmihy74yniwhjr27h7vxylnf2g3pni",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "124w7grwindyv86xfshfm70h0xfq29ns067pchk8dcbjbgh9yl7b",
   "fetcher": "github",
-  "repo": "syohex/emacs-helm-ack",
+  "repo": "emacsorphanage/helm-ack",
   "unstable": {
    "version": [
     20141030,
@@ -41903,31 +42494,31 @@
  },
  {
   "ename": "helm-ag",
-  "commit": "81f0f525680fea98e804f39dbde1dada887e8821",
-  "sha256": "050qh5xqh8lwkgmz3jxm8gql5nd7bq8sp9q6mzm2z7367qy4qqyf",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "0jzfycbaz88r6scsiw74prcnbvilsaphljdys6i5k9g5rhn5sxh5",
   "fetcher": "github",
-  "repo": "syohex/emacs-helm-ag",
+  "repo": "emacsorphanage/helm-ag",
   "unstable": {
    "version": [
-    20200315,
-    1231
+    20200328,
+    533
    ],
    "deps": [
     "helm"
    ],
-   "commit": "e24fb378c8d61e7c2bf12d99a41712126f9878cf",
-   "sha256": "1k5ldnjpcgskn71jrg3mcph8z1rdrdyysl5vbi3bpfx61hw4z2ij"
+   "commit": "ad3ef038584007fbf1b7d6e727be1f18e39a8730",
+   "sha256": "06gjbc1rkxg13nb2hr3gm65zyzpxv77pvsz7b7c9i3qfw782zsax"
   },
   "stable": {
    "version": [
     0,
-    58
+    59
    ],
    "deps": [
     "helm"
    ],
-   "commit": "39ed137823665fca2fa5b215f7c3e8701173f7b7",
-   "sha256": "0a6yls52pkqsaj6s5nsi70kzpvssdvb87bfnp8gp26q2y3syx4ni"
+   "commit": "79373d7f1616d175a5e0730e1e0c3855f04bd945",
+   "sha256": "0vsz2b5qw4qahlf74059z4p1grinhfz28f0psw4c3qf4jasv3b9j"
   }
  },
  {
@@ -42647,8 +43238,8 @@
    "deps": [
     "async"
    ],
-   "commit": "b38c9d1b098310262f331e191a9baaaba789fc25",
-   "sha256": "1rnmdg65r54g2r96j1pq6sz9akjgrpnl5q3la2rrn9pr22mjv0q7"
+   "commit": "0181b7ef468def6ef5547c7241b5c4c854816166",
+   "sha256": "09yvc6jpcb93fwa5blgzaqpk3f3v5h6m2hxajih1y6fxrdaxgnhq"
   },
   "stable": {
    "version": [
@@ -42981,16 +43572,16 @@
   "repo": "emacs-helm/helm-emms",
   "unstable": {
    "version": [
-    20191111,
-    1954
+    20200322,
+    1309
    ],
    "deps": [
     "cl-lib",
     "emms",
     "helm"
    ],
-   "commit": "f0bf6b307f9747ba16b3f582e8364a5012e41465",
-   "sha256": "0wldy81xyb96kg1pz6l2i463pi83qz84m1rmiff7866w9rl1fifd"
+   "commit": "37e5aa029abfa5a5c48636314de8157142944fa2",
+   "sha256": "0r1ai6xhzayyik30w2sx9n62bxxwm12vfmjspv0daqif9az8y3vg"
   },
   "stable": {
    "version": [
@@ -43168,15 +43759,28 @@
   "repo": "emacs-helm/helm-exwm",
   "unstable": {
    "version": [
-    20180827,
-    837
+    20200325,
+    1022
    ],
    "deps": [
     "exwm",
     "helm"
    ],
-   "commit": "e21c6ffabadd2fe8d6c7805b6027cc59a6f914e9",
-   "sha256": "11fyqk3h9cqynifc2zzqn0czrcj082wkdg1qhbj97nl4gcj787rl"
+   "commit": "00ddb4d2a127087a0b99f0a440562bd54408572d",
+   "sha256": "0g4k01ps14bp2az8v6dcag9llg045k2b4kdis81xx4lvw76znr9v"
+  },
+  "stable": {
+   "version": [
+    0,
+    0,
+    2
+   ],
+   "deps": [
+    "exwm",
+    "helm"
+   ],
+   "commit": "00ddb4d2a127087a0b99f0a440562bd54408572d",
+   "sha256": "0g4k01ps14bp2az8v6dcag9llg045k2b4kdis81xx4lvw76znr9v"
   }
  },
  {
@@ -43820,20 +44424,20 @@
  },
  {
   "ename": "helm-gtags",
-  "commit": "81f0f525680fea98e804f39dbde1dada887e8821",
-  "sha256": "1kbpfqhhbxmp3f70h91x2fws9mhx87zx4nzjjl29lpl93vf8xckl",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "0qcn6hmm26irlljcq93c6ap0k1kihdakr2jpgzvdbm8km2cxrm47",
   "fetcher": "github",
-  "repo": "syohex/emacs-helm-gtags",
+  "repo": "emacsorphanage/helm-gtags",
   "unstable": {
    "version": [
-    20170116,
-    529
+    20200321,
+    1456
    ],
    "deps": [
     "helm"
    ],
-   "commit": "108e93d0d099ebb7b98847388f368311cf177033",
-   "sha256": "0hfshcnzrrvf08yw4xz5c93g9pw6bvjp2bmv0s6acrsjqgwhx158"
+   "commit": "ff4329fec2cc1f53b404054ddab4cd16faef7241",
+   "sha256": "14jjjk258hg2d47d8fgg6qb410ij16400anx5kcghi2680a92f2w"
   },
   "stable": {
    "version": [
@@ -44024,10 +44628,10 @@
  },
  {
   "ename": "helm-ispell",
-  "commit": "edc42b26027dcd7daf0d6f2bd19ca4736fc12d6d",
-  "sha256": "0qyj6whgb2p0v231wn6pvx4awvl1wxppppqqbx5255j8r1f3l1b0",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "14slvcjyqd1ryymh63an7r2z1882dybwpq73bb50xkwrk7rs0389",
   "fetcher": "github",
-  "repo": "syohex/emacs-helm-ispell",
+  "repo": "emacsorphanage/helm-ispell",
   "unstable": {
    "version": [
     20151231,
@@ -44198,8 +44802,8 @@
     "helm",
     "lean-mode"
    ],
-   "commit": "c9dffcda2951c22c483d1d22411d13bc132ce609",
-   "sha256": "1lj6j21hzya41fmlnw7faqmhvsdcgcidwibyvicgsb0gm6qqipjf"
+   "commit": "65b55b1711fb61129312044d5ac7e6a2c2ee245c",
+   "sha256": "1zmw8950qhry2ixk2ng0pg4j0vwx11nvjlrpab9jg6x47ys9j65n"
   }
  },
  {
@@ -44365,16 +44969,30 @@
   "repo": "montag451/helm-lxc",
   "unstable": {
    "version": [
-    20190116,
-    2050
+    20200323,
+    816
    ],
    "deps": [
     "cl-lib",
     "helm",
     "lxc-tramp"
    ],
-   "commit": "a4e17dda329ec39a3dac5751ddcef1145b3d91c1",
-   "sha256": "1z6d752682b21ydp7s5a9jkhjqw7nbascv21qcs9418ydisl8q8d"
+   "commit": "37fe2d7ed97967edf59a3b68b1434910516ae24f",
+   "sha256": "1xnkwmdcdjfvslahhslw2xnlcym9fvb3m8384c455bas6s180qxh"
+  },
+  "stable": {
+   "version": [
+    0,
+    2,
+    0
+   ],
+   "deps": [
+    "cl-lib",
+    "helm",
+    "lxc-tramp"
+   ],
+   "commit": "02812daf09d5ffb02abef7a8e0fa1f7b7c472d67",
+   "sha256": "14x69laf6mfz766w6lrzj5a430jr0lrilk60ywc6i1wlpcs2v10v"
   }
  },
  {
@@ -44604,10 +45222,10 @@
  },
  {
   "ename": "helm-open-github",
-  "commit": "81f0f525680fea98e804f39dbde1dada887e8821",
-  "sha256": "1wqlwg21s9pjgcrwr8kdrppinmjn235nadkp4003g0md1d64zxpx",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "1lqjaprgybs4svnrgxvnbbzrkibgkf1zvhbg4ipiljz7h1byzqs7",
   "fetcher": "github",
-  "repo": "syohex/emacs-helm-open-github",
+  "repo": "emacsorphanage/helm-open-github",
   "unstable": {
    "version": [
     20170220,
@@ -44812,21 +45430,21 @@
  },
  {
   "ename": "helm-perldoc",
-  "commit": "81f0f525680fea98e804f39dbde1dada887e8821",
-  "sha256": "1qx0g81qcqanjiz5fxysagjhsxaj31g6nsi2hhdgq4x4nqrlmrhb",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "1xl075bg35lc48zxnwbvyr7dqcz8cxk3v87i9v506kqwfmfpiz95",
   "fetcher": "github",
-  "repo": "syohex/emacs-helm-perldoc",
+  "repo": "emacsorphanage/helm-perldoc",
   "unstable": {
    "version": [
-    20160918,
-    556
+    20200315,
+    1716
    ],
    "deps": [
     "deferred",
     "helm-core"
    ],
-   "commit": "1979f9f67814c11ec9498502237c89a5e1153100",
-   "sha256": "0fvjw8sqnwnjx978y7fghvgp5dznx31hx0pjp4iih01xa1hcwbnc"
+   "commit": "6f3526f07f3df3059dbde779f8e681f5f1fee6ea",
+   "sha256": "1g7f2vdvzh9qhk8lviii86w7cb06a60kz6gvv8gnbqx88mndqclq"
   },
   "stable": {
    "version": [
@@ -45090,10 +45708,10 @@
  },
  {
   "ename": "helm-pydoc",
-  "commit": "81f0f525680fea98e804f39dbde1dada887e8821",
-  "sha256": "1sh7gqqiwk85kx89l1sihlkb8ff1g9n460nwj1y1bsrpfl6if4j7",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "0a2vn7xgvcil8vp40jiljff83hwb2ysb240amd8darxbfxz1j9mi",
   "fetcher": "github",
-  "repo": "syohex/emacs-helm-pydoc",
+  "repo": "emacsorphanage/helm-pydoc",
   "unstable": {
    "version": [
     20160918,
@@ -45319,10 +45937,10 @@
  },
  {
   "ename": "helm-robe",
-  "commit": "e7018f57f6f0e4bd71e172ae23c050b44276581b",
-  "sha256": "1gi4nkm9xvnxv0frmhiiw8dkmnmhfpr9n0b6jpidlvr8xr4s5kyw",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "143azbrj32mk0xv0i7wpvwcj4lqvphbjj3rbcpwnx76rywi3iqp7",
   "fetcher": "github",
-  "repo": "syohex/emacs-helm-robe",
+  "repo": "emacsorphanage/helm-robe",
   "unstable": {
    "version": [
     20151209,
@@ -45750,14 +46368,14 @@
   "repo": "emacsorphanage/helm-swoop",
   "unstable": {
    "version": [
-    20200121,
-    1859
+    20200321,
+    231
    ],
    "deps": [
     "helm"
    ],
-   "commit": "9324d8c196ab2a86fde7142f159e081b87a4d277",
-   "sha256": "1nznfrnzfbxa5qlwbddjma96k93f9hr7jv9sqx3krc0i1061nbg8"
+   "commit": "069dc0b3970f1e796e34b7789ae51b1b7979ee30",
+   "sha256": "1jf1573r8v4mda1xiszrz51qarb1ii31cyk0v3ci16bi9dpp8swb"
   },
   "stable": {
    "version": [
@@ -45873,20 +46491,20 @@
  },
  {
   "ename": "helm-themes",
-  "commit": "81f0f525680fea98e804f39dbde1dada887e8821",
-  "sha256": "0r7kyd0i0spwi7xkjrpm2kyphrsl3hqm5pw96nd3ia0jiwp8550j",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "15qs23f467j99wybjd0n6dacgik5ibf96jn00j9fip55v8rp66gj",
   "fetcher": "github",
-  "repo": "syohex/emacs-helm-themes",
+  "repo": "emacsorphanage/helm-themes",
   "unstable": {
    "version": [
-    20160918,
-    545
+    20200323,
+    712
    ],
    "deps": [
     "helm-core"
    ],
-   "commit": "1160af42590b0d845a55e65e1e782d9e4027fd6e",
-   "sha256": "0856h8rnbgrxp3v3jpfmwq7kcdm1ymd4gcfvh0h27mk05113vz53"
+   "commit": "244121903650c2d25a233d12b378060cf8b010e7",
+   "sha256": "0ii70wn3vadx8a36q2frmsvrmlpz1w58qgn2w3knjivj195knliw"
   },
   "stable": {
    "version": [
@@ -46456,6 +47074,21 @@
    "sha256": "0dfzjgxfkcw4wisbyldsm1km18pfp9j8xgadn6qnsz11l55bpgyp"
   }
  },
+ {
+  "ename": "hidepw",
+  "commit": "f2ee7663bcedaffa935b8379cc77168035cb1f14",
+  "sha256": "0qnvlcjldg1mcb5ilcy538sbf294glrx5g1a7vbmspdm3wby7lna",
+  "fetcher": "github",
+  "repo": "jekor/hidepw",
+  "unstable": {
+   "version": [
+    20200326,
+    112
+   ],
+   "commit": "73f099da79d73fe4087472df3469d8b9b20a59f2",
+   "sha256": "1lcm5nfpcrvy3700g1zzi89j59n0508xvk3v66x9px5aq6a8xk2j"
+  }
+ },
  {
   "ename": "hideshow-org",
   "commit": "3de48eee24a5cca9c8b7dba2d6d01dfbc679d8d6",
@@ -47264,16 +47897,16 @@
   "repo": "thanhvg/emacs-hnreader",
   "unstable": {
    "version": [
-    20190909,
-    258
+    20200321,
+    1900
    ],
    "deps": [
     "org",
     "promise",
     "request"
    ],
-   "commit": "7e68beff596a7c67ff436be5cc29660acd46f5df",
-   "sha256": "0yynfz8bw7nvzk05zxypn183y6hf243s55kxfiicnxx7shag217i"
+   "commit": "5dd287e932e2398aab0f34cb23b99457b81ac370",
+   "sha256": "0ynq9dg00frk1sriraglzsszxpx51mpfdkbd1iqdz648rlhzyp3m"
   }
  },
  {
@@ -47506,20 +48139,20 @@
   "repo": "ericdallo/hover.el",
   "unstable": {
    "version": [
-    20200309,
-    1550
+    20200321,
+    1819
    ],
-   "commit": "5d94d07b0213b45fc3b2d57362fd9bcb86a2fbe8",
-   "sha256": "1fkzlp92lqkwnld3hnfk3qywy7ssyfy03vjxxrisryhnyam9r87d"
+   "commit": "cf1cd543f68525732e0a9178c96a5f83a3cabc7f",
+   "sha256": "1yjfvx94ipps91fr8qbgafpkdp38yhlbzvggyi97g91ib2pxfals"
   },
   "stable": {
    "version": [
     1,
-    0,
-    3
+    1,
+    0
    ],
-   "commit": "5d94d07b0213b45fc3b2d57362fd9bcb86a2fbe8",
-   "sha256": "1fkzlp92lqkwnld3hnfk3qywy7ssyfy03vjxxrisryhnyam9r87d"
+   "commit": "cf1cd543f68525732e0a9178c96a5f83a3cabc7f",
+   "sha256": "1yjfvx94ipps91fr8qbgafpkdp38yhlbzvggyi97g91ib2pxfals"
   }
  },
  {
@@ -47553,8 +48186,8 @@
     "promise",
     "request"
    ],
-   "commit": "8bfaffeff945bcfbc1e2b2cfb65e8452a7a34717",
-   "sha256": "05k7ar832bbzvjicri4v5dyivdrypgkqgninf72izykl89v8yzgx"
+   "commit": "ef7f42c14f0f4aec475b74d56931daa36aded6c8",
+   "sha256": "1a1wr86z5368zwvlgyp979x1ypz38m2w2qnp5607vjjplcrcmay2"
   }
  },
  {
@@ -48622,8 +49255,8 @@
    "deps": [
     "dash"
    ],
-   "commit": "a142ff1c33df23ed9665497d0dcae2943b3c706a",
-   "sha256": "0967709jyp9s04i6gi90axgqzhz03cdf1j1w39yrkds6q1b6v7jw"
+   "commit": "a814e25cb272401bdfee94cb98d915119d307414",
+   "sha256": "040mpwwldivyapmj0pjxsk8drgi113k7rpx8ym4jqz1hah5n33s1"
   },
   "stable": {
    "version": [
@@ -48808,8 +49441,8 @@
    "deps": [
     "dash"
    ],
-   "commit": "522af5d55b3d4cd6885f3b4100913566c202cec4",
-   "sha256": "0yh8px5ffx4pjmy97v1z9nwxb3qgzc5pdaj9nn6lsdxv9z7w5p3v"
+   "commit": "6a0bfeaca2e334b47b4f38ab80d63f53535b189e",
+   "sha256": "0q4w0akmnwk42ldbzqxbr7swz026q8wr1g27bl4i4k25bidqlx9q"
   },
   "stable": {
    "version": [
@@ -49442,16 +50075,15 @@
   "repo": "skeeto/impatient-mode",
   "unstable": {
    "version": [
-    20181002,
-    1231
+    20200327,
+    1619
    ],
    "deps": [
-    "cl-lib",
     "htmlize",
     "simple-httpd"
    ],
-   "commit": "96f6a05f8de74e19d570217fe83f0734623ddb0c",
-   "sha256": "1qddy3b3fmxgkpl10p0hvmgrzhkrxyxg72sxxg5ndfwvjpf2rf91"
+   "commit": "fc84f4a333d47ca853842570cf35e659753a3ebe",
+   "sha256": "14zycqky7xkmbfacmfdqbmq1qs3sj2r41nfmg09dv0hl97pavir8"
   },
   "stable": {
    "version": [
@@ -49499,10 +50131,10 @@
  },
  {
   "ename": "import-popwin",
-  "commit": "a6f0629515f36e2e98839a6894ca8c0f58862dc2",
-  "sha256": "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "0ax0s2jkfmjlnvj741n58m52srppzcn58l4vqq5gvmqj3dbh9rhd",
   "fetcher": "github",
-  "repo": "syohex/emacs-import-popwin",
+  "repo": "emacsorphanage/import-popwin",
   "unstable": {
    "version": [
     20170218,
@@ -49590,8 +50222,8 @@
     20200128,
     1052
    ],
-   "commit": "2976e6d9679f3578196ed7c104b4054f4a713b7e",
-   "sha256": "0ggnlvarpy49cp98970jla34khknj7xlkkg4r74hrywa9kk7j0hk"
+   "commit": "9548f14e7f0f7220d6cd1b8e88756b89fc57c471",
+   "sha256": "1hmrg1pyzcldqh858j3zpb6y0ap4x6142m56pas0lyh65d2wzggk"
   },
   "stable": {
    "version": [
@@ -49825,11 +50457,11 @@
   "repo": "nonsequitur/inf-ruby",
   "unstable": {
    "version": [
-    20200303,
-    1736
+    20200327,
+    1418
    ],
-   "commit": "e4ae089218bda49eb87beb2ca3593260e2fa3748",
-   "sha256": "1a3r1piljsrn2sbzkqjl6ffgygx6xjh6c7a7p85br84kq2ca4mfq"
+   "commit": "41e5ed3a886fca56990486f1987bb3bae0dbd54b",
+   "sha256": "12qgd2p664rh0ks5kq6sxaqi5nlmxrzj5p0kpqrx40caicj6jfpl"
   },
   "stable": {
    "version": [
@@ -49950,11 +50582,11 @@
   "repo": "oitofelix/info-rename-buffer",
   "unstable": {
    "version": [
-    20191005,
-    2346
+    20200328,
+    1450
    ],
-   "commit": "c983ae687481f39b8fd0d4ee9d85fd82b6a4ba03",
-   "sha256": "068flcy4rdzwjpzqqlxpcpcqjxd5f11xq00g55ph17vzxf4iwk3c"
+   "commit": "87fb263b18717538fd04878e3358e1e720415db8",
+   "sha256": "07ylrbl9i2d09nspj481hkgcq9vs4ikvl86sfj7594zzdyy6b8qx"
   }
  },
  {
@@ -50027,20 +50659,20 @@
   "repo": "zonuexe/init-open-recentf.el",
   "unstable": {
    "version": [
-    20161206,
-    1445
+    20200321,
+    737
    ],
-   "commit": "7d8fb124806291f7f6ef2ec3a664ea25899b6d68",
-   "sha256": "0vswa7304s7m6cirbaky9rmrxjb2aylvif2vg2p6l274k37c4jyh"
+   "commit": "369304d6adb6875948c4534419c4f303ac23c4f6",
+   "sha256": "1i41xcjj0kdhn7m29jb5gq2j2cyxn424y4lwx6s3fjj1ckx808ii"
   },
   "stable": {
    "version": [
     0,
-    0,
-    3
+    2,
+    1
    ],
-   "commit": "a4f5338a14302d44fa5aebb1ddc7aff3dc9abbe3",
-   "sha256": "0iph5cpz2dva1rnvp5xynmkndny87z308pziadk1qgf05mc0i61d"
+   "commit": "369304d6adb6875948c4534419c4f303ac23c4f6",
+   "sha256": "1i41xcjj0kdhn7m29jb5gq2j2cyxn424y4lwx6s3fjj1ckx808ii"
   }
  },
  {
@@ -50166,11 +50798,11 @@
   "url": "https://git.sr.ht/~zge/kaomoji",
   "unstable": {
    "version": [
-    20200102,
-    1942
+    20200325,
+    2248
    ],
-   "commit": "0c52e1266e61131ca0c8bd0f2092aad7b6d44ed9",
-   "sha256": "01sqc1cg89flxzhav9bgr733840xgqxy1i4sphfhd96c05yj287z"
+   "commit": "b943fe73327acc08dcd431eb8168a01609b9ab76",
+   "sha256": "13fk3b80gmgmr0d5296csvjfyjdq1jdxy3iahaj5mbhb9m3ganpc"
   },
   "stable": {
    "version": [
@@ -50193,8 +50825,8 @@
     20180403,
     1214
    ],
-   "commit": "7bfea92ba1dae9d13d442e2f84f9fb6c05a0a9bd",
-   "sha256": "01f2p58qsny7p9l6vrra0i2m2g1k05p39m0bzi906zm5awx7l0rr"
+   "commit": "af5f95ff98e2432837f5aa848ba38dd626e82fce",
+   "sha256": "0rdh4bzwq60m641r41kbsgzpkx8hxl7vx82y1cf7zp8zk8la4pd8"
   },
   "stable": {
    "version": [
@@ -50462,11 +51094,14 @@
   "repo": "thierryvolpiatto/ioccur",
   "unstable": {
    "version": [
-    20130822,
-    548
+    20200326,
+    1341
    ],
-   "commit": "4c0ef992a6fcd2aed62e3866d56650463108ab5a",
-   "sha256": "1rz5wf19lg1lnm0h73ynhb0vl3c99k7vpipay2f8jls24pv60bra"
+   "deps": [
+    "cl-lib"
+   ],
+   "commit": "59350b2066d61444f93c8a51b16353e746486e4c",
+   "sha256": "1055db76008a5nkb243ciq680fg4nn5yzkdv4x8sd1mq1hrs33qh"
   }
  },
  {
@@ -50943,11 +51578,11 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20200311,
-    1144
+    20200319,
+    1247
    ],
-   "commit": "8fae568daafdc79d4990ad739bac42ee230d3234",
-   "sha256": "18ppxzafz9f8dn7wwdb9vab3c91n20csvn9kjr3djkjgngz6qjd1"
+   "commit": "64f05f4735bba8b708bc12cfc2cbfb7fb7706787",
+   "sha256": "16b75jw0by1f8divymfygjbp5mikc2bjz4nqd907mdsndf8k6i8q"
   },
   "stable": {
    "version": [
@@ -51074,6 +51709,24 @@
    "sha256": "0slisbnfcdx8jv0p67ag6s4l0m0jmrwcpm5a2jm6sai9x67ayn4l"
   }
  },
+ {
+  "ename": "ivy-emoji",
+  "commit": "f1121a85321a3184d1fa990ae86f5d1f3b04f145",
+  "sha256": "0sp8z7r1kffgfm4jrn5cqfi335vaynn27hs9345ybrxi3r4a3c0g",
+  "fetcher": "github",
+  "repo": "sbozzolo/ivy-emoji",
+  "unstable": {
+   "version": [
+    20200316,
+    2351
+   ],
+   "deps": [
+    "ivy"
+   ],
+   "commit": "a1b7d32048278afd9b06536a8af96f533639d146",
+   "sha256": "0h3051qq6xjc7gkl2a8if9b9ak6wnlc4gmh268s8jvi0nd8dfw2z"
+  }
+ },
  {
   "ename": "ivy-erlang-complete",
   "commit": "ac1b9e350d3f066e4e56202ebb443134d5fc3669",
@@ -51091,8 +51744,8 @@
     "erlang",
     "ivy"
    ],
-   "commit": "7d60ed111dbfd34ab6ec1b07c06e2d16a5380b9a",
-   "sha256": "0z34ljmwr0hmkaq5z85p87vljywpv3nnsvhp1zc8cw4hvqarcjqg"
+   "commit": "c443dba0c466d36bef01a8985474f5da0a5a65fe",
+   "sha256": "0f0qr6h4y891lzlfi3k0a555qg0jw79fl9bfgv5fxi06m24q4683"
   },
   "stable": {
    "version": [
@@ -51243,8 +51896,8 @@
     "hydra",
     "ivy"
    ],
-   "commit": "8fae568daafdc79d4990ad739bac42ee230d3234",
-   "sha256": "18ppxzafz9f8dn7wwdb9vab3c91n20csvn9kjr3djkjgngz6qjd1"
+   "commit": "64f05f4735bba8b708bc12cfc2cbfb7fb7706787",
+   "sha256": "16b75jw0by1f8divymfygjbp5mikc2bjz4nqd907mdsndf8k6i8q"
   },
   "stable": {
    "version": [
@@ -51434,8 +52087,8 @@
     "ivy",
     "prescient"
    ],
-   "commit": "7fd8c3b8028da4733434940c4aac1209281bef58",
-   "sha256": "1igsjdkxax2lavglc03h0dk3d7fpgqvlymnhyxx738sjyfzl09cr"
+   "commit": "a194852e8022762843052e58a9d0fbdaa1df0fe5",
+   "sha256": "0da4s32fza42vdiqhh7cdim08by5i4909q93ivxkmgrmqfgdvz0p"
   },
   "stable": {
    "version": [
@@ -51489,26 +52142,26 @@
   "repo": "Yevgnen/ivy-rich",
   "unstable": {
    "version": [
-    20200308,
-    331
+    20200322,
+    1326
    ],
    "deps": [
     "ivy"
    ],
-   "commit": "0f22aff4c7d7d01bb11561578f5fcd7a2eaa7058",
-   "sha256": "0d8q58k5j0vzq8m2z7kc597ks93hq1x98svjkqzlvnak241yzkim"
+   "commit": "596874d1469667f896b83731914d7d4456025553",
+   "sha256": "0yym3l24zzn1yjg3fjkq7lpvpp9w7wi2vl161v53pmg1v94xig6s"
   },
   "stable": {
    "version": [
     0,
     1,
-    5
+    6
    ],
    "deps": [
     "ivy"
    ],
-   "commit": "d2e64aee221228e27e670f6b1c051052cea33ea6",
-   "sha256": "1g45pk1w5vcrrlv7d7yz4qdk26v31a8ik2zkzk323bqwzc2safhi"
+   "commit": "840e13314774a40b69f10f0a15ce1d6af4187b12",
+   "sha256": "1ra18v6lgz3m6asm6d5b92zn1x22yiz4cwxd9b54dnvwi11121m7"
   }
  },
  {
@@ -51550,14 +52203,14 @@
   "repo": "Kungsgeten/ivy-todo",
   "unstable": {
    "version": [
-    20171208,
-    1609
+    20200323,
+    2005
    ],
    "deps": [
     "ivy"
    ],
-   "commit": "964e347cea1a6097854d7113f5b07f6c5ef81df0",
-   "sha256": "07208qdk1a77dgh9qmpn164x5mgkzvprsdvb7y35ax12r2q541b8"
+   "commit": "d74501cd334b7d709659946c5e02b21cfd5507de",
+   "sha256": "0j9cdzr5s7zi6qf4cax8bc2jrprgaz85mfvc9cx52ryd3yn8l6g0"
   }
  },
  {
@@ -51793,11 +52446,11 @@
   "url": "https://bitbucket.org/sbarbit/jack-connect",
   "unstable": {
    "version": [
-    20191125,
-    1321
+    20200325,
+    1639
    ],
-   "commit": "e951217ee3ea0ac6b9ed9a209305ef9a72ec019a",
-   "sha256": "03dklv7daxlqzmv8dq9whc07ia0fihy988gfgdr006pfy2x6mnq7"
+   "commit": "c227d1ed3016960c8666a60e4215bbb029436bc7",
+   "sha256": "1w66dpn0cmdqwgjd1528cd2739ijxhsr62zyx2arlr9ldrnqy5f6"
   }
  },
  {
@@ -52346,8 +52999,8 @@
   "repo": "emiller88/emacs-jest",
   "unstable": {
    "version": [
-    20200223,
-    28
+    20200318,
+    237
    ],
    "deps": [
     "cl-lib",
@@ -52358,8 +53011,23 @@
     "projectile",
     "s"
    ],
-   "commit": "777cca00f8fdb93226225b16b48eb955493243c5",
-   "sha256": "0292bhkc98pbj6lchfkx9i6zyllab2h60cly07ck71glq96kfx3c"
+   "commit": "b51be19c1de9e82ee1dc62921be2222fc5685eed",
+   "sha256": "1jdphlhp9vxvkj51cswqfgka910216snyjhql700x4dgpmvkcv56"
+  }
+ },
+ {
+  "ename": "jest-test-mode",
+  "commit": "767499b7048cc0f1e47dff17f66f1e2fe8b023b5",
+  "sha256": "09vwidm49bw8kb4a9vax4rgbzk1ndg0fkdaj9k9sy973rapb213a",
+  "fetcher": "github",
+  "repo": "rymndhng/jest-test-mode",
+  "unstable": {
+   "version": [
+    20200329,
+    506
+   ],
+   "commit": "f04d08db36715d7509fd68448f74f917c6c1a382",
+   "sha256": "1pmzls19wpg60ql0b5l6rhml8hh8mzpbc0dgylzhps1jghi055s1"
   }
  },
  {
@@ -52595,11 +53263,11 @@
   "repo": "ljos/jq-mode",
   "unstable": {
    "version": [
-    20200312,
-    1315
+    20200317,
+    852
    ],
-   "commit": "b1a4137b30c3d50feb70eb00d8d2e41fa999763c",
-   "sha256": "0bdwfn3frq00sb14fmrsll9jg2p446gg4z7w0czmfqfay6av0hla"
+   "commit": "bc904840f27fe7b0e6dbdaeb912a7175a3837110",
+   "sha256": "0w5cgys1yfhirhsvj4n5k6km2xwyqvlnbv0m0sim1vavizzfmda4"
   },
   "stable": {
    "version": [
@@ -52769,14 +53437,14 @@
   "repo": "sooqua/js-react-redux-yasnippets",
   "unstable": {
    "version": [
-    20190911,
-    1259
+    20200316,
+    1144
    ],
    "deps": [
     "yasnippet"
    ],
-   "commit": "70785d126a28ffcb314fb4b354319418586e06b1",
-   "sha256": "0adlnjkcq0kpadc1dqwfzrrk0xd4jc0rc4k8hbj6nh4dhc7shnk0"
+   "commit": "9f509043f01fa59bff4daf31b2e95d63f8deab4a",
+   "sha256": "00icd76y7sp3cby6n1mkxma4h6aqkrq6cqsnbqrpsgq99qqy30my"
   }
  },
  {
@@ -53249,11 +53917,11 @@
   "repo": "JuliaEditorSupport/julia-emacs",
   "unstable": {
    "version": [
-    20200310,
-    1429
+    20200324,
+    1652
    ],
-   "commit": "b800403fada2b83bc98d6006cfd370e0cfd7876f",
-   "sha256": "1ay4wm303qh48h6g75di66w2f2smg5dnlqv40dgx4nhkyi68wrvg"
+   "commit": "1c122f1dff8dd2674245b2ce5e43b62504864bfd",
+   "sha256": "1ki42xx7vws8hb5vr1rgm2aih4qadf9qva8c4zq1hzmzq5j74jry"
   },
   "stable": {
    "version": [
@@ -53317,8 +53985,8 @@
   "repo": "gcv/julia-snail",
   "unstable": {
    "version": [
-    20200315,
-    529
+    20200327,
+    602
    ],
    "deps": [
     "cl-lib",
@@ -53329,8 +53997,8 @@
     "spinner",
     "vterm"
    ],
-   "commit": "13ddf77079d07326291a1f9ea87d33521d49537d",
-   "sha256": "18p9wm27yhpxa1cai79abiawh9arwn523lk4iy26rbpp0h64vy6f"
+   "commit": "c293f0db0203708e49139cb3b32e5826056ef972",
+   "sha256": "1fyw36c5f70j53jl03yk79pgr0x4q89mwyb77n9xcbscdhaxv3s2"
   },
   "stable": {
    "version": [
@@ -53338,7 +54006,7 @@
     0,
     0,
     -2,
-    5
+    6
    ],
    "deps": [
     "cl-lib",
@@ -53349,8 +54017,8 @@
     "spinner",
     "vterm"
    ],
-   "commit": "a614471cad3a133a00f77a7855407d506d94ce65",
-   "sha256": "01wdly6l0xkzqmqab529mhjc7mnijpv3f78cjnx0w0ak13srva93"
+   "commit": "596f59774edf213c4c4885992dda158de145be03",
+   "sha256": "0x8mlvq264ihhcdbkljhaij6hsvlh8s4fmrd8x970c7i3qi3hh7k"
   }
  },
  {
@@ -53485,8 +54153,8 @@
   "repo": "dzop/emacs-jupyter",
   "unstable": {
    "version": [
-    20200314,
-    1939
+    20200329,
+    828
    ],
    "deps": [
     "cl-lib",
@@ -53494,8 +54162,8 @@
     "websocket",
     "zmq"
    ],
-   "commit": "045f2b8b429fd6dc3ecb4f7baf2bd3012e0887b0",
-   "sha256": "0v78ara8277k92w4qirvk4fh6ljvzp75gfllcag57kzljfvxm17p"
+   "commit": "b691d38483b6540d42d482a32d35eb54178e5658",
+   "sha256": "1lp6xg71snlsaffl7afrgjcs99l2axc5xrbkrncc50zjhxlimxrr"
   },
   "stable": {
    "version": [
@@ -53812,15 +54480,15 @@
   "repo": "ogdenwebb/emacs-kaolin-themes",
   "unstable": {
    "version": [
-    20200314,
-    1600
+    20200324,
+    1349
    ],
    "deps": [
     "autothemer",
     "cl-lib"
    ],
-   "commit": "a523c0a535b8022bfe63aeb592a5c8a744d60d4d",
-   "sha256": "0ai28v2dcdz31qa1hdg4i21pklfx59zglwampwlnjlakmrra879g"
+   "commit": "9877c12ad412e79b3d88423f911be1ff59a72e0e",
+   "sha256": "079si7dhl45rx2vf8kf8srflk6nd6yxqz44xbsrh0s39gpp9v5dh"
   },
   "stable": {
    "version": [
@@ -54518,8 +55186,8 @@
     20180702,
     2029
    ],
-   "commit": "84e7bceb79e0324e0150f7f92421f2b7799d1d58",
-   "sha256": "17z8cw6b8pff8kqr62w5hvzajfv7w8l8jwbwnxic9m5aqcvxs8k6"
+   "commit": "26228b202e821824afd8b2536234b26c23ae1b9d",
+   "sha256": "1329xyhriha7037lnsg8bf4xqkc20f0h3bv7xifm2i40ib0z3wlx"
   },
   "stable": {
    "version": [
@@ -54806,16 +55474,16 @@
   "repo": "abrochard/kubel",
   "unstable": {
    "version": [
-    20200314,
-    1655
+    20200316,
+    207
    ],
    "deps": [
     "dash",
     "s",
     "transient"
    ],
-   "commit": "5f8fefa60d17a11f00d1652ef5278b2fc11da136",
-   "sha256": "055x4cv843k2lk1rwy2dbq42cn1cvcpgcyhs88gh9vhb0wvp5jwf"
+   "commit": "db3a999c028ffeeeb49936e8b921c364bf8f437e",
+   "sha256": "1ai33jma22agrxww6dcgsh6dbv5h36gixgs0b6n1q4d5v7k6d9q3"
   },
   "stable": {
    "version": [
@@ -54841,8 +55509,8 @@
     "evil",
     "kubel"
    ],
-   "commit": "5f8fefa60d17a11f00d1652ef5278b2fc11da136",
-   "sha256": "055x4cv843k2lk1rwy2dbq42cn1cvcpgcyhs88gh9vhb0wvp5jwf"
+   "commit": "db3a999c028ffeeeb49936e8b921c364bf8f437e",
+   "sha256": "1ai33jma22agrxww6dcgsh6dbv5h36gixgs0b6n1q4d5v7k6d9q3"
   },
   "stable": {
    "version": [
@@ -55177,25 +55845,26 @@
   "repo": "lassik/emacs-language-id",
   "unstable": {
    "version": [
-    20200214,
-    2254
+    20200321,
+    724
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "dc18099dd74a954601ab425ef6cfd3ed32003023",
-   "sha256": "1mwkv4cyz8n8vm9jf7nw980j0ig487ch37ayx356nvvznnrfnm5s"
+   "commit": "756f238b4fda63f6e0980f627869eb3c03d13f66",
+   "sha256": "18i1l7vpfa0y5zpy9hbcrkp79n30n7pkf0kasq718cj8ggczj120"
   },
   "stable": {
    "version": [
     0,
-    4
+    4,
+    2
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "dc18099dd74a954601ab425ef6cfd3ed32003023",
-   "sha256": "1mwkv4cyz8n8vm9jf7nw980j0ig487ch37ayx356nvvznnrfnm5s"
+   "commit": "2c7b8599fc7fb56b0c820a9ae9f08053c71a8738",
+   "sha256": "10vrx3vfg8glrqngbyhwgkg5maib8ihv03psdd6qjhd0kik83498"
   }
  },
  {
@@ -55206,8 +55875,8 @@
   "repo": "mihaiolteanu/lastfm.el",
   "unstable": {
    "version": [
-    20200207,
-    1316
+    20200320,
+    1839
    ],
    "deps": [
     "anaphora",
@@ -55216,13 +55885,13 @@
     "request",
     "s"
    ],
-   "commit": "cff7699343467b36ff3dad90061b567025ff9b23",
-   "sha256": "1jk400xh07pnwzab23xwsiyv9j0f4b8fl0v6w712vsn2n1ab88gm"
+   "commit": "54636059512adec0176950e8fce3b9bf7423619d",
+   "sha256": "1ffvh71vgsdv118hhz0x2xfmqb2bayk7i3mdxc1ybs2vrdggnim4"
   },
   "stable": {
    "version": [
     1,
-    0
+    2
    ],
    "deps": [
     "anaphora",
@@ -55231,8 +55900,8 @@
     "request",
     "s"
    ],
-   "commit": "c2b39d2fa4fb7f56e4aacb0a50ed2aa509ab992c",
-   "sha256": "09k8p5bpl7f4dgkvvx4gf91pgyc5ikm6kynkjhdwrsnpnnl2cc9b"
+   "commit": "96568f07324ba32804be9352016956694923f5f3",
+   "sha256": "04a563g6rby8374azpfjdagbgdylcg2glfx5wdx5agd98bs15j28"
   }
  },
  {
@@ -55243,15 +55912,15 @@
   "repo": "storvik/emacs-lastpass",
   "unstable": {
    "version": [
-    20191102,
-    611
+    20200320,
+    2117
    ],
    "deps": [
     "cl-lib",
     "seq"
    ],
-   "commit": "e07b1a062153b9d56d0112ac45caf76d6bce67c5",
-   "sha256": "0pz5svbs7jp7zcjl7p5pbfxqh6xzh48dzz3swkywms9hfh2ynqzp"
+   "commit": "ac472f844bd1e109c62479253cbc40bb5e50ed8f",
+   "sha256": "07bh7vkczzpmkbxxyyhn912b5rjm975a49y1bq08y4vd006zsq4x"
   }
  },
  {
@@ -55452,8 +56121,8 @@
    "deps": [
     "colorless-themes"
    ],
-   "commit": "a7b7c0a32b174988f40378996cd8997f73524f19",
-   "sha256": "0khsf4xz0wjn774hy08pxafm79j55ns28q25pfzyj9s07hi4r0vz"
+   "commit": "2b4c341640c8191a39e4bc28d6cd04c7d6dcbb37",
+   "sha256": "0ni9cnrv464fk840i1ll241kzkiy1zc6nfrbdv3ciixxdxbshxbn"
   },
   "stable": {
    "version": [
@@ -55528,11 +56197,11 @@
   "repo": "conao3/leaf.el",
   "unstable": {
    "version": [
-    20200225,
-    1023
+    20200327,
+    1411
    ],
-   "commit": "0179836fcc8ef613d6f9d7fa509a79a8fbf8db22",
-   "sha256": "0r5crz2n0q8xrh840gp3m8gy647i0khvwzj9pc3w5y9xkw7ca7vh"
+   "commit": "199045bfe411afc30cb7c7d18b8a6b03edebeae1",
+   "sha256": "0apaa5w2zfycigdf8d7x3h8aw8m11mz8b6l2d546dlbvxr5yra28"
   },
   "stable": {
    "version": [
@@ -55552,14 +56221,14 @@
   "repo": "conao3/leaf-keywords.el",
   "unstable": {
    "version": [
-    20200214,
-    1749
+    20200328,
+    845
    ],
    "deps": [
     "leaf"
    ],
-   "commit": "138af8613feded5eaeda84ffaff2621e62c2e0fe",
-   "sha256": "03jvjmr6ki28ngdc0j7sjj14qyzd730jxp8gdcajjln76ni5cayy"
+   "commit": "3164f1f4b98be9efa9e28170cc9b8d14a10b3e56",
+   "sha256": "165x864rn9ha8dd3k62xgdp97fi961x75p6a7nldl0znzan65691"
   },
   "stable": {
    "version": [
@@ -55579,8 +56248,8 @@
   "repo": "leanprover/lean-mode",
   "unstable": {
    "version": [
-    20200211,
-    2010
+    20200319,
+    838
    ],
    "deps": [
     "dash",
@@ -55589,8 +56258,8 @@
     "flycheck",
     "s"
    ],
-   "commit": "c9dffcda2951c22c483d1d22411d13bc132ce609",
-   "sha256": "1lj6j21hzya41fmlnw7faqmhvsdcgcidwibyvicgsb0gm6qqipjf"
+   "commit": "65b55b1711fb61129312044d5ac7e6a2c2ee245c",
+   "sha256": "1zmw8950qhry2ixk2ng0pg4j0vwx11nvjlrpab9jg6x47ys9j65n"
   }
  },
  {
@@ -55686,11 +56355,11 @@
   "repo": "ledger/ledger-mode",
   "unstable": {
    "version": [
-    20200312,
-    2023
+    20200328,
+    1927
    ],
-   "commit": "0ec6c5a74d636b9ec649c1cae26acecf84d1a830",
-   "sha256": "147k8l9mmkq6hhyh9dhqi7cv3l3s2sk0qbqlbx0y4plzbi1v0yay"
+   "commit": "bfa25a92d0cf63c5316b5aa8d50bd6809297ea9e",
+   "sha256": "1gx9brcwdmwhk0w2p93szdla5bgn25f1bsi9lna2l8ax1sn3l5kd"
   },
   "stable": {
    "version": [
@@ -55927,8 +56596,8 @@
     20200122,
     1934
    ],
-   "commit": "dccd751682a0954165c7f2c08414bea0168a9a9f",
-   "sha256": "12njc6pmbadwn71h811alr4rpsmw1b48b3jjmxpy3s51ja44vcc4"
+   "commit": "4bf80c2bb1e679b6e42e8d6547d6f33996830f73",
+   "sha256": "152731dwf0q1i1p5cjd3fwznl100vzsjk45ks1wxw4zv0w59q399"
   }
  },
  {
@@ -56446,8 +57115,8 @@
   "repo": "abo-abo/lispy",
   "unstable": {
    "version": [
-    20200305,
-    1858
+    20200323,
+    1616
    ],
    "deps": [
     "ace-window",
@@ -56456,8 +57125,8 @@
     "iedit",
     "zoutline"
    ],
-   "commit": "c7e282ae06f654bf985466ae05dedc4efc87144d",
-   "sha256": "1gw03xwjwvgvp1m2nl3wmz3y6d2q6xqpawpdfw95kn4rpw1lsh4w"
+   "commit": "b07ab5d8374c75bd1401b320fda17486325bc96d",
+   "sha256": "0gknqazf8pihn903518a5hmy5ggqmmq40rxz4kq2nfblpm6s5zkz"
   },
   "stable": {
    "version": [
@@ -56741,10 +57410,10 @@
  },
  {
   "ename": "literate-coffee-mode",
-  "commit": "855ea20024b606314f8590129259747cac0bcc97",
-  "sha256": "18fdgay7xfgza75z3xma666f414m9dn7d50w94wzzmv7ja74sp64",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "00zd5i6wpn95sslz0gd7m1h1fw7w07swszfqwaphkbqfwckgll6m",
   "fetcher": "github",
-  "repo": "syohex/emacs-literate-coffee-mode",
+  "repo": "emacsorphanage/literate-coffee-mode",
   "unstable": {
    "version": [
     20170211,
@@ -56776,14 +57445,14 @@
   "repo": "jingtaozf/literate-elisp",
   "unstable": {
    "version": [
-    20191012,
-    606
+    20200327,
+    620
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "3bd795288db8dcd3edf5b33ca8fc213fe16c62d5",
-   "sha256": "0in5cryj1abcg6850lxx8qqhxvdij54jmm4ip9ra2kwz55smq4ky"
+   "commit": "732d649136051a4b6d43c2fabeb5233c3e5f16d7",
+   "sha256": "1d4p6s9dj5368ywfpp46pysxvcqwsiacih3n1hia9c4y7p0xx4cz"
   },
   "stable": {
    "version": [
@@ -56867,11 +57536,11 @@
   "repo": "donkirkby/live-py-plugin",
   "unstable": {
    "version": [
-    20200221,
-    611
+    20200329,
+    2216
    ],
-   "commit": "b4ede4811d82063b1439bbc0523587c993bcb17e",
-   "sha256": "10j4ih5vp3bic2hjqwvd90sr1dbza9k2490l6k7m0sfy1pqlqy07"
+   "commit": "18587cf78fa22d61a7365238da852be4a55c0656",
+   "sha256": "0141svf43miy1xyfc4wi3lrv0jyx97qbg9yhnxwlxz5i6gdrnyza"
   },
   "stable": {
    "version": [
@@ -57286,6 +57955,21 @@
    "sha256": "1arzz27vf6r62m7qhfq049n5zw1x2zbbrvmlnvbd9yaanlgrf0hc"
   }
  },
+ {
+  "ename": "lol-data-dragon",
+  "commit": "c54747f74db0d3c270682c8994e3babdac9d36c4",
+  "sha256": "18aydjkv331gkbsyxgvrrlw37v2m2g65alz82287nwjswgns4pia",
+  "fetcher": "github",
+  "repo": "xuchunyang/lol-data-dragon.el",
+  "unstable": {
+   "version": [
+    20200321,
+    2142
+   ],
+   "commit": "6f53bb3971daad60bd0529d1e3889d5f9fedf235",
+   "sha256": "0xblv8l6krp3581m0xava95pm6wcsjm3rsl47dsvzpgns1kyz8lx"
+  }
+ },
  {
   "ename": "lolcat",
   "commit": "38e720f524b23b5742764186a695d143f983e179",
@@ -57416,6 +58100,25 @@
    "sha256": "1hwm7yxbwvb27pa35cgcxyjfjdjhk2a33i417q2akc7vppdbcmzh"
   }
  },
+ {
+  "ename": "lsp-docker",
+  "commit": "f592ec9b1d6a05e1e115d4b313be108c8e47ee67",
+  "sha256": "1xmkwhgkcsf52hngb811n2q7q4rav75wwjz7zin6x17vfv8hqifx",
+  "fetcher": "github",
+  "repo": "emacs-lsp/lsp-docker",
+  "unstable": {
+   "version": [
+    20200222,
+    505
+   ],
+   "deps": [
+    "dash",
+    "lsp-mode"
+   ],
+   "commit": "f46e56e554c9207d5ab5b9aebf994df8b41955f3",
+   "sha256": "1281qrskwwjz3x3mi99a6sp9694wbd08myhy0nlba6493ip8wbhz"
+  }
+ },
  {
   "ename": "lsp-elixir",
   "commit": "c875a05e68d09ecf37f7e13149f2624c70164ea3",
@@ -57479,16 +58182,16 @@
   "repo": "emacs-lsp/lsp-ivy",
   "unstable": {
    "version": [
-    20191028,
-    902
+    20200327,
+    1007
    ],
    "deps": [
     "dash",
     "ivy",
     "lsp-mode"
    ],
-   "commit": "78c1429c62c19006058b89d462657e1448d1e595",
-   "sha256": "1bry1vsv6p2h4qrzx8aq7bsqfw12w3v5gz548dwkdk2cwmhsmi3d"
+   "commit": "39b90e7aef755b6e7756f2ae306d66b01cb4d18d",
+   "sha256": "1nss84rzpa1lwxx9sr28nsq1p6z82ifs7n7dh4zl6xm7rl7cr9pz"
   }
  },
  {
@@ -57499,8 +58202,8 @@
   "repo": "emacs-lsp/lsp-java",
   "unstable": {
    "version": [
-    20200114,
-    2313
+    20200327,
+    2019
    ],
    "deps": [
     "dash",
@@ -57512,8 +58215,8 @@
     "request",
     "treemacs"
    ],
-   "commit": "0cea6fd5e7b163766ddf47380d655771c1b070e5",
-   "sha256": "17d5xf2dzy1lnxm6cip0gmzrw37xv362fakn05nhkq5ygl7bhpz6"
+   "commit": "5c6953441916c1e2e76ab0c41384ea6f57a18a5e",
+   "sha256": "13070b986jg1xd8chbr6am8915zg8wjk8mn9zlmn0d9k45zw1gsv"
   },
   "stable": {
    "version": [
@@ -57592,8 +58295,8 @@
   "repo": "emacs-lsp/lsp-mode",
   "unstable": {
    "version": [
-    20200315,
-    950
+    20200329,
+    1431
    ],
    "deps": [
     "dash",
@@ -57604,8 +58307,8 @@
     "markdown-mode",
     "spinner"
    ],
-   "commit": "6113e321b107915375e7f3fa8e9f85242f7fc874",
-   "sha256": "1vkicqf7p9dkp526svkk331pvb51zq1m26jbdvqvcs17zv8si3xr"
+   "commit": "9835e93f5526110bdeb164e42d8da16c1e39feb7",
+   "sha256": "0vd0vdbhfv31r63cygg40bzfj2v66k3zqd66hmkfzghhjl9d4q9f"
   },
   "stable": {
    "version": [
@@ -57970,26 +58673,26 @@
   "repo": "montag451/lxc-tramp",
   "unstable": {
    "version": [
-    20180523,
-    2024
+    20200321,
+    1815
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "1aab85fef50df2067902bff13e1bac5e6366908b",
-   "sha256": "066qwyk38r42xriifg1ik2f0am0m57wlfrk5278sycr8vbag6fc9"
+   "commit": "ad03a98386d4cdb0df3eb323ecaab8fe6d0942c6",
+   "sha256": "1x43na4m7krkhhsvvync9k0rk4lxdakl52n43aafyx43zgv5zk8y"
   },
   "stable": {
    "version": [
     0,
-    1,
+    2,
     0
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "17fc5962e7c27ac4f0bcc4ed7312dd5709063341",
-   "sha256": "03h6aw98mbwwqj08bzpg147hanx97r8fr8jv790zw7iqqjp46hsm"
+   "commit": "ad03a98386d4cdb0df3eb323ecaab8fe6d0942c6",
+   "sha256": "1x43na4m7krkhhsvvync9k0rk4lxdakl52n43aafyx43zgv5zk8y"
   }
  },
  {
@@ -58270,8 +58973,8 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20200313,
-    1657
+    20200318,
+    1224
    ],
    "deps": [
     "async",
@@ -58280,8 +58983,8 @@
     "transient",
     "with-editor"
    ],
-   "commit": "e293416cee73dc47a6dc7f0bc2f4624d69625634",
-   "sha256": "0kshzx82ics43x6z8i7wcl5866li8ai05mzkri14l6jrcarz9fjz"
+   "commit": "236c44518d30c43c7035be32f02ba615d148b5ef",
+   "sha256": "0fbcx8qfymvd1i96a21gzsd4882qz6xlgccvba0dam8h9aninqf6"
   },
   "stable": {
    "version": [
@@ -58608,8 +59311,8 @@
     "libgit",
     "magit"
    ],
-   "commit": "e293416cee73dc47a6dc7f0bc2f4624d69625634",
-   "sha256": "0kshzx82ics43x6z8i7wcl5866li8ai05mzkri14l6jrcarz9fjz"
+   "commit": "236c44518d30c43c7035be32f02ba615d148b5ef",
+   "sha256": "0fbcx8qfymvd1i96a21gzsd4882qz6xlgccvba0dam8h9aninqf6"
   }
  },
  {
@@ -58757,14 +59460,14 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20200313,
-    314
+    20200318,
+    1224
    ],
    "deps": [
     "dash"
    ],
-   "commit": "e293416cee73dc47a6dc7f0bc2f4624d69625634",
-   "sha256": "0kshzx82ics43x6z8i7wcl5866li8ai05mzkri14l6jrcarz9fjz"
+   "commit": "236c44518d30c43c7035be32f02ba615d148b5ef",
+   "sha256": "0fbcx8qfymvd1i96a21gzsd4882qz6xlgccvba0dam8h9aninqf6"
   },
   "stable": {
    "version": [
@@ -59004,8 +59707,8 @@
  },
  {
   "ename": "magma-mode",
-  "commit": "59764a0aab7c3f32b5a872a3d10a7e144f273a7e",
-  "sha256": "1gq6yi51h1h7ivrm1xr6nfrpabx8ylbk0waaw04gnw3bb54dmmvc",
+  "commit": "0a82892371eb390d8a802919458c6c2baacd1597",
+  "sha256": "134zm9mg7p0qcqr0m7wsxnwqxr64s9z1njxmvjhsbxi3rhaivcsl",
   "fetcher": "github",
   "repo": "ThibautVerron/magma-mode",
   "unstable": {
@@ -59354,8 +60057,8 @@
    "deps": [
     "manage-minor-mode"
    ],
-   "commit": "e68d979a8a508a86a35eb37a0282d53c1159dfb1",
-   "sha256": "1a10fyqfakrr1a9bp53l1h9m77jn92k6gqpxdldnjjjnv5xfkra4"
+   "commit": "cd126cbeb2e99c8d00b48310938a85448ebc2e1a",
+   "sha256": "1lk2rmv0qhzfyg57h461qdxgqciwqjggipl9i146m9bpjp7bjjvx"
   },
   "stable": {
    "version": [
@@ -60516,8 +61219,8 @@
     20191025,
     851
    ],
-   "commit": "a3eb8ce9a52d48cb521eb2c01297fd224ccf25ee",
-   "sha256": "0i8nxaqb2icw0arbjin23p1ah6p9v4dbvrdr7sak3fm7hxv1v7yi"
+   "commit": "37e38e44f57fa2caac5ed8a1268e747a42174c85",
+   "sha256": "1r73dy1wyrdclcnp9dpk7r463fwkh2ybi31q1mmxym1xwvkg5ahl"
   },
   "stable": {
    "version": [
@@ -60566,14 +61269,14 @@
   "repo": "abrochard/mermaid-mode",
   "unstable": {
    "version": [
-    20200221,
-    1938
+    20200320,
+    1357
    ],
    "deps": [
     "f"
    ],
-   "commit": "833abce1fb232b7dbeac0ee568afe8c468077029",
-   "sha256": "0znc9sv5xv0bqq4szcaz6nlxypijqm5lmi0igkcpibry6bwfipgj"
+   "commit": "a5b16bc4308e2a520711c2ef8a964e269115cbf7",
+   "sha256": "150a69rn0wkfb0bmyx21vywh7vcd5a3yfi7i9jgp8zf8hfclsymg"
   }
  },
  {
@@ -60694,8 +61397,8 @@
     20191018,
     242
    ],
-   "commit": "0177fc4e7edd705db59b82c83a24db51dc405890",
-   "sha256": "1whl7kz4im2jmdz99336wfn152q0l3qwii4w7sn45rlsm2sijiw1"
+   "commit": "821ed77f0982dfeb1df50380931d53e6b7b7036f",
+   "sha256": "16hrnfz4jp5a672rvgk6ky9xfzvgxx73p5l96wh3x9294vyjd4vi"
   },
   "stable": {
    "version": [
@@ -60748,11 +61451,11 @@
   "repo": "kazu-yamamoto/Mew",
   "unstable": {
    "version": [
-    20200130,
-    145
+    20200316,
+    221
    ],
-   "commit": "bdafb13aadeae6af73dadd9f6b383ea6903da32f",
-   "sha256": "09k9bkwf6hz8jnklsm30w79v3vkwsf5nd97cxfmi44j7wlb6kkr1"
+   "commit": "5145145f87bfbe80fd91e82ded33033cf78ef54f",
+   "sha256": "0wdbgh3bady6xad0gnlg3irds5vdffl8d39raqayzgn17yb98pcf"
   },
   "stable": {
    "version": [
@@ -60796,8 +61499,8 @@
     "projectile",
     "s"
    ],
-   "commit": "4501d996767caa9bc9592105113c9743b20b7bc0",
-   "sha256": "1xz5yzgjz2i3bdv6vqij527z5hxxsmm4ga033rdyphfip8ls55ji"
+   "commit": "5eb0423d4b7083cb330a73ef1cfd3e0dd8538567",
+   "sha256": "0vk2d59jvzhdm47w4kcn58njps444i0350lp5z7dnzhaag10dwc0"
   },
   "stable": {
    "version": [
@@ -61000,6 +61703,21 @@
    "sha256": "14i06i999wfpr0a0lvhnh6g4mm5xmawscjd9d7ibc055h94h3i2a"
   }
  },
+ {
+  "ename": "mini-frame",
+  "commit": "2a10ea61ac4a3c8fa800f4107f256fa3ac5907f2",
+  "sha256": "06zv8qmbvzqzinmb5zcd40a43kmmq7mby6dgacpq81cg5azyfkr7",
+  "fetcher": "github",
+  "repo": "muffinmad/emacs-mini-frame",
+  "unstable": {
+   "version": [
+    20200327,
+    2218
+   ],
+   "commit": "30000e659b0ad2501591343b4818e5877783483b",
+   "sha256": "07b4903i3h91rjdixqsyhfclwg936n538bpiglay9r2klaa6kjp1"
+  }
+ },
  {
   "ename": "mini-header-line",
   "commit": "122db5436ff9061713c0d3d8f44c47494067843e",
@@ -61023,14 +61741,14 @@
   "repo": "kiennq/emacs-mini-modeline",
   "unstable": {
    "version": [
-    20200309,
-    413
+    20200319,
+    526
    ],
    "deps": [
     "dash"
    ],
-   "commit": "4d97bf35cf0f9d58b14d13a78172c15463820382",
-   "sha256": "0cqzqrc8wpxav08fx9n1ljpzf97hj3wdhizywj4avnyxj3g63zwi"
+   "commit": "efe3f9743004d7989ea3b82d2bc71960e990bdc0",
+   "sha256": "0wy52ixj16029xk5grh1531afdcmpfi25iacl9bhplsrivzjl7hf"
   },
   "stable": {
    "version": [
@@ -61321,20 +62039,20 @@
   "repo": "jabranham/mixed-pitch",
   "unstable": {
    "version": [
-    20200310,
-    130
+    20200321,
+    1331
    ],
-   "commit": "60907165f118648d658572c578f9fd642bd42beb",
-   "sha256": "0icflm968n89p6kayy8rxm5sll4pxqlnk5pfqq648y3zg273lfk6"
+   "commit": "734fbdf2d2c17beee151faf39bd10174a87eea5d",
+   "sha256": "1i0yd7akkyqhkd8g2g793n6syiy0mbnlq9apg7p1s4xycmwxx684"
   },
   "stable": {
    "version": [
     1,
-    0,
-    1
+    1,
+    0
    ],
-   "commit": "15bb9ec6d8be0812a46917205be6c3a1c78f68ff",
-   "sha256": "1458sy5b6bis1i0k23jdqk6hfqg0ghk637r3ajql2g19ym48rf58"
+   "commit": "734fbdf2d2c17beee151faf39bd10174a87eea5d",
+   "sha256": "1i0yd7akkyqhkd8g2g793n6syiy0mbnlq9apg7p1s4xycmwxx684"
   }
  },
  {
@@ -61355,6 +62073,21 @@
    "sha256": "1d08i2cfn1q446nyyji0hi9vlw7bzkpxhn6653jz2k77vd2y0wmk"
   }
  },
+ {
+  "ename": "mlso-theme",
+  "commit": "2e026e2511ead77022cf8ed9d45d0d5a5aa104b9",
+  "sha256": "1abv6zhz28x5yk0rjn19wjxwvdq0ps3j2sx45n0dlbqfrqgw86d1",
+  "fetcher": "github",
+  "repo": "Mulling/mlso-theme",
+  "unstable": {
+   "version": [
+    20200329,
+    1516
+   ],
+   "commit": "a4bb7b55ce81d8dcc0ad8d92acbde309c7cc1ea0",
+   "sha256": "15fmzsf5rpgx5f1fr45j24hgzmz95zxkj1jihdb64p049ak2h5a9"
+  }
+ },
  {
   "ename": "mmm-jinja2",
   "commit": "721b9a6f16fb8efd4d339ac7953cc07d7a234b53",
@@ -61697,6 +62430,29 @@
    "sha256": "0jg5yix4c18gvy5n4wsi7zg2sb7r0bw0xlmq0w15g3z63nhy69vc"
   }
  },
+ {
+  "ename": "modern-fringes",
+  "commit": "c765214f003426ac7a0e98c5764b14dd61ccce52",
+  "sha256": "0acp18v97k2iahbd5kp240g46wqdmrk4ddrsgvckzm0chsmjmm8q",
+  "fetcher": "github",
+  "repo": "specialbomb/emacs-modern-fringes",
+  "unstable": {
+   "version": [
+    20200321,
+    1817
+   ],
+   "commit": "108daba8407dc8acf140157e7f49137c397a0af7",
+   "sha256": "15370yw3147fzx8ly1svk7xvm0l9fg2gbzd8sx9ls93nyml7c5k7"
+  },
+  "stable": {
+   "version": [
+    4,
+    4
+   ],
+   "commit": "6884dd16e4d76dedd792f0c5fed48ca8a2f11222",
+   "sha256": "10h5557sppi41pgbbjsffc9n67h8ja28skhdlklc0n6zap71m87s"
+  }
+ },
  {
   "ename": "modtime-skip-mode",
   "commit": "486a675ca4898f99133bc18202e123fb58af54c0",
@@ -61720,20 +62476,20 @@
   "repo": "protesilaos/modus-themes",
   "unstable": {
    "version": [
-    20200315,
-    841
+    20200330,
+    706
    ],
-   "commit": "856626de1662986d582b7d264f5415c10657463b",
-   "sha256": "1ynj2ay0r99rjxnh1fmz81gygfi5kxfgflvd1x1rb2lapb8p7k8k"
+   "commit": "cedb331001d0623eb003591b2f650b8e5e4069ed",
+   "sha256": "0nw3jlx2h9127y9b8mmyrps9jyvr33yz2dr9q33j9fll1b8wapn0"
   },
   "stable": {
    "version": [
     0,
-    6,
+    7,
     0
    ],
-   "commit": "a9d1ae86522f158eea2410571ec992775e04b284",
-   "sha256": "15z6qq0b0npp7hscmh04i3mi10bynzdy52fv2b160nji264zvcwa"
+   "commit": "cedb331001d0623eb003591b2f650b8e5e4069ed",
+   "sha256": "0nw3jlx2h9127y9b8mmyrps9jyvr33yz2dr9q33j9fll1b8wapn0"
   }
  },
  {
@@ -61744,20 +62500,20 @@
   "repo": "protesilaos/modus-themes",
   "unstable": {
    "version": [
-    20200315,
-    841
+    20200330,
+    706
    ],
-   "commit": "856626de1662986d582b7d264f5415c10657463b",
-   "sha256": "1ynj2ay0r99rjxnh1fmz81gygfi5kxfgflvd1x1rb2lapb8p7k8k"
+   "commit": "cedb331001d0623eb003591b2f650b8e5e4069ed",
+   "sha256": "0nw3jlx2h9127y9b8mmyrps9jyvr33yz2dr9q33j9fll1b8wapn0"
   },
   "stable": {
    "version": [
     0,
-    6,
+    7,
     0
    ],
-   "commit": "a9d1ae86522f158eea2410571ec992775e04b284",
-   "sha256": "15z6qq0b0npp7hscmh04i3mi10bynzdy52fv2b160nji264zvcwa"
+   "commit": "cedb331001d0623eb003591b2f650b8e5e4069ed",
+   "sha256": "0nw3jlx2h9127y9b8mmyrps9jyvr33yz2dr9q33j9fll1b8wapn0"
   }
  },
  {
@@ -61920,11 +62676,11 @@
   "repo": "belak/emacs-monokai-pro-theme",
   "unstable": {
    "version": [
-    20191115,
-    714
+    20200318,
+    830
    ],
-   "commit": "622e3a7203907978ce0d2409e3df2d65c63ce938",
-   "sha256": "08gl9wcr4xi1v8750j2bqvn0szv2iifi3y8ay9c9lscqax9knx83"
+   "commit": "90f34d48baad78a86f60eb3fae902c545bb82505",
+   "sha256": "0sjxyvv16jm2xss6kxiankn9n92z52l20p2mkv95p2bd47mxn5iw"
   }
  },
  {
@@ -61935,11 +62691,11 @@
   "repo": "oneKelvinSmith/monokai-emacs",
   "unstable": {
    "version": [
-    20190801,
-    1701
+    20200329,
+    49
    ],
-   "commit": "e407f51d34b0c30cfe9d815f80a0c3539b998b08",
-   "sha256": "0psz6z59v0fdl846vaydqrhmy4swxcvz6swa523rcpjxlp3w2vyq"
+   "commit": "1b937eab15326b3b2e4183229a01376c30e6781c",
+   "sha256": "0c2sfzxag01w2n61xy02aw2hwv7k1nm64iwbjyf0rsqcq0m64pz8"
   },
   "stable": {
    "version": [
@@ -62559,16 +63315,16 @@
   "repo": "kljohann/mpv.el",
   "unstable": {
    "version": [
-    20180602,
-    1014
+    20200315,
+    2158
    ],
    "deps": [
     "cl-lib",
     "json",
     "org"
    ],
-   "commit": "9dedf3b7c1bfd778284df7f394207ce0447ea7aa",
-   "sha256": "15z62wi47pwvkbh4qgvz06yk4cyy570pjz1276sd9frdwgd4kc19"
+   "commit": "2d40c4550558eb1bf35a69446777c4e9cae7a623",
+   "sha256": "0f9iq83dfj73gbx7zndvh32b102582lzv4xb8gvqjs26k5bywdxj"
   },
   "stable": {
    "version": [
@@ -62631,6 +63387,21 @@
    "sha256": "1ci1w4yma6axiigz55b2ip0r7zy8v215532jc0rkb3wyn14nsrh7"
   }
  },
+ {
+  "ename": "msgpack",
+  "commit": "773cb12f9aef4ad45179cb7dd07275d886907836",
+  "sha256": "1vcbngsr0xpqy00g837p2awkin82s145ksh223c1msszwwwgdx5m",
+  "fetcher": "github",
+  "repo": "xuchunyang/msgpack.el",
+  "unstable": {
+   "version": [
+    20200323,
+    515
+   ],
+   "commit": "90e3086f259549b1667a3c5b9aa2d70aaeaa4d3d",
+   "sha256": "0g9a59x7xjf1p2swbi3v8bawdwkqliw3kcg70bca5dgg2jxgd4z6"
+  }
+ },
  {
   "ename": "msvc",
   "commit": "69939b85353a23f374cab996ede879ab315a323b",
@@ -62714,11 +63485,11 @@
   "repo": "cdominik/mu2tex",
   "unstable": {
    "version": [
-    20190520,
-    503
+    20200329,
+    758
    ],
-   "commit": "9467076ee4115d7fc19abaeadecc603e9115bf8d",
-   "sha256": "1acyynjrr5pxn15g59hd3cq1yvx989ks1b79g1kmhb1cqfpz58b8"
+   "commit": "536a7a0db4ddbdb30a16fdd56c79b78c9b50d865",
+   "sha256": "18s4mks7yxbxlhdkn9s2bgxyl14rv7ds7n6c7g3pzjd94j404b64"
   }
  },
  {
@@ -63801,6 +64572,21 @@
    "sha256": "1dyc50a1zskx9fqxl2iy2x74f3bkb2ccz908v0aj13rqfqqnns9j"
   }
  },
+ {
+  "ename": "native-complete",
+  "commit": "abc5469b4400ed05192dcfd6c00504768f05292e",
+  "sha256": "0y1zqmd34jswfw5fi3j6n0d9dhpvl14x3h5nfl6wmxj2g8vv4gns",
+  "fetcher": "github",
+  "repo": "CeleritasCelery/emacs-native-shell-complete",
+  "unstable": {
+   "version": [
+    20200321,
+    2300
+   ],
+   "commit": "11803df3706fb23d58e418a14ce981204a64e847",
+   "sha256": "0maljdxigd4fvrm7pv3ssyywl3c1zhfpqdymq933iig7d2hrwxm1"
+  }
+ },
  {
   "ename": "nav",
   "commit": "0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f",
@@ -63954,11 +64740,11 @@
   "repo": "nickav/naysayer-theme.el",
   "unstable": {
    "version": [
-    20191207,
-    1936
+    20200326,
+    1937
    ],
-   "commit": "22ac2901c7dfbc73f802f6280621fa4e2f92ff78",
-   "sha256": "1n6c43l0c8csagsajc7ibg4395qmigfvhsprba0xgqm95pl7whd9"
+   "commit": "e4d80cb70324a45102075ea923af454a563e9133",
+   "sha256": "0kxlbvpszb0lrj5dzfmzc1iaxgvhcjwq4hwykif22mkgdigxppx3"
   }
  },
  {
@@ -64026,8 +64812,8 @@
     20161029,
     2023
    ],
-   "commit": "7c63573fe66897b089963e9831546e5de7787c5a",
-   "sha256": "15cwfma9cq8i9x8cpaanzjgszddgvxbkn9q5aci0nnvl6nggqzpn"
+   "commit": "ae60dc55822ea1715b203775179080c5d62700d8",
+   "sha256": "0q46r9r2vc50vn3bh321l317lgbbmmbylhgbxllbjpyaidfqzvb9"
   },
   "stable": {
    "version": [
@@ -64070,14 +64856,14 @@
   "repo": "jaypei/emacs-neotree",
   "unstable": {
    "version": [
-    20181121,
-    2026
+    20200324,
+    1946
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "c2420a4b344a9337760981c451783f0ff9df8bbf",
-   "sha256": "1wfx37kvsfwrql8zs2739nx7wb51m26vwlcz1jygbrb62n6wq14k"
+   "commit": "98fe21334affaffe2334bf7c987edaf1980d2d0b",
+   "sha256": "1m4d5l48k1frbkspk6wlzhbjn133bj7spp5chlgv8p4p9rpnc2zr"
   },
   "stable": {
    "version": [
@@ -64429,8 +65215,8 @@
     20181024,
     1439
    ],
-   "commit": "1f3cc7b7207309c441ce5bf120b57081bbea0c18",
-   "sha256": "1y19f8qqd5bvkrpr3b8d18ff8qdi4j0fgha4dkb7zgjhi0rb9nb7"
+   "commit": "8900fa55b56ba1e2f83b3f3ba2a1b336c97e5dc3",
+   "sha256": "0x6l5r5i1q7pbvziynbvb395q8rihkr1zyhp4xzw35xn55qyskiy"
   },
   "stable": {
    "version": [
@@ -64605,6 +65391,35 @@
    "sha256": "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld"
   }
  },
+ {
+  "ename": "nixpkgs-fmt",
+  "commit": "36f9451ad54c787f9e94bfda0e71de99da94be34",
+  "sha256": "1j9k4r25iylmrg0hbjb8jamrci3jxyrpx2baawmcyhqgxiz3lcz8",
+  "fetcher": "github",
+  "repo": "purcell/emacs-nixpkgs-fmt",
+  "unstable": {
+   "version": [
+    20200327,
+    2302
+   ],
+   "deps": [
+    "reformatter"
+   ],
+   "commit": "cc8ee143d4ef45a8c540901852326ccdf6ff8482",
+   "sha256": "0a1ih8w8xk8rdd96k7236v6xh2xr1r6gaiv2b6js95k04igdqxnh"
+  },
+  "stable": {
+   "version": [
+    0,
+    1
+   ],
+   "deps": [
+    "reformatter"
+   ],
+   "commit": "83e03d6f20bdf79c1c448c15734367b1a7cc6b02",
+   "sha256": "0hw0m4a637w1fm47snywn0mxz09qa5diy4hqngbqf7gxfj6hmfnz"
+  }
+ },
  {
   "ename": "nlinum-hl",
   "commit": "b13a886535a5c33fe389a6b616988b7377249625",
@@ -64683,8 +65498,8 @@
   "repo": "dickmao/nndiscourse",
   "unstable": {
    "version": [
-    20200309,
-    242
+    20200315,
+    2046
    ],
    "deps": [
     "anaphora",
@@ -64693,8 +65508,8 @@
     "json-rpc",
     "rbenv"
    ],
-   "commit": "6cf4c73e8144b5eb6708fd5f35245f81389e7859",
-   "sha256": "0l16ql64741m6wkhf691639d17066gizq02s8vnpxqif10zsgaap"
+   "commit": "280ac4943af307e6fe8d43a350c663c18c9c7ea8",
+   "sha256": "11ncy09y4lbivsp72l1lbg45ahqhgdzn56p9j4dxkczv5pnsg6p1"
   }
  },
  {
@@ -64705,8 +65520,8 @@
   "repo": "dickmao/nnhackernews",
   "unstable": {
    "version": [
-    20200310,
-    855
+    20200323,
+    1803
    ],
    "deps": [
     "anaphora",
@@ -64714,8 +65529,8 @@
     "dash-functional",
     "request"
    ],
-   "commit": "ac896a7becd1dcfded728a36ce13cf7dcd823e04",
-   "sha256": "02gv1kc46aa7sbalh02sphaq50kgi055803cnxjbjvlqhlmwc2cw"
+   "commit": "ab0db2b7e76efa8efc72c0f587a33da1f0dc9905",
+   "sha256": "10scn7y0v0hirwlckwxb8cr98qmdl0r6c605qdh8jigmcp4c782j"
   }
  },
  {
@@ -64741,8 +65556,8 @@
   "repo": "dickmao/nnreddit",
   "unstable": {
    "version": [
-    20200301,
-    1930
+    20200327,
+    413
    ],
    "deps": [
     "anaphora",
@@ -64751,8 +65566,8 @@
     "request",
     "virtualenvwrapper"
    ],
-   "commit": "a7e6a3b93949da0a1cf91318ce8bd8cf5cfb2216",
-   "sha256": "0mcj4bdzhin9ibp3m6rrhqh54a2n07ck25djka3apqyd16dvx2y2"
+   "commit": "ccba00ddd62f06e9f085f7f58532b961369d1677",
+   "sha256": "0fkcp3masas1sdrhp27c017b4r2gw2gp65lcjkvcfck2k9hnypip"
   }
  },
  {
@@ -64778,14 +65593,14 @@
   "repo": "emacscollective/no-littering",
   "unstable": {
    "version": [
-    20200309,
-    533
+    20200328,
+    1359
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "05ef102cffd2f32061eacf2d379663122257f5b1",
-   "sha256": "0c75arxqb8p3bp1nasfcwy32al4ys3jv68q48dnc2addvjmld42g"
+   "commit": "92661bc9b33af1e9d405d23f226c1fc80c0c9c01",
+   "sha256": "1c1zrfnzr7vh4fsrzyr1ivsf07ydxyr4v1776z2xv9bynvwb6lhz"
   },
   "stable": {
    "version": [
@@ -64914,11 +65729,11 @@
   "repo": "abicky/nodejs-repl.el",
   "unstable": {
    "version": [
-    20200223,
-    1449
+    20200320,
+    1645
    ],
-   "commit": "ed2052522d1770cc951863000f96165e0c42ec7b",
-   "sha256": "0a5mmg3cmdi73giblp07ksl06xzl9nb2m3f96ny4r3rv0ar3v1bx"
+   "commit": "6fad7d764fa0d818ba497450bd722ae10cb8efed",
+   "sha256": "0saky39n0p8w7lmalg3j4da0crrx40yz0rz1zdjzwpd2bd9v2izg"
   },
   "stable": {
    "version": [
@@ -65046,8 +65861,8 @@
    "deps": [
     "colorless-themes"
    ],
-   "commit": "a7b7c0a32b174988f40378996cd8997f73524f19",
-   "sha256": "0khsf4xz0wjn774hy08pxafm79j55ns28q25pfzyj9s07hi4r0vz"
+   "commit": "2b4c341640c8191a39e4bc28d6cd04c7d6dcbb37",
+   "sha256": "0ni9cnrv464fk840i1ll241kzkiy1zc6nfrbdv3ciixxdxbshxbn"
   },
   "stable": {
    "version": [
@@ -65099,11 +65914,11 @@
   "url": "https://git.notmuchmail.org/git/notmuch",
   "unstable": {
    "version": [
-    20200109,
-    114
+    20200323,
+    121
    ],
-   "commit": "018ad3703ba46ea603854f51f8ff5ae86183cca0",
-   "sha256": "0vr17rhc74cf8k1n1snnfb82rzpsfc9xxcb8y2ydi0pbwd2h87r6"
+   "commit": "1fcf068e331b9b79e14f79c8b126711fc3d72cbb",
+   "sha256": "1pf9xds5csw6vwkb4b15isrw29psdifx8gl8y61la7d1k7b6m517"
   },
   "stable": {
    "version": [
@@ -65123,15 +65938,15 @@
   "repo": "publicimageltd/notmuch-bookmarks",
   "unstable": {
    "version": [
-    20200105,
-    1041
+    20200322,
+    1925
    ],
    "deps": [
     "notmuch",
     "seq"
    ],
-   "commit": "28a8e58521b50bfe0944f74eb2945521e03daad3",
-   "sha256": "0ma8rmxcq0xh1gskzyc8ay5681nidc340ghjryic3g30njidbiwd"
+   "commit": "ec8edfdbd1ac475530591d73a570ded5c18ed86a",
+   "sha256": "01bhxvjsmgxvh08r80lzlyj0wk1izx5bq22w6zsdzvxiclgrzk16"
   },
   "stable": {
    "version": [
@@ -65245,6 +66060,24 @@
    "sha256": "00h6nwbx2l0rp2i7n0328w6ckp4gkspqk3q91ciixb4lkhh20cz2"
   }
  },
+ {
+  "ename": "npm",
+  "commit": "012ca672c63711197c98eded098b1d1a9a24fd51",
+  "sha256": "0zi4c5a8cn03i6jdranak586s580bw772vazslxa3zs1y3xripir",
+  "fetcher": "github",
+  "repo": "shaneikennedy/npm.el",
+  "unstable": {
+   "version": [
+    20200329,
+    1904
+   ],
+   "deps": [
+    "transient"
+   ],
+   "commit": "2201ab1d9d424146c725d5e9ad24cc8e0219ba95",
+   "sha256": "18bm31f6zaskyncn97mfwxdih6b31jpm8v858m920i5j45gh78r5"
+  }
+ },
  {
   "ename": "npm-mode",
   "commit": "22dd6b2f8a94f56a61f4b70bd7e44b1bcf96eb18",
@@ -66176,11 +67009,11 @@
   "repo": "arnm/ob-mermaid",
   "unstable": {
    "version": [
-    20200311,
-    2111
+    20200320,
+    1504
    ],
-   "commit": "06ca38e963475542dbf48e416a820c21e1441f28",
-   "sha256": "12g221bcw04gzq7w60j2i2yhqxpy783b5zp38xdyqg34hnk0p1ji"
+   "commit": "cca09b64eff689d8bb15a77de9d4c7fe9845a1f9",
+   "sha256": "1wwmf14df2rnxlfs8bwb9p4q1a1plschbq2g9vqflphj6kv213m4"
   }
  },
  {
@@ -66275,14 +67108,14 @@
   "repo": "alf/ob-restclient.el",
   "unstable": {
    "version": [
-    20200109,
-    730
+    20200316,
+    759
    ],
    "deps": [
     "restclient"
    ],
-   "commit": "c5c22e603531dca48575d0a425fddff16dc0f391",
-   "sha256": "19fs6ms6rj75w4v7p7z0k2004gnb246nksv20mb8cqjnzkj0495s"
+   "commit": "f7449b2068498fe9d8ab9589e0a638148861533f",
+   "sha256": "0s3931w9ab3yfml2pmq71rw21yf6hpg7m3vihxyy3vs6zli1cvmq"
   }
  },
  {
@@ -66743,10 +67576,10 @@
  },
  {
   "ename": "octicons",
-  "commit": "c62867eae1a254eb5fe820d4387dd4e8a0ff9be2",
-  "sha256": "02f37bvnc5qvkvfbyx5wp54nz71bqm747mq1p5361sx091lllkxk",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "0p66i8i2ksqld3bd0iq7f7ssskj1hp42s170q74crh3ilapjnkpq",
   "fetcher": "github",
-  "repo": "syohex/emacs-octicons",
+  "repo": "emacsorphanage/octicons",
   "unstable": {
    "version": [
     20151101,
@@ -66808,26 +67641,20 @@
   "repo": "oer/oer-reveal",
   "unstable": {
    "version": [
-    20200313,
-    842
+    20200325,
+    946
    ],
-   "deps": [
-    "org-re-reveal"
-   ],
-   "commit": "8351748a2f79fbf67cea1f1f6a245c4bfef12c9b",
-   "sha256": "1sfjrpd0vn1dgnjgkhg48wvfwr5nfiavddws2jxj6nrzj2jdga6l"
+   "commit": "5f22947a41780a59dab7252ef1e3d510e6e2b28a",
+   "sha256": "1y84lidg5jiix7ap46jakqn3y9x1gzdlnv5473r3qv3cxzaf7l2n"
   },
   "stable": {
    "version": [
     2,
-    5,
-    0
+    7,
+    2
    ],
-   "deps": [
-    "org-re-reveal"
-   ],
-   "commit": "8351748a2f79fbf67cea1f1f6a245c4bfef12c9b",
-   "sha256": "1sfjrpd0vn1dgnjgkhg48wvfwr5nfiavddws2jxj6nrzj2jdga6l"
+   "commit": "5f22947a41780a59dab7252ef1e3d510e6e2b28a",
+   "sha256": "1y84lidg5jiix7ap46jakqn3y9x1gzdlnv5473r3qv3cxzaf7l2n"
   }
  },
  {
@@ -66890,11 +67717,11 @@
   "repo": "rnkn/olivetti",
   "unstable": {
    "version": [
-    20200311,
-    527
+    20200320,
+    1154
    ],
-   "commit": "67e32a7754cda4c8d94227e80bfa708abb4e8e6d",
-   "sha256": "0928kn9yfwc2mhmja13y39iswlkk474xnszh9qza206j6r37h6p3"
+   "commit": "5dc27716c706166e1932f4a0e9f94384b6d17cb0",
+   "sha256": "0im6ds8mvnwfrh3z0cd05g32w9rklhl56xmhzl9i2180pv6qwil8"
   },
   "stable": {
    "version": [
@@ -67745,30 +68572,29 @@
   "repo": "Kungsgeten/org-brain",
   "unstable": {
    "version": [
-    20200229,
-    2229
+    20200328,
+    1700
    ],
    "deps": [
-    "org",
-    "org-ql"
+    "org"
    ],
-   "commit": "6b7fced8015387efd03f28e53be47c3ca8907d7f",
-   "sha256": "01s8cjgxfl5pplswy80qgxisiv7p1kmbq28g3xx1qn2w7pfiyfwa"
+   "commit": "ec4bd9dd290459657426bb06e78f666ac0310420",
+   "sha256": "18937fm3np1ngxc1rmjsg0mzrf7jr56gd87ygsi84y5cmw4j08zb"
   }
  },
  {
   "ename": "org-bullets",
-  "commit": "fe60fc3c60d87b5fd7aa24e858c79753d5f7d2f6",
-  "sha256": "0yrfgd6r71rng3qipp3y9i5mpm6510k4xsfgyidcn25v27fysk3v",
+  "commit": "aa0e1ebac172a73bfed7d55cb4d9eb52178dcbdc",
+  "sha256": "0jcqgp23wgzdmw7il8phwiqdndwyjc7lcc27mk8rfip4ngp3wiyn",
   "fetcher": "github",
-  "repo": "emacsorphanage/org-bullets",
+  "repo": "integral-dw/org-bullets",
   "unstable": {
    "version": [
-    20190802,
-    927
+    20200317,
+    1740
    ],
-   "commit": "c19b13be00df8d8dc596e4f1aef4a094b08ac801",
-   "sha256": "1rvhinwnz660mfz4wkr2wa51ss5cm4gzpwfvwc0s0srk14s2h66h"
+   "commit": "767f55feb58b840a5a04eabfc3fbbf0d257c4792",
+   "sha256": "01ll5b39wpx9qpqybndy58wkq97n512rg7j87482l1ry1s5b02d5"
   },
   "stable": {
    "version": [
@@ -67821,13 +68647,13 @@
   "repo": "IvanMalison/org-projectile",
   "unstable": {
    "version": [
-    20180601,
-    242
+    20200329,
+    313
    ],
    "deps": [
     "org"
    ],
-   "commit": "de37d0094791ab1146276904f3a37eba699e0b60",
+   "commit": "96a57a43555e24e5e0d81e79f0fbb47001c41bac",
    "sha256": "05h9scvnd9ggfwbbl1m124k6sdn5kp9mv2695cril2m4dkr1kyqz"
   },
   "stable": {
@@ -67934,11 +68760,11 @@
   "repo": "justintaft/org-clock-split",
   "unstable": {
    "version": [
-    20191219,
-    457
+    20200315,
+    1716
    ],
-   "commit": "361a7a96af2a7d09ccaf561423b80caca7a108cb",
-   "sha256": "00k7av97l609rf31zqndy92ypbdyvwnr0bdpxfisw33icw7706nb"
+   "commit": "322379f1bf08c74c034c5c86d8a3045675ee64ac",
+   "sha256": "0nigylzzxwm4wn8zp5vyrj4y41czcpkvglvy3p4dqn35agklz5mw"
   }
  },
  {
@@ -68539,20 +69365,20 @@
   "repo": "marcIhm/org-index",
   "unstable": {
    "version": [
-    20200314,
-    1732
+    20200323,
+    1404
    ],
-   "commit": "6de86372d46ca9639f22fe05eaadc0cbec58f5bc",
-   "sha256": "1h4lh9cfz6808wmmhq5xad6a37i145i5ifb84gygcpdx6g7xzjha"
+   "commit": "601435b3aeff1b2c00f62deb39adf9b351e9b567",
+   "sha256": "0v6r78zcvzhj2wgaz22ddpbhjpggiii5j54hl12m02rpbqv0m524"
   },
   "stable": {
    "version": [
     6,
     1,
-    1
+    2
    ],
-   "commit": "6de86372d46ca9639f22fe05eaadc0cbec58f5bc",
-   "sha256": "1h4lh9cfz6808wmmhq5xad6a37i145i5ifb84gygcpdx6g7xzjha"
+   "commit": "601435b3aeff1b2c00f62deb39adf9b351e9b567",
+   "sha256": "0v6r78zcvzhj2wgaz22ddpbhjpggiii5j54hl12m02rpbqv0m524"
   }
  },
  {
@@ -68657,16 +69483,16 @@
   "repo": "gizmomogwai/org-kanban",
   "unstable": {
    "version": [
-    20200126,
-    1158
+    20200329,
+    543
    ],
    "deps": [
     "dash",
     "org",
     "s"
    ],
-   "commit": "4e352ca1a0b712fc92f656b4fe436a04c7033a20",
-   "sha256": "0smjn7jmg5w9nwjp0qadl0sx6r78ycaqm8y3a2wm6slmdad2p1jb"
+   "commit": "544aac80f1c7113cfe42cf1a2b89f5ca6bd9ead6",
+   "sha256": "0sx4mvr5g2ipj1s1jg82vr1q90jkq9lm0pg5cdab8lrx464lqf2c"
   },
   "stable": {
    "version": [
@@ -68810,14 +69636,14 @@
   "repo": "org-mime/org-mime",
   "unstable": {
    "version": [
-    20191226,
-    2309
+    20200323,
+    130
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "b1899762170eaa656555ce62c58e613ca3509ec4",
-   "sha256": "1p3ffxanjpb83xvk4c42lafhfbckh4rkmi32wjdp86fkqx30nvrg"
+   "commit": "778f818ad3d101f27786556c2a7a9995d5da47c6",
+   "sha256": "0w3yyqn225c5y0if5pjvvszpasrvh3rh4f0bqjabrvqvrhf1q8ny"
   },
   "stable": {
    "version": [
@@ -69167,6 +69993,26 @@
    "sha256": "0pqmnhd3qdg06agj6h8v8lm4m5q8px0qmd7a1bfn6i5g2bq9zrck"
   }
  },
+ {
+  "ename": "org-pdftools",
+  "commit": "62cf59d93b7b6700c4f7711e5fd22ece04896e6a",
+  "sha256": "0fqkq8hpcxzpj3irczkad78m3chadqk2895bdbj7xpdlr0803n32",
+  "fetcher": "github",
+  "repo": "fuxialexander/org-pdftools",
+  "unstable": {
+   "version": [
+    20200329,
+    1507
+   ],
+   "deps": [
+    "org",
+    "org-noter",
+    "pdf-tools"
+   ],
+   "commit": "96fe7275c75842732c3fd1527619088f66b6a80a",
+   "sha256": "1ri58hyksp4fhmm6323ndc1h3ljkxjgbzcp588h76fkpk19lzhq1"
+  }
+ },
  {
   "ename": "org-pdfview",
   "commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -69362,7 +70208,7 @@
     "projectile",
     "s"
    ],
-   "commit": "de37d0094791ab1146276904f3a37eba699e0b60",
+   "commit": "96a57a43555e24e5e0d81e79f0fbb47001c41bac",
    "sha256": "05h9scvnd9ggfwbbl1m124k6sdn5kp9mv2695cril2m4dkr1kyqz"
   },
   "stable": {
@@ -69396,7 +70242,7 @@
     "helm",
     "org-projectile"
    ],
-   "commit": "de37d0094791ab1146276904f3a37eba699e0b60",
+   "commit": "96a57a43555e24e5e0d81e79f0fbb47001c41bac",
    "sha256": "05h9scvnd9ggfwbbl1m124k6sdn5kp9mv2695cril2m4dkr1kyqz"
   },
   "stable": {
@@ -69447,8 +70293,8 @@
   "repo": "alphapapa/org-ql",
   "unstable": {
    "version": [
-    20200314,
-    1908
+    20200315,
+    2004
    ],
    "deps": [
     "dash",
@@ -69463,14 +70309,14 @@
     "transient",
     "ts"
    ],
-   "commit": "5bc4a4a825f5961d1a47b6f35bd3e458bb2546e2",
-   "sha256": "1drn82ajcdzjzaa3qsqp6y5f0ynanb7xcpa57lpw01j4isja5zkw"
+   "commit": "ab5e9aa9116010e5da1995bf19ff26f55b93c214",
+   "sha256": "0h90vagb91zskvmy06yq0b1vjbkqry0fkxiagg4d076rbx3ryc0n"
   },
   "stable": {
    "version": [
     0,
     4,
-    3
+    4
    ],
    "deps": [
     "dash",
@@ -69483,8 +70329,8 @@
     "s",
     "ts"
    ],
-   "commit": "ba7d4a2e82f134b8bb9976c81227ec795dde00d4",
-   "sha256": "01qgnasab82aakx1p2iyjc60qhs6wahlhhmyacwa4s41ki0nlha1"
+   "commit": "4fef5b089f8f77b0dc25dac5f096406156e90858",
+   "sha256": "065wkxd269v19r5s8g2haapwhwr3s6c5amwzshfl2hq5z0bldvqi"
   }
  },
  {
@@ -69766,26 +70612,26 @@
   "repo": "akirak/org-reverse-datetree",
   "unstable": {
    "version": [
-    20200224,
-    548
+    20200325,
+    1003
    ],
    "deps": [
     "dash"
    ],
-   "commit": "800e1094892be1b62087317bd7dbd6c2cdca07f2",
-   "sha256": "1rb9gc99jb1sbzc7hlc6yndaci1dfravjvnlix9wk9bix27g3vca"
+   "commit": "afac070eb64cc24917c0ab0e14686258da4916f6",
+   "sha256": "1737r8c5kpb68yb2sixp88fm7fcmr7rvpkpywyxzwgqk30xpsjgq"
   },
   "stable": {
    "version": [
     0,
     3,
-    1
+    2
    ],
    "deps": [
     "dash"
    ],
-   "commit": "6fad8d248acfd32c7b2347223c9326351f8cefd4",
-   "sha256": "08kwbc630ijmz7nzypzm6bcr3yzij47rhb3ih1hgq6z5pm5cla6v"
+   "commit": "cfb14dc77768ea901fe5a49662ae10ae3ccc7bde",
+   "sha256": "05qjj4zfm84s7lmlnq2nndmh76cpnhh62rybdiz2fjsj1ns0zjln"
   }
  },
  {
@@ -69827,6 +70673,46 @@
    "sha256": "0gxb0fnh5gxjmld0hnk5hli0cvdd8gjd27m30bk2b80kwldxlq1z"
   }
  },
+ {
+  "ename": "org-roam",
+  "commit": "278f993cf094b39b5d049f05e0cbba61e52a6f0c",
+  "sha256": "1m4nw1r8kdxigdvws5arqglamrx4g62v4p482flikk7w52gcs7is",
+  "fetcher": "github",
+  "repo": "jethrokuan/org-roam",
+  "unstable": {
+   "version": [
+    20200329,
+    1330
+   ],
+   "deps": [
+    "dash",
+    "emacsql",
+    "emacsql-sqlite",
+    "f",
+    "org",
+    "s"
+   ],
+   "commit": "b86d2c8637f5eafd587c4cf4fe85e7d0380844f4",
+   "sha256": "04i8i3dixf50vqp8jrwcbf4c8d7m47g9lyzj76h49jd8bv2fqang"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    0
+   ],
+   "deps": [
+    "dash",
+    "emacsql",
+    "emacsql-sqlite",
+    "f",
+    "org",
+    "s"
+   ],
+   "commit": "1433dbc31602c412914c71ecc81aa5dcf6b03daf",
+   "sha256": "08pfa63k194dpk0y2gfa0nzn5lig81q0l9axkq5j4ibj6ifaap4a"
+  }
+ },
  {
   "ename": "org-rtm",
   "commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -70051,20 +70937,20 @@
   "repo": "bastibe/org-static-blog",
   "unstable": {
    "version": [
-    20200117,
-    800
+    20200324,
+    747
    ],
-   "commit": "5c19300d7634e94ae813b1b66abc716fbb1e5fc9",
-   "sha256": "1m7vmibjc6yk2npfrnnqd3g2099300r0q8mr8cvyivmk5ailbfrh"
+   "commit": "635ec9901be9d03402dd3d4b11e71f07bf1cf6f9",
+   "sha256": "1fc0r53209igflfxm2dncpmdh8zncr40y1ylj1j2pcyrdlghqpvw"
   },
   "stable": {
    "version": [
     1,
-    2,
-    1
+    3,
+    0
    ],
-   "commit": "f69d2fd6671fb250fbd87df5efa898a7bf5b9bda",
-   "sha256": "1h9c96rbxxk1jypib5f9pfi5zkimkvhxi61j0sps6r39435dd3w7"
+   "commit": "afe250fc43cd1beffd7946b54692d712d9263ff2",
+   "sha256": "15iy3z8rglaqbx1fz14inh18ksgjsmq30b8hyv3lgjvcc9ssaiw0"
   }
  },
  {
@@ -70522,6 +71408,26 @@
    "sha256": "0aacxxwhwjzby0f9r4q0lra5lqcrw5snnm1yc63jrs6c0ifakk45"
   }
  },
+ {
+  "ename": "org-treescope",
+  "commit": "f824498a74dcf0b8130baf474841b240adfa07a7",
+  "sha256": "13j7xz9i11kga1s0yvdv3k54076llna8vnnp0v8ri5pgbdrmc20w",
+  "fetcher": "github",
+  "repo": "mtekman/org-treescope.el",
+  "unstable": {
+   "version": [
+    20200324,
+    1959
+   ],
+   "deps": [
+    "dash",
+    "org",
+    "org-ql"
+   ],
+   "commit": "cad2aa82e5ca73bd7afc31b7a5e764da5ab716c3",
+   "sha256": "1jsc39xmli54mcqcdddzyaphmhlamwq167vfr2g133c3p0wx8swh"
+  }
+ },
  {
   "ename": "org-trello",
   "commit": "188ed8dc1ce2704838f7a2883c41243598150a46",
@@ -70660,8 +71566,8 @@
   "repo": "akhramov/org-wild-notifier.el",
   "unstable": {
    "version": [
-    20191114,
-    1632
+    20200328,
+    1153
    ],
    "deps": [
     "alert",
@@ -70669,14 +71575,14 @@
     "dash",
     "dash-functional"
    ],
-   "commit": "713c5205869dde4d42127fd9365f5831ec222503",
-   "sha256": "0585v39lxrqnv4p2k2pcswmx14gvm6l17j05q30cssn5zqy8cv8a"
+   "commit": "4011d7f557da3ae5eee73c56ae514b963fb4d1c1",
+   "sha256": "0mr5qmrnz0mr6w7ib8bcdlqwhzwnxfbnd47zyg9i6lmh20p8qrns"
   },
   "stable": {
    "version": [
     0,
-    3,
-    2
+    4,
+    0
    ],
    "deps": [
     "alert",
@@ -70684,8 +71590,8 @@
     "dash",
     "dash-functional"
    ],
-   "commit": "f2ea8a719cf61742def57475400222a498256bb6",
-   "sha256": "0wrr52bryvv1aj2fk5ik71iifh15bzmvrw1ixzs1afcdp2fn0bcm"
+   "commit": "4011d7f557da3ae5eee73c56ae514b963fb4d1c1",
+   "sha256": "0mr5qmrnz0mr6w7ib8bcdlqwhzwnxfbnd47zyg9i6lmh20p8qrns"
   }
  },
  {
@@ -70741,8 +71647,8 @@
   "repo": "org2blog/org2blog",
   "unstable": {
    "version": [
-    20200303,
-    418
+    20200317,
+    2136
    ],
    "deps": [
     "htmlize",
@@ -70750,8 +71656,8 @@
     "metaweblog",
     "xml-rpc"
    ],
-   "commit": "0177fc4e7edd705db59b82c83a24db51dc405890",
-   "sha256": "1whl7kz4im2jmdz99336wfn152q0l3qwii4w7sn45rlsm2sijiw1"
+   "commit": "821ed77f0982dfeb1df50380931d53e6b7b7036f",
+   "sha256": "16hrnfz4jp5a672rvgk6ky9xfzvgxx73p5l96wh3x9294vyjd4vi"
   },
   "stable": {
    "version": [
@@ -71194,8 +72100,8 @@
    "deps": [
     "reformatter"
    ],
-   "commit": "7b1905787de919e671cbd44360688678025c8395",
-   "sha256": "1l2wz4zk9x66cgnl5c6x3ajhz0cmmjmxvwzl1p3bnykygkndiwj6"
+   "commit": "5d991188b511e9d650c84fc578f2f49c9f995693",
+   "sha256": "1x5nx064cgcjj99xwp7drcvhfmmav1f72jnwwlxllhas2is458m0"
   }
  },
  {
@@ -71608,11 +72514,11 @@
   "repo": "emacsorphanage/ov",
   "unstable": {
    "version": [
-    20200124,
-    1842
+    20200326,
+    1042
    ],
-   "commit": "3b246691d5b728ef1f0164f0cefffe00c9554e64",
-   "sha256": "10synkwxz6kqldx97pc52falr7h7khq97gck5fqidijwzmvs7jb2"
+   "commit": "c5b9aa4e1b00d702eb2caedd61c69a22a5fa1fab",
+   "sha256": "1g3r4jsgvf713jazw0j5mcsbrw9shix9qrc683jm7dccwwrv5pcy"
   },
   "stable": {
    "version": [
@@ -71707,30 +72613,30 @@
   "repo": "aki2o/owdriver",
   "unstable": {
    "version": [
-    20170401,
-    1312
+    20200326,
+    1608
    ],
    "deps": [
     "log4e",
     "smartrep",
     "yaxception"
    ],
-   "commit": "d934f182bafe29aa16c173440eff3fef08b0ec10",
-   "sha256": "0yy5sah7vcjxcik3sp2cxp9gvcryyzw799h8zf4wbvjxv74kd17c"
+   "commit": "a243051365eb7ac0d1845c8b468b90510998f66e",
+   "sha256": "05a3s01y3sls6as28wvd1y5pmasqlz9k597yba10c0spxvlaijcn"
   },
   "stable": {
    "version": [
     0,
-    0,
-    6
+    1,
+    1
    ],
    "deps": [
     "log4e",
     "smartrep",
     "yaxception"
    ],
-   "commit": "0479389d9df9e70ff9ce69dff06252d3aa40fc86",
-   "sha256": "0f2psx4lq98l3q3fnibsfqxp2hvvwk7b30zjvjlry3bffg3l7pfk"
+   "commit": "a243051365eb7ac0d1845c8b468b90510998f66e",
+   "sha256": "05a3s01y3sls6as28wvd1y5pmasqlz9k597yba10c0spxvlaijcn"
   }
  },
  {
@@ -72038,11 +72944,14 @@
   "repo": "linktohack/ox-latex-subfigure",
   "unstable": {
    "version": [
-    20200113,
-    1029
+    20200326,
+    919
    ],
-   "commit": "18bcee0c89c19da847f38660946a5b9343607cfb",
-   "sha256": "1hpwsx3cba6kk2n954h144pb1ba5yy46gcni8ikvsbqm8j17ragm"
+   "deps": [
+    "org"
+   ],
+   "commit": "be0a0dde62fde8cdf8d72b6968344906aa8c6f54",
+   "sha256": "1afikv50ii4xk9pkg4m6dx246bjnwka37lccif8i5r48hfy5w4bq"
   },
   "stable": {
    "version": [
@@ -72203,14 +73112,14 @@
   "repo": "yjwen/org-reveal",
   "unstable": {
    "version": [
-    20200304,
-    937
+    20200327,
+    1636
    ],
    "deps": [
     "org"
    ],
-   "commit": "0d947cbce655cadb035e3b5da0fa2af8c228d69b",
-   "sha256": "1sf8qdih1fbzhsyvkf8grmfsglvrgim0ww14ww01w9xnr02fkb0g"
+   "commit": "ea8b5021702d8f12aa5285fb2a8561ceaeb1332e",
+   "sha256": "1fppdz2r8zig6r1v1n82bxmxyn2f6i1rjv9qll4n866gahkknlkr"
   }
  },
  {
@@ -72966,11 +73875,11 @@
   "repo": "sebasmonia/panda",
   "unstable": {
    "version": [
-    20190907,
-    314
+    20200317,
+    1932
    ],
-   "commit": "5a3da498a8ab8a60cef3a3a5e8f3e14dea9992dd",
-   "sha256": "04fa2895vr0z6y1w1mkpxhzx2q323vl7r3hayxr0vldd8mz8m0lw"
+   "commit": "2a17e3e5c57132777cfef9704565f6bfa129dbe2",
+   "sha256": "02aysxdb660dh19l07g6h2qvckrrd4aj79lryd6h7j3in1s0sn05"
   }
  },
  {
@@ -73154,14 +74063,14 @@
   "repo": "ajgrf/parchment",
   "unstable": {
    "version": [
-    20200308,
-    1727
+    20200322,
+    1714
    ],
    "deps": [
     "autothemer"
    ],
-   "commit": "1aa8cd5e3673c1c55941afa61cbf7a7a45474078",
-   "sha256": "1s95d2pzivq52ci4disnfr95knh0kdr0jqi0br8c8zaxys3p43c8"
+   "commit": "bf158a064e4a00a47d24ed0c1725204ce6675064",
+   "sha256": "1vqvfxrwrlmnmp0bidagphajwlxs6kf480xajkpz590m0zf1xfp3"
   },
   "stable": {
    "version": [
@@ -73639,17 +74548,16 @@
   "repo": "zx2c4/password-store",
   "unstable": {
    "version": [
-    20190929,
-    1627
+    20200328,
+    1214
    ],
    "deps": [
     "auth-source-pass",
-    "f",
     "s",
     "with-editor"
    ],
-   "commit": "88936b11aff49e48f79842e4628c55620e0ad736",
-   "sha256": "0hjb0zh94mda4xq20srba40mh3iww3gg45w3vaqyvplxiw08hqrq"
+   "commit": "98193d3bbb3538eda457d0db4ccccbcc4b04ce3d",
+   "sha256": "133b2m49jd2bw0k5f77y8gc2w53vhp3rym5mzqx7mlfgssgd795k"
   },
   "stable": {
    "version": [
@@ -74589,25 +75497,25 @@
   "repo": "nex3/perspective-el",
   "unstable": {
    "version": [
-    20200313,
-    1842
+    20200326,
+    2358
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "0debeeb542b2b449ad6c2a7e36eeb8691f27ed5b",
-   "sha256": "11jfm3sxnvpwn69y8y3cayq9svpfm21ch01nv58fd5padshagz5n"
+   "commit": "2ac6aff0569923993a251beddb3046ec44841408",
+   "sha256": "1z05vk85zbq4pj1xs69p5x3hwdshl829y28d5j2ckivl313p4had"
   },
   "stable": {
    "version": [
     2,
-    5
+    6
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "21877375d718e57d5e10808f06f78ba0c4d420c8",
-   "sha256": "0a1s1ygxday0602xk5dg19v1wjmz8dm4ajiwiflvyhqas4wcv9j2"
+   "commit": "2ac6aff0569923993a251beddb3046ec44841408",
+   "sha256": "1z05vk85zbq4pj1xs69p5x3hwdshl829y28d5j2ckivl313p4had"
   }
  },
  {
@@ -74636,6 +75544,21 @@
    "sha256": "0mi7ipx0zg0vrm9da24i4j0300xj0dm3jjg35f466pm3a7xafrsg"
   }
  },
+ {
+  "ename": "pest-mode",
+  "commit": "d3145c38d53aa94c6ae33f2bc0cb804e246a8558",
+  "sha256": "0d89s1lqif6mdbm1fh6h1m4414sxa382rjyw3qqsm5iz2b5vf14p",
+  "fetcher": "github",
+  "repo": "ksqsf/pest-mode",
+  "unstable": {
+   "version": [
+    20200321,
+    504
+   ],
+   "commit": "4ae88a9c81d499bbe99978ff0216b645fed70023",
+   "sha256": "1zc7dmgp3s9q33wkvw6i7zzlcaa65ixx3hxb78m62lk2a7fzb3ih"
+  }
+ },
  {
   "ename": "pfuture",
   "commit": "5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8",
@@ -75056,11 +75979,11 @@
   "repo": "emacs-php/php-mode",
   "unstable": {
    "version": [
-    20200301,
-    1404
+    20200323,
+    1215
    ],
-   "commit": "547a31d71991e7bb1d9e5d1ce45b6be6e5740058",
-   "sha256": "1iwbh8cc3a5ayq1r6lv8jkx5hfa4yfz1rgzmvb2s08si9q3y5wna"
+   "commit": "b5d99881002e3c62ebe874ad9f48474afc16c62d",
+   "sha256": "0pq7nccmrbvrf7120d48aqymdwh5jgjvzwi2820hdw8j6b7prm4h"
   },
   "stable": {
    "version": [
@@ -75148,8 +76071,8 @@
   "repo": "emacs-php/phpactor.el",
   "unstable": {
    "version": [
-    20200121,
-    1218
+    20200324,
+    1347
    ],
    "deps": [
     "async",
@@ -75158,8 +76081,8 @@
     "f",
     "php-runtime"
    ],
-   "commit": "5ccf65d59e6bbc9cd958dd5988e8fd2143b0d57f",
-   "sha256": "0k4dzn4a5y4kq7yz3ifvzziv90rp5si380c5ypgxr5iwb1b8a0l3"
+   "commit": "31fe2ea4dbd5c2f23efd6a4ec2ec881a4ced6b05",
+   "sha256": "0j52n0vs85q7zz5xfqw4rgrjjpr7mzfiqbzk7vwkcdmpnax608w5"
   },
   "stable": {
    "version": [
@@ -75995,6 +76918,25 @@
    "sha256": "0g6d7z9sv7fdc918gay7rd71frzqn75mcwnljgmqksfh5890apa6"
   }
  },
+ {
+  "ename": "playonline",
+  "commit": "27d8ea9dac3637eed39a68308194b30c1672a8ca",
+  "sha256": "10shq955cz664r0j0yjfrnnbvzjpcyq638lm6hwkiia5xbvsdz88",
+  "fetcher": "github",
+  "repo": "twlz0ne/playonline.el",
+  "unstable": {
+   "version": [
+    20200317,
+    642
+   ],
+   "deps": [
+    "dash",
+    "request"
+   ],
+   "commit": "c75da1fdc1dfbd5d9aa274dc4e90ff631ea08e70",
+   "sha256": "0vkgzqdcxp4mlkz9z8p4307lbvjz51wpqhzpmyw4gwl079xc6gkq"
+  }
+ },
  {
   "ename": "plenv",
   "commit": "a0819979b9567ac5fab9ed6821eba8fe7ee6a299",
@@ -76368,15 +77310,15 @@
   "repo": "galaunay/poetry.el",
   "unstable": {
    "version": [
-    20200112,
-    2309
+    20200326,
+    1328
    ],
    "deps": [
     "pyvenv",
     "transient"
    ],
-   "commit": "01da45f478c8ace3dea5088746873ac2d7c23dbb",
-   "sha256": "08x1q54pnb3hh4a2wbmghffl5cnq99sf280qdbgc65vqhdkj8r1z"
+   "commit": "6dcc9d22cac6642a861770b5518398d8ee4fcc9a",
+   "sha256": "1za8s1k5ni11yqz64rz777lps400jnga151cca2f3l3xx2lcc2c7"
   },
   "stable": {
    "version": [
@@ -76472,20 +77414,21 @@
   "repo": "polymode/poly-R",
   "unstable": {
    "version": [
-    20190605,
-    2103
+    20200316,
+    1315
    ],
    "deps": [
     "poly-markdown",
     "poly-noweb",
     "polymode"
    ],
-   "commit": "0443c89b4d2bc2ed235a0c017109c2dbd342aa02",
-   "sha256": "1v5djxwgqksf84pxfpgbm7qaz3yq5ha7cac0792p62pj1ydzvghi"
+   "commit": "51ffeb6ec45dd44eafa4d22ad2d6150cc4b248fc",
+   "sha256": "0a4wx73jkngw5nbq1fa4jfhba6bsmyn6vnsf887x3xhb5v3ykhsg"
   },
   "stable": {
    "version": [
     0,
+    2,
     2
    ],
    "deps": [
@@ -76493,8 +77436,8 @@
     "poly-noweb",
     "polymode"
    ],
-   "commit": "0443c89b4d2bc2ed235a0c017109c2dbd342aa02",
-   "sha256": "1v5djxwgqksf84pxfpgbm7qaz3yq5ha7cac0792p62pj1ydzvghi"
+   "commit": "51ffeb6ec45dd44eafa4d22ad2d6150cc4b248fc",
+   "sha256": "0a4wx73jkngw5nbq1fa4jfhba6bsmyn6vnsf887x3xhb5v3ykhsg"
   }
  },
  {
@@ -76542,25 +77485,26 @@
   "repo": "polymode/poly-erb",
   "unstable": {
    "version": [
-    20190605,
-    2102
+    20200316,
+    1314
    ],
    "deps": [
     "polymode"
    ],
-   "commit": "304204f415b9e46ee36b64531b7d170540828335",
-   "sha256": "0v13ssv9fjardg5as832hkhlx7yhjcdkm3bdcdj0qy31cmvk6dzb"
+   "commit": "56c744b8d87d8cbe0aba2696d4e8525afc4aa0e8",
+   "sha256": "118x9qrays54n6ksnln51ps5c298zs8ih7k49mn6aq6lpvwy5wjr"
   },
   "stable": {
    "version": [
     0,
+    2,
     2
    ],
    "deps": [
     "polymode"
    ],
-   "commit": "304204f415b9e46ee36b64531b7d170540828335",
-   "sha256": "0v13ssv9fjardg5as832hkhlx7yhjcdkm3bdcdj0qy31cmvk6dzb"
+   "commit": "56c744b8d87d8cbe0aba2696d4e8525afc4aa0e8",
+   "sha256": "118x9qrays54n6ksnln51ps5c298zs8ih7k49mn6aq6lpvwy5wjr"
   }
  },
  {
@@ -76571,27 +77515,28 @@
   "repo": "polymode/poly-markdown",
   "unstable": {
    "version": [
-    20190916,
-    702
+    20200316,
+    1315
    ],
    "deps": [
     "markdown-mode",
     "polymode"
    ],
-   "commit": "a867e5e5689f1e1a5bab5db57c7d39bac2448bcb",
-   "sha256": "1mrmrwmrv6xsafhn7ys3y8nbdqgzhkrb2mm0gir63g03kd6bn793"
+   "commit": "1536cf0c32f71d5cd05c90f7905905e38006e95d",
+   "sha256": "1q4qq0ql08hxkdrd2aal03560k612my7bvnfpfij3g432hn0p7v6"
   },
   "stable": {
    "version": [
     0,
+    2,
     2
    ],
    "deps": [
     "markdown-mode",
     "polymode"
    ],
-   "commit": "b0de1a9f3e4d7191b1b23b65ebf03dd0ac007afc",
-   "sha256": "0b6wlmhrpcw9g8rbw7q7k5fr2lgcp1rpy7d9p9f0gzn52yvcr4dr"
+   "commit": "1536cf0c32f71d5cd05c90f7905905e38006e95d",
+   "sha256": "1q4qq0ql08hxkdrd2aal03560k612my7bvnfpfij3g432hn0p7v6"
   }
  },
  {
@@ -76602,25 +77547,26 @@
   "repo": "polymode/poly-noweb",
   "unstable": {
    "version": [
-    20190605,
-    2102
+    20200316,
+    1315
    ],
    "deps": [
     "polymode"
    ],
-   "commit": "4e65cb22d6bca901021205257f867f868989c665",
-   "sha256": "1pnjg615i5p9h5fppvn36vq2naz4r1mziwqjwwxka6kic5ng81h8"
+   "commit": "3b0cd36ca9a707e8a09337a3468fa85d81fc461c",
+   "sha256": "1jl5h4nf10xd2gdlsxi6h2n3z5zh26ffcixn68xfp5q4zl34zk8p"
   },
   "stable": {
    "version": [
     0,
+    2,
     2
    ],
    "deps": [
     "polymode"
    ],
-   "commit": "4e65cb22d6bca901021205257f867f868989c665",
-   "sha256": "1pnjg615i5p9h5fppvn36vq2naz4r1mziwqjwwxka6kic5ng81h8"
+   "commit": "3b0cd36ca9a707e8a09337a3468fa85d81fc461c",
+   "sha256": "1jl5h4nf10xd2gdlsxi6h2n3z5zh26ffcixn68xfp5q4zl34zk8p"
   }
  },
  {
@@ -76631,25 +77577,26 @@
   "repo": "polymode/poly-org",
   "unstable": {
    "version": [
-    20200304,
-    1057
+    20200316,
+    1315
    ],
    "deps": [
     "polymode"
    ],
-   "commit": "9f89c1f590f616e2cd93df4f441cd1e9818cc7ac",
-   "sha256": "0r5vlvz2kinblxnzpshxa6mww3al4kwj8gy19hzrq3gj9jpr4ymb"
+   "commit": "8f4d11489532be98a291258ca27405aa528fc126",
+   "sha256": "1srnwcsn2bh8gqzxixkhffk7gbnk66kd4dgvxbnps5nxqc6v0qhc"
   },
   "stable": {
    "version": [
     0,
+    2,
     2
    ],
    "deps": [
     "polymode"
    ],
-   "commit": "8b0de75b1f9b65c22f7e3fbc205c9408214c8a1f",
-   "sha256": "04x6apjad4kg30456z1j4ipp64yjgkcaim6hqr6bb0rmrianqhck"
+   "commit": "8f4d11489532be98a291258ca27405aa528fc126",
+   "sha256": "1srnwcsn2bh8gqzxixkhffk7gbnk66kd4dgvxbnps5nxqc6v0qhc"
   }
  },
  {
@@ -76660,25 +77607,26 @@
   "repo": "polymode/poly-rst",
   "unstable": {
    "version": [
-    20190605,
-    2103
+    20200316,
+    1315
    ],
    "deps": [
     "polymode"
    ],
-   "commit": "1a7d38e1c1d35cf64e4dad408db486a8e1931e61",
-   "sha256": "1xzbznm43hsvmg2ibqa6a1rymfy85nagjsxadn5mj9r04ivhf2fd"
+   "commit": "8530f56fbdce01bcf4004839ff54e4156282c2b5",
+   "sha256": "088wzagwxpf2j67wb1i6agqfa944sahh2fm8my2m50spbbd9ymhl"
   },
   "stable": {
    "version": [
     0,
+    2,
     2
    ],
    "deps": [
     "polymode"
    ],
-   "commit": "1a7d38e1c1d35cf64e4dad408db486a8e1931e61",
-   "sha256": "1xzbznm43hsvmg2ibqa6a1rymfy85nagjsxadn5mj9r04ivhf2fd"
+   "commit": "8530f56fbdce01bcf4004839ff54e4156282c2b5",
+   "sha256": "088wzagwxpf2j67wb1i6agqfa944sahh2fm8my2m50spbbd9ymhl"
   }
  },
  {
@@ -76719,27 +77667,28 @@
   "repo": "polymode/poly-slim",
   "unstable": {
    "version": [
-    20190605,
-    2103
+    20200316,
+    1316
    ],
    "deps": [
     "polymode",
     "slim-mode"
    ],
-   "commit": "a4fb8166d110b82eb3f1d0b4fc87045c3308bd7d",
-   "sha256": "06kwhmw5r5h4bsaqscr7dl3rfsa6wp642597zcmzdly94h26iwy9"
+   "commit": "9e9b5164c68955974fd5f5d220aec5af9b5ba3ae",
+   "sha256": "1742wlx07khra7xfbd6f8d3i030w87mncnyx6kf6im10khf8qwmb"
   },
   "stable": {
    "version": [
     0,
+    2,
     2
    ],
    "deps": [
     "polymode",
     "slim-mode"
    ],
-   "commit": "a4fb8166d110b82eb3f1d0b4fc87045c3308bd7d",
-   "sha256": "06kwhmw5r5h4bsaqscr7dl3rfsa6wp642597zcmzdly94h26iwy9"
+   "commit": "9e9b5164c68955974fd5f5d220aec5af9b5ba3ae",
+   "sha256": "1742wlx07khra7xfbd6f8d3i030w87mncnyx6kf6im10khf8qwmb"
   }
  },
  {
@@ -76769,19 +77718,20 @@
   "repo": "polymode/polymode",
   "unstable": {
    "version": [
-    20200307,
-    1519
+    20200316,
+    1314
    ],
-   "commit": "44601aace1e9cef9b89379cc7b4e2144cca60b6a",
-   "sha256": "0wl2lc5niq89axbxi2frls2iq0ns6pmdqdaknnppgrasvfjxfwj3"
+   "commit": "44265e35161d77f6eaa09388ea2256b89bd5dcc8",
+   "sha256": "18ssl2h861dm2jkd3df6wkfr48p8zk337dbvpq5522kia7fq1lbn"
   },
   "stable": {
    "version": [
     0,
+    2,
     2
    ],
-   "commit": "82a0c3d71cc02e32a347033b3f42afeac4e43f66",
-   "sha256": "04v0gnzfsjb50bgly6kvpryx8cyzwjaq2llw4qv9ijw1l6ixmq3b"
+   "commit": "44265e35161d77f6eaa09388ea2256b89bd5dcc8",
+   "sha256": "18ssl2h861dm2jkd3df6wkfr48p8zk337dbvpq5522kia7fq1lbn"
   }
  },
  {
@@ -76911,29 +77861,28 @@
   "repo": "aki2o/emacs-pophint",
   "unstable": {
    "version": [
-    20170918,
-    248
+    20200322,
+    737
    ],
    "deps": [
     "log4e",
     "yaxception"
    ],
-   "commit": "909025c5a871ca4b9ec7aed7f1a27c819a94dba1",
-   "sha256": "0qbb36qijkzbzxlmqsvvddm7x2gk9rkafnyjbkxsl76rz1ajy6nz"
+   "commit": "2c43423c87c6892b0fd16e3749e021a3743ee708",
+   "sha256": "0ila3vqv5wkna11qmm221iv1nzafnvffda19mqmv8fpl2iv1197s"
   },
   "stable": {
    "version": [
-    0,
-    9,
-    3
+    1,
+    1,
+    0
    ],
    "deps": [
     "log4e",
-    "popup",
     "yaxception"
    ],
-   "commit": "28dc6a76e726f371bcca3160c27ae2017324399c",
-   "sha256": "18i0kivn6prh5pwdr7b4pxfxqsc8l4mks1h6cfs7iwnfn15g5k19"
+   "commit": "2c43423c87c6892b0fd16e3749e021a3743ee708",
+   "sha256": "0ila3vqv5wkna11qmm221iv1nzafnvffda19mqmv8fpl2iv1197s"
   }
  },
  {
@@ -76983,10 +77932,10 @@
  },
  {
   "ename": "popup-complete",
-  "commit": "b43b85f90c476a3b88f94927a7db90bdc72cd171",
-  "sha256": "04bpm31zx87j390r2xi1yl4kyqgalmyqc48xarsm67zfww9fw9c1",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "1mw892nr3dfhsjiqyyf3znd7vji4kxly295bbq74vszza2i0b87i",
   "fetcher": "github",
-  "repo": "syohex/emacs-popup-complete",
+  "repo": "emacsorphanage/popup-complete",
   "unstable": {
    "version": [
     20141109,
@@ -77205,11 +78154,11 @@
   "repo": "tumashu/posframe",
   "unstable": {
    "version": [
-    20200304,
-    631
+    20200319,
+    907
    ],
-   "commit": "4ff106ed5c6e3dc9ddba7e158c7ae9085a43b0bc",
-   "sha256": "1468g9n1dxnsws31zvzm9y6sfcpxx24qj24jmsv7x6r4qk00bq29"
+   "commit": "c15800a8388696474fe9f8466fce1b40735b9304",
+   "sha256": "14xjly5cqziqb0gnklsgg28vimdrpq8273z2inf1c0jnak8x2vzn"
   },
   "stable": {
    "version": [
@@ -77234,6 +78183,14 @@
    ],
    "commit": "ebaacd7266ae7a66605317f57b9f42e9cfb2ce1e",
    "sha256": "0kdcpd59jd1gasqk5gx4ggbyp492b53dy6n3nkv9j2rj8618yzs6"
+  },
+  "stable": {
+   "version": [
+    0,
+    1
+   ],
+   "commit": "ebaacd7266ae7a66605317f57b9f42e9cfb2ce1e",
+   "sha256": "0kdcpd59jd1gasqk5gx4ggbyp492b53dy6n3nkv9j2rj8618yzs6"
   }
  },
  {
@@ -77415,11 +78372,11 @@
   "repo": "conao3/ppp.el",
   "unstable": {
    "version": [
-    20200313,
-    437
+    20200318,
+    806
    ],
-   "commit": "7504b1e4f3aa7063f15ba683e0e8e65bc1312ab0",
-   "sha256": "1jsliv29h4vz8np8l6vclly5n4i8w1v7kf3d2iq66spr36csdilq"
+   "commit": "bfb9ddfbc124b8b97d7a12610947b76794c0fd06",
+   "sha256": "1632y0vaxv043w4js5jpd9zr36bzy9pwxnhmlh44hmkvgfw07qvn"
   },
   "stable": {
    "version": [
@@ -77480,8 +78437,8 @@
     20191224,
     220
    ],
-   "commit": "7fd8c3b8028da4733434940c4aac1209281bef58",
-   "sha256": "1igsjdkxax2lavglc03h0dk3d7fpgqvlymnhyxx738sjyfzl09cr"
+   "commit": "a194852e8022762843052e58a9d0fbdaa1df0fe5",
+   "sha256": "0da4s32fza42vdiqhh7cdim08by5i4909q93ivxkmgrmqfgdvz0p"
   },
   "stable": {
    "version": [
@@ -77665,25 +78622,25 @@
   "repo": "alphapapa/prism.el",
   "unstable": {
    "version": [
-    20200301,
-    1139
+    20200315,
+    1926
    ],
    "deps": [
     "dash"
    ],
-   "commit": "a9bb7ec3dcf83b4352f2a68134b6fd1d4977b27f",
-   "sha256": "04awq9h795ji90bp7z1d9cmg9s2sjx32snbzyp81gb55z02abihd"
+   "commit": "636059b6ca21d7dd2d46776d799f94b476c62ee2",
+   "sha256": "014zvdqizjqp1cxs8a45nj2nfpvjsfmls41780pjdvzvrvyq16p0"
   },
   "stable": {
    "version": [
     0,
-    1
+    2
    ],
    "deps": [
     "dash"
    ],
-   "commit": "682034ff5f3fd62bd24eee1873a2c68498e8b7d3",
-   "sha256": "1bzqqvyraj5h4flzmhxbjgaw98wgqd21hmjq1jg4j3yxwg8cbrw9"
+   "commit": "636059b6ca21d7dd2d46776d799f94b476c62ee2",
+   "sha256": "014zvdqizjqp1cxs8a45nj2nfpvjsfmls41780pjdvzvrvyq16p0"
   }
  },
  {
@@ -78078,14 +79035,14 @@
   "repo": "bbatsov/projectile",
   "unstable": {
    "version": [
-    20200307,
-    1701
+    20200329,
+    1908
    ],
    "deps": [
     "pkg-info"
    ],
-   "commit": "588692ad56395ed4fd072bac496b33992096bfe4",
-   "sha256": "1dysdh4nwxxz6yqimy65ssyvkyki0lk8j0v120csh9igb97ryy6v"
+   "commit": "56e18fcefa2f286edfec98853189985823d0e53c",
+   "sha256": "0iq93ghwj96xxfsa5s90g36ngwpa92bj91zvkkk40zn9faqkdllc"
   },
   "stable": {
    "version": [
@@ -78450,11 +79407,11 @@
   "repo": "chuntaro/emacs-promise",
   "unstable": {
    "version": [
-    20200209,
-    616
+    20200320,
+    341
    ],
-   "commit": "c45b4e09d796385823cfb42ab15a4e67feb01b77",
-   "sha256": "1crhny97p6yz3z2lb1m43334vsprdiz3sb79jp7czyxskkwqn86r"
+   "commit": "02c470bd6c7bf4ea4244d304f57997bad37c9bb7",
+   "sha256": "1sjwwram45pb9bjap6h24m6734qr5yhnai2lqbdvxd0nplfv91ng"
   },
   "stable": {
    "version": [
@@ -78530,11 +79487,11 @@
   "repo": "ProofGeneral/PG",
   "unstable": {
    "version": [
-    20200313,
-    907
+    20200326,
+    1804
    ],
-   "commit": "23d1199c24927cf5dc6fa53f082291b6e181cd13",
-   "sha256": "1c1rz3n3bli4ggnkp3zk0j5df1s8hsrsygdjn5nqs50gprb683dp"
+   "commit": "9196749d55413224355409d55003f7f8c8ba0f79",
+   "sha256": "17ak2nbgiqwldk6y4cg4qq49hnvzw32jm4m3dqag2smvkl6rjw19"
   },
   "stable": {
    "version": [
@@ -78637,8 +79594,8 @@
     20170526,
     1650
    ],
-   "commit": "422053f3bcb39cac483d2769e936c473e7c8bcdb",
-   "sha256": "0hlyxvriivk0fydqjx0862v53rynlh50sci9h5m3j5b7y3nsykry"
+   "commit": "dec4939439d9ca2adf2bb14edccf876c2587faf2",
+   "sha256": "0kxrgv1pb38lsgpgilaqjlvw6inmlbs8rdrm2bfilzcwwrr92bi9"
   },
   "stable": {
    "version": [
@@ -78702,8 +79659,8 @@
   "repo": "purescript-emacs/psc-ide-emacs",
   "unstable": {
    "version": [
-    20191217,
-    1144
+    20200317,
+    1013
    ],
    "deps": [
     "company",
@@ -78714,8 +79671,8 @@
     "s",
     "seq"
    ],
-   "commit": "2a9394422da317b54aa1da021aea6cded19004c1",
-   "sha256": "18pfi04grvdbgz8v5yb06y5mv0q6mkwm4rj43h35nw75l2gwaapv"
+   "commit": "7fc2b841be25f5bc5e1eb7d0634436181c38b3fe",
+   "sha256": "0r0fymyai30jimm34z1cmav4wgij8ci6s1d9y7qigygfbbfrdsmj"
   }
  },
  {
@@ -78849,8 +79806,8 @@
   "repo": "fvdbeek/emacs-pubmed",
   "unstable": {
    "version": [
-    20200312,
-    1930
+    20200315,
+    1938
    ],
    "deps": [
     "deferred",
@@ -78858,14 +79815,14 @@
     "s",
     "unidecode"
    ],
-   "commit": "b801f7480401e6f3207f150cd945fc5abd96f884",
-   "sha256": "1w9hxh94zkgnsw26hqrs5gdnb8xi7cnavjby9dy71l9n6js7bdb1"
+   "commit": "cc5d258ac83650ad6e8043c8c01d9162c2460308",
+   "sha256": "13n7i80734848by8f0b3z0mqv0rh9x42hglkc8abhmilc0sg4i0y"
   },
   "stable": {
    "version": [
     0,
     4,
-    1
+    2
    ],
    "deps": [
     "deferred",
@@ -78873,8 +79830,8 @@
     "s",
     "unidecode"
    ],
-   "commit": "b801f7480401e6f3207f150cd945fc5abd96f884",
-   "sha256": "1w9hxh94zkgnsw26hqrs5gdnb8xi7cnavjby9dy71l9n6js7bdb1"
+   "commit": "f6e13137ad7731c8b0eb1720aed48d1a1edf4719",
+   "sha256": "1nanaj0liilnplh1njbmch7qsa2h7izkc51bpd4hxw6k4bslplqc"
   }
  },
  {
@@ -79461,8 +80418,8 @@
   "repo": "tumashu/pyim",
   "unstable": {
    "version": [
-    20200315,
-    735
+    20200326,
+    719
    ],
    "deps": [
     "async",
@@ -79470,8 +80427,8 @@
     "pyim-basedict",
     "xr"
    ],
-   "commit": "92af8c283531f08aebf23fb6a0efd452fcc58d42",
-   "sha256": "0nzhg4hl1wv7yz1rbwm6j3vw9lgpg7rl2al1xbxliqkrfv9lh1mi"
+   "commit": "84af8e80a4ac8fa19e7b01a3f9984280e7d501b4",
+   "sha256": "0351mvnnm0xzmlm71byxlbn8dp7qnpw8d12ghwdmd53q87pfgz9s"
   },
   "stable": {
    "version": [
@@ -79616,8 +80573,8 @@
     20170402,
     1255
    ],
-   "commit": "16ed52ec500388aff2277a7144fc8138afb6f796",
-   "sha256": "01xh11991bwijhq44sp4xbmwsmfgj10c3ip9icns143c878svany"
+   "commit": "53e5406b9279008f3ae8b5f045e5cd5773771d70",
+   "sha256": "0c6d0pmbinj65kacnqzbsa6acb3as8blrl5f202s8bbb9zd62vam"
   }
  },
  {
@@ -79694,14 +80651,14 @@
   "repo": "ionrock/pytest-el",
   "unstable": {
    "version": [
-    20181005,
-    1524
+    20200330,
+    41
    ],
    "deps": [
     "s"
    ],
-   "commit": "1bfa7549001e61ecd59cd6eae7c6656a924d1ba4",
-   "sha256": "1ry0czn0qjjiw75v47jamxbfzh70jxai6lvf3pp5v87wp1xhnznh"
+   "commit": "6934047242db79b1c53e9fe3e0734cc9719ed1c4",
+   "sha256": "1gh5sqmhw7hl67m7nqgd4wwns7a10j0sfmabm97k1cmmbwdj0vca"
   }
  },
  {
@@ -79712,20 +80669,20 @@
   "repo": "poppyschmo/pytest-pdb-break",
   "unstable": {
    "version": [
-    20191218,
-    530
+    20200316,
+    301
    ],
-   "commit": "8b097f5fc8b42a9eddb5b020fd2d531c2b1fcddd",
-   "sha256": "0r1j9jjm013gah0cx10wrmv0blqqk6fwgs3wfgq7hsdrkm4pjil9"
+   "commit": "007427af712df9fa2c54869388d74e97f91b2bd7",
+   "sha256": "14l14605lgq498j37916p4gjwkqjb8z4ky85wlk3pgyx6bp20ckz"
   },
   "stable": {
    "version": [
     0,
     0,
-    7
+    8
    ],
-   "commit": "8b097f5fc8b42a9eddb5b020fd2d531c2b1fcddd",
-   "sha256": "0r1j9jjm013gah0cx10wrmv0blqqk6fwgs3wfgq7hsdrkm4pjil9"
+   "commit": "007427af712df9fa2c54869388d74e97f91b2bd7",
+   "sha256": "14l14605lgq498j37916p4gjwkqjb8z4ky85wlk3pgyx6bp20ckz"
   }
  },
  {
@@ -79736,15 +80693,15 @@
   "repo": "wbolster/emacs-python-black",
   "unstable": {
    "version": [
-    20190817,
-    1754
+    20200324,
+    930
    ],
    "deps": [
     "dash",
     "reformatter"
    ],
-   "commit": "706d317f0874d7c5b5a3d844698bcfb8b1fe253e",
-   "sha256": "0fjnd85nlkck156dj6cahk8chhgkbgl2kwywqzi8bl4yj700m4dk"
+   "commit": "a11ca73f6dfcdc125d27ff184496d66bdbd71326",
+   "sha256": "1jv2fwlf7q8l5npqcpr05xzqmfqlx6xmjn0zphh9rx6dd2dpdma9"
   },
   "stable": {
    "version": [
@@ -80205,11 +81162,11 @@
   "repo": "quelpa/quelpa",
   "unstable": {
    "version": [
-    20200304,
-    1835
+    20200329,
+    719
    ],
-   "commit": "497c281fce65c671aa2bfe780aea5dff4f097d13",
-   "sha256": "05k096qky4hn9m27gv3pri95mhn57m0vl8lp8phz5br9gm1isp9h"
+   "commit": "a3c4490a3bb08ee7819b330a93a284b2fd4cd70c",
+   "sha256": "1rm27y9zni9nscrvsmvi653nwkrlr4gd4cy5pyrynh3q32yhkqik"
   }
  },
  {
@@ -80312,10 +81269,10 @@
  },
  {
   "ename": "quickrun",
-  "commit": "81f0f525680fea98e804f39dbde1dada887e8821",
-  "sha256": "0f989d6niw6ghf9mq454kqyp0gy7gj34vx5l6krwc52agckyfacy",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "02wxja6l1xq7gini17ana8qy4kvpfzri0gn2dypjnj2nfh1vvk9i",
   "fetcher": "github",
-  "repo": "syohex/emacs-quickrun",
+  "repo": "emacsorphanage/quickrun",
   "unstable": {
    "version": [
     20200315,
@@ -80480,14 +81437,15 @@
   "repo": "greghendershott/racket-mode",
   "unstable": {
    "version": [
-    20200218,
-    1623
+    20200329,
+    1841
    ],
    "deps": [
-    "faceup"
+    "faceup",
+    "pos-tip"
    ],
-   "commit": "7a1414f83981aa174feba28f3d83e95574c7f075",
-   "sha256": "1bszd21fwaqfqkksqpqiq5058hm7wr500qj75zx1xa2j6r67w7sa"
+   "commit": "c8ac9971814ca9df8ec406f3b76c9ba4878a5d57",
+   "sha256": "0jnw9plmw3r2c12kcy4435v2kf0vmmla9ljb670zhcg690a5cjqh"
   }
  },
  {
@@ -81811,19 +82769,19 @@
   "repo": "purcell/reformatter.el",
   "unstable": {
    "version": [
-    20200304,
-    2250
+    20200327,
+    2358
    ],
-   "commit": "af393979570b801263bd57d7f136dc5bfd1106d1",
-   "sha256": "04ikh7rmm2rs3wjzgl8b0jgpp49kwafffix942av3bmcd4dw3a4d"
+   "commit": "e8f70b20caf6672353a2b0ee3161d4791c412696",
+   "sha256": "19mji7frfvj925nx2m2cdvsx0lf69dzdl5wbdppyra9717rsspbq"
   },
   "stable": {
    "version": [
     0,
-    4
+    5
    ],
-   "commit": "b2963f51009948d5e4885237a148695008d4ccbc",
-   "sha256": "0hhy6x1bkwlhdlarsgm06g3am4yh02yqv8qs34szpzgy53x84qah"
+   "commit": "e8f70b20caf6672353a2b0ee3161d4791c412696",
+   "sha256": "19mji7frfvj925nx2m2cdvsx0lf69dzdl5wbdppyra9717rsspbq"
   }
  },
  {
@@ -81948,6 +82906,30 @@
    "sha256": "0k9qgrbzbxx4sjffnr02qx5wm71i3m61w7mh2j4hq9jf8k6nbkq4"
   }
  },
+ {
+  "ename": "register-quicknav",
+  "commit": "fed1473b565f42f7849c7676d0c9739a39562c95",
+  "sha256": "1487mkyz2h5929580racxr4nbc343klns9bcm7m5jn4hsx5aiq6m",
+  "fetcher": "git",
+  "url": "https://schlomp.space/tastytea/register-quicknav.git",
+  "unstable": {
+   "version": [
+    20200325,
+    1612
+   ],
+   "commit": "06afa1efc490a6cbc1d814fc6f1e7a80a601ecc7",
+   "sha256": "055bffsa81chjpv39p2fn10dwikpzb034k19k0mc1026d8a423kg"
+  },
+  "stable": {
+   "version": [
+    0,
+    4,
+    3
+   ],
+   "commit": "e30883a7085ad1f4e1113dc84f5f2222ac4bcd37",
+   "sha256": "18mskl1w5n2cksjds27d1gcrwb065vp9n6hnw9402j3n6z0w8srv"
+  }
+ },
  {
   "ename": "related",
   "commit": "555932a7b9cf11b50a61c2a9dd2636fd6844fac8",
@@ -82583,19 +83565,19 @@
   "repo": "a13/reverse-im.el",
   "unstable": {
    "version": [
-    20200219,
-    1137
+    20200324,
+    1113
    ],
-   "commit": "45a55810ce3e07d4e42d9fb666100d7242004b4e",
-   "sha256": "1669fksymr24fz2lhxv419fm7csm94bkpycz20l2qy55ppn03his"
+   "commit": "030e89a38df6d194546b0629f90c9e1898370eb7",
+   "sha256": "1mfjwxf1l0py2ididzdv86r118ws9iscdv23a0kgf2cjd6ydpbjc"
   }
  },
  {
   "ename": "reverse-theme",
-  "commit": "81f0f525680fea98e804f39dbde1dada887e8821",
-  "sha256": "163kk5qnz9bk3l2fam79n264s764jfxbwqbiwgid8kw9cmk0v776",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "133wl2k0niy9ih0bjn7qx51fykqjj392ibkp1bvmy5dbl09x4gic",
   "fetcher": "github",
-  "repo": "syohex/emacs-reverse-theme",
+  "repo": "emacsorphanage/reverse-theme",
   "unstable": {
    "version": [
     20141205,
@@ -82832,6 +83814,27 @@
    "sha256": "0p044wg9d4i6f5x7bdshmisgwvw424y16lixac93q6v5bh3xmab5"
   }
  },
+ {
+  "ename": "rime",
+  "commit": "0144879cf0dfe4f0447c5da7cd061f7aac91d4fe",
+  "sha256": "1m9jp307czp4mx4xpfnj9bhq7w5xg656dx9l9ih603cbz24salq4",
+  "fetcher": "github",
+  "repo": "DogLooksGood/emacs-rime",
+  "unstable": {
+   "version": [
+    20200329,
+    1205
+   ],
+   "deps": [
+    "cl-lib",
+    "dash",
+    "popup",
+    "posframe"
+   ],
+   "commit": "f78719e5d8c8d2ec6da0f66e0b1e7d660d3a5a89",
+   "sha256": "0pcncx1w7y8rnsg23lf055cc38xrwhx26yhrqwzdf996cad54y6w"
+  }
+ },
  {
   "ename": "rimero-theme",
   "commit": "c6d07b0c021001195e6e0951c890566a5a784ce1",
@@ -83025,8 +84028,8 @@
    "deps": [
     "inf-ruby"
    ],
-   "commit": "8190cb7c7beb8385dd3abf6ea357f33d8981ae8a",
-   "sha256": "1lqckmfxm2csh0as22bwf4rvbn5rwqry18xx9m5nfhfl57360q75"
+   "commit": "68503b32bb3a005787ecb7a7fdeb3bb4a2317e2b",
+   "sha256": "1v4nbfr3rhdm1733gb88cv0f018iy53cw5hdcwpshrmjj36a2lpn"
   },
   "stable": {
    "version": [
@@ -83436,26 +84439,26 @@
  },
  {
   "ename": "ruby-electric",
-  "commit": "5fd5fa797a813e02a6433ecbe2bca1270a383753",
-  "sha256": "02xskivi917l8xyhrij084dmzwjq3knjcn65l2iwz34s767fbwl2",
+  "commit": "ccae5ba7c1088837f2dd6cb0992f49ea2dc5bcdf",
+  "sha256": "1fj5vb4n7jiq93z0yakr39vyfd0f5yhf4p4aw4bdm9cx5dmpr8g6",
   "fetcher": "github",
-  "repo": "knu/ruby-electric.el",
+  "repo": "ruby/elisp-ruby-electric",
   "unstable": {
    "version": [
-    20191217,
-    1214
+    20200328,
+    1528
    ],
-   "commit": "ea9571ce3af546fdb1234274c8b1a147109b4869",
-   "sha256": "16g1764igf9y717sg2rg4b2ysxxlnyjyzk2s6w9jx9dnr2lqih39"
+   "commit": "f2323cd9b5df3b34aa9810ba8109502824925d23",
+   "sha256": "1p0l0fsn0jcgb4raimyc4d1wpfksrfhn0rkwdazadvm6s8baydf7"
   },
   "stable": {
    "version": [
     2,
     3,
-    2
+    3
    ],
-   "commit": "0e6c1f1022ac84db6a03d60e7a0f9f1fd42ecc99",
-   "sha256": "1l3zz62d04m3kwj3swffsbkpvkayp9r651cpl07palghx9b34h3m"
+   "commit": "f2323cd9b5df3b34aa9810ba8109502824925d23",
+   "sha256": "1p0l0fsn0jcgb4raimyc4d1wpfksrfhn0rkwdazadvm6s8baydf7"
   }
  },
  {
@@ -83760,11 +84763,11 @@
   "repo": "rust-lang/rust-mode",
   "unstable": {
    "version": [
-    20200303,
-    932
+    20200322,
+    1749
    ],
-   "commit": "eb5270bc1cef48d30f33c2a312bff0638a9ff821",
-   "sha256": "1iip9qhcr3rzvpns71l44vwmm80n5ccldc8zw48xl2ghlxpk2r08"
+   "commit": "2df6cf72163db57fd0c79fefd0e79f38f29f7d93",
+   "sha256": "1f8fbzkc6ifx91kcf5blx22bh3713qmm5kj95i06k8cn10nlx11f"
   },
   "stable": {
    "version": [
@@ -84630,11 +85633,11 @@
   "repo": "ideasman42/emacs-scroll-on-drag",
   "unstable": {
    "version": [
-    20200106,
-    442
+    20200328,
+    116
    ],
-   "commit": "2fbd643ea9632d0e15d32e70b6f3c641476e3071",
-   "sha256": "1gjwsyvjwj4xsp83nws4bcmzsyxv4zp95a9fx0md86cc9gxw3h6n"
+   "commit": "2d79a6d9c2497f701335fd66154a67cd51073c9f",
+   "sha256": "0m2605k8i2z44mqw5ibviwsbn3j8g8hs4q9cih5ip14lik6hhrdz"
   }
  },
  {
@@ -85037,16 +86040,16 @@
   "repo": "conao3/seml-mode.el",
   "unstable": {
    "version": [
-    20200203,
-    1858
+    20200323,
+    220
    ],
    "deps": [
     "htmlize",
-    "simple-httpd",
+    "impatient-mode",
     "web-mode"
    ],
-   "commit": "6e09efaa613f411b9cc8cd30f46ddab44154a1e2",
-   "sha256": "0f6x2w94y1clqzl65f3qgw9hm9d97p91jaak4k8k92qnd9s3471r"
+   "commit": "32f0dbf5a9b39535bc079c9c70456479d0dd3fb2",
+   "sha256": "1284fdraamjsbaslyk8k75a3m1rfa1i8pwrh56k3vsmfmd8a0cib"
   },
   "stable": {
    "version": [
@@ -85129,6 +86132,25 @@
    "sha256": "0jn3a7m8ld07280mc7nkyahagwhvhrcshrpsb8k1ycdwd1r3zqw5"
   }
  },
+ {
+  "ename": "separedit",
+  "commit": "297ba98f4bc011948c34aad30ae28b7adc611938",
+  "sha256": "00p4crbzr5fkcj8lhpfd9w44ynpmhd9fay9yrwgz0yh87lll6nqx",
+  "fetcher": "github",
+  "repo": "twlz0ne/separedit.el",
+  "unstable": {
+   "version": [
+    20200325,
+    1711
+   ],
+   "deps": [
+    "dash",
+    "edit-indirect"
+   ],
+   "commit": "2ee55780eeced9b0bb086a9d731526ee1a9c3658",
+   "sha256": "08xxl3z7abqk0m4lwflp0cnz7pcy66f6hps8dmxfas2hgl0qyz7i"
+  }
+ },
  {
   "ename": "sequences",
   "commit": "4cf716df68fb2d6a41fe75fac0b41e356bddcf30",
@@ -85331,6 +86353,21 @@
    "sha256": "14fqkkvjbq2gj737k3yz3s0dkya33fi0dj4wds99zyzss2xp37f8"
   }
  },
+ {
+  "ename": "sexp-diff",
+  "commit": "d29e4d21bf808a74bef27ee00d500ec1f816be74",
+  "sha256": "0cr35b7k6a5japm14bjgnw93g1kqggzwlqwwr0mhg73klnn6qyn8",
+  "fetcher": "github",
+  "repo": "xuchunyang/sexp-diff.el",
+  "unstable": {
+   "version": [
+    20200314,
+    2018
+   ],
+   "commit": "7e8c988bea2af209e17b70fa51316ade55529acb",
+   "sha256": "1daz6jss2346a2p30fhc66m230sj7vyxm7jw6zqz5n8h9lqxpjyk"
+  }
+ },
  {
   "ename": "sexp-move",
   "commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -85516,6 +86553,21 @@
    "sha256": "11g9lsgakq8nf689k49p9l536ffi62g3bh11mh9ix1l058xamqw2"
   }
  },
+ {
+  "ename": "share2computer",
+  "commit": "47647167cc7b9d7ad0a2fc4785849f69dc07d6cb",
+  "sha256": "067xc1awknx9iqwd4lfj1gkni6aszzfr1179avzzfn1ggp7yzkmq",
+  "fetcher": "github",
+  "repo": "tumashu/share2computer",
+  "unstable": {
+   "version": [
+    20200316,
+    31
+   ],
+   "commit": "15da47625a800e3310b8dc714bd4e41e32966d6a",
+   "sha256": "04h8vhg0fxabjlqgfqsvxkgsmkcp5qmcinxg46xib386r7rzrx4g"
+  }
+ },
  {
   "ename": "shell-command",
   "commit": "ae489be43b1aee93614e40f492ebdf0b98a3fbc1",
@@ -85807,8 +86859,8 @@
     20190930,
     730
    ],
-   "commit": "cf30c23a119ef50d1c3ae3fa19ba3c1d07800466",
-   "sha256": "1d94qrb4kvvz75pgqci10akr1cg5knss66mix6sdfmcvg2q8l3zh"
+   "commit": "cbb15424431cd5f579b12307b8fa03122d525006",
+   "sha256": "1wwk5q3viw32pwmf4bjhbywkj0d1prwnldgdjfjzmr3rnvfw7w9h"
   }
  },
  {
@@ -86669,8 +87721,8 @@
   "repo": "yuya373/emacs-slack",
   "unstable": {
    "version": [
-    20200315,
-    743
+    20200320,
+    457
    ],
    "deps": [
     "alert",
@@ -86680,8 +87732,8 @@
     "request",
     "websocket"
    ],
-   "commit": "c1baa8f57895cc7093dcd156bd268c5a0b3ab68c",
-   "sha256": "1fklwbj1cgl2r0mqnw0yd62xqyfnmh11n4dmmsvvcjscw7n82p60"
+   "commit": "03345aabe728da3f5238954eaa0ddbce604807d5",
+   "sha256": "0kyd959a9113vd7d4prgfga7sj6y6n8zrw6nkqxsfkm5sfpv31iv"
   }
  },
  {
@@ -86742,15 +87794,15 @@
   "repo": "slime/slime",
   "unstable": {
    "version": [
-    20200314,
-    1241
+    20200326,
+    1453
    ],
    "deps": [
     "cl-lib",
     "macrostep"
    ],
-   "commit": "9add8d167cee8ecec0e0ce0f2afa2505499000a2",
-   "sha256": "09c9zpsbgg8c219hxrmw85w43qb0xdqq3skqpzig29yzbn4y0pvl"
+   "commit": "faa0c6a0b7c77f6a2db8d3244f24563106857944",
+   "sha256": "1dgmakfazz3p6s64qmy03schapxi1010sa8g7p1paqkpawr9d5qp"
   },
   "stable": {
    "version": [
@@ -86970,8 +88022,8 @@
     20200314,
     55
    ],
-   "commit": "c3a0e8b0480416f73aca253fe9c24724fbe6a603",
-   "sha256": "1wm18sqyhh9hgn8icn6bqjfp3jkfyr9f8vfvhcs4cfv3av032pnc"
+   "commit": "1382bda945ecfb4b177c7d05a36da8fd41e0384c",
+   "sha256": "1hmdx3nakhpsmg6zr52090pimmy0kpjz2adyi0m1wzh9zdg5cx4x"
   },
   "stable": {
    "version": [
@@ -87143,11 +88195,11 @@
   "repo": "zenitani/elisp",
   "unstable": {
    "version": [
-    20190522,
-    1125
+    20200322,
+    24
    ],
-   "commit": "366a4cdab1ad20105910bc24c4f3e4f8734e4eae",
-   "sha256": "1kk7ya14p4vpw31rzcgwq0pmay0wm3pg2j70fv5mms9ala1jyhsy"
+   "commit": "e2a390b9b8518ad62283046400a0fb3e81eb5b79",
+   "sha256": "1s23r0dr10wjnk0j5gicy1dxvbhvnz3zmbssk431vccbba1jm8yg"
   }
  },
  {
@@ -87477,15 +88529,15 @@
   "repo": "Fuco1/smartparens",
   "unstable": {
    "version": [
-    20200229,
-    1752
+    20200324,
+    2147
    ],
    "deps": [
     "cl-lib",
     "dash"
    ],
-   "commit": "1f8857c5febe8b82654ba44ae43e6d2f435f4832",
-   "sha256": "02b05rh474kyk3vmkgh54366k7fqshdf2x5zgrd5q4a8jcffb5nf"
+   "commit": "555626a43f9bb1985aa9a0eb675f2b88b29702c8",
+   "sha256": "0hfywwhzv2dphi7gacp1sdyk47cmajzx5sqrcwxkn7mlwx876nsx"
   },
   "stable": {
    "version": [
@@ -87604,17 +88656,17 @@
  },
  {
   "ename": "smeargle",
-  "commit": "c5b985b24a23499454dc61bf071073df325de571",
-  "sha256": "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "04z1prwdd1h91jyf9fnggqp657830657kvbch7m2f2pgmn3czvvs",
   "fetcher": "github",
-  "repo": "syohex/emacs-smeargle",
+  "repo": "emacsorphanage/smeargle",
   "unstable": {
    "version": [
-    20161212,
-    2358
+    20200323,
+    533
    ],
-   "commit": "0665b1ff5109731898bc4a0ca6d939933b804777",
-   "sha256": "0p0kxmjdr02l9injlyyrnnzqdbb7mirz1xx79c3lw1rgpalf0jnf"
+   "commit": "a0e9bc2ea694aa2940102e1f4cfd8db8be437931",
+   "sha256": "05n6vgxw91cxk5ri4mmsxc62jcad0yhjjnn16gk1qhjxjqvrlcis"
   },
   "stable": {
    "version": [
@@ -88098,14 +89150,14 @@
   "repo": "bbatsov/solarized-emacs",
   "unstable": {
    "version": [
-    20200309,
-    2116
+    20200329,
+    1048
    ],
    "deps": [
     "dash"
    ],
-   "commit": "8de268144ab2171896906c8553be7763d5c45fa5",
-   "sha256": "1z19axaaipia56c9b4nvw4wlcr89wapnwza2gc3mdph3jkwwfjfl"
+   "commit": "8cd79c8afd7563a69764c4174098d2b8e7fd0c96",
+   "sha256": "1x1cbyd7kr1izcbbffq1amxgg1gqfwaa5y4m17ffmdrhal37mdzb"
   },
   "stable": {
    "version": [
@@ -88337,21 +89389,21 @@
  },
  {
   "ename": "sound-wav",
-  "commit": "8333470e3d84d5433be489a23e065c876bed2ab2",
-  "sha256": "1vrwzk6zqma7r0w5ivbx16shys6hsifj52fwlf5rxs6jg1gqdb4f",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "1sb3345x6rbbxr71x12fj6bzzvj6nin712777rxk59riam4nknd6",
   "fetcher": "github",
-  "repo": "syohex/emacs-sound-wav",
+  "repo": "emacsorphanage/sound-wav",
   "unstable": {
    "version": [
-    20181126,
-    1726
+    20200323,
+    728
    ],
    "deps": [
     "cl-lib",
     "deferred"
    ],
-   "commit": "49a9f10334b914cf6429e49b5449e0711a3aa251",
-   "sha256": "1zg32gn0r06qcp6i5fxwns8xv5nqpc6hfzqajwj0hfvhkqdndv4j"
+   "commit": "8a18f8a62f4fdde80dfa069986aa959091a42472",
+   "sha256": "18iahla8m9b6bdn63x2yrvr3rzyw5ybipf44q9avyy6s1pqsby2a"
   },
   "stable": {
    "version": [
@@ -88448,10 +89500,10 @@
  },
  {
   "ename": "sourcemap",
-  "commit": "557d18259543263932fccdbaf44c4e7986bd277b",
-  "sha256": "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "1yxjvv3vg14in492hzb3czjfwrg2qp60h4mpxxpx18cjgx8mkybr",
   "fetcher": "github",
-  "repo": "syohex/emacs-sourcemap",
+  "repo": "emacsorphanage/sourcemap",
   "unstable": {
    "version": [
     20200315,
@@ -88610,11 +89662,11 @@
   "repo": "nashamri/spacemacs-theme",
   "unstable": {
    "version": [
-    20200127,
-    1656
+    20200324,
+    1107
    ],
-   "commit": "e088bff4f190495615c29de93079aaa823e2300c",
-   "sha256": "09p5pzy3ibrl8dxmg10v8j16wxdn1fkdqpbi8l9pgfib2azmnvnc"
+   "commit": "f79c40fb241e204539fde97200abae91e828e585",
+   "sha256": "1l2kkiyrskkpx8f901v0wrzaah1wjg15zdyv88spj3mh3hwd3b6n"
   }
  },
  {
@@ -88926,10 +89978,10 @@
  },
  {
   "ename": "splitjoin",
-  "commit": "51e172f46045fbb71b6a13b3521b502339a4a02b",
-  "sha256": "0l1x98fvvia8qx8g125h4d76slv0xnb3h1zxiq9xb5qh7a1h069l",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "0g2i1q1npwrczgzp5321lpljff2ykmq932lzj6pdwnn6cyqixzzb",
   "fetcher": "github",
-  "repo": "syohex/emacs-splitjoin",
+  "repo": "emacsorphanage/splitjoin",
   "unstable": {
    "version": [
     20150505,
@@ -89231,14 +90283,14 @@
   "repo": "purcell/sqlformat",
   "unstable": {
    "version": [
-    20200303,
-    802
+    20200327,
+    2329
    ],
    "deps": [
     "reformatter"
    ],
-   "commit": "f18a0bb425a5052022af699df322ba90e6d65e20",
-   "sha256": "10sqq8k27p4fhhwrlq5p1283wrkykkx76fmp4806jiqh4617932f"
+   "commit": "2f10382034cd5cd2356cc69b4a1e9116d77a0d86",
+   "sha256": "18z9hljifw63zy4jrsyg4x2lqzgx29sfibx3maj0dm90yzj6zmcg"
   },
   "stable": {
    "version": [
@@ -89358,6 +90410,35 @@
    "sha256": "0wx8l8gkh8rbf2g149f35gpnmkk45s9x4r844aqw5by4zkvix4rc"
   }
  },
+ {
+  "ename": "srfi",
+  "commit": "ff844713373e376a637625494321c8e8f197b48e",
+  "sha256": "1ik6gbcv79l1za7vr2llph1kb2ll8snq11szdxd0r8lnls7l33xf",
+  "fetcher": "github",
+  "repo": "srfi-explorations/emacs-srfi",
+  "unstable": {
+   "version": [
+    20200326,
+    752
+   ],
+   "deps": [
+    "cl-lib"
+   ],
+   "commit": "fa0c9e1fae26780dcce266df8ad8bf5efc971c30",
+   "sha256": "1azdc14y2jsmqcphk16qbxaj2fc7ajddwjjhc73xbhbn67knk1af"
+  },
+  "stable": {
+   "version": [
+    0,
+    1
+   ],
+   "deps": [
+    "cl-lib"
+   ],
+   "commit": "c0a1ae75bfb3fdc81bb722dff5f5e2fae3f07024",
+   "sha256": "1zymgidk09yyjdd23cz7rx2hql8vpmpqn21i07hwcr7032v0kl7k"
+  }
+ },
  {
   "ename": "srv",
   "commit": "6b0b7f22631e7749da484ced9192d8ae5e1be941",
@@ -89427,14 +90508,14 @@
   "repo": "magit/ssh-agency",
   "unstable": {
    "version": [
-    20191009,
-    156
+    20200329,
+    1535
    ],
    "deps": [
     "dash"
    ],
-   "commit": "89ea87dbfa0aa2fe644f7215aa3628c3008852c5",
-   "sha256": "0mkrn3jildlqyrkbdp31zf24vkzx4ycy49kxqs3vspbbcpanpj7j"
+   "commit": "67975f7773bfa0140d9dc09bd67df7f5489aa6ea",
+   "sha256": "0vwa1szfy45xpqqv44kyasjv2x0y2n3v680wlb1v3w2mxwwg8vda"
   },
   "stable": {
    "version": [
@@ -89961,6 +91042,30 @@
    "sha256": "035ym1c1vzg6hjsnd258z4dkrfc11lj4c0y4gpgybhk54dq3w9dk"
   }
  },
+ {
+  "ename": "stripes",
+  "commit": "f4c7beb05435a70293806b729b6f35c2fc2e8ca4",
+  "sha256": "0pwkqqyhg6gkpj8qh84ylsvq6wjykkkmmil4igw7mn80gy15zd09",
+  "fetcher": "gitlab",
+  "repo": "stepnem/stripes-el",
+  "unstable": {
+   "version": [
+    20200322,
+    2350
+   ],
+   "commit": "8b0010acb9f92c7ab2fb8396aaf354fccedea7c5",
+   "sha256": "0q2zw9nvs9c27c7mcj9psqwf1r7p6k86y63d6q38hps22l063c9x"
+  },
+  "stable": {
+   "version": [
+    0,
+    3,
+    1
+   ],
+   "commit": "8b0010acb9f92c7ab2fb8396aaf354fccedea7c5",
+   "sha256": "0q2zw9nvs9c27c7mcj9psqwf1r7p6k86y63d6q38hps22l063c9x"
+  }
+ },
  {
   "ename": "stumpwm-mode",
   "commit": "caaa21f235c4864f6008fb454d0a970a2fd22a86",
@@ -90427,6 +91532,21 @@
    "sha256": "0c6xjw1wh94llwh8qkf3bfzx05ksk0lsdrqdfqn3qkjnf3bkbbh2"
   }
  },
+ {
+  "ename": "svelte-mode",
+  "commit": "fc6a992830520750d2e4a9596668ba3d0eefaa11",
+  "sha256": "0mc9bc8p3a6lkqag72f48xprlrnj077h9mnglq4znxrslm91jr0h",
+  "fetcher": "github",
+  "repo": "leafOfTree/svelte-mode",
+  "unstable": {
+   "version": [
+    20200327,
+    406
+   ],
+   "commit": "17a53e5f8dd45c6bca44659a80a79ca30d161635",
+   "sha256": "1hrrcg42b1fnf8y0mz3fli6mp7aha7w0rv7nhrsrvhrilnq97wzl"
+  }
+ },
  {
   "ename": "svg-mode-line-themes",
   "commit": "2ca54d78b5e87c3bb582b178e4892af2bf447d1e",
@@ -90580,16 +91700,16 @@
   "repo": "danielmartin/swift-helpful",
   "unstable": {
    "version": [
-    20191226,
-    103
+    20200321,
+    10
    ],
    "deps": [
     "dash",
     "lsp-mode",
     "swift-mode"
    ],
-   "commit": "04c2bf38c16d7cf03a43c065baabaed3a80e78d3",
-   "sha256": "0xi23ywj9kf5qsw933raqs66yl859hhg62na3zybm78l2kq6dnhg"
+   "commit": "e58f26b8ab9cf0522d52fe9890d39dc9e645577e",
+   "sha256": "1yx73wgvaf01wi26ahc9cblsk3sj98rgljb19dxc9ab7hjyncd46"
   },
   "stable": {
    "version": [
@@ -90697,14 +91817,14 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20200314,
-    1959
+    20200319,
+    1334
    ],
    "deps": [
     "ivy"
    ],
-   "commit": "8fae568daafdc79d4990ad739bac42ee230d3234",
-   "sha256": "18ppxzafz9f8dn7wwdb9vab3c91n20csvn9kjr3djkjgngz6qjd1"
+   "commit": "64f05f4735bba8b708bc12cfc2cbfb7fb7706787",
+   "sha256": "16b75jw0by1f8divymfygjbp5mikc2bjz4nqd907mdsndf8k6i8q"
   },
   "stable": {
    "version": [
@@ -90807,16 +91927,29 @@
   "repo": "emacsorphanage/swoop",
   "unstable": {
    "version": [
-    20160120,
-    1715
+    20200321,
+    319
    ],
    "deps": [
     "async",
     "ht",
     "pcre2el"
    ],
-   "commit": "a5e475db7a9f5db02ba3d08cd3c1c3594e2e01d7",
-   "sha256": "10ka6f86n07xlf0z7w35db0mzp2zk4xhr6jd19kjdrn2j0ynlcw5"
+   "commit": "7f6f20d0f32b76b7ce5b1459afa44c1ab700f8bb",
+   "sha256": "1d134f3dyh8sa8q8dgmla01wiky61y4jmhqb5whqpb7c2p53niyc"
+  },
+  "stable": {
+   "version": [
+    1,
+    0
+   ],
+   "deps": [
+    "async",
+    "ht",
+    "pcre2el"
+   ],
+   "commit": "de2d29eb45edab802cf8b275aa1c25a24050122e",
+   "sha256": "1caq17f7s4pdy6jzyxfh5zwqmwkwkbfpgcnj5f09qgmwanjygjya"
   }
  },
  {
@@ -90878,6 +92011,36 @@
    "sha256": "02f63k8rzb3bcch6vj6w5c5ncccqg83siqnc8hyi0lhy1bfx240p"
   }
  },
+ {
+  "ename": "sxiv",
+  "commit": "1b3da730053c1f45e67fefb2e9bfce222cc38628",
+  "sha256": "0jj0bzw365227anvg9zqy78zdfczfvqlac47kjdyziqmj958yhh8",
+  "fetcher": "gitlab",
+  "repo": "contrapunctus/sxiv.el",
+  "unstable": {
+   "version": [
+    20200326,
+    1433
+   ],
+   "deps": [
+    "dash"
+   ],
+   "commit": "dae46e6f5890f3d97d45eaadf0194b7ff01f6baf",
+   "sha256": "094kvg0cznddzn5q1clgj9r26h3ygab96rpbr00qn2wnmdb79bhq"
+  },
+  "stable": {
+   "version": [
+    0,
+    3,
+    1
+   ],
+   "deps": [
+    "dash"
+   ],
+   "commit": "dae46e6f5890f3d97d45eaadf0194b7ff01f6baf",
+   "sha256": "094kvg0cznddzn5q1clgj9r26h3ygab96rpbr00qn2wnmdb79bhq"
+  }
+ },
  {
   "ename": "symbol-overlay",
   "commit": "c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b",
@@ -91582,11 +92745,11 @@
   "repo": "11111000000/tao-theme-emacs",
   "unstable": {
    "version": [
-    20200306,
-    1306
+    20200325,
+    344
    ],
-   "commit": "20d38a10b9d9cc49fdf99b99a39f2b03a1f077d6",
-   "sha256": "1g04j5j5w69qr59r9mlv50859bmfirrivlp01li14a0jy8jymcxv"
+   "commit": "34917843cde086943816d8a48977658c663a784e",
+   "sha256": "1ks4pnwp5fg2vswr93hrli2shfd7rrf3nwqwr1qwmqxhq1600f3x"
   },
   "stable": {
    "version": [
@@ -91606,11 +92769,11 @@
   "repo": "saf-dmitry/taskpaper-mode",
   "unstable": {
    "version": [
-    20200225,
-    1349
+    20200321,
+    2124
    ],
-   "commit": "6ebb8b188a39decf22a5cd675aeaa9684e4ea4ef",
-   "sha256": "0j3cxakgf943wv7bf73bwa69gc3m0g2ksw78xanz5hc0r0bsxbac"
+   "commit": "9ca1afb561433ff6d2e8527e3d8d9152de5912f7",
+   "sha256": "0a3hlwzq9ckf7jcxq6drrgl1g8hi5ad0f6lgm3nawbsqmrb6r28y"
   },
   "stable": {
    "version": [
@@ -91806,14 +92969,14 @@
   "repo": "zevlg/telega.el",
   "unstable": {
    "version": [
-    20200314,
-    1914
+    20200329,
+    1557
    ],
    "deps": [
     "visual-fill-column"
    ],
-   "commit": "b7c0b2438cb3152929824bc672ee39e82c67e93a",
-   "sha256": "1lcimnpg3z4gbwryhkqhmmg3896all2kjb5rhv7prw3794hjpf38"
+   "commit": "0da852c0b72ad3473432f9e846ce1371d7c8cd61",
+   "sha256": "0n4jvl6c68wkddvsjfyw82rxy5h7ikc6qrjd35h2v864080gmbjp"
   },
   "stable": {
    "version": [
@@ -92358,10 +93521,10 @@
  },
  {
   "ename": "terraform-mode",
-  "commit": "93e06adf34bc613edf95feaca64c69a0a2a4b567",
-  "sha256": "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "14bhn86d7xv4nvqdr65pm0nwmzawbnxyxyig5i4k8ax20xh59d67",
   "fetcher": "github",
-  "repo": "syohex/emacs-terraform-mode",
+  "repo": "emacsorphanage/terraform-mode",
   "unstable": {
    "version": [
     20170112,
@@ -92673,26 +93836,26 @@
   "repo": "myTerminal/theme-looper",
   "unstable": {
    "version": [
-    20190501,
-    127
+    20200326,
+    1651
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "67ca7e6ac4740a412a1ea29f86e46ceeb636535a",
-   "sha256": "07bfiikrbmk1jc9ir5d3iwvsi3hbfcsira8gsicphwzhaiahqc1c"
+   "commit": "7077ca11508c6a00d98d592dee967e92185480ff",
+   "sha256": "02kiaqlrb677773809sfkajz31p9fsr72k4k0g5297wlibr9ymjr"
   },
   "stable": {
    "version": [
     2,
-    4,
+    5,
     0
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "388138a238fbab9b4bc5ada0300c9bc5ef63d3f1",
-   "sha256": "0gab7ph1d7z0bjflqrj1y1lb4nk4c32bkpi943px0m5s5cjm54jv"
+   "commit": "7077ca11508c6a00d98d592dee967e92185480ff",
+   "sha256": "02kiaqlrb677773809sfkajz31p9fsr72k4k0g5297wlibr9ymjr"
   }
  },
  {
@@ -92816,18 +93979,18 @@
     20200212,
     1903
    ],
-   "commit": "e2b274cab473f85ffa8136942664211ed64ff742",
-   "sha256": "18z50i08y4fg4ygaz3fqyh5rf07jpah2w2y9zhmkpgqkigdwp3sl"
+   "commit": "9889eb8b3a3a773e8f06df327a76e408f9214cd4",
+   "sha256": "1vhfkfsrnhdzsk1353xl383nsb7x6a01v7r79lxdcrkj5yxppz0d"
   },
   "stable": {
    "version": [
     2020,
     3,
-    9,
+    23,
     0
    ],
-   "commit": "2ece938967751345394c81381efeea4e3165570f",
-   "sha256": "15wzhpd1djzviq9r46srzbrwj8zdfmwg7ca9zjm86nff0asv6i01"
+   "commit": "186d782f02d80c7d8e93be352c2011ed4097c228",
+   "sha256": "1wj4ng9ymi0hszl3kmdg7rqrff4zk0zipbbn1jcxcii2swrkw12g"
   }
  },
  {
@@ -92883,8 +94046,8 @@
    "deps": [
     "haskell-mode"
    ],
-   "commit": "d9c6b84d8cfadcb5111e291c17c1a2a01a984820",
-   "sha256": "13xyx6bb15g7kay1n1cfpfvjkya5i9r4r0182cvpdvcig8l3ii84"
+   "commit": "5d4bce7a9af5e39e6df0d2577962579e31964b65",
+   "sha256": "0hnqcfvc8gca98wyzcrjldn9kcxdc4m8aa9cdr1884kp4kf5dmvj"
   },
   "stable": {
    "version": [
@@ -92907,8 +94070,8 @@
   "repo": "ananthakumaran/tide",
   "unstable": {
    "version": [
-    20200308,
-    259
+    20200327,
+    1218
    ],
    "deps": [
     "cl-lib",
@@ -92917,8 +94080,8 @@
     "s",
     "typescript-mode"
    ],
-   "commit": "10e5c19de798aba2d57fb1ec83ad3d1369e6547a",
-   "sha256": "137kkpsdg4mg2rxidnhzq0a6lqgfld3q1zv91j1k0s2m0q2pb3ck"
+   "commit": "3b45610faaab33bc53ae2d44e1e573f19f35a74a",
+   "sha256": "1507xp8ndhyqvzd5j2qx3y4lpxq52j40srh5mp9784bf1hm9gg2s"
   },
   "stable": {
    "version": [
@@ -93246,15 +94409,15 @@
   "repo": "laishulu/emacs-tmux-pane",
   "unstable": {
    "version": [
-    20200227,
-    1230
+    20200330,
+    456
    ],
    "deps": [
     "names",
     "s"
    ],
-   "commit": "be321093575c1b68946296edd57762c4323c253b",
-   "sha256": "14f1nvnp6qxgq64410kqwi59f29p2shr6v8qg1ck8g9fiarilx5w"
+   "commit": "942270359587d54f4fd6e37e8d35da38373447c5",
+   "sha256": "1x5b0680vxvjqcj5r3674n7gnp4994js13707pikl362bhv398kw"
   }
  },
  {
@@ -93475,6 +94638,24 @@
    "sha256": "0pwbd5gzmpr6js20438870w605671930291070nhmhswvxfcdvay"
   }
  },
+ {
+  "ename": "tongbu",
+  "commit": "e97578be9aa9bdadc6bdf6c7105242ca9d23bf80",
+  "sha256": "1gnjvb4w0mgr0swpqqk3hmscypv9bdg9q2ixkp2sv19d45gd4pvb",
+  "fetcher": "github",
+  "repo": "xuchunyang/tongbu.el",
+  "unstable": {
+   "version": [
+    20200321,
+    1817
+   ],
+   "deps": [
+    "web-server"
+   ],
+   "commit": "cf3b3ee1468c3dcd1721a5e6802821c8f52f34ce",
+   "sha256": "0s4h711rwkpf1dbqbak4akbm95y8crd0niisx19jmk9lms5kj5n5"
+  }
+ },
  {
   "ename": "tornado-template-mode",
   "commit": "f329baae028fd17618824128f312a49aa0a0807e",
@@ -93803,14 +94984,14 @@
   "repo": "holomorph/transmission",
   "unstable": {
    "version": [
-    20200215,
-    1350
+    20200321,
+    216
    ],
    "deps": [
     "let-alist"
    ],
-   "commit": "49d3d764819afabf7a66f9d887a6b16c53566317",
-   "sha256": "00hk1rgqilxhlaabi7pgz25k0ykfizwhpp65yzgs453q6kvhccfv"
+   "commit": "05a80e7a90303cd80f67681df2ec8e1bac88c394",
+   "sha256": "02chl6k9r0mki7iy5rs9xwgd74ypf0c79q9d3p7fw1rc1wqxk9ji"
   },
   "stable": {
    "version": [
@@ -93983,8 +95164,8 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20200309,
-    2057
+    20200328,
+    1143
    ],
    "deps": [
     "ace-window",
@@ -93996,8 +95177,8 @@
     "pfuture",
     "s"
    ],
-   "commit": "81b69d9ee26326178cef08d5aef2811df4f659ed",
-   "sha256": "138iw9sva5s6d2asl1ch0723q3q8zqlyllhxrac3phgmqzjdw68c"
+   "commit": "4c1add44cc0c5a710c22788663353c9c24909149",
+   "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid"
   },
   "stable": {
    "version": [
@@ -94033,8 +95214,8 @@
     "evil",
     "treemacs"
    ],
-   "commit": "81b69d9ee26326178cef08d5aef2811df4f659ed",
-   "sha256": "138iw9sva5s6d2asl1ch0723q3q8zqlyllhxrac3phgmqzjdw68c"
+   "commit": "4c1add44cc0c5a710c22788663353c9c24909149",
+   "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid"
   },
   "stable": {
    "version": [
@@ -94064,8 +95245,8 @@
     "cl-lib",
     "treemacs"
    ],
-   "commit": "81b69d9ee26326178cef08d5aef2811df4f659ed",
-   "sha256": "138iw9sva5s6d2asl1ch0723q3q8zqlyllhxrac3phgmqzjdw68c"
+   "commit": "4c1add44cc0c5a710c22788663353c9c24909149",
+   "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid"
   },
   "stable": {
    "version": [
@@ -94096,8 +95277,8 @@
     "pfuture",
     "treemacs"
    ],
-   "commit": "81b69d9ee26326178cef08d5aef2811df4f659ed",
-   "sha256": "138iw9sva5s6d2asl1ch0723q3q8zqlyllhxrac3phgmqzjdw68c"
+   "commit": "4c1add44cc0c5a710c22788663353c9c24909149",
+   "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid"
   },
   "stable": {
    "version": [
@@ -94129,8 +95310,8 @@
     "persp-mode",
     "treemacs"
    ],
-   "commit": "81b69d9ee26326178cef08d5aef2811df4f659ed",
-   "sha256": "138iw9sva5s6d2asl1ch0723q3q8zqlyllhxrac3phgmqzjdw68c"
+   "commit": "4c1add44cc0c5a710c22788663353c9c24909149",
+   "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid"
   }
  },
  {
@@ -94148,8 +95329,8 @@
     "projectile",
     "treemacs"
    ],
-   "commit": "81b69d9ee26326178cef08d5aef2811df4f659ed",
-   "sha256": "138iw9sva5s6d2asl1ch0723q3q8zqlyllhxrac3phgmqzjdw68c"
+   "commit": "4c1add44cc0c5a710c22788663353c9c24909149",
+   "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid"
   },
   "stable": {
    "version": [
@@ -95607,14 +96788,14 @@
   "repo": "jwiegley/use-package",
   "unstable": {
    "version": [
-    20191126,
-    2034
+    20200322,
+    2110
    ],
    "deps": [
     "bind-key"
    ],
-   "commit": "42db6b3d90ee57d0f5947d3b0bf4b0010bdf7b40",
-   "sha256": "1an2whgy68l9c1l1qx8p8jz47g4hj2abf0kxvcmbc6wj8lp5zny8"
+   "commit": "c873d5529c9c80cb58222f22873a4f081c307cb2",
+   "sha256": "0jbq3w9ijsbl5gblhr24b0rh4gyp1xx696g20l438a7sbsk4b531"
   },
   "stable": {
    "version": [
@@ -95645,8 +96826,8 @@
     "key-chord",
     "use-package"
    ],
-   "commit": "42db6b3d90ee57d0f5947d3b0bf4b0010bdf7b40",
-   "sha256": "1an2whgy68l9c1l1qx8p8jz47g4hj2abf0kxvcmbc6wj8lp5zny8"
+   "commit": "c873d5529c9c80cb58222f22873a4f081c307cb2",
+   "sha256": "0jbq3w9ijsbl5gblhr24b0rh4gyp1xx696g20l438a7sbsk4b531"
   },
   "stable": {
    "version": [
@@ -95707,8 +96888,8 @@
     "system-packages",
     "use-package"
    ],
-   "commit": "42db6b3d90ee57d0f5947d3b0bf4b0010bdf7b40",
-   "sha256": "1an2whgy68l9c1l1qx8p8jz47g4hj2abf0kxvcmbc6wj8lp5zny8"
+   "commit": "c873d5529c9c80cb58222f22873a4f081c307cb2",
+   "sha256": "0jbq3w9ijsbl5gblhr24b0rh4gyp1xx696g20l438a7sbsk4b531"
   },
   "stable": {
    "version": [
@@ -95817,8 +96998,8 @@
     20190715,
     1836
    ],
-   "commit": "c719401992c255f30ed42c4a942651ce7982ce9d",
-   "sha256": "1dafg3549mpkkl4c698byghai7nlr9nfzl2l7bgqxqwh5qrwp15k"
+   "commit": "30c77ce4d7996822721e97ac8042d5bc0d415584",
+   "sha256": "03947csh8nzqqa58z2hq5i87kqf7z65f7b19nyvy0can2flznl7q"
   },
   "stable": {
    "version": [
@@ -96438,20 +97619,20 @@
   "repo": "federicotdn/verb",
   "unstable": {
    "version": [
-    20200313,
-    1956
+    20200326,
+    2322
    ],
-   "commit": "b2570e4809fc0c97add33b4f2e05e5361750c877",
-   "sha256": "02ikvwcqgma8nzpx13nzdjw3y8dmk2y0d5b3g882i9rp04xs0y1l"
+   "commit": "2c4252b2b57f65ebd9fd2c7a7771b4d0354f1d4c",
+   "sha256": "0g0hi1bhrx8bj0wbxwaimfpvl491sd079551199hcyhq607pcpp2"
   },
   "stable": {
    "version": [
     2,
-    8,
-    1
+    9,
+    0
    ],
-   "commit": "b2570e4809fc0c97add33b4f2e05e5361750c877",
-   "sha256": "02ikvwcqgma8nzpx13nzdjw3y8dmk2y0d5b3g882i9rp04xs0y1l"
+   "commit": "2c4252b2b57f65ebd9fd2c7a7771b4d0354f1d4c",
+   "sha256": "0g0hi1bhrx8bj0wbxwaimfpvl491sd079551199hcyhq607pcpp2"
   }
  },
  {
@@ -96499,8 +97680,8 @@
   "repo": "mihaiolteanu/versuri",
   "unstable": {
    "version": [
-    20200309,
-    737
+    20200316,
+    852
    ],
    "deps": [
     "anaphora",
@@ -96511,8 +97692,8 @@
     "request",
     "s"
    ],
-   "commit": "9cae9900e01cb41064209762ca289ca6da8bb196",
-   "sha256": "04r4qg9a1p6igg1j6praa2kxxg5rlc25s0s6gvl56gxb9s1qchh1"
+   "commit": "41e20583d1080beeeda0e36d1b2e6d74b9c57920",
+   "sha256": "0fgc1rai9gp6lwl0rxr9400vi420py0c0b8nv9wzl12ph80yhwj7"
   }
  },
  {
@@ -96611,8 +97792,8 @@
     "helm-rg",
     "outshine"
    ],
-   "commit": "8584e73ab550841b3df7419dea32b874cdd64425",
-   "sha256": "0s0ljcn6lgcr6zqhw31llg4ri2drkxbz31kviir0xwgr8hn4p5dn"
+   "commit": "3dbfe8160e22053f0a9bee70ba6f8e1e3967bc46",
+   "sha256": "1pr7skldslq35ry17yyslfrl2d84msxyh0q77a3djv7ssqlpd270"
   },
   "stable": {
    "version": [
@@ -96750,15 +97931,15 @@
   "repo": "mrkkrp/vimish-fold",
   "unstable": {
    "version": [
-    20200223,
-    1836
+    20200329,
+    1242
    ],
    "deps": [
     "cl-lib",
     "f"
    ],
-   "commit": "d3248a41a79092ea270b07ac60bf7420befa2146",
-   "sha256": "164jx09m7sgmffixlarjdyn8zdrqcmm4ngwddpjyv3phi65pnpj0"
+   "commit": "63685239655a151181b9152e45478dad587f86f2",
+   "sha256": "1l6zca08diq3ppmg1pllihbfj0pcaqvbnisryr92mvbblhk44wxs"
   },
   "stable": {
    "version": [
@@ -96976,6 +98157,21 @@
    "sha256": "1isqa4ck6pm4ykcrkr0g1qj8664jkpcsrq0f8dlb0sksns2dqkwj"
   }
  },
+ {
+  "ename": "vlc",
+  "commit": "bcb69969893a3f70fe9e7e3b2a836df3ba212fb8",
+  "sha256": "1pf3ry205pl4369hbpvcc1xlicf16ws4dc018mk6c1m4fi9qc3lk",
+  "fetcher": "github",
+  "repo": "xuchunyang/vlc.el",
+  "unstable": {
+   "version": [
+    20200328,
+    1143
+   ],
+   "commit": "932840f874e7510ee86e796bb5dc20d44514e31a",
+   "sha256": "0vqsdvaqi8ih98ic9hdwwwwcs4v0yjz3nrwwwkwh2a99l9a59j5g"
+  }
+ },
  {
   "ename": "vlf",
   "commit": "9116b11eb513dd9e1dc9542d274dd60f183b24c4",
@@ -97164,11 +98360,11 @@
   "repo": "akermu/emacs-libvterm",
   "unstable": {
    "version": [
-    20200315,
-    1353
+    20200327,
+    1447
    ],
-   "commit": "186914a3f3666b92a5c52fc77063953974a96c47",
-   "sha256": "06d51aqri06lxbnki0hag9g641amgbcnb64arj33wv4cf495q595"
+   "commit": "996c535b9cc6aa70c3595413582d97abfab16edd",
+   "sha256": "0f84376rc9gm54llfln1528p82svczfrz9p48d1vh9pmf5ba09vw"
   }
  },
  {
@@ -97247,6 +98443,28 @@
    "sha256": "014vx8jkscj1c614v78dqlqlg7n0zc3c2db3dqvxvaz417i5mxq0"
   }
  },
+ {
+  "ename": "vuiet",
+  "commit": "4f63056cf2f637fcb3426851501eeff5e6f40bb3",
+  "sha256": "0hf99rgzhi66in3lr0pl3g8g56l00zcvz1qgclfsbw1yb9ig626y",
+  "fetcher": "github",
+  "repo": "mihaiolteanu/vuiet",
+  "unstable": {
+   "version": [
+    20200326,
+    1738
+   ],
+   "deps": [
+    "bind-key",
+    "lastfm",
+    "mpv",
+    "s",
+    "versuri"
+   ],
+   "commit": "c917155a0c72d9fceb9f7c39efcc97320f9e9028",
+   "sha256": "14djavnczks11lvmldwf0j8nnj4jd0jmz30l6r4hv12f3zjwyk7a"
+  }
+ },
  {
   "ename": "vyper-mode",
   "commit": "492d42d60bc188a567c5e438b838a275a124c699",
@@ -97292,11 +98510,11 @@
   "repo": "emacs-w3m/emacs-w3m",
   "unstable": {
    "version": [
-    20200313,
-    0
+    20200325,
+    2226
    ],
-   "commit": "cf30c23a119ef50d1c3ae3fa19ba3c1d07800466",
-   "sha256": "1d94qrb4kvvz75pgqci10akr1cg5knss66mix6sdfmcvg2q8l3zh"
+   "commit": "cbb15424431cd5f579b12307b8fa03122d525006",
+   "sha256": "1wwk5q3viw32pwmf4bjhbywkj0d1prwnldgdjfjzmr3rnvfw7w9h"
   }
  },
  {
@@ -97384,11 +98602,11 @@
   "repo": "darkstego/wakib-keys",
   "unstable": {
    "version": [
-    20190910,
-    1011
+    20200326,
+    2329
    ],
-   "commit": "23237fc2c255de798b8d3fc2cb68c7c22b53caa9",
-   "sha256": "1s5n2gcldwj5srjn44pigd788x0hv4c7lz75krqyz1hysriydv9p"
+   "commit": "7564b39aaa2b38ccca0a21bc72a797f065a0b171",
+   "sha256": "132jwf1d54ykbvw4f9f7i27ig5hpc6wsmm1ib44m5hx1kv1kxvh6"
   }
  },
  {
@@ -97418,15 +98636,30 @@
   "repo": "abrochard/walkman",
   "unstable": {
    "version": [
-    20200224,
-    1501
+    20200319,
+    1739
    ],
    "deps": [
     "org",
     "transient"
    ],
-   "commit": "bdc026b58dc023cf078ec5eafae3b334ac5c39ef",
-   "sha256": "13bhdmylg7k9r5y6wi158rv8rm4cndv8av35g65vc6qk0bgnnwpz"
+   "commit": "da90c9dcd501c1bb88c6bde055911c34bf4202a7",
+   "sha256": "04gzb1v6wva24xbl8r8rr1ys2zmz03ccl0517d3pkgbd9v1wha2f"
+  }
+ },
+ {
+  "ename": "wallpaper",
+  "commit": "764c5b8438197d6f24113e7b3a696b8327a8d6d9",
+  "sha256": "18wpj5qzac0msp9mi8511kpw6157k7dj9zvzh1y6rhd7a5nd0clg",
+  "fetcher": "github",
+  "repo": "farlado/emacs-wallpaper",
+  "unstable": {
+   "version": [
+    20200321,
+    1220
+   ],
+   "commit": "762354e958dbe298de06d119493d1aee8ffd0112",
+   "sha256": "1vcpfamawaja9q2n5qqkfn1bn2psi3ymcniw9g66k3whkqsh0kji"
   }
  },
  {
@@ -97931,14 +99164,14 @@
   "repo": "ahyatt/emacs-websocket",
   "unstable": {
    "version": [
-    20200102,
-    637
+    20200321,
+    102
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "ee44af2cc55415591e7ccb1007193294c702affd",
-   "sha256": "01pc03kial647r1nad1vw6rcbd251hrvjjh87gqqlhh9ksrcwnl9"
+   "commit": "31e122a9d7a1ae092e8f970df718fb8256e16574",
+   "sha256": "1yjdrpn2dwaarmcymf1i8lj72jyvrpp3jqwr3rv59bg8fldin0rs"
   },
   "stable": {
    "version": [
@@ -98376,11 +99609,11 @@
   "repo": "lassik/emacs-whois",
   "unstable": {
    "version": [
-    20190529,
-    1554
+    20200326,
+    1909
    ],
-   "commit": "c86c0ad9adc4787a422cca11b66229cc14a6d83a",
-   "sha256": "1abn5rzapbvk217h1s7lk166y48g7fvdvjmy2fsbz60rwq2zhpk6"
+   "commit": "2186a52db77badd809c99d5c21502878298d78f6",
+   "sha256": "1dnr7navhjzca2hapwx41xdx4i5fgjyjnw2ms5na6n572xp8kgnj"
   },
   "stable": {
    "version": [
@@ -98846,11 +100079,11 @@
   "repo": "ArneBab/wisp",
   "unstable": {
    "version": [
-    20190921,
-    2218
+    20191114,
+    2340
    ],
-   "commit": "0d2c025ac4cfd394706c07fbb60999eaf711020b",
-   "sha256": "1fs4dpc78aax4mzcp0vzcvzf2mxiwzbdwjfgpylwppxamqdycdwy"
+   "commit": "33b4fcdd8a17aa19d57971e4f6db5fcb7758843c",
+   "sha256": "09rrv89b17s4sklkqgci1pmzlnkjlrira22884dh10sbfij42vbp"
   }
  },
  {
@@ -98970,14 +100203,14 @@
   "repo": "p3r7/with-shell-interpreter",
   "unstable": {
    "version": [
-    20200306,
-    1445
+    20200319,
+    1351
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "055b46755b7cbc324a8d92e092de671b9bc97098",
-   "sha256": "10xf2aqxkqdls0ym2a5dvwz96zzziw7v0y493krw2jchzpwkwryk"
+   "commit": "e806b1e5537ba2f23b507a3cc28aa7c3cacd2315",
+   "sha256": "1qklc135ydslcxjhlgbmagib3j184gm72paky6glzdjh2yf8mm50"
   }
  },
  {
@@ -99677,11 +100910,11 @@
   "repo": "xahlee/xah-fly-keys",
   "unstable": {
    "version": [
-    20200311,
-    1951
+    20200330,
+    557
    ],
-   "commit": "691a2bac50db70fc3bda5aa836952c4d3c3aed6f",
-   "sha256": "1cwl2jz0iwkr53b9l2vpj6yik4bghwqd2kcjpp7dpqx29i3sppyw"
+   "commit": "d75567f7f6b85830b97b18ab1b5d8e70acaa05bf",
+   "sha256": "1lmca03y7h584agid7fr5g2w3s9psk55n0qlrcfgg10d67nq6l75"
   }
  },
  {
@@ -100325,8 +101558,8 @@
     20171022,
     1412
    ],
-   "commit": "db84dbb30ed39079d34d5eba01cc67af6f7d92de",
-   "sha256": "1syxgm3a51i3kybbjgjlwlrrgr6rscr4iqam3aa7r55z0hlx8k2r"
+   "commit": "ecb66f0b77aac0123e5b3336ee1910fa07fa44f9",
+   "sha256": "1cvsp6x94b223g21avr2z255s5xwdwmdxnhwzq8qj2c3qrax6sx9"
   }
  },
  {
@@ -100486,11 +101719,11 @@
   "repo": "JorisE/yapfify",
   "unstable": {
    "version": [
-    20200117,
-    1245
+    20200326,
+    917
    ],
-   "commit": "0b4f20af0b00a86353ddc286df26eade89381269",
-   "sha256": "1k91fav3dvdjkg632zhkmgbjvichbixwqdir4x8lc332ma3wwi0h"
+   "commit": "2e5d344b6d9cf1965a1153b160b3a52582d492ff",
+   "sha256": "1pi1dgcqz1xn5r4z5pjxbyx4kq75cxzl3711zzp0dyn48w0a7sj3"
   },
   "stable": {
    "version": [
@@ -100616,14 +101849,14 @@
   "repo": "joaotavora/yasnippet",
   "unstable": {
    "version": [
-    20191222,
-    2206
+    20200329,
+    1434
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "3bf9a3b1af37174a004798b7195826af0123fa6a",
-   "sha256": "0via9dzw8m5lzymg1h78xkwjssh39zr3g6ccyamlf1rjzjsyxknv"
+   "commit": "7c02bc142c3b157699ab8c4f24ff98da94401248",
+   "sha256": "1yjqlb9jdbsmmywgg49wd25psbf9637hzgnx5i1q3diaravlnji6"
   },
   "stable": {
    "version": [
@@ -100898,6 +102131,21 @@
    "sha256": "0yvz7lmid4jcikb9jmc7h2lcry3fdyy809k25nyasj2bk41xqqsd"
   }
  },
+ {
+  "ename": "yesterbox",
+  "commit": "21f684c47e5778c9d46c9f28dae1113197717b78",
+  "sha256": "1ah4l8zz565jgr52d9n29iv93z7qwmlz9pdjw3l51qhqf79lkf1w",
+  "fetcher": "github",
+  "repo": "sje30/yesterbox",
+  "unstable": {
+   "version": [
+    20200327,
+    52
+   ],
+   "commit": "10591342f1759e25756f5865371a53c132d8b0a0",
+   "sha256": "0cd77m4zyqs74iz56l4h0k7ccxnxhis0247j4f5mf94s51fn1x7p"
+  }
+ },
  {
   "ename": "yoficator",
   "commit": "5156f01564978718dd99ab3a54f19b6512de5c3c",
@@ -101134,30 +102382,34 @@
  },
  {
   "ename": "zephir-mode",
-  "commit": "5bd901c93ce7f64de6082e801327adbd18fd4517",
-  "sha256": "0nxm6w7z89q2vvf3bp1p6hb6f2axv9ha85jyiv4k02l46sjprf4j",
+  "commit": "fac9fb89cbe5c3eea987fadf23db20c214eab4d9",
+  "sha256": "133m47a54hdsczzmk3wg7f47q314qnw824lkh8zqx0nw68063i79",
   "fetcher": "github",
-  "repo": "sergeyklay/zephir-mode",
+  "repo": "zephir-lang/zephir-mode",
   "unstable": {
    "version": [
-    20170918,
-    425
+    20200329,
+    1235
    ],
    "deps": [
     "cl-lib",
     "pkg-info"
    ],
-   "commit": "1db4071a014a796120b5c3d0a7f91eb77359eb10",
-   "sha256": "0kqnihir4rr8ckzz3wn5sz3qwgnvpa8bqw767khn887bpf7qsmiq"
+   "commit": "3e112ba7c52b5caad0c230e014b6e842d6379ab1",
+   "sha256": "1h6lhz7fvx6c2zwgjwm5aiax5f22v65dmq3rj0s51vpasyj2k9ib"
   },
   "stable": {
    "version": [
     0,
-    3,
-    3
+    5,
+    0
    ],
-   "commit": "243f0fb7fd1dfebf0f0bdf94046b72d1bea4f66c",
-   "sha256": "0jydy2zcbksi7db7bvfhgdh08np8k4a1yd6q2wq6m3ll2y3zd0w2"
+   "deps": [
+    "cl-lib",
+    "pkg-info"
+   ],
+   "commit": "76c310faf792db93bc6750305f5b54aa6a4963bd",
+   "sha256": "1najsypq8qix6jgxqqj5kkfdp7b10l3xz25qw0y5lzz4by4pzzpa"
   }
  },
  {
@@ -101227,14 +102479,14 @@
   "repo": "efls/zetteldeft",
   "unstable": {
    "version": [
-    20200314,
-    1814
+    20200329,
+    1506
    ],
    "deps": [
     "deft"
    ],
-   "commit": "4871425426ee1d283b1147d0cf6daa7598fa8e70",
-   "sha256": "0l6s8psp98h8jch6g1pbqb25zzqjz352h4m3kpgdlxf68cq9iary"
+   "commit": "1dd8b052bb4bc8fcd18740e798057ace97cb63ac",
+   "sha256": "16bkcp6mq98bn1qli2qi6wgf5zrkxfqs912fi9fg88bcixk50k9j"
   }
  },
  {
@@ -101245,11 +102497,11 @@
   "repo": "ziglang/zig-mode",
   "unstable": {
    "version": [
-    20191023,
-    1551
+    20200322,
+    131
    ],
-   "commit": "77202ac26ee6091d69d40990fddb1ce6cfcc6dc8",
-   "sha256": "0d2f6nz99dp3yxr7m8i78lc313qzssm7k4783w6kkvcsbpknazlw"
+   "commit": "fc7fde327f45533bb73be643e7bda1eda10394b6",
+   "sha256": "1ld34xs25bysxw9ialrlm6pnp5qbzx94zbb3594ghc2ggz5ph5d5"
   }
  },
  {
@@ -101260,8 +102512,8 @@
   "repo": "WillForan/zim-wiki-mode",
   "unstable": {
    "version": [
-    20191208,
-    2241
+    20200316,
+    1223
    ],
    "deps": [
     "dokuwiki-mode",
@@ -101270,8 +102522,8 @@
     "link-hint",
     "pretty-hydra"
    ],
-   "commit": "030fb78600a6782f8746fe547b979bcc9a24f0ed",
-   "sha256": "0b3rd83mbpyf782jnfv2yfhfq2ffps3wbn31iblyydmv790lpdvx"
+   "commit": "410fa67d5947b8801b03a58fcb2bd414cb5294f7",
+   "sha256": "14dmda7ahnflv0db9yzssz7bidz3zsdnxxwnby0y48vcjv94nnl5"
   }
  },
  {
@@ -101297,14 +102549,14 @@
   "repo": "dzop/emacs-zmq",
   "unstable": {
    "version": [
-    20190812,
-    1910
+    20200305,
+    2345
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "0544b70bf99b6eb95f46e0fcd788d98da50cb892",
-   "sha256": "0r9aq933b2pk9m70phfz3ah3dk1c5axmjixcf8cf19sjsv1hcc9x"
+   "commit": "2aed40aee51d19cbca83d1f1edc23a5f1522dd8d",
+   "sha256": "1viz4sw4vmnjhhqw68wp8a4ks1751s2dk09gx2gyl8gy5vw2fcg6"
   },
   "stable": {
    "version": [
@@ -101488,25 +102740,25 @@
  },
  {
   "ename": "zoom-window",
-  "commit": "8a55cc66cc0deb1c24023f638b8e920c9d975859",
-  "sha256": "0l9683nk2bdm49likk9c55c23qfy6f1pn04drqwd1vhpanz4l4b3",
+  "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
+  "sha256": "0h4rr6h79g6sh8caa0l0fxssbd02v2llapqmikz72vpsghqg7y57",
   "fetcher": "github",
-  "repo": "syohex/emacs-zoom-window",
+  "repo": "emacsorphanage/zoom-window",
   "unstable": {
    "version": [
-    20170302,
-    827
+    20200323,
+    720
    ],
-   "commit": "cd6ecc103fc30b171bda7daf1f44a550854d0dbf",
-   "sha256": "1rfhdzwyag32s15ysmf75976nvkx995581afaa4ychj45vwnaqfm"
+   "commit": "ab14a365f3e496b07f5efc20992f9094ec166f06",
+   "sha256": "0ah0gfzp0c90vrqmsfd6crl3i6bjqgb78hnpcvvg53gk5i19i4aw"
   },
   "stable": {
    "version": [
     0,
-    5
+    6
    ],
-   "commit": "eefe36d26e04a9f89aad27671d1f06e9d4736ac6",
-   "sha256": "08splg49ncgfsap3ivpc974wmg22ikshwv33l0i6advjjv9cskhm"
+   "commit": "ab14a365f3e496b07f5efc20992f9094ec166f06",
+   "sha256": "0ah0gfzp0c90vrqmsfd6crl3i6bjqgb78hnpcvvg53gk5i19i4aw"
   }
  },
  {

From 676e18b7a00b87262d07ea82c4444e58f3850c75 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 30 Mar 2020 04:20:00 -0500
Subject: [PATCH 4427/4636] spotify-tui: 0.17.0 -> 0.17.1

---
 pkgs/applications/audio/spotify-tui/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix
index 5837bd453101..65dfc50fe1b1 100644
--- a/pkgs/applications/audio/spotify-tui/default.nix
+++ b/pkgs/applications/audio/spotify-tui/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "spotify-tui";
-  version = "0.17.0";
+  version = "0.17.1";
 
   src = fetchFromGitHub {
     owner = "Rigellute";
     repo = "spotify-tui";
     rev = "v${version}";
-    sha256 = "1jx2qyshqg84l3fm682h8262da0hy68qjjg3dm2i53dxqxrm5ji9";
+    sha256 = "1gsddjinxmglm05hhphclax08d9pig1f0wjjs3bbcq096fydxgfs";
   };
 
-  cargoSha256 = "12qwp59gshc9d6nz0s3w03zc8sxqri12vrav94vi54fqagiikinm";
+  cargoSha256 = "1y398ypckk3gw1sfzf97xzwf5d5z3kxlcpn3bccmsfr59kvkf661";
 
   nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ];
   buildInputs = [ openssl ]

From 3df35ce37e9bf7a791bdc31d95fcc2e4271598b1 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 30 Mar 2020 11:31:52 +0200
Subject: [PATCH 4428/4636] home-manager: 2020-03-07 -> 2020-03-17

Includes https://github.com/rycee/home-manager/pull/1099.
---
 pkgs/tools/package-management/home-manager/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix
index 793c7cfae32d..8c70a5a47242 100644
--- a/pkgs/tools/package-management/home-manager/default.nix
+++ b/pkgs/tools/package-management/home-manager/default.nix
@@ -6,13 +6,13 @@
 stdenv.mkDerivation rec {
 
   pname = "home-manager";
-  version = "2020-03-07";
+  version = "2020-03-17";
 
   src = fetchFromGitHub {
     owner = "rycee";
     repo = "home-manager";
-    rev = "5c1e7349bbd9b51fe41ea96b67c380feef996b90";
-    sha256 = "03lw5pq878zbkkwm5abr01p77radn2zgfyvwlra7fhywbl76l83x";
+    rev = "5969551a5cc52f9470b5ff5ca01327bf4bda82c1";
+    sha256 = "0f4kz83a1kp3ci8zi5hvp8fp34wi73arpykl4d9vlywdk6w36bnd";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From b80edca6be70b13c097c58e3ad7a17034b536d49 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 30 Mar 2020 09:45:28 +0000
Subject: [PATCH 4429/4636] libvirt: fix escapeShellArg usage

Co-Authored-By: conferno <conferno@camfex.cz>
---
 nixos/modules/virtualisation/libvirtd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index eeaec8e35f11..4f22099443f4 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -218,7 +218,7 @@ in {
       after = [ "systemd-udev-settle.service" "libvirtd-config.service" ]
               ++ optional vswitch.enable "ovs-vswitchd.service";
 
-      environment.LIBVIRTD_ARGS = concatMapStringsSep " " escapeShellArg (
+      environment.LIBVIRTD_ARGS = escapeShellArgs (
         [ "--config" configFile
           "--timeout" "120"     # from ${libvirt}/var/lib/sysconfig/libvirtd
         ] ++ cfg.extraOptions);

From ba55f84b5da090a740ebcfe852f46d273e3c2fa4 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 30 Mar 2020 13:37:10 +0300
Subject: [PATCH 4430/4636] nixos/mysql: add test mariadb with tokudb plugin

---
 nixos/tests/mysql.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix
index 84673181e1a4..df0730660b01 100644
--- a/nixos/tests/mysql.nix
+++ b/nixos/tests/mysql.nix
@@ -68,6 +68,11 @@ import ./make-test-python.nix ({ pkgs, ...} : {
             "testdb2.*" = "ALL PRIVILEGES";
           };
         }];
+        services.mysql.settings = {
+          mysqld = {
+            plugin-load-add = [ "ha_tokudb.so" ];
+          };
+        };
         services.mysql.package = pkgs.mariadb;
       };
 
@@ -106,5 +111,19 @@ import ./make-test-python.nix ({ pkgs, ...} : {
     mariadb.succeed(
         "echo 'use testdb; select test_id from tests;' | sudo -u testuser mysql -u testuser -N | grep 42"
     )
+
+    # Check if TokuDB plugin works
+    mariadb.succeed(
+        "echo 'use testdb; create table tokudb (test_id INT, PRIMARY KEY (test_id)) ENGINE = TokuDB;' | sudo -u testuser mysql -u testuser"
+    )
+    mariadb.succeed(
+        "echo 'use testdb; insert into tokudb values (25);' | sudo -u testuser mysql -u testuser"
+    )
+    mariadb.succeed(
+        "echo 'use testdb; select test_id from tokudb;' | sudo -u testuser mysql -u testuser -N | grep 25"
+    )
+    mariadb.succeed(
+        "echo 'use testdb; drop table tokudb;' | sudo -u testuser mysql -u testuser"
+    )
   '';
 })

From 98f5d0574f941f1fd7b08f0f895b76b4d2656373 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 21 Mar 2020 13:16:05 +0200
Subject: [PATCH 4431/4636] gtk-gnutella: 1.1.14 -> 1.1.15

Remove patches applied between 1.1.14 and 1.1.15 and switch to GitHub
source.
gtk-gnutella: several changes.
Disable internal malloc implementation.
Add @doronbehar as maintainer.
Comment about hardeningDisable regarding next release.
Format arguments and inputs.
Enable to disable GUI.
---
 .../networking/p2p/gtk-gnutella/default.nix   | 70 ++++++++++++-------
 1 file changed, 46 insertions(+), 24 deletions(-)

diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
index 70e36cb7ec58..08163bd8a9e2 100644
--- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
+++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
@@ -1,37 +1,58 @@
-{ stdenv, fetchurl, fetchpatch, bison, pkgconfig, gettext, desktop-file-utils
-, glib, gtk2, libxml2, libbfd, zlib, binutils, gnutls
+{ stdenv
+, fetchFromGitHub
+, fetchpatch
+, bison
+, pkgconfig
+, gettext
+, desktop-file-utils
+, glib
+, gtk2
+, libxml2
+, libbfd
+, zlib
+, binutils
+, gnutls
+, enableGui ? true
 }:
 
 stdenv.mkDerivation rec {
   pname = "gtk-gnutella";
-  version = "1.1.14";
+  # NOTE: Please remove hardeningDisable on the next release, see:
+  # https://sourceforge.net/p/gtk-gnutella/bugs/555/#5c19
+  version = "1.1.15";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.xz";
-    sha256 = "0sljjha4anfz1r1xq1c6qnnkjv62ld56p7xgj4bsi6lqmq1azvii";
+  src = fetchFromGitHub {
+    owner = "gtk-gnutella";
+    repo = "gtk-gnutella";
+    rev = "v${version}";
+    sha256 = "1g7w6ywwp2g4qdgmfqkrl1rldk1b4rx50yb7h75hh15mh6nr159r";
   };
 
-  patches = [
-    (fetchpatch {
-      # Avoid namespace conflict with glibc 2.28 'statx' struct / remove after v1.1.14
-      url = "https://github.com/gtk-gnutella/gtk-gnutella/commit/e4205a082eb32161e28de81f5cba8095eea8ecc7.patch";
-      sha256 = "0ffkw2cw2b2yhydii8jm40vd40p4xl224l8jvhimg02lgs3zfbca";
-    })
-    (fetchpatch {
-      url = "https://src.fedoraproject.org/rpms/gtk-gnutella/raw/f30/f/gtk-gnutella-1.1.14-endian.patch";
-      sha256 = "19q4lq8msknfz4mkbjdqmmgld16p30j2yx371p8spmr19q5i0sfn";
-    })
+  nativeBuildInputs = [
+    bison
+    desktop-file-utils
+    gettext
+    pkgconfig
   ];
-
-  postPatch = ''
-    substituteInPlace Makefile.SH --replace "@exit 0" "@echo done"
-  '';
-
-  nativeBuildInputs = [ bison desktop-file-utils gettext pkgconfig ];
-  buildInputs = [ binutils glib gnutls gtk2 libbfd libxml2 zlib ];
+  buildInputs = [
+    glib
+    gnutls
+    libbfd
+    libxml2
+    zlib
+  ]
+  ++
+    stdenv.lib.optionals (enableGui) [ gtk2 ]
+  ;
 
   configureScript = "./build.sh";
-  configureFlags = [ "--configure-only" ];
+  configureFlags = [
+    "--configure-only"
+    # See https://sourceforge.net/p/gtk-gnutella/bugs/555/
+    "--disable-malloc"
+  ]
+    ++ stdenv.lib.optionals (!enableGui) [ "--topless" ]
+  ;
 
   hardeningDisable = [ "bindnow" "fortify" "pic" "relro" ];
 
@@ -45,6 +66,7 @@ stdenv.mkDerivation rec {
     description = "A GTK Gnutella client, optimized for speed and scalability";
     homepage = "http://gtk-gnutella.sourceforge.net/"; # Code: https://github.com/gtk-gnutella/gtk-gnutella
     changelog = "https://raw.githubusercontent.com/gtk-gnutella/gtk-gnutella/v${version}/ChangeLog";
+    maintainers = [ maintainers.doronbehar ];
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
   };

From 05195040c0006c0601075ee092031f2c2d2d04e0 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Mon, 30 Mar 2020 13:29:30 +0200
Subject: [PATCH 4432/4636] nixos/magic-wormhole-mailbox-server: init

---
 nixos/modules/module-list.nix                 |  1 +
 .../mail/magic-wormhole-mailbox-server.nix    | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 nixos/modules/services/mail/magic-wormhole-mailbox-server.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index c2a96c72d165..dafece285b64 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -394,6 +394,7 @@
   ./services/mail/mailcatcher.nix
   ./services/mail/mailhog.nix
   ./services/mail/mailman.nix
+  ./services/mail/magic-wormhole-mailbox-server.nix
   ./services/mail/mlmmj.nix
   ./services/mail/offlineimap.nix
   ./services/mail/opendkim.nix
diff --git a/nixos/modules/services/mail/magic-wormhole-mailbox-server.nix b/nixos/modules/services/mail/magic-wormhole-mailbox-server.nix
new file mode 100644
index 000000000000..09d357cd2b6e
--- /dev/null
+++ b/nixos/modules/services/mail/magic-wormhole-mailbox-server.nix
@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.magic-wormhole-mailbox-server;
+  dataDir = "/var/lib/magic-wormhole-mailbox-server;";
+  python = pkgs.python3.withPackages (py: [ py.magic-wormhole-mailbox-server py.twisted ]);
+in
+{
+  options.services.magic-wormhole-mailbox-server = {
+    enable = mkEnableOption "Enable Magic Wormhole Mailbox Server";
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.magic-wormhole-mailbox-server = {
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        DynamicUser = true;
+        ExecStart = "${python}/bin/twistd --nodaemon wormhole-mailbox";
+        WorkingDirectory = dataDir;
+        StateDirectory = baseNameOf dataDir;
+      };
+    };
+
+  };
+}

From e41f3d9ef3f2354a0763953c553cfb20ccf36ab7 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Mon, 30 Mar 2020 13:58:30 +0100
Subject: [PATCH 4433/4636] pulseaudio: Enable bluetooth support by default

It only increases the closure size by 0.5M and users who do not set
the NixOS option `hardware.pulseaudio.package = pkgs.pulseaudioFull;`
will be stumped by their bluetooth audio not working.
---
 pkgs/servers/pulseaudio/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 49909510d2ed..1a98af055878 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -17,7 +17,7 @@
 
 , airtunesSupport ? false
 
-, bluetoothSupport ? false
+, bluetoothSupport ? true
 
 , remoteControlSupport ? false
 

From af75bb17b984feb51b5100ceff355a28debcf699 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Mon, 30 Mar 2020 13:30:05 +0200
Subject: [PATCH 4434/4636] nixos/tests: add magic-wormhole-mailbox-server

---
 nixos/tests/all-tests.nix                     |  1 +
 nixos/tests/magic-wormhole-mailbox-server.nix | 38 +++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 nixos/tests/magic-wormhole-mailbox-server.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index a84f2c5d2616..2bdced6a3cc1 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -170,6 +170,7 @@ in
   #logstash = handleTest ./logstash.nix {};
   lorri = handleTest ./lorri/default.nix {};
   magnetico = handleTest ./magnetico.nix {};
+  magic-wormhole-mailbox-server = handleTest ./magic-wormhole-mailbox-server.nix {};
   mailcatcher = handleTest ./mailcatcher.nix {};
   mathics = handleTest ./mathics.nix {};
   matomo = handleTest ./matomo.nix {};
diff --git a/nixos/tests/magic-wormhole-mailbox-server.nix b/nixos/tests/magic-wormhole-mailbox-server.nix
new file mode 100644
index 000000000000..144a07e13492
--- /dev/null
+++ b/nixos/tests/magic-wormhole-mailbox-server.nix
@@ -0,0 +1,38 @@
+import ./make-test-python.nix ({ pkgs, ... }: {
+  name = "magic-wormhole-mailbox-server";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ mmahut ];
+  };
+
+  nodes = {
+    server = { ... }: {
+      networking.firewall.allowedTCPPorts = [ 4000 ];
+      services.magic-wormhole-mailbox-server.enable = true;
+    };
+
+    client_alice = { ... }: {
+      networking.firewall.enable = false;
+      environment.systemPackages = [ pkgs.magic-wormhole ];
+    };
+
+    client_bob = { ... }: {
+      environment.systemPackages = [ pkgs.magic-wormhole ];
+    };
+  };
+
+  testScript = ''
+    start_all()
+
+    # Start the wormhole relay server
+    server.wait_for_unit("magic-wormhole-mailbox-server.service")
+    server.wait_for_open_port(4000)
+
+    # Create a secret file and send it to Bob
+    client_alice.succeed("echo mysecret > secretfile")
+    client_alice.succeed("wormhole --relay-url=ws://server:4000/v1 send -0 secretfile &")
+
+    # Retrieve a secret file from Alice and check its content
+    client_bob.succeed("wormhole --relay-url=ws://server:4000/v1 receive -0 --accept-file")
+    client_bob.succeed("grep mysecret secretfile")
+  '';
+})

From d67539de8a5682b187c3db7903a7595a370731ae Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 30 Mar 2020 23:47:15 +1000
Subject: [PATCH 4435/4636] bubblewrap: 0.4.0 -> 0.4.1

https://github.com/containers/bubblewrap/releases/tag/v0.4.1
---
 pkgs/tools/admin/bubblewrap/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix
index 8e2ef7c87e1d..6c61a0439ff6 100644
--- a/pkgs/tools/admin/bubblewrap/default.nix
+++ b/pkgs/tools/admin/bubblewrap/default.nix
@@ -2,18 +2,18 @@
 
 stdenv.mkDerivation rec {
   pname = "bubblewrap";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchurl {
-    url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${pname}-${version}.tar.xz";
-    sha256 = "08r0f4c3fjkb4zjrb4kkax1zfcgcgic702vb62sjjw5xfhppvzp5";
+    url = "https://github.com/containers/bubblewrap/releases/download/v${version}/${pname}-${version}.tar.xz";
+    sha256 = "00ycgi6q2yngh06bnz50wkvar6r2jnjf3j158grhi9k13jdrpimr";
   };
 
   nativeBuildInputs = [ libcap libxslt docbook_xsl ];
 
   meta = with stdenv.lib; {
     description = "Unprivileged sandboxing tool";
-    homepage = https://github.com/projectatomic/bubblewrap;
+    homepage = "https://github.com/containers/bubblewrap";
     license = licenses.lgpl2Plus;
     maintainers = with maintainers; [ ];
   };

From 72aceab6efc726b7d44ae3b8ea8ccaed4385df40 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 31 Mar 2020 00:36:30 +1000
Subject: [PATCH 4436/4636] flatpak: 1.6.2 -> 1.6.3

https://github.com/flatpak/flatpak/releases/tag/1.6.3
---
 pkgs/development/libraries/flatpak/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index 3788974e1244..ceca7e24fb6e 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -54,14 +54,14 @@
 
 stdenv.mkDerivation rec {
   pname = "flatpak";
-  version = "1.6.2";
+  version = "1.6.3";
 
   # TODO: split out lib once we figure out what to do with triggerdir
   outputs = [ "out" "dev" "man" "doc" "installedTests" ];
 
   src = fetchurl {
     url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz";
-    sha256 = "02k9p5n60gz2k85n805n9niic4miw0mfh0i7yk1vrc8vaa5h69wd";
+    sha256 = "17s8nqdxd4xdy7ag9bw06adxccha78jmlsa3zpqnl3qh92pg0hji";
   };
 
   patches = [

From c392d705181cf3677d1326351bf361354a65e52f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 29 Mar 2020 11:27:09 +0200
Subject: [PATCH 4437/4636] pkgsStatic.python3: fix build

---
 pkgs/development/interpreters/python/cpython/default.nix | 7 ++++---
 pkgs/top-level/static.nix                                | 7 +++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index b778b62f908d..23a3d5d84099 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -28,6 +28,7 @@
 , stripTkinter ? false
 , rebuildBytecode ? true
 , stripBytecode ? false
+, static ? false
 }:
 
 assert x11Support -> tcl != null
@@ -130,7 +131,7 @@ in with passthru; stdenv.mkDerivation {
   CPPFLAGS = concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs);
   LDFLAGS = concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs);
   LIBS = "${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}";
-  NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";
+  NIX_LDFLAGS = optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) "-lgcc_s" + optionalString stdenv.hostPlatform.isMusl "-lgcc_eh";
   # Determinism: We fix the hashes of str, bytes and datetime objects.
   PYTHONHASHSEED=0;
 
@@ -169,7 +170,7 @@ in with passthru; stdenv.mkDerivation {
     # Never even try to use lchmod on linux,
     # don't rely on detecting glibc-isms.
     "ac_cv_func_lchmod=no"
-  ];
+  ] ++ optional static "LDFLAGS=-static";
 
   preConfigure = ''
     for i in /usr /sw /opt /pkg; do	# improve purity
@@ -262,7 +263,7 @@ in with passthru; stdenv.mkDerivation {
   # Enforce that we don't have references to the OpenSSL -dev package, which we
   # explicitly specify in our configure flags above.
   disallowedReferences =
-    stdenv.lib.optionals (openssl != null) [ openssl.dev ]
+    stdenv.lib.optionals (openssl != null && !static) [ openssl.dev ]
     ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     # Ensure we don't have references to build-time packages.
     # These typically end up in shebangs.
diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix
index 0de1db7d99b3..c7db64b99f6f 100644
--- a/pkgs/top-level/static.nix
+++ b/pkgs/top-level/static.nix
@@ -266,6 +266,13 @@ in {
   ) super.ocaml-ng;
 
   python27 = super.python27.override { static = true; };
+  python35 = super.python35.override { static = true; };
+  python36 = super.python36.override { static = true; };
+  python37 = super.python37.override { static = true; };
+  python38 = super.python38.override { static = true; };
+  python39 = super.python39.override { static = true; };
+  python3Minimal = super.python3Minimal.override { static = true; };
+
 
   libev = super.libev.override { static = true; };
 }

From 748f8b725ccb8b22f611847bd341847afbde8a75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 30 Mar 2020 16:25:03 +0100
Subject: [PATCH 4438/4636] sysdig: 0.26.5 -> 0.26.6

---
 pkgs/os-specific/linux/sysdig/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 61a51afa3a75..b0becd82d19f 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -5,13 +5,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   pname = "sysdig";
-  version = "0.26.5";
+  version = "0.26.6";
 
   src = fetchFromGitHub {
     owner = "draios";
     repo = "sysdig";
     rev = version;
-    sha256 = "145mwg6izrpi4r1qrygi4yb7qd68g4k64i3qmamk0671wxhjqi3c";
+    sha256 = "1rw9s5lamr02036z26vfmnp5dnn97f00hcnp4xv6gdxim6rpmbz7";
   };
 
   nativeBuildInputs = [ cmake perl ];

From f59308dc2a741b3ea4a112b2ef28917ba673ff55 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2020 10:37:23 +0000
Subject: [PATCH 4439/4636] plantuml: 1.2020.2 -> 1.2020.5

---
 pkgs/tools/misc/plantuml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index 0e9df5350f90..fec1bee160f9 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre, graphviz }:
 
 stdenv.mkDerivation rec {
-  version = "1.2020.2";
+  version = "1.2020.5";
   pname = "plantuml";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
-    sha256 = "1wvlhy76h1bxwjj8r48ixypch1bj9m9721rbawayj8v0hpyr1an4";
+    sha256 = "1cn1bjah9qvhh3hixa92v804crkgz69mg30k8229a551x3alykhd";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From ef3a9c8e9ed7bb02183d7863eaeeaf603cfdc184 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2020 18:04:03 +0000
Subject: [PATCH 4440/4636] python27Packages.jupytext: 1.3.4 -> 1.4.1

---
 pkgs/development/python-modules/jupytext/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix
index a77a1a576b47..8b2d56277cef 100644
--- a/pkgs/development/python-modules/jupytext/default.nix
+++ b/pkgs/development/python-modules/jupytext/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "jupytext";
-  version = "1.3.4";
+  version = "1.4.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0jijf4a3iaskzi6frjwhd8drh7brn94r1zl7gni6d0dzr296mm93";
+    sha256 = "126lmz702hbk7gyr4i6gkicmycx7zgsgjf47a6izq2d17bs0a9ji";
   };
 
   propagatedBuildInputs = [

From 9546a64d468af51648349c775ab2f74ed2db046d Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Mon, 30 Mar 2020 18:04:52 +0000
Subject: [PATCH 4441/4636] vimPlugins: Add --proc flag to update script.

This is based on discussion in #83008 and replaces it.
---
 pkgs/misc/vim-plugins/update.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
index bbeef0889f42..0055e8eccbce 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/misc/vim-plugins/update.py
@@ -477,6 +477,14 @@ def parse_args():
         default=DEFAULT_OUT,
         help="Filename to save generated nix code",
     )
+    parser.add_argument(
+        "--proc",
+        "-p",
+        dest="proc",
+        type=int,
+        default=30,
+        help="Number of concurrent processes to spawn.",
+    )
 
     return parser.parse_args()
 
@@ -491,9 +499,7 @@ def main() -> None:
     prefetch_with_cache = functools.partial(prefetch, cache=cache)
 
     try:
-        # synchronous variant for debugging
-        # results = list(map(prefetch_with_cache, plugin_names))
-        pool = Pool(processes=30)
+        pool = Pool(processes=args.proc)
         results = pool.map(prefetch_with_cache, plugin_names)
     finally:
         cache.store()

From 652342cabe64a04efb9ba74c62f5a23e133e297d Mon Sep 17 00:00:00 2001
From: Even Brenden <evenbrenden@gmail.com>
Date: Mon, 2 Mar 2020 12:04:15 +0100
Subject: [PATCH 4442/4636] vimPlugins.vim-pico8-syntax: init at 2016-10-30

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 4181ddbdd9dc..5c7f8295aa6d 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -4953,6 +4953,17 @@ let
     };
   };
 
+  vim-pico8-syntax = buildVimPluginFrom2Nix {
+    pname = "vim-pico8-syntax";
+    version = "2016-10-30";
+    src = fetchFromGitHub {
+      owner = "justinj";
+      repo = "vim-pico8-syntax";
+      rev = "dbdd92fad0533eeaeaea844815d4de11e9507ce7";
+      sha256 = "0say0bb74rdbabgsf7rrbm8x841pmgh80fwr6kn94fgphr3vhm0s";
+    };
+  };
+
   vim-plug = buildVimPluginFrom2Nix {
     pname = "vim-plug";
     version = "2020-01-27";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 7f271aa0adc0..bfa2ffc47d3f 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -376,6 +376,7 @@ Raimondi/delimitMate
 rakr/vim-one
 rbgrouleff/bclose.vim
 reedes/vim-pencil
+justinj/vim-pico8-syntax
 reedes/vim-wordy
 rhysd/committia.vim
 rhysd/vim-grammarous

From ab30516fec2d0f51859156ae92121f013855710c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2020 18:41:37 +0000
Subject: [PATCH 4443/4636] python27Packages.hdbscan: 0.8.24 -> 0.8.25

---
 pkgs/development/python-modules/hdbscan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix
index 7351b2742100..f95f6e9443f2 100644
--- a/pkgs/development/python-modules/hdbscan/default.nix
+++ b/pkgs/development/python-modules/hdbscan/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "hdbscan";
-  version = "0.8.24";
+  version = "0.8.25";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fe31a7ea0ce2c9babd190a195e491834ff9f64c74daa4ca94fa65a88f701269a";
+    sha256 = "17mi4nlifaygfw3n5ark5mfzx71pjxz3h6l455sh0i5mzh6czk4j";
   };
 
   checkInputs = [ nose ];

From 4665e31ffd98d9e90dd58d2dd90beda02d6fa1b2 Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Mon, 30 Mar 2020 21:02:52 +0100
Subject: [PATCH 4444/4636] zotero: make wrapGAppsHook work

---
 pkgs/applications/office/zotero/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index 54530cb8dce0..8a27dcd3c9fc 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -42,10 +42,11 @@ stdenv.mkDerivation rec {
     sha256 = "1abkwxdi154hnry8nsvxbklvbsnvd7cs2as0041h2kbiz824pv31";
   };
 
-  buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme dconf ];
-
-  phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ];
+  nativeBuildInputs = [ wrapGAppsHook ];
+  buildInputs= [ gsettings-desktop-schemas glib gtk3 gnome3.adwaita-icon-theme dconf ];
 
+  dontConfigure = true;
+  dontBuild = true;
   dontStrip = true;
   dontPatchELF = true;
 

From bd6a1ae174a4d57d75ec15f6c1691235319bac64 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2020 21:08:32 +0000
Subject: [PATCH 4445/4636] python27Packages.phonenumbers: 8.11.4 -> 8.12.0

---
 pkgs/development/python-modules/phonenumbers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index ff64f9ca82df..f16bf3f014ce 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.11.4";
+  version = "8.12.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "13hfcw89kppm8s2qx0s5bafzxjc0qhm9sxmpf6yqvshz2fn82pk8";
+    sha256 = "0mnicas0c5av322d7k6m14j3c10axh9mcvn3vx99vhngdnb9j6hn";
   };
 
   meta = {

From 2f8795d32a95e0cb1f38959c87d265241772a3cd Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 30 Mar 2020 20:31:18 +0000
Subject: [PATCH 4446/4636] qastools: 0.21.0 -> 0.22.0

---
 pkgs/tools/audio/qastools/default.nix | 30 +++++++++++----------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/tools/audio/qastools/default.nix
index bdc431bcb928..80775fe6f51a 100644
--- a/pkgs/tools/audio/qastools/default.nix
+++ b/pkgs/tools/audio/qastools/default.nix
@@ -1,30 +1,24 @@
-{ mkDerivation, lib, fetchurl, cmake, alsaLib, udev, qtbase, qtsvg, qttools }:
+{ mkDerivation, lib, fetchFromGitLab, cmake, alsaLib, udev, qtbase, qtsvg, qttools }:
 
-let
-  version = "0.21.0";
-in
-
-mkDerivation {
+mkDerivation rec {
   pname = "qastools";
-  inherit version;
+  version = "0.22.0";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/project/qastools/${version}/qastools_${version}.tar.bz2";
-    sha256 = "1zl9cn5h43n63yp3z1an87xvw554k9hlcz75ddb30lvpcczkmwrh";
+  src = fetchFromGitLab {
+    owner = "sebholt";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0px4fcn8dagivq5fyi5gy84yj86f6x0lk805mc4ry58d0wsbn68v";
   };
 
-  buildInputs = [
-    alsaLib udev qtbase qtsvg qttools
-  ];
   nativeBuildInputs = [ cmake ];
-
-  cmakeFlags = [
-    "-DALSA_INCLUDE=${alsaLib.dev}/include/alsa/version.h"
-  ];
+  buildInputs = [ alsaLib udev qtbase qtsvg qttools ];
 
   meta = with lib; {
     description = "Collection of desktop applications for ALSA configuration";
-    license = licenses.gpl3;
+    homepage = https://gitlab.com/sebholt/qastools;
+    license = licenses.mit;
+    maintainers = with maintainers; [ orivej ];
     platforms = platforms.linux;
   };
 }

From 53dc9d67513eb01ea52691889ad355a11ac825c5 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Sat, 28 Mar 2020 09:49:05 +0000
Subject: [PATCH 4447/4636] pythonPackages.roku: init at v4.1

---
 .gitignore                                    |  1 +
 .../python-modules/roku/default.nix           | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 3 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/python-modules/roku/default.nix

diff --git a/.gitignore b/.gitignore
index b3ae9e6ea863..ca00bc4df574 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ result-*
 .version-suffix
 
 .DS_Store
+.mypy_cache
 
 /pkgs/development/libraries/qt-5/*/tmp/
 /pkgs/desktops/kde-5/*/tmp/
diff --git a/pkgs/development/python-modules/roku/default.nix b/pkgs/development/python-modules/roku/default.nix
new file mode 100644
index 000000000000..6cdfa2aa15b1
--- /dev/null
+++ b/pkgs/development/python-modules/roku/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, buildPythonPackage, requests, pytest, flask, isPy27
+}:
+
+buildPythonPackage rec {
+  version = "4.1";
+  pname = "roku";
+  disabled = isPy27;
+
+  src = fetchFromGitHub {
+    owner = "jcarbaugh";
+    repo = "python-roku";
+    rev = "v${version}";
+    sha256 = "09mq59kjll7gj1srw4qc921ncsm7cld95sbz5v3p2bwmgckpqza7";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  checkInputs = [ pytest flask ];
+  pythonImportsCheck = [ "roku" ];
+
+  meta = with stdenv.lib; {
+    description = "Screw remotes. Control your Roku with Python.";
+    homepage = "https://github.com/jcarbaugh/python-roku";
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 74003cde6e5b..2e657da33886 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3299,6 +3299,8 @@ in {
 
   rethinkdb = callPackage ../development/python-modules/rethinkdb { };
 
+  roku = callPackage ../development/python-modules/roku { };
+
   roman = callPackage ../development/python-modules/roman { };
 
   rotate-backups = callPackage ../tools/backup/rotate-backups { };

From 919a924e0471249854656540e352dda66de5dce6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2020 18:48:16 +0000
Subject: [PATCH 4448/4636] python37Packages.nbdime: 1.1.0 -> 2.0.0

---
 pkgs/development/python-modules/nbdime/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix
index f641c017384b..7e774eed2962 100644
--- a/pkgs/development/python-modules/nbdime/default.nix
+++ b/pkgs/development/python-modules/nbdime/default.nix
@@ -24,12 +24,12 @@
 
 buildPythonPackage rec {
   pname = "nbdime";
-  version = "1.1.0";
+  version = "2.0.0";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0qfy7nmlg75vryvrlgd6p0rqrvcclq8n9kd0n4xv5959s9sjy0w0";
+    sha256 = "0pbi22mc5al29pvsw7bhai2d58i8n77gv09r7avr1wap6ni7jvw9";
   };
 
   checkInputs = [
@@ -61,7 +61,7 @@ buildPythonPackage rec {
     ];
 
   meta = with lib; {
-    homepage = https://github.com/jupyter/nbdime;
+    homepage = "https://github.com/jupyter/nbdime";
     description = "Tools for diffing and merging of Jupyter notebooks.";
     license = licenses.bsd3;
     maintainers = with maintainers; [ tbenst ];

From b1e3fb77479bade4dbbcd05b827e1884f1812058 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 31 Mar 2020 00:03:05 +0200
Subject: [PATCH 4449/4636] diffoscope: 137 -> 138

https://salsa.debian.org/reproducible-builds/diffoscope/-/tags/138
---
 pkgs/tools/misc/diffoscope/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 9273d82455de..0ce0e1be3256 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -9,11 +9,11 @@
 # Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
 python3Packages.buildPythonApplication rec {
   pname = "diffoscope";
-  version = "137";
+  version = "138";
 
   src = fetchurl {
     url    = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
-    sha256 = "1qa508nlqvz0s0cd6jk5c8m43kqfx1h2mgx50iphy4y0spnyv946";
+    sha256 = "171nz5n4dayr7bj04h0x282vdk92kp7lgarnb3x0md91m2i9x997";
   };
 
   patches = [

From ff07660248ab4a09a88224f84762273fdb9da8ce Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 31 Mar 2020 00:04:52 +0200
Subject: [PATCH 4450/4636] riot-web: 1.5.13 -> 1.5.14

https://github.com/vector-im/riot-web/releases/tag/v1.5.14
---
 .../networking/instant-messengers/riot/riot-web.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index 1ff55fbb1cb0..31c571c1ee4b 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -12,11 +12,11 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "riot-web";
-  version = "1.5.13";
+  version = "1.5.14";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "0xghpf9rv7ns5aipc6n517qd9dp50rr93arvx6r36kqhkdyzbfad";
+    sha256 = "1dqqrlr9gby4y8dhw6c50w261bz4f5drkcal98g1396ikcfff3mh";
   };
 
   installPhase = ''

From ec15aeb12f0304465ce8e69fc92ea609b70e89d6 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 31 Mar 2020 00:05:25 +0200
Subject: [PATCH 4451/4636] riot-desktop: 1.5.13 -> 1.5.14

https://github.com/vector-im/riot-web/releases/tag/v1.5.14
---
 .../instant-messengers/riot/riot-desktop-package.json     | 2 +-
 .../instant-messengers/riot/riot-desktop-yarndeps.nix     | 8 ++++----
 .../networking/instant-messengers/riot/riot-desktop.nix   | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
index 418375e80c36..4e014c9633f9 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "1.5.12",
+  "version": "1.5.14",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "dependencies": {
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix
index b76848c2b810..e1dce803b408 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix
@@ -610,11 +610,11 @@
       };
     }
     {
-      name = "minimist___minimist_1.2.0.tgz";
+      name = "minimist___minimist_1.2.2.tgz";
       path = fetchurl {
-        name = "minimist___minimist_1.2.0.tgz";
-        url  = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz";
-        sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+        name = "minimist___minimist_1.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.2.tgz";
+        sha1 = "b00a00230a1108c48c169e69a291aafda3aacd63";
       };
     }
     {
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
index 8218e0de9deb..5ae24c6a8dfb 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
@@ -6,12 +6,12 @@
 
 let
   executableName = "riot-desktop";
-  version = "1.5.13";
+  version = "1.5.14";
   riot-web-src = fetchFromGitHub {
     owner = "vector-im";
     repo = "riot-web";
     rev = "v${version}";
-    sha256 = "1p2bdqq8yziv3l7kjkwqvi27a8djav7rk3lsipl7dvdjk1926941";
+    sha256 = "0dkji5rgiakdzcba2v104hhvbw9j98ik95vzwcckksja79zfjmww";
   };
   electron = electron_7;
 

From 9a9f28bc094f9bc3761f6c978ab4b3d15f018fa7 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Sat, 28 Mar 2020 10:10:49 +0000
Subject: [PATCH 4452/4636] home-assistant: regenerate component-packages.nix
 (roku)

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 070e7238bc6a..0b2aa999f727 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -640,7 +640,7 @@
     "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api
     "rmvtransport" = ps: with ps; [ ]; # missing inputs: PyRMVtransport
     "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API
-    "roku" = ps: with ps; [ ]; # missing inputs: roku
+    "roku" = ps: with ps; [ roku];
     "roomba" = ps: with ps; [ ]; # missing inputs: roombapy
     "route53" = ps: with ps; [ boto3]; # missing inputs: ipify
     "rova" = ps: with ps; [ ]; # missing inputs: rova

From 8f91b1745a8fa5fc2cf05ffefd2db2b7fccb289d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2020 14:10:32 +0000
Subject: [PATCH 4453/4636] python27Packages.cocotb: 1.3.0 -> 1.3.1

---
 pkgs/development/python-modules/cocotb/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix
index 9bde31d1f13c..c0148effdf94 100644
--- a/pkgs/development/python-modules/cocotb/default.nix
+++ b/pkgs/development/python-modules/cocotb/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "cocotb";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "0gwd79zm7196fhnbzbdpyvgzsfjfzl3pmc5hh27h7hckfpxzj9yw";
+    sha256 = "118wp5sjsl99hj8pqw5n3v2lry9r949p2hv4l92p086q1n0axxk3";
   };
 
   propagatedBuildInputs = [
@@ -26,7 +26,7 @@ buildPythonPackage rec {
       substituteInPlace $f --replace 'shell which' 'shell command -v'
     done
 
-    # This can probably be removed in the next update after 1.3.0
+    # This can probably be removed in the next update after 1.3.1
     substituteInPlace cocotb/share/makefiles/Makefile.inc --replace "-Werror" ""
   '';
 

From b0a29a6dae7d124cdbd9a5c62347fea291671d53 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2020 12:13:36 +0000
Subject: [PATCH 4454/4636] python27Packages.cgroup-utils: 0.6 -> 0.8

---
 pkgs/development/python-modules/cgroup-utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cgroup-utils/default.nix b/pkgs/development/python-modules/cgroup-utils/default.nix
index 7496e7e1fcce..a94b4439250e 100644
--- a/pkgs/development/python-modules/cgroup-utils/default.nix
+++ b/pkgs/development/python-modules/cgroup-utils/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPythonPackage, fetchFromGitHub, pep8, nose }:
 
 buildPythonPackage rec {
-  version = "0.6";
+  version = "0.8";
   pname = "cgroup-utils";
 
   buildInputs = [ pep8 nose ];
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "peo3";
     repo = "cgroup-utils";
     rev = "v${version}";
-    sha256 = "1ck0aijzrg9xf6hjdxnynkapnyxw0y385jb0q7wyq4jf77ayfszc";
+    sha256 = "0qnbn8cnq8m14s8s1hcv25xjd55dyb6yy54l5vc7sby5xzzp11fq";
   };
 
   meta = with stdenv.lib; {

From b7572546b49ec535832f70bcf0a4b122cb3f25d5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2020 16:42:10 +0000
Subject: [PATCH 4455/4636] python27Packages.ipdb: 0.13.0 -> 0.13.2

---
 pkgs/development/python-modules/ipdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix
index 5de9e25bcf1f..4b234cc11ac8 100644
--- a/pkgs/development/python-modules/ipdb/default.nix
+++ b/pkgs/development/python-modules/ipdb/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "ipdb";
-  version = "0.13.0";
+  version = "0.13.2";
   disabled = isPyPy;  # setupterm: could not find terminfo database
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0nbs9m2pqg4j10m7c31vyb8h7wy29d9s8kiv0k2igbr821k1y3xr";
+    sha256 = "0jcd849rx30y3wcgzsqbn06v0yjlzvb9x3076q0yxpycdwm1ryvp";
   };
 
   propagatedBuildInputs = [ ipython ];

From d3a077ca067cb56e611277a3a1d88bc2234f8d45 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2020 16:10:03 +0000
Subject: [PATCH 4456/4636] python27Packages.identify: 1.4.11 -> 1.4.13

---
 pkgs/development/python-modules/identify/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix
index 7102995cdf24..c0858605bd72 100644
--- a/pkgs/development/python-modules/identify/default.nix
+++ b/pkgs/development/python-modules/identify/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "identify";
-  version = "1.4.11";
+  version = "1.4.13";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "15kbcgqz6zf9qqvyw3pwy611knv1lyaqmc213ivmqciq3zifn96q";
+    sha256 = "12adarxndb9f5kgbfch9644h86jhbf6vc1d5c5iiqnjqws9n495b";
   };
 
   # Tests not included in PyPI tarball

From ac5ac65dbed23bae2604f67a867ba5f063cb8249 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2020 10:01:55 +0000
Subject: [PATCH 4457/4636] aeolus: 0.9.7 -> 0.9.8

---
 pkgs/applications/audio/aeolus/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix
index ee9932a7aa3b..bfd75b4e75cf 100644
--- a/pkgs/applications/audio/aeolus/default.nix
+++ b/pkgs/applications/audio/aeolus/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "aeolus";
-  version = "0.9.7";
+  version = "0.9.8";
 
   src = fetchurl {
     url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";
-    sha256 = "0lhbr95hmbfj8ynbcpawn7jzjbpvrkm6k2yda39yhqk1bzg38v2k";
+    sha256 = "1zfr3567mwbqsfybkhg03n5dvmhllk88c9ayb10qzz2nh6d7g2qn";
   };
 
   buildInputs = [
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Synthetized (not sampled) pipe organ emulator";
-    homepage = http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html;
+    homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html";
     license = stdenv.lib.licenses.lgpl3;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.nico202 ];

From 10e9320ddf64836f37f094abcdd9228866f6b5f0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Mar 2020 13:21:30 +0000
Subject: [PATCH 4458/4636] synthv1: 0.9.12 -> 0.9.13

---
 pkgs/applications/audio/synthv1/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index f58166a59846..6339dad7f378 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -2,11 +2,11 @@
 
 mkDerivation rec {
   pname = "synthv1";
-  version = "0.9.12";
+  version = "0.9.13";
 
   src = fetchurl {
     url = "mirror://sourceforge/synthv1/${pname}-${version}.tar.gz";
-    sha256 = "1amxrl1cqwgncw5437r572frgf6xhss3cfpbgh178i8phlq1q731";
+    sha256 = "0bb48myvgvqcibwm68qhd4852pjr2g19rasf059a799d1hzgfq3l";
   };
 
   buildInputs = [ qtbase qttools libjack2 alsaLib liblo lv2 ];
@@ -15,7 +15,7 @@ mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx";
-    homepage = https://synthv1.sourceforge.io/;
+    homepage = "https://synthv1.sourceforge.io/";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.goibhniu ];

From 69cf4ef39ca454876663421b94ac1289caf598cb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Mar 2020 11:31:57 +0000
Subject: [PATCH 4459/4636] samplv1: 0.9.12 -> 0.9.13

---
 pkgs/applications/audio/samplv1/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index 8c8e5407f7ae..86f8f666d80d 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "samplv1";
-  version = "0.9.12";
+  version = "0.9.13";
 
   src = fetchurl {
     url = "mirror://sourceforge/samplv1/${pname}-${version}.tar.gz";
-    sha256 = "0xzjxiqzcf1ygabrjsy0iachhnpy85rp9519fmj2f568r6ml6hzg";
+    sha256 = "0clsp6s5qfnh0xaxbd35vq2ppi72q9dfayrzlgl73800a8p7gh9m";
   };
 
   buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx";
-    homepage = http://samplv1.sourceforge.net/;
+    homepage = "http://samplv1.sourceforge.net/";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.goibhniu ];

From bd245a755fba4f0e2d46b0a1d24c3d4f97e0959d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Mar 2020 10:05:53 +0000
Subject: [PATCH 4460/4636] stacks: 2.41 -> 2.52

---
 pkgs/applications/science/biology/stacks/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/biology/stacks/default.nix b/pkgs/applications/science/biology/stacks/default.nix
index e778c3bd52cc..93a02a46bd88 100644
--- a/pkgs/applications/science/biology/stacks/default.nix
+++ b/pkgs/applications/science/biology/stacks/default.nix
@@ -2,17 +2,17 @@
     
 stdenv.mkDerivation rec {
   pname = "stacks";
-  version = "2.41";
+  version = "2.52";
   src = fetchurl {
     url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz";
-    sha256 = "0q420rzjb05jfchcls3pysm4hxfgs6xj2jw246isx0il10g93gkq";
+    sha256 = "0gq3kbj910jsq591wylzjmd23srjlsssmrckmf46m4ysjqdqd8vm";
   };
 
   buildInputs = [ zlib ];
 
   meta = {
     description = "Software pipeline for building loci from short-read sequences";
-    homepage = http://catchenlab.life.illinois.edu/stacks/;
+    homepage = "http://catchenlab.life.illinois.edu/stacks/";
     maintainers = [ stdenv.lib.maintainers.bzizou ];
     license = stdenv.lib.licenses.gpl3;
   };

From ee5f8636fe39ce1f7a72b2c78db68d7269de16f2 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 30 Mar 2020 22:48:33 +0000
Subject: [PATCH 4461/4636] qpaeq: fix build with desktop file validation after
 #75729

Audio;Mixer; puts it near KMix which has Categories=Qt;KDE;AudioVideo;Audio;Mixer;
---
 pkgs/servers/pulseaudio/qpaeq.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/pulseaudio/qpaeq.nix b/pkgs/servers/pulseaudio/qpaeq.nix
index c84cc29f6528..2b8b08e025bb 100644
--- a/pkgs/servers/pulseaudio/qpaeq.nix
+++ b/pkgs/servers/pulseaudio/qpaeq.nix
@@ -13,7 +13,7 @@ let
     icon = "audio-volume-high";
     desktopName = "qpaeq";
     genericName = "Audio equalizer";
-    categories = "Music;Sound;";
+    categories = "Audio;Mixer;";
     startupNotify = "false";
   };
 in

From ab2d5c286c57dd9d5c373db9fe910bb9bbddff53 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2020 04:20:24 +0000
Subject: [PATCH 4462/4636] leatherman: 1.10.0 -> 1.11.0

---
 pkgs/development/libraries/leatherman/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix
index 48735c13ed15..1fab7ee28a8a 100644
--- a/pkgs/development/libraries/leatherman/default.nix
+++ b/pkgs/development/libraries/leatherman/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "leatherman";
-  version = "1.10.0";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
-    sha256 = "1kvvqvr0djz4gb770rs5h97zqcymvbzrmsw8kz2icvlmcicm7qd8";
+    sha256 = "1kp35gnph9myqxdxzyj1871ay19nfajxglzwai1gvsnh5840xnxy";
     rev = version;
     repo = "leatherman";
     owner = "puppetlabs";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/puppetlabs/leatherman/;
+    homepage = "https://github.com/puppetlabs/leatherman/";
     description = "A collection of C++ and CMake utility libraries";
     license = licenses.asl20;
     maintainers = [ maintainers.womfoo ];

From 915d58ba7cbb763bb6b6574c74a54fceca53128f Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Mon, 30 Mar 2020 14:57:50 -0700
Subject: [PATCH 4463/4636] python3Packages.subunit: fix build and add tests

---
 .../python-modules/subunit/default.nix        | 33 ++++++++++++-------
 pkgs/top-level/python-packages.nix            |  4 ++-
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/subunit/default.nix b/pkgs/development/python-modules/subunit/default.nix
index eeef94e6c765..f46226891877 100644
--- a/pkgs/development/python-modules/subunit/default.nix
+++ b/pkgs/development/python-modules/subunit/default.nix
@@ -1,22 +1,33 @@
 { buildPythonPackage
-, pkgs
-, testtools
+# pkgs dependencies
+, check
+, cppunit
+, pkg-config
+, subunit
+
+# python dependencies
+, fixtures
+, hypothesis
+, pytest
 , testscenarios
+, testtools
 }:
 
 buildPythonPackage {
-  name = pkgs.subunit.name;
-  src = pkgs.subunit.src;
+  inherit (subunit) name src meta;
 
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ check cppunit ];
   propagatedBuildInputs = [ testtools ];
-  checkInputs = [ testscenarios ];
-  nativeBuildInputs = [ pkgs.pkgconfig ];
-  buildInputs = [ pkgs.check pkgs.cppunit ];
 
-  patchPhase = ''
-    sed -i 's/version=VERSION/version="${pkgs.subunit.version}"/' setup.py
+  checkInputs = [ testscenarios hypothesis fixtures pytest ];
+  # ignore tests which call shell code, or call methods which haven't been implemented
+  checkPhase = ''
+    pytest python/subunit \
+      --ignore=python/subunit/tests/test_{output_filter,test_protocol{,2}}.py
   '';
 
-  meta = pkgs.subunit.meta;
-
+  patchPhase = ''
+    sed -i 's/version=VERSION/version="${subunit.version}"/' setup.py
+  '';
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 74003cde6e5b..ef46edc70b4d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6158,7 +6158,9 @@ in {
 
   subdownloader = callPackage ../development/python-modules/subdownloader { };
 
-  subunit = callPackage ../development/python-modules/subunit { };
+  subunit = callPackage ../development/python-modules/subunit {
+    inherit (pkgs) subunit pkg-config cppunit check;
+  };
 
   sure = callPackage ../development/python-modules/sure { };
 

From 62948a60be5f9f4db9d51a5948f18d1001d065d9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2020 12:33:32 +0000
Subject: [PATCH 4464/4636] python27Packages.datadog: 0.34.1 -> 0.35.0

---
 pkgs/development/python-modules/datadog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix
index 204a14eb0da8..d08d0903886e 100644
--- a/pkgs/development/python-modules/datadog/default.nix
+++ b/pkgs/development/python-modules/datadog/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "datadog";
-  version = "0.34.1";
+  version = "0.35.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1msi3wm0khmzh0ad7lwd5gigmqrxj25hd4w0qrsarihmd4ywrn1v";
+    sha256 = "0qpy6mg9gfjxvjms0aaglzayhmdds4agv0lh05g2mkfw620nm8zl";
   };
 
   postPatch = ''

From dad6f372fb742cb93f3fc7745915b02b3f701087 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 27 Mar 2020 23:29:51 +0000
Subject: [PATCH 4465/4636] python27Packages.flaskbabel: 0.12.2 -> 1.0.0

---
 pkgs/development/python-modules/flaskbabel/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/flaskbabel/default.nix b/pkgs/development/python-modules/flaskbabel/default.nix
index d3a46143e6e5..db0a4377947e 100644
--- a/pkgs/development/python-modules/flaskbabel/default.nix
+++ b/pkgs/development/python-modules/flaskbabel/default.nix
@@ -10,18 +10,18 @@
 
 buildPythonPackage rec {
   pname = "Flask-Babel";
-  version = "0.12.2";
+  version = "1.0.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "316ad183e42003f3922957fa643d0a1e8e34a0f0301a88c3a8f605bc37ba5c86";
+    sha256 = "0gmb165vkwv5v7dxsxa2i3zhafns0fh938m2zdcrv4d8z5l099yn";
   };
 
   propagatedBuildInputs = [ flask jinja2 speaklater Babel pytz ];
 
   meta = with stdenv.lib; {
     description = "Adds i18n/l10n support to Flask applications";
-    homepage = https://github.com/mitsuhiko/flask-babel;
+    homepage = "https://github.com/mitsuhiko/flask-babel";
     license = licenses.bsd0;
     maintainers = with maintainers; [ matejc ];
   };

From cce45bd7d724fd117d57839250149d524f69e75e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2020 11:12:19 +0000
Subject: [PATCH 4466/4636] commonsLang: 3.9 -> 3.10

---
 pkgs/development/libraries/java/commons/lang/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/java/commons/lang/default.nix b/pkgs/development/libraries/java/commons/lang/default.nix
index 675265ed4e32..96d2a76df018 100644
--- a/pkgs/development/libraries/java/commons/lang/default.nix
+++ b/pkgs/development/libraries/java/commons/lang/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "3.9";
+  version = "3.10";
   pname = "commons-lang";
 
   src = fetchurl {
     url    = "mirror://apache/commons/lang/binaries/commons-lang3-${version}-bin.tar.gz";
-    sha256 = "0l0q1hnicvpbjmxl81ig3rwc212x5sdfnlg3cniwbmnx8fxjgbki";
+    sha256 = "144057jrx1jral6dnnb039h3k8rnrx0nj3ii428s725jfhazg68f";
   };
 
   installPhase = ''

From 725e7aec63a2c27af36170783e1b2058b0240c5b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2020 12:46:19 +0000
Subject: [PATCH 4467/4636] calcurse: 4.5.1 -> 4.6.0

---
 pkgs/applications/misc/calcurse/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix
index 8f8934cb084b..ce3a2c0a271f 100644
--- a/pkgs/applications/misc/calcurse/default.nix
+++ b/pkgs/applications/misc/calcurse/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "calcurse";
-  version = "4.5.1";
+  version = "4.6.0";
 
   src = fetchurl {
     url = "https://calcurse.org/files/${pname}-${version}.tar.gz";
-    sha256 = "0cgkd285x5pk62lmdx9fjxl46c5lj8wj2cqbxq7d99yb4il5fdjk";
+    sha256 = "0hzhdpkkn75jlymanwzl69hrrf1pw29hrchr11wlxqjpl43h62gs";
   };
 
   buildInputs = [ ncurses gettext python3 python3Packages.wrapPython ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       customized to suit user needs and a very powerful set of command line options can
       be used to filter and format appointments, making it suitable for use in scripts.
     '';
-    homepage = http://calcurse.org/;
+    homepage = "http://calcurse.org/";
     license = licenses.bsd2;
     platforms = platforms.linux;
   };

From 5e8451b8a3b4578fbfaa1990e11853c921e83d52 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 28 Mar 2020 09:34:10 +0000
Subject: [PATCH 4468/4636] socket_wrapper: 1.2.3 -> 1.2.4

---
 pkgs/development/libraries/socket_wrapper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix
index 2903e79f8910..e6095ca82c53 100644
--- a/pkgs/development/libraries/socket_wrapper/default.nix
+++ b/pkgs/development/libraries/socket_wrapper/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "socket_wrapper-1.2.3";
+  name = "socket_wrapper-1.2.4";
 
   src = fetchurl {
     url = "mirror://samba/cwrap/${name}.tar.gz";
-    sha256 = "1jprm8f7xb91b3yrapdbf51l36j6g038n379akz7ds0dicjh0fh7";
+    sha256 = "07m0g5sxjl15h8h95ppf42mkilp9h1xc9camryg8l9bw8b2v8m4a";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 0e952b8d43bfeab990d3206cda67a6f97c033642 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2020 20:22:56 +0000
Subject: [PATCH 4469/4636] hwinfo: 21.68 -> 21.69

---
 pkgs/tools/system/hwinfo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix
index 048af14efb15..b8bbe09fcb73 100644
--- a/pkgs/tools/system/hwinfo/default.nix
+++ b/pkgs/tools/system/hwinfo/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "hwinfo";
-  version = "21.68";
+  version = "21.69";
 
   src = fetchFromGitHub {
     owner = "opensuse";
     repo = "hwinfo";
     rev = version;
-    sha256 = "0x63rkyl16918l8yf0azy2lyxaqy8nc6iafid89acvxn32j146rg";
+    sha256 = "01lmxyqhx092ahbls7z9gwgmsinlqcv8zb7xvklbwyhzy5c02fxx";
   };
 
   patchPhase = ''
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Hardware detection tool from openSUSE";
     license = licenses.gpl2;
-    homepage = https://github.com/openSUSE/hwinfo;
+    homepage = "https://github.com/openSUSE/hwinfo";
     maintainers = with maintainers; [ bobvanderlinden ];
     platforms = platforms.linux;
   };

From a7e4dba1e9b36a4dbb532dd39edaac63cbc98c26 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 30 Mar 2020 23:10:14 +0200
Subject: [PATCH 4470/4636] flatpak: do not use autoreconfHook

They use custom autogen.sh and running autoreconf is not enough.

This is necessary when running from Git, which I do on almost every update.
---
 pkgs/development/libraries/flatpak/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index ceca7e24fb6e..62a9ebcd7fb3 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -1,6 +1,8 @@
 { stdenv
 , fetchurl
-, autoreconfHook
+, autoconf
+, automake
+, libtool
 , docbook_xml_dtd_412
 , docbook_xml_dtd_42
 , docbook_xml_dtd_43
@@ -104,7 +106,9 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    autoreconfHook
+    autoconf
+    automake
+    libtool
     libxml2
     docbook_xml_dtd_412
     docbook_xml_dtd_42
@@ -179,6 +183,10 @@ stdenv.mkDerivation rec {
     patchShebangs tests
   '';
 
+  preConfigure = ''
+    NOCONFIGURE=1 ./autogen.sh
+  '';
+
   passthru = {
     tests = {
       installedTests = nixosTests.installed-tests.flatpak;

From 03ccfe23f71704813b1ebc37f97ffd56f7fe5c29 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 30 Mar 2020 00:06:19 -0400
Subject: [PATCH 4471/4636] pythonPackages.pyarrow: remove dead code in
 preCheck, use pytestCheckHook

---
 .../python-modules/pyarrow/default.nix        | 36 +++----------------
 1 file changed, 5 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix
index 6d51729e0c32..a63e32f9da67 100644
--- a/pkgs/development/python-modules/pyarrow/default.nix
+++ b/pkgs/development/python-modules/pyarrow/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchpatch, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytest, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }:
+{ lib, fetchpatch, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }:
 
 let
   _arrow-cpp = arrow-cpp.override { inherit python; };
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ];
   propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ];
-  checkInputs = [ hypothesis pandas pytest pytest-lazy-fixture ];
+  checkInputs = [ hypothesis pandas pytestCheckHook pytest-lazy-fixture ];
 
   PYARROW_BUILD_TYPE = "release";
   PYARROW_WITH_PARQUET = true;
@@ -34,6 +34,8 @@ buildPythonPackage rec {
     # ourselves
     "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW"
   ];
+  ARROW_HOME = _arrow-cpp;
+  PARQUET_HOME = _arrow-cpp;
 
   dontUseCmakeConfigure = true;
 
@@ -41,40 +43,12 @@ buildPythonPackage rec {
     export PYARROW_PARALLEL=$NIX_BUILD_CORES
   '';
 
+  dontUseSetuptoolsCheck = true;
   preCheck = ''
-    rm pyarrow/tests/test_jvm.py
-    rm pyarrow/tests/test_hdfs.py
-    rm pyarrow/tests/test_cuda.py
-
-    # fails: "ArrowNotImplementedError: Unsupported numpy type 22"
-    substituteInPlace pyarrow/tests/test_feather.py --replace "test_timedelta_with_nulls" "_disabled"
-
-    # runs out of memory on @grahamcofborg linux box
-    substituteInPlace pyarrow/tests/test_feather.py --replace "test_large_dataframe" "_disabled"
-
-    # probably broken on python2
-    substituteInPlace pyarrow/tests/test_feather.py --replace "test_unicode_filename" "_disabled"
-
-    # fails "error: [Errno 2] No such file or directory: 'test'" because
-    # nix_run_setup invocation somehow manages to import deserialize_buffer.py
-    # when it is not intended to be imported at all
-    rm pyarrow/tests/deserialize_buffer.py
-    substituteInPlace pyarrow/tests/test_feather.py --replace "test_deserialize_buffer_in_different_process" "_disabled"
-
-    # Fails to bind a socket
-    # "PermissionError: [Errno 1] Operation not permitted"
-    substituteInPlace pyarrow/tests/test_ipc.py --replace "test_socket_" "_disabled"
-  '';
-
-  ARROW_HOME = _arrow-cpp;
-  PARQUET_HOME = _arrow-cpp;
-
-  checkPhase = ''
     mv pyarrow/tests tests
     rm -rf pyarrow
     mkdir pyarrow
     mv tests pyarrow/tests
-    pytest -v
   '';
 
   meta = with lib; {

From 40ecaf3808482bb402fc2b06aac5eac55f205bde Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 31 Mar 2020 02:54:31 +0200
Subject: [PATCH 4472/4636] Revert "flatpak: do not use autoreconfHook"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a7e4dba1e9b36a4dbb532dd39edaac63cbc98c26.

Apparently, tarballs do not ship autogen.sh 😿
---
 pkgs/development/libraries/flatpak/default.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index 62a9ebcd7fb3..ceca7e24fb6e 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -1,8 +1,6 @@
 { stdenv
 , fetchurl
-, autoconf
-, automake
-, libtool
+, autoreconfHook
 , docbook_xml_dtd_412
 , docbook_xml_dtd_42
 , docbook_xml_dtd_43
@@ -106,9 +104,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    autoconf
-    automake
-    libtool
+    autoreconfHook
     libxml2
     docbook_xml_dtd_412
     docbook_xml_dtd_42
@@ -183,10 +179,6 @@ stdenv.mkDerivation rec {
     patchShebangs tests
   '';
 
-  preConfigure = ''
-    NOCONFIGURE=1 ./autogen.sh
-  '';
-
   passthru = {
     tests = {
       installedTests = nixosTests.installed-tests.flatpak;

From e38859deac63651da43e145e350a4beddf3c69cf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2020 18:08:11 +0000
Subject: [PATCH 4473/4636] ephemeral: 6.3.0 -> 6.3.1

---
 pkgs/applications/networking/browsers/ephemeral/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix
index ea840694bd31..dd0365760f94 100644
--- a/pkgs/applications/networking/browsers/ephemeral/default.nix
+++ b/pkgs/applications/networking/browsers/ephemeral/default.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ephemeral";
-  version = "6.3.0";
+  version = "6.3.1";
 
   src = fetchFromGitHub {
     owner = "cassidyjames";
     repo = "ephemeral";
     rev = version;
-    sha256 = "0h159szljvphs2hvagxwv6nncx46q0mvr4ylhl2nimap9jvss91n";
+    sha256 = "13rl26lv5xgagiv21yp5pz69bkwh4nnz1lx9wryhsplki45xm1sq";
   };
 
   nativeBuildInputs = [
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "The always-incognito web browser";
-    homepage = https://github.com/cassidyjames/ephemeral;
+    homepage = "https://github.com/cassidyjames/ephemeral";
     maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers;
     platforms = platforms.linux;
     license = licenses.gpl3;

From 4aaa18b64b1daa341529b23b728c547bfa6a209f Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Sun, 29 Mar 2020 17:28:31 -0400
Subject: [PATCH 4474/4636] python3Packages.dcmstack: init at 0.8

---
 .../python-modules/dcmstack/default.nix       | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/python-modules/dcmstack/default.nix

diff --git a/pkgs/development/python-modules/dcmstack/default.nix b/pkgs/development/python-modules/dcmstack/default.nix
new file mode 100644
index 000000000000..f06e361dc716
--- /dev/null
+++ b/pkgs/development/python-modules/dcmstack/default.nix
@@ -0,0 +1,39 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, pythonAtLeast
+, nose
+, nibabel
+, pydicom
+}:
+
+buildPythonPackage rec {
+  pname = "dcmstack";
+  version = "0.8";
+
+  disabled = pythonAtLeast "3.8";
+  # https://github.com/moloney/dcmstack/issues/67
+
+  src = fetchFromGitHub {
+    owner = "moloney";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1n24pp3rqz7ss1z6276fxynnppraxadbl3b9p8ijrcqnpzbzih7p";
+  };
+
+  propagatedBuildInputs = [ nibabel pydicom ];
+
+  checkInputs = [ nose ];
+  checkPhase = ''
+    runHook preCheck
+    nosetests
+    runHook postCheck
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/moloney/dcmstack";
+    description = "DICOM to Nifti conversion preserving metadata";
+    license = licenses.mit;
+    maintainers = with maintainers; [ bcdarwin ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ef46edc70b4d..77d1b33cb110 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -643,6 +643,8 @@ in {
 
   exchangelib = callPackage ../development/python-modules/exchangelib { };
 
+  dcmstack = callPackage ../development/python-modules/dcmstack { };
+
   dbus-python = callPackage ../development/python-modules/dbus {
     inherit (pkgs) dbus pkgconfig;
   };

From eb74fa912d5a695ea3f359b71dfc3780b02246aa Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 30 Mar 2020 22:02:57 -0300
Subject: [PATCH 4475/4636] elvish: 0.13 -> 0.13.1

---
 pkgs/shells/elvish/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix
index ad2e845f9bc8..402b5a7ebca7 100644
--- a/pkgs/shells/elvish/default.nix
+++ b/pkgs/shells/elvish/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "elvish";
-  version = "0.13";
+  version = "0.13.1";
 
   goPackagePath = "github.com/elves/elvish";
   excludedPackages = [ "website" ];
@@ -15,7 +15,7 @@ buildGoModule rec {
     owner = "elves";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0fprii430p9w8x4wq93iqkgkwi5kypwwlnzgvlcz0mkksayk8bzg";
+    sha256 = "0lz9lf1swrn67kymcp2wh67lh3c0ifqm9035gpkd3zynlq3wzqfm";
   };
 
   modSha256 = "13x4wbfj8049ygm3zbgzyr2bm4sq4x6xddrxx6shr8fydlcf1g8v";

From 91c9f2ab5c931ad036f6a5d1872c22d203b751af Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 30 Mar 2020 21:07:08 -0400
Subject: [PATCH 4476/4636] texlive.combine: set TEXMFCNF in binary wrapper

This helps kpathsea to find texmf.cnf in some cases. For example,
dvipng was trying to look for it in
/nix/store/<hash>-texlive-dvipng.bin-2019/ instead of
/nix/store/<hash>-texlive-combined-full-2019/.
---
 pkgs/tools/typesetting/tex/texlive/combine.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix
index cb4bc14927de..ee4d0dfe588a 100644
--- a/pkgs/tools/typesetting/tex/texlive/combine.nix
+++ b/pkgs/tools/typesetting/tex/texlive/combine.nix
@@ -153,7 +153,8 @@ in buildEnv {
       rm "$link"
       makeWrapper "$target" "$link" \
         --prefix PATH : "$out/bin:${perl}/bin" \
-        --prefix PERL5LIB : "$PERL5LIB"
+        --prefix PERL5LIB : "$PERL5LIB" \
+        --set-default TEXMFCNF "$TEXMFCNF"
 
       # avoid using non-nix shebang in $target by calling interpreter
       if [[ "$(head -c 2 "$target")" = "#!" ]]; then

From df62bb79cb9aab9cad47144c39948effece5f911 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2020 22:31:29 +0000
Subject: [PATCH 4477/4636] latte-dock: 0.9.9 -> 0.9.10

---
 pkgs/applications/misc/latte-dock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix
index ad824b238f8e..3fc5099acc2c 100644
--- a/pkgs/applications/misc/latte-dock/default.nix
+++ b/pkgs/applications/misc/latte-dock/default.nix
@@ -3,11 +3,11 @@
 
 mkDerivation rec {
   pname = "latte-dock";
-  version = "0.9.9";
+  version = "0.9.10";
 
   src = fetchurl {
     url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "01b2zr2x5hnadkvj687lwi3l6dwq3kdn5y9k4qf1bv0sa4vw6hn9";
+    sha256 = "11s9fslr33h3ic14ifr43jphf68jpny8jmhvmrrwcz6w0p3falzw";
     name = "${pname}-${version}.tar.xz";
   };
 

From ad867fbce405c3549aa684104f9cdfa92e6bbf9f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2020 20:52:05 +0000
Subject: [PATCH 4478/4636] icewm: 1.6.3 -> 1.6.5

---
 pkgs/applications/window-managers/icewm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix
index 58fa0d194e11..651669bebe52 100644
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "icewm";
-  version = "1.6.3";
+  version = "1.6.5";
 
   src = fetchFromGitHub {
     owner  = "bbidulock";
     repo   = "icewm";
     rev    = version;
-    sha256 = "0h3w718x28fd4sz36ka9wpgcb98scna6qpycxzls4cjji3rjgm0l";
+    sha256 = "1glzpkpl0vl5sjn1d9jlvwd9ch16dvxvsf2n310kb0ycpfkl84vs";
   };
 
   nativeBuildInputs = [ cmake pkgconfig perl asciidoc ];
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       IceWM is a window manager for the X Window System. The goal of
       IceWM is speed, simplicity, and not getting in the user's way.
     '';
-    homepage = http://www.icewm.org/;
+    homepage = "http://www.icewm.org/";
     license = licenses.lgpl2;
     maintainers = [ maintainers.AndersonTorres ];
     platforms = platforms.linux;

From 4078079cbcf5c47a6ed96c290f555fd56a772e70 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 29 Mar 2020 15:08:22 +0000
Subject: [PATCH 4479/4636] deadbeef: 1.8.2 -> 1.8.3

---
 pkgs/applications/audio/deadbeef/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix
index 2df6b9931cfc..4c2323fbe8a5 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@@ -59,13 +59,13 @@ assert remoteSupport -> curl != null;
 
 stdenv.mkDerivation rec {
   pname = "deadbeef";
-  version = "1.8.2";
+  version = "1.8.3";
 
   src = fetchFromGitHub {
     owner = "DeaDBeeF-Player";
     repo = "deadbeef";
     rev = version;
-    sha256 = "016wwnh5jqdcfxn1ff6in5dz73c3gdhh3fva8inq7sc3vzdz5khj";
+    sha256 = "0n0q7zfl56gnadcqqp5rg7sbh1xvfcmp7cvmh2ax07037b346qig";
   };
 
   buildInputs = with stdenv.lib; [ jansson ]
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Ultimate Music Player for GNU/Linux";
-    homepage = http://deadbeef.sourceforge.net/;
+    homepage = "http://deadbeef.sourceforge.net/";
     license = licenses.gpl2;
     platforms = [ "x86_64-linux" "i686-linux" ];
     maintainers = [ maintainers.abbradar ];

From 4078d72da9d1c2c64572aba4858a21aaeabc2971 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Sun, 29 Mar 2020 19:04:55 +0200
Subject: [PATCH 4480/4636] unifont: 12.1.03 -> 13.0.01

See https://lists.gnu.org/archive/html/info-gnu/2020-03/msg00013.html
for release information
---
 pkgs/data/fonts/unifont/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix
index fc41263fee7e..034c2583d268 100644
--- a/pkgs/data/fonts/unifont/default.nix
+++ b/pkgs/data/fonts/unifont/default.nix
@@ -4,16 +4,16 @@
 
 stdenv.mkDerivation rec {
   pname = "unifont";
-  version = "12.1.03";
+  version = "13.0.01";
 
   ttf = fetchurl {
     url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf";
-    sha256 = "10igjlf05d97h3vcggr2ahxmq9ljby4ypja2g4s9bvxs2w1si51p";
+    sha256 = "0y5bd7i5hp9ks6d3qq0bshywba7g90i3074wckpn9m8shh98ngcg";
   };
 
   pcf = fetchurl {
     url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz";
-    sha256 = "1cd1fnk3m7giqp099kynnjj4m7q00lqm4ybqb1vzd2wi3j4a1awf";
+    sha256 = "05zgz00n514cijqh9qcvr4iz0bla4hd028cvi1jlh0ic6fkafix8";
   };
 
   nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];

From 9f6db6e7548110f5eb10543cd16e0cde031d6f0c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 31 Mar 2020 03:26:18 +0200
Subject: [PATCH 4481/4636] deadbeef: remove unused patch

This was forgotten in https://github.com/NixOS/nixpkgs/pull/81010
---
 .../audio/deadbeef/fix-wildmidi.patch         | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 pkgs/applications/audio/deadbeef/fix-wildmidi.patch

diff --git a/pkgs/applications/audio/deadbeef/fix-wildmidi.patch b/pkgs/applications/audio/deadbeef/fix-wildmidi.patch
deleted file mode 100644
index c37308459bb7..000000000000
--- a/pkgs/applications/audio/deadbeef/fix-wildmidi.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/plugins/wildmidi/src/wildmidi_lib.c
-+++ b/plugins/wildmidi/src/wildmidi_lib.c
-@@ -394,11 +394,11 @@ free_gauss (void) {
-     }
- }
- 
--unsigned long int delay_size[4][2];
--signed long int a[5][2];
--signed long int b[5][2];
--signed long int gain_in[4];
--signed long int gain_out[4];
-+static unsigned long int delay_size[4][2];
-+static signed long int a[5][2];
-+static signed long int b[5][2];
-+static signed long int gain_in[4];
-+static signed long int gain_out[4];
- 
- void init_lowpass (void) {
-        float c = 0;

From dac0d8be656176eafe607427bc56d643364fef0d Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Fri, 27 Mar 2020 22:04:59 -0400
Subject: [PATCH 4482/4636] vscode-utils: allow direct vsix source

---
 pkgs/misc/vscode-extensions/vscode-utils.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/vscode-extensions/vscode-utils.nix b/pkgs/misc/vscode-extensions/vscode-utils.nix
index df8f24fcce73..5d446b025d7a 100644
--- a/pkgs/misc/vscode-extensions/vscode-utils.nix
+++ b/pkgs/misc/vscode-extensions/vscode-utils.nix
@@ -51,12 +51,15 @@ let
   buildVscodeMarketplaceExtension = a@{
     name ? "",
     src ? null,
+    vsix ? null,
     mktplcRef,
     ...
   }: assert "" == name; assert null == src;
-  buildVscodeExtension ((removeAttrs a [ "mktplcRef" ]) // {
+  buildVscodeExtension ((removeAttrs a [ "mktplcRef" "vsix" ]) // {
     name = "${mktplcRef.publisher}-${mktplcRef.name}-${mktplcRef.version}";
-    src = fetchVsixFromVscodeMarketplace mktplcRef;
+    src = if (vsix != null)
+      then vsix
+      else fetchVsixFromVscodeMarketplace mktplcRef;
     vscodeExtUniqueId = "${mktplcRef.publisher}.${mktplcRef.name}";
   });
 

From 4bbb0e83b1f1d6f16907683676902d9a2cb718ec Mon Sep 17 00:00:00 2001
From: Raphael Borun Das Gupta <git@raphael.dasgupta.ch>
Date: Sun, 29 Mar 2020 13:15:20 +0200
Subject: [PATCH 4483/4636] python: Shapely: 1.6.4.post2 -> 1.7.0

---
 .../python-modules/shapely/default.nix        |  4 +-
 .../shapely/library-paths.patch               | 89 ++++++++++++-------
 2 files changed, 58 insertions(+), 35 deletions(-)

diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix
index 220726733dcb..d895f00285d4 100644
--- a/pkgs/development/python-modules/shapely/default.nix
+++ b/pkgs/development/python-modules/shapely/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "Shapely";
-  version = "1.6.4.post2";
+  version = "1.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c4b87bb61fc3de59fc1f85e71a79b0c709dc68364d9584473697aad4aa13240f";
+    sha256 = "07lmrihj6pa7f99m97hbf2anqlhhwippcdz03bqkyihnlkhry6p2";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/shapely/library-paths.patch b/pkgs/development/python-modules/shapely/library-paths.patch
index f75ad7a9486e..4081936abe36 100644
--- a/pkgs/development/python-modules/shapely/library-paths.patch
+++ b/pkgs/development/python-modules/shapely/library-paths.patch
@@ -1,9 +1,9 @@
 diff --git a/shapely/geos.py b/shapely/geos.py
-index 09bf1ab..837aa98 100644
+index d5a67d2..19b7ffc 100644
 --- a/shapely/geos.py
 +++ b/shapely/geos.py
-@@ -55,100 +55,10 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE):
-             "Could not find lib {0} or load any of its variants {1}.".format(
+@@ -61,123 +61,11 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE):
+             "Could not find lib {} or load any of its variants {}.".format(
                  libname, fallbacks or []))
  
 -_lgeos = None
@@ -16,15 +16,25 @@ index 09bf1ab..837aa98 100644
 -    if len(geos_whl_so) == 1:
 -        _lgeos = CDLL(geos_whl_so[0])
 -        LOG.debug("Found GEOS DLL: %r, using it.", _lgeos)
+-    elif hasattr(sys, 'frozen'):
+-        geos_pyinstaller_so = glob.glob(os.path.join(sys.prefix, 'libgeos_c-*.so.*'))
+-        if len(geos_pyinstaller_so) == 1:
+-            _lgeos = CDLL(geos_pyinstaller_so[0])
+-            LOG.debug("Found GEOS DLL: %r, using it.", _lgeos)
+-    elif os.getenv('CONDA_PREFIX', ''):
+-        # conda package.
+-        _lgeos = CDLL(os.path.join(sys.prefix, 'lib', 'libgeos_c.so'))
 -    else:
 -        alt_paths = [
 -            'libgeos_c.so.1',
 -            'libgeos_c.so',
--            # anaconda
--            os.path.join(sys.prefix, "lib", "libgeos_c.so"),
 -        ]
 -        _lgeos = load_dll('geos_c', fallbacks=alt_paths)
--    free = load_dll('c').free
+-    # Necessary for environments with only libc.musl
+-    c_alt_paths = [
+-        'libc.musl-x86_64.so.1'
+-    ]
+-    free = load_dll('c', fallbacks=c_alt_paths).free
 -    free.argtypes = [c_void_p]
 -    free.restype = None
 -
@@ -32,10 +42,19 @@ index 09bf1ab..837aa98 100644
 -    # Test to see if we have a delocated wheel with a GEOS dylib.
 -    geos_whl_dylib = os.path.abspath(os.path.join(os.path.dirname(
 -        __file__), '.dylibs/libgeos_c.1.dylib'))
--    if os.path.exists(geos_whl_dylib):
--        _lgeos = CDLL(geos_whl_dylib)
--        LOG.debug("Found GEOS DLL: %r, using it.", _lgeos)
 -
+-    if os.path.exists(geos_whl_dylib):
+-        handle = CDLL(None)
+-        if hasattr(handle, "initGEOS_r"):
+-            LOG.debug("GEOS already loaded")
+-            _lgeos = handle
+-        else:
+-            _lgeos = CDLL(geos_whl_dylib)
+-            LOG.debug("Found GEOS DLL: %r, using it.", _lgeos)
+-
+-    elif os.getenv('CONDA_PREFIX', ''):
+-        # conda package.
+-        _lgeos = CDLL(os.path.join(sys.prefix, 'lib', 'libgeos_c.dylib'))
 -    else:
 -        if hasattr(sys, 'frozen'):
 -            try:
@@ -52,12 +71,12 @@ index 09bf1ab..837aa98 100644
 -                        os.path.join(sys._MEIPASS, 'libgeos_c.1.dylib'))
 -        else:
 -            alt_paths = [
--                # anaconda
--                os.path.join(sys.prefix, "lib", "libgeos_c.dylib"),
 -                # The Framework build from Kyng Chaos
 -                "/Library/Frameworks/GEOS.framework/Versions/Current/GEOS",
 -                # macports
 -                '/opt/local/lib/libgeos_c.dylib',
+-                # homebrew
+-                '/usr/local/lib/libgeos_c.dylib',
 -            ]
 -        _lgeos = load_dll('geos_c', fallbacks=alt_paths)
 -
@@ -66,30 +85,34 @@ index 09bf1ab..837aa98 100644
 -    free.restype = None
 -
 -elif sys.platform == 'win32':
--    try:
--        egg_dlls = os.path.abspath(
--            os.path.join(os.path.dirname(__file__), 'DLLs'))
--        if hasattr(sys, "frozen"):
--            wininst_dlls = os.path.normpath(
--                os.path.abspath(sys.executable + '../../DLLS'))
--        else:
--            wininst_dlls = os.path.abspath(os.__file__ + "../../../DLLs")
--        original_path = os.environ['PATH']
--        os.environ['PATH'] = "%s;%s;%s" % \
--            (egg_dlls, wininst_dlls, original_path)
--        _lgeos = load_dll("geos_c.dll", fallbacks=[
--            os.path.join(sys.prefix, "Library", "lib", "geos_c.dll"),
--        ])
--    except (ImportError, WindowsError, OSError):
--        raise
--
--    def free(m):
+-    if os.getenv('CONDA_PREFIX', ''):
+-        # conda package.
+-        _lgeos = CDLL(os.path.join(sys.prefix, 'Library', 'bin', 'geos_c.dll'))
+-    else:
 -        try:
--            cdll.msvcrt.free(m)
--        except WindowsError:
--            # XXX: See http://trac.gispython.org/projects/PCL/ticket/149
--            pass
+-            egg_dlls = os.path.abspath(
+-                os.path.join(os.path.dirname(__file__), 'DLLs'))
+-            if hasattr(sys, '_MEIPASS'):
+-                wininst_dlls = sys._MEIPASS
+-            elif hasattr(sys, "frozen"):
+-                wininst_dlls = os.path.normpath(
+-                    os.path.abspath(sys.executable + '../../DLLS'))
+-            else:
+-                wininst_dlls = os.path.abspath(os.__file__ + "../../../DLLs")
+-            original_path = os.environ['PATH']
+-            os.environ['PATH'] = "%s;%s;%s" % \
+-                (egg_dlls, wininst_dlls, original_path)
+-            _lgeos = load_dll("geos_c.dll")
+-        except (ImportError, WindowsError, OSError):
+-            raise
 -
+-        def free(m):
+-            try:
+-                cdll.msvcrt.free(m)
+-            except WindowsError:
+-                # XXX: See http://trac.gispython.org/projects/PCL/ticket/149
+-                pass
+ 
 -elif sys.platform == 'sunos5':
 -    _lgeos = load_dll('geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so'])
 -    free = CDLL('libc.so.1').free

From fa7d35dcbf8842892271463acf2fcc59b514549f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 31 Mar 2020 04:08:35 +0200
Subject: [PATCH 4484/4636] tevent: clean up expression
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* format with nixpkgs-fmt
* quote homepage as per RFC 0045
* split name → pname & version
* do not use aliases
---
 pkgs/development/libraries/tevent/default.nix | 30 ++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix
index 9f94f4f7217d..b3c31ffd88d2 100644
--- a/pkgs/development/libraries/tevent/default.nix
+++ b/pkgs/development/libraries/tevent/default.nix
@@ -1,18 +1,34 @@
-{ stdenv, fetchurl, python, pkgconfig, readline, talloc
-, libxslt, docbook_xsl, docbook_xml_dtd_42
+{ stdenv
+, fetchurl
+, python
+, pkg-config
+, readline
+, talloc
+, libxslt
+, docbook-xsl-nons
+, docbook_xml_dtd_42
 }:
 
 stdenv.mkDerivation rec {
-  name = "tevent-0.9.37";
+  pname = "tevent";
+  version = "0.9.37";
 
   src = fetchurl {
-    url = "mirror://samba/tevent/${name}.tar.gz";
+    url = "mirror://samba/tevent/${pname}-${version}.tar.gz";
     sha256 = "1q77vbjic2bb79li2a54ffscnrnwwww55fbpry2kgh7acpnlb0qn";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
   buildInputs = [
-    python readline talloc libxslt docbook_xsl docbook_xml_dtd_42
+    python
+    readline
+    talloc
+    libxslt
+    docbook-xsl-nons
+    docbook_xml_dtd_42
   ];
 
   preConfigure = ''
@@ -26,7 +42,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An event system based on the talloc memory management library";
-    homepage = https://tevent.samba.org/;
+    homepage = "https://tevent.samba.org/";
     license = licenses.lgpl3Plus;
     platforms = platforms.all;
   };

From f6f09daa23ad872c7d0a1704d6922c56cfc479dc Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 31 Mar 2020 04:14:20 +0200
Subject: [PATCH 4485/4636] tevent: clean up expression

* format with nixpkgs-fmt
* do not use aliases
---
 pkgs/development/libraries/talloc/default.nix | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix
index 9e9bc1c804bb..f464364e8a0a 100644
--- a/pkgs/development/libraries/talloc/default.nix
+++ b/pkgs/development/libraries/talloc/default.nix
@@ -1,5 +1,12 @@
-{ stdenv, fetchurl, python, pkgconfig, readline, libxslt
-, docbook_xsl, docbook_xml_dtd_42, fixDarwinDylibNames
+{ stdenv
+, fetchurl
+, python
+, pkg-config
+, readline
+, libxslt
+, docbook-xsl-nons
+, docbook_xml_dtd_42
+, fixDarwinDylibNames
 , wafHook
 }:
 
@@ -12,9 +19,19 @@ stdenv.mkDerivation rec {
     sha256 = "0xwzgzrqamfdlklwacp9d219pqkah0yfrhxb1j7bxlmgzp924j7g";
   };
 
-  nativeBuildInputs = [ pkgconfig fixDarwinDylibNames python wafHook
-                        docbook_xsl docbook_xml_dtd_42 ];
-  buildInputs = [ readline libxslt ];
+  nativeBuildInputs = [
+    pkg-config
+    fixDarwinDylibNames
+    python
+    wafHook
+    docbook-xsl-nons
+    docbook_xml_dtd_42
+  ];
+
+  buildInputs = [
+    readline
+    libxslt
+  ];
 
   wafPath = "buildtools/bin/waf";
 

From 8d2c08e774f5536bbf5ef7a5c4894db81e6febf6 Mon Sep 17 00:00:00 2001
From: Gabriel Gonzalez <Gabriel439@gmail.com>
Date: Mon, 30 Mar 2020 19:23:29 -0700
Subject: [PATCH 4486/4636] Fix evaluation of `cabal2nix`

`cabal2nix` fails to evaluate due to attempting to
evaluate `pkgs.haskellPackages.hackage-db_2_1_0`, which
does not exist.  However, the default
`pkgs.haskellPackages.hackage-db` is already version 2.1.0,
so the fix is simple: go back to using the default version.
---
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index 915f7b3e635f..9461f6cf34df 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -78,7 +78,6 @@ self: super: {
   # hackage-db uses must match, so take the latest
   cabal2nix = super.cabal2nix.overrideScope (self: super: {
     Cabal = self.Cabal_3_0_0_0;
-    hackage-db = self.hackage-db_2_1_0;
   });
 
   # cabal2spec needs a recent version of Cabal

From ce2a2afac79052b2d0286ff32996fe2097f0d8bf Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Tue, 31 Mar 2020 04:21:18 +0200
Subject: [PATCH 4487/4636] prosody: 0.11.3 -> 0.11.5

- https://prosody.im/doc/release/0.11.4
- https://prosody.im/doc/release/0.11.5
---
 pkgs/servers/xmpp/prosody/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index 8becdcd6a45b..0d552e9e1121 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -14,12 +14,12 @@ with stdenv.lib;
 
 
 stdenv.mkDerivation rec {
-  version = "0.11.3"; # also update communityModules
+  version = "0.11.5"; # also update communityModules
   pname = "prosody";
 
   src = fetchurl {
     url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz";
-    sha256 = "11xz4milv2962qf75vrdwsvd8sy2332nf69202rmvz5989pvvnng";
+    sha256 = "12s0hn6hvjbi61cdw3165l6iw0878971dmlvfg663byjsmjvvy2m";
   };
 
   # A note to all those merging automated updates: Please also update this
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
   # version.
   communityModules = fetchhg {
     url = "https://hg.prosody.im/prosody-modules";
-    rev = "b54e98d5c4a1";
-    sha256 = "0bzn92j48krb2zhp9gn5bbn5sg0qv15j5lpxfszwqdln3lpmrvzg";
+    rev = "acd231e2b46f";
+    sha256 = "1b33lsxrrrvarknqz9xs7j7f19bzxxymmfdhch7k70x3yyiwmfsy";
   };
 
   buildInputs = [
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Open-source XMPP application server written in Lua";
     license = licenses.mit;
-    homepage = https://prosody.im;
+    homepage = "https://prosody.im";
     platforms = platforms.linux;
     maintainers = with maintainers; [ fpletz globin ];
   };

From 296d1f813da3db9ae72eed5a4624a0a14826d347 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2020 02:28:35 +0000
Subject: [PATCH 4488/4636] circus: 0.15.0 -> 0.16.1

---
 pkgs/tools/networking/circus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/circus/default.nix b/pkgs/tools/networking/circus/default.nix
index 10edc92a9951..82c9db90432e 100644
--- a/pkgs/tools/networking/circus/default.nix
+++ b/pkgs/tools/networking/circus/default.nix
@@ -6,11 +6,11 @@ in
 
 buildPythonApplication rec {
   pname = "circus";
-  version = "0.15.0";
+  version = "0.16.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d1603cf4c4f620ce6593d3d2a67fad25bf0242183ea24110d8bb1c8079c55d1b";
+    sha256 = "0paccmqwgard2l0z7swcc3nwc418l9b4mfaddb4s31bpnqg02z6x";
   };
 
   postPatch = ''

From b334984a15440d862ca3cab80b6102304b2fff06 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Mon, 30 Mar 2020 23:28:44 -0300
Subject: [PATCH 4489/4636] bochs: 2.6.10 -> 2.6.11

---
 ...26.patch => bochs-2.6.11-glibc-2.26.patch} |  0
 .../virtualization/bochs/default.nix          |  6 +++---
 .../virtualization/bochs/fix-build-smp.patch  | 21 +++++++++++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)
 rename pkgs/applications/virtualization/bochs/{bochs-2.6.10-glibc-2.26.patch => bochs-2.6.11-glibc-2.26.patch} (100%)
 create mode 100644 pkgs/applications/virtualization/bochs/fix-build-smp.patch

diff --git a/pkgs/applications/virtualization/bochs/bochs-2.6.10-glibc-2.26.patch b/pkgs/applications/virtualization/bochs/bochs-2.6.11-glibc-2.26.patch
similarity index 100%
rename from pkgs/applications/virtualization/bochs/bochs-2.6.10-glibc-2.26.patch
rename to pkgs/applications/virtualization/bochs/bochs-2.6.11-glibc-2.26.patch
diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix
index f6e202ac4998..e9982d61391d 100644
--- a/pkgs/applications/virtualization/bochs/default.nix
+++ b/pkgs/applications/virtualization/bochs/default.nix
@@ -19,14 +19,14 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   pname = "bochs";
-  version = "2.6.10";
+  version = "2.6.11";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/bochs/bochs/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1c3mw4b8wrjf8z44fvhycs95j1wd1c0b4khcv63giiia5j5q0gvj";
+    sha256 = "0ql8q6y1k356li1g9gbvl21448mlxphxxi6kjb2b3pxvzd0pp2b3";
   };
 
-  patches = [ ./bochs-2.6.10-glibc-2.26.patch ];
+  patches = [ ./bochs-2.6.11-glibc-2.26.patch ./fix-build-smp.patch ];
 
   buildInputs =
   [ pkgconfig libtool gtk2 libGLU libGL readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ]
diff --git a/pkgs/applications/virtualization/bochs/fix-build-smp.patch b/pkgs/applications/virtualization/bochs/fix-build-smp.patch
new file mode 100644
index 000000000000..faa2acfa5129
--- /dev/null
+++ b/pkgs/applications/virtualization/bochs/fix-build-smp.patch
@@ -0,0 +1,21 @@
+Description: A fix for SMP-enable configurations
+Inspired in: https://sourceforge.net/p/bochs/code/13778/
+
+============
+diff -Naur bochs-2.6.11-old/bx_debug/dbg_main.cc bochs-2.6.11-new/bx_debug/dbg_main.cc
+--- bochs-2.6.11-old/bx_debug/dbg_main.cc	2019-12-20 04:57:59.818924000 -0300
++++ bochs-2.6.11-new/bx_debug/dbg_main.cc	2020-03-30 23:20:29.402195707 -0300
+@@ -1494,11 +1494,11 @@
+ {
+   char cpu_param_name[16];
+ 
+-  Bit32u index = BX_ITLB_INDEX_OF(laddr);
++  Bit32u index = BX_CPU(dbg_cpu)->ITLB.get_index_of(laddr);
+   sprintf(cpu_param_name, "ITLB.entry%d", index);
+   bx_dbg_show_param_command(cpu_param_name, 0);
+ 
+-  index = BX_DTLB_INDEX_OF(laddr, 0);
++  index = BX_CPU(dbg_cpu)->DTLB.get_index_of(laddr);
+   sprintf(cpu_param_name, "DTLB.entry%d", index);
+   bx_dbg_show_param_command(cpu_param_name, 0);
+ }

From 95f852d7c1cc0481272f058f321fedfc96229224 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2020 23:27:22 +0000
Subject: [PATCH 4490/4636] you-get: 0.4.1410 -> 0.4.1432

---
 pkgs/tools/misc/you-get/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix
index ab1a3e66825c..74599dc7d1e5 100644
--- a/pkgs/tools/misc/you-get/default.nix
+++ b/pkgs/tools/misc/you-get/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonApplication rec {
   pname = "you-get";
-  version = "0.4.1410";
+  version = "0.4.1432";
 
   # Tests aren't packaged, but they all hit the real network so
   # probably aren't suitable for a build environment anyway.
@@ -10,7 +10,7 @@ buildPythonApplication rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0isjmx1z5w3m2v25sb7fpi7lyd4h8bl9n9691ylvl5w3bxf6ynm9";
+    sha256 = "0i3gsl7wk1cn8jw79gnyv58mrrn0hmkvymrd3ic67z2ackp726s2";
   };
 
   meta = with stdenv.lib; {

From 215ca6863d2790dea1043ef02dee5c36382d5332 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2020 20:36:46 +0000
Subject: [PATCH 4491/4636] python27Packages.pysmbc: 1.0.18 -> 1.0.19

---
 pkgs/development/python-modules/pysmbc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pysmbc/default.nix b/pkgs/development/python-modules/pysmbc/default.nix
index 18ee419e8e5a..99a9f01d4b09 100644
--- a/pkgs/development/python-modules/pysmbc/default.nix
+++ b/pkgs/development/python-modules/pysmbc/default.nix
@@ -3,13 +3,13 @@
 , setuptools }:
 
 buildPythonPackage rec {
-  version = "1.0.18";
+  version = "1.0.19";
   pname = "pysmbc";
 
   src = fetchPypi {
     inherit pname version;
     extension = "tar.bz2";
-    sha256 = "5da8aef1e3edaaffb1fbe2afe3772ba0a5f5bf666a28ae5db7b59ef96e465bdf";
+    sha256 = "0dwffbfp3ay8y35hhc37ip61xdh522f5rfs097f3ia121h9x1mvj";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -17,7 +17,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "libsmbclient binding for Python";
-    homepage = https://github.com/hamano/pysmbc;
+    homepage = "https://github.com/hamano/pysmbc";
     license = licenses.gpl2Plus;
   };
 }

From 32721cac48fa66d4a0afb7afa569527e75ae92cc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2020 02:19:00 +0000
Subject: [PATCH 4492/4636] kargo: 0.4.6 -> 0.4.8

---
 pkgs/tools/misc/kargo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix
index 480c0abc728d..bcc19770155d 100644
--- a/pkgs/tools/misc/kargo/default.nix
+++ b/pkgs/tools/misc/kargo/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
-  version = "0.4.6";
+  version = "0.4.8";
   pname = "kargo";
 
   src = fetchurl {
     url = "mirror://pypi/k/kargo/${pname}-${version}.tar.gz";
-    sha256 = "1sm721c3d4scpc1gj2j3qwssr6jjvw6aq3p7ipvhbd9ywmm9dd7b";
+    sha256 = "1iq3vrmglag9gpsir03yz7556m0bz99nwb2mf594378cqzbr6db3";
   };
 
   doCheck = false;
@@ -25,7 +25,7 @@ python2Packages.buildPythonApplication rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/kubespray/kargo-cli;
+    homepage = "https://github.com/kubespray/kargo-cli";
     description = "A tool helps to deploy a kubernetes cluster with Ansible.";
     platforms = platforms.linux;
     license = licenses.gpl3;

From 41367ab6991ae07442506030548d44f377ddfad7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2020 02:24:53 +0000
Subject: [PATCH 4493/4636] vimwiki-markdown: 0.2.0 -> 0.3.0

---
 pkgs/tools/misc/vimwiki-markdown/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/vimwiki-markdown/default.nix b/pkgs/tools/misc/vimwiki-markdown/default.nix
index 241da2acbb44..b85bb0876605 100644
--- a/pkgs/tools/misc/vimwiki-markdown/default.nix
+++ b/pkgs/tools/misc/vimwiki-markdown/default.nix
@@ -6,12 +6,12 @@
 }:
 
 buildPythonApplication rec {
-  version = "0.2.0";
+  version = "0.3.0";
   pname = "vimwiki-markdown";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "0k7srlglhq4bm85kgd5ismslrk1fk8v16mm41a8k0kmcr9k4vi4a";
+    sha256 = "1icfnc623f9pyn59wgb76g0fnsx41s87q69x354qy17gw23bxabx";
   };
 
   propagatedBuildInputs= [
@@ -21,7 +21,7 @@ buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     description = "Vimwiki markdown plugin";
-    homepage = https://github.com/WnP/vimwiki_markdown;
+    homepage = "https://github.com/WnP/vimwiki_markdown";
     license = licenses.mit;
     maintainers = with maintainers; [ seqizz ];
   };

From 41fe7dbedff0d9d77a55fe8f1d153bae384659e1 Mon Sep 17 00:00:00 2001
From: Rohan Hart <rohan.hart@fronde.com>
Date: Sun, 29 Mar 2020 18:24:06 +1300
Subject: [PATCH 4494/4636] lutris: custom wine installations require libkrb5

fixes the error: symbol k5_os_mutex_destroy version krb5support_0_MIT not defined in file libkrb5support.so.0
---
 pkgs/applications/misc/lutris/chrootenv.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix
index a3a5d0ce751a..6f8d690779be 100644
--- a/pkgs/applications/misc/lutris/chrootenv.nix
+++ b/pkgs/applications/misc/lutris/chrootenv.nix
@@ -103,7 +103,7 @@ in buildFHSUserEnv {
 
     # WINE
     cups lcms2 mpg123 cairo unixODBC samba4 sane-backends openldap
-    ocl-icd utillinux
+    ocl-icd utillinux libkrb5
 
     # Winetricks
     fribidi

From 2ef17b38fbc7a6845567def91204bfa64091f762 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 31 Mar 2020 04:28:43 +0200
Subject: [PATCH 4495/4636] =?UTF-8?q?tevent:=200.9.37=20=E2=86=92=200.10.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Now requires Python 3
* Which was also coincidentally required to fix build (https://github.com/NixOS/nixpkgs/issues/82489)
* Also switch to wafhook

Changes:
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=1c73f38633ce40bcf19775fbeaf5e3baacdba9ab
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=db58a50296041ca57675daee15caea8850f1d3f8
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=6f2278018436184785e19f69efc60ec408b14aa7
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=123267138e993c6a87990c0022e89f4970c0ac12
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=4aea5c0972de53c143530cc42ef6d3b8cfafb973
---
 pkgs/development/libraries/tevent/default.nix | 29 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  4 +--
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix
index b3c31ffd88d2..66d65e639510 100644
--- a/pkgs/development/libraries/tevent/default.nix
+++ b/pkgs/development/libraries/tevent/default.nix
@@ -1,41 +1,44 @@
 { stdenv
 , fetchurl
-, python
+, python3
 , pkg-config
 , readline
 , talloc
 , libxslt
 , docbook-xsl-nons
 , docbook_xml_dtd_42
+, which
+, wafHook
 }:
 
 stdenv.mkDerivation rec {
   pname = "tevent";
-  version = "0.9.37";
+  version = "0.10.2";
 
   src = fetchurl {
     url = "mirror://samba/tevent/${pname}-${version}.tar.gz";
-    sha256 = "1q77vbjic2bb79li2a54ffscnrnwwww55fbpry2kgh7acpnlb0qn";
+    sha256 = "+EJ4IuWyh4+4so1vUNloSHNPPzEwYS+1dP3S0hSKZpY=";
   };
 
   nativeBuildInputs = [
     pkg-config
-  ];
-
-  buildInputs = [
-    python
-    readline
-    talloc
+    which
+    python3
     libxslt
     docbook-xsl-nons
     docbook_xml_dtd_42
+    wafHook
   ];
 
-  preConfigure = ''
-    sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,g' buildtools/bin/waf
-  '';
+  buildInputs = [
+    python3
+    readline # required to build python
+    talloc
+  ];
 
-  configureFlags = [
+  wafPath = "buildtools/bin/waf";
+
+  wafConfigureFlags = [
     "--bundled-libraries=NONE"
     "--builtin-libraries=replace"
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5638580166c8..72a76af34036 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14653,9 +14653,7 @@ in
 
   termbox = callPackage ../development/libraries/termbox { };
 
-  tevent = callPackage ../development/libraries/tevent {
-    python = python2;
-  };
+  tevent = callPackage ../development/libraries/tevent { };
 
   tet = callPackage ../development/tools/misc/tet { };
 

From b04ace2fbbc4d9355d8703ccc3e097fd679e1778 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 31 Mar 2020 04:34:20 +0200
Subject: [PATCH 4496/4636] ldb: clean up expression
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* format with nixpkgs-fmt
* quote homepage as per RFC 0045
* split name → pname & version
* do not use aliases
* switch to wafHook
---
 pkgs/development/libraries/ldb/default.nix | 48 ++++++++++++++++------
 1 file changed, 35 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix
index 12f7b176bb7b..036afbed5990 100644
--- a/pkgs/development/libraries/ldb/default.nix
+++ b/pkgs/development/libraries/ldb/default.nix
@@ -1,21 +1,45 @@
-{ stdenv, fetchurl, python, pkgconfig, readline, tdb, talloc, tevent
-, popt, libxslt, docbook_xsl, docbook_xml_dtd_42, cmocka
+{ stdenv
+, fetchurl
+, python
+, pkg-config
+, readline
+, tdb
+, talloc
+, tevent
+, popt
+, libxslt
+, docbook-xsl-nons
+, docbook_xml_dtd_42
+, cmocka
+, wafHook
 }:
 
 stdenv.mkDerivation rec {
-  name = "ldb-1.3.3";
+  pname = "ldb";
+  version = "1.3.3";
 
   src = fetchurl {
-    url = "mirror://samba/ldb/${name}.tar.gz";
-    sha256 = "14gsrm7dvyjpbpnc60z75j6fz2p187abm2h353lq95kx2bv70c1b"                                                                                                                                                             ;
+    url = "mirror://samba/ldb/${pname}-${version}.tar.gz";
+    sha256 = "14gsrm7dvyjpbpnc60z75j6fz2p187abm2h353lq95kx2bv70c1b";
   };
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [
+    pkg-config
+    wafHook
+  ];
+
   buildInputs = [
-    python readline tdb talloc tevent popt
-    libxslt docbook_xsl docbook_xml_dtd_42
+    python
+    readline
+    tdb
+    talloc
+    tevent
+    popt
+    libxslt
+    docbook-xsl-nons
+    docbook_xml_dtd_42
     cmocka
   ];
 
@@ -30,11 +54,9 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  preConfigure = ''
-    sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,g' buildtools/bin/waf
-  '';
+  wafPath = "buildtools/bin/waf";
 
-  configureFlags = [
+  wafConfigureFlags = [
     "--bundled-libraries=NONE"
     "--builtin-libraries=replace"
   ];
@@ -43,7 +65,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A LDAP-like embedded database";
-    homepage = https://ldb.samba.org/;
+    homepage = "https://ldb.samba.org/";
     license = licenses.lgpl3Plus;
     platforms = platforms.all;
   };

From 43f550744662b8044fd44002728be17298c6ba96 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 31 Mar 2020 04:44:49 +0200
Subject: [PATCH 4497/4636] tdb: clean up expression
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* format with nixpkgs-fmt
* quote homepage as per RFC 0045
* split name → pname & version
* do not use aliases
* switch to wafHook
---
 pkgs/development/libraries/tdb/default.nix | 29 +++++++++++++++-------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix
index 2764e8878875..03955a9ac710 100644
--- a/pkgs/development/libraries/tdb/default.nix
+++ b/pkgs/development/libraries/tdb/default.nix
@@ -1,23 +1,34 @@
-{ stdenv, fetchurl, pkgconfig
-, wafHook, python3, readline
-, libxslt, docbook_xsl, docbook_xml_dtd_45
+{ stdenv
+, fetchurl
+, pkg-config
+, wafHook
+, python
+, readline
+, libxslt
+, docbook-xsl-nons
+, docbook_xml_dtd_45
 }:
 
 stdenv.mkDerivation rec {
-  name = "tdb-1.4.3";
+  pname = "tdb";
+  version = "1.4.3";
 
   src = fetchurl {
-    url = "mirror://samba/tdb/${name}.tar.gz";
+    url = "mirror://samba/tdb/${pname}-${version}.tar.gz";
     sha256 = "06waz0k50c7v3chd08mzp2rv7w4k4q9isbxx3vhlfpx1vy9q61f8";
   };
 
   nativeBuildInputs = [
-    pkgconfig wafHook
-    libxslt docbook_xsl docbook_xml_dtd_45
+    pkg-config
+    wafHook
+    libxslt
+    docbook-xsl-nons
+    docbook_xml_dtd_45
   ];
 
   buildInputs = [
-    python3 readline
+    python
+    readline # required to build python
   ];
 
   wafPath = "buildtools/bin/waf";
@@ -35,7 +46,7 @@ stdenv.mkDerivation rec {
       and uses locking internally to keep writers from trampling on each
       other. TDB is also extremely small.
     '';
-    homepage = https://tdb.samba.org/;
+    homepage = "https://tdb.samba.org/";
     license = licenses.lgpl3Plus;
     platforms = platforms.all;
   };

From f1582a04df910d585763ec647958e1f7dfbdbd4b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 31 Mar 2020 04:47:34 +0200
Subject: [PATCH 4498/4636] tdb: Port to Python 3

Half of the Samba libraries needs it now
---
 pkgs/development/libraries/tdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix
index 03955a9ac710..b8e6552bc7b5 100644
--- a/pkgs/development/libraries/tdb/default.nix
+++ b/pkgs/development/libraries/tdb/default.nix
@@ -2,7 +2,7 @@
 , fetchurl
 , pkg-config
 , wafHook
-, python
+, python3
 , readline
 , libxslt
 , docbook-xsl-nons
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    python
+    python3
     readline # required to build python
   ];
 

From 00ca0c486957f2e95b5757d52330b2c2c76d7246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 13 Mar 2020 13:00:48 +0000
Subject: [PATCH 4499/4636] vscodeExtensions.ms-vscode-remote.remote-ssh:
 0.48.0 -> 0.50.0

---
 pkgs/misc/vscode-extensions/remote-ssh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/vscode-extensions/remote-ssh/default.nix b/pkgs/misc/vscode-extensions/remote-ssh/default.nix
index fe053dd7ea3d..e58ea98a606f 100644
--- a/pkgs/misc/vscode-extensions/remote-ssh/default.nix
+++ b/pkgs/misc/vscode-extensions/remote-ssh/default.nix
@@ -7,7 +7,7 @@
 
 let
   inherit (vscode-utils) buildVscodeMarketplaceExtension;
-  
+
   # patch runs on remote machine hence use of which
   # links to local node if version is 12
   patch = ''
@@ -36,8 +36,8 @@ in
     mktplcRef = {
       name = "remote-ssh";
       publisher = "ms-vscode-remote";
-      version = "0.48.0";
-      sha256 = "04q53gljqh5snkrdf5l69g0ahn1s5z35a4ipfcbf1rsjjmm85a19";
+      version = "0.50.0";
+      sha256 = "01pyd6759p5nkjhjy3iplrl748xblr54l1jphk2g02s1n5ds2qb9";
     };
 
     postPatch = ''

From c015badaa2fca031bff218f44b134e2ce432c1a4 Mon Sep 17 00:00:00 2001
From: Matt Snider <matt.snider@protonmail.com>
Date: Sat, 21 Mar 2020 10:20:21 +0100
Subject: [PATCH 4500/4636] python3Packages.openwrt-luci-rpc: init at 1.1.2

---
 .../openwrt-luci-rpc/default.nix              | 36 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/python-modules/openwrt-luci-rpc/default.nix

diff --git a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix
new file mode 100644
index 000000000000..4dc4ffa68fc0
--- /dev/null
+++ b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix
@@ -0,0 +1,36 @@
+{ buildPythonPackage
+, fetchPypi
+, lib
+, click
+, requests
+, packaging
+}:
+
+with lib;
+
+buildPythonPackage rec {
+  pname = "openwrt-luci-rpc";
+  version = "1.1.2";
+
+  srcs = fetchPypi {
+    inherit pname version;
+    sha256 = "144bw7w1xvpdkad5phflpkl15ih5pvi19799wmvfv8mj1dn1yjhp";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py --replace "requests==2.21.0" "requests"
+    substituteInPlace setup.py --replace "packaging==19.1" "packaging"
+  '';
+
+  propagatedBuildInputs = [ click requests packaging ];
+
+  meta = {
+    description = ''
+      Python3 module for interacting with the OpenWrt Luci RPC interface.
+      Supports 15.X & 17.X & 18.X or newer releases of OpenWrt.
+    '';
+    homepage = "https://github.com/fbradyirl/openwrt-luci-rpc";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ matt-snider ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 77d1b33cb110..53d243055c48 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7040,6 +7040,8 @@ in {
 
   pyemd  = callPackage ../development/python-modules/pyemd { };
 
+  openwrt-luci-rpc = disabledIf (!isPy3k) (callPackage ../development/python-modules/openwrt-luci-rpc { });
+
   pulp  = callPackage ../development/python-modules/pulp { };
 
   behave = callPackage ../development/python-modules/behave { };

From 4cfdc7af5399d243be7723b870ecb7ca4eeb36d7 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 31 Mar 2020 05:13:44 +0200
Subject: [PATCH 4501/4636] =?UTF-8?q?ldb:=201.3.3=20=E2=86=92=202.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Move build tools to nativeBuildInputs
* Switch to Python 3 as it is required by most Samba libraries
* Do not yet enable the experimental lmdb backend introduced in 1.4.0

Changes:
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=4e2eb5660a11cea215d39495844aa76ffb5a1a2e
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=3eecdbcc38dbe084b285c9720443d819304f7b97
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=b7f0ee93f58e663bb8fc0b39985aa49b254582d9
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=bdbb9422c0430d74c3173822257e23a9dfb2713e
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=340cb9ca97bc2a23f102f80897a8d8f4809f0072
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=de3bb5cd5236565f2b79644d99e55d03b254b65e
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=09d281d69b668a71e4457889bb5e949414a664fb
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=81648d576d56e924945b2214ac12ca6a40679db8
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=86d480ade25953a175b0837667ce5efb8b7e65df
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=80bd467affbda1d962f4deb3caa8a42c6531425d
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=bc0d16c9d8eacd254552ff28726a2ba5f2a1c8c0
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=c37b94fd0a7b24df93b664ad4c2d197c516c9dce
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=79460b1b9f3452d6d68014b84f4a9dc3988bd916
* https://git.samba.org/samba.git/?p=samba.git;a=commit;h=0ca46a37268c8219192abc3ab5f2546a02ed8862
---
 pkgs/development/libraries/ldb/default.nix | 29 ++++++++--------------
 pkgs/top-level/all-packages.nix            |  4 +--
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix
index 036afbed5990..7ee869b53c35 100644
--- a/pkgs/development/libraries/ldb/default.nix
+++ b/pkgs/development/libraries/ldb/default.nix
@@ -1,6 +1,6 @@
 { stdenv
 , fetchurl
-, python
+, python3
 , pkg-config
 , readline
 , tdb
@@ -16,49 +16,40 @@
 
 stdenv.mkDerivation rec {
   pname = "ldb";
-  version = "1.3.3";
+  version = "2.1.1";
 
   src = fetchurl {
     url = "mirror://samba/ldb/${pname}-${version}.tar.gz";
-    sha256 = "14gsrm7dvyjpbpnc60z75j6fz2p187abm2h353lq95kx2bv70c1b";
+    sha256 = "jO+y8l/KkT+hinktDvsDrwf4f1uVGkze0DD1uY8lx7A=";
   };
 
   outputs = [ "out" "dev" ];
 
   nativeBuildInputs = [
     pkg-config
+    python3
     wafHook
+    libxslt
+    docbook-xsl-nons
+    docbook_xml_dtd_42
   ];
 
   buildInputs = [
-    python
-    readline
+    python3
+    readline # required to build python
     tdb
     talloc
     tevent
     popt
-    libxslt
-    docbook-xsl-nons
-    docbook_xml_dtd_42
     cmocka
   ];
 
-  patches = [
-    # CVE-2019-3824
-    # downloading the patch from debian as they have ported the patch from samba to ldb but otherwise is identical to
-    # https://bugzilla.samba.org/attachment.cgi?id=14857
-    (fetchurl {
-      name = "CVE-2019-3824.patch";
-      url = "https://sources.debian.org/data/main/l/ldb/2:1.1.27-1+deb9u1/debian/patches/CVE-2019-3824-master-v4-5-02.patch";
-      sha256 = "1idnqckvjh18rh9sbq90rr4sxfviha9nd1ca9pd6lai0y6r6q4yd";
-    })
-  ];
-
   wafPath = "buildtools/bin/waf";
 
   wafConfigureFlags = [
     "--bundled-libraries=NONE"
     "--builtin-libraries=replace"
+    "--without-ldb-lmdb"
   ];
 
   stripDebugList = "bin lib modules";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 72a76af34036..7aa7435916bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12341,9 +12341,7 @@ in
 
   ldacbt = callPackage ../development/libraries/ldacbt { };
 
-  ldb = callPackage ../development/libraries/ldb {
-    python = python2;
-  };
+  ldb = callPackage ../development/libraries/ldb { };
 
   lensfun = callPackage ../development/libraries/lensfun {};
 

From 9435d3e9e56165e5af2b58acfac03d21b45c37ab Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 13 Feb 2020 14:27:42 +0200
Subject: [PATCH 4502/4636] pistol: init at 0.0.4

---
 pkgs/tools/misc/pistol/default.nix | 32 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/misc/pistol/default.nix

diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix
new file mode 100644
index 000000000000..35496ed4766d
--- /dev/null
+++ b/pkgs/tools/misc/pistol/default.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, buildGoModule
+, fetchFromGitHub
+, file
+}:
+
+buildGoModule rec {
+  pname = "pistol";
+  version = "0.0.4";
+
+  src = fetchFromGitHub {
+    owner = "doronbehar";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0r2nq1zsm9zxl097qnjgr5lk9jm3jjvpgczpvp1nx7dfnahkx2wf";
+  };
+
+  modSha256 = "0l4rjrvgbb4b3abyvyz9ws0mh78pri0cvncwv91dzgbx796a2nn6";
+
+  subPackages = [ "cmd/pistol" ];
+
+  buildInputs = [
+    file
+  ];
+
+  meta = with stdenv.lib; {
+    description = "General purpose file previewer designed for Ranger, Lf to make scope.sh redundant";
+    homepage = "https://github.com/doronbehar/pistol";
+    license = licenses.mit;
+    maintainers = with maintainers; [ doronbehar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5638580166c8..dee871b0898f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21275,6 +21275,8 @@ in
     gtksharp = gtk-sharp-2_0;
   };
 
+  pistol = callPackage ../tools/misc/pistol { };
+
   plex-media-player = libsForQt512.callPackage ../applications/video/plex-media-player { };
 
   plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { };

From 1be7664496efff14ff61459e339145b738d57e94 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 31 Mar 2020 05:17:21 +0200
Subject: [PATCH 4503/4636] ntdb: clean up expression
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* format with nixpkgs-fmt
* quote homepage as per RFC 0045
* split name → pname & version
* do not use aliases
* switch to wafHook
* move build tools to nativeBuildInputs
---
 pkgs/development/libraries/ntdb/default.nix | 40 ++++++++++++++-------
 pkgs/top-level/all-packages.nix             |  4 +--
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/ntdb/default.nix b/pkgs/development/libraries/ntdb/default.nix
index a310d2f27802..de0db887d4bf 100644
--- a/pkgs/development/libraries/ntdb/default.nix
+++ b/pkgs/development/libraries/ntdb/default.nix
@@ -1,32 +1,48 @@
-{ stdenv, fetchurl, python, pkgconfig, readline, gettext, libxslt
-, docbook_xsl, docbook_xml_dtd_42
+{ stdenv
+, fetchurl
+, python3
+, pkg-config
+, readline
+, gettext
+, libxslt
+, docbook-xsl-nons
+, docbook_xml_dtd_42
+, wafHook
 }:
 
 stdenv.mkDerivation rec {
-  name = "ntdb-1.0";
+  pname = "ntdb";
+  version = "1.0";
 
   src = fetchurl {
-    url = "mirror://samba/tdb/${name}.tar.gz";
+    url = "mirror://samba/tdb/${pname}-${version}.tar.gz";
     sha256 = "0jdzgrz5sr25k83yrw7wqb3r0yj1v04z4s3lhsmnr5z6n5ifhyl1";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    python readline gettext libxslt docbook_xsl docbook_xml_dtd_42
+  nativeBuildInputs = [
+    pkg-config
+    gettext
+    libxslt
+    docbook-xsl-nons
+    docbook_xml_dtd_42
+    wafHook
   ];
 
-  preConfigure = ''
-    patchShebangs buildtools/bin/waf
-  '';
+  buildInputs = [
+    python3
+    readline # required to build python
+  ];
 
-  configureFlags = [
+  wafPath = "buildtools/bin/waf";
+
+  wafConfigureFlags = [
     "--bundled-libraries=NONE"
     "--builtin-libraries=replace,ccan"
   ];
 
   meta = with stdenv.lib; {
     description = "The not-so trivial database";
-    homepage = https://tdb.samba.org/;
+    homepage = "https://tdb.samba.org/";
     license = licenses.lgpl3Plus;
     platforms = platforms.all;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7aa7435916bb..4188dbfc2932 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14627,9 +14627,7 @@ in
 
   tclx = callPackage ../development/libraries/tclx { };
 
-  ntdb = callPackage ../development/libraries/ntdb {
-    python = python2;
-  };
+  ntdb = callPackage ../development/libraries/ntdb { };
 
   tdb = callPackage ../development/libraries/tdb {};
 

From 365eb878a976abdf516402d7c6b4a7c8b605504d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2020 02:53:28 +0000
Subject: [PATCH 4504/4636] pirate-get: 0.3.4 -> 0.3.5

---
 pkgs/tools/networking/pirate-get/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix
index b92d255b719c..bacea663493f 100644
--- a/pkgs/tools/networking/pirate-get/default.nix
+++ b/pkgs/tools/networking/pirate-get/default.nix
@@ -4,20 +4,20 @@ with python3Packages;
 
 buildPythonApplication rec {
   pname = "pirate-get";
-  version = "0.3.4";
+  version = "0.3.5";
 
   doCheck = false;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0f82yf3bl9jaywagv4vvwypm57z1x8a8qqn0xhz9np3949df4ysm";
+    sha256 = "01jr9c04ic4bfalfdijavzvqzmpkw3hq1glqyc86z3v6zwl8dlp2";
   };
 
   propagatedBuildInputs = [ colorama veryprettytable beautifulsoup4 pyperclip ];
 
   meta = with stdenv.lib; {
     description = "A command line interface for The Pirate Bay";
-    homepage = https://github.com/vikstrous/pirate-get;
+    homepage = "https://github.com/vikstrous/pirate-get";
     license = licenses.gpl1;
     maintainers = with maintainers; [ rnhmjoj ];
     platforms = platforms.unix;

From 2cc64684d0709fde671e25c4e0310e216abb51c8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2020 03:27:58 +0000
Subject: [PATCH 4505/4636] swiftclient: 3.6.0 -> 3.9.0

---
 pkgs/tools/admin/swiftclient/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/swiftclient/default.nix b/pkgs/tools/admin/swiftclient/default.nix
index 788a64f928a4..91860d2df08e 100644
--- a/pkgs/tools/admin/swiftclient/default.nix
+++ b/pkgs/tools/admin/swiftclient/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonApplication rec {
   pname = "python-swiftclient";
-  version = "3.6.0";
+  version = "3.9.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0sv6z72zdwzwdjng0djk3l2maryn9pz3khf69yq5ig2ycz8hh0qv";
+    sha256 = "0xx3v5kk8jp352rydy3jxndy1b9kl2zmkj1gi14fjxjc5r4rf82g";
   };
 
   propagatedBuildInputs = [ requests six pbr setuptools ];
@@ -24,7 +24,7 @@ buildPythonApplication rec {
   doCheck = false;
 
   meta = with lib; {
-    homepage = https://github.com/openstack/python-swiftclient;
+    homepage = "https://github.com/openstack/python-swiftclient";
     description = "Python bindings to the OpenStack Object Storage API";
     license = licenses.asl20;
     maintainers = with maintainers; [ c0deaddict ];

From 294d2d703b0ba18c425631c0caadad3bfb579522 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2020 03:33:09 +0000
Subject: [PATCH 4506/4636] markdown-pp: 1.4 -> 1.5.1

---
 pkgs/tools/text/markdown-pp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/markdown-pp/default.nix b/pkgs/tools/text/markdown-pp/default.nix
index f479c221b65f..eaaa0547964d 100644
--- a/pkgs/tools/text/markdown-pp/default.nix
+++ b/pkgs/tools/text/markdown-pp/default.nix
@@ -3,7 +3,7 @@
 with pythonPackages;
 buildPythonApplication rec {
   pname = "MarkdownPP";
-  version = "1.4";
+  version = "1.5.1";
   propagatedBuildInputs = [ pillow watchdog ];
   checkPhase = ''
     cd test
@@ -13,7 +13,7 @@ buildPythonApplication rec {
     owner = "jreese";
     repo = "markdown-pp";
     rev = "v${version}";
-    sha256 = "1xmc0cxvvf6jzr7p4f0hm8icysrd44sy2kgff9b99lr1agwkmysq";
+    sha256 = "180i5wn9z6vdk2k2bh8345z3g80hj7zf5s2pq0h7k9vaxqpp7avc";
   };
   meta = with stdenv.lib; {
     description = "Preprocessor for Markdown files to generate a table of contents and other documentation needs";

From d5f9b0199dbe420c700f7757be007ac529494886 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 31 Mar 2020 04:09:19 +0000
Subject: [PATCH 4507/4636] qpaeq: add AudioVideo category

Audio without AudioVideo is deprecated.
---
 pkgs/servers/pulseaudio/qpaeq.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/pulseaudio/qpaeq.nix b/pkgs/servers/pulseaudio/qpaeq.nix
index 2b8b08e025bb..2ed4009b6702 100644
--- a/pkgs/servers/pulseaudio/qpaeq.nix
+++ b/pkgs/servers/pulseaudio/qpaeq.nix
@@ -13,7 +13,7 @@ let
     icon = "audio-volume-high";
     desktopName = "qpaeq";
     genericName = "Audio equalizer";
-    categories = "Audio;Mixer;";
+    categories = "AudioVideo;Audio;Mixer;";
     startupNotify = "false";
   };
 in

From 7df81361e48167ed5e8de12dac5969ae4670732d Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 31 Mar 2020 04:04:02 +0000
Subject: [PATCH 4508/4636] makeDesktopItem: make categories optional

"Application" is deprecated, "Other" is invalid, there are no generic
categories, and the Categories fields is optional per the spec.

Fixes the defaults after #75729.
---
 pkgs/build-support/make-desktopitem/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix
index 127243c6f2f8..8355a5ad29bc 100644
--- a/pkgs/build-support/make-desktopitem/default.nix
+++ b/pkgs/build-support/make-desktopitem/default.nix
@@ -9,7 +9,7 @@
 , desktopName
 , genericName ? null
 , mimeType ? null
-, categories ? "Application;Other;"
+, categories ? null
 , startupNotify ? null
 , extraEntries ? null
 , fileValidation ? true # whether to validate resulting desktop file.
@@ -20,6 +20,7 @@ let
                          {k="Comment";       v=comment;}
                          {k="GenericName";   v=genericName;}
                          {k="MimeType";      v=mimeType;}
+                         {k="Categories";    v=categories;}
                          {k="StartupNotify"; v=startupNotify;}];
 
   valueNotNull = {k, v}: v != null;
@@ -37,7 +38,6 @@ runCommandLocal "${name}.desktop" {}
     Exec=${exec}
     Terminal=${terminal}
     Name=${desktopName}
-    Categories=${categories}
     ${optionalEntriesString}
     ${if extraEntries == null then ''EOF'' else ''
     ${extraEntries}

From 6248fb23d22dac5f0e8bc1be107ee9ce656df17f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2020 04:20:27 +0000
Subject: [PATCH 4509/4636] gitAndTools.gita: 0.9.9 -> 0.10.5

---
 .../version-management/git-and-tools/gita/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/gita/default.nix b/pkgs/applications/version-management/git-and-tools/gita/default.nix
index 22bd0e66c151..c9d188e10e5a 100644
--- a/pkgs/applications/version-management/git-and-tools/gita/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gita/default.nix
@@ -6,12 +6,12 @@
 }:
 
 buildPythonApplication rec {
-  version = "0.9.9";
+  version = "0.10.5";
   pname = "gita";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1si2f9nyisbrvv8cvrjxj8r4cbrgc97ic0wdlbf34gvp020dsmgv";
+    sha256 = "1xggslmrrfszpl190klkc97fnl88gml1bnkmkzp6aimdch66g4jg";
   };
 
   propagatedBuildInputs = [
@@ -21,7 +21,7 @@ buildPythonApplication rec {
 
   meta = with lib; {
     description = "A command-line tool to manage multiple git repos";
-    homepage = https://github.com/nosarthur/gita;
+    homepage = "https://github.com/nosarthur/gita";
     license = licenses.mit;
     maintainers = with maintainers; [ seqizz ];
   };

From 6279efe3cdf7f83b07ada2232de4c49d9ba57dd6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2020 04:31:33 +0000
Subject: [PATCH 4510/4636] undervolt: 0.2.9 -> 0.2.11

---
 pkgs/os-specific/linux/undervolt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/undervolt/default.nix b/pkgs/os-specific/linux/undervolt/default.nix
index eb8f55ac6655..696625761b16 100644
--- a/pkgs/os-specific/linux/undervolt/default.nix
+++ b/pkgs/os-specific/linux/undervolt/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
-  version = "0.2.9";
+  version = "0.2.11";
   pname = "undervolt";
 
   src = fetchFromGitHub {
     owner = "georgewhewell";
     repo = "undervolt";
     rev = version;
-    sha256 = "1d934lp8yczrfslmwff6fxzd4arja2vg00s5kwdr949bxpa6w59c";
+    sha256 = "18mnf3x687qal7k8yk2sdxzgbyn3rqchgflbi1sksryznmksqqw5";
   };
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/georgewhewell/undervolt/;
+    homepage = "https://github.com/georgewhewell/undervolt/";
     description = "A program for undervolting Intel CPUs on Linux";
 
     longDescription = ''

From cff5adc2fbd8838cc8451d7e58c6770f7b032ae1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 30 Mar 2020 21:39:00 -0700
Subject: [PATCH 4511/4636] snakemake: 5.10.0 -> 5.13.0 (#83839)

---
 pkgs/applications/science/misc/snakemake/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix
index 27bf47e890a9..34bdaf6bacf8 100644
--- a/pkgs/applications/science/misc/snakemake/default.nix
+++ b/pkgs/applications/science/misc/snakemake/default.nix
@@ -2,7 +2,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "snakemake";
-  version = "5.10.0";
+  version = "5.13.0";
 
   propagatedBuildInputs = with python3Packages; [
     appdirs
@@ -22,13 +22,13 @@ python3Packages.buildPythonApplication rec {
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "0n8d5c8sc90kfdw740ad9ffbkg1ic3k1pmlnk68qr4w4vc98pym3";
+    sha256 = "11snr7sgv70d3y63s5svijfx8f4xpggh96g8chr6lccl4mi1s9x9";
   };
 
   doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json
 
   meta = with stdenv.lib; {
-    homepage = http://snakemake.bitbucket.io;
+    homepage = "http://snakemake.bitbucket.io";
     license = licenses.mit;
     description = "Python-based execution environment for make-like workflows";
     longDescription = ''

From 23c94580ced778de65789997a031db7aec78e44f Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Fri, 20 Mar 2020 04:08:56 +0000
Subject: [PATCH 4512/4636] vimPlugins.lightline-bufferline: init at 2020-02-14

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index cc89e861b8a1..6673dd9df697 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -1849,6 +1849,17 @@ let
     };
   };
 
+  lightline-bufferline = buildVimPluginFrom2Nix {
+    pname = "lightline-bufferline";
+    version = "2020-02-14";
+    src = fetchFromGitHub {
+      owner = "mengelbrecht";
+      repo = "lightline-bufferline";
+      rev = "17683bc5802de7f295f2583a15461e2bc662f98b";
+      sha256 = "1rlamxwk2gm9pyxl9vym9w6rhgimzqa2hjghy3qdqwvif6w8ir6l";
+    };
+  };
+
   lightline-vim = buildVimPluginFrom2Nix {
     pname = "lightline-vim";
     version = "2020-03-16";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 1d84a86f847f..e99f7b36a1c1 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -272,6 +272,7 @@ MaxMEllon/vim-jsx-pretty
 mbbill/undotree
 megaannum/forms
 megaannum/self
+mengelbrecht/lightline-bufferline
 mfukar/robotframework-vim
 mg979/vim-visual-multi
 mhinz/vim-grepper

From 95c981e9803b5c5d13c367615488d89b41379097 Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Fri, 20 Mar 2020 04:10:21 +0000
Subject: [PATCH 4513/4636] vimPlugins.SimpylFold: init at 2017-06-13

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 6673dd9df697..cc093d83e133 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2740,6 +2740,17 @@ let
     };
   };
 
+  SimpylFold = buildVimPluginFrom2Nix {
+    pname = "SimpylFold";
+    version = "2017-06-13";
+    src = fetchFromGitHub {
+      owner = "tmhedberg";
+      repo = "SimpylFold";
+      rev = "aa0371d9d708388f3ba385ccc67a7504586a20d9";
+      sha256 = "1gjv78x2cgh79a04l411kdhkm53f93czs54p07kadpa9659z93ss";
+    };
+  };
+
   sky-color-clock-vim = buildVimPluginFrom2Nix {
     pname = "sky-color-clock-vim";
     version = "2018-11-03";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index e99f7b36a1c1..348b400e427a 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -448,6 +448,7 @@ ternjs/tern_for_vim
 terryma/vim-expand-region
 terryma/vim-multiple-cursors
 tex/vimpreviewpandoc
+tmhedberg/SimpylFold
 thinca/vim-ft-diff_fold
 thinca/vim-prettyprint
 thinca/vim-quickrun

From d0ce3afefa8da13ac10063fb236edeb7025f64dc Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Fri, 20 Mar 2020 04:12:26 +0000
Subject: [PATCH 4514/4636] vimPlugins.splitjoin-vim: init at 2020-03-10

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index cc093d83e133..717df8d0b640 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -2850,6 +2850,17 @@ let
     };
   };
 
+  splitjoin-vim = buildVimPluginFrom2Nix {
+    pname = "splitjoin-vim";
+    version = "2020-03-10";
+    src = fetchFromGitHub {
+      owner = "AndrewRadev";
+      repo = "splitjoin.vim";
+      rev = "fef5079e9dee55c2cf879ce2a4412fb5dcb40808";
+      sha256 = "1v6cm86klzbmzx2grzxprpxci3001yjfbnwdd1891rfggjlm4wj9";
+    };
+  };
+
   starsearch-vim = buildVimPluginFrom2Nix {
     pname = "starsearch-vim";
     version = "2014-09-21";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 348b400e427a..8cdb28057d3d 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -11,6 +11,7 @@ alx741/vim-stylishask
 amiorin/ctrlp-z
 andrep/vimacs
 andreshazard/vim-logreview
+AndrewRadev/splitjoin.vim
 andsild/peskcolor.vim
 andviro/flake8-vim
 andys8/vim-elm-syntax

From 1f446cc7c8eb07f0a6b454d444bce6bdf8df331e Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Fri, 20 Mar 2020 04:13:01 +0000
Subject: [PATCH 4515/4636] vimPlugins.vim-python-pep8-indent: init at
 2019-05-13

---
 pkgs/misc/vim-plugins/generated.nix    | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 717df8d0b640..ae43c8cef6d3 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -5151,6 +5151,17 @@ let
     };
   };
 
+  vim-python-pep8-indent = buildVimPluginFrom2Nix {
+    pname = "vim-python-pep8-indent";
+    version = "2019-05-13";
+    src = fetchFromGitHub {
+      owner = "hynek";
+      repo = "vim-python-pep8-indent";
+      rev = "b3a7395ce49b13145bbb54b1cdbfe6a33585bfe9";
+      sha256 = "0gkbjcwdizqivsrn0p1gdn1170jimkk1vyxhyr286nb5qxj2n8hh";
+    };
+  };
+
   vim-qml = buildVimPluginFrom2Nix {
     pname = "vim-qml";
     version = "2019-12-20";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 8cdb28057d3d..2dc7a8427bad 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -138,6 +138,7 @@ honza/vim-snippets
 hotwatermorning/auto-git-diff
 hsanson/vim-android
 hsitz/VimOrganizer
+hynek/vim-python-pep8-indent
 iamcco/coc-spell-checker
 ianks/vim-tsx
 icymind/NeoSolarized

From 3017e6989f300cd84a2c919dccc4002ed581f27d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2020 04:06:15 +0000
Subject: [PATCH 4516/4636] deeptools: 3.3.1 -> 3.4.1

---
 pkgs/applications/science/biology/deeptools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/deeptools/default.nix b/pkgs/applications/science/biology/deeptools/default.nix
index 78a6f483337f..8787c96e5b03 100644
--- a/pkgs/applications/science/biology/deeptools/default.nix
+++ b/pkgs/applications/science/biology/deeptools/default.nix
@@ -4,11 +4,11 @@
 with python.pkgs;
 buildPythonApplication rec {
   pname = "deepTools";
-  version = "3.3.1";
+  version = "3.4.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08p36p9ncj5s8qf1r7h83x4rnmi63l3yk6mnr3wgpg2qgvwl0hji";
+    sha256 = "05zw9gk17hz08hns5lnhn7l13idg9jdz4gdba6m6gbr84yz149gs";
   };
 
   propagatedBuildInputs = [

From 81baaa6860f752e1987c25ace4d02cc23c6a9502 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2020 03:49:31 +0000
Subject: [PATCH 4517/4636] gallery-dl: 1.13.1 -> 1.13.3

---
 pkgs/applications/misc/gallery-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix
index d0cf9673180a..791db13e4239 100644
--- a/pkgs/applications/misc/gallery-dl/default.nix
+++ b/pkgs/applications/misc/gallery-dl/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gallery_dl";
-  version = "1.13.1";
+  version = "1.13.3";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "0a5k7gcs3vn6x1f2qg3ajpqsl39pmw2hsj2srd5y2l1xw7mkkqj6";
+    sha256 = "0nhbhli45i2xhkmyj9mpg8fn1l58y2zmr6nnnnms557wpdpg112x";
   };
 
   doCheck = false;

From 3267f92b98aa4f52c042a4a2c717a1ff4886989e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2020 04:34:28 +0000
Subject: [PATCH 4518/4636] ffmpeg-normalize: 1.15.7 -> 1.15.8

---
 pkgs/applications/video/ffmpeg-normalize/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix
index d992e42ebffd..4fad80c27ab1 100644
--- a/pkgs/applications/video/ffmpeg-normalize/default.nix
+++ b/pkgs/applications/video/ffmpeg-normalize/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonApplication rec {
   pname = "ffmpeg-normalize";
-  version = "1.15.7";
+  version = "1.15.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0161939f864e973b11d50170c657baf3e1433147f46c74a74ed5025a822e9a2d";
+    sha256 = "01lx1ki1iglg1dz6x99ciqx5zqlbj7hvfb12ga9m68ypjm0fcphl";
   };
 
   propagatedBuildInputs = [ ffmpeg tqdm ];

From cba196b0576a7ae8c7a5e899b54297c6cad172de Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2020 03:40:45 +0000
Subject: [PATCH 4519/4636] urh: 2.8.3 -> 2.8.5

---
 pkgs/applications/radio/urh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix
index 6c8615fd6310..850f73c49224 100644
--- a/pkgs/applications/radio/urh/default.nix
+++ b/pkgs/applications/radio/urh/default.nix
@@ -5,13 +5,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "urh";
-  version = "2.8.3";
+  version = "2.8.5";
 
   src = fetchFromGitHub {
     owner = "jopohl";
     repo = pname;
     rev = "v${version}";
-    sha256 = "17104livp6fv2zg56sqv90lqb7ywqhq2qfnal1hriwwh1b92glv8";
+    sha256 = "060npn0q7yrby2zj9hi8x7raivs91v9hvryvf45k1ipyqh8dgri6";
   };
 
   nativeBuildInputs = [ qt5.wrapQtAppsHook ];

From 1e78891e85a6bd7dc85eb79f0a41eeed72280d79 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2020 04:57:29 +0000
Subject: [PATCH 4520/4636] gdbgui: 0.13.1.1 -> 0.13.2.0

---
 pkgs/development/tools/misc/gdbgui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix
index b021a3e222b3..d5f8cfa173b1 100644
--- a/pkgs/development/tools/misc/gdbgui/default.nix
+++ b/pkgs/development/tools/misc/gdbgui/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonApplication rec {
   pname = "gdbgui";
-  version = "0.13.1.1";
+  version = "0.13.2.0";
 
   buildInputs = [ gdb ];
   propagatedBuildInputs = [
@@ -26,7 +26,7 @@ buildPythonApplication rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ypxgkxwb443ndyrmsa7zx2hn0d9b3s7n2w49ngfghd3l8k0yvi2";
+    sha256 = "0m1fnwafzrpk77yj3p26vszlz11cv4g2lj38kymk1ilcifh4gqw0";
   };
 
   postPatch = ''

From b3bd6835b780f091c462b68b96616aa7f03e150c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2020 05:11:30 +0000
Subject: [PATCH 4521/4636] git-repo-updater: 0.5 -> 0.5.1

---
 pkgs/development/tools/git-repo-updater/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/git-repo-updater/default.nix b/pkgs/development/tools/git-repo-updater/default.nix
index 6acb628a322c..dbf83677999a 100644
--- a/pkgs/development/tools/git-repo-updater/default.nix
+++ b/pkgs/development/tools/git-repo-updater/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonApplication rec {
   pname = "gitup";
-  version = "0.5";
+  version = "0.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "11ilz9i2yxrbipyjzpfkj7drx9wkrn3phvd1a60jivphbqdldpgf";
+    sha256 = "1pa612rcc94nc461zs9sag9p46sycc214622b06gdn35rmwp0y2g";
   };
 
   propagatedBuildInputs = [ colorama GitPython ];

From 589fa50df7c757984f0b2d6ee32aed4e6dda708e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2020 03:35:58 +0000
Subject: [PATCH 4522/4636] fanficfare: 3.16.0 -> 3.17.0

---
 pkgs/tools/text/fanficfare/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix
index ac89b6af32a7..ac90b4d7792c 100644
--- a/pkgs/tools/text/fanficfare/default.nix
+++ b/pkgs/tools/text/fanficfare/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "FanFicFare";
-  version = "3.16.0";
+  version = "3.17.0";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "1l76fh23a9wmw47bahd5l1bxyqcy54lahvid373iy9p3586fskis";
+    sha256 = "1h7kzlw516w9qk5vcn0rqibxbhvzbmxgnf9l6yjxj30x53ynrvzj";
   };
 
   propagatedBuildInputs = with python3Packages; [

From b64ce81b87df990f7aff84586c1728530a96ecb6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2020 05:03:04 +0000
Subject: [PATCH 4523/4636] rshell: 0.0.26 -> 0.0.27

---
 pkgs/development/tools/rshell/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rshell/default.nix b/pkgs/development/tools/rshell/default.nix
index b209b09eec71..5087b811ac01 100644
--- a/pkgs/development/tools/rshell/default.nix
+++ b/pkgs/development/tools/rshell/default.nix
@@ -2,17 +2,17 @@
 
 buildPythonApplication rec {
   pname = "rshell";
-  version = "0.0.26";
+  version = "0.0.27";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05nvfaykzwj1y86fcckrnvmrva7849lkbmpxsy2hb9akk0y7li6c";
+    sha256 = "15pm60jfmr5nms43nrh5jlpz4lxxfhaahznfcys6nc4g80r2fwr2";
   };
 
   propagatedBuildInputs = [ pyserial pyudev ];
 
   meta = with lib; {
-    homepage = https://github.com/dhylands/rshell;
+    homepage = "https://github.com/dhylands/rshell";
     description = "Remote Shell for MicroPython";
     license = licenses.mit;
     maintainers = with maintainers; [ c0deaddict ];

From 560e80348c23cd129dad777fc71c6c65b9ccf923 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2020 05:08:40 +0000
Subject: [PATCH 4524/4636] sqlite-web: 0.3.5 -> 0.3.6

---
 pkgs/development/tools/database/sqlite-web/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/database/sqlite-web/default.nix b/pkgs/development/tools/database/sqlite-web/default.nix
index a1b8ece12362..9a9314fde9b1 100644
--- a/pkgs/development/tools/database/sqlite-web/default.nix
+++ b/pkgs/development/tools/database/sqlite-web/default.nix
@@ -4,11 +4,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "sqlite-web";
-  version = "0.3.5";
+  version = "0.3.6";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "9e0c8938434b0129423544162d4ca6975abf7042c131445f79661a4b9c885d47";
+    sha256 = "17pymadm063358nji70xzma64zkfv26c3pai5i1whsfp9ahqzasg";
   };
 
   propagatedBuildInputs = with python3Packages; [ flask peewee pygments ];
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
 
   meta = with lib; {
     description = "Web-based SQLite database browser";
-    homepage = https://github.com/coleifer/sqlite-web;
+    homepage = "https://github.com/coleifer/sqlite-web";
     license = licenses.mit;
     maintainers = [ maintainers.costrouc ];
   };

From 0474424904d3756d5879a2622563ef3dc8e42290 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2020 04:42:13 +0000
Subject: [PATCH 4525/4636] whatstyle: 0.1.7 -> 0.1.8

---
 pkgs/development/tools/misc/whatstyle/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/whatstyle/default.nix b/pkgs/development/tools/misc/whatstyle/default.nix
index 0c6e4f568ffc..c882d6243fa0 100644
--- a/pkgs/development/tools/misc/whatstyle/default.nix
+++ b/pkgs/development/tools/misc/whatstyle/default.nix
@@ -2,12 +2,12 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "whatstyle";
-  version = "0.1.7";
+  version = "0.1.8";
   src = fetchFromGitHub {
     owner = "mikr";
     repo = pname;
     rev = "v${version}";
-    sha256 = "16ak4g149cr764c1lqakiyzmf5s98w8bdc4gk69m8qacimfg3mzm";
+    sha256 = "08lfd8h5fnvy5gci4f3an411cypad7p2yiahvbmlp51r9xwpaiwr";
   };
 
   # Fix references to previous version, to avoid confusion:
@@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     description = "Find a code format style that fits given source files";
-    homepage = https://github.com/mikr/whatstyle;
+    homepage = "https://github.com/mikr/whatstyle";
     license = licenses.mit;
     maintainers = with maintainers; [ dtzWill ];
     platforms = platforms.all;

From aa6c79daeb81b61b0ab63c274271afe3b0545d1f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2020 04:54:45 +0000
Subject: [PATCH 4526/4636] vcstool: 0.1.36 -> 0.2.7

---
 pkgs/development/tools/vcstool/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix
index f9a84937af30..f67bcb29966d 100644
--- a/pkgs/development/tools/vcstool/default.nix
+++ b/pkgs/development/tools/vcstool/default.nix
@@ -5,11 +5,11 @@ with python3Packages;
 
 buildPythonApplication rec {
   pname = "vcstool";
-  version = "0.1.36";
+  version = "0.2.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3c3d347f46cda641344ec5d613896499981b0540e2bfa299baf6026dab7649ca";
+    sha256 = "1mq8lmb1wh55cqdj7javq7qia4217h6vf5ljc99gsjyibi7g7d3k";
   };
 
   propagatedBuildInputs = [ pyyaml ];
@@ -20,7 +20,7 @@ buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     description = "Provides a command line tool to invoke vcs commands on multiple repositories";
-    homepage = https://github.com/dirk-thomas/vcstool;
+    homepage = "https://github.com/dirk-thomas/vcstool";
     license = licenses.asl20;
     maintainers = with maintainers; [ sivteck ];
   };

From 1504df58e2b677fae72ebcae39585e345935f51d Mon Sep 17 00:00:00 2001
From: Jon <jonringer@users.noreply.github.com>
Date: Mon, 30 Mar 2020 22:39:37 -0700
Subject: [PATCH 4527/4636] vcstools: fix dependencies

missing setuptools

```
$ ./results/vcstool/bin/vcs --help
Traceback (most recent call last):
  File "/nix/store/m9w0gapwnwffhnvyv3ds14mgbx2p5y93-vcstool-0.2.7/bin/.vcs-wrapped", line 6, in <module>
    from vcstool.commands.vcs import main
  File "/nix/store/m9w0gapwnwffhnvyv3ds14mgbx2p5y93-vcstool-0.2.7/lib/python3.7/site-packages/vcstool/commands/vcs.py", line 5, in <module>
    from vcstool.commands.help import get_entrypoint
  File "/nix/store/m9w0gapwnwffhnvyv3ds14mgbx2p5y93-vcstool-0.2.7/lib/python3.7/site-packages/vcstool/commands/help.py", line 6, in <module>
    from pkg_resources import load_entry_point
ModuleNotFoundError: No module named 'pkg_resources'
```
---
 pkgs/development/tools/vcstool/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix
index f67bcb29966d..bab3ebd57573 100644
--- a/pkgs/development/tools/vcstool/default.nix
+++ b/pkgs/development/tools/vcstool/default.nix
@@ -12,7 +12,7 @@ buildPythonApplication rec {
     sha256 = "1mq8lmb1wh55cqdj7javq7qia4217h6vf5ljc99gsjyibi7g7d3k";
   };
 
-  propagatedBuildInputs = [ pyyaml ];
+  propagatedBuildInputs = [ pyyaml setuptools ];
 
   makeWrapperArgs = ["--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ git bazaar subversion ])];
 

From dc3a76ae0ae6ae75ca29f1e8f8b9f3aceec5f7b5 Mon Sep 17 00:00:00 2001
From: Michael Reilly <OmnipotentEntity@gmail.com>
Date: Sun, 8 Mar 2020 19:36:58 -0400
Subject: [PATCH 4528/4636] katago: init at 1.3.5

---
 pkgs/games/katago/default.nix   | 97 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  8 +++
 2 files changed, 105 insertions(+)
 create mode 100644 pkgs/games/katago/default.nix

diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix
new file mode 100644
index 000000000000..cbbdb538513c
--- /dev/null
+++ b/pkgs/games/katago/default.nix
@@ -0,0 +1,97 @@
+{ stdenv
+, gcc8Stdenv
+, lib
+, libzip
+, boost
+, cmake
+, makeWrapper
+, fetchFromGitHub
+, cudnn ? null
+, cudatoolkit ? null
+, libGL_driver ? null
+, opencl-headers ? null
+, ocl-icd ? null
+, gperftools ? null
+, cudaSupport ? false
+, useTcmalloc ? true}:
+
+assert cudaSupport -> (
+  libGL_driver != null && 
+  cudatoolkit != null &&
+  cudnn != null);
+
+assert !cudaSupport -> (
+  opencl-headers != null &&
+  ocl-icd != null);
+
+assert useTcmalloc -> (
+  gperftools != null);
+
+let
+  env = if cudaSupport 
+    then gcc8Stdenv
+    else stdenv;
+
+in env.mkDerivation rec {
+  pname = "katago";
+  version = "1.3.5";
+
+  src = fetchFromGitHub {
+    owner = "lightvector";
+    repo = "katago";
+    rev = "v${version}";
+    sha256 = "1625s3fh0xc2ldgyl6sjdjmpliyys7rzzkcys6h9x6k828g8n0lq";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    makeWrapper
+  ];
+
+  buildInputs = [
+    libzip
+    boost
+  ] ++ lib.optionals cudaSupport [
+    cudnn
+    libGL_driver
+  ] ++ lib.optionals (!cudaSupport) [
+    opencl-headers
+    ocl-icd
+  ] ++ lib.optionals useTcmalloc [
+    gperftools
+  ];
+
+  cmakeFlags = [
+    "-DNO_GIT_REVISION=ON"
+  ] ++ lib.optionals cudaSupport [
+    "-DUSE_BACKEND=CUDA"
+  ] ++ lib.optionals (!cudaSupport) [
+    "-DUSE_BACKEND=OPENCL"
+  ] ++ lib.optionals useTcmalloc [
+    "-DUSE_TCMALLOC=ON"
+  ];
+
+  preConfigure = ''
+    cd cpp/
+  '' + lib.optionalString cudaSupport ''
+    export CUDA_PATH="${cudatoolkit}"
+    export EXTRA_LDFLAGS="-L/run/opengl-driver/lib"
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin; cp katago $out/bin;
+  '' + lib.optionalString cudaSupport ''
+    wrapProgram $out/bin/katago \
+      --prefix LD_LIBRARY_PATH : "/run/opengl-driver/lib"
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Go engine modeled after AlphaGo Zero";
+    homepage    = "https://github.com/lightvector/katago";
+    license     = licenses.mit;
+    maintainers = [ maintainers.omnipotententity ];
+    platforms   = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec4f61353a95..d5583bca8e2d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23299,6 +23299,14 @@ in
 
   ja2-stracciatella = callPackage ../games/ja2-stracciatella { };
 
+  katago = callPackage ../games/katago { };
+
+  katagoWithCuda = katago.override {
+    cudaSupport = true;
+    cudnn = cudnn_cudatoolkit_10_1;
+    cudatoolkit = cudatoolkit_10_1;
+  };
+
   klavaro = callPackage ../games/klavaro {};
 
   kobodeluxe = callPackage ../games/kobodeluxe { };

From 4a623b9c8ab46e7297b9fef15e4b7d0b3be9b6e7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2020 06:56:11 +0000
Subject: [PATCH 4529/4636] wllvm: 1.2.2 -> 1.2.8

---
 pkgs/development/tools/wllvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix
index 18d7be93258b..cd002bd2ef61 100644
--- a/pkgs/development/tools/wllvm/default.nix
+++ b/pkgs/development/tools/wllvm/default.nix
@@ -1,17 +1,17 @@
 { stdenv, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
-  version = "1.2.2";
+  version = "1.2.8";
   pname = "wllvm";
   name = "${pname}-${version}";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "1zrjcabv41105mmv632gp488kmhya37n0jwgwxhadps4z3jv2qxb";
+    sha256 = "1d88fzg4ba4r3hwrinnv6agiyj3xxdy4yryb8wz2ml51nc6bi591";
   };
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/travitch/whole-program-llvm;
+    homepage = "https://github.com/travitch/whole-program-llvm";
     description = "A wrapper script to build whole-program LLVM bitcode files";
     license = licenses.mit;
     maintainers = with maintainers; [ mic92 dtzWill ];

From 8ef96116456236d5b94480ac084454058d18bb5e Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Mon, 30 Mar 2020 23:15:04 +0200
Subject: [PATCH 4530/4636] nix-script: 2015-09-22 -> 2020-03-23

---
 pkgs/tools/nix/nix-script/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/nix/nix-script/default.nix b/pkgs/tools/nix/nix-script/default.nix
index d69b5943123c..dec5993f1b27 100644
--- a/pkgs/tools/nix/nix-script/default.nix
+++ b/pkgs/tools/nix/nix-script/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation {
   pname = "nix-script";
-  version = "2015-09-22";
+  version = "2020-03-23";
 
   src  = fetchFromGitHub {
     owner  = "bennofs";
     repo   = "nix-script";
-    rev    = "83064dc557b642f6748d4f2372b2c88b2a82c4e7";
-    sha256 = "0iwclyd2zz8lv012yghfr4696kdnsq6xvc91wv00jpwk2c09xl7a";
+    rev    = "7706b45429ff22c35bab575734feb2926bf8840b";
+    sha256 = "0yiqljamcj9x8z801bwj7r30sskrwv4rm6sdf39j83jqql1fyq7y";
   };
 
   buildInputs  = [

From 35523fbb0d8a1df4a6e2cd31a97a5f8063b1901d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 31 Mar 2020 08:35:52 +0100
Subject: [PATCH 4531/4636] fcgi: 2.4.0 -> 2.4.2

---
 pkgs/development/libraries/fcgi/default.nix | 23 +++++++--------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix
index 5eb7e3866ce6..0f580e3cd2b4 100644
--- a/pkgs/development/libraries/fcgi/default.nix
+++ b/pkgs/development/libraries/fcgi/default.nix
@@ -1,24 +1,17 @@
-{ stdenv, fetchurl, fetchpatch }:
+{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "fcgi";
-  version = "2.4.0";
+  version = "2.4.2";
 
-  src = fetchurl {
-    url = "https://launchpad.net/debian/+archive/primary/+files/libfcgi_${version}.orig.tar.gz";
-    #    url = "http://www.fastcgi.com/dist/${name}.tar.gz";
-    sha256 = "1f857wnl1d6jfrgfgfpz3zdaj8fch3vr13mnpcpvy8bang34bz36";
+  src = fetchFromGitHub {
+    owner = "FastCGI-Archives";
+    repo = "fcgi2";
+    rev = version;
+    sha256 = "1jhz6jfwv5kawa8kajvg18nfwc1b30f38zc0lggszd1vcmrwqkz1";
   };
 
-  patches = [
-    ./gcc-4.4.diff
-    (fetchpatch {
-      # Fix a stack-smashing bug:
-      # xhttps://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681591
-      url = "https://bugs.launchpad.net/ubuntu/+source/libfcgi/+bug/933417/+attachment/2745025/+files/poll.patch";
-      sha256 = "0v3gw0smjvrxh1bv3zx9xp633gbv5dd5bcn3ipj6ckqjyv4i6i7m";
-    })
-  ];
+  nativeBuildInputs = [ autoreconfHook ];
 
   postInstall = "ln -s . $out/include/fastcgi";
 

From 40d5a07ebefbc6719c0e089b13cfc910e1723cb5 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <brightone@protonmail.com>
Date: Tue, 31 Mar 2020 11:48:10 +0300
Subject: [PATCH 4532/4636] sozu: init at 0.11.46

---
 pkgs/servers/sozu/default.nix   | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/servers/sozu/default.nix

diff --git a/pkgs/servers/sozu/default.nix b/pkgs/servers/sozu/default.nix
new file mode 100644
index 000000000000..f7feda5e916c
--- /dev/null
+++ b/pkgs/servers/sozu/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+    pname = "sozu";
+    version = "0.11.46";
+
+    src = fetchFromGitHub {
+        owner = "sozu-proxy";
+        repo = pname;
+        rev = version;
+        sha256 = "0anng5qvdx9plxs9qqr5wmjjz0gx5113jq28xwbxaaklvd4ni7cm";
+    };
+
+    cargoSha256 = "19c2s9h4jk9pff72wdqw384mvrf40d8x4sx7qysnpb4hayq2ijh3";
+
+    meta = with stdenv.lib; {
+        description = "Open Source HTTP Reverse Proxy built in Rust for Immutable Infrastructures";
+        homepage = "https://sozu.io";
+        license = licenses.agpl3;
+        maintainers = with maintainers; [ filalex77 ];
+    };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d1f57640d54..a15a4f05909f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6716,6 +6716,8 @@ in
 
   soundkonverter = kdeApplications.callPackage ../applications/audio/soundkonverter {};
 
+  sozu = callPackage ../servers/sozu { };
+
   sparsehash = callPackage ../development/libraries/sparsehash { };
 
   spectre-meltdown-checker = callPackage ../tools/security/spectre-meltdown-checker { };

From 6af90a3df830d50527b3885318633a141435114f Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Tue, 31 Mar 2020 14:46:04 +0300
Subject: [PATCH 4533/4636] nixos/mysql: add test mariadb with rocksdb plugin

---
 nixos/tests/mysql.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix
index df0730660b01..11c1dabf9360 100644
--- a/nixos/tests/mysql.nix
+++ b/nixos/tests/mysql.nix
@@ -70,7 +70,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
         }];
         services.mysql.settings = {
           mysqld = {
-            plugin-load-add = [ "ha_tokudb.so" ];
+            plugin-load-add = [ "ha_tokudb.so" "ha_rocksdb.so" ];
           };
         };
         services.mysql.package = pkgs.mariadb;
@@ -125,5 +125,19 @@ import ./make-test-python.nix ({ pkgs, ...} : {
     mariadb.succeed(
         "echo 'use testdb; drop table tokudb;' | sudo -u testuser mysql -u testuser"
     )
+
+    # Check if RocksDB plugin works
+    mariadb.succeed(
+        "echo 'use testdb; create table rocksdb (test_id INT, PRIMARY KEY (test_id)) ENGINE = RocksDB;' | sudo -u testuser mysql -u testuser"
+    )
+    mariadb.succeed(
+        "echo 'use testdb; insert into rocksdb values (28);' | sudo -u testuser mysql -u testuser"
+    )
+    mariadb.succeed(
+        "echo 'use testdb; select test_id from rocksdb;' | sudo -u testuser mysql -u testuser -N | grep 28"
+    )
+    mariadb.succeed(
+        "echo 'use testdb; drop table rocksdb;' | sudo -u testuser mysql -u testuser"
+    )
   '';
 })

From 90931eaa398c0a78c612749ee975dc283dd60760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Fri, 24 Jan 2020 23:04:47 +0100
Subject: [PATCH 4534/4636] cinnamon.cinnamon-session: init at 4.4.0

---
 .../0001-Add-dbus_glib-dependency.patch       |  38 +++++++
 .../cinnamon/cinnamon-session/default.nix     | 105 ++++++++++++++++++
 pkgs/desktops/cinnamon/default.nix            |   1 +
 3 files changed, 144 insertions(+)
 create mode 100644 pkgs/desktops/cinnamon/cinnamon-session/0001-Add-dbus_glib-dependency.patch
 create mode 100644 pkgs/desktops/cinnamon/cinnamon-session/default.nix

diff --git a/pkgs/desktops/cinnamon/cinnamon-session/0001-Add-dbus_glib-dependency.patch b/pkgs/desktops/cinnamon/cinnamon-session/0001-Add-dbus_glib-dependency.patch
new file mode 100644
index 000000000000..156573c30e9a
--- /dev/null
+++ b/pkgs/desktops/cinnamon/cinnamon-session/0001-Add-dbus_glib-dependency.patch
@@ -0,0 +1,38 @@
+From ddc2c4faeec36675654a2f8f04c3011b807fdf79 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
+Date: Sun, 22 Mar 2020 07:36:25 +0100
+Subject: [PATCH] Add dbus_glib dependency
+
+---
+ cinnamon-session/meson.build | 2 +-
+ meson.build                  | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/cinnamon-session/meson.build b/cinnamon-session/meson.build
+index ee8916f..9dd9283 100644
+--- a/cinnamon-session/meson.build
++++ b/cinnamon-session/meson.build
+@@ -74,7 +74,7 @@ executable('cinnamon-session',
+     xext,
+     xrender,
+     xtest,
+-    # elogind,
++    dbus_glib,
+   ],
+   link_with: [
+     libegg,
+diff --git a/meson.build b/meson.build
+index 231a448..db306dc 100644
+--- a/meson.build
++++ b/meson.build
+@@ -48,6 +48,7 @@ else
+   gconf     = dependency('', required: false)
+ endif
+ conf.set('HAVE_GCONF', gconf.found())
++dbus_glib = dependency('dbus-glib-1')
+ 
+ 
+ gio_unix    = dependency('gio-unix-2.0',      required: false)
+-- 
+2.25.1
+
diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix
new file mode 100644
index 000000000000..56ff4b106e33
--- /dev/null
+++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix
@@ -0,0 +1,105 @@
+{ fetchFromGitHub
+, cinnamon-desktop
+, cinnamon-settings-daemon
+, dbus-glib
+, docbook_xsl
+, docbook_xml_dtd_412
+, glib
+, gsettings-desktop-schemas
+, gtk3
+, libcanberra
+, libxslt
+, makeWrapper
+, meson
+, ninja
+, pkgconfig
+, python3
+, stdenv
+, systemd
+, wrapGAppsHook
+, xapps
+, xmlto
+, xorg
+, cmake
+, libexecinfo
+, pango
+}:
+
+stdenv.mkDerivation rec {
+  pname = "cinnamon-session";
+  version = "4.4.0";
+
+  src = fetchFromGitHub {
+    owner = "linuxmint";
+    repo = pname;
+    rev = version;
+    sha256 = "0hplck17rksfgqm2z58ajvz4p2m4zg6ksdpbc27ki20iv4fv620s";
+  };
+
+  patches = [
+    ./0001-Add-dbus_glib-dependency.patch
+  ];
+
+  buildInputs = [
+    # meson.build
+    gtk3
+    glib
+    libcanberra
+    pango
+    xorg.libX11
+    xorg.libXext
+    xapps
+    xorg.libXau
+    xorg.libXcomposite
+
+    systemd
+
+    xorg.libXtst
+    xorg.libXrender
+    xorg.xtrans
+
+    # other (not meson.build)
+
+    cinnamon-desktop
+    cinnamon-settings-daemon
+    dbus-glib
+    glib
+    gsettings-desktop-schemas
+  ];
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    wrapGAppsHook
+    libexecinfo
+    docbook_xsl
+    docbook_xml_dtd_412
+    python3
+    pkgconfig
+    libxslt
+    xmlto
+  ];
+
+  # TODO: https://github.com/NixOS/nixpkgs/issues/36468
+  mesonFlags = [ "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" "-Dgconf=false" "-DENABLE_IPV6=true" ];
+
+  postPatch = ''
+    chmod +x data/meson_install_schemas.py # patchShebangs requires executable file
+    patchShebangs data/meson_install_schemas.py
+  '';
+
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix XDG_DATA_DIRS : "${cinnamon-desktop}/share"
+      --prefix XDG_CONFIG_DIRS : "${cinnamon-settings-daemon}/etc/xdg"
+    )
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/linuxmint/cinnamon-session";
+    description = "The Cinnamon session manager";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.mkg20001 ];
+  };
+}
diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix
index b077ad184769..ba99d2d36b58 100644
--- a/pkgs/desktops/cinnamon/default.nix
+++ b/pkgs/desktops/cinnamon/default.nix
@@ -4,6 +4,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   cinnamon-desktop = callPackage ./cinnamon-desktop { };
   cinnamon-menus = callPackage ./cinnamon-menus { };
   cinnamon-translations = callPackage ./cinnamon-translations { };
+  cinnamon-session = callPackage ./cinnamon-session { };
   cinnamon-settings-daemon = callPackage ./cinnamon-settings-daemon { };
   cjs = callPackage ./cjs { };
   nemo = callPackage ./nemo { };

From f9703bde3625880468a82c2e918d14937623c383 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sun, 29 Mar 2020 16:08:09 +0200
Subject: [PATCH 4535/4636] plex: 1.18.8.2527 -> 1.18.9.2571

---
 pkgs/servers/plex/raw.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index d4dd993b3296..678463f5a872 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -8,13 +8,13 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.18.8.2527-740d4c206";
+  version = "1.18.9.2571-e106a8a91";
   pname = "plexmediaserver";
 
   # Fetch the source
   src = fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm";
-    sha256 = "05543nkhmp6wq88vz5cnv3cfd5hbd8rqs1rylfy7njgvb0pxl107";
+    sha256 = "061q8vmvlhn1hxvxr420sd1izncqqjwmfj41dqqxhmfkq6nrwvxr";
   };
 
   outputs = [ "out" "basedb" ];

From bbce57b1431f35964c82a12ae9890330f966648c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= <code@andre-bubel.de>
Date: Tue, 31 Mar 2020 15:00:49 +0200
Subject: [PATCH 4536/4636] prusa-slicer: 2.1.1 -> 2.2.0

Adding myself (moredread) as maintainer. Several new dependencies and a bit of cleanup.
---
 .../misc/prusa-slicer/default.nix             | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix
index caf4f270a151..75183e202671 100644
--- a/pkgs/applications/misc/prusa-slicer/default.nix
+++ b/pkgs/applications/misc/prusa-slicer/default.nix
@@ -1,32 +1,34 @@
-{ stdenv, lib, fetchFromGitHub, makeWrapper, cmake, pkgconfig
+{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
 , boost, cereal, curl, eigen, expat, glew, libpng, tbb, wxGTK31
 , gtest, nlopt, xorg, makeDesktopItem
+, cgal_5, gmp, ilmbase, mpfr, qhull, openvdb, systemd
 }:
-let
-  nloptVersion = if lib.hasAttr "version" nlopt
-                 then lib.getAttr "version" nlopt
-                 else "2.4";
-in
 stdenv.mkDerivation rec {
   pname = "prusa-slicer";
-  version = "2.1.1";
+  version = "2.2.0";
 
   enableParallelBuilding = true;
 
   nativeBuildInputs = [
     cmake
-    makeWrapper
     pkgconfig
   ];
 
   buildInputs = [
     boost
     cereal
+    cgal_5
     curl
     eigen
     expat
     glew
+    gmp
+    ilmbase
     libpng
+    mpfr
+    nlopt
+    openvdb
+    systemd
     tbb
     wxGTK31
     xorg.libX11
@@ -35,31 +37,34 @@ stdenv.mkDerivation rec {
   checkInputs = [ gtest ];
 
   # The build system uses custom logic - defined in
-  # xs/src/libnest2d/cmake_modules/FindNLopt.cmake in the package source -
-  # for finding the nlopt library, which doesn't pick up the package in the nix store.
-  # We need to set the path via the NLOPT environment variable instead.
+  # cmake/modules/FindNLopt.cmake in the package source - for finding the nlopt
+  # library, which doesn't pick up the package in the nix store.  We
+  # additionally need to set the path via the NLOPT environment variable.
   NLOPT = nlopt;
 
-  # Disable compiler warnings that clutter the build log
+  # Disable compiler warnings that clutter the build log.
   # It seems to be a known issue for Eigen:
   # http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1221
   NIX_CFLAGS_COMPILE = "-Wno-ignored-attributes";
 
+  # prusa-slicer uses dlopen on `libudev.so` at runtime
+  NIX_LDFLAGS = "-ludev";
+
   prePatch = ''
     # In nix ioctls.h isn't available from the standard kernel-headers package
     # like in other distributions. The copy in glibc seems to be identical to the
     # one in the kernel though, so we use that one instead.
     sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' src/libslic3r/GCodeSender.cpp
-  '' + lib.optionalString (lib.versionOlder "2.5" nloptVersion) ''
+
     # Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx
     # now seems to be integrated into the main lib.
-    sed -i 's|nlopt_cxx|nlopt|g' src/libnest2d/cmake_modules/FindNLopt.cmake
+    sed -i 's|nlopt_cxx|nlopt|g' cmake/modules/FindNLopt.cmake
   '';
 
   src = fetchFromGitHub {
     owner = "prusa3d";
     repo = "PrusaSlicer";
-    sha256 = "0i393nbc2salb4j5l2hvy03ng7hmf90d2xj653pw9bsikhj0r3jd";
+    sha256 = "0954k9sm09y8qnz1jyswyysg10k54ywz8mswnwa4n2hnpq9qx73m";
     rev = "version_${version}";
   };
 
@@ -88,6 +93,6 @@ stdenv.mkDerivation rec {
     description = "G-code generator for 3D printer";
     homepage = https://github.com/prusa3d/PrusaSlicer;
     license = licenses.agpl3;
-    maintainers = with maintainers; [ tweber ];
+    maintainers = with maintainers; [ moredread tweber ];
   };
 }

From 081ed8f0126178a0d2c624fd4bd946704db7fc6a Mon Sep 17 00:00:00 2001
From: Jan Solanti <jhs@psonet.com>
Date: Mon, 30 Mar 2020 04:05:52 +0300
Subject: [PATCH 4537/4636] xow: 0.2 -> 0.4

---
 nixos/modules/hardware/uinput.nix       |  2 +-
 nixos/modules/services/hardware/xow.nix | 19 +++----------------
 pkgs/misc/drivers/xow/default.nix       | 25 +++++++++++++------------
 3 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/nixos/modules/hardware/uinput.nix b/nixos/modules/hardware/uinput.nix
index 101c12fe257e..55e86bfa6bdb 100644
--- a/nixos/modules/hardware/uinput.nix
+++ b/nixos/modules/hardware/uinput.nix
@@ -4,7 +4,7 @@ let
   cfg = config.hardware.uinput;
 in {
   options.hardware.uinput = {
-    enable = lib.mkEnableOption "Whether to enable uinput support";
+    enable = lib.mkEnableOption "uinput support";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/nixos/modules/services/hardware/xow.nix b/nixos/modules/services/hardware/xow.nix
index a97dd5c870d7..a18d60ad83be 100644
--- a/nixos/modules/services/hardware/xow.nix
+++ b/nixos/modules/services/hardware/xow.nix
@@ -4,27 +4,14 @@ let
   cfg = config.services.hardware.xow;
 in {
   options.services.hardware.xow = {
-    enable = lib.mkEnableOption "Whether to enable xow or not.";
+    enable = lib.mkEnableOption "xow as a systemd service";
   };
 
   config = lib.mkIf cfg.enable {
     hardware.uinput.enable = true;
 
-    users.users.xow = {
-      group = "uinput";
-      isSystemUser = true;
-    };
+    systemd.packages = [ pkgs.xow ];
 
-    systemd.services.xow = {
-      wantedBy = [ "multi-user.target" ];
-      description = "Xbox One Wireless Dongle Driver";
-      after = [ "systemd-udev-settle.service" ];
-      serviceConfig = {
-        ExecStart = ''
-          ${pkgs.xow}/bin/xow
-        '';
-        User = "xow";
-      };
-    };
+    services.udev.packages = [ pkgs.xow ];
   };
 }
diff --git a/pkgs/misc/drivers/xow/default.nix b/pkgs/misc/drivers/xow/default.nix
index 5ca3f235fcce..d5afc96c3b4a 100644
--- a/pkgs/misc/drivers/xow/default.nix
+++ b/pkgs/misc/drivers/xow/default.nix
@@ -1,32 +1,33 @@
-{ stdenv, fetchFromGitHub, libusb, gitMinimal }:
+{ stdenv, fetchFromGitHub, libusb }:
 
 stdenv.mkDerivation rec {
   pname = "xow";
-  version = "0.2";
+  version = "0.4";
 
   src = fetchFromGitHub {
     owner = "medusalix";
     repo = "xow";
     rev = "v${version}";
-    sha256 = "03ajal91xi52svzy621aa4jcdf0vj4pqd52kljam0wryrlmcpbr3";
+    sha256 = "1xkwcx2gqip9v2h3zjmrn7sgcck3midl5alhsmr3zivgdipamynv";
   };
 
-  makeFlags = [ "BUILD=RELEASE" "VERSION=${version}" ];
+  makeFlags = [
+    "BUILD=RELEASE"
+    "VERSION=${version}"
+    "BINDIR=${placeholder ''out''}/bin"
+    "UDEVDIR=${placeholder ''out''}/lib/udev/rules.d"
+    "MODLDIR=${placeholder ''out''}/lib/modules-load.d"
+    "MODPDIR=${placeholder ''out''}/lib/modprobe.d"
+    "SYSDDIR=${placeholder ''out''}/lib/systemd/system"
+  ];
   enableParallelBuilding = true;
   buildInputs = [ libusb ];
 
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out/bin
-    cp xow $out/bin
-    runHook postInstall
-  '';
-
   meta = with stdenv.lib; {
     homepage = "https://github.com/medusalix/xow";
     description = "Linux driver for the Xbox One wireless dongle";
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.pmiddend ];
+    maintainers = [ maintainers.jansol ];
     platforms = platforms.linux;
   };
 }

From 375cb452328925214ddfda9ede89a5b4721abfef Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Tue, 31 Mar 2020 11:19:25 +0100
Subject: [PATCH 4538/4636] diffr: 0.1.2 -> 0.1.4

---
 pkgs/tools/text/diffr/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/text/diffr/default.nix b/pkgs/tools/text/diffr/default.nix
index 9ddaa3468ff3..7ce9c3163042 100644
--- a/pkgs/tools/text/diffr/default.nix
+++ b/pkgs/tools/text/diffr/default.nix
@@ -2,23 +2,23 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "diffr";
-  version = "v0.1.2";
-
-  # diffr's tests expect the diffr binary to be at `$CARGO_MANIFEST_DIR/target/debug/diffr`.
-  doCheck = false;
+  version = "v0.1.4";
 
   src = fetchFromGitHub {
     owner = "mookid";
     repo = pname;
     rev = version;
-    sha256 = "1fpcyl4kc4djfl6a2jlj56xqra42334vygz8n7614zgjpyxz3zx2";
+    sha256 = "18ks5g4bx6iz9hdjxmi6a41ncxpb1hnsscdlddp2gr40k3vgd0pa";
   };
 
-  cargoSha256 = "17xgjk8li29b8q8p2bi56klqg0v2q0j6ich438c4p06jrszccx1f";
+  cargoSha256 = "09yn02985yv40n9y0ipz0jmj7iqhz7l8hd3ry9ib3fyw9pyklnfa";
 
-  nativeBuildInputs = [];
   buildInputs = (stdenv.lib.optional stdenv.isDarwin Security);
 
+  preCheck = ''
+    export DIFFR_TESTS_BINARY_PATH=$releaseDir/diffr
+  '';
+
   meta = with stdenv.lib; {
     description = "Yet another diff highlighting tool";
     homepage = https://github.com/mookid/diffr;

From dd3da963182cea6056f26cf7bb3efd0655ac0f6f Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Tue, 31 Mar 2020 16:29:39 +0200
Subject: [PATCH 4539/4636] nixos/magic-wormhole-mailbox-server: moving from
 mail to networking

---
 nixos/modules/module-list.nix                                   | 2 +-
 .../{mail => networking}/magic-wormhole-mailbox-server.nix      | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename nixos/modules/services/{mail => networking}/magic-wormhole-mailbox-server.nix (100%)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index dafece285b64..697e9a6c8761 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -394,7 +394,6 @@
   ./services/mail/mailcatcher.nix
   ./services/mail/mailhog.nix
   ./services/mail/mailman.nix
-  ./services/mail/magic-wormhole-mailbox-server.nix
   ./services/mail/mlmmj.nix
   ./services/mail/offlineimap.nix
   ./services/mail/opendkim.nix
@@ -643,6 +642,7 @@
   ./services/networking/lldpd.nix
   ./services/networking/logmein-hamachi.nix
   ./services/networking/mailpile.nix
+  ./services/networking/magic-wormhole-mailbox-server.nix
   ./services/networking/matterbridge.nix
   ./services/networking/mjpg-streamer.nix
   ./services/networking/minidlna.nix
diff --git a/nixos/modules/services/mail/magic-wormhole-mailbox-server.nix b/nixos/modules/services/networking/magic-wormhole-mailbox-server.nix
similarity index 100%
rename from nixos/modules/services/mail/magic-wormhole-mailbox-server.nix
rename to nixos/modules/services/networking/magic-wormhole-mailbox-server.nix

From a90b82dfe9e89e579473591454f0f1c28b264bd5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2020 07:04:15 +0000
Subject: [PATCH 4540/4636] alibuild: 1.5.4rc3 -> 1.5.5

---
 pkgs/development/tools/build-managers/alibuild/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/alibuild/default.nix b/pkgs/development/tools/build-managers/alibuild/default.nix
index c50e57160639..ad9813cde6fb 100644
--- a/pkgs/development/tools/build-managers/alibuild/default.nix
+++ b/pkgs/development/tools/build-managers/alibuild/default.nix
@@ -2,11 +2,11 @@
 
 python.pkgs.buildPythonApplication rec {
   pname = "alibuild";
-  version = "1.5.4rc3";
+  version = "1.5.5";
 
   src = python.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "1mnh0h9m96p78b9ln1gbl4lw1mgl16qbyfi9fj2l13p3nxaq1sib";
+    sha256 = "1sh02avpab4qlyin3p928xw91l4fgs8x5x2rzl623ayqsnfjv19j";
   };
 
   doCheck = false;

From db397cd2ffd82831ee751ae48a61f36758587815 Mon Sep 17 00:00:00 2001
From: Andy Tockman <andy@tck.mn>
Date: Mon, 9 Mar 2020 15:46:33 -0400
Subject: [PATCH 4541/4636] ipbt: init at 20190601.d1519e0

---
 pkgs/tools/misc/ipbt/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/tools/misc/ipbt/default.nix

diff --git a/pkgs/tools/misc/ipbt/default.nix b/pkgs/tools/misc/ipbt/default.nix
new file mode 100644
index 000000000000..e523dd198d42
--- /dev/null
+++ b/pkgs/tools/misc/ipbt/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, perl, ncurses }:
+
+stdenv.mkDerivation rec {
+  version = "20190601.d1519e0";
+  pname = "ipbt";
+
+  src = fetchurl {
+    url = "https://www.chiark.greenend.org.uk/~sgtatham/ipbt/ipbt-${version}.tar.gz";
+    sha256 = "1aj8pajdd81vq2qw6vzfm27i0aj8vfz9m7k3sda30pnsrizm06d5";
+  };
+
+  nativeBuildInputs = [ perl ];
+  buildInputs = [ ncurses ];
+
+  meta = with stdenv.lib; {
+    description = "A high-tech ttyrec player for Unix";
+    homepage = "https://www.chiark.greenend.org.uk/~sgtatham/ipbt/";
+    license = licenses.mit;
+    maintainers = [ maintainers.tckmn ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 340408715117..75f027369e04 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7012,6 +7012,8 @@ in
 
   ttylog = callPackage ../tools/misc/ttylog { };
 
+  ipbt = callPackage ../tools/misc/ipbt { };
+
   tuir = callPackage ../applications/misc/tuir { };
 
   turses = callPackage ../applications/networking/instant-messengers/turses { };

From 5a34c9946f5eecaa6131c049fd601dc368cc0031 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2020 04:47:15 +0000
Subject: [PATCH 4542/4636] lit: 0.8.0 -> 0.9.0

---
 pkgs/development/tools/misc/lit/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix
index c4164b414331..1044dd00d7f8 100644
--- a/pkgs/development/tools/misc/lit/default.nix
+++ b/pkgs/development/tools/misc/lit/default.nix
@@ -2,11 +2,11 @@
 
 python2.pkgs.buildPythonApplication rec {
   pname = "lit";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = python2.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "0lwx1w1vk3a0pc237chwycl8qc6lwq8bzf13036wnmk74m9kwi7c";
+    sha256 = "0vkqv0ijjkfg70j26cxqz75bpn2p78all5j5cw2gfcrn4c5aldf0";
   };
 
   # Non-standard test suite. Needs custom checkPhase.
@@ -14,7 +14,7 @@ python2.pkgs.buildPythonApplication rec {
 
   meta = {
     description = "Portable tool for executing LLVM and Clang style test suites";
-    homepage = http://llvm.org/docs/CommandGuide/lit.html;
+    homepage = "http://llvm.org/docs/CommandGuide/lit.html";
     license = lib.licenses.ncsa;
     maintainers = with lib.maintainers; [ dtzWill ];
   };

From 239343c6c3888e5ff1b2af58edd6f95202660cf9 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 31 Mar 2020 09:41:19 -0700
Subject: [PATCH 4543/4636] lit: use python3

---
 pkgs/development/tools/misc/lit/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix
index 1044dd00d7f8..63fce70a3830 100644
--- a/pkgs/development/tools/misc/lit/default.nix
+++ b/pkgs/development/tools/misc/lit/default.nix
@@ -1,10 +1,10 @@
-{ lib, python2 }:
+{ lib, python3 }:
 
-python2.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "lit";
   version = "0.9.0";
 
-  src = python2.pkgs.fetchPypi {
+  src = python3.pkgs.fetchPypi {
     inherit pname version;
     sha256 = "0vkqv0ijjkfg70j26cxqz75bpn2p78all5j5cw2gfcrn4c5aldf0";
   };

From 10993853d4ed377e5e2392998a7dd3c345f9e9f0 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 31 Mar 2020 10:34:04 -0700
Subject: [PATCH 4544/4636] lit: passthru python interpreter

---
 pkgs/development/tools/misc/lit/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix
index 63fce70a3830..1e511cc0f0b0 100644
--- a/pkgs/development/tools/misc/lit/default.nix
+++ b/pkgs/development/tools/misc/lit/default.nix
@@ -9,6 +9,10 @@ python3.pkgs.buildPythonApplication rec {
     sha256 = "0vkqv0ijjkfg70j26cxqz75bpn2p78all5j5cw2gfcrn4c5aldf0";
   };
 
+  passthru = {
+    python = python3;
+  };
+
   # Non-standard test suite. Needs custom checkPhase.
   doCheck = false;
 

From 0f9e2ba04d345039cec361c9c6a5f8a3942dfc3b Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 31 Mar 2020 10:34:24 -0700
Subject: [PATCH 4545/4636] ldc: inherit python interpreter from lit

---
 pkgs/development/compilers/ldc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix
index c397d02038da..7ed716bf866f 100644
--- a/pkgs/development/compilers/ldc/default.nix
+++ b/pkgs/development/compilers/ldc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata
-, python, libconfig, lit, gdb, unzip, darwin, bash
+, libconfig, lit, gdb, unzip, darwin, bash
 , callPackage, makeWrapper, runCommand, targetPackages
 , bootstrapVersion ? false
 , version ? "1.17.0"
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ninja makeWrapper unzip ]
     ++ stdenv.lib.optionals (!bootstrapVersion) [
-      bootstrapLdc python lit
+      bootstrapLdc lit lit.python
     ]
     ++ stdenv.lib.optional (!bootstrapVersion && stdenv.hostPlatform.isDarwin)
       # https://github.com/NixOS/nixpkgs/issues/57120

From e45f16b9f54522815e4142aa324174a0812d4648 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 31 Mar 2020 15:03:26 -0400
Subject: [PATCH 4546/4636] stdenv/linux: remove powerpc64le bootstrap tools
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These files never existed, so best to not leave the reference. If
someone want to step up to maintain this, that would be fine. I don’t
have the hardware to test these out. In addition, someone tried to use
the bootstrap-tools currently built by Hydra and found that they were
broken in some unclear way.
---
 pkgs/stdenv/linux/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 60c0730dce1f..6c396b277469 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -16,13 +16,11 @@
       armv7l-linux = import ./bootstrap-files/armv7l.nix;
       aarch64-linux = import ./bootstrap-files/aarch64.nix;
       mipsel-linux = import ./bootstrap-files/loongson2f.nix;
-      powerpc64le-linux = import ./bootstrap-files/ppc64le.nix;
     };
     musl = {
       aarch64-linux = import ./bootstrap-files/aarch64-musl.nix;
       armv6l-linux  = import ./bootstrap-files/armv6l-musl.nix;
       x86_64-linux  = import ./bootstrap-files/x86_64-musl.nix;
-      powerpc64le-linux = import ./bootstrap-files/ppc64le-musl.nix;
     };
   };
 

From 40fb6dea508cc4436285f75e5ae41a97a6eac9e4 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 31 Mar 2020 18:59:21 +0200
Subject: [PATCH 4547/4636] nano: 4.9 -> 4.9.1

See https://lists.gnu.org/archive/html/info-gnu/2020-03/msg00015.html
for release information
---
 pkgs/applications/editors/nano/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 3350f6a3db3e..e3c315275dd5 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -20,11 +20,11 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "nano";
-  version = "4.9";
+  version = "4.9.1";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${pname}-${version}.tar.xz";
-    sha256 = "19ik88b3g0d9xwav4hkai2h1acmjy5fdnh21gdc1mjq5s4lrff8f";
+    sha256 = "0v5s58j3lbg5s6gapl9kjmzph7zgwaam53qspycy2sxaxw65mkaj";
   };
 
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;

From eb8449935594a0e8a0a224cdd2c44ba1c3e7f3a2 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 31 Mar 2020 15:07:57 -0400
Subject: [PATCH 4548/4636] retroarch/cores.nix: use correct platform for
 darwin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This should fix the regression found in
https://hydra.nixos.org/eval/1577308#tabs-now-fail. The libretro
scripts use “osx” as the identifier for macOS, and “unix” seems to
mean linux.

If anyone could help out by confirming this works. I don’t currently
have access to a macOS machine.
---
 pkgs/misc/emulators/retroarch/cores.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index b1d01e12b626..3b935bb2b447 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -22,7 +22,7 @@ let
     makeFlags = [
       "platform=${{
         linux = "unix";
-        darwin = "unix";
+        darwin = "osx";
         windows = "win";
       }.${stdenv.hostPlatform.parsed.kernel.name} or stdenv.hostPlatform.parsed.kernel.name}"
       "ARCH=${{

From a8811cb82bab25aa835a09dc48a2d9450448d6d5 Mon Sep 17 00:00:00 2001
From: gtgteq <gtgteq.operator@gmail.com>
Date: Tue, 31 Mar 2020 15:35:45 +0900
Subject: [PATCH 4549/4636] sssd: Port to samba-4.12

---
 pkgs/os-specific/linux/sssd/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix
index 3dbdb99549a1..886d5e277184 100644
--- a/pkgs/os-specific/linux/sssd/default.nix
+++ b/pkgs/os-specific/linux/sssd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glibc, augeas, dnsutils, c-ares, curl,
+{ stdenv, fetchurl, fetchpatch, glibc, augeas, dnsutils, c-ares, curl,
   cyrus_sasl, ding-libs, libnl, libunistring, nss, samba, nfs-utils, doxygen,
   python, python3, pam, popt, talloc, tdb, tevent, pkgconfig, ldb, openldap,
   pcre, kerberos, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2,
@@ -18,6 +18,13 @@ stdenv.mkDerivation rec {
     url = "https://fedorahosted.org/released/sssd/${pname}-${version}.tar.gz";
     sha256 = "0ngr7cgimyjc6flqkm7psxagp1m4jlzpqkn28pliifbmdg6i5ckb";
   };
+  patches = [
+    # Fix build failure against samba 4.12.0rc1
+    (fetchpatch {
+      url = "https://github.com/SSSD/sssd/commit/bc56b10aea999284458dcc293b54cf65288e325d.patch";
+      sha256 = "0q74sx5n41srq3kdn55l5j1sq4xrjsnl5y4v8yh5mwsijj74yh4g";
+    })
+  ];
 
   # Something is looking for <libxml/foo.h> instead of <libxml2/libxml/foo.h>
   NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2";

From abe5f7070a50f99a6338f11397cf29d9611d7490 Mon Sep 17 00:00:00 2001
From: Leo Colisson <leo.colisson@gmail.com>
Date: Sat, 7 Mar 2020 13:50:42 +0000
Subject: [PATCH 4550/4636] python37Packages.picos: 1.2.0 -> 2.0

---
 pkgs/development/python-modules/picos/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/picos/default.nix b/pkgs/development/python-modules/picos/default.nix
index 57fbe099071d..ca6346d1cd24 100644
--- a/pkgs/development/python-modules/picos/default.nix
+++ b/pkgs/development/python-modules/picos/default.nix
@@ -4,19 +4,25 @@
 , numpy
 , cvxopt
 , python
+, networkx
 }:
 
 buildPythonPackage rec {
   pname = "picos";
-  version = "1.2.0";
+  version = "2.0";
 
   src = fetchFromGitLab {
     owner = "picos-api";
     repo = "picos";
     rev = "v${version}";
-    sha256 = "018xhc7cb2crkk27lhl63c7h77w5wa37fg41i7nqr4xclr43cs9z";
+    sha256 = "1k65iq791k5r08gh2kc6iz0xw1wyzqik19j6iam8ip732r7jm607";
   };
 
+  # Needed only for the tests
+  checkInputs = [
+    networkx
+  ];
+  
   propagatedBuildInputs = [
     numpy
     cvxopt
@@ -28,9 +34,8 @@ buildPythonPackage rec {
   
   meta = with lib; {
     description = "A Python interface to conic optimization solvers";
-    homepage = https://gitlab.com/picos-api/picos;
+    homepage = "https://gitlab.com/picos-api/picos";
     license = licenses.gpl3;
     maintainers = with maintainers; [ tobiasBora ];
   };
 }
-

From 24519c87e8c79354f1c0ce8f9e2291451ea47f6e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 31 Mar 2020 22:04:31 +0200
Subject: [PATCH 4551/4636] kdeApplications: 19.12.1 -> 19.12.3

---
 pkgs/applications/kde/fetch.sh |    2 +-
 pkgs/applications/kde/srcs.nix | 1728 ++++++++++++++++----------------
 2 files changed, 865 insertions(+), 865 deletions(-)

diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index 424c759b56c3..3f6dc9ef1810 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/release-service/19.12.1/src )
+WGET_ARGS=( http://download.kde.org/stable/release-service/19.12.3/src )
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 60cf49fa05e1..dc6eb0f09e8c 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -4,1731 +4,1731 @@
 
 {
   akonadi = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/akonadi-19.12.1.tar.xz";
-      sha256 = "991680be1b57a5335690341ab2a681fc7d8e77a4951673021f0662f3005856a3";
-      name = "akonadi-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/akonadi-19.12.3.tar.xz";
+      sha256 = "e41714d81ecbb629aaa0b267e0c32a4b1d83c6a45cf3f37d52232003b4c0f325";
+      name = "akonadi-19.12.3.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/akonadi-calendar-19.12.1.tar.xz";
-      sha256 = "4bec3252bd1a32874a22b28dcb82a2aed533b31e1955ca68803ddf076dbbd5be";
-      name = "akonadi-calendar-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/akonadi-calendar-19.12.3.tar.xz";
+      sha256 = "c58d18153ef711a79962ba907e44338a0ddd62968e0a6c50486bba09a6e2a446";
+      name = "akonadi-calendar-19.12.3.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/akonadi-calendar-tools-19.12.1.tar.xz";
-      sha256 = "0650e12b2155b08cf70cc4620f9ea3868bad66affc4668775cd050539eacbec9";
-      name = "akonadi-calendar-tools-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/akonadi-calendar-tools-19.12.3.tar.xz";
+      sha256 = "ad2c23cf188228dc697d39e2120b56ce445bbea3eb46721794cd6344aa7e94ba";
+      name = "akonadi-calendar-tools-19.12.3.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/akonadiconsole-19.12.1.tar.xz";
-      sha256 = "e6a755875b9ef9db4f022888b77bd011a5edf2c21667074b971d15818659dd5b";
-      name = "akonadiconsole-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/akonadiconsole-19.12.3.tar.xz";
+      sha256 = "0dedcccfcfd7e6ad9a5af0aa61ce05f26cbb625d8bf6b6d210ac6e3c5813487f";
+      name = "akonadiconsole-19.12.3.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/akonadi-contacts-19.12.1.tar.xz";
-      sha256 = "0fbca91b3251d57291629e441ecf5cdd9b71a56f74f05f6c55a428402d3b4c91";
-      name = "akonadi-contacts-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/akonadi-contacts-19.12.3.tar.xz";
+      sha256 = "b0baed9edb8c05b6d9b8db84239cd83a334d8f1d14d4aa8027dc1139a543eadf";
+      name = "akonadi-contacts-19.12.3.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/akonadi-import-wizard-19.12.1.tar.xz";
-      sha256 = "a58d29407eebd9ce895d38b121cb034f92c81b85afd1b8da9c70cc3d7dc29b3d";
-      name = "akonadi-import-wizard-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/akonadi-import-wizard-19.12.3.tar.xz";
+      sha256 = "2c1491e4f5994ed0d317a27cc717184a86f7d92c4b44f8bd056e147e80bee8c5";
+      name = "akonadi-import-wizard-19.12.3.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/akonadi-mime-19.12.1.tar.xz";
-      sha256 = "9ca3794a36e31a5dd759b741e91420f4910f05b0d726f6e803d365b8ab058f5b";
-      name = "akonadi-mime-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/akonadi-mime-19.12.3.tar.xz";
+      sha256 = "13bdf9a233a183d5aeee1be0991617fca6d73ffd35bc14ca0d18714149f04392";
+      name = "akonadi-mime-19.12.3.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/akonadi-notes-19.12.1.tar.xz";
-      sha256 = "cf8059cb14eca880c09fc83285576b4d03a8edf0799cebdf42d59084bb6904ca";
-      name = "akonadi-notes-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/akonadi-notes-19.12.3.tar.xz";
+      sha256 = "a34c2420190925b985b0629d7d2d19be04443cfeeaf284229666338e039e56e2";
+      name = "akonadi-notes-19.12.3.tar.xz";
     };
   };
   akonadi-search = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/akonadi-search-19.12.1.tar.xz";
-      sha256 = "78a0feaa41d4b474a2e90c74230bc5196349e1c4e72ad46fe341a1cb6e51a5b8";
-      name = "akonadi-search-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/akonadi-search-19.12.3.tar.xz";
+      sha256 = "60072a36f6c817d009a8476bad2e80c4131b14358e03b4889a03aa42340ed041";
+      name = "akonadi-search-19.12.3.tar.xz";
     };
   };
   akregator = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/akregator-19.12.1.tar.xz";
-      sha256 = "e6f00777059e5b9fe2458a7e4248a59652f08d836518bf0395aaf2ed77ef4d52";
-      name = "akregator-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/akregator-19.12.3.tar.xz";
+      sha256 = "63db0f6c75bffe9235122201445d151f4eaa7061d2a8df4eb924bca1a4600f68";
+      name = "akregator-19.12.3.tar.xz";
     };
   };
   analitza = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/analitza-19.12.1.tar.xz";
-      sha256 = "0c6c4ee1b4546ab84eb9503220ca0aa09f80cdd7cea3b89201db1d5aac2c4ce5";
-      name = "analitza-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/analitza-19.12.3.tar.xz";
+      sha256 = "47ca3acaf2d2f52e91cd2253742ab97d9b07abc3fef0d632bfc36d253dbf161b";
+      name = "analitza-19.12.3.tar.xz";
     };
   };
   ark = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/ark-19.12.1.tar.xz";
-      sha256 = "37b9dfc0b6005ebd0f2757ecce940568839e8a5d73b3bcbc1931ce4eccbb9d0c";
-      name = "ark-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/ark-19.12.3.tar.xz";
+      sha256 = "78594029729c197fc90321850696f1bd189b40d8d7fbc9faf51ad6b2ab744a07";
+      name = "ark-19.12.3.tar.xz";
     };
   };
   artikulate = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/artikulate-19.12.1.tar.xz";
-      sha256 = "407f72193c7c4ec3f8ac7fa93889803f2ec6523aebb59bdf9a9210e9fac0ee7d";
-      name = "artikulate-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/artikulate-19.12.3.tar.xz";
+      sha256 = "c27a5cb98a8e2975638fe74683a73f92c160ce133b133878844062dd99ffded6";
+      name = "artikulate-19.12.3.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/audiocd-kio-19.12.1.tar.xz";
-      sha256 = "3b4433bbbdd56bbafcf0418eaebb655b8fd4e03a4c29489112394393f3dc3815";
-      name = "audiocd-kio-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/audiocd-kio-19.12.3.tar.xz";
+      sha256 = "b920170ae816f29a61a6f6b25df68c9125a5d4d9fec225feee45e46317d64d42";
+      name = "audiocd-kio-19.12.3.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/baloo-widgets-19.12.1.tar.xz";
-      sha256 = "a9fb3a136267bb0089192f7bc523903bd304e528160d9f653ccd052b4a8c110c";
-      name = "baloo-widgets-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/baloo-widgets-19.12.3.tar.xz";
+      sha256 = "236c0bb0bcb345f4ce5f07d591bded6221383bc7b190b42b96999893390cd8a5";
+      name = "baloo-widgets-19.12.3.tar.xz";
     };
   };
   blinken = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/blinken-19.12.1.tar.xz";
-      sha256 = "4a1f7c782dc236d963bc1de11b7dcbc79012d47e3e6cc5ce692ca91ecb788388";
-      name = "blinken-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/blinken-19.12.3.tar.xz";
+      sha256 = "06ef385ab73d99fa3f1925a6f2ef522f691d04cd594777f5d9fa52a5f2e45a94";
+      name = "blinken-19.12.3.tar.xz";
     };
   };
   bomber = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/bomber-19.12.1.tar.xz";
-      sha256 = "f0007dae42d6586ab6c9da5775c835fb515cbf180698a1453a90efd2ba8f2795";
-      name = "bomber-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/bomber-19.12.3.tar.xz";
+      sha256 = "ea4926fe08c62ac5da28c3bb480a6986e51f7a77e3245d1dc1603c38617da4b0";
+      name = "bomber-19.12.3.tar.xz";
     };
   };
   bovo = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/bovo-19.12.1.tar.xz";
-      sha256 = "54cee2f71e9736057187c8121313b9c73f6cadd0fa463ea2a29cf0e86969d5ae";
-      name = "bovo-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/bovo-19.12.3.tar.xz";
+      sha256 = "ac67aff75c1e8e0d1a1a8142ae94431e4f39565f411287f57c2778f8820316af";
+      name = "bovo-19.12.3.tar.xz";
     };
   };
   calendarsupport = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/calendarsupport-19.12.1.tar.xz";
-      sha256 = "6f5e3282ff385044061320b7ccb4bef80a1848fa890afcbd12e16bd2524a4189";
-      name = "calendarsupport-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/calendarsupport-19.12.3.tar.xz";
+      sha256 = "ecbd194b5aa39284d33f7f2ddca75175f8699efee1bfbd5000ea10076567bae8";
+      name = "calendarsupport-19.12.3.tar.xz";
     };
   };
   cantor = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/cantor-19.12.1.tar.xz";
-      sha256 = "509ebe0bc173124d28e29483effa07985eef24cdd989e5e4e1fc233632cdf568";
-      name = "cantor-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/cantor-19.12.3.tar.xz";
+      sha256 = "8347160f18993f53c857ec0d418dfebbc533878ad9f480047646d121e4e644cb";
+      name = "cantor-19.12.3.tar.xz";
     };
   };
   cervisia = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/cervisia-19.12.1.tar.xz";
-      sha256 = "2a7d32ac0c1460c135397cedec177db8eb99117b53ec2c9652763b0e90184188";
-      name = "cervisia-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/cervisia-19.12.3.tar.xz";
+      sha256 = "733a90f521cd79157f6d02eeb28376bc703239800473e8cf366611dd4f3342a6";
+      name = "cervisia-19.12.3.tar.xz";
     };
   };
   dolphin = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/dolphin-19.12.1.tar.xz";
-      sha256 = "492b4ca71e33373c7000aad5c7daf6e04d7ad537e1fde8a73d2c3db15858e8c8";
-      name = "dolphin-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/dolphin-19.12.3.tar.xz";
+      sha256 = "ba16f4d5be5ccc3c135a913f2e3c7dd3b7a492cfc9ec9ae518f714fcd7c2ab47";
+      name = "dolphin-19.12.3.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/dolphin-plugins-19.12.1.tar.xz";
-      sha256 = "9392571a7004c08aac02dcc6453f58b6d0de4716b7cd61776f78d9b1783c60e0";
-      name = "dolphin-plugins-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/dolphin-plugins-19.12.3.tar.xz";
+      sha256 = "7dbd5c0fe4281c46df789f86f468c4ea32949285055cae4652bab3de59acdfd3";
+      name = "dolphin-plugins-19.12.3.tar.xz";
     };
   };
   dragon = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/dragon-19.12.1.tar.xz";
-      sha256 = "a804ae2089c0e96700e91d90ba2100d9a42a81a128a3fdbb037ed94c31f380cd";
-      name = "dragon-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/dragon-19.12.3.tar.xz";
+      sha256 = "c5b09b2bd37f4e86f8412d3b950331d330257ba53278b1a569f36bf3fbf560ee";
+      name = "dragon-19.12.3.tar.xz";
     };
   };
   elisa = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/elisa-19.12.1.tar.xz";
-      sha256 = "4929da2ebe68a3dc0d22a809a7b2a84493aa6f072e16515bd557ddaac51fd8fa";
-      name = "elisa-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/elisa-19.12.3.tar.xz";
+      sha256 = "28ad795c1d993969d49ab71514129589a71ee6fe8a2de785e22f17f5af7c3d32";
+      name = "elisa-19.12.3.tar.xz";
     };
   };
   eventviews = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/eventviews-19.12.1.tar.xz";
-      sha256 = "5eb73fb2c541a6b073ad231a28abe6affc0cad92f5fd4d36a4b58aba8a46193c";
-      name = "eventviews-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/eventviews-19.12.3.tar.xz";
+      sha256 = "e2ac6a77c6bdee008229a2b03262ac5602e0cabfd325a92df58be63aaa7db662";
+      name = "eventviews-19.12.3.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/ffmpegthumbs-19.12.1.tar.xz";
-      sha256 = "5f7853788c07d409bc2dd2fd7c9afab4cd847f3d2dc6db4dc30cfd78e762bdbd";
-      name = "ffmpegthumbs-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/ffmpegthumbs-19.12.3.tar.xz";
+      sha256 = "cc4a1c3b4768dc674d210294a9957d622448cbe9cdaf713c1cb40bff3a79260e";
+      name = "ffmpegthumbs-19.12.3.tar.xz";
     };
   };
   filelight = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/filelight-19.12.1.tar.xz";
-      sha256 = "29806a4149b3fb60f81372d56c184d0e2f861816639a0a21b85cd7af314f860b";
-      name = "filelight-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/filelight-19.12.3.tar.xz";
+      sha256 = "9ea78509f932cd2bd553d934e2af75c25d0b65d85d2b0ab4a007ac5929b2d3b5";
+      name = "filelight-19.12.3.tar.xz";
     };
   };
   granatier = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/granatier-19.12.1.tar.xz";
-      sha256 = "98051d292dd5a3ba3f873e8bc2bed6cdae291c9516b9cb21a64703b3135baa7f";
-      name = "granatier-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/granatier-19.12.3.tar.xz";
+      sha256 = "aa2e410e4eeae74f3902028069955017a31a922dff98b81850f20743f7b54c95";
+      name = "granatier-19.12.3.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/grantlee-editor-19.12.1.tar.xz";
-      sha256 = "63a2571369aff6cc648b064bcbc32227eede19475cad8937cfc454984423ea0c";
-      name = "grantlee-editor-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/grantlee-editor-19.12.3.tar.xz";
+      sha256 = "5df3e5ce7933290f9f6423bdbcb0ff5614a1a4b6fda250a37bd3ed57647f8a3c";
+      name = "grantlee-editor-19.12.3.tar.xz";
     };
   };
   grantleetheme = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/grantleetheme-19.12.1.tar.xz";
-      sha256 = "f23aaf86ff8c630a2f3498b3eebcd6533b01ee806dcf4130df7dd55e3b890ddd";
-      name = "grantleetheme-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/grantleetheme-19.12.3.tar.xz";
+      sha256 = "cc0ce448c9d8396dcadea2a43089feca8e1074572df42752f70dd176676f29f9";
+      name = "grantleetheme-19.12.3.tar.xz";
     };
   };
   gwenview = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/gwenview-19.12.1.tar.xz";
-      sha256 = "ed36590a0193fbe22f08c1a026e58f86a3067f516b3a894f29b72aa229967c84";
-      name = "gwenview-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/gwenview-19.12.3.tar.xz";
+      sha256 = "b453cd55b7409bf8e4446a1b714dc66e73a0376d2da65b184b82f786767164e7";
+      name = "gwenview-19.12.3.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/incidenceeditor-19.12.1.tar.xz";
-      sha256 = "1f1345db2e518bfe9405df5fa441ece3af1093cbc75066673d252a0760262484";
-      name = "incidenceeditor-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/incidenceeditor-19.12.3.tar.xz";
+      sha256 = "c608a95f6d09433b378f5df0243eff77be3738fb56f99ab439774f2cad5908a6";
+      name = "incidenceeditor-19.12.3.tar.xz";
     };
   };
   juk = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/juk-19.12.1.tar.xz";
-      sha256 = "de1d9f3581f791ea050700b467dce4b38d9ec2dc20884b495826e479d3245edf";
-      name = "juk-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/juk-19.12.3.tar.xz";
+      sha256 = "4bc4210d223afc23cb6edc9262eceee038ecc6243a550698e676230168943611";
+      name = "juk-19.12.3.tar.xz";
     };
   };
   k3b = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/k3b-19.12.1.tar.xz";
-      sha256 = "59def9d9c9e14de52a14d58a22c15173d98086d9a156a3a463b9607dc7be602d";
-      name = "k3b-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/k3b-19.12.3.tar.xz";
+      sha256 = "832c314d528ed21971d9d9d26c1c4d6c61323c9b3b01787d710541e3651575a5";
+      name = "k3b-19.12.3.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kaccounts-integration-19.12.1.tar.xz";
-      sha256 = "0dda504f51b86207180aceb00d86d42cb16c7ebe81c60ca1ed6bf8fa20699127";
-      name = "kaccounts-integration-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kaccounts-integration-19.12.3.tar.xz";
+      sha256 = "452b95113de5fb0d19a13ef75e229ee07b0e92cc1e7a17e9a2dc7879121d9d33";
+      name = "kaccounts-integration-19.12.3.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kaccounts-providers-19.12.1.tar.xz";
-      sha256 = "abcd1fa9f63248f3ce7f9c98d940b124ff5c70c1a3381a6cfad6ce7012b23c69";
-      name = "kaccounts-providers-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kaccounts-providers-19.12.3.tar.xz";
+      sha256 = "8774e9a8113e4aba593afeff655e38f6259c78e7dbaf1d95ea00235be880f3dd";
+      name = "kaccounts-providers-19.12.3.tar.xz";
     };
   };
   kaddressbook = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kaddressbook-19.12.1.tar.xz";
-      sha256 = "32e19973015151ac32fe7ae1f0a17e82e2834ce69ba052f31e8d197930f0be5c";
-      name = "kaddressbook-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kaddressbook-19.12.3.tar.xz";
+      sha256 = "1dede421e6fef2b1abc7d36dd1855cef43cc82de909a432cd38cff42d4168fba";
+      name = "kaddressbook-19.12.3.tar.xz";
     };
   };
   kajongg = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kajongg-19.12.1.tar.xz";
-      sha256 = "2f0944ea23cefb07187e0c176ae0a12cbba1b591aefeab9be9a59d5cab9e7a59";
-      name = "kajongg-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kajongg-19.12.3.tar.xz";
+      sha256 = "23e2b1be670b48bdd027e4e7a57e86a94b322afe6d37d8492c3d17689decfae5";
+      name = "kajongg-19.12.3.tar.xz";
     };
   };
   kalarm = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kalarm-19.12.1.tar.xz";
-      sha256 = "06a8d9544d1107ac3f2e8c4c2e9604055706dcb6b7f3b0267f0d4cb45f1caf35";
-      name = "kalarm-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kalarm-19.12.3.tar.xz";
+      sha256 = "526ab8884752c15622233db8b72e88d0c22a7a1bd265763d850b6e18e32de417";
+      name = "kalarm-19.12.3.tar.xz";
     };
   };
   kalarmcal = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kalarmcal-19.12.1.tar.xz";
-      sha256 = "18644d5cbc61b414675de66dd25d9a1dd30b0e93851f6223292f052d30a365e6";
-      name = "kalarmcal-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kalarmcal-19.12.3.tar.xz";
+      sha256 = "0ec5188f1164d91de702639ab2f85a713889feef48fc02dfe7385c945d06aa60";
+      name = "kalarmcal-19.12.3.tar.xz";
     };
   };
   kalgebra = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kalgebra-19.12.1.tar.xz";
-      sha256 = "49d623186800eb8f6fbb91eb43fb14dff78e112624c9cda6b331d494d610b16a";
-      name = "kalgebra-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kalgebra-19.12.3.tar.xz";
+      sha256 = "ac865dded31b61c438ddb9db721543b8facba79c9b39365750b4bebfe2645640";
+      name = "kalgebra-19.12.3.tar.xz";
     };
   };
   kalzium = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kalzium-19.12.1.tar.xz";
-      sha256 = "f50cc18d94ce9a1aaedcbee3a5dccc2cc6723ac8ec151a0ae0ff60009a7c6943";
-      name = "kalzium-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kalzium-19.12.3.tar.xz";
+      sha256 = "e44f359d1343c30cf1993a3970a3e610d0d5782f92a6b331b035cf4fef104195";
+      name = "kalzium-19.12.3.tar.xz";
     };
   };
   kamera = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kamera-19.12.1.tar.xz";
-      sha256 = "831d7b3d7ffdc73b03116b564fb1a23c651d468cae97c1c31791f6df1a8890ac";
-      name = "kamera-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kamera-19.12.3.tar.xz";
+      sha256 = "22e19527bf9748cdc298be4c3fa2cb0a3b8b337da3a3a804c9d6066d7f3e1110";
+      name = "kamera-19.12.3.tar.xz";
     };
   };
   kamoso = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kamoso-19.12.1.tar.xz";
-      sha256 = "c1776bf7f8eafd9f4c501aabc0df30035a0f1d40951e525312aa257e67cf74a7";
-      name = "kamoso-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kamoso-19.12.3.tar.xz";
+      sha256 = "9ae14c4c80cdbbf2ce2e92db5e9c814fbd685e81aa5c319aac5477649fc39fe4";
+      name = "kamoso-19.12.3.tar.xz";
     };
   };
   kanagram = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kanagram-19.12.1.tar.xz";
-      sha256 = "2127eada150ee3f023948b637890aa93d602874fd6c037c4bd031886a12a2fdc";
-      name = "kanagram-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kanagram-19.12.3.tar.xz";
+      sha256 = "441cae90d3b70dbef40bebbcf1325fa06e0df174a3f961b4b117a5fa1b40d6e3";
+      name = "kanagram-19.12.3.tar.xz";
     };
   };
   kapman = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kapman-19.12.1.tar.xz";
-      sha256 = "cd5bef40c51bc6ef635adab501acd2a40c2291c989c4ba3ef6e34a1cbebe4c49";
-      name = "kapman-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kapman-19.12.3.tar.xz";
+      sha256 = "3c81e3395ce2b2ea0937b09c0836cb58b8a941c2b7e2a27bd9741b2a9be1c1dd";
+      name = "kapman-19.12.3.tar.xz";
     };
   };
   kapptemplate = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kapptemplate-19.12.1.tar.xz";
-      sha256 = "b2fc583125aae1968c0342063a6cfcea2dbeff21e0ef505a021b689ed3a34085";
-      name = "kapptemplate-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kapptemplate-19.12.3.tar.xz";
+      sha256 = "5bef4e4fb74da3102cba6672584195962514ee3f53fb369b48d492d6ce7255ad";
+      name = "kapptemplate-19.12.3.tar.xz";
     };
   };
   kate = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kate-19.12.1.tar.xz";
-      sha256 = "9d2401907e5b163d5af0af5b4d28383896ef709bcde7f6ee2234e1a3adc28a47";
-      name = "kate-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kate-19.12.3.tar.xz";
+      sha256 = "f60b52e5a6a78920ac703a458f1eaf0ced02ffcd8b5f2d49de9a48674eeb007c";
+      name = "kate-19.12.3.tar.xz";
     };
   };
   katomic = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/katomic-19.12.1.tar.xz";
-      sha256 = "bc51424757434e905b5b611a6fa634147e533e375922c03f896a093fa61e57a3";
-      name = "katomic-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/katomic-19.12.3.tar.xz";
+      sha256 = "d7ed527e2546e94cb091e433a2e61618301152704c48e1f003e1f8e60b4f0cbd";
+      name = "katomic-19.12.3.tar.xz";
     };
   };
   kbackup = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kbackup-19.12.1.tar.xz";
-      sha256 = "1b30c142576d823043d4e78fa37592e8df79b5e13ea7a980d336b25c1093ecf8";
-      name = "kbackup-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kbackup-19.12.3.tar.xz";
+      sha256 = "1761009f9cd854d3fb4f98eb24b5ee7f3c42c4541f7cfb2ff1589786c86bdc99";
+      name = "kbackup-19.12.3.tar.xz";
     };
   };
   kblackbox = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kblackbox-19.12.1.tar.xz";
-      sha256 = "57901d6bf56228691b6c6436ca2f60e62542854e80f9c4fda7a60362a216e1ed";
-      name = "kblackbox-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kblackbox-19.12.3.tar.xz";
+      sha256 = "dffb910a5d429dfc231b7d2185119430856d26af2c027d34c551a6d664ae49c6";
+      name = "kblackbox-19.12.3.tar.xz";
     };
   };
   kblocks = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kblocks-19.12.1.tar.xz";
-      sha256 = "1077477910d1dfff60f1abad7b1cf937daf1f3e3a5e8b18407b7e2809b2fc3d9";
-      name = "kblocks-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kblocks-19.12.3.tar.xz";
+      sha256 = "5bc5cb14b91c9b230563388b4d935211975bae34ed36cb0479cbf25bc3b652fb";
+      name = "kblocks-19.12.3.tar.xz";
     };
   };
   kblog = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kblog-19.12.1.tar.xz";
-      sha256 = "6385ecfc024cf554a55e2840c3faf6b9e6ee81eb3536d5632899d32aecd54b9f";
-      name = "kblog-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kblog-19.12.3.tar.xz";
+      sha256 = "3fba584c4c217c5b5b3be52752f8f3c371fb877fe3b730a48711028fedc6b3d4";
+      name = "kblog-19.12.3.tar.xz";
     };
   };
   kbounce = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kbounce-19.12.1.tar.xz";
-      sha256 = "e9e1df6f2f57e102d95707b82b0aa582f9f1a6c3e395660b5faa33ef953e7fb3";
-      name = "kbounce-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kbounce-19.12.3.tar.xz";
+      sha256 = "d1b7ac99e54070e1e28a3449e8773691e90625c9f881cf94352ef752700197d0";
+      name = "kbounce-19.12.3.tar.xz";
     };
   };
   kbreakout = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kbreakout-19.12.1.tar.xz";
-      sha256 = "17475a5aa80f494876fb3b91d32df4c447417e79f4dd60d46f594cfab03f489f";
-      name = "kbreakout-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kbreakout-19.12.3.tar.xz";
+      sha256 = "ca662c9f2c6765f5f8b07bd4cc2e2aa0a43b69fec6428c3deda2cfad0ab675fa";
+      name = "kbreakout-19.12.3.tar.xz";
     };
   };
   kbruch = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kbruch-19.12.1.tar.xz";
-      sha256 = "94f9951c0ee3b4aea6d649f971f2d946d462b916a76e4e76ddafa809ce7e5550";
-      name = "kbruch-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kbruch-19.12.3.tar.xz";
+      sha256 = "522ddae0b2ec640e70c717a9fe0d6a95aef1ed3fe2acbca4b93a99a309abd559";
+      name = "kbruch-19.12.3.tar.xz";
     };
   };
   kcachegrind = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kcachegrind-19.12.1.tar.xz";
-      sha256 = "210e04441519c47d103871e52d98351abc41a04b9385c577a7839eec31a2f400";
-      name = "kcachegrind-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kcachegrind-19.12.3.tar.xz";
+      sha256 = "a30b70bac32f2b33c3c90b8c17754cfbf7d293c9eff0d573747eca2b45353b41";
+      name = "kcachegrind-19.12.3.tar.xz";
     };
   };
   kcalc = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kcalc-19.12.1.tar.xz";
-      sha256 = "51630cd5c6d7ebbf35fb91419acfe9b2d2719ebfcdc2fff8358dbfaa2cecda57";
-      name = "kcalc-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kcalc-19.12.3.tar.xz";
+      sha256 = "bbda4fc074e1ea748e95840aa79c51fdf0a1943ebb63ce6c7b68c197831258bd";
+      name = "kcalc-19.12.3.tar.xz";
     };
   };
   kcalutils = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kcalutils-19.12.1.tar.xz";
-      sha256 = "0298e92d84d9f4b612ea1a27abee1368bc624af2bc5bc4b5eb1053a27575ea04";
-      name = "kcalutils-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kcalutils-19.12.3.tar.xz";
+      sha256 = "00da1f331110a63c3d3c2c96394ead3d282f582d73fa925065560a50807fb7ff";
+      name = "kcalutils-19.12.3.tar.xz";
     };
   };
   kcharselect = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kcharselect-19.12.1.tar.xz";
-      sha256 = "5f23458974d6fa66c49d434937e7a7a31cc94e46616db866b35316025bb84b0c";
-      name = "kcharselect-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kcharselect-19.12.3.tar.xz";
+      sha256 = "9be6ac607148b0815bd985075fbb97d44561fdd6a955b60f0afc728f9cbd978b";
+      name = "kcharselect-19.12.3.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kcolorchooser-19.12.1.tar.xz";
-      sha256 = "713d1151f45382d8a889187ebb02f8e73ffbf28ac8abea0e03626888711d2c22";
-      name = "kcolorchooser-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kcolorchooser-19.12.3.tar.xz";
+      sha256 = "cb0395c1b4f953fd51129cfe5088702ec261f84cc045f889e22c13e81793744a";
+      name = "kcolorchooser-19.12.3.tar.xz";
     };
   };
   kcron = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kcron-19.12.1.tar.xz";
-      sha256 = "8c7d5fa24349b9ff7c4927579876ef84895398d8cde6122804d7104a4f4d5963";
-      name = "kcron-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kcron-19.12.3.tar.xz";
+      sha256 = "22d07834e8431d0fcc756a0e7d92d4e8993008766bf336254f8650c9455c9ab0";
+      name = "kcron-19.12.3.tar.xz";
     };
   };
   kdav = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kdav-19.12.1.tar.xz";
-      sha256 = "5059a295f3ecd9046da6f5ecadab596b3e47c75c5090650a1d6cd1f86a8b7498";
-      name = "kdav-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kdav-19.12.3.tar.xz";
+      sha256 = "7a0ed47378e064536b26dfdfcf7abcdb8dd2ec253a7bbcef7962b701d368872a";
+      name = "kdav-19.12.3.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kdebugsettings-19.12.1.tar.xz";
-      sha256 = "2730430123e6198131acbabb5d02800981082f7249f0d9b9001b5313b2d45f35";
-      name = "kdebugsettings-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kdebugsettings-19.12.3.tar.xz";
+      sha256 = "ad18d13dd0943a3651ec4729441899b103bd2dc743a4a373ce7bd14fb38dd3e0";
+      name = "kdebugsettings-19.12.3.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kde-dev-scripts-19.12.1.tar.xz";
-      sha256 = "c2965dee649abea0791774ae264230dbe673af07eb0bd85bf3e8c7c6a739cea5";
-      name = "kde-dev-scripts-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kde-dev-scripts-19.12.3.tar.xz";
+      sha256 = "94c0ba9de369dd6af14dcea505616025bf06599618a6c7557861aa9fb89ea628";
+      name = "kde-dev-scripts-19.12.3.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kde-dev-utils-19.12.1.tar.xz";
-      sha256 = "94f983c9b49ed3bc59b20849b23e7c26b64b7b303fbd86147c4bc823f87cda7d";
-      name = "kde-dev-utils-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kde-dev-utils-19.12.3.tar.xz";
+      sha256 = "772ec425865082b8be3650cf0af10ad943f38096036227cab22405b32c4e1fae";
+      name = "kde-dev-utils-19.12.3.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kdeedu-data-19.12.1.tar.xz";
-      sha256 = "d140f048e1ca8bd777b4a431904b3313a86446a5fd04e1f9c4e1fb4641a09b15";
-      name = "kdeedu-data-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kdeedu-data-19.12.3.tar.xz";
+      sha256 = "76fd5c0efaf339bcfc5ac9f131bac8889cff1df2dd3452ea7dd507b8d9e2645b";
+      name = "kdeedu-data-19.12.3.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kdegraphics-mobipocket-19.12.1.tar.xz";
-      sha256 = "546d11af89e97831cc09868051142d4180e9621cc537c2941272b42a85e71c6a";
-      name = "kdegraphics-mobipocket-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kdegraphics-mobipocket-19.12.3.tar.xz";
+      sha256 = "c459f9f04cf98cdc88a6763da8880f418e0c33b3cbd1d06b9a7347ebb470d835";
+      name = "kdegraphics-mobipocket-19.12.3.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kdegraphics-thumbnailers-19.12.1.tar.xz";
-      sha256 = "a91335c11637a351d3ea8798f5519ac5596d655aec92266e46ed2a1bab46a299";
-      name = "kdegraphics-thumbnailers-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kdegraphics-thumbnailers-19.12.3.tar.xz";
+      sha256 = "92a045ac0e9ca57ea27760df3cca0203f29ba435574e9d837d0c1069b8e88f72";
+      name = "kdegraphics-thumbnailers-19.12.3.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kdenetwork-filesharing-19.12.1.tar.xz";
-      sha256 = "823e31424998e96084eeb909dfb7ee6a8e8e6d33b5d2a57ada7d583350967684";
-      name = "kdenetwork-filesharing-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kdenetwork-filesharing-19.12.3.tar.xz";
+      sha256 = "8cc75f47ef8038cd7ee75974056cd48022816ab42c76cb6bd2c35a3619445180";
+      name = "kdenetwork-filesharing-19.12.3.tar.xz";
     };
   };
   kdenlive = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kdenlive-19.12.1.tar.xz";
-      sha256 = "fccf34a4660ce8a78ceefe8a4b9dd93d104f6871976d991ceec769366627dc77";
-      name = "kdenlive-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kdenlive-19.12.3.tar.xz";
+      sha256 = "cebcb8f019bc0fc719ef54d00507dc1281758e3c8c69ea2f93f99feda777bc64";
+      name = "kdenlive-19.12.3.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kdepim-addons-19.12.1.tar.xz";
-      sha256 = "091e3fd007ad54cd1dcd4e2d51c4ac883a2d9e365ca78592aa91a37835c4dcf5";
-      name = "kdepim-addons-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kdepim-addons-19.12.3.tar.xz";
+      sha256 = "f33bc70ac54ab56eea7bd8ca4c0ac98d9612acc4ddc9ce989d06b99f04f62c19";
+      name = "kdepim-addons-19.12.3.tar.xz";
     };
   };
   kdepim-apps-libs = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kdepim-apps-libs-19.12.1.tar.xz";
-      sha256 = "4ff633c98cd128f2409cb78c193dd72f1078ae29eba8db3e304248a019e17e43";
-      name = "kdepim-apps-libs-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kdepim-apps-libs-19.12.3.tar.xz";
+      sha256 = "e133cf76364f6b244338eafd39845a9f392eb9b55c43446541acbcb24a6f4796";
+      name = "kdepim-apps-libs-19.12.3.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kdepim-runtime-19.12.1.tar.xz";
-      sha256 = "31b1fe9778723079048d0fe1750028fd3f5f5b467ee10dcfa7fab37202a6ca39";
-      name = "kdepim-runtime-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kdepim-runtime-19.12.3.tar.xz";
+      sha256 = "dabf7da1ad35dfaa3531639a8964b61dbd7094ec0a9b3d62f50fa24a22f5db13";
+      name = "kdepim-runtime-19.12.3.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kdesdk-kioslaves-19.12.1.tar.xz";
-      sha256 = "e8e8f02e019bad7983cdc5cddbd435ccf676fd804ee7f960653acdda5676abb2";
-      name = "kdesdk-kioslaves-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kdesdk-kioslaves-19.12.3.tar.xz";
+      sha256 = "8b075bff545883aba24fee1763d0cdc64bf9444ae865f0623a33fc1ca295d254";
+      name = "kdesdk-kioslaves-19.12.3.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kdesdk-thumbnailers-19.12.1.tar.xz";
-      sha256 = "77f64ddb075407f781cf2d658af760840f9427cc171e8ec15805f47105da0e56";
-      name = "kdesdk-thumbnailers-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kdesdk-thumbnailers-19.12.3.tar.xz";
+      sha256 = "b304843045f93e91e0aeeeacf968018dc192ea71ed9977be3d9cfc4e149edcde";
+      name = "kdesdk-thumbnailers-19.12.3.tar.xz";
     };
   };
   kdf = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kdf-19.12.1.tar.xz";
-      sha256 = "bf5c96e5a78e0465e9b91617ffff0c37f04e896dc059d70962bbdd943c6c1c04";
-      name = "kdf-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kdf-19.12.3.tar.xz";
+      sha256 = "257e07e27376f45eaa1bfb1b3055c7f10759ca7ec185aa7572dc60317c8119bd";
+      name = "kdf-19.12.3.tar.xz";
     };
   };
   kdialog = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kdialog-19.12.1.tar.xz";
-      sha256 = "2a13d1957089e4a0307681786b9b5467b5df777311afd4598dd1cb69b4e070f6";
-      name = "kdialog-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kdialog-19.12.3.tar.xz";
+      sha256 = "e6f9a7a6b7c2f18795070bf9466dd6256568b02683d955ef3253432216594d00";
+      name = "kdialog-19.12.3.tar.xz";
     };
   };
   kdiamond = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kdiamond-19.12.1.tar.xz";
-      sha256 = "4f7770138d16bb7b91920b7f3c7024a89ef35dc330a2ac929a2fa5d4ee12b982";
-      name = "kdiamond-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kdiamond-19.12.3.tar.xz";
+      sha256 = "95dfd2fd3daa59a58d128c35b95b609117438efdb5d60110414ab7aff5fe3e7c";
+      name = "kdiamond-19.12.3.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/keditbookmarks-19.12.1.tar.xz";
-      sha256 = "11a950d53bc6e0b50d62a3ced2b74eaaa85c595b845ca8f2dcfa65e69d407fb0";
-      name = "keditbookmarks-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/keditbookmarks-19.12.3.tar.xz";
+      sha256 = "1c5efb63eb0a714942677eb03f91ae0bbd10731eace5471ea12ae9d3296b6b05";
+      name = "keditbookmarks-19.12.3.tar.xz";
     };
   };
   kfind = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kfind-19.12.1.tar.xz";
-      sha256 = "e9f5defa7796bbb54208b28af1fa76333a38e743d7febb8dd14739cf00d376eb";
-      name = "kfind-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kfind-19.12.3.tar.xz";
+      sha256 = "b3738d6e3f26fffbfcc204d946e165ae0727d9f460cb2065ceb221b4872019b1";
+      name = "kfind-19.12.3.tar.xz";
     };
   };
   kfloppy = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kfloppy-19.12.1.tar.xz";
-      sha256 = "77581323d16f8666fefca3372c91567dfe5233c0f92c79ead11b2253aee64e2c";
-      name = "kfloppy-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kfloppy-19.12.3.tar.xz";
+      sha256 = "7f384f9197d5066a5db978a9551665ae9a90b1f3afd1937f800ab61e376d3723";
+      name = "kfloppy-19.12.3.tar.xz";
     };
   };
   kfourinline = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kfourinline-19.12.1.tar.xz";
-      sha256 = "76e31b59f1b31ddb755def377324d5fa5b5a4835f1f537a30632a028bf671a3e";
-      name = "kfourinline-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kfourinline-19.12.3.tar.xz";
+      sha256 = "1d2f4fdbf427e2ce86a0519ee61a70df0675f039cebd658cd75bd27af4fe69f6";
+      name = "kfourinline-19.12.3.tar.xz";
     };
   };
   kgeography = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kgeography-19.12.1.tar.xz";
-      sha256 = "47f809fdb6da503c0b00f5d2052f9def3af0964ace45325e683227a1971c3a1b";
-      name = "kgeography-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kgeography-19.12.3.tar.xz";
+      sha256 = "3947ca1f50910d77f85c630b49128a085fed4230c7919e09281bc1765529a533";
+      name = "kgeography-19.12.3.tar.xz";
     };
   };
   kget = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kget-19.12.1.tar.xz";
-      sha256 = "33b043857b3d1c55d877d1c3af2bcc46feefe15019b7af40a9951c16e288658c";
-      name = "kget-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kget-19.12.3.tar.xz";
+      sha256 = "a4b1d8fb94617c80a557c27ae58a14131bda4476340c136262e5bf8f51d918d9";
+      name = "kget-19.12.3.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kgoldrunner-19.12.1.tar.xz";
-      sha256 = "1f2044656732ab7a72117139576201ca1701666d525c93b726473d4cd9aed29c";
-      name = "kgoldrunner-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kgoldrunner-19.12.3.tar.xz";
+      sha256 = "5808d797fb9df178526b3ea462bc902ca36b5926ef7c51233816ba3da6bc0bdd";
+      name = "kgoldrunner-19.12.3.tar.xz";
     };
   };
   kgpg = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kgpg-19.12.1.tar.xz";
-      sha256 = "e64dc85f303e45b8a7ef635525f6834c4fd2db36c5131fdb231fa11f7237fdb5";
-      name = "kgpg-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kgpg-19.12.3.tar.xz";
+      sha256 = "53e5726a1ccf34a70090ac0bbf2effb6f1f9f9b3d0164a5beead982a24c97e38";
+      name = "kgpg-19.12.3.tar.xz";
     };
   };
   khangman = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/khangman-19.12.1.tar.xz";
-      sha256 = "42fa9d9a9a72fe4b14127b12d5b662d66c00c1899eeefba6102be95136333def";
-      name = "khangman-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/khangman-19.12.3.tar.xz";
+      sha256 = "55286b318ec2c2d8b7e63f4063fc0e39a8ff81c0a9d3f06c9879f141c94762a8";
+      name = "khangman-19.12.3.tar.xz";
     };
   };
   khelpcenter = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/khelpcenter-19.12.1.tar.xz";
-      sha256 = "cd38f6b719f4f6228e3a7f94fc63f16020e86382ca402179ae767f2f0b846466";
-      name = "khelpcenter-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/khelpcenter-19.12.3.tar.xz";
+      sha256 = "526c89e46cace9e8afb4e748f9bbf0d105472a4cc4a6d8bb821e8b9b88ab0f73";
+      name = "khelpcenter-19.12.3.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kidentitymanagement-19.12.1.tar.xz";
-      sha256 = "7df38592610e0ed74c55baf6670331d07b2df0c98484d5f8cf8f135b6d229702";
-      name = "kidentitymanagement-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kidentitymanagement-19.12.3.tar.xz";
+      sha256 = "254bfc3a60df7bc1960fa1e6d5b7733f6aa5ed7772c1097d9a8cfcdda2704516";
+      name = "kidentitymanagement-19.12.3.tar.xz";
     };
   };
   kig = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kig-19.12.1.tar.xz";
-      sha256 = "507d89cddc0e128ab398ce0f551af22af0ba1583a4419574296cfefb96d944ee";
-      name = "kig-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kig-19.12.3.tar.xz";
+      sha256 = "1ae2c3024cdd14e476ff15b730f4ebe9b279477b67cc4cc89606755c7d3beef3";
+      name = "kig-19.12.3.tar.xz";
     };
   };
   kigo = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kigo-19.12.1.tar.xz";
-      sha256 = "235df9bca39b02dac6648b408d71f7b0978604f8389ea7ef5aa8e0be87fbcf9d";
-      name = "kigo-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kigo-19.12.3.tar.xz";
+      sha256 = "ee18b8563c49e3e01924ea76cd8c6ec376482c2100e0fac7cdfd14b5899592d5";
+      name = "kigo-19.12.3.tar.xz";
     };
   };
   killbots = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/killbots-19.12.1.tar.xz";
-      sha256 = "3d524028e7df412e4306daf4e7b1aca803d26b65985fa429c98db10cffff010f";
-      name = "killbots-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/killbots-19.12.3.tar.xz";
+      sha256 = "3c5dc7e1f27036d2584f6ee58bf3bbffd9e56a467f30a8e2eab9e1bda1e7d4a3";
+      name = "killbots-19.12.3.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kimagemapeditor-19.12.1.tar.xz";
-      sha256 = "9869f3a060dc44f2fad0646fa9c0f1c2924d68c3cc3de5147170456f27a39e77";
-      name = "kimagemapeditor-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kimagemapeditor-19.12.3.tar.xz";
+      sha256 = "1aee6521974bde5151744d92823f6b405ee4a8bd2dfe3c538324a209e18c6b35";
+      name = "kimagemapeditor-19.12.3.tar.xz";
     };
   };
   kimap = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kimap-19.12.1.tar.xz";
-      sha256 = "898e1f3b233b3631ffc74859d54bf402d36f0c5bae7f792e97d3fa5116d8bd0e";
-      name = "kimap-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kimap-19.12.3.tar.xz";
+      sha256 = "5c3b3cdf928754f9919030d865a2cdad0ad342c82c436afef660d018f85de4d2";
+      name = "kimap-19.12.3.tar.xz";
     };
   };
   kio-extras = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kio-extras-19.12.1.tar.xz";
-      sha256 = "79b3735510c3c8da9b3e019ee5a54b115f85bb8d89f1c04dbbf16dde3007e7b6";
-      name = "kio-extras-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kio-extras-19.12.3.tar.xz";
+      sha256 = "413cb21479fedf1421a6e2585b4df813c3a3fadaa77c248a9f810021f58cea4b";
+      name = "kio-extras-19.12.3.tar.xz";
     };
   };
   kipi-plugins = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kipi-plugins-19.12.1.tar.xz";
-      sha256 = "bcd27ab29b491f13116a156e403126d04ffbaa352b581eca7fb0904e13c5dabe";
-      name = "kipi-plugins-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kipi-plugins-19.12.3.tar.xz";
+      sha256 = "16997bd6fbb59c194c2997732c870e33bbacd3d7346546af9a255db3330ec5ac";
+      name = "kipi-plugins-19.12.3.tar.xz";
     };
   };
   kirigami-gallery = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kirigami-gallery-19.12.1.tar.xz";
-      sha256 = "de7f9d739feeac481223c7992179cb3cfaa2aabca1097b0d3597c5c9d737cb19";
-      name = "kirigami-gallery-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kirigami-gallery-19.12.3.tar.xz";
+      sha256 = "17febaeb77e0dfc6f591dd285fd7f538466572f2f2e3253461c41f92d6cb05fe";
+      name = "kirigami-gallery-19.12.3.tar.xz";
     };
   };
   kiriki = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kiriki-19.12.1.tar.xz";
-      sha256 = "f3079b53ed45ec46def7a95b336d441dba18151cc77c88ef8ce2d02fcf1d6375";
-      name = "kiriki-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kiriki-19.12.3.tar.xz";
+      sha256 = "abbaa49f9b47286f9afbe7c968eb6fbfeecb4be84ed4b2ce7514a3ed1e92b2d5";
+      name = "kiriki-19.12.3.tar.xz";
     };
   };
   kiten = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kiten-19.12.1.tar.xz";
-      sha256 = "abee050c05b54fae25562237b91a14156dabcb26ea142c714b5ec9e1907f54f3";
-      name = "kiten-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kiten-19.12.3.tar.xz";
+      sha256 = "663739a8b252cb95a38294c6f7d675c833daaa81f2654f5cabd8e512fd353560";
+      name = "kiten-19.12.3.tar.xz";
     };
   };
   kitinerary = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kitinerary-19.12.1.tar.xz";
-      sha256 = "6497469e9966c9c21c2810a1f21c2633b89e54dafb74d5689aa24382e3824926";
-      name = "kitinerary-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kitinerary-19.12.3.tar.xz";
+      sha256 = "4188efe8672091cbdaa4f757f5d8b94a30b1373dceafc076b01330602d5086e2";
+      name = "kitinerary-19.12.3.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kjumpingcube-19.12.1.tar.xz";
-      sha256 = "3e4abd57d14dccc9b39669eebdab578fc865464b8a4309c3ab8103002edc2ff0";
-      name = "kjumpingcube-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kjumpingcube-19.12.3.tar.xz";
+      sha256 = "b969111cb884efc9ad8ef585066ca33d7168bb045c93a3f18668173a11d29ea2";
+      name = "kjumpingcube-19.12.3.tar.xz";
     };
   };
   kldap = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kldap-19.12.1.tar.xz";
-      sha256 = "5595f840c2b97e96f265ffd91fb007f4beb198aaf67a0dbfd941108acbcb9aa3";
-      name = "kldap-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kldap-19.12.3.tar.xz";
+      sha256 = "49f1ad32ae10b7f997c77f3a8db0776b972b93f9e18873b77baabf0db05cd5d4";
+      name = "kldap-19.12.3.tar.xz";
     };
   };
   kleopatra = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kleopatra-19.12.1.tar.xz";
-      sha256 = "94ee94031696dd5d79d7a0ca00a2e51b4569466689e8a76c129deae645af08f4";
-      name = "kleopatra-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kleopatra-19.12.3.tar.xz";
+      sha256 = "04edf29e42088b2bccdfe36b9b7170c38acd7816657673da5393244b73773098";
+      name = "kleopatra-19.12.3.tar.xz";
     };
   };
   klettres = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/klettres-19.12.1.tar.xz";
-      sha256 = "4f103d85918d40e0a3ffc451bf3862c45b37b8bd2453e6ee7d21d4c738967c36";
-      name = "klettres-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/klettres-19.12.3.tar.xz";
+      sha256 = "f2a1bbb002954a80045780de24f494154214b8add53a5c01a8783cbeb26d26c7";
+      name = "klettres-19.12.3.tar.xz";
     };
   };
   klickety = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/klickety-19.12.1.tar.xz";
-      sha256 = "66cba17839023b6fe563a461da8f52a3c8a2bd4949195da2d63d780547f2e159";
-      name = "klickety-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/klickety-19.12.3.tar.xz";
+      sha256 = "351e421ecca5fc80955ed614453c81d8b790200185db16f56be1e0ca9325ad39";
+      name = "klickety-19.12.3.tar.xz";
     };
   };
   klines = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/klines-19.12.1.tar.xz";
-      sha256 = "111c4e607c4ba434a8ff593e45ba669c78e6c1fbf9e4d77d0fc5d611e733604e";
-      name = "klines-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/klines-19.12.3.tar.xz";
+      sha256 = "8d11894d0a02de20090e52ef697a5a3c00e902213c018a82c94ca0985e92350a";
+      name = "klines-19.12.3.tar.xz";
     };
   };
   kmag = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kmag-19.12.1.tar.xz";
-      sha256 = "59e5a59407894976574acf78e7248fd0609ce6ee222c60388a99e5576ac2061f";
-      name = "kmag-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kmag-19.12.3.tar.xz";
+      sha256 = "d1e8bbc8006cd2cfcb345e30aac73350562bff98b69b0333ad49726cdce81e7e";
+      name = "kmag-19.12.3.tar.xz";
     };
   };
   kmahjongg = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kmahjongg-19.12.1.tar.xz";
-      sha256 = "e157f2e603c03128fb99ac4d0b4bc3ab2002a60960c780a3907e35bb8aee9bd3";
-      name = "kmahjongg-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kmahjongg-19.12.3.tar.xz";
+      sha256 = "41a07f74cc4e3bf05f6a57a380d4e093b0303528cb703369981b262a0b1787c8";
+      name = "kmahjongg-19.12.3.tar.xz";
     };
   };
   kmail = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kmail-19.12.1.tar.xz";
-      sha256 = "a8fa4a604f8f88b91beebf0f3f9bb0ac7c040671bd75ab4478d8087a21cde40c";
-      name = "kmail-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kmail-19.12.3.tar.xz";
+      sha256 = "7f70e5270960e474b15631a36110e13fdf7238d6fd9f1b3fdb6d8c145b6529ba";
+      name = "kmail-19.12.3.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kmail-account-wizard-19.12.1.tar.xz";
-      sha256 = "e7cbda3946b19d01f5c3a722d2c104b7be072ab411f80437a25b8200d73e7cfa";
-      name = "kmail-account-wizard-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kmail-account-wizard-19.12.3.tar.xz";
+      sha256 = "4199e8c73456bf31b829596919ca481c3a95e59dee7c9bfb2e680311d0354ff0";
+      name = "kmail-account-wizard-19.12.3.tar.xz";
     };
   };
   kmailtransport = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kmailtransport-19.12.1.tar.xz";
-      sha256 = "1a46563c441a7d09e6cc2bf98a628b724944193e0df88607d5d867f4fa65c1a4";
-      name = "kmailtransport-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kmailtransport-19.12.3.tar.xz";
+      sha256 = "077b3dba7c02dde9693c003ab7039f3b2a530e3b1aecfcf187313db5226e8953";
+      name = "kmailtransport-19.12.3.tar.xz";
     };
   };
   kmbox = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kmbox-19.12.1.tar.xz";
-      sha256 = "7442fd3a421a917a3f27e47259a7da7e08ff6191290a0e9e67c67005c82c606a";
-      name = "kmbox-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kmbox-19.12.3.tar.xz";
+      sha256 = "de69683abb42c5c24ccb4f034e067f50c94d5a10c53f359b0e6ad4b75a70b376";
+      name = "kmbox-19.12.3.tar.xz";
     };
   };
   kmime = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kmime-19.12.1.tar.xz";
-      sha256 = "4d6db5d59b239b884bf8811f3ea616520ab1f69224a809cef3f79023b2563085";
-      name = "kmime-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kmime-19.12.3.tar.xz";
+      sha256 = "5ed20ad77000c60ba5723aaa22149fca3a3956f930d63e70984f0a17b9339300";
+      name = "kmime-19.12.3.tar.xz";
     };
   };
   kmines = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kmines-19.12.1.tar.xz";
-      sha256 = "8f921aa4bda7397c0fa6265ba07a6ce68190174864d0ee16ee575be806b49539";
-      name = "kmines-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kmines-19.12.3.tar.xz";
+      sha256 = "05d8004f2e560bf2c9e32a3ca1988b3848b99bfb9cc96307c1ac2b703c202dad";
+      name = "kmines-19.12.3.tar.xz";
     };
   };
   kmix = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kmix-19.12.1.tar.xz";
-      sha256 = "97fff89e4a102351d01265a9659c5664b030b9b4f27fa021b997fe7ab8801ad6";
-      name = "kmix-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kmix-19.12.3.tar.xz";
+      sha256 = "a4c637383e988ffa21b9c48c72ef6d8855fe207c852d0679011337a331ccfc5c";
+      name = "kmix-19.12.3.tar.xz";
     };
   };
   kmousetool = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kmousetool-19.12.1.tar.xz";
-      sha256 = "d056fd05ffb900f65670e3a77dc8a0c08fbc02d86f4fba1b34dd8f6b5f60c3e5";
-      name = "kmousetool-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kmousetool-19.12.3.tar.xz";
+      sha256 = "3741aff20c778bb704c76df7ff005da36ef6c41b07fca35f257ba440741b8413";
+      name = "kmousetool-19.12.3.tar.xz";
     };
   };
   kmouth = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kmouth-19.12.1.tar.xz";
-      sha256 = "da46e472a05920225c3ae0caba21279dc817b7c8e77ae981b1ad6cf2083a49ad";
-      name = "kmouth-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kmouth-19.12.3.tar.xz";
+      sha256 = "424dd4cf81cd43e47630ada0f2a9e47be8106b31ebf2e5c8c1077e55e3a8113f";
+      name = "kmouth-19.12.3.tar.xz";
     };
   };
   kmplot = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kmplot-19.12.1.tar.xz";
-      sha256 = "b82d9f9d4f3d3447e9125b42918819fe8effd5658d9a385da79e81e12f7466cf";
-      name = "kmplot-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kmplot-19.12.3.tar.xz";
+      sha256 = "2743e3a472ccf40281f5afd9c6110dde6fb9bc437e8e291beba484d405d8152e";
+      name = "kmplot-19.12.3.tar.xz";
     };
   };
   knavalbattle = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/knavalbattle-19.12.1.tar.xz";
-      sha256 = "1cc2c7fec2e2edc634cb1f83cf7e433522b0bc7d76c04cbcde66bb486a832856";
-      name = "knavalbattle-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/knavalbattle-19.12.3.tar.xz";
+      sha256 = "59875e10b0f2b06c2d3165f2f2457113f04550215947c8296ce1dcaf385ee37f";
+      name = "knavalbattle-19.12.3.tar.xz";
     };
   };
   knetwalk = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/knetwalk-19.12.1.tar.xz";
-      sha256 = "95725a45c56956a2b8e8e2db36b6baedfc0271af0d6e3541d6143342e6f41ca5";
-      name = "knetwalk-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/knetwalk-19.12.3.tar.xz";
+      sha256 = "24cb7cfa4143b2ab1bcaf38a6698cd01252201238c6561bc711e0673366642ae";
+      name = "knetwalk-19.12.3.tar.xz";
     };
   };
   knights = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/knights-19.12.1.tar.xz";
-      sha256 = "60ce0d76eb13c95ba81b0f2dfe5bd3e80ed2226319e4ef97150c3240f428d355";
-      name = "knights-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/knights-19.12.3.tar.xz";
+      sha256 = "4796654dcaff355b4f1097260748cfe04812ff926acc7ca0f037711875dd1512";
+      name = "knights-19.12.3.tar.xz";
     };
   };
   knotes = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/knotes-19.12.1.tar.xz";
-      sha256 = "e89f22ee1a918553be5241e167bd038797391502cb98c5f260c96b25017dd235";
-      name = "knotes-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/knotes-19.12.3.tar.xz";
+      sha256 = "b27846609dfac1ffcb3ac5e7165b7557231b096f6a84206da956c37233aed7b0";
+      name = "knotes-19.12.3.tar.xz";
     };
   };
   kolf = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kolf-19.12.1.tar.xz";
-      sha256 = "78c5e74d61f8c19b31d4d08781d12a87bc6101d0105081e0c15f4506e36ef6f5";
-      name = "kolf-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kolf-19.12.3.tar.xz";
+      sha256 = "2ba1f781d7d98ca0b10231e4f963b27d043c726f44da662b6c77105da4f9cffc";
+      name = "kolf-19.12.3.tar.xz";
     };
   };
   kollision = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kollision-19.12.1.tar.xz";
-      sha256 = "a48515f63c0dbcc890aa9c01e344ea5bcb123e587459879796acc39a16243c09";
-      name = "kollision-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kollision-19.12.3.tar.xz";
+      sha256 = "ce0bb077e8db8a959f965d463bb25bac02c91585b422af6c9249ad8a8f25eaab";
+      name = "kollision-19.12.3.tar.xz";
     };
   };
   kolourpaint = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kolourpaint-19.12.1.tar.xz";
-      sha256 = "a2db2312ddf79024358309da8b70cb2b9979d208372ce5f0960f662b8aab2518";
-      name = "kolourpaint-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kolourpaint-19.12.3.tar.xz";
+      sha256 = "7c134da2feb75a87bfda6b4265ef705868a9be03d70a828111a2869ca0b517b1";
+      name = "kolourpaint-19.12.3.tar.xz";
     };
   };
   kompare = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kompare-19.12.1.tar.xz";
-      sha256 = "c2eede65a85d59067caf6161606c3de4f18ec6b5e824cb1da9e6b3a8f1b7a92d";
-      name = "kompare-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kompare-19.12.3.tar.xz";
+      sha256 = "b89b266b6f648500627d2e70df29b73248c7b7d7d5e7c1bbcaddaedf072f6f1a";
+      name = "kompare-19.12.3.tar.xz";
     };
   };
   konqueror = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/konqueror-19.12.1.tar.xz";
-      sha256 = "20da57d7dd141e2c45345457ca90be26af28c2078224eb461dff9f9589889a09";
-      name = "konqueror-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/konqueror-19.12.3.tar.xz";
+      sha256 = "0f2b31a1dae1740839232bd646bf22d7cb57e34995584b9a96271ebcb0da7f0e";
+      name = "konqueror-19.12.3.tar.xz";
     };
   };
   konquest = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/konquest-19.12.1.tar.xz";
-      sha256 = "178e42f76115f8e8b47494ea7732fb76a692debe714590c06d84f7071930b65a";
-      name = "konquest-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/konquest-19.12.3.tar.xz";
+      sha256 = "e23732a7d78382c73fca0d31afb3ed85614ee4b4bfe2f07647a13582fa0811a5";
+      name = "konquest-19.12.3.tar.xz";
     };
   };
   konsole = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/konsole-19.12.1.tar.xz";
-      sha256 = "39797ed81c5ace12fd90f4a6e65c25d33db8e4385ab2baad2bd6a3b2db0ef075";
-      name = "konsole-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/konsole-19.12.3.tar.xz";
+      sha256 = "0bde8eb6365c53e96489d0ceb05baa0bb0385ee865492622033164a4c4bfccdc";
+      name = "konsole-19.12.3.tar.xz";
     };
   };
   kontact = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kontact-19.12.1.tar.xz";
-      sha256 = "e9f7911154953d58be962bd392baf7d9c310e9e665adb0c875ed5a50dcfe5e01";
-      name = "kontact-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kontact-19.12.3.tar.xz";
+      sha256 = "8dbd01f73c181f7b44df5dfffac1cf33c36b36149294fd854403bada9ef33052";
+      name = "kontact-19.12.3.tar.xz";
     };
   };
   kontactinterface = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kontactinterface-19.12.1.tar.xz";
-      sha256 = "a88b782b495d662920fd5f51c287c472c107c577af92431b4470787a78866b2c";
-      name = "kontactinterface-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kontactinterface-19.12.3.tar.xz";
+      sha256 = "1a0392cbeb6833f4834c86f202ff06e5b6069d12100bffe37de6427f0531af89";
+      name = "kontactinterface-19.12.3.tar.xz";
     };
   };
   kopete = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kopete-19.12.1.tar.xz";
-      sha256 = "eca3610cc9607c27620c7c23f9bb54bdd80d2fb295adaf6636506597fc0b848d";
-      name = "kopete-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kopete-19.12.3.tar.xz";
+      sha256 = "8d58fb0c9dd8b651bfc996e6928f7ccdad8e21cba39ffd0e54d46f7145fa7b27";
+      name = "kopete-19.12.3.tar.xz";
     };
   };
   korganizer = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/korganizer-19.12.1.tar.xz";
-      sha256 = "8bd84dfdca4f4738152c19d336b8c516f0c79fd888f0361005bc5d6359eeb117";
-      name = "korganizer-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/korganizer-19.12.3.tar.xz";
+      sha256 = "ea0a970aa510d5cdbbf80e974049fa3e7591e02c9ec2c4206137c49266df1acb";
+      name = "korganizer-19.12.3.tar.xz";
     };
   };
   kpat = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kpat-19.12.1.tar.xz";
-      sha256 = "cb72a256a2a6a34bd8ee05e09b28f0eedee6643f24f793c5f67a9465040c30c3";
-      name = "kpat-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kpat-19.12.3.tar.xz";
+      sha256 = "00b823b1b204b68e0c8671e5ddfe5f96abe8c9fcfb1efa9b7f70191cfa5384e1";
+      name = "kpat-19.12.3.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kpimtextedit-19.12.1.tar.xz";
-      sha256 = "253ded44f3ccb7de1a0a8879e45cc361c14dda2924619aeb04f4286c917f5475";
-      name = "kpimtextedit-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kpimtextedit-19.12.3.tar.xz";
+      sha256 = "64be03d7a8d4b9ece40c0065a23113023c2b3320dc57068fe00f6c4bc72537d5";
+      name = "kpimtextedit-19.12.3.tar.xz";
     };
   };
   kpkpass = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kpkpass-19.12.1.tar.xz";
-      sha256 = "b5a079dc1c102c52e29c1d0da3e5a1e51bf9e0a666bb82d6b783f1b55eaa7ada";
-      name = "kpkpass-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kpkpass-19.12.3.tar.xz";
+      sha256 = "45723989170e86c6739c8a377c54b3ba7456a8dc3ed6cf52eef884074c2df189";
+      name = "kpkpass-19.12.3.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kqtquickcharts-19.12.1.tar.xz";
-      sha256 = "641f5c993e627dd6d0778066016d20196b7502e34ab793fcf17dd6b226d08ae8";
-      name = "kqtquickcharts-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kqtquickcharts-19.12.3.tar.xz";
+      sha256 = "94669a7add0cef9a1c0969a92ece8e60a67fbb0ff32826cc49ce87bd890c976c";
+      name = "kqtquickcharts-19.12.3.tar.xz";
     };
   };
   krdc = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/krdc-19.12.1.tar.xz";
-      sha256 = "b3d9b9c43bfe5801d807be08172ca4c773ff6fc2d846cf5b2456c3360ca21824";
-      name = "krdc-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/krdc-19.12.3.tar.xz";
+      sha256 = "12602912abbc22e061067b6b5048d37a7cbdaaf99d203829d3f52fdf7319acce";
+      name = "krdc-19.12.3.tar.xz";
     };
   };
   kreversi = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kreversi-19.12.1.tar.xz";
-      sha256 = "b81e6544ba23b0869329d734618b3bc4408b585d550985338e6d90bf2d3a17f3";
-      name = "kreversi-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kreversi-19.12.3.tar.xz";
+      sha256 = "6bfe3a2faa7c0d08fb689b75341bfd5881d66bc865445573b2f4dbb316a751e8";
+      name = "kreversi-19.12.3.tar.xz";
     };
   };
   krfb = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/krfb-19.12.1.tar.xz";
-      sha256 = "7f25790480ac3a8db8a8bd847d80937a0ab763f6c5c12fa2ce704c4b24810287";
-      name = "krfb-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/krfb-19.12.3.tar.xz";
+      sha256 = "cb88997dc7b15b992d1de5c5cabaeccb37122e20823501ac29140875259782ee";
+      name = "krfb-19.12.3.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kross-interpreters-19.12.1.tar.xz";
-      sha256 = "c5ec40971befd1d214d80c8c2ced3e30aaadfd2d4000ea782751f769783f8130";
-      name = "kross-interpreters-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kross-interpreters-19.12.3.tar.xz";
+      sha256 = "2b4060494901a68ca1d07e0c345cc0814e11fb84e9f48014a7231021e4377487";
+      name = "kross-interpreters-19.12.3.tar.xz";
     };
   };
   kruler = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kruler-19.12.1.tar.xz";
-      sha256 = "0ecbc70561c0d973866c4bd27333a5ddc904b748fb3a64f66b6b06040b30d34a";
-      name = "kruler-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kruler-19.12.3.tar.xz";
+      sha256 = "803a0d31bbb5bfbfa057b13a7f6bbf7630dcc1816a0d41ea13cc4592bdacaa47";
+      name = "kruler-19.12.3.tar.xz";
     };
   };
   kshisen = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kshisen-19.12.1.tar.xz";
-      sha256 = "a361dfc41595640287dd5b800921859ff17a45f7360e5e2fc6f520cc0e421afa";
-      name = "kshisen-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kshisen-19.12.3.tar.xz";
+      sha256 = "f6ce353725d71ce65269b1b7b3d118cb8555cd065db0d3b17fe4696d87c10601";
+      name = "kshisen-19.12.3.tar.xz";
     };
   };
   ksirk = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/ksirk-19.12.1.tar.xz";
-      sha256 = "4f71e4ef3b4d2041edd48537f4b475cb505fc54e45b39b81a08c82d4eec7cc8e";
-      name = "ksirk-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/ksirk-19.12.3.tar.xz";
+      sha256 = "6387d7a6320e644157f10b94474ca715e7ad7fd15cdf7156a8e7d94bff019dcb";
+      name = "ksirk-19.12.3.tar.xz";
     };
   };
   ksmtp = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/ksmtp-19.12.1.tar.xz";
-      sha256 = "6c7d6ce91d65d7430cb31fb4a1fd44a600a5a459b3956807ee3180b5822dbac0";
-      name = "ksmtp-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/ksmtp-19.12.3.tar.xz";
+      sha256 = "1fd69f494afee91c11667ddbba43bc6cc316b51acf5894fe4c3a2631f53fae27";
+      name = "ksmtp-19.12.3.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/ksnakeduel-19.12.1.tar.xz";
-      sha256 = "73e9c55cce88a6e5d00683c73382ee82db64bfe788c14c3a4eda8decf382188f";
-      name = "ksnakeduel-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/ksnakeduel-19.12.3.tar.xz";
+      sha256 = "8db1dece78571f3e6933f8edcd693c3ceb1035acff780547a72c98b9f7decb87";
+      name = "ksnakeduel-19.12.3.tar.xz";
     };
   };
   kspaceduel = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kspaceduel-19.12.1.tar.xz";
-      sha256 = "0bc1f1c12bcfc9e5c778918fb9fa644f5c7ec5c3e687c015d45a7c5c31a27834";
-      name = "kspaceduel-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kspaceduel-19.12.3.tar.xz";
+      sha256 = "a9b5dc498b3695b59ae8925cc572cfc521ccadc8532756fa95ac876a7423c444";
+      name = "kspaceduel-19.12.3.tar.xz";
     };
   };
   ksquares = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/ksquares-19.12.1.tar.xz";
-      sha256 = "955225b9fadbda464bdaf1b59c95c3d12310f84484a296968737e9fb87b37b46";
-      name = "ksquares-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/ksquares-19.12.3.tar.xz";
+      sha256 = "45a922e4d85835cc655de560b6fd9be87d8cabc74eadbdecda3f17ba53ac92af";
+      name = "ksquares-19.12.3.tar.xz";
     };
   };
   ksudoku = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/ksudoku-19.12.1.tar.xz";
-      sha256 = "4dd72a5b0bb0c951508bbe2c60ce280efcd0414899e025a2ca4d92336576ec2a";
-      name = "ksudoku-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/ksudoku-19.12.3.tar.xz";
+      sha256 = "1cf36e762f31464b0640a88c739dfbb39b10129cace7fb5b74093ec607dea06c";
+      name = "ksudoku-19.12.3.tar.xz";
     };
   };
   ksystemlog = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/ksystemlog-19.12.1.tar.xz";
-      sha256 = "497496ca7451cd34f193ba11fe3100479515a89a34f0437ca2f508a48e68e895";
-      name = "ksystemlog-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/ksystemlog-19.12.3.tar.xz";
+      sha256 = "8225b1308ace76ebbf9bb805a2b6fae9bf8a425d0b09518645234c1b2df522dc";
+      name = "ksystemlog-19.12.3.tar.xz";
     };
   };
   kteatime = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kteatime-19.12.1.tar.xz";
-      sha256 = "49a0531b64e93ceb29548a7f75da755e75afda001fce2e6ba906372456b5dc17";
-      name = "kteatime-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kteatime-19.12.3.tar.xz";
+      sha256 = "0ab5fb6e33583e6d627b8f9dfaba5ce59e2b363e8045dfc66a4f65236d56542f";
+      name = "kteatime-19.12.3.tar.xz";
     };
   };
   ktimer = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/ktimer-19.12.1.tar.xz";
-      sha256 = "0c5fac1baddfa3144b8930f3d42b78a3eb8681d642a3c3339c903ad2cb30a2ba";
-      name = "ktimer-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/ktimer-19.12.3.tar.xz";
+      sha256 = "921af876a176a4731a74b5e9e76d751853043ec4f4857301b39a5c680246557c";
+      name = "ktimer-19.12.3.tar.xz";
     };
   };
   ktnef = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/ktnef-19.12.1.tar.xz";
-      sha256 = "2fce576e517e6ae9001ade6f07a51fcfa899a6569bc4b8c3948827adfc0af20c";
-      name = "ktnef-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/ktnef-19.12.3.tar.xz";
+      sha256 = "3537515b432e5da00d401046e94e0098fa54c071246cb0e357e3d8f47296ed3c";
+      name = "ktnef-19.12.3.tar.xz";
     };
   };
   ktouch = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/ktouch-19.12.1.tar.xz";
-      sha256 = "64b8a025f82b951c69c3be7aa7d3c23f14ccef9ed5e900776eb01462cff9a99f";
-      name = "ktouch-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/ktouch-19.12.3.tar.xz";
+      sha256 = "522fb081da5877717d577493fdaeeecbfe3d8d773e5d7fc83ecced008744ef0e";
+      name = "ktouch-19.12.3.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/ktp-accounts-kcm-19.12.1.tar.xz";
-      sha256 = "1ae81e4b7bae97d9d18c1fdc9e7083cc810b39d58dff5755dc9d78bd62551577";
-      name = "ktp-accounts-kcm-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/ktp-accounts-kcm-19.12.3.tar.xz";
+      sha256 = "ae5ae5004ecbf34596711a56e069d480c952de5ea784f5e90c391750439aff51";
+      name = "ktp-accounts-kcm-19.12.3.tar.xz";
     };
   };
   ktp-approver = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/ktp-approver-19.12.1.tar.xz";
-      sha256 = "502a63f13db44fc8a28f64e37c43839b8da22086bf858dc9c492476d9ba14b50";
-      name = "ktp-approver-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/ktp-approver-19.12.3.tar.xz";
+      sha256 = "af4f6d247b6332745f6b6dfacef74eb2ea0f7bbea9398080fc7b57e5953fdfbd";
+      name = "ktp-approver-19.12.3.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/ktp-auth-handler-19.12.1.tar.xz";
-      sha256 = "109583d4800d293fe11eeaa553d72643f2a3709c0d078a6e842f2e4b228d93e0";
-      name = "ktp-auth-handler-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/ktp-auth-handler-19.12.3.tar.xz";
+      sha256 = "40822e78879d97c3cc1d16f44f7d3b581980c4e249a273d7471b291adf3b9225";
+      name = "ktp-auth-handler-19.12.3.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/ktp-call-ui-19.12.1.tar.xz";
-      sha256 = "adb3025f8f878fd4a56ce125bd51c155f26b02661b9365b6321fb456153b0c55";
-      name = "ktp-call-ui-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/ktp-call-ui-19.12.3.tar.xz";
+      sha256 = "96b1dd64b0f87228d76f12b6cad3677afeb4c44d6f18645c3001555506573fb1";
+      name = "ktp-call-ui-19.12.3.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/ktp-common-internals-19.12.1.tar.xz";
-      sha256 = "4a1f189c1393164fba710e63b0e8f1aae6f22a5faacea0d86544e3e4a471603a";
-      name = "ktp-common-internals-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/ktp-common-internals-19.12.3.tar.xz";
+      sha256 = "48cde7fc4f2f0d39999f70699867044e0f85e06769a0824aac49c572fb1af5a4";
+      name = "ktp-common-internals-19.12.3.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/ktp-contact-list-19.12.1.tar.xz";
-      sha256 = "c293fa90899d496c4e29b9c9986a3864e06ef22dabbd4583123abbc232f4fe25";
-      name = "ktp-contact-list-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/ktp-contact-list-19.12.3.tar.xz";
+      sha256 = "093544e84ca12169966837be5f01d339ddc59e5f031d78e68ddf7be4dd890efd";
+      name = "ktp-contact-list-19.12.3.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/ktp-contact-runner-19.12.1.tar.xz";
-      sha256 = "a86d8a67f3d8f3d741c6c4548a58cbdff384e8bd5ed5cd1d82db65456240ac0f";
-      name = "ktp-contact-runner-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/ktp-contact-runner-19.12.3.tar.xz";
+      sha256 = "50646e8670449d6f6a9b107e36f18174b5ec37052a7b4f471617f4f53fecc96b";
+      name = "ktp-contact-runner-19.12.3.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/ktp-desktop-applets-19.12.1.tar.xz";
-      sha256 = "63f1a0df6a392f41a54fda8c4896754c2687ba34968cf5bbc0ac84a37c1a1741";
-      name = "ktp-desktop-applets-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/ktp-desktop-applets-19.12.3.tar.xz";
+      sha256 = "4ab8f04537345db8e41ed9f8ff7a6a2f3135e3539382cef97d1a7e9f0eddb54e";
+      name = "ktp-desktop-applets-19.12.3.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/ktp-filetransfer-handler-19.12.1.tar.xz";
-      sha256 = "208aab8c78f4b7f38e331802a63fa10d00a65c115900c72c7a710b799ea56034";
-      name = "ktp-filetransfer-handler-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/ktp-filetransfer-handler-19.12.3.tar.xz";
+      sha256 = "b2e81fec33b51628d9d88707b6bd844c69eb2c9bfb00cb0b45759a4fd9769b03";
+      name = "ktp-filetransfer-handler-19.12.3.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/ktp-kded-module-19.12.1.tar.xz";
-      sha256 = "274f97c6874eeb2af14b937ed20430d2ac2e1a769890a70da8d477ac33ed6082";
-      name = "ktp-kded-module-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/ktp-kded-module-19.12.3.tar.xz";
+      sha256 = "6bb0c05683812738e254c88d39936565966096a7156111565d8a64a59c55ef0d";
+      name = "ktp-kded-module-19.12.3.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/ktp-send-file-19.12.1.tar.xz";
-      sha256 = "5652e40e02ac191ad6e8df276a5faf8805000760261d495f3f4424416da3b977";
-      name = "ktp-send-file-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/ktp-send-file-19.12.3.tar.xz";
+      sha256 = "566d9dccc0c2fa7c23c95051c25543d3aabe76065ddff7dff9d8a37683d2022b";
+      name = "ktp-send-file-19.12.3.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/ktp-text-ui-19.12.1.tar.xz";
-      sha256 = "226efc09343bb9218c461858747a1bc084ad8291fbbcc9f49eb888acfe2039c6";
-      name = "ktp-text-ui-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/ktp-text-ui-19.12.3.tar.xz";
+      sha256 = "b8ad9a224ae300c0412874d0877fdc8e050869d3a8f60a4051a0919a8749c50f";
+      name = "ktp-text-ui-19.12.3.tar.xz";
     };
   };
   ktuberling = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/ktuberling-19.12.1.tar.xz";
-      sha256 = "4c0d594ef72bd2dda5d42daf0f8b430319cbea6d28ba5c9725895b1221cdaace";
-      name = "ktuberling-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/ktuberling-19.12.3.tar.xz";
+      sha256 = "c4d74d18173d5761f7e6f8adf6178713a726c671aaa2eda4e6c77115484e9e55";
+      name = "ktuberling-19.12.3.tar.xz";
     };
   };
   kturtle = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kturtle-19.12.1.tar.xz";
-      sha256 = "de10ea1ee142aea6fba8dee0d27d2e431aa806c6d7be4f5b5727cba8984e8d51";
-      name = "kturtle-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kturtle-19.12.3.tar.xz";
+      sha256 = "6958a88c484261919cd89cb1f0d163b0c5d5f1e28b10b3b4e3b6b9e82e379ef1";
+      name = "kturtle-19.12.3.tar.xz";
     };
   };
   kubrick = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kubrick-19.12.1.tar.xz";
-      sha256 = "485e7e4a30b01cb2661c640214bdc71a3e0a8b61a9071c64ffbbe75e2270af3c";
-      name = "kubrick-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kubrick-19.12.3.tar.xz";
+      sha256 = "8fc0a0e68d255481c6efb3f4ff894c5e376367b29958c4738bd72d3f4b1ff557";
+      name = "kubrick-19.12.3.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kwalletmanager-19.12.1.tar.xz";
-      sha256 = "b2370fbf559a3b8e8551daedada9c97d07041388dc74f8bd1286c64ab18b936b";
-      name = "kwalletmanager-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kwalletmanager-19.12.3.tar.xz";
+      sha256 = "247c7f80a54babd21a13e6b9386370b72ec12bdf928c08a7e8a647ccca53e393";
+      name = "kwalletmanager-19.12.3.tar.xz";
     };
   };
   kwave = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kwave-19.12.1.tar.xz";
-      sha256 = "e6c336644c00a457b37820fc87668dd9b8a448d8abf84cda267b6e5cd01e0645";
-      name = "kwave-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kwave-19.12.3.tar.xz";
+      sha256 = "3c90115d4702dbe46767e2404c952d84533137fa558b787b87ff95ed61f6930d";
+      name = "kwave-19.12.3.tar.xz";
     };
   };
   kwordquiz = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/kwordquiz-19.12.1.tar.xz";
-      sha256 = "8ee204de56fe2bf33e11d19b9c0c21d7e3dcf26bf550f9dffa79b22a3082659f";
-      name = "kwordquiz-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/kwordquiz-19.12.3.tar.xz";
+      sha256 = "6965a3b3c171c3f62aeecf4ccdddde14d23062ab914b1860822546a5770b80fc";
+      name = "kwordquiz-19.12.3.tar.xz";
     };
   };
   libgravatar = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/libgravatar-19.12.1.tar.xz";
-      sha256 = "84525db5f24c04cfa2bb44376a3bd64368e9d9478a160cf862c695052f3fc254";
-      name = "libgravatar-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/libgravatar-19.12.3.tar.xz";
+      sha256 = "70ea306f48aede9f8f327eaa74ea5ce5761e5dfe67f2da50d3242c0f312edc86";
+      name = "libgravatar-19.12.3.tar.xz";
     };
   };
   libkcddb = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/libkcddb-19.12.1.tar.xz";
-      sha256 = "50c139aaa14a5f27b3818cec7ec6ede4b764d461b6547651b61e4edd295afe6f";
-      name = "libkcddb-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/libkcddb-19.12.3.tar.xz";
+      sha256 = "69cbaf03adba24c0cabf957ee4149c4fa86d403eb6b8a07f7f80eb17be49e892";
+      name = "libkcddb-19.12.3.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/libkcompactdisc-19.12.1.tar.xz";
-      sha256 = "95b14098b24a86094b01b357e36ae135fb6c85c838e8735c843d27b101cc2bd9";
-      name = "libkcompactdisc-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/libkcompactdisc-19.12.3.tar.xz";
+      sha256 = "74aac7dcac84c60a7962f23e7bcc6eb693048fd96ca21015441a87487baa9d1c";
+      name = "libkcompactdisc-19.12.3.tar.xz";
     };
   };
   libkdcraw = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/libkdcraw-19.12.1.tar.xz";
-      sha256 = "bbdd5b1b9b40780b5f2be567d9ba0ab163fe7dcc7121070b788106e0fe966c1e";
-      name = "libkdcraw-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/libkdcraw-19.12.3.tar.xz";
+      sha256 = "9454aed707ee311dbfb921f8d45fba11710ffc01f48d65f64585d12c2580116f";
+      name = "libkdcraw-19.12.3.tar.xz";
     };
   };
   libkdegames = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/libkdegames-19.12.1.tar.xz";
-      sha256 = "317513544e08d03b2381bdb4c0bcd24c844dd8af7ccc4896569dd05933061d9c";
-      name = "libkdegames-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/libkdegames-19.12.3.tar.xz";
+      sha256 = "39cf5039b7fe11688028df026252c9cd4424546817b5bb635af2558f71ba6b20";
+      name = "libkdegames-19.12.3.tar.xz";
     };
   };
   libkdepim = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/libkdepim-19.12.1.tar.xz";
-      sha256 = "1d626a959a0f9fcb24c4e01c553126d40314c789db9bc80d6b52f2bb75e233cd";
-      name = "libkdepim-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/libkdepim-19.12.3.tar.xz";
+      sha256 = "911e7d174240d4c056472549dbd1f3da4467a57c765f3cb34fbac32943f38dbb";
+      name = "libkdepim-19.12.3.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/libkeduvocdocument-19.12.1.tar.xz";
-      sha256 = "a0e3921dab9d892d5efcddfbca548f230b508fc81ab4d7735c7610a710791816";
-      name = "libkeduvocdocument-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/libkeduvocdocument-19.12.3.tar.xz";
+      sha256 = "31594d30e03890507b25d676981164fd64258e69c6b264b85939118377eda964";
+      name = "libkeduvocdocument-19.12.3.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/libkexiv2-19.12.1.tar.xz";
-      sha256 = "53b9a4ecda0f76df1a5b9f7b8184b85e847838cf97e4ad3036a6c5bb719993e5";
-      name = "libkexiv2-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/libkexiv2-19.12.3.tar.xz";
+      sha256 = "f5d0947f6b1ca0583d569990dc6f68bb01d8f7756a38bcc40b1e54f7814e4d4d";
+      name = "libkexiv2-19.12.3.tar.xz";
     };
   };
   libkgapi = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/libkgapi-19.12.1.tar.xz";
-      sha256 = "8bfa16ab76b0042e2a0b827cf251b1155c0e693db39ffcb2805613d3393389cf";
-      name = "libkgapi-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/libkgapi-19.12.3.tar.xz";
+      sha256 = "f52923c382272b47782348fbadb32902fbcd4652f4100875a745ba57033cf48a";
+      name = "libkgapi-19.12.3.tar.xz";
     };
   };
   libkgeomap = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/libkgeomap-19.12.1.tar.xz";
-      sha256 = "68c9c5b91e77a4b4a07ca646d58e8e890975825f8f851d850c95dacb7a1d90d2";
-      name = "libkgeomap-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/libkgeomap-19.12.3.tar.xz";
+      sha256 = "eb604deffe78cdcd4a8c7d888416246d0a17f2e3b7d80d6959e1412f03ab2755";
+      name = "libkgeomap-19.12.3.tar.xz";
     };
   };
   libkipi = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/libkipi-19.12.1.tar.xz";
-      sha256 = "79f0a994b348467353425aea60dc4f4234c9a259cffcb55ac60d8c195bd0122c";
-      name = "libkipi-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/libkipi-19.12.3.tar.xz";
+      sha256 = "3a57d07cd4fe8e118558d807242bf483fa2aac1bcf3dcdc29139636c2b280786";
+      name = "libkipi-19.12.3.tar.xz";
     };
   };
   libkleo = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/libkleo-19.12.1.tar.xz";
-      sha256 = "8e9b78fbeb861370ab81f98150ff9ea8afc960293ae8324fedd0b877302994a7";
-      name = "libkleo-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/libkleo-19.12.3.tar.xz";
+      sha256 = "1e715442a0c52ca561316abdce9662082f52ad9f3101ea01435a90984989a057";
+      name = "libkleo-19.12.3.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/libkmahjongg-19.12.1.tar.xz";
-      sha256 = "e6a107a32c01c654a2372fda984724b4acd59dbc2902f3f9c7a7d9e14587639c";
-      name = "libkmahjongg-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/libkmahjongg-19.12.3.tar.xz";
+      sha256 = "f8ea23952a576e6081052d10e9c967bebe5db017ad62775183f91236158cc19f";
+      name = "libkmahjongg-19.12.3.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/libkomparediff2-19.12.1.tar.xz";
-      sha256 = "319d61742f7603a60d781151cd717291c5cb976ff0f2895df9d167526cfb0b4a";
-      name = "libkomparediff2-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/libkomparediff2-19.12.3.tar.xz";
+      sha256 = "aadc6e420e24bdebe203d4dfc76f5c23c8529be70ac057d89b516ab57b165094";
+      name = "libkomparediff2-19.12.3.tar.xz";
     };
   };
   libksane = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/libksane-19.12.1.tar.xz";
-      sha256 = "5a5998996848e83c80589c8ed0b1a6c1fa48bb61686288d199d831ac810e1603";
-      name = "libksane-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/libksane-19.12.3.tar.xz";
+      sha256 = "0aab855b8414041c37ddfbb9f0732272206af1c0844376f1370b9d2a907af71d";
+      name = "libksane-19.12.3.tar.xz";
     };
   };
   libksieve = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/libksieve-19.12.1.tar.xz";
-      sha256 = "6c3d49e2ce4d8e6b7c1b4328aa6065a01c7711223dd4f3b9db3a542f9fc0a84c";
-      name = "libksieve-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/libksieve-19.12.3.tar.xz";
+      sha256 = "990e6a15e7e88120bf6c744fe6f1ac78184d6470318005f24634a70219f45002";
+      name = "libksieve-19.12.3.tar.xz";
     };
   };
   lokalize = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/lokalize-19.12.1.tar.xz";
-      sha256 = "ee29cff9a513d68cde72e6ace0f893de77be5cb3fe56b4b6e0d1fa5b808b424c";
-      name = "lokalize-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/lokalize-19.12.3.tar.xz";
+      sha256 = "8015c994e974fd51c1c7f5903a005bbbc25f094656bdd44cd5e8675cd69cea92";
+      name = "lokalize-19.12.3.tar.xz";
     };
   };
   lskat = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/lskat-19.12.1.tar.xz";
-      sha256 = "0aa36c4cc554b708f7334b32362831537ea52db81b8480b80ffac5c27a041e8f";
-      name = "lskat-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/lskat-19.12.3.tar.xz";
+      sha256 = "5f13417ba9f6831a5f48c220a5c67a8d73787715b8b4aa433e6e356b7ac58776";
+      name = "lskat-19.12.3.tar.xz";
     };
   };
   mailcommon = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/mailcommon-19.12.1.tar.xz";
-      sha256 = "160135049bc2e4984f14022af793a9ac05bf488faa6f9eb7bd86a094de1c9bfe";
-      name = "mailcommon-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/mailcommon-19.12.3.tar.xz";
+      sha256 = "d3999d290505b20aecbb4b14bec5af4d6a7db72d1f26f7a40b4aff231588c7e5";
+      name = "mailcommon-19.12.3.tar.xz";
     };
   };
   mailimporter = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/mailimporter-19.12.1.tar.xz";
-      sha256 = "c1a042560438d6f6195a1f64355515489b74a44c1d2f5f547ced6785439215f1";
-      name = "mailimporter-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/mailimporter-19.12.3.tar.xz";
+      sha256 = "b81e8a5794aee24aa611c1a1912f93a308ce56c429ad4a72afe308e6b554c4a7";
+      name = "mailimporter-19.12.3.tar.xz";
     };
   };
   marble = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/marble-19.12.1.tar.xz";
-      sha256 = "46ec0dcab4773ccfb843ae52881ae833b038a00b7690977a2e721099264dc8dd";
-      name = "marble-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/marble-19.12.3.tar.xz";
+      sha256 = "73a2c5234f8a1728e2a97499166e7bbf8dfb2f48d10fe8cff96380631d064627";
+      name = "marble-19.12.3.tar.xz";
     };
   };
   mbox-importer = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/mbox-importer-19.12.1.tar.xz";
-      sha256 = "04dd6220192095d0f7befb368b9d96a321acac7af43b3575faf25ae89d17b5f4";
-      name = "mbox-importer-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/mbox-importer-19.12.3.tar.xz";
+      sha256 = "62fb1490517e0a49bf823946c8b747062cb970dbe00281d459adda73596f0046";
+      name = "mbox-importer-19.12.3.tar.xz";
     };
   };
   messagelib = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/messagelib-19.12.1.tar.xz";
-      sha256 = "d2514ac31f78235340353701f735a15f69d99374a55566ec7702a3a5ddd23d05";
-      name = "messagelib-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/messagelib-19.12.3.tar.xz";
+      sha256 = "5e776d5ea7b0cbb246b03cf2bfc84a65a959e7433a7f80b77a5f67cfa7c23ccb";
+      name = "messagelib-19.12.3.tar.xz";
     };
   };
   minuet = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/minuet-19.12.1.tar.xz";
-      sha256 = "735b340f9f0d6ee09c2c6aa76061282da6bd921f8b77683c53311731a77edff1";
-      name = "minuet-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/minuet-19.12.3.tar.xz";
+      sha256 = "740a3704004336f08c0fde148257c1562254b4e706704ec7eb2149fb3d7b6b9b";
+      name = "minuet-19.12.3.tar.xz";
     };
   };
   okular = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/okular-19.12.1.tar.xz";
-      sha256 = "485044127c6bbe0d4c71f1518da15050957c06b8fe36633462367d15d684d4bd";
-      name = "okular-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/okular-19.12.3.tar.xz";
+      sha256 = "c5de22cc4292e3b7adae3f6ef6566dcba33a1dd5995fb0b968ea3e705a4c04e0";
+      name = "okular-19.12.3.tar.xz";
     };
   };
   palapeli = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/palapeli-19.12.1.tar.xz";
-      sha256 = "ea4d9dd576066a610444680f3e8686f242bc8be9222020423acab52ec98a185f";
-      name = "palapeli-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/palapeli-19.12.3.tar.xz";
+      sha256 = "6989bbc94ed955f6990d40bccbc0c38768898bf2ccb8163c45119517340b723d";
+      name = "palapeli-19.12.3.tar.xz";
     };
   };
   parley = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/parley-19.12.1.tar.xz";
-      sha256 = "54b91178a9bd1ff9c1817bd0df69a3a4bb9e4f3488f052034dd45e729f1325b6";
-      name = "parley-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/parley-19.12.3.tar.xz";
+      sha256 = "ebf9fdec981abca988d83d8a77e921e7ce871eb010b6cf4ea9065ee6d45f5089";
+      name = "parley-19.12.3.tar.xz";
     };
   };
   picmi = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/picmi-19.12.1.tar.xz";
-      sha256 = "5428ef9add8dd9479f319b8c08fbfefca9ee34fbf503bee1c55b04ecf82ae9f9";
-      name = "picmi-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/picmi-19.12.3.tar.xz";
+      sha256 = "04a69125fc76b1fcd58d873452e4a4e642ee9ee672cdb7656214d8cd854fc178";
+      name = "picmi-19.12.3.tar.xz";
     };
   };
   pimcommon = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/pimcommon-19.12.1.tar.xz";
-      sha256 = "d3058407ec578a32df82eb83eb7631d2904e75d6d345ed61dac0f3744840ebf5";
-      name = "pimcommon-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/pimcommon-19.12.3.tar.xz";
+      sha256 = "443e2915eb42a4f56f1ddf47785ceeceb4ca1e0384ff48bc93fc4a7756392766";
+      name = "pimcommon-19.12.3.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/pim-data-exporter-19.12.1.tar.xz";
-      sha256 = "3f650c1c221826079d7c739e4070e295a7a1b1156f75e8e3100b06f878efed12";
-      name = "pim-data-exporter-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/pim-data-exporter-19.12.3.tar.xz";
+      sha256 = "8e9961fcc4f1ed0305d589e3a417f8924657d89d798a77c53956d73f6bf19938";
+      name = "pim-data-exporter-19.12.3.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/pim-sieve-editor-19.12.1.tar.xz";
-      sha256 = "3fdca7147c581dce4a014dc2d30bd7e6616c0559654cf9fee68e9292fd6ef037";
-      name = "pim-sieve-editor-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/pim-sieve-editor-19.12.3.tar.xz";
+      sha256 = "641ea56304df079a80e098fb253c173b63266990856f8795af093c144c3883ae";
+      name = "pim-sieve-editor-19.12.3.tar.xz";
     };
   };
   poxml = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/poxml-19.12.1.tar.xz";
-      sha256 = "f02aa4d1f7de8fb38921fe73076b3e905185979d9b75ff6345efaca8aad0ebb9";
-      name = "poxml-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/poxml-19.12.3.tar.xz";
+      sha256 = "190178290ce18fe3a684c22d650843f3008a6e31ebbab8fff25491c58b21e276";
+      name = "poxml-19.12.3.tar.xz";
     };
   };
   print-manager = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/print-manager-19.12.1.tar.xz";
-      sha256 = "76336be7da80a7494e2e5d5c9ab431047672a98630c7d61f916aa4b9edc35776";
-      name = "print-manager-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/print-manager-19.12.3.tar.xz";
+      sha256 = "74c13802a65136539b4542fec10fb248149a3324e8060e947a8f305ce665269a";
+      name = "print-manager-19.12.3.tar.xz";
     };
   };
   rocs = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/rocs-19.12.1.tar.xz";
-      sha256 = "cc9ff080b05bd6c48ee438c968917d8eb6f6eccb45ca70b45c5e53dce396bb45";
-      name = "rocs-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/rocs-19.12.3.tar.xz";
+      sha256 = "f834e69e676913e364162906b79da5a75a6043f4a5c8506954d1630abda45e3c";
+      name = "rocs-19.12.3.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/signon-kwallet-extension-19.12.1.tar.xz";
-      sha256 = "a98397cc15733b9c1010f022a8d6bcf7727c4065ba6ae662273ba97864836bbe";
-      name = "signon-kwallet-extension-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/signon-kwallet-extension-19.12.3.tar.xz";
+      sha256 = "46199be023bad630b769b14c2c0a63feff2949da944c76780b1ebd9a50ee3daa";
+      name = "signon-kwallet-extension-19.12.3.tar.xz";
     };
   };
   spectacle = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/spectacle-19.12.1.tar.xz";
-      sha256 = "140f388c531043eeefff8d639eb468d1ed33397925021c6809c0c8a799bb25c9";
-      name = "spectacle-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/spectacle-19.12.3.tar.xz";
+      sha256 = "443f114dab1fb50e7e12a046fdf06c0456bf99a3abdf09dce05605fdf7d3de81";
+      name = "spectacle-19.12.3.tar.xz";
     };
   };
   step = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/step-19.12.1.tar.xz";
-      sha256 = "f171c58b567bb29ed50109b341e53dc00116e814c90f51aa7a6e405326982907";
-      name = "step-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/step-19.12.3.tar.xz";
+      sha256 = "0eb62c87553769e009daa02406b1d95742c946bdffe0d22327776ec558e7584b";
+      name = "step-19.12.3.tar.xz";
     };
   };
   svgpart = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/svgpart-19.12.1.tar.xz";
-      sha256 = "6083457999121ead13b6c267211a78ea04c925d6f9f7447b31677c0b49f6898b";
-      name = "svgpart-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/svgpart-19.12.3.tar.xz";
+      sha256 = "942d877a516d8407ef2782d7c6869ab688274fee6cde9b23ab1061bcbddf2cc9";
+      name = "svgpart-19.12.3.tar.xz";
     };
   };
   sweeper = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/sweeper-19.12.1.tar.xz";
-      sha256 = "50b1464c08b738f4af4c78b4edc291ce93877a52831b810cd12c8ca6a4df0cf9";
-      name = "sweeper-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/sweeper-19.12.3.tar.xz";
+      sha256 = "cf89cfba61c9eeda9b4e7921c21a23e7d9a110b134ab6fbd127c37d036bd0517";
+      name = "sweeper-19.12.3.tar.xz";
     };
   };
   umbrello = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/umbrello-19.12.1.tar.xz";
-      sha256 = "077a1b5a3dfe15d37f03ee97ca5b40a1b8e7e0f2305df2f16a966861cc79e0d6";
-      name = "umbrello-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/umbrello-19.12.3.tar.xz";
+      sha256 = "b2f769c7bd1cc259170b62c68d2dca05b4a143dd1048dbb507cf2bbb3020a193";
+      name = "umbrello-19.12.3.tar.xz";
     };
   };
   yakuake = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/yakuake-19.12.1.tar.xz";
-      sha256 = "abff4f358f41f544b2e12c340a74d92482241b1b95906b14add7810384602e42";
-      name = "yakuake-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/yakuake-19.12.3.tar.xz";
+      sha256 = "0e4f16eaf155750b0c35f1f8f1a625909f386f3359b9f23bf4e7c2f9045384e3";
+      name = "yakuake-19.12.3.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "19.12.1";
+    version = "19.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/19.12.1/src/zeroconf-ioslave-19.12.1.tar.xz";
-      sha256 = "39641a186de9d0704a58063a8a37cfb3a405ff6bd9957c7d09efec3bec4dfc60";
-      name = "zeroconf-ioslave-19.12.1.tar.xz";
+      url = "${mirror}/stable/release-service/19.12.3/src/zeroconf-ioslave-19.12.3.tar.xz";
+      sha256 = "c9b2146030a9845b8164f5784d1c6fcc198b6cfe0e23f6a91edf78d093e4368f";
+      name = "zeroconf-ioslave-19.12.3.tar.xz";
     };
   };
 }

From 6c36c6e8aa62a15bf767ff12093acde391dad885 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@gra.red>
Date: Wed, 1 Apr 2020 00:30:56 +0300
Subject: [PATCH 4552/4636] sd: 0.6.5 -> 0.7.2

---
 pkgs/tools/text/sd/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix
index 1b6e4d945d42..a12f07d6da61 100644
--- a/pkgs/tools/text/sd/default.nix
+++ b/pkgs/tools/text/sd/default.nix
@@ -3,16 +3,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sd";
-  version = "0.6.5";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
     owner = "chmln";
     repo = pname;
-    rev = version;
-    sha256 = "1vxljmd1vh245yhv095i3l44pk915zr2pix4v9r8pz2fynp2nnmj";
+    rev = "v${version}";
+    sha256 = "15siv3p22v7lj37b74pjsy360qx97d40q2xdzdg2srbi8svjgg27";
   };
 
-  cargoSha256 = "0n4c0snmjfyk3z2mbzpqgb6ggyv4nqszdda035g3rzpbavzx9xb5";
+  cargoSha256 = "1sa7ki7kyg98l2gcrdzk7182ghm1clyqljjb596mhzh48g8kddn5";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
 

From a88dc23280b60c4f4df311c174cc0dda6136cc1c Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Tue, 3 Mar 2020 04:44:35 +0000
Subject: [PATCH 4553/4636] quaternion: fix build with
 config.allowAliases=false

---
 .../networking/instant-messengers/quaternion/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index 757551c70740..ec6a497bde92 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -1,7 +1,7 @@
 { mkDerivation, stdenv, lib, fetchFromGitHub, cmake
 , qtbase, qtquickcontrols, qtkeychain, qtmultimedia, qttools
 , libqmatrixclient_0_5
-, gnome3
+, libsecret
 }:
 
 let
@@ -16,7 +16,7 @@ let
       inherit sha256;
     };
 
-    buildInputs = [ qtbase qtmultimedia qtquickcontrols qtkeychain library gnome3.libsecret ];
+    buildInputs = [ qtbase qtmultimedia qtquickcontrols qtkeychain library libsecret ];
 
     nativeBuildInputs = [ cmake qttools ];
 

From 0a7c10f701c27ee05e4fe274e7f004428ceed06f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 31 Mar 2020 17:54:12 -0400
Subject: [PATCH 4554/4636] setupcfg2nix: Bump to 2.0.1.

Fixes #83814
---
 pkgs/development/tools/setupcfg2nix/default.nix | 2 +-
 pkgs/development/tools/setupcfg2nix/info.nix    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/setupcfg2nix/default.nix b/pkgs/development/tools/setupcfg2nix/default.nix
index 5d1f015e8052..96aefe55a953 100644
--- a/pkgs/development/tools/setupcfg2nix/default.nix
+++ b/pkgs/development/tools/setupcfg2nix/default.nix
@@ -6,7 +6,7 @@ buildSetupcfg rec {
     owner = "target";
     repo = "setupcfg2nix";
     rev = info.version;
-    sha256 = "1zn9njpzwhwikrirgjlyz6ys3xr8gq61ry8blmnpscqvhsdhxcs6";
+    sha256 = "1rj227vxybwp9acwnpwg9np964b1qcw2av3qmx00isnrw5vcps8m";
   };
   application = true;
   meta = {
diff --git a/pkgs/development/tools/setupcfg2nix/info.nix b/pkgs/development/tools/setupcfg2nix/info.nix
index b0d5873ed63c..6b65632bf7d1 100644
--- a/pkgs/development/tools/setupcfg2nix/info.nix
+++ b/pkgs/development/tools/setupcfg2nix/info.nix
@@ -1,6 +1,6 @@
 {
   pname = ''setupcfg2nix'';
-  version = ''1.1.0'';
+  version = ''2.0.1'';
   install_requires = [
     ''setuptools''
   ];

From 68a50aaaa52db6e8f1efb801da4f361486ae1904 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 1 Apr 2020 08:37:03 +1000
Subject: [PATCH 4555/4636] gitAndTools.gh: 0.6.2 -> 0.6.3

https://github.com/cli/cli/releases/tag/v0.6.3
---
 .../version-management/git-and-tools/gh/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix
index e74bd78fc59b..25aea20a58df 100644
--- a/pkgs/applications/version-management/git-and-tools/gh/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "gh";
-  version = "0.6.2";
+  version = "0.6.3";
 
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "10vylfsc8lldmr1l6r882sx87pgxl687k419c19faq90vd403i14";
+    sha256 = "0h9ayz903hyc5k7fs278rbi2x5pzilwpk30fkc8cclbbcsfnk4ka";
   };
 
-  modSha256 = "03m193ny5z77yy586cwh099ypi1lmhb5vdj7d4kphxycnvpndr66";
+  modSha256 = "102v30wr9wmd6n20qdvgs5mp2s639pwbqqd71r8q52f42p694bi1";
 
   buildFlagsArray = [
     "-ldflags=-X github.com/cli/cli/command.Version=${version}"

From 8ecb0108d63d8eb143cbb0a8c38782d37dda92aa Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 1 Apr 2020 08:40:58 +1000
Subject: [PATCH 4556/4636] croc: 8.0.4 -> 8.0.5

https://github.com/schollz/croc/releases/tag/v8.0.5
---
 pkgs/tools/networking/croc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix
index 0412020518e5..20c9fe714511 100644
--- a/pkgs/tools/networking/croc/default.nix
+++ b/pkgs/tools/networking/croc/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "croc";
-  version = "8.0.4";
+  version = "8.0.5";
 
   src = fetchFromGitHub {
     owner = "schollz";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0dc6h102jr5dkg6r3xxma51g702dnyd3d6s5rilwv1fivxn3bj43";
+    sha256 = "1qc7na1c0c5i2r19vg54ggvcmnkyz024hqlbzgix2v5n6wlpk0fc";
   };
 
-  modSha256 = "0ng4x9zmwax2vskbcadra4pdkgy1p1prmgkg1bjmh3b8rwsrhr0q";
+  modSha256 = "1y6qfb71vaard2l9fv83alprwpvii0pbzl8b3damd4j9x158hk7b";
 
   subPackages = [ "." ];
 

From d0de1e518d0e96ba64886895ae58db6c24e58160 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 31 Mar 2020 18:18:18 -0500
Subject: [PATCH 4557/4636] nushell: 0.11.0 -> 0.12.0

---
 pkgs/shells/nushell/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index 9f3f0da75c9e..43e0d2cb56a0 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -15,16 +15,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nushell";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "06w1118cxr5x3l7cq2wc092xvsfkgga8b6kz1gcmhwq0gf7fqirz";
+    sha256 = "0cy3rm0yr4ay4hcgw202w5k1sqw09kd75a0yyk0s0v0cxpmssf5n";
   };
 
-  cargoSha256 = "1bpb4p4j7lwb70qjsssbr878mfalil4xh8r954aaa2rlcf97fmb7";
+  cargoSha256 = "0q89841jwbsvl4c90sl8wgnjjl8q0bb3kw7sl7k9dpnfmj5j144x";
 
   nativeBuildInputs = [ pkg-config ]
     ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ];

From 06b05163f4e1583f18212c8b3f300a885cc209ce Mon Sep 17 00:00:00 2001
From: Lily Ballard <lilyball@twitch.tv>
Date: Tue, 31 Mar 2020 16:55:23 -0700
Subject: [PATCH 4558/4636] ffsend: 0.2.58 -> 0.2.59

---
 pkgs/tools/misc/ffsend/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix
index 38619f537151..7a8e56a4d6aa 100644
--- a/pkgs/tools/misc/ffsend/default.nix
+++ b/pkgs/tools/misc/ffsend/default.nix
@@ -16,16 +16,16 @@ with rustPlatform;
 
 buildRustPackage rec {
   pname = "ffsend";
-  version = "0.2.58";
+  version = "0.2.59";
 
   src = fetchFromGitLab {
     owner = "timvisee";
     repo = "ffsend";
     rev = "v${version}";
-    sha256 = "0yqigqh5vldzmp7wc1mxi5a4bxzm81xycx5h0ghak74vbjibps49";
+    sha256 = "14a7mb1a1s74hi124v4jscc72m09zq2bd8xrhq5agz9z27plqm2c";
   };
 
-  cargoSha256 = "0m2931fmc8jczjpb08077cpz9klhhf3aq15j2h76sb254qndagzy";
+  cargoSha256 = "1945s3ajpy55fzh5wbl7fchqck0fh69shl18lxni9hvg04smq39i";
 
   nativeBuildInputs = [ cmake pkgconfig installShellFiles ];
   buildInputs = [ openssl ]

From 9b5a325e0330991afd05476efb24253223aa0cb4 Mon Sep 17 00:00:00 2001
From: Thomas Marchand <thomas.marchand@tuta.io>
Date: Wed, 1 Apr 2020 03:25:28 +0200
Subject: [PATCH 4559/4636] maintainers: Add Th0rgal (#83899)

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 351ce32e936c..81dd8e981e0b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7336,6 +7336,12 @@
     githubId = 378734;
     name = "TG ⊗ Θ";
   };
+  th0rgal = {
+    email = "thomas.marchand@tuta.io";
+    github = "Th0rgal";
+    githubId = 41830259;
+    name = "Thomas Marchand";
+  };
   thall = {
     email = "niclas.thall@gmail.com";
     github = "thall";

From 14565eb2b32d375c62ceccfc0c8d5e5e7a18da92 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 1 Apr 2020 00:24:08 -0400
Subject: [PATCH 4560/4636] lollypop: 1.2.23 -> 1.2.32

---
 pkgs/applications/audio/lollypop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix
index ddb4646ba54d..d0f88170980a 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -23,7 +23,7 @@
 
 python3.pkgs.buildPythonApplication rec  {
   pname = "lollypop";
-  version = "1.2.23";
+  version = "1.2.32";
 
   format = "other";
   doCheck = false;
@@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec  {
     url = "https://gitlab.gnome.org/World/lollypop";
     rev = "refs/tags/${version}";
     fetchSubmodules = true;
-    sha256 = "059z7ri5qwkmfh2kvv8rq5wp80mz75423wc5hnm33wb9sgdd5x47";
+    sha256 = "03x6qihd349pq5lmgahb77sys60g16v5v6qkdlzf8k88451k8p7n";
   };
 
   nativeBuildInputs = [

From 0bb661d512329235ca6102f123d04a8cf0d48629 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 1 Apr 2020 00:35:01 -0400
Subject: [PATCH 4561/4636] vscode: Don't hardcode icon

This also allows people to use a vscode
icon that is shipped with their theme. (provided it is called code)

Fixes #83846
---
 pkgs/applications/editors/vscode/generic.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index a573c518b5d6..abd4a55c92b8 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -25,7 +25,7 @@ in
       comment = "Code Editing. Redefined.";
       genericName = "Text Editor";
       exec = executableName;
-      icon = "@out@/share/pixmaps/code.png";
+      icon = "code";
       startupNotify = "true";
       categories = "Utility;TextEditor;Development;IDE;";
       mimeType = "text/plain;inode/directory;";
@@ -37,7 +37,7 @@ in
         [Desktop Action new-empty-window]
         Name=New Empty Window
         Exec=${executableName} --new-window %F
-        Icon=@out@/share/pixmaps/code.png
+        Icon=code
       '';
     };
 
@@ -47,7 +47,7 @@ in
       comment = "Code Editing. Redefined.";
       genericName = "Text Editor";
       exec = executableName + " --open-url %U";
-      icon = "@out@/share/pixmaps/code.png";
+      icon = "code";
       startupNotify = "true";
       categories = "Utility;TextEditor;Development;IDE;";
       mimeType = "x-scheme-handler/vscode;";
@@ -83,10 +83,8 @@ in
         ln -s $out/lib/vscode/bin/${executableName} $out/bin
 
         mkdir -p $out/share/applications
-        substitute $desktopItem/share/applications/${executableName}.desktop $out/share/applications/${executableName}.desktop \
-          --subst-var out
-        substitute $urlHandlerDesktopItem/share/applications/${executableName}-url-handler.desktop $out/share/applications/${executableName}-url-handler.desktop \
-          --subst-var out
+        ln -s $desktopItem/share/applications/${executableName}.desktop $out/share/applications/${executableName}.desktop
+        ln -s $urlHandlerDesktopItem/share/applications/${executableName}-url-handler.desktop $out/share/applications/${executableName}-url-handler.desktop
 
         mkdir -p $out/share/pixmaps
         cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png

From c9fd76de7512adab77ba7af6b40ac4fd1b715262 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 1 Apr 2020 00:36:58 -0400
Subject: [PATCH 4562/4636] vscode: add backports notice

---
 pkgs/applications/editors/vscode/vscode.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 967cd45946fe..306bb115ef43 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -19,6 +19,8 @@ in
     # The update script doesn't correctly change the hash for darwin, so please:
     # nixpkgs-update: no auto update
 
+    # Please backport all compatible updates to the stable release.
+    # This is important for the extension ecosystem.
     version = "1.43.0";
     pname = "vscode";
 

From f9fc1d3be463f902d66d044b3ce543d0813412d6 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 1 Apr 2020 00:37:10 -0400
Subject: [PATCH 4563/4636] vscodium: add backports notice

---
 pkgs/applications/editors/vscode/vscodium.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index bffe73ec4f6b..ae40a0187def 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -25,6 +25,8 @@ in
     # The update script doesn't correctly change the hash for darwin, so please:
     # nixpkgs-update: no auto update
 
+    # Please backport all compatible updates to the stable release.
+    # This is important for the extension ecosystem.
     version = "1.43.0";
     pname = "vscodium";
 

From 35fcdb51912254373a98265c8932f18a5fb38e78 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 1 Apr 2020 01:07:50 -0400
Subject: [PATCH 4564/4636] elementary-planner: 2.1.1 -> 2.2.14

---
 .../office/elementary-planner/default.nix     | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix
index abc227e9e394..def44b40e809 100644
--- a/pkgs/applications/office/elementary-planner/default.nix
+++ b/pkgs/applications/office/elementary-planner/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-planner";
-  version = "2.1.1";
+  version = "2.2.14";
 
   src = fetchFromGitHub {
     owner = "alainm23";
     repo = "planner";
     rev = version;
-    sha256 = "0swj94pqf00wwzsgjap8z19k33gg1wj2b78ba1aj9h791j8lmaim";
+    sha256 = "14k5kiknr0d3my17p4v20iiqzifpz3y80gdzj8vdxic8yk2yr1ap";
   };
 
   nativeBuildInputs = [
@@ -36,24 +36,16 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     evolution-data-server
-    libical
-    libgee
-    json-glib
     glib
-    sqlite
-    libsoup
     gtk3
-    pantheon.granite
-    webkitgtk
+    json-glib
+    libgee
+    libical
+    libsoup
     pantheon.elementary-icon-theme
-  ];
-
-  # Fix version string, remove in next update!
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/alainm23/planner/pull/194/commits/3d0a2197087b13fe90fa6f85f817ba56798d632c.patch";
-      sha256 = "077q5jddi8jaw2ypc6szbd1c50i4x3b21jvmvi3w7g5zhjwpkmf5";
-    })
+    pantheon.granite
+    sqlite
+    webkitgtk
   ];
 
   postPatch = ''

From f8a78afd5c65a1919bd92754761e3470cf02194c Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 1 Apr 2020 01:30:11 -0400
Subject: [PATCH 4565/4636] nixos/geoclue2: set location.provider to geoclue2

---
 nixos/modules/services/desktops/geoclue2.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix
index 542b2ead4104..e2ce399896fb 100644
--- a/nixos/modules/services/desktops/geoclue2.nix
+++ b/nixos/modules/services/desktops/geoclue2.nix
@@ -182,6 +182,8 @@ in
   ###### implementation
   config = mkIf cfg.enable {
 
+    location.provider = "geoclue2";
+
     environment.systemPackages = [ package ];
 
     services.dbus.packages = [ package ];

From 0ea686647faf81ff224bdfa782856290069dda4e Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 23 Mar 2020 17:21:05 -0400
Subject: [PATCH 4566/4636] qgnomeplatform: hardcode gsettings schemas

Fixes #81866
---
 .../libraries/qgnomeplatform/default.nix      | 23 +++++++++++++++++-
 .../qgnomeplatform/hardcode-gsettings.patch   | 24 +++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/qgnomeplatform/hardcode-gsettings.patch

diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix
index 3626e15cfc75..93b9b9634de3 100644
--- a/pkgs/development/libraries/qgnomeplatform/default.nix
+++ b/pkgs/development/libraries/qgnomeplatform/default.nix
@@ -1,4 +1,16 @@
-{ mkDerivation, lib, fetchFromGitHub, pkgconfig, gtk3, qtbase, qmake, qtx11extras, pantheon }:
+{ mkDerivation
+, lib
+, fetchFromGitHub
+, pkgconfig
+, gtk3
+, glib
+, qtbase
+, qmake
+, qtx11extras
+, pantheon
+, substituteAll
+, gsettings-desktop-schemas
+}:
 
 mkDerivation rec {
   pname = "qgnomeplatform";
@@ -11,12 +23,21 @@ mkDerivation rec {
     sha256 = "0fb1mzs6sx76bl7f0z2xhc0jq6y1c55jrw1v3na8577is6g5ji0a";
   };
 
+  patches = [
+    # Hardcode GSettings schema path to avoid crashes from missing schemas
+    (substituteAll {
+      src = ./hardcode-gsettings.patch;
+      gds_gsettings_path = glib.getSchemaPath gsettings-desktop-schemas;
+    })
+  ];
+
   nativeBuildInputs = [
     pkgconfig
     qmake
   ];
 
   buildInputs = [
+    glib
     gtk3
     qtbase
     qtx11extras
diff --git a/pkgs/development/libraries/qgnomeplatform/hardcode-gsettings.patch b/pkgs/development/libraries/qgnomeplatform/hardcode-gsettings.patch
new file mode 100644
index 000000000000..9b342d7cf832
--- /dev/null
+++ b/pkgs/development/libraries/qgnomeplatform/hardcode-gsettings.patch
@@ -0,0 +1,24 @@
+diff --git a/common/gnomehintssettings.cpp b/common/gnomehintssettings.cpp
+index 9860e57..40fa6ec 100644
+--- a/common/gnomehintssettings.cpp
++++ b/common/gnomehintssettings.cpp
+@@ -80,9 +80,17 @@ void gtkMessageHandler(const gchar *log_domain,
+ GnomeHintsSettings::GnomeHintsSettings()
+     : QObject(0)
+     , m_usePortal(checkUsePortalSupport())
+-    , m_gnomeDesktopSettings(g_settings_new("org.gnome.desktop.wm.preferences"))
+-    , m_settings(g_settings_new("org.gnome.desktop.interface"))
+ {
++    g_autoptr(GSettingsSchemaSource) schemaSource = nullptr;
++    g_autoptr(GSettingsSchema) gnomeDesktopSchema = nullptr;
++    g_autoptr(GSettingsSchema) settingsSchema = nullptr;
++
++    schemaSource = g_settings_schema_source_new_from_directory("@gds_gsettings_path@", g_settings_schema_source_get_default(), true, nullptr);
++    gnomeDesktopSchema = g_settings_schema_source_lookup(schemaSource, "org.gnome.desktop.wm.preferences", false);
++    m_gnomeDesktopSettings = g_settings_new_full(gnomeDesktopSchema, nullptr, nullptr);
++    settingsSchema = g_settings_schema_source_lookup(schemaSource, "org.gnome.desktop.interface", false);
++    m_settings = g_settings_new_full(settingsSchema, nullptr, nullptr);
++
+     gtk_init(nullptr, nullptr);
+ 
+     // Set log handler to suppress false GtkDialog warnings

From 18fde5d57b3c4bce713b6a0f20cb166fa4b99fae Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 31 Mar 2020 07:22:38 +0000
Subject: [PATCH 4567/4636] jc: 1.9.2 -> 1.9.3

---
 pkgs/development/python-modules/jc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix
index 0c4d2062901d..9ade29bece1b 100644
--- a/pkgs/development/python-modules/jc/default.nix
+++ b/pkgs/development/python-modules/jc/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "jc";
-  version = "1.9.2";
+  version = "1.9.3";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1zn6skiv5nm7g8cs86n152ni79ck538bwdjynlh8n2k9dvfd5i8l";
+    sha256 = "1hg6h3ag4pbilpmqylnj7dflz7avk3w8ngmk6psfqrizizwx0hnj";
   };
 
   propagatedBuildInputs = [ ruamel_yaml ifconfig-parser xmltodict ];

From 74ad48e413631dac5b3972a223fa6faa8d2bbd49 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2020 04:59:09 +0000
Subject: [PATCH 4568/4636] snscrape: 0.3.0 -> 0.3.1

---
 pkgs/development/python-modules/snscrape/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/snscrape/default.nix b/pkgs/development/python-modules/snscrape/default.nix
index 18a7c2bb209f..9f0b805a19da 100644
--- a/pkgs/development/python-modules/snscrape/default.nix
+++ b/pkgs/development/python-modules/snscrape/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "snscrape";
-  version = "0.3.0";
+  version = "0.3.1";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1f3lyq06l8s4kcsmwbxcwcxnv6mvz9c3zj70np8vnx149p3zi983";
+    sha256 = "11jv5mv3l11qjlsjihd74gc1jafq0i7360cksqjkx1wv2hcc32rf";
   };
 
   # There are no tests; make sure the executable works.
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ setuptools requests lxml beautifulsoup4 ];
 
   meta = with lib; {
-    homepage = https://github.com/JustAnotherArchivist/snscrape;
+    homepage = "https://github.com/JustAnotherArchivist/snscrape";
     description = "A social networking service scraper in Python";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ ivan ];

From 673b3cd92e041a58c1900cd9bee36dc06a5afa20 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2020 04:48:55 +0000
Subject: [PATCH 4569/4636] python27Packages.jsbeautifier: 1.10.2 -> 1.10.3

---
 pkgs/development/python-modules/jsbeautifier/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix
index 4c77a07da02e..b30d2ee7e0fd 100644
--- a/pkgs/development/python-modules/jsbeautifier/default.nix
+++ b/pkgs/development/python-modules/jsbeautifier/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonApplication rec {
   pname = "jsbeautifier";
-  version = "1.10.2";
+  version = "1.10.3";
 
   propagatedBuildInputs = [ six editorconfig ];
   checkInputs = [ pytest ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a5ce5195c0b54a68eb813649829143373823ca28caa4d7aa682442b87ebea1ce";
+    sha256 = "0aaxi56qm2wmccsdj4v1lc158625c2g6ikqq950yv43i0pyyi3lp";
   };
 
   meta = with lib; {

From be3121ab5c4a7810dd63bfad758bbb67d69fc31d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2020 05:41:45 +0000
Subject: [PATCH 4570/4636] python27Packages.mypy-protobuf: 1.16 -> 1.20

---
 pkgs/development/python-modules/mypy-protobuf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix
index 954e913c9cf0..5cc192313acd 100644
--- a/pkgs/development/python-modules/mypy-protobuf/default.nix
+++ b/pkgs/development/python-modules/mypy-protobuf/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonApplication rec {
   pname = "mypy-protobuf";
-  version = "1.16";
+  version = "1.20";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "72ab724299aebd930b88476f6545587bff5bf480697c016097bd188841a56276";
+    sha256 = "03j2i9vhpdxbvwlqg6zghlzzq46s1x2jbx20fwninb6kss0ps3rg";
   };
 
   propagatedBuildInputs = [ protobuf ];

From 75a164ef4c1b01fb091ec5d52bc1c413d26b52e1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2020 05:38:58 +0000
Subject: [PATCH 4571/4636] python27Packages.sybil: 1.2.2 -> 1.3.0

---
 pkgs/development/python-modules/sybil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix
index cf30b4546cdc..358c70d34254 100644
--- a/pkgs/development/python-modules/sybil/default.nix
+++ b/pkgs/development/python-modules/sybil/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonApplication rec {
   pname = "sybil";
-  version = "1.2.2";
+  version = "1.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "dd84e68facfcb778298ef50a4d7446d4d9092e9d8596012b12bcb82858fd10e1";
+    sha256 = "0x34mzxvxj1kkld7sz9n90pdcinxcan56jg6cnnwkv87v7s1vna6";
   };
 
   checkInputs = [ pytest nose ];

From 88380453337205a65c220f68f8fed3ae1001d9f1 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 1 Apr 2020 02:13:09 -0400
Subject: [PATCH 4572/4636] nixos/contractor: delete file

It looks like I forgot to actually delete this file.
---
 nixos/modules/module-list.nix                  |  1 -
 .../services/desktops/pantheon/contractor.nix  | 18 ------------------
 2 files changed, 19 deletions(-)
 delete mode 100644 nixos/modules/services/desktops/pantheon/contractor.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 7633f1ca0ad5..59355aa666fc 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -295,7 +295,6 @@
   ./services/desktops/deepin/deepin.nix
   ./services/desktops/dleyna-renderer.nix
   ./services/desktops/dleyna-server.nix
-  ./services/desktops/pantheon/contractor.nix
   ./services/desktops/pantheon/files.nix
   ./services/desktops/flatpak.nix
   ./services/desktops/geoclue2.nix
diff --git a/nixos/modules/services/desktops/pantheon/contractor.nix b/nixos/modules/services/desktops/pantheon/contractor.nix
deleted file mode 100644
index c76145191a70..000000000000
--- a/nixos/modules/services/desktops/pantheon/contractor.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# Contractor
-
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-{
-
-
-  ###### implementation
-
-  config = mkIf config.services.pantheon.contractor.enable {
-
-    
-
-  };
-
-}

From 839083895c5e4e97ee6f56cf3d62d7ea0374d4de Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 1 Apr 2020 12:45:45 +1000
Subject: [PATCH 4573/4636] kepubify: 3.1.0 -> 3.1.1

https://github.com/geek1011/kepubify/releases/tag/v3.1.1
---
 pkgs/tools/misc/kepubify/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix
index 207492a89449..3b506270edad 100644
--- a/pkgs/tools/misc/kepubify/default.nix
+++ b/pkgs/tools/misc/kepubify/default.nix
@@ -2,20 +2,20 @@
 
 buildGoModule rec {
   pname = "kepubify";
-  version = "3.1.0";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "geek1011";
     repo = pname;
     rev = "v${version}";
-    sha256 = "17zhfq1nfdas4k5yzyr82zs3r3mm4n8f907ih1ckx081hy4g7a2p";
+    sha256 = "13vl8jn1kp0v84963kcl8j98gmm5a1i16ccd9i19in968875w4wl";
   };
 
-  modSha256 = "18q9ywsjc2v1bsmw7307dpd4v5m7v80hbhijkfrkcyqzj34jrq43";
+  modSha256 = "0jz8v4rnwm5zbxxp49kv96wm4lack6prwyhcrqwsrm79dr9yjcxf";
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 
-  subPackages = [ "." "covergen" "seriesmeta" ];
+  excludedPackages = [ "kobotest" ];
 
   meta = with lib; {
     description = "EPUB to KEPUB converter";

From 926b31c244b86fe079f7fe443fb7be723521b5dc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2020 07:33:38 +0000
Subject: [PATCH 4574/4636] act: 0.2.6 -> 0.2.7

---
 pkgs/development/tools/misc/act/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix
index de1cf939e6ae..885cef99111c 100644
--- a/pkgs/development/tools/misc/act/default.nix
+++ b/pkgs/development/tools/misc/act/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "act";
-  version = "0.2.6";
+  version = "0.2.7";
 
   src = fetchFromGitHub {
     owner = "nektos";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0l7id483006mnii4rlcff4p0ricd8a2n24sf74a9b387x0akpbsn";
+    sha256 = "0qx3vwsynmil1h3d2dzvqz0jzshfyy3vin14zjfmd353d915hf06";
   };
 
-  modSha256 = "04s4p9j6j7gw1s4v271zwzvdny7dvjaazd2pihmyjfik95xmwx9r";
+  modSha256 = "0276dngh29kzgm95d23r8ajjrrkss0v0f0wfq1ribgsxh17v0y5n";
 
   buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
 

From 3459038852983b1aa909d3c983b4859e9217f0c0 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 1 Apr 2020 00:08:12 -0700
Subject: [PATCH 4575/4636] Revert "nixos/geoclue2: set location.provider to
 geoclue2"

This reverts commit f8a78afd5c65a1919bd92754761e3470cf02194c.
---
 nixos/modules/services/desktops/geoclue2.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix
index e2ce399896fb..542b2ead4104 100644
--- a/nixos/modules/services/desktops/geoclue2.nix
+++ b/nixos/modules/services/desktops/geoclue2.nix
@@ -182,8 +182,6 @@ in
   ###### implementation
   config = mkIf cfg.enable {
 
-    location.provider = "geoclue2";
-
     environment.systemPackages = [ package ];
 
     services.dbus.packages = [ package ];

From 8ad3449e2b1175aeb2209460b61c08dcd25c1465 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2020 08:26:55 +0000
Subject: [PATCH 4576/4636] bitwarden: 1.17.0 -> 1.17.2

---
 pkgs/tools/security/bitwarden/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix
index 71f39eaf2ee9..f2abc376cd27 100644
--- a/pkgs/tools/security/bitwarden/default.nix
+++ b/pkgs/tools/security/bitwarden/default.nix
@@ -16,11 +16,11 @@ let
   pname = "bitwarden";
 
   version = {
-    x86_64-linux = "1.17.0";
+    x86_64-linux = "1.17.2";
   }.${system} or "";
 
   sha256 = {
-    x86_64-linux = "01azgz1wka32z2jjdnbdyzm8fbrb34ifwirmjbvfw37yia28sd72";
+    x86_64-linux = "0v7lrwj3sdypnqayknwg0cg9c2gfsxbjic5wswkfxljy652x8izx";
   }.${system} or "";
 
   meta = with stdenv.lib; {

From 25507443ec53611f361502c7b30f0a5b74e74196 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2020 09:02:12 +0000
Subject: [PATCH 4577/4636] broot: 0.13.4 -> 0.13.5b

---
 pkgs/tools/misc/broot/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix
index b7e2fb00a140..5d31570aacd5 100644
--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "broot";
-  version = "0.13.4";
+  version = "0.13.5b";
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0xd7vsybv6w5llvb85g6bx6r33lr0ki077rwzdvwb9c8w64fvs2h";
+    sha256 = "0gcv9w79r9q3rzrdqiq9xgh68ya653sq84vzgf0fb154zmzjkxfv";
   };
 
-  cargoSha256 = "16qad0m2vygwrbz40ww0mb0ba5wn2wna1n78bc8nxh60x0qiigi9";
+  cargoSha256 = "0534jykfnqs1gfnmijkpcf91ddpbggw7p25h4arci14lgd2wrmgd";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 7b07a07e3773d760e3af7df2644c98d2e87967de Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2020 09:21:57 +0000
Subject: [PATCH 4578/4636] cargo-expand: 0.4.18 -> 0.4.19

---
 pkgs/development/tools/rust/cargo-expand/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix
index 7ffb77f741bf..73dcb96201ed 100644
--- a/pkgs/development/tools/rust/cargo-expand/default.nix
+++ b/pkgs/development/tools/rust/cargo-expand/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-expand";
-  version = "0.4.18";
+  version = "0.4.19";
 
   src = fetchFromGitHub {
     owner = "dtolnay";
     repo = pname;
     rev = version;
-    sha256 = "1dhrzfy1ii2vg8psvz9rrgk0blj5bl64ghr0z44vh5y0kxn9v62p";
+    sha256 = "15izqd6nbpxjjymdmcpzjmaiygs1vdrpg9cw1nzmrkb8fc4h5ch5";
   };
 
-  cargoSha256 = "13ib0binyw1rzxjg59ly3ahyr53wdq3z7wfp11gd61kzwz34gs9d";
+  cargoSha256 = "0sbpymxhhwxg13w9821b17nda6p3ycqr81i7bj4fxil0n3sb910h";
 
   buildInputs = [ llvmPackages.libclang ]
     ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;

From 3330eefeff3ec8fb0fecb92b9189bec8ea4691da Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2020 09:36:09 +0000
Subject: [PATCH 4579/4636] checkstyle: 8.30 -> 8.31

---
 pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 8649c05d73b9..539c2f7d1910 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  version = "8.30";
+  version = "8.31";
   pname = "checkstyle";
 
   src = fetchurl {
     url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
-    sha256 = "1wsgpfdqasfz6chhy0w5pdjm4by6ih2g0l44lxwks9kik2lrs4av";
+    sha256 = "03dn07lissr2dkhi44wlkrbsby4zfvwai8gykc3xjgs46jy05rf8";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 5fabf11c4868e370f52a4461fc1cc05868f7f7b3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2020 09:39:13 +0000
Subject: [PATCH 4580/4636] chezmoi: 1.7.16 -> 1.7.18

---
 pkgs/tools/misc/chezmoi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix
index b2fb6925abac..38dbd5780254 100644
--- a/pkgs/tools/misc/chezmoi/default.nix
+++ b/pkgs/tools/misc/chezmoi/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "chezmoi";
-  version = "1.7.16";
+  version = "1.7.18";
 
   src = fetchFromGitHub {
     owner = "twpayne";
     repo = "chezmoi";
     rev = "v${version}";
-    sha256 = "1fkjdpqal0yzm58l146pf5xpbhij9iq79933i9a77v2jihdbjn52";
+    sha256 = "12gx78cbs7abizlqhs7y2w6lwlk5d1hhvixj0ki8d1d5vdr747bc";
   };
 
-  modSha256 = "0gh314d3mspqmz2z3m05bgsp62mrhb48m4mwhfy5h62fs7aqymr8";
+  modSha256 = "15b3hik3nzb7xnd6806dqdb36v7z2a0wmvxbrfwvnbigd8zd2y0j";
 
   buildFlagsArray = [
     "-ldflags=-s -w -X github.com/twpayne/chezmoi/cmd.VersionStr=${version}"

From 30940292918d1fc94df029a0ee17ec2ebc4b626e Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Wed, 1 Apr 2020 12:41:27 +0300
Subject: [PATCH 4581/4636] gpxsee: 7.25 -> 7.27

---
 pkgs/applications/misc/gpxsee/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 907a198ee3d4..eeb76091aa8d 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "gpxsee";
-  version = "7.25";
+  version = "7.27";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     rev = version;
-    sha256 = "0lml3hz2zxljl9j5wnh7bn9bj8k9v3wf6bk3g77x9nnarsmw0fcx";
+    sha256 = "1yillax9npmz912c6qa6yijrqrbm1gaz2h69v2ab9fb127qv4anj";
   };
 
   nativeBuildInputs = [ qmake qttools ];

From 0f93c20c149ca6e78e34ce3b82d925c170e89007 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Wed, 1 Apr 2020 09:42:37 +0300
Subject: [PATCH 4582/4636] kdenlive: set run-time dep paths (fix #83885)

---
 pkgs/applications/kde/ffmpeg-path.patch | 25 +++++++++++++++++++++++++
 pkgs/applications/kde/kdenlive.nix      | 12 +++++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/ffmpeg-path.patch

diff --git a/pkgs/applications/kde/ffmpeg-path.patch b/pkgs/applications/kde/ffmpeg-path.patch
new file mode 100644
index 000000000000..a0cef882f596
--- /dev/null
+++ b/pkgs/applications/kde/ffmpeg-path.patch
@@ -0,0 +1,25 @@
+diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
+index 5edad5ae7..d35347a40 100644
+--- a/src/kdenlivesettings.kcfg
++++ b/src/kdenlivesettings.kcfg
+@@ -403,17 +403,17 @@
+ 
+     <entry name="ffmpegpath" type="Path">
+       <label>FFmpeg / Libav binary path.</label>
+-      <default></default>
++      <default>@ffmpeg@/bin/ffmpeg</default>
+     </entry>
+ 
+     <entry name="ffplaypath" type="Path">
+       <label>FFplay / avplay binary path.</label>
+-      <default></default>
++      <default>@ffmpeg@/bin/ffplay</default>
+     </entry>
+ 
+     <entry name="ffprobepath" type="Path">
+       <label>FFprobe / avprobe binary path.</label>
+-      <default></default>
++      <default>@ffmpeg@/bin/ffprobe</default>
+     </entry>
+ 
+     <entry name="mltthreads" type="Int">
diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
index b7c691e9594b..95496f90e043 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@@ -70,14 +70,24 @@ mkDerivation {
     kpurpose
     kdeclarative
   ];
-  patches = [ ./mlt-path.patch ];
+  # Both MLT and FFMpeg paths must be set or Kdenlive will complain that it
+  # doesn't find them. See:
+  # https://github.com/NixOS/nixpkgs/issues/83885
+  patches = [ ./mlt-path.patch ./ffmpeg-path.patch ];
   inherit mlt;
+  ffmpeg = ffmpeg-full;
   postPatch =
     # Module Qt5::Concurrent must be included in `find_package` before it is used.
     ''
       sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|'
       substituteAllInPlace src/kdenlivesettings.kcfg
     '';
+  # Frei0r path needs to be set too or Kdenlive will complain. See:
+  # https://github.com/NixOS/nixpkgs/issues/83885
+  # https://github.com/NixOS/nixpkgs/issues/29614#issuecomment-488849325
+  qtWrapperArgs = [
+    "--set FREI0R_PATH ${frei0r}/lib/frei0r-1"
+  ];
   meta = {
     license = with lib.licenses; [ gpl2Plus ];
   };

From d4f2f039c1566ef9ebc640bce0c760cc089c75fb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2020 09:52:22 +0000
Subject: [PATCH 4583/4636] clojure-lsp: 20200305T151710 -> 20200314T202821

---
 pkgs/development/tools/misc/clojure-lsp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix
index 4f8ae1a41498..6801d67130bc 100644
--- a/pkgs/development/tools/misc/clojure-lsp/default.nix
+++ b/pkgs/development/tools/misc/clojure-lsp/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "clojure-lsp";
-  version = "20200305T151710";
+  version = "20200314T202821";
 
   src = fetchurl {
     url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}";
-    sha256 = "0zi05skp36azv0b6spxdscal32cj5rc6g0d0gzfnsaavvxd128lg";
+    sha256 = "1phfy4cw8pdx2ylfqc4gkniawlz5qn1bih64cx0hsc5i8n0v6qjz";
   };
 
   dontUnpack = true;

From d3973ad4750b6b84418c135a030e67bddcca84d3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2020 09:58:14 +0000
Subject: [PATCH 4584/4636] cloudflare-wrangler: 1.8.1 -> 1.8.4

---
 pkgs/development/tools/cloudflare-wrangler/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/cloudflare-wrangler/default.nix b/pkgs/development/tools/cloudflare-wrangler/default.nix
index a13433e784b1..5a05b7ca7c0a 100644
--- a/pkgs/development/tools/cloudflare-wrangler/default.nix
+++ b/pkgs/development/tools/cloudflare-wrangler/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cloudflare-wrangler";
-  version = "1.8.1";
+  version = "1.8.4";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "wrangler";
     rev = "v${version}";
-    sha256 = "0lh06cnjddmy5h5xvbkg8f97vw2v0wr5fi7vrs3nnidiz7x4rsja";
+    sha256 = "1lllam0zgr26fbg04hnw1sy35grwrs4br8cx4r9vqjf113cyr80x";
   };
 
-  cargoSha256 = "1q7vilh0bynhdz5bbpig5ibaqvk2153n07gmc715qb80w92sjw7w";
+  cargoSha256 = "0yvnqp15iqv142vcgsmcad07r5nnp417c0iqa9qgyzn39ssgpn0r";
 
   nativeBuildInputs = [ pkg-config ];
 

From d6aee72a9e5ef0e7cada3d39efb3f82487225119 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2020 10:06:48 +0000
Subject: [PATCH 4585/4636] compcert: 3.6 -> 3.7

---
 pkgs/development/compilers/compcert/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index 3a6c5e9c2c7e..1665061125d6 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -12,13 +12,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "compcert";
-  version = "3.6";
+  version = "3.7";
 
   src = fetchFromGitHub {
     owner = "AbsInt";
     repo = "CompCert";
     rev = "v${version}";
-    sha256 = "1k9xhj7fgllhf7bn7rp3w6zfvs4clglnc4w39zp4678hrwvdcpha";
+    sha256 = "1h4zhk9rrqki193nxs9vjvya7nl9yxjcf07hfqb6g77riy1vd2jr";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 0c5bd1588ee1e13054da66f095a1ef7fc566b865 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2020 10:10:40 +0000
Subject: [PATCH 4586/4636] conftest: 0.18.0 -> 0.18.1

---
 pkgs/development/tools/conftest/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix
index 7ce2594d84f6..133526c569a0 100644
--- a/pkgs/development/tools/conftest/default.nix
+++ b/pkgs/development/tools/conftest/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "conftest";
-  version = "0.18.0";
+  version = "0.18.1";
 
   src = fetchFromGitHub {
     owner = "instrumenta";
     repo = "conftest";
     rev = "v${version}";
-    sha256 = "189as930fksyqk3z636gyqdym1bqm522mya7msfnhzpnh46k5jvd";
+    sha256 = "0ial1zs5aqcwza813ny6zqn9ybq6ibrqjmaccwbbam1k9f5rplqv";
   };
 
-  modSha256 = "0gm08lrlaxc7504mapjdm3c4mwlzybnqxfwkkh6fawzvmd9sqddr";
+  modSha256 = "17j5fhgwfpyg9r7a5g9rmvkaz510xx9s4mbl1cmyzysvddc6f5wp";
 
   buildFlagsArray = ''
     -ldflags=

From 8866b7d72f2191b138506f7177691a4cdfb92d08 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2020 10:17:44 +0000
Subject: [PATCH 4587/4636] coredns: 1.6.7 -> 1.6.9

---
 pkgs/servers/dns/coredns/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix
index 017842f39dc1..cbf29b5d7c75 100644
--- a/pkgs/servers/dns/coredns/default.nix
+++ b/pkgs/servers/dns/coredns/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "coredns";
-  version = "1.6.7";
+  version = "1.6.9";
 
   goPackagePath = "github.com/coredns/coredns";
 
@@ -10,10 +10,10 @@ buildGoModule rec {
     owner = "coredns";
     repo = "coredns";
     rev = "v${version}";
-    sha256 = "05r0dm8h23s5dafxisya48izc2ywpn5ywvhf9q6m20qkpwr8gd10";
+    sha256 = "18c02ss0sxxg8lkhdmyaac2x5alfxsizf6jqhck8bqkf6hiyv5hc";
   };
 
-  modSha256 = "0wlffk6wkcyn2lphw2vmdsmzag0wxljcxrvm7sv3i124x2x3yvy4";
+  modSha256 = "07mlprwa37s6qpg5wvpljbvkiqcvrcljr27qsdwz49wldhdp6im6";
 
   meta = with stdenv.lib; {
     homepage = "https://coredns.io";

From 0f70340b798cc0d04c4514be4e2879ef5215337d Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 1 Apr 2020 12:01:50 +0200
Subject: [PATCH 4588/4636] android-studio: 3.6.1.0 -> 3.6.2.0

---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 9a476ada2142..b10ef9513daa 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -8,9 +8,9 @@ let
     inherit (gnome2) GConf gnome_vfs;
   };
   stableVersion = {
-    version = "3.6.1.0"; # "Android Studio 3.6.1"
-    build = "192.6241897";
-    sha256Hash = "1mwzk18224bl8hbw9cdxwzgj5cfain4y70q64cpj4p0snffxqm77";
+    version = "3.6.2.0"; # "Android Studio 3.6.2"
+    build = "192.6308749";
+    sha256Hash = "04r4iwlmns1lf3wfd32cqmndbdz9rf7hfbi5r6qmvpi8j83fghvr";
   };
   betaVersion = {
     version = "4.0.0.12"; # "Android Studio 4.0 Beta 3"

From ff6a64c5bc2ec1b6f8b1315f13342c5e68359643 Mon Sep 17 00:00:00 2001
From: Marek Mahut <marek.mahut@gmail.com>
Date: Wed, 1 Apr 2020 12:42:12 +0200
Subject: [PATCH 4589/4636] python3Packages.trezor: 0.11.6 -> 0.12.0

---
 pkgs/development/python-modules/trezor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix
index 2d40ad971dbe..e7bec00863ae 100644
--- a/pkgs/development/python-modules/trezor/default.nix
+++ b/pkgs/development/python-modules/trezor/default.nix
@@ -16,13 +16,13 @@
 
 buildPythonPackage rec {
   pname = "trezor";
-  version = "0.11.6";
+  version = "0.12.0";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1i73j812i0dgjw9n106pipc6qksd9cgs59d0as0b4j5iyl0087hh";
+    sha256 = "0ycmpwjv5xp25993divjhaq5j766zgcy22xx39xfc1pcvldq5g7n";
   };
 
   propagatedBuildInputs = [ typing-extensions protobuf hidapi ecdsa mnemonic requests pyblake2 click construct libusb1 rlp shamir-mnemonic trezor-udev-rules ];

From 183e6702e6c619e0e0f146fb5b2d15691e114a9c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2020 10:44:24 +0000
Subject: [PATCH 4590/4636] dnsproxy: 0.23.7 -> 0.24.0

---
 pkgs/tools/networking/dnsproxy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix
index 8296600cf3d3..6f57e9812397 100644
--- a/pkgs/tools/networking/dnsproxy/default.nix
+++ b/pkgs/tools/networking/dnsproxy/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "dnsproxy";
-  version = "0.23.7";
+  version = "0.24.0";
 
   src = fetchFromGitHub {
     owner = "AdguardTeam";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1sfl2nyzspqllbklc9wf62wqxs0k3ac7vzqz8kl5h9ch654g542a";
+    sha256 = "1jwy2qi99ks6zcas6h1n0zq3b0k47036ayas0mprdips60azw0hg";
   };
 
-  modSha256 = "0r5ybr4gpcdsldk12b0d4xiih6ckwnqkfwy89c97prv24v14zysv";
+  modSha256 = "0kba3jay6m9ir1pc7i833p7ylbs610g0lkp8kc3gm47xnxy7j4gz";
 
   meta = with stdenv.lib; {
     description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support";

From 5e37578dd94365236e5b82795eb92a6e6fc90f68 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 1 Apr 2020 13:05:37 +0200
Subject: [PATCH 4591/4636] .github/CODEOWNERS: remove myself from it

ofborg does a better job at assigning people
---
 .github/CODEOWNERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d84c6a595383..635395257929 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -82,8 +82,8 @@
 /pkgs/development/r-modules         @peti
 
 # Ruby
-/pkgs/development/interpreters/ruby @alyssais @zimbatm
-/pkgs/development/ruby-modules      @alyssais @zimbatm
+/pkgs/development/interpreters/ruby @alyssais
+/pkgs/development/ruby-modules      @alyssais
 
 # Rust
 /pkgs/development/compilers/rust @Mic92 @LnL7

From 4ebd2293691d6b6d0e2987d4846dc16ea02b914a Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 1 Apr 2020 13:15:45 +0200
Subject: [PATCH 4592/4636] google-compute-engine-oslogin: fix bash reference

This is the bash that is being called when logging into the VM. This
fixes prompt escaping issues and also restores tab completion to the
logged-in user.
---
 .../virtualization/google-compute-engine-oslogin/default.nix   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
index 0daa01f85bb3..04d222609a67 100644
--- a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
+++ b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
@@ -3,6 +3,7 @@
 , curl
 , json_c
 , pam
+, bashInteractive
 }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +23,7 @@ stdenv.mkDerivation rec {
     # change sudoers dir from /var/google-sudoers.d to /run/google-sudoers.d (managed through systemd-tmpfiles)
     substituteInPlace pam_module/pam_oslogin_admin.cc --replace /var/google-sudoers.d /run/google-sudoers.d
     # fix "User foo not allowed because shell /bin/bash does not exist"
-    substituteInPlace compat.h --replace /bin/bash ${stdenv.shell}
+    substituteInPlace compat.h --replace /bin/bash ${bashInteractive}/bin/bash
   '';
 
   buildInputs = [ curl.dev pam ];

From 59df62439802c1193b742d6f5f5c1388148887f2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2020 11:28:34 +0000
Subject: [PATCH 4593/4636] emplace: 0.2.12 -> 0.2.14

---
 pkgs/tools/package-management/emplace/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix
index 8845c54b5714..0017229e3b96 100644
--- a/pkgs/tools/package-management/emplace/default.nix
+++ b/pkgs/tools/package-management/emplace/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "emplace";
-  version = "0.2.12";
+  version = "0.2.14";
 
   src = fetchFromGitHub {
     owner = "tversteeg";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1jhv7c68ymwaq9fr586rjbgcaxpkxcr0d3pq7lyhbzihaywz7m6m";
+    sha256 = "0fkagz215clg7hikjqni8c9wqb3s0szyjr55f2w8zd6zpmvcs1n5";
   };
 
-  cargoSha256 = "1n4k8mnsix3sy6pmqkk7wymknn1mn5dkwa9i90nlb4k2h9y709wj";
+  cargoSha256 = "0fsrv2cak0zawg448jfbgzbaimn8pvw15xrb5x4733axlkg4g1ch";
 
   meta = with lib; {
     description = "Mirror installed software on multiple machines";

From 6da44bf95eddabec50bc513f7e8b9c8a1c4c39c7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2020 11:45:42 +0000
Subject: [PATCH 4594/4636] fly: 5.8.0 -> 6.0.0

---
 .../tools/continuous-integration/fly/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix
index e5454796b7e4..483b8e6b30c4 100644
--- a/pkgs/development/tools/continuous-integration/fly/default.nix
+++ b/pkgs/development/tools/continuous-integration/fly/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "fly";
-  version = "5.8.0";
+  version = "6.0.0";
 
   src = fetchFromGitHub {
     owner = "concourse";
     repo = "concourse";
     rev = "v${version}";
-    sha256 = "0ji3jya4b2b4l6dlvydh3k2jfh6kkhii23d6rmi49ypydhn1qmgj";
+    sha256 = "0chavwymyh5kv4fkvdjvf3p5jjx4yn9aavq66333xnsl5pn7q9dq";
   };
 
-  modSha256 = "14wwspp8x6i4ry23bz8b08mfyzrwc9m7clrylxzr8j67yhg5kw6v";
+  modSha256 = "1wiyfii4rmj3rp8ls0ill0sjpnpjz7l3q5fzrscm8ap1qn90gvzg";
 
   subPackages = [ "fly" ];
 

From 3b37ff146e2cd6f520c7b06fb8410e6ec87ec739 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2020 11:49:03 +0000
Subject: [PATCH 4595/4636] flyctl: 0.0.102 -> 0.0.110

---
 pkgs/development/web/flyctl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
index 85165d501d97..965a53dcdbda 100644
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.0.102";
+  version = "0.0.110";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    sha256 = "181j248i8j9g7kz5krg0bkbxkvmcwpz2vlknii5q3dy7yhgg19h3";
+    sha256 = "1fvvanyzrai41fq98msjwzgwsidxbaly6f6knma6lwmicv4f9svg";
   };
 
   preBuild = ''
@@ -20,7 +20,7 @@ buildGoModule rec {
     rm $out/bin/helpgen
   '';
 
-  modSha256 = "1mqkc7hnavvpbqar9f1d2vnm47p4car9abnk2ikyf27jr5glwmsd";
+  modSha256 = "0lnk2g5msqhhshh99s32sqd793rdlzmp7vhqdb1fd6qafrrrxm5w";
 
   meta = with lib; {
     description = "Command line tools for fly.io services";

From 1fc60492a077abd2b5641996c04fdbf0f9bcdbed Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2020 12:04:49 +0000
Subject: [PATCH 4596/4636] fwup: 1.5.1 -> 1.5.2

---
 pkgs/tools/misc/fwup/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix
index 99dcc194d011..bf6c125ac759 100644
--- a/pkgs/tools/misc/fwup/default.nix
+++ b/pkgs/tools/misc/fwup/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fwup";
-  version = "1.5.1";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
     owner = "fhunleth";
     repo = "fwup";
     rev = "v${version}";
-    sha256 = "08gscwdq7fwfpk3mf7dfdf64n5ijm5kjb7f5wrzzvpnnqz24xnb0";
+    sha256 = "05sjdlh450hk474a44yr6kz9dzx72jfxpi1krxbd0pdizlmfypsg";
   };
 
   doCheck = true;
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Configurable embedded Linux firmware update creator and runner";
-    homepage = https://github.com/fhunleth/fwup;
+    homepage = "https://github.com/fhunleth/fwup";
     license = licenses.asl20;
     maintainers = [ maintainers.georgewhewell ];
     platforms = platforms.all;

From f615df5c6e352e5a62879df401263947858e927e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 1 Apr 2020 13:07:51 +0100
Subject: [PATCH 4597/4636] clojure-lsp: fix java shebang

---
 pkgs/development/tools/misc/clojure-lsp/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix
index 6801d67130bc..42ebfc7f9af2 100644
--- a/pkgs/development/tools/misc/clojure-lsp/default.nix
+++ b/pkgs/development/tools/misc/clojure-lsp/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     install -Dm755 $src $out/bin/clojure-lsp
+    sed -i -e '1 s!java!${jre}/bin/java!' $out/bin/clojure-lsp
   '';
 
   meta = with stdenv.lib; {

From deb5e89c33658cc7ca6206120f4fb972b9e2b471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 1 Apr 2020 13:16:23 +0100
Subject: [PATCH 4598/4636] clojure-lsp: add smoke test

---
 pkgs/development/tools/misc/clojure-lsp/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix
index 42ebfc7f9af2..c12d0319386c 100644
--- a/pkgs/development/tools/misc/clojure-lsp/default.nix
+++ b/pkgs/development/tools/misc/clojure-lsp/default.nix
@@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
     sed -i -e '1 s!java!${jre}/bin/java!' $out/bin/clojure-lsp
   '';
 
+  # verify shebang patch
+  installCheckPhase = "PATH= clojure-lsp --version";
+
   meta = with stdenv.lib; {
     description = "Language Server Protocol (LSP) for Clojure";
     homepage = "https://github.com/snoe/clojure-lsp";

From dd24a2f2a00cd42c7b08ef6a83a4717fa21c4807 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 31 Mar 2020 04:20:00 -0500
Subject: [PATCH 4599/4636] ruby: update RVM patchsets

---
 pkgs/development/interpreters/ruby/rvm-patchsets.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix
index 883987683b0a..331dda5d0503 100644
--- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix
+++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix
@@ -3,6 +3,6 @@
 fetchFromGitHub {
   owner  = "skaes";
   repo   = "rvm-patchsets";
-  rev    = "58f72dccc8bb4dc9b1035f6af903d21f2465367a";
-  sha256 = "00gbrhvnf05g6zmfim472ld0l1lp100dy4pi3lixm6ry9iw9m4ag";
+  rev    = "6d8888d34a321198f7fd9253343b78c209efb046";
+  sha256 = "0xczl0nng1649km3bcbjn6zrr591l6m2kkwgnknh1fnwmmrdaya7";
 }

From 99b09d6b8f201379bb34f01a1acacdc1c3950c46 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 31 Mar 2020 04:21:00 -0500
Subject: [PATCH 4600/4636] ruby_2_5: 2.5.7 -> 2.5.8

Changelog: https://www.ruby-lang.org/en/news/2020/03/31/ruby-2-5-8-released/
---
 pkgs/development/interpreters/ruby/default.nix   | 6 +++---
 pkgs/development/interpreters/ruby/patchsets.nix | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 8ddd19bb40cc..d99c8445036d 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -224,10 +224,10 @@ let
 
 in {
   ruby_2_5 = generic {
-    version = rubyVersion "2" "5" "7" "";
+    version = rubyVersion "2" "5" "8" "";
     sha256 = {
-      src = "1m6nmnj9shifp8g3yh7aimac01vl035bzcc19x2spdji6ig0sb8b";
-      git = "0wppf82c9ccdbnvj30mppr5a3mc7sxm05diahjdw7hhk29n43knp";
+      src = "16md4jspjwixjlbhx3pnd5iwpca07p23ghkxkqd82sbchw3xy2vc";
+      git = "19gkk3q9l33cwkfsp5k8f8fipq7gkyqkqirm9farbvy425519rv2";
     };
   };
 
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index 4838a1a09e54..926f41fd85ad 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -6,7 +6,7 @@
     "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch"
   ];
-  "2.5.7" = ops useRailsExpress [
+  "2.5.8" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
     "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"

From b312ecf34e110d2d1fda3601c7b5a5a46a41dbfd Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 31 Mar 2020 04:22:00 -0500
Subject: [PATCH 4601/4636] ruby_2_6: 2.6.5 -> 2.6.6

Changelog: https://www.ruby-lang.org/en/news/2020/03/31/ruby-2-6-6-released/
---
 pkgs/development/interpreters/ruby/default.nix   | 6 +++---
 pkgs/development/interpreters/ruby/patchsets.nix | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index d99c8445036d..c64d72843f2e 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -232,10 +232,10 @@ in {
   };
 
   ruby_2_6 = generic {
-    version = rubyVersion "2" "6" "5" "";
+    version = rubyVersion "2" "6" "6" "";
     sha256 = {
-      src = "0zgdrgylq6avbblf78kpaf0k2xnkpc3jng3wkd7x67ycdrqnp5v6";
-      git = "0pay6ic22ag3bnvxffhgwp7z6clkd0p93944a1l4lvc5hxc8v77j";
+      src = "1492x795qzgp3zhpl580kd1sdp50n5hfsmpbfhdsq2rnxwyi8jrn";
+      git = "1jr9v99a7awssqmw7531afbx4a8i9x5yfqyffha545g7r4s7kj50";
     };
   };
 
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index 926f41fd85ad..5b97bdad36a2 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -11,7 +11,7 @@
     "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"
   ];
-  "2.6.5" = ops useRailsExpress [
+  "2.6.6" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
     "${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch"

From a7f1e9f1efbebd657a27d12ecd605a35ac4088d4 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 31 Mar 2020 04:23:00 -0500
Subject: [PATCH 4602/4636] ruby_2_7: 2.7.0 -> 2.7.1

Changelog: https://www.ruby-lang.org/en/news/2020/03/31/ruby-2-7-1-released/
---
 pkgs/development/interpreters/ruby/default.nix   | 6 +++---
 pkgs/development/interpreters/ruby/patchsets.nix | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index c64d72843f2e..da8d5ce20f47 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -240,10 +240,10 @@ in {
   };
 
   ruby_2_7 = generic {
-    version = rubyVersion "2" "7" "0" "";
+    version = rubyVersion "2" "7" "1" "";
     sha256 = {
-      src = "1glc3zpnih6h8mrgfcak0aa7cgmi4zyvxfyi6y2brwg2nn9sm6cc";
-      git = "11iz64k95czs273mb10195d1j75mmbcgddfdx1vay5876ffw81dq";
+      src = "0674x98f542y02r7n2yv2qhmh97blqhi2mvh2dn5f000vlxlh66l";
+      git = "0qk729kr5wm67xmwpljpdprwhp5wvn5y4ikqy00p1zcgwlwdcs33";
     };
   };
 }
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index 5b97bdad36a2..01e7e3946d6f 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -16,6 +16,9 @@
     "${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch"
   ];
-  "2.7.0" = ops useRailsExpress [ # no patches yet (2019-12-25)
+  "2.7.1" = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.7/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
+    "${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch"
   ];
 }

From 3ab49aac6419a855681e5e41125f1918a9b10bb0 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 31 Mar 2020 04:24:00 -0500
Subject: [PATCH 4603/4636] ruby: remove ruby_2_4 patchset

---
 pkgs/development/interpreters/ruby/patchsets.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index 01e7e3946d6f..b0c26e19e13b 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -1,11 +1,6 @@
 { patchSet, useRailsExpress, ops, patchLevel, fetchpatch }:
 
 {
-  "2.4.9" = ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch"
-  ];
   "2.5.8" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
     "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"

From ef8a2212546169f7d5ad4ba59b26b7e8e43d6dad Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2020 12:23:19 +0000
Subject: [PATCH 4604/4636] go-ethereum: 1.9.11 -> 1.9.12

---
 pkgs/applications/blockchains/go-ethereum.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix
index d8660967a4e0..980b485b9568 100644
--- a/pkgs/applications/blockchains/go-ethereum.nix
+++ b/pkgs/applications/blockchains/go-ethereum.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "go-ethereum";
-  version = "1.9.11";
+  version = "1.9.12";
 
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0xhkdxn5ajzi05252is5whqank81xy94jp1l5z2a44rajv8rh9vs";
+    sha256 = "143imiphyzk3009cfnqj7q013pb1wva13zq63byfj3d204b58cg6";
   };
 
-  modSha256 = "0jcj0knkhyndndyv1j9xhgbg5psagvyd27ailna3x9ikjlb8f7gg";
+  modSha256 = "15a8if5gx361nrqgv201jy8saq1ir1g18rpqzdmavg4ic75si5x1";
 
   subPackages = [
     "cmd/abigen"

From 606baf03ba204f7b205cb14c3e73d2f05aa22795 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 1 Apr 2020 14:52:34 +0200
Subject: [PATCH 4605/4636] tdesktop: 1.9.21 -> 2.0.1 (#83790)

* tdesktop: 1.9.21 -> 2.0.0
* tdesktop: 2.0.0 -> 2.0.1
---
 .../instant-messengers/telegram/tdesktop/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 3d4096667983..60fd95a14761 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -19,12 +19,12 @@ with lib;
 
 mkDerivation rec {
   pname = "telegram-desktop";
-  version = "1.9.21";
+  version = "2.0.1";
 
   # Telegram-Desktop with submodules
   src = fetchurl {
     url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
-    sha256 = "1b7z68q2sb2y203nf4p6lmz72zkpi5gyv9ypqi5h99bm2j6bbyg1";
+    sha256 = "0g3jw4can9gmp48s3b8s1w8n9xi54i142y74fszxf9jyq5drzlff";
   };
 
   postPatch = ''

From 596473df4a5019b8c4f0d0e051a65299ccee7036 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2020 12:52:51 +0000
Subject: [PATCH 4606/4636] helmfile: 0.102.0 -> 0.106.3

---
 pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
index ee7c4ab9cbdd..1318ff003de3 100644
--- a/pkgs/applications/networking/cluster/helmfile/default.nix
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -1,6 +1,6 @@
 { lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }:
 
-let version = "0.102.0"; in
+let version = "0.106.3"; in
 
 buildGoModule {
   pname = "helmfile";
@@ -10,12 +10,12 @@ buildGoModule {
     owner = "roboll";
     repo = "helmfile";
     rev = "v${version}";
-    sha256 = "0v7mhsnhswiqd62wrmkcpzsg9nfi6wvkh9danngs5rqjiz1zffhy";
+    sha256 = "0pwkkgdcj9vx6nk574iaqwn074qfpgqd1c44d3kr3xdbac89yfyf";
   };
 
   goPackagePath = "github.com/roboll/helmfile";
 
-  modSha256 = "0s7j7jbgr8gdc0s9dnl6zjwkpywqj05xyb7mkcank54kgrz0g5vq";
+  modSha256 = "1yv2b44qac0rms66v0qg13wsga0di6hwxa4dh2l0b1xvaf75ysay";
 
   nativeBuildInputs = [ makeWrapper ];
 

From e69e48a1e41059e5769537fc87751074794bf144 Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Fri, 27 Mar 2020 22:15:03 +0100
Subject: [PATCH 4607/4636] lib.licenses: Add Unicode License Agreement for
 Data Files and Software

---
 lib/licenses.nix                                      | 5 +++++
 pkgs/data/misc/cldr-emoji-annotation/default.nix      | 2 +-
 pkgs/data/misc/unicode-character-database/default.nix | 2 +-
 pkgs/data/misc/unicode-emoji/default.nix              | 2 +-
 pkgs/data/misc/unihan-database/default.nix            | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index e37eb57cff97..b63de0911bc5 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -682,6 +682,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
     # channel and NixOS images.
   };
 
+  unicode-dfs-2016 = spdx {
+    spdxId = "Unicode-DFS-2016";
+    fullName = "Unicode License Agreement - Data Files and Software (2016)";
+  };
+
   unlicense = spdx {
     spdxId = "Unlicense";
     fullName = "The Unlicense";
diff --git a/pkgs/data/misc/cldr-emoji-annotation/default.nix b/pkgs/data/misc/cldr-emoji-annotation/default.nix
index 4279cf8aec48..289f6d663406 100644
--- a/pkgs/data/misc/cldr-emoji-annotation/default.nix
+++ b/pkgs/data/misc/cldr-emoji-annotation/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Emoji annotation files in CLDR";
     homepage = "https://www.unicode.org/";
-    license = licenses.free; # https://www.unicode.org/license.html
+    license = licenses.unicode-dfs-2016;
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/data/misc/unicode-character-database/default.nix b/pkgs/data/misc/unicode-character-database/default.nix
index 1eda25fbe2b1..e52f21713ed8 100644
--- a/pkgs/data/misc/unicode-character-database/default.nix
+++ b/pkgs/data/misc/unicode-character-database/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Unicode Character Database";
     homepage = "https://www.unicode.org/";
-    license = licenses.free; # https://www.unicode.org/license.html
+    license = licenses.unicode-dfs-2016;
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/data/misc/unicode-emoji/default.nix b/pkgs/data/misc/unicode-emoji/default.nix
index 05472b26d88c..b7705d7ee5b4 100644
--- a/pkgs/data/misc/unicode-emoji/default.nix
+++ b/pkgs/data/misc/unicode-emoji/default.nix
@@ -53,7 +53,7 @@ symlinkJoin rec {
   meta = with stdenv.lib; {
     description = "Unicode Emoji Data Files";
     homepage = "https://home.unicode.org/emoji/";
-    license = licenses.free; # https://www.unicode.org/license.html
+    license = licenses.unicode-dfs-2016;
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/data/misc/unihan-database/default.nix b/pkgs/data/misc/unihan-database/default.nix
index 77da77242a92..d5d62403cc3d 100644
--- a/pkgs/data/misc/unihan-database/default.nix
+++ b/pkgs/data/misc/unihan-database/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Unicode Han Database";
     homepage = "https://www.unicode.org/";
-    license = licenses.free; # https://www.unicode.org/license.html
+    license = licenses.unicode-dfs-2016;
     platforms = platforms.all;
   };
 }

From 75922aa1e177d398782ba5c75fdd028f69c24795 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 27 Mar 2020 08:01:33 +0000
Subject: [PATCH 4608/4636] minijail: add myself as a maintainer

---
 pkgs/tools/system/minijail/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/system/minijail/default.nix b/pkgs/tools/system/minijail/default.nix
index 2b4d1deb9f9b..32858051caba 100644
--- a/pkgs/tools/system/minijail/default.nix
+++ b/pkgs/tools/system/minijail/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     homepage = https://android.googlesource.com/platform/external/minijail/;
     description = "Sandboxing library and application using Linux namespaces and capabilities";
     license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [pcarrier];
+    maintainers = with stdenv.lib.maintainers; [ pcarrier qyliss ];
     platforms = stdenv.lib.platforms.linux;
   };
 }

From 9225d95bdd9b8100d6c9cc738f0305933e1d1ccc Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 27 Mar 2020 08:43:04 +0000
Subject: [PATCH 4609/4636] minijail: android-10.0.0_r9 -> 14

Switched from the android-* tags to the linux-* ones, because Upstream
says "Releases are tagged as `linux-vXX`".
---
 pkgs/tools/system/minijail/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/system/minijail/default.nix b/pkgs/tools/system/minijail/default.nix
index 32858051caba..5c4c45fbca2c 100644
--- a/pkgs/tools/system/minijail/default.nix
+++ b/pkgs/tools/system/minijail/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "minijail";
-  version = "android-10.0.0_r9";
+  version = "14";
 
   src = fetchFromGitiles {
     url = "https://android.googlesource.com/platform/external/minijail";
-    rev = version;
-    sha256 = "0gcfsyim1krrddcklydqfxl8mamaxgail2xl5qp9yclq60km8f22";
+    rev = "linux-v${version}";
+    sha256 = "00dq854n4zg3ca2b46f90k15n32zn2sgabi76mnq2w985k9v977n";
   };
 
   buildInputs = [ libcap ];
@@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     substituteInPlace common.mk --replace /bin/echo echo
-    sed -i '/#include <asm\/siginfo.h>/ d' signal_handler.c
   '';
 
   postPatch = ''

From 2ed758481c1b9fdc06fb9fb41c4993c75cadd702 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 27 Mar 2020 07:11:12 +0000
Subject: [PATCH 4610/4636] minijail-tools: init at 14

This is built from the same source as minijail, but is for all intents
and purposes a seperate package.  It builds different things, with no
overlap, and is under a different license.
---
 pkgs/tools/system/minijail/tools.nix | 13 +++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/tools/system/minijail/tools.nix

diff --git a/pkgs/tools/system/minijail/tools.nix b/pkgs/tools/system/minijail/tools.nix
new file mode 100644
index 000000000000..875ea0dbff95
--- /dev/null
+++ b/pkgs/tools/system/minijail/tools.nix
@@ -0,0 +1,13 @@
+{ buildPythonApplication, lib, minijail }:
+
+buildPythonApplication {
+  pname = "minijail-tools";
+  inherit (minijail) version src;
+
+  meta = with lib; {
+    homepage = "https://android.googlesource.com/platform/external/minijail/+/refs/heads/master/tools/";
+    description = "A set of tools for minijail";
+    license = licenses.asl20;
+    inherit (minijail.meta) maintainers platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 76fa850309bd..d0b48046dbb7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5142,6 +5142,8 @@ in
 
   minijail = callPackage ../tools/system/minijail { };
 
+  minijail-tools = python3.pkgs.callPackage ../tools/system/minijail/tools.nix { };
+
   minixml = callPackage ../development/libraries/minixml { };
 
   mir-qualia = callPackage ../tools/text/mir-qualia {

From 139a15ea58964e57d08655af2839837e281e85cd Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 27 Mar 2020 08:46:03 +0000
Subject: [PATCH 4611/4636] minijail: build and install constants.json

This is a syscall table used for compiling Minijail policy files to
BPF.  The compiler is available in the minijail-tools package.  The
file is generated by compiling and running a small program named
dump_constants.

When cross-compiling, we have to get the syscall table for the host
platform.  To do this, dump_constants is run under QEMU user emulation
for the appropriate platform.  Google takes the same approach in their
minijail packages for ChromiumOS[1].

[1]: https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/729bd4269a47870380f8dde0b162de355ce89dfe/chromeos-base/minijail/minijail-9999.ebuild#49
---
 pkgs/tools/system/minijail/default.nix | 40 ++++++++++++++++++--------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/system/minijail/default.nix b/pkgs/tools/system/minijail/default.nix
index 5c4c45fbca2c..2f5adc3f4c95 100644
--- a/pkgs/tools/system/minijail/default.nix
+++ b/pkgs/tools/system/minijail/default.nix
@@ -1,4 +1,13 @@
-{ stdenv, fetchFromGitiles, libcap }:
+{ stdenv, lib, fetchFromGitiles, glibc, libcap, qemu }:
+
+let
+  dumpConstants =
+    if stdenv.buildPlatform == stdenv.hostPlatform then "./dump_constants"
+    else if stdenv.hostPlatform.isAarch32 then "qemu-arm dump_constants"
+    else if stdenv.hostPlatform.isAarch64 then "qemu-aarch64 dump_constants"
+    else if stdenv.hostPlatform.isx86_64 then "qemu-x86_64 dump_constants"
+    else throw "Unsupported host platform";
+in
 
 stdenv.mkDerivation rec {
   pname = "minijail";
@@ -10,35 +19,42 @@ stdenv.mkDerivation rec {
     sha256 = "00dq854n4zg3ca2b46f90k15n32zn2sgabi76mnq2w985k9v977n";
   };
 
+  nativeBuildInputs =
+    lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) qemu;
   buildInputs = [ libcap ];
 
   makeFlags = [ "LIBDIR=$(out)/lib" ];
-
-  preConfigure = ''
-    substituteInPlace common.mk --replace /bin/echo echo
-  '';
+  dumpConstantsFlags = lib.optional (stdenv.hostPlatform.libc == "glibc")
+    "LDFLAGS=-L${glibc.static}/lib";
 
   postPatch = ''
+    substituteInPlace common.mk --replace /bin/echo echo
     patchShebangs platform2_preinstall.sh
   '';
 
   postBuild = ''
-    ./platform2_preinstall.sh ${version} $out/include/chromeos
+    make $makeFlags $buildFlags $dumpConstantsFlags dump_constants
+    ${dumpConstants} > constants.json
   '';
 
   installPhase = ''
-    mkdir -p $out/lib/pkgconfig $out/include/chromeos $out/bin
+    ./platform2_preinstall.sh ${version} $out/include/chromeos
+
+    mkdir -p $out/lib/pkgconfig $out/include/chromeos $out/bin \
+        $out/share/minijail
+
     cp -v *.so $out/lib
     cp -v *.pc $out/lib/pkgconfig
     cp -v libminijail.h scoped_minijail.h $out/include/chromeos
     cp -v minijail0 $out/bin
+    cp -v constants.json $out/share/minijail
   '';
 
-  meta = {
-    homepage = https://android.googlesource.com/platform/external/minijail/;
+  meta = with lib; {
+    homepage = "https://android.googlesource.com/platform/external/minijail/";
     description = "Sandboxing library and application using Linux namespaces and capabilities";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ pcarrier qyliss ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ pcarrier qyliss ];
+    platforms = platforms.linux;
   };
 }

From df0db1774050f3e7f585e8902148a312f07b364e Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Fri, 27 Mar 2020 21:10:48 +0000
Subject: [PATCH 4612/4636] vimPlugins: automatically commit update

---
 doc/languages-frameworks/vim.section.md |  2 +-
 pkgs/misc/vim-plugins/update.py         | 36 ++++++++++++++++++++-----
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md
index 05a23d26cf2f..4272d1f59691 100644
--- a/doc/languages-frameworks/vim.section.md
+++ b/doc/languages-frameworks/vim.section.md
@@ -263,7 +263,7 @@ Sometimes plugins require an override that must be changed when the plugin is up
 
 To add a new plugin:
 
-  1. run `./update.py` and create a commit named "vimPlugins: Update",
+  1. run `./update.py --commit`,
   2. add the new plugin to [vim-plugin-names](/pkgs/misc/vim-plugins/vim-plugin-names) and add overrides if required to [overrides.nix](/pkgs/misc/vim-plugins/overrides.nix),
   3. run `./update.py` again and create a commit named "vimPlugins.[name]: init at [version]" (where `name` and `version` can be found in [generated.nix](/pkgs/misc/vim-plugins/generated.nix)), and
   4. create a pull request.
diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
index 0055e8eccbce..dda96816bb81 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/misc/vim-plugins/update.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -p nix-prefetch-git -p python3 nix -i python3
+#!nix-shell -p nix-prefetch-git -p python3 -p python3Packages.GitPython nix -i python3
 
 # format:
 # $ nix run nixpkgs.python3Packages.black -c black update.py
@@ -27,11 +27,14 @@ from typing import Dict, List, Optional, Tuple, Union, Any, Callable
 from urllib.parse import urljoin, urlparse
 from tempfile import NamedTemporaryFile
 
+import git
+
 ATOM_ENTRY = "{http://www.w3.org/2005/Atom}entry"  # " vim gets confused here
 ATOM_LINK = "{http://www.w3.org/2005/Atom}link"  # "
 ATOM_UPDATED = "{http://www.w3.org/2005/Atom}updated"  # "
 
 ROOT = Path(__file__).parent
+NIXPKGS_PATH = ROOT.cwd().parents[2]
 DEFAULT_IN = ROOT.joinpath("vim-plugin-names")
 DEFAULT_OUT = ROOT.joinpath("generated.nix")
 DEPRECATED = ROOT.joinpath("deprecated.json")
@@ -413,6 +416,11 @@ in lib.fix' (lib.extends overrides packages)
     print(f"updated {outfile}")
 
 
+def commit_changes(repo: git.Repo, *files: Path):
+    repo.index.add([str(f.resolve()) for f in files])
+    repo.index.commit("vimPlugins: Update")
+
+
 def rewrite_input(input_file: Path, output_file: Path, redirects: dict):
     with open(input_file, "r") as f:
         lines = f.readlines()
@@ -438,13 +446,10 @@ def rewrite_input(input_file: Path, output_file: Path, redirects: dict):
             f"""\
 Redirects have been detected and {input_file} has been updated. Please take the
 following steps:
-    1. Go ahead and commit just the updated expressions as you intended to do:
-            git add {output_file}
-            git commit -m "vimPlugins: Update"
-    2. Run this script again so these changes will be reflected in the
+    1. Run this script again so these changes will be reflected in the
     generated expressions:
             ./update.py
-    3. Commit {input_file} along with deprecations and generated expressions:
+    2. Commit {input_file} along with deprecations and generated expressions:
             git add {output_file} {input_file} {DEPRECATED}
             git commit -m "vimPlugins: Update redirects"
         """
@@ -485,13 +490,27 @@ def parse_args():
         default=30,
         help="Number of concurrent processes to spawn.",
     )
+    parser.add_argument(
+        "--commit",
+        dest="commit",
+        action="store_true",
+        help="Automatically commit updates",
+    )
 
     return parser.parse_args()
 
 
-def main() -> None:
+def get_nixpkgs_repo() -> git.Repo:
+    repo = git.Repo(NIXPKGS_PATH)
+    if repo.is_dirty():
+        raise Exception("Please stash your changes before updating.")
+    return repo
 
+
+def main() -> None:
     args = parse_args()
+    if args.commit:
+        nixpkgs_repo = get_nixpkgs_repo()
     plugin_names = load_plugin_spec(args.input_file)
     current_plugins = get_current_plugins()
     cache = Cache(current_plugins)
@@ -510,6 +529,9 @@ def main() -> None:
 
     rewrite_input(args.input_file, args.outfile, redirects)
 
+    if args.commit:
+        commit_changes(nixpkgs_repo, args.outfile)
+
 
 if __name__ == "__main__":
     main()

From 042c3dc356f24af8b6b87db1dbda335b4b0c535c Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Sat, 28 Mar 2020 06:29:53 +0000
Subject: [PATCH 4613/4636] vimPlugins: automatically commit redirect updates

- When redirections are detected, rather than printing instructions,
update.py now creates two commits -- one with the plugin updates and
another with redirected plugin names updated to their new repos.
- Added a --allow-dirty flag so that one can run ./update.py --commit
with a dirty nixpkgs repository, which is necessary for development.
I wouldn't mind removing this before merging if it's not in our flag
budget but it's necessary scaffolding for now.
---
 pkgs/misc/vim-plugins/update.py | 94 +++++++++++++++++++++------------
 1 file changed, 59 insertions(+), 35 deletions(-)

diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
index dda96816bb81..ef0b640dd4e7 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/misc/vim-plugins/update.py
@@ -416,12 +416,7 @@ in lib.fix' (lib.extends overrides packages)
     print(f"updated {outfile}")
 
 
-def commit_changes(repo: git.Repo, *files: Path):
-    repo.index.add([str(f.resolve()) for f in files])
-    repo.index.commit("vimPlugins: Update")
-
-
-def rewrite_input(input_file: Path, output_file: Path, redirects: dict):
+def rewrite_input(input_file: Path, redirects: dict):
     with open(input_file, "r") as f:
         lines = f.readlines()
 
@@ -442,19 +437,6 @@ def rewrite_input(input_file: Path, output_file: Path, redirects: dict):
         with open(DEPRECATED, "w") as f:
             json.dump(deprecations, f, indent=4, sort_keys=True)
 
-        print(
-            f"""\
-Redirects have been detected and {input_file} has been updated. Please take the
-following steps:
-    1. Run this script again so these changes will be reflected in the
-    generated expressions:
-            ./update.py
-    2. Commit {input_file} along with deprecations and generated expressions:
-            git add {output_file} {input_file} {DEPRECATED}
-            git commit -m "vimPlugins: Update redirects"
-        """
-        )
-
     lines = sorted(lines, key=str.casefold)
 
     with open(input_file, "w") as f:
@@ -496,25 +478,49 @@ def parse_args():
         action="store_true",
         help="Automatically commit updates",
     )
+    parser.add_argument(
+        "--allow-dirty",
+        dest="allow_dirty",
+        action="store_true",
+        help=(
+            "Allow commit to continue even if state is unexpectedly dirty. "
+            "This is only helpful when developing vimPlugins infrastructure."
+        ),
+    )
 
     return parser.parse_args()
 
 
-def get_nixpkgs_repo() -> git.Repo:
-    repo = git.Repo(NIXPKGS_PATH)
-    if repo.is_dirty():
-        raise Exception("Please stash your changes before updating.")
-    return repo
+class NixpkgsRepo:
+    def __init__(self, allow_dirty: bool):
+        self.allow_dirty: bool = allow_dirty
+        self.repo: git.Repo = git.Repo(NIXPKGS_PATH)
+
+        if self.is_unexpectedly_dirty():
+            raise Exception("Please stash changes before updating.")
+
+    def commit(self, message: str, files: List[Path]) -> None:
+        file_paths = [str(f.resolve()) for f in files]
+        files_changed = False
+        for f in self.repo.index.diff(None):
+            if str(f) in file_paths:
+                files_changed = True
+                break
+
+        if files_changed:
+            print(f'committing to nixpkgs "vimPlugins: {message}"')
+            self.repo.index.add(file_paths)
+            self.repo.index.commit(f"vimPlugins: {message}")
+            assert self.is_unexpectedly_dirty() is False
+        else:
+            print("no changes in working tree to commit")
+
+    def is_unexpectedly_dirty(self) -> bool:
+        return self.repo.is_dirty() and not self.allow_dirty
 
 
-def main() -> None:
-    args = parse_args()
-    if args.commit:
-        nixpkgs_repo = get_nixpkgs_repo()
-    plugin_names = load_plugin_spec(args.input_file)
-    current_plugins = get_current_plugins()
-    cache = Cache(current_plugins)
-
+def update_plugins(input_file: str, outfile: str, cache: Cache) -> Dict:
+    plugin_names = load_plugin_spec(input_file)
     prefetch_with_cache = functools.partial(prefetch, cache=cache)
 
     try:
@@ -525,12 +531,30 @@ def main() -> None:
 
     plugins, redirects = check_results(results)
 
-    generate_nix(plugins, args.outfile)
+    generate_nix(plugins, outfile)
 
-    rewrite_input(args.input_file, args.outfile, redirects)
+    return redirects
+
+
+def main() -> None:
+    args = parse_args()
+    if args.commit:
+        nixpkgs_repo = NixpkgsRepo(args.allow_dirty)
+    current_plugins = get_current_plugins()
+    cache = Cache(current_plugins)
+    redirects = {}
+
+    redirects = update_plugins(args.input_file, args.outfile, cache)
+
+    rewrite_input(args.input_file, redirects)
 
     if args.commit:
-        commit_changes(nixpkgs_repo, args.outfile)
+        nixpkgs_repo.commit("Update", [args.outfile])
+        if redirects:
+            update_plugins(args.input_file, args.outfile, cache)
+            nixpkgs_repo.commit(
+                "Update redirects", [args.outfile, args.input_file, DEPRECATED]
+            )
 
 
 if __name__ == "__main__":

From f1ae95f6d3cbc55cea72fe2765105a6b998ec7db Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Sat, 28 Mar 2020 17:42:31 +0000
Subject: [PATCH 4614/4636] vimPlugins: update.py --add <plugin> argument

- update.py's new --add argument replaces manual editing of
vim-plugin-names for basic use cases.
---
 doc/languages-frameworks/vim.section.md |  7 +---
 pkgs/misc/vim-plugins/update.py         | 54 ++++++++++++++++---------
 2 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md
index 4272d1f59691..1d316cf350e5 100644
--- a/doc/languages-frameworks/vim.section.md
+++ b/doc/languages-frameworks/vim.section.md
@@ -261,12 +261,7 @@ deoplete-fish = super.deoplete-fish.overrideAttrs(old: {
 
 Sometimes plugins require an override that must be changed when the plugin is updated. This can cause issues when Vim plugins are auto-updated but the associated override isn't updated. For these plugins, the override should be written so that it specifies all information required to install the plugin, and running `./update.py` doesn't change the derivation for the plugin. Manually updating the override is required to update these types of plugins. An example of such a plugin is `LanguageClient-neovim`.
 
-To add a new plugin:
-
-  1. run `./update.py --commit`,
-  2. add the new plugin to [vim-plugin-names](/pkgs/misc/vim-plugins/vim-plugin-names) and add overrides if required to [overrides.nix](/pkgs/misc/vim-plugins/overrides.nix),
-  3. run `./update.py` again and create a commit named "vimPlugins.[name]: init at [version]" (where `name` and `version` can be found in [generated.nix](/pkgs/misc/vim-plugins/generated.nix)), and
-  4. create a pull request.
+To add a new plugin, run `./update.py --commit --add "[owner]/[name]"`.
 
 ## Important repositories
 
diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
index ef0b640dd4e7..0a08e4dac16e 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/misc/vim-plugins/update.py
@@ -38,6 +38,7 @@ NIXPKGS_PATH = ROOT.cwd().parents[2]
 DEFAULT_IN = ROOT.joinpath("vim-plugin-names")
 DEFAULT_OUT = ROOT.joinpath("generated.nix")
 DEPRECATED = ROOT.joinpath("deprecated.json")
+OVERRIDES = ROOT.joinpath("overrides.nix")
 
 import time
 from functools import wraps
@@ -127,7 +128,7 @@ class Repo:
             new_owner, new_name = (
                 urllib.parse.urlsplit(response_url).path.strip("/").split("/")[:2]
             )
-            end_line = "\n" if self.alias is None else f" as {self.alias}\n"
+            end_line = "\n" if self.alias == "" else f" as {self.alias}\n"
             plugin_line = "{owner}/{name}" + end_line
 
             old_plugin = plugin_line.format(owner=self.owner, name=self.name)
@@ -280,17 +281,17 @@ def check_results(
         sys.exit(1)
 
 
-def parse_plugin_line(line: str) -> Tuple[str, str, Optional[str]]:
+def parse_plugin_line(line: str) -> Tuple[str, str, str]:
     name, repo = line.split("/")
     try:
         repo, alias = repo.split(" as ")
         return (name, repo, alias.strip())
     except ValueError:
         # no alias defined
-        return (name, repo.strip(), None)
+        return (name, repo.strip(), "")
 
 
-def load_plugin_spec(plugin_file: str) -> List[Tuple[str, str, Optional[str]]]:
+def load_plugin_spec(plugin_file: str) -> List[Tuple[str, str, str]]:
     plugins = []
     with open(plugin_file) as f:
         for line in f:
@@ -416,10 +417,12 @@ in lib.fix' (lib.extends overrides packages)
     print(f"updated {outfile}")
 
 
-def rewrite_input(input_file: Path, redirects: dict):
+def rewrite_input(input_file: Path, redirects: dict = None, append: Tuple = ()):
     with open(input_file, "r") as f:
         lines = f.readlines()
 
+    lines.extend(append)
+
     if redirects:
         lines = [redirects.get(line, line) for line in lines]
 
@@ -450,6 +453,14 @@ def parse_args():
             f"By default from {DEFAULT_IN} to {DEFAULT_OUT}"
         )
     )
+    parser.add_argument(
+        "--add",
+        "-a",
+        dest="add_plugins",
+        default=[],
+        action="append",
+        help="Plugin to add to vimPlugins in the form owner/repo",
+    )
     parser.add_argument(
         "--input-names",
         "-i",
@@ -500,17 +511,11 @@ class NixpkgsRepo:
             raise Exception("Please stash changes before updating.")
 
     def commit(self, message: str, files: List[Path]) -> None:
-        file_paths = [str(f.resolve()) for f in files]
-        files_changed = False
-        for f in self.repo.index.diff(None):
-            if str(f) in file_paths:
-                files_changed = True
-                break
+        files_staged = self.repo.index.add([str(f.resolve()) for f in files])
 
-        if files_changed:
-            print(f'committing to nixpkgs "vimPlugins: {message}"')
-            self.repo.index.add(file_paths)
-            self.repo.index.commit(f"vimPlugins: {message}")
+        if files_staged:
+            print(f'committing to nixpkgs "{message}"')
+            self.repo.index.commit(message)
             assert self.is_unexpectedly_dirty() is False
         else:
             print("no changes in working tree to commit")
@@ -538,6 +543,8 @@ def update_plugins(input_file: str, outfile: str, cache: Cache) -> Dict:
 
 def main() -> None:
     args = parse_args()
+    if args.add_plugins and not args.commit:
+        raise Exception("The --add argument requires setting the --commit flag.")
     if args.commit:
         nixpkgs_repo = NixpkgsRepo(args.allow_dirty)
     current_plugins = get_current_plugins()
@@ -545,15 +552,26 @@ def main() -> None:
     redirects = {}
 
     redirects = update_plugins(args.input_file, args.outfile, cache)
-
     rewrite_input(args.input_file, redirects)
 
     if args.commit:
-        nixpkgs_repo.commit("Update", [args.outfile])
+        nixpkgs_repo.commit("vimPlugins: Update", [args.outfile])
         if redirects:
             update_plugins(args.input_file, args.outfile, cache)
             nixpkgs_repo.commit(
-                "Update redirects", [args.outfile, args.input_file, DEPRECATED]
+                "vimPlugins: Update redirects",
+                [args.outfile, args.input_file, DEPRECATED],
+            )
+        for plugin_line in args.add_plugins:
+            rewrite_input(args.input_file, append=(plugin_line + "\n",))
+            update_plugins(args.input_file, args.outfile, cache)
+
+            plugin, _ = prefetch_plugin(*parse_plugin_line(plugin_line), cache)
+            nixpkgs_repo.commit(
+                "vimPlugins.{name}: init at {version}".format(
+                    name=plugin.normalized_name, version=plugin.version
+                ),
+                [args.outfile, args.input_file, OVERRIDES],
             )
 
 

From 1f32eb7987b44348b8c20bec0aea60bec836637c Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Sat, 28 Mar 2020 18:11:51 +0000
Subject: [PATCH 4615/4636] vimPlugins: remove repetition from update.main

Adding some abstraction makes main() more readable which is important
since it's the main control flow of the script.
---
 pkgs/misc/vim-plugins/update.py | 56 +++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 24 deletions(-)

diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
index 0a08e4dac16e..cea1ae21527a 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/misc/vim-plugins/update.py
@@ -222,16 +222,17 @@ def get_current_plugins() -> List[Plugin]:
 
 
 def prefetch_plugin(
-    user: str, repo_name: str, alias: str, cache: "Cache"
+    user: str, repo_name: str, alias: str, cache: "Cache" = None
 ) -> Tuple[Plugin, Dict[str, str]]:
     repo = Repo(user, repo_name, alias)
     commit, date = repo.latest_commit()
     has_submodules = repo.has_submodules()
-    cached_plugin = cache[commit]
-    if cached_plugin is not None:
-        cached_plugin.name = alias or repo_name
-        cached_plugin.date = date
-        return cached_plugin, repo.redirect
+    if cache is not None:
+        cached_plugin = cache[commit]
+        if cached_plugin is not None:
+            cached_plugin.name = alias or repo_name
+            cached_plugin.date = date
+            return cached_plugin, repo.redirect
 
     print(f"prefetch {user}/{repo_name}")
     if has_submodules:
@@ -524,21 +525,30 @@ class NixpkgsRepo:
         return self.repo.is_dirty() and not self.allow_dirty
 
 
-def update_plugins(input_file: str, outfile: str, cache: Cache) -> Dict:
-    plugin_names = load_plugin_spec(input_file)
-    prefetch_with_cache = functools.partial(prefetch, cache=cache)
+class PluginUpdater:
+    def __init__(self, input_file: str, outfile: str, proc: int):
+        self.input_file: str = input_file
+        self.outfile: str = outfile
+        self.proc = proc
+        self.cache: Cache = Cache(get_current_plugins())
+        self.prefetch = functools.partial(prefetch, cache=self.cache)
 
-    try:
-        pool = Pool(processes=args.proc)
-        results = pool.map(prefetch_with_cache, plugin_names)
-    finally:
-        cache.store()
+    def __call__(self) -> Dict:
+        plugin_names = load_plugin_spec(self.input_file)
 
-    plugins, redirects = check_results(results)
+        try:
+            # synchronous variant for debugging
+            # results = list(map(self.prefetch, plugin_names))
+            pool = Pool(processes=self.proc)
+            results = pool.map(self.prefetch, plugin_names)
+        finally:
+            self.cache.store()
 
-    generate_nix(plugins, outfile)
+        plugins, redirects = check_results(results)
 
-    return redirects
+        generate_nix(plugins, self.outfile)
+
+        return redirects
 
 
 def main() -> None:
@@ -547,26 +557,24 @@ def main() -> None:
         raise Exception("The --add argument requires setting the --commit flag.")
     if args.commit:
         nixpkgs_repo = NixpkgsRepo(args.allow_dirty)
-    current_plugins = get_current_plugins()
-    cache = Cache(current_plugins)
-    redirects = {}
+    updater = PluginUpdater(args.input_file, args.outfile, args.proc)
 
-    redirects = update_plugins(args.input_file, args.outfile, cache)
+    redirects = updater()
     rewrite_input(args.input_file, redirects)
 
     if args.commit:
         nixpkgs_repo.commit("vimPlugins: Update", [args.outfile])
         if redirects:
-            update_plugins(args.input_file, args.outfile, cache)
+            updater()
             nixpkgs_repo.commit(
                 "vimPlugins: Update redirects",
                 [args.outfile, args.input_file, DEPRECATED],
             )
         for plugin_line in args.add_plugins:
             rewrite_input(args.input_file, append=(plugin_line + "\n",))
-            update_plugins(args.input_file, args.outfile, cache)
+            updater()
 
-            plugin, _ = prefetch_plugin(*parse_plugin_line(plugin_line), cache)
+            plugin, _ = prefetch_plugin(*parse_plugin_line(plugin_line))
             nixpkgs_repo.commit(
                 "vimPlugins.{name}: init at {version}".format(
                     name=plugin.normalized_name, version=plugin.version

From 1c0f0de46c231d6c392b9727327d9635fc4f60ec Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Sun, 29 Mar 2020 16:09:59 +0000
Subject: [PATCH 4616/4636] vimPlugins: normalize deprecation names

Parsing plugin lines in multiple places is hazardous and already manifested a
bug!
---
 pkgs/misc/vim-plugins/deprecated.json |  4 ++--
 pkgs/misc/vim-plugins/update.py       | 21 ++++++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkgs/misc/vim-plugins/deprecated.json b/pkgs/misc/vim-plugins/deprecated.json
index 2c02982f6c60..2af94f5df3dd 100644
--- a/pkgs/misc/vim-plugins/deprecated.json
+++ b/pkgs/misc/vim-plugins/deprecated.json
@@ -9,10 +9,10 @@
     },
     "vundle": {
         "date": "2020-03-27",
-        "new": "Vundle.vim"
+        "new": "Vundle-vim"
     },
     "youcompleteme": {
         "date": "2020-03-27",
         "new": "YouCompleteMe"
     }
-}
\ No newline at end of file
+}
diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
index cea1ae21527a..a01bd93a3cc9 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/misc/vim-plugins/update.py
@@ -246,6 +246,11 @@ def prefetch_plugin(
     )
 
 
+def fetch_plugin_from_pluginline(plugin_line: str) -> Plugin:
+    plugin, _ = prefetch_plugin(*parse_plugin_line(plugin_line))
+    return plugin
+
+
 def print_download_error(plugin: str, ex: Exception):
     print(f"{plugin}: {ex}", file=sys.stderr)
     ex_traceback = ex.__traceback__
@@ -418,7 +423,9 @@ in lib.fix' (lib.extends overrides packages)
     print(f"updated {outfile}")
 
 
-def rewrite_input(input_file: Path, redirects: dict = None, append: Tuple = ()):
+def rewrite_input(
+    input_file: Path, redirects: Dict[str, str] = None, append: Tuple = ()
+):
     with open(input_file, "r") as f:
         lines = f.readlines()
 
@@ -431,11 +438,11 @@ def rewrite_input(input_file: Path, redirects: dict = None, append: Tuple = ()):
         with open(DEPRECATED, "r") as f:
             deprecations = json.load(f)
         for old, new in redirects.items():
-            old_name = old.split("/")[1].split(" ")[0].strip("\n")
-            new_name = new.split("/")[1].split(" ")[0].strip("\n")
-            if old_name != new_name:
-                deprecations[old_name] = {
-                    "new": new_name,
+            old_plugin = fetch_plugin_from_pluginline(old)
+            new_plugin = fetch_plugin_from_pluginline(new)
+            if old_plugin.normalized_name != new_plugin.normalized_name:
+                deprecations[old_plugin.normalized_name] = {
+                    "new": new_plugin.normalized_name,
                     "date": cur_date_iso,
                 }
         with open(DEPRECATED, "w") as f:
@@ -574,7 +581,7 @@ def main() -> None:
             rewrite_input(args.input_file, append=(plugin_line + "\n",))
             updater()
 
-            plugin, _ = prefetch_plugin(*parse_plugin_line(plugin_line))
+            plugin = fetch_plugin_from_pluginline(plugin_line)
             nixpkgs_repo.commit(
                 "vimPlugins.{name}: init at {version}".format(
                     name=plugin.normalized_name, version=plugin.version

From 09b47478f8f480aded09c3c621a6ca8af224d276 Mon Sep 17 00:00:00 2001
From: Christine Dodrill <me@christine.website>
Date: Fri, 13 Mar 2020 20:49:48 -0400
Subject: [PATCH 4617/4636] development/libraries/libdap: fix hash

(cherry picked from commit aa61e722b041ce60dd71f9e6f3f5a474db9f7211)
---
 pkgs/development/libraries/libdap/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix
index baf938944201..4763e5983f95 100644
--- a/pkgs/development/libraries/libdap/default.nix
+++ b/pkgs/development/libraries/libdap/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://www.opendap.org/pub/source/${pname}-${version}.tar.gz";
-    sha256 = "17j6ca2qsp69a91lm11mwbs4l8q13xqcdz60l94avl5krymrqg47";
+    sha256 = "15jysnsmdjs7q4iafb4qzq4b76cfyvmbxgcxnqg4sr0x4bplwfnb";
   };
 
   meta = with stdenv.lib; {

From 7f56fdd997c677058c05deb6dba887fde7080ed8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 1 Apr 2020 08:47:39 -0400
Subject: [PATCH 4618/4636] linux: Init 5.6.1

Change linux_latest to 5.6
---
 pkgs/os-specific/linux/kernel/linux-5.6.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix             | 13 +++++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-5.6.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-5.6.nix b/pkgs/os-specific/linux/kernel/linux-5.6.nix
new file mode 100644
index 000000000000..df06ffecba9b
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-5.6.nix
@@ -0,0 +1,18 @@
+{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
+
+with stdenv.lib;
+
+buildLinux (args // rec {
+  version = "5.6.1";
+
+  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
+  modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
+
+  # branchVersion needs to be x.y
+  extraMeta.branch = versions.majorMinor version;
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
+    sha256 = "0c0m9wbzbnhnfsvw2ki7wikvz8fzj94rlbfr76qa8shgdm2gvn26";
+  };
+} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d0b48046dbb7..c6653fd29415 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -525,7 +525,7 @@ in
   acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter {
     ffmpeg = ffmpeg_2;
   };
-  
+
   alsaequal = callPackage ../tools/audio/alsaequal { };
 
   acpica-tools = callPackage ../tools/system/acpica-tools { };
@@ -16711,6 +16711,14 @@ in
     ];
   };
 
+  linux_5_6 = callPackage ../os-specific/linux/kernel/linux-5.6.nix {
+    kernelPatches = [
+      kernelPatches.bridge_stp_helper
+      kernelPatches.request_key_helper
+      kernelPatches.export_kernel_fpu_functions."5.3"
+    ];
+  };
+
   linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
     kernelPatches = [
       kernelPatches.bridge_stp_helper
@@ -16920,7 +16928,7 @@ in
   linux = linuxPackages.kernel;
 
   # Update this when adding the newest kernel major version!
-  linuxPackages_latest = linuxPackages_5_5;
+  linuxPackages_latest = linuxPackages_5_6;
   linux_latest = linuxPackages_latest.kernel;
 
   # Build the kernel modules for the some of the kernels.
@@ -16935,6 +16943,7 @@ in
   linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
   linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4);
   linuxPackages_5_5 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_5);
+  linuxPackages_5_6 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_6);
 
   # When adding to this list:
   # - Update linuxPackages_latest to the latest version

From 7bae57f24921a88e68d16b2e66df661963b3d733 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 1 Apr 2020 08:48:23 -0400
Subject: [PATCH 4619/4636] linux: 5.4.28 -> 5.4.29

---
 pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 2471962404e3..90389a79a2e0 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.4.28";
+  version = "5.4.29";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "197p7rjmbs229ncj1y8s80f7n4bm8g9w0jrv1109m3rl8q9wqqy8";
+    sha256 = "1jssjnhwjh1my42vskm9h2b7rpc0ncvf2428y2aqm558ihia9ln7";
   };
 } // (args.argsOverride or {}))

From 902ebcdd444d5f1553bc5d3bfbea10a259e4a41c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 1 Apr 2020 08:48:31 -0400
Subject: [PATCH 4620/4636] linux: 5.5.13 -> 5.5.14

---
 pkgs/os-specific/linux/kernel/linux-5.5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.5.nix b/pkgs/os-specific/linux/kernel/linux-5.5.nix
index aa15a42d2c4d..4069914af07b 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.5.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.5.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "5.5.13";
+  version = "5.5.14";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1qjf18qywzrfdzwpgpf6m0w0bil8rbc9hby8473ckzvbl0a3cfqz";
+    sha256 = "0spgja8pk8m3fdhhnf50d0z0bzbzdpjd12d7w23iiw8d2179wljc";
   };
 } // (args.argsOverride or {}))

From ef3f3f2728c82e2f65e9e4dc5454345c6f7a4c32 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 1 Apr 2020 08:48:42 -0400
Subject: [PATCH 4621/4636] linux_latest-libre: 17387 -> 17402

---
 pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix
index f4f3e0ffaf11..d167a89ea830 100644
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -1,8 +1,8 @@
 { stdenv, lib, fetchsvn, linux
 , scripts ? fetchsvn {
     url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
-    rev = "17387";
-    sha256 = "1a62n326xsbb8r8y610d4k698n3la22rnhlxa56c2zki2q5697h3";
+    rev = "17402";
+    sha256 = "1g151h6hdiwpvpip1r2rhbma8j13xghcyxddh0ppg9h548wwwack";
   }
 , ...
 }:

From be792c92ec08ef6272ecf1e7cdbdc7a131d2bd73 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 1 Apr 2020 08:50:57 -0400
Subject: [PATCH 4622/4636] jenkins: 2.204.5 -> 2.222.1

---
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 0fe4de98f1d2..ec02cb26b8e3 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jenkins";
-  version = "2.204.5";
+  version = "2.222.1";
 
   src = fetchurl {
     url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
-    sha256 = "17437wshci2fyvvaznzk738m2npqa61w16aw5jslw2ifnyjkziwl";
+    sha256 = "0glmx8xi99mbfr84hi4sn36qkxw00rfn8wlz5n674ygbdj1vnv2s";
   };
 
   buildCommand = ''

From 04a6f80ff4bb407ae15f55281ffe7e4d0ed3fc3b Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 1 Apr 2020 16:53:02 +0200
Subject: [PATCH 4623/4636] riot-web: 1.5.14 -> 1.5.15

https://github.com/vector-im/riot-web/releases/tag/v1.5.15
---
 .../networking/instant-messengers/riot/riot-web.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index 31c571c1ee4b..69699505bb62 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -12,11 +12,11 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "riot-web";
-  version = "1.5.14";
+  version = "1.5.15";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "1dqqrlr9gby4y8dhw6c50w261bz4f5drkcal98g1396ikcfff3mh";
+    sha256 = "09a9l1l65m2c4ldycjhnqn0mmblm3j65vc9rcjfkdxqbd6bh86h7";
   };
 
   installPhase = ''

From d7c0018c79c6b607c84a54915cef0920e00dd82b Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 1 Apr 2020 16:53:16 +0200
Subject: [PATCH 4624/4636] riot-desktop: 1.5.14 -> 1.5.15

https://github.com/vector-im/riot-web/releases/tag/v1.5.15
---
 .../instant-messengers/riot/riot-desktop-package.json         | 2 +-
 .../networking/instant-messengers/riot/riot-desktop.nix       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
index 4e014c9633f9..390b61d8d367 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "1.5.14",
+  "version": "1.5.15",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "dependencies": {
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
index 5ae24c6a8dfb..5bb2e4e40a03 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
@@ -6,12 +6,12 @@
 
 let
   executableName = "riot-desktop";
-  version = "1.5.14";
+  version = "1.5.15";
   riot-web-src = fetchFromGitHub {
     owner = "vector-im";
     repo = "riot-web";
     rev = "v${version}";
-    sha256 = "0dkji5rgiakdzcba2v104hhvbw9j98ik95vzwcckksja79zfjmww";
+    sha256 = "08yk5is6n9ci1jml0b94a3swdybx01k5klbl30i1b76biyn75m77";
   };
   electron = electron_7;
 

From d6b23cb118fc3759bdf3075b861e15e6ce774731 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2020 15:13:11 +0000
Subject: [PATCH 4625/4636] minio: 2020-03-06T22-23-56Z -> 2020-03-25T07-03-04Z

---
 pkgs/servers/minio/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index 858f8899501d..953cc9fb77cd 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "minio";
-  version = "2020-03-06T22-23-56Z";
+  version = "2020-03-25T07-03-04Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "minio";
     rev = "RELEASE.${version}";
-    sha256 = "0h5zsdxm2b2by6lzqaa7jj0z773kjr89cl13gq9ddabml34f0kxh";
+    sha256 = "0xdflc7pfx1misbh695x8kmqpysi5iydsarr9mwmjragf5b1kbl5";
   };
 
-  modSha256 = "0ikid628v673f7lvp3psk05s3liqlyc3arppg33lfi2cmbaf8hmr";
+  modSha256 = "09kbibsfa7qq55paqr7wcs4gpwk6g5pknc5fjssmd12nm2cji96k";
 
   subPackages = [ "." ];
 
@@ -20,7 +20,7 @@ buildGoModule rec {
   ''];
 
   meta = with stdenv.lib; {
-    homepage = https://www.minio.io/;
+    homepage = "https://www.minio.io/";
     description = "An S3-compatible object storage server";
     maintainers = with maintainers; [ eelco bachp ];
     platforms = platforms.unix;

From 8e686bacc4e627da1080a5ad5769ead230e5ba69 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 26 Mar 2020 03:56:56 +0100
Subject: [PATCH 4626/4636] ocamlPackages.ocaml-r: init at 0.2.0

---
 .../ocaml-modules/ocaml-r/default.nix         | 31 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/ocaml-r/default.nix

diff --git a/pkgs/development/ocaml-modules/ocaml-r/default.nix b/pkgs/development/ocaml-modules/ocaml-r/default.nix
new file mode 100644
index 000000000000..71e77b24ce4b
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocaml-r/default.nix
@@ -0,0 +1,31 @@
+{ lib, fetchFromGitHub, buildDunePackage, pkg-config, configurator, stdio, R }:
+
+buildDunePackage rec {
+  pname = "ocaml-r";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "pveber";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "09gljccwjsw9693m1hm9hcyvgp3p2fvg3cfn18yyidpc2f81a4fy";
+  };
+
+  # Without the following patch, stub generation fails with:
+  # > Fatal error: exception (Failure "not supported: osVersion")
+  preConfigure = ''
+    substituteInPlace stubgen/stubgen.ml --replace  \
+    'failwithf "not supported: %s" name ()' \
+    'sprintf "(* not supported: %s *)" name'
+  '';
+
+  buildInputs = [ configurator pkg-config R stdio ];
+
+  meta = {
+    description = "OCaml bindings for the R interpreter";
+    inherit (src.meta) homepage;
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.bcdarwin ];
+  };
+
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 7e12a3db3f78..68d45730d27f 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -615,6 +615,8 @@ let
 
     pgocaml_ppx = callPackage ../development/ocaml-modules/pgocaml/ppx.nix {};
 
+    ocaml-r = callPackage ../development/ocaml-modules/ocaml-r { };
+
     ocaml-sat-solvers = callPackage ../development/ocaml-modules/ocaml-sat-solvers { };
 
     ocamlscript = callPackage ../development/tools/ocaml/ocamlscript { };

From 206cf8a3414fbec2ba321d43627f5141bc8c16ec Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 26 Mar 2020 03:57:03 +0100
Subject: [PATCH 4627/4636] =?UTF-8?q?ocamlPackages.gnuplot:=200.5.3=20?=
 =?UTF-8?q?=E2=86=92=200.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/gnuplot/default.nix         | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/ocaml-modules/gnuplot/default.nix b/pkgs/development/ocaml-modules/gnuplot/default.nix
index e473273b8da7..d939b884e875 100644
--- a/pkgs/development/ocaml-modules/gnuplot/default.nix
+++ b/pkgs/development/ocaml-modules/gnuplot/default.nix
@@ -1,19 +1,21 @@
-{ stdenv, buildDunePackage, fetchFromBitbucket, gnuplot, core }:
+{ lib, buildDunePackage, fetchFromGitHub, gnuplot, iso8601 }:
 
 buildDunePackage rec {
   pname = "gnuplot";
-  version = "0.5.3";
+  version = "0.7";
 
-  src = fetchFromBitbucket {
-    owner  = "ogu";
-    repo   = "${pname}-ocaml";
-    rev    = "release-${version}";
-    sha256 = "00sn9g46pj8pfh7faiyxg3pfhq7w9knafyabjr464bh6qz5kiin3";
+  minimumOCamlVersion = "4.03";
+
+  src = fetchFromGitHub {
+    owner  = "c-cube";
+    repo   = "ocaml-${pname}";
+    rev    = "v${version}";
+    sha256 = "02pzi3lb57ysrdsba743s3vmnapjbxgq8ynlzpxbbs6cn1jj6ch9";
   };
 
-  propagatedBuildInputs = [ core gnuplot ];
+  propagatedBuildInputs = [ gnuplot iso8601 ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     inherit (src.meta) homepage;
     description = "Ocaml bindings to Gnuplot";
     maintainers = [ maintainers.bcdarwin ];

From 34db9b5ee342c398e1646ef17ec415a8cbaedbc7 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 26 Mar 2020 03:57:08 +0100
Subject: [PATCH 4628/4636] =?UTF-8?q?ocamlPackages.phylogenetics:=202019-1?=
 =?UTF-8?q?1-15=20=E2=86=92=202020-01-05?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/phylogenetics/default.nix            | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix
index 87e88cbf496e..916be9b3d386 100644
--- a/pkgs/development/ocaml-modules/phylogenetics/default.nix
+++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix
@@ -1,23 +1,23 @@
 { stdenv, buildDunePackage, fetchFromGitHub, ppx_deriving
-, alcotest, biocaml, gnuplot, lacaml, menhir, owl }:
+, alcotest, biocaml, gnuplot, lacaml, menhir, ocaml-r, owl, printbox }:
 
 buildDunePackage rec {
   pname = "phylogenetics";
-  version = "unstable-2019-11-15";
+  version = "unstable-2020-01-05";
 
   useDune2 = true;
 
   src = fetchFromGitHub {
     owner  = "biocaml";
     repo   = pname;
-    rev    = "91c03834db065cf4a86f33affbb9cfd216defc9f";
-    sha256 = "0i9m0633a6a724as35ix8z3p1gj267cl0hmqrpw4qfq39zxmgnxb";
+    rev    = "b55ef7d7322bd822be26d21339945d45487fb547";
+    sha256 = "0hzfjhs5w3a7hlzxs739k5ik3k1xn3dzyzziid765s74f638n4hj";
   };
 
   minimumOCamlVersion = "4.08";  # e.g., uses Float.min
 
   checkInputs = [ alcotest ];
-  propagatedBuildInputs = [ biocaml gnuplot lacaml menhir owl ppx_deriving ];
+  propagatedBuildInputs = [ biocaml gnuplot lacaml menhir ocaml-r owl ppx_deriving printbox ];
 
   doCheck = false;  # many tests require bppsuite
 

From 543382d83cfe3948db3029e153ee763fe0fe79eb Mon Sep 17 00:00:00 2001
From: Drew Risinger <drewrisinger@users.noreply.github.com>
Date: Tue, 21 Jan 2020 09:37:08 -0500
Subject: [PATCH 4629/4636] pythonPackages.qiskit-ignis: init at 0.2.0

Qiskit Ignis is a toolbox for quantum hardware verification,
noise characterization, and error correction.

This commit follows the new Qiskit scheme of breaking one large package
into smaller packages (terra, aer, etc), and then having a single
meta-package "qiskit" that comprises them.
---
 .../python-modules/qiskit-ignis/default.nix   | 62 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 64 insertions(+)
 create mode 100644 pkgs/development/python-modules/qiskit-ignis/default.nix

diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix
new file mode 100644
index 000000000000..2f0a99dc0f82
--- /dev/null
+++ b/pkgs/development/python-modules/qiskit-ignis/default.nix
@@ -0,0 +1,62 @@
+{ lib
+, pythonOlder
+, buildPythonPackage
+, fetchFromGitHub
+, fetchpatch
+, numpy
+, qiskit-terra
+, scipy
+  # Check Inputs
+, pytestCheckHook
+, qiskit-aer
+}:
+
+buildPythonPackage rec {
+  pname = "qiskit-ignis";
+  version = "0.2.0";
+
+  disabled = pythonOlder "3.5";
+
+  # Pypi's tarball doesn't contain tests
+  src = fetchFromGitHub {
+    owner = "Qiskit";
+    repo = pname;
+    rev = version;
+    sha256 = "08a60xk5dq5wmqc23r4hr2v2nsf9hs0ybz832vbnd6d80dl6izyc";
+  };
+
+  patches = [
+    # Update tests for compatibility with qiskit-aer 0.4 (#342). Remove in version > 0.2.0
+    (fetchpatch {
+      url = "https://github.com/Qiskit/qiskit-ignis/commit/d78c494579f370058e68e360f10149db81b52477.patch";
+      sha256 = "0ygkllf95c0jfvjg7gn399a5fd0wshsjpcn279kj7855m8j306h6";
+    })
+    # Fix statevector test over-eager validation (PR #333)
+    (fetchpatch {
+      url = "https://github.com/Qiskit/qiskit-ignis/commit/7cc8eb2e852b383ea429233fa43d3728931f1707.patch";
+      sha256 = "0mdygykilg4qivdaa731z3y56l3ax4jp1sil9npqv0gn4p03c9g5";
+    })
+  ];
+
+  propagatedBuildInputs = [
+    numpy
+    qiskit-terra
+    scipy
+  ];
+
+  # Tests
+  pythonImportsCheck = [ "qiskit.ignis" ];
+  dontUseSetuptoolsCheck = true;
+  preCheck = ''export HOME=$TMPDIR'';
+  checkInputs = [
+    pytestCheckHook
+    qiskit-aer
+  ];
+
+  meta = with lib; {
+    description = "Qiskit tools for quantum hardware verification, noise characterization, and error correction";
+    homepage = "https://github.com/QISKit/qiskit-ignis";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ drewrisinger ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1a412e679210..8e42fcd19f44 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7113,6 +7113,8 @@ in {
 
   qiskit-ibmq-provider = callPackage ../development/python-modules/qiskit-ibmq-provider { };
 
+  qiskit-ignis = callPackage ../development/python-modules/qiskit-ignis { };
+
   qiskit-terra = callPackage ../development/python-modules/qiskit-terra { };
 
   qasm2image = callPackage ../development/python-modules/qasm2image { };

From 8ce84989d9038117101fa91f41a17ed6bbb16b09 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2020 08:16:39 +0000
Subject: [PATCH 4630/4636] bitcoin-abc: 0.21.1 -> 0.21.3

---
 pkgs/applications/blockchains/bitcoin-abc.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix
index 1fb4078696b8..afc5b40f9db5 100644
--- a/pkgs/applications/blockchains/bitcoin-abc.nix
+++ b/pkgs/applications/blockchains/bitcoin-abc.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 mkDerivation rec {
 
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
-  version = "0.21.1";
+  version = "0.21.3";
 
   src = fetchFromGitHub {
     owner = "bitcoin-ABC";
     repo = "bitcoin-abc";
     rev = "v${version}";
-    sha256 = "1aswgmzqk3vhxhp5k0m0awk22lf5ayaqg2cmlqy12jvfmpka9lrj";
+    sha256 = "1pzdgghbsss2qjfgl42lvkbs5yc5q6jnzqnp24lljmrh341g2zn4";
   };
 
   patches = [ ./fix-bitcoin-qt-build.patch ];

From 0a2759483a69d49a0580d3e9e994029f1d8f5bf0 Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Tue, 31 Mar 2020 01:01:33 +0000
Subject: [PATCH 4631/4636] vimPlugins: update auto-commiting based on review

- Use git.Repo(ROOT, search_parent_directories=True) to find nixpkgs
repo.
- Don't commit overrides.nix.
- Remove "-a" short argument.
- Remove "--commit" flag and commit by default.
- Improve help/error messages.
- Favor closure pattern over classes.Use a closure to wrap the update
function with state rather than a callable class.
- break NixpkgsRepo class into functions
- Optional None-type arguments
- Remove repo checks from update.py. Git is too flexible and permits too
many workflows for my attempt to replace documentation with code to work.
My goal would be to separate the `--add` functionality from the update
functionality in the near term and then there will be no reason for this
usage to create commits anyway.
---
 doc/languages-frameworks/vim.section.md |   2 +-
 pkgs/misc/vim-plugins/update.py         | 144 +++++++++---------------
 2 files changed, 54 insertions(+), 92 deletions(-)

diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md
index 1d316cf350e5..4911509212e6 100644
--- a/doc/languages-frameworks/vim.section.md
+++ b/doc/languages-frameworks/vim.section.md
@@ -261,7 +261,7 @@ deoplete-fish = super.deoplete-fish.overrideAttrs(old: {
 
 Sometimes plugins require an override that must be changed when the plugin is updated. This can cause issues when Vim plugins are auto-updated but the associated override isn't updated. For these plugins, the override should be written so that it specifies all information required to install the plugin, and running `./update.py` doesn't change the derivation for the plugin. Manually updating the override is required to update these types of plugins. An example of such a plugin is `LanguageClient-neovim`.
 
-To add a new plugin, run `./update.py --commit --add "[owner]/[name]"`.
+To add a new plugin, run `./update.py --add "[owner]/[name]"`. **NOTE**: This script automatically commits to your git repository. Be sure to check out a fresh branch before running.
 
 ## Important repositories
 
diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py
index a01bd93a3cc9..fe8cb90d1035 100755
--- a/pkgs/misc/vim-plugins/update.py
+++ b/pkgs/misc/vim-plugins/update.py
@@ -34,11 +34,9 @@ ATOM_LINK = "{http://www.w3.org/2005/Atom}link"  # "
 ATOM_UPDATED = "{http://www.w3.org/2005/Atom}updated"  # "
 
 ROOT = Path(__file__).parent
-NIXPKGS_PATH = ROOT.cwd().parents[2]
 DEFAULT_IN = ROOT.joinpath("vim-plugin-names")
 DEFAULT_OUT = ROOT.joinpath("generated.nix")
 DEPRECATED = ROOT.joinpath("deprecated.json")
-OVERRIDES = ROOT.joinpath("overrides.nix")
 
 import time
 from functools import wraps
@@ -78,7 +76,7 @@ def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: floa
 
 
 class Repo:
-    def __init__(self, owner: str, name: str, alias: str) -> None:
+    def __init__(self, owner: str, name: str, alias: Optional[str]) -> None:
         self.owner = owner
         self.name = name
         self.alias = alias
@@ -128,7 +126,7 @@ class Repo:
             new_owner, new_name = (
                 urllib.parse.urlsplit(response_url).path.strip("/").split("/")[:2]
             )
-            end_line = "\n" if self.alias == "" else f" as {self.alias}\n"
+            end_line = "\n" if self.alias is None else f" as {self.alias}\n"
             plugin_line = "{owner}/{name}" + end_line
 
             old_plugin = plugin_line.format(owner=self.owner, name=self.name)
@@ -222,17 +220,16 @@ def get_current_plugins() -> List[Plugin]:
 
 
 def prefetch_plugin(
-    user: str, repo_name: str, alias: str, cache: "Cache" = None
+    user: str, repo_name: str, alias: Optional[str], cache: "Optional[Cache]" = None
 ) -> Tuple[Plugin, Dict[str, str]]:
     repo = Repo(user, repo_name, alias)
     commit, date = repo.latest_commit()
     has_submodules = repo.has_submodules()
-    if cache is not None:
-        cached_plugin = cache[commit]
-        if cached_plugin is not None:
-            cached_plugin.name = alias or repo_name
-            cached_plugin.date = date
-            return cached_plugin, repo.redirect
+    cached_plugin = cache[commit] if cache else None
+    if cached_plugin is not None:
+        cached_plugin.name = alias or repo_name
+        cached_plugin.date = date
+        return cached_plugin, repo.redirect
 
     print(f"prefetch {user}/{repo_name}")
     if has_submodules:
@@ -287,17 +284,17 @@ def check_results(
         sys.exit(1)
 
 
-def parse_plugin_line(line: str) -> Tuple[str, str, str]:
+def parse_plugin_line(line: str) -> Tuple[str, str, Optional[str]]:
     name, repo = line.split("/")
     try:
         repo, alias = repo.split(" as ")
         return (name, repo, alias.strip())
     except ValueError:
         # no alias defined
-        return (name, repo.strip(), "")
+        return (name, repo.strip(), None)
 
 
-def load_plugin_spec(plugin_file: str) -> List[Tuple[str, str, str]]:
+def load_plugin_spec(plugin_file: str) -> List[Tuple[str, str, Optional[str]]]:
     plugins = []
     with open(plugin_file) as f:
         for line in f:
@@ -463,11 +460,10 @@ def parse_args():
     )
     parser.add_argument(
         "--add",
-        "-a",
         dest="add_plugins",
         default=[],
         action="append",
-        help="Plugin to add to vimPlugins in the form owner/repo",
+        help="Plugin to add to vimPlugins from Github in the form owner/repo",
     )
     parser.add_argument(
         "--input-names",
@@ -491,103 +487,69 @@ def parse_args():
         default=30,
         help="Number of concurrent processes to spawn.",
     )
-    parser.add_argument(
-        "--commit",
-        dest="commit",
-        action="store_true",
-        help="Automatically commit updates",
-    )
-    parser.add_argument(
-        "--allow-dirty",
-        dest="allow_dirty",
-        action="store_true",
-        help=(
-            "Allow commit to continue even if state is unexpectedly dirty. "
-            "This is only helpful when developing vimPlugins infrastructure."
-        ),
-    )
-
     return parser.parse_args()
 
 
-class NixpkgsRepo:
-    def __init__(self, allow_dirty: bool):
-        self.allow_dirty: bool = allow_dirty
-        self.repo: git.Repo = git.Repo(NIXPKGS_PATH)
+def commit(repo: git.Repo, message: str, files: List[Path]) -> None:
+    files_staged = repo.index.add([str(f.resolve()) for f in files])
 
-        if self.is_unexpectedly_dirty():
-            raise Exception("Please stash changes before updating.")
-
-    def commit(self, message: str, files: List[Path]) -> None:
-        files_staged = self.repo.index.add([str(f.resolve()) for f in files])
-
-        if files_staged:
-            print(f'committing to nixpkgs "{message}"')
-            self.repo.index.commit(message)
-            assert self.is_unexpectedly_dirty() is False
-        else:
-            print("no changes in working tree to commit")
-
-    def is_unexpectedly_dirty(self) -> bool:
-        return self.repo.is_dirty() and not self.allow_dirty
+    if files_staged:
+        print(f'committing to nixpkgs "{message}"')
+        repo.index.commit(message)
+    else:
+        print("no changes in working tree to commit")
 
 
-class PluginUpdater:
-    def __init__(self, input_file: str, outfile: str, proc: int):
-        self.input_file: str = input_file
-        self.outfile: str = outfile
-        self.proc = proc
-        self.cache: Cache = Cache(get_current_plugins())
-        self.prefetch = functools.partial(prefetch, cache=self.cache)
+def get_update(input_file: str, outfile: str, proc: int):
+    cache: Cache = Cache(get_current_plugins())
+    _prefetch = functools.partial(prefetch, cache=cache)
 
-    def __call__(self) -> Dict:
-        plugin_names = load_plugin_spec(self.input_file)
+    def update() -> dict:
+        plugin_names = load_plugin_spec(input_file)
 
         try:
-            # synchronous variant for debugging
-            # results = list(map(self.prefetch, plugin_names))
-            pool = Pool(processes=self.proc)
-            results = pool.map(self.prefetch, plugin_names)
+            pool = Pool(processes=proc)
+            results = pool.map(_prefetch, plugin_names)
         finally:
-            self.cache.store()
+            cache.store()
 
         plugins, redirects = check_results(results)
 
-        generate_nix(plugins, self.outfile)
+        generate_nix(plugins, outfile)
 
         return redirects
 
+    return update
 
-def main() -> None:
+
+def main():
     args = parse_args()
-    if args.add_plugins and not args.commit:
-        raise Exception("The --add argument requires setting the --commit flag.")
-    if args.commit:
-        nixpkgs_repo = NixpkgsRepo(args.allow_dirty)
-    updater = PluginUpdater(args.input_file, args.outfile, args.proc)
+    nixpkgs_repo = git.Repo(ROOT, search_parent_directories=True)
+    update = get_update(args.input_file, args.outfile, args.proc)
 
-    redirects = updater()
+    redirects = update()
     rewrite_input(args.input_file, redirects)
+    commit(nixpkgs_repo, "vimPlugins: update", [args.outfile])
 
-    if args.commit:
-        nixpkgs_repo.commit("vimPlugins: Update", [args.outfile])
-        if redirects:
-            updater()
-            nixpkgs_repo.commit(
-                "vimPlugins: Update redirects",
-                [args.outfile, args.input_file, DEPRECATED],
-            )
-        for plugin_line in args.add_plugins:
-            rewrite_input(args.input_file, append=(plugin_line + "\n",))
-            updater()
+    if redirects:
+        update()
+        commit(
+            nixpkgs_repo,
+            "vimPlugins: resolve github repository redirects",
+            [args.outfile, args.input_file, DEPRECATED],
+        )
 
-            plugin = fetch_plugin_from_pluginline(plugin_line)
-            nixpkgs_repo.commit(
-                "vimPlugins.{name}: init at {version}".format(
-                    name=plugin.normalized_name, version=plugin.version
-                ),
-                [args.outfile, args.input_file, OVERRIDES],
-            )
+    for plugin_line in args.add_plugins:
+        rewrite_input(args.input_file, append=(plugin_line + "\n",))
+        update()
+        plugin = fetch_plugin_from_pluginline(plugin_line)
+        commit(
+            nixpkgs_repo,
+            "vimPlugins.{name}: init at {version}".format(
+                name=plugin.normalized_name, version=plugin.version
+            ),
+            [args.outfile, args.input_file],
+        )
 
 
 if __name__ == "__main__":

From 7c4913be41fc0a647b94dd938ea185c4c5ecd78a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 1 Apr 2020 18:05:07 +0000
Subject: [PATCH 4632/4636] pyradio: 0.8.7.1 -> 0.8.7.2

---
 pkgs/applications/radio/pyradio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/radio/pyradio/default.nix b/pkgs/applications/radio/pyradio/default.nix
index 88ce23cd7096..f23359688c6c 100644
--- a/pkgs/applications/radio/pyradio/default.nix
+++ b/pkgs/applications/radio/pyradio/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pyradio";
-  version = "0.8.7.1";
+  version = "0.8.7.2";
 
   src = fetchFromGitHub {
     owner = "coderholic";
     repo = pname;
     rev = version;
-    sha256 = "1f1dch5vrx2armrff19rh9gpqydspn3nvzc9p9j2jfi6gsxhppyb";
+    sha256 = "0h2sxaqpmc1d1kpvpbcs9wymgzhx25x0x9p7dbyfw9r90i6123q1";
   };
 
   checkPhase = ''

From 79e768eeb4997efe93e94c6cc9f71ccd52433179 Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Wed, 29 Jan 2020 10:08:00 +0100
Subject: [PATCH 4633/4636] zenpower: 0.1.5 -> 0.1.10

---
 pkgs/os-specific/linux/zenpower/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/zenpower/default.nix b/pkgs/os-specific/linux/zenpower/default.nix
index 8fdf7f23cf83..97b69a7921b6 100644
--- a/pkgs/os-specific/linux/zenpower/default.nix
+++ b/pkgs/os-specific/linux/zenpower/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, kernel, fetchFromGitHub }:
+{ stdenv, kernel, fetchFromGitHub, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "zenpower";
-  version = "0.1.5";
+  version = "0.1.10";
 
   src = fetchFromGitHub {
     owner = "ocerman";
     repo = "zenpower";
     rev = "v${version}";
-    sha256 = "1ay1q666bc7czgc95invw523c0ds2gj85wxypc3wi418vfaha5vy";
+    sha256 = "1fqqaj7fq49yi2yip518036w80r9w7mkxpbkrxqzlydpma1x9v5m";
   };
 
   hardeningDisable = [ "pic" ];
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/ocerman/zenpower";
     license = licenses.gpl2;
     maintainers = with maintainers; [ alexbakker ];
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
     broken = versionOlder kernel.version "4.14";
   };
 }

From d2bb8d232b4d2691fdb8052e5c395fa282998254 Mon Sep 17 00:00:00 2001
From: David Anderson <dave@natulte.net>
Date: Sat, 14 Mar 2020 20:01:14 -0700
Subject: [PATCH 4634/4636] nixos/iio: explain why you might want IIO sensor
 support.

Signed-off-by: David Anderson <dave@natulte.net>
---
 nixos/modules/hardware/sensor/iio.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/hardware/sensor/iio.nix b/nixos/modules/hardware/sensor/iio.nix
index a8bc18800021..86fc196a18a5 100644
--- a/nixos/modules/hardware/sensor/iio.nix
+++ b/nixos/modules/hardware/sensor/iio.nix
@@ -8,7 +8,11 @@ with lib;
   options = {
     hardware.sensor.iio = {
       enable = mkOption {
-        description = "Enable this option to support IIO sensors.";
+        description = ''
+          Enable this option to support IIO sensors.
+
+          IIO sensors are used for orientation and ambient light
+          sensors on some mobile devices.'';
         type = types.bool;
         default = false;
       };

From 19a831d8535d2fbde03ce861df2b5b2d5376ca60 Mon Sep 17 00:00:00 2001
From: Dave Anderson <dave@natulte.net>
Date: Wed, 1 Apr 2020 10:56:22 -0700
Subject: [PATCH 4635/4636] nixos/iio: adjust formatting of option description.

Co-Authored-By: Alyssa Ross <hi@alyssa.is>
---
 nixos/modules/hardware/sensor/iio.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/hardware/sensor/iio.nix b/nixos/modules/hardware/sensor/iio.nix
index 86fc196a18a5..4c359c3b1725 100644
--- a/nixos/modules/hardware/sensor/iio.nix
+++ b/nixos/modules/hardware/sensor/iio.nix
@@ -12,7 +12,8 @@ with lib;
           Enable this option to support IIO sensors.
 
           IIO sensors are used for orientation and ambient light
-          sensors on some mobile devices.'';
+          sensors on some mobile devices.
+        '';
         type = types.bool;
         default = false;
       };

From 094f7ddd5a697d6fee2c0e21ac6f125f98e78472 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Mon, 9 Mar 2020 16:43:05 +0200
Subject: [PATCH 4636/4636] pythonPackages.salmon-mail: 3.1.1 -> 3.2.0

---
 .../python-modules/salmon-mail/default.nix     | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix
index afd915ed8407..92def3935e72 100644
--- a/pkgs/development/python-modules/salmon-mail/default.nix
+++ b/pkgs/development/python-modules/salmon-mail/default.nix
@@ -1,22 +1,26 @@
-{ stdenv, buildPythonPackage, fetchPypi, nose, dnspython
-,  chardet, lmtpd, python-daemon, six, jinja2, mock }:
+{ stdenv, buildPythonPackage, fetchPypi, dnspython, chardet, lmtpd
+, python-daemon, six, jinja2, mock, click }:
 
 buildPythonPackage rec {
   pname = "salmon-mail";
-  version = "3.1.1";
+  version = "3.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ddd9nwdmiibk3jaampznm8nai5b7zalp0f8c65l71674300bqnw";
+    sha256 = "0q2m6xri1b7qv46rqpv2qfdgk2jvswj8lpaacnxwjna3m685fhfx";
   };
 
-  checkInputs = [ nose jinja2 mock ];
-  propagatedBuildInputs = [ chardet dnspython lmtpd python-daemon six ];
+  checkInputs = [ jinja2 mock ];
+  propagatedBuildInputs = [ chardet dnspython lmtpd python-daemon six click ];
+
+  # Darwin tests fail without this. See:
+  # https://github.com/NixOS/nixpkgs/pull/82166#discussion_r399909846
+  __darwinAllowLocalNetworking = true;
 
   # The tests use salmon executable installed by salmon itself so we need to add
   # that to PATH
   checkPhase = ''
-    PATH=$out/bin:$PATH nosetests .
+    PATH=$out/bin:$PATH python setup.py test
   '';
 
   meta = with stdenv.lib; {